From Valentine at hall-mark.us.redhat.com  Wed Apr  1 07:05:13 2009
From: Valentine at hall-mark.us.redhat.com (hallmark.com)
Date: Wed, 01 Apr 2009 07:05:13 +0000
Subject: You've received A Hallmark Valentine-Card!
Message-ID: <E1LouVd-0001wo-IB@server3.wsarchives.com>

An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20090401/01199996/attachment.htm>

From lennart at fedoraproject.org  Wed Apr  1 00:02:06 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  1 Apr 2009 00:02:06 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.74,1.75
Message-ID: <20090401000206.56BF37011D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1106

Modified Files:
	pulseaudio.spec 
Log Message:
Fix tarball name


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- pulseaudio.spec	31 Mar 2009 23:29:07 -0000	1.74
+++ pulseaudio.spec	1 Apr 2009 00:01:36 -0000	1.75
@@ -3,10 +3,10 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	4.test6%{?dist}
+Release:	5.test6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
-Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test5.tar.gz
+Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -185,7 +185,7 @@
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.15-test5
+%setup -q -T -b0 -n pulseaudio-0.9.15-test6
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -247,7 +247,6 @@
 %dir %{_libdir}/pulse-%{drvver}/modules/
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
 %{_libdir}/pulse-%{drvver}/modules/libcli.so
-%{_libdir}/pulse-%{drvver}/modules/libdbus-util.so
 %{_libdir}/pulse-%{drvver}/modules/liboss-util.so
 %{_libdir}/pulse-%{drvver}/modules/libprotocol-cli.so
 %{_libdir}/pulse-%{drvver}/modules/libprotocol-esound.so
@@ -407,6 +406,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-5.test6
+- Fix tarball name
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-4.test6
 - New test release
 



From lennart at fedoraproject.org  Wed Apr  1 00:04:37 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  1 Apr 2009 00:04:37 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.75,1.76
Message-ID: <20090401000437.DDD807011D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1716

Modified Files:
	pulseaudio.spec 
Log Message:
fix mistag


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- pulseaudio.spec	1 Apr 2009 00:01:36 -0000	1.75
+++ pulseaudio.spec	1 Apr 2009 00:04:07 -0000	1.76
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	5.test6%{?dist}
+Release:	6.test6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
@@ -406,6 +406,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-6.test6
+- Fix mistag
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-5.test6
 - Fix tarball name
 



From mjg59 at fedoraproject.org  Wed Apr  1 00:25:27 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Wed,  1 Apr 2009 00:25:27 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6.29-alsa-update-quirks.patch, NONE,
	1.1 kernel.spec, 1.1494, 1.1495
Message-ID: <20090401002527.C10747011D@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6209

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.29-alsa-update-quirks.patch 
Log Message:
* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support


linux-2.6.29-alsa-update-quirks.patch:

--- NEW FILE linux-2.6.29-alsa-update-quirks.patch ---
diff -up ./include/sound/core.h.alsa ./include/sound/core.h
--- ./include/sound/core.h.alsa	2009-04-01 00:47:41.000000000 +0100
+++ ./include/sound/core.h	2009-04-01 00:47:43.000000000 +0100
@@ -446,21 +446,33 @@ static inline int __snd_bug_on(int cond)
 struct snd_pci_quirk {
 	unsigned short subvendor;	/* PCI subvendor ID */
 	unsigned short subdevice;	/* PCI subdevice ID */
+	unsigned short subdevice_mask;	/* bitmask to match */
 	int value;			/* value */
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 	const char *name;		/* name of the device (optional) */
 #endif
 };
 
-#define _SND_PCI_QUIRK_ID(vend,dev) \
-	.subvendor = (vend), .subdevice = (dev)
+#define _SND_PCI_QUIRK_ID_MASK(vend, mask, dev)	\
+	.subvendor = (vend), .subdevice = (dev), .subdevice_mask = (mask)
+#define _SND_PCI_QUIRK_ID(vend, dev) \
+	_SND_PCI_QUIRK_ID_MASK(vend, 0xffff, dev)
 #define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
 	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev),			\
+			.value = (val), .name = (xname)}
 #else
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
 	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), .value = (val)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)}
 #endif
 
 const struct snd_pci_quirk *
diff -up ./sound/core/misc.c.alsa ./sound/core/misc.c
--- ./sound/core/misc.c.alsa	2009-04-01 00:47:41.000000000 +0100
+++ ./sound/core/misc.c	2009-04-01 00:47:43.000000000 +0100
@@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci
 {
 	const struct snd_pci_quirk *q;
 
-	for (q = list; q->subvendor; q++)
-		if (q->subvendor == pci->subsystem_vendor &&
-		    (!q->subdevice || q->subdevice == pci->subsystem_device))
+	for (q = list; q->subvendor; q++) {
+		if (q->subvendor != pci->subsystem_vendor)
+			continue;
+		if (!q->subdevice ||
+		    (pci->subsystem_device & q->subdevice_mask) == q->subdevice)
 			return q;
+	}
 	return NULL;
 }
-
 EXPORT_SYMBOL(snd_pci_quirk_lookup);
 #endif
diff -up ./sound/pci/hda/patch_analog.c.alsa ./sound/pci/hda/patch_analog.c
--- ./sound/pci/hda/patch_analog.c.alsa	2009-03-23 23:12:14.000000000 +0000
+++ ./sound/pci/hda/patch_analog.c	2009-04-01 00:52:49.000000000 +0100
@@ -1002,11 +1002,9 @@ static struct snd_pci_quirk ad1986a_cfg_
 	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
 	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
-	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG),
-	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG),
-	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG),
 	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
-	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
+        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_SAMSUNG),
+        SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),
 	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE),
@@ -3911,8 +3909,10 @@ static struct snd_pci_quirk ad1884a_cfg_
 	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
 	SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
-	SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
-	SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e1, "HP laptop", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
 	{}
diff -up ./sound/pci/hda/patch_conexant.c.alsa ./sound/pci/hda/patch_conexant.c
--- ./sound/pci/hda/patch_conexant.c.alsa	2009-04-01 00:53:24.000000000 +0100
+++ ./sound/pci/hda/patch_conexant.c	2009-04-01 00:54:34.000000000 +0100
@@ -1002,15 +1002,9 @@ static const char *cxt5045_models[CXT504
 };
 
 static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
-	SND_PCI_QUIRK(0x103c, 0x30a5, "HP", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2120", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30cd, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE),
 	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
-	SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
+                           CXT5045_LAPTOP_HPSENSE),
 	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT5045_LAPTOP_MICSENSE),
 	SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),
 	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),
@@ -1020,8 +1014,8 @@ static struct snd_pci_quirk cxt5045_cfg_
 	SND_PCI_QUIRK(0x1509, 0x1e40, "FIC", CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x1509, 0x2f05, "FIC", CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x1509, 0x2f06, "FIC", CXT5045_LAPTOP_HPMICSENSE),
-	SND_PCI_QUIRK(0x1631, 0xc106, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
-	SND_PCI_QUIRK(0x1631, 0xc107, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
+        SND_PCI_QUIRK_MASK(0x1631, 0xff00, 0xc100, "Packard Bell",
+                           CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
 	{}
 };
diff -up ./sound/pci/hda/patch_realtek.c.alsa ./sound/pci/hda/patch_realtek.c
--- ./sound/pci/hda/patch_realtek.c.alsa	2009-04-01 00:54:47.000000000 +0100
+++ ./sound/pci/hda/patch_realtek.c	2009-04-01 00:57:42.000000000 +0100
@@ -10549,15 +10549,12 @@ static const char *alc262_models[ALC262_
 static struct snd_pci_quirk alc262_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),
-	SND_PCI_QUIRK(0x103c, 0x12fe, "HP xw9400", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x12ff, "HP xw4550", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1306, "HP xw8600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",
+			   ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",
+			   ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",
+			   ALC262_HP_BPC),
 	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
 	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
 	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
@@ -10575,17 +10572,17 @@ static struct snd_pci_quirk alc262_cfg_t
 	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
 	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x9033, "Sony VAIO VGN-SR19XN",
-		      ALC262_SONY_ASSAMD),
+        SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */
+        SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",
+			   ALC262_SONY_ASSAMD),
 	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
 		      ALC262_TOSHIBA_RX1),
 	SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
 	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
 	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
-	SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
-	SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
+        SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_TYAN),
+        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
+			   ALC262_ULTRA),
 	SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
 	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
@@ -16039,9 +16036,8 @@ static struct snd_pci_quirk alc662_cfg_t
 	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
 	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
 					ALC662_3ST_6ch_DIG),
-	SND_PCI_QUIRK(0x1854, 0x2000, "ASUS H13-2000", ALC663_ASUS_H13),
-	SND_PCI_QUIRK(0x1854, 0x2001, "ASUS H13-2001", ALC663_ASUS_H13),
-	SND_PCI_QUIRK(0x1854, 0x2002, "ASUS H13-2002", ALC663_ASUS_H13),
+        SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
+			   ALC663_ASUS_H13),
 	{}
 };
 
diff -up ./sound/pci/hda/patch_sigmatel.c.alsa ./sound/pci/hda/patch_sigmatel.c
--- ./sound/pci/hda/patch_sigmatel.c.alsa	2009-04-01 00:57:52.000000000 +0100
+++ ./sound/pci/hda/patch_sigmatel.c	2009-04-01 01:00:53.000000000 +0100
@@ -1796,18 +1796,12 @@ static struct snd_pci_quirk stac92hd71bx
 	/* SigmaTel reference board */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
 		      "DFI LanParty", STAC_92HD71BXX_REF),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f2,
-		      "HP dv5", STAC_HP_M4),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
-		      "HP dv7", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
-		      "HP dv4", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
-		      "HP dv7", STAC_HP_M4),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3600,
-		      "HP dv5", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
-		      "HP dv5", STAC_HP_DV5),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,
+			   "HP", STAC_HP_DV5),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,
+			   "HP dv4-7", STAC_HP_DV5),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,
+			   "HP dv4-7", STAC_HP_DV5),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,
 				"unknown HP", STAC_HP_M4),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
@@ -2065,32 +2059,8 @@ static struct snd_pci_quirk stac922x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,
 		      "Dell XPS M1210", STAC_922X_DELL_M82),
 	/* ECS/PC Chips boards */
-	SND_PCI_QUIRK(0x1019, 0x2144,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2608,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2633,
-		      "ECS/PC chips P17G/1333", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2811,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2812,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2813,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2814,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2815,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2816,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2817,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2818,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2819,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2820,
-		      "ECS/PC chips", STAC_ECS_202),
+        SND_PCI_QUIRK_MASK(0x1019, 0xf000, 0x2000,
+			   "ECS/PC chips", STAC_ECS_202),
 	{} /* terminator */
 };
 
@@ -2148,22 +2118,10 @@ static struct snd_pci_quirk stac927x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x3d01, "Intel D946", STAC_D965_3ST),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xa301, "Intel D946", STAC_D965_3ST),
 	/* 965 based 3 stack systems */
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2116, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2115, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2114, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2113, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2112, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2111, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2110, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2009, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2008, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2007, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2006, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2005, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2004, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2100,
+			   "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,
+			   "Intel D965", STAC_D965_3ST),
 	/* Dell 3 stack systems */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_3ST),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
@@ -2179,15 +2137,10 @@ static struct snd_pci_quirk stac927x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS),
 	/* 965 based 5 stack systems */
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2303, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2304, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2305, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2501, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2502, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2503, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2504, "Intel D965", STAC_D965_5ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2300,
+			   "Intel D965", STAC_D965_5ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500,
+			   "Intel D965", STAC_D965_5ST),
 	{} /* terminator */
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -u -r1.1494 -r1.1495
--- kernel.spec	31 Mar 2009 23:58:15 -0000	1.1494
+++ kernel.spec	1 Apr 2009 00:24:57 -0000	1.1495
@@ -644,6 +644,7 @@
 Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
 Patch604: alsa-pcm-safer-boundary-checks.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
+Patch611: linux-2.6-alsa-update-quirks.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
@@ -1182,6 +1183,7 @@
 # ALSA
 # squelch hda_beep by default
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+ApplyPatch linux-2.6.29-alsa-update-quirks.patch
 
 # fix alsa for pulseaudio
 ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
@@ -1865,6 +1867,9 @@
 # and build.
 
 %changelog
+* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support
+
 * Tue Mar 31 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.29.1-rc1
 - Dropped patches, merged upstream:



From lennart at fedoraproject.org  Wed Apr  1 00:32:18 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  1 Apr 2009 00:32:18 +0000 (UTC)
Subject: rpms/libcanberra/devel
	ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch, 
	NONE, 1.1 libcanberra.spec, 1.23, 1.24
Message-ID: <20090401003218.0C4687011D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8489

Modified Files:
	libcanberra.spec 
Added Files:
	ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch 
Log Message:
Another preview for 0.12

ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch:

--- NEW FILE ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch ---
diff --git a/Makefile.am b/Makefile.am
index 507a02f..8db04da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 dist_doc_DATA = README
 
 EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
-SUBDIRS = libltdl src gtkdoc doc
+SUBDIRS = src gtkdoc doc
 
 MAINTAINERCLEANFILES = README
 noinst_DATA = README
@@ -51,7 +51,7 @@ ACLOCAL_AMFLAGS = -I m4
 README:
 	rm -f README
 	$(MAKE) -C doc README
-	cd $(srcdir) && ln -s doc/README README
+	ln -s doc/README README
 
 homepage: all dist
 	test -d $$HOME/homepage/private
diff --git a/bootstrap.sh b/bootstrap.sh
index abeb4f6..29d356f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,7 +18,7 @@
 # License along with libcanberra. If not, see
 # <http://www.gnu.org/licenses/>.
 
-VERSION=1.9
+VERSION=1.10
 
 run_versioned() {
     local P
@@ -42,6 +42,15 @@ run_versioned() {
 
 set -ex
 
+# We check for this here, because if pkg-config is not found in the
+# system, it's likely that the pkg.m4 macro file is also not present,
+# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
+# configure file faulty.
+if ! pkg-config --version &>/dev/null; then
+    echo "pkg-config is required to bootstrap this program" &>/dev/null
+    exit 1
+fi
+
 if [ "x$1" = "xam" ] ; then
     run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
@@ -54,7 +63,7 @@ else
 
     mkdir -p m4
     gtkdocize --copy --flavour no-tmpl --docdir gtkdoc
-    "$LIBTOOLIZE" -c --force --ltdl --recursive
+    "$LIBTOOLIZE" -c --force --recursive
     run_versioned aclocal "$VERSION" -I m4
     run_versioned autoconf 2.63 -Wall
     run_versioned autoheader 2.63
diff --git a/configure.ac b/configure.ac
index 3f1a841..51dc305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de])
+AC_INIT([libcanberra],[0.11],[mzyvopnaoreen (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/common.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR(m4)
@@ -65,9 +65,32 @@ done
 
 #### libtool stuff ####
 LT_PREREQ(2.2)
-LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen win32-dll disable-static])
-LTDL_INIT([convenience recursive])
+
+dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
+dnl exactly which version of libltdl is present in the system, so we
+dnl just assume that it's a working version as long as we have the
+dnl library and the header files.
+dnl
+dnl As an extra safety device, check for lt_dladvise_init() which is
+dnl only implemented in libtool 2.x, and refine as we go if we have
+dnl refined requirements.
+dnl
+dnl Check the header files first since the system may have a
+dnl libltdl.so for runtime, but no headers, and we want to bail out as
+dnl soon as possible.
+dnl
+dnl We don't need any special variable for this though, since the user
+dnl can give the proper place to find libltdl through the standard
+dnl variables like LDFLAGS and CPPFLAGS.
+
+AC_CHECK_HEADER([ltdl.h],
+    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
+    [LIBLTDL=])
+
+AS_IF([test "x$LIBLTDL" = "x"],
+    [AC_MSG_ERROR([Unable to find libltdl.])])
+AC_SUBST([LIBLTDL])
 
 #### Determine build environment ####
 
@@ -109,7 +132,6 @@ AC_TYPE_SIZE_T
 AC_CHECK_TYPES(ssize_t, , [AC_DEFINE([ssize_t], [signed long],
     [Define ssize_t if it is not done by the standard libs.])])
 AC_TYPE_OFF_T
-AC_TYPE_SIGNAL
 AC_TYPE_UID_T
 
 #### Check for libs ####
@@ -158,20 +180,12 @@ AM_ICONV
 
 #### pkg-config ####
 
-# Check for pkg-config manually first, as if its not installed the
-# PKG_PROG_PKG_CONFIG macro won't be defined.
-AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
-
-if test x"$have_pkg_config" = "xno"; then
-    AC_MSG_ERROR(pkg-config is required to install this program)
-fi
-
 PKG_PROG_PKG_CONFIG
 
 #### ALSA support (optional) ####
 
 AC_ARG_ENABLE([alsa],
-    AC_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
+    AS_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
         [
             case "${enableval}" in
                 yes) alsa=yes ;;
@@ -203,7 +217,7 @@ AC_SUBST(ALSA_LIBS)
 ### OSS support (optional) ###
 
 AC_ARG_ENABLE([oss],
-    AC_HELP_STRING([--disable-oss], [Disable optional OSS support]),
+    AS_HELP_STRING([--disable-oss], [Disable optional OSS support]),
         [
             case "${enableval}" in
                 yes) oss=yes ;;
@@ -233,7 +247,7 @@ fi
 ### PulseAudio (optional) ####
 
 AC_ARG_ENABLE([pulse],
-    AC_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
+    AS_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
         [
             case "${enableval}" in
                 yes) pulse=yes ;;
@@ -274,7 +288,7 @@ AC_SUBST(PULSE_LIBS)
 #### GStreamer support (optional) ####
 
 AC_ARG_ENABLE([gstreamer],
-    AC_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
+    AS_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
         [
             case "${enableval}" in
                 yes) gstreamer=yes ;;
@@ -306,7 +320,7 @@ AC_SUBST(GSTREAMER_LIBS)
 ### Null output (optional) ####
 
 AC_ARG_ENABLE([null],
-    AC_HELP_STRING([--disable-null], [Disable optional null output]),
+    AS_HELP_STRING([--disable-null], [Disable optional null output]),
         [
             case "${enableval}" in
                 yes) null=yes ;;
@@ -326,7 +340,7 @@ fi
 ### GTK (optional) ####
 
 AC_ARG_ENABLE([gtk],
-    AC_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
+    AS_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
         [
             case "${enableval}" in
                 yes) gtk=yes ;;
@@ -368,7 +382,7 @@ AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1])
 #### TDB cache support (optional) ####
 
 AC_ARG_ENABLE([tdb],
-    AC_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
+    AS_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
         [
             case "${enableval}" in
                 yes) tdb=yes ;;
@@ -415,7 +429,7 @@ fi
 ### LYNX documentation generation ###
 
 AC_ARG_ENABLE([lynx],
-        AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
+        AS_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
                 [
                         case "${enableval}" in
                                 yes) lynx=yes ;;
@@ -561,7 +575,6 @@ GTK_DOC_CHECK(1.9)
 
 AC_CONFIG_FILES([
 Makefile
-libltdl/Makefile
 src/Makefile
 libcanberra.pc
 libcanberra-gtk.pc
diff --git a/doc/README.html.in b/doc/README.html.in
index d4a3edf..9b9cf04 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -10,7 +10,7 @@
 <body>
 <h1><a name="top">libcanberra @PACKAGE_VERSION@</a></h1>
 
-<p><i>Copyright 2008 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
+<p><i>Copyright 2008-2009 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
 
 <ul class="toc">
     <li><a href="#license">License</a></li>
diff --git a/src/Makefile.am b/src/Makefile.am
index d1b4d89..e40ec1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,8 @@ libcanberra_la_SOURCES = \
 	sound-theme-spec.c sound-theme-spec.h \
 	llist.h \
 	macro.h macro.c \
-	malloc.c malloc.h
+	malloc.c malloc.h \
+	fork-detect.c fork-detect.h
 libcanberra_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(VORBIS_CFLAGS)
@@ -85,8 +86,6 @@ if BUILTIN_DSO
 libcanberra_la_SOURCES += \
 	dso.c \
 	driver-order.c driver-order.h
-libcanberra_la_CFLAGS += \
-	$(LTDLINCL)
 libcanberra_la_LIBADD += \
 	$(LIBLTDL)
 
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index b9d8ae0..302eeb4 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -647,11 +647,15 @@ static gboolean idle_cb(void *userdata) {
     return FALSE;
 }
 
+static void connect_settings(void);
+
 static gboolean emission_hook_cb(GSignalInvocationHint *hint, guint n_param_values, const GValue *param_values, gpointer data) {
     static SoundEventData *d = NULL;
     GdkEvent *e;
     GObject *object;
 
+    connect_settings();
+
     if (disabled)
         return TRUE;
 
@@ -719,15 +723,15 @@ static void enable_input_feedback_sounds_changed(GtkSettings *s, GParamSpec *arg
     read_enable_input_feedback_sounds(s);
 }
 
-G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+static void connect_settings(void) {
     GtkSettings *s;
+    static gboolean connected = FALSE;
 
-    /* This is the same quark libgnomeui uses! */
-    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
-    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
+    if (connected)
+        return;
 
-    /* Hook up the gtk setting */
-    s = gtk_settings_get_default();
+    if (!(s = gtk_settings_get_default()))
+        return;
 
     if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-input-feedback-sounds")) {
         g_signal_connect(G_OBJECT(s), "notify::gtk-enable-input-feedback-sounds", G_CALLBACK(enable_input_feedback_sounds_changed), NULL);
@@ -735,6 +739,18 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
     } else
         g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-input-feedback-sounds property.");
 
+    connected = TRUE;
+}
+
+G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+
+    /* This is the same quark libgnomeui uses! */
+    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
+    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
+
+    /* Hook up the gtk setting */
+    connect_settings();
+
     install_hook(GTK_TYPE_WINDOW, "show", &signal_id_widget_show);
     install_hook(GTK_TYPE_WINDOW, "hide", &signal_id_widget_hide);
     install_hook(GTK_TYPE_DIALOG, "response", &signal_id_dialog_response);
@@ -749,7 +765,6 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
     install_hook(GTK_TYPE_ICON_VIEW, "selection-changed", &signal_id_icon_view_selection_changed);
 }
 
-
 G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
 
 G_MODULE_EXPORT gchar* g_module_check_init(GModule *module) {
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
index 70b8d7e..cb36a0f 100644
--- a/src/canberra-gtk.c
+++ b/src/canberra-gtk.c
@@ -31,6 +31,7 @@
 #include "common.h"
 #include "malloc.h"
 #include "proplist.h"
+#include "fork-detect.h"
 
 /**
  * SECTION:canberra-gtk
@@ -93,7 +94,8 @@ ca_context *ca_gtk_context_get(void) {
     if ((c = g_static_private_get(&context_private)))
         return c;
 
-    ca_assert_se(ca_context_create(&c) == CA_SUCCESS);
+    if (ca_context_create(&c) != CA_SUCCESS)
+        return NULL;
 
     if ((name = g_get_application_name()))
         ca_context_change_props(c, CA_PROP_APPLICATION_NAME, name, NULL);
@@ -154,6 +156,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
 
     ca_return_val_if_fail(p, CA_ERROR_INVALID);
     ca_return_val_if_fail(widget, CA_ERROR_INVALID);
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
 
     if (!(w = get_toplevel(widget)))
         return CA_ERROR_INVALID;
@@ -224,6 +227,7 @@ int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e) {
 
     ca_return_val_if_fail(p, CA_ERROR_INVALID);
     ca_return_val_if_fail(e, CA_ERROR_INVALID);
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
 
     if ((gw = e->any.window)) {
         gdk_window_get_user_data(gw, (gpointer*) &w);
@@ -297,6 +301,7 @@ int ca_gtk_play_for_widget(GtkWidget *w, uint32_t id, ...) {
     ca_proplist *p;
 
     ca_return_val_if_fail(w, CA_ERROR_INVALID);
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
 
     if ((ret = ca_proplist_create(&p)) < 0)
         return ret;
@@ -346,6 +351,7 @@ int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) {
     ca_proplist *p;
 
     ca_return_val_if_fail(e, CA_ERROR_INVALID);
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
 
     if ((ret = ca_proplist_create(&p)) < 0)
         return ret;
diff --git a/src/canberra.h b/src/canberra.h
index ff09146..9664ef2 100644
--- a/src/canberra.h
+++ b/src/canberra.h
@@ -414,7 +414,8 @@ enum {
     CA_ERROR_IO = -14,
     CA_ERROR_INTERNAL = -15,
     CA_ERROR_DISABLED = -16,
-    _CA_ERROR_MAX = -17
+    CA_ERROR_FORKED = -17,
+    _CA_ERROR_MAX = -18
 };
 
 /**
diff --git a/src/common.c b/src/common.c
index e1445f4..ac8b982 100644
--- a/src/common.c
+++ b/src/common.c
@@ -30,6 +30,7 @@
 #include "driver.h"
 #include "proplist.h"
 #include "macro.h"
+#include "fork-detect.h"
 
 /**
  * SECTION:canberra
@@ -127,6 +128,7 @@ int ca_context_create(ca_context **_c) {
     int ret;
     const char *d;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(_c, CA_ERROR_INVALID);
 
     if (!(c = ca_new0(ca_context, 1)))
@@ -171,6 +173,7 @@ int ca_context_create(ca_context **_c) {
 int ca_context_destroy(ca_context *c) {
     int ret = CA_SUCCESS;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
 
     /* There's no locking necessary here, because the application is
@@ -209,6 +212,7 @@ int ca_context_set_driver(ca_context *c, const char *driver) {
     char *n;
     int ret;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_mutex_lock(c->mutex);
     ca_return_val_if_fail_unlock(!c->opened, CA_ERROR_STATE, c->mutex);
@@ -250,6 +254,7 @@ int ca_context_change_device(ca_context *c, const char *device) {
     char *n;
     int ret;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_mutex_lock(c->mutex);
 
@@ -277,6 +282,7 @@ fail:
 static int context_open_unlocked(ca_context *c) {
     int ret;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
 
     if (c->opened)
@@ -302,6 +308,7 @@ static int context_open_unlocked(ca_context *c) {
 int ca_context_open(ca_context *c) {
     int ret;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_mutex_lock(c->mutex);
     ca_return_val_if_fail_unlock(!c->opened, CA_ERROR_STATE, c->mutex);
@@ -336,6 +343,7 @@ int ca_context_change_props(ca_context *c, ...)  {
     int ret;
     ca_proplist *p = NULL;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
 
     va_start(ap, c);
@@ -368,6 +376,7 @@ int ca_context_change_props_full(ca_context *c, ca_proplist *p) {
     int ret;
     ca_proplist *merged;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_return_val_if_fail(p, CA_ERROR_INVALID);
 
@@ -438,6 +447,7 @@ int ca_context_play(ca_context *c, uint32_t id, ...) {
     va_list ap;
     ca_proplist *p = NULL;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
 
     va_start(ap, id);
@@ -478,6 +488,7 @@ int ca_context_play_full(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_c
     const char *t;
     ca_bool_t enabled = TRUE;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_return_val_if_fail(p, CA_ERROR_INVALID);
     ca_return_val_if_fail(!userdata || cb, CA_ERROR_INVALID);
@@ -532,6 +543,7 @@ finish:
 int ca_context_cancel(ca_context *c, uint32_t id)  {
     int ret;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_mutex_lock(c->mutex);
     ca_return_val_if_fail_unlock(c->opened, CA_ERROR_STATE, c->mutex);
@@ -566,6 +578,7 @@ int ca_context_cache(ca_context *c, ...) {
     va_list ap;
     ca_proplist *p = NULL;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
 
     va_start(ap, c);
@@ -599,6 +612,7 @@ int ca_context_cache(ca_context *c, ...) {
 int ca_context_cache_full(ca_context *c, ca_proplist *p) {
     int ret;
 
+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_return_val_if_fail(p, CA_ERROR_INVALID);
 
@@ -648,7 +662,8 @@ const char *ca_strerror(int code) {
         [-CA_ERROR_ACCESS] = "Access forbidden",
         [-CA_ERROR_IO] = "IO error",
         [-CA_ERROR_INTERNAL] = "Internal error",
-        [-CA_ERROR_DISABLED] = "Sound disabled"
+        [-CA_ERROR_DISABLED] = "Sound disabled",
+        [-CA_ERROR_FORKED] = "Process forked"
     };
 
     ca_return_val_if_fail(code <= 0, NULL);
diff --git a/src/fork-detect.c b/src/fork-detect.c
new file mode 100644
index 0000000..622037c
--- /dev/null
+++ b/src/fork-detect.c
@@ -0,0 +1,51 @@
+/***
+  This file is part of libcanberra.
+
+  Copyright 2009 Lennart Poettering
+
+  libcanberra is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation, either version 2.1 of the
+  License, or (at your option) any later version.
+
+  libcanberra is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with libcanberra. If not, see
+  <http://www.gnu.org/licenses/>.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <unistd.h>
+#include <sys/types.h>
+
+#include "fork-detect.h"
+
+int ca_detect_fork(void) {
+    static volatile pid_t pid = (pid_t) -1;
+    pid_t v;
+
+    /* Some really stupid applications (Hey, vim, that means you!)
+     * love to fork after initializing gtk/libcanberra. This is really
+     * bad style. We however have to deal with this cleanly, so we try
+     * to detect the forks making sure all our calls fail cleanly
+     * after the fork. */
+
+    /* Ideally we'd use atomic operations here, but we don't have them
+     * and this is not exactly crucial, so we don't care */
+
+    v = pid;
+
+    if (v == getpid() || v == (pid_t) -1) {
+        pid = getpid();
+        return 0;
+    }
+
+    return 1;
+}
diff --git a/src/fork-detect.h b/src/fork-detect.h
new file mode 100644
index 0000000..9050ef8
--- /dev/null
+++ b/src/fork-detect.h
@@ -0,0 +1,26 @@
+#ifndef foocanberraforkdetecth
+#define foocanberraforkdetecth
+
+/***
+  This file is part of libcanberra.
+
+  Copyright 2009 Lennart Poettering
+
+  libcanberra is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation, either version 2.1 of the
+  License, or (at your option) any later version.
+
+  libcanberra is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with libcanberra. If not, see
+  <http://www.gnu.org/licenses/>.
+***/
+
+int ca_detect_fork(void);
+
+#endif
diff --git a/src/map-file b/src/map-file
index 2265ed0..902252a 100644
--- a/src/map-file
+++ b/src/map-file
@@ -7,4 +7,7 @@ driver_change_props;
 driver_destroy;
 driver_open;
 driver_play;
+lt_*;
+dlopen_*;
+preopen_*;
 };
diff --git a/src/pulse.c b/src/pulse.c
index 11d6e52..ed371de 100644
--- a/src/pulse.c
+++ b/src/pulse.c
@@ -166,12 +166,27 @@ static int translate_error(int error) {
         [PA_ERR_BADSTATE]             = CA_ERROR_STATE,
         [PA_ERR_NODATA]               = CA_ERROR_IO,
         [PA_ERR_VERSION]              = CA_ERROR_NOTSUPPORTED,
-        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG
+        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG,
+#ifdef PA_ERR_NOTSUPPORTED
+        [PA_ERR_NOTSUPPORTED]         = CA_ERROR_NOTSUPPORTED,
+#endif
+#ifdef PA_ERR_UNKNOWN
+        [PA_ERR_UNKNOWN]              = CA_ERROR_IO,
+#endif
+#ifdef PA_ERR_NOEXTENSION
+        [PA_ERR_NOEXTENSION]          = CA_ERROR_NOTSUPPORTED,
+#endif
+#ifdef PA_ERR_OBSOLETE
+        [PA_ERR_OBSOLETE]             = CA_ERROR_NOTSUPPORTED,
+#endif
+#ifdef PA_ERR_NOTIMPLEMENTED
+        [PA_ERR_NOTIMPLEMENTED]       = CA_ERROR_NOTSUPPORTED
+#endif
     };
 
     ca_assert(error >= 0);
 
-    if (error >= PA_ERR_MAX)
+    if (error >= PA_ERR_MAX || !table[error])
         return CA_ERROR_IO;
 
     return table[error];
@@ -572,7 +587,7 @@ static void stream_write_cb(pa_stream *s, size_t bytes, void *userdata) {
             goto finish;
         }
 
-	data = NULL;
+        data = NULL;
 
         bytes -= rbytes;
     }
@@ -641,7 +656,11 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
     pa_proplist *l = NULL;
     const char *n, *vol, *ct;
     char *name = NULL;
+#if defined(PA_MAJOR) && ((PA_MAJOR > 0) || (PA_MAJOR == 0 && PA_MINOR > 9) || (PA_MAJOR == 0 && PA_MINOR == 9 && PA_MICRO >= 15))
+    pa_volume_t v = (pa_volume_t) -1;
+#else
     pa_volume_t v = PA_VOLUME_NORM;
+#endif
     pa_sample_spec ss;
     ca_cache_control_t cache_control = CA_CACHE_CONTROL_NEVER;
     struct outstanding *out = NULL;
@@ -781,7 +800,13 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
     pa_stream_set_state_callback(out->stream, stream_state_cb, out);
     pa_stream_set_write_callback(out->stream, stream_write_cb, out);
 
-    if (pa_stream_connect_playback(out->stream, NULL, NULL, 0, NULL, NULL) < 0) {
+    if (pa_stream_connect_playback(out->stream, NULL, NULL,
+#ifdef PA_STREAM_FAIL_ON_SUSPEND
+                                   PA_STREAM_FAIL_ON_SUSPEND
+#else
+                                   0
+#endif
+                                   , NULL, NULL) < 0) {
         ret = translate_error(pa_context_errno(p->context));
         pa_threaded_mainloop_unlock(p->mainloop);
         goto finish;


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libcanberra.spec	25 Feb 2009 02:57:26 -0000	1.23
+++ libcanberra.spec	1 Apr 2009 00:31:47 -0000	1.24
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.11
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -19,7 +19,7 @@
 BuildRequires: gettext-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
-Patch0: febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
+Patch0: ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -120,6 +120,9 @@
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-9
+- Another preview for 0.12
+
 * Wed Feb 25 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-8
 - Add missing dependency on gettext-devel
 



From lennart at fedoraproject.org  Wed Apr  1 00:33:08 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  1 Apr 2009 00:33:08 +0000 (UTC)
Subject: rpms/libcanberra/devel
	febbf740799d85dfbdca965efa9867fd70fa2cfc.patch, 1.1, NONE
Message-ID: <20090401003308.8AFF17011D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8913

Removed Files:
	febbf740799d85dfbdca965efa9867fd70fa2cfc.patch 
Log Message:
remove obsolete patch


--- febbf740799d85dfbdca965efa9867fd70fa2cfc.patch DELETED ---



From Valentine at hall-mark.us.redhat.com  Wed Apr  1 01:41:20 2009
From: Valentine at hall-mark.us.redhat.com (hallmark.com)
Date: Wed, 01 Apr 2009 03:41:20 +0200
Subject: You've received A Hallmark Valentine-Card!
Message-ID: <E1LopSC-00020k-08@europe.pianetaedizioni.com>

An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20090401/0289d042/attachment.htm>

From cebbert at fedoraproject.org  Wed Apr  1 01:05:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  1 Apr 2009 01:05:06 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1495,1.1496
Message-ID: <20090401010506.72D9D7011D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16209

Modified Files:
	kernel.spec 
Log Message:
add version to changelog


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1495
retrieving revision 1.1496
diff -u -r1.1495 -r1.1496
--- kernel.spec	1 Apr 2009 00:24:57 -0000	1.1495
+++ kernel.spec	1 Apr 2009 01:04:35 -0000	1.1496
@@ -1867,7 +1867,7 @@
 # and build.
 
 %changelog
-* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com>
+* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-34.rc1
 - linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support
 
 * Tue Mar 31 2009 Chuck Ebbert <cebbert at redhat.com>



From cwickert at fedoraproject.org  Wed Apr  1 01:07:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  1 Apr 2009 01:07:24 +0000 (UTC)
Subject: rpms/beldi/devel .cvsignore, 1.7, 1.8 beldi.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20090401010724.8DB0C7011D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/beldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16913

Modified Files:
	.cvsignore beldi.spec sources 
Log Message:
* Wed Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.24-1
- Upgrade to 0.9.24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Oct 2008 18:39:58 -0000	1.7
+++ .cvsignore	1 Apr 2009 01:06:54 -0000	1.8
@@ -1 +1 @@
-beldi-0.9.23.tgz
+beldi-0.9.24.tar.gz


Index: beldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/devel/beldi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- beldi.spec	24 Feb 2009 04:26:44 -0000	1.8
+++ beldi.spec	1 Apr 2009 01:06:54 -0000	1.9
@@ -1,14 +1,19 @@
 Summary:	Belug Linux Distribution Burner
 Name:		beldi
-Version:	0.9.23
-Release:	2%{?dist}
+Version:	0.9.24
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 URL:		http://belug.de/~beldi/
-Source:		http://belug.de/~beldi/releases/%{name}-%{version}.tgz
+Source:		http://belug.de/~beldi/releases/%{name}-%{version}.tar.gz
 Requires:	%{_bindir}/cdrecord
-BuildRequires:	curl-devel, gtkmm24-devel, libxml++-devel
-BuildRequires:	gtkglextmm-devel, desktop-file-utils, gettext
+BuildRequires:	curl-devel
+BuildRequires:	gtkmm24-devel
+BuildRequires:	libxml++-devel
+BuildRequires:	openssl-devel
+BuildRequires:	gtkglextmm-devel	
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -52,6 +57,9 @@
 %{_mandir}/man6/%{name}.6.gz
 
 %changelog
+* Wed Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.24-1
+- Upgrade to 0.9.24
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beldi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Oct 2008 18:39:58 -0000	1.7
+++ sources	1 Apr 2009 01:06:54 -0000	1.8
@@ -1 +1 @@
-b38613e7264dc17e7255ed774df6479a  beldi-0.9.23.tgz
+fed4c219ffcf50be1d7ff53be51cf6f5  beldi-0.9.24.tar.gz



From suravee at fedoraproject.org  Wed Apr  1 01:07:52 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Wed,  1 Apr 2009 01:07:52 +0000 (UTC)
Subject: rpms/CodeAnalyst-gui/devel CodeAnalyst-gui.spec,1.2,1.3
Message-ID: <20090401010752.AA5317011D@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/rpms/CodeAnalyst-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16865

Modified Files:
	CodeAnalyst-gui.spec 
Log Message:
Bump release number, and add changelog



Index: CodeAnalyst-gui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/CodeAnalyst-gui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CodeAnalyst-gui.spec	30 Mar 2009 17:33:08 -0000	1.2
+++ CodeAnalyst-gui.spec	1 Apr 2009 01:07:22 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:       CodeAnalyst is a Performance Analysis Suite for AMD-based System
 Name:          CodeAnalyst-gui
 Version:       2.8.38
-Release:       9%{?dist}.1
+Release:       10%{?dist}
 License:       GPLv2
 Group:         Development/System
 URL:           http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux
@@ -155,6 +155,10 @@
 
 
 %changelog
+* Tue Mar 31 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
+- 2.8.38-10
+- Rebuild with new libbfd-2.19.51.0.2-16.fc11.so
+
 * Thu Mar 12 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
 - 2.8.38-9
 - Disable dwarf



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:20 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchbugzilla
Message-ID: <20090401011819.561D5208510@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:21 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchcommits
Message-ID: <20090401011821.54EB3208551@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:27 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested commit
Message-ID: <20090401011826.060E8208557@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:14 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested approveacls
Message-ID: <20090401011830.60E35208604@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:34 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchbugzilla
Message-ID: <20090401011833.8EF8B208608@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:35 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchcommits
Message-ID: <20090401011835.AC8CC20860F@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:21 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested commit
Message-ID: <20090401011837.8209B2086F3@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:40 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested approveacls
Message-ID: <20090401011840.1CA97208706@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:46 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested approveacls
Message-ID: <20090401011845.1A491208550@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:31 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested commit
Message-ID: <20090401011847.BB3BA20871A@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:49 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchcommits
Message-ID: <20090401011849.4E816208743@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:51 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchbugzilla
Message-ID: <20090401011852.AEC5420876C@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:59 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested approveacls
Message-ID: <20090401011858.E97F7208556@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:18:45 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested commit
Message-ID: <20090401011901.59A9D20876E@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:03 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchcommits
Message-ID: <20090401011903.0E2EE2087F4@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:05 +0000
Subject: [pkgdb] fedora-ds-console: rmeggins has requested watchbugzilla
Message-ID: <20090401011905.A62C22087F6@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:28 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested commit
Message-ID: <20090401011929.4836B2086F1@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-admin-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:09 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested approveacls
Message-ID: <20090401011925.9C6642086EF@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-admin-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:30 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested watchcommits
Message-ID: <20090401011930.28E472086FE@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-admin-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:35 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested
	watchbugzilla
Message-ID: <20090401011934.CB2E320892C@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-admin-console (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:20 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested approveacls
Message-ID: <20090401011937.719B6208932@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-admin-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:38 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested commit
Message-ID: <20090401011938.DFEBE208936@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-admin-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:43 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested watchcommits
Message-ID: <20090401011942.1EBD2208706@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-admin-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:28 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested
	watchbugzilla
Message-ID: <20090401011944.113D8208938@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-admin-console (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:46 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested approveacls
Message-ID: <20090401011945.7F4A720893A@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-admin-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:50 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested watchcommits
Message-ID: <20090401011949.781CA208940@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-admin-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:46 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested commit
Message-ID: <20090401011947.407AA20893F@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-admin-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:35 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested
	watchbugzilla
Message-ID: <20090401011952.6788B208944@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-admin-console (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:53 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested approveacls
Message-ID: <20090401011953.69FB1208514@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds-admin-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:55 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested commit
Message-ID: <20090401011955.35F49208947@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds-admin-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:58 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested watchcommits
Message-ID: <20090401011959.1E56C208551@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds-admin-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:19:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:19:44 +0000
Subject: [pkgdb] fedora-ds-admin-console: rmeggins has requested
	watchbugzilla
Message-ID: <20090401012000.6C10C20894E@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds-admin-console (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:00 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested approveacls
Message-ID: <20090401012016.BEEDC208743@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:18 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested commit
Message-ID: <20090401012018.62EBD20876C@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:19 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchcommits
Message-ID: <20090401012019.66799208951@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:05 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested approveacls
Message-ID: <20090401012021.D8D60208957@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:22 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested commit
Message-ID: <20090401012022.212A220895A@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:23 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchcommits
Message-ID: <20090401012023.8D97020895E@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:08 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested approveacls
Message-ID: <20090401012024.284B5208962@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:24 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchbugzilla
Message-ID: <20090401012024.67B2D208557@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:25 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested commit
Message-ID: <20090401012024.8D43220896B@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:26 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchbugzilla
Message-ID: <20090401012025.36017208971@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:28 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchbugzilla
Message-ID: <20090401012027.0B856208C45@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:25 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchcommits
Message-ID: <20090401012025.8B604208C46@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:11 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested approveacls
Message-ID: <20090401012027.6C482208C49@bastion.fedora.phx.redhat.com>

rmeggins has requested the approveacls acl on fedora-ds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:28 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested commit
Message-ID: <20090401012027.F12AB208C4C@bastion.fedora.phx.redhat.com>

rmeggins has requested the commit acl on fedora-ds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:14 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchbugzilla
Message-ID: <20090401012030.D2279208C5D@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchbugzilla acl on fedora-ds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 01:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:20:31 +0000
Subject: [pkgdb] fedora-ds: rmeggins has requested watchcommits
Message-ID: <20090401012031.8E34F208C61@bastion.fedora.phx.redhat.com>

rmeggins has requested the watchcommits acl on fedora-ds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From lennart at fedoraproject.org  Wed Apr  1 01:26:25 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  1 Apr 2009 01:26:25 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.31, 1.32 pulseaudio.spec, 1.76, 
	1.77 sources, 1.32, 1.33
Message-ID: <20090401012625.739087011D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21656

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
New test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Mar 2009 23:29:07 -0000	1.31
+++ .cvsignore	1 Apr 2009 01:25:55 -0000	1.32
@@ -1 +1 @@
-pulseaudio-0.9.15-test6.tar.gz
+pulseaudio-0.9.15-test7.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- pulseaudio.spec	1 Apr 2009 00:04:07 -0000	1.76
+++ pulseaudio.spec	1 Apr 2009 01:25:55 -0000	1.77
@@ -3,10 +3,10 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	6.test6%{?dist}
+Release:	7.test7%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
-Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
+Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -185,7 +185,7 @@
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.15-test6
+%setup -q -T -b0 -n pulseaudio-0.9.15-test7
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -406,6 +406,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-7.test7
+- New test release
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-6.test6
 - Fix mistag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	31 Mar 2009 23:29:07 -0000	1.32
+++ sources	1 Apr 2009 01:25:55 -0000	1.33
@@ -1 +1 @@
-2f96ad490209170aa22d5d2286e1718e  pulseaudio-0.9.15-test6.tar.gz
+411d7c85bb58f351b8120c876eb43317  pulseaudio-0.9.15-test7.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 01:27:53 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 01:27:53 +0000 (UTC)
Subject: rpms/nikto/devel nikto-2.03-libwhisker2.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 nikto.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090401012753.892FD7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/nikto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22110

Modified Files:
	.cvsignore nikto.spec sources 
Added Files:
	nikto-2.03-libwhisker2.patch 
Log Message:
new upstream release

nikto-2.03-libwhisker2.patch:

--- NEW FILE nikto-2.03-libwhisker2.patch ---
diff -up ./nikto.pl.orig ./nikto.pl
--- ./nikto.pl.orig	2009-04-01 03:13:26.000000000 +0200
+++ ./nikto.pl	2009-04-01 03:13:44.000000000 +0200
@@ -68,9 +68,9 @@ require "$NIKTO{plugindir}/nikto_core.pl
 nprint("T:$STARTTIME: Starting", "d");
 require "$NIKTO{plugindir}/nikto_reports.plugin";    ### Change this line if your setup is having trouble finding it
 require "$NIKTO{plugindir}/nikto_single.plugin";     ### Change this line if your setup is having trouble finding it
-require "$NIKTO{plugindir}/LW2.pm";                  ### Change this line if your setup is having trouble finding it
+#require "$NIKTO{plugindir}/LW2.pm";                  ### Change this line if your setup is having trouble finding it
 
-# use LW2;					     ### Change this line to use a different installed version
+use LW2;					     ### Change this line to use a different installed version
 
 ($a, $b) = split(/\./, $LW2::VERSION);
 die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2007 16:32:02 -0000	1.2
+++ .cvsignore	1 Apr 2009 01:27:23 -0000	1.3
@@ -1 +1 @@
-nikto-1.36.tar.bz2
+nikto-2.03.tar.bz2


Index: nikto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/devel/nikto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nikto.spec	26 Feb 2009 05:43:38 -0000	1.3
+++ nikto.spec	1 Apr 2009 01:27:23 -0000	1.4
@@ -1,15 +1,15 @@
 Name:           nikto
-Version:        1.36
-Release:        5%{?dist}
+Version:        2.03
+Release:        1%{?dist}
 Summary:        Web server scanner 
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.cirt.net/code/nikto.shtml
-Source0:        http://www.cirt.net/nikto/%{name}-%{version}.tar.bz2
-#use system libwhisker
+Source0:        http://www.cirt.net/nikto2/%{name}-%{version}.tar.bz2
 Source1:        nikto-database-license.txt
-Patch0:         nikto-1.36-libwhisker.patch
+#use system libwhisker2
+Patch0:         nikto-2.03-libwhisker2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,7 +24,7 @@
 can be automatically updated (if desired).
 
 %prep
-%setup -q
+%setup -qn %{name}
 %patch0 -p1
 
 #change configfile path
@@ -39,15 +39,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cp %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}/database-license.txt
+cp %{SOURCE1} $RPM_BUILD_DIR/%{name}/database-license.txt
 install -pD nikto.pl $RPM_BUILD_ROOT%{_bindir}/nikto
-install -m 0644 -pD docs/nikto-%{version}.man $RPM_BUILD_ROOT%{_mandir}/man1/nikto.1
+install -m 0644 -pD docs/nikto.1 $RPM_BUILD_ROOT%{_mandir}/man1/nikto.1
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/
 install -m 0644 -p plugins/* $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/nikto/templates/
+install -m 0644 -p templates/* $RPM_BUILD_ROOT%{_datadir}/nikto/templates/
 install -m 0644 -pD config.txt $RPM_BUILD_ROOT%{_sysconfdir}/nikto/config
 
 #remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/LW.pm
+rm -f $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/LW2.pm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,7 +57,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs/CHANGES.txt docs/LICENSE.txt docs/README_plugins.txt database-license.txt
+%doc docs/CHANGES.txt docs/LICENSE.txt database-license.txt
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/nikto
 %{_datadir}/nikto
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 2.03-1
+- New upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2007 16:32:02 -0000	1.2
+++ sources	1 Apr 2009 01:27:23 -0000	1.3
@@ -1 +1 @@
-d70107deb225489ecf20e2b46684674e  nikto-1.36.tar.bz2
+8f286a7943b12a341088f005f832d087  nikto-2.03.tar.bz2



From pkgdb at fedoraproject.org  Wed Apr  1 01:30:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:30:17 +0000
Subject: [pkgdb] reiserfs-utils ownership updated
Message-ID: <20090401013017.34B67208557@bastion.fedora.phx.redhat.com>

Package reiserfs-utils in Fedora 10 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/reiserfs-utils



From pkgdb at fedoraproject.org  Wed Apr  1 01:30:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:30:16 +0000
Subject: [pkgdb] reiserfs-utils ownership updated
Message-ID: <20090401013015.6D90C208555@bastion.fedora.phx.redhat.com>

Package reiserfs-utils in Fedora 9 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/reiserfs-utils



From pkgdb at fedoraproject.org  Wed Apr  1 01:29:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 01:29:55 +0000
Subject: [pkgdb] reiserfs-utils ownership updated
Message-ID: <20090401013011.5725E208551@bastion.fedora.phx.redhat.com>

Package reiserfs-utils in Fedora devel is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/reiserfs-utils



From sindrepb at fedoraproject.org  Wed Apr  1 01:38:36 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 01:38:36 +0000 (UTC)
Subject: rpms/nikto/F-10 nikto-2.03-libwhisker2.patch, NONE, 1.1 nikto.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090401013836.2F3C07011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/nikto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25150

Modified Files:
	nikto.spec sources 
Added Files:
	nikto-2.03-libwhisker2.patch 
Log Message:
new upstream release

nikto-2.03-libwhisker2.patch:

--- NEW FILE nikto-2.03-libwhisker2.patch ---
diff -up ./nikto.pl.orig ./nikto.pl
--- ./nikto.pl.orig	2009-04-01 03:13:26.000000000 +0200
+++ ./nikto.pl	2009-04-01 03:13:44.000000000 +0200
@@ -68,9 +68,9 @@ require "$NIKTO{plugindir}/nikto_core.pl
 nprint("T:$STARTTIME: Starting", "d");
 require "$NIKTO{plugindir}/nikto_reports.plugin";    ### Change this line if your setup is having trouble finding it
 require "$NIKTO{plugindir}/nikto_single.plugin";     ### Change this line if your setup is having trouble finding it
-require "$NIKTO{plugindir}/LW2.pm";                  ### Change this line if your setup is having trouble finding it
+#require "$NIKTO{plugindir}/LW2.pm";                  ### Change this line if your setup is having trouble finding it
 
-# use LW2;					     ### Change this line to use a different installed version
+use LW2;					     ### Change this line to use a different installed version
 
 ($a, $b) = split(/\./, $LW2::VERSION);
 die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);


Index: nikto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/F-10/nikto.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nikto.spec	26 Aug 2008 22:59:20 -0000	1.2
+++ nikto.spec	1 Apr 2009 01:38:05 -0000	1.3
@@ -1,15 +1,15 @@
 Name:           nikto
-Version:        1.36
-Release:        4%{?dist}
+Version:        2.03
+Release:        1%{?dist}
 Summary:        Web server scanner 
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.cirt.net/code/nikto.shtml
-Source0:        http://www.cirt.net/nikto/%{name}-%{version}.tar.bz2
-#use system libwhisker
+Source0:        http://www.cirt.net/nikto2/%{name}-%{version}.tar.bz2
 Source1:        nikto-database-license.txt
-Patch0:         nikto-1.36-libwhisker.patch
+#use system libwhisker2
+Patch0:         nikto-2.03-libwhisker2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,7 +24,7 @@
 can be automatically updated (if desired).
 
 %prep
-%setup -q
+%setup -qn %{name}
 %patch0 -p1
 
 #change configfile path
@@ -39,15 +39,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cp %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}/database-license.txt
+cp %{SOURCE1} $RPM_BUILD_DIR/%{name}/database-license.txt
 install -pD nikto.pl $RPM_BUILD_ROOT%{_bindir}/nikto
-install -m 0644 -pD docs/nikto-%{version}.man $RPM_BUILD_ROOT%{_mandir}/man1/nikto.1
+install -m 0644 -pD docs/nikto.1 $RPM_BUILD_ROOT%{_mandir}/man1/nikto.1
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/
 install -m 0644 -p plugins/* $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/nikto/templates/
+install -m 0644 -p templates/* $RPM_BUILD_ROOT%{_datadir}/nikto/templates/
 install -m 0644 -pD config.txt $RPM_BUILD_ROOT%{_sysconfdir}/nikto/config
 
 #remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/LW.pm
+rm -f $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/LW2.pm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,7 +57,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs/CHANGES.txt docs/LICENSE.txt docs/README_plugins.txt database-license.txt
+%doc docs/CHANGES.txt docs/LICENSE.txt database-license.txt
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/nikto
 %{_datadir}/nikto
@@ -63,6 +65,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 2.03-1
+- New upstream release
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.36-4
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2007 16:32:02 -0000	1.2
+++ sources	1 Apr 2009 01:38:05 -0000	1.3
@@ -1 +1 @@
-d70107deb225489ecf20e2b46684674e  nikto-1.36.tar.bz2
+8f286a7943b12a341088f005f832d087  nikto-2.03.tar.bz2



From nucleo at fedoraproject.org  Wed Apr  1 01:41:27 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Wed,  1 Apr 2009 01:41:27 +0000 (UTC)
Subject: rpms/knemo/devel .cvsignore, 1.7, 1.8 knemo.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <20090401014127.3EF6C7011D@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25939

Modified Files:
	.cvsignore knemo.spec sources 
Log Message:
Update to version 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Mar 2009 19:28:11 -0000	1.7
+++ .cvsignore	1 Apr 2009 01:40:56 -0000	1.8
@@ -1 +1 @@
-12956-knemo-0.5.1.tar.gz
+12956-knemo-0.5.2.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/knemo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- knemo.spec	17 Mar 2009 15:52:16 -0000	1.15
+++ knemo.spec	1 Apr 2009 01:40:56 -0000	1.16
@@ -1,16 +1,15 @@
 Name:             knemo
-Version:          0.5.1
-Release:          5%{?dist}
+Version:          0.5.2
+Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
-License:          GPLv2
+License:          GPLv2+
 URL:              http://extragear.kde.org/apps/knemo/
-Source0:          http://kde-apps.org/content/files/12956-%{name}-%{version}.tar.gz
-Patch0:           knemo-git-2009-03-14.patch
+Source0:          http://kde-apps.org/CONTENT/content-files/12956-%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake desktop-file-utils gettext
-BuildRequires:    kdelibs-devel wireless-tools-devel net-tools
-Requires:         kdelibs wireless-tools net-tools
+BuildRequires:    kdelibs4-devel wireless-tools-devel net-tools
+Requires:         wireless-tools net-tools
 Requires(post):   xdg-utils
 Requires(postun): xdg-utils
 
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -40,7 +38,6 @@
 
 desktop-file-install \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
-    --remove-key=Path \
     $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
 
 %find_lang %{name}
@@ -70,6 +67,10 @@
 %{_kde4_iconsdir}/hicolor/*/apps/knemo.*
 
 %changelog
+* Wed Apr  1 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.2-1
+- Update to version 0.5.2
+- Fixed spec License and URL fields
+
 * Tue Mar 17 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.1-5
 - Upstream update from git.mehercule.net
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Mar 2009 19:28:12 -0000	1.8
+++ sources	1 Apr 2009 01:40:56 -0000	1.9
@@ -1 +1 @@
-5968cde508282ca5cee84dce64c928fa  12956-knemo-0.5.1.tar.gz
+ab4c9519f5dcfe46530edf3d9f24b647  12956-knemo-0.5.2.tar.gz



From nucleo at fedoraproject.org  Wed Apr  1 01:46:12 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Wed,  1 Apr 2009 01:46:12 +0000 (UTC)
Subject: rpms/knemo/devel knemo-git-2009-03-14.patch,1.1,NONE
Message-ID: <20090401014612.4C5827011D@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26916

Removed Files:
	knemo-git-2009-03-14.patch 
Log Message:
Update to version 0.5.2


--- knemo-git-2009-03-14.patch DELETED ---



From nucleo at fedoraproject.org  Wed Apr  1 01:49:56 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Wed,  1 Apr 2009 01:49:56 +0000 (UTC)
Subject: rpms/knemo/F-9 .cvsignore, 1.7, 1.8 knemo.spec, 1.14, 1.15 sources, 
	1.8, 1.9 knemo-git-2009-03-14.patch, 1.1, NONE
Message-ID: <20090401014956.CFDDA7011D@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27414

Modified Files:
	.cvsignore knemo.spec sources 
Removed Files:
	knemo-git-2009-03-14.patch 
Log Message:
Update to version 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Mar 2009 13:21:39 -0000	1.7
+++ .cvsignore	1 Apr 2009 01:49:26 -0000	1.8
@@ -1 +1 @@
-12956-knemo-0.5.1.tar.gz
+12956-knemo-0.5.2.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-9/knemo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- knemo.spec	17 Mar 2009 16:04:23 -0000	1.14
+++ knemo.spec	1 Apr 2009 01:49:26 -0000	1.15
@@ -1,16 +1,15 @@
 Name:             knemo
-Version:          0.5.1
-Release:          5%{?dist}
+Version:          0.5.2
+Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
-License:          GPLv2
+License:          GPLv2+
 URL:              http://extragear.kde.org/apps/knemo/
-Source0:          http://kde-apps.org/content/files/12956-%{name}-%{version}.tar.gz
-Patch0:           knemo-git-2009-03-14.patch
+Source0:          http://kde-apps.org/CONTENT/content-files/12956-%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake desktop-file-utils gettext
-BuildRequires:    kdelibs-devel wireless-tools-devel net-tools
-Requires:         kdelibs wireless-tools net-tools
+BuildRequires:    kdelibs4-devel wireless-tools-devel net-tools
+Requires:         wireless-tools net-tools
 Requires(post):   xdg-utils
 Requires(postun): xdg-utils
 
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -40,7 +38,6 @@
 
 desktop-file-install \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
-    --remove-key=Path \
     $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
 
 %find_lang %{name}
@@ -70,6 +67,10 @@
 %{_kde4_iconsdir}/hicolor/*/apps/knemo.*
 
 %changelog
+* Wed Apr  1 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.2-1
+- Update to version 0.5.2
+- Fixed spec License and URL fields
+
 * Tue Mar 17 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.1-5
 - Upstream update from git.mehercule.net
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Mar 2009 13:21:39 -0000	1.8
+++ sources	1 Apr 2009 01:49:26 -0000	1.9
@@ -1 +1 @@
-5968cde508282ca5cee84dce64c928fa  12956-knemo-0.5.1.tar.gz
+ab4c9519f5dcfe46530edf3d9f24b647  12956-knemo-0.5.2.tar.gz


--- knemo-git-2009-03-14.patch DELETED ---



From nucleo at fedoraproject.org  Wed Apr  1 01:53:40 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Wed,  1 Apr 2009 01:53:40 +0000 (UTC)
Subject: rpms/knemo/F-10 .cvsignore, 1.7, 1.8 knemo.spec, 1.15, 1.16 sources,
	1.8, 1.9 knemo-git-2009-03-14.patch, 1.1, NONE
Message-ID: <20090401015340.943E77011D@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28208

Modified Files:
	.cvsignore knemo.spec sources 
Removed Files:
	knemo-git-2009-03-14.patch 
Log Message:
Update to version 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Mar 2009 19:28:11 -0000	1.7
+++ .cvsignore	1 Apr 2009 01:53:10 -0000	1.8
@@ -1 +1 @@
-12956-knemo-0.5.1.tar.gz
+12956-knemo-0.5.2.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-10/knemo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- knemo.spec	17 Mar 2009 16:12:27 -0000	1.15
+++ knemo.spec	1 Apr 2009 01:53:10 -0000	1.16
@@ -1,16 +1,15 @@
 Name:             knemo
-Version:          0.5.1
-Release:          5%{?dist}
+Version:          0.5.2
+Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
-License:          GPLv2
+License:          GPLv2+
 URL:              http://extragear.kde.org/apps/knemo/
-Source0:          http://kde-apps.org/content/files/12956-%{name}-%{version}.tar.gz
-Patch0:           knemo-git-2009-03-14.patch
+Source0:          http://kde-apps.org/CONTENT/content-files/12956-%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake desktop-file-utils gettext
-BuildRequires:    kdelibs-devel wireless-tools-devel net-tools
-Requires:         kdelibs wireless-tools net-tools
+BuildRequires:    kdelibs4-devel wireless-tools-devel net-tools
+Requires:         wireless-tools net-tools
 Requires(post):   xdg-utils
 Requires(postun): xdg-utils
 
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -40,7 +38,6 @@
 
 desktop-file-install \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
-    --remove-key=Path \
     $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
 
 %find_lang %{name}
@@ -70,6 +67,10 @@
 %{_kde4_iconsdir}/hicolor/*/apps/knemo.*
 
 %changelog
+* Wed Apr  1 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.2-1
+- Update to version 0.5.2
+- Fixed spec License and URL fields
+
 * Tue Mar 17 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.1-5
 - Upstream update from git.mehercule.net
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Mar 2009 19:28:12 -0000	1.8
+++ sources	1 Apr 2009 01:53:10 -0000	1.9
@@ -1 +1 @@
-5968cde508282ca5cee84dce64c928fa  12956-knemo-0.5.1.tar.gz
+ab4c9519f5dcfe46530edf3d9f24b647  12956-knemo-0.5.2.tar.gz


--- knemo-git-2009-03-14.patch DELETED ---



From sindrepb at fedoraproject.org  Wed Apr  1 02:07:05 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 02:07:05 +0000 (UTC)
Subject: rpms/perl-Net-Pcap/devel .cvsignore, 1.2, 1.3 perl-Net-Pcap.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090401020705.173777011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/perl-Net-Pcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31611

Modified Files:
	.cvsignore perl-Net-Pcap.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 May 2007 23:25:49 -0000	1.2
+++ .cvsignore	1 Apr 2009 02:06:34 -0000	1.3
@@ -1 +1 @@
-Net-Pcap-0.14.tar.gz
+Net-Pcap-0.16.tar.gz


Index: perl-Net-Pcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/devel/perl-Net-Pcap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-Pcap.spec	26 Feb 2009 23:18:04 -0000	1.4
+++ perl-Net-Pcap.spec	1 Apr 2009 02:06:34 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-Pcap
-Version:        0.14
-Release:        5%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Interface to pcap(3) LBL packet capture library
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.16-1
+- New upstream release
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 May 2007 23:25:49 -0000	1.2
+++ sources	1 Apr 2009 02:06:34 -0000	1.3
@@ -1 +1 @@
-80a4b62911cded1a011b897f735d445e  Net-Pcap-0.14.tar.gz
+b150d8e0a40137fad2a7df792d80cab4  Net-Pcap-0.16.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 02:14:55 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 02:14:55 +0000 (UTC)
Subject: rpms/perl-Nmap-Parser/EL-4 perl-Nmap-Parser.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <20090401021455.8DCB97011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv623

Modified Files:
	perl-Nmap-Parser.spec sources 
Log Message:
new upstream release


Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/EL-4/perl-Nmap-Parser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Nmap-Parser.spec	3 Aug 2008 15:15:12 -0000	1.2
+++ perl-Nmap-Parser.spec	1 Apr 2009 02:14:25 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Nmap-Parser
-Version:        1.16
+Version:        1.19
 Release:        1%{?dist}
 Summary:        Parse nmap scan data with perl
 
@@ -11,7 +11,6 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(XML::Twig), perl(ExtUtils::MakeMaker), perl(Test::More)
-BuildRequires:  /usr/bin/dos2unix
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -26,8 +25,8 @@
 %setup -qn Nmap-Parser-%{version}
 
 #fix end-of-line encoding
-/usr/bin/dos2unix $RPM_BUILD_DIR/Nmap-Parser-%{version}/README
-/usr/bin/dos2unix $RPM_BUILD_DIR/Nmap-Parser-%{version}/Parser.pm
+sed -i 's/\r//' $RPM_BUILD_DIR/Nmap-Parser-%{version}/README
+sed -i 's/\r//' $RPM_BUILD_DIR/Nmap-Parser-%{version}/Parser.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -41,6 +40,10 @@
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+install -D -m 755 tools/nmap2sqlite.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/nmap2sqlite.pl
+install -m 755 tools/pdev.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/pdev.pl
+install -m 755 tools/scan.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/scan.pl
+
 #fix permissions
 chmod 0644 $RPM_BUILD_DIR/Nmap-Parser-%{version}/README
 chmod 0644 $RPM_BUILD_DIR/Nmap-Parser-%{version}/LICENSE
@@ -59,11 +62,21 @@
 %defattr(-,root,root,-)
 %doc LICENSE README
 %{perl_vendorlib}/*
+%{_datadir}/*
 %{_mandir}/man3/*.3*
 
 %changelog
-* Sun Aug 03 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.16-1
+* Tue Mar 04 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org>
+- New upstream release
+- Fix typo in manual install
+- Don't use dos2unix, rely on sed magic instead
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Aug 03 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.16-2
 - New release, 1.16
+- Add data files
 
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.05-5
 Rebuild for new perl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Aug 2008 15:15:12 -0000	1.3
+++ sources	1 Apr 2009 02:14:25 -0000	1.4
@@ -1 +1 @@
-0d663caf90de3cd6c85ba1a1f6c36f7f  Nmap-Parser-1.16.tar.gz
+79e50c9e325b1920545eb4a07e2f5b10  Nmap-Parser-1.19.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 02:17:20 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 02:17:20 +0000 (UTC)
Subject: rpms/perl-Nmap-Parser/EL-5 perl-Nmap-Parser.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <20090401021720.69FDF7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1101

Modified Files:
	perl-Nmap-Parser.spec sources 
Log Message:
new upstream release


Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/EL-5/perl-Nmap-Parser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Nmap-Parser.spec	3 Aug 2008 15:15:33 -0000	1.2
+++ perl-Nmap-Parser.spec	1 Apr 2009 02:16:50 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Nmap-Parser
-Version:        1.16
+Version:        1.19
 Release:        1%{?dist}
 Summary:        Parse nmap scan data with perl
 
@@ -11,7 +11,6 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(XML::Twig), perl(ExtUtils::MakeMaker), perl(Test::More)
-BuildRequires:  /usr/bin/dos2unix
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -26,8 +25,8 @@
 %setup -qn Nmap-Parser-%{version}
 
 #fix end-of-line encoding
-/usr/bin/dos2unix $RPM_BUILD_DIR/Nmap-Parser-%{version}/README
-/usr/bin/dos2unix $RPM_BUILD_DIR/Nmap-Parser-%{version}/Parser.pm
+sed -i 's/\r//' $RPM_BUILD_DIR/Nmap-Parser-%{version}/README
+sed -i 's/\r//' $RPM_BUILD_DIR/Nmap-Parser-%{version}/Parser.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -41,6 +40,10 @@
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+install -D -m 755 tools/nmap2sqlite.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/nmap2sqlite.pl
+install -m 755 tools/pdev.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/pdev.pl
+install -m 755 tools/scan.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/scan.pl
+
 #fix permissions
 chmod 0644 $RPM_BUILD_DIR/Nmap-Parser-%{version}/README
 chmod 0644 $RPM_BUILD_DIR/Nmap-Parser-%{version}/LICENSE
@@ -59,11 +62,21 @@
 %defattr(-,root,root,-)
 %doc LICENSE README
 %{perl_vendorlib}/*
+%{_datadir}/*
 %{_mandir}/man3/*.3*
 
 %changelog
-* Sun Aug 03 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.16-1
+* Tue Mar 04 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org>
+- New upstream release
+- Fix typo in manual install
+- Don't use dos2unix, rely on sed magic instead
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Aug 03 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.16-2
 - New release, 1.16
+- Add data files
 
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.05-5
 Rebuild for new perl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Aug 2008 15:15:33 -0000	1.3
+++ sources	1 Apr 2009 02:16:50 -0000	1.4
@@ -1 +1 @@
-0d663caf90de3cd6c85ba1a1f6c36f7f  Nmap-Parser-1.16.tar.gz
+79e50c9e325b1920545eb4a07e2f5b10  Nmap-Parser-1.19.tar.gz



From transif at fedoraproject.org  Wed Apr  1 02:34:33 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 02:34:33 +0000 (UTC)
Subject: comps/po zh_TW.po,1.22,1.23
Message-ID: <20090401023433.D1FB07011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5060/po

Modified Files:
	zh_TW.po 
Log Message:
Sending translation for Chinese (Traditional)


Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- zh_TW.po	9 Jan 2009 11:52:43 -0000	1.22
+++ zh_TW.po	1 Apr 2009 02:34:03 -0000	1.23
@@ -1,14 +1,14 @@
-# translation of comps.HEAD.po to Traditional Chinese
-# Terry Chuang <tchuang at redhat.com>, 2008.
+# translation of comps.HEAD.po to
+# Terry Chuang <tchuang at redhat.com>, 2008, 2009.
 # translation of zh_TW.po to
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-12-05 11:30+1000\n"
+"POT-Creation-Date: 2009-03-31 19:25+0000\n"
+"PO-Revision-Date: 2009-04-01 12:33+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
-"Language-Team: Traditional Chinese <zh at li.org>\n"
+"Language-Team:  <zh at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,192 +21,192 @@
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "?????????Clustering???"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "?????????Clustering?????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ???????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "???????????????"
 
@@ -215,78 +215,78 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ?????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora ???????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -296,19 +296,19 @@
 "??????????????????"
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -317,86 +317,86 @@
 "???????????????"
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -404,76 +404,74 @@
 msgstr "??????????????????????????? GTK+ ??? GNOME ?????????????????????"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "??????????????????????????? GTK+ ??? XFCE ?????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "??????????????????????????? QT ??? KDE ?????????????????????"
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????????????????????????????????????????????X?????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE ????????????"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -482,121 +480,121 @@
 "????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ?????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????/???????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -604,111 +602,110 @@
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -717,77 +714,77 @@
 "??? Vi???"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????????"
 
@@ -796,68 +793,64 @@
 msgstr "Eclipse ?????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????????????????????PDF ??????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????? IMAP ??? SMTP ??????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??????????????????????????? X ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??????????????????????????????????????????????????? DHCP, Kerberos ??? NIS???"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "????????????????????????????????????????????????????????? rsh ??? telnet???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -866,52 +859,51 @@
 "them into HTML, PDF, Postscript, and text."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????????????????????????????????????????? FTP ????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
-msgstr ""
-"???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
+msgstr "???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "???????????????????????? Red Hat ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr "??????????????????????????????????????????????????????????????? / ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -919,13 +911,13 @@
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -935,30 +927,27 @@
 "????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
-msgstr ""
-"???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -968,339 +957,368 @@
 "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "???????????????????????????????????????????????? DNS ??????????????????BIND??????"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "????????????????????????????????? Linux ??? MS Windows???tm???????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????????????????????????????????????????? MySQL ????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????????????????????????????????????????? Postgresql ????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X Window ??????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "??????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "??????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "????????? Eclipse ????????????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? bitmap ?????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "???????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
 msgstr "???????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "??????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ????????? OLPC XO ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "???????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "???????????????????????????"
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskell ??????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "?????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "?????????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "???????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
 msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "??????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "???????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "??????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "?????????????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "??????????????????"
+msgstr "?????????????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "???????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "Electronic Lab?????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
 msgstr "?????????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "???????????????"
+msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????????"
+msgstr "????????????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "???????????????"
+msgstr "????????????????????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW cross-compiler"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "???????????????"
+msgstr "?????????????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "?????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Sugar ????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "????????? Feodra ?????? 32 ?????? Windows ???????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:201
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "???????????? Objective CAML ??????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1351,18 +1369,15 @@
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1370,6 +1385,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
+



From cebbert at fedoraproject.org  Wed Apr  1 02:39:42 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  1 Apr 2009 02:39:42 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1496,1.1497
Message-ID: <20090401023942.8E0207011D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6048

Modified Files:
	kernel.spec 
Log Message:
fix patch name


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1496
retrieving revision 1.1497
diff -u -r1.1496 -r1.1497
--- kernel.spec	1 Apr 2009 01:04:35 -0000	1.1496
+++ kernel.spec	1 Apr 2009 02:39:12 -0000	1.1497
@@ -644,7 +644,7 @@
 Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
 Patch604: alsa-pcm-safer-boundary-checks.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
-Patch611: linux-2.6-alsa-update-quirks.patch
+Patch611: linux-2.6.29-alsa-update-quirks.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
@@ -1867,7 +1867,7 @@
 # and build.
 
 %changelog
-* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-34.rc1
+* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-35.rc1
 - linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support
 
 * Tue Mar 31 2009 Chuck Ebbert <cebbert at redhat.com>



From sindrepb at fedoraproject.org  Wed Apr  1 02:47:20 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 02:47:20 +0000 (UTC)
Subject: rpms/perl-Net-Pcap/EL-5 perl-Net-Pcap.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090401024720.BA6D77011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/perl-Net-Pcap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7640

Modified Files:
	perl-Net-Pcap.spec sources 
Log Message:
new upstream release


Index: perl-Net-Pcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/EL-5/perl-Net-Pcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-Pcap.spec	23 May 2007 01:04:25 -0000	1.1
+++ perl-Net-Pcap.spec	1 Apr 2009 02:46:50 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Net-Pcap
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Interface to pcap(3) LBL packet capture library
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Net-Pcap/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-Pcap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +53,18 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.16-1
+- New upstream release
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.14-4
+- rebuild for new perl
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.14-3
+- Autorebuild for GCC 4.3
+
 * Tue May 08 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.14-2
 - Add missing BR
 - Chance License to GPL or Artistic


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 01:04:25 -0000	1.2
+++ sources	1 Apr 2009 02:46:50 -0000	1.3
@@ -1 +1 @@
-80a4b62911cded1a011b897f735d445e  Net-Pcap-0.14.tar.gz
+b150d8e0a40137fad2a7df792d80cab4  Net-Pcap-0.16.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 02:55:07 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 02:55:07 +0000 (UTC)
Subject: rpms/perl-Net-Pcap/EL-4 perl-Net-Pcap.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090401025507.766A37011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/perl-Net-Pcap/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9568

Modified Files:
	perl-Net-Pcap.spec sources 
Log Message:
new upstream release


Index: perl-Net-Pcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/EL-4/perl-Net-Pcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-Pcap.spec	23 May 2007 01:03:28 -0000	1.1
+++ perl-Net-Pcap.spec	1 Apr 2009 02:54:36 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Net-Pcap
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Interface to pcap(3) LBL packet capture library
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Net-Pcap/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-Pcap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +53,18 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.16-1
+- New upstream release
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.14-4
+- rebuild for new perl
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.14-3
+- Autorebuild for GCC 4.3
+
 * Tue May 08 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.14-2
 - Add missing BR
 - Chance License to GPL or Artistic


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 01:03:28 -0000	1.2
+++ sources	1 Apr 2009 02:54:36 -0000	1.3
@@ -1 +1 @@
-80a4b62911cded1a011b897f735d445e  Net-Pcap-0.14.tar.gz
+b150d8e0a40137fad2a7df792d80cab4  Net-Pcap-0.16.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 02:55:21 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 02:55:21 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb.spec,1.2,1.3
Message-ID: <20090401025521.322347011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9677

Modified Files:
	python-imdb.spec 
Log Message:
new upstream release


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-imdb.spec	26 Feb 2009 21:47:02 -0000	1.2
+++ python-imdb.spec	1 Apr 2009 02:54:50 -0000	1.3
@@ -4,8 +4,8 @@
 %define realname IMDbPY
 
 Name:           python-imdb
-Version:        3.8
-Release:        4%{?dist}
+Version:        4.0
+Release:        1%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -13,7 +13,7 @@
 URL:            http://imdbpy.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/imdbpy/%{realname}-%{version}.tar.gz
 #use system beautifulsoup
-Patch0:         %{name}-beautifulsoup.patch
+Patch0:         %{name}-%{version}-beautifulsoup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -32,7 +32,7 @@
 %patch0 -p0
 
 #patch removes need for bundled beautifulsoup, so let's remove it
-rm -f imdb/parser/http/_bsoup.py
+rm -f imdb/parser/http/bsouplxml/_bsoup.py
 
 #fix end-of-line-encoding
 %{__sed} -i 's/\r//' docs/imdbpy.cfg
@@ -56,6 +56,9 @@
 mv bin examples
 chmod 0644 examples/*
 
+#don't include these twice
+rm -f $RPM_BUILD_ROOT%{_prefix}/doc/*
+rm -f $RPM_BUILD_ROOT%{_prefix}/etc/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +72,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0
+- New upstream release
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sindrepb at fedoraproject.org  Wed Apr  1 03:07:10 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:07:10 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb-4.0-beautifulsoup.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 python-imdb.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090401030710.D74807011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12782

Modified Files:
	.cvsignore python-imdb.spec sources 
Added Files:
	python-imdb-4.0-beautifulsoup.patch 
Log Message:
new upstream release

python-imdb-4.0-beautifulsoup.patch:

--- NEW FILE python-imdb-4.0-beautifulsoup.patch ---
diff -up ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig ./imdb/parser/http/bsouplxml/bsoupxpath.py
--- ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig	2009-04-01 04:37:01.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/bsoupxpath.py	2009-04-01 04:37:46.000000000 +0200
@@ -26,8 +26,8 @@ __docformat__ = 'restructuredtext'
 
 import re
 import string
-import _bsoup as BeautifulSoup
-
+#use system BeautifulSoup
+import BeautifulSoup
 
 # XPath related enumerations and constants
 
diff -up ./imdb/parser/http/bsouplxml/etree.py.orig ./imdb/parser/http/bsouplxml/etree.py
--- ./imdb/parser/http/bsouplxml/etree.py.orig	2009-04-01 04:38:24.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/etree.py	2009-04-01 04:39:19.000000000 +0200
@@ -21,8 +21,9 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-from _bsoup import Tag as Element
+#use system BeautifulSoup
+import BeautifulSoup
+from BeautifulSoup import Tag as Element
 
 import bsoupxpath
 
diff -up ./imdb/parser/http/bsouplxml/html.py.orig ./imdb/parser/http/bsouplxml/html.py
--- ./imdb/parser/http/bsouplxml/html.py.orig	2009-04-01 04:38:14.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/html.py	2009-04-01 04:39:36.000000000 +0200
@@ -21,8 +21,8 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-
+#use system BeautifulSoup
+import BeautifulSoup
 
 def fromstring(html_string):
     """Return a DOM representation of the string."""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Dec 2008 11:38:28 -0000	1.2
+++ .cvsignore	1 Apr 2009 03:06:40 -0000	1.3
@@ -1 +1 @@
-IMDbPY-3.8.tar.gz
+IMDbPY-4.0.tar.gz


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imdb.spec	1 Apr 2009 02:54:50 -0000	1.3
+++ python-imdb.spec	1 Apr 2009 03:06:40 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           python-imdb
 Version:        4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -72,7 +72,7 @@
 
 
 %changelog
-* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-2
 - New upstream release
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Dec 2008 11:38:28 -0000	1.2
+++ sources	1 Apr 2009 03:06:40 -0000	1.3
@@ -1 +1 @@
-da982f60de30883c224fe81d7b1dfe2e  IMDbPY-3.8.tar.gz
+873fb1550f0fde04acbb297b74c94377  IMDbPY-4.0.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 03:08:40 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:08:40 +0000 (UTC)
Subject: rpms/xdotool/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xdotool.spec, 1.3, 1.4
Message-ID: <20090401030840.A64307011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/xdotool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13109

Modified Files:
	.cvsignore sources xdotool.spec 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 May 2008 20:28:08 -0000	1.2
+++ .cvsignore	1 Apr 2009 03:08:10 -0000	1.3
@@ -1 +1 @@
-xdotool-20071230.tar.gz
+xdotool-20090126.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2008 20:28:08 -0000	1.2
+++ sources	1 Apr 2009 03:08:10 -0000	1.3
@@ -1 +1 @@
-a4db4b81840db2ff806b26d36a5b6458  xdotool-20071230.tar.gz
+a520d6a3175c3b55582998cbeef81688  xdotool-20090126.tar.gz


Index: xdotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/devel/xdotool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdotool.spec	2 Mar 2009 23:23:21 -0000	1.3
+++ xdotool.spec	1 Apr 2009 03:08:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xdotool
-Version:        20071230
-Release:        4%{?dist}
+Version:        20090126 
+Release:        1%{?dist}
 Summary:        Fake keyboard/mouse input
 
 Group:          User Interface/X
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20090126-1
+- New upstream release
+
 * Mon Mar 02 2009 Caol??n McNamara <caolanm at redhat.com> - 20071230-4
 - add BuildRequires libX11-devel to build
 



From sindrepb at fedoraproject.org  Wed Apr  1 03:14:12 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:14:12 +0000 (UTC)
Subject: rpms/xdotool/devel xdotool-20090126-prefix.patch,NONE,1.1
Message-ID: <20090401031412.DCDAB7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/xdotool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14223

Added Files:
	xdotool-20090126-prefix.patch 
Log Message:


xdotool-20090126-prefix.patch:

--- NEW FILE xdotool-20090126-prefix.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2009-04-01 05:02:42.000000000 +0200
+++ ./Makefile	2009-04-01 05:04:27.000000000 +0200
@@ -1,4 +1,4 @@
-PREFIX?=/usr/local
+PREFIX?=/usr
 INSTALLBIN?=$(PREFIX)/bin
 INSTALLMAN?=$(PREFIX)/man
 
@@ -10,8 +10,8 @@ WARNFLAGS+=-pedantic -Wall -W -Wundef \
 
 CFLAGS=-pipe -std=c99 $(WARNFLAGS)
 
-DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst
-DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
+DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/lib -lX11 -lXtst
+DEFAULT_INC=-I/usr/X11R6/include -I/usr/include
 
 LIBS=`pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)"`
 INC=`pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)"`



From mjg59 at fedoraproject.org  Wed Apr  1 03:24:03 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Wed,  1 Apr 2009 03:24:03 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6.29-alsa-update-quirks.patch,1.1,1.2
Message-ID: <20090401032403.1BE517011D@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16012

Modified Files:
	linux-2.6.29-alsa-update-quirks.patch 
Log Message:
The right version of the diff, this time.


linux-2.6.29-alsa-update-quirks.patch:

Index: linux-2.6.29-alsa-update-quirks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-alsa-update-quirks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.29-alsa-update-quirks.patch	1 Apr 2009 00:24:57 -0000	1.1
+++ linux-2.6.29-alsa-update-quirks.patch	1 Apr 2009 03:24:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./include/sound/core.h.alsa ./include/sound/core.h
---- ./include/sound/core.h.alsa	2009-04-01 00:47:41.000000000 +0100
-+++ ./include/sound/core.h	2009-04-01 00:47:43.000000000 +0100
+diff -up linux-2.6.29.noarch/include/sound/core.h.alsa linux-2.6.29.noarch/include/sound/core.h
+--- linux-2.6.29.noarch/include/sound/core.h.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/include/sound/core.h	2009-04-01 04:22:00.000000000 +0100
 @@ -446,21 +446,33 @@ static inline int __snd_bug_on(int cond)
  struct snd_pci_quirk {
  	unsigned short subvendor;	/* PCI subvendor ID */
@@ -37,9 +37,9 @@
  #endif
  
  const struct snd_pci_quirk *
-diff -up ./sound/core/misc.c.alsa ./sound/core/misc.c
---- ./sound/core/misc.c.alsa	2009-04-01 00:47:41.000000000 +0100
-+++ ./sound/core/misc.c	2009-04-01 00:47:43.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/core/misc.c.alsa linux-2.6.29.noarch/sound/core/misc.c
+--- linux-2.6.29.noarch/sound/core/misc.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/core/misc.c	2009-04-01 04:22:00.000000000 +0100
 @@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci
  {
  	const struct snd_pci_quirk *q;
@@ -59,9 +59,9 @@
 -
  EXPORT_SYMBOL(snd_pci_quirk_lookup);
  #endif
-diff -up ./sound/pci/hda/patch_analog.c.alsa ./sound/pci/hda/patch_analog.c
---- ./sound/pci/hda/patch_analog.c.alsa	2009-03-23 23:12:14.000000000 +0000
-+++ ./sound/pci/hda/patch_analog.c	2009-04-01 00:52:49.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_analog.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_analog.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_analog.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_analog.c	2009-04-01 04:22:00.000000000 +0100
 @@ -1002,11 +1002,9 @@ static struct snd_pci_quirk ad1986a_cfg_
  	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
  	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
@@ -89,9 +89,9 @@
  	SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
  	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
  	{}
-diff -up ./sound/pci/hda/patch_conexant.c.alsa ./sound/pci/hda/patch_conexant.c
---- ./sound/pci/hda/patch_conexant.c.alsa	2009-04-01 00:53:24.000000000 +0100
-+++ ./sound/pci/hda/patch_conexant.c	2009-04-01 00:54:34.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c	2009-04-01 04:22:00.000000000 +0100
 @@ -1002,15 +1002,9 @@ static const char *cxt5045_models[CXT504
  };
  
@@ -121,9 +121,9 @@
  	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
  	{}
  };
-diff -up ./sound/pci/hda/patch_realtek.c.alsa ./sound/pci/hda/patch_realtek.c
---- ./sound/pci/hda/patch_realtek.c.alsa	2009-04-01 00:54:47.000000000 +0100
-+++ ./sound/pci/hda/patch_realtek.c	2009-04-01 00:57:42.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c	2009-04-01 04:22:13.000000000 +0100
 @@ -10549,15 +10549,12 @@ static const char *alc262_models[ALC262_
  static struct snd_pci_quirk alc262_cfg_tbl[] = {
  	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
@@ -146,7 +146,7 @@
  	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
  	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
  	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
-@@ -10575,17 +10572,17 @@ static struct snd_pci_quirk alc262_cfg_t
+@@ -10575,17 +10572,16 @@ static struct snd_pci_quirk alc262_cfg_t
  	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
  	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
  	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
@@ -164,13 +164,12 @@
  	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
 -	SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
 -	SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
-+        SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_TYAN),
 +        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
 +			   ALC262_ULTRA),
  	SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
  	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
  	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
-@@ -16039,9 +16036,8 @@ static struct snd_pci_quirk alc662_cfg_t
+@@ -16039,9 +16035,8 @@ static struct snd_pci_quirk alc662_cfg_t
  	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
  	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
  					ALC662_3ST_6ch_DIG),
@@ -182,9 +181,9 @@
  	{}
  };
  
-diff -up ./sound/pci/hda/patch_sigmatel.c.alsa ./sound/pci/hda/patch_sigmatel.c
---- ./sound/pci/hda/patch_sigmatel.c.alsa	2009-04-01 00:57:52.000000000 +0100
-+++ ./sound/pci/hda/patch_sigmatel.c	2009-04-01 01:00:53.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c	2009-04-01 04:22:00.000000000 +0100
 @@ -1796,18 +1796,12 @@ static struct snd_pci_quirk stac92hd71bx
  	/* SigmaTel reference board */
  	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,



From sindrepb at fedoraproject.org  Wed Apr  1 03:26:20 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:26:20 +0000 (UTC)
Subject: rpms/xdotool/F-10 xdotool-20090126-prefix.patch, NONE, 1.1 sources, 
	1.2, 1.3 xdotool.spec, 1.1, 1.2
Message-ID: <20090401032620.3F72F7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/xdotool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16635

Modified Files:
	sources xdotool.spec 
Added Files:
	xdotool-20090126-prefix.patch 
Log Message:
new upstream release

xdotool-20090126-prefix.patch:

--- NEW FILE xdotool-20090126-prefix.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2009-04-01 05:02:42.000000000 +0200
+++ ./Makefile	2009-04-01 05:04:27.000000000 +0200
@@ -1,4 +1,4 @@
-PREFIX?=/usr/local
+PREFIX?=/usr
 INSTALLBIN?=$(PREFIX)/bin
 INSTALLMAN?=$(PREFIX)/man
 
@@ -10,8 +10,8 @@ WARNFLAGS+=-pedantic -Wall -W -Wundef \
 
 CFLAGS=-pipe -std=c99 $(WARNFLAGS)
 
-DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst
-DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
+DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/lib -lX11 -lXtst
+DEFAULT_INC=-I/usr/X11R6/include -I/usr/include
 
 LIBS=`pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)"`
 INC=`pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)"`


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2008 20:28:08 -0000	1.2
+++ sources	1 Apr 2009 03:25:49 -0000	1.3
@@ -1 +1 @@
-a4db4b81840db2ff806b26d36a5b6458  xdotool-20071230.tar.gz
+a520d6a3175c3b55582998cbeef81688  xdotool-20090126.tar.gz


Index: xdotool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdotool/F-10/xdotool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdotool.spec	30 May 2008 20:28:08 -0000	1.1
+++ xdotool.spec	1 Apr 2009 03:25:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           xdotool
-Version:        20071230
-Release:        2%{?dist}
+Version:        20090126 
+Release:        1%{?dist}
 Summary:        Fake keyboard/mouse input
 
 Group:          User Interface/X
@@ -10,7 +10,7 @@
 Patch0:         %{name}-%{version}-prefix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libXtst-devel       
+BuildRequires:  libXtst-devel, libX11-devel
 
 %description
 This tool lets you programatically (or manually) simulate keyboard input
@@ -45,6 +45,15 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20090126-1
+- New upstream release
+
+* Mon Mar 02 2009 Caol??n McNamara <caolanm at redhat.com> - 20071230-4
+- add BuildRequires libX11-devel to build
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071230-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 28 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 20071230-2
 - Add patch to fix prefix
 - Add CFLAGS to %%build



From sindrepb at fedoraproject.org  Wed Apr  1 03:26:37 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:26:37 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb.spec,1.4,1.5
Message-ID: <20090401032637.EA46C7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16726

Modified Files:
	python-imdb.spec 
Log Message:
fixes


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-imdb.spec	1 Apr 2009 03:06:40 -0000	1.4
+++ python-imdb.spec	1 Apr 2009 03:26:07 -0000	1.5
@@ -4,8 +4,9 @@
 %define realname IMDbPY
 
 Name:           python-imdb
+Provides:       IMDBpy = %{version}
 Version:        4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -16,7 +17,7 @@
 Patch0:         %{name}-%{version}-beautifulsoup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, python-setuptools
 
 Requires:       python-sqlobject, python-lxml, python-BeautifulSoup
 
@@ -72,6 +73,11 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-3
+- Add Provides: upstream name
+- Add missing python-setuptools buildrequires
+
+
 * Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-2
 - New upstream release
 



From sindrepb at fedoraproject.org  Wed Apr  1 03:27:42 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:27:42 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb.spec,1.5,1.6
Message-ID: <20090401032742.2DFFC7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16919

Modified Files:
	python-imdb.spec 
Log Message:
fixes


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-imdb.spec	1 Apr 2009 03:26:07 -0000	1.5
+++ python-imdb.spec	1 Apr 2009 03:27:11 -0000	1.6
@@ -4,7 +4,7 @@
 %define realname IMDbPY
 
 Name:           python-imdb
-Provides:       IMDBpy = %{version}
+Provides:       IMDBpy = %{version}-%{release}
 Version:        4.0
 Release:        3%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database



From sindrepb at fedoraproject.org  Wed Apr  1 03:33:12 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:33:12 +0000 (UTC)
Subject: rpms/recordmydesktop/devel .cvsignore, 1.6, 1.7 recordmydesktop.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20090401033312.72F957011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/recordmydesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18131

Modified Files:
	.cvsignore recordmydesktop.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/recordmydesktop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 May 2008 14:17:40 -0000	1.6
+++ .cvsignore	1 Apr 2009 03:32:42 -0000	1.7
@@ -1 +1 @@
-recordmydesktop-0.3.7.3.tar.gz
+recordmydesktop-0.3.8.1.tar.gz


Index: recordmydesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/recordmydesktop/devel/recordmydesktop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- recordmydesktop.spec	25 Feb 2009 19:26:53 -0000	1.11
+++ recordmydesktop.spec	1 Apr 2009 03:32:42 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           recordmydesktop
-Version:        0.3.7.3
-Release:        3%{?dist}
+Version:        0.3.8.1
+Release:        1%{?dist}
 Summary:        Desktop session recorder with audio and video
 
 Group:          Applications/Multimedia
@@ -28,9 +28,9 @@
 %prep
 %setup -q
 
-chmod -x $RPM_BUILD_DIR/%{name}-%{version}/src/load_cache.c \
-         $RPM_BUILD_DIR/%{name}-%{version}/include/rmdtypes.h \
-         $RPM_BUILD_DIR/%{name}-%{version}/src/cache_frame.c
+#chmod -x $RPM_BUILD_DIR/%{name}-%{version}/src/load_cache.c \
+#         $RPM_BUILD_DIR/%{name}-%{version}/include/rmdtypes.h \
+#         $RPM_BUILD_DIR/%{name}-%{version}/src/cache_frame.c
 
 %build
 %configure
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.8.1-1
+- New upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/recordmydesktop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 May 2008 14:17:40 -0000	1.6
+++ sources	1 Apr 2009 03:32:42 -0000	1.7
@@ -1 +1 @@
-705718f5385781da17b91509721e4174  recordmydesktop-0.3.7.3.tar.gz
+6998b165540598965499bd99d8aa0eef  recordmydesktop-0.3.8.1.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 03:33:55 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:33:55 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb.spec,1.6,1.7
Message-ID: <20090401033355.AB1717013C@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18387

Modified Files:
	python-imdb.spec 
Log Message:
fixes


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-imdb.spec	1 Apr 2009 03:27:11 -0000	1.6
+++ python-imdb.spec	1 Apr 2009 03:33:25 -0000	1.7
@@ -6,7 +6,7 @@
 Name:           python-imdb
 Provides:       IMDBpy = %{version}-%{release}
 Version:        4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -73,11 +73,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-3
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-4
 - Add Provides: upstream name
 - Add missing python-setuptools buildrequires
 
-
 * Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-2
 - New upstream release
 



From sindrepb at fedoraproject.org  Wed Apr  1 03:34:19 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:34:19 +0000 (UTC)
Subject: rpms/gtk-recordmydesktop/devel .cvsignore, 1.7,
	1.8 gtk-recordmydesktop.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090401033419.BDE117011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gtk-recordmydesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18777

Modified Files:
	.cvsignore gtk-recordmydesktop.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-recordmydesktop/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 May 2008 14:22:02 -0000	1.7
+++ .cvsignore	1 Apr 2009 03:33:49 -0000	1.8
@@ -1 +1 @@
-gtk-recordmydesktop-0.3.7.2.tar.gz
+gtk-recordmydesktop-0.3.8.tar.gz


Index: gtk-recordmydesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-recordmydesktop/devel/gtk-recordmydesktop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-recordmydesktop.spec	25 Feb 2009 01:49:57 -0000	1.10
+++ gtk-recordmydesktop.spec	1 Apr 2009 03:33:49 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gtk-recordmydesktop
-Version:        0.3.7.2
-Release:        4%{?dist}
+Version:        0.3.8
+Release:        1%{?dist}
 Summary:        GUI Desktop session recorder with audio and video
 
 Group:          Applications/Multimedia
@@ -62,6 +62,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.8-1
+- New upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-recordmydesktop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 May 2008 14:22:02 -0000	1.7
+++ sources	1 Apr 2009 03:33:49 -0000	1.8
@@ -1 +1 @@
-c6fdcd99caabea041709f5e0080e2f6d  gtk-recordmydesktop-0.3.7.2.tar.gz
+2637b9be9801e0b2c3b6dae8f86a8b59  gtk-recordmydesktop-0.3.8.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 03:40:04 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:40:04 +0000 (UTC)
Subject: rpms/qt-recordmydesktop/devel .cvsignore, 1.4,
	1.5 qt-recordmydesktop.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090401034004.8A0537011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/qt-recordmydesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20413

Modified Files:
	.cvsignore qt-recordmydesktop.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-recordmydesktop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 May 2008 14:22:08 -0000	1.4
+++ .cvsignore	1 Apr 2009 03:39:34 -0000	1.5
@@ -1 +1 @@
-qt-recordmydesktop-0.3.7.2.tar.gz
+qt-recordmydesktop-0.3.8.tar.gz


Index: qt-recordmydesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-recordmydesktop/devel/qt-recordmydesktop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt-recordmydesktop.spec	25 Feb 2009 18:08:10 -0000	1.7
+++ qt-recordmydesktop.spec	1 Apr 2009 03:39:34 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qt-recordmydesktop
-Version:        0.3.7.2
-Release:        4%{?dist}
+Version:        0.3.8
+Release:        1%{?dist}
 Summary:        KDE Desktop session recorder with audio and video
 
 Group:          Applications/Multimedia
@@ -57,6 +57,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.8-1
+- New upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-recordmydesktop/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 May 2008 14:22:08 -0000	1.4
+++ sources	1 Apr 2009 03:39:34 -0000	1.5
@@ -1 +1 @@
-3b18bc3ef93e0ad529e86d44760b6eef  qt-recordmydesktop-0.3.7.2.tar.gz
+bf1525740755615ae172ae27fef68fb5  qt-recordmydesktop-0.3.8.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 03:58:22 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 03:58:22 +0000 (UTC)
Subject: rpms/python-imdb/F-10 python-imdb-4.0-beautifulsoup.patch, NONE,
	1.1 python-imdb.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090401035822.2B91D7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23423

Modified Files:
	python-imdb.spec sources 
Added Files:
	python-imdb-4.0-beautifulsoup.patch 
Log Message:
new upstream release

python-imdb-4.0-beautifulsoup.patch:

--- NEW FILE python-imdb-4.0-beautifulsoup.patch ---
diff -up ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig ./imdb/parser/http/bsouplxml/bsoupxpath.py
--- ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig	2009-04-01 04:37:01.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/bsoupxpath.py	2009-04-01 04:37:46.000000000 +0200
@@ -26,8 +26,8 @@ __docformat__ = 'restructuredtext'
 
 import re
 import string
-import _bsoup as BeautifulSoup
-
+#use system BeautifulSoup
+import BeautifulSoup
 
 # XPath related enumerations and constants
 
diff -up ./imdb/parser/http/bsouplxml/etree.py.orig ./imdb/parser/http/bsouplxml/etree.py
--- ./imdb/parser/http/bsouplxml/etree.py.orig	2009-04-01 04:38:24.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/etree.py	2009-04-01 04:39:19.000000000 +0200
@@ -21,8 +21,9 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-from _bsoup import Tag as Element
+#use system BeautifulSoup
+import BeautifulSoup
+from BeautifulSoup import Tag as Element
 
 import bsoupxpath
 
diff -up ./imdb/parser/http/bsouplxml/html.py.orig ./imdb/parser/http/bsouplxml/html.py
--- ./imdb/parser/http/bsouplxml/html.py.orig	2009-04-01 04:38:14.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/html.py	2009-04-01 04:39:36.000000000 +0200
@@ -21,8 +21,8 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-
+#use system BeautifulSoup
+import BeautifulSoup
 
 def fromstring(html_string):
     """Return a DOM representation of the string."""


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/F-10/python-imdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-imdb.spec	25 Dec 2008 11:45:40 -0000	1.1
+++ python-imdb.spec	1 Apr 2009 03:57:51 -0000	1.2
@@ -4,8 +4,9 @@
 %define realname IMDbPY
 
 Name:           python-imdb
-Version:        3.8
-Release:        3%{?dist}
+Provides:       IMDBpy = %{version}-%{release}
+Version:        4.0
+Release:        4%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -13,10 +14,10 @@
 URL:            http://imdbpy.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/imdbpy/%{realname}-%{version}.tar.gz
 #use system beautifulsoup
-Patch0:         %{name}-beautifulsoup.patch
+Patch0:         %{name}-%{version}-beautifulsoup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, python-setuptools
 
 Requires:       python-sqlobject, python-lxml, python-BeautifulSoup
 
@@ -32,7 +33,7 @@
 %patch0 -p0
 
 #patch removes need for bundled beautifulsoup, so let's remove it
-rm -f imdb/parser/http/_bsoup.py
+rm -f imdb/parser/http/bsouplxml/_bsoup.py
 
 #fix end-of-line-encoding
 %{__sed} -i 's/\r//' docs/imdbpy.cfg
@@ -56,6 +57,9 @@
 mv bin examples
 chmod 0644 examples/*
 
+#don't include these twice
+rm -f $RPM_BUILD_ROOT%{_prefix}/doc/*
+rm -f $RPM_BUILD_ROOT%{_prefix}/etc/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +73,16 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-4
+- Add Provides: upstream name
+- Add missing python-setuptools buildrequires
+
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-2
+- New upstream release
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 22 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.8-3
 - Add patch to use system BeautifulSoup
 - Add beautifulsoup requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Dec 2008 11:45:40 -0000	1.2
+++ sources	1 Apr 2009 03:57:51 -0000	1.3
@@ -1 +1 @@
-da982f60de30883c224fe81d7b1dfe2e  IMDbPY-3.8.tar.gz
+873fb1550f0fde04acbb297b74c94377  IMDbPY-4.0.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 04:01:23 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 04:01:23 +0000 (UTC)
Subject: rpms/halberd/devel .cvsignore, 1.3, 1.4 halberd.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090401040123.48BB37011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/halberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24079

Modified Files:
	.cvsignore halberd.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 May 2007 14:56:10 -0000	1.3
+++ .cvsignore	1 Apr 2009 04:00:52 -0000	1.4
@@ -1 +1 @@
-halberd-0.2.2.tar.gz
+halberd-0.2.3.tar.gz


Index: halberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/devel/halberd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- halberd.spec	25 Feb 2009 03:18:14 -0000	1.7
+++ halberd.spec	1 Apr 2009 04:00:52 -0000	1.8
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           halberd
-Version:        0.2.2
-Release:        5%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        Tool to discover HTTP load balancers
 
 Group:          Applications/Internet
@@ -46,6 +46,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.2.3-1
+- New upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 May 2007 14:56:10 -0000	1.3
+++ sources	1 Apr 2009 04:00:52 -0000	1.4
@@ -1 +1 @@
-c109f0cd510d73708eb2a254da32e4ae  halberd-0.2.2.tar.gz
+3d90556573d0d347dac53ddad6412071  halberd-0.2.3.tar.gz



From cebbert at fedoraproject.org  Wed Apr  1 04:02:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  1 Apr 2009 04:02:07 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1497,1.1498
Message-ID: <20090401040207.044CD7011D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24290

Modified Files:
	kernel.spec 
Log Message:
check for missing patches during prep


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1497
retrieving revision 1.1498
diff -u -r1.1497 -r1.1498
--- kernel.spec	1 Apr 2009 02:39:12 -0000	1.1497
+++ kernel.spec	1 Apr 2009 04:01:36 -0000	1.1498
@@ -906,6 +906,9 @@
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1;
   fi
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+    [ "${patch:0:10}" != "patch-2.6." ] && echo "Patch $patch not listed in specfile" && exit 1;
+  fi
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;



From sindrepb at fedoraproject.org  Wed Apr  1 04:02:52 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 04:02:52 +0000 (UTC)
Subject: rpms/halberd/EL-4 halberd.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090401040252.ABCA87011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/halberd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24491

Modified Files:
	halberd.spec sources 
Log Message:
new upstream release


Index: halberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/EL-4/halberd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- halberd.spec	23 May 2007 11:32:35 -0000	1.1
+++ halberd.spec	1 Apr 2009 04:02:22 -0000	1.2
@@ -2,12 +2,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           halberd
-Version:        0.2.1
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Tool to discover HTTP load balancers
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://halberd.superadditive.com
 Source0:        http://halberd.superadditive.com/dist/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,5 +46,20 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.2.3-1
+- New upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
+- Rebuild for Python 2.6
+
+* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2-3
+- fix license tag
+* Wed May 30 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.2-1
+- New upstream release
+* Mon May 28 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.1-3
+- Bump release for rebuild
 * Thu May 03 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.1-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 11:32:35 -0000	1.2
+++ sources	1 Apr 2009 04:02:22 -0000	1.3
@@ -1 +1 @@
-dc37c78e19772da5bdbd20f99df884b4  halberd-0.2.1.tar.gz
+3d90556573d0d347dac53ddad6412071  halberd-0.2.3.tar.gz



From mclasen at fedoraproject.org  Wed Apr  1 04:03:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  1 Apr 2009 04:03:21 +0000 (UTC)
Subject: rpms/esound/devel esound-nospawn.patch, NONE, 1.1 esound.spec, 1.50,
	1.51
Message-ID: <20090401040321.C83997011D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/esound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24652

Modified Files:
	esound.spec 
Added Files:
	esound-nospawn.patch 
Log Message:
Remove /etc/esd.conf


esound-nospawn.patch:

--- NEW FILE esound-nospawn.patch ---
diff -up esound-0.2.41/esd_config.c.nospawn esound-0.2.41/esd_config.c
--- esound-0.2.41/esd_config.c.nospawn	2009-03-31 23:57:35.860368388 -0400
+++ esound-0.2.41/esd_config.c	2009-03-31 23:57:51.032658859 -0400
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <string.h>
 
-int esd_no_spawn=0; /* If we can't even find the system config file,
+int esd_no_spawn=1; /* If we can't even find the system config file,
 		       things are screwed up - don't try to make things
 		       worse. */
 int esd_spawn_wait_ms=100; /* Time to wait trying to connect to an


Index: esound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esound/devel/esound.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- esound.spec	16 Mar 2009 03:28:36 -0000	1.50
+++ esound.spec	1 Apr 2009 04:02:51 -0000	1.51
@@ -2,16 +2,18 @@
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
 Version: 0.2.41
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: LGPLv2+
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
 Group: System Environment/Daemons
 Source0:  http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch4: esound-0.2.38-drain.patch
 Patch6: esound-0.2.38-fix-open-macro.patch
 Patch7: remove-confusing-spew.patch
+# default to nospawn, so we can kill the esd.conf file
+Patch8: esound-nospawn.patch
 # temporarily disable doc build due to xml catalog issues
 #BuildRequires: docbook-utils
 BuildRequires: audiofile-devel
@@ -65,6 +67,7 @@
 %patch4 -p1 -b .drain-race
 %patch6 -p1 -b .open-macro
 %patch7 -p1 -b .spew
+%patch8 -p1 -b .nospawn
 
 %build
 %configure --disable-static
@@ -75,6 +78,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/esd.conf
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # Delete the esound binary
 rm -f $RPM_BUILD_ROOT%{_bindir}/esd $RPM_BUILD_ROOT%{_mandir}/man1/esd.1*
@@ -90,7 +94,6 @@
 %doc AUTHORS COPYING.LIB ChangeLog docs/esound.sgml
 %doc NEWS README TIPS TODO
 %defattr(-, root, root,-)
-%config(noreplace) /etc/*
 %{_libdir}/*.so.*
 
 %files tools
@@ -125,6 +128,9 @@
 %{_mandir}/man1/esd-config.1.gz
 
 %changelog
+* Tue Mar 31 2009 Matthias Clasen <mclasen at redhat.com> - 1:0.2.41-2
+- Remove /etc/esd.conf (#491481)
+
 * Sun Mar 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:0.2.41-1
 - Update to 0.2.41
 



From sindrepb at fedoraproject.org  Wed Apr  1 04:13:10 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 04:13:10 +0000 (UTC)
Subject: rpms/halberd/EL-5 halberd.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090401041310.E15877011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/halberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27358

Modified Files:
	halberd.spec sources 
Log Message:
new upstream release


Index: halberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/EL-5/halberd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- halberd.spec	23 May 2007 11:33:38 -0000	1.1
+++ halberd.spec	1 Apr 2009 04:12:40 -0000	1.2
@@ -2,12 +2,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           halberd
-Version:        0.2.1
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Tool to discover HTTP load balancers
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://halberd.superadditive.com
 Source0:        http://halberd.superadditive.com/dist/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,5 +46,20 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.2.3-1
+- New upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
+- Rebuild for Python 2.6
+
+* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2-3
+- fix license tag
+* Wed May 30 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.2-1
+- New upstream release
+* Mon May 28 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.1-3
+- Bump release for rebuild
 * Thu May 03 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.1-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 11:33:38 -0000	1.2
+++ sources	1 Apr 2009 04:12:40 -0000	1.3
@@ -1 +1 @@
-dc37c78e19772da5bdbd20f99df884b4  halberd-0.2.1.tar.gz
+3d90556573d0d347dac53ddad6412071  halberd-0.2.3.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 04:16:42 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 04:16:42 +0000 (UTC)
Subject: rpms/halberd/F-10 halberd.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090401041642.49D727011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/halberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27953

Modified Files:
	halberd.spec sources 
Log Message:
new upstream release


Index: halberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/F-10/halberd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- halberd.spec	31 Jul 2008 15:31:27 -0000	1.5
+++ halberd.spec	1 Apr 2009 04:16:11 -0000	1.6
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           halberd
-Version:        0.2.2
-Release:        3%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        Tool to discover HTTP load balancers
 
 Group:          Applications/Internet
@@ -46,6 +46,15 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.2.3-1
+- New upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
+- Rebuild for Python 2.6
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.2-3
 - fix license tag
 * Wed May 30 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/halberd/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 May 2007 14:56:10 -0000	1.3
+++ sources	1 Apr 2009 04:16:11 -0000	1.4
@@ -1 +1 @@
-c109f0cd510d73708eb2a254da32e4ae  halberd-0.2.2.tar.gz
+3d90556573d0d347dac53ddad6412071  halberd-0.2.3.tar.gz



From sindrepb at fedoraproject.org  Wed Apr  1 04:54:33 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 04:54:33 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do-0.8.1.3-applicationspath.patch, NONE, 
	1.1 gnome-do.spec, 1.32, 1.33
Message-ID: <20090401045433.5F84E7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3003

Modified Files:
	gnome-do.spec 
Added Files:
	gnome-do-0.8.1.3-applicationspath.patch 
Log Message:
fix indexing bug

gnome-do-0.8.1.3-applicationspath.patch:

--- NEW FILE gnome-do-0.8.1.3-applicationspath.patch ---
diff -up ./Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs.orig ./Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs
--- ./Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs.orig	2009-04-01 06:42:55.000000000 +0200
+++ ./Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs	2009-04-01 06:43:33.000000000 +0200
@@ -131,7 +131,7 @@ namespace Do.Universe.Linux {
 						yield return (new [] {home, ".local/share", appDirSuffix}.Aggregate (Path.Combine));
 					} else if (xdgVar == "XDG_DATA_DIRS") {
 						yield return Path.Combine ("/usr/local/share/", appDirSuffix);
-						yield return Path.Combine ("/usr/share/applications", appDirSuffix);
+						yield return Path.Combine ("/usr/share/", appDirSuffix);
 					}
 				} else {
 					foreach (string dir in envPath.Split (':'))


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-do.spec	18 Mar 2009 00:06:28 -0000	1.32
+++ gnome-do.spec	1 Apr 2009 04:54:03 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.1.3
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -11,6 +11,8 @@
 URL:			http://do.davebsd.com/
 Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
 
+Patch0:			%{name}-%{version}-applicationspath.patch
+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
@@ -57,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -126,6 +129,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-3
+- Add patch to fix issue where applications wasn't being indexed
+
 * Tue Mar 17 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-2
 - New upstream release
 



From dcantrel at fedoraproject.org  Wed Apr  1 05:08:36 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  1 Apr 2009 05:08:36 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.246,1.247
Message-ID: <20090401050836.334207011D@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6294

Modified Files:
	dhcp.spec 
Log Message:
* Tue Mar 31 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-13
- dhclient obsoletes libdhcp4client (#493213)
- dhcp-devel obsolets libdhcp4client-devel (#493213)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- dhcp.spec	11 Mar 2009 19:12:56 -0000	1.246
+++ dhcp.spec	1 Apr 2009 05:08:05 -0000	1.247
@@ -4,7 +4,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  12%{?dist}
+Release:  13%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -71,6 +71,7 @@
 Requires: initscripts >= 6.75
 Requires(post): coreutils
 Obsoletes: dhcpcd <= 1.3.22pl1-7
+Obsoletes: libdhcp4client <= 12:4.0.0-31
 Provides: dhcpcd = 1.3.22pl1-8
 
 %description -n dhclient
@@ -87,6 +88,7 @@
 %package devel
 Summary: Development headers and libraries for interfacing to the DHCP server
 Group: Development/Libraries
+Obsoletes: libdhcp4client-devel <= 12:4.0.0-31
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -413,6 +415,10 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Mar 31 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-13
+- dhclient obsoletes libdhcp4client (#493213)
+- dhcp-devel obsolets libdhcp4client-devel (#493213)
+
 * Wed Mar 11 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-12
 - Fix problems with dhclient.d script execution (#488864)
 



From dcantrel at fedoraproject.org  Wed Apr  1 05:12:56 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  1 Apr 2009 05:12:56 +0000 (UTC)
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.98,1.99
Message-ID: <20090401051256.408F57011D@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7308

Modified Files:
	dhcpv6.spec 
Log Message:
* Tue Mar 31 2009 David Cantrell <dcantrell at redhat.com> - 1.1.0-3
- dhcpv6-client obsoletes libdhcp6client, libdhcp6client-devel (#493214)



Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- dhcpv6.spec	24 Feb 2009 11:41:59 -0000	1.98
+++ dhcpv6.spec	1 Apr 2009 05:12:25 -0000	1.99
@@ -4,7 +4,7 @@
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
 Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
@@ -36,6 +36,8 @@
 Requires:  initscripts >= 7.73
 Group:     System Environment/Base
 Obsoletes: dhcpv6_client
+Obsoletes: libdhcp6client <= 1.0.22-1
+Obsoletes: libdhcp6client-devel <= 1.0.22-1
 
 %description -n dhcpv6-client
 Provides the client for the DHCPv6 protocol (RFC 3315) to support dynamic
@@ -111,6 +113,9 @@
 %attr(750,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Tue Mar 31 2009 David Cantrell <dcantrell at redhat.com> - 1.1.0-3
+- dhcpv6-client obsoletes libdhcp6client, libdhcp6client-devel (#493214)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From erikos at fedoraproject.org  Wed Apr  1 05:13:51 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  1 Apr 2009 05:13:51 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.34, 1.35 sources, 1.36,
	1.37 sugar.spec, 1.58, 1.59
Message-ID: <20090401051351.5AFA07011D@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7529

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-4.20090401git4232758da5
- git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	24 Mar 2009 19:30:02 -0000	1.34
+++ .cvsignore	1 Apr 2009 05:13:20 -0000	1.35
@@ -1 +1 @@
-sugar-0.84.1-gite16cf854aa.tar.bz2
+sugar-0.84.1-git4232758da5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	24 Mar 2009 19:30:02 -0000	1.36
+++ sources	1 Apr 2009 05:13:21 -0000	1.37
@@ -1 +1 @@
-a7954a83c070014051a53130632fd944  sugar-0.84.1-gite16cf854aa.tar.bz2
+3115f37c94c6a200dc71a2ed82cb356a  sugar-0.84.1-git4232758da5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sugar.spec	24 Mar 2009 19:57:50 -0000	1.58
+++ sugar.spec	1 Apr 2009 05:13:21 -0000	1.59
@@ -1,13 +1,13 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
-%define commitid e16cf854aa
-%define alphatag 20090324git%{commitid}
+%define commitid 4232758da5
+%define alphatag 20090401git%{commitid}
 
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.84.1
 #Release: 1%{?dist}
-Release: 3.%{alphatag}%{?dist}
+Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
 # cd sugar
@@ -140,6 +140,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-4.20090401git4232758da5
+- git snapshot
+
 * Tue Mar 24 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-3.20090324gite16cf854aa
 - rebuild without the logout patch
 



From transif at fedoraproject.org  Wed Apr  1 05:20:10 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 05:20:10 +0000 (UTC)
Subject: comps/po ja.po,1.21,1.22
Message-ID: <20090401052010.F399E7011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9001/po

Modified Files:
	ja.po 
Log Message:
Sending translation for Japanese


Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ja.po	9 Jan 2009 11:52:38 -0000	1.21
+++ ja.po	1 Apr 2009 05:19:40 -0000	1.22
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.ja.po to Japanese
+# translation of comps.po to Japanese
 # coms-po Japanese translation
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) Red Hat Inc.2002
@@ -6,13 +6,13 @@
 # James Hashida <khashida at redhat.com>, 2002.
 # Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007, 2008.
 # Hirofumi Saito <hi_saito at yk.rim.or.jp>, 2004, 2005.
-# Kiyoto Hashida <khashida at redhat.com>, 2008.
+# Kiyoto Hashida <khashida at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.ja\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-09-25 18:25+1000\n"
+"POT-Creation-Date: 2009-03-31 19:25+0000\n"
+"PO-Revision-Date: 2009-04-01 15:16+1000\n"
 "Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
 "Language-Team: Japanese <jp at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,192 +26,192 @@
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ?????????????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "??????????????????????????????"
 
@@ -220,78 +220,78 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "?????? (????????????) ???????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora ??????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -301,19 +301,19 @@
 "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -322,86 +322,86 @@
 "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -411,7 +411,7 @@
 "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -420,7 +420,7 @@
 "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
@@ -428,67 +428,65 @@
 "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????????????????????????????? (X) ??????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ??????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE ( K ????????????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ????????????????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -497,121 +495,121 @@
 "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "Office/?????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -619,113 +617,112 @@
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -734,77 +731,77 @@
 "???????????????????????????????????? Emacs ??? Vi ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????????????????????"
 
@@ -813,7 +810,7 @@
 msgstr "Eclipse ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
@@ -821,43 +818,38 @@
 "??????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????????IMAP ??? SMTP ?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
+msgstr "?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "????????????????????????????????????DHCP???Kerberos???NIS ????????? ????????????????????????????????????"
 "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -866,17 +858,17 @@
 "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -885,7 +877,7 @@
 "????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -894,21 +886,19 @@
 "Postscript??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -918,7 +908,7 @@
 "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
@@ -926,14 +916,14 @@
 "??????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "??????????????????????????????????????? Red Hat ????????????????????????????????????????????????????????????"
 "??????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -942,7 +932,7 @@
 "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
@@ -950,7 +940,7 @@
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -960,14 +950,13 @@
 "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -977,7 +966,7 @@
 "??????????????????????????????????????????????????????????????? X Window System ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -987,22 +976,19 @@
 "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgid "This group is a collection of tools for various hardware specific utilities."
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -1012,15 +998,14 @@
 "?????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "?????????????????????????????????????????????????????????????????? DNS ????????????????????? (BIND) ?????????"
 "???????????????"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1029,332 +1014,366 @@
 "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr ""
 "??????????????????????????????????????????MySQL ???????????????????????????????????????????????????????????????"
 "????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "?????????????????????????????????????????? Postgresql ??????????????????????????????????????????????????????"
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Web ????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows ????????????????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ????????????????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X Window System"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "Buildsystem ?????????????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ????????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "???????????????????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "?????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "????????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "?????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "???????????????????????????"
+msgstr "???????????????????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "?????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ??? OLPC XO ?????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "???????????????????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "???????????????????????????????????????????????????????????????????????????"
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskell ??????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "??????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "?????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "??????????????? (?????????) ??????????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ???????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "???????????????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "?????????????????????"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "???????????????????????????"
+msgstr "????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ????????????????????????"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "?????????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Sugar ????????????????????????"
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr ""
+"32 bit Windows ??????????????????????????????????????????????????????????????????????????? "
+"?????????????????????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr ""
+"?????????????????? CAML ??????????????????????????????????????????????????????????????????????????????????????? "
+"????????????"
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????? "
+"??????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "???????????????????????????"
+msgstr "?????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1405,18 +1424,15 @@
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1424,6 +1440,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+



From erikos at fedoraproject.org  Wed Apr  1 05:31:05 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  1 Apr 2009 05:31:05 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.30, 1.31 sources, 1.34,
	1.35 sugar-toolkit.spec, 1.44, 1.45
Message-ID: <20090401053105.C678F7011D@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11128

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-2.20090401git0a65259dc5
- git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	22 Mar 2009 17:53:37 -0000	1.30
+++ .cvsignore	1 Apr 2009 05:30:33 -0000	1.31
@@ -1 +1 @@
-sugar-toolkit-0.84.1.tar.bz2
+sugar-toolkit-0.84.1-git0a65259dc5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	22 Mar 2009 17:53:37 -0000	1.34
+++ sources	1 Apr 2009 05:30:35 -0000	1.35
@@ -1 +1 @@
-31a215e195c83ef7d5ce2c8353bfa8b3  sugar-toolkit-0.84.1.tar.bz2
+6850f235fbb1f1e95136fb359a3e9c3a  sugar-toolkit-0.84.1-git0a65259dc5.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sugar-toolkit.spec	22 Mar 2009 17:53:37 -0000	1.44
+++ sugar-toolkit.spec	1 Apr 2009 05:30:35 -0000	1.45
@@ -1,19 +1,19 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
-%define commitid 29aa6cbe65
-%define alphatag 20090227git%{commitid}
+%define commitid 0a65259dc5
+%define alphatag 20090401git%{commitid}
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.84.1
-Release: 1%{?dist}
-#Release: 2.%{alphatag}%{?dist}
+#Release: 1%{?dist}
+Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
 # cd sugar
 # git-checkout %{commitid}
-#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
 License: LGPLv2
 Group: System Environment/Libraries
@@ -69,6 +69,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-2.20090401git0a65259dc5
+- git snapshot
+
 * Sun Mar 22 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-1
 - Fix palettes scaling when using scaling factor 72 #504
 - Use Popen.communicate() to avoid hang (Sascha Silbe) #397



From mtasaka at fedoraproject.org  Wed Apr  1 05:41:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  1 Apr 2009 05:41:22 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.356, 1.357 jd.spec, 1.414, 1.415 sources,
	1.357, 1.358
Message-ID: <20090401054122.347927011D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14249

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- .cvsignore	23 Mar 2009 07:16:03 -0000	1.356
+++ .cvsignore	1 Apr 2009 05:40:51 -0000	1.357
@@ -1 +1 @@
-jd-2.4.0-svn2744_trunk.tgz
+jd-2.4.0-svn2758_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- jd.spec	23 Mar 2009 07:16:03 -0000	1.414
+++ jd.spec	1 Apr 2009 05:40:51 -0000	1.415
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2744_trunk
+%define         strtag        svn2758_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Mar 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Wed Apr  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- sources	23 Mar 2009 07:16:03 -0000	1.357
+++ sources	1 Apr 2009 05:40:51 -0000	1.358
@@ -1 +1 @@
-f81f2dee516cbb7195e65840e79b583f  jd-2.4.0-svn2744_trunk.tgz
+150ca247b665197ce029f330bc0930ee  jd-2.4.0-svn2758_trunk.tgz



From erikos at fedoraproject.org  Wed Apr  1 06:05:04 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  1 Apr 2009 06:05:04 +0000 (UTC)
Subject: rpms/sugar-browse/devel .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 sugar-browse.spec, 1.14, 1.15
Message-ID: <20090401060505.06B3E7011D@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18412

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 106-1
- Fix Autocompletion and File upload #670
- Make sugarlabs.org the default homepage




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Mar 2009 21:32:01 -0000	1.5
+++ .cvsignore	1 Apr 2009 06:04:34 -0000	1.6
@@ -1 +1 @@
-Browse-105.tar.bz2
+Browse-106.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Mar 2009 21:32:01 -0000	1.6
+++ sources	1 Apr 2009 06:04:34 -0000	1.7
@@ -1 +1 @@
-770ba65fb167eca4de853e66ea173644  Browse-105.tar.bz2
+6688707598f660d77664ebfc95d7ccd9  Browse-106.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sugar-browse.spec	3 Mar 2009 21:32:01 -0000	1.14
+++ sugar-browse.spec	1 Apr 2009 06:04:34 -0000	1.15
@@ -1,5 +1,5 @@
 Name: sugar-browse
-Version: 105
+Version: 106
 Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
@@ -40,6 +40,10 @@
 
 
 %changelog
+* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 106-1
+- Fix Autocompletion and File upload #670
+- Make sugarlabs.org the default homepage
+
 * Tue Mar 03 2009 Simon Schampijer <simon at schampijer.de> - 105-1
 - New translations
 



From jnovy at fedoraproject.org  Wed Apr  1 06:35:25 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  1 Apr 2009 06:35:25 +0000 (UTC)
Subject: rpms/libgphoto2/devel gphoto2-canontimeout.patch, NONE,
	1.1 libgphoto2.spec, 1.18, 1.19
Message-ID: <20090401063525.939607011D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24152

Modified Files:
	libgphoto2.spec 
Added Files:
	gphoto2-canontimeout.patch 
Log Message:
* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-4
- increase timeouts for Canon cameras (#476355), thanks to
  Andrzej Nowak and Russell Harrison


gphoto2-canontimeout.patch:

--- NEW FILE gphoto2-canontimeout.patch ---
diff -upr libgphoto2-2.4.3/camlibs/canon/usb.c libgphoto2-2.4.3.rlh/camlibs/canon/usb.c
--- libgphoto2-2.4.3/camlibs/canon/usb.c	2008-08-08 16:12:57.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/canon/usb.c	2009-03-31 12:44:05.000000000 -0400
@@ -72,7 +72,7 @@
 
 /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for
  * an URB to come back on an interrupt endpoint */
-#define CANON_FAST_TIMEOUT 175
+#define CANON_FAST_TIMEOUT 500
 
 /* WARNING: This destroys reentrancy of the code. Better to put this
  * in the camera descriptor somewhere. */
diff -upr libgphoto2-2.4.3/camlibs/ptp2/library.c libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c
--- libgphoto2-2.4.3/camlibs/ptp2/library.c	2008-10-19 12:41:36.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c	2009-03-31 12:44:49.000000000 -0400
@@ -59,7 +59,7 @@
 #define GP_MODULE "PTP2"
 
 #define USB_START_TIMEOUT 8000
-#define USB_CANON_START_TIMEOUT 500	/* 0.5 seconds */
+#define USB_CANON_START_TIMEOUT 1500	/* 1.5 seconds */
 #define USB_NORMAL_TIMEOUT 20000
 #define USB_TIMEOUT_CAPTURE 20000
 


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libgphoto2.spec	5 Mar 2009 10:43:12 -0000	1.18
+++ libgphoto2.spec	1 Apr 2009 06:34:55 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,6 +11,7 @@
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: gphoto2-canontimeout.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -54,6 +55,7 @@
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
+%patch5 -p1 -b .canontimeout
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -151,6 +153,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-4
+- increase timeouts for Canon cameras (#476355), thanks to
+  Andrzej Nowak and Russell Harrison
+
 * Thu Mar 05 2009 Caol??n McNamara <caolanm at redhat.com> - 2.4.4-3
 - tweak BR to get to build
 



From mtasaka at fedoraproject.org  Wed Apr  1 06:57:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  1 Apr 2009 06:57:09 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.356, 1.357 jd.spec, 1.405, 1.406 sources, 
	1.357, 1.358
Message-ID: <20090401065709.E4F8C7011D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26908

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- .cvsignore	23 Mar 2009 07:16:04 -0000	1.356
+++ .cvsignore	1 Apr 2009 06:56:39 -0000	1.357
@@ -1 +1 @@
-jd-2.4.0-svn2744_trunk.tgz
+jd-2.4.0-svn2758_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- jd.spec	23 Mar 2009 07:16:05 -0000	1.405
+++ jd.spec	1 Apr 2009 06:56:39 -0000	1.406
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2744_trunk
+%define         strtag        svn2758_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Mar 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Wed Apr  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- sources	23 Mar 2009 07:16:05 -0000	1.357
+++ sources	1 Apr 2009 06:56:39 -0000	1.358
@@ -1 +1 @@
-f81f2dee516cbb7195e65840e79b583f  jd-2.4.0-svn2744_trunk.tgz
+150ca247b665197ce029f330bc0930ee  jd-2.4.0-svn2758_trunk.tgz



From mmaslano at fedoraproject.org  Wed Apr  1 06:59:05 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  1 Apr 2009 06:59:05 +0000 (UTC)
Subject: rpms/tcl/devel tcl-8.5.6-http.patch,NONE,1.1 tcl.spec,1.86,1.87
Message-ID: <20090401065905.A8A0D7011D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27295

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.5.6-http.patch 
Log Message:
* Wed Apr 1  2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 1:8.5.6-6
- add missing part of patch


tcl-8.5.6-http.patch:

--- NEW FILE tcl-8.5.6-http.patch ---
diff -up tcl8.5.6/library/http/http.tcl.http tcl8.5.6/library/http/http.tcl
--- tcl8.5.6/library/http/http.tcl.http	2008-10-24 01:34:32.000000000 +0200
+++ tcl8.5.6/library/http/http.tcl	2009-04-01 08:01:54.000000000 +0200
@@ -943,9 +943,10 @@ proc http::Event {sock token} {
 	return
     }
     if {$state(state) eq "connecting"} {
-	set state(state) "header"
 	if {[catch {gets $sock state(http)} n]} {
 	    return [Finish $token $n]
+	} elseif {$n >= 0} {
+	    set state(state) "header"
 	}
     } elseif {$state(state) eq "header"} {
 	if {[catch {gets $sock line} n]} {


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- tcl.spec	31 Mar 2009 08:27:51 -0000	1.86
+++ tcl.spec	1 Apr 2009 06:58:35 -0000	1.87
@@ -4,7 +4,7 @@
 Summary: Tool Command Language, pronounced tickle
 Name: tcl
 Version: %{vers}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: TCL
 Group: Development/Languages
@@ -18,7 +18,7 @@
 Patch0: tcl-8.5.1-autopath.patch
 Patch1: tcl-8.5.0-conf.patch
 Patch2: tcl-8.5.0-hidden.patch
-Patch3: tcl-8.5.6-http.pach
+Patch3: tcl-8.5.6-http.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -126,6 +126,9 @@
 %{_libdir}/%{name}8.5/%{name}Config.sh
 
 %changelog
+* Wed Apr 1  2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 1:8.5.6-6
+- add missing part of patch
+
 * Tue Mar 31 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 1:8.5.6-5
 - 492541 newer http prevents connection (reproduced on amsn)
 



From transif at fedoraproject.org  Wed Apr  1 07:12:35 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 07:12:35 +0000 (UTC)
Subject: comps/po hi.po,1.17,1.18
Message-ID: <20090401071235.429AF7011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29608/po

Modified Files:
	hi.po 
Log Message:
Sending translation for Hindi


Index: hi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hi.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hi.po	9 Jan 2009 11:52:37 -0000	1.17
+++ hi.po	1 Apr 2009 07:12:04 -0000	1.18
@@ -1,22 +1,22 @@
-# translation of comps.HEAD.hi.po to Hindi
+# translation of comps.HEAD.po to Hindi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-# Rajesh Ranjan <rranjan at redhat.com>, 2004, 2005, 2006, 2008.
+# Rajesh Ranjan <rranjan at redhat.com>, 2004, 2005, 2006, 2008, 2009.
 # hi <rranjan at redhat.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.hi\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-13 16:20+0530\n"
+"POT-Creation-Date: 2009-03-31 02:03+0000\n"
+"PO-Revision-Date: 2009-04-01 12:41+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\n"
@@ -36,192 +36,192 @@
 msgstr "??????????????? ???????????????????????? ????????????????????? ?????? ?????? ???????????????????????? ???????????? ?????? ????????? ????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "??????????????? ????????????????????? ?????????????????? ???????????? ?????? ???????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????? ?????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ?????? ????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "?????????????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "?????????????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "?????? ??????????????????"
 
@@ -230,78 +230,78 @@
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "??????????????????????????? ?????? ???????????? ???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "????????????????????????????????? ?????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "???????????????????????? (????????????) ??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ???????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "?????????????????? ??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -311,19 +311,19 @@
 "?????? ?????????????????? ?????? ????????? ????????? ???????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -332,86 +332,86 @@
 "?????????????????? ???????????? ????????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "????????? ?????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -419,78 +419,74 @@
 msgstr "GTK+ ?????? GNOME ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ?????? XFCE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ?????? KDE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"?????????????????? ?????? ?????????????????? ???????????? ?????? ?????????????????? ??????????????? ????????? ??????????????? ??????????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
+msgstr "?????????????????? ?????? ?????????????????? ???????????? ?????? ?????????????????? ??????????????? ????????? ??????????????? ??????????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"???????????? ??????????????? (X) ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ?????? ????????? ?????? ??????????????? ???????????? ?????? ??????????????????????????? ????????????."
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "???????????? ??????????????? (X) ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ?????? ????????? ?????? ??????????????? ???????????? ?????? ??????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????????????????? ?????????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -499,121 +495,121 @@
 "?????????????????? ???????????? ????????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "?????????????????? ??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "?????????????????? ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "?????????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????????????????/???????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -621,111 +617,110 @@
 msgstr "??????????????? ?????? ??????????????????????????? ?????? ??????????????? ?????? ????????????????????? ?????? ???????????? ????????????????????????????????????????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????? ??????????????? ????????????????????? ?????? ?????? ???????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "???????????? ???????????? ????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "??????????????? ??????????????? ?????? ???????????? ?????????????????? ?????? ???????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -734,77 +729,77 @@
 "?????????????????? ???????????? ?????????. ??????????????? ?????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????? ?????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ????????? ??????????????????????????? ??????????????? ?????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ?????? ??????????????? ?????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "????????????????????????-?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????? ??????????????????"
 
@@ -813,69 +808,64 @@
 msgstr "??????????????? ?????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??????????????????????????? ????????? ???????????????????????? ?????????????????????, PDF ???????????????, ?????? ?????? ?????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
-msgstr ""
-"?????? ???????????? ????????? ?????????????????? ??????????????? ?????? ??????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ?????? ????????? ?????????????????? ??????."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
+msgstr "?????? ???????????? ????????? ?????????????????? ??????????????? ?????? ??????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ?????? ????????? ?????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ??????????????? ???????????? IMAP ?????? SMTP ????????? ??????????????? ?????? ????????????????????? ???????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "?????? ????????????????????? ?????? ?????? X ?????????????????? ?????????????????? ?????? ????????? ????????????????????????????????? ?????? ??????????????? ?????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????? ??????????????? ????????? ??????????????????????????? ?????? ????????? ????????????????????? ?????? ??????????????? ????????? ?????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ??????????????? ????????? DHCP, ?????????????????? ?????? NIS ???????????? ???????????????-?????????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "?????? ????????????????????? ????????? rsh ?????? telnet ???????????? ????????????????????? ??????????????? ??????????????????????????? ?????? ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ??????????????? ??????????????????????????????????????? ????????????????????? ?????????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ??????????????? ??????????????? ???????????????????????? ????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "?????? ??????????????? ????????? ??? ??????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -884,39 +874,38 @@
 "???????????????????????? ????????? ??????????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ????????????????????? ?????? ?????????????????? ?????? ?????? ????????? ??????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ????????????????????? ?????? ?????????????????? ?????? ?????? FTP ??????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
-msgstr ""
-"?????? ????????????????????? ????????? automake, gcc, perl, python, ?????? debuggers ???????????? ???????????????????????? ??????????????? ??????????????? ?????????."
+msgstr "?????? ????????????????????? ????????? automake, gcc, perl, python, ?????? debuggers ???????????? ???????????????????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ?????????????????? ??????????????? ?????? ????????? ?????????????????? ?????? ??????????????????????????? ???????????? ?????? ?????????????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "?????? ???????????? ????????? Red Hat ?????? ????????? ??????????????? ??????????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -925,13 +914,13 @@
 "??????????????????, ?????????????????? ?????? ?????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ???????????? ????????? ??????????????? ????????????, ????????? ?????? ????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -939,13 +928,13 @@
 msgstr "?????? ???????????? ????????? ???????????? ?????? ??????????????????????????? ??????????????????, ??????????????? ?????? ???????????? ??????????????? ?????? ????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????? ???????????? ????????? ?????????????????? ?????? ?????????????????????????????? ?????? ???????????????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -955,7 +944,7 @@
 "?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -965,21 +954,19 @@
 "????????? ?????? ?????????????????? ??????????????????????????? ?????? ????????????????????? ?????? ????????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??????????????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????? ???????????? ??????????????? ??????????????????????????? ????????????????????? ???????????????????????? ?????? ???????????? ?????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -989,342 +976,368 @@
 "?????? ??????????????? ????????????????????? ?????????????????? ???????????? ?????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ??????????????? ???????????? ?????? ?????? ?????????????????? ?????? DNS ????????? ??????????????? (BIND) ?????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
-msgstr ""
-"?????? ??????????????? ???????????? ?????? ?????? Linux ?????? MS Windows(tm) ???????????????????????? ?????? ????????? ???????????? ?????????????????????????????? ?????? ???????????? ?????????."
+msgstr "?????? ??????????????? ???????????? ?????? ?????? Linux ?????? MS Windows(tm) ???????????????????????? ?????? ????????? ???????????? ?????????????????????????????? ?????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ??????????????? ???????????? MySQL ??????????????? ?????? ????????? ?????????????????? ????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ??????????????? ???????????? ????????? Postgresql ?????? ????????? ??????????????? ?????? ????????? ??????????????? ??????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????? ??????????????? ?????? ?????????????????? ??????????????? ???????????? ?????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "?????????????????? ?????? ?????? ???????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????? ??????????????? ????????? ?????????????????? ?????? ???????????? ???????????? ?????? ??????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "????????????????????????????????? ???????????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "??????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????? ?????? ????????? ??????????????? ???????????? ?????? ????????? ??????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "???????????????????????? ?????? ?????????????????? ?????????????????? ??????????????? ?????????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "??????????????? ?????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "??????????????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????????? bitmap ?????? ???????????? ??????????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "???????????? ???????????????????????? ?????????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ?????? ???????????????????????? ????????????????????? ?????? ?????? OLPC XO ?????? ????????? ?????????????????? ???????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "??????????????????????????? ?????? ???????????? ????????? ??????????????? ?????? ????????? ?????????????????????????????? ????????????????????????????????????"
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "??????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????? ????????? ?????? ??????????????? ?????? ????????? ??????????????? ???????????? ???????????????."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (???????????????) ??????????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "????????????????????? ???????????????????????????????????? ???????????? ????????? ??????????????????????????? ??????????????? ?????? ???????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "???????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "??????????????????????????? ???????????????????????? ?????? ????????? ????????????????????? ??? ???????????????????????? ???????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "???????????????????????????????????? ??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "?????????????????? ????????????????????? ??? ??????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ??????????????? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "?????????????????? ????????? ??? ????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "???????????? ???????????????????????? ?????????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "32 ????????? ?????????????????? ?????????????????? ????????? ??????????????? ??????????????????????????? ??????????????????????????? ?????? ????????? ??????????????????, ?????????????????? ??????????????????, ?????? ???????????????????????? ?????? ?????????????????????, ????????? ????????? ?????????????????? ?????? ????????????."
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "?????????????????????????????? CAML ???????????????????????????????????? ???????????? ??? ??????????????????????????? ?????? ?????????????????? ?????? ?????????????????????????????? ??????????????? ?????? ????????? ??????????????????."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "??????????????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+msgstr "?????? ???????????? ????????????????????? ?????? ?????????????????? ?????? ?????? ?????? ?????????????????? ?????? ?????????????????????, ????????????????????????, ????????????-???????????? ?????? ?????????????????? ????????? ???????????????????????? ???????????? ??????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????? ????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1375,18 +1388,15 @@
 msgstr "?????? ???????????? ????????????????????? ???????????????????????? ?????? ???????????? ??????????????? ??????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1394,6 +1404,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+



From airlied at fedoraproject.org  Wed Apr  1 07:18:43 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  1 Apr 2009 07:18:43 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.39,
	1.40 xorg-x11-drv-ati.spec, 1.161, 1.162
Message-ID: <20090401071843.168147011D@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30235

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.0-3
- radeon-modeset: fix FUS on DRI22


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- radeon-modeset.patch	14 Mar 2009 08:42:44 -0000	1.39
+++ radeon-modeset.patch	1 Apr 2009 07:18:42 -0000	1.40
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index 3475f6a..727e2a0 100644
+index b094a50..29a19e3 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -114,8 +114,19 @@ if test "$DRI" = yes; then
@@ -2403,7 +2403,7 @@
 +int radeon_bo_gem_name_buffer(dri_bo *bo, uint32_t *name);
 +#endif
 diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
-index a9bc7d2..6c22339 100644
+index eabd87d..8712a74 100644
 --- a/src/radeon_commonfuncs.c
 +++ b/src/radeon_commonfuncs.c
 @@ -62,12 +62,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
@@ -2534,10 +2534,10 @@
  
  	FLUSH_RING();
 diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
-index 0fcdcf0..49601cf 100644
+index 0fcdcf0..cbc188b 100644
 --- a/src/radeon_cursor.c
 +++ b/src/radeon_cursor.c
-@@ -96,12 +96,19 @@ avivo_setup_cursor(xf86CrtcPtr crtc, Bool enable)
+@@ -96,12 +96,16 @@ avivo_setup_cursor(xf86CrtcPtr crtc, Bool enable)
      RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
      RADEONInfoPtr  info = RADEONPTR(crtc->scrn);
      unsigned char     *RADEONMMIO = info->MMIO;
@@ -2548,10 +2548,7 @@
  
      if (enable) {
 +
-+	if (info->drm_mm)
-+	    location = info->fbLocation + radeon_crtc->cursor->offset;
-+	else
-+	    location = info->fbLocation + radeon_crtc->cursor_offset + pScrn->fbOffset;
++	location = info->fbLocation + radeon_crtc->cursor_offset + pScrn->fbOffset;
 +
  	OUTREG(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset,
 -	       info->fbLocation + radeon_crtc->cursor_offset + pScrn->fbOffset);
@@ -2559,7 +2556,7 @@
  	OUTREG(AVIVO_D1CUR_SIZE + radeon_crtc->crtc_offset,
  	       ((CURSOR_WIDTH - 1) << 16) | (CURSOR_HEIGHT - 1));
  	OUTREG(AVIVO_D1CUR_CONTROL + radeon_crtc->crtc_offset,
-@@ -203,6 +210,7 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+@@ -203,6 +207,7 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
      int xorigin = 0, yorigin = 0;
      int stride = 256;
      DisplayModePtr mode = &crtc->mode;
@@ -2567,35 +2564,29 @@
  
      if (x < 0)                        xorigin = -x+1;
      if (y < 0)                        yorigin = -y+1;
-@@ -233,8 +241,12 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+@@ -233,8 +238,9 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
  					       | (yorigin ? 0 : y)));
  	    RADEONCTRACE(("cursor_offset: 0x%x, yorigin: %d, stride: %d, temp %08X\n",
  			  radeon_crtc->cursor_offset + pScrn->fbOffset, yorigin, stride, temp));
-+	    if (info->drm_mm)
-+		offset = radeon_crtc->cursor->offset;
-+	    else
-+		offset = radeon_crtc->cursor_offset + pScrn->fbOffset;
++	    offset = radeon_crtc->cursor_offset + pScrn->fbOffset;
  	    OUTREG(RADEON_CUR_OFFSET,
 -		   radeon_crtc->cursor_offset + pScrn->fbOffset + yorigin * stride);
 +		   offset + yorigin * stride);
  	} else if (crtc_id == 1) {
  	    OUTREG(RADEON_CUR2_HORZ_VERT_OFF,  (RADEON_CUR2_LOCK
  						| (xorigin << 16)
-@@ -244,8 +256,12 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+@@ -244,8 +250,9 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
  						| (yorigin ? 0 : y)));
  	    RADEONCTRACE(("cursor_offset2: 0x%x, yorigin: %d, stride: %d, temp %08X\n",
  			  radeon_crtc->cursor_offset + pScrn->fbOffset, yorigin, stride, temp));
-+	    if (info->drm_mm)
-+		offset = radeon_crtc->cursor->offset;
-+	    else
-+		offset = radeon_crtc->cursor_offset + pScrn->fbOffset;
++	    offset = radeon_crtc->cursor_offset + pScrn->fbOffset;
  	    OUTREG(RADEON_CUR2_OFFSET,
 -		   radeon_crtc->cursor_offset + pScrn->fbOffset + yorigin * stride);
 +		   offset + yorigin * stride);
  	}
      }
  }
-@@ -299,10 +315,15 @@ radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
+@@ -299,10 +306,12 @@ radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
      RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
      RADEONInfoPtr  info = RADEONPTR(pScrn);
      CURSOR_SWAPPING_DECL_MMIO
@@ -2604,23 +2595,11 @@
  
      RADEONCTRACE(("RADEONLoadCursorARGB\n"));
  
-+    if (info->drm_mm) 
-+      d = (uint32_t *)radeon_crtc->cursor->map;
-+    else
-+      d = (uint32_t *)(pointer)(info->FB + radeon_crtc->cursor_offset);
++    d = (uint32_t *)(pointer)(info->FB + radeon_crtc->cursor_offset);
 +
      info->cursor_argb = TRUE;
  
      CURSOR_SWAPPING_START();
-@@ -333,7 +354,7 @@ Bool RADEONCursorInit(ScreenPtr pScreen)
-     height      = ((size_bytes * xf86_config->num_crtc) + width_bytes - 1) / width_bytes;
-     int align = IS_AVIVO_VARIANT ? 4096 : 256;
- 
--    if (!info->useEXA) {
-+    if (!info->useEXA && !info->drm_mm) {
- 	for (c = 0; c < xf86_config->num_crtc; c++) {
- 	    xf86CrtcPtr crtc = xf86_config->crtc[c];
- 	    RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
 diff --git a/src/radeon_dri.c b/src/radeon_dri.c
 index 9c9fc7f..aa6352e 100644
 --- a/src/radeon_dri.c
@@ -4079,7 +4058,7 @@
 +
 +#endif
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index d1b2f54..052ed1f 100644
+index c0f5e7b..aa60074 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
 @@ -67,7 +67,7 @@
@@ -4091,7 +4070,7 @@
  				/* Driver data structures */
  #include "radeon.h"
  #include "radeon_reg.h"
-@@ -229,7 +229,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
+@@ -226,7 +226,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
      stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
      *size = stride;
  
@@ -4103,7 +4082,7 @@
  }
  static Bool
  RADEONCreateScreenResources (ScreenPtr pScreen)
-@@ -250,6 +253,13 @@ RADEONCreateScreenResources (ScreenPtr pScreen)
+@@ -247,6 +250,13 @@ RADEONCreateScreenResources (ScreenPtr pScreen)
  		      radeonShadowWindow, 0, NULL))
  	   return FALSE;
     }
@@ -4117,7 +4096,7 @@
     return TRUE;
  }
  
-@@ -1661,6 +1671,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
+@@ -1658,6 +1668,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
      }
  
      pScrn->videoRam  &= ~1023;
@@ -4125,13 +4104,13 @@
      info->FbMapSize  = pScrn->videoRam * 1024;
  
      /* if the card is PCI Express reserve the last 32k for the gart table */
-@@ -1791,58 +1802,64 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
+@@ -1787,59 +1798,61 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
+                    "R500 support is under development. Please report any issues to xorg-driver-ati at lists.x.org\n");
      }
  
-     from               = X_PROBED;
+-    from               = X_PROBED;
 -    info->LinearAddr   = PCI_REGION_BASE(info->PciInfo, 0, REGION_MEM) & ~0x1ffffffULL;
-+    info->LinearAddr   = PCI_REGION_BASE(info->PciInfo, 0, REGION_MEM) & ~0x1ffffffUL;
-     pScrn->memPhysBase = info->LinearAddr;
+-    pScrn->memPhysBase = info->LinearAddr;
 -    if (dev->MemBase) {
 -	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 -		   "Linear address override, using 0x%016lx instead of 0x%016llx\n",
@@ -4146,23 +4125,9 @@
 -    }
 -    xf86DrvMsg(pScrn->scrnIndex, from,
 -	       "Linear framebuffer at 0x%016llx\n", info->LinearAddr);
- 
--#ifndef XSERVER_LIBPCIACCESS
--				/* BIOS */
--    from              = X_PROBED;
--    info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
--    if (dev->BiosBase) {
--	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
--		   (unsigned long)dev->BiosBase,
--		   (unsigned long)info->BIOSAddr);
--	info->BIOSAddr = dev->BiosBase;
--	from           = X_CONFIG;
--    }
--    if (info->BIOSAddr) {
 +    if (!info->drm_mode_setting) {
 +	from               = X_PROBED;
-+	info->LinearAddr   = PCI_REGION_BASE(info->PciInfo, 0, REGION_MEM) & ~0x1ffffffUL;
++	info->LinearAddr   = PCI_REGION_BASE(info->PciInfo, 0, REGION_MEM) & ~0x1ffffffULL;
 +	pScrn->memPhysBase = info->LinearAddr;
 +	if (dev->MemBase) {
 +	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -4176,12 +4141,25 @@
 +		       "No valid linear framebuffer address\n");
 +	    return FALSE;
 +	}
- 	xf86DrvMsg(pScrn->scrnIndex, from,
++	xf86DrvMsg(pScrn->scrnIndex, from,
++		   "Linear framebuffer at 0x%016llx\n", info->LinearAddr);
+ 
+ #ifndef XSERVER_LIBPCIACCESS
+-				/* BIOS */
+-    from              = X_PROBED;
+-    info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
+-    if (dev->BiosBase) {
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+-		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
+-		   (unsigned long)dev->BiosBase,
+-		   (unsigned long)info->BIOSAddr);
+-	info->BIOSAddr = dev->BiosBase;
+-	from           = X_CONFIG;
+-    }
+-    if (info->BIOSAddr) {
+-	xf86DrvMsg(pScrn->scrnIndex, from,
 -		   "BIOS at 0x%08lx\n", (unsigned long)info->BIOSAddr);
 -    }
-+		   "Linear framebuffer at 0x%016llx\n", info->LinearAddr);
-+
-+#ifndef XSERVER_LIBPCIACCESS
 +	/* BIOS */
 +	from              = X_PROBED;
 +	info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
@@ -4233,7 +4211,7 @@
  
  #ifdef XF86DRI
  				/* AGP/PCI */
-@@ -2017,6 +2034,15 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2014,6 +2027,15 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
      }
      info->accel_state->fifo_slots                 = 0;
  
@@ -4249,7 +4227,7 @@
      if ((info->ChipFamily == CHIP_FAMILY_RS100) ||
  	(info->ChipFamily == CHIP_FAMILY_RS200) ||
  	(info->ChipFamily == CHIP_FAMILY_RS300) ||
-@@ -2041,6 +2067,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2038,6 +2060,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
      if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
  	int errmaj = 0, errmin = 0;
  
@@ -4259,7 +4237,7 @@
  	from = X_DEFAULT;
  #if defined(USE_EXA)
  #if defined(USE_XAA)
-@@ -2051,6 +2080,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2048,6 +2073,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
  		info->useEXA = TRUE;
  	    } else if (xf86NameCmp(optstr, "XAA") == 0) {
  		from = X_CONFIG;
@@ -4267,7 +4245,7 @@
  	    }
  	}
  #else /* USE_XAA */
-@@ -2155,15 +2185,9 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
+@@ -2151,15 +2177,9 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
      return TRUE;
  }
  
@@ -4284,7 +4262,7 @@
  
      if (!(info->dri = xcalloc(1, sizeof(struct radeon_dri)))) {
  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Unable to allocate dri rec!\n");
-@@ -2174,6 +2198,22 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
+@@ -2170,6 +2190,22 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Unable to allocate cp rec!\n");
  	return FALSE;
      }
@@ -4307,7 +4285,7 @@
      info->cp->CPInUse = FALSE;
      info->cp->CPStarted = FALSE;
      info->cp->CPusecTimeout = RADEON_DEFAULT_CP_TIMEOUT;
-@@ -2731,6 +2771,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
+@@ -2727,6 +2763,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
      RADEONCRTCResize
  };
  
@@ -4345,7 +4323,7 @@
  Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  {
      xf86CrtcConfigPtr   xf86_config;
-@@ -2751,6 +2822,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2747,6 +2814,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      info               = RADEONPTR(pScrn);
      info->MMIO         = NULL;
  
@@ -4354,7 +4332,7 @@
      info->IsSecondary  = FALSE;
      info->IsPrimary = FALSE;
  
-@@ -2785,62 +2858,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2781,62 +2850,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      }
  
      info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
@@ -4465,7 +4443,7 @@
  
      if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
  	goto fail;
-@@ -2850,10 +2924,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2846,10 +2916,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
      pScrn->monitor     = pScrn->confScreen->monitor;
  
@@ -4482,7 +4460,7 @@
  
      if (!RADEONPreInitVisual(pScrn))
  	goto fail;
-@@ -2867,167 +2943,227 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2863,164 +2935,224 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
      xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
  
@@ -4583,11 +4561,6 @@
 +	
 +	RADEONPostInt10Check(pScrn, int10_save);
  
--    /* Save BIOS scratch registers */
--    RADEONSaveBIOSRegisters(pScrn, info->SavedReg);
-+    	/* Save BIOS scratch registers */
-+    	RADEONSaveBIOSRegisters(pScrn, info->SavedReg);
- 
 +	if (!RADEONPreInitBIOS(pScrn, pInt10))
 +	    goto fail;
  #ifdef XF86DRI
@@ -4777,9 +4750,7 @@
 +	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n");
 +	    goto fail;
 +	}
- 
--	for (i = 0; i < xf86_config->num_output; i++) {
--	    xf86OutputPtr output = xf86_config->output[i];
++
 +	info->dri->drmFD = info->drmmode.fd;
 +    info->dri2.drm_fd = info->drmmode.fd;
 +    info->dri2.enabled = FALSE;
@@ -4800,7 +4771,9 @@
 +	    {
 +	        struct drm_radeon_getparam gp;
 +		int value;
-+
+ 
+-	for (i = 0; i < xf86_config->num_output; i++) {
+-	    xf86OutputPtr output = xf86_config->output[i];
 +		memset(&gp, 0, sizeof(gp));
 +		gp.param = RADEON_PARAM_FB_LOCATION;
 +		gp.value = &value;
@@ -4839,7 +4812,7 @@
  
  	/* Get ScreenInit function */
      if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-@@ -3042,10 +3178,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3035,10 +3167,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  	if (!RADEONPreInitXv(pScrn))                 goto fail;
      }
  
@@ -4856,7 +4829,7 @@
      }
  
      if (pScrn->modes == NULL) {
-@@ -3198,6 +3336,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
+@@ -3191,6 +3325,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
  
  #ifdef USE_EXA
      info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
@@ -4866,7 +4839,7 @@
  #endif
  }
  
-@@ -3286,7 +3427,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3279,7 +3416,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      int            subPixelOrder = SubPixelUnknown;
      char*          s;
  #endif
@@ -4875,7 +4848,7 @@
  
      info->accelOn      = FALSE;
  #ifdef USE_XAA
-@@ -3306,58 +3447,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3299,58 +3436,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  		   "RADEONScreenInit %lx %ld\n",
  		   pScrn->memPhysBase, pScrn->fbOffset);
  #endif
@@ -4976,7 +4949,7 @@
      /* Visual setup */
      miClearVisualTypes();
      if (!miSetVisualTypes(pScrn->depth,
-@@ -3391,19 +3535,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3384,19 +3524,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      hasDRI = info->directRenderingEnabled;
  #endif /* XF86DRI */
  
@@ -5010,7 +4983,7 @@
  	}
      }
  
-@@ -3440,7 +3586,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3433,7 +3575,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #ifdef XF86DRI
  	if (hasDRI) {
  	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
@@ -5022,7 +4995,7 @@
  
  	    /* Reserve approx. half of offscreen memory for local textures by
  	     * default, can be overridden with Option "FBTexPercent".
-@@ -3466,7 +3615,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3459,7 +3604,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #if defined(XF86DRI) && defined(USE_XAA)
@@ -5031,7 +5004,7 @@
  	info->dri->textureSize = -1;
  	if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT,
  				 &(info->dri->textureSize))) {
-@@ -3484,7 +3633,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3477,7 +3622,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #ifdef USE_XAA
@@ -5040,7 +5013,7 @@
  	return FALSE;
  #endif
  
-@@ -3505,7 +3654,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3498,7 +3643,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			    info->CurrentLayout.pixel_bytes);
  	int  maxy        = info->FbMapSize / width_bytes;
  
@@ -5049,7 +5022,7 @@
  	    xf86DrvMsg(scrnIndex, X_ERROR,
  		       "Static buffer allocation failed.  Disabling DRI.\n");
  	    xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3515,19 +3664,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3508,19 +3653,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024);
  	    info->directRenderingEnabled = FALSE;
  	} else {
@@ -5108,7 +5081,7 @@
  #endif
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Initializing fb layer\n");
-@@ -3551,7 +3735,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3544,7 +3724,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      if (info->r600_shadow_fb == FALSE) {
  	/* Init fb layer */
@@ -5117,7 +5090,7 @@
  			  pScrn->virtualX, pScrn->virtualY,
  			  pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
  			  pScrn->bitsPerPixel))
-@@ -3593,8 +3777,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3586,8 +3766,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      /* restore the memory map here otherwise we may get a hang when
       * initializing the drm below
       */
@@ -5130,7 +5103,7 @@
  
      /* Backing store setup */
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -3604,7 +3790,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3597,7 +3779,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      /* DRI finalisation */
  #ifdef XF86DRI
@@ -5139,7 +5112,7 @@
          info->dri->pKernelDRMVersion->version_minor >= 19)
      {
        if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -3620,14 +3806,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3613,14 +3795,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      if (info->directRenderingEnabled) {
          xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		       "DRI Finishing init !\n");
@@ -5165,7 +5138,7 @@
  
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
  
-@@ -3723,10 +3919,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3716,10 +3908,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
              return FALSE;
          }
      }
@@ -5183,7 +5156,7 @@
  
      /* Provide SaveScreen & wrap BlockHandler and CloseScreen */
      /* Wrap CloseScreen */
-@@ -5303,7 +5505,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5296,7 +5494,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #ifdef XF86DRI
      Bool           CPStarted   = info->cp->CPStarted;
  
@@ -5192,7 +5165,7 @@
  	DRILock(pScrn->pScreen, 0);
  	RADEONCP_STOP(pScrn, info);
      }
-@@ -5326,8 +5528,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5319,8 +5517,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #endif
      }
  
@@ -5205,7 +5178,7 @@
  
      ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0);
  
-@@ -5339,16 +5543,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5332,16 +5532,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  	/* xf86SetRootClip would do, but can't access that here */
      }
  
@@ -5233,7 +5206,7 @@
      }
  #endif
  
-@@ -5546,6 +5753,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5539,6 +5742,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
      xf86OutputPtr  output = config->output[config->compat_output];
      xf86CrtcPtr	crtc = output->crtc;
  
@@ -5245,7 +5218,7 @@
      /* not handled */
      if (IS_AVIVO_VARIANT)
  	return;
-@@ -5585,76 +5797,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5578,76 +5786,101 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONEnterVT\n");
  
@@ -5312,13 +5285,12 @@
 -	if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
 -	    atombios_static_pwrmgt_setup(pScrn, 1);
 -	    atombios_dyn_clk_setup(pScrn, 1);
+-	}
 +    } else {
 +	int ret;
-+	if (info->drm_mode_setting) {
-+		ret = ioctl(info->dri->drmFD, DRM_IOCTL_SET_MASTER, NULL);
-+		if (ret == -EINVAL)
-+			ErrorF("Unable to retrieve master\n");
- 	}
++	ret = ioctl(info->dri->drmFD, DRM_IOCTL_SET_MASTER, NULL);
++	if (ret == -EINVAL)
++		ErrorF("Unable to retrieve master\n");
      }
  
 -    if (IS_R300_VARIANT || IS_RV100_VARIANT)
@@ -5398,7 +5370,7 @@
      }
  #endif
      /* this will get XVideo going again, but only if XVideo was initialised
-@@ -5669,7 +5908,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5662,7 +5895,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
  	info->accel_state->XInited3D = FALSE;
  
  #ifdef XF86DRI
@@ -5407,10 +5379,11 @@
          if (info->ChipFamily >= CHIP_FAMILY_R600)
  		R600LoadShaders(pScrn);
  	RADEONCP_START(pScrn, info);
-@@ -5694,26 +5933,28 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5686,27 +5919,29 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONLeaveVT\n");
  #ifdef XF86DRI
-     if (RADEONPTR(pScrn)->directRenderingInited) {
+-    if (RADEONPTR(pScrn)->directRenderingInited) {
 -
 -	RADEONDRISetVBlankInterrupt (pScrn, FALSE);
 -	DRILock(pScrn->pScreen, 0);
@@ -5419,6 +5392,7 @@
 -        if (info->cardType == CARD_PCIE &&
 -	    info->dri->pKernelDRMVersion->version_minor >= 19 &&
 -	    info->FbSecureSize) {
++    if (info->directRenderingInited || info->dri2.enabled) {
 +	if (!info->drm_mode_setting) {
 +	    RADEONDRISetVBlankInterrupt (pScrn, FALSE);
 +	    DRILock(pScrn->pScreen, 0);
@@ -5451,7 +5425,7 @@
  
  	/* Make sure 3D clients will re-upload textures to video RAM */
  	if (info->dri->textureSize) {
-@@ -5729,6 +5970,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5722,6 +5957,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  		i = list[i].next;
  	    } while (i != 0);
  	}
@@ -5463,7 +5437,7 @@
      }
  #endif
  
-@@ -5755,10 +6001,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5748,10 +5988,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  
      xf86_hide_cursors (pScrn);
  
@@ -5485,7 +5459,7 @@
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Ok, leaving now...\n");
-@@ -5812,7 +6066,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5805,7 +6053,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
  #endif /* USE_XAA */
  
      if (pScrn->vtSema) {
@@ -5495,7 +5469,7 @@
      }
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5847,6 +6102,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5840,6 +6089,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
      info->DGAModes = NULL;
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Unmapping memory\n");
@@ -6377,7 +6351,7 @@
  }
  #endif
 diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
-index 59cb46f..7172cc2 100644
+index 59cb46f..8d6f085 100644
 --- a/src/radeon_exa_funcs.c
 +++ b/src/radeon_exa_funcs.c
 @@ -74,21 +74,73 @@ FUNC_NAME(RADEONSync)(ScreenPtr pScreen, int marker)
@@ -6661,14 +6635,7 @@
      BEGIN_ACCEL(2);
      OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
      OUT_ACCEL_REG(RADEON_WAIT_UNTIL,
-@@ -261,12 +392,15 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst)
- 
- #ifdef ACCEL_CP
- 
-+#if 0
- static Bool
- RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
- 		       char *src, int src_pitch)
+@@ -267,17 +398,27 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
  {
      RINFO_FROM_SCREEN(pDst->drawable.pScreen);
      unsigned int   bpp	     = pDst->drawable.bitsPerPixel;
@@ -6677,60 +6644,36 @@
      unsigned int   hpass;
      uint32_t	   buf_pitch, dst_pitch_off;
  
-@@ -275,9 +409,45 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
+     TRACE;
+ 
++    if (info->new_cs)
++	return FALSE;
++
      if (bpp < 8)
  	return FALSE;
  
 -    if (info->directRenderingEnabled &&
 -	RADEONGetPixmapOffsetPitch(pDst, &dst_pitch_off)) {
 -	uint8_t *buf;
-+    if (info->new_cs){
-+
-+	if (info->drm_mm) {
-+	    uint32_t offset, bo_width, bo_height = h;
-+
-+	    driver_priv = exaGetPixmapDriverPrivate(pDst);
-+	    if (!driver_priv)
-+		return FALSE;
-+
-+
-+	    if (radeon_bufmgr_gem_has_references(driver_priv->bo))
-+		RADEONCPFlushIndirect(pScrn, 0);
-+
-+	    radeon_bufmgr_gem_wait_rendering(driver_priv->bo);
-+
-+	    /* use pwrites - maybe require some sort of fallback */
-+	    bo_width = w * (bpp / 8);
-+	    offset = (x * bpp / 8) + (y * dst_pitch);
-+
-+	    while (bo_height--) {
-+		dri_bo_subdata(driver_priv->bo, offset, bo_width,
-+				     src);
-+		    
-+		src += src_pitch;
-+		offset += dst_pitch;
-+	    }
-+
-+	    return TRUE;
-+	}
-+    }
 +    if (!info->directRenderingEnabled && !info->drm_mode_setting)
 +        goto fallback;
 +
 +    if (!RADEONGetPixmapOffsetPitch(pDst, &dst_pitch_off))
 +        goto fallback;
 +
-+    if (!info->new_cs)
 +    {
 +        uint8_t *buf;
  	int cpp = bpp / 8;
  	ACCEL_PREAMBLE();
  
-@@ -300,17 +470,24 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
- 
+@@ -297,20 +438,26 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
+ 	exaMarkSync(pDst->drawable.pScreen);
+ 	return TRUE;
+     }
+-
++fallback:
      return FALSE;
  }
-+#endif
  
  /* Emit blit with arbitrary source and destination offsets and pitches */
  static void
@@ -6753,7 +6696,7 @@
      OUT_ACCEL_REG(RADEON_DP_GUI_MASTER_CNTL,
  		  RADEON_GMC_DST_PITCH_OFFSET_CNTL |
  		  RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
-@@ -321,8 +498,14 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset,
+@@ -321,8 +468,14 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset,
  		  RADEON_DP_SRC_SOURCE_MEMORY |
  		  RADEON_GMC_CLR_CMP_CNTL_DIS |
  		  RADEON_GMC_WR_MSK_DIS);
@@ -6768,7 +6711,7 @@
      OUT_ACCEL_REG(RADEON_SRC_Y_X, (srcY << 16) | srcX);
      OUT_ACCEL_REG(RADEON_DST_Y_X, (dstY << 16) | dstX);
      OUT_ACCEL_REG(RADEON_DST_HEIGHT_WIDTH, (h << 16) | w);
-@@ -334,6 +517,173 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset,
+@@ -334,6 +487,173 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset,
      FINISH_ACCEL();
  }
  
@@ -6942,7 +6885,7 @@
  
  static Bool
  RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
-@@ -347,12 +697,17 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
+@@ -347,12 +667,17 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
  
      TRACE;
  
@@ -6961,7 +6904,7 @@
  	RADEONGetPixmapOffsetPitch(pSrc, &src_pitch_offset) &&
  	(scratch = RADEONCPGetBuffer(pScrn)))
      {
-@@ -367,7 +722,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
+@@ -367,7 +692,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
  	RADEON_SWITCH_TO_2D();
  
  	/* Kick the first blit as early as possible */
@@ -6971,7 +6914,7 @@
  			x, y, 0, 0, w, hpass);
  	FLUSH_RING();
  
-@@ -394,7 +750,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
+@@ -394,7 +720,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
  	    /* Prepare next blit if anything's left */
  	    if (hpass) {
  		scratch_off = scratch->total/2 - scratch_off;
@@ -6981,13 +6924,7 @@
  				x, y, 0, 0, w, hpass);
  	    }
  
-@@ -468,15 +825,13 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
-     info->accel_state->exa->MarkSync = FUNC_NAME(RADEONMarkSync);
-     info->accel_state->exa->WaitMarker = FUNC_NAME(RADEONSync);
- #ifdef ACCEL_CP
--    info->accel_state->exa->UploadToScreen = RADEONUploadToScreenCP;
-+  //  info->accel_state->exa->UploadToScreen = RADEONUploadToScreenCP;
-     if (info->accelDFS)
+@@ -473,10 +800,8 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
  	info->accel_state->exa->DownloadFromScreen = RADEONDownloadFromScreenCP;
  #endif
  
@@ -6998,7 +6935,7 @@
  
      info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS;
  #ifdef EXA_SUPPORTS_PREPARE_AUX
-@@ -485,6 +840,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
+@@ -485,6 +810,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
      info->accel_state->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1;
      info->accel_state->exa->pixmapPitchAlign = 64;
  
@@ -7010,7 +6947,7 @@
  #ifdef RENDER
      if (info->RenderAccel) {
  	if (info->ChipFamily >= CHIP_FAMILY_R600)
-@@ -493,7 +853,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
+@@ -493,7 +823,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
  	else if (IS_R300_3D || IS_R500_3D) {
  	    if ((info->ChipFamily < CHIP_FAMILY_RS400)
  #ifdef XF86DRI
@@ -7019,7 +6956,7 @@
  #endif
  		) {
  		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
-@@ -528,6 +888,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
+@@ -528,6 +858,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
      }
  #endif
  
@@ -8028,7 +7965,7 @@
 +
 +
 diff --git a/src/radeon_probe.h b/src/radeon_probe.h
-index a0c6b2c..30fee18 100644
+index afc8e21..6138f36 100644
 --- a/src/radeon_probe.h
 +++ b/src/radeon_probe.h
 @@ -146,6 +146,27 @@ typedef struct


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- xorg-x11-drv-ati.spec	16 Mar 2009 02:17:17 -0000	1.161
+++ xorg-x11-drv-ati.spec	1 Apr 2009 07:18:42 -0000	1.162
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -76,6 +76,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.0-3
+- radeon-modeset: fix FUS on DRI22
+
 * Mon Mar 16 2009 Dave Airlie <airlied at redhat.com> 6.12.0-2
 - radeon-6.12.0-git-fixes: fixes from git upstream 
 



From mschwendt at fedoraproject.org  Wed Apr  1 08:03:36 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 08:03:36 +0000 (UTC)
Subject: rpms/python-ogg/devel python-ogg.spec,1.11,1.12
Message-ID: <20090401080336.BE54A7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/python-ogg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2712

Modified Files:
	python-ogg.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3-12
- Fix unowned headers directory (#483470).



Index: python-ogg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ogg/devel/python-ogg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-ogg.spec	26 Feb 2009 22:39:35 -0000	1.11
+++ python-ogg.spec	1 Apr 2009 08:03:06 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: Python wrapper for the Ogg libraries
 Name: python-ogg
 Version: 1.3
-Release: 11
+Release: 12
 License: LGPLv2
 Group: Development/Languages
 URL: http://ekyo.nerim.net/software/pyogg/
@@ -56,10 +56,14 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{python_incdir}/pyogg
 %{python_incdir}/pyogg/pyogg.h
 
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3-12
+- Fix unowned headers directory (#483470).
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Wed Apr  1 08:13:51 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 08:13:51 +0000 (UTC)
Subject: rpms/grib_api/devel grib_api.spec,1.4,1.5
Message-ID: <20090401081351.2F5C67011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/grib_api/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4013

Modified Files:
	grib_api.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7.0-2
- Fix unowned directory.
- Fix subpackage Group tags.
- Use %_includedir in files section.



Index: grib_api.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/grib_api.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grib_api.spec	18 Mar 2009 03:05:01 -0000	1.4
+++ grib_api.spec	1 Apr 2009 08:13:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grib_api
 Version:        1.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        WMO FM-92 GRIB (v1,v2) interface accessible from C and FORTRAN programs
 
 Group:          Applications/System
@@ -19,7 +19,7 @@
 
 %package devel
 Summary:    GRIB API development headers
-Group:      Development/Languages
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-static = %{version}-%{release}
 
@@ -28,7 +28,7 @@
 
 %package static
 Summary:    GRIB API static libraries
-Group:      Applications/System
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-devel = %{version}-%{release}
 
@@ -61,6 +61,7 @@
 %files
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
+%dir %{_datadir}/%{name}
 %doc %{_datadir}/%{name}/samples/
 %doc %{_datadir}/%{name}/definitions/
 %{_bindir}/*
@@ -68,7 +69,7 @@
 %files devel
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%{_prefix}/include/*
+%{_includedir}/*
 
 %files static
 %defattr(-,root,root,-)
@@ -76,6 +77,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7.0-2
+- Fix unowned directory.
+- Fix subpackage Group tags.
+- Use %%_includedir in files section.
+
 * Tue Mar 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-1
 - New upstream version
 



From mschwendt at fedoraproject.org  Wed Apr  1 08:21:58 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 08:21:58 +0000 (UTC)
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.35,1.36
Message-ID: <20090401082158.A34277011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/nfs-utils-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5221

Modified Files:
	nfs-utils-lib.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1.4-4
- Fix unowned header directories (#483464).



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- nfs-utils-lib.spec	26 Feb 2009 05:33:22 -0000	1.35
+++ nfs-utils-lib.spec	1 Apr 2009 08:21:28 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -133,6 +133,8 @@
 %defattr(0644,root,root,755)
 %{_libdir}/librpcsecgss.a
 %{_libdir}/librpcsecgss.so
+%dir %{_includedir}/rpcsecgss
+%dir %{_includedir}/rpcsecgss/rpc
 %{_includedir}/rpcsecgss/rpc/auth.h
 %{_includedir}/rpcsecgss/rpc/auth_gss.h
 %{_includedir}/rpcsecgss/rpc/svc.h
@@ -144,6 +146,9 @@
 %{_libdir}/libnfsidmap*.a
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1.4-4
+- Fix unowned header directories (#483464).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rhughes at fedoraproject.org  Wed Apr  1 08:29:52 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed,  1 Apr 2009 08:29:52 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel .cvsignore, 1.8, 1.9 DeviceKit-power.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20090401082952.E23337011D@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5875

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Tue Apr 01 2009 Richard Hughes  <rhughes at redhat.com> - 008-0.1.20090401git
- Update to todays git snapshot which works with the new permissive DBus.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Mar 2009 11:24:32 -0000	1.8
+++ .cvsignore	1 Apr 2009 08:29:22 -0000	1.9
@@ -1 +1 @@
-DeviceKit-power-007.tar.gz
+DeviceKit-power-008-20090401.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DeviceKit-power.spec	30 Mar 2009 13:52:24 -0000	1.10
+++ DeviceKit-power.spec	1 Apr 2009 08:29:22 -0000	1.11
@@ -4,18 +4,18 @@
 %define DeviceKit_version       002
 %define polkit_version          0.8
 %define parted_version          1.8.8
+%define alphatag                20090401
 
 Summary: Power Management Service
 Name: DeviceKit-power
-Version: 007
-Release: 2%{?dist}
+Version: 008
+Release: 0.1.%{?alphatag}git%{?dist}
+#Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit.git;a=summary
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
-
-# Already upstream
-Patch0:    DeviceKit-power-007-fix-compile.patch
+Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+#Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): /sbin/ldconfig
@@ -52,8 +52,8 @@
 Headers and libraries for DeviceKit-power.
 
 %prep
-%setup -q
-%patch0 -p1 -b .fix-compile
+#%setup -q
+%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 01 2009 Richard Hughes  <rhughes at redhat.com> - 008-0.1.20090401git
+- Update to todays git snapshot which works with the new permissive DBus.
+
 * Mon Mar 30 2009 Richard Hughes <richard at hughsie.com> 007-2
 - Try to fix a compile error with koji and the new gcc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Mar 2009 11:24:32 -0000	1.8
+++ sources	1 Apr 2009 08:29:22 -0000	1.9
@@ -1 +1 @@
-4b1159374f36e23fe7d920f934076269  DeviceKit-power-007.tar.gz
+f445f1eecd35c38466c3b2abb7147ef1  DeviceKit-power-008-20090401.tar.gz



From caolanm at fedoraproject.org  Wed Apr  1 08:36:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  1 Apr 2009 08:36:52 +0000 (UTC)
Subject: rpms/hunspell-sk/devel .cvsignore, 1.5, 1.6 hunspell-sk.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <20090401083652.36DC57011D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6371

Modified Files:
	.cvsignore hunspell-sk.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2009 12:41:43 -0000	1.5
+++ .cvsignore	1 Apr 2009 08:36:21 -0000	1.6
@@ -1 +1 @@
-hunspell-sk-20090106.zip
+hunspell-sk-20090330.zip


Index: hunspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/hunspell-sk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hunspell-sk.spec	25 Feb 2009 05:28:02 -0000	1.8
+++ hunspell-sk.spec	1 Apr 2009 08:36:21 -0000	1.9
@@ -1,9 +1,9 @@
 Name: hunspell-sk
 Summary: Slovak hunspell dictionaries
 Epoch: 1
-%define upstreamid 20090106
+%define upstreamid 20090330
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://www.sk-spell.sk.cx/file_download/51/%{name}-%{upstreamid}.zip
 Group: Applications/Text
 URL: http://www.sk-spell.sk.cx/
@@ -34,6 +34,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Apr 01 2009 Caolan McNamara <caolanm at redhat.com> - 1:0.20090330-1
+- latest version
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.20090106-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2009 12:50:54 -0000	1.6
+++ sources	1 Apr 2009 08:36:21 -0000	1.7
@@ -1 +1 @@
-f5d7adfd55c2802438b3d7386fc7d971  hunspell-sk-20090106.zip
+f5d7adfd55c2802438b3d7386fc7d971  hunspell-sk-20090330.zip



From transif at fedoraproject.org  Wed Apr  1 08:50:18 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 08:50:18 +0000 (UTC)
Subject: comps/po as.po,1.18,1.19
Message-ID: <20090401085018.942727011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7819/po

Modified Files:
	as.po 
Log Message:
Sending translation for Assamese


Index: as.po
===================================================================
RCS file: /cvs/pkgs/comps/po/as.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- as.po	9 Jan 2009 11:52:35 -0000	1.18
+++ as.po	1 Apr 2009 08:49:48 -0000	1.19
@@ -4,19 +4,19 @@
 #
 # Amitakhya Phukan <amitakhya.phukan at gmail.com>, 2006.
 # Amitakhya Phukan <aphukan at redhat.com>, 2006, 2007, 2008.
-# Amitakhya Phukan <aphukan at fedoraproject.org>, 2008.
+# Amitakhya Phukan <aphukan at fedoraproject.org>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-09-23 12:13+0530\n"
+"POT-Creation-Date: 2009-03-31 02:03+0000\n"
+"PO-Revision-Date: 2009-04-01 11:21+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
-"Language-Team: Assamese\n"
+"Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
@@ -25,192 +25,192 @@
 msgstr "????????? ????????????????????? ??????????????????'??? ?????????????????? ?????? ??????????????? ???????????????????????? ????????????????????? ??????????????? ????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "????????????????????? ???????????????????????? ???????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????????? ?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "???????????? ?????????'????????????????????? ??????????????? ??????????????? ?????????????????? ???"
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????????????????????? ??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "?????????????????????????????? ????????? ????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "?????????????????????????????? ????????? ????????? ??????????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "?????????'????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ????????? ????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "?????????????????? ???????????? ??????????????????????????? ?????????????????????  ?????????????????? ?????????????????????????????? ?????????-??????????????????(???????????????????????????)"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "?????????????????? ???????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "??????????????? ????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "????????? ??????????????? ??????????????????"
 
@@ -219,78 +219,78 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "????????????????????????-????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "?????????????????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "?????????????????? ?????????????????? ???????????? ?????????????????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "???????????????????????????????????? ????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "?????????????????? (UK)??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "?????????'????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora Packager"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "????????????????????????' ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -300,19 +300,19 @@
 "???????????????????????? ???????????? ?????????????????? ???????????????????????????????????????????????? ??????????????? ??? ??????????????? ???????????? ????????????????????? ????????????'?????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -321,169 +321,165 @@
 "???????????????, ?????????????????????, ???????????????????????????????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? ?????????????????????  ???"
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "???????????????????????? ????????? ????????????-??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????????????????? ????????????????????????'???"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "??????????????? ?????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "??????????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "?????????????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"GTK+ ????????? GNOME ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
+msgstr "GTK+ ????????? GNOME ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"GTK+ ????????? XFCE ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
+msgstr "GTK+ ????????? XFCE ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE-??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "???????????????????????????????????????????????? ?????????????????? ?????????????????? ????????????????????? ?????? ?????????????????? ????????????????????? ???????????? ?????????????????? ????????? ??????????????? ????????????'?????? ?????? "
 "?????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "????????? ?????????????????????????????? (X) ??????????????????????????????????????? ??????????????? ?????????????????? ????????????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? "
 "????????? ???"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
-msgstr "????????????"
+msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
-msgstr "??????????????? ??????????????????"
+msgstr "Java??? ??????????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ????????????????????? ??????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -492,121 +488,121 @@
 "???????????????, ?????????????????????, ???????????????????????????????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "???'??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "?????????????????? ??????'??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "?????????????????? ????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "?????????????????? ????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "????????? ??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????'??????????????? ???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "????????????????????? ???'???' ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "????????????'??? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "?????????????????????????????????/????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -614,111 +610,110 @@
 msgstr "??????????????????????????????????????? ????????????????????? ????????? ????????????????????? ????????????'?????? ?????? ???????????????????????? ???????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "???'??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????? ???????????????????????? ????????????????????? ?????? ???????????? ???????????? ??????????????????'??? ????????????????????? ????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "??????????????????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "??????'??????????????? ???????????? ????????????'?????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "??????'???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -727,77 +722,77 @@
 "????????????'?????? ??????????????? ????????? ??? ???????????? ????????????????????????????????? ?????? ????????? Emacs ????????? Vi ???"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????? ????????? ???????????????'"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "?????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "?????????????????? ???'???' ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
-msgstr " ???????????? ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ??????????????????"
+msgstr " Java ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
-msgstr "???????????? ?????????'????????????????????? ??????????????? ?????????'?????????????????? ????????????'?????? ???????????? ??????????????????"
+msgstr "Java ?????????'????????????????????? ??????????????? ?????????'?????????????????? ????????????'?????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "???????????????????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????-?????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????? ??????????????? ??????????????????"
 
@@ -806,7 +801,7 @@
 msgstr "???????????????????????? ???????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
@@ -814,44 +809,38 @@
 "?????????????????? ????????? ???????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "?????? ???????????? ????????????????????? ???????????? ?????????????????????????????? ?????????????????? ???????????? ??????????????????????????? ????????? ?????????????????????  ?????????????????? ?????????????????????????????? "
 "?????????-?????????????????? ???"
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"?????? ????????????????????? ??????????????? ?????????????????? ??????????????? ????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ???????????? ???"
+msgstr "?????? ????????????????????? ??????????????? ?????????????????? ??????????????? ????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ???????????? ???"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "?????? ????????????????????? ??????????????? ?????????????????? ??????????????? X ???????????????-????????????????????? ???????????????????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? "
 "???????????? ???????????? ???"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????? ??????????????????????????? ?????? ???????????? ????????????????????? ?????????????????? ?????? ????????????????????????????????? ??????????????? ?????? ???"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr ""
-"?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????'??????????????? ?????????????????? ???????????? ???????????? DHCP, Kerberos ????????? NIS ???"
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgstr "?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????'??????????????? ?????????????????? ???????????? ???????????? DHCP, Kerberos ????????? NIS ???"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -859,25 +848,24 @@
 "?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????????????? ??????'??????????????? ???????????????-??????????????? ???????????? ???????????? rsh ????????? telnet ???"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ????????????????????? ??????????????? ??????????????????????????????????????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ????????????????????? ??????????????? ???????????????????????? ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr ""
-"?????? ????????????????????? ??????????????? ????????????????????? ???????????????????????? ????????? ????????? ????????? ??????????????? ????????????????????? ????????????????????? ??????????????? ????????? ???"
+msgstr "?????? ????????????????????? ??????????????? ????????????????????? ???????????????????????? ????????? ????????? ????????? ??????????????? ????????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -886,19 +874,19 @@
 "??????????????? ???????????? ?????????????????????????????? ????????????'?????? ?????????????????? ???????????? ???"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ?????????????????? ??????????????? ?????????????????? ???????????????????????????????????????????????? ???????????? ???????????? ????????????'?????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ?????????????????? ??????????????? ?????????????????? ???????????????????????????????????????????????? FTP ???????????? ????????????'?????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -908,18 +896,18 @@
 "???????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ???????????? ?????????????????? ??????????????? ???????????? ???????????? ???????????????????????????????????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "?????? ???????????? Red Hat-??? ???????????? ??????????????????????????? ??????????????? ????????????????????? ?????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -928,13 +916,13 @@
 "?????????????????? ?????????????????? ???????????? ???????????? ?????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ???????????? ?????????????????????????????? ????????????, ???????????? ????????? ????????? ??????????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -942,13 +930,13 @@
 msgstr "?????? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ????????? ?????????????????? ??????????????? ????????? ??????????????? ????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????? ???????????? ????????????????????????????????? ????????? ?????????????????????????????? ?????????????????????????????? ????????? ??????????????????????????? ???????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -958,7 +946,7 @@
 "???????????????-????????????????????? ???????????????????????????????????????????????? ????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -968,21 +956,19 @@
 "???????????????-????????? ??????????????????????????? ????????? ????????? ???????????????????????????????????????????????? ????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????? ????????? ?????????????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????????????????? ??????????????????-????????????????????? ???????????????????????? ???????????? ?????? ????????? ???????????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -992,14 +978,12 @@
 "????????? ??????'??????????????? ???????????? ????????? ???????????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
-msgstr ""
-"?????? ???????????????????????? ?????????????????? ???????????????????????????????????????????????? DNS ????????????????????? ????????????(BIND) ??????????????? ??????????????? ????????? ???"
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
+msgstr "?????? ???????????????????????? ?????????????????? ???????????????????????????????????????????????? DNS ????????????????????? ????????????(BIND) ??????????????? ??????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1008,328 +992,359 @@
 "????????? ???"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ???????????????????????? ???????????? ????????? MySQL??? ???????????? ?????????????????? ????????????'?????? ???????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ???????????????????????? ???????????? ????????? Postgresql??? ???????????? ?????????????????? ????????????'?????? ???????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "???'???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "????????? Fedora Packager ??? ?????????????????? ????????????????????? ???????????? ????????????????????? ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "???'???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "???????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????????????????????????? ????????????????????? ????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????? ??????????????? ????????? ????????????????????? ????????? ???????????? ????????????'?????? ????????????????????? ????????? ???"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????? ???????????? ???"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows ???????????????????????? ???????????? ???"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ????????????????????????????????? ?????????????????? ???"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ???????????????-????????????????????? ?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "Buildsystem ???????????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "?????????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "??????????????????'?????? ????????? ??????????????????????????? ???????????? ????????????????????? ???"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "??????????????????????????? ?????????????????? ????????? ???????????????????????? ?????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "?????????????????? ?????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "??????' ?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "??????????????? bitmap ????????? vector ???????????? ?????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "???????????????????????? ??????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
-msgstr "??????????????????????????? ??????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "????????????????????? ???????????? ??????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ???????????? OLPC XO ??? ???????????? ????????????????????? ????????? ??????????????????'??? ?????????????????? ???"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "????????????????????? ????????? ????????????????????? ????????????????????????????????? ?????????????????????????????? ???"
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskell ??? ???????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "????????????????????????????????? ???????????? ??????????????? ?????????????????? ??????????????? ????????????????????? ????????????????????? ???"
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "??????????????????????????? (???????????????????????????) ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ?????????????????? ???"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "???????????? ??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "??????????????????????????? ???????????????????????? ??????????????????????????? ??????????????? ???????????????????????? ????????? ??????????????????????????? ?????????????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "????????????????????????????????? ??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "???'???????????? ???????????????????????? ????????? ?????????????????? ????????? ?????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "??????????????????????????? ??????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "????????????????????????' ??????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????? ??????????????? ??????????????????"
+msgstr "?????????????????????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "???????????? ??????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW cross-compiler"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "???????????????????????? ??????????????? ??????????????????"
+msgstr "???'????????????????????? ??????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "??????-???????????? ???????????? ????????? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Sugar ????????????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr ""
+"?????? ????????? Windows ????????????????????? ??????????????? ???????????????????????????????????? cross-compiling ??? ??????????????????, ?????????????????? ????????????????????? ?????????, "
+"????????? ???????????????????????? ?????????????????? ?????????, ???????????? Fedora ??? ?????????????????? ???"
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr ""
+"Objective CAML ????????????????????????????????? ???????????? ????????? ??????????????????????????? ????????????????????? ????????? ?????????????????????????????? ??????????????? ???????????? ?????????????????? ???"
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????? ????????? ?????????????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
+msgstr "?????? ????????? ???'???????????? ????????????????????????, ?????????????????????, ???????????????????????????, ????????? ????????? ??????????????? ???????????????????????? ?????????????????? ???"
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "???????????????????????? ??????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "??????????????????????????? ??????????????? ??????????????????"
+msgstr "???????????? ???'????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1382,18 +1397,15 @@
 msgstr "???????????? ????????????????????????????????? ??????????????? ???????????? ??????'??????????????? ??????????????? ???????????? ????????? ?????????????????? ?????? ???"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ????????? ??????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ????????? ????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ????????? ????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1401,6 +1413,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ????????? ????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
+



From airlied at fedoraproject.org  Wed Apr  1 08:54:39 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  1 Apr 2009 08:54:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.27,
	1.28 radeon-6.12.0-git-fixes.patch, 1.1,
	1.2 radeon-modeset.patch, 1.40, 1.41 sources, 1.27,
	1.28 xorg-x11-drv-ati.spec, 1.162, 1.163
Message-ID: <20090401085439.35BF17011D@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8131

Modified Files:
	.cvsignore radeon-6.12.0-git-fixes.patch radeon-modeset.patch 
	sources xorg-x11-drv-ati.spec 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-1
- rebase to upstream + fix FUS on DRI2 + video on r100/r200 hopefully



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 Mar 2009 08:42:43 -0000	1.27
+++ .cvsignore	1 Apr 2009 08:54:08 -0000	1.28
@@ -1 +1 @@
-xf86-video-ati-6.12.0.tar.bz2
+xf86-video-ati-6.12.1.tar.bz2

radeon-6.12.0-git-fixes.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 radeon-6.12.0-git-fixes.patch
Index: radeon-6.12.0-git-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.12.0-git-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.12.0-git-fixes.patch	16 Mar 2009 02:17:17 -0000	1.1
+++ radeon-6.12.0-git-fixes.patch	1 Apr 2009 08:54:08 -0000	1.2
@@ -1,514 +1,2097 @@
+diff --git a/configure.ac b/configure.ac
+index 3848f4c..660ea1f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@
+ 
+ AC_PREREQ(2.57)
+ AC_INIT([xf86-video-ati],
+-        6.12.1,
++        6.12.1.99,
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+         xf86-video-ati)
+ 
+diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
+index d532f16..f31cadb 100644
+--- a/src/ati_pciids_gen.h
++++ b/src/ati_pciids_gen.h
+@@ -429,3 +429,10 @@
+ #define PCI_CHIP_RS780_9612 0x9612
+ #define PCI_CHIP_RS780_9613 0x9613
+ #define PCI_CHIP_RS780_9614 0x9614
++#define PCI_CHIP_RS780_9615 0x9615
++#define PCI_CHIP_RS780_9616 0x9616
++#define PCI_CHIP_RS880_9710 0x9710
++#define PCI_CHIP_RS880_9711 0x9711
++#define PCI_CHIP_RS880_9712 0x9712
++#define PCI_CHIP_RS880_9713 0x9713
++#define PCI_CHIP_RS880_9714 0x9714
 diff --git a/src/atombios_output.c b/src/atombios_output.c
-index 130ab93..70e716c 100644
+index 35d1767..4af04c1 100644
 --- a/src/atombios_output.c
 +++ b/src/atombios_output.c
-@@ -1019,30 +1019,11 @@ static void atom_rv515_force_tv_scaler(ScrnInfoPtr pScrn)
- static int
- atombios_output_yuv_setup(xf86OutputPtr output, Bool enable)
- {
--    RADEONOutputPrivatePtr radeon_output = output->driver_private;
-     RADEONInfoPtr info       = RADEONPTR(output->scrn);
-     RADEONCrtcPrivatePtr radeon_crtc = output->crtc->driver_private;
-     ENABLE_YUV_PS_ALLOCATION disp_data;
-     AtomBiosArgRec data;
-     unsigned char *space;
--    unsigned char *RADEONMMIO = info->MMIO;
--    uint32_t temp, reg;
--
--    if (info->ChipFamily >= CHIP_FAMILY_R600)
--	reg = R600_BIOS_3_SCRATCH;
--    else
--	reg = RADEON_BIOS_3_SCRATCH;
--
--    //fix up scratch reg handling
--    temp = INREG(reg);
--    if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT))
--	OUTREG(reg, (ATOM_S3_TV1_ACTIVE |
--		     (radeon_crtc->crtc_id << 18)));
--    else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT))
--	OUTREG(reg, (ATOM_S3_CV_ACTIVE |
--		     (radeon_crtc->crtc_id << 24)));
--    else
--	OUTREG(reg, 0);
- 
-     memset(&disp_data, 0, sizeof(disp_data));
- 
-@@ -1055,15 +1036,10 @@ atombios_output_yuv_setup(xf86OutputPtr output, Bool enable)
-     data.exec.pspace = &disp_data;
- 
-     if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
--
--	OUTREG(reg, temp);
--
- 	ErrorF("crtc %d YUV %s setup success\n", radeon_crtc->crtc_id, enable ? "enable" : "disable");
- 	return ATOM_SUCCESS;
-     }
- 
--    OUTREG(reg, temp);
--
-     ErrorF("crtc %d YUV %s setup failed\n", radeon_crtc->crtc_id, enable ? "enable" : "disable");
-     return ATOM_NOT_IMPLEMENTED;
+@@ -1406,8 +1406,12 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
+ 	default:
+ 	    if (IS_AVIVO_VARIANT)
+ 		crtc_src_param.ucCRTC = radeon_crtc->crtc_id;
+-	    else
+-		crtc_src_param.ucCRTC = radeon_crtc->crtc_id << 2;
++	    else {
++		if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
++		    crtc_src_param.ucCRTC = radeon_crtc->crtc_id;
++		else
++		    crtc_src_param.ucCRTC = radeon_crtc->crtc_id << 2;
++	    }
+ 	    switch (radeon_encoder->encoder_id) {
+ 	    case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
+ 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
+index 4d4e625..bff80ca 100644
+--- a/src/pcidb/ati_pciids.csv
++++ b/src/pcidb/ati_pciids.csv
+@@ -430,3 +430,10 @@
+ "0x9612","RS780_9612","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics"
+ "0x9613","RS780_9613","RS780",,1,,,1,"ATI Radeon 3100 Graphics"
+ "0x9614","RS780_9614","RS780",,1,,,1,"ATI Radeon HD 3300 Graphics"
++"0x9615","RS780_9615","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics"
++"0x9616","RS780_9616","RS780",,1,,,1,"ATI Radeon 3000 Graphics"
++"0x9710","RS880_9710","RS880",,1,,,1,"ATI Radeon HD Graphics"
++"0x9711","RS880_9711","RS880",,1,,,1,"ATI Radeon Graphics"
++"0x9712","RS880_9712","RS880",1,1,,,1,"ATI Mobility Radeon HD Graphics"
++"0x9713","RS880_9713","RS880",1,1,,,1,"ATI Mobility Radeon Graphics"
++"0x9714","RS880_9714","RS880",,1,,,1,"ATI Radeon Graphics"
+diff --git a/src/r600_exa.c b/src/r600_exa.c
+index 40f02e1..2dc33a8 100644
+--- a/src/r600_exa.c
++++ b/src/r600_exa.c
+@@ -1098,6 +1098,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     unsigned int i;
+     tex_resource_t  tex_res;
+     tex_sampler_t   tex_samp;
++    int pix_r, pix_g, pix_b, pix_a;
  
-diff --git a/src/radeon_accel.c b/src/radeon_accel.c
-index dffbc57..a9a4848 100644
---- a/src/radeon_accel.c
-+++ b/src/radeon_accel.c
-@@ -688,8 +688,6 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard)
-     drmBufPtr          buffer = info->cp->indirectBuffer;
-     int                start  = info->cp->indirectStart;
-     drm_radeon_indirect_t  indirect;
--    RING_LOCALS;
--    RADEONCP_REFRESH(pScrn, info);
- 
-     if (!buffer) return;
-     if (start == buffer->used && !discard) return;
-@@ -700,10 +698,14 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard)
+     CLEAR (tex_res);
+     CLEAR (tex_samp);
+@@ -1142,46 +1143,102 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     switch (pPict->format) {
+     case PICT_a1r5g5b5:
+     case PICT_a8r8g8b8:
+-	tex_res.dst_sel_x           = SQ_SEL_Z; /* R */
+-	tex_res.dst_sel_y           = SQ_SEL_Y; /* G */
+-	tex_res.dst_sel_z           = SQ_SEL_X; /* B */
+-	tex_res.dst_sel_w           = SQ_SEL_W; /* A */
++	pix_r = SQ_SEL_Z; /* R */
++	pix_g = SQ_SEL_Y; /* G */
++	pix_b = SQ_SEL_X; /* B */
++	pix_a = SQ_SEL_W; /* A */
+ 	break;
+     case PICT_a8b8g8r8:
+-	tex_res.dst_sel_x           = SQ_SEL_X; /* R */
+-	tex_res.dst_sel_y           = SQ_SEL_Y; /* G */
+-	tex_res.dst_sel_z           = SQ_SEL_Z; /* B */
+-	tex_res.dst_sel_w           = SQ_SEL_W; /* A */
++	pix_r = SQ_SEL_X; /* R */
++	pix_g = SQ_SEL_Y; /* G */
++	pix_b = SQ_SEL_Z; /* B */
++	pix_a = SQ_SEL_W; /* A */
+ 	break;
+     case PICT_x8b8g8r8:
+-	tex_res.dst_sel_x           = SQ_SEL_X; /* R */
+-	tex_res.dst_sel_y           = SQ_SEL_Y; /* G */
+-	tex_res.dst_sel_z           = SQ_SEL_Z; /* B */
+-	tex_res.dst_sel_w           = SQ_SEL_1; /* A */
++	pix_r = SQ_SEL_X; /* R */
++	pix_g = SQ_SEL_Y; /* G */
++	pix_b = SQ_SEL_Z; /* B */
++	pix_a = SQ_SEL_1; /* A */
+ 	break;
+     case PICT_x1r5g5b5:
+     case PICT_x8r8g8b8:
+-	tex_res.dst_sel_x           = SQ_SEL_Z; /* R */
+-	tex_res.dst_sel_y           = SQ_SEL_Y; /* G */
+-	tex_res.dst_sel_z           = SQ_SEL_X; /* B */
+-	tex_res.dst_sel_w           = SQ_SEL_1; /* A */
+-	break;
+     case PICT_r5g6b5:
+-	tex_res.dst_sel_x           = SQ_SEL_Z; /* R */
+-	tex_res.dst_sel_y           = SQ_SEL_Y; /* G */
+-	tex_res.dst_sel_z           = SQ_SEL_X; /* B */
+-	tex_res.dst_sel_w           = SQ_SEL_1; /* A */
++	pix_r = SQ_SEL_Z; /* R */
++	pix_g = SQ_SEL_Y; /* G */
++	pix_b = SQ_SEL_X; /* B */
++	pix_a = SQ_SEL_1; /* A */
+ 	break;
+     case PICT_a8:
+-	tex_res.dst_sel_x           = SQ_SEL_0; /* R */
+-	tex_res.dst_sel_y           = SQ_SEL_0; /* G */
+-	tex_res.dst_sel_z           = SQ_SEL_0; /* B */
+-	tex_res.dst_sel_w           = SQ_SEL_X; /* A */
++	pix_r = SQ_SEL_0; /* R */
[...2186 lines suppressed...]
++			      (2 << R200_TXC_TFACTOR_SEL_SHIFT) |
++			      R200_TXC_SCALE_2X |
++			      (R200_TXC_REPL_RED << R200_TXC_REPL_ARG_B_SHIFT) |
++			      R200_TXC_CLAMP_0_1 | R200_TXC_OUTPUT_REG_R0);
++		OUT_ACCEL_REG(R200_PP_TXABLEND_2,
++			      R200_TXA_ARG_A_ZERO |
++			      R200_TXA_ARG_B_ZERO |
++			      R200_TXA_ARG_C_ZERO |
++			      R200_TXA_COMP_ARG_C |
++			      R200_TXA_OP_MADD);
++		OUT_ACCEL_REG(R200_PP_TXABLEND2_2,
++			      R200_TXA_CLAMP_0_1 | R200_TXA_OUTPUT_REG_R0);
++
++		/* shader constants */
++		OUT_ACCEL_REG(R200_PP_TFACTOR_0, float4touint(1.0, /* src range [1, 2] */
++							      yco - 1.0,
++							      -yoff, /* range [-1, 0] */
++							      0.0));
++		OUT_ACCEL_REG(R200_PP_TFACTOR_1, float4touint(uco[0] * 0.125 + 0.5, /* range [-4, 4] */
++							      uco[1] * 0.125 + 0.5,
++							      uco[2] * 0.125 + 0.5,
++							      0.0));
++		OUT_ACCEL_REG(R200_PP_TFACTOR_2, float4touint(vco[0] * 0.25 + 0.5, /* range [-2, 2] */
++							      vco[1] * 0.25 + 0.5,
++							      vco[2] * 0.25 + 0.5,
++							      0.0));
++
++		FINISH_ACCEL();
 +	    }
- 	    break;
- 	case ATOM_DEVICE_DFP2_SUPPORT:
--	    if (connected)
-+	    if (connected) {
- 		save->bios_4_scratch |= RADEON_DFP2_ATTACHED;
--	    else
-+		save->bios_5_scratch |= RADEON_DFP2_ON;
-+	    } else {
- 		save->bios_4_scratch &= ~RADEON_DFP2_ATTACHED;
-+		save->bios_5_scratch &= ~RADEON_DFP2_ON;
++	    else {
++		BEGIN_ACCEL(13);
++		OUT_ACCEL_REG(RADEON_PP_CNTL,
++			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
++
++		OUT_ACCEL_REG(R200_SE_VTX_FMT_0, R200_VTX_XY);
++		OUT_ACCEL_REG(R200_SE_VTX_FMT_1,
++			      (2 << R200_VTX_TEX0_COMP_CNT_SHIFT));
++
++		OUT_ACCEL_REG(R200_PP_TXFILTER_0,
++			      R200_MAG_FILTER_LINEAR |
++			      R200_MIN_FILTER_LINEAR |
++			      R200_CLAMP_S_CLAMP_LAST |
++			      R200_CLAMP_T_CLAMP_LAST |
++			      R200_YUV_TO_RGB);
++		OUT_ACCEL_REG(R200_PP_TXFORMAT_0, txformat);
++		OUT_ACCEL_REG(R200_PP_TXFORMAT_X_0, 0);
++		OUT_ACCEL_REG(R200_PP_TXSIZE_0,
++			      (pPriv->w - 1) |
++			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
++		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
++
++		OUT_ACCEL_REG(R200_PP_TXOFFSET_0, pPriv->src_offset);
++
++		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
++			      R200_TXC_ARG_A_ZERO |
++			      R200_TXC_ARG_B_ZERO |
++			      R200_TXC_ARG_C_R0_COLOR |
++			      R200_TXC_OP_MADD);
++		OUT_ACCEL_REG(R200_PP_TXCBLEND2_0,
++			      R200_TXC_CLAMP_0_1 | R200_TXC_OUTPUT_REG_R0);
++		OUT_ACCEL_REG(R200_PP_TXABLEND_0,
++			      R200_TXA_ARG_A_ZERO |
++			      R200_TXA_ARG_B_ZERO |
++			      R200_TXA_ARG_C_R0_ALPHA |
++			      R200_TXA_OP_MADD);
++		OUT_ACCEL_REG(R200_PP_TXABLEND2_0,
++			      R200_TXA_CLAMP_0_1 | R200_TXA_OUTPUT_REG_R0);
++		FINISH_ACCEL();
 +	    }
- 	    break;
- 	}
- 	OUTREG(RADEON_BIOS_4_SCRATCH, save->bios_4_scratch);
-+	OUTREG(RADEON_BIOS_5_SCRATCH, save->bios_5_scratch);
+ 	} else {
+ 
+ 	    info->accel_state->texW[0] = 1;
+ 	    info->accel_state->texH[0] = 1;
+ 
+-	    BEGIN_ACCEL(8);
++	    BEGIN_ACCEL(9);
++
++	    OUT_ACCEL_REG(RADEON_PP_CNTL,
++			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
+ 
+ 	    OUT_ACCEL_REG(RADEON_SE_VTX_FMT, (RADEON_SE_VTX_FMT_XY |
+ 					      RADEON_SE_VTX_FMT_ST0));
+@@ -1672,6 +2180,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			    ((float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0)) / info->accel_state->texW[0],
+ 			                                              (float)srcY / info->accel_state->texH[0]);
+ 		}
++	    } else if (isplanar) {
++		/*
++		 * Just render a rect (using three coords).
++		 * Filter is a bit a misnomer, it's just texcoords...
++		 */
++		VTX_OUT_FILTER((float)dstX,                                (float)(dstY + dsth),
++			(float)srcX / info->accel_state->texW[0],          (float)(srcY + srch) / info->accel_state->texH[0],
++			(float)srcX / info->accel_state->texW[0],          (float)(srcY + srch) / info->accel_state->texH[0]);
++		VTX_OUT_FILTER((float)(dstX + dstw),                       (float)(dstY + dsth),
++			(float)(srcX + srcw) / info->accel_state->texW[0], (float)(srcY + srch) / info->accel_state->texH[0],
++			(float)(srcX + srcw) / info->accel_state->texW[0], (float)(srcY + srch) / info->accel_state->texH[0]);
++		VTX_OUT_FILTER((float)(dstX + dstw),                       (float)dstY,
++			(float)(srcX + srcw) / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0],
++			(float)(srcX + srcw) / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0]);
+ 	    } else {
+ 		/*
+ 		 * Just render a rect (using three coords).
+diff --git a/src/radeon_tv.c b/src/radeon_tv.c
+index 98e3b0a..eef45d9 100644
+--- a/src/radeon_tv.c
++++ b/src/radeon_tv.c
+@@ -815,7 +815,9 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save,
+     save->tv_rgb_cntl = (RADEON_RGB_DITHER_EN
+ 			 | RADEON_TVOUT_SCALE_EN
+ 			 | (0x0b << RADEON_UVRAM_READ_MARGIN_SHIFT)
+-			 | (0x07 << RADEON_FIFORAM_FFMACRO_READ_MARGIN_SHIFT));
++			 | (0x07 << RADEON_FIFORAM_FFMACRO_READ_MARGIN_SHIFT)
++			 | RADEON_RGB_ATTEN_SEL(0x3)
++			 | RADEON_RGB_ATTEN_VAL(0xc));
+ 
+     if (IsPrimary) {
+ 	if (radeon_output->Flags & RADEON_USE_RMX)
+diff --git a/src/radeon_video.c b/src/radeon_video.c
+index 92d1a71..42aa036 100644
+--- a/src/radeon_video.c
++++ b/src/radeon_video.c
+@@ -297,22 +297,19 @@ void RADEONInitVideo(ScreenPtr pScreen)
+ 	RADEONInitOffscreenImages(pScreen);
      }
  
- }
+-    if (info->ChipFamily != CHIP_FAMILY_RV250) {
+-	if ((info->ChipFamily < CHIP_FAMILY_RS400)
++    if ((info->ChipFamily < CHIP_FAMILY_RS400)
+ #ifdef XF86DRI
+-	    || (info->directRenderingEnabled)
++	|| (info->directRenderingEnabled)
+ #endif
+-	    ) {
+-	    texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
+-	    if (texturedAdaptor != NULL) {
+-		adaptors[num_adaptors++] = texturedAdaptor;
+-		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
+-	    } else
+-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n");
++	) {
++	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
++	if (texturedAdaptor != NULL) {
++	    adaptors[num_adaptors++] = texturedAdaptor;
++	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
+ 	} else
+-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video requires CP on R5xx/R6xx/R7xx/IGP\n");
++	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n");
+     } else
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video disabled on RV250 due to HW bug\n");
++	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video requires CP on R5xx/R6xx/R7xx/IGP\n");
+ 
+     if(num_adaptors)
+ 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+@@ -1070,11 +1067,11 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
+     OvGCr = CAdjGCr * gamma_curve_r100[gamma].OvGammaCont;
+     OvBCb = CAdjBCb * gamma_curve_r100[gamma].OvGammaCont;
+     OvBCr = CAdjBCr * gamma_curve_r100[gamma].OvGammaCont;
+-    OvROff = CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
++    OvROff = RedAdj + CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
+ 	OvLuma * Loff - (OvRCb + OvRCr) * Coff;
+-    OvGOff = CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
++    OvGOff = GreenAdj + CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
+ 	OvLuma * Loff - (OvGCb + OvGCr) * Coff;
+-    OvBOff = CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
++    OvBOff = BlueAdj + CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
+ 	OvLuma * Loff - (OvBCb + OvBCr) * Coff;
+ #if 0 /* default constants */
+     OvROff = -888.5;
+diff --git a/src/radeon_video.h b/src/radeon_video.h
+index 7f1891e..34fb07f 100644
+--- a/src/radeon_video.h
++++ b/src/radeon_video.h
+@@ -90,6 +90,11 @@ typedef struct {
+    void         *video_memory;
+    int           video_offset;
+ 
++   Bool          planar_hw;
++   Bool          planar_state;
++   int           planeu_offset;
++   int           planev_offset;
++
+    /* bicubic filtering */
+    void         *bicubic_memory;
+    int           bicubic_offset;

radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- radeon-modeset.patch	1 Apr 2009 07:18:42 -0000	1.40
+++ radeon-modeset.patch	1 Apr 2009 08:54:08 -0000	1.41
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index b094a50..29a19e3 100644
+index 660ea1f..4279b60 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -114,8 +114,19 @@ if test "$DRI" = yes; then
@@ -1067,7 +1067,7 @@
 +#endif
 +#endif
 diff --git a/src/radeon.h b/src/radeon.h
-index 7bb720a..348ad3f 100644
+index d488429..09e15f4 100644
 --- a/src/radeon.h
 +++ b/src/radeon.h
 @@ -46,6 +46,8 @@
@@ -1095,7 +1095,7 @@
  				/* Render support */
  #ifdef RENDER
  #include "picturestr.h"
-@@ -413,6 +417,14 @@ typedef enum {
+@@ -414,6 +418,14 @@ typedef enum {
  
  typedef struct _atomBiosHandle *atomBiosHandlePtr;
  
@@ -1110,7 +1110,7 @@
  typedef struct {
      uint32_t pci_device_id;
      RADEONChipFamily chip_family;
-@@ -423,7 +435,27 @@ typedef struct {
+@@ -424,7 +436,27 @@ typedef struct {
      int singledac;
  } RADEONCardInfo;
  
@@ -1138,7 +1138,7 @@
  struct radeon_cp {
      Bool              CPRuns;           /* CP is running */
      Bool              CPInUse;          /* CP has been used by X server */
-@@ -437,6 +469,10 @@ struct radeon_cp {
+@@ -438,6 +470,10 @@ struct radeon_cp {
      drmBufPtr         indirectBuffer;
      int               indirectStart;
  
@@ -1149,7 +1149,7 @@
      /* Debugging info for BEGIN_RING/ADVANCE_RING pairs. */
      int               dma_begin_count;
      char              *dma_debug_func;
-@@ -503,13 +539,13 @@ struct radeon_dri {
+@@ -504,13 +540,13 @@ struct radeon_dri {
      drm_handle_t      ringHandle;       /* Handle from drmAddMap */
      drmSize           ringMapSize;      /* Size of map */
      int               ringSize;         /* Size of ring (in MB) */
@@ -1165,7 +1165,7 @@
  
      /* CP vertex/indirect buffer data */
      unsigned long     bufStart;         /* Offset into GART space */
-@@ -528,7 +564,6 @@ struct radeon_dri {
+@@ -529,7 +565,6 @@ struct radeon_dri {
      drmAddress        gartTex;           /* Map */
      int               log2GARTTexGran;
  
@@ -1173,7 +1173,7 @@
      int               fbX;
      int               fbY;
      int               backX;
-@@ -784,6 +819,7 @@ typedef struct {
+@@ -789,6 +824,7 @@ typedef struct {
      RADEONCardType    cardType;            /* Current card is a PCI card */
      struct radeon_cp  *cp;
      struct radeon_dri  *dri;
@@ -1181,7 +1181,7 @@
  #ifdef USE_EXA
      Bool              accelDFS;
  #endif
-@@ -887,6 +923,45 @@ typedef struct {
+@@ -892,6 +928,45 @@ typedef struct {
  
      Bool              r4xx_atom;
  
@@ -1227,7 +1227,7 @@
  } RADEONInfoRec, *RADEONInfoPtr;
  
  #define RADEONWaitForFifo(pScrn, entries)				\
-@@ -1140,6 +1215,24 @@ extern void
+@@ -1147,6 +1222,24 @@ extern void
  radeon_legacy_free_memory(ScrnInfoPtr pScrn,
  		          void *mem_struct);
  
@@ -1252,7 +1252,7 @@
  #ifdef XF86DRI
  #  ifdef USE_XAA
  /* radeon_accelfuncs.c */
-@@ -1158,7 +1251,9 @@ do {									\
+@@ -1165,7 +1258,9 @@ do {									\
  
  #define RADEONCP_RELEASE(pScrn, info)					\
  do {									\
@@ -1263,7 +1263,7 @@
  	RADEON_PURGE_CACHE();						\
  	RADEON_WAIT_UNTIL_IDLE();					\
  	RADEONCPReleaseIndirect(pScrn);					\
-@@ -1193,7 +1288,7 @@ do {									\
+@@ -1200,7 +1295,7 @@ do {									\
  
  #define RADEONCP_REFRESH(pScrn, info)					\
  do {									\
@@ -1272,7 +1272,7 @@
  	if (info->cp->needCacheFlush) {					\
  	    RADEON_PURGE_CACHE();					\
  	    RADEON_PURGE_ZCACHE();					\
-@@ -1220,6 +1315,13 @@ do {									\
+@@ -1227,6 +1322,13 @@ do {									\
  #define RING_LOCALS	uint32_t *__head = NULL; int __expected; int __count = 0
  
  #define BEGIN_RING(n) do {						\
@@ -1286,7 +1286,7 @@
      if (RADEON_VERBOSE) {						\
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO,				\
  		   "BEGIN_RING(%d) in %s\n", (unsigned int)n, __FUNCTION__);\
-@@ -1232,13 +1334,6 @@ do {									\
+@@ -1239,13 +1341,6 @@ do {									\
      }									\
      info->cp->dma_debug_func = __FILE__;				\
      info->cp->dma_debug_lineno = __LINE__;				\
@@ -1300,7 +1300,7 @@
      __expected = n;							\
      __head = (pointer)((char *)info->cp->indirectBuffer->address +	\
  		       info->cp->indirectBuffer->used);			\
-@@ -1281,6 +1376,14 @@ do {									\
+@@ -1288,6 +1383,14 @@ do {									\
      OUT_RING(val);							\
  } while (0)
  
@@ -1316,7 +1316,7 @@
  do {									\
      if (RADEON_VERBOSE)							\
 diff --git a/src/radeon_accel.c b/src/radeon_accel.c
-index dffbc57..1531c81 100644
+index a9a4848..9d02ac8 100644
 --- a/src/radeon_accel.c
 +++ b/src/radeon_accel.c
 @@ -92,6 +92,7 @@
@@ -1590,7 +1590,7 @@
  
  #if 0
      /* FIXME: pScrn->pScreen has not been initialized when this is first
-@@ -694,6 +817,11 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard)
+@@ -692,6 +815,11 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard)
      if (!buffer) return;
      if (start == buffer->used && !discard) return;
  
@@ -1602,7 +1602,7 @@
      if (RADEON_VERBOSE) {
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Flushing buffer %d\n",
  		   buffer->idx);
-@@ -749,10 +877,16 @@ void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn)
+@@ -750,10 +878,16 @@ void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn)
  	}
      }
  
@@ -1619,7 +1619,7 @@
  
      if (RADEON_VERBOSE) {
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Releasing buffer %d\n",
-@@ -879,6 +1013,7 @@ RADEONHostDataBlit(
+@@ -880,6 +1014,7 @@ RADEONHostDataBlit(
      ret = ( uint8_t* )&__head[__count];
  
      __count += dwords;
@@ -1627,7 +1627,7 @@
      ADVANCE_RING();
  
      *y += *hpass;
-@@ -1013,7 +1148,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
+@@ -1014,7 +1149,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
  #ifdef USE_EXA
      if (info->useEXA) {
  # ifdef XF86DRI
@@ -1636,7 +1636,7 @@
  	    if (info->ChipFamily >= CHIP_FAMILY_R600) {
  		if (!R600DrawInit(pScreen))
  		    return FALSE;
-@@ -1046,7 +1181,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
+@@ -1047,7 +1182,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
  	}
  
  #ifdef XF86DRI
@@ -1645,7 +1645,7 @@
  	    RADEONAccelInitCP(pScreen, a);
  	else
  #endif /* XF86DRI */
-@@ -1068,11 +1203,13 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
+@@ -1069,11 +1204,13 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
      RADEONInfoPtr info = RADEONPTR (pScrn);
  
  #ifdef XF86DRI
@@ -1663,7 +1663,7 @@
  	RADEONInit3DEngineCP(pScrn);
      } else
  #endif
-@@ -1080,7 +1217,7 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
+@@ -1081,7 +1218,7 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
  
      info->accel_state->XInited3D = TRUE;
  }
@@ -2403,7 +2403,7 @@
 +int radeon_bo_gem_name_buffer(dri_bo *bo, uint32_t *name);
 +#endif
 diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
-index eabd87d..8712a74 100644
+index a9bc7d2..6c22339 100644
 --- a/src/radeon_commonfuncs.c
 +++ b/src/radeon_commonfuncs.c
 @@ -62,12 +62,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
@@ -2601,7 +2601,7 @@
  
      CURSOR_SWAPPING_START();
 diff --git a/src/radeon_dri.c b/src/radeon_dri.c
-index 9c9fc7f..aa6352e 100644
+index f6c6261..1699d8a 100644
 --- a/src/radeon_dri.c
 +++ b/src/radeon_dri.c
 @@ -40,6 +40,8 @@
@@ -2845,7 +2845,7 @@
  }
  
  /* AGP Mode Quirk List - Certain hostbridge/gfx-card combos don't work with
-@@ -990,6 +1146,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -992,6 +1148,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
  	       "[agp] ring handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringHandle);
  
@@ -2854,7 +2854,7 @@
      if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize,
  	       &info->dri->ring) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n");
-@@ -998,9 +1156,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1000,9 +1158,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] Ring mapped at 0x%08lx\n",
  	       (unsigned long)info->dri->ring);
@@ -2866,7 +2866,7 @@
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
  		   "[agp] Could not add ring read ptr mapping\n");
  	return FALSE;
-@@ -1009,6 +1168,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1011,6 +1170,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
   	       "[agp] ring read ptr handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringReadPtrHandle);
  
@@ -2875,7 +2875,7 @@
      if (drmMap(info->dri->drmFD, info->dri->ringReadPtrHandle, info->dri->ringReadMapSize,
  	       &info->dri->ringReadPtr) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
-@@ -1018,6 +1179,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1020,6 +1181,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] Ring read ptr mapped at 0x%08lx\n",
  	       (unsigned long)info->dri->ringReadPtr);
@@ -2883,7 +2883,7 @@
  
      if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize,
  		  DRM_AGP, 0, &info->dri->bufHandle) < 0) {
-@@ -1095,6 +1257,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1097,6 +1259,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
  	       "[pci] ring handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringHandle);
  
@@ -2891,7 +2891,7 @@
      if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize,
  	       &info->dri->ring) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring\n");
-@@ -1106,6 +1269,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1108,6 +1271,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] Ring contents 0x%08lx\n",
  	       *(unsigned long *)(pointer)info->dri->ring);
@@ -2899,7 +2899,7 @@
  
      if (drmAddMap(info->dri->drmFD, info->dri->ringReadOffset, info->dri->ringReadMapSize,
  		  DRM_SCATTER_GATHER, flags, &info->dri->ringReadPtrHandle) < 0) {
-@@ -1117,8 +1281,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1119,8 +1283,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
   	       "[pci] ring read ptr handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringReadPtrHandle);
  
@@ -2910,7 +2910,7 @@
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
  		   "[pci] Could not map ring read ptr\n");
  	return FALSE;
-@@ -1129,6 +1295,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1131,6 +1297,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] Ring read ptr contents 0x%08lx\n",
  	       *(unsigned long *)(pointer)info->dri->ringReadPtr);
@@ -2918,7 +2918,7 @@
  
      if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize,
  		  DRM_SCATTER_GATHER, 0, &info->dri->bufHandle) < 0) {
-@@ -1181,6 +1348,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1183,6 +1350,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
   */
  static Bool RADEONDRIMapInit(RADEONInfoPtr info, ScreenPtr pScreen)
  {
@@ -2928,7 +2928,7 @@
  				/* Map registers */
      info->dri->registerSize = info->MMIOSize;
      if (drmAddMap(info->dri->drmFD, info->MMIOAddr, info->dri->registerSize,
-@@ -1221,20 +1391,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1223,20 +1393,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
      drmInfo.fb_bpp              = info->CurrentLayout.pixel_code;
      drmInfo.depth_bpp           = (info->dri->depthBits - 8) * 2;
  
@@ -2966,7 +2966,7 @@
      if (drmCommandWrite(info->dri->drmFD, DRM_RADEON_CP_INIT,
  			&drmInfo, sizeof(drm_radeon_init_t)) < 0)
  	return FALSE;
-@@ -1243,8 +1416,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1245,8 +1418,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
       * registers back to their default values, so we need to restore
       * those engine register here.
       */
@@ -2978,7 +2978,7 @@
  
      return TRUE;
  }
-@@ -1442,12 +1616,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
+@@ -1444,12 +1618,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
  
      /* Get DRM version & close DRM */
      info->dri->pKernelDRMVersion = drmGetVersion(fd);
@@ -2992,7 +2992,7 @@
      }
  
      /* Now check if we qualify */
-@@ -1481,10 +1654,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
+@@ -1483,10 +1656,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
  		   req_patch);
  	drmFreeVersion(info->dri->pKernelDRMVersion);
  	info->dri->pKernelDRMVersion = NULL;
@@ -3023,7 +3023,7 @@
  }
  
  Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
-@@ -1493,6 +1685,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
+@@ -1495,6 +1687,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
      xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
      int value = 0;
  
@@ -3033,7 +3033,7 @@
      if (!info->want_vblank_interrupts)
          on = FALSE;
  
-@@ -1512,6 +1707,52 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
+@@ -1514,6 +1709,52 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
      return TRUE;
  }
  
@@ -3086,7 +3086,7 @@
  
  /* Initialize the screen-specific data structures for the DRI and the
   * Radeon.  This is the main entry point to the device-specific
-@@ -1575,10 +1816,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1577,10 +1818,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
      pDRIInfo->ddxDriverMajorVersion      = info->allowColorTiling ? 5 : 4;
      pDRIInfo->ddxDriverMinorVersion      = 3;
      pDRIInfo->ddxDriverPatchVersion      = 0;
@@ -3113,7 +3113,7 @@
      pDRIInfo->ddxDrawableTableEntry      = RADEON_MAX_DRAWABLES;
      pDRIInfo->maxDrawableTableEntry      = (SAREA_MAX_DRAWABLES
  					    < RADEON_MAX_DRAWABLES
-@@ -1631,9 +1884,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1633,9 +1886,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
      pDRIInfo->TransitionTo3d = RADEONDRITransitionTo3d;
      pDRIInfo->TransitionSingleToMulti3D = RADEONDRITransitionSingleToMulti3d;
      pDRIInfo->TransitionMultiToSingle3D = RADEONDRITransitionMultiToSingle3d;
@@ -3124,7 +3124,7 @@
      pDRIInfo->ClipNotify     = RADEONDRIClipNotify;
  #endif
  
-@@ -1665,57 +1916,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1667,57 +1918,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
  	pDRIInfo = NULL;
  	return FALSE;
      }
@@ -3229,7 +3229,7 @@
  static Bool RADEONDRIDoCloseScreen(int scrnIndex, ScreenPtr pScreen)
  {
      ScrnInfoPtr    pScrn = xf86Screens[pScreen->myNum];
-@@ -1757,17 +2011,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
+@@ -1759,17 +2013,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
  	return FALSE;
      }
  
@@ -3259,7 +3259,7 @@
  
      /* Initialize and start the CP if required */
      RADEONDRICPInit(pScrn);
-@@ -1776,6 +2034,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
+@@ -1778,6 +2036,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
      pSAREAPriv = (drm_radeon_sarea_t*)DRIGetSAREAPrivate(pScreen);
      memset(pSAREAPriv, 0, sizeof(*pSAREAPriv));
  
@@ -3270,7 +3270,7 @@
      pRADEONDRI                    = (RADEONDRIPtr)info->dri->pDRIInfo->devPrivate;
  
      pRADEONDRI->deviceID          = info->Chipset;
-@@ -1933,6 +2195,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1935,6 +2197,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  	drmUnmap(info->dri->buf, info->dri->bufMapSize);
  	info->dri->buf = NULL;
      }
@@ -3279,7 +3279,7 @@
      if (info->dri->ringReadPtr) {
  	drmUnmap(info->dri->ringReadPtr, info->dri->ringReadMapSize);
  	info->dri->ringReadPtr = NULL;
-@@ -1941,6 +2205,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1943,6 +2207,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  	drmUnmap(info->dri->ring, info->dri->ringMapSize);
  	info->dri->ring = NULL;
      }
@@ -3287,7 +3287,7 @@
      if (info->dri->agpMemHandle != DRM_AGP_NO_HANDLE) {
  	drmAgpUnbind(info->dri->drmFD, info->dri->agpMemHandle);
  	drmAgpFree(info->dri->drmFD, info->dri->agpMemHandle);
-@@ -2350,3 +2615,11 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value)
+@@ -2352,3 +2617,11 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value)
  			  &radeonsetparam, sizeof(drm_radeon_setparam_t));
      return ret;
  }
@@ -4058,7 +4058,7 @@
 +
 +#endif
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index c0f5e7b..aa60074 100644
+index 8673f5e..8d04d92 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
 @@ -67,7 +67,7 @@
@@ -4070,7 +4070,7 @@
  				/* Driver data structures */
  #include "radeon.h"
  #include "radeon_reg.h"
-@@ -226,7 +226,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
+@@ -229,7 +229,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
      stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
      *size = stride;
  
@@ -4082,7 +4082,7 @@
  }
  static Bool
  RADEONCreateScreenResources (ScreenPtr pScreen)
-@@ -247,6 +250,13 @@ RADEONCreateScreenResources (ScreenPtr pScreen)
+@@ -250,6 +253,13 @@ RADEONCreateScreenResources (ScreenPtr pScreen)
  		      radeonShadowWindow, 0, NULL))
  	   return FALSE;
     }
@@ -4096,7 +4096,7 @@
     return TRUE;
  }
  
-@@ -1658,6 +1668,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
+@@ -1695,6 +1705,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
      }
  
      pScrn->videoRam  &= ~1023;
@@ -4104,7 +4104,7 @@
      info->FbMapSize  = pScrn->videoRam * 1024;
  
      /* if the card is PCI Express reserve the last 32k for the gart table */
-@@ -1787,59 +1798,61 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
+@@ -1824,59 +1835,61 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
                     "R500 support is under development. Please report any issues to xorg-driver-ati at lists.x.org\n");
      }
  
@@ -4211,7 +4211,7 @@
  
  #ifdef XF86DRI
  				/* AGP/PCI */
-@@ -2014,6 +2027,15 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2051,6 +2064,15 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
      }
      info->accel_state->fifo_slots                 = 0;
  
@@ -4227,7 +4227,7 @@
      if ((info->ChipFamily == CHIP_FAMILY_RS100) ||
  	(info->ChipFamily == CHIP_FAMILY_RS200) ||
  	(info->ChipFamily == CHIP_FAMILY_RS300) ||
-@@ -2038,6 +2060,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2075,6 +2097,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
      if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
  	int errmaj = 0, errmin = 0;
  
@@ -4237,7 +4237,7 @@
  	from = X_DEFAULT;
  #if defined(USE_EXA)
  #if defined(USE_XAA)
-@@ -2048,6 +2073,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2085,6 +2110,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
  		info->useEXA = TRUE;
  	    } else if (xf86NameCmp(optstr, "XAA") == 0) {
  		from = X_CONFIG;
@@ -4245,7 +4245,7 @@
  	    }
  	}
  #else /* USE_XAA */
-@@ -2151,15 +2177,9 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
+@@ -2189,15 +2215,9 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
      return TRUE;
  }
  
@@ -4262,7 +4262,7 @@
  
      if (!(info->dri = xcalloc(1, sizeof(struct radeon_dri)))) {
  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Unable to allocate dri rec!\n");
-@@ -2170,6 +2190,22 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
+@@ -2208,6 +2228,22 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Unable to allocate cp rec!\n");
  	return FALSE;
      }
@@ -4285,7 +4285,7 @@
      info->cp->CPInUse = FALSE;
      info->cp->CPStarted = FALSE;
      info->cp->CPusecTimeout = RADEON_DEFAULT_CP_TIMEOUT;
-@@ -2727,6 +2763,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
+@@ -2771,6 +2807,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
      RADEONCRTCResize
  };
  
@@ -4323,7 +4323,7 @@
  Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  {
      xf86CrtcConfigPtr   xf86_config;
-@@ -2747,6 +2814,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2791,6 +2858,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      info               = RADEONPTR(pScrn);
      info->MMIO         = NULL;
  
@@ -4332,7 +4332,7 @@
      info->IsSecondary  = FALSE;
      info->IsPrimary = FALSE;
  
-@@ -2781,62 +2850,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2825,62 +2894,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      }
  
      info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
@@ -4443,7 +4443,7 @@
  
      if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
  	goto fail;
-@@ -2846,10 +2916,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2890,10 +2960,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
      pScrn->monitor     = pScrn->confScreen->monitor;
  
@@ -4460,7 +4460,7 @@
  
      if (!RADEONPreInitVisual(pScrn))
  	goto fail;
-@@ -2863,164 +2935,224 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2907,167 +2979,227 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
      xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
  
@@ -4561,6 +4561,11 @@
 +	
 +	RADEONPostInt10Check(pScrn, int10_save);
  
+-    /* Save BIOS scratch registers */
+-    RADEONSaveBIOSRegisters(pScrn, info->SavedReg);
++    	/* Save BIOS scratch registers */
++    	RADEONSaveBIOSRegisters(pScrn, info->SavedReg);
+ 
 +	if (!RADEONPreInitBIOS(pScrn, pInt10))
 +	    goto fail;
  #ifdef XF86DRI
@@ -4812,7 +4817,7 @@
  
  	/* Get ScreenInit function */
      if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-@@ -3035,10 +3167,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3082,10 +3214,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  	if (!RADEONPreInitXv(pScrn))                 goto fail;
      }
  
@@ -4829,7 +4834,7 @@
      }
  
      if (pScrn->modes == NULL) {
-@@ -3191,6 +3325,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
+@@ -3238,6 +3372,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
  
  #ifdef USE_EXA
      info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
@@ -4839,7 +4844,7 @@
  #endif
  }
  
-@@ -3279,7 +3416,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3326,7 +3463,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      int            subPixelOrder = SubPixelUnknown;
      char*          s;
  #endif
@@ -4848,7 +4853,7 @@
  
      info->accelOn      = FALSE;
  #ifdef USE_XAA
-@@ -3299,58 +3436,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3346,58 +3483,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  		   "RADEONScreenInit %lx %ld\n",
  		   pScrn->memPhysBase, pScrn->fbOffset);
  #endif
@@ -4949,7 +4954,7 @@
      /* Visual setup */
      miClearVisualTypes();
      if (!miSetVisualTypes(pScrn->depth,
-@@ -3384,19 +3524,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3431,19 +3571,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      hasDRI = info->directRenderingEnabled;
  #endif /* XF86DRI */
  
@@ -4983,7 +4988,7 @@
  	}
      }
  
-@@ -3433,7 +3575,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3480,7 +3622,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #ifdef XF86DRI
  	if (hasDRI) {
  	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
@@ -4995,7 +5000,7 @@
  
  	    /* Reserve approx. half of offscreen memory for local textures by
  	     * default, can be overridden with Option "FBTexPercent".
-@@ -3459,7 +3604,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3506,7 +3651,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #if defined(XF86DRI) && defined(USE_XAA)
@@ -5004,7 +5009,7 @@
  	info->dri->textureSize = -1;
  	if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT,
  				 &(info->dri->textureSize))) {
-@@ -3477,7 +3622,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3524,7 +3669,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #ifdef USE_XAA
@@ -5013,7 +5018,7 @@
  	return FALSE;
  #endif
  
-@@ -3498,7 +3643,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3545,7 +3690,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			    info->CurrentLayout.pixel_bytes);
  	int  maxy        = info->FbMapSize / width_bytes;
  
@@ -5022,7 +5027,7 @@
  	    xf86DrvMsg(scrnIndex, X_ERROR,
  		       "Static buffer allocation failed.  Disabling DRI.\n");
  	    xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3508,19 +3653,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3555,19 +3700,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024);
  	    info->directRenderingEnabled = FALSE;
  	} else {
@@ -5081,7 +5086,7 @@
  #endif
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Initializing fb layer\n");
-@@ -3544,7 +3724,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3591,7 +3771,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      if (info->r600_shadow_fb == FALSE) {
  	/* Init fb layer */
@@ -5090,7 +5095,7 @@
  			  pScrn->virtualX, pScrn->virtualY,
  			  pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
  			  pScrn->bitsPerPixel))
-@@ -3586,8 +3766,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3633,8 +3813,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      /* restore the memory map here otherwise we may get a hang when
       * initializing the drm below
       */
@@ -5103,7 +5108,7 @@
  
      /* Backing store setup */
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -3597,7 +3779,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3644,7 +3826,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      /* DRI finalisation */
  #ifdef XF86DRI
@@ -5112,7 +5117,7 @@
          info->dri->pKernelDRMVersion->version_minor >= 19)
      {
        if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -3613,14 +3795,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3660,14 +3842,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      if (info->directRenderingEnabled) {
          xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		       "DRI Finishing init !\n");
@@ -5138,7 +5143,7 @@
  
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
  
-@@ -3716,10 +3908,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3763,10 +3955,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
              return FALSE;
          }
      }
@@ -5148,15 +5153,15 @@
 -    if (!xf86SetDesiredModes (pScrn))
 +    if (info->drm_mode_setting) {
 +      if (!drmmode_set_desired_modes(pScrn, &info->drmmode))
-+	return FALSE;
+ 	return FALSE;
 +    } else {
 +      if (!xf86SetDesiredModes (pScrn))
- 	return FALSE;
++	return FALSE;
 +    }
  
      /* Provide SaveScreen & wrap BlockHandler and CloseScreen */
      /* Wrap CloseScreen */
-@@ -5296,7 +5494,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5336,7 +5534,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #ifdef XF86DRI
      Bool           CPStarted   = info->cp->CPStarted;
  
@@ -5165,7 +5170,7 @@
  	DRILock(pScrn->pScreen, 0);
  	RADEONCP_STOP(pScrn, info);
      }
-@@ -5319,8 +5517,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5359,8 +5557,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #endif
      }
  
@@ -5178,7 +5183,7 @@
  
      ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0);
  
-@@ -5332,16 +5532,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5372,16 +5572,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  	/* xf86SetRootClip would do, but can't access that here */
      }
  
@@ -5206,7 +5211,7 @@
      }
  #endif
  
-@@ -5539,6 +5742,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5579,6 +5782,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
      xf86OutputPtr  output = config->output[config->compat_output];
      xf86CrtcPtr	crtc = output->crtc;
  
@@ -5218,7 +5223,7 @@
      /* not handled */
      if (IS_AVIVO_VARIANT)
  	return;
-@@ -5578,76 +5786,101 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5618,76 +5826,101 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONEnterVT\n");
  
@@ -5370,7 +5375,7 @@
      }
  #endif
      /* this will get XVideo going again, but only if XVideo was initialised
-@@ -5662,7 +5895,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5702,7 +5935,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
  	info->accel_state->XInited3D = FALSE;
  
  #ifdef XF86DRI
@@ -5379,7 +5384,7 @@
          if (info->ChipFamily >= CHIP_FAMILY_R600)
  		R600LoadShaders(pScrn);
  	RADEONCP_START(pScrn, info);
-@@ -5686,27 +5919,29 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5726,27 +5959,29 @@ void RADEONLeaveVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONLeaveVT\n");
  #ifdef XF86DRI
@@ -5425,7 +5430,7 @@
  
  	/* Make sure 3D clients will re-upload textures to video RAM */
  	if (info->dri->textureSize) {
-@@ -5722,6 +5957,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5762,6 +5997,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  		i = list[i].next;
  	    } while (i != 0);
  	}
@@ -5437,7 +5442,7 @@
      }
  #endif
  
-@@ -5748,10 +5988,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5788,10 +6028,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  
      xf86_hide_cursors (pScrn);
  
@@ -5459,7 +5464,7 @@
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Ok, leaving now...\n");
-@@ -5805,7 +6053,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5845,7 +6093,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
  #endif /* USE_XAA */
  
      if (pScrn->vtSema) {
@@ -5469,7 +5474,7 @@
      }
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5840,6 +6089,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5880,6 +6129,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
      info->DGAModes = NULL;
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Unmapping memory\n");
@@ -7965,7 +7970,7 @@
 +
 +
 diff --git a/src/radeon_probe.h b/src/radeon_probe.h
-index afc8e21..6138f36 100644
+index a0c6b2c..30fee18 100644
 --- a/src/radeon_probe.h
 +++ b/src/radeon_probe.h
 @@ -146,6 +146,27 @@ typedef struct
@@ -8006,7 +8011,7 @@
  
  typedef struct _radeon_encoder {
 diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
-index 2df299f..ff16f26 100644
+index 79671c0..1ef8dc3 100644
 --- a/src/radeon_textured_video.c
 +++ b/src/radeon_textured_video.c
 @@ -40,6 +40,7 @@
@@ -8017,7 +8022,7 @@
  
  #include <X11/extensions/Xv.h>
  #include "fourcc.h"
-@@ -124,6 +125,7 @@ static __inline__ uint32_t F_TO_24(float val)
+@@ -133,6 +134,7 @@ static __inline__ uint32_t float4touint(float fr, float fg, float fb, float fa)
  #define BEGIN_ACCEL(n)		RADEONWaitForFifo(pScrn, (n))
  #define OUT_ACCEL_REG(reg, val)	OUTREG(reg, val)
  #define OUT_ACCEL_REG_F(reg, val) OUTREG(reg, F_TO_DW(val))
@@ -8025,7 +8030,7 @@
  #define FINISH_ACCEL()
  
  #include "radeon_textured_videofuncs.c"
-@@ -133,6 +135,7 @@ static __inline__ uint32_t F_TO_24(float val)
+@@ -142,6 +144,7 @@ static __inline__ uint32_t float4touint(float fr, float fg, float fb, float fa)
  #undef BEGIN_ACCEL
  #undef OUT_ACCEL_REG
  #undef OUT_ACCEL_REG_F
@@ -8033,7 +8038,7 @@
  #undef FINISH_ACCEL
  
  #ifdef XF86DRI
-@@ -146,6 +149,7 @@ static __inline__ uint32_t F_TO_24(float val)
+@@ -155,6 +158,7 @@ static __inline__ uint32_t float4touint(float fr, float fg, float fb, float fa)
  #define OUT_ACCEL_REG_F(reg, val)	OUT_ACCEL_REG(reg, F_TO_DW(val))
  #define FINISH_ACCEL()		ADVANCE_RING()
  #define OUT_RING_F(x) OUT_RING(F_TO_DW(x))
@@ -8041,7 +8046,7 @@
  
  #include "radeon_textured_videofuncs.c"
  
-@@ -374,6 +378,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -412,6 +416,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  								size * 2, 64);
  	if (pPriv->video_offset == 0)
  	    return BadAlloc;
@@ -8050,8 +8055,8 @@
 +	    pPriv->src_bo = pPriv->video_memory;
      }
  
-     /* Bicubic filter setup */
-@@ -397,6 +404,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     /* Bicubic filter loading */
+@@ -422,6 +429,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  	pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset;
  	if (pPriv->bicubic_offset == 0)
  		pPriv->bicubic_enabled = FALSE;
@@ -8061,7 +8066,7 @@
      }
  
      if (pDraw->type == DRAWABLE_WINDOW)
-@@ -426,11 +436,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -451,11 +461,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
@@ -8087,9 +8092,9 @@
 +            pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
 +    }
      pPriv->src_pitch = dstPitch;
-     pPriv->size = size;
-     pPriv->pDraw = pDraw;
-@@ -511,9 +532,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     pPriv->planeu_offset = dstPitch * dst_height;
+     pPriv->planev_offset = pPriv->planeu_offset + dstPitch2 * ((dst_height + 1) >> 1);
+@@ -566,9 +587,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  
      /* Upload bicubic filter tex */
      if (pPriv->bicubic_enabled) {
@@ -8117,7 +8122,7 @@
      }
  
      /* update cliplist */
-@@ -531,10 +567,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -586,10 +622,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      pPriv->w = width;
      pPriv->h = height;
  
@@ -8132,10 +8137,24 @@
      else
  #endif
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index f55ae12..5d23ad9 100644
+index 05acb93..b7a8513 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
-@@ -92,6 +92,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -87,11 +87,25 @@ do {								\
+ 
+ #endif /* !ACCEL_CP */
+ 
++#define OUT_TEXTURE_REG(reg, offset, bo) do {	\
++	if (info->new_cs) {		  \
++	    OUT_ACCEL_REG((reg), (offset));				\
++	    OUT_RELOC((bo), RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0); \
++	} else { \
++	    OUT_ACCEL_REG((reg), (offset) + info->fbLocation + pScrn->fbOffset);} \
++    } while(0)
++
++
+ static void
+ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
  {
      RADEONInfoPtr info = RADEONPTR(pScrn);
      PixmapPtr pPixmap = pPriv->pPixmap;
@@ -8147,7 +8166,7 @@
      uint32_t txformat;
      uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
      uint32_t dst_offset, dst_pitch, dst_format;
-@@ -100,19 +105,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
      int dstxoff, dstyoff, pixel_shift, vtx_count;
      BoxPtr pBox = REGION_RECTS(&pPriv->clip);
      int nBox = REGION_NUM_RECTS(&pPriv->clip);
@@ -8208,7 +8227,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -143,7 +186,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_WAIT_DMA_GUI_IDLE);
  	    FINISH_ACCEL();
  
@@ -8217,9 +8236,15 @@
  		RADEONInit3DEngine(pScrn);
  	}
  
-@@ -213,13 +256,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	if (IS_R500_3D && ((pPriv->h - 1) & 0x800))
+ 	    txpitch |= R500_TXHEIGHT_11;
  
- 	txoffset = pPriv->src_offset;
+-	txoffset = pPriv->src_offset;
++	if (info->new_cs)
++		txoffset = 0;
++	else
++		txoffset = pPriv->src_offset;
  
 -	BEGIN_ACCEL(6);
 +	qwords = info->new_cs ? 7 : 6;
@@ -8230,17 +8255,37 @@
  	OUT_ACCEL_REG(R300_TX_FORMAT1_0, txformat1);
  	OUT_ACCEL_REG(R300_TX_FORMAT2_0, txpitch);
 -	OUT_ACCEL_REG(R300_TX_OFFSET_0, txoffset);
-+	if (info->new_cs) {
-+	    OUT_ACCEL_REG(R300_TX_OFFSET_0, 0);
-+	    OUT_RELOC(pPriv->src_bo, RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0);
-+	} else {
-+	    txoffset += info->fbLocation + pScrn->fbOffset;
-+	    OUT_ACCEL_REG(R300_TX_OFFSET_0, txoffset);
-+	}
++	OUT_TEXTURE_REG(R300_TX_OFFSET_0, txoffset, pPriv->src_bo);
  	FINISH_ACCEL();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -240,13 +290,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			R300_TX_MIN_FILTER_LINEAR |
+ 			R300_TX_MAG_FILTER_LINEAR);
+ 
+-		BEGIN_ACCEL(12);
++		qwords = info->new_cs ? 14 : 12;
++		BEGIN_ACCEL(qwords);
+ 		OUT_ACCEL_REG(R300_TX_FILTER0_1, txfilter | (1 << R300_TX_ID_SHIFT));
+ 		OUT_ACCEL_REG(R300_TX_FILTER1_1, 0);
+ 		OUT_ACCEL_REG(R300_TX_FORMAT0_1, txformat0);
+ 		OUT_ACCEL_REG(R300_TX_FORMAT1_1, R300_TX_FORMAT_X8 | R300_TX_FORMAT_CACHE_FOURTH_REGION_2);
+ 		OUT_ACCEL_REG(R300_TX_FORMAT2_1, txpitch);
+-		OUT_ACCEL_REG(R300_TX_OFFSET_1, txoffset + pPriv->planeu_offset);
++		OUT_TEXTURE_REG(R300_TX_OFFSET_1, txoffset + pPriv->planeu_offset, pPriv->src_bo);
++
+ 		OUT_ACCEL_REG(R300_TX_FILTER0_2, txfilter | (2 << R300_TX_ID_SHIFT));
+ 		OUT_ACCEL_REG(R300_TX_FILTER1_2, 0);
+ 		OUT_ACCEL_REG(R300_TX_FORMAT0_2, txformat0);
+ 		OUT_ACCEL_REG(R300_TX_FORMAT1_2, R300_TX_FORMAT_X8 | R300_TX_FORMAT_CACHE_FOURTH_REGION_3);
+ 		OUT_ACCEL_REG(R300_TX_FORMAT2_2, txpitch);
+-		OUT_ACCEL_REG(R300_TX_OFFSET_2, txoffset + pPriv->planev_offset);
++		OUT_TEXTURE_REG(R300_TX_OFFSET_2, txoffset + pPriv->planev_offset, pPriv->src_bo);
++
+ 		FINISH_ACCEL();
+ 		txenable |= R300_TEX_1_ENABLE | R300_TEX_2_ENABLE;
+ 	}
+@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
  
@@ -8262,12 +8307,12 @@
  		FINISH_ACCEL();
  
  		/* Enable tex 1 */
-@@ -1332,11 +1388,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    }
  	}
  
 -	BEGIN_ACCEL(6);
-+	qwords = info->new_cs ? 7 : 6;
++	qwords = info->new_cs ? 8 : 6;
 +	BEGIN_ACCEL(qwords);
  	OUT_ACCEL_REG(R300_TX_INVALTAGS, 0);
  	OUT_ACCEL_REG(R300_TX_ENABLE, txenable);
@@ -8283,39 +8328,112 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1381,6 +1444,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 		      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
+@@ -1591,6 +1663,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 
  	OUT_ACCEL_REG(RADEON_RB3D_CNTL,
- 		      dst_format | RADEON_ALPHA_BLEND_ENABLE);
+ 		      dst_format /*| RADEON_ALPHA_BLEND_ENABLE*/);
 +
 +	dst_offset += info->fbLocation + pScrn->fbOffset;
  	OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -1418,7 +1483,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 			  ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
- 	    OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
- 
--	    OUT_ACCEL_REG(R200_PP_TXOFFSET_0, pPriv->src_offset);
-+	    OUT_ACCEL_REG(R200_PP_TXOFFSET_0, pPriv->src_offset +
-+			  info->fbLocation + pScrn->fbOffset);
- 
- 	    OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
- 			  R200_TXC_ARG_A_ZERO |
-@@ -1451,8 +1517,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1630,7 +1704,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			    R200_CLAMP_S_CLAMP_LAST |
+ 			    R200_CLAMP_T_CLAMP_LAST;
+ 
+-		BEGIN_ACCEL(36);
++		qwords = info->new_cs ? 39 : 36;
++		BEGIN_ACCEL(qwords);
+ 
+ 		OUT_ACCEL_REG(RADEON_PP_CNTL,
+ 			      RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
+@@ -1649,21 +1724,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			      (pPriv->w - 1) |
+ 			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
+ 		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
+-		OUT_ACCEL_REG(R200_PP_TXOFFSET_0, pPriv->src_offset);
++		OUT_TEXTURE_REG(R200_PP_TXOFFSET_0, txoffset, pPriv->src_bo);
+ 
+ 		OUT_ACCEL_REG(R200_PP_TXFILTER_1, txfilter);
+ 		OUT_ACCEL_REG(R200_PP_TXFORMAT_1, txformat | R200_TXFORMAT_ST_ROUTE_STQ1);
+ 		OUT_ACCEL_REG(R200_PP_TXFORMAT_X_1, 0);
+ 		OUT_ACCEL_REG(R200_PP_TXSIZE_1, txformat0);
+ 		OUT_ACCEL_REG(R200_PP_TXPITCH_1, txpitch);
+-		OUT_ACCEL_REG(R200_PP_TXOFFSET_1, pPriv->src_offset + pPriv->planeu_offset);
++		OUT_TEXTURE_REG(R200_PP_TXOFFSET_1, txoffset + pPriv->planeu_offset, pPriv->src_bo);
+ 
+ 		OUT_ACCEL_REG(R200_PP_TXFILTER_2, txfilter);
+ 		OUT_ACCEL_REG(R200_PP_TXFORMAT_2, txformat | R200_TXFORMAT_ST_ROUTE_STQ1);
+ 		OUT_ACCEL_REG(R200_PP_TXFORMAT_X_2, 0);
+ 		OUT_ACCEL_REG(R200_PP_TXSIZE_2, txformat0);
+ 		OUT_ACCEL_REG(R200_PP_TXPITCH_2, txpitch);
+-		OUT_ACCEL_REG(R200_PP_TXOFFSET_2, pPriv->src_offset + pPriv->planev_offset);
++
++		OUT_TEXTURE_REG(R200_PP_TXOFFSET_2, txoffset + pPriv->planev_offset, pPriv->src_bo);
+ 
+ 		/* similar to r300 code. Note the big problem is that hardware constants
+ 		 * are 8 bits only, representing 0.0-1.0. We can get that up (using bias
+@@ -1799,7 +1875,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			    R200_CLAMP_S_CLAMP_LAST |
+ 			    R200_CLAMP_T_CLAMP_LAST;
+ 
+-		BEGIN_ACCEL(24);
++		qwords = info->new_cs ? 25 : 24;
++		BEGIN_ACCEL(qwords);
+ 
+ 		OUT_ACCEL_REG(RADEON_PP_CNTL,
+ 			      RADEON_TEX_0_ENABLE |
+@@ -1817,7 +1894,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			      (pPriv->w - 1) |
+ 			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
+ 		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
+-		OUT_ACCEL_REG(R200_PP_TXOFFSET_0, pPriv->src_offset);
++		OUT_TEXTURE_REG(R200_PP_TXOFFSET_0, txoffset, pPriv->src_bo);
+ 
+ 		/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
+ 		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
+@@ -1901,7 +1978,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 		FINISH_ACCEL();
+ 	    }
+ 	    else {
+-		BEGIN_ACCEL(13);
++		qwords = info->new_cs ? 14 : 13;
++		BEGIN_ACCEL(qwords);
+ 		OUT_ACCEL_REG(RADEON_PP_CNTL,
+ 			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
+ 
+@@ -1922,7 +2000,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
+ 		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
+ 
+-		OUT_ACCEL_REG(R200_PP_TXOFFSET_0, pPriv->src_offset);
++		OUT_TEXTURE_REG(R200_PP_TXOFFSET_0, txoffset, pPriv->src_bo);
+ 
+ 		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
+ 			      R200_TXC_ARG_A_ZERO |
+@@ -1945,7 +2023,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	    info->accel_state->texW[0] = 1;
+ 	    info->accel_state->texH[0] = 1;
+ 
+-	    BEGIN_ACCEL(9);
++	    qwords = info->new_cs ? 10 : 9;
++	    BEGIN_ACCEL(qwords);
+ 
+ 	    OUT_ACCEL_REG(RADEON_PP_CNTL,
+ 			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
+@@ -1959,8 +2038,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);
 +
  	    OUT_ACCEL_REG(RADEON_PP_TXFORMAT_0, txformat);
 -	    OUT_ACCEL_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset);
-+	    OUT_ACCEL_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset +
-+			  info->fbLocation + pScrn->fbOffset);
++	    OUT_TEXTURE_REG(RADEON_PP_TXOFFSET_0, txoffset, pPriv->src_bo);
  	    OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
 diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 92d1a71..03f42a4 100644
+index 42aa036..bd6408d 100644
 --- a/src/radeon_video.c
 +++ b/src/radeon_video.c
 @@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
@@ -8327,23 +8445,22 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -297,10 +297,13 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -297,9 +297,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
  	RADEONInitOffscreenImages(pScreen);
      }
  
--    if (info->ChipFamily != CHIP_FAMILY_RV250) {
+-    if ((info->ChipFamily < CHIP_FAMILY_RS400)
 +    if (info->ChipFamily >= CHIP_FAMILY_R600 && info->drm_mode_setting) {
 +	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 +		   "Disabling textured video for KMS On R600+\n");
-+    } else if (info->ChipFamily != CHIP_FAMILY_RV250) {
- 	if ((info->ChipFamily < CHIP_FAMILY_RS400)
++    } else if ((info->ChipFamily < CHIP_FAMILY_RS400)
  #ifdef XF86DRI
--	    || (info->directRenderingEnabled)
-+	    || (info->directRenderingEnabled || info->drm_mode_setting)
+-	|| (info->directRenderingEnabled)
++	|| (info->directRenderingEnabled || info->drm_mode_setting)
  #endif
- 	    ) {
- 	    texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2203,7 +2206,7 @@ RADEONCopyData(
+ 	) {
+ 	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
+@@ -2200,7 +2203,7 @@ RADEONCopyData(
  
  #ifdef XF86DRI
  
@@ -8353,10 +8470,10 @@
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
 diff --git a/src/radeon_video.h b/src/radeon_video.h
-index 7f1891e..7a5f740 100644
+index 34fb07f..7b75ec3 100644
 --- a/src/radeon_video.h
 +++ b/src/radeon_video.h
-@@ -116,6 +116,9 @@ typedef struct {
+@@ -121,6 +121,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;
      int vsync;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Mar 2009 08:42:44 -0000	1.27
+++ sources	1 Apr 2009 08:54:08 -0000	1.28
@@ -1 +1 @@
-540b25842f8e09164cf4d2376995dc68  xf86-video-ati-6.12.0.tar.bz2
+2adf5988c5e5b6df5f4cb61006fa2bf1  xf86-video-ati-6.12.1.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- xorg-x11-drv-ati.spec	1 Apr 2009 07:18:42 -0000	1.162
+++ xorg-x11-drv-ati.spec	1 Apr 2009 08:54:08 -0000	1.163
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.12.0
-Release:   3%{?dist}
+Version:   6.12.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -76,8 +76,8 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.0-3
-- radeon-modeset: fix FUS on DRI22
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-1
+- rebase to upstream + fix FUS on DRI2 + video on r100/r200 hopefully
 
 * Mon Mar 16 2009 Dave Airlie <airlied at redhat.com> 6.12.0-2
 - radeon-6.12.0-git-fixes: fixes from git upstream 



From caolanm at fedoraproject.org  Wed Apr  1 09:09:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  1 Apr 2009 09:09:52 +0000 (UTC)
Subject: rpms/planner/devel planner.spec,1.60,1.61
Message-ID: <20090401090952.1E8A77011D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8946

Modified Files:
	planner.spec 
Log Message:
Resolves: rhbz#226301 fix some rpmlint warnings


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- planner.spec	27 Feb 2009 00:45:39 -0000	1.60
+++ planner.spec	1 Apr 2009 09:09:21 -0000	1.61
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.3
-Release:   10%{?dist}
+Release:   11%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -18,9 +18,6 @@
 Requires:  shared-mime-info
 Requires(post): %{_bindir}/scrollkeeper-update
 Requires(postun): %{_bindir}/scrollkeeper-update
-Obsoletes: mrproject <= 0.10.3
-Obsoletes: libmrproject <= 0.10.3
-Obsoletes: libmrproject-devel <= 0.10.3
 
 Patch0: planner-0.12-desktop-fix.patch
 Patch1: planner-0.13-enableeds.patch
@@ -87,6 +84,12 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/*/plugins/*.la
 
+pushd $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions
+rm -f libecalbackendplanner.so
+rm -f libecalbackendplanner.so.0
+mv -f libecalbackendplanner.so.0.0.0 libecalbackendplanner.so
+popd
+
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/XMLnamespaces
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/globs
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/magic
@@ -142,7 +145,7 @@
 %{_libdir}/%{name}/plugins/libeds-plugin.so
 %dir %{_libdir}/evolution-data-server-1.2
 %dir %{_libdir}/evolution-data-server-1.2/extensions
-%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.*
+%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.so
 %{_libdir}/evolution/*/plugins/liborg-gnome-planner-source.so
 %{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
 
@@ -154,6 +157,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 01 2009 Caol??n McNamara <caolanm at redhat.com> - 0.14.3-11
+- Resolves: rhbz#226301 fix some rpmlint warnings
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caolanm at fedoraproject.org  Wed Apr  1 09:22:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  1 Apr 2009 09:22:07 +0000 (UTC)
Subject: rpms/hunspell-sk/devel hunspell-sk.spec,1.9,1.10
Message-ID: <20090401092207.2F3067011D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10942

Modified Files:
	hunspell-sk.spec 
Log Message:
upstream didn't change dir from last release


Index: hunspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/hunspell-sk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hunspell-sk.spec	1 Apr 2009 08:36:21 -0000	1.9
+++ hunspell-sk.spec	1 Apr 2009 09:21:36 -0000	1.10
@@ -17,7 +17,7 @@
 Slovak hunspell dictionaries.
 
 %prep
-%setup -q -n hunspell-sk-%{upstreamid}
+%setup -q -n hunspell-sk-20090106
 
 %build
 



From transif at fedoraproject.org  Wed Apr  1 09:31:56 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 09:31:56 +0000 (UTC)
Subject: comps/po gu.po,1.20,1.21
Message-ID: <20090401093156.410B57011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11700/po

Modified Files:
	gu.po 
Log Message:
Sending translation for Gujarati


Index: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gu.po	9 Jan 2009 11:52:37 -0000	1.20
+++ gu.po	1 Apr 2009 09:31:25 -0000	1.21
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.gu.po to Gujarati
+# translation of gu.po to Gujarati
 # Gujarati translations for PACKAGE package.
 # Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -6,20 +6,20 @@
 # Automatically generated, 2004.
 # Ankit Patel <ankit at redhat.com>, 2004, 2005, 2006, 2007, 2008.
 # Sweta Kothari <sweta2782 at yahoo.co.in>, 2008.
-# Sweta Kothari <swkothar at redhat.com>, 2008.
+# Sweta Kothari <swkothar at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.gu\n"
+"Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-11-03 12:41+0530\n"
-"Last-Translator: Ankit Patel <ankit at redhat.com>\n"
-"Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
+"POT-Creation-Date: 2009-04-01 08:02+0000\n"
+"PO-Revision-Date: 2009-04-01 15:00+0530\n"
+"Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
+"Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
 "\n"
@@ -39,192 +39,192 @@
 msgstr "??????????????? ???????????????????????? ???????????????????????? ?????? ?????? ???????????? ??????????????? ???????????? ??????????????? ???????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "??????????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
-msgstr "???????????? ???????????????????????????????????? ???????????? ?????????????????? ????????????????????? ????????????"
+msgstr "???????????? ???????????????????????????????????? ???????????? ?????????????????? ????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????????????????????? ??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
-msgstr "?????????????????????????????? ????????????."
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "??????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "????????????-?????? ?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "?????? ????????????"
 
@@ -233,78 +233,78 @@
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "??????????????? ?????????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "?????????????????? ????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "???????????????????????? (UK) ????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ???????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "?????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -314,19 +314,19 @@
 "??????????????? ????????? ?????????????????? ???????????? ?????????????????? ?????? ????????? ???????????? ???????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "??????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "??????????????? ???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -335,86 +335,86 @@
 "????????? ????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "???????????? ????????? ?????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "????????????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "???????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -422,79 +422,76 @@
 msgstr "GTK+ ????????? ??????????????? ????????????????????????????????? ???????????????????????????????????? ??????????????? ???????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????????? XFCE ????????????????????????????????? ?????????????????????????????? ???????????????????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE ????????????????????????????????? ?????????????????????????????? ???????????????????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "???????????????????????? ??????????????? ???????????? ???????????? ???????????? ??????????????? ??????????????? ????????? ???????????? ?????????????????? ???????????? ???????????? ??? ??????????????? ????????????????????? "
 "?????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"????????????????????? ???????????????????????????????????? (X) ?????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??? ??????????????? ?????????????????? ????????????????????? ?????????."
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "????????????????????? ???????????????????????????????????? (X) ?????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??? ??????????????? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????????????????? ????????????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -503,121 +500,121 @@
 "????????? ???????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "??????????????? ???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "??????????????? ?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????/???????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -625,111 +622,110 @@
 msgstr "?????????????????? ?????? ?????? ???????????????????????????????????? ??????????????? ????????? ???????????????????????? ?????????????????? ??????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "???????????? ?????????????????? ????????????????????????????????? ?????? ?????? ???????????? ???????????????????????? ?????????????????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "????????????????????? ???????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????????????????? ?????????????????? ?????????????????? ???????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -738,77 +734,77 @@
 "?????????????????? ????????????????????? ????????? ??????. ??? Emacs ????????? Vi ??????????????????????????? ?????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????? ????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "????????????????????? ?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ????????????????????? ?????????????????? ?????????????????????????????? ?????????????????? ?????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "???????????? ?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????? ????????????"
 
@@ -817,68 +813,64 @@
 msgstr "Eclipse Integrated Development Environment."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????? ?????????????????? ??????????????????, PDF ?????????????????? ????????? ????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ?????????????????? ?????????????????? ?????????????????? ??? ????????? ?????????????????????????????? ?????? ?????? ?????? ?????????????????????????????? ???????????????????????? ???????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ?????????????????? ???????????? IMAP ???????????? SMTP ???????????? ??????????????? ????????????????????????????????? ???????????? ???????????? ????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ?????????????????? ???????????? X ?????????????????? ???????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ?????????????????? ?????????????????? ????????? ?????????????????????????????? ?????? ????????? ?????????????????? ????????????????????? ??????????????? ????????? ?????????????????? ?????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????? DHCP, ????????????????????? ????????? NIS ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "??? ?????????????????? ???????????? ????????????????????? ??????????????????????????? ???????????? ?????? rsh ????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "??? ?????????????????? ????????????????????????????????????????????? ???????????????????????? ??????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ?????????????????? ???????????????????????? ???????????????????????? ???????????? ???????????????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??? ?????????????????? ??????????????? ????????? ??????????????? ??????????????????????????? ????????????????????? ??????????????? ???????????????????????? ???????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -887,19 +879,19 @@
 "????????????????????? ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ??????????????? ???????????? ?????????????????? ?????? ????????? ?????????????????? ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ??????????????? ???????????? ?????????????????? ?????? FTP ??????????????? ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -909,18 +901,18 @@
 "??????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ????????? ???????????? ?????????????????? ??????????????? ??????????????? ????????????????????????????????? ?????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ????????? Red Hat ?????? ????????????????????? ??????????????????????????? ????????? ??????????????? ??????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -929,13 +921,13 @@
 "?????????????????? ??????, ?????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ????????? ???????????????????????????????????? ???-????????????, ????????? ????????? ??????????????? ??????????????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -945,13 +937,13 @@
 "??????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ????????? ?????????????????? ???????????? ????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -961,7 +953,7 @@
 "???????????????????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -971,21 +963,19 @@
 "???????????????????????? ???????????? ???????????? ????????? ?????????????????? ???????????????????????? ????????????????????????????????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ??? ?????????????????????????????? ????????????????????????????????? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ??? ??????????????? ???????????????????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -995,341 +985,370 @@
 "????????????????????? ????????????????????? ???????????? ?????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "??? ???????????????????????? ????????? ???????????? ?????????????????? ?????? DNS ????????? ???????????? (BIND) ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "??? ????????? ???????????? ?????????????????? ????????? ????????????????????? ??????????????? ??????????????? ??????????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ??????????????? ????????? MySQL ???????????? ?????????????????? ?????????????????? ??????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ??????????????? ????????? Postgresql ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????? ??????????????? ????????????????????? ?????????????????? ??????????????????????????? ???????????? ??????????????? ????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "???????????????????????? ??????????????? ?????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????? ???????????? ????????? ??????????????? ????????? ???????????????????????? ????????? ????????? ?????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "?????????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "????????????????????? ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "????????????????????????????????? ???????????????????????? ?????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "???????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????? ?????? ???????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????????????????."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????????????????? Integrated Development Environments."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "??????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "???????????? ?????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "???????????? ?????????????????? ????????? ?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "?????????????????? ????????????"
+msgstr "????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????????????????? ???????????? ????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ???????????????????????? ????????????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ??? OLPC XO ???????????? ??????????????? ???????????? ???????????????????????? ???????????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "??????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "??????????????? ???????????? ??????????????? ???????????? ???????????????????????? ????????????????????????????????????."
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskell ???????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "??????????????? ?????????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????? ????????????????????? ??????????????? ???????????? ??????????????? ?????????????????? ??????????????????."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "????????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "????????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
 msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (??????????????????) ????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "??????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "??????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "??????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "?????????????????? ????????????"
+msgstr "?????????????????? ????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "???????????????????????? ?????????????????? ???????????? ???????????? ????????? ?????????????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "???????????????????????????????????? ?????????"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "??????????????? ???????????? ????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ???????????????-????????????????????????"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "??????????????????????????? ????????????"
+msgstr "??????????????? ????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "?????????????????? ????????? ????????? ????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "???????????? ???????????????????????? ????????????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr ""
+"32 ????????? ???????????????????????? ?????????????????????????????? ???????????????-?????????????????????????????? ?????????????????????????????? ???????????? ????????????, ??????????????? ?????????????????? ????????? ??????????????? ??????, ????????? ??????????????????????????? "
+"??????????????? ????????? ??????????????? ??????, Fedora ??????????????? ?????????."
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "Objective CAML ???????????????????????????????????? ???????????? ????????? ???????????????????????????????????? ??????????????? ???????????????????????? ???????????????????????? ?????????????????? ????????????."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "??? ????????? ??? ?????????????????????????????? ????????????????????????????????? ??????????????? ????????? ???????????????????????? ???????????? ??????."
+msgstr "????????????, ????????????????????????, ???????????????????????????, ????????? ??????????????????????????? ???????????????????????? ????????? ??? ????????? ??? ????????????????????? ????????????????????? ?????????????????? ??????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "?????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "????????? ???????????????????????? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1380,18 +1399,15 @@
 msgstr "?????????????????? ??????????????? ???????????? ??? ????????? ??? ????????????????????? ???????????????????????? ???????????? ??????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1399,6 +1415,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
+



From mschwendt at fedoraproject.org  Wed Apr  1 09:52:29 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 09:52:29 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.6,1.7
Message-ID: <20090401095229.E9C287011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13468

Modified Files:
	nufw.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.21-3
- Fix unowned directories (#483383).



Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nufw.spec	26 Feb 2009 06:21:00 -0000	1.6
+++ nufw.spec	1 Apr 2009 09:51:59 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: nufw
 Version: 2.2.21
-Release: 2%{dist}
+Release: 3%{dist}
 Summary: Authentication Firewall Suite for Linux
 License: GPLv2
 Group: System Environment/Daemons
@@ -333,6 +333,8 @@
 %config(noreplace) %attr(0600, nuauth, nuauth) %{_sysconfdir}/%{name}/nuauth-cert.pem
 %config(noreplace) %{_sysconfdir}/pam.d/nuauth
 %dir %{_sysconfdir}/%{name}/
+%{_libdir}/nuauth
+%{_libdir}/nuauth/modules
 %{_libdir}/nuauth/modules/libsyslog.so*
 %{_libdir}/nuauth/modules/libplaintext.so*
 %{_libdir}/nuauth/modules/libsystem.so*
@@ -358,6 +360,9 @@
 %{python_sitelib}/nuclient/*
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.21-3
+- Fix unowned directories (#483383).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Wed Apr  1 09:54:55 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 09:54:55 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.7,1.8
Message-ID: <20090401095455.9F80E7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13902

Modified Files:
	nufw.spec 
Log Message:



Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nufw.spec	1 Apr 2009 09:51:59 -0000	1.7
+++ nufw.spec	1 Apr 2009 09:54:25 -0000	1.8
@@ -333,8 +333,8 @@
 %config(noreplace) %attr(0600, nuauth, nuauth) %{_sysconfdir}/%{name}/nuauth-cert.pem
 %config(noreplace) %{_sysconfdir}/pam.d/nuauth
 %dir %{_sysconfdir}/%{name}/
-%{_libdir}/nuauth
-%{_libdir}/nuauth/modules
+%dir %{_libdir}/nuauth
+%dir %{_libdir}/nuauth/modules
 %{_libdir}/nuauth/modules/libsyslog.so*
 %{_libdir}/nuauth/modules/libplaintext.so*
 %{_libdir}/nuauth/modules/libsystem.so*



From gd at fedoraproject.org  Wed Apr  1 09:58:34 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  1 Apr 2009 09:58:34 +0000 (UTC)
Subject: rpms/samba/F-10 .cvsignore, 1.58, 1.59 samba.spec, 1.170,
	1.171 sources, 1.62, 1.63 samba-3.2.8-nmbd_lmb_delay.patch, 1.1, NONE
Message-ID: <20090401095834.E68CB7011D@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14346

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.2.8-nmbd_lmb_delay.patch 
Log Message:
Update to 3.2.9
resolves: #489547

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	3 Feb 2009 17:13:18 -0000	1.58
+++ .cvsignore	1 Apr 2009 09:58:04 -0000	1.59
@@ -1 +1 @@
-samba-3.2.8.tar.gz
+samba-3.2.9.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- samba.spec	26 Mar 2009 20:48:11 -0000	1.170
+++ samba.spec	1 Apr 2009 09:58:04 -0000	1.171
@@ -1,5 +1,5 @@
-%define main_release 28
-%define samba_version 3.2.8
+%define main_release 29
+%define samba_version 3.2.9
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.8
+Version: 3.2.9
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -46,7 +46,6 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch201: samba-3.2.8-nmbd_lmb_delay.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -253,7 +252,6 @@
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
-%patch201 -p1 -b .nmbd_lmb_delay
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -828,6 +826,10 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Mar 31 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.9-0.29
+- Update to 3.2.9
+- resolves: #489547
+
 * Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.2.8-0.28
 - Fix nmbd init script nmbd reload was causing smbd not nmbd to reload the
   configuration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	3 Feb 2009 17:13:18 -0000	1.62
+++ sources	1 Apr 2009 09:58:04 -0000	1.63
@@ -1 +1 @@
-06efd6e6cc4aac628a1a0b082e4be0f2  samba-3.2.8.tar.gz
+868d777b77dccec6ae7b6dbcfbb9d370  samba-3.2.9.tar.gz


--- samba-3.2.8-nmbd_lmb_delay.patch DELETED ---



From gd at fedoraproject.org  Wed Apr  1 09:59:15 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  1 Apr 2009 09:59:15 +0000 (UTC)
Subject: rpms/samba/F-9 .cvsignore, 1.57, 1.58 samba.spec, 1.168,
	1.169 sources, 1.61, 1.62
Message-ID: <20090401095915.960877011D@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14442

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.9
resolves: #489547

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	3 Feb 2009 17:48:54 -0000	1.57
+++ .cvsignore	1 Apr 2009 09:58:45 -0000	1.58
@@ -1 +1 @@
-samba-3.2.8.tar.gz
+samba-3.2.9.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- samba.spec	5 Mar 2009 11:36:35 -0000	1.168
+++ samba.spec	1 Apr 2009 09:58:45 -0000	1.169
@@ -1,5 +1,5 @@
-%define main_release 26
-%define samba_version 3.2.8
+%define main_release 27
+%define samba_version 3.2.9
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.8
+Version: 3.2.9
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -824,6 +824,10 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Mar 31 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.9-0.27
+- Update to 3.2.9
+- resolves: #489547
+
 * Thu Mar  5 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.8-0.26
 - Add libcap-devel to requires list (resolves: #488559)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	3 Feb 2009 17:48:54 -0000	1.61
+++ sources	1 Apr 2009 09:58:45 -0000	1.62
@@ -1 +1 @@
-06efd6e6cc4aac628a1a0b082e4be0f2  samba-3.2.8.tar.gz
+868d777b77dccec6ae7b6dbcfbb9d370  samba-3.2.9.tar.gz



From mschwendt at fedoraproject.org  Wed Apr  1 10:15:47 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 10:15:47 +0000 (UTC)
Subject: rpms/dnssec-tools/devel dnssec-tools.spec,1.24,1.25
Message-ID: <20090401101547.85FBF7011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/dnssec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16170

Modified Files:
	dnssec-tools.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-2
- Fix unowned directories (#483339).



Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dnssec-tools.spec	6 Mar 2009 20:00:47 -0000	1.24
+++ dnssec-tools.spec	1 Apr 2009 10:15:17 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -210,11 +210,9 @@
 %files perlmods
 %defattr(-,root,root)
 
-# These should NOT be owned by the package as it's not entirely ours:
-#%{perl_vendorarch}/Net
-#%{perl_vendorarch}/Net/DNS
-#%{perl_vendorarch}/Net/DNS/SEC
-# but this one is entirely ours:
+# perl-Net-DNS-SEC is noarch and cannot own this directory:
+%dir %{perl_vendorarch}/Net/DNS/SEC
+
 %{perl_vendorarch}/Net/DNS/SEC/Tools
 %{perl_vendorarch}/Net/addrinfo*
 %{perl_vendorarch}/Net/DNS/SEC/*.pm
@@ -223,7 +221,7 @@
 %{perl_vendorarch}/auto/Net/DNS/SEC/Validator
 %{perl_vendorarch}/auto/Net/addrinfo/
 %{perl_vendorarch}/Net/DNS/ZoneFile/
-%{perl_vendorlib}/Net/DNS/SEC/Tools/Donuts/
+%{perl_vendorlib}/Net/DNS/SEC/Tools/
 
 %{_mandir}/man3/Net::DNS::SEC::Tools::QWPrimitives.3pm.gz
 %{_mandir}/man3/Net::DNS::SEC::Tools::BootStrap.3pm.gz
@@ -289,6 +287,9 @@
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-2
+- Fix unowned directories (#483339).
+
 * Fri Mar  6 2009 Wes Hardaker <wjhns174 at hardakers.net> - 1.5-1
 - Update to 1.5
 



From ltinkl at fedoraproject.org  Wed Apr  1 10:18:37 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  1 Apr 2009 10:18:37 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.69, 1.70 kdelibs.spec, 1.458,
	1.459 sources, 1.86, 1.87
Message-ID: <20090401101837.A6B627011D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16479

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	19 Mar 2009 12:17:23 -0000	1.69
+++ .cvsignore	1 Apr 2009 10:18:07 -0000	1.70
@@ -1 +1 @@
-kdelibs-4.2.1.tar.bz2
+kdelibs-4.2.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- kdelibs.spec	23 Mar 2009 17:16:37 -0000	1.458
+++ kdelibs.spec	1 Apr 2009 10:18:07 -0000	1.459
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.1
-Release: 9%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -413,6 +413,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
 - scriptlet optimization
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	1 Mar 2009 11:21:51 -0000	1.86
+++ sources	1 Apr 2009 10:18:07 -0000	1.87
@@ -1 +1 @@
-fa4206dd747890c4e4283c8adb831e6c  kdelibs-4.2.1.tar.bz2
+ff54817efef952e8812c607f5089c2e1  kdelibs-4.2.2.tar.bz2



From mschwendt at fedoraproject.org  Wed Apr  1 10:20:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 10:20:38 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec,1.50,1.51
Message-ID: <20090401102038.64FB87011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16639

Modified Files:
	cyrus-imapd.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.3.13-5
- fix unowned directory (#483336).



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cyrus-imapd.spec	24 Feb 2009 10:38:31 -0000	1.50
+++ cyrus-imapd.spec	1 Apr 2009 10:20:08 -0000	1.51
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.13
 Name: cyrus-imapd
 Version: 2.3.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -782,6 +782,7 @@
 %dir %{perl_vendorarch}/auto/Cyrus/IMAP
 %{perl_vendorarch}/auto/Cyrus/IMAP/IMAP.so
 %{perl_vendorarch}/auto/Cyrus/IMAP/IMAP.bs
+%dir %{perl_vendorarch}/auto/Cyrus/SIEVE
 %dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
 %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.bs
@@ -797,6 +798,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.3.13-5
+- fix unowned directory (#483336).
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Wed Apr  1 10:32:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  1 Apr 2009 10:32:54 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.459,
	1.460 kdelibs-4.2.1-css.patch, 1.1, NONE
Message-ID: <20090401103254.828BE7011D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17673

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.1-css.patch 
Log Message:
drop upstream patches



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- kdelibs.spec	1 Apr 2009 10:18:07 -0000	1.459
+++ kdelibs.spec	1 Apr 2009 10:32:24 -0000	1.460
@@ -86,7 +86,6 @@
 
 # upstream
 # 4.2 branch
-Patch100: kdelibs-4.2.1-css.patch
 Patch101: kdelibs-4.2.1-encoding-qt45.patch
 
 # 4.3 branch
@@ -227,7 +226,6 @@
 
 # upstream patches
 # 4.2
-%patch100 -p1 -b .css-style
 %patch101 -p1 -b .encoding-qt45
 
 # 4.3


--- kdelibs-4.2.1-css.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Apr  1 10:40:40 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  1 Apr 2009 10:40:40 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.460,
	1.461 kdelibs-4.2.1-encoding-qt45.patch, 1.1, NONE
Message-ID: <20090401104040.35FDD7011D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18334

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.1-encoding-qt45.patch 
Log Message:
drop upstream patches



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- kdelibs.spec	1 Apr 2009 10:32:24 -0000	1.460
+++ kdelibs.spec	1 Apr 2009 10:40:09 -0000	1.461
@@ -86,7 +86,6 @@
 
 # upstream
 # 4.2 branch
-Patch101: kdelibs-4.2.1-encoding-qt45.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -226,7 +225,6 @@
 
 # upstream patches
 # 4.2
-%patch101 -p1 -b .encoding-qt45
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths


--- kdelibs-4.2.1-encoding-qt45.patch DELETED ---



From jakub at fedoraproject.org  Wed Apr  1 10:41:51 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  1 Apr 2009 10:41:51 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.265, 1.266 glibc-fedora.patch, 1.298,
	1.299 glibc.spec, 1.385, 1.386 import.log, 1.9, 1.10 sources,
	1.290, 1.291
Message-ID: <20090401104151.80F497011D@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18387/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- .cvsignore	20 Mar 2009 20:26:14 -0000	1.265
+++ .cvsignore	1 Apr 2009 10:41:20 -0000	1.266
@@ -1,2 +1,2 @@
-glibc-20090320T1944.tar.bz2
-glibc-fedora-20090320T1944.tar.bz2
+glibc-20090401T0935.tar.bz2
+glibc-fedora-20090401T0935.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- glibc-fedora.patch	20 Mar 2009 20:26:14 -0000	1.298
+++ glibc-fedora.patch	1 Apr 2009 10:41:20 -0000	1.299
@@ -1,6 +1,6 @@
---- glibc-20090320T1944/ChangeLog	17 Mar 2009 00:35:19 -0000	1.11552
-+++ glibc-20090320T1944-fedora/ChangeLog	20 Mar 2009 20:00:10 -0000	1.8782.2.322
-@@ -7002,6 +7002,13 @@
+--- glibc-20090401T0935/ChangeLog	1 Apr 2009 00:26:36 -0000	1.11556
++++ glibc-20090401T0935-fedora/ChangeLog	1 Apr 2009 09:41:35 -0000	1.8782.2.323
+@@ -7030,6 +7030,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7297,6 +7304,10 @@
+@@ -7325,6 +7332,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8554,6 +8565,15 @@
+@@ -8582,6 +8593,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090320T1944/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090320T1944-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090401T0935/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090401T0935-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090320T1944/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090320T1944-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090401T0935/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090401T0935-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090320T1944/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090320T1944-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090401T0935/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090401T0935-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090320T1944/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090320T1944-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090401T0935/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090401T0935-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090320T1944/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090320T1944-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090401T0935/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090401T0935-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090320T1944/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090320T1944-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090401T0935/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090401T0935-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090320T1944/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090320T1944-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090401T0935/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090401T0935-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090320T1944/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090320T1944-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090401T0935/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090401T0935-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090320T1944/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090401T0935/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090320T1944/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090401T0935/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090320T1944/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090320T1944-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090401T0935/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090401T0935-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090320T1944/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090320T1944-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090401T0935/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090401T0935-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090320T1944/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090320T1944-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090401T0935/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090401T0935-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090320T1944/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090320T1944-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090401T0935/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090401T0935-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090320T1944/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090320T1944-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090401T0935/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090401T0935-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090320T1944/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090320T1944-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090401T0935/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090401T0935-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090320T1944/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090320T1944-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090401T0935/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090401T0935-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090320T1944/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090320T1944-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090401T0935/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090401T0935-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090320T1944/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090401T0935/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090320T1944/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090320T1944-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090401T0935/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090401T0935-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090320T1944/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090320T1944-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090401T0935/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090401T0935-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090320T1944/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090320T1944-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090401T0935/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090401T0935-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090320T1944/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090320T1944-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090401T0935/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090401T0935-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090320T1944/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090320T1944-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090401T0935/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090401T0935-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090320T1944/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090320T1944-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090401T0935/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090401T0935-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090320T1944/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090320T1944-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090401T0935/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090401T0935-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090320T1944/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090320T1944-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090401T0935/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090401T0935-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090320T1944/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090401T0935/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090320T1944/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090320T1944-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090401T0935/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090401T0935-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090320T1944/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090320T1944-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090401T0935/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090401T0935-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090320T1944/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090320T1944-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090401T0935/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090401T0935-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090320T1944/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090320T1944-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090401T0935/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090401T0935-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090320T1944/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090401T0935/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090320T1944/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
-+++ glibc-20090320T1944-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
+--- glibc-20090401T0935/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
++++ glibc-20090401T0935-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
 @@ -102,7 +102,7 @@ libnss_dns {
      _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
      _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
@@ -1225,8 +1225,8 @@
    }
  }
  
---- glibc-20090320T1944/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090320T1944-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090401T0935/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090401T0935-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1236,8 +1236,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090320T1944/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090320T1944-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090401T0935/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090401T0935-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1253,8 +1253,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090320T1944/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090320T1944-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090401T0935/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090401T0935-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1270,8 +1270,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090320T1944/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090320T1944-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090401T0935/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090401T0935-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1283,8 +1283,8 @@
  endif
  endif
  
---- glibc-20090320T1944/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090320T1944-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090401T0935/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090401T0935-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1636,8 +1636,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090320T1944/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090401T0935/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1723,8 +1723,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090320T1944/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090320T1944-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090401T0935/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090401T0935-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1733,8 +1733,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090320T1944/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090320T1944-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090401T0935/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090401T0935-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1749,8 +1749,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1766,8 +1766,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1815,8 +1815,8 @@
      }
    else
  #endif
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1859,8 +1859,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1886,8 +1886,8 @@
  
  struct netlink_res
  {
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1897,8 +1897,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1944,8 +1944,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1964,8 +1964,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2026,8 +2026,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2060,29 +2060,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090320T1944/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090320T1944-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090401T0935/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- glibc.spec	20 Mar 2009 20:26:14 -0000	1.385
+++ glibc.spec	1 Apr 2009 10:41:21 -0000	1.386
@@ -1,6 +1,6 @@
-%define glibcdate 20090320T1944
+%define glibcdate 20090401T0935
 %define glibcname glibc
-%define glibcsrcdir glibc-20090320T1944
+%define glibcsrcdir glibc-20090401T0935
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 11
+Release: 12
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -324,7 +324,7 @@
 	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
-	--disable-profile
+	--disable-profile --enable-experimental-malloc
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1013,6 +1013,10 @@
 %endif
 
 %changelog
+* Wed Apr  1 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-12
+- update from trunk
+- configure with --enable-experimental-malloc
+
 * Fri Mar 20 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-11
 - update from trunk
   - POSIX 2008 prototype adjustments for scandir{,64}, alphasort{,64} and


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	20 Mar 2009 20:26:14 -0000	1.9
+++ import.log	1 Apr 2009 10:41:21 -0000	1.10
@@ -7,3 +7,4 @@
 glibc-2_9_90-9:HEAD:glibc-2.9.90-9.src.rpm:1236610744
 glibc-2_9_90-10:HEAD:glibc-2.9.90-10.src.rpm:1236715256
 glibc-2_9_90-11:HEAD:glibc-2.9.90-11.src.rpm:1237580739
+glibc-2_9_90-12:HEAD:glibc-2.9.90-12.src.rpm:1238582344


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- sources	20 Mar 2009 20:26:14 -0000	1.290
+++ sources	1 Apr 2009 10:41:21 -0000	1.291
@@ -1,2 +1,2 @@
-758f86e8e51fe5cd97876e57eca2de9a  glibc-20090320T1944.tar.bz2
-f841e1211a3e7ee0a98a4b9826576239  glibc-fedora-20090320T1944.tar.bz2
+2ba6e9abcb430ceb0817bd34f3bc6152  glibc-20090401T0935.tar.bz2
+12a79bf25e050840713075538d01c13e  glibc-fedora-20090401T0935.tar.bz2



From transif at fedoraproject.org  Wed Apr  1 10:54:11 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 10:54:11 +0000 (UTC)
Subject: comps/po ko.po,1.22,1.23
Message-ID: <20090401105411.9C4887011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20319/po

Modified Files:
	ko.po 
Log Message:
Sending translation for Korean


Index: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ko.po	9 Jan 2009 11:52:38 -0000	1.22
+++ ko.po	1 Apr 2009 10:53:41 -0000	1.23
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.po to Korean
+# translation of comps.HEAD.ko.po to Korean
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2002 Red Hat, Inc.
 #
@@ -8,10 +8,10 @@
 # Eunju Kim <eukim at redhat.com>, 2006, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD\n"
+"Project-Id-Version: comps.HEAD.ko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:34+0000\n"
-"PO-Revision-Date: 2009-01-07 10:46+1000\n"
+"POT-Creation-Date: 2009-04-01 08:02+0000\n"
+"PO-Revision-Date: 2009-04-01 20:51+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,6 +26,7 @@
 "\n"
 "\n"
 "\n"
+"\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
@@ -33,192 +34,192 @@
 msgstr "??? ?????? ?????????????????? ??? ???????????? ????????? ???????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "??????????????? ?????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????? ????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "????????? ????????? ???????????? ?????? ?????? ????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????? ?????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ??????????????? ????????? ?????? ?????? ??????."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ?????? ??????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "???????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "??????????????? ??????"
 
@@ -227,78 +228,78 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "????????? ??????????????? "
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "????????? ?????? ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "?????? (?????????) ??????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ??????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora Packager"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -308,19 +309,19 @@
 "???????????? ????????? ???????????? ????????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -329,86 +330,86 @@
 "????????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "????????? ?????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -416,25 +417,25 @@
 msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT??? KDE??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
@@ -442,50 +443,50 @@
 "???."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ????????? ??????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????? ??????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -494,121 +495,121 @@
 "?????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "????????? ???????????? ??????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "?????? ????????? ??????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "??????/?????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -616,110 +617,110 @@
 msgstr "??? ???????????? ?????? ??????????????? ???????????? ?????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "?????? ??????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "?????? ?????? ??????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????? ???????????? ????????? ???????????? ?????? ????????? ????????? ??????????????????. "
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "????????? ?????? ??????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "???????????? ????????? ???????????? ?????? ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -728,77 +729,77 @@
 "????????? ???????????????. ????????? ?????????????????? Emacs??? Vi??? ???????????????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????????? ?????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "?????? ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "?????? ????????? ??????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ??????????????? ????????? ????????? ????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ??????????????? ????????? ????????? ???????????? ?????? ??????."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????-?????? ?????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????? ??????"
 
@@ -807,42 +808,42 @@
 msgstr "Eclipse ?????? ?????? ??????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??? ?????? ??????????????? ????????? ???????????? ??????, PDF ?????? ???????????? ?????? ???????????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ???????????? IMAP??? SMTP ?????? ?????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ???????????? X ????????? ???????????? ?????? ???????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ???????????? ??? ?????? ?????????????????? ??? ????????? ????????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "??? ??????????????? DHCP, Kerberos, NIS??? ?????? ????????????-?????? ????????? ???????????? ?????????"
 "???."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -851,24 +852,24 @@
 "????????? ????????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "??? ???????????? ????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ???????????? ?????? ?????? ???????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??? ???????????? ????????? ????????? (?????? ??? ?????? ??????)??? ???????????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -877,19 +878,19 @@
 "HTML, PDF, Postscript??? ????????? ???????????? ????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ????????? ???????????? ????????? ????????? ???????????? ????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ????????? ???????????? ????????? ????????? FTP ????????? ????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -899,18 +900,18 @@
 "??? ????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ????????? ???????????? ???????????? ?????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ???????????? Red Hat??? ????????? ?????? ?????? ?????? ????????? ?????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -919,13 +920,13 @@
 "??????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ???????????? ????????? ?????????, ???, ?????? ?????????????????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -935,13 +936,13 @@
 "????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ????????? ????????? ???????????? ???????????? ??????, ?????? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -951,7 +952,7 @@
 "?????? ???????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -961,19 +962,19 @@
 "??? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ?????????????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ?????? ???????????? ??????????????? ?????? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -983,14 +984,14 @@
 "????????? ?????? ????????? ????????? ?????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "??? ????????? ????????? ???????????? ????????? ????????? DNS ?????? ?????? (BIND)??? ???????????? ??? ???"
 "?????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -999,319 +1000,356 @@
 "??? ??? ????????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ????????? ????????? ???????????? MySQL??? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ????????? ????????? ???????????? Postgresql ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora Packager??? ????????? ?????? ??? ???????????? "
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "????????? ?????? ?????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "????????? ???????????? ?????? ????????? ?????? ??? ?????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "??? ?????? "
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "??? ??????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "????????? ????????? "
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows ?????? ??????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ??????????????? ??????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ????????? ?????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ??????????????? ?????? "
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "????????? ??????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "????????? ??????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "?????? ????????? ?????? ?????? "
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "?????? "
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????? ????????? ????????? ????????? ??? ?????? ????????? "
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????? ?????? ?????? ?????? "
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "????????? ?????? "
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "?????? ????????? ?????? "
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????? ????????? ??? ?????? ?????? ????????? "
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????? ?????? "
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
 msgstr "???????????? ??????  "
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "?????????????????? ??????     "
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????? ????????? ??????  "
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ???????????? ??????   "
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR??? OLPC XO??? ?????? ????????? ???????????? ???????????????. "
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "????????? ??????   "
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "????????? ?????? ????????? ??????????????? ????????? ?????????????????????.  "
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskell ??????  "
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "?????? ?????? "
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "?????? ????????? ????????? ?????? ?????? ?????? ?????????  "
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
 msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "????????? (?????????) ??????   "
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "????????? ?????? "
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ??????????????? ????????? ????????? ????????? ???????????? ??????. "
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f11.xml.in.h:5
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
 msgstr "??????????????? ?????? "
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "???????????? ??????????????? ?????? ????????? ??? ??????????????? ?????? "
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "?????? ?????? "
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
 msgstr "?????? ????????? ??? ????????? "
 
-#: ../comps-f11.xml.in.h:58
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
 msgstr "??????????????? ??????   "
 
-#: ../comps-f11.xml.in.h:59
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
 msgstr "?????????????????? ??????   "
 
-#: ../comps-f11.xml.in.h:101
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
 msgstr "?????????????????? ?????? "
 
-#: ../comps-f11.xml.in.h:118
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
 msgstr "??????????????? ?????? "
 
-#: ../comps-f11.xml.in.h:132
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ????????? ???????????? "
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
 msgstr "????????? ??????     "
 
-#: ../comps-f11.xml.in.h:201
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "????????? ????????? ??? ?????? "
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Sugar ???????????? ?????? "
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "Fedora ?????? 32 ?????? ????????? ??????, ????????? ??? ?????? ???????????? ???????????? ????????? ????????? ??????????????? ?????? ??????  "
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "Objective CAML ??????????????? ?????? ??? ?????????????????? ???????????? ??????????????? ?????? ??????   "
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "??? ????????? ?????? ?????????, ??????, ?????? ??? ???????????? ???????????? ?????? ???????????????.  "
 
-#: ../comps-f11.xml.in.h:213
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
 msgstr "??????????????? ??????  "
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "??????????????? ??????"
+msgstr "??????????????? (??????) ?????? "
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From erikos at fedoraproject.org  Wed Apr  1 11:05:15 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  1 Apr 2009 11:05:15 +0000 (UTC)
Subject: rpms/sugar-chat/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sugar-chat.spec, 1.5, 1.6
Message-ID: <20090401110515.373CB7011D@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21137

Modified Files:
	.cvsignore sources sugar-chat.spec 
Log Message:
* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 65-1
- Support new activity.info exec parameter
- 'share or invite' hint not when resuming shared instance #402




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Mar 2009 14:42:08 -0000	1.4
+++ .cvsignore	1 Apr 2009 11:04:43 -0000	1.5
@@ -1 +1 @@
-Chat-64.tar.bz2
+Chat-65.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 14:42:08 -0000	1.4
+++ sources	1 Apr 2009 11:04:43 -0000	1.5
@@ -1 +1 @@
-dfb2b0abfb21dfbb419173a24dad67ff  Chat-64.tar.bz2
+8926e848ff40e178a47de49ac6049b1f  Chat-65.tar.bz2


Index: sugar-chat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sugar-chat.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sugar-chat.spec	3 Mar 2009 14:42:08 -0000	1.5
+++ sugar-chat.spec	1 Apr 2009 11:04:43 -0000	1.6
@@ -1,5 +1,5 @@
 Name: sugar-chat
-Version: 64
+Version: 65
 Release: 1%{?dist}
 Summary: Chat client for Sugar
 Group: Sugar/Activities
@@ -38,7 +38,11 @@
 
 
 %changelog
-* Tue Mar 03 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 64-2
+* Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 65-1
+- Support new activity.info exec parameter
+- 'share or invite' hint not when resuming shared instance #402
+
+* Tue Mar 03 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 64-1
 - New upstream release
  
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 62-2



From ovasik at fedoraproject.org  Wed Apr  1 11:14:31 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  1 Apr 2009 11:14:31 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.19,
	1.20 coreutils-i18n.patch, 1.32, 1.33 coreutils-pam.patch, 1.15,
	1.16 coreutils.spec, 1.256, 1.257
Message-ID: <20090401111432.0D5377011D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21834

Modified Files:
	coreutils-6.10-configuration.patch coreutils-i18n.patch 
	coreutils-pam.patch coreutils.spec 
Log Message:
temporarily disable strverscmp failing gnulib test, defuzz patches

coreutils-6.10-configuration.patch:

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- coreutils-6.10-configuration.patch	31 Mar 2009 15:48:26 -0000	1.19
+++ coreutils-6.10-configuration.patch	1 Apr 2009 11:14:30 -0000	1.20
@@ -1,3 +1,19 @@
+diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
+--- coreutils-7.2-orig/gnulib-tests/gnulib.mk	2009-03-31 14:28:30.000000000 +0200
++++ coreutils-7.2/gnulib-tests/gnulib.mk	2009-04-01 12:37:00.000000000 +0200
+@@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
+ 
+ ## begin gnulib module strverscmp-tests
+ 
+-TESTS += test-strverscmp
+-check_PROGRAMS += test-strverscmp
+-EXTRA_DIST += test-strverscmp.c
++#TESTS += test-strverscmp
++#check_PROGRAMS += test-strverscmp
++#EXTRA_DIST += test-strverscmp.c
+ 
+ ## end   gnulib module strverscmp-tests
+ 
 diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
 --- coreutils-6.11-orig/tests/mkdir/selinux	2008-04-19 23:34:23.000000000 +0200
 +++ coreutils-6.11/tests/mkdir/selinux	2008-04-22 13:23:50.000000000 +0200

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- coreutils-i18n.patch	2 Mar 2009 12:42:55 -0000	1.32
+++ coreutils-i18n.patch	1 Apr 2009 11:14:30 -0000	1.33
@@ -114,13 +114,13 @@
 --- coreutils-6.12-orig/tests/Makefile.am	2008-05-27 13:47:53.000000000 +0200
 +++ coreutils-6.12/tests/Makefile.am	2008-06-02 10:06:03.000000000 +0200
 @@ -192,6 +192,7 @@
-   misc/sort					\
    misc/sort-compress				\
+   misc/sort-continue				\
    misc/sort-files0-from				\
 +  misc/sort-mb-tests				\
    misc/sort-merge				\
+   misc/sort-merge-fdlimit			\
    misc/sort-rand				\
-   misc/sort-version				\
 @@ -391,6 +392,10 @@
    $(root_tests)
  
@@ -2786,7 +2786,7 @@
  
 @@ -416,7 +454,20 @@
  
- #define NULLCOL (COLUMN *)0
+ typedef struct COLUMN COLUMN;
  
 -static int char_to_clump (char c);
 +/* Funtion pointers to switch functions for single byte locale or for

coreutils-pam.patch:

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- coreutils-pam.patch	24 Feb 2009 16:34:43 -0000	1.15
+++ coreutils-pam.patch	1 Apr 2009 11:14:30 -0000	1.16
@@ -407,7 +407,7 @@
 --- coreutils-7.1/configure.ac.pam
 +++ coreutils-7.1/configure.ac
 @@ -44,6 +44,13 @@
-     [enable compile-time and run-time bounds-checking, and some warnings])
+   AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
  fi
  
 +dnl Give the chance to enable PAM


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- coreutils.spec	31 Mar 2009 15:48:26 -0000	1.256
+++ coreutils.spec	1 Apr 2009 11:14:30 -0000	1.257
@@ -312,6 +312,7 @@
 * Tue Mar 31 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-1
 - New upstream bugfix release 7.2
 - removed applied patches
+- temporarily disable strverscmp failing gnulib test
 
 * Thu Mar 19 2009 Ondrej Vasik <ovasik at redhat.com> 7.1-7
 - do not ship /etc/DIR_COLORS.xterm - as many terminals



From bernie at fedoraproject.org  Wed Apr  1 11:54:21 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Wed,  1 Apr 2009 11:54:21 +0000 (UTC)
Subject: rpms/ctrlproxy/devel ctrlproxy.spec,1.22,1.23
Message-ID: <20090401115421.B4A607011D@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/ctrlproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11039

Modified Files:
	ctrlproxy.spec 
Log Message:
* Wed Apr 1 2009 Bernie Innocenti <bernie at codewiz.org> 3.0.8-3
- Fix rhbz#483334: Unowned directories



Index: ctrlproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctrlproxy/devel/ctrlproxy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ctrlproxy.spec	24 Feb 2009 10:13:23 -0000	1.22
+++ ctrlproxy.spec	1 Apr 2009 11:53:50 -0000	1.23
@@ -6,7 +6,7 @@
 Summary: ctrlproxy
 Name: ctrlproxy
 Version: 3.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz
@@ -85,8 +85,9 @@
 %attr(0750, ctrlproxy, ctrlproxy) %dir %{ctrlproxy_logdir}
 %attr(0750, ctrlproxy, ctrlproxy) %dir %{ctrlproxy_homedir}
 %attr(0750, ctrlproxy, ctrlproxy) %config(noreplace) %{ctrlproxy_homedir}/config
-%attr(0750, ctrlproxy, ctrlproxy) %config(noreplace) %{_sysconfdir}/ctrlproxy/config
-%attr(0750, ctrlproxy, ctrlproxy) %config(noreplace) %{_sysconfdir}/ctrlproxy/motd
+%dir %{_sysconfdir}/ctrlproxy
+%attr(0640, ctrlproxy, ctrlproxy) %config(noreplace) %{_sysconfdir}/ctrlproxy/config
+%attr(0644, ctrlproxy, ctrlproxy) %config(noreplace) %{_sysconfdir}/ctrlproxy/motd
 
 
 %files devel
@@ -95,6 +96,9 @@
 %{_libdir}/pkgconfig/ctrlproxy.pc
 
 %changelog
+* Wed Apr 1 2009 Bernie Innocenti <bernie at codewiz.org> 3.0.8-3
+- Fix rhbz#483334: Unowned directories
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From airlied at fedoraproject.org  Wed Apr  1 12:03:35 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  1 Apr 2009 12:03:35 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.41,
	1.42 xorg-x11-drv-ati.spec, 1.163, 1.164
Message-ID: <20090401120335.3D61C7011D@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12981

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-2
- attempt to fix r100/r200 xv better


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- radeon-modeset.patch	1 Apr 2009 08:54:08 -0000	1.41
+++ radeon-modeset.patch	1 Apr 2009 12:03:34 -0000	1.42
@@ -8137,7 +8137,7 @@
      else
  #endif
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 05acb93..b7a8513 100644
+index 05acb93..852f4ac 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
 @@ -87,11 +87,25 @@ do {								\
@@ -8328,16 +8328,29 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1591,6 +1663,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	if (RADEONTilingEnabled(pScrn, pPixmap))
+ 	    colorpitch |= RADEON_COLOR_TILE_ENABLE;
+ 
+-	BEGIN_ACCEL(4);
++	qwords = info->new_cs ? 5 : 4;
++	BEGIN_ACCEL(qwords);
  
  	OUT_ACCEL_REG(RADEON_RB3D_CNTL,
  		      dst_format /*| RADEON_ALPHA_BLEND_ENABLE*/);
+-	OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
 +
-+	dst_offset += info->fbLocation + pScrn->fbOffset;
- 	OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
++	if (info->new_cs) {
++	    OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, 0);
++	    OUT_RELOC(dst_bo, 0, RADEON_GEM_DOMAIN_VRAM);
++	} else {
++	    dst_offset += info->fbLocation + pScrn->fbOffset;
++	    OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
++	}
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -1630,7 +1704,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8347,7 +8360,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
-@@ -1649,21 +1724,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8373,7 +8386,7 @@
  
  		/* similar to r300 code. Note the big problem is that hardware constants
  		 * are 8 bits only, representing 0.0-1.0. We can get that up (using bias
-@@ -1799,7 +1875,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8383,7 +8396,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1894,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8392,7 +8405,7 @@
  
  		/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
-@@ -1901,7 +1978,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  		FINISH_ACCEL();
  	    }
  	    else {
@@ -8402,7 +8415,7 @@
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  
-@@ -1922,7 +2000,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
@@ -8411,7 +8424,7 @@
  
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			      R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2023,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    info->accel_state->texW[0] = 1;
  	    info->accel_state->texH[0] = 1;
  
@@ -8421,7 +8434,7 @@
  
  	    OUT_ACCEL_REG(RADEON_PP_CNTL,
  			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2038,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- xorg-x11-drv-ati.spec	1 Apr 2009 08:54:08 -0000	1.163
+++ xorg-x11-drv-ati.spec	1 Apr 2009 12:03:34 -0000	1.164
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -76,6 +76,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-2
+- attempt to fix r100/r200 xv better
+
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-1
 - rebase to upstream + fix FUS on DRI2 + video on r100/r200 hopefully
 



From hadess at fedoraproject.org  Wed Apr  1 12:20:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  1 Apr 2009 12:20:37 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/devel
	gst-fmd-update-from-bad.patch, NONE,
	1.1 gstreamer-plugins-flumpegdemux.spec, 1.4, 1.5
Message-ID: <20090401122037.F23187011D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16882

Modified Files:
	gstreamer-plugins-flumpegdemux.spec 
Added Files:
	gst-fmd-update-from-bad.patch 
Log Message:
* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-6
- Update code from gst-plugins-bad


gst-fmd-update-from-bad.patch:

--- NEW FILE gst-fmd-update-from-bad.patch ---
diff -uprN gst-fluendo-mpegdemux-0.10.15.old/configure.ac gst-fluendo-mpegdemux-0.10.15/configure.ac
--- gst-fluendo-mpegdemux-0.10.15.old/configure.ac	2008-02-13 18:14:54.000000000 +0000
+++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-04-01 12:39:32.000000000 +0100
@@ -76,6 +76,8 @@ AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_BASE_LIBS)
 
+PKG_CHECK_MODULES(LIBOIL, liboil-0.3)
+
 dnl make GST_MAJORMINOR available in Makefile.am
 AC_SUBST(GST_MAJORMINOR)
 
diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c
--- gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c	2007-11-21 12:59:24.000000000 +0000
+++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:37:48.000000000 +0100
@@ -1,4 +1,10 @@
-/* 
+/*
+ * This library is licensed under 2 different licenses and you
+ * can choose to use it under the terms of either one of them. The
+ * two licenses are the MPL 1.1 and the LGPL.
+ *
+ * MPL:
+ *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,6 +15,23 @@
  * License for the specific language governing rights and limitations
  * under the License.
  *
+ * LGPL:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
  * The Original Code is Fluendo MPEG Demuxer plugin.
  *
  * The Initial Developer of the Original Code is Fluendo, S.L.
@@ -24,28 +47,31 @@
 
 #include "gstmpegdemux.h"
 #include "gstmpegtsdemux.h"
+#include "mpegtsparse.h"
+#include "mpegtspacketizer.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gstflupesfilter_debug);
 GST_DEBUG_CATEGORY_EXTERN (gstflusectionfilter_debug);
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "flupesfilter", 0,
+  GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "mpegpesfilter", 0,
       "MPEG-TS/PS PES filter output");
-  GST_DEBUG_CATEGORY_INIT (gstflusectionfilter_debug, "flusectionfilter", 0,
+  GST_DEBUG_CATEGORY_INIT (gstflusectionfilter_debug, "mpegsectionfilter", 0,
       "MPEG-TS Section filter output");
 
   if (!gst_flups_demux_plugin_init (plugin))
     return FALSE;
-  if (!gst_fluts_demux_plugin_init (plugin))
+  if (!gst_mpegts_demux_plugin_init (plugin))
+    return FALSE;
+  if (!gst_mpegtsparse_plugin_init (plugin))
     return FALSE;
-
   return TRUE;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "flumpegdemux",
+    "mpegdemux2",
     "MPEG demuxers",
     plugin_init, VERSION,
-    GST_LICENSE_UNKNOWN, "flumpegdemux", "http://www.fluendo.com/");
+    GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c
--- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c	2007-11-21 12:59:24.000000000 +0000
+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:37:48.000000000 +0100
@@ -1,4 +1,10 @@
-/* 
+/*
+ * This library is licensed under 2 different licenses and you
+ * can choose to use it under the terms of either one of them. The
+ * two licenses are the MPL 1.1 and the LGPL.
+ *
+ * MPL:
+ *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,6 +15,23 @@
  * License for the specific language governing rights and limitations
  * under the License.
  *
+ * LGPL:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
  * The Original Code is Fluendo MPEG Demuxer plugin.
  *
  * The Initial Developer of the Original Code is Fluendo, S.L.
@@ -33,18 +56,19 @@ enum
   PROP_PID
 };
 
-static void fluts_pat_info_set_property (GObject * object, guint prop_id,
+static void mpegts_pat_info_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * spec);
-static void fluts_pat_info_get_property (GObject * object, guint prop_id,
+static void mpegts_pat_info_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * spec);
 
-GST_BOILERPLATE (FluTsPatInfo, fluts_pat_info, GObject, G_TYPE_OBJECT);
+GST_BOILERPLATE (MpegTsPatInfo, mpegts_pat_info, GObject, G_TYPE_OBJECT);
 
-FluTsPatInfo *fluts_pat_info_new (guint16 program_no, guint16 pid)
+MpegTsPatInfo *
+mpegts_pat_info_new (guint16 program_no, guint16 pid)
 {
-  FluTsPatInfo *info;
+  MpegTsPatInfo *info;
 
-  info = g_object_new (FLUTS_TYPE_PAT_INFO, NULL);
+  info = g_object_new (MPEGTS_TYPE_PAT_INFO, NULL);
 
   info->program_no = program_no;
   info->pid = pid;
@@ -53,51 +77,53 @@ FluTsPatInfo *fluts_pat_info_new (guint1
 }
 
 static void
-fluts_pat_info_base_init (gpointer klass)
+mpegts_pat_info_base_init (gpointer klass)
 {
 }
 
 static void
-fluts_pat_info_class_init (FluTsPatInfoClass *klass)
+mpegts_pat_info_class_init (MpegTsPatInfoClass * klass)
 {
-  GObjectClass *gobject_klass = (GObjectClass *)klass;
+  GObjectClass *gobject_klass = (GObjectClass *) klass;
 
-  gobject_klass->set_property = fluts_pat_info_set_property;
-  gobject_klass->get_property = fluts_pat_info_get_property;
+  gobject_klass->set_property = mpegts_pat_info_set_property;
+  gobject_klass->get_property = mpegts_pat_info_get_property;
 
   g_object_class_install_property (gobject_klass, PROP_PROGRAM_NO,
-       g_param_spec_uint ("program-number", "Program Number",
-       "Program Number for this program", 0, G_MAXUINT16, 1,
-       G_PARAM_READABLE));
+      g_param_spec_uint ("program-number", "Program Number",
+          "Program Number for this program", 0, G_MAXUINT16, 1,
+          G_PARAM_READABLE));
 
   g_object_class_install_property (gobject_klass, PROP_PID,
-       g_param_spec_uint ("pid", "PID carrying PMT",
-       "PID which carries the PMT for this program", 1, G_MAXUINT16, 1,
-       G_PARAM_READABLE));
+      g_param_spec_uint ("pid", "PID carrying PMT",
+          "PID which carries the PMT for this program", 1, G_MAXUINT16, 1,
+          G_PARAM_READABLE));
 }
 
 static void
-fluts_pat_info_init (FluTsPatInfo *pat_info, FluTsPatInfoClass *klass)
+mpegts_pat_info_init (MpegTsPatInfo * pat_info, MpegTsPatInfoClass * klass)
 {
 }
 
-static void fluts_pat_info_set_property (GObject * object, guint prop_id,
[...9801 lines suppressed...]
+    } else {
+      /* push the packet downstream */
+      res = mpegts_parse_push (parse, &packet, NULL);
+    }
+
+  next:
+    mpegts_packetizer_clear_packet (parse->packetizer, &packet);
+  }
+
+  gst_object_unref (parse);
+  return res;
+}
+
+static GstStateChangeReturn
+mpegts_parse_change_state (GstElement * element, GstStateChange transition)
+{
+  MpegTSParse *parse;
+  GstStateChangeReturn ret;
+
+  parse = GST_MPEGTS_PARSE (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      mpegts_parse_reset (parse);
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+mpegts_parse_src_pad_query (GstPad * pad, GstQuery * query)
+{
+  MpegTSParse *parse = GST_MPEGTS_PARSE (gst_pad_get_parent (pad));
+  gboolean res;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_LATENCY:
+    {
+      if ((res = gst_pad_peer_query (parse->sinkpad, query))) {
+        gboolean is_live;
+        GstClockTime min_latency, max_latency;
+
+        gst_query_parse_latency (query, &is_live, &min_latency, &max_latency);
+        if (is_live) {
+          min_latency += TS_LATENCY * GST_MSECOND;
+          if (max_latency != GST_CLOCK_TIME_NONE)
+            max_latency += TS_LATENCY * GST_MSECOND;
+        }
+
+        gst_query_set_latency (query, is_live, min_latency, max_latency);
+      }
+
+      break;
+    }
+    default:
+      res = gst_pad_query_default (pad, query);
+  }
+
+  return res;
+}
+
+gboolean
+gst_mpegtsparse_plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (mpegts_parse_debug, "mpegtsparse", 0,
+      "MPEG transport stream parser");
+
+  mpegts_packetizer_init_debug ();
+  gst_mpegtsdesc_init_debug ();
+
+  return gst_element_register (plugin, "mpegtsparse",
+      GST_RANK_NONE, GST_TYPE_MPEGTS_PARSE);
+}
diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h
--- gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h	1970-01-01 01:00:00.000000000 +0100
+++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-04-01 12:37:48.000000000 +0100
@@ -0,0 +1,83 @@
+/*
+ * mpegts_parse.h - GStreamer MPEG transport stream parser
+ * Copyright (C) 2007 Alessandro Decina
+ * 
+ * Authors:
+ *   Alessandro Decina <alessandro at nnva.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef GST_MPEG_TS_PARSE_H
+#define GST_MPEG_TS_PARSE_H
+
+#include <gst/gst.h>
+#include "mpegtspacketizer.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_MPEGTS_PARSE \
+  (mpegts_parse_get_type())
+#define GST_MPEGTS_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MPEGTS_PARSE,MpegTSParse))
+#define GST_MPEGTS_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEGTS_PARSE,MpegTSParseClass))
+#define GST_IS_MPEGTS_PARSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MPEGTS_PARSE))
+#define GST_IS_MPEGTS_PARSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEGTS_PARSE))
+
+typedef struct _MpegTSParse MpegTSParse;
+typedef struct _MpegTSParseClass MpegTSParseClass;
+
+struct _MpegTSParse {
+  GstElement element;
+
+  GstPad *sinkpad;
+
+  /* the following vars must be protected with the OBJECT_LOCK as they can be
+   * accessed from the application thread and the streaming thread */
+  gchar *program_numbers;
+  GList *pads_to_add;
+  GList *pads_to_remove;
+  GHashTable *programs;
+  guint req_pads;
+
+  GstStructure *pat;
+  MpegTSPacketizer *packetizer;
+  GHashTable *psi_pids;
+  gboolean disposed;
+};
+
+struct _MpegTSParseClass {
+  GstElementClass parent_class;
+
+  /* signals */
+  void (*pat_info) (GstStructure *pat);
+  void (*pmt_info) (GstStructure *pmt);
+  void (*nit_info) (GstStructure *nit);
+  void (*sdt_info) (GstStructure *sdt);
+  void (*eit_info) (GstStructure *eit);
+};
+
+GType gst_mpegts_parse_get_type(void);
+
+gboolean gst_mpegtsparse_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* GST_MPEG_TS_PARSE_H */
--- gst-fluendo-mpegdemux-0.10.15.old/src/Makefile.am	2007-11-21 12:59:24.000000000 +0000
+++ gst-fluendo-mpegdemux-0.10.15/src/Makefile.am	2009-04-01 13:05:25.000000000 +0100
@@ -1,5 +1,4 @@
-# plugindir is set in configure
-
+plugindir = $(libdir)/gstreamer-0.10/
 plugin_LTLIBRARIES = libgstflumpegdemux.la
 
 # for the next set of variables, rename the prefix if you renamed the .la
@@ -14,12 +13,14 @@ libgstflumpegdemux_la_SOURCES = \
 	flutspatinfo.c \
 	flutspmtinfo.c \
 	flutspmtstreaminfo.c \
-	gstsectionfilter.c
+	gstsectionfilter.c \
+	mpegtspacketizer.c \
+	mpegtsparse.c
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS)
-libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) -DGST_PACKAGE_NAME="\"gst-fluendo-mpegdemux from gst-plugins-bad\"" -DGST_PACKAGE_ORIGIN="\"http://download.fedora.redhat.com/fedora\""
+libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
 libgstflumpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 # headers we need but don't want installed
@@ -32,5 +33,7 @@ noinst_HEADERS =	\
 	flutspatinfo.h \
 	flutspmtinfo.h \
 	flutspmtstreaminfo.h \
-	gstsectionfilter.h
+	gstsectionfilter.h \
+	mpegtspacketizer.h \
+	mpegtsparse.h
 


Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamer-plugins-flumpegdemux.spec	25 Feb 2009 01:34:47 -0000	1.4
+++ gstreamer-plugins-flumpegdemux.spec	1 Apr 2009 12:20:07 -0000	1.5
@@ -1,16 +1,20 @@
 Summary: MPEG demuxer for GStreamer
 Name: gstreamer-plugins-flumpegdemux
 Version: 0.10.15
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: MPLv1.1
 Group: Applications/Multimedia
 Source0: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-%{version}.tar.bz2
 Url: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# Update code to current from gst-plugins-bad
+Patch0: gst-fmd-update-from-bad.patch
 
 BuildRequires: gcc-c++, pkgconfig
 BuildRequires: gstreamer-devel
+BuildRequires: liboil-devel
+BuildRequires: automake autoconf
 
 %description
 This package contains an MPEG demuxer for the GStreamer multimedia framework.
@@ -19,6 +23,12 @@
 
 %prep
 %setup -q -n gst-fluendo-mpegdemux-%{version}
+%patch0 -p1 -b .bad
+
+aclocal
+cat common/m4/*.m4 >> aclocal.m4
+autoconf
+automake
 
 %build
 %configure
@@ -28,6 +38,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/libgstflumpegdemux.so $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/libgstmpegdemux.so
+
 # no static libs and libtool archives either
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
@@ -38,9 +50,12 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS TODO
-%{_libdir}/gstreamer-0.10/libgstflumpegdemux.so
+%{_libdir}/gstreamer-0.10/libgstmpegdemux.so
 
 %changelog
+* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-6
+- Update code from gst-plugins-bad
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From airlied at fedoraproject.org  Wed Apr  1 12:24:10 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  1 Apr 2009 12:24:10 +0000 (UTC)
Subject: rpms/mesa/devel radeon-fix-r100.patch, NONE, 1.1 mesa.spec, 1.237,
	1.238
Message-ID: <20090401122410.423517011D@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17774

Modified Files:
	mesa.spec 
Added Files:
	radeon-fix-r100.patch 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 7.5-0.6
- Build fbo files for r100


radeon-fix-r100.patch:

--- NEW FILE radeon-fix-r100.patch ---
diff -up mesa-20090322/src/mesa/drivers/dri/radeon/Makefile.dma mesa-20090322/src/mesa/drivers/dri/radeon/Makefile
--- mesa-20090322/src/mesa/drivers/dri/radeon/Makefile.dma	2009-04-01 22:18:56.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/radeon/Makefile	2009-04-01 22:19:05.000000000 +1000
@@ -19,7 +19,8 @@ RADEON_COMMON_SOURCES = \
 	radeon_bo_legacy.c \
 	radeon_cs_legacy.c \
 	radeon_mipmap_tree.c \
-	radeon_span.c
+	radeon_span.c \
+	radeon_fbo.c
 
 DRIVER_SOURCES = \
 	radeon_context.c \


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- mesa.spec	31 Mar 2009 06:07:01 -0000	1.237
+++ mesa.spec	1 Apr 2009 12:23:39 -0000	1.238
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -46,6 +46,7 @@
 Patch9: intel-revert-vbl.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
+Patch13: radeon-fix-r100.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -173,6 +174,7 @@
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
+%patch13 -p1 -b .r100
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -429,6 +431,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 7.5-0.6
+- Build fbo files for r100
+
 * Tue Mar 31 2009 Dave Airlie <airlied at redhat.com> 7.5-0.5
 - radeon-rewrite.patch: misc radeon fixes with buffer readbacks
 



From hadess at fedoraproject.org  Wed Apr  1 12:33:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  1 Apr 2009 12:33:01 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/devel
	gstreamer-plugins-flumpegdemux.spec, 1.5, 1.6
Message-ID: <20090401123301.A042A7011D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19475

Modified Files:
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
Add missing libtool BR



Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gstreamer-plugins-flumpegdemux.spec	1 Apr 2009 12:20:07 -0000	1.5
+++ gstreamer-plugins-flumpegdemux.spec	1 Apr 2009 12:32:31 -0000	1.6
@@ -14,7 +14,7 @@
 BuildRequires: gcc-c++, pkgconfig
 BuildRequires: gstreamer-devel
 BuildRequires: liboil-devel
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool
 
 %description
 This package contains an MPEG demuxer for the GStreamer multimedia framework.



From hadess at fedoraproject.org  Wed Apr  1 12:38:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  1 Apr 2009 12:38:03 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/devel
	gstreamer-plugins-flumpegdemux.spec, 1.6, 1.7
Message-ID: <20090401123803.9D2477011D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20424

Modified Files:
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
more libtool



Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gstreamer-plugins-flumpegdemux.spec	1 Apr 2009 12:32:31 -0000	1.6
+++ gstreamer-plugins-flumpegdemux.spec	1 Apr 2009 12:37:34 -0000	1.7
@@ -25,6 +25,7 @@
 %setup -q -n gst-fluendo-mpegdemux-%{version}
 %patch0 -p1 -b .bad
 
+libtoolize -f
 aclocal
 cat common/m4/*.m4 >> aclocal.m4
 autoconf



From airlied at fedoraproject.org  Wed Apr  1 12:42:55 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  1 Apr 2009 12:42:55 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-radeon-reorder-bm.patch, NONE, 1.1 kernel.spec,
	1.1498, 1.1499
Message-ID: <20090401124255.5ABD77011D@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21375

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-reorder-bm.patch 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
- drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards


drm-radeon-reorder-bm.patch:

--- NEW FILE drm-radeon-reorder-bm.patch ---
>From 79a5ca0c53c2a149f51f71352a6bbf73bcdc40df Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 1 Apr 2009 22:34:53 +1000
Subject: [PATCH] radeon: reorder bm enable vs mode set

---
 drivers/gpu/drm/radeon/radeon_pm.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index ac7bc0a..0d2f4a5 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -111,8 +111,6 @@ int radeon_resume(struct drm_device *dev)
 	if (pci_enable_device(dev->pdev))
 		return -1;
 
-	/* Turn on bus mastering -todo fix properly */
-	radeon_enable_bm(dev_priv);
 
 	DRM_ERROR("\n");
 	/* on atom cards re init the whole card 
@@ -125,7 +123,6 @@ int radeon_resume(struct drm_device *dev)
 		radeon_combios_asic_init(dev);
 	}
 
-	pci_set_master(dev->pdev);
 
 	for (i = 0; i < 8; i++)
 		RADEON_WRITE(RADEON_BIOS_0_SCRATCH + (i * 4), dev_priv->pmregs.bios_scratch[i]);
@@ -150,6 +147,10 @@ int radeon_resume(struct drm_device *dev)
 	
 	radeon_init_memory_map(dev);
 
+	pci_set_master(dev->pdev);
+	/* Turn on bus mastering -todo fix properly */
+	radeon_enable_bm(dev_priv);
+
 	if (dev_priv->flags & RADEON_IS_PCIE) {
 		memcpy_toio(dev_priv->mm.pcie_table.kmap.virtual, dev_priv->mm.pcie_table_backup, dev_priv->gart_info.table_size);
 	}
-- 
1.6.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -r1.1498 -r1.1499
--- kernel.spec	1 Apr 2009 04:01:36 -0000	1.1498
+++ kernel.spec	1 Apr 2009 12:42:24 -0000	1.1499
@@ -667,6 +667,7 @@
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
+Patch1820: drm-radeon-reorder-bm.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1259,6 +1260,7 @@
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
+ApplyPatch drm-radeon-reorder-bm.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1870,6 +1872,9 @@
 # and build.
 
 %changelog
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
+- drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards
+
 * Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-35.rc1
 - linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support
 



From rdieter at fedoraproject.org  Wed Apr  1 12:52:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 12:52:04 +0000 (UTC)
Subject: rpms/PackageKit/F-10 PackageKit.spec,1.91,1.92
Message-ID: <20090401125204.4F38C7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PackageKit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24084

Modified Files:
	PackageKit.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.15-2
- rebuild against qt-4.4.x (#493003)



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-10/PackageKit.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- PackageKit.spec	30 Mar 2009 11:03:04 -0000	1.91
+++ PackageKit.spec	1 Apr 2009 12:51:33 -0000	1.92
@@ -8,7 +8,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.3.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -380,6 +380,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.15-2
+- rebuild against qt-4.4.x (#493003)
+
 * Mon Mar 30 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.15-1
 - New upstream version
 - Fixes #492004, #480440 and #488509



From oget at fedoraproject.org  Wed Apr  1 13:01:40 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 13:01:40 +0000 (UTC)
Subject: rpms/ardour/F-10 .cvsignore,1.10,1.11 sources,1.11,1.12
Message-ID: <20090401130140.4EF987011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ardour/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26153

Modified Files:
	.cvsignore sources 
Log Message:
update source file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Feb 2009 08:40:39 -0000	1.10
+++ .cvsignore	1 Apr 2009 13:01:09 -0000	1.11
@@ -1 +1 @@
-ardour-2.7.1.tar.bz2
+ardour-2.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	23 Feb 2009 08:40:39 -0000	1.11
+++ sources	1 Apr 2009 13:01:09 -0000	1.12
@@ -1 +1 @@
-0fd4b1a600c75447d633b796bad321e1  ardour-2.7.1.tar.bz2
+24bd768dbe08f1f2724dc97704ee0518  ardour-2.8.tar.bz2



From mschwendt at fedoraproject.org  Wed Apr  1 13:06:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 13:06:49 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.15,1.16
Message-ID: <20090401130649.6EEB07011D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27609

Modified Files:
	bit.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-6
- Fix unowned directory (#473629) by fixing the dependency on bit-devel



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bit.spec	24 Feb 2009 04:49:24 -0000	1.15
+++ bit.spec	1 Apr 2009 13:06:19 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -49,7 +49,7 @@
 %package          gtkmm-devel
 Summary:          Development files to support gtkmm UI widgets for bit stream processing
 Group:            Development/Libraries
-Requires:         bit-gtkmm = %{version}-%{release}
+Requires:         bit-devel = %{version}-%{release}
 Requires:         gtkmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Provides:         bitgtkmm-devel = %{version}
@@ -118,6 +118,9 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-6
+- Fix unowned directory (#473629) by fixing the dependency on bit-devel
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.90-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Wed Apr  1 13:16:21 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 13:16:21 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.76,1.77
Message-ID: <20090401131621.9145D70146@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29962

Modified Files:
	qpidc.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.752600-5
- Fix unowned examples directory in -devel pkg.



Index: qpidc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- qpidc.spec	30 Mar 2009 17:45:24 -0000	1.76
+++ qpidc.spec	1 Apr 2009 13:15:51 -0000	1.77
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.5.752600
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -284,6 +284,7 @@
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
+%dir %_datadir/qpidc
 %_datadir/qpidc/examples
 
 %files -n qpidd
@@ -408,6 +409,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.752600-5
+- Fix unowned examples directory in -devel pkg.
+
 * Mon Mar 16 2009 Nuno Santos <nsantos at localhost.localdomain> - 0.5.752600-4
 - BZ483925 - split docs into a separate noarch subpackage
 



From than at fedoraproject.org  Wed Apr  1 13:21:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  1 Apr 2009 13:21:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec, 1.102,
	1.103 kdebase-runtime-4.2.1-pulseaudio-cmake.patch, 1.1, NONE
Message-ID: <20090401132125.D23B470146@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31678

Modified Files:
	kdebase-runtime.spec 
Removed Files:
	kdebase-runtime-4.2.1-pulseaudio-cmake.patch 
Log Message:
drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch




Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdebase-runtime.spec	31 Mar 2009 11:22:53 -0000	1.102
+++ kdebase-runtime.spec	1 Apr 2009 13:20:55 -0000	1.103
@@ -11,7 +11,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -26,7 +26,6 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
-Patch100:      kdebase-runtime-4.2.1-pulseaudio-cmake.patch
 
 %ifarch noarch
 %define icons 1
@@ -376,6 +375,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch
+
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 


--- kdebase-runtime-4.2.1-pulseaudio-cmake.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Apr  1 13:29:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 13:29:24 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.17,1.18
Message-ID: <20090401132924.1331870146@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1073

Modified Files:
	conexus.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6.0-2
- Fix unowned top-level headers directory (#483305).



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- conexus.spec	26 Mar 2009 16:09:28 -0000	1.17
+++ conexus.spec	1 Apr 2009 13:28:53 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
 Version:          0.6.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -169,6 +169,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/libconexus.so
 %{_libdir}/pkgconfig/conexus-1.0.pc
+%dir %{_includedir}/conexus-0.6
 %{_includedir}/conexus-0.6/conexus.h
 %{_includedir}/conexus-0.6/conexus/
 %doc ChangeLog
@@ -230,6 +231,9 @@
 %doc doc/reference/conexus-nss/html/
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6.0-2
+- Fix unowned top-level headers directory (#483305).
+
 * Mon Mar 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
 - New release
 - Changed Sourceforge url to downloads.sf.net from download.sf.net



From harald at fedoraproject.org  Wed Apr  1 13:30:00 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  1 Apr 2009 13:30:00 +0000 (UTC)
Subject: rpms/udev/devel udev.spec,1.268,1.269
Message-ID: <20090401133000.A39C370146@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1225

Modified Files:
	udev.spec 
Log Message:
* Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-3
- renamed modprobe /etc/modprobe.d/floppy-pnp to
  /etc/modprobe.d/floppy-pnp.conf (bug #492732 #488768)
- Resolves: rhbz#492732



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- udev.spec	3 Mar 2009 13:11:08 -0000	1.268
+++ udev.spec	1 Apr 2009 13:29:30 -0000	1.269
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 139
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -191,7 +191,7 @@
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/floppy-pnp <<EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/floppy-pnp.conf <<EOF
 alias pnp:dPNP0700 floppy
 EOF
 
@@ -313,7 +313,7 @@
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
 
-%config %attr(0644,root,root) %{_sysconfdir}/modprobe.d/floppy-pnp
+%config %attr(0644,root,root) %{_sysconfdir}/modprobe.d/floppy-pnp.conf
 
 %dir %attr(0755,root,root) %{firmwaredir}
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
@@ -379,6 +379,11 @@
 
 
 %changelog
+* Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-3
+- renamed modprobe /etc/modprobe.d/floppy-pnp to
+  /etc/modprobe.d/floppy-pnp.conf (bug #492732 #488768)
+- Resolves: rhbz#492732
+
 * Tue Mar 03 2009 Harald Hoyer <harald at redhat.com> 139-2
 - speedup of start_udev by doing make_extra_nodes in parallel to 
   the daemon start



From nucleo at fedoraproject.org  Wed Apr  1 13:31:41 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Wed,  1 Apr 2009 13:31:41 +0000 (UTC)
Subject: rpms/knemo/F-9 knemo.spec,1.15,1.16
Message-ID: <20090401133141.88F6F70146@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1743

Modified Files:
	knemo.spec 
Log Message:
Update to version 0.5.2


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-9/knemo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- knemo.spec	1 Apr 2009 01:49:26 -0000	1.15
+++ knemo.spec	1 Apr 2009 13:31:11 -0000	1.16
@@ -1,6 +1,6 @@
 Name:             knemo
 Version:          0.5.2
-Release:          1%{?dist}
+Release:          1%{?dist}.1
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
 License:          GPLv2+
@@ -67,7 +67,7 @@
 %{_kde4_iconsdir}/hicolor/*/apps/knemo.*
 
 %changelog
-* Wed Apr  1 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.2-1
+* Wed Apr  1 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.2-1.1
 - Update to version 0.5.2
 - Fixed spec License and URL fields
 



From than at fedoraproject.org  Wed Apr  1 13:31:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  1 Apr 2009 13:31:51 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.103,1.104
Message-ID: <20090401133151.E488770146@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1725

Modified Files:
	kdebase-runtime.spec 
Log Message:
drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdebase-runtime.spec	1 Apr 2009 13:20:55 -0000	1.103
+++ kdebase-runtime.spec	1 Apr 2009 13:31:21 -0000	1.104
@@ -121,7 +121,6 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
-%patch100 -p1 -b .pulseaudio-cmake
 
 %build
 mkdir -p %{_target_platform}



From gd at fedoraproject.org  Wed Apr  1 13:10:24 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  1 Apr 2009 13:10:24 +0000 (UTC)
Subject: rpms/samba/F-9 .cvsignore, 1.58, 1.59 samba.spec, 1.169,
	1.170 sources, 1.62, 1.63
Message-ID: <20090401131024.EDBB77013C@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28621

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.10

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	1 Apr 2009 09:58:45 -0000	1.58
+++ .cvsignore	1 Apr 2009 13:09:54 -0000	1.59
@@ -1 +1 @@
-samba-3.2.9.tar.gz
+samba-3.2.10.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- samba.spec	1 Apr 2009 09:58:45 -0000	1.169
+++ samba.spec	1 Apr 2009 13:09:54 -0000	1.170
@@ -1,5 +1,5 @@
 %define main_release 27
-%define samba_version 3.2.9
+%define samba_version 3.2.10
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.9
+Version: 3.2.10
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -824,8 +824,8 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Tue Mar 31 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.9-0.27
-- Update to 3.2.9
+* Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.10-0.27
+- Update to 3.2.10
 - resolves: #489547
 
 * Thu Mar  5 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.8-0.26


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	1 Apr 2009 09:58:45 -0000	1.62
+++ sources	1 Apr 2009 13:09:54 -0000	1.63
@@ -1 +1 @@
-868d777b77dccec6ae7b6dbcfbb9d370  samba-3.2.9.tar.gz
+7a83207fb05200e9c2114d995f11396e  samba-3.2.10.tar.gz



From gd at fedoraproject.org  Wed Apr  1 13:10:32 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  1 Apr 2009 13:10:32 +0000 (UTC)
Subject: rpms/samba/devel .cvsignore, 1.59, 1.60 samba.spec, 1.181,
	1.182 sources, 1.63, 1.64 samba-3.2.8-nmbd_lmb_delay.patch, 1.1, NONE
Message-ID: <20090401131032.30A987013F@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26946

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.2.8-nmbd_lmb_delay.patch 
Log Message:
Update to 3.3.3

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	12 Mar 2009 16:12:56 -0000	1.59
+++ .cvsignore	1 Apr 2009 13:10:01 -0000	1.60
@@ -1 +1 @@
-samba-3.3.2.tar.gz
+samba-3.3.3.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- samba.spec	26 Mar 2009 20:40:56 -0000	1.181
+++ samba.spec	1 Apr 2009 13:10:01 -0000	1.182
@@ -1,5 +1,5 @@
-%define main_release 33
-%define samba_version 3.3.2
+%define main_release 34
+%define samba_version 3.3.3
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
 %define pre_release %nil
@@ -46,7 +46,6 @@
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
-Patch201: samba-3.2.8-nmbd_lmb_delay.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -251,7 +250,6 @@
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
-%patch201 -p1 -b .nmbd_lmb_delay
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -881,6 +879,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.34
+- Update to 3.3.3
+
 * Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.3.2-0.33
 - Fix nmbd init script nmbd reload was causing smbd not nmbd to reload the
   configuration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	12 Mar 2009 16:12:57 -0000	1.63
+++ sources	1 Apr 2009 13:10:01 -0000	1.64
@@ -1 +1 @@
-5c5178ea2c5d9bd5f6569285f2e0e6d7  samba-3.3.2.tar.gz
+4d5835817416d1ffa30783af45c5a9ed  samba-3.3.3.tar.gz


--- samba-3.2.8-nmbd_lmb_delay.patch DELETED ---



From ivazquez at fedoraproject.org  Wed Apr  1 13:13:39 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed,  1 Apr 2009 13:13:39 +0000 (UTC)
Subject: rpms/transifex/F-10 .cvsignore, 1.3, 1.4 sources, 1.6,
	1.7 transifex.spec, 1.6, 1.7
Message-ID: <20090401131339.46D3970143@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/transifex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287/F-10

Modified Files:
	.cvsignore sources transifex.spec 
Log Message:
- Upstream update
  * Fixed ordering of components untranslated by a Release X Lang
  * Fixed missing parameter for the set_stats_for_lang method call
  * Fixed msgfmt to work large files
- Fixed small bug in %%post
- Fixed PROJECT_PATH in the settings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Mar 2009 19:26:15 -0000	1.3
+++ .cvsignore	1 Apr 2009 13:13:09 -0000	1.4
@@ -1 +1 @@
-transifex-0.5.1.tar.gz
+transifex-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2009 11:43:48 -0000	1.6
+++ sources	1 Apr 2009 13:13:09 -0000	1.7
@@ -1 +1 @@
-14332970dcc46e85d692f7f5ed0e7b92  transifex-0.5.1.tar.gz
+34129c1dc28a804e1b863b0bf7a339fa  transifex-0.5.2.tar.gz


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/F-10/transifex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- transifex.spec	30 Mar 2009 11:43:48 -0000	1.6
+++ transifex.spec	1 Apr 2009 13:13:09 -0000	1.7
@@ -1,8 +1,8 @@
 %define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.5.1
-Release:    2%{?dist}
+Version:    0.5.2
+Release:    1%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -19,7 +19,7 @@
 Requires:   django-notification django-pagination django-tagging
 Requires:   python-markdown python-pygments
 Requires:   mercurial
-Requires:   intltool >= 0.40.5
+Requires:   intltool >= 0.37.1
 
 %description
 Transifex is a web-system that facilitates the process of submitting
@@ -69,7 +69,8 @@
 
 install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
-sed -n -e '/ADDITIONAL VCS OPTIONS/q;p' \
+sed -n -e 's!^\(PROJECT_PATH = \).*$!\1"%{_datadir}/%{name}"!;
+    /ADDITIONAL VCS OPTIONS/q;p' \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py > \
     $RPM_BUILD_ROOT%{confdir}/00-default.conf
 
@@ -87,11 +88,12 @@
 
 %post
 # Check to see if the secret key for Django needs setting, and then set it
-if grep -q '[[SECRETKEY]]' %{confdir}/00-default.conf
+if grep -q '\[\[SECRETKEY\]\]' %{confdir}/00-default.conf
 then
     key=$(python << EOF
 import random
-print ''.join(chr(random.randint(35, 126)) for x in xrange(40))
+print ''.join(chr(random.randint(35, 126)) for x in xrange(40)).replace('&',
+    '\&')
 EOF
 )
     sed -i -e "s!\[\[SECRETKEY\]\]!$key!" \
@@ -171,6 +173,14 @@
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Wed Apr 01 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.2-1
+- Upstream update
+  * Fixed ordering of components untranslated by a Release X Lang
+  * Fixed missing parameter for the set_stats_for_lang method call
+  * Fixed msgfmt to work large files
+- Fixed small bug in %%post
+- Fixed PROJECT_PATH in the settings
+
 * Mon Mar 30 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.1-2
 - Build with proper tarball
 



From gd at fedoraproject.org  Wed Apr  1 13:10:28 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  1 Apr 2009 13:10:28 +0000 (UTC)
Subject: rpms/samba/F-10 .cvsignore, 1.59, 1.60 samba.spec, 1.171,
	1.172 sources, 1.63, 1.64
Message-ID: <20090401131028.9108D7013D@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26465

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.10

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	1 Apr 2009 09:58:04 -0000	1.59
+++ .cvsignore	1 Apr 2009 13:09:58 -0000	1.60
@@ -1 +1 @@
-samba-3.2.9.tar.gz
+samba-3.2.10.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- samba.spec	1 Apr 2009 09:58:04 -0000	1.171
+++ samba.spec	1 Apr 2009 13:09:58 -0000	1.172
@@ -1,5 +1,5 @@
 %define main_release 29
-%define samba_version 3.2.9
+%define samba_version 3.2.10
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.9
+Version: 3.2.10
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -826,8 +826,8 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Tue Mar 31 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.9-0.29
-- Update to 3.2.9
+* Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.10-0.29
+- Update to 3.2.10
 - resolves: #489547
 
 * Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.2.8-0.28


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	1 Apr 2009 09:58:04 -0000	1.63
+++ sources	1 Apr 2009 13:09:58 -0000	1.64
@@ -1 +1 @@
-868d777b77dccec6ae7b6dbcfbb9d370  samba-3.2.9.tar.gz
+7a83207fb05200e9c2114d995f11396e  samba-3.2.10.tar.gz



From ivazquez at fedoraproject.org  Wed Apr  1 13:13:39 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed,  1 Apr 2009 13:13:39 +0000 (UTC)
Subject: rpms/transifex/EL-5 .cvsignore, 1.3, 1.4 sources, 1.6,
	1.7 transifex.spec, 1.6, 1.7
Message-ID: <20090401131339.23DA770142@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/transifex/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287/EL-5

Modified Files:
	.cvsignore sources transifex.spec 
Log Message:
- Upstream update
  * Fixed ordering of components untranslated by a Release X Lang
  * Fixed missing parameter for the set_stats_for_lang method call
  * Fixed msgfmt to work large files
- Fixed small bug in %%post
- Fixed PROJECT_PATH in the settings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Mar 2009 19:26:15 -0000	1.3
+++ .cvsignore	1 Apr 2009 13:13:08 -0000	1.4
@@ -1 +1 @@
-transifex-0.5.1.tar.gz
+transifex-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2009 11:43:46 -0000	1.6
+++ sources	1 Apr 2009 13:13:08 -0000	1.7
@@ -1 +1 @@
-14332970dcc46e85d692f7f5ed0e7b92  transifex-0.5.1.tar.gz
+34129c1dc28a804e1b863b0bf7a339fa  transifex-0.5.2.tar.gz


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/EL-5/transifex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- transifex.spec	30 Mar 2009 11:43:47 -0000	1.6
+++ transifex.spec	1 Apr 2009 13:13:08 -0000	1.7
@@ -1,8 +1,8 @@
 %define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.5.1
-Release:    2%{?dist}
+Version:    0.5.2
+Release:    1%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -19,7 +19,7 @@
 Requires:   django-notification django-pagination django-tagging
 Requires:   python-markdown python-pygments
 Requires:   mercurial
-Requires:   intltool >= 0.40.5
+Requires:   intltool >= 0.37.1
 
 %description
 Transifex is a web-system that facilitates the process of submitting
@@ -69,7 +69,8 @@
 
 install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
-sed -n -e '/ADDITIONAL VCS OPTIONS/q;p' \
+sed -n -e 's!^\(PROJECT_PATH = \).*$!\1"%{_datadir}/%{name}"!;
+    /ADDITIONAL VCS OPTIONS/q;p' \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py > \
     $RPM_BUILD_ROOT%{confdir}/00-default.conf
 
@@ -87,11 +88,12 @@
 
 %post
 # Check to see if the secret key for Django needs setting, and then set it
-if grep -q '[[SECRETKEY]]' %{confdir}/00-default.conf
+if grep -q '\[\[SECRETKEY\]\]' %{confdir}/00-default.conf
 then
     key=$(python << EOF
 import random
-print ''.join(chr(random.randint(35, 126)) for x in xrange(40))
+print ''.join(chr(random.randint(35, 126)) for x in xrange(40)).replace('&',
+    '\&')
 EOF
 )
     sed -i -e "s!\[\[SECRETKEY\]\]!$key!" \
@@ -171,6 +173,14 @@
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Wed Apr 01 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.2-1
+- Upstream update
+  * Fixed ordering of components untranslated by a Release X Lang
+  * Fixed missing parameter for the set_stats_for_lang method call
+  * Fixed msgfmt to work large files
+- Fixed small bug in %%post
+- Fixed PROJECT_PATH in the settings
+
 * Mon Mar 30 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.1-2
 - Build with proper tarball
 



From ivazquez at fedoraproject.org  Wed Apr  1 13:13:39 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed,  1 Apr 2009 13:13:39 +0000 (UTC)
Subject: rpms/transifex/F-9 .cvsignore, 1.3, 1.4 sources, 1.6,
	1.7 transifex.spec, 1.6, 1.7
Message-ID: <20090401131339.809F070144@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/transifex/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287/F-9

Modified Files:
	.cvsignore sources transifex.spec 
Log Message:
- Upstream update
  * Fixed ordering of components untranslated by a Release X Lang
  * Fixed missing parameter for the set_stats_for_lang method call
  * Fixed msgfmt to work large files
- Fixed small bug in %%post
- Fixed PROJECT_PATH in the settings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Mar 2009 19:26:15 -0000	1.3
+++ .cvsignore	1 Apr 2009 13:13:09 -0000	1.4
@@ -1 +1 @@
-transifex-0.5.1.tar.gz
+transifex-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2009 11:43:48 -0000	1.6
+++ sources	1 Apr 2009 13:13:09 -0000	1.7
@@ -1 +1 @@
-14332970dcc46e85d692f7f5ed0e7b92  transifex-0.5.1.tar.gz
+34129c1dc28a804e1b863b0bf7a339fa  transifex-0.5.2.tar.gz


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/F-9/transifex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- transifex.spec	30 Mar 2009 11:43:49 -0000	1.6
+++ transifex.spec	1 Apr 2009 13:13:09 -0000	1.7
@@ -1,8 +1,8 @@
 %define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.5.1
-Release:    2%{?dist}
+Version:    0.5.2
+Release:    1%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -19,7 +19,7 @@
 Requires:   django-notification django-pagination django-tagging
 Requires:   python-markdown python-pygments
 Requires:   mercurial
-Requires:   intltool >= 0.40.5
+Requires:   intltool >= 0.37.1
 
 %description
 Transifex is a web-system that facilitates the process of submitting
@@ -69,7 +69,8 @@
 
 install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
-sed -n -e '/ADDITIONAL VCS OPTIONS/q;p' \
+sed -n -e 's!^\(PROJECT_PATH = \).*$!\1"%{_datadir}/%{name}"!;
+    /ADDITIONAL VCS OPTIONS/q;p' \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py > \
     $RPM_BUILD_ROOT%{confdir}/00-default.conf
 
@@ -87,11 +88,12 @@
 
 %post
 # Check to see if the secret key for Django needs setting, and then set it
-if grep -q '[[SECRETKEY]]' %{confdir}/00-default.conf
+if grep -q '\[\[SECRETKEY\]\]' %{confdir}/00-default.conf
 then
     key=$(python << EOF
 import random
-print ''.join(chr(random.randint(35, 126)) for x in xrange(40))
+print ''.join(chr(random.randint(35, 126)) for x in xrange(40)).replace('&',
+    '\&')
 EOF
 )
     sed -i -e "s!\[\[SECRETKEY\]\]!$key!" \
@@ -171,6 +173,14 @@
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Wed Apr 01 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.2-1
+- Upstream update
+  * Fixed ordering of components untranslated by a Release X Lang
+  * Fixed missing parameter for the set_stats_for_lang method call
+  * Fixed msgfmt to work large files
+- Fixed small bug in %%post
+- Fixed PROJECT_PATH in the settings
+
 * Mon Mar 30 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.1-2
 - Build with proper tarball
 



From ivazquez at fedoraproject.org  Wed Apr  1 13:13:39 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed,  1 Apr 2009 13:13:39 +0000 (UTC)
Subject: rpms/transifex/devel .cvsignore, 1.3, 1.4 sources, 1.6,
	1.7 transifex.spec, 1.6, 1.7
Message-ID: <20090401131339.BD4E170145@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/transifex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287/devel

Modified Files:
	.cvsignore sources transifex.spec 
Log Message:
- Upstream update
  * Fixed ordering of components untranslated by a Release X Lang
  * Fixed missing parameter for the set_stats_for_lang method call
  * Fixed msgfmt to work large files
- Fixed small bug in %%post
- Fixed PROJECT_PATH in the settings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Mar 2009 05:22:20 -0000	1.3
+++ .cvsignore	1 Apr 2009 13:13:09 -0000	1.4
@@ -1 +1 @@
-transifex-0.5.1.tar.gz
+transifex-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2009 11:43:49 -0000	1.6
+++ sources	1 Apr 2009 13:13:09 -0000	1.7
@@ -1 +1 @@
-14332970dcc46e85d692f7f5ed0e7b92  transifex-0.5.1.tar.gz
+34129c1dc28a804e1b863b0bf7a339fa  transifex-0.5.2.tar.gz


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/transifex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- transifex.spec	30 Mar 2009 11:43:49 -0000	1.6
+++ transifex.spec	1 Apr 2009 13:13:09 -0000	1.7
@@ -1,8 +1,8 @@
 %define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.5.1
-Release:    2%{?dist}
+Version:    0.5.2
+Release:    1%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -19,7 +19,7 @@
 Requires:   django-notification django-pagination django-tagging
 Requires:   python-markdown python-pygments
 Requires:   mercurial
-Requires:   intltool >= 0.40.5
+Requires:   intltool >= 0.37.1
 
 %description
 Transifex is a web-system that facilitates the process of submitting
@@ -69,7 +69,8 @@
 
 install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
-sed -n -e '/ADDITIONAL VCS OPTIONS/q;p' \
+sed -n -e 's!^\(PROJECT_PATH = \).*$!\1"%{_datadir}/%{name}"!;
+    /ADDITIONAL VCS OPTIONS/q;p' \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py > \
     $RPM_BUILD_ROOT%{confdir}/00-default.conf
 
@@ -87,11 +88,12 @@
 
 %post
 # Check to see if the secret key for Django needs setting, and then set it
-if grep -q '[[SECRETKEY]]' %{confdir}/00-default.conf
+if grep -q '\[\[SECRETKEY\]\]' %{confdir}/00-default.conf
 then
     key=$(python << EOF
 import random
-print ''.join(chr(random.randint(35, 126)) for x in xrange(40))
+print ''.join(chr(random.randint(35, 126)) for x in xrange(40)).replace('&',
+    '\&')
 EOF
 )
     sed -i -e "s!\[\[SECRETKEY\]\]!$key!" \
@@ -171,6 +173,14 @@
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Wed Apr 01 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.2-1
+- Upstream update
+  * Fixed ordering of components untranslated by a Release X Lang
+  * Fixed missing parameter for the set_stats_for_lang method call
+  * Fixed msgfmt to work large files
+- Fixed small bug in %%post
+- Fixed PROJECT_PATH in the settings
+
 * Mon Mar 30 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.1-2
 - Build with proper tarball
 



From jnovy at fedoraproject.org  Wed Apr  1 13:36:50 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  1 Apr 2009 13:36:50 +0000 (UTC)
Subject: rpms/gphoto2/F-10 .cvsignore, 1.20, 1.21 gphoto2.spec, 1.97,
	1.98 sources, 1.22, 1.23
Message-ID: <20090401133650.D1B3F7011D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/gphoto2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2799

Modified Files:
	.cvsignore gphoto2.spec sources 
Log Message:
* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
- update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Oct 2008 10:25:33 -0000	1.20
+++ .cvsignore	1 Apr 2009 13:36:20 -0000	1.21
@@ -1 +1 @@
-gphoto2-2.4.3.tar.bz2
+gphoto2-2.4.4.tar.bz2


Index: gphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/F-10/gphoto2.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gphoto2.spec	20 Oct 2008 10:25:33 -0000	1.97
+++ gphoto2.spec	1 Apr 2009 13:36:20 -0000	1.98
@@ -1,6 +1,6 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
-Version: 2.4.3
+Version: 2.4.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
@@ -51,6 +51,9 @@
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
+- update to 2.4.4
+
 * Mon Oct 20 2008 Jindrich Novy <jnovy at redhat.com> 2.4.3-1
 - update to 2.4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Oct 2008 10:25:33 -0000	1.22
+++ sources	1 Apr 2009 13:36:20 -0000	1.23
@@ -1 +1 @@
-561bcf2beac539431017c6302e0237a6  gphoto2-2.4.3.tar.bz2
+bcc5621e09802e114c7f72a6f6172230  gphoto2-2.4.4.tar.bz2



From jnovy at fedoraproject.org  Wed Apr  1 13:09:38 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  1 Apr 2009 13:09:38 +0000 (UTC)
Subject: rpms/libgphoto2/F-10 gphoto2-canontimeout.patch, NONE,
	1.1 .cvsignore, 
	1.6, 1.7 libgphoto2.spec, 1.14, 1.15 sources, 1.6, 1.7
Message-ID: <20090401130938.2E5407011D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28432

Modified Files:
	.cvsignore libgphoto2.spec sources 
Added Files:
	gphoto2-canontimeout.patch 
Log Message:
* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
- update to 2.4.4
- many fixes and improvements to Nikon and Canon cameras
- translation updates
- increase timeouts for Canon cameras (#476355), thanks to
  Andrzej Nowak and Russell Harrison


gphoto2-canontimeout.patch:

--- NEW FILE gphoto2-canontimeout.patch ---
diff -upr libgphoto2-2.4.3/camlibs/canon/usb.c libgphoto2-2.4.3.rlh/camlibs/canon/usb.c
--- libgphoto2-2.4.3/camlibs/canon/usb.c	2008-08-08 16:12:57.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/canon/usb.c	2009-03-31 12:44:05.000000000 -0400
@@ -72,7 +72,7 @@
 
 /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for
  * an URB to come back on an interrupt endpoint */
-#define CANON_FAST_TIMEOUT 175
+#define CANON_FAST_TIMEOUT 500
 
 /* WARNING: This destroys reentrancy of the code. Better to put this
  * in the camera descriptor somewhere. */
diff -upr libgphoto2-2.4.3/camlibs/ptp2/library.c libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c
--- libgphoto2-2.4.3/camlibs/ptp2/library.c	2008-10-19 12:41:36.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c	2009-03-31 12:44:49.000000000 -0400
@@ -59,7 +59,7 @@
 #define GP_MODULE "PTP2"
 
 #define USB_START_TIMEOUT 8000
-#define USB_CANON_START_TIMEOUT 500	/* 0.5 seconds */
+#define USB_CANON_START_TIMEOUT 1500	/* 1.5 seconds */
 #define USB_NORMAL_TIMEOUT 20000
 #define USB_TIMEOUT_CAPTURE 20000
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Oct 2008 10:25:51 -0000	1.6
+++ .cvsignore	1 Apr 2009 13:09:07 -0000	1.7
@@ -1 +1 @@
-libgphoto2-2.4.3.tar.bz2
+libgphoto2-2.4.4.tar.bz2


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-10/libgphoto2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libgphoto2.spec	20 Oct 2008 10:25:51 -0000	1.14
+++ libgphoto2.spec	1 Apr 2009 13:09:07 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
-Version: 2.4.3
+Version: 2.4.4
 Release: 1%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
@@ -11,6 +11,7 @@
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: gphoto2-canontimeout.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -54,6 +55,7 @@
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
+%patch5 -p1 -b .canontimeout
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -151,6 +153,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
+- update to 2.4.4
+- many fixes and improvements to Nikon and Canon cameras
+- translation updates
+- increase timeouts for Canon cameras (#476355), thanks to
+  Andrzej Nowak and Russell Harrison
+
 * Mon Oct 20 2008 Jindrich Novy <jnovy at redhat.com> 2.4.3-1
 - update to libgphoto2-2.4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Oct 2008 10:25:51 -0000	1.6
+++ sources	1 Apr 2009 13:09:07 -0000	1.7
@@ -1 +1 @@
-6c23b8b3021aee4187b2c11d4bb7265b  libgphoto2-2.4.3.tar.bz2
+8aff5ac4ca72cba17de633078cf1612e  libgphoto2-2.4.4.tar.bz2



From harald at fedoraproject.org  Wed Apr  1 13:37:52 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  1 Apr 2009 13:37:52 +0000 (UTC)
Subject: rpms/udev/devel udev.spec,1.269,1.270
Message-ID: <20090401133752.8F7697011D@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3012

Modified Files:
	udev.spec 
Log Message:
* Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-4
- double the IMPORT buffer (bug #488554)
- Resolves: rhbz#488554



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- udev.spec	1 Apr 2009 13:29:30 -0000	1.269
+++ udev.spec	1 Apr 2009 13:37:22 -0000	1.270
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 139
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,6 +19,7 @@
 Source5: udev.sysconfig
 
 Patch102: udev-118-sysconf.patch
+Patch103: udev-import-buffer.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -92,6 +93,7 @@
 %setup -q  
 
 %patch102 -p1 -b .sysconf
+%patch103 -p1 -b .import
 rm rules/redhat/95-pam-console.rules
 
 %build
@@ -379,6 +381,10 @@
 
 
 %changelog
+* Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-4
+- double the IMPORT buffer (bug #488554)
+- Resolves: rhbz#488554
+
 * Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-3
 - renamed modprobe /etc/modprobe.d/floppy-pnp to
   /etc/modprobe.d/floppy-pnp.conf (bug #492732 #488768)



From harald at fedoraproject.org  Wed Apr  1 13:40:26 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  1 Apr 2009 13:40:26 +0000 (UTC)
Subject: rpms/udev/devel udev-import-buffer.patch,NONE,1.1
Message-ID: <20090401134026.44EC27011D@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3740

Added Files:
	udev-import-buffer.patch 
Log Message:
* Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-4
- double the IMPORT buffer (bug #488554)
- Resolves: rhbz#488554


udev-import-buffer.patch:

--- NEW FILE udev-import-buffer.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Mon, 30 Mar 2009 18:09:08 +0000 (+0200)
Subject: IMPORT: 2048 -> 4096 bytes buffer
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=52761bb0a99cb80ccb19c9edf23963fdad67060d;hp=f2b937440c682bca3837263a1bafd78e30b17e4d

IMPORT: 2048 -> 4096 bytes buffer
---

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 663a6d4..e4594c3 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -737,7 +737,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
 {
 	struct udev *udev = udev_device_get_udev(dev);
 	char **envp;
-	char result[2048];
+	char result[4096];
 	size_t reslen;
 	char *line;
 



From mschwendt at fedoraproject.org  Wed Apr  1 13:50:21 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  1 Apr 2009 13:50:21 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.16,1.17
Message-ID: <20090401135021.3F3387013C@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5540

Modified Files:
	bit.spec 
Log Message:
* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-7
- And readd the bit-gtkmm-devel -> bit-gtkmm dep, since the guidelines
  require it.



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bit.spec	1 Apr 2009 13:06:19 -0000	1.16
+++ bit.spec	1 Apr 2009 13:49:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          6%{?dist}
+Release:          7%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -49,6 +49,7 @@
 %package          gtkmm-devel
 Summary:          Development files to support gtkmm UI widgets for bit stream processing
 Group:            Development/Libraries
+Requires:         bit-gtkmm = %{version}-%{release}
 Requires:         bit-devel = %{version}-%{release}
 Requires:         gtkmm24-devel >= 2.6.0
 Requires:         pkgconfig
@@ -118,6 +119,10 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-7
+- And readd the bit-gtkmm-devel -> bit-gtkmm dep, since the guidelines
+  require it.
+
 * Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-6
 - Fix unowned directory (#473629) by fixing the dependency on bit-devel
 



From jnovy at fedoraproject.org  Wed Apr  1 13:59:34 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  1 Apr 2009 13:59:34 +0000 (UTC)
Subject: rpms/netpbm/F-10 netpbm-10.35-ppmdfontfix.patch, NONE,
	1.1 netpbm-10.35-ppmfadeusage.patch, NONE,
	1.1 netpbm-10.35-ppmrainbowexit.patch, NONE,
	1.1 netpbm-10.35-svgtopam.patch, NONE,
	1.1 netpbm-10.35-ximtoppmsegfault.patch, NONE, 1.1 .cvsignore,
	1.48, 1.49 netpbm-10.23-security.patch, 1.20, 1.21 netpbm.spec,
	1.124, 1.125 sources, 1.52, 1.53
Message-ID: <20090401135934.EECEB7011D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8083

Modified Files:
	.cvsignore netpbm-10.23-security.patch netpbm.spec sources 
Added Files:
	netpbm-10.35-ppmdfontfix.patch netpbm-10.35-ppmfadeusage.patch 
	netpbm-10.35-ppmrainbowexit.patch netpbm-10.35-svgtopam.patch 
	netpbm-10.35-ximtoppmsegfault.patch 
Log Message:
* Wed Apr  1 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-1
- update to 10.35.61
- upstream fixes array bound violation in pbmtog3
- drop .pbmtog3segfault patch, we fixed this some time ago already
  and it is in upstream now
- use saner exit status in ppmfade
- remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
- fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak  


netpbm-10.35-ppmdfontfix.patch:

--- NEW FILE netpbm-10.35-ppmdfontfix.patch ---
diff -up netpbm-10.35.58/lib/ppmdfont.c.ppmdfontfix netpbm-10.35.58/lib/ppmdfont.c
--- netpbm-10.35.58/lib/ppmdfont.c.ppmdfontfix	2009-01-19 09:23:54.000000000 +0100
+++ netpbm-10.35.58/lib/ppmdfont.c	2009-03-23 13:06:36.000000000 +0100
@@ -62,7 +62,8 @@ static void
 readFontHeader(FILE *                   const ifP,
                struct ppmd_fontHeader * const fontHeaderP) {
     
-    fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP);
+    if (!fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP))
+	pm_error("Error reading font header.");
     fontHeaderP->format         = fgetc(ifP);
     fontHeaderP->characterCount = fgetc(ifP);
     fontHeaderP->firstCodePoint = fgetc(ifP);

netpbm-10.35-ppmfadeusage.patch:

--- NEW FILE netpbm-10.35-ppmfadeusage.patch ---
diff -up netpbm-10.35.60/editor/ppmfade.ppmfadeusage netpbm-10.35.60/editor/ppmfade
--- netpbm-10.35.60/editor/ppmfade.ppmfadeusage	2009-02-27 12:35:26.000000000 +0100
+++ netpbm-10.35.60/editor/ppmfade	2009-02-27 12:39:06.000000000 +0100
@@ -36,6 +36,8 @@ my $mode = $SPREAD;		# default fading mo
 #
 #  Check those command line args.
 #
+sub usage();
+
 if (@ARGV == 0) {
     usage();
 }
@@ -82,7 +84,7 @@ for ($n = 0; $n < @ARGV; $n++) {
         usage();
     } else {
         print "Unknown argument: $ARGV[$n]\n";
-        exit 100;
+        exit 1;
     } 
 }
 #
@@ -312,5 +314,5 @@ sub usage() {
    print "               [-base basename]\n";
    print "Notes: Default base: fade\n";
    print "       The resulting image files will be named fade.NNNN.ppm.\n";
-   exit(100);
+   exit 1;
 }

netpbm-10.35-ppmrainbowexit.patch:

--- NEW FILE netpbm-10.35-ppmrainbowexit.patch ---
diff -up netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit netpbm-10.35.60/generator/ppmrainbow
--- netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit	2009-02-15 13:04:35.000000000 +0100
+++ netpbm-10.35.60/generator/ppmrainbow	2009-02-26 18:48:34.000000000 +0100
@@ -21,15 +21,16 @@ GetOptions("width=i"   => \$Twid,
            "norepeat!" => \$norepeat,
            "verbose!"  => \$verbose);
 
+$! = 1;
 die "invalid width and/or height\n" unless $Twid >= 1 && $Thgt >= 1;
 
 my $verboseCommand = $verbose ? "set -x;" : "";
 
 if (@ARGV < 1) {
-    die("You must specify at least one color as an argument");
+    die("You must specify at least one color as an argument\n");
 } elsif (@ARGV < 2 && $norepeat) {
     die("With the -norepeat option, you must specify at least two colors " .
-        "as arguments.");
+        "as arguments.\n");
 }
 
 my @colorlist;
@@ -57,7 +58,7 @@ while (@colorlist >= 2) {
     my $rc = system("$verboseCommand pgmramp -lr $w $Thgt | " .
                     "pgmtoppm \"$colorlist[0]-$colorlist[1]\" >$outfile");
     if ($rc != 0) {
-        die("pgmramp|pgmtoppm failed.");
+        die("pgmramp|pgmtoppm failed.\n");
     }
     $widthRemaining -= $w;
     $n++;

netpbm-10.35-svgtopam.patch:

--- NEW FILE netpbm-10.35-svgtopam.patch ---
diff -up netpbm-10.35.58/converter/other/Makefile.svgtopam netpbm-10.35.58/converter/other/Makefile
--- netpbm-10.35.58/converter/other/Makefile.svgtopam	2009-01-19 09:23:58.000000000 +0100
+++ netpbm-10.35.58/converter/other/Makefile	2009-03-23 13:17:22.000000000 +0100
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
   BINARIES += pnmtops
 endif
 
-ifneq ($(XML2_LIBS),NONE)
-  BINARIES += svgtopam
-endif 
-
 MERGEBINARIES = $(BINARIES)
 
 EXTRA_OBJECTS = exif.o rast.o pngtxt.o bmepsoe.o

netpbm-10.35-ximtoppmsegfault.patch:

--- NEW FILE netpbm-10.35-ximtoppmsegfault.patch ---
diff -up netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault netpbm-10.35.58/converter/ppm/ximtoppm.c
--- netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault	2009-01-28 18:37:05.000000000 +0100
+++ netpbm-10.35.58/converter/ppm/ximtoppm.c	2009-01-28 19:01:14.000000000 +0100
@@ -50,6 +50,10 @@ parseCommandLine(int argc, char ** argv,
     OPTENT3(0,   "alphaout",   OPT_STRING, 
             &cmdlineP->alpha_filename, &alphaoutSpec, 0);
 
+    opt.opt_table = option_def;
+    opt.short_allowed = FALSE;
+    opt.allowNegNum = FALSE;
+
     optParseOptions3(&argc, argv, opt, sizeof(opt), 0);
         /* Uses and sets argc, argv, and all of *cmdlineP. */
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	23 Jan 2009 17:58:28 -0000	1.48
+++ .cvsignore	1 Apr 2009 13:59:04 -0000	1.49
@@ -1 +1,2 @@
-netpbm-10.35.58.tar.bz2
+netpbm-10.35.60.tar.bz2
+netpbm-10.35.61.tar.bz2

netpbm-10.23-security.patch:

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm-10.23-security.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- netpbm-10.23-security.patch	23 Jan 2009 17:58:28 -0000	1.20
+++ netpbm-10.23-security.patch	1 Apr 2009 13:59:04 -0000	1.21
@@ -303,27 +303,6 @@
      if (samplebuf == NULL)
          pm_error ("can't allocate memory for row buffer");
  
-diff -up netpbm-10.35.46/converter/other/xwdtopnm.c.security netpbm-10.35.46/converter/other/xwdtopnm.c
---- netpbm-10.35.46/converter/other/xwdtopnm.c.security	2008-06-24 08:59:13.000000000 +0200
-+++ netpbm-10.35.46/converter/other/xwdtopnm.c	2008-06-24 09:04:21.000000000 +0200
-@@ -214,6 +214,9 @@ processX10Header(X10WDFileHeader *  cons
-         *colorsP = pnm_allocrow( 2 );
-         PNM_ASSIGN1( (*colorsP)[0], 0 );
-         PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
-+        overflow_add(h10P->pixmap_width, 15);
-+        if(h10P->pixmap_width < 0)
-+            pm_error("assert: negative width");
-         *padrightP =
-             ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
-         *bits_per_itemP = 16;
-@@ -560,6 +563,7 @@ processX11Header(X11WDFileHeader *  cons
- 
-     *colsP = h11FixedP->pixmap_width;
-     *rowsP = h11FixedP->pixmap_height;
-+    overflow2(h11FixedP->bytes_per_line, 8);
-     *padrightP =
-         h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel -
-         h11FixedP->pixmap_width;
 diff -up netpbm-10.35.46/converter/pbm/icontopbm.c.security netpbm-10.35.46/converter/pbm/icontopbm.c
 --- netpbm-10.35.46/converter/pbm/icontopbm.c.security	2008-06-24 08:59:23.000000000 +0200
 +++ netpbm-10.35.46/converter/pbm/icontopbm.c	2008-06-24 09:04:21.000000000 +0200
@@ -1331,30 +1310,6 @@
      MALLOCARRAY(hist, inpam.maxval + 1);
      if (hist == NULL)
          pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.35.46/editor/pbmclean.c.security netpbm-10.35.46/editor/pbmclean.c
---- netpbm-10.35.46/editor/pbmclean.c.security	2008-06-24 08:58:59.000000000 +0200
-+++ netpbm-10.35.46/editor/pbmclean.c	2008-06-24 09:04:21.000000000 +0200
-@@ -150,7 +150,7 @@ nextrow(FILE * const ifd,
-     inrow[0] = inrow[1];
-     inrow[1] = inrow[2];
-     inrow[2] = shuffle ;
--    if (row+1 < rows) {
-+    if (row <= rows) {
-         /* Read the "next" row in from the file.  Allocate buffer if needed */
-         if (inrow[2] == NULL)
-             inrow[2] = pbm_allocrow(cols);
-diff -up netpbm-10.35.46/editor/pbmlife.c.security netpbm-10.35.46/editor/pbmlife.c
---- netpbm-10.35.46/editor/pbmlife.c.security	2008-06-24 08:58:59.000000000 +0200
-+++ netpbm-10.35.46/editor/pbmlife.c	2008-06-24 09:04:21.000000000 +0200
-@@ -54,7 +54,7 @@ char* argv[];
- 	prevrow = thisrow;
- 	thisrow = nextrow;
- 	nextrow = temprow;
--	if ( row < rows - 1 )
-+	if ( row <= rows )
- 	    pbm_readpbmrow( ifp, nextrow, cols, format );
- 
-         for ( col = 0; col < cols; ++col )
 diff -up netpbm-10.35.46/editor/pbmpscale.c.security netpbm-10.35.46/editor/pbmpscale.c
 --- netpbm-10.35.46/editor/pbmpscale.c.security	2008-06-24 08:58:59.000000000 +0200
 +++ netpbm-10.35.46/editor/pbmpscale.c	2008-06-24 09:04:21.000000000 +0200
@@ -2098,3 +2053,25 @@
  
  #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
  #define USE_PROTOTYPES
+diff -up netpbm-10.35.60/converter/other/xwdtopnm.c.security netpbm-10.35.60/converter/other/xwdtopnm.c
+--- netpbm-10.35.60/converter/other/xwdtopnm.c.security	2009-02-15 13:04:43.000000000 +0100
++++ netpbm-10.35.60/converter/other/xwdtopnm.c	2009-02-16 12:15:50.000000000 +0100
+@@ -214,6 +214,10 @@ processX10Header(X10WDFileHeader *  cons
+         *colorsP = pnm_allocrow( 2 );
+         PNM_ASSIGN1( (*colorsP)[0], 0 );
+         PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
++        overflow_add(h10P->pixmap_width, 15);
++        if(h10P->pixmap_width < 0)
++            pm_error("assert: negative width");
++        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
+         *padrightP =
+             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
+         *bits_per_itemP = 16;
+@@ -608,6 +612,7 @@ processX11Header(X11WDFileHeader *  cons
+ 
+     *colsP = h11FixedP->pixmap_width;
+     *rowsP = h11FixedP->pixmap_height;
++    overflow2(h11FixedP->bytes_per_line, 8);
+     *padrightP =
+         h11FixedP->bytes_per_line * 8 -
+         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- netpbm.spec	23 Jan 2009 17:58:28 -0000	1.124
+++ netpbm.spec	1 Apr 2009 13:59:04 -0000	1.125
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.58
+Version: 10.35.61
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -25,7 +25,6 @@
 Patch13: netpbm-10.33-multilib.patch
 Patch14: netpbm-10.34-pamscale.patch
 Patch15: netpbm-10.35-ppmquantall.patch
-Patch16: netpbm-10.35-pbmtog3segfault.patch
 Patch17: netpbm-10.35-pbmtomacp.patch
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
@@ -34,6 +33,11 @@
 Patch22: netpbm-10.35-pnmmontagefix.patch
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
+Patch25: netpbm-10.35-ximtoppmsegfault.patch
+Patch26: netpbm-10.35-ppmfadeusage.patch
+Patch27: netpbm-10.35-ppmrainbowexit.patch
+Patch28: netpbm-10.35-ppmdfontfix.patch
+Patch29: netpbm-10.35-svgtopam.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -89,7 +93,6 @@
 %patch13 -p1 -b .multilib
 %patch14 -p1 -b .pamscale
 %patch15 -p1 -b .pqall
-%patch16 -p1 -b .pbmtog3segfault
 %patch17 -p1 -b .pbmtomacp
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
@@ -98,9 +101,11 @@
 %patch22 -p1 -b .pnmmontagefix
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
-
-##mv shhopt/shhopt.h shhopt/pbmshhopt.h
-##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
+%patch25 -p1 -b .ximtoppmsegfault
+%patch26 -p1 -b .ppmfadeusage
+%patch27 -p1 -b .ppmrainbowexit
+%patch28 -p1 -b .ppmdfontfix
+%patch29 -p1 -b .svgtopam
 
 %build
 ./configure <<EOF
@@ -217,6 +222,7 @@
 %{_includedir}/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
+
 %files progs
 %defattr(-,root,root)
 %{_bindir}/*
@@ -225,6 +231,15 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Apr  1 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-1
+- update to 10.35.61
+- upstream fixes array bound violation in pbmtog3
+- drop .pbmtog3segfault patch, we fixed this some time ago already
+  and it is in upstream now
+- use saner exit status in ppmfade
+- remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
+- fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak  
+
 * Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
 - update to 10.35.38
 - fixes crashes in picttoppm, pbmtomrf, mrftopbm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	23 Jan 2009 17:58:28 -0000	1.52
+++ sources	1 Apr 2009 13:59:04 -0000	1.53
@@ -1 +1 @@
-f4e789971594212d0be2d8fd1e8a00ac  netpbm-10.35.58.tar.bz2
+ea6882cc00d8dc2b580184c25334ad5a  netpbm-10.35.61.tar.bz2



From rvinyard at fedoraproject.org  Wed Apr  1 14:05:09 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 14:05:09 +0000 (UTC)
Subject: rpms/conexus/F-10 conexus.spec,1.15,1.16
Message-ID: <20090401140510.0210E7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9255

Modified Files:
	conexus.spec 
Log Message:



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/conexus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- conexus.spec	26 Mar 2009 18:20:53 -0000	1.15
+++ conexus.spec	1 Apr 2009 14:04:39 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
 Version:          0.6.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -18,6 +18,7 @@
 BuildRequires:    hal-devel >= 0.5.2
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
+BuildRequires:    papyrus-extras-devel >= 0.10
 BuildRequires:    openssl-devel >= 0.9.8
 
 %description
@@ -54,6 +55,7 @@
 Requires:         hal-devel >= 0.5.2
 Requires:         gtkmm24-devel >= 2.6
 Requires:         papyrus-gtkmm-devel >= 0.10
+Requires:         papyrus-extras-devel >= 0.10
 Provides:         conexusmm-devel = %{version}
 Obsoletes:        conexusmm-devel < 0.5.1
 
@@ -167,6 +169,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/libconexus.so
 %{_libdir}/pkgconfig/conexus-1.0.pc
+%dir %{_includedir}/conexus-0.6
 %{_includedir}/conexus-0.6/conexus.h
 %{_includedir}/conexus-0.6/conexus/
 %doc ChangeLog
@@ -228,19 +231,27 @@
 %doc doc/reference/conexus-nss/html/
 
 %changelog
-* Mon Mar 02 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6.0-2
+- Fix unowned top-level headers directory (#483305).
+
+* Mon Mar 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
 - New release
 - Changed Sourceforge url to downloads.sf.net from download.sf.net
 - Added -p to doc installs
 - Updated minimum papyrus-devel version to 0.10
 - Updated a few of the descriptions
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.98-1
 - New release
 - Removed pcap reference from description
 - Removed cstring patch - upstream fixed
 - Added libcap requires
 - Added gtkmm, ssl, nspr and nss subpackages
+- Changed papyrus-devel to requires to papyrus-gtkmm-devel
+- Added papyrus-extras-devel requires
 
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.3-5
 - Fix Patch0:/%%patch mismatch.



From rvinyard at fedoraproject.org  Wed Apr  1 14:08:04 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 14:08:04 +0000 (UTC)
Subject: rpms/conexus/F-9 conexus.spec,1.13,1.14
Message-ID: <20090401140804.EE5957011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10023

Modified Files:
	conexus.spec 
Log Message:



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-9/conexus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- conexus.spec	26 Mar 2009 18:25:06 -0000	1.13
+++ conexus.spec	1 Apr 2009 14:07:34 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
 Version:          0.6.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -18,6 +18,7 @@
 BuildRequires:    hal-devel >= 0.5.2
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
+BuildRequires:    papyrus-extras-devel >= 0.10
 BuildRequires:    openssl-devel >= 0.9.8
 
 %description
@@ -54,6 +55,7 @@
 Requires:         hal-devel >= 0.5.2
 Requires:         gtkmm24-devel >= 2.6
 Requires:         papyrus-gtkmm-devel >= 0.10
+Requires:         papyrus-extras-devel >= 0.10
 Provides:         conexusmm-devel = %{version}
 Obsoletes:        conexusmm-devel < 0.5.1
 
@@ -167,6 +169,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/libconexus.so
 %{_libdir}/pkgconfig/conexus-1.0.pc
+%dir %{_includedir}/conexus-0.6
 %{_includedir}/conexus-0.6/conexus.h
 %{_includedir}/conexus-0.6/conexus/
 %doc ChangeLog
@@ -228,19 +231,27 @@
 %doc doc/reference/conexus-nss/html/
 
 %changelog
-* Mon Mar 02 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6.0-2
+- Fix unowned top-level headers directory (#483305).
+
+* Mon Mar 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
 - New release
 - Changed Sourceforge url to downloads.sf.net from download.sf.net
 - Added -p to doc installs
 - Updated minimum papyrus-devel version to 0.10
 - Updated a few of the descriptions
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.98-1
 - New release
 - Removed pcap reference from description
 - Removed cstring patch - upstream fixed
 - Added libcap requires
 - Added gtkmm, ssl, nspr and nss subpackages
+- Changed papyrus-devel to requires to papyrus-gtkmm-devel
+- Added papyrus-extras-devel requires
 
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.3-5
 - Fix Patch0:/%%patch mismatch.



From jnovy at fedoraproject.org  Wed Apr  1 14:10:59 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  1 Apr 2009 14:10:59 +0000 (UTC)
Subject: rpms/netpbm/F-9 netpbm-10.35-ppmdfontfix.patch, NONE,
	1.1 netpbm-10.35-ppmfadeusage.patch, NONE,
	1.1 netpbm-10.35-ppmrainbowexit.patch, NONE,
	1.1 netpbm-10.35-svgtopam.patch, NONE,
	1.1 netpbm-10.35-ximtoppmsegfault.patch, NONE, 1.1 .cvsignore,
	1.39, 1.40 netpbm-10.23-security.patch, 1.20, 1.21 netpbm.spec,
	1.113, 1.114 sources, 1.43, 1.44
Message-ID: <20090401141059.C0B197011D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10640

Modified Files:
	.cvsignore netpbm-10.23-security.patch netpbm.spec sources 
Added Files:
	netpbm-10.35-ppmdfontfix.patch netpbm-10.35-ppmfadeusage.patch 
	netpbm-10.35-ppmrainbowexit.patch netpbm-10.35-svgtopam.patch 
	netpbm-10.35-ximtoppmsegfault.patch 
Log Message:
* Wed Apr  1 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-1
- update to 10.35.61
- upstream fixes array bound violation in pbmtog3
- drop .pbmtog3segfault patch, we fixed this some time ago already
  and it is in upstream now
- use saner exit status in ppmfade
- remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
- fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak  


netpbm-10.35-ppmdfontfix.patch:

--- NEW FILE netpbm-10.35-ppmdfontfix.patch ---
diff -up netpbm-10.35.58/lib/ppmdfont.c.ppmdfontfix netpbm-10.35.58/lib/ppmdfont.c
--- netpbm-10.35.58/lib/ppmdfont.c.ppmdfontfix	2009-01-19 09:23:54.000000000 +0100
+++ netpbm-10.35.58/lib/ppmdfont.c	2009-03-23 13:06:36.000000000 +0100
@@ -62,7 +62,8 @@ static void
 readFontHeader(FILE *                   const ifP,
                struct ppmd_fontHeader * const fontHeaderP) {
     
-    fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP);
+    if (!fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP))
+	pm_error("Error reading font header.");
     fontHeaderP->format         = fgetc(ifP);
     fontHeaderP->characterCount = fgetc(ifP);
     fontHeaderP->firstCodePoint = fgetc(ifP);

netpbm-10.35-ppmfadeusage.patch:

--- NEW FILE netpbm-10.35-ppmfadeusage.patch ---
diff -up netpbm-10.35.60/editor/ppmfade.ppmfadeusage netpbm-10.35.60/editor/ppmfade
--- netpbm-10.35.60/editor/ppmfade.ppmfadeusage	2009-02-27 12:35:26.000000000 +0100
+++ netpbm-10.35.60/editor/ppmfade	2009-02-27 12:39:06.000000000 +0100
@@ -36,6 +36,8 @@ my $mode = $SPREAD;		# default fading mo
 #
 #  Check those command line args.
 #
+sub usage();
+
 if (@ARGV == 0) {
     usage();
 }
@@ -82,7 +84,7 @@ for ($n = 0; $n < @ARGV; $n++) {
         usage();
     } else {
         print "Unknown argument: $ARGV[$n]\n";
-        exit 100;
+        exit 1;
     } 
 }
 #
@@ -312,5 +314,5 @@ sub usage() {
    print "               [-base basename]\n";
    print "Notes: Default base: fade\n";
    print "       The resulting image files will be named fade.NNNN.ppm.\n";
-   exit(100);
+   exit 1;
 }

netpbm-10.35-ppmrainbowexit.patch:

--- NEW FILE netpbm-10.35-ppmrainbowexit.patch ---
diff -up netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit netpbm-10.35.60/generator/ppmrainbow
--- netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit	2009-02-15 13:04:35.000000000 +0100
+++ netpbm-10.35.60/generator/ppmrainbow	2009-02-26 18:48:34.000000000 +0100
@@ -21,15 +21,16 @@ GetOptions("width=i"   => \$Twid,
            "norepeat!" => \$norepeat,
            "verbose!"  => \$verbose);
 
+$! = 1;
 die "invalid width and/or height\n" unless $Twid >= 1 && $Thgt >= 1;
 
 my $verboseCommand = $verbose ? "set -x;" : "";
 
 if (@ARGV < 1) {
-    die("You must specify at least one color as an argument");
+    die("You must specify at least one color as an argument\n");
 } elsif (@ARGV < 2 && $norepeat) {
     die("With the -norepeat option, you must specify at least two colors " .
-        "as arguments.");
+        "as arguments.\n");
 }
 
 my @colorlist;
@@ -57,7 +58,7 @@ while (@colorlist >= 2) {
     my $rc = system("$verboseCommand pgmramp -lr $w $Thgt | " .
                     "pgmtoppm \"$colorlist[0]-$colorlist[1]\" >$outfile");
     if ($rc != 0) {
-        die("pgmramp|pgmtoppm failed.");
+        die("pgmramp|pgmtoppm failed.\n");
     }
     $widthRemaining -= $w;
     $n++;

netpbm-10.35-svgtopam.patch:

--- NEW FILE netpbm-10.35-svgtopam.patch ---
diff -up netpbm-10.35.58/converter/other/Makefile.svgtopam netpbm-10.35.58/converter/other/Makefile
--- netpbm-10.35.58/converter/other/Makefile.svgtopam	2009-01-19 09:23:58.000000000 +0100
+++ netpbm-10.35.58/converter/other/Makefile	2009-03-23 13:17:22.000000000 +0100
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
   BINARIES += pnmtops
 endif
 
-ifneq ($(XML2_LIBS),NONE)
-  BINARIES += svgtopam
-endif 
-
 MERGEBINARIES = $(BINARIES)
 
 EXTRA_OBJECTS = exif.o rast.o pngtxt.o bmepsoe.o

netpbm-10.35-ximtoppmsegfault.patch:

--- NEW FILE netpbm-10.35-ximtoppmsegfault.patch ---
diff -up netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault netpbm-10.35.58/converter/ppm/ximtoppm.c
--- netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault	2009-01-28 18:37:05.000000000 +0100
+++ netpbm-10.35.58/converter/ppm/ximtoppm.c	2009-01-28 19:01:14.000000000 +0100
@@ -50,6 +50,10 @@ parseCommandLine(int argc, char ** argv,
     OPTENT3(0,   "alphaout",   OPT_STRING, 
             &cmdlineP->alpha_filename, &alphaoutSpec, 0);
 
+    opt.opt_table = option_def;
+    opt.short_allowed = FALSE;
+    opt.allowNegNum = FALSE;
+
     optParseOptions3(&argc, argv, opt, sizeof(opt), 0);
         /* Uses and sets argc, argv, and all of *cmdlineP. */
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	23 Jan 2009 19:10:41 -0000	1.39
+++ .cvsignore	1 Apr 2009 14:10:29 -0000	1.40
@@ -1 +1,2 @@
-netpbm-10.35.58.tar.bz2
+netpbm-10.35.60.tar.bz2
+netpbm-10.35.61.tar.bz2

netpbm-10.23-security.patch:

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm-10.23-security.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- netpbm-10.23-security.patch	23 Jan 2009 19:10:41 -0000	1.20
+++ netpbm-10.23-security.patch	1 Apr 2009 14:10:29 -0000	1.21
@@ -303,27 +303,6 @@
      if (samplebuf == NULL)
          pm_error ("can't allocate memory for row buffer");
  
-diff -up netpbm-10.35.46/converter/other/xwdtopnm.c.security netpbm-10.35.46/converter/other/xwdtopnm.c
---- netpbm-10.35.46/converter/other/xwdtopnm.c.security	2008-06-24 08:59:13.000000000 +0200
-+++ netpbm-10.35.46/converter/other/xwdtopnm.c	2008-06-24 09:04:21.000000000 +0200
-@@ -214,6 +214,9 @@ processX10Header(X10WDFileHeader *  cons
-         *colorsP = pnm_allocrow( 2 );
-         PNM_ASSIGN1( (*colorsP)[0], 0 );
-         PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
-+        overflow_add(h10P->pixmap_width, 15);
-+        if(h10P->pixmap_width < 0)
-+            pm_error("assert: negative width");
-         *padrightP =
-             ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
-         *bits_per_itemP = 16;
-@@ -560,6 +563,7 @@ processX11Header(X11WDFileHeader *  cons
- 
-     *colsP = h11FixedP->pixmap_width;
-     *rowsP = h11FixedP->pixmap_height;
-+    overflow2(h11FixedP->bytes_per_line, 8);
-     *padrightP =
-         h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel -
-         h11FixedP->pixmap_width;
 diff -up netpbm-10.35.46/converter/pbm/icontopbm.c.security netpbm-10.35.46/converter/pbm/icontopbm.c
 --- netpbm-10.35.46/converter/pbm/icontopbm.c.security	2008-06-24 08:59:23.000000000 +0200
 +++ netpbm-10.35.46/converter/pbm/icontopbm.c	2008-06-24 09:04:21.000000000 +0200
@@ -1331,30 +1310,6 @@
      MALLOCARRAY(hist, inpam.maxval + 1);
      if (hist == NULL)
          pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.35.46/editor/pbmclean.c.security netpbm-10.35.46/editor/pbmclean.c
---- netpbm-10.35.46/editor/pbmclean.c.security	2008-06-24 08:58:59.000000000 +0200
-+++ netpbm-10.35.46/editor/pbmclean.c	2008-06-24 09:04:21.000000000 +0200
-@@ -150,7 +150,7 @@ nextrow(FILE * const ifd,
-     inrow[0] = inrow[1];
-     inrow[1] = inrow[2];
-     inrow[2] = shuffle ;
--    if (row+1 < rows) {
-+    if (row <= rows) {
-         /* Read the "next" row in from the file.  Allocate buffer if needed */
-         if (inrow[2] == NULL)
-             inrow[2] = pbm_allocrow(cols);
-diff -up netpbm-10.35.46/editor/pbmlife.c.security netpbm-10.35.46/editor/pbmlife.c
---- netpbm-10.35.46/editor/pbmlife.c.security	2008-06-24 08:58:59.000000000 +0200
-+++ netpbm-10.35.46/editor/pbmlife.c	2008-06-24 09:04:21.000000000 +0200
-@@ -54,7 +54,7 @@ char* argv[];
- 	prevrow = thisrow;
- 	thisrow = nextrow;
- 	nextrow = temprow;
--	if ( row < rows - 1 )
-+	if ( row <= rows )
- 	    pbm_readpbmrow( ifp, nextrow, cols, format );
- 
-         for ( col = 0; col < cols; ++col )
 diff -up netpbm-10.35.46/editor/pbmpscale.c.security netpbm-10.35.46/editor/pbmpscale.c
 --- netpbm-10.35.46/editor/pbmpscale.c.security	2008-06-24 08:58:59.000000000 +0200
 +++ netpbm-10.35.46/editor/pbmpscale.c	2008-06-24 09:04:21.000000000 +0200
@@ -2098,3 +2053,25 @@
  
  #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
  #define USE_PROTOTYPES
+diff -up netpbm-10.35.60/converter/other/xwdtopnm.c.security netpbm-10.35.60/converter/other/xwdtopnm.c
+--- netpbm-10.35.60/converter/other/xwdtopnm.c.security	2009-02-15 13:04:43.000000000 +0100
++++ netpbm-10.35.60/converter/other/xwdtopnm.c	2009-02-16 12:15:50.000000000 +0100
+@@ -214,6 +214,10 @@ processX10Header(X10WDFileHeader *  cons
+         *colorsP = pnm_allocrow( 2 );
+         PNM_ASSIGN1( (*colorsP)[0], 0 );
+         PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
++        overflow_add(h10P->pixmap_width, 15);
++        if(h10P->pixmap_width < 0)
++            pm_error("assert: negative width");
++        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
+         *padrightP =
+             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
+         *bits_per_itemP = 16;
+@@ -608,6 +612,7 @@ processX11Header(X11WDFileHeader *  cons
+ 
+     *colsP = h11FixedP->pixmap_width;
+     *rowsP = h11FixedP->pixmap_height;
++    overflow2(h11FixedP->bytes_per_line, 8);
+     *padrightP =
+         h11FixedP->bytes_per_line * 8 -
+         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- netpbm.spec	23 Jan 2009 19:10:41 -0000	1.113
+++ netpbm.spec	1 Apr 2009 14:10:29 -0000	1.114
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.58
+Version: 10.35.61
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -25,7 +25,6 @@
 Patch13: netpbm-10.33-multilib.patch
 Patch14: netpbm-10.34-pamscale.patch
 Patch15: netpbm-10.35-ppmquantall.patch
-Patch16: netpbm-10.35-pbmtog3segfault.patch
 Patch17: netpbm-10.35-pbmtomacp.patch
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
@@ -34,6 +33,11 @@
 Patch22: netpbm-10.35-pnmmontagefix.patch
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
+Patch25: netpbm-10.35-ximtoppmsegfault.patch
+Patch26: netpbm-10.35-ppmfadeusage.patch
+Patch27: netpbm-10.35-ppmrainbowexit.patch
+Patch28: netpbm-10.35-ppmdfontfix.patch
+Patch29: netpbm-10.35-svgtopam.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -89,7 +93,6 @@
 %patch13 -p1 -b .multilib
 %patch14 -p1 -b .pamscale
 %patch15 -p1 -b .pqall
-%patch16 -p1 -b .pbmtog3segfault
 %patch17 -p1 -b .pbmtomacp
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
@@ -98,9 +101,11 @@
 %patch22 -p1 -b .pnmmontagefix
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
-
-##mv shhopt/shhopt.h shhopt/pbmshhopt.h
-##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
+%patch25 -p1 -b .ximtoppmsegfault
+%patch26 -p1 -b .ppmfadeusage
+%patch27 -p1 -b .ppmrainbowexit
+%patch28 -p1 -b .ppmdfontfix
+%patch29 -p1 -b .svgtopam
 
 %build
 ./configure <<EOF
@@ -217,6 +222,7 @@
 %{_includedir}/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
+
 %files progs
 %defattr(-,root,root)
 %{_bindir}/*
@@ -225,6 +231,15 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Apr  1 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-1
+- update to 10.35.61
+- upstream fixes array bound violation in pbmtog3
+- drop .pbmtog3segfault patch, we fixed this some time ago already
+  and it is in upstream now
+- use saner exit status in ppmfade
+- remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
+- fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak  
+
 * Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
 - update to 10.35.38
 - fixes crashes in picttoppm, pbmtomrf, mrftopbm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	23 Jan 2009 19:10:41 -0000	1.43
+++ sources	1 Apr 2009 14:10:29 -0000	1.44
@@ -1 +1 @@
-f4e789971594212d0be2d8fd1e8a00ac  netpbm-10.35.58.tar.bz2
+ea6882cc00d8dc2b580184c25334ad5a  netpbm-10.35.61.tar.bz2



From eseyman at fedoraproject.org  Wed Apr  1 14:11:21 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed,  1 Apr 2009 14:11:21 +0000 (UTC)
Subject: rpms/perl-CGI-Application/F-9 perl-CGI-Application.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090401141121.C57FE7011D@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10727

Modified Files:
	sources 
Added Files:
	perl-CGI-Application.spec 
Log Message:
Build for F-9


--- NEW FILE perl-CGI-Application.spec ---
Name:           perl-CGI-Application
Version:        4.21
Release:        2%{?dist}
Summary:        Framework for building reusable web-applications
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application/
Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MARKSTOS/CGI-Application-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(HTML::Template)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(HTML::Template)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application is an Object-Oriented Perl module which implements an
Abstract Class. It is not intended that this package be instantiated
directly. Instead, it is intended that your Application Module will be
implemented as a Sub-Class of CGI::Application.

%prep
%setup -q -n CGI-Application-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC Changes GPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Mar 03 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 4.21-2
- Include Test::More in the BuildRequires (brc #486584)

* Fri Feb 20 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 4.21-1
- Update to 4.21

* Sun Nov 02 2008 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 4.20-1
- Update to 4.20

* Mon Jun 11 2007 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 4.06-1
- Specfile autogenerated by cpanspec 1.70.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Mar 2009 05:48:24 -0000	1.1
+++ sources	1 Apr 2009 14:10:51 -0000	1.2
@@ -0,0 +1 @@
+d63b877314caae7b45c359c228670048  CGI-Application-4.21.tar.gz



From rdieter at fedoraproject.org  Wed Apr  1 14:12:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 14:12:22 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.104,1.105
Message-ID: <20090401141222.292897011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10988

Modified Files:
	kdebase-runtime.spec 
Log Message:
drop flags/noarch build (for now).



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdebase-runtime.spec	1 Apr 2009 13:31:21 -0000	1.104
+++ kdebase-runtime.spec	1 Apr 2009 14:11:51 -0000	1.105
@@ -92,9 +92,9 @@
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+#if 0%{?fedora} > 9
+#BuildArch: noarch
+#endif
 %description flags 
 %{summary}.
 



From dwmw2 at fedoraproject.org  Wed Apr  1 14:27:35 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed,  1 Apr 2009 14:27:35 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel
	NetworkManager-openconnect-allow-lasthost-autoconnect.patch,
	NONE, 1.1 NetworkManager-openconnect-update-translations.patch,
	NONE, 1.1 NetworkManager-openconnect.spec, 1.7, 1.8
Message-ID: <20090401142735.6626B7011D@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14267

Modified Files:
	NetworkManager-openconnect.spec 
Added Files:
	NetworkManager-openconnect-allow-lasthost-autoconnect.patch 
	NetworkManager-openconnect-update-translations.patch 
Log Message:
don't barf on lasthost or autoconnect gconf options being set

NetworkManager-openconnect-allow-lasthost-autoconnect.patch:

--- NEW FILE NetworkManager-openconnect-allow-lasthost-autoconnect.patch ---
commit 8bbf7080f315cc6f88e0d2477c2d0c6fc24f1a41
Author: dcbw <dcbw at 2d2abe1d-468f-4c39-a1b0-6bd7e627f4f5>
Date:   Tue Mar 31 03:26:55 2009 +0000

    2009-03-30 David Woodhouse <dwmw2 at infradead.org>
    
    	* src/nm-openconnect-service.c
    	  src/nm-openconnect-service.h
    		- Add 'autoconnect' and 'lasthost' options to remember the last used
    			host, and to automatically connect to that host if desired
    
    
    
    git-svn-id: svn://svn.gnome.org/svn/network-manager-openconnect/trunk at 42 2d2abe1d-468f-4c39-a1b0-6bd7e627f4f5

diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index 8c7fd3a..b9803b2 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -46,15 +46,17 @@ typedef struct {
 } ValidProperty;
 
 static ValidProperty valid_properties[] = {
-	{ NM_OPENCONNECT_KEY_GATEWAY,   G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_CACERT,    G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_AUTHTYPE,  G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_USERCERT,  G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_USERNAME,  G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_XMLCONFIG, G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_PRIVKEY,   G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_CERTSIGS,  G_TYPE_STRING, 0, 0 },
-	{ NULL,                         G_TYPE_NONE, 0, 0 }
+	{ NM_OPENCONNECT_KEY_GATEWAY,     G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_CACERT,      G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_AUTHTYPE,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_USERCERT,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_USERNAME,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_XMLCONFIG,   G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_PRIVKEY,     G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_CERTSIGS,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_LASTHOST,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_AUTOCONNECT, G_TYPE_BOOLEAN, 0, 0 },
+	{ NULL,                           G_TYPE_NONE, 0, 0 }
 };
 
 static ValidProperty valid_secrets[] = {
diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
index 92db840..71b74ba 100644
--- a/src/nm-openconnect-service.h
+++ b/src/nm-openconnect-service.h
@@ -27,6 +27,8 @@
 #define NM_OPENCONNECT_KEY_USERNAME "username"
 #define NM_OPENCONNECT_KEY_XMLCONFIG "xmlconfig"
 #define NM_OPENCONNECT_KEY_CERTSIGS "certsigs"
+#define NM_OPENCONNECT_KEY_LASTHOST "lasthost"
+#define NM_OPENCONNECT_KEY_AUTOCONNECT "autoconnect"
 
 #define NM_OPENCONNECT_AUTHTYPE_CERT "cert"
 #define NM_OPENCONNECT_AUTHTYPE_CERT_TPM "cert-tpm"

NetworkManager-openconnect-update-translations.patch:

--- NEW FILE NetworkManager-openconnect-update-translations.patch ---
diff --git a/po/ChangeLog b/po/ChangeLog
index 4885046..1b71a0d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,51 @@
+2009-03-27  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias P??ldaru
+
+2009-03-24  Ignacio Casal Quinteiro  <icq at gnome.org>
+
+	 * gl.po: Updated Galician translation by Suso Baleato.
+
+2009-03-20  Inaki Larranaga Murgoitio  <dooteo at euskalgnu.org>
+
+	* LINGUAS: Added 'eu' (Basque) entry.
+	* eu.po: Add Basque translation.
+
+2009-03-19  Manoj Kumar Giri  <mgiri at redhat.com>
+
+	* or.po: Updated Oriya Translation.
+	* LINGUAS: Added Oriya (or) in the list.
+
+2009-03-14  Duarte Loreto <happyguy_pt at hotmail.com>
+
+	* pt.po: Added Portuguese translation by Filipe Gomes
+	<filipefgomes at gmail.com>.
+	* LINGUAS: Added Portuguese (pt) to the list.
+
+2009-03-12  Andre Klapper  <a9016009 at gmx.de>
+
+	* LINGUAS:
+	* cs.po: Added Czech translation by Zden??k Hata??.
+
+2009-03-10  Claude Paroz  <claude at 2xlibre.net>
+
+	* LINGUAS:
+	* fr.po: Added French translation by Laurent Coudeur.
+
+2009-03-09  Milo Casagrande  <milo at ubuntu.com>
+
+	* it.po: Updated Italian translation by Francesco Marletta.
+
+2009-03-09  Milo Casagrande  <milo at ubuntu.com>
+
+	* it.po: Added Italian translation by Francesco Marletta.
+	* LINGUAS: Added it.
+
+2009-03-06  Sandeep Shedmake  <sshedmak at redhat.com>
+
+	* LINGUAS: Added "mr" locale.
+	* mr.po: Added Marathi Translations.
+
 2009-02-24 Kenneth Nielsen <k.nielsen81 at gmail.com>
 
 	* LINGUAS: Added "da" to list of languages
diff --git a/po/LINGUAS b/po/LINGUAS
index 238b888..e894e63 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,13 +1,21 @@
 # please keep this list sorted alphabetically
 #
 ca
+cs
 da
 de
 el
 es
 et
+eu
+fr
+gl
 hu
+it
+mr
+or
 pl
+pt
 pt_BR
 ru
 sv
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..676e24d
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,96 @@
+# Czech translation of network-manager-openconnect.
+# Copyright (C) 2008 the author(s) of network-manager-openconnect.
+# This file is distributed under the same license as the network-manager-openconnect package.
+# Zden??k Hata?? <zdenek.hatas at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 19:22+0100\n"
+"PO-Revision-Date: 2009-03-12 01:30+0000\n"
+"Last-Translator: Zden??k Hata?? <zdenek.hatas at gmail.com>\n"
+"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-Country: CZECH REPUBLIC\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Zvolit certifik??t certifika??n?? autority..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Zvolte sv??j osobn?? certifik??t..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Zvolte sv??j soukrom?? kl????..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certifik??ty PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN kompatibiln?? s Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Kompatibiln?? s Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Heslo / SecurID:"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certifik??t (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certifik??t (TLS) s TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentizace<b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Obecn??</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certifik??t CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Soukrom?? kl????"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Zvolte soubor"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certifik??t u??ivatele:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "U??iv. jm??no:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Br??na:"
diff --git a/po/et.po b/po/et.po
index 81593b5..6019c93 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,9 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: networkmanager openconnect\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2009-01-26 19:46+0000\n"
-"PO-Revision-Date: 2009-02-09 01:10+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-02-11 11:38+0000\n"
+"PO-Revision-Date: 2009-03-26 18:57+0300\n"
 "Last-Translator: Mattias P??ldaru <mahfiaz gmail com>\n"
 "Language-Team: Gnome Estonian Translation Team <gnome-et at linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -19,80 +20,59 @@ msgstr ""
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: Estonia\n"
 
-#: ../properties/auth-helpers.c:69
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Sertifikaadikeskuse serdi valimine..."
 
-#: ../properties/auth-helpers.c:89
 msgid "Choose your personal certificate..."
 msgstr "Vali isiklik sertifikaat..."
 
-#: ../properties/auth-helpers.c:107
 msgid "Choose your private key..."
 msgstr "Vali privaatv??ti..."
 
-#: ../properties/auth-helpers.c:394
 msgid "PEM certificates (*.pem, *.crt, *.key)"
 msgstr "PEM sertifikaadid (*.pem, *.crt, *.key)"
 
-#: ../properties/nm-openconnect.c:50
 msgid "Cisco AnyConnect Compatible VPN (openconnect)"
 msgstr "Cisco AnyConnect-iga ??hilduv VPN (openconnect)"
 
-#: ../properties/nm-openconnect.c:51
 msgid "Compatible with Cisco AnyConnect SSL VPN."
 msgstr "Cisco AnyConnect SSL VPN-iga ??hilduv."
 
-#: ../properties/nm-openconnect.c:232
 msgid "Password / SecurID"
 msgstr "Parool / SecurID"
 
-#: ../properties/nm-openconnect.c:244
 msgid "Certificate (TLS)"
 msgstr "Sert (TLS)"
 
-#: ../properties/nm-openconnect.c:253
 msgid "Certificate (TLS) with TPM"
 msgstr "Sert (TLS) TPM-iga"
 
-#: ../properties/nm-openconnect-dialog.glade.h:1
-#, fuzzy
 msgid " "
-msgstr ""
+msgstr " "
 
-#: ../properties/nm-openconnect-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: ../properties/nm-openconnect-dialog.glade.h:3
 msgid "<b>General</b>"
 msgstr "<b>??ldine</b>"
 
-#: ../properties/nm-openconnect-dialog.glade.h:4
 msgid "CA Certificate:"
 msgstr "Sertifikaadikeskuse sert:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:5
 msgid "Private Key:"
 msgstr "Privaatv??ti:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:6
 msgid "Select A File"
 msgstr "Vali fail"
 
-#: ../properties/nm-openconnect-dialog.glade.h:7
 msgid "Type:"
 msgstr "T????p:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:8
 msgid "User Certificate:"
 msgstr "Kasutaja sertifikaat:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:9
 msgid "User name:"
 msgstr "Kasutajanimi:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:10
 msgid "_Gateway:"
 msgstr "_Gateway:"
-
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 0000000..3ec2aad
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,95 @@
+# translation of eu.po to Basque
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# I??aki Larra??aga Murgoitio <dooteo at euskalgnu.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-20 14:17+0100\n"
+"PO-Revision-Date: 2009-03-20 14:21+0100\n"
+"Last-Translator: I??aki Larra??aga Murgoitio <dooteo at euskalgnu.org>\n"
+"Language-Team: Basque <itzulpena at euskalgnu.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Aukeratu ziurtagiri pertsonala..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Aukeratu gako pribatua..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ziurtagiriak (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN bateragarria Cisco AnyConnect-ekin (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco AnyConnect SSL VPN-ekin bateragarria."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Pasahitza / SegurtasunIDa"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Ziurtagiria (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Ziurtagiria (TLS) TPMrekin"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentifikazioa</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Orokorra</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "ZE ziurtagiria:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Gako pribatua:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Hautatu fitxategia"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Mota:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Erabiltzailearen ziurtagiria:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Erabiltzaile-izena:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Atebidea:"
+
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..3af75a9
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,94 @@
+# French translation of network-manager-openconnect.
+# Copyright (C) 2009 The GNOME Foundation.
+# This file is distributed under the same license as the network-manager-openconnect package.
+#
+# Laurent Coudeur <laurentc at iol.ie>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect.HEAD\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-03-06 05:30+0000\n"
+"PO-Revision-Date: 2009-03-04 16:48+0100\n"
+"Last-Translator: laurent coudeur <laurentc at iol.ie>\n"
+"Language-Team: French <gnomefr at traduc.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Choisissez un certificat d'autorit?? de certification..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Choisissez votre certificat personnel..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Choisissez votre cl?? priv??e..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificats PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compatible Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Compatible avec Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Mot de passe / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificat (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificat (TLS) avec TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Authentification</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>G??n??ral</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificat d'AC??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Cl?? priv??e??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "S??lectionner un fichier"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Type??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificat d'utilisateur??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nom d'utilisateur??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Passerelle??:"
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..10d99e9
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,93 @@
+# translation of gl.po to Galego
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Mancom??n - Centro de Referencia e Servizos de Software Libre <g11n at mancomun.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: gl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-24 11:47+0100\n"
+"PO-Revision-Date: 2008-10-31 09:00+0000\n"
+"Last-Translator: Suso Baleato <suso.baleato at xunta.es>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Seleccione un certificado de Autoridade de Certificaci??n..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Seleccione o seu certificado persoal..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Seleccione a s??a chave privada..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificados PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compat??bel Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Compat??bel con Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Contrasinal / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificado (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificado (TLS) con TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autenticaci??n</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Xeral</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificado CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Chave privada:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleccione un ficheiro"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificado de usuario:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nome de usuario:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Pasarela:"
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..69800a3
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,94 @@
+# Italian translation of NetworkManager-OpenConnect.
+# Copyright (C) 2006, 2007, 2008, 2009 the NetworkManager-OpenConnect'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the NetworkManager-OpenConnect package.
+# Francesco Marletta <francesco.marletta at tiscali.it>, 2006, 2007, 2008, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager-OpenConnect 0.7.1\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-03-09 20:18+0000\n"
+"PO-Revision-Date: 2009-03-09 21:32+0100\n"
+"Last-Translator: Francesco Marletta <francesco.marletta at tiscali.it>\n"
+"Language-Team: italian <tp at lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Scegliere un certificato di una Autorit?? di Certificazione..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Scegliere un certificato personale..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Scegliere una chiave privata..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Cetificati PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compatibile con Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "VPN Compatibile con Cisco AnyConnect SSL. "
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Password / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificato (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificato (TLS) con TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autenticazione</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Generale</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificato CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Chiave private:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleziona un file"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificato utente:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nome utente:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Gateway:"
diff --git a/po/mr.po b/po/mr.po
new file mode 100644
index 0000000..05618d4
--- /dev/null
+++ b/po/mr.po
@@ -0,0 +1,95 @@
+# translation of network-manager-openconnect.HEAD.po to marathi
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sandeep Shedmake <sandeep.shedmake at gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect.HEAD\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-02-24 22:53+0000\n"
+"PO-Revision-Date: 2009-03-04 18:40+0530\n"
+"Last-Translator: Sandeep Shedmake <sandeep.shedmake at gmail.com>\n"
+"Language-Team: marathi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Certificate Authority ?????????????????????????????? ???????????????..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "??????????????? ???????????????????????? ??????????????????????????? ???????????????..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "??????????????? ???????????????????????? ?????? ???????????????..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ????????????????????????????????? (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "Cisco AnyConnect Compatible VPN (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco AnyConnect SSL VPN ?????? ???????????????."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "????????????????????? ???????????? / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "TPM ?????? ?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>????????? ????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>??????????????????????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "CA ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "???????????????????????? ??????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "???????????? ???????????????"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "??????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "??????????????????????????? ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "???????????????????????? ?????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "??????????????? (_G):"
+
diff --git a/po/or.po b/po/or.po
new file mode 100644
index 0000000..b0e405c
--- /dev/null
+++ b/po/or.po
@@ -0,0 +1,95 @@
+# translation of or.po to Oriya
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Manoj Kumar Giri <mgiri at redhat.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: or\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-03-14 21:15+0000\n"
+"PO-Revision-Date: 2009-03-19 15:22+0530\n"
+"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
+"Language-Team: Oriya <oriya-it at googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "??????????????? ?????????????????????????????? ????????????????????? ?????????????????????????????? ?????????????????????..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "????????????????????? ??????????????????????????? ???????????????????????????????????? ?????????????????????..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "????????????????????? ??????????????????????????? ?????? ?????? ?????????????????????..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ???????????????????????????????????????????????? (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "Cisco ????????????????????? ??????????????? ?????????????????? VPN (???????????? ???????????????)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco ????????????????????? ??????????????? SSL VPN ???????????? ?????????????????????"
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "?????????????????? ??????????????? / ???????????????????????? ID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "TPM ???????????? ?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>?????????????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>??????????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "CA ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "??????????????????????????? ??????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "??????????????? ???????????? ?????????????????????"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "??????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "???????????? ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "???????????? ?????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "?????????????????? ??????????????? (_G):"
+
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 0000000..ca9dab3
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,94 @@
+# network-manager-openconnect's Portuguese translation.
+# Copyright ?? 2009 network-manager-openconnect
+# This file is distributed under the same license as the network-manager-openconnect package.
+# Filipe Gomes <filipefgomes at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?\n"
+"POT-Creation-Date: 2009-03-12 18:23+0000\n"
+"PO-Revision-Date: 2009-03-13 18:40+0000\n"
+"Last-Translator: Filipe Gomes <filipefgomes at gmail.com>\n"
+"Language-Team: Portuguese <gnome_pt at yahoogroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Escolha um certificado de Autoridade Certificadora..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Escolha o seu certificado pessoal..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Escolha a sua chave privada..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificados PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN Compat??vel com Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Compat??vel com Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Senha / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificado (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificado (TLS) com TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentica????o</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Geral</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificado CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Chave Privada:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleccionar Um Ficheiro"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificado do Utilizador:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Utilizador:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Gateway:"
+


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-openconnect.spec	5 Mar 2009 20:06:17 -0000	1.7
+++ NetworkManager-openconnect.spec	1 Apr 2009 14:27:04 -0000	1.8
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.0.99
-Release:   1%{svn_snapshot}%{?dist}
+Release:   2%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -18,7 +18,8 @@
 # git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ b94964eb \
 #                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn14.tar.gz
 Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
-
+Patch0:	   NetworkManager-openconnect-update-translations.patch
+Patch1:	   NetworkManager-openconnect-allow-lasthost-autoconnect.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-more-warnings=yes
@@ -101,6 +104,10 @@
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> 1:0.7.0.99-2
+- Update translations from SVN
+- Accept 'lasthost' and 'autoconnect' keys in gconf
+
 * Thu Mar  5 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0.99-1
 - Update to 0.7.1rc3
 



From dwmw2 at fedoraproject.org  Wed Apr  1 14:29:40 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed,  1 Apr 2009 14:29:40 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/F-10
	NetworkManager-openconnect-allow-lasthost-autoconnect.patch,
	NONE, 1.1 NetworkManager-openconnect-update-translations-1.patch,
	NONE, 1.1 NetworkManager-openconnect-update-translations.patch,
	NONE, 1.1 NetworkManager-openconnect.spec, 1.6, 1.7
Message-ID: <20090401142940.214ED7011D@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14689

Modified Files:
	NetworkManager-openconnect.spec 
Added Files:
	NetworkManager-openconnect-allow-lasthost-autoconnect.patch 
	NetworkManager-openconnect-update-translations-1.patch 
	NetworkManager-openconnect-update-translations.patch 
Log Message:
don't barf on lasthost or autoconnect gconf options being set

NetworkManager-openconnect-allow-lasthost-autoconnect.patch:

--- NEW FILE NetworkManager-openconnect-allow-lasthost-autoconnect.patch ---
commit 8bbf7080f315cc6f88e0d2477c2d0c6fc24f1a41
Author: dcbw <dcbw at 2d2abe1d-468f-4c39-a1b0-6bd7e627f4f5>
Date:   Tue Mar 31 03:26:55 2009 +0000

    2009-03-30 David Woodhouse <dwmw2 at infradead.org>
    
    	* src/nm-openconnect-service.c
    	  src/nm-openconnect-service.h
    		- Add 'autoconnect' and 'lasthost' options to remember the last used
    			host, and to automatically connect to that host if desired
    
    
    
    git-svn-id: svn://svn.gnome.org/svn/network-manager-openconnect/trunk at 42 2d2abe1d-468f-4c39-a1b0-6bd7e627f4f5

diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index 8c7fd3a..b9803b2 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -46,15 +46,17 @@ typedef struct {
 } ValidProperty;
 
 static ValidProperty valid_properties[] = {
-	{ NM_OPENCONNECT_KEY_GATEWAY,   G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_CACERT,    G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_AUTHTYPE,  G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_USERCERT,  G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_USERNAME,  G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_XMLCONFIG, G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_PRIVKEY,   G_TYPE_STRING, 0, 0 },
-	{ NM_OPENCONNECT_KEY_CERTSIGS,  G_TYPE_STRING, 0, 0 },
-	{ NULL,                         G_TYPE_NONE, 0, 0 }
+	{ NM_OPENCONNECT_KEY_GATEWAY,     G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_CACERT,      G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_AUTHTYPE,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_USERCERT,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_USERNAME,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_XMLCONFIG,   G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_PRIVKEY,     G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_CERTSIGS,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_LASTHOST,    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENCONNECT_KEY_AUTOCONNECT, G_TYPE_BOOLEAN, 0, 0 },
+	{ NULL,                           G_TYPE_NONE, 0, 0 }
 };
 
 static ValidProperty valid_secrets[] = {
diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
index 92db840..71b74ba 100644
--- a/src/nm-openconnect-service.h
+++ b/src/nm-openconnect-service.h
@@ -27,6 +27,8 @@
 #define NM_OPENCONNECT_KEY_USERNAME "username"
 #define NM_OPENCONNECT_KEY_XMLCONFIG "xmlconfig"
 #define NM_OPENCONNECT_KEY_CERTSIGS "certsigs"
+#define NM_OPENCONNECT_KEY_LASTHOST "lasthost"
+#define NM_OPENCONNECT_KEY_AUTOCONNECT "autoconnect"
 
 #define NM_OPENCONNECT_AUTHTYPE_CERT "cert"
 #define NM_OPENCONNECT_AUTHTYPE_CERT_TPM "cert-tpm"

NetworkManager-openconnect-update-translations-1.patch:

--- NEW FILE NetworkManager-openconnect-update-translations-1.patch ---
diff --git a/po/ChangeLog b/po/ChangeLog
index abcce91..5df93ad 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-11  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias P??ldaru
+
+2009-01-26  Gil Forcada  <gforcada at gnome.org>
+
+	* ca.po: Added Catalan translation by David Planella.
+	* LINGUAS: Added ca.
+
 2009-01-02  Simos Xenitellis  <simos at gnome.org>
 
 	* el.po: Added Greek translation by Evgenia Petoumenou.
diff --git a/po/LINGUAS b/po/LINGUAS
index 1a02531..3d5bd98 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,8 +1,10 @@
 # please keep this list sorted alphabetically
 #
+ca
 de
 el
 es
+et
 hu
 pt_BR
 sv
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 0000000..e64310d
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,93 @@
+# Catalan translations for network-manager-openconnect package
+# Traduccions al catal?? del paquet ??network-manager-openconnect??.
+# Copyright (C) 2009 THE network-manager-openconnect'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the network-manager-openconnect package.
+# David Planella <david.planella at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-26 20:44+0100\n"
+"PO-Revision-Date: 2009-01-15 21:05+0100\n"
+"Last-Translator: David Planella <david.planella at gmail.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Trieu un certificat d'autoritat de certificaci??..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Trieu el vostre certificat personal..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Trieu la vostra clau privada..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificats PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compatible amb Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "VPN SSL compatible amb Cisco AnyConnect."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Contrasenya / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificat (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificat (TLS) amb TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autenticaci??</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificat d'autoritat de certificaci??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Clau privada:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleccioneu un fitxer"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipus:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificat d'usuari:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nom d'usuari:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Passarel??la:"
diff --git a/po/el.po b/po/el.po
index 9c072d9..c2b3a95 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2009-01-02 21:21+0000\n"
 "PO-Revision-Date: 2008-12-18 16:52+0100\n"
 "Last-Translator: Jennie Petoumenou <epetoumenou at gmail.com>\n"
-"Language-Team: Greek <team-lists at gnome.gr>\n"
+"Language-Team: Greek <team at gnome.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 0000000..81593b5
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,98 @@
+# GNOME NetworkManager - openconnect
+#
+# Copyright (C) 2009 The GNOME Project.
+# This file is distributed under the same license as the NetworkManager-openconnect package.
+#
+# Mattias P??ldaru <mahfiaz at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: networkmanager openconnect\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-01-26 19:46+0000\n"
+"PO-Revision-Date: 2009-02-09 01:10+0300\n"
+"Last-Translator: Mattias P??ldaru <mahfiaz gmail com>\n"
+"Language-Team: Gnome Estonian Translation Team <gnome-et at linux.ee>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Estonian\n"
+"X-Poedit-Country: Estonia\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Sertifikaadikeskuse serdi valimine..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Vali isiklik sertifikaat..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Vali privaatv??ti..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM sertifikaadid (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "Cisco AnyConnect-iga ??hilduv VPN (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco AnyConnect SSL VPN-iga ??hilduv."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Parool / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Sert (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Sert (TLS) TPM-iga"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+#, fuzzy
+msgid " "
+msgstr ""
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentimine</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>??ldine</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Sertifikaadikeskuse sert:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Privaatv??ti:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Vali fail"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "T????p:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Kasutaja sertifikaat:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Kasutajanimi:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Gateway:"
+

NetworkManager-openconnect-update-translations.patch:

--- NEW FILE NetworkManager-openconnect-update-translations.patch ---
diff --git a/po/ChangeLog b/po/ChangeLog
index 4885046..1b71a0d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,51 @@
+2009-03-27  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias P??ldaru
+
+2009-03-24  Ignacio Casal Quinteiro  <icq at gnome.org>
+
+	 * gl.po: Updated Galician translation by Suso Baleato.
+
+2009-03-20  Inaki Larranaga Murgoitio  <dooteo at euskalgnu.org>
+
+	* LINGUAS: Added 'eu' (Basque) entry.
+	* eu.po: Add Basque translation.
+
+2009-03-19  Manoj Kumar Giri  <mgiri at redhat.com>
+
+	* or.po: Updated Oriya Translation.
+	* LINGUAS: Added Oriya (or) in the list.
+
+2009-03-14  Duarte Loreto <happyguy_pt at hotmail.com>
+
+	* pt.po: Added Portuguese translation by Filipe Gomes
+	<filipefgomes at gmail.com>.
+	* LINGUAS: Added Portuguese (pt) to the list.
+
+2009-03-12  Andre Klapper  <a9016009 at gmx.de>
+
+	* LINGUAS:
+	* cs.po: Added Czech translation by Zden??k Hata??.
+
+2009-03-10  Claude Paroz  <claude at 2xlibre.net>
+
+	* LINGUAS:
+	* fr.po: Added French translation by Laurent Coudeur.
+
+2009-03-09  Milo Casagrande  <milo at ubuntu.com>
+
+	* it.po: Updated Italian translation by Francesco Marletta.
+
+2009-03-09  Milo Casagrande  <milo at ubuntu.com>
+
+	* it.po: Added Italian translation by Francesco Marletta.
+	* LINGUAS: Added it.
+
+2009-03-06  Sandeep Shedmake  <sshedmak at redhat.com>
+
+	* LINGUAS: Added "mr" locale.
+	* mr.po: Added Marathi Translations.
+
 2009-02-24 Kenneth Nielsen <k.nielsen81 at gmail.com>
 
 	* LINGUAS: Added "da" to list of languages
diff --git a/po/LINGUAS b/po/LINGUAS
index 238b888..e894e63 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,13 +1,21 @@
 # please keep this list sorted alphabetically
 #
 ca
+cs
 da
 de
 el
 es
 et
+eu
+fr
+gl
 hu
+it
+mr
+or
 pl
+pt
 pt_BR
 ru
 sv
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..676e24d
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,96 @@
+# Czech translation of network-manager-openconnect.
+# Copyright (C) 2008 the author(s) of network-manager-openconnect.
+# This file is distributed under the same license as the network-manager-openconnect package.
+# Zden??k Hata?? <zdenek.hatas at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 19:22+0100\n"
+"PO-Revision-Date: 2009-03-12 01:30+0000\n"
+"Last-Translator: Zden??k Hata?? <zdenek.hatas at gmail.com>\n"
+"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-Country: CZECH REPUBLIC\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Zvolit certifik??t certifika??n?? autority..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Zvolte sv??j osobn?? certifik??t..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Zvolte sv??j soukrom?? kl????..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certifik??ty PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN kompatibiln?? s Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Kompatibiln?? s Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Heslo / SecurID:"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certifik??t (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certifik??t (TLS) s TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentizace<b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Obecn??</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certifik??t CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Soukrom?? kl????"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Zvolte soubor"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certifik??t u??ivatele:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "U??iv. jm??no:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Br??na:"
diff --git a/po/et.po b/po/et.po
index 81593b5..6019c93 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,9 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: networkmanager openconnect\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2009-01-26 19:46+0000\n"
-"PO-Revision-Date: 2009-02-09 01:10+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-02-11 11:38+0000\n"
+"PO-Revision-Date: 2009-03-26 18:57+0300\n"
 "Last-Translator: Mattias P??ldaru <mahfiaz gmail com>\n"
 "Language-Team: Gnome Estonian Translation Team <gnome-et at linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -19,80 +20,59 @@ msgstr ""
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: Estonia\n"
 
-#: ../properties/auth-helpers.c:69
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Sertifikaadikeskuse serdi valimine..."
 
-#: ../properties/auth-helpers.c:89
 msgid "Choose your personal certificate..."
 msgstr "Vali isiklik sertifikaat..."
 
-#: ../properties/auth-helpers.c:107
 msgid "Choose your private key..."
 msgstr "Vali privaatv??ti..."
 
-#: ../properties/auth-helpers.c:394
 msgid "PEM certificates (*.pem, *.crt, *.key)"
 msgstr "PEM sertifikaadid (*.pem, *.crt, *.key)"
 
-#: ../properties/nm-openconnect.c:50
 msgid "Cisco AnyConnect Compatible VPN (openconnect)"
 msgstr "Cisco AnyConnect-iga ??hilduv VPN (openconnect)"
 
-#: ../properties/nm-openconnect.c:51
 msgid "Compatible with Cisco AnyConnect SSL VPN."
 msgstr "Cisco AnyConnect SSL VPN-iga ??hilduv."
 
-#: ../properties/nm-openconnect.c:232
 msgid "Password / SecurID"
 msgstr "Parool / SecurID"
 
-#: ../properties/nm-openconnect.c:244
 msgid "Certificate (TLS)"
 msgstr "Sert (TLS)"
 
-#: ../properties/nm-openconnect.c:253
 msgid "Certificate (TLS) with TPM"
 msgstr "Sert (TLS) TPM-iga"
 
-#: ../properties/nm-openconnect-dialog.glade.h:1
-#, fuzzy
 msgid " "
-msgstr ""
+msgstr " "
 
-#: ../properties/nm-openconnect-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: ../properties/nm-openconnect-dialog.glade.h:3
 msgid "<b>General</b>"
 msgstr "<b>??ldine</b>"
 
-#: ../properties/nm-openconnect-dialog.glade.h:4
 msgid "CA Certificate:"
 msgstr "Sertifikaadikeskuse sert:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:5
 msgid "Private Key:"
 msgstr "Privaatv??ti:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:6
 msgid "Select A File"
 msgstr "Vali fail"
 
-#: ../properties/nm-openconnect-dialog.glade.h:7
 msgid "Type:"
 msgstr "T????p:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:8
 msgid "User Certificate:"
 msgstr "Kasutaja sertifikaat:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:9
 msgid "User name:"
 msgstr "Kasutajanimi:"
 
-#: ../properties/nm-openconnect-dialog.glade.h:10
 msgid "_Gateway:"
 msgstr "_Gateway:"
-
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 0000000..3ec2aad
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,95 @@
+# translation of eu.po to Basque
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# I??aki Larra??aga Murgoitio <dooteo at euskalgnu.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-20 14:17+0100\n"
+"PO-Revision-Date: 2009-03-20 14:21+0100\n"
+"Last-Translator: I??aki Larra??aga Murgoitio <dooteo at euskalgnu.org>\n"
+"Language-Team: Basque <itzulpena at euskalgnu.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Aukeratu ziurtagiri pertsonala..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Aukeratu gako pribatua..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ziurtagiriak (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN bateragarria Cisco AnyConnect-ekin (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco AnyConnect SSL VPN-ekin bateragarria."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Pasahitza / SegurtasunIDa"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Ziurtagiria (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Ziurtagiria (TLS) TPMrekin"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentifikazioa</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Orokorra</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "ZE ziurtagiria:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Gako pribatua:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Hautatu fitxategia"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Mota:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Erabiltzailearen ziurtagiria:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Erabiltzaile-izena:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Atebidea:"
+
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..3af75a9
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,94 @@
+# French translation of network-manager-openconnect.
+# Copyright (C) 2009 The GNOME Foundation.
+# This file is distributed under the same license as the network-manager-openconnect package.
+#
+# Laurent Coudeur <laurentc at iol.ie>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect.HEAD\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-03-06 05:30+0000\n"
+"PO-Revision-Date: 2009-03-04 16:48+0100\n"
+"Last-Translator: laurent coudeur <laurentc at iol.ie>\n"
+"Language-Team: French <gnomefr at traduc.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Choisissez un certificat d'autorit?? de certification..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Choisissez votre certificat personnel..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Choisissez votre cl?? priv??e..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificats PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compatible Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Compatible avec Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Mot de passe / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificat (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificat (TLS) avec TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Authentification</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>G??n??ral</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificat d'AC??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Cl?? priv??e??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "S??lectionner un fichier"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Type??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificat d'utilisateur??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nom d'utilisateur??:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Passerelle??:"
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..10d99e9
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,93 @@
+# translation of gl.po to Galego
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Mancom??n - Centro de Referencia e Servizos de Software Libre <g11n at mancomun.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: gl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-24 11:47+0100\n"
+"PO-Revision-Date: 2008-10-31 09:00+0000\n"
+"Last-Translator: Suso Baleato <suso.baleato at xunta.es>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Seleccione un certificado de Autoridade de Certificaci??n..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Seleccione o seu certificado persoal..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Seleccione a s??a chave privada..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificados PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compat??bel Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Compat??bel con Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Contrasinal / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificado (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificado (TLS) con TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autenticaci??n</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Xeral</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificado CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Chave privada:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleccione un ficheiro"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificado de usuario:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nome de usuario:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Pasarela:"
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..69800a3
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,94 @@
+# Italian translation of NetworkManager-OpenConnect.
+# Copyright (C) 2006, 2007, 2008, 2009 the NetworkManager-OpenConnect'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the NetworkManager-OpenConnect package.
+# Francesco Marletta <francesco.marletta at tiscali.it>, 2006, 2007, 2008, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager-OpenConnect 0.7.1\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-03-09 20:18+0000\n"
+"PO-Revision-Date: 2009-03-09 21:32+0100\n"
+"Last-Translator: Francesco Marletta <francesco.marletta at tiscali.it>\n"
+"Language-Team: italian <tp at lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Scegliere un certificato di una Autorit?? di Certificazione..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Scegliere un certificato personale..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Scegliere una chiave privata..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Cetificati PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN compatibile con Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "VPN Compatibile con Cisco AnyConnect SSL. "
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Password / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificato (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificato (TLS) con TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autenticazione</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Generale</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificato CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Chiave private:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleziona un file"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificato utente:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Nome utente:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Gateway:"
diff --git a/po/mr.po b/po/mr.po
new file mode 100644
index 0000000..05618d4
--- /dev/null
+++ b/po/mr.po
@@ -0,0 +1,95 @@
+# translation of network-manager-openconnect.HEAD.po to marathi
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sandeep Shedmake <sandeep.shedmake at gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect.HEAD\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-02-24 22:53+0000\n"
+"PO-Revision-Date: 2009-03-04 18:40+0530\n"
+"Last-Translator: Sandeep Shedmake <sandeep.shedmake at gmail.com>\n"
+"Language-Team: marathi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Certificate Authority ?????????????????????????????? ???????????????..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "??????????????? ???????????????????????? ??????????????????????????? ???????????????..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "??????????????? ???????????????????????? ?????? ???????????????..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ????????????????????????????????? (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "Cisco AnyConnect Compatible VPN (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco AnyConnect SSL VPN ?????? ???????????????."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "????????????????????? ???????????? / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "TPM ?????? ?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>????????? ????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>??????????????????????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "CA ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "???????????????????????? ??????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "???????????? ???????????????"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "??????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "??????????????????????????? ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "???????????????????????? ?????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "??????????????? (_G):"
+
diff --git a/po/or.po b/po/or.po
new file mode 100644
index 0000000..b0e405c
--- /dev/null
+++ b/po/or.po
@@ -0,0 +1,95 @@
+# translation of or.po to Oriya
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Manoj Kumar Giri <mgiri at redhat.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: or\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2009-03-14 21:15+0000\n"
+"PO-Revision-Date: 2009-03-19 15:22+0530\n"
+"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
+"Language-Team: Oriya <oriya-it at googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "??????????????? ?????????????????????????????? ????????????????????? ?????????????????????????????? ?????????????????????..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "????????????????????? ??????????????????????????? ???????????????????????????????????? ?????????????????????..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "????????????????????? ??????????????????????????? ?????? ?????? ?????????????????????..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ???????????????????????????????????????????????? (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "Cisco ????????????????????? ??????????????? ?????????????????? VPN (???????????? ???????????????)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Cisco ????????????????????? ??????????????? SSL VPN ???????????? ?????????????????????"
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "?????????????????? ??????????????? / ???????????????????????? ID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "TPM ???????????? ?????????????????????????????? (TLS)"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>?????????????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>??????????????????</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "CA ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "??????????????????????????? ??????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "??????????????? ???????????? ?????????????????????"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "??????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "???????????? ??????????????????????????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "???????????? ?????????:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "?????????????????? ??????????????? (_G):"
+
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 0000000..ca9dab3
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,94 @@
+# network-manager-openconnect's Portuguese translation.
+# Copyright ?? 2009 network-manager-openconnect
+# This file is distributed under the same license as the network-manager-openconnect package.
+# Filipe Gomes <filipefgomes at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager-openconnect\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?\n"
+"POT-Creation-Date: 2009-03-12 18:23+0000\n"
+"PO-Revision-Date: 2009-03-13 18:40+0000\n"
+"Last-Translator: Filipe Gomes <filipefgomes at gmail.com>\n"
+"Language-Team: Portuguese <gnome_pt at yahoogroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);"
+
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Escolha um certificado de Autoridade Certificadora..."
+
+#: ../properties/auth-helpers.c:89
+msgid "Choose your personal certificate..."
+msgstr "Escolha o seu certificado pessoal..."
+
+#: ../properties/auth-helpers.c:107
+msgid "Choose your private key..."
+msgstr "Escolha a sua chave privada..."
+
+#: ../properties/auth-helpers.c:394
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "Certificados PEM (*.pem, *.crt, *.key)"
+
+#: ../properties/nm-openconnect.c:50
+msgid "Cisco AnyConnect Compatible VPN (openconnect)"
+msgstr "VPN Compat??vel com Cisco AnyConnect (openconnect)"
+
+#: ../properties/nm-openconnect.c:51
+msgid "Compatible with Cisco AnyConnect SSL VPN."
+msgstr "Compat??vel com Cisco AnyConnect SSL VPN."
+
+#: ../properties/nm-openconnect.c:232
+msgid "Password / SecurID"
+msgstr "Senha / SecurID"
+
+#: ../properties/nm-openconnect.c:244
+msgid "Certificate (TLS)"
+msgstr "Certificado (TLS)"
+
+#: ../properties/nm-openconnect.c:253
+msgid "Certificate (TLS) with TPM"
+msgstr "Certificado (TLS) com TPM"
+
+#: ../properties/nm-openconnect-dialog.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openconnect-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentica????o</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:3
+msgid "<b>General</b>"
+msgstr "<b>Geral</b>"
+
+#: ../properties/nm-openconnect-dialog.glade.h:4
+msgid "CA Certificate:"
+msgstr "Certificado CA:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:5
+msgid "Private Key:"
+msgstr "Chave Privada:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:6
+msgid "Select A File"
+msgstr "Seleccionar Um Ficheiro"
+
+#: ../properties/nm-openconnect-dialog.glade.h:7
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:8
+msgid "User Certificate:"
+msgstr "Certificado do Utilizador:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:9
+msgid "User name:"
+msgstr "Utilizador:"
+
+#: ../properties/nm-openconnect-dialog.glade.h:10
+msgid "_Gateway:"
+msgstr "_Gateway:"
+


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/NetworkManager-openconnect.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NetworkManager-openconnect.spec	5 Mar 2009 20:07:38 -0000	1.6
+++ NetworkManager-openconnect.spec	1 Apr 2009 14:29:09 -0000	1.7
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.0.99
-Release:   1%{svn_snapshot}%{?dist}
+Release:   2%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -18,7 +18,8 @@
 # git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ b94964eb \
 #                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn14.tar.gz
 Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
-
+Patch0:	   NetworkManager-openconnect-update-translations.patch
+Patch1:	   NetworkManager-openconnect-allow-lasthost-autoconnect.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-more-warnings=yes
@@ -101,6 +104,10 @@
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> 1:0.7.0.99-2
+- Update translations from SVN
+- Accept 'lasthost' and 'autoconnect' keys in gconf
+
 * Thu Mar  5 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0.99-1
 - Update to 0.7.1rc3
 



From rdieter at fedoraproject.org  Wed Apr  1 14:31:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 14:31:06 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.105,1.106
Message-ID: <20090401143106.21B9B7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14988

Modified Files:
	kdebase-runtime.spec 
Log Message:
cleanup/fix kde3_desktop logic



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- kdebase-runtime.spec	1 Apr 2009 14:11:51 -0000	1.105
+++ kdebase-runtime.spec	1 Apr 2009 14:30:35 -0000	1.106
@@ -1,6 +1,6 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%define kde3_desktop 1
+%global kde3_desktop 1
 %else
 # curently broken due to noarch build of oxygen-icon-theme
 # when oxygen-icon-theme review is done, they can be omitted from 
@@ -258,21 +258,26 @@
 rm -rf %{buildroot}
 
 
+%if ! 0%{?kde3_desktop}
 %post
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
 
 %posttrans
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+%if ! 0%{?kde3_desktop}
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
 update-desktop-database -q &> /dev/null ||:
 
 %postun
 if [ $1 -eq 0 ] ; then
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-%{!?kde3_desktop:touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :}
-%{!?kde3_desktop:gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :}
+%if ! 0%{?kde3_desktop}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 



From dwmw2 at fedoraproject.org  Wed Apr  1 14:39:50 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed,  1 Apr 2009 14:39:50 +0000 (UTC)
Subject: rpms/openconnect/F-10 .cvsignore, 1.3, 1.4 openconnect.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090401143950.C84BB7011D@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16446

Modified Files:
	.cvsignore openconnect.spec sources 
Log Message:
Update to 1.10. UI improvements, support UserGroups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Mar 2009 15:38:02 -0000	1.3
+++ .cvsignore	1 Apr 2009 14:39:20 -0000	1.4
@@ -1 +1 @@
-openconnect-1.00.tar.gz
+openconnect-1.10.tar.gz


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-10/openconnect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openconnect.spec	18 Mar 2009 15:38:02 -0000	1.2
+++ openconnect.spec	1 Apr 2009 14:39:20 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	1.00
+Version:	1.10
 Release:	1%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
@@ -11,6 +11,9 @@
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
 Requires:	vpnc
+# The "lasthost" and "autoconnect" gconf keys will cause older versions of
+# NetworkManager-openconnect to barf
+Conflicts:	NetworkManager-openconnect < 0.7.0.99-2
 
 %description
 This package provides a client for Cisco's "AnyConnect" VPN, which uses
@@ -43,6 +46,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-1
+- Update to 1.10.
+
 * Wed Mar 18 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.00-1
 - Update to 1.00.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Mar 2009 15:38:02 -0000	1.3
+++ sources	1 Apr 2009 14:39:20 -0000	1.4
@@ -1 +1 @@
-e94aafa77f6ee00ace49c8568b251ab3  openconnect-1.00.tar.gz
+cf6f8c34b682b980fe86a1395373b18f  openconnect-1.10.tar.gz



From dwmw2 at fedoraproject.org  Wed Apr  1 14:40:29 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed,  1 Apr 2009 14:40:29 +0000 (UTC)
Subject: rpms/openconnect/devel .cvsignore, 1.3, 1.4 openconnect.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <20090401144029.8D9117011D@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16630

Modified Files:
	.cvsignore openconnect.spec sources 
Log Message:
Update to 1.10. UI improvements, support UserGroups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Mar 2009 15:37:43 -0000	1.3
+++ .cvsignore	1 Apr 2009 14:39:59 -0000	1.4
@@ -1 +1 @@
-openconnect-1.00.tar.gz
+openconnect-1.10.tar.gz


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/openconnect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openconnect.spec	18 Mar 2009 15:37:44 -0000	1.4
+++ openconnect.spec	1 Apr 2009 14:39:59 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	1.00
+Version:	1.10
 Release:	1%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
@@ -11,6 +11,9 @@
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
 Requires:	vpnc
+# The "lasthost" and "autoconnect" gconf keys will cause older versions of
+# NetworkManager-openconnect to barf
+Conflicts:	NetworkManager-openconnect < 0.7.0.99-2
 
 %description
 This package provides a client for Cisco's "AnyConnect" VPN, which uses
@@ -43,6 +46,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-1
+- Update to 1.10.
+
 * Wed Mar 18 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.00-1
 - Update to 1.00.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Mar 2009 15:37:44 -0000	1.3
+++ sources	1 Apr 2009 14:39:59 -0000	1.4
@@ -1 +1 @@
-e94aafa77f6ee00ace49c8568b251ab3  openconnect-1.00.tar.gz
+cf6f8c34b682b980fe86a1395373b18f  openconnect-1.10.tar.gz



From rdieter at fedoraproject.org  Wed Apr  1 14:43:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 14:43:52 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.106,1.107
Message-ID: <20090401144352.9A9D77011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17349

Modified Files:
	kdebase-runtime.spec 
Log Message:
awol %endif



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdebase-runtime.spec	1 Apr 2009 14:30:35 -0000	1.106
+++ kdebase-runtime.spec	1 Apr 2009 14:43:22 -0000	1.107
@@ -278,6 +278,7 @@
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
 update-desktop-database -q &> /dev/null ||:
 fi
 



From jwrdegoede at fedoraproject.org  Wed Apr  1 14:44:17 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  1 Apr 2009 14:44:17 +0000 (UTC)
Subject: rpms/xfig/F-10 xfig-3.2.5a-default-apps.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xfig-3.2.5-color-resources.patch, 1.1,
	1.2 xfig-3.2.5-debian.patch, 1.1,
	1.2 xfig-3.2.5-enable-Xaw3d.patch, 1.1, 1.2 xfig-3.2.5-fhs.patch,
	1.1, 1.2 xfig-3.2.5-missing-protos.patch, 1.1,
	1.2 xfig-3.2.5-mkstemp.diff, 1.1, 1.2 xfig-3.2.5-rh490257.patch,
	1.1, 1.2 xfig-3.2.5-rh490259.patch, 1.2,
	1.3 xfig-3.2.5-zoom-crash.patch, 1.1, 1.2 xfig.3.2.5-Xaw3d.patch,
	1.1, 1.2 xfig.3.2.5-modularX.patch, 1.1, 1.2 xfig.sh, 1.1,
	1.2 xfig.spec, 1.54,
	1.55 xfig-3.2.5-crash-on-char-from-charmap.patch, 1.1,
	NONE xfig-3.2.5-quiet.patch, 1.1, NONE
Message-ID: <20090401144417.F27C77011D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17430

Modified Files:
	.cvsignore sources xfig-3.2.5-color-resources.patch 
	xfig-3.2.5-debian.patch xfig-3.2.5-enable-Xaw3d.patch 
	xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch 
	xfig-3.2.5-mkstemp.diff xfig-3.2.5-rh490257.patch 
	xfig-3.2.5-rh490259.patch xfig-3.2.5-zoom-crash.patch 
	xfig.3.2.5-Xaw3d.patch xfig.3.2.5-modularX.patch xfig.sh 
	xfig.spec 
Added Files:
	xfig-3.2.5a-default-apps.patch 
Removed Files:
	xfig-3.2.5-crash-on-char-from-charmap.patch 
	xfig-3.2.5-quiet.patch 
Log Message:
* Fri Mar 27 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-18.a
- Rebase to new upstream 3.2.5a release, this was made available to me by
  the Debian maintainer who is in contact with upstream, which appearantly
  is still somewhat alive (but not alive enough to put the tarbal on the
  homepage ??)


xfig-3.2.5a-default-apps.patch:

--- NEW FILE xfig-3.2.5a-default-apps.patch ---
diff -up xfig.3.2.5a/Fig.ad~ xfig.3.2.5a/Fig.ad
--- xfig.3.2.5a/Fig.ad~	2007-04-14 04:17:24.000000000 +0200
+++ xfig.3.2.5a/Fig.ad	2009-03-27 15:15:27.000000000 +0100
@@ -19,22 +19,20 @@ Fig*AllowShellResize: false
 Fig.image_editor:		xv
 
 ! name of ghostscript (not ghostview)
-Fig.ghostscript:		gs
+Fig.ghostscript:		xdg-open
 
 ! Browser - put your favorite browser here.  
 ! 		This is for viewing the xfig html reference.
-! For firefox, this command will open the help pages in a running firefox,
-!     or start a new netscape if one isn't already running
-Fig.browser:	firefox -remote 'openFile(%f)' || firefox %f
+Fig.browser:			xdg-open %f
 
 ! pdfviewer - put your favorite pdf viewer here.  
 !		This is for viewing the xfig how-to guide and man pages
-Fig.pdfviewer:			xpdf %f
+Fig.pdfviewer:			xdg-open %f
 
 ! Spell check program - put your favorite spelling check program here.
 !		It must write the misspelled words to standard output.
 
-Fig.spellcheckcommand:	spell %f
+Fig.spellcheckcommand:		aspell %f
 
 ! delay before spinner automatically counts when pressed (milliseconds)
 Fig.spinner_delay:		1000


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Apr 2007 13:15:16 -0000	1.5
+++ .cvsignore	1 Apr 2009 14:43:46 -0000	1.6
@@ -1,2 +1 @@
-xfig.3.2.4.full.tar.gz
-xfig.3.2.5.full.tar.gz
+xfig.3.2.5a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Apr 2007 13:15:16 -0000	1.5
+++ sources	1 Apr 2009 14:43:46 -0000	1.6
@@ -1 +1 @@
-fae0c67a3951bd41c057deb63b6aa47a  xfig.3.2.5.full.tar.gz
+20e8774f9cbaaf314ddf515110641a52  xfig.3.2.5a.tar.gz

xfig-3.2.5-color-resources.patch:

Index: xfig-3.2.5-color-resources.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-color-resources.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-color-resources.patch	16 Nov 2007 19:58:04 -0000	1.1
+++ xfig-3.2.5-color-resources.patch	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,16 +1,46 @@
 diff -up xfig.3.2.5/Fig-color.ad~ xfig.3.2.5/Fig-color.ad
---- xfig.3.2.5/Fig-color.ad~	2007-11-16 13:47:45.000000000 +0100
-+++ xfig.3.2.5/Fig-color.ad	2007-11-16 13:47:52.000000000 +0100
-@@ -93,7 +93,7 @@ Fig*sideruler.background: 		gray95
+--- xfig.3.2.5/Fig.ad~	2007-11-16 13:47:45.000000000 +0100
++++ xfig.3.2.5/Fig.ad	2007-11-16 13:47:52.000000000 +0100
+@@ -113,19 +113,19 @@
+ ! I include both for compatibility.  Be sure to change both values when
+ ! modifying them.
+ 
+-	Fig*horizontal.shadowWidth: 0
+-	Fig*horizontal.topShadowPixel: black
+-	Fig*horizontal.bottomShadowPixel: white
+-	Fig*horizontal.topShadow: black
+-	Fig*horizontal.bottomShadow: white
++!	Fig*horizontal.shadowWidth: 0
++!	Fig*horizontal.topShadowPixel: black
++!	Fig*horizontal.bottomShadowPixel: white
++!	Fig*horizontal.topShadow: black
++!	Fig*horizontal.bottomShadow: white
+ 
+ ! the following is done so the widget set doesn't try to make shades of
+ ! the scrollbar shadows (even though the width is 0 it takes more colors)
+-	Fig*Scrollbar.shadowWidth: 0
+-	Fig*Scrollbar.topShadow: black
+-	Fig*Scrollbar.bottomShadow: white
+-	Fig*Scrollbar.topShadowPixel: black
+-	Fig*Scrollbar.bottomShadowPixel: white
++!	Fig*Scrollbar.shadowWidth: 0
++!	Fig*Scrollbar.topShadow: black
++!	Fig*Scrollbar.bottomShadow: white
++!	Fig*Scrollbar.topShadowPixel: black
++!	Fig*Scrollbar.bottomShadowPixel: white
+ 
+ ! this is for the standard color buttons in the color panel
+ 	Fig*stdColor.shadowWidth: 2
+@@ -655,7 +655,7 @@
  
  Fig*FigList*background: 		gray95
  Fig*List*background: 			gray95
 -Fig*Scrollbar.background: 		gray95
-+! Fig*Scrollbar.background: 		gray95
++Fig*Scrollbar.background: 		gray80
  
  Fig*Label.background: 			gray80
  Fig*ind_box.background:			gray80
-@@ -104,8 +104,8 @@ Fig*button_form.update*foreground:	red
+@@ -666,8 +666,8 @@
  Fig*upd_ctrl_form.upd_ctrl_btns*shadowWidth:	2
  
  !##### Shadows
@@ -21,19 +51,3 @@
  Fig*horizontal.shadowWidth: 		2
  Fig*Scrollbar.shadowWidth:		2
  ! no shadows for update indicators
-@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel:		gray80
- 
- Fig*toggle*bottomShadowPixel:		gray80
- Fig*toggle*topShadowPixel:		gray50
-+
-+! repare damage done to scrollbar shadows non color resources file
-+
-+Fig*horizontal.topShadowPixel: gray95
-+Fig*horizontal.bottomShadowPixel: gray50
-+Fig*horizontal.topShadow: gray95
-+Fig*horizontal.bottomShadow: gray50
-+
-+Fig*Scrollbar.topShadow: gray95
-+Fig*Scrollbar.bottomShadow: gray50
-+Fig*Scrollbar.topShadowPixel: gray95
-+Fig*Scrollbar.bottomShadowPixel: gray50

xfig-3.2.5-debian.patch:

Index: xfig-3.2.5-debian.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-debian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-debian.patch	16 Mar 2009 09:48:19 -0000	1.1
+++ xfig-3.2.5-debian.patch	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,89 +1,6 @@
-diff -urN xfig.3.2.5.orig/Doc/html/introduction.html xfig.3.2.5/Doc/html/introduction.html
---- xfig.3.2.5.orig/Doc/html/introduction.html	2004-01-05 18:19:14.000000000 +0100
-+++ xfig.3.2.5/Doc/html/introduction.html	2009-03-15 16:44:48.000000000 +0100
-@@ -7,7 +7,7 @@
- </HEAD>
- <BODY>
- <a href="contents.html"><img src="images/xfig-title.png"
--  alt="XFIG Users Manual" border=0></a>
-+  alt="XFIG Users Manual Version 3.2.5 Feb 22, 2007" border=0></a>
- 
- <P>[ <img src="images/usflag.png" alt=""><B>English Version</B>
-  | <A HREF="japanese/index.html" target="_top"><img src="images/japaneseflag.png" alt="" border=0>
 diff -urN xfig.3.2.5.orig/Doc/xfig.man xfig.3.2.5/Doc/xfig.man
 --- xfig.3.2.5.orig/Doc/xfig.man	2004-04-14 19:26:07.000000000 +0200
 +++ xfig.3.2.5/Doc/xfig.man	2009-03-15 16:44:48.000000000 +0100
-@@ -437,7 +437,7 @@
- .BR \-geom [ etry ]
- .RI [ WxH ] [+X+Y]
- .Ap
--You may use the -geometry option or resource to
-+You may use the \-geometry option or resource to
- .I size and/or position the xfig window,
- or you may use 
- .B -pwidth 
-@@ -595,7 +595,7 @@
- when you load a Fig file the orientation will change as required.
- This is only true for files of version 3.0 or higher.
- .br
--See also -portrait.
-+See also \-portrait.
- .\"-------
- .At
- .BR \-lat [ exfonts ]
-@@ -967,7 +967,7 @@
- .Ap
- Enable smoothing when exporting to the bitmap formats (e.g. GIF, PNG, etc.). The allowed
- values are 0 (no smoothing), 2 or 4 (most smoothing).  This parameter is passed 
--to ghostscript in the -dTextAlphaBits -dGraphicsAlphaBits options to smooth the figure.
-+to ghostscript in the \-dTextAlphaBits \-dGraphicsAlphaBits options to smooth the figure.
- .\"-------
- .At
- .BR \-spec [ ialtext ]
-@@ -1018,7 +1018,7 @@
- .BR \-startfi [ llstyle ]
- .I stylenumber
- .Ap
--Set the starting fill style for area fill (-1 to 21).
-+Set the starting fill style for area fill (\-1 to 21).
- .\"-------
- .At
- .BR \-startfo [ ntsize ]
-@@ -1206,7 +1206,7 @@
- .\"-------
- .\" BODY
- .\"-------
--.if n \l'\nnu-'
-+.if n \l'\nnu\&-'
- .if t \l'\nnu'
- allownegcoords	boolean	true	\-allownegcoords (true),
- 			\-dontallownegcoords (false)
-@@ -1242,7 +1242,7 @@
- 			\-metric (false)
- installowncmap	boolean	false	\-installowncmap
- internalborderwidth	integer	1	\-internalBW
--international	International	boolean	false	-international
-+international	International	boolean	false	\-international
- jpeg_quality	integer	75	\-jpeg_quality
- justify	boolean	false	\-left (false),
- 			\-right (true)
-@@ -1267,6 +1267,7 @@
- 		9.5 (portrait)
- pwidth	float	11 (landscape)	\-pwidth
- 		8.5 (portrait)
-+rigidtext	boolean	false	\-rigid (true)
- rulerthick	integer	24	\-rulerthick
- scalablefonts	boolean	true	\-scalablefonts (true),
- 			\-noscalablefonts (false)
-@@ -1303,7 +1304,7 @@
- tablet	boolean	false	\-track,
- trackCursor	boolean	true	\-track (true),
- 			\-notrack (false)
--transparent_color	integer	-2 (none)	\-transparent_color
-+transparent_color	integer	\-2 (none)	\-transparent_color
- userscale	float	1.0	\-userscale
- userunit	string	in (inches)	\-userunit
- 		cm (metric)
 @@ -1474,8 +1475,11 @@
  See the
  .IR Imakefile .
@@ -129,1316 +46,3 @@
  ! The following fixes a problem that some window managers have
  ! with xfig continually resizing itself
  
-diff -urN xfig.3.2.5.orig/Imakefile xfig.3.2.5/Imakefile
---- xfig.3.2.5.orig/Imakefile	2009-03-15 16:31:31.000000000 +0100
-+++ xfig.3.2.5/Imakefile	2009-03-15 16:44:48.000000000 +0100
-@@ -429,7 +429,7 @@
- 	if [ -d $(DESTDIR)$(XFIGDOCDIR)/html/japanese ]; then set +x; \
- 	   else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html/japanese ); fi ; \
- 	tar cf - * | ( cd $(DESTDIR)$(XFIGDOCDIR)/html/japanese ; tar xf - ) ; \
--	done) ;
-+	) ;
- #endif
- 
- XCOMM Install the object libraries here with "make install.libs"
-diff -urN xfig.3.2.5.orig/Libraries/Computers/fujitsu-siemens.fig xfig.3.2.5/Libraries/Computers/fujitsu-siemens.fig
---- xfig.3.2.5.orig/Libraries/Computers/fujitsu-siemens.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Computers/fujitsu-siemens.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,60 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Landscape
-+Center
-+Metric
-+A4      
-+100.00
-+Single
-+-2
-+# Rack mounted PC
-+# Drawn by Andre Esser
-+1200 2
-+0 33 #c7c3c7
-+0 37 #e0e0e0
-+0 48 #565151
-+6 6930 3195 9990 3960
-+6 9515 3316 9634 3422
-+6 9515 3316 9634 3369
-+1 3 0 1 0 4 50 0 25 0.000 1 0.0000 9541 3343 19 19 9541 3343 9555 3356
-+1 3 0 1 0 4 50 0 25 0.000 1 0.0000 9607 3343 19 19 9607 3343 9621 3356
-+-6
-+6 9515 3369 9634 3422
-+1 3 0 1 0 14 50 0 25 0.000 1 0.0000 9541 3395 19 19 9541 3395 9555 3409
-+1 3 0 1 0 14 50 0 25 0.000 1 0.0000 9607 3395 19 19 9607 3395 9621 3409
-+-6
-+-6
-+6 7247 3330 8212 3803
-+6 7247 3330 8212 3503
-+5 1 0 1 0 37 49 0 1 0.000 0 1 0 0 7721.500 2352.803 7247 3330 7737 3439 8196 3330
-+2 2 0 1 0 37 50 0 6 0.000 0 0 7 0 0 5
-+	 7247 3330 8212 3330 8212 3503 7247 3503 7247 3330
-+-6
-+6 7247 3630 8212 3803
-+5 1 0 1 0 37 49 0 1 0.000 0 1 0 0 7721.500 2662.682 7247 3630 7737 3740 8196 3630
-+2 2 0 1 0 37 50 0 6 0.000 0 0 7 0 0 5
-+	 7247 3630 8212 3630 8212 3803 7247 3803 7247 3630
-+-6
-+-6
-+6 8338 3330 9305 3803
-+6 8338 3330 9305 3503
-+5 1 0 1 0 37 49 0 1 0.000 0 1 0 0 8813.000 2350.697 8338 3330 8829 3439 9288 3330
-+2 2 0 1 0 37 50 0 6 0.000 0 0 7 0 0 5
-+	 8338 3330 9305 3330 9305 3503 8338 3503 8338 3330
-+-6
-+6 8338 3630 9305 3803
-+5 1 0 1 0 37 49 0 1 0.000 0 1 0 0 8813.000 2660.595 8338 3630 8829 3740 9288 3630
-+2 2 0 1 0 37 50 0 6 0.000 0 0 7 0 0 5
-+	 8338 3630 9305 3630 9305 3803 8338 3803 8338 3630
-+-6
-+-6
-+2 4 0 1 0 7 50 0 -1 0.000 0 0 2 0 0 5
-+	 9660 3856 9660 3290 9502 3290 9502 3856 9660 3856
-+2 4 0 1 0 48 50 0 9 0.000 0 0 2 0 0 5
-+	 7194 3882 7194 3237 6983 3237 6983 3882 7194 3882
-+2 4 0 1 0 48 50 0 9 0.000 0 0 2 0 0 5
-+	 9937 3882 9937 3237 9726 3237 9726 3882 9937 3882
-+2 4 0 1 0 48 50 0 27 0.000 0 0 2 0 0 5
-+	 9634 3817 9634 3632 9528 3632 9528 3817 9634 3817
-+2 2 0 1 0 33 53 0 15 0.000 0 0 7 0 0 5
-+	 6930 3211 9977 3211 9977 3922 6930 3922 6930 3211
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Computers/mirapoint.fig xfig.3.2.5/Libraries/Computers/mirapoint.fig
---- xfig.3.2.5.orig/Libraries/Computers/mirapoint.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Computers/mirapoint.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,85 @@
-+#FIG 3.2
-+Landscape
-+Center
-+Metric
-+A4      
-+100.00
-+Single
-+-2
-+# Mirapoint M400
-+# Drawn by Andre Esser
-+1200 2
-+0 32 #85807d
-+0 33 #d2d2d2
-+0 34 #3a3a3a
-+0 35 #4573aa
-+6 4455 2430 7541 4470
-+6 4455 3617 7541 4470
-+2 2 0 1 0 0 55 0 20 0.000 0 0 7 0 0 5
-+	 4455 3617 7541 3617 7541 4470 4455 4470 4455 3617
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 4550 3664 4597 3664 4597 4423 4550 4423 4550 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 4692 3664 4738 3664 4738 4423 4692 4423 4692 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 4834 3664 4883 3664 4883 4423 4834 4423 4834 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 4979 3664 5025 3664 5025 4423 4979 4423 4979 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5120 3664 5166 3664 5166 4423 5120 4423 5120 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5262 3664 5309 3664 5309 4423 5262 4423 5262 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5405 3664 5452 3664 5452 4423 5405 4423 5405 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5548 3664 5595 3664 5595 4423 5548 4423 5548 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5689 3664 5737 3664 5737 4423 5689 4423 5689 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5832 3664 5879 3664 5879 4423 5832 4423 5832 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 5974 3664 6022 3664 6022 4423 5974 4423 5974 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6117 3664 6164 3664 6164 4423 6117 4423 6117 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6259 3664 6307 3664 6307 4423 6259 4423 6259 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6401 3664 6448 3664 6448 4423 6401 4423 6401 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6544 3664 6591 3664 6591 4423 6544 4423 6544 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6687 3664 6734 3664 6734 4423 6687 4423 6687 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6830 3664 6876 3664 6876 4423 6830 4423 6830 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 6971 3664 7017 3664 7017 4423 6971 4423 6971 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 7113 3664 7162 3664 7162 4423 7113 4423 7113 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 7258 3664 7304 3664 7304 4423 7258 4423 7258 3664
-+2 2 0 1 0 32 52 0 20 0.000 0 0 7 0 0 5
-+	 7399 3664 7446 3664 7446 4423 7399 4423 7399 3664
-+-6
-+1 3 0 1 0 34 40 0 20 0.000 1 0.0000 5025 3189 47 47 5025 3189 5025 3236
-+1 3 0 1 0 34 40 0 20 0.000 1 0.0000 5120 3094 47 47 5120 3094 5120 3142
-+1 3 0 1 0 34 40 0 20 0.000 1 0.0000 5025 3000 47 47 5025 3000 5025 3047
-+1 3 0 1 0 34 40 0 20 0.000 1 0.0000 4930 3094 47 47 4930 3094 4930 3142
-+2 4 0 1 0 33 47 0 20 0.000 0 0 4 0 0 5
-+	 5689 3379 4788 3379 4788 2621 5689 2621 5689 3379
-+2 2 0 1 0 34 48 0 20 0.000 0 0 7 0 0 5
-+	 4646 3330 7350 3330 7350 3379 4646 3379 4646 3330
-+2 4 0 1 0 14 45 0 20 0.000 0 0 4 0 0 5
-+	 5548 2905 4883 2905 4883 2713 5548 2713 5548 2905
-+2 2 0 1 0 34 48 0 20 0.000 0 0 7 0 0 5
-+	 4646 2621 7350 2621 7350 2667 4646 2667 4646 2621
-+2 2 0 1 0 35 50 0 20 0.000 0 0 7 0 0 5
-+	 4455 2430 7541 2430 7541 3617 4455 3617 4455 2430
-+2 2 0 1 0 34 48 0 20 0.000 0 0 7 0 0 5
-+	 4597 2762 7399 2762 7399 2809 4597 2809 4597 2762
-+2 2 0 1 0 34 48 0 20 0.000 0 0 7 0 0 5
-+	 4550 2905 7446 2905 7446 2951 4550 2951 4550 2905
-+2 2 0 1 0 34 48 0 20 0.000 0 0 7 0 0 5
-+	 4597 3189 7399 3189 7399 3236 4597 3236 4597 3189
-+2 2 0 1 0 34 48 0 20 0.000 0 0 7 0 0 5
-+	 4550 3047 7446 3047 7446 3094 4550 3094 4550 3047
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Computers/sun_d1000.fig xfig.3.2.5/Libraries/Computers/sun_d1000.fig
---- xfig.3.2.5.orig/Libraries/Computers/sun_d1000.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Computers/sun_d1000.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,21 @@
-+#FIG 3.2
-+Landscape
-+Center
-+Metric
-+A4      
-+100.00
-+Single
-+-2
-+# SUN D1000 disk shelf
-+# Drawn by Andre Esser
-+1200 2
-+0 33 #7b79a5
-+6 2160 4230 5400 5490
-+2 2 0 1 0 33 50 0 50 0.000 0 0 7 0 0 5
-+	 5355 5223 2205 5223 2205 5466 5355 5466 5355 5223
-+2 2 0 1 0 33 49 0 40 0.000 0 0 7 0 0 5
-+	 2302 5247 2641 5247 2641 5441 2302 5441 2302 5247
-+2 2 0 1 0 33 49 0 9 0.000 0 0 7 0 0 5
-+	 2205 4254 5355 4254 5355 5223 2205 5223 2205 4254
-+4 0 0 49 0 0 7 0.0000 4 73 153 2399 5393 Sun\001
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Computers/sunfire_v120.fig xfig.3.2.5/Libraries/Computers/sunfire_v120.fig
---- xfig.3.2.5.orig/Libraries/Computers/sunfire_v120.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Computers/sunfire_v120.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,33 @@
-+#FIG 3.2
-+Landscape
-+Center
-+Metric
-+A4      
-+73.00
-+Single
-+-2
-+# SunFire V120
-+# Drawn by Andre Esser
-+1200 2
-+0 49 #444444
-+0 80 #73758c
-+# SunfireV120
-+6 818 3167 3841 3435
-+2 1 0 1 0 7 30 0 20 0.000 0 0 -1 0 0 5
-+	 2161 3247 2108 3300 2161 3355 2216 3300 2161 3247
-+2 2 0 1 0 80 45 0 20 0.000 0 0 -1 0 0 5
-+	 3840 3435 818 3435 818 3167 3840 3167 3840 3435
-+2 2 0 1 0 31 40 0 20 0.000 0 0 -1 0 0 5
-+	 3570 3195 3732 3195 3732 3221 3570 3221 3570 3195
-+2 2 0 1 0 0 25 0 19 0.000 0 0 -1 0 0 5
-+	 3544 3273 3786 3273 3786 3329 3544 3329 3544 3273
-+2 2 0 1 0 14 35 0 20 0.000 0 0 -1 0 0 5
-+	 854 3173 882 3173 882 3240 854 3240 854 3173
-+3 2 0 1 0 49 45 0 25 0.000 0 0 0 3
-+	 818 3249 2036 3303 818 3356
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 49 45 0 25 0.000 0 0 0 3
-+	 3841 3249 2623 3303 3841 3356
-+	 0.000 -1.000 0.000
-+4 0 0 30 0 27 7 0.0000 4 90 270 2270 3329 Sun\001
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Computers/sunfire_v240.fig xfig.3.2.5/Libraries/Computers/sunfire_v240.fig
---- xfig.3.2.5.orig/Libraries/Computers/sunfire_v240.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Computers/sunfire_v240.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,46 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Landscape
-+Center
-+Metric
-+A4      
-+100.00
-+Single
-+-2
-+# SunFire V240
-+# Drawn by Andre Esser
-+1200 2
-+0 80 #73758c
-+6 6210 3544 6688 3756
-+1 2 0 1 0 7 44 -1 -1 0.000 1 0.0000 6449 3650 239 106 6210 3650 6688 3650
-+2 1 0 1 0 7 30 0 20 0.000 0 0 -1 0 0 5
-+	 6325 3598 6280 3651 6325 3706 6372 3651 6325 3598
-+4 0 0 30 0 27 6 0.0000 4 90 192 6418 3680 Sun\001
-+-6
-+2 2 0 1 0 31 40 0 20 0.000 0 0 -1 0 0 5
-+	 7710 3510 7872 3510 7872 3536 7710 3536 7710 3510
-+2 2 0 1 0 14 35 0 20 0.000 0 0 -1 0 0 5
-+	 4994 3488 5022 3488 5022 3555 4994 3555 4994 3488
-+2 1 0 1 0 80 44 -1 5 0.000 0 0 7 0 0 10
-+	 7652 3512 5220 3510 5221 3534 6210 3580 6305 3533 6447 3522
-+	 6597 3538 6680 3581 7650 3532 7641 3504
-+2 2 0 1 0 80 45 0 20 0.000 0 0 -1 0 0 5
-+	 7980 4050 4950 4050 4950 3482 7980 3482 7980 4050
-+2 1 0 1 0 80 44 -1 5 0.000 0 0 -1 0 0 12
-+	 4987 3778 6194 3718 6314 3777 6456 3793 6616 3769 6684 3733
-+	 7919 3769 7920 3816 6668 3870 6222 3866 4996 3823 4999 3782
-+2 1 0 1 0 80 44 -1 5 0.000 0 0 -1 0 0 4
-+	 5661 4051 6178 3978 6755 3975 7257 4040
-+2 2 0 1 0 80 40 -1 20 0.000 0 0 -1 0 0 5
-+	 5014 3625 5255 3625 5255 3693 5014 3693 5014 3625
-+3 2 0 1 0 80 44 0 5 0.000 0 0 0 3
-+	 4989 3589 6165 3645 4989 3739
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 80 44 0 5 0.000 0 0 0 3
-+	 4992 3855 6165 3915 4992 4005
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 80 44 0 5 0.000 0 0 0 3
-+	 7922 3860 6750 3915 7924 4005
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 80 44 0 5 0.000 0 0 0 3
-+	 7922 3591 6750 3645 7921 3737
-+	 0.000 -1.000 0.000
-diff -urN xfig.3.2.5.orig/Libraries/Computers/sunfire_v440.fig xfig.3.2.5/Libraries/Computers/sunfire_v440.fig
---- xfig.3.2.5.orig/Libraries/Computers/sunfire_v440.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Computers/sunfire_v440.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,79 @@
-+#FIG 3.2
-+Landscape
-+Center
-+Metric
-+A4      
-+100.00
-+Single
-+-2
-+# SunFire V440
-+# Drawn by Andre Esser
-+1200 2
-+0 46 #444444
-+0 74 #f7f7f7
-+0 76 #414541
-+0 82 #635dce
-+6 1980 3869 4971 5310
-+1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 3331 4103 181 126 3331 4103 3511 4229
-+2 3 0 1 0 82 48 0 20 0.000 0 0 -1 0 0 5
-+	 2791 5094 1980 5058 1980 5040 2791 5076 2791 5094
-+2 3 0 1 0 82 48 0 20 0.000 0 0 -1 0 0 5
-+	 2791 4878 1980 4914 1980 4932 2791 4896 2791 4878
-+2 3 0 1 0 82 48 0 20 0.000 0 0 -1 0 0 5
-+	 2791 4445 1980 4481 1980 4499 2791 4463 2791 4445
-+2 3 0 1 0 82 48 0 20 0.000 0 0 -1 0 0 5
-+	 2791 4265 1980 4229 1980 4211 2791 4247 2791 4265
-+2 3 0 1 0 82 48 0 20 0.000 0 0 -1 0 0 5
-+	 2791 4031 1980 4067 1980 4085 2791 4050 2791 4031
-+2 2 0 1 0 76 55 0 21 0.000 0 0 -1 0 0 5
-+	 2809 3927 2034 3927 2034 5274 2809 5274 2809 3927
-+2 3 0 1 0 82 48 0 20 0.000 0 0 -1 0 0 5
-+	 2809 4680 1980 4644 1980 4626 2791 4662 2809 4680
-+2 2 0 1 0 82 60 0 20 0.000 0 0 -1 0 0 5
-+	 2809 5310 1980 5310 1980 3869 2809 3869 2809 5310
-+2 2 0 1 0 82 60 0 20 0.000 0 0 -1 0 0 5
-+	 2809 3869 4971 3869 4971 5310 2809 5310 2809 3869
-+2 3 0 1 0 46 50 0 22 0.000 0 0 -1 0 0 7
-+	 4899 5004 3511 4932 2899 4932 2899 5094 3511 5094 4899 5040
-+	 4899 5004
-+2 3 0 1 0 46 50 0 22 0.000 0 0 -1 0 0 7
-+	 4899 4716 3511 4644 2899 4644 2899 4805 3511 4805 4899 4752
-+	 4899 4716
-+2 2 0 1 0 74 50 0 20 0.000 0 0 -1 0 0 5
-+	 2664 4662 3061 4662 3061 4787 2664 4787 2664 4662
-+2 3 0 1 0 46 50 0 22 0.000 0 0 -1 0 0 6
-+	 4124 5274 3511 5220 3079 5220 2899 5274 4106 5274 4124 5274
-+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
-+	 2809 3923 4899 3923 4899 5274 2809 5274 2809 3923
-+2 2 0 1 0 74 50 0 20 0.000 0 0 -1 0 0 5
-+	 3710 4283 4899 4283 4899 4410 3710 4410 3710 4283
-+2 2 0 1 0 46 50 0 22 0.000 0 0 -1 0 0 5
-+	 2899 4265 3565 4265 3565 4463 2899 4463 2899 4265
-+2 3 0 1 0 46 50 0 22 0.000 0 0 -1 0 0 11
-+	 2917 3959 3151 4013 3213 3973 3283 3953 3373 3953 3463 3983
-+	 3513 4018 3547 4013 4719 3923 2917 3923 2917 3959
-+2 2 0 1 0 46 50 0 22 0.000 0 0 -1 0 0 5
-+	 2827 3887 2863 3887 2863 5310 2827 5310 2827 3887
-+3 2 0 1 0 46 48 0 22 0.000 0 0 0 3
-+	 4899 4499 3547 4590 4899 4680
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 46 48 0 22 0.000 0 0 0 3
-+	 4899 5076 3547 5166 4899 5256
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 46 48 0 22 0.000 0 0 0 3
-+	 4899 4787 3547 4878 4899 4968
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 46 50 0 22 0.000 0 0 0 4
-+	 2899 4499 3097 4553 2899 4626 2899 4608
-+	 0.000 -1.000 -1.000 0.000
-+3 2 0 1 0 46 48 0 22 0.000 0 0 0 3
-+	 4899 3977 3547 4067 4899 4157
-+	 0.000 -1.000 0.000
-+3 2 0 1 0 46 50 0 22 0.000 0 0 0 4
-+	 2899 4013 3097 4067 2899 4139 2899 4121
-+	 0.000 -1.000 -1.000 0.000
-+3 2 0 1 0 46 50 0 22 0.000 0 0 0 4
-+	 2899 5112 3097 5166 2899 5238 2899 5220
-+	 0.000 -1.000 -1.000 0.000
-+4 0 0 50 0 0 6 0.0000 4 78 174 3241 4139 Sun\001
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Maps/Europe/eastern_europe.fig xfig.3.2.5/Libraries/Maps/Europe/eastern_europe.fig
---- xfig.3.2.5.orig/Libraries/Maps/Europe/eastern_europe.fig	2001-10-31 19:41:41.000000000 +0100
-+++ xfig.3.2.5/Libraries/Maps/Europe/eastern_europe.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -6,6 +6,7 @@
- 100.00
- Single
- -2
-+# Eastern Europe
- 1200 2
- # Estonia
- 2 3 0 1 0 7 48 -1 -1 0.000 1 0 7 0 0 96
-diff -urN xfig.3.2.5.orig/Libraries/Maps/Europe/spain.fig xfig.3.2.5/Libraries/Maps/Europe/spain.fig
---- xfig.3.2.5.orig/Libraries/Maps/Europe/spain.fig	2000-11-07 21:14:35.000000000 +0100
-+++ xfig.3.2.5/Libraries/Maps/Europe/spain.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -1,245 +1,265 @@
--#FIG 3.2
--Portrait
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Landscape
- Center
- Metric
- A4      
- 100.00
- Single
- -2
--# Spain
- 1200 2
- # Spain
--2 3 0 1 0 7 48 0 -1 0.000 0 0 7 0 0 1393
--	 3290 8388 3287 8388 3279 8388 3275 8388 3272 8388 3272 8391
--	 3268 8391 3264 8391 3260 8391 3257 8395 3253 8395 3238 8395
--	 3227 8399 3219 8399 3212 8403 3204 8403 3197 8403 3193 8403
--	 3189 8403 3182 8399 3174 8395 3167 8391 3167 8388 3159 8384
--	 3155 8380 3144 8376 3137 8373 3129 8373 3122 8369 3114 8369
--	 3107 8369 3095 8369 3084 8369 3077 8369 3069 8365 3069 8361
--	 3065 8361 3065 8354 3062 8346 3062 8339 3058 8331 3058 8324
--	 3058 8316 3054 8313 3054 8309 3050 8309 3047 8301 3047 8298
--	 3047 8294 3043 8290 3035 8286 3032 8286 3028 8283 3024 8279
--	 3020 8275 3017 8275 3013 8271 3005 8268 2998 8264 2979 8256
--	 2972 8253 2968 8249 2960 8245 2957 8241 2953 8238 2949 8234
--	 2942 8230 2942 8226 2934 8223 2927 8219 2919 8215 2912 8211
--	 2904 8208 2897 8204 2893 8196 2889 8193 2885 8189 2878 8185
--	 2874 8181 2867 8178 2859 8174 2859 8178 2852 8178 2844 8181
--	 2833 8185 2825 8193 2822 8196 2818 8204 2814 8208 2810 8211
--	 2807 8211 2803 8208 2799 8204 2795 8204 2792 8200 2788 8193
--	 2784 8193 2777 8189 2769 8189 2762 8189 2750 8189 2743 8185
--	 2735 8185 2728 8181 2709 8178 2702 8178 2690 8174 2690 8170
--	 2683 8166 2679 8163 2672 8159 2668 8151 2664 8148 2664 8140
--	 2660 8140 2660 8136 2657 8133 2649 8125 2642 8121 2638 8118
--	 2634 8118 2627 8114 2615 8110 2612 8110 2608 8110 2597 8106
--	 2585 8106 2582 8106 2578 8106 2574 8103 2574 8099 2574 8095
--	 2574 8091 2570 8088 2570 8084 2567 8080 2563 8073 2559 8069
--	 2556 8069 2552 8065 2544 8065 2541 8065 2537 8061 2529 8054
--	 2526 8050 2522 8046 2518 8043 2511 8039 2507 8035 2507 8031
--	 2499 8028 2492 8024 2492 8020 2484 8020 2477 8016 2469 8013
--	 2466 8009 2462 8005 2454 8001 2451 8001 2447 7998 2443 7998
--	 2439 7998 2436 7998 2432 7998 2424 7998 2421 7994 2424 7990
--	 2424 7986 2428 7986 2428 7983 2432 7979 2436 7975 2443 7971
--	 2447 7964 2454 7960 2454 7956 2454 7953 2454 7949 2451 7945
--	 2451 7941 2443 7938 2439 7934 2432 7930 2428 7930 2421 7930
--	 2417 7926 2413 7926 2409 7926 2406 7923 2402 7919 2398 7915
--	 2394 7915 2391 7908 2391 7904 2391 7900 2370 7890 2364 7885
--	 2353 7881 2349 7881 2342 7878 2334 7874 2327 7874 2319 7870
--	 2312 7870 2304 7870 2301 7870 2297 7870 2297 7866 2293 7866
--	 2289 7866 2286 7866 2278 7866 2278 7863 2274 7863 2267 7859
--	 2263 7859 2259 7855 2256 7851 2252 7848 2248 7844 2244 7840
--	 2241 7836 2237 7829 2229 7825 2226 7821 2218 7818 2211 7810
--	 2203 7806 2199 7806 2192 7803 2184 7799 2173 7799 2169 7799
--	 2162 7799 2154 7799 2151 7803 2143 7803 2132 7803 2124 7803
--	 2121 7799 2113 7795 2106 7795 2098 7791 2098 7788 2091 7784
--	 2083 7784 2076 7780 2072 7776 2061 7773 2061 7769 2057 7765
--	 2057 7758 2057 7750 2057 7743 2057 7735 2057 7731 2057 7728
--	 2057 7720 2057 7716 2053 7713 2042 7701 2034 7698 2027 7698
--	 2019 7694 2008 7694 2000 7694 1989 7698 1982 7698 1970 7698
--	 1963 7701 1955 7701 1948 7701 1937 7701 1925 7701 1910 7701
--	 1899 7701 1888 7701 1877 7701 1865 7698 1850 7694 1843 7694
--	 1832 7686 1820 7683 1813 7679 1805 7675 1802 7671 1794 7668
--	 1783 7660 1772 7653 1764 7645 1753 7641 1745 7634 1738 7630
--	 1734 7630 1727 7626 1715 7626 1715 7623 1708 7619 1704 7615
--	 1700 7611 1693 7611 1693 7608 1685 7604 1682 7600 1678 7596
--	 1674 7593 1670 7589 1667 7585 1667 7578 1663 7566 1663 7559
--	 1663 7551 1663 7544 1659 7536 1655 7533 1655 7529 1648 7521
--	 1640 7521 1637 7521 1633 7518 1625 7514 1614 7510 1607 7506
--	 1603 7499 1595 7495 1588 7491 1580 7488 1573 7484 1562 7476
--	 1558 7469 1547 7465 1543 7465 1539 7465 1535 7469 1532 7469
--	 1528 7473 1528 7476 1524 7480 1524 7484 1520 7491 1517 7495
--	 1513 7499 1509 7506 1505 7510 1502 7510 1494 7514 1487 7514
--	 1479 7514 1472 7514 1460 7514 1449 7514 1445 7510 1438 7510
--	 1427 7506 1419 7503 1415 7499 1408 7495 1404 7491 1397 7488
--	 1389 7484 1382 7480 1374 7480 1367 7476 1363 7476 1356 7473
--	 1352 7469 1348 7465 1344 7461 1337 7458 1333 7454 1333 7450
--	 1326 7446 1322 7439 1318 7435 1311 7428 1303 7420 1299 7416
--	 1296 7409 1292 7409 1284 7401 1273 7401 1269 7401 1266 7401
--	 1262 7401 1258 7398 1254 7394 1251 7386 1247 7383 1239 7379
--	 1232 7375 1224 7371 1217 7368 1213 7368 1206 7364 1198 7364
--	 1191 7364 1187 7364 1172 7371 1164 7375 1161 7379 1157 7383
--	 1149 7386 1146 7394 1142 7401 1138 7405 1134 7413 1134 7416
--	 1131 7420 1131 7424 1127 7428 1123 7431 1116 7431 1116 7435
--	 1112 7439 1108 7439 1104 7439 1097 7443 1093 7446 1089 7446
--	 1086 7446 1078 7450 1071 7450 1063 7450 1059 7446 1052 7446
--	 1044 7443 1037 7439 1029 7435 1026 7431 1018 7428 1010 7424
--	 1007 7424 999 7420 992 7416 984 7416 977 7416 973 7416
--	 969 7413 965 7413 962 7413 958 7416 954 7416 947 7416
--	 943 7416 939 7420 935 7420 928 7420 920 7420 913 7420
--	 905 7420 898 7420 894 7420 890 7424 887 7424 883 7428
--	 883 7435 879 7439 879 7443 879 7446 875 7450 875 7454
--	 872 7454 872 7458 868 7458 868 7461 868 7465 868 7473
--	 868 7480 868 7488 872 7491 872 7499 875 7503 879 7510
--	 879 7514 879 7521 883 7529 883 7536 883 7540 883 7544
--	 883 7551 879 7555 879 7563 883 7570 887 7581 887 7585
--	 887 7589 887 7593 887 7596 883 7600 879 7604 875 7611
--	 879 7615 887 7623 894 7626 902 7630 909 7630 913 7634
--	 917 7638 917 7641 913 7645 913 7649 913 7641 909 7641
--	 905 7649 902 7656 894 7664 890 7675 887 7679 883 7686
--	 875 7701 872 7709 872 7713 872 7720 868 7728 868 7735
--	 868 7743 868 7746 864 7758 864 7765 860 7769 853 7780
--	 849 7791 842 7795 842 7803 842 7806 842 7814 842 7825
--	 842 7829 842 7836 842 7844 842 7851 842 7859 842 7866
--	 842 7874 842 7881 838 7889 838 7896 838 7904 838 7911
--	 834 7919 838 7926 838 7934 838 7941 838 7949 838 7956
--	 838 7964 834 7971 834 7979 830 7990 830 8005 830 8016
--	 830 8031 830 8039 830 8043 830 8050 830 8054 827 8061
--	 823 8069 819 8076 815 8084 812 8091 804 8103 801 8118
--	 793 8125 793 8129 789 8136 786 8140 782 8144 778 8148
--	 774 8155 767 8163 763 8166 759 8174 756 8178 748 8185
--	 744 8193 741 8200 733 8215 729 8223 722 8230 718 8238
--	 714 8241 711 8249 707 8253 699 8264 696 8275 688 8290
--	 681 8305 677 8313 669 8320 666 8328 662 8331 654 8339
--	 647 8350 639 8361 636 8365 628 8376 624 8388 617 8399
--	 606 8410 587 8425 583 8429 579 8433 579 8436 576 8440
--	 568 8448 564 8451 557 8459 553 8463 553 8466 549 8466
--	 546 8466 542 8466 538 8466 527 8466 523 8466 523 8470
--	 519 8474 516 8478 512 8481 508 8481 508 8485 504 8485
--	 501 8489 497 8496 493 8496 489 8500 489 8508 482 8519
--	 474 8526 471 8534 463 8541 463 8549 456 8556 452 8560
--	 448 8564 448 8568 441 8575 437 8583 437 8586 433 8590
--	 433 8594 433 8598 433 8601 429 8609 429 8613 426 8616
--	 426 8620 426 8624 422 8628 422 8631 418 8635 422 8639
--	 426 8643 429 8646 433 8646 437 8646 441 8646 452 8643
--	 459 8639 471 8631 482 8628 489 8624 493 8624 497 8620
--	 504 8620 512 8616 516 8616 519 8613 531 8613 534 8613
--	 538 8616 542 8620 546 8624 546 8631 546 8639 546 8646
--	 546 8658 546 8661 546 8669 546 8673 542 8673 542 8676
--	 538 8680 516 8703 508 8710 504 8710 504 8714 501 8718
--	 501 8721 501 8729 501 8733 501 8736 504 8740 508 8744
--	 516 8748 519 8751 523 8755 523 8763 527 8766 527 8774
--	 531 8785 531 8793 531 8800 531 8808 527 8819 527 8826
--	 523 8834 519 8845 516 8853 512 8860 512 8868 508 8871
--	 508 8883 508 8886 504 8894 504 8898 501 8901 501 8909
--	 501 8913 497 8916 497 8924 493 8931 493 8943 493 8950
--	 489 8958 489 8961 489 8969 486 8969 482 8976 478 8984
--	 471 8995 463 9003 456 9010 448 9021 441 9036 433 9044
--	 429 9051 426 9059 422 9066 422 9070 418 9078 411 9085
--	 407 9093 399 9096 396 9104 392 9108 384 9111 381 9119
--	 377 9123 377 9126 377 9134 384 9141 392 9145 399 9149
--	 407 9149 418 9153 429 9153 437 9153 444 9156 452 9156
--	 459 9156 467 9156 474 9160 486 9164 493 9168 501 9171
--	 508 9175 516 9183 519 9186 527 9194 531 9198 538 9201
--	 546 9209 553 9213 561 9216 568 9220 572 9224 576 9228
--	 587 9231 594 9235 598 9239 606 9243 613 9246 617 9246
--	 628 9250 632 9250 643 9246 651 9246 658 9243 666 9243
--	 673 9243 684 9239 692 9239 703 9243 711 9243 718 9243
--	 726 9243 733 9243 748 9246 756 9246 763 9250 771 9250
--	 774 9254 782 9258 786 9261 793 9261 793 9265 801 9269
--	 808 9276 819 9280 827 9288 834 9291 838 9295 845 9303
--	 853 9306 857 9314 860 9314 860 9318 864 9325 868 9329
--	 872 9333 872 9340 879 9348 879 9351 883 9355 883 9359
--	 887 9366 887 9378 890 9385 890 9396 890 9404 894 9411
--	 894 9419 898 9426 898 9430 898 9434 898 9438 898 9441
--	 898 9449 898 9456 898 9468 898 9471 894 9475 894 9483
--	 894 9490 890 9494 890 9501 890 9509 890 9516 890 9524
--	 898 9535 898 9543 898 9546 902 9554 913 9569 917 9569
--	 928 9576 932 9576 932 9584 932 9591 935 9599 939 9606
--	 943 9610 947 9614 947 9621 950 9625 954 9633 958 9636
--	 962 9644 965 9648 969 9651 980 9655 988 9663 995 9666
--	 1003 9670 1010 9674 1014 9678 1018 9681 1026 9685 1026 9689
--	 1029 9689 1041 9693 1048 9696 1056 9696 1067 9700 1074 9700
--	 1086 9700 1089 9696 1097 9696 1123 9670 1127 9666 1127 9663
--	 1131 9659 1138 9651 1142 9648 1146 9644 1149 9640 1153 9636
--	 1161 9633 1161 9629 1168 9625 1172 9621 1179 9621 1179 9618
--	 1183 9618 1187 9614 1191 9614 1194 9614 1198 9614 1202 9614
--	 1206 9614 1213 9618 1221 9618 1228 9621 1232 9621 1243 9621
--	 1251 9621 1254 9621 1258 9621 1262 9621 1266 9621 1273 9621
--	 1281 9621 1288 9621 1292 9618 1299 9618 1307 9614 1314 9614
--	 1322 9606 1329 9606 1333 9603 1337 9599 1341 9599 1344 9595
--	 1348 9595 1352 9595 1359 9595 1363 9595 1371 9595 1374 9595
--	 1382 9599 1389 9603 1397 9606 1404 9606 1408 9610 1415 9610
--	 1419 9614 1427 9618 1434 9618 1442 9621 1445 9621 1453 9621
--	 1460 9625 1468 9629 1475 9629 1483 9633 1490 9636 1498 9636
--	 1505 9636 1513 9640 1524 9640 1535 9644 1550 9648 1558 9648
--	 1569 9651 1573 9651 1577 9651 1580 9651 1588 9651 1595 9655
--	 1603 9655 1610 9655 1622 9655 1629 9659 1633 9659 1640 9659
--	 1644 9663 1648 9666 1652 9666 1655 9666 1659 9670 1667 9674
--	 1674 9678 1682 9681 1685 9685 1693 9689 1697 9693 1700 9696
--	 1704 9700 1708 9704 1712 9711 1715 9711 1723 9715 1727 9715
--	 1734 9719 1738 9719 1742 9719 1745 9715 1753 9711 1760 9708
--	 1764 9700 1768 9696 1775 9696 1779 9693 1783 9693 1787 9693
--	 1790 9693 1798 9693 1805 9693 1817 9696 1820 9696 1824 9700
--	 1828 9708 1832 9711 1835 9715 1835 9719 1843 9726 1850 9726
--	 1858 9730 1869 9734 1877 9734 1888 9734 1895 9734 1899 9730
--	 1899 9726 1903 9723 1903 9719 1907 9711 1910 9708 1922 9696
--	 1929 9693 1940 9685 1948 9678 1955 9670 1967 9663 1970 9655
--	 1978 9648 1982 9640 1982 9633 1985 9625 1989 9618 1989 9606
--	 1993 9603 1993 9595 1997 9588 2000 9584 2004 9580 2012 9576
--	 2019 9576 2027 9576 2030 9576 2038 9576 2049 9573 2053 9573
--	 2064 9573 2072 9569 2083 9569 2094 9565 2102 9565 2113 9565
--	 2121 9561 2128 9561 2136 9561 2143 9561 2151 9565 2158 9565
--	 2166 9569 2173 9569 2181 9569 2188 9569 2196 9565 2199 9565
--	 2207 9561 2211 9561 2218 9558 2222 9558 2226 9554 2229 9550
--	 2233 9543 2237 9535 2237 9531 2237 9524 2237 9520 2233 9513
--	 2233 9509 2233 9501 2237 9494 2241 9486 2244 9479 2248 9475
--	 2256 9468 2271 9441 2271 9434 2274 9430 2274 9426 2278 9419
--	 2282 9415 2286 9411 2289 9408 2293 9404 2297 9400 2301 9396
--	 2304 9393 2308 9389 2316 9385 2323 9381 2323 9378 2331 9374
--	 2334 9370 2338 9366 2346 9363 2353 9355 2361 9355 2368 9351
--	 2376 9348 2379 9344 2387 9340 2394 9340 2402 9336 2409 9336
--	 2417 9333 2424 9333 2432 9329 2436 9325 2443 9325 2451 9321
--	 2458 9321 2466 9318 2469 9318 2473 9314 2477 9310 2481 9310
--	 2484 9306 2488 9306 2496 9303 2499 9299 2503 9299 2507 9295
--	 2511 9291 2514 9291 2518 9288 2518 9284 2518 9280 2514 9273
--	 2511 9269 2507 9265 2503 9261 2499 9258 2496 9254 2492 9250
--	 2484 9246 2484 9243 2481 9235 2473 9231 2469 9216 2466 9213
--	 2462 9205 2458 9201 2458 9194 2451 9186 2447 9171 2443 9156
--	 2443 9153 2439 9145 2436 9138 2436 9126 2436 9119 2439 9078
--	 2443 9070 2443 9063 2443 9059 2447 9059 2447 9055 2443 9051
--	 2443 9048 2439 9048 2436 9044 2432 9040 2432 9036 2432 9029
--	 2432 9025 2436 9021 2436 9018 2439 9014 2443 9010 2447 9006
--	 2451 9003 2454 8999 2462 8991 2466 8988 2473 8984 2477 8976
--	 2481 8973 2484 8969 2488 8969 2492 8965 2496 8961 2503 8961
--	 2507 8954 2514 8950 2522 8946 2533 8943 2537 8939 2541 8935
--	 2544 8931 2548 8931 2552 8928 2559 8924 2563 8920 2567 8916
--	 2570 8916 2574 8913 2578 8909 2582 8905 2585 8901 2593 8898
--	 2597 8894 2600 8890 2604 8886 2612 8883 2619 8879 2627 8875
--	 2634 8871 2645 8868 2649 8864 2653 8860 2657 8860 2660 8856
--	 2664 8853 2668 8849 2672 8845 2675 8838 2679 8834 2679 8830
--	 2683 8826 2683 8823 2687 8815 2690 8811 2694 8808 2698 8804
--	 2702 8800 2705 8796 2709 8796 2709 8800 2713 8804 2717 8808
--	 2724 8811 2728 8815 2732 8815 2735 8815 2743 8815 2750 8815
--	 2758 8808 2765 8804 2773 8796 2777 8793 2780 8789 2784 8785
--	 2784 8781 2788 8778 2788 8774 2784 8770 2784 8766 2777 8755
--	 2773 8748 2769 8744 2769 8740 2765 8736 2769 8733 2769 8721
--	 2799 8710 2803 8710 2807 8706 2807 8703 2810 8699 2814 8695
--	 2818 8691 2822 8691 2825 8688 2833 8688 2840 8684 2848 8684
--	 2855 8680 2863 8680 2867 8680 2874 8680 2882 8680 2889 8680
--	 2897 8680 2908 8680 2915 8680 2927 8680 2934 8680 2942 8680
--	 2949 8680 2957 8680 2964 8680 2972 8680 2990 8680 2994 8680
--	 3002 8680 3005 8680 3013 8680 3020 8680 3028 8680 3035 8680
--	 3043 8680 3050 8676 3058 8676 3065 8676 3073 8673 3080 8673
--	 3088 8669 3092 8669 3103 8665 3118 8661 3125 8658 3133 8654
--	 3137 8650 3140 8646 3144 8643 3148 8639 3152 8635 3155 8635
--	 3159 8631 3163 8631 3167 8628 3174 8624 3185 8620 3197 8616
--	 3215 8609 3223 8605 3230 8601 3238 8601 3245 8598 3253 8594
--	 3260 8594 3268 8590 3272 8586 3279 8583 3287 8579 3294 8575
--	 3298 8571 3305 8571 3309 8568 3317 8564 3324 8560 3328 8556
--	 3332 8556 3335 8553 3339 8549 3343 8541 3343 8534 3343 8526
--	 3343 8519 3347 8511 3347 8504 3343 8496 3343 8493 3343 8485
--	 3343 8478 3343 8474 3343 8470 3343 8466 3343 8463 3347 8459
--	 3350 8455 3354 8451 3354 8448 3358 8444 3362 8444 3362 8440
--	 3362 8436 3365 8433 3365 8429 3365 8421 3365 8418 3362 8410
--	 3358 8406 3354 8403 3354 8399 3350 8395 3347 8391 3343 8391
--	 3339 8388 3335 8388 3332 8388 3332 8384 3328 8384 3332 8384
--	 3290 8388
-+2 3 0 1 0 7 48 0 -1 0.000 0 0 7 0 0 1521
-+	 1742 6936 1742 6929 1742 6925 1755 6935 1760 6935 1765 6935
-+	 1775 6930 1780 6930 1785 6930 1790 6925 1795 6925 1800 6920
-+	 1805 6915 1815 6910 1820 6905 1825 6905 1830 6905 1835 6905
-+	 1840 6905 1845 6905 1850 6905 1860 6905 1870 6905 1875 6905
-+	 1880 6910 1885 6910 1895 6910 1900 6915 1905 6915 1905 6920
-+	 1910 6925 1910 6930 1910 6935 1910 6940 1905 6945 1900 6945
-+	 1890 6950 1885 6955 1880 6960 1875 6960 1870 6965 1865 6970
-+	 1865 6975 1865 6980 1860 6990 1860 6995 1865 7000 1865 7005
-+	 1870 7010 1870 7015 1875 7015 1885 7015 1890 7015 1895 7015
-+	 1900 7015 1905 7015 1915 7015 1920 7015 1930 7010 1935 7010
-+	 1940 7010 1945 7010 1950 7010 1955 7010 1960 7015 1970 7015
-+	 1970 7020 1975 7020 1980 7025 1985 7030 1990 7030 2000 7035
-+	 2005 7035 2015 7040 2020 7040 2030 7040 2040 7045 2045 7045
-+	 2050 7045 2055 7045 2065 7045 2070 7045 2075 7040 2085 7040
-+	 2090 7040 2095 7040 2100 7040 2105 7040 2115 7040 2125 7040
-+	 2130 7045 2135 7045 2140 7050 2145 7050 2150 7050 2155 7050
-+	 2165 7055 2170 7060 2175 7060 2180 7065 2185 7070 2185 7075
-+	 2185 7080 2185 7085 2185 7090 2185 7095 2185 7100 2185 7105
-+	 2185 7110 2185 7115 2185 7120 2190 7125 2190 7130 2195 7135
-+	 2195 7140 2200 7140 2205 7145 2205 7150 2215 7155 2220 7155
-+	 2220 7160 2225 7160 2225 7165 2230 7170 2230 7175 2230 7180
-+	 2230 7185 2230 7190 2230 7195 2230 7200 2230 7205 2230 7210
-+	 2225 7215 2225 7220 2220 7225 2220 7230 2215 7235 2210 7240
-+	 2205 7240 2205 7245 2200 7250 2195 7250 2195 7255 2190 7260
-+	 2185 7260 2175 7265 2165 7265 2155 7265 2150 7265 2145 7265
-+	 2140 7265 2135 7270 2130 7270 2125 7275 2120 7280 2115 7285
-+	 2110 7290 2105 7295 2100 7295 2095 7300 2090 7300 2080 7300
-+	 2075 7300 2065 7300 2060 7305 2055 7305 2050 7310 2050 7315
-+	 2050 7320 2050 7325 2050 7330 2050 7335 2050 7340 2050 7345
-+	 2050 7360 2050 7365 2050 7370 2050 7375 2045 7385 2045 7390
-+	 2045 7395 2040 7405 2040 7410 2040 7415 2040 7420 2035 7430
-+	 2035 7435 2035 7440 2035 7445 2035 7450 2030 7455 2030 7460
-+	 2025 7470 2020 7480 2015 7490 2010 7495 2010 7500 2005 7505
-+	 2005 7510 2005 7515 2000 7520 2000 7525 1995 7530 1990 7530
-+	 1985 7535 1980 7535 1975 7535 1970 7540 1965 7540 1960 7545
-+	 1955 7550 1955 7555 1950 7560 1950 7565 1950 7570 1950 7575
-+	 1950 7580 1950 7585 1950 7590 1950 7595 1950 7600 1950 7605
-+	 1950 7610 1950 7615 1950 7620 1945 7625 1940 7630 1935 7635
-+	 1935 7640 1930 7640 1930 7645 1925 7645 1925 7650 1920 7650
-+	 1915 7655 1910 7655 1905 7655 1900 7660 1895 7660 1890 7655
-+	 1885 7655 1875 7650 1870 7650 1860 7645 1855 7645 1850 7645
-+	 1845 7645 1840 7640 1835 7640 1830 7640 1825 7640 1815 7640
-+	 1810 7640 1805 7640 1800 7640 1795 7640 1795 7645 1790 7650
-+	 1790 7655 1790 7660 1810 7680 1815 7680 1815 7685 1820 7690
-+	 1820 7695 1825 7695 1825 7700 1830 7705 1830 7710 1830 7715
-+	 1830 7720 1835 7725 1835 7730 1835 7735 1835 7740 1835 7745
-+	 1835 7750 1835 7755 1835 7760 1840 7765 1840 7770 1840 7775
-+	 1845 7785 1845 7790 1845 7795 1850 7800 1850 7805 1850 7810
-+	 1855 7815 1855 7820 1860 7830 1865 7835 1865 7840 1870 7845
-+	 1870 7850 1870 7855 1870 7860 1865 7865 1860 7870 1855 7870
-+	 1850 7875 1845 7880 1835 7880 1830 7890 1825 7895 1815 7900
-+	 1810 7900 1805 7905 1800 7910 1795 7910 1795 7915 1790 7920
-+	 1785 7925 1780 7930 1780 7935 1775 7940 1775 7945 1770 7950
-+	 1765 7955 1765 7960 1760 7960 1755 7965 1755 7970 1750 7975
-+	 1750 7980 1745 7985 1745 7990 1745 7995 1745 8000 1745 8005
-+	 1745 8010 1745 8015 1745 8020 1750 8025 1750 8030 1755 8035
-+	 1755 8040 1760 8045 1760 8050 1765 8055 1765 8060 1770 8060
-+	 1775 8065 1785 8070 1790 8075 1795 8080 1800 8085 1800 8095
-+	 1800 8100 1800 8105 1795 8105 1790 8110 1785 8115 1775 8115
-+	 1765 8120 1755 8120 1750 8120 1745 8120 1740 8120 1735 8120
-+	 1730 8125 1725 8125 1720 8130 1715 8135 1715 8140 1710 8140
-+	 1705 8145 1700 8155 1690 8160 1685 8165 1675 8170 1670 8175
-+	 1665 8180 1660 8185 1655 8190 1650 8190 1645 8200 1635 8205
-+	 1635 8210 1630 8215 1630 8220 1630 8225 1625 8230 1625 8235
-+	 1625 8240 1625 8245 1625 8250 1625 8260 1630 8270 1635 8280
-+	 1640 8285 1640 8290 1635 8295 1635 8300 1630 8305 1625 8310
-+	 1611 8343 1618 8343 1626 8343 1633 8343 1648 8346 1656 8346
-+	 1663 8350 1671 8350 1674 8354 1682 8358 1686 8361 1693 8361
-+	 1693 8365 1701 8369 1708 8376 1719 8380 1727 8388 1734 8391
-+	 1738 8395 1745 8403 1753 8406 1757 8414 1760 8414 1760 8418
-+	 1764 8425 1768 8429 1772 8433 1772 8440 1779 8448 1779 8451
-+	 1783 8455 1783 8459 1787 8466 1787 8478 1790 8485 1790 8496
-+	 1790 8504 1794 8511 1794 8519 1798 8526 1798 8530 1798 8534
-+	 1798 8538 1798 8541 1798 8549 1798 8556 1798 8568 1798 8571
-+	 1794 8575 1794 8583 1794 8590 1790 8594 1790 8601 1790 8609
-+	 1790 8616 1790 8624 1798 8635 1798 8643 1798 8646 1802 8654
-+	 1813 8669 1817 8669 1828 8676 1832 8676 1832 8684 1832 8691
-+	 1835 8699 1839 8706 1843 8710 1847 8714 1847 8721 1850 8725
-+	 1854 8733 1858 8736 1862 8744 1865 8748 1869 8751 1880 8755
-+	 1888 8763 1895 8766 1903 8770 1910 8774 1914 8778 1918 8781
-+	 1926 8785 1926 8789 1929 8789 1941 8793 1948 8796 1956 8796
-+	 1967 8800 1974 8800 1986 8800 1989 8796 1997 8796 2023 8770
-+	 2027 8766 2027 8763 2031 8759 2038 8751 2042 8748 2046 8744
-+	 2049 8740 2053 8736 2061 8733 2061 8729 2068 8725 2072 8721
-+	 2079 8721 2079 8718 2083 8718 2087 8714 2091 8714 2094 8714
-+	 2098 8714 2102 8714 2106 8714 2113 8718 2121 8718 2128 8721
-+	 2132 8721 2143 8721 2151 8721 2154 8721 2158 8721 2162 8721
-+	 2166 8721 2173 8721 2181 8721 2188 8721 2192 8718 2199 8718
-+	 2207 8714 2214 8714 2222 8706 2229 8706 2233 8703 2237 8699
-+	 2241 8699 2244 8695 2248 8695 2252 8695 2259 8695 2263 8695
-+	 2271 8695 2274 8695 2282 8699 2289 8703 2297 8706 2304 8706
-+	 2308 8710 2315 8710 2319 8714 2327 8718 2334 8718 2342 8721
-+	 2345 8721 2353 8721 2360 8725 2368 8729 2375 8729 2383 8733
-+	 2390 8736 2398 8736 2405 8736 2413 8740 2424 8740 2435 8744
-+	 2450 8748 2458 8748 2469 8751 2473 8751 2477 8751 2480 8751
-+	 2488 8751 2495 8755 2503 8755 2510 8755 2522 8755 2529 8759
-+	 2533 8759 2540 8759 2544 8763 2548 8766 2552 8766 2555 8766
-+	 2559 8770 2567 8774 2574 8778 2582 8781 2585 8785 2593 8789
-+	 2597 8793 2600 8796 2604 8800 2608 8804 2612 8811 2615 8811
-+	 2623 8815 2627 8815 2634 8819 2638 8819 2642 8819 2645 8815
-+	 2653 8811 2660 8808 2664 8800 2668 8796 2675 8796 2679 8793
-+	 2683 8793 2687 8793 2690 8793 2698 8793 2705 8793 2717 8796
-+	 2720 8796 2724 8800 2728 8808 2732 8811 2735 8815 2735 8819
-+	 2743 8826 2750 8826 2758 8830 2769 8834 2777 8834 2788 8834
-+	 2795 8834 2799 8830 2799 8826 2803 8823 2803 8819 2807 8811
-+	 2810 8808 2822 8796 2829 8793 2840 8785 2848 8778 2855 8770
-+	 2867 8763 2870 8755 2878 8748 2882 8740 2882 8733 2885 8725
-+	 2889 8718 2889 8706 2893 8703 2893 8695 2897 8688 2900 8684
-+	 2904 8680 2912 8676 2919 8676 2927 8676 2930 8676 2938 8676
-+	 2949 8673 2953 8673 2964 8673 2972 8669 2983 8669 2994 8665
-+	 3002 8665 3013 8665 3021 8661 3028 8661 3036 8661 3043 8661
-+	 3051 8665 3058 8665 3066 8669 3073 8669 3081 8669 3088 8669
-+	 3096 8665 3099 8665 3107 8661 3111 8661 3118 8658 3122 8658
-+	 3126 8654 3129 8650 3133 8643 3137 8635 3137 8631 3137 8624
-+	 3137 8620 3133 8613 3133 8609 3133 8601 3137 8594 3141 8586
-+	 3144 8579 3148 8575 3156 8568 3171 8541 3171 8534 3174 8530
-+	 3174 8526 3178 8519 3182 8515 3186 8511 3189 8508 3193 8504
-+	 3197 8500 3201 8496 3204 8493 3208 8489 3216 8485 3223 8481
-+	 3223 8478 3231 8474 3234 8470 3238 8466 3246 8463 3253 8455
-+	 3261 8455 3268 8451 3276 8448 3279 8444 3287 8440 3294 8440
-+	 3302 8436 3309 8436 3317 8433 3324 8433 3332 8429 3336 8425
-+	 3343 8425 3351 8421 3358 8421 3366 8418 3369 8418 3373 8414
-+	 3377 8410 3381 8410 3384 8406 3388 8406 3396 8403 3399 8399
-+	 3403 8399 3407 8395 3411 8391 3414 8391 3418 8388 3418 8384
-+	 3418 8380 3414 8373 3411 8369 3407 8365 3403 8361 3399 8358
-+	 3396 8354 3392 8350 3384 8346 3384 8343 3381 8335 3373 8331
-+	 3369 8316 3366 8313 3362 8305 3358 8301 3358 8294 3351 8286
-+	 3347 8271 3343 8256 3343 8253 3339 8245 3336 8238 3336 8226
-+	 3336 8219 3339 8178 3343 8170 3343 8163 3343 8159 3347 8159
-+	 3347 8155 3343 8151 3343 8148 3339 8148 3336 8144 3332 8140
-+	 3332 8136 3332 8129 3332 8125 3336 8121 3336 8118 3339 8114
-+	 3343 8110 3347 8106 3351 8103 3354 8099 3362 8091 3366 8088
-+	 3373 8084 3377 8076 3381 8073 3384 8069 3388 8069 3392 8065
-+	 3396 8061 3403 8061 3407 8054 3414 8050 3422 8046 3433 8043
-+	 3437 8039 3441 8035 3444 8031 3448 8031 3452 8028 3459 8024
-+	 3463 8020 3467 8016 3470 8016 3474 8013 3478 8009 3482 8005
-+	 3485 8001 3493 7998 3497 7994 3500 7990 3504 7986 3512 7983
-+	 3519 7979 3527 7975 3534 7971 3545 7968 3549 7964 3553 7960
-+	 3557 7960 3560 7956 3564 7953 3568 7949 3572 7945 3575 7938
-+	 3579 7934 3579 7930 3583 7926 3583 7923 3587 7915 3590 7911
-+	 3594 7908 3598 7904 3602 7900 3605 7896 3609 7896 3609 7900
-+	 3613 7904 3617 7908 3624 7911 3628 7915 3632 7915 3635 7915
-+	 3643 7915 3650 7915 3658 7908 3665 7904 3673 7896 3677 7893
-+	 3680 7889 3684 7885 3684 7881 3688 7878 3688 7874 3684 7870
-+	 3684 7866 3677 7855 3673 7848 3669 7844 3669 7840 3665 7836
-+	 3669 7833 3669 7821 3699 7810 3703 7810 3707 7806 3707 7803
-+	 3710 7799 3714 7795 3718 7791 3722 7791 3725 7788 3733 7788
-+	 3740 7784 3748 7784 3755 7780 3763 7780 3767 7780 3774 7780
-+	 3782 7780 3789 7780 3797 7780 3808 7780 3815 7780 3827 7780
-+	 3834 7780 3842 7780 3849 7780 3857 7780 3864 7780 3872 7780
-+	 3890 7780 3894 7780 3902 7780 3905 7780 3913 7780 3920 7780
-+	 3928 7780 3935 7780 3943 7780 3950 7776 3958 7776 3965 7776
-+	 3973 7773 3980 7773 3988 7769 3992 7769 4003 7765 4018 7761
-+	 4025 7758 4033 7754 4037 7750 4040 7746 4044 7743 4048 7739
-+	 4052 7735 4055 7735 4059 7731 4063 7731 4067 7728 4074 7724
-+	 4085 7720 4097 7716 4115 7709 4123 7705 4130 7701 4138 7701
-+	 4145 7698 4153 7694 4160 7694 4168 7690 4172 7686 4179 7683
-+	 4187 7679 4194 7675 4198 7671 4205 7671 4209 7668 4217 7664
-+	 4224 7660 4228 7656 4232 7656 4235 7653 4239 7649 4243 7641
-+	 4243 7634 4243 7626 4243 7619 4247 7611 4247 7604 4243 7596
-+	 4243 7593 4243 7585 4243 7578 4243 7574 4243 7570 4243 7566
-+	 4243 7563 4247 7559 4250 7555 4254 7551 4254 7548 4258 7544
-+	 4262 7544 4262 7540 4262 7536 4265 7533 4265 7529 4265 7521
-+	 4265 7518 4262 7510 4258 7506 4254 7503 4254 7499 4250 7495
-+	 4247 7491 4243 7491 4239 7488 4235 7488 4232 7488 4232 7484
-+	 4228 7484 4232 7484 4190 7488 4187 7488 4179 7488 4175 7488
-+	 4172 7488 4172 7491 4168 7491 4164 7491 4160 7491 4157 7495
-+	 4153 7495 4138 7495 4127 7499 4119 7499 4112 7503 4104 7503
-+	 4097 7503 4093 7503 4089 7503 4082 7499 4074 7495 4067 7491
-+	 4067 7488 4059 7484 4055 7480 4044 7476 4037 7473 4029 7473
-+	 4022 7469 4014 7469 4007 7469 3995 7469 3984 7469 3977 7469
-+	 3969 7465 3969 7461 3965 7461 3965 7454 3962 7446 3962 7439
-+	 3958 7431 3958 7424 3958 7416 3954 7413 3954 7409 3950 7409
-+	 3947 7401 3947 7398 3947 7394 3943 7390 3935 7386 3932 7386
-+	 3928 7383 3924 7379 3920 7375 3917 7375 3913 7371 3905 7368
-+	 3898 7364 3879 7356 3872 7353 3868 7349 3860 7345 3857 7341
-+	 3853 7338 3849 7334 3842 7330 3842 7326 3834 7323 3827 7319
-+	 3819 7315 3812 7311 3804 7308 3797 7304 3793 7296 3789 7293
-+	 3785 7289 3778 7285 3774 7281 3767 7278 3759 7274 3759 7278
-+	 3752 7278 3744 7281 3733 7285 3725 7293 3722 7296 3718 7304
-+	 3714 7308 3710 7311 3707 7311 3703 7308 3699 7304 3695 7304
-+	 3692 7300 3688 7293 3684 7293 3677 7289 3669 7289 3662 7289
-+	 3650 7289 3643 7285 3635 7285 3628 7281 3609 7278 3602 7278
-+	 3590 7274 3590 7270 3583 7266 3579 7263 3572 7259 3568 7251
-+	 3564 7248 3564 7240 3560 7240 3560 7236 3557 7233 3549 7225
-+	 3542 7221 3538 7218 3534 7218 3527 7214 3515 7210 3512 7210
-+	 3508 7210 3497 7206 3485 7206 3482 7206 3478 7206 3474 7203
-+	 3474 7199 3474 7195 3474 7191 3470 7188 3470 7184 3467 7180
-+	 3463 7173 3459 7169 3456 7169 3452 7165 3444 7165 3441 7165
-+	 3437 7161 3429 7154 3426 7150 3422 7146 3418 7143 3411 7139
-+	 3407 7135 3407 7131 3399 7128 3392 7124 3392 7120 3384 7120
-+	 3377 7116 3369 7113 3366 7109 3362 7105 3354 7101 3351 7101
-+	 3347 7098 3343 7098 3339 7098 3336 7098 3332 7098 3324 7098
-+	 3321 7094 3324 7090 3324 7086 3328 7086 3328 7083 3332 7079
-+	 3336 7075 3343 7071 3347 7064 3354 7060 3354 7056 3354 7053
-+	 3354 7049 3351 7045 3351 7041 3343 7038 3339 7034 3332 7030
-+	 3328 7030 3321 7030 3317 7026 3313 7026 3309 7026 3306 7023
-+	 3302 7019 3298 7015 3294 7015 3291 7008 3291 7004 3291 7000
-+	 3270 6990 3264 6985 3253 6981 3249 6981 3242 6978 3234 6974
-+	 3227 6974 3219 6970 3212 6970 3204 6970 3201 6970 3197 6970
-+	 3197 6966 3193 6966 3189 6966 3186 6966 3178 6966 3178 6963
-+	 3174 6963 3167 6959 3163 6959 3159 6955 3156 6951 3152 6948
-+	 3148 6944 3144 6940 3141 6936 3137 6929 3129 6925 3126 6921
-+	 3118 6918 3111 6910 3103 6906 3099 6906 3092 6903 3084 6899
-+	 3073 6899 3069 6899 3062 6899 3054 6899 3051 6903 3043 6903
-+	 3032 6903 3024 6903 3021 6899 3013 6895 3006 6895 2998 6891
-+	 2998 6888 2991 6884 2983 6884 2976 6880 2972 6876 2961 6873
-+	 2961 6869 2957 6865 2957 6858 2957 6850 2957 6843 2957 6835
-+	 2957 6831 2957 6828 2957 6820 2957 6816 2953 6813 2942 6801
-+	 2934 6798 2927 6798 2919 6794 2908 6794 2900 6794 2889 6798
-+	 2882 6798 2870 6798 2863 6801 2855 6801 2848 6801 2837 6801
-+	 2825 6801 2810 6801 2799 6801 2788 6801 2777 6801 2765 6798
-+	 2750 6794 2743 6794 2732 6786 2720 6783 2713 6779 2705 6775
-+	 2702 6771 2694 6768 2683 6760 2672 6753 2664 6745 2653 6741
-+	 2645 6734 2638 6730 2634 6730 2627 6726 2615 6726 2615 6723
-+	 2608 6719 2604 6715 2600 6711 2593 6711 2593 6708 2585 6704
-+	 2582 6700 2578 6696 2574 6693 2570 6689 2567 6685 2567 6678
-+	 2563 6666 2563 6659 2563 6651 2563 6644 2559 6636 2555 6633
-+	 2555 6629 2548 6621 2540 6621 2537 6621 2533 6618 2525 6614
-+	 2514 6610 2507 6606 2503 6599 2495 6595 2488 6591 2480 6588
-+	 2473 6584 2462 6576 2458 6569 2447 6565 2443 6565 2439 6565
-+	 2435 6569 2432 6569 2428 6573 2428 6576 2424 6580 2424 6584
-+	 2420 6591 2417 6595 2413 6599 2409 6606 2405 6610 2402 6610
-+	 2394 6614 2387 6614 2379 6614 2372 6614 2360 6614 2349 6614
-+	 2345 6610 2338 6610 2327 6606 2319 6603 2315 6599 2308 6595
-+	 2304 6591 2297 6588 2289 6584 2282 6580 2274 6580 2267 6576
-+	 2263 6576 2256 6573 2252 6569 2248 6565 2244 6561 2237 6558
-+	 2233 6554 2233 6550 2226 6546 2222 6539 2218 6535 2211 6528
-+	 2203 6520 2199 6516 2196 6509 2192 6509 2184 6501 2173 6501
-+	 2169 6501 2166 6501 2162 6501 2158 6498 2154 6494 2151 6486
-+	 2147 6483 2139 6479 2132 6475 2124 6471 2117 6468 2113 6468
-+	 2106 6464 2098 6464 2091 6464 2087 6464 2072 6471 2064 6475
-+	 2061 6479 2057 6483 2049 6486 2046 6494 2042 6501 2038 6505
-+	 2034 6513 2034 6516 2031 6520 2031 6524 2027 6528 2023 6531
-+	 2016 6531 2016 6535 2012 6539 2008 6539 2004 6539 1997 6543
-+	 1993 6546 1989 6546 1986 6546 1978 6550 1971 6550 1963 6550
-+	 1959 6546 1952 6546 1944 6543 1937 6539 1929 6535 1926 6531
-+	 1918 6528 1910 6524 1907 6524 1899 6520 1892 6516 1884 6516
-+	 1877 6516 1873 6516 1869 6513 1865 6513 1862 6513 1858 6516
-+	 1854 6516 1847 6516 1843 6516 1839 6520 1835 6520 1828 6520
-+	 1820 6520 1813 6520 1805 6520 1798 6520 1794 6520 1790 6524
-+	 1787 6524 1783 6528 1783 6535 1779 6539 1779 6543 1779 6546
-+	 1775 6550 1775 6554 1772 6554 1772 6558 1768 6558 1768 6561
-+	 1768 6565 1768 6573 1768 6580 1768 6588 1772 6591 1772 6599
-+	 1775 6603 1779 6610 1779 6614 1779 6621 1783 6629 1783 6636
-+	 1783 6640 1783 6644 1783 6651 1779 6655 1779 6663 1783 6670
-+	 1787 6681 1787 6685 1787 6689 1787 6693 1787 6696 1783 6700
-+	 1779 6704 1775 6711 1779 6715 1787 6723 1794 6726 1802 6730
-+	 1809 6730 1813 6734 1817 6738 1817 6741 1813 6745 1813 6749
-+	 1813 6741 1809 6741 1805 6749 1802 6756 1794 6764 1790 6775
-+	 1787 6779 1783 6786 1775 6801 1772 6809 1772 6813 1772 6820
-+	 1768 6828 1768 6835 1768 6843 1768 6846 1764 6858 1764 6865
-+	 1760 6869 1753 6880 1749 6891 1742 6895 1742 6903 1742 6906
-+	 1742 6914 1742 6925 1742 6936
-diff -urN xfig.3.2.5.orig/Libraries/Networks/Devices/firewall-pair.fig xfig.3.2.5/Libraries/Networks/Devices/firewall-pair.fig
---- xfig.3.2.5.orig/Libraries/Networks/Devices/firewall-pair.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Networks/Devices/firewall-pair.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,75 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4      
-+100.00
-+Single
-+-2
-+# A pair of firewalls
-+# Combined by Roland Rosenfeld
-+1200 2
-+0 32 #aeaaae
-+# A pair of firewalls
-+6 3375 2175 4050 3075
-+6 3600 2250 4050 3075
-+# Firewall
-+# (from TomiOllila <Tomi.Ollila at tfi.net> )
-+6 3600 2250 4050 3075
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+	 3825 3075 3825 2475
-+2 1 0 1 0 20 2 0 20 0.000 0 0 -1 0 0 5
-+	 3675 2475 3675 3075 3825 3075 3975 2925 3975 2400
-+2 1 0 1 0 32 1 0 20 0.000 0 0 -1 0 0 7
-+	 3600 2400 3600 2475 3900 2475 4050 2325 4050 2250 3750 2250
-+	 3600 2400
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+	 3900 2475 3900 2400 3600 2400
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+	 3900 2400 4050 2250
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+	 3675 2625 3825 2625 3975 2475
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+	 3675 2775 3825 2775 3975 2625
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+	 3675 2925 3825 2925 3975 2775
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+	 3900 3000 3900 2850
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+	 3900 2700 3900 2550
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+	 3750 2475 3750 2625
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+	 3750 2775 3750 2925
-+-6
-+-6
-+6 3375 2175 3825 3000
-+6 3450 2175 3825 3000
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+	 3600 3000 3600 2400
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+	 3675 2325 3825 2175
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+	 3450 2550 3600 2550 3750 2400
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+	 3450 2700 3600 2700 3750 2550
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+	 3450 2850 3600 2850 3750 2700
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+	 3675 2925 3675 2775
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+	 3675 2625 3675 2475
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+	 3525 2400 3525 2550
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+	 3525 2700 3525 2850
-+-6
-+2 1 0 1 0 20 22 0 20 0.000 0 0 -1 0 0 5
-+	 3450 2400 3450 3000 3600 3000 3750 2850 3750 2325
-+2 1 0 1 0 32 21 0 20 0.000 0 0 -1 0 0 7
-+	 3375 2325 3375 2400 3675 2400 3825 2250 3825 2175 3525 2175
-+	 3375 2325
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 -1 0 0 3
-+	 3675 2400 3675 2325 3375 2325
-+-6
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Networks/Devices/internet.fig xfig.3.2.5/Libraries/Networks/Devices/internet.fig
---- xfig.3.2.5.orig/Libraries/Networks/Devices/internet.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Networks/Devices/internet.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,39 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4      
-+100.00
-+Single
-+-2
-+# Internet cloud
-+# By Roland Rosenfeld
-+1200 2
-+# An Internet cloud
-+6 4275 5700 7200 7650
-+2 1 0 0 7 7 970 0 20 4.000 0 0 0 0 0 65
-+	 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
-+	 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
-+	 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
-+	 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
-+	 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
-+	 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
-+	 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
-+	 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
-+	 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
-+	 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
-+	 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
-+2 1 0 2 1 0 969 0 -1 0.000 0 0 0 0 0 65
-+	 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
-+	 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
-+	 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
-+	 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
-+	 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
-+	 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
-+	 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
-+	 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
-+	 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
-+	 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
-+	 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
-+4 0 0 100 0 18 33 0.0000 4 405 2040 4744 6853 Internet\001
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Networks/Routers/router-pair.fig xfig.3.2.5/Libraries/Networks/Routers/router-pair.fig
---- xfig.3.2.5.orig/Libraries/Networks/Routers/router-pair.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Networks/Routers/router-pair.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,78 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4      
-+100.00
-+Single
-+-2
-+# A pair of routers
-+# Colored and combined by Roland Rosenfeld
-+1200 2
-+# A pair of routers
-+6 3150 3300 4275 3975
-+6 3346 3450 4269 3975
-+6 3844 3615 4173 3718
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3879 3701 3854 3647 3976 3624 3955 3642 4159 3676 4111 3713
-+	 3908 3676 3879 3701
-+-6
-+6 3617 3636 3803 3759
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3764 3731 3638 3754 3634 3694 3671 3703 3738 3646 3800 3657
-+	 3727 3719 3764 3731
-+-6
-+6 3803 3470 3988 3594
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
-+	 3837 3518 3982 3481 3983 3541 3947 3535 3876 3591 3809 3581
-+	 3882 3526 3837 3518
-+-6
-+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 3807 3619 457 169 3349 3619 4264 3619
-+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 3803 3806 457 169 3346 3806 4261 3806
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3705 3557 3738 3608 3609 3637 3638 3615 3439 3581 3488 3545
-+	 3681 3576 3705 3557
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+	 3350 3613 3347 3812
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+	 4263 3626 4263 3815
-+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
-+	 3349 3626 4269 3626 4269 3800 3349 3800 3349 3626
-+-6
-+6 3150 3300 4125 3825
-+6 3600 3450 3975 3600
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+	 3683 3551 3658 3497 3780 3474 3759 3492 3963 3526 3915 3563
-+	 3712 3526 3683 3551
-+-6
-+6 3600 3300 3825 3450
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 7 0 0 8
-+	 3641 3368 3786 3331 3787 3391 3751 3385 3680 3441 3613 3431
-+	 3686 3376 3641 3368
-+-6
-+6 3375 3450 3675 3675
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+	 3568 3581 3442 3604 3438 3544 3475 3553 3542 3496 3604 3507
-+	 3531 3569 3568 3581
-+-6
-+1 2 0 1 0 15 61 0 20 0.000 1 0.0000 3611 3469 457 169 3153 3469 4068 3469
-+1 2 0 1 0 15 63 0 20 0.000 1 0.0000 3607 3656 457 169 3150 3656 4065 3656
-+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
-+	 4067 3476 4067 3665
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+	 3509 3407 3542 3458 3413 3487 3442 3465 3243 3431 3292 3395
-+	 3485 3426 3509 3407
-+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
-+	 3154 3463 3151 3662
-+2 2 0 0 0 15 62 -1 20 0.000 0 0 -1 0 0 5
-+	 3153 3476 4073 3476 4073 3650 3153 3650 3153 3476
-+-6
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Networks/Routers/router4.fig xfig.3.2.5/Libraries/Networks/Routers/router4.fig
---- xfig.3.2.5.orig/Libraries/Networks/Routers/router4.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Networks/Routers/router4.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,44 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Metric
-+A4      
-+100.00
-+Single
-+-2
-+# Router
-+# Colored by Roland Rosenfeld
-+1200 2
-+# Router
-+6 3870 4455 5940 5625
-+6 4995 4815 5715 5040
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 5072 5002 5018 4886 5284 4834 5238 4873 5683 4948 5578 5030
-+	 5136 4948 5072 5002
-+-6
-+6 4500 4860 4905 5130
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 4822 5067 4545 5117 4537 4989 4618 5007 4766 4883 4900 4905
-+	 4741 5041 4822 5067
-+-6
-+6 4905 4500 5310 4770
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
-+	 4981 4603 5296 4523 5300 4653 5222 4640 5066 4762 4919 4741
-+	 5079 4622 4981 4603
-+-6
-+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 4914 4824 999 369 3915 4824 5913 4824
-+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 4908 5231 999 369 3909 5231 5907 5231
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 4693 4690 4766 4800 4483 4863 4545 4814 4111 4740 4219 4661
-+	 4640 4731 4693 4690
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+	 3917 4811 3910 5244
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+	 5910 4838 5910 5251
-+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
-+	 3915 4838 5924 4838 5924 5218 3915 5218 3915 4838
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Networks/Switches/switch-pair.fig xfig.3.2.5/Libraries/Networks/Switches/switch-pair.fig
---- xfig.3.2.5.orig/Libraries/Networks/Switches/switch-pair.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Networks/Switches/switch-pair.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,66 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4      
-+100.00
-+Single
-+-2
-+# A pair of switches
-+# Colored and combined by Roland Rosenfeld
-+1200 2
-+# A pair of switches
-+6 2550 2625 4725 3750
-+6 2625 2850 4725 3750
-+6 3000 2850 4425 3300
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
-+	 3214 3184 3608 3184
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
-+	 4040 3124 3646 3124
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
-+	 3371 3012 3765 3012
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
-+	 4216 2959 3822 2959
-+-6
-+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
-+	 4125 3300 4725 2850 4725 3300 4125 3750
-+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
-+	 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
-+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
-+	 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
-+-6
-+6 2550 2625 4650 3525
-+6 2925 2625 4350 3075
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+	 3528 2955 3506 2985 3119 2985 3086 3015 2953 2970 3193 2901
-+	 3139 2959 3533 2959
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+	 3576 2903 3598 2873 3985 2873 4018 2843 4151 2888 3911 2957
-+	 3965 2899 3571 2899
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+	 3685 2783 3663 2813 3276 2813 3243 2843 3110 2798 3350 2729
-+	 3296 2787 3690 2787
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+	 3752 2738 3774 2708 4161 2708 4194 2678 4327 2723 4087 2792
-+	 4141 2734 3747 2734
-+-6
-+2 1 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 4
-+	 4050 3075 4650 2625 4650 3075 4050 3525
-+2 2 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 5
-+	 2550 3075 4050 3075 4050 3525 2550 3525 2550 3075
-+2 3 0 1 0 15 62 -1 20 0.000 0 0 -1 0 0 5
-+	 2550 3075 3150 2625 4650 2625 4050 3075 2550 3075
-+-6
-+-6
-diff -urN xfig.3.2.5.orig/Libraries/Networks/Switches/switch2.fig xfig.3.2.5/Libraries/Networks/Switches/switch2.fig
---- xfig.3.2.5.orig/Libraries/Networks/Switches/switch2.fig	1970-01-01 01:00:00.000000000 +0100
-+++ xfig.3.2.5/Libraries/Networks/Switches/switch2.fig	2009-03-15 16:44:48.000000000 +0100
-@@ -0,0 +1,38 @@
-+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4      
-+100.00
-+Single
-+-2
-+# Switch
-+# colored by Roland Rosenfeld
-+1200 2
-+# Switch
-+6 2625 2850 4725 3750
-+6 3000 2850 4425 3300
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
-+	 3214 3184 3608 3184
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
-+	 4040 3124 3646 3124
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
-+	 3371 3012 3765 3012
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+	 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
-+	 4216 2959 3822 2959
-+-6
-+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
-+	 4125 3300 4725 2850 4725 3300 4125 3750
-+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
-+	 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
-+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
-+	 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
-+-6
-diff -urN xfig.3.2.5.orig/u_free.c xfig.3.2.5/u_free.c
---- xfig.3.2.5.orig/u_free.c	2005-07-26 18:40:00.000000000 +0200
-+++ xfig.3.2.5/u_free.c	2009-03-15 16:44:48.000000000 +0100
-@@ -168,14 +168,14 @@
- 	return;
- 
-     if (picture->refcount == 0) {
--	fprintf(stderr, "Error freeing picture %x %s with refcount = 0\n",
-+	fprintf(stderr, "Error freeing picture %p %s with refcount = 0\n",
- 		picture, picture->file);
- 	return;
-     }
-     picture->refcount--;
-     if (picture->refcount == 0) {
- 	if (appres.DEBUG)
--	    fprintf(stderr,"Delete picture %x %s, refcount = %d\n",
-+	    fprintf(stderr,"Delete picture %p %s, refcount = %d\n",
- 				picture, picture->file, picture->refcount);
- 	if (picture->bitmap)
- 	    free((char *) picture->bitmap);
-@@ -193,7 +193,7 @@
- 	free(picture);
-     } else {
- 	if (appres.DEBUG)
--	    fprintf(stderr,"Decrease refcount for picture %x %s, refcount = %d\n",
-+	    fprintf(stderr,"Decrease refcount for picture %p %s, refcount = %d\n",
- 				picture, picture->file, picture->refcount);
-     }
- }
-diff -urN xfig.3.2.5.orig/w_file.c xfig.3.2.5/w_file.c
---- xfig.3.2.5.orig/w_file.c	2005-07-26 18:40:01.000000000 +0200
-+++ xfig.3.2.5/w_file.c	2009-03-15 16:44:48.000000000 +0100
-@@ -208,7 +208,7 @@
-     *iyoff = round(yoff*offset_unit_conv[yoff_unit_setting]);
- }
- 
--void
-+static void
- merge_request(Widget w, XButtonEvent *ev)
- {
-     if (preview_in_progress) {
-@@ -291,7 +291,7 @@
-     }
- }
- 
--void
-+static void
- do_load(Widget w, XButtonEvent *ev)
- {
-     char	    fname[PATH_MAX];
-diff -urN xfig.3.2.5.orig/w_setup.c xfig.3.2.5/w_setup.c
---- xfig.3.2.5.orig/w_setup.c	2009-03-15 16:32:09.000000000 +0100
-+++ xfig.3.2.5/w_setup.c	2009-03-15 16:44:48.000000000 +0100
-@@ -23,8 +23,6 @@
- #include "w_setup.h"
- #include "w_util.h"
- 
--#define	NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */
--
- int		TOOL_WD, TOOL_HT;
- int		CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT;
- int		NAMEPANEL_WD;
-@@ -94,8 +92,7 @@
- 
-     /* space for both modepanel titles (Drawing modes and Editing modes) */
-     MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - 
--	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
--			ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
-+	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_MODE_SW/SW_PER_ROW) + 1);
-     if (MODEPANEL_SPACE < 2)
- 	MODEPANEL_SPACE = 2;
- }

xfig-3.2.5-enable-Xaw3d.patch:

Index: xfig-3.2.5-enable-Xaw3d.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-enable-Xaw3d.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-enable-Xaw3d.patch	16 Nov 2007 19:58:04 -0000	1.1
+++ xfig-3.2.5-enable-Xaw3d.patch	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,34 +1,21 @@
-diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile
---- xfig.3.2.5/Imakefile.no-Xaw3d	2007-11-16 10:38:18.000000000 +0100
-+++ xfig.3.2.5/Imakefile	2007-11-16 10:38:49.000000000 +0100
-@@ -50,16 +50,16 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
+diff -up xfig.3.2.5a/Imakefile.no-Xaw3d xfig.3.2.5a/Imakefile
+--- xfig.3.2.5a/Imakefile.no-Xaw3d	2009-03-27 16:33:46.000000000 +0100
++++ xfig.3.2.5a/Imakefile	2009-03-27 16:35:06.000000000 +0100
+@@ -50,7 +50,7 @@ XAPPLOADDIR = /usr/share/X11/app-default
+ XCOMM Comment out the following definition for XAW3D if you don't to want to use
+ XCOMM the 3d Athena Widget Set
  
 -XCOMM #define XAW3D
 +#define XAW3D
  
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
+ #ifdef XAW3D
+ XAWLIB = -lXaw3d
+@@ -60,7 +60,7 @@ XCOMM Uncomment the following if you hav
  XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+ XCOMM NOTE: This is the default for many X systems now.
  
 -XCOMM #define XAW3D1_5E
 +#define XAW3D1_5E
  
  #ifdef XAW3D1_5E
      DUSEXAW3D = -DXAW3D -DXAW3D1_5E
--    XAWLIB = -lXaw3d15e
-+    XAWLIB = -lXaw3d
- #else
-     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
-     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
-diff -up xfig.3.2.5/w_library.c.no-Xaw3d xfig.3.2.5/w_library.c
---- xfig.3.2.5/w_library.c.no-Xaw3d	2006-04-03 18:27:30.000000000 +0200
-+++ xfig.3.2.5/w_library.c	2007-11-16 10:38:18.000000000 +0100
-@@ -1029,6 +1029,7 @@ make_library_menu(Widget parent, char *n
-     Widget	     menu, entry;
- #ifndef XAW3D1_5E
-     Widget	     submenu;
-+#else
-     char	     submenu_name[200];
- #endif /* XAW3D1_5E */
-     char	     menu_name[200];

xfig-3.2.5-fhs.patch:

Index: xfig-3.2.5-fhs.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-fhs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-fhs.patch	16 Apr 2007 13:15:16 -0000	1.1
+++ xfig-3.2.5-fhs.patch	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,6 +1,6 @@
 --- xfig.3.2.5/Imakefile.fhs	2006-10-11 01:19:22.000000000 +0200
 +++ xfig.3.2.5/Imakefile	2007-04-16 14:04:45.000000000 +0200
-@@ -169,13 +169,11 @@
+@@ -169,8 +169,7 @@
  XFIGLIBDIR = $(LIBDIR)/xfig
  
  XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
@@ -10,9 +10,3 @@
  
  XCOMM MANDIR tells where the standard man pages should go (no need to change it
  XCOMM if you want the man pages installed in the standard place on your system
--XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--MANDIR = /usr/local/xfig/man
-+MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
- 
- XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR

xfig-3.2.5-missing-protos.patch:

Index: xfig-3.2.5-missing-protos.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-missing-protos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-missing-protos.patch	3 Apr 2008 17:39:10 -0000	1.1
+++ xfig-3.2.5-missing-protos.patch	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,15 +1,15 @@
-diff -ur xfig.3.2.5/e_chop.c xfig.3.2.5.new/e_chop.c
---- xfig.3.2.5/e_chop.c	2005-07-26 18:56:28.000000000 +0200
-+++ xfig.3.2.5.new/e_chop.c	2008-04-03 18:58:07.000000000 +0200
-@@ -20,6 +20,7 @@
- 
- #include <stdlib.h>
+diff -urNad xfig~/e_chop.c xfig/e_chop.c
+--- xfig~/e_chop.c
++++ xfig/e_chop.c
+@@ -22,6 +22,7 @@
+ #ifndef __FreeBSD__
  #include <alloca.h>
+ #endif
 +#include <math.h>
  #include "fig.h"
  #include "resources.h"
  #include "mode.h"
-@@ -29,6 +30,9 @@
+@@ -31,6 +32,9 @@
  #include "u_list.h"
  #include "u_search.h"
  #include "u_undo.h"
@@ -19,7 +19,7 @@
  #include "w_canvas.h"
  #include "w_drawprim.h"
  #include "w_mousefun.h"
-@@ -37,6 +41,8 @@
+@@ -39,6 +43,8 @@
  #include "w_zoom.h"
  #include "w_snap.h"
  #include "w_intersect.h"
@@ -28,9 +28,9 @@
  
  static void select_axe_object();
  static void select_log_object();
-diff -ur xfig.3.2.5/main.c xfig.3.2.5.new/main.c
---- xfig.3.2.5/main.c	2008-04-03 19:28:25.000000000 +0200
-+++ xfig.3.2.5.new/main.c	2008-04-03 19:26:36.000000000 +0200
+diff -urNad xfig~/main.c xfig/main.c
+--- xfig~/main.c
++++ xfig/main.c
 @@ -68,6 +68,8 @@
  #include <X11/keysym.h>
  #endif  /* I18N */
@@ -40,9 +40,9 @@
  /* EXPORTS */
  
  Boolean	    geomspec;
-diff -ur xfig.3.2.5/w_intersect.c xfig.3.2.5.new/w_intersect.c
---- xfig.3.2.5/w_intersect.c	2004-09-29 23:46:00.000000000 +0200
-+++ xfig.3.2.5.new/w_intersect.c	2008-04-03 19:25:08.000000000 +0200
+diff -urNad xfig~/w_intersect.c xfig/w_intersect.c
+--- xfig~/w_intersect.c
++++ xfig/w_intersect.c
 @@ -23,6 +23,8 @@
  #include "mode.h"
  #include "w_snap.h"
@@ -50,11 +50,11 @@
 +#include "w_msgpanel.h"
 +#include "f_util.h"
  #include "u_quartic.h"
+ #include <alloca.h>
  #include <math.h>
- #include <complex.h>
-diff -ur xfig.3.2.5/w_intersect.h xfig.3.2.5.new/w_intersect.h
---- xfig.3.2.5/w_intersect.h	2004-09-28 05:05:03.000000000 +0200
-+++ xfig.3.2.5.new/w_intersect.h	2008-04-03 19:15:44.000000000 +0200
+diff -urNad xfig~/w_intersect.h xfig/w_intersect.h
+--- xfig~/w_intersect.h
++++ xfig/w_intersect.h
 @@ -59,4 +59,6 @@
  
  extern F_line * build_text_bounding_box(F_text * t);
@@ -62,22 +62,9 @@
 +extern void delete_text_bounding_box(F_line * l);
 +
  #endif
-diff -ur xfig.3.2.5/w_keyboard.c xfig.3.2.5.new/w_keyboard.c
---- xfig.3.2.5/w_keyboard.c	2004-11-09 22:10:22.000000000 +0100
-+++ xfig.3.2.5.new/w_keyboard.c	2008-04-03 19:24:23.000000000 +0200
-@@ -31,7 +31,9 @@
- #include "w_setup.h"
- #include "w_indpanel.h"
- #include "w_util.h"
-+#include "w_msgpanel.h"
- #include "w_keyboard.h"
-+#include "f_util.h"
- 
- #if defined(__CYGWIN__)
- #define REG_NOERROR REG_OKAY
-diff -ur xfig.3.2.5/w_snap.c xfig.3.2.5.new/w_snap.c
---- xfig.3.2.5/w_snap.c	2004-09-29 23:52:16.000000000 +0200
-+++ xfig.3.2.5.new/w_snap.c	2008-04-03 19:16:37.000000000 +0200
+diff -urNad xfig~/w_snap.c xfig/w_snap.c
+--- xfig~/w_snap.c
++++ xfig/w_snap.c
 @@ -27,7 +27,10 @@
  #include "w_setup.h"
  #include "w_indpanel.h"
@@ -87,41 +74,17 @@
 +#include "u_search.h"
 +#include "f_util.h"
  #include <math.h>
+ #ifndef __FreeBSD__
  #include <alloca.h>
+diff -up xfig.3.2.5a/w_canvas.h~ xfig.3.2.5a/w_canvas.h
+--- xfig.3.2.5a/w_canvas.h~	2008-06-19 21:55:20.000000000 +0200
++++ xfig.3.2.5a/w_canvas.h	2009-03-27 16:42:25.000000000 +0100
+@@ -35,7 +35,7 @@ extern void	toggle_show_balloons(void);
+ extern void	toggle_show_lengths(void);
+ extern void	toggle_show_vertexnums(void);
+ extern void	toggle_show_borders(void);
+-extern void 	round_coords();				// isometric grid
++extern void 	round_coords(int *x, int *y);		// isometric grid
  
-@@ -850,6 +853,12 @@
- }
- 
- 
-+#ifdef signbit
-+#undef signbit
-+#endif
-+#define signbit(x) \
-+    ((0.0 >  (x)) ? 1 : 0)
-+
- Boolean
- is_point_on_arc(a, x, y)
-      F_arc * a;
-diff -ur xfig.3.2.5/w_snap.h xfig.3.2.5.new/w_snap.h
---- xfig.3.2.5/w_snap.h	2004-11-09 22:14:42.000000000 +0100
-+++ xfig.3.2.5.new/w_snap.h	2008-04-03 19:15:49.000000000 +0200
-@@ -63,8 +63,4 @@
- extern Widget snap_indicator_panel;  
- extern Widget snap_indicator_label;
- 
--#  define signbit(x) \
--    ((0.0 >  (x)) ? 1 : 0)
--
--
- #endif
-diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c
---- xfig.3.2.5/u_draw.c~	2008-04-03 15:58:23.000000000 +0200
-+++ xfig.3.2.5/u_draw.c	2008-04-03 15:58:23.000000000 +0200
-@@ -43,6 +43,7 @@
- #include "w_zoom.h"
- #include "u_redraw.h"
- #include "w_cursor.h"
-+#include <X11/ImUtil.h>
- 
- static Boolean add_point(int x, int y);
- static void init_point_array(void);
+ extern void		canvas_selected(Widget tool, XButtonEvent *event, String *params, Cardinal *nparams);
+ extern void	paste_primary_selection(void);

xfig-3.2.5-mkstemp.diff:

Index: xfig-3.2.5-mkstemp.diff
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-mkstemp.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-mkstemp.diff	16 Apr 2007 13:15:16 -0000	1.1
+++ xfig-3.2.5-mkstemp.diff	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,5 +1,110 @@
---- xfig.3.2.5/f_readtif.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
-+++ xfig.3.2.5/f_readtif.c	2007-04-16 14:05:22.000000000 +0200
+diff -urNad xfig~/f_readeps.c xfig/f_readeps.c
+--- xfig~/f_readeps.c
++++ xfig/f_readeps.c
+@@ -250,11 +250,10 @@
+     int         urx, llx, ury, lly;
+     int         pdf_flag;
+ {
+-    static	tempseq = 0;
+     char        buf[300];
+     FILE       *tmpfp, *pixfile, *gsfile;
+     char       *psnam, *driver;
+-    int         status, wid, ht, nbitmap;
++    int         status, wid, ht, nbitmap, fd;
+     char        tmpfile[PATH_MAX],
+ 		pixnam[PATH_MAX],
+ 		errnam[PATH_MAX],
+@@ -270,8 +269,12 @@
+ 	/* re-open the pipe */
+ 	close_picfile(file, filetype);
+ 	file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
+-	sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
+-	if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
++   snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
++   if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
++       if (fd != -1) {
++         unlink(tmpfile);
++         close(fd);
++       }
+ 	    file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
+ 	    return False;
+ 	}
+@@ -280,10 +283,20 @@
+ 	fclose(tmpfp);
+     }
+     /* make name /TMPDIR/xfig-pic######.pix */
+-    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
++    snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
++    if ((fd = mkstemp(pixnam)) == -1) {
++        file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
++        return False;
++    }
++    close(fd);
++
+     /* and file name for any error messages from gs */
+-    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
+-    tempseq++;
++    snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
++    if ((fd = mkstemp(errnam)) == -1) {
++       file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
++       return False;
++    }
++    close(fd);
+ 
+     /* generate gs command line */
+     /* for monochrome, use pbm */
+diff -urNad xfig~/f_readgif.c xfig/f_readgif.c
+--- xfig~/f_readgif.c
++++ xfig/f_readgif.c
+@@ -76,7 +76,7 @@
+ 	char		buf[BUFLEN],pcxname[PATH_MAX];
+ 	FILE		*giftopcx;
+ 	struct Cmap 	localColorMap[MAX_COLORMAP_SIZE];
+-	int		i, stat, size;
++	int		i, stat, size, fd;
+ 	int		useGlobalColormap;
+ 	unsigned int	bitPixel, red, green, blue;
+ 	unsigned char	c;
+@@ -173,7 +173,13 @@
+ 	/* now call giftopnm and ppmtopcx */
+ 
+ 	/* make name for temp output file */
+-	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
++	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
++	if ((fd = mkstemp(pcxname)) == -1) {
++		file_msg("Cannot create temporary file\n");
++		return FileInvalid;
++	}
++	close(fd);
++
+ 	/* make command to convert gif to pcx into temp file */
+ 	sprintf(buf, "giftopnm -quiet | ppmtopcx -quiet > %s", pcxname);
+ 	if ((giftopcx = popen(buf,"w" )) == 0) {
+diff -urNad xfig~/f_readppm.c xfig/f_readppm.c
+--- xfig~/f_readppm.c
++++ xfig/f_readppm.c
+@@ -34,10 +34,16 @@
+ {
+ 	char	 buf[BUFLEN],pcxname[PATH_MAX];
+ 	FILE	*giftopcx;
+-	int	 stat, size;
++	int	 stat, size, fd;
+ 
+ 	/* make name for temp output file */
+-	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
++	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
++	if ((fd = mkstemp(pcxname)) == -1) {
++	    file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
++	    return FileInvalid;
++	}
++	close(fd);
++
+ 	/* make command to convert gif to pcx into temp file */
+ 	sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
+ 	if ((giftopcx = popen(buf,"w" )) == 0) {
+diff -urNad xfig~/f_readtif.c xfig/f_readtif.c
+--- xfig~/f_readtif.c
++++ xfig/f_readtif.c
 @@ -33,11 +33,16 @@
  {
  	char	 buf[2*PATH_MAX+40],pcxname[PATH_MAX];
@@ -20,47 +125,9 @@
  	/* make command to convert tif to pnm then to pcx into temp file */
  	/* for some reason, tifftopnm requires a file and can't work in a pipe */
  	sprintf(buf, "tifftopnm %s 2> /dev/null | ppmtopcx > %s 2> /dev/null",
---- xfig.3.2.5/u_print.c.mkstemp	2006-02-24 21:18:11.000000000 +0100
-+++ xfig.3.2.5/u_print.c	2007-04-16 14:05:22.000000000 +0200
-@@ -92,9 +92,16 @@
-     char	    syspr[2*PATH_MAX+200];
-     char	    tmpfile[PATH_MAX];
-     char	   *name;
-+    int     fd;
- 
--    sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-print", getpid());
-+    snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-print.XXXXXX", TMPDIR);
-     warnexist = False;
-+    if ((fd = mkstemp(tmpfile)) == -1) {
-+       file_msg("Can't open temp file %s: %s\n", tmpfile, strerror(errno));
-+       return;
-+    }
-+    close(fd);
-+
-     init_write_tmpfile();
-     if (write_file(tmpfile, False)) {
-       end_write_tmpfile();
-@@ -648,10 +655,16 @@
-     char   errfname[PATH_MAX];
-     FILE  *errfile;
-     char   str[400];
--    int	   status;
-+    int	   status, fd;
- 
-     /* make temp filename for any errors */
--    sprintf(errfname, "%s/xfig-export%06d.err", TMPDIR, getpid());
-+    snprintf(errfname, sizeof(errfname), "%s/xfig-export.XXXXXX", TMPDIR);
-+    if ((fd = mkstemp(errfname)) == -1) {
-+	file_msg("Can't open temp file %s: %s\n", errfname, strerror(errno));
-+	return 1;
-+    }
-+    close(fd);
-+    
-     /* direct any output from fig2dev to this file */
-     strcat(command, " 2> "); 
-     strcat(command, errfname); 
---- xfig.3.2.5/f_util.c.mkstemp	2007-01-16 18:58:18.000000000 +0100
-+++ xfig.3.2.5/f_util.c	2007-04-16 14:05:22.000000000 +0200
+diff -urNad xfig~/f_util.c xfig/f_util.c
+--- xfig~/f_util.c
++++ xfig/f_util.c
 @@ -906,14 +906,20 @@
  int strain_out(char *name)
  {
@@ -87,9 +154,10 @@
      }
      /* read the .xfigrc file and write all to temp file except file names */
      xfigrc = fopen(xfigrc_name,"r");
---- xfig.3.2.5/main.c.mkstemp	2007-01-15 01:24:26.000000000 +0100
-+++ xfig.3.2.5/main.c	2007-04-16 14:05:22.000000000 +0200
-@@ -653,8 +653,10 @@
+diff -urNad xfig~/main.c xfig/main.c
+--- xfig~/main.c
++++ xfig/main.c
+@@ -657,8 +657,10 @@
      update_figs = False;
  
      /* get the TMPDIR environment variable for temporary files */
@@ -102,7 +170,7 @@
  
      /* first check args to see if user wants to scale the figure as it is
  	read in and make sure it is a resonable (positive) number */
-@@ -1669,7 +1671,14 @@
+@@ -1673,7 +1675,14 @@
      if (userhome != NULL && *strcpy(cut_buf_name, userhome) != '\0') {
  	strcat(cut_buf_name, "/.xfig");
      } else {
@@ -118,9 +186,62 @@
      }
  }
  
---- xfig.3.2.5/w_print.c.mkstemp	2005-07-26 18:40:01.000000000 +0200
-+++ xfig.3.2.5/w_print.c	2007-04-16 14:05:22.000000000 +0200
-@@ -294,9 +294,10 @@
+diff -urNad xfig~/mode.c xfig/mode.c
+--- xfig~/mode.c
++++ xfig/mode.c
+@@ -86,7 +86,7 @@
+ 
+ int		cur_exp_lang;		/* gets initialized in main.c */
+ Boolean		batch_exists = False;
+-char		batch_file[32];
++char		batch_file[PATH_MAX];
+ 
+ /*******************************************************************/
+ /* If you change the order of the lang_items[] you must change the */
+diff -urNad xfig~/u_print.c xfig/u_print.c
+--- xfig~/u_print.c
++++ xfig/u_print.c
+@@ -92,9 +92,16 @@
+     char	    syspr[2*PATH_MAX+200];
+     char	    tmpfile[PATH_MAX];
+     char	   *name;
++    int     fd;
+ 
+-    sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-print", getpid());
++    snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-print.XXXXXX", TMPDIR);
+     warnexist = False;
++    if ((fd = mkstemp(tmpfile)) == -1) {
++       file_msg("Can't open temp file %s: %s\n", tmpfile, strerror(errno));
++       return;
++    }
++    close(fd);
++
+     init_write_tmpfile();
+     if (write_file(tmpfile, False)) {
+       end_write_tmpfile();
+@@ -671,10 +678,16 @@
+     char   errfname[PATH_MAX];
+     FILE  *errfile;
+     char   str[400];
+-    int	   status;
++    int	   status, fd;
+ 
+     /* make temp filename for any errors */
+-    sprintf(errfname, "%s/xfig-export%06d.err", TMPDIR, getpid());
++    snprintf(errfname, sizeof(errfname), "%s/xfig-export.XXXXXX", TMPDIR);
++    if ((fd = mkstemp(errfname)) == -1) {
++	file_msg("Can't open temp file %s: %s\n", errfname, strerror(errno));
++	return 1;
++    }
++    close(fd);
++    
+     /* direct any output from fig2dev to this file */
+     strcat(command, " 2> "); 
+     strcat(command, errfname); 
+diff -urNad xfig~/w_print.c xfig/w_print.c
+--- xfig~/w_print.c
++++ xfig/w_print.c
+@@ -295,9 +295,10 @@
  do_print_batch(Widget w)
  {
  	FILE	   *infp,*outfp;
@@ -132,7 +253,7 @@
  
  	if (writing_batch || emptyfigure_msg(print_msg))
  		return;
-@@ -305,11 +306,20 @@
+@@ -306,11 +307,20 @@
  	/* this could happen if the user presses the button too fast */
  	writing_batch = True;
  
@@ -157,7 +278,7 @@
  	if (!print_popup) 
  		create_print_panel(w);
  
-@@ -322,6 +332,12 @@
+@@ -323,6 +333,12 @@
  	/* make a #rrggbb string from the background color */
  	make_rgb_string(export_background_color, backgrnd);
  
@@ -170,55 +291,9 @@
  	/* get grid params and assemble into fig2dev parm */
  	get_grid_spec(grid, print_grid_minor_text, print_grid_major_text);
  
---- xfig.3.2.5/f_readppm.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
-+++ xfig.3.2.5/f_readppm.c	2007-04-16 14:05:22.000000000 +0200
-@@ -34,10 +34,16 @@
- {
- 	char	 buf[BUFLEN],pcxname[PATH_MAX];
- 	FILE	*giftopcx;
--	int	 stat, size;
-+	int	 stat, size, fd;
- 
- 	/* make name for temp output file */
--	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pcxname)) == -1) {
-+	    file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
-+	    return FileInvalid;
-+	}
-+	close(fd);
-+
- 	/* make command to convert gif to pcx into temp file */
- 	sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
- 	if ((giftopcx = popen(buf,"w" )) == 0) {
---- xfig.3.2.5/f_readgif.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
-+++ xfig.3.2.5/f_readgif.c	2007-04-16 14:05:22.000000000 +0200
-@@ -76,7 +76,7 @@
- 	char		buf[BUFLEN],pcxname[PATH_MAX];
- 	FILE		*giftopcx;
- 	struct Cmap 	localColorMap[MAX_COLORMAP_SIZE];
--	int		i, stat, size;
-+	int		i, stat, size, fd;
- 	int		useGlobalColormap;
- 	unsigned int	bitPixel, red, green, blue;
- 	unsigned char	c;
-@@ -173,7 +173,13 @@
- 	/* now call giftopnm and ppmtopcx */
- 
- 	/* make name for temp output file */
--	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pcxname)) == -1) {
-+		file_msg("Cannot create temporary file\n");
-+		return FileInvalid;
-+	}
-+	close(fd);
-+
- 	/* make command to convert gif to pcx into temp file */
- 	sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
- 	if ((giftopcx = popen(buf,"w" )) == 0) {
---- xfig.3.2.5/w_srchrepl.c.mkstemp	2005-07-26 18:40:02.000000000 +0200
-+++ xfig.3.2.5/w_srchrepl.c	2007-04-16 14:05:22.000000000 +0200
+diff -urNad xfig~/w_srchrepl.c xfig/w_srchrepl.c
+--- xfig~/w_srchrepl.c
++++ xfig/w_srchrepl.c
 @@ -788,7 +788,7 @@
    char	 *cmd;
    char	  str[300];
@@ -244,68 +319,3 @@
      file_msg("Can't open temporary file: %s: %s\n", filename, strerror(errno));
    } else {
      /* locate all text objects and write them to file fp */
---- xfig.3.2.5/f_readeps.c.mkstemp	2005-10-31 18:40:38.000000000 +0100
-+++ xfig.3.2.5/f_readeps.c	2007-04-16 14:19:32.000000000 +0200
-@@ -250,11 +250,10 @@
-     int         urx, llx, ury, lly;
-     int         pdf_flag;
- {
--    static	tempseq = 0;
-     char        buf[300];
-     FILE       *tmpfp, *pixfile, *gsfile;
-     char       *psnam, *driver;
--    int         status, wid, ht, nbitmap;
-+    int         status, wid, ht, nbitmap, fd;
-     char        tmpfile[PATH_MAX],
- 		pixnam[PATH_MAX],
- 		errnam[PATH_MAX],
-@@ -270,8 +269,12 @@
- 	/* re-open the pipe */
- 	close_picfile(file, filetype);
- 	file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
--	sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
--	if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
-+   snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
-+   if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
-+       if (fd != -1) {
-+         unlink(tmpfile);
-+         close(fd);
-+       }
- 	    file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
- 	    return False;
- 	}
-@@ -280,10 +283,20 @@
- 	fclose(tmpfp);
-     }
-     /* make name /TMPDIR/xfig-pic######.pix */
--    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
-+    snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
-+    if ((fd = mkstemp(pixnam)) == -1) {
-+        file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
-+        return False;
-+    }
-+    close(fd);
-+
-     /* and file name for any error messages from gs */
--    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
--    tempseq++;
-+    snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
-+    if ((fd = mkstemp(errnam)) == -1) {
-+       file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
-+       return False;
-+    }
-+    close(fd);
- 
-     /* generate gs command line */
-     /* for monochrome, use pbm */
---- xfig.3.2.5/mode.c.mkstemp	2005-07-26 18:40:00.000000000 +0200
-+++ xfig.3.2.5/mode.c	2007-04-16 14:05:22.000000000 +0200
-@@ -86,7 +86,7 @@
- 
- int		cur_exp_lang;		/* gets initialized in main.c */
- Boolean		batch_exists = False;
--char		batch_file[32];
-+char		batch_file[PATH_MAX];
- 
- /*******************************************************************/
- /* If you change the order of the lang_items[] you must change the */

xfig-3.2.5-rh490257.patch:

Index: xfig-3.2.5-rh490257.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-rh490257.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-rh490257.patch	15 Mar 2009 15:46:22 -0000	1.1
+++ xfig-3.2.5-rh490257.patch	1 Apr 2009 14:43:46 -0000	1.2
@@ -1,5 +1,6 @@
---- xfig.3.2.5/w_util.c	2007-01-16 18:58:18.000000000 +0100
-+++ xfig.3.2.5.wip/w_util.c	2009-03-15 13:31:47.000000000 +0100
+diff -urNad xfig~/w_util.c xfig/w_util.c
+--- xfig~/w_util.c
++++ xfig/w_util.c
 @@ -932,21 +932,23 @@
      DeclareArgs(4);
      spin_struct *spins = (spin_struct*) info;

xfig-3.2.5-rh490259.patch:

Index: xfig-3.2.5-rh490259.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-rh490259.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfig-3.2.5-rh490259.patch	19 Mar 2009 14:59:10 -0000	1.2
+++ xfig-3.2.5-rh490259.patch	1 Apr 2009 14:43:46 -0000	1.3
@@ -1,14 +1,7 @@
 diff -urN xfig.3.2.5.orig/w_msgpanel.c xfig.3.2.5/w_msgpanel.c
 --- xfig.3.2.5.orig/w_msgpanel.c	2005-07-26 18:40:01.000000000 +0200
 +++ xfig.3.2.5/w_msgpanel.c	2009-03-19 14:21:11.000000000 +0100
-@@ -86,12 +86,14 @@
- {
-     /* now the message panel */
-     FirstArg(XtNfont, roman_font);
--    FirstArg(XtNwidth, MSGPANEL_WD);
-+    NextArg(XtNwidth, MSGPANEL_WD);
-     NextArg(XtNheight, MSGPANEL_HT);
-     NextArg(XtNstring, "\0");
+@@ -86,6 +86,8 @@
      NextArg(XtNfromVert, cmd_form);
      NextArg(XtNvertDistance, -INTERNAL_BW);
      NextArg(XtNborderWidth, INTERNAL_BW);

xfig-3.2.5-zoom-crash.patch:

Index: xfig-3.2.5-zoom-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig-3.2.5-zoom-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig-3.2.5-zoom-crash.patch	12 Dec 2007 19:34:13 -0000	1.1
+++ xfig-3.2.5-zoom-crash.patch	1 Apr 2009 14:43:47 -0000	1.2
@@ -1,16 +1,7 @@
-diff -up xfig.3.2.5/w_rulers.c~ xfig.3.2.5/w_rulers.c
---- xfig.3.2.5/w_rulers.c~	2007-12-12 20:28:30.000000000 +0100
-+++ xfig.3.2.5/w_rulers.c	2007-12-12 20:28:30.000000000 +0100
-@@ -1166,7 +1166,7 @@ void reset_topruler(void)
-     register int    i,k;
-     register tick_info* tk;
-     register Pixmap p = topruler_pm;
--    char	    number[6];
-+    char	    number[16];
-     int		    X0,len;
-     int		    tickmod, tickskip;
- 
-@@ -1183,7 +1183,7 @@ void reset_topruler(void)
+diff -urNad xfig~/w_rulers.c xfig/w_rulers.c
+--- xfig~/w_rulers.c
++++ xfig/w_rulers.c
+@@ -1183,7 +1183,7 @@
  	tickmod = 1;
  
      /* see how big a label is to adjust spacing, if necessary */
@@ -19,7 +10,7 @@
      len = XTextWidth(roman_font, number, strlen(number));
      while (skipx < (len + 5)/zoomscale) {
  	skip *= 2;
-@@ -1197,11 +1197,11 @@ void reset_topruler(void)
+@@ -1197,11 +1197,11 @@
        /* string */
        if (i % skipx == 0) {
          if ((i/10) % tickmod == 0)
@@ -34,16 +25,7 @@
  	/* get length of string to position it */
  	len = XTextWidth(roman_font, number, strlen(number));
          /* we center on the number only, letting the minus sign hang out */
-@@ -1425,7 +1425,7 @@ void reset_sideruler(void)
-     register int    i,k;
-     register tick_info* tk;
-     register Pixmap p = sideruler_pm;
--    char	    number[6],len;
-+    char	    number[16],len;
-     int		    Y0;
-     int		    tickmod, tickskip;
- 
-@@ -1456,11 +1456,11 @@ void reset_sideruler(void)
+@@ -1456,11 +1456,11 @@
        /* string */
        if (i % skipx == 0) {
          if ((i/10) % tickmod == 0)

xfig.3.2.5-Xaw3d.patch:

Index: xfig.3.2.5-Xaw3d.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig.3.2.5-Xaw3d.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig.3.2.5-Xaw3d.patch	16 Apr 2007 13:15:16 -0000	1.1
+++ xfig.3.2.5-Xaw3d.patch	1 Apr 2009 14:43:47 -0000	1.2
@@ -1,11 +1,12 @@
---- xfig.3.2.5/Imakefile.Xaw3d	2007-04-16 14:56:58.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:57:26.000000000 +0200
-@@ -50,7 +50,7 @@
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
+diff -up xfig.3.2.5a/Imakefile.Xaw3d xfig.3.2.5a/Imakefile
+--- xfig.3.2.5a/Imakefile.Xaw3d	2009-03-27 16:32:20.000000000 +0100
++++ xfig.3.2.5a/Imakefile	2009-03-27 16:33:20.000000000 +0100
+@@ -50,7 +50,7 @@ XAPPLOADDIR = /usr/share/X11/app-default
+ XCOMM Comment out the following definition for XAW3D if you don't to want to use
+ XCOMM the 3d Athena Widget Set
  
 -#define XAW3D
 +XCOMM #define XAW3D
  
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+ #ifdef XAW3D
+ XAWLIB = -lXaw3d

xfig.3.2.5-modularX.patch:

Index: xfig.3.2.5-modularX.patch
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig.3.2.5-modularX.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig.3.2.5-modularX.patch	16 Apr 2007 13:15:16 -0000	1.1
+++ xfig.3.2.5-modularX.patch	1 Apr 2009 14:43:47 -0000	1.2
@@ -1,15 +1,16 @@
---- xfig.3.2.5/Imakefile.modularX	2007-04-16 14:27:49.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:29:18.000000000 +0200
-@@ -45,7 +45,7 @@
+diff -up xfig.3.2.5a/Imakefile~ xfig.3.2.5a/Imakefile
+--- xfig.3.2.5a/Imakefile~	2009-03-27 15:31:02.000000000 +0100
++++ xfig.3.2.5a/Imakefile	2009-03-27 15:35:44.000000000 +0100
+@@ -45,7 +45,7 @@ XCOMM Don't set the DESTDIR variable unl
  XCOMM different tree than the "correct" tree that your X system expects. The usual
  XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
  
 -XCOMM XAPPLOADDIR = /home/user/xfig
 +XAPPLOADDIR = /usr/share/X11/app-defaults
  
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -166,14 +166,14 @@
+ XCOMM Comment out the following definition for XAW3D if you don't to want to use
+ XCOMM the 3d Athena Widget Set
+@@ -169,14 +169,14 @@ XCOMM be sure to comment out the second 
  XCOMM XFIGLIBDIR = $(LIBDIR)
  
  XCOMM use this if you want the multi-key data base file in the standard X11 tree
@@ -23,6 +24,6 @@
  XCOMM if you want the man pages installed in the standard place on your system
 -MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
 +MANDIR = /usr/share/man/man1
+ XCOMM MANDIR = /usr/local/xfig/man
  
  XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR


Index: xfig.sh
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfig.sh	16 Nov 2007 19:58:04 -0000	1.1
+++ xfig.sh	1 Apr 2009 14:43:47 -0000	1.2
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 if [ -x /usr/bin/xfig-Xaw3d ]; then
-    cd /usr/share/X11/app-defaults
-    xrdb -merge Fig-color 2> /dev/null
-    cd - > /dev/null
     exec xfig-Xaw3d "$@"
 else
     exec xfig-plain "$@"


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xfig.spec	16 Mar 2009 09:48:19 -0000	1.54
+++ xfig.spec	1 Apr 2009 14:43:47 -0000	1.55
@@ -3,30 +3,31 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 17%{?dist}
+Release: 18.a%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
-Source0: http://www.xfig.org/xfigdist/xfig.%{version}.full.tar.gz
+# The new upstream 3.2.5a release was made available to me (Hans) by the Debian
+# maintainer who is in contact with upstream, which appearantly is still
+# somewhat alive (but not alive enough to put the tarbal on the homepage ??)
+Source0: xfig.%{version}a.tar.gz
 Source1: xfig.png
 Source2: xfig.desktop
 Source3: xfig.sh
 
-Patch0: xfig-3.2.4-redhat.patch
+Patch0: xfig-3.2.5a-default-apps.patch
 Patch1: xfig-3.2.5-fhs.patch
 Patch2: xfig-3.2.5-mkstemp.diff
 Patch7: xfig.3.2.5-modularX.patch
 Patch9: xfig.3.2.5-Xaw3d.patch
 Patch10: xfig-3.2.5-enable-Xaw3d.patch
 Patch11: xfig-3.2.5-color-resources.patch
-Patch12: xfig-3.2.5-quiet.patch
 Patch13: xfig-3.2.5-urwfonts.patch
 Patch14: xfig-3.2.5-zoom-crash.patch
 Patch15: xfig-3.2.5-missing-protos.patch
 Patch17: xfig-3.2.5-rh490257.patch
 Patch18: xfig-3.2.5-rh490259.patch
 Patch19: xfig-3.2.5-debian.patch
-Patch20: xfig-3.2.5-crash-on-char-from-charmap.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -91,7 +92,7 @@
 
 
 %prep
-%setup -q -n xfig.%{version}
+%setup -q -n xfig.%{version}a
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .fhs
 %patch2 -p1 -b .mkstemp
@@ -99,24 +100,13 @@
 %patch9 -p1 -b .Xaw3d
 %patch10 -p1 -b .no-Xaw3d
 %patch11 -p1 -b .color-resources
-%patch12 -p1 -b .quiet
 %patch13 -p1 -b .urw
 %patch14 -p1 -b .zoom-crash
 %patch15 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
-ln -nfs Doc/xfig.man xfig.man
-find -type f -print0 | xargs -0 chmod -x
-sed -i.save 's/\r//g' Doc/html/index.html
-touch -r Doc/html/index.html.save Doc/html/index.html
-rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
-for i in Doc/html/{new_features,new_features.3.2.4,bugs_fixed.3.2.4}.html; do
-  iconv -f ISO-8859-1 -t UTF8 $i > $i.UTF-8
-  touch -r $i $i.UTF-8
-  mv $i.UTF-8 $i
-done
+rm Doc/html/images/sav1a0.tmp
 
 
 %build
@@ -204,6 +194,12 @@
 
 
 %changelog
+* Fri Mar 27 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-18.a
+- Rebase to new upstream 3.2.5a release, this was made available to me by
+  the Debian maintainer who is in contact with upstream, which appearantly
+  is still somewhat alive (but not alive enough to put the tarbal on the
+  homepage ??)
+
 * Sun Mar 15 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-17
 - Add various patches from Debian (doc updates, new figures in the lib,
   better fix for modepanel resizing)


--- xfig-3.2.5-crash-on-char-from-charmap.patch DELETED ---


--- xfig-3.2.5-quiet.patch DELETED ---



From jreznik at fedoraproject.org  Wed Apr  1 14:49:23 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed,  1 Apr 2009 14:49:23 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.103,1.104
Message-ID: <20090401144923.C214F7011D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18452

Modified Files:
	kdeartwork.spec 
Log Message:
* Tue Mar 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.2-2
- split wallpapers and sounds                                   
- noarch subpackages



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdeartwork.spec	31 Mar 2009 11:22:52 -0000	1.103
+++ kdeartwork.spec	1 Apr 2009 14:48:53 -0000	1.104
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -41,6 +41,7 @@
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
+BuildArch: noarch
 %description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
@@ -52,6 +53,7 @@
 Provides: kdeclassic-icon-theme = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
+BuildArch: noarch
 %description icons
 This contains icon themes:
 * kdeclassic
@@ -73,6 +75,21 @@
 %description kxs
 %{summary}.
 
+%package wallpapers
+Summary: Additional wallpapers
+Group: Amusements/Graphics
+Requires: kdebase-workspace >= %{version}
+BuildArch: noarch
+%description wallpapers
+%{summary}.
+
+%package sounds
+Summary: Additional sounds
+Group: Amusements/Graphics
+Requires: kdebase-workspace >= %{version}
+BuildArch: noarch
+%description sounds
+%{summary}.
 
 %prep
 %setup -q
@@ -132,15 +149,12 @@
 %endif
 %endif
 
-
 %if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/*
 %{_kde4_datadir}/emoticons/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/styles/
 
@@ -152,6 +166,14 @@
 %files kxs
 %defattr(-,root,root,-)
 %{_bindir}/kxs*
+
+%files wallpapers
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/*
+
+%files sounds
+%defattr(-,root,root,-)
+%{_kde4_datadir}/sounds/*
 %endif
 
 %if 0%{?icons}
@@ -166,8 +188,11 @@
 %endif
 %endif
 
-
 %changelog
+* Tue Mar 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.2-2
+- split wallpapers and sounds
+- noarch subpackages
+
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From s4504kr at fedoraproject.org  Wed Apr  1 14:50:51 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  1 Apr 2009 14:50:51 +0000 (UTC)
Subject: rpms/ksplice/devel ksplice.spec,1.15,1.16
Message-ID: <20090401145051.43F6A7011D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18847

Modified Files:
	ksplice.spec 
Log Message:
Changing from ExcludeArch to ExclusiveArch


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ksplice.spec	11 Mar 2009 18:01:30 -0000	1.15
+++ ksplice.spec	1 Apr 2009 14:50:20 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		ksplice
 Version:	0.9.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
 Group:		System Environment/Kernel
@@ -13,7 +13,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch:	ppc64, ppc
+ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	autoconf
 BuildRequires:	binutils-devel, perl
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.7-3
+- Change from ExcludeArch to ExclusiveArch
+
 * Wed Mar 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.7-2
 - New upstream release
 



From sindrepb at fedoraproject.org  Wed Apr  1 14:52:27 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 14:52:27 +0000 (UTC)
Subject: rpms/python-imdb/devel python-imdb.spec,1.7,1.8
Message-ID: <20090401145227.0CB587013C@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19289

Modified Files:
	python-imdb.spec 
Log Message:
fixes


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/devel/python-imdb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imdb.spec	1 Apr 2009 03:33:25 -0000	1.7
+++ python-imdb.spec	1 Apr 2009 14:51:56 -0000	1.8
@@ -4,9 +4,9 @@
 %define realname IMDbPY
 
 Name:           python-imdb
-Provides:       IMDBpy = %{version}-%{release}
+Provides:       IMDbPY = %{version}-%{release}
 Version:        4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-5
+- Fix typo in Provides:
+
 * Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-4
 - Add Provides: upstream name
 - Add missing python-setuptools buildrequires



From sindrepb at fedoraproject.org  Wed Apr  1 14:54:12 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 14:54:12 +0000 (UTC)
Subject: rpms/python-imdb/F-10 python-imdb.spec,1.2,1.3
Message-ID: <20090401145412.C962D7011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20149

Modified Files:
	python-imdb.spec 
Log Message:
fix casing in provides


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/F-10/python-imdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-imdb.spec	1 Apr 2009 03:57:51 -0000	1.2
+++ python-imdb.spec	1 Apr 2009 14:53:42 -0000	1.3
@@ -4,9 +4,9 @@
 %define realname IMDbPY
 
 Name:           python-imdb
-Provides:       IMDBpy = %{version}-%{release}
+Provides:       IMDbPY = %{version}-%{release}
 Version:        4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-5
+- Fix typo in Provides:
+
 * Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 4.0-4
 - Add Provides: upstream name
 - Add missing python-setuptools buildrequires



From mlichvar at fedoraproject.org  Wed Apr  1 15:00:46 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  1 Apr 2009 15:00:46 +0000 (UTC)
Subject: rpms/mutt/devel mutt-1.5.19-inodesort.patch, NONE,
	1.1 mutt-1.5.19-realpath.patch, NONE,
	1.1 mutt-1.5.19-saslcb.patch, NONE, 1.1 mutt.spec, 1.60, 1.61
Message-ID: <20090401150046.D53C67011D@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21538

Modified Files:
	mutt.spec 
Added Files:
	mutt-1.5.19-inodesort.patch mutt-1.5.19-realpath.patch 
	mutt-1.5.19-saslcb.patch 
Log Message:
- use PATH_MAX for buffers passed to realpath (#492861)
- unconditionally inode-sort Maildir and MH folders
- restore connection polling callback when closing SASL connection


mutt-1.5.19-inodesort.patch:

--- NEW FILE mutt-1.5.19-inodesort.patch ---
# HG changeset patch
# User Rocco Rutte <pdmef at gmx.net>
# Date 1233066304 -3600
# Branch HEAD
# Node ID eb918af802ec62136f5a522dcb1ac18cb470d4ac
# Parent  da94a92c3ba0ec7718c78a1c60d62931d13b062f
Unconditionally inode-sort Maildir and MH folders. Closes #3166.

diff -r da94a92c3ba0 -r eb918af802ec mh.c
--- a/mh.c	Mon Jan 26 12:32:30 2009 -0800
+++ b/mh.c	Tue Jan 27 15:25:04 2009 +0100
@@ -1027,13 +1027,14 @@
     if (!ctx->quiet && progress)
       mutt_progress_update (progress, count, -1);
 
+    DO_SORT();
+
     snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path);
 
 #if USE_HCACHE
     if (option(OPTHCACHEVERIFY))
     {
-      DO_SORT();
-      ret = stat(fn, &lastchanged);
+       ret = stat(fn, &lastchanged);
     }
     else
     {
@@ -1057,7 +1058,6 @@
     {
 #endif /* USE_HCACHE */
 
-    DO_SORT();
     if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h))
     {
       p->header_parsed = 1;

mutt-1.5.19-realpath.patch:

--- NEW FILE mutt-1.5.19-realpath.patch ---
# HG changeset patch
# User Miroslav Lichvar <mlichvar at redhat.com>
# Date 1238589215 -7200
# Branch HEAD
# Node ID 8205a12329d395b87eeb890cb86d28e761e83992
# Parent  47c64fd9ac708fee9f4969e571c42e105287596e
Use PATH_MAX for buffers passed to realpath(3) as we're supposed to

diff -r 47c64fd9ac70 -r 8205a12329d3 hcache.c
--- a/hcache.c	Wed Apr 01 13:16:35 2009 +0200
+++ b/hcache.c	Wed Apr 01 14:33:35 2009 +0200
@@ -836,7 +836,7 @@
    * to ensure equivalent paths share the hcache */
   if (stat (folder, &st) == 0)
   {
-    p = safe_malloc (_POSIX_PATH_MAX+1);
+    p = safe_malloc (PATH_MAX+1);
     if (!realpath (folder, p))
       mutt_str_replace (&p, folder);
   } else
diff -r 47c64fd9ac70 -r 8205a12329d3 muttlib.c
--- a/muttlib.c	Wed Apr 01 13:16:35 2009 +0200
+++ b/muttlib.c	Wed Apr 01 14:33:35 2009 +0200
@@ -759,7 +759,7 @@
   char *p = s, *q = s;
   size_t len;
   url_scheme_t scheme;
-  char tmp[_POSIX_PATH_MAX];
+  char tmp[PATH_MAX];
 
   scheme = url_check_scheme (s);
 

mutt-1.5.19-saslcb.patch:

--- NEW FILE mutt-1.5.19-saslcb.patch ---
# HG changeset patch
# User Roman Kraevskiy <rkraevskiy at gmail.com>
# Date 1237455364 -3600
# Branch HEAD
# Node ID 6fac57b97bf1e829d1bfdf643583f5921e153fea
# Parent  17d770ae41e4bc94527181dc62072564b9fbd252
Restore connection polling callback when closing SASL connection. Closes #3206.

diff -r 17d770ae41e4 -r 6fac57b97bf1 mutt_sasl.c
--- a/mutt_sasl.c	Wed Mar 18 14:48:07 2009 +0100
+++ b/mutt_sasl.c	Thu Mar 19 10:36:04 2009 +0100
@@ -481,6 +481,7 @@
   conn->conn_close = sasldata->msasl_close;
   conn->conn_read = sasldata->msasl_read;
   conn->conn_write = sasldata->msasl_write;
+  conn->conn_poll = sasldata->msasl_poll;
 
   /* release sasl resources */
   sasl_dispose (&sasldata->saslconn);


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mutt.spec	26 Feb 2009 03:29:14 -0000	1.60
+++ mutt.spec	1 Apr 2009 15:00:16 -0000	1.61
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.19
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -28,6 +28,9 @@
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
 Patch7: mutt-1.5.19-db47.patch
+Patch8: mutt-1.5.19-realpath.patch
+Patch9: mutt-1.5.19-inodesort.patch
+Patch10: mutt-1.5.19-saslcb.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +70,9 @@
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
 %patch7 -p1 -b .db47
+%patch8 -p1 -b .realpath
+%patch9 -p1 -b .inodesort
+%patch10 -p1 -b .saslcb
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
@@ -142,6 +148,11 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Apr 01 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.19-4
+- use PATH_MAX for buffers passed to realpath (#492861)
+- unconditionally inode-sort Maildir and MH folders
+- restore connection polling callback when closing SASL connection
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.5.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lennart at fedoraproject.org  Wed Apr  1 15:04:09 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  1 Apr 2009 15:04:09 +0000 (UTC)
Subject: rpms/pulseaudio/devel
	0001-load-bt-discover-module-only-when-installed.patch, NONE,
	1.1 pulseaudio.spec, 1.77, 1.78
Message-ID: <20090401150409.A68137011D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22347

Modified Files:
	pulseaudio.spec 
Added Files:
	0001-load-bt-discover-module-only-when-installed.patch 
Log Message:
Only load bt modules when installed

0001-load-bt-discover-module-only-when-installed.patch:

--- NEW FILE 0001-load-bt-discover-module-only-when-installed.patch ---
>From dcb24f5068f54f0fd3c30b691b8e3735973d008b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Wed, 1 Apr 2009 16:15:27 +0200
Subject: [PATCH] load bt discover module only when installed

---
 src/daemon/default.pa.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 57ccd9f..fa0683e 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -58,9 +58,9 @@ load-module module-detect
 .endif
 
 ### Automatically load driver modules for Bluetooth hardware
-#.ifexists module-bluetooth-discover at PA_SOEXT@
+.ifexists module-bluetooth-discover at PA_SOEXT@
 load-module module-bluetooth-discover
-#.endif
+.endif
 
 ### Load several protocols
 .ifexists module-esound-protocol-unix at PA_SOEXT@
-- 
1.6.2



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- pulseaudio.spec	1 Apr 2009 01:25:55 -0000	1.77
+++ pulseaudio.spec	1 Apr 2009 15:03:38 -0000	1.78
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	7.test7%{?dist}
+Release:	8.test7%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz
@@ -49,6 +49,7 @@
 Obsoletes:	pulseaudio-core-libs
 Provides:	pulseaudio-core-libs
 Requires:	udev-extras
+Patch0:		0001-load-bt-discover-module-only-when-installed.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -186,6 +187,7 @@
 
 %prep
 %setup -q -T -b0 -n pulseaudio-0.9.15-test7
+%patch0 -p1 -b .load-bt-discover-module-only-when-installed
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -406,6 +408,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-8.test7
+- Only load bt modules when installed
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-7.test7
 - New test release
 



From itamarjp at fedoraproject.org  Wed Apr  1 15:15:11 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed,  1 Apr 2009 15:15:11 +0000 (UTC)
Subject: rpms/knemo/F-9 import.log,1.3,1.4 knemo.spec,1.16,1.17
Message-ID: <20090401151511.406CE7011D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/knemo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24209/F-9

Modified Files:
	import.log knemo.spec 
Log Message:
fix dist-tag



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	17 Mar 2009 16:04:23 -0000	1.3
+++ import.log	1 Apr 2009 15:14:39 -0000	1.4
@@ -1,3 +1,4 @@
 knemo-0_5_1-4_fc10:F-9:knemo-0.5.1-4.fc10.src.rpm:1237296007
 knemo-0_5_1-4_fc10_1:F-9:knemo-0.5.1-4.fc10.1.src.rpm:1237300010
 knemo-0_5_1-5_fc10:F-9:knemo-0.5.1-5.fc10.src.rpm:1237305813
+knemo-0_5_2-2_fc11:F-9:knemo-0.5.2-2.fc11.src.rpm:1238598787


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-9/knemo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- knemo.spec	1 Apr 2009 13:31:11 -0000	1.16
+++ knemo.spec	1 Apr 2009 15:14:39 -0000	1.17
@@ -1,6 +1,6 @@
 Name:             knemo
 Version:          0.5.2
-Release:          1%{?dist}.1
+Release:          2%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
 License:          GPLv2+
@@ -67,6 +67,9 @@
 %{_kde4_iconsdir}/hicolor/*/apps/knemo.*
 
 %changelog
+* Wed Apr 01 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br>  - 0.5.2-2
+- fix dist-tag
+
 * Wed Apr  1 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.2-1.1
 - Update to version 0.5.2
 - Fixed spec License and URL fields



From rdieter at fedoraproject.org  Wed Apr  1 15:21:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 15:21:56 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.107,1.108
Message-ID: <20090401152156.92CA87011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25523

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- -flags subpkg
- koji/noarch hacks dropped



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdebase-runtime.spec	1 Apr 2009 14:43:22 -0000	1.107
+++ kdebase-runtime.spec	1 Apr 2009 15:21:26 -0000	1.108
@@ -2,10 +2,7 @@
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %global kde3_desktop 1
 %else
-# curently broken due to noarch build of oxygen-icon-theme
-# when oxygen-icon-theme review is done, they can be omitted from 
-# here, and flags be re-enabled.
-#define flags 1
+%define flags 1 
 %endif
 
 Name:          kdebase-runtime
@@ -27,15 +24,18 @@
 
 ## Upstream patches
 
-%ifarch noarch
-%define icons 1
-%define icons_svg 1
-%else
+#ifarch noarch
+## icons now provided by standalone oxygen-icon-theme
+#define icons 1
+#define icons_svg 1
+#else
 %define rest 1
-%endif
+#endif
 
 # when kdesu was removed, this is/should-be only temporary
+%if 0%{?fedora} < 10
 Conflicts: kdebase3 < 3.5.10-4
+%endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #??KHelpcenter requires htdig for building search indices
@@ -92,9 +92,9 @@
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-#if 0%{?fedora} > 9
-#BuildArch: noarch
-#endif
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description flags 
 %{summary}.
 
@@ -102,6 +102,9 @@
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
 %{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme
 %{summary}.
 
@@ -109,6 +112,9 @@
 Summary: Oxygen icon theme, scalable(svg) icons
 Group: User Interface/Desktops
 Requires: oxygen-icon-theme = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
@@ -380,6 +386,10 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- -flags subpkg
+- koji/noarch hacks dropped
+
 * Wed Apr 01 2009 Than Ngo <than at redhat.com> - 4.2.2-2
 - drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch
 



From oget at fedoraproject.org  Wed Apr  1 15:27:00 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 15:27:00 +0000 (UTC)
Subject: rpms/unalz/devel unalz-optflags.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 unalz.spec, 1.2, 1.3
Message-ID: <20090401152700.8E9727011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/unalz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27239

Modified Files:
	.cvsignore sources unalz.spec 
Added Files:
	unalz-optflags.patch 
Log Message:
* Wed Apr 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.65-1
- Update to 0.65


unalz-optflags.patch:

--- NEW FILE unalz-optflags.patch ---
--- unalz.old/Makefile	2009-04-01 11:11:34.000000000 -0400
+++ unalz/Makefile	2009-04-01 11:21:29.000000000 -0400
@@ -82,3 +82,14 @@ bzip2/huffman.o: bzip2/huffman.c
 bzip2/randtable.o: bzip2/randtable.c
 	$(CC) -c bzip2/randtable.c -o bzip2/randtable.o $(CFLAGS)
 
+main.o: main.cpp
+	$(CPP) -c main.cpp -o main.o $(CFLAGS)
+
+UnAlz.o: UnAlz.cpp
+	$(CPP) -c main.cpp -o UnAlz.o $(CFLAGS)
+
+UnAlzUtils.o: UnAlzUtils.cpp
+	$(CPP) -c UnAlzUtils.cpp -o UnAlzUtils.o $(CFLAGS)
+
+UnAlzBzip2.o: UnAlzBzip2.cpp
+	$(CPP) -c UnAlzBzip2.cpp -o UnAlzBzip2.o $(CFLAGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Feb 2009 22:56:46 -0000	1.2
+++ .cvsignore	1 Apr 2009 15:26:29 -0000	1.3
@@ -1 +1 @@
-unalz-0.64.tgz
+unalz-0.65.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Feb 2009 22:56:46 -0000	1.2
+++ sources	1 Apr 2009 15:26:30 -0000	1.3
@@ -1 +1 @@
-2c78c7a803e897fae4281f13ad0e232b  unalz-0.64.tgz
+e4db2c4e3c8f6f5ee414b68bc55288e5  unalz-0.65.tgz


Index: unalz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/devel/unalz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unalz.spec	25 Feb 2009 22:50:12 -0000	1.2
+++ unalz.spec	1 Apr 2009 15:26:30 -0000	1.3
@@ -1,13 +1,14 @@
 Summary: Decompression utility
 Name: unalz
-Version: 0.64
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 License: zlib and BSD
 Group: Applications/File
 URL: http://www.kipple.pe.kr/win/unalz/
 Source0: http://www.kipple.pe.kr/win/unalz/%{name}-%{version}.tgz
 # We are using the internal zlib
 Patch0: unalz-internal-zlib.patch
+Patch1: unalz-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
 
@@ -19,6 +20,8 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .zlib
+%patch1 -p1 -b .optflags
+
 rm -fr zlib
 
 # Fix permissions and encoding issues
@@ -31,7 +34,9 @@
 done
 
 %build
-make %{?_smp_mflags} linux-utf8 CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} linux-utf8
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -47,6 +52,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Wed Apr 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.65-1
+- Update to 0.65
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.64-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Apr  1 15:30:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 15:30:13 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.108,1.109
Message-ID: <20090401153013.37AD27011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27764

Modified Files:
	kdebase-runtime.spec 
Log Message:
Release++
fix Conflicts: kdebase3 logic



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- kdebase-runtime.spec	1 Apr 2009 15:21:26 -0000	1.108
+++ kdebase-runtime.spec	1 Apr 2009 15:29:42 -0000	1.109
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -33,7 +33,7 @@
 #endif
 
 # when kdesu was removed, this is/should-be only temporary
-%if 0%{?fedora} < 10
+%if 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 



From clumens at fedoraproject.org  Wed Apr  1 15:30:28 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  1 Apr 2009 15:30:28 +0000 (UTC)
Subject: rpms/booty/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE booty.spec, 1.86, NONE sources, 1.82, NONE
Message-ID: <20090401153028.0875A7011D@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/booty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27948

Added Files:
	dead.package 
Removed Files:
	Makefile booty.spec sources 
Log Message:
booty is no longer a separate package.



--- NEW FILE dead.package ---
Obsoleted by anaconda.


--- Makefile DELETED ---


--- booty.spec DELETED ---


--- sources DELETED ---



From rvinyard at fedoraproject.org  Wed Apr  1 15:32:45 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:32:45 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.17,1.18
Message-ID: <20090401153245.CB8C57011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28279

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bit.spec	1 Apr 2009 13:49:50 -0000	1.17
+++ bit.spec	1 Apr 2009 15:32:15 -0000	1.18
@@ -75,7 +75,7 @@
 
 # Fix documentation installation and put bit-gtkmm docs under gtk-doc
 %{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/
-%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/ doc/reference/bit-gtkmm/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/ doc/reference/bit-gtkmm/html/*
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -119,6 +119,10 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
+- Changed Sourceforge URL to downloads.sf.net from download.sf.net
+- Added -p to doc installs
+
 * Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-7
 - And readd the bit-gtkmm-devel -> bit-gtkmm dep, since the guidelines
   require it.



From rvinyard at fedoraproject.org  Wed Apr  1 15:33:17 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:33:17 +0000 (UTC)
Subject: rpms/bit/F-10 bit.spec,1.14,1.15
Message-ID: <20090401153317.D120B7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28454

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-10/bit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bit.spec	6 Feb 2009 19:17:44 -0000	1.14
+++ bit.spec	1 Apr 2009 15:32:47 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          4%{?dist}
+Release:          7%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -50,6 +50,7 @@
 Summary:          Development files to support gtkmm UI widgets for bit stream processing
 Group:            Development/Libraries
 Requires:         bit-gtkmm = %{version}-%{release}
+Requires:         bit-devel = %{version}-%{release}
 Requires:         gtkmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Provides:         bitgtkmm-devel = %{version}
@@ -74,7 +75,7 @@
 
 # Fix documentation installation and put bit-gtkmm docs under gtk-doc
 %{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/
-%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/ doc/reference/bit-gtkmm/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/ doc/reference/bit-gtkmm/html/*
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -118,6 +119,20 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
+- Changed Sourceforge URL to downloads.sf.net from download.sf.net
+- Added -p to doc installs
+
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-7
+- And readd the bit-gtkmm-devel -> bit-gtkmm dep, since the guidelines
+  require it.
+
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-6
+- Fix unowned directory (#473629) by fixing the dependency on bit-devel
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.90-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-4
 - Fix directory ownership issue
 



From rvinyard at fedoraproject.org  Wed Apr  1 15:33:30 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:33:30 +0000 (UTC)
Subject: rpms/bit/F-9 bit.spec,1.10,1.11
Message-ID: <20090401153330.310BA7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28512

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-9/bit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bit.spec	3 Nov 2008 20:05:54 -0000	1.10
+++ bit.spec	1 Apr 2009 15:32:59 -0000	1.11
@@ -1,7 +1,7 @@
-Summary:          Bit is a C++ library to simplify bit stream parsing
+Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          2%{?dist}
+Release:          7%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -21,7 +21,7 @@
 fields that are not necessarily octet (byte) oriented.
 
 %package          devel
-Summary:          Support files for developing programs that will use the bit library
+Summary:          C++ development files to simplify bit stream parsing
 Group:            Development/Libraries
 Requires:         bit = %{version}-%{release}
 Requires:         libxml++-devel >= 2.10.0
@@ -37,7 +37,7 @@
 developing applications that use the bit library.
 
 %package          gtkmm
-Summary:          This library contains gtkmm UI widgets to support the bit library
+Summary:          Gtkmm UI widgets to support bit stream processing
 Group:            System Environment/Libraries
 Requires:         bit = %{version}-%{release}
 Provides:         bitgtkmm = %{version}
@@ -47,9 +47,10 @@
 This package contains gtkmm widgets associated with the bit library.
 
 %package          gtkmm-devel
-Summary:          Support files for gtkmm applications that will use the bit-gtkmm UI widgets
+Summary:          Development files to support gtkmm UI widgets for bit stream processing
 Group:            Development/Libraries
 Requires:         bit-gtkmm = %{version}-%{release}
+Requires:         bit-devel = %{version}-%{release}
 Requires:         gtkmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Provides:         bitgtkmm-devel = %{version}
@@ -74,7 +75,7 @@
 
 # Fix documentation installation and put bit-gtkmm docs under gtk-doc
 %{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/
-%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/ doc/reference/bit-gtkmm/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/bit-gtkmm/ doc/reference/bit-gtkmm/html/*
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -99,6 +100,7 @@
 %{_libdir}/pkgconfig/bit-1.0.pc
 %{_includedir}/bit-0.4/bit.h
 %{_includedir}/bit-0.4/bit/
+%dir %{_includedir}/bit-0.4/
 %doc ChangeLog
 %doc doc/reference/bit/html/
 
@@ -117,6 +119,26 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
+- Changed Sourceforge URL to downloads.sf.net from download.sf.net
+- Added -p to doc installs
+
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-7
+- And readd the bit-gtkmm-devel -> bit-gtkmm dep, since the guidelines
+  require it.
+
+* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.90-6
+- Fix unowned directory (#473629) by fixing the dependency on bit-devel
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.90-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-4
+- Fix directory ownership issue
+
+* Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-3
+- Updated summaries
+
 * Mon Nov 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-2
 - Excluded ppc and ppc64 arches
 



From rvinyard at fedoraproject.org  Wed Apr  1 15:34:39 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:34:39 +0000 (UTC)
Subject: rpms/bit/F-10 bit.spec,1.15,1.16
Message-ID: <20090401153439.935FE7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28792

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-10/bit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bit.spec	1 Apr 2009 15:32:47 -0000	1.15
+++ bit.spec	1 Apr 2009 15:34:09 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries



From rvinyard at fedoraproject.org  Wed Apr  1 15:34:34 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:34:34 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.18,1.19
Message-ID: <20090401153434.122CB7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28760

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bit.spec	1 Apr 2009 15:32:15 -0000	1.18
+++ bit.spec	1 Apr 2009 15:34:03 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries



From rvinyard at fedoraproject.org  Wed Apr  1 15:34:46 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:34:46 +0000 (UTC)
Subject: rpms/bit/F-9 bit.spec,1.11,1.12
Message-ID: <20090401153446.DF94B7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28835

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-9/bit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bit.spec	1 Apr 2009 15:32:59 -0000	1.11
+++ bit.spec	1 Apr 2009 15:34:16 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries



From rvinyard at fedoraproject.org  Wed Apr  1 15:36:34 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:36:34 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.19,1.20
Message-ID: <20090401153634.866A97011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29139

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bit.spec	1 Apr 2009 15:34:03 -0000	1.19
+++ bit.spec	1 Apr 2009 15:36:04 -0000	1.20
@@ -119,7 +119,7 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
-* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
+* Wed Apr  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
 - Changed Sourceforge URL to downloads.sf.net from download.sf.net
 - Added -p to doc installs
 



From rvinyard at fedoraproject.org  Wed Apr  1 15:36:37 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:36:37 +0000 (UTC)
Subject: rpms/bit/F-9 bit.spec,1.12,1.13
Message-ID: <20090401153637.37A877011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29201

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-9/bit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bit.spec	1 Apr 2009 15:34:16 -0000	1.12
+++ bit.spec	1 Apr 2009 15:36:06 -0000	1.13
@@ -119,7 +119,7 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
-* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
+* Wed Apr  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
 - Changed Sourceforge URL to downloads.sf.net from download.sf.net
 - Added -p to doc installs
 



From rvinyard at fedoraproject.org  Wed Apr  1 15:36:39 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 15:36:39 +0000 (UTC)
Subject: rpms/bit/F-10 bit.spec,1.16,1.17
Message-ID: <20090401153639.B79F07011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29172

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-10/bit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bit.spec	1 Apr 2009 15:34:09 -0000	1.16
+++ bit.spec	1 Apr 2009 15:36:09 -0000	1.17
@@ -119,7 +119,7 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
-* Fri Feb 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
+* Wed Apr  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-8
 - Changed Sourceforge URL to downloads.sf.net from download.sf.net
 - Added -p to doc installs
 



From pkgdb at fedoraproject.org  Wed Apr  1 16:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:01:54 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160135.3C822208557@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:01:54 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160135.5566C208604@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:01:57 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160137.7406420860B@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:01:57 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160138.1AF412086EF@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:04 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160145.3D83320854A@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:06 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160147.23DF62086F1@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:07 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160148.38BCB2086FF@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:08 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160149.42AFF208703@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:01:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:01:51 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160152.4A340208706@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:12 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160152.D0861208712@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:19 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160200.60CE3208604@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:23 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160204.0A7E2208743@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:28 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160209.39B0620876C@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:29 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160210.4544D2084D5@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:13 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160213.B1DB02087F3@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:02:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:02:34 +0000
Subject: [pkgdb] fedora-ds-console had acl change status
Message-ID: <20090401160215.6B0E62087F6@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-console



From mcpierce at fedoraproject.org  Wed Apr  1 16:02:27 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Wed,  1 Apr 2009 16:02:27 +0000 (UTC)
Subject: rpms/rubygem-hoe/devel .cvsignore, 1.12, 1.13 rubygem-hoe.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <20090401160227.8F0D17011D@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1473

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.1 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2009 12:47:51 -0000	1.12
+++ .cvsignore	1 Apr 2009 16:01:56 -0000	1.13
@@ -1 +1 @@
-hoe-1.11.0.gem
+hoe-1.12.1.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rubygem-hoe.spec	17 Mar 2009 12:47:51 -0000	1.16
+++ rubygem-hoe.spec	1 Apr 2009 16:01:56 -0000	1.17
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.11.0
+Version:    	1.12.1
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
+- Release 1.12.1 of Hoe.
+
 * Tue Mar 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.11.0-1
 - Release 1.11.0 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Mar 2009 12:47:51 -0000	1.12
+++ sources	1 Apr 2009 16:01:56 -0000	1.13
@@ -1 +1 @@
-b2acaab9e7f1ed1ed128932e5c575ff4  hoe-1.11.0.gem
+c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:02 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160303.5212B20892D@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-admin-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:03 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160304.5E47C208930@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-admin-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:28 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160309.75C51208932@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-admin-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:30 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160311.5AA23208936@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-admin-console (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:14 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160316.37E4920871B@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-admin-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:35 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160316.D19CA208938@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-admin-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:38 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160318.AC99820893C@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-admin-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:20 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160320.ED67E208609@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-admin-console (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:43 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160324.CA236208940@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-admin-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:26 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160327.20DC2208943@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-admin-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:46 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160327.725BC208946@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-admin-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:48 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160329.93872208948@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-admin-console (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:33 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160334.6B228208950@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds-admin-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:59 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160340.9C489208956@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds-admin-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:02 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160342.AE068208958@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds-admin-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:03:47 +0000
Subject: [pkgdb] fedora-ds-admin-console had acl change status
Message-ID: <20090401160347.AFBAA2087F5@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds-admin-console (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds-admin-console



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:43 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160424.1F554208706@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:44 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160425.94891208705@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:47 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160427.BE0C720895D@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:28 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160428.D78D4208961@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds (Fedora devel) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:54 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160434.E9A19208971@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:55 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160435.94A3F208C43@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:57 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160440.398D52087F9@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:59 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160442.A087C20892C@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds (Fedora 8) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:42 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160443.7E6E9208C45@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:05:05 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160446.6FCF7208C4B@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:49 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160449.ACC0B208C59@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:05:09 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160451.174FF208603@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds (Fedora 9) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:05:14 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160455.39FE9208C5D@bastion.fedora.phx.redhat.com>

nhosoi has set the watchbugzilla acl on fedora-ds (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:05:16 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160457.C093A208C61@bastion.fedora.phx.redhat.com>

nhosoi has set the watchcommits acl on fedora-ds (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:04:58 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160459.6858A208C62@bastion.fedora.phx.redhat.com>

nhosoi has set the commit acl on fedora-ds (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From pkgdb at fedoraproject.org  Wed Apr  1 16:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:05:23 +0000
Subject: [pkgdb] fedora-ds had acl change status
Message-ID: <20090401160504.56709208C65@bastion.fedora.phx.redhat.com>

nhosoi has set the approveacls acl on fedora-ds (Fedora 10) to Approved for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-ds



From oget at fedoraproject.org  Wed Apr  1 16:09:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 16:09:23 +0000 (UTC)
Subject: rpms/unalz/F-10 unalz-optflags.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 unalz.spec, 1.1, 1.2
Message-ID: <20090401160923.299AE7011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/unalz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2719

Modified Files:
	.cvsignore sources unalz.spec 
Added Files:
	unalz-optflags.patch 
Log Message:
* Wed Apr 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.65-1
- Update to 0.65


unalz-optflags.patch:

--- NEW FILE unalz-optflags.patch ---
--- unalz.old/Makefile	2009-04-01 11:11:34.000000000 -0400
+++ unalz/Makefile	2009-04-01 11:21:29.000000000 -0400
@@ -82,3 +82,14 @@ bzip2/huffman.o: bzip2/huffman.c
 bzip2/randtable.o: bzip2/randtable.c
 	$(CC) -c bzip2/randtable.c -o bzip2/randtable.o $(CFLAGS)
 
+main.o: main.cpp
+	$(CPP) -c main.cpp -o main.o $(CFLAGS)
+
+UnAlz.o: UnAlz.cpp
+	$(CPP) -c main.cpp -o UnAlz.o $(CFLAGS)
+
+UnAlzUtils.o: UnAlzUtils.cpp
+	$(CPP) -c UnAlzUtils.cpp -o UnAlzUtils.o $(CFLAGS)
+
+UnAlzBzip2.o: UnAlzBzip2.cpp
+	$(CPP) -c UnAlzBzip2.cpp -o UnAlzBzip2.o $(CFLAGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Feb 2009 22:59:40 -0000	1.2
+++ .cvsignore	1 Apr 2009 16:08:52 -0000	1.3
@@ -1 +1 @@
-unalz-0.64.tgz
+unalz-0.65.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Feb 2009 22:59:40 -0000	1.2
+++ sources	1 Apr 2009 16:08:52 -0000	1.3
@@ -1 +1 @@
-2c78c7a803e897fae4281f13ad0e232b  unalz-0.64.tgz
+e4db2c4e3c8f6f5ee414b68bc55288e5  unalz-0.65.tgz


Index: unalz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/F-10/unalz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unalz.spec	18 Feb 2009 22:59:40 -0000	1.1
+++ unalz.spec	1 Apr 2009 16:08:52 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Decompression utility
 Name: unalz
-Version: 0.64
+Version: 0.65
 Release: 1%{?dist}
 License: zlib and BSD
 Group: Applications/File
@@ -8,6 +8,7 @@
 Source0: http://www.kipple.pe.kr/win/unalz/%{name}-%{version}.tgz
 # We are using the internal zlib
 Patch0: unalz-internal-zlib.patch
+Patch1: unalz-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
 
@@ -19,6 +20,8 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .zlib
+%patch1 -p1 -b .optflags
+
 rm -fr zlib
 
 # Fix permissions and encoding issues
@@ -31,7 +34,9 @@
 done
 
 %build
-make %{?_smp_mflags} linux-utf8 CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} linux-utf8
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -47,6 +52,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Wed Apr 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.65-1
+- Update to 0.65
+
 * Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.64-1
 - Update to 0.64
 



From oget at fedoraproject.org  Wed Apr  1 16:11:33 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 16:11:33 +0000 (UTC)
Subject: rpms/unalz/F-9 unalz-optflags.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 unalz.spec, 1.1, 1.2
Message-ID: <20090401161133.867527011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/unalz/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3264

Modified Files:
	.cvsignore sources unalz.spec 
Added Files:
	unalz-optflags.patch 
Log Message:
* Wed Apr 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.65-1
- Update to 0.65


unalz-optflags.patch:

--- NEW FILE unalz-optflags.patch ---
--- unalz.old/Makefile	2009-04-01 11:11:34.000000000 -0400
+++ unalz/Makefile	2009-04-01 11:21:29.000000000 -0400
@@ -82,3 +82,14 @@ bzip2/huffman.o: bzip2/huffman.c
 bzip2/randtable.o: bzip2/randtable.c
 	$(CC) -c bzip2/randtable.c -o bzip2/randtable.o $(CFLAGS)
 
+main.o: main.cpp
+	$(CPP) -c main.cpp -o main.o $(CFLAGS)
+
+UnAlz.o: UnAlz.cpp
+	$(CPP) -c main.cpp -o UnAlz.o $(CFLAGS)
+
+UnAlzUtils.o: UnAlzUtils.cpp
+	$(CPP) -c UnAlzUtils.cpp -o UnAlzUtils.o $(CFLAGS)
+
+UnAlzBzip2.o: UnAlzBzip2.cpp
+	$(CPP) -c UnAlzBzip2.cpp -o UnAlzBzip2.o $(CFLAGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Feb 2009 22:58:14 -0000	1.2
+++ .cvsignore	1 Apr 2009 16:11:02 -0000	1.3
@@ -1 +1 @@
-unalz-0.64.tgz
+unalz-0.65.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Feb 2009 22:58:14 -0000	1.2
+++ sources	1 Apr 2009 16:11:03 -0000	1.3
@@ -1 +1 @@
-2c78c7a803e897fae4281f13ad0e232b  unalz-0.64.tgz
+e4db2c4e3c8f6f5ee414b68bc55288e5  unalz-0.65.tgz


Index: unalz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unalz/F-9/unalz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unalz.spec	18 Feb 2009 22:58:14 -0000	1.1
+++ unalz.spec	1 Apr 2009 16:11:03 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Decompression utility
 Name: unalz
-Version: 0.64
+Version: 0.65
 Release: 1%{?dist}
 License: zlib and BSD
 Group: Applications/File
@@ -8,6 +8,7 @@
 Source0: http://www.kipple.pe.kr/win/unalz/%{name}-%{version}.tgz
 # We are using the internal zlib
 Patch0: unalz-internal-zlib.patch
+Patch1: unalz-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
 
@@ -19,6 +20,8 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .zlib
+%patch1 -p1 -b .optflags
+
 rm -fr zlib
 
 # Fix permissions and encoding issues
@@ -31,7 +34,9 @@
 done
 
 %build
-make %{?_smp_mflags} linux-utf8 CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} linux-utf8
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -47,6 +52,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Wed Apr 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.65-1
+- Update to 0.65
+
 * Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.64-1
 - Update to 0.64
 



From rmeggins at fedoraproject.org  Wed Apr  1 16:13:08 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 16:13:08 +0000 (UTC)
Subject: rpms/fedora-ds-console/F-10 .cvsignore, 1.3,
	1.4 fedora-ds-console.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090401161308.E2B737011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3642/F-10

Modified Files:
	.cvsignore fedora-ds-console.spec sources 
Log Message:
this is the 1.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:36:23 -0000	1.3
+++ .cvsignore	1 Apr 2009 16:12:38 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-console-1.1.1.tar.bz2
-fedora-ds-console-1.1.2.tar.bz2
+fedora-ds-console-1.2.0.tar.bz2


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-10/fedora-ds-console.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-console.spec	4 Sep 2008 16:00:15 -0000	1.5
+++ fedora-ds-console.spec	1 Apr 2009 16:12:38 -0000	1.6
@@ -1,12 +1,12 @@
-%define major_version 1.1
-%define minor_version 2
+%define major_version 1.2
+%define minor_version 0
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -19,8 +19,8 @@
 Requires: %{shortname}-admin
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
-BuildRequires: idm-console-framework
-BuildRequires: java-devel > 1.5.0
+BuildRequires: idm-console-framework >= 1.1
+BuildRequires: java-devel >= 1:1.6.0
 
 %description
 A Java based remote management console used for Managing Fedora
@@ -69,6 +69,12 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-1
+- this is the 1.2.0 release
+
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-2
 - fixed incorrect source
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 16:00:15 -0000	1.5
+++ sources	1 Apr 2009 16:12:38 -0000	1.6
@@ -1,2 +1 @@
-ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
-62964d896042c032143d9bac60abd105  fedora-ds-console-1.1.2.tar.bz2
+70232afe04ca9fabc0dd3a1a29d1c44e  fedora-ds-console-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 16:13:09 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 16:13:09 +0000 (UTC)
Subject: rpms/fedora-ds-console/F-9 .cvsignore, 1.3,
	1.4 fedora-ds-console.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090401161309.1E0977011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3642/F-9

Modified Files:
	.cvsignore fedora-ds-console.spec sources 
Log Message:
this is the 1.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:36:21 -0000	1.3
+++ .cvsignore	1 Apr 2009 16:12:38 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-console-1.1.1.tar.bz2
-fedora-ds-console-1.1.2.tar.bz2
+fedora-ds-console-1.2.0.tar.bz2


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/fedora-ds-console.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-console.spec	4 Sep 2008 16:00:14 -0000	1.5
+++ fedora-ds-console.spec	1 Apr 2009 16:12:38 -0000	1.6
@@ -1,12 +1,12 @@
-%define major_version 1.1
-%define minor_version 2
+%define major_version 1.2
+%define minor_version 0
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -19,8 +19,8 @@
 Requires: %{shortname}-admin
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
-BuildRequires: idm-console-framework
-BuildRequires: java-devel > 1.5.0
+BuildRequires: idm-console-framework >= 1.1
+BuildRequires: java-devel >= 1:1.6.0
 
 %description
 A Java based remote management console used for Managing Fedora
@@ -69,6 +69,12 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-1
+- this is the 1.2.0 release
+
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-2
 - fixed incorrect source
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 16:00:14 -0000	1.5
+++ sources	1 Apr 2009 16:12:38 -0000	1.6
@@ -1,2 +1 @@
-ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
-62964d896042c032143d9bac60abd105  fedora-ds-console-1.1.2.tar.bz2
+70232afe04ca9fabc0dd3a1a29d1c44e  fedora-ds-console-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 16:13:09 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 16:13:09 +0000 (UTC)
Subject: rpms/fedora-ds-console/devel .cvsignore, 1.3,
	1.4 fedora-ds-console.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090401161309.5FF0D7011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3642/devel

Modified Files:
	.cvsignore fedora-ds-console.spec sources 
Log Message:
this is the 1.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:36:23 -0000	1.3
+++ .cvsignore	1 Apr 2009 16:12:39 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-console-1.1.1.tar.bz2
-fedora-ds-console-1.1.2.tar.bz2
+fedora-ds-console-1.2.0.tar.bz2


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/fedora-ds-console.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-console.spec	24 Feb 2009 16:27:04 -0000	1.6
+++ fedora-ds-console.spec	1 Apr 2009 16:12:39 -0000	1.7
@@ -1,12 +1,12 @@
-%define major_version 1.1
-%define minor_version 2
+%define major_version 1.2
+%define minor_version 0
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
 Group: Applications/System
@@ -19,8 +19,8 @@
 Requires: %{shortname}-admin
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
-BuildRequires: idm-console-framework
-BuildRequires: java-devel > 1.5.0
+BuildRequires: idm-console-framework >= 1.1
+BuildRequires: java-devel >= 1:1.6.0
 
 %description
 A Java based remote management console used for Managing Fedora
@@ -69,6 +69,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-1
+- this is the 1.2.0 release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-console/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 16:00:15 -0000	1.5
+++ sources	1 Apr 2009 16:12:39 -0000	1.6
@@ -1,2 +1 @@
-ee0401937a81ce2466292a4f9b14e20a  fedora-ds-console-1.1.1.tar.bz2
-62964d896042c032143d9bac60abd105  fedora-ds-console-1.1.2.tar.bz2
+70232afe04ca9fabc0dd3a1a29d1c44e  fedora-ds-console-1.2.0.tar.bz2



From mcpierce at fedoraproject.org  Wed Apr  1 16:15:17 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Wed,  1 Apr 2009 16:15:17 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-9 .cvsignore, 1.12, 1.13 rubygem-hoe.spec, 1.12, 
	1.13 sources, 1.12, 1.13
Message-ID: <20090401161517.37A9B7011D@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4109

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.1 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2009 12:55:26 -0000	1.12
+++ .cvsignore	1 Apr 2009 16:14:46 -0000	1.13
@@ -1 +1 @@
-hoe-1.11.0.gem
+hoe-1.12.1.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/rubygem-hoe.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rubygem-hoe.spec	17 Mar 2009 12:55:26 -0000	1.12
+++ rubygem-hoe.spec	1 Apr 2009 16:14:46 -0000	1.13
@@ -5,7 +5,7 @@
 
 Summary:    Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       rubygem-%{gemname}
-Version:    1.11.0
+Version:    1.12.1
 Release:    1%{?dist}
 Group:      Development/Languages
 License:    MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
+- Release 1.12.1 of Hoe.
+
 * Tue Mar 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.11.0-1
 - Release 1.11.0 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Mar 2009 12:55:26 -0000	1.12
+++ sources	1 Apr 2009 16:14:46 -0000	1.13
@@ -1 +1 @@
-b2acaab9e7f1ed1ed128932e5c575ff4  hoe-1.11.0.gem
+c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem



From mbarnes at fedoraproject.org  Wed Apr  1 16:22:48 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  1 Apr 2009 16:22:48 +0000 (UTC)
Subject: rpms/python-ldap/devel .cvsignore, 1.7, 1.8 python-ldap.spec, 1.28, 
	1.29 sources, 1.7, 1.8 python-ldap-2.3.5-fix-build-error.patch,
	1.1, NONE
Message-ID: <20090401162248.5E3367011D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/python-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5382

Modified Files:
	.cvsignore python-ldap.spec sources 
Removed Files:
	python-ldap-2.3.5-fix-build-error.patch 
Log Message:

* Wed Apr 01 2009 Matthew Barnes <mbarnes at redhat.com> - 0:2.3.6-1
- Update to 2.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 17:59:54 -0000	1.7
+++ .cvsignore	1 Apr 2009 16:22:17 -0000	1.8
@@ -1 +1 @@
-python-ldap-2.3.5.tar.gz
+python-ldap-2.3.6.tar.gz


Index: python-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- python-ldap.spec	27 Feb 2009 15:08:28 -0000	1.28
+++ python-ldap.spec	1 Apr 2009 16:22:18 -0000	1.29
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: python-ldap
-Version: 2.3.5
-Release: 5%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 Epoch: 0
 License: Python
 Group: System Environment/Libraries
@@ -19,8 +19,6 @@
 
 Patch0: python-ldap-2.2.0-dirs.patch
 
-Patch1: python-ldap-2.3.5-fix-build-error.patch
-
 ### Dependencies ###
 
 Requires: openldap >= %{openldap_version}
@@ -42,7 +40,6 @@
 %prep
 %setup -q -n python-ldap-%{version}
 %patch0 -p1 -b .dirs
-%patch1 -p1 -b .fix-build-error
 
 # clean up cvs hidden files
 rm -rf Demo/Lib/ldap/.cvsignore Demo/.cvsignore Demo/Lib/ldif/.cvsignore Demo/Lib/ldap/async/.cvsignore \
@@ -72,6 +69,9 @@
 %{python_sitearch}/python_ldap-%{version}-*.egg-info/
 
 %changelog
+* Wed Apr 01 2009 Matthew Barnes <mbarnes at redhat.com> - 0:2.3.6-1
+- Update to 2.3.6
+
 * Fri Feb 27 2009 Matthew Barnes <mbarnes at redhat.com> - 0:2.3.5-5
 - Fix a build error.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 17:59:54 -0000	1.7
+++ sources	1 Apr 2009 16:22:18 -0000	1.8
@@ -1 +1 @@
-c9732621075edc65b54233fff21fe07c  python-ldap-2.3.5.tar.gz
+69605234571509eb288fc9292a34edad  python-ldap-2.3.6.tar.gz


--- python-ldap-2.3.5-fix-build-error.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Apr  1 16:23:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:23:58 +0000
Subject: [pkgdb] eclipse (Fedora, 11) updated by ausil
Message-ID: <20090401162358.F2002208505@bastion.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for eclipse
ausil has set commit to Approved for provenpackager on eclipse (Fedora 11)
ausil has set build to Approved for provenpackager on eclipse (Fedora 11)
ausil has set checkout to Approved for provenpackager on eclipse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From pkgdb at fedoraproject.org  Wed Apr  1 16:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:26:19 +0000
Subject: [pkgdb] jd (Fedora, 11) updated by ausil
Message-ID: <20090401162600.129CB208505@bastion.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for jd
ausil has set commit to Approved for provenpackager on jd (Fedora 11)
ausil has set build to Approved for provenpackager on jd (Fedora 11)
ausil has set checkout to Approved for provenpackager on jd (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jd



From pkgdb at fedoraproject.org  Wed Apr  1 16:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:28:30 +0000
Subject: [pkgdb] gnome-commander (Fedora, 11) updated by ausil
Message-ID: <20090401162810.EADB6208505@bastion.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for gnome-commander
ausil has set commit to Approved for provenpackager on gnome-commander (Fedora 11)
ausil has set build to Approved for provenpackager on gnome-commander (Fedora 11)
ausil has set checkout to Approved for provenpackager on gnome-commander (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-commander



From pkgdb at fedoraproject.org  Wed Apr  1 16:30:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:30:14 +0000
Subject: [pkgdb] wine (Fedora, 11) updated by ausil
Message-ID: <20090401162955.E1D0E208514@bastion.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for wine
ausil has set commit to Approved for provenpackager on wine (Fedora 11)
ausil has set build to Approved for provenpackager on wine (Fedora 11)
ausil has set checkout to Approved for provenpackager on wine (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wine



From pkgdb at fedoraproject.org  Wed Apr  1 16:31:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:31:28 +0000
Subject: [pkgdb] R-RUnit was added for pingou
Message-ID: <20090401163129.1EB3E208514@bastion.fedora.phx.redhat.com>

ausil has added Package R-RUnit with summary R Unit test framework
ausil has approved Package R-RUnit
ausil has added a Fedora devel branch for R-RUnit with an owner of pingou
ausil has approved R-RUnit in Fedora devel
ausil has approved Package R-RUnit
ausil has set commit to Approved for provenpackager on R-RUnit (Fedora devel)
ausil has set build to Approved for provenpackager on R-RUnit (Fedora devel)
ausil has set checkout to Approved for provenpackager on R-RUnit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-RUnit



From ausil at fedoraproject.org  Wed Apr  1 16:31:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:31:37 +0000 (UTC)
Subject: rpms/R-RUnit/devel - New directory
Message-ID: <20090401163137.60D9D7013C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/R-RUnit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsBR7994/rpms/R-RUnit/devel

Log Message:
Directory /cvs/pkgs/rpms/R-RUnit/devel added to the repository




From pkgdb at fedoraproject.org  Wed Apr  1 16:31:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:31:49 +0000
Subject: [pkgdb] R-RUnit (Fedora, 10) updated by ausil
Message-ID: <20090401163130.3AEEB208553@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for R-RUnit
ausil has set commit to Approved for provenpackager on R-RUnit (Fedora 10)
ausil has set build to Approved for provenpackager on R-RUnit (Fedora 10)
ausil has set checkout to Approved for provenpackager on R-RUnit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-RUnit



From pkgdb at fedoraproject.org  Wed Apr  1 16:31:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:31:49 +0000
Subject: [pkgdb] R-RUnit (Fedora, 9) updated by ausil
Message-ID: <20090401163130.4BEA3208557@bastion.fedora.phx.redhat.com>

ausil added a Fedora 9 branch for R-RUnit
ausil has set commit to Approved for provenpackager on R-RUnit (Fedora 9)
ausil has set build to Approved for provenpackager on R-RUnit (Fedora 9)
ausil has set checkout to Approved for provenpackager on R-RUnit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-RUnit



From ausil at fedoraproject.org  Wed Apr  1 16:31:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:31:37 +0000 (UTC)
Subject: rpms/R-RUnit - New directory
Message-ID: <20090401163137.307E77011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/R-RUnit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsBR7994/rpms/R-RUnit

Log Message:
Directory /cvs/pkgs/rpms/R-RUnit added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:31:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:31:45 +0000 (UTC)
Subject: rpms/R-RUnit Makefile,NONE,1.1
Message-ID: <20090401163145.55F527011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/R-RUnit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsBR7994/rpms/R-RUnit

Added Files:
	Makefile 
Log Message:
Setup of module R-RUnit


--- NEW FILE Makefile ---
# Top level Makefile for module R-RUnit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Apr  1 16:31:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:31:45 +0000 (UTC)
Subject: rpms/R-RUnit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090401163145.A9D697011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/R-RUnit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsBR7994/rpms/R-RUnit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-RUnit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-RUnit
# $Id: Makefile,v 1.1 2009/04/01 16:31:45 ausil Exp $
NAME := R-RUnit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  1 16:32:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:32:39 +0000
Subject: [pkgdb] rumor was added for oget
Message-ID: <20090401163220.96860208550@bastion.fedora.phx.redhat.com>

ausil has added Package rumor with summary Really Unintelligent Music transcriptOR
ausil has approved Package rumor
ausil has added a Fedora devel branch for rumor with an owner of oget
ausil has approved rumor in Fedora devel
ausil has approved Package rumor
ausil has set commit to Approved for provenpackager on rumor (Fedora devel)
ausil has set build to Approved for provenpackager on rumor (Fedora devel)
ausil has set checkout to Approved for provenpackager on rumor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rumor



From pkgdb at fedoraproject.org  Wed Apr  1 16:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:32:21 +0000
Subject: [pkgdb] rumor (Fedora, 10) updated by ausil
Message-ID: <20090401163222.28001208602@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for rumor
ausil has set commit to Approved for provenpackager on rumor (Fedora 10)
ausil has set build to Approved for provenpackager on rumor (Fedora 10)
ausil has set checkout to Approved for provenpackager on rumor (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rumor



From pkgdb at fedoraproject.org  Wed Apr  1 16:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:32:21 +0000
Subject: [pkgdb] rumor (Fedora, 9) updated by ausil
Message-ID: <20090401163222.5211F208608@bastion.fedora.phx.redhat.com>

ausil added a Fedora 9 branch for rumor
ausil has set commit to Approved for provenpackager on rumor (Fedora 9)
ausil has set build to Approved for provenpackager on rumor (Fedora 9)
ausil has set checkout to Approved for provenpackager on rumor (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rumor



From ausil at fedoraproject.org  Wed Apr  1 16:32:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:32:29 +0000 (UTC)
Subject: rpms/rumor - New directory
Message-ID: <20090401163229.207547011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rumor
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsro8370/rpms/rumor

Log Message:
Directory /cvs/pkgs/rpms/rumor added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:32:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:32:29 +0000 (UTC)
Subject: rpms/rumor/devel - New directory
Message-ID: <20090401163229.4FD3F7013C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rumor/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsro8370/rpms/rumor/devel

Log Message:
Directory /cvs/pkgs/rpms/rumor/devel added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:32:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:32:36 +0000 (UTC)
Subject: rpms/rumor Makefile,NONE,1.1
Message-ID: <20090401163236.630E37011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rumor
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsro8370/rpms/rumor

Added Files:
	Makefile 
Log Message:
Setup of module rumor


--- NEW FILE Makefile ---
# Top level Makefile for module rumor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Apr  1 16:32:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:32:36 +0000 (UTC)
Subject: rpms/rumor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090401163236.9671A7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rumor/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsro8370/rpms/rumor/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rumor


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rumor
# $Id: Makefile,v 1.1 2009/04/01 16:32:36 ausil Exp $
NAME := rumor
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mcpierce at fedoraproject.org  Wed Apr  1 16:34:13 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Wed,  1 Apr 2009 16:34:13 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-10 .cvsignore, 1.12, 1.13 rubygem-hoe.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <20090401163413.A7F9C7011D@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8714

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.1 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2009 13:11:50 -0000	1.12
+++ .cvsignore	1 Apr 2009 16:33:43 -0000	1.13
@@ -1 +1 @@
-hoe-1.11.0.gem
+hoe-1.12.1.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/rubygem-hoe.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rubygem-hoe.spec	17 Mar 2009 13:11:51 -0000	1.15
+++ rubygem-hoe.spec	1 Apr 2009 16:33:43 -0000	1.16
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.11.0
+Version:    	1.12.1
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
+- Release 1.12.1 of Hoe.
+
 * Tue Mar 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.11.0-1
 - Release 1.11.0 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Mar 2009 13:11:51 -0000	1.12
+++ sources	1 Apr 2009 16:33:43 -0000	1.13
@@ -1 +1 @@
-b2acaab9e7f1ed1ed128932e5c575ff4  hoe-1.11.0.gem
+c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem



From ausil at fedoraproject.org  Wed Apr  1 16:36:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:36:33 +0000 (UTC)
Subject: rpms/unzoo - New directory
Message-ID: <20090401163633.285097011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/unzoo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsmi9298/rpms/unzoo

Log Message:
Directory /cvs/pkgs/rpms/unzoo added to the repository




From pkgdb at fedoraproject.org  Wed Apr  1 16:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:36:43 +0000
Subject: [pkgdb] unzoo was added for linville
Message-ID: <20090401163624.9A128208505@bastion.fedora.phx.redhat.com>

ausil has added Package unzoo with summary ZOO archive extractor
ausil has approved Package unzoo
ausil has added a Fedora devel branch for unzoo with an owner of linville
ausil has approved unzoo in Fedora devel
ausil has approved Package unzoo
ausil has set commit to Approved for provenpackager on unzoo (Fedora devel)
ausil has set build to Approved for provenpackager on unzoo (Fedora devel)
ausil has set checkout to Approved for provenpackager on unzoo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unzoo



From pkgdb at fedoraproject.org  Wed Apr  1 16:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:36:25 +0000
Subject: [pkgdb] unzoo (Fedora, 10) updated by ausil
Message-ID: <20090401163625.7FF20208550@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for unzoo
ausil has set commit to Approved for provenpackager on unzoo (Fedora 10)
ausil has set build to Approved for provenpackager on unzoo (Fedora 10)
ausil has set checkout to Approved for provenpackager on unzoo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unzoo



From ausil at fedoraproject.org  Wed Apr  1 16:36:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:36:41 +0000 (UTC)
Subject: rpms/unzoo Makefile,NONE,1.1
Message-ID: <20090401163641.6A4D47011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/unzoo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsmi9298/rpms/unzoo

Added Files:
	Makefile 
Log Message:
Setup of module unzoo


--- NEW FILE Makefile ---
# Top level Makefile for module unzoo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Apr  1 16:36:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:36:41 +0000 (UTC)
Subject: rpms/unzoo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090401163641.BD9BC7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/unzoo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsmi9298/rpms/unzoo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module unzoo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: unzoo
# $Id: Makefile,v 1.1 2009/04/01 16:36:41 ausil Exp $
NAME := unzoo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ausil at fedoraproject.org  Wed Apr  1 16:36:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:36:33 +0000 (UTC)
Subject: rpms/unzoo/devel - New directory
Message-ID: <20090401163633.61DCA7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/unzoo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsmi9298/rpms/unzoo/devel

Log Message:
Directory /cvs/pkgs/rpms/unzoo/devel added to the repository




From pkgdb at fedoraproject.org  Wed Apr  1 16:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:38:03 +0000
Subject: [pkgdb] sahana was added for ke4qqq
Message-ID: <20090401163744.5B7C3208505@bastion.fedora.phx.redhat.com>

ausil has added Package sahana with summary Disaster Management System
ausil has approved Package sahana
ausil has added a Fedora devel branch for sahana with an owner of ke4qqq
ausil has approved sahana in Fedora devel
ausil has approved Package sahana
ausil has set commit to Approved for provenpackager on sahana (Fedora devel)
ausil has set build to Approved for provenpackager on sahana (Fedora devel)
ausil has set checkout to Approved for provenpackager on sahana (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sahana



From pkgdb at fedoraproject.org  Wed Apr  1 16:37:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:37:44 +0000
Subject: [pkgdb] sahana (Fedora EPEL, 5) updated by ausil
Message-ID: <20090401163746.0D9A6208553@bastion.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for sahana
ausil has set commit to Approved for provenpackager on sahana (Fedora EPEL 5)
ausil has set build to Approved for provenpackager on sahana (Fedora EPEL 5)
ausil has set checkout to Approved for provenpackager on sahana (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sahana



From pkgdb at fedoraproject.org  Wed Apr  1 16:37:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:37:45 +0000
Subject: [pkgdb] sahana (Fedora, 10) updated by ausil
Message-ID: <20090401163747.1C464208556@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for sahana
ausil has set commit to Approved for provenpackager on sahana (Fedora 10)
ausil has set build to Approved for provenpackager on sahana (Fedora 10)
ausil has set checkout to Approved for provenpackager on sahana (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sahana



From pkgdb at fedoraproject.org  Wed Apr  1 16:37:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:37:45 +0000
Subject: [pkgdb] sahana (Fedora, 9) updated by ausil
Message-ID: <20090401163747.87877208604@bastion.fedora.phx.redhat.com>

ausil added a Fedora 9 branch for sahana
ausil has set commit to Approved for provenpackager on sahana (Fedora 9)
ausil has set build to Approved for provenpackager on sahana (Fedora 9)
ausil has set checkout to Approved for provenpackager on sahana (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sahana



From pkgdb at fedoraproject.org  Wed Apr  1 16:37:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:37:45 +0000
Subject: [pkgdb] sahana (Fedora, 11) updated by ausil
Message-ID: <20090401163747.8C090208609@bastion.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for sahana
ausil has set commit to Approved for provenpackager on sahana (Fedora 11)
ausil has set build to Approved for provenpackager on sahana (Fedora 11)
ausil has set checkout to Approved for provenpackager on sahana (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sahana



From ausil at fedoraproject.org  Wed Apr  1 16:37:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:37:53 +0000 (UTC)
Subject: rpms/sahana - New directory
Message-ID: <20090401163753.2F5777011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sahana
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQn9784/rpms/sahana

Log Message:
Directory /cvs/pkgs/rpms/sahana added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:37:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:37:53 +0000 (UTC)
Subject: rpms/sahana/devel - New directory
Message-ID: <20090401163753.625387011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sahana/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQn9784/rpms/sahana/devel

Log Message:
Directory /cvs/pkgs/rpms/sahana/devel added to the repository




From kkofler at fedoraproject.org  Wed Apr  1 16:37:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  1 Apr 2009 16:37:57 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch, NONE,
	1.1 qt.spec, 1.258, 1.259
Message-ID: <20090401163757.ACC2F7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9634/devel

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch 
Log Message:
* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-12
- fix inline asm in qatomic (de)ref (i386/x86_64), should fix Kolourpaint crash

qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch ---
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h	2009-04-01 17:54:21.000000000 +0200
@@ -115,8 +115,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -127,8 +127,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h	2009-04-01 17:54:32.000000000 +0200
@@ -116,8 +116,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -128,8 +128,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- qt.spec	30 Mar 2009 17:01:19 -0000	1.258
+++ qt.spec	1 Apr 2009 16:37:27 -0000	1.259
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -50,6 +50,10 @@
 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
+# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
+# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
+# crash with Qt 4.5
+Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
 %define qt_copy 20090325
@@ -324,6 +328,7 @@
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
+%patch53 -p1 -b .qatomic-inline-asm
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -804,6 +809,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-12
+- fix inline asm in qatomic (de)ref (i386/x86_64), should fix Kolourpaint crash
+
 * Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-11
 - qt fails to build on ia64 (#492174)
 



From ausil at fedoraproject.org  Wed Apr  1 16:38:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:38:00 +0000 (UTC)
Subject: rpms/sahana Makefile,NONE,1.1
Message-ID: <20090401163800.D996D7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sahana
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQn9784/rpms/sahana

Added Files:
	Makefile 
Log Message:
Setup of module sahana


--- NEW FILE Makefile ---
# Top level Makefile for module sahana
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Apr  1 16:38:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:38:01 +0000 (UTC)
Subject: rpms/sahana/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090401163801.283DB7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sahana/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQn9784/rpms/sahana/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sahana


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sahana
# $Id: Makefile,v 1.1 2009/04/01 16:38:00 ausil Exp $
NAME := sahana
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  1 16:38:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:38:57 +0000
Subject: [pkgdb] python-polybori was added for konradm
Message-ID: <20090401163840.02CE2208494@bastion.fedora.phx.redhat.com>

ausil has added Package python-polybori with summary Framework for Boolean Rings
ausil has approved Package python-polybori
ausil has added a Fedora devel branch for python-polybori with an owner of konradm
ausil has approved python-polybori in Fedora devel
ausil has approved Package python-polybori
ausil has set commit to Approved for provenpackager on python-polybori (Fedora devel)
ausil has set build to Approved for provenpackager on python-polybori (Fedora devel)
ausil has set checkout to Approved for provenpackager on python-polybori (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-polybori



From pkgdb at fedoraproject.org  Wed Apr  1 16:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:38:39 +0000
Subject: [pkgdb] python-polybori (Fedora, 10) updated by ausil
Message-ID: <20090401163840.089BA208557@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for python-polybori
ausil has set commit to Approved for provenpackager on python-polybori (Fedora 10)
ausil has set build to Approved for provenpackager on python-polybori (Fedora 10)
ausil has set checkout to Approved for provenpackager on python-polybori (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-polybori



From ausil at fedoraproject.org  Wed Apr  1 16:38:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:38:47 +0000 (UTC)
Subject: rpms/python-polybori - New directory
Message-ID: <20090401163847.2545E7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-polybori
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB10249/rpms/python-polybori

Log Message:
Directory /cvs/pkgs/rpms/python-polybori added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:38:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:38:47 +0000 (UTC)
Subject: rpms/python-polybori/devel - New directory
Message-ID: <20090401163847.654CE7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-polybori/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB10249/rpms/python-polybori/devel

Log Message:
Directory /cvs/pkgs/rpms/python-polybori/devel added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:38:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:38:54 +0000 (UTC)
Subject: rpms/python-polybori Makefile,NONE,1.1
Message-ID: <20090401163854.97FD87011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-polybori
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB10249/rpms/python-polybori

Added Files:
	Makefile 
Log Message:
Setup of module python-polybori


--- NEW FILE Makefile ---
# Top level Makefile for module python-polybori
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Apr  1 16:38:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:38:54 +0000 (UTC)
Subject: rpms/python-polybori/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090401163854.DB6527011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-polybori/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB10249/rpms/python-polybori/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-polybori


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-polybori
# $Id: Makefile,v 1.1 2009/04/01 16:38:54 ausil Exp $
NAME := python-polybori
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  1 16:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:39:21 +0000
Subject: [pkgdb] geanyvc was added for pingou
Message-ID: <20090401163921.9AA86208514@bastion.fedora.phx.redhat.com>

ausil has added Package geanyvc with summary Version controler plugin for geany
ausil has approved Package geanyvc
ausil has added a Fedora devel branch for geanyvc with an owner of pingou
ausil has approved geanyvc in Fedora devel
ausil has approved Package geanyvc
ausil has set commit to Approved for provenpackager on geanyvc (Fedora devel)
ausil has set build to Approved for provenpackager on geanyvc (Fedora devel)
ausil has set checkout to Approved for provenpackager on geanyvc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geanyvc



From pkgdb at fedoraproject.org  Wed Apr  1 16:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:39:42 +0000
Subject: [pkgdb] geanyvc (Fedora, 10) updated by ausil
Message-ID: <20090401163922.AF683208553@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for geanyvc
ausil has set commit to Approved for provenpackager on geanyvc (Fedora 10)
ausil has set build to Approved for provenpackager on geanyvc (Fedora 10)
ausil has set checkout to Approved for provenpackager on geanyvc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geanyvc



From pkgdb at fedoraproject.org  Wed Apr  1 16:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:39:42 +0000
Subject: [pkgdb] geanyvc (Fedora, 9) updated by ausil
Message-ID: <20090401163922.E61B7208557@bastion.fedora.phx.redhat.com>

ausil added a Fedora 9 branch for geanyvc
ausil has set commit to Approved for provenpackager on geanyvc (Fedora 9)
ausil has set build to Approved for provenpackager on geanyvc (Fedora 9)
ausil has set checkout to Approved for provenpackager on geanyvc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geanyvc



From ausil at fedoraproject.org  Wed Apr  1 16:39:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:39:31 +0000 (UTC)
Subject: rpms/geanyvc - New directory
Message-ID: <20090401163931.2257F7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/geanyvc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl10594/rpms/geanyvc

Log Message:
Directory /cvs/pkgs/rpms/geanyvc added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:39:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:39:31 +0000 (UTC)
Subject: rpms/geanyvc/devel - New directory
Message-ID: <20090401163931.5991B7011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/geanyvc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl10594/rpms/geanyvc/devel

Log Message:
Directory /cvs/pkgs/rpms/geanyvc/devel added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:39:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:39:38 +0000 (UTC)
Subject: rpms/geanyvc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090401163938.E2A0A7013D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/geanyvc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl10594/rpms/geanyvc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module geanyvc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: geanyvc
# $Id: Makefile,v 1.1 2009/04/01 16:39:38 ausil Exp $
NAME := geanyvc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ausil at fedoraproject.org  Wed Apr  1 16:39:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:39:38 +0000 (UTC)
Subject: rpms/geanyvc Makefile,NONE,1.1
Message-ID: <20090401163938.A1AE27011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/geanyvc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsl10594/rpms/geanyvc

Added Files:
	Makefile 
Log Message:
Setup of module geanyvc


--- NEW FILE Makefile ---
# Top level Makefile for module geanyvc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Apr  1 16:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:40:23 +0000
Subject: [pkgdb] libdwarf was added for suravee
Message-ID: <20090401164023.C6FFD208514@bastion.fedora.phx.redhat.com>

ausil has added Package libdwarf with summary Library to access the DWARF Debugging file format
ausil has approved Package libdwarf
ausil has added a Fedora devel branch for libdwarf with an owner of suravee
ausil has approved libdwarf in Fedora devel
ausil has approved Package libdwarf
ausil has set commit to Approved for provenpackager on libdwarf (Fedora devel)
ausil has set build to Approved for provenpackager on libdwarf (Fedora devel)
ausil has set checkout to Approved for provenpackager on libdwarf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdwarf



From ausil at fedoraproject.org  Wed Apr  1 16:40:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:40:31 +0000 (UTC)
Subject: rpms/libdwarf - New directory
Message-ID: <20090401164031.2AF997011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libdwarf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY11002/rpms/libdwarf

Log Message:
Directory /cvs/pkgs/rpms/libdwarf added to the repository




From pkgdb at fedoraproject.org  Wed Apr  1 16:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:40:44 +0000
Subject: [pkgdb] libdwarf (Fedora, devel) updated by ausil
Message-ID: <20090401164024.92016208553@bastion.fedora.phx.redhat.com>

ausil approved watchbugzilla on libdwarf (Fedora devel) for paragn
ausil approved watchcommits on libdwarf (Fedora devel) for paragn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdwarf



From pkgdb at fedoraproject.org  Wed Apr  1 16:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 16:40:44 +0000
Subject: [pkgdb] libdwarf (Fedora, 10) updated by ausil
Message-ID: <20090401164024.A7337208557@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for libdwarf
ausil has set commit to Approved for provenpackager on libdwarf (Fedora 10)
ausil has set build to Approved for provenpackager on libdwarf (Fedora 10)
ausil has set checkout to Approved for provenpackager on libdwarf (Fedora 10)
ausil approved watchbugzilla on libdwarf (Fedora 10) for paragn
ausil approved watchcommits on libdwarf (Fedora 10) for paragn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdwarf



From ausil at fedoraproject.org  Wed Apr  1 16:40:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:40:31 +0000 (UTC)
Subject: rpms/libdwarf/devel - New directory
Message-ID: <20090401164031.6C9157011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libdwarf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY11002/rpms/libdwarf/devel

Log Message:
Directory /cvs/pkgs/rpms/libdwarf/devel added to the repository




From ausil at fedoraproject.org  Wed Apr  1 16:40:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:40:39 +0000 (UTC)
Subject: rpms/libdwarf Makefile,NONE,1.1
Message-ID: <20090401164039.04C027011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libdwarf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY11002/rpms/libdwarf

Added Files:
	Makefile 
Log Message:
Setup of module libdwarf


--- NEW FILE Makefile ---
# Top level Makefile for module libdwarf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Apr  1 16:40:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  1 Apr 2009 16:40:39 +0000 (UTC)
Subject: rpms/libdwarf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090401164039.405177011D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libdwarf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsY11002/rpms/libdwarf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libdwarf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libdwarf
# $Id: Makefile,v 1.1 2009/04/01 16:40:39 ausil Exp $
NAME := libdwarf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From s4504kr at fedoraproject.org  Wed Apr  1 16:46:22 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  1 Apr 2009 16:46:22 +0000 (UTC)
Subject: rpms/blender/devel blender-wrapper, 1.8, 1.9 blender.spec, 1.106,
	1.107 blenderplayer-wraper, 1.1, 1.2
Message-ID: <20090401164622.810AC7011D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12359

Modified Files:
	blender-wrapper blender.spec blenderplayer-wraper 
Log Message:
Change nonfree to freeworld


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- blender-wrapper	31 Mar 2009 20:13:03 -0000	1.8
+++ blender-wrapper	1 Apr 2009 16:45:52 -0000	1.9
@@ -6,8 +6,8 @@
 # In case user's home directory doesn't contain ~/.blender, copy it
 # from /usr/share/blender
 
-if [ -x /usr/bin/blender-nonfree.bin ]; then
-    blend="blender-nonfree"
+if [ -x /usr/bin/blender-freeworld.bin ]; then
+    blend="blender-freeworld"
 else
     blend="blender"
 fi


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- blender.spec	31 Mar 2009 20:16:35 -0000	1.106
+++ blender.spec	1 Apr 2009 16:45:52 -0000	1.107
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	18%{?dist}
+Release: 	19%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -227,6 +227,9 @@
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.48a-19
+- Change nonfree to freeworld
+
 * Tue Mar 31 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-18
 - Fix typo
 


Index: blenderplayer-wraper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blenderplayer-wraper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blenderplayer-wraper	31 Mar 2009 20:13:03 -0000	1.1
+++ blenderplayer-wraper	1 Apr 2009 16:45:52 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [ -x /usr/bin/blenderplayer-nonfree ]; then
-   /usr/bin/blenderplayer-nonfree.bin $@
+if [ -x /usr/bin/blenderplayer-freeworld ]; then
+   /usr/bin/blenderplayer-freeword.bin $@
 else
    /usr/bin/blenderplayer.bin $@
 fi



From oget at fedoraproject.org  Wed Apr  1 16:52:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 16:52:07 +0000 (UTC)
Subject: rpms/rumor/devel import.log, NONE, 1.1 rumor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401165207.E61697011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/rumor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13508/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rumor.spec 
Log Message:
* Sat Mar 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-2
- Remove -O0 flag altogether instead of replacing with -O2
- Fix mixed usage of tabs&spaces

* Sun Mar 15 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-1
- Initial build



--- NEW FILE import.log ---
rumor-1_0_3b-2_fc10:HEAD:rumor-1.0.3b-2.fc10.src.rpm:1238604662


--- NEW FILE rumor.spec ---
Name:		 rumor
Version:	 1.0.3b
Release:	 2%{?dist}
Summary:	 Really Unintelligent Music transcriptOR 
Group:		 Applications/Multimedia
License:	 GPLv2
URL:		 http://www.volny.cz/smilauer/rumor/rumor.html
Source0:	 http://www.volny.cz/smilauer/rumor/src/rumor-1.0.3b.tar.bz2
BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	 alsa-lib-devel
BuildRequires:	 guile-devel
Requires(post):  info
Requires(preun): info

%description
Rumor is a realtime monophonic (with chords) MIDI keyboard to Lilypond 
converter. It receives MIDI events, quantizes them according to its metronome
on the fly and outputs handwritten-like corresponding Lilypond notation. Tempo,
meter, key and other parameters can be set via command-line options.

%prep
%setup -q

# Impose optflags
sed -i 's|-O0||' configure

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove unwanted file:
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS COPYING README TODO
%{_bindir}/%{name}
%{_infodir}/%{name}.info*

%changelog
* Sat Mar 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-2
- Remove -O0 flag altogether instead of replacing with -O2
- Fix mixed usage of tabs&spaces

* Sun Mar 15 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rumor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:32:36 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:51:37 -0000	1.2
@@ -0,0 +1 @@
+rumor-1.0.3b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rumor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:32:36 -0000	1.1
+++ sources	1 Apr 2009 16:51:37 -0000	1.2
@@ -0,0 +1 @@
+c95917356659b77bb83505cb2512ad1b  rumor-1.0.3b.tar.bz2



From oget at fedoraproject.org  Wed Apr  1 16:53:33 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 16:53:33 +0000 (UTC)
Subject: rpms/rumor/F-10 import.log, NONE, 1.1 rumor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401165333.467307011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/rumor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13994/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rumor.spec 
Log Message:
* Sat Mar 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-2
- Remove -O0 flag altogether instead of replacing with -O2
- Fix mixed usage of tabs&spaces

* Sun Mar 15 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-1
- Initial build



--- NEW FILE import.log ---
rumor-1_0_3b-2_fc10:F-10:rumor-1.0.3b-2.fc10.src.rpm:1238604761


--- NEW FILE rumor.spec ---
Name:		 rumor
Version:	 1.0.3b
Release:	 2%{?dist}
Summary:	 Really Unintelligent Music transcriptOR 
Group:		 Applications/Multimedia
License:	 GPLv2
URL:		 http://www.volny.cz/smilauer/rumor/rumor.html
Source0:	 http://www.volny.cz/smilauer/rumor/src/rumor-1.0.3b.tar.bz2
BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	 alsa-lib-devel
BuildRequires:	 guile-devel
Requires(post):  info
Requires(preun): info

%description
Rumor is a realtime monophonic (with chords) MIDI keyboard to Lilypond 
converter. It receives MIDI events, quantizes them according to its metronome
on the fly and outputs handwritten-like corresponding Lilypond notation. Tempo,
meter, key and other parameters can be set via command-line options.

%prep
%setup -q

# Impose optflags
sed -i 's|-O0||' configure

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove unwanted file:
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS COPYING README TODO
%{_bindir}/%{name}
%{_infodir}/%{name}.info*

%changelog
* Sat Mar 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-2
- Remove -O0 flag altogether instead of replacing with -O2
- Fix mixed usage of tabs&spaces

* Sun Mar 15 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rumor/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:32:36 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:53:03 -0000	1.2
@@ -0,0 +1 @@
+rumor-1.0.3b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rumor/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:32:36 -0000	1.1
+++ sources	1 Apr 2009 16:53:03 -0000	1.2
@@ -0,0 +1 @@
+c95917356659b77bb83505cb2512ad1b  rumor-1.0.3b.tar.bz2



From oget at fedoraproject.org  Wed Apr  1 16:54:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 16:54:49 +0000 (UTC)
Subject: rpms/rumor/F-9 import.log, NONE, 1.1 rumor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401165449.3CFBD7011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/rumor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14517/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rumor.spec 
Log Message:
* Sat Mar 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-2
- Remove -O0 flag altogether instead of replacing with -O2
- Fix mixed usage of tabs&spaces

* Sun Mar 15 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-1
- Initial build



--- NEW FILE import.log ---
rumor-1_0_3b-2_fc10:F-9:rumor-1.0.3b-2.fc10.src.rpm:1238604842


--- NEW FILE rumor.spec ---
Name:		 rumor
Version:	 1.0.3b
Release:	 2%{?dist}
Summary:	 Really Unintelligent Music transcriptOR 
Group:		 Applications/Multimedia
License:	 GPLv2
URL:		 http://www.volny.cz/smilauer/rumor/rumor.html
Source0:	 http://www.volny.cz/smilauer/rumor/src/rumor-1.0.3b.tar.bz2
BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	 alsa-lib-devel
BuildRequires:	 guile-devel
Requires(post):  info
Requires(preun): info

%description
Rumor is a realtime monophonic (with chords) MIDI keyboard to Lilypond 
converter. It receives MIDI events, quantizes them according to its metronome
on the fly and outputs handwritten-like corresponding Lilypond notation. Tempo,
meter, key and other parameters can be set via command-line options.

%prep
%setup -q

# Impose optflags
sed -i 's|-O0||' configure

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove unwanted file:
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS COPYING README TODO
%{_bindir}/%{name}
%{_infodir}/%{name}.info*

%changelog
* Sat Mar 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-2
- Remove -O0 flag altogether instead of replacing with -O2
- Fix mixed usage of tabs&spaces

* Sun Mar 15 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.3b-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rumor/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:32:36 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:54:19 -0000	1.2
@@ -0,0 +1 @@
+rumor-1.0.3b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rumor/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:32:36 -0000	1.1
+++ sources	1 Apr 2009 16:54:19 -0000	1.2
@@ -0,0 +1 @@
+c95917356659b77bb83505cb2512ad1b  rumor-1.0.3b.tar.bz2



From suravee at fedoraproject.org  Wed Apr  1 16:56:15 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Wed,  1 Apr 2009 16:56:15 +0000 (UTC)
Subject: rpms/libdwarf/devel import.log, NONE, 1.1 libdwarf-soname-fix.patch,
	NONE, 1.1 libdwarf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090401165615.80AFA7013C@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/rpms/libdwarf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15029/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libdwarf-soname-fix.patch libdwarf.spec 
Log Message:
Initial revision



--- NEW FILE import.log ---
libdwarf-0_20090324-4_fc10:HEAD:libdwarf-0.20090324-4.fc10.src.rpm:1238604801

libdwarf-soname-fix.patch:

--- NEW FILE libdwarf-soname-fix.patch ---
--- dwarf-20090324-base/libdwarf/Makefile.in	2009-03-24 15:31:18.000000000 -0500
+++ dwarf-20090324/libdwarf/Makefile.in	2009-03-25 18:52:52.000000000 -0500
@@ -127,8 +127,8 @@
 libdwarf.a:	$(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS) 
 
-libdwarf.so:	$(OBJS)
-	$(CC) $(CFLAGS) -shared $(OBJS) -o $@
+libdwarf.so.0.0:	$(OBJS)
+	$(CC) $(CFLAGS) -shared $(OBJS) -Wl,-soname,libdwarf.so.0.0 -o $@
 
 none:
 	echo "do nothing"


--- NEW FILE libdwarf.spec ---
%define   upstreamid 20090324

Summary:       Library to access the DWARF Debugging file format 
Name:          libdwarf
Version:       0.%{upstreamid}
Release:       4%{?dist}
License:       LGPLv2
Group:         Development/Libraries
URL:           http://reality.sgiweb.org/davea/dwarf.html

#md5sum 4e603955797a1d5d314a9489a4342c24 (for 20090324)
Source0:       http://reality.sgiweb.org/davea/%{name}-%{upstreamid}.tar.gz

# This patch set up the proper soname
Patch0:        libdwarf-soname-fix.patch

BuildRequires: binutils-devel elfutils-libelf-devel
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%package devel
Summary:       Library and header files of libdwarf
License:       LGPLv2
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}
Requires:      elfutils-libelf

%package tools
Summary:       Tools for accessing DWARF debugging information
License:       GPLv2
Group:         Development/Tools
Requires:      %{name} = %{version}-%{release}
Requires:      elfutils-libelf

%description
Library to access the DWARF debugging file format which supports
source level debugging of a number of procedural languages, such as C, C++,
and Fortran.  Please see http://www.dwarfstd.org for DWARF specification.

%description devel
Development package containing library and header files of libdwarf.

%description tools
C++ version of dwarfdump (dwarfdump2) command-line utilities 
to access DWARF debug information.

%prep
%setup -q -n dwarf-%{upstreamid}
%patch0 -p1 -b .soname-fix

%build
pushd libdwarf
%configure --enable-shared
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" libdwarf.so.0.0
ln -s libdwarf.so.0.0 libdwarf.so
ln -s libdwarf.so.0.0 libdwarf.so.0
popd

# Need to also configure dwarfdump since dwarfdump2 Makefile 
# depends on dwarfdump's Makefile
pushd dwarfdump
%configure --enable-shared
popd

pushd dwarfdump2
%configure --enable-shared
# Note: %{?_smp_mflags} failed to build
LD_LIBRARY_PATH="../libdwarf" make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" all
popd

%install
rm -rf %{buildroot}
install -pDm 0644 libdwarf/dwarf.h         %{buildroot}%{_includedir}/libdwarf/dwarf.h
install -pDm 0644 libdwarf/libdwarf.h      %{buildroot}%{_includedir}/libdwarf/libdwarf.h
install -pDm 0755 libdwarf/libdwarf.so.0.0 %{buildroot}%{_libdir}/libdwarf.so.0.0
cp -pd libdwarf/libdwarf.so.0               %{buildroot}%{_libdir}/libdwarf.so.0
cp -pd libdwarf/libdwarf.so                 %{buildroot}%{_libdir}/libdwarf.so
install -pDm 0755 dwarfdump2/dwarfdump     %{buildroot}%{_bindir}/dwarfdump

%clean
rm -rf %{buildroot}

%post -n libdwarf -p /sbin/ldconfig

%postun -n libdwarf -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
%{_libdir}/libdwarf.so.0*

%files devel
%defattr(-,root,root,-)
%doc libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
%doc libdwarf/*.pdf
%{_includedir}/libdwarf
%{_libdir}/libdwarf.so

%files tools
%defattr(-,root,root,-)
%doc dwarfdump2/README dwarfdump2/COPYING dwarfdump2/DWARFDUMPCOPYRIGHT dwarfdump2/GPL.txt
%{_bindir}/dwarfdump

%changelog
* Tue Mar 31 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 0.20090324-4
- Adding _smp_mflags for libdwarf build
- Move CFLAGS override from configure to make
 
* Mon Mar 30 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 0.20090324-3
- Remove AutoreqProv no

* Thu Mar 26 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 0.20090324-2
- Drop the C implementation of dwarfdump. (dwarfdump1)
- Since the doc package is small, we combined the contents into the devel package.
- Fix the version string.
- Drop the static library.
- Add release number to "Requires".
- Fix licensing (v2 instead of v2+)
- Change linking for libdwarf.so and libdwarf.so.0

* Wed Mar 25 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 20090324-1
- Initial Revision



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:40:39 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:55:45 -0000	1.2
@@ -0,0 +1 @@
+libdwarf-20090324.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:40:39 -0000	1.1
+++ sources	1 Apr 2009 16:55:45 -0000	1.2
@@ -0,0 +1 @@
+4e603955797a1d5d314a9489a4342c24  libdwarf-20090324.tar.gz



From ke4qqq at fedoraproject.org  Wed Apr  1 16:56:23 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 16:56:23 +0000 (UTC)
Subject: rpms/sahana/devel import.log, NONE, 1.1 sahana.conf, NONE,
	1.1 sahana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401165623.5BFE77013C@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14818/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sahana.conf sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- Initial CVS commit



--- NEW FILE import.log ---
sahana-0_6_2_2-3_fc10:HEAD:sahana-0.6.2.2-3.fc10.src.rpm:1238604801


--- NEW FILE sahana.conf ---
#conf file for dedicated server installs of Sahana. 
#	v0.1 David Nalley <david at gnsa.us>  - Initial effort
#
Alias /sahana /usr/share/sahana/www
<Directory /usr/share/sahana/www/>
   order deny,allow
   allow from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/maintenance/>
	order deny,allow
	deny from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/benchmarks/>
	order deny,allow
	deny from all
</Directory>


--- NEW FILE sahana.spec ---
#conditional stuff for selinux
%bcond_without selinux

Name: sahana
Version: 0.6.2.2
Release: 3%{?dist}
Summary: Sahana is a free open source disaster management application
Group:	Applications/Publishing
License: LGPLv2+
URL: http://www.sahana.lk/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
#URL for source is http://code.zikula.org/core/downloads/99
Source1: sahana.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: dos2unix
Requires: httpd
Requires: php >= 5.2.0
Requires: php-mysql >= 5.2.0
Requires: php-gd
Requires(pre): policycoreutils
%description
Sahana is a free and open source Disaster Management 
System.It mainly facilitates management of Missing people, 
disaster victims, Managing and administrating various 
organisations, managing camps and managing requests and 
assistance in the proper distribution of resources. 


%pre
%if %{with selinux} 
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || :
%endif 


%prep
%setup -qn %{name} 

%build
#nothing really for this section but rpmbuild complains if build is empty

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -m 0775 -p %{buildroot}/%{_sysconfdir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name}
rm -rf www/tmp
# in the above we are deleting the tmp dir and we'll link tmp to localstatedir
cp -pr 3rd inc inst mod res test tools www -t %{buildroot}/%{_datadir}/%{name}
install -m 0644 about.inc  %{buildroot}/%{_datadir}/%{name}
chmod -x CHANGELOG.TXT
dos2unix README_Portable_App


install -m 0664 ./conf/* %{buildroot}/%{_sysconfdir}/%{name}/
ln -sf ../../..%{_sysconfdir}/%{name}/ %{buildroot}/%{_datadir}/%{name}/conf
install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/sahana.conf
ln -sf ../../../../..%{_localstatedir}/lib/%{name} %{buildroot}/%{_datadir}/%{name}/www/tmp
find ${RPM_BUILD_ROOT} -type f -name \*.php -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.js -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.css -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.html -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ini -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xsl -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xml -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.svg -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
find ${RPM_BUILD_ROOT} -type f -name check_template -exec chmod 755 {} \;
chmod +x %{buildroot}/%{_datadir}/%{name}/test/code/* 
grep -IUrl '^M' ${RPM_BUILD_ROOT} | xargs -ifile dos2unix 'file'
chmod +x %{buildroot}/%{_datadir}/%{name}/3rd/htmlpurifier/maintenance/*-*.php
chmod +x %{buildroot}/%{_datadir}/%{name}/tools/build_pot
chmod +x %{buildroot}/%{_datadir}/%{name}/inst/create-mysql
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/handler_options.inc
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/lib_message.inc


%clean
rm -rf %{buildroot}

%post
symlinks -crs /usr/share/sahana >/dev/null 2>&1 || :


%files

%defattr(-,root,root,-)
%doc INSTALL
%doc README
%doc README_Portable_App
%doc CHANGELOG.TXT
%{_datadir}/%{name}
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/sahana.conf
%attr(775,root,apache) %dir %{_sysconfdir}/%{name}
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/sysconf.inc.tpl
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/conf-order.inc


%changelog
* Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- added BuildRequires dos2unix
* Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2
- corrected semanage pre scripts to be conditional
- pushed all output from symlinks to /dev/null since there is no silent option
- moved post between clean and files
- changed attr to 775 for conf dir and 664 for files so that the webinstall will work. 
- created symlink www/tmp to localstatedir to facilitate  writing by apache 
- changed url to source to use macros for name and version
* Fri Mar 20 2009 David Nalley <david at gnsa.us> 0.6.2.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:00 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:55:53 -0000	1.2
@@ -0,0 +1 @@
+sahana-0.6.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:01 -0000	1.1
+++ sources	1 Apr 2009 16:55:53 -0000	1.2
@@ -0,0 +1 @@
+1df2ecad5ea81b61d10a6f8b42d2e260  sahana-0.6.2.2.tar.gz



From ke4qqq at fedoraproject.org  Wed Apr  1 16:58:03 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 16:58:03 +0000 (UTC)
Subject: rpms/sahana/F-9 import.log, NONE, 1.1 sahana.conf, NONE,
	1.1 sahana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401165803.192AB7011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16409/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sahana.conf sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- Initial CVS commit



--- NEW FILE import.log ---
sahana-0_6_2_2-3_fc10:F-9:sahana-0.6.2.2-3.fc10.src.rpm:1238604960


--- NEW FILE sahana.conf ---
#conf file for dedicated server installs of Sahana. 
#	v0.1 David Nalley <david at gnsa.us>  - Initial effort
#
Alias /sahana /usr/share/sahana/www
<Directory /usr/share/sahana/www/>
   order deny,allow
   allow from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/maintenance/>
	order deny,allow
	deny from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/benchmarks/>
	order deny,allow
	deny from all
</Directory>


--- NEW FILE sahana.spec ---
#conditional stuff for selinux
%bcond_without selinux

Name: sahana
Version: 0.6.2.2
Release: 3%{?dist}
Summary: Sahana is a free open source disaster management application
Group:	Applications/Publishing
License: LGPLv2+
URL: http://www.sahana.lk/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
#URL for source is http://code.zikula.org/core/downloads/99
Source1: sahana.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: dos2unix
Requires: httpd
Requires: php >= 5.2.0
Requires: php-mysql >= 5.2.0
Requires: php-gd
Requires(pre): policycoreutils
%description
Sahana is a free and open source Disaster Management 
System.It mainly facilitates management of Missing people, 
disaster victims, Managing and administrating various 
organisations, managing camps and managing requests and 
assistance in the proper distribution of resources. 


%pre
%if %{with selinux} 
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || :
%endif 


%prep
%setup -qn %{name} 

%build
#nothing really for this section but rpmbuild complains if build is empty

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -m 0775 -p %{buildroot}/%{_sysconfdir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name}
rm -rf www/tmp
# in the above we are deleting the tmp dir and we'll link tmp to localstatedir
cp -pr 3rd inc inst mod res test tools www -t %{buildroot}/%{_datadir}/%{name}
install -m 0644 about.inc  %{buildroot}/%{_datadir}/%{name}
chmod -x CHANGELOG.TXT
dos2unix README_Portable_App


install -m 0664 ./conf/* %{buildroot}/%{_sysconfdir}/%{name}/
ln -sf ../../..%{_sysconfdir}/%{name}/ %{buildroot}/%{_datadir}/%{name}/conf
install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/sahana.conf
ln -sf ../../../../..%{_localstatedir}/lib/%{name} %{buildroot}/%{_datadir}/%{name}/www/tmp
find ${RPM_BUILD_ROOT} -type f -name \*.php -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.js -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.css -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.html -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ini -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xsl -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xml -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.svg -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
find ${RPM_BUILD_ROOT} -type f -name check_template -exec chmod 755 {} \;
chmod +x %{buildroot}/%{_datadir}/%{name}/test/code/* 
grep -IUrl '^M' ${RPM_BUILD_ROOT} | xargs -ifile dos2unix 'file'
chmod +x %{buildroot}/%{_datadir}/%{name}/3rd/htmlpurifier/maintenance/*-*.php
chmod +x %{buildroot}/%{_datadir}/%{name}/tools/build_pot
chmod +x %{buildroot}/%{_datadir}/%{name}/inst/create-mysql
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/handler_options.inc
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/lib_message.inc


%clean
rm -rf %{buildroot}

%post
symlinks -crs /usr/share/sahana >/dev/null 2>&1 || :


%files

%defattr(-,root,root,-)
%doc INSTALL
%doc README
%doc README_Portable_App
%doc CHANGELOG.TXT
%{_datadir}/%{name}
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/sahana.conf
%attr(775,root,apache) %dir %{_sysconfdir}/%{name}
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/sysconf.inc.tpl
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/conf-order.inc


%changelog
* Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- added BuildRequires dos2unix
* Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2
- corrected semanage pre scripts to be conditional
- pushed all output from symlinks to /dev/null since there is no silent option
- moved post between clean and files
- changed attr to 775 for conf dir and 664 for files so that the webinstall will work. 
- created symlink www/tmp to localstatedir to facilitate  writing by apache 
- changed url to source to use macros for name and version
* Fri Mar 20 2009 David Nalley <david at gnsa.us> 0.6.2.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:00 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:57:32 -0000	1.2
@@ -0,0 +1 @@
+sahana-0.6.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:01 -0000	1.1
+++ sources	1 Apr 2009 16:57:32 -0000	1.2
@@ -0,0 +1 @@
+1df2ecad5ea81b61d10a6f8b42d2e260  sahana-0.6.2.2.tar.gz



From kkofler at fedoraproject.org  Wed Apr  1 16:58:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  1 Apr 2009 16:58:09 +0000 (UTC)
Subject: rpms/qgit/F-10 qgit.desktop,1.2,1.3 qgit.spec,1.24,1.25
Message-ID: <20090401165809.846C47011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16446/F-10

Modified Files:
	qgit.desktop qgit.spec 
Log Message:
* Tue Mar 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
- rebuild against Qt 4.5 to work around apparent ABI compatibility issue

(qgit is reported to lock up when built against 4.4 and run against 4.5. We will include the rebuilt version in the qt update.)

Also sync these changes from devel:

* Sat Feb 28 2009 Dan Horak <dan[at]danny.cz> 2.2-4
- update desktop file for recent standards

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Nov 25 2008 Dan Horak <dan[at]danny.cz> 2.2-2
- shorten Summary


Index: qgit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qgit/F-10/qgit.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qgit.desktop	9 Apr 2007 11:44:41 -0000	1.2
+++ qgit.desktop	1 Apr 2009 16:57:39 -0000	1.3
@@ -1,13 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=QGit
 GenericName=QGit
 Comment=git repository browser
 Exec=qgit
-Icon=qgit.png
+Icon=qgit
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Development;X-Fedora;
+Categories=Development;Qt;RevisionControl;
 Version=1.0
-X-Desktop-File-Install-Version=0.4


Index: qgit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgit/F-10/qgit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qgit.spec	17 Jul 2008 13:14:02 -0000	1.24
+++ qgit.spec	1 Apr 2009 16:57:39 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           qgit
 Version:        2.2
-Release:        1%{?dist}
-Summary:        QGit is a git GUI repository browser
+Release:        4%{?dist}.1
+Summary:        GUI browser for git repositories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://digilander.libero.it/mcostalba/
-Source0:        http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}48d.png
 Patch0:         %{name}-2.2-qmake.patch
@@ -56,6 +56,18 @@
 
 
 %changelog
+* Tue Mar 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
+- rebuild against Qt 4.5 to work around apparent ABI compatibility issue
+
+* Sat Feb 28 2009 Dan Horak <dan[at]danny.cz> 2.2-4
+- update desktop file for recent standards
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Nov 25 2008 Dan Horak <dan[at]danny.cz> 2.2-2
+- shorten Summary
+
 * Thu Jul 17 2008 Dan Horak <dan[at]danny.cz> 2.2-1
 - update to upstream version 2.2
 



From kkofler at fedoraproject.org  Wed Apr  1 16:58:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  1 Apr 2009 16:58:09 +0000 (UTC)
Subject: rpms/qgit/F-9 qgit.desktop,1.2,1.3 qgit.spec,1.24,1.25
Message-ID: <20090401165809.BD7B77011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16446/F-9

Modified Files:
	qgit.desktop qgit.spec 
Log Message:
* Tue Mar 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
- rebuild against Qt 4.5 to work around apparent ABI compatibility issue

(qgit is reported to lock up when built against 4.4 and run against 4.5. We will include the rebuilt version in the qt update.)

Also sync these changes from devel:

* Sat Feb 28 2009 Dan Horak <dan[at]danny.cz> 2.2-4
- update desktop file for recent standards

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Nov 25 2008 Dan Horak <dan[at]danny.cz> 2.2-2
- shorten Summary


Index: qgit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qgit/F-9/qgit.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qgit.desktop	9 Apr 2007 11:44:41 -0000	1.2
+++ qgit.desktop	1 Apr 2009 16:57:39 -0000	1.3
@@ -1,13 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=QGit
 GenericName=QGit
 Comment=git repository browser
 Exec=qgit
-Icon=qgit.png
+Icon=qgit
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Development;X-Fedora;
+Categories=Development;Qt;RevisionControl;
 Version=1.0
-X-Desktop-File-Install-Version=0.4


Index: qgit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgit/F-9/qgit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qgit.spec	17 Jul 2008 13:16:46 -0000	1.24
+++ qgit.spec	1 Apr 2009 16:57:39 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           qgit
 Version:        2.2
-Release:        1%{?dist}
-Summary:        QGit is a git GUI repository browser
+Release:        4%{?dist}.1
+Summary:        GUI browser for git repositories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://digilander.libero.it/mcostalba/
-Source0:        http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}48d.png
 Patch0:         %{name}-2.2-qmake.patch
@@ -56,6 +56,18 @@
 
 
 %changelog
+* Tue Mar 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
+- rebuild against Qt 4.5 to work around apparent ABI compatibility issue
+
+* Sat Feb 28 2009 Dan Horak <dan[at]danny.cz> 2.2-4
+- update desktop file for recent standards
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Nov 25 2008 Dan Horak <dan[at]danny.cz> 2.2-2
+- shorten Summary
+
 * Thu Jul 17 2008 Dan Horak <dan[at]danny.cz> 2.2-1
 - update to upstream version 2.2
 



From ke4qqq at fedoraproject.org  Wed Apr  1 16:59:16 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 16:59:16 +0000 (UTC)
Subject: rpms/sahana/F-10 import.log, NONE, 1.1 sahana.conf, NONE,
	1.1 sahana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401165916.B041A7011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16816/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sahana.conf sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- Initial CVS commit



--- NEW FILE import.log ---
sahana-0_6_2_2-3_fc10:F-10:sahana-0.6.2.2-3.fc10.src.rpm:1238605038


--- NEW FILE sahana.conf ---
#conf file for dedicated server installs of Sahana. 
#	v0.1 David Nalley <david at gnsa.us>  - Initial effort
#
Alias /sahana /usr/share/sahana/www
<Directory /usr/share/sahana/www/>
   order deny,allow
   allow from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/maintenance/>
	order deny,allow
	deny from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/benchmarks/>
	order deny,allow
	deny from all
</Directory>


--- NEW FILE sahana.spec ---
#conditional stuff for selinux
%bcond_without selinux

Name: sahana
Version: 0.6.2.2
Release: 3%{?dist}
Summary: Sahana is a free open source disaster management application
Group:	Applications/Publishing
License: LGPLv2+
URL: http://www.sahana.lk/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
#URL for source is http://code.zikula.org/core/downloads/99
Source1: sahana.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: dos2unix
Requires: httpd
Requires: php >= 5.2.0
Requires: php-mysql >= 5.2.0
Requires: php-gd
Requires(pre): policycoreutils
%description
Sahana is a free and open source Disaster Management 
System.It mainly facilitates management of Missing people, 
disaster victims, Managing and administrating various 
organisations, managing camps and managing requests and 
assistance in the proper distribution of resources. 


%pre
%if %{with selinux} 
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || :
%endif 


%prep
%setup -qn %{name} 

%build
#nothing really for this section but rpmbuild complains if build is empty

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -m 0775 -p %{buildroot}/%{_sysconfdir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name}
rm -rf www/tmp
# in the above we are deleting the tmp dir and we'll link tmp to localstatedir
cp -pr 3rd inc inst mod res test tools www -t %{buildroot}/%{_datadir}/%{name}
install -m 0644 about.inc  %{buildroot}/%{_datadir}/%{name}
chmod -x CHANGELOG.TXT
dos2unix README_Portable_App


install -m 0664 ./conf/* %{buildroot}/%{_sysconfdir}/%{name}/
ln -sf ../../..%{_sysconfdir}/%{name}/ %{buildroot}/%{_datadir}/%{name}/conf
install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/sahana.conf
ln -sf ../../../../..%{_localstatedir}/lib/%{name} %{buildroot}/%{_datadir}/%{name}/www/tmp
find ${RPM_BUILD_ROOT} -type f -name \*.php -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.js -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.css -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.html -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ini -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xsl -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xml -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.svg -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
find ${RPM_BUILD_ROOT} -type f -name check_template -exec chmod 755 {} \;
chmod +x %{buildroot}/%{_datadir}/%{name}/test/code/* 
grep -IUrl '^M' ${RPM_BUILD_ROOT} | xargs -ifile dos2unix 'file'
chmod +x %{buildroot}/%{_datadir}/%{name}/3rd/htmlpurifier/maintenance/*-*.php
chmod +x %{buildroot}/%{_datadir}/%{name}/tools/build_pot
chmod +x %{buildroot}/%{_datadir}/%{name}/inst/create-mysql
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/handler_options.inc
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/lib_message.inc


%clean
rm -rf %{buildroot}

%post
symlinks -crs /usr/share/sahana >/dev/null 2>&1 || :


%files

%defattr(-,root,root,-)
%doc INSTALL
%doc README
%doc README_Portable_App
%doc CHANGELOG.TXT
%{_datadir}/%{name}
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/sahana.conf
%attr(775,root,apache) %dir %{_sysconfdir}/%{name}
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/sysconf.inc.tpl
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/conf-order.inc


%changelog
* Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- added BuildRequires dos2unix
* Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2
- corrected semanage pre scripts to be conditional
- pushed all output from symlinks to /dev/null since there is no silent option
- moved post between clean and files
- changed attr to 775 for conf dir and 664 for files so that the webinstall will work. 
- created symlink www/tmp to localstatedir to facilitate  writing by apache 
- changed url to source to use macros for name and version
* Fri Mar 20 2009 David Nalley <david at gnsa.us> 0.6.2.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:00 -0000	1.1
+++ .cvsignore	1 Apr 2009 16:58:46 -0000	1.2
@@ -0,0 +1 @@
+sahana-0.6.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:01 -0000	1.1
+++ sources	1 Apr 2009 16:58:46 -0000	1.2
@@ -0,0 +1 @@
+1df2ecad5ea81b61d10a6f8b42d2e260  sahana-0.6.2.2.tar.gz



From transif at fedoraproject.org  Wed Apr  1 17:00:23 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  1 Apr 2009 17:00:23 +0000 (UTC)
Subject: comps/po el.po,1.18,1.19
Message-ID: <20090401170023.25DB67011D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17531/po

Modified Files:
	el.po 
Log Message:
Sending translation for Greek


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 el.po
Index: el.po
===================================================================
RCS file: /cvs/pkgs/comps/po/el.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- el.po	9 Jan 2009 11:52:36 -0000	1.18
+++ el.po	1 Apr 2009 16:59:52 -0000	1.19
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-12 13:57+0200\n"
-"Last-Translator: Pierros Papadeas <ppapadeas at gmail.com>\n"
+"POT-Creation-Date: 2009-04-01 14:04+0000\n"
+"PO-Revision-Date: 2009-04-01 19:58+0200\n"
+"Last-Translator: nikosCharonitakis <nikosx at gmail.com>\n"
 "Language-Team: Greek <fedora-trans-el at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,200 +21,320 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"?????? ?????????????? ?????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? "
-"????????????????????."
+msgstr "?????? ?????????????? ?????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? ????????????????????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????????????? ??????????????????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "???????????????????? ??????????????????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "???????????????????? ??????????????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????????????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "?????????????????? ?????? ?????? ???????????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????????????????? ??????????????????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "???????????????????? Assamese"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????????? ?????? ????????????????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:14
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "???????????? ???????????????????? ?????? ???? ???????????? ?????????????????????????????? Ruby"
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "???????????????????? ????????????????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "???????????????????? Belarusian"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "???????????????????? ??????????????????"
 
[...2407 lines suppressed...]
-msgstr "???????????????????? Kannada"
+msgstr "???????????????????? Kinyarwanda"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "???????????????????? ??????????????????????"
+msgstr "???????????????????? Malagasy"
 
-#: ../comps-f11.xml.in.h:132
+#: ../comps-f11.xml.in.h:126
 #, fuzzy
+msgid "MinGW cross-compiler"
+msgstr "MinGW cross-compiler"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? Occitan"
 
-#: ../comps-f11.xml.in.h:201
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "??????????????????????  ?????????????? ?????? ????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "???????????????????? ???????????????? Sugar"
+
+#: ../comps-f11.xml.in.h:170
+msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora."
+msgstr ""
+
+#: ../comps-f11.xml.in.h:173
 #, fuzzy
-msgid ""
-"This group is a collection of tools used in the design, modification, "
-"manipulation, and packaging of fonts."
-msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????????? ????????????????????????."
+msgid "Support for developing software using the Objective CAML programming language and libraries."
+msgstr "???????????????????? ?????????????????? ???????????????????? ?????? ???????????? ?????????????????????????????? Java."
 
-#: ../comps-f11.xml.in.h:213
+#: ../comps-f11.xml.in.h:208
 #, fuzzy
+msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????????? ????????????????????????."
+
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ??????????????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "???????????????????? ????????????????"
+msgstr "???????????????????? Upper Sorbian"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?????????????????? ?????? ?????? ???????????????? ????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "???????????????????? ?????????????????? ???????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"???? GNOME ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? "
-"??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? "
-"??????????????."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"???? KDE ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? "
-"??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? "
-"??????????????."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"?????????????? ?????????????????????? ??????????????????????????, ?????????? ???? ?????????????????? ???????????? ???????????? ?????? "
-"???????????????????? ?????? ?????????????????? ??????????????. ???????? ?? Emacs ?????? ?? Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "???? GNOME ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? ??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? ??????????????."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "???? KDE ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? ??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? ??????????????."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "?????????????? ?????????????????????? ??????????????????????????, ?????????? ???? ?????????????????? ???????????? ???????????? ?????? ???????????????????? ?????? ?????????????????? ??????????????. ???????? ?? Emacs ?????? ?? Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "?? ???????????????????????? ???????????????? XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"???????? ???? ???????????????? ?????? ???????????????????? ???? ?????????????????????????? ?????????????? ???? ?????????? DocBook  "
-"?????? ???? ???? ?????????????????????? ???? HTML, PDF, Postscript ?? ?????? ???????? ??????????????."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "???????? ???? ???????????????? ?????? ???????????????????? ???? ?????????????????????????? ?????????????? ???? ?????????? DocBook  ?????? ???? ???? ?????????????????????? ???? HTML, PDF, Postscript ?? ?????? ???????? ??????????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????????????? ?????????????? ?????? ???????????????? ??????????????"
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????????????? ?????????????? ?????? ???????????????? ??????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? "
-"???????????????????????? ????????????????."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ???????????????? "
-"????????????????????????."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? ???????????????????????? ????????????????."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ???????????????? ????????????????????????."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????????????? ????????????????????????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????????????? "
-"????????????????????????."
-
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? "
-"????????????????????????."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? ????????????????????????."
 
 #, fuzzy
 #~ msgid "British Support"
@@ -1486,3 +2065,4 @@
 #, fuzzy
 #~ msgid "Virtualization Support."
 #~ msgstr "????????????????????????????"
+



From ke4qqq at fedoraproject.org  Wed Apr  1 17:00:36 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:00:36 +0000 (UTC)
Subject: rpms/sahana/F-11 import.log, NONE, 1.1 sahana.conf, NONE,
	1.1 sahana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401170036.121827011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17614/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sahana.conf sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- Initial CVS commit



--- NEW FILE import.log ---
sahana-0_6_2_2-3_fc10:F-11:sahana-0.6.2.2-3.fc10.src.rpm:1238605116


--- NEW FILE sahana.conf ---
#conf file for dedicated server installs of Sahana. 
#	v0.1 David Nalley <david at gnsa.us>  - Initial effort
#
Alias /sahana /usr/share/sahana/www
<Directory /usr/share/sahana/www/>
   order deny,allow
   allow from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/maintenance/>
	order deny,allow
	deny from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/benchmarks/>
	order deny,allow
	deny from all
</Directory>


--- NEW FILE sahana.spec ---
#conditional stuff for selinux
%bcond_without selinux

Name: sahana
Version: 0.6.2.2
Release: 3%{?dist}
Summary: Sahana is a free open source disaster management application
Group:	Applications/Publishing
License: LGPLv2+
URL: http://www.sahana.lk/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
#URL for source is http://code.zikula.org/core/downloads/99
Source1: sahana.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: dos2unix
Requires: httpd
Requires: php >= 5.2.0
Requires: php-mysql >= 5.2.0
Requires: php-gd
Requires(pre): policycoreutils
%description
Sahana is a free and open source Disaster Management 
System.It mainly facilitates management of Missing people, 
disaster victims, Managing and administrating various 
organisations, managing camps and managing requests and 
assistance in the proper distribution of resources. 


%pre
%if %{with selinux} 
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || :
%endif 


%prep
%setup -qn %{name} 

%build
#nothing really for this section but rpmbuild complains if build is empty

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -m 0775 -p %{buildroot}/%{_sysconfdir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name}
rm -rf www/tmp
# in the above we are deleting the tmp dir and we'll link tmp to localstatedir
cp -pr 3rd inc inst mod res test tools www -t %{buildroot}/%{_datadir}/%{name}
install -m 0644 about.inc  %{buildroot}/%{_datadir}/%{name}
chmod -x CHANGELOG.TXT
dos2unix README_Portable_App


install -m 0664 ./conf/* %{buildroot}/%{_sysconfdir}/%{name}/
ln -sf ../../..%{_sysconfdir}/%{name}/ %{buildroot}/%{_datadir}/%{name}/conf
install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/sahana.conf
ln -sf ../../../../..%{_localstatedir}/lib/%{name} %{buildroot}/%{_datadir}/%{name}/www/tmp
find ${RPM_BUILD_ROOT} -type f -name \*.php -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.js -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.css -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.html -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ini -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xsl -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xml -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.svg -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
find ${RPM_BUILD_ROOT} -type f -name check_template -exec chmod 755 {} \;
chmod +x %{buildroot}/%{_datadir}/%{name}/test/code/* 
grep -IUrl '^M' ${RPM_BUILD_ROOT} | xargs -ifile dos2unix 'file'
chmod +x %{buildroot}/%{_datadir}/%{name}/3rd/htmlpurifier/maintenance/*-*.php
chmod +x %{buildroot}/%{_datadir}/%{name}/tools/build_pot
chmod +x %{buildroot}/%{_datadir}/%{name}/inst/create-mysql
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/handler_options.inc
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/lib_message.inc


%clean
rm -rf %{buildroot}

%post
symlinks -crs /usr/share/sahana >/dev/null 2>&1 || :


%files

%defattr(-,root,root,-)
%doc INSTALL
%doc README
%doc README_Portable_App
%doc CHANGELOG.TXT
%{_datadir}/%{name}
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/sahana.conf
%attr(775,root,apache) %dir %{_sysconfdir}/%{name}
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/sysconf.inc.tpl
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/conf-order.inc


%changelog
* Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- added BuildRequires dos2unix
* Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2
- corrected semanage pre scripts to be conditional
- pushed all output from symlinks to /dev/null since there is no silent option
- moved post between clean and files
- changed attr to 775 for conf dir and 664 for files so that the webinstall will work. 
- created symlink www/tmp to localstatedir to facilitate  writing by apache 
- changed url to source to use macros for name and version
* Fri Mar 20 2009 David Nalley <david at gnsa.us> 0.6.2.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:00 -0000	1.1
+++ .cvsignore	1 Apr 2009 17:00:05 -0000	1.2
@@ -0,0 +1 @@
+sahana-0.6.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:01 -0000	1.1
+++ sources	1 Apr 2009 17:00:05 -0000	1.2
@@ -0,0 +1 @@
+1df2ecad5ea81b61d10a6f8b42d2e260  sahana-0.6.2.2.tar.gz



From ke4qqq at fedoraproject.org  Wed Apr  1 17:02:07 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:02:07 +0000 (UTC)
Subject: rpms/sahana/EL-5 import.log, NONE, 1.1 sahana.conf, NONE,
	1.1 sahana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401170207.7961B7011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18098/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sahana.conf sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- Initial CVS commit



--- NEW FILE import.log ---
sahana-0_6_2_2-3_fc10:EL-5:sahana-0.6.2.2-3.fc10.src.rpm:1238605197


--- NEW FILE sahana.conf ---
#conf file for dedicated server installs of Sahana. 
#	v0.1 David Nalley <david at gnsa.us>  - Initial effort
#
Alias /sahana /usr/share/sahana/www
<Directory /usr/share/sahana/www/>
   order deny,allow
   allow from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/maintenance/>
	order deny,allow
	deny from all
</Directory>

<Directory /usr/share/sahana/3rd/htmlpurifier/benchmarks/>
	order deny,allow
	deny from all
</Directory>


--- NEW FILE sahana.spec ---
#conditional stuff for selinux
%bcond_without selinux

Name: sahana
Version: 0.6.2.2
Release: 3%{?dist}
Summary: Sahana is a free open source disaster management application
Group:	Applications/Publishing
License: LGPLv2+
URL: http://www.sahana.lk/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
#URL for source is http://code.zikula.org/core/downloads/99
Source1: sahana.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: dos2unix
Requires: httpd
Requires: php >= 5.2.0
Requires: php-mysql >= 5.2.0
Requires: php-gd
Requires(pre): policycoreutils
%description
Sahana is a free and open source Disaster Management 
System.It mainly facilitates management of Missing people, 
disaster victims, Managing and administrating various 
organisations, managing camps and managing requests and 
assistance in the proper distribution of resources. 


%pre
%if %{with selinux} 
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name} 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/conf-order.inc 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc.tpl 2>/dev/null || :
semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/sysconf.inc 2>/dev/null || :
%endif 


%prep
%setup -qn %{name} 

%build
#nothing really for this section but rpmbuild complains if build is empty

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -m 0775 -p %{buildroot}/%{_sysconfdir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name}
rm -rf www/tmp
# in the above we are deleting the tmp dir and we'll link tmp to localstatedir
cp -pr 3rd inc inst mod res test tools www -t %{buildroot}/%{_datadir}/%{name}
install -m 0644 about.inc  %{buildroot}/%{_datadir}/%{name}
chmod -x CHANGELOG.TXT
dos2unix README_Portable_App


install -m 0664 ./conf/* %{buildroot}/%{_sysconfdir}/%{name}/
ln -sf ../../..%{_sysconfdir}/%{name}/ %{buildroot}/%{_datadir}/%{name}/conf
install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/sahana.conf
ln -sf ../../../../..%{_localstatedir}/lib/%{name} %{buildroot}/%{_datadir}/%{name}/www/tmp
find ${RPM_BUILD_ROOT} -type f -name \*.php -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.js -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.css -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.html -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ini -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xsl -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.xml -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.svg -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
find ${RPM_BUILD_ROOT} -type f -name check_template -exec chmod 755 {} \;
chmod +x %{buildroot}/%{_datadir}/%{name}/test/code/* 
grep -IUrl '^M' ${RPM_BUILD_ROOT} | xargs -ifile dos2unix 'file'
chmod +x %{buildroot}/%{_datadir}/%{name}/3rd/htmlpurifier/maintenance/*-*.php
chmod +x %{buildroot}/%{_datadir}/%{name}/tools/build_pot
chmod +x %{buildroot}/%{_datadir}/%{name}/inst/create-mysql
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/handler_options.inc
chmod +x %{buildroot}/%{_datadir}/%{name}/inc/lib_asp/lib_message.inc


%clean
rm -rf %{buildroot}

%post
symlinks -crs /usr/share/sahana >/dev/null 2>&1 || :


%files

%defattr(-,root,root,-)
%doc INSTALL
%doc README
%doc README_Portable_App
%doc CHANGELOG.TXT
%{_datadir}/%{name}
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/sahana.conf
%attr(775,root,apache) %dir %{_sysconfdir}/%{name}
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/sysconf.inc.tpl
%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/conf-order.inc


%changelog
* Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
- added BuildRequires dos2unix
* Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2
- corrected semanage pre scripts to be conditional
- pushed all output from symlinks to /dev/null since there is no silent option
- moved post between clean and files
- changed attr to 775 for conf dir and 664 for files so that the webinstall will work. 
- created symlink www/tmp to localstatedir to facilitate  writing by apache 
- changed url to source to use macros for name and version
* Fri Mar 20 2009 David Nalley <david at gnsa.us> 0.6.2.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:00 -0000	1.1
+++ .cvsignore	1 Apr 2009 17:01:37 -0000	1.2
@@ -0,0 +1 @@
+sahana-0.6.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:01 -0000	1.1
+++ sources	1 Apr 2009 17:01:37 -0000	1.2
@@ -0,0 +1 @@
+1df2ecad5ea81b61d10a6f8b42d2e260  sahana-0.6.2.2.tar.gz



From rmeggins at fedoraproject.org  Wed Apr  1 17:02:31 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 17:02:31 +0000 (UTC)
Subject: rpms/fedora-ds-admin-console/F-10 .cvsignore, 1.3,
	1.4 fedora-ds-admin-console.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090401170231.829297011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin-console/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18169/F-10

Modified Files:
	.cvsignore fedora-ds-admin-console.spec sources 
Log Message:
this is the 1.1.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:51:02 -0000	1.3
+++ .cvsignore	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-admin-console-1.1.1.tar.bz2
-fedora-ds-admin-console-1.1.2.tar.bz2
+fedora-ds-admin-console-1.1.3.tar.bz2


Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-10/fedora-ds-admin-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin-console.spec	4 Sep 2008 15:51:02 -0000	1.3
+++ fedora-ds-admin-console.spec	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 2
+%define minor_version 3
 
 %define dsname fedora-ds
 %define shortname fedora-admin
@@ -21,7 +21,7 @@
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: idm-console-framework
-BuildRequires: java-devel > 1.5.0
+BuildRequires: java-devel >= 1:1.6.0
 Obsoletes: fedora-admin-console
 
 %description
@@ -71,6 +71,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - disable SSLv2 settings
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 15:51:02 -0000	1.3
+++ sources	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,2 +1 @@
-3f8c2757b92917aa58ab782c1d30bad3  fedora-ds-admin-console-1.1.1.tar.bz2
-e40ffc75263637e886fdf62b20e9a628  fedora-ds-admin-console-1.1.2.tar.bz2
+454967f656b712c4cd00098507c57a63  fedora-ds-admin-console-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 17:02:31 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 17:02:31 +0000 (UTC)
Subject: rpms/fedora-ds-admin-console/F-9 .cvsignore, 1.3,
	1.4 fedora-ds-admin-console.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090401170231.DAD757011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin-console/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18169/F-9

Modified Files:
	.cvsignore fedora-ds-admin-console.spec sources 
Log Message:
this is the 1.1.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:51:00 -0000	1.3
+++ .cvsignore	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-admin-console-1.1.1.tar.bz2
-fedora-ds-admin-console-1.1.2.tar.bz2
+fedora-ds-admin-console-1.1.3.tar.bz2


Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-9/fedora-ds-admin-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-admin-console.spec	4 Sep 2008 15:51:00 -0000	1.3
+++ fedora-ds-admin-console.spec	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 2
+%define minor_version 3
 
 %define dsname fedora-ds
 %define shortname fedora-admin
@@ -21,7 +21,7 @@
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: idm-console-framework
-BuildRequires: java-devel > 1.5.0
+BuildRequires: java-devel >= 1:1.6.0
 Obsoletes: fedora-admin-console
 
 %description
@@ -71,6 +71,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Thu Jul  3 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - disable SSLv2 settings
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 15:51:00 -0000	1.3
+++ sources	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,2 +1 @@
-3f8c2757b92917aa58ab782c1d30bad3  fedora-ds-admin-console-1.1.1.tar.bz2
-e40ffc75263637e886fdf62b20e9a628  fedora-ds-admin-console-1.1.2.tar.bz2
+454967f656b712c4cd00098507c57a63  fedora-ds-admin-console-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 17:02:32 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 17:02:32 +0000 (UTC)
Subject: rpms/fedora-ds-admin-console/devel .cvsignore, 1.3,
	1.4 fedora-ds-admin-console.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090401170232.25BBB7011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18169/devel

Modified Files:
	.cvsignore fedora-ds-admin-console.spec sources 
Log Message:
this is the 1.1.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:51:02 -0000	1.3
+++ .cvsignore	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-admin-console-1.1.1.tar.bz2
-fedora-ds-admin-console-1.1.2.tar.bz2
+fedora-ds-admin-console-1.1.3.tar.bz2


Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/devel/fedora-ds-admin-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin-console.spec	24 Feb 2009 16:25:09 -0000	1.4
+++ fedora-ds-admin-console.spec	1 Apr 2009 17:02:01 -0000	1.5
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 2
+%define minor_version 3
 
 %define dsname fedora-ds
 %define shortname fedora-admin
@@ -7,7 +7,7 @@
 
 Name: fedora-ds-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Admin Server Management Console
 
 Group: Applications/System
@@ -21,7 +21,7 @@
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: idm-console-framework
-BuildRequires: java-devel > 1.5.0
+BuildRequires: java-devel >= 1:1.6.0
 Obsoletes: fedora-admin-console
 
 %description
@@ -71,6 +71,9 @@
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin-console/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 15:51:02 -0000	1.3
+++ sources	1 Apr 2009 17:02:01 -0000	1.4
@@ -1,2 +1 @@
-3f8c2757b92917aa58ab782c1d30bad3  fedora-ds-admin-console-1.1.1.tar.bz2
-e40ffc75263637e886fdf62b20e9a628  fedora-ds-admin-console-1.1.2.tar.bz2
+454967f656b712c4cd00098507c57a63  fedora-ds-admin-console-1.1.3.tar.bz2



From suravee at fedoraproject.org  Wed Apr  1 17:13:51 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Wed,  1 Apr 2009 17:13:51 +0000 (UTC)
Subject: rpms/libdwarf/F-10 libdwarf-soname-fix.patch, NONE,
	1.1 libdwarf.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090401171351.7D2487011D@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/rpms/libdwarf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20312

Modified Files:
	sources 
Added Files:
	libdwarf-soname-fix.patch libdwarf.spec 
Log Message:
Initial revision for branch F-10


libdwarf-soname-fix.patch:

--- NEW FILE libdwarf-soname-fix.patch ---
--- dwarf-20090324-base/libdwarf/Makefile.in	2009-03-24 15:31:18.000000000 -0500
+++ dwarf-20090324/libdwarf/Makefile.in	2009-03-25 18:52:52.000000000 -0500
@@ -127,8 +127,8 @@
 libdwarf.a:	$(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS) 
 
-libdwarf.so:	$(OBJS)
-	$(CC) $(CFLAGS) -shared $(OBJS) -o $@
+libdwarf.so.0.0:	$(OBJS)
+	$(CC) $(CFLAGS) -shared $(OBJS) -Wl,-soname,libdwarf.so.0.0 -o $@
 
 none:
 	echo "do nothing"


--- NEW FILE libdwarf.spec ---
%define   upstreamid 20090324

Summary:       Library to access the DWARF Debugging file format 
Name:          libdwarf
Version:       0.%{upstreamid}
Release:       4%{?dist}
License:       LGPLv2
Group:         Development/Libraries
URL:           http://reality.sgiweb.org/davea/dwarf.html

#md5sum 4e603955797a1d5d314a9489a4342c24 (for 20090324)
Source0:       http://reality.sgiweb.org/davea/%{name}-%{upstreamid}.tar.gz

# This patch set up the proper soname
Patch0:        libdwarf-soname-fix.patch

BuildRequires: binutils-devel elfutils-libelf-devel
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%package devel
Summary:       Library and header files of libdwarf
License:       LGPLv2
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}
Requires:      elfutils-libelf

%package tools
Summary:       Tools for accessing DWARF debugging information
License:       GPLv2
Group:         Development/Tools
Requires:      %{name} = %{version}-%{release}
Requires:      elfutils-libelf

%description
Library to access the DWARF debugging file format which supports
source level debugging of a number of procedural languages, such as C, C++,
and Fortran.  Please see http://www.dwarfstd.org for DWARF specification.

%description devel
Development package containing library and header files of libdwarf.

%description tools
C++ version of dwarfdump (dwarfdump2) command-line utilities 
to access DWARF debug information.

%prep
%setup -q -n dwarf-%{upstreamid}
%patch0 -p1 -b .soname-fix

%build
pushd libdwarf
%configure --enable-shared
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" libdwarf.so.0.0
ln -s libdwarf.so.0.0 libdwarf.so
ln -s libdwarf.so.0.0 libdwarf.so.0
popd

# Need to also configure dwarfdump since dwarfdump2 Makefile 
# depends on dwarfdump's Makefile
pushd dwarfdump
%configure --enable-shared
popd

pushd dwarfdump2
%configure --enable-shared
# Note: %{?_smp_mflags} failed to build
LD_LIBRARY_PATH="../libdwarf" make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" all
popd

%install
rm -rf %{buildroot}
install -pDm 0644 libdwarf/dwarf.h         %{buildroot}%{_includedir}/libdwarf/dwarf.h
install -pDm 0644 libdwarf/libdwarf.h      %{buildroot}%{_includedir}/libdwarf/libdwarf.h
install -pDm 0755 libdwarf/libdwarf.so.0.0 %{buildroot}%{_libdir}/libdwarf.so.0.0
cp -pd libdwarf/libdwarf.so.0               %{buildroot}%{_libdir}/libdwarf.so.0
cp -pd libdwarf/libdwarf.so                 %{buildroot}%{_libdir}/libdwarf.so
install -pDm 0755 dwarfdump2/dwarfdump     %{buildroot}%{_bindir}/dwarfdump

%clean
rm -rf %{buildroot}

%post -n libdwarf -p /sbin/ldconfig

%postun -n libdwarf -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
%{_libdir}/libdwarf.so.0*

%files devel
%defattr(-,root,root,-)
%doc libdwarf/README libdwarf/COPYING libdwarf/LIBDWARFCOPYRIGHT libdwarf/LGPL.txt
%doc libdwarf/*.pdf
%{_includedir}/libdwarf
%{_libdir}/libdwarf.so

%files tools
%defattr(-,root,root,-)
%doc dwarfdump2/README dwarfdump2/COPYING dwarfdump2/DWARFDUMPCOPYRIGHT dwarfdump2/GPL.txt
%{_bindir}/dwarfdump

%changelog
* Tue Mar 31 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 0.20090324-4
- Adding _smp_mflags for libdwarf build
- Move CFLAGS override from configure to make
 
* Mon Mar 30 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 0.20090324-3
- Remove AutoreqProv no

* Thu Mar 26 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 0.20090324-2
- Drop the C implementation of dwarfdump. (dwarfdump1)
- Since the doc package is small, we combined the contents into the devel package.
- Fix the version string.
- Drop the static library.
- Add release number to "Requires".
- Fix licensing (v2 instead of v2+)
- Change linking for libdwarf.so and libdwarf.so.0

* Wed Mar 25 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
- 20090324-1
- Initial Revision



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdwarf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:40:39 -0000	1.1
+++ sources	1 Apr 2009 17:13:21 -0000	1.2
@@ -0,0 +1 @@
+4e603955797a1d5d314a9489a4342c24  libdwarf-20090324.tar.gz



From oget at fedoraproject.org  Wed Apr  1 17:16:16 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 17:16:16 +0000 (UTC)
Subject: rpms/frescobaldi/devel frescobaldi.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401171616.73C917011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20941/devel

Modified Files:
	.cvsignore sources 
Added Files:
	frescobaldi.spec import.log 
Log Message:
* Tue Mar 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.8-1
- New upstream version

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-2
- Remove BuildRequires:  dbus-python
- Fix the year of the previous changelog entry
- Add "Public Domain" to the license tag
- Add AudioVideo category to the .desktop file
- Add disttag

* Sun Mar 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-1
- Initial build



--- NEW FILE frescobaldi.spec ---
Name:           frescobaldi
Version:        0.7.8
Release:        1%{?dist}
Summary:        Edit LilyPond sheet music with ease!
Group:          Applications/Editors
# python/hyphenator.py is LGPLv2+
# python/rational.py is public domain
# The rest, including the core of the program, is GPLv2+
License:        GPLv2+ and LGPLv2+ and Public Domain
URL:            http://www.frescobaldi.org/
Source0:        http://lilykde.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  cmake
BuildRequires:  desktop-file-utils
BuildRequires:  gettext 
BuildRequires:  ImageMagick
BuildRequires:  lilypond
BuildRequires:  PyKDE4

Requires:       alsa-utils
Requires:       lilypond
Requires:       PyKDE4 
Requires:       rumor
Requires:       timidity++
# Need katepart, kdialog, okularpart, ...
Requires:       kdebase
Requires:       kdegraphics
Requires:       kdesdk

%description
Frescobaldi is a LilyPond sheet music editor for KDE4. It aims to be powerful,
yet lightweight and easy to use. It features:

    * Enter LilyPond scores, build and preview them with a mouseclick
    * Point-and-click support: click on notes or error messages to jump to the
      correct position
    * A powerful Score Wizard to quickly setup a musical score
    * Editing tools to:
          o manipulate the rhythm
          o hyphenate lyrics
          o quickly enter or add articulations and other symbols to existing 
            music
          o run the document through convert-ly to update it to a newer 
            LilyPond version
    * Context sensitive autocomplete, helping you to quickly enter LilyPond 
      commands
    * Expansion manager to enter larger snippets of LilyPond input using short
      mnemonics
    * A powerful Rumor plugin, using the Rumor program to quickly enter music
      by playing it on a MIDI keyboard or even your computer keyboard
    * Built-in comprehensive User Guide


%prep
%setup -q

# We want to build everything from source
rm -f po/*.mo
rm -f pics/*.png

%build
%{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
make %{?_smp_mflags} VERBOSE=1 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 

## File lists
# locale's
%find_lang %{name}
# HTML (1.0)
HTML_DIR=$(kde4-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
   for lang_dir in %{buildroot}$HTML_DIR/* ; do
      pushd $lang_dir
         # Replace absolute symlinks with relative ones
         for i in *; do
            [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
         done
      popd
   done
fi

# desktop file
desktop-file-install                                         \
   --dir=%{buildroot}%{_datadir}/applications                \
   --remove-category=Application                             \
   --add-category=AudioVideo                                 \
   --delete-original                                         \
   %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop

%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README* THANKS
%{_docdir}/HTML/en/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
%{_datadir}/kde4/apps/%{name}/

%changelog
* Tue Mar 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.8-1
- New upstream version

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-2
- Remove BuildRequires:  dbus-python
- Fix the year of the previous changelog entry
- Add "Public Domain" to the license tag
- Add AudioVideo category to the .desktop file
- Add disttag

* Sun Mar 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-1
- Initial build


--- NEW FILE import.log ---
frescobaldi-0_7_8-1_fc10:HEAD:frescobaldi-0.7.8-1.fc10.src.rpm:1238606124


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Mar 2009 02:49:17 -0000	1.1
+++ .cvsignore	1 Apr 2009 17:15:46 -0000	1.2
@@ -0,0 +1 @@
+frescobaldi-0.7.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Mar 2009 02:49:17 -0000	1.1
+++ sources	1 Apr 2009 17:15:46 -0000	1.2
@@ -0,0 +1 @@
+37e03ac19212ca701a7f975ed03f1f33  frescobaldi-0.7.8.tar.gz



From linville at fedoraproject.org  Wed Apr  1 17:18:02 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  1 Apr 2009 17:18:02 +0000 (UTC)
Subject: rpms/unzoo/devel import.log, NONE, 1.1 unzoo.c, NONE, 1.1 unzoo.spec,
	NONE, 1.1
Message-ID: <20090401171802.146C97011D@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/unzoo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21817/devel

Added Files:
	import.log unzoo.c unzoo.spec 
Log Message:
Package import


--- NEW FILE import.log ---
unzoo-4_4-4_fc10:HEAD:unzoo-4.4-4.fc10.src.rpm:1238606204


--- NEW FILE unzoo.c ---
/****************************************************************************
**
*A  unzoo.c                     Tools                        Martin Schoenert
**
*H  @(#)$Id: unzoo.c,v 4.4 2000/05/29 08:56:57 sal Exp $
**
*Y  This file is in the Public Domain.
**
**  SYNTAX
**
**  'unzoo'
**  'unzoo [-l] [-v] <archive>[.zoo] [<file>..]'
**  'unzoo -x [-abnpo] <archive>[.zoo] [<file>..]'
**
**  DESCRIPTION
**
**  'unzoo' is  a zoo  archive extractor.   A zoo archive   is  a  file  that
**  contains several files, called its members, usually in compressed form to
**  save space.  'unzoo' can list all or  selected members or  extract all or
**  selected members, i.e.,  uncompress them and write   them  to files.   It
**  cannot add new members or  delete  members.  For this   you need the  zoo
**  archiver, called 'zoo', written by Rahul Dhesi.
**
**  If you call 'unzoo'  with no arguments, it will  first print a summary of
**  the commands and  then prompt for  command lines interactively, until you
**  enter an empty line.  This is useful  on systems  that do not support the
**  notion of command line arguments such as the Macintosh.
**
**  If you call  'unzoo' with the  '-l' option,  it lists the  members in the
**  archive <archive>.   For each member 'unzoo'   prints  the size  that the
**  extracted file  would  have, the  compression factor,  the  size that the
**  member occupies in the archive (not  counting  the  space needed to store
**  the attributes such as the path name of the file), the date and time when
**  the files were last modified, and finally  the path name itself.  Finally
**  'unzoo' prints a grand total for the  file sizes, the compression factor,
**  and the member sizes.
**
**  The '-v' suboption causes 'unzoo' to append to each path name,  separated
**  by a ';', the generation number of the member,  where higher numbers mean
**  later generations.  Members for which generations are disabled are listed
**  with  ';0'.  Also 'unzoo'   will print the  comments associated  with the
**  archive itself or the members, preceeded by the string '# '.
**
**  If you call 'unzoo' with the '-x' option,  it extracts the  members  from
**  the archive <archive>.  Members are  stored with a  full path name in the
**  archive and if the operating system supports this, they will be extracted
**  into   appropriate subdirectories,   which will   be  created on  demand.
**  The members are usually  extracted as binary files,  with no translation.
**  However, if a member has a  comment that starts with the string '!TEXT!',
**  it is  extracted as a  text file, i.e.,  it will be  translated from  the
**  universal text file format (with <lf> as line separator as under UNIX) to
**  the local text file format (e.g., with <cr>/<lf> as separator under DOS).
**  If the archive  itself has a  comment that starts with  '!TEXT!' then all
**  members will be extracted as text files, even those that have no comment.
**  For each member the name is printed followed by  '-- extracted as binary'
**  or '-- extracted as text' when the member has been completely extracted.
**
**  The '-a' suboption causes  'unzoo' to extract all members  as text files,
**  even if they have no comment starting with  '!TEXT!'.
**
**  The '-b' suboption causes 'unzoo' to extract all members as binary files,
**  even if they have a comment starting with  '!TEXT!'.
**
**  The '-n' suboption causes 'unzoo' to suppress writing the files.  You use
**  this suboption  to test the integrity  of the archive  without extracting
**  the members.  For each member the name is printed followed by '-- tested'
**  if the member is intact or by '-- error, CRC failed' if it is not.
**
**  The '-p' suboption causes 'unzoo' to print the files to stdout instead of
**  writing them to files.
**
**  The '-o'  suboption causes 'unzoo'   to overwrite existing  files without
**  asking  you for confirmation.   The  default is  to ask for  confirmation
**  '<file> exists, overwrite it? (Yes/No/All/Ren)'.   To this you can answer
**  with 'y' to overwrite the  file, 'n' to skip  extraction of the file, 'a'
**  to overwrite this and all following files, or 'r' to enter a new name for
**  the file.  'unzoo' will never overwrite existing read-only files.
**
**  The '-j <prefix>' suboption causes 'unzoo' to prepend the string <prefix>
**  to  all path names for  the members  before  they  are extracted.  So for
**  example if an archive contains absolute  path names under  UNIX,  '-j ./'
**  can be used to convert them to relative pathnames.   This option  is also
**  useful  on  the Macintosh where   you start 'unzoo' by clicking,  because
**  then the current directory will be the one where 'unzoo' is,  not the one
**  where the  archive is.   Note  that the  directory  <prefix> must  exist,
**  'unzoo' will not create it on demand.
**
**  If no  <files>  argument is given all members  are  listed or  extracted.
**  If  one or  more <files>  arguments are given,  only members whose  names
**  match at least one of  the  <files> patterns  are  listed  or  extracted.
**  <files> can  contain the wildcard   '?', which  matches any character  in
**  names, and '*', which  matches any number  of characters  in names.  When
**  you pass the <files> arguments on the command  line you will usually have
**  to quote them to keep the shell from trying to expand them.
**
**  Usually 'unzoo' will  only list or extract the  latest generation of each
**  member.  But if you append ';<nr>' to a path  name pattern the generation
**  with the number <nr> is listed or extracted.  <nr> itself can contain the
**  wildcard characters '?' and '*', so appending ';*' to a path name pattern
**  causes all generations to be listed or extracted.
**
**
**  COMPATIBILITY
**
**  'unzoo'  is based heavily on the 'booz' archive extractor by Rahul Dhesi.
**  I basically stuffed everything in one file (so  no 'Makefile' is needed),
**  cleaned it up (so that it is now more portable and  a little bit faster),
**  and added the  support for  long file names,  directories,  and comments.
**
**  'unzoo' differs in some details from  'booz' and the zoo archiver  'zoo'.
**
**  'unzoo' can  only list  and extract members   from archives, like 'booz'.
**  'zoo' can also add members, delete members, etc.
**
**  'unzoo' can extract members as text files, converting from universal text
**  format to the local text format,  if the '-a' option is given or the '-b'
**  option is not given and the  member has a comment starting with '!TEXT!'.
**  So in the absence of the '-a' option and comments starting with '!TEXT!',
**  'unzoo' behaves like  'zoo' and 'booz',  which always extract as  binary.
**  But  'unzoo' can  correctly extract  text files from  archives that  were
**  created under UNIX (or other systems using the universal text format) and
**  extended with '!TEXT!' comments on systems such as DOS, VMS, Macintosh.
**
**  'unzoo' can handle  long names, which it converts  in  a system dependent
**  manner to local  names, like  'zoo'  (this may not   be available on  all
**  systems).  'booz' always uses the short DOS format names.
**
**  'unzoo' extracts  members  into  subdirectories, which  it  automatically
**  creates, like 'zoo' (this  may not be available on  all systems).  'booz'
**  always extracts all members into the current directory.
**
**  'unzoo'  can handle comments and generations in the  archive, like 'zoo'.
**  'booz' ignores all comments and generations.
**
**  'unzoo' cannot handle  members compressed with  the old method, only with
**  the new  high method or  not compressed  at all.   'zoo' and  'booz' also
**  handle members compress with the old method.  This shall be fixed soon.
**
**  'unzoo' can handle archives in  binary format under  VMS, i.e., it is not
**  necessary to convert  them to stream linefeed  format  with 'bilf' first.
**  'zoo' and 'booz' require this conversion.
**
**  'unzoo' is somewhat faster than 'zoo' and 'booz'.
**
**  'unzoo' should be much easier to port than both 'zoo' and 'booz'.
**
**  COMPILATION
**
**  Under  UNIX  with the  standard  C compiler,  compile  'unzoo' as follows
**      cc  -o unzoo  -DSYS_IS_UNIX   -O  unzoo.c
**  If your UNIX has the 'mkdir' system call,  you may add  '-DSYS_HAS_MKDIR'
**  for a slightly faster executable.   BSD has it,  else try  'man 2 mkdir'.
**
**  Under  DOS  with the  DJGPP  GNU C compiler,  compile  'unzoo' as follows
**      gcc  -o unzoo.out  -DSYS_IS_DOS_DJGPP  -O2  unzoo.c
**      copy /b \djgpp\bin\go32.exe+unzoo.out unzoo.exe
**
**  Under TOS with the GNU compiler and unixmode, compile  'unzoo' as follows
**      gcc  -o unzoo.ttp  -DSYS_IS_TOS_GCC  -O2  unzoo.c
**
**  Under OS/2 2 with the emx development system, compile  'unzoo' as follows
**      gcc  -o unzoo.exe  -DSYS_IS_OS2_EMX  -Zomf -Zsys  -O2  unzoo.c
**  To create an executable that runs under OS/2 and DOS,  but which requires
**  the emx runtime, compile without the '-Zomf' and '-Zsys' options.
**
**  On a VAX running VMS with the DEC C compiler, compile  'unzoo' as follows
**      cc   unzoo/define=SYS_IS_VMS
**      link unzoo
**  Then perform the following global symbolic assignment
**      unzoo :== $<dev>:[<dir>]unzoo.exe
**  where  <dir> is the    name of the   directory  where you  have installed
**  'unzoo' and  <dev> is the device on which this directory is,  for example
**      unzoo :== $dia1:[progs.archivers]unzoo
**  You may want to put this symbolic assignment into your  'login.com' file.
**
**  On a  Macintosh  with  the  MPW C  compiler,  compile  'unzoo' as follows
**      C    -model far  -d SYS_IS_MAC_MPW  -opt on  unzoo.c
**      Link -model far -d -c '????' -t APPL unzoo.c.o -o unzoo   <continued>
**          "{CLibraries}"StdClib.o "{Libraries}"SIOW.o           <continued>
**          "{Libraries}"Runtime.o  "{Libraries}"Interface.o
**      Rez  -a "{RIncludes}"SIOW.r  -o unzoo
**  Afterwards choose the  'Get Info' command in the  finder 'File' menu  and
**  increase the  amount of memory  'unzoo' gets upon startup to  256 KBytes.
**  To  create a MPW  tool instead of a  standalone, link with creator 'MPS '
**  instead of '????', with type 'MPST' instead  of 'APPL' and with 'Stubs.o'
**  instead of 'SIOW.o'.  The  'Rez' command  is  not required for the  tool.
**  Alternatively choose the 'Create Build Commands...'  command from the MPW
**  'Build' menu to create a  makefile.  Edit it  and add '-d SYS_IS_MAC_MPW'
**  to the  compile command.  Choose the  'Build...' command from the 'Build'
**  menu to build 'unzoo'.
**
**  On  other systems with a C compiler,  try to  compile  'unzoo' as follows
**      cc  -o unzoo -DSYS_IS_GENERIC  -O  unzoo.c
**
**  PORTING
**
**  If this  does not work,  you must supply new   definitions for the macros
**  'OPEN_READ_ARCH',   'OPEN_READ_TEXT' and  'OPEN_WRIT_TEXT'.  If you  want
**  'unzoo' to keep long file  names, you must   supply a definition for  the
[...2448 lines suppressed...]
            OpenWritFile( (char*)0, 0L );

        /* decode the file                                                 */
        if ( ! GotoReadArch( Entry.posdat ) ) {
            printf("unzoo: cannot find data in archive '%s'\n",arc);
            return 0;
        }
        res = 0;
        ErrMsg = "this should not happen";
        if ( out == 0 || out == 2 )
            printf("%s \t-- ",Entry.patl);
        else
            printf("********\n%s\n********\n",Entry.patl);
        fflush( stdout );
        if ( Entry.method == 0 )  res = DecodeCopy( Entry.siznow );
        if ( Entry.method == 1 )  res = DecodeLzd();
        if ( Entry.method == 2 )  res = DecodeLzh();

        /* check that everything went ok                                   */
        if      ( res == 0             )  printf("error, %s\n",ErrMsg);
        else if ( Crc != Entry.crcdat  )  printf("error, CRC failed\n");
        else if ( out == 2 && bin == 1 )  printf("extracted as text\n");
        else if ( out == 2 && bin == 2 )  printf("extracted as binary\n");
#ifdef  SYS_IS_MAC_MPW
        else if ( out == 2 && bin == 3 )  printf("extracted as MacBinary\n");
#endif
        else if ( out == 0             )  printf("tested\n");
        fflush( stdout );

        /* close the file after extraction                                 */
        if ( out == 1 || out == 2 )
            ClosWritFile();

        /* set the file time, evt. correct for timezone of packing system  */
        secs = 24*60*60L*(365*(Entry.year - 70)
                         + BeginMonth[Entry.month]
                         + Entry.day - 1
                         + (Entry.year -  69) / 4
                         + (Entry.year %   4 ==   0 && 1 < Entry.month)
                         - (Entry.year + 299) / 400
                         - (Entry.year % 400 == 100 && 1 < Entry.month))
                 +60*60L*Entry.hour + 60L*Entry.min + Entry.sec;
        if      ( Entry.timzon < 127 )  secs += 15*60*(Entry.timzon      );
        else if ( 127 < Entry.timzon )  secs += 15*60*(Entry.timzon - 256);
        if ( out == 2 ) {
            if ( ! SETF_TIME( patl, secs ) )
                printf("unzoo: '%s' could not set the times\n",patl);
        }

        /* set the file permissions                                        */
        if ( out == 2 && (Entry.permis >> 22) == 1 ) {
            if ( ! SETF_PERM( patl, Entry.permis ) )
                printf("unzoo: '%s' could not set the permissions\n",patl);
        }

    }

    /* close the archive file                                              */
    if ( ! ClosReadArch() ) {
        printf("unzoo: could not close the archive '%s'\n",arc);
        return 0;
    }

    /* indicate success                                                    */
    return 1;
}


/****************************************************************************
**
*F  HelpArch()  . . . . . . . . . . . . . . . . . . . . . . . print some help
**
**  'HelpArch' prints some help about 'unzoo'.
*/
int             HelpArch ()
{
    printf("unzoo -- a zoo archive extractor by Martin Schoenert\n");
    printf("  ($Id: unzoo.c,v 4.4 2000/05/29 08:56:57 sal Exp $)\n");
    printf("  based on 'booz' version 2.0 by Rahul Dhesi\n");
    printf("\n");
    printf("unzoo [-l] [-v] <archive>[.zoo] [<file>..]\n");
    printf("  list the members of the archive\n");
    printf("  -v:  list also the generation numbers and the comments\n");
    printf("  <file>: list only files matching at least one pattern,\n");
    printf("          '?' matches any char, '*' matches any string.\n");
    printf("\n");
    printf("unzoo -x [-abnpo] [-j <prefix>] <archive>[.zoo] [<file>..]\n");
    printf("  extract the members of the archive\n");
    printf("  -a:  extract all members as text files ");
    printf("(not only those with !TEXT! comments)\n");
    printf("  -b:  extract all members as binary files ");
    printf("(even those with !TEXT! comments)\n");
    printf("  -n:  extract no members, only test the integrity\n");
    printf("  -p:  extract to stdout\n");
    printf("  -o:  extract over existing files\n");
    printf("  -j:  extract to '<prefix><membername>'\n");
    printf("  <file>: extract only files matching at least one pattern,\n");
    printf("          '?' matches any char, '*' matches any string.\n");
    return 1;
}


/****************************************************************************
**
*F  main(<argc>,<argv>) . . . . . . . . . . . . . . . . . . . .  main program
**
**  'main' is the main program, it decodes the arguments  and then  calls the
**  appropriate function.
*/
int             main ( argc, argv )
    int                 argc;
    char *              argv [];
{
    unsigned long       res;            /* result of command               */
    unsigned long       cmd;            /* command help/list/extract       */
    unsigned long       ver;            /* list verbose option             */
    unsigned long       bim;            /* extraction mode option          */
    unsigned long       out;            /* output destination option       */
    unsigned long       ovr;            /* overwrite file option           */
    char *              pre;            /* prefix to prepend to path names */
    char                argl [256];     /* interactive command line        */
    int                 argd;           /* interactive command count       */
    char *              argw [256];     /* interactive command vector      */
    char *              p;              /* loop variable                   */


#ifdef SYS_IS_MAC_THC
    SIOUXSettings.autocloseonquit = 1;
    SIOUXSettings.asktosaveonclose = 0;
#endif

    /* repeat until the user enters an empty line                          */
    InitCrc();
    IsSpec['\0'] = 1;  IsSpec[';'] = 1;
    argd = 1;
    do {

        /* scan the command line arguments                                 */
        cmd = 1;  ver = 0;  bim = 0;  out = 2;  ovr = 0;
        pre = "";
        while ( 1 < argc && argv[1][0] == '-' ) {
            if ( argv[1][2] != '\0' )  cmd = 0;
            switch ( argv[1][1] ) {
            case 'l': case 'L': if ( cmd != 0 )  cmd = 1;            break;
            case 'v': case 'V': if ( cmd != 1 )  cmd = 0;  ver = 1;  break;
            case 'x': case 'X': if ( cmd != 0 )  cmd = 2;            break;
            case 'a': case 'A': if ( cmd != 2 )  cmd = 0;  bim = 1;  break;
            case 'b': case 'B': if ( cmd != 2 )  cmd = 0;  bim = 2;  break;
            case 'n': case 'N': if ( cmd != 2 )  cmd = 0;  out = 0;  break;
            case 'p': case 'P': if ( cmd != 2 )  cmd = 0;  out = 1;  break;
            case 'o': case 'O': if ( cmd != 2 )  cmd = 0;  ovr = 1;  break;
            case 'j': case 'J': if ( argc == 2 ) { cmd = 0;  break; }
                                pre = argv[2];  argc--;  argv++;
                                break;
            default:            cmd = 0;  break;
            }
            argc--;  argv++;
        }

        /* execute the command or print help                               */
        if      ( cmd == 1 && 1 < argc )
            res = ListArch( ver, argv[1],
                            (unsigned long)argc-2, argv+2 );
        else if ( cmd == 2 && 1 < argc )
            res = ExtrArch( bim, out, ovr, pre, argv[1],
                            (unsigned long)argc-2, argv+2 );
        else
            res = HelpArch();

        /* in interactive mode read another line                           */
        if ( 1 < argd || argc <= 1 ) {

            /* read a command line                                         */
            printf("\nEnter a command line or an empty line to quit:\n");
            fflush( stdout );
            if ( fgets( argl, sizeof(argl), stdin ) == (char*)0 )  break;
#ifdef SYS_IdfgdfsgasfgdsgfdS_MAC_THC
			if ( *argl == '\n' && argl[1]=='\0') break;
#endif 
           /* parse the command line into argc                            */
            argd = 1;
            p = argl;
            while ( *p==' ' || *p=='\t' || *p=='\n' )  *p++ = '\0';
            while ( *p != '\0' ) {
                argw[argd++] = p;
                while ( *p!=' ' && *p!='\t' && *p!='\n' && *p!='\0' )  p++;
                while ( *p==' ' || *p=='\t' || *p=='\n' )  *p++ = '\0';
            }
            argc = argd;  argv = argw;

        }

    } while ( 1 < argd );

    /* just to please lint                                                 */
    return ! res;
}





--- NEW FILE unzoo.spec ---
Name:           unzoo
Version:        4.4
Release:        4%{?dist}
Summary:        ZOO archive extractor

Group:          Applications/Archiving
License:        Public Domain
URL:            http://archives.math.utk.edu/software/multi-platform/gap/util/unzoo.c
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://archives.math.utk.edu/software/multi-platform/gap/util/unzoo.c

%description
'unzoo' is a zoo archive extractor.  A zoo archive is a file that
contains several files, called its members, usually in compressed form
to save space.  'unzoo' can list all or selected members or extract
all or selected members, i.e., uncompress them and write them to
files.  It cannot add new members or delete members.  For this you
need the zoo archiver, called 'zoo', written by Rahul Dhesi.


%prep
%setup -Tc -n %{name}-%{version}
cp -a %{SOURCE0} .
cat %{SOURCE0} | sed -e '/SYNTAX/,/\*\//!d' | cut -c5- > unzoo.txt


%build
gcc %{optflags} -o unzoo -DSYS_IS_UNIX unzoo.c


%install
rm -rf %{buildroot}

# Install binaries
install -Dpm 755 unzoo %{buildroot}%{_bindir}/unzoo


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/unzoo
%doc unzoo.txt


%changelog
* Thu Mar 26 2009 John W. Linville <linville at redhat.com> - 4.4-4
- Copy source to build directory so it is included in debuginfo

* Thu Mar 26 2009 John W. Linville <linville at redhat.com> - 4.4-3
- Use setup macro in prep phase (cleaner spec, generates debuginfo)
- Add release info in changelog

* Wed Mar 25 2009 John W. Linville <linville at redhat.com> - 4.4-2
- Revise in accordance with new package review comments

* Mon Mar 23 2009 John W. Linville <linville at redhat.com> - 4.4-1
- Initial release for Fedora



From itamarjp at fedoraproject.org  Wed Apr  1 17:18:30 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed,  1 Apr 2009 17:18:30 +0000 (UTC)
Subject: rpms/reiserfs-utils/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 reiserfs-utils.spec, 1.19, 1.20 sources, 1.7,
	1.8 header-fix.patch, 1.2, NONE
Message-ID: <20090401171830.D12AB7011D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/reiserfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21752/devel

Modified Files:
	.cvsignore reiserfs-utils.spec sources 
Added Files:
	import.log 
Removed Files:
	header-fix.patch 
Log Message:
3.6.21



--- NEW FILE import.log ---
reiserfs-utils-3_6_21-1_fc11:HEAD:reiserfs-utils-3.6.21-1.fc11.src.rpm:1238606206


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jan 2005 12:25:36 -0000	1.7
+++ .cvsignore	1 Apr 2009 17:18:00 -0000	1.8
@@ -1,3 +1 @@
-reiserfsprogs-3.6.17.tar.gz
-reiserfsprogs-3.6.18.tar.gz
-reiserfsprogs-3.6.19.tar.gz
+reiserfsprogs-3.6.21.tar.gz


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- reiserfs-utils.spec	25 Feb 2009 19:38:56 -0000	1.19
+++ reiserfs-utils.spec	1 Apr 2009 17:18:00 -0000	1.20
@@ -1,16 +1,17 @@
 Name: reiserfs-utils
-Version: 3.6.19
-Release: 5%{?dist}
+Version: 3.6.21
+Release: 1%{?dist}
 Summary: Tools for creating, repairing, and debugging ReiserFS filesystems
-URL: http://www.namesys.com/
-Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
+#URL: http://www.namesys.com/
+URL: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/
+#Source0: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
+Source0: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-%{version}.tar.gz
 # See README.
 License: GPLv2 with exceptions
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
 BuildRequires: e2fsprogs-devel
-Patch1: header-fix.patch
 
 %description
 The reiserfs-utils package contains a number of utilities for
@@ -27,7 +28,6 @@
 
 %prep
 %setup -q -n reiserfsprogs-%{version}
-%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -63,6 +63,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 01 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2:3.6.21-1
+- 3.6.21
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:3.6.19-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2005 12:25:36 -0000	1.7
+++ sources	1 Apr 2009 17:18:00 -0000	1.8
@@ -1 +1 @@
-b42cf15f6651c3ceff5cb84996c0d539  reiserfsprogs-3.6.19.tar.gz
+bc00c7c4e047902575dc4e1c64ab3ba4  reiserfsprogs-3.6.21.tar.gz


--- header-fix.patch DELETED ---



From sindrepb at fedoraproject.org  Wed Apr  1 17:19:43 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 17:19:43 +0000 (UTC)
Subject: rpms/hamlib/devel hamlib.spec,1.37,1.38
Message-ID: <20090401171943.D69277011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22187

Modified Files:
	hamlib.spec 
Log Message:
fix python binding bug


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- hamlib.spec	25 Feb 2009 03:21:06 -0000	1.37
+++ hamlib.spec	1 Apr 2009 17:19:13 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -129,6 +129,9 @@
 find $RPM_BUILD_ROOT -type f -name Hamlib.bs -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name perltest.pl -exec rm -f {} ';'
 
+#installed in the wrong place, better fix needed
+mv $RPM_BUILD_ROOT%{_libdir}/_Hamlib.so $RPM_BUILD_ROOT%{python_sitelib}/_Hamlib.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,7 +155,6 @@
 %{_sbindir}/*
 %{_libdir}/libhamlib.so.*
 %{_libdir}/hamlib-*.so
-%{_libdir}/_Hamlib.so
 %{_mandir}/man?/*
 
 %files devel
@@ -192,6 +194,8 @@
 %defattr(-, root, root)
 %doc COPYING.LIB
 %{python_sitelib}/*.py*
+%{python_sitelib}/_Hamlib.so
+
 
 %files tcl
 %defattr(-, root, root)
@@ -199,6 +203,9 @@
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.2.8-3
+- Add hackish fix for python binding issue
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cwickert at fedoraproject.org  Wed Apr  1 17:22:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  1 Apr 2009 17:22:42 +0000 (UTC)
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec, 1.19,
	1.20
Message-ID: <20090401172242.B12247011D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-sensors-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23119

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
* Wed Apr 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.10.99.6-4
- Own %{_libdir}/xfce4/modules/ to fix unowned directory (#474587)



Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfce4-sensors-plugin.spec	26 Feb 2009 09:04:43 -0000	1.19
+++ xfce4-sensors-plugin.spec	1 Apr 2009 17:22:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           xfce4-sensors-plugin
 Version:        0.10.99.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Sensors plugin for the Xfce panel
 
 Group:          User Interface/Desktops
@@ -70,6 +70,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/xfce4-sensors
+%dir %{_libdir}/xfce4/modules/
 %{_libdir}/xfce4/modules/libxfce4sensors.so.*
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/applications/xfce4-sensors.desktop
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.10.99.6-4
+- Own %%{_libdir}/xfce4/modules/ to fix unowned directory (#474587)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.99.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sindrepb at fedoraproject.org  Wed Apr  1 17:23:08 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  1 Apr 2009 17:23:08 +0000 (UTC)
Subject: rpms/hamlib/F-10 hamlib.spec,1.35,1.36
Message-ID: <20090401172308.11DA87011D@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/hamlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23236

Modified Files:
	hamlib.spec 
Log Message:
fix python binding


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-10/hamlib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- hamlib.spec	15 Dec 2008 22:31:57 -0000	1.35
+++ hamlib.spec	1 Apr 2009 17:22:37 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.8
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -129,6 +129,9 @@
 find $RPM_BUILD_ROOT -type f -name Hamlib.bs -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name perltest.pl -exec rm -f {} ';'
 
+#installed in the wrong place, better fix needed
+mv $RPM_BUILD_ROOT%{_libdir}/_Hamlib.so $RPM_BUILD_ROOT%{python_sitelib}/_Hamlib.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,7 +155,6 @@
 %{_sbindir}/*
 %{_libdir}/libhamlib.so.*
 %{_libdir}/hamlib-*.so
-%{_libdir}/_Hamlib.so
 %{_mandir}/man?/*
 
 %files devel
@@ -192,6 +194,8 @@
 %defattr(-, root, root)
 %doc COPYING.LIB
 %{python_sitelib}/*.py*
+%{python_sitelib}/_Hamlib.so
+
 
 %files tcl
 %defattr(-, root, root)
@@ -199,6 +203,12 @@
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.2.8-3
+- Add hackish fix for python binding issue
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 15 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 1.2.8-1
 - New upstream release
 



From rdieter at fedoraproject.org  Wed Apr  1 17:28:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 17:28:05 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.104,1.105
Message-ID: <20090401172806.05EE37011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24986

Modified Files:
	kdeartwork.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- optimize scriptlets
- omit (unused) noarch hacks, use f10+ support
- -extras -> -screensavers rename
- -icons -> kdeclassic-icon-theme rename
- main pkg, Requires: -wallpapers, -sounds (upgrade path)
- -wallpapers, -sounds: drop Req: kdebase-workspace
- BR: eigen2-devel



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdeartwork.spec	1 Apr 2009 14:48:53 -0000	1.104
+++ kdeartwork.spec	1 Apr 2009 17:27:35 -0000	1.105
@@ -1,7 +1,7 @@
 Name:           kdeartwork
 Version:        4.2.2
-Release:        2%{?dist}
-Summary:        Additional artwork (themes, sound themes, ...) for KDE
+Release:        3%{?dist}
+Summary:        Additional artwork for KDE
 
 License:        GPLv2
 Group:          User Interface/Desktops
@@ -9,29 +9,26 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#ifarch noarch
-%define icons 1
-#else
-%define rest 1
-#endif
-
 # We currently don't ship crystalsvg from kdeartwork because the actions have
 # been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
 # and yet not yet useful for KDE 4.
 # TODO: Revisit this issue once the renaming is complete. -- Kevin
 #define include_crystalsvg 1
 
+BuildRequires:  eigen2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
 
+%if 0%{fedora} < 11
+# upgrade path
+Requires: %{name}-sounds = %{version}-%{release}
+Requires: %{name}-wallpapers = %{version}-%{release}
+%endif
+
 %description
-Additional artwork (themes, sound themes, screensavers ...) for KDE.
+%{summary}, including additional styles, themes.
 
 %if 0%{?include_crystalsvg}
 %package -n crystalsvg-icon-theme
@@ -39,32 +36,34 @@
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%if 0%{?fedora} > 9
 BuildArch: noarch
+%endif
 %description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
 %endif
 
-%package icons
-Summary: Additional icon themes
+%package -n kdeclassic-icon-theme 
+Summary: KDE classic icon theme 
 Group: User Interface/Desktops
-Provides: kdeclassic-icon-theme = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+Obsoletes: kdeartwork-icons < 4.2.2-3
+Provides:  kdeartwork-icons = %{version}-%{release}
+%if 0%{?fedora} > 9
 BuildArch: noarch
-%description icons
-This contains icon themes:
-* kdeclassic
+%endif
+%description -n kdeclassic-icon-theme 
+%{summary}.
 
-%package extras
-Summary: Artwork Extras, including xscreensaver-based screensavers
+%package screensavers 
+Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
+Obsoletes: kdeartwork-extras < 4.2.2-3
+Provides:  kdeartwork-extras = %{version}-%{release}
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
-%description extras
+%description screensavers 
 %{summary}.
 
 %package kxs
@@ -78,117 +77,128 @@
 %package wallpapers
 Summary: Additional wallpapers
 Group: Amusements/Graphics
-Requires: kdebase-workspace >= %{version}
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
 BuildArch: noarch
+%endif
 %description wallpapers
 %{summary}.
 
 %package sounds
 Summary: Additional sounds
 Group: Amusements/Graphics
-Requires: kdebase-workspace >= %{version}
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
 BuildArch: noarch
+%endif
 %description sounds
 %{summary}.
 
+
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-%endif
-
-%if 0%{?icons}
-make %{?_smp_mflags} -C %{_target_platform}/IconThemes
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%endif
 
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
 %if ! 0%{?include_crystalsvg}
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
 %endif
-%else
-rm -rf %{buildroot}%{_kde4_iconsdir}/
-%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%if 0%{?icons}
-%post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%post -n kdeclassic-icon-theme 
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%posttrans -n kdeclassic-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%postun -n kdeclassic-icon-theme 
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+fi
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
-%postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%posttrans -n crystalsvg-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 
-%if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 %endif
 
-%if 0%{?rest}
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_kde4_appsdir}/*
+%{_kde4_appsdir}/color-schemes/*.colors
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kstyle/
 %{_kde4_datadir}/emoticons/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/
+%{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%files extras
+%if 0%{?include_crystalsvg}
+%files -n crystalsvg-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_bindir}/*.kss
-%{_kde4_datadir}/kde4/services/ScreenSavers/*
+%{_kde4_iconsdir}/crystalsvg/
+%endif
+
+%files -n kdeclassic-icon-theme 
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/kdeclassic/
 
 %files kxs
 %defattr(-,root,root,-)
-%{_bindir}/kxs*
+%{_kde4_bindir}/kxsconfig
+%{_kde4_bindir}/kxsrun
 
-%files wallpapers
+%files screensavers 
 %defattr(-,root,root,-)
-%{_kde4_datadir}/wallpapers/*
+%{_kde4_appsdir}/kfiresaver/
+%{_kde4_appsdir}/kscreensaver/
+%{_kde4_bindir}/*.kss
+%{_kde4_datadir}/kde4/services/ScreenSavers/*
 
 %files sounds
 %defattr(-,root,root,-)
 %{_kde4_datadir}/sounds/*
-%endif
 
-%if 0%{?icons}
-%files icons
+%files wallpapers
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_datadir}/wallpapers/*
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
-%defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
-%endif
-%endif
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- optimize scriptlets
+- omit (unused) noarch hacks, use f10+ support
+- -extras -> -screensavers rename
+- -icons -> kdeclassic-icon-theme rename
+- main pkg, Requires: -wallpapers, -sounds (upgrade path)
+- -wallpapers, -sounds: drop Req: kdebase-workspace
+- BR: eigen2-devel
+
 * Tue Mar 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.2-2
 - split wallpapers and sounds
 - noarch subpackages



From linville at fedoraproject.org  Wed Apr  1 17:32:00 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  1 Apr 2009 17:32:00 +0000 (UTC)
Subject: rpms/unzoo/F-10 unzoo.c,NONE,1.1 unzoo.spec,NONE,1.1
Message-ID: <20090401173200.3F6E77011D@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/unzoo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25858

Added Files:
	unzoo.c unzoo.spec 
Log Message:
Package import


***** Error reading new file: [Errno 2] No such file or directory: 'unzoo.c'

--- NEW FILE unzoo.spec ---
Name:           unzoo
Version:        4.4
Release:        4%{?dist}
Summary:        ZOO archive extractor

Group:          Applications/Archiving
License:        Public Domain
URL:            http://archives.math.utk.edu/software/multi-platform/gap/util/unzoo.c
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://archives.math.utk.edu/software/multi-platform/gap/util/unzoo.c

%description
'unzoo' is a zoo archive extractor.  A zoo archive is a file that
contains several files, called its members, usually in compressed form
to save space.  'unzoo' can list all or selected members or extract
all or selected members, i.e., uncompress them and write them to
files.  It cannot add new members or delete members.  For this you
need the zoo archiver, called 'zoo', written by Rahul Dhesi.


%prep
%setup -Tc -n %{name}-%{version}
cp -a %{SOURCE0} .
cat %{SOURCE0} | sed -e '/SYNTAX/,/\*\//!d' | cut -c5- > unzoo.txt


%build
gcc %{optflags} -o unzoo -DSYS_IS_UNIX unzoo.c


%install
rm -rf %{buildroot}

# Install binaries
install -Dpm 755 unzoo %{buildroot}%{_bindir}/unzoo


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/unzoo
%doc unzoo.txt


%changelog
* Thu Mar 26 2009 John W. Linville <linville at redhat.com> - 4.4-4
- Copy source to build directory so it is included in debuginfo

* Thu Mar 26 2009 John W. Linville <linville at redhat.com> - 4.4-3
- Use setup macro in prep phase (cleaner spec, generates debuginfo)
- Add release info in changelog

* Wed Mar 25 2009 John W. Linville <linville at redhat.com> - 4.4-2
- Revise in accordance with new package review comments

* Mon Mar 23 2009 John W. Linville <linville at redhat.com> - 4.4-1
- Initial release for Fedora



From mtasaka at fedoraproject.org  Wed Apr  1 17:32:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  1 Apr 2009 17:32:20 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.29,
	1.30 gnome-commander.spec, 1.53, 1.54 sources, 1.29, 1.30
Message-ID: <20090401173220.ED4507011D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
rev 2502


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 Mar 2009 05:51:09 -0000	1.29
+++ .cvsignore	1 Apr 2009 17:31:50 -0000	1.30
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2497_trunk.tar.bz2
+gnome-commander-1.2.8-svn2502_trunk.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-commander.spec	28 Mar 2009 05:51:10 -0000	1.53
+++ gnome-commander.spec	1 Apr 2009 17:31:50 -0000	1.54
@@ -18,7 +18,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          3 
-%define        extratag              svn2497_trunk
+%define        extratag              svn2502_trunk
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -210,6 +210,9 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-0.3.svn2502_trunk
+- rev 2502
+
 * Sat Mar 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2497
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Mar 2009 05:51:10 -0000	1.29
+++ sources	1 Apr 2009 17:31:50 -0000	1.30
@@ -1 +1 @@
-2d18ab67f8e8f06014119ebd2320735a  gnome-commander-1.2.8-svn2497_trunk.tar.bz2
+1acab6a1db0eac704fcbb3e473252737  gnome-commander-1.2.8-svn2502_trunk.tar.bz2



From mtasaka at fedoraproject.org  Wed Apr  1 17:32:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  1 Apr 2009 17:32:21 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.29,
	1.30 gnome-commander.spec, 1.53, 1.54 sources, 1.29, 1.30
Message-ID: <20090401173221.34F3F7013C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801/devel

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
rev 2502


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 Mar 2009 05:51:09 -0000	1.29
+++ .cvsignore	1 Apr 2009 17:31:50 -0000	1.30
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2497_trunk.tar.bz2
+gnome-commander-1.3-svn2502_13dev.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-commander.spec	28 Mar 2009 05:51:10 -0000	1.53
+++ gnome-commander.spec	1 Apr 2009 17:31:50 -0000	1.54
@@ -14,11 +14,12 @@
 %define        TAGLIB_REQ            1.4
 %define        LIBGSF_REQ            1.12.0
 %define        POPPLER_REQ           0.6
+%define        VTE_REQ               0.11
 
 %define        use_autotool          0
 %define        if_pre                1
-%define        main_release          3 
-%define        extratag              svn2497_trunk
+%define        main_release          1 
+%define        extratag              svn2502_13dev
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -28,7 +29,7 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8
+Version:       1.3
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad??er plik??w dla GNOME oparty o Norton Commander'a (TM)
@@ -44,6 +45,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
+BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: scrollkeeper
@@ -56,6 +58,7 @@
 BuildRequires: libgnomeui-devel
 BuildRequires: poppler-devel       >= %{POPPLER_REQ}
 BuildRequires: taglib-devel        >= %{TAGLIB_REQ}
+BuildRequires: vte-devel           >= %{VTE_REQ}
 
 BuildRequires: gnome-doc-utils
 BuildRequires: perl(XML::Parser)
@@ -210,6 +213,9 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.1.svn2502_13dev
+- F-12: switch to 1.3 development branch
+
 * Sat Mar 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2497
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Mar 2009 05:51:10 -0000	1.29
+++ sources	1 Apr 2009 17:31:51 -0000	1.30
@@ -1 +1 @@
-2d18ab67f8e8f06014119ebd2320735a  gnome-commander-1.2.8-svn2497_trunk.tar.bz2
+e69597d524783a0622a509f02db0d3d7  gnome-commander-1.3-svn2502_13dev.tar.bz2



From oget at fedoraproject.org  Wed Apr  1 17:33:58 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 17:33:58 +0000 (UTC)
Subject: rpms/frescobaldi/F-10 frescobaldi.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401173358.1BA3E7011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26477/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	frescobaldi.spec import.log 
Log Message:
* Tue Mar 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.8-1
- New upstream version

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-2
- Remove BuildRequires:  dbus-python
- Fix the year of the previous changelog entry
- Add "Public Domain" to the license tag
- Add AudioVideo category to the .desktop file
- Add disttag

* Sun Mar 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-1
- Initial build



--- NEW FILE frescobaldi.spec ---
Name:           frescobaldi
Version:        0.7.8
Release:        1%{?dist}
Summary:        Edit LilyPond sheet music with ease!
Group:          Applications/Editors
# python/hyphenator.py is LGPLv2+
# python/rational.py is public domain
# The rest, including the core of the program, is GPLv2+
License:        GPLv2+ and LGPLv2+ and Public Domain
URL:            http://www.frescobaldi.org/
Source0:        http://lilykde.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  cmake
BuildRequires:  desktop-file-utils
BuildRequires:  gettext 
BuildRequires:  ImageMagick
BuildRequires:  lilypond
BuildRequires:  PyKDE4

Requires:       alsa-utils
Requires:       lilypond
Requires:       PyKDE4 
Requires:       rumor
Requires:       timidity++
# Need katepart, kdialog, okularpart, ...
Requires:       kdebase
Requires:       kdegraphics
Requires:       kdesdk

%description
Frescobaldi is a LilyPond sheet music editor for KDE4. It aims to be powerful,
yet lightweight and easy to use. It features:

    * Enter LilyPond scores, build and preview them with a mouseclick
    * Point-and-click support: click on notes or error messages to jump to the
      correct position
    * A powerful Score Wizard to quickly setup a musical score
    * Editing tools to:
          o manipulate the rhythm
          o hyphenate lyrics
          o quickly enter or add articulations and other symbols to existing 
            music
          o run the document through convert-ly to update it to a newer 
            LilyPond version
    * Context sensitive autocomplete, helping you to quickly enter LilyPond 
      commands
    * Expansion manager to enter larger snippets of LilyPond input using short
      mnemonics
    * A powerful Rumor plugin, using the Rumor program to quickly enter music
      by playing it on a MIDI keyboard or even your computer keyboard
    * Built-in comprehensive User Guide


%prep
%setup -q

# We want to build everything from source
rm -f po/*.mo
rm -f pics/*.png

%build
%{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
make %{?_smp_mflags} VERBOSE=1 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 

## File lists
# locale's
%find_lang %{name}
# HTML (1.0)
HTML_DIR=$(kde4-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
   for lang_dir in %{buildroot}$HTML_DIR/* ; do
      pushd $lang_dir
         # Replace absolute symlinks with relative ones
         for i in *; do
            [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
         done
      popd
   done
fi

# desktop file
desktop-file-install                                         \
   --dir=%{buildroot}%{_datadir}/applications                \
   --remove-category=Application                             \
   --add-category=AudioVideo                                 \
   --delete-original                                         \
   %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop

%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README* THANKS
%{_docdir}/HTML/en/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
%{_datadir}/kde4/apps/%{name}/

%changelog
* Tue Mar 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.8-1
- New upstream version

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-2
- Remove BuildRequires:  dbus-python
- Fix the year of the previous changelog entry
- Add "Public Domain" to the license tag
- Add AudioVideo category to the .desktop file
- Add disttag

* Sun Mar 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-1
- Initial build


--- NEW FILE import.log ---
frescobaldi-0_7_8-1_fc10:F-10:frescobaldi-0.7.8-1.fc10.src.rpm:1238607157


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Mar 2009 02:49:17 -0000	1.1
+++ .cvsignore	1 Apr 2009 17:33:27 -0000	1.2
@@ -0,0 +1 @@
+frescobaldi-0.7.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Mar 2009 02:49:17 -0000	1.1
+++ sources	1 Apr 2009 17:33:27 -0000	1.2
@@ -0,0 +1 @@
+37e03ac19212ca701a7f975ed03f1f33  frescobaldi-0.7.8.tar.gz



From oget at fedoraproject.org  Wed Apr  1 17:36:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 17:36:06 +0000 (UTC)
Subject: rpms/frescobaldi/F-9 frescobaldi.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401173606.3EF4F7011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26990/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	frescobaldi.spec import.log 
Log Message:
* Tue Mar 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.8-1
- New upstream version

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-2
- Remove BuildRequires:  dbus-python
- Fix the year of the previous changelog entry
- Add "Public Domain" to the license tag
- Add AudioVideo category to the .desktop file
- Add disttag

* Sun Mar 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-1
- Initial build




--- NEW FILE frescobaldi.spec ---
Name:           frescobaldi
Version:        0.7.8
Release:        1%{?dist}
Summary:        Edit LilyPond sheet music with ease!
Group:          Applications/Editors
# python/hyphenator.py is LGPLv2+
# python/rational.py is public domain
# The rest, including the core of the program, is GPLv2+
License:        GPLv2+ and LGPLv2+ and Public Domain
URL:            http://www.frescobaldi.org/
Source0:        http://lilykde.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  cmake
BuildRequires:  desktop-file-utils
BuildRequires:  gettext 
BuildRequires:  ImageMagick
BuildRequires:  lilypond
BuildRequires:  PyKDE4

Requires:       alsa-utils
Requires:       lilypond
Requires:       PyKDE4 
Requires:       rumor
Requires:       timidity++
# Need katepart, kdialog, okularpart, ...
Requires:       kdebase
Requires:       kdegraphics
Requires:       kdesdk

%description
Frescobaldi is a LilyPond sheet music editor for KDE4. It aims to be powerful,
yet lightweight and easy to use. It features:

    * Enter LilyPond scores, build and preview them with a mouseclick
    * Point-and-click support: click on notes or error messages to jump to the
      correct position
    * A powerful Score Wizard to quickly setup a musical score
    * Editing tools to:
          o manipulate the rhythm
          o hyphenate lyrics
          o quickly enter or add articulations and other symbols to existing 
            music
          o run the document through convert-ly to update it to a newer 
            LilyPond version
    * Context sensitive autocomplete, helping you to quickly enter LilyPond 
      commands
    * Expansion manager to enter larger snippets of LilyPond input using short
      mnemonics
    * A powerful Rumor plugin, using the Rumor program to quickly enter music
      by playing it on a MIDI keyboard or even your computer keyboard
    * Built-in comprehensive User Guide


%prep
%setup -q

# We want to build everything from source
rm -f po/*.mo
rm -f pics/*.png

%build
%{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
make %{?_smp_mflags} VERBOSE=1 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 

## File lists
# locale's
%find_lang %{name}
# HTML (1.0)
HTML_DIR=$(kde4-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
   for lang_dir in %{buildroot}$HTML_DIR/* ; do
      pushd $lang_dir
         # Replace absolute symlinks with relative ones
         for i in *; do
            [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
         done
      popd
   done
fi

# desktop file
desktop-file-install                                         \
   --dir=%{buildroot}%{_datadir}/applications                \
   --remove-category=Application                             \
   --add-category=AudioVideo                                 \
   --delete-original                                         \
   %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop

%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README* THANKS
%{_docdir}/HTML/en/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
%{_datadir}/kde4/apps/%{name}/

%changelog
* Tue Mar 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.8-1
- New upstream version

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-2
- Remove BuildRequires:  dbus-python
- Fix the year of the previous changelog entry
- Add "Public Domain" to the license tag
- Add AudioVideo category to the .desktop file
- Add disttag

* Sun Mar 15 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.7-1
- Initial build


--- NEW FILE import.log ---
frescobaldi-0_7_8-1_fc10:F-9:frescobaldi-0.7.8-1.fc10.src.rpm:1238607304


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Mar 2009 02:49:17 -0000	1.1
+++ .cvsignore	1 Apr 2009 17:35:35 -0000	1.2
@@ -0,0 +1 @@
+frescobaldi-0.7.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Mar 2009 02:49:17 -0000	1.1
+++ sources	1 Apr 2009 17:35:35 -0000	1.2
@@ -0,0 +1 @@
+37e03ac19212ca701a7f975ed03f1f33  frescobaldi-0.7.8.tar.gz



From kkofler at fedoraproject.org  Wed Apr  1 17:40:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  1 Apr 2009 17:40:17 +0000 (UTC)
Subject: rpms/qgit/F-10 qgit.spec,1.25,1.26
Message-ID: <20090401174017.C0FEE7011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27863/F-10

Modified Files:
	qgit.spec 
Log Message:
Bump the changelog date as I didn't actually do this yesterday. :-)


Index: qgit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgit/F-10/qgit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qgit.spec	1 Apr 2009 16:57:39 -0000	1.25
+++ qgit.spec	1 Apr 2009 17:39:47 -0000	1.26
@@ -56,7 +56,7 @@
 
 
 %changelog
-* Tue Mar 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
+* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
 - rebuild against Qt 4.5 to work around apparent ABI compatibility issue
 
 * Sat Feb 28 2009 Dan Horak <dan[at]danny.cz> 2.2-4



From kkofler at fedoraproject.org  Wed Apr  1 17:40:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  1 Apr 2009 17:40:17 +0000 (UTC)
Subject: rpms/qgit/F-9 qgit.spec,1.25,1.26
Message-ID: <20090401174017.D93187011D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27863/F-9

Modified Files:
	qgit.spec 
Log Message:
Bump the changelog date as I didn't actually do this yesterday. :-)


Index: qgit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgit/F-9/qgit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qgit.spec	1 Apr 2009 16:57:39 -0000	1.25
+++ qgit.spec	1 Apr 2009 17:39:47 -0000	1.26
@@ -56,7 +56,7 @@
 
 
 %changelog
-* Tue Mar 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
+* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-4.1
 - rebuild against Qt 4.5 to work around apparent ABI compatibility issue
 
 * Sat Feb 28 2009 Dan Horak <dan[at]danny.cz> 2.2-4



From ke4qqq at fedoraproject.org  Wed Apr  1 17:40:27 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:40:27 +0000 (UTC)
Subject: rpms/sahana/devel import.log,1.1,1.2 sahana.spec,1.1,1.2
Message-ID: <20090401174027.59B467011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27779/devel

Modified Files:
	import.log sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
- removed -executable predicate from find so it will build on EL-5 and F-9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2009 16:55:53 -0000	1.1
+++ import.log	1 Apr 2009 17:39:57 -0000	1.2
@@ -1 +1,2 @@
 sahana-0_6_2_2-3_fc10:HEAD:sahana-0.6.2.2-3.fc10.src.rpm:1238604801
+sahana-0_6_2_2-4_fc10:HEAD:sahana-0.6.2.2-4.fc10.src.rpm:1238607475


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/devel/sahana.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sahana.spec	1 Apr 2009 16:55:53 -0000	1.1
+++ sahana.spec	1 Apr 2009 17:39:57 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -71,7 +71,7 @@
 find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
-find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
+find ${RPM_BUILD_ROOT} -type f -perm /+x -exec chmod 644 {} \;
 find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
@@ -108,6 +108,8 @@
 
 
 %changelog
+* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
+- removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
 - added BuildRequires dos2unix
 * Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2



From ajax at fedoraproject.org  Wed Apr  1 17:42:16 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  1 Apr 2009 17:42:16 +0000 (UTC)
Subject: rpms/desktop-data-model/devel desktop-data-model.spec,1.15,1.16
Message-ID: <20090401174216.7E69C7011D@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/desktop-data-model/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28280

Modified Files:
	desktop-data-model.spec 
Log Message:
* Wed Apr 01 2009 Adam Jackson <ajax at redhat.com> 1.2.5-10
- Rebuild for yet another libempathy



Index: desktop-data-model.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-data-model/devel/desktop-data-model.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- desktop-data-model.spec	31 Mar 2009 14:07:50 -0000	1.15
+++ desktop-data-model.spec	1 Apr 2009 17:41:46 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           desktop-data-model
 Version:        1.2.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Engine providing live updates of online data to the desktop
 
 Group:          System Environment/Libraries
@@ -12,7 +12,7 @@
 # Previously, libddm-1.so was shipped in the mugshot package
 Conflicts: mugshot < 1.1.90-1
 
-BuildRequires:  empathy-devel >= 2.24
+BuildRequires:  empathy-devel >= 2.26
 BuildRequires:  glib2-devel >= 2.6
 BuildRequires:  gtk2-devel >= 2.6
 BuildRequires:  loudmouth-devel >= 1.0.3-3
@@ -82,6 +82,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 01 2009 Adam Jackson <ajax at redhat.com> 1.2.5-10
+- Rebuild for yet another libempathy
+
 * Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.5-9
 - rebuild to fix broken deps
 



From rdieter at fedoraproject.org  Wed Apr  1 17:43:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 17:43:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.210,
	1.211 kdebase-workspace-4.2.1-hotkey.patch, 1.1,
	NONE kdebase-workspace-4.2.1-kde#185585.patch, 1.1,
	NONE kdebase-workspace-4.2.1-kde#185736.patch, 1.1,
	NONE kdebase-workspace-4.2.1-powerdevil.patch, 1.1, NONE
Message-ID: <20090401174341.616A47011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28623

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.2.1-hotkey.patch 
	kdebase-workspace-4.2.1-kde#185585.patch 
	kdebase-workspace-4.2.1-kde#185736.patch 
	kdebase-workspace-4.2.1-powerdevil.patch 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets
- drop upstreamed patches



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- kdebase-workspace.spec	31 Mar 2009 11:22:53 -0000	1.210
+++ kdebase-workspace.spec	1 Apr 2009 17:43:11 -0000	1.211
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -42,16 +42,8 @@
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 # from 4.3: http://bugs.kde.org/180576
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-# 4.2 , http://bugs.kde.org/185736
-Patch104: kdebase-workspace-4.2.1-kde#185736.patch
 #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# 4.2, http://bugs.kde.org/185585
-Patch106: kdebase-workspace-4.2.1-kde#185585.patch
-# 4.2, http://bugs.kde.org/186992
-Patch107: kdebase-workspace-4.2.1-hotkey.patch
-# 4.2, http://bugs.kde.org/183273
-Patch108: kdebase-workspace-4.2.1-powerdevil.patch
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -94,8 +86,6 @@
 
 Requires: %{name}-libs = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
@@ -248,11 +238,7 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
-%patch104 -p5 -b .kde#185736
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p0 -b .kde#185585
-%patch107 -p1 -b .kde#186992
-%patch108 -p1 -b .kde#183273
 
 %build
 
@@ -294,14 +280,22 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -516,6 +510,10 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+- drop upstreamed patches
+
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 


--- kdebase-workspace-4.2.1-hotkey.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185585.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185736.patch DELETED ---


--- kdebase-workspace-4.2.1-powerdevil.patch DELETED ---



From ke4qqq at fedoraproject.org  Wed Apr  1 17:45:54 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:45:54 +0000 (UTC)
Subject: rpms/sahana/F-9 import.log,1.1,1.2 sahana.spec,1.1,1.2
Message-ID: <20090401174554.7DFAA7011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29213/F-9

Modified Files:
	import.log sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
- removed -executable predicate from find so it will build on EL-5 and F-9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2009 16:57:32 -0000	1.1
+++ import.log	1 Apr 2009 17:45:24 -0000	1.2
@@ -1 +1,2 @@
 sahana-0_6_2_2-3_fc10:F-9:sahana-0.6.2.2-3.fc10.src.rpm:1238604960
+sahana-0_6_2_2-4_fc10:F-9:sahana-0.6.2.2-4.fc10.src.rpm:1238607796


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-9/sahana.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sahana.spec	1 Apr 2009 16:57:32 -0000	1.1
+++ sahana.spec	1 Apr 2009 17:45:24 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -71,7 +71,7 @@
 find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
-find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
+find ${RPM_BUILD_ROOT} -type f -perm /+x -exec chmod 644 {} \;
 find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
@@ -108,6 +108,8 @@
 
 
 %changelog
+* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
+- removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
 - added BuildRequires dos2unix
 * Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2



From ke4qqq at fedoraproject.org  Wed Apr  1 17:47:25 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:47:25 +0000 (UTC)
Subject: rpms/sahana/F-10 import.log,1.1,1.2 sahana.spec,1.1,1.2
Message-ID: <20090401174725.3D5497011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29754/F-10

Modified Files:
	import.log sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
- removed -executable predicate from find so it will build on EL-5 and F-9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2009 16:58:46 -0000	1.1
+++ import.log	1 Apr 2009 17:46:55 -0000	1.2
@@ -1 +1,2 @@
 sahana-0_6_2_2-3_fc10:F-10:sahana-0.6.2.2-3.fc10.src.rpm:1238605038
+sahana-0_6_2_2-4_fc10:F-10:sahana-0.6.2.2-4.fc10.src.rpm:1238607925


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-10/sahana.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sahana.spec	1 Apr 2009 16:58:46 -0000	1.1
+++ sahana.spec	1 Apr 2009 17:46:55 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -71,7 +71,7 @@
 find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
-find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
+find ${RPM_BUILD_ROOT} -type f -perm /+x -exec chmod 644 {} \;
 find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
@@ -108,6 +108,8 @@
 
 
 %changelog
+* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
+- removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
 - added BuildRequires dos2unix
 * Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2



From ke4qqq at fedoraproject.org  Wed Apr  1 17:50:35 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:50:35 +0000 (UTC)
Subject: rpms/sahana/F-11 import.log,1.1,1.2 sahana.spec,1.1,1.2
Message-ID: <20090401175035.3B7867011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30542/F-11

Modified Files:
	import.log sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
- removed -executable predicate from find so it will build on EL-5 and F-9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2009 17:00:05 -0000	1.1
+++ import.log	1 Apr 2009 17:50:04 -0000	1.2
@@ -1 +1,2 @@
 sahana-0_6_2_2-3_fc10:F-11:sahana-0.6.2.2-3.fc10.src.rpm:1238605116
+sahana-0_6_2_2-4_fc10:F-11:sahana-0.6.2.2-4.fc10.src.rpm:1238608112


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-11/sahana.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sahana.spec	1 Apr 2009 17:00:05 -0000	1.1
+++ sahana.spec	1 Apr 2009 17:50:04 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -71,7 +71,7 @@
 find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
-find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
+find ${RPM_BUILD_ROOT} -type f -perm /+x -exec chmod 644 {} \;
 find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
@@ -108,6 +108,8 @@
 
 
 %changelog
+* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
+- removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
 - added BuildRequires dos2unix
 * Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2



From rdieter at fedoraproject.org  Wed Apr  1 17:51:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 17:51:03 +0000 (UTC)
Subject: rpms/kdelibs/F-10 .cvsignore, 1.63, 1.64 kdelibs.spec, 1.410,
	1.411 sources, 1.77, 1.78
Message-ID: <20090401175103.3F7E87011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30650

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
* Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	5 Mar 2009 01:25:33 -0000	1.63
+++ .cvsignore	1 Apr 2009 17:50:32 -0000	1.64
@@ -1 +1 @@
-kdelibs-4.2.1.tar.bz2
+kdelibs-4.2.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- kdelibs.spec	5 Mar 2009 01:25:33 -0000	1.410
+++ kdelibs.spec	1 Apr 2009 17:50:32 -0000	1.411
@@ -1,12 +1,13 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.1
-Release: 4%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
+%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
 %else
 Name: kdelibs4
 %endif
@@ -94,8 +95,8 @@
 #Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
 %if 0%{?fedora} < 9
@@ -141,6 +142,9 @@
 BuildRequires: qt4-doc
 %endif
 
+Provides: kross(javascript) = %{version}-%{release}
+Provides: kross(qtscript) = %{version}-%{release}
+
 %description
 Libraries for the K Desktop Environment 4.
 
@@ -303,14 +307,22 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    update-desktop-database -q &> /dev/null
+    update-mime-database %{_kde4_datadir}/mime &> /dev/null
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %clean
@@ -332,10 +344,10 @@
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_datadir}/mime/packages/*
+%{_kde4_datadir}/mime/packages/kde.xml
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_sharedir}/icons/hicolor/*/actions/*
+%{_kde4_iconsdir}/hicolor/*/actions/*
 %{_kde4_docdir}/HTML/en/sonnet/
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
@@ -397,6 +409,24 @@
 
 
 %changelog
+* Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
+- scriptlet optimization
+
+* Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-8
+- Provides: kdelibs4%%{?_isa} ... (#491082)
+
+* Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-7
+- Provides: kross(javascript) kross(qtscript)  (#490586)
+
+* Thu Mar 12 2009 Than Ngo <than at redhat.com> - 4.2.1-6
+- apply patch to fix encoding for Qt-4.5.0 
+
+* Mon Mar 09 2009 Than Ngo <than at redhat.com> - 4.2.1-5
+- apply patch to fix issue in CSS style that causes konqueror shows a blank page
+
 * Wed Mar 05 2009 Rex Dieter <rdieter at fedorproject.org> - 4.2.1-4 
 - move designer plugins to main/runtime (#487622)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	2 Mar 2009 10:11:42 -0000	1.77
+++ sources	1 Apr 2009 17:50:32 -0000	1.78
@@ -1 +1 @@
-fa4206dd747890c4e4283c8adb831e6c  kdelibs-4.2.1.tar.bz2
+ff54817efef952e8812c607f5089c2e1  kdelibs-4.2.2.tar.bz2



From spot at fedoraproject.org  Wed Apr  1 17:51:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 17:51:28 +0000 (UTC)
Subject: rpms/SolarModel/F-9 SolarModel.desktop,1.1,1.2
Message-ID: <20090401175128.260D07011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30768/F-9

Modified Files:
	SolarModel.desktop 
Log Message:
fix desktop file


Index: SolarModel.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/F-9/SolarModel.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SolarModel.desktop	12 Jan 2009 16:43:50 -0000	1.1
+++ SolarModel.desktop	1 Apr 2009 17:50:57 -0000	1.2
@@ -8,5 +8,5 @@
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Graphics;
+Categories=Graphics;Education;Astronomy;
 X-Desktop-File-Install-Version=0.15



From spot at fedoraproject.org  Wed Apr  1 17:51:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 17:51:27 +0000 (UTC)
Subject: rpms/SolarModel/F-10 SolarModel.desktop,1.1,1.2
Message-ID: <20090401175127.E7A357011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30768/F-10

Modified Files:
	SolarModel.desktop 
Log Message:
fix desktop file


Index: SolarModel.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/F-10/SolarModel.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SolarModel.desktop	12 Jan 2009 16:43:49 -0000	1.1
+++ SolarModel.desktop	1 Apr 2009 17:50:57 -0000	1.2
@@ -8,5 +8,5 @@
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Graphics;
+Categories=Graphics;Education;Astronomy;
 X-Desktop-File-Install-Version=0.15



From spot at fedoraproject.org  Wed Apr  1 17:51:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 17:51:28 +0000 (UTC)
Subject: rpms/SolarModel/devel SolarModel.desktop, 1.1, 1.2 SolarModel.spec, 
	1.2, 1.3
Message-ID: <20090401175128.698B27011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30768/devel

Modified Files:
	SolarModel.desktop SolarModel.spec 
Log Message:
fix desktop file


Index: SolarModel.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/SolarModel.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SolarModel.desktop	12 Jan 2009 16:38:58 -0000	1.1
+++ SolarModel.desktop	1 Apr 2009 17:50:58 -0000	1.2
@@ -8,5 +8,5 @@
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Graphics;
+Categories=Graphics;Education;Astronomy;
 X-Desktop-File-Install-Version=0.15


Index: SolarModel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/SolarModel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SolarModel.spec	23 Feb 2009 23:33:40 -0000	1.2
+++ SolarModel.spec	1 Apr 2009 17:50:58 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		SolarModel
 Summary: 	Real-time 3D Solar System simulation
 Version:	2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+
 Group:		System Environment/Base
 Source0:	http://downloads.sourceforge.net/solarmodel/%{name}_src_2_1.zip
@@ -67,6 +67,9 @@
 %{_datadir}/pixmaps/SolarModel.png
 
 %changelog
+* Wed Apr  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1-4
+- fix desktop file (bz 492751)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Wed Apr  1 17:51:47 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Wed,  1 Apr 2009 17:51:47 +0000 (UTC)
Subject: rpms/sahana/EL-5 import.log,1.1,1.2 sahana.spec,1.1,1.2
Message-ID: <20090401175147.9B9767011D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30982/EL-5

Modified Files:
	import.log sahana.spec 
Log Message:
* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
- removed -executable predicate from find so it will build on EL-5 and F-9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2009 17:01:37 -0000	1.1
+++ import.log	1 Apr 2009 17:51:17 -0000	1.2
@@ -1 +1,2 @@
 sahana-0_6_2_2-3_fc10:EL-5:sahana-0.6.2.2-3.fc10.src.rpm:1238605197
+sahana-0_6_2_2-4_fc10:EL-5:sahana-0.6.2.2-4.fc10.src.rpm:1238608186


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/EL-5/sahana.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sahana.spec	1 Apr 2009 17:01:37 -0000	1.1
+++ sahana.spec	1 Apr 2009 17:51:17 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -71,7 +71,7 @@
 find ${RPM_BUILD_ROOT} -type f -name \*.txt -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.ent -exec dos2unix {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.dtd -exec dos2unix {} \;
-find ${RPM_BUILD_ROOT} -type f -executable -exec chmod 644 {} \;
+find ${RPM_BUILD_ROOT} -type f -perm /+x -exec chmod 644 {} \;
 find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \;
 find ${RPM_BUILD_ROOT} -type f -name \*.pl -exec chmod 755 {} \;
@@ -108,6 +108,8 @@
 
 
 %changelog
+* Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
+- removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3
 - added BuildRequires dos2unix
 * Sun Mar 29 2009 David Nalley <david at gnsa.us> 0.6.2.2-2



From rdieter at fedoraproject.org  Wed Apr  1 17:52:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 17:52:56 +0000 (UTC)
Subject: rpms/kdelibs/F-9 .cvsignore, 1.58, 1.59 kdelibs.spec, 1.385,
	1.386 sources, 1.71, 1.72
Message-ID: <20090401175256.89D547011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31347

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
* Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	5 Mar 2009 01:26:20 -0000	1.58
+++ .cvsignore	1 Apr 2009 17:52:26 -0000	1.59
@@ -1 +1 @@
-kdelibs-4.2.1.tar.bz2
+kdelibs-4.2.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- kdelibs.spec	5 Mar 2009 01:26:20 -0000	1.385
+++ kdelibs.spec	1 Apr 2009 17:52:26 -0000	1.386
@@ -1,12 +1,13 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.1
-Release: 4%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
+%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
 %else
 Name: kdelibs4
 %endif
@@ -94,8 +95,8 @@
 #Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
 %if 0%{?fedora} < 9
@@ -141,6 +142,9 @@
 BuildRequires: qt4-doc
 %endif
 
+Provides: kross(javascript) = %{version}-%{release}
+Provides: kross(qtscript) = %{version}-%{release}
+
 %description
 Libraries for the K Desktop Environment 4.
 
@@ -303,14 +307,22 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    update-desktop-database -q &> /dev/null
+    update-mime-database %{_kde4_datadir}/mime &> /dev/null
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %clean
@@ -332,10 +344,10 @@
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_datadir}/mime/packages/*
+%{_kde4_datadir}/mime/packages/kde.xml
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_sharedir}/icons/hicolor/*/actions/*
+%{_kde4_iconsdir}/hicolor/*/actions/*
 %{_kde4_docdir}/HTML/en/sonnet/
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
@@ -397,6 +409,24 @@
 
 
 %changelog
+* Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
+- scriptlet optimization
+
+* Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-8
+- Provides: kdelibs4%%{?_isa} ... (#491082)
+
+* Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-7
+- Provides: kross(javascript) kross(qtscript)  (#490586)
+
+* Thu Mar 12 2009 Than Ngo <than at redhat.com> - 4.2.1-6
+- apply patch to fix encoding for Qt-4.5.0 
+
+* Mon Mar 09 2009 Than Ngo <than at redhat.com> - 4.2.1-5
+- apply patch to fix issue in CSS style that causes konqueror shows a blank page
+
 * Wed Mar 05 2009 Rex Dieter <rdieter at fedorproject.org> - 4.2.1-4 
 - move designer plugins to main/runtime (#487622)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	2 Mar 2009 10:11:42 -0000	1.71
+++ sources	1 Apr 2009 17:52:26 -0000	1.72
@@ -1 +1 @@
-fa4206dd747890c4e4283c8adb831e6c  kdelibs-4.2.1.tar.bz2
+ff54817efef952e8812c607f5089c2e1  kdelibs-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 18:14:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:14:03 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.127,1.128
Message-ID: <20090401181403.111787011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3140

Modified Files:
	kdeadmin.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
- optimize scriptlets 



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdeadmin.spec	31 Mar 2009 11:22:51 -0000	1.127
+++ kdeadmin.spec	1 Apr 2009 18:13:32 -0000	1.128
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -19,8 +19,8 @@
 BuildRequires:  PyKDE4-devel >= %{version}
 BuildRequires:  system-config-printer-libs
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
@@ -35,8 +35,6 @@
 Summary: An RPM package manager
 Group: Applications/System
 Requires: smart
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description kpackage
 Kpackage is an RPM package manager, used for displaying currently installed
 packages, uninstalling them and installing new ones.
@@ -64,7 +62,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -81,16 +79,29 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 %post kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans kpackage
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
 
 
 %files
@@ -133,6 +144,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+- optimize scriptlets 
+
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From mjg59 at fedoraproject.org  Wed Apr  1 18:17:13 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Wed,  1 Apr 2009 18:17:13 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1499,
	1.1500 linux-2.6-acpi-video-didl-intel-outputs.patch, 1.2, 1.3
Message-ID: <20090401181713.1FE7E7011D@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3863

Modified Files:
	kernel.spec linux-2.6-acpi-video-didl-intel-outputs.patch 
Log Message:
* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-acpi-video-didl-intel-outputs.patch: fix enabling of asle



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1499
retrieving revision 1.1500
diff -u -r1.1499 -r1.1500
--- kernel.spec	1 Apr 2009 12:42:24 -0000	1.1499
+++ kernel.spec	1 Apr 2009 18:16:42 -0000	1.1500
@@ -1872,6 +1872,9 @@
 # and build.
 
 %changelog
+* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-acpi-video-didl-intel-outputs.patch: fix enabling of asle
+
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
 - drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards
 

linux-2.6-acpi-video-didl-intel-outputs.patch:

Index: linux-2.6-acpi-video-didl-intel-outputs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-acpi-video-didl-intel-outputs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-acpi-video-didl-intel-outputs.patch	19 Mar 2009 22:31:11 -0000	1.2
+++ linux-2.6-acpi-video-didl-intel-outputs.patch	1 Apr 2009 18:16:42 -0000	1.3
@@ -240,3 +240,14 @@
 +
 +#endif
 +
+diff -up linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c~ linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c
+--- linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c~	2009-04-01 18:57:47.000000000 +0100
++++ linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c	2009-04-01 18:59:49.000000000 +0100
+@@ -389,6 +389,7 @@ int intel_opregion_init(struct drm_devic
+ 	if (mboxes & MBOX_ASLE) {
+ 		DRM_DEBUG("ASLE supported\n");
+ 		opregion->asle = base + OPREGION_ASLE_OFFSET;
++		opregion_enable_asle(dev);
+ 	}
+ 
+ 	/* Notify BIOS we are ready to handle ACPI video ext notifs.



From mjg59 at fedoraproject.org  Wed Apr  1 18:30:19 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Wed,  1 Apr 2009 18:30:19 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1500,1.1501
Message-ID: <20090401183019.B3BDC7011D@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6701

Modified Files:
	kernel.spec 
Log Message:
* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-shut-up-efifb.patch: avoid efifb errors on unsupported hardware



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1500
retrieving revision 1.1501
diff -u -r1.1500 -r1.1501
--- kernel.spec	1 Apr 2009 18:16:42 -0000	1.1500
+++ kernel.spec	1 Apr 2009 18:29:49 -0000	1.1501
@@ -634,6 +634,7 @@
 Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
 
 Patch510: linux-2.6-silence-noise.patch
+Patch511: linux-2.6-shut-up-efifb.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
@@ -1220,6 +1221,9 @@
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
+# Avoid efifb spew
+ApplyPatch linux-2.6-shut-up-efifb.patch
+
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
@@ -1873,6 +1877,9 @@
 
 %changelog
 * Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-shut-up-efifb.patch: avoid efifb errors on unsupported hardware
+
+* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-acpi-video-didl-intel-outputs.patch: fix enabling of asle
 
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>



From rdieter at fedoraproject.org  Wed Apr  1 18:34:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:34:49 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.120,1.121
Message-ID: <20090401183449.41A367011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330

Modified Files:
	kdegames.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kdegames.spec	31 Mar 2009 12:05:56 -0000	1.120
+++ kdegames.spec	1 Apr 2009 18:34:18 -0000	1.121
@@ -4,7 +4,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,9 +27,8 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): xdg-utils ggz-client-libs
+Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
-Requires(postun): xdg-utils
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -116,10 +115,26 @@
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -128,12 +143,6 @@
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
 
-%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -175,6 +184,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 18:39:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:39:19 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.193,1.194
Message-ID: <20090401183919.B28367011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8093

Modified Files:
	kdegraphics.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdegraphics.spec	31 Mar 2009 12:12:57 -0000	1.193
+++ kdegraphics.spec	1 Apr 2009 18:38:49 -0000	1.194
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -48,8 +48,6 @@
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: cups
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
 Obsoletes: gwenview < 2
@@ -71,8 +69,6 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -125,20 +121,32 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans libs
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 
 %files
@@ -211,6 +219,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 18:44:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:44:09 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.139,1.140
Message-ID: <20090401184409.85EE67011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9139

Modified Files:
	kdemultimedia.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- kdemultimedia.spec	31 Mar 2009 12:21:18 -0000	1.139
+++ kdemultimedia.spec	1 Apr 2009 18:43:39 -0000	1.140
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -26,9 +26,6 @@
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
@@ -89,12 +86,22 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -144,6 +151,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 18:49:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:49:19 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.181,1.182
Message-ID: <20090401184919.CDE4D7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9902

Modified Files:
	kdenetwork.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kdenetwork.spec	31 Mar 2009 12:28:15 -0000	1.181
+++ kdenetwork.spec	1 Apr 2009 18:48:49 -0000	1.182
@@ -46,9 +46,6 @@
 BuildRequires: libv4l-devel
 # FIXME/TODO: libnxcl-devel
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
@@ -95,9 +92,9 @@
 %patch0 -p1 -b .handle-enc-message
 %patch1 -p1 -b .libv4l
 %patch100 -p0 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 %patch104 -p1 -b .kopete-view-history
 
-rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -105,7 +102,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -119,14 +116,23 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
+
 
 %post libs -p /sbin/ldconfig
 
@@ -157,10 +163,10 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
+%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
@@ -171,6 +177,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 18:52:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:52:07 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.121,1.122
Message-ID: <20090401185207.18D497011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10398

Modified Files:
	kdegames.spec 
Log Message:
fix %%files



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdegames.spec	1 Apr 2009 18:34:18 -0000	1.121
+++ kdegames.spec	1 Apr 2009 18:51:36 -0000	1.122
@@ -170,6 +170,7 @@
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
+%{_sysconfdir}/ggz.modules.d/kdegames
 
 %files libs
 %defattr(-,root,root,-)



From rdieter at fedoraproject.org  Wed Apr  1 18:55:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 18:55:24 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.211,1.212
Message-ID: <20090401185524.90D747011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11129

Modified Files:
	kdepim.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- kdepim.spec	31 Mar 2009 15:03:24 -0000	1.211
+++ kdepim.spec	1 Apr 2009 18:54:54 -0000	1.212
@@ -6,7 +6,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -23,9 +23,6 @@
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -129,15 +126,22 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
-%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -187,6 +191,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rvinyard at fedoraproject.org  Wed Apr  1 18:56:28 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 18:56:28 +0000 (UTC)
Subject: rpms/nqc/devel nqc.spec,1.10,1.11 sources,1.3,1.4
Message-ID: <20090401185628.897377011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/nqc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11455

Modified Files:
	nqc.spec sources 
Log Message:



Index: nqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/devel/nqc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nqc.spec	26 Feb 2009 06:03:52 -0000	1.10
+++ nqc.spec	1 Apr 2009 18:55:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nqc
 Version:        3.1.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
@@ -13,6 +13,13 @@
 Source4:        http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf
 Source5:        http://bricxcc.sourceforge.net/nqc/doc/NQC_Tutorial.pdf
 Source6:        http://bricxcc.sourceforge.net/nqc/doc/NQCTutorialSamples.zip
+Source7:        http://people.cs.uu.nl/markov/lego/tutorial_n.doc
+Source8:        http://people.cs.uu.nl/markov/lego/tutorial_d.doc
+Source9:        http://people.cs.uu.nl/markov/lego/tutorial_j.pdf
+Source10:       http://people.cs.uu.nl/markov/lego/tutorial_s.doc
+Source11:       http://people.cs.uu.nl/markov/lego/tutorial_i.doc
+Source12:       http://people.cs.uu.nl/markov/lego/tutorial_t.doc
+Source13:       http://people.cs.uu.nl/markov/lego/tutorial_p.pdf
 Patch0:         nqc-3.1.6-linux.patch
 BuildRequires:  flex >= 2.5 bison >= 2.0
 Requires(pre):  %{_sbindir}/groupadd
@@ -22,15 +29,78 @@
 Not Quite C is a simple language with a C-like syntax that can be used to
 program Lego's RCX programmable brick (from the Mindstorms set).
 
+%package        doc
+Summary:        English Documentation for NQC
+Group:          Documentation
+
+%description    doc
+English Documentation for NQC
+
+%package        doc-nl
+Summary:        Dutch Documentation for NQC
+Group:          Documentation
+
+%description	doc-nl
+Dutch Documentation for NQC
+
+%package        doc-de
+Summary:        German Documentation for NQC
+Group:          Documentation
+
+%description	doc-de
+German Documentation for NQC
+
+%package        doc-ja
+Summary:        Japanese Documentation for NQC
+Group:          Documentation
+
+%description	doc-ja
+Japanese Documentation for NQC
+
+%package        doc-es
+Summary:        Spanish Documentation for NQC
+Group:          Documentation
+
+%description	doc-es
+Spanish Documentation for NQC
+
+%package        doc-it
+Summary:        Italian Documentation for NQC
+Group:          Documentation
+
+%description	doc-it
+Italian Documentation for NQC
+
+%package        doc-th
+Summary:        Thai Documentation for NQC
+Group:          Documentation
+
+%description	doc-th
+Thai Documentation for NQC
+
+%package        doc-pt
+Summary:        Portuguese Documentation for NQC
+Group:          Documentation
+
+%description	doc-pt
+Portuguese Documentation for NQC
 
 %prep
 %setup -c -q -n nqc-3.1.r6
 %patch0 -p1
 
 for i in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
-  cp $i .
+  %{__cp} --preserve=timestamps $i .
 done
 
+%{__cp} --preserve=timestamps %{SOURCE7} ./nqc-tutorial-nl.doc
+%{__cp} --preserve=timestamps %{SOURCE8} ./nqc-tutorial-de.doc
+%{__cp} --preserve=timestamps %{SOURCE9} ./nqc-tutorial-ja.pdf
+%{__cp} --preserve=timestamps %{SOURCE10} ./nqc-tutorial-es.doc
+%{__cp} --preserve=timestamps %{SOURCE11} ./nqc-tutorial-it.doc
+%{__cp} --preserve=timestamps %{SOURCE12} ./nqc-tutorial-th.doc
+%{__cp} --preserve=timestamps %{SOURCE13} ./nqc-tutorial-pt.pdf
+
 %{__mkdir} tutorial_files
 %{__unzip} -qq -a %{SOURCE6} -d tutorial_files
 
@@ -48,7 +118,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install PREFIX=%{buildroot}%{_prefix} MANDIR=%{buildroot}%{_mandir}/man1
 %{__rm} %{buildroot}%{_bindir}/mkdata
-%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
+%{__install} -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
 
 
 %clean
@@ -65,11 +135,47 @@
 %{_bindir}/nqc
 %{_mandir}/man1/nqc.1.gz
 %{_sysconfdir}/udev/rules.d/60-legousbtower.rules
-%doc readme.txt scout.txt history.txt LICENSE test.nqc
+%doc readme.txt LICENSE
+
+%files doc
+%defattr(-,root,root,-)
+%doc scout.txt history.txt test.nqc
 %doc faq.html NQC_Manual.pdf NQC_Guide.pdf NQC_Tutorial.pdf tutorial_files/
 
+%files doc-nl
+%defattr(-,root,root,-)
+%doc nqc-tutorial-nl.doc
+
+%files doc-de
+%defattr(-,root,root,-)
+%doc nqc-tutorial-de.doc
+
+%files doc-ja
+%defattr(-,root,root,-)
+%doc nqc-tutorial-ja.pdf
+
+%files doc-es
+%defattr(-,root,root,-)
+%doc nqc-tutorial-es.doc
+
+%files doc-it
+%defattr(-,root,root,-)
+%doc nqc-tutorial-it.doc
+
+%files doc-th
+%defattr(-,root,root,-)
+%doc nqc-tutorial-th.doc
+
+%files doc-pt
+%defattr(-,root,root,-)
+%doc nqc-tutorial-pt.pdf
 
 %changelog
+* Wed Apr  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-4
+- Added multi-lingual doc packages and split English docs into their own package
+- Added -p to udev rules file on install
+- Added preserve timestamps to docs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2007 06:44:22 -0000	1.3
+++ sources	1 Apr 2009 18:55:58 -0000	1.4
@@ -3,3 +3,10 @@
 8a03d3a0099e4ebdb76a8c8cacc76e0a  NQC_Manual.pdf
 987211739544e39dc8616af629aa02c8  NQC_Tutorial.pdf
 0fb3c6bcf3c171de8d2646bd9b555197  NQCTutorialSamples.zip
+d9dd833c198c18f816a84d39ff2245bf  tutorial_d.doc
+d85cbbbfa33fbbacbb30cacdabd64004  tutorial_i.doc
+38739f86917796d20336b14cb68f9096  tutorial_j.pdf
+61c0988bebfe6024e5b64d2523c7f575  tutorial_n.doc
+39521e3067cbc80facb0dd394eb8d4df  tutorial_p.pdf
+c90560ce6bc70a70c346294c52e0a97b  tutorial_s.doc
+f7c4358e1e6e66718006e6d537dfae57  tutorial_t.doc



From rvinyard at fedoraproject.org  Wed Apr  1 18:59:57 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 18:59:57 +0000 (UTC)
Subject: rpms/nqc/F-9 .cvsignore,1.3,1.4 nqc.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <20090401185957.69D247013C@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/nqc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12680

Modified Files:
	.cvsignore nqc.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2007 06:44:22 -0000	1.3
+++ .cvsignore	1 Apr 2009 18:59:26 -0000	1.4
@@ -3,3 +3,10 @@
 NQC_Manual.pdf
 NQC_Tutorial.pdf
 NQCTutorialSamples.zip
+tutorial_d.doc
+tutorial_i.doc
+tutorial_j.pdf
+tutorial_n.doc
+tutorial_p.pdf
+tutorial_s.doc
+tutorial_t.doc


Index: nqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/F-9/nqc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nqc.spec	19 Feb 2008 22:54:19 -0000	1.9
+++ nqc.spec	1 Apr 2009 18:59:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nqc
 Version:        3.1.6
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
@@ -13,6 +13,13 @@
 Source4:        http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf
 Source5:        http://bricxcc.sourceforge.net/nqc/doc/NQC_Tutorial.pdf
 Source6:        http://bricxcc.sourceforge.net/nqc/doc/NQCTutorialSamples.zip
+Source7:        http://people.cs.uu.nl/markov/lego/tutorial_n.doc
+Source8:        http://people.cs.uu.nl/markov/lego/tutorial_d.doc
+Source9:        http://people.cs.uu.nl/markov/lego/tutorial_j.pdf
+Source10:       http://people.cs.uu.nl/markov/lego/tutorial_s.doc
+Source11:       http://people.cs.uu.nl/markov/lego/tutorial_i.doc
+Source12:       http://people.cs.uu.nl/markov/lego/tutorial_t.doc
+Source13:       http://people.cs.uu.nl/markov/lego/tutorial_p.pdf
 Patch0:         nqc-3.1.6-linux.patch
 BuildRequires:  flex >= 2.5 bison >= 2.0
 Requires(pre):  %{_sbindir}/groupadd
@@ -22,15 +29,78 @@
 Not Quite C is a simple language with a C-like syntax that can be used to
 program Lego's RCX programmable brick (from the Mindstorms set).
 
+%package        doc
+Summary:        English Documentation for NQC
+Group:          Documentation
+
+%description    doc
+English Documentation for NQC
+
+%package        doc-nl
+Summary:        Dutch Documentation for NQC
+Group:          Documentation
+
+%description	doc-nl
+Dutch Documentation for NQC
+
+%package        doc-de
+Summary:        German Documentation for NQC
+Group:          Documentation
+
+%description	doc-de
+German Documentation for NQC
+
+%package        doc-ja
+Summary:        Japanese Documentation for NQC
+Group:          Documentation
+
+%description	doc-ja
+Japanese Documentation for NQC
+
+%package        doc-es
+Summary:        Spanish Documentation for NQC
+Group:          Documentation
+
+%description	doc-es
+Spanish Documentation for NQC
+
+%package        doc-it
+Summary:        Italian Documentation for NQC
+Group:          Documentation
+
+%description	doc-it
+Italian Documentation for NQC
+
+%package        doc-th
+Summary:        Thai Documentation for NQC
+Group:          Documentation
+
+%description	doc-th
+Thai Documentation for NQC
+
+%package        doc-pt
+Summary:        Portuguese Documentation for NQC
+Group:          Documentation
+
+%description	doc-pt
+Portuguese Documentation for NQC
 
 %prep
 %setup -c -q -n nqc-3.1.r6
 %patch0 -p1
 
 for i in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
-  cp $i .
+  %{__cp} --preserve=timestamps $i .
 done
 
+%{__cp} --preserve=timestamps %{SOURCE7} ./nqc-tutorial-nl.doc
+%{__cp} --preserve=timestamps %{SOURCE8} ./nqc-tutorial-de.doc
+%{__cp} --preserve=timestamps %{SOURCE9} ./nqc-tutorial-ja.pdf
+%{__cp} --preserve=timestamps %{SOURCE10} ./nqc-tutorial-es.doc
+%{__cp} --preserve=timestamps %{SOURCE11} ./nqc-tutorial-it.doc
+%{__cp} --preserve=timestamps %{SOURCE12} ./nqc-tutorial-th.doc
+%{__cp} --preserve=timestamps %{SOURCE13} ./nqc-tutorial-pt.pdf
+
 %{__mkdir} tutorial_files
 %{__unzip} -qq -a %{SOURCE6} -d tutorial_files
 
@@ -48,7 +118,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install PREFIX=%{buildroot}%{_prefix} MANDIR=%{buildroot}%{_mandir}/man1
 %{__rm} %{buildroot}%{_bindir}/mkdata
-%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
+%{__install} -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
 
 
 %clean
@@ -65,11 +135,50 @@
 %{_bindir}/nqc
 %{_mandir}/man1/nqc.1.gz
 %{_sysconfdir}/udev/rules.d/60-legousbtower.rules
-%doc readme.txt scout.txt history.txt LICENSE test.nqc
+%doc readme.txt LICENSE
+
+%files doc
+%defattr(-,root,root,-)
+%doc scout.txt history.txt test.nqc
 %doc faq.html NQC_Manual.pdf NQC_Guide.pdf NQC_Tutorial.pdf tutorial_files/
 
+%files doc-nl
+%defattr(-,root,root,-)
+%doc nqc-tutorial-nl.doc
+
+%files doc-de
+%defattr(-,root,root,-)
+%doc nqc-tutorial-de.doc
+
+%files doc-ja
+%defattr(-,root,root,-)
+%doc nqc-tutorial-ja.pdf
+
+%files doc-es
+%defattr(-,root,root,-)
+%doc nqc-tutorial-es.doc
+
+%files doc-it
+%defattr(-,root,root,-)
+%doc nqc-tutorial-it.doc
+
+%files doc-th
+%defattr(-,root,root,-)
+%doc nqc-tutorial-th.doc
+
+%files doc-pt
+%defattr(-,root,root,-)
+%doc nqc-tutorial-pt.pdf
 
 %changelog
+* Wed Apr  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-4
+- Added multi-lingual doc packages and split English docs into their own package
+- Added -p to udev rules file on install
+- Added preserve timestamps to docs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.1.6-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2007 06:44:22 -0000	1.3
+++ sources	1 Apr 2009 18:59:27 -0000	1.4
@@ -3,3 +3,10 @@
 8a03d3a0099e4ebdb76a8c8cacc76e0a  NQC_Manual.pdf
 987211739544e39dc8616af629aa02c8  NQC_Tutorial.pdf
 0fb3c6bcf3c171de8d2646bd9b555197  NQCTutorialSamples.zip
+d9dd833c198c18f816a84d39ff2245bf  tutorial_d.doc
+d85cbbbfa33fbbacbb30cacdabd64004  tutorial_i.doc
+38739f86917796d20336b14cb68f9096  tutorial_j.pdf
+61c0988bebfe6024e5b64d2523c7f575  tutorial_n.doc
+39521e3067cbc80facb0dd394eb8d4df  tutorial_p.pdf
+c90560ce6bc70a70c346294c52e0a97b  tutorial_s.doc
+f7c4358e1e6e66718006e6d537dfae57  tutorial_t.doc



From rvinyard at fedoraproject.org  Wed Apr  1 19:00:04 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  1 Apr 2009 19:00:04 +0000 (UTC)
Subject: rpms/nqc/F-10 .cvsignore,1.3,1.4 nqc.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <20090401190004.41C3F7011D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/nqc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12746

Modified Files:
	.cvsignore nqc.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2007 06:44:22 -0000	1.3
+++ .cvsignore	1 Apr 2009 18:59:33 -0000	1.4
@@ -3,3 +3,10 @@
 NQC_Manual.pdf
 NQC_Tutorial.pdf
 NQCTutorialSamples.zip
+tutorial_d.doc
+tutorial_i.doc
+tutorial_j.pdf
+tutorial_n.doc
+tutorial_p.pdf
+tutorial_s.doc
+tutorial_t.doc


Index: nqc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/F-10/nqc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nqc.spec	19 Feb 2008 22:54:19 -0000	1.9
+++ nqc.spec	1 Apr 2009 18:59:34 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nqc
 Version:        3.1.6
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
@@ -13,6 +13,13 @@
 Source4:        http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf
 Source5:        http://bricxcc.sourceforge.net/nqc/doc/NQC_Tutorial.pdf
 Source6:        http://bricxcc.sourceforge.net/nqc/doc/NQCTutorialSamples.zip
+Source7:        http://people.cs.uu.nl/markov/lego/tutorial_n.doc
+Source8:        http://people.cs.uu.nl/markov/lego/tutorial_d.doc
+Source9:        http://people.cs.uu.nl/markov/lego/tutorial_j.pdf
+Source10:       http://people.cs.uu.nl/markov/lego/tutorial_s.doc
+Source11:       http://people.cs.uu.nl/markov/lego/tutorial_i.doc
+Source12:       http://people.cs.uu.nl/markov/lego/tutorial_t.doc
+Source13:       http://people.cs.uu.nl/markov/lego/tutorial_p.pdf
 Patch0:         nqc-3.1.6-linux.patch
 BuildRequires:  flex >= 2.5 bison >= 2.0
 Requires(pre):  %{_sbindir}/groupadd
@@ -22,15 +29,78 @@
 Not Quite C is a simple language with a C-like syntax that can be used to
 program Lego's RCX programmable brick (from the Mindstorms set).
 
+%package        doc
+Summary:        English Documentation for NQC
+Group:          Documentation
+
+%description    doc
+English Documentation for NQC
+
+%package        doc-nl
+Summary:        Dutch Documentation for NQC
+Group:          Documentation
+
+%description	doc-nl
+Dutch Documentation for NQC
+
+%package        doc-de
+Summary:        German Documentation for NQC
+Group:          Documentation
+
+%description	doc-de
+German Documentation for NQC
+
+%package        doc-ja
+Summary:        Japanese Documentation for NQC
+Group:          Documentation
+
+%description	doc-ja
+Japanese Documentation for NQC
+
+%package        doc-es
+Summary:        Spanish Documentation for NQC
+Group:          Documentation
+
+%description	doc-es
+Spanish Documentation for NQC
+
+%package        doc-it
+Summary:        Italian Documentation for NQC
+Group:          Documentation
+
+%description	doc-it
+Italian Documentation for NQC
+
+%package        doc-th
+Summary:        Thai Documentation for NQC
+Group:          Documentation
+
+%description	doc-th
+Thai Documentation for NQC
+
+%package        doc-pt
+Summary:        Portuguese Documentation for NQC
+Group:          Documentation
+
+%description	doc-pt
+Portuguese Documentation for NQC
 
 %prep
 %setup -c -q -n nqc-3.1.r6
 %patch0 -p1
 
 for i in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
-  cp $i .
+  %{__cp} --preserve=timestamps $i .
 done
 
+%{__cp} --preserve=timestamps %{SOURCE7} ./nqc-tutorial-nl.doc
+%{__cp} --preserve=timestamps %{SOURCE8} ./nqc-tutorial-de.doc
+%{__cp} --preserve=timestamps %{SOURCE9} ./nqc-tutorial-ja.pdf
+%{__cp} --preserve=timestamps %{SOURCE10} ./nqc-tutorial-es.doc
+%{__cp} --preserve=timestamps %{SOURCE11} ./nqc-tutorial-it.doc
+%{__cp} --preserve=timestamps %{SOURCE12} ./nqc-tutorial-th.doc
+%{__cp} --preserve=timestamps %{SOURCE13} ./nqc-tutorial-pt.pdf
+
 %{__mkdir} tutorial_files
 %{__unzip} -qq -a %{SOURCE6} -d tutorial_files
 
@@ -48,7 +118,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install PREFIX=%{buildroot}%{_prefix} MANDIR=%{buildroot}%{_mandir}/man1
 %{__rm} %{buildroot}%{_bindir}/mkdata
-%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
+%{__install} -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
 
 
 %clean
@@ -65,11 +135,50 @@
 %{_bindir}/nqc
 %{_mandir}/man1/nqc.1.gz
 %{_sysconfdir}/udev/rules.d/60-legousbtower.rules
-%doc readme.txt scout.txt history.txt LICENSE test.nqc
+%doc readme.txt LICENSE
+
+%files doc
+%defattr(-,root,root,-)
+%doc scout.txt history.txt test.nqc
 %doc faq.html NQC_Manual.pdf NQC_Guide.pdf NQC_Tutorial.pdf tutorial_files/
 
+%files doc-nl
+%defattr(-,root,root,-)
+%doc nqc-tutorial-nl.doc
+
+%files doc-de
+%defattr(-,root,root,-)
+%doc nqc-tutorial-de.doc
+
+%files doc-ja
+%defattr(-,root,root,-)
+%doc nqc-tutorial-ja.pdf
+
+%files doc-es
+%defattr(-,root,root,-)
+%doc nqc-tutorial-es.doc
+
+%files doc-it
+%defattr(-,root,root,-)
+%doc nqc-tutorial-it.doc
+
+%files doc-th
+%defattr(-,root,root,-)
+%doc nqc-tutorial-th.doc
+
+%files doc-pt
+%defattr(-,root,root,-)
+%doc nqc-tutorial-pt.pdf
 
 %changelog
+* Wed Apr  1 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-4
+- Added multi-lingual doc packages and split English docs into their own package
+- Added -p to udev rules file on install
+- Added preserve timestamps to docs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.1.6-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nqc/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2007 06:44:22 -0000	1.3
+++ sources	1 Apr 2009 18:59:34 -0000	1.4
@@ -3,3 +3,10 @@
 8a03d3a0099e4ebdb76a8c8cacc76e0a  NQC_Manual.pdf
 987211739544e39dc8616af629aa02c8  NQC_Tutorial.pdf
 0fb3c6bcf3c171de8d2646bd9b555197  NQCTutorialSamples.zip
+d9dd833c198c18f816a84d39ff2245bf  tutorial_d.doc
+d85cbbbfa33fbbacbb30cacdabd64004  tutorial_i.doc
+38739f86917796d20336b14cb68f9096  tutorial_j.pdf
+61c0988bebfe6024e5b64d2523c7f575  tutorial_n.doc
+39521e3067cbc80facb0dd394eb8d4df  tutorial_p.pdf
+c90560ce6bc70a70c346294c52e0a97b  tutorial_s.doc
+f7c4358e1e6e66718006e6d537dfae57  tutorial_t.doc



From rdieter at fedoraproject.org  Wed Apr  1 19:00:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:00:21 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.30,1.31
Message-ID: <20090401190021.30E587011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13034

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kdeplasma-addons.spec	31 Mar 2009 15:50:38 -0000	1.30
+++ kdeplasma-addons.spec	1 Apr 2009 18:59:50 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -36,8 +36,8 @@
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -76,11 +76,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %clean
@@ -111,6 +117,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 19:12:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:12:20 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk.spec,1.140,1.141
Message-ID: <20090401191220.7CE5F7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16077

Modified Files:
	kdesdk.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kdesdk.spec	31 Mar 2009 15:36:55 -0000	1.140
+++ kdesdk.spec	1 Apr 2009 19:11:49 -0000	1.141
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -29,8 +29,6 @@
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -121,15 +119,29 @@
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -214,6 +226,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 19:14:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:14:08 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec, 1.212, 1.213 kdepim-4.2.1-imap.patch,
	1.1, NONE kdepim-4.2.1-korganizer_view.patch, 1.1, NONE
Message-ID: <20090401191408.626957011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16656

Modified Files:
	kdepim.spec 
Removed Files:
	kdepim-4.2.1-imap.patch kdepim-4.2.1-korganizer_view.patch 
Log Message:
drop upstreamed patches



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- kdepim.spec	1 Apr 2009 18:54:54 -0000	1.212
+++ kdepim.spec	1 Apr 2009 19:13:37 -0000	1.213
@@ -13,9 +13,6 @@
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# upstream patches
-Patch100: kdepim-4.2.1-imap.patch
-Patch101: kdepim-4.2.1-korganizer_view.patch 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,8 +89,6 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .imap
-%patch101 -p4 -b .korganizer_view
 
 
 %build


--- kdepim-4.2.1-imap.patch DELETED ---


--- kdepim-4.2.1-korganizer_view.patch DELETED ---



From rdieter at fedoraproject.org  Wed Apr  1 19:15:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:15:44 +0000 (UTC)
Subject: rpms/kdetoys/devel kdetoys.spec,1.49,1.50
Message-ID: <20090401191544.B62F37011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17066

Modified Files:
	kdetoys.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdetoys.spec	31 Mar 2009 15:39:10 -0000	1.49
+++ kdetoys.spec	1 Apr 2009 19:15:14 -0000	1.50
@@ -2,7 +2,7 @@
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -18,8 +18,8 @@
 
 Requires: kdelibs4 >= %{version}
 #Requires: kdebase-workspace
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 
 # FIXME: Don't list / drop kweather? It isn't really working as far as I can
@@ -60,11 +60,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files
@@ -83,6 +89,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From oget at fedoraproject.org  Wed Apr  1 19:16:21 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 19:16:21 +0000 (UTC)
Subject: rpms/ladspa-cmt-plugins/devel .cvsignore, 1.2,
	1.3 cmt-1.15-nostrip.patch, 1.1, 1.2 ladspa-cmt-plugins.spec,
	1.3, 1.4 sources, 1.2, 1.3 cmt-makefile.patch, 1.1, NONE
Message-ID: <20090401191621.2D7427011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ladspa-cmt-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17257

Modified Files:
	.cvsignore cmt-1.15-nostrip.patch ladspa-cmt-plugins.spec 
	sources 
Removed Files:
	cmt-makefile.patch 
Log Message:
* Wed Apr 01 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.16-1
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2007 17:44:41 -0000	1.2
+++ .cvsignore	1 Apr 2009 19:15:50 -0000	1.3
@@ -1 +1 @@
-cmt_src_1.15.tgz
+cmt_src_1.16.tgz

cmt-1.15-nostrip.patch:

Index: cmt-1.15-nostrip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/devel/cmt-1.15-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmt-1.15-nostrip.patch	21 Sep 2007 17:44:41 -0000	1.1
+++ cmt-1.15-nostrip.patch	1 Apr 2009 19:15:50 -0000	1.2
@@ -6,6 +6,6 @@
  
  install:	$(PLUGIN_LIB)
 -	-strip $(PLUGIN_LIB)
- 	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
+ 	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
  
  test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always


Index: ladspa-cmt-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/devel/ladspa-cmt-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ladspa-cmt-plugins.spec	25 Feb 2009 12:22:53 -0000	1.3
+++ ladspa-cmt-plugins.spec	1 Apr 2009 19:15:50 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           ladspa-cmt-plugins
-Version:        1.15
-Release:        8%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        A collection of LADSPA plugins
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.ladspa.org/
 Source0:        http://www.ladspa.org/download/cmt_src_%{version}.tgz
 Source1:        cmt.rdf
-Patch0:         cmt-makefile.patch
 Patch1:         cmt-1.15-addnoise.patch
 Patch2:         cmt-1.15-dontdenormal.patch
 Patch3:         cmt-1.15-nostrip.patch
@@ -30,11 +29,10 @@
 
 %prep
 %setup -q -n cmt
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-chmod -x doc/plugins.html src/freeverb/Components/tuning.h
+%{__chmod} -x doc/plugins.html src/freeverb/Components/tuning.h
 
 
 %build
@@ -45,8 +43,7 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir} -p %{buildroot}%{_libdir}/ladspa
 %{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
-%{__make} -C src DESTDIR="%{buildroot}" \
-                 INSTALL_PLUGINS_DIR="%{_libdir}/ladspa/" \
+%{__make} -C src INSTALL_PLUGINS_DIR="%{buildroot}%{_libdir}/ladspa/" \
                  install
 %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ladspa/rdf
 
@@ -63,6 +60,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.16-1
+- New upstream bugfix release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2007 17:44:41 -0000	1.2
+++ sources	1 Apr 2009 19:15:50 -0000	1.3
@@ -1 +1 @@
-aa2f0609aca8b698625d86170c426e2c  cmt_src_1.15.tgz
+15a875e5aaf79c209c223babfb41cb1c  cmt_src_1.16.tgz


--- cmt-makefile.patch DELETED ---



From rdieter at fedoraproject.org  Wed Apr  1 19:18:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:18:01 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.169,1.170
Message-ID: <20090401191801.183627011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17743

Modified Files:
	kdeutils.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdeutils.spec	31 Mar 2009 15:44:42 -0000	1.169
+++ kdeutils.spec	1 Apr 2009 19:17:30 -0000	1.170
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -28,8 +28,8 @@
 BuildRequires:  libzip-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
 # printer applet
@@ -120,16 +120,24 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files
@@ -187,6 +195,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 19:22:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:22:57 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.370,1.371
Message-ID: <20090401192257.16FAA7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18881

Modified Files:
	kdebase.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
- optimize scriptlets



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- kdebase.spec	31 Mar 2009 11:22:52 -0000	1.370
+++ kdebase.spec	1 Apr 2009 19:22:26 -0000	1.371
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -253,19 +253,29 @@
 
 %post
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+%if "%{name}" == "kdebase"
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %if 0%{?libs}
 %post libs -p /sbin/ldconfig
@@ -310,6 +320,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+- optimize scriptlets
+
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From oget at fedoraproject.org  Wed Apr  1 19:25:29 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  1 Apr 2009 19:25:29 +0000 (UTC)
Subject: rpms/ladspa-cmt-plugins/F-10 .cvsignore, 1.2,
	1.3 cmt-1.15-nostrip.patch, 1.1, 1.2 ladspa-cmt-plugins.spec,
	1.2, 1.3 sources, 1.2, 1.3 cmt-makefile.patch, 1.1, NONE
Message-ID: <20090401192529.0C3C77011D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ladspa-cmt-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19669

Modified Files:
	.cvsignore cmt-1.15-nostrip.patch ladspa-cmt-plugins.spec 
	sources 
Removed Files:
	cmt-makefile.patch 
Log Message:
* Wed Apr 01 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.16-1
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2007 17:44:41 -0000	1.2
+++ .cvsignore	1 Apr 2009 19:24:58 -0000	1.3
@@ -1 +1 @@
-cmt_src_1.15.tgz
+cmt_src_1.16.tgz

cmt-1.15-nostrip.patch:

Index: cmt-1.15-nostrip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/F-10/cmt-1.15-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmt-1.15-nostrip.patch	21 Sep 2007 17:44:41 -0000	1.1
+++ cmt-1.15-nostrip.patch	1 Apr 2009 19:24:58 -0000	1.2
@@ -6,6 +6,6 @@
  
  install:	$(PLUGIN_LIB)
 -	-strip $(PLUGIN_LIB)
- 	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
+ 	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
  
  test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always


Index: ladspa-cmt-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/F-10/ladspa-cmt-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ladspa-cmt-plugins.spec	19 Feb 2008 08:50:12 -0000	1.2
+++ ladspa-cmt-plugins.spec	1 Apr 2009 19:24:58 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           ladspa-cmt-plugins
-Version:        1.15
-Release:        7%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        A collection of LADSPA plugins
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.ladspa.org/
 Source0:        http://www.ladspa.org/download/cmt_src_%{version}.tgz
 Source1:        cmt.rdf
-Patch0:         cmt-makefile.patch
 Patch1:         cmt-1.15-addnoise.patch
 Patch2:         cmt-1.15-dontdenormal.patch
 Patch3:         cmt-1.15-nostrip.patch
@@ -30,11 +29,10 @@
 
 %prep
 %setup -q -n cmt
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-chmod -x doc/plugins.html src/freeverb/Components/tuning.h
+%{__chmod} -x doc/plugins.html src/freeverb/Components/tuning.h
 
 
 %build
@@ -45,8 +43,7 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir} -p %{buildroot}%{_libdir}/ladspa
 %{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
-%{__make} -C src DESTDIR="%{buildroot}" \
-                 INSTALL_PLUGINS_DIR="%{_libdir}/ladspa/" \
+%{__make} -C src INSTALL_PLUGINS_DIR="%{buildroot}%{_libdir}/ladspa/" \
                  install
 %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ladspa/rdf
 
@@ -63,6 +60,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.16-1
+- New upstream bugfix release
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.15-7
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-cmt-plugins/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2007 17:44:41 -0000	1.2
+++ sources	1 Apr 2009 19:24:58 -0000	1.3
@@ -1 +1 @@
-aa2f0609aca8b698625d86170c426e2c  cmt_src_1.15.tgz
+15a875e5aaf79c209c223babfb41cb1c  cmt_src_1.16.tgz


--- cmt-makefile.patch DELETED ---



From itamarjp at fedoraproject.org  Wed Apr  1 19:27:00 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed,  1 Apr 2009 19:27:00 +0000 (UTC)
Subject: rpms/reiserfs-utils/F-10 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 reiserfs-utils.spec, 1.18, 1.19 sources, 1.7,
	1.8 header-fix.patch, 1.2, NONE
Message-ID: <20090401192700.CD4EC7011D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/reiserfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20157/F-10

Modified Files:
	.cvsignore reiserfs-utils.spec sources 
Added Files:
	import.log 
Removed Files:
	header-fix.patch 
Log Message:
3.6.21



--- NEW FILE import.log ---
reiserfs-utils-3_6_21-1_fc11:F-10:reiserfs-utils-3.6.21-1.fc11.src.rpm:1238613939


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jan 2005 12:25:36 -0000	1.7
+++ .cvsignore	1 Apr 2009 19:26:30 -0000	1.8
@@ -1,3 +1 @@
-reiserfsprogs-3.6.17.tar.gz
-reiserfsprogs-3.6.18.tar.gz
-reiserfsprogs-3.6.19.tar.gz
+reiserfsprogs-3.6.21.tar.gz


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/F-10/reiserfs-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- reiserfs-utils.spec	3 Sep 2008 20:31:59 -0000	1.18
+++ reiserfs-utils.spec	1 Apr 2009 19:26:30 -0000	1.19
@@ -1,16 +1,17 @@
 Name: reiserfs-utils
-Version: 3.6.19
-Release: 4%{?dist}
+Version: 3.6.21
+Release: 1%{?dist}
 Summary: Tools for creating, repairing, and debugging ReiserFS filesystems
-URL: http://www.namesys.com/
-Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
+#URL: http://www.namesys.com/
+URL: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/
+#Source0: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
+Source0: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-%{version}.tar.gz
 # See README.
 License: GPLv2 with exceptions
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
 BuildRequires: e2fsprogs-devel
-Patch1: header-fix.patch
 
 %description
 The reiserfs-utils package contains a number of utilities for
@@ -27,7 +28,6 @@
 
 %prep
 %setup -q -n reiserfsprogs-%{version}
-%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -63,6 +63,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 01 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2:3.6.21-1
+- 3.6.21
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:3.6.19-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:3.6.19-4
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2005 12:25:36 -0000	1.7
+++ sources	1 Apr 2009 19:26:30 -0000	1.8
@@ -1 +1 @@
-b42cf15f6651c3ceff5cb84996c0d539  reiserfsprogs-3.6.19.tar.gz
+bc00c7c4e047902575dc4e1c64ab3ba4  reiserfsprogs-3.6.21.tar.gz


--- header-fix.patch DELETED ---



From itamarjp at fedoraproject.org  Wed Apr  1 19:29:23 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed,  1 Apr 2009 19:29:23 +0000 (UTC)
Subject: rpms/reiserfs-utils/F-9 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 reiserfs-utils.spec, 1.17, 1.18 sources, 1.7,
	1.8 header-fix.patch, 1.2, NONE
Message-ID: <20090401192923.BDF077011D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/reiserfs-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046/F-9

Modified Files:
	.cvsignore reiserfs-utils.spec sources 
Added Files:
	import.log 
Removed Files:
	header-fix.patch 
Log Message:
3.6.213.6.213.6.21



--- NEW FILE import.log ---
reiserfs-utils-3_6_21-1_fc11:F-9:reiserfs-utils-3.6.21-1.fc11.src.rpm:1238614097


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jan 2005 12:25:36 -0000	1.7
+++ .cvsignore	1 Apr 2009 19:28:53 -0000	1.8
@@ -1,3 +1 @@
-reiserfsprogs-3.6.17.tar.gz
-reiserfsprogs-3.6.18.tar.gz
-reiserfsprogs-3.6.19.tar.gz
+reiserfsprogs-3.6.21.tar.gz


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/F-9/reiserfs-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- reiserfs-utils.spec	19 Feb 2008 06:15:03 -0000	1.17
+++ reiserfs-utils.spec	1 Apr 2009 19:28:53 -0000	1.18
@@ -1,16 +1,17 @@
 Name: reiserfs-utils
-Version: 3.6.19
-Release: 3.4.1
-Summary: Tools for creating, repairing, and debugging ReiserFS filesystems.
-URL: http://www.namesys.com/
-Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
-License: GPL
+Version: 3.6.21
+Release: 1%{?dist}
+Summary: Tools for creating, repairing, and debugging ReiserFS filesystems
+#URL: http://www.namesys.com/
+URL: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/
+#Source0: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
+Source0: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-%{version}.tar.gz
+# See README.
+License: GPLv2 with exceptions
 Group: System Environment/Base
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
 BuildRequires: e2fsprogs-devel
-Patch1: header-fix.patch
 
 %description
 The reiserfs-utils package contains a number of utilities for
@@ -25,15 +26,13 @@
 You should install the reiserfs-utils package if you want to use
 ReiserFS on any of your partitions.
 
-%{name} contains reiserfsck (used to repair filesystem
 %prep
-%setup -n reiserfsprogs-%{version}
-%patch1 -p1
+%setup -q -n reiserfsprogs-%{version}
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 find . -name "config.cache" |xargs rm -f
-%configure --prefix=/
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -49,7 +48,7 @@
   ln -fs reiserfsck fsck.reiserfs )
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README
 /sbin/debugreiserfs
 /sbin/mkreiserfs
@@ -61,9 +60,18 @@
 %{_mandir}/*/*
 
 %clean
-rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 01 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2:3.6.21-1
+- 3.6.21
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:3.6.19-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:3.6.19-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2:3.6.19-3.4.1
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2005 12:25:36 -0000	1.7
+++ sources	1 Apr 2009 19:28:53 -0000	1.8
@@ -1 +1 @@
-b42cf15f6651c3ceff5cb84996c0d539  reiserfsprogs-3.6.19.tar.gz
+bc00c7c4e047902575dc4e1c64ab3ba4  reiserfsprogs-3.6.21.tar.gz


--- header-fix.patch DELETED ---



From limb at fedoraproject.org  Wed Apr  1 19:30:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  1 Apr 2009 19:30:03 +0000 (UTC)
Subject: rpms/moodle/devel moodle-1.9.4-CVE-2009-1171-1.patch, NONE,
	1.1 moodle-1.9.4-CVE-2009-1171-2.patch, NONE, 1.1 moodle.spec,
	1.41, 1.42
Message-ID: <20090401193003.58E3B7013C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21355

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.9.4-CVE-2009-1171-1.patch 
	moodle-1.9.4-CVE-2009-1171-2.patch 
Log Message:
CVE-2009-1171


moodle-1.9.4-CVE-2009-1171-1.patch:

--- NEW FILE moodle-1.9.4-CVE-2009-1171-1.patch ---
--- filter/tex/filter.php.orig	2009/02/17 05:24:35	1.18.4.4
+++ filter/tex/filter.php	2009/03/26 19:06:29	1.18.4.5
@@ -133,6 +133,16 @@
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
+    // TeX blacklist. MDL-18552
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -155,6 +165,19 @@
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
+        $invalidcommands = array();
+        foreach($tex_blacklist as $command) {
+            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
+                $invalidcommands[] = $command;
+            }
+        }
+        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
+            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
+            $text = str_replace( $matches[0][$i], $invalidstr, $text);
+            continue;
+        }
+    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';

moodle-1.9.4-CVE-2009-1171-2.patch:

--- NEW FILE moodle-1.9.4-CVE-2009-1171-2.patch ---
--- filter/tex/filter.php.orig
+++ filter/tex/filter.php
@@ -133,16 +133,6 @@ function tex_filter ($courseid, $text) {
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
-    // TeX blacklist. MDL-18552
-    $tex_blacklist = array(
-        'include','def','command','loop','repeat','open','toks','output',
-        'input','catcode','name','^^',
-        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
-        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
-        '\lowercase','\relax','\aftergroup',
-        '\afterassignment','\expandafter','\noexpand','\special'
-    );
-
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -165,19 +155,6 @@ function tex_filter ($courseid, $text) {
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
-    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
-        $invalidcommands = array();
-        foreach($tex_blacklist as $command) {
-            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
-                $invalidcommands[] = $command;
-            }
-        }
-        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
-            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
-            $text = str_replace( $matches[0][$i], $invalidstr, $text);
-            continue;
-        }
-    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';
--- filter/tex/latex.php.orig
+++ filter/tex/latex.php
@@ -44,9 +44,11 @@
          * @return string the latex document
          */
         function construct_latex_document( $formula, $fontsize=12 ) {
-            // $fontsize don't affects to formula's size. $density can change size
-
             global $CFG;
+
+            $formula = tex_sanitize_formula($formula);
+
+            // $fontsize don't affects to formula's size. $density can change size
             $doc =  "\\documentclass[{$fontsize}pt]{article}\n"; 
             $doc .=  $CFG->filter_tex_latexpreamble;
             $doc .= "\\pagestyle{empty}\n";
--- filter/tex/lib.php.orig
+++ filter/tex/lib.php
@@ -34,8 +34,22 @@ function tex_filter_get_executable($debug=false) {
     error($error_message1);
 }
 
+function tex_sanitize_formula($texexp) {
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain)
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
+    return  str_ireplace($tex_blacklist, 'forbiddenkeyword', $texexp);
+}
 
 function tex_filter_get_cmd($pathname, $texexp) {
+    $texexp = tex_sanitize_formula($texexp);
     $texexp = escapeshellarg($texexp);
     $executable = tex_filter_get_executable(false);
 
--- lib/db/upgrade.php.orig
+++ lib/db/upgrade.php
@@ -3106,6 +3106,13 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101542);
     }
 
+    if ($result && $oldversion < 2007101545.01) {
+        require_once("$CFG->dirroot/filter/tex/lib.php");
+        filter_tex_updatedcallback(null);
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2007101545.01);
+    }
+
     return $result;
 }
 
--- version.php.orig
+++ version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101540;  // YYYYMMDD      = date of the 1.9 branch (don't change)
+    $version = 2007101545.01;  // YYYYMMDD      = date of the 1.9 branch (don't change)
                             //         X     = release number 1.9.[0,1,2,3,4,5...]
                             //          Y.YY = micro-increments between releases
 


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- moodle.spec	24 Mar 2009 18:46:57 -0000	1.41
+++ moodle.spec	1 Apr 2009 19:29:33 -0000	1.42
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 %define moodlewebdir %{_var}/www/moodle/web
 %define moodledatadir %{_var}/www/moodle/data
 
@@ -7,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -104,6 +105,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
+Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
+Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -1478,6 +1481,8 @@
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1689,6 +1694,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
+- Patch for CVE-2009-1171, BZ 493109.
+
 * Tue Mar 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-5
 - Update for freefont->gnu-free-fonts change.
 



From rdieter at fedoraproject.org  Wed Apr  1 19:40:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:40:02 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec, 1.371,
	1.372 kdebase-4.2.1-konsole-layout-regression.patch, 1.1,
	NONE kdebase-4.2.1-konsole-selection.patch, 1.1, NONE
Message-ID: <20090401194002.EE9767011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24492

Modified Files:
	kdebase.spec 
Removed Files:
	kdebase-4.2.1-konsole-layout-regression.patch 
	kdebase-4.2.1-konsole-selection.patch 
Log Message:
drop upstreamed patches



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- kdebase.spec	1 Apr 2009 19:22:26 -0000	1.371
+++ kdebase.spec	1 Apr 2009 19:39:32 -0000	1.372
@@ -29,8 +29,6 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
-Patch100:   kdebase-4.2.1-konsole-selection.patch
-Patch101:   kdebase-4.2.1-konsole-layout-regression.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -127,9 +125,6 @@
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
-%patch100 -p1 -b .konsole
-%patch101 -p1 -b .layout-regression
-
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 


--- kdebase-4.2.1-konsole-layout-regression.patch DELETED ---


--- kdebase-4.2.1-konsole-selection.patch DELETED ---



From rmeggins at fedoraproject.org  Wed Apr  1 19:55:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 19:55:40 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 .cvsignore, 1.11,
	1.12 fedora-ds-base-cvs.sh, 
	1.8, 1.9 fedora-ds-base.spec, 1.25, 1.26 sources, 1.17, 1.18
Message-ID: <20090401195540.3FDDB7011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27839/F-10

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Sep 2008 22:30:23 -0000	1.11
+++ .cvsignore	1 Apr 2009 19:55:09 -0000	1.12
@@ -1,4 +1 @@
-fedora-ds-base-1.1.0.tar.bz2
-fedora-ds-base-1.1.1.tar.bz2
-fedora-ds-base-1.1.2.tar.bz2
-fedora-ds-base-1.1.3.tar.bz2
+fedora-ds-base-1.2.0.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base-cvs.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-ds-base-cvs.sh	23 Sep 2008 22:30:24 -0000	1.8
+++ fedora-ds-base-cvs.sh	1 Apr 2009 19:55:09 -0000	1.9
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_1_3
-VERSION=1.1.3
+CVSTAG=FedoraDirSvr_1_2_0_RC1
+VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fedora-ds-base.spec	30 Oct 2008 21:53:43 -0000	1.25
+++ fedora-ds-base.spec	1 Apr 2009 19:55:09 -0000	1.26
@@ -4,8 +4,8 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.3
-Release:          7%{?dist}
+Version:          1.2.0
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -60,7 +60,6 @@
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
-Patch0:           bug463991-bdb47.patch
 
 %description
 Fedora Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -70,13 +69,13 @@
 Summary:          Development libraries for Fedora Directory Server
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
+Requires:         mozldap-devel
 
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
 cp %{SOURCE2} README.devel
 
 %build
@@ -119,7 +118,16 @@
 %post
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
-
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section - we list it as a ghost so that
+# it will be removed when the rpm is removed
+if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -161,6 +169,12 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
+- new release 1.2.0
+- Made devel package depend on mozldap-devel
+- only create run dir if it does not exist
+- CVS tag: FedoraDirSvr_1_2_0_RC1 FedoraDirSvr_1_2_0_RC1_20090330
+
 * Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-7
 - added db4-utils to Requires for verify-db.pl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	31 Oct 2008 15:39:16 -0000	1.17
+++ sources	1 Apr 2009 19:55:09 -0000	1.18
@@ -1 +1 @@
-65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2
+9524493ace50fd8103e5c23950c91b96  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 19:55:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 19:55:40 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-8 fedora-ds-base.spec,1.15,1.16
Message-ID: <20090401195540.633957011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27839/F-8

Modified Files:
	fedora-ds-base.spec 
Log Message:
this is the 1.2.0 release


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-8/fedora-ds-base.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fedora-ds-base.spec	30 Oct 2008 21:53:42 -0000	1.15
+++ fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.16
@@ -4,8 +4,8 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.3
-Release:          4%{?dist}
+Version:          1.1.4
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -114,7 +114,16 @@
 %post
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
-
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section - we list it as a ghost so that
+# it will be removed when the rpm is removed
+if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -156,6 +165,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Nov  3 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.4-1
+- first cut
+
 * Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-4
 - added db4-utils to Requires for verify-db.pl
 



From rmeggins at fedoraproject.org  Wed Apr  1 19:55:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 19:55:40 +0000 (UTC)
Subject: rpms/fedora-ds-base/FC-6 fedora-ds-base.spec,1.15,1.16
Message-ID: <20090401195540.EED257011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27839/FC-6

Modified Files:
	fedora-ds-base.spec 
Log Message:
this is the 1.2.0 release


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fedora-ds-base.spec	30 Oct 2008 21:53:43 -0000	1.15
+++ fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.16
@@ -4,8 +4,8 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.3
-Release:          4%{?dist}
+Version:          1.2.0
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -66,6 +66,7 @@
 Summary:          Development libraries for Fedora Directory Server
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
+Requires:         mozldap-devel
 
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
@@ -114,7 +115,16 @@
 %post
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
-
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section - we list it as a ghost so that
+# it will be removed when the rpm is removed
+if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -156,7 +166,13 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
-* Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-4
+* Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
+- new release 1.2.0
+- Made devel package depend on mozldap-devel
+- only create run dir if it does not exist
+- CVS tag: FedoraDirSvr_1_2_0_RC1 FedoraDirSvr_1_2_0_RC1_20090330
+
+* Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-7
 - added db4-utils to Requires for verify-db.pl
 
 * Mon Oct 13 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-3



From rmeggins at fedoraproject.org  Wed Apr  1 19:55:41 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 19:55:41 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel .cvsignore, 1.11,
	1.12 fedora-ds-base-cvs.sh, 
	1.8, 1.9 fedora-ds-base.spec, 1.27, 1.28 sources, 1.17, 1.18
Message-ID: <20090401195541.54BF77011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27839/devel

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Sep 2008 22:30:23 -0000	1.11
+++ .cvsignore	1 Apr 2009 19:55:10 -0000	1.12
@@ -1,4 +1 @@
-fedora-ds-base-1.1.0.tar.bz2
-fedora-ds-base-1.1.1.tar.bz2
-fedora-ds-base-1.1.2.tar.bz2
-fedora-ds-base-1.1.3.tar.bz2
+fedora-ds-base-1.2.0.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base-cvs.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-ds-base-cvs.sh	23 Sep 2008 22:30:24 -0000	1.8
+++ fedora-ds-base-cvs.sh	1 Apr 2009 19:55:10 -0000	1.9
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_1_3
-VERSION=1.1.3
+CVSTAG=FedoraDirSvr_1_2_0_RC1
+VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fedora-ds-base.spec	24 Feb 2009 16:26:08 -0000	1.27
+++ fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.28
@@ -4,8 +4,8 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.3
-Release:          9%{?dist}
+Version:          1.2.0
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -60,7 +60,6 @@
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
-Patch0:           bug463991-bdb47.patch
 
 %description
 Fedora Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -70,13 +69,13 @@
 Summary:          Development libraries for Fedora Directory Server
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
+Requires:         mozldap-devel
 
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
 cp %{SOURCE2} README.devel
 
 %build
@@ -119,7 +118,16 @@
 %post
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
-
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section - we list it as a ghost so that
+# it will be removed when the rpm is removed
+if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -161,11 +169,11 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.3-8
-- rebuild with new openssl
+* Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
+- new release 1.2.0
+- Made devel package depend on mozldap-devel
+- only create run dir if it does not exist
+- CVS tag: FedoraDirSvr_1_2_0_RC1 FedoraDirSvr_1_2_0_RC1_20090330
 
 * Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-7
 - added db4-utils to Requires for verify-db.pl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	31 Oct 2008 15:39:16 -0000	1.17
+++ sources	1 Apr 2009 19:55:11 -0000	1.18
@@ -1 +1 @@
-65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2
+9524493ace50fd8103e5c23950c91b96  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 19:55:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 19:55:40 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 .cvsignore, 1.11, 1.12 fedora-ds-base-cvs.sh,
	1.8, 1.9 fedora-ds-base.spec, 1.21, 1.22 sources, 1.17, 1.18
Message-ID: <20090401195540.B7F297011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27839/F-9

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
this is the 1.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Sep 2008 22:30:23 -0000	1.11
+++ .cvsignore	1 Apr 2009 19:55:10 -0000	1.12
@@ -1,4 +1 @@
-fedora-ds-base-1.1.0.tar.bz2
-fedora-ds-base-1.1.1.tar.bz2
-fedora-ds-base-1.1.2.tar.bz2
-fedora-ds-base-1.1.3.tar.bz2
+fedora-ds-base-1.2.0.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base-cvs.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-ds-base-cvs.sh	23 Sep 2008 22:30:23 -0000	1.8
+++ fedora-ds-base-cvs.sh	1 Apr 2009 19:55:10 -0000	1.9
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_1_3
-VERSION=1.1.3
+CVSTAG=FedoraDirSvr_1_2_0_RC1
+VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fedora-ds-base.spec	30 Oct 2008 21:53:42 -0000	1.21
+++ fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.22
@@ -4,8 +4,8 @@
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
-Version:          1.1.3
-Release:          4%{?dist}
+Version:          1.2.0
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -69,6 +69,7 @@
 Summary:          Development libraries for Fedora Directory Server
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
+Requires:         mozldap-devel
 
 %description      devel
 Development Libraries and headers for the Fedora Directory Server base package.
@@ -117,7 +118,16 @@
 %post
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
-
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section - we list it as a ghost so that
+# it will be removed when the rpm is removed
+if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -159,6 +169,12 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
+- new release 1.2.0
+- Made devel package depend on mozldap-devel
+- only create run dir if it does not exist
+- CVS tag: FedoraDirSvr_1_2_0_RC1 FedoraDirSvr_1_2_0_RC1_20090330
+
 * Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-4
 - added db4-utils to Requires for verify-db.pl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	31 Oct 2008 15:39:16 -0000	1.17
+++ sources	1 Apr 2009 19:55:10 -0000	1.18
@@ -1 +1 @@
-65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2
+9524493ace50fd8103e5c23950c91b96  fedora-ds-base-1.2.0.tar.bz2



From limb at fedoraproject.org  Wed Apr  1 19:56:04 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  1 Apr 2009 19:56:04 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle-1.9.4-CVE-2009-1171-1.patch, NONE,
	1.1 moodle-1.9.4-CVE-2009-1171-2.patch, NONE, 1.1 moodle.spec,
	1.39, 1.40
Message-ID: <20090401195604.F14227011D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28032/F-10

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.9.4-CVE-2009-1171-1.patch 
	moodle-1.9.4-CVE-2009-1171-2.patch 
Log Message:
CVE-2009-1171


moodle-1.9.4-CVE-2009-1171-1.patch:

--- NEW FILE moodle-1.9.4-CVE-2009-1171-1.patch ---
--- filter/tex/filter.php.orig	2009/02/17 05:24:35	1.18.4.4
+++ filter/tex/filter.php	2009/03/26 19:06:29	1.18.4.5
@@ -133,6 +133,16 @@
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
+    // TeX blacklist. MDL-18552
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -155,6 +165,19 @@
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
+        $invalidcommands = array();
+        foreach($tex_blacklist as $command) {
+            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
+                $invalidcommands[] = $command;
+            }
+        }
+        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
+            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
+            $text = str_replace( $matches[0][$i], $invalidstr, $text);
+            continue;
+        }
+    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';

moodle-1.9.4-CVE-2009-1171-2.patch:

--- NEW FILE moodle-1.9.4-CVE-2009-1171-2.patch ---
--- filter/tex/filter.php.orig
+++ filter/tex/filter.php
@@ -133,16 +133,6 @@ function tex_filter ($courseid, $text) {
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
-    // TeX blacklist. MDL-18552
-    $tex_blacklist = array(
-        'include','def','command','loop','repeat','open','toks','output',
-        'input','catcode','name','^^',
-        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
-        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
-        '\lowercase','\relax','\aftergroup',
-        '\afterassignment','\expandafter','\noexpand','\special'
-    );
-
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -165,19 +155,6 @@ function tex_filter ($courseid, $text) {
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
-    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
-        $invalidcommands = array();
-        foreach($tex_blacklist as $command) {
-            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
-                $invalidcommands[] = $command;
-            }
-        }
-        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
-            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
-            $text = str_replace( $matches[0][$i], $invalidstr, $text);
-            continue;
-        }
-    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';
--- filter/tex/latex.php.orig
+++ filter/tex/latex.php
@@ -44,9 +44,11 @@
          * @return string the latex document
          */
         function construct_latex_document( $formula, $fontsize=12 ) {
-            // $fontsize don't affects to formula's size. $density can change size
-
             global $CFG;
+
+            $formula = tex_sanitize_formula($formula);
+
+            // $fontsize don't affects to formula's size. $density can change size
             $doc =  "\\documentclass[{$fontsize}pt]{article}\n"; 
             $doc .=  $CFG->filter_tex_latexpreamble;
             $doc .= "\\pagestyle{empty}\n";
--- filter/tex/lib.php.orig
+++ filter/tex/lib.php
@@ -34,8 +34,22 @@ function tex_filter_get_executable($debug=false) {
     error($error_message1);
 }
 
+function tex_sanitize_formula($texexp) {
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain)
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
+    return  str_ireplace($tex_blacklist, 'forbiddenkeyword', $texexp);
+}
 
 function tex_filter_get_cmd($pathname, $texexp) {
+    $texexp = tex_sanitize_formula($texexp);
     $texexp = escapeshellarg($texexp);
     $executable = tex_filter_get_executable(false);
 
--- lib/db/upgrade.php.orig
+++ lib/db/upgrade.php
@@ -3106,6 +3106,13 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101542);
     }
 
+    if ($result && $oldversion < 2007101545.01) {
+        require_once("$CFG->dirroot/filter/tex/lib.php");
+        filter_tex_updatedcallback(null);
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2007101545.01);
+    }
+
     return $result;
 }
 
--- version.php.orig
+++ version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101540;  // YYYYMMDD      = date of the 1.9 branch (don't change)
+    $version = 2007101545.01;  // YYYYMMDD      = date of the 1.9 branch (don't change)
                             //         X     = release number 1.9.[0,1,2,3,4,5...]
                             //          Y.YY = micro-increments between releases
 


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- moodle.spec	27 Feb 2009 17:54:33 -0000	1.39
+++ moodle.spec	1 Apr 2009 19:55:34 -0000	1.40
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 %define moodlewebdir %{_var}/www/moodle/web
 %define moodledatadir %{_var}/www/moodle/data
 
@@ -7,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -104,6 +105,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
+Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
+Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -112,7 +115,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 #Requires:	php-magpierss
-Requires:	freefont 
+Requires:	gnu-free-sans-fonts
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -744,7 +747,7 @@
 Summary:        Moodle language pack for Khmer
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	khmeros-fonts-base
+Requires:	khmeros-base-fonts
 
 %description    km
 This package contains the files needed to display Moodle in Khmer.
@@ -1111,7 +1114,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-fonts
+Requires:	dejavu-sans-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1270,7 +1273,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-fonts
+Requires:	dejavu-sans-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1478,6 +1481,8 @@
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1525,7 +1530,7 @@
 
 #Symlink to FreeSans, to save space.
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
-ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/gnu-free/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 
 #symlink to khmeros-base-fonts
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
@@ -1689,7 +1694,13 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
-* Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-3
+* Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
+- Patch for CVE-2009-1171, BZ 493109.
+
+* Tue Mar 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-5
+- Update for freefont->gnu-free-fonts change.
+
+* Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-4
 - Fix for symlink dir replacement.
 
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-2



From limb at fedoraproject.org  Wed Apr  1 19:56:05 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  1 Apr 2009 19:56:05 +0000 (UTC)
Subject: rpms/moodle/F-9 moodle-1.9.4-CVE-2009-1171-1.patch, NONE,
	1.1 moodle-1.9.4-CVE-2009-1171-2.patch, NONE, 1.1 moodle.spec,
	1.30, 1.31
Message-ID: <20090401195605.5D4617011D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28032/F-9

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.9.4-CVE-2009-1171-1.patch 
	moodle-1.9.4-CVE-2009-1171-2.patch 
Log Message:
CVE-2009-1171


moodle-1.9.4-CVE-2009-1171-1.patch:

--- NEW FILE moodle-1.9.4-CVE-2009-1171-1.patch ---
--- filter/tex/filter.php.orig	2009/02/17 05:24:35	1.18.4.4
+++ filter/tex/filter.php	2009/03/26 19:06:29	1.18.4.5
@@ -133,6 +133,16 @@
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
+    // TeX blacklist. MDL-18552
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -155,6 +165,19 @@
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
+        $invalidcommands = array();
+        foreach($tex_blacklist as $command) {
+            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
+                $invalidcommands[] = $command;
+            }
+        }
+        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
+            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
+            $text = str_replace( $matches[0][$i], $invalidstr, $text);
+            continue;
+        }
+    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';

moodle-1.9.4-CVE-2009-1171-2.patch:

--- NEW FILE moodle-1.9.4-CVE-2009-1171-2.patch ---
--- filter/tex/filter.php.orig
+++ filter/tex/filter.php
@@ -133,16 +133,6 @@ function tex_filter ($courseid, $text) {
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
-    // TeX blacklist. MDL-18552
-    $tex_blacklist = array(
-        'include','def','command','loop','repeat','open','toks','output',
-        'input','catcode','name','^^',
-        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
-        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
-        '\lowercase','\relax','\aftergroup',
-        '\afterassignment','\expandafter','\noexpand','\special'
-    );
-
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -165,19 +155,6 @@ function tex_filter ($courseid, $text) {
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
-    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
-        $invalidcommands = array();
-        foreach($tex_blacklist as $command) {
-            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
-                $invalidcommands[] = $command;
-            }
-        }
-        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
-            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
-            $text = str_replace( $matches[0][$i], $invalidstr, $text);
-            continue;
-        }
-    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';
--- filter/tex/latex.php.orig
+++ filter/tex/latex.php
@@ -44,9 +44,11 @@
          * @return string the latex document
          */
         function construct_latex_document( $formula, $fontsize=12 ) {
-            // $fontsize don't affects to formula's size. $density can change size
-
             global $CFG;
+
+            $formula = tex_sanitize_formula($formula);
+
+            // $fontsize don't affects to formula's size. $density can change size
             $doc =  "\\documentclass[{$fontsize}pt]{article}\n"; 
             $doc .=  $CFG->filter_tex_latexpreamble;
             $doc .= "\\pagestyle{empty}\n";
--- filter/tex/lib.php.orig
+++ filter/tex/lib.php
@@ -34,8 +34,22 @@ function tex_filter_get_executable($debug=false) {
     error($error_message1);
 }
 
+function tex_sanitize_formula($texexp) {
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain)
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
+    return  str_ireplace($tex_blacklist, 'forbiddenkeyword', $texexp);
+}
 
 function tex_filter_get_cmd($pathname, $texexp) {
+    $texexp = tex_sanitize_formula($texexp);
     $texexp = escapeshellarg($texexp);
     $executable = tex_filter_get_executable(false);
 
--- lib/db/upgrade.php.orig
+++ lib/db/upgrade.php
@@ -3106,6 +3106,13 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101542);
     }
 
+    if ($result && $oldversion < 2007101545.01) {
+        require_once("$CFG->dirroot/filter/tex/lib.php");
+        filter_tex_updatedcallback(null);
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2007101545.01);
+    }
+
     return $result;
 }
 
--- version.php.orig
+++ version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101540;  // YYYYMMDD      = date of the 1.9 branch (don't change)
+    $version = 2007101545.01;  // YYYYMMDD      = date of the 1.9 branch (don't change)
                             //         X     = release number 1.9.[0,1,2,3,4,5...]
                             //          Y.YY = micro-increments between releases
 


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-9/moodle.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- moodle.spec	27 Feb 2009 20:39:53 -0000	1.30
+++ moodle.spec	1 Apr 2009 19:55:35 -0000	1.31
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 %define moodlewebdir %{_var}/www/moodle/web
 %define moodledatadir %{_var}/www/moodle/data
 
@@ -7,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -104,6 +105,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
+Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
+Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -112,7 +115,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 #Requires:	php-magpierss
-Requires:	freefont 
+Requires:	gnu-free-sans-fonts
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -744,7 +747,7 @@
 Summary:        Moodle language pack for Khmer
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	khmeros-fonts-base
+Requires:	khmeros-base-fonts
 
 %description    km
 This package contains the files needed to display Moodle in Khmer.
@@ -1111,7 +1114,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-fonts
+Requires:	dejavu-sans-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1270,7 +1273,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-fonts
+Requires:	dejavu-sans-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1478,6 +1481,8 @@
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1525,7 +1530,7 @@
 
 #Symlink to FreeSans, to save space.
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
-ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/gnu-free/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 
 #symlink to khmeros-base-fonts
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
@@ -1689,7 +1694,13 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
-* Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-3
+* Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
+- Patch for CVE-2009-1171, BZ 493109.
+
+* Tue Mar 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-5
+- Update for freefont->gnu-free-fonts change.
+
+* Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-4
 - Fix for symlink dir replacement.
 
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-2



From rdieter at fedoraproject.org  Wed Apr  1 19:56:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:56:52 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.173,1.174
Message-ID: <20090401195652.6952C7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28304

Modified Files:
	kdeedu.spec 
Log Message:
omit gcc44 patch



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kdeedu.spec	31 Mar 2009 11:51:19 -0000	1.173
+++ kdeedu.spec	1 Apr 2009 19:56:22 -0000	1.174
@@ -149,7 +149,7 @@
 %setup -q -n kdeedu-%{version}
 
 %patch1 -p1 -b .indi_nodrivers
-%patch2 -p1 -b .gcc44
+#patch2 -p1 -b .gcc44
 
 %build
 mkdir -p %{_target_platform}



From rdieter at fedoraproject.org  Wed Apr  1 19:58:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 19:58:06 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 .cvsignore, 1.30, 1.31 kdepimlibs.spec, 1.63, 
	1.64 sources, 1.31,
	1.32 kdepimlibs-4.1.85-debug-cmake-crash.patch, 1.1, NONE
Message-ID: <20090401195806.0F8527011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29071

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs-4.1.85-debug-cmake-crash.patch 
Log Message:
* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	5 Mar 2009 01:59:42 -0000	1.30
+++ .cvsignore	1 Apr 2009 19:57:35 -0000	1.31
@@ -1 +1 @@
-kdepimlibs-4.2.1.tar.bz2
+kdepimlibs-4.2.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdepimlibs.spec	5 Mar 2009 02:56:08 -0000	1.63
+++ kdepimlibs.spec	1 Apr 2009 19:57:35 -0000	1.64
@@ -13,11 +13,10 @@
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
-%define debug 1 
 
 Name: kdepimlibs
-Version: 4.2.1
-Release: 2%{?dist}.1
+Version: 4.2.2
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -25,7 +24,6 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
@@ -92,13 +90,12 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%{?debug:%patch0 -p1}
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} %{?debug:--debug-output} ..
+%{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
@@ -220,6 +217,12 @@
 
 
 %changelog
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-4
+- disable CMake debugging, #475876 should be fixed now
+
 * Tue Mar 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
 - avoid libkcal conflict with kdepim3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	27 Feb 2009 18:08:10 -0000	1.31
+++ sources	1 Apr 2009 19:57:35 -0000	1.32
@@ -1 +1 @@
-5f220939f33c38992f419d5dfc6874df  kdepimlibs-4.2.1.tar.bz2
+62562a3025138a08ffdf08e6466b5065  kdepimlibs-4.2.2.tar.bz2


--- kdepimlibs-4.1.85-debug-cmake-crash.patch DELETED ---



From rdieter at fedoraproject.org  Wed Apr  1 20:02:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 20:02:33 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 .cvsignore, 1.25, 1.26 kdepimlibs.spec, 1.49,
	1.50 sources, 1.25,
	1.26 kdepimlibs-4.1.85-debug-cmake-crash.patch, 1.1, NONE
Message-ID: <20090401200233.8B9E07011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30846

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs-4.1.85-debug-cmake-crash.patch 
Log Message:
* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Feb 2009 17:01:33 -0000	1.25
+++ .cvsignore	1 Apr 2009 20:02:02 -0000	1.26
@@ -1,3 +1 @@
-kdepimlibs-4.1.85.tar.bz2
-kdepimlibs-4.1.96.tar.bz2
-kdepimlibs-4.2.0.tar.bz2
+kdepimlibs-4.2.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdepimlibs.spec	27 Feb 2009 18:08:10 -0000	1.49
+++ kdepimlibs.spec	1 Apr 2009 20:02:03 -0000	1.50
@@ -13,10 +13,9 @@
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
-%define debug 1 
 
 Name: kdepimlibs
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -25,7 +24,6 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
@@ -92,13 +90,12 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%{?debug:%patch0 -p1}
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} %{?debug:--debug-output} ..
+%{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
@@ -139,9 +136,14 @@
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+# conflicts with kdepim3 (compat)
+    libkcal.so)
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
 %if 0%{?fedora} < 10
-# conflicts with kdepim3
-    libgpgme++.so | libkcal.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
+# conflicts with kdepim(3)
+    libgpgme++.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
@@ -215,7 +217,16 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-4
+- disable CMake debugging, #475876 should be fixed now
+
+* Tue Mar 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- avoid libkcal conflict with kdepim3
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Feb 2009 18:08:10 -0000	1.25
+++ sources	1 Apr 2009 20:02:03 -0000	1.26
@@ -1 +1 @@
-5f220939f33c38992f419d5dfc6874df  kdepimlibs-4.2.1.tar.bz2
+62562a3025138a08ffdf08e6466b5065  kdepimlibs-4.2.2.tar.bz2


--- kdepimlibs-4.1.85-debug-cmake-crash.patch DELETED ---



From rmeggins at fedoraproject.org  Wed Apr  1 20:02:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 20:02:51 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-9 .cvsignore, 1.5, 1.6 fedora-ds-admin-cvs.sh,
	1.4, 1.5 fedora-ds-admin.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090401200251.7BAAC7011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30898/F-9

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2008 14:52:58 -0000	1.5
+++ .cvsignore	1 Apr 2009 20:02:21 -0000	1.6
@@ -1,2 +1 @@
-fedora-ds-admin-1.1.5.tar.bz2
-fedora-ds-admin-1.1.6.tar.bz2
+fedora-ds-admin-1.1.7.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin-cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin-cvs.sh	4 Sep 2008 14:52:58 -0000	1.4
+++ fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:21 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_6
-VERSION=1.1.6
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin.spec	4 Sep 2008 14:52:58 -0000	1.4
+++ fedora-ds-admin.spec	1 Apr 2009 20:02:21 -0000	1.5
@@ -3,7 +3,7 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.6
+Version:          1.1.7
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -76,10 +76,54 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# save permission info in temp file
+# if upgrading
+if [ "$1" -gt 1 ] ; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$perm1" ] ; then
+        perm1=0
+    fi
+    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$own1" ] ; then
+        own1=0
+    fi
+    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$perm2" ] ; then
+        perm2=0
+    fi
+    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$own2" ] ; then
+        own2=0
+    fi
+    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
+fi
+
 %post
 /sbin/chkconfig --add %{pkgname}-admin
 /sbin/ldconfig
-
+# if installing for the first time, make sure the config
+# directory and file have the correct permissions
+# the setup script is used to "fix" these
+if [ "$1" -gt 1 ]; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    if [ ! -f $mytmpfile ] ; then
+        echo Error: upgrade temp file $mytmpfile not found
+        exit 1
+    fi
+    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
+        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+    done
+    rm -f $mytmpfile
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -100,8 +144,21 @@
 %{_sbindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/%{pkgname}
+%{_mandir}/man8/*
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
+- this is the 1.1.7 release
+- added man pages for setup, migration, remove commands
+- better error handling for command line utilities
+- fixed remove from console
+- added remove-ds-admin.pl
+- added pre and post sections in order to preserve the permissions and ownerships
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC1 FedoraDirSrvAdmin_1_1_7_RC1_20090331
+
+* Mon Sep 15 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-2
+- patch for bug 451702 not required anymore - in upstream now
+
 * Wed Jul  2 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-1
 - The 1.1.6 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 14:52:58 -0000	1.5
+++ sources	1 Apr 2009 20:02:21 -0000	1.6
@@ -1,2 +1 @@
-766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
-63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2
+531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 20:02:50 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 20:02:50 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-10 .cvsignore, 1.5,
	1.6 fedora-ds-admin-cvs.sh, 
	1.4, 1.5 fedora-ds-admin.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090401200250.D1EB27011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30898/F-10

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2008 14:53:00 -0000	1.5
+++ .cvsignore	1 Apr 2009 20:02:20 -0000	1.6
@@ -1,2 +1 @@
-fedora-ds-admin-1.1.5.tar.bz2
-fedora-ds-admin-1.1.6.tar.bz2
+fedora-ds-admin-1.1.7.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/fedora-ds-admin-cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin-cvs.sh	4 Sep 2008 14:53:00 -0000	1.4
+++ fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:20 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_6
-VERSION=1.1.6
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/fedora-ds-admin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-admin.spec	15 Sep 2008 17:37:37 -0000	1.5
+++ fedora-ds-admin.spec	1 Apr 2009 20:02:20 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.6
-Release:          2%{?dist}
+Version:          1.1.7
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -76,10 +76,54 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# save permission info in temp file
+# if upgrading
+if [ "$1" -gt 1 ] ; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$perm1" ] ; then
+        perm1=0
+    fi
+    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$own1" ] ; then
+        own1=0
+    fi
+    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$perm2" ] ; then
+        perm2=0
+    fi
+    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$own2" ] ; then
+        own2=0
+    fi
+    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
+fi
+
 %post
 /sbin/chkconfig --add %{pkgname}-admin
 /sbin/ldconfig
-
+# if installing for the first time, make sure the config
+# directory and file have the correct permissions
+# the setup script is used to "fix" these
+if [ "$1" -gt 1 ]; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    if [ ! -f $mytmpfile ] ; then
+        echo Error: upgrade temp file $mytmpfile not found
+        exit 1
+    fi
+    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
+        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+    done
+    rm -f $mytmpfile
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -100,8 +144,18 @@
 %{_sbindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/%{pkgname}
+%{_mandir}/man8/*
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
+- this is the 1.1.7 release
+- added man pages for setup, migration, remove commands
+- better error handling for command line utilities
+- fixed remove from console
+- added remove-ds-admin.pl
+- added pre and post sections in order to preserve the permissions and ownerships
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC1 FedoraDirSrvAdmin_1_1_7_RC1_20090331
+
 * Mon Sep 15 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.6-2
 - patch for bug 451702 not required anymore - in upstream now
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 14:53:00 -0000	1.5
+++ sources	1 Apr 2009 20:02:20 -0000	1.6
@@ -1,2 +1 @@
-766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
-63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2
+531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2



From rmeggins at fedoraproject.org  Wed Apr  1 20:02:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 20:02:51 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-8 fedora-ds-admin-cvs.sh,1.4,1.5
Message-ID: <20090401200251.11A077011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30898/F-8

Modified Files:
	fedora-ds-admin-cvs.sh 
Log Message:
this is the 1.1.7 release


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-8/fedora-ds-admin-cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin-cvs.sh	4 Sep 2008 14:52:57 -0000	1.4
+++ fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:20 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_6
-VERSION=1.1.6
+CVSTAG=FedoraDirSrvAdmin_1_1_7
+VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE



From rmeggins at fedoraproject.org  Wed Apr  1 20:02:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  1 Apr 2009 20:02:51 +0000 (UTC)
Subject: rpms/fedora-ds-admin/devel .cvsignore, 1.5,
	1.6 fedora-ds-admin-cvs.sh, 
	1.4, 1.5 fedora-ds-admin.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090401200251.C64F77011D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30898/devel

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2008 14:53:00 -0000	1.5
+++ .cvsignore	1 Apr 2009 20:02:21 -0000	1.6
@@ -1,2 +1 @@
-fedora-ds-admin-1.1.5.tar.bz2
-fedora-ds-admin-1.1.6.tar.bz2
+fedora-ds-admin-1.1.7.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin-cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin-cvs.sh	4 Sep 2008 14:53:00 -0000	1.4
+++ fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:21 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_6
-VERSION=1.1.6
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin.spec	24 Feb 2009 16:24:13 -0000	1.6
+++ fedora-ds-admin.spec	1 Apr 2009 20:02:21 -0000	1.7
@@ -3,8 +3,8 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.6
-Release:          3%{?dist}
+Version:          1.1.7
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -76,10 +76,54 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# save permission info in temp file
+# if upgrading
+if [ "$1" -gt 1 ] ; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$perm1" ] ; then
+        perm1=0
+    fi
+    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$own1" ] ; then
+        own1=0
+    fi
+    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$perm2" ] ; then
+        perm2=0
+    fi
+    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$own2" ] ; then
+        own2=0
+    fi
+    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
+fi
+
 %post
 /sbin/chkconfig --add %{pkgname}-admin
 /sbin/ldconfig
-
+# if installing for the first time, make sure the config
+# directory and file have the correct permissions
+# the setup script is used to "fix" these
+if [ "$1" -gt 1 ]; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    if [ ! -f $mytmpfile ] ; then
+        echo Error: upgrade temp file $mytmpfile not found
+        exit 1
+    fi
+    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
+        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+    done
+    rm -f $mytmpfile
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -100,8 +144,18 @@
 %{_sbindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/%{pkgname}
+%{_mandir}/man8/*
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
+- this is the 1.1.7 release
+- added man pages for setup, migration, remove commands
+- better error handling for command line utilities
+- fixed remove from console
+- added remove-ds-admin.pl
+- added pre and post sections in order to preserve the permissions and ownerships
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC1 FedoraDirSrvAdmin_1_1_7_RC1_20090331
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 14:53:00 -0000	1.5
+++ sources	1 Apr 2009 20:02:21 -0000	1.6
@@ -1,2 +1 @@
-766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
-63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2
+531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2



From mathstuf at fedoraproject.org  Wed Apr  1 20:22:58 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed,  1 Apr 2009 20:22:58 +0000 (UTC)
Subject: rpms/sigen/F-10 sigen.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090401202258.DD7D27011D@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/sigen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3011

Modified Files:
	sigen.spec sources 
Log Message:
Update to 0.1.1


Index: sigen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-10/sigen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sigen.spec	6 Dec 2008 21:37:11 -0000	1.3
+++ sigen.spec	1 Apr 2009 20:22:28 -0000	1.4
@@ -1,24 +1,19 @@
 Name:           sigen
-Version:        0.0.2
-Release:        0.25.20081206git529cd0e%{?dist}
-Summary:        An RPG/Strategy engine inspired by the Pok??mon??? games
+Version:        0.1.1
+Release:        1%{?dist}
+Summary:        An RPG/strategy engine
 
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://www.sourceforge.net/projects/sigen
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-# git clone git://fedorapeople.org/~mathstuf/sigen.git
-# cd sigen
-# git archive --format=tar --prefix=sigen-0.0.2/ 529cd0e | bzip2 --best > ../sigen-0.0.2.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://benboeckel.net/sigen/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
 BuildRequires:  kdelibs4-devel >= 4.1.0
 # May use this in the future
 # BuildRequires:  kdegames4-devel
-BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  qt-devel >= 4.5.0
 BuildRequires:  qca2-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -26,30 +21,30 @@
 # May use this to link to documentation in the future
 # BuildRequires:  kdelibs4-apidocs
 # BuildRequires:  qt-doc
+# The following are necessary due to designer plugins
+# being included in -devel packages until these releases
+Requires:       qt4-x11 >= 4.5.0-3
+Requires:       kdelibs4 >= 4.2.1-4
 
 %description
-The Sigma Game Engine is an RPG/Strategy game engine.
+The Sigma Game Engine is an RPG/strategy game engine.
 The following libraries and tools are provided:
 Sigcore - library with common utility classes
 Sigmod - library for loading, editing, and saving Sigmod files
 Sigmodr - modding application for Sigmod files
-Sigscript - library for scripts to use the data in a Sigmod
-Sigbattle - library for the battle system
-Signet - library for network communications
-Sigworld - library for handling overworld interactions
 
 %package devel
 Summary:        Files needed to develop programs which use the Sigma Game Engine
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdelibs4-devel
+Requires:       kdelibs4-devel >= 4.1.0
 # May use this in the future
 # Requires:       kdegames4-devel
-Requires:       qt-devel
+Requires:       qt-devel >= 4.5.0
 Requires:       qca2-devel
 
 %description devel
-Development files used for creating apps based on the Sigma Game
+Development files used for creating apps using the Sigma Game
 Engine libraries and tools.
 
 
@@ -58,14 +53,23 @@
 
 
 %build
-%{cmake_kde4}
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4}             \
+    -DBUILD_sigbattle=OFF \
+    -DBUILD_sigencore=OFF \
+    -DBUILD_signet=OFF    \
+    -DBUILD_sigscript=OFF \
+    -DBUILD_sigworld=OFF  \
+    ..
+popd
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform} install/fast
 
 
 %clean
@@ -86,41 +90,57 @@
 
 %files
 %defattr(-,root,root,-)
+%{_kde4_docdir}/HTML/en/sigmodr/
 %{_docdir}/%{name}-%{version}
 %{_bindir}/sigmodr
 %{_libdir}/libsigcore.so.0
-%{_libdir}/libsigcore.so.0.0.2
+%{_libdir}/libsigcore.so.0.1.1
 %{_libdir}/libsigmod.so.0
-%{_libdir}/libsigmod.so.0.0.2
-%{_libdir}/libsigscript.so.0
-%{_libdir}/libsigscript.so.0.0.2
-%{_libdir}/libsigbattle.so.0
-%{_libdir}/libsigbattle.so.0.0.2
-%{_libdir}/libsignet.so.0
-%{_libdir}/libsignet.so.0.0.2
-%{_libdir}/libsigworld.so.0
-%{_libdir}/libsigworld.so.0.0.2
-%{_datadir}/mime/packages
-%{_datadir}/mimelnk/application
-%{_datadir}/applications
-%{_kde4_appsdir}/sigmodr
+%{_libdir}/libsigmod.so.0.1.1
+%{_libdir}/libsigmodrcorewidgets.so.0
+%{_libdir}/libsigmodrcorewidgets.so.0.1.1
+%{_libdir}/libsigmodrwidgets.so.0
+%{_libdir}/libsigmodrwidgets.so.0.1.1
+%{_libdir}/libsigmodrtree.so.0
+%{_libdir}/libsigmodrtree.so.0.1.1
+%{_datadir}/mime/packages/
+%{_datadir}/applications/
+%{_kde4_appsdir}/sigmodr/
+%{_kde4_configdir}.kcfg/sigmodr.kcfg
 %{_kde4_configdir}/sigmod.knsrc
+%{_kde4_libdir}/kde4/plugins/designer/sigmodrcorewidgetsplugin.so
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libsigcore.so
 %{_libdir}/libsigmod.so
-%{_libdir}/libsigscript.so
-%{_libdir}/libsigbattle.so
-%{_libdir}/libsignet.so
-%{_libdir}/libsigworld.so
-%{_includedir}/%{name}
+%{_libdir}/libsigmodrcorewidgets.so
+%{_libdir}/libsigmodrwidgets.so
+%{_libdir}/libsigmodrtree.so
+%{_includedir}/%{name}/
 %{_kde4_appsdir}/cmake/modules/SigenExportedLibraryTargets.cmake
 %{_kde4_appsdir}/cmake/modules/SigenExportedLibraryTargets-release.cmake
 
 
 %changelog
+* Thu Mar 5 2009 Ben Boeckel <MathStuf at gmail.com> 0.1.1-1
+- Update to release 0.1.1
+- Fix Requires
+
+* Sat Feb 28 2009 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.29.20090228git
+- Update to newer snapshot
+
+* Thu Feb 26 2009 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.28.20090226git
+- Update package for recent changes
+- Remove libraries which are not used at this time
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-0.27.20081206git529cd0e
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 4 2009 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.26.20081206git529cd0e
+- Patch for GCC 4.4
+
 * Sat Dec 06 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.25.20081206git529cd0e
 - CMake export files added
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 21:37:11 -0000	1.4
+++ sources	1 Apr 2009 20:22:28 -0000	1.5
@@ -1 +1 @@
-3d1153436dbf740ca22d0ef6bb12f21e  sigen-0.0.2.tar.bz2
+590232eb83f60618b5b17092a8d00582  sigen-0.1.1.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 20:24:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 20:24:41 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.50,1.51
Message-ID: <20090401202441.2BA7C7013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/F-9

Modified Files:
	kdepimlibs.spec 
Log Message:
use %_cmake_version macro



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdepimlibs.spec	1 Apr 2009 20:02:03 -0000	1.50
+++ kdepimlibs.spec	1 Apr 2009 20:24:10 -0000	1.51
@@ -199,9 +199,7 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/lib*.so
-# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
-# and F10's cmake (2.6.2) -- Lorenzo
-%if 0%{?fedora} > 10
+%if "%{?_cmake_version}" > "2.6.2"
 %{_kde4_libdir}/cmake/KdepimLibs*
 %else
 %{_kde4_libdir}/KdepimLibs*



From rdieter at fedoraproject.org  Wed Apr  1 20:24:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 20:24:40 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 kdepimlibs.spec,1.64,1.65
Message-ID: <20090401202440.EB49A7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/F-10

Modified Files:
	kdepimlibs.spec 
Log Message:
use %_cmake_version macro



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdepimlibs.spec	1 Apr 2009 19:57:35 -0000	1.64
+++ kdepimlibs.spec	1 Apr 2009 20:24:10 -0000	1.65
@@ -199,9 +199,7 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/lib*.so
-# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
-# and F10's cmake (2.6.2) -- Lorenzo
-%if 0%{?fedora} > 10
+%if "%{?_cmake_version}" > "2.6.2"
 %{_kde4_libdir}/cmake/KdepimLibs*
 %else
 %{_kde4_libdir}/KdepimLibs*



From rdieter at fedoraproject.org  Wed Apr  1 20:24:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 20:24:41 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.80,1.81
Message-ID: <20090401202441.6C6657011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
use %_cmake_version macro



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdepimlibs.spec	31 Mar 2009 15:52:38 -0000	1.80
+++ kdepimlibs.spec	1 Apr 2009 20:24:11 -0000	1.81
@@ -199,9 +199,7 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/lib*.so
-# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
-# and F10's cmake (2.6.2) -- Lorenzo
-%if 0%{?fedora} > 10
+%if "%{?_cmake_version}" > "2.6.2"
 %{_kde4_libdir}/cmake/KdepimLibs*
 %else
 %{_kde4_libdir}/KdepimLibs*



From akurtakov at fedoraproject.org  Wed Apr  1 20:29:43 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  1 Apr 2009 20:29:43 +0000 (UTC)
Subject: rpms/tomcat6/devel servlet-api-OSGi-MANIFEST.MF, NONE,
	1.1 tomcat6.spec, 1.7, 1.8
Message-ID: <20090401202943.9330A7011D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/tomcat6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4771/devel

Modified Files:
	tomcat6.spec 
Added Files:
	servlet-api-OSGi-MANIFEST.MF 
Log Message:
Add OSGi manifest for servlet-api.


--- NEW FILE servlet-api-OSGi-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
Bundle-SymbolicName: javax.servlet
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Localization: plugin
Bundle-Version: 2.5.0.v200806031605
Bundle-Vendor: %bundleProvider
Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
 ="2.5",javax.servlet.resources;version="2.5"


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tomcat6.spec	25 Feb 2009 21:17:27 -0000	1.7
+++ tomcat6.spec	1 Apr 2009 20:29:13 -0000	1.8
@@ -54,7 +54,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 9.1%{?dist}
+Release: 9.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -68,6 +68,7 @@
 Source5: %{name}-%{major_version}.%{minor_version}.logrotate
 Source6: %{name}-%{major_version}.%{minor_version}-digest.script
 Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
+Source8: servlet-api-OSGi-MANIFEST.MF
 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -225,6 +226,12 @@
 popd
 popd
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 # build initial path structure
@@ -440,6 +447,9 @@
 %{appdir}/sample
 
 %changelog
+* Wed Apr 1 2009 akurtakov <akurtakov at dhcp-lab-180.englab.brq.redhat.com> 0:6.0.18-9.2
+- Add OSGi manifest for servlet-api.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:6.0.18-9.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mathstuf at fedoraproject.org  Wed Apr  1 20:37:31 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed,  1 Apr 2009 20:37:31 +0000 (UTC)
Subject: rpms/sigen/F-9 sigen.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090401203731.5BEA27011D@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/sigen/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6995

Modified Files:
	sigen.spec sources 
Log Message:
Update to 0.1.1


Index: sigen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-9/sigen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sigen.spec	6 Dec 2008 21:59:37 -0000	1.3
+++ sigen.spec	1 Apr 2009 20:37:00 -0000	1.4
@@ -1,24 +1,19 @@
 Name:           sigen
-Version:        0.0.2
-Release:        0.25.20081206git529cd0e%{?dist}
-Summary:        An RPG/Strategy engine inspired by the Pok??mon??? games
+Version:        0.1.1
+Release:        1%{?dist}
+Summary:        An RPG/strategy engine
 
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://www.sourceforge.net/projects/sigen
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-# git clone git://fedorapeople.org/~mathstuf/sigen.git
-# cd sigen
-# git archive --format=tar --prefix=sigen-0.0.2/ 529cd0e | bzip2 --best > ../sigen-0.0.2.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://benboeckel.net/sigen/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
 BuildRequires:  kdelibs4-devel >= 4.1.0
 # May use this in the future
 # BuildRequires:  kdegames4-devel
-BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  qt-devel >= 4.5.0
 BuildRequires:  qca2-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -26,30 +21,30 @@
 # May use this to link to documentation in the future
 # BuildRequires:  kdelibs4-apidocs
 # BuildRequires:  qt-doc
+# The following are necessary due to designer plugins
+# being included in -devel packages until these releases
+Requires:       qt4-x11 >= 4.5.0-3
+Requires:       kdelibs4 >= 4.2.1-4
 
 %description
-The Sigma Game Engine is an RPG/Strategy game engine.
+The Sigma Game Engine is an RPG/strategy game engine.
 The following libraries and tools are provided:
 Sigcore - library with common utility classes
 Sigmod - library for loading, editing, and saving Sigmod files
 Sigmodr - modding application for Sigmod files
-Sigscript - library for scripts to use the data in a Sigmod
-Sigbattle - library for the battle system
-Signet - library for network communications
-Sigworld - library for handling overworld interactions
 
 %package devel
 Summary:        Files needed to develop programs which use the Sigma Game Engine
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdelibs4-devel
+Requires:       kdelibs4-devel >= 4.1.0
 # May use this in the future
 # Requires:       kdegames4-devel
-Requires:       qt-devel
+Requires:       qt-devel >= 4.5.0
 Requires:       qca2-devel
 
 %description devel
-Development files used for creating apps based on the Sigma Game
+Development files used for creating apps using the Sigma Game
 Engine libraries and tools.
 
 
@@ -58,14 +53,23 @@
 
 
 %build
-%{cmake_kde4}
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4}             \
+    -DBUILD_sigbattle=OFF \
+    -DBUILD_sigencore=OFF \
+    -DBUILD_signet=OFF    \
+    -DBUILD_sigscript=OFF \
+    -DBUILD_sigworld=OFF  \
+    ..
+popd
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform} install/fast
 
 
 %clean
@@ -86,41 +90,57 @@
 
 %files
 %defattr(-,root,root,-)
+%{_kde4_docdir}/HTML/en/sigmodr/
 %{_docdir}/%{name}-%{version}
 %{_bindir}/sigmodr
 %{_libdir}/libsigcore.so.0
-%{_libdir}/libsigcore.so.0.0.2
+%{_libdir}/libsigcore.so.0.1.1
 %{_libdir}/libsigmod.so.0
-%{_libdir}/libsigmod.so.0.0.2
-%{_libdir}/libsigscript.so.0
-%{_libdir}/libsigscript.so.0.0.2
-%{_libdir}/libsigbattle.so.0
-%{_libdir}/libsigbattle.so.0.0.2
-%{_libdir}/libsignet.so.0
-%{_libdir}/libsignet.so.0.0.2
-%{_libdir}/libsigworld.so.0
-%{_libdir}/libsigworld.so.0.0.2
-%{_datadir}/mime/packages
-%{_datadir}/mimelnk/application
-%{_datadir}/applications
-%{_kde4_appsdir}/sigmodr
+%{_libdir}/libsigmod.so.0.1.1
+%{_libdir}/libsigmodrcorewidgets.so.0
+%{_libdir}/libsigmodrcorewidgets.so.0.1.1
+%{_libdir}/libsigmodrwidgets.so.0
+%{_libdir}/libsigmodrwidgets.so.0.1.1
+%{_libdir}/libsigmodrtree.so.0
+%{_libdir}/libsigmodrtree.so.0.1.1
+%{_datadir}/mime/packages/
+%{_datadir}/applications/
+%{_kde4_appsdir}/sigmodr/
+%{_kde4_configdir}.kcfg/sigmodr.kcfg
 %{_kde4_configdir}/sigmod.knsrc
+%{_kde4_libdir}/kde4/plugins/designer/sigmodrcorewidgetsplugin.so
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libsigcore.so
 %{_libdir}/libsigmod.so
-%{_libdir}/libsigscript.so
-%{_libdir}/libsigbattle.so
-%{_libdir}/libsignet.so
-%{_libdir}/libsigworld.so
-%{_includedir}/%{name}
+%{_libdir}/libsigmodrcorewidgets.so
+%{_libdir}/libsigmodrwidgets.so
+%{_libdir}/libsigmodrtree.so
+%{_includedir}/%{name}/
 %{_kde4_appsdir}/cmake/modules/SigenExportedLibraryTargets.cmake
 %{_kde4_appsdir}/cmake/modules/SigenExportedLibraryTargets-release.cmake
 
 
 %changelog
+* Thu Mar 5 2009 Ben Boeckel <MathStuf at gmail.com> 0.1.1-1
+- Update to release 0.1.1
+- Fix Requires
+
+* Sat Feb 28 2009 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.29.20090228git
+- Update to newer snapshot
+
+* Thu Feb 26 2009 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.28.20090226git
+- Update package for recent changes
+- Remove libraries which are not used at this time
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-0.27.20081206git529cd0e
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 4 2009 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.26.20081206git529cd0e
+- Patch for GCC 4.4
+
 * Sat Dec 06 2008 Ben Boeckel <MathStuf at gmail.com> 0.0.2-0.25.20081206git529cd0e
 - CMake export files added
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigen/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 21:59:37 -0000	1.4
+++ sources	1 Apr 2009 20:37:01 -0000	1.5
@@ -1 +1 @@
-3d1153436dbf740ca22d0ef6bb12f21e  sigen-0.0.2.tar.bz2
+590232eb83f60618b5b17092a8d00582  sigen-0.1.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Apr  1 20:50:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 20:50:23 +0000
Subject: [pkgdb] oflb-goudy-bookletter-1911-fonts was added for spot
Message-ID: <20090401205004.32EE52084D5@bastion.fedora.phx.redhat.com>

spot has added Package oflb-goudy-bookletter-1911-fonts with summary Clean serif font based on Kennerly Old Style
spot has approved Package oflb-goudy-bookletter-1911-fonts
spot has added a Fedora devel branch for oflb-goudy-bookletter-1911-fonts with an owner of spot
spot has approved oflb-goudy-bookletter-1911-fonts in Fedora devel
spot has approved Package oflb-goudy-bookletter-1911-fonts
spot has set commit to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora devel)
spot has set build to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora devel)
spot has set checkout to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-goudy-bookletter-1911-fonts



From pkgdb at fedoraproject.org  Wed Apr  1 20:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 20:50:26 +0000
Subject: [pkgdb] oflb-goudy-bookletter-1911-fonts (Fedora,
	10) updated by spot
Message-ID: <20090401205006.D91F0208514@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for oflb-goudy-bookletter-1911-fonts
spot has set commit to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora 10)
spot has set build to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora 10)
spot has set checkout to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora 10)
spot approved watchbugzilla on oflb-goudy-bookletter-1911-fonts (Fedora 10) for fonts-sig
spot approved watchcommits on oflb-goudy-bookletter-1911-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-goudy-bookletter-1911-fonts



From pkgdb at fedoraproject.org  Wed Apr  1 20:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 20:50:26 +0000
Subject: [pkgdb] oflb-goudy-bookletter-1911-fonts (Fedora, 9) updated by spot
Message-ID: <20090401205006.E4238208550@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for oflb-goudy-bookletter-1911-fonts
spot has set commit to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora 9)
spot has set build to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora 9)
spot has set checkout to Approved for provenpackager on oflb-goudy-bookletter-1911-fonts (Fedora 9)
spot approved watchbugzilla on oflb-goudy-bookletter-1911-fonts (Fedora 9) for fonts-sig
spot approved watchcommits on oflb-goudy-bookletter-1911-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-goudy-bookletter-1911-fonts



From spot at fedoraproject.org  Wed Apr  1 20:50:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:50:14 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts - New directory
Message-ID: <20090401205014.362FE7011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsBw9615/rpms/oflb-goudy-bookletter-1911-fonts

Log Message:
Directory /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts added to the repository




From spot at fedoraproject.org  Wed Apr  1 20:50:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:50:14 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts/devel - New directory
Message-ID: <20090401205014.90F567011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsBw9615/rpms/oflb-goudy-bookletter-1911-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/devel added to the repository




From spot at fedoraproject.org  Wed Apr  1 20:50:23 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:50:23 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts Makefile,NONE,1.1
Message-ID: <20090401205023.D876F7011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsBw9615/rpms/oflb-goudy-bookletter-1911-fonts

Added Files:
	Makefile 
Log Message:
Setup of module oflb-goudy-bookletter-1911-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module oflb-goudy-bookletter-1911-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Apr  1 20:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 20:50:26 +0000
Subject: [pkgdb] oflb-goudy-bookletter-1911-fonts (Fedora,
	devel) updated by spot
Message-ID: <20090401205007.08184208555@bastion.fedora.phx.redhat.com>

spot approved watchbugzilla on oflb-goudy-bookletter-1911-fonts (Fedora devel) for fonts-sig
spot approved watchcommits on oflb-goudy-bookletter-1911-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-goudy-bookletter-1911-fonts



From spot at fedoraproject.org  Wed Apr  1 20:50:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:50:24 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090401205024.2B5E27011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsBw9615/rpms/oflb-goudy-bookletter-1911-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oflb-goudy-bookletter-1911-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: oflb-goudy-bookletter-1911-fonts
# $Id: Makefile,v 1.1 2009/04/01 20:50:24 spot Exp $
NAME := oflb-goudy-bookletter-1911-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Wed Apr  1 20:52:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:52:09 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts/devel import.log, NONE,
	1.1 oflb-goudy-bookletter-1911-fonts-fontconfig.conf, NONE,
	1.1 oflb-goudy-bookletter-1911-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401205209.4BC797011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10205/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-goudy-bookletter-1911-fonts-fontconfig.conf 
	oflb-goudy-bookletter-1911-fonts.spec 
Log Message:

initial commit



--- NEW FILE import.log ---
oflb-goudy-bookletter-1911-fonts-20080206-2_fc11:HEAD:oflb-goudy-bookletter-1911-fonts-20080206-2.fc11.src.rpm:1238618964


--- NEW FILE oflb-goudy-bookletter-1911-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Goudy Bookletter 1911</family>
    </prefer>
  </alias>
  <alias>
    <family>Goudy Bookletter 1911</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-goudy-bookletter-1911-fonts.spec ---
%global fontname oflb-goudy-bookletter-1911
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Summary:	Clean serif font based on Kennerly Old Style
Version:	20080206
Release:	2%{?dist}
License:	Public Domain
Group:		User Interface/X
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Goudy_Bookletter_1.zip
Source1:	%{name}-fontconfig.conf
URL:		http://openfontlibrary.org/media/files/chemoelectric/221
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fontpackages-devel, fontforge
Requires:	fontpackages-filesystem
BuildArch:	noarch

%description
Based on the roman of Frederic Goudy's Kennerley Old Style (designed and cut in
1911 for a limited edition of "The Door in the Wall and Other Stories" by H G
Wells, published by Mitchell Kennerley). The letters, though not condensed, may
seem to fit together like pieces of a jigsaw puzzle, giving text an unusually
solid appearance.

%prep
%setup -q -c -n %{name}
sed -i 's|/home/trashman/bin/fontforge|/usr/bin/fontforge|g' make-otf.py

%build
./generate-it.sh

%install
rm -rf %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.otf

%changelog
* Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20080206-2
- rename package to oflb-goudy-bookletter-1911-fonts
- drop common_desc (unnecessary)
- fix fontconfig file
- use %%global rather than %%define
- continue to annoy people diffing spec files

* Sun Mar 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20080206-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 20:50:24 -0000	1.1
+++ .cvsignore	1 Apr 2009 20:51:39 -0000	1.2
@@ -0,0 +1 @@
+chemoelectric_-_Goudy_Bookletter_1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 20:50:24 -0000	1.1
+++ sources	1 Apr 2009 20:51:39 -0000	1.2
@@ -0,0 +1 @@
+09291cdc848dec075a70ed868d4d716d  chemoelectric_-_Goudy_Bookletter_1.zip



From spot at fedoraproject.org  Wed Apr  1 20:55:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:55:26 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts/F-10
	oflb-goudy-bookletter-1911-fonts-fontconfig.conf, NONE,
	1.1 oflb-goudy-bookletter-1911-fonts.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090401205526.098267011D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10848/F-10

Modified Files:
	sources 
Added Files:
	oflb-goudy-bookletter-1911-fonts-fontconfig.conf 
	oflb-goudy-bookletter-1911-fonts.spec 
Log Message:
initial branching


--- NEW FILE oflb-goudy-bookletter-1911-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Goudy Bookletter 1911</family>
    </prefer>
  </alias>
  <alias>
    <family>Goudy Bookletter 1911</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-goudy-bookletter-1911-fonts.spec ---
%global fontname oflb-goudy-bookletter-1911
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Summary:	Clean serif font based on Kennerly Old Style
Version:	20080206
Release:	2%{?dist}
License:	Public Domain
Group:		User Interface/X
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Goudy_Bookletter_1.zip
Source1:	%{name}-fontconfig.conf
URL:		http://openfontlibrary.org/media/files/chemoelectric/221
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fontpackages-devel, fontforge
Requires:	fontpackages-filesystem
BuildArch:	noarch

%description
Based on the roman of Frederic Goudy's Kennerley Old Style (designed and cut in
1911 for a limited edition of "The Door in the Wall and Other Stories" by H G
Wells, published by Mitchell Kennerley). The letters, though not condensed, may
seem to fit together like pieces of a jigsaw puzzle, giving text an unusually
solid appearance.

%prep
%setup -q -c -n %{name}
sed -i 's|/home/trashman/bin/fontforge|/usr/bin/fontforge|g' make-otf.py

%build
./generate-it.sh

%install
rm -rf %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.otf

%changelog
* Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20080206-2
- rename package to oflb-goudy-bookletter-1911-fonts
- drop common_desc (unnecessary)
- fix fontconfig file
- use %%global rather than %%define
- continue to annoy people diffing spec files

* Sun Mar 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20080206-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 20:50:24 -0000	1.1
+++ sources	1 Apr 2009 20:54:55 -0000	1.2
@@ -0,0 +1 @@
+09291cdc848dec075a70ed868d4d716d  chemoelectric_-_Goudy_Bookletter_1.zip



From spot at fedoraproject.org  Wed Apr  1 20:55:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  1 Apr 2009 20:55:26 +0000 (UTC)
Subject: rpms/oflb-goudy-bookletter-1911-fonts/F-9
	oflb-goudy-bookletter-1911-fonts-fontconfig.conf, NONE,
	1.1 oflb-goudy-bookletter-1911-fonts.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090401205526.2DA4E7013F@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10848/F-9

Modified Files:
	sources 
Added Files:
	oflb-goudy-bookletter-1911-fonts-fontconfig.conf 
	oflb-goudy-bookletter-1911-fonts.spec 
Log Message:
initial branching


--- NEW FILE oflb-goudy-bookletter-1911-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Goudy Bookletter 1911</family>
    </prefer>
  </alias>
  <alias>
    <family>Goudy Bookletter 1911</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-goudy-bookletter-1911-fonts.spec ---
%global fontname oflb-goudy-bookletter-1911
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Summary:	Clean serif font based on Kennerly Old Style
Version:	20080206
Release:	2%{?dist}
License:	Public Domain
Group:		User Interface/X
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Goudy_Bookletter_1.zip
Source1:	%{name}-fontconfig.conf
URL:		http://openfontlibrary.org/media/files/chemoelectric/221
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fontpackages-devel, fontforge
Requires:	fontpackages-filesystem
BuildArch:	noarch

%description
Based on the roman of Frederic Goudy's Kennerley Old Style (designed and cut in
1911 for a limited edition of "The Door in the Wall and Other Stories" by H G
Wells, published by Mitchell Kennerley). The letters, though not condensed, may
seem to fit together like pieces of a jigsaw puzzle, giving text an unusually
solid appearance.

%prep
%setup -q -c -n %{name}
sed -i 's|/home/trashman/bin/fontforge|/usr/bin/fontforge|g' make-otf.py

%build
./generate-it.sh

%install
rm -rf %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.otf

%changelog
* Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20080206-2
- rename package to oflb-goudy-bookletter-1911-fonts
- drop common_desc (unnecessary)
- fix fontconfig file
- use %%global rather than %%define
- continue to annoy people diffing spec files

* Sun Mar 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20080206-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-goudy-bookletter-1911-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 20:50:24 -0000	1.1
+++ sources	1 Apr 2009 20:54:55 -0000	1.2
@@ -0,0 +1 @@
+09291cdc848dec075a70ed868d4d716d  chemoelectric_-_Goudy_Bookletter_1.zip



From clumens at fedoraproject.org  Wed Apr  1 21:01:45 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  1 Apr 2009 21:01:45 +0000 (UTC)
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.59, 1.60 sources, 
	1.73, 1.74 system-config-kickstart.spec, 1.78, 1.79
Message-ID: <20090401210145.C69347011D@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12351

Modified Files:
	.cvsignore sources system-config-kickstart.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	23 Dec 2008 15:27:27 -0000	1.59
+++ .cvsignore	1 Apr 2009 21:01:15 -0000	1.60
@@ -3,3 +3,4 @@
 system-config-kickstart-2.7.18.tar.gz
 system-config-kickstart-2.7.19.tar.gz
 system-config-kickstart-2.7.21.tar.gz
+system-config-kickstart-2.7.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	23 Dec 2008 15:27:27 -0000	1.73
+++ sources	1 Apr 2009 21:01:15 -0000	1.74
@@ -1 +1 @@
-6bdaefd975d594f17983567d020ef4ac  system-config-kickstart-2.7.21.tar.gz
+38310d9b3783c04d00017ef9c20e9feb  system-config-kickstart-2.7.22.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- system-config-kickstart.spec	26 Feb 2009 05:08:20 -0000	1.78
+++ system-config-kickstart.spec	1 Apr 2009 21:01:15 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
-Version: 2.7.21
-Release: 2%{?dist}
+Version: 2.7.22
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
@@ -68,6 +68,11 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Wed Apr 01 2009 Chris Lumens <clumens at redhat.com> - 2.7.22-1
+- Use dataList().append when adding partitions and network devices (#492100).
+- Update translation files (#490018). (clumens)
+- Lots of translation file udpates.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From chkr at fedoraproject.org  Wed Apr  1 21:11:31 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Wed,  1 Apr 2009 21:11:31 +0000 (UTC)
Subject: rpms/anki/devel anki-0.9.9.7.1-noupdate.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 anki.spec, 1.3, 1.4 sources, 1.2,
	1.3 anki-0.9.9.6-noupdate.patch, 1.1,
	NONE anki-0.9.9.6-unihaninstall.patch, 1.1, NONE
Message-ID: <20090401211131.EAC997011D@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/anki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14938

Modified Files:
	.cvsignore anki.spec sources 
Added Files:
	anki-0.9.9.7.1-noupdate.patch 
Removed Files:
	anki-0.9.9.6-noupdate.patch anki-0.9.9.6-unihaninstall.patch 
Log Message:
- Update to new upstream version 0.9.9.7.1
- Drop unihaninstall patch (applied upstream)
- Updated noupdate patch
- Use original upstream tgz since upstream doesn't ship the example files
anymore



anki-0.9.9.7.1-noupdate.patch:

--- NEW FILE anki-0.9.9.7.1-noupdate.patch ---
diff -uNr anki-0.9.9.7.1.old/ankiqt/config.py anki-0.9.9.7.1/ankiqt/config.py
--- anki-0.9.9.7.1.old/ankiqt/config.py	2009-03-23 05:40:26.000000000 +0100
+++ anki-0.9.9.7.1/ankiqt/config.py	2009-03-29 23:24:00.000000000 +0200
@@ -44,7 +44,7 @@
             'iconSize': 32,
             'syncOnLoad': True,
             'syncOnClose': True,
-            'checkForUpdates': True,
+            'checkForUpdates': False,
             'interfaceLang': "",
             'syncUsername': "",
             'syncPassword': "",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anki/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 20:14:46 -0000	1.2
+++ .cvsignore	1 Apr 2009 21:11:01 -0000	1.3
@@ -1 +1 @@
-anki-0.9.9.6-nosamples.tgz
+anki-0.9.9.7.1.tgz


Index: anki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anki/devel/anki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- anki.spec	1 Mar 2009 20:36:01 -0000	1.3
+++ anki.spec	1 Apr 2009 21:11:01 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		anki
-Version:	0.9.9.6
-Release:	4%{?dist}
+Version:	0.9.9.7.1
+Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
 Group:		Amusements/Games
@@ -10,19 +10,10 @@
 # was created out of  Unihan.txt from www.unicode.org (MIT license)
 License:	GPLv3+ and MIT
 URL:		http://www.ichi2.net/anki
-Source0:	%{name}-%{version}-nosamples.tgz
-# anki contains a sample with an unclear license
-# this script to remove all samples since they are not installed anyway
-# Download the upstream tarball and invoke this script while in the
-# tarball's directory:
-# ./generate-anki-tarball.sh 0.9.9.6
-# upstream tarball: http://ichi2.net/anki/download/%{name}-%{version}.tgz
-Source1:	generate-anki-tarball.sh
+Source0:	http://ichi2.net/anki/download/files/%{name}-%{version}.tgz
+
 # Config change: don't check for new updates.
-Patch0:		anki-0.9.9.6-noupdate.patch
-# install issue tracked upstream:
-# http://code.google.com/p/anki/issues/detail?id=561
-Patch1:		anki-0.9.9.6-unihaninstall.patch
+Patch0:		anki-0.9.9.7.1-noupdate.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, python-setuptools, python-sqlalchemy
 BuildRequires:	PyQt4-devel
@@ -41,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .noupdate
-%patch1 -p1 -b .unihaninstall
 
 %build
 pushd libanki
@@ -99,7 +89,10 @@
 %lang(ja) %{python_sitelib}/*/locale/ja_*/
 %lang(ko) %{python_sitelib}/*/locale/ko_*/
 %lang(pl) %{python_sitelib}/*/locale/pl_*/
-%lang(zh) %{python_sitelib}/anki/locale/zh_*/
+%lang(zh) %{python_sitelib}/*/locale/zh_*/
+%lang(sv) %{python_sitelib}/*/locale/sv_*/
+%lang(pt) %{python_sitelib}/*/locale/pt_*/
+%lang(ee) %{python_sitelib}/*/locale/ee_*/
 
 %{python_sitelib}/*egg-info
 %{_bindir}/anki
@@ -107,6 +100,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.1-1
+- Update to new upstream version 0.9.9.7.1
+- Drop unihaninstall patch (applied upstream)
+- Updated noupdate patch
+- Use original upstream tgz since upstream doesn't ship the example files
+anymore
+
 * Sun Mar 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.6-4
 - Bump release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anki/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2009 20:14:46 -0000	1.2
+++ sources	1 Apr 2009 21:11:01 -0000	1.3
@@ -1 +1 @@
-0f029c744c849a5e2ca7f95df119c59f  anki-0.9.9.6-nosamples.tgz
+7b39a2c58b31641a46d9be308aa1e56b  anki-0.9.9.7.1.tgz


--- anki-0.9.9.6-noupdate.patch DELETED ---


--- anki-0.9.9.6-unihaninstall.patch DELETED ---



From clumens at fedoraproject.org  Wed Apr  1 21:34:50 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  1 Apr 2009 21:34:50 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.629, 1.630 anaconda.spec, 1.777, 
	1.778 sources, 1.763, 1.764
Message-ID: <20090401213450.552857011D@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20202

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- .cvsignore	25 Mar 2009 19:54:45 -0000	1.629
+++ .cvsignore	1 Apr 2009 21:34:19 -0000	1.630
@@ -1,3 +1,4 @@
 clog
 anaconda-11.5.0.37.tar.bz2
 anaconda-11.5.0.38.tar.bz2
+anaconda-11.5.0.39.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- anaconda.spec	25 Mar 2009 19:54:45 -0000	1.777
+++ anaconda.spec	1 Apr 2009 21:34:19 -0000	1.778
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.38
+Version: 11.5.0.39
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -142,6 +142,7 @@
 Requires: dhclient
 Requires: dhcpv6-client
 Requires: anaconda-yum-plugins
+Requires: libselinux-python >= %{libselinuxver}
 Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
@@ -212,6 +213,75 @@
 %endif
 
 %changelog
+* Wed Apr 01 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.39-1
+- Prevent sensitive information in kickstart files from ending up in
+  tracebacks. (clumens)
+- It's 2009, let's ignore floppy drives now (#493338, #493377). (clumens)
+- Remove DmRaidArrayDevice level attribute (#493293) (hdegoede)
+- get_containing_device takes two arguments (#493266). (clumens)
+- Fix the check for if there's enough space available on / and /usr
+  (#492614). (clumens)
+- Fix testing if a PPC partition is bootable (#492726). (clumens)
+- Look for a PReP "partition" by examining the format, not the flags
+  (#492426). (clumens)
+- Fix a few more pylint warnings and errors in storage/* (hdegoede)
+- Fix some pylint warnings in iw/*.py (hdegoede)
+- Don't start our audit daemon with the livecd installer (katzj)
+- If there's a problem finding removable disks, disable save-to-disk.
+  (clumens)
+- Move %%pre processing to much earlier in the install process. (clumens)
+- If there are no installs to rescue via kickstart, display an error.
+  (clumens)
+- Add an early kickstart processing pass. (clumens)
+- Fixes of errors shown by pylint that didn't get into the beta build.
+  (mgracik)
+- Adjust the dmraid ignoring logic. (jgranado)
+- Reference the format by type, not name.(#492596) (jgranado)
+- Sending translation for Chinese (Simplified) (leahliu)
+- Increase udev_settle timeout in udev_get_block_devices. (#492049) (dlehman)
+- Fix check for fully defined md array when raidlevel is 0. (#491796)
+  (dlehman)
+- Fix a typo ('isEFI' should be 'isEfi'). (dlehman)
+- Make sure the pvs are set up before doing lvremove or vgremove. (dlehman)
+- Don't write out md member devices to a config file for assemble. (dlehman)
+- Fix the supported property of filesystems and prepboot format. (dlehman)
+- Return early from doAutoPartition if partition allocation fails. (dlehman)
+- Reset storage instance if autopart fails. (#492158) (dlehman)
+- Assign weights to partition requests when doing manual or kickstart
+  installs. (clumens)
+- Refresh windows immediately to make sure they appear. (clumens)
+- Fix problem with format and migrate combo box activation. (dcantrell)
+- Fix typo in upgrade.py (dcantrell)
+- Move _scheduleLVs and growLVM calls to be inside try/except (dcantrell)
+- Correct bounds checking problems in 'Shrink current system' (dcantrell)
+- Require libselinux-python (#489107) (dcantrell)
+- Do not prompt for NIC selection in cmdline mode (#492586) (dcantrell)
+- Do not write /etc/hosts since setup owns that now (#491808) (dcantrell)
+- Remove unused self._resize variable. (dcantrell)
+- Having 2 raidsets in the same group of devs is possible. (jgranado)
+- getDevice returns a string.  Use that to look up the device object
+  (#492465). (clumens)
+- Take into account i386->i586 when warning on upgrade arch mismatch.
+  (clumens)
+- Remove unused getVG{Free,Used}Space methods. (clumens)
+- We can no longer display Russian correctly in text mode (#491394).
+  (clumens)
+- Clean up the reinitialize LVM warning message (#491888). (clumens)
+- Update translation files (#484784). (clumens)
+- Include the storage directory when building the .po files. (clumens)
+- Merge commit 'origin/anaconda-storage-branch' (clumens)
+- Keep VG size property non-negative (rvykydal)
+- Grow LVs for kickstart requests too (rvykydal)
+- Handle not finding the upgrade root gracefully. (jgranado)
+- Use self.name to report that we could not eject cd. (jgranado)
+- Fix ppoll() timeout=infinity usage in auditd (#484721). (pjones)
+- Use correct parse method for the upgrade command (#471232) (wwoods)
+- Rename /etc/modprobe.d/anaconda to /etc/modprobe.d/anaconda.conf (clumens)
+- Handle FTP servers that both want and don't want PASS after USER
+  (#490350). (clumens)
+- Only select the Core group in text mode (#488754). (clumens)
+- Add created user to default group created for the user. (rvykydal)
+
 * Wed Mar 25 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.38-1
 - Fix pylint errors in iw/*.py (hdegoede)
 - Rework CryptTab.parse (dlehman).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -r1.763 -r1.764
--- sources	25 Mar 2009 19:54:45 -0000	1.763
+++ sources	1 Apr 2009 21:34:19 -0000	1.764
@@ -1 +1 @@
-cc5529f71c16ed409eab0cd0ca28be8e  anaconda-11.5.0.38.tar.bz2
+bfcd8c207308041a107ad56a2f839ad8  anaconda-11.5.0.39.tar.bz2



From hadess at fedoraproject.org  Wed Apr  1 22:19:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  1 Apr 2009 22:19:01 +0000 (UTC)
Subject: rpms/totem/devel .cvsignore, 1.73, 1.74 sources, 1.73,
	1.74 totem.spec, 1.232, 1.233
Message-ID: <20090401221901.33DAA7011D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29882

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-1
- Update to 2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	16 Mar 2009 11:16:37 -0000	1.73
+++ .cvsignore	1 Apr 2009 22:18:29 -0000	1.74
@@ -1 +1 @@
-totem-2.26.0.tar.bz2
+totem-2.26.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	16 Mar 2009 11:16:37 -0000	1.73
+++ sources	1 Apr 2009 22:18:30 -0000	1.74
@@ -1 +1 @@
-c4204177970911e46b555dd317c37611  totem-2.26.0.tar.bz2
+410d14957f48ae179c03e5c663607536  totem-2.26.1.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- totem.spec	16 Mar 2009 11:16:37 -0000	1.232
+++ totem.spec	1 Apr 2009 22:18:30 -0000	1.233
@@ -8,7 +8,7 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
@@ -478,6 +478,9 @@
 %endif
 
 %changelog
+* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Mon Mar 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From rdieter at fedoraproject.org  Wed Apr  1 22:52:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 22:52:28 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.190,1.191
Message-ID: <20090401225228.362B37011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5386

Modified Files:
	kdebindings.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- relax dep on kdepimlibs-akonadi



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kdebindings.spec	31 Mar 2009 11:18:31 -0000	1.190
+++ kdebindings.spec	1 Apr 2009 22:51:56 -0000	1.191
@@ -23,7 +23,7 @@
 
 Name: kdebindings
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -88,7 +88,7 @@
 Requires: PyQt4 >= %{pyqt4_version}
 %if ! 0%{?pykde4_akonadi}
 Provides: PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} = %{version}
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
 %endif
 %description -n PyKDE4
 %{summary}.
@@ -97,7 +97,7 @@
 Summary: Akonadi runtime support for PyKDE4 
 Group: Development/Languages 
 Requires: PyKDE4 = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} = %{version} 
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version} 
 %description -n PyKDE4-akonadi 
 %{summary}.
 
@@ -474,6 +474,9 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- relax dep on kdepimlibs-akonadi
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From rdieter at fedoraproject.org  Wed Apr  1 23:09:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:09:01 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 .cvsignore, 1.23,
	1.24 kdebase-workspace.spec, 1.168, 1.169 sources, 1.28, 1.29
Message-ID: <20090401230901.34F987011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9764

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets
- drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Mar 2009 01:32:31 -0000	1.23
+++ .cvsignore	1 Apr 2009 23:08:30 -0000	1.24
@@ -1 +1 @@
-kdebase-workspace-4.2.1.tar.bz2
+kdebase-workspace-4.2.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdebase-workspace.spec	12 Mar 2009 16:25:50 -0000	1.168
+++ kdebase-workspace.spec	1 Apr 2009 23:08:30 -0000	1.169
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.1
+Version: 4.2.2
 
-Release: 7%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -42,16 +42,8 @@
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 # from 4.3: http://bugs.kde.org/180576
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-# 4.2 , http://bugs.kde.org/185736
-Patch104: kdebase-workspace-4.2.1-kde#185736.patch
 #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# 4.2, http://bugs.kde.org/185585
-Patch106: kdebase-workspace-4.2.1-kde#185585.patch
-
-Provides: kdebase-kdm = 6:%{version}-%{release}
-Provides: kdm = %{version}-%{release}
-Provides: service(graphical-login) = kdm
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -65,8 +57,10 @@
 Obsoletes: kdmtheme < 1.3
 
 %if 0%{?fedora} > 10
-# kpowersave -> powerdevil upgrade path
+# -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
+# -> powerdevel upgrade path
+Obsoletes: guidance-power-manager < 4.2.0-10
 %endif
 
 BuildRequires: bluez-libs-devel
@@ -77,6 +71,7 @@
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libraw1394-devel
+BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
@@ -90,17 +85,15 @@
 # BuildRequires: libusb-devel
 
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kde-settings-kdm
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= %{version}
 
-# split ksysguardd
+# pkg-splits, upgrade path
+Requires: kdm = %{version}-%{release}
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -124,7 +117,6 @@
 KDE Desktop Environment.
 
 This package contains:
-* kdm (the login manager of KDE)
 * khotkeys (a hotkey daemon)
 * klipper (a cut & paste history utility)
 * kmenuedit (the menu editor)
@@ -157,7 +149,7 @@
 %else
 Provides: solid-bluetooth = 4.3-0.1
 %endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -172,6 +164,17 @@
 %description wallpapers
 %{summary}.
 
+%package -n kdm
+Summary: The KDE login manager
+group: User Interface/X
+Provides: kdebase-kdm = %{version}-%{release}
+Provides: service(graphical-login) = kdm
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kde-settings-kdm
+%description -n kdm
+KDM provides the graphical login screen, shown shortly after boot up,
+log out, and when user switching.
+
 %package -n ksysguardd
 Summary: Performance monitor daemon
 Group:   System Environment/Daemons
@@ -182,6 +185,9 @@
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
 %description -n oxygen-cursor-themes
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %{summary}.
 
 %package googlegadgets
@@ -199,6 +205,7 @@
 %description python-applet
 %{summary}.
 
+
 %prep
 
 %setup -q
@@ -231,9 +238,7 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
-%patch104 -p5 -b .kde#185736
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p0 -b .kde#185585
 
 %build
 
@@ -242,7 +247,8 @@
 %{cmake_kde4} \
   -DKDE4_KDM_PAM_SERVICE=kdm \
   -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
+  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -274,14 +280,22 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -292,37 +306,135 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
-%{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/ksysguardd
-%{_kde4_appsdir}/*
-%{_kde4_configdir}/*
+%{_kde4_bindir}/kaccess                           
+%{_kde4_bindir}/kapplymousetheme                  
+%{_kde4_bindir}/kblankscrn.kss                    
+%{_kde4_bindir}/kcheckrunning                     
+%{_kde4_bindir}/kcminit                           
+%{_kde4_bindir}/kcminit_startup                   
+%{_kde4_bindir}/kdostartupconfig4                 
+%{_kde4_bindir}/kfontinst
+%{_kde4_bindir}/kfontview
+%{_kde4_bindir}/klipper
+%{_kde4_bindir}/kmenuedit
+%{_kde4_bindir}/krandom.kss
+%{_kde4_bindir}/krandrtray
+%{_kde4_bindir}/krdb
+%{_kde4_bindir}/krunner
+%{_kde4_bindir}/ksmserver
+%{_kde4_bindir}/ksplashsimple
+%{_kde4_bindir}/ksplashx
+%{_kde4_bindir}/ksplashx_scale
+%{_kde4_bindir}/kstartupconfig4
+%{_kde4_bindir}/ksysguard
+%{_kde4_bindir}/ksystraycmd
+%{_kde4_bindir}/kwin*
+%{_kde4_bindir}/kxkb
+%{_kde4_bindir}/plasma
+%{_kde4_bindir}/plasma-overlay
+%{_kde4_bindir}/plasmaengineexplorer
+%{_kde4_bindir}/plasmapkg
+%{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/safestartkde
+%{_kde4_bindir}/setscheduler
+%{_kde4_bindir}/solid-bluetooth
+%{_kde4_bindir}/solid-network
+%{_kde4_bindir}/solid-powermanagement
+%{_kde4_bindir}/startkde
+%{_kde4_bindir}/systemsettings
+
+%{_kde4_appsdir}/color-schemes/
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kaccess/
+%{_kde4_appsdir}/kcminput/
+%{_kde4_appsdir}/kcmkeys/
+%{_kde4_appsdir}/kconf_update/
+%{_kde4_appsdir}/kcontrol/
+%{_kde4_appsdir}/kdisplay/
+%{_kde4_appsdir}/kfontinst/
+%{_kde4_appsdir}/kfontview/
+%{_kde4_appsdir}/khotkeys/
+%{_kde4_appsdir}/kmenuedit/
+%{_kde4_appsdir}/konqsidebartng/
+%{_kde4_appsdir}/ksplash/
+%{_kde4_appsdir}/ksysguard/
+%{_kde4_appsdir}/kthememanager/
+%{_kde4_appsdir}/kwin/
+%{_kde4_appsdir}/kwrited/
+%{_kde4_appsdir}/plasma/
+%{_kde4_appsdir}/plasma_scriptengine_ruby/
+%{_kde4_appsdir}/powerdevil/
+%{_kde4_appsdir}/solid/
+%{_kde4_appsdir}/solidfakenetbackend/
+%{_kde4_appsdir}/systemsettings/
+
+%{_kde4_configdir}/background.knsrc
+%{_kde4_configdir}/colorschemes.knsrc
+%{_kde4_configdir}/klipperrc
+%{_kde4_configdir}/ksplash.knsrc
+%{_kde4_configdir}/ksysguard.knsrc
+%{_kde4_configdir}/plasma-overlayrc
+%{_kde4_configdir}/plasma-themes.knsrc
+%{_kde4_configdir}/wallpaper.knsrc
+
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/sounds/pop.wav
+%{_kde4_datadir}/autostart/klipper.desktop
+%{_kde4_datadir}/autostart/krunner.desktop
+%{_kde4_datadir}/autostart/plasma.desktop
 %{_kde4_datadir}/applications/kde4/*
-%{_datadir}/dbus-1/interfaces/*
-%{_datadir}/dbus-1/services/*
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/dbus-1/services/*.service
 %{_kde4_datadir}/config.kcfg/*
-%{_datadir}/xsessions/*
-%{_kde4_docdir}/HTML/en/*
+%{_datadir}/xsessions/*.desktop
+%{_kde4_docdir}/HTML/en/kcontrol/
+%{_kde4_docdir}/HTML/en/klipper/
+%{_kde4_docdir}/HTML/en/kmenuedit/
+%{_kde4_docdir}/HTML/en/ksysguard/
+%{_kde4_docdir}/HTML/en/kxkb/
+%{_kde4_docdir}/HTML/en/plasma/
+%{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/ion_*.so
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/kde4/kfontviewpart.so
+%{_kde4_libdir}/kde4/kio_fonts.so
+%{_kde4_libdir}/kde4/krunner_*.so
+%{_kde4_libdir}/kde4/kstyle_keramik_config.so
+%{_kde4_libdir}/kde4/kwin*_*.so
+%{_kde4_libdir}/kde4/plasma_animator_default.so
+%{_kde4_libdir}/kde4/plasma_applet_*.so
+%{_kde4_libdir}/kde4/plasma_appletscript_*.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_*.so
+%{_kde4_libdir}/kde4/plasma_containment_*.so
+%{_kde4_libdir}/kde4/plasma_engine_*.so
+%{_kde4_libdir}/kde4/plasma_package*_*.so
+%{_kde4_libdir}/kde4/plasma_runnerscript_*.so
+%{_kde4_libdir}/kde4/plasma_wallpaper_*.so
+%{_kde4_libdir}/kde4/solid_*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
-%{_kde4_libexecdir}/*
+%{_kde4_libexecdir}/kcheckpass
+%{_kde4_libexecdir}/kcmdatetimehelper
+%{_kde4_libexecdir}/kfontprint
+%{_kde4_libexecdir}/kio_fonts_helper
+%{_kde4_libexecdir}/krootimage
+%{_kde4_libexecdir}/krunner_lock
+%{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
-%exclude %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
+%exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
 %exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
-%exclude %{_kde4_appsdir}/plasma_scriptengine_python
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
 %files libs
@@ -334,9 +446,9 @@
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
-# and F10's cmake (2.6.2) -- Lorenzo
-%if 0%{?fedora} > 10
+%{_kde4_appsdir}/cmake/modules/*.cmake
+# CMake changes behaviour after cmake-2.6.2 
+%if "%{?_cmake_version}" > "2.6.2" 
 %{_kde4_libdir}/cmake/KDE4Workspace*
 %else
 %{_kde4_libdir}/KDE4Workspace*
@@ -348,6 +460,22 @@
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/*
 
+%files -n kdm
+%defattr(-,root,root,-)
+%{_kde4_bindir}/genkdmconf
+%{_kde4_bindir}/kdm
+%{_kde4_bindir}/kdmctl
+%{_kde4_libdir}/kde4/kcm_kdm.so
+%{_kde4_libexecdir}/kdm_config
+%{_kde4_libexecdir}/kdm_greet
+%{_kde4_libdir}/kde4/kgreet_*.so
+%{_kde4_configdir}/kdm.knsrc
+%{_kde4_docdir}/HTML/en/kdm/
+%dir %{_kde4_appsdir}/doc
+%{_kde4_appsdir}/doc/kdm/
+%{_kde4_appsdir}/kdm/
+%{_kde4_datadir}/kde4/services/kdm.desktop
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -382,6 +510,31 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+- drop upstreamed patches
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Than Ngo <than at redhat.com> - 4.2.1-12
+- upstream patch to fix suspending issue
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-11
+- Obsoletes: guidance-power-manager (-> powerdevil upgrade path, F-11+)
+
+* Wed Mar 18 2009 Than Ngo <than at redhat.com> - 4.2.1-10
+- upstream patch to fix MenuEntryActions created from khotkeys
+
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
+- kdm subpkg
+- -devel: move cmake modules here
+- Requires: kdelibs4%%{?_isa} ..
+- BR: libutempter-devel (drops need for kwrited helper)
+
+* Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-8
+- oxygen-cursor-themes: make noarch (f10+)
+
 * Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-7
 - fix quicklauch (kdebug#185585,rh#489769)
 - -wallpapers: make noarch (f10+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 Mar 2009 12:22:04 -0000	1.28
+++ sources	1 Apr 2009 23:08:30 -0000	1.29
@@ -1 +1 @@
-5659e3c7c992fab38223b0a467377495  kdebase-workspace-4.2.1.tar.bz2
+ac494815044eefc3a181488871225eda  kdebase-workspace-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:09:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:09:56 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 .cvsignore, 1.17,
	1.18 kdebase-workspace.spec, 1.141, 1.142 sources, 1.22, 1.23
Message-ID: <20090401230956.0388A7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10115

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets
- drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	5 Mar 2009 01:32:15 -0000	1.17
+++ .cvsignore	1 Apr 2009 23:09:25 -0000	1.18
@@ -1 +1 @@
-kdebase-workspace-4.2.1.tar.bz2
+kdebase-workspace-4.2.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kdebase-workspace.spec	12 Mar 2009 16:30:57 -0000	1.141
+++ kdebase-workspace.spec	1 Apr 2009 23:09:25 -0000	1.142
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.1
+Version: 4.2.2
 
-Release: 7%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -42,16 +42,8 @@
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 # from 4.3: http://bugs.kde.org/180576
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-# 4.2 , http://bugs.kde.org/185736
-Patch104: kdebase-workspace-4.2.1-kde#185736.patch
 #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# 4.2, http://bugs.kde.org/185585
-Patch106: kdebase-workspace-4.2.1-kde#185585.patch
-
-Provides: kdebase-kdm = 6:%{version}-%{release}
-Provides: kdm = %{version}-%{release}
-Provides: service(graphical-login) = kdm
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -65,8 +57,10 @@
 Obsoletes: kdmtheme < 1.3
 
 %if 0%{?fedora} > 10
-# kpowersave -> powerdevil upgrade path
+# -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
+# -> powerdevel upgrade path
+Obsoletes: guidance-power-manager < 4.2.0-10
 %endif
 
 BuildRequires: bluez-libs-devel
@@ -77,6 +71,7 @@
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libraw1394-devel
+BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
@@ -90,17 +85,15 @@
 # BuildRequires: libusb-devel
 
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kde-settings-kdm
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= %{version}
 
-# split ksysguardd
+# pkg-splits, upgrade path
+Requires: kdm = %{version}-%{release}
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -124,7 +117,6 @@
 KDE Desktop Environment.
 
 This package contains:
-* kdm (the login manager of KDE)
 * khotkeys (a hotkey daemon)
 * klipper (a cut & paste history utility)
 * kmenuedit (the menu editor)
@@ -157,7 +149,7 @@
 %else
 Provides: solid-bluetooth = 4.3-0.1
 %endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -172,6 +164,17 @@
 %description wallpapers
 %{summary}.
 
+%package -n kdm
+Summary: The KDE login manager
+group: User Interface/X
+Provides: kdebase-kdm = %{version}-%{release}
+Provides: service(graphical-login) = kdm
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kde-settings-kdm
+%description -n kdm
+KDM provides the graphical login screen, shown shortly after boot up,
+log out, and when user switching.
+
 %package -n ksysguardd
 Summary: Performance monitor daemon
 Group:   System Environment/Daemons
@@ -182,6 +185,9 @@
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
 %description -n oxygen-cursor-themes
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %{summary}.
 
 %package googlegadgets
@@ -199,6 +205,7 @@
 %description python-applet
 %{summary}.
 
+
 %prep
 
 %setup -q
@@ -231,9 +238,7 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
-%patch104 -p5 -b .kde#185736
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p0 -b .kde#185585
 
 %build
 
@@ -242,7 +247,8 @@
 %{cmake_kde4} \
   -DKDE4_KDM_PAM_SERVICE=kdm \
   -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
+  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -274,14 +280,22 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null || :
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -292,37 +306,135 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
-%{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/ksysguardd
-%{_kde4_appsdir}/*
-%{_kde4_configdir}/*
+%{_kde4_bindir}/kaccess                           
+%{_kde4_bindir}/kapplymousetheme                  
+%{_kde4_bindir}/kblankscrn.kss                    
+%{_kde4_bindir}/kcheckrunning                     
+%{_kde4_bindir}/kcminit                           
+%{_kde4_bindir}/kcminit_startup                   
+%{_kde4_bindir}/kdostartupconfig4                 
+%{_kde4_bindir}/kfontinst
+%{_kde4_bindir}/kfontview
+%{_kde4_bindir}/klipper
+%{_kde4_bindir}/kmenuedit
+%{_kde4_bindir}/krandom.kss
+%{_kde4_bindir}/krandrtray
+%{_kde4_bindir}/krdb
+%{_kde4_bindir}/krunner
+%{_kde4_bindir}/ksmserver
+%{_kde4_bindir}/ksplashsimple
+%{_kde4_bindir}/ksplashx
+%{_kde4_bindir}/ksplashx_scale
+%{_kde4_bindir}/kstartupconfig4
+%{_kde4_bindir}/ksysguard
+%{_kde4_bindir}/ksystraycmd
+%{_kde4_bindir}/kwin*
+%{_kde4_bindir}/kxkb
+%{_kde4_bindir}/plasma
+%{_kde4_bindir}/plasma-overlay
+%{_kde4_bindir}/plasmaengineexplorer
+%{_kde4_bindir}/plasmapkg
+%{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/safestartkde
+%{_kde4_bindir}/setscheduler
+%{_kde4_bindir}/solid-bluetooth
+%{_kde4_bindir}/solid-network
+%{_kde4_bindir}/solid-powermanagement
+%{_kde4_bindir}/startkde
+%{_kde4_bindir}/systemsettings
+
+%{_kde4_appsdir}/color-schemes/
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kaccess/
+%{_kde4_appsdir}/kcminput/
+%{_kde4_appsdir}/kcmkeys/
+%{_kde4_appsdir}/kconf_update/
+%{_kde4_appsdir}/kcontrol/
+%{_kde4_appsdir}/kdisplay/
+%{_kde4_appsdir}/kfontinst/
+%{_kde4_appsdir}/kfontview/
+%{_kde4_appsdir}/khotkeys/
+%{_kde4_appsdir}/kmenuedit/
+%{_kde4_appsdir}/konqsidebartng/
+%{_kde4_appsdir}/ksplash/
+%{_kde4_appsdir}/ksysguard/
+%{_kde4_appsdir}/kthememanager/
+%{_kde4_appsdir}/kwin/
+%{_kde4_appsdir}/kwrited/
+%{_kde4_appsdir}/plasma/
+%{_kde4_appsdir}/plasma_scriptengine_ruby/
+%{_kde4_appsdir}/powerdevil/
+%{_kde4_appsdir}/solid/
+%{_kde4_appsdir}/solidfakenetbackend/
+%{_kde4_appsdir}/systemsettings/
+
+%{_kde4_configdir}/background.knsrc
+%{_kde4_configdir}/colorschemes.knsrc
+%{_kde4_configdir}/klipperrc
+%{_kde4_configdir}/ksplash.knsrc
+%{_kde4_configdir}/ksysguard.knsrc
+%{_kde4_configdir}/plasma-overlayrc
+%{_kde4_configdir}/plasma-themes.knsrc
+%{_kde4_configdir}/wallpaper.knsrc
+
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/sounds/pop.wav
+%{_kde4_datadir}/autostart/klipper.desktop
+%{_kde4_datadir}/autostart/krunner.desktop
+%{_kde4_datadir}/autostart/plasma.desktop
 %{_kde4_datadir}/applications/kde4/*
-%{_datadir}/dbus-1/interfaces/*
-%{_datadir}/dbus-1/services/*
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/dbus-1/services/*.service
 %{_kde4_datadir}/config.kcfg/*
-%{_datadir}/xsessions/*
-%{_kde4_docdir}/HTML/en/*
+%{_datadir}/xsessions/*.desktop
+%{_kde4_docdir}/HTML/en/kcontrol/
+%{_kde4_docdir}/HTML/en/klipper/
+%{_kde4_docdir}/HTML/en/kmenuedit/
+%{_kde4_docdir}/HTML/en/ksysguard/
+%{_kde4_docdir}/HTML/en/kxkb/
+%{_kde4_docdir}/HTML/en/plasma/
+%{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/ion_*.so
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/kde4/kfontviewpart.so
+%{_kde4_libdir}/kde4/kio_fonts.so
+%{_kde4_libdir}/kde4/krunner_*.so
+%{_kde4_libdir}/kde4/kstyle_keramik_config.so
+%{_kde4_libdir}/kde4/kwin*_*.so
+%{_kde4_libdir}/kde4/plasma_animator_default.so
+%{_kde4_libdir}/kde4/plasma_applet_*.so
+%{_kde4_libdir}/kde4/plasma_appletscript_*.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_*.so
+%{_kde4_libdir}/kde4/plasma_containment_*.so
+%{_kde4_libdir}/kde4/plasma_engine_*.so
+%{_kde4_libdir}/kde4/plasma_package*_*.so
+%{_kde4_libdir}/kde4/plasma_runnerscript_*.so
+%{_kde4_libdir}/kde4/plasma_wallpaper_*.so
+%{_kde4_libdir}/kde4/solid_*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
-%{_kde4_libexecdir}/*
+%{_kde4_libexecdir}/kcheckpass
+%{_kde4_libexecdir}/kcmdatetimehelper
+%{_kde4_libexecdir}/kfontprint
+%{_kde4_libexecdir}/kio_fonts_helper
+%{_kde4_libexecdir}/krootimage
+%{_kde4_libexecdir}/krunner_lock
+%{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
-%exclude %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
+%exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
 %exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
-%exclude %{_kde4_appsdir}/plasma_scriptengine_python
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
 %files libs
@@ -334,9 +446,9 @@
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
-# and F10's cmake (2.6.2) -- Lorenzo
-%if 0%{?fedora} > 10
+%{_kde4_appsdir}/cmake/modules/*.cmake
+# CMake changes behaviour after cmake-2.6.2 
+%if "%{?_cmake_version}" > "2.6.2" 
 %{_kde4_libdir}/cmake/KDE4Workspace*
 %else
 %{_kde4_libdir}/KDE4Workspace*
@@ -348,6 +460,22 @@
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/*
 
+%files -n kdm
+%defattr(-,root,root,-)
+%{_kde4_bindir}/genkdmconf
+%{_kde4_bindir}/kdm
+%{_kde4_bindir}/kdmctl
+%{_kde4_libdir}/kde4/kcm_kdm.so
+%{_kde4_libexecdir}/kdm_config
+%{_kde4_libexecdir}/kdm_greet
+%{_kde4_libdir}/kde4/kgreet_*.so
+%{_kde4_configdir}/kdm.knsrc
+%{_kde4_docdir}/HTML/en/kdm/
+%dir %{_kde4_appsdir}/doc
+%{_kde4_appsdir}/doc/kdm/
+%{_kde4_appsdir}/kdm/
+%{_kde4_datadir}/kde4/services/kdm.desktop
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -382,6 +510,31 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+- drop upstreamed patches
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Than Ngo <than at redhat.com> - 4.2.1-12
+- upstream patch to fix suspending issue
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-11
+- Obsoletes: guidance-power-manager (-> powerdevil upgrade path, F-11+)
+
+* Wed Mar 18 2009 Than Ngo <than at redhat.com> - 4.2.1-10
+- upstream patch to fix MenuEntryActions created from khotkeys
+
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
+- kdm subpkg
+- -devel: move cmake modules here
+- Requires: kdelibs4%%{?_isa} ..
+- BR: libutempter-devel (drops need for kwrited helper)
+
+* Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-8
+- oxygen-cursor-themes: make noarch (f10+)
+
 * Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-7
 - fix quicklauch (kdebug#185585,rh#489769)
 - -wallpapers: make noarch (f10+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	3 Mar 2009 12:24:24 -0000	1.22
+++ sources	1 Apr 2009 23:09:25 -0000	1.23
@@ -1 +1 @@
-5659e3c7c992fab38223b0a467377495  kdebase-workspace-4.2.1.tar.bz2
+ac494815044eefc3a181488871225eda  kdebase-workspace-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:12:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:12:13 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-9 oxygen-icon-theme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401231213.0D56B7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/oxygen-icon-theme/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10857

Modified Files:
	.cvsignore sources 
Added Files:
	oxygen-icon-theme.spec 
Log Message:
* Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
- kde-4.2.2



--- NEW FILE oxygen-icon-theme.spec ---

%define icons_svg 1

Name:          oxygen-icon-theme 
Summary:       Oxygen icon theme 
Version:       4.2.2
Release:       1%{?dist}

License:       LGPLv3+ 
Group:         User Interface/Desktops
URL:           http://www.kde.org/
Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:     noarch

BuildRequires: kdelibs4-devel >= %{version}

# Most of the following deps are bogus in this context, needed only 
# because we're curerntly building from kdebase-runtime tarball.
# upstream will provide standalone oxygen-icon-theme tarballs soon.
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-libs-devel
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel

%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}


%description
%{summary}.

%package scalable
Summary: Oxygen icon theme, scalable(svg) icons
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description scalable
%{summary}.

%prep
%setup -q -n kdebase-runtime-%{version}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen

%if 0%{?icons_svg}
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
sed -e "s|^%{buildroot}||" svg.list > svg-include.list
sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
%else
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
  xargs --no-run-if-empty rm -fv
%endif


%clean
rm -rf %{buildroot}


%post 
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :

%posttrans 
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :

%postun 
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
fi

%if 0%{?icons_svg}
%post scalable
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :

%posttrans scalable
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :

%postun scalable
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
fi
%endif


%files %{?icons_svg:-f svg-exclude.list}
%defattr(-,root,root,-)
%doc pics/oxygen/AUTHORS
%doc pics/oxygen/CONTRIBUTING
%doc pics/oxygen/COPYING
%doc pics/oxygen/TODO*
#{_kde4_iconsdir}/default.kde4
%{_kde4_iconsdir}/oxygen/

%if 0%{?icons_svg}
%files scalable -f svg-include.list
%defattr(-,root,root,-)
%endif


%changelog
* Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
- kde-4.2.2

* Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-11
- License: LGPLv3+
- %%doc: AUTHORS CONTRIBUTING COPYING TODO*

* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-10
- standalone (noarch) oxygen-icon-theme



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2009 21:36:44 -0000	1.1
+++ .cvsignore	1 Apr 2009 23:11:42 -0000	1.2
@@ -0,0 +1 @@
+kdebase-runtime-4.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2009 21:36:44 -0000	1.1
+++ sources	1 Apr 2009 23:11:42 -0000	1.2
@@ -0,0 +1 @@
+cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:13:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:13:28 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-10 oxygen-icon-theme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090401231328.4AF9F7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/oxygen-icon-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11234

Modified Files:
	.cvsignore sources 
Added Files:
	oxygen-icon-theme.spec 
Log Message:
* Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
- kde-4.2.2



--- NEW FILE oxygen-icon-theme.spec ---

%define icons_svg 1

Name:          oxygen-icon-theme 
Summary:       Oxygen icon theme 
Version:       4.2.2
Release:       1%{?dist}

License:       LGPLv3+ 
Group:         User Interface/Desktops
URL:           http://www.kde.org/
Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:     noarch

BuildRequires: kdelibs4-devel >= %{version}

# Most of the following deps are bogus in this context, needed only 
# because we're curerntly building from kdebase-runtime tarball.
# upstream will provide standalone oxygen-icon-theme tarballs soon.
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-libs-devel
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel

%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}


%description
%{summary}.

%package scalable
Summary: Oxygen icon theme, scalable(svg) icons
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description scalable
%{summary}.

%prep
%setup -q -n kdebase-runtime-%{version}


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen

%if 0%{?icons_svg}
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
sed -e "s|^%{buildroot}||" svg.list > svg-include.list
sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
%else
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
  xargs --no-run-if-empty rm -fv
%endif


%clean
rm -rf %{buildroot}


%post 
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :

%posttrans 
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :

%postun 
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
fi

%if 0%{?icons_svg}
%post scalable
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :

%posttrans scalable
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :

%postun scalable
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
fi
%endif


%files %{?icons_svg:-f svg-exclude.list}
%defattr(-,root,root,-)
%doc pics/oxygen/AUTHORS
%doc pics/oxygen/CONTRIBUTING
%doc pics/oxygen/COPYING
%doc pics/oxygen/TODO*
#{_kde4_iconsdir}/default.kde4
%{_kde4_iconsdir}/oxygen/

%if 0%{?icons_svg}
%files scalable -f svg-include.list
%defattr(-,root,root,-)
%endif


%changelog
* Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
- kde-4.2.2

* Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-11
- License: LGPLv3+
- %%doc: AUTHORS CONTRIBUTING COPYING TODO*

* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-10
- standalone (noarch) oxygen-icon-theme



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2009 21:36:44 -0000	1.1
+++ .cvsignore	1 Apr 2009 23:12:58 -0000	1.2
@@ -0,0 +1 @@
+kdebase-runtime-4.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2009 21:36:44 -0000	1.1
+++ sources	1 Apr 2009 23:12:58 -0000	1.2
@@ -0,0 +1 @@
+cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:16:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:16:23 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 .cvsignore, 1.25,
	1.26 kdebase-runtime.spec, 1.85, 1.86 sources, 1.28, 1.29
Message-ID: <20090401231623.CD2557011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12371

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- -flags subpkg
- koji/noarch hacks dropped



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	26 Jan 2009 21:51:15 -0000	1.25
+++ .cvsignore	1 Apr 2009 23:15:53 -0000	1.26
@@ -1 +1 @@
-kdebase-runtime-4.2.0.tar.bz2
+kdebase-runtime-4.2.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdebase-runtime.spec	3 Mar 2009 10:31:06 -0000	1.85
+++ kdebase-runtime.spec	1 Apr 2009 23:15:53 -0000	1.86
@@ -1,12 +1,14 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%define kde3_desktop 1
+%global kde3_desktop 1
+%else
+%define flags 1 
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.2.1
-Release:       2%{?dist}
+Version:       4.2.2
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -21,17 +23,19 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
-Patch100:      kdebase-runtime-4.2.1-pulseaudio-cmake.patch
 
-%ifarch noarch
-%define icons 1
-%define icons_svg 1
-%else
+#ifarch noarch
+## icons now provided by standalone oxygen-icon-theme
+#define icons 1
+#define icons_svg 1
+#else
 %define rest 1
-%endif
+#endif
 
 # when kdesu was removed, this is/should-be only temporary
+%if 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
+%endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #??KHelpcenter requires htdig for building search indices
@@ -42,8 +46,6 @@
 
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -86,10 +88,23 @@
 %description libs
 %{summary}.
 
+%package flags 
+Summary: Geopolitical flags
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description flags 
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
 %{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme
 %{summary}.
 
@@ -97,6 +112,9 @@
 Summary: Oxygen icon theme, scalable(svg) icons
 Group: User Interface/Desktops
 Requires: oxygen-icon-theme = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
@@ -109,7 +127,6 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
-%patch100 -p1 -b .pulseaudio-cmake
 
 %build
 mkdir -p %{_target_platform}
@@ -229,7 +246,7 @@
 %else
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
-rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+%{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
 # install this service for KDE 3 applications
 # NOTE: This is not a standard .desktop file, but an "almost standard" one
 #       installed into a KDE-3-specific directory, as usual for KDE 3 services,
@@ -247,33 +264,59 @@
 rm -rf %{buildroot}
 
 
+%if ! 0%{?kde3_desktop}
 %post
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+
+%posttrans
+%if ! 0%{?kde3_desktop}
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+%if ! 0%{?kde3_desktop}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %if 0%{?icons}
 %post -n oxygen-icon-theme
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n oxygen-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun -n oxygen-icon-theme
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
 %endif
 
 %if 0%{?icons_svg}
 %post -n oxygen-icon-theme-scalable
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n oxygen-icon-theme-scalable
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun -n oxygen-icon-theme-scalable
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
 %endif
 
 
@@ -310,6 +353,7 @@
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/
+%{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
@@ -322,6 +366,12 @@
 %{_kde4_libdir}/kde4/plugins/styles/
 %endif
 
+%if 0%{?flags}
+%files flags
+%defattr(-,root,root,-)
+%{_kde4_datadir}/locale/l10n/*/flag.png
+%endif
+
 %if 0%{?icons}
 %files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
 %defattr(-,root,root,-)
@@ -336,6 +386,20 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- -flags subpkg
+- koji/noarch hacks dropped
+
+* Wed Apr 01 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
+- flags subpkg (not enabled)
+- optimize scriptlets
+
 * Tue Mar  3 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-2
 - fix PulseAudio cmake detection
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	27 Feb 2009 15:52:26 -0000	1.28
+++ sources	1 Apr 2009 23:15:53 -0000	1.29
@@ -1 +1 @@
-93ef480ed5376ce02324d1b85b8bae0f  kdebase-runtime-4.2.1.tar.bz2
+cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:17:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:17:30 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 .cvsignore, 1.18, 1.19 kdebase-runtime.spec,
	1.67, 1.68 sources, 1.22, 1.23
Message-ID: <20090401231730.C3DCE7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12857

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- -flags subpkg
- koji/noarch hacks dropped



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Feb 2009 15:54:13 -0000	1.18
+++ .cvsignore	1 Apr 2009 23:17:00 -0000	1.19
@@ -1 +1 @@
-kdebase-runtime-4.2.0.tar.bz2
+kdebase-runtime-4.2.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdebase-runtime.spec	3 Mar 2009 10:31:06 -0000	1.67
+++ kdebase-runtime.spec	1 Apr 2009 23:17:00 -0000	1.68
@@ -1,12 +1,14 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%define kde3_desktop 1
+%global kde3_desktop 1
+%else
+%define flags 1 
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.2.1
-Release:       2%{?dist}
+Version:       4.2.2
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -21,17 +23,19 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
-Patch100:      kdebase-runtime-4.2.1-pulseaudio-cmake.patch
 
-%ifarch noarch
-%define icons 1
-%define icons_svg 1
-%else
+#ifarch noarch
+## icons now provided by standalone oxygen-icon-theme
+#define icons 1
+#define icons_svg 1
+#else
 %define rest 1
-%endif
+#endif
 
 # when kdesu was removed, this is/should-be only temporary
+%if 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
+%endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #??KHelpcenter requires htdig for building search indices
@@ -42,8 +46,6 @@
 
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -86,10 +88,23 @@
 %description libs
 %{summary}.
 
+%package flags 
+Summary: Geopolitical flags
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description flags 
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
 %{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme
 %{summary}.
 
@@ -97,6 +112,9 @@
 Summary: Oxygen icon theme, scalable(svg) icons
 Group: User Interface/Desktops
 Requires: oxygen-icon-theme = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
@@ -109,7 +127,6 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
-%patch100 -p1 -b .pulseaudio-cmake
 
 %build
 mkdir -p %{_target_platform}
@@ -229,7 +246,7 @@
 %else
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
-rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+%{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
 # install this service for KDE 3 applications
 # NOTE: This is not a standard .desktop file, but an "almost standard" one
 #       installed into a KDE-3-specific directory, as usual for KDE 3 services,
@@ -247,33 +264,59 @@
 rm -rf %{buildroot}
 
 
+%if ! 0%{?kde3_desktop}
 %post
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+
+%posttrans
+%if ! 0%{?kde3_desktop}
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-%{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+%if ! 0%{?kde3_desktop}
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+%endif
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %if 0%{?icons}
 %post -n oxygen-icon-theme
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n oxygen-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun -n oxygen-icon-theme
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
 %endif
 
 %if 0%{?icons_svg}
 %post -n oxygen-icon-theme-scalable
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n oxygen-icon-theme-scalable
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun -n oxygen-icon-theme-scalable
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
 %endif
 
 
@@ -310,6 +353,7 @@
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/
+%{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
@@ -322,6 +366,12 @@
 %{_kde4_libdir}/kde4/plugins/styles/
 %endif
 
+%if 0%{?flags}
+%files flags
+%defattr(-,root,root,-)
+%{_kde4_datadir}/locale/l10n/*/flag.png
+%endif
+
 %if 0%{?icons}
 %files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
 %defattr(-,root,root,-)
@@ -336,6 +386,20 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- -flags subpkg
+- koji/noarch hacks dropped
+
+* Wed Apr 01 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Mar 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
+- flags subpkg (not enabled)
+- optimize scriptlets
+
 * Tue Mar  3 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-2
 - fix PulseAudio cmake detection
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	27 Feb 2009 15:52:27 -0000	1.22
+++ sources	1 Apr 2009 23:17:00 -0000	1.23
@@ -1 +1 @@
-93ef480ed5376ce02324d1b85b8bae0f  kdebase-runtime-4.2.1.tar.bz2
+cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:20:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:20:38 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 .cvsignore, 1.54, 1.55 kdegraphics.spec, 1.188,
	1.189 sources, 1.63, 1.64
Message-ID: <20090401232038.3F5357011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13797

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	5 Mar 2009 02:47:33 -0000	1.54
+++ .cvsignore	1 Apr 2009 23:20:07 -0000	1.55
@@ -1 +1 @@
-kdegraphics-4.2.1.tar.bz2
+kdegraphics-4.2.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kdegraphics.spec	9 Mar 2009 14:34:58 -0000	1.188
+++ kdegraphics.spec	1 Apr 2009 23:20:07 -0000	1.189
@@ -6,8 +6,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.2.1
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -20,7 +20,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-Patch100: gwenview-fix-version.diff
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -49,8 +48,6 @@
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: cups
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
 Obsoletes: gwenview < 2
@@ -72,8 +69,6 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -97,7 +92,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-%patch100 -p1 -b .gwenview_fix_version
 
 
 %build
@@ -127,20 +121,32 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans libs
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 
 %files
@@ -213,6 +219,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
 - gwenview-fix-version.diff
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	2 Mar 2009 10:29:25 -0000	1.63
+++ sources	1 Apr 2009 23:20:07 -0000	1.64
@@ -1 +1 @@
-9cc2bc859e678aa6178a5c6cf87eb0ab  kdegraphics-4.2.1.tar.bz2
+92ccbd703885a1f7788e4f27f281a75c  kdegraphics-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Wed Apr  1 23:22:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:22:07 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 gwenview-fix-version.diff,1.1,NONE
Message-ID: <20090401232207.45E767011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392/F-10

Removed Files:
	gwenview-fix-version.diff 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



--- gwenview-fix-version.diff DELETED ---



From rdieter at fedoraproject.org  Wed Apr  1 23:22:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:22:37 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 .cvsignore, 1.48, 1.49 kdegraphics.spec, 1.165,
	1.166 sources, 1.56, 1.57 gwenview-fix-version.diff, 1.1, NONE
Message-ID: <20090401232237.CF9357011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392/F-9

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	gwenview-fix-version.diff 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	5 Mar 2009 02:47:33 -0000	1.48
+++ .cvsignore	1 Apr 2009 23:22:07 -0000	1.49
@@ -1 +1 @@
-kdegraphics-4.2.1.tar.bz2
+kdegraphics-4.2.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdegraphics.spec	9 Mar 2009 14:33:44 -0000	1.165
+++ kdegraphics.spec	1 Apr 2009 23:22:07 -0000	1.166
@@ -6,8 +6,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.2.1
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -20,7 +20,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-Patch100: gwenview-fix-version.diff
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -49,8 +48,6 @@
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: cups
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
 Obsoletes: gwenview < 2
@@ -72,8 +69,6 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -97,7 +92,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-%patch100 -p1 -b .gwenview_fix_version
 
 
 %build
@@ -127,20 +121,32 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans libs
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 
 %files
@@ -213,6 +219,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
 - gwenview-fix-version.diff
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	2 Mar 2009 10:29:26 -0000	1.56
+++ sources	1 Apr 2009 23:22:07 -0000	1.57
@@ -1 +1 @@
-9cc2bc859e678aa6178a5c6cf87eb0ab  kdegraphics-4.2.1.tar.bz2
+92ccbd703885a1f7788e4f27f281a75c  kdegraphics-4.2.2.tar.bz2


--- gwenview-fix-version.diff DELETED ---



From rdieter at fedoraproject.org  Wed Apr  1 23:32:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  1 Apr 2009 23:32:09 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec,1.142,1.143
Message-ID: <20090401233209.F077A7011D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16607

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix %%files for F-9



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kdebase-workspace.spec	1 Apr 2009 23:09:25 -0000	1.142
+++ kdebase-workspace.spec	1 Apr 2009 23:31:39 -0000	1.143
@@ -365,6 +365,9 @@
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
+%if 0%{?have_bluez3}
+%{_kde4_appsdir}/solidfakebluetoothbackend/
+%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:08 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235410.CE222208553@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on gsynaptics (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:32 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235412.D02FE208556@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on gsynaptics (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:12 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235413.E8A69208603@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on gsynaptics (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:34 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235415.3577720860B@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on gsynaptics (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:45 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235426.27AAB208514@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on gsynaptics (Fedora 10) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:47 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235427.A08CD208553@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on gsynaptics (Fedora 10) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:49 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235430.9F9FA2086F1@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on gsynaptics (Fedora 10) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From pkgdb at fedoraproject.org  Wed Apr  1 23:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 01 Apr 2009 23:54:51 +0000
Subject: [pkgdb] gsynaptics had acl change status
Message-ID: <20090401235431.B70402086FF@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on gsynaptics (Fedora 10) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsynaptics



From nbecker at fedoraproject.org  Thu Apr  2 00:01:19 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  2 Apr 2009 00:01:19 +0000 (UTC)
Subject: rpms/qct/devel qct.spec,1.6,1.7
Message-ID: <20090402000119.9052B70120@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/qct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23437

Modified Files:
	qct.spec 
Log Message:
br 439675, 474615


Index: qct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qct/devel/qct.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qct.spec	26 Mar 2009 20:56:05 -0000	1.6
+++ qct.spec	2 Apr 2009 00:00:49 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		qct
 Version:	1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Multi-vcs GUI commit tool
 
 Group:		Development/Tools
@@ -46,6 +46,7 @@
 Summary:	Mercurial plugin for qct
 Group:		Development/Tools
 Requires:	mercurial >= 0.9.5-3
+Requires: 	%{name} = %{version}-%{release}
 
 %description	mercurial
 Installs qct.rc plugin for mercurial
@@ -56,6 +57,8 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
+%dir %{python_archlib}/qctlib
+%dir %{python_archlib}/qctlib/vcs
 %{_datadir}/applications/fedora-qct.desktop
 %doc COPYING README.*
 
@@ -65,6 +68,10 @@
 %{python_archlib}/hgext/qct.py*
 
 %changelog
+* Wed Apr  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.7-3
+- Add Req qt to qt-mercurial br 439675
+- Own directories qctlib... br 474615
+
 * Thu Mar 26 2009 Neal Becker <ndbecker2 at gmail.com> - 1.7-2
 - fix typo
 



From nbecker at fedoraproject.org  Thu Apr  2 00:05:02 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  2 Apr 2009 00:05:02 +0000 (UTC)
Subject: rpms/qct/F-10 qct.spec,1.3,1.4
Message-ID: <20090402000502.61AB470120@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/qct/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250

Modified Files:
	qct.spec 
Log Message:
fix br 439675, 474615


Index: qct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qct/F-10/qct.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qct.spec	26 Mar 2009 21:16:25 -0000	1.3
+++ qct.spec	2 Apr 2009 00:04:32 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		qct
 Version:	1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Multi-vcs GUI commit tool
 
 Group:		Development/Tools
@@ -46,6 +46,7 @@
 Summary:	Mercurial plugin for qct
 Group:		Development/Tools
 Requires:	mercurial >= 0.9.5-3
+Requires: 	%{name} = %{version}-%{release}
 
 %description	mercurial
 Installs qct.rc plugin for mercurial
@@ -56,6 +57,8 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
+%dir %{python_archlib}/qctlib
+%dir %{python_archlib}/qctlib/vcs
 %{_datadir}/applications/fedora-qct.desktop
 %doc COPYING README.*
 
@@ -65,6 +68,10 @@
 %{python_archlib}/hgext/qct.py*
 
 %changelog
+* Wed Apr  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.7-3
+- Add Req qt to qt-mercurial br 439675
+- Own directories qctlib... br 474615
+
 * Thu Mar 26 2009 Neal Becker <ndbecker2 at gmail.com> - 1.7-2
 - fix typo
 



From cchance at fedoraproject.org  Thu Apr  2 00:12:36 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu,  2 Apr 2009 00:12:36 +0000 (UTC)
Subject: rpms/ibus-table-wubi/devel ibus-table-wubi.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090402001236.103E370120@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-wubi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26582/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-table-wubi.spec import.log 
Log Message:
new package separated from ibus-table (488168)



--- NEW FILE ibus-table-wubi.spec ---
%bcond_without bootstrap

Name:       ibus-table-wubi
Version:    1.1.0.20090327
Release:    3%{?dist}
Summary:    Wubi input methods for ibus-table
License:    GPLv3
Group:      System Environment/Libraries
URL:        http://code.google.com/p/ibus/
Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

# for noarch pkgconfig
BuildRequires: ibus-table >= 1.1.0.20090220-5
%if %{with bootstrap}
BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.2
%endif
Requires(post):   ibus-table > 1.1.0

%description
The package contains Wubi input methods for Table engine of IBus platform. 

Wubi is released under released under GPLv3.

%prep
%setup -q

%build
export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
%if %{with bootstrap}
./autogen.sh \
    --prefix=%{_prefix} \
%else
%configure \
%endif
    --enable-wubi86
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%post
%{_bindir}/ibus-table-createdb  -n wubi86.db -s wubi86.txt

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/wubi86.db
%{_datadir}/ibus-table/icons/wubi86.svg

%changelog
* Mon Mar 27 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-3.fc11
- Resolves: rhbz#488168
- Rebuilt with latest upstream.

* Mon Mar 27 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-2.fc11
- Resolves: rhbz#488168
- Removed wubi98.

* Mon Mar 16 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-1.fc11
- Resolves: rhbz#488168
- Splited from ibus-table.
- Added contents of AUTHORS.


--- NEW FILE import.log ---
ibus-table-wubi-1_1_0_20090327-3_fc11:HEAD:ibus-table-wubi-1.1.0.20090327-3.fc11.src.rpm:1238631748


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Mar 2009 11:30:20 -0000	1.1
+++ .cvsignore	2 Apr 2009 00:12:05 -0000	1.2
@@ -0,0 +1 @@
+ibus-table-wubi-1.1.0.20090327.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Mar 2009 11:30:20 -0000	1.1
+++ sources	2 Apr 2009 00:12:05 -0000	1.2
@@ -0,0 +1 @@
+8aa15f5b6d1b12068b22ff5e9639a277  ibus-table-wubi-1.1.0.20090327.tar.gz



From nbecker at fedoraproject.org  Thu Apr  2 00:15:05 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  2 Apr 2009 00:15:05 +0000 (UTC)
Subject: rpms/qct/F-9 qct.spec,1.3,1.4
Message-ID: <20090402001505.53B1A70120@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/qct/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27317

Modified Files:
	qct.spec 
Log Message:
fix br 439675, 474615


Index: qct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qct/F-9/qct.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qct.spec	26 Mar 2009 22:12:04 -0000	1.3
+++ qct.spec	2 Apr 2009 00:14:35 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		qct
 Version:	1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Multi-vcs GUI commit tool
 
 Group:		Development/Tools
@@ -46,6 +46,7 @@
 Summary:	Mercurial plugin for qct
 Group:		Development/Tools
 Requires:	mercurial >= 0.9.5-3
+Requires: 	%{name} = %{version}-%{release}
 
 %description	mercurial
 Installs qct.rc plugin for mercurial
@@ -56,6 +57,8 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
+%dir %{python_archlib}/qctlib
+%dir %{python_archlib}/qctlib/vcs
 %{_datadir}/applications/fedora-qct.desktop
 %doc COPYING README.*
 
@@ -65,6 +68,10 @@
 %{python_archlib}/hgext/qct.py*
 
 %changelog
+* Wed Apr  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.7-3
+- Add Req qt to qt-mercurial br 439675
+- Own directories qctlib... br 474615
+
 * Thu Mar 26 2009 Neal Becker <ndbecker2 at gmail.com> - 1.7-2
 - fix typo
 



From cchance at fedoraproject.org  Thu Apr  2 00:26:34 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu,  2 Apr 2009 00:26:34 +0000 (UTC)
Subject: rpms/ibus-table-wubi/devel ibus-table-wubi.spec,1.1,1.2
Message-ID: <20090402002634.1A38470120@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-wubi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29558

Modified Files:
	ibus-table-wubi.spec 
Log Message:
correct license to GPLv3+ and preserve .svg timestamp during make install.



Index: ibus-table-wubi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/devel/ibus-table-wubi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-table-wubi.spec	2 Apr 2009 00:12:05 -0000	1.1
+++ ibus-table-wubi.spec	2 Apr 2009 00:26:03 -0000	1.2
@@ -2,9 +2,9 @@
 
 Name:       ibus-table-wubi
 Version:    1.1.0.20090327
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Wubi input methods for ibus-table
-License:    GPLv3
+License:    GPLv3+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -40,7 +40,7 @@
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install INSTALL="install -p"
 
 %clean
 rm -rf %{buildroot}
@@ -55,6 +55,9 @@
 %{_datadir}/ibus-table/icons/wubi86.svg
 
 %changelog
+* Wed Apr 01 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-4.fc11
+- Correct license to GPLv3+ and preserve timestamp during make install.
+
 * Mon Mar 27 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-3.fc11
 - Resolves: rhbz#488168
 - Rebuilt with latest upstream.



From whot at fedoraproject.org  Thu Apr  2 00:35:00 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  2 Apr 2009 00:35:00 +0000 (UTC)
Subject: rpms/gsynaptics/devel gsynaptics-0.9.14-driver-header.patch, NONE, 
	1.1 gsynaptics-0.9.14-fix-scrolling-checkboxes.patch, NONE,
	1.1 gsynaptics-0.9.14-scrolling-checkboxes.patch, NONE,
	1.1 gsynaptics-0.9.14-scrollmethods.patch, NONE,
	1.1 gsynaptics.spec, 1.20, 1.21
Message-ID: <20090402003500.714FB70120@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gsynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31643

Modified Files:
	gsynaptics.spec 
Added Files:
	gsynaptics-0.9.14-driver-header.patch 
	gsynaptics-0.9.14-fix-scrolling-checkboxes.patch 
	gsynaptics-0.9.14-scrolling-checkboxes.patch 
	gsynaptics-0.9.14-scrollmethods.patch 
Log Message:
* Mon Apr 2 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-5
- gsynaptics-0.9.14-scrolling-checkboxes.patch: set checkboxes based on the
  scrolling enabled/disabled property, not on the delta.
- gsynaptics-0.9.14-driver-header.patch: use the driver's header file instead
  of a custom synshm.h.
- Require xorg-x11-drv-synaptics now that we use the driver header, and force
  an autoreconf to include it properly.
- gsynaptics-0.9.14-fix-scrolling-checkboxes.patch: fix scrolling
  enabled/disabled checkboxes
- gsynaptics-0.9.14-scrollmethod.patch: provide radiobuttons instead



gsynaptics-0.9.14-driver-header.patch:

--- NEW FILE gsynaptics-0.9.14-driver-header.patch ---
>From 53529e21e35efe409afc7be42553551ac89c9aa4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 13 Mar 2009 10:06:50 +1000
Subject: [PATCH] Use the driver's synaptics.h file instead of our own synshm.h file.

Requires chaning a couple of constant names, but oh well, we get bonus points
for having the same SHM struct as the driver.
---
 src/Makefile.am  |    2 +
 src/gsynaptics.c |   22 ++++++------
 src/gsynaptics.h |   10 +++---
 src/main.c       |    6 ++--
 src/synshm.h     |  107 ------------------------------------------------------
 5 files changed, 21 insertions(+), 126 deletions(-)
 delete mode 100644 src/synshm.h

diff --git a/configure.ac b/configure.ac
index 085ee4e..3bd7747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ PKG_CHECK_MODULES(GCONF2, gconf-2.0)
 AC_SUBST(GCONF2_CFLAGS)
 AC_SUBST(GCONF2_LIBS)
 
+PKG_CHECK_MODULES(SYNAPTICS, xorg-synaptics)
+AC_SUBST(SYNAPTICS_CFLAGS)
+AC_SUBST(SYNAPTICS_LIBS)
+
 GETTEXT_PACKAGE=gsynaptics
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
diff --git a/src/Makefile.am b/src/Makefile.am
index 643fcb9..a5f9046 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ gsynaptics_CFLAGS =				\
 	$(GTK_CFLAGS)				\
 	$(GLADE2_CFLAGS)			\
 	$(GCONF2_CFLAGS)			\
+	$(SYNAPTICS_CFLAGS)			\
 	$(AM_CFLAGS)
 
 gsynaptics_SOURCES =			\
@@ -29,6 +30,7 @@ gsynaptics_init_CFLAGS =				\
 	$(GLIB_CFLAGS)				\
 	$(GNOME_CFLAGS)				\
 	$(GCONF2_CFLAGS)			\
+	$(SYNAPTICS_CFLAGS)			\
 	$(AM_CFLAGS)
 
 gsynaptics_init_LDADD =	\
diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 3598c18..37e6cb2 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -233,7 +233,7 @@ g_synaptics_is_tapping_enabled (GSynaptics *synaptics)
 	else
 	{
 		return SYNSHM(synaptics)->tap_time > 0 &&
-			SYNSHM(synaptics)->tap_action[OneFinger] > 0; /* F1_TAP */
+			SYNSHM(synaptics)->tap_action[F1_TAP] > 0; /* F1_TAP */
 	}
 }
 
@@ -256,7 +256,7 @@ g_synaptics_tap_time (GSynaptics *synaptics)
 
 #if 0
 gint
-g_synaptics_tap_action                 (GSynaptics *synaptics, TapType type)
+g_synaptics_tap_action                 (GSynaptics *synaptics, TapEvent type)
 {
 }
 #endif
@@ -499,7 +499,7 @@ g_synaptics_circular_scroll_trigger (GSynaptics *synaptics)
 }
 
 Button
-g_synaptics_button_for_tap (GSynaptics *synaptics, TapType tap)
+g_synaptics_button_for_tap (GSynaptics *synaptics, TapEvent tap)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
 	if (!g_synaptics_is_valid(synaptics))
@@ -617,7 +617,7 @@ g_synaptics_set_tap_time (GSynaptics *synaptics, gint time)
 
 #if 0
 void
-g_synaptics_set_tap_action (GSynaptics *synaptics, TapType type, int action)
+g_synaptics_set_tap_action (GSynaptics *synaptics, TapEvent type, int action)
 {
 	if (!g_synaptics_is_valid(synaptics))
 		return;
@@ -884,7 +884,7 @@ g_synaptics_set_circular_scroll_trigger (GSynaptics *synaptics, ScrollTrigger t)
 }
 
 void
-g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapType tap, Button button)
+g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapEvent tap, Button button)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
 	if (!g_synaptics_is_valid(synaptics))
@@ -894,19 +894,19 @@ g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapType tap, Button butto
 	{
 	    gchar *command;
 
-	    if (tap >= OneFinger)
+	    if (tap >= F1_TAP)
 	    {
 		command = g_strdup_printf ("synclient TapButton%d=%d",
-			tap - OneFinger + 1, button);
+			tap - F1_TAP + 1, button);
 	    } else
 	    {
 		char *corner;
 		switch (tap)
 		{
-		    case RightTop: corner ="RT"; break;
-		    case LeftTop: corner ="LT"; break;
-		    case RightBottom: corner ="RB"; break;
-		    case LeftBottom: corner ="LB"; break;
+		    case RT_TAP: corner ="RT"; break;
+		    case LT_TAP: corner ="LT"; break;
+		    case RB_TAP: corner ="RB"; break;
+		    case LB_TAP: corner ="LB"; break;
 		    default:
 				     return;
 		}
diff --git a/src/gsynaptics.h b/src/gsynaptics.h
index 3b15c7e..11b8763 100644
--- a/src/gsynaptics.h
+++ b/src/gsynaptics.h
@@ -20,7 +20,7 @@
 #define __G_SYNAPTICS_H__
 
 #include <gtk/gtk.h>
-#include "synshm.h"
+#include <synaptics.h>
 
 G_BEGIN_DECLS
 
@@ -76,7 +76,7 @@ void		g_synaptics_edges                       (GSynaptics *synaptics);
 gboolean	g_synaptics_is_tapping_enabled          (GSynaptics *synaptics);
 gint		g_synaptics_tap_time                    (GSynaptics *synaptics);
 gint		g_synaptics_tap_action                  (GSynaptics *synaptics,
-							 TapType     type );
+							 TapEvent     type );
 gint		g_synaptics_sensitivity                 (GSynaptics *synaptics);
 gboolean	g_synaptics_is_horizontal_scroll_enabled(GSynaptics *synaptics);
 gint		g_synaptics_horizontal_scroll_delta     (GSynaptics *synaptics);
@@ -91,7 +91,7 @@ gboolean	g_synaptics_is_circular_scroll_enabled  (GSynaptics *synaptics);
 gint		g_synaptics_circular_scroll_delta       (GSynaptics *synaptics);
 ScrollTrigger	g_synaptics_circular_scroll_trigger     (GSynaptics *synaptics);
 Button		g_synaptics_button_for_tap              (GSynaptics *synaptics,
-							 TapType     tap );
+							 TapEvent    tap );
 gboolean	g_synaptics_are_fast_taps_enabled       (GSynaptics *synaptics);
 gint		g_synaptics_abs_coord_x                 (GSynaptics *synaptics);
 gint		g_synaptics_abs_coord_y                 (GSynaptics *synaptics);
@@ -102,7 +102,7 @@ void		g_synaptics_set_edges                   (GSynaptics *synaptics);
 void		g_synaptics_set_tap_time                (GSynaptics *synaptics,
 							 gint        time);
 void		g_synaptics_set_tap_action              (GSynaptics *synaptics,
-							 TapType     type,
+							 TapEvent    type,
 							 int         action);
 void		g_synaptics_set_sensitivity             (GSynaptics *synaptics,
 							 gint        value);
@@ -127,7 +127,7 @@ void		g_synaptics_set_circular_scroll_delta   (GSynaptics *synaptics,
 void		g_synaptics_set_circular_scroll_trigger (GSynaptics *synaptics,
 							 ScrollTrigger t);
 void		g_synaptics_set_button_for_tap          (GSynaptics *synaptics,
-							 TapType     tap,
+							 TapEvent    tap,
 							 Button      button);
 void		g_synaptics_set_fast_taps               (GSynaptics *synaptics,
 							 gboolean    enable);
diff --git a/src/main.c b/src/main.c
index 71c1570..d0cc0dd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -223,9 +223,9 @@ cb_tapping_toggled (GtkToggleButton *button, GladeXML *dialog)
 
 	g_synaptics_set_tap_time (synaptics, time);
         /* Default 1/2/3 finger tap settings */
-	g_synaptics_set_button_for_tap(synaptics, OneFinger, check ? 1 : 0);
-	g_synaptics_set_button_for_tap(synaptics, TwoFingers, check ? 3 : 0);
-	g_synaptics_set_button_for_tap(synaptics, ThreeFingers, check ? 2 : 0);
+	g_synaptics_set_button_for_tap(synaptics, F1_TAP, check ? 1 : 0);
+	g_synaptics_set_button_for_tap(synaptics, F2_TAP, check ? 3 : 0);
+	g_synaptics_set_button_for_tap(synaptics, F3_TAP, check ? 2 : 0);
 	gconf_client_set_int (gconf, MAXTAPTIME_KEY, time, NULL);
 }
 
diff --git a/src/synshm.h b/src/synshm.h
deleted file mode 100644
index 59ec0f4..0000000
--- a/src/synshm.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2004 by Stefan Kombrink <katakombi at web.de>              *
- *   Copyright (C) 2004 by Nadeem Hasan <nhasan at kde.org>                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
- 
-#ifndef _SYNSHM_H_
-#define _SYNSHM_H_
-
-#include <X11/Xdefs.h>
-
-/***************************************************************************
- * Public definitions (from Peter Osterlunds synaptics driver)
- ***************************************************************************/
-
-typedef enum
-{
-    RightTop = 0,               /* Right top corner */
-    RightBottom,                /* Right bottom corner */
-    LeftTop,                    /* Left top corner */
-    LeftBottom,                 /* Left bottom corner */
-    OneFinger,                  /* Non-corner tap, one finger */
-    TwoFingers,                 /* Non-corner tap, two fingers */
-    ThreeFingers,               /* Non-corner tap, three fingers */
-    MaxTap
-} TapType;
-
-struct SynapticsHwInfo
-{
-    unsigned int model_id;          /* Model-ID */
-    unsigned int capabilities;      /* Capabilities */
-    unsigned int ext_cap;           /* Extended Capabilities */
-    unsigned int identity;          /* Identification */
-    Bool hasGuest;                  /* Has a guest mouse */
-};
-
-// SHM Id
-#define SHM_SYNAPTICS 23947
-
-typedef struct _SynapticsSHM
-{
-    /* Current device state */
-    int x, y;                               /* actual x, y coordinates */
-    int z;                                  /* pressure value */
-    int numFingers;                         /* number of fingers */
-    int fingerWidth;                        /* finger width value */
-    int left, right, up, down;              /* left/right/up/down buttons */
-    Bool multi[8];
-    Bool middle;
-    int guest_left, guest_mid, guest_right; /* guest device buttons */
-    int guest_dx, guest_dy;                 /* guest device movement */
-
-    /* Probed hardware properties */
-    struct SynapticsHwInfo synhw;
-
-    /* Parameter data */
-    int left_edge, right_edge, top_edge, bottom_edge; /* edge coordinates absolute */
-    int finger_low, finger_high;                      /* finger detection values in Z-values */
-    unsigned long tap_time;
-    int tap_move;                                     /* max. tapping time and movement in packets and coord. */
-    unsigned long tap_time_2;           /* max. tapping time for double taps */
-    unsigned long click_time;           /* The duration of a single click */
-    Bool fast_taps;
-    int emulate_mid_button_time;        /* Max time between left and right button presses
-to
-                           emulate a middle button press. */
-    int scroll_dist_vert;               /* Scrolling distance in absolute coordinates */
-    int scroll_dist_horiz;              /* Scrolling distance in absolute coordinates */
-    double min_speed, max_speed, accl;  /* movement parameters */
-    int edge_motion_min_z;              /* finger pressure at which minimum edge motion speed
-is set */
-    int edge_motion_max_z;              /* finger pressure at which maximum edge motion speed
-is set */
-    int edge_motion_min_speed;          /* slowest setting for edge motion speed */
-    int edge_motion_max_speed;          /* fastest setting for edge motion speed */
-    Bool edge_motion_use_always;        /* If false, egde motion is used only when dragging */
-
-    Bool updown_button_scrolling;       /* Up/Down-Button scrolling or middle/double-click */
-    int touchpad_off;               /* Switches the touchpad off */
-    Bool guestmouse_off;            /* Switches the guest mouse off */
-    Bool locked_drags;              /* Enable locked drags */
-    int tap_action[MaxTap];         /* Button to report on tap events */
-    Bool circular_scrolling;        /* Enable circular scrolling */
-    double scroll_dist_circ;        /* Scrolling angle radians */
-    int circular_trigger;           /* Trigger area for circular scrolling */
-    Bool circular_pad;              /* Edge has an oval or circular shape */
-    Bool palm_detect;               /* Enable palm detection */
-    int palm_min_width;             /* Palm detection width */
-    int palm_min_z;                 /* Palm detection pressure */
-    double coasting_speed;          /* Coasting threshold scrolling speed */
-} SynapticsSHM;
-
-#endif
-- 
1.6.0.6


gsynaptics-0.9.14-fix-scrolling-checkboxes.patch:

--- NEW FILE gsynaptics-0.9.14-fix-scrolling-checkboxes.patch ---
>From 8071f04d537f39a0feeda90b24e72f29f2f17246 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 13 Mar 2009 09:47:02 +1000
Subject: [PATCH] Fix up edge scrolling checkboxes.

Edge scrolling toggling should set the Vert/HorizEdgeScroll property, not the
delta. And it should be stored in a separate gconf key, so the actual speed is
untouched when disabling it.
---
 src/gsynaptics-conf.h |    4 +++-
 src/gsynaptics.c      |   40 ++++++++++++++++++++++++++++++++++++++++
 src/gsynaptics.h      |    4 ++++
 src/main.c            |   25 ++++++-------------------
 4 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/src/gsynaptics-conf.h b/src/gsynaptics-conf.h
index 76999db..d2b8c17 100644
--- a/src/gsynaptics-conf.h
+++ b/src/gsynaptics-conf.h
@@ -28,6 +28,8 @@ G_BEGIN_DECLS
 #define MAXTAPTIME_KEY 		"/desktop/gnome/peripherals/touchpad/max_tap_time"
 #define HORIZSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/horiz_scroll_delta"
 #define VERTSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/vert_scroll_delta"
+#define VERTSCROLLENABLED_KEY 	"/desktop/gnome/peripherals/touchpad/vert_scroll_enabled"
+#define HORIZSCROLLENABLED_KEY 	"/desktop/gnome/peripherals/touchpad/horiz_scroll_enabled"
 #define EDGEMOTIONUSEALWAYS_KEY "/desktop/gnome/peripherals/touchpad/edge_motion_use_always"
 #define COASTENABLE_KEY 	"/desktop/gnome/peripherals/touchpad/coast_enable"
 #define CIRCULARSCROLLING_KEY 	"/desktop/gnome/peripherals/touchpad/circular_scrolling"
diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 37e6cb2..6f9b6a3 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -664,6 +664,46 @@ g_synaptics_set_sensitivity (GSynaptics *synaptics, gint value)
 }
 
 void
+g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics, gint enabled)
+{
+	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
+	if (!g_synaptics_is_valid(synaptics))
+		return;
+	if (priv->synclient)
+	{
+		gchar *command;
+		command = g_strdup_printf ("synclient HorizEdgeScroll=%d",
+					   enabled);
+		g_spawn_command_line_async (command, NULL);
+		g_free (command);
+	}
+	else
+	{
+		SYNSHM(synaptics)->scroll_edge_horiz = enabled;
+	}
+}
+
+void
+g_synaptics_set_vertical_scroll_enabled(GSynaptics *synaptics, gint enabled)
+{
+	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
+	if (!g_synaptics_is_valid(synaptics))
+		return;
+	if (priv->synclient)
+	{
+		gchar *command;
+		command = g_strdup_printf ("synclient VertEdgeScroll=%d",
+					   enabled);
+		g_spawn_command_line_async (command, NULL);
+		g_free (command);
+	}
+	else
+	{
+		SYNSHM(synaptics)->scroll_edge_vert = enabled;
+	}
+}
+
+void
 g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics, gint delta)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
diff --git a/src/gsynaptics.h b/src/gsynaptics.h
index 11b8763..8fced65 100644
--- a/src/gsynaptics.h
+++ b/src/gsynaptics.h
@@ -106,6 +106,10 @@ void		g_synaptics_set_tap_action              (GSynaptics *synaptics,
 							 int         action);
 void		g_synaptics_set_sensitivity             (GSynaptics *synaptics,
 							 gint        value);
+void		g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics,
+							  gint enabled);
+void		g_synaptics_set_vertical_scroll_enabled	(GSynaptics *synaptics,
+							 gint enabled);
 void		g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics,
 							 gint        delta);
 void		g_synaptics_set_vertical_scroll_delta   (GSynaptics *synaptics,
diff --git a/src/main.c b/src/main.c
index d0cc0dd..c7089f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,22 +136,15 @@ cb_vertical_scroll_toggled (GtkToggleButton *button, GladeXML *dialog)
 	GtkWidget *widget;
 	GSynaptics *synaptics;
 	gboolean check;
-	gint value;
 
 	widget = WID ("vertical_scroll_box");
 	check = gtk_toggle_button_get_active (button);
 	gtk_widget_set_sensitive (widget, check);
 
-	widget = WID ("vertical_scroll_scale");
-	value = (gint) gtk_range_get_value (GTK_RANGE(widget));
-	
 	synaptics = g_object_get_qdata (G_OBJECT(dialog), synaptics_quark);
 
-	if (!check)
-		value = 0;
-
-	g_synaptics_set_vertical_scroll_delta (synaptics, value * -1);
-	gconf_client_set_int (gconf, VERTSCROLLDELTA_KEY, value * -1, NULL);
+        g_synaptics_set_vertical_scroll_enabled(synaptics, check);
+	gconf_client_set_int (gconf, VERTSCROLLENABLED_KEY, check, NULL);
 }
 
 static void
@@ -160,22 +153,16 @@ cb_horizontal_scroll_toggled (GtkToggleButton *button, GladeXML *dialog)
 	GtkWidget *widget;
 	GSynaptics *synaptics;
 	gboolean check;
-	gint value;
 
 	widget = WID ("horizontal_scroll_box");
 	check = gtk_toggle_button_get_active (button);
 	gtk_widget_set_sensitive (widget, check);
-	
-	widget = WID ("horizontal_scroll_scale");
-	value = (gint) gtk_range_get_value (GTK_RANGE(widget));
-	
-	synaptics = g_object_get_qdata (G_OBJECT(dialog), synaptics_quark);
 
-	if (!check)
-		value = 0;
 
-	g_synaptics_set_horizontal_scroll_delta (synaptics, value * -1);
-	gconf_client_set_int (gconf, HORIZSCROLLDELTA_KEY, value * -1, NULL);
+	synaptics = g_object_get_qdata (G_OBJECT(dialog), synaptics_quark);
+
+        g_synaptics_set_horizontal_scroll_enabled(synaptics, check);
+        gconf_client_set_int (gconf, HORIZSCROLLENABLED_KEY, check, NULL);
 }
 
 static void
-- 
1.6.0.6


gsynaptics-0.9.14-scrolling-checkboxes.patch:

--- NEW FILE gsynaptics-0.9.14-scrolling-checkboxes.patch ---
>From 216e4904913e709532e88e2030831d3b8d8b0c2f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 13 Mar 2009 09:27:39 +1000
Subject: [PATCH] Set the scrolling checkboxes based on the Vert/HorizEdgeScroll property.

---
 src/gsynaptics.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 64755aa..3598c18 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -299,7 +299,7 @@ g_synaptics_is_horizontal_scroll_enabled (GSynaptics *synaptics)
 
 	if (priv->synclient)
 	{
-		return g_synaptics_get_value_from_synclient ("HorizScrollDelta") > 0;
+		return g_synaptics_get_value_from_synclient ("HorizEdgeScroll") > 0;
 	}
 	else
 	{
@@ -334,7 +334,7 @@ g_synaptics_is_vertical_scroll_enabled (GSynaptics *synaptics)
 	if (priv->synclient)
 	{
 
-		return g_synaptics_get_value_from_synclient ("VertScrollDelta") > 0;
+		return g_synaptics_get_value_from_synclient ("VertEdgeScroll") > 0;
 	}
 	else
 	{
-- 
1.6.0.6


gsynaptics-0.9.14-scrollmethods.patch:

--- NEW FILE gsynaptics-0.9.14-scrollmethods.patch ---
>From ed0ff114f059eab1c18e354b665fe858b5022301 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 1 Apr 2009 13:39:12 +1000
Subject: [PATCH] Add radiobuttons for twofinger/edge scrolling

---
 data/gsynaptics.glade |   74 +++++++++++++++++++++++++++++++++++++++-------
 src/gsynaptics-conf.h |    2 +-
 src/gsynaptics.c      |   78 ++++++++++++++++++++++++++++++++++++++++--------
 src/gsynaptics.h      |   12 +++++--
 src/main.c            |   54 ++++++++++++++++++++++++---------
 5 files changed, 176 insertions(+), 44 deletions(-)

diff --git a/data/gsynaptics.glade b/data/gsynaptics.glade
index c3fa58d..b8a7a13 100644
--- a/data/gsynaptics.glade
+++ b/data/gsynaptics.glade
@@ -558,16 +558,69 @@
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="vertical_scroll_check">
+			    <widget class="GtkHBox" id="hbox29">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Enable _vertical scrolling</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkRadioButton" id="disable_scroll_radio">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">disabled</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">True</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkRadioButton" id="edge_scroll_radio">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">edge scrolling</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <property name="group">disable_scroll_radio</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkRadioButton" id="twofinger_scroll_radio">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">two-finger scrolling</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <property name="group">disable_scroll_radio</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
diff --git a/src/gsynaptics-conf.h b/src/gsynaptics-conf.h
index 8dc788b..df58daf 100644
--- a/src/gsynaptics-conf.h
+++ b/src/gsynaptics-conf.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 #define MAXTAPTIME_KEY 		"/desktop/gnome/peripherals/touchpad/max_tap_time"
 #define HORIZSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/horiz_scroll_delta"
 #define VERTSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/vert_scroll_delta"
-#define VERTSCROLLENABLED_KEY 	"/desktop/gnome/peripherals/touchpad/vert_scroll_enabled"
+#define SCROLLMETHOD_KEY 	"/desktop/gnome/peripherals/touchpad/scroll_method"
 #define HORIZSCROLLENABLED_KEY 	"/desktop/gnome/peripherals/touchpad/horiz_scroll_enabled"
 #define EDGEMOTIONUSEALWAYS_KEY "/desktop/gnome/peripherals/touchpad/edge_motion_use_always"
 #define COASTENABLE_KEY 	"/desktop/gnome/peripherals/touchpad/coast_enable"
diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 6f9b6a3..93706f5 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -299,11 +299,13 @@ g_synaptics_is_horizontal_scroll_enabled (GSynaptics *synaptics)
 
 	if (priv->synclient)
 	{
-		return g_synaptics_get_value_from_synclient ("HorizEdgeScroll") > 0;
+		return (g_synaptics_get_value_from_synclient("HorizEdgeScroll") ||
+		        g_synaptics_get_value_from_synclient("HorizTwoFingerScroll"));
 	}
 	else
 	{
-		return SYNSHM(synaptics)->scroll_dist_horiz > 0;
+		return SYNSHM(synaptics)->scroll_edge_horiz ||
+                    SYNSHM(synaptics)->scroll_twofinger_horiz;
 	}
 }
 
@@ -324,22 +326,33 @@ g_synaptics_horizontal_scroll_delta (GSynaptics *synaptics)
 	}
 }
 
-gboolean
-g_synaptics_is_vertical_scroll_enabled (GSynaptics *synaptics)
+ScrollMethod
+g_synaptics_get_scroll_method (GSynaptics *synaptics)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
+	gboolean edge = 0, twofinger = 0;
+
 	if (!g_synaptics_is_valid(synaptics))
-		return FALSE;
+		return ScrollingDisabled;
 
 	if (priv->synclient)
 	{
-
-		return g_synaptics_get_value_from_synclient ("VertEdgeScroll") > 0;
+		edge = g_synaptics_get_value_from_synclient ("VertEdgeScroll");
+		twofinger = g_synaptics_get_value_from_synclient ("VertTwoFingerScroll");
 	}
 	else
 	{
-		return SYNSHM(synaptics)->scroll_dist_vert > 0;
+		edge = SYNSHM(synaptics)->scroll_edge_vert;
+		twofinger = SYNSHM(synaptics)->scroll_twofinger_vert;
 	}
+
+        if (edge)
+            return EdgeScrolling;
+
+        if (twofinger)
+            return TwoFingerScrolling;
+
+        return ScrollingDisabled;
 }
 
 gint
@@ -667,40 +680,79 @@ void
 g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics, gint enabled)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
+	gboolean edge = 0, twofinger = 0;
+
 	if (!g_synaptics_is_valid(synaptics))
 		return;
+
+	switch (g_synaptics_get_scroll_method (synaptics))
+	{
+	    case EdgeScrolling: edge = 1; break;
+	    case TwoFingerScrolling: twofinger = 1; break;
+	    default:
+		 break;
+	}
+
 	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient HorizEdgeScroll=%d",
-					   enabled);
+					   edge && enabled);
+		g_spawn_command_line_async (command, NULL);
+		g_free (command);
+
+		command = g_strdup_printf ("synclient HorizTwoFingerScroll=%d",
+					   twofinger && enabled);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
 	else
 	{
-		SYNSHM(synaptics)->scroll_edge_horiz = enabled;
+		SYNSHM(synaptics)->scroll_edge_horiz = edge && enabled;
+		SYNSHM(synaptics)->scroll_twofinger_horiz = twofinger &&
+		    enabled;
 	}
 }
 
 void
-g_synaptics_set_vertical_scroll_enabled(GSynaptics *synaptics, gint enabled)
+g_synaptics_set_scroll_method (GSynaptics *synaptics, ScrollMethod method)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
+	gboolean edge = 0, twofinger = 0;
+
 	if (!g_synaptics_is_valid(synaptics))
 		return;
+
+	switch(method)
+	{
+	    case EdgeScrolling:         edge = 1; break;
+	    case TwoFingerScrolling:    twofinger = 1; break;
+	    default:
+		break;
+	}
+
 	if (priv->synclient)
 	{
 		gchar *command;
+
 		command = g_strdup_printf ("synclient VertEdgeScroll=%d",
-					   enabled);
+					   edge);
+		g_spawn_command_line_async (command, NULL);
+		g_free (command);
+
+		command = g_strdup_printf ("synclient VertTwoFingerScroll=%d",
+					   twofinger);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
 	else
 	{
-		SYNSHM(synaptics)->scroll_edge_vert = enabled;
+		SYNSHM(synaptics)->scroll_edge_vert = edge;
+		SYNSHM(synaptics)->scroll_twofinger_vert = twofinger;
 	}
+
+		g_synaptics_set_horizontal_scroll_enabled(synaptics,
+		g_synaptics_is_horizontal_scroll_enabled(synaptics));
 }
 
 void
diff --git a/src/gsynaptics.h b/src/gsynaptics.h
index 8fced65..30bb3af 100644
--- a/src/gsynaptics.h
+++ b/src/gsynaptics.h
@@ -58,6 +58,12 @@ typedef enum
 	TopLeftCorner
 } ScrollTrigger;
 
+typedef enum {
+    ScrollingDisabled = 0,
+    EdgeScrolling = 1,
+    TwoFingerScrolling = 2
+} ScrollMethod;
+
 typedef enum
 {
 	None=0,
@@ -80,7 +86,7 @@ gint		g_synaptics_tap_action                  (GSynaptics *synaptics,
 gint		g_synaptics_sensitivity                 (GSynaptics *synaptics);
 gboolean	g_synaptics_is_horizontal_scroll_enabled(GSynaptics *synaptics);
 gint		g_synaptics_horizontal_scroll_delta     (GSynaptics *synaptics);
-gboolean	g_synaptics_is_vertical_scroll_enabled  (GSynaptics *synaptics);
+ScrollMethod	g_synaptics_get_scroll_method		(GSynaptics *synaptics);
 gint		g_synaptics_vertical_scroll_delta       (GSynaptics *synaptics);
 gboolean	g_synaptics_is_edge_motion_enabled      (GSynaptics *synaptics);
 gboolean	g_synaptics_is_coasting_enabled         (GSynaptics *synaptics);
@@ -108,8 +114,8 @@ void		g_synaptics_set_sensitivity             (GSynaptics *synaptics,
 							 gint        value);
 void		g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics,
 							  gint enabled);
-void		g_synaptics_set_vertical_scroll_enabled	(GSynaptics *synaptics,
-							 gint enabled);
+void		g_synaptics_set_scroll_method		(GSynaptics *synaptics,
+							 ScrollMethod method);
 void		g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics,
 							 gint        delta);
 void		g_synaptics_set_vertical_scroll_delta   (GSynaptics *synaptics,
diff --git a/src/main.c b/src/main.c
index c7089f3..fbbb19b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -131,20 +131,30 @@ cb_touchpad_toggled (GtkToggleButton *button, GladeXML *dialog)
 }
 
 static void
-cb_vertical_scroll_toggled (GtkToggleButton *button, GladeXML *dialog)
+rd_scroll_method_toggled (GtkToggleButton *button, GladeXML *dialog)
 {
 	GtkWidget *widget;
 	GSynaptics *synaptics;
-	gboolean check;
-
-	widget = WID ("vertical_scroll_box");
-	check = gtk_toggle_button_get_active (button);
-	gtk_widget_set_sensitive (widget, check);
+	ScrollMethod method = ScrollingDisabled;
+
+	widget = WID ("twofinger_scroll_radio");
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget)))
+	    method = TwoFingerScrolling;
+	else {
+	    widget = WID("edge_scroll_radio");
+	    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+		method = EdgeScrolling;
+	}
 
 	synaptics = g_object_get_qdata (G_OBJECT(dialog), synaptics_quark);
 
-        g_synaptics_set_vertical_scroll_enabled(synaptics, check);
-	gconf_client_set_int (gconf, VERTSCROLLENABLED_KEY, check, NULL);
+	g_synaptics_set_scroll_method(synaptics, method);
+	gconf_client_set_int (gconf, SCROLLMETHOD_KEY, method, NULL);
+
+	widget = WID("horizontal_scroll_check");
+	gtk_widget_set_sensitive(widget, (method != ScrollingDisabled));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
+		g_synaptics_is_horizontal_scroll_enabled(synaptics));
 }
 
 static void
@@ -517,7 +527,7 @@ setup_dialog (GladeXML *dialog)
 {
 	GdkPixbuf *icon_pixbuf = NULL;
 	GtkWidget *widget, *button;
-	GtkWidget *check, *scale;
+	GtkWidget *check, *scale, *radio;
 	GSynaptics *synaptics;
 	
 	gchar *path;
@@ -571,12 +581,25 @@ setup_dialog (GladeXML *dialog)
 	g_signal_connect (G_OBJECT (scale), "change-value",
 			  G_CALLBACK (cb_vertical_scroll_change), dialog);
 
-	check = WID ("vertical_scroll_check");
-	value = g_synaptics_is_vertical_scroll_enabled (synaptics);
-	g_signal_connect (G_OBJECT (check), "toggled",
-			  G_CALLBACK (cb_vertical_scroll_toggled), dialog);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
-	    			      value);
+	value = g_synaptics_get_scroll_method(synaptics);
+
+	radio = WID ("disable_scroll_radio");
+	g_signal_connect (G_OBJECT (radio), "toggled",
+			  G_CALLBACK (rd_scroll_method_toggled), dialog);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio),
+				      value == ScrollingDisabled);
+
+	radio = WID ("twofinger_scroll_radio");
+	g_signal_connect (G_OBJECT (radio), "toggled",
+			  G_CALLBACK (rd_scroll_method_toggled), dialog);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio),
+				      value == TwoFingerScrolling);
+
+	radio = WID ("edge_scroll_radio");
+	g_signal_connect (G_OBJECT (radio), "toggled",
+			  G_CALLBACK (rd_scroll_method_toggled), dialog);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio),
+				      value == EdgeScrolling);
 
 	scale = WID ("horizontal_scroll_scale");
 	num = g_synaptics_horizontal_scroll_delta (synaptics);
@@ -585,6 +608,7 @@ setup_dialog (GladeXML *dialog)
 			  G_CALLBACK (cb_horizontal_scroll_change), dialog);
 
 	check = WID ("horizontal_scroll_check");
+	gtk_widget_set_sensitive(check, (value != ScrollingDisabled));
 	value = g_synaptics_is_horizontal_scroll_enabled (synaptics);
 	g_signal_connect (G_OBJECT (check), "toggled",
 			  G_CALLBACK (cb_horizontal_scroll_toggled), dialog);
-- 
1.6.0.6



Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gsynaptics.spec	28 Feb 2009 23:51:50 -0000	1.20
+++ gsynaptics.spec	2 Apr 2009 00:34:30 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gsynaptics
 Version:        0.9.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -12,9 +12,14 @@
 Patch0:         gsynaptics-0.9.14-dot-fixes.patch
 Patch1:         gsynaptics-0.9.14-do-not-set-zero.patch
 Patch2:         gsynaptics-0.9.14-pixmap.patch
+# 3 4 5 are merged upstream
 Patch3:         gsynaptics-0.9.14-fix-tap-statecheck.patch
 Patch4:         gsynaptics-0.9.14-enable-tapping.patch
 Patch5:         gsynaptics-0.9.14-dont-reset-taptime.patch
+Patch6:         gsynaptics-0.9.14-scrolling-checkboxes.patch
+Patch7:         gsynaptics-0.9.14-driver-header.patch
+Patch8:         gsynaptics-0.9.14-fix-scrolling-checkboxes.patch
+Patch9:         gsynaptics-0.9.14-scrollmethods.patch
 
 Source1:        %{name}-touchpad.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,8 +29,10 @@
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils gettext
 BuildRequires:  gnome-doc-utils
+BuildRequires:  xorg-x11-drv-synaptics-devel
+BuildRequires:  libtool pkgconfig intltool
 
-Requires:       synaptics
+Requires:       xorg-x11-drv-synaptics
 
 # Use ExclusiveArch just as synaptics does; see
 # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup
@@ -49,8 +56,13 @@
 %patch3 -p1 -b .tap-checkbox
 %patch4 -p1 -b .tapping
 %patch5 -p1 -b .taptime
+%patch6 -p1 -b .scrl-chkbx
+%patch7 -p1 -b .header
+%patch8 -p1 -b .scrl-chkbx-fix
+%patch9 -p1 -b .scrollmethods
 
 %build
+autoreconf -v --install --force || exit 1
 %configure
 make %{?_smp_mflags}
 
@@ -91,6 +103,18 @@
 
 
 %changelog
+* Mon Apr 2 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-5
+- gsynaptics-0.9.14-scrolling-checkboxes.patch: set checkboxes based on the
+  scrolling enabled/disabled property, not on the delta.
+- gsynaptics-0.9.14-driver-header.patch: use the driver's header file instead
+  of a custom synshm.h.
+- Require xorg-x11-drv-synaptics now that we use the driver header, and force
+  an autoreconf to include it properly.
+- gsynaptics-0.9.14-fix-scrolling-checkboxes.patch: fix scrolling
+  enabled/disabled checkboxes
+- gsynaptics-0.9.14-scrollmethod.patch: provide radiobuttons instead
+  of a checkbox for scrolling methods.
+
 * Sun Mar 01 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-4
 - gsynaptics-0.9.14-fix-tap-statecheck.patch: fix check for tapping enabled or
   disabled, should take TapButton1 into account.



From glommer at fedoraproject.org  Thu Apr  2 01:07:40 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Thu,  2 Apr 2009 01:07:40 +0000 (UTC)
Subject: rpms/qemu/devel 01-tls-handshake-fix.patch, NONE,
	1.1 02-vnc-monitor-info.patch, NONE,
	1.1 03-display-keymaps.patch, NONE, 1.1 04-vnc-struct.patch,
	NONE, 1.1 05-vnc-tls-vencrypt.patch, NONE, 1.1 06-vnc-sasl.patch,
	NONE, 1.1 07-vnc-monitor-authinfo.patch, NONE,
	1.1 08-vnc-acl-mgmt.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 kvm-upstream-ppc.patch, 1.2, 1.3 qemu.spec, 1.70,
	1.71 sources, 1.13, 1.14
Message-ID: <20090402010740.3B61A70120@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7256

Modified Files:
	.cvsignore kvm-upstream-ppc.patch qemu.spec sources 
Added Files:
	01-tls-handshake-fix.patch 02-vnc-monitor-info.patch 
	03-display-keymaps.patch 04-vnc-struct.patch 
	05-vnc-tls-vencrypt.patch 06-vnc-sasl.patch 
	07-vnc-monitor-authinfo.patch 08-vnc-acl-mgmt.patch 
Log Message:
* Wed Apr 01 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-1
- Include debuginfo for qemu-img
- Do not require qemu-common for qemu-img
- Explicitly own each of the firmware files
- remove firmwares for ppc and sparc. They should be provided by an external package.
  Not that the packages exists for sparc in the secondary arch repo as noarch, but they
  don't automatically get into main repos. Unfortunately it's the best we can do right
  now.
- rollback a bit in time. Snapshot from avi's maint/2.6.30
  - this requires the sasl patches to come back.
  - with-patched-kernel comes back.



01-tls-handshake-fix.patch:

--- NEW FILE 01-tls-handshake-fix.patch ---
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth
 	    VNC_DEBUG("Failed to complete TLS\n");
 	    return 0;
 	}
-
-	if (vs->wiremode == VNC_WIREMODE_TLS) {
-	    VNC_DEBUG("Starting VeNCrypt subauth\n");
-	    return start_auth_vencrypt_subauth(vs);
-	} else {
-	    VNC_DEBUG("TLS handshake blocked\n");
-	    return 0;
-	}
     }
     return 0;
 }

02-vnc-monitor-info.patch:

--- NEW FILE 02-vnc-monitor-info.patch ---
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -166,19 +166,136 @@ struct VncState
 static VncDisplay *vnc_display; /* needed for info vnc */
 static DisplayChangeListener *dcl;
 
+static char *addr_to_string(const char *format,
+			    struct sockaddr_storage *sa,
+			    socklen_t salen) {
+    char *addr;
+    char host[NI_MAXHOST];
+    char serv[NI_MAXSERV];
+    int err;
+
+    if ((err = getnameinfo((struct sockaddr *)sa, salen,
+			   host, sizeof(host),
+			   serv, sizeof(serv),
+			   NI_NUMERICHOST | NI_NUMERICSERV)) != 0) {
+	VNC_DEBUG("Cannot resolve address %d: %s\n",
+		  err, gai_strerror(err));
+	return NULL;
+    }
+
+    if (asprintf(&addr, format, host, serv) < 0)
+	return NULL;
+
+    return addr;
+}
+
+static char *vnc_socket_local_addr(const char *format, int fd) {
+    struct sockaddr_storage sa;
+    socklen_t salen;
+
+    salen = sizeof(sa);
+    if (getsockname(fd, (struct sockaddr*)&sa, &salen) < 0)
+	return NULL;
+
+    return addr_to_string(format, &sa, salen);
+}
+
+static char *vnc_socket_remote_addr(const char *format, int fd) {
+    struct sockaddr_storage sa;
+    socklen_t salen;
+
+    salen = sizeof(sa);
+    if (getpeername(fd, (struct sockaddr*)&sa, &salen) < 0)
+	return NULL;
+
+    return addr_to_string(format, &sa, salen);
+}
+
+static const char *vnc_auth_name(VncDisplay *vd) {
+    switch (vd->auth) {
+    case VNC_AUTH_INVALID:
+	return "invalid";
+    case VNC_AUTH_NONE:
+	return "none";
+    case VNC_AUTH_VNC:
+	return "vnc";
+    case VNC_AUTH_RA2:
+	return "ra2";
+    case VNC_AUTH_RA2NE:
+	return "ra2ne";
+    case VNC_AUTH_TIGHT:
+	return "tight";
+    case VNC_AUTH_ULTRA:
+	return "ultra";
+    case VNC_AUTH_TLS:
+	return "tls";
+    case VNC_AUTH_VENCRYPT:
+#ifdef CONFIG_VNC_TLS
+	switch (vd->subauth) {
+	case VNC_AUTH_VENCRYPT_PLAIN:
+	    return "vencrypt+plain";
+	case VNC_AUTH_VENCRYPT_TLSNONE:
+	    return "vencrypt+tls+none";
+	case VNC_AUTH_VENCRYPT_TLSVNC:
+	    return "vencrypt+tls+vnc";
+	case VNC_AUTH_VENCRYPT_TLSPLAIN:
+	    return "vencrypt+tls+plain";
+	case VNC_AUTH_VENCRYPT_X509NONE:
+	    return "vencrypt+x509+none";
+	case VNC_AUTH_VENCRYPT_X509VNC:
+	    return "vencrypt+x509+vnc";
+	case VNC_AUTH_VENCRYPT_X509PLAIN:
+	    return "vencrypt+x509+plain";
+	default:
+	    return "vencrypt";
+	}
+#else
+	return "vencrypt";
+#endif
+    }
+    return "unknown";
+}
+
+#define VNC_SOCKET_FORMAT_PRETTY "local %s:%s"
+
+static void do_info_vnc_client(VncState *client)
+{
+    char *clientAddr =
+	vnc_socket_remote_addr("     address: %s:%s\n",
+			       client->csock);
+    if (!clientAddr)
+	return;
+
+    term_puts("Client:\n");
+    term_puts(clientAddr);
+    free(clientAddr);
+}
+
 void do_info_vnc(void)
 {
-    if (vnc_display == NULL || vnc_display->display == NULL)
-	term_printf("VNC server disabled\n");
-    else {
-	term_printf("VNC server active on: ");
-	term_print_filename(vnc_display->display);
-	term_printf("\n");
-
-	if (vnc_display->clients == NULL)
-	    term_printf("No client connected\n");
-	else
-	    term_printf("Client connected\n");
+    if (vnc_display == NULL || vnc_display->display == NULL) {
+	term_printf("Server: disabled\n");
+    } else {
+	char *serverAddr = vnc_socket_local_addr("     address: %s:%s\n",
+						 vnc_display->lsock);
+
+	if (!serverAddr)
+	    return;
+
+	term_puts("Server:\n");
+	term_puts(serverAddr);
+	free(serverAddr);
+	term_printf("        auth: %s\n", vnc_auth_name(vnc_display));
+
+	if (vnc_display->clients) {
+	    VncState *client = vnc_display->clients;
+	    while (client) {
+		do_info_vnc_client(client);
+		client = client->next;
+	    }
+	} else {
+	    term_printf("Client: none\n");
+	}
     }
 }
 

03-display-keymaps.patch:

--- NEW FILE 03-display-keymaps.patch ---
Index: qemu-kvm-0.10/qemu/Makefile
===================================================================
--- qemu-kvm-0.10.orig/qemu/Makefile
+++ qemu-kvm-0.10/qemu/Makefile
@@ -141,6 +141,7 @@ endif
 AUDIO_OBJS+= wavcapture.o
 OBJS+=$(addprefix audio/, $(AUDIO_OBJS))
 
+OBJS+=keymaps.o
 ifdef CONFIG_SDL
 OBJS+=sdl.o x_keymap.o
 endif
@@ -165,15 +166,17 @@ LIBS+=$(VDE_LIBS)
 
 cocoa.o: cocoa.m
 
-sdl.o: sdl.c keymaps.c sdl_keysym.h
+keymaps.o: keymaps.c keymaps.h
+
+sdl.o: sdl.c keymaps.h sdl_keysym.h
 
 sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
 
-vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h
+vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h
 
 vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 
-curses.o: curses.c keymaps.c curses_keys.h
+curses.o: curses.c keymaps.h curses_keys.h
 
 bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
 
Index: qemu-kvm-0.10/qemu/curses.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/curses.c
+++ qemu-kvm-0.10/qemu/curses.c
@@ -158,7 +158,6 @@ static void curses_cursor_position(Displ
 /* generic keyboard conversion */
 
 #include "curses_keys.h"
-#include "keymaps.c"
 
 static kbd_layout_t *kbd_layout = 0;
 static int keycode2keysym[CURSES_KEYS];
@@ -311,7 +310,7 @@ static void curses_keyboard_setup(void)
         keyboard_layout = "en-us";
 #endif
     if(keyboard_layout) {
-        kbd_layout = init_keyboard_layout(keyboard_layout);
+        kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);
         if (!kbd_layout)
             exit(1);
     }
Index: qemu-kvm-0.10/qemu/curses_keys.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/curses_keys.h
+++ qemu-kvm-0.10/qemu/curses_keys.h
@@ -21,6 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#include "keymaps.h"
+
+
 #define KEY_RELEASE         0x80
 #define KEY_MASK            0x7f
 #define SHIFT_CODE          0x2a
@@ -239,11 +243,6 @@ static const int curses2keysym[CURSES_KE
 
 };
 
-typedef struct {
-	const char* name;
-	int keysym;
-} name2keysym_t;
-
 static const name2keysym_t name2keysym[] = {
     /* Plain ASCII */
     { "space", 0x020 },
Index: qemu-kvm-0.10/qemu/keymaps.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/keymaps.c
+++ qemu-kvm-0.10/qemu/keymaps.c
@@ -22,34 +22,20 @@
  * THE SOFTWARE.
  */
 
-static int get_keysym(const char *name)
+#include "keymaps.h"
+#include "sysemu.h"
+
+static int get_keysym(const name2keysym_t *table,
+		      const char *name)
 {
     const name2keysym_t *p;
-    for(p = name2keysym; p->name != NULL; p++) {
+    for(p = table; p->name != NULL; p++) {
         if (!strcmp(p->name, name))
             return p->keysym;
     }
     return 0;
 }
 
-struct key_range {
-    int start;
-    int end;
-    struct key_range *next;
-};
-
-#define MAX_NORMAL_KEYCODE 512
-#define MAX_EXTRA_COUNT 256
-typedef struct {
-    uint16_t keysym2keycode[MAX_NORMAL_KEYCODE];
-    struct {
-	int keysym;
-	uint16_t keycode;
-    } keysym2keycode_extra[MAX_EXTRA_COUNT];
-    int extra_count;
-    struct key_range *keypad_range;
-    struct key_range *numlock_range;
-} kbd_layout_t;
 
 static void add_to_key_range(struct key_range **krp, int code) {
     struct key_range *kr;
@@ -73,7 +59,8 @@ static void add_to_key_range(struct key_
     }
 }
 
-static kbd_layout_t *parse_keyboard_layout(const char *language,
+static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
+					   const char *language,
 					   kbd_layout_t * k)
 {
     FILE *f;
@@ -102,7 +89,7 @@ static kbd_layout_t *parse_keyboard_layo
 	if (!strncmp(line, "map ", 4))
 	    continue;
 	if (!strncmp(line, "include ", 8)) {
-	    parse_keyboard_layout(line + 8, k);
+	    parse_keyboard_layout(table, line + 8, k);
         } else {
 	    char *end_of_keysym = line;
 	    while (*end_of_keysym != 0 && *end_of_keysym != ' ')
@@ -110,7 +97,7 @@ static kbd_layout_t *parse_keyboard_layo
 	    if (*end_of_keysym) {
 		int keysym;
 		*end_of_keysym = 0;
-		keysym = get_keysym(line);
+		keysym = get_keysym(table, line);
 		if (keysym == 0) {
                     //		    fprintf(stderr, "Warning: unknown keysym %s\n", line);
 		} else {
@@ -154,12 +141,14 @@ static kbd_layout_t *parse_keyboard_layo
     return k;
 }
 
-static void *init_keyboard_layout(const char *language)
+
+void *init_keyboard_layout(const name2keysym_t *table, const char *language)
 {
-    return parse_keyboard_layout(language, 0);
+    return parse_keyboard_layout(table, language, 0);
 }
 
-static int keysym2scancode(void *kbd_layout, int keysym)
+
+int keysym2scancode(void *kbd_layout, int keysym)
 {
     kbd_layout_t *k = kbd_layout;
     if (keysym < MAX_NORMAL_KEYCODE) {
@@ -180,7 +169,7 @@ static int keysym2scancode(void *kbd_lay
     return 0;
 }
 
-static inline int keycode_is_keypad(void *kbd_layout, int keycode)
+int keycode_is_keypad(void *kbd_layout, int keycode)
 {
     kbd_layout_t *k = kbd_layout;
     struct key_range *kr;
@@ -191,7 +180,7 @@ static inline int keycode_is_keypad(void
     return 0;
 }
 
-static inline int keysym_is_numlock(void *kbd_layout, int keysym)
+int keysym_is_numlock(void *kbd_layout, int keysym)
 {
     kbd_layout_t *k = kbd_layout;
     struct key_range *kr;
Index: qemu-kvm-0.10/qemu/keymaps.h
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/keymaps.h
@@ -0,0 +1,60 @@
+/*
+ * QEMU keysym to keycode conversion using rdesktop keymaps
+ *
+ * Copyright (c) 2004 Johannes Schindelin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __QEMU_KEYMAPS_H__
+#define __QEMU_KEYMAPS_H__
+
+#include "qemu-common.h"
+
+typedef struct {
+	const char* name;
+	int keysym;
+} name2keysym_t;
+
+struct key_range {
+    int start;
+    int end;
+    struct key_range *next;
+};
+
+#define MAX_NORMAL_KEYCODE 512
+#define MAX_EXTRA_COUNT 256
+typedef struct {
+    uint16_t keysym2keycode[MAX_NORMAL_KEYCODE];
+    struct {
+	int keysym;
+	uint16_t keycode;
+    } keysym2keycode_extra[MAX_EXTRA_COUNT];
+    int extra_count;
+    struct key_range *keypad_range;
+    struct key_range *numlock_range;
+} kbd_layout_t;
+
+
+void *init_keyboard_layout(const name2keysym_t *table, const char *language);
+int keysym2scancode(void *kbd_layout, int keysym);
+int keycode_is_keypad(void *kbd_layout, int keycode);
+int keysym_is_numlock(void *kbd_layout, int keysym);
+
+#endif /* __QEMU_KEYMAPS_H__ */
Index: qemu-kvm-0.10/qemu/sdl.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/sdl.c
+++ qemu-kvm-0.10/qemu/sdl.c
@@ -109,7 +109,6 @@ static void sdl_resize(DisplayState *ds)
 /* generic keyboard conversion */
 
 #include "sdl_keysym.h"
-#include "keymaps.c"
 
 static kbd_layout_t *kbd_layout = NULL;
 
@@ -677,7 +676,7 @@ void sdl_display_init(DisplayState *ds, 
         keyboard_layout = "en-us";
 #endif
     if(keyboard_layout) {
-        kbd_layout = init_keyboard_layout(keyboard_layout);
+        kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);
         if (!kbd_layout)
             exit(1);
     }
Index: qemu-kvm-0.10/qemu/sdl_keysym.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/sdl_keysym.h
+++ qemu-kvm-0.10/qemu/sdl_keysym.h
@@ -1,7 +1,6 @@
-typedef struct {
-	const char* name;
-	int keysym;
-} name2keysym_t;
+
+#include "keymaps.h"
+
 static const name2keysym_t name2keysym[]={
 /* ascii */
     { "space",                0x020},
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -35,7 +35,6 @@
 
 #include "vnc.h"
 #include "vnc_keysym.h"
-#include "keymaps.c"
 #include "d3des.h"
 
 #ifdef CONFIG_VNC_TLS
@@ -2420,9 +2419,9 @@ void vnc_display_init(DisplayState *ds)
     vs->ds = ds;
 
     if (keyboard_layout)
-        vs->kbd_layout = init_keyboard_layout(keyboard_layout);
+        vs->kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);
     else
-        vs->kbd_layout = init_keyboard_layout("en-us");
+        vs->kbd_layout = init_keyboard_layout(name2keysym, "en-us");
 
     if (!vs->kbd_layout)
 	exit(1);
Index: qemu-kvm-0.10/qemu/vnc_keysym.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc_keysym.h
+++ qemu-kvm-0.10/qemu/vnc_keysym.h
@@ -1,7 +1,6 @@
-typedef struct {
-	const char* name;
-	int keysym;
-} name2keysym_t;
+
+#include "keymaps.h"
+
 static const name2keysym_t name2keysym[]={
 /* ascii */
     { "space",                0x020},

04-vnc-struct.patch:

--- NEW FILE 04-vnc-struct.patch ---
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2006 Anthony Liguori <anthony at codemonkey.ws>
  * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2009 Red Hat, Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,25 +24,16 @@
  * THE SOFTWARE.
  */
 
-#include "qemu-common.h"
-#include "console.h"
+#include "vnc.h"
 #include "sysemu.h"
 #include "qemu_socket.h"
 #include "qemu-timer.h"
-#include "audio/audio.h"
-#include <zlib.h>
 
 #define VNC_REFRESH_INTERVAL (1000 / 30)
 
-#include "vnc.h"
 #include "vnc_keysym.h"
 #include "d3des.h"
 
-#ifdef CONFIG_VNC_TLS
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-#endif /* CONFIG_VNC_TLS */
-
 // #define _VNC_DEBUG 1
 
 #ifdef _VNC_DEBUG
@@ -64,103 +56,6 @@ static void vnc_debug_gnutls_log(int lev
     } \
 }
 
-typedef struct Buffer
-{
-    size_t capacity;
-    size_t offset;
-    uint8_t *buffer;
-} Buffer;
-
-typedef struct VncState VncState;
-
-typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len);
-
-typedef void VncWritePixels(VncState *vs, void *data, int size);
-
-typedef void VncSendHextileTile(VncState *vs,
-                                int x, int y, int w, int h,
-                                void *last_bg,
-                                void *last_fg,
-                                int *has_bg, int *has_fg);
-
-#define VNC_MAX_WIDTH 2048
-#define VNC_MAX_HEIGHT 2048
-#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32))
-
-#define VNC_AUTH_CHALLENGE_SIZE 16
-
-typedef struct VncDisplay VncDisplay;
-
-struct VncDisplay
-{
-    int lsock;
-    DisplayState *ds;
-    VncState *clients;
-    kbd_layout_t *kbd_layout;
-
-    char *display;
-    char *password;
-    int auth;
-#ifdef CONFIG_VNC_TLS
-    int subauth;
-    int x509verify;
-
-    char *x509cacert;
-    char *x509cacrl;
-    char *x509cert;
-    char *x509key;
-#endif
-};
-
-struct VncState
-{
-    QEMUTimer *timer;
-    int csock;
-    DisplayState *ds;
-    VncDisplay *vd;
-    int need_update;
-    uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS];
-    char *old_data;
-    uint32_t features;
-    int absolute;
-    int last_x;
-    int last_y;
-
-    uint32_t vnc_encoding;
-    uint8_t tight_quality;
-    uint8_t tight_compression;
-
-    int major;
-    int minor;
-
-    char challenge[VNC_AUTH_CHALLENGE_SIZE];
-
-#ifdef CONFIG_VNC_TLS
-    int wiremode;
-    gnutls_session_t tls_session;
-#endif
-
-    Buffer output;
-    Buffer input;
-    /* current output mode information */
-    VncWritePixels *write_pixels;
-    VncSendHextileTile *send_hextile_tile;
-    DisplaySurface clientds, serverds;
-
-    CaptureVoiceOut *audio_cap;
-    struct audsettings as;
-
-    VncReadEvent *read_handler;
-    size_t read_handler_expect;
-    /* input */
-    uint8_t modifiers_state[256];
-
-    Buffer zlib;
-    Buffer zlib_tmp;
-    z_stream zlib_stream[4];
-
-    VncState *next;
-};
 
 static VncDisplay *vnc_display; /* needed for info vnc */
 static DisplayChangeListener *dcl;
Index: qemu-kvm-0.10/qemu/vnc.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.h
+++ qemu-kvm-0.10/qemu/vnc.h
@@ -1,5 +1,148 @@
-#ifndef __VNCTIGHT_H
-#define __VNCTIGHT_H
+/*
+ * QEMU VNC display driver
+ *
+ * Copyright (C) 2006 Anthony Liguori <anthony at codemonkey.ws>
+ * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __QEMU_VNC_H
+#define __QEMU_VNC_H
+
+#include "qemu-common.h"
+#include "console.h"
+#include "audio/audio.h"
+#include <zlib.h>
+
+#ifdef CONFIG_VNC_TLS
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#endif /* CONFIG_VNC_TLS */
+
+#include "keymaps.h"
+
+/*****************************************************************************
+ *
+ * Core data structures
+ *
+ *****************************************************************************/
+
+typedef struct Buffer
+{
+    size_t capacity;
+    size_t offset;
+    uint8_t *buffer;
+} Buffer;
+
+typedef struct VncState VncState;
+
+typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len);
+
+typedef void VncWritePixels(VncState *vs, void *data, int size);
+
+typedef void VncSendHextileTile(VncState *vs,
+                                int x, int y, int w, int h,
+                                void *last_bg,
+                                void *last_fg,
+                                int *has_bg, int *has_fg);
+
+#define VNC_MAX_WIDTH 2048
+#define VNC_MAX_HEIGHT 2048
+#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32))
+
+#define VNC_AUTH_CHALLENGE_SIZE 16
+
+typedef struct VncDisplay VncDisplay;
+
+struct VncDisplay
+{
+    int lsock;
+    DisplayState *ds;
+    VncState *clients;
+    kbd_layout_t *kbd_layout;
+
+    char *display;
+    char *password;
+    int auth;
+#ifdef CONFIG_VNC_TLS
+    int subauth;
+    int x509verify;
+
+    char *x509cacert;
+    char *x509cacrl;
+    char *x509cert;
+    char *x509key;
+#endif
+};
+
+struct VncState
+{
+    QEMUTimer *timer;
+    int csock;
+    DisplayState *ds;
+    VncDisplay *vd;
+    int need_update;
+    uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS];
+    char *old_data;
+    uint32_t features;
+    int absolute;
+    int last_x;
+    int last_y;
+
+    uint32_t vnc_encoding;
+    uint8_t tight_quality;
+    uint8_t tight_compression;
+
+    int major;
+    int minor;
+
+    char challenge[VNC_AUTH_CHALLENGE_SIZE];
+
+#ifdef CONFIG_VNC_TLS
+    int wiremode;
+    gnutls_session_t tls_session;
+#endif
+
+    Buffer output;
+    Buffer input;
+    /* current output mode information */
+    VncWritePixels *write_pixels;
+    VncSendHextileTile *send_hextile_tile;
+    DisplaySurface clientds, serverds;
+
+    CaptureVoiceOut *audio_cap;
+    struct audsettings as;
+
+    VncReadEvent *read_handler;
+    size_t read_handler_expect;
+    /* input */
+    uint8_t modifiers_state[256];
+
+    Buffer zlib;
+    Buffer zlib_tmp;
+    z_stream zlib_stream[4];
+
+    VncState *next;
+};
+
 
 /*****************************************************************************
  *
@@ -111,4 +254,4 @@ enum {
 #define VNC_FEATURE_ZLIB_MASK                (1 << VNC_FEATURE_ZLIB)
 #define VNC_FEATURE_COPYRECT_MASK            (1 << VNC_FEATURE_COPYRECT)
 
-#endif /* __VNCTIGHT_H */
+#endif /* __QEMU_VNC_H */

05-vnc-tls-vencrypt.patch:

--- NEW FILE 05-vnc-tls-vencrypt.patch ---
Index: qemu-kvm-0.10/qemu/Makefile
===================================================================
--- qemu-kvm-0.10.orig/qemu/Makefile
+++ qemu-kvm-0.10/qemu/Makefile
@@ -149,6 +149,9 @@ ifdef CONFIG_CURSES
 OBJS+=curses.o
 endif
 OBJS+=vnc.o d3des.o
+ifdef CONFIG_VNC_TLS
+OBJS+=vnc-tls.o vnc-auth-vencrypt.o
+endif
 
 ifdef CONFIG_COCOA
 OBJS+=cocoa.o
@@ -172,10 +175,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h
 
 sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
 
-vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h
+vnc.h: vnc-tls.h vnc-auth-vencrypt.h keymaps.h
+
+vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h
 
 vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 
+vnc-tls.o: vnc-tls.c vnc.h
+
+vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h
+
 curses.o: curses.c keymaps.h curses_keys.h
 
 bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
Index: qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c
@@ -0,0 +1,167 @@
+/*
+ * QEMU VNC display driver: VeNCrypt authentication setup
+ *
+ * Copyright (C) 2006 Anthony Liguori <anthony at codemonkey.ws>
+ * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "vnc.h"
+
+
+static void start_auth_vencrypt_subauth(VncState *vs)
+{
+    switch (vs->vd->subauth) {
+    case VNC_AUTH_VENCRYPT_TLSNONE:
+    case VNC_AUTH_VENCRYPT_X509NONE:
+       VNC_DEBUG("Accept TLS auth none\n");
+       vnc_write_u32(vs, 0); /* Accept auth completion */
+       start_client_init(vs);
+       break;
+
+    case VNC_AUTH_VENCRYPT_TLSVNC:
+    case VNC_AUTH_VENCRYPT_X509VNC:
+       VNC_DEBUG("Start TLS auth VNC\n");
+       start_auth_vnc(vs);
+       break;
+
+    default: /* Should not be possible, but just in case */
+       VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
+       vnc_write_u8(vs, 1);
+       if (vs->minor >= 8) {
+           static const char err[] = "Unsupported authentication type";
+           vnc_write_u32(vs, sizeof(err));
+           vnc_write(vs, err, sizeof(err));
+       }
+       vnc_client_error(vs);
+    }
+}
+
+static void vnc_tls_handshake_io(void *opaque);
+
+static int vnc_start_vencrypt_handshake(struct VncState *vs) {
+    int ret;
+
+    if ((ret = gnutls_handshake(vs->tls.session)) < 0) {
+       if (!gnutls_error_is_fatal(ret)) {
+           VNC_DEBUG("Handshake interrupted (blocking)\n");
+           if (!gnutls_record_get_direction(vs->tls.session))
+               qemu_set_fd_handler(vs->csock, vnc_tls_handshake_io, NULL, vs);
+           else
+               qemu_set_fd_handler(vs->csock, NULL, vnc_tls_handshake_io, vs);
+           return 0;
+       }
+       VNC_DEBUG("Handshake failed %s\n", gnutls_strerror(ret));
+       vnc_client_error(vs);
+       return -1;
+    }
+
+    if (vs->vd->tls.x509verify) {
+	if (vnc_tls_validate_certificate(vs) < 0) {
+	    VNC_DEBUG("Client verification failed\n");
+	    vnc_client_error(vs);
+	    return -1;
+	} else {
+	    VNC_DEBUG("Client verification passed\n");
+	}
+    }
+
+    VNC_DEBUG("Handshake done, switching to TLS data mode\n");
+    vs->tls.wiremode = VNC_WIREMODE_TLS;
+    qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs);
+
+    start_auth_vencrypt_subauth(vs);
+
+    return 0;
+}
+
+static void vnc_tls_handshake_io(void *opaque) {
+    struct VncState *vs = (struct VncState *)opaque;
+
+    VNC_DEBUG("Handshake IO continue\n");
+    vnc_start_vencrypt_handshake(vs);
+}
+
+
+
+#define NEED_X509_AUTH(vs)			      \
+    ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE ||   \
+     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC ||    \
+     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN)
+
+
+static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len)
+{
+    int auth = read_u32(data, 0);
+
+    if (auth != vs->vd->subauth) {
+	VNC_DEBUG("Rejecting auth %d\n", auth);
+	vnc_write_u8(vs, 0); /* Reject auth */
+	vnc_flush(vs);
+	vnc_client_error(vs);
+    } else {
+	VNC_DEBUG("Accepting auth %d, setting up TLS for handshake\n", auth);
+	vnc_write_u8(vs, 1); /* Accept auth */
+	vnc_flush(vs);
+
+	if (vnc_tls_client_setup(vs, NEED_X509_AUTH(vs)) < 0) {
+	    VNC_DEBUG("Failed to setup TLS\n");
+	    return 0;
+	}
+
+	VNC_DEBUG("Start TLS VeNCrypt handshake process\n");
+	if (vnc_start_vencrypt_handshake(vs) < 0) {
+	    VNC_DEBUG("Failed to start TLS handshake\n");
+	    return 0;
+	}
+    }
+    return 0;
+}
+
+static int protocol_client_vencrypt_init(VncState *vs, uint8_t *data, size_t len)
+{
+    if (data[0] != 0 ||
+	data[1] != 2) {
+	VNC_DEBUG("Unsupported VeNCrypt protocol %d.%d\n", (int)data[0], (int)data[1]);
+	vnc_write_u8(vs, 1); /* Reject version */
+	vnc_flush(vs);
+	vnc_client_error(vs);
+    } else {
+	VNC_DEBUG("Sending allowed auth %d\n", vs->vd->subauth);
+	vnc_write_u8(vs, 0); /* Accept version */
+	vnc_write_u8(vs, 1); /* Number of sub-auths */
+	vnc_write_u32(vs, vs->vd->subauth); /* The supported auth */
+	vnc_flush(vs);
+	vnc_read_when(vs, protocol_client_vencrypt_auth, 4);
+    }
+    return 0;
+}
+
+
+void start_auth_vencrypt(VncState *vs)
+{
+    /* Send VeNCrypt version 0.2 */
+    vnc_write_u8(vs, 0);
+    vnc_write_u8(vs, 2);
+
+    vnc_read_when(vs, protocol_client_vencrypt_init, 2);
+}
+
Index: qemu-kvm-0.10/qemu/vnc-auth-vencrypt.h
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/vnc-auth-vencrypt.h
@@ -0,0 +1,33 @@
+/*
+ * QEMU VNC display driver
+ *
+ * Copyright (C) 2006 Anthony Liguori <anthony at codemonkey.ws>
+ * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#ifndef __QEMU_VNC_AUTH_VENCRYPT_H__
+#define __QEMU_VNC_AUTH_VENCRYPT_H__
+
+void start_auth_vencrypt(VncState *vs);
+
+#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */
Index: qemu-kvm-0.10/qemu/vnc-tls.c
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/vnc-tls.c
@@ -0,0 +1,414 @@
+/*
+ * QEMU VNC display driver: TLS helpers
+ *
+ * Copyright (C) 2006 Anthony Liguori <anthony at codemonkey.ws>
+ * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "vnc.h"
+#include "qemu_socket.h"
+
+#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2
+/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */
+static void vnc_debug_gnutls_log(int level, const char* str) {
+    VNC_DEBUG("%d %s", level, str);
+}
+#endif /* defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 */
+
+
+#define DH_BITS 1024
+static gnutls_dh_params_t dh_params;
+
+static int vnc_tls_initialize(void)
+{
+    static int tlsinitialized = 0;
+
+    if (tlsinitialized)
+	return 1;
+
+    if (gnutls_global_init () < 0)
+	return 0;
+
+    /* XXX ought to re-generate diffie-hellmen params periodically */
+    if (gnutls_dh_params_init (&dh_params) < 0)
+	return 0;
+    if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0)
+	return 0;
+
+#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2
+    gnutls_global_set_log_level(10);
+    gnutls_global_set_log_function(vnc_debug_gnutls_log);
+#endif
+
+    tlsinitialized = 1;
+
+    return 1;
+}
+
+static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
+			    const void *data,
+			    size_t len) {
+    struct VncState *vs = (struct VncState *)transport;
+    int ret;
+
+ retry:
+    ret = send(vs->csock, data, len, 0);
+    if (ret < 0) {
+	if (errno == EINTR)
+	    goto retry;
+	return -1;
+    }
+    return ret;
+}
+
+
+static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
+			    void *data,
+			    size_t len) {
+    struct VncState *vs = (struct VncState *)transport;
+    int ret;
+
+ retry:
+    ret = recv(vs->csock, data, len, 0);
+    if (ret < 0) {
+	if (errno == EINTR)
+	    goto retry;
+	return -1;
+    }
+    return ret;
+}
+
+
+static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
+{
+    gnutls_anon_server_credentials anon_cred;
+    int ret;
+
+    if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
+	VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret));
+	return NULL;
+    }
+
+    gnutls_anon_set_server_dh_params(anon_cred, dh_params);
+
+    return anon_cred;
+}
+
+
+static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncDisplay *vd)
+{
+    gnutls_certificate_credentials_t x509_cred;
+    int ret;
+
+    if (!vd->tls.x509cacert) {
+	VNC_DEBUG("No CA x509 certificate specified\n");
+	return NULL;
+    }
+    if (!vd->tls.x509cert) {
+	VNC_DEBUG("No server x509 certificate specified\n");
+	return NULL;
+    }
+    if (!vd->tls.x509key) {
+	VNC_DEBUG("No server private key specified\n");
+	return NULL;
+    }
+
+    if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) {
+	VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret));
+	return NULL;
+    }
+    if ((ret = gnutls_certificate_set_x509_trust_file(x509_cred,
+						      vd->tls.x509cacert,
+						      GNUTLS_X509_FMT_PEM)) < 0) {
+	VNC_DEBUG("Cannot load CA certificate %s\n", gnutls_strerror(ret));
+	gnutls_certificate_free_credentials(x509_cred);
+	return NULL;
+    }
+
+    if ((ret = gnutls_certificate_set_x509_key_file (x509_cred,
+						     vd->tls.x509cert,
+						     vd->tls.x509key,
+						     GNUTLS_X509_FMT_PEM)) < 0) {
+	VNC_DEBUG("Cannot load certificate & key %s\n", gnutls_strerror(ret));
+	gnutls_certificate_free_credentials(x509_cred);
+	return NULL;
+    }
+
+    if (vd->tls.x509cacrl) {
+	if ((ret = gnutls_certificate_set_x509_crl_file(x509_cred,
+							vd->tls.x509cacrl,
+							GNUTLS_X509_FMT_PEM)) < 0) {
+	    VNC_DEBUG("Cannot load CRL %s\n", gnutls_strerror(ret));
+	    gnutls_certificate_free_credentials(x509_cred);
+	    return NULL;
+	}
+    }
+
+    gnutls_certificate_set_dh_params (x509_cred, dh_params);
+
+    return x509_cred;
+}
+
+
+int vnc_tls_validate_certificate(struct VncState *vs)
+{
+    int ret;
+    unsigned int status;
+    const gnutls_datum_t *certs;
+    unsigned int nCerts, i;
+    time_t now;
+
+    VNC_DEBUG("Validating client certificate\n");
+    if ((ret = gnutls_certificate_verify_peers2 (vs->tls.session, &status)) < 0) {
+	VNC_DEBUG("Verify failed %s\n", gnutls_strerror(ret));
+	return -1;
+    }
+
+    if ((now = time(NULL)) == ((time_t)-1)) {
+	return -1;
+    }
+
+    if (status != 0) {
+	if (status & GNUTLS_CERT_INVALID)
+	    VNC_DEBUG("The certificate is not trusted.\n");
+
+	if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
+	    VNC_DEBUG("The certificate hasn't got a known issuer.\n");
+
+	if (status & GNUTLS_CERT_REVOKED)
+	    VNC_DEBUG("The certificate has been revoked.\n");
+
+	if (status & GNUTLS_CERT_INSECURE_ALGORITHM)
+	    VNC_DEBUG("The certificate uses an insecure algorithm\n");
+
+	return -1;
+    } else {
+	VNC_DEBUG("Certificate is valid!\n");
+    }
+
+    /* Only support x509 for now */
+    if (gnutls_certificate_type_get(vs->tls.session) != GNUTLS_CRT_X509)
+	return -1;
+
+    if (!(certs = gnutls_certificate_get_peers(vs->tls.session, &nCerts)))
+	return -1;
+
+    for (i = 0 ; i < nCerts ; i++) {
+	gnutls_x509_crt_t cert;
+	VNC_DEBUG ("Checking certificate chain %d\n", i);
+	if (gnutls_x509_crt_init (&cert) < 0)
+	    return -1;
+
+	if (gnutls_x509_crt_import(cert, &certs[i], GNUTLS_X509_FMT_DER) < 0) {
+	    gnutls_x509_crt_deinit (cert);
+	    return -1;
+	}
+
+	if (gnutls_x509_crt_get_expiration_time (cert) < now) {
+	    VNC_DEBUG("The certificate has expired\n");
+	    gnutls_x509_crt_deinit (cert);
+	    return -1;
+	}
+
+	if (gnutls_x509_crt_get_activation_time (cert) > now) {
+	    VNC_DEBUG("The certificate is not yet activated\n");
+	    gnutls_x509_crt_deinit (cert);
+	    return -1;
+	}
+
+	if (gnutls_x509_crt_get_activation_time (cert) > now) {
+	    VNC_DEBUG("The certificate is not yet activated\n");
+	    gnutls_x509_crt_deinit (cert);
+	    return -1;
+	}
+
+	gnutls_x509_crt_deinit (cert);
+    }
+
+    return 0;
+}
+
+
+int vnc_tls_client_setup(struct VncState *vs,
+			 int needX509Creds) {
+    static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 };
+    static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 };
+    static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0};
+    static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0};
+
+    VNC_DEBUG("Do TLS setup\n");
+    if (vnc_tls_initialize() < 0) {
+	VNC_DEBUG("Failed to init TLS\n");
+	vnc_client_error(vs);
+	return -1;
+    }
+    if (vs->tls.session == NULL) {
+	if (gnutls_init(&vs->tls.session, GNUTLS_SERVER) < 0) {
+	    vnc_client_error(vs);
+	    return -1;
+	}
+
+	if (gnutls_set_default_priority(vs->tls.session) < 0) {
+	    gnutls_deinit(vs->tls.session);
+	    vs->tls.session = NULL;
+	    vnc_client_error(vs);
+	    return -1;
+	}
+
+	if (gnutls_kx_set_priority(vs->tls.session, needX509Creds ? kx_x509 : kx_anon) < 0) {
+	    gnutls_deinit(vs->tls.session);
+	    vs->tls.session = NULL;
+	    vnc_client_error(vs);
+	    return -1;
+	}
+
+	if (gnutls_certificate_type_set_priority(vs->tls.session, cert_type_priority) < 0) {
+	    gnutls_deinit(vs->tls.session);
+	    vs->tls.session = NULL;
+	    vnc_client_error(vs);
+	    return -1;
+	}
+
+	if (gnutls_protocol_set_priority(vs->tls.session, protocol_priority) < 0) {
+	    gnutls_deinit(vs->tls.session);
+	    vs->tls.session = NULL;
+	    vnc_client_error(vs);
+	    return -1;
+	}
+
+	if (needX509Creds) {
+	    gnutls_certificate_server_credentials x509_cred = vnc_tls_initialize_x509_cred(vs->vd);
+	    if (!x509_cred) {
+		gnutls_deinit(vs->tls.session);
+		vs->tls.session = NULL;
+		vnc_client_error(vs);
+		return -1;
+	    }
+	    if (gnutls_credentials_set(vs->tls.session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) {
+		gnutls_deinit(vs->tls.session);
+		vs->tls.session = NULL;
+		gnutls_certificate_free_credentials(x509_cred);
+		vnc_client_error(vs);
+		return -1;
+	    }
+	    if (vs->vd->tls.x509verify) {
+		VNC_DEBUG("Requesting a client certificate\n");
+		gnutls_certificate_server_set_request (vs->tls.session, GNUTLS_CERT_REQUEST);
+	    }
+
+	} else {
+	    gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
+	    if (!anon_cred) {
+		gnutls_deinit(vs->tls.session);
+		vs->tls.session = NULL;
+		vnc_client_error(vs);
+		return -1;
+	    }
+	    if (gnutls_credentials_set(vs->tls.session, GNUTLS_CRD_ANON, anon_cred) < 0) {
+		gnutls_deinit(vs->tls.session);
+		vs->tls.session = NULL;
+		gnutls_anon_free_server_credentials(anon_cred);
+		vnc_client_error(vs);
+		return -1;
+	    }
+	}
+
+	gnutls_transport_set_ptr(vs->tls.session, (gnutls_transport_ptr_t)vs);
+	gnutls_transport_set_push_function(vs->tls.session, vnc_tls_push);
+	gnutls_transport_set_pull_function(vs->tls.session, vnc_tls_pull);
+    }
+    return 0;
+}
+
+
+void vnc_tls_client_cleanup(struct VncState *vs)
+{
+    if (vs->tls.session) {
+	gnutls_deinit(vs->tls.session);
+	vs->tls.session = NULL;
+    }
+    vs->tls.wiremode = VNC_WIREMODE_CLEAR;
+}
+
+
+
+static int vnc_set_x509_credential(VncDisplay *vd,
+				   const char *certdir,
+				   const char *filename,
+				   char **cred,
+				   int ignoreMissing)
+{
+    struct stat sb;
+
+    if (*cred) {
+	qemu_free(*cred);
+	*cred = NULL;
+    }
+
+    *cred = qemu_malloc(strlen(certdir) + strlen(filename) + 2);
+
+    strcpy(*cred, certdir);
+    strcat(*cred, "/");
+    strcat(*cred, filename);
+
+    VNC_DEBUG("Check %s\n", *cred);
+    if (stat(*cred, &sb) < 0) {
+	qemu_free(*cred);
+	*cred = NULL;
+	if (ignoreMissing && errno == ENOENT)
+	    return 0;
+	return -1;
+    }
+
+    return 0;
+}
+
+
+#define X509_CA_CERT_FILE "ca-cert.pem"
+#define X509_CA_CRL_FILE "ca-crl.pem"
+#define X509_SERVER_KEY_FILE "server-key.pem"
+#define X509_SERVER_CERT_FILE "server-cert.pem"
+
+
+int vnc_tls_set_x509_creds_dir(VncDisplay *vd,
+			       const char *certdir)
+{
+    if (vnc_set_x509_credential(vd, certdir, X509_CA_CERT_FILE, &vd->tls.x509cacert, 0) < 0)
+	goto cleanup;
+    if (vnc_set_x509_credential(vd, certdir, X509_CA_CRL_FILE, &vd->tls.x509cacrl, 1) < 0)
+	goto cleanup;
+    if (vnc_set_x509_credential(vd, certdir, X509_SERVER_CERT_FILE, &vd->tls.x509cert, 0) < 0)
+	goto cleanup;
+    if (vnc_set_x509_credential(vd, certdir, X509_SERVER_KEY_FILE, &vd->tls.x509key, 0) < 0)
+	goto cleanup;
+
+    return 0;
+
+ cleanup:
+    qemu_free(vd->tls.x509cacert);
+    qemu_free(vd->tls.x509cacrl);
+    qemu_free(vd->tls.x509cert);
+    qemu_free(vd->tls.x509key);
+    vd->tls.x509cacert = vd->tls.x509cacrl = vd->tls.x509cert = vd->tls.x509key = NULL;
+    return -1;
+}
+
Index: qemu-kvm-0.10/qemu/vnc-tls.h
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/vnc-tls.h
@@ -0,0 +1,70 @@
+/*
+ * QEMU VNC display driver. TLS helpers
+ *
+ * Copyright (C) 2006 Anthony Liguori <anthony at codemonkey.ws>
+ * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#ifndef __QEMU_VNC_TLS_H__
+#define __QEMU_VNC_TLS_H__
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+
+enum {
+    VNC_WIREMODE_CLEAR,
+    VNC_WIREMODE_TLS,
+};
+
+typedef struct VncDisplayTLS VncDisplayTLS;
+typedef struct VncStateTLS VncStateTLS;
+
+/* Server state */
+struct VncDisplayTLS {
+    int x509verify; /* Non-zero if server requests & validates client cert */
+
+    /* Paths to x509 certs/keys */
+    char *x509cacert;
+    char *x509cacrl;
+    char *x509cert;
+    char *x509key;
+};
+
+/* Per client state */
+struct VncStateTLS {
+    /* Whether data is being TLS encrypted yet */
+    int wiremode;
+    gnutls_session_t session;
+};
+
+int vnc_tls_client_setup(VncState *vs, int x509Creds);
+void vnc_tls_client_cleanup(VncState *vs);
+
+int vnc_tls_validate_certificate(VncState *vs);
+
+int vnc_tls_set_x509_creds_dir(VncDisplay *vd,
+			       const char *path);
+
+
+#endif /* __QEMU_VNC_TLS_H__ */
+
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -34,21 +34,6 @@
 #include "vnc_keysym.h"
 #include "d3des.h"
 
-// #define _VNC_DEBUG 1
-
-#ifdef _VNC_DEBUG
-#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
-
-#if defined(CONFIG_VNC_TLS) && _VNC_DEBUG >= 2
-/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */
-static void vnc_debug_gnutls_log(int level, const char* str) {
-    VNC_DEBUG("%d %s", level, str);
-}
-#endif /* CONFIG_VNC_TLS && _VNC_DEBUG */
-#else
-#define VNC_DEBUG(fmt, ...) do { } while (0)
-#endif
-
 #define count_bits(c, v) { \
     for (c = 0; v; v >>= 1) \
     { \
@@ -204,14 +189,7 @@ static inline uint32_t vnc_has_feature(V
    3) resolutions > 1024
 */
 
-static void vnc_write(VncState *vs, const void *data, size_t len);
-static void vnc_write_u32(VncState *vs, uint32_t value);
-static void vnc_write_s32(VncState *vs, int32_t value);
-static void vnc_write_u16(VncState *vs, uint16_t value);
-static void vnc_write_u8(VncState *vs, uint8_t value);
-static void vnc_flush(VncState *vs);
 static void vnc_update_client(void *opaque);
-static void vnc_client_read(void *opaque);
 
 static void vnc_colordepth(VncState *vs);
 
@@ -867,10 +845,7 @@ static int vnc_client_io_error(VncState 
         if (vs->input.buffer) qemu_free(vs->input.buffer);
         if (vs->output.buffer) qemu_free(vs->output.buffer);
 #ifdef CONFIG_VNC_TLS
-	if (vs->tls_session) {
-	    gnutls_deinit(vs->tls_session);
-	    vs->tls_session = NULL;
-	}
+	vnc_tls_client_cleanup(vs);
 #endif /* CONFIG_VNC_TLS */
         audio_del(vs);
 
@@ -896,19 +871,20 @@ static int vnc_client_io_error(VncState 
     return ret;
 }
 
-static void vnc_client_error(VncState *vs)
+
+void vnc_client_error(VncState *vs)
 {
     vnc_client_io_error(vs, -1, EINVAL);
 }
 
-static void vnc_client_write(void *opaque)
+void vnc_client_write(void *opaque)
 {
     long ret;
     VncState *vs = opaque;
 
 #ifdef CONFIG_VNC_TLS
-    if (vs->tls_session) {
-	ret = gnutls_write(vs->tls_session, vs->output.buffer, vs->output.offset);
+    if (vs->tls.session) {
+	ret = gnutls_write(vs->tls.session, vs->output.buffer, vs->output.offset);
 	if (ret < 0) {
 	    if (ret == GNUTLS_E_AGAIN)
 		errno = EAGAIN;
@@ -931,13 +907,13 @@ static void vnc_client_write(void *opaqu
     }
 }
 
-static void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
+void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
 {
     vs->read_handler = func;
     vs->read_handler_expect = expecting;
 }
 
-static void vnc_client_read(void *opaque)
+void vnc_client_read(void *opaque)
 {
     VncState *vs = opaque;
     long ret;
@@ -945,8 +921,8 @@ static void vnc_client_read(void *opaque
     buffer_reserve(&vs->input, 4096);
 
 #ifdef CONFIG_VNC_TLS
-    if (vs->tls_session) {
-	ret = gnutls_read(vs->tls_session, buffer_end(&vs->input), 4096);
+    if (vs->tls.session) {
+	ret = gnutls_read(vs->tls.session, buffer_end(&vs->input), 4096);
 	if (ret < 0) {
 	    if (ret == GNUTLS_E_AGAIN)
 		errno = EAGAIN;
@@ -980,7 +956,7 @@ static void vnc_client_read(void *opaque
     }
 }
 
-static void vnc_write(VncState *vs, const void *data, size_t len)
+void vnc_write(VncState *vs, const void *data, size_t len)
 {
     buffer_reserve(&vs->output, len);
 
@@ -991,12 +967,12 @@ static void vnc_write(VncState *vs, cons
     buffer_append(&vs->output, data, len);
 }
 
-static void vnc_write_s32(VncState *vs, int32_t value)
+void vnc_write_s32(VncState *vs, int32_t value)
 {
     vnc_write_u32(vs, *(uint32_t *)&value);
 }
 
-static void vnc_write_u32(VncState *vs, uint32_t value)
+void vnc_write_u32(VncState *vs, uint32_t value)
 {
     uint8_t buf[4];
 
@@ -1008,7 +984,7 @@ static void vnc_write_u32(VncState *vs, 
     vnc_write(vs, buf, 4);
 }
 
-static void vnc_write_u16(VncState *vs, uint16_t value)
+void vnc_write_u16(VncState *vs, uint16_t value)
 {
     uint8_t buf[2];
 
@@ -1018,74 +994,39 @@ static void vnc_write_u16(VncState *vs, 
     vnc_write(vs, buf, 2);
 }
 
-static void vnc_write_u8(VncState *vs, uint8_t value)
+void vnc_write_u8(VncState *vs, uint8_t value)
 {
     vnc_write(vs, (char *)&value, 1);
 }
 
-static void vnc_flush(VncState *vs)
+void vnc_flush(VncState *vs)
 {
     if (vs->output.offset)
 	vnc_client_write(vs);
 }
 
-static uint8_t read_u8(uint8_t *data, size_t offset)
+uint8_t read_u8(uint8_t *data, size_t offset)
 {
     return data[offset];
 }
 
-static uint16_t read_u16(uint8_t *data, size_t offset)
+uint16_t read_u16(uint8_t *data, size_t offset)
 {
     return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF);
 }
 
-static int32_t read_s32(uint8_t *data, size_t offset)
+int32_t read_s32(uint8_t *data, size_t offset)
 {
     return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) |
 		     (data[offset + 2] << 8) | data[offset + 3]);
 }
 
-static uint32_t read_u32(uint8_t *data, size_t offset)
+uint32_t read_u32(uint8_t *data, size_t offset)
 {
     return ((data[offset] << 24) | (data[offset + 1] << 16) |
 	    (data[offset + 2] << 8) | data[offset + 3]);
 }
 
-#ifdef CONFIG_VNC_TLS
-static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
-                            const void *data,
-                            size_t len) {
-    struct VncState *vs = (struct VncState *)transport;
-    int ret;
-
- retry:
-    ret = send(vs->csock, data, len, 0);
-    if (ret < 0) {
-	if (errno == EINTR)
-	    goto retry;
-	return -1;
-    }
-    return ret;
-}
-
-
-static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
-                            void *data,
-                            size_t len) {
-    struct VncState *vs = (struct VncState *)transport;
-    int ret;
-
- retry:
-    ret = recv(vs->csock, data, len, 0);
-    if (ret < 0) {
-	if (errno == EINTR)
-	    goto retry;
-	return -1;
-    }
-    return ret;
-}
-#endif /* CONFIG_VNC_TLS */
-
 static void client_cut_text(VncState *vs, size_t len, uint8_t *text)
 {
 }
@@ -1668,6 +1609,11 @@ static int protocol_client_init(VncState
     return 0;
 }
 
+void start_client_init(VncState *vs)
+{
+    vnc_read_when(vs, protocol_client_init, 1);
+}
+
 static void make_challenge(VncState *vs)
 {
     int i;
@@ -1723,12 +1669,12 @@ static int protocol_client_auth_vnc(VncS
 	vnc_write_u32(vs, 0); /* Accept auth */
 	vnc_flush(vs);
 
-	vnc_read_when(vs, protocol_client_init, 1);
+        start_client_init(vs);
     }
     return 0;
 }
 
-static int start_auth_vnc(VncState *vs)
+void start_auth_vnc(VncState *vs)
 {
     make_challenge(vs);
     /* Send client a 'random' challenge */
@@ -1736,411 +1682,9 @@ static int start_auth_vnc(VncState *vs)
     vnc_flush(vs);
 
     vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge));
-    return 0;
-}
-
-
-#ifdef CONFIG_VNC_TLS
-#define DH_BITS 1024
-static gnutls_dh_params_t dh_params;
-
-static int vnc_tls_initialize(void)
-{
-    static int tlsinitialized = 0;
-
-    if (tlsinitialized)
-	return 1;
-
-    if (gnutls_global_init () < 0)
-	return 0;
-
-    /* XXX ought to re-generate diffie-hellmen params periodically */
-    if (gnutls_dh_params_init (&dh_params) < 0)
-	return 0;
-    if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0)
-	return 0;
-
-#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2
-    gnutls_global_set_log_level(10);
-    gnutls_global_set_log_function(vnc_debug_gnutls_log);
-#endif
-
-    tlsinitialized = 1;
-
-    return 1;
-}
-
-static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
-{
-    gnutls_anon_server_credentials anon_cred;
-    int ret;
-
-    if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
-	VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret));
-	return NULL;
-    }
-
-    gnutls_anon_set_server_dh_params(anon_cred, dh_params);
-
-    return anon_cred;
 }
 
 
-static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncState *vs)
-{
-    gnutls_certificate_credentials_t x509_cred;
-    int ret;
-
-    if (!vs->vd->x509cacert) {
-	VNC_DEBUG("No CA x509 certificate specified\n");
-	return NULL;
-    }
-    if (!vs->vd->x509cert) {
-	VNC_DEBUG("No server x509 certificate specified\n");
-	return NULL;
-    }
-    if (!vs->vd->x509key) {
-	VNC_DEBUG("No server private key specified\n");
-	return NULL;
-    }
-
-    if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) {
-	VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret));
-	return NULL;
-    }
-    if ((ret = gnutls_certificate_set_x509_trust_file(x509_cred,
-						      vs->vd->x509cacert,
-						      GNUTLS_X509_FMT_PEM)) < 0) {
-	VNC_DEBUG("Cannot load CA certificate %s\n", gnutls_strerror(ret));
-	gnutls_certificate_free_credentials(x509_cred);
-	return NULL;
-    }
-
-    if ((ret = gnutls_certificate_set_x509_key_file (x509_cred,
-						     vs->vd->x509cert,
-						     vs->vd->x509key,
-						     GNUTLS_X509_FMT_PEM)) < 0) {
-	VNC_DEBUG("Cannot load certificate & key %s\n", gnutls_strerror(ret));
-	gnutls_certificate_free_credentials(x509_cred);
-	return NULL;
-    }
-
-    if (vs->vd->x509cacrl) {
-	if ((ret = gnutls_certificate_set_x509_crl_file(x509_cred,
-							vs->vd->x509cacrl,
-							GNUTLS_X509_FMT_PEM)) < 0) {
-	    VNC_DEBUG("Cannot load CRL %s\n", gnutls_strerror(ret));
-	    gnutls_certificate_free_credentials(x509_cred);
-	    return NULL;
-	}
-    }
-
-    gnutls_certificate_set_dh_params (x509_cred, dh_params);
-
-    return x509_cred;
-}
-
-static int vnc_validate_certificate(struct VncState *vs)
-{
-    int ret;
-    unsigned int status;
-    const gnutls_datum_t *certs;
-    unsigned int nCerts, i;
-    time_t now;
-
-    VNC_DEBUG("Validating client certificate\n");
-    if ((ret = gnutls_certificate_verify_peers2 (vs->tls_session, &status)) < 0) {
-	VNC_DEBUG("Verify failed %s\n", gnutls_strerror(ret));
-	return -1;
-    }
-
-    if ((now = time(NULL)) == ((time_t)-1)) {
-	return -1;
-    }
-
-    if (status != 0) {
-	if (status & GNUTLS_CERT_INVALID)
-	    VNC_DEBUG("The certificate is not trusted.\n");
-
-	if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
-	    VNC_DEBUG("The certificate hasn't got a known issuer.\n");
-
-	if (status & GNUTLS_CERT_REVOKED)
-	    VNC_DEBUG("The certificate has been revoked.\n");
-
-	if (status & GNUTLS_CERT_INSECURE_ALGORITHM)
-	    VNC_DEBUG("The certificate uses an insecure algorithm\n");
-
-	return -1;
-    } else {
-	VNC_DEBUG("Certificate is valid!\n");
-    }
-
-    /* Only support x509 for now */
-    if (gnutls_certificate_type_get(vs->tls_session) != GNUTLS_CRT_X509)
-	return -1;
-
-    if (!(certs = gnutls_certificate_get_peers(vs->tls_session, &nCerts)))
-	return -1;
-
-    for (i = 0 ; i < nCerts ; i++) {
-	gnutls_x509_crt_t cert;
-	VNC_DEBUG ("Checking certificate chain %d\n", i);
-	if (gnutls_x509_crt_init (&cert) < 0)
-	    return -1;
-
-	if (gnutls_x509_crt_import(cert, &certs[i], GNUTLS_X509_FMT_DER) < 0) {
-	    gnutls_x509_crt_deinit (cert);
-	    return -1;
-	}
-
-	if (gnutls_x509_crt_get_expiration_time (cert) < now) {
-	    VNC_DEBUG("The certificate has expired\n");
-	    gnutls_x509_crt_deinit (cert);
-	    return -1;
-	}
-
-	if (gnutls_x509_crt_get_activation_time (cert) > now) {
-	    VNC_DEBUG("The certificate is not yet activated\n");
-	    gnutls_x509_crt_deinit (cert);
-	    return -1;
-	}
-
-	if (gnutls_x509_crt_get_activation_time (cert) > now) {
-	    VNC_DEBUG("The certificate is not yet activated\n");
-	    gnutls_x509_crt_deinit (cert);
-	    return -1;
-	}
-
-	gnutls_x509_crt_deinit (cert);
-    }
-
-    return 0;
-}
-
-
-static int start_auth_vencrypt_subauth(VncState *vs)
-{
-    switch (vs->vd->subauth) {
-    case VNC_AUTH_VENCRYPT_TLSNONE:
-    case VNC_AUTH_VENCRYPT_X509NONE:
-       VNC_DEBUG("Accept TLS auth none\n");
-       vnc_write_u32(vs, 0); /* Accept auth completion */
-       vnc_read_when(vs, protocol_client_init, 1);
-       break;
-
-    case VNC_AUTH_VENCRYPT_TLSVNC:
-    case VNC_AUTH_VENCRYPT_X509VNC:
-       VNC_DEBUG("Start TLS auth VNC\n");
-       return start_auth_vnc(vs);
-
-    default: /* Should not be possible, but just in case */
-       VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
-       vnc_write_u8(vs, 1);
-       if (vs->minor >= 8) {
-           static const char err[] = "Unsupported authentication type";
-           vnc_write_u32(vs, sizeof(err));
-           vnc_write(vs, err, sizeof(err));
-       }
-       vnc_client_error(vs);
-    }
-
-    return 0;
-}
-
-static void vnc_handshake_io(void *opaque);
-
-static int vnc_continue_handshake(struct VncState *vs) {
-    int ret;
-
-    if ((ret = gnutls_handshake(vs->tls_session)) < 0) {
-       if (!gnutls_error_is_fatal(ret)) {
-           VNC_DEBUG("Handshake interrupted (blocking)\n");
-           if (!gnutls_record_get_direction(vs->tls_session))
-               qemu_set_fd_handler(vs->csock, vnc_handshake_io, NULL, vs);
-           else
-               qemu_set_fd_handler(vs->csock, NULL, vnc_handshake_io, vs);
-           return 0;
-       }
-       VNC_DEBUG("Handshake failed %s\n", gnutls_strerror(ret));
-       vnc_client_error(vs);
-       return -1;
-    }
-
-    if (vs->vd->x509verify) {
-	if (vnc_validate_certificate(vs) < 0) {
-	    VNC_DEBUG("Client verification failed\n");
-	    vnc_client_error(vs);
-	    return -1;
-	} else {
-	    VNC_DEBUG("Client verification passed\n");
-	}
-    }
-
-    VNC_DEBUG("Handshake done, switching to TLS data mode\n");
-    vs->wiremode = VNC_WIREMODE_TLS;
-    qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs);
-
-    return start_auth_vencrypt_subauth(vs);
-}
-
-static void vnc_handshake_io(void *opaque) {
-    struct VncState *vs = (struct VncState *)opaque;
-
-    VNC_DEBUG("Handshake IO continue\n");
-    vnc_continue_handshake(vs);
-}
-
-#define NEED_X509_AUTH(vs)			      \
-    ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE ||   \
-     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC ||    \
-     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN)
-
-
-static int vnc_start_tls(struct VncState *vs) {
-    static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 };
-    static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 };
-    static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0};
-    static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0};
-
-    VNC_DEBUG("Do TLS setup\n");
-    if (vnc_tls_initialize() < 0) {
-	VNC_DEBUG("Failed to init TLS\n");
-	vnc_client_error(vs);
-	return -1;
-    }
-    if (vs->tls_session == NULL) {
-	if (gnutls_init(&vs->tls_session, GNUTLS_SERVER) < 0) {
-	    vnc_client_error(vs);
-	    return -1;
-	}
-
-	if (gnutls_set_default_priority(vs->tls_session) < 0) {
-	    gnutls_deinit(vs->tls_session);
-	    vs->tls_session = NULL;
-	    vnc_client_error(vs);
-	    return -1;
-	}
-
-	if (gnutls_kx_set_priority(vs->tls_session, NEED_X509_AUTH(vs) ? kx_x509 : kx_anon) < 0) {
-	    gnutls_deinit(vs->tls_session);
-	    vs->tls_session = NULL;
-	    vnc_client_error(vs);
-	    return -1;
-	}
-
-	if (gnutls_certificate_type_set_priority(vs->tls_session, cert_type_priority) < 0) {
-	    gnutls_deinit(vs->tls_session);
-	    vs->tls_session = NULL;
-	    vnc_client_error(vs);
-	    return -1;
-	}
-
-	if (gnutls_protocol_set_priority(vs->tls_session, protocol_priority) < 0) {
-	    gnutls_deinit(vs->tls_session);
-	    vs->tls_session = NULL;
-	    vnc_client_error(vs);
-	    return -1;
-	}
-
-	if (NEED_X509_AUTH(vs)) {
-	    gnutls_certificate_server_credentials x509_cred = vnc_tls_initialize_x509_cred(vs);
-	    if (!x509_cred) {
-		gnutls_deinit(vs->tls_session);
-		vs->tls_session = NULL;
-		vnc_client_error(vs);
-		return -1;
-	    }
-	    if (gnutls_credentials_set(vs->tls_session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) {
-		gnutls_deinit(vs->tls_session);
-		vs->tls_session = NULL;
-		gnutls_certificate_free_credentials(x509_cred);
-		vnc_client_error(vs);
-		return -1;
-	    }
-	    if (vs->vd->x509verify) {
-		VNC_DEBUG("Requesting a client certificate\n");
-		gnutls_certificate_server_set_request (vs->tls_session, GNUTLS_CERT_REQUEST);
-	    }
-
-	} else {
-	    gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
-	    if (!anon_cred) {
-		gnutls_deinit(vs->tls_session);
-		vs->tls_session = NULL;
-		vnc_client_error(vs);
-		return -1;
-	    }
-	    if (gnutls_credentials_set(vs->tls_session, GNUTLS_CRD_ANON, anon_cred) < 0) {
-		gnutls_deinit(vs->tls_session);
-		vs->tls_session = NULL;
-		gnutls_anon_free_server_credentials(anon_cred);
-		vnc_client_error(vs);
-		return -1;
-	    }
-	}
-
-	gnutls_transport_set_ptr(vs->tls_session, (gnutls_transport_ptr_t)vs);
-	gnutls_transport_set_push_function(vs->tls_session, vnc_tls_push);
-	gnutls_transport_set_pull_function(vs->tls_session, vnc_tls_pull);
-    }
-
-    VNC_DEBUG("Start TLS handshake process\n");
-    return vnc_continue_handshake(vs);
-}
-
-static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len)
-{
-    int auth = read_u32(data, 0);
-
-    if (auth != vs->vd->subauth) {
-	VNC_DEBUG("Rejecting auth %d\n", auth);
-	vnc_write_u8(vs, 0); /* Reject auth */
-	vnc_flush(vs);
-	vnc_client_error(vs);
-    } else {
-	VNC_DEBUG("Accepting auth %d, starting handshake\n", auth);
-	vnc_write_u8(vs, 1); /* Accept auth */
-	vnc_flush(vs);
-
-	if (vnc_start_tls(vs) < 0) {
-	    VNC_DEBUG("Failed to complete TLS\n");
-	    return 0;
-	}
-    }
-    return 0;
-}
-
-static int protocol_client_vencrypt_init(VncState *vs, uint8_t *data, size_t len)
-{
-    if (data[0] != 0 ||
-	data[1] != 2) {
-	VNC_DEBUG("Unsupported VeNCrypt protocol %d.%d\n", (int)data[0], (int)data[1]);
-	vnc_write_u8(vs, 1); /* Reject version */
-	vnc_flush(vs);
-	vnc_client_error(vs);
-    } else {
-	VNC_DEBUG("Sending allowed auth %d\n", vs->vd->subauth);
-	vnc_write_u8(vs, 0); /* Accept version */
-	vnc_write_u8(vs, 1); /* Number of sub-auths */
-	vnc_write_u32(vs, vs->vd->subauth); /* The supported auth */
-	vnc_flush(vs);
-	vnc_read_when(vs, protocol_client_vencrypt_auth, 4);
-    }
-    return 0;
-}
-
-static int start_auth_vencrypt(VncState *vs)
-{
-    /* Send VeNCrypt version 0.2 */
-    vnc_write_u8(vs, 0);
-    vnc_write_u8(vs, 2);
-
-    vnc_read_when(vs, protocol_client_vencrypt_init, 2);
-    return 0;
-}
-#endif /* CONFIG_VNC_TLS */
-
 static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len)
 {
     /* We only advertise 1 auth scheme at a time, so client
@@ -2163,17 +1707,19 @@ static int protocol_client_auth(VncState
                vnc_write_u32(vs, 0); /* Accept auth completion */
                vnc_flush(vs);
            }
-           vnc_read_when(vs, protocol_client_init, 1);
+           start_client_init(vs);
            break;
 
        case VNC_AUTH_VNC:
            VNC_DEBUG("Start VNC auth\n");
-           return start_auth_vnc(vs);
+           start_auth_vnc(vs);
+           break;
 
 #ifdef CONFIG_VNC_TLS
        case VNC_AUTH_VENCRYPT:
            VNC_DEBUG("Accept VeNCrypt auth\n");;
-           return start_auth_vencrypt(vs);
+           start_auth_vencrypt(vs);
+           break;
 #endif /* CONFIG_VNC_TLS */
 
        default: /* Should not be possible, but just in case */
@@ -2226,7 +1772,7 @@ static int protocol_version(VncState *vs
             VNC_DEBUG("Tell client auth none\n");
             vnc_write_u32(vs, vs->vd->auth);
             vnc_flush(vs);
-            vnc_read_when(vs, protocol_client_init, 1);
+	    start_client_init(vs);
        } else if (vs->vd->auth == VNC_AUTH_VNC) {
             VNC_DEBUG("Tell client VNC auth\n");
             vnc_write_u32(vs, vs->vd->auth);
@@ -2328,61 +1874,6 @@ void vnc_display_init(DisplayState *ds)
     register_displaychangelistener(ds, dcl);
 }
 
-#ifdef CONFIG_VNC_TLS
-static int vnc_set_x509_credential(VncDisplay *vs,
-				   const char *certdir,
-				   const char *filename,
-				   char **cred,
-				   int ignoreMissing)
-{
-    struct stat sb;
-
-    if (*cred) {
-	qemu_free(*cred);
-	*cred = NULL;
-    }
-
-    *cred = qemu_malloc(strlen(certdir) + strlen(filename) + 2);
-
-    strcpy(*cred, certdir);
-    strcat(*cred, "/");
-    strcat(*cred, filename);
-
-    VNC_DEBUG("Check %s\n", *cred);
-    if (stat(*cred, &sb) < 0) {
-	qemu_free(*cred);
-	*cred = NULL;
-	if (ignoreMissing && errno == ENOENT)
-	    return 0;
-	return -1;
-    }
-
-    return 0;
-}
-
-static int vnc_set_x509_credential_dir(VncDisplay *vs,
-				       const char *certdir)
-{
-    if (vnc_set_x509_credential(vs, certdir, X509_CA_CERT_FILE, &vs->x509cacert, 0) < 0)
-	goto cleanup;
-    if (vnc_set_x509_credential(vs, certdir, X509_CA_CRL_FILE, &vs->x509cacrl, 1) < 0)
-	goto cleanup;
-    if (vnc_set_x509_credential(vs, certdir, X509_SERVER_CERT_FILE, &vs->x509cert, 0) < 0)
-	goto cleanup;
-    if (vnc_set_x509_credential(vs, certdir, X509_SERVER_KEY_FILE, &vs->x509key, 0) < 0)
-	goto cleanup;
-
-    return 0;
-
- cleanup:
-    qemu_free(vs->x509cacert);
-    qemu_free(vs->x509cacrl);
-    qemu_free(vs->x509cert);
-    qemu_free(vs->x509key);
-    vs->x509cacert = vs->x509cacrl = vs->x509cert = vs->x509key = NULL;
-    return -1;
-}
-#endif /* CONFIG_VNC_TLS */
 
 void vnc_display_close(DisplayState *ds)
 {
@@ -2402,7 +1893,7 @@ void vnc_display_close(DisplayState *ds)
     vs->auth = VNC_AUTH_INVALID;
 #ifdef CONFIG_VNC_TLS
     vs->subauth = VNC_AUTH_INVALID;
-    vs->x509verify = 0;
+    vs->tls.x509verify = 0;
 #endif
 }
 
@@ -2458,7 +1949,7 @@ int vnc_display_open(DisplayState *ds, c
 	    char *start, *end;
 	    x509 = 1; /* Require x509 certificates */
 	    if (strncmp(options, "x509verify", 10) == 0)
-	        vs->x509verify = 1; /* ...and verify client certs */
+	        vs->tls.x509verify = 1; /* ...and verify client certs */
 
 	    /* Now check for 'x509=/some/path' postfix
 	     * and use that to setup x509 certificate/key paths */
@@ -2469,7 +1960,7 @@ int vnc_display_open(DisplayState *ds, c
 		char *path = qemu_strndup(start + 1, len);
 
 		VNC_DEBUG("Trying certificate path '%s'\n", path);
-		if (vnc_set_x509_credential_dir(vs, path) < 0) {
+		if (vnc_tls_set_x509_creds_dir(vs, path) < 0) {
 		    fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path);
 		    qemu_free(path);
 		    qemu_free(vs->display);
Index: qemu-kvm-0.10/qemu/vnc.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.h
+++ qemu-kvm-0.10/qemu/vnc.h
@@ -32,13 +32,16 @@
 #include "audio/audio.h"
 #include <zlib.h>
 
-#ifdef CONFIG_VNC_TLS
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-#endif /* CONFIG_VNC_TLS */
-
 #include "keymaps.h"
 
+// #define _VNC_DEBUG 1
+
+#ifdef _VNC_DEBUG
+#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
+#else
+#define VNC_DEBUG(fmt, ...) do { } while (0)
+#endif
+
 /*****************************************************************************
  *
  * Core data structures
@@ -72,6 +75,11 @@ typedef void VncSendHextileTile(VncState
 
 typedef struct VncDisplay VncDisplay;
 
+#ifdef CONFIG_VNC_TLS
+#include "vnc-tls.h"
+#include "vnc-auth-vencrypt.h"
+#endif
+
 struct VncDisplay
 {
     int lsock;
@@ -83,13 +91,8 @@ struct VncDisplay
     char *password;
     int auth;
 #ifdef CONFIG_VNC_TLS
-    int subauth;
-    int x509verify;
-
-    char *x509cacert;
-    char *x509cacrl;
-    char *x509cert;
-    char *x509key;
+    int subauth; /* Used by VeNCrypt */
+    VncDisplayTLS tls;
 #endif
 };
 
@@ -117,8 +120,7 @@ struct VncState
     char challenge[VNC_AUTH_CHALLENGE_SIZE];
 
 #ifdef CONFIG_VNC_TLS
-    int wiremode;
-    gnutls_session_t tls_session;
+    VncStateTLS tls;
 #endif
 
     Buffer output;
@@ -162,12 +164,6 @@ enum {
     VNC_AUTH_VENCRYPT = 19
 };
 
-#ifdef CONFIG_VNC_TLS
-enum {
-    VNC_WIREMODE_CLEAR,
-    VNC_WIREMODE_TLS,
-};
-
 enum {
     VNC_AUTH_VENCRYPT_PLAIN = 256,
     VNC_AUTH_VENCRYPT_TLSNONE = 257,
@@ -178,12 +174,6 @@ enum {
     VNC_AUTH_VENCRYPT_X509PLAIN = 262,
 };
 
-#define X509_CA_CERT_FILE "ca-cert.pem"
-#define X509_CA_CRL_FILE "ca-crl.pem"
-#define X509_SERVER_KEY_FILE "server-key.pem"
-#define X509_SERVER_CERT_FILE "server-cert.pem"
-
-#endif /* CONFIG_VNC_TLS */
 
 /*****************************************************************************
  *
@@ -254,4 +244,38 @@ enum {
 #define VNC_FEATURE_ZLIB_MASK                (1 << VNC_FEATURE_ZLIB)
 #define VNC_FEATURE_COPYRECT_MASK            (1 << VNC_FEATURE_COPYRECT)
 
+
+/*****************************************************************************
+ *
+ * Internal APIs
+ *
+ *****************************************************************************/
+
+/* Event loop functions */
+void vnc_client_read(void *opaque);
+void vnc_client_write(void *opaque);
+
+
+/* Protocol I/O functions */
+void vnc_write(VncState *vs, const void *data, size_t len);
+void vnc_write_u32(VncState *vs, uint32_t value);
+void vnc_write_s32(VncState *vs, int32_t value);
+void vnc_write_u16(VncState *vs, uint16_t value);
+void vnc_write_u8(VncState *vs, uint8_t value);
+void vnc_flush(VncState *vs);
+void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting);
+
+
+/* Buffer I/O functions */
+uint8_t read_u8(uint8_t *data, size_t offset);
+uint16_t read_u16(uint8_t *data, size_t offset);
+int32_t read_s32(uint8_t *data, size_t offset);
+uint32_t read_u32(uint8_t *data, size_t offset);
+
+/* Protocol stage functions */
+void vnc_client_error(VncState *vs);
+
+void start_client_init(VncState *vs);
+void start_auth_vnc(VncState *vs);
+
 #endif /* __QEMU_VNC_H */

06-vnc-sasl.patch:

--- NEW FILE 06-vnc-sasl.patch ---
Index: qemu-kvm-0.10/qemu/Makefile
===================================================================
--- qemu-kvm-0.10.orig/qemu/Makefile
+++ qemu-kvm-0.10/qemu/Makefile
@@ -152,6 +152,9 @@ OBJS+=vnc.o d3des.o
 ifdef CONFIG_VNC_TLS
 OBJS+=vnc-tls.o vnc-auth-vencrypt.o
 endif
+ifdef CONFIG_VNC_SASL
+OBJS+=vnc-auth-sasl.o
+endif
 
 ifdef CONFIG_COCOA
 OBJS+=cocoa.o
@@ -175,7 +178,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h
 
 sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
 
-vnc.h: vnc-tls.h vnc-auth-vencrypt.h keymaps.h
+vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
 
 vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h
 
@@ -185,6 +188,8 @@ vnc-tls.o: vnc-tls.c vnc.h
 
 vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h
 
+vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h
+
 curses.o: curses.c keymaps.h curses_keys.h
 
 bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
Index: qemu-kvm-0.10/qemu/Makefile.target
===================================================================
--- qemu-kvm-0.10.orig/qemu/Makefile.target
+++ qemu-kvm-0.10/qemu/Makefile.target
@@ -613,6 +613,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 LIBS += $(CONFIG_VNC_TLS_LIBS)
 endif
 
+ifdef CONFIG_VNC_SASL
+CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS)
+LIBS += $(CONFIG_VNC_SASL_LIBS)
+endif
+
 ifdef CONFIG_BLUEZ
 LIBS += $(CONFIG_BLUEZ_LIBS)
 endif
Index: qemu-kvm-0.10/qemu/configure
===================================================================
--- qemu-kvm-0.10.orig/qemu/configure
+++ qemu-kvm-0.10/qemu/configure
@@ -164,6 +164,7 @@ fmod_lib=""
 fmod_inc=""
 oss_lib=""
 vnc_tls="yes"
+vnc_sasl="yes"
 bsd="no"
 linux="no"
 solaris="no"
@@ -404,6 +405,8 @@ for opt do
   ;;
   --disable-vnc-tls) vnc_tls="no"
   ;;
+  --disable-vnc-sasl) vnc_sasl="no"
+  ;;
   --disable-slirp) slirp="no"
   ;;
   --disable-vde) vde="no"
@@ -563,6 +566,7 @@ echo "                           Availab
 echo "  --enable-mixemu          enable mixer emulation"
 echo "  --disable-brlapi         disable BrlAPI"
 echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
+echo "  --disable-vnc-sasl       disable SASL encryption for VNC server"
 echo "  --disable-curses         disable curses output"
 echo "  --disable-bluez          disable bluez stack connectivity"
 echo "  --disable-kvm            disable KVM acceleration support"
@@ -890,6 +894,25 @@ EOF
 fi
 
 ##########################################
+# VNC SASL detection
+if test "$vnc_sasl" = "yes" ; then
+cat > $TMPC <<EOF
+#include <sasl/sasl.h>
+#include <stdio.h>
+int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
+EOF
+    # Assuming Cyrus-SASL installed in /usr prefix
+    vnc_sasl_cflags=""
+    vnc_sasl_libs="-lsasl2"
+    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \
+           $vnc_sasl_libs 2> /dev/null ; then
+	:
+    else
+	vnc_sasl="no"
+    fi
+fi
+
+##########################################
 # vde libraries probe
 if test "$vde" = "yes" ; then
   cat > $TMPC << EOF
@@ -1224,6 +1247,11 @@ if test "$vnc_tls" = "yes" ; then
     echo "    TLS CFLAGS    $vnc_tls_cflags"
     echo "    TLS LIBS      $vnc_tls_libs"
 fi
+echo "VNC SASL support  $vnc_sasl"
+if test "$vnc_sasl" = "yes" ; then
+    echo "    SASL CFLAGS    $vnc_sasl_cflags"
+    echo "    SASL LIBS      $vnc_sasl_libs"
+fi
 if test -n "$sparc_cpu"; then
     echo "Target Sparc Arch $sparc_cpu"
 fi
@@ -1467,6 +1495,12 @@ if test "$vnc_tls" = "yes" ; then
   echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
   echo "#define CONFIG_VNC_TLS 1" >> $config_h
 fi
+if test "$vnc_sasl" = "yes" ; then
+  echo "CONFIG_VNC_SASL=yes" >> $config_mak
+  echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
+  echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
+  echo "#define CONFIG_VNC_SASL 1" >> $config_h
+fi
 qemu_version=`head $source_path/VERSION`
 echo "VERSION=$qemu_version" >>$config_mak
 echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
Index: qemu-kvm-0.10/qemu/qemu-doc.texi
===================================================================
--- qemu-kvm-0.10.orig/qemu/qemu-doc.texi
+++ qemu-kvm-0.10/qemu/qemu-doc.texi
@@ -624,6 +624,21 @@ path following this option specifies whe
 be loaded from. See the @ref{vnc_security} section for details on generating
 certificates.
 
+ at item sasl
+
+Require that the client use SASL to authenticate with the VNC server.
+The exact choice of authentication method used is controlled from the
+system / user's SASL configuration file for the 'qemu' service. This
+is typically found in /etc/sasl2/qemu.conf. If running QEMU as an
+unprivileged user, an environment variable SASL_CONF_PATH can be used
+to make it search alternate locations for the service config.
+While some SASL auth methods can also provide data encryption (eg GSSAPI),
+it is recommended that SASL always be combined with the 'tls' and
+'x509' settings to enable use of SSL and server certificates. This
+ensures a data encryption preventing compromise of authentication
+credentials. See the @ref{vnc_security} section for details on using
+SASL authentication.
+
 @end table
 
 @end table
@@ -2069,7 +2084,10 @@ considerations depending on the deployme
 * vnc_sec_certificate::
 * vnc_sec_certificate_verify::
 * vnc_sec_certificate_pw::
+* vnc_sec_sasl::
+* vnc_sec_certificate_sasl::
 * vnc_generate_cert::
+* vnc_setup_sasl::
 @end menu
 @node vnc_sec_none
 @subsection Without passwords
@@ -2152,6 +2170,41 @@ Password: ********
 (qemu)
 @end example
 
+
+ at node vnc_sec_sasl
+ at subsection With SASL authentication
+
+The SASL authentication method is a VNC extension, that provides an
+easily extendable, pluggable authentication method. This allows for
+integration with a wide range of authentication mechanisms, such as
+PAM, GSSAPI/Kerberos, LDAP, SQL databases, one-time keys and more.
+The strength of the authentication depends on the exact mechanism
+configured. If the chosen mechanism also provides a SSF layer, then
+it will encrypt the datastream as well.
+
+Refer to the later docs on how to choose the exact SASL mechanism
+used for authentication, but assuming use of one supporting SSF,
+then QEMU can be launched with:
+
+ at example
+qemu [...OPTIONS...] -vnc :1,sasl -monitor stdio
+ at end example
+
+ at node vnc_sec_certificate_sasl
+ at subsection With x509 certificates and SASL authentication
+
+If the desired SASL authentication mechanism does not supported
+SSF layers, then it is strongly advised to run it in combination
+with TLS and x509 certificates. This provides securely encrypted
+data stream, avoiding risk of compromising of the security
+credentials. This can be enabled, by combining the 'sasl' option
+with the aforementioned TLS + x509 options:
+
+ at example
+qemu [...OPTIONS...] -vnc :1,tls,x509,sasl -monitor stdio
+ at end example
+
+
 @node vnc_generate_cert
 @subsection Generating certificates for VNC
 
@@ -2263,6 +2316,50 @@ EOF
 The @code{client-key.pem} and @code{client-cert.pem} files should now be securely
 copied to the client for which they were generated.
 
+
+ at node vnc_setup_sasl
+
+ at subsection Configuring SASL mechanisms
+
+The following documentation assumes use of the Cyrus SASL implementation on a
+Linux host, but the principals should apply to any other SASL impl. When SASL
+is enabled, the mechanism configuration will be loaded from system default
+SASL service config /etc/sasl2/qemu.conf. If running QEMU as an
+unprivileged user, an environment variable SASL_CONF_PATH can be used
+to make it search alternate locations for the service config.
+
+The default configuration might contain
+
+ at example
+mech_list: digest-md5
+sasldb_path: /etc/qemu/passwd.db
+ at end example
+
+This says to use the 'Digest MD5' mechanism, which is similar to the HTTP
+Digest-MD5 mechanism. The list of valid usernames & passwords is maintained
+in the /etc/qemu/passwd.db file, and can be updated using the saslpasswd2
+command. While this mechanism is easy to configure and use, it is not
+considered secure by modern standards, so only suitable for developers /
+ad-hoc testing.
+
+A more serious deployment might use Kerberos, which is done with the 'gssapi'
+mechanism
+
+ at example
+mech_list: gssapi
+keytab: /etc/qemu/krb5.tab
+ at end example
+
+For this to work the administrator of your KDC must generate a Kerberos
+principal for the server, with a name of  'qemu/somehost.example.com@@EXAMPLE.COM'
+replacing 'somehost.example.com' with the fully qualified host name of the
+machine running QEMU, and 'EXAMPLE.COM' with the Keberos Realm.
+
+Other configurations will be left as an exercise for the reader. It should
+be noted that only Digest-MD5 and GSSAPI provides a SSF layer for data
+encryption. For all other mechanisms, VNC should always be configured to
+use TLS and x509 certificates to protect security credentials from snooping.
+
 @node gdb_usage
 @section GDB usage
 
Index: qemu-kvm-0.10/qemu/qemu.sasl
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/qemu.sasl
@@ -0,0 +1,34 @@
+# If you want to use the non-TLS socket, then you *must* include
+# the GSSAPI or DIGEST-MD5 mechanisms, because they are the only
+# ones that can offer session encryption as well as authentication.
+#
+# If you're only using TLS, then you can turn on any mechanisms
+# you like for authentication, because TLS provides the encryption
+#
+# Default to a simple username+password mechanism
+# NB digest-md5 is no longer considered secure by current standards
+mech_list: digest-md5
+
+# Before you can use GSSAPI, you need a service principle on the
+# KDC server for libvirt, and that to be exported to the keytab
+# file listed below
+#mech_list: gssapi
+#
+# You can also list many mechanisms at once, then the user can choose
+# by adding  '?auth=sasl.gssapi' to their libvirt URI, eg
+#   qemu+tcp://hostname/system?auth=sasl.gssapi
+#mech_list: digest-md5 gssapi
+
+# Some older builds of MIT kerberos on Linux ignore this option &
+# instead need KRB5_KTNAME env var.
+# For modern Linux, and other OS, this should be sufficient
+keytab: /etc/qemu/krb5.tab
+
+# If using digest-md5 for username/passwds, then this is the file
+# containing the passwds. Use 'saslpasswd2 -a qemu [username]'
+# to add entries, and 'sasldblistusers2 -a qemu' to browse it
+sasldb_path: /etc/qemu/passwd.db
+
+
+auxprop_plugin: sasldb
+
Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.c
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.c
@@ -0,0 +1,626 @@
+/*
+ * QEMU VNC display driver: SASL auth protocol
+ *
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "vnc.h"
+
+/* Max amount of data we send/recv for SASL steps to prevent DOS */
+#define SASL_DATA_MAX_LEN (1024 * 1024)
+
+
+void vnc_sasl_client_cleanup(VncState *vs)
+{
+    if (vs->sasl.conn) {
+	vs->sasl.runSSF = vs->sasl.waitWriteSSF = vs->sasl.wantSSF = 0;
+	vs->sasl.encodedLength = vs->sasl.encodedOffset = 0;
+	vs->sasl.encoded = NULL;
+	free(vs->sasl.username);
+	free(vs->sasl.mechlist);
+	vs->sasl.username = vs->sasl.mechlist = NULL;
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+    }
+}
+
+
+long vnc_client_write_sasl(VncState *vs)
+{
+    long ret;
+
+    VNC_DEBUG("Write SASL: Pending output %p size %d offset %d Encoded: %p size %d offset %d\n",
+	      vs->output.buffer, vs->output.capacity, vs->output.offset,
+	      vs->sasl.encoded, vs->sasl.encodedLength, vs->sasl.encodedOffset);
+
+    if (!vs->sasl.encoded) {
+	int err;
+	err = sasl_encode(vs->sasl.conn,
+			  (char *)vs->output.buffer,
+			  vs->output.offset,
+			  (const char **)&vs->sasl.encoded,
+			  &vs->sasl.encodedLength);
+	if (err != SASL_OK)
+	    return vnc_client_io_error(vs, -1, EIO);
+
+	vs->sasl.encodedOffset = 0;
+    }
+
+    ret = vnc_client_write_buf(vs,
+			       vs->sasl.encoded + vs->sasl.encodedOffset,
+			       vs->sasl.encodedLength - vs->sasl.encodedOffset);
+    if (!ret)
+	return 0;
+
+    vs->sasl.encodedOffset += ret;
+    if (vs->sasl.encodedOffset == vs->sasl.encodedLength) {
+	vs->output.offset = 0;
+	vs->sasl.encoded = NULL;
+	vs->sasl.encodedOffset = vs->sasl.encodedLength = 0;
+    }
+
+    /* Can't merge this block with one above, because
+     * someone might have written more unencrypted
+     * data in vs->output while we were processing
+     * SASL encoded output
+     */
+    if (vs->output.offset == 0) {
+	qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
+    }
+
+    return ret;
+}
+
+
+long vnc_client_read_sasl(VncState *vs)
+{
+    long ret;
+    uint8_t encoded[4096];
+    const char *decoded;
+    unsigned int decodedLen;
+    int err;
+
+    ret = vnc_client_read_buf(vs, encoded, sizeof(encoded));
+    if (!ret)
+	return 0;
+
+    err = sasl_decode(vs->sasl.conn,
+		      (char *)encoded, ret,
+		      &decoded, &decodedLen);
+
+    if (err != SASL_OK)
+	return vnc_client_io_error(vs, -1, -EIO);
+    VNC_DEBUG("Read SASL Encoded %p size %ld Decoded %p size %d\n",
+	      encoded, ret, decoded, decodedLen);
+    buffer_reserve(&vs->input, decodedLen);
+    buffer_append(&vs->input, decoded, decodedLen);
+    return decodedLen;
+}
+
+
+static int vnc_auth_sasl_check_access(VncState *vs)
+{
+    const void *val;
+    int err;
+
+    err = sasl_getprop(vs->sasl.conn, SASL_USERNAME, &val);
+    if (err != SASL_OK) {
+	VNC_DEBUG("cannot query SASL username on connection %d (%s)\n",
+		  err, sasl_errstring(err, NULL, NULL));
+	return -1;
+    }
+    if (val == NULL) {
+	VNC_DEBUG("no client username was found\n");
+	return -1;
+    }
+    VNC_DEBUG("SASL client username %s\n", (const char *)val);
+
+    vs->sasl.username = qemu_strdup((const char*)val);
+
+    return 0;
+}
+
+static int vnc_auth_sasl_check_ssf(VncState *vs)
+{
+    const void *val;
+    int err, ssf;
+
+    if (!vs->sasl.wantSSF)
+	return 1;
+
+    err = sasl_getprop(vs->sasl.conn, SASL_SSF, &val);
+    if (err != SASL_OK)
+	return 0;
+
+    ssf = *(const int *)val;
+    VNC_DEBUG("negotiated an SSF of %d\n", ssf);
+    if (ssf < 56)
+	return 0; /* 56 is good for Kerberos */
+
+    /* Only setup for read initially, because we're about to send an RPC
+     * reply which must be in plain text. When the next incoming RPC
+     * arrives, we'll switch on writes too
+     *
+     * cf qemudClientReadSASL  in qemud.c
+     */
+    vs->sasl.runSSF = 1;
+
+    /* We have a SSF that's good enough */
+    return 1;
+}
+
+/*
+ * Step Msg
+ *
+ * Input from client:
+ *
+ * u32 clientin-length
+ * u8-array clientin-string
+ *
+ * Output to client:
+ *
+ * u32 serverout-length
+ * u8-array serverout-strin
+ * u8 continue
+ */
+
+static int protocol_client_auth_sasl_step_len(VncState *vs, uint8_t *data, size_t len);
+
+static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t len)
+{
+    uint32_t datalen = len;
+    const char *serverout;
+    unsigned int serveroutlen;
+    int err;
+    char *clientdata = NULL;
+
+    /* NB, distinction of NULL vs "" is *critical* in SASL */
+    if (datalen) {
+	clientdata = (char*)data;
+	clientdata[datalen-1] = '\0'; /* Wire includes '\0', but make sure */
+	datalen--; /* Don't count NULL byte when passing to _start() */
+    }
+
+    VNC_DEBUG("Step using SASL Data %p (%d bytes)\n",
+	      clientdata, datalen);
+    err = sasl_server_step(vs->sasl.conn,
+			   clientdata,
+			   datalen,
+			   &serverout,
+			   &serveroutlen);
+    if (err != SASL_OK &&
+	err != SASL_CONTINUE) {
+	VNC_DEBUG("sasl step failed %d (%s)\n",
+		  err, sasl_errdetail(vs->sasl.conn));
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+
+    if (serveroutlen > SASL_DATA_MAX_LEN) {
+	VNC_DEBUG("sasl step reply data too long %d\n",
+		  serveroutlen);
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+
+    VNC_DEBUG("SASL return data %d bytes, nil; %d\n",
+	      serveroutlen, serverout ? 0 : 1);
+
+    if (serveroutlen) {
+	vnc_write_u32(vs, serveroutlen + 1);
+	vnc_write(vs, serverout, serveroutlen + 1);
+    } else {
+	vnc_write_u32(vs, 0);
+    }
+
+    /* Whether auth is complete */
+    vnc_write_u8(vs, err == SASL_CONTINUE ? 0 : 1);
+
+    if (err == SASL_CONTINUE) {
+	VNC_DEBUG("%s", "Authentication must continue\n");
+	/* Wait for step length */
+	vnc_read_when(vs, protocol_client_auth_sasl_step_len, 4);
+    } else {
+	if (!vnc_auth_sasl_check_ssf(vs)) {
+	    VNC_DEBUG("Authentication rejected for weak SSF %d\n", vs->csock);
+	    goto authreject;
+	}
+
+	/* Check username whitelist ACL */
+	if (vnc_auth_sasl_check_access(vs) < 0) {
+	    VNC_DEBUG("Authentication rejected for ACL %d\n", vs->csock);
+	    goto authreject;
+	}
+
+	VNC_DEBUG("Authentication successful %d\n", vs->csock);
+	vnc_write_u32(vs, 0); /* Accept auth */
+	/*
+	 * Delay writing in SSF encoded mode until pending output
+	 * buffer is written
+	 */
+	if (vs->sasl.runSSF)
+	    vs->sasl.waitWriteSSF = vs->output.offset;
+	start_client_init(vs);
+    }
+
+    return 0;
+
+ authreject:
+    vnc_write_u32(vs, 1); /* Reject auth */
+    vnc_write_u32(vs, sizeof("Authentication failed"));
+    vnc_write(vs, "Authentication failed", sizeof("Authentication failed"));
+    vnc_flush(vs);
+    vnc_client_error(vs);
+    return -1;
+
+ authabort:
+    vnc_client_error(vs);
+    return -1;
+}
+
+static int protocol_client_auth_sasl_step_len(VncState *vs, uint8_t *data, size_t len)
+{
+    uint32_t steplen = read_u32(data, 0);
+    VNC_DEBUG("Got client step len %d\n", steplen);
+    if (steplen > SASL_DATA_MAX_LEN) {
+	VNC_DEBUG("Too much SASL data %d\n", steplen);
+	vnc_client_error(vs);
+	return -1;
+    }
+
+    if (steplen == 0)
+	return protocol_client_auth_sasl_step(vs, NULL, 0);
+    else
+	vnc_read_when(vs, protocol_client_auth_sasl_step, steplen);
+    return 0;
+}
+
+/*
+ * Start Msg
+ *
+ * Input from client:
+ *
+ * u32 clientin-length
+ * u8-array clientin-string
+ *
+ * Output to client:
+ *
+ * u32 serverout-length
+ * u8-array serverout-strin
+ * u8 continue
+ */
+
+#define SASL_DATA_MAX_LEN (1024 * 1024)
+
+static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t len)
+{
+    uint32_t datalen = len;
+    const char *serverout;
+    unsigned int serveroutlen;
+    int err;
+    char *clientdata = NULL;
+
+    /* NB, distinction of NULL vs "" is *critical* in SASL */
+    if (datalen) {
+	clientdata = (char*)data;
+	clientdata[datalen-1] = '\0'; /* Should be on wire, but make sure */
+	datalen--; /* Don't count NULL byte when passing to _start() */
+    }
+
+    VNC_DEBUG("Start SASL auth with mechanism %s. Data %p (%d bytes)\n",
+	      vs->sasl.mechlist, clientdata, datalen);
+    err = sasl_server_start(vs->sasl.conn,
+			    vs->sasl.mechlist,
+			    clientdata,
+			    datalen,
+			    &serverout,
+			    &serveroutlen);
+    if (err != SASL_OK &&
+	err != SASL_CONTINUE) {
+	VNC_DEBUG("sasl start failed %d (%s)\n",
+		  err, sasl_errdetail(vs->sasl.conn));
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+    if (serveroutlen > SASL_DATA_MAX_LEN) {
+	VNC_DEBUG("sasl start reply data too long %d\n",
+		  serveroutlen);
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+
+    VNC_DEBUG("SASL return data %d bytes, nil; %d\n",
+	      serveroutlen, serverout ? 0 : 1);
+
+    if (serveroutlen) {
+	vnc_write_u32(vs, serveroutlen + 1);
+	vnc_write(vs, serverout, serveroutlen + 1);
+    } else {
+	vnc_write_u32(vs, 0);
+    }
+
+    /* Whether auth is complete */
+    vnc_write_u8(vs, err == SASL_CONTINUE ? 0 : 1);
+
+    if (err == SASL_CONTINUE) {
+	VNC_DEBUG("%s", "Authentication must continue\n");
+	/* Wait for step length */
+	vnc_read_when(vs, protocol_client_auth_sasl_step_len, 4);
+    } else {
+	if (!vnc_auth_sasl_check_ssf(vs)) {
+	    VNC_DEBUG("Authentication rejected for weak SSF %d\n", vs->csock);
+	    goto authreject;
+	}
+
+	/* Check username whitelist ACL */
+	if (vnc_auth_sasl_check_access(vs) < 0) {
+	    VNC_DEBUG("Authentication rejected for ACL %d\n", vs->csock);
+	    goto authreject;
+	}
+
+	VNC_DEBUG("Authentication successful %d\n", vs->csock);
+	vnc_write_u32(vs, 0); /* Accept auth */
+	start_client_init(vs);
+    }
+
+    return 0;
+
+ authreject:
+    vnc_write_u32(vs, 1); /* Reject auth */
+    vnc_write_u32(vs, sizeof("Authentication failed"));
+    vnc_write(vs, "Authentication failed", sizeof("Authentication failed"));
+    vnc_flush(vs);
+    vnc_client_error(vs);
+    return -1;
+
+ authabort:
+    vnc_client_error(vs);
+    return -1;
+}
+
+static int protocol_client_auth_sasl_start_len(VncState *vs, uint8_t *data, size_t len)
+{
+    uint32_t startlen = read_u32(data, 0);
+    VNC_DEBUG("Got client start len %d\n", startlen);
+    if (startlen > SASL_DATA_MAX_LEN) {
+	VNC_DEBUG("Too much SASL data %d\n", startlen);
+	vnc_client_error(vs);
+	return -1;
+    }
+
+    if (startlen == 0)
+	return protocol_client_auth_sasl_start(vs, NULL, 0);
+
+    vnc_read_when(vs, protocol_client_auth_sasl_start, startlen);
+    return 0;
+}
+
+static int protocol_client_auth_sasl_mechname(VncState *vs, uint8_t *data, size_t len)
+{
+    char *mechname = malloc(len + 1);
+    if (!mechname) {
+	VNC_DEBUG("Out of memory reading mechname\n");
+	vnc_client_error(vs);
+    }
+    strncpy(mechname, (char*)data, len);
+    mechname[len] = '\0';
+    VNC_DEBUG("Got client mechname '%s' check against '%s'\n",
+	      mechname, vs->sasl.mechlist);
+
+    if (strncmp(vs->sasl.mechlist, mechname, len) == 0) {
+	if (vs->sasl.mechlist[len] != '\0' &&
+	    vs->sasl.mechlist[len] != ',') {
+	    VNC_DEBUG("One %d", vs->sasl.mechlist[len]);
+	    vnc_client_error(vs);
+	    return -1;
+	}
+    } else {
+	char *offset = strstr(vs->sasl.mechlist, mechname);
+	VNC_DEBUG("Two %p\n", offset);
+	if (!offset) {
+	    vnc_client_error(vs);
+	    return -1;
+	}
+	VNC_DEBUG("Two '%s'\n", offset);
+	if (offset[-1] != ',' ||
+	    (offset[len] != '\0'&&
+	     offset[len] != ',')) {
+	    vnc_client_error(vs);
+	    return -1;
+	}
+    }
+
+    free(vs->sasl.mechlist);
+    vs->sasl.mechlist = mechname;
+
+    VNC_DEBUG("Validated mechname '%s'\n", mechname);
+    vnc_read_when(vs, protocol_client_auth_sasl_start_len, 4);
+    return 0;
+}
+
+static int protocol_client_auth_sasl_mechname_len(VncState *vs, uint8_t *data, size_t len)
+{
+    uint32_t mechlen = read_u32(data, 0);
+    VNC_DEBUG("Got client mechname len %d\n", mechlen);
+    if (mechlen > 100) {
+	VNC_DEBUG("Too long SASL mechname data %d\n", mechlen);
+	vnc_client_error(vs);
+	return -1;
+    }
+    if (mechlen < 1) {
+	VNC_DEBUG("Too short SASL mechname %d\n", mechlen);
+	vnc_client_error(vs);
+	return -1;
+    }
+    vnc_read_when(vs, protocol_client_auth_sasl_mechname,mechlen);
+    return 0;
+}
+
+#define USES_X509_AUTH(vs)			      \
+    ((vs)->subauth == VNC_AUTH_VENCRYPT_X509NONE ||   \
+     (vs)->subauth == VNC_AUTH_VENCRYPT_X509VNC ||    \
+     (vs)->subauth == VNC_AUTH_VENCRYPT_X509PLAIN ||  \
+     (vs)->subauth == VNC_AUTH_VENCRYPT_X509SASL)
+
+
+void start_auth_sasl(VncState *vs)
+{
+    const char *mechlist = NULL;
+    sasl_security_properties_t secprops;
+    int err;
+    char *localAddr, *remoteAddr;
+    int mechlistlen;
+
+    VNC_DEBUG("Initialize SASL auth %d\n", vs->csock);
+
+    /* Get local & remote client addresses in form  IPADDR;PORT */
+    if (!(localAddr = vnc_socket_local_addr("%s;%s", vs->csock)))
+	goto authabort;
+
+    if (!(remoteAddr = vnc_socket_remote_addr("%s;%s", vs->csock))) {
+	free(localAddr);
+	goto authabort;
+    }
+
+    err = sasl_server_new("vnc",
+			  NULL, /* FQDN - just delegates to gethostname */
+			  NULL, /* User realm */
+			  localAddr,
+			  remoteAddr,
+			  NULL, /* Callbacks, not needed */
+			  SASL_SUCCESS_DATA,
+			  &vs->sasl.conn);
+    free(localAddr);
+    free(remoteAddr);
+    localAddr = remoteAddr = NULL;
+
+    if (err != SASL_OK) {
+	VNC_DEBUG("sasl context setup failed %d (%s)",
+		  err, sasl_errstring(err, NULL, NULL));
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+
+#ifdef CONFIG_VNC_TLS
+    /* Inform SASL that we've got an external SSF layer from TLS/x509 */
+    if (vs->vd->auth == VNC_AUTH_VENCRYPT &&
+	vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) {
+	gnutls_cipher_algorithm_t cipher;
+	sasl_ssf_t ssf;
+
+	cipher = gnutls_cipher_get(vs->tls.session);
+	if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) {
+	    VNC_DEBUG("%s", "cannot TLS get cipher size\n");
+	    sasl_dispose(&vs->sasl.conn);
+	    vs->sasl.conn = NULL;
+	    goto authabort;
+	}
+	ssf *= 8; /* tls key size is bytes, sasl wants bits */
+
+	err = sasl_setprop(vs->sasl.conn, SASL_SSF_EXTERNAL, &ssf);
+	if (err != SASL_OK) {
+	    VNC_DEBUG("cannot set SASL external SSF %d (%s)\n",
+		      err, sasl_errstring(err, NULL, NULL));
+	    sasl_dispose(&vs->sasl.conn);
+	    vs->sasl.conn = NULL;
+	    goto authabort;
+	}
+    } else
+#endif /* CONFIG_VNC_TLS */
+	vs->sasl.wantSSF = 1;
+
+    memset (&secprops, 0, sizeof secprops);
+    /* Inform SASL that we've got an external SSF layer from TLS */
+    if (strncmp(vs->vd->display, "unix:", 5) == 0
+#ifdef CONFIG_VNC_TLS
+	/* Disable SSF, if using TLS+x509+SASL only. TLS without x509
+	   is not sufficiently strong */
+	|| (vs->vd->auth == VNC_AUTH_VENCRYPT &&
+	    vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL)
+#endif /* CONFIG_VNC_TLS */
+	) {
+	/* If we've got TLS or UNIX domain sock, we don't care about SSF */
+	secprops.min_ssf = 0;
+	secprops.max_ssf = 0;
+	secprops.maxbufsize = 8192;
+	secprops.security_flags = 0;
+    } else {
+	/* Plain TCP, better get an SSF layer */
+	secprops.min_ssf = 56; /* Good enough to require kerberos */
+	secprops.max_ssf = 100000; /* Arbitrary big number */
+	secprops.maxbufsize = 8192;
+	/* Forbid any anonymous or trivially crackable auth */
+	secprops.security_flags =
+	    SASL_SEC_NOANONYMOUS | SASL_SEC_NOPLAINTEXT;
+    }
+
+    err = sasl_setprop(vs->sasl.conn, SASL_SEC_PROPS, &secprops);
+    if (err != SASL_OK) {
+	VNC_DEBUG("cannot set SASL security props %d (%s)\n",
+		  err, sasl_errstring(err, NULL, NULL));
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+
+    err = sasl_listmech(vs->sasl.conn,
+			NULL, /* Don't need to set user */
+			"", /* Prefix */
+			",", /* Separator */
+			"", /* Suffix */
+			&mechlist,
+			NULL,
+			NULL);
+    if (err != SASL_OK) {
+	VNC_DEBUG("cannot list SASL mechanisms %d (%s)\n",
+		  err, sasl_errdetail(vs->sasl.conn));
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+    VNC_DEBUG("Available mechanisms for client: '%s'\n", mechlist);
+
+    if (!(vs->sasl.mechlist = strdup(mechlist))) {
+	VNC_DEBUG("Out of memory");
+	sasl_dispose(&vs->sasl.conn);
+	vs->sasl.conn = NULL;
+	goto authabort;
+    }
+    mechlistlen = strlen(mechlist);
+    vnc_write_u32(vs, mechlistlen);
+    vnc_write(vs, mechlist, mechlistlen);
+    vnc_flush(vs);
+
+    VNC_DEBUG("Wait for client mechname length\n");
+    vnc_read_when(vs, protocol_client_auth_sasl_mechname_len, 4);
+
+    return;
+
+ authabort:
+    vnc_client_error(vs);
+    return;
+}
+
+
Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.h
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.h
@@ -0,0 +1,67 @@
+/*
+ * QEMU VNC display driver: SASL auth protocol
+ *
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#ifndef __QEMU_VNC_AUTH_SASL_H__
+#define __QEMU_VNC_AUTH_SASL_H__
+
+
+#include <sasl/sasl.h>
+
+typedef struct VncStateSASL VncStateSASL;
+
+struct VncStateSASL {
+    sasl_conn_t *conn;
+    /* If we want to negotiate an SSF layer with client */
+    int wantSSF :1;
+    /* If we are now running the SSF layer */
+    int runSSF :1;
+    /*
+     * If this is non-zero, then wait for that many bytes
+     * to be written plain, before switching to SSF encoding
+     * This allows the VNC auth result to finish being
+     * written in plain.
+     */
+    unsigned int waitWriteSSF;
+
+    /*
+     * Buffering encoded data to allow more clear data
+     * to be stuffed onto the output buffer
+     */
+    const uint8_t *encoded;
+    unsigned int encodedLength;
+    unsigned int encodedOffset;
+    char *username;
+    char *mechlist;
+};
+
+void vnc_sasl_client_cleanup(VncState *vs);
+
+long vnc_client_read_sasl(VncState *vs);
+long vnc_client_write_sasl(VncState *vs);
+
+void start_auth_sasl(VncState *vs);
+
+#endif /* __QEMU_VNC_AUTH_SASL_H__ */
+
Index: qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-auth-vencrypt.c
+++ qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c
@@ -43,8 +43,15 @@ static void start_auth_vencrypt_subauth(
        start_auth_vnc(vs);
        break;
 
+#ifdef CONFIG_VNC_SASL
+    case VNC_AUTH_VENCRYPT_TLSSASL:
+    case VNC_AUTH_VENCRYPT_X509SASL:
+      VNC_DEBUG("Start TLS auth SASL\n");
+      return start_auth_sasl(vs);
+#endif /* CONFIG_VNC_SASL */
+
     default: /* Should not be possible, but just in case */
-       VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
+       VNC_DEBUG("Reject subauth %d server bug\n", vs->vd->auth);
        vnc_write_u8(vs, 1);
        if (vs->minor >= 8) {
            static const char err[] = "Unsupported authentication type";
@@ -105,7 +112,8 @@ static void vnc_tls_handshake_io(void *o
 #define NEED_X509_AUTH(vs)			      \
     ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE ||   \
      (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC ||    \
-     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN)
+     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN ||  \
+     (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL)
 
 
 static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len)
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -68,7 +68,8 @@ static char *addr_to_string(const char *
     return addr;
 }
 
-static char *vnc_socket_local_addr(const char *format, int fd) {
+
+char *vnc_socket_local_addr(const char *format, int fd) {
     struct sockaddr_storage sa;
     socklen_t salen;
 
@@ -79,7 +80,8 @@ static char *vnc_socket_local_addr(const
     return addr_to_string(format, &sa, salen);
 }
 
-static char *vnc_socket_remote_addr(const char *format, int fd) {
+
+char *vnc_socket_remote_addr(const char *format, int fd) {
     struct sockaddr_storage sa;
     socklen_t salen;
 
@@ -125,12 +127,18 @@ static const char *vnc_auth_name(VncDisp
 	    return "vencrypt+x509+vnc";
 	case VNC_AUTH_VENCRYPT_X509PLAIN:
 	    return "vencrypt+x509+plain";
+	case VNC_AUTH_VENCRYPT_TLSSASL:
+	    return "vencrypt+tls+sasl";
+	case VNC_AUTH_VENCRYPT_X509SASL:
+	    return "vencrypt+x509+sasl";
 	default:
 	    return "vencrypt";
 	}
 #else
 	return "vencrypt";
 #endif
+    case VNC_AUTH_SASL:
+	return "sasl";
     }
     return "unknown";
 }
@@ -278,7 +286,7 @@ static void vnc_framebuffer_update(VncSt
     vnc_write_s32(vs, encoding);
 }
 
-static void buffer_reserve(Buffer *buffer, size_t len)
+void buffer_reserve(Buffer *buffer, size_t len)
 {
     if ((buffer->capacity - buffer->offset) < len) {
 	buffer->capacity += (len + 1024);
@@ -290,22 +298,22 @@ static void buffer_reserve(Buffer *buffe
     }
 }
 
-static int buffer_empty(Buffer *buffer)
+int buffer_empty(Buffer *buffer)
 {
     return buffer->offset == 0;
 }
 
-static uint8_t *buffer_end(Buffer *buffer)
+uint8_t *buffer_end(Buffer *buffer)
 {
     return buffer->buffer + buffer->offset;
 }
 
-static void buffer_reset(Buffer *buffer)
+void buffer_reset(Buffer *buffer)
 {
 	buffer->offset = 0;
 }
 
-static void buffer_append(Buffer *buffer, const void *data, size_t len)
+void buffer_append(Buffer *buffer, const void *data, size_t len)
 {
     memcpy(buffer->buffer + buffer->offset, data, len);
     buffer->offset += len;
@@ -821,7 +829,8 @@ static void audio_del(VncState *vs)
     }
 }
 
-static int vnc_client_io_error(VncState *vs, int ret, int last_errno)
+
+int vnc_client_io_error(VncState *vs, int ret, int last_errno)
 {
     if (ret == 0 || ret == -1) {
         if (ret == -1) {
@@ -847,6 +856,9 @@ static int vnc_client_io_error(VncState 
 #ifdef CONFIG_VNC_TLS
 	vnc_tls_client_cleanup(vs);
 #endif /* CONFIG_VNC_TLS */
+#ifdef CONFIG_VNC_SASL
+        vnc_sasl_client_cleanup(vs);
+#endif /* CONFIG_VNC_SASL */
         audio_del(vs);
 
         VncState *p, *parent = NULL;
@@ -877,14 +889,28 @@ void vnc_client_error(VncState *vs)
     vnc_client_io_error(vs, -1, EINVAL);
 }
 
-void vnc_client_write(void *opaque)
+
+/*
+ * Called to write a chunk of data to the client socket. The data may
+ * be the raw data, or may have already been encoded by SASL.
+ * The data will be written either straight onto the socket, or
+ * written via the GNUTLS wrappers, if TLS/SSL encryption is enabled
+ *
+ * NB, it is theoretically possible to have 2 layers of encryption,
+ * both SASL, and this TLS layer. It is highly unlikely in practice
+ * though, since SASL encryption will typically be a no-op if TLS
+ * is active
+ *
+ * Returns the number of bytes written, which may be less than
+ * the requested 'datalen' if the socket would block. Returns
+ * -1 on error, and disconnects the client socket.
+ */
+long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen)
 {
     long ret;
-    VncState *vs = opaque;
-
 #ifdef CONFIG_VNC_TLS
     if (vs->tls.session) {
-	ret = gnutls_write(vs->tls.session, vs->output.buffer, vs->output.offset);
+	ret = gnutls_write(vs->tls.session, data, datalen);
 	if (ret < 0) {
 	    if (ret == GNUTLS_E_AGAIN)
 		errno = EAGAIN;
@@ -894,10 +920,42 @@ void vnc_client_write(void *opaque)
 	}
     } else
 #endif /* CONFIG_VNC_TLS */
-	ret = send(vs->csock, vs->output.buffer, vs->output.offset, 0);
-    ret = vnc_client_io_error(vs, ret, socket_error());
+	ret = send(vs->csock, data, datalen, 0);
+    VNC_DEBUG("Wrote wire %p %d -> %ld\n", data, datalen, ret);
+    return vnc_client_io_error(vs, ret, socket_error());
+}
+
+
+/*
+ * Called to write buffered data to the client socket, when not
+ * using any SASL SSF encryption layers. Will write as much data
+ * as possible without blocking. If all buffered data is written,
+ * will switch the FD poll() handler back to read monitoring.
+ *
+ * Returns the number of bytes written, which may be less than
+ * the buffered output data if the socket would block. Returns
+ * -1 on error, and disconnects the client socket.
+ */
+static long vnc_client_write_plain(VncState *vs)
+{
+    long ret;
+
+#ifdef CONFIG_VNC_SASL
+    VNC_DEBUG("Write Plain: Pending output %p size %d offset %d. Wait SSF %d\n",
+              vs->output.buffer, vs->output.capacity, vs->output.offset,
+              vs->sasl.waitWriteSSF);
+
+    if (vs->sasl.conn &&
+        vs->sasl.runSSF &&
+        vs->sasl.waitWriteSSF) {
+        ret = vnc_client_write_buf(vs, vs->output.buffer, vs->sasl.waitWriteSSF);
+        if (ret)
+            vs->sasl.waitWriteSSF -= ret;
+    } else
+#endif /* CONFIG_VNC_SASL */
+        ret = vnc_client_write_buf(vs, vs->output.buffer, vs->output.offset);
     if (!ret)
-	return;
+        return 0;
 
     memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret));
     vs->output.offset -= ret;
@@ -905,6 +963,29 @@ void vnc_client_write(void *opaque)
     if (vs->output.offset == 0) {
 	qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
     }
+
+    return ret;
+}
+
+
+/*
+ * First function called whenever there is data to be written to
+ * the client socket. Will delegate actual work according to whether
+ * SASL SSF layers are enabled (thus requiring encryption calls)
+ */
+void vnc_client_write(void *opaque)
+{
+    long ret;
+    VncState *vs = opaque;
+
+#ifdef CONFIG_VNC_SASL
+    if (vs->sasl.conn &&
+        vs->sasl.runSSF &&
+        !vs->sasl.waitWriteSSF)
+        ret = vnc_client_write_sasl(vs);
+    else
+#endif /* CONFIG_VNC_SASL */
+        ret = vnc_client_write_plain(vs);
 }
 
 void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
@@ -913,16 +994,28 @@ void vnc_read_when(VncState *vs, VncRead
     vs->read_handler_expect = expecting;
 }
 
-void vnc_client_read(void *opaque)
+
+/*
+ * Called to read a chunk of data from the client socket. The data may
+ * be the raw data, or may need to be further decoded by SASL.
+ * The data will be read either straight from to the socket, or
+ * read via the GNUTLS wrappers, if TLS/SSL encryption is enabled
+ *
+ * NB, it is theoretically possible to have 2 layers of encryption,
+ * both SASL, and this TLS layer. It is highly unlikely in practice
+ * though, since SASL encryption will typically be a no-op if TLS
+ * is active
+ *
+ * Returns the number of bytes read, which may be less than
+ * the requested 'datalen' if the socket would block. Returns
+ * -1 on error, and disconnects the client socket.
+ */
+long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen)
 {
-    VncState *vs = opaque;
     long ret;
-
-    buffer_reserve(&vs->input, 4096);
-
 #ifdef CONFIG_VNC_TLS
     if (vs->tls.session) {
-	ret = gnutls_read(vs->tls.session, buffer_end(&vs->input), 4096);
+	ret = gnutls_read(vs->tls.session, data, datalen);
 	if (ret < 0) {
 	    if (ret == GNUTLS_E_AGAIN)
 		errno = EAGAIN;
@@ -932,12 +1025,52 @@ void vnc_client_read(void *opaque)
 	}
     } else
 #endif /* CONFIG_VNC_TLS */
-	ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0);
-    ret = vnc_client_io_error(vs, ret, socket_error());
-    if (!ret)
-	return;
+	ret = recv(vs->csock, data, datalen, 0);
+    VNC_DEBUG("Read wire %p %d -> %ld\n", data, datalen, ret);
+    return vnc_client_io_error(vs, ret, socket_error());
+}
 
+
+/*
+ * Called to read data from the client socket to the input buffer,
+ * when not using any SASL SSF encryption layers. Will read as much
+ * data as possible without blocking.
+ *
+ * Returns the number of bytes read. Returns -1 on error, and
+ * disconnects the client socket.
+ */
+static long vnc_client_read_plain(VncState *vs)
+{
+    int ret;
+    VNC_DEBUG("Read plain %p size %d offset %d\n",
+              vs->input.buffer, vs->input.capacity, vs->input.offset);
+    buffer_reserve(&vs->input, 4096);
+    ret = vnc_client_read_buf(vs, buffer_end(&vs->input), 4096);
+    if (!ret)
+        return 0;
     vs->input.offset += ret;
+    return ret;
+}
+
+
+/*
+ * First function called whenever there is more data to be read from
+ * the client socket. Will delegate actual work according to whether
+ * SASL SSF layers are enabled (thus requiring decryption calls)
+ */
+void vnc_client_read(void *opaque)
+{
+    VncState *vs = opaque;
+    long ret;
+
+#ifdef CONFIG_VNC_SASL
+    if (vs->sasl.conn && vs->sasl.runSSF)
+        ret = vnc_client_read_sasl(vs);
+    else
+#endif /* CONFIG_VNC_SASL */
+        ret = vnc_client_read_plain(vs);
+    if (!ret)
+	return;
 
     while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) {
 	size_t len = vs->read_handler_expect;
@@ -1722,6 +1855,13 @@ static int protocol_client_auth(VncState
            break;
 #endif /* CONFIG_VNC_TLS */
 
+#ifdef CONFIG_VNC_SASL
+       case VNC_AUTH_SASL:
+           VNC_DEBUG("Accept SASL auth\n");
+           start_auth_sasl(vs);
+           break;
+#endif /* CONFIG_VNC_SASL */
+
        default: /* Should not be possible, but just in case */
            VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
            vnc_write_u8(vs, 1);
@@ -1923,6 +2063,10 @@ int vnc_display_open(DisplayState *ds, c
 #ifdef CONFIG_VNC_TLS
     int tls = 0, x509 = 0;
 #endif
+#ifdef CONFIG_VNC_SASL
+    int sasl = 0;
+    int saslErr;
+#endif
 
     if (!vnc_display)
         return -1;
@@ -1942,6 +2086,10 @@ int vnc_display_open(DisplayState *ds, c
 	    reverse = 1;
 	} else if (strncmp(options, "to=", 3) == 0) {
             to_port = atoi(options+3) + 5900;
+#ifdef CONFIG_VNC_SASL
+	} else if (strncmp(options, "sasl", 4) == 0) {
+	    sasl = 1; /* Require SASL auth */
+#endif
 #ifdef CONFIG_VNC_TLS
 	} else if (strncmp(options, "tls", 3) == 0) {
 	    tls = 1; /* Require TLS */
@@ -1978,6 +2126,22 @@ int vnc_display_open(DisplayState *ds, c
 	}
     }
 
+    /*
+     * Combinations we support here:
+     *
+     *  - no-auth                (clear text, no auth)
+     *  - password               (clear text, weak auth)
+     *  - sasl                   (encrypt, good auth *IF* using Kerberos via GSSAPI)
+     *  - tls                    (encrypt, weak anonymous creds, no auth)
+     *  - tls + password         (encrypt, weak anonymous creds, weak auth)
+     *  - tls + sasl             (encrypt, weak anonymous creds, good auth)
+     *  - tls + x509             (encrypt, good x509 creds, no auth)
+     *  - tls + x509 + password  (encrypt, good x509 creds, weak auth)
+     *  - tls + x509 + sasl      (encrypt, good x509 creds, good auth)
+     *
+     * NB1. TLS is a stackable auth scheme.
+     * NB2. the x509 schemes have option to validate a client cert dname
+     */
     if (password) {
 #ifdef CONFIG_VNC_TLS
 	if (tls) {
@@ -1990,13 +2154,34 @@ int vnc_display_open(DisplayState *ds, c
 		vs->subauth = VNC_AUTH_VENCRYPT_TLSVNC;
 	    }
 	} else {
-#endif
+#endif /* CONFIG_VNC_TLS */
 	    VNC_DEBUG("Initializing VNC server with password auth\n");
 	    vs->auth = VNC_AUTH_VNC;
 #ifdef CONFIG_VNC_TLS
 	    vs->subauth = VNC_AUTH_INVALID;
 	}
-#endif
+#endif /* CONFIG_VNC_TLS */
+#ifdef CONFIG_VNC_SASL
+    } else if (sasl) {
+#ifdef CONFIG_VNC_TLS
+        if (tls) {
+            vs->auth = VNC_AUTH_VENCRYPT;
+            if (x509) {
+		VNC_DEBUG("Initializing VNC server with x509 SASL auth\n");
+                vs->subauth = VNC_AUTH_VENCRYPT_X509SASL;
+            } else {
+		VNC_DEBUG("Initializing VNC server with TLS SASL auth\n");
+                vs->subauth = VNC_AUTH_VENCRYPT_TLSSASL;
+            }
+        } else {
+#endif /* CONFIG_VNC_TLS */
+	    VNC_DEBUG("Initializing VNC server with SASL auth\n");
+            vs->auth = VNC_AUTH_SASL;
+#ifdef CONFIG_VNC_TLS
+            vs->subauth = VNC_AUTH_INVALID;
+        }
+#endif /* CONFIG_VNC_TLS */
+#endif /* CONFIG_VNC_SASL */
     } else {
 #ifdef CONFIG_VNC_TLS
 	if (tls) {
@@ -2018,6 +2203,16 @@ int vnc_display_open(DisplayState *ds, c
 #endif
     }
 
+#ifdef CONFIG_VNC_SASL
+    if ((saslErr = sasl_server_init(NULL, "qemu")) != SASL_OK) {
+        fprintf(stderr, "Failed to initialize SASL auth %s",
+                sasl_errstring(saslErr, NULL, NULL));
+        free(vs->display);
+        vs->display = NULL;
+        return -1;
+    }
+#endif
+
     if (reverse) {
         /* connect to viewer */
         if (strncmp(display, "unix:", 5) == 0)
Index: qemu-kvm-0.10/qemu/vnc.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.h
+++ qemu-kvm-0.10/qemu/vnc.h
@@ -79,6 +79,10 @@ typedef struct VncDisplay VncDisplay;
 #include "vnc-tls.h"
 #include "vnc-auth-vencrypt.h"
 #endif
+#ifdef CONFIG_VNC_SASL
+#include "vnc-auth-sasl.h"
+#endif
+
 
 struct VncDisplay
 {
@@ -118,10 +122,12 @@ struct VncState
     int minor;
 
     char challenge[VNC_AUTH_CHALLENGE_SIZE];
-
 #ifdef CONFIG_VNC_TLS
     VncStateTLS tls;
 #endif
+#ifdef CONFIG_VNC_SASL
+    VncStateSASL sasl;
+#endif
 
     Buffer output;
     Buffer input;
@@ -160,8 +166,9 @@ enum {
     VNC_AUTH_RA2NE = 6,
     VNC_AUTH_TIGHT = 16,
     VNC_AUTH_ULTRA = 17,
-    VNC_AUTH_TLS = 18,
-    VNC_AUTH_VENCRYPT = 19
+    VNC_AUTH_TLS = 18,      /* Supported in GTK-VNC & VINO */
+    VNC_AUTH_VENCRYPT = 19, /* Supported in GTK-VNC & VeNCrypt */
+    VNC_AUTH_SASL = 20,     /* Supported in GTK-VNC & VINO */
 };
 
 enum {
@@ -172,6 +179,8 @@ enum {
     VNC_AUTH_VENCRYPT_X509NONE = 260,
     VNC_AUTH_VENCRYPT_X509VNC = 261,
     VNC_AUTH_VENCRYPT_X509PLAIN = 262,
+    VNC_AUTH_VENCRYPT_X509SASL = 263,
+    VNC_AUTH_VENCRYPT_TLSSASL = 264,
 };
 
 
@@ -255,6 +264,8 @@ enum {
 void vnc_client_read(void *opaque);
 void vnc_client_write(void *opaque);
 
+long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen);
+long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen);
 
 /* Protocol I/O functions */
 void vnc_write(VncState *vs, const void *data, size_t len);
@@ -274,8 +285,22 @@ uint32_t read_u32(uint8_t *data, size_t 
 
 /* Protocol stage functions */
 void vnc_client_error(VncState *vs);
+int vnc_client_io_error(VncState *vs, int ret, int last_errno);
 
 void start_client_init(VncState *vs);
 void start_auth_vnc(VncState *vs);
 
+/* Buffer management */
+void buffer_reserve(Buffer *buffer, size_t len);
+int buffer_empty(Buffer *buffer);
+uint8_t *buffer_end(Buffer *buffer);
+void buffer_reset(Buffer *buffer);
+void buffer_append(Buffer *buffer, const void *data, size_t len);
+
+
+/* Misc helpers */
+
+char *vnc_socket_local_addr(const char *format, int fd);
+char *vnc_socket_remote_addr(const char *format, int fd);
+
 #endif /* __QEMU_VNC_H */

07-vnc-monitor-authinfo.patch:

--- NEW FILE 07-vnc-monitor-authinfo.patch ---
Index: qemu-kvm-0.10/qemu/vnc-tls.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-tls.c
+++ qemu-kvm-0.10/qemu/vnc-tls.c
@@ -241,6 +241,22 @@ int vnc_tls_validate_certificate(struct 
 	    return -1;
 	}
 
+	if (i == 0) {
+	    size_t dnameSize = 1024;
+	    vs->tls.dname = qemu_malloc(dnameSize);
+	requery:
+	    if ((ret = gnutls_x509_crt_get_dn (cert, vs->tls.dname, &dnameSize)) != 0) {
+		if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER) {
+		    vs->tls.dname = qemu_realloc(vs->tls.dname, dnameSize);
+		    goto requery;
+		}
+		gnutls_x509_crt_deinit (cert);
+		VNC_DEBUG("Cannot get client distinguished name: %s",
+			  gnutls_strerror (ret));
+		return -1;
+	    }
+	}
+
 	gnutls_x509_crt_deinit (cert);
     }
 
@@ -347,6 +363,7 @@ void vnc_tls_client_cleanup(struct VncSt
 	vs->tls.session = NULL;
     }
     vs->tls.wiremode = VNC_WIREMODE_CLEAR;
+    free(vs->tls.dname);
 }
 
 
Index: qemu-kvm-0.10/qemu/vnc-tls.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-tls.h
+++ qemu-kvm-0.10/qemu/vnc-tls.h
@@ -55,6 +55,9 @@ struct VncStateTLS {
     /* Whether data is being TLS encrypted yet */
     int wiremode;
     gnutls_session_t session;
+
+    /* Client's Distinguished Name from the x509 cert */
+    char *dname;
 };
 
 int vnc_tls_client_setup(VncState *vs, int x509Creds);
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState 
     term_puts("Client:\n");
     term_puts(clientAddr);
     free(clientAddr);
+
+#ifdef CONFIG_VNC_TLS
+    if (client->tls.session &&
+	client->tls.dname)
+	term_printf("  x509 dname: %s\n", client->tls.dname);
+    else
+	term_puts("  x509 dname: none\n");
+#endif
+#ifdef CONFIG_VNC_SASL
+    if (client->sasl.conn &&
+	client->sasl.username)
+	term_printf("    username: %s\n", client->sasl.username);
+    else
+	term_puts("    username: none\n");
+#endif
 }
 
 void do_info_vnc(void)
@@ -1823,7 +1838,7 @@ static int protocol_client_auth(VncState
     /* We only advertise 1 auth scheme at a time, so client
      * must pick the one we sent. Verify this */
     if (data[0] != vs->vd->auth) { /* Reject auth */
-       VNC_DEBUG("Reject auth %d\n", (int)data[0]);
+       VNC_DEBUG("Reject auth %d because it didn't match advertized\n", (int)data[0]);
        vnc_write_u32(vs, 1);
        if (vs->minor >= 8) {
            static const char err[] = "Authentication failed";
@@ -1863,7 +1878,7 @@ static int protocol_client_auth(VncState
 #endif /* CONFIG_VNC_SASL */
 
        default: /* Should not be possible, but just in case */
-           VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
+           VNC_DEBUG("Reject auth %d server code bug\n", vs->vd->auth);
            vnc_write_u8(vs, 1);
            if (vs->minor >= 8) {
                static const char err[] = "Authentication failed";

08-vnc-acl-mgmt.patch:

--- NEW FILE 08-vnc-acl-mgmt.patch ---
Index: qemu-kvm-0.10/qemu/Makefile
===================================================================
--- qemu-kvm-0.10.orig/qemu/Makefile
+++ qemu-kvm-0.10/qemu/Makefile
@@ -148,7 +148,7 @@ endif
 ifdef CONFIG_CURSES
 OBJS+=curses.o
 endif
-OBJS+=vnc.o d3des.o
+OBJS+=vnc.o acl.o d3des.o
 ifdef CONFIG_VNC_TLS
 OBJS+=vnc-tls.o vnc-auth-vencrypt.o
 endif
@@ -178,9 +178,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h
 
 sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
 
+acl.o: acl.h acl.c
+
 vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
 
-vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h
+vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h
 
 vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 
Index: qemu-kvm-0.10/qemu/acl.c
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/acl.c
@@ -0,0 +1,185 @@
+/*
+ * QEMU access control list management
+ *
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#include "qemu-common.h"
+#include "sysemu.h"
+#include "acl.h"
+
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#endif
+
+
+static unsigned int nacls = 0;
+static qemu_acl **acls = NULL;
+
+
+
+qemu_acl *qemu_acl_find(const char *aclname)
+{
+    int i;
+    for (i = 0 ; i < nacls ; i++) {
+	if (strcmp(acls[i]->aclname, aclname) == 0)
+	    return acls[i];
+    }
+
+    return NULL;
+}
+
+qemu_acl *qemu_acl_init(const char *aclname)
+{
+    qemu_acl *acl;
+
+    acl = qemu_acl_find(aclname);
+    if (acl)
+	return acl;
+
+    acl = qemu_malloc(sizeof(*acl));
+    acl->aclname = qemu_strdup(aclname);
+    /* Deny by default, so there is no window of "open
+     * access" between QEMU starting, and the user setting
+     * up ACLs in the monitor */
+    acl->defaultDeny = 1;
+
+    acl->nentries = 0;
+    TAILQ_INIT(&acl->entries);
+
+    acls = qemu_realloc(acls, sizeof(*acls) * (nacls +1));
+    acls[nacls] = acl;
+    nacls++;
+
+    return acl;
+}
+
+int qemu_acl_party_is_allowed(qemu_acl *acl,
+			      const char *party)
+{
+    qemu_acl_entry *entry;
+
+    TAILQ_FOREACH(entry, &acl->entries, next) {
+#ifdef HAVE_FNMATCH_H
+	if (fnmatch(entry->match, party, 0) == 0)
+	    return entry->deny ? 0 : 1;
+#else
+	/* No fnmatch, so fallback to exact string matching
+	 * instead of allowing wildcards */
+	if (strcmp(entry->match, party) == 0)
+	    return entry->deny ? 0 : 1;
+#endif
+    }
+
+    return acl->defaultDeny ? 0 : 1;
+}
+
+
+void qemu_acl_reset(qemu_acl *acl)
+{
+    qemu_acl_entry *entry;
+
+    /* Put back to deny by default, so there is no window
+     * of "open access" while the user re-initializes the
+     * access control list */
+    acl->defaultDeny = 1;
+    TAILQ_FOREACH(entry, &acl->entries, next) {
+	TAILQ_REMOVE(&acl->entries, entry, next);
+	free(entry->match);
+	free(entry);
+    }
+    acl->nentries = 0;
+}
+
+
+int qemu_acl_append(qemu_acl *acl,
+		    int deny,
+		    const char *match)
+{
+    qemu_acl_entry *entry;
+
+    entry = qemu_malloc(sizeof(*entry));
+    entry->match = qemu_strdup(match);
+    entry->deny = deny;
+
+    TAILQ_INSERT_TAIL(&acl->entries, entry, next);
+    acl->nentries++;
+
+    return acl->nentries;
+}
+
+
+int qemu_acl_insert(qemu_acl *acl,
+		    int deny,
+		    const char *match,
+		    int index)
+{
+    qemu_acl_entry *entry;
+    qemu_acl_entry *tmp;
+    int i = 0;
+
+    if (index <= 0)
+	return -1;
+    if (index >= acl->nentries)
+	return qemu_acl_append(acl, deny, match);
+
+
+    entry = qemu_malloc(sizeof(*entry));
+    entry->match = qemu_strdup(match);
+    entry->deny = deny;
+
+    TAILQ_FOREACH(tmp, &acl->entries, next) {
+	i++;
+	if (i == index) {
+	    TAILQ_INSERT_BEFORE(tmp, entry, next);
+	    acl->nentries++;
+	    break;
+	}
+    }
+
+    return i;
+}
+
+int qemu_acl_remove(qemu_acl *acl,
+		    const char *match)
+{
+    qemu_acl_entry *entry;
+    int i = 0;
+
+    TAILQ_FOREACH(entry, &acl->entries, next) {
+	i++;
+	if (strcmp(entry->match, match) == 0) {
+	    TAILQ_REMOVE(&acl->entries, entry, next);
+	    return i;
+	}
+    }
+    return -1;
+}
+
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 8
+ * End:
+ */
Index: qemu-kvm-0.10/qemu/acl.h
===================================================================
--- /dev/null
+++ qemu-kvm-0.10/qemu/acl.h
@@ -0,0 +1,74 @@
+/*
+ * QEMU access control list management
+ *
+ * Copyright (C) 2009 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __QEMU_ACL_H__
+#define __QEMU_ACL_H__
+
+#include "sys-queue.h"
+
+typedef struct qemu_acl_entry qemu_acl_entry;
+typedef struct qemu_acl qemu_acl;
+
+struct qemu_acl_entry {
+    char *match;
+    int deny;
+
+    TAILQ_ENTRY(qemu_acl_entry) next;
+};
+
+struct qemu_acl {
+    char *aclname;
+    unsigned int nentries;
+    TAILQ_HEAD(,qemu_acl_entry) entries;
+    int defaultDeny;
+};
+
+qemu_acl *qemu_acl_init(const char *aclname);
+
+qemu_acl *qemu_acl_find(const char *aclname);
+
+int qemu_acl_party_is_allowed(qemu_acl *acl,
+			      const char *party);
+
+void qemu_acl_reset(qemu_acl *acl);
+
+int qemu_acl_append(qemu_acl *acl,
+		    int deny,
+		    const char *match);
+int qemu_acl_insert(qemu_acl *acl,
+		    int deny,
+		    const char *match,
+		    int index);
+int qemu_acl_remove(qemu_acl *acl,
+		    const char *match);
+
+#endif /* __QEMU_ACL_H__ */
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 8
+ * End:
+ */
Index: qemu-kvm-0.10/qemu/configure
===================================================================
--- qemu-kvm-0.10.orig/qemu/configure
+++ qemu-kvm-0.10/qemu/configure
@@ -913,6 +913,21 @@ EOF
 fi
 
 ##########################################
+# fnmatch() probe, used for ACL routines
+fnmatch="no"
+cat > $TMPC << EOF
+#include <fnmatch.h>
+int main(void)
+{
+    fnmatch("foo", "foo", 0);
+    return 0;
+}
+EOF
+if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
+   fnmatch="yes"
+fi
+
+##########################################
 # vde libraries probe
 if test "$vde" = "yes" ; then
   cat > $TMPC << EOF
@@ -1501,6 +1516,9 @@ if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
   echo "#define CONFIG_VNC_SASL 1" >> $config_h
 fi
+if test "$fnmatch" = "yes" ; then
+  echo "#define HAVE_FNMATCH_H 1" >> $config_h
+fi
 qemu_version=`head $source_path/VERSION`
 echo "VERSION=$qemu_version" >>$config_mak
 echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
Index: qemu-kvm-0.10/qemu/monitor.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/monitor.c
+++ qemu-kvm-0.10/qemu/monitor.c
@@ -39,6 +39,7 @@
 #include "qemu-timer.h"
 #include "migration.h"
 #include "kvm.h"
+#include "acl.h"
 
 #include "qemu-kvm.h"
 
@@ -1498,6 +1499,85 @@ static void do_info_balloon(void)
         term_printf("balloon: actual=%d\n", (int)(actual >> 20));
 }
 
+static void do_acl(const char *command,
+		   const char *aclname,
+		   const char *match,
+		   int has_index,
+		   int index)
+{
+    qemu_acl *acl;
+
+    acl = qemu_acl_find(aclname);
+    if (!acl) {
+	term_printf("acl: unknown list '%s'\n", aclname);
+	return;
+    }
+
+    if (strcmp(command, "show") == 0) {
+	int i = 0;
+	qemu_acl_entry *entry;
+	term_printf("policy: %s\n",
+		    acl->defaultDeny ? "deny" : "allow");
+	TAILQ_FOREACH(entry, &acl->entries, next) {
+	    i++;
+	    term_printf("%d: %s %s\n", i,
+			entry->deny ? "deny" : "allow",
+			entry->match);
+	}
+    } else if (strcmp(command, "reset") == 0) {
+	qemu_acl_reset(acl);
+	term_printf("acl: removed all rules\n");
+    } else if (strcmp(command, "policy") == 0) {
+	if (!match) {
+	    term_printf("acl: missing policy parameter\n");
+	    return;
+	}
+
+	if (strcmp(match, "allow") == 0) {
+	    acl->defaultDeny = 0;
+	    term_printf("acl: policy set to 'allow'\n");
+	} else if (strcmp(match, "deny") == 0) {
+	    acl->defaultDeny = 1;
+	    term_printf("acl: policy set to 'deny'\n");
+	} else {
+	    term_printf("acl: unknown policy '%s', expected 'deny' or 'allow'\n", match);
+	}
+    } else if ((strcmp(command, "allow") == 0) ||
+	       (strcmp(command, "deny") == 0)) {
+	int deny = strcmp(command, "deny") == 0 ? 1 : 0;
+	int ret;
+
+	if (!match) {
+	    term_printf("acl: missing match parameter\n");
+	    return;
+	}
+
+	if (has_index)
+	    ret = qemu_acl_insert(acl, deny, match, index);
+	else
+	    ret = qemu_acl_append(acl, deny, match);
+	if (ret < 0)
+	    term_printf("acl: unable to add acl entry\n");
+	else
+	    term_printf("acl: added rule at position %d\n", ret);
+    } else if (strcmp(command, "remove") == 0) {
+	int ret;
+
+	if (!match) {
+	    term_printf("acl: missing match parameter\n");
+	    return;
+	}
+
+	ret = qemu_acl_remove(acl, match);
+	if (ret < 0)
+	    term_printf("acl: no matching acl entry\n");
+	else
+	    term_printf("acl: removed rule at position %d\n", ret);
+    } else {
+	term_printf("acl: unknown command '%s'\n", command);
+    }
+}
+
 /* Please update qemu-doc.texi when adding or changing commands */
 static const term_cmd_t term_cmds[] = {
     { "help|?", "s?", do_help,
@@ -1603,6 +1683,12 @@ static const term_cmd_t term_cmds[] = {
     { "set_link", "ss", do_set_link,
       "name [up|down]", "change the link status of a network adapter" },
     { "set_link", "ss", do_set_link, "name [up|down]" },
+    { "acl", "sss?i?", do_acl, "<command> <aclname> [<match>] [<index>]\n",
+                                "acl show vnc.username\n"
+                                "acl policy vnc.username deny\n"
+                                "acl allow vnc.username fred\n"
+                                "acl deny vnc.username bob\n"
+                                "acl reset vnc.username\n" },
     { "cpu_set", "is", do_cpu_set_nr, "cpu [online|offline]", "change cpu state" },
 #if defined(TARGET_I386) || defined(TARGET_X86_64)
     { "drive_add", "iss", drive_hot_add, "pcibus pcidevfn [file=file][,if=type][,bus=n]\n"
@@ -1611,6 +1697,7 @@ static const term_cmd_t term_cmds[] = {
                                         "[snapshot=on|off][,cache=on|off]",
                                         "add drive to PCI storage controller" },
 #endif
+
     { NULL, NULL, },
 };
 
@@ -2995,3 +3082,12 @@ int monitor_read_bdrv_key(BlockDriverSta
     }
     return -EPERM;
 }
+
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 8
+ * End:
+ */
Index: qemu-kvm-0.10/qemu/qemu-doc.texi
===================================================================
--- qemu-kvm-0.10.orig/qemu/qemu-doc.texi
+++ qemu-kvm-0.10/qemu/qemu-doc.texi
@@ -639,6 +639,19 @@ ensures a data encryption preventing com
 credentials. See the @ref{vnc_security} section for details on using
 SASL authentication.
 
+ at item acl
+
+Turn on access control lists for checking of the x509 client certificate
+and SASL party. For x509 certs, the ACL check is made against the
+certificate's distinguished name. This is something that looks like
+ at code{C=GB,O=ACME,L=Boston,CN=bob}. For SASL party, the ACL check is
+made against the username, which depending on the SASL plugin, may
+include a realm component, eg @code{bob} or @code{bob\@EXAMPLE.COM}.
+When the @option{acl} flag is set, the initial access list will be
+empty, with a @code{deny} policy. Thus no one will be allowed to
+use the VNC server until the ACLs have been loaded. This can be
+achieved using the @code{acl} monitor command.
+
 @end table
 
 @end table
@@ -1400,6 +1413,42 @@ Password: ********
 
 @end table
 
+ at item acl @var{subcommand} @var{aclname} @var{match} @var{index}
+
+Manage access control lists for network services. There are currently
+two named access control lists, @var{vnc.x509dname} and @var{vnc.username}
+matching on the x509 client certificate distinguished name, and SASL
+username respectively.
+
+ at table @option
+ at item acl show <aclname>
+list all the match rules in the access control list, and the default
+policy
+ at item acl policy <aclname> @code{allow|deny}
+set the default access control list policy, used in the event that
+none of the explicit rules match. The default policy at startup is
+always @code{deny}
+ at item acl allow <aclname> <match> [<index>]
+add a match to the access control list, allowing access. The match will
+normally be an exact username or x509 distinguished name, but can
+optionally include wildcard globs. eg @code{*\@EXAMPLE.COM} to allow
+all users in the @code{EXAMPLE.COM} kerberos realm. The match will
+normally be appended to the end of the ACL, but can be inserted
+earlier in the list if the optional @code{index} parameter is supplied.
+ at item acl deny <aclname> <match> [<index>]
+add a match to the access control list, denying access. The match will
+normally be an exact username or x509 distinguished name, but can
+optionally include wildcard globs. eg @code{*\@EXAMPLE.COM} to allow
+all users in the @code{EXAMPLE.COM} kerberos realm. The match will
+normally be appended to the end of the ACL, but can be inserted
+earlier in the list if the optional @code{index} parameter is supplied.
+ at item acl remove <aclname> <match>
+remove the specified match rule from the access control list.
+ at item acl reset <aclname>
+remove all matches from the access control list, and set the default
+policy back to @code{deny}.
+ at end table
+
 @item screendump @var{filename}
 Save screen into PPM image @var{filename}.
 
Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-auth-sasl.c
+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.c
@@ -120,22 +120,32 @@ static int vnc_auth_sasl_check_access(Vn
 {
     const void *val;
     int err;
+    int allow;
 
     err = sasl_getprop(vs->sasl.conn, SASL_USERNAME, &val);
     if (err != SASL_OK) {
-	VNC_DEBUG("cannot query SASL username on connection %d (%s)\n",
+	VNC_DEBUG("cannot query SASL username on connection %d (%s), denying access\n",
 		  err, sasl_errstring(err, NULL, NULL));
 	return -1;
     }
     if (val == NULL) {
-	VNC_DEBUG("no client username was found\n");
+	VNC_DEBUG("no client username was found, denying access\n");
 	return -1;
     }
     VNC_DEBUG("SASL client username %s\n", (const char *)val);
 
     vs->sasl.username = qemu_strdup((const char*)val);
 
-    return 0;
+    if (vs->vd->sasl.acl == NULL) {
+	VNC_DEBUG("no ACL activated, allowing access\n");
+	return 0;
+    }
+
+    allow = qemu_acl_party_is_allowed(vs->vd->sasl.acl, vs->sasl.username);
+
+    VNC_DEBUG("SASL client %s %s by ACL\n", vs->sasl.username,
+	      allow ? "allowed" : "denied");
+    return allow ? 0 : -1;
 }
 
 static int vnc_auth_sasl_check_ssf(VncState *vs)
Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-auth-sasl.h
+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.h
@@ -30,6 +30,9 @@
 #include <sasl/sasl.h>
 
 typedef struct VncStateSASL VncStateSASL;
+typedef struct VncDisplaySASL VncDisplaySASL;
+
+#include "acl.h"
 
 struct VncStateSASL {
     sasl_conn_t *conn;
@@ -56,6 +59,10 @@ struct VncStateSASL {
     char *mechlist;
 };
 
+struct VncDisplaySASL {
+    qemu_acl *acl;
+};
+
 void vnc_sasl_client_cleanup(VncState *vs);
 
 long vnc_client_read_sasl(VncState *vs);
Index: qemu-kvm-0.10/qemu/vnc-tls.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-tls.c
+++ qemu-kvm-0.10/qemu/vnc-tls.c
@@ -255,6 +255,25 @@ int vnc_tls_validate_certificate(struct 
 			  gnutls_strerror (ret));
 		return -1;
 	    }
+
+	    if (vs->vd->tls.x509verify) {
+		int allow;
+		if (!vs->vd->tls.acl) {
+		    VNC_DEBUG("no ACL activated, allowing access");
+		    gnutls_x509_crt_deinit (cert);
+		    continue;
+		}
+
+		allow = qemu_acl_party_is_allowed(vs->vd->tls.acl,
+						  vs->tls.dname);
+
+		VNC_DEBUG("TLS x509 ACL check for %s is %s\n",
+			  vs->tls.dname, allow ? "allowed" : "denied");
+		if (!allow) {
+		    gnutls_x509_crt_deinit (cert);
+		    return -1;
+		}
+	    }
 	}
 
 	gnutls_x509_crt_deinit (cert);
Index: qemu-kvm-0.10/qemu/vnc-tls.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc-tls.h
+++ qemu-kvm-0.10/qemu/vnc-tls.h
@@ -31,6 +31,8 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
+#include "acl.h"
+
 enum {
     VNC_WIREMODE_CLEAR,
     VNC_WIREMODE_TLS,
@@ -42,6 +44,7 @@ typedef struct VncStateTLS VncStateTLS;
 /* Server state */
 struct VncDisplayTLS {
     int x509verify; /* Non-zero if server requests & validates client cert */
+    qemu_acl *acl;
 
     /* Paths to x509 certs/keys */
     char *x509cacert;
Index: qemu-kvm-0.10/qemu/vnc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.c
+++ qemu-kvm-0.10/qemu/vnc.c
@@ -28,6 +28,7 @@
 #include "sysemu.h"
 #include "qemu_socket.h"
 #include "qemu-timer.h"
+#include "acl.h"
 
 #define VNC_REFRESH_INTERVAL (1000 / 30)
 
@@ -2082,6 +2083,7 @@ int vnc_display_open(DisplayState *ds, c
     int sasl = 0;
     int saslErr;
 #endif
+    int acl = 0;
 
     if (!vnc_display)
         return -1;
@@ -2138,9 +2140,28 @@ int vnc_display_open(DisplayState *ds, c
 		return -1;
 	    }
 #endif
+	} else if (strncmp(options, "acl", 3) == 0) {
+	    acl = 1;
 	}
     }
 
+#ifdef CONFIG_VNC_TLS
+    if (acl && x509 && vs->tls.x509verify) {
+	if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) {
+	    fprintf(stderr, "Failed to create x509 dname ACL\n");
+	    exit(1);
+	}
+    }
+#endif
+#ifdef CONFIG_VNC_SASL
+    if (acl && sasl) {
+	if (!(vs->sasl.acl = qemu_acl_init("vnc.username"))) {
+	    fprintf(stderr, "Failed to create username ACL\n");
+	    exit(1);
+	}
+    }
+#endif
+
     /*
      * Combinations we support here:
      *
Index: qemu-kvm-0.10/qemu/vnc.h
===================================================================
--- qemu-kvm-0.10.orig/qemu/vnc.h
+++ qemu-kvm-0.10/qemu/vnc.h
@@ -98,6 +98,9 @@ struct VncDisplay
     int subauth; /* Used by VeNCrypt */
     VncDisplayTLS tls;
 #endif
+#ifdef CONFIG_VNC_SASL
+    VncDisplaySASL sasl;
+#endif
 };
 
 struct VncState


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Mar 2009 01:28:56 -0000	1.13
+++ .cvsignore	2 Apr 2009 01:07:39 -0000	1.14
@@ -1 +1 @@
-qemu-kvm-devel-85rc1.git-snapshot-20090323.tar.gz
+qemu-kvm-0.10.tar.gz

kvm-upstream-ppc.patch:

Index: kvm-upstream-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/kvm-upstream-ppc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kvm-upstream-ppc.patch	11 Mar 2009 00:02:51 -0000	1.2
+++ kvm-upstream-ppc.patch	2 Apr 2009 01:07:39 -0000	1.3
@@ -18,10 +18,10 @@
  target-ppc/helper.c    |    2 +-
  4 files changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c
-index 00d82e4..164c326 100644
---- a/qemu/hw/ppc440.c
-+++ b/qemu/hw/ppc440.c
+Index: qemu-kvm-0.10/qemu/hw/ppc440.c
+===================================================================
+--- qemu-kvm-0.10.orig/qemu/hw/ppc440.c
++++ qemu-kvm-0.10/qemu/hw/ppc440.c
 @@ -18,6 +18,7 @@
  #include "ppc440.h"
  #include "ppc405.h"
@@ -30,10 +30,10 @@
  #include "kvm.h"
  
  #define PPC440EP_PCI_CONFIG     0xeec00000
-diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c
-index fbd447c..60ddaf4 100644
---- a/qemu/hw/ppc440_bamboo.c
-+++ b/qemu/hw/ppc440_bamboo.c
+Index: qemu-kvm-0.10/qemu/hw/ppc440_bamboo.c
+===================================================================
+--- qemu-kvm-0.10.orig/qemu/hw/ppc440_bamboo.c
++++ qemu-kvm-0.10/qemu/hw/ppc440_bamboo.c
 @@ -21,6 +21,7 @@
  #include "boards.h"
  #include "sysemu.h"
@@ -42,10 +42,10 @@
  #include "kvm.h"
  #include "kvm_ppc.h"
  #include "device_tree.h"
-diff --git a/qemu/hw/ppce500_mpc8544ds.c b/qemu/hw/ppce500_mpc8544ds.c
-index 3d73f8a..d8ea947 100644
---- a/qemu/hw/ppce500_mpc8544ds.c
-+++ b/qemu/hw/ppce500_mpc8544ds.c
+Index: qemu-kvm-0.10/qemu/hw/ppce500_mpc8544ds.c
+===================================================================
+--- qemu-kvm-0.10.orig/qemu/hw/ppce500_mpc8544ds.c
++++ qemu-kvm-0.10/qemu/hw/ppce500_mpc8544ds.c
 @@ -16,6 +16,7 @@
  
  #include <dirent.h>
@@ -54,10 +54,10 @@
  #include "config.h"
  #include "qemu-common.h"
  #include "net.h"
-diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c
-index 80b53eb..e8dc384 100644
---- a/qemu/target-ppc/helper.c
-+++ b/qemu/target-ppc/helper.c
+Index: qemu-kvm-0.10/qemu/target-ppc/helper.c
+===================================================================
+--- qemu-kvm-0.10.orig/qemu/target-ppc/helper.c
++++ qemu-kvm-0.10/qemu/target-ppc/helper.c
 @@ -29,6 +29,7 @@
  #include "exec-all.h"
  #include "helper_regs.h"
@@ -66,6 +66,3 @@
  #include "kvm.h"
  
  //#define DEBUG_MMU
--- 
-1.6.1.2
-


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- qemu.spec	25 Mar 2009 09:51:13 -0000	1.70
+++ qemu.spec	2 Apr 2009 01:07:39 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 0.12.kvm20090323git%{?dist}
+Release: 1%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -16,11 +16,23 @@
 # mkdir $(HOME)/sf-releases
 # ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD
 
-Source0: qemu-kvm-devel-85rc1.git-snapshot-20090323.tar.gz
+Source0: qemu-kvm-%{version}.tar.gz
 Source1: qemu.init
 Source2: kvm.modules
 
-Patch1: kvm-upstream-ppc.patch
+
+Patch1: 01-tls-handshake-fix.patch
+Patch2: 02-vnc-monitor-info.patch
+Patch3: 03-display-keymaps.patch
+Patch4: 04-vnc-struct.patch
+Patch5: 05-vnc-tls-vencrypt.patch
+Patch6: 06-vnc-sasl.patch
+Patch7: 07-vnc-monitor-authinfo.patch
+Patch8: 08-vnc-acl-mgmt.patch
+
+Patch9: kvm-upstream-ppc.patch
+Patch10: qemu-fix-debuginfo.patch
+Patch11: qemu-fix-gcc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -55,7 +67,6 @@
 %package  img
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %description img
 QEMU is a generic and open source processor emulator which achieves a good 
 emulation speed by using dynamic translation.
@@ -106,6 +117,7 @@
 Summary: QEMU system emulator for ppc
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: openbios-ppc
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
@@ -183,8 +195,19 @@
 %endif
 
 %prep
-%setup -q -n qemu-kvm-devel-85rc1.git-snapshot-20090323
+%setup -q -n qemu-kvm-%{version}
+
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -212,6 +235,8 @@
 ./configure --target-list=x86_64-softmmu \
             --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \
             --audio-drv-list=sdl,alsa,oss \
+            --with-patched-kernel \
+            --disable-strip \
             --qemu-ldflags=$extraldflags \
             --qemu-cflags="$RPM_OPT_FLAGS"
 
@@ -236,6 +261,7 @@
     --prefix=%{_prefix} \
     --interp-prefix=%{_prefix}/qemu-%%M \
     --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \
+    --disable-strip \
     --disable-kvm \
     --extra-ldflags=$extraldflags \
     --audio-drv-list=sdl,alsa,oss \
@@ -275,6 +301,9 @@
 rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin
 rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/vgabios*bin
 rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/bios.bin
+rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/openbios-ppc
+rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/openbios-sparc32
+rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/openbios-sparc64
 
 # the pxe etherboot images will be symlinks to the images on
 # /usr/share/etherboot, as QEMU doesn't know how to look
@@ -291,6 +320,9 @@
 ln -s ../vgabios/VGABIOS-lgpl-latest.bin  %{buildroot}/%{_prefix}/share/qemu/vgabios.bin
 ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/%{_prefix}/share/qemu/vgabios-cirrus.bin
 ln -s ../bochs/BIOS-bochs-kvm %{buildroot}/%{_prefix}/share/qemu/bios.bin
+ln -s ../openbios/openbios-ppc %{buildroot}/%{_prefix}/share/qemu/openbios-ppc
+ln -s ../openbios/openbios-sparc32 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc32
+ln -s ../openbios/openbios-sparc64 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc64
 
 
 
@@ -331,7 +363,7 @@
 %doc %{qemudocdir}/COPYING 
 %doc %{qemudocdir}/COPYING.LIB 
 %doc %{qemudocdir}/LICENSE
-%{_prefix}/share/qemu/
+%dir %{_prefix}/share/qemu/
 %{_prefix}/share/qemu/keymaps/
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man8/qemu-nbd.8*
@@ -364,6 +396,11 @@
 %{_prefix}/share/qemu/bios.bin
 %{_prefix}/share/qemu/vgabios.bin
 %{_prefix}/share/qemu/vgabios-cirrus.bin
+%{_prefix}/share/qemu/pxe-e1000.bin
+%{_prefix}/share/qemu/pxe-virtio.bin
+%{_prefix}/share/qemu/pxe-pcnet.bin
+%{_prefix}/share/qemu/pxe-rtl8139.bin
+%{_prefix}/share/qemu/pxe-ne2k_pci.bin
 %ifarch %{ix86} x86_64
 %{_prefix}/share/qemu/extboot.bin
 %{_bindir}/qemu-kvm
@@ -393,6 +430,10 @@
 %{_bindir}/qemu-system-ppc
 %{_bindir}/qemu-system-ppc64
 %{_bindir}/qemu-system-ppcemb
+%{_prefix}/share/qemu/openbios-ppc
+%{_prefix}/share/qemu/video.x
+%{_prefix}/share/qemu/bamboo.dtb
+%{_prefix}/share/qemu/ppc_rom.bin
 %files system-cris
 %defattr(-,root,root)
 %{_bindir}/qemu-system-cris
@@ -410,6 +451,18 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Apr 01 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-1
+- Include debuginfo for qemu-img
+- Do not require qemu-common for qemu-img
+- Explicitly own each of the firmware files
+- remove firmwares for ppc and sparc. They should be provided by an external package.
+  Not that the packages exists for sparc in the secondary arch repo as noarch, but they
+  don't automatically get into main repos. Unfortunately it's the best we can do right
+  now.
+- rollback a bit in time. Snapshot from avi's maint/2.6.30
+  - this requires the sasl patches to come back.
+  - with-patched-kernel comes back.
+
 * Wed Mar 25 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-0.12.kvm20090323git
 - BuildRequires pciutils-devel for device assignment (#492076)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Mar 2009 01:28:56 -0000	1.13
+++ sources	2 Apr 2009 01:07:39 -0000	1.14
@@ -1 +1 @@
-67eac5a4ab26bfa159539d49bd30a89d  qemu-kvm-devel-85rc1.git-snapshot-20090323.tar.gz
+04c32fb43c722f180654f53e04ad17dd  qemu-kvm-0.10.tar.gz



From whot at fedoraproject.org  Thu Apr  2 01:19:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  2 Apr 2009 01:19:51 +0000 (UTC)
Subject: rpms/gsynaptics/devel gsynaptics-0.9.14-tapping-gconf.patch, NONE, 
	1.1 gsynaptics.spec, 1.21, 1.22
Message-ID: <20090402011951.E6D9770120@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gsynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10730

Modified Files:
	gsynaptics.spec 
Added Files:
	gsynaptics-0.9.14-tapping-gconf.patch 
Log Message:
* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-6
- gsynaptics-0.9.14-tapping-gconf.patch: set a gconf key when tapping is
  enabled or disabled.



gsynaptics-0.9.14-tapping-gconf.patch:

--- NEW FILE gsynaptics-0.9.14-tapping-gconf.patch ---
>From 46b822e1e7b9a88091637d193922e83247ccf6f1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 2 Apr 2009 10:50:46 +1000
Subject: [PATCH] Add a gconf-key for tapping.

---
 src/gsynaptics-conf.h |    1 +
 src/main.c            |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gsynaptics-conf.h b/src/gsynaptics-conf.h
index df58daf..8e903a4 100644
--- a/src/gsynaptics-conf.h
+++ b/src/gsynaptics-conf.h
@@ -26,6 +26,7 @@ G_BEGIN_DECLS
 #define DIRNAME		 	"/desktop/gnome/peripherals/touchpad"
 #define SENSITIVITY_KEY 	"/desktop/gnome/peripherals/touchpad/sensitivity"
 #define OFF_KEY 		"/desktop/gnome/peripherals/touchpad/off"
+#define TAPPING_KEY 		"/desktop/gnome/peripherals/touchpad/tapping"
 #define MAXTAPTIME_KEY 		"/desktop/gnome/peripherals/touchpad/max_tap_time"
 #define HORIZSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/horiz_scroll_delta"
 #define VERTSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/vert_scroll_delta"
diff --git a/src/main.c b/src/main.c
index 9a475e8..fecd343 100644
--- a/src/main.c
+++ b/src/main.c
@@ -223,6 +223,7 @@ cb_tapping_toggled (GtkToggleButton *button, GladeXML *dialog)
 	g_synaptics_set_button_for_tap(synaptics, F1_TAP, check ? 1 : 0);
 	g_synaptics_set_button_for_tap(synaptics, F2_TAP, check ? 3 : 0);
 	g_synaptics_set_button_for_tap(synaptics, F3_TAP, check ? 2 : 0);
+	gconf_client_set_bool(gconf, TAPPING_KEY, check, NULL);
 	gconf_client_set_int (gconf, MAXTAPTIME_KEY, time, NULL);
 }
 
-- 
1.6.0.6



Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gsynaptics.spec	2 Apr 2009 00:34:30 -0000	1.21
+++ gsynaptics.spec	2 Apr 2009 01:19:21 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gsynaptics
 Version:        0.9.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -20,6 +20,7 @@
 Patch7:         gsynaptics-0.9.14-driver-header.patch
 Patch8:         gsynaptics-0.9.14-fix-scrolling-checkboxes.patch
 Patch9:         gsynaptics-0.9.14-scrollmethods.patch
+Patch10:        gsynaptics-0.9.14-tapping-gconf.patch
 
 Source1:        %{name}-touchpad.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,7 @@
 %patch7 -p1 -b .header
 %patch8 -p1 -b .scrl-chkbx-fix
 %patch9 -p1 -b .scrollmethods
+%patch10 -p1 -b .tapping-gconf
 
 %build
 autoreconf -v --install --force || exit 1
@@ -103,6 +105,10 @@
 
 
 %changelog
+* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-6
+- gsynaptics-0.9.14-tapping-gconf.patch: set a gconf key when tapping is
+  enabled or disabled.
+
 * Mon Apr 2 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-5
 - gsynaptics-0.9.14-scrolling-checkboxes.patch: set checkboxes based on the
   scrolling enabled/disabled property, not on the delta.



From rmeggins at fedoraproject.org  Thu Apr  2 01:40:02 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 01:40:02 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 ppc1.patch, NONE, 1.1 fedora-ds-base.spec, 
	1.26, 1.27
Message-ID: <20090402014002.361A470120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14906

Modified Files:
	fedora-ds-base.spec 
Added Files:
	ppc1.patch 
Log Message:
added ppc1.patch

ppc1.patch:

--- NEW FILE ppc1.patch ---
--- ldap/include/portable.h	10 Nov 2006 23:44:41 -0000	1.5
+++ ldap/include/portable.h	2 Apr 2009 01:35:36 -0000
@@ -322,23 +322,18 @@
 #elif defined( OSF1V3 )
 #define CTIME( c, b, l )		(ctime_r( c, b, l ) ? NULL : b)
 #else
 #define CTIME( c, b, l )		ctime_r( c, b, l )
 #endif
 #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \
     defined(SCOOS) || defined(BSDI) || defined(NCR) || \
     defined(NEC) || defined(LINUX2_0)
-/* strtok() is not MT safe, but it is okay to call here because used in mmt_protocol.xs which 
-   has been moved in the tetframewrok */
-#define STRTOK( s1, s2, l )		strtok( s1, s2 )
 #else
 #define HAVE_STRTOK_R
-char *strtok_r(char *, const char *, char **);
-#define STRTOK( s1, s2, l )		(char *)strtok_r( s1, s2, l )
 #endif /* STRTOK */
 #endif /* UNIX */
 
 #if defined( ultrix ) || defined( nextstep )
 extern char *strdup();
 #endif /* ultrix || nextstep */
 
 #if defined( sunos4 ) || defined( OSF1 )


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fedora-ds-base.spec	1 Apr 2009 19:55:09 -0000	1.26
+++ fedora-ds-base.spec	2 Apr 2009 01:39:31 -0000	1.27
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -60,6 +60,7 @@
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
+Patch1:           ppc1.patch
 
 %description
 Fedora Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -76,6 +77,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1
 cp %{SOURCE2} README.devel
 
 %build
@@ -169,6 +171,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Apr  1 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
+- added patch for ppc build
+
 * Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
 - new release 1.2.0
 - Made devel package depend on mozldap-devel



From glommer at fedoraproject.org  Thu Apr  2 01:49:05 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Thu,  2 Apr 2009 01:49:05 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-debuginfo.patch, NONE, 1.1 qemu.spec, 1.71,
	1.72
Message-ID: <20090402014905.5835070120@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17018

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-debuginfo.patch 
Log Message:
love of CVS.



qemu-fix-debuginfo.patch:

--- NEW FILE qemu-fix-debuginfo.patch ---
From: Riku Voipio <riku.voipio at iki.fi>
Subject: [Qemu-devel] [PATCH] Make binary stripping conditional

Currently qemu unconditionally strips binaries on install. This
is a problem for packagers who may want to store/ship debug symbols
of compiled packages for debugging purposes.

Keep stripping as default for the oldtimers and add a
--disable-strip flag to override.

Signed-off-by: Riku Voipio <riku.voipio at iki.fi>
---
 Makefile        |    2 +-
 Makefile.target |    2 +-
 configure       |    9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

Index: qemu-kvm-0.10/qemu/Makefile
===================================================================
--- qemu-kvm-0.10.orig/qemu/Makefile
+++ qemu-kvm-0.10/qemu/Makefile
@@ -256,7 +256,7 @@ endif
 install: all $(if $(BUILD_DOCS),install-doc)
 	mkdir -p "$(DESTDIR)$(bindir)"
 ifneq ($(TOOLS),)
-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+	$(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
 ifneq ($(BLOBS),)
 	mkdir -p "$(DESTDIR)$(datadir)"
Index: qemu-kvm-0.10/qemu/configure
===================================================================
--- qemu-kvm-0.10.orig/qemu/configure
+++ qemu-kvm-0.10/qemu/configure
@@ -154,6 +154,7 @@ case "$cpu" in
 esac
 gprof="no"
 sparse="no"
+strip_opt="yes"
 bigendian="no"
 mingw32="no"
 EXESUF=""
@@ -403,6 +404,8 @@ for opt do
   ;;
   --disable-sparse) sparse="no"
   ;;
+  --disable-strip) strip_opt="no"
+  ;;
   --disable-vnc-tls) vnc_tls="no"
   ;;
   --disable-vnc-sasl) vnc_sasl="no"
@@ -556,6 +559,7 @@ echo "  --install=INSTALL        use spe
 echo "  --static                 enable static build [$static]"
 echo "  --enable-sparse          enable sparse checker"
 echo "  --disable-sparse         disable sparse checker (default)"
+echo "  --disable-strip          disable stripping binaries"
 echo "  --disable-werror         disable compilation abort on warning"
 echo "  --disable-sdl            disable SDL"
 echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
@@ -1242,6 +1246,7 @@ echo "host big endian   $bigendian"
 echo "target list       $target_list"
 echo "gprof enabled     $gprof"
 echo "sparse enabled    $sparse"
+echo "strip binaries    $strip_opt"
 echo "profiler          $profiler"
 echo "static build      $static"
 echo "-Werror enabled   $werror"
@@ -1318,7 +1323,6 @@ echo "INSTALL=$install" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "HOST_CC=$host_cc" >> $config_mak
 echo "AR=$ar" >> $config_mak
-echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
 # XXX: only use CFLAGS and LDFLAGS ?  
 # XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross
 # compilation of dyngen tool (useful for win32 build on Linux host)
@@ -1405,6 +1409,9 @@ if test "$sparse" = "yes" ; then
   echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_mak
   echo "CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak
 fi
+if test "$strip_opt" = "yes" ; then
+  echo "STRIP_OPT=-s" >> $config_mak
+fi
 if test "$bigendian" = "yes" ; then
   echo "WORDS_BIGENDIAN=yes" >> $config_mak
   echo "#define WORDS_BIGENDIAN 1" >> $config_h


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- qemu.spec	2 Apr 2009 01:07:39 -0000	1.71
+++ qemu.spec	2 Apr 2009 01:48:35 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -451,6 +451,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Apr 01 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-2
+- added missing patch. love for CVS.
+
 * Wed Apr 01 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-1
 - Include debuginfo for qemu-img
 - Do not require qemu-common for qemu-img



From whot at fedoraproject.org  Thu Apr  2 01:54:06 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  2 Apr 2009 01:54:06 +0000 (UTC)
Subject: rpms/gsynaptics/devel .cvsignore, 1.9,
	1.10 gsynaptics-0.9.14-scrollmethods.patch, 1.1,
	1.2 gsynaptics.spec, 1.22, 1.23 sources, 1.9, 1.10
Message-ID: <20090402015406.34A7970120@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gsynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17978

Modified Files:
	.cvsignore gsynaptics-0.9.14-scrollmethods.patch 
	gsynaptics.spec sources 
Log Message:
* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.16-1
- rebase to 0.9.16




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Jul 2008 00:30:51 -0000	1.9
+++ .cvsignore	2 Apr 2009 01:53:34 -0000	1.10
@@ -1,2 +1,2 @@
-gsynaptics-0.9.14.tar.gz
 gsynaptics-touchpad.png
+gsynaptics-0.9.16.tar.gz

gsynaptics-0.9.14-scrollmethods.patch:

Index: gsynaptics-0.9.14-scrollmethods.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics-0.9.14-scrollmethods.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsynaptics-0.9.14-scrollmethods.patch	2 Apr 2009 00:34:30 -0000	1.1
+++ gsynaptics-0.9.14-scrollmethods.patch	2 Apr 2009 01:53:34 -0000	1.2
@@ -1,18 +1,18 @@
-From ed0ff114f059eab1c18e354b665fe858b5022301 Mon Sep 17 00:00:00 2001
+From 7c958b0d8ae28ad980036849ffdf7def56b6e072 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 1 Apr 2009 13:39:12 +1000
-Subject: [PATCH] Add radiobuttons for twofinger/edge scrolling
+Date: Thu, 2 Apr 2009 11:33:30 +1000
+Subject: [PATCH] foo
 
 ---
- data/gsynaptics.glade |   74 +++++++++++++++++++++++++++++++++++++++-------
+ data/gsynaptics.glade |   71 +++++++++++++++++++++++++++++++++++++++-----
  src/gsynaptics-conf.h |    2 +-
  src/gsynaptics.c      |   78 ++++++++++++++++++++++++++++++++++++++++--------
  src/gsynaptics.h      |   12 +++++--
  src/main.c            |   54 ++++++++++++++++++++++++---------
- 5 files changed, 176 insertions(+), 44 deletions(-)
+ 5 files changed, 176 insertions(+), 41 deletions(-)
 
 diff --git a/data/gsynaptics.glade b/data/gsynaptics.glade
-index c3fa58d..b8a7a13 100644
+index c3fa58d..8e09d99 100644
 --- a/data/gsynaptics.glade
 +++ b/data/gsynaptics.glade
 @@ -558,16 +558,69 @@
@@ -95,10 +95,10 @@
  			    <packing>
  			      <property name="padding">0</property>
 diff --git a/src/gsynaptics-conf.h b/src/gsynaptics-conf.h
-index 8dc788b..df58daf 100644
+index f8c8bcc..8e903a4 100644
 --- a/src/gsynaptics-conf.h
 +++ b/src/gsynaptics-conf.h
-@@ -29,7 +29,7 @@ G_BEGIN_DECLS
+@@ -30,7 +30,7 @@ G_BEGIN_DECLS
  #define MAXTAPTIME_KEY 		"/desktop/gnome/peripherals/touchpad/max_tap_time"
  #define HORIZSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/horiz_scroll_delta"
  #define VERTSCROLLDELTA_KEY 	"/desktop/gnome/peripherals/touchpad/vert_scroll_delta"
@@ -108,7 +108,7 @@
  #define EDGEMOTIONUSEALWAYS_KEY "/desktop/gnome/peripherals/touchpad/edge_motion_use_always"
  #define COASTENABLE_KEY 	"/desktop/gnome/peripherals/touchpad/coast_enable"
 diff --git a/src/gsynaptics.c b/src/gsynaptics.c
-index 6f9b6a3..93706f5 100644
+index 6f9b6a3..1e294a2 100644
 --- a/src/gsynaptics.c
 +++ b/src/gsynaptics.c
 @@ -299,11 +299,13 @@ g_synaptics_is_horizontal_scroll_enabled (GSynaptics *synaptics)
@@ -253,7 +253,7 @@
  
  void
 diff --git a/src/gsynaptics.h b/src/gsynaptics.h
-index 8fced65..30bb3af 100644
+index 8fced65..ec9350c 100644
 --- a/src/gsynaptics.h
 +++ b/src/gsynaptics.h
 @@ -58,6 +58,12 @@ typedef enum
@@ -290,7 +290,7 @@
  							 gint        delta);
  void		g_synaptics_set_vertical_scroll_delta   (GSynaptics *synaptics,
 diff --git a/src/main.c b/src/main.c
-index c7089f3..fbbb19b 100644
+index cea688e..93e00cd 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -131,20 +131,30 @@ cb_touchpad_toggled (GtkToggleButton *button, GladeXML *dialog)
@@ -332,7 +332,7 @@
  }
  
  static void
-@@ -517,7 +527,7 @@ setup_dialog (GladeXML *dialog)
+@@ -518,7 +528,7 @@ setup_dialog (GladeXML *dialog)
  {
  	GdkPixbuf *icon_pixbuf = NULL;
  	GtkWidget *widget, *button;
@@ -341,13 +341,13 @@
  	GSynaptics *synaptics;
  	
  	gchar *path;
-@@ -571,12 +581,25 @@ setup_dialog (GladeXML *dialog)
- 	g_signal_connect (G_OBJECT (scale), "change-value",
+@@ -572,12 +582,25 @@ setup_dialog (GladeXML *dialog)
+ 	g_signal_connect (scale, "change-value",
  			  G_CALLBACK (cb_vertical_scroll_change), dialog);
  
 -	check = WID ("vertical_scroll_check");
 -	value = g_synaptics_is_vertical_scroll_enabled (synaptics);
--	g_signal_connect (G_OBJECT (check), "toggled",
+-	g_signal_connect (check, "toggled",
 -			  G_CALLBACK (cb_vertical_scroll_toggled), dialog);
 -	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
 -	    			      value);
@@ -373,13 +373,13 @@
  
  	scale = WID ("horizontal_scroll_scale");
  	num = g_synaptics_horizontal_scroll_delta (synaptics);
-@@ -585,6 +608,7 @@ setup_dialog (GladeXML *dialog)
+@@ -586,6 +609,7 @@ setup_dialog (GladeXML *dialog)
  			  G_CALLBACK (cb_horizontal_scroll_change), dialog);
  
  	check = WID ("horizontal_scroll_check");
 +	gtk_widget_set_sensitive(check, (value != ScrollingDisabled));
  	value = g_synaptics_is_horizontal_scroll_enabled (synaptics);
- 	g_signal_connect (G_OBJECT (check), "toggled",
+ 	g_signal_connect (check, "toggled",
  			  G_CALLBACK (cb_horizontal_scroll_toggled), dialog);
 -- 
 1.6.0.6


Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gsynaptics.spec	2 Apr 2009 01:19:21 -0000	1.22
+++ gsynaptics.spec	2 Apr 2009 01:53:34 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           gsynaptics
-Version:        0.9.14
-Release:        6%{?dist}
+Version:        0.9.16
+Release:        1%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -11,11 +11,6 @@
 # until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 gets fixed
 Patch0:         gsynaptics-0.9.14-dot-fixes.patch
 Patch1:         gsynaptics-0.9.14-do-not-set-zero.patch
-Patch2:         gsynaptics-0.9.14-pixmap.patch
-# 3 4 5 are merged upstream
-Patch3:         gsynaptics-0.9.14-fix-tap-statecheck.patch
-Patch4:         gsynaptics-0.9.14-enable-tapping.patch
-Patch5:         gsynaptics-0.9.14-dont-reset-taptime.patch
 Patch6:         gsynaptics-0.9.14-scrolling-checkboxes.patch
 Patch7:         gsynaptics-0.9.14-driver-header.patch
 Patch8:         gsynaptics-0.9.14-fix-scrolling-checkboxes.patch
@@ -53,10 +48,6 @@
 install -p %{SOURCE1} data/touchpad.png
 %patch0 -p1 -b .dot-fixes
 %patch1 -p1 -b .zero
-%patch2 -p1 -b .pixmap
-%patch3 -p1 -b .tap-checkbox
-%patch4 -p1 -b .tapping
-%patch5 -p1 -b .taptime
 %patch6 -p1 -b .scrl-chkbx
 %patch7 -p1 -b .header
 %patch8 -p1 -b .scrl-chkbx-fix
@@ -105,6 +96,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.16-1
+- rebase to 0.9.16
+
 * Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-6
 - gsynaptics-0.9.14-tapping-gconf.patch: set a gconf key when tapping is
   enabled or disabled.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Jul 2008 00:30:51 -0000	1.9
+++ sources	2 Apr 2009 01:53:34 -0000	1.10
@@ -1,2 +1,2 @@
-5cf556b26085444288f087587a92484c  gsynaptics-0.9.14.tar.gz
 d2fc5db12827fc363f655daebca46e8e  gsynaptics-touchpad.png
+571828ddca2f1d9d6ea47e072db1959d  gsynaptics-0.9.16.tar.gz



From glommer at fedoraproject.org  Thu Apr  2 01:54:17 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Thu,  2 Apr 2009 01:54:17 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-gcc.patch,NONE,1.1 qemu.spec,1.72,1.73
Message-ID: <20090402015417.A627E70120@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18013

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-gcc.patch 
Log Message:
again ;-)



qemu-fix-gcc.patch:

--- NEW FILE qemu-fix-gcc.patch ---
>From 2ced1d80f01645885ac2e28107f724886eb1cd5a Mon Sep 17 00:00:00 2001
From: Jochen Roth <jroth at linux.vnet.ibm.com>
Date: Thu, 12 Mar 2009 14:19:19 +0100
Subject: [PATCH] kvm: testsuite: compile fix - avoid raw string literal

This patch fixes compilation problems of kvm-userspace on current gcc
4.4 compilers which implement the following standard:
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm

Signed-off-by: Jochen Roth <jroth at linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi at redhat.com>
---
 user/test/x86/apic.c   |   32 ++++++++++++++++----------------
 user/test/x86/vmexit.c |    2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

Index: qemu-kvm-0.10/user/test/x86/apic.c
===================================================================
--- qemu-kvm-0.10.orig/user/test/x86/apic.c
+++ qemu-kvm-0.10/user/test/x86/apic.c
@@ -54,14 +54,14 @@ asm (
     "push %r9  \n\t"
     "push %r8  \n\t"
 #endif
-    "push %"R"di \n\t"
-    "push %"R"si \n\t"
-    "push %"R"bp \n\t"
-    "push %"R"sp \n\t"
-    "push %"R"bx \n\t"
-    "push %"R"dx \n\t"
-    "push %"R"cx \n\t"
-    "push %"R"ax \n\t"
+    "push %"R "di \n\t"
+    "push %"R "si \n\t"
+    "push %"R "bp \n\t"
+    "push %"R "sp \n\t"
+    "push %"R "bx \n\t"
+    "push %"R "dx \n\t"
+    "push %"R "cx \n\t"
+    "push %"R "ax \n\t"
 #ifdef __x86_64__
     "mov %rsp, %rdi \n\t"
     "callq *8*16(%rsp) \n\t"
@@ -70,14 +70,14 @@ asm (
     "calll *4+4*8(%esp) \n\t"
     "add $4, %esp \n\t"
 #endif
-    "pop %"R"ax \n\t"
-    "pop %"R"cx \n\t"
-    "pop %"R"dx \n\t"
-    "pop %"R"bx \n\t"
-    "pop %"R"bp \n\t"
-    "pop %"R"bp \n\t"
-    "pop %"R"si \n\t"
-    "pop %"R"di \n\t"
+    "pop %"R "ax \n\t"
+    "pop %"R "cx \n\t"
+    "pop %"R "dx \n\t"
+    "pop %"R "bx \n\t"
+    "pop %"R "bp \n\t"
+    "pop %"R "bp \n\t"
+    "pop %"R "si \n\t"
+    "pop %"R "di \n\t"
 #ifdef __x86_64__
     "pop %r8  \n\t"
     "pop %r9  \n\t"
Index: qemu-kvm-0.10/user/test/x86/vmexit.c
===================================================================
--- qemu-kvm-0.10.orig/user/test/x86/vmexit.c
+++ qemu-kvm-0.10/user/test/x86/vmexit.c
@@ -31,7 +31,7 @@ int main()
 
 	t1 = rdtsc();
 	for (i = 0; i < N; ++i)
-		asm volatile ("push %%"R"bx; cpuid; pop %%"R"bx"
+		asm volatile ("push %%"R "bx; cpuid; pop %%"R "bx"
 			      : : : "eax", "ecx", "edx");
 	t2 = rdtsc();
 	printf("vmexit latency: %d\n", (int)((t2 - t1) / N));


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- qemu.spec	2 Apr 2009 01:48:35 -0000	1.72
+++ qemu.spec	2 Apr 2009 01:53:47 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2



From pkgdb at fedoraproject.org  Thu Apr  2 01:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:56:58 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090402015639.099DA208514@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase-runtime (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Thu Apr  2 01:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:56:43 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090402015643.BBBF72087F3@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase-runtime (Fedora 8) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:06 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090402015647.0DFA22087F8@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase-runtime (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:08 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090402015648.413A0208930@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase-runtime (Fedora 9) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:03 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090402015705.4980820860B@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdelibs (Fedora 7) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:56 +0000
Subject: [pkgdb] kdebase-workspace: rdieter has requested watchbugzilla
Message-ID: <20090402015737.4EE6B2086FE@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:37 +0000
Subject: [pkgdb] kdebase-workspace: rdieter has requested watchcommits
Message-ID: <20090402015737.EFED4208703@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:57 +0000
Subject: [pkgdb] kdebase-workspace: rdieter has requested commit
Message-ID: <20090402015738.A336D208705@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:58 +0000
Subject: [pkgdb] kdebase-workspace: rdieter has requested approveacls
Message-ID: <20090402015738.DB867208712@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:16 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402015757.1B61D208514@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora devel) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:17 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402015757.C7E41208934@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora 7) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:57:58 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402015759.00A1620893A@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora 8) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:23 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402015804.89426208556@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebase (Fedora 9) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:06 +0000
Subject: [pkgdb] kdebase: rdieter has requested watchbugzilla
Message-ID: <20090402015806.D8D2C20893F@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:27 +0000
Subject: [pkgdb] kdebase: rdieter has requested watchcommits
Message-ID: <20090402015808.01C36208942@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:29 +0000
Subject: [pkgdb] kdebase: rdieter has requested commit
Message-ID: <20090402015809.C06C8208944@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:09 +0000
Subject: [pkgdb] kdebase: rdieter has requested approveacls
Message-ID: <20090402015809.E98C0208947@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From kkofler at fedoraproject.org  Thu Apr  2 01:58:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 01:58:12 +0000 (UTC)
Subject: rpms/osmo/devel osmo.spec,1.11,1.12
Message-ID: <20090402015812.702CA70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/osmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18890/devel

Modified Files:
	osmo.spec 
Log Message:
* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.4-5
- Reenable syncml (undo Alex's changes from 0.2.4-3), libsyncml got reverted


Index: osmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/devel/osmo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- osmo.spec	26 Feb 2009 09:10:24 -0000	1.11
+++ osmo.spec	2 Apr 2009 01:57:42 -0000	1.12
@@ -2,7 +2,7 @@
 Summary(pl):	Osobisty organizer
 Name:		osmo
 Version:	0.2.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 URL:		http://clay.ll.pl/osmo/
@@ -21,7 +21,7 @@
 BuildRequires:	libical-devel
 BuildRequires:	libgringotts-devel
 BuildRequires:	libnotify-devel
-#BuildRequires:	libsyncml-devel
+BuildRequires:	libsyncml-devel
 BuildRequires:	libxml2-devel
 
 %description
@@ -44,10 +44,7 @@
 %patch0 -p1
 
 %build
-%configure --with-gringrotts --with-libical 
-# disable until release with support for syncml 0.5.0 is released
-# see: http://bugzilla.redhat.com/show_bug.cgi?id
-# --with-libsyncml
+%configure --with-gringrotts --with-libical --with-libsyncml
 make %{?_smp_mflags}
 
 %install
@@ -102,6 +99,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.4-5
+- Reenable syncml (undo Alex's changes from 0.2.4-3), libsyncml got reverted
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:52 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402015832.9A6B92087F4@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora devel) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:55 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402015836.ADBA420892F@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora 7) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:57 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402015837.A8964208953@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora 8) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:39 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402015839.1F0AA208956@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdebindings (Fedora 9) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:40 +0000
Subject: [pkgdb] kdebindings: rdieter has requested watchbugzilla
Message-ID: <20090402015842.1D11920895C@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdebindings (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:59:01 +0000
Subject: [pkgdb] kdebindings: rdieter has requested watchcommits
Message-ID: <20090402015842.70F3020895E@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdebindings (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:43 +0000
Subject: [pkgdb] kdebindings: rdieter has requested commit
Message-ID: <20090402015844.013C4208964@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdebindings (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 01:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 01:58:43 +0000
Subject: [pkgdb] kdebindings: rdieter has requested approveacls
Message-ID: <20090402015845.13421208609@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdebindings (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From rmeggins at fedoraproject.org  Thu Apr  2 02:01:12 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 02:01:12 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 ppc2.patch, NONE, 1.1 fedora-ds-base.spec, 
	1.27, 1.28
Message-ID: <20090402020112.1348470120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19571

Modified Files:
	fedora-ds-base.spec 
Added Files:
	ppc2.patch 
Log Message:
added ppc2.patch

ppc2.patch:

--- NEW FILE ppc2.patch ---
--- ldap/servers/slapd/tools/pwenc.c	15 Oct 2008 06:30:11 -0000	1.11
+++ ldap/servers/slapd/tools/pwenc.c	2 Apr 2009 01:59:32 -0000
@@ -45,19 +45,17 @@
 #include <windows.h>
 #include <time.h>
 #include "proto-ntutil.h"
 #else
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/param.h>
 #include <sys/types.h>
-#if defined(LINUX) /* I bet other Unix would like
-					* this flag. But don't want to
-					* break other builds so far */
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 #endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include "ldap.h"


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fedora-ds-base.spec	2 Apr 2009 01:39:31 -0000	1.27
+++ fedora-ds-base.spec	2 Apr 2009 02:00:41 -0000	1.28
@@ -61,6 +61,7 @@
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
 Patch1:           ppc1.patch
+Patch2:           ppc2.patch
 
 %description
 Fedora Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -78,6 +79,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1
+%patch2
 cp %{SOURCE2} README.devel
 
 %build



From mclasen at fedoraproject.org  Thu Apr  2 02:04:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  2 Apr 2009 02:04:19 +0000 (UTC)
Subject: rpms/gnome-games/devel sudoku-saved-data.patch, NONE,
	1.1 gnome-games.spec, 1.202, 1.203
Message-ID: <20090402020419.8641F70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20238

Modified Files:
	gnome-games.spec 
Added Files:
	sudoku-saved-data.patch 
Log Message:
Fix a sudoku crash


sudoku-saved-data.patch:

--- NEW FILE sudoku-saved-data.patch ---
--- trunk/gnome-sudoku/src/lib/saver.py	2009/03/28 00:47:14	8910
+++ trunk/gnome-sudoku/src/lib/saver.py	2009/03/28 02:05:39	8911
@@ -211,8 +211,22 @@
             except:
                 print 'Warning: could not read file',f
             else:
-                jar['saved_at']=os.stat(f)[8]
-                games.append(jar)
+                if self.is_valid(jar):
+                    jar['saved_at']=os.stat(f)[8]
+                    games.append(jar)
+                else:
+                    print 'Warning: malformed save game',f
         return games
-        
+
+    def is_valid (self, jar):
+        virgin = jar['game'].split('\n')[0].replace(' ','')
+        played = jar['game'].split('\n')[1].replace(' ','')
+
+        if len(virgin) != 81 or len(played) != 81:
+            return False
+
+        if not virgin.isdigit() or not played.isdigit():
+            return False
+
+        return True
 



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- gnome-games.spec	17 Mar 2009 01:02:48 -0000	1.202
+++ gnome-games.spec	2 Apr 2009 02:03:49 -0000	1.203
@@ -44,7 +44,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -52,6 +52,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=551455
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=516491
+Patch2: sudoku-saved-data.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
@@ -124,6 +126,7 @@
 %patch0 -p1 -b .ggz-api-changes
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
+%patch2 -p1 -b .sudoku-saved-data
 
 sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
   -e 's/GNOMEtris/GnomeFallingBlocks/g' \
@@ -355,6 +358,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Wed Apr  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-2
+- Add a workaround for sudoku crashing on certain saved games (#492962)
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-1
 - Update to 2.26.0
 



From jstanley at fedoraproject.org  Thu Apr  2 03:01:43 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu,  2 Apr 2009 03:01:43 +0000 (UTC)
Subject: rpms/supybot-fedora/devel .cvsignore, 1.3, 1.4 sources, 1.6,
	1.7 supybot-fedora.spec, 1.6, 1.7
Message-ID: <20090402030143.D80E770120@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31010

Modified Files:
	.cvsignore sources supybot-fedora.spec 
Log Message:
New upstream 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 03:57:23 -0000	1.3
+++ .cvsignore	2 Apr 2009 03:01:13 -0000	1.4
@@ -1 +1 @@
-supybot-fedora-0.2.4.tar.bz2
+supybot-fedora-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2009 03:57:23 -0000	1.6
+++ sources	2 Apr 2009 03:01:13 -0000	1.7
@@ -1 +1 @@
-b9dcb07f9cec1b1715d0724f46fcd169  supybot-fedora-0.2.4.tar.bz2
+59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/supybot-fedora.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- supybot-fedora.spec	31 Mar 2009 03:57:23 -0000	1.6
+++ supybot-fedora.spec	2 Apr 2009 03:01:13 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
+- New upstream -.2.5
+
 * Mon Mar 30 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.4-1
 - New upstream 0.2.4
 



From jstanley at fedoraproject.org  Thu Apr  2 03:09:44 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu,  2 Apr 2009 03:09:44 +0000 (UTC)
Subject: rpms/supybot-fedora/F-10 sources, 1.5, 1.6 supybot-fedora.spec, 1.4,
	1.5
Message-ID: <20090402030944.F26CF7013C@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32279/F-10

Modified Files:
	sources supybot-fedora.spec 
Log Message:
New upstream 0.2.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2009 04:05:37 -0000	1.5
+++ sources	2 Apr 2009 03:09:14 -0000	1.6
@@ -1 +1 @@
-b9dcb07f9cec1b1715d0724f46fcd169  supybot-fedora-0.2.4.tar.bz2
+59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/supybot-fedora.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- supybot-fedora.spec	31 Mar 2009 04:05:37 -0000	1.4
+++ supybot-fedora.spec	2 Apr 2009 03:09:14 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
+- New upstream -.2.5
+
 * Mon Mar 30 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.4-1
 - New upstream 0.2.4
 



From jstanley at fedoraproject.org  Thu Apr  2 03:09:44 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu,  2 Apr 2009 03:09:44 +0000 (UTC)
Subject: rpms/supybot-fedora/EL-5 sources, 1.6, 1.7 supybot-fedora.spec, 1.5,
	1.6
Message-ID: <20090402030944.E69EF70120@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32279/EL-5

Modified Files:
	sources supybot-fedora.spec 
Log Message:
New upstream 0.2.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2009 04:05:37 -0000	1.6
+++ sources	2 Apr 2009 03:09:13 -0000	1.7
@@ -1 +1 @@
-b9dcb07f9cec1b1715d0724f46fcd169  supybot-fedora-0.2.4.tar.bz2
+59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/supybot-fedora.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supybot-fedora.spec	31 Mar 2009 04:05:37 -0000	1.5
+++ supybot-fedora.spec	2 Apr 2009 03:09:13 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
+- New upstream -.2.5
+
 * Mon Mar 30 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.4-1
 - New upstream 0.2.4
 



From jstanley at fedoraproject.org  Thu Apr  2 03:09:44 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu,  2 Apr 2009 03:09:44 +0000 (UTC)
Subject: rpms/supybot-fedora/F-9 sources, 1.5, 1.6 supybot-fedora.spec, 1.4,
	1.5
Message-ID: <20090402030945.066387013D@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32279/F-9

Modified Files:
	sources supybot-fedora.spec 
Log Message:
New upstream 0.2.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2009 04:05:37 -0000	1.5
+++ sources	2 Apr 2009 03:09:14 -0000	1.6
@@ -1 +1 @@
-b9dcb07f9cec1b1715d0724f46fcd169  supybot-fedora-0.2.4.tar.bz2
+59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/supybot-fedora.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- supybot-fedora.spec	31 Mar 2009 04:05:37 -0000	1.4
+++ supybot-fedora.spec	2 Apr 2009 03:09:14 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
+- New upstream -.2.5
+
 * Mon Mar 30 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.4-1
 - New upstream 0.2.4
 



From kkofler at fedoraproject.org  Thu Apr  2 03:15:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:15:57 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.16, 1.17
Message-ID: <20090402031557.43ECD70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1405/devel

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.36-2
- BR libsoup22-devel instead of libsoup-devel


Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libopensync-plugin-syncml.spec	31 Mar 2009 23:19:48 -0000	1.16
+++ libopensync-plugin-syncml.spec	2 Apr 2009 03:15:26 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-syncml
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        SyncML plugin for libopensync
 
@@ -14,7 +14,7 @@
 BuildRequires:  cmake
 BuildRequires:  libopensync-devel >= 0.22
 BuildRequires:  libsyncml-devel >= 0.4.6
-BuildRequires:  openobex-devel pkgconfig libsoup-devel
+BuildRequires:  openobex-devel pkgconfig libsoup22-devel
 BuildRequires:  glib2-devel >= 2.15.1
 
 %description
@@ -45,6 +45,9 @@
 %{_datadir}/opensync-1.0/defaults/syncml-obex-client
 
 %changelog
+* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.36-2
+- BR libsoup22-devel instead of libsoup-devel
+
 * Wed Apr 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1:0.22-1
 - Revert even further to 0.22 because of recent opensync downgrade
 



From kkofler at fedoraproject.org  Thu Apr  2 03:21:22 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:21:22 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.17, 1.18
Message-ID: <20090402032122.A657B70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2597/devel

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
Fix changelog typo, it's 1:0.22-2, not 1:0.36.2.


Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libopensync-plugin-syncml.spec	2 Apr 2009 03:15:26 -0000	1.17
+++ libopensync-plugin-syncml.spec	2 Apr 2009 03:20:52 -0000	1.18
@@ -45,7 +45,7 @@
 %{_datadir}/opensync-1.0/defaults/syncml-obex-client
 
 %changelog
-* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.36-2
+* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.22-2
 - BR libsoup22-devel instead of libsoup-devel
 
 * Wed Apr 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1:0.22-1



From kkofler at fedoraproject.org  Thu Apr  2 03:33:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:33:28 +0000 (UTC)
Subject: rpms/qtgpsc/devel qtgpsc-0.2.3-gpsdclient.patch, NONE,
	1.1 qtgpsc.spec, 1.3, 1.4
Message-ID: <20090402033328.28AF970120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qtgpsc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4799/devel

Modified Files:
	qtgpsc.spec 
Added Files:
	qtgpsc-0.2.3-gpsdclient.patch 
Log Message:
* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.3-5
- Include "gpsdclient.h" so it actually builds with the new gpsd

qtgpsc-0.2.3-gpsdclient.patch:

--- NEW FILE qtgpsc-0.2.3-gpsdclient.patch ---
diff -ur qtgpsc-0.2.3/libgpsmm.h qtgpsc-0.2.3-gpsdclient/libgpsmm.h
--- qtgpsc-0.2.3/libgpsmm.h	2007-07-12 00:57:02.000000000 +0200
+++ qtgpsc-0.2.3-gpsdclient/libgpsmm.h	2009-04-02 05:30:08.000000000 +0200
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 #include "gpsd_config.h"
 #include "gps.h" //the C library we are going to wrap
+#include "gpsdclient.h"
 
 class gpsmm {
     public:


Index: qtgpsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtgpsc/devel/qtgpsc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtgpsc.spec	29 Mar 2009 00:19:55 -0000	1.3
+++ qtgpsc.spec	2 Apr 2009 03:32:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           qtgpsc
 Version:        0.2.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A client for the gpsd GPS server
 
 Group:          Applications/Engineering
@@ -9,6 +9,7 @@
 Source0:        http://www.navlost.eu/survey/gpsd/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
+Patch0:         qtgpsc-0.2.3-gpsdclient.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt3-devel
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gpsdclient
 
 
 %build
@@ -51,6 +53,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.3-5
+- Include "gpsdclient.h" so it actually builds with the new gpsd
+
 * Sun Mar 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.3-4
 - Rebuild for new gpsd
 



From kkofler at fedoraproject.org  Thu Apr  2 03:39:38 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:39:38 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.18, 1.19
Message-ID: <20090402033938.16E9470120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6318/devel

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
- disable -Werror so deprecation warnings from libsyncml don't break the build


Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libopensync-plugin-syncml.spec	2 Apr 2009 03:20:52 -0000	1.18
+++ libopensync-plugin-syncml.spec	2 Apr 2009 03:39:07 -0000	1.19
@@ -8,7 +8,6 @@
 License:        LGPLv2+
 URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
-#Patch1:         cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -22,8 +21,8 @@
 
 %prep
 %setup -q
-
-#%patch1 -p1
+# disable -Werror so deprecation warnings from libsyncml don't break the build
+sed -i -e 's/-Werror//g' src/Makefile.in
 
 %build
 %configure
@@ -47,6 +46,7 @@
 %changelog
 * Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.22-2
 - BR libsoup22-devel instead of libsoup-devel
+- disable -Werror so deprecation warnings from libsyncml don't break the build
 
 * Wed Apr 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1:0.22-1
 - Revert even further to 0.22 because of recent opensync downgrade



From kkofler at fedoraproject.org  Thu Apr  2 03:45:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:45:03 +0000 (UTC)
Subject: rpms/qtgpsc/devel qtgpsc-0.2.3-gpsdclient.patch,1.1,1.2
Message-ID: <20090402034503.6F76B70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qtgpsc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7309/devel

Modified Files:
	qtgpsc-0.2.3-gpsdclient.patch 
Log Message:
Include the header where it's actually used.

qtgpsc-0.2.3-gpsdclient.patch:

Index: qtgpsc-0.2.3-gpsdclient.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtgpsc/devel/qtgpsc-0.2.3-gpsdclient.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtgpsc-0.2.3-gpsdclient.patch	2 Apr 2009 03:32:57 -0000	1.1
+++ qtgpsc-0.2.3-gpsdclient.patch	2 Apr 2009 03:45:03 -0000	1.2
@@ -1,11 +1,11 @@
-diff -ur qtgpsc-0.2.3/libgpsmm.h qtgpsc-0.2.3-gpsdclient/libgpsmm.h
---- qtgpsc-0.2.3/libgpsmm.h	2007-07-12 00:57:02.000000000 +0200
-+++ qtgpsc-0.2.3-gpsdclient/libgpsmm.h	2009-04-02 05:30:08.000000000 +0200
-@@ -12,6 +12,7 @@
- #include <sys/types.h>
- #include "gpsd_config.h"
- #include "gps.h" //the C library we are going to wrap
+diff -ur qtgpsc-0.2.3/mainform.ui.h qtgpsc-0.2.3-gpsdclient/mainform.ui.h
+--- qtgpsc-0.2.3/mainform.ui.h	2007-12-31 13:38:43.000000000 +0100
++++ qtgpsc-0.2.3-gpsdclient/mainform.ui.h	2009-04-02 05:44:19.000000000 +0200
+@@ -11,6 +11,7 @@
+ *****************************************************************************/
+ #include "qurl.h"
+ #include "qsettings.h"
 +#include "gpsdclient.h"
  
- class gpsmm {
-     public:
+ void MainForm::writeSettings()
+  {



From kkofler at fedoraproject.org  Thu Apr  2 03:47:52 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:47:52 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.19, 1.20
Message-ID: <20090402034752.9C9EC70120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8446/devel

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
Remove stray "cd build" as we're building in the source directory.


Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libopensync-plugin-syncml.spec	2 Apr 2009 03:39:07 -0000	1.19
+++ libopensync-plugin-syncml.spec	2 Apr 2009 03:47:22 -0000	1.20
@@ -30,7 +30,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd build
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean



From glommer at fedoraproject.org  Thu Apr  2 03:51:39 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Thu,  2 Apr 2009 03:51:39 +0000 (UTC)
Subject: rpms/qemu/devel qemu-bios-bigger-roms.patch, NONE,
	1.1 qemu-roms-more-room.patch, NONE, 1.1 qemu.spec, 1.73, 1.74
Message-ID: <20090402035139.10B7470120@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9151

Modified Files:
	qemu.spec 
Added Files:
	qemu-bios-bigger-roms.patch qemu-roms-more-room.patch 
Log Message:
support gpxe roms



qemu-bios-bigger-roms.patch:

--- NEW FILE qemu-bios-bigger-roms.patch ---
diff --git a/bios/rombios.c b/bios/rombios.c
index c4f6ccd..c4bfe60 100644
--- a/bios/rombios.c
+++ b/bios/rombios.c
@@ -10196,22 +10196,43 @@ no_serial:
   ret
 
 rom_checksum:
-  push ax
-  push bx
-  push cx
+  pusha
+  push ds
+
   xor  ax, ax
   xor  bx, bx
   xor  cx, cx
+  xor  dx, dx
+
   mov  ch, [2]
   shl  cx, #1
+
+  jnc checksum_loop
+  xchg dx, cx
+  dec  cx
+
 checksum_loop:
   add  al, [bx]
   inc  bx
   loop checksum_loop
+
+  test dx, dx 
+  je checksum_out
+
+  add  al, [bx]
+  mov  cx, dx
+  mov  dx, ds
+  add  dh, #0x10
+  mov  ds, dx
+  xor  dx, dx 
+  xor  bx, bx
+
+  jmp  checksum_loop
+
+checksum_out:
   and  al, #0xff
-  pop  cx
-  pop  bx
-  pop  ax
+  pop  ds
+  popa 
   ret

qemu-roms-more-room.patch:

--- NEW FILE qemu-roms-more-room.patch ---
>From 34b39c2ba6cc08239a707b52bfb2886df2aa8dec Mon Sep 17 00:00:00 2001
From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 28 Mar 2009 17:28:45 +0000
Subject: [PATCH] get roms more room. (Glauber Costa)

This patch increases by 50 % the size available for option roms.
The main motivator is that some roms grew bigger than the 64k we
currently allocate for them (Hey, it's 2009!)

One example is the gpxe project, that produces some roms with 69k,
70k, etc. The space proposed by this patch actually makes it as
big as 84k. Probably still a fit for some time.

But there is no free lunch. This space must come from somewhere,
and we take it from vga rom space. Currently, our vga roms are
around 35k in size. With this patch, option rom space will begin
just after vga ends, aligned to the next 2k boundary.

Technicaly, we could do the same with the uper space (the bios itself),
but since bochs bios is already 128 k in size, I don't see an
urgent need to do it.

[ fix case for vgabioses smaller than 30k, by Carl-Daniel Hailfinger ]

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 6896 c046a42c-6fe2-441c-8c8c-71466251a162
---
 hw/pc.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

Index: qemu-kvm-0.10/qemu/hw/pc.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/hw/pc.c
+++ qemu-kvm-0.10/qemu/hw/pc.c
@@ -813,7 +813,7 @@ static void pc_init1(ram_addr_t ram_size
 {
     char buf[1024];
     int ret, linux_boot, i;
-    ram_addr_t ram_addr, vga_ram_addr, bios_offset, vga_bios_offset;
+    ram_addr_t ram_addr, vga_ram_addr, bios_offset, vga_bios_offset, option_rom_start = 0;
     ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
     int bios_size, isa_bios_size, vga_bios_size;
     int pci_option_rom_offset;
@@ -825,6 +825,7 @@ static void pc_init1(ram_addr_t ram_size
     int index;
     BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     BlockDriverState *fd[MAX_FD];
+    int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;
 
     if (ram_size >= 0xe0000000 ) {
         above_4g_mem_size = ram_size - 0xe0000000;
@@ -900,7 +901,7 @@ static void pc_init1(ram_addr_t ram_size
         exit(1);
     }
 
-    if (cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled) {
+    if (using_vga) {
         /* VGA BIOS load */
         if (cirrus_vga_enabled) {
             snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME);
@@ -918,12 +919,21 @@ vga_bios_error:
             fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf);
             exit(1);
         }
+	/* Round up vga bios size to the next 2k boundary */
+	vga_bios_size = (vga_bios_size + 2047) & ~2047;
+	option_rom_start = 0xc0000 + vga_bios_size;
 
         /* setup basic memory access */
-        cpu_register_physical_memory(0xc0000, 0x10000,
+        cpu_register_physical_memory(0xc0000, vga_bios_size,
                                      vga_bios_offset | IO_MEM_ROM);
     }
 
+    /* No point in placing option roms before this address, since bochs bios
+     * will only start looking for it at 0xc8000 */
+    if (option_rom_start < 0xc8000)
+	    option_rom_start = 0xc8000;
+
+
     /* map the last 128KB of the BIOS in ISA space */
     isa_bios_size = bios_size;
     if (isa_bios_size > (128 * 1024))
@@ -944,14 +954,14 @@ vga_bios_error:
         ram_addr_t option_rom_offset;
         int size, offset;
 
-        offset = 0;
+        offset = option_rom_start;
         if (linux_boot) {
             option_rom_offset = qemu_ram_alloc(TARGET_PAGE_SIZE);
             load_linux(phys_ram_base + option_rom_offset,
                        kernel_filename, initrd_filename, kernel_cmdline);
-            cpu_register_physical_memory(0xd0000, TARGET_PAGE_SIZE,
+            cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE,
                                          option_rom_offset | IO_MEM_ROM);
-            offset = TARGET_PAGE_SIZE;
+            offset += TARGET_PAGE_SIZE;
         }
 
         for (i = 0; i < nb_option_roms; i++) {
@@ -961,13 +971,13 @@ vga_bios_error:
                         option_rom[i]);
                 exit(1);
             }
-            if (size > (0x10000 - offset))
+            if (size > (0xe0000 - offset))
                 goto option_rom_error;
             option_rom_offset = qemu_ram_alloc(size);
             ret = load_image(option_rom[i], phys_ram_base + option_rom_offset);
             if (ret != size) {
             option_rom_error:
-                fprintf(stderr, "Too many option ROMS\n");
+                fprintf(stderr, "Could not fit %soption roms in available space\n", using_vga ? "VGA bios and " : "");
                 exit(1);
             }
             size = (size + 4095) & ~4095;
@@ -975,9 +985,8 @@ vga_bios_error:
        initialization, and (optionally) marked readonly by the BIOS
        before INT 19h.  See the PNPBIOS specification, appendix B.
        DDIM support is mandatory for proper PCI expansion ROM support. */
-            cpu_register_physical_memory(0xd0000 + offset,
-                                         size, option_rom_offset /* | IO_MEM_ROM */);
-            option_rom_setup_reset(0xd0000 + offset, size);
+            cpu_register_physical_memory(offset, size, option_rom_offset /* | IO_MEM_ROM */);
+            option_rom_setup_reset(offset, size);
             offset += size;
         }
         pci_option_rom_offset = offset;


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- qemu.spec	2 Apr 2009 01:53:47 -0000	1.73
+++ qemu.spec	2 Apr 2009 03:51:08 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -33,6 +33,8 @@
 Patch9: kvm-upstream-ppc.patch
 Patch10: qemu-fix-debuginfo.patch
 Patch11: qemu-fix-gcc.patch
+Patch12: qemu-roms-more-room.patch
+Patch13: qemu-bios-bigger-roms.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -208,6 +210,8 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -451,6 +455,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Apr 02 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-4
+- Support botting gpxe roms.
+
 * Wed Apr 01 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-2
 - added missing patch. love for CVS.
 



From kkofler at fedoraproject.org  Thu Apr  2 03:53:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 03:53:30 +0000 (UTC)
Subject: rpms/qtgpsc/devel qtgpsc-0.2.3-gpsdclient.patch,1.2,1.3
Message-ID: <20090402035330.4073470120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qtgpsc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9728/devel

Modified Files:
	qtgpsc-0.2.3-gpsdclient.patch 
Log Message:
The crappy header is not protected with extern "C"...

qtgpsc-0.2.3-gpsdclient.patch:

Index: qtgpsc-0.2.3-gpsdclient.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtgpsc/devel/qtgpsc-0.2.3-gpsdclient.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtgpsc-0.2.3-gpsdclient.patch	2 Apr 2009 03:45:03 -0000	1.2
+++ qtgpsc-0.2.3-gpsdclient.patch	2 Apr 2009 03:53:29 -0000	1.3
@@ -1,11 +1,13 @@
 diff -ur qtgpsc-0.2.3/mainform.ui.h qtgpsc-0.2.3-gpsdclient/mainform.ui.h
 --- qtgpsc-0.2.3/mainform.ui.h	2007-12-31 13:38:43.000000000 +0100
-+++ qtgpsc-0.2.3-gpsdclient/mainform.ui.h	2009-04-02 05:44:19.000000000 +0200
-@@ -11,6 +11,7 @@
++++ qtgpsc-0.2.3-gpsdclient/mainform.ui.h	2009-04-02 05:52:36.000000000 +0200
+@@ -11,6 +11,9 @@
  *****************************************************************************/
  #include "qurl.h"
  #include "qsettings.h"
-+#include "gpsdclient.h"
++extern "C" {
++  #include "gpsdclient.h"
++}
  
  void MainForm::writeSettings()
   {



From kkofler at fedoraproject.org  Thu Apr  2 04:03:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 04:03:44 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.20, 1.21
Message-ID: <20090402040344.4225570120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11475/devel

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
- fix file list
- remove .la files


Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libopensync-plugin-syncml.spec	2 Apr 2009 03:47:22 -0000	1.20
+++ libopensync-plugin-syncml.spec	2 Apr 2009 04:03:13 -0000	1.21
@@ -31,6 +31,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,14 +39,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_libdir}/opensync-1.0/plugins/syncml-plugin.so
-%{_datadir}/opensync-1.0/defaults/syncml-http-server
-%{_datadir}/opensync-1.0/defaults/syncml-obex-client
+%{_libdir}/opensync/plugins/syncml_plugin.so
+%{_datadir}/opensync/defaults/syncml-http-server
+%{_datadir}/opensync/defaults/syncml-obex-client
 
 %changelog
 * Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.22-2
 - BR libsoup22-devel instead of libsoup-devel
 - disable -Werror so deprecation warnings from libsyncml don't break the build
+- fix file list
+- remove .la files
 
 * Wed Apr 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1:0.22-1
 - Revert even further to 0.22 because of recent opensync downgrade



From kyle at fedoraproject.org  Thu Apr  2 04:05:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  2 Apr 2009 04:05:04 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-git9.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1042, 1.1043 config-generic, 1.271, 1.272 config-ia64-generic,
	1.23, 1.24 kernel.spec, 1.1496, 1.1497 sources, 1.1004,
	1.1005 upstream, 1.915, 1.916 patch-2.6.29-git8.bz2.sign, 1.1, NONE
Message-ID: <20090402040504.C7ECB70120@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11822

Modified Files:
	.cvsignore config-generic config-ia64-generic kernel.spec 
	sources upstream 
Added Files:
	patch-2.6.29-git9.bz2.sign 
Removed Files:
	patch-2.6.29-git8.bz2.sign 
Log Message:
* Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.29-git9



--- NEW FILE patch-2.6.29-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ1AL6yGugalF9Dw4RAoyxAJ9m4952fdOWrgg4aMeE+CF7+osiWgCaAiLa
4ZhQv2lDp5RaAtuEFFuY/hE=
=1k1J
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -r1.1042 -r1.1043
--- .cvsignore	31 Mar 2009 20:20:35 -0000	1.1042
+++ .cvsignore	2 Apr 2009 04:04:33 -0000	1.1043
@@ -5,4 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29-git8.bz2
+patch-2.6.29-git9.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- config-generic	31 Mar 2009 20:20:35 -0000	1.271
+++ config-generic	2 Apr 2009 04:04:34 -0000	1.272
@@ -79,6 +79,7 @@
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=y
+CONFIG_PCI_IOV=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_DEFAULT_ON=y
@@ -2056,6 +2057,8 @@
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LM95241=m
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -3753,6 +3756,7 @@
 
 # CONFIG_INTEL_MENLOW is not set
 CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_ISL29003=m
 CONFIG_IPWIRELESS=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_CGROUP_MEM_CONT=y
@@ -3894,3 +3898,5 @@
 CONFIG_NOP_USB_XCEIV=m
 
 # CONFIG_IMA is not set
+
+# CONFIG_PAGE_POISONING is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-ia64-generic	12 Mar 2009 03:23:02 -0000	1.23
+++ config-ia64-generic	2 Apr 2009 04:04:34 -0000	1.24
@@ -70,6 +70,7 @@
 # CONFIG_HW_RANDOM is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_EFI_RTC=y
+CONFIG_RTC_DRV_EFI=y
 
 
 #


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1496
retrieving revision 1.1497
diff -u -r1.1496 -r1.1497
--- kernel.spec	31 Mar 2009 21:12:54 -0000	1.1496
+++ kernel.spec	2 Apr 2009 04:04:34 -0000	1.1497
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 8
+%define gitrev 9
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1138,12 +1138,12 @@
 #
 
 # ext4
-ApplyPatch linux-2.6-ext4-flush-on-close.patch
+#ApplyPatch linux-2.6-ext4-flush-on-close.patch
 
 # xfs
 
 # btrfs
-ApplyPatch linux-2.6-btrfs-experimental-branch.patch
+#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
 
 # relatime
 #ApplyPatch linux-2.6-relatime-by-default.patch
@@ -1182,7 +1182,7 @@
 # default to enabling passively listening for hotplug events
 #ApplyPatch linux-2.6-defaults-pciehp.patch
 # Add /sys/bus/pci/devices/*/remove_id
-ApplyPatch linux-2.6-pci-sysfs-remove-id.patch
+#ApplyPatch linux-2.6-pci-sysfs-remove-id.patch
 
 #
 # SCSI Bits.
@@ -1888,6 +1888,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git9
+
 * Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
 - rds-only-on-64-bit-or-x86.patch: add
 - at76-netdev_ops.patch: add


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -r1.1004 -r1.1005
--- sources	31 Mar 2009 20:20:35 -0000	1.1004
+++ sources	2 Apr 2009 04:04:34 -0000	1.1005
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-4b4d6038b284efdd3376456992c6bfd2  patch-2.6.29-git8.bz2
+57870b0f201c7cf04e701c59dfb026c6  patch-2.6.29-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -r1.915 -r1.916
--- upstream	31 Mar 2009 20:20:35 -0000	1.915
+++ upstream	2 Apr 2009 04:04:34 -0000	1.916
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29-git8.bz2
+patch-2.6.29-git9.bz2


--- patch-2.6.29-git8.bz2.sign DELETED ---



From cweyl at fedoraproject.org  Thu Apr  2 05:14:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 05:14:17 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.26, 1.27 perl-Class-MOP.spec,
	1.31, 1.32 sources, 1.25, 1.26
Message-ID: <20090402051417.78F8570120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26727

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
- update to 0.79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	8 Mar 2009 20:32:46 -0000	1.26
+++ .cvsignore	2 Apr 2009 05:13:46 -0000	1.27
@@ -1,11 +1 @@
-Class-MOP-0.78.tar.gz
-Class-MOP-*
-*.gz
-*.tar
-*.rpm
-*.bak
-clog
-.build*
-noarch
-x86_64
-i386
+Class-MOP-0.79.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- perl-Class-MOP.spec	8 Mar 2009 20:32:46 -0000	1.31
+++ perl-Class-MOP.spec	2 Apr 2009 05:13:46 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.78
+Version:        0.79
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -91,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
+- update to 0.79
+
 * Sun Mar 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
 - update to 0.78
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	8 Mar 2009 20:32:46 -0000	1.25
+++ sources	2 Apr 2009 05:13:47 -0000	1.26
@@ -1 +1 @@
-03be1d56b26e6fb12c04746e421fdbbe  Class-MOP-0.78.tar.gz
+9c8527e156ba0f2823daffccc20ad6d9  Class-MOP-0.79.tar.gz



From mtasaka at fedoraproject.org  Thu Apr  2 05:36:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  2 Apr 2009 05:36:04 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.350, 1.351 jd.spec, 1.410, 1.411 sources,
	1.351, 1.352
Message-ID: <20090402053604.A158A70120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31509

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- .cvsignore	31 Mar 2009 18:53:00 -0000	1.350
+++ .cvsignore	2 Apr 2009 05:35:34 -0000	1.351
@@ -1 +1 @@
-jd-2.4.0-svn2758_trunk.tgz
+jd-2.4.0-svn2761_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- jd.spec	31 Mar 2009 18:53:00 -0000	1.410
+++ jd.spec	2 Apr 2009 05:35:34 -0000	1.411
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2758_trunk
+%define         strtag        svn2761_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Apr  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- sources	31 Mar 2009 18:53:00 -0000	1.351
+++ sources	2 Apr 2009 05:35:34 -0000	1.352
@@ -1 +1 @@
-150ca247b665197ce029f330bc0930ee  jd-2.4.0-svn2758_trunk.tgz
+dc36dd9c270abe097c16aa5892f114f3  jd-2.4.0-svn2761_trunk.tgz



From kevin at fedoraproject.org  Thu Apr  2 06:12:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  2 Apr 2009 06:12:59 +0000 (UTC)
Subject: rpms/fontforge/devel fontforge-20090224-pythondl.patch, NONE,
	1.1 fontforge.spec, 1.43, 1.44
Message-ID: <20090402061259.51CA070120@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8031

Modified Files:
	fontforge.spec 
Added Files:
	fontforge-20090224-pythondl.patch 
Log Message:
Apply patch for python modules loading (fixes #489109)
use install -p to fix multiarch issue (fixes #480685)


fontforge-20090224-pythondl.patch:

--- NEW FILE fontforge-20090224-pythondl.patch ---
diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure
--- fontforge-20090224.orig/configure	2008-12-24 14:04:18.000000000 -0700
+++ fontforge-20090224/configure	2009-04-01 22:56:07.000000000 -0600
@@ -26670,6 +26670,7 @@
   else
     PYLIBS=""
   fi
+  PYDEFINES="$PYDEFINES, ('SOLIBDIR','\"$libdir/\"')"
   PY=pyhook/setup.py
 fi
 
diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h
--- fontforge-20090224.orig/pyhook/loadfontforge.h	2007-12-23 19:28:35.000000000 -0700
+++ fontforge-20090224/pyhook/loadfontforge.h	2009-04-01 22:49:08.000000000 -0600
@@ -11,7 +11,7 @@
 
     if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) {
 #ifdef PREFIX
-	lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY);
+	lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY);
 #endif
     }
     if ( lib==NULL ) {
@@ -21,7 +21,7 @@
 
     if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) {
 #ifdef PREFIX
-	lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY);
+	lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY);
 #endif
     }
     if ( lib==NULL ) {
@@ -31,7 +31,7 @@
 
     if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) {
 #ifdef PREFIX
-	lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY);
+	lib = dlopen( SOLIBDIR "libfontforge.so.1" SO_EXT,RTLD_LAZY);
 #endif
     }
     if ( lib==NULL ) {


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- fontforge.spec	2 Mar 2009 19:57:21 -0000	1.43
+++ fontforge.spec	2 Apr 2009 06:12:28 -0000	1.44
@@ -5,7 +5,7 @@
 
 Name:           fontforge
 Version:        20090224
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -15,6 +15,7 @@
 Source1:        fontforge.desktop
 Source2:        http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
 Source3:        fontforge.xml
+Patch1:         fontforge-20090224-pythondl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       xdg-utils
@@ -55,6 +56,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch1 -p1
+
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
 rm -rf htdocs/scripts
@@ -68,6 +71,8 @@
 %{__sed} -i 's/\r//' htdocs/corpchar.txt
 
 %build
+export INSTALL='/usr/bin/install -p'
+
 %configure --with-freetype-bytecode=no --with-regular-link --enable-pyextension
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -142,6 +147,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Apr 02 2009 Kevin Fenzi <kevin at tummy.com> - 20090224-2
+- Apply patch for python modules loading (fixes #489109)
+- use install -p to fix multiarch issue (fixes #480685)
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 20090224-1
 - Upgrade to 20090224
 



From kkofler at fedoraproject.org  Thu Apr  2 06:18:42 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 06:18:42 +0000 (UTC)
Subject: rpms/libopensync-plugin-kdepim/devel
	libopensync-plugin-kdepim-0.22-kde4.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 libopensync-plugin-kdepim.spec, 1.15, 1.16 sources, 1.7,
	1.8 libopensync-plugin-kdepim-0.36-kde4.patch, 1.2, NONE
Message-ID: <20090402061842.5BAD970120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9346/devel

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Removed Files:
	libopensync-plugin-kdepim-0.36-kde4.patch 
Log Message:
* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.22-4
- revert to 0.22
- backport KDE 4 patch

libopensync-plugin-kdepim-0.22-kde4.patch:

--- NEW FILE libopensync-plugin-kdepim-0.22-kde4.patch ---
diff -ur libopensync-plugin-kdepim-0.22/AUTHORS libopensync-plugin-kdepim-0.22-kde4/AUTHORS
--- libopensync-plugin-kdepim-0.22/AUTHORS	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/AUTHORS	2009-04-02 07:38:05.000000000 +0200
@@ -1,2 +1,4 @@
 Stewart Heitmann <sheitmann at users.sourceforge.net>
 Eduardo Pereira Habkost <ehabkost at conectiva.com.br>
+
+Thomas Gillespie <tomjamesgillespie at googlemail.com>
diff -ur libopensync-plugin-kdepim-0.22/configure.ac libopensync-plugin-kdepim-0.22-kde4/configure.ac
--- libopensync-plugin-kdepim-0.22/configure.ac	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/configure.ac	2009-04-02 08:06:28.000000000 +0200
@@ -16,14 +16,14 @@
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-KDE_SET_PREFIX
+dnl KDE_SET_PREFIX
 
 dnl for NLS support. Call them in this order!
 dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
+dnl AM_KDE_WITH_NLS
 
-KDE_USE_QT(3.0.0)
-AC_PATH_KDE
+dnl KDE_USE_QT(3.0.0)
+dnl AC_PATH_KDE
 
 export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:$prefix/lib/pkgconfig:/usr/local/lib/pkgconfig
 pkg_modules="opensync-1.0"
@@ -79,7 +79,7 @@
 
 dnl PACKAGE set before
 AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
+dnl AC_CHECK_KDEMAXPATHLEN
 
 AC_CONFIG_FILES([ Makefile src/Makefile tests/Makefile ])
 AC_OUTPUT
diff -ur libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp
--- libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 07:48:44.000000000 +0200
@@ -28,8 +28,8 @@
 
 #include "kaddrbook.h"
 #include <kapplication.h>
-#include <dcopclient.h>
-#include <qdeepcopy.h>
+//#include <dcopclient.h>
+//#include <qdeepcopy.h>
 
 KContactDataSource::KContactDataSource(OSyncMember *member, OSyncHashTable *hashtable) : converter(new VCardConverter()), hashtable(hashtable), member(member), connected(false)
 {
@@ -64,7 +64,7 @@
 {
 	osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
 
-	DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
+/*	DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
 	if (!dcopc) {
 		osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to initialize dcop client");
 		osync_trace(TRACE_EXIT_ERROR, "%s: Unable to initialize dcop client", __func__);
@@ -72,6 +72,7 @@
 	}
 
 	QString appId = dcopc->registerAs("opensync-kaddrbook");
+*/
 
 	//get a handle to the standard KDE addressbook
 	addressbookptr = StdAddressBook::self(true);
@@ -223,7 +224,7 @@
 	OSyncChangeType chtype = osync_change_get_changetype(chg);
 	switch(chtype) {
 		case CHANGE_MODIFIED: {
-			Addressee addressee = converter->parseVCard(QString::fromUtf8(data, data_size));
+			Addressee addressee = converter->parseVCard(QByteArray(data, data_size));
 
 			// ensure it has the correct UID and revision
 			addressee.setUid(uid);
@@ -234,12 +235,12 @@
 			addressbookptr->insertAddressee(addressee);
 
 			QString hash = calc_hash(addressee);
-			osync_change_set_hash(chg, hash);
+			osync_change_set_hash(chg, hash.toUtf8());
 			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
 			break;
 		}
 		case CHANGE_ADDED: {
-			Addressee addressee = converter->parseVCard(QString::fromUtf8(data, data_size));
+			Addressee addressee = converter->parseVCard(QByteArray(data, data_size));
 
 			// ensure it has the correct revision
 			addressee.setRevision(QDateTime::currentDateTime());
@@ -250,7 +251,7 @@
 			osync_change_set_uid(chg, addressee.uid().local8Bit());
 
 			QString hash = calc_hash(addressee);
-			osync_change_set_hash(chg, hash);
+			osync_change_set_hash(chg, hash.toUtf8());
 			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
 			break;
 		}
diff -ur libopensync-plugin-kdepim-0.22/src/kcal.cpp libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp
--- libopensync-plugin-kdepim-0.22/src/kcal.cpp	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp	2009-04-02 08:02:40.000000000 +0200
@@ -26,7 +26,7 @@
 #include "kcal.h"
 
 #include <kapplication.h>
-#include <dcopclient.h>
+//#include <dcopclient.h>
 
 KCalDataSource::KCalDataSource(OSyncMember *member, OSyncHashTable *hashtable)
 		: hashtable(hashtable), member(member)
@@ -36,6 +36,7 @@
 
 bool KCalDataSource::connect(OSyncContext *ctx)
 {
+/*
 	DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
 	if (!dcopc) {
 		osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to initialize dcop client");
@@ -52,19 +53,14 @@
 		osync_trace(TRACE_EXIT_ERROR, "%s: KOrganizer is running", __func__);
 		return false;
 	}
-
+*/
 	calendar = new KCal::CalendarResources(QString::fromLatin1( "UTC" ));
 	if (!calendar) {
 		osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Can't open KDE calendar");
 		return false;
 	}
-#if KDE_IS_VERSION(3,3,0)
-	/* On KDE 3.2, there was no readConfig() and load(): the data
-	 * was loaded automatically on the CalendarResources() constructor
-	 */
 	calendar->readConfig();
 	calendar->load();
-#endif
 
 	//Detection mechanismn if this is the first sync
 	if (osync_member_objtype_enabled(member, "event")
@@ -98,9 +94,9 @@
 
 static QString calc_hash(const KCal::Incidence *e)
 {
-	QDateTime d = e->lastModified();
+	KDateTime d = e->lastModified();
 	if (!d.isValid()) {
-		d = QDateTime::currentDateTime();
+		d = KDateTime::currentLocalDateTime();
 		//e->setLastModified(&d);
 	}
 	/*FIXME: not i18ned string */
@@ -263,10 +259,10 @@
 				osync_debug("kcal", 3, "Writing incidence: uid: %s, summary: %s",
 						(const char*)e->uid().local8Bit(), (const char*)e->summary().local8Bit());
 
-				QString c_uid = e->uid().utf8();
-				osync_change_set_uid(chg, (const char*)c_uid);
+				QString c_uid = e->uid().toUtf8();
+				osync_change_set_uid(chg, (const char*)c_uid.toUtf8());
 				QString hash = calc_hash(*i);
-				osync_change_set_hash(chg, hash);
+				osync_change_set_hash(chg, hash.toUtf8());
 				calendar->addIncidence(e);
 			}
 			break;
diff -ur libopensync-plugin-kdepim-0.22/src/kcal.h libopensync-plugin-kdepim-0.22-kde4/src/kcal.h
--- libopensync-plugin-kdepim-0.22/src/kcal.h	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/kcal.h	2009-04-02 07:38:24.000000000 +0200
@@ -23,10 +23,10 @@
  * @autor Eduardo Pereira Habkost <ehabkost at conectiva.com.br>
  */
 
-#include <libkcal/calendarresources.h>
-#include <libkcal/incidence.h>
-#include <libkcal/icalformat.h>
-#include <libkcal/calendarlocal.h>
+#include <kcal/calendarresources.h>
+#include <kcal/incidence.h>
+#include <kcal/icalformat.h>
+#include <kcal/calendarlocal.h>
 #include <kdeversion.h>
 
 #include "osyncbase.h"
diff -ur libopensync-plugin-kdepim-0.22/src/kdepim_impl.cpp libopensync-plugin-kdepim-0.22-kde4/src/kdepim_impl.cpp
--- libopensync-plugin-kdepim-0.22/src/kdepim_impl.cpp	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/kdepim_impl.cpp	2009-04-02 07:54:32.000000000 +0200
@@ -27,14 +27,14 @@
 
 
 
-#include <libkcal/resourcecalendar.h>
-#include <kinstance.h>
+#include <kcal/resourcecalendar.h>
+//#include <kinstance.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 
-#include <qsignal.h>
+//#include <qsignal.h>
 
 
 #include <qfile.h>
@@ -61,22 +61,23 @@
 				return;
 
 			KAboutData aboutData(
-			    "libopensync-kdepim-plugin",         // internal program name
-			    "OpenSync-KDE-plugin",               // displayable program name.
-			    "0.1",                               // version string
-			    "OpenSync KDEPIM plugin",            // short porgram description
+			    QByteArray("libopensync-kdepim-plugin"),         // internal program name
+			    QByteArray(""),  
+			    ki18n("Opensync kdepim plugin"),                               // displayable name
+			    QByteArray("0.22-kde4"),
+			    ki18n("Sync kdepim with opensync"),           // short program description
 			    KAboutData::License_GPL,             // license type
-			    "(c) 2005, Eduardo Pereira Habkost", // copyright statement
-			    0,                                   // any free form text
-			    "http://www.opensync.org",           // program home page address
-			    "http://www.opensync.org/newticket"  // bug report email address
+			    ki18n("(c) 2005, Eduardo Pereira Habkost, (c)"), // copyright statement
+			    ki18n(""),                                   // any free form text
+			    QByteArray("http://www.opensync.org"),          // program home page address
+			    QByteArray("http://www.opensync.org")
 			);
 
 			KCmdLineArgs::init( &aboutData );
 			if ( kapp )
 				mApplication = kapp;
 			else {
-				mApplication = new KApplication( true, true );
+				mApplication = new KApplication( true );
 				mNewApplication = true;
 			}
 
@@ -92,7 +93,7 @@
 			mHashtable = osync_hashtable_new();
 
 			mKcal = new KCalDataSource(mMember, mHashtable);
-			mKnotes = new KNotesDataSource(mMember, mHashtable);
+			// mKnotes = new KNotesDataSource(mMember, mHashtable);
 			mKaddrbook = new KContactDataSource(mMember, mHashtable);
 
 			osync_trace(TRACE_EXIT, "%s", __func__);
@@ -104,8 +105,8 @@
 			delete mKcal;
 			mKcal = 0;
 
-			delete mKnotes;
-			mKnotes = 0;
+			// delete mKnotes;
+			// mKnotes = 0;
 
 			if ( mNewApplication ) {
 				delete mApplication;
@@ -135,11 +136,11 @@
 				return;
 			}
 
-			if (mKnotes && osync_member_objtype_enabled(mMember, "note") && \
+/*			if (mKnotes && osync_member_objtype_enabled(mMember, "note") && \
 			        !mKnotes->connect(ctx)) {
 				osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open notes", __func__);
 				return;
-			}
+			}*/
 
 			if (mKaddrbook && osync_member_objtype_enabled(mMember, "contact") && \
 			        !mKaddrbook->connect(ctx)) {
@@ -157,8 +158,8 @@
 
 			if (mKcal && mKcal->connected && !mKcal->disconnect(ctx))
 				return;
-			if (mKnotes && mKnotes->connected && !mKnotes->disconnect(ctx))
-				return;
+//			if (mKnotes && mKnotes->connected && !mKnotes->disconnect(ctx))
+//				return;
 			if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->disconnect(ctx))
 				return;
 
@@ -185,10 +186,10 @@
 				osync_anchor_update(mMember, "todo", "true");
 			}
 
-			if (mKnotes && mKnotes->connected)
+/*			if (mKnotes && mKnotes->connected)
 			{
 				osync_anchor_update(mMember, "note", "true");
-			}
+			}*/
 
 			osync_context_report_success(ctx);
 		}
@@ -208,8 +209,8 @@
 				 !mKcal->get_changeinfo_todos(ctx))
 				return;
 
-			if (mKnotes && mKnotes->connected && !mKnotes->get_changeinfo(ctx))
-				return;
+//			if (mKnotes && mKnotes->connected && !mKnotes->get_changeinfo(ctx))
+//				return;
 
 			osync_context_report_success(ctx);
 		}
@@ -282,9 +283,9 @@
 
 		virtual bool note_access(OSyncContext *ctx, OSyncChange *chg)
 		{
-			if (mKnotes)
+/*			if (mKnotes)
 				return mKnotes->access(ctx, chg);
-			else {
+			else */ {
 				osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No notes loaded");
 				return false;
 			}
@@ -293,9 +294,9 @@
 
 		virtual bool note_commit_change(OSyncContext *ctx, OSyncChange *chg)
 		{
-			if (mKnotes)
+/*			if (mKnotes)
 				return mKnotes->commit_change(ctx, chg);
-			else {
+			else */ {
 				osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No notes loaded");
 				return false;
 			}
@@ -304,7 +305,7 @@
 
 	private:
 		KCalDataSource *mKcal;
-		KNotesDataSource *mKnotes;
+		// KNotesDataSource *mKnotes;
 		KContactDataSource *mKaddrbook;
 
 		OSyncHashTable *mHashtable;
diff -ur libopensync-plugin-kdepim-0.22/src/kdepim_sync.cpp libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp
--- libopensync-plugin-kdepim-0.22/src/kdepim_sync.cpp	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp	2009-04-02 07:55:44.000000000 +0200
@@ -191,7 +191,7 @@
 		info->name = "kdepim-sync";
 		/*FIXME: i18n */
 		info->longname = "KDE Desktop";
-		info->description = "Plugin for the KDE 3.5 Desktop";
+		info->description = "Plugin for the KDE 4 Desktop";
 		info->config_type = NO_CONFIGURATION;
 
 		info->functions.initialize = kde_initialize;
diff -ur libopensync-plugin-kdepim-0.22/src/knotes.cpp libopensync-plugin-kdepim-0.22-kde4/src/knotes.cpp
--- libopensync-plugin-kdepim-0.22/src/knotes.cpp	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/knotes.cpp	2009-04-02 07:58:48.000000000 +0200
@@ -33,8 +33,10 @@
 #include "knotes.h"
 #include <glib.h>
 /*An adapted C++ implementation of RSA Data Securities MD5 algorithm.*/
-#include <kmdcodec.h>
+// #include <kmdcodec.h>
 
+///Wont work because we dont have dcop in kde4 (i dont think), port later
+/*
 KNotesDataSource::KNotesDataSource(OSyncMember *m, OSyncHashTable *h)
 		:member(m), hashtable(h)
 {
@@ -57,7 +59,7 @@
 		osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to attach dcop for knotes");
 		osync_trace(TRACE_EXIT_ERROR, "%s: Unable to attach dcop for knotes", __func__);
 		return FALSE;
-	}*/
+	}* /
 
 	QString appId = kn_dcop->registerAs("opensync");
 
@@ -105,7 +107,7 @@
 		osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to detach dcop for knotes");
 		osync_trace(TRACE_EXIT_ERROR, "%s: Unable to detach dcop for knotes", __func__);
 		return FALSE;
-	}*/
+	}* /
 	//destroy dcop
 	delete kn_iface;
 	kn_iface = NULL;
@@ -162,7 +164,7 @@
 	for (i = fNotes.begin(); i != fNotes.end(); i++) {
 		/* XXX: don't report empty notes, knotes always
 		 * "keeps" at least one
-		 */
+		 * /
 		if (kn_iface->text(i.key()) == "") {
 			osync_debug("knotes", 4, "Skipping empty note");
 			continue;
@@ -230,7 +232,7 @@
  * so it shouldn't call osync_context_report_success(). On success,
  * it should just return true and let the caller report success() to
  * OpenSync
- */
+ * /
 bool KNotesDataSource::__access(OSyncContext *ctx, OSyncChange *chg)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
@@ -332,7 +334,7 @@
 			osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Unable to delete note");
 			osync_trace(TRACE_EXIT_ERROR, "%s: Unable to delete note", __func__);
 			return false;
-		}*/
+		}* /
 	}
 
 	osync_trace(TRACE_EXIT, "%s", __func__);
@@ -363,3 +365,4 @@
 	osync_trace(TRACE_EXIT, "%s", __func__);
 	return true;
 }
+*/
diff -ur libopensync-plugin-kdepim-0.22/src/knotes.h libopensync-plugin-kdepim-0.22-kde4/src/knotes.h
--- libopensync-plugin-kdepim-0.22/src/knotes.h	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/knotes.h	2009-04-02 07:59:41.000000000 +0200
@@ -32,10 +32,10 @@
 #include <kapplication.h>
 #include <qmap.h>
 #include "KNotesIface.h"
-#include "KNotesIface_stub.h"
+//#include "KNotesIface_stub.h"
 #include <stdio.h>
 #include <qtimer.h>
-#include <dcopclient.h>
+//#include <dcopclient.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
@@ -54,6 +54,7 @@
 
 /** KNotes access implementation interface
  */
+/*
 class KNotesDataSource
 {
 	private:
@@ -65,7 +66,7 @@
 
 		/** Ugly hack to restart KNotes if it
 		 * was running
-		 */
+		 * /
 		bool knotesWasRunning;
 
 		/** access() method, used by commit() and access()
@@ -73,7 +74,7 @@
 		 * Returns true on succes, but don't send success reporting
 		 * to context, because the caller may need to do more
 		 * operations
-		 */
+		 * /
 		bool __access(OSyncContext *ctx, OSyncChange *chg);
 		bool saveNotes(OSyncContext *ctx);
 	public:
@@ -83,21 +84,21 @@
 		 *
 		 * On success, returns true, but doesn't call osync_context_report_success()
 		 * On error, returns false, after calling osync_context_report_error()
-		 */
+		 * /
 		bool connect(OSyncContext *ctx);
 
 		/** disconnect() method
 		 *
 		 * On success, returns true, but doesn't call osync_context_report_success()
 		 * On error, returns false, after calling osync_context_report_error()
-		 */
+		 * /
 		bool disconnect(OSyncContext *ctx);
 
 		/** get_changeinfo() method
 		 *
 		 * On success, returns true, but doesn't call osync_context_report_success()
 		 * On error, returns false, after calling osync_context_report_error()
-		 */
+		 * /
 		bool get_changeinfo(OSyncContext *ctx);
 
 		void get_data(OSyncContext *ctx, OSyncChange *chg);
@@ -106,14 +107,15 @@
 		 *
 		 * On success, returns true, after calling osync_context_report_success()
 		 * On error, returns false, after calling osync_context_report_error()
-		 */
+		 * /
 		bool access(OSyncContext *ctx, OSyncChange *chg);
 
 		/** commit_change() method
 		 *
 		 * On success, returns true, after calling osync_context_report_success()
 		 * On error, returns false, after calling osync_context_report_error()
-		 */
+		 * /
 		bool commit_change(OSyncContext *ctx, OSyncChange *chg);
 		bool connected;
 };
+*/
diff -ur libopensync-plugin-kdepim-0.22/src/KNotesIface.h libopensync-plugin-kdepim-0.22-kde4/src/KNotesIface.h
--- libopensync-plugin-kdepim-0.22/src/KNotesIface.h	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/KNotesIface.h	2009-04-02 07:38:22.000000000 +0200
@@ -25,9 +25,9 @@
 #include <qstring.h>
 #include <qmap.h>
 
-#include <dcopobject.h>
-
+//#include <dcopobject.h>
 
+/*
 class KNotesIface : virtual public DCOPObject
 {
 		K_DCOP
@@ -38,7 +38,7 @@
 		 *        KNotes will choose an appropriate name
 		 * @param text the body of the new note
 		 * @return the new notes' id
-		 */
+		 * /
 		virtual QString newNote( const QString& name = QString::null,
 		                         const QString& text = QString::null ) = 0;
 
@@ -49,72 +49,72 @@
 		 * @param name the name (title) of the new note, if it is empty,
 		 *        KNotes will choose an appropriate name
 		 * @return the new notes' id
-		 */
+		 * /
 		virtual QString newNoteFromClipboard( const QString& name = QString::null ) = 0;
 
 		/**
 		 * Show a note as if it had been selected from the "notes" menu.
 		 * @param noteId the id of the note to show
-		 */
+		 * /
 		virtual ASYNC showNote( const QString& noteId ) const = 0;
 
 		/**
 		 * Hide a note.
 		 * @param noteId the id of the note to hide
-		 */
+		 * /
 		virtual ASYNC hideNote( const QString& noteId ) const = 0;
 
 		/**
 		 * Deletes a note forever.
 		 * @param noteId the id of the note to kill
-		 */
+		 * /
 		virtual ASYNC killNote( const QString& noteId ) = 0;
 
 		/**
 		 * Deletes a note forever.
 		 * @param noteId the id of the note to kill
 		 * @param force do not request confirmation
-		 */
+		 * /
 		virtual ASYNC killNote( const QString& noteId, bool force ) = 0;
 
 		/**
 		 * Get all the notes including their ids.
 		 * @return a QMap that maps the id of a note to its name
-		 */
+		 * /
 		virtual QMap<QString,QString> notes() const = 0;
 
 		/**
 		 * Changes the title/name of a note.
 		 * @param noteId the id of the note to be modified
 		 * @param newName the new title
-		 */
+		 * /
 		virtual ASYNC setName( const QString& noteId, const QString& newName ) = 0;
 
 		/**
 		 * Sets the text of a note. This will delete the old text!
 		 * @param noteId the id of the note
 		 * @param newText the new text for the note
-		 */
+		 * /
 		virtual ASYNC setText( const QString& noteId, const QString& newText ) = 0;
 
 		/**
 		 * Returns the title/name of a note.
 		 * @param noteId the id of the note in question
 		 * @return the name as a QString
-		 */
+		 * /
 		virtual QString name( const QString& noteId ) const = 0;
 
 		/**
 		 * Returns the text of a note.
 		 * @param noteId the id of the note in question
 		 * @return the body as a QString
-		 */
+		 * /
 		virtual QString text( const QString& noteId ) const = 0;
 
 		/**
 		 * This tells KNotes that a specific app has synchronized with all the notes.
 		 * @param app the app that has synced with KNotes
-		 */
+		 * /
 		virtual ASYNC sync( const QString& app ) = 0;
 
 		/**
@@ -123,7 +123,7 @@
 		 * @param noteId the id of the note
 		 * @return true if the note is new, false if not or if the note does
 		 *         not exist
-		 */
+		 * /
 		virtual bool isNew( const QString& app, const QString& noteId ) const = 0;
 
 		/**
@@ -132,8 +132,8 @@
 		 * @param noteId the id of the note
 		 * @return true if modified (note that this will return true if the note is
 		 *         new as well!) and false if the note is not modified or doesn't exist
-		 */
+		 * /
 		virtual bool isModified( const QString& app, const QString& noteId ) const = 0;
 };
-
+*/
 #endif
diff -ur libopensync-plugin-kdepim-0.22/src/Makefile.am libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am
--- libopensync-plugin-kdepim-0.22/src/Makefile.am	2007-03-27 13:49:57.000000000 +0200
+++ libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am	2009-04-02 08:11:04.000000000 +0200
@@ -1,12 +1,15 @@
 plugindir=@OPENSYNC_PLUGINDIR@
 configdir=@OPENSYNC_CONFIGDIR@
 
+KDE_INCLUDES = -I/usr/include/kde4
+QT_INCLUDES = -I/usr/include/Qt
 INCLUDES = $(OSYNC_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(KDE_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/src
 # KDE has broken classes so -Werror cannot be used (lots of non-virtual
 # destructors in polymorphic classes).
 AM_CXXFLAGS = -Wall
 
-#FIXME: Is there a KDE macro to set this?
+KDE_RPATH = -L/usr/lib`kde4-config --libsuffix`/kde4/devel
+LIB_KABC = -lkabc
 LIB_KCAL = -lkcal
 
 config_DATA = kdepim-sync
@@ -32,21 +35,9 @@
 # ugly hack to make the c++ library work
 kdepim_sync_la_LIBADD = -lstdc++ @OSYNC_LIBS@
 
-$(srcdir)/kdepim_impl.cpp: KNotesIface_stub.h
-KNotesIface_stub.cpp: KNotesIface_stub.h
-
-KNotesIface_stub.cpp:
-	dcopidl $(srcdir)/KNotesIface.h > KNotesIface.kidl
-	dcopidl2cpp KNotesIface.kidl
-KNotesIface_stub.h:
-	dcopidl $(srcdir)/KNotesIface.h > KNotesIface.kidl
-	dcopidl2cpp KNotesIface.kidl
-
 dist_kdepim_lib_la_SOURCES = \
 	kdepim_impl.cpp \
 	kcal.cpp \
-	knotes.cpp \
 	kaddrbook.cpp 
-nodist_kdepim_lib_la_SOURCES = KNotesIface_stub.cpp
 kdepim_lib_la_LDFLAGS = $(KDE_LDFLAGS) -avoid-version -export-dynamic -module
 kdepim_lib_la_LIBADD = $(KDE_RPATH) $(LIB_KABC) $(LIB_KCAL) -L$(libdir) @OSYNC_LIBS@ -lopensync-xml


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jun 2008 11:37:45 -0000	1.7
+++ .cvsignore	2 Apr 2009 06:18:11 -0000	1.8
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.36.tar.bz2
+libopensync-plugin-kdepim-0.22.tar.bz2


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libopensync-plugin-kdepim.spec	25 Feb 2009 17:00:33 -0000	1.15
+++ libopensync-plugin-kdepim.spec	2 Apr 2009 06:18:11 -0000	1.16
@@ -3,20 +3,24 @@
 %endif
 
 Name:           libopensync-plugin-kdepim
-Version:        0.36
-Release:        2%{?dist}
+Version:        0.22
+Release:        4%{?dist}
+Epoch:          1
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
-# KDE 4 port: http://websvn.kde.org/trunk/playground/pim/libopensync-plugin-kdepim-0.36/
-Patch0:         libopensync-plugin-kdepim-0.36-kde4.patch
+# KDE 4 port backported from:
+# http://websvn.kde.org/trunk/playground/pim/libopensync-plugin-kdepim-0.36/
+Patch0:         libopensync-plugin-kdepim-0.22-kde4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake
-BuildRequires:  libopensync-devel >= 0.36
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 %if 0%{?kdepim4}
 BuildRequires:  kdepimlibs-devel
@@ -33,18 +37,19 @@
 %if 0%{?kdepim4}
 %patch0 -p1 -b .kdepim4
 %endif
+autoreconf
 
 %build
-mkdir build
-cd build
-%cmake -DCMAKE_SKIP_RPATH=YES ../
-make VERBOSE=1 %{?_smp_mflags}
+%configure --disable-rpath
+# smpflags sometimes screw up the build
+make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd build
 make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_lib.la
+rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_sync.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,11 +60,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_libdir}/opensync-1.0/plugins/kdepim*.so
-%{_datadir}/opensync-1.0/defaults/kdepim-sync
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.22-4
+- revert to 0.22
+- backport KDE 4 patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Jun 2008 11:37:45 -0000	1.7
+++ sources	2 Apr 2009 06:18:11 -0000	1.8
@@ -1 +1 @@
-4fc80504fc76fbd0bb04d61f5a1b8a6d  libopensync-plugin-kdepim-0.36.tar.bz2
+df4dea8183847da838e6494fcb4e7c0a  libopensync-plugin-kdepim-0.22.tar.bz2


--- libopensync-plugin-kdepim-0.36-kde4.patch DELETED ---



From cweyl at fedoraproject.org  Thu Apr  2 06:23:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 06:23:17 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.26, 1.27 perl-Moose.spec, 1.36, 
	1.37 sources, 1.26, 1.27
Message-ID: <20090402062317.A044170120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10994

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.73-1
- update to 0.73



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	8 Mar 2009 21:06:52 -0000	1.26
+++ .cvsignore	2 Apr 2009 06:22:46 -0000	1.27
@@ -1 +1 @@
-Moose-0.72.tar.gz
+Moose-0.73.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- perl-Moose.spec	8 Mar 2009 21:06:52 -0000	1.36
+++ perl-Moose.spec	2 Apr 2009 06:22:47 -0000	1.37
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.72
+Version:        0.73
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
@@ -15,7 +15,8 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Class::MOP)         >= 0.78
+BuildRequires:  perl(Class::MOP)         >= 0.79
+BuildRequires:  perl(Data::OptList)
 BuildRequires:  perl(Filter::Simple) 
 BuildRequires:  perl(List::MoreUtils)    >= 0.12
 BuildRequires:  perl(Scalar::Util)       >= 1.19
@@ -109,6 +110,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.73-1
+- update to 0.73
+
 * Sun Mar 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.72-1
 - update to 0.72
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	8 Mar 2009 21:06:52 -0000	1.26
+++ sources	2 Apr 2009 06:22:47 -0000	1.27
@@ -1 +1 @@
-b78fef11546371f33b99e61fd4c4f5c0  Moose-0.72.tar.gz
+ee5c50436480372a26f268a91e4b2932  Moose-0.73.tar.gz



From kkofler at fedoraproject.org  Thu Apr  2 06:26:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 06:26:56 +0000 (UTC)
Subject: rpms/libopensync-plugin-kdepim/devel
	libopensync-plugin-kdepim-0.22-kde4.patch, 1.1, 1.2
Message-ID: <20090402062656.85C7670120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11747/devel

Modified Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Log Message:
Use RTLD_DEEPBIND to load the implementation plugin in an attempt to allow using the plugin with a KDE 3 KitchenSync.
Fix Makefile.am syntax error.

libopensync-plugin-kdepim-0.22-kde4.patch:

Index: libopensync-plugin-kdepim-0.22-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim-0.22-kde4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 06:18:11 -0000	1.1
+++ libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 06:26:56 -0000	1.2
@@ -344,7 +344,16 @@
  		OSyncHashTable *mHashtable;
 diff -ur libopensync-plugin-kdepim-0.22/src/kdepim_sync.cpp libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp
 --- libopensync-plugin-kdepim-0.22/src/kdepim_sync.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp	2009-04-02 07:55:44.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp	2009-04-02 08:22:37.000000000 +0200
+@@ -49,7 +49,7 @@
+ 	osync_debug("kde", 3, "%s", __FUNCTION__);
+ 
+ 	osync_debug("kde", 3, "Loading implementation module");
+-	module = dlopen(KDEPIM_LIBDIR"/kdepim_lib.so", RTLD_NOW);
++	module = dlopen(KDEPIM_LIBDIR"/kdepim_lib.so", RTLD_NOW | RTLD_DEEPBIND);
+ 	if (!module) {
+ 		osync_error_set(e, OSYNC_ERROR_INITIALIZATION, "Can't load plugin implementation module from %s: %s",
+ 		                KDEPIM_LIBDIR"/kdepim_lib.so", dlerror());
 @@ -191,7 +191,7 @@
  		info->name = "kdepim-sync";
  		/*FIXME: i18n */
@@ -634,7 +643,7 @@
  #endif
 diff -ur libopensync-plugin-kdepim-0.22/src/Makefile.am libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am
 --- libopensync-plugin-kdepim-0.22/src/Makefile.am	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am	2009-04-02 08:11:04.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am	2009-04-02 08:25:15.000000000 +0200
 @@ -1,12 +1,15 @@
  plugindir=@OPENSYNC_PLUGINDIR@
  configdir=@OPENSYNC_CONFIGDIR@
@@ -647,7 +656,7 @@
  AM_CXXFLAGS = -Wall
  
 -#FIXME: Is there a KDE macro to set this?
-+KDE_RPATH = -L/usr/lib`kde4-config --libsuffix`/kde4/devel
++KDE_LDFLAGS = -L/usr/lib`kde4-config --libsuffix`/kde4/devel
 +LIB_KABC = -lkabc
  LIB_KCAL = -lkcal
  



From kkofler at fedoraproject.org  Thu Apr  2 06:44:50 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 06:44:50 +0000 (UTC)
Subject: rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim.spec,
	1.16, 1.17
Message-ID: <20090402064450.F1D8070120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14627/devel

Modified Files:
	libopensync-plugin-kdepim.spec 
Log Message:
Use autoreconf -i (!"??$%&/()=? libtool 2).


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libopensync-plugin-kdepim.spec	2 Apr 2009 06:18:11 -0000	1.16
+++ libopensync-plugin-kdepim.spec	2 Apr 2009 06:44:20 -0000	1.17
@@ -37,7 +37,7 @@
 %if 0%{?kdepim4}
 %patch0 -p1 -b .kdepim4
 %endif
-autoreconf
+autoreconf -i
 
 %build
 %configure --disable-rpath



From laxathom at fedoraproject.org  Thu Apr  2 06:51:34 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu,  2 Apr 2009 06:51:34 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.119,1.120
Message-ID: <20090402065134.843B470120@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15818

Modified Files:
	mono.spec 
Log Message:
Enable moonlight support


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- mono.spec	26 Mar 2009 23:12:10 -0000	1.119
+++ mono.spec	2 Apr 2009 06:51:04 -0000	1.120
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -301,7 +301,9 @@
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes --with-moonlight=no --disable-static --with-preview=yes --with-libgdiplus=installed
+%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes \
+           --with-moonlight=yes --disable-static --with-preview=yes \
+           --with-libgdiplus=installed
 make
 
 
@@ -687,6 +689,9 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Thu Apr 02 2009 Xavier Lamien <lxtnow at gmail.com> - 2.4-13
+- Enable moonlight support.
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-12
 - Full 2.4 release
 



From kevin at fedoraproject.org  Thu Apr  2 06:57:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  2 Apr 2009 06:57:21 +0000 (UTC)
Subject: rpms/twinkle/devel twinkle.spec,1.21,1.22
Message-ID: <20090402065721.6F5C870120@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17250

Modified Files:
	twinkle.spec 
Log Message:
adapt for EL-5



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- twinkle.spec	26 Feb 2009 03:05:14 -0000	1.21
+++ twinkle.spec	2 Apr 2009 06:56:51 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -17,11 +17,18 @@
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
 BuildRequires: alsa-lib-devel
-BuildRequires: kdelibs3-devel
 BuildRequires: bison
 BuildRequires: libzrtpcpp-devel
-BuildRequires: file-devel
 BuildRequires: readline-devel
+%if 0%{?fedora}
+BuildRequires: file-devel
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: file
+BuildRequires: ncurses-devel
+BuildRequires: bind-libbind-devel
+BuildRequires: kdelibs-devel
+%endif
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
@@ -43,7 +50,12 @@
 install -m 644 src/gui/images/twinkle48.png %{buildroot}%{_datadir}/pixmaps/twinkle.png
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/twinkle.desktop
-desktop-file-install --vendor fedora                            \
+desktop-file-install                            \
+%if 0%{?fedora}
+         --vendor fedora                        \
+%else
+         --vendor ""                            \
+%endif
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         twinkle.desktop
@@ -58,9 +70,16 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/twinkle.png
+%if 0%{?fedora}
 %{_datadir}/applications/fedora-twinkle.desktop
+%else
+%{_datadir}/applications/twinkle.desktop
+%endif
 
 %changelog
+* Wed Feb 25 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 1.4.2-2
+- adapt for EL-5
+
 * Wed Feb 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.2-1
 - Update to 1.4.2
 



From cweyl at fedoraproject.org  Thu Apr  2 06:58:49 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 06:58:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/devel .cvsignore, 1.6,
	1.7 perl-Catalyst-Manual.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090402065849.38D8B70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17708

Modified Files:
	.cvsignore perl-Catalyst-Manual.spec sources 
Log Message:
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-1
- update to 5.7020



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Mar 2009 15:31:07 -0000	1.6
+++ .cvsignore	2 Apr 2009 06:58:18 -0000	1.7
@@ -1 +1 @@
-Catalyst-Manual-5.7017.tar.gz
+Catalyst-Manual-5.7020.tar.gz


Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Catalyst-Manual.spec	9 Mar 2009 15:31:07 -0000	1.11
+++ perl-Catalyst-Manual.spec	2 Apr 2009 06:58:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.7017
+Version:        5.7020
 Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %changelog
+* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-1
+- update to 5.7020
+
 * Mon Mar 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7017-1
 - update to 5.7017
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Mar 2009 15:31:07 -0000	1.7
+++ sources	2 Apr 2009 06:58:18 -0000	1.8
@@ -1 +1 @@
-8d8c30dba6ff6e8dad014d6b48d7ceb2  Catalyst-Manual-5.7017.tar.gz
+4e24e0e2cf35d8ee6cd4006381f47a34  Catalyst-Manual-5.7020.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:00:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:00:56 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/devel .cvsignore, 1.6,
	1.7 perl-Catalyst-Plugin-Authentication.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20090402070056.8A52870120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18412

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10011-1
- update to 0.10011



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Feb 2009 05:34:18 -0000	1.6
+++ .cvsignore	2 Apr 2009 07:00:26 -0000	1.7
@@ -1 +1 @@
-Catalyst-Plugin-Authentication-0.10010.tar.gz
+Catalyst-Plugin-Authentication-0.10011.tar.gz


Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Catalyst-Plugin-Authentication.spec	26 Feb 2009 12:13:32 -0000	1.7
+++ perl-Catalyst-Plugin-Authentication.spec	2 Apr 2009 07:00:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10010
-Release:        2%{?dist}
+Version:        0.10011
+Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -86,6 +86,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10011-1
+- update to 0.10011
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10010-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Feb 2009 05:34:18 -0000	1.6
+++ sources	2 Apr 2009 07:00:26 -0000	1.7
@@ -1 +1 @@
-aa93b6dff7b6420f4392e90b1c7bc3a0  Catalyst-Plugin-Authentication-0.10010.tar.gz
+90f704005c0bba0f9c979f9a4361d4b4  Catalyst-Plugin-Authentication-0.10011.tar.gz



From lkundrak at fedoraproject.org  Thu Apr  2 07:01:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  2 Apr 2009 07:01:59 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/EL-5
	NetworkManager-vpnc-0.7.0.99-keyring.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 NetworkManager-vpnc.spec, 1.23, 1.24 sources, 1.11,
	1.12 NetworkManager-vpnc-0.6.4-keepalive.patch, 1.1,
	NONE NetworkManager-vpnc-0.6.4-options.patch, 1.1,
	NONE NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.1, NONE
Message-ID: <20090402070159.DEE5270120@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18651

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Added Files:
	NetworkManager-vpnc-0.7.0.99-keyring.patch 
Removed Files:
	NetworkManager-vpnc-0.6.4-keepalive.patch 
	NetworkManager-vpnc-0.6.4-options.patch 
	NetworkManager-vpnc-0.7.0-gppasswd.patch 
Log Message:
* Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.1
- Backport to EL-5


NetworkManager-vpnc-0.7.0.99-keyring.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0.99-keyring.patch ---
Older keyring manager does not provide memory protected string manipulation.
This is slightly less secure, but definitely not a security flaw.

Lubomir Rintel <lkundrak at v3.sk>

diff -up NetworkManager-vpnc-0.7.0.99/auth-dialog/gnome-two-password-dialog.c.keyring NetworkManager-vpnc-0.7.0.99/auth-dialog/gnome-two-password-dialog.c
--- NetworkManager-vpnc-0.7.0.99/auth-dialog/gnome-two-password-dialog.c.keyring	2009-01-19 07:38:26.000000000 +0100
+++ NetworkManager-vpnc-0.7.0.99/auth-dialog/gnome-two-password-dialog.c	2009-04-02 08:58:20.000000000 +0200
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include "gnome-two-password-dialog.h"
-#include <gnome-keyring-memory.h>
+#include <gnome-keyring.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff -up NetworkManager-vpnc-0.7.0.99/auth-dialog/main.c.keyring NetworkManager-vpnc-0.7.0.99/auth-dialog/main.c
--- NetworkManager-vpnc-0.7.0.99/auth-dialog/main.c.keyring	2008-12-11 20:47:33.000000000 +0100
+++ NetworkManager-vpnc-0.7.0.99/auth-dialog/main.c	2009-04-02 08:58:20.000000000 +0200
@@ -25,10 +25,11 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gnome-keyring.h>
-#include <gnome-keyring-memory.h>
+#include <gnome-keyring.h>
 #include <gconf/gconf-client.h>
 
 #include <nm-setting-vpn.h>
@@ -132,7 +133,7 @@ get_secrets (const char *vpn_uuid,
 	if (!upw_type)
 		upw_type = found_upw ? NM_VPNC_PW_TYPE_SAVE : NM_VPNC_PW_TYPE_ASK;
 	else if (!strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) {
-		gnome_keyring_memory_free (*upw);
+		free (*upw);
 		*upw = NULL;
 	}
 
@@ -140,7 +141,7 @@ get_secrets (const char *vpn_uuid,
 	if (!gpw_type)
 		gpw_type = found_gpw ? NM_VPNC_PW_TYPE_SAVE : NM_VPNC_PW_TYPE_ASK;
 	else if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) {
-		gnome_keyring_memory_free (*gpw);
+		free (*gpw);
 		*gpw = NULL;
 	}
 
@@ -195,12 +196,12 @@ get_secrets (const char *vpn_uuid,
 	/* if retrying, pre-fill dialog with the password */
 	if (*upw) {
 		vpn_password_dialog_set_password (dialog, *upw);
-		gnome_keyring_memory_free (*upw);
+		free (*upw);
 		*upw = NULL;
 	}
 	if (*gpw) {
 		vpn_password_dialog_set_password_secondary (dialog, *gpw);
-		gnome_keyring_memory_free (*gpw);
+		free (*gpw);
 		*gpw = NULL;
 	}
 
@@ -208,8 +209,8 @@ get_secrets (const char *vpn_uuid,
 
 	success = vpn_password_dialog_run_and_block (dialog);
 	if (success) {
-		*upw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password (dialog));
-		*gpw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password_secondary (dialog));
+		*upw = strdup (vpn_password_dialog_get_password (dialog));
+		*gpw = strdup (vpn_password_dialog_get_password_secondary (dialog));
 
 		if (!strcmp (upw_type, NM_VPNC_PW_TYPE_SAVE)) {
 			if (*upw)
@@ -346,11 +347,11 @@ main (int argc, char *argv[])
 
 	if (password) {
 		memset (password, 0, strlen (password));
-		gnome_keyring_memory_free (password);
+		free (password);
 	}
 	if (group_password) {
 		memset (group_password, 0, strlen (group_password));
-		gnome_keyring_memory_free (group_password);
+		free (group_password);
 	}
 
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
diff -up NetworkManager-vpnc-0.7.0.99/common-gnome/keyring-helpers.c.keyring NetworkManager-vpnc-0.7.0.99/common-gnome/keyring-helpers.c
--- NetworkManager-vpnc-0.7.0.99/common-gnome/keyring-helpers.c.keyring	2008-12-11 20:47:33.000000000 +0100
+++ NetworkManager-vpnc-0.7.0.99/common-gnome/keyring-helpers.c	2009-04-02 08:58:20.000000000 +0200
@@ -21,7 +21,8 @@
  */
 
 #include <string.h>
-#include <gnome-keyring-memory.h>
+#include <stdlib.h>
+#include <gnome-keyring.h>
 
 #include <nm-setting-vpn.h>
 
@@ -66,7 +67,7 @@ find_one_password (const char *vpn_uuid,
 			*is_session = FALSE;
 	}
 
-	secret = found->secret ? gnome_keyring_memory_strdup (found->secret) : NULL;
+	secret = found->secret ? strdup (found->secret) : NULL;
 	gnome_keyring_found_list_free (found_list);
 
 	return secret;
@@ -90,7 +91,7 @@ keyring_helpers_lookup_secrets (const ch
 	*group_password = find_one_password (vpn_uuid, VPNC_GROUP_PASSWORD, is_session);
 	if (!*group_password) {
 		memset (*password, 0, strlen (*password));
-		gnome_keyring_memory_free (*password);
+		free (*password);
 		*password = NULL;
 		return FALSE;
 	}
@@ -181,7 +182,7 @@ keyring_helpers_delete_secret (const cha
 	                                      GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
 	                                      secret_name,
 	                                      NULL);
-	if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH)
+	if (ret != GNOME_KEYRING_RESULT_OK)
 		return FALSE;
 	if (g_list_length (found) == 0)
 		return TRUE;
diff -up NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c.keyring NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c
--- NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c.keyring	2009-02-06 01:00:18.000000000 +0100
+++ NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c	2009-04-02 08:58:20.000000000 +0200
@@ -36,7 +36,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gnome-keyring.h>
-#include <gnome-keyring-memory.h>
+#include <gnome-keyring.h>
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE
 
@@ -184,11 +184,11 @@ fill_vpn_passwords (VpncPluginUiWidget *
 			if (s_vpn) {
 				tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD);
 				if (tmp)
-					password = gnome_keyring_memory_strdup (tmp);
+					password = strdup (tmp);
 
 				tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET);
 				if (tmp)
-					group_password = gnome_keyring_memory_strdup (tmp);
+					group_password = strdup (tmp);
 			}
 		} else {
 			s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
@@ -201,14 +201,14 @@ fill_vpn_passwords (VpncPluginUiWidget *
 			                                &password,
 			                                NULL);
 			if (!password)
-				password = gnome_keyring_memory_strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD));
+				password = strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD));
 
 			keyring_helpers_get_one_secret (nm_setting_connection_get_uuid (s_con),
 			                                VPNC_GROUP_PASSWORD,
 			                                &group_password,
 			                                NULL);
 			if (!group_password)
-				group_password = gnome_keyring_memory_strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET));
+				group_password = strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET));
 		}
 	}
 
@@ -233,8 +233,8 @@ fill_vpn_passwords (VpncPluginUiWidget *
 	success = TRUE;
 
 out:
-	gnome_keyring_memory_free (password);
-	gnome_keyring_memory_free (group_password);
+	free (password);
+	free (group_password);
 
 	return success;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Feb 2007 08:42:36 -0000	1.11
+++ .cvsignore	2 Apr 2009 07:01:29 -0000	1.12
@@ -3,3 +3,23 @@
 NetworkManager-vpnc-0.5.0.tar.gz
 NetworkManager-vpnc-0.6.0.tar.gz
 NetworkManager-vpnc-0.6.4.tar.gz
+NetworkManager-vpnc-0.7.0.svn2910.tar.gz
+NetworkManager-vpnc-0.7.0.svn2914.tar.gz
+NetworkManager-vpnc-0.7.0.svn2970.tar.gz
+NetworkManager-vpnc-0.7.0.svn3014.tar.gz
+NetworkManager-vpnc-0.7.0.svn3030.tar.gz
+NetworkManager-vpnc-0.7.0.svn3083.tar.gz
+NetworkManager-vpnc-0.7.0.svn3109.tar.gz
+NetworkManager-vpnc-0.7.0.svn3502.tar.gz
+NetworkManager-vpnc-0.7.0.svn3549.tar.gz
+NetworkManager-vpnc-0.7.0.svn3801.tar.gz
+NetworkManager-vpnc-0.7.0.svn3832.tar.gz
+NetworkManager-vpnc-0.7.0.svn3846.tar.gz
+NetworkManager-vpnc-0.7.0.svn3928.tar.gz
+NetworkManager-vpnc-0.7.0.svn4175.tar.gz
+NetworkManager-vpnc-0.7.0.svn4229.tar.gz
+NetworkManager-vpnc-0.7.0.svn4293.tar.gz
+NetworkManager-vpnc-0.7.0.svn4326.tar.gz
+NetworkManager-vpnc-0.7.0.svn13.tar.gz
+NetworkManager-vpnc-0.7.0.97.tar.gz
+NetworkManager-vpnc-0.7.0.99.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/NetworkManager-vpnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- NetworkManager-vpnc.spec	22 Mar 2007 08:33:17 -0000	1.23
+++ NetworkManager-vpnc.spec	2 Apr 2009 07:01:29 -0000	1.24
@@ -1,31 +1,30 @@
-%define nm_version          1:0.6.4
-%define dbus_version        0.60
-%define gtk2_version        2.6.0
-%define vpnc_version        0.3.3-3
+%define nm_version          1:0.7.0
+%define dbus_version        1.1
+%define gtk2_version        2.10.0
+%define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
-Summary:   NetworkManager VPN integration for vpnc
+%define svn_snapshot %{nil}
+
+Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.6.4
-Release:   3%{?dist}
-License:   GPL
+Version:   0.7.0.99
+Release:   1%{svn_snapshot}%{?dist}.1
+License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
-Source:    %{name}-%{version}.tar.gz
-Patch0:    NetworkManager-vpnc-0.7.0-gppasswd.patch
-Patch1:    NetworkManager-vpnc-0.6.4-keepalive.patch
-Patch2:    NetworkManager-vpnc-0.6.4-options.patch
+Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
+Patch0:    NetworkManager-vpnc-0.7.0.99-keyring.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: intltool gettext
 
 Requires: gtk2             >= %{gtk2_version}
@@ -45,21 +44,19 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gppasswd
-%patch1 -p1 -b .keepalive
-%patch2 -p1 -b .options
+%patch0 -p1 -b .keyring
 
 
 %build
-%configure
+%configure --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f %{buildroot}%{_libdir}/lib*.la
-rm -f %{buildroot}%{_libdir}/lib*.a
+rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
+rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
 
 %find_lang %{name}
 
@@ -70,17 +67,19 @@
 
 %post
 /sbin/ldconfig
-/usr/bin/update-desktop-database > /dev/null
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-      /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
+/usr/bin/update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
 %postun
 /sbin/ldconfig
-/usr/bin/update-desktop-database > /dev/null
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-      /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
+/usr/bin/update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
@@ -88,30 +87,142 @@
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog
-%{_libdir}/lib*.so*
+%{_libdir}/NetworkManager/lib*.so*
 %{_libexecdir}/nm-vpnc-auth-dialog
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
-%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
-%{_bindir}/nm-vpnc-service
-%{_bindir}/nm-vpnc-service-vpnc-helper
+%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
+%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
+%{_libexecdir}/nm-vpnc-service
+%{_libexecdir}/nm-vpnc-service-vpnc-helper
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
 %{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
-* Mon Mar 19 2007 Denis Leroy <denis at poolshark.org> - 1:0.6.4-3
+* Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.1
+- Backport to EL-5
+
+* Thu Mar  5 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0.99-1
+- Update to 0.7.1rc3
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.7.0.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 19 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0.97-1
+- Update to 0.7.1rc1
+- Handle import/export of "EnableNat", "DHGroup", "SaveUserPassword", and "EnableLocalLAN"
+
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
+- Rebuild for updated NetworkManager
+- Better handling of passwords that shouldn't be saved
+- Fix some specfile issues (rh #477151)
+
+* Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4326
+- Rebuild for updated NetworkManager
+
+* Tue Nov 18 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4296
+- Rebuild for updated NetworkManager
+
+* Mon Nov 17 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4293
+- Ensure errors are shown when connection fails (rh #331141)
+- Fix failures to ask for passwords on connect (rh #429287)
+- Fix routing when concentrator specifies routes (rh #449283)
+- Pull in upstream support for tokens and not saving passwords
+
+* Mon Oct 27 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4229
+- Rebuild for updated NetworkManager
+
+* Tue Oct 14 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn4175
+- Fix password issue with configurations that don't save the user password
+	in the keyring (rh #466864)
+
+* Sun Oct 12 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4175
+- Rebuild for updated NetworkManager
+- Allow changing passwords from the connection editor
+
+* Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4024
+- Fix regression where username radio buttons were mistakenly shown in the
+	auth dialog
+- Fix regression where the auth dialog would segfault when cancel was clicked
+
+* Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4022
+- Rebuild for updated NetworkManager
+
+* Mon Aug 11 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3928
+- Rebuild for updated NetworkManager
+
+* Thu Jul 24 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3846
+- Rebuild for updated NetworkManager
+
+* Fri Jul 18 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3832
+- Update for NM netmask -> prefix changes
+
+* Wed Jul 02 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3801
+- Update for moving VPN editing into connection manager
+- Add option to disable Dead Peer Detection
+- Add option to select NAT Traversal mode
+
+* Thu May 01 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-7.7.svn3627
+- Update for compat with new NM bits
+
+* Wed Apr 09 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-6.7.svn3549
+- Update for compat with new NM bits
+
+* Tue Mar 25 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3502
+- Send suggested MTU to NetworkManager
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.7.0-0.7.7.svn3204
+- Autorebuild for GCC 4.3
+
+* Fri Jan  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3204
+- Support new vpnc 0.4 Cisco UDP Encapsulation option
+- Fix another crash in the properties applet
+- Remove upstreamed pcfimport patch
+
+* Mon Nov 26 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.3.svn3109
+- Rebuild for updated NetworkManager
+
+* Tue Nov 13 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.2.svn3083
+- Rebuild for updated NetworkManager
+
+* Sat Oct 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.4.svn3030
+- Fix a crash when editing VPN properties a second time
+
+* Tue Oct 23 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn3014
+- Rebuild
+
+* Wed Oct 17 2007 Bill Nottingham <notting at redhat.com> - 1:0.7.0-0.3.svn2970
+- rebuild (#336261)
+
+* Wed Oct 10 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2970
+- Fix default username
+
+* Thu Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2914
+- Fix .name file on 64-bit systems
+
+* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 1:0.7.0-0.2.svn2910
+- BuildRequire NetworkManager-glib-devel
+
+* Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2910
+- New snapshot; ported to NM 0.7 API
+
+* Fri Aug 17 2007 Denis Leroy <denis at poolshark.org> - 1:0.6.4-4
+- Updated License tag
+- Added patch to make properties multilib friendly (#243535)
+
+* Thu Mar 22 2007 Denis Leroy <denis at poolshark.org> - 1:0.6.4-3
 - Added patch to improve configuration GUI, add NAT traversal and single DES options
 
-* Sat Feb 17 2007 Denis Leroy <denis at poolshark.org> - 1:0.6.4-2
+* Sun Feb 18 2007 Denis Leroy <denis at poolshark.org> - 1:0.6.4-2
 - Readded NAT-keepalive support patch from SVN branch
 
 * Wed Feb 14 2007 Denis Leroy <denis at poolshark.org> - 1:0.6.4-1
-- Downgrading to 1:0.6.4 to keep par with NetworkManager core version
+- Downgrading to 1:0.6.4 to keep par with core NM version
 
 * Mon Dec  4 2006 Dan Williams <dcbw at redhat.com> - 0.7.0-0.cvs20061204
 - Allow "NAT-Keepalive packet interval" config option
 
-* Wed Oct 25 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.3
+* Sat Oct 21 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.3
 - Added patch to support saving group password only
 
 * Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Feb 2007 08:42:36 -0000	1.11
+++ sources	2 Apr 2009 07:01:29 -0000	1.12
@@ -1 +1 @@
-ae2d37c75bfef1752f9a4fb944d0a7e5  NetworkManager-vpnc-0.6.4.tar.gz
+70c57da49eaa10baad6dc765d2ffed1c  NetworkManager-vpnc-0.7.0.99.tar.gz


--- NetworkManager-vpnc-0.6.4-keepalive.patch DELETED ---


--- NetworkManager-vpnc-0.6.4-options.patch DELETED ---


--- NetworkManager-vpnc-0.7.0-gppasswd.patch DELETED ---



From cweyl at fedoraproject.org  Thu Apr  2 07:03:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:03:01 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/devel .cvsignore, 1.7,
	1.8 perl-Catalyst-Runtime.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20090402070301.2DA7170120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19029

Modified Files:
	.cvsignore perl-Catalyst-Runtime.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-1
- update to 5.71001



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Feb 2009 01:33:59 -0000	1.7
+++ .cvsignore	2 Apr 2009 07:02:30 -0000	1.8
@@ -1,6 +1 @@
-Catalyst-Runtime-5.71000.tar.gz
-Catalyst-Runtime*
-*.rpm
-*.gz
-.build*
-noarch
+Catalyst-Runtime-5.71001.tar.gz


Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Catalyst-Runtime.spec	26 Feb 2009 12:24:59 -0000	1.11
+++ perl-Catalyst-Runtime.spec	2 Apr 2009 07:02:30 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Runtime
-Version:        5.71000
-Release:        2%{?dist}
+Version:        5.71001
+Release:        1%{?dist}
 Summary:        Catalyst core modules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -142,6 +142,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-1
+- update to 5.71001
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.71000-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jan 2009 23:30:09 -0000	1.6
+++ sources	2 Apr 2009 07:02:30 -0000	1.7
@@ -1 +1 @@
-d92966ae79d5ad3d7768809acd4886ea  Catalyst-Runtime-5.71000.tar.gz
+fdb983d9232e8b9522db2ac32c54cc21  Catalyst-Runtime-5.71001.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:04:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:04:34 +0000 (UTC)
Subject: rpms/perl-CGI-Ex/devel .cvsignore, 1.7, 1.8 perl-CGI-Ex.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <20090402070434.C72B870120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CGI-Ex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19512

Modified Files:
	.cvsignore perl-CGI-Ex.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.27-1
- update to 2.27



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ex/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Oct 2008 00:39:43 -0000	1.7
+++ .cvsignore	2 Apr 2009 07:04:04 -0000	1.8
@@ -1 +1 @@
-CGI-Ex-2.24.tar.gz
+CGI-Ex-2.27.tar.gz


Index: perl-CGI-Ex.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ex/devel/perl-CGI-Ex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-CGI-Ex.spec	26 Feb 2009 11:32:02 -0000	1.9
+++ perl-CGI-Ex.spec	2 Apr 2009 07:04:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Ex
-Version:        2.24
-Release:        2%{?dist}
+Version:        2.27
+Release:        1%{?dist}
 Summary:        CGI utility suite - makes powerful application writing fun and easy
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -71,6 +71,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.27-1
+- update to 2.27
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ex/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Oct 2008 00:39:43 -0000	1.7
+++ sources	2 Apr 2009 07:04:04 -0000	1.8
@@ -1 +1 @@
-4e7bdecdcf2e71f1082941d51ed207dd  CGI-Ex-2.24.tar.gz
+d265456d515f478883a27e238306fce6  CGI-Ex-2.27.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:04:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:04:59 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/F-10 perl-Catalyst-Manual.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20090402070459.3BBA870120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19640

Modified Files:
	perl-Catalyst-Manual.spec sources 
Log Message:
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-1
- update to 5.7020



Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/perl-Catalyst-Manual.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Catalyst-Manual.spec	9 Mar 2009 15:39:28 -0000	1.10
+++ perl-Catalyst-Manual.spec	2 Apr 2009 07:04:28 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.7017
+Version:        5.7020
 Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %changelog
+* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-1
+- update to 5.7020
+
 * Mon Mar 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7017-1
 - update to 5.7017
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Mar 2009 15:39:28 -0000	1.7
+++ sources	2 Apr 2009 07:04:28 -0000	1.8
@@ -1 +1 @@
-8d8c30dba6ff6e8dad014d6b48d7ceb2  Catalyst-Manual-5.7017.tar.gz
+4e24e0e2cf35d8ee6cd4006381f47a34  Catalyst-Manual-5.7020.tar.gz



From kkofler at fedoraproject.org  Thu Apr  2 07:06:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 07:06:17 +0000 (UTC)
Subject: rpms/libopensync-plugin-kdepim/devel
	libopensync-plugin-kdepim-0.22-kde4.patch, 1.2, 1.3
Message-ID: <20090402070617.D6FA170120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20094/devel

Modified Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Log Message:
Build fixes.

libopensync-plugin-kdepim-0.22-kde4.patch:

Index: libopensync-plugin-kdepim-0.22-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim-0.22-kde4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 06:26:56 -0000	1.2
+++ libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 07:06:17 -0000	1.3
@@ -39,7 +39,7 @@
  AC_OUTPUT
 diff -ur libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp
 --- libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 07:48:44.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 08:59:40.000000000 +0200
 @@ -28,8 +28,8 @@
  
  #include "kaddrbook.h"
@@ -68,6 +68,15 @@
  
  	//get a handle to the standard KDE addressbook
  	addressbookptr = StdAddressBook::self(true);
+@@ -146,7 +147,7 @@
+ 	QString uid = a->uid();
+ 
+ 	osync_change_set_member(chg, member);
+-	osync_change_set_uid(chg, uid.local8Bit());
++	osync_change_set_uid(chg, uid.toLocal8Bit());
+ 
+ 	QString hash = calc_hash(*a);
+ 
 @@ -223,7 +224,7 @@
  	OSyncChangeType chtype = osync_change_get_changetype(chg);
  	switch(chtype) {
@@ -82,8 +91,9 @@
  
  			QString hash = calc_hash(addressee);
 -			osync_change_set_hash(chg, hash);
+-			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
 +			osync_change_set_hash(chg, hash.toUtf8());
- 			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
++			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.toLocal8Bit());
  			break;
  		}
  		case CHANGE_ADDED: {
@@ -92,18 +102,33 @@
  
  			// ensure it has the correct revision
  			addressee.setRevision(QDateTime::currentDateTime());
-@@ -250,7 +251,7 @@
- 			osync_change_set_uid(chg, addressee.uid().local8Bit());
+@@ -247,11 +248,11 @@
+ 			// add the new address to the addressbook
+ 			addressbookptr->insertAddressee(addressee);
+ 
+-			osync_change_set_uid(chg, addressee.uid().local8Bit());
++			osync_change_set_uid(chg, addressee.uid().toLocal8Bit());
  
  			QString hash = calc_hash(addressee);
 -			osync_change_set_hash(chg, hash);
+-			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
 +			osync_change_set_hash(chg, hash.toUtf8());
- 			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
++			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().toLocal8Bit());
+ 			break;
+ 		}
+ 		case CHANGE_DELETED: {
+@@ -266,7 +267,7 @@
+ 			if(!addressee.isEmpty())
+ 				addressbookptr->removeAddressee(addressee);
+ 
+-			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY DELETED (UID=%s)", (const char*)uid.local8Bit());
++			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY DELETED (UID=%s)", (const char*)uid.toLocal8Bit());
+ 
  			break;
  		}
 diff -ur libopensync-plugin-kdepim-0.22/src/kcal.cpp libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp
 --- libopensync-plugin-kdepim-0.22/src/kcal.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp	2009-04-02 08:02:40.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp	2009-04-02 09:04:50.000000000 +0200
 @@ -26,7 +26,7 @@
  #include "kcal.h"
  
@@ -154,9 +179,52 @@
  		//e->setLastModified(&d);
  	}
  	/*FIXME: not i18ned string */
-@@ -263,10 +259,10 @@
+@@ -122,17 +118,17 @@
+ 
+ 	/* Build a local calendar for the incidence data */
+ 	KCal::CalendarLocal cal(calendar->timeZoneId());
+-	osync_debug("kcal", 3, "timezoneid: %s\n", (const char*)cal.timeZoneId().local8Bit());
++	osync_debug("kcal", 3, "timezoneid: %s\n", (const char*)cal.timeZoneId().toLocal8Bit());
+ 	cal.addIncidence(e->clone());
+ 
+ 	/* Convert the data to vcalendar */
+ 	KCal::ICalFormat format;
+-	QCString datastr = format.toString(&cal).utf8();
++	QByteArray datastr = format.toString(&cal).toUtf8();
+ 	const char *data = datastr;
+ 
+-	osync_debug("kcal", 3, "UID: %s\n", (const char*)uid.local8Bit());
++	osync_debug("kcal", 3, "UID: %s\n", (const char*)uid.toLocal8Bit());
+ 	OSyncChange *chg = osync_change_new();
+-	osync_change_set_uid(chg, uid.local8Bit());
++	osync_change_set_uid(chg, uid.toLocal8Bit());
+ 	osync_change_set_member(chg, member);
+ 
+ 	// object type and format
+@@ -142,7 +138,7 @@
+ 
+ 	// Use the hash table to check if the object
+ 	// needs to be reported
+-	osync_change_set_hash(chg, hash.data());
++	osync_change_set_hash(chg, hash.toUtf8());
+ 	if (osync_hashtable_detect_change(hashtable, chg)) {
+ 		osync_context_report_change(ctx, chg);
+ 		osync_hashtable_update_hash(hashtable, chg);
+@@ -191,7 +187,7 @@
+ 	}
+ 
+ 	for (KCal::Todo::List::ConstIterator i = todos.begin(); i != todos.end(); i++) {
+-		osync_debug("kcal", 3, "%p: doesFloat: %d", *i, (*i)->doesFloat());
++		osync_debug("kcal", 3, "%p: doesFloat: %d", *i, (*i)->allDay());
+ 		if (!report_incidence(ctx, *i, "todo", "vtodo20"))
+ 			return false;
+ 	}
+@@ -261,12 +257,12 @@
+ 					e->setUid(osync_change_get_uid(chg));
+ 
  				osync_debug("kcal", 3, "Writing incidence: uid: %s, summary: %s",
- 						(const char*)e->uid().local8Bit(), (const char*)e->summary().local8Bit());
+-						(const char*)e->uid().local8Bit(), (const char*)e->summary().local8Bit());
++						(const char*)e->uid().toLocal8Bit(), (const char*)e->summary().toLocal8Bit());
  
 -				QString c_uid = e->uid().utf8();
 -				osync_change_set_uid(chg, (const char*)c_uid);



From cweyl at fedoraproject.org  Thu Apr  2 07:07:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:07:08 +0000 (UTC)
Subject: rpms/perl-Class-Accessor-Grouped/devel .cvsignore, 1.4,
	1.5 perl-Class-Accessor-Grouped.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090402070708.F010D70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20294

Modified Files:
	.cvsignore perl-Class-Accessor-Grouped.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08003-1
- update to 0.08003



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Dec 2008 07:26:08 -0000	1.4
+++ .cvsignore	2 Apr 2009 07:06:38 -0000	1.5
@@ -1 +1 @@
-Class-Accessor-Grouped-0.08002.tar.gz
+Class-Accessor-Grouped-0.08003.tar.gz


Index: perl-Class-Accessor-Grouped.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel/perl-Class-Accessor-Grouped.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Class-Accessor-Grouped.spec	26 Feb 2009 12:33:05 -0000	1.7
+++ perl-Class-Accessor-Grouped.spec	2 Apr 2009 07:06:38 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor-Grouped
-Version:        0.08002
-Release:        2%{?dist}
+Version:        0.08003
+Release:        1%{?dist}
 Summary:        Lets you build groups of accessors
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08003-1
+- update to 0.08003
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08002-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Dec 2008 07:26:08 -0000	1.4
+++ sources	2 Apr 2009 07:06:38 -0000	1.5
@@ -1 +1 @@
-10e66752abaae0d95d8ca0c932c75c1c  Class-Accessor-Grouped-0.08002.tar.gz
+327376dab6b9867685f59a2560fc0ae7  Class-Accessor-Grouped-0.08003.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:07:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:07:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/F-10
	perl-Catalyst-Plugin-Authentication.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090402070723.7D53770120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20375

Modified Files:
	perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10011-1
- update to 0.10011



Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-10/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Catalyst-Plugin-Authentication.spec	19 Feb 2009 05:45:14 -0000	1.6
+++ perl-Catalyst-Plugin-Authentication.spec	2 Apr 2009 07:06:53 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10010
+Version:        0.10011
 Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
@@ -86,6 +86,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10011-1
+- update to 0.10011
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10010-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10010-1
 - update to 0.10010
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Feb 2009 05:45:15 -0000	1.6
+++ sources	2 Apr 2009 07:06:53 -0000	1.7
@@ -1 +1 @@
-aa93b6dff7b6420f4392e90b1c7bc3a0  Catalyst-Plugin-Authentication-0.10010.tar.gz
+90f704005c0bba0f9c979f9a4361d4b4  Catalyst-Plugin-Authentication-0.10011.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:08:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:08:24 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/F-10 perl-Catalyst-Runtime.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090402070824.0CFA270120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20669

Modified Files:
	perl-Catalyst-Runtime.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-1
- update to 5.71001



Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/F-10/perl-Catalyst-Runtime.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Catalyst-Runtime.spec	16 Feb 2009 01:34:58 -0000	1.10
+++ perl-Catalyst-Runtime.spec	2 Apr 2009 07:07:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Runtime
-Version:        5.71000
+Version:        5.71001
 Release:        1%{?dist}
 Summary:        Catalyst core modules
 License:        GPL+ or Artistic
@@ -142,6 +142,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-1
+- update to 5.71001
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.71000-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71000-1
 - update to 5.71000
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2009 01:34:58 -0000	1.6
+++ sources	2 Apr 2009 07:07:53 -0000	1.7
@@ -1 +1 @@
-d92966ae79d5ad3d7768809acd4886ea  Catalyst-Runtime-5.71000.tar.gz
+fdb983d9232e8b9522db2ac32c54cc21  Catalyst-Runtime-5.71001.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:10:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:10:50 +0000 (UTC)
Subject: rpms/perl-Class-C3/devel .cvsignore, 1.6, 1.7 perl-Class-C3.spec,
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090402071050.3D6B970120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252

Modified Files:
	.cvsignore perl-Class-C3.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Jan 2009 23:34:54 -0000	1.6
+++ .cvsignore	2 Apr 2009 07:10:19 -0000	1.7
@@ -1,4 +1 @@
-Class-C3-0.20.tar.gz
-*.gz
-*.log
-*.rpm
+Class-C3-0.21.tar.gz


Index: perl-Class-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/devel/perl-Class-C3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Class-C3.spec	26 Feb 2009 12:36:45 -0000	1.10
+++ perl-Class-C3.spec	2 Apr 2009 07:10:19 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3
-Version:        0.20
-Release:        2%{?dist}
+Version:        0.21
+Release:        1%{?dist}
 Summary:        Pragma to use the C3 method resolution order algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- update to 0.21
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Jan 2009 23:34:54 -0000	1.7
+++ sources	2 Apr 2009 07:10:19 -0000	1.8
@@ -1 +1 @@
-dcb30979cedeb252438179a6e478ea5a  Class-C3-0.20.tar.gz
+ce6306b7a1607c239977b823b89863a6  Class-C3-0.21.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:11:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:11:02 +0000 (UTC)
Subject: rpms/perl-CGI-Ex/F-10 perl-CGI-Ex.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20090402071102.55A6D70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CGI-Ex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21395

Modified Files:
	perl-CGI-Ex.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.27-1
- update to 2.27



Index: perl-CGI-Ex.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ex/F-10/perl-CGI-Ex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-CGI-Ex.spec	27 Oct 2008 00:39:43 -0000	1.8
+++ perl-CGI-Ex.spec	2 Apr 2009 07:10:32 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-CGI-Ex
-Version:        2.24
+Version:        2.27
 Release:        1%{?dist}
 Summary:        CGI utility suite - makes powerful application writing fun and easy
 License:        GPL+ or Artistic
@@ -71,6 +71,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.27-1
+- update to 2.27
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Oct 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 2.24-1
 - update to 2.24
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Ex/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Oct 2008 00:39:43 -0000	1.7
+++ sources	2 Apr 2009 07:10:32 -0000	1.8
@@ -1 +1 @@
-4e7bdecdcf2e71f1082941d51ed207dd  CGI-Ex-2.24.tar.gz
+d265456d515f478883a27e238306fce6  CGI-Ex-2.27.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:11:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:11:46 +0000 (UTC)
Subject: rpms/perl-Class-Accessor-Grouped/F-10
	perl-Class-Accessor-Grouped.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090402071146.08E0370120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Accessor-Grouped/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21665

Modified Files:
	perl-Class-Accessor-Grouped.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08003-1
- update to 0.08003



Index: perl-Class-Accessor-Grouped.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/F-10/perl-Class-Accessor-Grouped.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-Accessor-Grouped.spec	3 Dec 2008 07:27:52 -0000	1.6
+++ perl-Class-Accessor-Grouped.spec	2 Apr 2009 07:11:15 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Class-Accessor-Grouped
-Version:        0.08002
+Version:        0.08003
 Release:        1%{?dist}
 Summary:        Lets you build groups of accessors
 License:        GPL+ or Artistic
@@ -79,6 +79,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08003-1
+- update to 0.08003
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08002-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 02 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08002-1
 - update to 0.08002
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Dec 2008 07:27:52 -0000	1.4
+++ sources	2 Apr 2009 07:11:15 -0000	1.5
@@ -1 +1 @@
-10e66752abaae0d95d8ca0c932c75c1c  Class-Accessor-Grouped-0.08002.tar.gz
+327376dab6b9867685f59a2560fc0ae7  Class-Accessor-Grouped-0.08003.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:16:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:16:56 +0000 (UTC)
Subject: rpms/perl-Class-C3/F-10 perl-Class-C3.spec, 1.9, 1.10 sources, 1.7,
	1.8
Message-ID: <20090402071656.53E7170120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22549

Modified Files:
	perl-Class-C3.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- update to 0.21



Index: perl-Class-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/F-10/perl-Class-C3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Class-C3.spec	25 Jan 2009 23:35:19 -0000	1.9
+++ perl-Class-C3.spec	2 Apr 2009 07:16:25 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Class-C3
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Pragma to use the C3 method resolution order algorithm
 License:        GPL+ or Artistic
@@ -76,6 +76,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- update to 0.21
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - update to 0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Jan 2009 23:35:19 -0000	1.7
+++ sources	2 Apr 2009 07:16:25 -0000	1.8
@@ -1 +1 @@
-dcb30979cedeb252438179a6e478ea5a  Class-C3-0.20.tar.gz
+ce6306b7a1607c239977b823b89863a6  Class-C3-0.21.tar.gz



From kwizart at fedoraproject.org  Thu Apr  2 07:21:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu,  2 Apr 2009 07:21:51 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla.spec,1.35,1.36 sources,1.33,1.34
Message-ID: <20090402072151.22A597013C@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23578

Modified Files:
	filezilla.spec sources 
Log Message:
Update to 3.2.3.1



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- filezilla.spec	23 Mar 2009 17:30:47 -0000	1.35
+++ filezilla.spec	2 Apr 2009 07:21:20 -0000	1.36
@@ -1,7 +1,7 @@
 #define fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.3
+Version:        3.2.3.1
 Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Thu Apr  2 2009 kwizart < kwizart at gmail.com > - 3.2.3.1-1
+- Update to 3.2.3.1 stable
+
 * Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 3.2.3-1
 - Update to 3.2.3 stable
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	23 Mar 2009 17:30:48 -0000	1.33
+++ sources	2 Apr 2009 07:21:20 -0000	1.34
@@ -1 +1 @@
-dc7a6d824f132aa49fe6488e3e1f364b  FileZilla_3.2.3_src.tar.bz2
+c9d4b00e10e1a5e0c3928ac6e1fd5873  FileZilla_3.2.3.1_src.tar.bz2



From cweyl at fedoraproject.org  Thu Apr  2 07:22:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:22:59 +0000 (UTC)
Subject: rpms/perl-Class-C3-XS/devel .cvsignore, 1.6,
	1.7 perl-Class-C3-XS.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090402072259.4010C70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24564

Modified Files:
	.cvsignore perl-Class-C3-XS.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
- update to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Feb 2009 23:13:41 -0000	1.6
+++ .cvsignore	2 Apr 2009 07:22:28 -0000	1.7
@@ -1,9 +1,9 @@
-Class-C3-XS-0.08.tar.gz
+Class-C3-XS-0.11.tar.gz
 Class-C3-XS-*
-*.gz
-*.tar
-*.rpm
+i386
+x86_64
 .build*
 clog
-x86_64
-i386
+*.rpm
+*.gz
+*.tar


Index: perl-Class-C3-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/devel/perl-Class-C3-XS.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Class-C3-XS.spec	28 Feb 2009 23:13:41 -0000	1.10
+++ perl-Class-C3-XS.spec	2 Apr 2009 07:22:28 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           perl-Class-C3-XS
-Version:        0.08
-Release:        6%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        XS speedups for Class::C3
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-C3-XS/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-XS-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Class-C3-XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -17,8 +17,9 @@
 
 # don't "provide" private Perl libs
 %global _use_internal_dependency_generator 0
-%global provfind /bin/sh -c "grep -v '%perl_vendorarch.*\\.so$' | %__find_provides"
-%global __find_provides %provfind
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__deploop R}"
 
 %description
 This contains XS performance enhancers for Class::C3 version 0.16 and
@@ -76,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
+- update to 0.11
+
 * Sat Feb 28 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.08-6
 - Stripping bad provides of private Perl extension libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Aug 2007 00:41:34 -0000	1.5
+++ sources	2 Apr 2009 07:22:29 -0000	1.6
@@ -1 +1 @@
-bb19c19a2660f89765765c6c029184f1  Class-C3-XS-0.08.tar.gz
+6afa4bd20dd179358df6acf8e77037fc  Class-C3-XS-0.11.tar.gz



From kkofler at fedoraproject.org  Thu Apr  2 07:23:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  2 Apr 2009 07:23:03 +0000 (UTC)
Subject: rpms/libopensync-plugin-kdepim/devel
	libopensync-plugin-kdepim-0.22-kde4.patch, 1.3, 1.4
Message-ID: <20090402072303.EF62170120@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24725/devel

Modified Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Log Message:
More build fixes.

libopensync-plugin-kdepim-0.22-kde4.patch:

Index: libopensync-plugin-kdepim-0.22-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim-0.22-kde4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 07:06:17 -0000	1.3
+++ libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 07:23:03 -0000	1.4
@@ -39,7 +39,7 @@
  AC_OUTPUT
 diff -ur libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp
 --- libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 08:59:40.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 09:20:52.000000000 +0200
 @@ -28,8 +28,8 @@
  
  #include "kaddrbook.h"
@@ -77,6 +77,24 @@
  
  	QString hash = calc_hash(*a);
  
+@@ -154,7 +155,7 @@
+ 	// only vcard3.0 exports Categories
+ 	QString tmp = converter->createVCard(*a, VCardConverter::v3_0);
+ 
+-	char *data = strdup((const char *)tmp.utf8());
++	char *data = strdup((const char *)tmp.toUtf8());
+ 
+ 	osync_trace(TRACE_SENSITIVE,"\n%s", data);
+ 
+@@ -164,7 +165,7 @@
+ 	osync_change_set_objtype_string(chg, "contact");
+ 	osync_change_set_objformat_string(chg, "vcard30");
+ 
+-	osync_change_set_hash(chg, hash.data());
++	osync_change_set_hash(chg, hash.toUtf8());
+ 
+ 	return (chg);
+ }
 @@ -223,7 +224,7 @@
  	OSyncChangeType chtype = osync_change_get_changetype(chg);
  	switch(chtype) {



From kwizart at fedoraproject.org  Thu Apr  2 07:23:47 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu,  2 Apr 2009 07:23:47 +0000 (UTC)
Subject: rpms/filezilla/devel .cvsignore,1.29,1.30
Message-ID: <20090402072347.CCEE370120@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24794

Modified Files:
	.cvsignore 
Log Message:
commit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	23 Mar 2009 17:30:48 -0000	1.29
+++ .cvsignore	2 Apr 2009 07:23:17 -0000	1.30
@@ -1 +1 @@
-FileZilla_3.2.3_src.tar.bz2
+FileZilla_3.2.3.1_src.tar.bz2



From cweyl at fedoraproject.org  Thu Apr  2 07:25:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:25:08 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel .cvsignore, 1.2,
	1.3 perl-DateTime-Format-Pg.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090402072508.D85C870120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25324

Modified Files:
	.cvsignore perl-DateTime-Format-Pg.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16003-1
- update to 0.16003



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2008 22:54:48 -0000	1.2
+++ .cvsignore	2 Apr 2009 07:24:38 -0000	1.3
@@ -1 +1 @@
-DateTime-Format-Pg-0.16002.tar.gz
+DateTime-Format-Pg-0.16003.tar.gz


Index: perl-DateTime-Format-Pg.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/perl-DateTime-Format-Pg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DateTime-Format-Pg.spec	26 Feb 2009 14:59:36 -0000	1.3
+++ perl-DateTime-Format-Pg.spec	2 Apr 2009 07:24:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Pg
-Version:        0.16002
-Release:        3%{?dist}
+Version:        0.16003
+Release:        1%{?dist}
 Summary:        Parse and format PostgreSQL dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16003-1
+- update to 0.16003
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16002-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2008 22:54:48 -0000	1.2
+++ sources	2 Apr 2009 07:24:38 -0000	1.3
@@ -1 +1 @@
-381bb4e599cae0da2c0c8a48d4b0e759  DateTime-Format-Pg-0.16002.tar.gz
+160b19e83e304ec077f4f12f39f65d57  DateTime-Format-Pg-0.16003.tar.gz



From kwizart at fedoraproject.org  Thu Apr  2 07:26:08 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu,  2 Apr 2009 07:26:08 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla.spec,1.36,1.37
Message-ID: <20090402072608.DB11270120@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25652

Modified Files:
	filezilla.spec 
Log Message:
Fix tag 



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- filezilla.spec	2 Apr 2009 07:21:20 -0000	1.36
+++ filezilla.spec	2 Apr 2009 07:25:38 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:           filezilla
 Version:        3.2.3.1
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}.1
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet



From cweyl at fedoraproject.org  Thu Apr  2 07:28:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:28:25 +0000 (UTC)
Subject: rpms/perl-Devel-Size/devel .cvsignore, 1.5, 1.6 perl-Devel-Size.spec,
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090402072825.985CB70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Devel-Size/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26327

Modified Files:
	.cvsignore perl-Devel-Size.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.71-1
- update to 0.71



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Size/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Mar 2008 05:17:39 -0000	1.5
+++ .cvsignore	2 Apr 2009 07:27:55 -0000	1.6
@@ -1 +1 @@
-Devel-Size-0.69.tar.gz
+Devel-Size-0.71.tar.gz


Index: perl-Devel-Size.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Size/devel/perl-Devel-Size.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Devel-Size.spec	26 Feb 2009 15:14:55 -0000	1.9
+++ perl-Devel-Size.spec	2 Apr 2009 07:27:55 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Size
-Version:        0.69
-Release:        2%{?dist}
+Version:        0.71
+Release:        1%{?dist}
 Summary:        Perl extension for finding the memory usage of Perl variables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -19,6 +19,12 @@
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 
+# don't "provide" private Perl libs
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__deploop R}"
+
 %description
 This module figures out the real sizes of Perl variables in bytes. Call
 functions with a reference to the variable you want the size of. If the
@@ -60,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.71-1
+- update to 0.71
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.69-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Size/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Mar 2008 05:17:39 -0000	1.5
+++ sources	2 Apr 2009 07:27:55 -0000	1.6
@@ -1 +1 @@
-07ea62080f40a7cc7dd2e519ba4f4143  Devel-Size-0.69.tar.gz
+9504441ae609b39d70384a9fdc186362  Devel-Size-0.71.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:29:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:29:02 +0000 (UTC)
Subject: rpms/perl-Class-C3-XS/F-10 .cvsignore, 1.5,
	1.6 perl-Class-C3-XS.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090402072902.E145F70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3-XS/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26573

Modified Files:
	.cvsignore perl-Class-C3-XS.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
- update to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Aug 2007 00:41:34 -0000	1.5
+++ .cvsignore	2 Apr 2009 07:28:32 -0000	1.6
@@ -1 +1,9 @@
-Class-C3-XS-0.08.tar.gz
+Class-C3-XS-0.11.tar.gz
+Class-C3-XS-*
+i386
+x86_64
+.build*
+clog
+*.rpm
+*.gz
+*.tar


Index: perl-Class-C3-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/F-10/perl-Class-C3-XS.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Class-C3-XS.spec	4 Mar 2008 21:49:51 -0000	1.8
+++ perl-Class-C3-XS.spec	2 Apr 2009 07:28:32 -0000	1.9
@@ -1,11 +1,11 @@
 Name:           perl-Class-C3-XS
-Version:        0.08
-Release:        4%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        XS speedups for Class::C3
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-C3-XS/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-XS-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Class-C3-XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -15,6 +15,12 @@
 # test
 BuildRequires:  perl(Test::Pod)
 
+# don't "provide" private Perl libs
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__deploop R}"
+
 %description
 This contains XS performance enhancers for Class::C3 version 0.16 and
 higher. The main Class::C3 package will use this package automatically if
@@ -71,6 +77,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
+- update to 0.11
+
+* Sat Feb 28 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.08-6
+- Stripping bad provides of private Perl extension libs
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.08-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-XS/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Aug 2007 00:41:34 -0000	1.5
+++ sources	2 Apr 2009 07:28:32 -0000	1.6
@@ -1 +1 @@
-bb19c19a2660f89765765c6c029184f1  Class-C3-XS-0.08.tar.gz
+6afa4bd20dd179358df6acf8e77037fc  Class-C3-XS-0.11.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:31:35 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:31:35 +0000 (UTC)
Subject: rpms/perl-File-ExtAttr/devel .cvsignore, 1.3,
	1.4 perl-File-ExtAttr.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090402073135.B05CF70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-File-ExtAttr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27189

Modified Files:
	.cvsignore perl-File-ExtAttr.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.09-1
- update to 1.09



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ExtAttr/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2007 18:56:02 -0000	1.3
+++ .cvsignore	2 Apr 2009 07:31:05 -0000	1.4
@@ -1 +1 @@
-File-ExtAttr-1.02.tar.gz
+File-ExtAttr-1.09.tar.gz


Index: perl-File-ExtAttr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ExtAttr/devel/perl-File-ExtAttr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-File-ExtAttr.spec	26 Feb 2009 16:08:42 -0000	1.8
+++ perl-File-ExtAttr.spec	2 Apr 2009 07:31:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-File-ExtAttr
-Version:        1.02
-Release:        6%{?dist}
+Version:        1.09
+Release:        1%{?dist}
 Summary:        Perl extension for accessing extended attributes of files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -21,6 +21,11 @@
 BuildRequires:  perl(Test::Distribution), perl(Test::Pod)
 BuildRequires:  perl(File::Find::Rule), perl(Module::CoreList)
 
+# don't "provide" private Perl libs
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__deploop R}"
 
 %description
 File::ExtAttr is a Perl module providing access to the extended
@@ -65,6 +70,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.09-1
+- update to 1.09
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ExtAttr/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2007 18:56:02 -0000	1.3
+++ sources	2 Apr 2009 07:31:05 -0000	1.4
@@ -1 +1 @@
-bbfb0a79d4001fb387fc7b1a315fa496  File-ExtAttr-1.02.tar.gz
+bcce46d86b72185f3814a7c413b86c8a  File-ExtAttr-1.09.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:32:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:32:02 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/F-10 .cvsignore, 1.2,
	1.3 perl-DateTime-Format-Pg.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090402073202.4B60070120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27318

Modified Files:
	.cvsignore perl-DateTime-Format-Pg.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16003-1
- update to 0.16003



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2008 22:54:48 -0000	1.2
+++ .cvsignore	2 Apr 2009 07:31:31 -0000	1.3
@@ -1 +1 @@
-DateTime-Format-Pg-0.16002.tar.gz
+DateTime-Format-Pg-0.16003.tar.gz


Index: perl-DateTime-Format-Pg.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-10/perl-DateTime-Format-Pg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-DateTime-Format-Pg.spec	3 Sep 2008 22:55:30 -0000	1.2
+++ perl-DateTime-Format-Pg.spec	2 Apr 2009 07:31:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Pg
-Version:        0.16002
-Release:        2%{?dist}
+Version:        0.16003
+Release:        1%{?dist}
 Summary:        Parse and format PostgreSQL dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16003-1
+- update to 0.16003
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16002-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Sep 03 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.16002-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2008 22:54:48 -0000	1.2
+++ sources	2 Apr 2009 07:31:32 -0000	1.3
@@ -1 +1 @@
-381bb4e599cae0da2c0c8a48d4b0e759  DateTime-Format-Pg-0.16002.tar.gz
+160b19e83e304ec077f4f12f39f65d57  DateTime-Format-Pg-0.16003.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:34:11 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:34:11 +0000 (UTC)
Subject: rpms/perl-Devel-Size/F-10 .cvsignore, 1.5, 1.6 perl-Devel-Size.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090402073411.E55F370120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Devel-Size/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27802

Modified Files:
	.cvsignore perl-Devel-Size.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.71-1
- update to 0.71



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Size/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Mar 2008 05:17:39 -0000	1.5
+++ .cvsignore	2 Apr 2009 07:33:41 -0000	1.6
@@ -1 +1 @@
-Devel-Size-0.69.tar.gz
+Devel-Size-0.71.tar.gz


Index: perl-Devel-Size.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Size/F-10/perl-Devel-Size.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Devel-Size.spec	4 Mar 2008 05:17:39 -0000	1.8
+++ perl-Devel-Size.spec	2 Apr 2009 07:33:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Devel-Size
-Version:        0.69
+Version:        0.71
 Release:        1%{?dist}
 Summary:        Perl extension for finding the memory usage of Perl variables
 License:        GPL+ or Artistic
@@ -19,6 +19,12 @@
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 
+# don't "provide" private Perl libs
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__deploop R}"
+
 %description
 This module figures out the real sizes of Perl variables in bytes. Call
 functions with a reference to the variable you want the size of. If the
@@ -60,6 +66,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.71-1
+- update to 0.71
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.69-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.69-1
 - update to 0.69
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Size/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Mar 2008 05:17:39 -0000	1.5
+++ sources	2 Apr 2009 07:33:41 -0000	1.6
@@ -1 +1 @@
-07ea62080f40a7cc7dd2e519ba4f4143  Devel-Size-0.69.tar.gz
+9504441ae609b39d70384a9fdc186362  Devel-Size-0.71.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:36:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:36:03 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/devel .cvsignore, 1.4,
	1.5 perl-MooseX-Types.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090402073603.3239F70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28326

Modified Files:
	.cvsignore perl-MooseX-Types.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Dec 2008 16:01:32 -0000	1.4
+++ .cvsignore	2 Apr 2009 07:35:32 -0000	1.5
@@ -1 +1 @@
-MooseX-Types-0.08.tar.gz
+MooseX-Types-0.10.tar.gz


Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/perl-MooseX-Types.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MooseX-Types.spec	26 Feb 2009 22:41:38 -0000	1.7
+++ perl-MooseX-Types.spec	2 Apr 2009 07:35:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Types 
-Version:    0.08
-Release:    3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -84,6 +84,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Dec 2008 16:01:32 -0000	1.4
+++ sources	2 Apr 2009 07:35:32 -0000	1.5
@@ -1 +1 @@
-d1516a4fe76498308fee1b0d757917ed  MooseX-Types-0.08.tar.gz
+82f64e1b7c267926060e56b39de3d74d  MooseX-Types-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:37:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:37:23 +0000 (UTC)
Subject: rpms/perl-File-ExtAttr/F-10 perl-File-ExtAttr.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20090402073723.304F270120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-File-ExtAttr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28670

Modified Files:
	perl-File-ExtAttr.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.09-1
- update to 1.09



Index: perl-File-ExtAttr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ExtAttr/F-10/perl-File-ExtAttr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-ExtAttr.spec	7 Mar 2008 02:00:14 -0000	1.7
+++ perl-File-ExtAttr.spec	2 Apr 2009 07:36:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-ExtAttr
-Version:        1.02
-Release:        5%{?dist}
+Version:        1.09
+Release:        1%{?dist}
 Summary:        Perl extension for accessing extended attributes of files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -21,6 +21,11 @@
 BuildRequires:  perl(Test::Distribution), perl(Test::Pod)
 BuildRequires:  perl(File::Find::Rule), perl(Module::CoreList)
 
+# don't "provide" private Perl libs
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__deploop R}"
 
 %description
 File::ExtAttr is a Perl module providing access to the extended
@@ -65,6 +70,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.09-1
+- update to 1.09
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.02-5
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ExtAttr/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2007 18:56:02 -0000	1.3
+++ sources	2 Apr 2009 07:36:52 -0000	1.4
@@ -1 +1 @@
-bbfb0a79d4001fb387fc7b1a315fa496  File-ExtAttr-1.02.tar.gz
+bcce46d86b72185f3814a7c413b86c8a  File-ExtAttr-1.09.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:39:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:39:13 +0000 (UTC)
Subject: rpms/perl-Mouse/devel .cvsignore, 1.6, 1.7 perl-Mouse.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090402073913.BE62170120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29268

Modified Files:
	.cvsignore perl-Mouse.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
- update to 0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Feb 2009 04:35:05 -0000	1.6
+++ .cvsignore	2 Apr 2009 07:38:43 -0000	1.7
@@ -1 +1 @@
-Mouse-0.17.tar.gz
+Mouse-0.19.tar.gz


Index: perl-Mouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/perl-Mouse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Mouse.spec	26 Feb 2009 22:47:32 -0000	1.7
+++ perl-Mouse.spec	2 Apr 2009 07:38:43 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:       perl-Mouse 
-Version:        0.17
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Moose minus the antlers 
@@ -14,7 +14,7 @@
 BuildRequires: perl(Class::Method::Modifiers) >= 1.01
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(MRO::Compat)
-BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(Scalar::Util) >= 1.14
 # tests
 BuildRequires: perl(Moose)
 BuildRequires: perl(Test::Exception)
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
+- update to 0.19
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Feb 2009 04:35:05 -0000	1.6
+++ sources	2 Apr 2009 07:38:43 -0000	1.7
@@ -1 +1 @@
-b7be6042224bc24f9a4f28e9c89c72de  Mouse-0.17.tar.gz
+eb21c9fbf790421a3358e3cbdb92ae5f  Mouse-0.19.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:41:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:41:36 +0000 (UTC)
Subject: rpms/perl-MRO-Compat/devel .cvsignore, 1.4, 1.5 perl-MRO-Compat.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090402074136.0B79970120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MRO-Compat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29893

Modified Files:
	.cvsignore perl-MRO-Compat.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jun 2008 19:48:41 -0000	1.4
+++ .cvsignore	2 Apr 2009 07:41:05 -0000	1.5
@@ -1 +1 @@
-MRO-Compat-0.09.tar.gz
+MRO-Compat-0.10.tar.gz


Index: perl-MRO-Compat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/devel/perl-MRO-Compat.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MRO-Compat.spec	26 Feb 2009 21:17:43 -0000	1.6
+++ perl-MRO-Compat.spec	2 Apr 2009 07:41:05 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           perl-MRO-Compat
-Version:        0.09
-Release:        2%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mro::* interface compatibility for Perls < 5.9.5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MRO-Compat/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/MRO-Compat-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/MRO-Compat-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jun 2008 19:48:41 -0000	1.4
+++ sources	2 Apr 2009 07:41:05 -0000	1.5
@@ -1 +1 @@
-49199d3a6a984c45ec24ae6fcaa8d9fd  MRO-Compat-0.09.tar.gz
+0187128ab46570c8955251bc78674cbc  MRO-Compat-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:43:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:43:28 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/F-10 .cvsignore, 1.2,
	1.3 perl-MooseX-Types.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090402074328.952F970120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30445

Modified Files:
	.cvsignore perl-MooseX-Types.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2008 03:59:59 -0000	1.2
+++ .cvsignore	2 Apr 2009 07:42:58 -0000	1.3
@@ -1 +1 @@
-MooseX-Types-0.04.tar.gz
+MooseX-Types-0.10.tar.gz


Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-10/perl-MooseX-Types.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-MooseX-Types.spec	10 Jan 2009 18:36:20 -0000	1.3
+++ perl-MooseX-Types.spec	2 Apr 2009 07:42:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Types 
-Version:    0.08
-Release:    2%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -84,6 +84,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
 - add br on Test::Exception
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2009 18:36:20 -0000	1.3
+++ sources	2 Apr 2009 07:42:58 -0000	1.4
@@ -1 +1 @@
-d1516a4fe76498308fee1b0d757917ed  MooseX-Types-0.08.tar.gz
+82f64e1b7c267926060e56b39de3d74d  MooseX-Types-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:43:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:43:30 +0000 (UTC)
Subject: rpms/perl-namespace-clean/devel .cvsignore, 1.3,
	1.4 perl-namespace-clean.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090402074330.2789C70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-clean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30485

Modified Files:
	.cvsignore perl-namespace-clean.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
- update to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2008 01:32:47 -0000	1.3
+++ .cvsignore	2 Apr 2009 07:42:59 -0000	1.4
@@ -1 +1 @@
-namespace-clean-0.09.tar.gz
+namespace-clean-0.11.tar.gz


Index: perl-namespace-clean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/devel/perl-namespace-clean.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-namespace-clean.spec	27 Feb 2009 05:14:44 -0000	1.4
+++ perl-namespace-clean.spec	2 Apr 2009 07:42:59 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-namespace-clean 
-Version:    0.09 
-Release:    2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Keep your namespace tidy 
@@ -13,7 +13,7 @@
 
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(FindBin)
-BuildRequires: perl(B::Hooks::EndOfScope)
+BuildRequires: perl(B::Hooks::EndOfScope) >= 0.07
 BuildRequires: perl(Symbol)
 BuildRequires: perl(Test::More) >= 0.62
 
@@ -77,6 +77,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
+- update to 0.11
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2008 01:32:47 -0000	1.3
+++ sources	2 Apr 2009 07:42:59 -0000	1.4
@@ -1 +1 @@
-8edfbf0ccd9cb0557e7d0c5366d9f1f1  namespace-clean-0.09.tar.gz
+480c3735ffe40b491a4700df5e8659a3  namespace-clean-0.11.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:45:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:45:09 +0000 (UTC)
Subject: rpms/perl-Mouse/F-10 .cvsignore, 1.2, 1.3 perl-Mouse.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090402074509.F186670120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Mouse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31134

Modified Files:
	.cvsignore perl-Mouse.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
- update to 0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2008 15:39:54 -0000	1.2
+++ .cvsignore	2 Apr 2009 07:44:39 -0000	1.3
@@ -1 +1 @@
-Mouse-0.09.tar.gz
+Mouse-0.19.tar.gz


Index: perl-Mouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/F-10/perl-Mouse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Mouse.spec	23 Feb 2009 04:36:24 -0000	1.6
+++ perl-Mouse.spec	2 Apr 2009 07:44:39 -0000	1.7
@@ -1,6 +1,6 @@
 
 Name:       perl-Mouse 
-Version:        0.17
+Version:        0.19
 Release:        1%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -14,7 +14,7 @@
 BuildRequires: perl(Class::Method::Modifiers) >= 1.01
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(MRO::Compat)
-BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(Scalar::Util) >= 1.14
 # tests
 BuildRequires: perl(Moose)
 BuildRequires: perl(Test::Exception)
@@ -82,6 +82,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
+- update to 0.19
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
 - update to 0.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mouse/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Feb 2009 04:36:24 -0000	1.6
+++ sources	2 Apr 2009 07:44:39 -0000	1.7
@@ -1 +1 @@
-b7be6042224bc24f9a4f28e9c89c72de  Mouse-0.17.tar.gz
+eb21c9fbf790421a3358e3cbdb92ae5f  Mouse-0.19.tar.gz



From phuang at fedoraproject.org  Thu Apr  2 07:47:04 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu,  2 Apr 2009 07:47:04 +0000 (UTC)
Subject: rpms/ibus-anthy/devel .cvsignore, 1.13, 1.14 ibus-anthy.spec, 1.14, 
	1.15 sources, 1.13, 1.14
Message-ID: <20090402074704.9B7B770120@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31538

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Update to ibus-anthy-1.1.0.20090402


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Feb 2009 07:35:46 -0000	1.13
+++ .cvsignore	2 Apr 2009 07:46:34 -0000	1.14
@@ -1 +1 @@
-ibus-anthy-1.1.0.20090211.tar.gz
+ibus-anthy-1.1.0.20090402.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ibus-anthy.spec	25 Feb 2009 06:29:22 -0000	1.14
+++ ibus-anthy.spec	2 Apr 2009 07:46:34 -0000	1.15
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-1.1
 Name:       ibus-anthy
-Version:    1.1.0.20090211
-Release:    2%{?dist}
+Version:    1.1.0.20090402
+Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -54,6 +54,12 @@
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Apr 02 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090402-1
+- Update to 1.1.0.20090402.
+- Fix bug 490747 - Muhenkan (no-conversion) key does not undo conversion
+- Fix bug 490750 - Henkan key for candidate conversion doesn't do anything
+- Fix bug 490748 - Kana key doesn't do anything
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Feb 2009 07:35:46 -0000	1.13
+++ sources	2 Apr 2009 07:46:34 -0000	1.14
@@ -1 +1 @@
-860b8319ec95ce45d654a1b74e706a76  ibus-anthy-1.1.0.20090211.tar.gz
+2d5ae290174ed2f326006659deabc127  ibus-anthy-1.1.0.20090402.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:48:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:48:08 +0000 (UTC)
Subject: rpms/perl-MRO-Compat/F-10 .cvsignore, 1.4, 1.5 perl-MRO-Compat.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090402074808.C609F70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MRO-Compat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31777

Modified Files:
	.cvsignore perl-MRO-Compat.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jun 2008 19:48:41 -0000	1.4
+++ .cvsignore	2 Apr 2009 07:47:38 -0000	1.5
@@ -1 +1 @@
-MRO-Compat-0.09.tar.gz
+MRO-Compat-0.10.tar.gz


Index: perl-MRO-Compat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-10/perl-MRO-Compat.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MRO-Compat.spec	28 Jun 2008 19:48:41 -0000	1.5
+++ perl-MRO-Compat.spec	2 Apr 2009 07:47:38 -0000	1.6
@@ -1,11 +1,11 @@
 Name:           perl-MRO-Compat
-Version:        0.09
+Version:        0.10
 Release:        1%{?dist}
 Summary:        Mro::* interface compatibility for Perls < 5.9.5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MRO-Compat/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/MRO-Compat-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/MRO-Compat-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -69,6 +69,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jun 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09
 - update to 0.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MRO-Compat/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jun 2008 19:48:41 -0000	1.4
+++ sources	2 Apr 2009 07:47:38 -0000	1.5
@@ -1 +1 @@
-49199d3a6a984c45ec24ae6fcaa8d9fd  MRO-Compat-0.09.tar.gz
+0187128ab46570c8955251bc78674cbc  MRO-Compat-0.10.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 07:48:43 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 07:48:43 +0000 (UTC)
Subject: rpms/perl-namespace-clean/F-10 .cvsignore, 1.2,
	1.3 perl-namespace-clean.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090402074843.CA09370120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-namespace-clean/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31959

Modified Files:
	.cvsignore perl-namespace-clean.spec sources 
Log Message:
* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
- update to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2008 21:40:29 -0000	1.2
+++ .cvsignore	2 Apr 2009 07:48:13 -0000	1.3
@@ -1 +1 @@
-namespace-clean-0.08.tar.gz
+namespace-clean-0.11.tar.gz


Index: perl-namespace-clean.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/F-10/perl-namespace-clean.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-namespace-clean.spec	3 Dec 2008 01:43:18 -0000	1.3
+++ perl-namespace-clean.spec	2 Apr 2009 07:48:13 -0000	1.4
@@ -1,7 +1,7 @@
 
 Name:       perl-namespace-clean 
-Version:    0.09 
-Release:    1%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Keep your namespace tidy 
@@ -13,7 +13,7 @@
 
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(FindBin)
-BuildRequires: perl(B::Hooks::EndOfScope)
+BuildRequires: perl(B::Hooks::EndOfScope) >= 0.07
 BuildRequires: perl(Symbol)
 BuildRequires: perl(Test::More) >= 0.62
 
@@ -77,6 +77,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
+- update to 0.11
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 02 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
 - update to 0.09
 - note BR change from Scope::Guard to B::Hooks::EndOfScope


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-namespace-clean/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2008 01:43:18 -0000	1.3
+++ sources	2 Apr 2009 07:48:13 -0000	1.4
@@ -1 +1 @@
-8edfbf0ccd9cb0557e7d0c5366d9f1f1  namespace-clean-0.09.tar.gz
+480c3735ffe40b491a4700df5e8659a3  namespace-clean-0.11.tar.gz



From pkgdb at fedoraproject.org  Thu Apr  2 07:57:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:57:53 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090402075734.1FC76208514@bastion.fedora.phx.redhat.com>

phuang has set the watchbugzilla acl on awn-extras-applets (Fedora devel) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Thu Apr  2 07:57:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:57:54 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090402075734.2E432208553@bastion.fedora.phx.redhat.com>

phuang has set the watchcommits acl on awn-extras-applets (Fedora devel) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Thu Apr  2 07:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:57:33 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090402075736.01916208557@bastion.fedora.phx.redhat.com>

phuang has set the commit acl on awn-extras-applets (Fedora devel) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Thu Apr  2 07:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:58:04 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090402075744.7D4E1208604@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-workspace (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 07:58:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:58:05 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090402075746.5ACCB2084D5@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-workspace (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 07:58:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:58:03 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090402075746.928182086EF@bastion.fedora.phx.redhat.com>

phuang has set the approveacls acl on awn-extras-applets (Fedora devel) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Thu Apr  2 07:57:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:57:47 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090402075750.0F0502086F6@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-workspace (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Thu Apr  2 07:59:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:59:17 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402075918.43A4420854A@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 07:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:59:22 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402075924.9E60A208602@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Thu Apr  2 07:59:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 07:59:38 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090402075918.88E9E208555@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From cweyl at fedoraproject.org  Thu Apr  2 08:06:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 08:06:18 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/F-10 perl-Git-CPAN-Patch.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090402080618.230DE70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5679

Modified Files:
	perl-Git-CPAN-Patch.spec sources 
Log Message:
* Sat Mar 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.5-1
- update to 0.1.5



Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-10/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Git-CPAN-Patch.spec	28 Mar 2009 07:25:47 -0000	1.1
+++ perl-Git-CPAN-Patch.spec	2 Apr 2009 08:05:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.1.4
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -75,6 +75,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Mar 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.5-1
+- update to 0.1.5
+
 * Wed Mar 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.4-2
 - break into main package + git-cpan-patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Mar 2009 07:25:47 -0000	1.2
+++ sources	2 Apr 2009 08:05:47 -0000	1.3
@@ -1 +1 @@
-3ca356d3896cf37a7133301fc9678ff2  Git-CPAN-Patch-0.1.4.tar.gz
+5777545c4b9c9021c6b29c114fb72a5c  Git-CPAN-Patch-0.1.5.tar.gz



From cweyl at fedoraproject.org  Thu Apr  2 08:06:39 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 08:06:39 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/F-9 perl-Git-CPAN-Patch.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090402080639.B17FE70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5787

Modified Files:
	perl-Git-CPAN-Patch.spec sources 
Log Message:
* Sat Mar 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.5-1
- update to 0.1.5



Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-9/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Git-CPAN-Patch.spec	28 Mar 2009 07:20:33 -0000	1.1
+++ perl-Git-CPAN-Patch.spec	2 Apr 2009 08:06:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.1.4
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -75,6 +75,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Mar 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.5-1
+- update to 0.1.5
+
 * Wed Mar 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.4-2
 - break into main package + git-cpan-patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Mar 2009 07:20:33 -0000	1.2
+++ sources	2 Apr 2009 08:06:09 -0000	1.3
@@ -1 +1 @@
-3ca356d3896cf37a7133301fc9678ff2  Git-CPAN-Patch-0.1.4.tar.gz
+5777545c4b9c9021c6b29c114fb72a5c  Git-CPAN-Patch-0.1.5.tar.gz



From akurtakov at fedoraproject.org  Thu Apr  2 08:12:58 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  2 Apr 2009 08:12:58 +0000 (UTC)
Subject: rpms/eclipse/devel pre350changelog.txt, NONE,
	1.1 eclipse-jdt_launch-customBuild.patch, NONE,
	1.1 eclipse-platform_build.patch, NONE,
	1.1 eclipse-osgi-classpath.patch, 1.1,
	1.2 eclipse-buildswtnatives.patch, 1.1,
	1.2 eclipse-config.ini.director, 1.1,
	1.2 ecf-filetransfer-feature.xml, 1.1, 1.2 sources, 1.71,
	1.72 eclipse.spec, 1.625, 1.626 eclipse-nojarsignatures.patch,
	1.2, 1.3 .cvsignore, 1.55, 1.56 eclipse-mv-Platform.sh, 1.3, 1.4
Message-ID: <20090402081258.23BC370120@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7104/devel

Modified Files:
	eclipse-osgi-classpath.patch eclipse-buildswtnatives.patch 
	eclipse-config.ini.director ecf-filetransfer-feature.xml 
	sources eclipse.spec eclipse-nojarsignatures.patch .cvsignore 
	eclipse-mv-Platform.sh 
Added Files:
	pre350changelog.txt eclipse-jdt_launch-customBuild.patch 
	eclipse-platform_build.patch 
Log Message:
Initial 3.5 build.


--- NEW FILE pre350changelog.txt ---
* Mon Mar 30 2009 Dennis Gilmore <dennis at ausil.us> 1:3.4.2-6
- base sparcv9 and sparc on ppc

* Fri Mar 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-5
- Disable XULRunner-specific patch.
- Make pdebuild script to not generate p2 repo. 

* Mon Mar 16 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-4
- Build with XULRunner-specific flags since we're building against XULRunner.

* Mon Mar 9 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-3
- Remove ecj sub-package as it is replaced by standalone ecj package.

* Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-2
- Strict R/BR for sat4j >= 2.0.3.

* Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-1
- Update to 3.4.2.

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.4.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.1-15
- Rebuild for new xulrunner.

* Fri Jan 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.1-14
- Add R:java-devel for -jdt (rh#480979).

* Mon Jan 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.1-13
- Fix pdebuild to auto-set javacSouce based on BREE.

* Fri Dec 19 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
- Fixed GCJ AOT compilation (Gary Benson).

* Mon Dec 15 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-11
- Update pdebuild and package-build patch to include -z option.
- Make ecj default to 1.5 (rh#354721).
- Add GCJ AOT bits for ecj (rh#473674).

* Fri Dec 5 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-10
- Remove MaxPermSize from sysproperty lists in library.xml as it was causing the
  JVM to not start.

* Thu Dec 4 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-8
- Increase MaxPermSize when running tests.

* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:3.4.1-8
- Rebuild for Python 2.6

* Thu Nov 20 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-7
- Update and re-enable patch for always generating debuginfo for class files
  when doing an RPM build.
- Resolves rh#472292.

* Mon Oct 27 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-6
- Keep Provides: eclipse on -pde (different than Fedora 9 but probably
  more correct).

* Thu Oct 23 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-5
- Fix splashscreen (#467259).

* Fri Oct 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-4
- Fix quoting bug in pdebuild.sh again.

* Fri Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-3
- Fix swt symlinks in %%libdir/eclipse.

* Thu Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-2
- Fix quoting bug in pdebuild.sh.

* Wed Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-1
- Move copy-platform instead of copying it.

* Wed Oct 15 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-1
- Add conditionals around Equinox initialization to enable debugging.

* Fri Oct 13 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-1
- Symlink to ant-apache-bsf and ant-commons-net.
- Update branding.
- Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008).
- Update desktop-file-install usage and add --vendor=fedora. (Andrew Overholt)
- Resolves #466476. Fix pdebuild script. (Jeff Johnston)
- Remove dropins contents while running initializer.
- Add patch for wrong javaHome on x86_64 in the native build.(Alexander Kurtakov)

* Thu Oct 03 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-0
- 3.4.1
- Update nojarsignatures patch.
- Added osgi-classpath.patch fixes broken bootclasspath (Sean Flanigan).
- Removed patches 33 and 34 - not needed anymore.

* Thu Sep 25 2008 Michal Nowak <mnowak at redhat.com> 3.4.0-24
- exclude parts of eclipse-pydev from JIT compilation
- Resolves: bug 461860

* Tue Sep 02 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-23
- Use icu4j in its new place.

* Wed Aug 27 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-22
- Add test framework
- Remove two duplicate lines in eclipse-mv-Platform.sh
- Modify package-build and pdebuild so they can build the SDK tests

* Wed Aug 13 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-21
- Fix ecj-gcj (rhbz#458921)

* Tue Aug 12 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-20
- Require release of jetty which requires tomcat bits with proper metadata
- Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov)
- Add version to jakarta-commons-el requirement

* Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-19
- Move jdt and sdk dropins contents to non-eclipse-sub-dir place which
  makes dropins reconciler see them as dropins and not extension
  locations
- Add versions to jetty, lucene, and jsch Requires

* Thu Aug 07 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-18
- Add %%{_libdir}/eclipse/dropins/jdt to ecj files list

* Wed Aug 06 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-17
- Add p2 metadata generation to pdebuild
- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
  copy-platform
- Fix brightness in splash screen
- Fix icon symlinks
- Bump icu4j-eclipse requirement

* Tue Aug 05 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-16
- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
- Update copy-platform to add %%{_datadir}/dropins

* Mon Aug 04 2008 Sean Flanigan <sflaniga at redhat.com> 3.4.0-15
- Removed buildroot from path in datadir.link

* Mon Aug 04 2008 Sean Flanigan <sflaniga at redhat.com> 3.4.0-14
- Created missing directory for link file

* Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-13
- Update patch to avoid Hotspot crashing
- Add links folder for noarch plugins
- Create and add ownership of %%{_datadir}/eclipse/{plugins,features}

* Thu Jul 31 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-12
- Set product to Fedora Eclipse
- Remove pde-runtime %%package section
- Remove unnecessary Requires(post,postun)s

* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-11
- Update copy-platform to work with dropins
- Update JVM-crashing patch

* Mon Jul 28 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-10
- Move JDT and PDE/SDK bits to dropins/{jdt,sdk}
- Drop versionless PDE Build symlink (put logic into pdebuild script)
- Make SWT JAR symlinks relative
- Fold pde-runtime into pde
- Add patch to add root files for non-upstream arches
- Fix building of fragments for non-upstream arches
- Remove about.html from files list on ppc (will fix later)

* Fri Jul 25 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-10
- Add ability for pdebuild (-o) to work with Orbit-style dependencies

* Fri Jul 25 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-9
- Collapse patches to build SWT native bits into two
- Copy about* from x86 to all non-x86{_64} platforms

* Wed Jul 23 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-8
- Don't build for arch/ws/os combos other than the one on which we're
  building

* Wed Jul 23 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-7
- More work on non-upstream arches

* Mon Jul 21 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-6
- Update description to be a bit more current
- Attempt ppc64, etc. builds

* Mon Jul 21 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-5
- Add core.net fragment in %%files for x86
- I spoke with author about above and no .so is built because it is
  currently not used by the fragment
- Update ecj-gcj addition (Tom Tromey)

* Fri Jul 18 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-4
- Un-do crazy config.ini, bundles.info, etc. shuffling
- Update patch for building native libraries
- Re-add missing BR on tomcat5-jasper-eclipse
- Add patch for 64-bit platforms to build SWT
- Don't try to resolve http://bundles.osgi.org for javadocs
- Provision with java -cp instead of binary launcher

* Thu Jul 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-3
- Generate metadata and provision each sub-package
- Do crazy config.ini, bundles.info, and *.profile shuffling
- Add post and postun sections to update the config.ini, bundles.info, and
  *.profile files

* Wed Jul 16 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-1
- Fix files lists

* Wed Jul 16 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-1
- Update branding
- Fix p2 stuff so p2 UI works

* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-1
- 3.4
- Remove gcj compilation
- Update versions of dependencies
- Rename libswt3-gtk2 to eclipse-swt
- Move "Provides: eclipse" to PDE from JDT
- Remove unnecessary old Obsoletes/Provides
- Remove tomcat stuff since it's no longer used
- Move stuff from %%{_datadir}/eclipse to %%{_libdir}/eclipse
- Add BRs/Rs on objectweb-asm and sat4j
- Build ECF filetransfer stuff as part of this SRPM until we have a
  separate eclipse-ecf package (which will require this version of the
  SDK)

* Sat Jun 14 2008 Dennis Gilmore <dennis at ausil.us> 3.3.2-13
- make changes to support sparcv9

* Wed May 14 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-12
- Back-port patch for e.o#206432 (rh#446064).

* Sat Apr 26 2008 Mat Booth <fedora at matbooth.co.uk> 3.3.2-11
- Fixed some benign errors in copy-platform when calling pdebuild
  multiple times.

* Fri Apr 25 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-10
- Bump maximum heap size from 256 MB to 512 MB.
- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
  (which is really
  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100).
- Some jiggery-pokery for spaces in SWT paths for buildagainstxulrunner
  patch.

* Wed Apr 09 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-9
- Fix patch level for xulrunner build patch.

* Wed Apr 09 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-8
- Rather than removing java-javadoc, just add Requirement in all cases
  (gcj or not).

* Wed Apr 09 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-7
- Remove explicit java-javadoc requirements as OpenJDK's -devel package
  provides it.
- Patch SWT build to find libxul.pc.

* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-6
- Fix path of pdebuild in %%files.  Gah.

* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-5
- Move pdebuild to better location (buildscripts).

* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-4
- Fix SWT version in Requires.

* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-3
- Add missing line continuation.

* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-2
- Change ecj Provides from <= to = (rhbz#439825).

* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-1
- 3.3.2
- Update Obsoletes/Provides for ecj and make more ecj symlinks
  (rhbz#439825).

* Mon Mar 31 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-18
- Add PDE Build wrapper script (%%{_datadir}/eclipse/pdebuild) for
  packaging guidelines.

* Mon Mar 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-17
- Mark eclipse.ini as %%config.

* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.3.1.1-16
- Autorebuild for GCC 4.3

* Fri Feb 08 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-15
- Add ia64 patches from Doug Chapman.
- rhbz#431963.

* Wed Dec 05 2007 Martin Stransky <stransky at redhat.com> 3.3.1.1-14
- rebuilt against XUL Runner (gecko-libs 1.9)
- removed .png extension from the desktop file

* Tue Dec 04 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-13
- Remove Fedora log from splash screen.

* Mon Dec 03 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-12
- Update splash screen.

* Fri Nov 30 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-11
- Fix PermSize option (thanks to Mary Ellen Foster for testing).

* Fri Nov 23 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-10
- Move eclipse.ini for real.

* Fri Nov 23 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-9
- Move eclipse.ini in %%files section.

* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-8
- Re-enable gcj_support.

* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-7
- Un-break non-ppc64 platforms.

* Mon Nov 19 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-6
- Require jpackage-utils (courtesy Patrice Dumas).
- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
- Move eclipse.ini to %%{_libdir}/eclipse where it gets read.
- Resolves:  rhbz#394161.

* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-5
- Remove extraneous build.index comment (from test build again).

* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-4
- Enable gcj support (disabled for test build).

* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-3
- Update tomcat patches.
- Resolves:  rhbz#380121.

* Wed Nov 14 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-2
- Bump release to tag non-corrupted source zip.

* Thu Nov 01 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-1
- Update branding.
- Work around e.o#195897 by setting the VM arg explicitly.

* Fri Oct 26 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-1
- 3.3.1.1
- Add patch for memory issues with IcedTea.

* Mon Oct 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1-1
- 3.3.1
- Update icu4j requirement for new version number.

* Thu Oct 11 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-27
- Add patch to have unversioned swt.jar symlink (courtesy Patrice
  Dumas).

* Sat Oct 06 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-26
- Add encoding to desktop file.
- Fix %%files list again.

* Fri Oct 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-25
- Fix %%files list for Fedora Eclipse feature.

* Fri Oct 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-24
- Update branding plugin.
- Add branding feature.  This fixes the update manager issue when using
  the Fedora-branded product.
- Thanks to Alexander Kurtakov and Pascal Rapicault for helping track
  down this issue.

* Wed Oct 03 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-23
- Build gcj bits on x86 and x86_64.
- Add instructions for how to get source of branding plugin.
- Fix splash screen typo.
- Resolves:  rhbz#301871.

* Wed Sep 26 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-21
- Add patch to generate 1.6 bytecode on a 1.7 VM (kudos to Olivier
  Thomann)
- Resolves:  rhbz#288991.

* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-20
- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.

* Mon Sep 10 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-19
- Don't require subclipse, cdt, or rpm-editor on ppc64.

* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-18
- Build 1.6 plugins when building with IcedTea.

* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-17
- Update Fedora Eclipse product plugin to fix Welcome page.

* Thu Sep 06 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-16
- Compile SDK to 1.5 bytecode and disable 1.6 plugins.

* Wed Sep 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-15
- Update tomcat5, commons-el, and commons-logging to required releases
  with proper OSGi manifests.

* Mon Sep 04 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-14
- Add Fedora Eclipse product plugin.
- Add Requires: eclipse-rpm-editor to platform subpackage.

* Thu Aug 30 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-13
- Move *-sdk subpackages to pde subpackage.
- Add BuildRequires: libXt-devel for IcedTea build.
- Add launcher-fix-java-home.patch.

* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-12
- Require mylyn on all archs except ppc64 alpha.
- Use IcedTea on x86_64 and x86.
- Remove hacks for s390{,x} as they are now included in upstream build.

* Tue Aug 28 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-11
- Symlink to jetty.

* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-10
- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn,
  eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac
  and eclipse-changelog to platform package.
- Add requires eclipse-mylyn-java to jdt.
- Add requires eclipse-mylyn-pde to pde.
- Remove pde-sdk and sdk sub-packages

* Thu Aug 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-9
- Add Requires: eclipse-cvs-client to jdt package.

* Tue Aug 14 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-8
- Link to junit4 jar.
- Remove included eclipse binaries.
- Add Provides: eclipse to sdk subpackage.

* Mon Aug 13 2007 Oliver Falk <oliver at linux-kernel.at> 3.3.0-7
- Also explode SDK tarball on alpha
- Resolves: #251958

* Tue Aug 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-6
- Add links for jsp api, servlet api and jasper.
- Add %%{_libdir}/%%{name}/features to the rcp %%files listing.

* Fri Aug 03 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-5
- Add patch to fix double free bug in launcher library.
- Resolves: #248798.

* Tue Jul 31 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-4
- Link to commons-el.jar.
- Remove ant 1.7 hacks.

* Wed Jul 18 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-3
- Add links for lucene and lucene.analysis.
- Remove icu4j symlink from /usr/share/eclipse/plugins.
- Resolves: #248749.

* Mon Jul 16 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-2
- Fix dep in rcp sub-package.
- Add Alpha support.
- Link to commons-logging.jar
- Resolves: #248359.

* Fri Jun 29 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-1
- 3.3.

* Wed Jun 27 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.3.RC4
- Restore ppc64, s390{,x} and sparc{,64} support.
- Restore multilib support.

* Tue Jun 19 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC4
- Use icu4j-eclipse sub-package instead of building icu4j here.
- Use exec in binary wrapper.
- Add 3.3.0 splashscreen.

* Tue Jun 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC4
- 3.3RC4.

* Mon Jun 11 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC3
- Update launching strategy for 3.3.
- Pull in package-build fix from F-7.

* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC3
- 3.3RC3.

* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC2
- 3.3RC2.

* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC1
- 3.3RC1.
- Pull in changes from F-7.

* Mon Feb 26 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.M5eh
- 3.3M5.
- Remove launcher-addplatformtotildeeclipse.patch as it's only needed
  for FC-5 -> FC-6.
- Remove swt firefox patches as they are no longer needed.
- Remove ppc64, s390{,x} and sparc{,64} support.
- Remove use-built-launcher patch.
- Update set-launcher-and-configuration-dir patch.

* Mon Jan 29 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.3.M4
- Enable updated ecj square brackets patch.

* Fri Jan 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.M4
- Pull in fixes from rawhide.

* Wed Dec 20 2006 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.M4
- 3.3M4.
- Update patches for 3.3M4.
- Remove SWT JNI symlinks in %%{_libdir}.

* Wed Dec 6 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-25
- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2.
- Resolves: #211008.

* Tue Dec 5 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-24
- Specfile review with Ben Konrath.
- Lots of cleanups.

* Tue Nov 28 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-23
- Move back to ~/.eclipse for update site pending upstream comments.
- Add patch to add platform to ~/.eclipse's platform.xml.  This maintains
  user-installed plugins but allows us to remove the pre-configured
  platform.xml in the OSGi configuration area.

* Mon Nov 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-22
- Use ~/.eclipseplugins instead of ~/.eclipse in update site - homedir patch.
- Bump release.

* Fri Nov 17 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-21
- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853).
- Resolves: #209393.

* Fri Nov 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-20
- Revise gre64 patch to just do ppc64 addition and not ordering change.

* Thu Nov 16 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-19
- Add patch to look at gre64.conf on ppc64.

* Fri Nov 10 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-18
- Remove SWT ON_TOP patch as it is fixed in 3.2.1.

* Thu Nov 09 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-17
- Add file level requirement for swt fragment to rcp and platform packages.
  This is needed so that the rcp and platform packages pull in the swt package
  of the correct word size.

* Mon Nov 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-16
- Move copy-platform back to %%{_datadir}/eclipse.
- Require gjdoc >= 0.7.7-14 as it generates consistent html across archs.
- Move most of the doc plugins back to %%{_datatdir}/eclipse now that gjdoc
  is fixed.

* Fri Nov 03 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-15
- Make sdk require config.ini itself rather than the package to deal with the
  bi-arch installation situation.
- Move sdk feature and plugin to %%{_libdir} so we can check for its existence
  in the post scripts.

* Thu Nov 02 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-14
- Remove post sections that munge eclipse.product; always set it to
  org.eclipse.platform.ide or org.eclipse.sdk.ide.
- Remove changelogs prior to 3.2.0.

* Thu Nov 02 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-12
- Move doc plugins to %%{_libdir}/eclipse/plugins because of html is being
  generated differently on different arches.
- Fix multilib problem when there are two or more jars within a jar.
- BR dos2unix always (for mac2unix).

* Wed Nov 01 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-11
- Move copy-platform to %%{_libdir}/eclipse
- Move the platform.source, icu4j, icu4j.source, help.webapp and
  update.core.linux plugins to %%{_libdir}/eclipse/plugins because these plugins
  have platform specific content. Some of the platform specific content may be
  a result of bugs in libgcj. These need to be investigated.
- Disable building the help indexes on all archs so that we have the same doc
  plugins on all archs.
- Remove org.apache.ant_1.6.5/bin/runant.py to avoid multilib conflicts.
- Repack all the jars and the jars within those jars. This is needed
  to make this package multilib compatible.
- Put SWT symlinks in %%{_libdir}/eclipse instead of
  %%{_libdir}/eclipse/plugins.

* Wed Nov 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-11
- Use equinox initializer instead of old patch to core.runtime.
- Run initializer *after* splitting install into arch-specific and
  arch-independent locations.
- Move copy-platform to arch-specific location.
- Get rid of broken symlinks in tomcat plugin.

* Tue Oct 31 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-11
- Fix copy-platform to work with split install.

* Tue Oct 31 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-10
- Add 3.2.1 splash screen.
- Sort the java source files before building (#209249).
- Remove Fedora ifdefs.
- Resolves: #209249.

* Tue Oct 31 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-9
- Re-enable building of the icu4j plugins.

* Mon Oct 30 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-8
- Temporarily disable building of icu4j plugin.

* Mon Oct 30 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-8
- Fix eclipse-ecj symlink to point to correct location.
- Put SWT symlinks in %%{_libdir} instead of %%{_datadir} as they're
  target-dependent.

* Sat Oct 28 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-7
- Add patch for ecj [] classpath problem.
- Remove configuration files from rcp files list.
- Add patch set bindir and shared config patch to allow the eclipse binary
  to sit in %%{_bindir} and remove the symlinks. This patch also allows us to
  set osgi.sharedConfiguration.area config on a per build basis so that the
  configuration directory can be arch dependant.
- Remove launcher link patch as the bindir patch removes the requirement for
  this patch.
- Don't aot-compile org.eclipse.ui.ide to work around rh bug # 175547.
- Add Requies(post,postun) to all packages to ensure that no files are left
  behind when eclipse is un-installed.
- Many spec file clean ups.
- Resolves: #199961, #202585, #210764, #207016.
- Related: #175547.

* Mon Oct 16 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-6
- Remove unneeded tomcat symlinks.

* Mon Oct 16 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-6
- Remove unnecessary bits of configuration.
- Resolves: #210764, #202585.

* Tue Oct 10 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-5
- Remove perl dependancy.
- Fix offsets in libswt-enableallandO2 patch.
- Add Requires(post,postun) java-gcj-compat to sdk to avoid errors when
  uninstalling the java stack.
- Move jface and jface.databinding from libswt3-gtk2 to rcp because these
  plugins have dependancies on some plugins in rcp.

* Sun Oct 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-4
- Fix triggerpostun to include epoch of previous releases.

* Fri Sep 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-3
- Add Requires(post,postun) to platform and sdk sub-packages so that post and
  postun scripts work correctly.

* Fri Sep 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-3
- Add triggerpostun to deal with old rebuild-sdk-features postun crap
  (rh#207442, rh#207013).

* Fri Sep 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
- Fix swt-firefox patch to not create DSOs with undefined symbols (rh#201778).

* Thu Sep 28 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-1
- 3.2.1 final.

* Thu Sep 28 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
- Use new swt-firefox patch and consolidate others into one.

* Wed Sep 27 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.3
- Fix typo in %%postun of -sdk and -platform.
- Disable help index generation on ia64.

* Tue Sep 26 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.2
- Don't set eclipse.product incorrectly in %%postun of -sdk and -platform.

* Mon Sep 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.1
- M20060921-0945 (3.2.1 pre-release).
- Upadate patches to 3.2.1.
- Add icu4j 3.4.5 sources.
- Add Fedora version to platform about.mappings as well as sdk.

* Mon Sep 25 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-8
- Remove unused eclipse.conf.
- Remove unused gre64.conf patch (applied upstream).

* Thu Sep 21 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-7
- Use real SWT version on ia64, ppc64, s390 and s390x.
- Remove the swt native libs from the rcp sub-package because they are
  already in the libswt-gtk2 sub-package and rcp requires libswt-gtk2.
- Set correct eclipse.product in post and postun of sdk and platform
  sub-packages (rh bug # 207442)
- Don't set the .eclipseproduct twice.
- Add Conflicts: mozilla to libswt3-gtk2 (rh bug # 207626).
- Move Requires: firefox to libswt3-gtk2.

* Thu Sep 21 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-7
- Add workaround for gjdoc Mac-encoded bug (gcc#29167) to make javadocs build.
- Fix tomcat symlinking in %%install to make help work (rh#199453).

* Mon Sep 11 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-6
- Update swt-firefox patch and remove libswt-xpcom patch (rh bug # 200929).
- Re-work files list to match upstream and remove rebuild-sdk-features
  (rh bug # 205933).

* Thu Sep 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-5
- Add swt-firefox patch; moves SWT to NS_InitXPCOM3() from NS_InitEmbedding().
- Add sparc support (Dennis Gilmore <dennis at ausil.us>).
- Disable help index generation on s390.

* Wed Sep 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-4
- Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because
  it has not been applied upstream.
- Minor spec file clean ups.
- Add %%{name} to the -devel package Provides so that upgrading from
  FC-5 to FC-6 works.
- Re-enable natively compiling the ant.ui plugin.
- Re-enable natively compiling the team.cvs.core plugin on ia64.

* Fri Sep 01 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-3
- Use the system tomcat on ppc64 and s390x.

* Wed Aug 30 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-3
- Don't use pkg_summary.

* Tue Aug 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-2
- Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.
- Require java-gcj-compat >= 1.0.64.

* Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
- Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).

* Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_11fc
- Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
  jars that don't exist.
- Fix rebuild-sdk-features to work with 3.2.x feature versions.

* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_10fc
- Use firefox-devel instead of mozilla-devel.
- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).

* Tue Jul 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_9fc
- Use sed instead of patches for tomcat version numbers.

* Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_8fc
- Disable build.index doc generation on i386.

* Sun Jul 23 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_7fc
- Remove org.eclipse.ant.ui* from %%files.

* Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_7fc
- Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar from aot-compile-rpm.

* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1jpp_6fc
- Rebuilt

* Thu Jul 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_5fc
- New splash screen from Diana Fong (rh#199456).

* Tue Jul 18 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_4fc
- Add patch from Tom Tromey for ecj-gcj branch of gcj.
- Fix SWT symlinks.

* Tue Jul 18 2006 Igor Foox <ifoox at redhat.com> 3.2.0-1jpp_3fc
- Rebuild.

* Mon Jul 17 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_2fc
- Rebuild.

* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Temporarily add webapp patch for ppc64 and s390x.
- Bump tomcat5 to 5.5.17 both in BR/R and in patches.

* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Don't require tomcat on ppc64, s390, or s390x until we've got it there.
- org.eclipse.tomcat -> org.eclipse.tomcat/lib.
- Update webapp build patch.
- Use commons-* instead of jakarta-commons-*.
- Don't delete jars in %%install.
- Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now).
- Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64.
- Use tomcat plugin version instead of org.eclipse.tomcat_*.

* Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
- Fix tomcat symlinks.

* Tue Jul 04 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- 3.2.0.
- Remove Provides:  eclipse-sdk from eclipse-platform.
- Use build-jar-repository where appropriate.

* Tue Jun 13 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.7
- Rename -devel packages to -sdk to match upstream names.
- Add Provides eclipse-sdk to platform-sdk.
- Remove zip re-pack code.

* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.6
- Bump release again.

* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.5
- Bump release.

* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.4
- Require java-gcj-compat 1.0.52.
- Don't use '*' to set the quatifier name in the eclipse-ecj symlink.
- Really fix swt symlinks rh #194500.

* Wed Jun 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.3
- Enable ppc64, s390 and s390x.
- Add check for jars at the end of prep.
- Fix patch for rh #162177 (square brackets patch).
- Fix swt symlinks rh #194500.
- Add versionless pde.build symlink.
- Rename efj-wrapper.sh to efj.sh.in.
- Re-pack all zips after the build to ensure that zips have the same md5sum
  across arch re-builds. This is needed to avoid multilib conflicts.

* Wed Jun 07 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.2
- Fix eclipse-ecj.jar symlink to include qualifier.

* Tue Jun 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.1
- 3.2RC7.
- Remove com.jcraft.jsch_0.1.28.jar and repackage with classes from the system
  jsch.jar.
- Work around ia64 compile problem in aot-compile-rpm.

* Wed May 31 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC6
- 3.2RC6.

eclipse-jdt_launch-customBuild.patch:

--- NEW FILE eclipse-jdt_launch-customBuild.patch ---
--- plugins/org.eclipse.jdt.launching/scripts/customBuild.xml.orig	2009-03-09 15:06:45.000000000 +0100
+++ plugins/org.eclipse.jdt.launching/scripts/customBuild.xml	2009-03-09 16:57:53.000000000 +0100
@@ -14,5 +14,64 @@
     	<property name="bundleJavacTarget" value="${tempTarget}"/>
     </target>	
 
+	<target name="noDefault">
+		<echo message="This file must be called with explicit targets" />
+	</target>
+	
+	<target name="pre.build.jars">
+	</target>
+
+	<target name="post.build.jars">
+	</target>
+
+	<target name="pre.build.sources">
+	</target>
+
+	<target name="post.build.sources">
+	</target>
+
+	<target name="pre.name">
+	</target>
+
+	<target name="pre. at dot">
+	</target>
+
+	<target name="post.compile.name">
+	</target>
+	<target name="post.compile.lib/launchingsupport.jar">
+	</target>
+
+	<target name="post.compile. at dot">
+	</target>
+
+	<target name="post.name">
+	</target>
+
+	<target name="post. at dot">
+	</target>
+	
+	<target name="pre.gather.bin.parts">
+	</target>
+
+	<target name="post.gather.bin.parts">
+	</target>
+
+	<target name="pre.gather.sources">
+	</target>
+
+	<target name="post.gather.sources">
+	</target>
+
+	<target name="pre.gather.logs">
+	</target>
+
+	<target name="post.gather.logs">
+	</target>
+
+	<target name="pre.clean">
+	</target>
+
+	<target name="post.clean">
+	</target>
 
 </project>
\ No newline at end of file

eclipse-platform_build.patch:

--- NEW FILE eclipse-platform_build.patch ---
--- features/org.eclipse.platform/build.xml.orig	2009-04-02 08:59:23.000000000 +0200
+++ features/org.eclipse.platform/build.xml	2009-04-02 09:03:36.000000000 +0200
@@ -176,6 +176,11 @@
 			<property name="ws" value="win32"/>
 			<property name="os" value="win32"/>
 		</ant>
+		<ant antfile="build.xml" dir="../../features/org.eclipse.help" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="ws" value="win32"/>
+			<property name="os" value="win32"/>
+		</ant>
 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.intro" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="ws" value="win32"/>

eclipse-osgi-classpath.patch:

Index: eclipse-osgi-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-osgi-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-osgi-classpath.patch	3 Oct 2008 14:03:03 -0000	1.1
+++ eclipse-osgi-classpath.patch	2 Apr 2009 08:12:56 -0000	1.2
@@ -1,55 +1,17 @@
---- plugins/org.eclipse.osgi/build.xml.orig	2008-09-25 15:28:47.000000000 +1000
-+++ plugins/org.eclipse.osgi/build.xml	2008-09-25 15:54:08.000000000 +1000
-@@ -16,18 +16,36 @@
+--- plugins/org.eclipse.osgi/build.xml.sav	2009-03-04 16:14:31.000000000 +0100
++++ plugins/org.eclipse.osgi/build.xml	2009-03-04 16:23:41.000000000 +0100
+@@ -16,7 +16,13 @@
  	<property name="compilerArg" value=""/>
- 	<property name="javacSource" value="1.3"/>
- 	<property name="javacTarget" value="1.2"/>
--	<property name="bundleBootClasspath" value="osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.0/Foundation-1.0}"/>
-+	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-+		<os family="mac"/>
-+	</condition>
+ 	<property name="bundleJavacSource" value="1.3"/>
+ 	<property name="bundleJavacTarget" value="1.2"/>
+-	<property name="bundleBootClasspath" value="osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.1/Foundation-1.1}"/>
 +	<property name="dir_bootclasspath" value="${java.home}/lib"/>
 +	<path id="path_bootclasspath">
 +		<fileset dir="${dir_bootclasspath}">
 +			<include name="*.jar"/>
 +		</fileset>
 +	</path>
-+	<property name="bootclasspath" refid="path_bootclasspath"/>
-+<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-+		<isset property="J2SE-1.4"/>
-+	</condition>
- <condition property="bundleJavacSource" value="1.3"	>
--		<isset property="CDC-1.0/Foundation-1.0"/>
-+		<isset property="J2SE-1.4"/>
-+	</condition>
-+<condition property="bundleJavacTarget" value="1.2"	>
-+		<isset property="J2SE-1.4"/>
- 	</condition>
--<condition property="bundleJavacTarget" value="1.1"	>
--		<isset property="CDC-1.0/Foundation-1.0"/>
-+<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-+		<isset property="J2SE-1.4"/>
- 	</condition>
--<condition property="bundleJavacSource" value="1.5"	>
--		<isset property="J2SE-1.5"/>
-+<condition property="bundleJavacSource" value="1.3"	>
-+		<isset property="J2SE-1.4"/>
-+	</condition>
-+<condition property="bundleJavacTarget" value="1.2"	>
-+		<isset property="J2SE-1.4"/>
- 	</condition>
--<condition property="bundleJavacTarget" value="1.5"	>
--		<isset property="J2SE-1.5"/>
-+<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.1}"	>
-+		<isset property="OSGi/Minimum-1.1"/>
- 	</condition>
- <condition property="bundleJavacSource" value="1.3"	>
- 		<isset property="OSGi/Minimum-1.1"/>
-@@ -37,6 +55,7 @@
- 	</condition>
- 	<property name="bundleJavacSource" value="${javacSource}"/>
- 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-+	<property name="bundleBootClasspath" value="${bootclasspath}"/>
++	<property name="bundleBootClasspath" refid="path_bootclasspath"/>
  
  	<target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
+ 		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>

eclipse-buildswtnatives.patch:

Index: eclipse-buildswtnatives.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-buildswtnatives.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-buildswtnatives.patch	25 Jul 2008 13:21:25 -0000	1.1
+++ eclipse-buildswtnatives.patch	2 Apr 2009 08:12:56 -0000	1.2
@@ -1,7 +1,6 @@
-diff -up ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml
---- ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
-+++ ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml	2008-07-25 09:08:15.000000000 -0400
-@@ -272,6 +272,11 @@
+--- ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.orig	2009-03-24 18:54:29.000000000 +0100
++++ ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml	2009-03-25 10:02:07.000000000 +0100
+@@ -276,6 +276,10 @@
  	</target>
  
  	<target name="build.cfiles" depends="build.jars">
@@ -9,25 +8,24 @@
 +		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
 +		<!--compile swtools.jar in org.eclipse.swt.tools-->
 +		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
-+
  		<!-- generate the C code from the (64 bit) SWT PI java classes -->
  		<!-- assumes the swt.jar has already been built  -->
- 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -293,6 +298,7 @@
- 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library/"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar">
+@@ -325,6 +329,7 @@
+ 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library/" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library" />
 +			<fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
-diff -up ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml
---- ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
-+++ ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml	2008-07-25 09:07:58.000000000 -0400
-@@ -141,6 +141,28 @@
- 		<antcall target="@dot"/>
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library" />
+--- ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.orig	2009-03-24 18:54:28.000000000 +0100
++++ ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml	2009-03-25 10:06:41.000000000 +0100
+@@ -139,6 +139,29 @@
+ 		<jar jarfile="${build.result.folder}/${jar.filename}" basedir="${temp.folder}/@dot.bin" />
+ 		<delete dir="${temp.folder}/@dot.bin" />
  	</target>
- 
++	
 +	<target name="build.cfiles" depends="init">
 +		<mkdir dir="${build.result.folder}/library"/>
 +		<copy todir="${build.result.folder}/library">
@@ -50,20 +48,12 @@
 +			<arg line="install"/>
 +		</exec>
 +	</target>
- 	<target name="src.zip" depends="init" unless="src.zip">
- 		<mkdir dir="${build.result.folder}/"/>
- 		<zip zipfile="${build.result.folder}/src.zip">
-@@ -346,4 +368,4 @@
- 			<mapper type="glob" from="*._properties" to="*.properties"/>
- 		</move>
- 	</target>
--</project>
-\ No newline at end of file
-+</project>
-diff -up ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml
---- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
-+++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml	2008-07-25 09:07:58.000000000 -0400
-@@ -272,6 +272,11 @@
+ 
+ 	<target name="build.jars" depends="init">
+ 		<available property="@dot" file="${build.result.folder}/@dot" />
+--- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.orig	2009-03-24 18:54:29.000000000 +0100
++++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml	2009-03-25 10:08:51.000000000 +0100
+@@ -276,6 +276,11 @@
  	</target>
  
  	<target name="build.cfiles" depends="build.jars">
@@ -74,46 +64,62 @@
 +
  		<!-- generate the C code from the (64 bit) SWT PI java classes -->
  		<!-- assumes the swt.jar has already been built  -->
- 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -294,6 +299,7 @@
- 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
+ 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar">
+@@ -330,6 +335,7 @@
+ 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library" />
 +			<fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
- 			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
-diff -up ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
---- ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
-+++ ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2008-07-25 09:07:58.000000000 -0400
-@@ -271,6 +271,11 @@
+ 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library" />
+ 			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library" />
+--- ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.orig	2009-03-24 18:54:29.000000000 +0100
++++ ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2009-03-25 10:11:05.000000000 +0100
+@@ -175,6 +175,29 @@
+ 		<replace dir="${plugindir}" includes="**/*.java" token="long /*int*/" value="int /*long*/" />
+ 		<antcall target="refresh" />
  	</target>
- 
- 	<target name="build.cfiles" depends="build.jars">
-+		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
-+		<!--compile swtools.jar in org.eclipse.swt.tools-->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++	
++	<target name="build.cfiles" depends="init">
++		<mkdir dir="${build.result.folder}/library"/>
++		<copy todir="${build.result.folder}/library">
++			<fileset dir="${plugindir}/Eclipse SWT/common/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
++			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
++		</copy>
++	</target>
 +
- 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
- 		<!-- assumes the swt.jar has already been built  -->
- 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-diff -up ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml
---- ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt	2008-07-25 09:07:55.000000000 -0400
-+++ ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml	2008-07-25 09:07:58.000000000 -0400
-@@ -149,13 +149,14 @@
- 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
- 			<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
- 			<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
++	<target name="build.nativeLibraries" depends="build.cfiles">
++		<exec dir="${build.result.folder}/library" executable="sh">
++			<env key="OUTPUT_DIR" value="${build.result.folder}"/>
++			<arg line="${build.result.folder}/library/build.sh"/>
++			<arg line="install"/>
++		</exec>
++	</target>
+ 
+ 	<target name="src.zip" depends="init" unless="src.zip">
+ 		<mkdir dir="${build.result.folder}/" />
+--- ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.orig	2009-03-24 18:54:28.000000000 +0100
++++ ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml	2009-03-25 10:13:29.000000000 +0100
+@@ -153,13 +153,14 @@
+ 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library" />
+ 			<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library" />
+ 			<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library" />
 +			<fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
- 			<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
- 			<fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
- 			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
+ 			<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library" />
+ 			<fileset dir="${plugindir}/Eclipse SWT Program/cde/library" />
+ 			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library" />
  		</copy>
  	</target>
  
 -	<target name="build.jnilibs" depends="build.cfiles">
 +	<target name="build.nativeLibraries" depends="build.cfiles">
  		<exec dir="${build.result.folder}/library" executable="sh">
- 			<env key="OUTPUT_DIR" value="${build.result.folder}"/>
- 			<arg line="${build.result.folder}/library/build.sh"/>
+ 			<env key="OUTPUT_DIR" value="${build.result.folder}" />
+ 			<arg line="${build.result.folder}/library/build.sh" />


Index: eclipse-config.ini.director
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-config.ini.director,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-config.ini.director	14 Jul 2008 21:40:30 -0000	1.1
+++ eclipse-config.ini.director	2 Apr 2009 08:12:56 -0000	1.2
@@ -39,19 +39,18 @@
 # Simple bundle locations are interepreted as relative to the framework's parent directory.
 # The startlevel indicates the OSGi start level at which the bundle should run.
 osgi.bundles=\
+	org.eclipse.core.databinding.observable,\
 	org.eclipse.core.jobs,\
-	org.eclipse.core.net,\
 	org.eclipse.core.runtime,\
-	org.eclipse.core.runtime.compatibility.auth,\
 	org.eclipse.ecf,\
 	org.eclipse.ecf.filetransfer,\
+	org.eclipse.ecf.provider.filetransfer.httpclient,\
 	org.eclipse.ecf.identity,\
 	org.eclipse.ecf.provider.filetransfer,\
 	org.eclipse.equinox.app at start,\
 	org.eclipse.equinox.common,\
 	org.eclipse.equinox.frameworkadmin,\
 	org.eclipse.equinox.frameworkadmin.equinox at start,\
-	org.eclipse.equinox.preferences,\
 	org.eclipse.equinox.p2.artifact.repository,\
 	org.eclipse.equinox.p2.console,\
 	org.eclipse.equinox.p2.core,\
@@ -59,19 +58,19 @@
 	org.eclipse.equinox.p2.director.app,\
 	org.eclipse.equinox.p2.engine,\
 	org.eclipse.equinox.p2.exemplarysetup at start,\
-	org.eclipse.equinox.p2.garbagecollector,\
+	org.eclipse.equinox.p2.jarprocessor,\
 	org.eclipse.equinox.p2.metadata,\
 	org.eclipse.equinox.p2.metadata.repository,\
 	org.eclipse.equinox.p2.touchpoint.eclipse,\
 	org.eclipse.equinox.p2.touchpoint.natives,\
-	org.eclipse.equinox.preferences,\
 	org.eclipse.equinox.registry,\
 	org.eclipse.equinox.simpleconfigurator,\
 	org.eclipse.equinox.simpleconfigurator.manipulator at start,\
 	org.eclipse.osgi.services,\
+	org.eclipse.update.configurator,\
 	org.sat4j.core,\
 	org.sat4j.pb
-	
+
 org.eclipse.update.reconcile=false
 
 # The product to run.  A given Eclipse configuration may contain many products.


Index: ecf-filetransfer-feature.xml
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/ecf-filetransfer-feature.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecf-filetransfer-feature.xml	14 Jul 2008 21:40:30 -0000	1.1
+++ ecf-filetransfer-feature.xml	2 Apr 2009 08:12:56 -0000	1.2
@@ -43,6 +43,20 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.ecf.provider.filetransfer.ssl"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	26 Feb 2009 16:25:25 -0000	1.71
+++ sources	2 Apr 2009 08:12:56 -0000	1.72
@@ -2,6 +2,6 @@
 43c2aa722a815c61706549d28786d134  eclipse-ecj-gcj.tar.bz2
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
-bfbbf287cf57108b5eb6974be188c24f  eclipse-sourceBuild-srcIncluded-3.4.2.zip
 3e031f11b0de3f15b00233deec2b19f3  eclipse-3.4.2-testframework.tar.bz2
 c36f10cac0ab63f5da28e07a6b1bae9f  org.fedoraproject.ide.platform-3.4.2.zip
+2d40313df780077e45b0fca5646470be  eclipse-sourceBuild-srcIncluded-I20090401-1325.zip


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- eclipse.spec	30 Mar 2009 21:37:12 -0000	1.625
+++ eclipse.spec	2 Apr 2009 08:12:56 -0000	1.626
@@ -7,10 +7,10 @@
 Epoch:  1
 
 %define eclipse_major   3
-%define eclipse_minor   4
+%define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   2
-%define swtver          3.4.1.v3452b
+%define eclipse_micro   0
+%define swtver          3.5.0.v3538
 %define initialize      1
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -29,11 +29,11 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist}
+Release:        0.1.6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-sourceBuild-srcIncluded-3.4.2.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/I20090401-1325/eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
 Source2:        %{name}.desktop
 #Source3:        eclipse.in
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
@@ -41,7 +41,7 @@
 # cd branding
 # zip -r org.fedoraproject.ide.platform-3.4.2.zip \
 #   org.fedoraproject.ide.platform
-Source4:        org.fedoraproject.ide.platform-%{version}.zip
+Source4:        org.fedoraproject.ide.platform-3.4.2.zip
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
 #   -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
 # cd branding
@@ -84,7 +84,7 @@
 # tar cjf %{name}-%{version}-testframework.tar.bz2 \
 #   %{name}-%{version}-testframework
 # (generated 2008-10-03)
-Source30:       %{name}-%{version}-testframework.tar.bz2
+Source30:       %{name}-3.4.2-testframework.tar.bz2
 
 # Build swttools.jar before generation on 64-bit platforms.
 # Build SWT native libraries
@@ -119,7 +119,7 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
 Patch29:        %{name}-memorypermsizeandjvmcrash.patch
 
-Patch31:	%{name}-ia64-packaging.patch
+Patch31:	%{name}-ia64-qualifierpackaging.patch
 
 # Make ECF bundles have the same qualifier as they do upstream
 Patch35:	%{name}-ecf-qualifier.patch
@@ -152,6 +152,11 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=484453
 Patch45:        %{name}-swt-buildagainstxulrunner.patch
 
+# TODO fix build.xml generation
+Patch46:        %{name}-platform_build.patch
+# TODO fix customBuildCallback
+Patch47:        %{name}-jdt_launch-customBuild.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -168,8 +173,9 @@
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 3.8.1-3
+BuildRequires:  icu4j-eclipse >= 4.0.1
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.26-1.5
+BuildRequires:  tomcat6-servlet-2.5-api
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
@@ -177,7 +183,7 @@
 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-BuildRequires: jsch >= 0:0.1.39
+BuildRequires: jsch >= 0:0.1.41
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: jakarta-commons-el >= 1.0-9
 BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
@@ -219,7 +225,7 @@
 # FIXME:  investigate.  Can we just add a %{arch} to the above?
 ## This file-level requirement is for the bi-arch multilib case
 #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
-Requires:       icu4j-eclipse >= 3.8.1-3
+Requires:       icu4j-eclipse >= 4.0.1
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -239,8 +245,9 @@
 Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.26-1.5
+Requires: tomcat6-servlet-2.5-api > 6.0.18-9.1
 Requires: jetty >= 5.1.14-1.6
-Requires: jsch >= 0.1.39
+Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
 Requires: regexp
@@ -310,12 +317,14 @@
 #sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
 zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
 popd
-
+#-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
+  
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
    -e "/osgi\.org/d" \
-   plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+   -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
+    plugins/org.eclipse.platform.doc.isv/platformOptions.txt
 sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
    -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
    plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \
@@ -323,7 +332,7 @@
 sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
    -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-   plugins/org.eclipse.pde.doc.user/pdeOptions
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
 pushd plugins/org.eclipse.pde.build
 %patch15
@@ -341,8 +350,10 @@
 mv gtk/eclipse.ini{.orig,}
 popd
 
-%patch36
-%patch37
+# TODO check whether it is needed
+#%patch36
+# TODO rebase
+#%patch37
 
 #pushd plugins/org.eclipse.equinox.p2.reconciler.dropins
 #%patch39
@@ -377,17 +388,19 @@
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
 swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-sed --in-place "s/$swt_frag_ver_s390x/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
+sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF \
-                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source/META-INF/MANIFEST.MF \
-                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source/build.xml \
+                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/META-INF/MANIFEST.MF \
+                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/build.xml \
                                                       assemble.org.eclipse.sdk.linux.gtk.s390x.xml \
 						      features/org.eclipse.rcp/build.xml
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
-%patch28
-%patch30
+# TODO check this patch
+#%patch28
+# TODO and this one
+#%patch30
 %patch31 -p1
 %patch38
 
@@ -400,7 +413,7 @@
 %ifnarch %{ix86} x86_64
   cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}}
 %endif
-%ifarch ppc64 sparc64 alpha
+%ifarch ppc64 sparc sparcv9 sparc64 alpha
   for f in $(find -name \*s390x\*); do
     tofile=$(echo $f | sed "s/s390x/%{_arch}/")
     cp -rp $f $tofile
@@ -418,25 +431,6 @@
   done
   IFS=$OLDIFS
 %endif
-#base 32 bit sparc on ppc
-%ifarch sparc sparcv9
-  for f in $(find -name \*ppc\*); do
-    tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-    cp -rp $f $tofile
-    for g in $(find $tofile -type f); do
-        sed -i "s/ppc/%{_arch}/g" $g
-    done
-  done
-  OLDIFS=$IFS
-IFS='
-'
-  for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
-  -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
-  \*.exe -a ! -name \*.pm -a ! -name \*.jpg -a ! -name \*win32\* | grep -v win32); do
-   sed -i -e "s/ppc/%{_arch}/g" $f
-  done
-  IFS=$OLDIFS
-%endif
 
 %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
 IFS='
@@ -471,7 +465,7 @@
 # Don't build for non-linux,gtk,%%{_arch} targets
 pushd features
 for f in */build.xml; do
-    for platform in win32 macosx carbon hpux solaris aix qnx motif; do
+    for platform in win32 macosx carbon cocoa hpux solaris aix qnx motif; do
       sed -i "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
       sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Ivf\-]\+,//g" $f
     done
@@ -496,8 +490,8 @@
 
 # Symlinks
 rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.0.3.v20081021.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.0.3.v20081021.jar
+ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090308.jar
+ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090308.jar
 
 ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -505,7 +499,7 @@
 ln -s %{_javadir}/objectweb-asm/asm-all.jar \
   plugins/org.objectweb.asm_$ASMPLUGINVERSION
 
-## BEGIN ANT ##
+# BEGIN ANT ##
 ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
 rm $ANTDIR/lib/*
 ANTDIR=$ANTDIR/lib
@@ -533,11 +527,12 @@
 ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar
 ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
 #ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
-## END ANT ##
+# END ANT ##
 
-JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
-rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
+#JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
+# TODO fix jetty
+#rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
+#ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
 
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@@ -578,6 +573,20 @@
 rm plugins/org.apache.commons.el_$COMMONSELVERSION
 ln -s %{_javadir}/commons-el.jar \
   plugins/org.apache.commons.el_$COMMONSELVERSION
+  
+# link to commons-codec
+COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
+  sed 's/org.apache.commons.codec_//')
+rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
+ln -s %{_javadir}/commons-codec.jar \
+  plugins/org.apache.commons.codec_$COMMONSCODECVERSION
+  
+# link to commons-logging
+COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
+  sed 's/org.apache.commons.httpclient_//')
+rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
+ln -s %{_javadir}/commons-httpclient.jar \
+  plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
 
 # link to jasper
 JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \
@@ -590,9 +599,9 @@
 SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
   sed 's/javax.servlet_//')
 rm plugins/javax.servlet_*
-ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar \
+ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
   plugins/javax.servlet_$SERVLETAPIVERSION
-
+#
 # link to jsp-api
 JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
   sed 's/javax.servlet.jsp_//')
@@ -602,9 +611,7 @@
 
 # delete included jars
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
-rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
-   plugins/org.eclipse.swt/extra_jars/exceptions.jar \
-   plugins/org.eclipse.swt.tools/swttools.jar \
+rm plugins/org.eclipse.swt/extra_jars/exceptions.jar \
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
    plugins/org.eclipse.osgi/osgi/osgi.core.jar \
    plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
@@ -629,19 +636,22 @@
 tar jxf %{SOURCE20}
 
 # ECF filetransfer plugins
-tar jxf %{SOURCE25}
-pushd org.eclipse.ecf
-%patch35
-mkdir -p features/org.eclipse.ecf.filetransfer-feature
-pushd features/org.eclipse.ecf.filetransfer-feature
-cp -p %{SOURCE26} feature.xml
-cp -p %{SOURCE27} build.properties
-popd
-popd
+# TODO Enable with correct ecf
+#tar jxf %{SOURCE25}
+#pushd org.eclipse.ecf
+#%patch35
+#mkdir -p features/org.eclipse.ecf.filetransfer-feature
+#pushd features/org.eclipse.ecf.filetransfer-feature
+#cp -p %{SOURCE26} feature.xml
+#cp -p %{SOURCE27} build.properties
+#popd
+#popd
 
 # Test framework
 tar jxf %{SOURCE30}
-pushd %{name}-%{version}-testframework
+# TODO regenerate testframework once 3.5 is out
+#pushd %{name}-%{version}-testframework
+pushd %{name}-3.4.2-testframework
 %patch41
 pushd org.eclipse.test
 %patch42
@@ -649,8 +659,16 @@
 sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
 popd
 
+# TODO rediff patch if needed
 %patch43
 %patch44
+%patch46
+%patch47
+
+sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \
+	-e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \
+	plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
+
 
 %build
 ORIGCLASSPATH=$CLASSPATH
@@ -663,6 +681,10 @@
 export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
 ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml
 
+mkdir -p tmp/eclipse/plugins
+cp plugins/org.eclipse.ecf* tmp/eclipse/plugins
+cp plugins/org.apache.commons.codec* tmp/eclipse/plugins
+cp plugins/org.apache.commons.httpclient* tmp/eclipse/plugins
 # Build the rest of Eclipse
 export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
 export JAVA_HOME=%{java_home}
@@ -679,9 +701,12 @@
 homedir=$(cd home && pwd)
 LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
+cp plugins/org.eclipse.ecf* $SDK/plugins
+cp plugins/org.apache.commons.codec* $SDK/plugins
+cp plugins/org.apache.commons.httpclient* $SDK/plugins
 pushd equinox-incubator
 mkdir -p build
-
+ 
 # This can go away when package build handles plugins (not just features)
 echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.equinox.initializer.all.xml
 echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.equinox.initializer.all.xml
@@ -696,7 +721,7 @@
      -DbaseLocation=$SDK \
      -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
      -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
+     
 pushd build/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
      -Duser.home=$homedir                              \
@@ -707,24 +732,25 @@
 popd
 
 # Build the ECF filetransfer plugins
-pushd org.eclipse.ecf
-mkdir -p build
-
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-     -Duser.home=$homedir                              \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.eclipse.ecf.filetransfer_feature                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
-popd
+# TODO reenable with correct ecf
+#pushd org.eclipse.ecf
+#mkdir -p build
+#
+#java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+#     -Duser.home=$homedir                              \
+#      org.eclipse.core.launcher.Main \
+#     -application org.eclipse.ant.core.antRunner       \
+#     -Dtype=feature                                    \
+#     -Did=org.eclipse.ecf.filetransfer_feature                   \
+#     -DsourceDirectory=$(pwd)                          \
+#     -DbaseLocation=$SDK \
+#     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
+#     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
+#
+#popd
 
 # Build the test framework
-pushd %{name}-%{version}-testframework
+pushd %{name}-3.4.2-testframework
 mkdir -p build
 
 # The qualifier is what is in upstream's release:
@@ -740,7 +766,10 @@
      -DforceContextQualifier=v20080507 \
      -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
      -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
+popd
 
+#TODO verify this is the correct place
+pushd %{name}-3.4.2-testframework
 unzip build/rpmBuild/org.eclipse.test.zip
 # These are already in the SDK
 rm eclipse/epl-v10.html eclipse/notice.html
@@ -749,9 +778,9 @@
 zip -r build/rpmBuild/org.eclipse.test.zip eclipse
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 # Get swt version
 SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
@@ -779,16 +808,16 @@
 tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 
 # ECF filetransfer plugins we built
-rm $sdkDir/plugins/org.eclipse.ecf*.jar
-unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
+#rm $sdkDir/plugins/org.eclipse.ecf*.jar
+#unzip -d $RPM_BUILD_ROOT%{_libdir} \
+#  org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
 # Remove the feature we used for building
-rm -rf \
-  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
+#rm -rf \
+#  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 # Test framework
 unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  %{name}-%{version}-testframework/build/rpmBuild/org.eclipse.test.zip
+  %{name}-3.4.2-testframework/build/rpmBuild/org.eclipse.test.zip
 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
@@ -855,9 +884,9 @@
   org.eclipse.jdt.junit4.runtime \
   org.eclipse.jdt.launching \
   org.eclipse.jdt.ui \
+  org.eclipse.jdt.doc.user \
   org.junit \
-  org.junit4 \
-  org.eclipse.jdt.doc.user; do
+  org.junit4 ; do
   mv $sdkDir/plugins/${plugin}_* plugins
 done
 popd
@@ -906,10 +935,12 @@
 # Provision with director
 java \
 -Declipse.p2.data.area=file://$provisionDir/p2 \
+-Declipse.p2.MD5Check=false \
 -cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
 org.eclipse.core.launcher.Main \
 -application \
 org.eclipse.equinox.p2.director.app.application \
+-debug -consolelog \
 -flavor tooling \
 -installIU "Fedora Eclipse Platform" \
 -version %{version} \
@@ -922,7 +953,7 @@
 -metadataRepository file:$metadataDir \
 -artifactRepository file:$metadataDir \
 -destination $provisionDir \
--bundlepool $provisionDir
+-bundlepool $provisionDir 
 
 # Stuff in JDT, PDE, SDK
 for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do
@@ -935,11 +966,13 @@
 mkdir -p $dropins/jdt $dropins/sdk
 mv $jdtDir/features $dropins/jdt
 mv $jdtDir/plugins $dropins/jdt
-mv $jdtMetadata/content.xml $dropins/jdt
+#mv $jdtMetadata/content.xml $dropins/jdt
+#mv $jdtMetadata/artifacts.xml $dropins/jdt
 
 mv $sdkDir/features $dropins/sdk
 mv $sdkDir/plugins $dropins/sdk
-mv $sdkMetadata/content.xml $dropins/sdk
+#mv $sdkMetadata/content.xml $dropins/sdk
+#mv $sdkMetadata/artifacts.xml $dropins/sdk
 rm -rf $metadataDir $jdtDir $sdkDir $installDir
 mv $provisionDir $sdkDir
 
@@ -985,6 +1018,9 @@
 #
 # Extract .so files
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
+
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 pushd $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins  $RPM_BUILD_ROOT/dropins
 mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
@@ -992,7 +1028,7 @@
 java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
      -cp $libdir_path/startup.jar \
      org.eclipse.core.launcher.Main \
-     -consolelog \
+     -debug -consolelog \
      -application org.eclipse.equinox.initializer.configInitializer \
      -fileInitializer %{SOURCE19}
 popd
@@ -1009,7 +1045,7 @@
 # Remove the unnecessary configuration data
 rm -r $sdkDir/configuration/org.eclipse.core.runtime
 rm -r $sdkDir/configuration/org.eclipse.equinox.app
-rm -r $sdkDir/configuration/.settings
+#rm -r $sdkDir/configuration/.settings
 rm -rf $sdkDir/configuration/*.log
 dataDirs=$(find $sdkDir/configuration \
   -type d -name data)
@@ -1049,11 +1085,15 @@
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 
 # Install the Eclipse binary wrapper
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-#install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 #cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse
 #sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse
 #ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//")
@@ -1070,7 +1110,7 @@
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
 
 # Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -1137,8 +1177,8 @@
 
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.0.3.v20081021.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.0.3.v20081021.jar
+ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090308.jar
+ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090308.jar
 
 ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -1176,9 +1216,9 @@
 #ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
 ## END ANT ##
 
-JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
-rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
+#JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
+#rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
+#ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1218,6 +1258,20 @@
 rm plugins/org.apache.commons.el_$COMMONSELVERSION
 ln -s %{_javadir}/commons-el.jar \
   plugins/org.apache.commons.el_$COMMONSELVERSION
+  
+# link to commons-el
+COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
+  sed 's/org.apache.commons.codec_//')
+rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
+ln -s %{_javadir}/commons-codec.jar \
+  plugins/org.apache.commons.codec_$COMMONSCODECVERSION
+  
+# link to commons-el
+COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
+  sed 's/org.apache.commons.httpclient_//')
+rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
+ln -s %{_javadir}/commons-httpclient.jar \
+  plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
 
 # link to jasper
 JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \
@@ -1230,7 +1284,7 @@
 SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
   sed 's/javax.servlet_//')
 rm plugins/javax.servlet_*
-ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar \
+ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
   plugins/javax.servlet_$SERVLETAPIVERSION
 
 # link to jsp-api
@@ -1289,13 +1343,14 @@
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
 %endif
+%config %{_libdir}/%{name}/configuration
 %config %{_libdir}/%{name}/configuration/config.ini
 %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 %dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/epl-v10.html
 %{_libdir}/%{name}/links
-%ifnarch ppc sparc sparcv9
+%ifnarch ppc
 %{_libdir}/%{name}/about.html
 %endif
 %ifarch x86_64
@@ -1304,20 +1359,25 @@
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
+#%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
 %{_libdir}/%{name}/plugins/org.eclipse.help_*
 %{_libdir}/%{name}/plugins/org.eclipse.jface_*
 %{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
@@ -1355,6 +1415,7 @@
 %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.compare_*
+%{_libdir}/%{name}/plugins/org.eclipse.compare.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.boot_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*
@@ -1416,7 +1477,8 @@
 %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.ui_*
-%{_libdir}/%{name}/plugins/org.mortbay.jetty_*
+%{_libdir}/%{name}/plugins/org.mortbay.jetty.util_*
+%{_libdir}/%{name}/plugins/org.mortbay.jetty.server_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.initializer_*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.cvs_*
@@ -1443,9 +1505,13 @@
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository.tools_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.generator_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_*
@@ -1454,11 +1520,15 @@
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.extensionlocation_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director.app_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer_*
+%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*
+%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.ssl_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_*
+%{_libdir}/%{name}/plugins/org.apache.commons.codec_*
+%{_libdir}/%{name}/plugins/org.apache.commons.httpclient_*
 %{_libdir}/%{name}/plugins/org.sat4j.core_*
 %{_libdir}/%{name}/plugins/org.sat4j.pb_*
 # Put this in -platform since we're putting the p2 stuff here
@@ -1470,7 +1540,8 @@
 %files jdt
 %defattr(-,root,root)
 %{_bindir}/efj
-%{_libdir}/%{name}/dropins/jdt/content.xml
+%{_libdir}/%{name}/dropins/jdt
+#%{_libdir}/%{name}/dropins/jdt/content.xml
 %{_libdir}/%{name}/dropins/jdt/features
 %{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
 %{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
@@ -1500,811 +1571,6 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Mon Mar 30 2009 Dennis Gilmore <dennis at ausil.us> 1:3.4.2-6
-- base sparcv9 and sparc on ppc
-
-* Fri Mar 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-5
-- Disable XULRunner-specific patch.
-- Make pdebuild script to not generate p2 repo. 
-
-* Mon Mar 16 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-4
-- Build with XULRunner-specific flags since we're building against XULRunner.
-
-* Mon Mar 9 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-3
-- Remove ecj sub-package as it is replaced by standalone ecj package.
-
-* Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-2
-- Strict R/BR for sat4j >= 2.0.3.
-
-* Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-1
-- Update to 3.4.2.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.4.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.1-15
-- Rebuild for new xulrunner.
-
-* Fri Jan 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.1-14
-- Add R:java-devel for -jdt (rh#480979).
-
-* Mon Jan 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.1-13
-- Fix pdebuild to auto-set javacSouce based on BREE.
-
-* Fri Dec 19 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
-- Fixed GCJ AOT compilation (Gary Benson).
-
-* Mon Dec 15 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-11
-- Update pdebuild and package-build patch to include -z option.
-- Make ecj default to 1.5 (rh#354721).
-- Add GCJ AOT bits for ecj (rh#473674).
-
-* Fri Dec 5 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-10
-- Remove MaxPermSize from sysproperty lists in library.xml as it was causing the
-  JVM to not start.
-
-* Thu Dec 4 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-8
-- Increase MaxPermSize when running tests.
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:3.4.1-8
-- Rebuild for Python 2.6
-
-* Thu Nov 20 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-7
-- Update and re-enable patch for always generating debuginfo for class files
-  when doing an RPM build.
-- Resolves rh#472292.
-
-* Mon Oct 27 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-6
-- Keep Provides: eclipse on -pde (different than Fedora 9 but probably
-  more correct).
-
-* Thu Oct 23 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-5
-- Fix splashscreen (#467259).
-
-* Fri Oct 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-4
-- Fix quoting bug in pdebuild.sh again.
-
-* Fri Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-3
-- Fix swt symlinks in %%libdir/eclipse.
-
-* Thu Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-2
-- Fix quoting bug in pdebuild.sh.
-
-* Wed Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-1
-- Move copy-platform instead of copying it.
-
-* Wed Oct 15 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-1
-- Add conditionals around Equinox initialization to enable debugging.
-
-* Fri Oct 13 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-1
-- Symlink to ant-apache-bsf and ant-commons-net.
-- Update branding.
-- Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008).
-- Update desktop-file-install usage and add --vendor=fedora. (Andrew Overholt)
-- Resolves #466476. Fix pdebuild script. (Jeff Johnston)
-- Remove dropins contents while running initializer.
-- Add patch for wrong javaHome on x86_64 in the native build.(Alexander Kurtakov)
-
-* Thu Oct 03 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-0
-- 3.4.1
-- Update nojarsignatures patch.
-- Added osgi-classpath.patch fixes broken bootclasspath (Sean Flanigan).
-- Removed patches 33 and 34 - not needed anymore.
-
-* Thu Sep 25 2008 Michal Nowak <mnowak at redhat.com> 3.4.0-24
-- exclude parts of eclipse-pydev from JIT compilation
-- Resolves: bug 461860
-
-* Tue Sep 02 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-23
-- Use icu4j in its new place.
-
-* Wed Aug 27 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-22
-- Add test framework
-- Remove two duplicate lines in eclipse-mv-Platform.sh
-- Modify package-build and pdebuild so they can build the SDK tests
-
-* Wed Aug 13 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-21
-- Fix ecj-gcj (rhbz#458921)
-
-* Tue Aug 12 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-20
-- Require release of jetty which requires tomcat bits with proper metadata
-- Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov)
-- Add version to jakarta-commons-el requirement
-
-* Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-19
-- Move jdt and sdk dropins contents to non-eclipse-sub-dir place which
-  makes dropins reconciler see them as dropins and not extension
-  locations
-- Add versions to jetty, lucene, and jsch Requires
-
-* Thu Aug 07 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-18
-- Add %%{_libdir}/eclipse/dropins/jdt to ecj files list
-
-* Wed Aug 06 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-17
-- Add p2 metadata generation to pdebuild
-- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
-  copy-platform
-- Fix brightness in splash screen
-- Fix icon symlinks
-- Bump icu4j-eclipse requirement
-
-* Tue Aug 05 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-16
-- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
-- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
-- Update copy-platform to add %%{_datadir}/dropins
-
-* Mon Aug 04 2008 Sean Flanigan <sflaniga at redhat.com> 3.4.0-15
-- Removed buildroot from path in datadir.link
-
-* Mon Aug 04 2008 Sean Flanigan <sflaniga at redhat.com> 3.4.0-14
-- Created missing directory for link file
-
-* Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-13
-- Update patch to avoid Hotspot crashing
-- Add links folder for noarch plugins
-- Create and add ownership of %%{_datadir}/eclipse/{plugins,features}
-
-* Thu Jul 31 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-12
-- Set product to Fedora Eclipse
-- Remove pde-runtime %%package section
-- Remove unnecessary Requires(post,postun)s
-
-* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-11
-- Update copy-platform to work with dropins
-- Update JVM-crashing patch
-
-* Mon Jul 28 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-10
-- Move JDT and PDE/SDK bits to dropins/{jdt,sdk}
-- Drop versionless PDE Build symlink (put logic into pdebuild script)
-- Make SWT JAR symlinks relative
-- Fold pde-runtime into pde
-- Add patch to add root files for non-upstream arches
-- Fix building of fragments for non-upstream arches
-- Remove about.html from files list on ppc (will fix later)
-
-* Fri Jul 25 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-10
-- Add ability for pdebuild (-o) to work with Orbit-style dependencies
-
-* Fri Jul 25 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-9
-- Collapse patches to build SWT native bits into two
-- Copy about* from x86 to all non-x86{_64} platforms
-
-* Wed Jul 23 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-8
-- Don't build for arch/ws/os combos other than the one on which we're
-  building
-
-* Wed Jul 23 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-7
-- More work on non-upstream arches
-
-* Mon Jul 21 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-6
-- Update description to be a bit more current
-- Attempt ppc64, etc. builds
-
-* Mon Jul 21 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-5
-- Add core.net fragment in %%files for x86
-- I spoke with author about above and no .so is built because it is
-  currently not used by the fragment
-- Update ecj-gcj addition (Tom Tromey)
-
-* Fri Jul 18 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-4
-- Un-do crazy config.ini, bundles.info, etc. shuffling
-- Update patch for building native libraries
-- Re-add missing BR on tomcat5-jasper-eclipse
-- Add patch for 64-bit platforms to build SWT
-- Don't try to resolve http://bundles.osgi.org for javadocs
-- Provision with java -cp instead of binary launcher
-
-* Thu Jul 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-3
-- Generate metadata and provision each sub-package
-- Do crazy config.ini, bundles.info, and *.profile shuffling
-- Add post and postun sections to update the config.ini, bundles.info, and
-  *.profile files
-
-* Wed Jul 16 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-1
-- Fix files lists
-
-* Wed Jul 16 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-1
-- Update branding
-- Fix p2 stuff so p2 UI works
-
-* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-1
-- 3.4
-- Remove gcj compilation
-- Update versions of dependencies
-- Rename libswt3-gtk2 to eclipse-swt
-- Move "Provides: eclipse" to PDE from JDT
-- Remove unnecessary old Obsoletes/Provides
-- Remove tomcat stuff since it's no longer used
-- Move stuff from %%{_datadir}/eclipse to %%{_libdir}/eclipse
-- Add BRs/Rs on objectweb-asm and sat4j
-- Build ECF filetransfer stuff as part of this SRPM until we have a
-  separate eclipse-ecf package (which will require this version of the
-  SDK)
-
-* Sat Jun 14 2008 Dennis Gilmore <dennis at ausil.us> 3.3.2-13
-- make changes to support sparcv9
-
-* Wed May 14 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-12
-- Back-port patch for e.o#206432 (rh#446064).
-
-* Sat Apr 26 2008 Mat Booth <fedora at matbooth.co.uk> 3.3.2-11
-- Fixed some benign errors in copy-platform when calling pdebuild
-  multiple times.
-
-* Fri Apr 25 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-10
-- Bump maximum heap size from 256 MB to 512 MB.
-- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
-  (which is really
-  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100).
-- Some jiggery-pokery for spaces in SWT paths for buildagainstxulrunner
-  patch.
-
-* Wed Apr 09 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-9
-- Fix patch level for xulrunner build patch.
-
-* Wed Apr 09 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-8
-- Rather than removing java-javadoc, just add Requirement in all cases
-  (gcj or not).
-
-* Wed Apr 09 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-7
-- Remove explicit java-javadoc requirements as OpenJDK's -devel package
-  provides it.
-- Patch SWT build to find libxul.pc.
-
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-6
-- Fix path of pdebuild in %%files.  Gah.
-
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-5
-- Move pdebuild to better location (buildscripts).
-
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-4
-- Fix SWT version in Requires.
-
-* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-3
-- Add missing line continuation.
-
-* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-2
-- Change ecj Provides from <= to = (rhbz#439825).
-
-* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-1
-- 3.3.2
-- Update Obsoletes/Provides for ecj and make more ecj symlinks
-  (rhbz#439825).
-
-* Mon Mar 31 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-18
-- Add PDE Build wrapper script (%%{_datadir}/eclipse/pdebuild) for
-  packaging guidelines.
-
-* Mon Mar 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-17
-- Mark eclipse.ini as %%config.
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.3.1.1-16
-- Autorebuild for GCC 4.3
-
-* Fri Feb 08 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-15
-- Add ia64 patches from Doug Chapman.
-- rhbz#431963.
-
-* Wed Dec 05 2007 Martin Stransky <stransky at redhat.com> 3.3.1.1-14
-- rebuilt against XUL Runner (gecko-libs 1.9)
-- removed .png extension from the desktop file
-
-* Tue Dec 04 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-13
-- Remove Fedora log from splash screen.
-
-* Mon Dec 03 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-12
-- Update splash screen.
-
-* Fri Nov 30 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-11
-- Fix PermSize option (thanks to Mary Ellen Foster for testing).
-
-* Fri Nov 23 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-10
-- Move eclipse.ini for real.
-
-* Fri Nov 23 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-9
-- Move eclipse.ini in %%files section.
-
-* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-8
-- Re-enable gcj_support.
-
-* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-7
-- Un-break non-ppc64 platforms.
-
-* Mon Nov 19 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-6
-- Require jpackage-utils (courtesy Patrice Dumas).
-- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
-- Move eclipse.ini to %%{_libdir}/eclipse where it gets read.
-- Resolves:  rhbz#394161.
-
-* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-5
-- Remove extraneous build.index comment (from test build again).
-
-* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-4
-- Enable gcj support (disabled for test build).
-
-* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-3
-- Update tomcat patches.
-- Resolves:  rhbz#380121.
-
-* Wed Nov 14 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-2
-- Bump release to tag non-corrupted source zip.
-
-* Thu Nov 01 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-1
-- Update branding.
-- Work around e.o#195897 by setting the VM arg explicitly.
-
-* Fri Oct 26 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-1
-- 3.3.1.1
-- Add patch for memory issues with IcedTea.
-
-* Mon Oct 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1-1
-- 3.3.1
-- Update icu4j requirement for new version number.
-
-* Thu Oct 11 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-27
-- Add patch to have unversioned swt.jar symlink (courtesy Patrice
-  Dumas).
-
-* Sat Oct 06 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-26
-- Add encoding to desktop file.
-- Fix %%files list again.
-
-* Fri Oct 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-25
-- Fix %%files list for Fedora Eclipse feature.
-
-* Fri Oct 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-24
-- Update branding plugin.
-- Add branding feature.  This fixes the update manager issue when using
-  the Fedora-branded product.
-- Thanks to Alexander Kurtakov and Pascal Rapicault for helping track
-  down this issue.
-
-* Wed Oct 03 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-23
-- Build gcj bits on x86 and x86_64.
-- Add instructions for how to get source of branding plugin.
-- Fix splash screen typo.
-- Resolves:  rhbz#301871.
-
-* Wed Sep 26 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-21
-- Add patch to generate 1.6 bytecode on a 1.7 VM (kudos to Olivier
-  Thomann)
-- Resolves:  rhbz#288991.
-
-* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-20
-- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.
-
-* Mon Sep 10 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-19
-- Don't require subclipse, cdt, or rpm-editor on ppc64.
-
-* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-18
-- Build 1.6 plugins when building with IcedTea.
-
-* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-17
-- Update Fedora Eclipse product plugin to fix Welcome page.
-
-* Thu Sep 06 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-16
-- Compile SDK to 1.5 bytecode and disable 1.6 plugins.
-
-* Wed Sep 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-15
-- Update tomcat5, commons-el, and commons-logging to required releases
-  with proper OSGi manifests.
-
-* Mon Sep 04 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-14
-- Add Fedora Eclipse product plugin.
-- Add Requires: eclipse-rpm-editor to platform subpackage.
-
-* Thu Aug 30 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-13
-- Move *-sdk subpackages to pde subpackage.
-- Add BuildRequires: libXt-devel for IcedTea build.
-- Add launcher-fix-java-home.patch.
-
-* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-12
-- Require mylyn on all archs except ppc64 alpha.
-- Use IcedTea on x86_64 and x86.
-- Remove hacks for s390{,x} as they are now included in upstream build.
-
-* Tue Aug 28 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-11
-- Symlink to jetty.
-
-* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-10
-- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn,
-  eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac
-  and eclipse-changelog to platform package.
-- Add requires eclipse-mylyn-java to jdt.
-- Add requires eclipse-mylyn-pde to pde.
-- Remove pde-sdk and sdk sub-packages
-
-* Thu Aug 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-9
-- Add Requires: eclipse-cvs-client to jdt package.
-
-* Tue Aug 14 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-8
-- Link to junit4 jar.
-- Remove included eclipse binaries.
-- Add Provides: eclipse to sdk subpackage.
-
-* Mon Aug 13 2007 Oliver Falk <oliver at linux-kernel.at> 3.3.0-7
-- Also explode SDK tarball on alpha
-- Resolves: #251958
-
-* Tue Aug 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-6
-- Add links for jsp api, servlet api and jasper.
-- Add %%{_libdir}/%%{name}/features to the rcp %%files listing.
-
-* Fri Aug 03 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-5
-- Add patch to fix double free bug in launcher library.
-- Resolves: #248798.
-
-* Tue Jul 31 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-4
-- Link to commons-el.jar.
-- Remove ant 1.7 hacks.
-
-* Wed Jul 18 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-3
-- Add links for lucene and lucene.analysis.
-- Remove icu4j symlink from /usr/share/eclipse/plugins.
-- Resolves: #248749.
-
-* Mon Jul 16 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-2
-- Fix dep in rcp sub-package.
-- Add Alpha support.
-- Link to commons-logging.jar
-- Resolves: #248359.
-
-* Fri Jun 29 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-1
-- 3.3.
-
-* Wed Jun 27 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.3.RC4
-- Restore ppc64, s390{,x} and sparc{,64} support.
-- Restore multilib support.
-
-* Tue Jun 19 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC4
-- Use icu4j-eclipse sub-package instead of building icu4j here.
-- Use exec in binary wrapper.
-- Add 3.3.0 splashscreen.
-
-* Tue Jun 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC4
-- 3.3RC4.
-
-* Mon Jun 11 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC3
-- Update launching strategy for 3.3.
-- Pull in package-build fix from F-7.
-
-* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC3
-- 3.3RC3.
-
-* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC2
-- 3.3RC2.
-
-* Wed May 23 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC1
-- 3.3RC1.
-- Pull in changes from F-7.
-
-* Mon Feb 26 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.M5eh
-- 3.3M5.
-- Remove launcher-addplatformtotildeeclipse.patch as it's only needed
-  for FC-5 -> FC-6.
-- Remove swt firefox patches as they are no longer needed.
-- Remove ppc64, s390{,x} and sparc{,64} support.
-- Remove use-built-launcher patch.
-- Update set-launcher-and-configuration-dir patch.
-
-* Mon Jan 29 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.3.M4
-- Enable updated ecj square brackets patch.
-
-* Fri Jan 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.M4
-- Pull in fixes from rawhide.
-
-* Wed Dec 20 2006 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.M4
-- 3.3M4.
-- Update patches for 3.3M4.
-- Remove SWT JNI symlinks in %%{_libdir}.
-
-* Wed Dec 6 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-25
-- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2.
-- Resolves: #211008.
-
-* Tue Dec 5 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-24
-- Specfile review with Ben Konrath.
-- Lots of cleanups.
-
-* Tue Nov 28 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-23
-- Move back to ~/.eclipse for update site pending upstream comments.
-- Add patch to add platform to ~/.eclipse's platform.xml.  This maintains
-  user-installed plugins but allows us to remove the pre-configured
-  platform.xml in the OSGi configuration area.
-
-* Mon Nov 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-22
-- Use ~/.eclipseplugins instead of ~/.eclipse in update site - homedir patch.
-- Bump release.
-
-* Fri Nov 17 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-21
-- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853).
-- Resolves: #209393.
-
-* Fri Nov 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-20
-- Revise gre64 patch to just do ppc64 addition and not ordering change.
-
-* Thu Nov 16 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-19
-- Add patch to look at gre64.conf on ppc64.
-
-* Fri Nov 10 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-18
-- Remove SWT ON_TOP patch as it is fixed in 3.2.1.
-
-* Thu Nov 09 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-17
-- Add file level requirement for swt fragment to rcp and platform packages.
-  This is needed so that the rcp and platform packages pull in the swt package
-  of the correct word size.
-
-* Mon Nov 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-16
-- Move copy-platform back to %%{_datadir}/eclipse.
-- Require gjdoc >= 0.7.7-14 as it generates consistent html across archs.
-- Move most of the doc plugins back to %%{_datatdir}/eclipse now that gjdoc
-  is fixed.
-
-* Fri Nov 03 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-15
-- Make sdk require config.ini itself rather than the package to deal with the
-  bi-arch installation situation.
-- Move sdk feature and plugin to %%{_libdir} so we can check for its existence
-  in the post scripts.
-
-* Thu Nov 02 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-14
-- Remove post sections that munge eclipse.product; always set it to
-  org.eclipse.platform.ide or org.eclipse.sdk.ide.
-- Remove changelogs prior to 3.2.0.
-
-* Thu Nov 02 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-12
-- Move doc plugins to %%{_libdir}/eclipse/plugins because of html is being
-  generated differently on different arches.
-- Fix multilib problem when there are two or more jars within a jar.
-- BR dos2unix always (for mac2unix).
-
-* Wed Nov 01 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-11
-- Move copy-platform to %%{_libdir}/eclipse
-- Move the platform.source, icu4j, icu4j.source, help.webapp and
-  update.core.linux plugins to %%{_libdir}/eclipse/plugins because these plugins
-  have platform specific content. Some of the platform specific content may be
-  a result of bugs in libgcj. These need to be investigated.
-- Disable building the help indexes on all archs so that we have the same doc
-  plugins on all archs.
-- Remove org.apache.ant_1.6.5/bin/runant.py to avoid multilib conflicts.
-- Repack all the jars and the jars within those jars. This is needed
-  to make this package multilib compatible.
-- Put SWT symlinks in %%{_libdir}/eclipse instead of
-  %%{_libdir}/eclipse/plugins.
-
-* Wed Nov 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-11
-- Use equinox initializer instead of old patch to core.runtime.
-- Run initializer *after* splitting install into arch-specific and
-  arch-independent locations.
-- Move copy-platform to arch-specific location.
-- Get rid of broken symlinks in tomcat plugin.
-
-* Tue Oct 31 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-11
-- Fix copy-platform to work with split install.
-
-* Tue Oct 31 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-10
-- Add 3.2.1 splash screen.
-- Sort the java source files before building (#209249).
-- Remove Fedora ifdefs.
-- Resolves: #209249.
-
-* Tue Oct 31 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-9
-- Re-enable building of the icu4j plugins.
-
-* Mon Oct 30 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-8
-- Temporarily disable building of icu4j plugin.
-
-* Mon Oct 30 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-8
-- Fix eclipse-ecj symlink to point to correct location.
-- Put SWT symlinks in %%{_libdir} instead of %%{_datadir} as they're
-  target-dependent.
-
-* Sat Oct 28 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-7
-- Add patch for ecj [] classpath problem.
-- Remove configuration files from rcp files list.
-- Add patch set bindir and shared config patch to allow the eclipse binary
-  to sit in %%{_bindir} and remove the symlinks. This patch also allows us to
-  set osgi.sharedConfiguration.area config on a per build basis so that the
-  configuration directory can be arch dependant.
-- Remove launcher link patch as the bindir patch removes the requirement for
-  this patch.
-- Don't aot-compile org.eclipse.ui.ide to work around rh bug # 175547.
-- Add Requies(post,postun) to all packages to ensure that no files are left
-  behind when eclipse is un-installed.
-- Many spec file clean ups.
-- Resolves: #199961, #202585, #210764, #207016.
-- Related: #175547.
-
-* Mon Oct 16 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-6
-- Remove unneeded tomcat symlinks.
-
-* Mon Oct 16 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-6
-- Remove unnecessary bits of configuration.
-- Resolves: #210764, #202585.
-
-* Tue Oct 10 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-5
-- Remove perl dependancy.
-- Fix offsets in libswt-enableallandO2 patch.
-- Add Requires(post,postun) java-gcj-compat to sdk to avoid errors when
-  uninstalling the java stack.
-- Move jface and jface.databinding from libswt3-gtk2 to rcp because these
-  plugins have dependancies on some plugins in rcp.
-
-* Sun Oct 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-4
-- Fix triggerpostun to include epoch of previous releases.
-
-* Fri Sep 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-3
-- Add Requires(post,postun) to platform and sdk sub-packages so that post and
-  postun scripts work correctly.
-
-* Fri Sep 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-3
-- Add triggerpostun to deal with old rebuild-sdk-features postun crap
-  (rh#207442, rh#207013).
-
-* Fri Sep 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
-- Fix swt-firefox patch to not create DSOs with undefined symbols (rh#201778).
-
-* Thu Sep 28 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-1
-- 3.2.1 final.
-
-* Thu Sep 28 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
-- Use new swt-firefox patch and consolidate others into one.
-
-* Wed Sep 27 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.3
-- Fix typo in %%postun of -sdk and -platform.
-- Disable help index generation on ia64.
-
-* Tue Sep 26 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.2
-- Don't set eclipse.product incorrectly in %%postun of -sdk and -platform.
-
-* Mon Sep 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.1
-- M20060921-0945 (3.2.1 pre-release).
-- Upadate patches to 3.2.1.
-- Add icu4j 3.4.5 sources.
-- Add Fedora version to platform about.mappings as well as sdk.
-
-* Mon Sep 25 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-8
-- Remove unused eclipse.conf.
-- Remove unused gre64.conf patch (applied upstream).
-
-* Thu Sep 21 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-7
-- Use real SWT version on ia64, ppc64, s390 and s390x.
-- Remove the swt native libs from the rcp sub-package because they are
-  already in the libswt-gtk2 sub-package and rcp requires libswt-gtk2.
-- Set correct eclipse.product in post and postun of sdk and platform
-  sub-packages (rh bug # 207442)
-- Don't set the .eclipseproduct twice.
-- Add Conflicts: mozilla to libswt3-gtk2 (rh bug # 207626).
-- Move Requires: firefox to libswt3-gtk2.
-
-* Thu Sep 21 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-7
-- Add workaround for gjdoc Mac-encoded bug (gcc#29167) to make javadocs build.
-- Fix tomcat symlinking in %%install to make help work (rh#199453).
-
-* Mon Sep 11 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-6
-- Update swt-firefox patch and remove libswt-xpcom patch (rh bug # 200929).
-- Re-work files list to match upstream and remove rebuild-sdk-features
-  (rh bug # 205933).
-
-* Thu Sep 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-5
-- Add swt-firefox patch; moves SWT to NS_InitXPCOM3() from NS_InitEmbedding().
-- Add sparc support (Dennis Gilmore <dennis at ausil.us>).
-- Disable help index generation on s390.
-
-* Wed Sep 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-4
-- Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because
-  it has not been applied upstream.
-- Minor spec file clean ups.
-- Add %%{name} to the -devel package Provides so that upgrading from
-  FC-5 to FC-6 works.
-- Re-enable natively compiling the ant.ui plugin.
-- Re-enable natively compiling the team.cvs.core plugin on ia64.
-
-* Fri Sep 01 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-3
-- Use the system tomcat on ppc64 and s390x.
-
-* Wed Aug 30 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-3
-- Don't use pkg_summary.
-
-* Tue Aug 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-2
-- Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.
-- Require java-gcj-compat >= 1.0.64.
-
-* Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
-- Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).
-
-* Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_11fc
-- Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
-  jars that don't exist.
-- Fix rebuild-sdk-features to work with 3.2.x feature versions.
-
-* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_10fc
-- Use firefox-devel instead of mozilla-devel.
-- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).
-
-* Tue Jul 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_9fc
-- Use sed instead of patches for tomcat version numbers.
-
-* Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_8fc
-- Disable build.index doc generation on i386.
-
-* Sun Jul 23 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_7fc
-- Remove org.eclipse.ant.ui* from %%files.
-
-* Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_7fc
-- Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar from aot-compile-rpm.
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1jpp_6fc
-- Rebuilt
-
-* Thu Jul 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_5fc
-- New splash screen from Diana Fong (rh#199456).
-
-* Tue Jul 18 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_4fc
-- Add patch from Tom Tromey for ecj-gcj branch of gcj.
-- Fix SWT symlinks.
-
-* Tue Jul 18 2006 Igor Foox <ifoox at redhat.com> 3.2.0-1jpp_3fc
-- Rebuild.
-
-* Mon Jul 17 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_2fc
-- Rebuild.
-
-* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
-- Temporarily add webapp patch for ppc64 and s390x.
-- Bump tomcat5 to 5.5.17 both in BR/R and in patches.
-
-* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
-- Don't require tomcat on ppc64, s390, or s390x until we've got it there.
-- org.eclipse.tomcat -> org.eclipse.tomcat/lib.
-- Update webapp build patch.
-- Use commons-* instead of jakarta-commons-*.
-- Don't delete jars in %%install.
-- Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now).
-- Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64.
-- Use tomcat plugin version instead of org.eclipse.tomcat_*.
-
-* Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
-- Fix tomcat symlinks.
-
-* Tue Jul 04 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
-- 3.2.0.
-- Remove Provides:  eclipse-sdk from eclipse-platform.
-- Use build-jar-repository where appropriate.
-
-* Tue Jun 13 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.7
-- Rename -devel packages to -sdk to match upstream names.
-- Add Provides eclipse-sdk to platform-sdk.
-- Remove zip re-pack code.
-
-* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.6
-- Bump release again.
-
-* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.5
-- Bump release.
-
-* Mon Jun 12 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.4
-- Require java-gcj-compat 1.0.52.
-- Don't use '*' to set the quatifier name in the eclipse-ecj symlink.
-- Really fix swt symlinks rh #194500.
-
-* Wed Jun 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.3
-- Enable ppc64, s390 and s390x.
-- Add check for jars at the end of prep.
-- Fix patch for rh #162177 (square brackets patch).
-- Fix swt symlinks rh #194500.
-- Add versionless pde.build symlink.
-- Rename efj-wrapper.sh to efj.sh.in.
-- Re-pack all zips after the build to ensure that zips have the same md5sum
-  across arch re-builds. This is needed to avoid multilib conflicts.
-
-* Wed Jun 07 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.2
-- Fix eclipse-ecj.jar symlink to include qualifier.
-
-* Tue Jun 06 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.1
-- 3.2RC7.
-- Remove com.jcraft.jsch_0.1.28.jar and repackage with classes from the system
-  jsch.jar.
-- Work around ia64 compile problem in aot-compile-rpm.
+* Thu Apr 2 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.6
+- First try for 3.5 build.
 
-* Wed May 31 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC6
-- 3.2RC6.

eclipse-nojarsignatures.patch:

Index: eclipse-nojarsignatures.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-nojarsignatures.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-nojarsignatures.patch	3 Oct 2008 14:03:03 -0000	1.2
+++ eclipse-nojarsignatures.patch	2 Apr 2009 08:12:57 -0000	1.3
@@ -1,202 +1,203 @@
---- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignature	2008-09-11 23:28:30.000000000 +0200
-+++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF	2008-10-03 11:43:35.000000000 +0200
+--- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.orig	2009-02-02 22:45:45.000000000 +0100
++++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF	2009-02-19 17:09:24.000000000 +0100
 @@ -12,18 +12,3 @@
-  unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni
-  t.textui;version="3.8.2"
- 
--Name: junit.jar
--SHA1-Digest: s29rIXKth1H1+Yz24tK0E9r/sxA=
--
--Name: plugin.properties
--SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A=
--
--Name: about.html
--SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA=
--
--Name: META-INF/eclipse.inf
--SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
--
--Name: about_files/cpl-v10.html
--SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM=
--
---- plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignature	2008-09-11 23:27:41.000000000 +0200
-+++ plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF	2008-10-03 11:42:12.000000000 +0200
-@@ -57,178 +57,3 @@
-  .ant.util.optional,org.apache.tools.ant.util.regexp,org.apache.tools.
-  bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
- Require-Bundle: org.eclipse.osgi
--
--Name: lib/ant-apache-bsf.jar
--SHA1-Digest: DO50ciZuJhJDpVNImRUfEaBYUbI=
--
--Name: lib/ant-trax.jar
--SHA1-Digest: FBI4uldnKZSyHcob4yOVNc3Hp38=
--
--Name: etc/maudit-frames.xsl
--SHA1-Digest: BIZGVBGe+t+oL7NBTtnF6SSR2UI=
--
--Name: bin/lcp.bat
--SHA1-Digest: tVZ9b7fPb0VxK6VtxdbHL/Snslc=
--
--Name: bin/runrc.cmd
--SHA1-Digest: tEBZS6nXZrF77Q5oOO0NyffnU28=
--
--Name: etc/jdepend.xsl
--SHA1-Digest: OMznHreSkSUr+5YOtNAlZZLjZWQ=
--
--Name: bin/antenv.cmd
--SHA1-Digest: 2NIxw+ojKZeK7CNeLtrR7kFNG2E=
--
--Name: about_files/LICENSE.sax.txt
--SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek=
--
--Name: META-INF/eclipse.inf
--SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
--
--Name: lib/ant-launcher.jar
--SHA1-Digest: MKPgfhiWsE5F2R982ZCuSOWMXDg=
--
--Name: lib/ant-apache-bcel.jar
--SHA1-Digest: kde0uYC3k2o+Fg+6LlcBEv6kWRk=
--
--Name: lib/ant-antlr.jar
--SHA1-Digest: J4AmyjIaAnoB7ebJ4iMzOb9+GtU=
--
--Name: etc/changelog.xsl
--SHA1-Digest: qhlQEgDDZI8YGnD/Lo/OLLdpwE4=
--
--Name: etc/jdepend-frames.xsl
--SHA1-Digest: ziSyDJrI6CYzulVP7xbFuMAk62w=
--
--Name: lib/ant-starteam.jar
--SHA1-Digest: nXOBvJIHC5BOM3rQ0HeyF7q1z1A=
--
--Name: about.html
--SHA1-Digest: N0elfKP7uYuYLATOh5XaE1P3nXI=
--
--Name: lib/ant-jai.jar
--SHA1-Digest: tIm5HD9PM1IT/EnYwT4D49j0kAo=
--
--Name: lib/ant-junit.jar
--SHA1-Digest: dr31YBzQyziIxwLsNjAoVUBhXkw=
--
--Name: lib/ant-swing.jar
--SHA1-Digest: CYx1MeeUeffKmXW3cKIyesK/1+M=
--
--Name: lib/ant-apache-log4j.jar
--SHA1-Digest: kDAL5HSGcBGx8BtqP8my+7nVxUA=
--
--Name: bin/ant
--SHA1-Digest: 1hZ7I8ryxuQA8ffu95k409JSpxM=
--
--Name: bin/ant.cmd
--SHA1-Digest: YDWS/zHHaPn0kEZm/Az4+vJLzKI=
--
--Name: lib/ant-commons-net.jar
--SHA1-Digest: zttoDSdHmKhPxQkVB2939l5dEOE=
--
--Name: lib/ant-jsch.jar
--SHA1-Digest: 8TOFHxGi9/aJnOr5NWlYDPLTaG0=
--
--Name: lib/ant-netrexx.jar
--SHA1-Digest: SKI088GAW5X32myAJt2zYJtG4qw=
--
--Name: etc/checkstyle/checkstyle-text.xsl
--SHA1-Digest: v7HDzjT8VIMoo9nbczMpQ4R89OA=
--
--Name: lib/ant-jdepend.jar
--SHA1-Digest: v2pU8yfpZ4jDxE2GwwCqptNqf6k=
--
--Name: lib/ant-stylebook.jar
--SHA1-Digest: lGD3Z67EkUsBV0HeiuLxoT73kJM=
--
--Name: about_files/NOTICE
--SHA1-Digest: Mu3gQHJl963VZJ+BCE906ZAhmXY=
--
--Name: etc/coverage-frames.xsl
--SHA1-Digest: CuWmV380G7/H3FRwPp+feAg9d7E=
--
--Name: lib/ant-nodeps.jar
--SHA1-Digest: t0PNaVw0F4+n1li/saOcEsZPZwo=
--
--Name: bin/complete-ant-cmd.pl
--SHA1-Digest: u8SyqqLh5SyqEPe8brM/glCglQo=
--
--Name: about_files/LICENSE.dom.html
--SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk=
--
--Name: etc/tagdiff.xsl
--SHA1-Digest: QvXTkg9jgfgCMbm/Idqk/uNf4dI=
--
--Name: etc/junit-frames.xsl
--SHA1-Digest: wSBQFHcXT1XjHPWfk41j8XH1qeQ=
--
--Name: lib/ant-weblogic.jar
--SHA1-Digest: ZeOoCvq1VpITkhgFC+p7NfSUgjk=
--
--Name: lib/ant-jmf.jar
--SHA1-Digest: L//Sz/mvat6UlYte0H9s1LuNSc8=
--
--Name: bin/ant.bat
--SHA1-Digest: p0LkZEyD/pMRF8Uo9Hxte58B9dI=
--
--Name: plugin.properties
--SHA1-Digest: iQO3hlGZf45g3Y7ajtCmCUjMq30=
--
--Name: etc/checkstyle/checkstyle-xdoc.xsl
--SHA1-Digest: Zkz4ykfgxadN8RCiCtVrI46bzu4=
--
--Name: lib/ant.jar
--SHA1-Digest: AB5l/BKpcx67Btb0DxbAIgIbNvw=
--
--Name: lib/ant-javamail.jar
--SHA1-Digest: kVOXUSeWHwNdsV7Y+pfipS3wCJY=
--
--Name: lib/ant-apache-resolver.jar
--SHA1-Digest: mNy/MGrXL8Ql+5ZoYGvu/qlG+1A=
--
--Name: bin/antRun
--SHA1-Digest: HXlDrtLiLYQs4XkPbksH6PzmiQ4=
--
--Name: bin/envset.cmd
--SHA1-Digest: nJW9gBVUQczlMJmAog4nH2yNp98=
--
--Name: bin/antRun.pl
--SHA1-Digest: 1ZjEo56V249cfnPSBpzjYNRTLys=
--
--Name: etc/mmetrics-frames.xsl
--SHA1-Digest: +ueQIFM6aBe6Ifc8PrZ7F4Migyk=
--
--Name: etc/checkstyle/checkstyle-frames.xsl
--SHA1-Digest: aeITXtUk9Yia5TTVXOd6qfMmPTM=
--
--Name: lib/ant-apache-oro.jar
--SHA1-Digest: 7lwzOPLMkxFX2C5YX/dkcYQdjng=
--
--Name: bin/antRun.bat
--SHA1-Digest: d765puLLhb82dE5NC5YNCn6DpeA=
--
--Name: etc/junit-noframes.xsl
--SHA1-Digest: 8O4YCYnt5a6gbrMsIigvW/4GV4g=
--
--Name: bin/runant.pl
--SHA1-Digest: RPsWXDGHzbNBGD/i6pTGtQFJ6oY=
--
--Name: about_files/asl-v20.txt
--SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
--
--Name: etc/junit-frames-xalan1.xsl
--SHA1-Digest: blbb8jE6V2zTzRGjvVaXL5fPicM=
--
--Name: etc/log.xsl
--SHA1-Digest: ulVeGl+WSkbjGbHF7LGA8Csuh/0=
--
--Name: lib/ant-commons-logging.jar
--SHA1-Digest: NWd0KBqXRSZbCMSItqs0tWQoi2E=
--
--Name: lib/ant-apache-regexp.jar
--SHA1-Digest: xvqWfUXGkISU+7vSQaFsJe8s12k=
--
--Name: bin/runant.py
--SHA1-Digest: ptbC0mx7ZARrg/FG64aqqikvS2A=
--
+  unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni
+  t.textui;version="3.8.2"
+ 
+-Name: junit.jar
+-SHA1-Digest: c3q6P9LmZ5Def1MlP4MpqblgEgg=
+-
+-Name: plugin.properties
+-SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A=
+-
+-Name: about.html
+-SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA=
+-
+-Name: META-INF/eclipse.inf
+-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
+-
+-Name: about_files/cpl-v10.html
+-SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM=
+-
+
+
+--- plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF.orig	2009-02-02 22:45:40.000000000 +0100
++++ plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF	2009-02-19 17:08:54.000000000 +0100
+@@ -58,177 +58,3 @@
+  bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
+ Require-Bundle: org.eclipse.osgi
+ 
+-Name: lib/ant-apache-bsf.jar
+-SHA1-Digest: M2d6lresQp0xa4ei3/6UT0IvvOo=
+-
+-Name: lib/ant-trax.jar
+-SHA1-Digest: h2GIw5t/8Awgscfr4Kp8ijnUnio=
+-
+-Name: etc/maudit-frames.xsl
+-SHA1-Digest: 1oML7OYqWjV+hPKu/ItdzrAFGcA=
+-
+-Name: bin/lcp.bat
+-SHA1-Digest: eX7ICcBsanATsaEDkn5+oTA4QaQ=
+-
+-Name: bin/runrc.cmd
+-SHA1-Digest: eNo+cuYQicndcc56FVkRScD5w30=
+-
+-Name: etc/jdepend.xsl
+-SHA1-Digest: 0rf14aLzhLsun24uUsXVVvkHM6I=
+-
+-Name: bin/antenv.cmd
+-SHA1-Digest: s2zvcJEs2E2x6ckfXZoGxx1OF1Y=
+-
+-Name: about_files/LICENSE.sax.txt
+-SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek=
+-
+-Name: META-INF/eclipse.inf
+-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
+-
+-Name: lib/ant-launcher.jar
+-SHA1-Digest: j5MKo11ChREVqI8KAf2yOdoUwUw=
+-
+-Name: lib/ant-apache-bcel.jar
+-SHA1-Digest: UG6yMPpDDbFxF0IZBgyYlF5b8Bo=
+-
+-Name: lib/ant-antlr.jar
+-SHA1-Digest: 96qgI+qE4mkMTOueBU6BnOGr3F4=
+-
+-Name: etc/changelog.xsl
+-SHA1-Digest: 2EZZ+jSTt1TTlBYPN4vGUAX7cTQ=
+-
+-Name: etc/jdepend-frames.xsl
+-SHA1-Digest: U2Bb6aMxgbEYqXkCm2sujeLP7Zo=
+-
+-Name: lib/ant-starteam.jar
+-SHA1-Digest: RJsY/xmhxl6ubDDU6QoA/vM1yA4=
+-
+-Name: about.html
+-SHA1-Digest: cPPs9diR9VPNDzWrCs1FLNOdJEo=
+-
+-Name: lib/ant-jai.jar
+-SHA1-Digest: n8D/dzR//eyQWMESchVqF5rRTUA=
+-
+-Name: lib/ant-junit.jar
+-SHA1-Digest: I580f1s/QFktmmHjSojgmt81LQc=
+-
+-Name: lib/ant-swing.jar
+-SHA1-Digest: WJU3ePHwpg4Pdodu5cKbgSJh6pA=
+-
+-Name: lib/ant-apache-log4j.jar
+-SHA1-Digest: 5YHgX/HtmvKU4bSP1VAwh20/Au8=
+-
+-Name: bin/ant
+-SHA1-Digest: jK7w10Hy+BIiSimUAhjgizdaBuY=
+-
+-Name: bin/ant.cmd
+-SHA1-Digest: 4jPJI7nJO+v3oPpbi5GbrT7x9qk=
+-
+-Name: lib/ant-commons-net.jar
+-SHA1-Digest: TDn0QivPCf35qccRtl8z87UP4Yg=
+-
+-Name: lib/ant-jsch.jar
+-SHA1-Digest: NIFaHRPHD9wFblAPcnd9jbU4mHM=
+-
+-Name: lib/ant-netrexx.jar
+-SHA1-Digest: IAealF7ASH6uMNCx+e1xKARXN+4=
+-
+-Name: etc/checkstyle/checkstyle-text.xsl
+-SHA1-Digest: CqSzAXEeeV20DtFpeujwjL9FEW8=
+-
+-Name: lib/ant-jdepend.jar
+-SHA1-Digest: RaJxbDfsfacKS0SdZq7rxR2dfp4=
+-
+-Name: lib/ant-stylebook.jar
+-SHA1-Digest: 4h44nYKPpjWBoZNHPFUY6z0g0UA=
+-
+-Name: about_files/NOTICE
+-SHA1-Digest: v3XrGNGv2sQGqBe+ObJZnq9915g=
+-
+-Name: etc/coverage-frames.xsl
+-SHA1-Digest: 5SE/NhPWEbqzGDGL58dwEbkhwRs=
+-
+-Name: lib/ant-nodeps.jar
+-SHA1-Digest: Tug9J6tn3AF4hSbXRKez+oq/HV4=
+-
+-Name: bin/complete-ant-cmd.pl
+-SHA1-Digest: F1mrSua1xk98goAA1YvtOoJNiuw=
+-
+-Name: about_files/LICENSE.dom.html
+-SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk=
+-
+-Name: etc/tagdiff.xsl
+-SHA1-Digest: ddaegkBkww5CoIlRpSR8RDUI1bQ=
+-
+-Name: etc/junit-frames.xsl
+-SHA1-Digest: XIcHcYoM8I5hzTkhdiy5iskupIM=
+-
+-Name: lib/ant-weblogic.jar
+-SHA1-Digest: an89ZCKDUQcczNIGX24YKHlDw14=
+-
+-Name: lib/ant-jmf.jar
+-SHA1-Digest: 49xPxSZkHqTnpc7ObkxCx1FbGRg=
+-
+-Name: bin/ant.bat
+-SHA1-Digest: Rc2etgn1RATkrEL3NCa3Fs75Ov8=
+-
+-Name: plugin.properties
+-SHA1-Digest: oZ8G+d0YZCeLv5mafw0x2OwbwOY=
+-
+-Name: etc/checkstyle/checkstyle-xdoc.xsl
+-SHA1-Digest: yL3TqCA4pc0daZXtXwAiCN6xHxI=
+-
+-Name: lib/ant.jar
+-SHA1-Digest: TFaLIuMxJspDdKHi2pjTE2Ekz6Y=
+-
+-Name: lib/ant-javamail.jar
+-SHA1-Digest: vYv9iGIOQvdi0qIfGkzQlKaq+l8=
+-
+-Name: lib/ant-apache-resolver.jar
+-SHA1-Digest: bhF0iM9f9L1KT/v8Ys+v2j+vh3E=
+-
+-Name: bin/antRun
+-SHA1-Digest: S63QT5F5EI1BCpIj59nosT3lVTw=
+-
+-Name: bin/envset.cmd
+-SHA1-Digest: EJ+ljL5sbUQ8mWVn8V49XPBuAz0=
+-
+-Name: bin/antRun.pl
+-SHA1-Digest: mynp1agPByxojQUKZqlVZkXZSHY=
+-
+-Name: etc/mmetrics-frames.xsl
+-SHA1-Digest: cQnziGYZC2FrO0zwFE92P1bP2v8=
+-
+-Name: etc/checkstyle/checkstyle-frames.xsl
+-SHA1-Digest: 5KYg/jQq+iuWKS5gF1qX37F+UX0=
+-
+-Name: lib/ant-apache-oro.jar
+-SHA1-Digest: p/P5j9dkS+qaqPV5fzx6LJL/9K0=
+-
+-Name: bin/antRun.bat
+-SHA1-Digest: zB9JbFFhlXTVgwaJlw61wNELj6k=
+-
+-Name: etc/junit-noframes.xsl
+-SHA1-Digest: zmgmTYDnXS0QZvMd3wUarjPR7aE=
+-
+-Name: bin/runant.pl
+-SHA1-Digest: tynYaGh8+BtWDsZ6PljZdoi+egU=
+-
+-Name: about_files/asl-v20.txt
+-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
+-
+-Name: etc/junit-frames-xalan1.xsl
+-SHA1-Digest: ME/2vW22HRXG87EwVJ9LFfkfyEI=
+-
+-Name: etc/log.xsl
+-SHA1-Digest: juv2H0VplMm4ri1rzgdOW0yCroc=
+-
+-Name: lib/ant-commons-logging.jar
+-SHA1-Digest: X+YGW0HqKzBgYy7LvSiU07wuksY=
+-
+-Name: lib/ant-apache-regexp.jar
+-SHA1-Digest: WDOmb9jCRBSCrPZRPb8EpoPV2V8=
+-
+-Name: bin/runant.py
+-SHA1-Digest: Kg3iFzRnZW6PVIFmbj7Eyuo72cM=
+-


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	26 Feb 2009 16:25:25 -0000	1.55
+++ .cvsignore	2 Apr 2009 08:12:57 -0000	1.56
@@ -9,3 +9,4 @@
 eclipse-sourceBuild-srcIncluded-3.4.2.zip
 eclipse-3.4.2-testframework.tar.bz2
 org.fedoraproject.ide.platform-3.4.2.zip
+eclipse-sourceBuild-srcIncluded-I20090401-1325.zip


Index: eclipse-mv-Platform.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-mv-Platform.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-mv-Platform.sh	27 Aug 2008 20:12:34 -0000	1.3
+++ eclipse-mv-Platform.sh	2 Apr 2009 08:12:57 -0000	1.4
@@ -24,6 +24,7 @@
 mv $baseDir/plugins/*linux* plugins
 mv $baseDir/plugins/com.jcraft.jsch_* plugins
 mv $baseDir/plugins/org.eclipse.compare_* plugins
+mv $baseDir/plugins/org.eclipse.compare.core_* plugins
 mv $baseDir/plugins/org.eclipse.core.boot_* plugins
 mv $baseDir/plugins/org.eclipse.core.filebuffers_* plugins
 mv $baseDir/plugins/org.eclipse.core.filesystem_* plugins
@@ -72,6 +73,8 @@
 mv $baseDir/plugins/org.eclipse.core.commands_* plugins
 mv $baseDir/plugins/org.eclipse.core.databinding_* plugins
 mv $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins
+mv $baseDir/plugins/org.eclipse.core.databinding.observable_* plugins
+mv $baseDir/plugins/org.eclipse.core.databinding.property_* plugins
 mv $baseDir/plugins/org.eclipse.core.jobs_* plugins
 mv $baseDir/plugins/org.eclipse.core.expressions_* plugins
 mv $baseDir/plugins/org.eclipse.core.runtime_* plugins
@@ -89,17 +92,21 @@
 mv $baseDir/plugins/org.eclipse.core.contenttype_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.app_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.common_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.ds_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.initializer_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.preferences_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.registry_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.util_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.launcher_* plugins
 mv $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins
 mv $baseDir/plugins/org.eclipse.core.variables_* plugins
 mv $baseDir/plugins/javax.servlet_* plugins
 mv $baseDir/plugins/javax.servlet.jsp_* plugins
 mv $baseDir/plugins/org.apache.ant_* plugins
+mv $baseDir/plugins/org.apache.commons.codec_* plugins
 mv $baseDir/plugins/org.apache.commons.el_* plugins
 mv $baseDir/plugins/org.apache.commons.logging_* plugins
+mv $baseDir/plugins/org.apache.commons.httpclient_* plugins
 mv $baseDir/plugins/org.apache.jasper_* plugins
 mv $baseDir/plugins/org.apache.lucene_* plugins
 mv $baseDir/plugins/org.apache.lucene.analysis_* plugins
@@ -109,6 +116,8 @@
 mv $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins
 mv $baseDir/plugins/org.eclipse.ecf.identity_* plugins
 mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins
+mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_* plugins
+mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_* plugins
 mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins
 mv $baseDir/plugins/org.eclipse.ecf.ssl_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins
@@ -132,11 +141,15 @@
 mv $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.p2.publisher_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.p2.repository_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.p2.repository.tools_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins
 mv $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins
@@ -145,7 +158,8 @@
 mv $baseDir/plugins/org.eclipse.help.webapp_* plugins
 mv $baseDir/plugins/org.eclipse.osgi.services_* plugins
 mv $baseDir/plugins/org.eclipse.ui.forms_* plugins
-mv $baseDir/plugins/org.mortbay.jetty_* plugins
+mv $baseDir/plugins/org.mortbay.jetty.util_* plugins
+mv $baseDir/plugins/org.mortbay.jetty.server_* plugins
 mv $baseDir/plugins/org.sat4j.core_* plugins
 mv $baseDir/plugins/org.sat4j.pb_* plugins
 sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini



From pkgdb at fedoraproject.org  Thu Apr  2 08:14:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 08:14:44 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402081444.90309208505@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebindings (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 08:14:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 08:14:43 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402081446.30D40208553@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebindings (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Apr  2 08:15:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 08:15:08 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090402081449.70DA2208557@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebindings (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From cweyl at fedoraproject.org  Thu Apr  2 08:03:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  2 Apr 2009 08:03:03 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/devel .cvsignore, 1.2,
	1.3 perl-Git-CPAN-Patch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090402080303.C82ED70120@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4854

Modified Files:
	.cvsignore perl-Git-CPAN-Patch.spec sources 
Log Message:
* Sat Mar 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.5-1
- update to 0.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Mar 2009 07:15:02 -0000	1.2
+++ .cvsignore	2 Apr 2009 08:02:33 -0000	1.3
@@ -1 +1 @@
-Git-CPAN-Patch-0.1.4.tar.gz
+Git-CPAN-Patch-0.1.5.tar.gz


Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Git-CPAN-Patch.spec	28 Mar 2009 07:15:02 -0000	1.1
+++ perl-Git-CPAN-Patch.spec	2 Apr 2009 08:02:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.1.4
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -75,6 +75,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Mar 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.5-1
+- update to 0.1.5
+
 * Wed Mar 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.4-2
 - break into main package + git-cpan-patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Mar 2009 07:15:02 -0000	1.2
+++ sources	2 Apr 2009 08:02:33 -0000	1.3
@@ -1 +1 @@
-3ca356d3896cf37a7133301fc9678ff2  Git-CPAN-Patch-0.1.4.tar.gz
+5777545c4b9c9021c6b29c114fb72a5c  Git-CPAN-Patch-0.1.5.tar.gz



From tagoh at fedoraproject.org  Thu Apr  2 08:02:27 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu,  2 Apr 2009 08:02:27 +0000 (UTC)
Subject: rpms/libgxim/devel .cvsignore, 1.7, 1.8 libgxim.spec, 1.9,
	1.10 sources, 1.7, 1.8 libgxim-fix-unwanted-window-destroy.patch,
	1.1, NONE libgxim-fix-x-event.patch, 1.1, NONE
Message-ID: <20090402080227.3A2AD70120@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/libgxim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4613

Modified Files:
	.cvsignore libgxim.spec sources 
Removed Files:
	libgxim-fix-unwanted-window-destroy.patch 
	libgxim-fix-x-event.patch 
Log Message:
* Thu Apr  2 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.3-1
- New upstream release.
  - partly including a fix of freeze issue with switching (#488877)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Jan 2009 11:26:39 -0000	1.7
+++ .cvsignore	2 Apr 2009 08:01:56 -0000	1.8
@@ -7,3 +7,4 @@
 libgxim-0.3.0.tar.bz2
 libgxim-0.3.1.tar.bz2
 libgxim-0.3.2.tar.bz2
+libgxim-0.3.3.tar.bz2


Index: libgxim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/libgxim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgxim.spec	3 Mar 2009 14:38:28 -0000	1.9
+++ libgxim.spec	2 Apr 2009 08:01:56 -0000	1.10
@@ -1,14 +1,12 @@
 Name:		libgxim
-Version:	0.3.2
-Release:	4%{?dist}
+Version:	0.3.3
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/libgxim/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	intltool gettext ruby
 BuildRequires:	dbus-devel > 0.23, dbus-glib-devel >= 0.74, glib2-devel >= 2.16, gtk2-devel
 Source0:	http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0:		libgxim-fix-x-event.patch
-Patch1:		libgxim-fix-unwanted-window-destroy.patch
 
 Summary:	GObject-based XIM protocol library
 Group:		System Environment/Libraries
@@ -40,8 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .xevent
-%patch1 -p0 -b .window
 
 
 %build
@@ -81,6 +77,10 @@
 %{_datadir}/gtk-doc/html/libgxim
 
 %changelog
+* Thu Apr  2 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.3-1
+- New upstream release.
+  - partly including a fix of freeze issue with switching (#488877)
+
 * Tue Mar  3 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.2-4
 - Fix destroying a window unexpectedly. (#488223)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jan 2009 11:26:39 -0000	1.7
+++ sources	2 Apr 2009 08:01:57 -0000	1.8
@@ -1 +1 @@
-03cb1b6c7f9a7842b416ae20fb10cad0  libgxim-0.3.2.tar.bz2
+5fb6b86193b55c54a20c591188019bc3  libgxim-0.3.3.tar.bz2


--- libgxim-fix-unwanted-window-destroy.patch DELETED ---


--- libgxim-fix-x-event.patch DELETED ---



From rrakus at fedoraproject.org  Thu Apr  2 08:36:32 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu,  2 Apr 2009 08:36:32 +0000 (UTC)
Subject: rpms/powerpc-utils-papr/devel powerpc-utils-papr.spec,1.3,1.4
Message-ID: <20090402083632.0FEBD70120@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/powerpc-utils-papr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11600

Modified Files:
	powerpc-utils-papr.spec 
Log Message:
New upstream version 1.1.5


Index: powerpc-utils-papr.spec
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils-papr/devel/powerpc-utils-papr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- powerpc-utils-papr.spec	27 Feb 2009 02:01:18 -0000	1.3
+++ powerpc-utils-papr.spec	2 Apr 2009 08:36:01 -0000	1.4
@@ -1,15 +1,18 @@
 Name:           powerpc-utils-papr
-Version:        1.0.4
-Release:        4%{?dist}
+Version:        1.1.5
+Release:        1%{?dist}
 Summary:        Utilities for IBM PowerPC PAPR platforms
 
 Group:          System Environment/Base
 License:        CPL
 URL:            http://powerpc-utils.ozlabs.org/
-Source0:        http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-1.0.4.tar.gz
+Source0:        http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen librtas-devel
+BuildRequires:  doxygen librtas-devel python
+BuildRequires:  libservicelog-devel >= 1.0.1-2
+Requires:       libservicelog
 ExclusiveArch:  ppc ppc64
+Patch0:         powerpc-utils-papr-1.1.4.libservicelog.patch
 
 %description
 Utilities for maintaining and servicing IBM PowerPC systems that adhere to
@@ -17,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libservicelog
 sed -i s/744/755/ rules.mk
 chmod -x scripts/ibmvscsis.sh
 
@@ -48,6 +52,9 @@
 %{_sbindir}/rtas_dump
 %{_sbindir}/rtas_event_decode
 %{_sbindir}/sys_ident
+%{_sbindir}/drmgr
+%{_sbindir}/lsslot
+%{_bindir}/amsvis
 %{_mandir}/man8/update_flash.8.gz
 %{_mandir}/man8/activate_firmware.8.gz
 %{_mandir}/man8/usysident.8.gz
@@ -62,11 +69,15 @@
 %{_mandir}/man8/ibmvscsis.conf.8.gz
 %{_mandir}/man8/rtas_dump.8.gz
 %{_mandir}/man8/sys_ident.8.gz
+%{_mandir}/man8/amsvis.8.gz
 %doc README COPYRIGHT Changelog scripts/ibmvscsis.sh
 
 
 
 %changelog
+* Thu Apr 02 2009 Roman Rakus <rrakus at redhat.com> - 1.1.5-1
+- New upstream version 1.1.5
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rrakus at fedoraproject.org  Thu Apr  2 08:43:09 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu,  2 Apr 2009 08:43:09 +0000 (UTC)
Subject: rpms/powerpc-utils-papr/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090402084309.9BA5670120@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/powerpc-utils-papr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12361

Modified Files:
	.cvsignore sources 
Log Message:
Added new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils-papr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Nov 2007 02:03:08 -0000	1.2
+++ .cvsignore	2 Apr 2009 08:42:39 -0000	1.3
@@ -1 +1 @@
-powerpc-utils-papr-1.0.4.tar.gz
+powerpc-utils-papr-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils-papr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Nov 2007 02:03:08 -0000	1.2
+++ sources	2 Apr 2009 08:42:39 -0000	1.3
@@ -1 +1 @@
-1472a4b2c6929a5bfe0d29ff30e8b559  powerpc-utils-papr-1.0.4.tar.gz
+a67cfccbc5e049385441b4905be693ec  powerpc-utils-papr-1.1.5.tar.gz



From rrakus at fedoraproject.org  Thu Apr  2 08:52:08 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu,  2 Apr 2009 08:52:08 +0000 (UTC)
Subject: rpms/powerpc-utils-papr/devel
	powerpc-utils-papr-1.1.4.libservicelog.patch, NONE, 1.1
Message-ID: <20090402085208.A962A70120@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/powerpc-utils-papr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13340

Added Files:
	powerpc-utils-papr-1.1.4.libservicelog.patch 
Log Message:
Added missing patch

powerpc-utils-papr-1.1.4.libservicelog.patch:

--- NEW FILE powerpc-utils-papr-1.1.4.libservicelog.patch ---
diff -up powerpc-utils-papr-1.1.4/cmds/drmgr/Makefile.libservicelog powerpc-utils-papr-1.1.4/cmds/drmgr/Makefile
--- powerpc-utils-papr-1.1.4/cmds/drmgr/Makefile.libservicelog	2009-02-23 09:28:42.000000000 -0500
+++ powerpc-utils-papr-1.1.4/cmds/drmgr/Makefile	2009-02-23 09:28:53.000000000 -0500
@@ -3,7 +3,7 @@
 
 include ../../rules.mk
 
-LDFLAGS = -lrtas -lservicelog
+LDFLAGS = -lrtas -lservicelog -lsqlite3
 
 CMDS = drmgr lsslot
 



From pingou at fedoraproject.org  Thu Apr  2 08:56:12 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 08:56:12 +0000 (UTC)
Subject: rpms/geanyvc/devel geanyvc.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090402085612.82B5970120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14650/devel

Modified Files:
	.cvsignore sources 
Added Files:
	geanyvc.spec import.log 
Log Message:
Original import



--- NEW FILE geanyvc.spec ---
Name:           geanyvc
Version:        0.5
Release:        2%{?dist}
Summary:        Version Controler plugin for geany

Group:          Development/Languages
License:        GPLv2+
URL:            http://plugins.geany.org/geanyvc/
Source0:        http://users.cosmostv.by/yurand/geanyvc/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  geany-devel >= 0.15 gettext intltool
Requires:       geany

%description
geanyvc is plugin that provides a uniform way of accessing the different
version-control systems inside Geany IDE. Only small subset of vc is 
implemented, but, hey, you don't need anything besides diff, log, status,
revert and commit most time.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm  $RPM_BUILD_ROOT%{_libdir}/geany/geanyvc.la

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README THANKS TODO
%{_libdir}/geany/

%changelog
* Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
- Add intltool in the BR
- Change license to GPLv2+ has it should be

* Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-1
- Update to 0.5 for geant 0.16

* Fri Feb 13 2009 Pingou <pingou at pingoured.fr> 0.4-1
- First RPM for Fedora



--- NEW FILE import.log ---
geanyvc-0_5-2_fc10:HEAD:geanyvc-0.5-2.fc10.src.rpm:1238662510


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:39:38 -0000	1.1
+++ .cvsignore	2 Apr 2009 08:55:42 -0000	1.2
@@ -0,0 +1 @@
+geanyvc-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:39:38 -0000	1.1
+++ sources	2 Apr 2009 08:55:42 -0000	1.2
@@ -0,0 +1 @@
+643b4b8ac313754e05c2e60db9c2713c  geanyvc-0.5.tar.gz



From pingou at fedoraproject.org  Thu Apr  2 08:59:21 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 08:59:21 +0000 (UTC)
Subject: rpms/geanyvc/devel geanyvc.spec,1.1,1.2
Message-ID: <20090402085921.6C89970120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15074

Modified Files:
	geanyvc.spec 
Log Message:
Do not own the directory


Index: geanyvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/devel/geanyvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geanyvc.spec	2 Apr 2009 08:55:42 -0000	1.1
+++ geanyvc.spec	2 Apr 2009 08:58:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           geanyvc
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Version Controler plugin for geany
 
 Group:          Development/Languages
@@ -42,9 +42,12 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README THANKS TODO
-%{_libdir}/geany/
+%{_libdir}/geany/*
 
 %changelog
+* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
+- Do not own the folder geany which is own by the original package
+
 * Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
 - Add intltool in the BR
 - Change license to GPLv2+ has it should be



From pingou at fedoraproject.org  Thu Apr  2 09:01:05 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:01:05 +0000 (UTC)
Subject: rpms/geanyvc/F-10 geanyvc.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090402090105.F018070120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15482/F-10

Modified Files:
	sources 
Added Files:
	geanyvc.spec 
Log Message:
Original import for branch F-10 and F-9


--- NEW FILE geanyvc.spec ---
Name:           geanyvc
Version:        0.5
Release:        3%{?dist}
Summary:        Version Controler plugin for geany

Group:          Development/Languages
License:        GPLv2+
URL:            http://plugins.geany.org/geanyvc/
Source0:        http://users.cosmostv.by/yurand/geanyvc/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  geany-devel >= 0.15 gettext intltool
Requires:       geany

%description
geanyvc is plugin that provides a uniform way of accessing the different
version-control systems inside Geany IDE. Only small subset of vc is 
implemented, but, hey, you don't need anything besides diff, log, status,
revert and commit most time.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm  $RPM_BUILD_ROOT%{_libdir}/geany/geanyvc.la

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README THANKS TODO
%{_libdir}/geany/*

%changelog
* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
- Do not own the folder geany which is own by the original package

* Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
- Add intltool in the BR
- Change license to GPLv2+ has it should be

* Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-1
- Update to 0.5 for geant 0.16

* Fri Feb 13 2009 Pingou <pingou at pingoured.fr> 0.4-1
- First RPM for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:39:38 -0000	1.1
+++ sources	2 Apr 2009 09:00:35 -0000	1.2
@@ -0,0 +1 @@
+643b4b8ac313754e05c2e60db9c2713c  geanyvc-0.5.tar.gz



From pingou at fedoraproject.org  Thu Apr  2 09:01:06 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:01:06 +0000 (UTC)
Subject: rpms/geanyvc/F-9 geanyvc.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090402090106.2350870120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15482/F-9

Modified Files:
	sources 
Added Files:
	geanyvc.spec 
Log Message:
Original import for branch F-10 and F-9


--- NEW FILE geanyvc.spec ---
Name:           geanyvc
Version:        0.5
Release:        3%{?dist}
Summary:        Version Controler plugin for geany

Group:          Development/Languages
License:        GPLv2+
URL:            http://plugins.geany.org/geanyvc/
Source0:        http://users.cosmostv.by/yurand/geanyvc/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  geany-devel >= 0.15 gettext intltool
Requires:       geany

%description
geanyvc is plugin that provides a uniform way of accessing the different
version-control systems inside Geany IDE. Only small subset of vc is 
implemented, but, hey, you don't need anything besides diff, log, status,
revert and commit most time.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm  $RPM_BUILD_ROOT%{_libdir}/geany/geanyvc.la

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README THANKS TODO
%{_libdir}/geany/*

%changelog
* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
- Do not own the folder geany which is own by the original package

* Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
- Add intltool in the BR
- Change license to GPLv2+ has it should be

* Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-1
- Update to 0.5 for geant 0.16

* Fri Feb 13 2009 Pingou <pingou at pingoured.fr> 0.4-1
- First RPM for Fedora



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:39:38 -0000	1.1
+++ sources	2 Apr 2009 09:00:35 -0000	1.2
@@ -0,0 +1 @@
+643b4b8ac313754e05c2e60db9c2713c  geanyvc-0.5.tar.gz



From pingou at fedoraproject.org  Thu Apr  2 09:09:08 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:09:08 +0000 (UTC)
Subject: rpms/geanyvc/F-9 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 geanyvc.spec, 1.1, 1.2
Message-ID: <20090402090908.4D6FE70120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16453/F-9

Modified Files:
	.cvsignore geanyvc.spec 
Added Files:
	import.log 
Log Message:
Original commit for F-9



--- NEW FILE import.log ---
geanyvc-0_5-2_fc10:F-9:geanyvc-0.5-2.fc10.src.rpm:1238663289


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:39:38 -0000	1.1
+++ .cvsignore	2 Apr 2009 09:08:37 -0000	1.2
@@ -0,0 +1 @@
+geanyvc-0.5.tar.gz


Index: geanyvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-9/geanyvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geanyvc.spec	2 Apr 2009 09:00:35 -0000	1.1
+++ geanyvc.spec	2 Apr 2009 09:08:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           geanyvc
 Version:        0.5
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        Version Controler plugin for geany
 
 Group:          Development/Languages
@@ -42,12 +42,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README THANKS TODO
-%{_libdir}/geany/*
+%{_libdir}/geany/
 
 %changelog
-* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
-- Do not own the folder geany which is own by the original package
-
 * Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
 - Add intltool in the BR
 - Change license to GPLv2+ has it should be



From pingou at fedoraproject.org  Thu Apr  2 09:11:10 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:11:10 +0000 (UTC)
Subject: rpms/geanyvc/F-10 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 geanyvc.spec, 1.1, 1.2
Message-ID: <20090402091110.6494670120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16755/F-10

Modified Files:
	.cvsignore geanyvc.spec 
Added Files:
	import.log 
Log Message:
Original import for F-10



--- NEW FILE import.log ---
geanyvc-0_5-2_fc10:F-10:geanyvc-0.5-2.fc10.src.rpm:1238663370


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:39:38 -0000	1.1
+++ .cvsignore	2 Apr 2009 09:10:40 -0000	1.2
@@ -0,0 +1 @@
+geanyvc-0.5.tar.gz


Index: geanyvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-10/geanyvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geanyvc.spec	2 Apr 2009 09:00:35 -0000	1.1
+++ geanyvc.spec	2 Apr 2009 09:10:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           geanyvc
 Version:        0.5
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        Version Controler plugin for geany
 
 Group:          Development/Languages
@@ -42,12 +42,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README THANKS TODO
-%{_libdir}/geany/*
+%{_libdir}/geany/
 
 %changelog
-* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
-- Do not own the folder geany which is own by the original package
-
 * Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
 - Add intltool in the BR
 - Change license to GPLv2+ has it should be



From pingou at fedoraproject.org  Thu Apr  2 09:13:08 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:13:08 +0000 (UTC)
Subject: rpms/geanyvc/F-10 geanyvc.spec,1.2,1.3
Message-ID: <20090402091308.F025170120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17092

Modified Files:
	geanyvc.spec 
Log Message:
Do not own the directory


Index: geanyvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-10/geanyvc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geanyvc.spec	2 Apr 2009 09:10:40 -0000	1.2
+++ geanyvc.spec	2 Apr 2009 09:12:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           geanyvc
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Version Controler plugin for geany
 
 Group:          Development/Languages
@@ -42,9 +42,12 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README THANKS TODO
-%{_libdir}/geany/
+%{_libdir}/geany/*
 
 %changelog
+* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
+- Do not own the folder geany which is own by the original package
+
 * Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
 - Add intltool in the BR
 - Change license to GPLv2+ has it should be



From pingou at fedoraproject.org  Thu Apr  2 09:14:01 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:14:01 +0000 (UTC)
Subject: rpms/geanyvc/F-9 geanyvc.spec,1.2,1.3
Message-ID: <20090402091401.16E9E70120@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17272

Modified Files:
	geanyvc.spec 
Log Message:
Do not own the directory


Index: geanyvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-9/geanyvc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geanyvc.spec	2 Apr 2009 09:08:37 -0000	1.2
+++ geanyvc.spec	2 Apr 2009 09:13:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           geanyvc
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Version Controler plugin for geany
 
 Group:          Development/Languages
@@ -42,9 +42,12 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README THANKS TODO
-%{_libdir}/geany/
+%{_libdir}/geany/*
 
 %changelog
+* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
+- Do not own the folder geany which is own by the original package
+
 * Wed Mar 04 2009 Pingou <pingou at pingoured.fr> 0.5-2
 - Add intltool in the BR
 - Change license to GPLv2+ has it should be



From pingou at fedoraproject.org  Thu Apr  2 09:25:01 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu,  2 Apr 2009 09:25:01 +0000 (UTC)
Subject: rpms/geanyvc/F-10 geanyvc.spec,1.3,1.4
Message-ID: <20090402092501.38E85178003@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/geanyvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18787

Modified Files:
	geanyvc.spec 
Log Message:
Add a new BR


Index: geanyvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geanyvc/F-10/geanyvc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geanyvc.spec	2 Apr 2009 09:12:38 -0000	1.3
+++ geanyvc.spec	2 Apr 2009 09:24:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           geanyvc
 Version:        0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Version Controler plugin for geany
 
 Group:          Development/Languages
@@ -9,7 +9,7 @@
 Source0:        http://users.cosmostv.by/yurand/geanyvc/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  geany-devel >= 0.15 gettext intltool
+BuildRequires:  geany-devel >= 0.15 gettext intltool pkgconfig
 Requires:       geany
 
 %description
@@ -45,6 +45,9 @@
 %{_libdir}/geany/*
 
 %changelog
+* Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-4
+- Add pkgconfig as BR
+
 * Thu Apr 02 2009 pingou <pingou at pingoured.fr> 0.5-3
 - Do not own the folder geany which is own by the original package
 



From ltinkl at fedoraproject.org  Thu Apr  2 10:12:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  2 Apr 2009 10:12:14 +0000 (UTC)
Subject: rpms/kde-l10n/devel subdirs-kde-l10n,1.14,1.15
Message-ID: <20090402101214.5D65270120@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24617

Modified Files:
	subdirs-kde-l10n 
Log Message:
sync subdirs with the real sources



Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- subdirs-kde-l10n	30 Jan 2009 15:03:04 -0000	1.14
+++ subdirs-kde-l10n	2 Apr 2009 10:11:44 -0000	1.15
@@ -1,5 +1,6 @@
 ar
 bg
+bn_IN
 ca
 cs
 csb
@@ -14,19 +15,24 @@
 fr
 ga
 gl
+gu
 he
 hi
 hu
+is
 it
 ja
 kk
 km
+kn
 ko
 ku
 lt
 lv
+mai
 mk
 ml
+mr
 nb
 nds
 nl
@@ -35,10 +41,12 @@
 pl
 pt
 pt_BR
+ro
 ru
 sl
 sr
 sv
+tg
 th
 tr
 uk



From transif at fedoraproject.org  Thu Apr  2 10:30:59 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu,  2 Apr 2009 10:30:59 +0000 (UTC)
Subject: comps/po th.po,1.14,1.15
Message-ID: <20090402103059.09E4E70120@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27073/po

Modified Files:
	th.po 
Log Message:
Sending translation for Thai


Index: th.po
===================================================================
RCS file: /cvs/pkgs/comps/po/th.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- th.po	9 Jan 2009 11:52:43 -0000	1.14
+++ th.po	2 Apr 2009 10:30:28 -0000	1.15
@@ -3,301 +3,296 @@
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Kamthorn Krairaksa <kamthorn_k at yahoo.com>, 2004, 2006.
+# Manatsawin Hanmongkolchai <manatsawin at gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: th\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2006-09-17 18:04+0700\n"
-"Last-Translator: Kamthorn Krairaksa <kamthorn_k at yahoo.com>\n"
-"Language-Team: Thai <l10n at opentle.org>\n"
+"POT-Creation-Date: 2009-04-02 07:57+0000\n"
+"PO-Revision-Date: 2009-04-02 17:29+0700\n"
+"Last-Translator: Manatsawin Hanmongkolchai <manatsawin at gmail.com>\n"
+"Language-Team: Thai <thai-l10n at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
-msgstr "Afrikaans Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#, fuzzy
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
-msgstr "Canadian Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 #, fuzzy
 msgid "Applications to perform a variety of tasks"
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
-#, fuzzy
 msgid "Armenian Support"
-msgstr "Romanian Support"
+msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
-msgstr "Assamese Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
-msgstr "Basque Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
-#, fuzzy
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
-msgstr "Bulgarian Support"
+msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
-msgstr "Bengali Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
-#, fuzzy
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
-msgstr "Chinese Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
-#, fuzzy
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
-msgstr "Estonian Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
-msgstr "Brazilian Portuguese Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
-msgstr "Breton Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
-msgstr "Bulgarian Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
-msgstr "Catalan Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
-msgstr "Chinese Support"
+msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
-msgstr "Croatian Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
-msgstr "Czech Support"
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "???????????????????????????????????? DNS"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
-msgstr "Danish Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 #, fuzzy
 msgid "Dial-up Networking Support"
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
-msgstr "Dutch Support"
+msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:38
 msgid "Eclipse"
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
-#, fuzzy
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
-msgstr "Danish Support"
+msgstr "??????????????????????????????????????????????????????????????? (???????????????????????????????????????)"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
-msgstr "Estonian Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
-msgstr "Ethiopic Support"
+msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "???????????????????????????????????? FTP"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
-msgstr "Faeroese Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
-#, fuzzy
 msgid "Fedora Packager"
-msgstr "Eclipse"
+msgstr "?????????????????????????????????????????? Fedora"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 #, fuzzy
 msgid "Filipino Support"
 msgstr "Galician Support"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
-msgstr "Finnish Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
-msgstr "French Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -307,110 +302,107 @@
 "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "????????????????????????????????????????????????????????????????????? GNOME"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "????????????????????????????????????????????????????????????????????? GNOME"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
-#, fuzzy
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"GNOME ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ??????????????????????????? ??????????????????????????? "
-"??????????????????????????????????????????????????????????????????????????????"
+"GNOME ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????, ????????????????????????, ????????????????????????????????????\n"
+"??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
-msgstr "Gaelic Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
-msgstr "Galician Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
-#, fuzzy
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
-msgstr "German Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
-msgstr "German Support"
+msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
-msgstr "Gujarati Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
-#, fuzzy
 msgid "Hardware Support"
-msgstr "???????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
-msgstr "???????????????????????????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
-msgstr "Hindi Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
-msgstr "??????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
-msgstr "Icelandic Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
-msgstr "Indonesian Support"
+msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -418,206 +410,198 @@
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? GTK+ ????????? GNOME"
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
-#, fuzzy
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? GTK+ ????????? GNOME"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? GTK+ ????????? XFCE"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? QT ????????? KDE"
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? (X)"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
 #, fuzzy
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "Zulu Support"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
-msgstr "Irish Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
-msgstr "Italian Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
-msgstr "Japanese Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop Environment)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "????????????????????????????????????????????????????????? KDE"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
-#, fuzzy
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"KDE ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ??????????????? ??????????????????????????? ??????????????????????????? "
-"??????????????????????????????????????????????????????????????????????????????"
+"KDE ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????, ????????????????????????, ??????????????????????????? "
+"?????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
-msgstr "Kannada Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
-#, fuzzy
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
-msgstr "German Support"
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
-msgstr "Korean Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
-#, fuzzy
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
-msgstr "?????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
-#, fuzzy
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
-msgstr "Croatian Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
-msgstr "Lithuanian Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
-msgstr "Malay Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
-msgstr "Malayalam Support"
+msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
-#, fuzzy
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
-msgstr "Marathi Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
-msgstr "Marathi Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "??????????????????????????? MySQL"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "Northern Sotho Support"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
-msgstr "Norwegian Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "???????????????????????????????????????????????????/?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
-msgstr "Oriya Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -625,294 +609,280 @@
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
-#, fuzzy
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
-msgstr "Serbian Support"
+msgstr "???????????????????????????????????????????????????????????????????????? "
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
-msgstr "Polish Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
-msgstr "Portuguese Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "??????????????????????????? PostgreSQL"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
-msgstr "???????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
-msgstr "Romanian Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
-msgstr "Russian Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
 #, fuzzy
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "German Support"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
-msgstr "Serbian Support"
+msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "Sinhala Support"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
-msgstr "Slovak Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
-msgstr "Slovenian Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
-#, fuzzy
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
-msgstr "?????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
-#, fuzzy
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
 msgstr ""
-"???????????????????????????????????????????????? ????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????? Emacs ????????? Vi"
+"????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? "
+"?????????????????????????????????????????????????????????????????? ???????????????????????????????????? Emacs ????????? Vi"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 #, fuzzy
 msgid "Southern Ndebele Support"
 msgstr "Northern Sotho Support"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 #, fuzzy
 msgid "Southern Sotho Support"
 msgstr "Northern Sotho Support"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
-msgstr "Spanish Support"
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 #, fuzzy
 msgid "Swati Support"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
-msgstr "Swedish Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
-#, fuzzy
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
-msgstr "????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
-msgstr "????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
-msgstr "Telugu Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:143
 msgid "The Eclipse Integrated Development Environment."
-msgstr "The Eclipse Integrated Development Environment."
+msgstr "?????????????????????????????????????????????????????????????????????????????? Eclipse"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "???????????????????????????????????????????????????????????????????????????????????? ??????????????????????????? ????????????????????? PDF ????????????????????????"
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "????????????????????????????????????????????? ????????????????????????????????????????????? IMAP ????????????????????????????????????????????????????????? SMTP"
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? X Window"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-#, fuzzy
-msgid ""
-"These packages are helpful when developing web applications or web pages."
-msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? X Window"
+msgid "These packages are helpful when developing web applications or web pages."
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? DHCP, Kerberos ????????? NIS"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????? rsh ????????? telnet"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????? rsh ????????? telnet"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
-#, fuzzy
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
-msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
-#, fuzzy
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr ""
-"???????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
-#, fuzzy
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
 msgstr ""
 "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? DocBook ????????????????????????????????? HTML, PDF, "
-"Postscript ????????? text ?????????"
+"Postscript ???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? FTP ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -922,18 +892,18 @@
 "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Red Hat ?????????????????????"
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -942,13 +912,13 @@
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????? ???????????? ????????????????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -958,13 +928,13 @@
 "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -974,7 +944,7 @@
 "X Window"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -984,21 +954,19 @@
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
-msgstr ""
+msgid "This group is a collection of tools and resources of Armenian environments."
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
-msgstr ""
+msgid "This group is a collection of tools for various hardware specific utilities."
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -1008,365 +976,384 @@
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? DNS (BIND) ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? (tm) ?????????"
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? MySQL"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Postgresql"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 #, fuzzy
 msgid "Tibetan Support"
 msgstr "German Support"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
-#, fuzzy
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
-msgstr "Tsonga Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
-msgstr ""
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????? Fedora ?????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
-msgstr "Tsonga Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
-msgstr "Tswana Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
-msgstr "Turkish Support"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
-msgstr "Ukrainian Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
-#, fuzzy
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
-msgstr "Zulu Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "????????????????????????????????????????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
-#, fuzzy
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
-msgstr "Kannada Support"
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
-#, fuzzy
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
-msgstr "Chinese Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
-msgstr "Virtualization"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
-#, fuzzy
 msgid "Web Development"
-msgstr "???????????????????????????????????????????????????"
+msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "?????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "????????????????????????????????????????????????????????? X"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "???????????? X Window"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
-msgstr ""
+msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
-#, fuzzy
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
-msgstr "????????????????????????????????????????????????????????? X"
+msgstr "????????????????????????????????????????????????????????? XFCE"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
-#, fuzzy
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
-msgstr "?????????????????????????????????????????????"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
-msgstr "Zulu Support"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "??????????????????????????????????????? Buildsystem"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
-#, fuzzy
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
-msgstr ""
+msgstr "????????????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
-#, fuzzy
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "The Eclipse Integrated Development Environment."
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Eclipse"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "????????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 #, fuzzy
 msgid "Low Saxon Support"
 msgstr "?????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 #, fuzzy
 msgid "Mongolian Support"
 msgstr "Estonian Support"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
-#, fuzzy
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
-msgstr "Bengali Support"
+msgstr "????????????????????????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 #, fuzzy
 msgid "Esperanto Support"
 msgstr "German Support"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 #, fuzzy
 msgid "Kashubian Support"
 msgstr "Estonian Support"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 #, fuzzy
 msgid "Kurdish Support"
 msgstr "Turkish Support"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
-#, fuzzy
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
-msgstr "Estonian Support"
+msgstr "???????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 #, fuzzy
 msgid "Northern Sami Support"
 msgstr "Northern Sotho Support"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
-#, fuzzy
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
-msgstr "????????????????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????? SUGAR"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr ""
+msgstr "SUGAR ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? OLPC XO"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
 #, fuzzy
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "?????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
-#, fuzzy
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr ""
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
-msgstr "???????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????? Haskell"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
-msgstr ""
+msgstr "?????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
-#, fuzzy
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
-msgstr "German Support"
+msgstr "??????????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 #, fuzzy
 msgid "Konkani Support"
 msgstr "Korean Support"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
-#, fuzzy
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
-msgstr "Marathi Support"
+msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
-#, fuzzy
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
-msgstr "Chinese Support"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
-#, fuzzy
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
-msgstr "Hindi Support"
+msgstr "????????????????????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
-#, fuzzy
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
-msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????????????????????????? Haskell"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 #, fuzzy
 msgid "Tajik Support"
 msgstr "?????????????????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
-#, fuzzy
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
-msgstr "Czech Support"
+msgstr "??????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:5
+#: ../comps-f11.xml.in.h:6
 #, fuzzy
 msgid "Amazigh Support"
 msgstr "???????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "??????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:58
+#: ../comps-f11.xml.in.h:61
 #, fuzzy
 msgid "Frisian Support"
 msgstr "Serbian Support"
 
-#: ../comps-f11.xml.in.h:59
+#: ../comps-f11.xml.in.h:62
 #, fuzzy
 msgid "Friulian Support"
 msgstr "Brazilian Support"
 
-#: ../comps-f11.xml.in.h:101
+#: ../comps-f11.xml.in.h:104
 #, fuzzy
 msgid "Kinyarwanda Support"
 msgstr "Kannada Support"
 
-#: ../comps-f11.xml.in.h:118
+#: ../comps-f11.xml.in.h:121
 #, fuzzy
 msgid "Malagasy Support"
 msgstr "Malay Support"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW cross-compiler"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "???????????? OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "German Support"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:201
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "?????????????????????????????????????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "???????????????????????????????????????????????????????????? Sugar"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr ""
+"???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Windows 32 ?????????, ???????????????????????????????????? "
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????? Fedora"
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Objective CAML"
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????, ??????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:213
+#: ../comps-f11.xml.in.h:220
 #, fuzzy
 msgid "Turkmen Support"
 msgstr "Turkish Support"
 
-#: ../comps-f11.xml.in.h:215
+#: ../comps-f11.xml.in.h:222
 #, fuzzy
 msgid "Upper Sorbian Support"
 msgstr "Serbian Support"
@@ -1416,31 +1403,27 @@
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #~ msgid "British Support"
 #~ msgstr "British Support"
@@ -1689,12 +1672,6 @@
 #~ msgid "Punjabi"
 #~ msgstr "??????????????????????????????"
 
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "?????????????????? Red Hat Enterprise Linux 4"
-
-#~ msgid "Tamil"
-#~ msgstr "????????????????????????"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."



From rhughes at fedoraproject.org  Thu Apr  2 10:34:45 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu,  2 Apr 2009 10:34:45 +0000 (UTC)
Subject: rpms/PackageKit/devel
	PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch, NONE,
	1.1 PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch,
	NONE, 1.1 PackageKit.spec, 1.99, 1.100
Message-ID: <20090402103445.C3FB370120@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27488

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch 
	PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch 
Log Message:
* Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-2
- Fix installing local files with a unicode path. Fixes rh#486720
- Fix the allow cancel duplicate filtering with a patch from upstream.


PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch:

--- NEW FILE PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch ---
commit 826973135802ee453e014dc601168690b49af25d
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Apr 1 12:25:02 2009 +0100

    bugfix: correct the allow-cancel duplicate logic so we don't remember the state of the previous transaction

diff --git a/src/pk-backend.c b/src/pk-backend.c
index 6bedd12..d55245d 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -74,6 +74,13 @@
  */
 #define PK_BACKEND_FINISHED_TIMEOUT_GRACE	10 /* ms */
 
+/* a boolean with unset */
+typedef enum {
+	PK_BACKEND_TRISTATE_FALSE = FALSE,
+	PK_BACKEND_TRISTATE_TRUE = TRUE,
+	PK_BACKEND_TRISTATE_UNSET
+} PkBackendTristate;
+
 struct _PkBackendPrivate
 {
 	GModule			*handle;
@@ -101,7 +108,7 @@ struct _PkBackendPrivate
 	PkBackendFileChanged	 file_changed_func;
 	gpointer		 file_changed_data;
 	gboolean		 during_initialize;
-	gboolean		 allow_cancel;
+	PkBackendTristate	 allow_cancel;
 	gboolean		 finished;
 	guint			 last_percentage;
 	guint			 last_subpercentage;
@@ -1436,9 +1443,9 @@ pk_backend_set_allow_cancel (PkBackend *backend, gboolean allow_cancel)
 	}
 
 	/* same as last state? */
-	if (backend->priv->allow_cancel == allow_cancel) {
+	if (backend->priv->allow_cancel == (PkBackendTristate) allow_cancel) {
 		egg_debug ("ignoring same allow-cancel state");
-		return TRUE;
+		return FALSE;
 	}
 
 	/* can we do the action? */
@@ -1456,9 +1463,16 @@ pk_backend_set_allow_cancel (PkBackend *backend, gboolean allow_cancel)
 gboolean
 pk_backend_get_allow_cancel (PkBackend *backend)
 {
+	gboolean allow_cancel = FALSE;
+
 	g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE);
 	g_return_val_if_fail (backend->priv->locked != FALSE, FALSE);
-	return backend->priv->allow_cancel;
+
+	/* return FALSE if we never set state */
+	if (backend->priv->allow_cancel != PK_BACKEND_TRISTATE_UNSET)
+		allow_cancel = backend->priv->allow_cancel;
+
+	return allow_cancel;
 }
 
 /**
@@ -1952,11 +1966,11 @@ pk_backend_reset (PkBackend *backend)
 	backend->priv->set_error = FALSE;
 	backend->priv->set_signature = FALSE;
 	backend->priv->set_eula = FALSE;
-	backend->priv->allow_cancel = FALSE;
 	backend->priv->finished = FALSE;
 	backend->priv->has_sent_package = FALSE;
 	backend->priv->thread = NULL;
 	backend->priv->last_package = NULL;
+	backend->priv->allow_cancel = PK_BACKEND_TRISTATE_UNSET;
 	backend->priv->status = PK_STATUS_ENUM_UNKNOWN;
 	backend->priv->exit = PK_EXIT_ENUM_UNKNOWN;
 	backend->priv->role = PK_ROLE_ENUM_UNKNOWN;
@@ -2327,6 +2341,35 @@ pk_backend_test (EggTest *test)
 	egg_test_loop_wait (test, PK_BACKEND_FINISHED_ERROR_TIMEOUT + 400);
 	egg_test_loop_check (test);
 
+	/************************************************************
+	 ****************     CANCEL TRISTATE      ******************
+	 ************************************************************/
+	egg_test_title (test, "get allow cancel after reset");
+	pk_backend_reset (backend);
+	ret = pk_backend_get_allow_cancel (backend);
+	egg_test_assert (test, !ret);
+
+	/************************************************************/
+	egg_test_title (test, "set allow cancel TRUE");
+	ret = pk_backend_set_allow_cancel (backend, TRUE);
+	egg_test_assert (test, ret);
+
+	/************************************************************/
+	egg_test_title (test, "set allow cancel TRUE (repeat)");
+	ret = pk_backend_set_allow_cancel (backend, TRUE);
+	egg_test_assert (test, !ret);
+
+	/************************************************************/
+	egg_test_title (test, "set allow cancel FALSE");
+	ret = pk_backend_set_allow_cancel (backend, FALSE);
+	egg_test_assert (test, ret);
+
+	/************************************************************/
+	egg_test_title (test, "set allow cancel FALSE (after reset)");
+	pk_backend_reset (backend);
+	ret = pk_backend_set_allow_cancel (backend, FALSE);
+	egg_test_assert (test, ret);
+
 #ifdef PK_IS_DEVELOPER
 	egg_test_title (test, "check we enforce finished after error_code");
 	if (number_messages == 1)

PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch:

--- NEW FILE PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch ---
commit 4dfcd53103ac572e27e67e85088b6dee48b2e171
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Apr 2 11:20:55 2009 +0100

    bugfix: yum cannot handle FakeRepository.repo, unlike a normal Repository, so just handle the local case specially. Fixes rh#486720

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index f13bd9d..aade7bd 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -2641,8 +2641,13 @@ class PackageKitCallback(RPMBaseCallback):
             # we don't know the summary text
             self.base.package(package_id, status, "")
         else:
+            # local file shouldn't put the path in the package_id
+            repo_id = _to_unicode(self.curpkg.repo.id)
+            if repo_id.find("/") != -1:
+                repo_id = 'local'
+
             pkgver = _get_package_ver(self.curpkg)
-            package_id = self.base.get_package_id(self.curpkg.name, pkgver, self.curpkg.arch, self.curpkg.repo)
+            package_id = self.base.get_package_id(self.curpkg.name, pkgver, self.curpkg.arch, repo_id)
             self.base.package(package_id, status, self.curpkg.summary)
 
     def event(self, package, action, te_current, te_total, ts_current, ts_total):


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- PackageKit.spec	30 Mar 2009 16:18:49 -0000	1.99
+++ PackageKit.spec	2 Apr 2009 10:34:15 -0000	1.100
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -18,11 +18,18 @@
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Fedora-specific
-# Set Vendor.conf up for Fedora.
+# Fedora-specific: set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
+
+# Fedora specific: the yum backend doesn't do time estimation correctly
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
+# Already upstream: 4dfcd53103ac572e27e67e85088b6dee48b2e171
+Patch2:    PackageKit-0.4.6-fix-FakeRepository-for-unicode-paths.patch
+
+# Already upstream: 826973135802ee453e014dc601168690b49af25d
+Patch3:    PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -223,6 +230,8 @@
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
+%patch2 -p1 -b .fake-repo-unicode
+%patch3 -p1 -b .correct-allow-cancel
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -417,6 +426,10 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-2
+- Fix installing local files with a unicode path. Fixes rh#486720
+- Fix the allow cancel duplicate filtering with a patch from upstream.
+
 * Mon Mar 30 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-1
 - New upstream version
 



From jgu at fedoraproject.org  Thu Apr  2 10:47:44 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu,  2 Apr 2009 10:47:44 +0000 (UTC)
Subject: rpms/geany/devel geany.spec,1.19,1.20
Message-ID: <20090402104744.4EE8B70120@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28584

Modified Files:
	geany.spec 
Log Message:
* Thu Apr  2 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-2
- Add Requires for pkgconfig to geany-devel subpackage (BZ 493566)



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- geany.spec	25 Feb 2009 21:20:43 -0000	1.19
+++ geany.spec	2 Apr 2009 10:47:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.16
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -40,6 +40,7 @@
 Summary:   Header files for building Geany plug-ins
 Group:     Development/Tools
 Requires:  geany = %{version}-%{release}
+Requires:  pkgconfig
 
 %description devel
 This package contains the header files and pkg-config file needed for building
@@ -89,6 +90,9 @@
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Thu Apr  2 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-2
+- Add Requires for pkgconfig to geany-devel subpackage (BZ 493566)
+
 * Sun Feb 25 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-1
 - Update to 0.16
 - Add tags files



From ltinkl at fedoraproject.org  Thu Apr  2 10:53:28 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  2 Apr 2009 10:53:28 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec, 1.75, 1.76 subdirs-kde-l10n, 1.15,
	1.16
Message-ID: <20090402105328.4E3F170120@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29327

Modified Files:
	kde-l10n.spec subdirs-kde-l10n 
Log Message:
add new languages, kn omitted for now, tarball broken



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kde-l10n.spec	31 Mar 2009 16:06:52 -0000	1.75
+++ kde-l10n.spec	2 Apr 2009 10:52:57 -0000	1.76
@@ -63,6 +63,14 @@
 #Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2
+Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-bn_IN-%{version}.tar.bz2
+Source55: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-gu-%{version}.tar.bz2
+Source56: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-is-%{version}.tar.bz2
+#Source57: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-kn-%{version}.tar.bz2
+Source58: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mai-%{version}.tar.bz2
+Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
+Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
+Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -122,6 +130,15 @@
 %description Belarusian
 Belarusian language support for KDE
 
+%package Bengali
+Summary: Bengali language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-bn_IN = %{version}-%{release}
+
+%description Bengali
+Bengali language support for KDE
+
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
@@ -131,15 +148,6 @@
 %description Bulgarian
 Bulgarian language support for KDE
 
-%package Bengali
-Summary: Bengali language support for KDE
-Group: User Interface/Desktops
-Requires: kde-filesystem
-Provides: %{name}-bn = %{version}-%{release}
-
-%description Bengali
-Bengali language support for KDE
-
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
@@ -185,8 +193,6 @@
 %description Czech
 Czech language support for KDE
 
-
-
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
@@ -223,6 +229,15 @@
 %description Greek
 Greek language support for KDE
 
+%package Gujarati
+Summary: Gujarati language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-gu = %{version}-%{release}
+
+%description Gujarati
+Gujarati language support for KDE
+
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
@@ -494,6 +509,15 @@
 %description Macedonian
 Macedonian language support for KDE
 
+%package Maithili
+Summary: Maithili language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-mai = %{version}-%{release}
+
+%description Maithili
+Maithili language support for KDE
+
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
@@ -512,6 +536,15 @@
 %description Maltese
 Maltese language support for KDE
 
+%package Marathi
+Summary: Marathi language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-mr = %{version}-%{release}
+
+%description Marathi
+Marathi language support for KDE
+
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
@@ -834,7 +867,7 @@
 %lang(af) %{_datadir}/locale/af/*
 %endif
 
-%files Arabic 
+%files Arabic
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
@@ -859,7 +892,7 @@
 %if %{buildall}
 %files Bengali
 %defattr(-,root,root)
-%lang(bn) %{_datadir}/locale/bn/*
+%lang(bn_IN) %{_datadir}/locale/bn_IN/*
 %endif
 
 %if %{buildall}
@@ -929,6 +962,10 @@
 %lang(el) %{_datadir}/locale/el/*
 %lang(el) %{_kde4_appsdir}/kvtml/el
 
+%files Gujarati
+%defattr(-,root,root)
+%lang(gu) %{_datadir}/locale/gu/*
+
 %files British
 %defattr(-,root,root)
 %lang(en_GB) %{_datadir}/locale/en_GB/*
@@ -1120,6 +1157,14 @@
 %defattr(-,root,root)
 %lang(mk) %{_datadir}/locale/mk/*
 
+%files Maithili
+%defattr(-,root,root)
+%lang(mai) %{_datadir}/locale/mai/*
+
+%files Marathi
+%defattr(-,root,root)
+%lang(mr) %{_datadir}/locale/mr/*
+
 %files Malayalam
 %defattr(-,root,root)
 %lang(ml) %{_datadir}/locale/ml/*
@@ -1208,7 +1253,9 @@
 %files Romanian
 %defattr(-,root,root)
 %lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_kde4_appsdir}/kvtml/ro
 %lang(ro) %{_kde4_appsdir}/ktuberling/sounds/ro*
+%lang(ru) %{_kde4_docdir}/HTML/ro
 %endif
 
 %files Russian
@@ -1266,6 +1313,8 @@
 %files Tajik
 %defattr(-,root,root)
 %lang(tg) %{_datadir}/locale/tg/*
+%lang(tg) %{_kde4_appsdir}/kvtml/tg
+%lang(tg) %{_kde4_appsdir}/khangman/tg.txt
 %endif
 
 %files Thai


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- subdirs-kde-l10n	2 Apr 2009 10:11:44 -0000	1.15
+++ subdirs-kde-l10n	2 Apr 2009 10:52:57 -0000	1.16
@@ -24,7 +24,6 @@
 ja
 kk
 km
-kn
 ko
 ku
 lt



From caolanm at fedoraproject.org  Thu Apr  2 10:59:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  2 Apr 2009 10:59:22 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.217, 1.218 sources, 1.358,
	1.359
Message-ID: <20090402105922.26F5770120@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30789

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- .cvsignore	28 Mar 2009 16:24:54 -0000	1.217
+++ .cvsignore	2 Apr 2009 10:58:51 -0000	1.218
@@ -7,4 +7,4 @@
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
 or-IN_DEV300_m40.sdf
-OOO310_m8.tar.bz2
+OOO310_m9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- sources	28 Mar 2009 16:24:54 -0000	1.358
+++ sources	2 Apr 2009 10:58:51 -0000	1.359
@@ -7,4 +7,4 @@
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-1cadc13a0a688cf30eacfdcffd1a82f4  OOO310_m8.tar.bz2
+16eca6326a807ff6f60bcd2125dab852  OOO310_m9.tar.bz2



From jgu at fedoraproject.org  Thu Apr  2 11:01:02 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu,  2 Apr 2009 11:01:02 +0000 (UTC)
Subject: rpms/geany/F-10 geany.spec,1.18,1.19
Message-ID: <20090402110102.E086770120@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31070

Modified Files:
	geany.spec 
Log Message:
* Thu Apr  2 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-2
- Add Requires for pkgconfig to geany-devel subpackage (BZ 493566)



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/F-10/geany.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- geany.spec	25 Feb 2009 21:22:58 -0000	1.18
+++ geany.spec	2 Apr 2009 11:00:32 -0000	1.19
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.16
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -40,6 +40,7 @@
 Summary:   Header files for building Geany plug-ins
 Group:     Development/Tools
 Requires:  geany = %{version}-%{release}
+Requires:  pkgconfig
 
 %description devel
 This package contains the header files and pkg-config file needed for building
@@ -89,10 +90,16 @@
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
-* Wed Feb 25 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-1
+* Thu Apr  2 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-2
+- Add Requires for pkgconfig to geany-devel subpackage (BZ 493566)
+
+* Sun Feb 25 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.16-1
 - Update to 0.16
 - Add tags files
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Oct 26 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.15-1
 - Update to 0.15
 - Update URL



From caolanm at fedoraproject.org  Thu Apr  2 11:02:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  2 Apr 2009 11:02:38 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1869,1.1870
Message-ID: <20090402110238.3498870120@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31393

Modified Files:
	openoffice.org.spec 
Log Message:
next milestone


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1869
retrieving revision 1.1870
diff -u -r1.1869 -r1.1870
--- openoffice.org.spec	30 Mar 2009 08:45:54 -0000	1.1869
+++ openoffice.org.spec	2 Apr 2009 11:02:07 -0000	1.1870
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 8
-%define rh_rpm_release 2
+%define ooomilestone 9
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4107,6 +4107,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 02 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.1
+- latest milestone
+
 * Mon Mar 30 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-8.2
 - add openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
 



From ltinkl at fedoraproject.org  Thu Apr  2 11:23:53 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  2 Apr 2009 11:23:53 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.21, 1.22 sources, 1.24,
	1.25 subdirs-kde-l10n, 1.16, 1.17
Message-ID: <20090402112353.EF17870120@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1197

Modified Files:
	.cvsignore sources subdirs-kde-l10n 
Log Message:
upload and add Slovak tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	31 Mar 2009 16:56:01 -0000	1.21
+++ .cvsignore	2 Apr 2009 11:23:22 -0000	1.22
@@ -53,3 +53,4 @@
 kde-l10n-wa-4.2.2.tar.bz2
 kde-l10n-zh_CN-4.2.2.tar.bz2
 kde-l10n-zh_TW-4.2.2.tar.bz2
+kde-l10n-sk-4.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	31 Mar 2009 16:56:01 -0000	1.24
+++ sources	2 Apr 2009 11:23:22 -0000	1.25
@@ -53,3 +53,4 @@
 c2a082a4049fe340d108d1145d53451c  kde-l10n-wa-4.2.2.tar.bz2
 34de085cac6f862b359d1ce3e9ccfeed  kde-l10n-zh_CN-4.2.2.tar.bz2
 f0c15cd1f14783f7d895355fe5754f61  kde-l10n-zh_TW-4.2.2.tar.bz2
+855181e00df828278d4ae83e6c8aba7b  kde-l10n-sk-4.2.2.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- subdirs-kde-l10n	2 Apr 2009 10:52:57 -0000	1.16
+++ subdirs-kde-l10n	2 Apr 2009 11:23:22 -0000	1.17
@@ -42,6 +42,7 @@
 pt_BR
 ro
 ru
+sk
 sl
 sr
 sv



From sindrepb at fedoraproject.org  Thu Apr  2 11:47:26 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 11:47:26 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.13,1.14
Message-ID: <20090402114726.4ABA070120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20970

Modified Files:
	awn-extras-applets.spec 
Log Message:
new upstream release, fixes


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- awn-extras-applets.spec	24 Feb 2009 03:45:11 -0000	1.13
+++ awn-extras-applets.spec	2 Apr 2009 11:46:55 -0000	1.14
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           awn-extras-applets
-Version:        0.2.6
-Release:        9%{?dist}
+Version:        0.3.2.1
+Release:        1%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -11,7 +12,7 @@
 Source0:        https://edge.launchpad.net/awn-extras/0.2/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  avant-window-navigator-devel >= 0.2.6
+BuildRequires:  avant-window-navigator-devel >= 0.3.2
 BuildRequires:  libwnck-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  gnome-menus-devel
@@ -25,15 +26,16 @@
 BuildRequires:  libsexy-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  ed
+#BuildRequires:  ed
 BuildRequires:  pycairo-devel
 BuildRequires:  pygtk2-devel
 BuildRequires:  vte-devel
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libtool
 BuildRequires:  intltool 
+BuildRequires:  gettext
 
-Requires:       avant-window-navigator >= 0.2.6
+Requires:       avant-window-navigator >= 0.3.2
 Requires:       gnome-python2-gnome
 Requires:       gnome-python2-gnomedesktop
 Requires:       gnome-python2-gnomevfs
@@ -54,21 +56,31 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Patch0: awn-extras-applets-0.2.6.configure.patch
+#Patch0: awn-extras-applets-0.2.6.configure.patch
 
 
 %description
 awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 #for f in `find -name '*.py'`; do
 #  head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f 
 #done
 
 %build
-./autogen.sh --disable-pymod-checks
+#./autogen.sh --disable-pymod-checks
 %configure --disable-static --disable-pymod-checks
 make %{?_smp_mflags}
 
@@ -84,11 +96,10 @@
 # mv ${RPM_BUILD_ROOT}/etc/gconf/schemas/notification-daemon.schemas \
 #   ${RPM_BUILD_ROOT}/etc/gconf/schemas/awn-notification-daemon.schemas
 
-# This project does not have translations
-# %find_lang %{name}
+%find_lang %{name}
 
 %pre
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     for name in ${SCHEMAS}; do
@@ -98,15 +109,20 @@
 fi
 
 %post
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 for name in ${SCHEMAS}; do
   gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/${name}.schemas > /dev/null || :
 done
 
+/sbin/ldconfig
+
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %preun
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     for name in ${SCHEMAS}; do
@@ -115,28 +131,52 @@
     done
 fi
 
+%postun
+/sbin/ldconfig
+
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING
+%doc ChangeLog COPYING README
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/affinity-preferences
-%{_libdir}/libawn-extras.so*
-%{python_sitelib}/awn/extras/*
-%dir %{python_sitelib}/awn/extras
-%{_includedir}/libawn-extras
-
-%{_libdir}/awn/applets/*
-
-%{_datadir}/icons
-%{_datadir}/avant-window-navigator/applets/icons
-%{_datadir}/avant-window-navigator/defs/awn_extras.defs
-%dir %{_datadir}/awn-extras-applets
-%{_datadir}/awn-extras-applets/*
+%{_libdir}/libawn-extras.so.*
+%{_libdir}/awn
+%{python_sitearch}/awn/extras
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/avant-window-navigator/applets/*
+%{_datadir}/avant-window-navigator/defs/*
+
+%files devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
+
 
 %changelog
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-1
+- New upstream release
+- Add devel package
+- Update schemas lists
+- Enable translations shebang
+- Add gnome-icon-cache scriplet
+- Add shared library scriplet
+- clean up files list
+- Use python_sitearch, not sitelib as package is arch.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twaugh at fedoraproject.org  Thu Apr  2 11:50:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  2 Apr 2009 11:50:54 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.468,1.469
Message-ID: <20090402115054.BBDE070120@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21345

Modified Files:
	cups.spec 
Log Message:
* Thu Apr  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.13
- Don't verify MD5 sum, file size, or mtime for several config files:
  cupsd.conf, client.conf, classes.conf, printers.conf, snmp.conf,
  subscriptions.conf, lpoptions (bug #486287).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- cups.spec	23 Mar 2009 18:04:54 -0000	1.468
+++ cups.spec	2 Apr 2009 11:50:24 -0000	1.469
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.12%{?dist}
+Release: 0.%{pre}.13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -368,15 +368,15 @@
 %dir %attr(0755,root,lp) /etc/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
-%config(noreplace) %attr(0640,root,lp) /etc/cups/cupsd.conf
+%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) /etc/cups/cupsd.conf
 %attr(0640,root,lp) /etc/cups/cupsd.conf.default
-%config(noreplace) %attr(0644,root,lp) /etc/cups/client.conf
-%config(noreplace) %attr(0600,root,lp) /etc/cups/classes.conf
-%config(noreplace) %attr(0600,root,lp) /etc/cups/printers.conf
-%config(noreplace) %attr(0644,root,lp) /etc/cups/snmp.conf
-%config(noreplace) %attr(0644,root,lp) /etc/cups/subscriptions.conf
+%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) /etc/cups/client.conf
+%verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) /etc/cups/classes.conf
+%verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) /etc/cups/printers.conf
+%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) /etc/cups/snmp.conf
+%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) /etc/cups/subscriptions.conf
 /etc/cups/interfaces
-%config(noreplace) %attr(0644,root,lp) /etc/cups/lpoptions
+%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) /etc/cups/lpoptions
 %dir %attr(0755,root,lp) /etc/cups/ppd
 %dir %attr(0700,root,lp) /etc/cups/ssl
 /etc/cups/pstoraster.convs
@@ -472,6 +472,11 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Thu Apr  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.13
+- Don't verify MD5 sum, file size, or mtime for several config files:
+  cupsd.conf, client.conf, classes.conf, printers.conf, snmp.conf,
+  subscriptions.conf, lpoptions (bug #486287).
+
 * Mon Mar 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.12
 - If cups-polld gets EAI_AGAIN when looking up a hostname,
   re-initialise the resolver (bug #490943).



From sindrepb at fedoraproject.org  Thu Apr  2 11:51:02 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 11:51:02 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.14,1.15
Message-ID: <20090402115102.F39ED70120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21416

Modified Files:
	awn-extras-applets.spec 
Log Message:
new upstream release, fixes


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- awn-extras-applets.spec	2 Apr 2009 11:46:55 -0000	1.14
+++ awn-extras-applets.spec	2 Apr 2009 11:50:32 -0000	1.15
@@ -1,4 +1,3 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           awn-extras-applets
@@ -9,7 +8,7 @@
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            https://launchpad.net/awn-extras/
-Source0:        https://edge.launchpad.net/awn-extras/0.2/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  avant-window-navigator-devel >= 0.3.2
@@ -170,7 +169,7 @@
 * Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-1
 - New upstream release
 - Add devel package
-- Update schemas lists
+- Update schemas scriplets
 - Enable translations shebang
 - Add gnome-icon-cache scriplet
 - Add shared library scriplet



From tbzatek at fedoraproject.org  Thu Apr  2 11:52:53 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu,  2 Apr 2009 11:52:53 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.189,1.190
Message-ID: <20090402115253.8F24670120@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21736

Modified Files:
	gnome-vfs2.spec 
Log Message:
* Thu Apr  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-2
- Rebuilt to solve multilib issues (#492926)



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gnome-vfs2.spec	17 Mar 2009 15:31:27 -0000	1.189
+++ gnome-vfs2.spec	2 Apr 2009 11:52:23 -0000	1.190
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -135,7 +135,7 @@
 %configure --disable-gtk-doc --enable-hal 
 
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -207,7 +207,7 @@
 %postun -p /sbin/ldconfig
 
 %files -f %{po_package}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS COPYING COPYING.LIB NEWS README
 
 %dir %{_sysconfdir}/gnome-vfs-2.0
@@ -239,6 +239,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Apr  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-2
+- Rebuilt to solve multilib issues (#492926)
+
 * Tue Mar 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-1
 - Update to 2.24.1
 



From rspanton at fedoraproject.org  Thu Apr  2 12:04:16 2009
From: rspanton at fedoraproject.org (Robert Spanton)
Date: Thu,  2 Apr 2009 12:04:16 +0000 (UTC)
Subject: rpms/msp430-binutils/F-10 .cvsignore, 1.2, 1.3 msp430-binutils.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090402120416.D822670120@cvs1.fedora.phx.redhat.com>

Author: rspanton

Update of /cvs/pkgs/rpms/msp430-binutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23920

Modified Files:
	.cvsignore msp430-binutils.spec sources 
Log Message:
Update to binutils 2.19.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2009 13:09:49 -0000	1.2
+++ .cvsignore	2 Apr 2009 12:03:46 -0000	1.3
@@ -1 +1 @@
-binutils-2.19.tar.bz2
+binutils-2.19.1.tar.bz2


Index: msp430-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/F-10/msp430-binutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msp430-binutils.spec	26 Jan 2009 13:09:49 -0000	1.1
+++ msp430-binutils.spec	2 Apr 2009 12:03:46 -0000	1.2
@@ -1,8 +1,8 @@
 %define target msp430
 
 Name:		%{target}-binutils
-Version:	2.19
-Release:	2%{?dist}
+Version:	2.19.1
+Release:	1%{?dist}
 Summary:	Cross Compiling GNU binutils targeted at %{target}
 Group:		Development/Tools
 License:	GPLv2+
@@ -55,6 +55,9 @@
 %{_mandir}/man1/%{target}-*.1.gz
 
 %changelog
+* Tue Feb 10 2009 Rob Spanton rspanton at zepler.net 2.19.1-1
+- Bump up to binutils 2.19.1 
+
 * Thu Jan 15 2009 Rob Spanton rspanton at zepler.net 2.19-2
 - Add comment about getting patch upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2009 13:09:49 -0000	1.2
+++ sources	2 Apr 2009 12:03:46 -0000	1.3
@@ -1 +1 @@
-17a52219dee5a76c1a9d9b0bfd337d66  binutils-2.19.tar.bz2
+09a8c5821a2dfdbb20665bc0bd680791  binutils-2.19.1.tar.bz2



From mcrha at fedoraproject.org  Thu Apr  2 12:04:35 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Thu,  2 Apr 2009 12:04:35 +0000 (UTC)
Subject: rpms/evolution-data-server/F-9
	evolution-data-server-2.22.3-display-smime-sign-and-encrypt.patch,
	NONE, 1.1 evolution-data-server.spec, 1.221, 1.222
Message-ID: <20090402120435.5794670120@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23899

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.22.3-display-smime-sign-and-encrypt.patch 
Log Message:
Resolves: bug 492852


evolution-data-server-2.22.3-display-smime-sign-and-encrypt.patch:

--- NEW FILE evolution-data-server-2.22.3-display-smime-sign-and-encrypt.patch ---
diff -up evolution-data-server-2.22.3/camel/camel-smime-context.c.display-smime-sign-and-encrypt evolution-data-server-2.22.3/camel/camel-smime-context.c
--- evolution-data-server-2.22.3/camel/camel-smime-context.c.display-smime-sign-and-encrypt	2009-04-02 13:22:32.000000000 +0200
+++ evolution-data-server-2.22.3/camel/camel-smime-context.c	2009-04-02 13:22:42.000000000 +0200
@@ -970,7 +970,8 @@ sm_decrypt(CamelCipherContext *context, 
 	camel_data_wrapper_construct_from_stream((CamelDataWrapper *)opart, ostream);
 
 	if (NSS_CMSMessage_IsSigned(cmsg)) {
-		valid = sm_verify_cmsg(context, cmsg, NULL, ex);
+		camel_stream_reset (ostream);
+		valid = sm_verify_cmsg (context, cmsg, ostream, ex);
 	} else {
 		valid = camel_cipher_validity_new();
 		valid->encrypt.description = g_strdup(_("Encrypted content"));


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-9/evolution-data-server.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- evolution-data-server.spec	17 Mar 2009 18:15:04 -0000	1.221
+++ evolution-data-server.spec	2 Apr 2009 12:04:05 -0000	1.222
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.22.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -64,6 +64,9 @@
 # RH bug #487685 / CVE-2009-0582
 Patch18: evolution-data-server-2.22.3-CVE-2009-0582.patch
 
+# RH bug #492852  (display sign and encrypted S/MIME messages again)
+Patch19: evolution-data-server-2.22.3-display-smime-sign-and-encrypt.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -146,6 +149,7 @@
 %patch16 -p1 -b .e-book-auth-util
 %patch17 -p1 -b .CVE-2009-0582
 %patch18 -p1 -b .CVE-2009-0587
+%patch19 -p1 -b .display-smime-sign-and-encrypt
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -388,6 +392,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Apr 02 2009 Milan Crha <mcrha at redhat.com> - 2.22.3-4.fc9
+- Add patch for RH bug #492852 (S/MIME signatures and encryption).
+
 * Tue Mar 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.22.3-3.fc9
 - Add patch for RH bug #484925 (CVE-2009-0547, S/MIME signatures).
 - Add patch for RH bug #487685 (CVE-2009-0582, NTLM authentication).



From tmraz at fedoraproject.org  Thu Apr  2 12:04:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu,  2 Apr 2009 12:04:54 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.73, 1.74 authconfig.spec, 1.103,
	1.104 sources, 1.81, 1.82
Message-ID: <20090402120454.769E670120@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24064

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Thu Apr  2 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.8-1
- fix regression in authconfig-tui (#493576)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	26 Jan 2009 16:52:56 -0000	1.73
+++ .cvsignore	2 Apr 2009 12:04:24 -0000	1.74
@@ -1 +1 @@
-authconfig-5.4.7.tar.bz2
+authconfig-5.4.8.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- authconfig.spec	24 Feb 2009 03:15:59 -0000	1.103
+++ authconfig.spec	2 Apr 2009 12:04:24 -0000	1.104
@@ -1,7 +1,7 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.7
-Release: 2%{?dist}
+Version: 5.4.8
+Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -95,8 +95,8 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Apr  2 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.8-1
+- fix regression in authconfig-tui (#493576)
 
 * Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.7-1
 - move the consolehelper symlinks to the gtk subpackage to remove


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	26 Jan 2009 16:52:56 -0000	1.81
+++ sources	2 Apr 2009 12:04:24 -0000	1.82
@@ -1 +1 @@
-f4dd25f64c7174f88149b17139c602b3  authconfig-5.4.7.tar.bz2
+f56c26ef89768193d632fe2b52a6a0e0  authconfig-5.4.8.tar.bz2



From mlichvar at fedoraproject.org  Thu Apr  2 12:09:26 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  2 Apr 2009 12:09:26 +0000 (UTC)
Subject: rpms/rpmreaper/devel .cvsignore, 1.4, 1.5 rpmreaper.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090402120926.74D4C70120@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/rpmreaper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24878

Modified Files:
	.cvsignore rpmreaper.spec sources 
Log Message:
- update to 0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2008 13:02:30 -0000	1.4
+++ .cvsignore	2 Apr 2009 12:08:56 -0000	1.5
@@ -1 +1 @@
-rpmreaper-0.1.5.tar.gz
+rpmreaper-0.1.6.tar.gz


Index: rpmreaper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/devel/rpmreaper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmreaper.spec	6 Mar 2009 22:58:44 -0000	1.6
+++ rpmreaper.spec	2 Apr 2009 12:08:56 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           rpmreaper
-Version:        0.1.5
-Release:        3%{?dist}
+Version:        0.1.6
+Release:        1%{?dist}
 Summary:        A tool for removing packages from system
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://fedorahosted.org/rpmreaper/
-Source0:        https://fedorahosted.org/releases/r/p/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel rpm-devel
@@ -35,6 +35,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Apr 02 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.1.6-1
+- update to 0.1.6
+
 * Fri Mar 06 2009 Jesse Keating <jkeating at redhat.com> - 0.1.5-3
 - Rebuild for new rpm
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2008 13:02:30 -0000	1.4
+++ sources	2 Apr 2009 12:08:56 -0000	1.5
@@ -1 +1 @@
-650975d54da4f9df4f716a6eabac7520  rpmreaper-0.1.5.tar.gz
+655184ddcb5cdd3a255d89341284fe6e  rpmreaper-0.1.6.tar.gz



From pkgdb at fedoraproject.org  Thu Apr  2 12:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:14:16 +0000
Subject: [pkgdb] geany: pingou has requested watchbugzilla
Message-ID: <20090402121357.8E8462084D5@bastion.fedora.phx.redhat.com>

pingou has requested the watchbugzilla acl on geany (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:13:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:13:59 +0000
Subject: [pkgdb] geany: pingou has requested watchcommits
Message-ID: <20090402121400.00B8220854A@bastion.fedora.phx.redhat.com>

pingou has requested the watchcommits acl on geany (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:14:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:14:21 +0000
Subject: [pkgdb] geany: pingou has requested commit
Message-ID: <20090402121402.582CB208555@bastion.fedora.phx.redhat.com>

pingou has requested the commit acl on geany (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:14:10 +0000
Subject: [pkgdb] geany: pingou has requested watchcommits
Message-ID: <20090402121410.756A42084D5@bastion.fedora.phx.redhat.com>

pingou has requested the watchcommits acl on geany (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:14:31 +0000
Subject: [pkgdb] geany: pingou has requested commit
Message-ID: <20090402121411.41913208608@bastion.fedora.phx.redhat.com>

pingou has requested the commit acl on geany (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:14:31 +0000
Subject: [pkgdb] geany: pingou has requested watchbugzilla
Message-ID: <20090402121412.1A99520860F@bastion.fedora.phx.redhat.com>

pingou has requested the watchbugzilla acl on geany (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:14:16 +0000
Subject: [pkgdb] geany: pingou has requested commit
Message-ID: <20090402121416.68F1B2086F3@bastion.fedora.phx.redhat.com>

pingou has requested the commit acl on geany (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From mlichvar at fedoraproject.org  Thu Apr  2 12:19:56 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  2 Apr 2009 12:19:56 +0000 (UTC)
Subject: rpms/rpmreaper/F-10 .cvsignore, 1.4, 1.5 rpmreaper.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090402121956.601AC70120@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/rpmreaper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26459

Modified Files:
	.cvsignore rpmreaper.spec sources 
Log Message:
- update to 0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2008 13:02:30 -0000	1.4
+++ .cvsignore	2 Apr 2009 12:19:26 -0000	1.5
@@ -1 +1 @@
-rpmreaper-0.1.5.tar.gz
+rpmreaper-0.1.6.tar.gz


Index: rpmreaper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-10/rpmreaper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmreaper.spec	19 Sep 2008 13:02:30 -0000	1.4
+++ rpmreaper.spec	2 Apr 2009 12:19:26 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           rpmreaper
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 Summary:        A tool for removing packages from system
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://fedorahosted.org/rpmreaper/
-Source0:        https://fedorahosted.org/releases/r/p/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel rpm-devel
@@ -35,6 +35,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Apr 02 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.1.6-1
+- update to 0.1.6
+
 * Fri Sep 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.5-1
 - update to 0.1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2008 13:02:30 -0000	1.4
+++ sources	2 Apr 2009 12:19:26 -0000	1.5
@@ -1 +1 @@
-650975d54da4f9df4f716a6eabac7520  rpmreaper-0.1.5.tar.gz
+655184ddcb5cdd3a255d89341284fe6e  rpmreaper-0.1.6.tar.gz



From mlichvar at fedoraproject.org  Thu Apr  2 12:24:39 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  2 Apr 2009 12:24:39 +0000 (UTC)
Subject: rpms/rpmreaper/F-9 .cvsignore, 1.4, 1.5 rpmreaper.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090402122439.5A41B70120@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/rpmreaper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27125

Modified Files:
	.cvsignore rpmreaper.spec sources 
Log Message:
- update to 0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2008 13:05:54 -0000	1.4
+++ .cvsignore	2 Apr 2009 12:24:08 -0000	1.5
@@ -1 +1 @@
-rpmreaper-0.1.5.tar.gz
+rpmreaper-0.1.6.tar.gz


Index: rpmreaper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-9/rpmreaper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmreaper.spec	19 Sep 2008 13:05:54 -0000	1.3
+++ rpmreaper.spec	2 Apr 2009 12:24:09 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           rpmreaper
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 Summary:        A tool for removing packages from system
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://fedorahosted.org/rpmreaper/
-Source0:        https://fedorahosted.org/releases/r/p/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel rpm-devel
@@ -35,6 +35,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Apr 02 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.1.6-1
+- update to 0.1.6
+
 * Fri Sep 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 0.1.5-1
 - update to 0.1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmreaper/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2008 13:05:54 -0000	1.4
+++ sources	2 Apr 2009 12:24:09 -0000	1.5
@@ -1 +1 @@
-650975d54da4f9df4f716a6eabac7520  rpmreaper-0.1.5.tar.gz
+655184ddcb5cdd3a255d89341284fe6e  rpmreaper-0.1.6.tar.gz



From sindrepb at fedoraproject.org  Thu Apr  2 12:44:10 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 12:44:10 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel .cvsignore, 1.4,
	1.5 awn-extras-applets.spec, 1.15, 1.16 sources, 1.4, 1.5
Message-ID: <20090402124410.549A270120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29920

Modified Files:
	.cvsignore awn-extras-applets.spec sources 
Log Message:
new upstream release, fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Mar 2008 06:15:46 -0000	1.4
+++ .cvsignore	2 Apr 2009 12:43:40 -0000	1.5
@@ -1 +1 @@
-awn-extras-applets-0.2.6.tar.gz
+awn-extras-applets-0.3.2.1.tar.gz


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awn-extras-applets.spec	2 Apr 2009 11:50:32 -0000	1.15
+++ awn-extras-applets.spec	2 Apr 2009 12:43:40 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -166,7 +166,7 @@
 
 
 %changelog
-* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-1
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-2
 - New upstream release
 - Add devel package
 - Update schemas scriplets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Mar 2008 06:15:46 -0000	1.4
+++ sources	2 Apr 2009 12:43:40 -0000	1.5
@@ -1 +1 @@
-a02a7d82f086db96bca35d7865d2fa03  awn-extras-applets-0.2.6.tar.gz
+54f975f4a9a0798b5cce1b3239ed7b96  awn-extras-applets-0.3.2.1.tar.gz



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:06 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125147.747F3208505@bastion.fedora.phx.redhat.com>

josef has set the commit acl on geany (Fedora devel) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:51:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:51:56 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125158.93A38208555@bastion.fedora.phx.redhat.com>

josef has set the watchbugzilla acl on geany (Fedora 9) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:01 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125201.9B862208505@bastion.fedora.phx.redhat.com>

josef has set the watchcommits acl on geany (Fedora 9) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:24 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125204.52AFE208557@bastion.fedora.phx.redhat.com>

josef has set the commit acl on geany (Fedora 9) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:04 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125206.DE4102084D5@bastion.fedora.phx.redhat.com>

josef has set the commit acl on geany (Fedora 10) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:07 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125207.F2E102086F1@bastion.fedora.phx.redhat.com>

josef has set the watchcommits acl on geany (Fedora 10) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:34 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125214.CB0B1208505@bastion.fedora.phx.redhat.com>

josef has set the watchbugzilla acl on geany (Fedora 10) to Approved for pingou

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:39 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125219.83A932086FE@bastion.fedora.phx.redhat.com>

josef has set the approveacls acl on geany (Fedora devel) to Approved for jgu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:49 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125230.72EB5208602@bastion.fedora.phx.redhat.com>

josef has set the approveacls acl on geany (Fedora 9) to Approved for jgu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From pkgdb at fedoraproject.org  Thu Apr  2 12:52:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 12:52:34 +0000
Subject: [pkgdb] geany had acl change status
Message-ID: <20090402125237.13A63208608@bastion.fedora.phx.redhat.com>

josef has set the approveacls acl on geany (Fedora 10) to Approved for jgu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From rineau at fedoraproject.org  Thu Apr  2 12:55:22 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu,  2 Apr 2009 12:55:22 +0000 (UTC)
Subject: rpms/libQGLViewer/devel libQGLViewer-2.3.1-dbg.patch, NONE,
	1.1 libQGLViewer.spec, 1.2, 1.3
Message-ID: <20090402125522.E91E770120@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/libQGLViewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31318

Modified Files:
	libQGLViewer.spec 
Added Files:
	libQGLViewer-2.3.1-dbg.patch 
Log Message:
* Wed Apr  1 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-8
- Add a patch, so that "-g" flags are not removed.


libQGLViewer-2.3.1-dbg.patch:

--- NEW FILE libQGLViewer-2.3.1-dbg.patch ---
diff -up libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro.dbg libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro
--- libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro.dbg	2009-04-01 16:52:24.000000000 +0200
+++ libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro	2009-04-01 16:52:32.000000000 +0200
@@ -130,10 +130,6 @@ unix|win32-g++ {
     CONFIG -= thread
   }
 
-  # Remove debugging options
-  release:QMAKE_CFLAGS_RELEASE -= -g
-  release:QMAKE_CXXFLAGS_RELEASE -= -g
-
   # Intermediate files are created in an hidden folder
   MOC_DIR = .moc
   OBJECTS_DIR = .obj
diff -up libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro.dbg libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro
--- libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro.dbg	2009-04-01 16:50:42.000000000 +0200
+++ libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro	2009-04-01 16:50:51.000000000 +0200
@@ -144,10 +144,6 @@ unix {
     QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
   }
 
-  # Make much smaller libraries (and packages) by removing debugging informations
-  QMAKE_CFLAGS_RELEASE -= -g
-  QMAKE_CXXFLAGS_RELEASE -= -g
-
   # install header
   include.path = $${INCLUDE_DIR}/QGLViewer
   include.files = $${HEADERS} qglviewer.cw qglviewer_*.qm


Index: libQGLViewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/devel/libQGLViewer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libQGLViewer.spec	30 Mar 2009 21:59:37 -0000	1.2
+++ libQGLViewer.spec	2 Apr 2009 12:54:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libQGLViewer
 Version:        2.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Qt based OpenGL generic 3D viewer library
 
 Group:          System Environment/Libraries
@@ -12,6 +12,10 @@
 # Use abort() instead.
 Patch0:         libQGLViewer-2.3.1-exit.patch
 
+# libQGLViewer .pro files explicitely remove "-g" from compile flags. Make
+# them back.
+Patch1:         libQGLViewer-2.3.1-dbg.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -47,6 +51,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .exit
+%patch1 -p1 -b .dbg
 
 # Fix the encoding of several files, so that they all use utf-8.
 for f in doc/*.html doc/examples/*.html \
@@ -112,6 +117,9 @@
 %doc examples
 
 %changelog
+* Wed Apr  1 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-8
+- Add a patch, so that "-g" flags are not removed.
+
 * Mon Mar 30 2009  <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-7
 - Remove glibc-common from BR:
 



From kyle at fedoraproject.org  Thu Apr  2 13:04:31 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  2 Apr 2009 13:04:31 +0000 (UTC)
Subject: rpms/kernel/devel fix-ppc-debug_kmap_atomic.patch, NONE,
	1.1 kernel.spec, 1.1497, 1.1498
Message-ID: <20090402130431.B734970120@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv402

Modified Files:
	kernel.spec 
Added Files:
	fix-ppc-debug_kmap_atomic.patch 
Log Message:
* Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
- fix-ppc-debug_kmap_atomic.patch: fix build failures on ppc.


fix-ppc-debug_kmap_atomic.patch:

--- NEW FILE fix-ppc-debug_kmap_atomic.patch ---
The following commit breaks PPC builds with CONFIG_HIGHMEM=y

commit f4112de6b679d84bd9b9681c7504be7bdfb7c7d5
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date:   Tue Mar 31 15:23:25 2009 -0700

    mm: introduce debug_kmap_atomic

We get:

 CC      init/main.o
In file included from include/linux/highmem.h:25,
                 from include/linux/pagemap.h:11,
                 from include/linux/mempolicy.h:63,
                 from init/main.c:53:
linux-2.6/arch/powerpc/include/asm/highmem.h: In function 'kmap_atomic_prot':
linux-2.6/arch/powerpc/include/asm/highmem.h:98: error: implicit declaration of function 'debug_kmap_atomic'
In file included from include/linux/pagemap.h:11,
                 from include/linux/mempolicy.h:63,
                 from init/main.c:53:
include/linux/highmem.h: At top level:
include/linux/highmem.h:196: warning: conflicting types for 'debug_kmap_atomic'
include/linux/highmem.h:196: error: static declaration of 'debug_kmap_atomic' follows non-static declaration
linux-2.6/include/asm/highmem.h:98: error: previous implicit declaration of 'debug_kmap_atomic' was here
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---

Should address Akinobu issues w/having this build properly on x86

- k

 include/linux/highmem.h |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 7ff5c55..1fcb712 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -19,8 +19,21 @@ static inline void flush_kernel_dcache_page(struct page *page)
 }
 #endif
 
-#ifdef CONFIG_HIGHMEM
+#include <asm/kmap_types.h>
+
+#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT)
+
+void debug_kmap_atomic(enum km_type type);
+
+#else
 
+static inline void debug_kmap_atomic(enum km_type type)
+{
+}
+
+#endif
+
+#ifdef CONFIG_HIGHMEM
 #include <asm/highmem.h>
 
 /* declarations for linux/mm/highmem.c */
@@ -44,8 +57,6 @@ static inline void *kmap(struct page *page)
 
 #define kunmap(page) do { (void) (page); } while (0)
 
-#include <asm/kmap_types.h>
-
 static inline void *kmap_atomic(struct page *page, enum km_type idx)
 {
 	pagefault_disable();
@@ -187,16 +198,4 @@ static inline void copy_highpage(struct page *to, struct page *from)
 	kunmap_atomic(vto, KM_USER1);
 }
 
-#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT)
-
-void debug_kmap_atomic(enum km_type type);
-
-#else
-
-static inline void debug_kmap_atomic(enum km_type type)
-{
-}
-
-#endif
-
 #endif /* _LINUX_HIGHMEM_H */
-- 
1.5.6.6

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1497
retrieving revision 1.1498
diff -u -r1.1497 -r1.1498
--- kernel.spec	2 Apr 2009 04:04:34 -0000	1.1497
+++ kernel.spec	2 Apr 2009 13:04:01 -0000	1.1498
@@ -599,6 +599,7 @@
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch50: rds-only-on-64-bit-or-x86.patch
+Patch51: fix-ppc-debug_kmap_atomic.patch
 
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
@@ -1103,6 +1104,7 @@
 ApplyPatch linux-2.6-sysrq-c.patch
 
 ApplyPatch rds-only-on-64-bit-or-x86.patch
+ApplyPatch fix-ppc-debug_kmap_atomic.patch
 
 # Architecture patches
 # x86(-64)
@@ -1889,6 +1891,9 @@
 #	                ||     ||
 %changelog
 * Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
+- fix-ppc-debug_kmap_atomic.patch: fix build failures on ppc.
+
+* Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.29-git9
 
 * Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>



From transif at fedoraproject.org  Thu Apr  2 13:06:57 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu,  2 Apr 2009 13:06:57 +0000 (UTC)
Subject: comps/po sk.po,1.19,1.20
Message-ID: <20090402130657.7DCD970120@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv979/po

Modified Files:
	sk.po 
Log Message:
Sending translation for Slovak


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 sk.po
Index: sk.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sk.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sk.po	9 Jan 2009 11:52:42 -0000	1.19
+++ sk.po	2 Apr 2009 13:06:27 -0000	1.20
@@ -6,335 +6,214 @@
 #
 # Marcel Telka <marcel at telka.sk>, 2003, 2004.
 # Pavol ??imo <palo.simo at gmail.com>, 2007.
-# Ondrej ??ulek <feonsu at gmail.com>, 2008.
+# Ondrej ??ulek <feonsu at gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comp-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2009-01-09 13:44+0100\n"
-"Last-Translator: Lubomir Rintel <lkundrak at v3.sk>\n"
-"Language-Team: Slovak <fedora-trans-sk at redhat.com>\n"
+"POT-Creation-Date: 2009-04-02 07:57+0000\n"
+"PO-Revision-Date: 2009-04-02 15:00+0200\n"
+"Last-Translator: Ondrej ??ulek <feonsu at gmail.com>\n"
+"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../comps-f7.xml.in.h:1
-#: ../comps-f8.xml.in.h:1
-#: ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1
-#: ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "Jednoduch?? pracovn?? prostredie, ktor?? dobre pracuje na pomal????ch po????ta??och."
+msgstr ""
+"Jednoduch?? pracovn?? prostredie, ktor?? dobre pracuje na pomal????ch po????ta??och."
 
-#: ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2
-#: ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2
-#: ../comps-f11.xml.in.h:2
-#: ../comps-el4.xml.in.h:1
+#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administr??torsk?? n??stroje"
 
-#: ../comps-f7.xml.in.h:3
-#: ../comps-f8.xml.in.h:3
-#: ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3
-#: ../comps-f11.xml.in.h:3
+#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "Juhoafrick?? podpora"
 
-#: ../comps-f7.xml.in.h:4
-#: ../comps-f8.xml.in.h:4
-#: ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4
-#: ../comps-f11.xml.in.h:4
+#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "Alb??nska podpora"
 
-#: ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5
-#: ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5
-#: ../comps-f11.xml.in.h:6
-#: ../comps-el4.xml.in.h:2
+#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplik??cie"
 
-#: ../comps-f7.xml.in.h:6
-#: ../comps-f8.xml.in.h:6
-#: ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6
-#: ../comps-f11.xml.in.h:7
+#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplik??cie na vykon??vanie r??znych ??loh"
 
-#: ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7
-#: ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7
-#: ../comps-f11.xml.in.h:8
-#: ../comps-el4.xml.in.h:4
+#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arabsk?? podpora"
 
-#: ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8
-#: ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8
-#: ../comps-f11.xml.in.h:9
-#: ../comps-el4.xml.in.h:5
+#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Arm??nska podpora"
 
-#: ../comps-f7.xml.in.h:9
-#: ../comps-f8.xml.in.h:9
-#: ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9
-#: ../comps-f11.xml.in.h:10
+#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "Assamsk?? podpora"
 
-#: ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10
-#: ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10
-#: ../comps-f11.xml.in.h:11
-#: ../comps-el4.xml.in.h:6
+#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "P??sanie a publikovanie"
 
-#: ../comps-f7.xml.in.h:11
-#: ../comps-f8.xml.in.h:11
-#: ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11
-#: ../comps-f11.xml.in.h:12
+#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "Z??klad"
 
-#: ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12
-#: ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12
-#: ../comps-f11.xml.in.h:13
-#: ../comps-el4.xml.in.h:7
+#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Z??klad syst??mu"
 
-#: ../comps-f7.xml.in.h:13
-#: ../comps-f8.xml.in.h:13
-#: ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13
-#: ../comps-f11.xml.in.h:14
+#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "Z??kladn?? podpora pre programovac?? jazyk Ruby."
 
-#: ../comps-f7.xml.in.h:14
-#: ../comps-f8.xml.in.h:14
-#: ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14
-#: ../comps-f11.xml.in.h:15
+#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "Baskick?? podpora"
 
-#: ../comps-f7.xml.in.h:15
-#: ../comps-f8.xml.in.h:15
-#: ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15
-#: ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "Bielorusk?? podpora"
 
-#: ../comps-f7.xml.in.h:16
-#: ../comps-f8.xml.in.h:16
-#: ../comps-f9.xml.in.h:16
[...2732 lines suppressed...]
+
 #~ msgid "Spanish"
 #~ msgstr "??paniel??ina"
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Brazilian Portuguese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v braz??lskej "
 #~ "portugal??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "English language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v angli??tine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "French language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux vo "
 #~ "franc??z??tine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "German language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v nem??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Italian language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v talian??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Spanish language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v ??paniel??ine."
+
 #~ msgid "Japanese"
 #~ msgstr "Japon??ina"
+
 #~ msgid "Korean"
 #~ msgstr "K??rej??ina"
+
 #~ msgid "Simplified Chinese"
 #~ msgstr "Zjednodu??en?? ????n??tina"
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Japanese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v japon??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Korean language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v k??rej??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Simplified Chinese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v "
 #~ "zjednodu??enej ????n??tine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Traditional Chinese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v tradi??nej "
 #~ "????n??tine."
+
 #~ msgid "Traditional Chinese"
 #~ msgstr "Tradi??n?? ????n??tina"
+
 #~ msgid "ppc64 Compatibility Arch Development Support"
 #~ msgstr "Podpora v??voja kompatibiln??ch ppc64 architekt??r"
+
 #~ msgid "Bengali"
 #~ msgstr "Beng??lske"
+
 #~ msgid "Gujarati"
 #~ msgstr "Gujaratsk??"
+
 #~ msgid "Hindi"
 #~ msgstr "Hindsk??"
+
 #~ msgid "Punjabi"
 #~ msgstr "Pand????bske"
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Dokument??cia Red Hat Enterprise Linux 4"
-#~ msgid "Tamil"
-#~ msgstr "Tamilsk??"
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v beng??l??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Gujarati language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v gujarat??ine."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Hindi language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v hindskom "
 #~ "jazyku."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Punjabi language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v pand????bskom "
 #~ "jazyku."
+
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Tamil language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v tamil??ine."
+
 #~ msgid "Red Hat Enterprise Linux Extras"
 #~ msgstr "Red Hat Enterprise Linux Extras"
+
 #~ msgid "Workstation"
 #~ msgstr "Pracovn?? stanica"
+
 #~ msgid "Workstation applications and utilities."
 #~ msgstr "Aplik??cie pre pracovn?? stanice a pomocn?? programy."
+
 #~ msgid "Compatibility Arch"
 #~ msgstr "Architekt??ra kompatibility"
+
 #~ msgid "Compatibility Arch Libraries"
 #~ msgstr "Kni??nice architekt??ry kompatibility"
+
 #~ msgid "Multilib library packages"
 #~ msgstr "Bal??ky kni??nice multilib"
+
 #~ msgid ""
 #~ "Packages which provide functionality for the compatibility architecture."
 #~ msgstr "Tieto bal??ky poskytuj?? podporu pre architekt??ru kompatibility."
@@ -5752,25 +5298,34 @@
 #~ "packagereq> </packagelist> </group> <group> <id>mysql</id> "
 #~ "<_name>Datab??za MySQL</_name> <_description>T??to skupina bal??kov obsahuje "
 #~ "bal??ky vhodn?? pre pou??itie s MySQL."
+
 #~ msgid "Cups"
 #~ msgstr "Cups"
+
 #~ msgid "Cups printing service and drivers to use it."
 #~ msgstr "Tla??ov?? slu??ba cups a ovl??da??e na jej pou??itie."
+
 #~ msgid "SQL Database Server"
 #~ msgstr "Datab??zov?? server SQL"
+
 #~ msgid "Supported Packages"
 #~ msgstr "Podporovan?? bal??ky"
+
 #~ msgid ""
 #~ "These packages include network-based servers such as CIPE, DHCP, and "
 #~ "telnet."
 #~ msgstr "Tieto bal??ky obsahuj?? sie??ov?? servery, napr. CIPE, DHCP a telnet."
+
 #~ msgid "This package group allows you to run an SQL server on the system."
 #~ msgstr "T??to skupina bal??kov v??m umo??n?? spusti?? na po????ta??i SQL server."
+
 #~ msgid "GNOME Desktop"
 #~ msgstr "Pracovn?? plocha GNOME"
+
 #~ msgid ""
 #~ "These packages include network-based servers such as DHCP and telnet."
 #~ msgstr "Tieto bal??ky obsahuj?? sie??ov?? servery, napr. DHCP a telnet."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>sk</langonly> <grouplist> <groupreq>ISO8859-2-support</"
@@ -5785,6 +5340,7 @@
 #~ "requires=\"kdelibs\">kde-i18n-Slovak</packagereq> </packagelist> </group> "
 #~ "<group> <id>slovenian-support</id> <_name>Slovinsk?? podpora</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<packagelist> <packagereq type=\"mandatory\">fonts-KOI8-R</packagereq> "
@@ -5799,4 +5355,3 @@
 #~ "<packagereq type=\"optional\" requires=\"xorg-x11\">fonts-xorg-cyrillic</"
 #~ "packagereq> </packagelist> </group> <group> <id>czech-support</id> "
 #~ "<_name>??esk?? podpora</_name> <_description>"
-



From rineau at fedoraproject.org  Thu Apr  2 13:19:24 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu,  2 Apr 2009 13:19:24 +0000 (UTC)
Subject: rpms/libQGLViewer/F-10 libQGLViewer-2.3.1-dbg.patch, NONE,
	1.1 libQGLViewer.spec, 1.1, 1.2
Message-ID: <20090402131924.B514170120@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/libQGLViewer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2633

Modified Files:
	libQGLViewer.spec 
Added Files:
	libQGLViewer-2.3.1-dbg.patch 
Log Message:
* Wed Apr  1 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-8
- Add a patch, so that "-g" flags are not removed.


libQGLViewer-2.3.1-dbg.patch:

--- NEW FILE libQGLViewer-2.3.1-dbg.patch ---
diff -up libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro.dbg libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro
--- libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro.dbg	2009-04-01 16:52:24.000000000 +0200
+++ libQGLViewer-2.3.1/designerPlugin/designerPlugin.pro	2009-04-01 16:52:32.000000000 +0200
@@ -130,10 +130,6 @@ unix|win32-g++ {
     CONFIG -= thread
   }
 
-  # Remove debugging options
-  release:QMAKE_CFLAGS_RELEASE -= -g
-  release:QMAKE_CXXFLAGS_RELEASE -= -g
-
   # Intermediate files are created in an hidden folder
   MOC_DIR = .moc
   OBJECTS_DIR = .obj
diff -up libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro.dbg libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro
--- libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro.dbg	2009-04-01 16:50:42.000000000 +0200
+++ libQGLViewer-2.3.1/QGLViewer/QGLViewer.pro	2009-04-01 16:50:51.000000000 +0200
@@ -144,10 +144,6 @@ unix {
     QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
   }
 
-  # Make much smaller libraries (and packages) by removing debugging informations
-  QMAKE_CFLAGS_RELEASE -= -g
-  QMAKE_CXXFLAGS_RELEASE -= -g
-
   # install header
   include.path = $${INCLUDE_DIR}/QGLViewer
   include.files = $${HEADERS} qglviewer.cw qglviewer_*.qm


Index: libQGLViewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/F-10/libQGLViewer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libQGLViewer.spec	30 Mar 2009 22:06:04 -0000	1.1
+++ libQGLViewer.spec	2 Apr 2009 13:18:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libQGLViewer
 Version:        2.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Qt based OpenGL generic 3D viewer library
 
 Group:          System Environment/Libraries
@@ -12,6 +12,10 @@
 # Use abort() instead.
 Patch0:         libQGLViewer-2.3.1-exit.patch
 
+# libQGLViewer .pro files explicitely remove "-g" from compile flags. Make
+# them back.
+Patch1:         libQGLViewer-2.3.1-dbg.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -47,6 +51,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .exit
+%patch1 -p1 -b .dbg
 
 # Fix the encoding of several files, so that they all use utf-8.
 for f in doc/*.html doc/examples/*.html \
@@ -112,6 +117,9 @@
 %doc examples
 
 %changelog
+* Wed Apr  1 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-8
+- Add a patch, so that "-g" flags are not removed.
+
 * Mon Mar 30 2009  <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-7
 - Remove glibc-common from BR:
 



From dnovotny at fedoraproject.org  Thu Apr  2 13:34:34 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  2 Apr 2009 13:34:34 +0000 (UTC)
Subject: rpms/mailman/devel mailman-2.1.12-mmcfg.patch, NONE,
	1.1 mailman.spec, 1.80, 1.81
Message-ID: <20090402133434.29D0570120@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6147

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.12-mmcfg.patch 
Log Message:

fix #481446


mailman-2.1.12-mmcfg.patch:

--- NEW FILE mailman-2.1.12-mmcfg.patch ---
diff -up mailman-2.1.12/misc/mailman.in.selinux mailman-2.1.12/misc/mailman.in
--- mailman-2.1.12/misc/mailman.in.selinux	2009-04-02 15:03:19.000000000 +0200
+++ mailman-2.1.12/misc/mailman.in	2009-04-02 15:04:23.000000000 +0200
@@ -84,6 +84,7 @@ prog="mailman"
 function start()
 {
     echo -n $"Starting $prog: "
+    mailman-update-cfg
     daemon $MAILMANCTL -s -q start
     RETVAL=$?
     if [ $RETVAL -eq 0 ]
@@ -98,6 +99,7 @@ function start()
 function stop()
 {
     echo -n $"Shutting down $prog: "
+    mailman-update-cfg
     daemon $MAILMANCTL -q stop
     RETVAL=$?
     if [ $RETVAL -eq 0 ]


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mailman.spec	31 Mar 2009 09:19:59 -0000	1.80
+++ mailman.spec	2 Apr 2009 13:34:03 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -31,6 +31,7 @@
 Patch15: mailman-2.1.12-lctype.patch
 #Patch15: mailman-2.1.11-footer.patch
 Patch16: mailman-2.1.12-privurl.patch
+Patch17: mailman-2.1.12-mmcfg.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -116,6 +117,7 @@
 %patch15 -p1 -b .lctype
 #%%patch15 -p1 -b .footer
 %patch16 -p1 -b .privurl
+%patch17 -p1 -b .mmcfg
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -366,6 +368,9 @@
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Thu Apr 02 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-4
+- fix bz#481446 (Recompile of mailman's config causes SElinux denials)
+
 * Tue Mar 31 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-3
 - fix bz#447784 (List-Archive URL for private archives broken)
 



From roma at fedoraproject.org  Thu Apr  2 13:35:00 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu,  2 Apr 2009 13:35:00 +0000 (UTC)
Subject: rpms/memtest86+/devel import.log,1.2,1.3 memtest86+.spec,1.42,1.43
Message-ID: <20090402133500.EFC2370120@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6092/devel

Modified Files:
	import.log memtest86+.spec 
Log Message:
Not updating grub.conf by default.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Mar 2009 14:46:05 -0000	1.2
+++ import.log	2 Apr 2009 13:34:30 -0000	1.3
@@ -1,2 +1,3 @@
 memtest86+-2_11-4_fc10:HEAD:memtest86+-2.11-4.fc10.src.rpm:1236973348
 memtest86+-2_11-5_fc10:HEAD:memtest86+-2.11-5.fc10.src.rpm:1238510694
+memtest86+-2_11-6_fc10:HEAD:memtest86+-2.11-6.fc10.src.rpm:1238679177


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- memtest86+.spec	31 Mar 2009 14:46:05 -0000	1.42
+++ memtest86+.spec	2 Apr 2009 13:34:30 -0000	1.43
@@ -7,7 +7,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 2.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -19,9 +19,11 @@
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby
+Requires: /sbin/grubby sed
+%if %{with update_grub}
 Requires(preun): coreutils
 Requires(post): coreutils
+%endif
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -33,7 +35,9 @@
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
-Optionally, run 'memtest-setup' to add to your GRUB or lilo boot menu.
+
+Please, run '/usr/sbin/memtest-setup' as root to add 
+the memtest86+ entry to your GRUB or lilo boot menu.
 
 %prep
 %setup -q
@@ -57,24 +61,13 @@
 install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
-%post
 %if %{with update_grub}
-   /usr/sbin/memtest-setup
-%else
-   cat << EOF
-
-   ************************************************
-   * REMINDER: Please update your /etc/grub.conf  *
-   * file and add the memtest86+ boot entry,      *
-   * by running /usr/sbin/memtest-setup as root.  *
-   ************************************************
-
-   EOF
-%endif
+%post -p /usr/sbin/memtest-setup
 
 %preun
 sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -87,6 +80,11 @@
 %{_sbindir}/memtest-setup
 
 %changelog
+* Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
+- grub.conf will not be updated by default. The user
+  will have to add and/or remove memtest86+ entries.
+- No messages printed.
+
 * Mon Mar 31 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-5
 - Changed postun for preun.
 - Calling memtest-setup in case of updating grub.conf



From roma at fedoraproject.org  Thu Apr  2 13:36:30 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu,  2 Apr 2009 13:36:30 +0000 (UTC)
Subject: rpms/memtest86+/F-9 import.log,1.2,1.3 memtest86+.spec,1.39,1.40
Message-ID: <20090402133630.3C9D170120@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743/F-9

Modified Files:
	import.log memtest86+.spec 
Log Message:
Not updating grub.conf by default.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Mar 2009 14:59:10 -0000	1.2
+++ import.log	2 Apr 2009 13:35:59 -0000	1.3
@@ -1,2 +1,3 @@
 memtest86+-2_11-4_fc10:F-9:memtest86+-2.11-4.fc10.src.rpm:1236974130
 memtest86+-2_11-5_fc10:F-9:memtest86+-2.11-5.fc10.src.rpm:1238511494
+memtest86+-2_11-6_fc10:F-9:memtest86+-2.11-6.fc10.src.rpm:1238679330


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/memtest86+.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- memtest86+.spec	31 Mar 2009 14:59:10 -0000	1.39
+++ memtest86+.spec	2 Apr 2009 13:35:59 -0000	1.40
@@ -7,7 +7,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 2.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -19,9 +19,11 @@
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby
+Requires: /sbin/grubby sed
+%if %{with update_grub}
 Requires(preun): coreutils
 Requires(post): coreutils
+%endif
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -33,7 +35,9 @@
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
-Optionally, run 'memtest-setup' to add to your GRUB or lilo boot menu.
+
+Please, run '/usr/sbin/memtest-setup' as root to add 
+the memtest86+ entry to your GRUB or lilo boot menu.
 
 %prep
 %setup -q
@@ -57,24 +61,13 @@
 install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
-%post
 %if %{with update_grub}
-   /usr/sbin/memtest-setup
-%else
-   cat << EOF
-
-   ************************************************
-   * REMINDER: Please update your /etc/grub.conf  *
-   * file and add the memtest86+ boot entry,      *
-   * by running /usr/sbin/memtest-setup as root.  *
-   ************************************************
-
-   EOF
-%endif
+%post -p /usr/sbin/memtest-setup
 
 %preun
 sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -87,6 +80,11 @@
 %{_sbindir}/memtest-setup
 
 %changelog
+* Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
+- grub.conf will not be updated by default. The user
+  will have to add and/or remove memtest86+ entries.
+- No messages printed.
+
 * Mon Mar 31 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-5
 - Changed postun for preun.
 - Calling memtest-setup in case of updating grub.conf



From dwalsh at fedoraproject.org  Thu Apr  2 13:36:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  2 Apr 2009 13:36:47 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.189,
	1.190 libselinux.spec, 1.366, 1.367
Message-ID: <20090402133647.902CD70120@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6945

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Apr 2 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-5
- Fix crash in python


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- libselinux-rhat.patch	29 Mar 2009 15:18:27 -0000	1.189
+++ libselinux-rhat.patch	2 Apr 2009 13:36:45 -0000	1.190
@@ -84,827 +84,6 @@
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/d libselinux-2.0.79/src/d
---- nsalibselinux/src/d	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.79/src/d	2009-03-27 11:32:04.000000000 -0400
-@@ -0,0 +1,801 @@
-+
-+%exception is_selinux_enabled {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception is_selinux_mls_enabled {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getcon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getcon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setcon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setcon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getpidcon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getpidcon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getprevcon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getprevcon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getexeccon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getexeccon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setexeccon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setexeccon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getfscreatecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getfscreatecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setfscreatecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setfscreatecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getkeycreatecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getkeycreatecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setkeycreatecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setkeycreatecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getsockcreatecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getsockcreatecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setsockcreatecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setsockcreatecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getfilecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getfilecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception lgetfilecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception lgetfilecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception fgetfilecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception fgetfilecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setfilecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception setfilecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception lsetfilecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception lsetfilecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception fsetfilecon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception fsetfilecon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getpeercon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getpeercon_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_av {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_av_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_create {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_create_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_relabel {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_relabel_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_member {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_member_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_user {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_compute_user_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_load_policy {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_get_initial_context {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_get_initial_context_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_mkload_policy {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_init_load_policy {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_set_boolean_list {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_load_booleans {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_check_context {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_check_context_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_canonicalize_context {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_canonicalize_context_raw {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_getenforce {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_setenforce {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_disable {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_policyvers {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_get_boolean_names {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_get_boolean_pending {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_get_boolean_active {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_set_boolean {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_commit_booleans {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception security_av_string {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception matchpathcon_init {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception matchpathcon_init_prefix {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception matchpathcon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception matchpathcon_index {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception matchpathcon_filespec_add {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception matchmediacon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_getenforcemode {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_getpolicytype {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_check_passwd_access {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception checkPasswdAccess {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_check_securetty_context {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception rpm_execcon {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception is_context_customizable {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_trans_to_raw_context {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_raw_to_trans_context {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception selinux_raw_context_to_color {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getseuserbyname {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-+
-+%exception getseuser {
-+   
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.h libselinux-2.0.79/src/exception.h
---- nsalibselinux/src/exception.h	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.79/src/exception.h	2009-03-27 11:32:14.000000000 -0400
-@@ -0,0 +1,12 @@
-+function except() {
-+echo "
-+%exception $1 {
-+  $action 
-+  if (result < 0) {
-+     PyErr_SetFromErrno(PyExc_OSError);
-+     return NULL;
-+  }
-+}
-+"
-+}
-+for i in `grep "extern *int" ../include/selinux/selinux.h | awk '{ print $3 }' | cut -d '(' -f 1`; do except $i ; done 
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.79/src/exception.sh
 --- nsalibselinux/src/exception.sh	1969-12-31 19:00:00.000000000 -0500
 +++ libselinux-2.0.79/src/exception.sh	2009-03-27 14:20:10.000000000 -0400
@@ -3404,7 +2583,7 @@
 Binary files nsalibselinux/src/selinux.pyc and libselinux-2.0.79/src/selinux.pyc differ
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.79/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2009-03-12 08:48:48.000000000 -0400
-+++ libselinux-2.0.79/src/selinuxswig.i	2009-03-29 11:15:11.000000000 -0400
++++ libselinux-2.0.79/src/selinuxswig.i	2009-04-02 09:35:01.000000000 -0400
 @@ -4,11 +4,14 @@
  
  %module selinux
@@ -3423,24 +2602,7 @@
  %}
  %apply int *OUTPUT { int *enforce };
  %apply int *OUTPUT { size_t * };
-@@ -47,7 +50,15 @@
- %ignore set_matchpathcon_printf;
- %ignore set_matchpathcon_invalidcon;
- %ignore set_matchpathcon_canoncon;
--
-+%ignore set_selinuxmnt; 
-+%ignore avc_memory_callback;
-+%ignore avc_log_callback;
-+%ignore avc_thread_callback;
-+%ignore avc_lock_callback;
-+%ignore selinux_callback;
-+%ignore selinux_get_callback;
-+%ignore selinux_set_callback;
-+%ignore print_access_vector;
- %ignore avc_add_callback;
- 
- /* Ignore netlink stuff for now */
-@@ -55,8 +66,11 @@
+@@ -55,8 +58,11 @@
  %ignore avc_netlink_release_fd;
  %ignore avc_netlink_check_nb;
  
@@ -3457,7 +2619,7 @@
 +%include "../include/selinux/selinux.h"
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.79/src/selinuxswig_python.i
 --- nsalibselinux/src/selinuxswig_python.i	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.79/src/selinuxswig_python.i	2009-03-27 14:07:34.000000000 -0400
++++ libselinux-2.0.79/src/selinuxswig_python.i	2009-04-01 10:14:50.000000000 -0400
 @@ -21,6 +21,15 @@
                               map(restorecon, [os.path.join(dirname, fname)
                                                for fname in fnames]), None)
@@ -3474,17 +2636,12 @@
  %}
  
  /* security_get_boolean_names() typemap */
-@@ -150,4 +159,10 @@
+@@ -150,4 +159,5 @@
  	free($1);
  }
  
 +%include "selinuxswig_exception.i"
  %include "selinuxswig.i"
-+
-+
-+
-+
-+
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.79/src/selinuxswig_wrap.c
 --- nsalibselinux/src/selinuxswig_wrap.c	2009-03-06 14:41:45.000000000 -0500
 +++ libselinux-2.0.79/src/selinuxswig_wrap.c	2009-03-27 16:31:56.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- libselinux.spec	29 Mar 2009 15:18:28 -0000	1.366
+++ libselinux.spec	2 Apr 2009 13:36:47 -0000	1.367
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.79
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -164,6 +164,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Thu Apr 2 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-5
+- Fix crash in python
+
 * Sun Mar 29 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-4
 - Add back in additional interfaces
 



From ltinkl at fedoraproject.org  Thu Apr  2 13:41:22 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  2 Apr 2009 13:41:22 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.76,1.77
Message-ID: <20090402134122.7537570120@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7511

Modified Files:
	kde-l10n.spec 
Log Message:
fix sk filelist



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kde-l10n.spec	2 Apr 2009 10:52:57 -0000	1.76
+++ kde-l10n.spec	2 Apr 2009 13:40:52 -0000	1.77
@@ -1268,8 +1268,8 @@
 %files Slovak
 %defattr(-,root,root)
 %lang(sk) %{_datadir}/locale/sk/*
-%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
-%lang(sk) %{_kde4_appsdir}/klettres/sk
+#%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
+#%lang(sk) %{_kde4_appsdir}/klettres/sk
 
 %files Slovenian
 %defattr(-,root,root)



From roma at fedoraproject.org  Thu Apr  2 13:44:18 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu,  2 Apr 2009 13:44:18 +0000 (UTC)
Subject: rpms/memtest86+/F-10 import.log,1.2,1.3 memtest86+.spec,1.39,1.40
Message-ID: <20090402134418.36A7170120@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8038/F-10

Modified Files:
	import.log memtest86+.spec 
Log Message:
Not updating grub.conf by default.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Mar 2009 15:00:40 -0000	1.2
+++ import.log	2 Apr 2009 13:43:47 -0000	1.3
@@ -1,2 +1,3 @@
 memtest86+-2_11-4_fc10:F-10:memtest86+-2.11-4.fc10.src.rpm:1236974259
 memtest86+-2_11-5_fc10:F-10:memtest86+-2.11-5.fc10.src.rpm:1238511600
+memtest86+-2_11-6_fc10:F-10:memtest86+-2.11-6.fc10.src.rpm:1238679556


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/memtest86+.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- memtest86+.spec	31 Mar 2009 15:00:40 -0000	1.39
+++ memtest86+.spec	2 Apr 2009 13:43:47 -0000	1.40
@@ -7,7 +7,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 2.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -19,9 +19,11 @@
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby
+Requires: /sbin/grubby sed
+%if %{with update_grub}
 Requires(preun): coreutils
 Requires(post): coreutils
+%endif
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -33,7 +35,9 @@
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
-Optionally, run 'memtest-setup' to add to your GRUB or lilo boot menu.
+
+Please, run '/usr/sbin/memtest-setup' as root to add 
+the memtest86+ entry to your GRUB or lilo boot menu.
 
 %prep
 %setup -q
@@ -57,24 +61,13 @@
 install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
-%post
 %if %{with update_grub}
-   /usr/sbin/memtest-setup
-%else
-   cat << EOF
-
-   ************************************************
-   * REMINDER: Please update your /etc/grub.conf  *
-   * file and add the memtest86+ boot entry,      *
-   * by running /usr/sbin/memtest-setup as root.  *
-   ************************************************
-
-   EOF
-%endif
+%post -p /usr/sbin/memtest-setup
 
 %preun
 sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -87,6 +80,11 @@
 %{_sbindir}/memtest-setup
 
 %changelog
+* Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
+- grub.conf will not be updated by default. The user
+  will have to add and/or remove memtest86+ entries.
+- No messages printed.
+
 * Mon Mar 31 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-5
 - Changed postun for preun.
 - Calling memtest-setup in case of updating grub.conf



From mhlavink at fedoraproject.org  Thu Apr  2 13:44:33 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu,  2 Apr 2009 13:44:33 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel .cvsignore, 1.13,
	1.14 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.2,
	1.3 cyrus-imapd.spec, 1.51, 1.52 sources, 1.15, 1.16
Message-ID: <20090402134433.115ED70120@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8111

Modified Files:
	.cvsignore cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd.spec sources 
Log Message:
update to 2.3.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Jan 2009 19:26:23 -0000	1.13
+++ .cvsignore	2 Apr 2009 13:44:02 -0000	1.14
@@ -1,3 +1,2 @@
-cyrus-imapd-2.3.13.tar.gz
-cyrus-imapd-2.3.13.tar.gz.sig
+cyrus-imapd-2.3.14.tar.gz
 cyrus_sharedbackup-0.1.tar.gz

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:

Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	13 Jan 2009 19:26:23 -0000	1.2
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	2 Apr 2009 13:44:02 -0000	1.3
@@ -1671,7 +1671,7 @@
  /* current namespace */
  static struct namespace lmtpd_namespace;
  
-@@ -976,6 +978,86 @@
+@@ -976,6 +978,86 @@ void shut_down(int code)
      exit(code);
  }
  
@@ -1756,7 +1756,7 @@
 +
 +
  static int verify_user(const char *user, const char *domain, char *mailbox,
- 		       long quotacheck, struct auth_state *authstate)
+ 		       quota_t quotacheck, struct auth_state *authstate)
  {
 @@ -1019,6 +1101,15 @@
  	 */


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cyrus-imapd.spec	1 Apr 2009 10:20:08 -0000	1.51
+++ cyrus-imapd.spec	2 Apr 2009 13:44:02 -0000	1.52
@@ -1,7 +1,6 @@
-%define upstream_ver 2.3.13
 Name: cyrus-imapd
-Version: 2.3.13
-Release: 5%{?dist}
+Version: 2.3.14
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -97,8 +96,7 @@
 #Packager: Simon Matter <simon.matter at invoca.ch>
 #Vendor: Invoca Systems
 #Distribution: Invoca Linux Server
-Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{upstream_ver}.tar.gz
-Source1: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{upstream_ver}.tar.gz.sig
+Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
 #Source2: http://ftp.gnu.org/gnu/autoconf/autoconf-%{_acversion}.tar.gz
 Source3: cyrus-deliver-wrapper.c
 Source4: cyrus-user-procmailrc.template
@@ -798,7 +796,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.3.13-5
+* Thu Apr 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-1
+- updated to 2.3.14
+
+* Wed Apr 01 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.3.13-5
 - fix unowned directory (#483336).
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.13-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Jan 2009 19:26:24 -0000	1.15
+++ sources	2 Apr 2009 13:44:02 -0000	1.16
@@ -1,3 +1,2 @@
-7dc48324c3a99e210bf777ea74aae694  cyrus-imapd-2.3.13.tar.gz
-6b58bb8dd2c47af02b45c5a426b1335c  cyrus-imapd-2.3.13.tar.gz.sig
+1030d4d9d04036b2fb9830165723908e  cyrus-imapd-2.3.14.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz



From dnovotny at fedoraproject.org  Thu Apr  2 13:46:06 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  2 Apr 2009 13:46:06 +0000 (UTC)
Subject: rpms/mailman/F-10 mailman-2.1.11-mmcfg.patch, NONE,
	1.1 mailman-update-cfg, NONE, 1.1 mailman.spec, 1.74, 1.75
Message-ID: <20090402134606.B4D0870120@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/mailman/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8477

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.11-mmcfg.patch mailman-update-cfg 
Log Message:

fix #481446


mailman-2.1.11-mmcfg.patch:

--- NEW FILE mailman-2.1.11-mmcfg.patch ---
diff -up mailman-2.1.11/misc/mailman.in.selinux mailman-2.1.11/misc/mailman.in
--- mailman-2.1.11/misc/mailman.in.selinux	2009-04-02 15:03:19.000000000 +0200
+++ mailman-2.1.11/misc/mailman.in	2009-04-02 15:04:23.000000000 +0200
@@ -84,6 +84,7 @@ prog="mailman"
 function start()
 {
     echo -n $"Starting $prog: "
+    mailman-update-cfg
     daemon $MAILMANCTL -s -q start
     RETVAL=$?
     if [ $RETVAL -eq 0 ]
@@ -98,6 +99,7 @@ function start()
 function stop()
 {
     echo -n $"Shutting down $prog: "
+    mailman-update-cfg
     daemon $MAILMANCTL -q stop
     RETVAL=$?
     if [ $RETVAL -eq 0 ]


--- NEW FILE mailman-update-cfg ---
#!/usr/bin/python
import py_compile

py_compile.compile("/usr/lib/mailman/Mailman/mm_cfg.py")


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/F-10/mailman.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mailman.spec	29 Oct 2008 07:53:15 -0000	1.74
+++ mailman.spec	2 Apr 2009 13:45:36 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -12,6 +12,7 @@
 Source5: mailman.INSTALL.REDHAT.in
 Source6: mailman-crontab-edit
 Source7: mailman-migrate-fhs
+Source8: mailman-update-cfg
 
 Patch1: mailman-2.1-multimail.patch
 Patch2: mailman-2.1-build.patch
@@ -28,6 +29,7 @@
 Patch13: mailman-2.1.9-unicode.patch
 Patch14: mailman-2.1.11-fhsinit.patch
 Patch15: mailman-2.1.11-footer.patch
+Patch16: mailman-2.1.11-mmcfg.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -111,6 +113,7 @@
 %patch13 -p1 -b .unicode
 %patch14 -p1 -b .fhsinit
 %patch15 -p1 -b .footer
+%patch16 -p1 -b .mmcfg
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -236,6 +239,10 @@
 install -m755 -d $RPM_BUILD_ROOT%{docdir}/admin
 cp -r %{mmbuilddir}/doc $RPM_BUILD_ROOT%{docdir}/admin
 
+#install the script for updating the config (bz#481446)
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}
+
 # remove dir/files from $RPM_BUILD_ROOT that we aren't shipping
 rm -rf $RPM_BUILD_ROOT%{varmmdir}/icons
 
@@ -354,8 +361,12 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 %attr(0644,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/cron.d/mailman
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
+%attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Thu Apr 02 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.11-5
+- fix bz#481446 (Recompile of mailman's config causes SElinux denials)
+
 * Wed Oct 29 2008 Daniel Novotny <dnovotny at redhat.com> 3:2.1.11-4
   fix #460820 - msg_footer gets its trailing spaces trimmed
 



From langel at fedoraproject.org  Thu Apr  2 13:50:36 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu,  2 Apr 2009 13:50:36 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk-pulsejava.patch,
	NONE, 1.1 java-1.6.0-openjdk-lcms.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.105, 1.106
Message-ID: <20090402135036.A6B7170120@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9712

Modified Files:
	java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-pulsejava.patch 
Log Message:
* Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-14.b14
- Added java-1.6.0-openjdk-pulsejava.patch.
- Updated release.
- Updated java-1.6.0-openjdk-lcms.patch.
- Resolves: rhbz#492367
- Resolves: rhbz#493276



java-1.6.0-openjdk-pulsejava.patch:

--- NEW FILE java-1.6.0-openjdk-pulsejava.patch ---
--- oldPulseAudioSourceDataLine.java	2009-03-31 11:47:13.000000000 -0400
+++ pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	2009-03-31 11:51:19.000000000 -0400
@@ -151,19 +151,15 @@
 			throw new IllegalArgumentException(
 					"amount of data to write does not represent an integral number of frames");
 		}
+		
 		if (length < 0) {
-			throw new IllegalArgumentException("length is negative");
+		    throw new IllegalArgumentException("length is negative");
 		}
-
-		if (offset < 0) {
-			throw new ArrayIndexOutOfBoundsException("offset is negative: "
-					+ offset);
-		}
-
-		if (length + offset > data.length) {
+		
+		if (length < 0 || offset < 0 || offset > data.length - length) {
 			throw new ArrayIndexOutOfBoundsException(
-					"writing data beyond the length of the array: "
-							+ (length + offset));
+					"Overflow condition: buffer.length=" + data.length + 
+							" offset= " + offset + " length=" + length );
 		}
 
 		int position = offset;
--- oldPulseAudioTargetDataLine.java	2009-03-31 11:47:19.000000000 -0400
+++ pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	2009-03-31 11:47:32.000000000 -0400
@@ -156,10 +156,10 @@
 		if (length < 0) {
 			throw new IllegalArgumentException("length is negative");
 		}
-
-		if (length + offset > data.length) {
-			throw new ArrayIndexOutOfBoundsException("index: "
-					+ (length + offset) + " array size: " + data.length);
+		
+		if ( offset < 0 || offset > data.length - length) {
+			throw new ArrayIndexOutOfBoundsException("array size: " + data.length
+					+ " offset:" + offset + " length:" + length );
 		}
 
 		/* everything ok */

java-1.6.0-openjdk-lcms.patch:

Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-lcms.patch	24 Mar 2009 18:44:25 -0000	1.2
+++ java-1.6.0-openjdk-lcms.patch	2 Apr 2009 13:50:36 -0000	1.3
@@ -1,6 +1,6 @@
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-24 14:11:33.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -79,9 +79,9 @@
  }
  
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-24 14:16:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -118,9 +118,9 @@
  #else
      VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
      MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-24 14:17:09.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -285,8 +285,6 @@
 +        const char *id;
 +        WRITEMODE as;
 +    } PROPERTY;
-+
-+static PROPERTY PredefinedProperties[] = {
  
 -        "NUMBER_OF_FIELDS",    // Required - NUMBER OF FIELDS
 -        "NUMBER_OF_SETS",      // Required - NUMBER OF SETS
@@ -299,6 +297,9 @@
 -        "MANUFACTURE",         // Some broken Fuji targets does store this value
 -        "PROD_DATE",           // Identifies year and month of production of the target in the form yyyy:mm.
 -        "SERIAL",              // Uniquely identifies individual physical target.
++static PROPERTY PredefinedProperties[] = {
+ 
+-        "MATERIAL",            // Identifies the material on which the target was produced using a code
 +        {"NUMBER_OF_FIELDS", WRITE_UNCOOKED},    // Required - NUMBER OF FIELDS
 +        {"NUMBER_OF_SETS",   WRITE_UNCOOKED},    // Required - NUMBER OF SETS
 +        {"ORIGINATOR",       WRITE_STRINGIFY},   // Required - Identifies the specific system, organization or individual that created the data file.
@@ -310,8 +311,7 @@
 +        {"MANUFACTURE",      WRITE_STRINGIFY},   // Some broken Fuji targets does store this value
 +        {"PROD_DATE",        WRITE_STRINGIFY},   // Identifies year and month of production of the target in the form yyyy:mm.
 +        {"SERIAL",           WRITE_STRINGIFY},   // Uniquely identifies individual physical target.
- 
--        "MATERIAL",            // Identifies the material on which the target was produced using a code
++
 +        {"MATERIAL",         WRITE_STRINGIFY},   // Identifies the material on which the target was produced using a code
                                 // uniquely identifying th e material. This is intend ed to be used for IT8.7
                                 // physical targets only (i.e . IT8.7/1 a nd IT8.7/2).
@@ -337,8 +337,7 @@
 -                               // measurement. Allowed values are ?black?, ?white?, or "na".
 +        {"SAMPLE_BACKING",   WRITE_STRINGIFY},   // Identifies the backing material used behind the sample during
 +                               // measurement. Allowed values are ?black?, ?white?, or {"na".
- 
--        "CHISQ_DOF"            // Degrees of freedom associated with the Chi squared statistic
++
 +        {"CHISQ_DOF",        WRITE_STRINGIFY},   // Degrees of freedom associated with the Chi squared statistic
 +
 +//    new in recent specs:
@@ -372,7 +371,8 @@
 +       {"TARGET_TYPE",        WRITE_STRINGIFY},  // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc.
 +
 +       {"COLORANT",           WRITE_STRINGIFY},  // Identifies the colorant(s) used in creating the target.
-+
+ 
+-        "CHISQ_DOF"            // Degrees of freedom associated with the Chi squared statistic
 +       {"TABLE_DESCRIPTOR",   WRITE_STRINGIFY},  // Describes the purpose or contents of a data table.
 +
 +       {"TABLE_NAME",         WRITE_STRINGIFY}   // Provides a short name for a data table.
@@ -408,7 +408,7 @@
          "STDEV_B",        // Standard deviation of b*
          "STDEV_DE",       // Standard deviation of CIE dE
          "CHI_SQD_PAR"};   // The average of the standard deviations of L*, a* and b*. It is
-@@ -397,9 +458,13 @@
+@@ -397,57 +458,119 @@
  
  #define NUMPREDEFINEDSAMPLEID (sizeof(PredefinedSampleID)/sizeof(char *))
  
@@ -423,8 +423,6 @@
  {
          return (c == ' ') || (c == '\t') || (c == '\r');
  }
-@@ -405,49 +470,107 @@
- }
  
  // Checks whatever if c is a valid identifier char
 -
@@ -494,7 +492,7 @@
 +    return TRUE;
 +}
 +
- 
++
 +// Make sure no exploit is being even tried
 +
 +static
@@ -506,7 +504,7 @@
 +    return str;
 +}
 +
-+
+ 
 +// Syntax error
  static
 -BOOL SynError(LPIT8 it8, const char *Txt, ...)
@@ -591,18 +589,18 @@
 +                if(_cmsMakePath(it8->str, it8->FileStack[it8->IncludeSP]->FileName, FileNest->FileName) == FALSE)
 +                {
 +                    SynError(it8, "File path too long");
-+                        return;
-+                }
-+
+                         return;
+                 }
+ 
+-                it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
 +                FileNest->Stream = fopen(FileNest->FileName, "rt");
 +                if (FileNest->Stream == NULL) {
 +
 +                        SynError(it8, "File %s not found", FileNest->FileName);
-                         return;
-                 }
++                        return;
++                }
 +                it8->IncludeSP++;
- 
--                it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
++
                  it8 ->ch = ' ';
                  InSymbol(it8);
      }
@@ -1564,9 +1562,9 @@
  void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
  {
      LPIT8 it8 = (LPIT8) hIT8;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-24 14:17:18.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1592,9 +1590,9 @@
 +
 +
 +      
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-24 14:17:24.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1624,9 +1622,9 @@
                strcat(Buffer1, Buffer2);
                MessageBox(NULL, Buffer1, "Little cms",
                                            MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-24 14:17:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1771,9 +1769,9 @@
  
  
      if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-24 14:17:50.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1875,9 +1873,9 @@
  
      }
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-24 14:17:59.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1914,9 +1912,9 @@
  
          f = ((Value - b) / a);
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-24 14:18:22.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1964,23 +1962,23 @@
 +      if (len == 0) {
 +          return 0;
 +      }
- 
--     if (ResData -> Pointer + len > ResData -> Size){
++
 +      if (len / size != count) {
 +          cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with count / size.");
 +          return 0;
 +      }
- 
--         len = (ResData -> Size - ResData -> Pointer);
--         cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
++
 +      if (extent < len || extent < ResData -> Pointer) {
 +          cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with len.");
 +          return 0;
 +      } 
-+
+ 
+-     if (ResData -> Pointer + len > ResData -> Size){
 +      if (ResData -> Pointer + len > ResData -> Size) {
  
-+         len = (ResData -> Size - ResData -> Pointer);
+          len = (ResData -> Size - ResData -> Pointer);
+-         cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
+-
 +         cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
 +         return 0;
       }
@@ -2293,7 +2291,7 @@
      _cmsInitTag(Icc, sig, sizeof(cmsNAMEDCOLORLIST) + (nc ->nColors - 1) * sizeof(cmsNAMEDCOLOR), nc);
 -    return FALSE;
 +    return TRUE;
- }
++}
 +
 +
 +LCMSBOOL LCMSEXPORT _cmsAddChromaticAdaptationTag(cmsHPROFILE hProfile, icTagSignature sig, const cmsCIEXYZ* mat)
@@ -2303,12 +2301,12 @@
 +    _cmsInitTag(Icc, sig, 3*sizeof(cmsCIEXYZ), mat);
 +    return TRUE;
 +
-+}
+ }
 +
 +
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-24 14:18:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -2476,7 +2474,7 @@
  
              NewLUT -> T = PtrW;
              NewLUT -> Tsize = (unsigned int) (nTabSize * sizeof(WORD));
-@@ -589,12 +628,12 @@
+@@ -589,25 +628,37 @@
  
                       *PtrW++ = TO16_TAB(Temp[i]);
              }
@@ -2491,10 +2489,6 @@
         }
  
  
-@@ -598,16 +637,28 @@
-        }
- 
- 
 -
         // Copy output tables
  
@@ -2985,14 +2979,15 @@
  
 -    case icSigLut8Type:    ReadLUT8(Icc, NewLUT, sig); break;
 -    case icSigLut16Type:   ReadLUT16(Icc, NewLUT);     break;
+-
+-    case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
+-    case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
 +    case icSigLut8Type:    if (!ReadLUT8(Icc, NewLUT, sig)) {
 +                                cmsFreeLUT(NewLUT);
 +                                return NULL;
 +                           }
 +                           break;
- 
--    case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
--    case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
++
 +    case icSigLut16Type:   if (!ReadLUT16(Icc, NewLUT)) {
 +                                cmsFreeLUT(NewLUT);
 +                                return NULL;
@@ -4284,9 +4279,9 @@
 -  return TRUE;
 -}
 -
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-24 14:18:49.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4442,9 +4437,9 @@
                                                         &Lut -> In16params);
                Lut ->wFlags &= ~LUT_HASTL1;
             }
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-24 14:19:12.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4505,9 +4500,9 @@
  }
  
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-24 14:19:17.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4569,9 +4564,9 @@
  {
          MAT3 m, a_1;
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-24 14:19:23.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4630,9 +4625,9 @@
  {
      _LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-24 14:19:30.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-26 15:13:30.000000000 -0400
 @@ -28,7 +28,7 @@
  // file:
  //
@@ -4814,9 +4809,9 @@
                              break;
  
                       default:;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-24 14:19:46.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4826,9 +4821,9 @@
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-24 14:19:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5004,14 +4999,14 @@
  
 -        if (lIsAbsolute) {
 +            cmsCIEXYZ White;
-+
-+            cmsTakeMediaWhitePoint(&White, hProfile);
  
 -            // For absolute colorimetric intent, do nothing
-+            Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
-+            Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
++            cmsTakeMediaWhitePoint(&White, hProfile);
  
 -            Writef(m, "%% Absolute colorimetric -- no transformation\n"
++            Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
++            Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
++
 +            Writef(m, "%% Absolute colorimetric -- encode to relative to maximize LUT usage\n"
                        "/TransformPQR [\n"
 -                      "{exch pop exch pop exch pop exch pop} bind dup dup]\n");
@@ -5190,9 +5185,9 @@
  
      // Finally, return used byte count
      return dwBytesUsed;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-24 14:20:03.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5302,9 +5297,9 @@
  {
  
         WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-24 14:20:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5457,9 +5452,9 @@
  
         Lut -> InputChan = 3;
         Lut -> OutputChan = 1;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-24 14:20:20.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5614,9 +5609,9 @@
      if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
              (cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
              (cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-24 14:20:26.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-26 15:18:47.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5652,7 +5647,27 @@
         cmsTakeIluminant(&Illuminant, hProfile);
  
         if (cmsGetPCS(hProfile) == icSigLabData) {
-@@ -801,7 +802,7 @@
+@@ -688,6 +689,9 @@
+                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
+                 FromLstarToXYZ(GrayTRC, Shapes1);
+ 
++		if (GrayTRC == NULL)
++		  return NULL;		
++
+                 // Reversing must be done after curve translation
+ 
+                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
+@@ -703,6 +707,9 @@
+ 
+                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
+ 
++                if (GrayTRC == NULL)
++                  return NULL;
++
+                 Shapes[0] = cmsDupGamma(GrayTRC);
+                 Shapes[1] = cmsDupGamma(GrayTRC);
+                 Shapes[2] = cmsDupGamma(GrayTRC);
+@@ -801,7 +808,7 @@
  // This function builds a transform matrix chaining parameters
  
  static
@@ -5661,7 +5676,7 @@
  {
         MAT3 From, To, ToInv, Transfer;
         LPGAMMATABLE In[3], InverseOut[3];
-@@ -838,6 +839,11 @@
+@@ -838,6 +845,11 @@
          InverseOut[1] = cmsReadICCGammaReversed(p -> OutputProfile, icSigGreenTRCTag);
          InverseOut[2] = cmsReadICCGammaReversed(p -> OutputProfile, icSigBlueTRCTag);
  
@@ -5673,7 +5688,7 @@
          p -> SmeltMatShaper = cmsAllocMatShaper2(&Transfer, In, InverseOut, MATSHAPER_ALLSMELTED);
  
          cmsFreeGammaTriple(In);
-@@ -1029,7 +1035,7 @@
+@@ -1029,7 +1041,7 @@
  // Check colorspace
  
  static
@@ -5682,7 +5697,7 @@
  {
         int Space = T_COLORSPACE(dwFormat);
  
-@@ -1049,10 +1055,10 @@
+@@ -1049,10 +1061,10 @@
  {
      // Allocate needed memory
  
@@ -5695,7 +5710,7 @@
            return NULL;
      }
  
-@@ -1269,10 +1275,10 @@
+@@ -1269,10 +1281,10 @@
          else {
                  // Can we optimize matrix-shaper only transform?
  
@@ -5710,7 +5725,16 @@
                         (p -> EntryColorSpace == icSigRgbData) &&
                         (p -> ExitColorSpace == icSigRgbData) &&
                         !(p -> dwOriginalFlags & cmsFLAGS_BLACKPOINTCOMPENSATION)) {
-@@ -1553,7 +1559,8 @@
+@@ -1335,7 +1347,7 @@
+                      p -> ToDevice = PCStoShaperMatrix;
+                      p -> OutMatShaper = cmsBuildOutputMatrixShaper(p->OutputProfile);
+ 
+-                     if (!p -> OutMatShaper) {
++                     if (!p || !p -> OutMatShaper) {
+                             cmsSignalError(LCMS_ERRC_ABORTED, "profile is unsuitable for output");
+                             return NULL;
+                             }
+@@ -1553,7 +1565,8 @@
                      DeviceLink = _cmsPrecalculateDeviceLink((cmsHTRANSFORM) p, dwFlags);
                 }
  
@@ -5720,7 +5744,7 @@
  
                     GamutCheck = _cmsPrecalculateGamutCheck((cmsHTRANSFORM) p);
                 }
-@@ -1668,7 +1675,7 @@
+@@ -1668,7 +1681,7 @@
  
             LCMS_FREE_LOCK(&p->rwlock);
  
@@ -5729,7 +5753,7 @@
  }
  
  
-@@ -1704,7 +1711,7 @@
+@@ -1704,7 +1717,7 @@
  
  // Returns TRUE if the profile is implemented as matrix-shaper
  
@@ -5738,7 +5762,7 @@
  {
      switch (cmsGetColorSpace(hProfile)) {
  
-@@ -1728,7 +1735,7 @@
+@@ -1728,7 +1741,7 @@
  }
  
  
@@ -5747,7 +5771,7 @@
                                                  int Intent, int UsedDirection)
  {
  
-@@ -1774,6 +1781,16 @@
+@@ -1774,6 +1787,16 @@
  }
  
  
@@ -5764,7 +5788,7 @@
  // A multiprofile transform does chain several profiles into a single
  // devicelink. It couls also be used to merge named color profiles into
  // a single database.
-@@ -1805,10 +1822,16 @@
+@@ -1805,10 +1828,16 @@
      // There is a simple case with just two profiles, try to catch it in order of getting
      // black preservation to work on this function, at least with two profiles.
  
@@ -5783,7 +5807,29 @@
                     return cmsCreateTransform(hProfiles[0], dwInput, hProfiles[1], dwOutput, Intent, dwFlags);
      }
  
-@@ -1984,6 +2007,14 @@
+@@ -1897,6 +1926,7 @@
+ 
+         ColorSpace = ColorSpaceIn;
+ 
++	Transforms[i] = NULL;
+ 
+         if (ColorSpace == CurrentColorSpace) {
+ 
+@@ -1946,7 +1976,12 @@
+                 goto ErrorCleanup;
+         }
+ 
+-        CurrentColorSpace = ColorSpaceOut;
++	if (Transforms[i] == NULL) {
++                cmsSignalError(LCMS_ERRC_ABORTED, "cmsCreateMultiprofileTransform: Invalid profile");
++                goto ErrorCleanup;
++        }
++
++	CurrentColorSpace = ColorSpaceOut;
+ 
+     }
+ 
+@@ -1984,6 +2019,14 @@
      if (hLab) cmsCloseProfile(hLab);
      if (hXYZ) cmsCloseProfile(hXYZ);
  
@@ -5798,9 +5844,9 @@
      if ((Intent != INTENT_ABSOLUTE_COLORIMETRIC) &&
          !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP))
                              _cmsFixWhiteMisalignment(p);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-24 14:21:56.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-26 15:13:30.000000000 -0400
 @@ -1,5 +1,8 @@
 +/* Header file guard bands */
 +#ifndef ICC_H
@@ -5864,21 +5910,32 @@
  typedef uint8_t   icUInt8Number;
  typedef uint16_t  icUInt16Number;
  typedef uint32_t  icUInt32Number;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-24 13:18:16.000000000 -0400
-@@ -361,7 +361,7 @@
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-26 15:16:19.000000000 -0400
+@@ -356,12 +356,18 @@
+       fprintf(stderr, "setTagData on icSigHead not permitted");
+       return;
+     }
++    
++    if (data == NULL)
++    {
++      JNU_ThrowByName(env, "java/lang/NullPointerException", "");
++      return;
++    }
+ 
+     sProf.j = id;
      profile = (cmsHPROFILE) sProf.pf;
      dataArray = (*env)->GetByteArrayElements(env, data, 0);    
      tagSize =(*env)->GetArrayLength(env, data);
 -    _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-+    _cmsInitTag(profile, (icTagSignature) tagSig, dataArray, tagSize);
++    _cmsInitTag(profile, (icTagSignature) tagSig, tagSize, dataArray);
      (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
  }
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-24 14:22:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -6264,7 +6321,7 @@
  
  // PostScript ColorRenderingDictionary and ColorSpaceArray
  
-@@ -1326,35 +1304,37 @@
+@@ -1326,35 +1303,37 @@
  // Persistence
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
@@ -6276,15 +6333,15 @@
  // Properties
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetSheetType(LCMSHANDLE hIT8);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
-+LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
- 
+-
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
-+LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
++LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
  
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val);
--
++LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
+ 
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer);
 +LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
 +LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
@@ -6314,7 +6371,7 @@
                                                  double Val);
  
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
-@@ -1362,25 +1342,28 @@
+@@ -1362,25 +1341,28 @@
  
  LCMSAPI double          LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
  
@@ -6346,7 +6403,7 @@
  // Formatter for double
  LCMSAPI void            LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter);
  
-@@ -1406,15 +1389,16 @@
+@@ -1406,15 +1388,16 @@
  
  // Profiling Extensions --- Would be removed from API in future revisions
  
@@ -6372,7 +6429,7 @@
  
  // --------------------------------------------------------------------------------------------------- Inline functions
  
-@@ -1456,6 +1440,34 @@
+@@ -1456,6 +1439,34 @@
         return (WORD) in;
  }
  
@@ -6407,7 +6464,7 @@
  // ------------------------------------------------------------------------------------------- end of inline functions
  
  // Signal error from inside lcms code
-@@ -1542,8 +1554,8 @@
+@@ -1542,8 +1553,8 @@
  void   cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
  void   cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
@@ -6418,7 +6475,7 @@
  void   cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
  void   cdecl VEC3saturate(LPVEC3 v);
-@@ -1554,13 +1566,13 @@
+@@ -1554,13 +1565,13 @@
  void   cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
  void   cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
  int    cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
@@ -6434,7 +6491,7 @@
  void   cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
  
  // Is a table linear?
-@@ -1609,7 +1621,7 @@
+@@ -1609,7 +1620,7 @@
  void    cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
@@ -6443,7 +6500,7 @@
  
  WORD    cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
  Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
-@@ -1693,7 +1705,7 @@
+@@ -1693,7 +1704,7 @@
  
                 // Gray axes fixup. Only on v2 8-bit Lab LUT
  
@@ -6452,7 +6509,7 @@
  
  
                             // Parameters used for curve creation
-@@ -1704,7 +1716,7 @@
+@@ -1704,7 +1715,7 @@
                 }; // LUT, FAR* LPLUT;
  
  
@@ -6461,7 +6518,7 @@
  
  
  // CRC of gamma tables
-@@ -1722,7 +1734,7 @@
+@@ -1722,7 +1733,7 @@
  
  void           cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
  void           cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
@@ -6470,7 +6527,7 @@
  void           cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
  
  LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
-@@ -1756,7 +1768,7 @@
+@@ -1756,7 +1767,7 @@
  void        cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
  void        cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
  
@@ -6479,7 +6536,7 @@
  
  LPMATSHAPER  cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
  LPMATSHAPER  cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
-@@ -1764,11 +1776,11 @@
+@@ -1764,11 +1775,11 @@
  
  
  // White Point & Primary chromas handling
@@ -6495,7 +6552,7 @@
  
  // Inter-PCS conversion routines. They assume D50 as white point.
  void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
-@@ -1783,7 +1795,7 @@
+@@ -1783,7 +1794,7 @@
  LPcmsNAMEDCOLORLIST  cdecl cmsAllocNamedColorList(int n);
  int                  cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
  void                 cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
@@ -6504,7 +6561,7 @@
  
  
  // I/O
-@@ -1827,8 +1839,8 @@
+@@ -1827,8 +1838,8 @@
  
                 char                    PhysicalFile[MAX_PATH];
  
@@ -6515,7 +6572,7 @@
  
                 struct tm               Created;
  
-@@ -1836,14 +1848,13 @@
+@@ -1836,14 +1847,13 @@
  
                 size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
  
@@ -6533,7 +6590,7 @@
  
                 size_t UsedSpace;
  
-@@ -1855,7 +1866,7 @@
+@@ -1855,7 +1865,7 @@
  cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
  
  // Search into tag dictionary
@@ -6542,7 +6599,7 @@
  
  // Search for a particular tag, replace if found or add new one else
  LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
-@@ -1871,6 +1882,7 @@
+@@ -1871,6 +1881,7 @@
  
  // These macros unpack format specifiers into integers
  
@@ -6550,7 +6607,7 @@
  #define T_COLORSPACE(s)       (((s)>>16)&31)
  #define T_SWAPFIRST(s)        (((s)>>14)&1)
  #define T_FLAVOR(s)           (((s)>>13)&1)
-@@ -1967,7 +1979,7 @@
+@@ -1967,7 +1978,7 @@
  
                      // Flag for transform involving v4 profiles
  
@@ -6559,7 +6616,7 @@
  
  
                      // 1-pixel cache
-@@ -2014,7 +2026,7 @@
+@@ -2014,7 +2025,7 @@
  
  // Clamping & Gamut handling
  
@@ -6568,7 +6625,7 @@
                              WORD **White, WORD **Black, int *nOutputs);
  
  WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
-@@ -2043,7 +2055,7 @@
+@@ -2043,7 +2054,7 @@
  LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
  
  // Hot fixes bad profiles
@@ -6577,7 +6634,7 @@
  
  // Marks LUT as 8 bit on input
  LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
-@@ -2061,6 +2073,10 @@
+@@ -2061,6 +2072,10 @@
  // Build a tone curve for K->K' if possible (only works on CMYK)
  LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- java-1.6.0-openjdk.spec	24 Mar 2009 18:44:26 -0000	1.105
+++ java-1.6.0-openjdk.spec	2 Apr 2009 13:50:36 -0000	1.106
@@ -117,7 +117,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 13.%{openjdkver}%{?dist}
+Release: 14.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -154,6 +154,7 @@
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
 Patch8:   java-1.6.0-openjdk-lcms.patch
 Patch9:   java-1.6.0-openjdk-securitypatches.patch
+Patch10:  java-1.6.0-openjdk-pulsejava.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -387,6 +388,7 @@
 patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH7}
 patch -l -p0 < %{PATCH8}
+patch -l -p0 < %{PATCH10}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -911,6 +913,13 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-14.b14
+- Added java-1.6.0-openjdk-pulsejava.patch.
+- Updated release.
+- Updated java-1.6.0-openjdk-lcms.patch.
+- Resolves: rhbz#492367
+- Resolves: rhbz#493276
+
 * Tue Mar 24 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-13.b14
 - Updated java-1.6.0-openjdk-lcms.patch.
 



From langel at fedoraproject.org  Thu Apr  2 13:50:51 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu,  2 Apr 2009 13:50:51 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-pulsejava.patch,
	NONE, 1.1 java-1.6.0-openjdk-lcms.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.114, 1.115
Message-ID: <20090402135051.3E67770120@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9788

Modified Files:
	java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-pulsejava.patch 
Log Message:
* Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-18.b14
- Added java-1.6.0-openjdk-pulsejava.patch.
- Updated release.
- Updated java-1.6.0-openjdk-lcms.patch.
- Resolves: rhbz#492367
- Resolves: rhbz#493276



java-1.6.0-openjdk-pulsejava.patch:

--- NEW FILE java-1.6.0-openjdk-pulsejava.patch ---
--- oldPulseAudioSourceDataLine.java	2009-03-31 11:47:13.000000000 -0400
+++ pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	2009-03-31 11:51:19.000000000 -0400
@@ -151,19 +151,15 @@
 			throw new IllegalArgumentException(
 					"amount of data to write does not represent an integral number of frames");
 		}
+		
 		if (length < 0) {
-			throw new IllegalArgumentException("length is negative");
+		    throw new IllegalArgumentException("length is negative");
 		}
-
-		if (offset < 0) {
-			throw new ArrayIndexOutOfBoundsException("offset is negative: "
-					+ offset);
-		}
-
-		if (length + offset > data.length) {
+		
+		if (length < 0 || offset < 0 || offset > data.length - length) {
 			throw new ArrayIndexOutOfBoundsException(
-					"writing data beyond the length of the array: "
-							+ (length + offset));
+					"Overflow condition: buffer.length=" + data.length + 
+							" offset= " + offset + " length=" + length );
 		}
 
 		int position = offset;
--- oldPulseAudioTargetDataLine.java	2009-03-31 11:47:19.000000000 -0400
+++ pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	2009-03-31 11:47:32.000000000 -0400
@@ -156,10 +156,10 @@
 		if (length < 0) {
 			throw new IllegalArgumentException("length is negative");
 		}
-
-		if (length + offset > data.length) {
-			throw new ArrayIndexOutOfBoundsException("index: "
-					+ (length + offset) + " array size: " + data.length);
+		
+		if ( offset < 0 || offset > data.length - length) {
+			throw new ArrayIndexOutOfBoundsException("array size: " + data.length
+					+ " offset:" + offset + " length:" + length );
 		}
 
 		/* everything ok */

java-1.6.0-openjdk-lcms.patch:

Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-lcms.patch	24 Mar 2009 18:46:59 -0000	1.2
+++ java-1.6.0-openjdk-lcms.patch	2 Apr 2009 13:50:50 -0000	1.3
@@ -1,6 +1,6 @@
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-24 14:11:33.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -79,9 +79,9 @@
  }
  
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-24 14:16:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -118,9 +118,9 @@
  #else
      VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
      MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-24 14:17:09.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -285,8 +285,6 @@
 +        const char *id;
 +        WRITEMODE as;
 +    } PROPERTY;
-+
-+static PROPERTY PredefinedProperties[] = {
  
 -        "NUMBER_OF_FIELDS",    // Required - NUMBER OF FIELDS
 -        "NUMBER_OF_SETS",      // Required - NUMBER OF SETS
@@ -299,6 +297,9 @@
 -        "MANUFACTURE",         // Some broken Fuji targets does store this value
 -        "PROD_DATE",           // Identifies year and month of production of the target in the form yyyy:mm.
 -        "SERIAL",              // Uniquely identifies individual physical target.
++static PROPERTY PredefinedProperties[] = {
+ 
+-        "MATERIAL",            // Identifies the material on which the target was produced using a code
 +        {"NUMBER_OF_FIELDS", WRITE_UNCOOKED},    // Required - NUMBER OF FIELDS
 +        {"NUMBER_OF_SETS",   WRITE_UNCOOKED},    // Required - NUMBER OF SETS
 +        {"ORIGINATOR",       WRITE_STRINGIFY},   // Required - Identifies the specific system, organization or individual that created the data file.
@@ -310,8 +311,7 @@
 +        {"MANUFACTURE",      WRITE_STRINGIFY},   // Some broken Fuji targets does store this value
 +        {"PROD_DATE",        WRITE_STRINGIFY},   // Identifies year and month of production of the target in the form yyyy:mm.
 +        {"SERIAL",           WRITE_STRINGIFY},   // Uniquely identifies individual physical target.
- 
--        "MATERIAL",            // Identifies the material on which the target was produced using a code
++
 +        {"MATERIAL",         WRITE_STRINGIFY},   // Identifies the material on which the target was produced using a code
                                 // uniquely identifying th e material. This is intend ed to be used for IT8.7
                                 // physical targets only (i.e . IT8.7/1 a nd IT8.7/2).
@@ -337,8 +337,7 @@
 -                               // measurement. Allowed values are ?black?, ?white?, or "na".
 +        {"SAMPLE_BACKING",   WRITE_STRINGIFY},   // Identifies the backing material used behind the sample during
 +                               // measurement. Allowed values are ?black?, ?white?, or {"na".
- 
--        "CHISQ_DOF"            // Degrees of freedom associated with the Chi squared statistic
++
 +        {"CHISQ_DOF",        WRITE_STRINGIFY},   // Degrees of freedom associated with the Chi squared statistic
 +
 +//    new in recent specs:
@@ -372,7 +371,8 @@
 +       {"TARGET_TYPE",        WRITE_STRINGIFY},  // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc.
 +
 +       {"COLORANT",           WRITE_STRINGIFY},  // Identifies the colorant(s) used in creating the target.
-+
+ 
+-        "CHISQ_DOF"            // Degrees of freedom associated with the Chi squared statistic
 +       {"TABLE_DESCRIPTOR",   WRITE_STRINGIFY},  // Describes the purpose or contents of a data table.
 +
 +       {"TABLE_NAME",         WRITE_STRINGIFY}   // Provides a short name for a data table.
@@ -408,7 +408,7 @@
          "STDEV_B",        // Standard deviation of b*
          "STDEV_DE",       // Standard deviation of CIE dE
          "CHI_SQD_PAR"};   // The average of the standard deviations of L*, a* and b*. It is
-@@ -397,9 +458,13 @@
+@@ -397,57 +458,119 @@
  
  #define NUMPREDEFINEDSAMPLEID (sizeof(PredefinedSampleID)/sizeof(char *))
  
@@ -423,8 +423,6 @@
  {
          return (c == ' ') || (c == '\t') || (c == '\r');
  }
-@@ -405,49 +470,107 @@
- }
  
  // Checks whatever if c is a valid identifier char
 -
@@ -494,7 +492,7 @@
 +    return TRUE;
 +}
 +
- 
++
 +// Make sure no exploit is being even tried
 +
 +static
@@ -506,7 +504,7 @@
 +    return str;
 +}
 +
-+
+ 
 +// Syntax error
  static
 -BOOL SynError(LPIT8 it8, const char *Txt, ...)
@@ -591,18 +589,18 @@
 +                if(_cmsMakePath(it8->str, it8->FileStack[it8->IncludeSP]->FileName, FileNest->FileName) == FALSE)
 +                {
 +                    SynError(it8, "File path too long");
-+                        return;
-+                }
-+
+                         return;
+                 }
+ 
+-                it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
 +                FileNest->Stream = fopen(FileNest->FileName, "rt");
 +                if (FileNest->Stream == NULL) {
 +
 +                        SynError(it8, "File %s not found", FileNest->FileName);
-                         return;
-                 }
++                        return;
++                }
 +                it8->IncludeSP++;
- 
--                it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
++
                  it8 ->ch = ' ';
                  InSymbol(it8);
      }
@@ -1564,9 +1562,9 @@
  void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
  {
      LPIT8 it8 = (LPIT8) hIT8;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-24 14:17:18.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1592,9 +1590,9 @@
 +
 +
 +      
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-24 14:17:24.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1624,9 +1622,9 @@
                strcat(Buffer1, Buffer2);
                MessageBox(NULL, Buffer1, "Little cms",
                                            MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-24 14:17:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1771,9 +1769,9 @@
  
  
      if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-24 14:17:50.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1875,9 +1873,9 @@
  
      }
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-24 14:17:59.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1914,9 +1912,9 @@
  
          f = ((Value - b) / a);
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-24 14:18:22.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1964,23 +1962,23 @@
 +      if (len == 0) {
 +          return 0;
 +      }
- 
--     if (ResData -> Pointer + len > ResData -> Size){
++
 +      if (len / size != count) {
 +          cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with count / size.");
 +          return 0;
 +      }
- 
--         len = (ResData -> Size - ResData -> Pointer);
--         cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
++
 +      if (extent < len || extent < ResData -> Pointer) {
 +          cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with len.");
 +          return 0;
 +      } 
-+
+ 
+-     if (ResData -> Pointer + len > ResData -> Size){
 +      if (ResData -> Pointer + len > ResData -> Size) {
  
-+         len = (ResData -> Size - ResData -> Pointer);
+          len = (ResData -> Size - ResData -> Pointer);
+-         cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
+-
 +         cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
 +         return 0;
       }
@@ -2293,7 +2291,7 @@
      _cmsInitTag(Icc, sig, sizeof(cmsNAMEDCOLORLIST) + (nc ->nColors - 1) * sizeof(cmsNAMEDCOLOR), nc);
 -    return FALSE;
 +    return TRUE;
- }
++}
 +
 +
 +LCMSBOOL LCMSEXPORT _cmsAddChromaticAdaptationTag(cmsHPROFILE hProfile, icTagSignature sig, const cmsCIEXYZ* mat)
@@ -2303,12 +2301,12 @@
 +    _cmsInitTag(Icc, sig, 3*sizeof(cmsCIEXYZ), mat);
 +    return TRUE;
 +
-+}
+ }
 +
 +
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-24 14:18:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -2476,7 +2474,7 @@
  
              NewLUT -> T = PtrW;
              NewLUT -> Tsize = (unsigned int) (nTabSize * sizeof(WORD));
-@@ -589,12 +628,12 @@
+@@ -589,25 +628,37 @@
  
                       *PtrW++ = TO16_TAB(Temp[i]);
              }
@@ -2491,10 +2489,6 @@
         }
  
  
-@@ -598,16 +637,28 @@
-        }
- 
- 
 -
         // Copy output tables
  
@@ -2985,14 +2979,15 @@
  
 -    case icSigLut8Type:    ReadLUT8(Icc, NewLUT, sig); break;
 -    case icSigLut16Type:   ReadLUT16(Icc, NewLUT);     break;
+-
+-    case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
+-    case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
 +    case icSigLut8Type:    if (!ReadLUT8(Icc, NewLUT, sig)) {
 +                                cmsFreeLUT(NewLUT);
 +                                return NULL;
 +                           }
 +                           break;
- 
--    case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
--    case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
++
 +    case icSigLut16Type:   if (!ReadLUT16(Icc, NewLUT)) {
 +                                cmsFreeLUT(NewLUT);
 +                                return NULL;
@@ -4284,9 +4279,9 @@
 -  return TRUE;
 -}
 -
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-24 14:18:49.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4442,9 +4437,9 @@
                                                         &Lut -> In16params);
                Lut ->wFlags &= ~LUT_HASTL1;
             }
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-24 14:19:12.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4505,9 +4500,9 @@
  }
  
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-24 14:19:17.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4569,9 +4564,9 @@
  {
          MAT3 m, a_1;
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-24 14:19:23.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4630,9 +4625,9 @@
  {
      _LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-24 14:19:30.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-26 15:13:30.000000000 -0400
 @@ -28,7 +28,7 @@
  // file:
  //
@@ -4814,9 +4809,9 @@
                              break;
  
                       default:;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-24 14:19:46.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4826,9 +4821,9 @@
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-24 14:19:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5004,14 +4999,14 @@
  
 -        if (lIsAbsolute) {
 +            cmsCIEXYZ White;
-+
-+            cmsTakeMediaWhitePoint(&White, hProfile);
  
 -            // For absolute colorimetric intent, do nothing
-+            Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
-+            Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
++            cmsTakeMediaWhitePoint(&White, hProfile);
  
 -            Writef(m, "%% Absolute colorimetric -- no transformation\n"
++            Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
++            Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
++
 +            Writef(m, "%% Absolute colorimetric -- encode to relative to maximize LUT usage\n"
                        "/TransformPQR [\n"
 -                      "{exch pop exch pop exch pop exch pop} bind dup dup]\n");
@@ -5190,9 +5185,9 @@
  
      // Finally, return used byte count
      return dwBytesUsed;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-24 14:20:03.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5302,9 +5297,9 @@
  {
  
         WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-24 14:20:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5457,9 +5452,9 @@
  
         Lut -> InputChan = 3;
         Lut -> OutputChan = 1;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-24 14:20:20.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5614,9 +5609,9 @@
      if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
              (cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
              (cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-24 14:20:26.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-26 15:18:47.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5652,7 +5647,27 @@
         cmsTakeIluminant(&Illuminant, hProfile);
  
         if (cmsGetPCS(hProfile) == icSigLabData) {
-@@ -801,7 +802,7 @@
+@@ -688,6 +689,9 @@
+                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
+                 FromLstarToXYZ(GrayTRC, Shapes1);
+ 
++		if (GrayTRC == NULL)
++		  return NULL;		
++
+                 // Reversing must be done after curve translation
+ 
+                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
+@@ -703,6 +707,9 @@
+ 
+                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
+ 
++                if (GrayTRC == NULL)
++                  return NULL;
++
+                 Shapes[0] = cmsDupGamma(GrayTRC);
+                 Shapes[1] = cmsDupGamma(GrayTRC);
+                 Shapes[2] = cmsDupGamma(GrayTRC);
+@@ -801,7 +808,7 @@
  // This function builds a transform matrix chaining parameters
  
  static
@@ -5661,7 +5676,7 @@
  {
         MAT3 From, To, ToInv, Transfer;
         LPGAMMATABLE In[3], InverseOut[3];
-@@ -838,6 +839,11 @@
+@@ -838,6 +845,11 @@
          InverseOut[1] = cmsReadICCGammaReversed(p -> OutputProfile, icSigGreenTRCTag);
          InverseOut[2] = cmsReadICCGammaReversed(p -> OutputProfile, icSigBlueTRCTag);
  
@@ -5673,7 +5688,7 @@
          p -> SmeltMatShaper = cmsAllocMatShaper2(&Transfer, In, InverseOut, MATSHAPER_ALLSMELTED);
  
          cmsFreeGammaTriple(In);
-@@ -1029,7 +1035,7 @@
+@@ -1029,7 +1041,7 @@
  // Check colorspace
  
  static
@@ -5682,7 +5697,7 @@
  {
         int Space = T_COLORSPACE(dwFormat);
  
-@@ -1049,10 +1055,10 @@
+@@ -1049,10 +1061,10 @@
  {
      // Allocate needed memory
  
@@ -5695,7 +5710,7 @@
            return NULL;
      }
  
-@@ -1269,10 +1275,10 @@
+@@ -1269,10 +1281,10 @@
          else {
                  // Can we optimize matrix-shaper only transform?
  
@@ -5710,7 +5725,16 @@
                         (p -> EntryColorSpace == icSigRgbData) &&
                         (p -> ExitColorSpace == icSigRgbData) &&
                         !(p -> dwOriginalFlags & cmsFLAGS_BLACKPOINTCOMPENSATION)) {
-@@ -1553,7 +1559,8 @@
+@@ -1335,7 +1347,7 @@
+                      p -> ToDevice = PCStoShaperMatrix;
+                      p -> OutMatShaper = cmsBuildOutputMatrixShaper(p->OutputProfile);
+ 
+-                     if (!p -> OutMatShaper) {
++                     if (!p || !p -> OutMatShaper) {
+                             cmsSignalError(LCMS_ERRC_ABORTED, "profile is unsuitable for output");
+                             return NULL;
+                             }
+@@ -1553,7 +1565,8 @@
                      DeviceLink = _cmsPrecalculateDeviceLink((cmsHTRANSFORM) p, dwFlags);
                 }
  
@@ -5720,7 +5744,7 @@
  
                     GamutCheck = _cmsPrecalculateGamutCheck((cmsHTRANSFORM) p);
                 }
-@@ -1668,7 +1675,7 @@
+@@ -1668,7 +1681,7 @@
  
             LCMS_FREE_LOCK(&p->rwlock);
  
@@ -5729,7 +5753,7 @@
  }
  
  
-@@ -1704,7 +1711,7 @@
+@@ -1704,7 +1717,7 @@
  
  // Returns TRUE if the profile is implemented as matrix-shaper
  
@@ -5738,7 +5762,7 @@
  {
      switch (cmsGetColorSpace(hProfile)) {
  
-@@ -1728,7 +1735,7 @@
+@@ -1728,7 +1741,7 @@
  }
  
  
@@ -5747,7 +5771,7 @@
                                                  int Intent, int UsedDirection)
  {
  
-@@ -1774,6 +1781,16 @@
+@@ -1774,6 +1787,16 @@
  }
  
  
@@ -5764,7 +5788,7 @@
  // A multiprofile transform does chain several profiles into a single
  // devicelink. It couls also be used to merge named color profiles into
  // a single database.
-@@ -1805,10 +1822,16 @@
+@@ -1805,10 +1828,16 @@
      // There is a simple case with just two profiles, try to catch it in order of getting
      // black preservation to work on this function, at least with two profiles.
  
@@ -5783,7 +5807,29 @@
                     return cmsCreateTransform(hProfiles[0], dwInput, hProfiles[1], dwOutput, Intent, dwFlags);
      }
  
-@@ -1984,6 +2007,14 @@
+@@ -1897,6 +1926,7 @@
+ 
+         ColorSpace = ColorSpaceIn;
+ 
++	Transforms[i] = NULL;
+ 
+         if (ColorSpace == CurrentColorSpace) {
+ 
+@@ -1946,7 +1976,12 @@
+                 goto ErrorCleanup;
+         }
+ 
+-        CurrentColorSpace = ColorSpaceOut;
++	if (Transforms[i] == NULL) {
++                cmsSignalError(LCMS_ERRC_ABORTED, "cmsCreateMultiprofileTransform: Invalid profile");
++                goto ErrorCleanup;
++        }
++
++	CurrentColorSpace = ColorSpaceOut;
+ 
+     }
+ 
+@@ -1984,6 +2019,14 @@
      if (hLab) cmsCloseProfile(hLab);
      if (hXYZ) cmsCloseProfile(hXYZ);
  
@@ -5798,9 +5844,9 @@
      if ((Intent != INTENT_ABSOLUTE_COLORIMETRIC) &&
          !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP))
                              _cmsFixWhiteMisalignment(p);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-24 14:21:56.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-26 15:13:30.000000000 -0400
 @@ -1,5 +1,8 @@
 +/* Header file guard bands */
 +#ifndef ICC_H
@@ -5864,21 +5910,32 @@
  typedef uint8_t   icUInt8Number;
  typedef uint16_t  icUInt16Number;
  typedef uint32_t  icUInt32Number;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-24 13:18:16.000000000 -0400
-@@ -361,7 +361,7 @@
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-26 15:16:19.000000000 -0400
+@@ -356,12 +356,18 @@
+       fprintf(stderr, "setTagData on icSigHead not permitted");
+       return;
+     }
++    
++    if (data == NULL)
++    {
++      JNU_ThrowByName(env, "java/lang/NullPointerException", "");
++      return;
++    }
+ 
+     sProf.j = id;
      profile = (cmsHPROFILE) sProf.pf;
      dataArray = (*env)->GetByteArrayElements(env, data, 0);    
      tagSize =(*env)->GetArrayLength(env, data);
 -    _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-+    _cmsInitTag(profile, (icTagSignature) tagSig, dataArray, tagSize);
++    _cmsInitTag(profile, (icTagSignature) tagSig, tagSize, dataArray);
      (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
  }
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-24 14:22:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -6264,7 +6321,7 @@
  
  // PostScript ColorRenderingDictionary and ColorSpaceArray
  
-@@ -1326,35 +1304,37 @@
+@@ -1326,35 +1303,37 @@
  // Persistence
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
@@ -6276,15 +6333,15 @@
  // Properties
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetSheetType(LCMSHANDLE hIT8);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
-+LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
- 
+-
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
-+LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
++LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
  
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val);
--
++LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
+ 
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer);
 +LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
 +LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
@@ -6314,7 +6371,7 @@
                                                  double Val);
  
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
-@@ -1362,25 +1342,28 @@
+@@ -1362,25 +1341,28 @@
  
  LCMSAPI double          LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
  
@@ -6346,7 +6403,7 @@
  // Formatter for double
  LCMSAPI void            LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter);
  
-@@ -1406,15 +1389,16 @@
+@@ -1406,15 +1388,16 @@
  
  // Profiling Extensions --- Would be removed from API in future revisions
  
@@ -6372,7 +6429,7 @@
  
  // --------------------------------------------------------------------------------------------------- Inline functions
  
-@@ -1456,6 +1440,34 @@
+@@ -1456,6 +1439,34 @@
         return (WORD) in;
  }
  
@@ -6407,7 +6464,7 @@
  // ------------------------------------------------------------------------------------------- end of inline functions
  
  // Signal error from inside lcms code
-@@ -1542,8 +1554,8 @@
+@@ -1542,8 +1553,8 @@
  void   cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
  void   cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
@@ -6418,7 +6475,7 @@
  void   cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
  void   cdecl VEC3saturate(LPVEC3 v);
-@@ -1554,13 +1566,13 @@
+@@ -1554,13 +1565,13 @@
  void   cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
  void   cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
  int    cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
@@ -6434,7 +6491,7 @@
  void   cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
  
  // Is a table linear?
-@@ -1609,7 +1621,7 @@
+@@ -1609,7 +1620,7 @@
  void    cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
@@ -6443,7 +6500,7 @@
  
  WORD    cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
  Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
-@@ -1693,7 +1705,7 @@
+@@ -1693,7 +1704,7 @@
  
                 // Gray axes fixup. Only on v2 8-bit Lab LUT
  
@@ -6452,7 +6509,7 @@
  
  
                             // Parameters used for curve creation
-@@ -1704,7 +1716,7 @@
+@@ -1704,7 +1715,7 @@
                 }; // LUT, FAR* LPLUT;
  
  
@@ -6461,7 +6518,7 @@
  
  
  // CRC of gamma tables
-@@ -1722,7 +1734,7 @@
+@@ -1722,7 +1733,7 @@
  
  void           cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
  void           cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
@@ -6470,7 +6527,7 @@
  void           cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
  
  LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
-@@ -1756,7 +1768,7 @@
+@@ -1756,7 +1767,7 @@
  void        cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
  void        cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
  
@@ -6479,7 +6536,7 @@
  
  LPMATSHAPER  cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
  LPMATSHAPER  cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
-@@ -1764,11 +1776,11 @@
+@@ -1764,11 +1775,11 @@
  
  
  // White Point & Primary chromas handling
@@ -6495,7 +6552,7 @@
  
  // Inter-PCS conversion routines. They assume D50 as white point.
  void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
-@@ -1783,7 +1795,7 @@
+@@ -1783,7 +1794,7 @@
  LPcmsNAMEDCOLORLIST  cdecl cmsAllocNamedColorList(int n);
  int                  cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
  void                 cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
@@ -6504,7 +6561,7 @@
  
  
  // I/O
-@@ -1827,8 +1839,8 @@
+@@ -1827,8 +1838,8 @@
  
                 char                    PhysicalFile[MAX_PATH];
  
@@ -6515,7 +6572,7 @@
  
                 struct tm               Created;
  
-@@ -1836,14 +1848,13 @@
+@@ -1836,14 +1847,13 @@
  
                 size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
  
@@ -6533,7 +6590,7 @@
  
                 size_t UsedSpace;
  
-@@ -1855,7 +1866,7 @@
+@@ -1855,7 +1865,7 @@
  cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
  
  // Search into tag dictionary
@@ -6542,7 +6599,7 @@
  
  // Search for a particular tag, replace if found or add new one else
  LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
-@@ -1871,6 +1882,7 @@
+@@ -1871,6 +1881,7 @@
  
  // These macros unpack format specifiers into integers
  
@@ -6550,7 +6607,7 @@
  #define T_COLORSPACE(s)       (((s)>>16)&31)
  #define T_SWAPFIRST(s)        (((s)>>14)&1)
  #define T_FLAVOR(s)           (((s)>>13)&1)
-@@ -1967,7 +1979,7 @@
+@@ -1967,7 +1978,7 @@
  
                      // Flag for transform involving v4 profiles
  
@@ -6559,7 +6616,7 @@
  
  
                      // 1-pixel cache
-@@ -2014,7 +2026,7 @@
+@@ -2014,7 +2025,7 @@
  
  // Clamping & Gamut handling
  
@@ -6568,7 +6625,7 @@
                              WORD **White, WORD **Black, int *nOutputs);
  
  WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
-@@ -2043,7 +2055,7 @@
+@@ -2043,7 +2054,7 @@
  LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
  
  // Hot fixes bad profiles
@@ -6577,7 +6634,7 @@
  
  // Marks LUT as 8 bit on input
  LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
-@@ -2061,6 +2073,10 @@
+@@ -2061,6 +2072,10 @@
  // Build a tone curve for K->K' if possible (only works on CMYK)
  LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- java-1.6.0-openjdk.spec	24 Mar 2009 18:47:00 -0000	1.114
+++ java-1.6.0-openjdk.spec	2 Apr 2009 13:50:50 -0000	1.115
@@ -120,7 +120,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 17.%{openjdkver}%{?dist}
+Release: 18.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -159,6 +159,7 @@
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
 Patch8:   java-1.6.0-openjdk-lcms.patch
 Patch9:   java-1.6.0-openjdk-securitypatches.patch
+Patch10:  java-1.6.0-openjdk-pulsejava.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -397,6 +398,7 @@
 patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH7}
 patch -l -p0 < %{PATCH8}
+patch -l -p0 < %{PATCH10}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -925,6 +927,13 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-18.b14
+- Added java-1.6.0-openjdk-pulsejava.patch.
+- Updated release.
+- Updated java-1.6.0-openjdk-lcms.patch.
+- Resolves: rhbz#492367
+- Resolves: rhbz#493276
+
 * Tue Mar 24 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-17.b14
 - Updated java-1.6.0-openjdk-lcms.patch.
 



From langel at fedoraproject.org  Thu Apr  2 13:50:51 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu,  2 Apr 2009 13:50:51 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-lcms.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.65, 1.66
Message-ID: <20090402135051.B87E570120@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9574

Modified Files:
	java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec 
Log Message:
* Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.24.b09
- Updated java-1.6.0-openjdk-lcms.patch.
- Resolves: rhbz#493276




java-1.6.0-openjdk-lcms.patch:

Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-lcms.patch	24 Mar 2009 18:40:25 -0000	1.2
+++ java-1.6.0-openjdk-lcms.patch	2 Apr 2009 13:50:21 -0000	1.3
@@ -1,6 +1,6 @@
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-24 14:11:33.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -79,9 +79,9 @@
  }
  
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-24 14:16:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -118,9 +118,9 @@
  #else
      VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
      MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-24 14:17:09.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -285,8 +285,6 @@
 +        const char *id;
 +        WRITEMODE as;
 +    } PROPERTY;
-+
-+static PROPERTY PredefinedProperties[] = {
  
 -        "NUMBER_OF_FIELDS",    // Required - NUMBER OF FIELDS
 -        "NUMBER_OF_SETS",      // Required - NUMBER OF SETS
@@ -299,6 +297,9 @@
 -        "MANUFACTURE",         // Some broken Fuji targets does store this value
 -        "PROD_DATE",           // Identifies year and month of production of the target in the form yyyy:mm.
 -        "SERIAL",              // Uniquely identifies individual physical target.
++static PROPERTY PredefinedProperties[] = {
+ 
+-        "MATERIAL",            // Identifies the material on which the target was produced using a code
 +        {"NUMBER_OF_FIELDS", WRITE_UNCOOKED},    // Required - NUMBER OF FIELDS
 +        {"NUMBER_OF_SETS",   WRITE_UNCOOKED},    // Required - NUMBER OF SETS
 +        {"ORIGINATOR",       WRITE_STRINGIFY},   // Required - Identifies the specific system, organization or individual that created the data file.
@@ -310,8 +311,7 @@
 +        {"MANUFACTURE",      WRITE_STRINGIFY},   // Some broken Fuji targets does store this value
 +        {"PROD_DATE",        WRITE_STRINGIFY},   // Identifies year and month of production of the target in the form yyyy:mm.
 +        {"SERIAL",           WRITE_STRINGIFY},   // Uniquely identifies individual physical target.
- 
--        "MATERIAL",            // Identifies the material on which the target was produced using a code
++
 +        {"MATERIAL",         WRITE_STRINGIFY},   // Identifies the material on which the target was produced using a code
                                 // uniquely identifying th e material. This is intend ed to be used for IT8.7
                                 // physical targets only (i.e . IT8.7/1 a nd IT8.7/2).
@@ -337,8 +337,7 @@
 -                               // measurement. Allowed values are ?black?, ?white?, or "na".
 +        {"SAMPLE_BACKING",   WRITE_STRINGIFY},   // Identifies the backing material used behind the sample during
 +                               // measurement. Allowed values are ?black?, ?white?, or {"na".
- 
--        "CHISQ_DOF"            // Degrees of freedom associated with the Chi squared statistic
++
 +        {"CHISQ_DOF",        WRITE_STRINGIFY},   // Degrees of freedom associated with the Chi squared statistic
 +
 +//    new in recent specs:
@@ -372,7 +371,8 @@
 +       {"TARGET_TYPE",        WRITE_STRINGIFY},  // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc.
 +
 +       {"COLORANT",           WRITE_STRINGIFY},  // Identifies the colorant(s) used in creating the target.
-+
+ 
+-        "CHISQ_DOF"            // Degrees of freedom associated with the Chi squared statistic
 +       {"TABLE_DESCRIPTOR",   WRITE_STRINGIFY},  // Describes the purpose or contents of a data table.
 +
 +       {"TABLE_NAME",         WRITE_STRINGIFY}   // Provides a short name for a data table.
@@ -408,7 +408,7 @@
          "STDEV_B",        // Standard deviation of b*
          "STDEV_DE",       // Standard deviation of CIE dE
          "CHI_SQD_PAR"};   // The average of the standard deviations of L*, a* and b*. It is
-@@ -397,9 +458,13 @@
+@@ -397,57 +458,119 @@
  
  #define NUMPREDEFINEDSAMPLEID (sizeof(PredefinedSampleID)/sizeof(char *))
  
@@ -423,8 +423,6 @@
  {
          return (c == ' ') || (c == '\t') || (c == '\r');
  }
-@@ -405,49 +470,107 @@
- }
  
  // Checks whatever if c is a valid identifier char
 -
@@ -494,7 +492,7 @@
 +    return TRUE;
 +}
 +
- 
++
 +// Make sure no exploit is being even tried
 +
 +static
@@ -506,7 +504,7 @@
 +    return str;
 +}
 +
-+
+ 
 +// Syntax error
  static
 -BOOL SynError(LPIT8 it8, const char *Txt, ...)
@@ -591,18 +589,18 @@
 +                if(_cmsMakePath(it8->str, it8->FileStack[it8->IncludeSP]->FileName, FileNest->FileName) == FALSE)
 +                {
 +                    SynError(it8, "File path too long");
-+                        return;
-+                }
-+
+                         return;
+                 }
+ 
+-                it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
 +                FileNest->Stream = fopen(FileNest->FileName, "rt");
 +                if (FileNest->Stream == NULL) {
 +
 +                        SynError(it8, "File %s not found", FileNest->FileName);
-                         return;
-                 }
++                        return;
++                }
 +                it8->IncludeSP++;
- 
--                it8 -> Stream[++it8 -> IncludeSP] = IncludeFile;
++
                  it8 ->ch = ' ';
                  InSymbol(it8);
      }
@@ -1564,9 +1562,9 @@
  void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
  {
      LPIT8 it8 = (LPIT8) hIT8;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-24 14:17:18.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1592,9 +1590,9 @@
 +
 +
 +      
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-24 14:17:24.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1624,9 +1622,9 @@
                strcat(Buffer1, Buffer2);
                MessageBox(NULL, Buffer1, "Little cms",
                                            MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-24 14:17:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1771,9 +1769,9 @@
  
  
      if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-24 14:17:50.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1875,9 +1873,9 @@
  
      }
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-24 14:17:59.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1914,9 +1912,9 @@
  
          f = ((Value - b) / a);
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-24 14:18:22.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1964,23 +1962,23 @@
 +      if (len == 0) {
 +          return 0;
 +      }
- 
--     if (ResData -> Pointer + len > ResData -> Size){
++
 +      if (len / size != count) {
 +          cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with count / size.");
 +          return 0;
 +      }
- 
--         len = (ResData -> Size - ResData -> Pointer);
--         cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
++
 +      if (extent < len || extent < ResData -> Pointer) {
 +          cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Integer overflow with len.");
 +          return 0;
 +      } 
-+
+ 
+-     if (ResData -> Pointer + len > ResData -> Size){
 +      if (ResData -> Pointer + len > ResData -> Size) {
  
-+         len = (ResData -> Size - ResData -> Pointer);
+          len = (ResData -> Size - ResData -> Pointer);
+-         cmsSignalError(LCMS_ERRC_WARNING, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
+-
 +         cmsSignalError(LCMS_ERRC_ABORTED, "Read from memory error. Got %d bytes, block should be of %d bytes", len * size, count * size);
 +         return 0;
       }
@@ -2293,7 +2291,7 @@
      _cmsInitTag(Icc, sig, sizeof(cmsNAMEDCOLORLIST) + (nc ->nColors - 1) * sizeof(cmsNAMEDCOLOR), nc);
 -    return FALSE;
 +    return TRUE;
- }
++}
 +
 +
 +LCMSBOOL LCMSEXPORT _cmsAddChromaticAdaptationTag(cmsHPROFILE hProfile, icTagSignature sig, const cmsCIEXYZ* mat)
@@ -2303,12 +2301,12 @@
 +    _cmsInitTag(Icc, sig, 3*sizeof(cmsCIEXYZ), mat);
 +    return TRUE;
 +
-+}
+ }
 +
 +
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-24 14:18:32.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -2476,7 +2474,7 @@
  
              NewLUT -> T = PtrW;
              NewLUT -> Tsize = (unsigned int) (nTabSize * sizeof(WORD));
-@@ -589,12 +628,12 @@
+@@ -589,25 +628,37 @@
  
                       *PtrW++ = TO16_TAB(Temp[i]);
              }
@@ -2491,10 +2489,6 @@
         }
  
  
-@@ -598,16 +637,28 @@
-        }
- 
- 
 -
         // Copy output tables
  
@@ -2985,14 +2979,15 @@
  
 -    case icSigLut8Type:    ReadLUT8(Icc, NewLUT, sig); break;
 -    case icSigLut16Type:   ReadLUT16(Icc, NewLUT);     break;
+-
+-    case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
+-    case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
 +    case icSigLut8Type:    if (!ReadLUT8(Icc, NewLUT, sig)) {
 +                                cmsFreeLUT(NewLUT);
 +                                return NULL;
 +                           }
 +                           break;
- 
--    case icSiglutAtoBType: ReadLUT_A2B(Icc, NewLUT, offset, sig); break;
--    case icSiglutBtoAType: ReadLUT_B2A(Icc, NewLUT, offset, sig); break;
++
 +    case icSigLut16Type:   if (!ReadLUT16(Icc, NewLUT)) {
 +                                cmsFreeLUT(NewLUT);
 +                                return NULL;
@@ -4284,9 +4279,9 @@
 -  return TRUE;
 -}
 -
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-24 14:18:49.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4442,9 +4437,9 @@
                                                         &Lut -> In16params);
                Lut ->wFlags &= ~LUT_HASTL1;
             }
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-24 14:19:12.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4505,9 +4500,9 @@
  }
  
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-24 14:19:17.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4569,9 +4564,9 @@
  {
          MAT3 m, a_1;
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-24 14:19:23.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4630,9 +4625,9 @@
  {
      _LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-24 14:19:30.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-26 15:13:30.000000000 -0400
 @@ -28,7 +28,7 @@
  // file:
  //
@@ -4814,9 +4809,9 @@
                              break;
  
                       default:;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-24 14:19:46.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4826,9 +4821,9 @@
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-24 14:19:55.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5004,14 +4999,14 @@
  
 -        if (lIsAbsolute) {
 +            cmsCIEXYZ White;
-+
-+            cmsTakeMediaWhitePoint(&White, hProfile);
  
 -            // For absolute colorimetric intent, do nothing
-+            Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
-+            Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
++            cmsTakeMediaWhitePoint(&White, hProfile);
  
 -            Writef(m, "%% Absolute colorimetric -- no transformation\n"
++            Writef(m,"/MatrixPQR [1 0 0 0 1 0 0 0 1 ]\n");
++            Writef(m,"/RangePQR [ -0.5 2 -0.5 2 -0.5 2 ]\n");
++
 +            Writef(m, "%% Absolute colorimetric -- encode to relative to maximize LUT usage\n"
                        "/TransformPQR [\n"
 -                      "{exch pop exch pop exch pop exch pop} bind dup dup]\n");
@@ -5190,9 +5185,9 @@
  
      // Finally, return used byte count
      return dwBytesUsed;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-24 14:20:03.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5302,9 +5297,9 @@
  {
  
         WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-24 14:20:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5457,9 +5452,9 @@
  
         Lut -> InputChan = 3;
         Lut -> OutputChan = 1;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-24 14:20:20.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5614,9 +5609,9 @@
      if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
              (cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
              (cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-24 14:20:26.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-26 15:18:47.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5652,7 +5647,27 @@
         cmsTakeIluminant(&Illuminant, hProfile);
  
         if (cmsGetPCS(hProfile) == icSigLabData) {
-@@ -801,7 +802,7 @@
+@@ -688,6 +689,9 @@
+                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
+                 FromLstarToXYZ(GrayTRC, Shapes1);
+ 
++		if (GrayTRC == NULL)
++		  return NULL;		
++
+                 // Reversing must be done after curve translation
+ 
+                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
+@@ -703,6 +707,9 @@
+ 
+                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
+ 
++                if (GrayTRC == NULL)
++                  return NULL;
++
+                 Shapes[0] = cmsDupGamma(GrayTRC);
+                 Shapes[1] = cmsDupGamma(GrayTRC);
+                 Shapes[2] = cmsDupGamma(GrayTRC);
+@@ -801,7 +808,7 @@
  // This function builds a transform matrix chaining parameters
  
  static
@@ -5661,7 +5676,7 @@
  {
         MAT3 From, To, ToInv, Transfer;
         LPGAMMATABLE In[3], InverseOut[3];
-@@ -838,6 +839,11 @@
+@@ -838,6 +845,11 @@
          InverseOut[1] = cmsReadICCGammaReversed(p -> OutputProfile, icSigGreenTRCTag);
          InverseOut[2] = cmsReadICCGammaReversed(p -> OutputProfile, icSigBlueTRCTag);
  
@@ -5673,7 +5688,7 @@
          p -> SmeltMatShaper = cmsAllocMatShaper2(&Transfer, In, InverseOut, MATSHAPER_ALLSMELTED);
  
          cmsFreeGammaTriple(In);
-@@ -1029,7 +1035,7 @@
+@@ -1029,7 +1041,7 @@
  // Check colorspace
  
  static
@@ -5682,7 +5697,7 @@
  {
         int Space = T_COLORSPACE(dwFormat);
  
-@@ -1049,10 +1055,10 @@
+@@ -1049,10 +1061,10 @@
  {
      // Allocate needed memory
  
@@ -5695,7 +5710,7 @@
            return NULL;
      }
  
-@@ -1269,10 +1275,10 @@
+@@ -1269,10 +1281,10 @@
          else {
                  // Can we optimize matrix-shaper only transform?
  
@@ -5710,7 +5725,16 @@
                         (p -> EntryColorSpace == icSigRgbData) &&
                         (p -> ExitColorSpace == icSigRgbData) &&
                         !(p -> dwOriginalFlags & cmsFLAGS_BLACKPOINTCOMPENSATION)) {
-@@ -1553,7 +1559,8 @@
+@@ -1335,7 +1347,7 @@
+                      p -> ToDevice = PCStoShaperMatrix;
+                      p -> OutMatShaper = cmsBuildOutputMatrixShaper(p->OutputProfile);
+ 
+-                     if (!p -> OutMatShaper) {
++                     if (!p || !p -> OutMatShaper) {
+                             cmsSignalError(LCMS_ERRC_ABORTED, "profile is unsuitable for output");
+                             return NULL;
+                             }
+@@ -1553,7 +1565,8 @@
                      DeviceLink = _cmsPrecalculateDeviceLink((cmsHTRANSFORM) p, dwFlags);
                 }
  
@@ -5720,7 +5744,7 @@
  
                     GamutCheck = _cmsPrecalculateGamutCheck((cmsHTRANSFORM) p);
                 }
-@@ -1668,7 +1675,7 @@
+@@ -1668,7 +1681,7 @@
  
             LCMS_FREE_LOCK(&p->rwlock);
  
@@ -5729,7 +5753,7 @@
  }
  
  
-@@ -1704,7 +1711,7 @@
+@@ -1704,7 +1717,7 @@
  
  // Returns TRUE if the profile is implemented as matrix-shaper
  
@@ -5738,7 +5762,7 @@
  {
      switch (cmsGetColorSpace(hProfile)) {
  
-@@ -1728,7 +1735,7 @@
+@@ -1728,7 +1741,7 @@
  }
  
  
@@ -5747,7 +5771,7 @@
                                                  int Intent, int UsedDirection)
  {
  
-@@ -1774,6 +1781,16 @@
+@@ -1774,6 +1787,16 @@
  }
  
  
@@ -5764,7 +5788,7 @@
  // A multiprofile transform does chain several profiles into a single
  // devicelink. It couls also be used to merge named color profiles into
  // a single database.
-@@ -1805,10 +1822,16 @@
+@@ -1805,10 +1828,16 @@
      // There is a simple case with just two profiles, try to catch it in order of getting
      // black preservation to work on this function, at least with two profiles.
  
@@ -5783,7 +5807,29 @@
                     return cmsCreateTransform(hProfiles[0], dwInput, hProfiles[1], dwOutput, Intent, dwFlags);
      }
  
-@@ -1984,6 +2007,14 @@
+@@ -1897,6 +1926,7 @@
+ 
+         ColorSpace = ColorSpaceIn;
+ 
++	Transforms[i] = NULL;
+ 
+         if (ColorSpace == CurrentColorSpace) {
+ 
+@@ -1946,7 +1976,12 @@
+                 goto ErrorCleanup;
+         }
+ 
+-        CurrentColorSpace = ColorSpaceOut;
++	if (Transforms[i] == NULL) {
++                cmsSignalError(LCMS_ERRC_ABORTED, "cmsCreateMultiprofileTransform: Invalid profile");
++                goto ErrorCleanup;
++        }
++
++	CurrentColorSpace = ColorSpaceOut;
+ 
+     }
+ 
+@@ -1984,6 +2019,14 @@
      if (hLab) cmsCloseProfile(hLab);
      if (hXYZ) cmsCloseProfile(hXYZ);
  
@@ -5798,9 +5844,9 @@
      if ((Intent != INTENT_ABSOLUTE_COLORIMETRIC) &&
          !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP))
                              _cmsFixWhiteMisalignment(p);
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-24 14:21:56.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-26 15:13:30.000000000 -0400
 @@ -1,5 +1,8 @@
 +/* Header file guard bands */
 +#ifndef ICC_H
@@ -5864,21 +5910,32 @@
  typedef uint8_t   icUInt8Number;
  typedef uint16_t  icUInt16Number;
  typedef uint32_t  icUInt32Number;
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-24 13:18:16.000000000 -0400
-@@ -361,7 +361,7 @@
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-26 15:16:19.000000000 -0400
+@@ -356,12 +356,18 @@
+       fprintf(stderr, "setTagData on icSigHead not permitted");
+       return;
+     }
++    
++    if (data == NULL)
++    {
++      JNU_ThrowByName(env, "java/lang/NullPointerException", "");
++      return;
++    }
+ 
+     sProf.j = id;
      profile = (cmsHPROFILE) sProf.pf;
      dataArray = (*env)->GetByteArrayElements(env, data, 0);    
      tagSize =(*env)->GetArrayLength(env, data);
 -    _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-+    _cmsInitTag(profile, (icTagSignature) tagSig, dataArray, tagSize);
++    _cmsInitTag(profile, (icTagSignature) tagSig, tagSize, dataArray);
      (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
  }
  
-diff -bBruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-24 14:22:10.000000000 -0400
+diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
+--- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-26 15:13:30.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -6264,7 +6321,7 @@
  
  // PostScript ColorRenderingDictionary and ColorSpaceArray
  
-@@ -1326,35 +1304,37 @@
+@@ -1326,35 +1303,37 @@
  // Persistence
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
@@ -6276,15 +6333,15 @@
  // Properties
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetSheetType(LCMSHANDLE hIT8);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
-+LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
- 
+-
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
-+LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
++LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type);
  
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val);
--
++LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment);
+ 
 -LCMSAPI BOOL            LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer);
 +LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str);
 +LCMSAPI LCMSBOOL        LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val);
@@ -6314,7 +6371,7 @@
                                                  double Val);
  
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
-@@ -1362,25 +1342,28 @@
+@@ -1362,25 +1341,28 @@
  
  LCMSAPI double          LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
  
@@ -6346,7 +6403,7 @@
  // Formatter for double
  LCMSAPI void            LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter);
  
-@@ -1406,15 +1389,16 @@
+@@ -1406,15 +1388,16 @@
  
  // Profiling Extensions --- Would be removed from API in future revisions
  
@@ -6372,7 +6429,7 @@
  
  // --------------------------------------------------------------------------------------------------- Inline functions
  
-@@ -1456,6 +1440,34 @@
+@@ -1456,6 +1439,34 @@
         return (WORD) in;
  }
  
@@ -6407,7 +6464,7 @@
  // ------------------------------------------------------------------------------------------- end of inline functions
  
  // Signal error from inside lcms code
-@@ -1542,8 +1554,8 @@
+@@ -1542,8 +1553,8 @@
  void   cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
  void   cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
@@ -6418,7 +6475,7 @@
  void   cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
  void   cdecl VEC3saturate(LPVEC3 v);
-@@ -1554,13 +1566,13 @@
+@@ -1554,13 +1565,13 @@
  void   cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
  void   cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
  int    cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
@@ -6434,7 +6491,7 @@
  void   cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
  
  // Is a table linear?
-@@ -1609,7 +1621,7 @@
+@@ -1609,7 +1620,7 @@
  void    cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
@@ -6443,7 +6500,7 @@
  
  WORD    cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
  Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
-@@ -1693,7 +1705,7 @@
+@@ -1693,7 +1704,7 @@
  
                 // Gray axes fixup. Only on v2 8-bit Lab LUT
  
@@ -6452,7 +6509,7 @@
  
  
                             // Parameters used for curve creation
-@@ -1704,7 +1716,7 @@
+@@ -1704,7 +1715,7 @@
                 }; // LUT, FAR* LPLUT;
  
  
@@ -6461,7 +6518,7 @@
  
  
  // CRC of gamma tables
-@@ -1722,7 +1734,7 @@
+@@ -1722,7 +1733,7 @@
  
  void           cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
  void           cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
@@ -6470,7 +6527,7 @@
  void           cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
  
  LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
-@@ -1756,7 +1768,7 @@
+@@ -1756,7 +1767,7 @@
  void        cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
  void        cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
  
@@ -6479,7 +6536,7 @@
  
  LPMATSHAPER  cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
  LPMATSHAPER  cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
-@@ -1764,11 +1776,11 @@
+@@ -1764,11 +1775,11 @@
  
  
  // White Point & Primary chromas handling
@@ -6495,7 +6552,7 @@
  
  // Inter-PCS conversion routines. They assume D50 as white point.
  void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
-@@ -1783,7 +1795,7 @@
+@@ -1783,7 +1794,7 @@
  LPcmsNAMEDCOLORLIST  cdecl cmsAllocNamedColorList(int n);
  int                  cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
  void                 cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
@@ -6504,7 +6561,7 @@
  
  
  // I/O
-@@ -1827,8 +1839,8 @@
+@@ -1827,8 +1838,8 @@
  
                 char                    PhysicalFile[MAX_PATH];
  
@@ -6515,7 +6572,7 @@
  
                 struct tm               Created;
  
-@@ -1836,14 +1848,13 @@
+@@ -1836,14 +1847,13 @@
  
                 size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
  
@@ -6533,7 +6590,7 @@
  
                 size_t UsedSpace;
  
-@@ -1855,7 +1866,7 @@
+@@ -1855,7 +1865,7 @@
  cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
  
  // Search into tag dictionary
@@ -6542,7 +6599,7 @@
  
  // Search for a particular tag, replace if found or add new one else
  LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
-@@ -1871,6 +1882,7 @@
+@@ -1871,6 +1881,7 @@
  
  // These macros unpack format specifiers into integers
  
@@ -6550,7 +6607,7 @@
  #define T_COLORSPACE(s)       (((s)>>16)&31)
  #define T_SWAPFIRST(s)        (((s)>>14)&1)
  #define T_FLAVOR(s)           (((s)>>13)&1)
-@@ -1967,7 +1979,7 @@
+@@ -1967,7 +1978,7 @@
  
                      // Flag for transform involving v4 profiles
  
@@ -6559,7 +6616,7 @@
  
  
                      // 1-pixel cache
-@@ -2014,7 +2026,7 @@
+@@ -2014,7 +2025,7 @@
  
  // Clamping & Gamut handling
  
@@ -6568,7 +6625,7 @@
                              WORD **White, WORD **Black, int *nOutputs);
  
  WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
-@@ -2043,7 +2055,7 @@
+@@ -2043,7 +2054,7 @@
  LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
  
  // Hot fixes bad profiles
@@ -6577,7 +6634,7 @@
  
  // Marks LUT as 8 bit on input
  LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
-@@ -2061,6 +2073,10 @@
+@@ -2061,6 +2072,10 @@
  // Build a tone curve for K->K' if possible (only works on CMYK)
  LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- java-1.6.0-openjdk.spec	24 Mar 2009 18:40:25 -0000	1.65
+++ java-1.6.0-openjdk.spec	2 Apr 2009 13:50:21 -0000	1.66
@@ -134,7 +134,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.23.%{openjdkver}%{?dist}
+Release: 0.24.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -931,6 +931,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.24.b09
+- Updated java-1.6.0-openjdk-lcms.patch.
+- Resolves: rhbz#493276
+
 * Tue Mar 24 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.23.b09
 - Updated java-1.6.0-openjdk-lcms.patch.
 



From jcollie at fedoraproject.org  Thu Apr  2 13:58:46 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  2 Apr 2009 13:58:46 +0000 (UTC)
Subject: rpms/schroedinger/devel .cvsignore, 1.6, 1.7 schroedinger.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090402135846.3644670120@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11232

Modified Files:
	.cvsignore schroedinger.spec sources 
Log Message:
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2008 19:14:30 -0000	1.6
+++ .cvsignore	2 Apr 2009 13:58:15 -0000	1.7
@@ -1 +1 @@
-schroedinger-1.0.5.tar.gz
+schroedinger-1.0.6.tar.gz


Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- schroedinger.spec	25 Feb 2009 22:55:20 -0000	1.12
+++ schroedinger.spec	2 Apr 2009 13:58:15 -0000	1.13
@@ -1,8 +1,8 @@
 %define abi 1.0
 
 Name:           schroedinger
-Version:        1.0.5
-Release:        5%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -12,7 +12,7 @@
 Source0:	http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  liboil-devel >= 0.3.13
+BuildRequires:  liboil-devel >= 0.3.16
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  gtk-doc
@@ -32,7 +32,7 @@
 Summary:        Development files for schroedinger
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:	liboil-devel
+Requires:	liboil-devel >= 0.3.16
 
 %description devel
 Development files for schroedinger


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2008 19:14:31 -0000	1.6
+++ sources	2 Apr 2009 13:58:15 -0000	1.7
@@ -1 +1 @@
-55596c41572c5efcf4b2cae9c68c2152  schroedinger-1.0.5.tar.gz
+e5d0f34d623f6fc3bbf9468c48935c97  schroedinger-1.0.6.tar.gz



From sailer at fedoraproject.org  Thu Apr  2 14:00:51 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu,  2 Apr 2009 14:00:51 +0000 (UTC)
Subject: rpms/ghdl/devel ieee-mathreal-nocompat.patch, NONE, 1.1 ghdl.spec, 
	1.46, 1.47
Message-ID: <20090402140051.29AA070120@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11821

Modified Files:
	ghdl.spec 
Added Files:
	ieee-mathreal-nocompat.patch 
Log Message:
make math_real more standards compliant


ieee-mathreal-nocompat.patch:

--- NEW FILE ieee-mathreal-nocompat.patch ---
--- vhdl/libraries/ieee/math_real.vhdl.orig	2009-04-01 19:21:58.000000000 +0200
+++ vhdl/libraries/ieee/math_real.vhdl	2009-04-01 19:35:06.000000000 +0200
@@ -102,16 +102,21 @@
     	-- returns integer FLOOR(X + 0.5) if X > 0;
     	-- return integer CEIL(X - 0.5) if X < 0
 
-    -- IAC: we are missing the function TRUNC
-    -- IAC: we are missing the function MOD
-    -- IAC: functions FMAX and FMIN should be renamed REALMAX and REALMIN
-    
-    function FMAX (X, Y : real ) return real;
-    attribute foreign of fmax : function is "VHPIDIRECT fmax"; 
+    function TRUNC (X : real ) return real;
+    attribute foreign of trunc : function is "VHPIDIRECT trunc"; 
+    	-- returns integer FLOOR(X) if X > 0;
+    	-- return integer CEIL(X) if X < 0
+
+    function "MOD" (X, Y : real ) return real;
+    attribute foreign of "mod" : function is "VHPIDIRECT fmod"; 
+    	-- returns the floating point modulus of X/Y
+
+    function REALMAX (X, Y : real ) return real;
+    attribute foreign of realmax : function is "VHPIDIRECT fmax"; 
     	-- returns the algebraically larger of X and Y
 
-    function FMIN (X, Y : real ) return real;
-    attribute foreign of fmin : function is "VHPIDIRECT fmin"; 
+    function REALMIN (X, Y : real ) return real;
+    attribute foreign of realmin : function is "VHPIDIRECT fmin"; 
     	-- returns the algebraically smaller of X and Y
 
     procedure UNIFORM (variable Seed1,Seed2:inout integer; variable X:out real);
@@ -203,25 +208,17 @@
     	-- returns tan X; X in radians
     	-- X /= ((2k+1) * PI/2), where k is an integer
 
-    -- IAC: function should be called ARCSIN
-    
-    function  ASIN (X : real ) return real; 
+    function  ARCSIN (X : real ) return real; 
     	-- returns  -PI/2 < asin X < PI/2; | X | <= 1
 
-    -- IAC: function should be called ARCCOS
-    
-    function  ACOS (X : real ) return real;
+    function  ARCCOS (X : real ) return real;
     	-- returns  0 < acos X < PI; | X | <= 1
 
-    
-    -- IAC: function should be called ARCTAN
-    
-    function  ATAN (X : real) return real;
-    attribute foreign of atan : function is "VHPIDIRECT atan"; 
+    function  ARCTAN (X : real) return real;
+    attribute foreign of arctan : function is "VHPIDIRECT atan"; 
     	-- returns  -PI/2 < atan X < PI/2
 
-    -- IAC: function ATAN2 should not exist
-    function  ATAN2 (X : real; Y : real) return real;
+    function  ARCTAN (X : real; Y : real) return real;
     	-- returns  atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
 
     function SINH (X : real) return real;
@@ -236,20 +233,14 @@
     attribute foreign of tanh : function is "VHPIDIRECT tanh"; 
     	-- hyperbolic tangent; -- returns (e**X - e**(-X))/(e**X + e**(-X))
 
-    -- IAC: function should be called ARCSINH
-    
-    function ASINH (X : real) return real;
-    attribute foreign of asinh : function is "VHPIDIRECT asinh"; 
+    function ARCSINH (X : real) return real;
+    attribute foreign of arcsinh : function is "VHPIDIRECT asinh"; 
     	-- returns ln( X + sqrt( X**2 + 1))
 
-    -- IAC: function should be called ARCCOSH
-
-    function ACOSH (X : real) return real;
+    function ARCCOSH (X : real) return real;
     	-- returns ln( X + sqrt( X**2 - 1));   X >= 1
 
-    -- IAC: function should be called ARCTANH
-    
-    function ATANH (X : real) return real;
+    function ARCTANH (X : real) return real;
     	-- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
 
 end  MATH_REAL;
--- vhdl/libraries/ieee/math_real-body.vhdl.orig	2009-04-01 19:22:04.000000000 +0200
+++ vhdl/libraries/ieee/math_real-body.vhdl	2009-04-01 19:34:18.000000000 +0200
@@ -72,16 +72,41 @@
     begin
         assert false severity failure;
     end ROUND;
-    
-    function FMAX (X, Y : real ) return real is
+
+    function TRUNC (X : real ) return real is
     begin
         assert false severity failure;
-    end FMAX;
+    end TRUNC;
+
+    function c_mod (x : real; y : real) return real;
+    attribute foreign of c_mod : function is "VHPIDIRECT fmod"; 
 
-    function FMIN (X, Y : real ) return real is
+    function c_mod (x : real; y: real) return real is
     begin
         assert false severity failure;
-    end FMIN;
+    end c_mod; 
+
+    function "MOD" (X, Y : real ) return real is
+    begin
+        if y = 0.0 then 
+            assert false 
+                report "MOD(X, 0.0) is undefined" 
+                severity ERROR;
+            return 0.0; 
+        else
+            return c_mod(x,y);
+        end if;     
+    end "MOD";
+
+    function REALMAX (X, Y : real ) return real is
+    begin
+        assert false severity failure;
+    end REALMAX;
+
+    function REALMIN (X, Y : real ) return real is
+    begin
+        assert false severity failure;
+    end REALMIN;
 
     --
     -- Pseudo-random number generators
@@ -297,18 +322,18 @@
         assert false severity failure;
     end c_asin; 
 
-    function ASIN (x : real ) return real is
+    function ARCSIN (x : real ) return real is
         -- returns  -PI/2 < asin X < PI/2; | X | <= 1
     begin   
         if abs x > 1.0 then 
             assert false
-                report "Out of range parameter passed to ASIN" 
+                report "Out of range parameter passed to ARCSIN" 
                 severity ERROR;
             return x;
         else
             return c_asin(x);
         end if; 
-    end ASIN; 
+    end ARCSIN; 
    
     function c_acos (x : real ) return real;
     attribute foreign of c_acos : function is "VHPIDIRECT acos"; 
@@ -318,24 +343,24 @@
         assert false severity failure;
     end c_acos; 
 
-    function ACOS (x : REAL) return REAL is
+    function ARCCOS (x : REAL) return REAL is
     	-- returns  0 < acos X < PI; | X | <= 1
     begin  
       if abs x > 1.0 then 
          assert false 
-            report "Out of range parameter passed to ACOS" 
+            report "Out of range parameter passed to ARCCOS" 
 			severity ERROR; 
          return x;
       else
          return c_acos(x);
       end if;
-    end ACOS; 
+    end ARCCOS; 
    
-   function ATAN (x : REAL) return REAL is
+    function ARCTAN (x : REAL) return REAL is
     	-- returns  -PI/2 < atan X < PI/2
-   begin
+    begin
         assert false severity failure;
-   end ATAN; 
+    end ARCTAN; 
 
     function c_atan2 (x : real; y : real) return real;
     attribute foreign of c_atan2 : function is "VHPIDIRECT atan2"; 
@@ -345,7 +370,7 @@
         assert false severity failure;
     end c_atan2; 
 
-    function ATAN2 (x : REAL; y : REAL) return REAL is 
+    function ARCTAN (x : REAL; y : REAL) return REAL is 
         -- returns  atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
     begin   
         if y = 0.0 and x = 0.0 then 
@@ -356,7 +381,7 @@
         else
             return c_atan2(x,y);
         end if;     
-    end ATAN2; 
+    end ARCTAN; 
 
 
     function SINH (X : real) return real is
@@ -377,11 +402,11 @@
         assert false severity failure;
     end TANH;
     
-    function ASINH (X : real) return real is
+    function ARCSINH (X : real) return real is
     	-- returns ln( X + sqrt( X**2 + 1))
     begin
         assert false severity failure;
-    end ASINH;
+    end ARCSINH;
 
     function c_acosh (x : real ) return real;
     attribute foreign of c_acosh : function is "VHPIDIRECT acosh"; 
@@ -391,16 +416,16 @@
         assert false severity failure;
     end c_acosh;
 
-    function ACOSH (X : real) return real is
+    function ARCCOSH (X : real) return real is
     	-- returns ln( X + sqrt( X**2 - 1));   X >= 1
     begin
       	if abs x >= 1.0 then 
-         	assert false report "Out of range parameter passed to ACOSH" 
+         	assert false report "Out of range parameter passed to ARCCOSH" 
 			severity ERROR; 
          	return x;
       	end if; 
         return c_acosh(x);
-    end ACOSH;
+    end ARCCOSH;
 
     function c_atanh (x : real ) return real;
     attribute foreign of c_atanh : function is "VHPIDIRECT atanh"; 
@@ -410,15 +435,15 @@
         assert false severity failure;
     end c_atanh;
 
-    function ATANH (X : real) return real is
+    function ARCTANH (X : real) return real is
     	-- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
     begin
       	if abs x < 1.0 then 
-        	assert false report "Out of range parameter passed to ATANH" 
+        	assert false report "Out of range parameter passed to ARCTANH" 
 			severity ERROR; 
         	return x;
       	end if; 
         return c_atanh(x);
-    end ATANH; 
+    end ARCTANH; 
 
 end  MATH_REAL;
--- vhdl/libraries/ieee/math_complex-body.vhdl.orig	2009-04-02 12:08:47.000000000 +0200
+++ vhdl/libraries/ieee/math_complex-body.vhdl	2009-04-02 12:09:18.000000000 +0200
@@ -119,7 +119,7 @@
     function COMPLEX_TO_POLAR(Z: in complex ) return complex_polar is
     	-- converts complex to complex_polar
     begin
-    		return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),atan2(z.re,z.im));
+    		return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),ARCTAN(z.re,z.im));
     end COMPLEX_TO_POLAR;
 
     function POLAR_TO_COMPLEX(Z: in complex_polar ) return complex is


Index: ghdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ghdl.spec	15 Mar 2009 19:54:17 -0000	1.46
+++ ghdl.spec	2 Apr 2009 14:00:20 -0000	1.47
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.4%{?dist}
+Release: 0.%{ghdlsvnver}svn.5%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -21,6 +21,7 @@
 Patch104: ghdl-svn110-libgnat44.patch
 Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
+Patch107: ieee-mathreal.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -116,6 +117,7 @@
 pushd ghdl-%{ghdlver}
 %patch100 -p1
 %patch103 -p0 -b .noruntime
+%patch107 -p0 -b .ieeemathreal
 %{__mv} vhdl ../gcc/
 popd
 #patch102 -p1 -b .makeinfo
@@ -303,6 +305,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.5
+- make ieee.math_real more standards compliant
+
 * Sun Mar 15 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.4
 - gnat version is now 4.4
 



From rhughes at fedoraproject.org  Thu Apr  2 14:05:22 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu,  2 Apr 2009 14:05:22 +0000 (UTC)
Subject: rpms/gnome-keyring/devel
	gnome-keyring-2.26.0-egg-endless-loop.patch, 
	NONE, 1.1 gnome-keyring.spec, 1.118, 1.119
Message-ID: <20090402140522.9A68470120@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13452

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.26.0-egg-endless-loop.patch 
Log Message:
* Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-2
- Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
  would hang when re-allocating from a pool of secure memory.


gnome-keyring-2.26.0-egg-endless-loop.patch:

--- NEW FILE gnome-keyring-2.26.0-egg-endless-loop.patch ---
diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
index a215364..ba0cf5c 100644
--- a/egg/egg-secure-memory.c
+++ b/egg/egg-secure-memory.c
@@ -341,7 +341,7 @@ sec_insert_cell_ring (Cell **ring, Cell *cell)
 	/* Insert back into the mix of available memory */ 
 	if (*ring) { 
 		cell->next = (*ring)->next;
-		cell->prev = (*ring)->prev;
+		cell->prev = *ring;
 		cell->next->prev = cell;
 		cell->prev->next = cell;
 	} else {


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnome-keyring.spec	16 Mar 2009 12:52:16 -0000	1.118
+++ gnome-keyring.spec	2 Apr 2009 14:04:52 -0000	1.119
@@ -8,12 +8,16 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+# already in gnome svn, fixes a nasty bug described in http://bugzilla.gnome.org/show_bug.cgi?id=575247
+Patch0:    gnome-keyring-2.26.0-egg-endless-loop.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
@@ -65,6 +69,7 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .nasty-endless-loop
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -141,6 +146,10 @@
 
 
 %changelog
+* Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-2
+- Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
+  would hang when re-allocating from a pool of secure memory.
+
 * Mon Mar 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From atkac at fedoraproject.org  Thu Apr  2 14:06:12 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  2 Apr 2009 14:06:12 +0000 (UTC)
Subject: rpms/libbind/devel .cvsignore, 1.3, 1.4 libbind.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090402140612.C277D70120@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/libbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13714

Modified Files:
	.cvsignore libbind.spec sources 
Log Message:
- update to final 6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbind/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 14:35:24 -0000	1.3
+++ .cvsignore	2 Apr 2009 14:05:42 -0000	1.4
@@ -1,2 +1,2 @@
-libbind-6.0rc1.tar.gz
+libbind-6.0.tar.gz
 libbind.pc


Index: libbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbind/devel/libbind.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libbind.spec	9 Mar 2009 14:35:24 -0000	1.2
+++ libbind.spec	2 Apr 2009 14:05:42 -0000	1.3
@@ -1,9 +1,10 @@
-%define PREVER rc1
-%define VERSION %{version}%{PREVER}
+#%define PREVER rc1
+#%define VERSION %{version}%{PREVER}
+%define VERSION %{version}
 
 Name:		libbind
 Version:	6.0
-Release:	0.4.%{PREVER}%{?dist}
+Release:	1%{?dist}
 Summary:	ISC's standard resolver library
 
 Group:		System Environment/Libraries
@@ -106,6 +107,9 @@
 %{_mandir}/man7/libbind_*
 
 %changelog
+* Thu Apr 02 2009 Adam Tkac <atkac redhat com> 6.0-1
+- update to final 6.0
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> 6.0-0.4.rc1
 - updated to 6.0rc1
 - added pkg-config file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbind/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2009 14:35:24 -0000	1.3
+++ sources	2 Apr 2009 14:05:42 -0000	1.4
@@ -1,2 +1,2 @@
-6bed81bcaffa54de99c5d1b08aae7271  libbind-6.0rc1.tar.gz
+3e4e36fa39d0275ef97f74b737f30f0b  libbind-6.0.tar.gz
 4290a468430ce9b3e3ae7d88ccc4666d  libbind.pc



From rdieter at fedoraproject.org  Thu Apr  2 14:10:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:10:28 +0000 (UTC)
Subject: rpms/kdebindings/F-9 kdebindings-qyoto-examples.patch, NONE,
	1.1 kdebindings-qyoto-includes.patch, NONE, 1.1 qyoto.pc, NONE,
	1.1 .cvsignore, 1.45, 1.46 kdebindings.spec, 1.113,
	1.114 sources, 1.54, 1.55
Message-ID: <20090402141028.BC09070120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14544

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-qyoto-examples.patch 
	kdebindings-qyoto-includes.patch qyoto.pc 
Log Message:
sync from devel/ branch for 4.2.2 goodness


kdebindings-qyoto-examples.patch:

--- NEW FILE kdebindings-qyoto-examples.patch ---
diff -U 5 -r csharp/plasma/CMakeLists.txt csharp/plasma/CMakeLists.txt
--- csharp/plasma/CMakeLists.txt	2008-12-10 11:12:50.000000000 -0500
+++ csharp/plasma/CMakeLists.txt	2009-03-19 23:47:56.000000000 -0400
@@ -2,11 +2,11 @@
 
 IF (NOT QT4_FOUND)
 	FIND_PACKAGE(Qt4 REQUIRED)
 ENDIF (NOT QT4_FOUND)
 
-add_subdirectory( examples )
+# add_subdirectory( examples )
 
 SET(SRC_CPP src/plasma.cpp src/plasmahandlers.cpp)
 
 SET(SRC_CS src/AssemblyInfo.cs 
  src/PlasmaScripting_DataEngine.cs

kdebindings-qyoto-includes.patch:

--- NEW FILE kdebindings-qyoto-includes.patch ---
diff -r -U 5 csharp/kimono/src/marshall_macros_kde.h csharp/kimono/src/marshall_macros_kde.h
--- csharp/kimono/src/marshall_macros_kde.h	2008-11-28 10:33:04.000000000 -0500
+++ csharp/kimono/src/marshall_macros_kde.h	2009-03-17 00:40:26.000000000 -0400
@@ -1,6 +1,7 @@
 #include <ksharedptr.h>
+#include <cstdio>
 
 template<class Item, const char *ItemSTR>
 void marshall_KSharedPtr(Marshall *m) {
 	switch(m->action()) {
 	case Marshall::FromObject:
diff -r -U 5 csharp/qyoto/src/qyotosmokebinding.cpp csharp/qyoto/src/qyotosmokebinding.cpp
--- csharp/qyoto/src/qyotosmokebinding.cpp	2009-01-06 12:19:24.000000000 -0500
+++ csharp/qyoto/src/qyotosmokebinding.cpp	2009-03-16 23:46:55.000000000 -0400
@@ -11,16 +11,16 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
-#include <stdlib.h>
 #include "qyotosmokebinding.h"
 #include "qyoto.h"
 #include "virtualmethodcall.h"
 
 #include <cstdlib>
+#include <cstdio>
 
 #include <qt_smoke.h>
 
 #if QT_VERSION >= 0x40200
 	#include <QVariant>


--- NEW FILE qyoto.pc ---
Name: Qyoto
Description: Qt .NET/Mono bindings
Version: 4.5.0
Libs: -r:qt-dotnet


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	8 Jan 2009 18:25:14 -0000	1.45
+++ .cvsignore	2 Apr 2009 14:09:58 -0000	1.46
@@ -1 +1 @@
-kdebindings-4.1.4.tar.bz2
+kdebindings-4.2.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdebindings.spec	27 Feb 2009 16:18:56 -0000	1.113
+++ kdebindings.spec	2 Apr 2009 14:09:58 -0000	1.114
@@ -1,11 +1,12 @@
-# FIXME/TODO: BRs for Java (krossjava), C# (qyoto, kimono) and PHP (php-qt) support?
-
 # define to enable these optional bits
-#define csharp 1
+%ifnarch ppc64
+%define csharp 1
+%endif
 %define falcon 1
-#define php 1
+%define php 1
 %define ruby 1
 %define smoke 1
+%define java 0
 
 %define pykde4_akonadi 1
 %define pyqt4_version 4.4.4
@@ -21,37 +22,61 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source1: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qyoto/qyoto.pc
 
+# patch to disable examples (trouble with them installing to the buildroot)
+Patch0:  kdebindings-qyoto-examples.patch
 # upstream patches
+Patch99: kdebindings-qyoto-includes.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
-BuildRequires:  plasma-devel >= %{version}
+BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-%{?falcon:BuildRequires:  Falcon-devel >= 0.8.12}
-%{?csharp:BuildRequires:  mono-core}
 BuildRequires:  python-devel
-%{?ruby:BuildRequires:  ruby-devel ruby}
-BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
+BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
 BuildRequires:  soprano-devel
+%if 0%{?csharp}
+BuildRequires:  mono-core
+BuildRequires:  mono-devel
+%endif
+%if 0%{?falcon}
+BuildRequires:  Falcon-devel >= 0.8.12
+%endif
+%if 0%{?php}
+BuildRequires:  php-devel
+%endif
+%if 0%{?ruby}
+BuildRequires:  ruby-devel
+BuildRequires:  ruby
+%endif
+%if 0%{?java}
+# TODO: kross-java is a mess, not sure what it needs to build
+# CMakeLists.txt is also not portable (only gcj and i486 hardcoded)
+# -- mathstuf
+BuildRequires:  java-1.6.0-openjdk-devel
+%endif
 
-Requires: kdelibs4 >= %{version}
+Requires:       kdelibs4 >= %{version}
 
-%{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
+%if ! 0%{?devel}
+Obsoletes:      kdebindings-devel < %{version}-%{release}
+%endif
 
 %description
 KDE bindings to non-C++ languages
@@ -63,7 +88,7 @@
 Requires: PyQt4 >= %{pyqt4_version}
 %if ! 0%{?pykde4_akonadi}
 Provides: PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} = %{version}
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
 %endif
 %description -n PyKDE4
 %{summary}.
@@ -72,7 +97,7 @@
 Summary: Akonadi runtime support for PyKDE4 
 Group: Development/Languages 
 Requires: PyKDE4 = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} = %{version} 
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version} 
 %description -n PyKDE4-akonadi 
 %{summary}.
 
@@ -95,6 +120,34 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%if 0%{?csharp}
+%package -n kimono
+Group:    Development/Languages
+Summary:  C# bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: qyoto = %{version}-%{release}
+Provides: kimono4 = %{version}-%{release}
+%description -n kimono
+%{summary}.
+
+%package -n qyoto
+Group:    Development/Languages
+Summary:  C# bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: qyoto4 = %{version}-%{release}
+%description -n qyoto
+%{summary}.
+
+%package -n qyoto-devel
+Group:    Development/Languages
+Summary:  Development files for qyoto
+Requires: qyoto = %{version}-%{release}
+Requires: mono-devel
+Provides: qyoto4-devel = %{version}-%{release}
+%description -n qyoto-devel
+%{summary}.
+%endif
+
 %if 0%{?ruby}
 %package -n korundum
 Group:    Development/Languages
@@ -107,7 +160,7 @@
 
 %package -n korundum-devel
 Group:    Development/Languages
-Summary:  Development files for korundum 
+Summary:  Development files for korundum
 Requires: QtRuby-devel
 Requires: korundum = %{version}-%{release}
 Provides: korundum4-devel = %{version}-%{release}
@@ -124,21 +177,40 @@
 
 %package -n QtRuby-devel
 Group:    Development/Languages
-Summary:  Development files for QtRuby 
+Summary:  Development files for QtRuby
 Requires: QtRuby = %{version}-%{release}
 Provides: QtRuby4-devel = %{version}-%{release}
 %description -n QtRuby-devel
 %{summary}.
 %endif
 
+%if 0%{?php}
+%package -n php-qt
+Group:    Development/Languages
+Summary:  PHP bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: php-qt4 = %{version}-%{release}
+%description -n php-qt
+%{summary}.
+
+%package -n php-qt-devel
+Group:    Development/Languages
+Summary:  Development files for php-qt
+Requires: php-qt = %{version}-%{release}
+Provides: php-qt4-devel = %{version}-%{release}
+%description -n php-qt-devel
+%{summary}.
+%endif
+
 %package -n kross-python
 Group:    Development/Languages
 Summary:  Kross plugin for python
 Requires: kdelibs4 >= %{version}
-Provides: kross(python) = ^{version]-%{release}
+Provides: kross(python) = %{version}-%{release}
 %description -n kross-python
 Python plugin for the Kross archtecture in KDE4.
 
+%if 0%{?ruby}
 %package -n kross-ruby
 Group:    Development/Languages
 Summary:  Kross plugin for ruby
@@ -147,7 +219,9 @@
 Provides: kross(ruby) = %{version}-%{release}
 %description -n kross-ruby
 Ruby plugin for the Kross archtecture in KDE4.
+%endif
 
+%if 0%{?falcon}
 %package -n kross-falcon
 Group:    Development/Languages
 Summary:  Kross plugin for falcon
@@ -156,32 +230,65 @@
 Provides: kross(falcon) = %{version}-%{release}
 %description -n kross-falcon
 Falcon plugin for the Kross archtecture in KDE4.
+%endif
 
 
 %prep
 %setup -q
+%patch0
+%patch99
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-# FIXME/TODO: Get csharp to compile
 %{cmake_kde4} \
-  %{!?csharp:-DBUILD_csharp=OFF} \
-  %{?falcon:-DBUILD_falcon=ON -DENABLE_KROSSFALCON=ON} \
-  %{!?php:-DBUILD_php=OFF} \
-  %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
-  %{!?smoke:-DBUILD_smoke=OFF} \
+  %if 0%{?csharp}
+    -DENABLE_QYOTO=ON \
+  %else
+    -DBUILD_csharp=OFF \
+  %endif
+  %if 0%{?falcon}
+    -DENABLE_KROSSFALCON=ON \
+  %else
+    -DBUILD_falcon=OFF \
+  %endif
+  %if 0%{?php}
+    -DENABLE_PHP-QT=ON \
+  %else
+    -DBUILD_php=OFF \
+  %endif
+  %if 0%{?ruby}
+    -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} \
+    -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} \
+  %else
+    -DBUILD_ruby=OFF \
+  %endif
+  %if 0%{?smoke}
+    -DENABLE_SMOKE=ON \
+  %else
+    -DBUILD_smoke=OFF \
+  %endif
+  %if 0%{?java}
+    -DENABLE_KROSSJAVA=ON \
+  %else
+    -DBUILD_java=OFF \
+  %endif
   ..
 popd
 
 # smp build not recommended (upstream)
 make -C %{_target_platform}
 
-
 %install
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?csharp}
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p %{SOURCE1} %{buildroot}%{_datadir}/pkgconfig/
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -229,6 +336,64 @@
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
+%if 0%{?csharp}
+%files -n kimono
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kimonopluginfactory.so
+%{_kde4_libdir}/libakonadi-sharp.so
+%{_kde4_libdir}/libkhtml-sharp.so
+%{_kde4_libdir}/libkimono.so
+%{_kde4_libdir}/libktexteditor-sharp.so
+%{_kde4_libdir}/libnepomuk-sharp.so
+%{_kde4_libdir}/libplasma-sharp.so
+%{_kde4_libdir}/libsoprano-sharp.so
+%{_kde4_libdir}/mono/2.0/akonadi.dll
+%{_kde4_libdir}/mono/2.0/kde-dotnet.dll
+%{_kde4_libdir}/mono/2.0/khtml-dll.dll
+%{_kde4_libdir}/mono/2.0/ktexteditor-dotnet.dll
+%{_kde4_libdir}/mono/2.0/nepomuk-dll.dll
+%{_kde4_libdir}/mono/2.0/plasma-dll.dll
+%{_kde4_libdir}/mono/2.0/soprano.dll
+%{_kde4_libdir}/mono/gac/akonadi/
+%{_kde4_libdir}/mono/gac/kde-dotnet/
+%{_kde4_libdir}/mono/gac/khtml-dll/
+%{_kde4_libdir}/mono/gac/ktexteditor-dotnet/
+%{_kde4_libdir}/mono/gac/nepomuk-dll/
+%{_kde4_libdir}/mono/gac/plasma-dll/
+%{_kde4_libdir}/mono/gac/soprano/
+%{_kde4_appsdir}/plasma_scriptengine_kimono/
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-applet.desktop
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-dataengine.desktop
+
+%files -n qyoto
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libqtscript-sharp.so
+%{_kde4_libdir}/libqttest-sharp.so
+%{_kde4_libdir}/libqtuitools-sharp.so
+%{_kde4_libdir}/libqtwebkit-sharp.so
+%{_kde4_libdir}/libqyoto.so
+%{_kde4_libdir}/libqyotoshared.so.1
+%{_kde4_libdir}/libqyotoshared.so.1.0.0
+%{_kde4_libdir}/mono/2.0/qt-dotnet.dll
+%{_kde4_libdir}/mono/2.0/qtscript.dll
+%{_kde4_libdir}/mono/2.0/qttest.dll
+%{_kde4_libdir}/mono/2.0/qtuitools.dll
+%{_kde4_libdir}/mono/2.0/qtwebkit.dll
+%{_kde4_libdir}/mono/gac/qt-dotnet/
+%{_kde4_libdir}/mono/gac/qtscript/
+%{_kde4_libdir}/mono/gac/qttest/
+%{_kde4_libdir}/mono/gac/qtuitools/
+%{_kde4_libdir}/mono/gac/qtwebkit/
+
+%files -n qyoto-devel
+%defattr(-,root,root,-)
+%{_bindir}/csrcc
+%{_bindir}/uics
+%{_includedir}/qyoto/
+%{_kde4_libdir}/libqyotoshared.so
+%{_datadir}/pkgconfig/qyoto.pc
+%endif
+
 %if 0%{?ruby}
 %files -n korundum
 %defattr(-,root,root,-)
@@ -280,6 +445,16 @@
 %{_kde4_libdir}/libqtruby4shared.so
 %endif
 
+%if 0%{?php}
+%files -n php-qt
+%defattr(-,root,root,-)
+%{_libdir}/php/modules/php_qt.so
+
+%files -n php-qt-devel
+%defattr(-,root,root,-)
+%{_bindir}/phpuic
+%endif
+
 %files -n kross-python
 %defattr(-,root,root,-)
 # unversioned library
@@ -299,7 +474,36 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- relax dep on kdepimlibs-akonadi
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-8
+- Only install the .pc file if building csharp/qyoto support
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-7
+- Fix install line
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-6
+- Create pkgconfig directory
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-5
+- Ship qyoto.pc file as well
+- Add dependency on mono-devel from qyoto-devel
+
+* Fri Mar 20 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-4
+- Don't enable csharp on ppc64
+
+* Fri Mar 20 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-3
+- Clean up conditionals
+- Enable PHP and C# bindings
+
+* Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- fix typos in Provides: kross(python)
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Than Ngo <than at redhat.com> - 4.2.0-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	27 Feb 2009 16:18:56 -0000	1.54
+++ sources	2 Apr 2009 14:09:58 -0000	1.55
@@ -1 +1 @@
-8b81bc56e77404fd377af56224bd966f  kdebindings-4.2.1.tar.bz2
+56adf7d276957d87102457165739f764  kdebindings-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 14:12:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:12:04 +0000 (UTC)
Subject: rpms/kdebindings/F-10 kdebindings-qyoto-examples.patch, NONE,
	1.1 kdebindings-qyoto-includes.patch, NONE, 1.1 qyoto.pc, NONE,
	1.1 .cvsignore, 1.51, 1.52 kdebindings.spec, 1.153,
	1.154 sources, 1.59, 1.60
Message-ID: <20090402141204.218AE70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14821

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-qyoto-examples.patch 
	kdebindings-qyoto-includes.patch qyoto.pc 
Log Message:
sync devel/ branch for 4.2.2 goodness


kdebindings-qyoto-examples.patch:

--- NEW FILE kdebindings-qyoto-examples.patch ---
diff -U 5 -r csharp/plasma/CMakeLists.txt csharp/plasma/CMakeLists.txt
--- csharp/plasma/CMakeLists.txt	2008-12-10 11:12:50.000000000 -0500
+++ csharp/plasma/CMakeLists.txt	2009-03-19 23:47:56.000000000 -0400
@@ -2,11 +2,11 @@
 
 IF (NOT QT4_FOUND)
 	FIND_PACKAGE(Qt4 REQUIRED)
 ENDIF (NOT QT4_FOUND)
 
-add_subdirectory( examples )
+# add_subdirectory( examples )
 
 SET(SRC_CPP src/plasma.cpp src/plasmahandlers.cpp)
 
 SET(SRC_CS src/AssemblyInfo.cs 
  src/PlasmaScripting_DataEngine.cs

kdebindings-qyoto-includes.patch:

--- NEW FILE kdebindings-qyoto-includes.patch ---
diff -r -U 5 csharp/kimono/src/marshall_macros_kde.h csharp/kimono/src/marshall_macros_kde.h
--- csharp/kimono/src/marshall_macros_kde.h	2008-11-28 10:33:04.000000000 -0500
+++ csharp/kimono/src/marshall_macros_kde.h	2009-03-17 00:40:26.000000000 -0400
@@ -1,6 +1,7 @@
 #include <ksharedptr.h>
+#include <cstdio>
 
 template<class Item, const char *ItemSTR>
 void marshall_KSharedPtr(Marshall *m) {
 	switch(m->action()) {
 	case Marshall::FromObject:
diff -r -U 5 csharp/qyoto/src/qyotosmokebinding.cpp csharp/qyoto/src/qyotosmokebinding.cpp
--- csharp/qyoto/src/qyotosmokebinding.cpp	2009-01-06 12:19:24.000000000 -0500
+++ csharp/qyoto/src/qyotosmokebinding.cpp	2009-03-16 23:46:55.000000000 -0400
@@ -11,16 +11,16 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
-#include <stdlib.h>
 #include "qyotosmokebinding.h"
 #include "qyoto.h"
 #include "virtualmethodcall.h"
 
 #include <cstdlib>
+#include <cstdio>
 
 #include <qt_smoke.h>
 
 #if QT_VERSION >= 0x40200
 	#include <QVariant>


--- NEW FILE qyoto.pc ---
Name: Qyoto
Description: Qt .NET/Mono bindings
Version: 4.5.0
Libs: -r:qt-dotnet


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	24 Jan 2009 03:58:46 -0000	1.51
+++ .cvsignore	2 Apr 2009 14:11:33 -0000	1.52
@@ -1,5 +1 @@
-kdebindings-4.1.2.tar.bz2
-kdebindings-4.1.80.tar.bz2
-kdebindings-4.1.85.tar.bz2
-kdebindings-4.1.96.tar.bz2
-kdebindings-4.2.0.tar.bz2
+kdebindings-4.2.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdebindings.spec	27 Feb 2009 16:18:55 -0000	1.153
+++ kdebindings.spec	2 Apr 2009 14:11:33 -0000	1.154
@@ -1,11 +1,12 @@
-# FIXME/TODO: BRs for Java (krossjava), C# (qyoto, kimono) and PHP (php-qt) support?
-
 # define to enable these optional bits
-#define csharp 1
+%ifnarch ppc64
+%define csharp 1
+%endif
 %define falcon 1
-#define php 1
+%define php 1
 %define ruby 1
 %define smoke 1
+%define java 0
 
 %define pykde4_akonadi 1
 %define pyqt4_version 4.4.4
@@ -21,37 +22,61 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source1: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qyoto/qyoto.pc
 
+# patch to disable examples (trouble with them installing to the buildroot)
+Patch0:  kdebindings-qyoto-examples.patch
 # upstream patches
+Patch99: kdebindings-qyoto-includes.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
-BuildRequires:  plasma-devel >= %{version}
+BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-%{?falcon:BuildRequires:  Falcon-devel >= 0.8.12}
-%{?csharp:BuildRequires:  mono-core}
 BuildRequires:  python-devel
-%{?ruby:BuildRequires:  ruby-devel ruby}
-BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
+BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
 BuildRequires:  soprano-devel
+%if 0%{?csharp}
+BuildRequires:  mono-core
+BuildRequires:  mono-devel
+%endif
+%if 0%{?falcon}
+BuildRequires:  Falcon-devel >= 0.8.12
+%endif
+%if 0%{?php}
+BuildRequires:  php-devel
+%endif
+%if 0%{?ruby}
+BuildRequires:  ruby-devel
+BuildRequires:  ruby
+%endif
+%if 0%{?java}
+# TODO: kross-java is a mess, not sure what it needs to build
+# CMakeLists.txt is also not portable (only gcj and i486 hardcoded)
+# -- mathstuf
+BuildRequires:  java-1.6.0-openjdk-devel
+%endif
 
-Requires: kdelibs4 >= %{version}
+Requires:       kdelibs4 >= %{version}
 
-%{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
+%if ! 0%{?devel}
+Obsoletes:      kdebindings-devel < %{version}-%{release}
+%endif
 
 %description
 KDE bindings to non-C++ languages
@@ -63,7 +88,7 @@
 Requires: PyQt4 >= %{pyqt4_version}
 %if ! 0%{?pykde4_akonadi}
 Provides: PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} = %{version}
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
 %endif
 %description -n PyKDE4
 %{summary}.
@@ -72,7 +97,7 @@
 Summary: Akonadi runtime support for PyKDE4 
 Group: Development/Languages 
 Requires: PyKDE4 = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} = %{version} 
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version} 
 %description -n PyKDE4-akonadi 
 %{summary}.
 
@@ -95,6 +120,34 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%if 0%{?csharp}
+%package -n kimono
+Group:    Development/Languages
+Summary:  C# bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: qyoto = %{version}-%{release}
+Provides: kimono4 = %{version}-%{release}
+%description -n kimono
+%{summary}.
+
+%package -n qyoto
+Group:    Development/Languages
+Summary:  C# bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: qyoto4 = %{version}-%{release}
+%description -n qyoto
+%{summary}.
+
+%package -n qyoto-devel
+Group:    Development/Languages
+Summary:  Development files for qyoto
+Requires: qyoto = %{version}-%{release}
+Requires: mono-devel
+Provides: qyoto4-devel = %{version}-%{release}
+%description -n qyoto-devel
+%{summary}.
+%endif
+
 %if 0%{?ruby}
 %package -n korundum
 Group:    Development/Languages
@@ -107,7 +160,7 @@
 
 %package -n korundum-devel
 Group:    Development/Languages
-Summary:  Development files for korundum 
+Summary:  Development files for korundum
 Requires: QtRuby-devel
 Requires: korundum = %{version}-%{release}
 Provides: korundum4-devel = %{version}-%{release}
@@ -124,21 +177,40 @@
 
 %package -n QtRuby-devel
 Group:    Development/Languages
-Summary:  Development files for QtRuby 
+Summary:  Development files for QtRuby
 Requires: QtRuby = %{version}-%{release}
 Provides: QtRuby4-devel = %{version}-%{release}
 %description -n QtRuby-devel
 %{summary}.
 %endif
 
+%if 0%{?php}
+%package -n php-qt
+Group:    Development/Languages
+Summary:  PHP bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: php-qt4 = %{version}-%{release}
+%description -n php-qt
+%{summary}.
+
+%package -n php-qt-devel
+Group:    Development/Languages
+Summary:  Development files for php-qt
+Requires: php-qt = %{version}-%{release}
+Provides: php-qt4-devel = %{version}-%{release}
+%description -n php-qt-devel
+%{summary}.
+%endif
+
 %package -n kross-python
 Group:    Development/Languages
 Summary:  Kross plugin for python
 Requires: kdelibs4 >= %{version}
-Provides: kross(python) = ^{version]-%{release}
+Provides: kross(python) = %{version}-%{release}
 %description -n kross-python
 Python plugin for the Kross archtecture in KDE4.
 
+%if 0%{?ruby}
 %package -n kross-ruby
 Group:    Development/Languages
 Summary:  Kross plugin for ruby
@@ -147,7 +219,9 @@
 Provides: kross(ruby) = %{version}-%{release}
 %description -n kross-ruby
 Ruby plugin for the Kross archtecture in KDE4.
+%endif
 
+%if 0%{?falcon}
 %package -n kross-falcon
 Group:    Development/Languages
 Summary:  Kross plugin for falcon
@@ -156,32 +230,65 @@
 Provides: kross(falcon) = %{version}-%{release}
 %description -n kross-falcon
 Falcon plugin for the Kross archtecture in KDE4.
+%endif
 
 
 %prep
 %setup -q
+%patch0
+%patch99
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-# FIXME/TODO: Get csharp to compile
 %{cmake_kde4} \
-  %{!?csharp:-DBUILD_csharp=OFF} \
-  %{?falcon:-DBUILD_falcon=ON -DENABLE_KROSSFALCON=ON} \
-  %{!?php:-DBUILD_php=OFF} \
-  %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
-  %{!?smoke:-DBUILD_smoke=OFF} \
+  %if 0%{?csharp}
+    -DENABLE_QYOTO=ON \
+  %else
+    -DBUILD_csharp=OFF \
+  %endif
+  %if 0%{?falcon}
+    -DENABLE_KROSSFALCON=ON \
+  %else
+    -DBUILD_falcon=OFF \
+  %endif
+  %if 0%{?php}
+    -DENABLE_PHP-QT=ON \
+  %else
+    -DBUILD_php=OFF \
+  %endif
+  %if 0%{?ruby}
+    -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} \
+    -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} \
+  %else
+    -DBUILD_ruby=OFF \
+  %endif
+  %if 0%{?smoke}
+    -DENABLE_SMOKE=ON \
+  %else
+    -DBUILD_smoke=OFF \
+  %endif
+  %if 0%{?java}
+    -DENABLE_KROSSJAVA=ON \
+  %else
+    -DBUILD_java=OFF \
+  %endif
   ..
 popd
 
 # smp build not recommended (upstream)
 make -C %{_target_platform}
 
-
 %install
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?csharp}
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p %{SOURCE1} %{buildroot}%{_datadir}/pkgconfig/
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -229,6 +336,64 @@
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
+%if 0%{?csharp}
+%files -n kimono
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kimonopluginfactory.so
+%{_kde4_libdir}/libakonadi-sharp.so
+%{_kde4_libdir}/libkhtml-sharp.so
+%{_kde4_libdir}/libkimono.so
+%{_kde4_libdir}/libktexteditor-sharp.so
+%{_kde4_libdir}/libnepomuk-sharp.so
+%{_kde4_libdir}/libplasma-sharp.so
+%{_kde4_libdir}/libsoprano-sharp.so
+%{_kde4_libdir}/mono/2.0/akonadi.dll
+%{_kde4_libdir}/mono/2.0/kde-dotnet.dll
+%{_kde4_libdir}/mono/2.0/khtml-dll.dll
+%{_kde4_libdir}/mono/2.0/ktexteditor-dotnet.dll
+%{_kde4_libdir}/mono/2.0/nepomuk-dll.dll
+%{_kde4_libdir}/mono/2.0/plasma-dll.dll
+%{_kde4_libdir}/mono/2.0/soprano.dll
+%{_kde4_libdir}/mono/gac/akonadi/
+%{_kde4_libdir}/mono/gac/kde-dotnet/
+%{_kde4_libdir}/mono/gac/khtml-dll/
+%{_kde4_libdir}/mono/gac/ktexteditor-dotnet/
+%{_kde4_libdir}/mono/gac/nepomuk-dll/
+%{_kde4_libdir}/mono/gac/plasma-dll/
+%{_kde4_libdir}/mono/gac/soprano/
+%{_kde4_appsdir}/plasma_scriptengine_kimono/
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-applet.desktop
+%{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-dataengine.desktop
+
+%files -n qyoto
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libqtscript-sharp.so
+%{_kde4_libdir}/libqttest-sharp.so
+%{_kde4_libdir}/libqtuitools-sharp.so
+%{_kde4_libdir}/libqtwebkit-sharp.so
+%{_kde4_libdir}/libqyoto.so
+%{_kde4_libdir}/libqyotoshared.so.1
+%{_kde4_libdir}/libqyotoshared.so.1.0.0
+%{_kde4_libdir}/mono/2.0/qt-dotnet.dll
+%{_kde4_libdir}/mono/2.0/qtscript.dll
+%{_kde4_libdir}/mono/2.0/qttest.dll
+%{_kde4_libdir}/mono/2.0/qtuitools.dll
+%{_kde4_libdir}/mono/2.0/qtwebkit.dll
+%{_kde4_libdir}/mono/gac/qt-dotnet/
+%{_kde4_libdir}/mono/gac/qtscript/
+%{_kde4_libdir}/mono/gac/qttest/
+%{_kde4_libdir}/mono/gac/qtuitools/
+%{_kde4_libdir}/mono/gac/qtwebkit/
+
+%files -n qyoto-devel
+%defattr(-,root,root,-)
+%{_bindir}/csrcc
+%{_bindir}/uics
+%{_includedir}/qyoto/
+%{_kde4_libdir}/libqyotoshared.so
+%{_datadir}/pkgconfig/qyoto.pc
+%endif
+
 %if 0%{?ruby}
 %files -n korundum
 %defattr(-,root,root,-)
@@ -280,6 +445,16 @@
 %{_kde4_libdir}/libqtruby4shared.so
 %endif
 
+%if 0%{?php}
+%files -n php-qt
+%defattr(-,root,root,-)
+%{_libdir}/php/modules/php_qt.so
+
+%files -n php-qt-devel
+%defattr(-,root,root,-)
+%{_bindir}/phpuic
+%endif
+
 %files -n kross-python
 %defattr(-,root,root,-)
 # unversioned library
@@ -299,7 +474,36 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- relax dep on kdepimlibs-akonadi
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-8
+- Only install the .pc file if building csharp/qyoto support
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-7
+- Fix install line
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-6
+- Create pkgconfig directory
+
+* Sat Mar 28 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-5
+- Ship qyoto.pc file as well
+- Add dependency on mono-devel from qyoto-devel
+
+* Fri Mar 20 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-4
+- Don't enable csharp on ppc64
+
+* Fri Mar 20 2009 Ben Boeckel <Mathstuf at gmail.com> - 4.2.1-3
+- Clean up conditionals
+- Enable PHP and C# bindings
+
+* Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- fix typos in Provides: kross(python)
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Than Ngo <than at redhat.com> - 4.2.0-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	27 Feb 2009 16:18:55 -0000	1.59
+++ sources	2 Apr 2009 14:11:33 -0000	1.60
@@ -1 +1 @@
-8b81bc56e77404fd377af56224bd966f  kdebindings-4.2.1.tar.bz2
+56adf7d276957d87102457165739f764  kdebindings-4.2.2.tar.bz2



From lkundrak at fedoraproject.org  Thu Apr  2 14:23:52 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  2 Apr 2009 14:23:52 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/EL-5 NetworkManager-vpnc.spec,1.24,1.25
Message-ID: <20090402142352.BC7C270120@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15824

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
* Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.2
- Work around EPEL buildsys bug by removing versioned BRs



Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/NetworkManager-vpnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- NetworkManager-vpnc.spec	2 Apr 2009 07:01:29 -0000	1.24
+++ NetworkManager-vpnc.spec	2 Apr 2009 14:23:22 -0000	1.25
@@ -10,7 +10,7 @@
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0.99
-Release:   1%{svn_snapshot}%{?dist}.1
+Release:   1%{svn_snapshot}%{?dist}.2
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -20,8 +20,10 @@
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
-BuildRequires: NetworkManager-devel   >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+# See https://fedorahosted.org/fedora-infrastructure/ticket/1202
+#BuildRequires: NetworkManager-devel   >= %{nm_version}
+#BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: NetworkManager-devel NetworkManager-glib-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
@@ -99,6 +101,9 @@
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.2
+- Work around EPEL buildsys bug by removing versioned BRs
+
 * Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.1
 - Backport to EL-5
 



From rmeggins at fedoraproject.org  Thu Apr  2 14:29:15 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:29:15 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 bug463991-bdb47.patch,1.3,NONE
Message-ID: <20090402142915.AFA4370120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17075/F-10

Removed Files:
	bug463991-bdb47.patch 
Log Message:
exclude ppc for now - too many problems - will require some porting work to make viable


--- bug463991-bdb47.patch DELETED ---



From rmeggins at fedoraproject.org  Thu Apr  2 14:29:45 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:29:45 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 fedora-ds-base.spec,1.22,1.23
Message-ID: <20090402142945.EA01F70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17075/F-9

Modified Files:
	fedora-ds-base.spec 
Log Message:
exclude ppc for now - too many problems - will require some porting work to make viable


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.22
+++ fedora-ds-base.spec	2 Apr 2009 14:29:15 -0000	1.23
@@ -5,11 +5,13 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# the ppc builds have many problems - needs porting
+ExcludeArch:      ppc ppc64
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -169,6 +171,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Thu Apr  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
+- exclude ppc builds - needs extensive porting work
+
 * Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
 - new release 1.2.0
 - Made devel package depend on mozldap-devel



From rmeggins at fedoraproject.org  Thu Apr  2 14:29:46 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:29:46 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel fedora-ds-base.spec,1.28,1.29
Message-ID: <20090402142946.3D8CA70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17075/devel

Modified Files:
	fedora-ds-base.spec 
Log Message:
exclude ppc for now - too many problems - will require some porting work to make viable


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.28
+++ fedora-ds-base.spec	2 Apr 2009 14:29:15 -0000	1.29
@@ -5,11 +5,13 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# the ppc builds have many problems - needs porting
+ExcludeArch:      ppc ppc64
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -169,6 +171,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Thu Apr  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
+- exclude ppc builds - needs extensive porting work
+
 * Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
 - new release 1.2.0
 - Made devel package depend on mozldap-devel



From rmeggins at fedoraproject.org  Thu Apr  2 14:38:54 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:38:54 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/F-10 .cvsignore, 1.3, 1.4 fedora-ds-dsgw.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090402143854.C5B6A70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924/F-10

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 16:15:38 -0000	1.3
+++ .cvsignore	2 Apr 2009 14:38:24 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-dsgw-1.1.0.tar.bz2
-fedora-ds-dsgw-1.1.1.tar.bz2
+fedora-ds-dsgw-1.1.2.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-10/fedora-ds-dsgw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-dsgw.spec	4 Sep 2008 16:15:38 -0000	1.2
+++ fedora-ds-dsgw.spec	2 Apr 2009 14:38:24 -0000	1.3
@@ -2,7 +2,7 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.1
+Version:          1.1.2
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -61,12 +61,22 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section
+if [ ! -d %{_localstatedir}/run/%{pkgname}/dsgw/cookies ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}/dsgw/cookies
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
 %dir %{_sysconfdir}/%{pkgname}/dsgw
 %config(noreplace)%{_sysconfdir}/%{pkgname}/dsgw/*.conf
-%{_localstatedir}/run/%{pkgname}/dsgw
 %{_datadir}/%{pkgname}/dsgw
 %{_datadir}/%{pkgname}/manual/*/dsgw
 %{_datadir}/%{pkgname}/properties/dsgw
@@ -74,6 +84,9 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- this is the 1.1.2 release
+
 * Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
 - this is the 1.1.1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 16:15:38 -0000	1.3
+++ sources	2 Apr 2009 14:38:24 -0000	1.4
@@ -1,2 +1 @@
-b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
-fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2
+81846aa8ecc334238fde8f9a68bdd7ba  fedora-ds-dsgw-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Apr  2 14:38:55 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:38:55 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/F-9 .cvsignore, 1.3, 1.4 fedora-ds-dsgw.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090402143855.15B3770120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924/F-9

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 16:15:37 -0000	1.3
+++ .cvsignore	2 Apr 2009 14:38:24 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-dsgw-1.1.0.tar.bz2
-fedora-ds-dsgw-1.1.1.tar.bz2
+fedora-ds-dsgw-1.1.2.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-9/fedora-ds-dsgw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-dsgw.spec	4 Sep 2008 16:15:37 -0000	1.2
+++ fedora-ds-dsgw.spec	2 Apr 2009 14:38:24 -0000	1.3
@@ -2,7 +2,7 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.1
+Version:          1.1.2
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -61,12 +61,22 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section
+if [ ! -d %{_localstatedir}/run/%{pkgname}/dsgw/cookies ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}/dsgw/cookies
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
 %dir %{_sysconfdir}/%{pkgname}/dsgw
 %config(noreplace)%{_sysconfdir}/%{pkgname}/dsgw/*.conf
-%{_localstatedir}/run/%{pkgname}/dsgw
 %{_datadir}/%{pkgname}/dsgw
 %{_datadir}/%{pkgname}/manual/*/dsgw
 %{_datadir}/%{pkgname}/properties/dsgw
@@ -74,6 +84,9 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- this is the 1.1.2 release
+
 * Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.1-1
 - this is the 1.1.1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 16:15:37 -0000	1.3
+++ sources	2 Apr 2009 14:38:24 -0000	1.4
@@ -1,2 +1 @@
-b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
-fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2
+81846aa8ecc334238fde8f9a68bdd7ba  fedora-ds-dsgw-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Apr  2 14:38:55 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:38:55 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/devel .cvsignore, 1.3, 1.4 fedora-ds-dsgw.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090402143855.5FC1A70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-dsgw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924/devel

Modified Files:
	.cvsignore fedora-ds-dsgw.spec sources 
Log Message:
this is the 1.1.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 16:15:38 -0000	1.3
+++ .cvsignore	2 Apr 2009 14:38:25 -0000	1.4
@@ -1,2 +1 @@
-fedora-ds-dsgw-1.1.0.tar.bz2
-fedora-ds-dsgw-1.1.1.tar.bz2
+fedora-ds-dsgw-1.1.2.tar.bz2


Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/devel/fedora-ds-dsgw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-dsgw.spec	24 Feb 2009 16:27:59 -0000	1.3
+++ fedora-ds-dsgw.spec	2 Apr 2009 14:38:25 -0000	1.4
@@ -2,8 +2,8 @@
 
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
-Version:          1.1.1
-Release:          2%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -61,12 +61,22 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section
+if [ ! -d %{_localstatedir}/run/%{pkgname}/dsgw/cookies ] ; then
+    mkdir -p %{_localstatedir}/run/%{pkgname}/dsgw/cookies
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
 %dir %{_sysconfdir}/%{pkgname}/dsgw
 %config(noreplace)%{_sysconfdir}/%{pkgname}/dsgw/*.conf
-%{_localstatedir}/run/%{pkgname}/dsgw
 %{_datadir}/%{pkgname}/dsgw
 %{_datadir}/%{pkgname}/manual/*/dsgw
 %{_datadir}/%{pkgname}/properties/dsgw
@@ -74,6 +84,9 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
+- this is the 1.1.2 release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-dsgw/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 16:15:38 -0000	1.3
+++ sources	2 Apr 2009 14:38:25 -0000	1.4
@@ -1,2 +1 @@
-b0da249e798b0105012f0deab43f55e3  fedora-ds-dsgw-1.1.0.tar.bz2
-fd86e38de705e75296100d7fe9025970  fedora-ds-dsgw-1.1.1.tar.bz2
+81846aa8ecc334238fde8f9a68bdd7ba  fedora-ds-dsgw-1.1.2.tar.bz2



From rmeggins at fedoraproject.org  Thu Apr  2 14:02:12 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:02:12 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 fedora-ds-base.spec, 1.28, 1.29 ppc1.patch,
	1.1, NONE ppc2.patch, 1.1, NONE
Message-ID: <20090402140212.7D6337013C@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12087

Modified Files:
	fedora-ds-base.spec 
Removed Files:
	ppc1.patch ppc2.patch 
Log Message:
exclude ppc - needs porting


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fedora-ds-base.spec	2 Apr 2009 02:00:41 -0000	1.28
+++ fedora-ds-base.spec	2 Apr 2009 14:01:42 -0000	1.29
@@ -10,6 +10,8 @@
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# the ppc builds have many problems - needs porting
+ExcludeArch:      ppc ppc64
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -60,8 +62,6 @@
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
-Patch1:           ppc1.patch
-Patch2:           ppc2.patch
 
 %description
 Fedora Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -78,8 +78,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1
-%patch2
 cp %{SOURCE2} README.devel
 
 %build
@@ -173,8 +171,8 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
-* Wed Apr  1 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
-- added patch for ppc build
+* Thu Apr  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
+- exclude ppc builds - needs extensive porting work
 
 * Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
 - new release 1.2.0


--- ppc1.patch DELETED ---


--- ppc2.patch DELETED ---



From rmeggins at fedoraproject.org  Thu Apr  2 14:42:55 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:42:55 +0000 (UTC)
Subject: rpms/fedora-ds/F-10 fedora-ds.spec,1.2,1.3
Message-ID: <20090402144255.393EE70120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21041/F-10

Modified Files:
	fedora-ds.spec 
Log Message:
this is the 1.1.3 release


Index: fedora-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds/F-10/fedora-ds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds.spec	4 Sep 2008 16:25:16 -0000	1.2
+++ fedora-ds.spec	2 Apr 2009 14:42:24 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:          Red Hat Directory, Administration, and Console Suite
 Name:             fedora-ds
-Version:          1.1.2
+Version:          1.1.3
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
@@ -37,6 +37,9 @@
 %doc LICENSE
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - this is the 1.1.2 release
 - made noarch because Fedora is supposed to just "do the right thing" now



From rmeggins at fedoraproject.org  Thu Apr  2 14:42:55 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:42:55 +0000 (UTC)
Subject: rpms/fedora-ds/F-9 fedora-ds.spec,1.3,1.4
Message-ID: <20090402144255.5F2C370120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21041/F-9

Modified Files:
	fedora-ds.spec 
Log Message:
this is the 1.1.3 release


Index: fedora-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds/F-9/fedora-ds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds.spec	4 Sep 2008 16:25:15 -0000	1.3
+++ fedora-ds.spec	2 Apr 2009 14:42:24 -0000	1.4
@@ -1,11 +1,12 @@
 Summary:          Red Hat Directory, Administration, and Console Suite
 Name:             fedora-ds
-Version:          1.1.2
+Version:          1.1.3
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:        noarch
 
 Source:           LICENSE
 
@@ -36,6 +37,9 @@
 %doc LICENSE
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Thu Sep  4 2008 Rich Megginson <rmeggins at redhat.com> 1.1.2-1
 - this is the 1.1.2 release
 - made noarch because Fedora is supposed to just "do the right thing" now



From rmeggins at fedoraproject.org  Thu Apr  2 14:42:55 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  2 Apr 2009 14:42:55 +0000 (UTC)
Subject: rpms/fedora-ds/devel fedora-ds.spec,1.3,1.4
Message-ID: <20090402144255.A3C8370120@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21041/devel

Modified Files:
	fedora-ds.spec 
Log Message:
this is the 1.1.3 release


Index: fedora-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds/devel/fedora-ds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds.spec	24 Feb 2009 16:23:16 -0000	1.3
+++ fedora-ds.spec	2 Apr 2009 14:42:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:          Red Hat Directory, Administration, and Console Suite
 Name:             fedora-ds
-Version:          1.1.2
-Release:          2%{?dist}
+Version:          1.1.3
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -37,6 +37,9 @@
 %doc LICENSE
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
+- this is the 1.1.3 release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Thu Apr  2 14:43:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:43:54 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-9 .cvsignore, 1.27,
	1.28 kdeaccessibility.spec, 1.59, 1.60 sources, 1.32, 1.33
Message-ID: <20090402144354.B835670120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21628

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	5 Nov 2008 15:56:12 -0000	1.27
+++ .cvsignore	2 Apr 2009 14:43:24 -0000	1.28
@@ -1 +1 @@
-kdeaccessibility-4.1.3.tar.bz2
+kdeaccessibility-4.2.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdeaccessibility.spec	27 Feb 2009 14:38:23 -0000	1.59
+++ kdeaccessibility.spec	2 Apr 2009 14:43:24 -0000	1.60
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -24,8 +24,8 @@
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
 Obsoletes: kdeaccessibility-devel < 1:3.5.8 
@@ -52,11 +52,12 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
+
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
@@ -66,13 +67,22 @@
 
 %post
 /sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme mono 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/mono &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme mono 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+    touch --no-create %{_kde4_iconsdir}/mono &> /dev/null 
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null 
+    gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
+
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 
 
 %files
@@ -101,7 +111,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- scriptlet optimization
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	27 Feb 2009 14:38:23 -0000	1.32
+++ sources	2 Apr 2009 14:43:24 -0000	1.33
@@ -1 +1 @@
-4005e2acc05a2479d83386588b91668f  kdeaccessibility-4.2.1.tar.bz2
+7fd255ecf2274f868d4634b0f44e41af  kdeaccessibility-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 14:49:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:49:37 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 .cvsignore, 1.34,
	1.35 kdeaccessibility.spec, 1.64, 1.65 sources, 1.37, 1.38
Message-ID: <20090402144937.A2AEE70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23510

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	24 Jan 2009 05:47:38 -0000	1.34
+++ .cvsignore	2 Apr 2009 14:49:07 -0000	1.35
@@ -1,5 +1 @@
-kdeaccessibility-4.1.2.tar.bz2
-kdeaccessibility-4.1.80.tar.bz2
-kdeaccessibility-4.1.85.tar.bz2
-kdeaccessibility-4.1.96.tar.bz2
-kdeaccessibility-4.2.0.tar.bz2
+kdeaccessibility-4.2.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdeaccessibility.spec	27 Feb 2009 14:38:23 -0000	1.64
+++ kdeaccessibility.spec	2 Apr 2009 14:49:07 -0000	1.65
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -24,8 +24,8 @@
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
 Obsoletes: kdeaccessibility-devel < 1:3.5.8 
@@ -52,11 +52,12 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
+
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
@@ -66,13 +67,22 @@
 
 %post
 /sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme mono 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/mono &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme mono 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+    touch --no-create %{_kde4_iconsdir}/mono &> /dev/null 
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null 
+    gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
+
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 
 
 %files
@@ -101,7 +111,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- scriptlet optimization
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	27 Feb 2009 14:38:23 -0000	1.37
+++ sources	2 Apr 2009 14:49:07 -0000	1.38
@@ -1 +1 @@
-4005e2acc05a2479d83386588b91668f  kdeaccessibility-4.2.1.tar.bz2
+7fd255ecf2274f868d4634b0f44e41af  kdeaccessibility-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 14:51:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:51:27 +0000 (UTC)
Subject: rpms/kdeartwork/F-9 .cvsignore, 1.45, 1.46 kdeartwork.spec, 1.90,
	1.91 sources, 1.51, 1.52
Message-ID: <20090402145127.58BFA70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24038/F-9

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
sync from devel/ for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	5 Nov 2008 17:24:56 -0000	1.45
+++ .cvsignore	2 Apr 2009 14:50:56 -0000	1.46
@@ -1 +1 @@
-kdeartwork-4.1.3.tar.bz2
+kdeartwork-4.2.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kdeartwork.spec	27 Feb 2009 15:29:20 -0000	1.90
+++ kdeartwork.spec	2 Apr 2009 14:50:56 -0000	1.91
@@ -1,7 +1,7 @@
 Name:           kdeartwork
-Version:        4.2.1
-Release:        1%{?dist}
-Summary:        Additional artwork (themes, sound themes, ...) for KDE
+Version:        4.2.2
+Release:        3%{?dist}
+Summary:        Additional artwork for KDE
 
 License:        GPLv2
 Group:          User Interface/Desktops
@@ -9,29 +9,26 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#ifarch noarch
-%define icons 1
-#else
-%define rest 1
-#endif
-
 # We currently don't ship crystalsvg from kdeartwork because the actions have
 # been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
 # and yet not yet useful for KDE 4.
 # TODO: Revisit this issue once the renaming is complete. -- Kevin
 #define include_crystalsvg 1
 
+BuildRequires:  eigen2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
 
+%if 0%{fedora} < 11
+# upgrade path
+Requires: %{name}-sounds = %{version}-%{release}
+Requires: %{name}-wallpapers = %{version}-%{release}
+%endif
+
 %description
-Additional artwork (themes, sound themes, screensavers ...) for KDE.
+%{summary}, including additional styles, themes.
 
 %if 0%{?include_crystalsvg}
 %package -n crystalsvg-icon-theme
@@ -39,30 +36,34 @@
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
 %endif
 
-%package icons
-Summary: Additional icon themes
+%package -n kdeclassic-icon-theme 
+Summary: KDE classic icon theme 
 Group: User Interface/Desktops
-Provides: kdeclassic-icon-theme = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-%description icons
-This contains icon themes:
-* kdeclassic
+Obsoletes: kdeartwork-icons < 4.2.2-3
+Provides:  kdeartwork-icons = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n kdeclassic-icon-theme 
+%{summary}.
 
-%package extras
-Summary: Artwork Extras, including xscreensaver-based screensavers
+%package screensavers 
+Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
+Obsoletes: kdeartwork-extras < 4.2.2-3
+Provides:  kdeartwork-extras = %{version}-%{release}
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
-%description extras
+%description screensavers 
 %{summary}.
 
 %package kxs
@@ -73,102 +74,139 @@
 %description kxs
 %{summary}.
 
+%package wallpapers
+Summary: Additional wallpapers
+Group: Amusements/Graphics
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description wallpapers
+%{summary}.
+
+%package sounds
+Summary: Additional sounds
+Group: Amusements/Graphics
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description sounds
+%{summary}.
+
 
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-%endif
-
-%if 0%{?icons}
-make %{?_smp_mflags} -C %{_target_platform}/IconThemes
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%endif
 
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
 %if ! 0%{?include_crystalsvg}
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
 %endif
-%else
-rm -rf %{buildroot}%{_kde4_iconsdir}/
-%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%if 0%{?icons}
-%post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%post -n kdeclassic-icon-theme 
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%posttrans -n kdeclassic-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%postun -n kdeclassic-icon-theme 
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+fi
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
-%postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%posttrans -n crystalsvg-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 
-%if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 %endif
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_kde4_appsdir}/*
+%{_kde4_appsdir}/color-schemes/*.colors
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kstyle/
 %{_kde4_datadir}/emoticons/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/
+%{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%files extras
+%if 0%{?include_crystalsvg}
+%files -n crystalsvg-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_bindir}/*.kss
-%{_kde4_datadir}/kde4/services/ScreenSavers/*
+%{_kde4_iconsdir}/crystalsvg/
+%endif
+
+%files -n kdeclassic-icon-theme 
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/kdeclassic/
 
 %files kxs
 %defattr(-,root,root,-)
-%{_bindir}/kxs*
-%endif
+%{_kde4_bindir}/kxsconfig
+%{_kde4_bindir}/kxsrun
 
-%if 0%{?icons}
-%files icons
+%files screensavers 
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_appsdir}/kfiresaver/
+%{_kde4_appsdir}/kscreensaver/
+%{_kde4_bindir}/*.kss
+%{_kde4_datadir}/kde4/services/ScreenSavers/*
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
+%files sounds
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
-%endif
-%endif
+%{_kde4_datadir}/sounds/*
+
+%files wallpapers
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/*
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- optimize scriptlets
+- omit (unused) noarch hacks, use f10+ support
+- -extras -> -screensavers rename
+- -icons -> kdeclassic-icon-theme rename
+- main pkg, Requires: -wallpapers, -sounds (upgrade path)
+- -wallpapers, -sounds: drop Req: kdebase-workspace
+- BR: eigen2-devel
+
+* Tue Mar 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.2-2
+- split wallpapers and sounds
+- noarch subpackages
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	27 Feb 2009 15:29:20 -0000	1.51
+++ sources	2 Apr 2009 14:50:56 -0000	1.52
@@ -1 +1 @@
-2712142e1cd452f6ada441a310a971d6  kdeartwork-4.2.1.tar.bz2
+2315d64bb543decdb602b01376f5fc1e  kdeartwork-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 14:51:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:51:27 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 .cvsignore, 1.51, 1.52 kdeartwork.spec, 1.96, 
	1.97 sources, 1.56, 1.57
Message-ID: <20090402145127.851D070120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24038/F-10

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
sync from devel/ for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	7 Jan 2009 11:05:29 -0000	1.51
+++ .cvsignore	2 Apr 2009 14:50:57 -0000	1.52
@@ -1,5 +1 @@
-kdeartwork-4.0.99.tar.bz2
-kdeartwork-4.1.0.tar.bz2
-kdeartwork-4.1.1.tar.bz2
-kdeartwork-4.1.2.tar.bz2
-kdeartwork-4.1.4.tar.bz2
+kdeartwork-4.2.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdeartwork.spec	27 Feb 2009 15:29:20 -0000	1.96
+++ kdeartwork.spec	2 Apr 2009 14:50:57 -0000	1.97
@@ -1,7 +1,7 @@
 Name:           kdeartwork
-Version:        4.2.1
-Release:        1%{?dist}
-Summary:        Additional artwork (themes, sound themes, ...) for KDE
+Version:        4.2.2
+Release:        3%{?dist}
+Summary:        Additional artwork for KDE
 
 License:        GPLv2
 Group:          User Interface/Desktops
@@ -9,29 +9,26 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#ifarch noarch
-%define icons 1
-#else
-%define rest 1
-#endif
-
 # We currently don't ship crystalsvg from kdeartwork because the actions have
 # been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
 # and yet not yet useful for KDE 4.
 # TODO: Revisit this issue once the renaming is complete. -- Kevin
 #define include_crystalsvg 1
 
+BuildRequires:  eigen2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
 
+%if 0%{fedora} < 11
+# upgrade path
+Requires: %{name}-sounds = %{version}-%{release}
+Requires: %{name}-wallpapers = %{version}-%{release}
+%endif
+
 %description
-Additional artwork (themes, sound themes, screensavers ...) for KDE.
+%{summary}, including additional styles, themes.
 
 %if 0%{?include_crystalsvg}
 %package -n crystalsvg-icon-theme
@@ -39,30 +36,34 @@
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
 %endif
 
-%package icons
-Summary: Additional icon themes
+%package -n kdeclassic-icon-theme 
+Summary: KDE classic icon theme 
 Group: User Interface/Desktops
-Provides: kdeclassic-icon-theme = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-%description icons
-This contains icon themes:
-* kdeclassic
+Obsoletes: kdeartwork-icons < 4.2.2-3
+Provides:  kdeartwork-icons = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n kdeclassic-icon-theme 
+%{summary}.
 
-%package extras
-Summary: Artwork Extras, including xscreensaver-based screensavers
+%package screensavers 
+Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
+Obsoletes: kdeartwork-extras < 4.2.2-3
+Provides:  kdeartwork-extras = %{version}-%{release}
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
-%description extras
+%description screensavers 
 %{summary}.
 
 %package kxs
@@ -73,102 +74,139 @@
 %description kxs
 %{summary}.
 
+%package wallpapers
+Summary: Additional wallpapers
+Group: Amusements/Graphics
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description wallpapers
+%{summary}.
+
+%package sounds
+Summary: Additional sounds
+Group: Amusements/Graphics
+Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description sounds
+%{summary}.
+
 
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-%endif
-
-%if 0%{?icons}
-make %{?_smp_mflags} -C %{_target_platform}/IconThemes
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%endif
 
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
 %if ! 0%{?include_crystalsvg}
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
 %endif
-%else
-rm -rf %{buildroot}%{_kde4_iconsdir}/
-%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%if 0%{?icons}
-%post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%post -n kdeclassic-icon-theme 
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%posttrans -n kdeclassic-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+
+%postun -n kdeclassic-icon-theme 
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+fi
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
-%postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
+%posttrans -n crystalsvg-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 
-%if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%endif
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 %endif
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_kde4_appsdir}/*
+%{_kde4_appsdir}/color-schemes/*.colors
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kstyle/
 %{_kde4_datadir}/emoticons/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/
+%{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%files extras
+%if 0%{?include_crystalsvg}
+%files -n crystalsvg-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_bindir}/*.kss
-%{_kde4_datadir}/kde4/services/ScreenSavers/*
+%{_kde4_iconsdir}/crystalsvg/
+%endif
+
+%files -n kdeclassic-icon-theme 
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/kdeclassic/
 
 %files kxs
 %defattr(-,root,root,-)
-%{_bindir}/kxs*
-%endif
+%{_kde4_bindir}/kxsconfig
+%{_kde4_bindir}/kxsrun
 
-%if 0%{?icons}
-%files icons
+%files screensavers 
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_appsdir}/kfiresaver/
+%{_kde4_appsdir}/kscreensaver/
+%{_kde4_bindir}/*.kss
+%{_kde4_datadir}/kde4/services/ScreenSavers/*
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
+%files sounds
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
-%endif
-%endif
+%{_kde4_datadir}/sounds/*
+
+%files wallpapers
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/*
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- optimize scriptlets
+- omit (unused) noarch hacks, use f10+ support
+- -extras -> -screensavers rename
+- -icons -> kdeclassic-icon-theme rename
+- main pkg, Requires: -wallpapers, -sounds (upgrade path)
+- -wallpapers, -sounds: drop Req: kdebase-workspace
+- BR: eigen2-devel
+
+* Tue Mar 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.2-2
+- split wallpapers and sounds
+- noarch subpackages
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	27 Feb 2009 15:29:20 -0000	1.56
+++ sources	2 Apr 2009 14:50:57 -0000	1.57
@@ -1 +1 @@
-2712142e1cd452f6ada441a310a971d6  kdeartwork-4.2.1.tar.bz2
+2315d64bb543decdb602b01376f5fc1e  kdeartwork-4.2.2.tar.bz2



From sindrepb at fedoraproject.org  Thu Apr  2 14:55:44 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 14:55:44 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.16,1.17
Message-ID: <20090402145544.0F20670120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25319

Modified Files:
	awn-extras-applets.spec 
Log Message:
fixes


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- awn-extras-applets.spec	2 Apr 2009 12:43:40 -0000	1.16
+++ awn-extras-applets.spec	2 Apr 2009 14:55:13 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -32,7 +32,7 @@
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libtool
 BuildRequires:  intltool 
-BuildRequires:  gettext
+#BuildRequires:  gettext
 
 Requires:       avant-window-navigator >= 0.3.2
 Requires:       gnome-python2-gnome
@@ -95,7 +95,19 @@
 # mv ${RPM_BUILD_ROOT}/etc/gconf/schemas/notification-daemon.schemas \
 #   ${RPM_BUILD_ROOT}/etc/gconf/schemas/awn-notification-daemon.schemas
 
-%find_lang %{name}
+#%find_lang
+
+#remove script-shebang in non-executables
+stripscript()
+{
+  sed '1d' "$1" > "${1}_"
+  mv -f "${1}_" "$1"
+}
+for f in `find $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/ -name *.py ! -executable`
+ do stripscript $f
+done
+stripscript $RPM_BUILD_ROOT%{python_sitearch}/awn/detach.py
+
 
 %pre
 SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
@@ -145,7 +157,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
@@ -166,11 +178,11 @@
 
 
 %changelog
-* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-2
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-3
 - New upstream release
 - Add devel package
 - Update schemas scriplets
-- Enable translations shebang
+- Fix rpmlint warnings about non-executable scripts
 - Add gnome-icon-cache scriplet
 - Add shared library scriplet
 - clean up files list



From rdieter at fedoraproject.org  Thu Apr  2 14:57:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:57:23 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec, 1.174, 1.175 kdeedu-4.2.0-gcc44.patch,
	1.1, NONE
Message-ID: <20090402145723.4649170120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25890

Modified Files:
	kdeedu.spec 
Removed Files:
	kdeedu-4.2.0-gcc44.patch 
Log Message:
drop gcc44 patch



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kdeedu.spec	1 Apr 2009 19:56:22 -0000	1.174
+++ kdeedu.spec	2 Apr 2009 14:56:53 -0000	1.175
@@ -23,7 +23,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
-Patch2: kdeedu-4.2.0-gcc44.patch
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -149,7 +148,7 @@
 %setup -q -n kdeedu-%{version}
 
 %patch1 -p1 -b .indi_nodrivers
-#patch2 -p1 -b .gcc44
+
 
 %build
 mkdir -p %{_target_platform}


--- kdeedu-4.2.0-gcc44.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr  2 14:59:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:59:44 +0000 (UTC)
Subject: rpms/kdeedu/F-10 .cvsignore, 1.59, 1.60 kdeedu.spec, 1.147,
	1.148 sources, 1.61, 1.62 kdeedu-4.2.0-gcc44.patch, 1.1, NONE
Message-ID: <20090402145944.9B4C37013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26569/F-10

Modified Files:
	.cvsignore kdeedu.spec sources 
Removed Files:
	kdeedu-4.2.0-gcc44.patch 
Log Message:
* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	25 Mar 2009 16:35:59 -0000	1.59
+++ .cvsignore	2 Apr 2009 14:59:14 -0000	1.60
@@ -1 +1 @@
-kdeedu-4.2.1.tar.bz2
+kdeedu-4.2.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdeedu.spec	26 Mar 2009 14:43:32 -0000	1.147
+++ kdeedu.spec	2 Apr 2009 14:59:14 -0000	1.148
@@ -13,8 +13,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -23,7 +23,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
-Patch2: kdeedu-4.2.0-gcc44.patch
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -149,7 +148,7 @@
 %setup -q -n kdeedu-%{version}
 
 %patch1 -p1 -b .indi_nodrivers
-%patch2 -p1 -b .gcc44
+
 
 %build
 mkdir -p %{_target_platform}
@@ -453,6 +452,9 @@
 
 
 %changelog
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
 - respin for gpsd (#491390)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	27 Feb 2009 16:44:21 -0000	1.61
+++ sources	2 Apr 2009 14:59:14 -0000	1.62
@@ -1 +1 @@
-bc8fb562cf0564ce50486b83f7c94d01  kdeedu-4.2.1.tar.bz2
+132724e6d8d874372c218ed138cb2091  kdeedu-4.2.2.tar.bz2


--- kdeedu-4.2.0-gcc44.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr  2 14:59:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 14:59:44 +0000 (UTC)
Subject: rpms/kdeedu/F-9 .cvsignore, 1.52, 1.53 kdeedu.spec, 1.121,
	1.122 sources, 1.56, 1.57 kdeedu-4.2.0-gcc44.patch, 1.1, NONE
Message-ID: <20090402145944.770DD70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26569/F-9

Modified Files:
	.cvsignore kdeedu.spec sources 
Removed Files:
	kdeedu-4.2.0-gcc44.patch 
Log Message:
* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	25 Mar 2009 14:25:17 -0000	1.52
+++ .cvsignore	2 Apr 2009 14:59:14 -0000	1.53
@@ -1 +1 @@
-kdeedu-4.2.1.tar.bz2
+kdeedu-4.2.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdeedu.spec	26 Mar 2009 14:43:15 -0000	1.121
+++ kdeedu.spec	2 Apr 2009 14:59:14 -0000	1.122
@@ -13,8 +13,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -23,7 +23,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
-Patch2: kdeedu-4.2.0-gcc44.patch
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -149,7 +148,7 @@
 %setup -q -n kdeedu-%{version}
 
 %patch1 -p1 -b .indi_nodrivers
-%patch2 -p1 -b .gcc44
+
 
 %build
 mkdir -p %{_target_platform}
@@ -453,6 +452,9 @@
 
 
 %changelog
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
 - respin for gpsd (#491390)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	27 Feb 2009 16:44:21 -0000	1.56
+++ sources	2 Apr 2009 14:59:14 -0000	1.57
@@ -1 +1 @@
-bc8fb562cf0564ce50486b83f7c94d01  kdeedu-4.2.1.tar.bz2
+132724e6d8d874372c218ed138cb2091  kdeedu-4.2.2.tar.bz2


--- kdeedu-4.2.0-gcc44.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr  2 15:01:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:01:55 +0000 (UTC)
Subject: rpms/kdegames/F-10 .cvsignore, 1.60, 1.61 kdegames.spec, 1.109,
	1.110 sources, 1.65, 1.66
Message-ID: <20090402150155.8C5847013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27390/F-10

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	24 Jan 2009 05:56:39 -0000	1.60
+++ .cvsignore	2 Apr 2009 15:01:25 -0000	1.61
@@ -1,5 +1 @@
-kdegames-4.1.2.tar.bz2
-kdegames-4.1.80.tar.bz2
-kdegames-4.1.85.tar.bz2
-kdegames-4.1.96.tar.bz2
-kdegames-4.2.0.tar.bz2
+kdegames-4.2.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kdegames.spec	27 Feb 2009 16:47:43 -0000	1.109
+++ kdegames.spec	2 Apr 2009 15:01:25 -0000	1.110
@@ -3,8 +3,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,9 +27,8 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): xdg-utils ggz-client-libs
+Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
-Requires(postun): xdg-utils
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -116,10 +115,26 @@
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -128,12 +143,6 @@
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
 
-%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -161,6 +170,7 @@
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
+%{_sysconfdir}/ggz.modules.d/kdegames
 
 %files libs
 %defattr(-,root,root,-)
@@ -175,7 +185,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Thu Feb 26 2009 Than Ngo <than at redhat.com> - 4.2.0-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	27 Feb 2009 16:47:43 -0000	1.65
+++ sources	2 Apr 2009 15:01:25 -0000	1.66
@@ -1 +1 @@
-c640899282024033124de5655a520d21  kdegames-4.2.1.tar.bz2
+d78bba18dcf6bcdf86f77b26596f4c71  kdegames-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:01:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:01:55 +0000 (UTC)
Subject: rpms/kdegames/F-9 .cvsignore, 1.54, 1.55 kdegames.spec, 1.99,
	1.100 sources, 1.60, 1.61
Message-ID: <20090402150155.8AB9A70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27390/F-9

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	9 Jan 2009 00:05:00 -0000	1.54
+++ .cvsignore	2 Apr 2009 15:01:24 -0000	1.55
@@ -1 +1 @@
-kdegames-4.1.4.tar.bz2
+kdegames-4.2.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdegames.spec	27 Feb 2009 16:47:44 -0000	1.99
+++ kdegames.spec	2 Apr 2009 15:01:24 -0000	1.100
@@ -3,8 +3,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,9 +27,8 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): xdg-utils ggz-client-libs
+Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
-Requires(postun): xdg-utils
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -116,10 +115,26 @@
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -128,12 +143,6 @@
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
 
-%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -161,6 +170,7 @@
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
+%{_sysconfdir}/ggz.modules.d/kdegames
 
 %files libs
 %defattr(-,root,root,-)
@@ -175,7 +185,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Thu Feb 26 2009 Than Ngo <than at redhat.com> - 4.2.0-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	27 Feb 2009 16:47:44 -0000	1.60
+++ sources	2 Apr 2009 15:01:24 -0000	1.61
@@ -1 +1 @@
-c640899282024033124de5655a520d21  kdegames-4.2.1.tar.bz2
+d78bba18dcf6bcdf86f77b26596f4c71  kdegames-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:04:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:04:58 +0000 (UTC)
Subject: rpms/kdemultimedia/F-9 .cvsignore, 1.52, 1.53 kdemultimedia.spec,
	1.122, 1.123 sources, 1.56, 1.57
Message-ID: <20090402150458.B024370120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28492/F-9

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	5 Mar 2009 02:51:14 -0000	1.52
+++ .cvsignore	2 Apr 2009 15:04:28 -0000	1.53
@@ -1 +1 @@
-kdemultimedia-4.2.1.tar.bz2
+kdemultimedia-4.2.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdemultimedia.spec	27 Feb 2009 17:01:11 -0000	1.122
+++ kdemultimedia.spec	2 Apr 2009 15:04:28 -0000	1.123
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -26,9 +26,6 @@
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
@@ -89,12 +86,22 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -144,7 +151,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	27 Feb 2009 17:01:11 -0000	1.56
+++ sources	2 Apr 2009 15:04:28 -0000	1.57
@@ -1 +1 @@
-d3916cb7a0dd5cb4e230e5c19d99563b  kdemultimedia-4.2.1.tar.bz2
+ebdf9ccc9eae935eda5f78d56773ee9a  kdemultimedia-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:04:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:04:59 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 .cvsignore, 1.58, 1.59 kdemultimedia.spec, 
	1.129, 1.130 sources, 1.61, 1.62
Message-ID: <20090402150459.270D370120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28492/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	5 Mar 2009 02:51:14 -0000	1.58
+++ .cvsignore	2 Apr 2009 15:04:28 -0000	1.59
@@ -1 +1 @@
-kdemultimedia-4.2.1.tar.bz2
+kdemultimedia-4.2.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdemultimedia.spec	27 Feb 2009 17:01:11 -0000	1.129
+++ kdemultimedia.spec	2 Apr 2009 15:04:28 -0000	1.130
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.1
-Release: 1%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -26,9 +26,6 @@
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
@@ -89,12 +86,22 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -144,7 +151,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Sun Feb 22 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	27 Feb 2009 17:01:11 -0000	1.61
+++ sources	2 Apr 2009 15:04:28 -0000	1.62
@@ -1 +1 @@
-d3916cb7a0dd5cb4e230e5c19d99563b  kdemultimedia-4.2.1.tar.bz2
+ebdf9ccc9eae935eda5f78d56773ee9a  kdemultimedia-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:07:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:07:53 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 .cvsignore, 1.60, 1.61 kdenetwork.spec, 1.164, 
	1.165 sources, 1.69, 1.70
Message-ID: <20090402150753.4D54A70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29895/F-10

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	24 Jan 2009 05:58:56 -0000	1.60
+++ .cvsignore	2 Apr 2009 15:07:22 -0000	1.61
@@ -1,5 +1 @@
-kdenetwork-4.1.2.tar.bz2
-kdenetwork-4.1.80.tar.bz2
-kdenetwork-4.1.85.tar.bz2
-kdenetwork-4.1.96.tar.bz2
-kdenetwork-4.2.0.tar.bz2
+kdenetwork-4.2.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kdenetwork.spec	27 Feb 2009 18:01:22 -0000	1.164
+++ kdenetwork.spec	2 Apr 2009 15:07:22 -0000	1.165
@@ -1,7 +1,7 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -46,9 +46,6 @@
 BuildRequires: libv4l-devel
 # FIXME/TODO: libnxcl-devel
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
@@ -95,9 +92,9 @@
 %patch0 -p1 -b .handle-enc-message
 %patch1 -p1 -b .libv4l
 %patch100 -p0 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 %patch104 -p1 -b .kopete-view-history
 
-rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -105,7 +102,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -119,14 +116,23 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
+
 
 %post libs -p /sbin/ldconfig
 
@@ -157,10 +163,10 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
+%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
@@ -171,7 +177,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	27 Feb 2009 18:01:22 -0000	1.69
+++ sources	2 Apr 2009 15:07:23 -0000	1.70
@@ -1 +1 @@
-17ba9800af0bfcf20a49337624f9946a  kdenetwork-4.2.1.tar.bz2
+72193b5eb050ef45fad76422a15e0e1a  kdenetwork-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:07:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:07:53 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 .cvsignore, 1.54, 1.55 kdenetwork.spec, 1.163, 
	1.164 sources, 1.63, 1.64
Message-ID: <20090402150753.0AE2D70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29895/F-9

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	9 Jan 2009 10:38:39 -0000	1.54
+++ .cvsignore	2 Apr 2009 15:07:22 -0000	1.55
@@ -1 +1 @@
-kdenetwork-4.1.4.tar.bz2
+kdenetwork-4.2.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kdenetwork.spec	27 Feb 2009 18:01:22 -0000	1.163
+++ kdenetwork.spec	2 Apr 2009 15:07:22 -0000	1.164
@@ -1,7 +1,7 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -46,9 +46,6 @@
 BuildRequires: libv4l-devel
 # FIXME/TODO: libnxcl-devel
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
@@ -95,9 +92,9 @@
 %patch0 -p1 -b .handle-enc-message
 %patch1 -p1 -b .libv4l
 %patch100 -p0 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 %patch104 -p1 -b .kopete-view-history
 
-rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -105,7 +102,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -119,14 +116,23 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
+
 
 %post libs -p /sbin/ldconfig
 
@@ -157,10 +163,10 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
+%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
@@ -171,7 +177,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	27 Feb 2009 18:01:23 -0000	1.63
+++ sources	2 Apr 2009 15:07:22 -0000	1.64
@@ -1 +1 @@
-17ba9800af0bfcf20a49337624f9946a  kdenetwork-4.2.1.tar.bz2
+72193b5eb050ef45fad76422a15e0e1a  kdenetwork-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:10:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:10:55 +0000 (UTC)
Subject: rpms/kdepim/F-10 .cvsignore, 1.60, 1.61 kdepim.spec, 1.207,
	1.208 sources, 1.69, 1.70
Message-ID: <20090402151056.0694070120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30884

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	9 Mar 2009 14:36:44 -0000	1.60
+++ .cvsignore	2 Apr 2009 15:10:25 -0000	1.61
@@ -1 +1 @@
-kdepim-4.2.1.tar.bz2
+kdepim-4.2.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- kdepim.spec	9 Mar 2009 14:37:46 -0000	1.207
+++ kdepim.spec	2 Apr 2009 15:10:25 -0000	1.208
@@ -5,17 +5,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# upstream patches
-Patch100: kdepim-4.2.1-imap.patch
-Patch101: kdepim-4.2.1-korganizer_view.patch 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +20,6 @@
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -95,8 +89,6 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .imap
-%patch101 -p4 -b .korganizer_view
 
 
 %build
@@ -129,15 +121,22 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
-%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -187,6 +186,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
 - upstream korganizer-view patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	27 Feb 2009 18:04:36 -0000	1.69
+++ sources	2 Apr 2009 15:10:25 -0000	1.70
@@ -1 +1 @@
-2ebc3730aaee53f494e8e6abd26029bd  kdepim-4.2.1.tar.bz2
+964208d570845c75e0c482bb3d33892f  kdepim-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:12:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:12:29 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.175,1.176
Message-ID: <20090402151229.B0FCF70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31480

Modified Files:
	kdeedu.spec 
Log Message:
drop versioned BR: gpsd-devel



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kdeedu.spec	2 Apr 2009 14:56:53 -0000	1.175
+++ kdeedu.spec	2 Apr 2009 15:11:59 -0000	1.176
@@ -34,7 +34,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
 BuildRequires: gmm-devel
-BuildRequires: gpsd-devel >= 2.39
+BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}



From sailer at fedoraproject.org  Thu Apr  2 15:13:04 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu,  2 Apr 2009 15:13:04 +0000 (UTC)
Subject: rpms/ghdl/devel ieee-mathreal.patch,NONE,1.1 ghdl.spec,1.47,1.48
Message-ID: <20090402151304.1988A70120@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31667

Modified Files:
	ghdl.spec 
Added Files:
	ieee-mathreal.patch 
Log Message:
add the missing patch


ieee-mathreal.patch:

--- NEW FILE ieee-mathreal.patch ---
--- vhdl/libraries/ieee/math_real.vhdl.orig	2009-04-01 19:21:58.000000000 +0200
+++ vhdl/libraries/ieee/math_real.vhdl	2009-04-02 12:21:52.000000000 +0200
@@ -102,16 +102,21 @@
     	-- returns integer FLOOR(X + 0.5) if X > 0;
     	-- return integer CEIL(X - 0.5) if X < 0
 
-    -- IAC: we are missing the function TRUNC
-    -- IAC: we are missing the function MOD
-    -- IAC: functions FMAX and FMIN should be renamed REALMAX and REALMIN
-    
-    function FMAX (X, Y : real ) return real;
-    attribute foreign of fmax : function is "VHPIDIRECT fmax"; 
+    function TRUNC (X : real ) return real;
+    attribute foreign of trunc : function is "VHPIDIRECT trunc"; 
+    	-- returns integer FLOOR(X) if X > 0;
+    	-- return integer CEIL(X) if X < 0
+
+    function "MOD" (X, Y : real ) return real;
+    attribute foreign of "mod" : function is "VHPIDIRECT fmod"; 
+    	-- returns the floating point modulus of X/Y
+
+    function REALMAX (X, Y : real ) return real;
+    attribute foreign of realmax : function is "VHPIDIRECT fmax"; 
     	-- returns the algebraically larger of X and Y
 
-    function FMIN (X, Y : real ) return real;
-    attribute foreign of fmin : function is "VHPIDIRECT fmin"; 
+    function REALMIN (X, Y : real ) return real;
+    attribute foreign of realmin : function is "VHPIDIRECT fmin"; 
     	-- returns the algebraically smaller of X and Y
 
     procedure UNIFORM (variable Seed1,Seed2:inout integer; variable X:out real);
@@ -203,25 +208,17 @@
     	-- returns tan X; X in radians
     	-- X /= ((2k+1) * PI/2), where k is an integer
 
-    -- IAC: function should be called ARCSIN
-    
-    function  ASIN (X : real ) return real; 
+    function  ARCSIN (X : real ) return real; 
     	-- returns  -PI/2 < asin X < PI/2; | X | <= 1
 
-    -- IAC: function should be called ARCCOS
-    
-    function  ACOS (X : real ) return real;
+    function  ARCCOS (X : real ) return real;
     	-- returns  0 < acos X < PI; | X | <= 1
 
-    
-    -- IAC: function should be called ARCTAN
-    
-    function  ATAN (X : real) return real;
-    attribute foreign of atan : function is "VHPIDIRECT atan"; 
+    function  ARCTAN (X : real) return real;
+    attribute foreign of arctan : function is "VHPIDIRECT atan"; 
     	-- returns  -PI/2 < atan X < PI/2
 
-    -- IAC: function ATAN2 should not exist
-    function  ATAN2 (X : real; Y : real) return real;
+    function  ARCTAN (X : real; Y : real) return real;
     	-- returns  atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
 
     function SINH (X : real) return real;
@@ -236,20 +233,35 @@
     attribute foreign of tanh : function is "VHPIDIRECT tanh"; 
     	-- hyperbolic tangent; -- returns (e**X - e**(-X))/(e**X + e**(-X))
 
-    -- IAC: function should be called ARCSINH
-    
-    function ASINH (X : real) return real;
-    attribute foreign of asinh : function is "VHPIDIRECT asinh"; 
+    function ARCSINH (X : real) return real;
+    attribute foreign of arcsinh : function is "VHPIDIRECT asinh"; 
     	-- returns ln( X + sqrt( X**2 + 1))
 
-    -- IAC: function should be called ARCCOSH
-
-    function ACOSH (X : real) return real;
+    function ARCCOSH (X : real) return real;
     	-- returns ln( X + sqrt( X**2 - 1));   X >= 1
 
-    -- IAC: function should be called ARCTANH
-    
-    function ATANH (X : real) return real;
+    function ARCTANH (X : real) return real;
     	-- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
 
+
+    -- Compatibility; will be removed in the future!
+    impure function FMAX (X, Y : real ) return real;
+
+    impure function FMIN (X, Y : real ) return real;
+
+    impure function ASIN (X : real ) return real; 
+
+    impure function ACOS (X : real ) return real;
+
+    impure function ATAN (X : real) return real;
+
+    impure function ATAN2 (X : real; Y : real) return real;
+
+    impure function ASINH (X : real) return real;
+
+    impure function ACOSH (X : real) return real;
+
+    impure function ATANH (X : real) return real;
+
+
 end  MATH_REAL;
--- vhdl/libraries/ieee/math_real-body.vhdl.orig	2009-04-01 19:22:04.000000000 +0200
+++ vhdl/libraries/ieee/math_real-body.vhdl	2009-04-02 12:27:15.000000000 +0200
@@ -72,16 +72,41 @@
     begin
         assert false severity failure;
     end ROUND;
-    
-    function FMAX (X, Y : real ) return real is
+
+    function TRUNC (X : real ) return real is
     begin
         assert false severity failure;
-    end FMAX;
+    end TRUNC;
 
-    function FMIN (X, Y : real ) return real is
+    function c_mod (x : real; y : real) return real;
+    attribute foreign of c_mod : function is "VHPIDIRECT fmod"; 
+
+    function c_mod (x : real; y: real) return real is
     begin
         assert false severity failure;
-    end FMIN;
+    end c_mod; 
+
+    function "MOD" (X, Y : real ) return real is
+    begin
+        if y = 0.0 then 
+            assert false 
+                report "MOD(X, 0.0) is undefined" 
+                severity ERROR;
+            return 0.0; 
+        else
+            return c_mod(x,y);
+        end if;     
+    end "MOD";
+
+    function REALMAX (X, Y : real ) return real is
+    begin
+        assert false severity failure;
+    end REALMAX;
+
+    function REALMIN (X, Y : real ) return real is
+    begin
+        assert false severity failure;
+    end REALMIN;
 
     --
     -- Pseudo-random number generators
@@ -297,18 +322,18 @@
         assert false severity failure;
     end c_asin; 
 
-    function ASIN (x : real ) return real is
+    function ARCSIN (x : real ) return real is
         -- returns  -PI/2 < asin X < PI/2; | X | <= 1
     begin   
         if abs x > 1.0 then 
             assert false
-                report "Out of range parameter passed to ASIN" 
+                report "Out of range parameter passed to ARCSIN" 
                 severity ERROR;
             return x;
         else
             return c_asin(x);
         end if; 
-    end ASIN; 
+    end ARCSIN; 
    
     function c_acos (x : real ) return real;
     attribute foreign of c_acos : function is "VHPIDIRECT acos"; 
@@ -318,24 +343,24 @@
         assert false severity failure;
     end c_acos; 
 
-    function ACOS (x : REAL) return REAL is
+    function ARCCOS (x : REAL) return REAL is
     	-- returns  0 < acos X < PI; | X | <= 1
     begin  
       if abs x > 1.0 then 
          assert false 
-            report "Out of range parameter passed to ACOS" 
+            report "Out of range parameter passed to ARCCOS" 
 			severity ERROR; 
          return x;
       else
          return c_acos(x);
       end if;
-    end ACOS; 
+    end ARCCOS; 
    
-   function ATAN (x : REAL) return REAL is
+    function ARCTAN (x : REAL) return REAL is
     	-- returns  -PI/2 < atan X < PI/2
-   begin
+    begin
         assert false severity failure;
-   end ATAN; 
+    end ARCTAN; 
 
     function c_atan2 (x : real; y : real) return real;
     attribute foreign of c_atan2 : function is "VHPIDIRECT atan2"; 
@@ -345,7 +370,7 @@
         assert false severity failure;
     end c_atan2; 
 
-    function ATAN2 (x : REAL; y : REAL) return REAL is 
+    function ARCTAN (x : REAL; y : REAL) return REAL is 
         -- returns  atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
     begin   
         if y = 0.0 and x = 0.0 then 
@@ -356,7 +381,7 @@
         else
             return c_atan2(x,y);
         end if;     
-    end ATAN2; 
+    end ARCTAN; 
 
 
     function SINH (X : real) return real is
@@ -377,11 +402,11 @@
         assert false severity failure;
     end TANH;
     
-    function ASINH (X : real) return real is
+    function ARCSINH (X : real) return real is
     	-- returns ln( X + sqrt( X**2 + 1))
     begin
         assert false severity failure;
-    end ASINH;
+    end ARCSINH;
 
     function c_acosh (x : real ) return real;
     attribute foreign of c_acosh : function is "VHPIDIRECT acosh"; 
@@ -391,16 +416,16 @@
         assert false severity failure;
     end c_acosh;
 
-    function ACOSH (X : real) return real is
+    function ARCCOSH (X : real) return real is
     	-- returns ln( X + sqrt( X**2 - 1));   X >= 1
     begin
       	if abs x >= 1.0 then 
-         	assert false report "Out of range parameter passed to ACOSH" 
+         	assert false report "Out of range parameter passed to ARCCOSH" 
 			severity ERROR; 
          	return x;
       	end if; 
         return c_acosh(x);
-    end ACOSH;
+    end ARCCOSH;
 
     function c_atanh (x : real ) return real;
     attribute foreign of c_atanh : function is "VHPIDIRECT atanh"; 
@@ -410,15 +435,107 @@
         assert false severity failure;
     end c_atanh;
 
-    function ATANH (X : real) return real is
+    function ARCTANH (X : real) return real is
     	-- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
     begin
       	if abs x < 1.0 then 
-        	assert false report "Out of range parameter passed to ATANH" 
+        	assert false report "Out of range parameter passed to ARCTANH" 
 			severity ERROR; 
         	return x;
       	end if; 
         return c_atanh(x);
-    end ATANH; 
+    end ARCTANH; 
+
+    -- Compatibility; will be removed in the future!
+    shared variable fmax_compat_warn : boolean := false;
+    shared variable fmin_compat_warn : boolean := false;
+    shared variable asin_compat_warn : boolean := false;
+    shared variable acos_compat_warn : boolean := false;
+    shared variable atan_compat_warn : boolean := false;
+    shared variable atan2_compat_warn : boolean := false;
+    shared variable asinh_compat_warn : boolean := false;
+    shared variable acosh_compat_warn : boolean := false;
+    shared variable atanh_compat_warn : boolean := false;
+
+    impure function FMAX (X, Y : real ) return real is
+    begin
+      assert fmax_compat_warn
+        report "MATH_REAL.FMAX is not a standards compliant function and will be removed in the future; use REALMAX instead"
+        severity note;
+      fmax_compat_warn := true;
+      return REALMAX(X, Y);
+    end FMAX;
+
+    impure function FMIN (X, Y : real ) return real is
+    begin
+      assert fmin_compat_warn
+        report "MATH_REAL.FMIN is not a standards compliant function and will be removed in the future; use REALMIN instead"
+        severity note;
+      fmin_compat_warn := true;
+      return REALMIN(X, Y);
+    end FMIN;
+
+    impure function ASIN (X : real ) return real is
+    begin
+      assert asin_compat_warn
+        report "MATH_REAL.ASIN is not a standards compliant function and will be removed in the future; use ARCSIN instead"
+        severity note;
+      asin_compat_warn := true;
+      return ARCSIN(X);
+    end ASIN; 
+
+    impure function ACOS (X : real ) return real is
+    begin
+      assert acos_compat_warn
+        report "MATH_REAL.ACOS is not a standards compliant function and will be removed in the future; use ARCCOS instead"
+        severity note;
+      acos_compat_warn := true;
+      return ARCCOS(X);
+    end ACOS;
+
+    impure function ATAN (X : real) return real is
+    begin
+      assert atan_compat_warn
+        report "MATH_REAL.ATAN is not a standards compliant function and will be removed in the future; use ARCTAN instead"
+        severity note;
+      atan_compat_warn := true;
+      return ARCTAN(X);
+    end ATAN;
+
+    impure function ATAN2 (X : real; Y : real) return real is
+    begin
+      assert atan2_compat_warn
+        report "MATH_REAL.ATAN2 is not a standards compliant function and will be removed in the future; use ARCTAN instead"
+        severity note;
+      atan2_compat_warn := true;
+      return ARCTAN(X, Y);
+    end ATAN2;
+
+    impure function ASINH (X : real) return real is
+    begin
+      assert asinh_compat_warn
+        report "MATH_REAL.ASINH is not a standards compliant function and will be removed in the future; use ARCSINH instead"
+        severity note;
+      asinh_compat_warn := true;
+      return ARCSINH(X);
+    end ASINH;
+
+    impure function ACOSH (X : real) return real is
+    begin
+      assert acosh_compat_warn
+        report "MATH_REAL.ACOSH is not a standards compliant function and will be removed in the future; use ARCCOSH instead"
+        severity note;
+      acosh_compat_warn := true;
+      return ACOSH(X);
+    end ACOSH;
+
+    impure function ATANH (X : real) return real is
+    begin
+      assert atanh_compat_warn
+        report "MATH_REAL.ATANH is not a standards compliant function and will be removed in the future; use ARCTANH instead"
+        severity note;
+      atanh_compat_warn := true;
+      return ARCTANH(X);
+    end ATANH;
 
 end  MATH_REAL;
--- vhdl/libraries/ieee/math_complex-body.vhdl.orig	2009-04-02 12:08:47.000000000 +0200
+++ vhdl/libraries/ieee/math_complex-body.vhdl	2009-04-02 12:09:18.000000000 +0200
@@ -119,7 +119,7 @@
     function COMPLEX_TO_POLAR(Z: in complex ) return complex_polar is
     	-- converts complex to complex_polar
     begin
-    		return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),atan2(z.re,z.im));
+    		return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),ARCTAN(z.re,z.im));
     end COMPLEX_TO_POLAR;
 
     function POLAR_TO_COMPLEX(Z: in complex_polar ) return complex is


Index: ghdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ghdl.spec	2 Apr 2009 14:00:20 -0000	1.47
+++ ghdl.spec	2 Apr 2009 15:12:33 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.5%{?dist}
+Release: 0.%{ghdlsvnver}svn.6%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Wed Apr  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.6
+- actually add the patch
+
 * Wed Apr  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.5
 - make ieee.math_real more standards compliant
 



From rdieter at fedoraproject.org  Thu Apr  2 15:13:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:13:25 +0000 (UTC)
Subject: rpms/kdeedu/F-9 kdeedu.spec,1.122,1.123
Message-ID: <20090402151325.0DE4270120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31788/F-9

Modified Files:
	kdeedu.spec 
Log Message:
drop versioned BR: gpsd-devel



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdeedu.spec	2 Apr 2009 14:59:14 -0000	1.122
+++ kdeedu.spec	2 Apr 2009 15:12:54 -0000	1.123
@@ -34,7 +34,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
 BuildRequires: gmm-devel
-BuildRequires: gpsd-devel >= 2.39
+BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}



From rdieter at fedoraproject.org  Thu Apr  2 15:13:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:13:25 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.148,1.149
Message-ID: <20090402151325.6E32B70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31788/F-10

Modified Files:
	kdeedu.spec 
Log Message:
drop versioned BR: gpsd-devel



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdeedu.spec	2 Apr 2009 14:59:14 -0000	1.148
+++ kdeedu.spec	2 Apr 2009 15:12:55 -0000	1.149
@@ -34,7 +34,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
 BuildRequires: gmm-devel
-BuildRequires: gpsd-devel >= 2.39
+BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}



From amdunn at fedoraproject.org  Thu Apr  2 15:15:54 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Thu,  2 Apr 2009 15:15:54 +0000 (UTC)
Subject: rpms/ocaml-mlgmpidl/devel mlgmpidl-1.1-Makefile.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 ocaml-mlgmpidl.spec, 1.1, 1.2 sources, 1.2,
	1.3 mlgmpidl-1.0-Makefile.patch, 1.1, NONE
Message-ID: <20090402151554.EEB3770120@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/ocaml-mlgmpidl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698/devel

Modified Files:
	.cvsignore import.log ocaml-mlgmpidl.spec sources 
Added Files:
	mlgmpidl-1.1-Makefile.patch 
Removed Files:
	mlgmpidl-1.0-Makefile.patch 
Log Message:
New upstream version incorporates functional interface to Mpfr.


mlgmpidl-1.1-Makefile.patch:

--- NEW FILE mlgmpidl-1.1-Makefile.patch ---
--- Makefile	2009-04-02 09:41:47.000000000 -0400
+++ Makefile	2009-04-02 09:51:12.000000000 -0400
@@ -11,6 +11,24 @@
 #
 PREFIX = $(MLGMPIDL_PREFIX)
 
+# Location of includes
+GMP_INCLUDEDIR = $(GMP_PREFIX)/include
+MPFR_INCLUDEDIR = $(MPFR_PREFIX)/include
+
+# Location of C libraries
+GMP_LIBDIR = $(GMP_PREFIX)/lib
+MPFR_LIBDIR = $(MPFR_PREFIX)/lib
+
+# Location of OCaml libraries
+CAML_LIBDIR = $(CAML_PREFIX)/lib/ocaml
+CAMLIDL_LIBDIR = $(CAMLIDL_PREFIX)/lib/ocaml
+MLGMPIDL_LIBDIR = $(MLGMPIDL_PREFIX)/lib
+
+# Eventual installation destination directories
+INSTALL_INCLUDEDIR = $(PREFIX)/include
+INSTALL_OCAML_LIBDIR = $(PREFIX)/lib/ocaml/mlgmpidl
+INSTALL_BINDIR = $(PREFIX)/bin
+
 #---------------------------------------
 # CAML part
 #---------------------------------------
@@ -18,15 +36,15 @@
 OCAMLINC =
 ifeq ($(HAS_MPFR),0)
 OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl" 
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
 else
 OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(MPFR_PREFIX)/lib" -cclib "-lmpfr" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl"
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(MPFR_LIBDIR)" -cclib "-lmpfr" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
 endif
 
 #---------------------------------------
@@ -36,14 +54,14 @@
 ifeq ($(HAS_MPFR),0)
 ICFLAGS = \
 -DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
 else
 ICFLAGS = \
 -DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(MPFR_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(MPFR_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
 endif
 
 #---------------------------------------
@@ -89,20 +107,20 @@
 	-ccopt "-L." bigarray.cma gmp.cma 
 
 install:
-	mkdir -p $(PREFIX)/include $(PREFIX)/lib $(PREFIX)/bin
-	cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(PREFIX)/lib
-	cp -f $(CCINC_TOINSTALL) $(PREFIX)/include
-	for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/lib; fi; done
-	for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/bin; fi; done
+	mkdir -p $(INSTALL_INCLUDEDIR) $(INSTALL_OCAML_LIBDIR) $(INSTALL_BINDIR)
+	cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(INSTALL_OCAML_LIBDIR)
+	cp -f $(CCINC_TOINSTALL) $(INSTALL_INCLUDEDIR)
+	for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_OCAML_LIBDIR); fi; done
+	for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_BINDIR); fi; done
 
 #---------------------------------------
 # Misc rules
 #---------------------------------------
 
 distclean: clean
-	(cd $(PREFIX)/include; /bin/rm -f $(CCINC_TOINSTALL))
-	(cd $(PREFIX)/lib; /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(CCLIB_TOINSTALL))
-	(cd $(PREFIX)/bin; /bin/rm -f $(CCBIN_TOINSTALL))
+	(cd $(INSTALL_INCLUDEDIR); /bin/rm -f $(CCINC_TOINSTALL))
+	(cd $(INSTALL_OCAML_LIBDDIR); /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx))
+	(cd $(INSTALL_BINDIR); /bin/rm -f $(CCBIN_TOINSTALL))
 
 clean:
 	/bin/rm -fr tmp html


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Mar 2009 15:24:51 -0000	1.2
+++ .cvsignore	2 Apr 2009 15:15:24 -0000	1.3
@@ -1 +1 @@
-mlgmpidl.tgz
+mlgmpidl-1.1.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Mar 2009 15:24:52 -0000	1.1
+++ import.log	2 Apr 2009 15:15:24 -0000	1.2
@@ -1 +1,2 @@
 ocaml-mlgmpidl-1_0-1_fc10:HEAD:ocaml-mlgmpidl-1.0-1.fc10.src.rpm:1238253602
+ocaml-mlgmpidl-1_1-1_fc10:HEAD:ocaml-mlgmpidl-1.1-1.fc10.src.rpm:1238684941


Index: ocaml-mlgmpidl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/devel/ocaml-mlgmpidl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-mlgmpidl.spec	28 Mar 2009 15:24:52 -0000	1.1
+++ ocaml-mlgmpidl.spec	2 Apr 2009 15:15:24 -0000	1.2
@@ -10,17 +10,17 @@
 %define debug_package %{nil}
 
 Name:           ocaml-mlgmpidl
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        OCaml interface to GMP and MPFR libraries
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/index.html
-Source0:        http://gforge.inria.fr/frs/download.php/2460/mlgmpidl.tgz
+Source0:        http://gforge.inria.fr/frs/download.php/20228/mlgmpidl-%{version}.tgz
 Source1:        mlgmpidl_test.ml
 Source2:        mlgmpidl_test_result
 Source3:        mlgmpidl-META
-Patch0:         mlgmpidl-1.0-Makefile.patch
+Patch0:         mlgmpidl-1.1-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ocaml >= 3.07, ocaml-ocamldoc, ocaml-camlidl-devel, gmp-devel, mpfr-devel, prelink
 # BuildRequires for documentation build
@@ -141,5 +141,7 @@
 %{_docdir}/%{name}
 
 %changelog
+* Thu Apr 02 2009 Alan Dunn <amdunn at gmail.com> 1.1-1
+- New upstream version incorporates functional interface to Mpfr.
 * Sat Mar 28 2009 Alan Dunn <amdunn at gmail.com> 1.0-1
 - Initial Fedora RPM version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Mar 2009 15:24:52 -0000	1.2
+++ sources	2 Apr 2009 15:15:24 -0000	1.3
@@ -1 +1 @@
-63ec244511e58bd1cbf5513dc7aaad8e  mlgmpidl.tgz
+5374d9764c609e005691925c612c44ac  mlgmpidl-1.1.tgz


--- mlgmpidl-1.0-Makefile.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr  2 15:16:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:16:41 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 .cvsignore, 1.9,
	1.10 kdeplasma-addons.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20090402151641.622B670120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv746/F-10

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Mar 2009 19:17:42 -0000	1.9
+++ .cvsignore	2 Apr 2009 15:16:11 -0000	1.10
@@ -1,6 +1 @@
-kdeplasma-addons-4.1.2.tar.bz2
-kdeplasma-addons-4.1.80.tar.bz2
-kdeplasma-addons-4.1.85.tar.bz2
-kdeplasma-addons-4.1.96.tar.bz2
-kdeplasma-addons-4.2.0.tar.bz2
-kdeplasma-addons-4.2.1.tar.bz2
+kdeplasma-addons-4.2.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kdeplasma-addons.spec	17 Mar 2009 19:17:42 -0000	1.13
+++ kdeplasma-addons.spec	2 Apr 2009 15:16:11 -0000	1.14
@@ -1,7 +1,6 @@
-
 Name:           kdeplasma-addons
-Version:        4.2.1
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -37,8 +36,8 @@
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -68,14 +67,6 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# fixup bball 
-pushd %{buildroot}%{_kde4_appsdir}/bball/
-for svgz in *.svgz ; do
-  mv $svgz `basename $svgz .svgz`.svg.gz
-  gunzip `basename $svgz .svgz`.svg.gz
-done
-popd
-
 # unpackaged files
 # omit -devel type stuff, for now
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
@@ -85,11 +76,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %clean
@@ -120,8 +117,14 @@
 
 
 %changelog
-* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
-- make bball applet work (ship .svg instead of .svgz)
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
+- make bball applet work, ship .svg instead of .svgz (kdebug#185568)
 - use new %%_qt45 macro
 - spec housecleaning
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Feb 2009 18:21:20 -0000	1.10
+++ sources	2 Apr 2009 15:16:11 -0000	1.11
@@ -1 +1 @@
-55219414d52924cb22ea2953cd2ae78b  kdeplasma-addons-4.2.1.tar.bz2
+809887da8ee9f7674761e0f46fa966a2  kdeplasma-addons-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:16:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:16:41 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-9 .cvsignore, 1.7, 1.8 kdeplasma-addons.spec,
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090402151641.1819270120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv746/F-9

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Mar 2009 19:16:26 -0000	1.7
+++ .cvsignore	2 Apr 2009 15:16:10 -0000	1.8
@@ -1,6 +1 @@
-kdeplasma-addons-4.1.2.tar.bz2
-kdeplasma-addons-4.1.80.tar.bz2
-kdeplasma-addons-4.1.85.tar.bz2
-kdeplasma-addons-4.1.96.tar.bz2
-kdeplasma-addons-4.2.0.tar.bz2
-kdeplasma-addons-4.2.1.tar.bz2
+kdeplasma-addons-4.2.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/kdeplasma-addons.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdeplasma-addons.spec	17 Mar 2009 19:16:26 -0000	1.10
+++ kdeplasma-addons.spec	2 Apr 2009 15:16:10 -0000	1.11
@@ -1,7 +1,6 @@
-
 Name:           kdeplasma-addons
-Version:        4.2.1
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -37,8 +36,8 @@
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -68,14 +67,6 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# fixup bball 
-pushd %{buildroot}%{_kde4_appsdir}/bball/
-for svgz in *.svgz ; do
-  mv $svgz `basename $svgz .svgz`.svg.gz
-  gunzip `basename $svgz .svgz`.svg.gz
-done
-popd
-
 # unpackaged files
 # omit -devel type stuff, for now
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
@@ -85,11 +76,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %clean
@@ -120,8 +117,14 @@
 
 
 %changelog
-* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
-- make bball applet work (ship .svg instead of .svgz)
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
+- make bball applet work, ship .svg instead of .svgz (kdebug#185568)
 - use new %%_qt45 macro
 - spec housecleaning
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Feb 2009 18:21:20 -0000	1.9
+++ sources	2 Apr 2009 15:16:10 -0000	1.10
@@ -1 +1 @@
-55219414d52924cb22ea2953cd2ae78b  kdeplasma-addons-4.2.1.tar.bz2
+809887da8ee9f7674761e0f46fa966a2  kdeplasma-addons-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:22:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:22:19 +0000 (UTC)
Subject: rpms/kdesdk/F-10 .cvsignore, 1.53, 1.54 kdesdk.spec, 1.127,
	1.128 sources, 1.56, 1.57
Message-ID: <20090402152219.28F6570120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3002/F-10

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Feb 2009 19:07:45 -0000	1.53
+++ .cvsignore	2 Apr 2009 15:21:48 -0000	1.54
@@ -1,6 +1 @@
-kdesdk-4.1.2.tar.bz2
-kdesdk-4.1.80.tar.bz2
-kdesdk-4.1.85.tar.bz2
-kdesdk-4.1.96.tar.bz2
-kdesdk-4.2.0.tar.bz2
-kdesdk-4.2.1.tar.bz2
+kdesdk-4.2.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdesdk.spec	27 Feb 2009 19:07:45 -0000	1.127
+++ kdesdk.spec	2 Apr 2009 15:21:48 -0000	1.128
@@ -1,6 +1,6 @@
 Name:           kdesdk
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -29,8 +29,6 @@
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -121,15 +119,29 @@
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -214,6 +226,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 - blockquote patch (#487624)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	27 Feb 2009 18:38:57 -0000	1.56
+++ sources	2 Apr 2009 15:21:48 -0000	1.57
@@ -1 +1 @@
-e1c95a5ab0e34d2d084677199af0b093  kdesdk-4.2.1.tar.bz2
+018767d862229899f4a648a6c36fd0f6  kdesdk-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:22:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:22:18 +0000 (UTC)
Subject: rpms/kdesdk/F-9 .cvsignore, 1.47, 1.48 kdesdk.spec, 1.115,
	1.116 sources, 1.51, 1.52
Message-ID: <20090402152218.E05A170120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3002/F-9

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	27 Feb 2009 19:07:44 -0000	1.47
+++ .cvsignore	2 Apr 2009 15:21:48 -0000	1.48
@@ -1,6 +1 @@
-kdesdk-4.1.2.tar.bz2
-kdesdk-4.1.80.tar.bz2
-kdesdk-4.1.85.tar.bz2
-kdesdk-4.1.96.tar.bz2
-kdesdk-4.2.0.tar.bz2
-kdesdk-4.2.1.tar.bz2
+kdesdk-4.2.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdesdk.spec	27 Feb 2009 19:07:44 -0000	1.115
+++ kdesdk.spec	2 Apr 2009 15:21:48 -0000	1.116
@@ -1,6 +1,6 @@
 Name:           kdesdk
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -29,8 +29,6 @@
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -121,15 +119,29 @@
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -214,6 +226,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 - blockquote patch (#487624)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	27 Feb 2009 18:38:57 -0000	1.51
+++ sources	2 Apr 2009 15:21:48 -0000	1.52
@@ -1 +1 @@
-e1c95a5ab0e34d2d084677199af0b093  kdesdk-4.2.1.tar.bz2
+018767d862229899f4a648a6c36fd0f6  kdesdk-4.2.2.tar.bz2



From dwalsh at fedoraproject.org  Thu Apr  2 15:24:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  2 Apr 2009 15:24:29 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.73,
	1.74 selinux-policy.spec, 1.814, 1.815
Message-ID: <20090402152429.764A570120@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-6
- Dontaudit listing of /root directory for cron system jobs


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- policy-20090105.patch	30 Mar 2009 16:06:48 -0000	1.73
+++ policy-20090105.patch	2 Apr 2009 15:23:57 -0000	1.74
@@ -1580,6 +1580,68 @@
  /usr/bin/cdrecord	--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
 +/usr/bin/growisoifs	--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.fc serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.fc
+--- nsaserefpolicy/policy/modules/apps/cpufreqselector.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.fc	2009-04-02 10:05:45.000000000 -0400
+@@ -0,0 +1 @@
++/usr/bin/cpufreq-selector       --      gen_context(system_u:object_r:cpufreqselector_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.if serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.if
+--- nsaserefpolicy/policy/modules/apps/cpufreqselector.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.if	2009-04-02 10:05:45.000000000 -0400
+@@ -0,0 +1,2 @@
++## <summary>cpufreq-selector policy</summary>
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.te
+--- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.te	2009-04-02 10:05:45.000000000 -0400
+@@ -0,0 +1,47 @@
++policy_module(cpufreqselector,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type cpufreqselector_t;
++type cpufreqselector_exec_t;
++
++dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
++
++########################################
++#
++# cpufreq-selector local policy
++#
++
++allow cpufreqselector_t self:capability { sys_nice sys_ptrace };
++allow cpufreqselector_t self:fifo_file rw_fifo_file_perms;
++
++files_read_etc_files(cpufreqselector_t)
++files_read_usr_files(cpufreqselector_t)
++
++corecmd_search_bin(cpufreqselector_t)
++
++dev_rw_sysfs(cpufreqselector_t)
++
++fs_list_inotifyfs(cpufreqselector_t)
++
++libs_use_ld_so(cpufreqselector_t)
++libs_use_shared_libs(cpufreqselector_t)
++
++userdom_read_all_users_state(cpufreqselector_t)
++
++nscd_dontaudit_search_pid(cpufreqselector_t)
++
++optional_policy(`
++        consolekit_dbus_chat(cpufreqselector_t)
++')
++
++optional_policy(`
++	polkit_domtrans_auth(cpufreqselector_t)
++	polkit_read_lib(cpufreqselector_t)
++	polkit_read_reload(cpufreqselector_t)
++')
++
++permissive cpufreqselector_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/git.fc serefpolicy-3.6.10/policy/modules/apps/git.fc
 --- nsaserefpolicy/policy/modules/apps/git.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.10/policy/modules/apps/git.fc	2009-03-30 10:09:41.000000000 -0400
@@ -9098,7 +9160,7 @@
 +/var/log/rpmpkgs.*		--	gen_context(system_u:object_r:cron_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.10/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-11-11 16:13:47.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/cron.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/cron.if	2009-04-02 11:21:32.000000000 -0400
 @@ -12,6 +12,10 @@
  ## </param>
  #
@@ -9187,7 +9249,7 @@
  
  	optional_policy(`
  		gen_require(`
-@@ -261,6 +277,7 @@
+@@ -261,10 +277,12 @@
  	allow $1 system_cronjob_t:fifo_file rw_file_perms;
  	allow $1 system_cronjob_t:process sigchld;
  
@@ -9195,7 +9257,12 @@
  	allow $1 crond_t:fifo_file rw_file_perms;
  	allow $1 crond_t:fd use;
  	allow $1 crond_t:process sigchld;
-@@ -343,6 +360,24 @@
+ 
++	userdom_dontaudit_list_admin_dir($1)
+ 	role system_r types $1;
+ ')
+ 
+@@ -343,6 +361,24 @@
  
  ########################################
  ## <summary>
@@ -9220,7 +9287,7 @@
  ##	Read and write a cron daemon unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -361,7 +396,7 @@
+@@ -361,7 +397,7 @@
  
  ########################################
  ## <summary>
@@ -9229,7 +9296,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -369,7 +404,7 @@
+@@ -369,7 +405,7 @@
  ##	</summary>
  ## </param>
  #
@@ -9238,7 +9305,7 @@
  	gen_require(`
  		type crond_t;
  	')
-@@ -416,6 +451,42 @@
+@@ -416,6 +452,42 @@
  
  ########################################
  ## <summary>
@@ -9281,7 +9348,7 @@
  ##	Inherit and use a file descriptor
  ##	from system cron jobs.
  ## </summary>
-@@ -481,11 +552,14 @@
+@@ -481,11 +553,14 @@
  #
  interface(`cron_read_system_job_tmp_files',`
  	gen_require(`
@@ -9297,7 +9364,7 @@
  ')
  
  ########################################
-@@ -506,3 +580,101 @@
+@@ -506,3 +581,101 @@
  
  	dontaudit $1 system_cronjob_tmp_t:file append;
  ')
@@ -18450,7 +18517,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.6.10/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/samba.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/samba.if	2009-04-01 15:42:15.000000000 -0400
 @@ -4,6 +4,45 @@
  ##	from Windows NT servers.
  ## </summary>
@@ -18850,7 +18917,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.10/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/samba.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/samba.te	2009-04-01 15:20:37.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -19136,7 +19203,7 @@
  allow swat_t self:udp_socket create_socket_perms;
  
 +allow swat_t self:unix_stream_socket connectto;
-+can_exec(swat_t, smbd_exec_t)
++samba_domtrans_smb(swat_t)
 +allow swat_t smbd_port_t:tcp_socket name_bind;
 +allow swat_t smbd_t:process { signal signull };
 +allow swat_t smbd_var_run_t:file { lock unlink };
@@ -23819,13 +23886,14 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.10/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/init.if	2009-03-30 10:09:41.000000000 -0400
-@@ -280,6 +280,27 @@
++++ serefpolicy-3.6.10/policy/modules/system/init.if	2009-04-01 15:00:12.000000000 -0400
+@@ -280,6 +280,28 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
 +
 +	userdom_dontaudit_search_user_home_dirs($1)
++	userdom_dontaudit_rw_stream($1)
 +
 +	tunable_policy(`allow_daemons_use_tty',`
 +	   term_use_all_user_ttys($1)
@@ -23848,7 +23916,7 @@
  ')
  
  ########################################
-@@ -546,7 +567,7 @@
+@@ -546,7 +568,7 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
@@ -23857,7 +23925,7 @@
  	')
  ')
  
-@@ -619,18 +640,19 @@
+@@ -619,18 +641,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -23881,7 +23949,7 @@
  	')
  ')
  
-@@ -646,23 +668,43 @@
+@@ -646,23 +669,43 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -23929,7 +23997,7 @@
  ##	Execute a init script in a specified domain.
  ## </summary>
  ## <desc>
-@@ -1291,6 +1333,25 @@
+@@ -1291,6 +1334,25 @@
  
  ########################################
  ## <summary>
@@ -23955,7 +24023,7 @@
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1582,51 @@
+@@ -1521,3 +1583,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
@@ -24009,7 +24077,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.10/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/init.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/init.te	2009-04-01 15:00:25.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -24292,13 +24360,15 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +865,17 @@
+@@ -790,3 +865,19 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
 +
 +userdom_append_user_home_content_files(daemon)
 +userdom_write_user_tmp_files(daemon)
++userdom_dontaudit_rw_stream(daemon)
++
 +logging_append_all_logs(daemon)
 +
 +optional_policy(`
@@ -26941,7 +27011,7 @@
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.10/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/unconfined.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/unconfined.if	2009-04-01 14:58:39.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -27598,7 +27668,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.10/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-01 14:59:58.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28982,7 +29052,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3182,462 @@
+@@ -2981,3 +3182,482 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -29445,6 +29515,26 @@
 +	allow $1 userdomain:key manage_key_perms;
 +')
 +
++
++########################################
++## <summary>
++##	Do not audit attempts to read and write
++##	unserdomain stream.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_rw_stream',`
++	gen_require(`
++		attribute userdomain;
++	')
++
++	dontaudit $1 userdomain:unix_stream_socket rw_file_perms;
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.10/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.10/policy/modules/system/userdomain.te	2009-03-30 10:09:41.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- selinux-policy.spec	30 Mar 2009 16:06:48 -0000	1.814
+++ selinux-policy.spec	2 Apr 2009 15:23:58 -0000	1.815
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Thu Apr 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-6
+- Dontaudit listing of /root directory for cron system jobs
+
 * Mon Mar 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-5
 - Fix missing ld.so.cache label
 



From rdieter at fedoraproject.org  Thu Apr  2 15:25:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:25:00 +0000 (UTC)
Subject: rpms/kdetoys/F-9 .cvsignore, 1.23, 1.24 kdetoys.spec, 1.31,
	1.32 sources, 1.24, 1.25
Message-ID: <20090402152500.746AF70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4102/F-9

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Jan 2009 17:18:24 -0000	1.23
+++ .cvsignore	2 Apr 2009 15:24:30 -0000	1.24
@@ -1 +1 @@
-kdetoys-4.1.4.tar.bz2
+kdetoys-4.2.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/kdetoys.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdetoys.spec	27 Feb 2009 18:45:04 -0000	1.31
+++ kdetoys.spec	2 Apr 2009 15:24:30 -0000	1.32
@@ -1,8 +1,8 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -18,8 +18,8 @@
 
 Requires: kdelibs4 >= %{version}
 #Requires: kdebase-workspace
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 
 # FIXME: Don't list / drop kweather? It isn't really working as far as I can
@@ -60,11 +60,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files
@@ -83,7 +89,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	27 Feb 2009 18:45:04 -0000	1.24
+++ sources	2 Apr 2009 15:24:30 -0000	1.25
@@ -1 +1 @@
-78cd751eb92ec2f068c8dc39794175e6  kdetoys-4.2.1.tar.bz2
+dcc17b3d719c7ddb48f75b64f34af261  kdetoys-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  2 15:25:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:25:00 +0000 (UTC)
Subject: rpms/kdetoys/F-10 .cvsignore, 1.29, 1.30 kdetoys.spec, 1.39,
	1.40 sources, 1.29, 1.30
Message-ID: <20090402152500.CC4037013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4102/F-10

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	24 Jan 2009 14:49:01 -0000	1.29
+++ .cvsignore	2 Apr 2009 15:24:30 -0000	1.30
@@ -1,5 +1 @@
-kdetoys-4.1.2.tar.bz2
-kdetoys-4.1.80.tar.bz2
-kdetoys-4.1.85.tar.bz2
-kdetoys-4.1.96.tar.bz2
-kdetoys-4.2.0.tar.bz2
+kdetoys-4.2.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdetoys.spec	27 Feb 2009 18:45:03 -0000	1.39
+++ kdetoys.spec	2 Apr 2009 15:24:30 -0000	1.40
@@ -1,8 +1,8 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -18,8 +18,8 @@
 
 Requires: kdelibs4 >= %{version}
 #Requires: kdebase-workspace
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 
 # FIXME: Don't list / drop kweather? It isn't really working as far as I can
@@ -60,11 +60,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files
@@ -83,7 +89,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Feb 2009 18:45:03 -0000	1.29
+++ sources	2 Apr 2009 15:24:30 -0000	1.30
@@ -1 +1 @@
-78cd751eb92ec2f068c8dc39794175e6  kdetoys-4.2.1.tar.bz2
+dcc17b3d719c7ddb48f75b64f34af261  kdetoys-4.2.2.tar.bz2



From amdunn at fedoraproject.org  Thu Apr  2 15:31:02 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Thu,  2 Apr 2009 15:31:02 +0000 (UTC)
Subject: rpms/ocaml-mlgmpidl/F-10 mlgmpidl-1.1-Makefile.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 ocaml-mlgmpidl.spec, 1.1, 1.2 sources, 1.2,
	1.3 mlgmpidl-1.0-Makefile.patch, 1.1, NONE
Message-ID: <20090402153102.EFBC170120@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5822/F-10

Modified Files:
	.cvsignore import.log ocaml-mlgmpidl.spec sources 
Added Files:
	mlgmpidl-1.1-Makefile.patch 
Removed Files:
	mlgmpidl-1.0-Makefile.patch 
Log Message:
New upstream version incorporates functional interface to Mpfr.


mlgmpidl-1.1-Makefile.patch:

--- NEW FILE mlgmpidl-1.1-Makefile.patch ---
--- Makefile	2009-04-02 09:41:47.000000000 -0400
+++ Makefile	2009-04-02 09:51:12.000000000 -0400
@@ -11,6 +11,24 @@
 #
 PREFIX = $(MLGMPIDL_PREFIX)
 
+# Location of includes
+GMP_INCLUDEDIR = $(GMP_PREFIX)/include
+MPFR_INCLUDEDIR = $(MPFR_PREFIX)/include
+
+# Location of C libraries
+GMP_LIBDIR = $(GMP_PREFIX)/lib
+MPFR_LIBDIR = $(MPFR_PREFIX)/lib
+
+# Location of OCaml libraries
+CAML_LIBDIR = $(CAML_PREFIX)/lib/ocaml
+CAMLIDL_LIBDIR = $(CAMLIDL_PREFIX)/lib/ocaml
+MLGMPIDL_LIBDIR = $(MLGMPIDL_PREFIX)/lib
+
+# Eventual installation destination directories
+INSTALL_INCLUDEDIR = $(PREFIX)/include
+INSTALL_OCAML_LIBDIR = $(PREFIX)/lib/ocaml/mlgmpidl
+INSTALL_BINDIR = $(PREFIX)/bin
+
 #---------------------------------------
 # CAML part
 #---------------------------------------
@@ -18,15 +36,15 @@
 OCAMLINC =
 ifeq ($(HAS_MPFR),0)
 OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl" 
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
 else
 OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(MPFR_PREFIX)/lib" -cclib "-lmpfr" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl"
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(MPFR_LIBDIR)" -cclib "-lmpfr" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
 endif
 
 #---------------------------------------
@@ -36,14 +54,14 @@
 ifeq ($(HAS_MPFR),0)
 ICFLAGS = \
 -DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
 else
 ICFLAGS = \
 -DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(MPFR_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(MPFR_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
 endif
 
 #---------------------------------------
@@ -89,20 +107,20 @@
 	-ccopt "-L." bigarray.cma gmp.cma 
 
 install:
-	mkdir -p $(PREFIX)/include $(PREFIX)/lib $(PREFIX)/bin
-	cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(PREFIX)/lib
-	cp -f $(CCINC_TOINSTALL) $(PREFIX)/include
-	for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/lib; fi; done
-	for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/bin; fi; done
+	mkdir -p $(INSTALL_INCLUDEDIR) $(INSTALL_OCAML_LIBDIR) $(INSTALL_BINDIR)
+	cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(INSTALL_OCAML_LIBDIR)
+	cp -f $(CCINC_TOINSTALL) $(INSTALL_INCLUDEDIR)
+	for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_OCAML_LIBDIR); fi; done
+	for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_BINDIR); fi; done
 
 #---------------------------------------
 # Misc rules
 #---------------------------------------
 
 distclean: clean
-	(cd $(PREFIX)/include; /bin/rm -f $(CCINC_TOINSTALL))
-	(cd $(PREFIX)/lib; /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(CCLIB_TOINSTALL))
-	(cd $(PREFIX)/bin; /bin/rm -f $(CCBIN_TOINSTALL))
+	(cd $(INSTALL_INCLUDEDIR); /bin/rm -f $(CCINC_TOINSTALL))
+	(cd $(INSTALL_OCAML_LIBDDIR); /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx))
+	(cd $(INSTALL_BINDIR); /bin/rm -f $(CCBIN_TOINSTALL))
 
 clean:
 	/bin/rm -fr tmp html


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Mar 2009 15:27:17 -0000	1.2
+++ .cvsignore	2 Apr 2009 15:30:32 -0000	1.3
@@ -1 +1 @@
-mlgmpidl.tgz
+mlgmpidl-1.1.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Mar 2009 15:27:17 -0000	1.1
+++ import.log	2 Apr 2009 15:30:32 -0000	1.2
@@ -1 +1,2 @@
 ocaml-mlgmpidl-1_0-1_fc10:F-10:ocaml-mlgmpidl-1.0-1.fc10.src.rpm:1238253748
+ocaml-mlgmpidl-1_1-1_fc10:F-10:ocaml-mlgmpidl-1.1-1.fc10.src.rpm:1238685944


Index: ocaml-mlgmpidl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/ocaml-mlgmpidl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-mlgmpidl.spec	28 Mar 2009 15:27:17 -0000	1.1
+++ ocaml-mlgmpidl.spec	2 Apr 2009 15:30:32 -0000	1.2
@@ -10,17 +10,17 @@
 %define debug_package %{nil}
 
 Name:           ocaml-mlgmpidl
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        OCaml interface to GMP and MPFR libraries
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/index.html
-Source0:        http://gforge.inria.fr/frs/download.php/2460/mlgmpidl.tgz
+Source0:        http://gforge.inria.fr/frs/download.php/20228/mlgmpidl-%{version}.tgz
 Source1:        mlgmpidl_test.ml
 Source2:        mlgmpidl_test_result
 Source3:        mlgmpidl-META
-Patch0:         mlgmpidl-1.0-Makefile.patch
+Patch0:         mlgmpidl-1.1-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ocaml >= 3.07, ocaml-ocamldoc, ocaml-camlidl-devel, gmp-devel, mpfr-devel, prelink
 # BuildRequires for documentation build
@@ -141,5 +141,7 @@
 %{_docdir}/%{name}
 
 %changelog
+* Thu Apr 02 2009 Alan Dunn <amdunn at gmail.com> 1.1-1
+- New upstream version incorporates functional interface to Mpfr.
 * Sat Mar 28 2009 Alan Dunn <amdunn at gmail.com> 1.0-1
 - Initial Fedora RPM version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Mar 2009 15:27:17 -0000	1.2
+++ sources	2 Apr 2009 15:30:32 -0000	1.3
@@ -1 +1 @@
-63ec244511e58bd1cbf5513dc7aaad8e  mlgmpidl.tgz
+5374d9764c609e005691925c612c44ac  mlgmpidl-1.1.tgz


--- mlgmpidl-1.0-Makefile.patch DELETED ---



From sindrepb at fedoraproject.org  Thu Apr  2 15:31:31 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 15:31:31 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.17,1.18
Message-ID: <20090402153131.1511670120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6079

Modified Files:
	awn-extras-applets.spec 
Log Message:
fixes


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- awn-extras-applets.spec	2 Apr 2009 14:55:13 -0000	1.17
+++ awn-extras-applets.spec	2 Apr 2009 15:31:00 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -106,7 +106,7 @@
 for f in `find $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/ -name *.py ! -executable`
  do stripscript $f
 done
-stripscript $RPM_BUILD_ROOT%{python_sitearch}/awn/detach.py
+stripscript $RPM_BUILD_ROOT%{python_sitearch}/awn/extras/detach.py
 
 
 %pre
@@ -178,7 +178,7 @@
 
 
 %changelog
-* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-3
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-4
 - New upstream release
 - Add devel package
 - Update schemas scriplets



From rdieter at fedoraproject.org  Thu Apr  2 15:31:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:31:32 +0000 (UTC)
Subject: rpms/kdeutils/F-10 .cvsignore, 1.56, 1.57 kdeutils.spec, 1.153,
	1.154 sources, 1.60, 1.61
Message-ID: <20090402153132.922AB70120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6023

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	6 Mar 2009 15:18:14 -0000	1.56
+++ .cvsignore	2 Apr 2009 15:31:02 -0000	1.57
@@ -1 +1 @@
-kdeutils-4.2.1.tar.bz2
+kdeutils-4.2.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdeutils.spec	6 Mar 2009 16:23:39 -0000	1.153
+++ kdeutils.spec	2 Apr 2009 15:31:02 -0000	1.154
@@ -1,17 +1,12 @@
-%if 0%{?fedora} > 9
-# include new PyKDE4 printer applet
-%define printer_applet 1
-%endif
-
 %if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
 %define include_kjots 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.1
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -33,15 +28,15 @@
 BuildRequires:  libzip-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
-%if 0%{?printer_applet}
+
+# printer applet
 BuildRequires:  PyKDE4-devel >= %{version}
 BuildRequires:  system-config-printer-libs
 # upgrade path so it doesn't get lost
 Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-%endif
 
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
@@ -125,16 +120,24 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files
@@ -184,16 +187,26 @@
 %endif
 %{_mandir}/man1/*
 
-%if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
 %{_kde4_bindir}/printer-applet
 %{_kde4_datadir}/autostart/printer-applet.desktop
 %{_kde4_appsdir}/printer-applet/
-%endif
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.2
+- also drag in the printer-applet on F9
+
+* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.1
+- also build printer-applet on F9, but don't drag it in by default
+
 * Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
 - *really* make a -printer-applet subpkg
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	27 Feb 2009 18:53:34 -0000	1.60
+++ sources	2 Apr 2009 15:31:02 -0000	1.61
@@ -1 +1 @@
-ed3397244a64530c108e76d6767c07d0  kdeutils-4.2.1.tar.bz2
+3df5186f9dacddbce48a1c7eb35515cd  kdeutils-4.2.2.tar.bz2



From amdunn at fedoraproject.org  Thu Apr  2 15:32:24 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Thu,  2 Apr 2009 15:32:24 +0000 (UTC)
Subject: rpms/ocaml-mlgmpidl/F-9 mlgmpidl-1.1-Makefile.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 ocaml-mlgmpidl.spec, 1.1, 1.2 sources, 1.2,
	1.3 mlgmpidl-1.0-Makefile.patch, 1.1, NONE
Message-ID: <20090402153224.1E62370120@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/ocaml-mlgmpidl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6486/F-9

Modified Files:
	.cvsignore import.log ocaml-mlgmpidl.spec sources 
Added Files:
	mlgmpidl-1.1-Makefile.patch 
Removed Files:
	mlgmpidl-1.0-Makefile.patch 
Log Message:
New upstream version incorporates functional interface to Mpfr.


mlgmpidl-1.1-Makefile.patch:

--- NEW FILE mlgmpidl-1.1-Makefile.patch ---
--- Makefile	2009-04-02 09:41:47.000000000 -0400
+++ Makefile	2009-04-02 09:51:12.000000000 -0400
@@ -11,6 +11,24 @@
 #
 PREFIX = $(MLGMPIDL_PREFIX)
 
+# Location of includes
+GMP_INCLUDEDIR = $(GMP_PREFIX)/include
+MPFR_INCLUDEDIR = $(MPFR_PREFIX)/include
+
+# Location of C libraries
+GMP_LIBDIR = $(GMP_PREFIX)/lib
+MPFR_LIBDIR = $(MPFR_PREFIX)/lib
+
+# Location of OCaml libraries
+CAML_LIBDIR = $(CAML_PREFIX)/lib/ocaml
+CAMLIDL_LIBDIR = $(CAMLIDL_PREFIX)/lib/ocaml
+MLGMPIDL_LIBDIR = $(MLGMPIDL_PREFIX)/lib
+
+# Eventual installation destination directories
+INSTALL_INCLUDEDIR = $(PREFIX)/include
+INSTALL_OCAML_LIBDIR = $(PREFIX)/lib/ocaml/mlgmpidl
+INSTALL_BINDIR = $(PREFIX)/bin
+
 #---------------------------------------
 # CAML part
 #---------------------------------------
@@ -18,15 +36,15 @@
 OCAMLINC =
 ifeq ($(HAS_MPFR),0)
 OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl" 
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
 else
 OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(MPFR_PREFIX)/lib" -cclib "-lmpfr" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl"
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(MPFR_LIBDIR)" -cclib "-lmpfr" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
 endif
 
 #---------------------------------------
@@ -36,14 +54,14 @@
 ifeq ($(HAS_MPFR),0)
 ICFLAGS = \
 -DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
 else
 ICFLAGS = \
 -DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(MPFR_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(MPFR_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
 endif
 
 #---------------------------------------
@@ -89,20 +107,20 @@
 	-ccopt "-L." bigarray.cma gmp.cma 
 
 install:
-	mkdir -p $(PREFIX)/include $(PREFIX)/lib $(PREFIX)/bin
-	cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(PREFIX)/lib
-	cp -f $(CCINC_TOINSTALL) $(PREFIX)/include
-	for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/lib; fi; done
-	for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/bin; fi; done
+	mkdir -p $(INSTALL_INCLUDEDIR) $(INSTALL_OCAML_LIBDIR) $(INSTALL_BINDIR)
+	cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(INSTALL_OCAML_LIBDIR)
+	cp -f $(CCINC_TOINSTALL) $(INSTALL_INCLUDEDIR)
+	for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_OCAML_LIBDIR); fi; done
+	for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_BINDIR); fi; done
 
 #---------------------------------------
 # Misc rules
 #---------------------------------------
 
 distclean: clean
-	(cd $(PREFIX)/include; /bin/rm -f $(CCINC_TOINSTALL))
-	(cd $(PREFIX)/lib; /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(CCLIB_TOINSTALL))
-	(cd $(PREFIX)/bin; /bin/rm -f $(CCBIN_TOINSTALL))
+	(cd $(INSTALL_INCLUDEDIR); /bin/rm -f $(CCINC_TOINSTALL))
+	(cd $(INSTALL_OCAML_LIBDDIR); /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx))
+	(cd $(INSTALL_BINDIR); /bin/rm -f $(CCBIN_TOINSTALL))
 
 clean:
 	/bin/rm -fr tmp html


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Mar 2009 15:32:31 -0000	1.2
+++ .cvsignore	2 Apr 2009 15:31:53 -0000	1.3
@@ -1 +1 @@
-mlgmpidl.tgz
+mlgmpidl-1.1.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Mar 2009 15:32:31 -0000	1.1
+++ import.log	2 Apr 2009 15:31:53 -0000	1.2
@@ -1 +1,2 @@
 ocaml-mlgmpidl-1_0-1_fc10:F-9:ocaml-mlgmpidl-1.0-1.fc10.src.rpm:1238253936
+ocaml-mlgmpidl-1_1-1_fc10:F-9:ocaml-mlgmpidl-1.1-1.fc10.src.rpm:1238686031


Index: ocaml-mlgmpidl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-9/ocaml-mlgmpidl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-mlgmpidl.spec	28 Mar 2009 15:32:32 -0000	1.1
+++ ocaml-mlgmpidl.spec	2 Apr 2009 15:31:53 -0000	1.2
@@ -10,17 +10,17 @@
 %define debug_package %{nil}
 
 Name:           ocaml-mlgmpidl
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        OCaml interface to GMP and MPFR libraries
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/index.html
-Source0:        http://gforge.inria.fr/frs/download.php/2460/mlgmpidl.tgz
+Source0:        http://gforge.inria.fr/frs/download.php/20228/mlgmpidl-%{version}.tgz
 Source1:        mlgmpidl_test.ml
 Source2:        mlgmpidl_test_result
 Source3:        mlgmpidl-META
-Patch0:         mlgmpidl-1.0-Makefile.patch
+Patch0:         mlgmpidl-1.1-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ocaml >= 3.07, ocaml-ocamldoc, ocaml-camlidl-devel, gmp-devel, mpfr-devel, prelink
 # BuildRequires for documentation build
@@ -141,5 +141,7 @@
 %{_docdir}/%{name}
 
 %changelog
+* Thu Apr 02 2009 Alan Dunn <amdunn at gmail.com> 1.1-1
+- New upstream version incorporates functional interface to Mpfr.
 * Sat Mar 28 2009 Alan Dunn <amdunn at gmail.com> 1.0-1
 - Initial Fedora RPM version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Mar 2009 15:32:32 -0000	1.2
+++ sources	2 Apr 2009 15:31:53 -0000	1.3
@@ -1 +1 @@
-63ec244511e58bd1cbf5513dc7aaad8e  mlgmpidl.tgz
+5374d9764c609e005691925c612c44ac  mlgmpidl-1.1.tgz


--- mlgmpidl-1.0-Makefile.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr  2 15:43:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 15:43:26 +0000 (UTC)
Subject: rpms/kdeutils/F-9 .cvsignore, 1.55, 1.56 kdeutils.spec, 1.139,
	1.140 sources, 1.62, 1.63
Message-ID: <20090402154326.88F4670120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9996

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	5 Mar 2009 11:59:16 -0000	1.55
+++ .cvsignore	2 Apr 2009 15:42:56 -0000	1.56
@@ -1,3 +1,2 @@
-kdeutils-4.2.0.tar.bz2
-kdepim-4.2.0.tar.bz2
-kdepim-4.2.1.tar.bz2
+kdeutils-4.2.2.tar.bz2
+kdepim-4.2.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- kdeutils.spec	14 Mar 2009 17:36:27 -0000	1.139
+++ kdeutils.spec	2 Apr 2009 15:42:56 -0000	1.140
@@ -1,12 +1,12 @@
 %if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
 %define include_kjots 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.1
-Release:        3%{?dist}.2
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -28,8 +28,8 @@
 BuildRequires:  libzip-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
 # printer applet
@@ -120,16 +120,24 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files
@@ -187,6 +195,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.2
 - also drag in the printer-applet on F9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	27 Feb 2009 18:53:35 -0000	1.62
+++ sources	2 Apr 2009 15:42:56 -0000	1.63
@@ -1,2 +1,2 @@
-ed3397244a64530c108e76d6767c07d0  kdeutils-4.2.1.tar.bz2
-2ebc3730aaee53f494e8e6abd26029bd  kdepim-4.2.1.tar.bz2
+3df5186f9dacddbce48a1c7eb35515cd  kdeutils-4.2.2.tar.bz2
+964208d570845c75e0c482bb3d33892f  kdepim-4.2.2.tar.bz2



From mbarnes at fedoraproject.org  Thu Apr  2 16:05:41 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  2 Apr 2009 16:05:41 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.376,1.377
Message-ID: <20090402160541.A3D8C70120@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14946

Modified Files:
	evolution.spec 
Log Message:

* Thu Apr 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
- Require libpst.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- evolution.spec	16 Mar 2009 11:47:20 -0000	1.376
+++ evolution.spec	2 Apr 2009 16:05:11 -0000	1.377
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -77,8 +77,10 @@
 # Don't trust evolution-data-server to maintain accurate sonames.
 Requires: evolution-data-server >= %{version}
 
+# No devel package for libpst, despite the name.
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-themes
+Requires: libpst
 
 ### Build Dependencies ###
 
@@ -689,6 +691,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Thu Apr 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
+- Require libpst.
+
 * Mon Mar 16 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-1.fc11
 - Update to 2.26.0
 



From joost at fedoraproject.org  Thu Apr  2 16:24:15 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  2 Apr 2009 16:24:15 +0000 (UTC)
Subject: rpms/lazarus/devel .cvsignore, 1.3, 1.4 Desktop_patch.diff, 1.2,
	1.3 lazarus.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090402162415.48E9970120@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/lazarus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19985

Modified Files:
	.cvsignore Desktop_patch.diff lazarus.spec sources 
Log Message:
* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-1
 - Updated to version 0.9.26.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2008 22:46:32 -0000	1.3
+++ .cvsignore	2 Apr 2009 16:23:44 -0000	1.4
@@ -1 +1 @@
-lazarus-0.9.26-0.tgz
+lazarus-0.9.26.2-0.tgz

Desktop_patch.diff:

Index: Desktop_patch.diff
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/Desktop_patch.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Desktop_patch.diff	27 Oct 2008 22:46:32 -0000	1.2
+++ Desktop_patch.diff	2 Apr 2009 16:23:44 -0000	1.3
@@ -1,6 +1,6 @@
 --- lazarus/install/lazarus.desktop	2007-11-26 15:34:42.000000000 +0100
 +++ lazarus/install/lazarus.desktop.n	2008-10-18 11:52:33.000000000 +0200
-@@ -5,13 +5,8 @@
+@@ -5,12 +5,7 @@
  Exec=startlazarus %f
  Terminal=false
  Type=Application
@@ -10,9 +10,8 @@
 +Categories=IDE;Development;GTK;GUIDesigner;
  StartupWMClass=Lazarus
  MimeType=text/x-pascal;text/lazarus-project-source;text/lazarus-project-information;text/lazarus-form;text/lazarus-resource;text/lazarus-package;text/lazarus-package-link;text/lazarus-code-inlay;
--Patterns=*.pas;*.pp;*.p;*.inc;*.lpi;*.lpk;*.lpr;*.lfm;*.lrs;*.lpl;*.dci
 -[Property::X-KDE-NativeExtension]
 -Type=QString
 -Value=.pas
 -X-Ubuntu-Gettext-Domain=desktop_kdelibs
- 
+-


Index: lazarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/lazarus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lazarus.spec	25 Feb 2009 12:43:06 -0000	1.5
+++ lazarus.spec	2 Apr 2009 16:23:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lazarus
-Version:        0.9.26
-Release:        4%{?dist}
+Version:        0.9.26.2
+Release:        1%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal
 
 Group:          Development/Languages
@@ -99,6 +99,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-1
+ - Updated to version 0.9.26.2
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.26-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2008 22:46:32 -0000	1.3
+++ sources	2 Apr 2009 16:23:44 -0000	1.4
@@ -1 +1 @@
-f1a7b2f89d1e6a246f25abb235880594  lazarus-0.9.26-0.tgz
+357fd9f6e9d410f3c74ff493fce7f75a  lazarus-0.9.26.2-0.tgz



From jnovy at fedoraproject.org  Thu Apr  2 16:36:16 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu,  2 Apr 2009 16:36:16 +0000 (UTC)
Subject: rpms/texlive/devel texlive-getline.patch, NONE,
	1.1 texlive-poolfix.patch, NONE, 1.1 texlive.spec, 1.50, 1.51
Message-ID: <20090402163616.23B6A70120@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22522

Modified Files:
	texlive.spec 
Added Files:
	texlive-getline.patch texlive-poolfix.patch 
Log Message:
* Thu Apr 02 2009 Jindrich Novy <jnovy at redhat.com> - 2007-42
- avoid clashes with getline() from glibc
- increase default bibtex/jbibtex limits (#492136)


texlive-getline.patch:

--- NEW FILE texlive-getline.patch ---
diff -up texlive-2007/texk/afm2pl/afm2pl.c.getline texlive-2007/texk/afm2pl/afm2pl.c
--- texlive-2007/texk/afm2pl/afm2pl.c.getline	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/afm2pl/afm2pl.c	2009-04-02 15:18:30.000000000 +0200
@@ -345,7 +345,7 @@ P2C (register int, x, register int, y)
 
 /* read a line from infile into buffer and obuffer */
 int
-  getline
+  _getline
 P1H (void)
 {
   register char *p;
@@ -781,7 +781,7 @@ P1H (void)
     afmencoding->vec[i] = ".notdef";
   afmencoding->name = "Unspecified";
 
-  while (getline ()) {
+  while (_getline ()) {
     switch (interest (paramstring ())) {
     case FontName:
       fontname = paramnewstring ();
@@ -963,7 +963,7 @@ gettoken ()
 
   while (1) {
     while (param == 0 || *param == 0) {
-      if (getline () == 0)
+      if (_getline () == 0)
         error ("! premature end in encoding file");
     }
     if (param[0] == '%') {
@@ -1540,7 +1540,7 @@ extraligkerninfo ()
     encfilename =
       openin (encfilename, kpse_enc_format, ".enc");
     for (lig_it = 0; lig_it < 2; lig_it++) {
-      while (getline ()) {
+      while (_getline ()) {
         /* search for (ligkern) comment in line */
         for (p = buffer; *p; p++)
           if (*p == '%') {
@@ -1576,7 +1576,7 @@ extraligkerninfo ()
     for (i = 0; i < ligfilenames->n; i++) {
       ligfilename = openin (ligfilenames->names[i],
                             kpse_lig_format, ".lig");
-      while (getline ())
+      while (_getline ())
         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
       fclose (infile);
     }
@@ -1607,7 +1607,7 @@ extraligkerninfo ()
   for (i = 0; i < Ligfilenames->n; i++) {
     ligfilename = openin (Ligfilenames->names[i],
                           kpse_lig_format, ".lig");
-    while (getline ())
+    while (_getline ())
       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
     fclose (infile);
   }
diff -up texlive-2007/texk/dvipsk/afm2tfm.c.getline texlive-2007/texk/dvipsk/afm2tfm.c
--- texlive-2007/texk/dvipsk/afm2tfm.c.getline	2009-04-02 15:10:49.000000000 +0200
+++ texlive-2007/texk/dvipsk/afm2tfm.c	2009-04-02 15:20:59.000000000 +0200
@@ -257,7 +257,7 @@ transform P2C(register int, x, register 
 }
 
 int
-getline P1H(void) {
+_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -612,7 +612,7 @@ readadobe P1H(void) {
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1888,7 +1888,7 @@ char *gettoken() {
 
    while (1) {
       while (param == 0 || *param == 0) {
-         if (getline() == 0)
+         if (_getline() == 0)
             error("! premature end in encoding file") ;
          for (p=buffer; *p; p++)
             if (*p == '%') {
@@ -1979,7 +1979,7 @@ struct encoding *readencoding P1C(char *
       p = gettoken() ;
       if (strcmp(p, "]"))
          error("! token 258 in encoding must be make-array (])") ;
-      while (getline()) {
+      while (_getline()) {
          for (p=buffer; *p; p++)
             if (*p == '%') {
                if (ignoreligkern == 0)
diff -up texlive-2007/texk/web2c/cpascal.h.getline texlive-2007/texk/web2c/cpascal.h
--- texlive-2007/texk/web2c/cpascal.h.getline	2006-12-27 00:37:34.000000000 +0100
+++ texlive-2007/texk/web2c/cpascal.h	2009-04-02 15:10:49.000000000 +0200
@@ -14,6 +14,7 @@
 
 /* We must include this first, to resolve many C issues.  */
 #include "config.h"
+#define getline _getline
 
 /* We only use getopt in the applications, not in web2c itself.  */
 #include <kpathsea/getopt.h>
diff -up texlive-2007/texk/web2c/mpware/mpto.c.getline texlive-2007/texk/web2c/mpware/mpto.c
--- texlive-2007/texk/web2c/mpware/mpto.c.getline	2006-11-28 14:24:53.000000000 +0100
+++ texlive-2007/texk/web2c/mpware/mpto.c	2009-04-02 15:10:50.000000000 +0200
@@ -99,7 +95,7 @@ usage(char *progn)
 }
 
 char *
-getline(void)
+_getline(void)
 {				/* returns NULL on EOF or error, otherwise buf */
     int c;
     unsigned loc = 0;
@@ -304,11 +300,11 @@ copytex(void)
     while (*aa == ' ' || *aa == '\t')
 	aa++;
     if (*aa == 0)
-	if ((aa = getline()) == NULL)
+	if ((aa = _getline()) == NULL)
 	    err("btex section does not end");
     do {
 	if (*aa == 0)
-	    if ((aa = getline()) == NULL)
+	    if ((aa = _getline()) == NULL)
 		err("btex section does not end");
 	    else
 		printf("\n");
@@ -465,7 +461,7 @@ Current maintainer: Taco Hoekwater.\n");
 	postverb = troff_postverb;
     }
     printf("%s", predoc);
-    while (getline() != NULL)
+    while (_getline() != NULL)
 	do_line();
     printf("%s", postdoc);
     exit(0);

texlive-poolfix.patch:

--- NEW FILE texlive-poolfix.patch ---
diff -up texlive-2007/texk/web2c/bibtex.ch.poolfix texlive-2007/texk/web2c/bibtex.ch
--- texlive-2007/texk/web2c/bibtex.ch.poolfix	2006-12-27 00:37:34.000000000 +0100
+++ texlive-2007/texk/web2c/bibtex.ch	2009-04-02 18:06:56.000000000 +0200
@@ -169,7 +169,7 @@ end.
 
 @x [still 14]
 @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
-@!pool_size=65000; {maximum number of characters in strings}
+@!pool_size=650000; {maximum number of characters in strings}
 @!max_strings=4000; {maximum number of strings, including pre-defined;
                                                         must be |<=hash_size|}
 @!max_cites=750; {maximum number of distinct cite keys; must be
@@ -179,7 +179,7 @@ end.
 @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
 @y [still 14]
 @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
-@!POOL_SIZE=65000; {initial number of characters in strings}
+@!POOL_SIZE=650000; {initial number of characters in strings}
 @!max_strings=35000; {maximum number of strings, including pre-defined;
                                                         must be |<=hash_size|}
 @!max_cites=5000; {maximum number of distinct cite keys; must be
diff -up texlive-2007/texk/web2c/bibtex.web.poolfix texlive-2007/texk/web2c/bibtex.web
--- texlive-2007/texk/web2c/bibtex.web.poolfix	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/web2c/bibtex.web	2009-04-02 18:06:56.000000000 +0200
@@ -399,7 +399,7 @@ first limitation to be a problem, often 
 @!max_print_line=79; {the maximum: must be |>min_print_line| and |<buf_size|}
 @!aux_stack_size=20; {maximum number of simultaneous open \.{.aux} files}
 @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
-@!pool_size=65000; {maximum number of characters in strings}
+@!pool_size=650000; {maximum number of characters in strings}
 @!max_strings=4000; {maximum number of strings, including pre-defined;
                                                         must be |<=hash_size|}
 @!max_cites=750; {maximum number of distinct cite keys; must be
diff -up texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch
--- texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix	2009-04-02 18:06:56.000000000 +0200
+++ texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch	2009-04-02 18:07:52.000000000 +0200
@@ -179,7 +179,7 @@ end.
 
 @x [still 14]
 @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
-@!pool_size=65000; {maximum number of characters in strings}
+@!pool_size=650000; {maximum number of characters in strings}
 @!max_strings=4000; {maximum number of strings, including pre-defined;
                                                         must be |<=hash_size|}
 @!max_cites=750; {maximum number of distinct cite keys; must be
@@ -189,7 +189,7 @@ end.
 @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
 @y [still 14]
 @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
-@!POOL_SIZE=65000; {initial number of characters in strings}
+@!POOL_SIZE=650000; {initial number of characters in strings}
 @!max_strings=35000; {maximum number of strings, including pre-defined;
                                                         must be |<=hash_size|}
 @!max_cites=5000; {maximum number of distinct cite keys; must be


Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- texlive.spec	26 Feb 2009 09:54:14 -0000	1.50
+++ texlive.spec	2 Apr 2009 16:35:45 -0000	1.51
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	41%{?dist}
+Release:	42%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -75,6 +75,8 @@
 Patch29:	texlive-man-context.patch
 Patch30:	texlive-lacheck.patch
 Patch31:	texlive-elif.patch
+Patch32:	texlive-getline.patch
+Patch33:	texlive-poolfix.patch
 
 ######
 # mpeters contributed patches
@@ -122,6 +124,7 @@
 Patch1005:	texlive-2007-pdvips.patch
 Patch1006:	texlive-2007-ptex-3.1.10.patch
 Patch1007:	texlive-2007-fmtutil-ptex.patch
+Patch1008:	texlive-poolfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -392,6 +395,7 @@
 %patch29 -p1 -b .man-context
 %patch30 -p1 -b .lacheck
 %patch31 -p1 -b .elif
+%patch32 -p1 -b .getline
 
 # fix non utf man pages
 %patch42 -p1 -b .notutf8-2
@@ -458,6 +462,8 @@
 # set up mendexk
 tar xfz %{SOURCE1002} -C texk
 
+%patch1008 -p1 -b .poolfix
+
 %build
 set -x
 # define CCACHE_DIR to let the build pass with ccache enabled.
@@ -1230,6 +1236,10 @@
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Thu Apr 02 2009 Jindrich Novy <jnovy at redhat.com> - 2007-42
+- avoid clashes with getline() from glibc
+- increase default bibtex/jbibtex limits (#492136)
+
 * Thu Feb 26 2009 Jindrich Novy <jnovy at redhat.com> - 2007-41
 - texlive-east-asian now requires texlive-texmf-east-asian (#487258)
 - do not attempt to remove old fonts via cron in /var/lib/texmf,



From kengert at fedoraproject.org  Thu Apr  2 16:36:38 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Thu,  2 Apr 2009 16:36:38 +0000 (UTC)
Subject: rpms/nss/devel nss-disable-freebl-execstack.patch, NONE,
	1.1 nss.spec, 1.60, 1.61
Message-ID: <20090402163638.E219170120@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606

Modified Files:
	nss.spec 
Added Files:
	nss-disable-freebl-execstack.patch 
Log Message:
* Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-4
- disable execstack when building freebl


nss-disable-freebl-execstack.patch:

--- NEW FILE nss-disable-freebl-execstack.patch ---
--- nss-3.12.2.99.3/mozilla/security/nss/lib/freebl/Makefile-save	2009-04-02 08:46:32.083530732 -0700
+++ nss-3.12.2.99.3/mozilla/security/nss/lib/freebl/Makefile	2009-04-02 08:46:51.740542226 -0700
@@ -133,7 +133,7 @@
 ifeq ($(OS_TARGET),Linux)
 ifeq ($(CPU_ARCH),x86_64)
     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
-    ASFLAGS += -march=opteron -m64 -fPIC
+    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
     DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
     DEFINES += -DNSS_USE_COMBA
     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- nss.spec	31 Mar 2009 23:05:13 -0000	1.60
+++ nss.spec	2 Apr 2009 16:36:08 -0000	1.61
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.99.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -34,6 +34,7 @@
 Patch4:           nss-pem-bug483855.patch
 Patch5:           nss-pem-bug429175.patch
 Patch6:           nss-enable-pem.patch
+Patch7:           nss-disable-freebl-execstack.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -90,6 +91,7 @@
 %patch4 -p0 -b .483855
 %patch5 -p0 -b .429175
 %patch6 -p0 -b .libpem
+%patch7 -p1
 
 
 %build
@@ -450,6 +452,8 @@
 
 
 %changelog
+* Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-4
+- disable execstack when building freebl
 * Tue Mar 31 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-3
 - add upstream patch to fix bug 483855
 * Tue Mar 31 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-2



From mjg59 at fedoraproject.org  Thu Apr  2 16:41:09 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Thu,  2 Apr 2009 16:41:09 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-shut-up-efifb.patch,NONE,1.1
Message-ID: <20090402164109.E963D70120@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24618

Added Files:
	linux-2.6-shut-up-efifb.patch 
Log Message:
Add the EFIfb patch`


linux-2.6-shut-up-efifb.patch:

--- NEW FILE linux-2.6-shut-up-efifb.patch ---
--- vanilla-2.6.29/drivers/video/efifb.c	2009-03-23 23:12:14.000000000 +0000
+++ linux-2.6.29.noarch/drivers/video/efifb.c	2009-04-01 19:24:01.000000000 +0100
@@ -208,12 +208,15 @@
 	unsigned int size_total;
 	int request_succeeded = 0;
 
-	printk(KERN_INFO "efifb: probing for efifb\n");
-
 	if (!screen_info.lfb_depth)
 		screen_info.lfb_depth = 32;
 	if (!screen_info.pages)
 		screen_info.pages = 1;
+	if (!screen_info.lfb_base) {
+		printk(KERN_DEBUG "efifb: invalid framebuffer address\n");
+		return -ENODEV;
+	}
+	printk(KERN_INFO "efifb: probing for efifb\n");
 
 	/* just assume they're all unset if any are */
 	if (!screen_info.blue_size) {



From joost at fedoraproject.org  Thu Apr  2 16:51:56 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  2 Apr 2009 16:51:56 +0000 (UTC)
Subject: rpms/lazarus/devel Makefile_patch.diff, 1.2, 1.3 lazarus.spec, 1.6,
	1.7
Message-ID: <20090402165156.B04F670120@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/lazarus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27036

Modified Files:
	Makefile_patch.diff lazarus.spec 
Log Message:
* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-2
 - Adapted Makefile patch for version 0.9.26.2


Makefile_patch.diff:

Index: Makefile_patch.diff
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/Makefile_patch.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile_patch.diff	27 Oct 2008 22:46:32 -0000	1.2
+++ Makefile_patch.diff	2 Apr 2009 16:51:56 -0000	1.3
@@ -20,8 +20,8 @@
  INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
  ifneq ($(findstring $(OS_TARGET),win32 win64),)
  LAZARUS_INSTALL_DIR=C:\lazarus
-@@ -110,8 +110,8 @@
- ifeq ($(OS_TARGET),win32)
+@@ -115,8 +115,8 @@
+ ifneq ($(findstring $(OS_TARGET),win32 win64),)
  
  else
 -	$(MKDIR) $(INSTALL_PREFIX)/share


Index: lazarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/lazarus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lazarus.spec	2 Apr 2009 16:23:44 -0000	1.6
+++ lazarus.spec	2 Apr 2009 16:51:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lazarus
 Version:        0.9.26.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal
 
 Group:          Development/Languages
@@ -99,6 +99,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-2
+ - Adapted Makefile patch for version 0.9.26.2
+
 * Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-1
  - Updated to version 0.9.26.2
 



From hadess at fedoraproject.org  Thu Apr  2 16:54:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  2 Apr 2009 16:54:28 +0000 (UTC)
Subject: rpms/totem/devel totem-use-pulsesink-volume.patch, 1.3,
	1.4 totem.spec, 1.233, 1.234
Message-ID: <20090402165428.6250670120@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27615

Modified Files:
	totem-use-pulsesink-volume.patch totem.spec 
Log Message:
* Thu Apr 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-2
- Update patch to set the PA stream volume, avoids setting the 
  volume when pulsesink isn't in a state where it has a stream
  (#488532)


totem-use-pulsesink-volume.patch:

Index: totem-use-pulsesink-volume.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem-use-pulsesink-volume.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- totem-use-pulsesink-volume.patch	17 Feb 2009 14:57:49 -0000	1.3
+++ totem-use-pulsesink-volume.patch	2 Apr 2009 16:53:57 -0000	1.4
@@ -1,18 +1,19 @@
 Index: src/backend/bacon-video-widget-gst-0.10.c
 ===================================================================
---- src/backend/bacon-video-widget-gst-0.10.c	(revision 5970)
+--- src/backend/bacon-video-widget-gst-0.10.c	(revision 6227)
 +++ src/backend/bacon-video-widget-gst-0.10.c	(working copy)
-@@ -166,7 +166,8 @@
+@@ -163,7 +163,9 @@
    gboolean                     cursor_shown;
    gboolean                     fullscreen_mode;
    gboolean                     auto_resize;
 -  gboolean                     uses_fakesink;
 +  gboolean                     uses_audio_fakesink;
 +  GstElement                  *pulse_audio_sink;
++  gdouble                      volume;
    
    gint                         video_width; /* Movie width */
    gint                         video_height; /* Movie height */
-@@ -1892,6 +1893,11 @@
+@@ -1879,6 +1881,11 @@
    g_free (bvw->priv->vis_element_name);
    bvw->priv->vis_element_name = NULL;
  
@@ -24,7 +25,16 @@
    if (bvw->priv->vis_plugins_list) {
      g_list_free (bvw->priv->vis_plugins_list);
      bvw->priv->vis_plugins_list = NULL;
-@@ -3145,7 +3151,7 @@
+@@ -1986,7 +1993,7 @@
+       bacon_video_widget_get_show_cursor (bvw));
+       break;
+     case PROP_VOLUME:
+-      g_value_set_double (value, bacon_video_widget_get_volume (bvw));
++      g_value_set_double (value, bvw->priv->volume);
+       break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+@@ -3133,7 +3140,7 @@
    if (bvw->priv->speakersetup == BVW_AUDIO_SOUND_AC3PASSTHRU)
      return FALSE;
  
@@ -33,43 +43,59 @@
  }
  
  void
-@@ -3157,8 +3163,13 @@
+@@ -3145,8 +3152,25 @@
    if (bacon_video_widget_can_set_volume (bvw) != FALSE)
    {
      volume = CLAMP (volume, 0.0, 1.0);
 -    g_object_set (bvw->priv->play, "volume",
 -	          (gdouble) volume, NULL);
 +    if (bvw->priv->pulse_audio_sink) {
-+      g_object_set (bvw->priv->pulse_audio_sink, "volume",
-+		    (gdouble) volume, NULL);
++      GstState cur_state;
++
++      gst_element_get_state (bvw->priv->pulse_audio_sink, &cur_state, NULL, 0);
++      if (cur_state == GST_STATE_READY || cur_state == GST_STATE_PLAYING)
++      {
++	gdouble new_vol;
++	g_object_set (bvw->priv->pulse_audio_sink, "volume",
++		      (gdouble) volume, NULL);
++	got_set = TRUE;
++
++        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
++      }
 +    } else {
 +      g_object_set (bvw->priv->play, "volume",
 +		    (gdouble) volume, NULL);
 +    }
++
++    bvw->priv->volume = volume;
      g_object_notify (G_OBJECT (bvw), "volume");
    }
  }
-@@ -3171,7 +3182,11 @@
+@@ -3159,9 +3183,7 @@
    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
    g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
  
 -  g_object_get (G_OBJECT (bvw->priv->play), "volume", &vol, NULL);
-+  if (bvw->priv->pulse_audio_sink) {
-+    g_object_get (G_OBJECT (bvw->priv->pulse_audio_sink), "volume", &vol, NULL);
-+  } else {
-+    g_object_get (G_OBJECT (bvw->priv->play), "volume", &vol, NULL);
-+  }
- 
-   return vol;
+-
+-  return vol;
++  return bvw->priv->volume;
  }
-@@ -4947,6 +4962,21 @@
+ 
+ void
+@@ -4935,6 +4957,27 @@
    g_mutex_unlock (bvw->priv->lock);
  }
  
 +static gboolean
 +notify_volume_idle_cb (BaconVideoWidget *bvw)
 +{
++  gdouble vol;
++
++  g_object_get (G_OBJECT (bvw->priv->pulse_audio_sink), "volume", &vol, NULL);
++  bvw->priv->volume = vol;
++
 +  g_object_notify (G_OBJECT (bvw), "volume");
++
 +  return FALSE;
 +}
 +
@@ -78,13 +104,13 @@
 +		  GParamSpec          *pspec,
 +		  BaconVideoWidget    *bvw)
 +{
-+  g_idle_add (notify_volume_idle_cb, bvw);
++  g_idle_add ((GSourceFunc) notify_volume_idle_cb, bvw);
 +}
 +
  GtkWidget *
  bacon_video_widget_new (int width, int height,
                          BvwUseType type, GError ** err)
-@@ -5014,15 +5044,18 @@
+@@ -5000,15 +5043,18 @@
        cb_gconf, bvw, NULL, NULL);
  
    if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
@@ -111,7 +137,7 @@
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5171,9 +5204,19 @@
+@@ -5155,9 +5201,19 @@
        /* make fakesink sync to the clock like a real sink */
        g_object_set (audio_sink, "sync", TRUE, NULL);
        GST_DEBUG ("audio sink doesn't work, using fakesink instead");


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- totem.spec	1 Apr 2009 22:18:30 -0000	1.233
+++ totem.spec	2 Apr 2009 16:53:57 -0000	1.234
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -478,6 +478,11 @@
 %endif
 
 %changelog
+* Thu Apr 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-2
+- Update patch to set the PA stream volume, avoids setting the 
+  volume when pulsesink isn't in a state where it has a stream
+  (#488532)
+
 * Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 



From rdieter at fedoraproject.org  Thu Apr  2 16:56:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 16:56:21 +0000 (UTC)
Subject: rpms/ggz-base-libs/devel ggz-base-libs.spec,1.2,1.3
Message-ID: <20090402165621.231C370120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ggz-base-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28141

Modified Files:
	ggz-base-libs.spec 
Log Message:
* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-4
- own %{_sysconfdir}/ggz.modules.d
- kill rpaths (again)



Index: ggz-base-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-base-libs/devel/ggz-base-libs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ggz-base-libs.spec	23 Mar 2009 13:31:32 -0000	1.2
+++ ggz-base-libs.spec	2 Apr 2009 16:55:50 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Base libraries for GGZ gaming zone
 Name:    ggz-base-libs
 Version: 0.99.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+ and GPLv2+
 Group:   System Environment/Libraries
@@ -63,7 +63,7 @@
 %else
 # avoid lib64 rpaths, quick-n-dirty
 %if "%{_libdir}" != "/usr/lib"
-#sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 %endif
 
@@ -85,8 +85,9 @@
 
 make install DESTDIR=%{buildroot}
 
-# GGZCONFDIR/ggz.modules
+# GGZCONFDIR stuff
 install -D -m644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ggz.modules
+mkdir -p %{buildroot}%{_sysconfdir}/ggz.modules.d
 # GGZDATADIR
 mkdir -p %{buildroot}%{_datadir}/ggz
 # GGZGAMEDIR
@@ -115,6 +116,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %config(noreplace) %{_sysconfdir}/ggz.modules
+%dir %{_sysconfdir}/ggz.modules.d
 # GPLv2+
 %{_bindir}/ggz-config
 %dir %{_datadir}/ggz
@@ -151,6 +153,10 @@
 
 
 %changelog
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-4
+- own %%{_sysconfdir}/ggz.modules.d
+- kill rpaths (again)
+
 * Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-3
 - conflict with ggz-client-libs, include epoch in Obsoletes/Provides: 
   libggz ggz-client-libs (#491638)



From rdieter at fedoraproject.org  Thu Apr  2 16:59:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 16:59:02 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.122,1.123
Message-ID: <20090402165902.ABE6470120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28932

Modified Files:
	kdegames.spec 
Log Message:
* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- fix ggz scriptlet logic



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdegames.spec	1 Apr 2009 18:51:36 -0000	1.122
+++ kdegames.spec	2 Apr 2009 16:58:32 -0000	1.123
@@ -1,10 +1,9 @@
-%{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,8 +26,12 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if "%{?_ggz_version}" < "0.99.5"
+%define _skip_ggzconfig -DSKIP_GGZCONFIG=1
 Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
+%endif
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -91,7 +94,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} %{?_skip_ggzconfig} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -102,19 +105,19 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# HACK, FIXME
+%if 0%{?_skip_ggzconfig:1}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
-
-# unpackaged files
-rm -f %{buildroot}%{_sysconfdir}/ggz.modules
+%endif
 
 
 %post
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
+%endif
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -136,12 +139,14 @@
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
+%endif
 
 %post libs -p /sbin/ldconfig
 
@@ -167,10 +172,13 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
-%{_sysconfdir}/ggz.modules.d/kdegames
+%else
+%{_ggz_configdir}/ggz.modules.d/kdegames
+%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -185,6 +193,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- fix ggz scriptlet logic
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 



From rdieter at fedoraproject.org  Thu Apr  2 17:01:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 17:01:16 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames.spec,1.100,1.101
Message-ID: <20090402170116.D19E070120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29526

Modified Files:
	kdegames.spec 
Log Message:
* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- fix ggz scriptlet logic



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdegames.spec	2 Apr 2009 15:01:24 -0000	1.100
+++ kdegames.spec	2 Apr 2009 17:00:46 -0000	1.101
@@ -1,10 +1,9 @@
-%{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,8 +26,12 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if "%{?_ggz_version}" < "0.99.5"
+%define _skip_ggzconfig -DSKIP_GGZCONFIG=1
 Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
+%endif
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -91,7 +94,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} %{?_skip_ggzconfig} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -102,19 +105,19 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# HACK, FIXME
+%if 0%{?_skip_ggzconfig:1}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
-
-# unpackaged files
-rm -f %{buildroot}%{_sysconfdir}/ggz.modules
+%endif
 
 
 %post
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
+%endif
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -136,12 +139,14 @@
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
+%endif
 
 %post libs -p /sbin/ldconfig
 
@@ -167,10 +172,13 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
-%{_sysconfdir}/ggz.modules.d/kdegames
+%else
+%{_ggz_configdir}/ggz.modules.d/kdegames
+%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -185,6 +193,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- fix ggz scriptlet logic
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 



From rdieter at fedoraproject.org  Thu Apr  2 17:04:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 17:04:33 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames.spec,1.110,1.111
Message-ID: <20090402170433.937C770120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30456

Modified Files:
	kdegames.spec 
Log Message:
* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- fix ggz scriptlet logic



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdegames.spec	2 Apr 2009 15:01:25 -0000	1.110
+++ kdegames.spec	2 Apr 2009 17:04:03 -0000	1.111
@@ -1,10 +1,9 @@
-%{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,8 +26,12 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if "%{?_ggz_version}" < "0.99.5"
+%define _skip_ggzconfig -DSKIP_GGZCONFIG=1
 Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
+%endif
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -91,7 +94,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} %{?_skip_ggzconfig} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -102,19 +105,19 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# HACK, FIXME
+%if 0%{?_skip_ggzconfig:1}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
-
-# unpackaged files
-rm -f %{buildroot}%{_sysconfdir}/ggz.modules
+%endif
 
 
 %post
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
+%endif
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -136,12 +139,14 @@
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
+%endif
 
 %post libs -p /sbin/ldconfig
 
@@ -167,10 +172,13 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
-%{_sysconfdir}/ggz.modules.d/kdegames
+%else
+%{_ggz_configdir}/ggz.modules.d/kdegames
+%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -185,6 +193,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- fix ggz scriptlet logic
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 



From hadess at fedoraproject.org  Thu Apr  2 17:08:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  2 Apr 2009 17:08:32 +0000 (UTC)
Subject: rpms/totem/devel totem-use-pulsesink-volume.patch,1.4,1.5
Message-ID: <20090402170832.8B8617013C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529

Modified Files:
	totem-use-pulsesink-volume.patch 
Log Message:
Fix patcheroo


totem-use-pulsesink-volume.patch:

Index: totem-use-pulsesink-volume.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem-use-pulsesink-volume.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- totem-use-pulsesink-volume.patch	2 Apr 2009 16:53:57 -0000	1.4
+++ totem-use-pulsesink-volume.patch	2 Apr 2009 17:08:02 -0000	1.5
@@ -43,7 +43,7 @@
  }
  
  void
-@@ -3145,8 +3152,25 @@
+@@ -3145,8 +3152,24 @@
    if (bacon_video_widget_can_set_volume (bvw) != FALSE)
    {
      volume = CLAMP (volume, 0.0, 1.0);
@@ -58,7 +58,6 @@
 +	gdouble new_vol;
 +	g_object_set (bvw->priv->pulse_audio_sink, "volume",
 +		      (gdouble) volume, NULL);
-+	got_set = TRUE;
 +
 +        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
 +      }
@@ -71,7 +70,12 @@
      g_object_notify (G_OBJECT (bvw), "volume");
    }
  }
-@@ -3159,9 +3183,7 @@
+@@ -3154,14 +3177,10 @@
+ double
+ bacon_video_widget_get_volume (BaconVideoWidget * bvw)
+ {
+-  double vol;
+-
    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
    g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
  
@@ -82,7 +86,7 @@
  }
  
  void
-@@ -4935,6 +4957,27 @@
+@@ -4935,6 +4954,27 @@
    g_mutex_unlock (bvw->priv->lock);
  }
  
@@ -110,7 +114,7 @@
  GtkWidget *
  bacon_video_widget_new (int width, int height,
                          BvwUseType type, GError ** err)
-@@ -5000,15 +5043,18 @@
+@@ -5000,15 +5040,18 @@
        cb_gconf, bvw, NULL, NULL);
  
    if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
@@ -137,7 +141,7 @@
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5155,9 +5201,19 @@
+@@ -5155,9 +5198,19 @@
        /* make fakesink sync to the clock like a real sink */
        g_object_set (audio_sink, "sync", TRUE, NULL);
        GST_DEBUG ("audio sink doesn't work, using fakesink instead");



From transif at fedoraproject.org  Thu Apr  2 17:12:42 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu,  2 Apr 2009 17:12:42 +0000 (UTC)
Subject: comps/po te.po,1.17,1.18
Message-ID: <20090402171242.1BF6C70120@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv808/po

Modified Files:
	te.po 
Log Message:
Sending translation for Telugu


Index: te.po
===================================================================
RCS file: /cvs/pkgs/comps/po/te.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- te.po	9 Jan 2009 11:52:43 -0000	1.17
+++ te.po	2 Apr 2009 17:12:11 -0000	1.18
@@ -1,4 +1,4 @@
-# translation of te.po to Telugu
+# translation of comps.HEAD.te.po to Telugu
 # translation of te.po to
 # translation of te.po to
 # translation of te.po to
@@ -9,20 +9,20 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
 #
 # Sree Ganesh <sthottem at redhat.com>, 2006, 2007.
-# Krishna Babu K <kkrothap at redhat.com>, 2008.
+# Krishna Babu K <kkrothap at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: te\n"
+"Project-Id-Version: comps.HEAD.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-09-29 12:11+0530\n"
+"POT-Creation-Date: 2009-04-02 13:57+0000\n"
+"PO-Revision-Date: 2009-04-02 22:40+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\n"
@@ -33,192 +33,192 @@
 msgstr "?????????????????? ???????????????????????? ?????????????????????????????? ???????????????????????? ????????? ?????????????????? ??????????????????????????? ???????????????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "??????????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "???????????????????????? ??????????????? ??????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ????????????????????? ??????????????? ??????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????????????????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "??????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "??????????????????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "???????????????-????????? ???????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "????????? ??????????????????"
 
@@ -227,78 +227,78 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "?????????????????????????????????????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "??????????????????????????????????????? ?????????????????????????????????????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "??????????????????????????? ??????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "???????????????????????? (UK) ??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ??????????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora ??????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -308,19 +308,19 @@
 "????????????????????????????????? ??????????????? ??????????????? ??????????????? ??????????????? ?????????????????? ???????????????????????????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -329,86 +329,86 @@
 "??????????????? ??????????????????????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "???????????? ??????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "??????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -416,77 +416,74 @@
 msgstr "GTK+ ??????????????? GNOME ??????????????? ?????????????????????????????? ????????????????????? ??? package?????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ??????????????? XFCE ??????????????? ?????????????????????????????? ????????????????????? ??? ??????????????????????????? ????????????????????????????????? ."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ??????????????? KDE ??????????????? ?????????????????????????????? ????????????????????????????????? ??? package?????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "????????????????????? ?????????????????? ???????????? ?????????????????? ???????????????????????? ?????????????????????????????? ??? ??????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"??? package ??????????????????????????? ???????????????????????????????????????????????? ????????? graphical (X) ??????????????????????????????????????? interface?????? ?????????????????????????????????."
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "??? package ??????????????????????????? ???????????????????????????????????????????????? ????????? graphical (X) ??????????????????????????????????????? interface?????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop ???????????????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE Software ??????????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -495,121 +492,121 @@
 "user interface."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "Lao ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "??????????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "??????????????? ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "??????????????? ???????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "??????????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "???????????????????????????/????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -617,111 +614,110 @@
 msgstr "?????????????????????????????? ????????????????????????????????? ??????????????? ?????????????????????????????? ???????????????????????????????????? ?????????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "?????????????????????????????? SQL ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "??????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "??????????????? ?????????????????????????????? ?????????????????????????????? ???????????? ???????????? ?????????????????? ??????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "???????????????????????? ??????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "?????????????????????????????? ???????????????????????? ???????????????????????? ???????????????????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -730,77 +726,77 @@
 "Emacs ??????????????? Vi?????? ???????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "??????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "??????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????? ??????????????? ????????????????????? ????????????????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ?????????????????????(programing) ??????????????? ??????????????? ????????????????????????????????? ?????????????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????????????????-?????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "???????????? ??????????????????"
 
@@ -809,68 +805,64 @@
 msgstr "Eclipse ??????????????? ??????????????????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??? ????????????????????????????????? ???????????????????????? suites, PDF ???????????????????????? ??????????????? ??????????????? ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ????????????????????? ???????????? packages ?????????????????????????????? ????????????????????????????????? ????????????????????? ???????????? libraries."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "IMAP ????????? SMTP mail ?????????????????? ?????????????????????????????? ??? ????????????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr " X Window ?????????????????????????????? ?????????????????????????????? ??????????????????????????? ??? package?????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????? ???????????????????????????????????? ???????????? ???????????? ?????????????????? ??????????????????????????? ??????????????????????????? ??? ???????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? package?????? network ?????????????????? ???????????????????????? - DHCP, Kerberos ??????????????? NIS??????. ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr "??? package?????? ????????? network ???????????????????????? (rsh ??????????????? telnet) ???????????? ??????????????????????????? ??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "??? ???????????????????????? ???????????????????????? ???????????????????????????????????? ???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? package?????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "???????????????????????? ??????????????? ???????????????????????? ??????????????????????????? ??????????????????????????? ???????????? ????????????????????????????????? ??? ???????????????????????? ??????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -879,19 +871,19 @@
 "Postscript, ??????????????? ????????? ?????????????????? ?????????????????? ????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ???????????????????????? ????????????????????????????????? Web ???????????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ???????????????????????? ????????????????????????????????? FTP ???????????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -901,18 +893,18 @@
 "???????????? ?????????????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????? ???????????????????????? ?????? ????????????????????????????????? ???????????????????????????????????????????????? ??? ??????????????? ??????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ??????????????? Red Hat ??????????????? ??????????????? ????????????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -921,13 +913,13 @@
 "??????????????????????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ??????????????? ??????????????? ???-?????????, Web, ??????????????? ????????????????????? ???????????????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -937,13 +929,13 @@
 "??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????????????????????????????? ????????????????????? ??????????????? ?????????????????????????????????????????? ???????????? ????????????????????? ??????????????????????????? ??? ??????????????? ??????????????????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -953,7 +945,7 @@
 "Window ???????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -963,21 +955,19 @@
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ??????????????? ?????????????????? ?????????????????????????????? ????????????????????????????????? ????????????????????? ??????????????????????????? ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -987,343 +977,372 @@
 "???????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
-msgstr ""
-"DNS ?????????????????? ???????????????????????? (BIND) ?????? ????????????????????????????????? ?????????????????????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
+msgstr "DNS ?????????????????? ???????????????????????? (BIND) ?????? ????????????????????????????????? ?????????????????????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
-msgstr ""
-"Linux and MS Windows (tm) ????????????????????????????????? ??????????????? ??????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
+msgstr "Linux and MS Windows (tm) ????????????????????????????????? ??????????????? ??????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "MySQL?????? ?????????????????????????????????????????? ???????????????????????? package????????? ??? package ??????????????? ??????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "Postgresql?????? ??????????????????????????? ?????????????????????????????? ??????????????????????????? ??? ??????????????? ??????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ?????????????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????? ??????????????? ???????????? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "????????????????????????????????? ??????????????? ?????? ???????????? ???????????????????????? ??????????????????????????? ????????????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "???????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "????????????????????? ?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "Xhosa ??????????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "????????????????????????????????????????????? ????????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "?????????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????????????????? ?????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????????????????? ????????????????????????."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????? ????????????????????? ??????????????? ??????????????????????????? ??????????????????????????????."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "??????????????? ????????????????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "?????????????????? ???????????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "??????????????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? ???????????????????????????????????? ??????????????? ???????????? ???????????????????????? ????????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "??????????????????????????? ????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ?????????????????????????????? ???????????????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ?????????????????? OLPC XO ??????????????? ?????????????????????????????????????????? ?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "??????????????????????????????????????????????????? ????????????????????? ????????????????????????????????????????????? ?????? ?????????????????????????????? ????????????????????????."
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "??????????????????????????? ???????????????????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "???????????????????????? ????????????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ????????????????????? ???????????????????????? ?????????????????? ????????????????????????."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (?????????????????????) ??????????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "??????????????????????????? ??????????????????????????????????????? ??????????????? ??????????????????????????????????????? ???????????????????????????????????????????????? ??????????????????."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "?????????????????????????????? ??????????????????????????? ??????????????? ?????????????????? ??????????????? ????????????????????????????????? ????????????????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "???????????????????????????????????? ???????????????????????????"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "??????????????? ????????????????????? ??????????????? ???????????????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "?????????????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????? ??????????????????"
+msgstr "???????????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ??????????????????-?????????????????????"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "??????????????? ?????????????????????????????? ???????????????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr ""
+"32 bit Windows ???????????????????????? ??????????????? ??????????????????-??????????????????????????? ??????????????????????????????????????? ??????????????????????????????, ?????????????????? ?????????????????????????????????, "
+"??????????????? ???????????????????????????????????? ??????????????????????????????, ??????????????? Fedora ????????????."
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "?????????????????????????????? CAML ??????????????????????????????????????? ??????????????? ??????????????? ?????????????????????????????? ?????????????????????????????? ??????????????????????????? ????????????????????????????????? ?????????????????????????????????."
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????????????????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
+msgstr ""
+"??? ??????????????? ???????????????????????? ?????????????????? ?????????????????????, ???????????????????????????????????????, ??????????????????????????????, "
+"???????????????????????????????????? ????????????????????? ????????????????????????????????? ????????????????????? ?????????????????????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1375,18 +1394,15 @@
 msgstr "??? ??????????????? ????????????????????? ??????????????????????????? ??????????????? ?????????????????????????????? ?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1394,6 +1410,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
+



From josef at fedoraproject.org  Thu Apr  2 17:21:58 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Thu,  2 Apr 2009 17:21:58 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-btrfs-fix-umount-hang.patch, NONE,
	1.1 kernel.spec, 1.1501, 1.1502
Message-ID: <20090402172158.854A670120@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2769

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-btrfs-fix-umount-hang.patch 
Log Message:
add linux-2.6-btrfs-fix-umount-hang.patch to fix a possible hang on umount.


linux-2.6-btrfs-fix-umount-hang.patch:

--- NEW FILE linux-2.6-btrfs-fix-umount-hang.patch ---
Need to check kthread_should_stop after schedule_timeout() before calling schedule(). This causes threads to sleep with potentially no one to wake them up causing mount(2) to hang in btrfs_stop_workers waiting for threads to stop. Race, IMO, is more evident on UP than on SMP.

Signed-off-by: Amit Gud <gud at ksu.edu>

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index c84ca1f..4c1f3e5 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -195,6 +195,9 @@ again_locked:
 				if (!list_empty(&worker->pending))
 					continue;
 
+				if (kthread_should_stop())
+					return 0;
+
 				/* still no more work?, sleep for real */
 				spin_lock_irq(&worker->lock);
 				set_current_state(TASK_INTERRUPTIBLE);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1501
retrieving revision 1.1502
diff -u -r1.1501 -r1.1502
--- kernel.spec	1 Apr 2009 18:29:49 -0000	1.1501
+++ kernel.spec	2 Apr 2009 17:21:28 -0000	1.1502
@@ -689,6 +689,7 @@
 # fs fixes
 Patch2920: linux-2.6-ext4-flush-on-close.patch
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
+Patch3001: linux-2.6-btrfs-fix-umount-hang.patch
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 
@@ -1139,6 +1140,7 @@
 
 # btrfs
 ApplyPatch linux-2.6-btrfs-experimental-branch.patch
+ApplyPatch linux-2.6-btrfs-fix-umount-hang.patch
 
 # relatime
 ApplyPatch linux-2.6-relatime-by-default.patch
@@ -1876,6 +1878,9 @@
 # and build.
 
 %changelog
+* Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>
+- linux-2.6-btrfs-fix-umount-hang.patch: fix hang on umount
+
 * Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-shut-up-efifb.patch: avoid efifb errors on unsupported hardware
 



From jortel at fedoraproject.org  Thu Apr  2 17:22:30 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 17:22:30 +0000 (UTC)
Subject: rpms/python-suds/devel .cvsignore, 1.5, 1.6 python-suds.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <20090402172230.A144A70120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2995

Modified Files:
	.cvsignore python-suds.spec sources 
Log Message:
release version 0.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Feb 2009 19:55:22 -0000	1.5
+++ .cvsignore	2 Apr 2009 17:22:00 -0000	1.6
@@ -2,3 +2,4 @@
 python-suds-0.3.2.tar.gz
 python-suds-0.3.3.tar.gz
 python-suds-0.3.4.tar.gz
+python-suds-0.3.5.tar.gz


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/python-suds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-suds.spec	25 Feb 2009 19:55:22 -0000	1.6
+++ python-suds.spec	2 Apr 2009 17:22:00 -0000	1.7
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?version: %define version %(%{__python} -c "from suds import properties; print properties['version']")}
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.4
+Version: %{version}
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -10,11 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: python >= 2.3
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
 BuildRequires: python-setuptools
-%endif
 Url: https://fedorahosted.org/suds
 
 %description
@@ -40,21 +37,31 @@
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?fedora} >= 8
 %{python_sitelib}/suds*.egg-info
-%endif
 %dir %{python_sitelib}/suds
 %dir %{python_sitelib}/suds/bindings
 %dir %{python_sitelib}/suds/sax
 %dir %{python_sitelib}/suds/xsd
+%dir %{python_sitelib}/suds/transport
 %{python_sitelib}/suds/*.py*
 %{python_sitelib}/suds/bindings/*.py*
 %{python_sitelib}/suds/sax/*.py*
 %{python_sitelib}/suds/xsd/*.py*
+%{python_sitelib}/suds/transport/*.py*
 
 %doc README LICENSE
 
 %changelog
+* Wed Feb 25 2009 jortel <jortel at redhat.com> - 0.3.5-1
+- Adds http caching.  Default is (1) day.
+- Replaced build requires python-setuptools-devel with python-setuptools in the spec.
+- Removed checking fc version in spec since no longer building < fc9.
+- Updated spec to get version from suds properties.
+- Updated makefile to roll tarball with tar.sh.
+- Moved bare/wrapped determination to wsdl for document/literal.
+- Refactored Transport to provide better visibility into http headers.
+- Fixed Tickets: #207, #207, #209, #210, #212, #214, #215
+
 * Mon Dec 08 2008 jortel <jortel at redhat.com> - 0.3.4-1
 - Static (automatic) Import.bind('http://schemas.xmlsoap.org/soap/encoding/')
 - Basic ws-security with {{{UsernameToken}}} and clear-text password only.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Feb 2009 19:55:22 -0000	1.5
+++ sources	2 Apr 2009 17:22:00 -0000	1.6
@@ -2,3 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
+94fd13d373c495d32ae25f6f0ae5265c  python-suds-0.3.5.tar.gz



From spot at fedoraproject.org  Thu Apr  2 17:26:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  2 Apr 2009 17:26:20 +0000 (UTC)
Subject: rpms/rpm/F-10 rpm-4.6.0-niagara.patch, NONE, 1.1 rpm.spec, 1.311,
	1.312
Message-ID: <20090402172620.C6CDA70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4072

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.0-niagara.patch 
Log Message:
Fix sparcv9v and sparc64v targets

rpm-4.6.0-niagara.patch:

--- NEW FILE rpm-4.6.0-niagara.patch ---
diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
--- rpm-4.6.0-orig/lib/rpmrc.c	2009-03-09 21:54:49.000000000 -0500
+++ rpm-4.6.0/lib/rpmrc.c	2009-03-11 12:00:44.000000000 -0500
@@ -763,6 +763,31 @@
     return rc;
 }
 
+#if defined(__linux__) && defined(__sparc__)
+static int is_sun4v()
+{
+	char buffer[4096], *p;
+	int fd = open("/proc/cpuinfo", O_RDONLY);
+	if (read(fd, &buffer, sizeof(buffer) - 1) == -1) {
+		rpmlog(RPMLOG_WARNING, _("read(/proc/cpuinfo) failed\n"));
+		close(fd);
+		return 0;
+	}
+	close(fd);
+
+	p = strstr(buffer, "type");
+	p = strtok(p, "\n");
+	p = strstr(p, "sun");
+	if (p == NULL) {
+		rpmlog(RPMLOG_WARNING, _("/proc/cpuinfo has no 'type' line\n"));
+		return 0;
+	} else if (strcmp(p, "sun4v") == 0) {
+		return 1;
+	}
+	return 0;
+}
+#endif
+
 
 #	if defined(__linux__) && defined(__i386__)
 #include <setjmp.h>
@@ -1179,6 +1204,13 @@
 		personality(oldpers);
 	    }
 	}
+	if (is_sun4v()){
+	    if (strcmp(un.machine, "sparcv9") == 0 || strcmp(un.machine, "sparc") == 0 ) {
+	        strcpy(un.machine, "sparcv9v");
+	    } else if (strcmp(un.machine, "sparc64") == 0 ) {
+	        strcpy(un.machine, "sparc64v");
+	    }
+	}
 #	endif	/* sparc*-linux */
 
 #	if defined(__GNUC__) && defined(__alpha__)
diff -rNu rpm-4.6.0-orig/rpmrc.in rpm-4.6.0/rpmrc.in
--- rpm-4.6.0-orig/rpmrc.in	2009-03-09 21:54:49.000000000 -0500
+++ rpm-4.6.0/rpmrc.in	2009-03-11 11:50:49.000000000 -0500
@@ -312,7 +312,7 @@
 arch_compat: sun4d: sparc
 arch_compat: sun4m: sparc
 arch_compat: sun4u: sparc64
-arch_compat: sparc64v: sparc64
+arch_compat: sparc64v: sparc64 sparcv9v
 arch_compat: sparc64: sparcv9
 arch_compat: sparcv9v: sparcv9
 arch_compat: sparcv9: sparcv8


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-10/rpm.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- rpm.spec	12 Mar 2009 06:00:21 -0000	1.311
+++ rpm.spec	2 Apr 2009 17:25:50 -0000	1.312
@@ -17,7 +17,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -32,6 +32,9 @@
 # this as Fedora-specific patch for now
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
+# Fix sparcv9v and sparc64v targets
+Patch4: rpm-4.6.0-niagara.patch
+
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
@@ -374,6 +377,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.6.0-3
+- Fix sparcv9v and sparc64v targets
+
 * Thu Mar 12 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-2
 - handle NULL as EVR to rpmdsSingle() (#487881, #485616)
 - permit UTF-8 as first char of dependency names (#455119)



From jortel at fedoraproject.org  Thu Apr  2 17:30:06 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 17:30:06 +0000 (UTC)
Subject: rpms/python-suds/devel python-suds.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <20090402173006.190A070120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5115

Modified Files:
	python-suds.spec sources 
Log Message:
redefine version to sudsversion so not to conflict with builtin {version}.


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/python-suds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-suds.spec	2 Apr 2009 17:22:00 -0000	1.7
+++ python-suds.spec	2 Apr 2009 17:29:35 -0000	1.8
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?version: %define version %(%{__python} -c "from suds import properties; print properties['version']")}
+%{!?version: %define sudsversion %(%{__python} -c "from suds import properties; print properties['version']")}
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: %{version}
+Version: %{sudsversion}
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Apr 2009 17:22:00 -0000	1.6
+++ sources	2 Apr 2009 17:29:35 -0000	1.7
@@ -2,4 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
-94fd13d373c495d32ae25f6f0ae5265c  python-suds-0.3.5.tar.gz
+8b3ee94361960a21a3a29e6fd6f0c95f  python-suds-0.3.5.tar.gz



From josef at fedoraproject.org  Thu Apr  2 17:37:13 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Thu,  2 Apr 2009 17:37:13 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-btrfs-fix-umount-hang.patch, NONE,
	1.1 kernel.spec, 1.1498, 1.1499
Message-ID: <20090402173713.4F27870120@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6846

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-btrfs-fix-umount-hang.patch 
Log Message:
adding linux-2.6-btrfs-fix-umount-hang.patch to fix a umount hang on btrfs


linux-2.6-btrfs-fix-umount-hang.patch:

--- NEW FILE linux-2.6-btrfs-fix-umount-hang.patch ---
Need to check kthread_should_stop after schedule_timeout() before calling schedule(). This causes threads to sleep with potentially no one to wake them up causing mount(2) to hang in btrfs_stop_workers waiting for threads to stop. Race, IMO, is more evident on UP than on SMP.

Signed-off-by: Amit Gud <gud at ksu.edu>

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index c84ca1f..4c1f3e5 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -195,6 +195,9 @@ again_locked:
 				if (!list_empty(&worker->pending))
 					continue;
 
+				if (kthread_should_stop())
+					return 0;
+
 				/* still no more work?, sleep for real */
 				spin_lock_irq(&worker->lock);
 				set_current_state(TASK_INTERRUPTIBLE);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -r1.1498 -r1.1499
--- kernel.spec	2 Apr 2009 13:04:01 -0000	1.1498
+++ kernel.spec	2 Apr 2009 17:36:42 -0000	1.1499
@@ -690,6 +690,7 @@
 # fs fixes
 Patch2920: linux-2.6-ext4-flush-on-close.patch
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
+Patch3001: linux-2.6-btrfs-fix-umount-hang.patch
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 
@@ -1146,6 +1147,7 @@
 
 # btrfs
 #ApplyPatch linux-2.6-btrfs-experimental-branch.patch
+ApplyPatch linux-2.6-btrfs-fix-umount-hang.patch
 
 # relatime
 #ApplyPatch linux-2.6-relatime-by-default.patch
@@ -1890,6 +1892,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>
+- linux-2.6-btrfs-fix-umount-hang.patch: fix umount hang on btrfs
+
 * Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
 - fix-ppc-debug_kmap_atomic.patch: fix build failures on ppc.
 



From orion at fedoraproject.org  Thu Apr  2 17:39:35 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  2 Apr 2009 17:39:35 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.129,1.130
Message-ID: <20090402173935.9BD377013C@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7597

Modified Files:
	kexec-tools.spec 
Log Message:
* Thu Apr 02 2009 Orion Poplawski <orion at cora.nwra.com> - 2.0.0-9
- Add BR glibc-static



Index: kexec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kexec-tools.spec	25 Feb 2009 11:08:26 -0000	1.129
+++ kexec-tools.spec	2 Apr 2009 17:39:05 -0000	1.130
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -22,6 +22,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): coreutils chkconfig sed zlib 
 Requires: busybox >= 1.2.0
+BuildRequires: glibc-static
 BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel 
 BuildRequires: pkgconfig intltool gettext 
 %ifarch %{ix86} x86_64 ppc64 ia64 ppc
@@ -241,6 +242,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Orion Poplawski <orion at cora.nwra.com> - 2.0.0-9
+- Add BR glibc-static
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jortel at fedoraproject.org  Thu Apr  2 17:40:52 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 17:40:52 +0000 (UTC)
Subject: rpms/python-suds/devel python-suds.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20090402174052.5EE6470120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8636

Modified Files:
	python-suds.spec sources 
Log Message:
Change Version: back to static string.  Seems to be needed by koji


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/python-suds.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-suds.spec	2 Apr 2009 17:29:35 -0000	1.8
+++ python-suds.spec	2 Apr 2009 17:40:22 -0000	1.9
@@ -1,9 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?version: %define sudsversion %(%{__python} -c "from suds import properties; print properties['version']")}
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: %{sudsversion}
+Version: 0.3.5
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -56,7 +55,6 @@
 - Adds http caching.  Default is (1) day.
 - Replaced build requires python-setuptools-devel with python-setuptools in the spec.
 - Removed checking fc version in spec since no longer building < fc9.
-- Updated spec to get version from suds properties.
 - Updated makefile to roll tarball with tar.sh.
 - Moved bare/wrapped determination to wsdl for document/literal.
 - Refactored Transport to provide better visibility into http headers.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Apr 2009 17:29:35 -0000	1.7
+++ sources	2 Apr 2009 17:40:22 -0000	1.8
@@ -2,4 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
-8b3ee94361960a21a3a29e6fd6f0c95f  python-suds-0.3.5.tar.gz
+54564e2e1cf1103d3f231d15e19081a6  python-suds-0.3.5.tar.gz



From notting at fedoraproject.org  Thu Apr  2 17:41:23 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  2 Apr 2009 17:41:23 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.161, 1.162 initscripts.spec,
	1.190, 1.191 sources, 1.180, 1.181
Message-ID: <20090402174123.8877C70120@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.92-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- .cvsignore	16 Mar 2009 20:34:51 -0000	1.161
+++ .cvsignore	2 Apr 2009 17:40:53 -0000	1.162
@@ -1 +1 @@
-initscripts-8.91.tar.bz2
+initscripts-8.92.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- initscripts.spec	16 Mar 2009 20:54:58 -0000	1.190
+++ initscripts.spec	2 Apr 2009 17:40:53 -0000	1.191
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.91
+Version: 8.92
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -34,6 +34,7 @@
 Conflicts: tcsh < 6.13-5
 Conflicts: xorg-x11, glib2 < 2.11.1-2
 Conflicts: alsa-utils < 1.0.18
+Conflicts: plymouth < 0.7.0-0.2009.02.26
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
 Obsoletes: hotplug
@@ -248,6 +249,27 @@
 /etc/profile.d/debug*
 
 %changelog
+* Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.92-1
+- rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
+- netfs: drop smbfs support, we don't even ship the module or tools any more
+- setsysfont: honor LC_CTYPE (#487133, <skasal at redhat.com>)
+- prefdm: do fallbackes based on provides of 'service(graphical-login)' (#485751)
+- rc.sysinit: handle multiple IP addresses without choking in the stateless code (#443945)
+- rc.sysinit: catch the right error code from checking for passphrases (#483269, <vladis.kletnieks at vt.edu>)
+- prefdm: handle empty /etc/sysconfig/desktop correctly (#480113)
+- ifup-ipsec: allow use of either ESP only or AH only (#251494, <stijn.tintel at x-tend.be>)
+- ifup-eth: allow passing of arguments to dhcp6c (#437949, <pekkas at netcore.fi>)
+- ifup-eth: fix dhcpv6 when there is no IPv4 configuration (#486507)
+- ifup-ppp: avoid spurious SIGCHLD to pppd (#448881)
+- ifup-eth: add support for creating TUN/TAP devices on the fly (#453973, <scott at zahna.com>)
+- stop plymouth when starting single-user mode. (#491062)
+- add plymouth shutdown script (#473237, <jmccann at redhat.com>)
+- fix lang.sh/lang.sh/consoletype for execution with '-e'
+- ifdown-eth: remove arp_ip_target on ifdown for bonding devices. (#483711)
+- add vlan support for s390 HSI interfaces. (#490584)
+- ipcalc: support IPv6 (#464268, <dcantrell at redhat.com>)
+- translation updates: all
+
 * Mon Mar 16 2009 Bill Nottingham <notting at redhat.com> - 8.91-1
 - fix DHCP reading of options from ifcfg-XXX (#483257)
 - ifdown-eth: clean up bridges on ifdown (#463325, <sean at bruenor.org>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- sources	16 Mar 2009 20:56:34 -0000	1.180
+++ sources	2 Apr 2009 17:40:53 -0000	1.181
@@ -1 +1 @@
-f141c08179a36e3c6a47617f7b7c7a8f  initscripts-8.91.tar.bz2
+c83e133783603524a34deded6a2b5ecc  initscripts-8.92.tar.bz2



From spot at fedoraproject.org  Thu Apr  2 17:41:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  2 Apr 2009 17:41:45 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.6.0-niagara.patch, NONE, 1.1 rpm.spec, 1.341,
	1.342
Message-ID: <20090402174145.4F4F670120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8889/devel

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.0-niagara.patch 
Log Message:
niagara patch

rpm-4.6.0-niagara.patch:

--- NEW FILE rpm-4.6.0-niagara.patch ---
diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
--- rpm-4.6.0-orig/lib/rpmrc.c	2009-03-09 21:54:49.000000000 -0500
+++ rpm-4.6.0/lib/rpmrc.c	2009-03-11 12:00:44.000000000 -0500
@@ -763,6 +763,31 @@
     return rc;
 }
 
+#if defined(__linux__) && defined(__sparc__)
+static int is_sun4v()
+{
+	char buffer[4096], *p;
+	int fd = open("/proc/cpuinfo", O_RDONLY);
+	if (read(fd, &buffer, sizeof(buffer) - 1) == -1) {
+		rpmlog(RPMLOG_WARNING, _("read(/proc/cpuinfo) failed\n"));
+		close(fd);
+		return 0;
+	}
+	close(fd);
+
+	p = strstr(buffer, "type");
+	p = strtok(p, "\n");
+	p = strstr(p, "sun");
+	if (p == NULL) {
+		rpmlog(RPMLOG_WARNING, _("/proc/cpuinfo has no 'type' line\n"));
+		return 0;
+	} else if (strcmp(p, "sun4v") == 0) {
+		return 1;
+	}
+	return 0;
+}
+#endif
+
 
 #	if defined(__linux__) && defined(__i386__)
 #include <setjmp.h>
@@ -1179,6 +1204,13 @@
 		personality(oldpers);
 	    }
 	}
+	if (is_sun4v()){
+	    if (strcmp(un.machine, "sparcv9") == 0 || strcmp(un.machine, "sparc") == 0 ) {
+	        strcpy(un.machine, "sparcv9v");
+	    } else if (strcmp(un.machine, "sparc64") == 0 ) {
+	        strcpy(un.machine, "sparc64v");
+	    }
+	}
 #	endif	/* sparc*-linux */
 
 #	if defined(__GNUC__) && defined(__alpha__)
diff -rNu rpm-4.6.0-orig/rpmrc.in rpm-4.6.0/rpmrc.in
--- rpm-4.6.0-orig/rpmrc.in	2009-03-09 21:54:49.000000000 -0500
+++ rpm-4.6.0/rpmrc.in	2009-03-11 11:50:49.000000000 -0500
@@ -312,7 +312,7 @@
 arch_compat: sun4d: sparc
 arch_compat: sun4m: sparc
 arch_compat: sun4u: sparc64
-arch_compat: sparc64v: sparc64
+arch_compat: sparc64v: sparc64 sparcv9v
 arch_compat: sparc64: sparcv9
 arch_compat: sparcv9v: sparcv9
 arch_compat: sparcv9: sparcv8


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- rpm.spec	24 Mar 2009 07:26:38 -0000	1.341
+++ rpm.spec	2 Apr 2009 17:41:14 -0000	1.342
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.7%{?dist}
+Release: 0.%{snapver}.8%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -52,6 +52,7 @@
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
 Patch301: rpm-4.7.0-rpmfc-order.patch
+Patch302: rpm-4.6.0-niagara.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -197,6 +198,7 @@
 
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .rpmfc-order
+%patch302 -p1 -b .niagara
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -402,6 +404,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7.0-0.beta1.8
+- Fix sparcv9v and sparc64v targets
+
 * Tue Mar 24 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.7
 - prefer more specific types over generic "text" in classification (#491349)
 



From spot at fedoraproject.org  Thu Apr  2 17:41:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  2 Apr 2009 17:41:44 +0000 (UTC)
Subject: rpms/rpm/F-10 rpm.spec,1.312,1.313
Message-ID: <20090402174144.DB1FE70120@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8889/F-10

Modified Files:
	rpm.spec 
Log Message:
niagara patch


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-10/rpm.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- rpm.spec	2 Apr 2009 17:25:50 -0000	1.312
+++ rpm.spec	2 Apr 2009 17:41:14 -0000	1.313
@@ -17,7 +17,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -32,9 +32,6 @@
 # this as Fedora-specific patch for now
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
-# Fix sparcv9v and sparc64v targets
-Patch4: rpm-4.6.0-niagara.patch
-
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
@@ -45,6 +42,9 @@
 Patch203: rpm-4.6.0-alpha-isa.patch
 Patch204: rpm-4.6.0-rsa-v4.patch
 
+# Patches not yet upstream
+Patch300: rpm-4.6.0-niagara.patch
+
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
 License: GPLv2+
@@ -182,6 +182,8 @@
 %patch203 -p1 -b .alpha-isa
 %patch204 -p1 -b .rsa-v4
 
+%patch300 -p1 -b .niagara
+
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
 %endif
@@ -377,6 +379,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.6.0-4
+- actually apply niagara patch
+
 * Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.6.0-3
 - Fix sparcv9v and sparc64v targets
 



From maynardj at fedoraproject.org  Thu Apr  2 17:42:02 2009
From: maynardj at fedoraproject.org (Maynard Johnson)
Date: Thu,  2 Apr 2009 17:42:02 +0000 (UTC)
Subject: rpms/stapitrace/devel it-update.patch, 1.1, NONE itrace_fix1.patch, 
	1.1, NONE stapitrace-fix-bfd-configure.patch, 1.1,
	NONE stapitrace-utrace2.patch, 1.2, NONE stapitrace.spec, 1.23, NONE
Message-ID: <20090402174202.6F98670120@cvs1.fedora.phx.redhat.com>

Author: maynardj

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9309

Removed Files:
	it-update.patch itrace_fix1.patch 
	stapitrace-fix-bfd-configure.patch stapitrace-utrace2.patch 
	stapitrace.spec 
Log Message:
remove old files in preparation for package update


--- it-update.patch DELETED ---


--- itrace_fix1.patch DELETED ---


--- stapitrace-fix-bfd-configure.patch DELETED ---


--- stapitrace-utrace2.patch DELETED ---


--- stapitrace.spec DELETED ---



From notting at fedoraproject.org  Thu Apr  2 17:54:32 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  2 Apr 2009 17:54:32 +0000 (UTC)
Subject: rpms/initscripts/F-10 .cvsignore, 1.157, 1.158 initscripts.spec,
	1.184, 1.185 sources, 1.175, 1.176
Message-ID: <20090402175432.D794670120@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11982

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.86.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/.cvsignore,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- .cvsignore	11 Nov 2008 16:52:59 -0000	1.157
+++ .cvsignore	2 Apr 2009 17:54:02 -0000	1.158
@@ -1 +1 @@
-initscripts-8.86.tar.bz2
+initscripts-8.86.1.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/initscripts.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- initscripts.spec	11 Nov 2008 16:52:59 -0000	1.184
+++ initscripts.spec	2 Apr 2009 17:54:02 -0000	1.185
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.86
+Version: 8.86.1
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -142,7 +142,7 @@
 /etc/sysconfig/network-scripts/network-functions
 /etc/sysconfig/network-scripts/network-functions-ipv6
 /etc/sysconfig/network-scripts/init.ipv6-global
-/etc/sysconfig/network-scripts/ifcfg-lo
+%config(noreplace) /etc/sysconfig/network-scripts/ifcfg-lo
 /etc/sysconfig/network-scripts/ifup-ipx
 /etc/sysconfig/network-scripts/ifup-post
 /etc/sysconfig/network-scripts/ifdown-ppp
@@ -250,6 +250,27 @@
 /etc/profile.d/debug*
 
 %changelog
+* Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.86.1-1
+- rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
+- setsysfont: honor LC_CTYPE (#487133, <skasal at redhat.com>)
+- prefdm: do fallbacks based on provides of 'service(graphical-login)' (#485751)
+- rc.sysinit: catch the right error code from checking for passphrases (#483269, <vladis.kletnieks at vt.edu>)
+- prefdm: handle empty /etc/sysconfig/desktop correctly (#480113)
+- ifup-eth: fix dhcpv6 when there is no IPv4 configuration (#486507)
+- bring up ipsec interfaces last (#481733)
+- ifdown-eth: fix bridge + vlan (#481557, <danken at redhat.com>)
+- init.d/halt: determine reboot/halt via existing INIT_HALT environment variable. (#475227)
+- rc.sysinit: fix typo. (#487926)
+- fix switching from targeted to MLS policy (#479054, <dwalsh at redhat.com>)
+- network-functions-ipv6: set MTU correctly for 6to4. (#477976, <ackistler at yahoo.com>)
+- add more entries to rwtab (#476799, <harald at redhat.com>)
+- rc.sysinit: remove /.suspended as well on boot (#270861)
+- add %config back for ifcfg-lo (#472761)
+- remove support for no longer existing 'brctl setgcint' command. (#360471)
+- rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717)
+- sysconfig.txt: add some docs on BONDING_OPTS
+- lang.sh: ignore return code from consoletype (#471123)
+
 * Tue Nov 11 2008 Bill Nottingham <notting at redhat.com> - 8.86-1
 - stop plymouth before stopping the runlevel (#467207)
 - fix get_config_by_subchannel (#459044, <harald at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/sources,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- sources	11 Nov 2008 16:52:59 -0000	1.175
+++ sources	2 Apr 2009 17:54:02 -0000	1.176
@@ -1 +1 @@
-0d1fa303855d2bed43d0ccc9784fd35e  initscripts-8.86.tar.bz2
+768b1b306565be9a04bed1fdb6748752  initscripts-8.86.1.tar.bz2



From maynardj at fedoraproject.org  Thu Apr  2 17:56:56 2009
From: maynardj at fedoraproject.org (Maynard Johnson)
Date: Thu,  2 Apr 2009 17:56:56 +0000 (UTC)
Subject: rpms/stapitrace/devel itrace-f11-fixes-private.patch, NONE,
	1.1 stapitrace.spec, 1.24, 1.25 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090402175656.9C57B70120@cvs1.fedora.phx.redhat.com>

Author: maynardj

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12793

Modified Files:
	.cvsignore sources 
Added Files:
	itrace-f11-fixes-private.patch stapitrace.spec 
Log Message:
Updating stapitrace source to use SystemTap built-in insn probe

itrace-f11-fixes-private.patch:

--- NEW FILE itrace-f11-fixes-private.patch ---
diff -paur Dpiperf/src/driver/Makefile Dpiperf-fixes/src/driver/Makefile
--- Dpiperf/src/driver/Makefile	2009-01-19 11:57:20.000000000 -0500
+++ Dpiperf-fixes/src/driver/Makefile	2009-03-12 12:52:45.000000000 -0400
@@ -5,7 +5,7 @@
 # The first time invokes the kernel build system
 # The second time does the work.
 
-EXTRA_CFLAGS += -D_LINUX -fomit-frame-pointer
+EXTRA_CFLAGS += -D_LINUX
 
 ifneq (${KERNELRELEASE},)
 	EXTRA_CFLAGS += -DPI_TPROF
diff -paur Dpiperf/src/driver/pi_btrace.c Dpiperf-fixes/src/driver/pi_btrace.c
--- Dpiperf/src/driver/pi_btrace.c	2009-01-19 11:57:20.000000000 -0500
+++ Dpiperf-fixes/src/driver/pi_btrace.c	2009-03-12 12:53:15.000000000 -0400
@@ -325,7 +325,7 @@ int SoftTraceOn(void)
 	union perf_addr  addr;
 #endif
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,99)
         struct mm_struct * p_init_mm = (struct mm_struct *)pi_init_mm_address;
 #else
         struct mm_struct * p_init_mm = &init_mm;        


Index: stapitrace.spec
===================================================================
RCS file: stapitrace.spec
diff -N stapitrace.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ stapitrace.spec	2 Apr 2009 17:56:26 -0000	1.25
@@ -0,0 +1,94 @@
+#
+# spec file for package itrace 
+#
+
+%define alphatag 20090402cvs_alpha
+Name:		stapitrace
+Summary:	Instruction Tracing Tool
+Version:	2.0.1
+Release:	0.%{alphatag}%{?dist}
+License:	GPLv2+
+Group:		Development/Tools
+URL:		http://sourceforge.net/projects/perfinsp
+Source0:	%{name}-%{version}.%{alphatag}.tar.gz
+Patch0:         itrace-f11-fixes-private.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:	systemtap systemtap-runtime binutils binutils-devel
+BuildRequires:	binutils binutils-devel autoconf automake zlib-devel
+ExclusiveArch:	ppc ppc64
+
+%description
+ITrace is a software tracing mechanism that runs on Linux. ITrace traces
+through user application code using the SystemTap user instruction tracing
+support and can produce human-readable ASCII output or qtrace output suitable
+for analysis by packages, such as the IBM Performance Simulator for Linux
+on POWER (simppc).
+
+It is based on and shares code from PerformanceInspector's ITRACE tool.
+
+%define systap %{_datadir}/systemtap
+%define tap %{systap}/tapset
+%define tap64 %{tap}/ppc64
+%define post src/post
+%define a2n src/a2n
+%define stap src/stap
+
+%prep
+%setup -q -n Dpiperf
+%patch0 -p1
+
+%build
+autoreconf -i --force
+# override -m64
+export CFLAGS="%{__global_cflags} -mminimal-toc"	
+export CXXFLAGS="%{__global_cflags} -mminimal-toc"
+
+%configure --enable-build_stap=yes --enable-lib32on64 --disable-dependency-tracking
+%{__make} DESTDIR=""
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT/usr/lib
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_mandir}/man1
+%{__mkdir_p} $RPM_BUILD_ROOT/%{systap}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{systap}/runtime
+%{__mkdir_p} $RPM_BUILD_ROOT/%{tap}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{tap64}
+%{__install} -m 755 %{post}/post $RPM_BUILD_ROOT/%{_bindir}/post
+cd src/stap 
+%{__install} -m 644 itrace.1 $RPM_BUILD_ROOT/%{_mandir}/man1/itrace.1
+%{__install} -m 644 post.1 $RPM_BUILD_ROOT/%{_mandir}/man1/post.1
+%{__install} -m 755 itrace $RPM_BUILD_ROOT/%{_bindir}/itrace
+%{__install} -m 644 pi_itrace.stp $RPM_BUILD_ROOT/%{tap}/pi_itrace.stp
+%{__install} -m 644 ppc_pi_itrace.stp $RPM_BUILD_ROOT/%{tap64}/ppc_pi_itrace.stp
+
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%files 
+%defattr(-,root,root)
+%{tap}/pi_itrace.stp
+%{tap64}/ppc_pi_itrace.stp
+%{_mandir}/man1/itrace.1.gz
+%{_mandir}/man1/post.1.gz
+%{_bindir}/post
+%{_bindir}/itrace
+
+%changelog -n itrace
+* Wed Mar 11 2009 Maynard Johnson <maynardj at us.ibm.com>
+- Change to using Systemtap's built-in itrace probe point
+
+* Wed Oct 15 2008 Dave Nomura <dcnltc at us.ibm.com>
+- upgrade to utrace2
+
+* Fri Sep 12 2008 Josh Boyer <jwboyer at gmail.com>
+- Fix bfd configure test as binutils now requires zlib for compressed
+  sections
+
+* Tue May 27 2008 Dave Nomura <dcnltc at us.ibm.com>
+- removed liba2n.so dependency and changed to all apps to 32-bit
+
+* Mon Apr 07 2008 Dave Nomura <dcnltc at us.ibm.com>
+- new package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2008 21:41:47 -0000	1.2
+++ .cvsignore	2 Apr 2009 17:56:26 -0000	1.3
@@ -1 +1 @@
-stapitrace-1.0.0.20080622cvs_alpha.tar.gz
+stapitrace-2.0.1.20090402cvs_alpha.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jul 2008 16:08:36 -0000	1.3
+++ sources	2 Apr 2009 17:56:26 -0000	1.4
@@ -1 +1 @@
-a4923a1d512f79175548d9fd1d57c548  stapitrace-1.0.0.20080622cvs_alpha.tar.gz
+a5302e521d56b148b766acf48e5f6206  stapitrace-2.0.1.20090402cvs_alpha.tar.gz



From limb at fedoraproject.org  Thu Apr  2 18:03:50 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  2 Apr 2009 18:03:50 +0000 (UTC)
Subject: rpms/numpy/EL-5 numpy.spec,1.17,1.18
Message-ID: <20090402180350.EDED470120@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14352

Modified Files:
	numpy.spec 
Log Message:
Build against atlas instead of blas. BZ 461472.



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/EL-5/numpy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- numpy.spec	7 May 2008 15:28:55 -0000	1.17
+++ numpy.spec	2 Apr 2009 18:03:20 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel python-setuptools gcc-gfortran
-BuildRequires:  blas-devel lapack-devel
+BuildRequires:  atlas lapack-devel
 
 Provides:       f2py
 Obsoletes:      f2py <= 2.45.241_1927
@@ -73,6 +73,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> 1.0.4-2
+- Build against atlas instead of blas. BZ 461472.
+
 * Tue May 06 2008 Jarod Wilson <jwilson at redhat.com> 1.0.4-1
 - New upstream release
 



From sindrepb at fedoraproject.org  Thu Apr  2 18:05:38 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 18:05:38 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel
	awn-extras-applets-0.3.2.1-python-platform.patch, NONE,
	1.1 awn-extras-applets.spec, 1.18, 1.19
Message-ID: <20090402180538.DC8C270120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14803

Modified Files:
	awn-extras-applets.spec 
Added Files:
	awn-extras-applets-0.3.2.1-python-platform.patch 
Log Message:
fix 64bit build issue

awn-extras-applets-0.3.2.1-python-platform.patch:

--- NEW FILE awn-extras-applets-0.3.2.1-python-platform.patch ---
diff -up ./src/libawn-extras/bindings/python/Makefile.am.orig ./src/libawn-extras/bindings/python/Makefile.am
--- ./src/libawn-extras/bindings/python/Makefile.am.orig	2009-04-02 18:59:53.000000000 +0200
+++ ./src/libawn-extras/bindings/python/Makefile.am	2009-04-02 19:40:14.000000000 +0200
@@ -1,7 +1,7 @@
 NULL =
 
 # awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extras_PYTHON =	\
 	__init__.py	\
 	awnlib.py	\
@@ -19,7 +19,7 @@ INCLUDES = \
 	$(NULL)
 
 # libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extrasexec_LTLIBRARIES = _extras.la
 
 common_ldflags = -module -avoid-version
diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
--- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-02 18:59:58.000000000 +0200
+++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-02 19:42:03.000000000 +0200
@@ -246,6 +246,7 @@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDF
 PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
 PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SITE_PKG = @PYTHON_PLATFORM_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -331,7 +332,7 @@ top_srcdir = @top_srcdir@
 NULL = 
 
 # awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extras_PYTHON = \
 	__init__.py	\
 	awnlib.py	\
@@ -350,7 +351,7 @@ INCLUDES = \
 
 
 # libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extrasexec_LTLIBRARIES = _extras.la
 common_ldflags = -module -avoid-version
 AWN_EXTRAS_DEFS = awn_extras.defs


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- awn-extras-applets.spec	2 Apr 2009 15:31:00 -0000	1.18
+++ awn-extras-applets.spec	2 Apr 2009 18:05:08 -0000	1.19
@@ -2,13 +2,14 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            https://launchpad.net/awn-extras/
 Source0:        https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-python-platform.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  avant-window-navigator-devel >= 0.3.2
@@ -55,8 +56,6 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
-#Patch0: awn-extras-applets-0.2.6.configure.patch
-
 
 %description
 awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
@@ -73,7 +72,8 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
+
 #for f in `find -name '*.py'`; do
 #  head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f 
 #done
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-5
+- Add patch to fix build on x86_64
+
 * Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-4
 - New upstream release
 - Add devel package



From ltinkl at fedoraproject.org  Thu Apr  2 18:11:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  2 Apr 2009 18:11:58 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.77,1.78
Message-ID: <20090402181158.B1B5B70120@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16920

Modified Files:
	kde-l10n.spec 
Log Message:
fix unpackaged files



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kde-l10n.spec	2 Apr 2009 13:40:52 -0000	1.77
+++ kde-l10n.spec	2 Apr 2009 18:11:28 -0000	1.78
@@ -889,11 +889,9 @@
 %lang(bg) %{_datadir}/locale/bg/*
 %lang(bg) %{_kde4_appsdir}/kvtml/bg
 
-%if %{buildall}
 %files Bengali
 %defattr(-,root,root)
 %lang(bn_IN) %{_datadir}/locale/bn_IN/*
-%endif
 
 %if %{buildall}
 %files Tibetan
@@ -972,6 +970,9 @@
 %lang(en_GB) %{_kde4_appsdir}/klettres/en_GB
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
+%lang(en_GB) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.en_GB.xml
+%lang(en_GB) %{_kde4_appsdir}/kturtle/data/logokeywords.en_GB.xml
+%lang(en_GB) %{_kde4_appsdir}/kturtle/examples/en_GB/*.logo
 
 %if %{buildall}
 %files Esperanto
@@ -1080,11 +1081,9 @@
 %lang(id) %{_datadir}/locale/id/*
 %endif
 
-%if %{buildall}
 %files Icelandic
 %defattr(-,root,root)
 %lang(is) %{_datadir}/locale/is/*
-%endif
 
 %files Italian
 %defattr(-,root,root)
@@ -1189,6 +1188,9 @@
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
 %lang(nl) %{_kde4_docdir}/HTML/nl
+%lang(nl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nl.xml
+%lang(nl) %{_kde4_appsdir}/kturtle/data/logokeywords.nl.xml
+%lang(nl) %{_kde4_appsdir}/kturtle/examples/nl/*.logo
 %lang(nl) %{_mandir}/nl/*/*
 
 %if %{buildall}
@@ -1204,6 +1206,9 @@
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
+%lang(nb) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nb.xml
+%lang(nb) %{_kde4_appsdir}/kturtle/data/logokeywords.nb.xml
+%lang(nb) %{_kde4_appsdir}/kturtle/examples/nb/*.logo
 %lang(nb) %{_mandir}/nb/*/*
 
 %files Norwegian-Nynorsk
@@ -1247,22 +1252,26 @@
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
+%lang(pt_BR) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.pt_BR.xml
+%lang(pt_BR) %{_kde4_appsdir}/kturtle/data/logokeywords.pt_BR.xml
+%lang(pt_BR) %{_kde4_appsdir}/kturtle/examples/pt_BR/*.logo
 %lang(pt_BR) %{_mandir}/pt_BR/*/*
 
-%if %{buildall}
 %files Romanian
 %defattr(-,root,root)
 %lang(ro) %{_datadir}/locale/ro/*
 %lang(ro) %{_kde4_appsdir}/kvtml/ro
 %lang(ro) %{_kde4_appsdir}/ktuberling/sounds/ro*
-%lang(ru) %{_kde4_docdir}/HTML/ro
-%endif
+%lang(ro) %{_kde4_docdir}/HTML/ro
 
 %files Russian
 %defattr(-,root,root)
 %lang(ru) %{_datadir}/locale/ru/*
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
+%lang(ru) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.ru.xml
+%lang(ru) %{_kde4_appsdir}/kturtle/data/logokeywords.ru.xml
+%lang(ru) %{_kde4_appsdir}/kturtle/examples/ru/*.logo
 %lang(ru) %{_mandir}/ru/*/*
 
 %files Slovak
@@ -1277,6 +1286,9 @@
 %lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
 %lang(sl) %{_kde4_appsdir}/khangman/sl.txt
 %lang(sl) %{_kde4_appsdir}/kvtml/sl
+%lang(sl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sl.xml
+%lang(sl) %{_kde4_appsdir}/kturtle/data/logokeywords.sl.xml
+%lang(sl) %{_kde4_appsdir}/kturtle/examples/sl/*.logo
 %lang(sl) %{_kde4_docdir}/HTML/sl
 
 %files Serbian
@@ -1309,13 +1321,11 @@
 %lang(ta) %{_datadir}/locale/ta/*
 %endif
 
-%if %{buildall}
 %files Tajik
 %defattr(-,root,root)
 %lang(tg) %{_datadir}/locale/tg/*
 %lang(tg) %{_kde4_appsdir}/kvtml/tg
 %lang(tg) %{_kde4_appsdir}/khangman/tg.txt
-%endif
 
 %files Thai
 %defattr(-,root,root)



From sindrepb at fedoraproject.org  Thu Apr  2 18:13:04 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  2 Apr 2009 18:13:04 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel
	awn-extras-applets-0.3.2.1-python-platform.patch, 1.1,
	1.2 awn-extras-applets.spec, 1.19, 1.20
Message-ID: <20090402181304.DA20370120@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17463

Modified Files:
	awn-extras-applets-0.3.2.1-python-platform.patch 
	awn-extras-applets.spec 
Log Message:
fix 64bit build issue, for real

awn-extras-applets-0.3.2.1-python-platform.patch:

Index: awn-extras-applets-0.3.2.1-python-platform.patch
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets-0.3.2.1-python-platform.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- awn-extras-applets-0.3.2.1-python-platform.patch	2 Apr 2009 18:05:08 -0000	1.1
+++ awn-extras-applets-0.3.2.1-python-platform.patch	2 Apr 2009 18:13:04 -0000	1.2
@@ -21,12 +21,12 @@
  common_ldflags = -module -avoid-version
 diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
 --- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-02 18:59:58.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-02 19:42:03.000000000 +0200
++++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-02 20:12:22.000000000 +0200
 @@ -246,6 +246,7 @@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDF
  PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
  PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
  PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
-+PYTHON_SITE_PKG = @PYTHON_PLATFORM_PKG@
++PYTHON_PLATFORM_PKG = @PYTHON_PLATFORM_PKG@
  PYTHON_VERSION = @PYTHON_VERSION@
  RANLIB = @RANLIB@
  SED = @SED@


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- awn-extras-applets.spec	2 Apr 2009 18:05:08 -0000	1.19
+++ awn-extras-applets.spec	2 Apr 2009 18:13:04 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -178,7 +178,7 @@
 
 
 %changelog
-* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-5
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-6
 - Add patch to fix build on x86_64
 
 * Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-4



From linville at fedoraproject.org  Thu Apr  2 18:28:43 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  2 Apr 2009 18:28:43 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch,
	NONE,
	1.1 linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch, 
	NONE, 1.1 kernel.spec, 1.1502, 1.1503
Message-ID: <20090402182843.9689B70120@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20939

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch 
	linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch 
Log Message:
back-port iwlwifi rfkill while device down patches

linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch:

--- NEW FILE linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch ---
Back-port of commit pending for 2.6.30...

commit 9a454abf066ab588ef28ff9d2c04cc480d13c040
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Thu Jan 15 09:38:44 2009 +0100

    iwl3945: report killswitch changes even if the interface is down

    Currently iwl3945 is not able to report hw-killswitch events while the
    interface is down. This has implications on user space tools (like
    NetworkManager) relying on rfkill notifications to bring the interface
    up once the wireless gets enabled through a hw killswitch.

    Thus, enable the device already in iwl3945_pci_probe instead of iwl3945_up
    and poll the CSR_GP_CNTRL register to update the killswitch state every
    two seconds. The polling is only needed on 3945 hardware as this adapter
    does not use interrupts to signal rfkill changes to the driver (in case no
    firmware is loaded). The firmware loading is still done in iwl3945_up.

    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Acked-by: Samuel Ortiz <samuel.ortiz at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 14:21:18.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 14:21:22.000000000 -0400
@@ -6001,7 +6001,8 @@ static void iwl3945_bg_rf_kill(struct wo
 		IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL,
 			  "HW and/or SW RF Kill no longer active, restarting "
 			  "device\n");
-		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
+		if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
+		     test_bit(STATUS_ALIVE, &priv->status))
 			queue_work(priv->workqueue, &priv->restart);
 	} else {
 
@@ -6018,6 +6019,25 @@ static void iwl3945_bg_rf_kill(struct wo
 	iwl3945_rfkill_set_hw_state(priv);
 }
 
+static void iwl3945_rfkill_poll(struct work_struct *data)
+{
+	struct iwl3945_priv *priv =
+	    container_of(data, struct iwl3945_priv, rfkill_poll.work);
+	unsigned long status = priv->status;
+
+	if (iwl3945_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+
+	if (test_bit(STATUS_RF_KILL_HW, &status) != test_bit(STATUS_RF_KILL_HW, &priv->status))
+		queue_work(priv->workqueue, &priv->rf_kill);
+
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   round_jiffies_relative(2 * HZ));
+
+}
+
 #define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
 
 static void iwl3945_bg_scan_check(struct work_struct *data)
@@ -6420,20 +6440,6 @@ static int iwl3945_mac_start(struct ieee
 
 	IWL_DEBUG_MAC80211("enter\n");
 
-	if (pci_enable_device(priv->pci_dev)) {
-		IWL_ERROR("Fail to pci_enable_device\n");
-		return -ENODEV;
-	}
-	pci_restore_state(priv->pci_dev);
-	pci_enable_msi(priv->pci_dev);
-
-	ret = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
-			  DRV_NAME, priv);
-	if (ret) {
-		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
-		goto out_disable_msi;
-	}
-
 	/* we should be verifying the device is ready to be opened */
 	mutex_lock(&priv->mutex);
 
@@ -6478,15 +6484,15 @@ static int iwl3945_mac_start(struct ieee
 		}
 	}
 
+	/* ucode is running and will send rfkill notifications,
+	 * no need to poll the killswitch state anymore */
+	cancel_delayed_work(&priv->rfkill_poll);
+
 	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
 
 out_release_irq:
-	free_irq(priv->pci_dev->irq, priv);
-out_disable_msi:
-	pci_disable_msi(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
 	priv->is_open = 0;
 	IWL_DEBUG_MAC80211("leave - failed\n");
 	return ret;
@@ -6517,10 +6523,10 @@ static void iwl3945_mac_stop(struct ieee
 	iwl3945_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	/* start polling the killswitch state again */
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   round_jiffies_relative(2 * HZ));
 
 	IWL_DEBUG_MAC80211("leave\n");
 }
@@ -7735,6 +7741,7 @@ static void iwl3945_setup_deferred_work(
 	INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start);
 	INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start);
 	INIT_DELAYED_WORK(&priv->scan_check, iwl3945_bg_scan_check);
+	INIT_DELAYED_WORK(&priv->rfkill_poll, iwl3945_rfkill_poll);
 
 	iwl3945_hw_setup_deferred_work(priv);
 
@@ -8007,24 +8014,27 @@ static int iwl3945_pci_probe(struct pci_
 	iwl3945_disable_interrupts(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
+	pci_enable_msi(priv->pci_dev);
+
+	err = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
+			  DRV_NAME, priv);
+	if (err) {
+		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+		goto out_disable_msi;
+	}
+
 	err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 	if (err) {
 		IWL_ERROR("failed to create sysfs device attributes\n");
-		goto out_free_geos;
+		goto out_release_irq;
 	}
 
 	iwl3945_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);
 	iwl3945_setup_deferred_work(priv);
 	iwl3945_setup_rx_handlers(priv);
 
-	/***********************
-	 * 9. Conclude
-	 * ********************/
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-
 	/*********************************
-	 * 10. Setup and Register mac80211
+	 * 9. Setup and Register mac80211
 	 * *******************************/
 
 	err = ieee80211_register_hw(priv->hw);
@@ -8042,13 +8052,20 @@ static int iwl3945_pci_probe(struct pci_
 		IWL_ERROR("Unable to initialize RFKILL system. "
 				  "Ignoring error: %d\n", err);
 
+	/* Start monitoring the killswitch */
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   2 * HZ);
+
 	return 0;
 
  out_remove_sysfs:
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
- out_free_geos:
+ out_release_irq:
+	free_irq(priv->pci_dev->irq, priv);
+ out_disable_msi:
+	pci_disable_msi(priv->pci_dev);
 	iwl3945_free_geos(priv);
  out_free_channel_map:
 	iwl3945_free_channel_map(priv);
@@ -8093,6 +8110,8 @@ static void __devexit iwl3945_pci_remove
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 
 	iwl3945_rfkill_unregister(priv);
+	cancel_delayed_work(&priv->rfkill_poll);
+
 	iwl3945_dealloc_ucode_pci(priv);
 
 	if (priv->rxq.bd)
@@ -8114,6 +8133,9 @@ static void __devexit iwl3945_pci_remove
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 
+	free_irq(pdev->irq, priv);
+	pci_disable_msi(pdev);
+
 	pci_iounmap(pdev, priv->hw_base);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
@@ -8140,19 +8162,8 @@ static int iwl3945_pci_suspend(struct pc
 		priv->is_open = 1;
 	}
 
-	/* pci driver assumes state will be saved in this function.
-	 * pci state is saved and device disabled when interface is
-	 * stopped, so at this time pci device will always be disabled -
-	 * whether interface was started or not. saving pci state now will
-	 * cause saved state be that of a disabled device, which will cause
-	 * problems during resume in that we will end up with a disabled device.
-	 *
-	 * indicate that the current saved state (from when interface was
-	 * stopped) is valid. if interface was never up at time of suspend
-	 * then the saved state will still be valid as it was saved during
-	 * .probe. */
-	pdev->state_saved = true;
-
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -8163,6 +8174,8 @@ static int iwl3945_pci_resume(struct pci
 	struct iwl3945_priv *priv = pci_get_drvdata(pdev);
 
 	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
 
 	if (priv->is_open)
 		iwl3945_mac_start(priv->hw);
diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig	2009-04-02 14:21:36.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h	2009-04-02 14:21:45.000000000 -0400
@@ -895,6 +895,7 @@ struct iwl3945_priv {
 	struct delayed_work thermal_periodic;
 	struct delayed_work gather_stats;
 	struct delayed_work scan_check;
+	struct delayed_work rfkill_poll;
 
 #define IWL_DEFAULT_TX_POWER 0x0F
 	s8 user_txpower_limit;

linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch:

--- NEW FILE linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch ---
Back-port of commit pending for 2.6.30...

commit f44035116d6ab7d0677874709fb864b2dc75a996
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Mon Jan 19 13:10:07 2009 +0100

    iwlagn: fix hw-rfkill while the interface is down
    
    Currently iwlagn is not able to report hw-killswitch events while the
    interface is down. This has implications on user space tools (like
    NetworkManager) relying on rfkill notifications to bring the interface
    up once the wireless gets enabled through a hw killswitch.
    
    Thus, enable the device already in iwl_pci_probe instead of iwl_up
    and enable interrups while the interface is down in order to get
    notified about killswitch state changes. The firmware loading is still
    done in iwl_up.
    
    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Acked-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-04-02 14:15:36.000000000 -0400
@@ -1397,13 +1397,16 @@ static void iwl_irq_tasklet(struct iwl_p
 				hw_rf_kill ? "disable radio" : "enable radio");
 
 		/* driver only loads ucode once setting the interface up.
-		 * the driver as well won't allow loading if RFKILL is set
-		 * therefore no need to restart the driver from this handler
+		 * the driver allows loading the ucode even if the radio
+		 * is killed. Hence update the killswitch state here. The
+		 * rfkill handler will care about restarting if needed.
 		 */
-		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
-			clear_bit(STATUS_RF_KILL_HW, &priv->status);
-			if (priv->is_open && !iwl_is_rfkill(priv))
-				queue_work(priv->workqueue, &priv->up);
+		if (!test_bit(STATUS_ALIVE, &priv->status)) {
+			if (hw_rf_kill)
+				set_bit(STATUS_RF_KILL_HW, &priv->status);
+			else
+				clear_bit(STATUS_RF_KILL_HW, &priv->status);
+			queue_work(priv->workqueue, &priv->rf_kill);
 		}
 
 		handled |= CSR_INT_BIT_RF_KILL;
@@ -2156,7 +2159,8 @@ static void iwl_bg_rf_kill(struct work_s
 		IWL_DEBUG(IWL_DL_RF_KILL,
 			  "HW and/or SW RF Kill no longer active, restarting "
 			  "device\n");
-		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
+		if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
+		     test_bit(STATUS_ALIVE, &priv->status))
 			queue_work(priv->workqueue, &priv->restart);
 	} else {
 		/* make sure mac80211 stop sending Tx frame */
@@ -2353,31 +2357,9 @@ static int iwl_mac_start(struct ieee8021
 {
 	struct iwl_priv *priv = hw->priv;
 	int ret;
-	u16 pci_cmd;
 
 	IWL_DEBUG_MAC80211("enter\n");
 
-	if (pci_enable_device(priv->pci_dev)) {
-		IWL_ERROR("Fail to pci_enable_device\n");
-		return -ENODEV;
-	}
-	pci_restore_state(priv->pci_dev);
-	pci_enable_msi(priv->pci_dev);
-
-	/* enable interrupts if needed: hw bug w/a */
-	pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
-	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
-		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
-		pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
-	}
-
-	ret = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
-			  DRV_NAME, priv);
-	if (ret) {
-		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
-		goto out_disable_msi;
-	}
-
 	/* we should be verifying the device is ready to be opened */
 	mutex_lock(&priv->mutex);
 
@@ -2390,7 +2372,7 @@ static int iwl_mac_start(struct ieee8021
 		if (ret) {
 			IWL_ERROR("Could not read microcode: %d\n", ret);
 			mutex_unlock(&priv->mutex);
-			goto out_release_irq;
+			return ret;
 		}
 	}
 
@@ -2401,7 +2383,7 @@ static int iwl_mac_start(struct ieee8021
 	iwl_rfkill_set_hw_state(priv);
 
 	if (ret)
-		goto out_release_irq;
+		return ret;
 
 	if (iwl_is_rfkill(priv))
 		goto out;
@@ -2420,8 +2402,7 @@ static int iwl_mac_start(struct ieee8021
 		if (!test_bit(STATUS_READY, &priv->status)) {
 			IWL_ERROR("START_ALIVE timeout after %dms.\n",
 				jiffies_to_msecs(UCODE_READY_TIMEOUT));
-			ret = -ETIMEDOUT;
-			goto out_release_irq;
+			return -ETIMEDOUT;
 		}
 	}
 
@@ -2429,15 +2410,6 @@ out:
 	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
-
-out_release_irq:
-	free_irq(priv->pci_dev->irq, priv);
-out_disable_msi:
-	pci_disable_msi(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
-	priv->is_open = 0;
-	IWL_DEBUG_MAC80211("leave - failed\n");
-	return ret;
 }
 
 static void iwl_mac_stop(struct ieee80211_hw *hw)
@@ -2465,10 +2437,10 @@ static void iwl_mac_stop(struct ieee8021
 	iwl_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	/* enable interrupts again in order to receive rfkill changes */
+	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
+	iwl_enable_interrupts(priv);
 
 	IWL_DEBUG_MAC80211("leave\n");
 }
@@ -3764,6 +3736,7 @@ static int iwl_pci_probe(struct pci_dev 
 	struct ieee80211_hw *hw;
 	struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
 	unsigned long flags;
+	u16 pci_cmd;
 
 	/************************
 	 * 1. Allocating HW data
@@ -3909,26 +3882,36 @@ static int iwl_pci_probe(struct pci_dev 
 	iwl_disable_interrupts(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
+	pci_enable_msi(priv->pci_dev);
+
+	err = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
+			  DRV_NAME, priv);
+	if (err) {
+		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+		goto out_disable_msi;
+	}
 	err = sysfs_create_group(&pdev->dev.kobj, &iwl_attribute_group);
 	if (err) {
 		IWL_ERROR("failed to create sysfs device attributes\n");
 		goto out_uninit_drv;
 	}
 
-
 	iwl_setup_deferred_work(priv);
 	iwl_setup_rx_handlers(priv);
 
-	/********************
-	 * 9. Conclude
-	 ********************/
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-
 	/**********************************
-	 * 10. Setup and register mac80211
+	 * 9. Setup and register mac80211
 	 **********************************/
 
+	/* enable interrupts if needed: hw bug w/a */
+	pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
+	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+		pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
+	}
+
+	iwl_enable_interrupts(priv);
+
 	err = iwl_setup_mac(priv);
 	if (err)
 		goto out_remove_sysfs;
@@ -3937,10 +3920,19 @@ static int iwl_pci_probe(struct pci_dev 
 	if (err)
 		IWL_ERROR("failed to create debugfs files\n");
 
+	/* If platform's RF_KILL switch is NOT set to KILL */
+	if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+
 	err = iwl_rfkill_init(priv);
 	if (err)
 		IWL_ERROR("Unable to initialize RFKILL system. "
 				  "Ignoring error: %d\n", err);
+	else
+		iwl_rfkill_set_hw_state(priv);
+
 	iwl_power_initialize(priv);
 	return 0;
 
@@ -3948,6 +3940,9 @@ static int iwl_pci_probe(struct pci_dev 
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 	sysfs_remove_group(&pdev->dev.kobj, &iwl_attribute_group);
+ out_disable_msi:
+	pci_disable_msi(priv->pci_dev);
+	pci_disable_device(priv->pci_dev);
  out_uninit_drv:
 	iwl_uninit_drv(priv);
  out_free_eeprom:
@@ -4019,6 +4014,8 @@ static void __devexit iwl_pci_remove(str
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 
+	free_irq(priv->pci_dev->irq, priv);
+	pci_disable_msi(priv->pci_dev);
 	pci_iounmap(pdev, priv->hw_base);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
@@ -4044,19 +4041,8 @@ static int iwl_pci_suspend(struct pci_de
 		priv->is_open = 1;
 	}
 
-	/* pci driver assumes state will be saved in this function.
-	 * pci state is saved and device disabled when interface is
-	 * stopped, so at this time pci device will always be disabled -
-	 * whether interface was started or not. saving pci state now will
-	 * cause saved state be that of a disabled device, which will cause
-	 * problems during resume in that we will end up with a disabled device.
-	 *
-	 * indicate that the current saved state (from when interface was
-	 * stopped) is valid. if interface was never up at time of suspend
-	 * then the saved state will still be valid as it was saved during
-	 * .probe. */
-	pdev->state_saved = true;
-
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -4067,6 +4053,9 @@ static int iwl_pci_resume(struct pci_dev
 	struct iwl_priv *priv = pci_get_drvdata(pdev);
 
 	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
+	iwl_enable_interrupts(priv);
 
 	if (priv->is_open)
 		iwl_mac_start(priv->hw);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -r1.1502 -r1.1503
--- kernel.spec	2 Apr 2009 17:21:28 -0000	1.1502
+++ kernel.spec	2 Apr 2009 18:28:13 -0000	1.1503
@@ -652,6 +652,8 @@
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
+Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 
@@ -1247,6 +1249,10 @@
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 
+# back-port iwlwifi rfkill while device down patches
+ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
+ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1878,6 +1884,9 @@
 # and build.
 
 %changelog
+* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
+- back-port iwlwifi rfkill while device down patches
+
 * Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>
 - linux-2.6-btrfs-fix-umount-hang.patch: fix hang on umount
 



From jdennis at fedoraproject.org  Thu Apr  2 18:35:22 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu,  2 Apr 2009 18:35:22 +0000 (UTC)
Subject: rpms/python-nss/F-9 python-nss.spec,NONE,1.1
Message-ID: <20090402183522.4B0FC70120@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/python-nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22547

Added Files:
	python-nss.spec 
Log Message:
import spec file into F-9 branch so package can be built for F-9



--- NEW FILE python-nss.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-nss
Version:        0.1
Release:        1%{?dist}
Summary:        Python bindings for Network Security Services (NSS)

Group:          Development/Languages
License:        GPLv2+
#URL:            
Source0:        %{name}-%{version}.tar.bz2 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define docdir %{_docdir}/%{name}-%{version}

BuildRequires: python-devel
BuildRequires: python-setuptools-devel
BuildRequires: epydoc
BuildRequires: python-docutils
BuildRequires: nspr-devel
BuildRequires: nss-devel


%description
This package provides Python bindings for Network Security Services
(NSS) and the Netscape Portable Runtime (NSPR).

NSS is a set of libraries supporting security-enabled client and
server applications. Applications built with NSS can support SSL v2
and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
certificates, and other security standards. Specific NSS
implementations have been FIPS-140 certified.


%prep
%setup -q


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%{__python} setup.py build_doc


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install  -O1 --install-platlib %{python_sitearch} --skip-build --root $RPM_BUILD_ROOT 
%{__python} setup.py install_doc --docdir %{docdir} --skip-build --root $RPM_BUILD_ROOT

# Remove execution permission from any example scripts
find $RPM_BUILD_ROOT/%{docdir}/examples -type f | xargs chmod a-x

# Set correct permissions on .so files
chmod 0755 $RPM_BUILD_ROOT/%{python_sitearch}/nss/*.so
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc %{docdir}
%{python_sitearch}/*


%changelog
* Tue Sep  9 2008 John Dennis <jdennis at redhat.com> - 0.1-1
- clean up ssl_example.py, fix arg list in get_cert_nicknames,
   make certdir cmd line arg consistent with other NSS tools
- update httplib.py to support client auth, add httplib_example.py which illustrates it's use
- fix some documentation
- fix some type usage which were unsafe on 64-bit

* Wed Jul  9 2008 John Dennis <jdennis at redhat.com> - 0.0-2
- add docutils to build requires so restructured text works

* Fri Jun 27 2008 John Dennis <jdennis at redhat.com> - 0.0-1
- initial release





From bpepple at fedoraproject.org  Thu Apr  2 18:38:19 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  2 Apr 2009 18:38:19 +0000 (UTC)
Subject: rpms/telepathy-salut/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 telepathy-salut.spec, 1.26, 1.27
Message-ID: <20090402183819.4450970120@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-salut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23342

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
* Thu Apr  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
- Update to 0.3.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Feb 2009 20:31:17 -0000	1.18
+++ .cvsignore	2 Apr 2009 18:37:48 -0000	1.19
@@ -1 +1 @@
-telepathy-salut-0.3.8.tar.gz
+telepathy-salut-0.3.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Feb 2009 20:31:17 -0000	1.18
+++ sources	2 Apr 2009 18:37:48 -0000	1.19
@@ -1 +1 @@
-5c67655054059a1dfa647d64dd8b3260  telepathy-salut-0.3.8.tar.gz
+b61b6f8a86b07a10315c4cca9d78b4fa  telepathy-salut-0.3.9.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/telepathy-salut.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- telepathy-salut.spec	25 Feb 2009 19:46:27 -0000	1.26
+++ telepathy-salut.spec	2 Apr 2009 18:37:48 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
-Version:        0.3.8
-Release:        2%{?dist}
+Version:        0.3.9
+Release:        1%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -59,6 +59,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Thu Apr  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
+- Update to 0.3.9.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ynemoy at fedoraproject.org  Thu Apr  2 18:46:09 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Thu,  2 Apr 2009 18:46:09 +0000 (UTC)
Subject: rpms/ghc-X11/F-10 ghc-X11.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090402184609.CD98D70120@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26404

Modified Files:
	sources 
Added Files:
	ghc-X11.spec 
Log Message:
Copies branch from devel



--- NEW FILE ghc-X11.spec ---
%global pkg_name X11
%global ghc_version 6.10.1

%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}

%bcond_without prof
%bcond_without doc

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        1.4.5
Release:        5%{?dist}
Summary:        Haskell %{pkg_name} librar

Group:          Development/Libraries
License:        BSD
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc = %{ghc_version}
%if %{with doc}
BuildRequires:  ghc-doc = %{ghc_version}
%endif
%if %{with prof}
BuildRequires:  ghc-prof = %{ghc_version}
%endif
BuildRequires: libXinerama-devel, libX11-devel, libXext-devel

%description
This package provides the Haskell %{pkg_name} library.

The library consists of bindings to direct translations of the C bindings; for
documentation of these calls, refer to "The Xlib Programming
Manual", available online at <http://tronche.com/gui/x/xlib/>.

%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires:       libXinerama-devel, libX11-devel, libXext-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary: Documentation for %{name}
Group: Development/Libraries
Requires: ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary: Profiling libraries for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%cabal_configure --ghc %{!?without_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
%endif
%ghc_gen_scripts


%install
rm -rf $RPM_BUILD_ROOT
%cabal_install
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc
%defattr(-,root,root,-)
%{pkg_docdir}
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Sun Mar  8 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-5
- corrected a faulty tag

* Sun Mar  8 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-4
- forgot to include the right arch tags

* Sat Feb 28 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-3
- sync with cabal2spec-0.12:
- improve requires

* Mon Feb 23 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 1.4.5-2
- updated template to new guidelines

* Mon Jan  5 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 1.4.5-1
- initial packaging for Fedora created by cabal2spec
- added description and build requires
- altered license from template


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2009 04:39:02 -0000	1.1
+++ sources	2 Apr 2009 18:45:39 -0000	1.2
@@ -0,0 +1 @@
+73a4ba56b8cef69ce3659ab452e4530b  X11-1.4.5.tar.gz



From jdennis at fedoraproject.org  Thu Apr  2 19:09:47 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu,  2 Apr 2009 19:09:47 +0000 (UTC)
Subject: rpms/python-nss/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090402190947.B629370120@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/python-nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv992

Modified Files:
	.cvsignore sources 
Log Message:
upload tar file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jul 2008 16:57:10 -0000	1.1
+++ .cvsignore	2 Apr 2009 19:09:17 -0000	1.2
@@ -0,0 +1 @@
+python-nss-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jul 2008 16:57:10 -0000	1.1
+++ sources	2 Apr 2009 19:09:17 -0000	1.2
@@ -0,0 +1 @@
+f92dcac6c1837d4cc7991678850b449a  python-nss-0.1.tar.bz2



From linville at fedoraproject.org  Thu Apr  2 19:11:08 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  2 Apr 2009 19:11:08 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.56, 1.1206.2.57
Message-ID: <20090402191108.1B0B670120@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1564

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
Log Message:
iwl3945: rely on priv->lock to protect priv access

linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch:

--- NEW FILE linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch ---
diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 15:03:20.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 15:03:34.000000000 -0400
@@ -7111,15 +7111,12 @@ static int iwl3945_mac_conf_tx(struct ie
 	priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
 	priv->qos_data.qos_active = 1;
 
-	spin_unlock_irqrestore(&priv->lock, flags);
-
-	mutex_lock(&priv->mutex);
 	if (priv->iw_mode == IEEE80211_IF_TYPE_AP)
 		iwl3945_activate_qos(priv, 1);
 	else if (priv->assoc_id && iwl3945_is_associated(priv))
 		iwl3945_activate_qos(priv, 0);
 
-	mutex_unlock(&priv->mutex);
+	spin_unlock_irqrestore(&priv->lock, flags);
 
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.56
retrieving revision 1.1206.2.57
diff -u -r1.1206.2.56 -r1.1206.2.57
--- kernel.spec	24 Mar 2009 02:45:53 -0000	1.1206.2.56
+++ kernel.spec	2 Apr 2009 19:10:37 -0000	1.1206.2.57
@@ -656,6 +656,7 @@
 Patch685: linux-2.6-rtl8187b-tx-status-feedback.patch
 Patch686: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch687: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch688: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1303,6 +1304,7 @@
 # back-port scan result aging patches
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
@@ -1971,6 +1973,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr  2 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.57
+- iwl3945: rely on priv->lock to protect priv access
+
 * Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.56
 - 2.6.27.21
 - Dropped patches, merged in -stable:



From jdennis at fedoraproject.org  Thu Apr  2 19:11:27 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu,  2 Apr 2009 19:11:27 +0000 (UTC)
Subject: rpms/python-nss/F-9 python-nss.spec,1.1,1.2
Message-ID: <20090402191127.ABF0770120@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/python-nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1656

Modified Files:
	python-nss.spec 
Log Message:
bump release for build



Index: python-nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nss/F-9/python-nss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-nss.spec	2 Apr 2009 18:35:21 -0000	1.1
+++ python-nss.spec	2 Apr 2009 19:10:57 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-nss
 Version:        0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for Network Security Services (NSS)
 
 Group:          Development/Languages



From linville at fedoraproject.org  Thu Apr  2 19:15:46 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  2 Apr 2009 19:15:46 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1206.2.57,1.1206.2.58
Message-ID: <20090402191546.29E6470120@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3880

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Log Message:



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.57
retrieving revision 1.1206.2.58
diff -u -r1.1206.2.57 -r1.1206.2.58
--- kernel.spec	2 Apr 2009 19:10:37 -0000	1.1206.2.57
+++ kernel.spec	2 Apr 2009 19:15:15 -0000	1.1206.2.58
@@ -1304,6 +1304,8 @@
 # back-port scan result aging patches
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+
+# fix locking in ipw3945 conf_tx callback
 ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 # NFS Client mounts hang when exported directory do not exist



From pkgdb at fedoraproject.org  Thu Apr  2 19:25:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 19:25:39 +0000
Subject: [pkgdb] ejabberd: mmahut has requested watchbugzilla
Message-ID: <20090402192525.D288F208514@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on ejabberd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Thu Apr  2 19:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 19:25:46 +0000
Subject: [pkgdb] ejabberd: mmahut has requested watchcommits
Message-ID: <20090402192528.A8D46208555@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on ejabberd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Thu Apr  2 19:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 19:25:50 +0000
Subject: [pkgdb] ejabberd: mmahut has requested commit
Message-ID: <20090402192530.E5B15208603@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on ejabberd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Thu Apr  2 19:25:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 02 Apr 2009 19:25:34 +0000
Subject: [pkgdb] ejabberd: mmahut has requested approveacls
Message-ID: <20090402192534.C4456208609@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on ejabberd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From linville at fedoraproject.org  Thu Apr  2 19:26:40 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  2 Apr 2009 19:26:40 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch,
	1.1, 1.2
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch,
	NONE,
	1.1 linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch, 
	NONE, 1.1 config-generic, 1.224, 1.225 kernel.spec, 1.1312, 1.1313
Message-ID: <20090402192640.2A6B570120@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6602

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch 
	linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch 
Log Message:
back-port iwlwifi rfkill while device down patches ; iwl3945: rely on priv->lock to protect priv access

linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch:

Index: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
===================================================================
RCS file: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
diff -N linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch	2 Apr 2009 19:26:39 -0000	1.2
@@ -0,0 +1,20 @@
+diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
+--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 15:21:05.000000000 -0400
++++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 15:22:27.000000000 -0400
+@@ -7101,15 +7101,12 @@ static int iwl3945_mac_conf_tx(struct ie
+ 	priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
+ 	priv->qos_data.qos_active = 1;
+ 
+-	spin_unlock_irqrestore(&priv->lock, flags);
+-
+-	mutex_lock(&priv->mutex);
+ 	if (priv->iw_mode == NL80211_IFTYPE_AP)
+ 		iwl3945_activate_qos(priv, 1);
+ 	else if (priv->assoc_id && iwl3945_is_associated(priv))
+ 		iwl3945_activate_qos(priv, 0);
+ 
+-	mutex_unlock(&priv->mutex);
++	spin_unlock_irqrestore(&priv->lock, flags);
+ 
+ 	IWL_DEBUG_MAC80211("leave\n");
+ 	return 0;

linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch:

--- NEW FILE linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch ---
Back-port of commit pending for 2.6.30...

commit 9a454abf066ab588ef28ff9d2c04cc480d13c040
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Thu Jan 15 09:38:44 2009 +0100

    iwl3945: report killswitch changes even if the interface is down

    Currently iwl3945 is not able to report hw-killswitch events while the
    interface is down. This has implications on user space tools (like
    NetworkManager) relying on rfkill notifications to bring the interface
    up once the wireless gets enabled through a hw killswitch.

    Thus, enable the device already in iwl3945_pci_probe instead of iwl3945_up
    and poll the CSR_GP_CNTRL register to update the killswitch state every
    two seconds. The polling is only needed on 3945 hardware as this adapter
    does not use interrupts to signal rfkill changes to the driver (in case no
    firmware is loaded). The firmware loading is still done in iwl3945_up.

    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Acked-by: Samuel Ortiz <samuel.ortiz at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 14:21:18.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 14:21:22.000000000 -0400
@@ -6001,7 +6001,8 @@ static void iwl3945_bg_rf_kill(struct wo
 		IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL,
 			  "HW and/or SW RF Kill no longer active, restarting "
 			  "device\n");
-		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
+		if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
+		     test_bit(STATUS_ALIVE, &priv->status))
 			queue_work(priv->workqueue, &priv->restart);
 	} else {
 
@@ -6018,6 +6019,25 @@ static void iwl3945_bg_rf_kill(struct wo
 	iwl3945_rfkill_set_hw_state(priv);
 }
 
+static void iwl3945_rfkill_poll(struct work_struct *data)
+{
+	struct iwl3945_priv *priv =
+	    container_of(data, struct iwl3945_priv, rfkill_poll.work);
+	unsigned long status = priv->status;
+
+	if (iwl3945_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+
+	if (test_bit(STATUS_RF_KILL_HW, &status) != test_bit(STATUS_RF_KILL_HW, &priv->status))
+		queue_work(priv->workqueue, &priv->rf_kill);
+
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   round_jiffies_relative(2 * HZ));
+
+}
+
 #define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
 
 static void iwl3945_bg_scan_check(struct work_struct *data)
@@ -6420,20 +6440,6 @@ static int iwl3945_mac_start(struct ieee
 
 	IWL_DEBUG_MAC80211("enter\n");
 
-	if (pci_enable_device(priv->pci_dev)) {
-		IWL_ERROR("Fail to pci_enable_device\n");
-		return -ENODEV;
-	}
-	pci_restore_state(priv->pci_dev);
-	pci_enable_msi(priv->pci_dev);
-
-	ret = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
-			  DRV_NAME, priv);
-	if (ret) {
-		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
-		goto out_disable_msi;
-	}
-
 	/* we should be verifying the device is ready to be opened */
 	mutex_lock(&priv->mutex);
 
@@ -6478,15 +6484,15 @@ static int iwl3945_mac_start(struct ieee
 		}
 	}
 
+	/* ucode is running and will send rfkill notifications,
+	 * no need to poll the killswitch state anymore */
+	cancel_delayed_work(&priv->rfkill_poll);
+
 	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
 
 out_release_irq:
-	free_irq(priv->pci_dev->irq, priv);
-out_disable_msi:
-	pci_disable_msi(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
 	priv->is_open = 0;
 	IWL_DEBUG_MAC80211("leave - failed\n");
 	return ret;
@@ -6517,10 +6523,10 @@ static void iwl3945_mac_stop(struct ieee
 	iwl3945_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	/* start polling the killswitch state again */
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   round_jiffies_relative(2 * HZ));
 
 	IWL_DEBUG_MAC80211("leave\n");
 }
@@ -7735,6 +7741,7 @@ static void iwl3945_setup_deferred_work(
 	INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start);
 	INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start);
 	INIT_DELAYED_WORK(&priv->scan_check, iwl3945_bg_scan_check);
+	INIT_DELAYED_WORK(&priv->rfkill_poll, iwl3945_rfkill_poll);
 
 	iwl3945_hw_setup_deferred_work(priv);
 
@@ -8007,24 +8014,27 @@ static int iwl3945_pci_probe(struct pci_
 	iwl3945_disable_interrupts(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
+	pci_enable_msi(priv->pci_dev);
+
+	err = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
+			  DRV_NAME, priv);
+	if (err) {
+		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+		goto out_disable_msi;
+	}
+
 	err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 	if (err) {
 		IWL_ERROR("failed to create sysfs device attributes\n");
-		goto out_free_geos;
+		goto out_release_irq;
 	}
 
 	iwl3945_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);
 	iwl3945_setup_deferred_work(priv);
 	iwl3945_setup_rx_handlers(priv);
 
-	/***********************
-	 * 9. Conclude
-	 * ********************/
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-
 	/*********************************
-	 * 10. Setup and Register mac80211
+	 * 9. Setup and Register mac80211
 	 * *******************************/
 
 	err = ieee80211_register_hw(priv->hw);
@@ -8042,13 +8052,20 @@ static int iwl3945_pci_probe(struct pci_
 		IWL_ERROR("Unable to initialize RFKILL system. "
 				  "Ignoring error: %d\n", err);
 
+	/* Start monitoring the killswitch */
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   2 * HZ);
+
 	return 0;
 
  out_remove_sysfs:
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
- out_free_geos:
+ out_release_irq:
+	free_irq(priv->pci_dev->irq, priv);
+ out_disable_msi:
+	pci_disable_msi(priv->pci_dev);
 	iwl3945_free_geos(priv);
  out_free_channel_map:
 	iwl3945_free_channel_map(priv);
@@ -8093,6 +8110,8 @@ static void __devexit iwl3945_pci_remove
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 
 	iwl3945_rfkill_unregister(priv);
+	cancel_delayed_work(&priv->rfkill_poll);
+
 	iwl3945_dealloc_ucode_pci(priv);
 
 	if (priv->rxq.bd)
@@ -8114,6 +8133,9 @@ static void __devexit iwl3945_pci_remove
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 
+	free_irq(pdev->irq, priv);
+	pci_disable_msi(pdev);
+
 	pci_iounmap(pdev, priv->hw_base);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
@@ -8140,19 +8162,8 @@ static int iwl3945_pci_suspend(struct pc
 		priv->is_open = 1;
 	}
 
-	/* pci driver assumes state will be saved in this function.
-	 * pci state is saved and device disabled when interface is
-	 * stopped, so at this time pci device will always be disabled -
-	 * whether interface was started or not. saving pci state now will
-	 * cause saved state be that of a disabled device, which will cause
-	 * problems during resume in that we will end up with a disabled device.
-	 *
-	 * indicate that the current saved state (from when interface was
-	 * stopped) is valid. if interface was never up at time of suspend
-	 * then the saved state will still be valid as it was saved during
-	 * .probe. */
-	pdev->state_saved = true;
-
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -8163,6 +8174,8 @@ static int iwl3945_pci_resume(struct pci
 	struct iwl3945_priv *priv = pci_get_drvdata(pdev);
 
 	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
 
 	if (priv->is_open)
 		iwl3945_mac_start(priv->hw);
diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig	2009-04-02 14:21:36.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h	2009-04-02 14:21:45.000000000 -0400
@@ -895,6 +895,7 @@ struct iwl3945_priv {
 	struct delayed_work thermal_periodic;
 	struct delayed_work gather_stats;
 	struct delayed_work scan_check;
+	struct delayed_work rfkill_poll;
 
 #define IWL_DEFAULT_TX_POWER 0x0F
 	s8 user_txpower_limit;

linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch:

--- NEW FILE linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch ---
Back-port of commit pending for 2.6.30...

commit f44035116d6ab7d0677874709fb864b2dc75a996
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Mon Jan 19 13:10:07 2009 +0100

    iwlagn: fix hw-rfkill while the interface is down
    
    Currently iwlagn is not able to report hw-killswitch events while the
    interface is down. This has implications on user space tools (like
    NetworkManager) relying on rfkill notifications to bring the interface
    up once the wireless gets enabled through a hw killswitch.
    
    Thus, enable the device already in iwl_pci_probe instead of iwl_up
    and enable interrups while the interface is down in order to get
    notified about killswitch state changes. The firmware loading is still
    done in iwl_up.
    
    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Acked-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-04-02 14:15:36.000000000 -0400
@@ -1397,13 +1397,16 @@ static void iwl_irq_tasklet(struct iwl_p
 				hw_rf_kill ? "disable radio" : "enable radio");
 
 		/* driver only loads ucode once setting the interface up.
-		 * the driver as well won't allow loading if RFKILL is set
-		 * therefore no need to restart the driver from this handler
+		 * the driver allows loading the ucode even if the radio
+		 * is killed. Hence update the killswitch state here. The
+		 * rfkill handler will care about restarting if needed.
 		 */
-		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
-			clear_bit(STATUS_RF_KILL_HW, &priv->status);
-			if (priv->is_open && !iwl_is_rfkill(priv))
-				queue_work(priv->workqueue, &priv->up);
+		if (!test_bit(STATUS_ALIVE, &priv->status)) {
+			if (hw_rf_kill)
+				set_bit(STATUS_RF_KILL_HW, &priv->status);
+			else
+				clear_bit(STATUS_RF_KILL_HW, &priv->status);
+			queue_work(priv->workqueue, &priv->rf_kill);
 		}
 
 		handled |= CSR_INT_BIT_RF_KILL;
@@ -2156,7 +2159,8 @@ static void iwl_bg_rf_kill(struct work_s
 		IWL_DEBUG(IWL_DL_RF_KILL,
 			  "HW and/or SW RF Kill no longer active, restarting "
 			  "device\n");
-		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
+		if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
+		     test_bit(STATUS_ALIVE, &priv->status))
 			queue_work(priv->workqueue, &priv->restart);
 	} else {
 		/* make sure mac80211 stop sending Tx frame */
@@ -2353,31 +2357,9 @@ static int iwl_mac_start(struct ieee8021
 {
 	struct iwl_priv *priv = hw->priv;
 	int ret;
-	u16 pci_cmd;
 
 	IWL_DEBUG_MAC80211("enter\n");
 
-	if (pci_enable_device(priv->pci_dev)) {
-		IWL_ERROR("Fail to pci_enable_device\n");
-		return -ENODEV;
-	}
-	pci_restore_state(priv->pci_dev);
-	pci_enable_msi(priv->pci_dev);
-
-	/* enable interrupts if needed: hw bug w/a */
-	pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
-	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
-		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
-		pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
-	}
-
-	ret = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
-			  DRV_NAME, priv);
-	if (ret) {
-		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
-		goto out_disable_msi;
-	}
-
 	/* we should be verifying the device is ready to be opened */
 	mutex_lock(&priv->mutex);
 
@@ -2390,7 +2372,7 @@ static int iwl_mac_start(struct ieee8021
 		if (ret) {
 			IWL_ERROR("Could not read microcode: %d\n", ret);
 			mutex_unlock(&priv->mutex);
-			goto out_release_irq;
+			return ret;
 		}
 	}
 
@@ -2401,7 +2383,7 @@ static int iwl_mac_start(struct ieee8021
 	iwl_rfkill_set_hw_state(priv);
 
 	if (ret)
-		goto out_release_irq;
+		return ret;
 
 	if (iwl_is_rfkill(priv))
 		goto out;
@@ -2420,8 +2402,7 @@ static int iwl_mac_start(struct ieee8021
 		if (!test_bit(STATUS_READY, &priv->status)) {
 			IWL_ERROR("START_ALIVE timeout after %dms.\n",
 				jiffies_to_msecs(UCODE_READY_TIMEOUT));
-			ret = -ETIMEDOUT;
-			goto out_release_irq;
+			return -ETIMEDOUT;
 		}
 	}
 
@@ -2429,15 +2410,6 @@ out:
 	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
-
-out_release_irq:
-	free_irq(priv->pci_dev->irq, priv);
-out_disable_msi:
-	pci_disable_msi(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
-	priv->is_open = 0;
-	IWL_DEBUG_MAC80211("leave - failed\n");
-	return ret;
 }
 
 static void iwl_mac_stop(struct ieee80211_hw *hw)
@@ -2465,10 +2437,10 @@ static void iwl_mac_stop(struct ieee8021
 	iwl_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	/* enable interrupts again in order to receive rfkill changes */
+	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
+	iwl_enable_interrupts(priv);
 
 	IWL_DEBUG_MAC80211("leave\n");
 }
@@ -3764,6 +3736,7 @@ static int iwl_pci_probe(struct pci_dev 
 	struct ieee80211_hw *hw;
 	struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
 	unsigned long flags;
+	u16 pci_cmd;
 
 	/************************
 	 * 1. Allocating HW data
@@ -3909,26 +3882,36 @@ static int iwl_pci_probe(struct pci_dev 
 	iwl_disable_interrupts(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
+	pci_enable_msi(priv->pci_dev);
+
+	err = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
+			  DRV_NAME, priv);
+	if (err) {
+		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+		goto out_disable_msi;
+	}
 	err = sysfs_create_group(&pdev->dev.kobj, &iwl_attribute_group);
 	if (err) {
 		IWL_ERROR("failed to create sysfs device attributes\n");
 		goto out_uninit_drv;
 	}
 
-
 	iwl_setup_deferred_work(priv);
 	iwl_setup_rx_handlers(priv);
 
-	/********************
-	 * 9. Conclude
-	 ********************/
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-
 	/**********************************
-	 * 10. Setup and register mac80211
+	 * 9. Setup and register mac80211
 	 **********************************/
 
+	/* enable interrupts if needed: hw bug w/a */
+	pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
+	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+		pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
+	}
+
+	iwl_enable_interrupts(priv);
+
 	err = iwl_setup_mac(priv);
 	if (err)
 		goto out_remove_sysfs;
@@ -3937,10 +3920,19 @@ static int iwl_pci_probe(struct pci_dev 
 	if (err)
 		IWL_ERROR("failed to create debugfs files\n");
 
+	/* If platform's RF_KILL switch is NOT set to KILL */
+	if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+
 	err = iwl_rfkill_init(priv);
 	if (err)
 		IWL_ERROR("Unable to initialize RFKILL system. "
 				  "Ignoring error: %d\n", err);
+	else
+		iwl_rfkill_set_hw_state(priv);
+
 	iwl_power_initialize(priv);
 	return 0;
 
@@ -3948,6 +3940,9 @@ static int iwl_pci_probe(struct pci_dev 
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 	sysfs_remove_group(&pdev->dev.kobj, &iwl_attribute_group);
+ out_disable_msi:
+	pci_disable_msi(priv->pci_dev);
+	pci_disable_device(priv->pci_dev);
  out_uninit_drv:
 	iwl_uninit_drv(priv);
  out_free_eeprom:
@@ -4019,6 +4014,8 @@ static void __devexit iwl_pci_remove(str
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 
+	free_irq(priv->pci_dev->irq, priv);
+	pci_disable_msi(priv->pci_dev);
 	pci_iounmap(pdev, priv->hw_base);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
@@ -4044,19 +4041,8 @@ static int iwl_pci_suspend(struct pci_de
 		priv->is_open = 1;
 	}
 
-	/* pci driver assumes state will be saved in this function.
-	 * pci state is saved and device disabled when interface is
-	 * stopped, so at this time pci device will always be disabled -
-	 * whether interface was started or not. saving pci state now will
-	 * cause saved state be that of a disabled device, which will cause
-	 * problems during resume in that we will end up with a disabled device.
-	 *
-	 * indicate that the current saved state (from when interface was
-	 * stopped) is valid. if interface was never up at time of suspend
-	 * then the saved state will still be valid as it was saved during
-	 * .probe. */
-	pdev->state_saved = true;
-
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -4067,6 +4053,9 @@ static int iwl_pci_resume(struct pci_dev
 	struct iwl_priv *priv = pci_get_drvdata(pdev);
 
 	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
+	iwl_enable_interrupts(priv);
 
 	if (priv->is_open)
 		iwl_mac_start(priv->hw);


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- config-generic	25 Mar 2009 19:34:16 -0000	1.224
+++ config-generic	2 Apr 2009 19:26:39 -0000	1.225
@@ -1325,7 +1325,6 @@
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
-CONFIG_MAC80211_RC_MINSTREL=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_MAC80211_DEBUG is not set
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1312
retrieving revision 1.1313
diff -u -r1.1312 -r1.1313
--- kernel.spec	31 Mar 2009 00:19:44 -0000	1.1312
+++ kernel.spec	2 Apr 2009 19:26:39 -0000	1.1313
@@ -636,6 +636,9 @@
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
+Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+Patch685: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1212,6 +1215,13 @@
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 
+# back-port iwlwifi rfkill while device down patches
+ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
+ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+
+# fix locking in ipw3945 conf_tx callback
+ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1827,6 +1837,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr  2 2009 John W. Linville <linville at redhat.com>  2.6.29-13
+- back-port iwlwifi rfkill while device down patches
+- iwl3945: rely on priv->lock to protect priv access
+
 * Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-12
 - x86 PCI/PAT fix headed for -stable: inherit protections on mmap.
 - FUSE patch headed for -stable: don't return to user with lock held.



From xavierb at fedoraproject.org  Thu Apr  2 19:27:20 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu,  2 Apr 2009 19:27:20 +0000 (UTC)
Subject: rpms/perl-Date-Leapyear/devel .cvsignore, 1.2,
	1.3 perl-Date-Leapyear.spec, 1.1, 1.2 sources, 1.2,
	1.3 perl-Date-Leapyear-Re-license_Date-Leapyear.eml, 1.1, NONE
Message-ID: <20090402192720.C371B70120@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Date-Leapyear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6715

Modified Files:
	.cvsignore perl-Date-Leapyear.spec sources 
Removed Files:
	perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
Log Message:
1.72, GPL+ or Artistic


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 08:51:25 -0000	1.2
+++ .cvsignore	2 Apr 2009 19:26:50 -0000	1.3
@@ -1 +1 @@
-Date-Leapyear-1.71.tar.gz
+Date-Leapyear-1.72.tar.gz


Index: perl-Date-Leapyear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/devel/perl-Date-Leapyear.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Date-Leapyear.spec	20 Mar 2009 08:51:25 -0000	1.1
+++ perl-Date-Leapyear.spec	2 Apr 2009 19:26:50 -0000	1.2
@@ -1,14 +1,11 @@
 Name:           perl-Date-Leapyear
-Version:        1.71
-Release:        2%{?dist}
+Version:        1.72
+Release:        1%{?dist}
 Summary:        Is a particular year a leap year?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Date-Leapyear/
 Source0:        http://www.cpan.org/modules/by-module/Date/Date-Leapyear-%{version}.tar.gz
-# License is currently Artistic in upstream tarball. However upstream has agreed to re-license.
-# See the mail in Source1.
-Source1:        perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -29,8 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m 0644 %{SOURCE1} .
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -46,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README
-%doc perl-Date-Leapyear-Re-license_Date-Leapyear.eml
+%doc LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 1.72-1
+- New upstream release, under new license terms.
+
 * Wed Mar 18 2009 Xavier Bachelot <xavier at bachelot.org> 1.71-2
 - Change License: to GPL+ or Artistic, as agreed by upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 08:51:25 -0000	1.2
+++ sources	2 Apr 2009 19:26:50 -0000	1.3
@@ -1 +1 @@
-ca35097e84896eadf529f7a79f2c2e82  Date-Leapyear-1.71.tar.gz
+bdfe5e8d435d6afcf7103269450e514b  Date-Leapyear-1.72.tar.gz


--- perl-Date-Leapyear-Re-license_Date-Leapyear.eml DELETED ---



From linville at fedoraproject.org  Thu Apr  2 19:29:31 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  2 Apr 2009 19:29:31 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch,
	NONE, 1.1 kernel.spec, 1.1503, 1.1504
Message-ID: <20090402192931.60D3670120@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7411

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
Log Message:
iwl3945: rely on priv->lock to protect priv access

linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch:

--- NEW FILE linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch ---
diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 15:21:05.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 15:22:27.000000000 -0400
@@ -7101,15 +7101,12 @@ static int iwl3945_mac_conf_tx(struct ie
 	priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
 	priv->qos_data.qos_active = 1;
 
-	spin_unlock_irqrestore(&priv->lock, flags);
-
-	mutex_lock(&priv->mutex);
 	if (priv->iw_mode == NL80211_IFTYPE_AP)
 		iwl3945_activate_qos(priv, 1);
 	else if (priv->assoc_id && iwl3945_is_associated(priv))
 		iwl3945_activate_qos(priv, 0);
 
-	mutex_unlock(&priv->mutex);
+	spin_unlock_irqrestore(&priv->lock, flags);
 
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1503
retrieving revision 1.1504
diff -u -r1.1503 -r1.1504
--- kernel.spec	2 Apr 2009 18:28:13 -0000	1.1503
+++ kernel.spec	2 Apr 2009 19:29:01 -0000	1.1504
@@ -654,6 +654,7 @@
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+Patch685: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 
@@ -1253,6 +1254,9 @@
 ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 
+# fix locking in ipw3945 conf_tx callback
+ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1885,6 +1889,9 @@
 
 %changelog
 * Thu Apr 02 2009 John W. Linville <linville at redhat.com>
+- iwl3945: rely on priv->lock to protect priv access
+
+* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
 - back-port iwlwifi rfkill while device down patches
 
 * Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>



From rdieter at fedoraproject.org  Thu Apr  2 19:32:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 19:32:47 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.81,1.82
Message-ID: <20090402193247.901A470120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8334

Modified Files:
	kdepimlibs.spec 
Log Message:
* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- -apidocs noarch (f10+)
- package %_kde4_appsdir/akonadi-kde only once



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kdepimlibs.spec	1 Apr 2009 20:24:11 -0000	1.81
+++ kdepimlibs.spec	2 Apr 2009 19:32:17 -0000	1.82
@@ -1,4 +1,4 @@
-#ifarch noarch
+
 %if 0%{?fedora} > 8
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
@@ -7,9 +7,6 @@
 # files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
 %define apidocs 0
 %endif
-#else
-%define rest 1
-#endif
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
@@ -82,6 +79,9 @@
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -98,9 +98,7 @@
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 # build apidocs
 %if 0%{?apidocs}
@@ -112,7 +110,6 @@
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
@@ -152,7 +149,6 @@
   esac
 done
 popd
-%endif
 
 # install apidocs
 %if 0%{?apidocs}
@@ -170,10 +166,8 @@
 rm -rf %{buildroot}
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
@@ -205,7 +199,6 @@
 %{_kde4_libdir}/KdepimLibs*
 %endif
 %{_kde4_libdir}/gpgmepp/
-%endif
 
 %if 0%{?apidocs}
 %files apidocs
@@ -215,6 +208,10 @@
 
 
 %changelog
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- -apidocs noarch (f10+)
+- package %%_kde4_appsdir/akonadi-kde only once
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From limb at fedoraproject.org  Thu Apr  2 19:33:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  2 Apr 2009 19:33:59 +0000 (UTC)
Subject: rpms/numpy/devel .cvsignore, 1.15, 1.16 numpy.spec, 1.31,
	1.32 sources, 1.15, 1.16
Message-ID: <20090402193359.855FA70120@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8740

Modified Files:
	.cvsignore numpy.spec sources 
Log Message:
1.3.0rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Dec 2008 20:46:27 -0000	1.15
+++ .cvsignore	2 Apr 2009 19:33:29 -0000	1.16
@@ -1 +1 @@
-numpy-1.2.1.tar.gz
+numpy-1.3.0rc1.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- numpy.spec	5 Mar 2009 14:13:32 -0000	1.31
+++ numpy.spec	2 Apr 2009 19:33:29 -0000	1.32
@@ -3,14 +3,14 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.3.0
+Release:        0.rc1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://numeric.scipy.org/
-Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}rc1.tar.gz
 Patch0:         numpy-1.0.1-f2py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +33,7 @@
 this package is a version of f2py that works properly with NumPy.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}rc1
 %patch0 -p1 -b .f2py
 
 %build
@@ -76,6 +76,9 @@
 %endif
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-0.rc1
+- Update to latest upstream.
+
 * Thu Mar 05 2009 Jon Ciesla <limb at jcomserv.net> 1.2.1-3
 - Require python-devel, BZ 488464.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Dec 2008 20:46:27 -0000	1.15
+++ sources	2 Apr 2009 19:33:29 -0000	1.16
@@ -1 +1 @@
-1bc6dbddaf4b48ded8a619c6438fff37  numpy-1.2.1.tar.gz
+20cdddd69594420b0f8556bbc4a27a5a  numpy-1.3.0rc1.tar.gz



From rdieter at fedoraproject.org  Thu Apr  2 19:34:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  2 Apr 2009 19:34:37 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.82,1.83
Message-ID: <20090402193437.7DB5370120@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8927

Modified Files:
	kdepimlibs.spec 
Log Message:
Release++



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdepimlibs.spec	2 Apr 2009 19:32:17 -0000	1.82
+++ kdepimlibs.spec	2 Apr 2009 19:34:07 -0000	1.83
@@ -13,7 +13,7 @@
 
 Name: kdepimlibs
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2



From xavierb at fedoraproject.org  Thu Apr  2 19:38:44 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu,  2 Apr 2009 19:38:44 +0000 (UTC)
Subject: rpms/perl-Date-Leapyear/F-10 perl-Date-Leapyear.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 perl-Date-Leapyear-Re-license_Date-Leapyear.eml, 1.1, NONE
Message-ID: <20090402193844.6DED170120@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Date-Leapyear/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10014/F-10

Modified Files:
	perl-Date-Leapyear.spec sources 
Removed Files:
	perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
Log Message:
1.72, GPL+ or Artistic


Index: perl-Date-Leapyear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/F-10/perl-Date-Leapyear.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Date-Leapyear.spec	20 Mar 2009 10:34:31 -0000	1.1
+++ perl-Date-Leapyear.spec	2 Apr 2009 19:38:14 -0000	1.2
@@ -1,14 +1,11 @@
 Name:           perl-Date-Leapyear
-Version:        1.71
-Release:        2%{?dist}
+Version:        1.72
+Release:        1%{?dist}
 Summary:        Is a particular year a leap year?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Date-Leapyear/
 Source0:        http://www.cpan.org/modules/by-module/Date/Date-Leapyear-%{version}.tar.gz
-# License is currently Artistic in upstream tarball. However upstream has agreed to re-license.
-# See the mail in Source1.
-Source1:        perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -29,8 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m 0644 %{SOURCE1} .
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -46,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README
-%doc perl-Date-Leapyear-Re-license_Date-Leapyear.eml
+%doc LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 1.72-1
+- New upstream release, under new license terms.
+
 * Wed Mar 18 2009 Xavier Bachelot <xavier at bachelot.org> 1.71-2
 - Change License: to GPL+ or Artistic, as agreed by upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:34:31 -0000	1.2
+++ sources	2 Apr 2009 19:38:14 -0000	1.3
@@ -1 +1 @@
-ca35097e84896eadf529f7a79f2c2e82  Date-Leapyear-1.71.tar.gz
+bdfe5e8d435d6afcf7103269450e514b  Date-Leapyear-1.72.tar.gz


--- perl-Date-Leapyear-Re-license_Date-Leapyear.eml DELETED ---



From xavierb at fedoraproject.org  Thu Apr  2 19:38:43 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu,  2 Apr 2009 19:38:43 +0000 (UTC)
Subject: rpms/perl-Date-Leapyear/EL-4 perl-Date-Leapyear.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 perl-Date-Leapyear-Re-license_Date-Leapyear.eml, 1.1, NONE
Message-ID: <20090402193843.D142670120@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Date-Leapyear/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10014/EL-4

Modified Files:
	perl-Date-Leapyear.spec sources 
Removed Files:
	perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
Log Message:
1.72, GPL+ or Artistic


Index: perl-Date-Leapyear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/EL-4/perl-Date-Leapyear.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Date-Leapyear.spec	20 Mar 2009 10:34:30 -0000	1.1
+++ perl-Date-Leapyear.spec	2 Apr 2009 19:38:13 -0000	1.2
@@ -1,14 +1,11 @@
 Name:           perl-Date-Leapyear
-Version:        1.71
-Release:        2%{?dist}
+Version:        1.72
+Release:        1%{?dist}
 Summary:        Is a particular year a leap year?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Date-Leapyear/
 Source0:        http://www.cpan.org/modules/by-module/Date/Date-Leapyear-%{version}.tar.gz
-# License is currently Artistic in upstream tarball. However upstream has agreed to re-license.
-# See the mail in Source1.
-Source1:        perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -29,8 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m 0644 %{SOURCE1} .
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -46,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README
-%doc perl-Date-Leapyear-Re-license_Date-Leapyear.eml
+%doc LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 1.72-1
+- New upstream release, under new license terms.
+
 * Wed Mar 18 2009 Xavier Bachelot <xavier at bachelot.org> 1.71-2
 - Change License: to GPL+ or Artistic, as agreed by upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:34:30 -0000	1.2
+++ sources	2 Apr 2009 19:38:13 -0000	1.3
@@ -1 +1 @@
-ca35097e84896eadf529f7a79f2c2e82  Date-Leapyear-1.71.tar.gz
+bdfe5e8d435d6afcf7103269450e514b  Date-Leapyear-1.72.tar.gz


--- perl-Date-Leapyear-Re-license_Date-Leapyear.eml DELETED ---



From xavierb at fedoraproject.org  Thu Apr  2 19:38:44 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu,  2 Apr 2009 19:38:44 +0000 (UTC)
Subject: rpms/perl-Date-Leapyear/EL-5 perl-Date-Leapyear.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 perl-Date-Leapyear-Re-license_Date-Leapyear.eml, 1.1, NONE
Message-ID: <20090402193844.15FD570120@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Date-Leapyear/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10014/EL-5

Modified Files:
	perl-Date-Leapyear.spec sources 
Removed Files:
	perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
Log Message:
1.72, GPL+ or Artistic


Index: perl-Date-Leapyear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/EL-5/perl-Date-Leapyear.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Date-Leapyear.spec	20 Mar 2009 10:34:31 -0000	1.1
+++ perl-Date-Leapyear.spec	2 Apr 2009 19:38:13 -0000	1.2
@@ -1,14 +1,11 @@
 Name:           perl-Date-Leapyear
-Version:        1.71
-Release:        2%{?dist}
+Version:        1.72
+Release:        1%{?dist}
 Summary:        Is a particular year a leap year?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Date-Leapyear/
 Source0:        http://www.cpan.org/modules/by-module/Date/Date-Leapyear-%{version}.tar.gz
-# License is currently Artistic in upstream tarball. However upstream has agreed to re-license.
-# See the mail in Source1.
-Source1:        perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -29,8 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m 0644 %{SOURCE1} .
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -46,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README
-%doc perl-Date-Leapyear-Re-license_Date-Leapyear.eml
+%doc LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 1.72-1
+- New upstream release, under new license terms.
+
 * Wed Mar 18 2009 Xavier Bachelot <xavier at bachelot.org> 1.71-2
 - Change License: to GPL+ or Artistic, as agreed by upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:34:31 -0000	1.2
+++ sources	2 Apr 2009 19:38:13 -0000	1.3
@@ -1 +1 @@
-ca35097e84896eadf529f7a79f2c2e82  Date-Leapyear-1.71.tar.gz
+bdfe5e8d435d6afcf7103269450e514b  Date-Leapyear-1.72.tar.gz


--- perl-Date-Leapyear-Re-license_Date-Leapyear.eml DELETED ---



From xavierb at fedoraproject.org  Thu Apr  2 19:38:44 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu,  2 Apr 2009 19:38:44 +0000 (UTC)
Subject: rpms/perl-Date-Leapyear/F-9 perl-Date-Leapyear.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 perl-Date-Leapyear-Re-license_Date-Leapyear.eml, 1.1, NONE
Message-ID: <20090402193844.BC03970120@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Date-Leapyear/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10014/F-9

Modified Files:
	perl-Date-Leapyear.spec sources 
Removed Files:
	perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
Log Message:
1.72, GPL+ or Artistic


Index: perl-Date-Leapyear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/F-9/perl-Date-Leapyear.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Date-Leapyear.spec	20 Mar 2009 10:34:31 -0000	1.1
+++ perl-Date-Leapyear.spec	2 Apr 2009 19:38:14 -0000	1.2
@@ -1,14 +1,11 @@
 Name:           perl-Date-Leapyear
-Version:        1.71
-Release:        2%{?dist}
+Version:        1.72
+Release:        1%{?dist}
 Summary:        Is a particular year a leap year?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Date-Leapyear/
 Source0:        http://www.cpan.org/modules/by-module/Date/Date-Leapyear-%{version}.tar.gz
-# License is currently Artistic in upstream tarball. However upstream has agreed to re-license.
-# See the mail in Source1.
-Source1:        perl-Date-Leapyear-Re-license_Date-Leapyear.eml 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -29,8 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m 0644 %{SOURCE1} .
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -46,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README
-%doc perl-Date-Leapyear-Re-license_Date-Leapyear.eml
+%doc LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 1.72-1
+- New upstream release, under new license terms.
+
 * Wed Mar 18 2009 Xavier Bachelot <xavier at bachelot.org> 1.71-2
 - Change License: to GPL+ or Artistic, as agreed by upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:34:31 -0000	1.2
+++ sources	2 Apr 2009 19:38:14 -0000	1.3
@@ -1 +1 @@
-ca35097e84896eadf529f7a79f2c2e82  Date-Leapyear-1.71.tar.gz
+bdfe5e8d435d6afcf7103269450e514b  Date-Leapyear-1.72.tar.gz


--- perl-Date-Leapyear-Re-license_Date-Leapyear.eml DELETED ---



From notting at fedoraproject.org  Thu Apr  2 19:42:06 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  2 Apr 2009 19:42:06 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.162, 1.163 initscripts.spec,
	1.191, 1.192 sources, 1.181, 1.182
Message-ID: <20090402194206.940FE70120@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11152

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.93



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- .cvsignore	2 Apr 2009 17:40:53 -0000	1.162
+++ .cvsignore	2 Apr 2009 19:41:36 -0000	1.163
@@ -1 +1 @@
-initscripts-8.92.tar.bz2
+initscripts-8.93.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- initscripts.spec	2 Apr 2009 17:40:53 -0000	1.191
+++ initscripts.spec	2 Apr 2009 19:41:36 -0000	1.192
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.92
+Version: 8.93
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -249,11 +249,11 @@
 /etc/profile.d/debug*
 
 %changelog
-* Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.92-1
+* Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.93-1
 - rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
 - netfs: drop smbfs support, we don't even ship the module or tools any more
 - setsysfont: honor LC_CTYPE (#487133, <skasal at redhat.com>)
-- prefdm: do fallbackes based on provides of 'service(graphical-login)' (#485751)
+- prefdm: do fallbacks based on provides of 'service(graphical-login)' (#485751)
 - rc.sysinit: handle multiple IP addresses without choking in the stateless code (#443945)
 - rc.sysinit: catch the right error code from checking for passphrases (#483269, <vladis.kletnieks at vt.edu>)
 - prefdm: handle empty /etc/sysconfig/desktop correctly (#480113)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	2 Apr 2009 17:40:53 -0000	1.181
+++ sources	2 Apr 2009 19:41:36 -0000	1.182
@@ -1 +1 @@
-c83e133783603524a34deded6a2b5ecc  initscripts-8.92.tar.bz2
+10f089c83b7b0d0cb4ee3592fcff98dd  initscripts-8.93.tar.bz2



From jortel at fedoraproject.org  Thu Apr  2 19:42:37 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 19:42:37 +0000 (UTC)
Subject: rpms/python-suds/devel python-suds.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <20090402194237.55CC77013C@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11502

Modified Files:
	python-suds.spec sources 
Log Message:
Change BuildRequires: back to python-setuptools-devel.


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/python-suds.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-suds.spec	2 Apr 2009 17:40:22 -0000	1.9
+++ python-suds.spec	2 Apr 2009 19:42:07 -0000	1.10
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: python >= 2.3
-BuildRequires: python-setuptools
+BuildRequires: python-setuptools-devel
 Url: https://fedorahosted.org/suds
 
 %description
@@ -53,7 +53,6 @@
 %changelog
 * Wed Feb 25 2009 jortel <jortel at redhat.com> - 0.3.5-1
 - Adds http caching.  Default is (1) day.
-- Replaced build requires python-setuptools-devel with python-setuptools in the spec.
 - Removed checking fc version in spec since no longer building < fc9.
 - Updated makefile to roll tarball with tar.sh.
 - Moved bare/wrapped determination to wsdl for document/literal.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Apr 2009 17:40:22 -0000	1.8
+++ sources	2 Apr 2009 19:42:07 -0000	1.9
@@ -2,4 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
-54564e2e1cf1103d3f231d15e19081a6  python-suds-0.3.5.tar.gz
+2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz



From notting at fedoraproject.org  Thu Apr  2 19:45:50 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  2 Apr 2009 19:45:50 +0000 (UTC)
Subject: rpms/initscripts/F-10 .cvsignore, 1.158, 1.159 initscripts.spec,
	1.185, 1.186 sources, 1.176, 1.177
Message-ID: <20090402194550.56D0670120@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13197

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.86.2-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/.cvsignore,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- .cvsignore	2 Apr 2009 17:54:02 -0000	1.158
+++ .cvsignore	2 Apr 2009 19:45:19 -0000	1.159
@@ -1 +1 @@
-initscripts-8.86.1.tar.bz2
+initscripts-8.86.2.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/initscripts.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- initscripts.spec	2 Apr 2009 17:54:02 -0000	1.185
+++ initscripts.spec	2 Apr 2009 19:45:19 -0000	1.186
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.86.1
+Version: 8.86.2
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -250,7 +250,7 @@
 /etc/profile.d/debug*
 
 %changelog
-* Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.86.1-1
+* Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.86.2-1
 - rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
 - setsysfont: honor LC_CTYPE (#487133, <skasal at redhat.com>)
 - prefdm: do fallbacks based on provides of 'service(graphical-login)' (#485751)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/sources,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- sources	2 Apr 2009 17:54:02 -0000	1.176
+++ sources	2 Apr 2009 19:45:19 -0000	1.177
@@ -1 +1 @@
-768b1b306565be9a04bed1fdb6748752  initscripts-8.86.1.tar.bz2
+2e5cfb10c089109e21b6cea9030abc37  initscripts-8.86.2.tar.bz2



From limb at fedoraproject.org  Thu Apr  2 19:56:04 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  2 Apr 2009 19:56:04 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle.spec,1.40,1.41
Message-ID: <20090402195604.EDC4970120@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15800/F-10

Modified Files:
	moodle.spec 
Log Message:
Font deps fix.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- moodle.spec	1 Apr 2009 19:55:34 -0000	1.40
+++ moodle.spec	2 Apr 2009 19:55:34 -0000	1.41
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6%{?dist}
+Release:        6.1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -115,7 +115,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 #Requires:	php-magpierss
-Requires:	gnu-free-sans-fonts
+Requires:	freefont
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -747,7 +747,7 @@
 Summary:        Moodle language pack for Khmer
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	khmeros-base-fonts
+Requires:	khmeros-fonts-base
 
 %description    km
 This package contains the files needed to display Moodle in Khmer.
@@ -1114,7 +1114,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-sans-fonts
+Requires:	dejavu-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1273,7 +1273,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-sans-fonts
+Requires:	dejavu-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1530,9 +1530,9 @@
 
 #Symlink to FreeSans, to save space.
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
-ln -s /usr/share/fonts/gnu-free/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 
-#symlink to khmeros-base-fonts
+#symlink to khmeros-fonts-base
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 ln -s /usr/share/fonts/khmeros/KhmerOS_sys.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 
@@ -1694,6 +1694,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6.1
+- Fix broken font deps.
+
 * Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
 - Patch for CVE-2009-1171, BZ 493109.
 



From limb at fedoraproject.org  Thu Apr  2 19:56:05 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  2 Apr 2009 19:56:05 +0000 (UTC)
Subject: rpms/moodle/F-9 moodle.spec,1.31,1.32
Message-ID: <20090402195605.21D3270120@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15800/F-9

Modified Files:
	moodle.spec 
Log Message:
Font deps fix.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-9/moodle.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- moodle.spec	1 Apr 2009 19:55:35 -0000	1.31
+++ moodle.spec	2 Apr 2009 19:55:34 -0000	1.32
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6%{?dist}
+Release:        6.1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -115,7 +115,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 #Requires:	php-magpierss
-Requires:	gnu-free-sans-fonts
+Requires:	freefont
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -747,7 +747,7 @@
 Summary:        Moodle language pack for Khmer
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	khmeros-base-fonts
+Requires:	khmeros-fonts-base
 
 %description    km
 This package contains the files needed to display Moodle in Khmer.
@@ -1114,7 +1114,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-sans-fonts
+Requires:	dejavu-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1273,7 +1273,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
-Requires:	dejavu-sans-fonts
+Requires:	dejavu-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1530,9 +1530,9 @@
 
 #Symlink to FreeSans, to save space.
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
-ln -s /usr/share/fonts/gnu-free/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 
-#symlink to khmeros-base-fonts
+#symlink to khmeros-fonts-base
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 ln -s /usr/share/fonts/khmeros/KhmerOS_sys.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
 
@@ -1694,6 +1694,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6.1
+- Fix broken font deps.
+
 * Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
 - Patch for CVE-2009-1171, BZ 493109.
 



From jortel at fedoraproject.org  Thu Apr  2 20:02:52 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 20:02:52 +0000 (UTC)
Subject: rpms/python-suds push.sh,NONE,1.1
Message-ID: <20090402200252.D45B270120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17588

Added Files:
	push.sh 
Log Message:
Add script to easily update branches from devel


--- NEW FILE push.sh ---
branches="F-9 F-10 EL-4 EL-5"
files="devel/python-suds.spec devel/sources"

echo "Update the branches"

for branch in $branches
do
  echo "update branch $branch"
  cp -v $files $branch
done

echo "Commit updates in branches"

cvs commit

echo "Tag branches"

for branch in $branches
do
  echo "tagging branch $branch"
  cd $branch
  make tag
  cd ../
done

echo "Build branches"

for branch in $branches
do
  echo "building branch $branch"
  cd $branch
  make build
  cd ../
done



From jortel at fedoraproject.org  Thu Apr  2 20:03:23 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 20:03:23 +0000 (UTC)
Subject: rpms/python-suds/EL-4 python-suds.spec,1.4,1.5
Message-ID: <20090402200323.121AC70120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17588/EL-4

Modified Files:
	python-suds.spec 
Log Message:
Add script to easily update branches from devel


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-4/python-suds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-suds.spec	25 Feb 2009 20:13:45 -0000	1.4
+++ python-suds.spec	2 Apr 2009 20:02:52 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: A python SOAP client
 Name:  python-suds
 Version: 0.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
 Group: Development/Libraries
@@ -40,21 +40,13 @@
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?fedora} >= 8
-%{python_sitelib}/suds*.egg-info
-%endif
 %dir %{python_sitelib}/suds
-%dir %{python_sitelib}/suds/bindings
-%dir %{python_sitelib}/suds/sax
-%dir %{python_sitelib}/suds/xsd
-%{python_sitelib}/suds/*.py*
-%{python_sitelib}/suds/bindings/*.py*
-%{python_sitelib}/suds/sax/*.py*
-%{python_sitelib}/suds/xsd/*.py*
-
 %doc README LICENSE
 
 %changelog
+* Mon Mar 13 2009 jortel <jortel at redhat.com> - 0.3.4-2
+- Remove extra directory breakdown from (files) section.
+
 * Mon Dec 08 2008 jortel <jortel at redhat.com> - 0.3.4-1
 - Static (automatic) Import.bind('http://schemas.xmlsoap.org/soap/encoding/')
 - Basic ws-security with {{{UsernameToken}}} and clear-text password only.



From jortel at fedoraproject.org  Thu Apr  2 20:05:15 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 20:05:15 +0000 (UTC)
Subject: rpms/python-suds/EL-4 python-suds.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090402200515.0CED870120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17944/EL-4

Modified Files:
	python-suds.spec sources 
Log Message:
Release version 0.3.5



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-4/python-suds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-suds.spec	2 Apr 2009 20:02:52 -0000	1.5
+++ python-suds.spec	2 Apr 2009 20:04:44 -0000	1.6
@@ -2,19 +2,15 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.4
-Release: 2%{?dist}
+Version: 0.3.5
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: python >= 2.3
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 Url: https://fedorahosted.org/suds
 
 %description
@@ -40,12 +36,28 @@
 
 %files
 %defattr(-,root,root,-)
+%{python_sitelib}/suds*.egg-info
 %dir %{python_sitelib}/suds
+%dir %{python_sitelib}/suds/bindings
+%dir %{python_sitelib}/suds/sax
+%dir %{python_sitelib}/suds/xsd
+%dir %{python_sitelib}/suds/transport
+%{python_sitelib}/suds/*.py*
+%{python_sitelib}/suds/bindings/*.py*
+%{python_sitelib}/suds/sax/*.py*
+%{python_sitelib}/suds/xsd/*.py*
+%{python_sitelib}/suds/transport/*.py*
+
 %doc README LICENSE
 
 %changelog
-* Mon Mar 13 2009 jortel <jortel at redhat.com> - 0.3.4-2
-- Remove extra directory breakdown from (files) section.
+* Wed Feb 25 2009 jortel <jortel at redhat.com> - 0.3.5-1
+- Adds http caching.  Default is (1) day.
+- Removed checking fc version in spec since no longer building < fc9.
+- Updated makefile to roll tarball with tar.sh.
+- Moved bare/wrapped determination to wsdl for document/literal.
+- Refactored Transport to provide better visibility into http headers.
+- Fixed Tickets: #207, #207, #209, #210, #212, #214, #215
 
 * Mon Dec 08 2008 jortel <jortel at redhat.com> - 0.3.4-1
 - Static (automatic) Import.bind('http://schemas.xmlsoap.org/soap/encoding/')


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Feb 2009 20:13:45 -0000	1.5
+++ sources	2 Apr 2009 20:04:44 -0000	1.6
@@ -2,3 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
+2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz



From jortel at fedoraproject.org  Thu Apr  2 20:05:15 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 20:05:15 +0000 (UTC)
Subject: rpms/python-suds/EL-5 python-suds.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20090402200515.2D5397013C@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17944/EL-5

Modified Files:
	python-suds.spec sources 
Log Message:
Release version 0.3.5



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-5/python-suds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-suds.spec	25 Feb 2009 20:13:45 -0000	1.4
+++ python-suds.spec	2 Apr 2009 20:04:44 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.4
+Version: 0.3.5
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -10,11 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: python >= 2.3
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 Url: https://fedorahosted.org/suds
 
 %description
@@ -40,21 +36,29 @@
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?fedora} >= 8
 %{python_sitelib}/suds*.egg-info
-%endif
 %dir %{python_sitelib}/suds
 %dir %{python_sitelib}/suds/bindings
 %dir %{python_sitelib}/suds/sax
 %dir %{python_sitelib}/suds/xsd
+%dir %{python_sitelib}/suds/transport
 %{python_sitelib}/suds/*.py*
 %{python_sitelib}/suds/bindings/*.py*
 %{python_sitelib}/suds/sax/*.py*
 %{python_sitelib}/suds/xsd/*.py*
+%{python_sitelib}/suds/transport/*.py*
 
 %doc README LICENSE
 
 %changelog
+* Wed Feb 25 2009 jortel <jortel at redhat.com> - 0.3.5-1
+- Adds http caching.  Default is (1) day.
+- Removed checking fc version in spec since no longer building < fc9.
+- Updated makefile to roll tarball with tar.sh.
+- Moved bare/wrapped determination to wsdl for document/literal.
+- Refactored Transport to provide better visibility into http headers.
+- Fixed Tickets: #207, #207, #209, #210, #212, #214, #215
+
 * Mon Dec 08 2008 jortel <jortel at redhat.com> - 0.3.4-1
 - Static (automatic) Import.bind('http://schemas.xmlsoap.org/soap/encoding/')
 - Basic ws-security with {{{UsernameToken}}} and clear-text password only.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Feb 2009 20:13:45 -0000	1.5
+++ sources	2 Apr 2009 20:04:44 -0000	1.6
@@ -2,3 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
+2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz



From jortel at fedoraproject.org  Thu Apr  2 20:05:15 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 20:05:15 +0000 (UTC)
Subject: rpms/python-suds/F-10 python-suds.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20090402200515.6603270120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17944/F-10

Modified Files:
	python-suds.spec sources 
Log Message:
Release version 0.3.5



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-10/python-suds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-suds.spec	25 Feb 2009 20:13:45 -0000	1.4
+++ python-suds.spec	2 Apr 2009 20:04:45 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.4
+Version: 0.3.5
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -10,11 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: python >= 2.3
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 Url: https://fedorahosted.org/suds
 
 %description
@@ -40,21 +36,29 @@
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?fedora} >= 8
 %{python_sitelib}/suds*.egg-info
-%endif
 %dir %{python_sitelib}/suds
 %dir %{python_sitelib}/suds/bindings
 %dir %{python_sitelib}/suds/sax
 %dir %{python_sitelib}/suds/xsd
+%dir %{python_sitelib}/suds/transport
 %{python_sitelib}/suds/*.py*
 %{python_sitelib}/suds/bindings/*.py*
 %{python_sitelib}/suds/sax/*.py*
 %{python_sitelib}/suds/xsd/*.py*
+%{python_sitelib}/suds/transport/*.py*
 
 %doc README LICENSE
 
 %changelog
+* Wed Feb 25 2009 jortel <jortel at redhat.com> - 0.3.5-1
+- Adds http caching.  Default is (1) day.
+- Removed checking fc version in spec since no longer building < fc9.
+- Updated makefile to roll tarball with tar.sh.
+- Moved bare/wrapped determination to wsdl for document/literal.
+- Refactored Transport to provide better visibility into http headers.
+- Fixed Tickets: #207, #207, #209, #210, #212, #214, #215
+
 * Mon Dec 08 2008 jortel <jortel at redhat.com> - 0.3.4-1
 - Static (automatic) Import.bind('http://schemas.xmlsoap.org/soap/encoding/')
 - Basic ws-security with {{{UsernameToken}}} and clear-text password only.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Feb 2009 20:13:45 -0000	1.5
+++ sources	2 Apr 2009 20:04:45 -0000	1.6
@@ -2,3 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
+2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz



From jortel at fedoraproject.org  Thu Apr  2 20:05:15 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu,  2 Apr 2009 20:05:15 +0000 (UTC)
Subject: rpms/python-suds/F-9 python-suds.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20090402200515.A934370120@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17944/F-9

Modified Files:
	python-suds.spec sources 
Log Message:
Release version 0.3.5



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-9/python-suds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-suds.spec	25 Feb 2009 20:13:46 -0000	1.4
+++ python-suds.spec	2 Apr 2009 20:04:45 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.4
+Version: 0.3.5
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -10,11 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: python >= 2.3
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 Url: https://fedorahosted.org/suds
 
 %description
@@ -40,21 +36,29 @@
 
 %files
 %defattr(-,root,root,-)
-%if 0%{?fedora} >= 8
 %{python_sitelib}/suds*.egg-info
-%endif
 %dir %{python_sitelib}/suds
 %dir %{python_sitelib}/suds/bindings
 %dir %{python_sitelib}/suds/sax
 %dir %{python_sitelib}/suds/xsd
+%dir %{python_sitelib}/suds/transport
 %{python_sitelib}/suds/*.py*
 %{python_sitelib}/suds/bindings/*.py*
 %{python_sitelib}/suds/sax/*.py*
 %{python_sitelib}/suds/xsd/*.py*
+%{python_sitelib}/suds/transport/*.py*
 
 %doc README LICENSE
 
 %changelog
+* Wed Feb 25 2009 jortel <jortel at redhat.com> - 0.3.5-1
+- Adds http caching.  Default is (1) day.
+- Removed checking fc version in spec since no longer building < fc9.
+- Updated makefile to roll tarball with tar.sh.
+- Moved bare/wrapped determination to wsdl for document/literal.
+- Refactored Transport to provide better visibility into http headers.
+- Fixed Tickets: #207, #207, #209, #210, #212, #214, #215
+
 * Mon Dec 08 2008 jortel <jortel at redhat.com> - 0.3.4-1
 - Static (automatic) Import.bind('http://schemas.xmlsoap.org/soap/encoding/')
 - Basic ws-security with {{{UsernameToken}}} and clear-text password only.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Feb 2009 20:13:46 -0000	1.5
+++ sources	2 Apr 2009 20:04:45 -0000	1.6
@@ -2,3 +2,4 @@
 a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
 79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
+2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz



From jwrdegoede at fedoraproject.org  Thu Apr  2 20:07:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  2 Apr 2009 20:07:32 +0000 (UTC)
Subject: rpms/python-pyblock/devel .cvsignore, 1.40, 1.41 python-pyblock.spec,
	1.65, 1.66 sources, 1.43, 1.44
Message-ID: <20090402200732.B11CC70120@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18931

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
* Thu Apr  2 2009 Hans de Goede <hdegoede at redhat.com> - 0.42-1
- Create assertion function to return PyErrors (jgranados)
- Do a thorough search for the Raid Sets (jgranados)
- RaidSet.level is broken atm (hansg)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	19 Mar 2009 10:13:07 -0000	1.40
+++ .cvsignore	2 Apr 2009 20:07:02 -0000	1.41
@@ -1 +1 @@
-pyblock-0.41.tar.bz2
+pyblock-0.42.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- python-pyblock.spec	19 Mar 2009 10:13:08 -0000	1.65
+++ python-pyblock.spec	2 Apr 2009 20:07:02 -0000	1.66
@@ -5,7 +5,7 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.41
+Version: 0.42
 Release: 1%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
@@ -43,6 +43,11 @@
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Thu Apr  2 2009 Hans de Goede <hdegoede at redhat.com> - 0.42-1
+- Create assertion function to return PyErrors (jgranados)
+- Do a thorough search for the Raid Sets (jgranados)
+- RaidSet.level is broken atm (hansg)
+
 * Thu Mar 19 2009 Joel Granados <jgranado at redhat.com> - 0.41-1
 - Make build/tagging easier (jgranados).
 - Do not try to find and activate partitions on raid subsets (hansg).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	19 Mar 2009 10:13:08 -0000	1.43
+++ sources	2 Apr 2009 20:07:02 -0000	1.44
@@ -1 +1 @@
-06b198bba8819d1a852996f3222c91c6  pyblock-0.41.tar.bz2
+6500aeb42b1f53432204291e8626cd57  pyblock-0.42.tar.bz2



From kzak at fedoraproject.org  Thu Apr  2 20:25:56 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Thu,  2 Apr 2009 20:25:56 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.44,1.45
Message-ID: <20090402202556.DA0FD70120@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23644

Modified Files:
	util-linux-ng.spec 
Log Message:
* Thu Apr  2 2009 Karel Zak <kzak at redhat.com> 2.14.2-8
- fix #490769 - %post scriptlet failed (thanks to Dan Horak)
 
* Fri Mar 20 2009 Karel Zak <kzak at redhat.com> 2.14.2-7
- fix some nits in mount.tmpfs



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- util-linux-ng.spec	20 Mar 2009 09:13:48 -0000	1.44
+++ util-linux-ng.spec	2 Apr 2009 20:25:26 -0000	1.45
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -331,7 +331,7 @@
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/ipc.info %{_infodir}/dir
+/sbin/install-info %{_infodir}/ipc.info %{_infodir}/dir || :
 # only for minimal buildroots without /var/log
 [ -d /var/log ] || /bin/mkdir -p /var/log
 /bin/touch /var/log/lastlog
@@ -345,13 +345,13 @@
 		# without selinux stuff on host machine with enabled selinux.
 		# We don't want to use any RPM dependence on selinux policy for
 		# matchpathcon(2). SELinux policy should be optional.
-		/usr/bin/chcon "$SECXT"  /var/log/lastlog >/dev/null 2>&1
+		/usr/bin/chcon "$SECXT"  /var/log/lastlog >/dev/null 2>&1 || :
 	fi
 fi
 
 %preun
 if [ "$1" = 0 ]; then
-	/sbin/install-info --del %{_infodir}/ipc.info %{_infodir}/dir
+	/sbin/install-info --del %{_infodir}/ipc.info %{_infodir}/dir || :
 fi
 exit 0
 
@@ -544,13 +544,16 @@
 /sbin/losetup
 
 %changelog
-* Fri Mar 20 2009 Karel Zak <kzak at redhat.com>  2.14.2-7
+* Thu Apr  2 2009 Karel Zak <kzak at redhat.com> 2.14.2-8
+- fix #490769 - %post scriptlet failed (thanks to Dan Horak)
+ 
+* Fri Mar 20 2009 Karel Zak <kzak at redhat.com> 2.14.2-7
 - fix some nits in mount.tmpfs
 
-* Fri Mar 20 2009 Karel Zak <kzak at redhat.com>  2.14.2-6
+* Fri Mar 20 2009 Karel Zak <kzak at redhat.com> 2.14.2-6
 - fix #491175 - mount of tmpfs FSs fail at boot
 
-* Thu Mar 19 2009 Karel Zak <kzak at redhat.com>  2.14.2-5
+* Thu Mar 19 2009 Karel Zak <kzak at redhat.com> 2.14.2-5
 - fix #489672 - flock segfaults when file name is not given (upstream)
 - fix #476964 - Mount /var/tmp with tmpfs creates denials
 - fix #487227 - fdisk 4KiB hw sectors support (upstream)



From limb at fedoraproject.org  Thu Apr  2 20:31:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  2 Apr 2009 20:31:55 +0000 (UTC)
Subject: rpms/moodle/EL-4 moodle-1.8.8-CVE-2009-1171-1.patch, NONE,
	1.1 moodle-1.8.8-CVE-2009-1171-2.patch, NONE, 1.1 moodle.spec,
	1.20, 1.21
Message-ID: <20090402203156.0213370120@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25333/EL-4

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.8.8-CVE-2009-1171-1.patch 
	moodle-1.8.8-CVE-2009-1171-2.patch 
Log Message:
CVE-2009-1171


moodle-1.8.8-CVE-2009-1171-1.patch:

--- NEW FILE moodle-1.8.8-CVE-2009-1171-1.patch ---
--- filter/tex/filter.php.orig	2009/02/17 05:24:35	1.18.4.4
+++ filter/tex/filter.php	2009/03/26 19:06:29	1.18.4.5
@@ -120,6 +120,16 @@
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
+    // TeX blacklist. MDL-18552
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -155,6 +165,19 @@
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
+        $invalidcommands = array();
+        foreach($tex_blacklist as $command) {
+            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
+                $invalidcommands[] = $command;
+            }
+        }
+        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
+            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
+            $text = str_replace( $matches[0][$i], $invalidstr, $text);
+            continue;
+        }
+    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';

moodle-1.8.8-CVE-2009-1171-2.patch:

--- NEW FILE moodle-1.8.8-CVE-2009-1171-2.patch ---
--- filter/algebra/algebradebug.php
+++ filter/algebra/algebradebug.php
@@ -16,6 +16,8 @@
         }
     }
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->algebrafilterdir = "filter/algebra";
     $CFG->algebraimagedir = "filter/algebra";
@@ -233,6 +235,7 @@ function tex2image($texexp, $md5, $return=false) {
         } 
         $commandpath = "";
         $cmd = "";
+        $texexp = tex_sanitize_formula($texexp);
         $texexp = escapeshellarg($texexp);
         switch (PHP_OS) {
             case "Linux":
--- filter/algebra/pix.php
+++ filter/algebra/pix.php
@@ -19,6 +19,7 @@
     // disable moodle specific debug messages
     disable_debugging();
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
     require_once($CFG->libdir.'/filelib.php');
 
     $CFG->texfilterdir     = 'filter/tex';
@@ -54,6 +55,7 @@
             $texexp = str_replace('&gt;','>',$texexp);
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
+            $texexp = tex_sanitize_formula($texexp);
             $texexp = escapeshellarg($texexp);
 
             if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
--- filter/tex/filter.php
+++ filter/tex/filter.php
@@ -118,16 +118,6 @@ function tex_filter ($courseid, $text) {
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
-    // TeX blacklist. MDL-18552
-    $tex_blacklist = array(
-        'include','def','command','loop','repeat','open','toks','output',
-        'input','catcode','name','^^',
-        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
-        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
-        '\lowercase','\relax','\aftergroup',
-        '\afterassignment','\expandafter','\noexpand','\special'
-    );
-
     // <tex> TeX expression </tex>
     // or $$ TeX expression $$
     // or \[ TeX expression \]          // original tag of MathType and TeXaide (dlnsk)
@@ -148,19 +138,6 @@ function tex_filter ($courseid, $text) {
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
-    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
-        $invalidcommands = array();
-        foreach($tex_blacklist as $command) {
-            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
-                $invalidcommands[] = $command;
-            }
-        }
-        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
-            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
-            $text = str_replace( $matches[0][$i], $invalidstr, $text);
-            continue;
-        }
-    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';
--- filter/tex/latex.php
+++ filter/tex/latex.php
@@ -44,9 +44,11 @@
          * @return string the latex document
          */
         function construct_latex_document( $formula, $fontsize=12 ) {
-            // $fontsize don't affects to formula's size. $density can change size
-
             global $CFG;
+
+            $formula = tex_sanitize_formula($formula);
+
+            // $fontsize don't affects to formula's size. $density can change size
             $doc =  "\\documentclass[{$fontsize}pt]{article}\n"; 
             $doc .=  $CFG->filter_tex_latexpreamble;
             $doc .= "\\pagestyle{empty}\n";
--- /dev/null
+++ filter/tex/lib.php
@@ -0,0 +1,37 @@
+<?php  //$Id$
+
+function tex_sanitize_formula($texexp) {
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain)
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
+    return  str_ireplace($tex_blacklist, 'forbiddenkeyword', $texexp);
+}
+
+/**
+ * Purge all caches when settings changed.
+ */
+function filter_tex_updatedcallback($name) {
+    global $CFG;
+
+    if (file_exists("$CFG->dataroot/filter/tex")) {
+        remove_dir("$CFG->dataroot/filter/tex");
+    }
+    if (file_exists("$CFG->dataroot/filter/algebra")) {
+        remove_dir("$CFG->dataroot/filter/algebra");
+    }
+    if (file_exists("$CFG->dataroot/temp/latex")) {
+        remove_dir("$CFG->dataroot/temp/latex");
+    }
+
+    delete_records('cache_filters', 'filter', 'tex');
+    delete_records('cache_filters', 'filter', 'algebra');
+}
+
+?>
\ No newline at end of file
--- filter/tex/pix.php
+++ filter/tex/pix.php
@@ -20,8 +20,9 @@
     disable_debugging();
 
     require_once($CFG->libdir.'/filelib.php');
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+    require_once($CFG->dirroot.'/filter/tex/latex.php');
     require_once('defaultsettings.php' );
-    require_once('latex.php');
 
     $CFG->texfilterdir = 'filter/tex';
     $CFG->teximagedir  = 'filter/tex';
@@ -69,6 +70,7 @@
                 $texexp = str_replace('&gt;','>',$texexp);
                 $texexp = preg_replace('!\r\n?!',' ',$texexp);
                 $texexp = '\Large ' . $texexp;
+                $texexp = tex_sanitize_formula($texexp);
                 $texexp = escapeshellarg($texexp);
 
                 if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
--- filter/tex/texdebug.php
+++ filter/tex/texdebug.php
@@ -4,7 +4,6 @@
       // and uses mimeTeX to create the image file
 
     require_once("../../config.php");
-    require( 'latex.php' );
 
     if (empty($CFG->textfilters)) {
         error ('Filter not enabled!');
@@ -15,6 +14,9 @@
         }
     }
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+    require_once($CFG->dirroot.'/filter/tex/latex.php');
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->teximagedir = "filter/tex";
  
@@ -141,6 +143,7 @@
             }
             $commandpath = "";
             $cmd = "";
+            $texexp = tex_sanitize_formula($texexp);
             $texexp = escapeshellarg($texexp);
             switch (PHP_OS) {
                 case "Linux":
--- filter/tex/texed.php
+++ filter/tex/texed.php
@@ -6,6 +6,7 @@
     $nomoodlecookie = true;     // Because it interferes with caching
 
     require_once("../../config.php");
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
 
     if (empty($CFG->textfilters)) {
         error ('Filter not enabled!');
@@ -32,6 +33,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
+        $texexp = tex_sanitize_formula($texexp);
         $texexp = escapeshellarg($texexp);
 
         switch (PHP_OS) {
--- lib/db/upgrade.php
+++ lib/db/upgrade.php
@@ -775,6 +775,11 @@ function xmldb_main_upgrade($oldversion=0) {
         $db->debug = true;
     }
 
+    if ($result && $oldversion < 2007021581) {
+        require_once("$CFG->dirroot/filter/tex/lib.php");
+        filter_tex_updatedcallback(null);
+    }
+
     return $result;
 
 }
--- version.php
+++ version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2007021580;   // YYYYMMDD   = date of the 1.8 branch (don't change)
+   $version = 2007021581;   // YYYYMMDD   = date of the 1.8 branch (don't change)
                             //         X  = release number 1.8.[0,1,2,3...]
                             //          Y = micro-increments between releases
 


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-4/moodle.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- moodle.spec	23 Feb 2009 19:04:04 -0000	1.20
+++ moodle.spec	2 Apr 2009 20:31:25 -0000	1.21
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 %define moodlewebdir %{_var}/www/moodle/web
 %define moodledatadir %{_var}/www/moodle/data
 
@@ -7,7 +8,7 @@
 
 Name:           moodle
 Version:        1.8.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -102,6 +103,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+Patch0:		moodle-1.8.8-CVE-2009-1171-1.patch
+Patch1:		moodle-1.8.8-CVE-2009-1171-2.patch
+
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
 Requires:       perl(Encode) perl(Text::Aspell) perl(HTML::Parser) php
@@ -1470,6 +1474,9 @@
 sed -i 's/\r//' mod/wiki/ewiki/README
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
+%patch0 -p0
+%patch1 -p0
+
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
 
@@ -1652,6 +1659,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-3
+- Patch for CVE-2009-1171, BZ 493109.
+
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-2
 - Fixed cron.
 



From limb at fedoraproject.org  Thu Apr  2 20:31:56 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  2 Apr 2009 20:31:56 +0000 (UTC)
Subject: rpms/moodle/EL-5 moodle-1.8.8-CVE-2009-1171-1.patch, NONE,
	1.1 moodle-1.8.8-CVE-2009-1171-2.patch, NONE, 1.1 moodle.spec,
	1.19, 1.20
Message-ID: <20090402203156.48E2E70120@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25333/EL-5

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.8.8-CVE-2009-1171-1.patch 
	moodle-1.8.8-CVE-2009-1171-2.patch 
Log Message:
CVE-2009-1171


moodle-1.8.8-CVE-2009-1171-1.patch:

--- NEW FILE moodle-1.8.8-CVE-2009-1171-1.patch ---
--- filter/tex/filter.php.orig	2009/02/17 05:24:35	1.18.4.4
+++ filter/tex/filter.php	2009/03/26 19:06:29	1.18.4.5
@@ -120,6 +120,16 @@
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
+    // TeX blacklist. MDL-18552
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
     // <tex> TeX expression </tex>
     // or <tex alt="My alternative text to be used instead of the TeX form"> TeX expression </tex>
     // or $$ TeX expression $$
@@ -155,6 +165,19 @@
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
+        $invalidcommands = array();
+        foreach($tex_blacklist as $command) {
+            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
+                $invalidcommands[] = $command;
+            }
+        }
+        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
+            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
+            $text = str_replace( $matches[0][$i], $invalidstr, $text);
+            continue;
+        }
+    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';

moodle-1.8.8-CVE-2009-1171-2.patch:

--- NEW FILE moodle-1.8.8-CVE-2009-1171-2.patch ---
--- filter/algebra/algebradebug.php
+++ filter/algebra/algebradebug.php
@@ -16,6 +16,8 @@
         }
     }
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->algebrafilterdir = "filter/algebra";
     $CFG->algebraimagedir = "filter/algebra";
@@ -233,6 +235,7 @@ function tex2image($texexp, $md5, $return=false) {
         } 
         $commandpath = "";
         $cmd = "";
+        $texexp = tex_sanitize_formula($texexp);
         $texexp = escapeshellarg($texexp);
         switch (PHP_OS) {
             case "Linux":
--- filter/algebra/pix.php
+++ filter/algebra/pix.php
@@ -19,6 +19,7 @@
     // disable moodle specific debug messages
     disable_debugging();
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
     require_once($CFG->libdir.'/filelib.php');
 
     $CFG->texfilterdir     = 'filter/tex';
@@ -54,6 +55,7 @@
             $texexp = str_replace('&gt;','>',$texexp);
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
+            $texexp = tex_sanitize_formula($texexp);
             $texexp = escapeshellarg($texexp);
 
             if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
--- filter/tex/filter.php
+++ filter/tex/filter.php
@@ -118,16 +118,6 @@ function tex_filter ($courseid, $text) {
         $text = str_replace($matches[0][$i],$replacement,$text);
     }
 
-    // TeX blacklist. MDL-18552
-    $tex_blacklist = array(
-        'include','def','command','loop','repeat','open','toks','output',
-        'input','catcode','name','^^',
-        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
-        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
-        '\lowercase','\relax','\aftergroup',
-        '\afterassignment','\expandafter','\noexpand','\special'
-    );
-
     // <tex> TeX expression </tex>
     // or $$ TeX expression $$
     // or \[ TeX expression \]          // original tag of MathType and TeXaide (dlnsk)
@@ -148,19 +138,6 @@ function tex_filter ($courseid, $text) {
           $align = "text-top";
           $texexp = preg_replace('/^align=top /','',$texexp);
         }
-    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain). MDL-18552
-        $invalidcommands = array();
-        foreach($tex_blacklist as $command) {
-            if (stristr($texexp, $command)) { /// Found invalid command. Annotate.
-                $invalidcommands[] = $command;
-            }
-        }
-        if (!empty($invalidcommands)) { /// Invalid commands found. Output error and continue with next TeX element
-            $invalidstr = get_string('invalidtexcommand', 'error', implode(', ', $invalidcommands));
-            $text = str_replace( $matches[0][$i], $invalidstr, $text);
-            continue;
-        }
-    /// Everything is ok, let's process the expression
         $md5 = md5($texexp);
         if (! $texcache = get_record("cache_filters","filter","tex", "md5key", $md5)) {
             $texcache->filter = 'tex';
--- filter/tex/latex.php
+++ filter/tex/latex.php
@@ -44,9 +44,11 @@
          * @return string the latex document
          */
         function construct_latex_document( $formula, $fontsize=12 ) {
-            // $fontsize don't affects to formula's size. $density can change size
-
             global $CFG;
+
+            $formula = tex_sanitize_formula($formula);
+
+            // $fontsize don't affects to formula's size. $density can change size
             $doc =  "\\documentclass[{$fontsize}pt]{article}\n"; 
             $doc .=  $CFG->filter_tex_latexpreamble;
             $doc .= "\\pagestyle{empty}\n";
--- /dev/null
+++ filter/tex/lib.php
@@ -0,0 +1,37 @@
+<?php  //$Id$
+
+function tex_sanitize_formula($texexp) {
+    /// Check $texexp against blacklist (whitelisting could be more complete but also harder to maintain)
+    $tex_blacklist = array(
+        'include','def','command','loop','repeat','open','toks','output',
+        'input','catcode','name','^^',
+        '\every','\errhelp','\errorstopmode','\scrollmode','\nonstopmode',
+        '\batchmode','\read','\write','csname','\newhelp','\uppercase',
+        '\lowercase','\relax','\aftergroup',
+        '\afterassignment','\expandafter','\noexpand','\special'
+    );
+
+    return  str_ireplace($tex_blacklist, 'forbiddenkeyword', $texexp);
+}
+
+/**
+ * Purge all caches when settings changed.
+ */
+function filter_tex_updatedcallback($name) {
+    global $CFG;
+
+    if (file_exists("$CFG->dataroot/filter/tex")) {
+        remove_dir("$CFG->dataroot/filter/tex");
+    }
+    if (file_exists("$CFG->dataroot/filter/algebra")) {
+        remove_dir("$CFG->dataroot/filter/algebra");
+    }
+    if (file_exists("$CFG->dataroot/temp/latex")) {
+        remove_dir("$CFG->dataroot/temp/latex");
+    }
+
+    delete_records('cache_filters', 'filter', 'tex');
+    delete_records('cache_filters', 'filter', 'algebra');
+}
+
+?>
\ No newline at end of file
--- filter/tex/pix.php
+++ filter/tex/pix.php
@@ -20,8 +20,9 @@
     disable_debugging();
 
     require_once($CFG->libdir.'/filelib.php');
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+    require_once($CFG->dirroot.'/filter/tex/latex.php');
     require_once('defaultsettings.php' );
-    require_once('latex.php');
 
     $CFG->texfilterdir = 'filter/tex';
     $CFG->teximagedir  = 'filter/tex';
@@ -69,6 +70,7 @@
                 $texexp = str_replace('&gt;','>',$texexp);
                 $texexp = preg_replace('!\r\n?!',' ',$texexp);
                 $texexp = '\Large ' . $texexp;
+                $texexp = tex_sanitize_formula($texexp);
                 $texexp = escapeshellarg($texexp);
 
                 if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
--- filter/tex/texdebug.php
+++ filter/tex/texdebug.php
@@ -4,7 +4,6 @@
       // and uses mimeTeX to create the image file
 
     require_once("../../config.php");
-    require( 'latex.php' );
 
     if (empty($CFG->textfilters)) {
         error ('Filter not enabled!');
@@ -15,6 +14,9 @@
         }
     }
 
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
+    require_once($CFG->dirroot.'/filter/tex/latex.php');
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->teximagedir = "filter/tex";
  
@@ -141,6 +143,7 @@
             }
             $commandpath = "";
             $cmd = "";
+            $texexp = tex_sanitize_formula($texexp);
             $texexp = escapeshellarg($texexp);
             switch (PHP_OS) {
                 case "Linux":
--- filter/tex/texed.php
+++ filter/tex/texed.php
@@ -6,6 +6,7 @@
     $nomoodlecookie = true;     // Because it interferes with caching
 
     require_once("../../config.php");
+    require_once($CFG->dirroot.'/filter/tex/lib.php');
 
     if (empty($CFG->textfilters)) {
         error ('Filter not enabled!');
@@ -32,6 +33,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
+        $texexp = tex_sanitize_formula($texexp);
         $texexp = escapeshellarg($texexp);
 
         switch (PHP_OS) {
--- lib/db/upgrade.php
+++ lib/db/upgrade.php
@@ -775,6 +775,11 @@ function xmldb_main_upgrade($oldversion=0) {
         $db->debug = true;
     }
 
+    if ($result && $oldversion < 2007021581) {
+        require_once("$CFG->dirroot/filter/tex/lib.php");
+        filter_tex_updatedcallback(null);
+    }
+
     return $result;
 
 }
--- version.php
+++ version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2007021580;   // YYYYMMDD   = date of the 1.8 branch (don't change)
+   $version = 2007021581;   // YYYYMMDD   = date of the 1.8 branch (don't change)
                             //         X  = release number 1.8.[0,1,2,3...]
                             //          Y = micro-increments between releases
 


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-5/moodle.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- moodle.spec	23 Feb 2009 19:04:04 -0000	1.19
+++ moodle.spec	2 Apr 2009 20:31:25 -0000	1.20
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 %define moodlewebdir %{_var}/www/moodle/web
 %define moodledatadir %{_var}/www/moodle/data
 
@@ -7,7 +8,7 @@
 
 Name:           moodle
 Version:        1.8.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -102,6 +103,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+Patch0:		moodle-1.8.8-CVE-2009-1171-1.patch
+Patch1:		moodle-1.8.8-CVE-2009-1171-2.patch
+
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
 Requires:       perl(Encode) perl(Text::Aspell) perl(HTML::Parser) php
@@ -1470,6 +1474,9 @@
 sed -i 's/\r//' mod/wiki/ewiki/README
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
+%patch0 -p0
+%patch1 -p0
+
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
 
@@ -1652,6 +1659,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-3
+- Patch for CVE-2009-1171, BZ 493109.
+
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-2
 - Fixed cron.
 



From mschwendt at fedoraproject.org  Thu Apr  2 20:46:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  2 Apr 2009 20:46:56 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.24,1.25
Message-ID: <20090402204656.88EDA70120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26777

Modified Files:
	rc-modified 
Log Message:
Add --rawhidehack option (off by default) to handle i386->i586 updates
in Rawhide (Fedora 11 Development) and 3rd party repos.

Yes, it's a hack, as a hot-fix was necessary for a 3rd party repo.
Theory of operation is as follows. We still need to resolve deps for i386
packages, but i386 packages must not satisfy a dependency if there is a
newer i586 build of the package. And we must not examine an i386 build of
a package if it has an i586 update. In other words, we need to ignore all
i386 packages that have i586 updates. There are many ways to do
it,... probably even an elegant solution somewhere in the Yum API.




Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rc-modified	7 Dec 2008 09:52:30 -0000	1.24
+++ rc-modified	2 Apr 2009 20:46:56 -0000	1.25
@@ -59,6 +59,8 @@
                       help="check only the newest packages in the repos")
     parser.add_option("", "--nomultilibhack", default=False, action="store_true",
                       help="disable multi-lib hack")
+    parser.add_option("", "--rawhidehack", default=False, action="store_true",
+                      help="Fedora 11 does i386->i586 updates")
     (opts, args) = parser.parse_args()
     return (opts, args)
 
@@ -76,6 +78,7 @@
             self.repos._selectSackType()
 
         self.guessMultiLibProbs = True
+        self.rawhidehack = False
 
     def evrTupletoVer(self,tuple):
         """convert and evr tuple to a version string, return None if nothing
@@ -139,6 +142,18 @@
         # and therefore be the only one in newestpkgtuplist.
         return True
 
+    def hasupdate(self, pkg):
+        # Ugly hack for the i386->i586 switch in F11 development.
+        (n,a,e,v,r) = pkg.pkgtup
+        for provpkg in self.pkgSack.returnNewestByName(n):
+            prov_a = provpkg.pkgtup[1]
+            if prov_a=='i586':
+                (prov_e, prov_v, prov_r) = provpkg.pkgtup[2:]
+                vercmp = rpmUtils.miscutils.compareEVR( (prov_e,prov_v,prov_r), (e,v,r) )
+                if vercmp>0:  # provpkg is newer, i586 updates i386
+                    return True
+        return False  # there is no update for the i386 pkg
+
     def getBrokenDeps(self, newest=False):
         unresolved = {}
         resolved = {}
@@ -172,6 +187,9 @@
             print 'WARNING: rpmUtils.updates.checkForObsolete missing!'
 
         for pkg in pkgs:
+            if self.rawhidehack and pkg.pkgtup[1]=='i386' and self.hasupdate(pkg):
+                print 'WARNING: Skipping', pkg
+                continue
             thispkgobsdict = {}
             if haveCheckForObsolete:
                 try:
@@ -222,8 +240,13 @@
                                 pass
                         
                         if po.pkgtup in pkgtuplist:
-                            resolved_by_newest = True
-                            break
+                            if not self.rawhidehack:
+                                resolved_by_newest = True
+                                break
+                            # In F11 devel i386 pkgs are updated by i586.
+                            elif po.pkgtup[1]!='i386' or not self.hasupdate(po):
+                                resolved_by_newest = True
+                                break
 
                     if resolved_by_newest:                    
                         resolved[(req,flags,ver)] = 1
@@ -244,6 +267,7 @@
     (opts, cruft) = parseArgs()
     my = RepoClosure(arch = opts.arch, config = opts.config)
     my.guessMultiLibProbs = not opts.nomultilibhack
+    my.rawhidehack = opts.rawhidehack
     
     if opts.repoid:
         for repo in my.repos.repos.values():



From joost at fedoraproject.org  Thu Apr  2 21:19:46 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  2 Apr 2009 21:19:46 +0000 (UTC)
Subject: rpms/lazarus/F-10 Desktop_patch.diff, 1.2, 1.3 Makefile_patch.diff, 
	1.2, 1.3 lazarus.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090402211946.4D61B70120@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/lazarus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4782

Modified Files:
	Desktop_patch.diff Makefile_patch.diff lazarus.spec sources 
Log Message:
* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-2
 - Adapted Makefile patch for version 0.9.26.2

* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-1
 - Updated to version 0.9.26.2

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.26-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.9.26-3
- Include /etc/lazarus directory.


Desktop_patch.diff:

Index: Desktop_patch.diff
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/F-10/Desktop_patch.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Desktop_patch.diff	27 Oct 2008 22:46:32 -0000	1.2
+++ Desktop_patch.diff	2 Apr 2009 21:19:45 -0000	1.3
@@ -1,6 +1,6 @@
 --- lazarus/install/lazarus.desktop	2007-11-26 15:34:42.000000000 +0100
 +++ lazarus/install/lazarus.desktop.n	2008-10-18 11:52:33.000000000 +0200
-@@ -5,13 +5,8 @@
+@@ -5,12 +5,7 @@
  Exec=startlazarus %f
  Terminal=false
  Type=Application
@@ -10,9 +10,8 @@
 +Categories=IDE;Development;GTK;GUIDesigner;
  StartupWMClass=Lazarus
  MimeType=text/x-pascal;text/lazarus-project-source;text/lazarus-project-information;text/lazarus-form;text/lazarus-resource;text/lazarus-package;text/lazarus-package-link;text/lazarus-code-inlay;
--Patterns=*.pas;*.pp;*.p;*.inc;*.lpi;*.lpk;*.lpr;*.lfm;*.lrs;*.lpl;*.dci
 -[Property::X-KDE-NativeExtension]
 -Type=QString
 -Value=.pas
 -X-Ubuntu-Gettext-Domain=desktop_kdelibs
- 
+-

Makefile_patch.diff:

Index: Makefile_patch.diff
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/F-10/Makefile_patch.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile_patch.diff	27 Oct 2008 22:46:32 -0000	1.2
+++ Makefile_patch.diff	2 Apr 2009 21:19:45 -0000	1.3
@@ -20,8 +20,8 @@
  INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
  ifneq ($(findstring $(OS_TARGET),win32 win64),)
  LAZARUS_INSTALL_DIR=C:\lazarus
-@@ -110,8 +110,8 @@
- ifeq ($(OS_TARGET),win32)
+@@ -115,8 +115,8 @@
+ ifneq ($(findstring $(OS_TARGET),win32 win64),)
  
  else
 -	$(MKDIR) $(INSTALL_PREFIX)/share


Index: lazarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/F-10/lazarus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lazarus.spec	29 Oct 2008 17:45:19 -0000	1.3
+++ lazarus.spec	2 Apr 2009 21:19:45 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           lazarus
-Version:        0.9.26
+Version:        0.9.26.2
 Release:        2%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal
 
@@ -93,11 +93,24 @@
 %{_datadir}/mime/packages/lazarus.xml
 %doc lazarus/COPYING*
 %doc lazarus/README.txt
+%dir %{_sysconfdir}/lazarus
 %config(noreplace) %{_sysconfdir}/lazarus/editoroptions.xml
 %config(noreplace) %{_sysconfdir}/lazarus/environmentoptions.xml
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-2
+ - Adapted Makefile patch for version 0.9.26.2
+
+* Wed Apr 1 2009 Joost van der Sluis <joost at cnoc.nl> 0.9.26.2-1
+ - Updated to version 0.9.26.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.26-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.9.26-3
+- Include /etc/lazarus directory.
+
 * Wed Oct 29 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9.26-2
 - Fix path to the source tree
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2008 22:46:32 -0000	1.3
+++ sources	2 Apr 2009 21:19:45 -0000	1.4
@@ -1 +1 @@
-f1a7b2f89d1e6a246f25abb235880594  lazarus-0.9.26-0.tgz
+357fd9f6e9d410f3c74ff493fce7f75a  lazarus-0.9.26.2-0.tgz



From lennart at fedoraproject.org  Thu Apr  2 21:55:07 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu,  2 Apr 2009 21:55:07 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.4, 1.5 libatasmart.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090402215507.4026A70120@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11848

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Mar 2009 01:00:27 -0000	1.4
+++ .cvsignore	2 Apr 2009 21:54:36 -0000	1.5
@@ -1 +1 @@
-libatasmart-0.3.tar.gz
+libatasmart-0.4.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libatasmart.spec	24 Mar 2009 01:00:28 -0000	1.5
+++ libatasmart.spec	2 Apr 2009 21:54:36 -0000	1.6
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.3
+Version: 0.4
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -53,6 +53,9 @@
 %{_libdir}/pkgconfig/libatasmart.pc
 
 %changelog
+* Thu Apr 2 2009 Lennart Poettering <lpoetter at redhat.com> 0.4-1
+- New upstream release
+
 * Tue Mar 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Mar 2009 01:00:28 -0000	1.4
+++ sources	2 Apr 2009 21:54:36 -0000	1.5
@@ -1 +1 @@
-03c799ad18b6833d08e9b8bc867206f1  libatasmart-0.3.tar.gz
+36bbbfecb516c735c05d076e2bc955f5  libatasmart-0.4.tar.gz



From caolanm at fedoraproject.org  Thu Apr  2 22:02:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  2 Apr 2009 22:02:44 +0000 (UTC)
Subject: rpms/mythes-sk/devel mythes-sk.spec,1.10,1.11 sources,1.8,1.9
Message-ID: <20090402220244.AB12370120@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13247

Modified Files:
	mythes-sk.spec sources 
Log Message:
latest version


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mythes-sk.spec	3 Mar 2009 09:28:14 -0000	1.10
+++ mythes-sk.spec	2 Apr 2009 22:02:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name: mythes-sk
 Summary: Slovak thesaurus
-%define upstreamid 20090302
+%define upstreamid 20090402
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.sk-spell.sk.cx/thesaurus/download/OOo-Thesaurus2-sk_SK.zip
@@ -36,6 +36,9 @@
 %{_datadir}/mythes/*
 
 %changelog
+* Thu Apr 02 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090402-1
+- latest version
+
 * Tue Mar 03 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090302-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Mar 2009 09:28:15 -0000	1.8
+++ sources	2 Apr 2009 22:02:14 -0000	1.9
@@ -1 +1 @@
-11442604464856ddd21f5afc9b44f945  OOo-Thesaurus2-sk_SK.zip
+af12f7ff7b99d6f5e312449d6492f16d  OOo-Thesaurus2-sk_SK.zip



From caolanm at fedoraproject.org  Thu Apr  2 22:04:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  2 Apr 2009 22:04:26 +0000 (UTC)
Subject: rpms/mythes-de/devel mythes-de.spec,1.20,1.21 sources,1.18,1.19
Message-ID: <20090402220426.E424170120@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-de/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13705

Modified Files:
	mythes-de.spec sources 
Log Message:
latest version


Index: mythes-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mythes-de.spec	2 Mar 2009 09:52:01 -0000	1.20
+++ mythes-de.spec	2 Apr 2009 22:03:56 -0000	1.21
@@ -1,6 +1,6 @@
 Name: mythes-de
 Summary: German thesaurus
-%define upstreamid 20090302
+%define upstreamid 20090402
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.openthesaurus.de/download/thes_de_DE_v2.zip
@@ -44,6 +44,9 @@
 %{_datadir}/mythes/*
 
 %changelog
+* Thu Apr 02 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090402-1
+- latest version
+
 * Mon Mar 02 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090302-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-de/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	2 Mar 2009 09:48:05 -0000	1.18
+++ sources	2 Apr 2009 22:03:56 -0000	1.19
@@ -1 +1 @@
-b628df3e12f3259bfe805ee27bed54f8  thes_de_DE_v2.zip
+8c893ad279cdac31d0eb77d09d19e2da  thes_de_DE_v2.zip



From kengert at fedoraproject.org  Thu Apr  2 22:07:10 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Thu,  2 Apr 2009 22:07:10 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.61,1.62
Message-ID: <20090402220710.816A170120@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14464

Modified Files:
	nss.spec 
Log Message:
* Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-5
- introduce separate nss-softokn-freebl package



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- nss.spec	2 Apr 2009 16:36:08 -0000	1.61
+++ nss.spec	2 Apr 2009 22:06:40 -0000	1.62
@@ -4,11 +4,12 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.99.3
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
+Requires:         nss-softokn-freebl >= %{version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
@@ -43,6 +44,20 @@
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
+%package softokn-freebl
+Summary:          Freebl library for the Network Security Services
+Group:            System Environment/Base
+
+%description softokn-freebl
+Network Security Services (NSS) is a set of libraries designed to
+support cross-platform development of security-enabled client and
+server applications. Applications built with NSS can support SSL v2
+and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
+v3 certificates, and other security standards.
+
+Install the nss-softokn-freebl package if you need the freebl 
+library.
+
 
 %package tools
 Summary:          Tools for the Network Security Services
@@ -297,7 +312,6 @@
 /%{_lib}/libsoftokn3.so
 /%{_lib}/libnssckbi.so
 /%{_lib}/libnsspem.so
-/%{_lib}/libfreebl3.so
 %{unsupported_tools_directory}/shlibsign
 %ghost /%{_lib}/libsoftokn3.chk
 %ghost /%{_lib}/libfreebl3.chk
@@ -310,6 +324,9 @@
 %dir %{_sysconfdir}/prelink.conf.d
 %{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
+%files softokn-freebl
+/%{_lib}/libfreebl3.so
+
 %files tools
 %defattr(-,root,root)
 %{_bindir}/certutil
@@ -452,6 +469,8 @@
 
 
 %changelog
+* Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-5
+- introduce separate nss-softokn-freebl package
 * Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-4
 - disable execstack when building freebl
 * Tue Mar 31 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-3



From overholt at fedoraproject.org  Thu Apr  2 22:28:53 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu,  2 Apr 2009 22:28:53 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse-swt-xulrunner191.patch, NONE,
	1.1 eclipse.spec, 1.625, 1.626
Message-ID: <20090402222853.D1F0570120@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20123/F-11

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-swt-xulrunner191.patch 
Log Message:
* Thu Apr 2 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-7
- Add patch from upstream to work with XULRunner 1.9.1.
- Red Hat bugzilla #483832 (and its duplicates).

eclipse-swt-xulrunner191.patch:

--- NEW FILE eclipse-swt-xulrunner191.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
retrieving revision 1.105.2.3
diff -u -r1.105.2.3 Mozilla.java
--- Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java	21 Aug 2008 16:02:30 -0000	1.105.2.3
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java	2 Apr 2009 19:15:06 -0000
@@ -47,6 +47,7 @@
 	Shell tip = null;
 	Listener listener;
 	Vector unhookedDOMWindows = new Vector ();
+	byte[] htmlBytes;
 
 	static nsIAppShell AppShell;
 	static AppFileLocProvider LocationProvider;
@@ -1168,21 +1169,21 @@
 				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
 				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
 				 */
-				awaitingNavigate = true;
-				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-				if (rc != XPCOM.NS_OK) {
-					browser.dispose ();
-					error (rc);
-				}
-				if (result[0] == 0) {
-					browser.dispose ();
-					error (XPCOM.NS_ERROR_NO_INTERFACE);
-				}
-				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-			    char[] uri = new char[ABOUT_BLANK.length () + 1];
-			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-				webNavigation.Release ();
+//				awaitingNavigate = true;
+//				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+//				if (rc != XPCOM.NS_OK) {
+//					browser.dispose ();
+//					error (rc);
+//				}
+//				if (result[0] == 0) {
+//					browser.dispose ();
+//					error (XPCOM.NS_ERROR_NO_INTERFACE);
+//				}
+//				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+//			    char[] uri = new char[ABOUT_BLANK.length () + 1];
+//			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+//				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+//				webNavigation.Release ();
 
 				dialogFactory.isPre_1_9 = false;
 			}
@@ -1264,6 +1265,7 @@
 }
 
 public boolean back () {
+	htmlBytes = null;
 	if (awaitingNavigate) return false;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1466,6 +1468,7 @@
 }
 
 public boolean forward () {
+	htmlBytes = null;
 	if (awaitingNavigate) return false;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1676,6 +1679,7 @@
 	webBrowser.Release ();
 	webBrowser = null;
 	webBrowserObject = null;
+	htmlBytes = null;
 
 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
 	tip = null;
@@ -1737,6 +1741,7 @@
 }
 
 public void refresh () {
+	htmlBytes = null;
 	if (awaitingNavigate) return;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1858,11 +1863,45 @@
 		} else {
 			result[0] = 0;
 			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-			nsIDocShell docShell = new nsIDocShell (result[0]);
-			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-			docShell.Release ();
+			if (rc == XPCOM.NS_OK) {
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				nsIDocShell docShell = new nsIDocShell (result[0]);
+				rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
+				docShell.Release ();
+			} else {
+				result[0] = 0;
+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+				if (rc == XPCOM.NS_OK) {
+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+					/*
+					* Setting mozilla's content through nsIWebBrowserStream does not cause a page
+					* load to occur, so the events that usually accompany a page change are not
+					* fired.  To make this behave as expected, navigate to about:blank first and
+					* then set the html content once the page has loaded.
+					*/
+					new nsISupports (result[0]).Release ();
+					result[0] = 0;
+
+					/*
+					* If htmlBytes is not null then the about:blank page is already being loaded,
+					* so no Navigate is required.  Just set the html that is to be shown.
+					*/
+					boolean blankLoading = htmlBytes != null;
+					htmlBytes = data;
+					if (blankLoading) return true;
+
+					/* navigate to about:blank */
+					rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+					if (rc != XPCOM.NS_OK) error (rc);
+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+					nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+					result[0] = 0;
+				    char[] uriChars = new char[ABOUT_BLANK.length () + 1];
+				    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
+					rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+					webNavigation.Release ();
+				}
+			}
 		}
 	}
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1877,6 +1916,7 @@
 }
 
 public boolean setUrl (String url) {
+	htmlBytes = null;
 	awaitingNavigate = false;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1893,6 +1933,7 @@
 }
 
 public void stop () {
+	htmlBytes = null;
 	if (awaitingNavigate) return;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -2215,6 +2256,108 @@
 			unhookedDOMWindows.remove (ptrObject);
 			new nsISupports (ptrObject.value).Release ();
 		}
+
+		/*
+		* If htmlBytes is not null then there is html from a previous setText() call
+		* waiting to be set into the about:blank page once it has completed loading. 
+		*/
+		if (htmlBytes != null) {
+			nsIRequest req = new nsIRequest (aRequest);
+			int /*long*/ name = XPCOM.nsEmbedCString_new ();
+			rc = req.GetName (name);
+			if (rc != XPCOM.NS_OK) error (rc);
+			int length = XPCOM.nsEmbedCString_Length (name);
+			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+			byte[] dest = new byte[length];
+			XPCOM.memmove (dest, buffer, length);
+			String url = new String (dest);
+			XPCOM.nsEmbedCString_delete (name);
+
+			if (url.startsWith (ABOUT_BLANK)) {
+				/*
+				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
+				 * DOM listeners that were hooked on it (about:blank), so remove them and
+				 * add new ones after the content has been set.
+				 */
+				unhookDOMListeners ();
+
+				rc = XPCOM.NS_GetServiceManager (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+				result[0] = 0;
+				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				serviceManager.Release ();
+
+				nsIIOService ioService = new nsIIOService (result[0]);
+				result[0] = 0;
+				/*
+				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
+				* when the URI protocol for the nsInputStreamChannel
+				* is about:blank.  The fix is to specify the file protocol.
+				*/
+				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+				rc = ioService.NewURI (aSpec, null, 0, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				XPCOM.nsEmbedCString_delete (aSpec);
+				ioService.Release ();
+
+				nsIURI uri = new nsIURI (result[0]);
+				result[0] = 0;
+
+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
+				result[0] = 0;
+
+				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+				int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+				rc = stream.OpenStream (uri.getAddress (), aContentType);
+				if (rc != XPCOM.NS_OK) error (rc);
+				int /*long*/ ptr = C.malloc (htmlBytes.length);
+				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
+				int pageSize = 8192;
+				int pageCount = htmlBytes.length / pageSize + 1;
+				int /*long*/ current = ptr;
+				for (int i = 0; i < pageCount; i++) {
+					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
+					if (length > 0) {
+						rc = stream.AppendToStream (current, length);
+						if (rc != XPCOM.NS_OK) error (rc);
+					}
+					current += pageSize;
+				}
+				rc = stream.CloseStream ();
+				if (rc != XPCOM.NS_OK) error (rc);
+				C.free (ptr);
+				XPCOM.nsEmbedCString_delete (aContentType);
+				stream.Release ();
+				uri.Release ();
+				htmlBytes = null;
+
+				rc = webBrowser.GetContentDOMWindow (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				boolean isTop = result[0] == domWindow.getAddress ();
+				new nsISupports (result[0]).Release ();
+				result[0] = 0;
+				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
+				result[0] = 0;
+				hookDOMListeners (target, isTop);
+				target.Release ();
+			}
+		}
 		domWindow.Release ();
 
 		/*
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
===================================================================
RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,55 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserStream extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
+		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
+
+	public static final nsID NS_IWEBBROWSERSTREAM_IID =
+		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
+
+	public nsIWebBrowserStream(int /*long*/ address) {
+		super(address);
+	}
+
+	public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
+	}
+
+	public int AppendToStream(int /*long*/ aData, int aLen) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
+	}
+
+	public int CloseStream() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+}


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- eclipse.spec	30 Mar 2009 21:37:12 -0000	1.625
+++ eclipse.spec	2 Apr 2009 22:28:22 -0000	1.626
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -151,6 +151,10 @@
 # https://bugs.eclipse.org/226356
 # https://bugzilla.redhat.com/show_bug.cgi?id=484453
 Patch45:        %{name}-swt-buildagainstxulrunner.patch
+# Work with changed interface in XULRunner 1.9.1
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=130611
+Patch46:        %{name}-swt-xulrunner191.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -355,6 +359,9 @@
 #pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
 #%patch45 -p3
 #popd
+pushd plugins/org.eclipse.swt
+%patch46
+popd
 
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
@@ -1500,6 +1507,10 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Apr 2 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-7
+- Add patch from upstream to work with XULRunner 1.9.1.
+- Red Hat bugzilla #483832 (and its duplicates).
+
 * Mon Mar 30 2009 Dennis Gilmore <dennis at ausil.us> 1:3.4.2-6
 - base sparcv9 and sparc on ppc
 



From cebbert at fedoraproject.org  Thu Apr  2 23:42:19 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  2 Apr 2009 23:42:19 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.29.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.1040, 
	1.1041 kernel.spec, 1.1504, 1.1505 linux-2.6-v4l-dvb-fixes.patch,
	1.12, 1.13 sources, 1.1002, 1.1003 upstream, 1.913,
	1.914 patch-2.6.29.1-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090402234219.604E170120@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3315

Modified Files:
	.cvsignore kernel.spec linux-2.6-v4l-dvb-fixes.patch sources 
	upstream 
Added Files:
	patch-2.6.29.1.bz2.sign 
Removed Files:
	patch-2.6.29.1-rc1.bz2.sign 
Log Message:
Linux 2.6.29.1
Removed upstream commit d64260d58865004c6354e024da3450fdd607ea07
  from v4l-dvb-fixes: merged in 2.6.29.1


--- NEW FILE patch-2.6.29.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ1UWtyGugalF9Dw4RAkuGAJ4sDs0OM/1EKkycBDFYGk6E7l0UrgCghiIF
A7VtJ1agWJvh0s6+3jIaXSs=
=Wnzk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1040
retrieving revision 1.1041
diff -u -r1.1040 -r1.1041
--- .cvsignore	31 Mar 2009 23:58:14 -0000	1.1040
+++ .cvsignore	2 Apr 2009 23:41:46 -0000	1.1041
@@ -5,4 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29.1-rc1.bz2
+patch-2.6.29.1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1504
retrieving revision 1.1505
diff -u -r1.1504 -r1.1505
--- kernel.spec	2 Apr 2009 19:29:01 -0000	1.1504
+++ kernel.spec	2 Apr 2009 23:41:46 -0000	1.1505
@@ -39,7 +39,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 1
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1888,6 +1888,11 @@
 # and build.
 
 %changelog
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.29.1
+- Removed upstream commit d64260d58865004c6354e024da3450fdd607ea07
+  from v4l-dvb-fixes: merged in 2.6.29.1
+
 * Thu Apr 02 2009 John W. Linville <linville at redhat.com>
 - iwl3945: rely on priv->lock to protect priv access
 

linux-2.6-v4l-dvb-fixes.patch:

Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-v4l-dvb-fixes.patch	30 Mar 2009 12:11:45 -0000	1.12
+++ linux-2.6-v4l-dvb-fixes.patch	2 Apr 2009 23:41:47 -0000	1.13
@@ -315,7 +315,6 @@
       V4L/DVB (11051): v4l-dvb: replace remaining references to the old mailinglist.
       V4L/DVB (11052): bt819: remove an unused header
       V4L/DVB (11053): saa7134: set v4l2_dev field of video_device
-      V4L/DVB (11098): v4l2-common: remove incorrect MODULE test
       V4L/DVB (11100): au8522: fix compilation warning.
       V4L/DVB (11112): v4l2-subdev: add support for TRY_FMT, ENUM_FMT and G/S_PARM.
       V4L/DVB (11113): ov7670: convert to v4l2_subdev
@@ -98395,19 +98394,6 @@
     to high class IDs.
  
     This function returns the first ID that follows after the given ID.
-@@ -910,10 +797,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
- 	struct i2c_board_info info;
- 
- 	BUG_ON(!dev);
--#ifdef MODULE
-+
- 	if (module_name)
- 		request_module(module_name);
--#endif
-+
- 	/* Setup the i2c board info with the device type and
- 	   the device address. */
- 	memset(&info, 0, sizeof(info));
 @@ -927,11 +814,11 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */
@@ -98437,19 +98423,6 @@
  }
  EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
  
-@@ -958,10 +850,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
- 	struct i2c_board_info info;
- 
- 	BUG_ON(!dev);
--#ifdef MODULE
-+
- 	if (module_name)
- 		request_module(module_name);
--#endif
-+
- 	/* Setup the i2c board info with the device type and
- 	   the device address. */
- 	memset(&info, 0, sizeof(info));
 @@ -974,11 +866,11 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -r1.1002 -r1.1003
--- sources	31 Mar 2009 23:58:15 -0000	1.1002
+++ sources	2 Apr 2009 23:41:47 -0000	1.1003
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-ed1a88e478d2b87ed7523420457e22c7  patch-2.6.29.1-rc1.bz2
+87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -r1.913 -r1.914
--- upstream	31 Mar 2009 23:58:15 -0000	1.913
+++ upstream	2 Apr 2009 23:41:47 -0000	1.914
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29.1-rc1.bz2
+patch-2.6.29.1.bz2


--- patch-2.6.29.1-rc1.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Thu Apr  2 23:48:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  2 Apr 2009 23:48:38 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.38, 1.39 gvfs.spec, 1.117,
	1.118 sources, 1.38, 1.39
Message-ID: <20090402234838.C62DA70120@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5183

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	16 Mar 2009 12:46:04 -0000	1.38
+++ .cvsignore	2 Apr 2009 23:48:08 -0000	1.39
@@ -1 +1 @@
-gvfs-1.2.0.tar.bz2
+gvfs-1.2.1.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gvfs.spec	19 Mar 2009 16:12:55 -0000	1.117
+++ gvfs.spec	2 Apr 2009 23:48:08 -0000	1.118
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -271,6 +271,9 @@
 
 
 %changelog
+* Thu Apr  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Wed Mar 18 2009 David Zeuthen <davidz at redhat.com> - 1.2.0-2
 - GNOME #575728 - crash in Open Folder: mounting a crypto volume
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	16 Mar 2009 12:46:05 -0000	1.38
+++ sources	2 Apr 2009 23:48:08 -0000	1.39
@@ -1 +1 @@
-d30aa7b099e4a3746da81265d27363da  gvfs-1.2.0.tar.bz2
+df8f624587adfabe7009838ce6d8d5fd  gvfs-1.2.1.tar.bz2



From cebbert at fedoraproject.org  Thu Apr  2 23:54:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  2 Apr 2009 23:54:54 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.29.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.1002, 1.1003 kernel.spec, 1.1313, 1.1314 sources, 1.963,
	1.964 upstream, 1.874,
	1.875 linux-2.6-fuse-fix-lseek-return-with-lock-held.patch, 1.1,
	NONE linux-2.6-net-fix-gro-bug.patch, 1.1,
	NONE linux-2.6-net-xfrm-fix-spin-unlock.patch, 1.1,
	NONE linux-2.6-vm-x86-pat-fix-warnings.patch, 1.1,
	NONE linux-2.6.29-pat-pci-change-prot-for-inherit.patch, 1.1, NONE
Message-ID: <20090402235454.8CA46700DA@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7104

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29.1.bz2.sign 
Removed Files:
	linux-2.6-fuse-fix-lseek-return-with-lock-held.patch 
	linux-2.6-net-fix-gro-bug.patch 
	linux-2.6-net-xfrm-fix-spin-unlock.patch 
	linux-2.6-vm-x86-pat-fix-warnings.patch 
	linux-2.6.29-pat-pci-change-prot-for-inherit.patch 
Log Message:
Linux 2.6.29.1
Dropped patches, merged upstream:
    linux-2.6-net-fix-gro-bug.patch
    linux-2.6-net-xfrm-fix-spin-unlock.patch
    linux-2.6-vm-x86-pat-fix-warnings.patch
    linux-2.6.29-pat-pci-change-prot-for-inherit.patch
    linux-2.6-fuse-fix-lseek-return-with-lock-held.patch


--- NEW FILE patch-2.6.29.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ1UWtyGugalF9Dw4RAkuGAJ4sDs0OM/1EKkycBDFYGk6E7l0UrgCghiIF
A7VtJ1agWJvh0s6+3jIaXSs=
=Wnzk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -r1.1002 -r1.1003
--- .cvsignore	24 Mar 2009 02:24:57 -0000	1.1002
+++ .cvsignore	2 Apr 2009 23:54:23 -0000	1.1003
@@ -5,3 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
+patch-2.6.29.1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1313
retrieving revision 1.1314
diff -u -r1.1313 -r1.1314
--- kernel.spec	2 Apr 2009 19:26:39 -0000	1.1313
+++ kernel.spec	2 Apr 2009 23:54:23 -0000	1.1314
@@ -36,7 +36,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -592,9 +592,7 @@
 
 Patch41: linux-2.6-sysrq-c.patch
 
-Patch80: linux-2.6-vm-x86-pat-fix-warnings.patch
 Patch81: linux-2.6-defaults-saner-vm-settings.patch
-Patch82: linux-2.6.29-pat-pci-change-prot-for-inherit.patch
 
 Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch
@@ -629,8 +627,6 @@
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 Patch602: alsa-rewrite-hw_ptr-updaters.patch
 
-Patch640: linux-2.6-net-xfrm-fix-spin-unlock.patch
-
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
@@ -677,9 +673,6 @@
 # fix stalls with ext3 data writeout
 Patch2950: linux-2.6-kjournald-use-rt-io-priority.patch
 
-# don't return to userspace w/ held lock
-Patch2960: linux-2.6-fuse-fix-lseek-return-with-lock-held.patch
-
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
 Patch9000: squashfs3.patch
@@ -690,9 +683,6 @@
 #Adding dropmonitor bits from 2.6.30
 Patch9011: linux-2.6-dropwatch-protocol.patch
 
-# fix for net lockups, will be in 2.6.29.1
-Patch9100: linux-2.6-net-fix-gro-bug.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1086,9 +1076,7 @@
 
 # Architecture patches
 # x86(-64)
-ApplyPatch linux-2.6-vm-x86-pat-fix-warnings.patch
 ApplyPatch linux-2.6-defaults-saner-vm-settings.patch
-ApplyPatch linux-2.6.29-pat-pci-change-prot-for-inherit.patch
 
 #
 # PowerPC
@@ -1130,9 +1118,6 @@
 
 ApplyPatch linux-2.6-kjournald-use-rt-io-priority.patch
 
-ApplyPatch linux-2.6-fuse-fix-lseek-return-with-lock-held.patch
-
-
 # ext4
 # data integrity band-aid for badly written apps
 ApplyPatch linux-2.6-ext4-flush-on-close.patch
@@ -1181,7 +1166,6 @@
 ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
 
 # Networking
-ApplyPatch linux-2.6-net-xfrm-fix-spin-unlock.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1259,8 +1243,6 @@
 # Apply dropmonitor protocol bits from 2.6..30 net-next tree
 ApplyPatch linux-2.6-dropwatch-protocol.patch
 
-ApplyPatch linux-2.6-net-fix-gro-bug.patch
-
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -1837,6 +1819,15 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-14
+- Linux 2.6.29.1
+- Dropped patches, merged upstream:
+    linux-2.6-net-fix-gro-bug.patch
+    linux-2.6-net-xfrm-fix-spin-unlock.patch
+    linux-2.6-vm-x86-pat-fix-warnings.patch
+    linux-2.6.29-pat-pci-change-prot-for-inherit.patch
+    linux-2.6-fuse-fix-lseek-return-with-lock-held.patch
+
 * Thu Apr  2 2009 John W. Linville <linville at redhat.com>  2.6.29-13
 - back-port iwlwifi rfkill while device down patches
 - iwl3945: rely on priv->lock to protect priv access


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.963
retrieving revision 1.964
diff -u -r1.963 -r1.964
--- sources	24 Mar 2009 02:24:58 -0000	1.963
+++ sources	2 Apr 2009 23:54:24 -0000	1.964
@@ -1 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
+87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- upstream	24 Mar 2009 02:24:58 -0000	1.874
+++ upstream	2 Apr 2009 23:54:24 -0000	1.875
@@ -1 +1,2 @@
 linux-2.6.29.tar.bz2
+patch-2.6.29.1.bz2


--- linux-2.6-fuse-fix-lseek-return-with-lock-held.patch DELETED ---


--- linux-2.6-net-fix-gro-bug.patch DELETED ---


--- linux-2.6-net-xfrm-fix-spin-unlock.patch DELETED ---


--- linux-2.6-vm-x86-pat-fix-warnings.patch DELETED ---


--- linux-2.6.29-pat-pci-change-prot-for-inherit.patch DELETED ---



From cebbert at fedoraproject.org  Fri Apr  3 00:34:56 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  3 Apr 2009 00:34:56 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.269, 1.270 config-nodebug, 1.31, 
	1.32 config-x86_64-generic, 1.72, 1.73 kernel.spec, 1.1505,
	1.1506 dma-api-debug-fixes.patch, 1.1,
	NONE linux-2.6-debug-dma-api.patch, 1.3, NONE
Message-ID: <20090403003456.351E770134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15643

Modified Files:
	config-generic config-nodebug config-x86_64-generic 
	kernel.spec 
Removed Files:
	dma-api-debug-fixes.patch linux-2.6-debug-dma-api.patch 
Log Message:
Enable debug builds and turn of debugging in the regular kernel.
Remove dma-debug patches.
Leave CONFIG_PCI_MSI_DEFAULT_ON set.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- config-generic	31 Mar 2009 19:59:53 -0000	1.269
+++ config-generic	3 Apr 2009 00:34:25 -0000	1.270
@@ -1366,10 +1366,10 @@
 # CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -3427,7 +3427,7 @@
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 
 ## BEGIN ISA Junk.
 
@@ -3843,7 +3843,7 @@
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_BOOT_TRACER=y
+# CONFIG_BOOT_TRACER is not set
 CONFIG_STACK_TRACER=y
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 CONFIG_EARLY_PRINTK_DBGP=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-nodebug,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-nodebug	5 Feb 2009 21:11:18 -0000	1.31
+++ config-nodebug	3 Apr 2009 00:34:25 -0000	1.32
@@ -2,48 +2,48 @@
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_SPINLOCK=y
-
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FAILSLAB is not set
+# CONFIG_FAIL_PAGE_ALLOC is not set
+# CONFIG_FAIL_MAKE_REQUEST is not set
+# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
+# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
 # CONFIG_FAIL_IO_TIMEOUT is not set
 
-CONFIG_SLUB_DEBUG_ON=y
+# CONFIG_SLUB_DEBUG_ON is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
 # CONFIG_ACPI_DEBUG is not set
 
-CONFIG_DEBUG_SG=y
+# CONFIG_DEBUG_SG is not set
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
+# CONFIG_DEBUG_OBJECTS_FREE is not set
+# CONFIG_DEBUG_OBJECTS_TIMERS is not set
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-CONFIG_X86_PTDUMP=y
+# CONFIG_X86_PTDUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
 
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
 
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86_64-generic,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- config-x86_64-generic	24 Mar 2009 21:54:28 -0000	1.72
+++ config-x86_64-generic	3 Apr 2009 00:34:25 -0000	1.73
@@ -10,7 +10,7 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1505
retrieving revision 1.1506
diff -u -r1.1505 -r1.1506
--- kernel.spec	2 Apr 2009 23:41:46 -0000	1.1505
+++ kernel.spec	3 Apr 2009 00:34:25 -0000	1.1506
@@ -120,7 +120,7 @@
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -594,8 +594,6 @@
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ftrace.patch
 
-Patch30: linux-2.6-debug-dma-api.patch
-Patch31: dma-api-debug-fixes.patch
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch141: linux-2.6-ps3-storage-alias.patch
@@ -1096,10 +1094,6 @@
 ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-utrace-ftrace.patch
 
-# DMA API debugging
-ApplyPatch linux-2.6-debug-dma-api.patch
-ApplyPatch dma-api-debug-fixes.patch
-
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1888,6 +1882,11 @@
 # and build.
 
 %changelog
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-44
+- Enable debug builds and turn of debugging in the regular kernel.
+- Remove dma-debug patches.
+- Leave CONFIG_PCI_MSI_DEFAULT_ON set.
+
 * Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.29.1
 - Removed upstream commit d64260d58865004c6354e024da3450fdd607ea07


--- dma-api-debug-fixes.patch DELETED ---


--- linux-2.6-debug-dma-api.patch DELETED ---



From cebbert at fedoraproject.org  Fri Apr  3 01:07:38 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  3 Apr 2009 01:07:38 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1506,1.1507
Message-ID: <20090403010738.E04A370134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23180

Modified Files:
	kernel.spec 
Log Message:
fix debug build


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1506
retrieving revision 1.1507
diff -u -r1.1506 -r1.1507
--- kernel.spec	3 Apr 2009 00:34:25 -0000	1.1506
+++ kernel.spec	3 Apr 2009 01:07:08 -0000	1.1507
@@ -1575,7 +1575,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{with_debug}
-%if !%{with_up}
+%if %{with_up}
 BuildKernel %make_target %kernel_image debug
 %endif
 %if %{with_pae}
@@ -1882,7 +1882,7 @@
 # and build.
 
 %changelog
-* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-44
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-45
 - Enable debug builds and turn of debugging in the regular kernel.
 - Remove dma-debug patches.
 - Leave CONFIG_PCI_MSI_DEFAULT_ON set.



From mclasen at fedoraproject.org  Fri Apr  3 02:08:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  3 Apr 2009 02:08:05 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.118,1.119
Message-ID: <20090403020805.4B31E70134@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5886

Modified Files:
	gvfs.spec 
Log Message:
drop patch



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gvfs.spec	2 Apr 2009 23:48:08 -0000	1.118
+++ gvfs.spec	3 Apr 2009 02:07:34 -0000	1.119
@@ -40,9 +40,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
 Patch4: gvfs-1.1.7-gdu-computer-expose-devices.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=575728
-Patch5: gvfs-1.2.0-fix-daemon-mount-op-bgo575728.patch
-
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -127,7 +124,6 @@
 %patch2 -p0 -b .gdu
 %patch3 -p1 -b .gdu-volumes-typo
 %patch4 -p1 -b .computer-gdu
-%patch5 -p1 -b .mount-op
 
 %build
 



From cebbert at fedoraproject.org  Fri Apr  3 02:10:21 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  3 Apr 2009 02:10:21 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1507,1.1508
Message-ID: <20090403021021.0CC4770134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6388

Modified Files:
	kernel.spec 
Log Message:
hopefully fix more debug build breakage


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -u -r1.1507 -r1.1508
--- kernel.spec	3 Apr 2009 01:07:08 -0000	1.1507
+++ kernel.spec	3 Apr 2009 02:09:50 -0000	1.1508
@@ -1873,7 +1873,9 @@
 
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
+%if %{with_up}
 %kernel_variant_files %{with_debug} debug
+%endif
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
@@ -1882,7 +1884,7 @@
 # and build.
 
 %changelog
-* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-45
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-46
 - Enable debug builds and turn of debugging in the regular kernel.
 - Remove dma-debug patches.
 - Leave CONFIG_PCI_MSI_DEFAULT_ON set.



From rdieter at fedoraproject.org  Fri Apr  3 02:15:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  3 Apr 2009 02:15:02 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 .cvsignore, 1.48, 1.49 kdeadmin.spec, 1.102,
	1.103 sources, 1.54, 1.55
Message-ID: <20090403021502.9AB7970134@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7549/F-9

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	5 Nov 2008 16:30:35 -0000	1.48
+++ .cvsignore	3 Apr 2009 02:14:31 -0000	1.49
@@ -1 +1 @@
-kdeadmin-4.1.3.tar.bz2
+kdeadmin-4.2.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdeadmin.spec	27 Feb 2009 15:09:11 -0000	1.102
+++ kdeadmin.spec	3 Apr 2009 02:14:32 -0000	1.103
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -19,8 +19,8 @@
 BuildRequires:  PyKDE4-devel >= %{version}
 BuildRequires:  system-config-printer-libs
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
@@ -35,8 +35,6 @@
 Summary: An RPM package manager
 Group: Applications/System
 Requires: smart
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description kpackage
 Kpackage is an RPM package manager, used for displaying currently installed
 packages, uninstalling them and installing new ones.
@@ -64,7 +62,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -81,16 +79,29 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 %post kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans kpackage
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
 
 
 %files
@@ -133,7 +144,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+- optimize scriptlets 
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	27 Feb 2009 15:09:11 -0000	1.54
+++ sources	3 Apr 2009 02:14:32 -0000	1.55
@@ -1 +1 @@
-11dde15ee5150357801c245d1290f38d  kdeadmin-4.2.1.tar.bz2
+b9104de38fa36962a2812aa9cae8fc5f  kdeadmin-4.2.2.tar.bz2



From rdieter at fedoraproject.org  Fri Apr  3 02:15:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  3 Apr 2009 02:15:02 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 .cvsignore, 1.55, 1.56 kdeadmin.spec, 1.117,
	1.118 sources, 1.59, 1.60
Message-ID: <20090403021502.B9C9A7013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7549/F-10

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	24 Jan 2009 06:33:12 -0000	1.55
+++ .cvsignore	3 Apr 2009 02:14:32 -0000	1.56
@@ -1,5 +1 @@
-kdeadmin-4.1.2.tar.bz2
-kdeadmin-4.1.80.tar.bz2
-kdeadmin-4.1.85.tar.bz2
-kdeadmin-4.1.96.tar.bz2
-kdeadmin-4.2.0.tar.bz2
+kdeadmin-4.2.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdeadmin.spec	27 Feb 2009 15:09:11 -0000	1.117
+++ kdeadmin.spec	3 Apr 2009 02:14:32 -0000	1.118
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -19,8 +19,8 @@
 BuildRequires:  PyKDE4-devel >= %{version}
 BuildRequires:  system-config-printer-libs
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
@@ -35,8 +35,6 @@
 Summary: An RPM package manager
 Group: Applications/System
 Requires: smart
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description kpackage
 Kpackage is an RPM package manager, used for displaying currently installed
 packages, uninstalling them and installing new ones.
@@ -64,7 +62,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -81,16 +79,29 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 %post kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans kpackage
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun kpackage
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
 
 
 %files
@@ -133,7 +144,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+- optimize scriptlets 
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	27 Feb 2009 15:09:11 -0000	1.59
+++ sources	3 Apr 2009 02:14:32 -0000	1.60
@@ -1 +1 @@
-11dde15ee5150357801c245d1290f38d  kdeadmin-4.2.1.tar.bz2
+b9104de38fa36962a2812aa9cae8fc5f  kdeadmin-4.2.2.tar.bz2



From dcantrel at fedoraproject.org  Fri Apr  3 02:51:25 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri,  3 Apr 2009 02:51:25 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.24, 1.25 dhcpv6.spec, 1.99,
	1.100 sources, 1.24, 1.25
Message-ID: <20090403025126.2647D70134@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17328

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 1.2.0-1
- Upgrade to dhcpv6-1.2.0
- Client, server, and relay daemon write PID files (#491371)
- Obsolete libdhcp and libdhcp-devel packages (#493547)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	4 Dec 2008 22:33:16 -0000	1.24
+++ .cvsignore	3 Apr 2009 02:50:54 -0000	1.25
@@ -1 +1 @@
-dhcpv6-1.1.0.tar.gz
+dhcpv6-1.2.0.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- dhcpv6.spec	1 Apr 2009 05:12:25 -0000	1.99
+++ dhcpv6.spec	3 Apr 2009 02:50:54 -0000	1.100
@@ -3,8 +3,8 @@
 
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
-Version: 1.1.0
-Release: 3%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
@@ -38,6 +38,8 @@
 Obsoletes: dhcpv6_client
 Obsoletes: libdhcp6client <= 1.0.22-1
 Obsoletes: libdhcp6client-devel <= 1.0.22-1
+Obsoletes: libdhcp <= 1.99.8-1
+Obsoletes: libdhcp-devel <= 1.99.8-1
 
 %description -n dhcpv6-client
 Provides the client for the DHCPv6 protocol (RFC 3315) to support dynamic
@@ -58,6 +60,7 @@
 %{__mv} %{buildroot}%{_sbindir}/dhcp6c %{buildroot}/sbin/dhcp6c
 
 %{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name}
+%{__mkdir} -p %{buildroot}%{_localstatedir}/run/%{name}
 
 %post
 /sbin/chkconfig --add dhcp6s
@@ -102,6 +105,7 @@
 %{_mandir}/man5/dhcp6s.conf.5.gz
 %{_mandir}/man8/dhcp6r.8.gz
 %attr(750,root,root) %dir %{_localstatedir}/lib/%{name}
+%attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %files -n dhcpv6-client
 %defattr(-,root,root,-)
@@ -111,8 +115,14 @@
 %{_mandir}/man8/dhcp6c.8.gz
 %{_mandir}/man5/dhcp6c.conf.5.gz
 %attr(750,root,root) %dir %{_localstatedir}/lib/%{name}
+%attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 1.2.0-1
+- Upgrade to dhcpv6-1.2.0
+- Client, server, and relay daemon write PID files (#491371)
+- Obsolete libdhcp and libdhcp-devel packages (#493547)
+
 * Tue Mar 31 2009 David Cantrell <dcantrell at redhat.com> - 1.1.0-3
 - dhcpv6-client obsoletes libdhcp6client, libdhcp6client-devel (#493214)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	4 Dec 2008 22:33:16 -0000	1.24
+++ sources	3 Apr 2009 02:50:55 -0000	1.25
@@ -1 +1 @@
-dba512a2d24a60a3326e34c713945a48  dhcpv6-1.1.0.tar.gz
+d537416b33002f56912b7f27477d8d35  dhcpv6-1.2.0.tar.gz



From dcantrel at fedoraproject.org  Fri Apr  3 02:53:54 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri,  3 Apr 2009 02:53:54 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.247,1.248
Message-ID: <20090403025354.F08FA70134@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18208

Modified Files:
	dhcp.spec 
Log Message:
* Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-14
- Obsolete libdhcp and libdhcp-devel (#493547)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- dhcp.spec	1 Apr 2009 05:08:05 -0000	1.247
+++ dhcp.spec	3 Apr 2009 02:53:24 -0000	1.248
@@ -4,7 +4,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  13%{?dist}
+Release:  14%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -72,6 +72,7 @@
 Requires(post): coreutils
 Obsoletes: dhcpcd <= 1.3.22pl1-7
 Obsoletes: libdhcp4client <= 12:4.0.0-31
+Obsoletes: libdhcp <= 1.99.8-1
 Provides: dhcpcd = 1.3.22pl1-8
 
 %description -n dhclient
@@ -89,6 +90,7 @@
 Summary: Development headers and libraries for interfacing to the DHCP server
 Group: Development/Libraries
 Obsoletes: libdhcp4client-devel <= 12:4.0.0-31
+Obsoletes: libdhcp-devel <= 1.99.8-1
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -415,6 +417,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-14
+- Obsolete libdhcp and libdhcp-devel (#493547)
+
 * Tue Mar 31 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-13
 - dhclient obsoletes libdhcp4client (#493213)
 - dhcp-devel obsolets libdhcp4client-devel (#493213)



From cebbert at fedoraproject.org  Fri Apr  3 02:56:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  3 Apr 2009 02:56:06 +0000 (UTC)
Subject: rpms/kernel/F-11/scripts watch-task,NONE,1.1
Message-ID: <20090403025606.9409C7013C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19180

Added Files:
	watch-task 
Log Message:
add script for watching builds


--- NEW FILE watch-task ---
#! /bin/sh

watchtask() {
	while true ; do
		koji taskinfo $1 | grep "^State: $2$" >/dev/null || break
		echo -en "State: $2\r"
		sleep 3m
	done
}

echo "Started watching koji task $1: $(date)"
watchtask $1 free
watchtask $1 open
echo "    Task $1 is no longer open: $(date)"

for i in $(seq 1 10) ; do
	echo -en '\a'
	sleep .2
done

koji taskinfo $1



From mclasen at fedoraproject.org  Fri Apr  3 03:04:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  3 Apr 2009 03:04:09 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.93, 1.94 nautilus.spec, 1.267,
	1.268 sources, 1.97, 1.98
Message-ID: <20090403030409.9C98670134@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21469

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	16 Mar 2009 13:19:06 -0000	1.93
+++ .cvsignore	3 Apr 2009 03:03:38 -0000	1.94
@@ -1 +1 @@
-nautilus-2.26.0.tar.bz2
+nautilus-2.26.1.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- nautilus.spec	16 Mar 2009 13:19:06 -0000	1.267
+++ nautilus.spec	3 Apr 2009 03:03:38 -0000	1.268
@@ -15,7 +15,7 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.26.0
+Version: 	2.26.1
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -84,19 +84,16 @@
 
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=171655
-Patch15:	nautilus-2.22.0-treeview-xds-dnd-2.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
-that makes it easy to manage your files and the rest of your system. 
-It allows to browse directories on local and remote filesystems, preview 
+that makes it easy to manage your files and the rest of your system.
+It allows to browse directories on local and remote filesystems, preview
 files and launch applications associated with them.
-It is also responsible for handling the icons on the GNOME desktop. 
+It is also responsible for handling the icons on the GNOME desktop.
 
 %package extensions
 Summary: Nautilus extensions library
@@ -127,7 +124,6 @@
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
-%patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
 
 %build
@@ -266,6 +262,9 @@
 
 
 %changelog
+* Thu Apr  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Mon Mar 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	16 Mar 2009 13:19:06 -0000	1.97
+++ sources	3 Apr 2009 03:03:38 -0000	1.98
@@ -1 +1 @@
-d26e673de34be4c6d8ab09af89b92270  nautilus-2.26.0.tar.bz2
+5d75f5de2806e9003e36a4613866b8d1  nautilus-2.26.1.tar.bz2



From airlied at fedoraproject.org  Fri Apr  3 03:26:40 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 03:26:40 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-f10-compat.patch, NONE,
	1.1 drm-modesetting-radeon.patch, 1.78, 1.79 drm-next.patch,
	1.15, 1.16 kernel.spec, 1.1314, 1.1315
Message-ID: <20090403032640.6EA5E7013C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27073

Modified Files:
	drm-modesetting-radeon.patch drm-next.patch kernel.spec 
Added Files:
	drm-f10-compat.patch 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com>
- add backwards drm compat for radeon kms


drm-f10-compat.patch:

--- NEW FILE drm-f10-compat.patch ---
>From 5b64dc2000826365cff157de0bbeaedc21eb90d7 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 3 Apr 2009 13:19:09 +1000
Subject: [PATCH] drm: backwards compat layer on top of F11 DRM for F10

for radeon kms
---
 drivers/gpu/drm/radeon/radeon_gem.c |  254 +++++++++++++++++++++++++++++++++++
 include/drm/drm.h                   |   39 +++---
 include/drm/drm_mode.h              |   23 ++--
 include/drm/radeon_drm.h            |   18 +++-
 4 files changed, 306 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index ab9c005..2fd1c5d 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -30,6 +30,9 @@
 static int radeon_gem_ib_init(struct drm_device *dev);
 static int radeon_gem_ib_destroy(struct drm_device *dev);
 
+static int radeon_gem_dma_bufs_init(struct drm_device *dev);
+static void radeon_gem_dma_bufs_destroy(struct drm_device *dev);
+
 int radeon_gem_init_object(struct drm_gem_object *obj)
 {
 	struct drm_radeon_gem_object *obj_priv;
@@ -721,6 +724,7 @@ int radeon_alloc_gart_objects(struct drm_device *dev)
 
 	/* init the indirect buffers */
 	radeon_gem_ib_init(dev);
+	radeon_gem_dma_bufs_init(dev);
 	return 0;
 
 }
@@ -1158,6 +1162,8 @@ void radeon_gem_mm_fini(struct drm_device *dev)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 
+	radeon_gem_dma_bufs_destroy(dev);
+
 	radeon_gem_ib_destroy(dev);
 
 	mutex_lock(&dev->struct_mutex);
@@ -1583,3 +1589,251 @@ void radeon_gem_update_offsets(struct drm_device *dev, struct drm_master *master
 }
 
 
+
+#define RADEON_DMA_BUFFER_SIZE (64 * 1024)
+#define RADEON_DMA_BUFFER_COUNT (16)
+
+
+/**
+ * Cleanup after an error on one of the addbufs() functions.
+ *
+ * \param dev DRM device.
+ * \param entry buffer entry where the error occurred.
+ *
+ * Frees any pages and buffers associated with the given entry.
+ */
+static void drm_cleanup_buf_error(struct drm_device * dev,
+				  struct drm_buf_entry * entry)
+{
+	int i;
+
+	if (entry->seg_count) {
+		for (i = 0; i < entry->seg_count; i++) {
+			if (entry->seglist[i]) {
+				drm_pci_free(dev, entry->seglist[i]);
+			}
+		}
+		drm_free(entry->seglist,
+			 entry->seg_count *
+			 sizeof(*entry->seglist), DRM_MEM_SEGS);
+
+		entry->seg_count = 0;
+	}
+
+	if (entry->buf_count) {
+		for (i = 0; i < entry->buf_count; i++) {
+			if (entry->buflist[i].dev_private) {
+				drm_free(entry->buflist[i].dev_private,
+					 entry->buflist[i].dev_priv_size,
+					 DRM_MEM_BUFS);
+			}
+		}
+		drm_free(entry->buflist,
+			 entry->buf_count *
+			 sizeof(*entry->buflist), DRM_MEM_BUFS);
+
+		entry->buf_count = 0;
+	}
+}
+
+static int radeon_gem_addbufs(struct drm_device *dev)
+{
+	struct drm_radeon_private *dev_priv = dev->dev_private;
+	struct drm_device_dma *dma = dev->dma;
+	struct drm_buf_entry *entry;
+	struct drm_buf *buf;
+	unsigned long offset;
+	unsigned long agp_offset;
+	int count;
+	int order;
+	int size;
+	int alignment;
+	int page_order;
+	int total;
+	int byte_count;
+	int i;
+	struct drm_buf **temp_buflist;
+	
+	if (!dma)
+		return -EINVAL;
+
+	count = RADEON_DMA_BUFFER_COUNT;
+	order = drm_order(RADEON_DMA_BUFFER_SIZE);
+	size = 1 << order;
+
+	alignment = PAGE_ALIGN(size);
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total = PAGE_SIZE << page_order;
+
+	byte_count = 0;
+	agp_offset = dev_priv->mm.dma_bufs.bo->offset;
+
+	DRM_DEBUG("count:      %d\n", count);
+	DRM_DEBUG("order:      %d\n", order);
+	DRM_DEBUG("size:       %d\n", size);
+	DRM_DEBUG("agp_offset: %lu\n", agp_offset);
+	DRM_DEBUG("alignment:  %d\n", alignment);
+	DRM_DEBUG("page_order: %d\n", page_order);
+	DRM_DEBUG("total:      %d\n", total);
+
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
+		return -EINVAL;
+	if (dev->queue_count)
+		return -EBUSY;	/* Not while in use */
+
+	spin_lock(&dev->count_lock);
+	if (dev->buf_use) {
+		spin_unlock(&dev->count_lock);
+		return -EBUSY;
+	}
+	atomic_inc(&dev->buf_alloc);
+	spin_unlock(&dev->count_lock);
+
+	mutex_lock(&dev->struct_mutex);
+	entry = &dma->bufs[order];
+	if (entry->buf_count) {
+		mutex_unlock(&dev->struct_mutex);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM;	/* May only call once for each order */
+	}
+
+	if (count < 0 || count > 4096) {
+		mutex_unlock(&dev->struct_mutex);
+		atomic_dec(&dev->buf_alloc);
+		return -EINVAL;
+	}
+
+	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+				   DRM_MEM_BUFS);
+	if (!entry->buflist) {
+		mutex_unlock(&dev->struct_mutex);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM;
+	}
+	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+
+	entry->buf_size = size;
+	entry->page_order = page_order;
+
+	offset = 0;
+
+	while (entry->buf_count < count) {
+		buf = &entry->buflist[entry->buf_count];
+		buf->idx = dma->buf_count + entry->buf_count;
+		buf->total = alignment;
+		buf->order = order;
+		buf->used = 0;
+
+		buf->offset = (dma->byte_count + offset);
+		buf->bus_address = dev_priv->gart_vm_start + agp_offset + offset;
+		buf->address = (void *)(agp_offset + offset);
+		buf->next = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		init_waitqueue_head(&buf->dma_wait);
+		buf->file_priv = NULL;
+
+		buf->dev_priv_size = dev->driver->dev_priv_size;
+		buf->dev_private = drm_alloc(buf->dev_priv_size, DRM_MEM_BUFS);
+		if (!buf->dev_private) {
+			/* Set count correctly so we free the proper amount. */
+			entry->buf_count = count;
+			drm_cleanup_buf_error(dev, entry);
+			mutex_unlock(&dev->struct_mutex);
+			atomic_dec(&dev->buf_alloc);
+			return -ENOMEM;
+		}
+
+		memset(buf->dev_private, 0, buf->dev_priv_size);
+
+		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
+
+		offset += alignment;
+		entry->buf_count++;
+		byte_count += PAGE_SIZE << page_order;
+	}
+
+	DRM_DEBUG("byte_count: %d\n", byte_count);
+
+	temp_buflist = drm_realloc(dma->buflist,
+				   dma->buf_count * sizeof(*dma->buflist),
+				   (dma->buf_count + entry->buf_count)
+				   * sizeof(*dma->buflist), DRM_MEM_BUFS);
+	if (!temp_buflist) {
+		/* Free the entry because it isn't valid */
+		drm_cleanup_buf_error(dev, entry);
+		mutex_unlock(&dev->struct_mutex);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM;
+	}
+	dma->buflist = temp_buflist;
+
+	for (i = 0; i < entry->buf_count; i++) {
+		dma->buflist[i + dma->buf_count] = &entry->buflist[i];
+	}
+
+	dma->buf_count += entry->buf_count;
+	dma->seg_count += entry->seg_count;
+	dma->page_count += byte_count >> PAGE_SHIFT;
+	dma->byte_count += byte_count;
+
+	DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
+	DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
+
+	mutex_unlock(&dev->struct_mutex);
+
+	dma->flags = _DRM_DMA_USE_SG;
+	atomic_dec(&dev->buf_alloc);
+	return 0;
+}
+
+static int radeon_gem_dma_bufs_init(struct drm_device *dev)
+{
+	struct drm_radeon_private *dev_priv = dev->dev_private;
+	int size = RADEON_DMA_BUFFER_SIZE * RADEON_DMA_BUFFER_COUNT;
+	int ret;
+
+	ret = drm_dma_setup(dev);
+	if (ret < 0)
+		return ret;
+
+	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
+				       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_NO_EVICT |
+				       DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MAPPABLE, 0,
+				       0, 0, &dev_priv->mm.dma_bufs.bo);
+	if (ret) {
+		DRM_ERROR("Failed to create DMA bufs\n");
+		return -ENOMEM;
+	}
+
+	ret = drm_bo_kmap(dev_priv->mm.dma_bufs.bo, 0, size >> PAGE_SHIFT,
+			  &dev_priv->mm.dma_bufs.kmap);
+	if (ret) {
+		DRM_ERROR("Failed to mmap DMA buffers\n");
+		return -ENOMEM;
+	}
+	dev_priv->mm.gart_useable -= size;
+	DRM_DEBUG("\n");
+	radeon_gem_addbufs(dev);
+
+	DRM_DEBUG("%lx %d\n", dev_priv->mm.dma_bufs.bo->map_list.hash.key, size);
+	dev->agp_buffer_token = dev_priv->mm.dma_bufs.bo->map_list.hash.key << PAGE_SHIFT;
+	dev_priv->mm.fake_agp_map.handle = dev_priv->mm.dma_bufs.kmap.virtual;
+	dev_priv->mm.fake_agp_map.size = size;
+	
+	dev->agp_buffer_map = &dev_priv->mm.fake_agp_map;
+	dev_priv->gart_buffers_offset = dev_priv->mm.dma_bufs.bo->offset + dev_priv->gart_vm_start;
+	return 0;
+}
+
+static void radeon_gem_dma_bufs_destroy(struct drm_device *dev)
+{
+
+	struct drm_radeon_private *dev_priv = dev->dev_private;
+	drm_dma_takedown(dev);
+
+	if (dev_priv->mm.dma_bufs.bo) {
+		drm_bo_kunmap(&dev_priv->mm.dma_bufs.kmap);
+		drm_bo_usage_deref_unlocked(&dev_priv->mm.dma_bufs.bo);
+	}
+}
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 17a1e2c..fa02570 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -671,23 +671,28 @@ struct drm_gem_open {
 
 #define DRM_IOCTL_UPDATE_DRAW		DRM_IOW(0x3f, struct drm_update_draw)
 
-#define DRM_IOCTL_MODE_GETRESOURCES	DRM_IOWR(0xA0, struct drm_mode_card_res)
-#define DRM_IOCTL_MODE_GETCRTC		DRM_IOWR(0xA1, struct drm_mode_crtc)
-#define DRM_IOCTL_MODE_SETCRTC		DRM_IOWR(0xA2, struct drm_mode_crtc)
-#define DRM_IOCTL_MODE_CURSOR		DRM_IOWR(0xA3, struct drm_mode_cursor)
-#define DRM_IOCTL_MODE_GETGAMMA		DRM_IOWR(0xA4, struct drm_mode_crtc_lut)
-#define DRM_IOCTL_MODE_SETGAMMA		DRM_IOWR(0xA5, struct drm_mode_crtc_lut)
-#define DRM_IOCTL_MODE_GETENCODER	DRM_IOWR(0xA6, struct drm_mode_get_encoder)
-#define DRM_IOCTL_MODE_GETCONNECTOR	DRM_IOWR(0xA7, struct drm_mode_get_connector)
-#define DRM_IOCTL_MODE_ATTACHMODE	DRM_IOWR(0xA8, struct drm_mode_mode_cmd)
-#define DRM_IOCTL_MODE_DETACHMODE	DRM_IOWR(0xA9, struct drm_mode_mode_cmd)
-
-#define DRM_IOCTL_MODE_GETPROPERTY	DRM_IOWR(0xAA, struct drm_mode_get_property)
-#define DRM_IOCTL_MODE_SETPROPERTY	DRM_IOWR(0xAB, struct drm_mode_connector_set_property)
-#define DRM_IOCTL_MODE_GETPROPBLOB	DRM_IOWR(0xAC, struct drm_mode_get_blob)
-#define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
-#define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
-#define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
+#define DRM_IOCTL_MODE_GETRESOURCES     DRM_IOWR(0xA0, struct drm_mode_card_res)
+#define DRM_IOCTL_MODE_GETCRTC          DRM_IOWR(0xA1, struct drm_mode_crtc)
+#define DRM_IOCTL_MODE_GETCONNECTOR        DRM_IOWR(0xA2, struct drm_mode_get_connector)
+#define DRM_IOCTL_MODE_SETCRTC          DRM_IOWR(0xA3, struct drm_mode_crtc)
+#define DRM_IOCTL_MODE_ADDFB            DRM_IOWR(0xA4, struct drm_mode_fb_cmd)
+#define DRM_IOCTL_MODE_RMFB             DRM_IOWR(0xA5, unsigned int)
+#define DRM_IOCTL_MODE_GETFB            DRM_IOWR(0xA6, struct drm_mode_fb_cmd)
+
+#define DRM_IOCTL_MODE_SETPROPERTY     DRM_IOWR(0xA7, struct drm_mode_connector_set_property)
+#define DRM_IOCTL_MODE_GETPROPBLOB     DRM_IOWR(0xA8, struct drm_mode_get_blob)
+#define DRM_IOCTL_MODE_ATTACHMODE      DRM_IOWR(0xA9, struct drm_mode_mode_cmd)
+#define DRM_IOCTL_MODE_DETACHMODE      DRM_IOWR(0xAA, struct drm_mode_mode_cmd)
+
+#define DRM_IOCTL_MODE_GETPROPERTY     DRM_IOWR(0xAB, struct drm_mode_get_property)
+#define DRM_IOCTL_MODE_CURSOR          DRM_IOWR(0xAC, struct drm_mode_cursor)
+#define DRM_IOCTL_MODE_HOTPLUG         DRM_IOWR(0xAD, struct drm_mode_hotplug)
+#define DRM_IOCTL_WAIT_HOTPLUG		DRM_IOWR(0xAE, union drm_wait_hotplug)
+
+#define DRM_IOCTL_MODE_REPLACEFB       DRM_IOWR(0xAF, struct drm_mode_fb_cmd)
+#define DRM_IOCTL_MODE_GETENCODER      DRM_IOWR(0xB0, struct drm_mode_get_encoder)
+#define DRM_IOCTL_MODE_GETGAMMA        DRM_IOWR(0xB1, struct drm_mode_crtc_lut)
+#define DRM_IOCTL_MODE_SETGAMMA        DRM_IOWR(0xB2, struct drm_mode_crtc_lut)
 
 /**
  * Device specific ioctls should only be in their respective headers
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 601d2bd..58417e5 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -126,10 +126,11 @@ struct drm_mode_crtc {
 #define DRM_MODE_ENCODER_TVDAC	4
 
 struct drm_mode_get_encoder {
-	uint32_t encoder_id;
-	uint32_t encoder_type;
 
-	uint32_t crtc_id; /**< Id of crtc */
+	unsigned int encoder_type;
+	unsigned int encoder_id;
+
+	unsigned int crtc_id; /**< Id of crtc */
 
 	uint32_t possible_crtcs;
 	uint32_t possible_clones;
@@ -216,13 +217,15 @@ struct drm_mode_get_blob {
 };
 
 struct drm_mode_fb_cmd {
-	uint32_t fb_id;
-	uint32_t width, height;
-	uint32_t pitch;
-	uint32_t bpp;
-	uint32_t depth;
-	/* driver specific handle */
-	uint32_t handle;
+	union {
+		unsigned int fb_id;
+		unsigned int buffer_id;
+	};
+	unsigned int width, height;
+	unsigned int pitch;
+	unsigned int bpp;
+	unsigned int handle;
+	unsigned int depth;
 };
 
 struct drm_mode_mode_cmd {
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index f716e0a..d6a233f 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -514,7 +514,8 @@ typedef struct {
 #define DRM_RADEON_GEM_SET_DOMAIN 0x23
 #define DRM_RADEON_GEM_WAIT_RENDERING 0x24
 
-#define DRM_RADEON_CS       0x26
+#define DRM_RADEON_CS           0x26
+#define DRM_RADEON_CS2       0x26
 
 #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
 #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
@@ -554,6 +555,7 @@ typedef struct {
 #define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
 #define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
 #define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
+#define DRM_IOCTL_RADEON_CS2 DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS2, struct drm_radeon_cs2)
 
 
 typedef struct drm_radeon_init {
@@ -869,6 +871,14 @@ struct drm_radeon_gem_pwrite {
 
 /* New interface which obsolete all previous interface.
  */
+
+
+struct drm_radeon_cs_old {
+	uint32_t            dwords;
+	uint32_t            cs_id;
+	uint64_t            packets;
+};
+
 #define RADEON_CHUNK_ID_RELOCS 0x01
 #define RADEON_CHUNK_ID_IB     0x02
 #define RADEON_CHUNK_ID_OLD 0xff
@@ -886,5 +896,11 @@ struct drm_radeon_cs {
 				   cs chunks */
 };
 
+struct drm_radeon_cs2 {
+	uint32_t	num_chunks;
+	uint32_t        cs_id;
+	uint64_t	chunks; /* this points to uint64_t * which point to
+				   cs chunks */
+};
 
 #endif
-- 
1.6.0.6


drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.78 -r 1.79 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- drm-modesetting-radeon.patch	13 Mar 2009 05:42:46 -0000	1.78
+++ drm-modesetting-radeon.patch	3 Apr 2009 03:26:36 -0000	1.79
@@ -1,4 +1,169 @@
-commit 784e2287e60f91c16814fbb757ea316b3027ddd1
+commit dea27f6e83efabdc3e37bc5a91d29d6dab893853
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 18 17:07:07 2009 +1000
+
+    radeon: fixup encoder oops due to wrong ordering on init calls
+
+commit 4a90f1edefee2cba39d135f2866e1bacc1ac647e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Mar 19 00:16:00 2009 +1000
+
+    drm/ttm: re-org the whole cached/uncached allocator yet again.
+    
+    This removes the allocator type, and instead tracks when pages
+    were allocated from which pool and frees them back into that pool
+
+commit c8ae93fa4ac69112f4fc16477f73e0a98bba2765
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Mar 15 18:26:42 2009 +1000
+
+    ttm: prefetch pages on pagefault
+
+commit f4df0e7870378ec40c268b95fb4b5d13533095fd
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Mar 16 03:52:13 2009 -0400
+
+    radeon: make sure to free connector priv when done
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 96d923793eb924750b26e8ab2a4264131e17cd5b
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Mar 16 03:36:16 2009 -0400
+
+    radeon: fix combios asic init
+    
+    - igp chips don't have asic_init3/4 or ram reset tables
+    - write out the detected ram size to the CONFIG_MEMSIZE register
+    - some r1xx chips require ram detection rather than reading size
+      from bios tables
+    - asic_init5 table isn't needed
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 68f14af742eda9fd28c920776ce5396e304f8a82
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Mar 16 03:16:35 2009 -0400
+
+    radeon: rework bios scratch regsiter handling
+    
+    split bios scratch reg handling into 3 functions:
+    
+    - connected/active
+    - crtc to encoder mapping
+    - encoder dpms state
+    
+    Hook the functions in at the appropriate places in
+    the driver. DVI-I is a bit messy since we need to know
+    digital vs analog so we have to update the scratch regs
+    twice: once in detect() and again after we know digital/analog
+    in get_modes().
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 3ba04861b4d399a7c6e21f0a7279d5f087fc4a8c
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Sat Mar 14 16:43:14 2009 -0400
+
+    radeon: rework combios encoder/connector setup
+    
+    - along the same lines as atom
+    - re-enable atom and legacy paths for r4xx cards
+    - remove bios_connector struct
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 2ed15179f72e66a020a7f318cc4c3fa57865e4ba
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Mar 12 16:02:01 2009 -0400
+
+    radeon: fix misleading messages
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit cb917ec2b585f5ac873ab2e6938da9a3b730c0a1
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Mar 12 14:27:06 2009 -0400
+
+    atom: fix up encoder routines to deal with connector setup
+    
+    often times the links or lanes used are dependant on the
+    connector rather than the encoder.
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit abe11890fc272189712f2e6268a8751e25b7b7b5
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Mar 12 13:43:03 2009 -0400
+
+    atom: re-enable quirks
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 6a45dbd73c14735711f1803e8a3dd1063b7b3021
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Mar 12 13:21:32 2009 -0400
+
+    object table: don't add ddc for tv/cv
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 6fb018a3740510f140bcd5b6b89904e9d3167811
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Mar 12 13:10:50 2009 -0400
+
+    radeon: major restructuring of atom output/connector setup
+    
+    - add connectors and encoders while parsing the bios tables.
+    - pull in fixed up object header parsing for r6xx+
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 034267381be779a1bbdb5f6f97c1471fb8538a04
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Mar 4 13:02:26 2009 -0500
+
+    RS600 doesn't have DFP quirk in connector table
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit b7936094db13c736e4bee7494c2b99a8e5ced042
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Mar 5 16:37:57 2009 -0500
+
+    R6xx/R7xx: don't mess with RADEON_HOST_PATH_CNTL
+    
+    these chips don't have this reg at this location.
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit a1fdbf2f4de3988f5e3319ee9f267f7b27e8fc6e
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Mar 11 16:50:19 2009 -0400
+
+    radeon: make sure to free enc_priv when done
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit d54586a52852497d82f322c536515d223697fdf4
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Mar 11 15:43:16 2009 -0400
+
+    radeon: restructure encoders
+    
+    move encoder specific data into encoder specific structs
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 0215044d42faded71b8591a79550c0bf04908458
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Mar 11 11:23:16 2009 -0400
+
+    radeon: atom modesetting updates
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 121d45a2e9562836138c658224def839bb166f68
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Mar 12 11:39:05 2009 +1000
 
@@ -17,7 +182,7 @@
     
     Signed-off-by: Tom "spot" Callaway <tcallawa at redhat.com>
 
-commit 42a73c53bce752bca305c4ec40bff9873042ba6d
+commit 36bbbdea9a2e77c1d1da7504bc5f03267d0e0d6c
 Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
 Date:   Thu Mar 12 10:58:05 2009 +1000
 
@@ -26,7 +191,7 @@
     This makes the IB get routine a lot smarter and hopefully
     fixes some cases where it exits
 
-commit 64e61a039f5e28b5d288fd2b50d44d3d42327976
+commit 5047f54c5cf7cbd48c4894ba4950dbad158c3184
 Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
 Date:   Thu Mar 12 10:57:17 2009 +1000
 
@@ -38,7 +203,7 @@
     
     only happens on r300 hw for me
[...9464 lines suppressed...]
++	struct radeon_native_mode native_mode;
++};
 +
-+	/* legacy primary dac */
-+	uint32_t ps2_pdac_adj;
-+
++struct radeon_encoder_tv_dac {
 +	/* legacy tv dac */
 +	uint32_t ps2_tvdac_adj;
 +	uint32_t ntsc_tvdac_adj;
 +	uint32_t pal_tvdac_adj;
++
 +	enum radeon_tv_std tv_std;
++};
 +
++struct radeon_encoder_int_tmds {
 +	/* legacy int tmds */
 +	struct radeon_tmds_pll tmds_pll[4];
 +};
 +
++struct radeon_encoder_atom_dig {
++	/* atom dig */
++	uint32_t transmitter_config;
++	bool coherent_mode;
++	/* atom lvds */
++	uint32_t lvds_misc;
++	uint16_t panel_pwr_delay;
++	/* panel mode */
++	struct radeon_native_mode native_mode;
++};
++
++struct radeon_encoder {
++	struct drm_encoder base;
++	uint32_t encoder_id;
++	uint32_t devices;
++	uint32_t flags;
++	enum radeon_rmx_type rmx_type;
++	struct radeon_native_mode native_mode;
++	void *enc_priv;
++};
++
++struct radeon_connector_atom_dig {
++	uint32_t igp_lane_info;
++	bool linkb;
++};
++
 +struct radeon_connector {
 +	struct drm_connector base;
++	uint32_t connector_id;
++	uint32_t devices;
 +	struct radeon_i2c_chan *ddc_bus;
 +	int use_digital;
++	void *con_priv;
 +};
 +
 +struct radeon_framebuffer {
@@ -29798,16 +31453,14 @@
 +			       uint32_t *post_div_p,
 +			       int flags);
 +
-+struct drm_encoder *radeon_encoder_lvtma_add(struct drm_device *dev, int bios_index);
-+struct drm_encoder *radeon_encoder_atom_dac_add(struct drm_device *dev, int bios_index, int dac_id, int with_tv);
-+struct drm_encoder *radeon_encoder_atom_tmds_add(struct drm_device *dev, int bios_index, int tmds_type);
 +struct drm_encoder *radeon_encoder_legacy_lvds_add(struct drm_device *dev, int bios_index);
 +struct drm_encoder *radeon_encoder_legacy_primary_dac_add(struct drm_device *dev, int bios_index, int with_tv);
 +struct drm_encoder *radeon_encoder_legacy_tv_dac_add(struct drm_device *dev, int bios_index, int with_tv);
 +struct drm_encoder *radeon_encoder_legacy_tmds_int_add(struct drm_device *dev, int bios_index);
 +struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, int bios_index);
-+extern void atombios_ext_tmds_setup(struct drm_encoder *encoder,
-+				    struct drm_display_mode *mode);
++extern void atombios_external_tmds_setup(struct drm_encoder *encoder,
++					 struct drm_display_mode *mode);
++extern int atombios_get_encoder_mode(struct drm_encoder *encoder);
 +
 +extern void radeon_crtc_load_lut(struct drm_crtc *crtc);
 +extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
@@ -29833,18 +31486,31 @@
 +
 +extern bool radeon_atom_get_clock_info(struct drm_device *dev);
 +extern bool radeon_combios_get_clock_info(struct drm_device *dev);
-+extern void radeon_atombios_get_lvds_info(struct radeon_encoder *encoder);
-+extern void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder);
-+extern bool radeon_combios_get_lvds_info(struct radeon_encoder *encoder);
-+extern bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder);
++extern struct radeon_encoder_atom_dig *
++radeon_atombios_get_lvds_info(struct radeon_encoder *encoder);
++extern struct radeon_encoder_int_tmds *
++radeon_atombios_get_tmds_info(struct radeon_encoder *encoder);
++extern struct radeon_encoder_lvds *
++radeon_combios_get_lvds_info(struct radeon_encoder *encoder);
++extern struct radeon_encoder_int_tmds *
++radeon_combios_get_tmds_info(struct radeon_encoder *encoder);
 +extern void radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder);
-+extern bool radeon_combios_get_tv_info(struct radeon_encoder *encoder);
-+extern bool radeon_combios_get_tv_dac_info(struct radeon_encoder *encoder);
-+extern bool radeon_combios_get_primary_dac_info(struct radeon_encoder *encoder);
++extern struct radeon_encoder_tv_dac *
++radeon_combios_get_tv_dac_info(struct radeon_encoder *encoder);
++extern struct radeon_encoder_primary_dac *
++radeon_combios_get_primary_dac_info(struct radeon_encoder *encoder);
 +extern void radeon_combios_output_lock(struct drm_encoder *encoder, bool lock);
 +extern void radeon_combios_initialize_bios_scratch_regs(struct drm_device *dev);
 +extern void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock);
 +extern void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev);
++extern void
++radeon_atombios_encoder_crtc_scratch_regs(struct drm_encoder *encoder, int crtc);
++extern void
++radeon_atombios_encoder_dpms_scratch_regs(struct drm_encoder *encoder, bool on);
++extern void
++radeon_combios_encoder_crtc_scratch_regs(struct drm_encoder *encoder, int crtc);
++extern void
++radeon_combios_encoder_dpms_scratch_regs(struct drm_encoder *encoder, bool on);
 +extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
 +				     u16 blue, int regno);
 +struct drm_framebuffer *radeon_framebuffer_create(struct drm_device *dev,
@@ -29865,7 +31531,9 @@
 +void radeon_atom_dyn_clk_setup(struct drm_device *dev, int enable);
 +void radeon_combios_dyn_clk_setup(struct drm_device *dev, int enable);
 +void radeon_get_clock_info(struct drm_device *dev);
-+extern bool radeon_get_atom_connector_info_from_bios_connector_table(struct drm_device *dev);
++
++extern bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev);
++extern bool radeon_get_atom_connector_info_from_supported_devices_table(struct drm_device *dev);
 +
 +void radeon_rmx_mode_fixup(struct drm_encoder *encoder,
 +			   struct drm_display_mode *mode,
@@ -30145,10 +31813,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
 new file mode 100644
-index 0000000..9ccf839
+index 0000000..0edb592
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_reg.h
-@@ -0,0 +1,5337 @@
+@@ -0,0 +1,5344 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -30328,6 +31996,13 @@
 +#       define RADEON_CV1_CRTC_SHIFT        13
 +#       define RADEON_DFP2_CRTC_MASK        (1 << 14)
 +#       define RADEON_DFP2_CRTC_SHIFT       14
++#       define RADEON_ACC_REQ_LCD1          (1 << 16)
++#       define RADEON_ACC_REQ_CRT1          (1 << 17)
++#       define RADEON_ACC_REQ_TV1           (1 << 18)
++#       define RADEON_ACC_REQ_DFP1          (1 << 19)
++#       define RADEON_ACC_REQ_CRT2          (1 << 21)
++#       define RADEON_ACC_REQ_TV2           (1 << 22)
++#       define RADEON_ACC_REQ_DFP2          (1 << 23)
 +#define RADEON_BIOS_6_SCRATCH               0x0028
 +#       define RADEON_ACC_MODE_CHANGE       (1 << 2)
 +#       define RADEON_EXT_DESKTOP_MODE      (1 << 3)
@@ -35933,7 +37608,7 @@
  #endif
 diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h
 new file mode 100644
-index 0000000..60016d6
+index 0000000..686a6c4
 --- /dev/null
 +++ b/include/drm/drm_objects.h
 @@ -0,0 +1,913 @@
@@ -36385,7 +38060,7 @@
 +extern void drm_ttm_fixup_caching(struct drm_ttm *ttm);
 +extern struct page *drm_ttm_get_page(struct drm_ttm *ttm, int index);
 +extern void drm_ttm_cache_flush(struct page *pages[], unsigned long num_pages);
-+extern int drm_ttm_populate(struct drm_ttm *ttm);
++extern int drm_ttm_populate(struct drm_ttm *ttm, int cached);
 +extern int drm_ttm_set_user(struct drm_ttm *ttm,
 +			    struct task_struct *tsk,
 +			    unsigned long start,
@@ -36452,6 +38127,10 @@
 + * intent was.
 + */
 +#define DRM_TTM_PAGE_USER_DMA   (1 << 8)
++/*
++ * The pages in this TTM were allocated cached
++ */
++#define DRM_TTM_PAGE_ALLOC_CACHED   (1 << 9)
 +
 +/***************************************************
 + * Buffer objects. (drm_bo.c, drm_bo_move.c)
@@ -36600,9 +38279,6 @@
 +#define _DRM_FLAG_MEMTYPE_CMA       0x00000010	/* Can't map aperture */
 +#define _DRM_FLAG_MEMTYPE_CSELECT   0x00000020	/* Select caching */
 +
-+#define _DRM_BM_ALLOCATOR_CACHED 0x0
-+#define _DRM_BM_ALLOCATOR_UNCACHED 0x1
-+
 +struct drm_buffer_manager {
 +	struct drm_bo_lock bm_lock;
 +	struct mutex evict_mutex;
@@ -36617,7 +38293,6 @@
 +	unsigned long cur_pages;
 +	atomic_t count;
 +	struct page *dummy_read_page;
-+	int allocator_type;
 +};
 +
 +struct drm_bo_driver {

drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- drm-next.patch	13 Mar 2009 05:42:49 -0000	1.15
+++ drm-next.patch	3 Apr 2009 03:26:37 -0000	1.16
@@ -1,3 +1,14 @@
+commit 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Mar 16 15:37:02 2009 -0400
+
+    drm/radeon: fix logic in r600_page_table_init() to match ati_gart
+    
+    This fixes page table init on rs600.
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
 commit 06f0a488c1b642d3cd7769da66600e5148c3fad8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Mar 13 09:35:32 2009 +1000
@@ -3949,7 +3960,7 @@
  	cmdbuf->bufsz -= sizeof(u64);
 diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
 new file mode 100644
-index 0000000..76eb0d5
+index 0000000..9d14eee
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/r600_cp.c
 @@ -0,0 +1,2253 @@
@@ -4127,7 +4138,6 @@
 +		if (entry->busaddr[i] == 0) {
 +			DRM_ERROR("unable to map PCIGART pages!\n");
 +			r600_page_table_cleanup(dev, gart_info);
-+			ret = -EINVAL;
 +			goto done;
 +		}
 +		entry_addr = entry->busaddr[i];
@@ -4146,6 +4156,7 @@
 +			entry_addr += ATI_PCIGART_PAGE_SIZE;
 +		}
 +	}
++	ret = 1;
 +done:
 +	return ret;
 +}
@@ -6050,7 +6061,7 @@
 +			  dev_priv->gart_info.addr,
 +			  dev_priv->pcigart_offset);
 +
-+		if (r600_page_table_init(dev)) {
++		if (!r600_page_table_init(dev)) {
 +			DRM_ERROR("Failed to init GART table\n");
 +			r600_do_cleanup_cp(dev);
 +			return -EINVAL;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1314
retrieving revision 1.1315
diff -u -r1.1314 -r1.1315
--- kernel.spec	2 Apr 2009 23:54:23 -0000	1.1314
+++ kernel.spec	3 Apr 2009 03:26:37 -0000	1.1315
@@ -648,6 +648,7 @@
 Patch1812: drm-modesetting-radeon.patch
 Patch1814: drm-nouveau.patch
 Patch1816: drm-no-gem-on-i8xx.patch
+Patch1817: drm-f10-compat.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1222,6 +1223,7 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
+ApplyPatch drm-f10-compat.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1819,6 +1821,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com>
+- add backwards drm compat for radeon kms
+
 * Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-14
 - Linux 2.6.29.1
 - Dropped patches, merged upstream:



From dcantrel at fedoraproject.org  Fri Apr  3 03:28:11 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri,  3 Apr 2009 03:28:11 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.630, 1.631 anaconda.spec, 1.778, 
	1.779 sources, 1.764, 1.765
Message-ID: <20090403032811.8B5D670134@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27911

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.40-1
- Don't let device names affect action order in general case. (dlehman)
- Round up when aligning to pesize for space used. (#493656) (dlehman)
- Improve handling for various nodev filesystems in fstab. (#493685,
  #493202) (dlehman)
- Present the correct max lv size in the dialog. (dlehman)
- Use the head of the current branch, not master, for scratch archives.
  (dlehman)
- Make a top level StorageError that all others are based on. (dlehman)
- Remove unused PRePDevice class. (dlehman)
- Make the disk model an attribute of DiskDevice. (dlehman)
- Handle format actions in cancelAction() (dcantrell)
- Fix format check box for pre-existing partitions (#491675) (dcantrell)
- Remove temporary directory used in _getExistingSize() (dcantrell)
- Activate storage before looking up the hdiso source drive (#491781).
  (clumens)
- Remove isys.getDeviceByToken since it is no longer used. (clumens)
- Don't allow the rootfs on live installs to not match (#493206, #492727)
  (katzj)
- Create setup and teardown functs for dmraid devs. (jgranado)
- put xfs back where it belongs (sandeen)
- Fix up the other caller of unmountCD to pass in a device (#493537).
  (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -r1.630 -r1.631
--- .cvsignore	1 Apr 2009 21:34:19 -0000	1.630
+++ .cvsignore	3 Apr 2009 03:27:40 -0000	1.631
@@ -1,4 +1,2 @@
 clog
-anaconda-11.5.0.37.tar.bz2
-anaconda-11.5.0.38.tar.bz2
-anaconda-11.5.0.39.tar.bz2
+anaconda-11.5.0.40.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -r1.778 -r1.779
--- anaconda.spec	1 Apr 2009 21:34:19 -0000	1.778
+++ anaconda.spec	3 Apr 2009 03:27:40 -0000	1.779
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.39
+Version: 11.5.0.40
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,30 @@
 %endif
 
 %changelog
+* Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.40-1
+- Don't let device names affect action order in general case. (dlehman)
+- Round up when aligning to pesize for space used. (#493656) (dlehman)
+- Improve handling for various nodev filesystems in fstab. (#493685,
+  #493202) (dlehman)
+- Present the correct max lv size in the dialog. (dlehman)
+- Use the head of the current branch, not master, for scratch archives.
+  (dlehman)
+- Make a top level StorageError that all others are based on. (dlehman)
+- Remove unused PRePDevice class. (dlehman)
+- Make the disk model an attribute of DiskDevice. (dlehman)
+- Handle format actions in cancelAction() (dcantrell)
+- Fix format check box for pre-existing partitions (#491675) (dcantrell)
+- Remove temporary directory used in _getExistingSize() (dcantrell)
+- Activate storage before looking up the hdiso source drive (#491781).
+  (clumens)
+- Remove isys.getDeviceByToken since it is no longer used. (clumens)
+- Don't allow the rootfs on live installs to not match (#493206, #492727)
+  (katzj)
+- Create setup and teardown functs for dmraid devs. (jgranado)
+- put xfs back where it belongs (sandeen)
+- Fix up the other caller of unmountCD to pass in a device (#493537).
+  (clumens)
+
 * Wed Apr 01 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.39-1
 - Prevent sensitive information in kickstart files from ending up in
   tracebacks. (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -r1.764 -r1.765
--- sources	1 Apr 2009 21:34:19 -0000	1.764
+++ sources	3 Apr 2009 03:27:41 -0000	1.765
@@ -1 +1 @@
-bfcd8c207308041a107ad56a2f839ad8  anaconda-11.5.0.39.tar.bz2
+b598cf0206e4cc22b4f9c75261435997  anaconda-11.5.0.40.tar.bz2



From airlied at fedoraproject.org  Fri Apr  3 03:31:13 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 03:31:13 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic,1.225,1.226
Message-ID: <20090403033113.6E8C970134@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28756

Modified Files:
	config-generic 
Log Message:
reenable radeon kms



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- config-generic	2 Apr 2009 19:26:39 -0000	1.225
+++ config-generic	3 Apr 2009 03:30:43 -0000	1.226
@@ -2163,7 +2163,7 @@
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m



From transif at fedoraproject.org  Fri Apr  3 03:49:17 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  3 Apr 2009 03:49:17 +0000 (UTC)
Subject: comps/po ru.po,1.21,1.22
Message-ID: <20090403034917.58FD270134@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31720/po

Modified Files:
	ru.po 
Log Message:
Sending translation for Russian


Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ru.po	9 Jan 2009 11:52:42 -0000	1.21
+++ ru.po	3 Apr 2009 03:48:45 -0000	1.22
@@ -1,3 +1,4 @@
+# translation of ru.po to
 # translation of comps.HEAD.ru.po to
 # This file is distributed under the same license as the comps package.
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER.
@@ -8,13 +9,13 @@
 # Dmitri Alenitchev <alenitchev at nm.ru>, 2005.
 # Andrew Martynov <andrewm at inventa.ru>, 2004, 2005, 2006.
 # Yulia Poyarkova <ypoyarko at redhat.com>, 2006.
-# Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2008.
+# Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.ru\n"
+"Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-09-30 14:23+1000\n"
+"POT-Creation-Date: 2009-04-02 19:06+0000\n"
+"PO-Revision-Date: 2009-04-03 14:36+1100\n"
 "Last-Translator: Yulia Poyarkova <yulia.poyarkova at redhat.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,192 +31,192 @@
 "??????????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????????????? ??????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "???????????????????? ?????? ???????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "?????????????? ?????????????????? ?????????? ???????????????????????????????? Ruby."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "?????????????????? ?????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "?????????????????? ???????????????????????? ????????????????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "?????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "???????????? DNS"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "???????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "?????????????????? ???????????? ?? ????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
@@ -224,78 +225,78 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "?????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "?????????????????????? ?????????????????? ?????? ????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "?????????????? ?? ????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "?????????????????? ?????????????????????? (UK) ??????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "???????????? FTP"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "?????????????????? Fedora"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -305,19 +306,19 @@
 "?????????????????? ???????????????? ???? ???????????? ?? ?????????? ?? ??????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "?????????????????????? ?????????? GNOME"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "???????????????? ???????????????????? GNOME"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -326,169 +327,165 @@
 "????????????, ?????????????? ????????, ?????????????????? ?????????????????????? ?? ?????????????????????? ???????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "???????? ?? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????????? ???????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "??????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "?????????????????? ?????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "?????????????????? ???????????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? GNOME."
+msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? GNOME."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? XFCE."
+msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ?????????????????????? ???????????????????? GTK+ ?? XFCE."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "???????????????????? ?????? ???????????? ?????? ???????????????????? ???????????????????? QT ?? KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "???????????????????? ?????? ????????????, ?????????? ???????????????? ?????????????????????? ???????????????? ?????????? ?????? "
 "???????????????????????? ?????????????? ?????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "???????????????????? ?????? ???????????? ??????????????, ?????????? ???????????????? ?????????????????????? ?????????????????? "
 "???????????????????????? (X)"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "?????????????????? ?????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????????????? ???? Java"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "?????????????????????? ?????????? KDE"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "???????????????? ???????????????????? KDE"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -497,121 +494,121 @@
 "?????????????? ????????, ?????????????????? ???????????? ?? ?????????????????????? ???????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "??????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "???????????????????? ?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "???????????????? ???????????????????? ???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "?????????????????? ???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "???????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ?????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "???????? ???????????? MySQL"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "???????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ?????????????????? ????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "?????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -619,112 +616,110 @@
 msgstr "????????????, ?????????????????????????????? ?????????????????????? ???????????????????? ?? ???????????? ????????????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "?????????????????? ???????????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "???????? ???????????? PostgreSQL"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????? ?????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "???????????????? ?????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "??????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"?????????????? ?????????????? ??????????????????, ???? ???????????????????? ???????????? ????????????-???????? ???????????????? ??????????."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "?????????????? ?????????????? ??????????????????, ???? ???????????????????? ???????????? ????????????-???????? ???????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "?????????????????? ?????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "???????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "??????????????????, ???????????????????????? ?????? ?????????????? ?????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -733,77 +728,77 @@
 "?????????????????????????? ????????????. ???????????????? Emacs ?? Vi."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "???????? ?? ??????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "?????????????????? ???????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "?????????????????? ???????????? ????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "?????????????????? ???????????????????? ???????????????? ???? ?????????? ???????????????????????????????? Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "?????????????????? ?????????????? ????????????????, ???????????????????? ???? ?????????? ???????????????????????????????? Java."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "?????????????????? ???????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "?????????????????? ???????????????? ??????????"
 
@@ -812,7 +807,7 @@
 msgstr "?????????????????????????????? ?????????? ???????????????????? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
@@ -820,57 +815,51 @@
 "?????? ?????????????????? PDF ????????????, ?? ????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????????????? ????????????????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ???????????? ?????????????????? ?????????????????? ???????????????? ???????????? IMAP ?????? SMTP."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "?????? ???????????? ?????????????????? ?????????????????????????? ???????????????????? ?????? X Window System."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????? ???????????? ?????????????????? ?????????????????????????? ?????? ???????????????????? ?????? ?????? ????????????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr ""
-"?????? ???????????? ???????????????? ?? ???????? ?????????? ?????????????? ??????????????, ?????? DHCP, Kerberos ?? NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgstr "?????? ???????????? ???????????????? ?? ???????? ?????????? ?????????????? ??????????????, ?????? DHCP, Kerberos ?? NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"?????? ???????????? ???????????????? ?????????????? ?????????? ???????????????????? ????????????????????, ?????? rsh ?? telnet."
+msgstr "?????? ???????????? ???????????????? ?????????????? ?????????? ???????????????????? ????????????????????, ?????? rsh ?? telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ???????????? ???????????????????????? ?????????????????? ??????????????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ???????????? ???????????????????????? ?????????????????????????? ?? ?????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -879,7 +868,7 @@
 "???????????? ?? ?????????? ??????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -888,19 +877,19 @@
 "?????????????????????????????? ?? HTML, PDF, Postscript ?? ??????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ???????????????? ?????????????????? ???????????????????????? ?????????????? ?????? ??????-????????????"
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ???????????????? ?????????????????? ???????????????????????? ?????????????? ?????? ???????????? FTP."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -910,20 +899,20 @@
 "perl, python ?? ??????????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ???????????? ?????????????????? ???????????????????????? ?????????????? ?????? ???????????? ????????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "?????? ???????????? ???????????????? ?? ???????? ?????? ???????????????? ?????????????????????????????????? ??????????????, "
 "???????????????????? ?? Red Hat."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -932,13 +921,13 @@
 "???????????????? ?????????????????? ??????????????????????????????/?????????????? ??????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ???????????? ???????????????? ?????????????????????? ?????????????? ?????????????????????? ??????????, ?????? ?? ????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -948,14 +937,13 @@
 "???????????????????? ?? ????????????????????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????? ?? ???????????????? ?? ??????????????????."
+msgstr "?????? ???????????? ???????????????? ???????????????????? ?????????????????????? ?????? ???????????? ?? ???????????????? ?? ??????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -966,7 +954,7 @@
 "Window System"
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -977,23 +965,21 @@
 "???????????????????? ????????????, ?? ????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ?????????????????? ??????????????????????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
 "?????? ???????????? ???????????????? ?????????? ???????????????????????? ?????? ?????????????????? ???????????? ???????????? ?? "
 "??????????????????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -1003,13 +989,12 @@
 "?????????????? ?? SMB ????????????????, ?? ?????????????????? ?????? ?????????????????????? ???????????????? ??????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "???????????? ?? ???????? ???????????? ???????????????? ?????? ???????????????????? ?? ?????????????????? DNS (BIND)."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1018,330 +1003,358 @@
 "MS Windows(tm)."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ???????????? ???????????????? ????????????, ???????????????? ?????? ?????????????????????????? ?? MySQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ???????????? ???????????????? ????????????, ???????????????? ?????? ?????????????????????????? ?? Postgresql."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????????? ?? ??????????????, ?????????????????????? ???????????????????? Fedora"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "?????????????????? ?????????? ????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "?????????????????? ?????????? ????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "?????????????????? ???????????????? ???????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????? ?????????????? ???????????????????????? ?? ???????????????? ?????????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "??????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "?????? ????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "??????-????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "?????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "???????????????? ???????????? ?????? Windows"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "???????????????????? ???? ?????? X"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "?????????????? X Window"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "???????????????????? ???? ?????? XFCE"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "?????????????????? ?????????? ????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "?????????????????? ?????????? ????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "???????????? ???????????? Buildsystem"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????? ???? ???????????????? ?????? ?????????????????????? ???????????? ???? ?????????????? ??????????."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "?????????????????????????????? ?????????????????? ???????????????????? ???? ???????????? Eclipse."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "???????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "?????????????????? ???????????????????????????????? ??????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????? ???????????? ???????????? ?? ???????????????????? ?? ???????????????????? ????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????? ?????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "?????????????????? ?????????????????? ??????????"
+msgstr "?????????????????? ?????????????????? ??????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "?????????????????? ???????????????????????? ??????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????????????????? ????????????-???????????????????? ??????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "?????????????????? ???????????????? ?????????? SUGAR"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr ""
 "SUGAR ???????????????????????? ?????????? ?????????????????? ???????????????? ??????????, ?????????????????????????? ???????????????????? "
 "?????? OLPC XO."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
-msgstr "?????????????????? ???????????????????? ??????????"
+msgstr "?????????????????? ?????????????????????? ??????????"
+
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "?????????? ?????? ???????????????????????? ?? ?????????????????? ????????????????."
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "???????????????????? Haskell"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "???????????? ??????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "???????????? ?????? ?????????? ???????????? ???? ?????????????????? ????????????."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "?????????????????? ?????????? ??????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "?????????????????? ?????????? ??????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ?????????? ????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "?????????????????? ?????????? ????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "?????????????????? ???????????????????? ???????????????? ???? ?????????? ???????????????????????????????? Haskell."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "?????????????????? ?????????????????????? ??????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "?????????????????? ???????????????????? ??????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "?????????????????? ?????????????????? ??????????"
+msgstr "?????????????????? ?????????? Amazigh"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "?????????????????????? ???????????????????? ?? ?????????????????? ?????? ?????????????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "?????????????????????? ??????????????????????"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "???????????? ?????????????? ?? ???? ????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "?????????????????? ?????????????????????? ??????????"
+msgstr "?????????????????? ?????????????????? ??????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "?????????????????? ???????????????????????? ??????????"
+msgstr "?????????????????? ?????????????????????? ??????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "?????????????????? ?????????????????????? ??????????"
+msgstr "?????????????????? ?????????? ??????????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "?????????????????? ???????????????????? ??????????"
+msgstr "?????????????????? ???????????????????????????? ??????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "??????????-???????????????????? MinGW"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "?????????????????? ???????????????????? ??????????"
+msgstr "?????????????????? ???????????????????????? ??????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "????????????-?????????????? ?? ????????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "?????????????????????? ?????????????????? Sugar"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "?????????????????? ??????????-???????????????????? ?????? ???????????????? 32-???????????? ???????????????? Windows, ???? ???????????????????????? ?? ???????????? ???????????????????????? c ?????????????? Fedora."
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "?????????????????? ???????????????????? ???????????????? ?????? ???????????? ???????????????????? ?????????? ???????????????????????????????? CAML ?? ??????????????????."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ?????????????????? ??????????????????????."
+msgstr "???????????? ???????????????????????? ?????????? ?????????? ???????????? ?????? ????????????????????, ??????????????????, ?????????????????????? ?? ???????????????? ??????????????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "?????????????????? ?????????????????? ??????????"
+msgstr "?????????????????? ???????????????????????? ??????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "?????????????????? ?????????????????? ??????????"
+msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1392,20 +1405,17 @@
 msgstr "?????? ???????????? ???????????????? ?????????? ?????????????? ????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ???????????????? ??????????????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ??????????????????, ???????????????????????? "
 "??????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ???????????????? ??????????????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1413,6 +1423,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???????????? ???????????????? ?????????? ???????????? ?? ???????????????? ?????? ?????????????? ??????????????????????."
+



From ynemoy at fedoraproject.org  Fri Apr  3 04:09:30 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Fri,  3 Apr 2009 04:09:30 +0000 (UTC)
Subject: rpms/ghc-X11/F-10 ghc-X11.spec,1.1,1.2
Message-ID: <20090403040931.1151E70134@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3950

Modified Files:
	ghc-X11.spec 
Log Message:
replaces -devel.files with .files to build on F-10



Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-10/ghc-X11.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-X11.spec	2 Apr 2009 18:45:39 -0000	1.1
+++ ghc-X11.spec	3 Apr 2009 04:08:59 -0000	1.2
@@ -12,7 +12,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Haskell %{pkg_name} librar
 
 Group:          Development/Libraries
@@ -124,7 +124,7 @@
 %endif
 
 
-%files devel -f %{name}-devel.files
+%files devel -f %{name}.files
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Fri Apr  3 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
+- replaces -devel.files with .files to build on F-10
+
 * Sun Mar  8 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-5
 - corrected a faulty tag
 



From bskeggs at fedoraproject.org  Fri Apr  3 04:16:31 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri,  3 Apr 2009 04:16:31 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.26,
	1.27 dcbconf_7_4_ignore.diff, 1.1, 1.2 nouveau-fedora.patch,
	1.15, 1.16 sources, 1.27, 1.28 xorg-x11-drv-nouveau.spec, 1.32, 1.33
Message-ID: <20090403041631.3A27B70134@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990

Modified Files:
	.cvsignore dcbconf_7_4_ignore.diff nouveau-fedora.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Apr 03 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-21.20090403git11be9a9
- upstream update, loads of modesetting fixes
- rh#492819, rh#492427, rh#492289, rh#492289




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	30 Mar 2009 10:22:48 -0000	1.26
+++ .cvsignore	3 Apr 2009 04:16:00 -0000	1.27
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090330git9d46930.tar.bz2
+xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2

dcbconf_7_4_ignore.diff:

Index: dcbconf_7_4_ignore.diff
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/dcbconf_7_4_ignore.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dcbconf_7_4_ignore.diff	23 Mar 2009 03:50:36 -0000	1.1
+++ dcbconf_7_4_ignore.diff	3 Apr 2009 04:16:00 -0000	1.2
@@ -1,14 +1,13 @@
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 22421a0..86e9651 100644
+index fe6368e..7b56148 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
-@@ -4507,6 +4507,9 @@ parse_dcb_entry(ScrnInfoPtr pScrn, struct bios_parsed_dcb *bdcb, int index, uint
- 				mask = ~0x5;
- 				if (conf & 0x4)
- 					entry->lvdsconf.use_power_scripts = true;
-+
-+				if ((conf & 0xf0) == 0x60)
-+					mask &= ~0xf0;
- 			}
- 			if (conf & mask) {
- 				/* I'm bored of getting this reported; left as a reminder for someone to fix it */
+@@ -4104,6 +4104,8 @@ parse_dcb20_entry(ScrnInfoPtr pScrn, struct bios_parsed_dcb *bdcb,
+ 			mask = ~0x5;
+ 			if (conf & 0x4)
+ 				entry->lvdsconf.use_power_scripts = true;
++			if ((conf & 0xf0) == 0x60)
++				mask &= ~0xf0;
+ 		}
+ 		if (conf & mask) {
+ 			/* I'm bored of getting this reported; left as a reminder for someone to fix it */

nouveau-fedora.patch:

Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nouveau-fedora.patch	30 Mar 2009 01:39:07 -0000	1.15
+++ nouveau-fedora.patch	3 Apr 2009 04:16:00 -0000	1.16
@@ -11,7 +11,7 @@
  			 nouveau_output.h \
  			 nouveau_connector.h \
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 7ac7b67..b95ff84 100644
+index 8150a28..bc15231 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -185,6 +185,50 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
@@ -484,7 +484,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index fef0e02..8b7b3fe 100644
+index 7da48d2..fe6368e 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@
@@ -497,7 +497,7 @@
  #include "nv_include.h"
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4418,7 +4421,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4485,7 +4488,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
  
  bool NVInitVBIOS(ScrnInfoPtr pScrn)
  {
@@ -508,7 +508,7 @@
  
  	memset(bios, 0, sizeof(struct nvbios));
  
-@@ -4429,6 +4435,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4496,6 +4502,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
  	if (bios->length > NV_PROM_SIZE)
  		bios->length = NV_PROM_SIZE;
  
@@ -536,7 +536,7 @@
  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
  			   "[dri] unable to reference front buffer: %d\n", ret);
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 4a1a4b1..06f4a79 100644
+index 92232dd..d6391f3 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -604,7 +604,7 @@
  	if (!pNv->kms_enable) {
  		if (pNv->Architecture < NV_ARCH_50)
  			NVRestore(pScrn);
-@@ -1586,6 +1607,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1589,6 +1610,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
  		return FALSE;
  	pNv->GART = NULL;
  
@@ -613,7 +613,7 @@
  	ret = nouveau_bo_fake(&dev, Cursor0Offset,
  			      NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
  			      64 * 64 * 4, pNv->VRAMMap + Cursor0Offset,
-@@ -1626,11 +1649,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1629,11 +1652,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
  }
  
  static Bool
@@ -695,7 +695,7 @@
  
  	if (!pNv->dev)
  		return NVMapMemSW(pScrn);
-@@ -1647,45 +1740,42 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1650,45 +1743,42 @@ NVMapMem(ScrnInfoPtr pScrn)
  		size = size * (pScrn->bitsPerPixel >> 3);
  		size = size * pScrn->virtualY;
  	} else {
@@ -764,7 +764,7 @@
  	}
  
  	/* We don't need to allocate cursors / lut here if we're using
-@@ -1759,6 +1849,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
+@@ -1762,6 +1852,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
  	}
  
  	nouveau_bo_ref(NULL, &pNv->FB);
@@ -772,7 +772,7 @@
  	nouveau_bo_ref(NULL, &pNv->GART);
  	nouveau_bo_ref(NULL, &pNv->Cursor);
  	nouveau_bo_ref(NULL, &pNv->Cursor2);
-@@ -2274,6 +2365,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2277,6 +2368,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
  	bool on = xf86IsUnblank(mode);
  	int i;
  
@@ -804,7 +804,7 @@
  #ifndef exaMoveInPixmap
  extern void exaMoveInPixmap(PixmapPtr pPixmap);
 diff --git a/src/nv_type.h b/src/nv_type.h
-index 3eae469..f43dc4c 100644
+index 2ec4fba..5396cc8 100644
 --- a/src/nv_type.h
 +++ b/src/nv_type.h
 @@ -270,6 +270,7 @@ typedef struct _NVRec {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Mar 2009 10:22:48 -0000	1.27
+++ sources	3 Apr 2009 04:16:00 -0000	1.28
@@ -1 +1 @@
-74eeca3817c37dfa939deea30c29e1ec  xf86-video-nouveau-0.0.12-20090330git9d46930.tar.bz2
+55e911e7dadc7e445469a0be81b6306b  xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-nouveau.spec	30 Mar 2009 10:22:48 -0000	1.32
+++ xorg-x11-drv-nouveau.spec	3 Apr 2009 04:16:00 -0000	1.33
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090330
-%define git_version 9d46930
+%define gitdate 20090403
+%define git_version 11be9a9
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   20.%{snapshot}%{?dist}
+Release:   21.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,10 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Apr 03 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-21.20090403git11be9a9
+- upstream update, loads of modesetting fixes
+- rh#492819, rh#492427, rh#492289, rh#492289
+
 * Mon Mar 30 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-20.20090330git9d46930
 - xv bugfix
 



From cebbert at fedoraproject.org  Fri Apr  3 05:04:30 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  3 Apr 2009 05:04:30 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1499,1.1500
Message-ID: <20090403050430.F3D2170134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18091

Modified Files:
	kernel.spec 
Log Message:
copy sanity checking and build fixes from F-11


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1499
retrieving revision 1.1500
diff -u -r1.1499 -r1.1500
--- kernel.spec	2 Apr 2009 17:36:42 -0000	1.1499
+++ kernel.spec	3 Apr 2009 05:04:00 -0000	1.1500
@@ -916,6 +916,9 @@
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1;
   fi
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+    [ "${patch:0:10}" != "patch-2.6." ] && echo "Patch $patch not listed in specfile" && exit 1;
+  fi
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
@@ -1577,7 +1580,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{with_debug}
-%if !%{with_up}
+%if %{with_up}
 BuildKernel %make_target %kernel_image debug
 %endif
 %if %{with_pae}
@@ -1875,7 +1878,9 @@
 
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
+%if %{with_up}
 %kernel_variant_files %{with_debug} debug
+%endif
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
 %kernel_variant_files -k vmlinux %{with_kdump} kdump



From pkgdb at fedoraproject.org  Fri Apr  3 05:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:19:48 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403051955.BB286208555@bastion.fedora.phx.redhat.com>

peter has set the watchcommits acl on ejabberd (Fedora devel) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:19:54 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403051954.A8A6020854A@bastion.fedora.phx.redhat.com>

peter has set the watchbugzilla acl on ejabberd (Fedora devel) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:20:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:20:24 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052004.B4DCF208603@bastion.fedora.phx.redhat.com>

peter has set the commit acl on ejabberd (Fedora devel) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:20:20 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052020.5B490208550@bastion.fedora.phx.redhat.com>

peter has set the watchbugzilla acl on ejabberd (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:20:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:20:43 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052023.8D7B9208557@bastion.fedora.phx.redhat.com>

peter has set the watchcommits acl on ejabberd (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:20:49 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052029.ABF65208605@bastion.fedora.phx.redhat.com>

peter has set the commit acl on ejabberd (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:20:31 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052032.188382086EF@bastion.fedora.phx.redhat.com>

peter has set the approveacls acl on ejabberd (Fedora EPEL 5) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:10 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052050.017B3208555@bastion.fedora.phx.redhat.com>

peter has set the approveacls acl on ejabberd (Fedora devel) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:12 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052119.44BF9208550@bastion.fedora.phx.redhat.com>

peter has set the watchbugzilla acl on ejabberd (Fedora 10) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:21 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052121.E1093208556@bastion.fedora.phx.redhat.com>

peter has set the watchcommits acl on ejabberd (Fedora 10) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:44 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052124.9CD6D208605@bastion.fedora.phx.redhat.com>

peter has set the commit acl on ejabberd (Fedora 10) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:21 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052129.2DE36208609@bastion.fedora.phx.redhat.com>

peter has set the approveacls acl on ejabberd (Fedora 10) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:32 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052132.4050C2086EF@bastion.fedora.phx.redhat.com>

peter has set the watchbugzilla acl on ejabberd (Fedora 9) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:56 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052136.913812086F6@bastion.fedora.phx.redhat.com>

peter has set the commit acl on ejabberd (Fedora 9) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:57 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052138.6BA59208703@bastion.fedora.phx.redhat.com>

peter has set the watchcommits acl on ejabberd (Fedora 9) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From pkgdb at fedoraproject.org  Fri Apr  3 05:21:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 05:21:51 +0000
Subject: [pkgdb] ejabberd had acl change status
Message-ID: <20090403052152.12CCC208557@bastion.fedora.phx.redhat.com>

peter has set the approveacls acl on ejabberd (Fedora 9) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From transif at fedoraproject.org  Fri Apr  3 05:40:36 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  3 Apr 2009 05:40:36 +0000 (UTC)
Subject: comps/po kn.po,1.18,1.19
Message-ID: <20090403054037.01A0370134@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26700/po

Modified Files:
	kn.po 
Log Message:
Sending translation for Kannada


Index: kn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/kn.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kn.po	9 Jan 2009 11:52:38 -0000	1.18
+++ kn.po	3 Apr 2009 05:40:06 -0000	1.19
@@ -5,13 +5,13 @@
 #
 # Umesh Rudrapatna <urudrapatna at yahoo.com>, 2006.
 # shankar prasad <svenkate at redhat.com>, 2006.
-# Shankar Prasad <svenkate at redhat.com>, 2007, 2008.
+# Shankar Prasad <svenkate at redhat.com>, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-03 18:05+0530\n"
+"POT-Creation-Date: 2009-04-01 08:02+0000\n"
+"PO-Revision-Date: 2009-04-02 23:20+0530\n"
 "Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
 "Language-Team: Kannada <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,195 +26,195 @@
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "???????????????????????? ????????????????????????????????? ???????????? ?????????????????????????????? ???????????? ???????????? ???????????? ??????????????????-???????????? ???????????????."
+msgstr "???????????????????????? ????????????????????????????????? ???????????? ?????????????????????????????? ???????????? ???????????? ???????????? ????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "??????????????? ?????????????????????????????????  ??????????????????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "???????????? ??????????????????????????????????????? ?????????????????? ???????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????????????????????? ?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "????????????????????? ???????????? ???????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "????????? ???????????????"
 
@@ -223,78 +223,78 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "???????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "??????????????????????????? ???????????????????????? ???????????????????????? "
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "???????????????????????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "???????????????????????? (????????????) ???????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ?????????????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "?????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -304,19 +304,19 @@
 "?????????????????????????????????, ??? ???????????????????????? ??????????????? ???????????? ????????????????????????????????????????????? ????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -325,86 +325,86 @@
 "???????????????????????????,??????????????? ???????????? ?????????????????????????????? ????????? ??????????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "??????????????????????????? ??????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -412,80 +412,76 @@
 msgstr "GTK+ ??????????????? GNOME ?????????????????????????????? ????????????????????????????????? ???????????????????????? ??? ????????????????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"GTK+ ??????????????? XFCE ?????????????????????????????? ????????????????????????????????? ????????????????????????????????????????????? ??? ????????????????????????????????????????????? ?????????????????????????????????."
+msgstr "GTK+ ??????????????? XFCE ?????????????????????????????? ????????????????????????????????? ????????????????????????????????????????????? ??? ????????????????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ??????????????? KDE ?????????????????????????????? ????????????????????????????????? ???????????????????????? ???????????????????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "??????????????? ????????????????????? ??????????????????????????? ???????????? ??????????????? ???????????????????????? ?????????????????? ??????????????????????????????????????????????????? ??? ????????????????????????????????? "
 "?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
-msgstr ""
-"????????? ?????????????????????????????? ?????????????????? ???????????? (X ????????????) ????????????????????????????????? ??? ???????????????????????? ??????????????????????????? ?????????????????????????????????."
+msgid "Install this group of packages to use the base graphical (X) user interface."
+msgstr "????????? ?????????????????????????????? ?????????????????? ???????????? (X ????????????) ????????????????????????????????? ??? ???????????????????????? ??????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "???????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ????????????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -494,121 +490,121 @@
 "???????????????????????? ??????????????????????????? ???????????? ?????????????????????????????? ????????? ??????????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "??????????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "??????????????? (legacy) ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "??????????????? ???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ????????????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "??????????????? ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "???????????????/???????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -616,111 +612,110 @@
 msgstr "????????????????????????????????? ???????????????????????? ???????????? ?????????????????? ??????????????? ??????????????????????????? ?????????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ????????????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "????????????????????? ?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr "???????????? ??????????????? ??????????????????-???????????? ???????????????????????? ?????????????????????????????? ???????????? ????????????????????? ??????????????? ??????????????????????????????."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "???????????? ??????????????? ????????????????????? ???????????????????????? ?????????????????????????????? ???????????? ????????????????????? ??????????????? ??????????????????????????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "???????????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "????????? ??????????????????????????????????????? ?????????????????????????????????????????? ??????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -729,77 +724,77 @@
 "??????????????????????????????????????????????????????. Emacs ??????????????? Vi ??? ????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "???????????? ?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "???????????? ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ??????????????????????????????????????? ??????????????????????????? ????????????????????????????????????????????? ???????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ??????????????????????????????????????? ??????????????????????????? ????????????????????? ????????????????????????????????????????????? ????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "???????????????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "??????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "???????????? ???????????????"
 
@@ -808,46 +803,40 @@
 msgstr "??????????????????????????? ?????????????????? ????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr ""
-"??????????????? ??????????????????????????? ??????????????????????????? ????????????????????????, PDF ???????????????????????? ???????????? ????????? ?????????????????????????????????????????????????????????."
+msgstr "??????????????? ??????????????????????????? ??????????????????????????? ????????????????????????, PDF ???????????????????????? ???????????? ????????? ?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "????????????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ??? ???????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ???????????????????????????????????? IMAP ???????????? SMTP ???????????? ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "X Window ?????????????????????????????? ????????????????????????????????? ???????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
-msgstr ""
-"????????? ????????????????????????????????? ????????? ????????? ??????????????????????????? ??????????????????????????????????????????????????? ??? ???????????????????????????????????? ?????????????????????????????????????????????."
+msgid "These packages are helpful when developing web applications or web pages."
+msgstr "????????? ????????????????????????????????? ????????? ????????? ??????????????????????????? ??????????????????????????????????????????????????? ??? ???????????????????????????????????? ?????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ???????????????????????????????????? DHCP, Kerberos, NIS.?????????????????? ?????????????????????????????? ?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -856,17 +845,17 @@
 "?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "??? ???????????????????????????????????? ?????????????????????????????? ?????????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ???????????????????????????????????? ?????????????????? ???????????????????????????????????? ??????????????? ?????????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -875,7 +864,7 @@
 "???????????????????????? ??????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -884,19 +873,19 @@
 "???????????? ???????????????????????? ????????????????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ???????????????????????? ??????????????? ???????????????????????? ????????? ????????????????????????????????????????????? ????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ???????????????????????? ??????????????? ???????????????????????? FTP ????????????????????????????????????????????? ????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -906,18 +895,18 @@
 "?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ???????????? ??????????????? ???????????????????????? ?????????????????? ????????????????????????????????? ???????????????????????? ??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ???????????? Red Hat ??? ??????????????? ???????????????????????? ????????????????????? ?????????????????? ????????????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -926,13 +915,13 @@
 "??????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ???????????? ???????????????????????? ??????-????????????, ????????? ???????????? ????????????????????? ????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -942,7 +931,7 @@
 "???????????? ?????????????????? ?????????????????????????????????????????? ??????????????????????????? ?????????????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
@@ -950,7 +939,7 @@
 "?????????????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -960,7 +949,7 @@
 "?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -970,21 +959,19 @@
 "???????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ?????????????????? ?????????????????????????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ???????????? ??????????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ?????????????????? ??????????????? ???????????????????????? ????????????????????? ???????????????????????? ???????????? ??????????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -994,15 +981,14 @@
 "????????????????????????????????????????????????????????? ???????????????????????? ?????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "??? ???????????????????????? ???????????? ??????????????? ???????????????????????? ????????????????????????????????????????????? (DNS name server (BIND)) ????????????????????? "
 "??????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1011,328 +997,356 @@
 "??????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ???????????????????????? ???????????? MySQL ??????????????? ??????????????????????????????????????? ?????????????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ???????????????????????? ???????????? Postgresql ??????????????? ??????????????????????????????????????? ?????????????????????????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "???????????? ?????????????????? ?????????????????????????????????????????? ????????????????????? ??????????????? ???????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????? ??????????????? ???????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "????????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "????????????????????????????????????????????? (Virtualization)"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "????????????????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X Window ????????????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "????????????????????????????????????????????????????????????(???????????????????????????????????????) ??????????????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "??????????????? ??????????????????????????????"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????????????????? ??????????????????????????? ?????????????????? ??????????????? ????????????????????????????????? ????????????????????????????????????."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "??????????????????????????? ??????????????? ?????????????????? ?????????????????? ???????????????."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "????????????????????????(??????????????????) ????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "???????????? ?????????????????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "??????????????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "???????????? ????????????????????????????????? ???????????? ????????????????????????????????? ????????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "??????????????????????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "???????????????????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "?????????????????? ???????????????"
+msgstr "???????????????????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "????????????????????????????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "??????????????? ???????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ??????????????????????????? OLPC XO ???????????? ??????????????????????????? ????????????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "??????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "????????????????????? ??????????????? ?????????????????? ???????????????????????? ???????????? ???????????????????????? ????????? ???????????????."
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "?????????????????????????????? ???????????????????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "???????????? ?????????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "???????????????????????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????? ?????????????????????????????????."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (?????????????????????) ???????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "??????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "?????????????????????????????? ?????????????????????????????????????????? ??????????????????????????? ????????????????????????????????????????????? ???????????????????????? ???????????????."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "????????????????????? ???????????????"
+msgstr "????????????????????? ???????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "???????????????????????? ??????????????????????????????????????????????????? ????????????????????? ???????????? ??????????????????????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "????????????????????????????????? ???????????????????????????"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "??????????????????????????? ????????????????????? ???????????? ???????????????????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "???????????????????????? ???????????????"
+msgstr "?????????????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "???????????????????????? ???????????????"
+msgstr "?????????????????????????????????  ???????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????? ???????????????"
+msgstr "???????????????????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "??????????????? ???????????????"
+msgstr "?????????????????? ???????????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ??????????????????-?????????????????????"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "??????????????????????????? ???????????????"
+msgstr "??????????????????????????? ???????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "??????????????????????????? ??????????????? ???????????? ????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "??????????????? ????????? ????????????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "32 ????????????????????? ???????????????????????????????????? ??????????????????-??????????????????????????? ????????????????????????????????????????????? ???????????????, ??????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????????????????? ????????????????????? ???????????????, ???????????? ????????????????????????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "????????????????????????????????? CAML ??????????????????????????????????????? ??????????????????????????? ???????????? ??????????????????????????????????????? ??????????????????????????? ??????????????????????????????????????? ???????????????????????? ???????????????."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "??? ?????????????????? ?????????????????????????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ???????????? ??????????????????????????? ???????????????."
+msgstr "??? ????????????????????? ?????????????????? ????????????????????????????????? ???????????????, ???????????????????????????????????????, ???????????????????????????????????????????????? ??????????????????????????????????????? ???????????? ?????????????????????????????????????????? ??????????????????????????? ??????????????? ????????????????????????????????????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "?????????????????? ???????????????"
+msgstr "???????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "???????????????????????? ???????????????"
+msgstr "?????????????????? ???????????????????????? ???????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1383,18 +1397,15 @@
 msgstr "??? ?????????????????? ??????????????? ?????????????????? ??????????????????????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??? ?????????????????? ????????????????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ???????????? ?????????????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??? ?????????????????? ?????????????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ???????????? ?????????????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ?????????????????? ????????????????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ???????????? ?????????????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1402,6 +1413,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ?????????????????? ???????????? ????????????????????? ???????????????????????? ???????????? ?????????????????????????????? ???????????? ?????????????????????????????????????????????."
+



From dchen at fedoraproject.org  Fri Apr  3 05:41:04 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri,  3 Apr 2009 05:41:04 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.11, 1.12 ibus-chewing.spec,
	1.13, 1.14 import.log, 1.6, 1.7 sources, 1.11, 1.12
Message-ID: <20090403054104.B433970134@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26902/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Dialog labels aligned  Fix iBus Google issue 326  CMake modules revised  Add 2 make targets.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Mar 2009 07:41:36 -0000	1.11
+++ .cvsignore	3 Apr 2009 05:40:34 -0000	1.12
@@ -1 +1 @@
-ibus-chewing-1.0.5.20090330-Source.tar.gz
+ibus-chewing-1.0.6.20090403-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ibus-chewing.spec	30 Mar 2009 07:41:36 -0000	1.13
+++ ibus-chewing.spec	3 Apr 2009 05:40:34 -0000	1.14
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.5.20090330
+Version:    1.0.6.20090403
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -12,7 +12,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.1
-BuildRequires:  cmake
+BuildRequires:  cmake >= 2.4
 BuildRequires:  gob2
 BuildRequires:  libchewing-devel >= 0.3.2-4
 BuildRequires:  pkgconfig
@@ -73,6 +73,13 @@
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.6.20090403-1
+- Fix iBus Google issue 326: Fail to build with CMake < 2.6.3
+- DateFormate.cmake is merged to BasicMacros.cmake
+- See headers of cmake modules in cmake_modules/ for detailed changed.
+- Add a make target "version_check" 
+- Add a make developer target "new_version"  which are hidden for ordinary users.
+
 * Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1
 - Added tooltips.
 - Revealed the sync caps lock setting.
@@ -93,10 +100,9 @@
 * Wed Mar 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.3.20090311-1
 - IBus Google issue 305:  ibus-chewing.schema -> ibus-chewing.schemas
 - IBus Google issue 307:  hardcoded chewing datadir
-- Sync chewing candPerPage and IBusTable->page_size
+    - Sync chewing candPerPage and IBusTable->page_size
 - Sync between IM and keyboard (Experimental)
-
-- ibus-chewing.schema -> ibus-chewing.schemas
+    - ibus-chewing.schema -> ibus-chewing.schemas
 
 * Tue Mar 03 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.2.20090303-1
 - Required gconf2 -> GConf2.
@@ -135,3 +141,7 @@
 
 * Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - The first version.
+
+
+
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	30 Mar 2009 07:41:36 -0000	1.6
+++ import.log	3 Apr 2009 05:40:34 -0000	1.7
@@ -4,3 +4,4 @@
 ibus-chewing-1_0_3_20090311-1_fc10:HEAD:ibus-chewing-1.0.3.20090311-1.fc10.src.rpm:1236834036
 ibus-chewing-1_0_4_20090323-2_fc10:HEAD:ibus-chewing-1.0.4.20090323-2.fc10.src.rpm:1237775380
 ibus-chewing-1_0_5_20090330-1_fc10:HEAD:ibus-chewing-1.0.5.20090330-1.fc10.src.rpm:1238398686
+ibus-chewing-1_0_6_20090403-1_fc10:HEAD:ibus-chewing-1.0.6.20090403-1.fc10.src.rpm:1238737188


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Mar 2009 07:41:36 -0000	1.11
+++ sources	3 Apr 2009 05:40:34 -0000	1.12
@@ -1 +1 @@
-e31d1a158b0abd7d3ef29ba519b3110d  ibus-chewing-1.0.5.20090330-Source.tar.gz
+7e3ad7dfa4b37b7353670a6eec2cfef5  ibus-chewing-1.0.6.20090403-Source.tar.gz



From dchen at fedoraproject.org  Fri Apr  3 06:30:35 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri,  3 Apr 2009 06:30:35 +0000 (UTC)
Subject: rpms/libsvm/devel libsvm-2.89.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 import.log, 1.3, 1.4 libsvm.spec, 1.34, 1.35 sources, 1.5,
	1.6 libsvm-2.88.patch, 1.3, NONE
Message-ID: <20090403063036.029CF70134@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6334/devel

Modified Files:
	.cvsignore import.log libsvm.spec sources 
Added Files:
	libsvm-2.89.patch 
Removed Files:
	libsvm-2.88.patch 
Log Message:
Upstream update to 2.89

libsvm-2.89.patch:

--- NEW FILE libsvm-2.89.patch ---
diff -up ./java/Makefile.bak ./java/Makefile
--- ./java/Makefile.bak	2009-02-18 10:41:04.000000000 +1000
+++ ./java/Makefile	2009-04-03 15:13:40.000000000 +1000
@@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
 		libsvm/svm_print_interface.class \
 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
 
+JAVA_TARGETDIR=${INSTDIR}/share/libsvm/java
+JAVA_DOCDIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
+CLASSPATH = .
 #JAVAC = jikes
-JAVAC_FLAGS = -target 1.5 -source 1.5
+JAVAC_FLAGS = -target 1.5 -source 1.5  -classpath ${CLASSPATH}
+ifndef JAVAC
 JAVAC = javac
+endif
 # JAVAC_FLAGS =
 
+ifndef JAR
+JAR=jar
+endif
+
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	${JAR} cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -18,8 +27,24 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc: docs/index.html
+
+docs/index.html: $(FILES)
+	javadoc -d docs *.java libsvm/*.java
+
+install: 
+	mkdir -p ${JAVA_TARGETDIR}
+	install -m 644 libsvm.jar ${JAVA_TARGETDIR}
+	install -m 644 test_applet.html ${JAVA_TARGETDIR}
+#	mkdir -p ${JAVA_DOCDIR}
+#	cd docs; cp -R * ${JAVA_DOCDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+	rm -fr ${JAVA_DOCDIR}
+
 clean:
 	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
+	rm -rf docs
 
 dist: clean all
 	rm *.class libsvm/*.class
diff -up ./java/test_applet.html.bak ./java/test_applet.html
--- ./java/test_applet.html.bak	2003-07-12 14:07:32.000000000 +1000
+++ ./java/test_applet.html	2009-04-03 15:04:06.000000000 +1000
@@ -1 +1,3 @@
-<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
+<html>
+<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
+</html>
diff -up ./Makefile.bak ./Makefile
--- ./Makefile.bak	2008-09-15 14:36:48.000000000 +1000
+++ ./Makefile	2009-04-03 15:04:06.000000000 +1000
@@ -1,11 +1,40 @@
 CXX? = g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
 SHVER = 1
+MAKE = make
+DOT_LIBS=.libs
+LIBS= -L${DOT_LIBS} -lsvm
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
+
+export INSTDIR
+
+IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${IS_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+ifndef LIBDIR
+LIBDIR=/usr/lib${IS_64}
+endif
+
+export LIBDIR
+export LIB_INSTDIR
+
+
+all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
 
 lib: svm.o
-	$(CXX) -shared svm.o -o libsvm.so.$(SHVER)
+	$(CXX) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o  -o libsvm.so.$(SHVER)
+	ln -sf libsvm.so.$(SHVER) libsvm.so
 
 svm-predict: svm-predict.c svm.o
 	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
@@ -16,4 +45,59 @@ svm-scale: svm-scale.c
 svm.o: svm.cpp svm.h
 	$(CXX) $(CFLAGS) -c svm.cpp
 clean:
-	rm -f *~ svm.o svm-train svm-predict svm-scale
+	rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/gtk/svm-toy-gtk  svm-toy/qt/svm-toy-qt
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+svm-toy-gtk:
+	${MAKE} -C svm-toy/gtk
+svm-toy-qt:
+	${MAKE} -C svm-toy/qt
+ 
+install: all
+	mkdir -p ${INSTDIR}/bin
+	install -m 755 svm-train ${INSTDIR}/bin
+	install -m 755 svm-predict ${INSTDIR}/bin
+	install -m 755 svm-scale ${INSTDIR}/bin
+	mkdir -p ${LIB_INSTDIR}
+	install -m 755 libsvm.so.$(SHVER) ${LIB_INSTDIR}
+# install package libsvm-devel
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 *.h ${INSTDIR}/share/libsvm/src
+	install -m 644 *.c ${INSTDIR}/share/libsvm/src
+	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
+	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
+	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
+# install package libsvm-python
+	${MAKE} -C python install
+# install package libsvm-java
+	${MAKE} -C java install
+# install package svm-toy
+	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
+	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
+# install examples
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+uninstall:
+	rm -f ${INSTDIR}/bin/svm-train
+	rm -f ${INSTDIR}/bin/svm-predict
+	rm -f ${INSTDIR}/bin/svm-scale
+	rm -fr ${INSTDIR}/libsvm/examples
+	rm -f ${INSTDIR}/include/libsvm/svm.h
+	rm -f ${LIB_INSTDIR}/libsvm/svm.o
+	rm -fr ${INSTDIR}/libsvm/src
+	rm -fr ${INSTDIR}/libsvm
+	${MAKE} -C python uninstall
+	${MAKE} -C java uninstall
+	rm -f ${INSTDIR}/bin/svm-toy-gtk
+	rm -f ${INSTDIR}/bin/svm-toy-qt
+
+
diff -up ./python/Makefile.bak ./python/Makefile
--- ./python/Makefile.bak	2008-12-10 09:05:08.000000000 +1000
+++ ./python/Makefile	2009-04-03 15:21:19.000000000 +1000
@@ -2,9 +2,11 @@ CXX? = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.5
+PYTHON_INCLUDEDIR ?= /usr/include/python${PYTHON_VERSION}
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
+CFLAGS_PYTHON = ${CFLAGS}  -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
 # Mac OS
 # LDFLAGS = -framework Python -bundle
@@ -15,16 +17,31 @@ svmc.so: svmc_wrap.o svm.o
 	$(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o svm.o
 
 svmc_wrap.o: svmc_wrap.c ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c svmc_wrap.c
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c svmc_wrap.c
 
 svmc_wrap.c: svmc.i
 	$(SWIG) -python -noproxy svmc.i
 
 svm.o: ../svm.cpp ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c ../svm.cpp
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c ../svm.cpp
 
 clean:
 	rm -f *~ *.o *.so *.pyc *.pyo svm.o
 
 moreclean:	clean
 	rm -f svmc_wrap.c
+
+
+install: all
+	mkdir -p ${PYTHON_TARGETDIR}
+	install -m 755 cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 svm.py ${PYTHON_TARGETDIR}
+	install -m 755 svm_test.py ${PYTHON_TARGETDIR}
+	install -m 755 test_cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 *.i ${PYTHON_TARGETDIR}
+	install -m 755 *.so ${PYTHON_TARGETDIR}
+	install -m 755 ../tools/*.py ${PYTHON_TARGETDIR}
+
+uninstall:
+	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
+
diff -up ./svm-toy/gtk/callbacks.cpp.bak ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.bak	2006-03-04 17:40:12.000000000 +1000
+++ ./svm-toy/gtk/callbacks.cpp	2009-04-03 15:04:06.000000000 +1000
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <list>
+#include <cstdlib>
 #include "callbacks.h"
 #include "interface.h"
 #include "../../svm.h"
diff -up ./svm-toy/gtk/Makefile.bak ./svm-toy/gtk/Makefile
--- ./svm-toy/gtk/Makefile.bak	2007-10-14 16:29:12.000000000 +1000
+++ ./svm-toy/gtk/Makefile	2009-04-03 15:04:06.000000000 +1000
@@ -2,21 +2,27 @@ CC? = gcc
 CXX? = g++
 CFLAGS = -Wall -O3 -g `gtk-config --cflags`
 LIBS = `gtk-config --libs`
+COPT = -Wall -O3 -g `pkg-config --cflags --libs gtk+-2.0`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
 
-svm-toy: main.o interface.o callbacks.o ../../svm.o
-	$(CXX) $(CFLAGS) main.o interface.o callbacks.o ../../svm.o -o svm-toy $(LIBS)
+
+all: svm-toy-gtk
+
+svm-toy-gtk: main.o interface.o callbacks.o 
+	$(CXX) $(COPT) main.o interface.o callbacks.o ${LIBS} -o svm-toy-gtk
 
 main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
+	$(CC) $(COPT) -c main.c
 
 interface.o: interface.c interface.h
-	$(CC) $(CFLAGS) -c interface.c
+	$(CC) $(COPT) -c interface.c
 
 callbacks.o: callbacks.cpp callbacks.h
-	$(CXX) $(CFLAGS) -c callbacks.cpp
+	$(CXX) $(COPT) -c callbacks.cpp
 
-../../svm.o:
-	cd ../..; make svm.o
+#../../svm.o:
+#	cd ../..; make svm.o
 
 clean:
-	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
+	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
diff -up ./svm-toy/qt/Makefile.bak ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.bak	2008-12-19 16:42:05.000000000 +1000
+++ ./svm-toy/qt/Makefile	2009-04-03 15:25:25.000000000 +1000
@@ -1,17 +1,20 @@
 CXX? = g++
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
+CFLAGS = -Wall -O3
+FLAGS:=${CFLAGS} `pkg-config --cflags --libs QtGui`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
+
 INCLUDE = /usr/include/qt4
 MOC = /usr/bin/moc-qt4
 
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
-	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
+all: svm-toy-qt
+
+svm-toy-qt: svm-toy.cpp svm-toy.moc
+	$(CXX) $(FLAGS) svm-toy.cpp ${LIBS} -o svm-toy-qt
 
 svm-toy.moc: svm-toy.cpp
 	$(MOC) svm-toy.cpp -o svm-toy.moc
 
-../../svm.o:
-	cd ../..; make svm.o
-
 clean:
-	rm -f *~ svm-toy svm-toy.moc ../../svm.o
+	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
 
diff -up ./tools/easy.py.bak ./tools/easy.py
--- ./tools/easy.py.bak	2009-01-14 07:13:26.000000000 +1000
+++ ./tools/easy.py	2009-04-03 15:04:06.000000000 +1000
@@ -2,6 +2,7 @@
 
 import sys
 import os
+from distutils.sysconfig import get_python_lib
 from subprocess import *
 
 if len(sys.argv) <= 1:
@@ -12,10 +13,10 @@ if len(sys.argv) <= 1:
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-	svmscale_exe = "../svm-scale"
-	svmtrain_exe = "../svm-train"
-	svmpredict_exe = "../svm-predict"
-	grid_py = "./grid.py"
+	svmscale_exe = "/usr/bin/svm-scale"
+	svmtrain_exe = "/usr/bin/svm-train"
+	svmpredict_exe = "/usr/bin/svm-predict"
+	grid_py = get_python_lib(1)+"/libsvm/grid.py"
 	gnuplot_exe = "/usr/bin/gnuplot"
 else:
         # example for windows
diff -up ./tools/grid.py.bak ./tools/grid.py
--- ./tools/grid.py.bak	2008-08-08 20:41:11.000000000 +1000
+++ ./tools/grid.py	2009-04-03 15:04:06.000000000 +1000
@@ -11,7 +11,7 @@ from subprocess import *
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-       svmtrain_exe = "../svm-train"
+       svmtrain_exe = "/usr/bin/svm-train"
        gnuplot_exe = "/usr/bin/gnuplot"
 else:
        # example for windows
@@ -88,6 +88,7 @@ Usage: grid.py [-log2c begin,end,step] [
         i = i + 1
 
     pass_through_string = join(pass_through_options," ")
+    print 'dataset_pathname=%s' % dataset_pathname
     assert os.path.exists(svmtrain_exe),"svm-train executable not found"    
     assert os.path.exists(gnuplot_exe),"gnuplot executable not found"
     assert os.path.exists(dataset_pathname),"dataset not found"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Nov 2008 08:00:37 -0000	1.5
+++ .cvsignore	3 Apr 2009 06:30:04 -0000	1.6
@@ -1,2 +1,2 @@
 guide.pdf
-libsvm-2.88.tar.gz
+libsvm-2.89.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	11 Nov 2008 01:06:17 -0000	1.3
+++ import.log	3 Apr 2009 06:30:04 -0000	1.4
@@ -1,3 +1,4 @@
 libsvm-2_88-0_fc9:HEAD:libsvm-2.88-0.fc9.src.rpm:1226043285
 libsvm-2_88-1_fc9:HEAD:libsvm-2.88-1.fc9.src.rpm:1226296273
 libsvm-2_88-2_fc9:HEAD:libsvm-2.88-2.fc9.src.rpm:1226365469
+libsvm-2_89-1_fc10:HEAD:libsvm-2.89-1.fc10.src.rpm:1238738697


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libsvm.spec	25 Feb 2009 19:09:26 -0000	1.34
+++ libsvm.spec	3 Apr 2009 06:30:04 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           libsvm
-Version:        2.88
-Release:        4%{?dist}
+Version:        2.89
+Release:        1%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -97,7 +97,7 @@
 
 %prep
 %setup -q 
-%patch0 -p0 -b .bak 
+%patch0 -p0 -b .orig
 cp %{SOURCE1} ChangeLog
 cp %{SOURCE2} .
 cp %{SOURCE3} .
@@ -203,14 +203,23 @@
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.88-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.88-3
-- Rebuild for Python 2.6
+* Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-1
+- Upstream Update to 2.89:
+  + reduce input/loading time of svm-train/svm-predict by half
+  + pointer function so users can specify their own outputs
+  + remove info_flush() 
+  + a extern variable libsvm_version
+  + svm-train -q option (disable outputs)
+  + svm-scale: warning if more nonzero produced
+  + easy.py: popel.communiate() to avoid some deadlock (if lots of
+    outputs when #classes is large)
 
 * Mon Nov 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-2
 - Fix java BuildRequire and Build
+- javadoc have been removed because ppc and ppc64 do not have a 
+  suitable package to build javadoc in F-8, nor does javadoc
+  provide much useful information.
+
 
 * Wed Nov 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-0
 - Note:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Nov 2008 08:00:37 -0000	1.5
+++ sources	3 Apr 2009 06:30:04 -0000	1.6
@@ -1,2 +1,2 @@
 aae7a8f7e357e86e1c893b706bb02a63  guide.pdf
-1b69c7d887d349b13f9f2cf245310fea  libsvm-2.88.tar.gz
+71975f20d37b30eb13a3ec8897f4f546  libsvm-2.89.tar.gz


--- libsvm-2.88.patch DELETED ---



From pnemade at fedoraproject.org  Fri Apr  3 06:41:55 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri,  3 Apr 2009 06:41:55 +0000 (UTC)
Subject: rpms/m17n-contrib/devel mai-inscript.mim, NONE,
	1.1 m17n-contrib.spec, 1.24, 1.25
Message-ID: <20090403064155.AEB9570134@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9280

Modified Files:
	m17n-contrib.spec 
Added Files:
	mai-inscript.mim 
Log Message:
* Fri Apr 03 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-2
- Resolves: rh#491794 [mai_IN] Removing @maithili-support removes m17n-db-hindi package
- Resolves: rh#493793 [mai_IN] No default keymap for language




--- NEW FILE mai-inscript.mim ---
;; mai-inscript.mim -- Maithili input method for inscript layout
;; This file is derived from the Hindi inscript table of scim-tables,
;; which was derived from iiimf unitLE's Hindi inscript layout.
;; Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.

;; This file is part of the m17n contrib; a sub-part of the m17n
;; library.

;; The m17n library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public License
;; as published by the Free Software Foundation; either version 2.1 of
;; the License, or (at your option) any later version.

;; The m17n library is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
;; Lesser General Public License for more details.

;; You should have received a copy of the GNU Lesser General Public
;; License along with the m17n library; if not, write to the Free
;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.

(input-method mai inscript)

(description "Maithili input method for inscript layout.

Reference URL : http://indlinux.org/wiki/index.php/InscriptLayouts#Devanagari

Key Summary:
1. ????????? : % 
         This can also be typed as a sequence of following:                 
                ??? + ???  + ??? i.e. p + d + }
2. ????????? : ^
          This can also be typed as a sequence of following:
                 ??? + ???  + ??? i.e. l + d + j
 
3. ????????? : &
          This can also be typed as a sequence of following:
                 ??? + ???  + ??? i.e. k + d + <
 
4. ????????? : *
         This can also be typed as a sequence of following:
                 ??? + ???  + ??? i.e. M + d + j
                 
Key summary: Rajesh Ranjan <rranjan at redhat.com>                 

")

(title "???")

(map
 (trans
  ((KP_1) "???")
  ((KP_2) "???")
  ((KP_3) "???")
  ((KP_4) "???")
  ((KP_5) "???")
  ((KP_6) "???")
  ((KP_7) "???")
  ((KP_8) "???")
  ((KP_9) "???")
  ((KP_0) "???")
  ((KP_Decimal) ".")
  ((KP_Divide) "/")
  ((KP_Multiply) "*")
  ((KP_Add) "+")
  ((KP_Subtract) "-") 
 
  ("!" ????)
  ("1" ????)
  ("@" ????)
  ("2" ????)
  ("#" ?#)
  ("3" ????)
  ("$" ?$)
  ("4" ????)
  ("5" ????)
  ("6" ????)
  ("7" ????)
  ("8" ????)
  ("(" ?()
  ("9" ????)
  (")" ?))
  ("0" ????)
  ("_" ????)
  ("-" ?-)
  ("+" ????)
  ("=" ????)
  ("Q" ????)
  ("q" ????)
  ("W" ????)
  ("w" ????)
  ("E" ????)
  ("e" ????)
  ("R" ????)
  ("r" ????)
  ("T" ????)
  ("t" ????)
  ("Y" ????)
  ("y" ????)
  ("U" ????)
  ("u" ????)
  ("I" ????)
  ("i" ????)
  ("O" ????)
  ("o" ????)
  ("P" ????)
  ("p" ????)
  ("{" ????)
  ("[" ????)
  ("}" ????)
  ("]" ????)
  ("A" ????)
  ("a" ????)
  ("S" ????)
  ("s" ????)
  ("D" ????)
  ("d" ????)
  ("F" ????)
  ("f" ????)
  ("G" ????)
  ("g" ????)
  ("H" ????)
  ("h" ????)
  ("J" ????)
  ("j" ????)
  ("K" ????)
  ("k" ????)
  ("L" ????)
  ("l" ????)
  (":" ????)
  (";" ????)
  ("\"" ????)
  ("'" ????)
  ("|" ????)
  ("\\" ????)
  ("~" ????)
  ("`" ????)
  ("Z" ????)
  ("z" ????)
  ("X" ????)
  ("x" ????)
  ("C" ????)
  ("c" ????)
  ("V" ????)
  ("v" ????)
  ("B" ????)
  ("b" ????)
  ("N" ????)
  ("n" ????)
  ("M" ????)
  ("m" ????)
  ("<" ????)
  ("," ?,)
  (">" ????)
  ("." ?.)
  ("?" ????)
  ("/" ????)
  ("%" "?????????")
  ("^" "?????????")
  ("&" "?????????")
  ("*" "?????????")
  ("dd" "??????") 
  ))

(state
  (init
    (trans)))


Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- m17n-contrib.spec	3 Mar 2009 05:54:50 -0000	1.24
+++ m17n-contrib.spec	3 Apr 2009 06:41:25 -0000	1.25
@@ -1,11 +1,12 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
 Version:  1.1.9
-Release:  1%{?dist}
+Release:  2%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/m17n-contrib-%{version}.tar.gz
+Source1:  mai-inscript.mim
 Patch0:	  bug433416-bn-probhat.patch
 Patch1:	  as-inscript-keysummary-440201.patch
 Patch2:   ml-inscript-keysummary-435259.patch
@@ -73,6 +74,7 @@
 %mk_pkg_uses_db gujarati gu 1
 %mk_pkg_uses_db hindi hi 1
 %mk_pkg_uses_db kannada kn 1
+%mk_pkg_uses_db maithili mai 0
 %mk_pkg_uses_db malayalam ml 1
 %mk_pkg marathi mr 1
 %mk_pkg nepali ne 1
@@ -104,6 +106,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 # generate .engine files for ibus-m17n for now
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ibus/engine
@@ -123,6 +126,10 @@
 %{_datadir}/m17n/scripts
 
 %changelog
+* Fri Apr 03 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-2
+- Resolves: rh#491794 [mai_IN] Removing @maithili-support removes m17n-db-hindi package
+- Resolves: rh#493793 [mai_IN] No default keymap for language
+
 * Tue Mar 03 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-1
 - Update to new upstream release 1.1.9
 



From dchen at fedoraproject.org  Fri Apr  3 06:58:13 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri,  3 Apr 2009 06:58:13 +0000 (UTC)
Subject: rpms/libsvm/F-10 libsvm-2.89.patch, NONE, 1.1 import.log, 1.3,
	1.4 libsvm.spec, 1.3, 1.4 sources, 1.1, 1.2 libsvm-2.88.patch,
	1.3, NONE
Message-ID: <20090403065813.7B10F70134@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13522/F-10

Modified Files:
	import.log libsvm.spec sources 
Added Files:
	libsvm-2.89.patch 
Removed Files:
	libsvm-2.88.patch 
Log Message:
Upstream update to 2.89

libsvm-2.89.patch:

--- NEW FILE libsvm-2.89.patch ---
diff -up ./java/Makefile.bak ./java/Makefile
--- ./java/Makefile.bak	2009-02-18 10:41:04.000000000 +1000
+++ ./java/Makefile	2009-04-03 15:13:40.000000000 +1000
@@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
 		libsvm/svm_print_interface.class \
 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
 
+JAVA_TARGETDIR=${INSTDIR}/share/libsvm/java
+JAVA_DOCDIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
+CLASSPATH = .
 #JAVAC = jikes
-JAVAC_FLAGS = -target 1.5 -source 1.5
+JAVAC_FLAGS = -target 1.5 -source 1.5  -classpath ${CLASSPATH}
+ifndef JAVAC
 JAVAC = javac
+endif
 # JAVAC_FLAGS =
 
+ifndef JAR
+JAR=jar
+endif
+
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	${JAR} cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -18,8 +27,24 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc: docs/index.html
+
+docs/index.html: $(FILES)
+	javadoc -d docs *.java libsvm/*.java
+
+install: 
+	mkdir -p ${JAVA_TARGETDIR}
+	install -m 644 libsvm.jar ${JAVA_TARGETDIR}
+	install -m 644 test_applet.html ${JAVA_TARGETDIR}
+#	mkdir -p ${JAVA_DOCDIR}
+#	cd docs; cp -R * ${JAVA_DOCDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+	rm -fr ${JAVA_DOCDIR}
+
 clean:
 	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
+	rm -rf docs
 
 dist: clean all
 	rm *.class libsvm/*.class
diff -up ./java/test_applet.html.bak ./java/test_applet.html
--- ./java/test_applet.html.bak	2003-07-12 14:07:32.000000000 +1000
+++ ./java/test_applet.html	2009-04-03 15:04:06.000000000 +1000
@@ -1 +1,3 @@
-<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
+<html>
+<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
+</html>
diff -up ./Makefile.bak ./Makefile
--- ./Makefile.bak	2008-09-15 14:36:48.000000000 +1000
+++ ./Makefile	2009-04-03 15:04:06.000000000 +1000
@@ -1,11 +1,40 @@
 CXX? = g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
 SHVER = 1
+MAKE = make
+DOT_LIBS=.libs
+LIBS= -L${DOT_LIBS} -lsvm
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
+
+export INSTDIR
+
+IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${IS_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+ifndef LIBDIR
+LIBDIR=/usr/lib${IS_64}
+endif
+
+export LIBDIR
+export LIB_INSTDIR
+
+
+all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
 
 lib: svm.o
-	$(CXX) -shared svm.o -o libsvm.so.$(SHVER)
+	$(CXX) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o  -o libsvm.so.$(SHVER)
+	ln -sf libsvm.so.$(SHVER) libsvm.so
 
 svm-predict: svm-predict.c svm.o
 	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
@@ -16,4 +45,59 @@ svm-scale: svm-scale.c
 svm.o: svm.cpp svm.h
 	$(CXX) $(CFLAGS) -c svm.cpp
 clean:
-	rm -f *~ svm.o svm-train svm-predict svm-scale
+	rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/gtk/svm-toy-gtk  svm-toy/qt/svm-toy-qt
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+svm-toy-gtk:
+	${MAKE} -C svm-toy/gtk
+svm-toy-qt:
+	${MAKE} -C svm-toy/qt
+ 
+install: all
+	mkdir -p ${INSTDIR}/bin
+	install -m 755 svm-train ${INSTDIR}/bin
+	install -m 755 svm-predict ${INSTDIR}/bin
+	install -m 755 svm-scale ${INSTDIR}/bin
+	mkdir -p ${LIB_INSTDIR}
+	install -m 755 libsvm.so.$(SHVER) ${LIB_INSTDIR}
+# install package libsvm-devel
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 *.h ${INSTDIR}/share/libsvm/src
+	install -m 644 *.c ${INSTDIR}/share/libsvm/src
+	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
+	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
+	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
+# install package libsvm-python
+	${MAKE} -C python install
+# install package libsvm-java
+	${MAKE} -C java install
+# install package svm-toy
+	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
+	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
+# install examples
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+uninstall:
+	rm -f ${INSTDIR}/bin/svm-train
+	rm -f ${INSTDIR}/bin/svm-predict
+	rm -f ${INSTDIR}/bin/svm-scale
+	rm -fr ${INSTDIR}/libsvm/examples
+	rm -f ${INSTDIR}/include/libsvm/svm.h
+	rm -f ${LIB_INSTDIR}/libsvm/svm.o
+	rm -fr ${INSTDIR}/libsvm/src
+	rm -fr ${INSTDIR}/libsvm
+	${MAKE} -C python uninstall
+	${MAKE} -C java uninstall
+	rm -f ${INSTDIR}/bin/svm-toy-gtk
+	rm -f ${INSTDIR}/bin/svm-toy-qt
+
+
diff -up ./python/Makefile.bak ./python/Makefile
--- ./python/Makefile.bak	2008-12-10 09:05:08.000000000 +1000
+++ ./python/Makefile	2009-04-03 15:21:19.000000000 +1000
@@ -2,9 +2,11 @@ CXX? = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.5
+PYTHON_INCLUDEDIR ?= /usr/include/python${PYTHON_VERSION}
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
+CFLAGS_PYTHON = ${CFLAGS}  -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
 # Mac OS
 # LDFLAGS = -framework Python -bundle
@@ -15,16 +17,31 @@ svmc.so: svmc_wrap.o svm.o
 	$(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o svm.o
 
 svmc_wrap.o: svmc_wrap.c ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c svmc_wrap.c
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c svmc_wrap.c
 
 svmc_wrap.c: svmc.i
 	$(SWIG) -python -noproxy svmc.i
 
 svm.o: ../svm.cpp ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c ../svm.cpp
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c ../svm.cpp
 
 clean:
 	rm -f *~ *.o *.so *.pyc *.pyo svm.o
 
 moreclean:	clean
 	rm -f svmc_wrap.c
+
+
+install: all
+	mkdir -p ${PYTHON_TARGETDIR}
+	install -m 755 cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 svm.py ${PYTHON_TARGETDIR}
+	install -m 755 svm_test.py ${PYTHON_TARGETDIR}
+	install -m 755 test_cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 *.i ${PYTHON_TARGETDIR}
+	install -m 755 *.so ${PYTHON_TARGETDIR}
+	install -m 755 ../tools/*.py ${PYTHON_TARGETDIR}
+
+uninstall:
+	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
+
diff -up ./svm-toy/gtk/callbacks.cpp.bak ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.bak	2006-03-04 17:40:12.000000000 +1000
+++ ./svm-toy/gtk/callbacks.cpp	2009-04-03 15:04:06.000000000 +1000
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <list>
+#include <cstdlib>
 #include "callbacks.h"
 #include "interface.h"
 #include "../../svm.h"
diff -up ./svm-toy/gtk/Makefile.bak ./svm-toy/gtk/Makefile
--- ./svm-toy/gtk/Makefile.bak	2007-10-14 16:29:12.000000000 +1000
+++ ./svm-toy/gtk/Makefile	2009-04-03 15:04:06.000000000 +1000
@@ -2,21 +2,27 @@ CC? = gcc
 CXX? = g++
 CFLAGS = -Wall -O3 -g `gtk-config --cflags`
 LIBS = `gtk-config --libs`
+COPT = -Wall -O3 -g `pkg-config --cflags --libs gtk+-2.0`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
 
-svm-toy: main.o interface.o callbacks.o ../../svm.o
-	$(CXX) $(CFLAGS) main.o interface.o callbacks.o ../../svm.o -o svm-toy $(LIBS)
+
+all: svm-toy-gtk
+
+svm-toy-gtk: main.o interface.o callbacks.o 
+	$(CXX) $(COPT) main.o interface.o callbacks.o ${LIBS} -o svm-toy-gtk
 
 main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
+	$(CC) $(COPT) -c main.c
 
 interface.o: interface.c interface.h
-	$(CC) $(CFLAGS) -c interface.c
+	$(CC) $(COPT) -c interface.c
 
 callbacks.o: callbacks.cpp callbacks.h
-	$(CXX) $(CFLAGS) -c callbacks.cpp
+	$(CXX) $(COPT) -c callbacks.cpp
 
-../../svm.o:
-	cd ../..; make svm.o
+#../../svm.o:
+#	cd ../..; make svm.o
 
 clean:
-	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
+	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
diff -up ./svm-toy/qt/Makefile.bak ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.bak	2008-12-19 16:42:05.000000000 +1000
+++ ./svm-toy/qt/Makefile	2009-04-03 15:25:25.000000000 +1000
@@ -1,17 +1,20 @@
 CXX? = g++
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
+CFLAGS = -Wall -O3
+FLAGS:=${CFLAGS} `pkg-config --cflags --libs QtGui`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
+
 INCLUDE = /usr/include/qt4
 MOC = /usr/bin/moc-qt4
 
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
-	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
+all: svm-toy-qt
+
+svm-toy-qt: svm-toy.cpp svm-toy.moc
+	$(CXX) $(FLAGS) svm-toy.cpp ${LIBS} -o svm-toy-qt
 
 svm-toy.moc: svm-toy.cpp
 	$(MOC) svm-toy.cpp -o svm-toy.moc
 
-../../svm.o:
-	cd ../..; make svm.o
-
 clean:
-	rm -f *~ svm-toy svm-toy.moc ../../svm.o
+	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
 
diff -up ./tools/easy.py.bak ./tools/easy.py
--- ./tools/easy.py.bak	2009-01-14 07:13:26.000000000 +1000
+++ ./tools/easy.py	2009-04-03 15:04:06.000000000 +1000
@@ -2,6 +2,7 @@
 
 import sys
 import os
+from distutils.sysconfig import get_python_lib
 from subprocess import *
 
 if len(sys.argv) <= 1:
@@ -12,10 +13,10 @@ if len(sys.argv) <= 1:
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-	svmscale_exe = "../svm-scale"
-	svmtrain_exe = "../svm-train"
-	svmpredict_exe = "../svm-predict"
-	grid_py = "./grid.py"
+	svmscale_exe = "/usr/bin/svm-scale"
+	svmtrain_exe = "/usr/bin/svm-train"
+	svmpredict_exe = "/usr/bin/svm-predict"
+	grid_py = get_python_lib(1)+"/libsvm/grid.py"
 	gnuplot_exe = "/usr/bin/gnuplot"
 else:
         # example for windows
diff -up ./tools/grid.py.bak ./tools/grid.py
--- ./tools/grid.py.bak	2008-08-08 20:41:11.000000000 +1000
+++ ./tools/grid.py	2009-04-03 15:04:06.000000000 +1000
@@ -11,7 +11,7 @@ from subprocess import *
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-       svmtrain_exe = "../svm-train"
+       svmtrain_exe = "/usr/bin/svm-train"
        gnuplot_exe = "/usr/bin/gnuplot"
 else:
        # example for windows
@@ -88,6 +88,7 @@ Usage: grid.py [-log2c begin,end,step] [
         i = i + 1
 
     pass_through_string = join(pass_through_options," ")
+    print 'dataset_pathname=%s' % dataset_pathname
     assert os.path.exists(svmtrain_exe),"svm-train executable not found"    
     assert os.path.exists(gnuplot_exe),"gnuplot executable not found"
     assert os.path.exists(dataset_pathname),"dataset not found"


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	11 Nov 2008 01:07:33 -0000	1.3
+++ import.log	3 Apr 2009 06:57:42 -0000	1.4
@@ -1,3 +1,4 @@
 libsvm-2_88-0_fc9:F-10:libsvm-2.88-0.fc9.src.rpm:1226049467
 libsvm-2_88-1_fc9:F-10:libsvm-2.88-1.fc9.src.rpm:1226297083
 libsvm-2_88-2_fc9:F-10:libsvm-2.88-2.fc9.src.rpm:1226365621
+libsvm-2_89-1_fc10:F-10:libsvm-2.89-1.fc10.src.rpm:1238740885


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/libsvm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsvm.spec	11 Nov 2008 01:07:33 -0000	1.3
+++ libsvm.spec	3 Apr 2009 06:57:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libsvm
-Version:        2.88
-Release:        2%{?dist}
+Version:        2.89
+Release:        1%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -97,7 +97,7 @@
 
 %prep
 %setup -q 
-%patch0 -p0 -b .bak 
+%patch0 -p0 -b .orig
 cp %{SOURCE1} ChangeLog
 cp %{SOURCE2} .
 cp %{SOURCE3} .
@@ -203,8 +203,23 @@
 
 
 %changelog
+* Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-1
+- Upstream Update to 2.89:
+  + reduce input/loading time of svm-train/svm-predict by half
+  + pointer function so users can specify their own outputs
+  + remove info_flush() 
+  + a extern variable libsvm_version
+  + svm-train -q option (disable outputs)
+  + svm-scale: warning if more nonzero produced
+  + easy.py: popel.communiate() to avoid some deadlock (if lots of
+    outputs when #classes is large)
+
 * Mon Nov 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-2
 - Fix java BuildRequire and Build
+- javadoc have been removed because ppc and ppc64 do not have a 
+  suitable package to build javadoc in F-8, nor does javadoc
+  provide much useful information.
+
 
 * Wed Nov 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-0
 - Note:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Nov 2008 09:19:00 -0000	1.1
+++ sources	3 Apr 2009 06:57:43 -0000	1.2
@@ -1,2 +1,2 @@
 aae7a8f7e357e86e1c893b706bb02a63  guide.pdf
-1b69c7d887d349b13f9f2cf245310fea  libsvm-2.88.tar.gz
+71975f20d37b30eb13a3ec8897f4f546  libsvm-2.89.tar.gz


--- libsvm-2.88.patch DELETED ---



From dchen at fedoraproject.org  Fri Apr  3 07:04:45 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri,  3 Apr 2009 07:04:45 +0000 (UTC)
Subject: rpms/libsvm/F-9 libsvm-2.89.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 import.log, 1.3, 1.4 libsvm.spec, 1.32, 1.33 sources, 1.5,
	1.6 libsvm-2.88.patch, 1.3, NONE
Message-ID: <20090403070445.688E670134@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15618/F-9

Modified Files:
	.cvsignore import.log libsvm.spec sources 
Added Files:
	libsvm-2.89.patch 
Removed Files:
	libsvm-2.88.patch 
Log Message:
Upstream update to 2.89

libsvm-2.89.patch:

--- NEW FILE libsvm-2.89.patch ---
diff -up ./java/Makefile.bak ./java/Makefile
--- ./java/Makefile.bak	2009-02-18 10:41:04.000000000 +1000
+++ ./java/Makefile	2009-04-03 15:13:40.000000000 +1000
@@ -4,13 +4,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
 		libsvm/svm_print_interface.class \
 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
 
+JAVA_TARGETDIR=${INSTDIR}/share/libsvm/java
+JAVA_DOCDIR=${INSTDIR}/share/javadoc/libsvm-${LIBSVM_VER}
+CLASSPATH = .
 #JAVAC = jikes
-JAVAC_FLAGS = -target 1.5 -source 1.5
+JAVAC_FLAGS = -target 1.5 -source 1.5  -classpath ${CLASSPATH}
+ifndef JAVAC
 JAVAC = javac
+endif
 # JAVAC_FLAGS =
 
+ifndef JAR
+JAR=jar
+endif
+
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	${JAR} cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -18,8 +27,24 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc: docs/index.html
+
+docs/index.html: $(FILES)
+	javadoc -d docs *.java libsvm/*.java
+
+install: 
+	mkdir -p ${JAVA_TARGETDIR}
+	install -m 644 libsvm.jar ${JAVA_TARGETDIR}
+	install -m 644 test_applet.html ${JAVA_TARGETDIR}
+#	mkdir -p ${JAVA_DOCDIR}
+#	cd docs; cp -R * ${JAVA_DOCDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+	rm -fr ${JAVA_DOCDIR}
+
 clean:
 	rm -f libsvm/*.class *.class *.jar libsvm/*~ *~ libsvm/svm.java
+	rm -rf docs
 
 dist: clean all
 	rm *.class libsvm/*.class
diff -up ./java/test_applet.html.bak ./java/test_applet.html
--- ./java/test_applet.html.bak	2003-07-12 14:07:32.000000000 +1000
+++ ./java/test_applet.html	2009-04-03 15:04:06.000000000 +1000
@@ -1 +1,3 @@
-<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
+<html>
+<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
+</html>
diff -up ./Makefile.bak ./Makefile
--- ./Makefile.bak	2008-09-15 14:36:48.000000000 +1000
+++ ./Makefile	2009-04-03 15:04:06.000000000 +1000
@@ -1,11 +1,40 @@
 CXX? = g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
 SHVER = 1
+MAKE = make
+DOT_LIBS=.libs
+LIBS= -L${DOT_LIBS} -lsvm
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
+
+export INSTDIR
+
+IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${IS_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+ifndef LIBDIR
+LIBDIR=/usr/lib${IS_64}
+endif
+
+export LIBDIR
+export LIB_INSTDIR
+
+
+all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
 
 lib: svm.o
-	$(CXX) -shared svm.o -o libsvm.so.$(SHVER)
+	$(CXX) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o  -o libsvm.so.$(SHVER)
+	ln -sf libsvm.so.$(SHVER) libsvm.so
 
 svm-predict: svm-predict.c svm.o
 	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
@@ -16,4 +45,59 @@ svm-scale: svm-scale.c
 svm.o: svm.cpp svm.h
 	$(CXX) $(CFLAGS) -c svm.cpp
 clean:
-	rm -f *~ svm.o svm-train svm-predict svm-scale
+	rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/gtk/svm-toy-gtk  svm-toy/qt/svm-toy-qt
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+svm-toy-gtk:
+	${MAKE} -C svm-toy/gtk
+svm-toy-qt:
+	${MAKE} -C svm-toy/qt
+ 
+install: all
+	mkdir -p ${INSTDIR}/bin
+	install -m 755 svm-train ${INSTDIR}/bin
+	install -m 755 svm-predict ${INSTDIR}/bin
+	install -m 755 svm-scale ${INSTDIR}/bin
+	mkdir -p ${LIB_INSTDIR}
+	install -m 755 libsvm.so.$(SHVER) ${LIB_INSTDIR}
+# install package libsvm-devel
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 *.h ${INSTDIR}/share/libsvm/src
+	install -m 644 *.c ${INSTDIR}/share/libsvm/src
+	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
+	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
+	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
+	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
+	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
+# install package libsvm-python
+	${MAKE} -C python install
+# install package libsvm-java
+	${MAKE} -C java install
+# install package svm-toy
+	install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
+	install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
+# install examples
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+uninstall:
+	rm -f ${INSTDIR}/bin/svm-train
+	rm -f ${INSTDIR}/bin/svm-predict
+	rm -f ${INSTDIR}/bin/svm-scale
+	rm -fr ${INSTDIR}/libsvm/examples
+	rm -f ${INSTDIR}/include/libsvm/svm.h
+	rm -f ${LIB_INSTDIR}/libsvm/svm.o
+	rm -fr ${INSTDIR}/libsvm/src
+	rm -fr ${INSTDIR}/libsvm
+	${MAKE} -C python uninstall
+	${MAKE} -C java uninstall
+	rm -f ${INSTDIR}/bin/svm-toy-gtk
+	rm -f ${INSTDIR}/bin/svm-toy-qt
+
+
diff -up ./python/Makefile.bak ./python/Makefile
--- ./python/Makefile.bak	2008-12-10 09:05:08.000000000 +1000
+++ ./python/Makefile	2009-04-03 15:21:19.000000000 +1000
@@ -2,9 +2,11 @@ CXX? = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.5
+PYTHON_INCLUDEDIR ?= /usr/include/python${PYTHON_VERSION}
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
+CFLAGS_PYTHON = ${CFLAGS}  -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
 # Mac OS
 # LDFLAGS = -framework Python -bundle
@@ -15,16 +17,31 @@ svmc.so: svmc_wrap.o svm.o
 	$(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o svm.o
 
 svmc_wrap.o: svmc_wrap.c ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c svmc_wrap.c
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c svmc_wrap.c
 
 svmc_wrap.c: svmc.i
 	$(SWIG) -python -noproxy svmc.i
 
 svm.o: ../svm.cpp ../svm.h
-	$(CXX) $(CFLAGS) -fPIC -c ../svm.cpp
+	$(CXX) $(CFLAGS_PYTHON) -fPIC -c ../svm.cpp
 
 clean:
 	rm -f *~ *.o *.so *.pyc *.pyo svm.o
 
 moreclean:	clean
 	rm -f svmc_wrap.c
+
+
+install: all
+	mkdir -p ${PYTHON_TARGETDIR}
+	install -m 755 cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 svm.py ${PYTHON_TARGETDIR}
+	install -m 755 svm_test.py ${PYTHON_TARGETDIR}
+	install -m 755 test_cross_validation.py ${PYTHON_TARGETDIR}
+	install -m 644 *.i ${PYTHON_TARGETDIR}
+	install -m 755 *.so ${PYTHON_TARGETDIR}
+	install -m 755 ../tools/*.py ${PYTHON_TARGETDIR}
+
+uninstall:
+	rm -fr ${LIBDIR}/python${PYTHON_VERSION}/site-packages/libsvm
+
diff -up ./svm-toy/gtk/callbacks.cpp.bak ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.bak	2006-03-04 17:40:12.000000000 +1000
+++ ./svm-toy/gtk/callbacks.cpp	2009-04-03 15:04:06.000000000 +1000
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <list>
+#include <cstdlib>
 #include "callbacks.h"
 #include "interface.h"
 #include "../../svm.h"
diff -up ./svm-toy/gtk/Makefile.bak ./svm-toy/gtk/Makefile
--- ./svm-toy/gtk/Makefile.bak	2007-10-14 16:29:12.000000000 +1000
+++ ./svm-toy/gtk/Makefile	2009-04-03 15:04:06.000000000 +1000
@@ -2,21 +2,27 @@ CC? = gcc
 CXX? = g++
 CFLAGS = -Wall -O3 -g `gtk-config --cflags`
 LIBS = `gtk-config --libs`
+COPT = -Wall -O3 -g `pkg-config --cflags --libs gtk+-2.0`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
 
-svm-toy: main.o interface.o callbacks.o ../../svm.o
-	$(CXX) $(CFLAGS) main.o interface.o callbacks.o ../../svm.o -o svm-toy $(LIBS)
+
+all: svm-toy-gtk
+
+svm-toy-gtk: main.o interface.o callbacks.o 
+	$(CXX) $(COPT) main.o interface.o callbacks.o ${LIBS} -o svm-toy-gtk
 
 main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
+	$(CC) $(COPT) -c main.c
 
 interface.o: interface.c interface.h
-	$(CC) $(CFLAGS) -c interface.c
+	$(CC) $(COPT) -c interface.c
 
 callbacks.o: callbacks.cpp callbacks.h
-	$(CXX) $(CFLAGS) -c callbacks.cpp
+	$(CXX) $(COPT) -c callbacks.cpp
 
-../../svm.o:
-	cd ../..; make svm.o
+#../../svm.o:
+#	cd ../..; make svm.o
 
 clean:
-	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
+	rm -f *~ callbacks.o svm-toy-gtk main.o interface.o callbacks.o
diff -up ./svm-toy/qt/Makefile.bak ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.bak	2008-12-19 16:42:05.000000000 +1000
+++ ./svm-toy/qt/Makefile	2009-04-03 15:25:25.000000000 +1000
@@ -1,17 +1,20 @@
 CXX? = g++
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
+CFLAGS = -Wall -O3
+FLAGS:=${CFLAGS} `pkg-config --cflags --libs QtGui`
+LOCAL_LIBDIR=../../
+LIBS= -L${LOCAL_LIBDIR} -lsvm
+
 INCLUDE = /usr/include/qt4
 MOC = /usr/bin/moc-qt4
 
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
-	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
+all: svm-toy-qt
+
+svm-toy-qt: svm-toy.cpp svm-toy.moc
+	$(CXX) $(FLAGS) svm-toy.cpp ${LIBS} -o svm-toy-qt
 
 svm-toy.moc: svm-toy.cpp
 	$(MOC) svm-toy.cpp -o svm-toy.moc
 
-../../svm.o:
-	cd ../..; make svm.o
-
 clean:
-	rm -f *~ svm-toy svm-toy.moc ../../svm.o
+	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
 
diff -up ./tools/easy.py.bak ./tools/easy.py
--- ./tools/easy.py.bak	2009-01-14 07:13:26.000000000 +1000
+++ ./tools/easy.py	2009-04-03 15:04:06.000000000 +1000
@@ -2,6 +2,7 @@
 
 import sys
 import os
+from distutils.sysconfig import get_python_lib
 from subprocess import *
 
 if len(sys.argv) <= 1:
@@ -12,10 +13,10 @@ if len(sys.argv) <= 1:
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-	svmscale_exe = "../svm-scale"
-	svmtrain_exe = "../svm-train"
-	svmpredict_exe = "../svm-predict"
-	grid_py = "./grid.py"
+	svmscale_exe = "/usr/bin/svm-scale"
+	svmtrain_exe = "/usr/bin/svm-train"
+	svmpredict_exe = "/usr/bin/svm-predict"
+	grid_py = get_python_lib(1)+"/libsvm/grid.py"
 	gnuplot_exe = "/usr/bin/gnuplot"
 else:
         # example for windows
diff -up ./tools/grid.py.bak ./tools/grid.py
--- ./tools/grid.py.bak	2008-08-08 20:41:11.000000000 +1000
+++ ./tools/grid.py	2009-04-03 15:04:06.000000000 +1000
@@ -11,7 +11,7 @@ from subprocess import *
 
 is_win32 = (sys.platform == 'win32')
 if not is_win32:
-       svmtrain_exe = "../svm-train"
+       svmtrain_exe = "/usr/bin/svm-train"
        gnuplot_exe = "/usr/bin/gnuplot"
 else:
        # example for windows
@@ -88,6 +88,7 @@ Usage: grid.py [-log2c begin,end,step] [
         i = i + 1
 
     pass_through_string = join(pass_through_options," ")
+    print 'dataset_pathname=%s' % dataset_pathname
     assert os.path.exists(svmtrain_exe),"svm-train executable not found"    
     assert os.path.exists(gnuplot_exe),"gnuplot executable not found"
     assert os.path.exists(dataset_pathname),"dataset not found"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Nov 2008 09:20:26 -0000	1.5
+++ .cvsignore	3 Apr 2009 07:04:14 -0000	1.6
@@ -1,2 +1,2 @@
 guide.pdf
-libsvm-2.88.tar.gz
+libsvm-2.89.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	11 Nov 2008 01:08:45 -0000	1.3
+++ import.log	3 Apr 2009 07:04:14 -0000	1.4
@@ -1,3 +1,4 @@
 libsvm-2_88-0_fc9:F-9:libsvm-2.88-0.fc9.src.rpm:1226049580
 libsvm-2_88-1_fc9:F-9:libsvm-2.88-1.fc9.src.rpm:1226301358
 libsvm-2_88-2_fc9:F-9:libsvm-2.88-2.fc9.src.rpm:1226365691
+libsvm-2_89-1_fc10:F-9:libsvm-2.89-1.fc10.src.rpm:1238742191


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-9/libsvm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libsvm.spec	11 Nov 2008 01:08:45 -0000	1.32
+++ libsvm.spec	3 Apr 2009 07:04:14 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           libsvm
-Version:        2.88
-Release:        2%{?dist}
+Version:        2.89
+Release:        1%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -97,7 +97,7 @@
 
 %prep
 %setup -q 
-%patch0 -p0 -b .bak 
+%patch0 -p0 -b .orig
 cp %{SOURCE1} ChangeLog
 cp %{SOURCE2} .
 cp %{SOURCE3} .
@@ -203,8 +203,23 @@
 
 
 %changelog
+* Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-1
+- Upstream Update to 2.89:
+  + reduce input/loading time of svm-train/svm-predict by half
+  + pointer function so users can specify their own outputs
+  + remove info_flush() 
+  + a extern variable libsvm_version
+  + svm-train -q option (disable outputs)
+  + svm-scale: warning if more nonzero produced
+  + easy.py: popel.communiate() to avoid some deadlock (if lots of
+    outputs when #classes is large)
+
 * Mon Nov 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-2
 - Fix java BuildRequire and Build
+- javadoc have been removed because ppc and ppc64 do not have a 
+  suitable package to build javadoc in F-8, nor does javadoc
+  provide much useful information.
+
 
 * Wed Nov 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-0
 - Note:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Nov 2008 09:20:26 -0000	1.5
+++ sources	3 Apr 2009 07:04:14 -0000	1.6
@@ -1,2 +1,2 @@
 aae7a8f7e357e86e1c893b706bb02a63  guide.pdf
-1b69c7d887d349b13f9f2cf245310fea  libsvm-2.88.tar.gz
+71975f20d37b30eb13a3ec8897f4f546  libsvm-2.89.tar.gz


--- libsvm-2.88.patch DELETED ---



From jwrdegoede at fedoraproject.org  Fri Apr  3 07:30:13 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  3 Apr 2009 07:30:13 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel 04-iscsi, 1.1,
	1.2 iscsi-initiator-utils.spec, 1.42, 1.43
Message-ID: <20090403073014.026F370134@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22194

Modified Files:
	04-iscsi iscsi-initiator-utils.spec 
Log Message:
* Fri Apr  3 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-8
- Stop the NM script from exiting with an error status when it
  didn't do anything (#493411)



Index: 04-iscsi
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/04-iscsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 04-iscsi	13 Oct 2008 18:12:29 -0000	1.1
+++ 04-iscsi	3 Apr 2009 07:29:43 -0000	1.2
@@ -3,13 +3,15 @@
 export LC_ALL=C
 
 if [ "$2" = "down" ]; then
-	/sbin/ip route ls | grep -q ^default || {
-		[ -f /var/lock/subsys/iscsi ] && /etc/rc.d/init.d/iscsi stop
-	}
+	if ! /sbin/ip route ls | grep -q ^default &&
+	   [ -f /var/lock/subsys/iscsi ]; then
+		/etc/rc.d/init.d/iscsi stop
+	fi
 fi
 
 if [ "$2" = "up" ]; then
-	/sbin/ip -o route show dev "$1" | grep -q '^default' && {
-		/sbin/chkconfig iscsi && /etc/rc.d/init.d/iscsi start
-	}
+	if /sbin/ip -o route show dev "$1" | grep -q '^default' && 
+	   /sbin/chkconfig iscsi; then
+		/etc/rc.d/init.d/iscsi start
+	fi
 fi


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- iscsi-initiator-utils.spec	20 Mar 2009 14:24:54 -0000	1.42
+++ iscsi-initiator-utils.spec	3 Apr 2009 07:29:43 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -162,6 +162,10 @@
 %{_includedir}/libiscsi.h
 
 %changelog
+* Fri Apr  3 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-8
+- Stop the NM script from exiting with an error status when it
+  didn't do anything (#493411)
+
 * Fri Mar 20 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-7
 - libiscsi: use fwparam_ibft_sysfs() instead of fw_get_entry(), as
   the latter causes stack corruption (workaround #490515)



From pmatilai at fedoraproject.org  Fri Apr  3 07:45:55 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri,  3 Apr 2009 07:45:55 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.0-beta1-default-filestate.patch, NONE,
	1.1 rpm.spec, 1.342, 1.343
Message-ID: <20090403074555.830DB70134@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26900

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-beta1-default-filestate.patch 
Log Message:
- fix recorded file state of otherwise skipped files (#492947)
- compress ChangeLog, drop old CHANGES file (#492440)


rpm-4.7.0-beta1-default-filestate.patch:

--- NEW FILE rpm-4.7.0-beta1-default-filestate.patch ---
commit 4e77d95a7856216e49453009c855cce701734b9c
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Fri Apr 3 10:28:59 2009 +0300

    Make sure installed files have state (rhbz#492947)
    - rpmfsSetState() doesn't get called for skipped files like %ghost and
      %config(noreplace), causing incorrect file state ("no state") getting
      recorded in rpmdb, leading to inapproriate removal/rename on erase, ick
    - For TR_ADDED, always default file states to RPMFILE_STATE_NORMAL, fsm
      changes it as necessary for skipped colors and such. Lazy alloc on
      rpmfsSetState() is not correct as rpmfsSetState() might not get called
      at all.
    - originally broken by commit 8d6c4b8c95b59f5a71d90c582c2e98f5c7ed7b9d

diff --git a/lib/fsm.c b/lib/fsm.c
index b892b03..752f0cc 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -663,8 +663,6 @@ static int fsmMapPath(FSM_t fsm)
 	    break;
 	case FA_COPYIN:
 	case FA_CREATE:
-	    if (rpmteType(te) == TR_ADDED)
-		rpmfsSetState(fs, i, RPMFILE_STATE_NORMAL);
 	    break;
 
 	case FA_SKIPNSTATE:
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 6ff20f5..e1ef060 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -285,7 +285,7 @@ static void addTE(rpmts ts, rpmte p, Header h,
 	struct rpmtd_s bnames;
 	headerGet(h, RPMTAG_BASENAMES, &bnames, HEADERGET_MINMEM);
 
-	p->fs = rpmfsNew(rpmtdCount(&bnames));
+	p->fs = rpmfsNew(rpmtdCount(&bnames), p->type);
 
 	rpmtdFreeData(&bnames);
     }
@@ -896,11 +896,15 @@ rpmfs rpmteGetFileStates(rpmte te) {
     return te->fs;
 }
 
-rpmfs rpmfsNew(unsigned int fc) {
+rpmfs rpmfsNew(unsigned int fc, rpmElementType type) {
     rpmfs fs = xmalloc(sizeof(*fs));
     fs->fc = fc;
     fs->replaced = NULL;
     fs->states = NULL;
+    if (type == TR_ADDED) {
+	fs->states = xmalloc(sizeof(*fs->states) * fs->fc);
+	memset(fs->states, RPMFILE_STATE_NORMAL, fs->fc);
+    }
     fs->actions = xmalloc(fc * sizeof(*fs->actions));
     memset(fs->actions, FA_UNKNOWN, fc * sizeof(*fs->actions));
     fs->numReplaced = fs->allocatedReplaced = 0;
@@ -958,10 +962,6 @@ sharedFileInfo rpmfsNextReplaced(rpmfs fs , sharedFileInfo replaced)
 void rpmfsSetState(rpmfs fs, unsigned int ix, rpmfileState state)
 {
     assert(ix < fs->fc);
-    if (fs->states == NULL) {
-	fs->states = xmalloc(sizeof(*fs->states) * fs->fc);
-	memset(fs->states, RPMFILE_STATE_MISSING, fs->fc);
-    }
     fs->states[ix] = state;
 }
 
diff --git a/lib/rpmte_internal.h b/lib/rpmte_internal.h
index 3ce4112..60c52bd 100644
--- a/lib/rpmte_internal.h
+++ b/lib/rpmte_internal.h
@@ -81,7 +81,7 @@ int rpmteHaveTransScript(rpmte te, rpmTag tag);
 rpmfs rpmteGetFileStates(rpmte te);
 
 RPM_GNUC_INTERNAL
-rpmfs rpmfsNew(unsigned int fc);
+rpmfs rpmfsNew(unsigned int fc, rpmElementType type);
 
 RPM_GNUC_INTERNAL
 rpmfs rpmfsFree(rpmfs fs);


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- rpm.spec	2 Apr 2009 17:41:14 -0000	1.342
+++ rpm.spec	3 Apr 2009 07:45:24 -0000	1.343
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.8%{?dist}
+Release: 0.%{snapver}.9%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -48,6 +48,7 @@
 Patch202: rpm-4.7.0-beta1-installangs.patch
 Patch203: rpm-4.7.0-alpha-isa.patch
 Patch204: rpm-4.7.0-rsa-v4.patch
+Patch205: rpm-4.7.0-beta1-default-filestate.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -195,6 +196,7 @@
 %patch202 -p1 -b .installangs
 %patch203 -p1 -b .alpha-isa
 %patch204 -p1 -b .rsa-v4
+%patch205 -p1 -b .default-fstate
 
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .rpmfc-order
@@ -274,6 +276,9 @@
 # avoid dragging in tonne of perl libs for an unused script
 chmod 0644 $RPM_BUILD_ROOT/%{rpmhome}/perldeps.pl
 
+# compress our ChangeLog, it's fairly big...
+bzip2 -9 ChangeLog
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -298,7 +303,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc CHANGES GROUPS COPYING CREDITS ChangeLog doc/manual/[a-z]*
+%doc GROUPS COPYING CREDITS ChangeLog.bz2 doc/manual/[a-z]*
 
 %{_sysconfdir}/cron.daily/rpm
 %config(noreplace,missingok)    %{_sysconfdir}/logrotate.d/rpm
@@ -404,6 +409,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Apr 03 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.9
+- fix recorded file state of otherwise skipped files (#492947)
+- compress ChangeLog, drop old CHANGES file (#492440)
+
 * Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7.0-0.beta1.8
 - Fix sparcv9v and sparc64v targets
 



From transif at fedoraproject.org  Fri Apr  3 07:54:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  3 Apr 2009 07:54:04 +0000 (UTC)
Subject: comps/po de.po,1.35,1.36
Message-ID: <20090403075404.D6BF770134@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29165/po

Modified Files:
	de.po 
Log Message:
Sending translation for German


Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- de.po	7 Mar 2009 14:53:35 -0000	1.35
+++ de.po	3 Apr 2009 07:53:34 -0000	1.36
@@ -17,9 +17,9 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-07 13:52+0000\n"
-"PO-Revision-Date: 2009-03-07 15:51+0100\n"
-"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
+"POT-Creation-Date: 2009-04-03 02:05+0000\n"
+"PO-Revision-Date: 2009-04-03 09:53+0100\n"
+"Last-Translator: Dominik Sandjaja <dominiksandjaja at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1031,7 +1031,7 @@
 #: ../comps-f8.xml.in.h:126
 #: ../comps-f9.xml.in.h:133
 #: ../comps-f10.xml.in.h:141
-#: ../comps-f11.xml.in.h:153
+#: ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "Unterst??tzung f??r Samoanisch"
 
@@ -1039,7 +1039,7 @@
 #: ../comps-f8.xml.in.h:127
 #: ../comps-f9.xml.in.h:134
 #: ../comps-f10.xml.in.h:142
-#: ../comps-f11.xml.in.h:154
+#: ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "Unterst??tzung f??r Serbisch"
 
@@ -1047,7 +1047,7 @@
 #: ../comps-f8.xml.in.h:128
 #: ../comps-f9.xml.in.h:135
 #: ../comps-f10.xml.in.h:143
-#: ../comps-f11.xml.in.h:155
+#: ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "Server-Konfigurationswerkzeuge"
 
@@ -1055,7 +1055,7 @@
 #: ../comps-f8.xml.in.h:129
 #: ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:144
-#: ../comps-f11.xml.in.h:156
+#: ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41
 #: ../comps-el5.xml.in.h:41
 msgid "Servers"
@@ -1065,7 +1065,7 @@
 #: ../comps-f8.xml.in.h:130
 #: ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145
-#: ../comps-f11.xml.in.h:157
+#: ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42
 #: ../comps-el5.xml.in.h:42
 msgid "Simple window managers that aren't part of a larger desktop environment."
@@ -1075,7 +1075,7 @@
 #: ../comps-f8.xml.in.h:131
 #: ../comps-f9.xml.in.h:138
 #: ../comps-f10.xml.in.h:147
-#: ../comps-f11.xml.in.h:159
+#: ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "Unterst??tzung f??r Sinhala"
 
@@ -1083,7 +1083,7 @@
 #: ../comps-f8.xml.in.h:132
 #: ../comps-f9.xml.in.h:139
 #: ../comps-f10.xml.in.h:148
-#: ../comps-f11.xml.in.h:160
+#: ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "Unterst??tzung f??r Slowakisch"
 
@@ -1091,7 +1091,7 @@
 #: ../comps-f8.xml.in.h:133
 #: ../comps-f9.xml.in.h:140
 #: ../comps-f10.xml.in.h:149
-#: ../comps-f11.xml.in.h:161
+#: ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "Unterst??tzung f??r Slowenisch"
 
@@ -1099,7 +1099,7 @@
 #: ../comps-f8.xml.in.h:134
 #: ../comps-f9.xml.in.h:141
 #: ../comps-f10.xml.in.h:150
-#: ../comps-f11.xml.in.h:162
+#: ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "Kleinstm??gliche Installation"
 
@@ -1107,7 +1107,7 @@
 #: ../comps-f8.xml.in.h:135
 #: ../comps-f9.xml.in.h:142
 #: ../comps-f10.xml.in.h:151
-#: ../comps-f11.xml.in.h:163
+#: ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43
 #: ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
@@ -1117,7 +1117,7 @@
 #: ../comps-f8.xml.in.h:136
 #: ../comps-f9.xml.in.h:143
 #: ../comps-f10.xml.in.h:152
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "Unterst??tzung f??r Somali"
 
@@ -1125,7 +1125,7 @@
 #: ../comps-f8.xml.in.h:137
 #: ../comps-f9.xml.in.h:144
 #: ../comps-f10.xml.in.h:153
-#: ../comps-f11.xml.in.h:165
+#: ../comps-f11.xml.in.h:164
 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi."
 msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Text-Dateien. Dazu geh??ren Emacs und Vi."
 
@@ -1133,7 +1133,7 @@
 #: ../comps-f8.xml.in.h:138
 #: ../comps-f9.xml.in.h:145
 #: ../comps-f10.xml.in.h:154
-#: ../comps-f11.xml.in.h:166
+#: ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45
 #: ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
@@ -1143,7 +1143,7 @@
 #: ../comps-f8.xml.in.h:139
 #: ../comps-f9.xml.in.h:146
 #: ../comps-f10.xml.in.h:155
-#: ../comps-f11.xml.in.h:167
+#: ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "Unterst??tzung f??r S??d-Ndebele"
 
@@ -1151,7 +1151,7 @@
 #: ../comps-f8.xml.in.h:140
 #: ../comps-f9.xml.in.h:147
 #: ../comps-f10.xml.in.h:156
-#: ../comps-f11.xml.in.h:168
+#: ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "Unterst??tzung f??r S??d-Sotho"
 
@@ -1159,7 +1159,7 @@
 #: ../comps-f8.xml.in.h:141
 #: ../comps-f9.xml.in.h:148
 #: ../comps-f10.xml.in.h:157
-#: ../comps-f11.xml.in.h:169
+#: ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "Unterst??tzung f??r Spanisch"
 
@@ -1822,7 +1822,6 @@
 
 #: ../comps-f9.xml.in.h:131
 #: ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:152
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR Desktopumgebung"
 
@@ -1882,7 +1881,7 @@
 msgstr "Unterst??tzung f??r Burmesisch (Myanmar)"
 
 #: ../comps-f10.xml.in.h:146
-#: ../comps-f11.xml.in.h:158
+#: ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "Unterst??tzung f??r Sindhi"
 
@@ -1949,6 +1948,10 @@
 msgid "Online Help and Documentation"
 msgstr "Online-Hilfe und Dokumentation"
 
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Sugar-Desktopumgebung"
+
 #: ../comps-f11.xml.in.h:170
 msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora."
 msgstr "Unterst??tzung f??r Cross-Compiling von Programmen f??r 32-bit-Windows-Ziele, f??r das Testen und das Bauen, alles in Fedora."



From pingou at fedoraproject.org  Fri Apr  3 08:07:48 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  3 Apr 2009 08:07:48 +0000 (UTC)
Subject: rpms/R-RUnit/devel R-RUnit.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090403080748.BF9CA70134@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv799/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R-RUnit.spec import.log 
Log Message:
Original import for devel



--- NEW FILE R-RUnit.spec ---
%global packname  RUnit

Name:             R-%{packname}
Version:          0.4.21
Release:          2%{?dist}
Summary:          R Unit test framework

Group:            Applications/Engineering 
License:          GPLv2 
URL:              http://cran.r-project.org/web/packages/RUnit/index.html
Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

Requires:         R >= 2.4.0 R-utils R-methods
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= 2.4.0 R-utils R-methods

%description
R functions implementing a standard Unit Testing framework, with additional 
code inspection and report generation tools

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


#noarch
mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_datadir}/R/library/R.css

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)

#noarch
#%dir %{_datadir}/R/library/%{packname}
%{_datadir}/R/library/%{packname}

%doc %{_datadir}/R/library/%{packname}/doc
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/latex/
%doc %{_datadir}/R/library/%{packname}/man/
%doc %{_datadir}/R/library/%{packname}/COPYING
%doc %{_datadir}/R/library/%{packname}/NEWS

%{_datadir}/R/library/%{packname}/R-ex
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/examples
%{_datadir}/R/library/%{packname}/share
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/CONTENTS

%changelog
* Wed Apr 01 2009 pingou <pingou at pingoured.fr> 0.4.21-2
- Remove CONTENTS INDEX and NAMESPACE from %%doc
- Use the macro in Source0

* Tue Feb 24 2009 pingou <pingou -AT- pingoured.fr> 0.4.21-1
- initial package for Fedora


--- NEW FILE import.log ---
R-RUnit-0_4_21-2_fc10:HEAD:R-RUnit-0.4.21-2.fc10.src.rpm:1238746010


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:31:45 -0000	1.1
+++ .cvsignore	3 Apr 2009 08:07:18 -0000	1.2
@@ -0,0 +1 @@
+RUnit_0.4.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:31:45 -0000	1.1
+++ sources	3 Apr 2009 08:07:18 -0000	1.2
@@ -0,0 +1 @@
+e4438f8d86f2fec5a553b0860f626ee5  RUnit_0.4.21.tar.gz



From pingou at fedoraproject.org  Fri Apr  3 08:10:03 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  3 Apr 2009 08:10:03 +0000 (UTC)
Subject: rpms/R-RUnit/F-10 R-RUnit.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090403081003.AA47270134@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1317/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	R-RUnit.spec import.log 
Log Message:
Original import for F-10



--- NEW FILE R-RUnit.spec ---
%global packname  RUnit

Name:             R-%{packname}
Version:          0.4.21
Release:          2%{?dist}
Summary:          R Unit test framework

Group:            Applications/Engineering 
License:          GPLv2 
URL:              http://cran.r-project.org/web/packages/RUnit/index.html
Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

Requires:         R >= 2.4.0 R-utils R-methods
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= 2.4.0 R-utils R-methods

%description
R functions implementing a standard Unit Testing framework, with additional 
code inspection and report generation tools

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


#noarch
mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_datadir}/R/library/R.css

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)

#noarch
#%dir %{_datadir}/R/library/%{packname}
%{_datadir}/R/library/%{packname}

%doc %{_datadir}/R/library/%{packname}/doc
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/latex/
%doc %{_datadir}/R/library/%{packname}/man/
%doc %{_datadir}/R/library/%{packname}/COPYING
%doc %{_datadir}/R/library/%{packname}/NEWS

%{_datadir}/R/library/%{packname}/R-ex
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/examples
%{_datadir}/R/library/%{packname}/share
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/CONTENTS

%changelog
* Wed Apr 01 2009 pingou <pingou at pingoured.fr> 0.4.21-2
- Remove CONTENTS INDEX and NAMESPACE from %%doc
- Use the macro in Source0

* Tue Feb 24 2009 pingou <pingou -AT- pingoured.fr> 0.4.21-1
- initial package for Fedora


--- NEW FILE import.log ---
R-RUnit-0_4_21-2_fc10:F-10:R-RUnit-0.4.21-2.fc10.src.rpm:1238746109


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:31:45 -0000	1.1
+++ .cvsignore	3 Apr 2009 08:09:33 -0000	1.2
@@ -0,0 +1 @@
+RUnit_0.4.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:31:45 -0000	1.1
+++ sources	3 Apr 2009 08:09:33 -0000	1.2
@@ -0,0 +1 @@
+e4438f8d86f2fec5a553b0860f626ee5  RUnit_0.4.21.tar.gz



From pingou at fedoraproject.org  Fri Apr  3 08:12:23 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  3 Apr 2009 08:12:23 +0000 (UTC)
Subject: rpms/R-RUnit/F-9 R-RUnit.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090403081223.7442270134@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2187/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	R-RUnit.spec import.log 
Log Message:
Original import for F-9



--- NEW FILE R-RUnit.spec ---
%global packname  RUnit

Name:             R-%{packname}
Version:          0.4.21
Release:          2%{?dist}
Summary:          R Unit test framework

Group:            Applications/Engineering 
License:          GPLv2 
URL:              http://cran.r-project.org/web/packages/RUnit/index.html
Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

Requires:         R >= 2.4.0 R-utils R-methods
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= 2.4.0 R-utils R-methods

%description
R functions implementing a standard Unit Testing framework, with additional 
code inspection and report generation tools

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


#noarch
mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_datadir}/R/library/R.css

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)

#noarch
#%dir %{_datadir}/R/library/%{packname}
%{_datadir}/R/library/%{packname}

%doc %{_datadir}/R/library/%{packname}/doc
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/latex/
%doc %{_datadir}/R/library/%{packname}/man/
%doc %{_datadir}/R/library/%{packname}/COPYING
%doc %{_datadir}/R/library/%{packname}/NEWS

%{_datadir}/R/library/%{packname}/R-ex
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/examples
%{_datadir}/R/library/%{packname}/share
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/CONTENTS

%changelog
* Wed Apr 01 2009 pingou <pingou at pingoured.fr> 0.4.21-2
- Remove CONTENTS INDEX and NAMESPACE from %%doc
- Use the macro in Source0

* Tue Feb 24 2009 pingou <pingou -AT- pingoured.fr> 0.4.21-1
- initial package for Fedora


--- NEW FILE import.log ---
R-RUnit-0_4_21-2_fc10:F-9:R-RUnit-0.4.21-2.fc10.src.rpm:1238746283


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:31:45 -0000	1.1
+++ .cvsignore	3 Apr 2009 08:11:53 -0000	1.2
@@ -0,0 +1 @@
+RUnit_0.4.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:31:45 -0000	1.1
+++ sources	3 Apr 2009 08:11:53 -0000	1.2
@@ -0,0 +1 @@
+e4438f8d86f2fec5a553b0860f626ee5  RUnit_0.4.21.tar.gz



From pkgdb at fedoraproject.org  Fri Apr  3 09:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:18:16 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403091756.60B1E208555@bastion.fedora.phx.redhat.com>

Package curl in Fedora devel was orphaned by jnovy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:18:02 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403091802.B474F208556@bastion.fedora.phx.redhat.com>

Package curl in Fedora 7 was orphaned by jnovy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:18:30 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403091809.C9B82208603@bastion.fedora.phx.redhat.com>

Package curl in Fedora 8 was orphaned by jnovy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:18:33 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403091814.8A5F620854A@bastion.fedora.phx.redhat.com>

Package curl in Fedora 9 was orphaned by jnovy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:18:09 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403091817.81C9F208605@bastion.fedora.phx.redhat.com>

Package curl in Fedora 10 was orphaned by jnovy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pghmcfc at fedoraproject.org  Fri Apr  3 09:21:04 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri,  3 Apr 2009 09:21:04 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.16,
	1.17 perl-IO-Socket-SSL.spec, 1.19, 1.20 sources, 1.16, 1.17
Message-ID: <20090403092104.9449D70134@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16850

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Update to 1.24 (add verify hostname scheme ftp, same as http)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	25 Feb 2009 21:35:25 -0000	1.16
+++ .cvsignore	3 Apr 2009 09:20:34 -0000	1.17
@@ -1 +1 @@
-IO-Socket-SSL-1.23.tar.gz
+IO-Socket-SSL-1.24.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-IO-Socket-SSL.spec	25 Feb 2009 21:35:25 -0000	1.19
+++ perl-IO-Socket-SSL.spec	3 Apr 2009 09:20:34 -0000	1.20
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.23
+Version:	1.24
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr  2 2009 Paul Howarth <paul at city-fan.org> - 1.24-1
+- Update to 1.24 (add verify hostname scheme ftp, same as http)
+
 * Wed Feb 25 2009 Paul Howarth <paul at city-fan.org> - 1.23-1
 - Update to 1.23 (complain when no certificates are provided)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	25 Feb 2009 21:35:25 -0000	1.16
+++ sources	3 Apr 2009 09:20:34 -0000	1.17
@@ -1 +1 @@
-9365651b22b57c496c8bbf2ae08d7897  IO-Socket-SSL-1.23.tar.gz
+53a407291bf9b3e09ae0f0cff90799a9  IO-Socket-SSL-1.24.tar.gz



From pkgdb at fedoraproject.org  Fri Apr  3 09:22:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:22:30 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403092210.AD561208514@bastion.fedora.phx.redhat.com>

Package curl in Fedora devel is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:22:44 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403092225.78FCA2086F1@bastion.fedora.phx.redhat.com>

Package curl in Fedora 10 is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:22:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:22:35 +0000
Subject: [pkgdb] curl ownership updated
Message-ID: <20090403092235.2DD6D208514@bastion.fedora.phx.redhat.com>

Package curl in Fedora 9 is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:25:00 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092440.0E2AF20854A@bastion.fedora.phx.redhat.com>

kdudka has set the watchbugzilla acl on curl (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:25:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:25:03 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092444.17BA2208550@bastion.fedora.phx.redhat.com>

kdudka has set the watchcommits acl on curl (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:24:46 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092446.2FC88208555@bastion.fedora.phx.redhat.com>

kdudka has set the commit acl on curl (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:24:48 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092448.47303208557@bastion.fedora.phx.redhat.com>

kdudka has set the approveacls acl on curl (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:37 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092617.0ED0F208553@bastion.fedora.phx.redhat.com>

kdudka has set the watchcommits acl on curl (Fedora 9) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:17 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092617.659F8208556@bastion.fedora.phx.redhat.com>

kdudka has set the watchbugzilla acl on curl (Fedora 9) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:38 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092618.581A6208602@bastion.fedora.phx.redhat.com>

kdudka has set the approveacls acl on curl (Fedora 9) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:44 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092625.E8086208609@bastion.fedora.phx.redhat.com>

kdudka has set the watchcommits acl on curl (Fedora 10) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:16 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092623.86B0A20860F@bastion.fedora.phx.redhat.com>

kdudka has set the watchbugzilla acl on curl (Fedora 10) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:40 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092623.476EC20860B@bastion.fedora.phx.redhat.com>

kdudka has set the commit acl on curl (Fedora 9) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:19 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092626.DB4B12086EF@bastion.fedora.phx.redhat.com>

kdudka has set the approveacls acl on curl (Fedora 10) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pkgdb at fedoraproject.org  Fri Apr  3 09:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 09:26:46 +0000
Subject: [pkgdb] curl had acl change status
Message-ID: <20090403092626.DC5C22086F1@bastion.fedora.phx.redhat.com>

kdudka has set the commit acl on curl (Fedora 10) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From pravins at fedoraproject.org  Fri Apr  3 09:28:03 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri,  3 Apr 2009 09:28:03 +0000 (UTC)
Subject: rpms/smc-fonts/devel smc-fonts.spec,1.6,1.7
Message-ID: <20090403092803.4147C70134@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18272

Modified Files:
	smc-fonts.spec 
Log Message:
* Fri Apr 03 2009 Pravin Satpute <psatpute at redhat.com> 04.1-6
- bugfix 493814
- added 'Provides' field for packages



Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- smc-fonts.spec	26 Feb 2009 01:41:38 -0000	1.6
+++ smc-fonts.spec	3 Apr 2009 09:27:32 -0000	1.7
@@ -8,7 +8,7 @@
 
 Name:		%{fontname}-fonts
 Version:	04.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
@@ -34,6 +34,7 @@
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
+Provides: %{fontname}-fonts-dyuthi = %{version}-%{release}
 Obsoletes: %{name}-dyuthi < 04.1-4
 %description -n %{fontname}-dyuthi-fonts
 The Dyuthi font package contains fonts for the display of
@@ -46,6 +47,7 @@
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
+Provides: %{fontname}-fonts-meera = %{version}-%{release}
 Obsoletes: %{name}-meera < 04.1-4
 %description -n %{fontname}-meera-fonts
 The Meera font package contains fonts for the display of
@@ -59,6 +61,7 @@
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+
+Provides: %{fontname}-fonts-rachana = %{version}-%{release}
 Obsoletes: %{name}-rachana < 04.1-4
 %description -n %{fontname}-rachana-fonts
 The Rachana font package contains fonts for the display of
@@ -72,6 +75,7 @@
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2
+Provides: %{fontname}-fonts-raghumalayalam = %{version}-%{release}
 Obsoletes: %{name}-raghumalayalam < 04.1-4
 %description -n %{fontname}-raghumalayalam-fonts
 The SMC Malayalam fonts package contains fonts for the display of
@@ -84,6 +88,7 @@
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
+Provides: %{fontname}-fonts-suruma = %{version}-%{release}
 Obsoletes: %{name}-suruma < 04.1-4
 %description -n %{fontname}-suruma-fonts
 The Suruma font package contains fonts for the display of
@@ -96,6 +101,7 @@
 Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
+Provides: %{fontname}-fonts-kalyani = %{version}-%{release}
 Obsoletes: %{name}-kalyani < 04.1-4
 %description -n %{fontname}-kalyani-fonts
 The Kalyani font package contains fonts for the display of
@@ -108,6 +114,7 @@
 Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
+Provides: %{fontname}-fonts-anjalioldlipi = %{version}-%{release}
 Obsoletes: %{name}-anjalioldlipi < 04.1-4
 %description -n %{fontname}-anjalioldlipi-fonts
 The Anjali OldLipi package contains fonts for the display of
@@ -145,6 +152,10 @@
 %dir %{_fontdir}
 
 %changelog
+* Fri Apr 03 2009 Pravin Satpute <psatpute at redhat.com> 04.1-6
+- bugfix 493814
+- added 'Provides' field for packages
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 04.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pingou at fedoraproject.org  Fri Apr  3 09:30:17 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  3 Apr 2009 09:30:17 +0000 (UTC)
Subject: rpms/R-RUnit/F-10 R-RUnit.spec,1.1,1.2
Message-ID: <20090403093017.E1F7570134@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18999/F-10

Modified Files:
	R-RUnit.spec 
Log Message:
Should not own all the files twice


Index: R-RUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-10/R-RUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-RUnit.spec	3 Apr 2009 08:09:33 -0000	1.1
+++ R-RUnit.spec	3 Apr 2009 09:29:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          0.4.21
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          R Unit test framework
 
 Group:            Applications/Engineering 
@@ -54,8 +54,7 @@
 %defattr(-, root, root, -)
 
 #noarch
-#%dir %{_datadir}/R/library/%{packname}
-%{_datadir}/R/library/%{packname}
+%dir %{_datadir}/R/library/%{packname}
 
 %doc %{_datadir}/R/library/%{packname}/doc
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION
@@ -76,6 +75,9 @@
 %{_datadir}/R/library/%{packname}/CONTENTS
 
 %changelog
+* Fri Apr 03 2009 pingou <pingou at pingoured.fr> 0.4.21-3
+- The package should not list all the file twice...
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 0.4.21-2
 - Remove CONTENTS INDEX and NAMESPACE from %%doc
 - Use the macro in Source0



From pingou at fedoraproject.org  Fri Apr  3 09:30:18 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  3 Apr 2009 09:30:18 +0000 (UTC)
Subject: rpms/R-RUnit/F-9 R-RUnit.spec,1.1,1.2
Message-ID: <20090403093018.1340370134@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18999/F-9

Modified Files:
	R-RUnit.spec 
Log Message:
Should not own all the files twice


Index: R-RUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-9/R-RUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-RUnit.spec	3 Apr 2009 08:11:53 -0000	1.1
+++ R-RUnit.spec	3 Apr 2009 09:29:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          0.4.21
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          R Unit test framework
 
 Group:            Applications/Engineering 
@@ -54,8 +54,7 @@
 %defattr(-, root, root, -)
 
 #noarch
-#%dir %{_datadir}/R/library/%{packname}
-%{_datadir}/R/library/%{packname}
+%dir %{_datadir}/R/library/%{packname}
 
 %doc %{_datadir}/R/library/%{packname}/doc
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION
@@ -76,6 +75,9 @@
 %{_datadir}/R/library/%{packname}/CONTENTS
 
 %changelog
+* Fri Apr 03 2009 pingou <pingou at pingoured.fr> 0.4.21-3
+- The package should not list all the file twice...
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 0.4.21-2
 - Remove CONTENTS INDEX and NAMESPACE from %%doc
 - Use the macro in Source0



From pingou at fedoraproject.org  Fri Apr  3 09:30:18 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Fri,  3 Apr 2009 09:30:18 +0000 (UTC)
Subject: rpms/R-RUnit/devel R-RUnit.spec,1.1,1.2
Message-ID: <20090403093018.4A7DF70134@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18999/devel

Modified Files:
	R-RUnit.spec 
Log Message:
Should not own all the files twice


Index: R-RUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/devel/R-RUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-RUnit.spec	3 Apr 2009 08:07:18 -0000	1.1
+++ R-RUnit.spec	3 Apr 2009 09:29:48 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          0.4.21
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          R Unit test framework
 
 Group:            Applications/Engineering 
@@ -54,8 +54,7 @@
 %defattr(-, root, root, -)
 
 #noarch
-#%dir %{_datadir}/R/library/%{packname}
-%{_datadir}/R/library/%{packname}
+%dir %{_datadir}/R/library/%{packname}
 
 %doc %{_datadir}/R/library/%{packname}/doc
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION
@@ -76,6 +75,9 @@
 %{_datadir}/R/library/%{packname}/CONTENTS
 
 %changelog
+* Fri Apr 03 2009 pingou <pingou at pingoured.fr> 0.4.21-3
+- The package should not list all the file twice...
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 0.4.21-2
 - Remove CONTENTS INDEX and NAMESPACE from %%doc
 - Use the macro in Source0



From airlied at fedoraproject.org  Fri Apr  3 09:38:50 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 09:38:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-r6xx-fix.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.164, 1.165
Message-ID: <20090403093851.05C0E7013C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21092

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-r6xx-fix.patch 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-3
- fix up r600 xv src offsets hopefully


radeon-r6xx-fix.patch:

--- NEW FILE radeon-r6xx-fix.patch ---
>From c3d0bb80ce0c2e70b05168e4ab8fa2b4de539d7b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 3 Apr 2009 20:34:05 +1100
Subject: [PATCH] r600: fix src offsets after kms changes

---
 src/r600_textured_videofuncs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index 3dfe151..f4b4f1e 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
     switch(pPriv->id) {
     case FOURCC_YV12:
     case FOURCC_I420:
-	accel_state->src_mc_addr[0] = pPriv->src_offset;
+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
 	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
 
 	/* flush texture cache */
@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
     case FOURCC_UYVY:
     case FOURCC_YUY2:
     default:
-	accel_state->src_mc_addr[0] = pPriv->src_offset;
+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
 	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
 
 	/* flush texture cache */
-- 
1.6.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- xorg-x11-drv-ati.spec	1 Apr 2009 12:03:34 -0000	1.164
+++ xorg-x11-drv-ati.spec	3 Apr 2009 09:38:20 -0000	1.165
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
+Patch7:	    radeon-r6xx-fix.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,6 +46,7 @@
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
+%patch7 -p1 -b .r6xv
 
 %build
 autoreconf -iv
@@ -76,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-3
+- fix up r600 xv src offsets hopefully
+
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-2
 - attempt to fix r100/r200 xv better
 



From airlied at fedoraproject.org  Fri Apr  3 09:45:49 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 09:45:49 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-r6xx-fix.patch,1.1,1.2
Message-ID: <20090403094549.41EB070134@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23231

Modified Files:
	radeon-r6xx-fix.patch 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-3
- fix up r600 xv src offsets hopefully


radeon-r6xx-fix.patch:

Index: radeon-r6xx-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-r6xx-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-r6xx-fix.patch	3 Apr 2009 09:38:20 -0000	1.1
+++ radeon-r6xx-fix.patch	3 Apr 2009 09:45:48 -0000	1.2
@@ -16,7 +16,7 @@
      case FOURCC_YV12:
      case FOURCC_I420:
 -	accel_state->src_mc_addr[0] = pPriv->src_offset;
-+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
@@ -25,7 +25,7 @@
      case FOURCC_YUY2:
      default:
 -	accel_state->src_mc_addr[0] = pPriv->src_offset;
-+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */



From pmatilai at fedoraproject.org  Fri Apr  3 09:49:57 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri,  3 Apr 2009 09:49:57 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite-3.6.12-libdl.patch, NONE,
	1.1 sqlite-3.6.12-no-sqlite-doc.patch, NONE, 1.1 .cvsignore,
	1.24, 1.25 sources, 1.24, 1.25 sqlite.spec, 1.53,
	1.54 sqlite-3.6.10-keywords.patch, 1.1,
	NONE sqlite-3.6.6.2-libdl.patch, 1.1, NONE
Message-ID: <20090403094957.A1B3370134@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24228

Modified Files:
	.cvsignore sources sqlite.spec 
Added Files:
	sqlite-3.6.12-libdl.patch sqlite-3.6.12-no-sqlite-doc.patch 
Removed Files:
	sqlite-3.6.10-keywords.patch sqlite-3.6.6.2-libdl.patch 
Log Message:
- update to 3.6.12 (#492662)
- remove reference to non-existent sqlite-doc from manual (#488883)
- drop unused patches


sqlite-3.6.12-libdl.patch:

--- NEW FILE sqlite-3.6.12-libdl.patch ---
diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac
--- sqlite-3.6.4/configure.ac.orig	2008-11-08 11:37:15.000000000 +0200
+++ sqlite-3.6.4/configure.ac	2008-11-08 11:35:50.000000000 +0200
@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST
       [use_loadextension=$enableval],[use_loadextension=no])
 if test "${use_loadextension}" = "yes" ; then
   OPT_FEATURE_FLAGS=""
+  AC_SEARCH_LIBS(dlopen, [dl])
 else
   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

sqlite-3.6.12-no-sqlite-doc.patch:

--- NEW FILE sqlite-3.6.12-no-sqlite-doc.patch ---
diff -up sqlite-3.6.12/sqlite3.1.no-sqlite-doc sqlite-3.6.12/sqlite3.1
--- sqlite-3.6.12/sqlite3.1.no-sqlite-doc	2009-04-03 12:37:35.000000000 +0300
+++ sqlite-3.6.12/sqlite3.1	2009-04-03 12:37:44.000000000 +0300
@@ -221,8 +221,6 @@ o All other command line options are pro
 
 .SH SEE ALSO
 http://www.sqlite.org/
-.br
-The sqlite-doc package
 .SH AUTHOR
 This manual page was originally written by Andreas Rottmann
 <rotty at debian.org>, for the Debian GNU/Linux system (but may be used


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Jan 2009 07:37:44 -0000	1.24
+++ .cvsignore	3 Apr 2009 09:49:27 -0000	1.25
@@ -1 +1 @@
-sqlite-3.6.10.tar.gz
+sqlite-3.6.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Jan 2009 07:37:44 -0000	1.24
+++ sources	3 Apr 2009 09:49:27 -0000	1.25
@@ -1 +1 @@
-a03bdc86df4025b6881d58557e4b5bd3  sqlite-3.6.10.tar.gz
+13600865a69a3f54d2ac42a0d6b743db  sqlite-3.6.12.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sqlite.spec	26 Feb 2009 02:37:01 -0000	1.53
+++ sqlite.spec	3 Apr 2009 09:49:27 -0000	1.54
@@ -5,18 +5,17 @@
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.6.10
-Release: 4%{?dist}
+Version: 3.6.12
+Release: 1%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 # Fix build with --enable-load-extension, upstream ticket #3137
-Patch1: sqlite-3.6.6.2-libdl.patch
+Patch1: sqlite-3.6.12-libdl.patch
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
 Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
-# Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=6186
-Patch3: sqlite-3.6.10-keywords.patch
+Patch3: sqlite-3.6.12-no-sqlite-doc.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 %if %{with tcl}
@@ -77,14 +76,16 @@
 %setup -q
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .keywords
+%patch3 -p1 -b .no-sqlite-doc
 
 %build
+autoconf
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -Wall"
 %configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks \
-           --enable-load-extension 
+           --enable-load-extension \
+	   %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
 
 make %{?_smp_mflags}
 make doc
@@ -92,7 +93,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=${RPM_BUILD_ROOT} %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}} install
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 install -D -m0644 sqlite3.1 $RPM_BUILD_ROOT/%{_mandir}/man1/sqlite3.1
 install -D -m0755 lemon $RPM_BUILD_ROOT/%{_bindir}/lemon
@@ -148,6 +149,10 @@
 %endif
 
 %changelog
+* Fri Apr 03 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.12-1
+- update to 3.6.12 (#492662)
+- remove reference to non-existent sqlite-doc from manual (#488883)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- sqlite-3.6.10-keywords.patch DELETED ---


--- sqlite-3.6.6.2-libdl.patch DELETED ---



From pmatilai at fedoraproject.org  Fri Apr  3 09:56:55 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri,  3 Apr 2009 09:56:55 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite.spec,1.54,1.55
Message-ID: <20090403095655.74E8570134@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25629

Modified Files:
	sqlite.spec 
Log Message:
- libdl patch now needs autoconf



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sqlite.spec	3 Apr 2009 09:49:27 -0000	1.54
+++ sqlite.spec	3 Apr 2009 09:56:25 -0000	1.55
@@ -18,6 +18,8 @@
 Patch3: sqlite-3.6.12-no-sqlite-doc.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
+# libdl patch needs
+BuildRequires: autoconf
 %if %{with tcl}
 BuildRequires: /usr/bin/tclsh
 BuildRequires: tcl-devel



From airlied at fedoraproject.org  Fri Apr  3 10:03:50 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 10:03:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-r6xx-fix.patch, 1.2,
	1.3 xorg-x11-drv-ati.spec, 1.165, 1.166
Message-ID: <20090403100350.5AFD170134@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27181

Modified Files:
	radeon-r6xx-fix.patch xorg-x11-drv-ati.spec 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-4
- fix up r600 xv harder


radeon-r6xx-fix.patch:

Index: radeon-r6xx-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-r6xx-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- radeon-r6xx-fix.patch	3 Apr 2009 09:45:48 -0000	1.2
+++ radeon-r6xx-fix.patch	3 Apr 2009 10:03:49 -0000	1.3
@@ -1,11 +1,12 @@
-From c3d0bb80ce0c2e70b05168e4ab8fa2b4de539d7b Mon Sep 17 00:00:00 2001
+From 8cdbd33ded588f6edf03ac17b617547af98a3544 Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Fri, 3 Apr 2009 20:34:05 +1100
 Subject: [PATCH] r600: fix src offsets after kms changes
 
 ---
  src/r600_textured_videofuncs.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ src/radeon_textured_video.c    |    6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
 index 3dfe151..f4b4f1e 100644
@@ -16,7 +17,7 @@
      case FOURCC_YV12:
      case FOURCC_I420:
 -	accel_state->src_mc_addr[0] = pPriv->src_offset;
-+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
@@ -25,10 +26,38 @@
      case FOURCC_YUY2:
      default:
 -	accel_state->src_mc_addr[0] = pPriv->src_offset;
-+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
+diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
+index 1ef8dc3..0410dd2 100644
+--- a/src/radeon_textured_video.c
++++ b/src/radeon_textured_video.c
+@@ -502,12 +502,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+ 	    if (info->DMAForXv) {
+ 		if (id == FOURCC_YV12)
+ 		    R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset,
+-				     pPriv->src_offset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fboffset,
+ 				     srcPitch, srcPitch2, pPriv->src_pitch,
+ 				     width, height);
+ 		else
+ 		    R600CopyPlanarHW(pScrn, buf, buf + s2offset, buf + s3offset,
+-				     pPriv->src_offset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fboffset,
+ 				     srcPitch, srcPitch2, pPriv->src_pitch,
+ 				     width, height);
+ 	    } else {
+@@ -569,7 +569,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     default:
+ 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
+ 	    if (info->DMAForXv)
+-		R600CopyPackedHW(pScrn, buf, pPriv->src_offset,
++		R600CopyPackedHW(pScrn, buf, pPriv->src_offset + info->fbLocation + pScrn->fboffset,
+ 				 2 * width, pPriv->src_pitch,
+ 				 width, height);
+ 	    else
 -- 
 1.6.2
 


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- xorg-x11-drv-ati.spec	3 Apr 2009 09:38:20 -0000	1.165
+++ xorg-x11-drv-ati.spec	3 Apr 2009 10:03:49 -0000	1.166
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -78,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-4
+- fix up r600 xv harder
+
 * Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-3
 - fix up r600 xv src offsets hopefully
 



From airlied at fedoraproject.org  Fri Apr  3 10:11:12 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 10:11:12 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-r6xx-fix.patch,1.3,1.4
Message-ID: <20090403101112.69D6870134@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29964

Modified Files:
	radeon-r6xx-fix.patch 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-4
- fix up r600 xv harder


radeon-r6xx-fix.patch:

Index: radeon-r6xx-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-r6xx-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- radeon-r6xx-fix.patch	3 Apr 2009 10:03:49 -0000	1.3
+++ radeon-r6xx-fix.patch	3 Apr 2009 10:11:12 -0000	1.4
@@ -17,7 +17,7 @@
      case FOURCC_YV12:
      case FOURCC_I420:
 -	accel_state->src_mc_addr[0] = pPriv->src_offset;
-+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
@@ -26,7 +26,7 @@
      case FOURCC_YUY2:
      default:
 -	accel_state->src_mc_addr[0] = pPriv->src_offset;
-+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */



From cwickert at fedoraproject.org  Fri Apr  3 10:18:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  3 Apr 2009 10:18:58 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.3, 1.4 rednotebook.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090403101858.AB2C570134@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31761

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Apr 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.5-1
- Updated to new upstream version 0.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Mar 2009 21:11:48 -0000	1.3
+++ .cvsignore	3 Apr 2009 10:18:28 -0000	1.4
@@ -1 +1 @@
-rednotebook-0.6.2.tar.gz
+rednotebook-0.6.5.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rednotebook.spec	18 Mar 2009 21:11:48 -0000	1.2
+++ rednotebook.spec	3 Apr 2009 10:18:28 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.6.2
+Version:        0.6.5
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.5-1
+- Updated to new upstream version 0.6.5
+
 * Wed Mar 18 2009 Fabian Affolter <fabian at bernewireless.net> - 0.6.2-1
 - Added hicolor-icon-theme as a requirement
 - Added icons directory


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Mar 2009 21:11:48 -0000	1.3
+++ sources	3 Apr 2009 10:18:28 -0000	1.4
@@ -1 +1 @@
-523c8573f0b3d059ef6fb11058d060f2  rednotebook-0.6.2.tar.gz
+76e35cd47bc02360e802ec7785862d3d  rednotebook-0.6.5.tar.gz



From airlied at fedoraproject.org  Fri Apr  3 10:20:14 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  3 Apr 2009 10:20:14 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-r6xx-fix.patch,1.4,1.5
Message-ID: <20090403102014.B840870134@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32220

Modified Files:
	radeon-r6xx-fix.patch 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-4
- fix up r600 xv harder


radeon-r6xx-fix.patch:

Index: radeon-r6xx-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-r6xx-fix.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- radeon-r6xx-fix.patch	3 Apr 2009 10:11:12 -0000	1.4
+++ radeon-r6xx-fix.patch	3 Apr 2009 10:20:14 -0000	1.5
@@ -39,13 +39,13 @@
  		if (id == FOURCC_YV12)
  		    R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset,
 -				     pPriv->src_offset,
-+				     pPriv->src_offset + info->fbLocation + pScrn->fboffset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
  				     srcPitch, srcPitch2, pPriv->src_pitch,
  				     width, height);
  		else
  		    R600CopyPlanarHW(pScrn, buf, buf + s2offset, buf + s3offset,
 -				     pPriv->src_offset,
-+				     pPriv->src_offset + info->fbLocation + pScrn->fboffset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
  				     srcPitch, srcPitch2, pPriv->src_pitch,
  				     width, height);
  	    } else {
@@ -54,7 +54,7 @@
  	if (info->ChipFamily >= CHIP_FAMILY_R600) {
  	    if (info->DMAForXv)
 -		R600CopyPackedHW(pScrn, buf, pPriv->src_offset,
-+		R600CopyPackedHW(pScrn, buf, pPriv->src_offset + info->fbLocation + pScrn->fboffset,
++		R600CopyPackedHW(pScrn, buf, pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
  				 2 * width, pPriv->src_pitch,
  				 width, height);
  	    else



From tagoh at fedoraproject.org  Fri Apr  3 10:39:10 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri,  3 Apr 2009 10:39:10 +0000 (UTC)
Subject: rpms/libgxim/devel libgxim-fix-fontset.patch, NONE, 1.1 libgxim.spec,
	1.10, 1.11
Message-ID: <20090403103910.460C870134@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/libgxim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4744

Modified Files:
	libgxim.spec 
Added Files:
	libgxim-fix-fontset.patch 
Log Message:
* Fri Apr  3 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.3-2
- Fix an error message about FontSet.

libgxim-fix-fontset.patch:

--- NEW FILE libgxim-fix-fontset.patch ---
2009-04-03  Akira TAGOH  <akira at tagoh.org>

	* libgxim/gximmisc.c (g_xim_fontset_put_to_stream): get rid of
	processing a padding.
	(g_xim_fontset_get_from_stream): likewise.
	(g_xim_attribute_put_to_stream): deal with a padding here.

	* libgxim/gximattr.c (g_xim_attr_get_attribute_from_stream): deal with
	a padding here.

	* libgxim/gximprotocol.c (g_xim_protocol_read_vformat): Stop obtaining
	a value from NESTEDLIST if a remaining size is less than minimal.

Index: libgxim/gximprotocol.c
===================================================================
--- libgxim/gximprotocol.c	(??????????????? 204)
+++ libgxim/gximprotocol.c	(??????????????? 205)
@@ -2704,7 +2704,8 @@
 				    conn = G_XIM_CONNECTION (proto);
 				    /* XXX: NESTEDLIST is only used for IC attributes? */
 				    list = g_xim_nested_list_new(G_XIM_ATTR (conn->default_icattr), size);
-				    while (size > 0) {
+				    /* try to fetch a value until remaining size is more than minimum requirement */
+				    while (size > 3) {
 					    goffset cur_pos = g_seekable_tell(G_SEEKABLE (istream)), pos;
 					    gint16 attr_id;
 					    guint16 n;
Index: libgxim/gximattr.c
===================================================================
--- libgxim/gximattr.c	(??????????????? 204)
+++ libgxim/gximattr.c	(??????????????? 205)
@@ -975,9 +975,10 @@
 			    attr_id, name, g_xim_value_type_name(vtype));
 	g_free(name);
 	if (!g_xim_protocol_read_format(proto, stream, cancellable, error,
-					2,
+					3,
 					G_XIM_TYPE_MARKER_N_BYTES_2, vtype,
-					vtype, &value))
+					vtype, &value,
+					G_XIM_TYPE_AUTO_PADDING, 0))
 		return NULL;
 
 	new_attr = g_xim_attribute_new_with_value(attr_id, vtype, value);
Index: libgxim/gximmisc.c
===================================================================
--- libgxim/gximmisc.c	(??????????????? 204)
+++ libgxim/gximmisc.c	(??????????????? 205)
@@ -1370,9 +1370,8 @@
 	g_return_val_if_fail (G_IS_XIM_PROTOCOL (proto), 0);
 	g_return_val_if_fail (error != NULL, 0);
 
-	return g_xim_protocol_send_format(proto, cancellable, error, 2,
-					  G_XIM_TYPE_GSTRING, fontset,
-					  G_XIM_TYPE_AUTO_PADDING, 2);
+	return g_xim_protocol_send_format(proto, cancellable, error, 1,
+					  G_XIM_TYPE_GSTRING, fontset);
 }
 
 gpointer
@@ -1388,9 +1387,8 @@
 	g_return_val_if_fail (error != NULL, NULL);
 
 	if (!g_xim_protocol_read_format(proto, stream, cancellable, error,
-					2,
-					G_XIM_TYPE_GSTRING, &retval,
-					G_XIM_TYPE_AUTO_PADDING, 2))
+					1,
+					G_XIM_TYPE_GSTRING, &retval))
 		return NULL;
 
 	return retval;
@@ -2212,10 +2210,11 @@
 	g_return_val_if_fail (attr != NULL, 0);
 	g_return_val_if_fail (error != NULL, 0);
 
-	return g_xim_protocol_send_format(proto, cancellable, error, 3,
+	return g_xim_protocol_send_format(proto, cancellable, error, 4,
 					  G_XIM_TYPE_WORD, attr->id,
 					  G_XIM_TYPE_MARKER_N_BYTES_2, attr->vtype,
-					  attr->vtype, attr->v.pointer);
+					  attr->vtype, attr->v.pointer,
+					  G_XIM_TYPE_AUTO_PADDING, 0);
 }
 
 /* NESTEDLIST */


Index: libgxim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/libgxim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgxim.spec	2 Apr 2009 08:01:56 -0000	1.10
+++ libgxim.spec	3 Apr 2009 10:38:39 -0000	1.11
@@ -1,12 +1,13 @@
 Name:		libgxim
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/libgxim/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	intltool gettext ruby
 BuildRequires:	dbus-devel > 0.23, dbus-glib-devel >= 0.74, glib2-devel >= 2.16, gtk2-devel
 Source0:	http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2
+Patch0:		libgxim-fix-fontset.patch
 
 Summary:	GObject-based XIM protocol library
 Group:		System Environment/Libraries
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b 0-fontset
 
 
 %build
@@ -77,6 +79,9 @@
 %{_datadir}/gtk-doc/html/libgxim
 
 %changelog
+* Fri Apr  3 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.3-2
+- Fix an error message about FontSet.
+
 * Thu Apr  2 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.3-1
 - New upstream release.
   - partly including a fix of freeze issue with switching (#488877)



From ovasik at fedoraproject.org  Fri Apr  3 10:42:49 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri,  3 Apr 2009 10:42:49 +0000 (UTC)
Subject: rpms/elinks/devel elinks-nss.patch,1.2,1.3 elinks.spec,1.66,1.67
Message-ID: <20090403104249.BEE9770134@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6512

Modified Files:
	elinks-nss.patch elinks.spec 
Log Message:
use word Elinks instead of Links in package description

elinks-nss.patch:

Index: elinks-nss.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-nss.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elinks-nss.patch	30 Mar 2009 13:45:18 -0000	1.2
+++ elinks-nss.patch	3 Apr 2009 10:42:49 -0000	1.3
@@ -188,7 +188,7 @@
 +		    "have a PKCS#12 file containing client certificate, you "
 +		    "can import it into your NSS database with: "
 +		    "$ pk12util -i mycert.p12 -d /path/to/database "
-+       " "
++		    " "
 +		    "The NSS database location can be changed by SSL_DIR "
 +		    "environment variable. The database can be also shared "
 +		    "with Mozilla browsers.")),


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- elinks.spec	30 Mar 2009 13:45:18 -0000	1.66
+++ elinks.spec	3 Apr 2009 10:42:49 -0000	1.67
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.11.pre3%{?dist}
+Release:   0.12.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -35,9 +35,9 @@
 Patch9: elinks-nss.patch
 
 %description
-Links is a text-based Web browser. Links does not display any images,
-but it does support frames, tables and most other HTML tags. Links'
-advantage over graphical browsers is its speed--Links starts and exits
+Elinks is a text-based Web browser. Elinks does not display any images,
+but it does support frames, tables and most other HTML tags. Elinks'
+advantage over graphical browsers is its speed--Elinks starts and exits
 quickly and swiftly displays Web pages.
 
 %prep
@@ -117,6 +117,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Apr 03 2009 Ondrej Vasik <ovasik at redhat.com> 0.12.0.12.pre3
+- use word Elinks instead of Links in package description
+
 * Mon Mar 30 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.11.pre3
 - new upstream bugfix prerelease
 - defuzz patches



From pkgdb at fedoraproject.org  Fri Apr  3 11:34:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 11:34:46 +0000
Subject: [pkgdb] kdebase: ltinkl has requested watchcommits
Message-ID: <20090403113446.A1B2D208555@bastion.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Apr  3 11:34:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 11:34:37 +0000
Subject: [pkgdb] kdebase: ltinkl has requested watchbugzilla
Message-ID: <20090403113444.64DE720854A@bastion.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Apr  3 11:35:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 11:35:10 +0000
Subject: [pkgdb] kdebase: ltinkl has requested commit
Message-ID: <20090403113449.EF3F5208602@bastion.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdebase (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Apr  3 11:45:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 11:45:30 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090403114511.2055E20854A@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Apr  3 11:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 11:45:04 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090403114512.7C715208555@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Apr  3 11:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 11:45:33 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090403114513.2ECA4208602@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From transif at fedoraproject.org  Fri Apr  3 11:54:55 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri,  3 Apr 2009 11:54:55 +0000 (UTC)
Subject: comps/po ta.po,1.17,1.18
Message-ID: <20090403115455.1870E70134@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9447/po

Modified Files:
	ta.po 
Log Message:
Sending translation for Tamil


Index: ta.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ta.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ta.po	9 Jan 2009 11:52:43 -0000	1.17
+++ ta.po	3 Apr 2009 11:54:24 -0000	1.18
@@ -9,13 +9,13 @@
 # Jayaradha N <njaya at redhat.com>, 2004, 2006.
 # Felix <ifelix at redhat.com>, 2006.
 # I felix <ifelix at redhat.com>, 2007.
-# I. Felix <ifelix at redhat.com>, 2008.
+# I. Felix <ifelix at redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-10 17:03+0530\n"
+"POT-Creation-Date: 2009-03-31 08:02+0000\n"
+"PO-Revision-Date: 2009-04-02 22:23+0530\n"
 "Last-Translator: I. Felix <ifelix at redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,8 @@
 "\n"
 "\n"
 "\n"
+"\n"
+"\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
@@ -41,192 +43,192 @@
 "??????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "????????????????????? ?????????????????? ??????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "??????????????????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "???????????? ???????????????????????? ???????????????????????? ???????????????????????? ???????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????????????????????? ???????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "??????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ??????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "?????????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "????????????????????? ??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "????????? ????????????"
 
@@ -235,78 +237,78 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "??????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "???????????? ??????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "??????????????????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "?????????????????? (????????????) ????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "???????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ????????????????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -316,19 +318,19 @@
 "???????????????????????? ???????????? ?????????????????? ??????????????????????????? ????????? ????????????????????? ??????????????????????????????????????? ????????? ??????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ?????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -337,86 +339,86 @@
 "?????????????????????????????? ????????? ???????????????????????? ?????????????????? ??????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "??????????????????????????????????????? ????????????????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -424,78 +426,76 @@
 msgstr "GTK+ ????????????????????? GNOME ?????????????????? ????????????????????????????????? ???????????????????????? ???????????? ????????????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????????????????????? XFCE ?????????????????? ????????????????????????????????? ???????????????????????? ???????????? ????????????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????????????????? KDE ?????????????????? ????????????????????????????????? ???????????????????????? ???????????? ????????????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "?????????????????? ?????????????????? ????????? ??????????????? ??????????????????????????? ???????????????????????? ????????????????????? ????????????????????????????????? ???????????? ???????????????????????? "
 "?????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????????????????? ???????????????????????? (X) ??????????????? ????????????????????? ?????????????????????????????? ???????????? ???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop Environment)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "?????????????????? ?????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -504,121 +504,121 @@
 "??????????????????????????? ??????????????? ????????? ???????????????????????? ?????????????????? ??????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "?????? ????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "??????????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "???????????? ??????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "???????????? ?????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "???????????? ?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????????????? ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "?????? ???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????????????????/???????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -626,111 +626,110 @@
 msgstr "????????????????????????????????? ??????????????????????????????????????????, ???????????????????????????????????? ???????????????????????????????????? ?????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "?????????????????? ?????????????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "???????????? ???????????? ?????????????????????????????? ??????????????? ????????????????????? ????????????????????? ??????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "??????????????? ????????????????????????????????? ??????????????? ???????????????????????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -739,77 +738,77 @@
 "????????????????????? ????????????????????? ??????????????????. ????????????????????? ????????????????????? Vi ??????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "???????????? ?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "???????????? ???????????? ????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ???????????????????????? ???????????? ?????????????????? ???????????????????????? ????????????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ???????????????????????? ???????????? ?????????????????? ?????????????????????????????? ???????????????????????? ????????????????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "??????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "????????? ??????????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "???????????? ????????????"
 
@@ -818,46 +817,42 @@
 msgstr "??????????????????????????? ???????????????????????????????????? ???????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????? ?????????????????????????????????, PDF ???????????????????????????, ????????????????????? ?????? ????????????????????????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "???????????? ????????????????????????????????? ????????????????????????????????? ????????????????????????????????? ???????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "???????????? ????????????????????????????????? IMAP ?????????????????? SMTP ?????????????????? ?????????????????????????????? ??????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "???????????? ????????????????????????????????? X ???????????? ?????????????????????????????? ????????????????????????????????? ???????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????? ????????????????????????????????? ???????????? ????????????????????????????????? ?????????????????? ???????????? ??????????????????????????? ???????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "???????????? ????????????????????????????????? ??????????????? ????????????????????????????????? ???????????????????????????????????? DHCP, Kerberos ????????????????????? NIS?????????????????????????????? "
 "??????????????????????????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -866,17 +861,17 @@
 "?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "???????????? ????????????????????????????????? ????????? ???????????????????????????????????? ??????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "???????????? ????????????????????????????????? ????????????????????? ????????????????????????????????????????????? ??????????????? ?????????????????? ????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -885,7 +880,7 @@
 "????????????????????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -894,19 +889,19 @@
 "????????????????????? ?????????????????? ??????????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "???????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????? ?????????????????????????????? ??????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "???????????? ???????????????????????? ????????????????????? ??????????????????????????? FTP ?????????????????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -916,19 +911,18 @@
 "debugger????????? ????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "???????????? ???????????? ????????????????????? ??????????????????????????? ????????? ?????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
-msgstr ""
-"???????????? ???????????? Red Hat ????????? ????????????????????? ??????????????????????????? ?????????????????? ?????????????????????????????? ???????????????????????????????????? ?????????????????????????????????."
+msgstr "???????????? ???????????? Red Hat ????????? ????????????????????? ??????????????????????????? ?????????????????? ?????????????????????????????? ???????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -937,13 +931,13 @@
 "??????????????????????????? ???????????????????????? ???????????????????????????, ????????????????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "???????????? ???????????????????????? ?????????????????? ??????????????????????????????, ?????????????????? ????????????????????? ?????????????????? ?????????????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -953,13 +947,13 @@
 "????????????????????? ????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???????????? ???????????? ??????????????????????????? ??????????????? ????????????????????? ???????????? ?????????????????? ????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -969,7 +963,7 @@
 "?????????????????????????????? X ???????????? ????????????????????? ??????????????????????????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -979,21 +973,19 @@
 "??????????????????????????? ???????????????????????? ????????????????????? ????????????????????? ??????????????????????????? ????????????????????????????????????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????? ???????????? ????????????????????? ??????????????????????????? ????????????????????????????????? ????????????????????? ?????????????????? ????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -1003,13 +995,12 @@
 "????????????????????? ???????????????????????? ????????????????????? ??????????????? ???????????????????????????????????? ??????????????????????????????????????? ???????????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "???????????? ???????????????????????? ???????????? ??????????????????????????? DNS ??????????????? ?????????????????????????????? (BIND) ??????????????? ???????????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1018,330 +1009,358 @@
 "???????????????????????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "???????????? ???????????????????????? ???????????? MySQL??? ?????????????????????????????????????????????????????? ????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "???????????? ???????????????????????? ???????????? Postgresql ?????????????????????????????????????????????????????? ????????????????????? ??????????????? ????????????????????????????????? "
 "?????????????????????????????????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "????????? ????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????? ????????????????????? ???????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????????????????? ????????????????????? ?????????????????? ????????????????????? ????????????????????? ??????????????????????????? ?????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "???????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "???????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "???????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "???????????????????????? ?????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ?????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ?????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "Buildsystem ?????????????????? ??????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "????????????????????? ???????????????????????????"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "??????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "????????????????????????????????? ???????????????????????? ???????????????????????? ??????????????????????????? ?????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "????????????????????????????????? ???????????????????????? ???????????????????????????????????? ???????????????????????? ????????????????????????."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "????????? ??????????????????????????????????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "????????????????????? ????????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "???????????? ???????????????????????? ????????????????????? ???????????????????????? ?????????????????????????????????????????? ?????????????????????????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "???????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "??????????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "????????????????????????????????? ????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????? ???????????? ????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR ????????????????????? ????????????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ?????????????????? OLPC XO???????????? ?????????????????????????????????????????? ????????????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "?????????????????? ?????????????????? ???????????????????????? ????????? ?????????????????????????????? ?????????????????????????????? ?????????????????????"
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "????????????????????? ??????????????????????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "????????????????????? ?????????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "????????????????????? ????????? ???????????????????????????????????? ????????????????????? ???????????? ?????????????????????????????????"
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "???????????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "??????????????????????????? (?????????????????????) ????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "???????????????????????? ???????????????????????? ???????????? ?????????????????? ???????????????????????? ????????????????????????????????? ????????????."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "?????????????????? ????????????"
+msgstr "????????????????????? ????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "??????????????????????????? ??????????????????????????????????????????????????? ?????????????????? ????????????????????? ????????????????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "???????????????????????????????????? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "??????????????????????????? ?????????????????? ????????????????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "??????????????????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "??????????????????????????? ????????????"
+msgstr "???????????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "??????????????? ????????????"
+msgstr "?????????????????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "??????????????? ????????????"
+msgstr "????????????????????? ????????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW cross-compiler"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "???????????? ???????????? ????????????????????? ???????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "??????????????? ????????????????????? ????????????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "32 ???????????? ???????????????????????? ??????????????????????????????????????? ???????????????????????? ????????????????????????, ??????????????????????????? ????????????????????? ??????????????????????????? ???????????????????????????????????? ??????????????????????????? ??????????????????????????????????????????????????? ???????????????????????????????????????"
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "Objective CAML programming ???????????? ????????????????????? ?????????????????? ??????????????? ?????????????????????????????? ???????????????????????????????????? ????????????."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????."
+msgstr "???????????? ?????????????????????????????? ???????????????????????? ???????????? ??????????????????, ???????????????????????????, ????????????????????????????????? ????????????????????? ?????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "??????????????????????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "????????????????????? ????????????"
+msgstr "???????????? ????????????????????? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1392,18 +1411,15 @@
 msgstr "?????????????????? ???????????? ????????????????????????????????? ?????????????????????????????????????????? ??????????????? ????????????????????????????????? ?????????????????? ????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ?????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ?????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ???????????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1411,6 +1427,6 @@
 msgstr "X?????????????????????"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ???????????? ???????????????????????? ?????????????????? ????????????????????????????????????."
+



From jbowes at fedoraproject.org  Fri Apr  3 12:09:16 2009
From: jbowes at fedoraproject.org (James Bowes)
Date: Fri,  3 Apr 2009 12:09:16 +0000 (UTC)
Subject: rpms/tig/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 tig.spec, 
	1.15, 1.16
Message-ID: <20090403120916.4A1FD70134@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/tig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11170

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
tig-0.14.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Feb 2009 18:36:48 -0000	1.11
+++ .cvsignore	3 Apr 2009 12:08:45 -0000	1.12
@@ -1 +1 @@
-tig-0.14.tar.gz
+tig-0.14.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Feb 2009 18:36:48 -0000	1.11
+++ sources	3 Apr 2009 12:08:45 -0000	1.12
@@ -1 +1 @@
-db095faf5b5db92c583ef1ebd0f1c360  tig-0.14.tar.gz
+e47bf48813c0cbe6be0f3b749e6de96c  tig-0.14.1.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/tig.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tig.spec	25 Feb 2009 20:40:56 -0000	1.15
+++ tig.spec	3 Apr 2009 12:08:45 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           tig
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.14.1
+Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 Group:          Development/Tools
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 James Bowes <jbowes at redhat.com> 0.14.1-1
+- tig-0.14.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jbowes at fedoraproject.org  Fri Apr  3 12:25:49 2009
From: jbowes at fedoraproject.org (James Bowes)
Date: Fri,  3 Apr 2009 12:25:49 +0000 (UTC)
Subject: rpms/python-vobject/devel .cvsignore, 1.15, 1.16 python-vobject.spec,
	1.21, 1.22 sources, 1.15, 1.16
Message-ID: <20090403122549.B78D670134@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13803

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
vobject 0.8.1c


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Feb 2009 18:26:25 -0000	1.15
+++ .cvsignore	3 Apr 2009 12:25:19 -0000	1.16
@@ -1 +1 @@
-vobject-0.8.1b.tar.gz
+vobject-0.8.1c.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-vobject.spec	27 Feb 2009 00:08:31 -0000	1.21
+++ python-vobject.spec	3 Apr 2009 12:25:19 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.8.1b 
-Release:        2%{?dist}
+Version:        0.8.1c 
+Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 James Bowes <jbowes at redhat.com> - 0.8.1c-1
+- Update to 0.8.1c
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Feb 2009 18:26:25 -0000	1.15
+++ sources	3 Apr 2009 12:25:19 -0000	1.16
@@ -1 +1 @@
-5af438b0dd0d26214d1631f47569e0ce  vobject-0.8.1b.tar.gz
+c9686dd74d39fdae140890d9c694c076  vobject-0.8.1c.tar.gz



From ltinkl at fedoraproject.org  Fri Apr  3 12:26:17 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  3 Apr 2009 12:26:17 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase.spec, 1.361, 1.362 sources, 1.107,
	1.108 kdebase-4.2.1-konsole-layout-regression.patch, 1.1,
	NONE kdebase-4.2.1-konsole-selection.patch, 1.1, NONE
Message-ID: <20090403122617.0F8BF70134@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13844/F-10

Modified Files:
	kdebase.spec sources 
Removed Files:
	kdebase-4.2.1-konsole-layout-regression.patch 
	kdebase-4.2.1-konsole-selection.patch 
Log Message:
sync with devel/



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- kdebase.spec	9 Mar 2009 22:21:16 -0000	1.361
+++ kdebase.spec	3 Apr 2009 12:25:46 -0000	1.362
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,8 +29,6 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
-Patch100:   kdebase-4.2.1-konsole-selection.patch
-Patch101:   kdebase-4.2.1-konsole-layout-regression.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -127,9 +125,6 @@
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
-%patch100 -p1 -b .konsole
-%patch101 -p1 -b .layout-regression
-
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -253,19 +248,29 @@
 
 %post
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+%if "%{name}" == "kdebase"
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %if 0%{?libs}
 %post libs -p /sbin/ldconfig
@@ -310,6 +315,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+- optimize scriptlets
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 09 2009 Than Ngo <than at redhat.com> - 4.2.1-3
 - apply patch to fix regression in konsole, layout regression affecting apps
   using the KPart


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- sources	27 Feb 2009 15:38:33 -0000	1.107
+++ sources	3 Apr 2009 12:25:46 -0000	1.108
@@ -1 +1 @@
-a8f391db7b98feaa6ae81b8f1e99ed5a  kdebase-4.2.1.tar.bz2
+7f6b0d5051f251d0f34ee797a8e2b54a  kdebase-4.2.2.tar.bz2


--- kdebase-4.2.1-konsole-layout-regression.patch DELETED ---


--- kdebase-4.2.1-konsole-selection.patch DELETED ---



From ltinkl at fedoraproject.org  Fri Apr  3 12:26:17 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  3 Apr 2009 12:26:17 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase.spec, 1.351, 1.352 sources, 1.102,
	1.103 kdebase-4.2.1-konsole-layout-regression.patch, 1.1,
	NONE kdebase-4.2.1-konsole-selection.patch, 1.1, NONE
Message-ID: <20090403122617.6169C70134@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13844/F-9

Modified Files:
	kdebase.spec sources 
Removed Files:
	kdebase-4.2.1-konsole-layout-regression.patch 
	kdebase-4.2.1-konsole-selection.patch 
Log Message:
sync with devel/



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- kdebase.spec	9 Mar 2009 22:23:51 -0000	1.351
+++ kdebase.spec	3 Apr 2009 12:25:47 -0000	1.352
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,8 +29,6 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
-Patch100:   kdebase-4.2.1-konsole-selection.patch
-Patch101:   kdebase-4.2.1-konsole-layout-regression.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -127,9 +125,6 @@
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
-%patch100 -p1 -b .konsole
-%patch101 -p1 -b .layout-regression
-
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -253,19 +248,29 @@
 
 %post
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+%if "%{name}" == "kdebase"
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 %{!?libs:/sbin/ldconfig}
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
 %if "%{name}" == "kdebase"
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 %endif
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %if 0%{?libs}
 %post libs -p /sbin/ldconfig
@@ -310,6 +315,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+- optimize scriptlets
+
+* Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 09 2009 Than Ngo <than at redhat.com> - 4.2.1-3
 - apply patch to fix regression in konsole, layout regression affecting apps
   using the KPart


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	27 Feb 2009 15:38:33 -0000	1.102
+++ sources	3 Apr 2009 12:25:47 -0000	1.103
@@ -1 +1 @@
-a8f391db7b98feaa6ae81b8f1e99ed5a  kdebase-4.2.1.tar.bz2
+7f6b0d5051f251d0f34ee797a8e2b54a  kdebase-4.2.2.tar.bz2


--- kdebase-4.2.1-konsole-layout-regression.patch DELETED ---


--- kdebase-4.2.1-konsole-selection.patch DELETED ---



From jfch2222 at fedoraproject.org  Fri Apr  3 12:37:30 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  3 Apr 2009 12:37:30 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-homechroot.patch, NONE,
	1.1 openssh-5.1p1-log-in-chroot.patch, 1.1, 1.2 openssh.spec,
	1.139, 1.140
Message-ID: <20090403123730.62F3770134@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15231

Modified Files:
	openssh-5.1p1-log-in-chroot.patch openssh.spec 
Added Files:
	openssh-5.2p1-homechroot.patch 
Log Message:
- fix logging after chroot
- enable non root users to use chroot %h in internal-sftp


openssh-5.2p1-homechroot.patch:

--- NEW FILE openssh-5.2p1-homechroot.patch ---
--- openssh-5.2p1/session.c	2009-03-20 18:08:11.263662384 +0100
+++ openssh-5.2p1/session.c	2009-03-20 18:26:29.925498409 +0100
@@ -1408,6 +1408,7 @@
 	const char *cp;
 	char component[MAXPATHLEN];
 	struct stat st;
+	int last;
 
 	if (*path != '/')
 		fatal("chroot path does not begin at root");
@@ -1419,7 +1420,7 @@
 	 * root-owned directory with strict permissions.
 	 */
 	for (cp = path; cp != NULL;) {
-		if ((cp = strchr(cp, '/')) == NULL)
+		if (((last = ((cp = strchr(cp, '/')) == NULL))))
 			strlcpy(component, path, sizeof(component));
 		else {
 			cp++;
@@ -1432,7 +1433,7 @@
 		if (stat(component, &st) != 0)
 			fatal("%s: stat(\"%s\"): %s", __func__,
 			    component, strerror(errno));
-		if (st.st_uid != 0 || (st.st_mode & 022) != 0)
+		if ((st.st_uid != 0 || (st.st_mode & 022) != 0) && !(last && st.st_uid == uid))
 			fatal("bad ownership or modes for chroot "
 			    "directory %s\"%s\"", 
 			    cp == NULL ? "" : "component ", component);

openssh-5.1p1-log-in-chroot.patch:

Index: openssh-5.1p1-log-in-chroot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.1p1-log-in-chroot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-5.1p1-log-in-chroot.patch	23 Jul 2008 14:47:19 -0000	1.1
+++ openssh-5.1p1-log-in-chroot.patch	3 Apr 2009 12:37:30 -0000	1.2
@@ -15,15 +15,32 @@
 diff -up openssh-5.1p1/log.c.log-chroot openssh-5.1p1/log.c
 --- openssh-5.1p1/log.c.log-chroot	2008-06-10 15:01:51.000000000 +0200
 +++ openssh-5.1p1/log.c	2008-07-23 15:18:52.000000000 +0200
-@@ -56,6 +56,7 @@ static LogLevel log_level = SYSLOG_LEVEL
+@@ -45,6 +45,7 @@
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <fcntl.h>
+ #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
+ # include <vis.h>
+ #endif
+@@ -56,6 +57,7 @@
  static int log_on_stderr = 1;
  static int log_facility = LOG_AUTH;
  static char *argv0;
-+static int log_fd_keep;
++int log_fd_keep = 0;
  
  extern char *__progname;
  
-@@ -392,10 +393,21 @@ do_log(LogLevel level, const char *fmt, 
+@@ -310,6 +312,8 @@
+ 		exit(1);
+ 	}
+ 
++	if (log_fd_keep != 0)
++		return;
+ 	/*
+ 	 * If an external library (eg libwrap) attempts to use syslog
+ 	 * immediately after reexec, syslog may be pointing to the wrong
+@@ -392,10 +396,33 @@
  		syslog_r(pri, &sdata, "%.500s", fmtbuf);
  		closelog_r(&sdata);
  #else
@@ -42,16 +59,58 @@
 +void
 +open_log(void)
 +{
++	int temp1, temp2;
++
++	temp1 = open("/dev/null", O_RDONLY);
 +	openlog(argv0 ? argv0 : __progname, LOG_PID|LOG_NDELAY, log_facility);
-+	log_fd_keep = 1;
++	temp2 = open("/dev/null", O_RDONLY);
++	if (temp1 + 2 ==  temp2)
++		log_fd_keep = temp1 + 1;
++	else 
++		log_fd_keep = -1;
++
++	if (temp1 != -1)
++		close(temp1);
++	if (temp2 != -1)
++		close(temp2);
 +}
 diff -up openssh-5.1p1/log.h.log-chroot openssh-5.1p1/log.h
 --- openssh-5.1p1/log.h.log-chroot	2008-06-13 02:22:54.000000000 +0200
 +++ openssh-5.1p1/log.h	2008-07-23 15:20:11.000000000 +0200
-@@ -66,4 +66,6 @@ void     debug3(const char *, ...) __att
+@@ -46,6 +46,9 @@
+ 	SYSLOG_LEVEL_NOT_SET = -1
+ }       LogLevel;
+ 
++
++extern int log_fd_keep;
++
+ void     log_init(char *, LogLevel, SyslogFacility, int);
+ 
+ SyslogFacility	log_facility_number(char *);
+@@ -66,4 +69,6 @@
  
  void	 do_log(LogLevel, const char *, va_list);
  void	 cleanup_exit(int) __attribute__((noreturn));
 +
 +void     open_log(void);
  #endif
+--- openssh-5.2p1/session.c.	2009-03-20 18:32:01.004151364 +0100
++++ openssh-5.2p1/session.c	2009-03-20 19:00:28.328742384 +0100
+@@ -1445,6 +1456,7 @@
+ 	if (chdir(path) == -1)
+ 		fatal("Unable to chdir to chroot path \"%s\": "
+ 		    "%s", path, strerror(errno));
++	open_log ();
+ 	if (chroot(path) == -1)
+ 		fatal("chroot(\"%s\"): %s", path, strerror(errno));
+ 	if (chdir("/") == -1)
+@@ -1632,7 +1644,8 @@
+ 	 * descriptors open.
+ 	 */
+ 	for (i = 3; i < 64; i++)
+-		close(i);
++		if (i != log_fd_keep)
++			close(i);
+ }
+ 
+ /*


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- openssh.spec	13 Mar 2009 10:32:52 -0000	1.139
+++ openssh.spec	3 Apr 2009 12:37:30 -0000	1.140
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 2%{?dist}%{?rescue_rel}
+Release: 3%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -97,6 +97,7 @@
 Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
 Patch65: openssh-5.2p1-fips.patch
+Patch66: openssh-5.2p1-homechroot.patch
 
 License: BSD
 Group: Applications/Internet
@@ -228,6 +229,7 @@
 %patch55 -p1 -b .cloexec
 %patch62 -p1 -b .manpage
 %patch65 -p1 -b .fips
+%patch66 -p1 -b .homechroot
 
 autoreconf
 
@@ -472,6 +474,10 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-3
+- fix logging after chroot
+- enable non root users to use chroot %h in internal-sftp
+
 * Fri Mar 13 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-2
 - add AES-CTR ciphers to the FIPS mode proposal
 



From hadess at fedoraproject.org  Fri Apr  3 12:38:38 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  3 Apr 2009 12:38:38 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.18,
	1.19 nautilus-sendto.spec, 1.66, 1.67 sources, 1.18,
	1.19 nautilus-sendto-empathy-contact-selector.patch, 1.1, NONE
Message-ID: <20090403123838.2843070134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15392

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Removed Files:
	nautilus-sendto-empathy-contact-selector.patch 
Log Message:
* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.3-1
- Update to 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	23 Feb 2009 13:40:00 -0000	1.18
+++ .cvsignore	3 Apr 2009 12:38:07 -0000	1.19
@@ -1 +1 @@
-nautilus-sendto-1.1.2.tar.bz2
+nautilus-sendto-1.1.3.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- nautilus-sendto.spec	18 Mar 2009 05:25:59 -0000	1.66
+++ nautilus-sendto.spec	3 Apr 2009 12:38:07 -0000	1.67
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
-Version:        1.1.2
-Release: 	4%{?dist}
+Version:        1.1.3
+Release: 	1%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -31,9 +31,6 @@
 Obsoletes: nautilus-sendto-bluetooth
 Provides: nautilus-sendto-bluetooth
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=567065
-Patch0: nautilus-sendto-empathy-contact-selector.patch
-
 %description
 The nautilus-sendto package provides a Nautilus context menu for
 sending files via other desktop applications.  These functions are
@@ -43,7 +40,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .empathy-contact-selector
 
 %build
 %configure
@@ -98,6 +94,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.3-1
+- Update to 1.1.3
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.2-4
 - Make build and run with current Empathy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 Feb 2009 13:40:00 -0000	1.18
+++ sources	3 Apr 2009 12:38:07 -0000	1.19
@@ -1 +1 @@
-20b5ae02ebc33d443b747b5f309b8e4a  nautilus-sendto-1.1.2.tar.bz2
+1a3a983b72cbb63170ccb989440a40c0  nautilus-sendto-1.1.3.tar.bz2


--- nautilus-sendto-empathy-contact-selector.patch DELETED ---



From mgrepl at fedoraproject.org  Fri Apr  3 12:41:49 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri,  3 Apr 2009 12:41:49 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.264,
	1.265 selinux-policy.spec, 1.746, 1.747
Message-ID: <20090403124149.E5D0370134@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15827

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
- Allow spamc_t to manage spamassassin milter state


policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- policy-20071130.patch	25 Mar 2009 08:29:43 -0000	1.264
+++ policy-20071130.patch	3 Apr 2009 12:41:46 -0000	1.265
@@ -653995,7 +653995,7 @@
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.3.1/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/services/milter.if	2009-03-20 10:54:05.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/services/milter.if	2009-04-03 13:51:58.000000000 +0200
 @@ -0,0 +1,105 @@
 +## <summary>Milter mail filters</summary>
 +
@@ -654091,7 +654091,7 @@
 +##     </summary>
 +## </param>
 +#
-+interface(`spamass_milter_manage_state',`
++interface(`milter_spamass_manage_state',`
 +       gen_require(`
 +               type spamass_milter_state_t;
 +       ')
@@ -664920,7 +664920,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.3.1/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2008-02-26 14:23:10.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/services/spamassassin.te	2009-03-20 10:50:40.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/services/spamassassin.te	2009-04-03 13:52:53.000000000 +0200
 @@ -21,8 +21,10 @@
  gen_tunable(spamd_enable_home_dirs,true)
  
@@ -665061,12 +665061,12 @@
  ')
  
  optional_policy(`
-@@ -209,6 +264,228 @@
+@@ -209,6 +264,232 @@
  	mta_read_config(spamd_t)
  ')
  
 + optional_policy(`
-+        spamass_milter_manage_state(spamd_t)
++	milter_spamass_manage_state(spamd_t)
 +')
 +
  optional_policy(`
@@ -665281,6 +665281,10 @@
 +')
 +
 +optional_policy(`
++        milter_spamass_manage_state(spamc_t)
++')
++
++optional_policy(`
 +	mta_read_queue(spamc_t)
 +	mta_read_config(spamc_t)
 +	sendmail_stub(spamc_t)
@@ -670249,7 +670253,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.3.1/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/system/libraries.fc	2009-03-23 10:46:22.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/system/libraries.fc	2009-04-03 14:00:57.000000000 +0200
 @@ -69,8 +69,10 @@
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
@@ -670306,7 +670310,7 @@
  
  /usr/lib/firefox-[^/]*/plugins/nppdf.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/libFLAC\.so.*			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -183,6 +191,7 @@
+@@ -183,12 +191,14 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/[^/]*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/codecs/[^/]*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -670314,7 +670318,14 @@
  /usr/lib(64)?/libSDL-.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -204,6 +213,9 @@
+ /usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/X11R6/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/libOSMesa\.so.*                --      gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -204,6 +214,9 @@
  /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -670324,7 +670335,7 @@
  # Fedora Extras packages: ladspa, imlib2, ocaml
  /usr/lib(64)?/ladspa/analogue_osc_1416\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/bandpass_a_iir_1893\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -229,7 +241,8 @@
+@@ -229,7 +242,8 @@
  /usr/lib(64)?/php/modules/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
@@ -670334,7 +670345,7 @@
  /usr/lib(64)?/codecs/drv[1-9c]\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -242,12 +255,13 @@
+@@ -242,12 +256,13 @@
  
  # Flash plugin, Macromedia
  HOME_DIR/\.mozilla(/.*)?/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -670350,7 +670361,7 @@
  
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -263,6 +277,8 @@
+@@ -263,6 +278,8 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -670359,7 +670370,7 @@
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -287,11 +303,15 @@
+@@ -287,11 +304,15 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -670375,7 +670386,7 @@
  /var/ftp/lib(64)?(/.*)?				gen_context(system_u:object_r:lib_t,s0)
  /var/ftp/lib(64)?/ld[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
  
-@@ -301,6 +321,30 @@
+@@ -301,6 +322,30 @@
  /var/lib/samba/bin/.+\.so(\.[^/]*)*	-l	gen_context(system_u:object_r:lib_t,s0)
  ')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.746
retrieving revision 1.747
diff -u -r1.746 -r1.747
--- selinux-policy.spec	25 Mar 2009 08:29:45 -0000	1.746
+++ selinux-policy.spec	3 Apr 2009 12:41:48 -0000	1.747
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 130%{?dist}
+Release: 131%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Apr 3 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-131
+- Allow spamc_t to manage spamassassin milter state
+
 * Wed Mar 25 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-130
 - Add xenner fixes
 



From than at fedoraproject.org  Fri Apr  3 12:55:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  3 Apr 2009 12:55:48 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec, 1.57, 1.58 sources, 1.20,
	1.21 subdirs-kde-l10n, 1.15, 1.16
Message-ID: <20090403125548.57BE370134@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17502

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
4.2.2



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-l10n.spec	2 Mar 2009 10:31:56 -0000	1.57
+++ kde-l10n.spec	3 Apr 2009 12:55:17 -0000	1.58
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -49,7 +49,7 @@
 Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
 #Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
-#Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
 Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
 Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
 #Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
@@ -63,6 +63,14 @@
 #Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2
+Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-bn_IN-%{version}.tar.bz2
+Source55: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-gu-%{version}.tar.bz2
+Source56: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-is-%{version}.tar.bz2
+#Source57: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-kn-%{version}.tar.bz2
+Source58: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mai-%{version}.tar.bz2
+Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
+Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
+Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -122,6 +130,15 @@
 %description Belarusian
 Belarusian language support for KDE
 
+%package Bengali
+Summary: Bengali language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-bn_IN = %{version}-%{release}
+
+%description Bengali
+Bengali language support for KDE
+
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
@@ -131,15 +148,6 @@
 %description Bulgarian
 Bulgarian language support for KDE
 
-%package Bengali
-Summary: Bengali language support for KDE
-Group: User Interface/Desktops
-Requires: kde-filesystem
-Provides: %{name}-bn = %{version}-%{release}
-
-%description Bengali
-Bengali language support for KDE
-
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
@@ -185,8 +193,6 @@
 %description Czech
 Czech language support for KDE
 
-
-
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
@@ -223,6 +229,15 @@
 %description Greek
 Greek language support for KDE
 
+%package Gujarati
+Summary: Gujarati language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-gu = %{version}-%{release}
+
+%description Gujarati
+Gujarati language support for KDE
+
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
@@ -494,6 +509,15 @@
 %description Macedonian
 Macedonian language support for KDE
 
+%package Maithili
+Summary: Maithili language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-mai = %{version}-%{release}
+
+%description Maithili
+Maithili language support for KDE
+
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
@@ -512,6 +536,15 @@
 %description Maltese
 Maltese language support for KDE
 
+%package Marathi
+Summary: Marathi language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-mr = %{version}-%{release}
+
+%description Marathi
+Marathi language support for KDE
+
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
@@ -834,7 +867,7 @@
 %lang(af) %{_datadir}/locale/af/*
 %endif
 
-%files Arabic 
+%files Arabic
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
@@ -856,11 +889,9 @@
 %lang(bg) %{_datadir}/locale/bg/*
 %lang(bg) %{_kde4_appsdir}/kvtml/bg
 
-%if %{buildall}
 %files Bengali
 %defattr(-,root,root)
-%lang(bn) %{_datadir}/locale/bn/*
-%endif
+%lang(bn_IN) %{_datadir}/locale/bn_IN/*
 
 %if %{buildall}
 %files Tibetan
@@ -929,12 +960,19 @@
 %lang(el) %{_datadir}/locale/el/*
 %lang(el) %{_kde4_appsdir}/kvtml/el
 
+%files Gujarati
+%defattr(-,root,root)
+%lang(gu) %{_datadir}/locale/gu/*
+
 %files British
 %defattr(-,root,root)
 %lang(en_GB) %{_datadir}/locale/en_GB/*
 %lang(en_GB) %{_kde4_appsdir}/klettres/en_GB
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
+%lang(en_GB) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.en_GB.xml
+%lang(en_GB) %{_kde4_appsdir}/kturtle/data/logokeywords.en_GB.xml
+%lang(en_GB) %{_kde4_appsdir}/kturtle/examples/en_GB/*.logo
 
 %if %{buildall}
 %files Esperanto
@@ -1043,11 +1081,9 @@
 %lang(id) %{_datadir}/locale/id/*
 %endif
 
-%if %{buildall}
 %files Icelandic
 %defattr(-,root,root)
 %lang(is) %{_datadir}/locale/is/*
-%endif
 
 %files Italian
 %defattr(-,root,root)
@@ -1120,6 +1156,14 @@
 %defattr(-,root,root)
 %lang(mk) %{_datadir}/locale/mk/*
 
+%files Maithili
+%defattr(-,root,root)
+%lang(mai) %{_datadir}/locale/mai/*
+
+%files Marathi
+%defattr(-,root,root)
+%lang(mr) %{_datadir}/locale/mr/*
+
 %files Malayalam
 %defattr(-,root,root)
 %lang(ml) %{_datadir}/locale/ml/*
@@ -1144,6 +1188,9 @@
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
 %lang(nl) %{_kde4_docdir}/HTML/nl
+%lang(nl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nl.xml
+%lang(nl) %{_kde4_appsdir}/kturtle/data/logokeywords.nl.xml
+%lang(nl) %{_kde4_appsdir}/kturtle/examples/nl/*.logo
 %lang(nl) %{_mandir}/nl/*/*
 
 %if %{buildall}
@@ -1159,6 +1206,9 @@
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
+%lang(nb) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nb.xml
+%lang(nb) %{_kde4_appsdir}/kturtle/data/logokeywords.nb.xml
+%lang(nb) %{_kde4_appsdir}/kturtle/examples/nb/*.logo
 %lang(nb) %{_mandir}/nb/*/*
 
 %files Norwegian-Nynorsk
@@ -1202,29 +1252,33 @@
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
+%lang(pt_BR) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.pt_BR.xml
+%lang(pt_BR) %{_kde4_appsdir}/kturtle/data/logokeywords.pt_BR.xml
+%lang(pt_BR) %{_kde4_appsdir}/kturtle/examples/pt_BR/*.logo
 %lang(pt_BR) %{_mandir}/pt_BR/*/*
 
-%if %{buildall}
 %files Romanian
 %defattr(-,root,root)
 %lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_kde4_appsdir}/kvtml/ro
 %lang(ro) %{_kde4_appsdir}/ktuberling/sounds/ro*
-%endif
+%lang(ro) %{_kde4_docdir}/HTML/ro
 
 %files Russian
 %defattr(-,root,root)
 %lang(ru) %{_datadir}/locale/ru/*
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
+%lang(ru) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.ru.xml
+%lang(ru) %{_kde4_appsdir}/kturtle/data/logokeywords.ru.xml
+%lang(ru) %{_kde4_appsdir}/kturtle/examples/ru/*.logo
 %lang(ru) %{_mandir}/ru/*/*
 
-%if %{buildall}
 %files Slovak
 %defattr(-,root,root)
 %lang(sk) %{_datadir}/locale/sk/*
-%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
-%lang(sk) %{_kde4_appsdir}/klettres/sk
-%endif
+#%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
+#%lang(sk) %{_kde4_appsdir}/klettres/sk
 
 %files Slovenian
 %defattr(-,root,root)
@@ -1232,6 +1286,9 @@
 %lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
 %lang(sl) %{_kde4_appsdir}/khangman/sl.txt
 %lang(sl) %{_kde4_appsdir}/kvtml/sl
+%lang(sl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sl.xml
+%lang(sl) %{_kde4_appsdir}/kturtle/data/logokeywords.sl.xml
+%lang(sl) %{_kde4_appsdir}/kturtle/examples/sl/*.logo
 %lang(sl) %{_kde4_docdir}/HTML/sl
 
 %files Serbian
@@ -1264,11 +1321,11 @@
 %lang(ta) %{_datadir}/locale/ta/*
 %endif
 
-%if %{buildall}
 %files Tajik
 %defattr(-,root,root)
 %lang(tg) %{_datadir}/locale/tg/*
-%endif
+%lang(tg) %{_kde4_appsdir}/kvtml/tg
+%lang(tg) %{_kde4_appsdir}/khangman/tg.txt
 
 %files Thai
 %defattr(-,root,root)
@@ -1325,6 +1382,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	2 Mar 2009 10:31:56 -0000	1.20
+++ sources	3 Apr 2009 12:55:18 -0000	1.21
@@ -1,47 +1,56 @@
-7d2caac95a427cafadaca02f3647cd1e  kde-l10n-ar-4.2.1.tar.bz2
-f6621960e9a1f3328e42a6f5735083c7  kde-l10n-bg-4.2.1.tar.bz2
-b4e42ac60e2491025705ef7d4f9ff613  kde-l10n-ca-4.2.1.tar.bz2
-7787304141fa31c4b967297b2d75b36f  kde-l10n-cs-4.2.1.tar.bz2
-2f2ca099814cd3bbf1a0273d0b027b80  kde-l10n-csb-4.2.1.tar.bz2
-7765ade376b10d25d88e0b9d7ea7ef94  kde-l10n-da-4.2.1.tar.bz2
-c1521b6517667e9dd1a29ffb9182cd0e  kde-l10n-de-4.2.1.tar.bz2
-53df4a6bd3f6ce8aa4130ab4c927ec93  kde-l10n-el-4.2.1.tar.bz2
-bb92656ccfd7c4e1c28b8e1ae53d01b5  kde-l10n-en_GB-4.2.1.tar.bz2
-249501d5acaf9cdaa1c81ecc7892ee9f  kde-l10n-es-4.2.1.tar.bz2
-4d7ba6e07f6949bf03d810e67d55230c  kde-l10n-et-4.2.1.tar.bz2
-5d4d1c5a9606f79b37ddb8bce6fd8dc8  kde-l10n-eu-4.2.1.tar.bz2
-4b69917aee664dd2b10471d8a9294dd2  kde-l10n-fi-4.2.1.tar.bz2
-d9b613ccb77cce12385ba77bfc0eb5ec  kde-l10n-fr-4.2.1.tar.bz2
-e5b10ab623c56b45cf206db37024049a  kde-l10n-ga-4.2.1.tar.bz2
-fafa0c2a2f6b46d0c9f4c11508ac86e6  kde-l10n-gl-4.2.1.tar.bz2
-1d69a2182408b89393cbe6d773752d03  kde-l10n-he-4.2.1.tar.bz2
-8b4a197ff42a3ec17624a612db748205  kde-l10n-hi-4.2.1.tar.bz2
-fe62f86cea5b6022b40650299ed5223c  kde-l10n-hu-4.2.1.tar.bz2
-5f366b474472536371baf9890458f1a0  kde-l10n-it-4.2.1.tar.bz2
-f43e96ea7eba05616b25145cf3e26e9a  kde-l10n-ja-4.2.1.tar.bz2
-e32ff330ab1caa8cc45e6474bda42fc9  kde-l10n-kk-4.2.1.tar.bz2
-3db01f4d93ef17a03173e2c0b4693889  kde-l10n-km-4.2.1.tar.bz2
-a05b21792fb0a2dc032454852a1d75e6  kde-l10n-ko-4.2.1.tar.bz2
-d065d40014e1a4a8d120b4c60ac4e298  kde-l10n-ku-4.2.1.tar.bz2
-e10ac0d7d88183849a1a811dd1dc4191  kde-l10n-lt-4.2.1.tar.bz2
-2591ad3682547ad5c5ddce2d99644325  kde-l10n-lv-4.2.1.tar.bz2
-c02330d7c1de2386dca89f9c5f4e124e  kde-l10n-mk-4.2.1.tar.bz2
-27d628c4230b378bdbe5ac74b1fd7611  kde-l10n-ml-4.2.1.tar.bz2
-e4b6d5a8f7a6acb46c6493986deb2fc0  kde-l10n-nb-4.2.1.tar.bz2
-6b3cd678e8d2bfdb3b3b28d1dbc17c9a  kde-l10n-nds-4.2.1.tar.bz2
-c5612a215db0b13b0cfd5b17e337300e  kde-l10n-nl-4.2.1.tar.bz2
-80a3b5932356f21a8b9068ca40f7e0c1  kde-l10n-nn-4.2.1.tar.bz2
-385983a3584a639c91f0c489140e9d28  kde-l10n-pa-4.2.1.tar.bz2
-6cc2883667a293f7db927fd076623f93  kde-l10n-pl-4.2.1.tar.bz2
-55e15795d4901701b7deab813857ec06  kde-l10n-pt-4.2.1.tar.bz2
-a77c500292a1615f77a519d84d6f5a7c  kde-l10n-pt_BR-4.2.1.tar.bz2
-770d39e08471b0fe91762dbee93d6d00  kde-l10n-ru-4.2.1.tar.bz2
-d643261b6b97a587a9d3fc682f4b01b0  kde-l10n-sl-4.2.1.tar.bz2
-6ec221411c0e338bb25234c95abd3045  kde-l10n-sr-4.2.1.tar.bz2
-4f2a5b6ee87c129499350418d1a0a17e  kde-l10n-sv-4.2.1.tar.bz2
-62c1114df471bc35e05e2980e2c12b47  kde-l10n-th-4.2.1.tar.bz2
-8ce5790512f818320804967a6e5c6204  kde-l10n-tr-4.2.1.tar.bz2
-40f6a3fd553144ccd8a576fed272fb6d  kde-l10n-uk-4.2.1.tar.bz2
-9334b0cd1a718afb59b81906a677ac44  kde-l10n-wa-4.2.1.tar.bz2
-f3cbd496581e3acdaf5bb371549103ee  kde-l10n-zh_CN-4.2.1.tar.bz2
-4b78c747661c0f1f7840f180b06e48a8  kde-l10n-zh_TW-4.2.1.tar.bz2
+90f064a42e5c197631fdec8ae1e1c2df  kde-l10n-ar-4.2.2.tar.bz2
+d6f9cc4fce05427c23e05ad7a6e501f8  kde-l10n-bg-4.2.2.tar.bz2
+0ca74656701506ff0e2eb404d42af4e5  kde-l10n-bn_IN-4.2.2.tar.bz2
+f860f8c0eb81764bf48d27fa253d1abd  kde-l10n-ca-4.2.2.tar.bz2
+c8aa7eab14d89466bf3738e70e255d87  kde-l10n-cs-4.2.2.tar.bz2
+70145686a60f2db1ab66d0fe3a395e59  kde-l10n-csb-4.2.2.tar.bz2
+2db197e069695fe6ddaa709e2e646878  kde-l10n-da-4.2.2.tar.bz2
+4a669b86c523cb78a45bbf3e1d03507d  kde-l10n-de-4.2.2.tar.bz2
+1dd033fc59ce3874d6cd30244a715253  kde-l10n-el-4.2.2.tar.bz2
+bec69c9899683a35b40fea7dc65cc920  kde-l10n-en_GB-4.2.2.tar.bz2
+37c561521e1d89389a0f1d5df39cc1b3  kde-l10n-es-4.2.2.tar.bz2
+c536c5f67a5cff82dc097c01f081e16d  kde-l10n-et-4.2.2.tar.bz2
+00f1513bcfee2d6c5bfe413ecba67723  kde-l10n-eu-4.2.2.tar.bz2
+4c11d695a375f5fe830d92e80a19a8bf  kde-l10n-fi-4.2.2.tar.bz2
+d0fbc486e241dd0a1ad650c044c82656  kde-l10n-fr-4.2.2.tar.bz2
+d9f5a315259812b48ca86cc3818d5825  kde-l10n-ga-4.2.2.tar.bz2
+b268bdfa5b8f603cdbe0a557aaedb1bc  kde-l10n-gl-4.2.2.tar.bz2
+a73aabc124459d51eb3207042665f472  kde-l10n-gu-4.2.2.tar.bz2
+570cfa032ec3cb46bceb0eb1c0c9e6d4  kde-l10n-he-4.2.2.tar.bz2
+f43d0563b66a16a73bb3f2f5f95362bf  kde-l10n-hi-4.2.2.tar.bz2
+4f58a17ed248c57ea55dbceeacf359e2  kde-l10n-hu-4.2.2.tar.bz2
+10faf2af63662f6842562b24a0c295a3  kde-l10n-is-4.2.2.tar.bz2
+c54364f89abb34d2469bc4cf4da6f840  kde-l10n-it-4.2.2.tar.bz2
+a8022ab1be8c8e143167828cdbcf0e1e  kde-l10n-ja-4.2.2.tar.bz2
+d441ed4bed5e3dca6e8498f762f042c2  kde-l10n-kk-4.2.2.tar.bz2
+1443dad476a3df65222030000262001a  kde-l10n-km-4.2.2.tar.bz2
+3bf7d7fb9004865d8da5588a25d352e6  kde-l10n-kn-4.2.2.tar.bz2
+2680181faf79a7c893a1a1240a2adf4d  kde-l10n-ko-4.2.2.tar.bz2
+58e0a1ed8627c5b841b44994665ae5dc  kde-l10n-ku-4.2.2.tar.bz2
+c7b90195d2cd4be2a723e8c0e9089166  kde-l10n-lt-4.2.2.tar.bz2
+028be5e0d058ab8759792e3da7d0daa9  kde-l10n-lv-4.2.2.tar.bz2
+4ea512bd91efa95a1af42c3156329815  kde-l10n-mai-4.2.2.tar.bz2
+7cdd7d4e33bb782a541f1d004f444e24  kde-l10n-mk-4.2.2.tar.bz2
+0f6ea12f6db2cace8491a7a2c4879b3b  kde-l10n-ml-4.2.2.tar.bz2
+2bf97467d21b48d16a6a5c9e7db4a0ad  kde-l10n-mr-4.2.2.tar.bz2
+7d8fec243c5b76a29807413d372e0356  kde-l10n-nb-4.2.2.tar.bz2
+346172f49029f9aa621bd8fa4e401083  kde-l10n-nds-4.2.2.tar.bz2
+bb7f95e030ee6b0b13ab12489ce5f963  kde-l10n-nl-4.2.2.tar.bz2
+5ada2c1895846e9c9985a8ea4f34f0e5  kde-l10n-nn-4.2.2.tar.bz2
+b019a54c931b1dcae659976f56d236c5  kde-l10n-pa-4.2.2.tar.bz2
+118f22de9b47b1ac326d849175ddd6f5  kde-l10n-pl-4.2.2.tar.bz2
+394964f96e21d087dfdf52989a2ec2fe  kde-l10n-pt-4.2.2.tar.bz2
+b3ab2486a8079791682b17c3caa89ed1  kde-l10n-pt_BR-4.2.2.tar.bz2
+003ac0ebada9173c9eee8ded8b293454  kde-l10n-ro-4.2.2.tar.bz2
+45b2679ac7c1554ec02816a2c509dea0  kde-l10n-ru-4.2.2.tar.bz2
+3d8b43de7bd364364f01648a3bc9cf95  kde-l10n-sl-4.2.2.tar.bz2
+166976c4a4129fa361f7643e57bcebce  kde-l10n-sr-4.2.2.tar.bz2
+d993387a13813af942154cc1d10a3ce5  kde-l10n-sv-4.2.2.tar.bz2
+6ec453392f7f7ebaa2bdce79c10a9884  kde-l10n-tg-4.2.2.tar.bz2
+bf04317460335654aa0482ad0000b58f  kde-l10n-th-4.2.2.tar.bz2
+04c3780701be20682bd772159ec78f1f  kde-l10n-tr-4.2.2.tar.bz2
+3863787f2e4721b1568db2a9736454e7  kde-l10n-uk-4.2.2.tar.bz2
+c2a082a4049fe340d108d1145d53451c  kde-l10n-wa-4.2.2.tar.bz2
+34de085cac6f862b359d1ce3e9ccfeed  kde-l10n-zh_CN-4.2.2.tar.bz2
+f0c15cd1f14783f7d895355fe5754f61  kde-l10n-zh_TW-4.2.2.tar.bz2
+855181e00df828278d4ae83e6c8aba7b  kde-l10n-sk-4.2.2.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/subdirs-kde-l10n,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- subdirs-kde-l10n	30 Jan 2009 17:01:39 -0000	1.15
+++ subdirs-kde-l10n	3 Apr 2009 12:55:18 -0000	1.16
@@ -1,5 +1,6 @@
 ar
 bg
+bn_IN
 ca
 cs
 csb
@@ -14,9 +15,11 @@
 fr
 ga
 gl
+gu
 he
 hi
 hu
+is
 it
 ja
 kk
@@ -25,8 +28,10 @@
 ku
 lt
 lv
+mai
 mk
 ml
+mr
 nb
 nds
 nl
@@ -35,10 +40,13 @@
 pl
 pt
 pt_BR
+ro
 ru
+sk
 sl
 sr
 sv
+tg
 th
 tr
 uk



From dwalsh at fedoraproject.org  Fri Apr  3 12:58:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 12:58:07 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.190,
	1.191 libselinux.spec, 1.367, 1.368
Message-ID: <20090403125807.7F3E170134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17838

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-6
- Fix Memory Leak


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- libselinux-rhat.patch	2 Apr 2009 13:36:45 -0000	1.190
+++ libselinux-rhat.patch	3 Apr 2009 12:58:06 -0000	1.191
@@ -257,6 +257,18 @@
  }
  
  void selabel_stats(struct selabel_handle *rec)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/label_file.c libselinux-2.0.79/src/label_file.c
+--- nsalibselinux/src/label_file.c	2009-03-06 14:41:45.000000000 -0500
++++ libselinux-2.0.79/src/label_file.c	2009-04-03 08:57:05.000000000 -0400
+@@ -299,6 +299,8 @@
+ 		COMPAT_LOG(SELINUX_WARNING,
+ 			    "%s:  line %d is missing fields, skipping\n", path,
+ 			    lineno);
++		if (items == 1)
++			freee(regex);
+ 		return 0;
+ 	} else if (items == 2) {
+ 		/* The type field is optional. */
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.79/src/Makefile
 --- nsalibselinux/src/Makefile	2009-03-06 14:41:45.000000000 -0500
 +++ libselinux-2.0.79/src/Makefile	2009-03-27 14:21:35.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- libselinux.spec	2 Apr 2009 13:36:47 -0000	1.367
+++ libselinux.spec	3 Apr 2009 12:58:07 -0000	1.368
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.79
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -164,6 +164,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-6
+- Fix Memory Leak
+
 * Thu Apr 2 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-5
 - Fix crash in python
 



From jfch2222 at fedoraproject.org  Fri Apr  3 13:04:00 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  3 Apr 2009 13:04:00 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.140,1.141
Message-ID: <20090403130400.26B5470134@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18398

Modified Files:
	openssh.spec 
Log Message:



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- openssh.spec	3 Apr 2009 12:37:30 -0000	1.140
+++ openssh.spec	3 Apr 2009 13:03:29 -0000	1.141
@@ -476,7 +476,7 @@
 %changelog
 * Fri Apr  3 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-3
 - fix logging after chroot
-- enable non root users to use chroot %h in internal-sftp
+- enable non root users to use chroot %%h in internal-sftp
 
 * Fri Mar 13 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-2
 - add AES-CTR ciphers to the FIPS mode proposal



From than at fedoraproject.org  Fri Apr  3 13:05:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  3 Apr 2009 13:05:58 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 kde-l10n.spec, 1.44, 1.45 sources, 1.19,
	1.20 subdirs-kde-l10n, 1.11, 1.12
Message-ID: <20090403130558.DB36970134@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18507

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
4.2.2



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kde-l10n.spec	2 Mar 2009 10:31:57 -0000	1.44
+++ kde-l10n.spec	3 Apr 2009 13:05:28 -0000	1.45
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -49,7 +49,7 @@
 Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
 #Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
-#Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
 Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
 Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
 #Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
@@ -63,6 +63,14 @@
 #Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
 Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2
+Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-bn_IN-%{version}.tar.bz2
+Source55: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-gu-%{version}.tar.bz2
+Source56: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-is-%{version}.tar.bz2
+#Source57: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-kn-%{version}.tar.bz2
+Source58: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mai-%{version}.tar.bz2
+Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
+Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
+Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -122,6 +130,15 @@
 %description Belarusian
 Belarusian language support for KDE
 
+%package Bengali
+Summary: Bengali language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-bn_IN = %{version}-%{release}
+
+%description Bengali
+Bengali language support for KDE
+
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
@@ -131,15 +148,6 @@
 %description Bulgarian
 Bulgarian language support for KDE
 
-%package Bengali
-Summary: Bengali language support for KDE
-Group: User Interface/Desktops
-Requires: kde-filesystem
-Provides: %{name}-bn = %{version}-%{release}
-
-%description Bengali
-Bengali language support for KDE
-
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
@@ -185,8 +193,6 @@
 %description Czech
 Czech language support for KDE
 
-
-
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
@@ -223,6 +229,15 @@
 %description Greek
 Greek language support for KDE
 
+%package Gujarati
+Summary: Gujarati language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-gu = %{version}-%{release}
+
+%description Gujarati
+Gujarati language support for KDE
+
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
@@ -494,6 +509,15 @@
 %description Macedonian
 Macedonian language support for KDE
 
+%package Maithili
+Summary: Maithili language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-mai = %{version}-%{release}
+
+%description Maithili
+Maithili language support for KDE
+
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
@@ -512,6 +536,15 @@
 %description Maltese
 Maltese language support for KDE
 
+%package Marathi
+Summary: Marathi language support for KDE
+Group: User Interface/Desktops
+Requires: kde-filesystem
+Provides: %{name}-mr = %{version}-%{release}
+
+%description Marathi
+Marathi language support for KDE
+
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
@@ -834,7 +867,7 @@
 %lang(af) %{_datadir}/locale/af/*
 %endif
 
-%files Arabic 
+%files Arabic
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
@@ -856,11 +889,9 @@
 %lang(bg) %{_datadir}/locale/bg/*
 %lang(bg) %{_kde4_appsdir}/kvtml/bg
 
-%if %{buildall}
 %files Bengali
 %defattr(-,root,root)
-%lang(bn) %{_datadir}/locale/bn/*
-%endif
+%lang(bn_IN) %{_datadir}/locale/bn_IN/*
 
 %if %{buildall}
 %files Tibetan
@@ -929,12 +960,19 @@
 %lang(el) %{_datadir}/locale/el/*
 %lang(el) %{_kde4_appsdir}/kvtml/el
 
+%files Gujarati
+%defattr(-,root,root)
+%lang(gu) %{_datadir}/locale/gu/*
+
 %files British
 %defattr(-,root,root)
 %lang(en_GB) %{_datadir}/locale/en_GB/*
 %lang(en_GB) %{_kde4_appsdir}/klettres/en_GB
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
+%lang(en_GB) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.en_GB.xml
+%lang(en_GB) %{_kde4_appsdir}/kturtle/data/logokeywords.en_GB.xml
+%lang(en_GB) %{_kde4_appsdir}/kturtle/examples/en_GB/*.logo
 
 %if %{buildall}
 %files Esperanto
@@ -1043,11 +1081,9 @@
 %lang(id) %{_datadir}/locale/id/*
 %endif
 
-%if %{buildall}
 %files Icelandic
 %defattr(-,root,root)
 %lang(is) %{_datadir}/locale/is/*
-%endif
 
 %files Italian
 %defattr(-,root,root)
@@ -1120,6 +1156,14 @@
 %defattr(-,root,root)
 %lang(mk) %{_datadir}/locale/mk/*
 
+%files Maithili
+%defattr(-,root,root)
+%lang(mai) %{_datadir}/locale/mai/*
+
+%files Marathi
+%defattr(-,root,root)
+%lang(mr) %{_datadir}/locale/mr/*
+
 %files Malayalam
 %defattr(-,root,root)
 %lang(ml) %{_datadir}/locale/ml/*
@@ -1144,6 +1188,9 @@
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
 %lang(nl) %{_kde4_docdir}/HTML/nl
+%lang(nl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nl.xml
+%lang(nl) %{_kde4_appsdir}/kturtle/data/logokeywords.nl.xml
+%lang(nl) %{_kde4_appsdir}/kturtle/examples/nl/*.logo
 %lang(nl) %{_mandir}/nl/*/*
 
 %if %{buildall}
@@ -1159,6 +1206,9 @@
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
+%lang(nb) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nb.xml
+%lang(nb) %{_kde4_appsdir}/kturtle/data/logokeywords.nb.xml
+%lang(nb) %{_kde4_appsdir}/kturtle/examples/nb/*.logo
 %lang(nb) %{_mandir}/nb/*/*
 
 %files Norwegian-Nynorsk
@@ -1202,29 +1252,33 @@
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
+%lang(pt_BR) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.pt_BR.xml
+%lang(pt_BR) %{_kde4_appsdir}/kturtle/data/logokeywords.pt_BR.xml
+%lang(pt_BR) %{_kde4_appsdir}/kturtle/examples/pt_BR/*.logo
 %lang(pt_BR) %{_mandir}/pt_BR/*/*
 
-%if %{buildall}
 %files Romanian
 %defattr(-,root,root)
 %lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_kde4_appsdir}/kvtml/ro
 %lang(ro) %{_kde4_appsdir}/ktuberling/sounds/ro*
-%endif
+%lang(ro) %{_kde4_docdir}/HTML/ro
 
 %files Russian
 %defattr(-,root,root)
 %lang(ru) %{_datadir}/locale/ru/*
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
+%lang(ru) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.ru.xml
+%lang(ru) %{_kde4_appsdir}/kturtle/data/logokeywords.ru.xml
+%lang(ru) %{_kde4_appsdir}/kturtle/examples/ru/*.logo
 %lang(ru) %{_mandir}/ru/*/*
 
-%if %{buildall}
 %files Slovak
 %defattr(-,root,root)
 %lang(sk) %{_datadir}/locale/sk/*
-%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
-%lang(sk) %{_kde4_appsdir}/klettres/sk
-%endif
+#%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
+#%lang(sk) %{_kde4_appsdir}/klettres/sk
 
 %files Slovenian
 %defattr(-,root,root)
@@ -1232,6 +1286,9 @@
 %lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
 %lang(sl) %{_kde4_appsdir}/khangman/sl.txt
 %lang(sl) %{_kde4_appsdir}/kvtml/sl
+%lang(sl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sl.xml
+%lang(sl) %{_kde4_appsdir}/kturtle/data/logokeywords.sl.xml
+%lang(sl) %{_kde4_appsdir}/kturtle/examples/sl/*.logo
 %lang(sl) %{_kde4_docdir}/HTML/sl
 
 %files Serbian
@@ -1264,11 +1321,11 @@
 %lang(ta) %{_datadir}/locale/ta/*
 %endif
 
-%if %{buildall}
 %files Tajik
 %defattr(-,root,root)
 %lang(tg) %{_datadir}/locale/tg/*
-%endif
+%lang(tg) %{_kde4_appsdir}/kvtml/tg
+%lang(tg) %{_kde4_appsdir}/khangman/tg.txt
 
 %files Thai
 %defattr(-,root,root)
@@ -1325,6 +1382,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	2 Mar 2009 10:31:57 -0000	1.19
+++ sources	3 Apr 2009 13:05:28 -0000	1.20
@@ -1,47 +1,56 @@
-7d2caac95a427cafadaca02f3647cd1e  kde-l10n-ar-4.2.1.tar.bz2
-f6621960e9a1f3328e42a6f5735083c7  kde-l10n-bg-4.2.1.tar.bz2
-b4e42ac60e2491025705ef7d4f9ff613  kde-l10n-ca-4.2.1.tar.bz2
-7787304141fa31c4b967297b2d75b36f  kde-l10n-cs-4.2.1.tar.bz2
-2f2ca099814cd3bbf1a0273d0b027b80  kde-l10n-csb-4.2.1.tar.bz2
-7765ade376b10d25d88e0b9d7ea7ef94  kde-l10n-da-4.2.1.tar.bz2
-c1521b6517667e9dd1a29ffb9182cd0e  kde-l10n-de-4.2.1.tar.bz2
-53df4a6bd3f6ce8aa4130ab4c927ec93  kde-l10n-el-4.2.1.tar.bz2
-bb92656ccfd7c4e1c28b8e1ae53d01b5  kde-l10n-en_GB-4.2.1.tar.bz2
-249501d5acaf9cdaa1c81ecc7892ee9f  kde-l10n-es-4.2.1.tar.bz2
-4d7ba6e07f6949bf03d810e67d55230c  kde-l10n-et-4.2.1.tar.bz2
-5d4d1c5a9606f79b37ddb8bce6fd8dc8  kde-l10n-eu-4.2.1.tar.bz2
-4b69917aee664dd2b10471d8a9294dd2  kde-l10n-fi-4.2.1.tar.bz2
-d9b613ccb77cce12385ba77bfc0eb5ec  kde-l10n-fr-4.2.1.tar.bz2
-e5b10ab623c56b45cf206db37024049a  kde-l10n-ga-4.2.1.tar.bz2
-fafa0c2a2f6b46d0c9f4c11508ac86e6  kde-l10n-gl-4.2.1.tar.bz2
-1d69a2182408b89393cbe6d773752d03  kde-l10n-he-4.2.1.tar.bz2
-8b4a197ff42a3ec17624a612db748205  kde-l10n-hi-4.2.1.tar.bz2
-fe62f86cea5b6022b40650299ed5223c  kde-l10n-hu-4.2.1.tar.bz2
-5f366b474472536371baf9890458f1a0  kde-l10n-it-4.2.1.tar.bz2
-f43e96ea7eba05616b25145cf3e26e9a  kde-l10n-ja-4.2.1.tar.bz2
-e32ff330ab1caa8cc45e6474bda42fc9  kde-l10n-kk-4.2.1.tar.bz2
-3db01f4d93ef17a03173e2c0b4693889  kde-l10n-km-4.2.1.tar.bz2
-a05b21792fb0a2dc032454852a1d75e6  kde-l10n-ko-4.2.1.tar.bz2
-d065d40014e1a4a8d120b4c60ac4e298  kde-l10n-ku-4.2.1.tar.bz2
-e10ac0d7d88183849a1a811dd1dc4191  kde-l10n-lt-4.2.1.tar.bz2
-2591ad3682547ad5c5ddce2d99644325  kde-l10n-lv-4.2.1.tar.bz2
-c02330d7c1de2386dca89f9c5f4e124e  kde-l10n-mk-4.2.1.tar.bz2
-27d628c4230b378bdbe5ac74b1fd7611  kde-l10n-ml-4.2.1.tar.bz2
-e4b6d5a8f7a6acb46c6493986deb2fc0  kde-l10n-nb-4.2.1.tar.bz2
-6b3cd678e8d2bfdb3b3b28d1dbc17c9a  kde-l10n-nds-4.2.1.tar.bz2
-c5612a215db0b13b0cfd5b17e337300e  kde-l10n-nl-4.2.1.tar.bz2
-80a3b5932356f21a8b9068ca40f7e0c1  kde-l10n-nn-4.2.1.tar.bz2
-385983a3584a639c91f0c489140e9d28  kde-l10n-pa-4.2.1.tar.bz2
-6cc2883667a293f7db927fd076623f93  kde-l10n-pl-4.2.1.tar.bz2
-55e15795d4901701b7deab813857ec06  kde-l10n-pt-4.2.1.tar.bz2
-a77c500292a1615f77a519d84d6f5a7c  kde-l10n-pt_BR-4.2.1.tar.bz2
-770d39e08471b0fe91762dbee93d6d00  kde-l10n-ru-4.2.1.tar.bz2
-d643261b6b97a587a9d3fc682f4b01b0  kde-l10n-sl-4.2.1.tar.bz2
-6ec221411c0e338bb25234c95abd3045  kde-l10n-sr-4.2.1.tar.bz2
-4f2a5b6ee87c129499350418d1a0a17e  kde-l10n-sv-4.2.1.tar.bz2
-62c1114df471bc35e05e2980e2c12b47  kde-l10n-th-4.2.1.tar.bz2
-8ce5790512f818320804967a6e5c6204  kde-l10n-tr-4.2.1.tar.bz2
-40f6a3fd553144ccd8a576fed272fb6d  kde-l10n-uk-4.2.1.tar.bz2
-9334b0cd1a718afb59b81906a677ac44  kde-l10n-wa-4.2.1.tar.bz2
-f3cbd496581e3acdaf5bb371549103ee  kde-l10n-zh_CN-4.2.1.tar.bz2
-4b78c747661c0f1f7840f180b06e48a8  kde-l10n-zh_TW-4.2.1.tar.bz2
+90f064a42e5c197631fdec8ae1e1c2df  kde-l10n-ar-4.2.2.tar.bz2
+d6f9cc4fce05427c23e05ad7a6e501f8  kde-l10n-bg-4.2.2.tar.bz2
+0ca74656701506ff0e2eb404d42af4e5  kde-l10n-bn_IN-4.2.2.tar.bz2
+f860f8c0eb81764bf48d27fa253d1abd  kde-l10n-ca-4.2.2.tar.bz2
+c8aa7eab14d89466bf3738e70e255d87  kde-l10n-cs-4.2.2.tar.bz2
+70145686a60f2db1ab66d0fe3a395e59  kde-l10n-csb-4.2.2.tar.bz2
+2db197e069695fe6ddaa709e2e646878  kde-l10n-da-4.2.2.tar.bz2
+4a669b86c523cb78a45bbf3e1d03507d  kde-l10n-de-4.2.2.tar.bz2
+1dd033fc59ce3874d6cd30244a715253  kde-l10n-el-4.2.2.tar.bz2
+bec69c9899683a35b40fea7dc65cc920  kde-l10n-en_GB-4.2.2.tar.bz2
+37c561521e1d89389a0f1d5df39cc1b3  kde-l10n-es-4.2.2.tar.bz2
+c536c5f67a5cff82dc097c01f081e16d  kde-l10n-et-4.2.2.tar.bz2
+00f1513bcfee2d6c5bfe413ecba67723  kde-l10n-eu-4.2.2.tar.bz2
+4c11d695a375f5fe830d92e80a19a8bf  kde-l10n-fi-4.2.2.tar.bz2
+d0fbc486e241dd0a1ad650c044c82656  kde-l10n-fr-4.2.2.tar.bz2
+d9f5a315259812b48ca86cc3818d5825  kde-l10n-ga-4.2.2.tar.bz2
+b268bdfa5b8f603cdbe0a557aaedb1bc  kde-l10n-gl-4.2.2.tar.bz2
+a73aabc124459d51eb3207042665f472  kde-l10n-gu-4.2.2.tar.bz2
+570cfa032ec3cb46bceb0eb1c0c9e6d4  kde-l10n-he-4.2.2.tar.bz2
+f43d0563b66a16a73bb3f2f5f95362bf  kde-l10n-hi-4.2.2.tar.bz2
+4f58a17ed248c57ea55dbceeacf359e2  kde-l10n-hu-4.2.2.tar.bz2
+10faf2af63662f6842562b24a0c295a3  kde-l10n-is-4.2.2.tar.bz2
+c54364f89abb34d2469bc4cf4da6f840  kde-l10n-it-4.2.2.tar.bz2
+a8022ab1be8c8e143167828cdbcf0e1e  kde-l10n-ja-4.2.2.tar.bz2
+d441ed4bed5e3dca6e8498f762f042c2  kde-l10n-kk-4.2.2.tar.bz2
+1443dad476a3df65222030000262001a  kde-l10n-km-4.2.2.tar.bz2
+3bf7d7fb9004865d8da5588a25d352e6  kde-l10n-kn-4.2.2.tar.bz2
+2680181faf79a7c893a1a1240a2adf4d  kde-l10n-ko-4.2.2.tar.bz2
+58e0a1ed8627c5b841b44994665ae5dc  kde-l10n-ku-4.2.2.tar.bz2
+c7b90195d2cd4be2a723e8c0e9089166  kde-l10n-lt-4.2.2.tar.bz2
+028be5e0d058ab8759792e3da7d0daa9  kde-l10n-lv-4.2.2.tar.bz2
+4ea512bd91efa95a1af42c3156329815  kde-l10n-mai-4.2.2.tar.bz2
+7cdd7d4e33bb782a541f1d004f444e24  kde-l10n-mk-4.2.2.tar.bz2
+0f6ea12f6db2cace8491a7a2c4879b3b  kde-l10n-ml-4.2.2.tar.bz2
+2bf97467d21b48d16a6a5c9e7db4a0ad  kde-l10n-mr-4.2.2.tar.bz2
+7d8fec243c5b76a29807413d372e0356  kde-l10n-nb-4.2.2.tar.bz2
+346172f49029f9aa621bd8fa4e401083  kde-l10n-nds-4.2.2.tar.bz2
+bb7f95e030ee6b0b13ab12489ce5f963  kde-l10n-nl-4.2.2.tar.bz2
+5ada2c1895846e9c9985a8ea4f34f0e5  kde-l10n-nn-4.2.2.tar.bz2
+b019a54c931b1dcae659976f56d236c5  kde-l10n-pa-4.2.2.tar.bz2
+118f22de9b47b1ac326d849175ddd6f5  kde-l10n-pl-4.2.2.tar.bz2
+394964f96e21d087dfdf52989a2ec2fe  kde-l10n-pt-4.2.2.tar.bz2
+b3ab2486a8079791682b17c3caa89ed1  kde-l10n-pt_BR-4.2.2.tar.bz2
+003ac0ebada9173c9eee8ded8b293454  kde-l10n-ro-4.2.2.tar.bz2
+45b2679ac7c1554ec02816a2c509dea0  kde-l10n-ru-4.2.2.tar.bz2
+3d8b43de7bd364364f01648a3bc9cf95  kde-l10n-sl-4.2.2.tar.bz2
+166976c4a4129fa361f7643e57bcebce  kde-l10n-sr-4.2.2.tar.bz2
+d993387a13813af942154cc1d10a3ce5  kde-l10n-sv-4.2.2.tar.bz2
+6ec453392f7f7ebaa2bdce79c10a9884  kde-l10n-tg-4.2.2.tar.bz2
+bf04317460335654aa0482ad0000b58f  kde-l10n-th-4.2.2.tar.bz2
+04c3780701be20682bd772159ec78f1f  kde-l10n-tr-4.2.2.tar.bz2
+3863787f2e4721b1568db2a9736454e7  kde-l10n-uk-4.2.2.tar.bz2
+c2a082a4049fe340d108d1145d53451c  kde-l10n-wa-4.2.2.tar.bz2
+34de085cac6f862b359d1ce3e9ccfeed  kde-l10n-zh_CN-4.2.2.tar.bz2
+f0c15cd1f14783f7d895355fe5754f61  kde-l10n-zh_TW-4.2.2.tar.bz2
+855181e00df828278d4ae83e6c8aba7b  kde-l10n-sk-4.2.2.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/subdirs-kde-l10n,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- subdirs-kde-l10n	30 Jan 2009 19:00:16 -0000	1.11
+++ subdirs-kde-l10n	3 Apr 2009 13:05:28 -0000	1.12
@@ -1,5 +1,6 @@
 ar
 bg
+bn_IN
 ca
 cs
 csb
@@ -14,9 +15,11 @@
 fr
 ga
 gl
+gu
 he
 hi
 hu
+is
 it
 ja
 kk
@@ -25,8 +28,10 @@
 ku
 lt
 lv
+mai
 mk
 ml
+mr
 nb
 nds
 nl
@@ -35,10 +40,13 @@
 pl
 pt
 pt_BR
+ro
 ru
+sk
 sl
 sr
 sv
+tg
 th
 tr
 uk



From spot at fedoraproject.org  Fri Apr  3 13:09:11 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  3 Apr 2009 13:09:11 +0000 (UTC)
Subject: rpms/ntfs-3g/F-10 ntfs-3g.spec,1.45,1.46 sources,1.31,1.32
Message-ID: <20090403130911.D773470134@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18817/F-10

Modified Files:
	ntfs-3g.spec sources 
Log Message:
2009.4.4


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-10/ntfs-3g.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ntfs-3g.spec	30 Mar 2009 15:27:58 -0000	1.45
+++ ntfs-3g.spec	3 Apr 2009 13:08:41 -0000	1.46
@@ -4,15 +4,13 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	2009.3.8
-Release:	2%{?dist}
+Version:	2009.4.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
-# Patch from upstream provided as temporary workaround for bz 486619
-Patch1:		mount-readlink-hang-workaround.diff
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -51,7 +49,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -131,6 +128,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Fri Apr  3 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.4.4-1
+- update to 4.4, patch for mount issue merged
+
 * Mon Mar 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.3.8-2
 - Patch from upstream provided as temporary workaround for bz 486619
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	26 Mar 2009 23:13:21 -0000	1.31
+++ sources	3 Apr 2009 13:08:41 -0000	1.32
@@ -1 +1 @@
-da67f4c651649f5a463af293c347c387  ntfs-3g-2009.3.8.tgz
+e0b5c170f088a8d82968f0a6b34d31da  ntfs-3g-2009.4.4.tgz



From spot at fedoraproject.org  Fri Apr  3 13:09:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  3 Apr 2009 13:09:12 +0000 (UTC)
Subject: rpms/ntfs-3g/F-9 ntfs-3g.spec,1.45,1.46 sources,1.31,1.32
Message-ID: <20090403130912.0AA6770134@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18817/F-9

Modified Files:
	ntfs-3g.spec sources 
Log Message:
2009.4.4


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/ntfs-3g.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ntfs-3g.spec	30 Mar 2009 15:27:58 -0000	1.45
+++ ntfs-3g.spec	3 Apr 2009 13:08:41 -0000	1.46
@@ -4,15 +4,13 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	2009.3.8
-Release:	2%{?dist}
+Version:	2009.4.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
-# Patch from upstream provided as temporary workaround for bz 486619
-Patch1:		mount-readlink-hang-workaround.diff
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -51,7 +49,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -131,6 +128,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Fri Apr  3 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.4.4-1
+- update to 4.4, patch for mount issue merged
+
 * Mon Mar 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.3.8-2
 - Patch from upstream provided as temporary workaround for bz 486619
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	26 Mar 2009 23:13:21 -0000	1.31
+++ sources	3 Apr 2009 13:08:41 -0000	1.32
@@ -1 +1 @@
-da67f4c651649f5a463af293c347c387  ntfs-3g-2009.3.8.tgz
+e0b5c170f088a8d82968f0a6b34d31da  ntfs-3g-2009.4.4.tgz



From spot at fedoraproject.org  Fri Apr  3 13:09:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  3 Apr 2009 13:09:12 +0000 (UTC)
Subject: rpms/ntfs-3g/devel .cvsignore, 1.30, 1.31 ntfs-3g.spec, 1.47,
	1.48 sources, 1.32, 1.33
Message-ID: <20090403130912.43E0970134@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18817/devel

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:
2009.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	26 Mar 2009 23:13:21 -0000	1.30
+++ .cvsignore	3 Apr 2009 13:08:42 -0000	1.31
@@ -1 +1 @@
-ntfs-3g-2009.3.8.tgz
+ntfs-3g-2009.4.4.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ntfs-3g.spec	30 Mar 2009 15:27:59 -0000	1.47
+++ ntfs-3g.spec	3 Apr 2009 13:08:42 -0000	1.48
@@ -4,15 +4,13 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	2009.3.8
-Release:	2%{?dist}
+Version:	2009.4.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
-# Patch from upstream provided as temporary workaround for bz 486619
-Patch1:		mount-readlink-hang-workaround.diff
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -51,7 +49,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -131,6 +128,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Fri Apr  3 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.4.4-1
+- update to 4.4, patch for mount issue merged
+
 * Mon Mar 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.3.8-2
 - Patch from upstream provided as temporary workaround for bz 486619
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Mar 2009 23:13:21 -0000	1.32
+++ sources	3 Apr 2009 13:08:42 -0000	1.33
@@ -1 +1 @@
-da67f4c651649f5a463af293c347c387  ntfs-3g-2009.3.8.tgz
+e0b5c170f088a8d82968f0a6b34d31da  ntfs-3g-2009.4.4.tgz



From pkgdb at fedoraproject.org  Fri Apr  3 13:09:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:09:56 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested watchcommits
Message-ID: <20090403131003.C82E120854A@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:10:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:10:04 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested commit
Message-ID: <20090403131004.B0395208556@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:10:26 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested watchbugzilla
Message-ID: <20090403131006.B8C32208603@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:10:26 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested approveacls
Message-ID: <20090403131007.60F62208609@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:10:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:10:28 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has given up approveacls
Message-ID: <20090403131009.8F8D2208703@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:38 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has given up watchbugzilla
Message-ID: <20090403131219.89942208514@bastion.fedora.phx.redhat.com>

rdieter has given up the watchbugzilla acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:41 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has given up watchcommits
Message-ID: <20090403131220.CD8D2208553@bastion.fedora.phx.redhat.com>

rdieter has given up the watchcommits acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:18 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has given up commit
Message-ID: <20090403131225.B504D208557@bastion.fedora.phx.redhat.com>

rdieter has given up the commit acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:57 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested approveacls
Message-ID: <20090403131239.415BA208553@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:35 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested commit
Message-ID: <20090403131242.F117B208604@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:45 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested watchcommits
Message-ID: <20090403131245.1A0BB20860B@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:07 +0000
Subject: [pkgdb] kdebase-runtime: rdieter has requested watchbugzilla
Message-ID: <20090403131247.A88342086EF@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:12:59 +0000
Subject: [pkgdb] kdegames: rdieter has requested approveacls
Message-ID: <20090403131308.6AB66208603@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:08 +0000
Subject: [pkgdb] kdegames: rdieter has requested commit
Message-ID: <20090403131309.9665B208605@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:32 +0000
Subject: [pkgdb] kdegames: rdieter has requested watchbugzilla
Message-ID: <20090403131312.A80E32086F6@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:29 +0000
Subject: [pkgdb] kdegames: rdieter has requested watchcommits
Message-ID: <20090403131310.4EAD7208556@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:44 +0000
Subject: [pkgdb] kdegraphics: rdieter has requested approveacls
Message-ID: <20090403131325.3FE3B20860B@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegraphics (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:47 +0000
Subject: [pkgdb] kdegraphics: rdieter has requested commit
Message-ID: <20090403131326.CEE072086F1@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdegraphics (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:20 +0000
Subject: [pkgdb] kdegraphics: rdieter has requested watchcommits
Message-ID: <20090403131327.DC047208704@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdegraphics (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:30 +0000
Subject: [pkgdb] kdegraphics: rdieter has requested watchbugzilla
Message-ID: <20090403131330.C69B4208719@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdegraphics (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:13 +0000
Subject: [pkgdb] kdemultimedia: rdieter has requested approveacls
Message-ID: <20090403131353.88E2F208557@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdemultimedia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:47 +0000
Subject: [pkgdb] kdemultimedia: rdieter has requested commit
Message-ID: <20090403131355.66FE0208603@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdemultimedia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Apr  3 13:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:13:56 +0000
Subject: [pkgdb] kdemultimedia: rdieter has requested watchcommits
Message-ID: <20090403131356.2DBD0208608@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdemultimedia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:17 +0000
Subject: [pkgdb] kdemultimedia: rdieter has requested watchbugzilla
Message-ID: <20090403131357.B2B752086FE@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdemultimedia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:03 +0000
Subject: [pkgdb] kdenetwork: rdieter has requested approveacls
Message-ID: <20090403131410.84FF920860B@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdenetwork (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:10 +0000
Subject: [pkgdb] kdenetwork: rdieter has requested commit
Message-ID: <20090403131410.CB1B9208712@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdenetwork (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:30 +0000
Subject: [pkgdb] kdenetwork: rdieter has requested watchcommits
Message-ID: <20090403131411.6044D20876A@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdenetwork (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:34 +0000
Subject: [pkgdb] kdenetwork: rdieter has requested watchbugzilla
Message-ID: <20090403131413.C68D9208770@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdenetwork (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:46 +0000
Subject: [pkgdb] kdelibs: rdieter has requested approveacls
Message-ID: <20090403131426.A3581208704@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:48 +0000
Subject: [pkgdb] kdelibs: rdieter has requested commit
Message-ID: <20090403131427.E5FD62087F6@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:21 +0000
Subject: [pkgdb] kdelibs: rdieter has requested watchcommits
Message-ID: <20090403131428.B3BDA208703@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:14:30 +0000
Subject: [pkgdb] kdelibs: rdieter has requested watchbugzilla
Message-ID: <20090403131430.3B0922087F8@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:16:22 +0000
Subject: [pkgdb] kdepimlibs: rdieter has requested watchcommits
Message-ID: <20090403131622.B8DE0208603@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdepimlibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:16:42 +0000
Subject: [pkgdb] kdepimlibs: rdieter has requested watchbugzilla
Message-ID: <20090403131623.37238208608@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdepimlibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:16:43 +0000
Subject: [pkgdb] kdepimlibs: rdieter has requested commit
Message-ID: <20090403131623.BB94C20860F@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdepimlibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:16:25 +0000
Subject: [pkgdb] kdepimlibs: rdieter has requested approveacls
Message-ID: <20090403131626.563D12086F3@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepimlibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Apr  3 13:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:18:00 +0000
Subject: [pkgdb] kdesdk: rdieter has requested approveacls
Message-ID: <20090403131800.D4599208505@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdesdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Apr  3 13:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:18:21 +0000
Subject: [pkgdb] kdesdk: rdieter has requested commit
Message-ID: <20090403131801.E4862208553@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdesdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Apr  3 13:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:18:22 +0000
Subject: [pkgdb] kdesdk: rdieter has requested watchcommits
Message-ID: <20090403131803.1D472208602@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdesdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Apr  3 13:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:18:25 +0000
Subject: [pkgdb] kdesdk: rdieter has requested watchbugzilla
Message-ID: <20090403131804.D4639208605@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdesdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Apr  3 13:22:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:22:59 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090403132259.78B57208514@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdebase-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:23:22 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090403132302.2A4DD208553@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdebase-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:23:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:23:30 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090403132310.A29E7208602@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdebase-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:23:40 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090403132340.8B13620854A@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on kdebase (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Apr  3 13:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:24:38 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090403132418.5D9E920854A@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on kdebase-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Apr  3 13:24:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 13:24:43 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090403132450.85932208602@bastion.fedora.phx.redhat.com>

ausil has set the approveacls acl on kdebase-workspace (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From mgrepl at fedoraproject.org  Fri Apr  3 13:33:32 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri,  3 Apr 2009 13:33:32 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.157,1.158
Message-ID: <20090403133332.5818270134@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21355

Modified Files:
	policy-20080710.patch 
Log Message:
- Allow swat_t domtrans to smbd_t


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- policy-20080710.patch	30 Mar 2009 15:26:50 -0000	1.157
+++ policy-20080710.patch	3 Apr 2009 13:33:31 -0000	1.158
@@ -7200,7 +7200,7 @@
  network_port(xfs, tcp,7100,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.13/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/kernel/devices.fc	2009-03-25 13:47:42.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.fc	2009-04-03 15:22:46.000000000 +0200
 @@ -1,8 +1,9 @@
  
  /dev			-d	gen_context(system_u:object_r:device_t,s0)
@@ -7342,7 +7342,7 @@
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.13/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/kernel/devices.if	2009-03-25 14:08:22.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.if	2009-04-03 10:50:33.000000000 +0200
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1, device_t, device_node)
@@ -7930,7 +7930,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.5.13/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/kernel/devices.te	2009-03-25 13:47:42.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.te	2009-04-03 10:51:23.000000000 +0200
 @@ -1,5 +1,5 @@
  
 -policy_module(devices, 1.7.0)
@@ -18406,7 +18406,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.5.13/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/services/lircd.te	2009-03-27 14:56:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/lircd.te	2009-04-03 15:23:05.000000000 +0200
 @@ -0,0 +1,60 @@
 +policy_module(lircd,1.0.0)
 +
@@ -26581,7 +26581,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.5.13/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/samba.te	2009-02-26 15:44:58.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/samba.te	2009-04-03 11:57:58.000000000 +0200
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -26902,7 +26902,7 @@
  allow swat_t self:udp_socket create_socket_perms;
  
 +allow swat_t self:unix_stream_socket connectto;
-+can_exec(swat_t, smbd_exec_t)
++samba_domtrans_smb(swat_t)
 +allow swat_t smbd_port_t:tcp_socket name_bind;
 +allow swat_t smbd_t:process { signal signull };
 +allow swat_t smbd_var_run_t:file { lock unlink };
@@ -33306,7 +33306,7 @@
  allow iscsid_t iscsi_tmp_t:dir manage_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.13/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/libraries.fc	2009-03-30 17:17:31.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/system/libraries.fc	2009-04-03 10:47:07.000000000 +0200
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -33405,7 +33405,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -187,6 +205,7 @@
+@@ -187,12 +205,14 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/[^/]*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/codecs/[^/]*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -33413,7 +33413,14 @@
  /usr/lib(64)?/libSDL-.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -208,6 +227,9 @@
+ /usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/X11R6/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/libOSMesa\.so.*                --      gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -208,6 +228,9 @@
  /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -33423,7 +33430,7 @@
  # Fedora Extras packages: ladspa, imlib2, ocaml
  /usr/lib(64)?/ladspa/analogue_osc_1416\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/bandpass_a_iir_1893\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -233,7 +255,7 @@
+@@ -233,7 +256,7 @@
  /usr/lib(64)?/php/modules/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
@@ -33432,7 +33439,7 @@
  /usr/lib(64)?/codecs/drv[1-9c]\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -246,13 +268,16 @@
+@@ -246,13 +269,16 @@
  
  # Flash plugin, Macromedia
  HOME_DIR/\.mozilla(/.*)?/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -33451,7 +33458,7 @@
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libdivxdecore\.so\.0	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -267,6 +292,9 @@
+@@ -267,6 +293,9 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -33461,7 +33468,7 @@
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -291,6 +319,8 @@
+@@ -291,6 +320,8 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -33470,7 +33477,7 @@
  ') dnl end distro_redhat
  
  #
-@@ -307,6 +337,36 @@
+@@ -307,6 +338,36 @@
  /var/lib/samba/bin/.+\.so(\.[^/]*)*	-l	gen_context(system_u:object_r:lib_t,s0)
  ')
  



From karsten at fedoraproject.org  Fri Apr  3 13:35:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri,  3 Apr 2009 13:35:42 +0000 (UTC)
Subject: rpms/java-1.5.0-gcj/devel .cvsignore, 1.10, 1.11 java-1.5.0-gcj.spec,
	1.41, 1.42 sources, 1.10, 1.11
Message-ID: <20090403133542.D9ACA70134@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/java-1.5.0-gcj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21609

Modified Files:
	.cvsignore java-1.5.0-gcj.spec sources 
Log Message:
- update workaround patch to fix rebuild problems


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/java-1.5.0-gcj/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Dec 2008 16:22:45 -0000	1.10
+++ .cvsignore	3 Apr 2009 13:35:12 -0000	1.11
@@ -1,2 +1,2 @@
-javadoc-workaround.patch
 java-gcj-compat-1.0.79.tar.gz
+javadoc-workaround.patch


Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/extras/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- java-1.5.0-gcj.spec	25 Feb 2009 08:58:51 -0000	1.41
+++ java-1.5.0-gcj.spec	3 Apr 2009 13:35:12 -0000	1.42
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 # The LICENSE file has the classpath exception, but nothing in this package
@@ -784,6 +784,9 @@
 %endif
 
 %changelog
+* Fri Apr 03 2009 Karsten Hopp <karsten at redhat.com> 1.5.0.0-27
+- update workaround patch to fix rebuild problems
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0.0-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/java-1.5.0-gcj/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Dec 2008 16:22:45 -0000	1.10
+++ sources	3 Apr 2009 13:35:12 -0000	1.11
@@ -1,2 +1,2 @@
-c1b0b1c5507c73c3f5195c408d2a6406  javadoc-workaround.patch
 6881d9866c98df7a4059ea3b94fd84a0  java-gcj-compat-1.0.79.tar.gz
+926a82762117996f714da54894041fdd  javadoc-workaround.patch



From dwalsh at fedoraproject.org  Fri Apr  3 14:05:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 14:05:52 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch,1.191,1.192
Message-ID: <20090403140552.C005170134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25294

Modified Files:
	libselinux-rhat.patch 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-6
- Fix Memory Leak


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- libselinux-rhat.patch	3 Apr 2009 12:58:06 -0000	1.191
+++ libselinux-rhat.patch	3 Apr 2009 14:05:22 -0000	1.192
@@ -265,7 +265,7 @@
  			    "%s:  line %d is missing fields, skipping\n", path,
  			    lineno);
 +		if (items == 1)
-+			freee(regex);
++			free(regex);
  		return 0;
  	} else if (items == 2) {
  		/* The type field is optional. */



From pghmcfc at fedoraproject.org  Fri Apr  3 14:15:12 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri,  3 Apr 2009 14:15:12 +0000 (UTC)
Subject: rpms/spamass-milter/F-10 spamass-milter.spec, 1.15,
	1.16 spamass-milter.sysv, 1.3, 1.4
Message-ID: <20090403141512.B372B70134@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/spamass-milter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26176/F-10

Modified Files:
	spamass-milter.spec spamass-milter.sysv 
Log Message:
resync with devel


Index: spamass-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/F-10/spamass-milter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- spamass-milter.spec	2 Feb 2009 15:05:29 -0000	1.15
+++ spamass-milter.spec	3 Apr 2009 14:14:42 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	9%{?dist}
+Release:	13%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -17,12 +17,10 @@
 BuildRequires:	spamassassin, sendmail-devel
 Requires:	spamassassin, /usr/sbin/sendmail
 
-Requires(pre): shadow-utils
+Requires(pre): /usr/bin/getent, /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/usermod
 Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Requires(preun): /sbin/chkconfig, initscripts
+Requires(postun): initscripts
 
 %description
 A milter (Mail Filter) application that pipes incoming mail (including things
@@ -34,7 +32,10 @@
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires(pre):	postfix
-Requires(post):	shadow-utils
+Requires(post):	shadow-utils, %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:	noarch
+%endif
 
 %description postfix
 This package adds support for running spamass-milter using a Unix-domain
@@ -64,6 +65,7 @@
 
 %{__install} -m 755 -D spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter
 %{__install} -m 644 -D spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter
+%{__install} -m 755 -d %{buildroot}%{_localstatedir}/lib/spamass-milter
 %{__install} -m 711 -d %{buildroot}%{_localstatedir}/run/spamass-milter
 %{__install} -m 750 -d %{buildroot}%{_localstatedir}/run/spamass-milter/postfix
 %{__install} -m 755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
@@ -71,8 +73,10 @@
 %pre
 /usr/bin/getent group sa-milt >/dev/null || /usr/sbin/groupadd -r sa-milt
 /usr/bin/getent passwd sa-milt >/dev/null || \
-	/usr/sbin/useradd -r -g sa-milt -d %{_localstatedir}/run/spamass-milter \
+	/usr/sbin/useradd -r -g sa-milt -d %{_localstatedir}/lib/spamass-milter \
 		-s /sbin/nologin -c "SpamAssassin Milter" sa-milt
+# Fix homedir for upgrades
+/usr/sbin/usermod --home %{_localstatedir}/lib/spamass-milter sa-milt &>/dev/null
 exit 0
 
 %post
@@ -80,12 +84,12 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service spamass-milter stop &>/dev/null || :
+	%{_initrddir}/spamass-milter stop &>/dev/null || :
 	/sbin/chkconfig --del spamass-milter || :
 fi
 
 %postun
-/sbin/service spamass-milter condrestart &>/dev/null || :
+%{_initrddir}/spamass-milter condrestart &>/dev/null || :
 
 %post postfix
 # This is needed because the milter needs to "give away" the MTA communication
@@ -104,6 +108,7 @@
 %{_initrddir}/spamass-milter
 %{_sbindir}/spamass-milter
 %{_sbindir}/spamass-milter-wrapper
+%dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/lib/spamass-milter/
 %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter/
 
 %files postfix
@@ -112,6 +117,25 @@
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Wed Mar 18 2009 Paul Howarth <paul at city-fan.org> 0.3.1-13
+- Call initscripts directly instead of via /sbin/service and fine-tune scriptlet
+  dependencies
+- Change sa-milt user's home directory from
+  %%{_localstatedir}/run/spamass-milter to %%{_localstatedir}/lib/spamass-milter
+  so as to retain directory contents across a reboot (#489995), and fix the home
+  directory of any existing sa-milt account on upgrades
+
+* Fri Feb 27 2009 Paul Howarth <paul at city-fan.org> 0.3.1-12
+- Subpackage for postfix is now noarch for Fedora 10 onwards
+- Fix scriptlet deps to ensure that sa-milt user exists before we attempt to
+  add it to the postfix group
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 13 2009 Paul Howarth <paul at city-fan.org> 0.3.1-10
+- Rebuild for shared libmilter in Fedora 11 development
+
 * Thu Jul  3 2008 Paul Howarth <paul at city-fan.org> 0.3.1-9
 - Require /usr/sbin/sendmail (for -b/-B/-x options) rather than sendmail pkg
 - Make summary and description less Sendmail-specific


Index: spamass-milter.sysv
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/F-10/spamass-milter.sysv,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spamass-milter.sysv	2 Feb 2009 15:05:29 -0000	1.3
+++ spamass-milter.sysv	3 Apr 2009 14:14:42 -0000	1.4
@@ -38,8 +38,9 @@
 
 # Read configuration
 source %{_initrddir}/functions
-source %{_sysconfdir}/sysconfig/network
-[ -r "${SYSCONFIG}" ] && source "${SYSCONFIG}"
+for configfile in %{_sysconfdir}/sysconfig/network "${SYSCONFIG}"; do
+	[ -r "${configfile}" ] && source "${configfile}"
+done
 
 [ -x %{_sbindir}/spamass-milter ] || exit 5
 



From pghmcfc at fedoraproject.org  Fri Apr  3 14:15:12 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri,  3 Apr 2009 14:15:12 +0000 (UTC)
Subject: rpms/spamass-milter/F-9 spamass-milter.spec, 1.15,
	1.16 spamass-milter.sysv, 1.3, 1.4
Message-ID: <20090403141512.D5FFF70134@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/spamass-milter/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26176/F-9

Modified Files:
	spamass-milter.spec spamass-milter.sysv 
Log Message:
resync with devel


Index: spamass-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/F-9/spamass-milter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- spamass-milter.spec	2 Feb 2009 15:05:29 -0000	1.15
+++ spamass-milter.spec	3 Apr 2009 14:14:42 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	9%{?dist}
+Release:	13%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -17,12 +17,10 @@
 BuildRequires:	spamassassin, sendmail-devel
 Requires:	spamassassin, /usr/sbin/sendmail
 
-Requires(pre): shadow-utils
+Requires(pre): /usr/bin/getent, /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/usermod
 Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Requires(preun): /sbin/chkconfig, initscripts
+Requires(postun): initscripts
 
 %description
 A milter (Mail Filter) application that pipes incoming mail (including things
@@ -34,7 +32,10 @@
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires(pre):	postfix
-Requires(post):	shadow-utils
+Requires(post):	shadow-utils, %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:	noarch
+%endif
 
 %description postfix
 This package adds support for running spamass-milter using a Unix-domain
@@ -64,6 +65,7 @@
 
 %{__install} -m 755 -D spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter
 %{__install} -m 644 -D spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter
+%{__install} -m 755 -d %{buildroot}%{_localstatedir}/lib/spamass-milter
 %{__install} -m 711 -d %{buildroot}%{_localstatedir}/run/spamass-milter
 %{__install} -m 750 -d %{buildroot}%{_localstatedir}/run/spamass-milter/postfix
 %{__install} -m 755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
@@ -71,8 +73,10 @@
 %pre
 /usr/bin/getent group sa-milt >/dev/null || /usr/sbin/groupadd -r sa-milt
 /usr/bin/getent passwd sa-milt >/dev/null || \
-	/usr/sbin/useradd -r -g sa-milt -d %{_localstatedir}/run/spamass-milter \
+	/usr/sbin/useradd -r -g sa-milt -d %{_localstatedir}/lib/spamass-milter \
 		-s /sbin/nologin -c "SpamAssassin Milter" sa-milt
+# Fix homedir for upgrades
+/usr/sbin/usermod --home %{_localstatedir}/lib/spamass-milter sa-milt &>/dev/null
 exit 0
 
 %post
@@ -80,12 +84,12 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service spamass-milter stop &>/dev/null || :
+	%{_initrddir}/spamass-milter stop &>/dev/null || :
 	/sbin/chkconfig --del spamass-milter || :
 fi
 
 %postun
-/sbin/service spamass-milter condrestart &>/dev/null || :
+%{_initrddir}/spamass-milter condrestart &>/dev/null || :
 
 %post postfix
 # This is needed because the milter needs to "give away" the MTA communication
@@ -104,6 +108,7 @@
 %{_initrddir}/spamass-milter
 %{_sbindir}/spamass-milter
 %{_sbindir}/spamass-milter-wrapper
+%dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/lib/spamass-milter/
 %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter/
 
 %files postfix
@@ -112,6 +117,25 @@
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Wed Mar 18 2009 Paul Howarth <paul at city-fan.org> 0.3.1-13
+- Call initscripts directly instead of via /sbin/service and fine-tune scriptlet
+  dependencies
+- Change sa-milt user's home directory from
+  %%{_localstatedir}/run/spamass-milter to %%{_localstatedir}/lib/spamass-milter
+  so as to retain directory contents across a reboot (#489995), and fix the home
+  directory of any existing sa-milt account on upgrades
+
+* Fri Feb 27 2009 Paul Howarth <paul at city-fan.org> 0.3.1-12
+- Subpackage for postfix is now noarch for Fedora 10 onwards
+- Fix scriptlet deps to ensure that sa-milt user exists before we attempt to
+  add it to the postfix group
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 13 2009 Paul Howarth <paul at city-fan.org> 0.3.1-10
+- Rebuild for shared libmilter in Fedora 11 development
+
 * Thu Jul  3 2008 Paul Howarth <paul at city-fan.org> 0.3.1-9
 - Require /usr/sbin/sendmail (for -b/-B/-x options) rather than sendmail pkg
 - Make summary and description less Sendmail-specific


Index: spamass-milter.sysv
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/F-9/spamass-milter.sysv,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spamass-milter.sysv	2 Feb 2009 15:05:29 -0000	1.3
+++ spamass-milter.sysv	3 Apr 2009 14:14:42 -0000	1.4
@@ -38,8 +38,9 @@
 
 # Read configuration
 source %{_initrddir}/functions
-source %{_sysconfdir}/sysconfig/network
-[ -r "${SYSCONFIG}" ] && source "${SYSCONFIG}"
+for configfile in %{_sysconfdir}/sysconfig/network "${SYSCONFIG}"; do
+	[ -r "${configfile}" ] && source "${configfile}"
+done
 
 [ -x %{_sbindir}/spamass-milter ] || exit 5
 



From dwalsh at fedoraproject.org  Fri Apr  3 14:22:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 14:22:21 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.123,1.124
Message-ID: <20090403142221.81D2E70134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27588

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
- Stop sending messages with scon or tcon == setroubleshootd_t



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- setroubleshoot.spec	27 Mar 2009 01:04:28 -0000	1.123
+++ setroubleshoot.spec	3 Apr 2009 14:21:51 -0000	1.124
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.1.6
-Release: 2%{?dist}
+Version: 2.1.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -195,6 +195,9 @@
 %doc %{pkgdocdir}
 
 %changelog
+* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
+- Stop sending messages with scon or tcon == setroubleshootd_t
+
 * Thu Mar 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.6-2
 - Split out documentation
 



From dwalsh at fedoraproject.org  Fri Apr  3 14:29:41 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 14:29:41 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore,1.94,1.95 sources,1.105,1.106
Message-ID: <20090403142941.7DFCF70134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28482

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
- Stop sending messages with scon or tcon == setroubleshootd_t



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	27 Feb 2009 20:48:41 -0000	1.94
+++ .cvsignore	3 Apr 2009 14:29:11 -0000	1.95
@@ -10,3 +10,4 @@
 setroubleshoot-2.1.4.tar.gz
 setroubleshoot-2.1.5.tar.gz
 setroubleshoot-2.1.6.tar.gz
+setroubleshoot-2.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	27 Feb 2009 20:48:41 -0000	1.105
+++ sources	3 Apr 2009 14:29:11 -0000	1.106
@@ -1 +1 @@
-fdbc7a830fd19032e2daf32948482ebd  setroubleshoot-2.1.6.tar.gz
+d84d1d7b334b03c646d975b697c648d9  setroubleshoot-2.1.7.tar.gz



From jzeleny at fedoraproject.org  Fri Apr  3 14:42:30 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri,  3 Apr 2009 14:42:30 +0000 (UTC)
Subject: rpms/nc/devel nc-1.84-efficient_reads.patch, NONE, 1.1 nc.spec, 1.42,
	1.43
Message-ID: <20090403144230.C1E8770134@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/nc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29730

Modified Files:
	nc.spec 
Added Files:
	nc-1.84-efficient_reads.patch 
Log Message:
Uploaded patch to make network reads more efficient (#493129)



nc-1.84-efficient_reads.patch:

--- NEW FILE nc-1.84-efficient_reads.patch ---
diff -ur nc.orig/netcat.c nc/netcat.c
--- nc.orig/netcat.c	2009-03-31 13:41:12.000000000 -0400
+++ nc/netcat.c	2009-03-31 14:05:50.000000000 -0400
@@ -316,10 +316,10 @@
 			 */
 			if (uflag) {
 				int rv, plen;
-				char buf[8192];
+				char buf[16384];
 
 				len = sizeof(cliaddr);
-				plen = jflag ? 8192 : 1024;
+				plen = jflag ? 16384 : 2048;
 				rv = recvfrom(s, buf, plen, MSG_PEEK,
 				    (struct sockaddr *)&cliaddr, &len);
 				if (rv < 0)
@@ -690,12 +690,12 @@
 readwrite(int nfd)
 {
 	struct pollfd pfd[2];
-	unsigned char buf[8192];
+	unsigned char buf[16384];
 	int n, wfd = fileno(stdin);
 	int lfd = fileno(stdout);
 	int plen;
 
-	plen = jflag ? 8192 : 1024;
+	plen = jflag ? 16384 : 2048;
 
 	/* Setup Network FD */
 	pfd[0].fd = nfd;


Index: nc.spec
===================================================================
RCS file: /cvs/extras/rpms/nc/devel/nc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- nc.spec	27 Feb 2009 14:52:14 -0000	1.42
+++ nc.spec	3 Apr 2009 14:42:00 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP
 Name: nc
 Version: 1.84
-Release: 18%{?dist}
+Release: 19%{?dist}
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 # source is CVS checkout
 Source0: nc-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 Patch8: nc-1.84-verb.patch
 Patch9: nc-1.84-man.patch
 Patch10: nc-1.84-gcc4.3.patch
+Patch11: nc-1.84-efficient_reads.patch
 
 License: GPL+
 Group: Applications/Internet
@@ -49,6 +50,7 @@
 %patch8 -p1 -b .verb
 %patch9 -p1 -b .man
 %patch10 -p1 -b .gcc
+%patch11 -p1 -b .reads
 
 %build
 gcc $RPM_OPT_FLAGS -Werror -fno-strict-aliasing `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc
@@ -70,6 +72,9 @@
 %doc README scripts
 
 %changelog
+* Fri Apr 03 2009 Jan Zeleny <jzeleny at redhat.com> - 1.84-19
+- updated network reading to be more efficient (#493129)
+
 * Fri Feb 27 2009 Jan Safranek <jsafrane at redhat.com> - 1.84-18
 - fixed compilation with GCC 4.4
 



From dwalsh at fedoraproject.org  Fri Apr  3 14:45:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 14:45:30 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.124,1.125
Message-ID: <20090403144530.B154570134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30286

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
- Stop sending messages with scon or tcon == setroubleshootd_t



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- setroubleshoot.spec	3 Apr 2009 14:21:51 -0000	1.124
+++ setroubleshoot.spec	3 Apr 2009 14:45:00 -0000	1.125
@@ -19,6 +19,7 @@
 Requires: dbus libnotify
 Requires: dbus-python
 Requires: libxml2-python
+Requires: libselinux-python  >= 1.30.15-1
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): dbus
 Requires(postun): /usr/bin/update-desktop-database
@@ -106,11 +107,9 @@
 Requires: %{name}-plugins >= 2.0.4
 Requires: audit >= 1.2.6-3
 Requires: audit-libs-python >= 1.2.6-3
-Requires: libselinux >= 1.30.15-1
 Requires: pygobject2
 Requires: dbus-python 
 Requires: libxml2-python
-Requires: libselinux-python
 Requires: rpm-python
 Requires: gtk2 libnotify
 BuildRequires: intltool gettext python



From dwalsh at fedoraproject.org  Fri Apr  3 14:46:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 14:46:28 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.19,
	1.20 modules-mls.conf, 1.53, 1.54 modules-targeted.conf, 1.121,
	1.122 policy-20090105.patch, 1.74, 1.75 selinux-policy.spec,
	1.815, 1.816
Message-ID: <20090403144628.D5E9A70134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30514

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-7
- Allow setroubelshoot exec* privs to prevent crash from bad libraries
- add cpufreqselector



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- modules-minimum.conf	20 Mar 2009 18:18:50 -0000	1.19
+++ modules-minimum.conf	3 Apr 2009 14:45:58 -0000	1.20
@@ -32,6 +32,13 @@
 # 
 ada = module
 
+# Layer: apps
+# Module: cpufreqselector 
+#
+# cpufreqselector executable
+# 
+cpufreqselector = module
+
 # Layer: modules
 # Module: awstats
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- modules-mls.conf	20 Mar 2009 18:18:50 -0000	1.53
+++ modules-mls.conf	3 Apr 2009 14:45:58 -0000	1.54
@@ -32,6 +32,13 @@
 # 
 ada = module
 
+# Layer: apps
+# Module: cpufreqselector 
+#
+# cpufreqselector executable
+# 
+cpufreqselector = module
+
 # Layer: modules
 # Module: awstats
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- modules-targeted.conf	20 Mar 2009 18:18:50 -0000	1.121
+++ modules-targeted.conf	3 Apr 2009 14:45:58 -0000	1.122
@@ -32,6 +32,13 @@
 # 
 ada = module
 
+# Layer: apps
+# Module: cpufreqselector 
+#
+# cpufreqselector executable
+# 
+cpufreqselector = module
+
 # Layer: modules
 # Module: awstats
 #

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- policy-20090105.patch	2 Apr 2009 15:23:57 -0000	1.74
+++ policy-20090105.patch	3 Apr 2009 14:45:58 -0000	1.75
@@ -1593,8 +1593,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.te	2009-04-02 10:05:45.000000000 -0400
-@@ -0,0 +1,47 @@
++++ serefpolicy-3.6.10/policy/modules/apps/cpufreqselector.te	2009-04-03 10:09:12.000000000 -0400
+@@ -0,0 +1,44 @@
 +policy_module(cpufreqselector,1.0.0)
 +
 +########################################
@@ -1624,9 +1624,6 @@
 +
 +fs_list_inotifyfs(cpufreqselector_t)
 +
-+libs_use_ld_so(cpufreqselector_t)
-+libs_use_shared_libs(cpufreqselector_t)
-+
 +userdom_read_all_users_state(cpufreqselector_t)
 +
 +nscd_dontaudit_search_pid(cpufreqselector_t)
@@ -10987,8 +10984,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.10/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/devicekit.te	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,210 @@
++++ serefpolicy-3.6.10/policy/modules/services/devicekit.te	2009-04-03 08:12:27.000000000 -0400
+@@ -0,0 +1,211 @@
 +policy_module(devicekit,1.0.0)
 +
 +########################################
@@ -11150,6 +11147,7 @@
 +dev_read_sysfs(devicekit_disk_t)
 +dev_read_urand(devicekit_disk_t)
 +dev_getattr_usbfs_dirs(devicekit_disk_t)
++dev_manage_generic_files(devicekit_disk_t)
 +
 +kernel_read_software_raid_state(devicekit_disk_t)
 +
@@ -19761,7 +19759,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.10/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/setroubleshoot.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/setroubleshoot.te	2009-04-03 10:25:52.000000000 -0400
 @@ -11,6 +11,9 @@
  domain_type(setroubleshootd_t)
  init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
@@ -19772,7 +19770,7 @@
  type setroubleshoot_var_lib_t;
  files_type(setroubleshoot_var_lib_t)
  
-@@ -27,8 +30,8 @@
+@@ -27,8 +30,10 @@
  # setroubleshootd local policy
  #
  
@@ -19780,10 +19778,12 @@
 -allow setroubleshootd_t self:process { signull signal getattr getsched };
 +allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
 +allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
++# if bad library causes setroubleshoot to require these, we want to give it so setroubleshoot can continue to run
++allow setroubleshootd_t self:process { execmem execstack };
  allow setroubleshootd_t self:fifo_file rw_fifo_file_perms;
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -52,7 +55,10 @@
+@@ -52,7 +57,10 @@
  
  kernel_read_kernel_sysctls(setroubleshootd_t)
  kernel_read_system_state(setroubleshootd_t)
@@ -19794,7 +19794,7 @@
  
  corecmd_exec_bin(setroubleshootd_t)
  corecmd_exec_shell(setroubleshootd_t)
-@@ -68,16 +74,24 @@
+@@ -68,16 +76,24 @@
  
  dev_read_urand(setroubleshootd_t)
  dev_read_sysfs(setroubleshootd_t)
@@ -19820,7 +19820,7 @@
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,22 +108,24 @@
+@@ -94,22 +110,24 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -27011,7 +27011,7 @@
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.10/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/unconfined.if	2009-04-01 14:58:39.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/unconfined.if	2009-04-03 10:28:13.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -27130,7 +27130,7 @@
 +		type unconfined_t;
 +	')
 +
-+	dontaudit $1 unconfined_t:unix_stream_socket rw_file_perms;
++	dontaudit $1 unconfined_t:unix_stream_socket rw_socket_perms;
 +')
 +
 +########################################
@@ -27668,7 +27668,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.10/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-01 14:59:58.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-03 10:26:58.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29532,7 +29532,7 @@
 +		attribute userdomain;
 +	')
 +
-+	dontaudit $1 userdomain:unix_stream_socket rw_file_perms;
++	dontaudit $1 userdomain:unix_stream_socket rw_socket_perms;
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.10/policy/modules/system/userdomain.te


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -r1.815 -r1.816
--- selinux-policy.spec	2 Apr 2009 15:23:58 -0000	1.815
+++ selinux-policy.spec	3 Apr 2009 14:45:58 -0000	1.816
@@ -15,12 +15,12 @@
 %endif
 %define POLICYVER 23
 %define libsepolver 2.0.20-1
-%define POLICYCOREUTILSVER 2.0.61-7
+%define POLICYCOREUTILSVER 2.0.62-7
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,10 @@
 %endif
 
 %changelog
+* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-7
+- Allow setroubelshoot exec* privs to prevent crash from bad libraries
+- add cpufreqselector
+
 * Thu Apr 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-6
 - Dontaudit listing of /root directory for cron system jobs
 



From lkundrak at fedoraproject.org  Fri Apr  3 15:01:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri,  3 Apr 2009 15:01:59 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog-3.21.10-HUPisRestart.patch, NONE,
	1.1 rsyslog.spec, 1.57, 1.58
Message-ID: <20090403150159.255BC70134@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32385

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-3.21.10-HUPisRestart.patch 
Log Message:
* Tue Mar 31 2009 Lubomir Rintel <lkundrak at v3.sk> 3.21.10-4
- Backport HUPisRestart option


rsyslog-3.21.10-HUPisRestart.patch:

--- NEW FILE rsyslog-3.21.10-HUPisRestart.patch ---
>From 5f83b6a346faca241b310c7d5be2b7eacc6239f9 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards at adiscon.com>
Date: Thu, 23 Oct 2008 14:46:47 +0200
Subject: [PATCH] added configuration directive "HUPisRestart"

...which enables to configure HUP to be either a full restart
or "just" a leightweight way to close open files
---
 ChangeLog                 |    3 ++
 action.c                  |   33 ++++++++++++++++++++++
 action.h                  |    1 +
 doc/rsyslog_conf.html     |    5 +++
 runtime/glbl.c            |    5 +++
 runtime/glbl.h            |    1 +
 runtime/module-template.h |   31 +++++++++++++++++++-
 runtime/modules.c         |    5 +++
 runtime/modules.h         |    1 +
 tools/omfile.c            |   68 ++++++++++++++++++++++++++++++++------------
 tools/syslogd.c           |   57 ++++++++++++++++++++++++++++++++-----
 11 files changed, 181 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db6abcf..d1bceeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+- added configuration directive "HUPisRestart" which enables to configure
+  HUP to be either a full restart or "just" a leightweight way to
+  close open files.
 ---------------------------------------------------------------------------
 Version 3.21.10 [BETA] (rgerhards), 2009-02-02
 - bugfix: inconsistent use of mutex/atomic operations could cause segfault
diff --git a/action.c b/action.c
index 5c5bdbe..d257290 100644
--- a/action.c
+++ b/action.c
@@ -498,6 +498,39 @@ finalize_it:
 }
 #pragma GCC diagnostic warning "-Wempty-body"
 
+
+/* call the HUP handler for a given action, if such a handler is defined. The
+ * action mutex is locked, because the HUP handler most probably needs to modify
+ * some internal state information.
+ * rgerhards, 2008-10-22
+ */
+#pragma GCC diagnostic ignored "-Wempty-body"
+rsRetVal
+actionCallHUPHdlr(action_t *pAction)
+{
+	DEFiRet;
+	int iCancelStateSave;
+
+	ASSERT(pAction != NULL);
+	dbgprintf("Action %p checks HUP hdlr: %p\n", pAction, pAction->pMod->doHUP);
+
+	if(pAction->pMod->doHUP == NULL) {
+		FINALIZE;	/* no HUP handler, so we are done ;) */
+	}
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave);
+	d_pthread_mutex_lock(&pAction->mutActExec);
+	pthread_cleanup_push(mutexCancelCleanup, &pAction->mutActExec);
+	pthread_setcancelstate(iCancelStateSave, NULL);
+	CHKiRet(pAction->pMod->doHUP(pAction->pModData));
+	pthread_cleanup_pop(1); /* unlock mutex */
+
+finalize_it:
+	RETiRet;
+}
+#pragma GCC diagnostic warning "-Wempty-body"
+
+
 /* set the action message queue mode
  * TODO: probably move this into queue object, merge with MainMsgQueue!
  * rgerhards, 2008-01-28
diff --git a/action.h b/action.h
index d26d15b..8d9d510 100644
--- a/action.h
+++ b/action.h
@@ -85,6 +85,7 @@ rsRetVal actionSetGlobalResumeInterval(int iNewVal);
 rsRetVal actionDoAction(action_t *pAction);
 rsRetVal actionCallAction(action_t *pAction, msg_t *pMsg);
 rsRetVal actionWriteToAction(action_t *pAction);
+rsRetVal actionCallHUPHdlr(action_t *pAction);
 rsRetVal actionClassInit(void);
 rsRetVal addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringRequest_t *pOMSR, int bSuspended);
 
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 8947165..2698a71 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -175,6 +175,11 @@ default 60000 (1 minute)]</li>
 <li><a href="rsconf1_gssforwardservicename.html">$GssForwardServiceName</a></li>
 <li><a href="rsconf1_gsslistenservicename.html">$GssListenServiceName</a></li>
 <li><a href="rsconf1_gssmode.html">$GssMode</a></li>
+<li>$HUPisRestart [<b>on</b>/off] - if set to on, a HUP is a full daemon restart. This means any queued messages are discarded (depending
+on queue configuration, of course) all modules are unloaded and reloaded. This mode keeps compatible with sysklogd, but is
+not recommended for use with rsyslog. To do a full restart, simply stop and start the daemon. The default is "on" for
+compatibility reasons. If it is set to "off", a HUP will only close open files. This is a much quicker action and usually
+the only one that is needed e.g. for log rotation. <b>It is recommended to set the setting to "off".</b></li>
 <li><a href="rsconf1_includeconfig.html">$IncludeConfig</a></li><li>MainMsgQueueCheckpointInterval &lt;number&gt;</li>
 <li>$MainMsgQueueDequeueSlowdown &lt;number&gt; [number
 is timeout in <i> micro</i>seconds (1000000us is 1sec!),
diff --git a/runtime/glbl.c b/runtime/glbl.c
index 1114fcd..67509e9 100644
--- a/runtime/glbl.c
+++ b/runtime/glbl.c
@@ -52,6 +52,7 @@ DEFobjStaticHelpers
  */
 static uchar *pszWorkDir = NULL;
 static int iMaxLine = 2048;		/* maximum length of a syslog message */
+static int bHUPisRestart = 1;	/* should SIGHUP cause a full system restart? */
 static int iDefPFFamily = PF_UNSPEC;     /* protocol family (IPv4, IPv6 or both) */
 static int bDropMalPTRMsgs = 0;/* Drop messages which have malicious PTR records during DNS lookup */
 static int option_DisallowWarning = 1;	/* complain if message from disallowed sender is received */
@@ -86,6 +87,7 @@ static dataType Get##nameFunc(void) \
 }
 
 SIMP_PROP(MaxLine, iMaxLine, int)
+SIMP_PROP(HUPisRestart, bHUPisRestart, int)
 SIMP_PROP(DefPFFamily, iDefPFFamily, int) /* note that in the future we may check the family argument */
 SIMP_PROP(DropMalPTRMsgs, bDropMalPTRMsgs, int)
 SIMP_PROP(Option_DisallowWarning, option_DisallowWarning, int)
@@ -173,6 +175,7 @@ CODESTARTobjQueryInterface(glbl)
 	pIf->Get##name = Get##name; \
 	pIf->Set##name = Set##name;
 	SIMP_PROP(MaxLine);
+	SIMP_PROP(HUPisRestart);
 	SIMP_PROP(DefPFFamily);
 	SIMP_PROP(DropMalPTRMsgs);
 	SIMP_PROP(Option_DisallowWarning);
@@ -216,6 +219,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 		pszWorkDir = NULL;
 	}
 	bDropMalPTRMsgs = 0;
+	bHUPisRestart = 1;
 	return RS_RET_OK;
 }
 
@@ -235,6 +239,7 @@ BEGINAbstractObjClassInit(glbl, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercafile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrCAF, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdriverkeyfile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrKeyFile, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercertfile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrCertFile, NULL));
+	CHKiRet(regCfSysLineHdlr((uchar *)"hupisrestart", 0, eCmdHdlrBinary, NULL, &bHUPisRestart, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL));
 ENDObjClassInit(glbl)
 
diff --git a/runtime/glbl.h b/runtime/glbl.h
index 0c83bdd..bcb9ad2 100644
--- a/runtime/glbl.h
+++ b/runtime/glbl.h
@@ -41,6 +41,7 @@ BEGINinterface(glbl) /* name must also be changed in ENDinterface macro! */
 	dataType (*Get##name)(void); \
 	rsRetVal (*Set##name)(dataType);
 	SIMP_PROP(MaxLine, int)
+	SIMP_PROP(HUPisRestart, int)
 	SIMP_PROP(DefPFFamily, int)
 	SIMP_PROP(DropMalPTRMsgs, int)
 	SIMP_PROP(Option_DisallowWarning, int)
diff --git a/runtime/module-template.h b/runtime/module-template.h
index eb39b58..6f7d877 100644
--- a/runtime/module-template.h
+++ b/runtime/module-template.h
@@ -481,6 +481,33 @@ static rsRetVal afterRun(void)\
 }
 
 
-/*
- * vi:set ai:
+/* doHUP()
+ * This function is optional. Currently, it is available to output plugins
+ * only, but may be made available to other types of plugins in the future.
+ * A plugin does not need to define this entry point. If if does, it gets
+ * called when a non-restart type of HUP is done. A plugin should register
+ * this function so that it can close files, connection or other ressources
+ * on HUP - if it can be assume the user wanted to do this as a part of HUP
+ * processing. Note that the name "HUP" has historical reasons, it stems back
+ * to the infamous SIGHUP which was sent to restart a syslogd. We still retain
+ * that legacy, but may move this to a different signal.
+ * rgerhards, 2008-10-22
+ */
+#define CODEqueryEtryPt_doHUP \
+	else if(!strcmp((char*) name, "doHUP")) {\
+		*pEtryPoint = doHUP;\
+	}
+#define BEGINdoHUP \
+static rsRetVal doHUP(instanceData __attribute__((unused)) *pData)\
+{\
+	DEFiRet;
+
+#define CODESTARTdoHUP 
+
+#define ENDdoHUP \
+	RETiRet;\
+}
+
+
+/* vim:set ai:
  */
diff --git a/runtime/modules.c b/runtime/modules.c
index d5730ed..169d234 100644
--- a/runtime/modules.c
+++ b/runtime/modules.c
@@ -347,6 +347,7 @@ static rsRetVal
 doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_t*), uchar *name, void *pModHdlr)
 {
 	DEFiRet;
+	rsRetVal localRet;
 	modInfo_t *pNew = NULL;
 	rsRetVal (*modGetType)(eModType_t *pType);
 
@@ -391,6 +392,10 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"parseSelectorAct", &pNew->mod.om.parseSelectorAct));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"isCompatibleWithFeature", &pNew->isCompatibleWithFeature));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"tryResume", &pNew->tryResume));
+			/* try load optional interfaces */
+			localRet = (*pNew->modQueryEtryPt)((uchar*)"doHUP", &pNew->doHUP);
+			if(localRet != RS_RET_OK && localRet != RS_RET_MODULE_ENTRY_POINT_NOT_FOUND)
+				ABORT_FINALIZE(localRet);
 			break;
 		case eMOD_LIB:
 			break;
diff --git a/runtime/modules.h b/runtime/modules.h
index 7d34bcf..77bc5d1 100644
--- a/runtime/modules.h
+++ b/runtime/modules.h
@@ -88,6 +88,7 @@ typedef struct modInfo_s {
 	rsRetVal (*tryResume)(void*);/* called to see if module actin can be resumed now */
 	rsRetVal (*modExit)(void);		/* called before termination or module unload */
 	rsRetVal (*modGetID)(void **);		/* get its unique ID from module */
+	rsRetVal (*doHUP)(void *);		/* non-restart type HUP handler */
 	/* below: parse a configuration line - return if processed
 	 * or not. If not, must be parsed to next module.
 	 */
diff --git a/tools/omfile.c b/tools/omfile.c
index d76e24a..5b661cb 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -244,7 +244,6 @@ static rsRetVal cflineParseOutchannel(instanceData *pData, uchar* p, omodStringR
 	 */
 	pData->f_sizeLimitCmd = (char*) pOch->cmdOnSizeLimit;
 
-RUNLOG_VAR("%p", pszTplName);
 	iRet = cflineParseTemplateName(&p, pOMSR, iEntry, iTplOpts,
 				       (pszTplName == NULL) ? (uchar*)"RSYSLOG_FileFormat" : pszTplName);
 
@@ -349,9 +348,11 @@ finalize_it:
 }
 
 
-/* This function frees the dynamic file name cache.
+/* This function frees all dynamic file name cache entries and closes the
+ * relevant files. Part of Shutdown and HUP processing.
+ * rgerhards, 2008-10-23
  */
-static void dynaFileFreeCache(instanceData *pData)
+static inline void dynaFileFreeCacheEntries(instanceData *pData)
 {
 	register int i;
 	ASSERT(pData != NULL);
@@ -360,17 +361,36 @@ static void dynaFileFreeCache(instanceData *pData)
 	for(i = 0 ; i < pData->iCurrCacheSize ; ++i) {
 		dynaFileDelCacheEntry(pData->dynCache, i, 1);
 	}
+	ENDfunc;
+}
+
+
+/* This function frees the dynamic file name cache.
+ */
+static void dynaFileFreeCache(instanceData *pData)
+{
+	ASSERT(pData != NULL);
 
+	BEGINfunc;
+	dynaFileFreeCacheEntries(pData);
 	if(pData->dynCache != NULL)
 		d_free(pData->dynCache);
 	ENDfunc;
 }
 
 
-/* This is a shared code for both static and dynamic files.
+/* This is now shared code for all types of files. It simply prepares
+ * file access, which, among others, means the the file wil be opened
+ * and any directories in between will be created (based on config, of
+ * course). -- rgerhards, 2008-10-22
  */
 static void prepareFile(instanceData *pData, uchar *newFileName)
 {
+	if(pData->fileType == eTypePIPE) {
+		pData->fd = open((char*) pData->f_fname, O_RDWR|O_NONBLOCK);
+		FINALIZE; /* we are done in this case */
+	}
+
 	if(access((char*)newFileName, F_OK) == 0) {
 		/* file already exists */
 		pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
@@ -413,6 +433,12 @@ static void prepareFile(instanceData *pData, uchar *newFileName)
 			}
 		}
 	}
+finalize_it:
+	if((pData->fd) != 0 && isatty(pData->fd)) {
+		dbgprintf("file %d is a tty file\n", pData->fd);
+		pData->fileType = eTypeTTY;
+		untty();
+	}
 }
 
 
@@ -537,6 +563,8 @@ static rsRetVal writeFile(uchar **ppString, unsigned iMsgOpts, instanceData *pDa
 	if(pData->bDynamicName) {
 		if(prepareDynFile(pData, ppString[1], iMsgOpts) != 0)
 			ABORT_FINALIZE(RS_RET_ERR);
+	} else if(pData->fd == -1) {
+		prepareFile(pData, pData->f_fname);
 	}
 
 	/* create the message based on format specified */
@@ -642,12 +670,7 @@ ENDtryResume
 BEGINdoAction
 CODESTARTdoAction
 	dbgprintf(" (%s)\n", pData->f_fname);
-	/* pData->fd == -1 is an indicator that the we couldn't
-	 * open the file at startup. For dynaFiles, this is ok,
-	 * all others are doomed.
-	 */
-	if(pData->bDynamicName || (pData->fd != -1))
-		iRet = writeFile(ppString, iMsgOpts, pData);
+	iRet = writeFile(ppString, iMsgOpts, pData);
 ENDdoAction
 
 
@@ -764,11 +787,7 @@ CODESTARTparseSelectorAct
 		pData->dirUID = dirUID;
 		pData->dirGID = dirGID;
 
-		if(pData->fileType == eTypePIPE) {
-			pData->fd = open((char*) pData->f_fname, O_RDWR|O_NONBLOCK);
-	        } else {
-			prepareFile(pData, pData->f_fname);
-		}
+		prepareFile(pData, pData->f_fname);
 		        
 	  	if ( pData->fd < 0 ){
 			pData->fd = -1;
@@ -776,10 +795,6 @@ CODESTARTparseSelectorAct
 			errmsg.LogError(0, NO_ERRCODE, "%s", pData->f_fname);
 			break;
 		}
-		if (isatty(pData->fd)) {
-			pData->fileType = eTypeTTY;
-			untty();
-		}
 		if (strcmp((char*) p, _PATH_CONSOLE) == 0)
 			pData->fileType = eTypeCONSOLE;
 		break;
@@ -815,6 +830,20 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 }
 
 
+BEGINdoHUP
+CODESTARTdoHUP
+	if(pData->bDynamicName) {
+		dynaFileFreeCacheEntries(pData);
+		pData->iCurrElt = -1; /* invalidate current element */
+	} else {
+		if(pData->fd != -1) {
+			close(pData->fd);
+			pData->fd = -1;
+		}
+	}
+ENDdoHUP
+
+
 BEGINmodExit
 CODESTARTmodExit
 	if(pszTplName != NULL)
@@ -825,6 +854,7 @@ ENDmodExit
 BEGINqueryEtryPt
 CODESTARTqueryEtryPt
 CODEqueryEtryPt_STD_OMOD_QUERIES
+CODEqueryEtryPt_doHUP
 ENDqueryEtryPt
 
 
diff --git a/tools/syslogd.c b/tools/syslogd.c
index b0d6fa2..98c7882 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -219,7 +219,7 @@ static char	*PidFile = _PATH_LOGPID; /* read-only after startup */
 
 static pid_t myPid;	/* our pid for use in self-generated messages, e.g. on startup */
 /* mypid is read-only after the initial fork() */
-static int restart = 0; /* do restart (config read) - multithread safe */
+static int bHadHUP = 0; /* did we have a HUP? */
 
 static int bParseHOSTNAMEandTAG = 1; /* global config var: should the hostname and tag be
                                       * parsed inside message - rgerhards, 2006-03-13 */
@@ -2525,13 +2525,13 @@ static rsRetVal setMainMsgQueType(void __attribute__((unused)) *pVal, uchar *psz
  * The following function is resposible for handling a SIGHUP signal.  Since
  * we are now doing mallocs/free as part of init we had better not being
  * doing this during a signal handler.  Instead this function simply sets
- * a flag variable which will tell the main loop to go through a restart.
+ * a flag variable which will tells the main loop to do "the right thing".
  */
 void sighup_handler()
 {
 	struct sigaction sigAct;
 	
-	restart = 1;
+	bHadHUP = 1;
 
 	memset(&sigAct, 0, sizeof (sigAct));
 	sigemptyset(&sigAct.sa_mask);
@@ -2560,6 +2560,49 @@ static void processImInternal(void)
 }
 
 
+/* helper to doHUP(), this "HUPs" each action. The necessary locking
+ * is done inside the action class and nothing we need to take care of.
+ * rgerhards, 2008-10-22
+ */
+DEFFUNC_llExecFunc(doHUPActions)
+{
+	BEGINfunc
+	actionCallHUPHdlr((action_t*) pData);
+	ENDfunc
+	return RS_RET_OK; /* we ignore errors, we can not do anything either way */
+}
+
+
+/* This function processes a HUP after one has been detected. Note that this
+ * is *NOT* the sighup handler. The signal is recorded by the handler, that record
+ * detected inside the mainloop and then this function is called to do the
+ * real work. -- rgerhards, 2008-10-22
+ */
+static inline void
+doHUP(void)
+{
+	selector_t *f;
+	char buf[512];
+
+	snprintf(buf, sizeof(buf) / sizeof(char),
+		 " [origin software=\"rsyslogd\" " "swVersion=\"" VERSION
+		 "\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] rsyslogd was HUPed, type '%s'.",
+		 (int) myPid, glbl.GetHUPisRestart() ? "restart" : "lightweight");
+		errno = 0;
+	logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)buf, 0);
+
+	if(glbl.GetHUPisRestart()) {
+		dbgprintf("Received SIGHUP, configured to be restart, reloading rsyslogd.\n");
+		init(); /* main queue is stopped as part of init() */
+	} else {
+		dbgprintf("Received SIGHUP, configured to be a non-restart type of HUP - notifying actions.\n");
+		for(f = Files; f != NULL ; f = f->f_next) {
+			llExecFunc(&f->llActList, doHUPActions, NULL);
+		}
+	}
+}
+
+
 /* This is the main processing loop. It is called after successful initialization.
  * When it returns, the syslogd terminates.
  * Its sole function is to provide some housekeeping things. The real work is done
@@ -2616,11 +2659,9 @@ mainloop(void)
 		if(bReduceRepeatMsgs == 1)
 			doFlushRptdMsgs();
 
-		if(restart) {
-			dbgprintf("\nReceived SIGHUP, reloading rsyslogd.\n");
-			/* main queue is stopped as part of init() */
-			init();
-			restart = 0;
+		if(bHadHUP) {
+			doHUP();
+			bHadHUP = 0;
 			continue;
 		}
 	}
-- 
1.5.5.6



Index: rsyslog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rsyslog.spec	18 Mar 2009 12:13:41 -0000	1.57
+++ rsyslog.spec	3 Apr 2009 15:01:28 -0000	1.58
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -13,6 +13,7 @@
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
 Patch0: rsyslog-3.21.10-convVar.patch
+Patch1: rsyslog-3.21.10-HUPisRestart.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -89,6 +90,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .convVar
+%patch1 -p1 -b .HUPisRestart
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -194,6 +196,9 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Tue Mar 31 2009 Lubomir Rintel <lkundrak at v3.sk> 3.21.10-4
+- Backport HUPisRestart option
+
 * Wed Mar 18 2009 Tomas Heinrich <theinric at redhat.com> 3.21.10-3
 - fix variables' type conversion in expression-based filters (#485937)
 



From pkgdb at fedoraproject.org  Fri Apr  3 15:07:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 15:07:46 +0000
Subject: [pkgdb] exaile: tvvikram has requested watchcommits
Message-ID: <20090403150746.59D85208604@bastion.fedora.phx.redhat.com>

tvvikram has requested the watchcommits acl on exaile (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Fri Apr  3 15:07:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 15:07:43 +0000
Subject: [pkgdb] exaile: tvvikram has requested watchbugzilla
Message-ID: <20090403150752.364372086F1@bastion.fedora.phx.redhat.com>

tvvikram has requested the watchbugzilla acl on exaile (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/exaile



From dwalsh at fedoraproject.org  Fri Apr  3 15:10:09 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 15:10:09 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.125,1.126
Message-ID: <20090403151009.9269D70134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
- Stop sending messages with scon or tcon == setroubleshootd_t



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- setroubleshoot.spec	3 Apr 2009 14:45:00 -0000	1.125
+++ setroubleshoot.spec	3 Apr 2009 15:09:38 -0000	1.126
@@ -20,6 +20,7 @@
 Requires: dbus-python
 Requires: libxml2-python
 Requires: libselinux-python  >= 1.30.15-1
+BuildRequires: libselinux 
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): dbus
 Requires(postun): /usr/bin/update-desktop-database



From erikos at fedoraproject.org  Fri Apr  3 15:16:06 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri,  3 Apr 2009 15:16:06 +0000 (UTC)
Subject: rpms/sugar-browse/devel .cvsignore, 1.6, 1.7 sources, 1.7,
	1.8 sugar-browse.spec, 1.15, 1.16
Message-ID: <20090403151606.1D05F70134@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1447

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Fri Apr 03 2009 Simon Schampijer <simon at schampijer.de> - 107-1
- Don't pick up the sugar theme #684
- Add a static welcome-page #645




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Apr 2009 06:04:34 -0000	1.6
+++ .cvsignore	3 Apr 2009 15:15:35 -0000	1.7
@@ -1 +1 @@
-Browse-106.tar.bz2
+Browse-107.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Apr 2009 06:04:34 -0000	1.7
+++ sources	3 Apr 2009 15:15:35 -0000	1.8
@@ -1 +1 @@
-6688707598f660d77664ebfc95d7ccd9  Browse-106.tar.bz2
+afadb3bab2e2d2f55c135bec6c6c4a4c  Browse-107.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sugar-browse.spec	1 Apr 2009 06:04:34 -0000	1.15
+++ sugar-browse.spec	3 Apr 2009 15:15:35 -0000	1.16
@@ -1,5 +1,5 @@
 Name: sugar-browse
-Version: 106
+Version: 107
 Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
@@ -40,6 +40,10 @@
 
 
 %changelog
+* Fri Apr 03 2009 Simon Schampijer <simon at schampijer.de> - 107-1
+- Don't pick up the sugar theme #684
+- Add a static welcome-page #645
+
 * Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 106-1
 - Fix Autocompletion and File upload #670
 - Make sugarlabs.org the default homepage



From berrange at fedoraproject.org  Fri Apr  3 15:18:03 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  3 Apr 2009 15:18:03 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.6.1-svirt-sound.patch, 1.1,
	1.2 libvirt.spec, 1.121, 1.122
Message-ID: <20090403151803.D010A7013C@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2217

Modified Files:
	libvirt-0.6.1-svirt-sound.patch libvirt.spec 
Log Message:
Fix dumb typo in previous patch

libvirt-0.6.1-svirt-sound.patch:

Index: libvirt-0.6.1-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.1-svirt-sound.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libvirt-0.6.1-svirt-sound.patch	17 Mar 2009 16:00:54 -0000	1.1
+++ libvirt-0.6.1-svirt-sound.patch	3 Apr 2009 15:18:03 -0000	1.2
@@ -10,7 +10,7 @@
 +    if (driver->securityDriver &&
 +        driver->securityDriver->name &&
 +        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid == 0) {
++        getuid() == 0) {
 +        static int soundWarned = 0; 
 +        skipSound = 1;
 +        if (vm->def->nsounds &&


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- libvirt.spec	17 Mar 2009 16:00:54 -0000	1.121
+++ libvirt.spec	3 Apr 2009 15:18:03 -0000	1.122
@@ -47,7 +47,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.1
-Release: 5%{?dist}%{?extra_release}
+Release: 6%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -506,6 +506,9 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Daniel P. Berrange  <berrange at redhat.com> - 0.6.1-6.fc11
+- Fix typo in previous patch
+
 * Tue Mar 17 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.1-5.fc11
 - Don't relabel shared/readonly disks
 - Disable sound cards when running sVirt



From dwalsh at fedoraproject.org  Fri Apr  3 15:30:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 15:30:53 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.126,1.127
Message-ID: <20090403153053.5059070134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3821

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
- Stop sending messages with scon or tcon == setroubleshootd_t



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- setroubleshoot.spec	3 Apr 2009 15:09:38 -0000	1.126
+++ setroubleshoot.spec	3 Apr 2009 15:30:23 -0000	1.127
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
-BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-libs-devel
+BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
@@ -20,7 +20,6 @@
 Requires: dbus-python
 Requires: libxml2-python
 Requires: libselinux-python  >= 1.30.15-1
-BuildRequires: libselinux 
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): dbus
 Requires(postun): /usr/bin/update-desktop-database



From kkofler at fedoraproject.org  Fri Apr  3 15:31:01 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  3 Apr 2009 15:31:01 +0000 (UTC)
Subject: rpms/kdegraphics/devel
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch, NONE,
	1.1 kdegraphics.spec, 1.194, 1.195
Message-ID: <20090403153101.A07EA70134@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3853/devel

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch 
Log Message:
* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
- work around Kolourpaint crash with Qt 4.5 (kde#183850)

kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch:

--- NEW FILE kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch ---
diff -ur kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp
--- kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2008-12-21 21:19:06.000000000 +0100
+++ kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2009-04-03 15:23:49.000000000 +0200
@@ -252,7 +252,7 @@
         // Copy RGB layer.
         *destPixmapPtr = QPixmap (oldPixmap.width (), oldPixmap.height ());
         QPainter p (destPixmapPtr);
-        p.drawPixmap (QPoint (0, 0), oldPixmap);
+        p.drawImage (QPoint (0, 0), oldPixmap.toImage());
         p.end ();
 
         // Copy mask layer (if any).


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- kdegraphics.spec	1 Apr 2009 18:38:49 -0000	1.194
+++ kdegraphics.spec	3 Apr 2009 15:30:31 -0000	1.195
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -17,6 +17,9 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
+# work around Kolourpaint crash with Qt 4.5 (kde#183850)
+# patch from the upstream bug report
+Patch0:         kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -90,6 +93,7 @@
 
 %prep
 %setup -q -n kdegraphics-%{version}
+%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 # upstream patches
 
@@ -219,6 +223,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
+- work around Kolourpaint crash with Qt 4.5 (kde#183850)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From veillard at fedoraproject.org  Fri Apr  3 15:52:41 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Fri,  3 Apr 2009 15:52:41 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.6.2-svirt-sound.patch, NONE,
	1.1 .cvsignore, 1.38, 1.39 libvirt.spec, 1.122, 1.123 sources,
	1.39, 1.40 libvirt-0.6.1-events-dispatch.patch, 1.1,
	NONE libvirt-0.6.1-fd-leaks.patch, 1.1,
	NONE libvirt-0.6.1-fd-leaks2.patch, 1.1,
	NONE libvirt-0.6.1-getvcpus-remote.patch, 1.1,
	NONE libvirt-0.6.1-pool-mode-parse.patch, 1.1,
	NONE libvirt-0.6.1-storage-free.patch, 1.1,
	NONE libvirt-0.6.1-svirt-shared-readonly.patch, 1.1,
	NONE libvirt-0.6.1-svirt-sound.patch, 1.2,
	NONE libvirt-0.6.1-vcpu-deadlock.patch, 1.1,
	NONE libvirt-0.6.1-vnc-sasl-auth.patch, 1.1,
	NONE libvirt-0.6.1-xen-events.patch, 1.1,
	NONE libvirt-0.6.1-xenblock-detach.patch, 1.1,
	NONE libvirt-0.6.1-xend-lookup.patch, 1.1, NONE
Message-ID: <20090403155241.BB1C870134@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6810

Modified Files:
	.cvsignore libvirt.spec sources 
Added Files:
	libvirt-0.6.2-svirt-sound.patch 
Removed Files:
	libvirt-0.6.1-events-dispatch.patch 
	libvirt-0.6.1-fd-leaks.patch libvirt-0.6.1-fd-leaks2.patch 
	libvirt-0.6.1-getvcpus-remote.patch 
	libvirt-0.6.1-pool-mode-parse.patch 
	libvirt-0.6.1-storage-free.patch 
	libvirt-0.6.1-svirt-shared-readonly.patch 
	libvirt-0.6.1-svirt-sound.patch 
	libvirt-0.6.1-vcpu-deadlock.patch 
	libvirt-0.6.1-vnc-sasl-auth.patch 
	libvirt-0.6.1-xen-events.patch 
	libvirt-0.6.1-xenblock-detach.patch 
	libvirt-0.6.1-xend-lookup.patch 
Log Message:
libvirt-0.6.2 release
remove old patches
update the svirt sound patch
Daniel


libvirt-0.6.2-svirt-sound.patch:

--- NEW FILE libvirt-0.6.2-svirt-sound.patch ---
--- src/qemu_conf.c.orig	2009-04-02 11:50:10.000000000 +0200
+++ src/qemu_conf.c	2009-04-03 17:46:59.000000000 +0200
@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr 
     char domid[50];
     char *pidfile;
     const char *cpu = NULL;
+    int skipSound = 0;
+
+    if (driver->securityDriver &&
+        driver->securityDriver->name &&
+        STREQ(driver->securityDriver->name, "selinux") &&
+        getuid() == 0) {
+        static int soundWarned = 0; 
+        skipSound = 1;
+        if (vm->def->nsounds &&
+            !soundWarned) {
+            soundWarned = 1;
+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
+        }
+    }
 
     uname_normalize(&ut);
 
@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr 
     }
 
     /* Add sound hardware */
-    if (vm->def->nsounds) {
+    if (vm->def->nsounds &&
+        !skipSound) {
         int size = 100;
         char *modstr;
         if (VIR_ALLOC_N(modstr, size+1) < 0)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	4 Mar 2009 13:33:45 -0000	1.38
+++ .cvsignore	3 Apr 2009 15:52:11 -0000	1.39
@@ -5,3 +5,4 @@
 libvirt-*.tar.gz
 libvirt-0.6.0.tar.gz
 libvirt-0.6.1.tar.gz
+libvirt-0.6.2.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- libvirt.spec	3 Apr 2009 15:18:03 -0000	1.122
+++ libvirt.spec	3 Apr 2009 15:52:11 -0000	1.123
@@ -13,6 +13,25 @@
 %define with_uml       0%{!?_without_uml:1}
 %define with_network   0%{!?_without_network:1}
 
+%define with_xen           0%{!?_without_xen:1}
+%define with_xen_proxy     0%{!?_without_xen_proxy:1}
+%define with_qemu          0%{!?_without_qemu:1}
+%define with_openvz        0%{!?_without_openvz:1}
+%define with_lxc           0%{!?_without_lxc:1}
+%define with_sasl          0%{!?_without_sasl:1}
+%define with_avahi         0%{!?_without_avahi:1}
+%define with_polkit        0%{!?_without_polkit:0}
+%define with_python        0%{!?_without_python:1}
+%define with_libvirtd      0%{!?_without_libvirtd:1}
+%define with_uml           0%{!?_without_uml:1}
+%define with_network       0%{!?_without_network:1}
+%define with_storage_fs    0%{!?_without_storage_fs:1}
+%define with_storage_lvm   0%{!?_without_storage_lvm:1}
+%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
+%define with_storage_disk  0%{!?_without_storage_disk:1}
+%define with_numactl       0%{!?_without_numactl:1}
+
+
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i586 i686 x86_64 ia64
 %define with_xen 0
@@ -46,29 +65,15 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.6.1
-Release: 6%{?dist}%{?extra_release}
+Version: 0.6.2
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: libvirt-0.6.1-xend-lookup.patch
-Patch2: libvirt-0.6.1-xen-events.patch
-Patch3: libvirt-0.6.1-events-dispatch.patch
-Patch4: libvirt-0.6.1-fd-leaks.patch
-Patch5: libvirt-0.6.1-getvcpus-remote.patch
-Patch6: libvirt-0.6.1-pool-mode-parse.patch
-Patch7: libvirt-0.6.1-storage-free.patch
-Patch8: libvirt-0.6.1-vcpu-deadlock.patch
-Patch9: libvirt-0.6.1-xenblock-detach.patch
-Patch10: libvirt-0.6.1-fd-leaks2.patch
-Patch11: libvirt-0.6.1-svirt-shared-readonly.patch
-
-# Not upstream yet - pending QEMU merge
-Patch100: libvirt-0.6.1-vnc-sasl-auth.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
-Patch200: libvirt-0.6.1-svirt-sound.patch
+Patch200: libvirt-0.6.2-svirt-sound.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -92,11 +97,13 @@
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
+%if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
 Requires: nfs-utils
+%endif
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -106,12 +113,18 @@
 Requires: /usr/sbin/qcow-create
 %endif
 %endif
+%if %{with_storage_lvm}
 # For LVM drivers
 Requires: lvm2
+%endif
+%if %{with_storage_iscsi}
 # For ISCSI driver
 Requires: iscsi-initiator-utils
+%endif
+%if %{with_storage_disk}
 # For disk driver
 Requires: parted
+%endif
 # For svirt support
 Requires: libselinux
 %if %{with_xen}
@@ -139,8 +152,10 @@
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
+%if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
+%endif
 %if %{with_qemu}
 # From QEMU RPMs
 BuildRequires: /usr/bin/qemu-img
@@ -150,14 +165,22 @@
 BuildRequires: /usr/sbin/qcow-create
 %endif
 %endif
+%if %{with_storage_lvm}
 # For LVM drivers
 BuildRequires: lvm2
+%endif
+%if %{with_storage_iscsi}
 # For ISCSI driver
 BuildRequires: iscsi-initiator-utils
+%endif
+%if %{with_storage_disk}
 # For disk driver
 BuildRequires: parted-devel
+%endif
+%if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
+%endif
 Obsoletes: libvir <= 0.2
 Provides: libvir = %{version}-%{release}
 
@@ -200,20 +223,8 @@
 
 %prep
 %setup -q
-%patch1 -p0
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p0
-%patch11 -p1
 
-%patch100 -p1
-%patch200 -p1
+%patch200 -p0
 
 mv NEWS NEWS.old
 iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
@@ -267,6 +278,26 @@
 %define _without_network --without-network
 %endif
 
+%if ! %{with_storage_fs}
+%define _without_storage_fs --without-storage-fs
+%endif
+
+%if ! %{with_storage_lvm}
+%define _without_storage_lvm --without-storage-lvm
+%endif
+
+%if ! %{with_storage_iscsi}
+%define _without_storage_iscsi --without-storage-iscsi
+%endif
+
+%if ! %{with_storage_disk}
+%define _without_storage_disk --without-storage-disk
+%endif
+
+%if ! %{with_numactl}
+%define _without_numactl --without-numactl
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -279,6 +310,11 @@
            %{?_without_uml} \
            %{?_without_network} \
            %{?_with_rhel5_api} \
+           %{?_without_storage_fs} \
+           %{?_without_storage_lvm} \
+           %{?_without_storage_iscsi} \
+           %{?_without_storage_disk} \
+           %{?_without_numactl} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -506,6 +542,14 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.2-1.fc11
+- release of 0.6.2
+- memory ballooning in QEMU
+- SCSI HBA storage pool support
+- support SASL auth for VNC server
+- PCI passthrough in Xen driver
+- assorted bug fixes
+
 * Fri Apr  3 2009 Daniel P. Berrange  <berrange at redhat.com> - 0.6.1-6.fc11
 - Fix typo in previous patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	4 Mar 2009 13:33:45 -0000	1.39
+++ sources	3 Apr 2009 15:52:11 -0000	1.40
@@ -1 +1 @@
-3154ea9d4a0778497dfdf58cb98127c0  libvirt-0.6.1.tar.gz
+3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz


--- libvirt-0.6.1-events-dispatch.patch DELETED ---


--- libvirt-0.6.1-fd-leaks.patch DELETED ---


--- libvirt-0.6.1-fd-leaks2.patch DELETED ---


--- libvirt-0.6.1-getvcpus-remote.patch DELETED ---


--- libvirt-0.6.1-pool-mode-parse.patch DELETED ---


--- libvirt-0.6.1-storage-free.patch DELETED ---


--- libvirt-0.6.1-svirt-shared-readonly.patch DELETED ---


--- libvirt-0.6.1-svirt-sound.patch DELETED ---


--- libvirt-0.6.1-vcpu-deadlock.patch DELETED ---


--- libvirt-0.6.1-vnc-sasl-auth.patch DELETED ---


--- libvirt-0.6.1-xen-events.patch DELETED ---


--- libvirt-0.6.1-xenblock-detach.patch DELETED ---


--- libvirt-0.6.1-xend-lookup.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Apr  3 16:04:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:04:13 +0000
Subject: [pkgdb] iwl5000-firmware had acl change status
Message-ID: <20090403160353.E838D208553@bastion.fedora.phx.redhat.com>

kwizart has set the watchbugzilla acl on iwl5000-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:03:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:03:57 +0000
Subject: [pkgdb] iwl5000-firmware had acl change status
Message-ID: <20090403160357.BF29F208556@bastion.fedora.phx.redhat.com>

kwizart has set the watchcommits acl on iwl5000-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:04:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:04:17 +0000
Subject: [pkgdb] iwl5000-firmware had acl change status
Message-ID: <20090403160358.1CCE8208603@bastion.fedora.phx.redhat.com>

kwizart has set the commit acl on iwl5000-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:03:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:03:50 +0000
Subject: [pkgdb] iwl5000-firmware had acl change status
Message-ID: <20090403160359.6F6DC208604@bastion.fedora.phx.redhat.com>

kwizart has set the approveacls acl on iwl5000-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:07:06 +0000
Subject: [pkgdb] iwl4965-firmware had acl change status
Message-ID: <20090403160646.1E32B20854A@bastion.fedora.phx.redhat.com>

kwizart has set the watchbugzilla acl on iwl4965-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl4965-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:07:07 +0000
Subject: [pkgdb] iwl4965-firmware had acl change status
Message-ID: <20090403160647.C0AE8208555@bastion.fedora.phx.redhat.com>

kwizart has set the watchcommits acl on iwl4965-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl4965-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:06:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:06:50 +0000
Subject: [pkgdb] iwl4965-firmware had acl change status
Message-ID: <20090403160650.54CA2208603@bastion.fedora.phx.redhat.com>

kwizart has set the commit acl on iwl4965-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl4965-firmware



From pkgdb at fedoraproject.org  Fri Apr  3 16:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 16:06:45 +0000
Subject: [pkgdb] iwl4965-firmware had acl change status
Message-ID: <20090403160655.194C5208609@bastion.fedora.phx.redhat.com>

kwizart has set the approveacls acl on iwl4965-firmware (Fedora devel) to Approved for linville

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iwl4965-firmware



From tbzatek at fedoraproject.org  Fri Apr  3 16:15:20 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri,  3 Apr 2009 16:15:20 +0000 (UTC)
Subject: rpms/sabayon/devel sabayon.spec,1.58,1.59
Message-ID: <20090403161520.A8E8870134@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8832

Modified Files:
	sabayon.spec 
Log Message:
* Fri Apr  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-2
- Fix some gconf crashes (gnome #576445)
- Temporarily switched back to Xnest to get working keyboard (gnome #576447)



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sabayon.spec	23 Mar 2009 10:09:25 -0000	1.58
+++ sabayon.spec	3 Apr 2009 16:14:50 -0000	1.59
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.25.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -27,8 +27,12 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=551535
 Patch4:  sabayon-lockdown-save.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=576440
 Patch5:  sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=576445
+Patch6:  sabayon-2.25.0-gconf-crashes.patch
+
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -78,7 +82,8 @@
 Summary:  The parts of sabayon needed on the client systems
 Group:    Applications/System
 
-Requires: xorg-x11-server-Xephyr
+# Requires: xorg-x11-server-Xephyr
+Requires: xorg-x11-server-Xnest
 Requires: shadow-utils
 Requires: gamin-python
 Requires: python-ldap
@@ -98,10 +103,13 @@
 # More modern pam file
 cp %{SOURCE2} admin-tool/
 
-%patch1 -p1 -b .xephyr
+# %patch1 -p1 -b .xephyr
+# -- temporarily disabled: https://bugzilla.gnome.org/show_bug.cgi?id=576447
 %patch3 -p1 -b .selinux
 %patch4 -p0 -b .gconfsave
 %patch5 -p1 -b .xauth
+%patch6 -p1 -b .gconf
+
 
 %build
 
@@ -290,6 +298,10 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Apr  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-2
+- Fix some gconf crashes (gnome #576445)
+- Temporarily switched back to Xnest to get working keyboard (gnome #576447)
+
 * Fri Mar 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-1
 - Update to 2.25.0
 



From bskeggs at fedoraproject.org  Fri Apr  3 16:18:30 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri,  3 Apr 2009 16:18:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.27,
	1.28 nouveau-fedora.patch, 1.16, 1.17 sources, 1.28,
	1.29 xorg-x11-drv-nouveau.spec, 1.33, 1.34
Message-ID: <20090403161830.484AA70134@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9191

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Sat Apr 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-22.20090404git836d985
- use consistent connector names across all modesetting paths
- rh#493981





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	3 Apr 2009 04:16:00 -0000	1.27
+++ .cvsignore	3 Apr 2009 16:17:59 -0000	1.28
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2
+xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2

nouveau-fedora.patch:

Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nouveau-fedora.patch	3 Apr 2009 04:16:00 -0000	1.16
+++ nouveau-fedora.patch	3 Apr 2009 16:17:59 -0000	1.17
@@ -11,10 +11,10 @@
  			 nouveau_output.h \
  			 nouveau_connector.h \
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 8150a28..bc15231 100644
+index b7a38fa..5361825 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -185,6 +185,50 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
+@@ -185,6 +185,51 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
  }
  
  static void
@@ -49,12 +49,13 @@
 +	
 +	nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
 +	dst = pNv->scanout->map;
++	dst += (y * fb->pitch) + (x * (fb->bpp >> 3));
 +
 +	h = fb->height;
 +	while (h--) {
 +		memcpy(dst, src, fb->width * (fb->bpp >> 3));
 +		src += fb->pitch;
-+		dst += fb->pitch;
++		dst += pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
 +	}
 +
 +	nouveau_bo_unmap(pNv->scanout);
@@ -65,7 +66,7 @@
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -194,6 +238,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -194,6 +239,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	PixmapPtr pspix, pdpix;
  	int w, h;
  
@@ -77,7 +78,7 @@
  	pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
  	if (!pspix)
  		return;
-@@ -239,7 +288,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -239,7 +289,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		ret = drmModeAddFB(drmmode->fd,
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,
@@ -86,7 +87,7 @@
  		if (ret < 0) {
  			ErrorF("failed to add fb\n");
  			return FALSE;
-@@ -292,8 +341,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -292,8 +342,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_id;
  	else
@@ -484,7 +485,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 7da48d2..fe6368e 100644
+index e5ef11a..735fee0 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@
@@ -497,7 +498,7 @@
  #include "nv_include.h"
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4485,7 +4488,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4486,7 +4489,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
  
  bool NVInitVBIOS(ScrnInfoPtr pScrn)
  {
@@ -508,7 +509,7 @@
  
  	memset(bios, 0, sizeof(struct nvbios));
  
-@@ -4496,6 +4502,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4497,6 +4503,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
  	if (bios->length > NV_PROM_SIZE)
  		bios->length = NV_PROM_SIZE;
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 Apr 2009 04:16:00 -0000	1.28
+++ sources	3 Apr 2009 16:17:59 -0000	1.29
@@ -1 +1 @@
-55e911e7dadc7e445469a0be81b6306b  xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2
+2b3bc53449226e0f3028afc78c578602  xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-nouveau.spec	3 Apr 2009 04:16:00 -0000	1.33
+++ xorg-x11-drv-nouveau.spec	3 Apr 2009 16:17:59 -0000	1.34
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090403
-%define git_version 11be9a9
+%define gitdate 20090404
+%define git_version 836d985
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   21.%{snapshot}%{?dist}
+Release:   22.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,10 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sat Apr 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-22.20090404git836d985
+- use consistent connector names across all modesetting paths
+- rh#493981
+
 * Fri Apr 03 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-21.20090403git11be9a9
 - upstream update, loads of modesetting fixes
 - rh#492819, rh#492427, rh#492289, rh#492289



From tbzatek at fedoraproject.org  Fri Apr  3 16:21:12 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri,  3 Apr 2009 16:21:12 +0000 (UTC)
Subject: rpms/sabayon/devel sabayon-2.25.0-gconf-crashes.patch,NONE,1.1
Message-ID: <20090403162112.0801A70134@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10142

Added Files:
	sabayon-2.25.0-gconf-crashes.patch 
Log Message:
Forgot to 'cvs add' a patch
(didn't I spew some nasty words about missing commit hook last time?)


sabayon-2.25.0-gconf-crashes.patch:

--- NEW FILE sabayon-2.25.0-gconf-crashes.patch ---
diff -up sabayon-2.25.0/lib/sources/paneldelegate.py.gconf sabayon-2.25.0/lib/sources/paneldelegate.py
--- sabayon-2.25.0/lib/sources/paneldelegate.py.gconf	2009-01-12 19:38:22.000000000 +0100
+++ sabayon-2.25.0/lib/sources/paneldelegate.py	2009-04-03 17:46:08.000000000 +0200
@@ -191,10 +191,19 @@ class PanelDelegate (userprofile.SourceD
     class PanelObject (PanelThing):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
-  
+            
             self.toplevel_id = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/toplevel_id")
             self.object_type = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/object_type")
 
+            home = util.get_home_dir()
+            (cl, xaddress) = gconfsource.get_client_and_address_for_path (os.path.join (home, ".gconf"))
+            
+            # FIXME: not sure why this is happening, looks like the change is pushed to wrong gconf repository
+            if self.toplevel_id == None:
+                self.toplevel_id = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/toplevel_id")
+            if self.object_type == None:
+                self.object_type = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/object_type")
+
             if self.object_type == "drawer-object":
                 # Translators: This is a drawer in gnome-panel (where you can put applets)
                 self.name = _("Drawer")
@@ -202,6 +211,10 @@ class PanelDelegate (userprofile.SourceD
                 self.name = _("Main Menu")
             elif self.object_type == "launcher-object":
                 launcher_location = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/launcher_location")
+                # FIXME: not sure why this is happening, looks like the change is pushed to wrong gconf repository 
+                if launcher_location == None:
+                    launcher_location = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/launcher_location")
+
                 if launcher_location[0] == '/':
                     desktop_file = launcher_location
                 elif launcher_location[0:7] == "file://": # See what happens when you drag and drop from the menu
@@ -212,6 +225,10 @@ class PanelDelegate (userprofile.SourceD
                 self.name = _("%s launcher") % launcher.getName()
             elif self.object_type == "action-applet":
                 action_type = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/action_type")
+                # FIXME: not sure why this is happening, looks like the change is pushed to wrong gconf repository 
+                if action_type == None:
+                    action_type = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/action_type")
+
                 if action_type == "lock":
                     self.name = _("Lock Screen button")
                 elif action_type == "logout":



From davej at fedoraproject.org  Fri Apr  3 16:38:24 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri,  3 Apr 2009 16:38:24 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-dma-debug-fixes.patch, NONE,
	1.1 kernel.spec, 1.1508, 1.1509
Message-ID: <20090403163824.D5C7C70134@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11511

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-dma-debug-fixes.patch 
Log Message:
x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

linux-2.6-dma-debug-fixes.patch:

--- NEW FILE linux-2.6-dma-debug-fixes.patch ---
Date: 	Fri, 3 Apr 2009 15:50:14 +0200
From: Joerg Roedel <joerg.roedel at amd.com>
To: mingo at redhat.com
CC: linux-kernel at vger.kernel.org, shemminger at vyatta.com
Subject: [git pull] dma-debug fixes for 2.6.30-rc
Message-ID: <20090403135014.GG22472 at amd.com>

Hi Ingo,

The following changes since commit 8fe74cf053de7ad2124a894996f84fa890a81093:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git dma-debug

Joerg Roedel (1):
      x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

 arch/x86/include/asm/pci.h    |   36 ++++++++++++++++++++++++++++++++----
 arch/x86/include/asm/pci_32.h |   34 ----------------------------------
 arch/x86/include/asm/pci_64.h |   22 ----------------------
 3 files changed, 32 insertions(+), 60 deletions(-)
 delete mode 100644 arch/x86/include/asm/pci_32.h

This unification fixes dma-debug false positives on i386 reporting that a dma
mapping was freed with another length than it was allocated. The full diff is
also attached. This patch is against linus/master since your HEAD of latest
tip/core/iommu branch is currently 2.6.29 final. Please pull.

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index a977de2..e403448 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -86,12 +86,40 @@ static inline void early_quirks(void) { }
 
 extern void pci_iommu_alloc(void);
 
-#endif  /* __KERNEL__ */
+#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
+
+#if defined(CONFIG_X86_64) || defined(CONFIG_DMA_API_DEBUG)
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
+	        dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \
+	        __u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)                  \
+	        ((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \
+	        (((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)                    \
+	        ((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \
+	        (((PTR)->LEN_NAME) = (VAL))
 
-#ifdef CONFIG_X86_32
-# include "pci_32.h"
 #else
-# include "pci_64.h"
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
+#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
+	        do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
+#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
+	        do { break; } while (pci_unmap_len(PTR, LEN_NAME))
+
+#endif
+
+#endif  /* __KERNEL__ */
+
+#ifdef CONFIG_X86_64
+#include "pci_64.h"
 #endif
 
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h
index 4da2079..ae5e40f 100644
--- a/arch/x86/include/asm/pci_64.h
+++ b/arch/x86/include/asm/pci_64.h
@@ -24,28 +24,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
 
 extern void dma32_reserve_bootmem(void);
 
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions
- *
- * On AMD64 it mostly equals, but we set it to zero if a hardware
- * IOMMU (gart) of sotware IOMMU (swiotlb) is available.
- */
-#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\
-	dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
-	__u32 LEN_NAME;
-#define pci_unmap_addr(PTR, ADDR_NAME)			\
-	((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
-	(((PTR)->ADDR_NAME) = (VAL))
-#define pci_unmap_len(PTR, LEN_NAME)			\
-	((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
-	(((PTR)->LEN_NAME) = (VAL))
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_X86_PCI_64_H */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- kernel.spec	3 Apr 2009 02:09:50 -0000	1.1508
+++ kernel.spec	3 Apr 2009 16:37:54 -0000	1.1509
@@ -654,6 +654,8 @@
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 Patch685: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
+Patch700: linux-2.6-dma-debug-fixes.patch
+
 Patch1515: linux-2.6.29-lirc.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
@@ -1251,6 +1253,9 @@
 # fix locking in ipw3945 conf_tx callback
 ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
+# Fix up DMA debug code
+ApplyPatch linux-2.6-dma-debug-fixes.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1884,6 +1889,9 @@
 # and build.
 
 %changelog
+* Fri Apr 03 2009 Dave Jones <davej at redhat.com>
+- x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
+
 * Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-46
 - Enable debug builds and turn of debugging in the regular kernel.
 - Remove dma-debug patches.



From atorkhov at fedoraproject.org  Fri Apr  3 16:57:36 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri,  3 Apr 2009 16:57:36 +0000 (UTC)
Subject: rpms/btanks/devel btanks-0.8-rename-lib.patch, NONE, 1.1 btanks.spec,
	1.1, 1.2
Message-ID: <20090403165736.2D6E270134@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/btanks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13855

Modified Files:
	btanks.spec 
Added Files:
	btanks-0.8-rename-lib.patch 
Log Message:
* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-10
- Make btanks-data noarch
- Rename libbt.so to libbtanks.so because of conflict with blackbox


btanks-0.8-rename-lib.patch:

--- NEW FILE btanks-0.8-rename-lib.patch ---
diff -urp btanks-0.8.7686.orig/editor/SConscript btanks-0.8.7686/editor/SConscript
--- btanks-0.8.7686.orig/editor/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/editor/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -6,7 +6,7 @@ Import('sdl_libs')
 
 env = env.Clone()
 
-libs = ['bt', 'sdlx', 'mrt', 'SDL']
+libs = ['btanks', 'sdlx', 'mrt', 'SDL']
 
 ed_src = [
 	'base_brush.cpp', 
+++ btanks-0.8.7686/engine/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -109,7 +109,7 @@ if sys.platform != 'win32':
 	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
 
 
-bt = env.SharedLibrary('bt', bt_sources, LIBS=bt_libs)
+bt = env.SharedLibrary('btanks', bt_sources, LIBS=bt_libs)
 
 if sys.platform != 'win32' and len(env['prefix']) > 0:
 	Import('install_targets')
@@ -119,7 +119,7 @@ else:
 	Install('#', bt[0])
 
 bt_main_sources = ['src/main.cpp']
-bt_main_libs =  ['mrt', 'bt', 'SDL', 'sdlx']
+bt_main_libs =  ['mrt', 'btanks', 'SDL', 'sdlx']
 
 if sys.platform == "win32":
 	bt_rc = env.RES('src/bt.rc')
diff -urp btanks-0.8.7686.orig/objects/SConscript btanks-0.8.7686/objects/SConscript
--- btanks-0.8.7686.orig/objects/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/objects/SConscript	2009-04-03 20:08:58.000000000 +0400
@@ -7,7 +7,7 @@ Import('lib_dir')
 env = env.Clone()
 buildmode = env['mode']
 
-libs = ['bt', 'sdlx', 'mrt']
+libs = ['btanks', 'sdlx', 'mrt']
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/engine'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/mrt'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/sdlx'])


Index: btanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btanks/devel/btanks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btanks.spec	18 Mar 2009 08:41:56 -0000	1.1
+++ btanks.spec	3 Apr 2009 16:57:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           btanks
 Version:        0.8.7686
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Funny battle on your desk
 Summary(ru):    ?????????????? ?????????????????? ?????????? ???? ??????????
 
@@ -12,6 +12,9 @@
 Patch0:         %{name}-0.8-remove-rpath.patch
 # Disable video previews of map levels (we don't distribute video anyway)
 Patch1:         %{name}-0.8-disable-smpeg.patch
+# Rename libbt.so to libbtanks.so because of conflict with blackbox
+# http://sourceforge.net/tracker/?func=detail&atid=843095&aid=2722914&group_id=167474
+Patch2:         %{name}-0.8-rename-lib.patch
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        bted.desktop
@@ -50,6 +53,8 @@
 Group:          Amusements/Games
 Requires:       %{name} = %{version}-%{release}
 
+BuildArch:      noarch
+
 %description    data
 The %{name}-data package contains data files that are needed for
 running %{name}.
@@ -59,6 +64,7 @@
 %setup -q
 %patch0 -p1 -b .remove-rpath
 %patch1 -p1 -b .disable-smpeg
+%patch2 -p1 -b .rename-lib
 dos2unix -k *.txt ChangeLog *.url LICENSE EXCEPTION
 
 iconv -f latin1 -t utf-8 EXCEPTION > EXCEPTION.new
@@ -96,7 +102,7 @@
 
 # libs
 install -dm 755 %{buildroot}%{_libdir}/%{name}
-install -m 755 build/release/engine/libbt.so %{buildroot}%{_libdir}
+install -m 755 build/release/engine/libbtanks.so %{buildroot}%{_libdir}
 install -m 755 build/release/mrt/libmrt.so %{buildroot}%{_libdir}
 install -m 755 build/release/sdlx/libsdlx.so %{buildroot}%{_libdir}
 install -m 755 build/release/clunk/libclunk.so %{buildroot}%{_libdir}
@@ -152,6 +158,10 @@
 
 
 %changelog
+* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-10
+- Make btanks-data noarch
+- Rename libbt.so to libbtanks.so because of conflict with blackbox
+
 * Wed Mar 18 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-8
 - Package data as separate files instead of big zip blob
 



From rdieter at fedoraproject.org  Fri Apr  3 17:07:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  3 Apr 2009 17:07:48 +0000 (UTC)
Subject: rpms/xine-lib/devel .cvsignore, 1.20, 1.21 sources, 1.22,
	1.23 xine-lib.spec, 1.72, 1.73 xine-lib-add-mime-for-mod.patch,
	1.2, NONE xine-lib-safe-audio-pause3.patch, 1.1, NONE
Message-ID: <20090403170748.E692570134@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14961

Modified Files:
	.cvsignore sources xine-lib.spec 
Removed Files:
	xine-lib-add-mime-for-mod.patch 
	xine-lib-safe-audio-pause3.patch 
Log Message:
* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
- xine-lib-1.1.16.3, plugin-abi 1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Feb 2009 23:03:37 -0000	1.20
+++ .cvsignore	3 Apr 2009 17:07:18 -0000	1.21
@@ -1,2 +1,2 @@
-xine-lib-1.1.16.2-pruned.tar.bz2
-xine-lib-1.1.16.2-autotools.patch.bz2
+xine-lib-1.1.16.3-autotools.patch.bz2
+xine-lib-1.1.16.3-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	10 Feb 2009 23:03:37 -0000	1.22
+++ sources	3 Apr 2009 17:07:18 -0000	1.23
@@ -1,2 +1,2 @@
-e2c3a178be02f5c32957b2716123aa28  xine-lib-1.1.16.2-pruned.tar.bz2
-07bf186d51b8315026453a2f21b33703  xine-lib-1.1.16.2-autotools.patch.bz2
+e50122a9323107564d58056b35256610  xine-lib-1.1.16.3-autotools.patch.bz2
+0cac86b7d74c1dcaa22f5a8cbc5ef578  xine-lib-1.1.16.3-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- xine-lib.spec	26 Mar 2009 14:56:30 -0000	1.72
+++ xine-lib.spec	3 Apr 2009 17:07:18 -0000	1.73
@@ -4,7 +4,7 @@
 #   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 # - deprecate ESD support?
 
-%define         abiver      1.25
+%define         plugin_abi  1.26
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -33,8 +33,8 @@
 
 Summary:        A multimedia engine 
 Name:           xine-lib
-Version:        1.1.16.2
-Release:        6%{?dist}
+Version:        1.1.16.3
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -56,12 +56,10 @@
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstream patches
-Patch100:       xine-lib-safe-audio-pause3.patch
-Patch101:       xine-lib-add-mime-for-mod.patch
 
-Provides:       xine-lib(plugin-abi) = %{abiver}
+Provides:       xine-lib(plugin-abi) = %{plugin_abi}
 %if "%{?_isa}" != "%{nil}"
-Provides:       xine-lib(plugin-abi)%{?_isa} = %{abiver}
+Provides:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
 %endif
 # X11
 BuildRequires:  libX11-devel
@@ -144,7 +142,7 @@
 Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 # -arts was split off the -extras subpackage at 1.1.7-3
 Obsoletes:      xine-lib-extras < 1.1.7-3
 
@@ -166,7 +164,7 @@
 Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 
 %description    extras
 This package contains extra plugins for %{name}:
@@ -210,9 +208,6 @@
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 
-%patch100 -p1 -b .safe_audio_pause
-%patch101 -p0 -b .add-mime-for-mod
-
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -292,142 +287,142 @@
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{abiver}/
-%{_libdir}/xine/plugins/%{abiver}/mime.types
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/
+%{_libdir}/xine/plugins/%{plugin_abi}/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{abiver}/post/
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/post/
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{abiver}/vidix/
-%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/vidix/
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/savage_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/sis_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/unichrome_vid.so
 %endif # vidix
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_ts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
 %if %{with_xcb}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %endif # xcb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
 %if 0%{!?_without_arts:1}
 %files arts
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
 %endif
 
 %if %{with_pa}
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
 %endif
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
 %if %{with_aalib}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
 %endif # aalib
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xdirectfb.so
 %endif # directfb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -444,6 +439,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
+- xine-lib-1.1.16.3, plugin-abi 1.26
+
 * Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-6
 - add-mime-for-mod.patch 
 
@@ -472,7 +470,7 @@
 - safe-audio-pause patch (kdebug#180339)
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-2
-- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver}
+- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{plugin_abi}
 - touchup Summary/Description
 
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1


--- xine-lib-add-mime-for-mod.patch DELETED ---


--- xine-lib-safe-audio-pause3.patch DELETED ---



From atkac at fedoraproject.org  Fri Apr  3 17:08:19 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri,  3 Apr 2009 17:08:19 +0000 (UTC)
Subject: rpms/tigervnc/devel vncserver.init, NONE, 1.1 vncserver.sysconfig, 
	NONE, 1.1 vncviewer.desktop, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 tigervnc.spec, 1.1,
	1.2 tigervnc-clipboard.patch, 1.1, NONE tigervnc-rh212985.patch,
	1.1, NONE tigervnc-xclients.patch, 1.1, NONE
Message-ID: <20090403170819.EE66870134@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15012

Modified Files:
	.cvsignore sources tigervnc.spec 
Added Files:
	vncserver.init vncserver.sysconfig vncviewer.desktop 
Removed Files:
	tigervnc-clipboard.patch tigervnc-rh212985.patch 
	tigervnc-xclients.patch 
Log Message:
- update to r3751
- patches merged
  - tigervnc-xclients.patch
  - tigervnc-clipboard.patch
  - tigervnc-rh212985.patch
- basic RandR support in Xvnc (resize of the desktop)
- use built-in libjpeg (SSE2/MMX accelerated encoding on x86 platform)
- use Tight encoding by default
- use TigerVNC icons



--- NEW FILE vncserver.init ---
#!/bin/bash
#
# chkconfig: - 91 35
# description: Starts and stops vncserver. \
#	       used to provide remote X administration services.

### BEGIN INIT INFO
# Provides: vncserver
# Required-Start: $network $named
# Required-Stop: $network $named
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start|stop|restart|try-restart|status|force-reload vncserver
# Description: control vncserver which exports your desktop
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -r /etc/sysconfig/vncservers ] && . /etc/sysconfig/vncservers

prog=$"VNC server"

RETVAL=0

start() {
    # Source networking configuration.
    . /etc/sysconfig/network

    # Check that networking is up.
    [ ${NETWORKING} = "no" ] && exit 1

    [ -x /usr/bin/vncserver ] || exit 5
    [ -x /usr/bin/Xvnc ] || exit 5

    echo -n $"Starting $prog: "
    RETVAL=0
    if [ ! -d /tmp/.X11-unix ]
    then
        mkdir -m 1777 /tmp/.X11-unix || :
        restorecon /tmp/.X11-unix 2>/dev/null || :
    fi

    for display in ${VNCSERVERS}
    do
        SERVS=1
        echo -n "${display} "
	DISP="${display%%:*}"
	USER="${display##*:}"
	VNCUSERARGS="${VNCSERVERARGS[${DISP}]}"
        runuser -l ${USER} -c "cd ~${USER} && [ -r .vnc/passwd ] && vncserver :${DISP} ${VNCUSERARGS}"
        RETVAL=$?
        [ "$RETVAL" -eq 0 ] || break
    done
    if [ -z "$SERVS" ]; then
        echo -n "no displays configured "
        failure
        RETVAL=6
    else
        if [ "$RETVAL" -eq 0 ]; then
	    success $"vncserver startup"
	    touch /var/lock/subsys/vncserver
        else 
            failure $"vncserver start"
        fi
    fi
    echo
    return "$RETVAL"
}

stop() {
    echo -n $"Shutting down $prog: "
    for display in ${VNCSERVERS}
    do
        echo -n "${display} "
	export USER="${display##*:}"
	runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
    done
    RETVAL=$?
    [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
        failure $"vncserver shutdown"
    echo
    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver
    return "$RETVAL"
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart|force-reload)
	stop
	sleep 3
	start
	;;
  condrestart)
	echo "condrestart is obsolete, use try-restart instead"
	if [ -e /var/lock/subsys/vncserver ]; then
	    stop
	    sleep 3
	    start
	fi
	;;
  try-restart)
        if [ -e /var/lock/subsys/vncserver ]; then
            stop
            sleep 3
            start
        fi
        ;;
  status)
	status Xvnc
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|try-restart|status|force-reload}"
	exit 3
esac

exit "$RETVAL"



--- NEW FILE vncserver.sysconfig ---
# The VNCSERVERS variable is a list of display:user pairs.
#
# Uncomment the lines below to start a VNC server on display :2
# as my 'myusername' (adjust this to your own).  You will also
# need to set a VNC password; run 'man vncpasswd' to see how
# to do that.  
#
# DO NOT RUN THIS SERVICE if your local area network is
# untrusted!  For a secure way of using VNC, see
# <URL:http://www.uk.research.att.com/archive/vnc/sshvnc.html>.

# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.

# Use "-nohttpd" to prevent web-based VNC clients connecting.

# Use "-localhost" to prevent remote VNC clients connecting except when
# doing so through a secure tunnel.  See the "-via" option in the
# `man vncviewer' manual page.

# VNCSERVERS="2:myusername"
# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -nohttpd -localhost"


--- NEW FILE vncviewer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=TigerVNC Viewer
Comment=Connect to VNC server and display remote desktop
Exec=/usr/bin/vncviewer
Icon=tigervnc
Terminal=false
Type=Application
StartupWMClass=TigerVNC Viewer: Connection Details
Categories=Network;Application;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 21:02:04 -0000	1.2
+++ .cvsignore	3 Apr 2009 17:07:49 -0000	1.3
@@ -1,7 +1 @@
-tigervnc-0.0.90-20090303svn3631.tar.bz2
-vncserver.init
-vncserver.sysconfig
-vnc-16x16.png
-vnc-24x24.png
-vnc-48x48.png
-vncviewer.desktop
+tigervnc-0.0.90-20090403svn3751.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Mar 2009 21:02:04 -0000	1.2
+++ sources	3 Apr 2009 17:07:49 -0000	1.3
@@ -1,7 +1 @@
-8d262508edb0e18d9d114fc56955e2ed  tigervnc-0.0.90-20090303svn3631.tar.bz2
-ededd32e8bc5364c4bf41552d0b56b96  vncserver.init
-833229c4a91fd869ca8a4d1c5d189a15  vncserver.sysconfig
-2f19f562d4ff6b8752c1686331ce44b7  vnc-16x16.png
-273f51f58324f12e2cc96e2a1dcc5a6d  vnc-24x24.png
-f96d936a0fcc61cabee0e6cb65e0e38a  vnc-48x48.png
-2531d7bbc8369fb23e4cb1578521edc6  vncviewer.desktop
+34f63ea8b071b0e1996ac467455ee4c2  tigervnc-0.0.90-20090403svn3751.tar.bz2


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tigervnc.spec	3 Mar 2009 21:03:40 -0000	1.1
+++ tigervnc.spec	3 Apr 2009 17:07:49 -0000	1.2
@@ -1,10 +1,10 @@
-%define		revision	3631
-%define		date		20090303
-%define		releasetag	%{date}svn%{revision}
+%define	revision	3751
+%define	date		20090403
+%define	releasetag	%{date}svn%{revision}
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.3.%{releasetag}%{?dist}
+Release:	0.3.1.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -22,9 +22,6 @@
 Source0:	%{name}-%{version}-%{releasetag}.tar.bz2
 Source1:	vncserver.init
 Source2:	vncserver.sysconfig
-Source3:	vnc-16x16.png
-Source4:	vnc-24x24.png
-Source5:	vnc-48x48.png
 Source6:	vncviewer.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +30,15 @@
 BuildRequires:	xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:	libdrm-devel, libXt-devel, pixman-devel libXfont-devel
 BuildRequires:	libxkbfile-devel, openssl-devel, libpciaccess-devel
-BuildRequires:	libjpeg-devel, mesa-libGL-devel, libXinerama-devel
+BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
 BuildRequires:  freetype-devel
 BuildRequires:	desktop-file-utils
 
+%ifarch %ix86
+BuildRequires: nasm
+%endif
+
+
 Requires(post):	coreutils	
 Requires(postun):coreutils	
 
@@ -47,12 +49,9 @@
 
 Patch0:		tigervnc-102434.patch
 Patch1:		tigervnc-bounds.patch
-Patch2:		tigervnc-xclients.patch
-Patch3:		tigervnc-clipboard.patch
 Patch4:		tigervnc-cookie.patch
 Patch5:		tigervnc-manminor.patch
 Patch6:		tigervnc-newfbsize.patch
-Patch7:		tigervnc-rh212985.patch
 Patch8:		tigervnc-viewer-reparent.patch
 
 %description
@@ -107,12 +106,9 @@
 
 %patch0 -p1 -b .102434
 %patch1 -p1 -b .bounds
-%patch2 -p1 -b .xclients
-%patch3 -p1 -b .clipboard
 %patch4 -p1 -b .cookie
 %patch5 -p1 -b .manminor
 %patch6 -p1 -b .newfbsize
-%patch7 -p1 -b .rh212985
 %patch8 -p1 -b .viewer-reparent
 
 # Use newer gettext
@@ -155,6 +151,11 @@
 make %{?_smp_mflags}
 popd
 
+# Build icons
+pushd media
+make
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd unix
@@ -174,9 +175,12 @@
 
 # Install desktop stuff
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png
-install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png
+
+pushd media/icons
+for s in 16 24 48; do
+install -m644 tigervnc_$s.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x$s/apps/tigervnc.png
+done
+popd
 
 mkdir $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -245,6 +249,17 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Fri Apr 03 2009 Adam Tkac <atkac redhat com> 0.0.90-0.4.20090403svn3751
+- update to r3751
+- patches merged
+  - tigervnc-xclients.patch
+  - tigervnc-clipboard.patch
+  - tigervnc-rh212985.patch
+- basic RandR support in Xvnc (resize of the desktop)
+- use built-in libjpeg (SSE2/MMX accelerated encoding on x86 platform)
+- use Tight encoding by default
+- use TigerVNC icons
+
 * Tue Mar 03 2009 Adam Tkac <atkac redhat com> 0.0.90-0.3.20090303svn3631
 - update to r3631
 


--- tigervnc-clipboard.patch DELETED ---


--- tigervnc-rh212985.patch DELETED ---


--- tigervnc-xclients.patch DELETED ---



From mtasaka at fedoraproject.org  Fri Apr  3 17:10:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  3 Apr 2009 17:10:11 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.357, 1.358 jd.spec, 1.415, 1.416 sources,
	1.358, 1.359
Message-ID: <20090403171011.2717E70134@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15542

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- .cvsignore	1 Apr 2009 05:40:51 -0000	1.357
+++ .cvsignore	3 Apr 2009 17:09:40 -0000	1.358
@@ -1 +1 @@
-jd-2.4.0-svn2758_trunk.tgz
+jd-2.4.0-svn2761_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- jd.spec	1 Apr 2009 05:40:51 -0000	1.415
+++ jd.spec	3 Apr 2009 17:09:40 -0000	1.416
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2758_trunk
+%define         strtag        svn2761_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Apr  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- sources	1 Apr 2009 05:40:51 -0000	1.358
+++ sources	3 Apr 2009 17:09:40 -0000	1.359
@@ -1 +1 @@
-150ca247b665197ce029f330bc0930ee  jd-2.4.0-svn2758_trunk.tgz
+dc36dd9c270abe097c16aa5892f114f3  jd-2.4.0-svn2761_trunk.tgz



From markmc at fedoraproject.org  Fri Apr  3 17:10:13 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  3 Apr 2009 17:10:13 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-display-breakage.patch, NONE, 1.1 qemu.spec,
	1.74, 1.75
Message-ID: <20090403171013.7BFCF70134@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15569

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-display-breakage.patch 
Log Message:
* Fri Apr  3 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-5
- Fix vga segfault under kvm-autotest (#494002)
- Kill kernelrelease hack; it's not needed
- Build with "make V=1" for more verbose logs


qemu-fix-display-breakage.patch:

--- NEW FILE qemu-fix-display-breakage.patch ---
>From 8ad63a93a482d5c3354b97463633394456a157d5 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi at redhat.com>
Date: Thu, 2 Apr 2009 22:17:50 +0300
Subject: [PATCH 1/1] kvm: qemu: Fix display breakage when resizing the screen

When the vga resolution changes, a new display surface is not allocated
immediately; instead that is deferred until the next update.  However,
if we're running without a display client attached, that won't happen
and the next bitblt is likely to cause a segfault by overflowing the
display surface.

Fix by reallocating the display immediately when the resolution changes.

Signed-off-by: Avi Kivity <avi at redhat.com>
---
 qemu/hw/cirrus_vga.c |   10 ++-
 qemu/hw/vga.c        |  205 +++++++++++++++++++++++++++++--------------------
 qemu/hw/vga_int.h    |    4 +
 3 files changed, 134 insertions(+), 85 deletions(-)

diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c
index 0ab0f14..7bd0482 100644
--- a/qemu/hw/cirrus_vga.c
+++ b/qemu/hw/cirrus_vga.c
@@ -1399,6 +1399,8 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value)
 	break;
     }
 
+    vga_update_resolution((VGAState *)s);
+
     return CIRRUS_HOOK_HANDLED;
 }
 
@@ -1426,6 +1428,7 @@ static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value)
 #endif
     }
     s->cirrus_hidden_dac_lockindex = 0;
+    vga_update_resolution((VGAState *)s);
 }
 
 /***************************************
@@ -1712,6 +1715,8 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value)
 	break;
     }
 
+    vga_update_resolution((VGAState *)s);
+
     return CIRRUS_HOOK_HANDLED;
 }
 
@@ -2839,6 +2844,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
 	if (s->ar_flip_flop == 0) {
 	    val &= 0x3f;
 	    s->ar_index = val;
+            vga_update_resolution((VGAState *)s);
 	} else {
 	    index = s->ar_index & 0x1f;
 	    switch (index) {
@@ -2932,6 +2938,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
 	    /* can always write bit 4 of CR7 */
 	    if (s->cr_index == 7)
 		s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10);
+            vga_update_resolution((VGAState *)s);
 	    return;
 	}
 	switch (s->cr_index) {
@@ -3166,7 +3173,8 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id)
 
     cirrus_update_memory_access(s);
     /* force refresh */
-    s->graphic_mode = -1;
+    vga_update_resolution((VGAState *)s);
+    s->want_full_update = 1;
     cirrus_update_bank_ptr(s, 0);
     cirrus_update_bank_ptr(s, 1);
     return 0;
diff --git a/qemu/hw/vga.c b/qemu/hw/vga.c
index d4fddf9..9a950d3 100644
--- a/qemu/hw/vga.c
+++ b/qemu/hw/vga.c
@@ -37,6 +37,10 @@
 
 //#define DEBUG_BOCHS_VBE
 
+#define GMODE_TEXT     0
+#define GMODE_GRAPH    1
+#define GMODE_BLANK 2
+
 /* force some bits to zero */
 const uint8_t sr_mask[8] = {
     (uint8_t)~0xfc,
@@ -394,6 +398,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
         if (s->ar_flip_flop == 0) {
             val &= 0x3f;
             s->ar_index = val;
+            vga_update_resolution(s);
         } else {
             index = s->ar_index & 0x1f;
             switch(index) {
@@ -434,6 +439,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
 #endif
         s->sr[s->sr_index] = val & sr_mask[s->sr_index];
         if (s->sr_index == 1) s->update_retrace_info(s);
+        vga_update_resolution(s);
         break;
     case 0x3c7:
         s->dac_read_index = val;
@@ -461,6 +467,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
         printf("vga: write GR%x = 0x%02x\n", s->gr_index, val);
 #endif
         s->gr[s->gr_index] = val & gr_mask[s->gr_index];
+        vga_update_resolution(s);
         break;
     case 0x3b4:
     case 0x3d4:
@@ -476,6 +483,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
             /* can always write bit 4 of CR7 */
             if (s->cr_index == 7)
                 s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10);
+            vga_update_resolution(s);
             return;
         }
         switch(s->cr_index) {
@@ -503,6 +511,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
             s->update_retrace_info(s);
             break;
         }
+        vga_update_resolution(s);
         break;
     case 0x3ba:
     case 0x3da:
@@ -582,11 +591,13 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
             if ((val <= VBE_DISPI_MAX_XRES) && ((val & 7) == 0)) {
                 s->vbe_regs[s->vbe_index] = val;
             }
+            vga_update_resolution(s);
             break;
         case VBE_DISPI_INDEX_YRES:
             if (val <= VBE_DISPI_MAX_YRES) {
                 s->vbe_regs[s->vbe_index] = val;
             }
+            vga_update_resolution(s);
             break;
         case VBE_DISPI_INDEX_BPP:
             if (val == 0)
@@ -595,6 +606,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
                 val == 16 || val == 24 || val == 32) {
                 s->vbe_regs[s->vbe_index] = val;
             }
+            vga_update_resolution(s);
             break;
         case VBE_DISPI_INDEX_BANK:
             if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) {
@@ -663,6 +675,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
             }
             s->dac_8bit = (val & VBE_DISPI_8BIT_DAC) > 0;
             s->vbe_regs[s->vbe_index] = val;
+            vga_update_resolution(s);
             break;
         case VBE_DISPI_INDEX_VIRT_WIDTH:
             {
@@ -683,6 +696,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
                 s->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = h;
                 s->vbe_line_offset = line_offset;
             }
+            vga_update_resolution(s);
             break;
         case VBE_DISPI_INDEX_X_OFFSET:
         case VBE_DISPI_INDEX_Y_OFFSET:
@@ -697,6 +711,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
                     s->vbe_start_addr += x * ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3);
                 s->vbe_start_addr >>= 2;
             }
+            vga_update_resolution(s);
             break;
         default:
             break;
@@ -1300,7 +1315,6 @@ static void vga_draw_text(VGAState *s, int full_update)
         s->plane_updated = 0;
         full_update = 1;
     }
-    full_update |= update_basic_params(s);
 
     line_offset = s->line_offset;
     s1 = s->vram_ptr + (s->start_addr * 4);
@@ -1312,18 +1326,6 @@ static void vga_draw_text(VGAState *s, int full_update)
         return;
     }
 
-    if (width != s->last_width || height != s->last_height ||
-        cw != s->last_cw || cheight != s->last_ch || s->last_depth) {
-        s->last_scr_width = width * cw;
-        s->last_scr_height = height * cheight;
-        qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height);
-        s->last_depth = 0;
-        s->last_width = width;
-        s->last_height = height;
-        s->last_ch = cheight;
-        s->last_cw = cw;
-        full_update = 1;
-    }
     s->rgb_to_pixel =
         rgb_to_pixel_dup_table[get_depth_index(s->ds)];
     full_update |= update_palette16(s);
@@ -1580,40 +1582,20 @@ static void vga_sync_dirty_bitmap(VGAState *s)
     vga_dirty_log_start(s);
 }
 
-/*
- * graphic modes
- */
-static void vga_draw_graphic(VGAState *s, int full_update)
+static void vga_update_resolution_graphics(VGAState *s)
 {
-    int y1, y, update, linesize, y_start, double_scan, mask, depth;
-    int width, height, shift_control, line_offset, bwidth, bits;
+    int depth = s->get_bpp(s);
+    int width, height, shift_control, double_scan;
     int disp_width, multi_scan, multi_run;
-    uint8_t *d;
-    uint32_t v, addr1, addr;
-    long page0, page1, page_min, page_max;
-    vga_draw_line_func *vga_draw_line;
-
-    full_update |= update_basic_params(s);
-
-    if (!full_update)
-        vga_sync_dirty_bitmap(s);
 
     s->get_resolution(s, &width, &height);
-    disp_width = width;
 
     shift_control = (s->gr[0x05] >> 5) & 3;
     double_scan = (s->cr[0x09] >> 7);
-    if (shift_control != 1) {
-        multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1;
-    } else {
-        /* in CGA modes, multi_scan is ignored */
-        /* XXX: is it correct ? */
-        multi_scan = double_scan;
-    }
-    multi_run = multi_scan;
+
     if (shift_control != s->shift_control ||
         double_scan != s->double_scan) {
-        full_update = 1;
+        s->want_full_update = 1;
         s->shift_control = shift_control;
         s->double_scan = double_scan;
     }
@@ -1627,12 +1609,25 @@ static void vga_draw_graphic(VGAState *s, int full_update)
             disp_width <<= 1;
         }
     }
+    disp_width = width;
+
+    if (shift_control != 1) {
+        multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1;
+    } else {
+        /* in CGA modes, multi_scan is ignored */
+        /* XXX: is it correct ? */
+        multi_scan = double_scan;
+    }
+
+    multi_run = multi_scan;
 
-    depth = s->get_bpp(s);
     if (s->line_offset != s->last_line_offset ||
         disp_width != s->last_width ||
         height != s->last_height ||
-        s->last_depth != depth) {
+        s->last_depth != depth ||
+        s->multi_run != multi_run ||
+        s->multi_scan != multi_scan ||
+        s->want_full_update) {
 #if defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
         if (depth == 16 || depth == 32) {
 #else
@@ -1659,8 +1654,74 @@ static void vga_draw_graphic(VGAState *s, int full_update)
         s->last_height = height;
         s->last_line_offset = s->line_offset;
         s->last_depth = depth;
-        full_update = 1;
-    } else if (is_graphic_console() && is_buffer_shared(s->ds->surface) &&
+        s->multi_run = multi_run;
+        s->multi_scan = multi_scan;
+        s->want_full_update = 1;
+    }
+}
+
+static void vga_update_resolution_text(VGAState *s)
+{
+    int width, height, cw, cheight;
+
+    vga_get_text_resolution(s, &width, &height, &cw, &cheight);
+    if (width != s->last_width || height != s->last_height ||
+        cw != s->last_cw || cheight != s->last_ch || s->last_depth) {
+        s->last_scr_width = width * cw;
+        s->last_scr_height = height * cheight;
+        qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height);
+        s->last_depth = 0;
+        s->last_width = width;
+        s->last_height = height;
+        s->last_ch = cheight;
+        s->last_cw = cw;
+        s->want_full_update = 1;
+    }
+}
+
+void vga_update_resolution(VGAState *s)
+{
+    int graphic_mode;
+
+    if (!(s->ar_index & 0x20)) {
+        graphic_mode = GMODE_BLANK;
+    } else {
+        graphic_mode = s->gr[6] & 1;
+    }
+    if (graphic_mode != s->graphic_mode) {
+        s->graphic_mode = graphic_mode;
+        s->want_full_update = 1;
+    }
+    s->want_full_update |= update_basic_params(s);
+    switch (graphic_mode) {
+    case GMODE_TEXT:
+        vga_update_resolution_text(s);
+        break;
+    case GMODE_GRAPH:
+        vga_update_resolution_graphics(s);
+        break;
+    }
+}
+
+/*
+ * graphic modes
+ */
+static void vga_draw_graphic(VGAState *s, int full_update)
+{
+    int y1, y, update, linesize, y_start, mask;
+    int width, height, line_offset, bwidth, bits;
+    int multi_run;
+    uint8_t *d;
+    uint32_t v, addr1, addr;
+    long page0, page1, page_min, page_max;
+    vga_draw_line_func *vga_draw_line;
+
+    if (!full_update)
+        vga_sync_dirty_bitmap(s);
+
+    s->get_resolution(s, &width, &height);
+    multi_run = s->multi_run;
+    if (is_graphic_console() && is_buffer_shared(s->ds->surface) &&
                (full_update || s->ds->surface->data != s->vram_ptr + (s->start_addr * 4))) {
         s->ds->surface->data = s->vram_ptr + (s->start_addr * 4);
         dpy_setdata(s->ds);
@@ -1669,7 +1730,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
     s->rgb_to_pixel =
         rgb_to_pixel_dup_table[get_depth_index(s->ds)];
 
-    if (shift_control == 0) {
+    if (s->shift_control == 0) {
         full_update |= update_palette16(s);
         if (s->sr[0x01] & 8) {
             v = VGA_DRAW_LINE4D2;
@@ -1677,7 +1738,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
             v = VGA_DRAW_LINE4;
         }
         bits = 4;
-    } else if (shift_control == 1) {
+    } else if (s->shift_control == 1) {
         full_update |= update_palette16(s);
         if (s->sr[0x01] & 8) {
             v = VGA_DRAW_LINE2D2;
@@ -1773,7 +1834,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
             if (y_start >= 0) {
                 /* flush to display */
                 dpy_update(s->ds, 0, y_start,
-                           disp_width, y - y_start);
+                           s->last_width, y - y_start);
                 y_start = -1;
             }
         }
@@ -1782,7 +1843,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
             if ((y1 & mask) == mask)
                 addr1 += line_offset;
             y1++;
-            multi_run = multi_scan;
+            multi_run = s->multi_scan;
         } else {
             multi_run--;
         }
@@ -1794,7 +1855,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
     if (y_start >= 0) {
         /* flush to display */
         dpy_update(s->ds, 0, y_start,
-                   disp_width, y - y_start);
+                   s->last_width, y - y_start);
     }
     /* reset modified pages */
     if (page_max != -1) {
@@ -1831,29 +1892,17 @@ static void vga_draw_blank(VGAState *s, int full_update)
                s->last_scr_width, s->last_scr_height);
 }
 
-#define GMODE_TEXT     0
-#define GMODE_GRAPH    1
-#define GMODE_BLANK 2
-
 static void vga_update_display(void *opaque)
 {
     VGAState *s = (VGAState *)opaque;
-    int full_update, graphic_mode;
+    int full_update;
 
     if (ds_get_bits_per_pixel(s->ds) == 0) {
         /* nothing to do */
     } else {
-        full_update = 0;
-        if (!(s->ar_index & 0x20)) {
-            graphic_mode = GMODE_BLANK;
-        } else {
-            graphic_mode = s->gr[6] & 1;
-        }
-        if (graphic_mode != s->graphic_mode) {
-            s->graphic_mode = graphic_mode;
-            full_update = 1;
-        }
-        switch(graphic_mode) {
+        full_update = s->want_full_update;
+        s->want_full_update = 0;
+        switch(s->graphic_mode) {
         case GMODE_TEXT:
             vga_draw_text(s, full_update);
             break;
@@ -1876,8 +1925,8 @@ static void vga_invalidate_display(void *opaque)
 {
     VGAState *s = (VGAState *)opaque;
 
-    s->last_width = -1;
-    s->last_height = -1;
+    vga_update_resolution(s);
+    s->want_full_update = 1;
 }
 
 void vga_reset(void *opaque)
@@ -1921,7 +1970,6 @@ void vga_reset(void *opaque)
     s->vbe_bank_mask = (s->vram_size >> 16) - 1;
 #endif
     memset(s->font_offsets, '\0', sizeof(s->font_offsets));
-    s->graphic_mode = -1; /* force full update */
     s->shift_control = 0;
     s->double_scan = 0;
     s->line_offset = 0;
@@ -1947,6 +1995,7 @@ void vga_reset(void *opaque)
         memset(&s->retrace_info, 0, sizeof (s->retrace_info));
         break;
     }
+    vga_update_resolution(s);
 }
 
 #define TEXTMODE_X(x)	((x) % width)
@@ -1965,24 +2014,9 @@ static void vga_update_text(void *opaque, console_ch_t *chardata)
     char msg_buffer[80];
     int full_update = 0;
 
-    if (!(s->ar_index & 0x20)) {
-        graphic_mode = GMODE_BLANK;
-    } else {
-        graphic_mode = s->gr[6] & 1;
-    }
-    if (graphic_mode != s->graphic_mode) {
-        s->graphic_mode = graphic_mode;
-        full_update = 1;
-    }
-    if (s->last_width == -1) {
-        s->last_width = 0;
-        full_update = 1;
-    }
-
     switch (graphic_mode) {
     case GMODE_TEXT:
         /* TODO: update palette */
-        full_update |= update_basic_params(s);
 
         /* total width & height */
         cheight = (s->cr[9] & 0x1f) + 1;
@@ -2224,7 +2258,8 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id)
 #endif
 
     /* force refresh */
-    s->graphic_mode = -1;
+    vga_update_resolution(s);
+    s->want_full_update = 1;
     return 0;
 }
 
@@ -2418,7 +2453,8 @@ void vga_bios_init(VGAState *s)
     memcpy(s->palette, palette_model, 192);
 
     s->bank_offset = 0;
-    s->graphic_mode = -1;
+    vga_update_resolution(s);
+    s->want_full_update = 1;
 
     /* TODO: add vbe support if enabled */
 }
@@ -2803,7 +2839,8 @@ static void vga_screen_dump_common(VGAState *s, const char *filename,
     ds->surface = qemu_create_displaysurface(w, h, 32, 4 * w);
 
     s->ds = ds;
-    s->graphic_mode = -1;
+    vga_update_resolution(s);
+    s->want_full_update = 1;
     vga_update_display(s);
 
     ppm_save(filename, ds->surface);
diff --git a/qemu/hw/vga_int.h b/qemu/hw/vga_int.h
index 8ba8a60..71ffeb5 100644
--- a/qemu/hw/vga_int.h
+++ b/qemu/hw/vga_int.h
@@ -147,8 +147,11 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s);
     DisplayState *ds;                                                   \
     uint32_t font_offsets[2];                                           \
     int graphic_mode;                                                   \
+    int want_full_update;                                               \
     uint8_t shift_control;                                              \
     uint8_t double_scan;                                                \
+    uint8_t multi_run;                                                  \
+    uint8_t multi_scan;                                                 \
     uint32_t line_offset;                                               \
     uint32_t line_compare;                                              \
     uint32_t start_addr;                                                \
@@ -195,6 +198,7 @@ void vga_common_init(VGAState *s, uint8_t *vga_ram_base,
                      ram_addr_t vga_ram_offset, int vga_ram_size);
 void vga_init(VGAState *s);
 void vga_reset(void *s);
+void vga_update_resolution(VGAState *s);
 
 void vga_dirty_log_start(VGAState *s);
 void vga_dirty_log_stop(VGAState *s);
-- 
1.6.0.6



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- qemu.spec	2 Apr 2009 03:51:08 -0000	1.74
+++ qemu.spec	3 Apr 2009 17:09:43 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -35,6 +35,7 @@
 Patch11: qemu-fix-gcc.patch
 Patch12: qemu-roms-more-room.patch
 Patch13: qemu-bios-bigger-roms.patch
+Patch14: qemu-fix-display-breakage.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -212,6 +213,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -231,8 +233,6 @@
 fi
 
 %ifarch %{ix86} x86_64
-# build kvm
-echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
 # sdl outputs to alsa or pulseaudio directly depending on what the system has configured
 # alsa works, but causes huge CPU load due to bugs
 # oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire
@@ -244,7 +244,7 @@
             --qemu-ldflags=$extraldflags \
             --qemu-cflags="$RPM_OPT_FLAGS"
 
-make %{?_smp_mflags} $buildldflags
+make V=1 %{?_smp_mflags} $buildldflags
 cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm
 cp user/kvmtrace  .
 cp user/kvmtrace_format  .
@@ -455,6 +455,11 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Apr  3 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-5
+- Fix vga segfault under kvm-autotest (#494002)
+- Kill kernelrelease hack; it's not needed
+- Build with "make V=1" for more verbose logs
+
 * Thu Apr 02 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-4
 - Support botting gpxe roms.
 



From mtasaka at fedoraproject.org  Fri Apr  3 17:16:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  3 Apr 2009 17:16:47 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.357, 1.358 jd.spec, 1.406, 1.407 sources, 
	1.358, 1.359
Message-ID: <20090403171647.3502B70134@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16564

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- .cvsignore	1 Apr 2009 06:56:39 -0000	1.357
+++ .cvsignore	3 Apr 2009 17:16:16 -0000	1.358
@@ -1 +1 @@
-jd-2.4.0-svn2758_trunk.tgz
+jd-2.4.0-svn2761_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- jd.spec	1 Apr 2009 06:56:39 -0000	1.406
+++ jd.spec	3 Apr 2009 17:16:16 -0000	1.407
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2758_trunk
+%define         strtag        svn2761_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Apr  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- sources	1 Apr 2009 06:56:39 -0000	1.358
+++ sources	3 Apr 2009 17:16:16 -0000	1.359
@@ -1 +1 @@
-150ca247b665197ce029f330bc0930ee  jd-2.4.0-svn2758_trunk.tgz
+dc36dd9c270abe097c16aa5892f114f3  jd-2.4.0-svn2761_trunk.tgz



From berrange at fedoraproject.org  Fri Apr  3 17:17:34 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  3 Apr 2009 17:17:34 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.400.3-selinux-context.patch, 
	NONE, 1.1 python-virtinst.spec, 1.61, 1.62
Message-ID: <20090403171734.D7A8E70134@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16782

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-selinux-context.patch 
Log Message:
Set SELinux context on $HOME/.virtinst to make kernel/initrd boot work (rhbz #491052)

virtinst-0.400.3-selinux-context.patch:

--- NEW FILE virtinst-0.400.3-selinux-context.patch ---
diff -rup virtinst-0.400.3.orig/virtinst/Installer.py virtinst-0.400.3.new/virtinst/Installer.py
--- virtinst-0.400.3.orig/virtinst/Installer.py	2009-03-10 03:32:15.000000000 +0000
+++ virtinst-0.400.3.new/virtinst/Installer.py	2009-04-03 18:15:10.000000000 +0100
@@ -136,12 +136,28 @@ class Installer(object):
     def get_scratchdir(self):
         if platform.system() == 'SunOS':
             return '/var/tmp'
-        if self.type == "xen" and os.path.exists(XEN_SCRATCH):
+        if os.geteuid() == 0 and self.type == "xen" and os.path.exists(XEN_SCRATCH):
             return XEN_SCRATCH
         if os.geteuid() == 0 and os.path.exists(LIBVIRT_SCRATCH):
             return LIBVIRT_SCRATCH
-        else:
-            return os.path.expanduser("~/.virtinst/boot")
+
+        appdir = os.path.expanduser("~/.virtinst")
+        bootdir = appdir + "/boot"
+        # Try and make directory immediately and set selinux
+        # context if possible
+        try:
+            import selinux
+            if not os.access(appdir, os.W_OK):
+                os.mkdir(appdir)
+            if not os.access(bootdir, os.W_OK):
+                os.mkdir(bootdir)
+            selinux.restorecon(bootdir, recursive=True)
+            logging.info("Restored SELinux context on %s" % bootdir)
+        except Exception, e:
+            logging.error("Unable to restore SELinux context on %s: %s" % (bootdir, str(e)))
+            pass
+
+        return bootdir
     scratchdir = property(get_scratchdir)
 
     def get_cdrom(self):


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- python-virtinst.spec	23 Mar 2009 20:56:47 -0000	1.61
+++ python-virtinst.spec	3 Apr 2009 17:17:04 -0000	1.62
@@ -17,11 +17,12 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
 Patch3: %{appname}-%{version}-spanish-trans.patch
+Patch4: %{appname}-%{version}-selinux-context.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 python setup.py build
@@ -85,6 +87,9 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.3-fc11
+- Set SELinux context on $HOME/.virtinst to make kernel/initrd boot work (rhbz #491052)
+
 * Mon Mar 23 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-2.fc11
 - Add spanish translation (bz 480816)
 - Fix calls to libvirt host device detach/reset



From kkofler at fedoraproject.org  Fri Apr  3 17:19:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  3 Apr 2009 17:19:45 +0000 (UTC)
Subject: rpms/kdegraphics/F-10
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch, NONE,
	1.1 kdegraphics.spec, 1.189, 1.190
Message-ID: <20090403171945.3C2D270134@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17004/F-10

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch 
Log Message:
Sync from devel:

* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
- work around Kolourpaint crash with Qt 4.5 (kde#183850)

kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch:

--- NEW FILE kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch ---
diff -ur kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp
--- kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2008-12-21 21:19:06.000000000 +0100
+++ kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2009-04-03 15:23:49.000000000 +0200
@@ -252,7 +252,7 @@
         // Copy RGB layer.
         *destPixmapPtr = QPixmap (oldPixmap.width (), oldPixmap.height ());
         QPainter p (destPixmapPtr);
-        p.drawPixmap (QPoint (0, 0), oldPixmap);
+        p.drawImage (QPoint (0, 0), oldPixmap.toImage());
         p.end ();
 
         // Copy mask layer (if any).


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- kdegraphics.spec	1 Apr 2009 23:20:07 -0000	1.189
+++ kdegraphics.spec	3 Apr 2009 17:19:14 -0000	1.190
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -17,6 +17,9 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
+# work around Kolourpaint crash with Qt 4.5 (kde#183850)
+# patch from the upstream bug report
+Patch0:         kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -90,6 +93,7 @@
 
 %prep
 %setup -q -n kdegraphics-%{version}
+%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 # upstream patches
 
@@ -219,6 +223,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
+- work around Kolourpaint crash with Qt 4.5 (kde#183850)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From kkofler at fedoraproject.org  Fri Apr  3 17:19:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  3 Apr 2009 17:19:45 +0000 (UTC)
Subject: rpms/kdegraphics/F-9
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch, NONE,
	1.1 kdegraphics.spec, 1.166, 1.167
Message-ID: <20090403171945.85FA570134@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17004/F-9

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch 
Log Message:
Sync from devel:

* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
- work around Kolourpaint crash with Qt 4.5 (kde#183850)

kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch:

--- NEW FILE kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch ---
diff -ur kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp
--- kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2008-12-21 21:19:06.000000000 +0100
+++ kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2009-04-03 15:23:49.000000000 +0200
@@ -252,7 +252,7 @@
         // Copy RGB layer.
         *destPixmapPtr = QPixmap (oldPixmap.width (), oldPixmap.height ());
         QPainter p (destPixmapPtr);
-        p.drawPixmap (QPoint (0, 0), oldPixmap);
+        p.drawImage (QPoint (0, 0), oldPixmap.toImage());
         p.end ();
 
         // Copy mask layer (if any).


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdegraphics.spec	1 Apr 2009 23:22:07 -0000	1.166
+++ kdegraphics.spec	3 Apr 2009 17:19:15 -0000	1.167
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -17,6 +17,9 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
+# work around Kolourpaint crash with Qt 4.5 (kde#183850)
+# patch from the upstream bug report
+Patch0:         kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -90,6 +93,7 @@
 
 %prep
 %setup -q -n kdegraphics-%{version}
+%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 # upstream patches
 
@@ -219,6 +223,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
+- work around Kolourpaint crash with Qt 4.5 (kde#183850)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From atorkhov at fedoraproject.org  Fri Apr  3 17:20:08 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri,  3 Apr 2009 17:20:08 +0000 (UTC)
Subject: rpms/btanks/F-10 btanks-0.8-rename-lib.patch, NONE, 1.1 btanks.spec,
	1.1, 1.2
Message-ID: <20090403172008.5047B70134@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/btanks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17074

Modified Files:
	btanks.spec 
Added Files:
	btanks-0.8-rename-lib.patch 
Log Message:
* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-9
- Rename libbt.so to libbtanks.so because of conflict with blackbox


btanks-0.8-rename-lib.patch:

--- NEW FILE btanks-0.8-rename-lib.patch ---
diff -urp btanks-0.8.7686.orig/editor/SConscript btanks-0.8.7686/editor/SConscript
--- btanks-0.8.7686.orig/editor/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/editor/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -6,7 +6,7 @@ Import('sdl_libs')
 
 env = env.Clone()
 
-libs = ['bt', 'sdlx', 'mrt', 'SDL']
+libs = ['btanks', 'sdlx', 'mrt', 'SDL']
 
 ed_src = [
 	'base_brush.cpp', 
+++ btanks-0.8.7686/engine/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -109,7 +109,7 @@ if sys.platform != 'win32':
 	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
 
 
-bt = env.SharedLibrary('bt', bt_sources, LIBS=bt_libs)
+bt = env.SharedLibrary('btanks', bt_sources, LIBS=bt_libs)
 
 if sys.platform != 'win32' and len(env['prefix']) > 0:
 	Import('install_targets')
@@ -119,7 +119,7 @@ else:
 	Install('#', bt[0])
 
 bt_main_sources = ['src/main.cpp']
-bt_main_libs =  ['mrt', 'bt', 'SDL', 'sdlx']
+bt_main_libs =  ['mrt', 'btanks', 'SDL', 'sdlx']
 
 if sys.platform == "win32":
 	bt_rc = env.RES('src/bt.rc')
diff -urp btanks-0.8.7686.orig/objects/SConscript btanks-0.8.7686/objects/SConscript
--- btanks-0.8.7686.orig/objects/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/objects/SConscript	2009-04-03 20:08:58.000000000 +0400
@@ -7,7 +7,7 @@ Import('lib_dir')
 env = env.Clone()
 buildmode = env['mode']
 
-libs = ['bt', 'sdlx', 'mrt']
+libs = ['btanks', 'sdlx', 'mrt']
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/engine'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/mrt'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/sdlx'])


Index: btanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btanks/F-10/btanks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btanks.spec	18 Mar 2009 08:48:17 -0000	1.1
+++ btanks.spec	3 Apr 2009 17:19:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           btanks
 Version:        0.8.7686
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Funny battle on your desk
 Summary(ru):    ?????????????? ?????????????????? ?????????? ???? ??????????
 
@@ -12,6 +12,9 @@
 Patch0:         %{name}-0.8-remove-rpath.patch
 # Disable video previews of map levels (we don't distribute video anyway)
 Patch1:         %{name}-0.8-disable-smpeg.patch
+# Rename libbt.so to libbtanks.so because of conflict with blackbox
+# http://sourceforge.net/tracker/?func=detail&atid=843095&aid=2722914&group_id=167474
+Patch2:         %{name}-0.8-rename-lib.patch
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        bted.desktop
@@ -59,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .remove-rpath
 %patch1 -p1 -b .disable-smpeg
+%patch2 -p1 -b .rename-lib
 dos2unix -k *.txt ChangeLog *.url LICENSE EXCEPTION
 
 iconv -f latin1 -t utf-8 EXCEPTION > EXCEPTION.new
@@ -96,7 +100,7 @@
 
 # libs
 install -dm 755 %{buildroot}%{_libdir}/%{name}
-install -m 755 build/release/engine/libbt.so %{buildroot}%{_libdir}
+install -m 755 build/release/engine/libbtanks.so %{buildroot}%{_libdir}
 install -m 755 build/release/mrt/libmrt.so %{buildroot}%{_libdir}
 install -m 755 build/release/sdlx/libsdlx.so %{buildroot}%{_libdir}
 install -m 755 build/release/clunk/libclunk.so %{buildroot}%{_libdir}
@@ -152,6 +156,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-9
+- Rename libbt.so to libbtanks.so because of conflict with blackbox
+
 * Wed Mar 18 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-8
 - Package data as separate files instead of big zip blob
 



From atorkhov at fedoraproject.org  Fri Apr  3 17:33:16 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Fri,  3 Apr 2009 17:33:16 +0000 (UTC)
Subject: rpms/btanks/F-9 btanks-0.8-rename-lib.patch, NONE, 1.1 btanks.spec, 
	1.1, 1.2
Message-ID: <20090403173316.76DA070134@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/btanks/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19168

Modified Files:
	btanks.spec 
Added Files:
	btanks-0.8-rename-lib.patch 
Log Message:
* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-9
- Rename libbt.so to libbtanks.so because of conflict with blackbox


btanks-0.8-rename-lib.patch:

--- NEW FILE btanks-0.8-rename-lib.patch ---
diff -urp btanks-0.8.7686.orig/editor/SConscript btanks-0.8.7686/editor/SConscript
--- btanks-0.8.7686.orig/editor/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/editor/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -6,7 +6,7 @@ Import('sdl_libs')
 
 env = env.Clone()
 
-libs = ['bt', 'sdlx', 'mrt', 'SDL']
+libs = ['btanks', 'sdlx', 'mrt', 'SDL']
 
 ed_src = [
 	'base_brush.cpp', 
+++ btanks-0.8.7686/engine/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -109,7 +109,7 @@ if sys.platform != 'win32':
 	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
 
 
-bt = env.SharedLibrary('bt', bt_sources, LIBS=bt_libs)
+bt = env.SharedLibrary('btanks', bt_sources, LIBS=bt_libs)
 
 if sys.platform != 'win32' and len(env['prefix']) > 0:
 	Import('install_targets')
@@ -119,7 +119,7 @@ else:
 	Install('#', bt[0])
 
 bt_main_sources = ['src/main.cpp']
-bt_main_libs =  ['mrt', 'bt', 'SDL', 'sdlx']
+bt_main_libs =  ['mrt', 'btanks', 'SDL', 'sdlx']
 
 if sys.platform == "win32":
 	bt_rc = env.RES('src/bt.rc')
diff -urp btanks-0.8.7686.orig/objects/SConscript btanks-0.8.7686/objects/SConscript
--- btanks-0.8.7686.orig/objects/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/objects/SConscript	2009-04-03 20:08:58.000000000 +0400
@@ -7,7 +7,7 @@ Import('lib_dir')
 env = env.Clone()
 buildmode = env['mode']
 
-libs = ['bt', 'sdlx', 'mrt']
+libs = ['btanks', 'sdlx', 'mrt']
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/engine'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/mrt'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/sdlx'])


Index: btanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btanks/F-9/btanks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btanks.spec	18 Mar 2009 08:45:12 -0000	1.1
+++ btanks.spec	3 Apr 2009 17:32:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           btanks
 Version:        0.8.7686
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Funny battle on your desk
 Summary(ru):    ?????????????? ?????????????????? ?????????? ???? ??????????
 
@@ -12,6 +12,9 @@
 Patch0:         %{name}-0.8-remove-rpath.patch
 # Disable video previews of map levels (we don't distribute video anyway)
 Patch1:         %{name}-0.8-disable-smpeg.patch
+# Rename libbt.so to libbtanks.so because of conflict with blackbox
+# http://sourceforge.net/tracker/?func=detail&atid=843095&aid=2722914&group_id=167474
+Patch2:         %{name}-0.8-rename-lib.patch
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        bted.desktop
@@ -59,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .remove-rpath
 %patch1 -p1 -b .disable-smpeg
+%patch2 -p1 -b .rename-lib
 dos2unix -k *.txt ChangeLog *.url LICENSE EXCEPTION
 
 iconv -f latin1 -t utf-8 EXCEPTION > EXCEPTION.new
@@ -96,7 +100,7 @@
 
 # libs
 install -dm 755 %{buildroot}%{_libdir}/%{name}
-install -m 755 build/release/engine/libbt.so %{buildroot}%{_libdir}
+install -m 755 build/release/engine/libbtanks.so %{buildroot}%{_libdir}
 install -m 755 build/release/mrt/libmrt.so %{buildroot}%{_libdir}
 install -m 755 build/release/sdlx/libsdlx.so %{buildroot}%{_libdir}
 install -m 755 build/release/clunk/libclunk.so %{buildroot}%{_libdir}
@@ -152,6 +156,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-9
+- Rename libbt.so to libbtanks.so because of conflict with blackbox
+
 * Wed Mar 18 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-8
 - Package data as separate files instead of big zip blob
 



From hadess at fedoraproject.org  Fri Apr  3 17:37:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  3 Apr 2009 17:37:15 +0000 (UTC)
Subject: rpms/bluez/devel bluez-fix-audio-service-crasher.patch, NONE,
	1.1 bluez.spec, 1.55, 1.56
Message-ID: <20090403173715.BAD1270134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19530

Modified Files:
	bluez.spec 
Added Files:
	bluez-fix-audio-service-crasher.patch 
Log Message:
* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-2
- Don't crash when audio devices are registered and the adapter
  is removed


bluez-fix-audio-service-crasher.patch:

--- NEW FILE bluez-fix-audio-service-crasher.patch ---
diff --git a/audio/device.c b/audio/device.c
index aeca576..f66cd61 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -617,5 +617,8 @@ void audio_device_unregister(struct audio_device *device)
 	if (device->control)
 		control_unregister(device);
 
+	g_dbus_unregister_interface(device->conn, device->path,
+						AUDIO_INTERFACE);
+
 	device_free(device);
 }


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- bluez.spec	29 Mar 2009 21:15:06 -0000	1.55
+++ bluez.spec	3 Apr 2009 17:36:45 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.34
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -14,6 +14,8 @@
 Patch2: bluez-try-utf8-harder.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1754
 Patch3: bluez-activate-wacom-mode2.patch
+# http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=457056310229911e820357470ee8fb30c82516da
+Patch4: bluez-fix-audio-service-crasher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -102,6 +104,7 @@
 %patch1 -p0 -b .oui
 %patch2 -p1 -b .non-utf8-name
 %patch3 -p1 -b .wacom
+%patch4 -p1 -b .audio-service-crasher
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -194,6 +197,10 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-2
+- Don't crash when audio devices are registered and the adapter
+  is removed
+
 * Sun Mar 29 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-1
 - Update to 4.34
 



From hadess at fedoraproject.org  Fri Apr  3 17:41:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  3 Apr 2009 17:41:33 +0000 (UTC)
Subject: rpms/bluez/devel bluez-fix-audio-service-disconnect.patch, NONE,
	1.1 bluez.spec, 1.56, 1.57
Message-ID: <20090403174133.6C13570134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19906

Modified Files:
	bluez.spec 
Added Files:
	bluez-fix-audio-service-disconnect.patch 
Log Message:
* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-3
- Avoid disconnecting audio devices straight after they're connected


bluez-fix-audio-service-disconnect.patch:

--- NEW FILE bluez-fix-audio-service-disconnect.patch ---
diff --git a/audio/device.c b/audio/device.c
index f66cd61..84659d3 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -257,7 +257,7 @@ static gboolean headset_connect_timeout(gpointer user_data)
 	dev->priv->headset_timer = 0;
 
 	if (dev->headset)
-		headset_config_stream(dev, NULL, NULL);
+		headset_config_stream(dev, FALSE, NULL, NULL);
 
 	return FALSE;
 }
@@ -437,7 +437,7 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
 	dev->auto_connect = TRUE;
 
 	if (dev->headset)
-		headset_config_stream(dev, NULL, NULL);
+		headset_config_stream(dev, FALSE, NULL, NULL);
 	else if (dev->sink) {
 		struct avdtp *session = avdtp_get(&dev->src, &dev->dst);
 
diff --git a/audio/headset.c b/audio/headset.c
index 4d70b4a..e1d1cb5 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -2259,6 +2259,7 @@ unsigned int headset_request_stream(struct audio_device *dev,
 }
 
 unsigned int headset_config_stream(struct audio_device *dev,
+					gboolean auto_dc,
 					headset_stream_cb_t cb,
 					void *user_data)
 {
@@ -2280,7 +2281,7 @@ unsigned int headset_config_stream(struct audio_device *dev,
 	if (rfcomm_connect(dev, cb, user_data, &id) < 0)
 		return 0;
 
-	hs->auto_dc = TRUE;
+	hs->auto_dc = auto_dc;
 	hs->pending->target_state = HEADSET_STATE_CONNECTED;
 
 	return id;
diff --git a/audio/headset.h b/audio/headset.h
index dbe1923..73c8a25 100644
--- a/audio/headset.h
+++ b/audio/headset.h
@@ -65,6 +65,7 @@ void headset_update(struct audio_device *dev, uint16_t svc,
 			const char *uuidstr);
 
 unsigned int headset_config_stream(struct audio_device *dev,
+					gboolean auto_dc,
 					headset_stream_cb_t cb,
 					void *user_data);
 unsigned int headset_request_stream(struct audio_device *dev,
diff --git a/audio/sink.c b/audio/sink.c
index 7f8286d..afdfde6 100644
--- a/audio/sink.c
+++ b/audio/sink.c
@@ -507,6 +507,8 @@ gboolean sink_setup_stream(struct sink *sink, struct avdtp *session)
 	if (!sink->session)
 		return FALSE;
 
+	avdtp_set_auto_disconnect(sink->session, FALSE);
+
 	if (avdtp_discover(sink->session, discovery_complete, sink) < 0)
 		return FALSE;
 
@@ -538,8 +540,6 @@ static DBusMessage *sink_connect(DBusConnection *conn,
 						".AlreadyConnected",
 						"Device Already Connected");
 
-	avdtp_set_auto_disconnect(sink->session, FALSE);
-
 	if (!sink_setup_stream(sink, NULL))
 		return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
 						"Failed to create a stream");
diff --git a/audio/unix.c b/audio/unix.c
index 0cebcec..7aca7ef 100644
--- a/audio/unix.c
+++ b/audio/unix.c
@@ -904,7 +904,7 @@ static void start_config(struct audio_device *dev, struct unix_client *client)
 			goto failed;
 		}
 
-		id = headset_config_stream(dev, headset_setup_complete,
+		id = headset_config_stream(dev, TRUE, headset_setup_complete,
 						client);
 		client->cancel = headset_cancel_stream;
 		break;


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- bluez.spec	3 Apr 2009 17:36:45 -0000	1.56
+++ bluez.spec	3 Apr 2009 17:41:03 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.34
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -16,6 +16,8 @@
 Patch3: bluez-activate-wacom-mode2.patch
 # http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=457056310229911e820357470ee8fb30c82516da
 Patch4: bluez-fix-audio-service-crasher.patch
+# http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=1200c9362b09dcc0cd362c046b93c560a7a47256
+Patch5: bluez-fix-audio-service-disconnect.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -105,6 +107,7 @@
 %patch2 -p1 -b .non-utf8-name
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .audio-service-crasher
+%patch5 -p1 -b .audio-service-disconnect
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -197,6 +200,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-3
+- Avoid disconnecting audio devices straight after they're connected
+
 * Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-2
 - Don't crash when audio devices are registered and the adapter
   is removed



From lennart at fedoraproject.org  Fri Apr  3 17:54:39 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri,  3 Apr 2009 17:54:39 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart.spec,1.6,1.7
Message-ID: <20090403175439.94FC770134@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21715

Modified Files:
	libatasmart.spec 
Log Message:
New upstream release


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libatasmart.spec	2 Apr 2009 21:54:36 -0000	1.6
+++ libatasmart.spec	3 Apr 2009 17:54:09 -0000	1.7
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -53,6 +53,9 @@
 %{_libdir}/pkgconfig/libatasmart.pc
 
 %changelog
+* Fri Apr 3 2009 Lennart Poettering <lpoetter at redhat.com> 0.5-1
+- New upstream release
+
 * Thu Apr 2 2009 Lennart Poettering <lpoetter at redhat.com> 0.4-1
 - New upstream release
 



From lennart at fedoraproject.org  Fri Apr  3 17:56:27 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri,  3 Apr 2009 17:56:27 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090403175627.551E670134@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21963

Modified Files:
	.cvsignore sources 
Log Message:
forgot tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Apr 2009 21:54:36 -0000	1.5
+++ .cvsignore	3 Apr 2009 17:55:57 -0000	1.6
@@ -1 +1 @@
-libatasmart-0.4.tar.gz
+libatasmart-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Apr 2009 21:54:36 -0000	1.5
+++ sources	3 Apr 2009 17:55:57 -0000	1.6
@@ -1 +1 @@
-36bbbfecb516c735c05d076e2bc955f5  libatasmart-0.4.tar.gz
+f8d3beac2161e18c08e4df274c149cc3  libatasmart-0.5.tar.gz



From pjones at fedoraproject.org  Fri Apr  3 17:57:23 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri,  3 Apr 2009 17:57:23 +0000 (UTC)
Subject: rpms/gnu-efi/devel gnu-efi-3.0e-ignore-gnu-stack, NONE,
	1.1 gnu-efi.spec, 1.30, 1.31
Message-ID: <20090403175723.1808770134@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/gnu-efi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22081

Modified Files:
	gnu-efi.spec 
Added Files:
	gnu-efi-3.0e-ignore-gnu-stack 
Log Message:
* Fri Apr 03 2009 Peter Jones <pjones at redhat.com> - 3.0e-7
- Use nickc's workaround for #492183



--- NEW FILE gnu-efi-3.0e-ignore-gnu-stack ---
diff --git a/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds
index bc29799..b15b36d 100644
--- a/gnuefi/elf_ia32_efi.lds
+++ b/gnuefi/elf_ia32_efi.lds
@@ -58,5 +58,7 @@ SECTIONS
   {
     *(.rel.reloc)
     *(.eh_frame)
+    *(.note.GNU-stack)
   }
+  .comment 0 : { *(.comment) }
 }
diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds
index 9c0a9f8..d0ae5f0 100644
--- a/gnuefi/elf_x86_64_efi.lds
+++ b/gnuefi/elf_x86_64_efi.lds
@@ -54,5 +54,8 @@ SECTIONS
   .ignored.reloc :
   {
     *(.rela.reloc)
+    *(.eh_frame)
+    *(.note.GNU-stack)
   }
+  .comment 0 : { *(.comment) }
 }


Index: gnu-efi.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnu-efi.spec	31 Mar 2009 16:41:59 -0000	1.30
+++ gnu-efi.spec	3 Apr 2009 17:56:52 -0000	1.31
@@ -1,14 +1,14 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
 Version: 3.0e
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Development/System
 License: GPLv2+
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.bz2
 Patch0: gnu-efi-3.0e-no-relocations.patch
 Patch1: gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
-Patch2: gnu-efi-3.0e-pad-all-sections.patch
+Patch2: gnu-efi-3.0e-ignore-gnu-stack
 Patch3: gnu-efi-3.0d-unwrap.patch
 Patch4: gnu-efi-3.0d-uefi_wrap.patch
 Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch
@@ -23,7 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 # these are currently disabled as we don't need them per se, and they
 # haven't gone upstream yet either.  Also #2 and #3 haven't been updated
 # to work with gnu-efi-3.0e yet.
@@ -57,6 +57,12 @@
 %{_libdir}/*
 
 %changelog
+* Fri Apr 03 2009 Peter Jones <pjones at redhat.com> - 3.0e-7
+- Use nickc's workaround for #492183
+
+* Tue Mar 31 2009 Peter Jones <pjones at redhat.com> - 3.0e-6.1
+- Make a test package for nickc.
+
 * Thu Mar 12 2009 Chris Lumens <clumens at redhat.com> 3.0e-6
 - Add IA64 back into the list of build arches (#489544).
 



From berrange at fedoraproject.org  Fri Apr  3 18:25:27 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Fri,  3 Apr 2009 18:25:27 +0000 (UTC)
Subject: rpms/python-virtinst/devel python-virtinst.spec, 1.62,
	1.63 virtinst-0.400.3-selinux-context.patch, 1.1, 1.2
Message-ID: <20090403182527.8419A70134@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25887

Modified Files:
	python-virtinst.spec virtinst-0.400.3-selinux-context.patch 
Log Message:
Attempt to fix SELinux labelling on CDROM ISOs used for installation


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- python-virtinst.spec	3 Apr 2009 17:17:04 -0000	1.62
+++ python-virtinst.spec	3 Apr 2009 18:24:57 -0000	1.63
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -87,6 +87,9 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.4-fc11
+- Attempt to fix SELinux labelling on CDROM ISOs used for installation
+
 * Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.3-fc11
 - Set SELinux context on $HOME/.virtinst to make kernel/initrd boot work (rhbz #491052)
 

virtinst-0.400.3-selinux-context.patch:

Index: virtinst-0.400.3-selinux-context.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/virtinst-0.400.3-selinux-context.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtinst-0.400.3-selinux-context.patch	3 Apr 2009 17:17:04 -0000	1.1
+++ virtinst-0.400.3-selinux-context.patch	3 Apr 2009 18:24:57 -0000	1.2
@@ -1,3 +1,46 @@
+diff -rup virtinst-0.400.3.orig/virtinst/CapabilitiesParser.py virtinst-0.400.3.new/virtinst/CapabilitiesParser.py
+--- virtinst-0.400.3.orig/virtinst/CapabilitiesParser.py	2009-03-10 03:32:15.000000000 +0000
++++ virtinst-0.400.3.new/virtinst/CapabilitiesParser.py	2009-04-03 19:15:33.000000000 +0100
+@@ -93,6 +93,7 @@ class Host(object):
+ 
+         self.features = CapabilityFeatures()
+         self.topology = None
++        self.secmodel = None
+ 
+         if not node is None:
+             self.parseXML(node)
+@@ -103,6 +104,9 @@ class Host(object):
+             if child.name == "topology":
+                 self.topology = Topology(child)
+ 
++            if child.name == "secmodel":
++                self.secmodel = SecurityModel(child)
++
+             if child.name != "cpu":
+                 child = child.next
+                 continue
+@@ -252,6 +256,21 @@ class TopologyCPU(object):
+         self.id = int(node.prop("id"))
+ 
+ 
++class SecurityModel(object):
++    def __init__(self, node = None):
++        self.model = None
++        self.doi = None
++
++        if not node is None:
++            self.parseXML(node)
++
++    def parseXML(self, node):
++        child = node.children
++        if child.name == "model":
++            self.model = child.content
++        elif cihld.name == "doi":
++            self.doi == child.content
++
+ class Capabilities(object):
+     def __init__(self, node = None):
+         self.host = None
 diff -rup virtinst-0.400.3.orig/virtinst/Installer.py virtinst-0.400.3.new/virtinst/Installer.py
 --- virtinst-0.400.3.orig/virtinst/Installer.py	2009-03-10 03:32:15.000000000 +0000
 +++ virtinst-0.400.3.new/virtinst/Installer.py	2009-04-03 18:15:10.000000000 +0100
@@ -33,3 +76,97 @@
      scratchdir = property(get_scratchdir)
  
      def get_cdrom(self):
+Only in virtinst-0.400.3.new/virtinst: virtinst-0.400.3-selinux-context.patch
+diff -rup virtinst-0.400.3.orig/virtinst/VirtualDisk.py virtinst-0.400.3.new/virtinst/VirtualDisk.py
+--- virtinst-0.400.3.orig/virtinst/VirtualDisk.py	2009-03-10 03:32:15.000000000 +0000
++++ virtinst-0.400.3.new/virtinst/VirtualDisk.py	2009-04-03 19:23:49.000000000 +0100
+@@ -28,6 +28,7 @@ import _util
+ import Storage
+ from VirtualDevice import VirtualDevice
+ from virtinst import _virtinst as _
++from CapabilitiesParser import parse as parseCapabilities
+ 
+ def _vdisk_create(path, size, kind, sparse = True):
+     force_fixed = "raw"
+@@ -557,7 +558,6 @@ class VirtualDisk(VirtualDevice):
+                     # vdisk _is_ a directory.
+                     raise ValueError(_("The path '%s' must be a file or a "
+                                        "device, not a directory") % self.path)
+-                # XXX: Any selinux validation checks should go here
+ 
+             self.__set_dev_type()
+             return True
+@@ -605,6 +605,8 @@ class VirtualDisk(VirtualDevice):
+         @param progresscb: progress meter
+         @type progresscb: instanceof urlgrabber.BaseMeter
+         """
++        self.setup_security_context()
++
+         if self.vol_object:
+             return
+         elif self.vol_install:
+@@ -651,7 +653,63 @@ class VirtualDisk(VirtualDevice):
+                     os.close(fd)
+                 if progresscb:
+                     progresscb.end(size_bytes)
+-        # FIXME: set selinux context?
++
++    def setup_security_context(self):
++        logging.info("Setting up security contexts")
++        if self.device != VirtualDisk.DEVICE_CDROM:
++            return
++
++        caps = parseCapabilities(self.conn.getCapabilities())
++        if caps.host.secmodel is None:
++            logging.info("No security model active")
++            return
++        if caps.host.secmodel.model != "selinux":
++            logging.info("Security model is not selinux")
++            return
++
++        wantLabel = "system_u:object_r:virt_content_t:s0"
++        changeLabel = False
++        if self.vol_object:
++            xml = self.vol_object.XMLDesc(0)
++            label = _util.get_xml_path(xml, "/volume/target/permissions/label")
++
++            if label == wantLabel:
++                logging.info("Labelling is correct")
++                return
++
++            if _util.is_uri_remote(self.conn.getURI()):
++                raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
++                                    (self.path, label, wantLabel))
++            else:
++                changeLabel = True
++        elif self.path:
++            try:
++                import selinux
++                con = selinux.getfilecon(self.path)
++                if con == wantLabel:
++                    logging.info("Labelling is correct")
++                    return
++
++                if _util.is_remote_uri(self.conn.URI()):
++                    raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
++                                        (self.path, label, wantLabel))
++                else:
++                    if self.path[0:4] == "/dev":
++                        logging.info("Not changing context on physical device")
++                    else:
++                        changeLabel = True
++            except Exception, e:
++                logging.error("Failed to validate SELinux labelling: %s. Assuming its OK" % str(e))
++
++        if changeLabel:
++            try:
++                import selinux
++                selinux.setfilecon(self.path, wantLabel)
++                logging.info("Changed SELinux label to %s" % wantLabel)
++            except Exception, e:
++                raise ValueError, _(("Unable to fix install volume SELinux labelling: %s\n" % str(e)) +
++                                    ("Please run 'chcon %s %s' manually and retry installation" % (wantLabel, self.path)))
++
+ 
+     def get_xml_config(self, disknode=None):
+         """



From pjones at fedoraproject.org  Fri Apr  3 18:34:42 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri,  3 Apr 2009 18:34:42 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-efipxe.patch, NONE, 1.1 grub.spec, 1.88,
	1.89
Message-ID: <20090403183442.55C6970134@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27336

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-efipxe.patch 
Log Message:
* Fri Apr 03 2009 Peter Jones <pjones at redhat.com> - 0.97-45
- Add very basic PXE support for EFI.


grub-0.97-efipxe.patch:

--- NEW FILE grub-0.97-efipxe.patch ---
>From 379129c619281449e4c441a932080c68b57f0ab8 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 31 Mar 2009 14:55:00 +0500
Subject: [PATCH] add basic pxe boot support in efi

---
 efi/Makefile.am    |    2 +-
 efi/byteswap.h     |   37 +++++
 efi/dhcp.h         |  133 +++++++++++++++
 efi/eficore.c      |   12 ++
 efi/efimain.c      |   41 ++++--
 efi/efimisc.c      |   14 +-
 efi/efitftp.c      |  182 +++++++++++++++++++++
 efi/grub/efi/efi.h |    6 +
 efi/pxe.c          |  456 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 efi/pxe.h          |  237 +++++++++++++++++++++++++++
 grub/Makefile.am   |    2 +-
 grub/efitftp.c     |   29 ++++
 stage2/Makefile.am |    4 +-
 stage2/disk_io.c   |   17 ++-
 stage2/efistubs.c  |    9 +
 stage2/efistubs.h  |    8 +
 stage2/filesys.h   |   13 ++-
 17 files changed, 1176 insertions(+), 26 deletions(-)
 create mode 100644 efi/byteswap.h
 create mode 100644 efi/dhcp.h
 create mode 100644 efi/efitftp.c
 create mode 100644 efi/pxe.c
 create mode 100644 efi/pxe.h
 create mode 100644 grub/efitftp.c
 create mode 100644 stage2/efistubs.c
 create mode 100644 stage2/efistubs.h

diff --git a/efi/Makefile.am b/efi/Makefile.am
index 4d97dbe..129c8d0 100644
--- a/efi/Makefile.am
+++ b/efi/Makefile.am
@@ -72,7 +72,7 @@ noinst_LIBRARIES = libgrubefi.a
 libgrubefi_a_SOURCES = $(EFI_ARCH)/callwrap.c eficore.c efimm.c efimisc.c \
 	$(EFI_ARCH)/setjmp.S eficon.c efidisk.c graphics.c efigraph.c efiuga.c \
 	font_8x16.c efiserial.c $(EFI_ARCH)/loader/linux.c efichainloader.c \
-	xpm.c
+	xpm.c pxe.c efitftp.c
 libgrubefi_a_CFLAGS = $(RELOC_FLAGS) -nostdinc
 
 endif
diff --git a/efi/byteswap.h b/efi/byteswap.h
new file mode 100644
index 0000000..5a057c4
--- /dev/null
+++ b/efi/byteswap.h
@@ -0,0 +1,37 @@
+#ifndef BYTESWAP_H
+#define BYTESWAP_H 1
+
+#if defined(__i386__)
+#define LITTLE_ENDIAN 1
+#elif defined(__x86_64__)
+#define LITTLE_ENDIAN 1
+#else
+#error endian not defined
+#endif
+
+#define bswap_16(x) \
+     ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+
+#define bswap_32(x) \
+     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |		      \
+      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+
+static inline grub_efi_uint16_t htons(grub_efi_uint16_t hostshort)
+{
+#ifdef LITTLE_ENDIAN
+	return bswap_16(hostshort);
+#else
+	return hostshort;
+#endif
+}
+
+static inline grub_efi_uint32_t htonl(grub_efi_uint32_t hostshort)
+{
+#ifdef LITTLE_ENDIAN
+	return bswap_32(hostshort);
+#else
+	return hostshort;
+#endif
+}
+
+#endif /* BYTESWAP_H */
diff --git a/efi/dhcp.h b/efi/dhcp.h
new file mode 100644
index 0000000..a82a522
--- /dev/null
+++ b/efi/dhcp.h
@@ -0,0 +1,133 @@
+#ifndef DHCP_H
+#define DHCP_H 1
+
+#include "pxe.h"
+
+#define EFI_DHCP4_PROTOCOL_GUID \
+{ 0x8a219718, 0x4ef5, 0x4761, {0x91,0xc8,0xc0,0xf0,0x4b,0xda,0x9e,0x56} }
+static grub_efi_guid_t DHCP4Protocol = EFI_DHCP4_PROTOCOL_GUID;
+
+#define EFI_DHCP4_SERVICE_BINDING_PROTOCOL_GUID \
+{ 0x9d9a39d8, 0xbd42, 0x4a73, {0xa4,0xd5,0x8e,0xe9,0x4b,0xe1,0x13,0x80} }
+static grub_efi_guid_t DHCP4SbProtocol = EFI_DHCP4_SERVICE_BINDING_PROTOCOL_GUID;
+
+#define EFI_PXE_DHCP4_PROTOCOL_GUID \
+{ 0x03c4e624, 0xac28, 0x11d3, {0x9a,0x2d,0x00,0x90,0x29,0x3f,0xc1,0x4d} }
+static grub_efi_guid_t PxeDHCP4Protocol = EFI_PXE_DHCP4_PROTOCOL_GUID;
+
+
+typedef EFI_STATUS (*EFI_DHCP4_GET_MODE_DATA)();
+typedef EFI_STATUS (*EFI_DHCP4_CONFIGURE)();
+typedef EFI_STATUS (*EFI_DHCP4_START)();
+typedef EFI_STATUS (*EFI_DHCP4_RENEW_REBIND)();
+typedef EFI_STATUS (*EFI_DHCP4_RELEASE)();
+typedef EFI_STATUS (*EFI_DHCP4_STOP)();
+typedef EFI_STATUS (*EFI_DHCP4_BUILD)();
+typedef EFI_STATUS (*EFI_DHCP4_TRANSMIT_RECIEVE)();
+typedef EFI_STATUS (*EFI_DHCP4_PARSE)();
+
+typedef struct _EFI_DHCP4_PROTOCOL {
+	EFI_DHCP4_GET_MODE_DATA GetModeData;
+	EFI_DHCP4_CONFIGURE Configure;
+	EFI_DHCP4_START Start;
+	EFI_DHCP4_RENEW_REBIND RenewRebind;
+	EFI_DHCP4_RELEASE Release;
+	EFI_DHCP4_STOP Stop;
+	EFI_DHCP4_BUILD Build;
+	EFI_DHCP4_TRANSMIT_RECIEVE TransmitReceive;
+	EFI_DHCP4_PARSE Parse;
+} EFI_DHCP4_PROTOCOL;
+
+typedef enum {
+	Dhcp4Stopped,
+	Dhcp4Init,
+	Dhcp4Selecting,
+	Dhcp4Requesting,
+	Dhcp4Bound,
+	Dhcp4Renewing,
+	Dhcp4Rebinding,
+	Dhcp4InitReboot,
+	Dhcp4Rebooting,
+} EFI_DHCP4_STATE;
+
+typedef enum {
+	Dhcp4SendDiscover = 0x1,
+	Dhcp4RcvdOffer,
+	Dhcp4SelectOffer,
+	Dhcp4SendRequest,
+	Dhcp4RcvdAck,
+	Dhcp4RcvdNak,
+	Dhcp4SendDecline,
+	Dhcp4BoundCompleted,
+	Dhcp4EnterRenewing,
+	Dhcp4EnterRebinding,
+	Dhcp4AddressLost,
+	Dhcp4Fail,
+} EFI_DHCP4_EVENT;
+
+typedef struct {
+	grub_efi_uint8_t OpCode;
+	grub_efi_uint8_t HwType;
+	grub_efi_uint8_t HwAddrLen;
+	grub_efi_uint8_t Hops;
+	grub_efi_uint32_t xid;
+	grub_efi_uint16_t Seconds;
+	grub_efi_uint16_t reserved;
+	EFI_IPv4_ADDRESS ClientAddr;
+	EFI_IPv4_ADDRESS YourAddr;
+	EFI_IPv4_ADDRESS ServerAddr;
+	EFI_IPv4_ADDRESS GatewayAddr;
+	grub_efi_uint8_t ClientHwAddr[16];
+	char ServerName[64];
+	char BootFileName[128];
+} EFI_DHCP4_HEADER;
+
+typedef struct {
+	grub_efi_uint32_t Size;
+	grub_efi_uint32_t Length;
+	struct {
+		EFI_DHCP4_HEADER Header;
+		grub_efi_uint32_t Magik;
+		grub_efi_uint8_t option[];
+	} Dhcp4;
+} EFI_DHCP4_PACKET;
+
+typedef struct {
+	grub_efi_uint8_t OpCode;
+	grub_efi_uint8_t Length;
+	grub_efi_uint8_t Data[1];
+} EFI_DHCP4_PACKET_OPTION;
+
+typedef EFI_STATUS (*EFI_DHCP4_CALLBACK) (
+	EFI_DHCP4_PROTOCOL *This,
+	void *Context,
+	EFI_DHCP4_STATE CurrentState,
+	EFI_DHCP4_EVENT Dhcp4Event,
+	EFI_DHCP4_PACKET *Packet,
+	EFI_DHCP4_PACKET **NewPacket);
+
+typedef struct {
+	grub_efi_uint32_t DiscoverTryCount;
+	grub_efi_uint32_t *DiscoverTimeout;
+	grub_efi_uint32_t RequestTryCount;
+	grub_efi_uint32_t *RequestTimeout;
+	EFI_IPv4_ADDRESS ClientAddress;
+	EFI_DHCP4_CALLBACK Dhcp4Callback;
+	void *CallbackContext;
+	grub_efi_uint32_t OptionCount;
+	EFI_DHCP4_PACKET_OPTION **OptionList;
+} EFI_DHCP4_CONFIG_DATA;
+
+typedef struct {
+	EFI_DHCP4_STATE State;
+	EFI_DHCP4_CONFIG_DATA ConfigData;
+	EFI_IPv4_ADDRESS ClientAddress;
+	EFI_MAC_ADDRESS ClientMacAddress;
+	EFI_IPv4_ADDRESS ServerAddress;
+	EFI_IPv4_ADDRESS RouterAddress;
+	EFI_IPv4_ADDRESS SubnetMask;
+	grub_efi_uint32_t LeaseTime;
+	EFI_DHCP4_PACKET *ReplyPacket;
+} EFI_DHCP4_MODE_DATA;
+
+#endif /* DHCP_H */
diff --git a/efi/eficore.c b/efi/eficore.c
index 394d82d..8052a14 100644
--- a/efi/eficore.c
+++ b/efi/eficore.c
@@ -38,6 +38,18 @@ static grub_efi_guid_t console_control_guid = GRUB_EFI_CONSOLE_CONTROL_GUID;
 static grub_efi_guid_t loaded_image_guid = GRUB_EFI_LOADED_IMAGE_GUID;
 static grub_efi_guid_t device_path_guid = GRUB_EFI_DEVICE_PATH_GUID;
 
+grub_efi_status_t
+grub_efi_locate_handle_buffer (grub_efi_locate_search_type_t search_type,
+				grub_efi_guid_t *protocol,
+				void *search_key,
+				grub_efi_uintn_t *no_handles,
+				grub_efi_handle_t **buffer)
+{
+	return Call_Service_5(
+		grub_efi_system_table->boot_services->locate_handle_buffer,
+		search_type, protocol, search_key, no_handles, buffer);
+}
+
 void *
 grub_efi_locate_protocol (grub_efi_guid_t *protocol, void *registration)
 {
diff --git a/efi/efimain.c b/efi/efimain.c
index ed73ca2..e1a1e66 100644
--- a/efi/efimain.c
+++ b/efi/efimain.c
@@ -24,6 +24,9 @@
 #include <grub/misc.h>
 
 #include <shared.h>
+#include <efistubs.h>
+
+#include "pxe.h"
 
 #define GRUB_SCRATCH_MEM_PAGES  (GRUB_SCRATCH_MEM_SIZE >> 12)
 
@@ -34,25 +37,41 @@ void *grub_scratch_mem = NULL;
 #define LOW_STACK_PAGES (LOW_STACK_SIZE >> 12)
 static void *low_stack, *real_stack;
 
+extern int grub_test_pxe(grub_efi_loaded_image_t *loaded_image);
+
 static void
 real_main (void)
 {
   grub_efi_loaded_image_t *loaded_image;
-  char *path_name;
+  char *path_name = NULL;
 
   loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
-  grub_get_drive_partition_from_bdev_handle (loaded_image->device_handle,
-					     &boot_drive,
-					     &install_partition);
-  path_name = grub_efi_file_path_to_path_name (loaded_image->file_path);
-  if (path_name)
-    {
-      grub_set_config_file (path_name);
-      grub_free (path_name);
-    }
-  grub_load_saved_default (loaded_image->device_handle);
+
+  path_name = grub_efi_pxe_get_config_path(loaded_image);
+
+  if (path_name) {
+    network_ready = 1;
+
+    grub_set_config_file (path_name);
+    grub_free (path_name);
+  } else {
+      grub_get_drive_partition_from_bdev_handle (loaded_image->device_handle,
+						 &boot_drive,
+						 &install_partition);
+      path_name = grub_efi_file_path_to_path_name (loaded_image->file_path);
+
+    if (path_name)
+      {
+        grub_set_config_file (path_name);
+        grub_free (path_name);
+      }
+
+    grub_load_saved_default (loaded_image->device_handle);
+  }
 
   init_bios_info ();
+  while (console_getkey() < 0)
+    grub_efi_stall(1000);
 }
 
 grub_efi_status_t
diff --git a/efi/efimisc.c b/efi/efimisc.c
index 4818617..d508ada 100644
--- a/efi/efimisc.c
+++ b/efi/efimisc.c
@@ -489,11 +489,15 @@ grub_set_config_file (char *path_name)
       grub_strcpy (saved_default_file, DEFAULT_SAVED_DEFAULT_FILE_NAME);
       return;
     }
-  path_name_len = dir_end + 1 - path_name;
-  if (path_name_len + sizeof (DEFAULT_CONFIG_FILE_NAME) > 128)
-    return;
-  grub_memmove (config_file, path_name, path_name_len);
-  grub_strcpy (config_file + path_name_len, DEFAULT_CONFIG_FILE_NAME);
+  if (strlen(dir_end) == 1) {
+    path_name_len = dir_end + 1 - path_name;
+    if (path_name_len + sizeof (DEFAULT_CONFIG_FILE_NAME) > 128)
+      return;
+    grub_memmove (config_file, path_name, path_name_len);
+    grub_strcpy (config_file + path_name_len, DEFAULT_CONFIG_FILE_NAME);
+  } else {
+    grub_memmove (config_file, path_name, path_name_len);
+  }
   if (path_name_len + sizeof (DEFAULT_SAVED_DEFAULT_FILE_NAME) > 128)
     return;
   path_name_len = dir_end + 1 - path_name;
diff --git a/efi/efitftp.c b/efi/efitftp.c
new file mode 100644
index 0000000..9138165
--- /dev/null
+++ b/efi/efitftp.c
@@ -0,0 +1,182 @@
+#include <grub/efi/efi.h>
+#include <grub/efi/api.h>
+#include <grub/efi/misc.h>
+#include <grub/misc.h>
+
+#include <shared.h>
+#include <filesys.h>
+#include "pxe.h"
+
+struct tftp_info tftp_info = {
+	.LoadedImage = NULL,
+	.Pxe = NULL,
+	.ServerIp = NULL,
+	.BasePath = NULL
+};
+
+/*
+ * CLIENT MAC ADDR: 00 15 17 4C E6 74 
+ * CLIENT IP: 10.16.52.158  MASK: 255.255.255.0  DHCP IP: 10.16.52.16
+ * GATEWAY IP: 10.16.52.254 
+ *
+ * TSize.Running LoadFile()
+ *
+ * TFTP.status: 5
+ * got to grub_efi_pxe_get_config_path
+ * SiAddr: 10.16.52.16
+ * BootpHwAddr: 00:15:17:4c:e6:74:00:00:00:00:00:00:00:00:00:00
+ * BootpSrvName: 
+ * BootpBootFile: X86PC/UNDI/pxelinux/bootx64.efi
+ */
+
+grub_efi_status_t tftp_get_file_size(
+	char *Filename,
+	grub_efi_uintn_t *Size)
+{
+	EFI_PXE_BASE_CODE_TFTP_OPCODE OpCode = EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE;
+	char Buffer[8192];
+	grub_efi_boolean_t Overwrite = 0;
+	grub_efi_boolean_t DontUseBuffer = 0;
+	grub_efi_uint64_t BufferSize = 8192;
+	grub_efi_uintn_t BlockSize = 512;
+	grub_efi_status_t rc;
+	char *FullPath = NULL;
+
+	if (tftp_info.BasePath) {
+		int PathSize = 0;
+		PathSize = strlen(tftp_info.BasePath) + 2 + strlen(Filename);
+		FullPath = grub_malloc(PathSize);
+		grub_sprintf(FullPath, "%s/%s", tftp_info.BasePath, Filename);
+	} else {
+		FullPath = grub_malloc(strlen(Filename));
+		strcpy(FullPath, Filename);
+	}
+
+	rc = Call_Service_10(tftp_info.Pxe->Mtftp, tftp_info.Pxe, OpCode,
+		Buffer, Overwrite, &BufferSize, &BlockSize, tftp_info.ServerIp,
+		FullPath, NULL, DontUseBuffer);
+	if (rc == GRUB_EFI_SUCCESS)
+		*Size = BufferSize;
+	grub_free(FullPath);
+	return rc;
+}
+
+static grub_efi_status_t tftp_read_file(
+	char *Filename,
+	char *Buffer,
+	grub_efi_uintn_t BufferSize)
+{
+	EFI_PXE_BASE_CODE_TFTP_OPCODE OpCode = EFI_PXE_BASE_CODE_TFTP_READ_FILE;
+	grub_efi_boolean_t Overwrite = 0;
+	grub_efi_boolean_t DontUseBuffer = 0;
+	grub_efi_uintn_t BlockSize = 512;
+	grub_efi_status_t rc;
+	char *FullPath = NULL;
+
+	if (tftp_info.BasePath) {
+		int PathSize = 0;
+		PathSize = strlen(tftp_info.BasePath) + 2 + strlen(Filename);
+		FullPath = grub_malloc(PathSize);
+		grub_sprintf(FullPath, "%s/%s", tftp_info.BasePath, Filename);
+	} else {
+		FullPath = grub_malloc(strlen(Filename));
+		strcpy(FullPath, Filename);
+	}
+
+	rc = Call_Service_10(tftp_info.Pxe->Mtftp, tftp_info.Pxe, OpCode,
+		Buffer, Overwrite, &BufferSize, &BlockSize, tftp_info.ServerIp,
+		FullPath, NULL, DontUseBuffer);
+	grub_free(FullPath);
+	return rc;
+}
+
+int
+efi_tftp_mount (void)
+{
+	if (current_drive != NETWORK_DRIVE) {
+		grub_printf("current drive is not network drive.\n");
+
+		return 0;
+	}
+	return 1;
+}
+
+int
+efi_tftp_read (char *addr, int size)
+{
+	int rc;
+
+	if (tftp_info.LastPath == NULL) {
+		grub_printf(" = 0 (no path known)\n");
+		return 0;
+	}
+	if (tftp_info.Buffer == NULL) {
+		grub_printf(" = 0 (no file open)\n");
+		return 0;
+	}
+	if (filemax == -1) {
+		grub_printf(" = 0 (file not found)\n");
+		return 0;
+	}
+	if (filepos == 0) {
+		rc = tftp_read_file(tftp_info.LastPath, tftp_info.Buffer,
+				    filemax);
+	}
+
+	grub_memmove(addr, tftp_info.Buffer+filepos, size);
+	filepos += size;
+
+	return size;
+}
+
+int
+efi_tftp_dir (char *dirname)
+{
+	int rc;
+	int ch;
+	grub_efi_uintn_t size;
+	int len;
+	char *name;
+
+	ch = nul_terminate(dirname);
+	len = strlen(dirname);
+
+	name = grub_malloc(len + 1);
+	grub_memmove(name, dirname, len);
+	name[len] = '\0';
+	dirname[len] = ch;
+
+#if 0
+	if (print_possibilities)
+		return 1;
+#endif
+
+	filemax = -1;
+
+	rc = tftp_get_file_size(name, &size);
+	if (rc == 0) {
+		tftp_info.LastPath = grub_malloc(strlen(name) + 1);
+		sprintf(tftp_info.LastPath, "%s", name);
+		filemax = size;
+		filepos = 0;
+
+		tftp_info.Buffer = grub_malloc(filemax);
+
+		printf("rc: %d filemax: %d\n", rc, filemax);
+		return 1;
+	}
+	printf("rc: %d filemax: %d\n", rc, filemax);
+
+	return 0;
+}
+
+void
+efi_tftp_close (void)
+{
+	filepos = 0;
+	filemax = -1;
+	grub_free(tftp_info.LastPath);
+	tftp_info.LastPath = NULL;
+	grub_free(tftp_info.Buffer);
+	tftp_info.Buffer = NULL;
+}
diff --git a/efi/grub/efi/efi.h b/efi/grub/efi/efi.h
index 0424fbb..7078af8 100644
--- a/efi/grub/efi/efi.h
+++ b/efi/grub/efi/efi.h
@@ -25,6 +25,12 @@
 #include <grub/efi/api.h>
 
 /* Functions.  */
+grub_efi_status_t
+grub_efi_locate_handle_buffer (grub_efi_locate_search_type_t search_type,
+				grub_efi_guid_t *protocol,
+				void *search_key,
+				grub_efi_uintn_t *no_handles,
+				grub_efi_handle_t **buffer);
 void *grub_efi_locate_protocol (grub_efi_guid_t * protocol,
 				void *registration);
 grub_efi_handle_t *grub_efi_locate_handle (grub_efi_locate_search_type_t
diff --git a/efi/pxe.c b/efi/pxe.c
new file mode 100644
index 0000000..375f47d
--- /dev/null
+++ b/efi/pxe.c
@@ -0,0 +1,456 @@
+
+#include <grub/efi/efi.h>
+#include <grub/efi/api.h>
+#include <grub/efi/misc.h>
+#include <grub/misc.h>
+
+#include <shared.h>
+#include <stddef.h>
+
+#include "pxe.h"
+#include "dhcp.h"
+
+/* Search path is:
+ *
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/1902dcf5-7190-d811-bbd6-6ef21c690030
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/01-00-30-6e-f2-1c-69
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A103437
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A10343
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A1034
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A103
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A10
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A1
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0A
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/0
+ * X86PC/UNDI/pxelinux/pxelinux.cfg/default
+ *
+ * The paths we get from uefi are like:
+ * .BootBootFile: X86PC/UNDI/pxelinux/bootx64.efi
+ * .BootCiAddr: 0.0.0.0
+ * .BootYiAddr: 10.16.52.158
+ * .BootSiAddr: 10.16.52.16
+ */
+
+typedef struct {
+	char *options;
+	EFI_DHCP4_PACKET_OPTION *current_option;
+} dhcp_option_parser;
+
+static void dhcp_option_parser_reset(dhcp_option_parser *parser,
+				EFI_PXE_BASE_CODE_PACKET *packet)
+{
+	grub_uint64_t addr = (grub_uint64_t)packet;
+
+	addr += offsetof(EFI_PXE_BASE_CODE_DHCPV4_PACKET, DhcpOptions);
+	parser->current_option = (void *)addr;
+	parser->options = (void *)addr;
+}
+
+static int dhcp_option_parser_next(dhcp_option_parser *parser,
+				EFI_DHCP4_PACKET_OPTION **option)
+{
+	if (parser->current_option->OpCode == 255) {
+		*option = NULL;
+		return 0;
+	}
+	parser->current_option = (void *)((grub_uint64_t)parser->current_option + 2 + parser->current_option->Length);
+	*option = parser->current_option;
+	return 1;
+}
+
+#define DHCPMAGIK "\x63\x82\x53\x63"
+
+static int get_dhcp_client_id(EFI_PXE_BASE_CODE_PACKET *packet, uuid_t *uuid)
+{
+	dhcp_option_parser parser;
+	EFI_DHCP4_PACKET_OPTION *option;
+
+	dhcp_option_parser_reset(&parser, packet);
+
+	if (memcmp((char *)&packet->Dhcpv4.DhcpMagik, DHCPMAGIK, 4))
+		return 0;
+
+	while (dhcp_option_parser_next(&parser, &option)) {
+		int i;
+		char data[option->Length];
+
+		if (option->OpCode != 97)
+			continue;
+
+		if (option->Length != 17)
+			continue;
+
+		memcpy(data, option->Data, option->Length);
+		if (data[0] != 0)
+			continue;
+
+		/* 97[17]: 009cfe245ed0c8bd45a79f54ea5fbd3d97
+		 *                               ^^^^^^^^^^^^ uint8_t[]
+		 *                             ^^ uint8_t
+		 *                           ^^ uint8_t
+		 *                       ^^^^ BE uint16_t
+		 *                   ^^^^ BE uint16_t
+		 *           ^^^^^^^^ BE uint32_t
+		 *         ^^ "type".  0 means UUID.
+		 */
+		memcpy(uuid, data+1, 16);
+		uuid->time_low = htonl(uuid->time_low);
+		uuid->time_mid = htons(uuid->time_mid);
+		uuid->time_hi_ver = htons(uuid->time_hi_ver);
+
+		return 1;
+	}
+	return 0;
+}
+
+#if 0
+static void grub_dump_dhcp_options(EFI_PXE_BASE_CODE_PACKET *packet)
+{
+	dhcp_option_parser parser;
+	EFI_DHCP4_PACKET_OPTION *option;
+	char hex[] = "0123456789abcdef";
+	int i;
+	int j = 0;
+
+	dhcp_option_parser_reset(&parser, packet);
+
+	if (memcmp((char *)&packet->Dhcpv4.DhcpMagik, DHCPMAGIK, 4))
+		return;
+
+	/* 54[4]: a0014301
+	 * 51[4]: 00004506
+	 * 1[4]: ffffff00
+	 * 3[4]: a00143ef
+	 * 6[8]: a001ff20a001ff30
+	 * 15[48]: 96e6374716c6c6e226f637e2275646861647e236f6d60226f637e2275646861647e236f6d602275646861647e236f6d6
+	 * 28[4]: a00143ff
+	 * 40[10]: 275646861647e236f6d6
+	 * 41[8]: a001ff20a001ff30
+	 * 58[4]: 0000a203
+	 * 59[4]: 0000944d
+	 * this is the one we want:
+	 * 97[17]: 009cfe245ed0c8bd45a79f54ea5fbd3d97
+	 *                               ^^^^^^^^^^^^ in order
+	 *                             ^^ 
+	 *                           ^^
+	 *                       ^^^^ out of order
+	 *                   ^^^^ out of order
+	 *           ^^^^^^^^ out of order
+	 *         ^^ "type".  0 means UUID.
+	 * 255[0]: 
+	 */
+	while (dhcp_option_parser_next(&parser, &option)) {
+		char data[option->Length + 1];
+
+		memcpy(data, option->Data, option->Length);
+		data[option->Length] = '\0';
+
+		grub_printf("%d[%d]: ", option->OpCode, option->Length);
+		for (i = 0; i < option->Length; i++) {
+			grub_printf("%c%c", hex[data[i] & 0xf],
+					hex[(data[i] & 0xf0) >> 4]);
+		}
+		printf("\n");
+	}
+
+}
+
+void grub_print_dhcp_info(grub_efi_loaded_image_t *loaded_image)
+{
+	EFI_PXE_BASE_CODE *pxe = NULL;
+	EFI_PXE_BASE_CODE_PACKET *packet;
+
+	grub_printf("got to %s\n", __func__);
+
+	pxe = grub_efi_locate_protocol(&PxeBaseCodeProtocol, NULL);
+	if (pxe == NULL)
+		return;
+	
+	printf("DhcpDiscover options:\n");
+	packet = (EFI_PXE_BASE_CODE_PACKET *)&pxe->Mode->DhcpDiscover.Dhcpv4;
+	grub_dump_dhcp_options(packet);
+
+	printf("DhcpAck options:\n");
+	packet = (EFI_PXE_BASE_CODE_PACKET *)&pxe->Mode->DhcpAck.Dhcpv4;
+	grub_dump_dhcp_options(packet);
+
+	printf("PxeDiscover options:\n");
+	packet = (EFI_PXE_BASE_CODE_PACKET *)&pxe->Mode->PxeDiscover.Dhcpv4;
+	grub_dump_dhcp_options(packet);
+
+	printf("PxeReply options:\n");
+	packet = (EFI_PXE_BASE_CODE_PACKET *)&pxe->Mode->PxeReply.Dhcpv4;
+	grub_dump_dhcp_options(packet);
+
+#if 0
+	printf("pxe->Mode->DhcpAck.Dhcpv4: \n");
+	printf("\t.BootSrvName: %s\n", pxe->Mode->DhcpAck.Dhcpv4.BootpSrvName);
+	printf("\t.BootBootFile: %s\n", pxe->Mode->DhcpAck.Dhcpv4.BootpBootFile);
+	printf("\t.BootCiAddr: %d.%d.%d.%d\n",
+		pxe->Mode->DhcpAck.Dhcpv4.BootpCiAddr[0],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpCiAddr[1],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpCiAddr[2],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpCiAddr[3]);
+	printf("\t.BootYiAddr: %d.%d.%d.%d\n",
+		pxe->Mode->DhcpAck.Dhcpv4.BootpYiAddr[0],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpYiAddr[1],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpYiAddr[2],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpYiAddr[3]);
+	printf("\t.BootSiAddr: %d.%d.%d.%d\n",
+		pxe->Mode->DhcpAck.Dhcpv4.BootpSiAddr[0],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpSiAddr[1],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpSiAddr[2],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpSiAddr[3]);
+	printf("\t.BootGiAddr: %d.%d.%d.%d\n",
+		pxe->Mode->DhcpAck.Dhcpv4.BootpGiAddr[0],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpGiAddr[1],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpGiAddr[2],
+		pxe->Mode->DhcpAck.Dhcpv4.BootpGiAddr[3]);
+	}
+	printf("\n");
+#endif
+
+
+}
+#endif
+
+static void icmp_print_error(EFI_PXE_BASE_CODE *pxe)
+{
+	EFI_PXE_BASE_CODE_ICMP_ERROR *err = &pxe->Mode->IcmpError;
+	int i;
+	//char hex[] = "0123456789abcdef";
+
+	printf("icmp error\n");
+	printf("type: %d code: %d\n", err->Type, err->Code);
+	printf("data: \n");
+	for(i = 0; i < 464; i+=16) {
+		int x;
+		for (x = i; x < i+4; x++)
+			printf("%02x ", err->Data[x]);
+		printf(" ");
+		for (x = i+4; x < i+8; x++)
+			printf("%02x ", err->Data[x]);
+		printf(" ");
+		printf(" ");
+		for (x = i+8; x < i+12; x++)
+			printf("%02x ", err->Data[x]);
+		printf(" ");
+		for (x = i+12; x < i+16; x++)
+			printf("%02x ", err->Data[x]);
+		printf("\n");
+	}
+}
+
+static int grub_efi_pxe_check_for_file(
+	EFI_PXE_BASE_CODE *pxe,
+	EFI_IP_ADDRESS *ServerIp,
+	char *BootpBootFile,
+	char *configname,
+	char **returnpath)
+{
+	size_t bplen = strlen(BootpBootFile);
+	char *Filename = grub_malloc(24 + bplen + 40);
+	char *lastslash = Filename + bplen;
+	grub_efi_uintn_t size;
+	int i;
+	EFI_STATUS rc;
+	char Buffer[8192];
+
+	memcpy(Filename, BootpBootFile, bplen);
+
+	for (i = 0; i < bplen; i++) {
+		if (Filename[i] == '/')
+			lastslash = Filename + i;
+	}
+	if (*lastslash) {
+		*lastslash++ = '/';
+		*lastslash = '\0';
+	}
+
+	sprintf(lastslash, configname);
+
+	printf("tftp://%d.%d.%d.%d/%s\n",
+		ServerIp->v4.Addr[0], ServerIp->v4.Addr[1],
+		ServerIp->v4.Addr[2], ServerIp->v4.Addr[3],
+		Filename);
+
+	rc = tftp_get_file_size(Filename, &size);
+	if (rc == GRUB_EFI_ICMP_ERROR)
+		icmp_print_error(pxe);
+
+	if (rc == GRUB_EFI_SUCCESS) {
+		*returnpath = Filename;
+		return size;
+	}
+	grub_free(Filename);
+	return 0;
+}
+
+extern char *grub_efi_pxe_find_config_file(void);
+char *grub_efi_pxe_find_config_file(void)
+{
+	EFI_PXE_BASE_CODE *pxe = NULL;
+	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
+	EFI_IP_ADDRESS serveraddr;
+	char hex[] = "0123456789ABCDEF";
+	char bootpsrvname[65];
+	char bootpbootfile[129];
+	char hexip[9];
+	char *filepath = NULL;
+	int hexiplen;
+
+	pxe = grub_efi_locate_protocol(&PxeBaseCodeProtocol, NULL);
+	if (pxe == NULL)
+		return NULL;
+
+	packet = &pxe->Mode->DhcpAck.Dhcpv4;
+
+	memcpy(&serveraddr, packet->BootpSiAddr, 4);
+
+	packet = &pxe->Mode->DhcpAck.Dhcpv4;
+#if 0
+	if (!memcmp(packet->BootpHwAddr + 6, "\x00\x00\x00\x00\x00"
+					     "\x00\x00\x00\x00\x00", 10) &&
+			memcmp(packet->BootpHwAddr, "\x00\x00\x00\x00\x00\x00",
+				6)) {
+		char mac[21];
+		sprintf(mac, "00-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
+			hex[(packet->BootpHwAddr[0] & 0xf0) >> 4],
+			hex[packet->BootpHwAddr[0] & 0xf],
+			hex[(packet->BootpHwAddr[1] & 0xf0) >> 4],
+			hex[packet->BootpHwAddr[1] & 0xf],
+			hex[(packet->BootpHwAddr[2] & 0xf0) >> 4],
+			hex[packet->BootpHwAddr[2] & 0xf],
+			hex[(packet->BootpHwAddr[3] & 0xf0) >> 4],
+			hex[packet->BootpHwAddr[3] & 0xf],
+			hex[(packet->BootpHwAddr[4] & 0xf0) >> 4],
+			hex[packet->BootpHwAddr[4] & 0xf],
+			hex[(packet->BootpHwAddr[5] & 0xf0) >> 4],
+			hex[packet->BootpHwAddr[5] & 0xf]);
+		if (grub_efi_pxe_check_for_file(pxe, &serveraddr,
+					    packet->BootpBootFile, mac,
+					    &filepath)) {
+
+			return filepath;
+		}
+	}
+
+	sprintf(hexip, "%c%c%c%c%c%c%c%c",
+		hex[(packet->BootpYiAddr[0] & 0xf0) >> 4],
+		hex[packet->BootpYiAddr[0] & 0xf],
+		hex[(packet->BootpYiAddr[1] & 0xf0) >> 4],
+		hex[packet->BootpYiAddr[1] & 0xf],
+		hex[(packet->BootpYiAddr[2] & 0xf0) >> 4],
+		hex[packet->BootpYiAddr[2] & 0xf],
+		hex[(packet->BootpYiAddr[3] & 0xf0) >> 4],
+		hex[packet->BootpYiAddr[3] & 0xf]);
+
+	for (hexiplen = strlen(hexip); hexiplen > 0; hexiplen--)
+	{
+		hexip[hexiplen] = '\0';
+		if (grub_efi_pxe_check_for_file(pxe, &serveraddr,
+					    packet->BootpBootFile, hexip,
+					    &filepath)) {
+			return filepath;
+		}
+	}
+
+
+	if (grub_efi_pxe_check_for_file(pxe, &serveraddr, packet->BootpBootFile,
+				    "efidefault", &filepath)) {
+		return filepath;
+	}
+#endif
+	return NULL;
+}
+
+static void get_pxe_server(EFI_PXE_BASE_CODE *pxe, EFI_IP_ADDRESS **Address)
+{
+	EFI_IP_ADDRESS *tmp = grub_malloc(sizeof *tmp);
+	if (tmp) {
+		memset(tmp, '\0', sizeof (*tmp));
+		memcpy(&tmp->Addr[0], pxe->Mode->DhcpAck.Dhcpv4.BootpSiAddr, 4);
+		*Address = tmp;
+	}
+}
+
+static char *get_pxe_file_dir(EFI_PXE_BASE_CODE *pxe)
+{
+	char *FileDir = NULL;
+	char *DirEnd = NULL;
+	char *BootpBootFile;
+	size_t bplen;
+
+	BootpBootFile = pxe->Mode->DhcpAck.Dhcpv4.BootpBootFile;
+	bplen = strlen(BootpBootFile);
+	FileDir = grub_malloc(bplen + 1);
+	memcpy(FileDir, BootpBootFile, bplen);
+	FileDir[bplen] = '\0';
+
+	DirEnd = grub_strrchr(FileDir, '/');
+	if (!DirEnd)
+		DirEnd = FileDir;
+
+	*DirEnd = '\0';
+	
+	printf("FileDir: \"%s\"\n", FileDir);
+	return FileDir;
+}
+
+static void set_pxe_info(grub_efi_loaded_image_t *LoadedImage,
+			EFI_PXE_BASE_CODE *pxe)
+{
+	tftp_info.LoadedImage = LoadedImage;
+	tftp_info.Pxe = pxe;
+	get_pxe_server(pxe, &tftp_info.ServerIp);	
+	tftp_info.BasePath = get_pxe_file_dir(pxe);
+}
+
+char *grub_efi_pxe_get_config_path(grub_efi_loaded_image_t *LoadedImage)
+{
+	EFI_PXE_BASE_CODE *pxe = NULL;
+	EFI_IP_ADDRESS ServerIp;
+	char *FileName = NULL;
+	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
+	uuid_t uuid;
+	size_t FileSize = 0;
+	grub_efi_status_t rc = GRUB_EFI_SUCCESS;
+	char *ConfigPath = NULL;
+
+	pxe = grub_efi_locate_protocol(&PxeBaseCodeProtocol, NULL);
+	if (pxe == NULL)
+		return NULL;
+
+	if (!pxe->Mode->Started)
+		return NULL;
+
+	set_pxe_info(LoadedImage, pxe);
+
+	FileName = grub_malloc(strlen("1902dcf5-7190-d811-bbd6-6ef21c690030"));
+
+	packet = &pxe->Mode->DhcpDiscover.Dhcpv4;
+
+	if (get_dhcp_client_id((EFI_PXE_BASE_CODE_PACKET *)packet, &uuid)) {
+
+		uuid.time_mid = 0x0011;
+		sprintf(FileName,
+			"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+			uuid.time_low, uuid.time_mid, uuid.time_hi_ver,
+			uuid.clock_seq_hi, uuid.clock_seq_low,
+			uuid.node[0], uuid.node[1], uuid.node[2],
+			uuid.node[3], uuid.node[4], uuid.node[5]);
+		printf("FileName: \"%s\"\n", FileName);
+
+		rc = tftp_get_file_size(FileName, &FileSize);
+		if (rc == GRUB_EFI_SUCCESS) {
+			char *ReturnFile = grub_malloc(strlen("(nd)/") +
+						strlen(FileName) + 1);
+			sprintf(ReturnFile, "(nd)/%s", FileName);
+			grub_free(FileName);
+			//sprintf(tftp_info.LastPath, FileName);
+			return ReturnFile;
+		}
+	}
+
+	return NULL;
+}
diff --git a/efi/pxe.h b/efi/pxe.h
new file mode 100644
index 0000000..0a68007
--- /dev/null
+++ b/efi/pxe.h
@@ -0,0 +1,237 @@
+#ifndef PXE_H
+#define PXE_H 1
+
+#include "byteswap.h"
+
+extern char *grub_efi_pxe_get_config_path(grub_efi_loaded_image_t *LoadedImage);
+extern void grub_print_dhcp_info(grub_efi_loaded_image_t *loaded_image);
+extern char *grub_efi_pxe_path_to_path_name(void);
+
+
+#define EFI_PXE_BASE_CODE_PROTOCOL \
+    { 0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }
+static grub_efi_guid_t PxeBaseCodeProtocol = EFI_PXE_BASE_CODE_PROTOCOL;
+
+struct _EFI_PXE_BASE_CODE;
+
+typedef enum {
+	EFI_PXE_BASE_CODE_TFTP_FIRST,
+	EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE,
+	EFI_PXE_BASE_CODE_TFTP_READ_FILE,
+	EFI_PXE_BASE_CODE_TFTP_WRITE_FILE,
+	EFI_PXE_BASE_CODE_TFTP_READ_DIRECTORY,
+	EFI_PXE_BASE_CODE_MTFTP_GET_FILE_SIZE,
+	EFI_PXE_BASE_CODE_MTFTP_READ_FILE,
+	EFI_PXE_BASE_CODE_MTFTP_READ_DIRECTORY,
+	EFI_PXE_BASE_CODE_MTFTP_LAST
+} EFI_PXE_BASE_CODE_TFTP_OPCODE;
+
+typedef struct {
+    grub_efi_uint8_t                   Addr[4];
+} EFI_IPv4_ADDRESS;
+
+typedef struct {
+    grub_efi_uint8_t                   Addr[16];
+} EFI_IPv6_ADDRESS;
+
+typedef struct {
+    grub_efi_uint8_t                   Addr[32];
+} EFI_MAC_ADDRESS;
+
+typedef union {
+    grub_efi_uint32_t      Addr[4];
+    EFI_IPv4_ADDRESS    v4;
+    EFI_IPv6_ADDRESS    v6;
+} EFI_IP_ADDRESS;
+
+typedef grub_efi_uint16_t EFI_PXE_BASE_CODE_UDP_PORT;
+
+typedef struct {
+	EFI_IP_ADDRESS MCastIp;
+	EFI_PXE_BASE_CODE_UDP_PORT CPort;
+	EFI_PXE_BASE_CODE_UDP_PORT SPort;
+	grub_efi_uint16_t ListenTimeout;
+	grub_efi_uint16_t TransmitTimeout;
+} EFI_PXE_BASE_CODE_MTFTP_INFO;
+
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_MTFTP)(
+	struct _EFI_PXE_BASE_CODE *This,
+	EFI_PXE_BASE_CODE_TFTP_OPCODE Operation,
+	void *BufferPtr,
+	grub_efi_boolean_t Overwrite,
+	grub_efi_uint64_t *BufferSize,
+	grub_efi_uintn_t *BlockSize,
+	EFI_IP_ADDRESS *ServerIp,
+	grub_efi_uint8_t *Filename,
+	EFI_PXE_BASE_CODE_MTFTP_INFO *Info,
+	grub_efi_boolean_t DontUseBuffer);
+
+typedef struct {
+    grub_efi_uint8_t                           BootpOpcode;
+    grub_efi_uint8_t                           BootpHwType;
+    grub_efi_uint8_t                           BootpHwAddrLen;
+    grub_efi_uint8_t                           BootpGateHops;
+    grub_efi_uint32_t                          BootpIdent;
+    grub_efi_uint16_t                          BootpSeconds;
+    grub_efi_uint16_t                          BootpFlags;
+    grub_efi_uint8_t                           BootpCiAddr[4];
+    grub_efi_uint8_t                           BootpYiAddr[4];
+    grub_efi_uint8_t                           BootpSiAddr[4];
+    grub_efi_uint8_t                           BootpGiAddr[4];
+    grub_efi_uint8_t                           BootpHwAddr[16];
+    grub_efi_uint8_t                           BootpSrvName[64];
+    grub_efi_uint8_t                           BootpBootFile[128];
+    grub_efi_uint32_t                          DhcpMagik;
+    grub_efi_uint8_t                           DhcpOptions[56];
+} EFI_PXE_BASE_CODE_DHCPV4_PACKET;
+
+// TBD in EFI v1.1
+//typedef struct {
+//    grub_efi_uint8_t                           reserved;
+//} EFI_PXE_BASE_CODE_DHCPV6_PACKET;
+
+typedef union {
+    grub_efi_uint8_t                               Raw[1472];
+    EFI_PXE_BASE_CODE_DHCPV4_PACKET     Dhcpv4;
+//    EFI_PXE_BASE_CODE_DHCPV6_PACKET     Dhcpv6;
+} EFI_PXE_BASE_CODE_PACKET;
+
+typedef struct {
+    grub_efi_uint8_t                   Type;
+    grub_efi_uint8_t                   Code;
+    grub_efi_uint16_t                  Checksum;
+    union {
+        grub_efi_uint32_t              reserved;
+        grub_efi_uint32_t              Mtu;
+        grub_efi_uint32_t              Pointer;
+        struct {
+            grub_efi_uint16_t          Identifier;
+            grub_efi_uint16_t          Sequence;
+        } Echo;
+    } u;
+    grub_efi_uint8_t                   Data[494];
+} EFI_PXE_BASE_CODE_ICMP_ERROR;
+
+typedef struct {
+    grub_efi_uint8_t                   ErrorCode;
+    grub_efi_char8_t                   ErrorString[127];
+} EFI_PXE_BASE_CODE_TFTP_ERROR;
+
+
+#define EFI_PXE_BASE_CODE_MAX_IPCNT             8
+typedef struct {
+    grub_efi_uint8_t                       Filters;
+    grub_efi_uint8_t                       IpCnt;
+    grub_efi_uint16_t                      reserved;
+    EFI_IP_ADDRESS              IpList[EFI_PXE_BASE_CODE_MAX_IPCNT];
+} EFI_PXE_BASE_CODE_IP_FILTER;
+
+#define EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP             0x0001
+#define EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST              0x0002
+#define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS            0x0004
+#define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST  0x0008
+
+typedef struct {
+    EFI_IP_ADDRESS       IpAddr;
+    EFI_MAC_ADDRESS      MacAddr;
+} EFI_PXE_BASE_CODE_ARP_ENTRY;
+
+typedef struct {
+    EFI_IP_ADDRESS       IpAddr;
+    EFI_IP_ADDRESS       SubnetMask;
+    EFI_IP_ADDRESS       GwAddr;
+} EFI_PXE_BASE_CODE_ROUTE_ENTRY;
+
+#define EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES       8
+#define EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES     8
+
+typedef struct {
+    grub_efi_boolean_t                         Started;
+    grub_efi_boolean_t                         Ipv6Available;
+    grub_efi_boolean_t                         Ipv6Supported;
+    grub_efi_boolean_t                         UsingIpv6;
+    grub_efi_boolean_t                         BisSupported;
+    grub_efi_boolean_t                         BisDetected;
+    grub_efi_boolean_t                         AutoArp;
+    grub_efi_boolean_t                         SendGUID;
+    grub_efi_boolean_t                         DhcpDiscoverValid;
+    grub_efi_boolean_t                         DhcpAckReceived;
+    grub_efi_boolean_t                         ProxyOfferReceived;
+    grub_efi_boolean_t                         PxeDiscoverValid;
+    grub_efi_boolean_t                         PxeReplyReceived;
+    grub_efi_boolean_t                         PxeBisReplyReceived;
+    grub_efi_boolean_t                         IcmpErrorReceived;
+    grub_efi_boolean_t                         TftpErrorReceived;
+    grub_efi_boolean_t                         MakeCallbacks;
+    grub_efi_uint8_t                           TTL;
+    grub_efi_uint8_t                           ToS;
+    EFI_IP_ADDRESS                  StationIp;
+    EFI_IP_ADDRESS                  SubnetMask;
+    EFI_PXE_BASE_CODE_PACKET        DhcpDiscover;
+    EFI_PXE_BASE_CODE_PACKET        DhcpAck;
+    EFI_PXE_BASE_CODE_PACKET        ProxyOffer;
+    EFI_PXE_BASE_CODE_PACKET        PxeDiscover;
+    EFI_PXE_BASE_CODE_PACKET        PxeReply;
+    EFI_PXE_BASE_CODE_PACKET        PxeBisReply;
+    EFI_PXE_BASE_CODE_IP_FILTER     IpFilter;
+    grub_efi_uint32_t                          ArpCacheEntries;
+    EFI_PXE_BASE_CODE_ARP_ENTRY     ArpCache[EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES];
+    grub_efi_uint32_t                          RouteTableEntries;
+    EFI_PXE_BASE_CODE_ROUTE_ENTRY   RouteTable[EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES];
+    EFI_PXE_BASE_CODE_ICMP_ERROR    IcmpError;
+    EFI_PXE_BASE_CODE_TFTP_ERROR    TftpError;
+} EFI_PXE_BASE_CODE_MODE;
+
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_START)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_STOP)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_DHCP)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_DISCOVER)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_UDP_WRITE)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_UDP_READ)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_SET_IP_FILTER)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_ARP)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_SET_PARAMETERS)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_SET_STATION_IP)();
+typedef EFI_STATUS (*EFI_PXE_BASE_CODE_SET_PACKETS)();
+
+typedef struct _EFI_PXE_BASE_CODE{
+	grub_efi_uint64_t Revision;
+	EFI_PXE_BASE_CODE_START             Start;
+	EFI_PXE_BASE_CODE_STOP              Stop;
+	EFI_PXE_BASE_CODE_DHCP              Dhcp;
+	EFI_PXE_BASE_CODE_DISCOVER          Discover;
+	EFI_PXE_BASE_CODE_MTFTP             Mtftp;
+	EFI_PXE_BASE_CODE_UDP_WRITE         UdpWrite;
+	EFI_PXE_BASE_CODE_UDP_READ          UdpRead;
+	EFI_PXE_BASE_CODE_SET_IP_FILTER     SetIpFilter;
+	EFI_PXE_BASE_CODE_ARP               Arp;
+	EFI_PXE_BASE_CODE_SET_PARAMETERS    SetParameters;
+	EFI_PXE_BASE_CODE_SET_STATION_IP    SetStationIp;
+	EFI_PXE_BASE_CODE_SET_PACKETS       SetPackets;
+	EFI_PXE_BASE_CODE_MODE              *Mode;
+} EFI_PXE_BASE_CODE;
+
+typedef struct {
+	grub_efi_uint32_t time_low;
+	grub_efi_uint16_t time_mid;
+	grub_efi_uint16_t time_hi_ver;
+	grub_efi_uint8_t clock_seq_hi;
+	grub_efi_uint8_t clock_seq_low;
+	grub_efi_uint8_t node[6];
+} uuid_t;
+
+struct tftp_info {
+	grub_efi_loaded_image_t *LoadedImage;
+	EFI_PXE_BASE_CODE *Pxe;
+	EFI_IP_ADDRESS *ServerIp;
+	char *BasePath;
+	char *LastPath;
+	char *Buffer;
+};
+
+extern struct tftp_info tftp_info;
+extern grub_efi_status_t tftp_get_file_size(
+	char *Filename,
+	grub_efi_uintn_t *Size);
+
+#endif /* PXE_H */
diff --git a/grub/Makefile.am b/grub/Makefile.am
index 7eb2eaa..d4353f7 100644
--- a/grub/Makefile.am
+++ b/grub/Makefile.am
@@ -15,5 +15,5 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
 
 AM_CFLAGS = $(GRUB_CFLAGS)
 
-grub_SOURCES = main.c asmstub.c
+grub_SOURCES = main.c asmstub.c efitftp.c
 grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)
diff --git a/grub/efitftp.c b/grub/efitftp.c
new file mode 100644
index 0000000..383c451
--- /dev/null
+++ b/grub/efitftp.c
@@ -0,0 +1,29 @@
+#include <shared.h>
+#include <filesys.h>
+
+int
+efi_tftp_mount (void)
+{
+	grub_printf("non-efi efi_tftp_mount()\n");
+	return 0;
+}
+
+int
+efi_tftp_read (char *addr, int size)
+{
+	grub_printf ("non-efi efi_tftp_read (0x%x, %d)\n", (long) addr, size);
+	return 0;
+}
+
+int
+efi_tftp_dir (char *dirname)
+{
+	grub_printf ("non-efi efi_ftp_dir (%s)\n", dirname);
+	return 0;
+}
+
+void
+efi_tftp_close (void)
+{
+	grub_printf ("non-efi efi_tftp_close ()\n");
+}
diff --git a/stage2/Makefile.am b/stage2/Makefile.am
index e128bc2..06bc8e5 100644
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -23,7 +23,7 @@ libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
 	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
 	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
 	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
-	terminfo.c tparm.c graphics.c
+	terminfo.c tparm.c graphics.c efistubs.c
 libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
 	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
@@ -100,7 +100,7 @@ libstage2_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
 	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
 	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
 	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
-	terminfo.c tparm.c
+	terminfo.c tparm.c efistubs.c
 libstage2_a_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
 
 if !PLATFORM_EFI
diff --git a/stage2/disk_io.c b/stage2/disk_io.c
index 622bdbb..ef34ae4 100644
--- a/stage2/disk_io.c
+++ b/stage2/disk_io.c
@@ -28,6 +28,10 @@
 # include <etherboot.h>
 #endif
 
+#ifdef PLATFORM_EFI
+#include "efistubs.h"
+#endif
+
 #ifdef GRUB_UTIL
 # include <device.h>
 #endif
@@ -49,6 +53,9 @@ int fsmax;
 struct fsys_entry fsys_table[NUM_FSYS + 1] =
 {
   /* TFTP should come first because others don't handle net device.  */
+# ifdef PLATFORM_EFI
+  {"efitftp", efi_tftp_mount, efi_tftp_read, efi_tftp_dir, efi_tftp_close, 0},
+# endif
 # ifdef FSYS_TFTP
   {"tftp", tftp_mount, tftp_read, tftp_dir, tftp_close, 0},
 # endif
@@ -1067,7 +1074,7 @@ set_device (char *device)
       if (*device != ',' && *device != ')')
 	{
 	  char ch = *device;
-#ifdef SUPPORT_NETBOOT
+#if defined(SUPPORT_NETBOOT) || defined(PLATFORM_EFI)
 	  if (*device == 'f' || *device == 'h'
 	      || (*device == 'n' && network_ready)
 	      || (*device == 'c' && cdrom_drive != GRUB_INVALID_DRIVE))
@@ -1091,14 +1098,14 @@ set_device (char *device)
 
 	  if ((*device == 'f'
 	       || *device == 'h'
-#ifdef SUPPORT_NETBOOT
+#if defined(SUPPORT_NETBOOT) || defined(PLATFORM_EFI)
 	       || (*device == 'n' && network_ready)
 #endif
 	       || (*device == 'c' && cdrom_drive != GRUB_INVALID_DRIVE))
 	      && (device += 2, (*(device - 1) != 'd')))
 	    errnum = ERR_NUMBER_PARSING;
 	  
-#ifdef SUPPORT_NETBOOT
+#if defined(SUPPORT_NETBOOT) || defined(PLATFORM_EFI)
 	  if (ch == 'n' && network_ready)
 	    current_drive = NETWORK_DRIVE;
 	  else
@@ -1465,7 +1472,7 @@ print_completions (int is_filename, int is_completion)
 
 	      if (!ptr
 		  || *(ptr-1) != 'd'
-#ifdef SUPPORT_NETBOOT
+#if defined(SUPPORT_NETBOOT) || defined(PLATFORM_EFI)
 		  || *(ptr-2) != 'n'
 #endif /* SUPPORT_NETBOOT */
 		  || *(ptr-2) != 'c')
@@ -1496,7 +1503,7 @@ print_completions (int is_filename, int is_completion)
 		      || (*(ptr-1) == 'd' && *(ptr-2) == 'c')))
 		print_a_completion ("cd");
 
-# ifdef SUPPORT_NETBOOT
+# if defined(SUPPORT_NETBOOT) || defined(PLATFORM_EFI)
 	      if (network_ready
 		  && (disk_choice || NETWORK_DRIVE == current_drive)
 		  && (!ptr
diff --git a/stage2/efistubs.c b/stage2/efistubs.c
new file mode 100644
index 0000000..79db331
--- /dev/null
+++ b/stage2/efistubs.c
@@ -0,0 +1,9 @@
+
+#include "shared.h"
+#include "efistubs.h"
+
+#if defined(PLATFORM_EFI)
+int network_ready = 0;
+#else
+#error wtf
+#endif /* defined(PLATFORM_EFI) */
diff --git a/stage2/efistubs.h b/stage2/efistubs.h
new file mode 100644
index 0000000..97e407d
--- /dev/null
+++ b/stage2/efistubs.h
@@ -0,0 +1,8 @@
+#ifndef EFISTUBS_H
+#define EFISTUBS_H 1
+
+#if defined(PLATFORM_EFI)
+extern int network_ready;
+#endif /* defined(PLATFORM_EFI) */
+
+#endif /* EFISTUBS_H */
diff --git a/stage2/filesys.h b/stage2/filesys.h
index 4ea0728..4295e45 100644
--- a/stage2/filesys.h
+++ b/stage2/filesys.h
@@ -115,6 +115,17 @@ void tftp_close (void);
 #define FSYS_TFTP_NUM 0
 #endif
 
+#ifdef PLATFORM_EFI
+#define FSYS_EFI_TFTP_NUM 1
+int efi_tftp_mount (void);
+int efi_tftp_read (char *buf, int len);
+int efi_tftp_dir (char *dirname);
+void efi_tftp_close (void);
+#else
+#define FSYS_EFI_TFTP_NUM 0
+#endif
+
+
 #ifdef FSYS_ISO9660
 #define FSYS_ISO9660_NUM 1
 int iso9660_mount (void);
@@ -128,7 +139,7 @@ int iso9660_dir (char *dirname);
 #define NUM_FSYS	\
   (FSYS_FFS_NUM + FSYS_FAT_NUM + FSYS_EXT2FS_NUM + FSYS_MINIX_NUM	\
    + FSYS_REISERFS_NUM + FSYS_VSTAFS_NUM + FSYS_JFS_NUM + FSYS_XFS_NUM	\
-   + FSYS_TFTP_NUM + FSYS_ISO9660_NUM + FSYS_UFS2_NUM)
+   + FSYS_TFTP_NUM + FSYS_EFI_TFTP_NUM + FSYS_ISO9660_NUM + FSYS_UFS2_NUM)
 #endif
 
 /* defines for the block filesystem info area */
-- 
1.6.2



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- grub.spec	30 Mar 2009 21:22:56 -0000	1.88
+++ grub.spec	3 Apr 2009 18:34:11 -0000	1.89
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 44%{?dist}
+Release: 45%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -36,6 +36,7 @@
 Patch8: grub-0.97-xfs-buildfix.patch
 Patch9: grub-0.97-efigraph-use-blt.patch
 Patch10: grub-0.97-efislice.patch
+Patch11: grub-0.97-efipxe.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -56,6 +57,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 autoreconf
@@ -118,6 +120,9 @@
 %{_datadir}/grub
 
 %changelog
+* Fri Apr 03 2009 Peter Jones <pjones at redhat.com> - 0.97-45
+- Add very basic PXE support for EFI.
+
 * Mon Mar 30 2009 Matthew Garrett <mjg at redhat.com> - 0.97-44
 - Recognise the 0xef partition type
 



From pbrobinson at fedoraproject.org  Fri Apr  3 18:38:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  3 Apr 2009 18:38:05 +0000 (UTC)
Subject: rpms/gupnp-vala/devel gupnp-vala.spec,1.1,1.2
Message-ID: <20090403183805.9113570134@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27866

Modified Files:
	gupnp-vala.spec 
Log Message:
- Remove noarch, as its not due to the pkgconfig file


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/gupnp-vala.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gupnp-vala.spec	10 Mar 2009 21:30:52 -0000	1.1
+++ gupnp-vala.spec	3 Apr 2009 18:37:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gupnp-vala
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GUPnP is a upnp framework. This adds vala language bindings
 
 Group:          Development/Languages
@@ -9,7 +9,6 @@
 Source0:        http://www.gupnp.org/sources/bindings/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:     noarch
 BuildRequires: vala-devel >= 0.5.7
 BuildRequires: vala-tools >= 0.5.7
 BuildRequires: gssdp-devel >= 0.6.4
@@ -61,6 +60,9 @@
 %{_libdir}/pkgconfig/gupnp-vala-1.0.pc
 
 %changelog
+* Fri Apr  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.3-3
+- Remove noarch, as its not due to the pkgconfig file
+
 * Tue Mar 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.3-2
 - Patch for noarch and some reqs thanks to Michel Salim
 



From cebbert at fedoraproject.org  Fri Apr  3 18:48:01 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri,  3 Apr 2009 18:48:01 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-e820-acpi3-bios-workaround.patch, NONE, 
	1.1 linux-2.6-e820-guard-against-pre-acpi3.patch, NONE,
	1.1 linux-2.6-e820-mark-esi-clobbered.patch, NONE,
	1.1 linux-2.6-e820-save-restore-edi-ebp.patch, NONE,
	1.1 kernel.spec, 1.1509, 1.1510
Message-ID: <20090403184801.1FB3F70134@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28955

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-e820-acpi3-bios-workaround.patch 
	linux-2.6-e820-guard-against-pre-acpi3.patch 
	linux-2.6-e820-mark-esi-clobbered.patch 
	linux-2.6-e820-save-restore-edi-ebp.patch 
Log Message:
x86 E820 fixes from 2.6.30

linux-2.6-e820-acpi3-bios-workaround.patch:

--- NEW FILE linux-2.6-e820-acpi3-bios-workaround.patch ---
From: H. Peter Anvin <hpa at zytor.com>
Date: Sat, 28 Mar 2009 20:53:26 +0000 (-0700)
Subject: x86, setup: ACPI 3, BIOS workaround for E820-probing code
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c549e71d073a6e9a4847497344db28a784061455

x86, setup: ACPI 3, BIOS workaround for E820-probing code

Impact: ACPI 3 spec compliance, BIOS bug workaround

The ACPI 3 spec added another field to the E820 buffer -- which is
backwards incompatible, since it contains a validity bit.
Furthermore, there has been at least one report of a BIOS which
assumes that the buffer it is pointed at is the same buffer as for the
previous E820 call.  Therefore, read the data into a temporary buffer
and copy the standard part of it if and only if the valid bit is set.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index fcdb10a..d5d2360 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -2,6 +2,7 @@
  *
  *   Copyright (C) 1991, 1992 Linus Torvalds
  *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *   Copyright 2009 Intel Corporation; author H. Peter Anvin
  *
  *   This file is part of the Linux kernel, and is made available under
  *   the terms of the GNU General Public License version 2.
@@ -16,6 +17,11 @@
 
 #define SMAP	0x534d4150	/* ASCII "SMAP" */
 
+struct e820_ext_entry {
+	struct e820entry std;
+	u32 ext_flags;
+} __attribute__((packed));
+
 static int detect_memory_e820(void)
 {
 	int count = 0;
@@ -23,9 +29,10 @@ static int detect_memory_e820(void)
 	u32 size, id, edi;
 	u8 err;
 	struct e820entry *desc = boot_params.e820_map;
+	static struct e820_ext_entry buf; /* static so it is zeroed */
 
 	do {
-		size = sizeof(struct e820entry);
+		size = sizeof buf;
 
 		/* Important: %edx and %esi are clobbered by some BIOSes,
 		   so they must be either used for the error output
@@ -33,8 +40,8 @@ static int detect_memory_e820(void)
 		   is something out there clobbering %ebp and %edi, too. */
 		asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0"
 		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
-		      "=D" (edi), "=m" (*desc)
-		    : "D" (desc), "d" (SMAP), "a" (0xe820)
+		      "=D" (edi), "+m" (buf)
+		    : "D" (&buf), "d" (SMAP), "a" (0xe820)
 		    : "esi");
 
 		/* BIOSes which terminate the chain with CF = 1 as opposed
@@ -53,8 +60,14 @@ static int detect_memory_e820(void)
 			break;
 		}
 
+		/* ACPI 3.0 added the extended flags support.  If bit 0
+		   in the extended flags is zero, we're supposed to simply
+		   ignore the entry -- a backwards incompatible change! */
+		if (size > 20 && !(buf.ext_flags & 1))
+			continue;
+
+		*desc++ = buf.std;
 		count++;
-		desc++;
 	} while (next && count < ARRAY_SIZE(boot_params.e820_map));
 
 	return boot_params.e820_entries = count;

linux-2.6-e820-guard-against-pre-acpi3.patch:

--- NEW FILE linux-2.6-e820-guard-against-pre-acpi3.patch ---
From: H. Peter Anvin <hpa at zytor.com>
Date: Wed, 1 Apr 2009 18:35:00 +0000 (-0700)
Subject: x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cd670599b7b00d9263f6f11a05c0edeb9cbedaf3

x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx

Impact: BIOS bug safety

For pre-ACPI 3 BIOSes, pre-initialize the end of the e820 buffer just
in case the BIOS returns an unchanged %ecx but without actually
touching the ACPI 3 extended flags field.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index d5d2360..5054c2d 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -31,6 +31,12 @@ static int detect_memory_e820(void)
 	struct e820entry *desc = boot_params.e820_map;
 	static struct e820_ext_entry buf; /* static so it is zeroed */
 
+	/*
+	 * Set this here so that if the BIOS doesn't change this field
+	 * but still doesn't change %ecx, we're still okay...
+	 */
+	buf.ext_flags = 1;
+
 	do {
 		size = sizeof buf;
 

linux-2.6-e820-mark-esi-clobbered.patch:

--- NEW FILE linux-2.6-e820-mark-esi-clobbered.patch ---
From: Michael K. Johnson <johnsonm at rpath.com>
Date: Fri, 27 Mar 2009 17:14:41 +0000 (-0400)
Subject: x86, setup: mark %esi as clobbered in E820 BIOS call
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=01522df346f846906eaf6ca57148641476209909

x86, setup: mark %esi as clobbered in E820 BIOS call

Jordan Hargrave diagnosed a BIOS clobbering %esi in the E820 call.
That particular BIOS has been fixed, but there is a possibility that
this is responsible for other occasional reports of early boot
failure, and it does not hurt to add %esi to the clobbers.

-stable candidate patch.

Cc: Justin Forbes <jmforbes at linuxtx.org>
Signed-off-by: Michael K Johnson <johnsonm at rpath.com>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: stable at kernel.org
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index 8c3c25f..a99dbbe 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -27,13 +27,14 @@ static int detect_memory_e820(void)
 	do {
 		size = sizeof(struct e820entry);
 
-		/* Important: %edx is clobbered by some BIOSes,
-		   so it must be either used for the error output
+		/* Important: %edx and %esi are clobbered by some BIOSes,
+		   so they must be either used for the error output
 		   or explicitly marked clobbered. */
 		asm("int $0x15; setc %0"
 		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
 		      "=m" (*desc)
-		    : "D" (desc), "d" (SMAP), "a" (0xe820));
+		    : "D" (desc), "d" (SMAP), "a" (0xe820)
+		    : "esi");
 
 		/* BIOSes which terminate the chain with CF = 1 as opposed
 		   to %ebx = 0 don't always report the SMAP signature on

linux-2.6-e820-save-restore-edi-ebp.patch:

--- NEW FILE linux-2.6-e820-save-restore-edi-ebp.patch ---
From: H. Peter Anvin <hpa at zytor.com>
Date: Sat, 28 Mar 2009 20:53:26 +0000 (-0700)
Subject: x86, setup: preemptively save/restore edi and ebp around INT 15 E820
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=32ec7fd08b597586774b92ac1cd2678021ccac1b

x86, setup: preemptively save/restore edi and ebp around INT 15 E820

Impact: BIOS bugproofing

Since there are BIOSes known to clobber %ebx and %esi for INT 15 E820,
assume there is something out there clobbering %edi and/or %ebp too,
and don't wait for it to fail.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index a99dbbe..fcdb10a 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -20,7 +20,7 @@ static int detect_memory_e820(void)
 {
 	int count = 0;
 	u32 next = 0;
-	u32 size, id;
+	u32 size, id, edi;
 	u8 err;
 	struct e820entry *desc = boot_params.e820_map;
 
@@ -29,10 +29,11 @@ static int detect_memory_e820(void)
 
 		/* Important: %edx and %esi are clobbered by some BIOSes,
 		   so they must be either used for the error output
-		   or explicitly marked clobbered. */
-		asm("int $0x15; setc %0"
+		   or explicitly marked clobbered.  Given that, assume there
+		   is something out there clobbering %ebp and %edi, too. */
+		asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0"
 		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
-		      "=m" (*desc)
+		      "=D" (edi), "=m" (*desc)
 		    : "D" (desc), "d" (SMAP), "a" (0xe820)
 		    : "esi");
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -u -r1.1509 -r1.1510
--- kernel.spec	3 Apr 2009 16:37:54 -0000	1.1509
+++ kernel.spec	3 Apr 2009 18:47:30 -0000	1.1510
@@ -596,6 +596,11 @@
 
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch100: linux-2.6-e820-mark-esi-clobbered.patch
+Patch101: linux-2.6-e820-save-restore-edi-ebp.patch
+Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
+Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -1101,6 +1106,10 @@
 
 # Architecture patches
 # x86(-64)
+ApplyPatch linux-2.6-e820-mark-esi-clobbered.patch
+ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch
+ApplyPatch linux-2.6-e820-acpi3-bios-workaround.patch
+ApplyPatch linux-2.6-e820-guard-against-pre-acpi3.patch
 
 #
 # PowerPC
@@ -1889,6 +1898,9 @@
 # and build.
 
 %changelog
+* Fri Apr 03 2009 Chuck Ebbert <cebbert at redhat.com>
+- x86 E820 fixes from 2.6.30
+
 * Fri Apr 03 2009 Dave Jones <davej at redhat.com>
 - x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
 



From bpepple at fedoraproject.org  Fri Apr  3 19:02:33 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  3 Apr 2009 19:02:33 +0000 (UTC)
Subject: rpms/empathy/devel empathy-broken-pkgconfig.patch, 1.1,
	1.2 empathy.spec, 1.53, 1.54
Message-ID: <20090403190233.B47A670134@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31290

Modified Files:
	empathy-broken-pkgconfig.patch empathy.spec 
Log Message:
* Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.26.0.1-2
- Update pkgconfig patch to add libcanberra-gtk requires. (#493954)


empathy-broken-pkgconfig.patch:

Index: empathy-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- empathy-broken-pkgconfig.patch	30 Dec 2008 01:10:05 -0000	1.1
+++ empathy-broken-pkgconfig.patch	3 Apr 2009 19:02:33 -0000	1.2
@@ -1,6 +1,6 @@
-diff -urp empathy-2.25.3.OLD/libempathy/libempathy.pc.in empathy-2.25.3/libempathy/libempathy.pc.in
---- empathy-2.25.3.OLD/libempathy/libempathy.pc.in	2008-12-12 13:41:01.000000000 -0500
-+++ empathy-2.25.3/libempathy/libempathy.pc.in	2008-12-29 19:58:24.000000000 -0500
+diff -urp empathy-2.26.0.1.OLD/libempathy/libempathy.pc.in empathy-2.26.0.1/libempathy/libempathy.pc.in
+--- empathy-2.26.0.1.OLD/libempathy/libempathy.pc.in	2009-02-20 13:33:48.000000000 -0500
++++ empathy-2.26.0.1/libempathy/libempathy.pc.in	2009-04-03 14:59:09.000000000 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
  Name: libempathy
@@ -11,16 +11,16 @@
  Version: @VERSION@
  Libs: -L${libdir} -lempathy
  Cflags: -I${includedir} 
-diff -urp empathy-2.25.3.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.25.3/libempathy-gtk/libempathy-gtk.pc.in
---- empathy-2.25.3.OLD/libempathy-gtk/libempathy-gtk.pc.in	2008-12-12 13:41:01.000000000 -0500
-+++ empathy-2.25.3/libempathy-gtk/libempathy-gtk.pc.in	2008-12-29 19:57:54.000000000 -0500
+diff -urp empathy-2.26.0.1.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.26.0.1/libempathy-gtk/libempathy-gtk.pc.in
+--- empathy-2.26.0.1.OLD/libempathy-gtk/libempathy-gtk.pc.in	2009-02-20 13:33:48.000000000 -0500
++++ empathy-2.26.0.1/libempathy-gtk/libempathy-gtk.pc.in	2009-04-03 14:58:50.000000000 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
  Name: libempathy-gtk
  Description:  Empathy interface library
 -Requires: pkg-config >= 0.21
 -Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libmissioncontrol, libempathy, telepathy-glib
-+Requires: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libmissioncontrol, libempathy, telepathy-glib
++Requires: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libcanberra-gtk, libmissioncontrol, libempathy, telepathy-glib
  Version: @VERSION@
  Libs: -L${libdir} -lempathy-gtk
  Cflags: -I${includedir} 


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- empathy.spec	31 Mar 2009 07:08:48 -0000	1.53
+++ empathy.spec	3 Apr 2009 19:02:33 -0000	1.54
@@ -10,7 +10,7 @@
 
 Name:		empathy
 Version:	2.26.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -24,6 +24,7 @@
 Patch0: 	%{name}-fedora-mission-control-convert.patch
 ## Workaround for our broken pkgconfig
 ##  https://bugzilla.redhat.com/show_bug.cgi?id=436773
+##  http://bugzilla.gnome.org/show_bug.cgi?id=577863
 Patch1:		%{name}-broken-pkgconfig.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -228,6 +229,9 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.26.0.1-2
+- Update pkgconfig patch to add libcanberra-gtk requires. (#493954)
+
 * Mon Mar 30 2009 Peter Gordon <peter at thecodergeek.com> - 2.26.0.1-1
 - Update to new upstream release (2.26.0.1): updated translations, fixes a
   couple of crasher bugs and usage of the UNIX socket address.



From pjones at fedoraproject.org  Fri Apr  3 19:11:22 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri,  3 Apr 2009 19:11:22 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-efipxe.patch,1.1,1.2
Message-ID: <20090403191122.E5CE870134@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32447

Modified Files:
	grub-0.97-efipxe.patch 
Log Message:
* Fri Apr 03 2009 Peter Jones <pjones at redhat.com> - 0.97-45
- Add very basic PXE support for EFI.


grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-0.97-efipxe.patch	3 Apr 2009 18:34:11 -0000	1.1
+++ grub-0.97-efipxe.patch	3 Apr 2009 19:10:52 -0000	1.2
@@ -1267,10 +1267,15 @@
 index 0000000..383c451
 --- /dev/null
 +++ b/grub/efitftp.c
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,34 @@
 +#include <shared.h>
 +#include <filesys.h>
 +
++int efi_tftp_mount (void);
++int efi_tftp_read (char *buf, int len);
++int efi_tftp_dir (char *dirname);
++void efi_tftp_close (void);
++
 +int
 +efi_tftp_mount (void)
 +{
@@ -1393,15 +1398,13 @@
 index 0000000..79db331
 --- /dev/null
 +++ b/stage2/efistubs.c
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,7 @@
 +
 +#include "shared.h"
 +#include "efistubs.h"
 +
 +#if defined(PLATFORM_EFI)
 +int network_ready = 0;
-+#else
-+#error wtf
 +#endif /* defined(PLATFORM_EFI) */
 diff --git a/stage2/efistubs.h b/stage2/efistubs.h
 new file mode 100644



From sgrubb at fedoraproject.org  Fri Apr  3 19:23:52 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri,  3 Apr 2009 19:23:52 +0000 (UTC)
Subject: rpms/audit/F-10 audit.spec,1.206,1.207
Message-ID: <20090403192352.684297013C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1487

Modified Files:
	audit.spec 
Log Message:
* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 1.7.12-4
- Fix bz #491327 - audit-libs-python broken on 64 bit systems



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-10/audit.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- audit.spec	3 Apr 2009 19:22:48 -0000	1.206
+++ audit.spec	3 Apr 2009 19:23:22 -0000	1.207
@@ -1,7 +1,7 @@
 %define audit_version 1.7.12
 %define audit_release 4%{?dist}
 %define sca_version 0.4.8
-%define sca_release 18
+%define sca_release 19
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing



From sgrubb at fedoraproject.org  Fri Apr  3 19:23:49 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri,  3 Apr 2009 19:23:49 +0000 (UTC)
Subject: rpms/audit/F-10 audit-swig.patch,NONE,1.1 audit.spec,1.205,1.206
Message-ID: <20090403192349.47F7B7013C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1403

Modified Files:
	audit.spec 
Added Files:
	audit-swig.patch 
Log Message:
* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 1.7.12-4
- Fix bz #491327 - audit-libs-python broken on 64 bit systems


audit-swig.patch:

--- NEW FILE audit-swig.patch ---
diff -u -r audit-1.7.12/swig/Makefile.am audit-1.7.12.good/swig/Makefile.am
--- audit-1.7.12/swig/Makefile.am	2009-02-24 16:11:36.000000000 -0500
+++ audit-1.7.12.good/swig/Makefile.am	2009-03-06 23:36:21.000000000 -0500
@@ -25,7 +25,7 @@
 PYLIBVER ?= python$(PYTHON_VERSION)
 INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I/usr/include/$(PYLIBVER)
 LIBS = $(top_builddir)/lib/libaudit.la
-python_PYTHON = audit.py
+pyexec_PYTHON = audit.py
 pyexec_LTLIBRARIES = _audit.la
 pyexec_SOLIBRARIES = _audit.so
 _audit_la_LDFLAGS = -module -avoid-version
diff -u -r audit-1.7.12/swig/Makefile.in audit-1.7.12.good/swig/Makefile.in
--- audit-1.7.12/swig/Makefile.in	2009-02-24 16:12:03.000000000 -0500
+++ audit-1.7.12.good/swig/Makefile.in	2009-03-06 23:39:01.000000000 -0500
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,7 +34,7 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = swig
-DIST_COMMON = $(python_PYTHON) $(srcdir)/Makefile.am \
+DIST_COMMON = $(pyexec_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/src/libev/libev.m4 \
@@ -49,7 +49,7 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"
+am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)"
 pyexecLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pyexec_LTLIBRARIES)
 _audit_la_LIBADD =
@@ -72,7 +72,7 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(nodist__audit_la_SOURCES)
 DIST_SOURCES =
-pythonPYTHON_INSTALL = $(INSTALL_DATA)
+pyexecPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
 ETAGS = etags
 CTAGS = ctags
@@ -89,27 +89,24 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@
@@ -118,11 +115,17 @@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIBWRAP_LIBS = @LIBWRAP_LIBS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -146,8 +149,7 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -180,6 +182,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -201,6 +204,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -229,7 +233,7 @@
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 AM_CFLAGS = -fPIC -DPIC
 INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I/usr/include/$(PYLIBVER)
-python_PYTHON = audit.py
+pyexec_PYTHON = audit.py
 pyexec_LTLIBRARIES = _audit.la
 pyexec_SOLIBRARIES = _audit.so
 _audit_la_LDFLAGS = -module -avoid-version
@@ -244,8 +248,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -333,33 +337,33 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-pythonPYTHON: $(python_PYTHON)
+install-pyexecPYTHON: $(pyexec_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
-	@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
+	test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
+	@list='$(pyexec_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
 	    f=$(am__strip_dir) \
 	    dlist="$$dlist $$f"; \
-	    echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
-	    $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \
+	    echo " $(pyexecPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
+	    $(pyexecPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
 	  else :; fi; \
 	done; \
 	if test -n "$$dlist"; then \
 	  if test -z "$(DESTDIR)"; then \
-	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
+	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
 	  else \
-	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \
 	  fi; \
 	else :; fi
 
-uninstall-pythonPYTHON:
+uninstall-pyexecPYTHON:
 	@$(NORMAL_UNINSTALL)
-	@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
+	@list='$(pyexec_PYTHON)'; dlist=''; for p in $$list; do\
 	  f=$(am__strip_dir) \
-	  rm -f "$(DESTDIR)$(pythondir)/$$f"; \
-	  rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \
-	  rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \
+	  rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \
+	  rm -f "$(DESTDIR)$(pyexecdir)/$${f}c"; \
+	  rm -f "$(DESTDIR)$(pyexecdir)/$${f}o"; \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -367,7 +371,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -439,7 +443,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"; do \
+	for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -488,11 +492,11 @@
 
 info-am:
 
-install-data-am: install-pythonPYTHON
+install-data-am:
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-pyexecLTLIBRARIES
+install-exec-am: install-pyexecLTLIBRARIES install-pyexecPYTHON
 
 install-html: install-html-am
 
@@ -524,7 +528,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON
+uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pyexecPYTHON
 
 .MAKE: install-am install-strip
 
@@ -536,12 +540,12 @@
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
-	install-pyexecLTLIBRARIES install-pythonPYTHON install-strip \
+	install-pyexecLTLIBRARIES install-pyexecPYTHON install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-pyexecLTLIBRARIES \
-	uninstall-pythonPYTHON
+	uninstall-pyexecPYTHON
 
 PYLIBVER ?= python$(PYTHON_VERSION)
 _audit_la_HEADERS: $(top_builddir)/config.h 





From dwalsh at fedoraproject.org  Fri Apr  3 19:25:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 19:25:21 +0000 (UTC)
Subject: rpms/selinux-policy/devel customizable_types, NONE,
	1.1 policy-20090105.patch, 1.75, 1.76 selinux-policy.spec, 1.816,
	1.817
Message-ID: <20090403192521.8D22570134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2440

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Added Files:
	customizable_types 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-8
- Add customizable_types for svirt



--- NEW FILE customizable_types ---
svirt_image_t
virt_content_t

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- policy-20090105.patch	3 Apr 2009 14:45:58 -0000	1.75
+++ policy-20090105.patch	3 Apr 2009 19:25:20 -0000	1.76
@@ -125,9 +125,10 @@
 +system_u:system_r:svirt_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.10/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/virtual_image_context	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1 @@
++++ serefpolicy-3.6.10/config/appconfig-mcs/virtual_image_context	2009-04-03 14:55:45.000000000 -0400
+@@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
++system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.10/config/appconfig-mcs/xguest_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
@@ -199,9 +200,10 @@
 +system_u:system_r:qemu_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.10/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/virtual_image_context	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1 @@
++++ serefpolicy-3.6.10/config/appconfig-mls/virtual_image_context	2009-04-03 14:56:16.000000000 -0400
+@@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
++system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.10/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.10/config/appconfig-mls/xguest_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
@@ -10769,15 +10771,16 @@
 +allow session_bus_type dbusd_unconfined:dbus send_msg;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.fc serefpolicy-3.6.10/policy/modules/services/dcc.fc
 --- nsaserefpolicy/policy/modules/services/dcc.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.10/policy/modules/services/dcc.fc	2009-03-30 10:09:41.000000000 -0400
-@@ -11,6 +11,7 @@
- /usr/libexec/dcc/dccm		--	gen_context(system_u:object_r:dccm_exec_t,s0)
++++ serefpolicy-3.6.10/policy/modules/services/dcc.fc	2009-04-03 11:39:16.000000000 -0400
+@@ -12,6 +12,8 @@
  
  /var/dcc(/.*)?				gen_context(system_u:object_r:dcc_var_t,s0)
-+/var/lib/dcc(/.*)?			gen_context(system_u:object_r:dcc_var_t,s0)
  /var/dcc/map			--	gen_context(system_u:object_r:dcc_client_map_t,s0)
++/var/lib/dcc(/.*)?			gen_context(system_u:object_r:dcc_var_t,s0)
++/var/lib/dcc/map		--	gen_context(system_u:object_r:dcc_client_map_t,s0)
  
  /var/run/dcc(/.*)?			gen_context(system_u:object_r:dcc_var_run_t,s0)
+ /var/run/dcc/map		--	gen_context(system_u:object_r:dcc_client_map_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.6.10/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.10/policy/modules/services/dcc.te	2009-03-30 10:09:41.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -r1.816 -r1.817
--- selinux-policy.spec	3 Apr 2009 14:45:58 -0000	1.816
+++ selinux-policy.spec	3 Apr 2009 19:25:21 -0000	1.817
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -43,6 +43,7 @@
 Source17: booleans-minimum.conf
 Source18: setrans-minimum.conf
 Source19: securetty_types-minimum
+Source20: customizable_types
 
 Url: http://oss.tresys.com/repos/refpolicy/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,7 +114,7 @@
 touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 install -m0644 $RPM_SOURCE_DIR/securetty_types-%1 %{buildroot}%{_sysconfdir}/selinux/%1/contexts/securetty_types \
 install -m0644 $RPM_SOURCE_DIR/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \
-echo -n > %{buildroot}%{_sysconfdir}/selinux/%1/contexts/customizable_types \
+install -m0644 $RPM_SOURCE_DIR/customizable_types %{buildroot}%{_sysconfdir}/selinux/%1/contexts/customizable_types \
 bzip2 %{buildroot}/%{_usr}/share/selinux/%1/*.pp
 %nil
 
@@ -246,7 +247,6 @@
 echo  "xdg-open file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
 chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
 
-
 %clean
 %{__rm} -fR %{buildroot}
 
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-8
+- Add customizable_types for svirt
+
 * Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-7
 - Allow setroubelshoot exec* privs to prevent crash from bad libraries
 - add cpufreqselector



From jwilson at fedoraproject.org  Fri Apr  3 19:34:35 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  3 Apr 2009 19:34:35 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-lying-systems-without-lvds.patch, NONE, 
	1.1 linux-2.6-acer-wmi-bail-on-aao.patch, NONE, 1.1 kernel.spec,
	1.1510, 1.1511
Message-ID: <20090403193435.5130D70134@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3356

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-lying-systems-without-lvds.patch 
	linux-2.6-acer-wmi-bail-on-aao.patch 
Log Message:
* Fri Apr 03 2009 Jarod Wilson <jarod at redhat.com>
- Don't set up non-existent LVDS on systems with mobile Intel graphics chips
  that lie about having LVDS (like my Dell Studio Hybrid). Makes plymouth
  graphical boot function properly.
- Don't let acer-wmi do stupid things on unsupported systems (like, create
  a bogus rfkill entry in sysfs that effectively neuters wireless in
  NetworkManager on the Aspire One)


drm-intel-lying-systems-without-lvds.patch:

--- NEW FILE drm-intel-lying-systems-without-lvds.patch ---
 drivers/gpu/drm/i915/intel_lvds.c |   50 ++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 6619f26..4607662 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -384,7 +384,44 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
 	.destroy = intel_lvds_enc_destroy,
 };
 
+static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
+{
+	//DRM_DEBUG("Skipping LVDS initialization for %s\n", id->ident);
+	printk("Skipping LVDS initialization for %s\n", id->ident);
+	return 1;
+}
+
+/* These systems claim to have LVDS, but really don't */
+static const struct dmi_system_id __initdata intel_no_lvds[] = {
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Apple Mac Mini (Core series)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"),
+		},
+	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Apple Mac Mini (Core 2 series)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Macmini2,1"),
+		},
+	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Dell Studio Hybrid",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Studio Hybrid 140g"),
+		},
+	},
+
+	/* FIXME: add a check for the Aopen Mini PC */
 
+	{ }	/* terminating entry */
+};
 
 /**
  * intel_lvds_init - setup LVDS connectors on this device
@@ -404,15 +441,10 @@ void intel_lvds_init(struct drm_device *dev)
 	u32 lvds;
 	int pipe;
 
-	/* Blacklist machines that we know falsely report LVDS. */
-	/* FIXME: add a check for the Aopen Mini PC */
-
-	/* Apple Mac Mini Core Duo and Mac Mini Core 2 Duo */
-	if(dmi_match(DMI_PRODUCT_NAME, "Macmini1,1") ||
-	   dmi_match(DMI_PRODUCT_NAME, "Macmini2,1")) {
-		DRM_DEBUG("Skipping LVDS initialization for Apple Mac Mini\n");
-		return;
-	}
+	/* Skip init on machines we know falsely report LVDS */
+	if (dmi_check_system(intel_no_lvds))
+		printk("woulda disabled bogus lvds, but it fucks up Xv...\n");
+		//return;
 
 	intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
 	if (!intel_output) {

linux-2.6-acer-wmi-bail-on-aao.patch:

--- NEW FILE linux-2.6-acer-wmi-bail-on-aao.patch ---
[PATCH] acer-wmi: don't bother loading on unsupported systems

Its both a waste of system resources to load this driver on unsupported
systems (which happens often, due to the *Acer* dmi modalias wildcard),
and actually causes problems -- we wind up with a sysfs rfkill entry
that is always disabled, which throws things like NetworkManager for a
loop, causing it to think your wireless card isn't available, even
though the *real* rfkill entry for the card says it is. This is
triggering on multiple Acer Aspire One's here in the office, like so:

NetworkManager: <info> starting...
NetworkManager: <WARN> nm_generic_enable_loopback(): error -17 returned from rtnl_addr_add():#012Sucess#012
NetworkManager: <info> Found radio killswitch /org/freedesktop/Hal/devices/platform_acer_wmi_rfkill_acer_wireless_wlan
NetworkManager: <info> Found radio killswitch /org/freedesktop/Hal/devices/pci_8086_423a_rfkill_5350AGN_wlan
NetworkManager: <info> (eth0): new Ethernet device (driver: 'r8169')
NetworkManager: <info> (eth0): exported as /org/freedesktop/Hal/devices/net_00_1e_68_8a_a1_f8
NetworkManager: <info> (wlan0): driver supports SSID scans (scan_capa 0x01).
NetworkManager: <info> (wlan0): new 802.11 WiFi device (driver: 'iwlagn')
NetworkManager: <info> (wlan0): exported as /org/freedesktop/Hal/devices/net_00_16_eb_04_31_ea
NetworkManager: <info> Trying to start the supplicant...
NetworkManager: <info> Trying to start the system settings daemon...
NetworkManager: <info> Wireless now disabled by radio killswitch
NetworkManager: <info> (wlan0): supplicant manager state: down -> idle

So have acer-wmi just bail on unsupported systems -- includes only my
particular model of the Aspire One atm, but a larger list of unsupported
systems can be found here:

http://code.google.com/p/aceracpi/wiki/SupportedHardware

This might well become unnecessary once the WMI sysfs interface mentioned in
acer-wmi.c exists and the wild-card dmi modalias is gone, but for now... I
prefer to have working wireless, and this isn't exactly an obvious root
cause.

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 drivers/platform/x86/acer-wmi.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index a6a42e8..eda7eea 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -355,6 +355,25 @@ static struct dmi_system_id acer_quirks[] = {
 	{}
 };
 
+static int __init acer_wmi_unsupported_callback(const struct dmi_system_id *id)
+{
+	printk(ACER_INFO "%s not supported by Acer Laptop ACPI-WMI Extras\n",
+	       id->ident);
+	return 1;
+}
+
+static const struct dmi_system_id __initdata acer_wmi_unsupported[] = {
+	{
+		.callback = acer_wmi_unsupported_callback,
+		.ident = "Acer Aspire One",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+		},
+	},
+	{}
+};
+
 /* Find which quirks are needed for a particular vendor/ model pair */
 static void find_quirks(void)
 {
@@ -1252,6 +1271,10 @@ static int __init acer_wmi_init(void)
 {
 	int err;
 
+	/* Check for unsupported systems and bail */
+	if (dmi_check_system(acer_wmi_unsupported))
+		return -ENODEV;
+
 	printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
 
 	find_quirks();


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -r1.1510 -r1.1511
--- kernel.spec	3 Apr 2009 18:47:30 -0000	1.1510
+++ kernel.spec	3 Apr 2009 19:34:04 -0000	1.1511
@@ -625,6 +625,7 @@
 Patch393: linux-2.6-hwmon-atk0110.patch
 Patch394: linux-2.6-acpi-video-didl-intel-outputs.patch
 Patch395: linux-2.6-sony-laptop-rfkill.patch
+Patch396: linux-2.6-acer-wmi-bail-on-aao.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
@@ -677,6 +678,7 @@
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1820: drm-radeon-reorder-bm.patch
+Patch1821: drm-intel-lying-systems-without-lvds.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1168,6 +1170,7 @@
 ApplyPatch linux-2.6-hwmon-atk0110.patch
 ApplyPatch linux-2.6-acpi-video-didl-intel-outputs.patch
 ApplyPatch linux-2.6-sony-laptop-rfkill.patch
+ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1285,6 +1288,7 @@
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-radeon-reorder-bm.patch
+ApplyPatch drm-intel-lying-systems-without-lvds.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1898,6 +1902,14 @@
 # and build.
 
 %changelog
+* Fri Apr 03 2009 Jarod Wilson <jarod at redhat.com>
+- Don't set up non-existent LVDS on systems with mobile Intel graphics chips
+  that lie about having LVDS (like my Dell Studio Hybrid). Makes plymouth
+  graphical boot function properly.
+- Don't let acer-wmi do stupid things on unsupported systems (like, create
+  a bogus rfkill entry in sysfs that effectively neuters wireless in
+  NetworkManager on the Aspire One)
+
 * Fri Apr 03 2009 Chuck Ebbert <cebbert at redhat.com>
 - x86 E820 fixes from 2.6.30
 



From sgrubb at fedoraproject.org  Fri Apr  3 19:42:46 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri,  3 Apr 2009 19:42:46 +0000 (UTC)
Subject: rpms/audit/devel audit-1.7.12-libev.patch, NONE, 1.1 audit.spec,
	1.209, 1.210
Message-ID: <20090403194246.8B17570134@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4156

Modified Files:
	audit.spec 
Added Files:
	audit-1.7.12-libev.patch 
Log Message:
* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 1.7.12-4
- Drop some debug code in libev


audit-1.7.12-libev.patch:

--- NEW FILE audit-1.7.12-libev.patch ---
diff -ur audit-1.7.12.orig/src/libev/Makefile.in audit-1.7.12/src/libev/Makefile.in
--- audit-1.7.12.orig/src/libev/Makefile.in	2009-03-14 19:54:52.000000000 -0400
+++ audit-1.7.12/src/libev/Makefile.in	2009-03-14 20:03:38.000000000 -0400
@@ -78,7 +78,7 @@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -DNDEBUG
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- audit.spec	17 Mar 2009 18:30:16 -0000	1.209
+++ audit.spec	3 Apr 2009 19:42:16 -0000	1.210
@@ -1,8 +1,8 @@
 %define audit_version 1.7.12
-%define audit_release 3%{?dist}
+%define audit_release 4%{?dist}
 %define sca_version 0.4.8
-%define sca_release 18
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define sca_release 19
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
@@ -13,7 +13,8 @@
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 Patch1: audit-1.8-noaudit.patch
-Patch2: audit-swig.patch
+Patch2: audit-1.7.12-libev.patch
+Patch3: audit-swig.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -93,6 +94,7 @@
 %setup -q
 %patch1 -p2
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
@@ -187,9 +189,9 @@
 
 %files libs-python
 %defattr(-,root,root)
-%attr(755,root,root) %{python_sitelib}/_audit.so
-%attr(755,root,root) %{python_sitelib}/auparse.so
-%{python_sitelib}/audit.py*
+%attr(755,root,root) %{python_sitearch}/_audit.so
+%attr(755,root,root) %{python_sitearch}/auparse.so
+%{python_sitearch}/audit.py*
 
 %files
 %defattr(-,root,root,-)
@@ -262,6 +264,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 1.7.12-4
+- Drop some debug code in libev
+
 * Tue Mar 17 2009 Steve Grubb <sgrubb at redhat.com> 1.7.12-3
 - Apply patch from dwalsh moving audit.py file to arch specific python dir
 



From bpepple at fedoraproject.org  Fri Apr  3 19:42:53 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  3 Apr 2009 19:42:53 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.29, 1.30 sources, 1.29,
	1.30 telepathy-glib.spec, 1.37, 1.38
Message-ID: <20090403194253.7C21070134@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4234

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.29-1
- Update to 0.7.29.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	24 Mar 2009 23:02:42 -0000	1.29
+++ .cvsignore	3 Apr 2009 19:42:23 -0000	1.30
@@ -1 +1 @@
-telepathy-glib-0.7.28.tar.gz
+telepathy-glib-0.7.29.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	24 Mar 2009 23:02:42 -0000	1.29
+++ sources	3 Apr 2009 19:42:23 -0000	1.30
@@ -1 +1 @@
-bf12a774375cddf3d5902fdabae8b451  telepathy-glib-0.7.28.tar.gz
+ae67d4fe42c7e337813754cb5927b6cc  telepathy-glib-0.7.29.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- telepathy-glib.spec	24 Mar 2009 23:02:42 -0000	1.37
+++ telepathy-glib.spec	3 Apr 2009 19:42:23 -0000	1.38
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.28
+Version:        0.7.29
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.29-1
+- Update to 0.7.29.
+
 * Tue Mar 24 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.28-1
 - Update to 0.7.28.
 



From jwilson at fedoraproject.org  Fri Apr  3 19:48:54 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  3 Apr 2009 19:48:54 +0000 (UTC)
Subject: rpms/kernel/F-11 TODO, 1.61,
	1.62 drm-intel-lying-systems-without-lvds.patch, 1.1, 1.2
Message-ID: <20090403194854.D61B870134@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5156

Modified Files:
	TODO drm-intel-lying-systems-without-lvds.patch 
Log Message:
Update intel lvds blacklist patch header and update TODO a bit


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- TODO	30 Mar 2009 15:08:54 -0000	1.61
+++ TODO	3 Apr 2009 19:48:24 -0000	1.62
@@ -66,8 +66,10 @@
 * linux-2.6.29-lirc.patch
 * linux-2.6-sysrq-c.patch
 	jarod working on upstreaming
-* linux-2.6-hdpvr.patch
-	jarod added, should be in upstream v4l-dvb by .28, linus' tree by .29
+
+* drm-intel-lying-systems-without-lvds.patch
+* linux-2.6-acer-wmi-bail-on-aao.patch
+	jarod will send upstream shortly (so says he, on 20090303)
 
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch

drm-intel-lying-systems-without-lvds.patch:

Index: drm-intel-lying-systems-without-lvds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-intel-lying-systems-without-lvds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 19:34:04 -0000	1.1
+++ drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 19:48:24 -0000	1.2
@@ -1,3 +1,21 @@
+[PATCH] drm: ignore LVDS on intel graphics systems that lie about having it
+
+There are a number of small form factor desktop systems with Intel mobile
+graphics chips that lie and say they have an LVDS. With kernel mode-setting,
+this becomes a problem, and makes native resolution boot go haywire -- for
+example, my Dell Studio Hybrid, hooked to a 1920x1080 display claims to
+have a 1024x768 LVDS, and the resulting graphical boot on the 1920x1080
+display uses only the top left 1024x768, and auto-configured X will end
+up only 1024x768 as well. With this change, graphical boot and X
+both do 1920x1080 as expected.
+
+Nb: one minor issue... Current Fedora rawhide, video playback using Xv
+makes X go off into the weeds with this patch added... But that's a bug
+elsewhere, still confident this patch DTRT.
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+---
  drivers/gpu/drm/i915/intel_lvds.c |   50 ++++++++++++++++++++++++++++++------
  1 files changed, 41 insertions(+), 9 deletions(-)
 



From rmeggins at fedoraproject.org  Fri Apr  3 19:53:06 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri,  3 Apr 2009 19:53:06 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-10 fedora-ds-admin-cvs.sh, 1.5,
	1.6 fedora-ds-admin.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090403195306.2D0D870134@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5735/F-10

Modified Files:
	fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
Resolves: bug 493989
Description: Admin Server: valgrind invalid read in security.c when installing CRL



Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/fedora-ds-admin-cvs.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:20 -0000	1.5
+++ fedora-ds-admin-cvs.sh	3 Apr 2009 19:52:35 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC2
 VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/fedora-ds-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin.spec	1 Apr 2009 20:02:20 -0000	1.6
+++ fedora-ds-admin.spec	3 Apr 2009 19:52:35 -0000	1.7
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,6 +147,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Apr  3 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
+- Resolves: bug 493989
+- Description: Admin Server: valgrind invalid read in security.c when installing CRL
+
 * Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
 - this is the 1.1.7 release
 - added man pages for setup, migration, remove commands


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Apr 2009 20:02:20 -0000	1.6
+++ sources	3 Apr 2009 19:52:35 -0000	1.7
@@ -1 +1 @@
-531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2
+bf2fe57c719783ce116ac6aaf8227539  fedora-ds-admin-1.1.7.tar.bz2



From rmeggins at fedoraproject.org  Fri Apr  3 19:53:06 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri,  3 Apr 2009 19:53:06 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-9 fedora-ds-admin-cvs.sh, 1.5,
	1.6 fedora-ds-admin.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090403195306.5BCF470134@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5735/F-9

Modified Files:
	fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
Resolves: bug 493989
Description: Admin Server: valgrind invalid read in security.c when installing CRL



Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin-cvs.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:21 -0000	1.5
+++ fedora-ds-admin-cvs.sh	3 Apr 2009 19:52:36 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC2
 VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-admin.spec	1 Apr 2009 20:02:21 -0000	1.5
+++ fedora-ds-admin.spec	3 Apr 2009 19:52:36 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,6 +147,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Apr  3 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
+- Resolves: bug 493989
+- Description: Admin Server: valgrind invalid read in security.c when installing CRL
+
 * Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
 - this is the 1.1.7 release
 - added man pages for setup, migration, remove commands


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Apr 2009 20:02:21 -0000	1.6
+++ sources	3 Apr 2009 19:52:36 -0000	1.7
@@ -1 +1 @@
-531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2
+bf2fe57c719783ce116ac6aaf8227539  fedora-ds-admin-1.1.7.tar.bz2



From rmeggins at fedoraproject.org  Fri Apr  3 19:53:06 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri,  3 Apr 2009 19:53:06 +0000 (UTC)
Subject: rpms/fedora-ds-admin/devel fedora-ds-admin-cvs.sh, 1.5,
	1.6 fedora-ds-admin.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090403195306.9550970134@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5735/devel

Modified Files:
	fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
Resolves: bug 493989
Description: Admin Server: valgrind invalid read in security.c when installing CRL



Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin-cvs.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:21 -0000	1.5
+++ fedora-ds-admin-cvs.sh	3 Apr 2009 19:52:36 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC2
 VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-admin.spec	1 Apr 2009 20:02:21 -0000	1.7
+++ fedora-ds-admin.spec	3 Apr 2009 19:52:36 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,6 +147,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Apr  3 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
+- Resolves: bug 493989
+- Description: Admin Server: valgrind invalid read in security.c when installing CRL
+
 * Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
 - this is the 1.1.7 release
 - added man pages for setup, migration, remove commands


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Apr 2009 20:02:21 -0000	1.6
+++ sources	3 Apr 2009 19:52:36 -0000	1.7
@@ -1 +1 @@
-531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2
+bf2fe57c719783ce116ac6aaf8227539  fedora-ds-admin-1.1.7.tar.bz2



From dodji at fedoraproject.org  Fri Apr  3 19:57:59 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Fri,  3 Apr 2009 19:57:59 +0000 (UTC)
Subject: rpms/nemiver/devel sources,1.15,1.16
Message-ID: <20090403195759.961A270134@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7040

Modified Files:
	sources 
Log Message:
Uploaded nemiver 0.6.6




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Mar 2009 12:29:17 -0000	1.15
+++ sources	3 Apr 2009 19:57:29 -0000	1.16
@@ -1 +1 @@
-8986dd9eec47604826a8556d37e51746  nemiver-0.6.5.tar.bz2
+e17c00535e6584668fe785aa7589f98f  nemiver-0.6.6.tar.bz2



From sgrubb at fedoraproject.org  Fri Apr  3 19:58:43 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri,  3 Apr 2009 19:58:43 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.41,1.42
Message-ID: <20090403195843.0D29C70134@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7305

Modified Files:
	libprelude.spec 
Log Message:
* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 0.9.21.2-9
- remove check section, doesn't work on anything except x86 anyways



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libprelude.spec	13 Mar 2009 10:13:18 -0000	1.41
+++ libprelude.spec	3 Apr 2009 19:58:12 -0000	1.42
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.21.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -15,9 +15,6 @@
 
 BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
 BuildRequires:	swig chrpath 
-%ifnarch ppc ppc64 s390 s390x
-BuildRequires:	valgrind 
-%endif
 
 %description
 The Prelude Library is a collection of generic functions providing
@@ -110,12 +107,6 @@
 # Fix time stamp for both 32 and 64 bit libraries
 touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/*
 
-# PPC strips ld.so so valgrind can't run
-##%ifnarch ppc ppc64
-##%check
-##make check
-##%endif
-
 %clean
 rm -rf %{buildroot}
 
@@ -158,6 +149,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 0.9.21.2-9
+- remove check section, doesn't work on anything except x86 anyways
+
 * Fri Mar 13 2009 Karsten Hopp <karsten at redhat.com> 0.9.21.2-8
 - don't buildrequire valgrind on s390x, similar to ppc
 



From dodji at fedoraproject.org  Fri Apr  3 20:01:31 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Fri,  3 Apr 2009 20:01:31 +0000 (UTC)
Subject: rpms/nemiver/devel nemiver.spec,1.22,1.23
Message-ID: <20090403200131.EC55470134@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7781

Modified Files:
	nemiver.spec 
Log Message:
* Fri Apr 03 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.6-1
- Update to new upstream release (0.6.6)
- Drop patch http://bugzilla.gnome.org/show_bug.cgi?id=574915
  as included in upstream release.




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nemiver.spec	13 Mar 2009 11:12:17 -0000	1.22
+++ nemiver.spec	3 Apr 2009 20:01:01 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		nemiver
-Version:	0.6.5
-Release:	2%{?dist}
+Version:	0.6.6
+Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers
@@ -8,11 +8,6 @@
 URL:		http://home.gna.org/nemiver/
 
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
-#Updates the Nemiver spinner code to
-#the latest Epiphany spinner widget code.
-#This closes upstream bug
-#http://bugzilla.gnome.org/show_bug.cgi?id=574915.
-Patch0:		%{name}-%{version}-update-spinner.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -71,8 +66,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .update-spinner.patch
-
 
 %build
 %configure --disable-static --disable-schemas-install		\
@@ -150,6 +143,11 @@
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Fri Apr 03 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.6-1
+- Update to new upstream release (0.6.6)
+- Drop patch http://bugzilla.gnome.org/show_bug.cgi?id=574915
+  as included in upstream release.
+
 * Fri Mar 13 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.5-2
 - Add upstream patch http://bugzilla.gnome.org/show_bug.cgi?id=574915
   Fixes a "spinner not found" bug.



From nhorman at fedoraproject.org  Fri Apr  3 20:04:33 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri,  3 Apr 2009 20:04:33 +0000 (UTC)
Subject: rpms/kexec-tools/F-10 kexec-tools.spec, 1.125, 1.126 mkdumprd, 1.25,
	1.26
Message-ID: <20090403200433.2DEC570134@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8122

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz 493707


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-10/kexec-tools.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kexec-tools.spec	5 Nov 2008 14:38:43 -0000	1.125
+++ kexec-tools.spec	3 Apr 2009 20:04:02 -0000	1.126
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -239,6 +239,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-4
+- Fix typo in mkdumprd which breaks use of makedumpfile (bz 493707)
+
 * Wed Nov 05 2008 Neil Horman <nhorman at redhat.com> - 2.0.0-3
 - Correct source file to use proper lang package (bz 335191)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-10/mkdumprd,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mkdumprd	29 Oct 2008 13:37:34 -0000	1.25
+++ mkdumprd	3 Apr 2009 20:04:02 -0000	1.26
@@ -2022,7 +2022,7 @@
                     emit "  mkdir -p /mnt/$SAVE_PATH/127.0.0.1-\$DATE"
                     emit "  VMCORE=/mnt/$SAVE_PATH/127.0.0.1-\$DATE/vmcore"
                     emit "  export VMCORE"
-                    if [ $CORE_COLLECTOR == "cp" ]; then
+                    if [ "$CORE_COLLECTOR" == "cp" ]; then
                         emit "  monitor_cp_progress \$VMCORE-incomplete &"
                     fi
                     emit "  $CORE_COLLECTOR /proc/vmcore \$VMCORE-incomplete >/dev/null"



From nhorman at fedoraproject.org  Fri Apr  3 20:07:00 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri,  3 Apr 2009 20:07:00 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.130, 1.131 mkdumprd, 1.25,
	1.26
Message-ID: <20090403200700.0DD0570134@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8389

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resoves: bz 493707


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kexec-tools.spec	2 Apr 2009 17:39:05 -0000	1.130
+++ kexec-tools.spec	3 Apr 2009 20:06:29 -0000	1.131
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -242,6 +242,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-10
+- Fix problem with quoted CORE_COLLECTOR string (bz 493707)
+
 * Thu Apr 02 2009 Orion Poplawski <orion at cora.nwra.com> - 2.0.0-9
 - Add BR glibc-static
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mkdumprd	29 Oct 2008 13:37:34 -0000	1.25
+++ mkdumprd	3 Apr 2009 20:06:29 -0000	1.26
@@ -2022,7 +2022,7 @@
                     emit "  mkdir -p /mnt/$SAVE_PATH/127.0.0.1-\$DATE"
                     emit "  VMCORE=/mnt/$SAVE_PATH/127.0.0.1-\$DATE/vmcore"
                     emit "  export VMCORE"
-                    if [ $CORE_COLLECTOR == "cp" ]; then
+                    if [ "$CORE_COLLECTOR" == "cp" ]; then
                         emit "  monitor_cp_progress \$VMCORE-incomplete &"
                     fi
                     emit "  $CORE_COLLECTOR /proc/vmcore \$VMCORE-incomplete >/dev/null"



From dodji at fedoraproject.org  Fri Apr  3 20:09:23 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Fri,  3 Apr 2009 20:09:23 +0000 (UTC)
Subject: rpms/nemiver/F-10 nemiver.spec,1.21,1.22
Message-ID: <20090403200923.8C76170134@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9011

Modified Files:
	nemiver.spec 
Log Message:
* Fri Apr 03 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.6-1
- Update to new upstream release (0.6.6)




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nemiver.spec	1 Mar 2009 13:51:54 -0000	1.21
+++ nemiver.spec	3 Apr 2009 20:08:53 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.6.5
+Version:	0.6.6
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.6-1
+- Update to new upstream release (0.6.6)
+
 * Sun Mar 01 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.5-1
 - Update to new upstream release (0.6.5)
 - BuildRequires intltool



From peter at fedoraproject.org  Fri Apr  3 20:10:04 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  3 Apr 2009 20:10:04 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd-captcha.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 ejabberd.spec, 1.35, 1.36 import.log, 1.8,
	1.9 mod_ctlextra.erl, 1.4, 1.5 sources, 1.15, 1.16
Message-ID: <20090403201004.1170070134@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9153/devel

Modified Files:
	.cvsignore ejabberd.spec import.log mod_ctlextra.erl sources 
Added Files:
	ejabberd-captcha.patch 
Log Message:
Ver. 2.0.5

ejabberd-captcha.patch:

--- NEW FILE ejabberd-captcha.patch ---
Binary files ejabberd-2.0.4/src/.DS_Store and ejabberd-2.0.4-new/src/.DS_Store differ
diff -urN ejabberd-2.0.4/src/ejabberd_captcha.erl ejabberd-2.0.4-new/src/ejabberd_captcha.erl
--- ejabberd-2.0.4/src/ejabberd_captcha.erl	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_captcha.erl	2009-03-14 07:27:05.000000000 +0100
@@ -0,0 +1,312 @@
+%%%-------------------------------------------------------------------
+%%% File    : ejabberd_captcha.erl
+%%% Author  : Evgeniy Khramtsov <xramtsov at gmail.com>
+%%% Description : CAPTCHA processing.
+%%%
+%%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov at gmail.com>
+%%%-------------------------------------------------------------------
+-module(ejabberd_captcha).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-export([create_captcha/6, process_reply/1, process/2]).
+
+-include("jlib.hrl").
+-include("ejabberd.hrl").
+-include("web/ejabberd_http.hrl").
+
+-define(VFIELD(Type, Var, Value),
+	{xmlelement, "field", [{"type", Type}, {"var", Var}],
+	 [{xmlelement, "value", [], [Value]}]}).
+
+-define(CAPTCHA_BODY(Lang, Room, URL),
+	translate:translate(Lang, "Your messages to ") ++ Room
+	++ translate:translate(Lang, " are being blocked. To unblock them, visit ")
+	++ URL).
+
+-define(CAPTCHA_TEXT(Lang), translate:translate(Lang, "Enter the text you see")).
+-define(CAPTCHA_LIFETIME, 120000). % two minutes
+
+-record(state, {}).
+-record(captcha, {id, pid, key, tref, args}).
+
+-define(T(S),
+	case catch mnesia:transaction(fun() -> S end) of
+	    {atomic, Res} ->
+		Res;
+	    {_, Reason} ->
+		?ERROR_MSG("mnesia transaction failed: ~p", [Reason]),
+		{error, Reason}
+	end).
+
+%%====================================================================
+%% API
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+create_captcha(Id, SID, From, To, Lang, Args)
+  when is_list(Id), is_list(Lang), is_list(SID),
+       is_record(From, jid), is_record(To, jid) ->
+    case create_image() of
+	{ok, Type, Key, Image} ->
+	    B64Image = jlib:encode_base64(binary_to_list(Image)),
+	    JID = jlib:jid_to_string(From),
+	    CID = "sha1+" ++ sha:sha(Image) ++ "@bob.xmpp.org",
+	    Data = {xmlelement, "data",
+		    [{"xmlns", ?NS_BOB}, {"cid", CID},
+		     {"max-age", "0"}, {"type", Type}],
+		    [{xmlcdata, B64Image}]},
+	    Captcha =
+		{xmlelement, "captcha", [{"xmlns", ?NS_CAPTCHA}],
+		 [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
+		   [?VFIELD("hidden", "FORM_TYPE", {xmlcdata, ?NS_CAPTCHA}),
+		    ?VFIELD("hidden", "from", {xmlcdata, jlib:jid_to_string(To)}),
+		    ?VFIELD("hidden", "challenge", {xmlcdata, Id}),
+		    ?VFIELD("hidden", "sid", {xmlcdata, SID}),
+		    {xmlelement, "field", [{"var", "ocr"}],
+		     [{xmlelement, "media", [{"xmlns", ?NS_MEDIA}],
+		       [{xmlelement, "uri", [{"type", Type}],
+			 [{xmlcdata, "cid:" ++ CID}]}]}]}]}]},
+	    Body = {xmlelement, "body", [],
+		    [{xmlcdata, ?CAPTCHA_BODY(Lang, JID, get_url(Id))}]},
+	    OOB = {xmlelement, "x", [{"xmlns", ?NS_OOB}],
+		   [{xmlelement, "url", [], [{xmlcdata, get_url(Id)}]}]},
+	    Tref = erlang:send_after(?CAPTCHA_LIFETIME, ?MODULE, {remove_id, Id}),
+	    ?T(mnesia:write(#captcha{id=Id, pid=self(), key=Key,
+				     tref=Tref, args=Args})),
+	    {ok, [Body, OOB, Captcha, Data]};
+	_Err ->
+	    error
+    end.
+
+process_reply({xmlelement, "captcha", _, _} = El) ->
+    case xml:get_subtag(El, "x") of
+	false ->
+	    {error, malformed};
+	Xdata ->
+	    Fields = jlib:parse_xdata_submit(Xdata),
+	    [Id | _] = proplists:get_value("challenge", Fields, [none]),
+	    [OCR | _] = proplists:get_value("ocr", Fields, [none]),
+	    ?T(case mnesia:read(captcha, Id, write) of
+		   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+		       mnesia:delete({captcha, Id}),
+		       erlang:cancel_timer(Tref),
+		       if OCR == Key ->
+			       Pid ! {captcha_succeed, Args},
+			       ok;
+			  true ->
+			       Pid ! {captcha_failed, Args},
+			       {error, bad_match}
+		       end;
+		   _ ->
+		       {error, not_found}
+	       end)
+    end;
+process_reply(_) ->
+    {error, malformed}.
+
+process(_Handlers, #request{method='GET', lang=Lang, path=[_, Id]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{}] ->
+	    Form =
+		{xmlelement, "div", [{"align", "center"}],
+		 [{xmlelement, "form", [{"action", get_url(Id)},
+					{"name", "captcha"},
+					{"method", "POST"}],
+		   [{xmlelement, "img", [{"src", get_url(Id ++ "/image")}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlcdata, ?CAPTCHA_TEXT(Lang)},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "text"},
+					   {"name", "key"},
+					   {"size", "10"}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "submit"},
+					   {"name", "enter"},
+					   {"value", "OK"}], []}]}]},
+	    ejabberd_web:make_xhtml([Form]);
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='GET', path=[_, Id, "image"]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{key=Key}] ->
+	    case create_image(Key) of
+		{ok, Type, _, Img} ->
+		    {200,
+		     [{"Content-Type", Type},
+		      {"Cache-Control", "no-cache"},
+		      {"Last-Modified", httpd_util:rfc1123_date()}],
+		     Img};
+		_ ->
+		    ejabberd_web:error(not_found)
+	    end;
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='POST', q=Q, path=[_, Id]}) ->
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+	       mnesia:delete({captcha, Id}),
+	       erlang:cancel_timer(Tref),
+	       Input = proplists:get_value("key", Q, none),
+	       if Input == Key ->
+		       Pid ! {captcha_succeed, Args},
+		       ejabberd_web:make_xhtml([]);
+		  true ->
+		       Pid ! {captcha_failed, Args},
+		       ejabberd_web:error(not_allowed)
+	       end;
+	   _ ->
+	       ejabberd_web:error(not_found)
+       end).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+init([]) ->
+    mnesia:create_table(captcha,
+			[{ram_copies, [node()]},
+			 {attributes, record_info(fields, captcha)}]),
+    mnesia:add_table_copy(captcha, node(), ram_copies),
+    {ok, #state{}}.
+
+handle_call(_Request, _From, State) ->
+    {reply, bad_request, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info({remove_id, Id}, State) ->
+    ?DEBUG("captcha ~p timed out", [Id]),
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{args=Args, pid=Pid}] ->
+	       Pid ! {captcha_failed, Args},
+	       mnesia:delete({captcha, Id});
+	   _ ->
+	       ok
+       end),
+    {noreply, State};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Function: create_image() -> {ok, Type, Key, Image} | {error, Reason}
+%% Type = "image/png" | "image/jpeg" | "image/gif"
+%% Key = string()
+%% Image = binary()
+%% Reason = atom()
+%%--------------------------------------------------------------------
+create_image() ->
+    %% Six numbers from 1 to 9.
+    Key = string:substr(randoms:get_string(), 1, 6),
+    create_image(Key).
+
+create_image(Key) ->
+    FileName = get_prog_name(),
+    Cmd = lists:flatten(io_lib:format("~s ~s", [FileName, Key])),
+    case cmd(Cmd) of
+	{ok, <<16#89, $P, $N, $G, $\r, $\n, 16#1a, $\n, _/binary>> = Img} ->
+	    {ok, "image/png", Key, Img};
+	{ok, <<16#ff, 16#d8, _/binary>> = Img} ->
+	    {ok, "image/jpeg", Key, Img};
+	{ok, <<$G, $I, $F, $8, X, $a, _/binary>> = Img} when X==$7; X==$9 ->
+	    {ok, "image/gif", Key, Img};
+	{error, Reason} ->
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason};
+	_ ->
+	    Reason = malformed_image,
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason}
+    end.
+
+get_prog_name() ->
+    case ejabberd_config:get_local_option(captcha_cmd) of
+	FileName when is_list(FileName) ->
+	    FileName;
+	_ ->
+	    ""
+    end.
+
+get_url(Str) ->
+    case ejabberd_config:get_local_option(captcha_host) of
+	Host when is_list(Host) ->
+	    "http://" ++ Host ++ "/captcha/" ++ Str;
+	_ ->
+	    "http://" ++ ?MYNAME ++ "/captcha/" ++ Str
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: cmd(Cmd) -> Data | {error, Reason}
+%% Cmd = string()
+%% Data = binary()
+%% Description: os:cmd/1 replacement
+%%--------------------------------------------------------------------
+-define(CMD_TIMEOUT, 5000).
+-define(MAX_FILE_SIZE, 64*1024).
+
+cmd(Cmd) ->
+    Port = open_port({spawn, Cmd}, [stream, eof, binary]),
+    TRef = erlang:start_timer(?CMD_TIMEOUT, self(), timeout),
+    recv_data(Port, TRef, <<>>).
+
+recv_data(Port, TRef, Buf) ->
+    receive
+	{Port, {data, Bytes}} ->
+	    NewBuf = <<Buf/binary, Bytes/binary>>,
+	    if size(NewBuf) > ?MAX_FILE_SIZE ->
+		    return(Port, TRef, {error, efbig});
+	       true ->
+		    recv_data(Port, TRef, NewBuf)
+	    end;
+	{Port, {data, _}} ->
+	    return(Port, TRef, {error, efbig});
+	{Port, eof} when Buf /= <<>> ->
+	    return(Port, TRef, {ok, Buf});
+	{Port, eof} ->
+	    return(Port, TRef, {error, enodata});
+	{timeout, TRef, _} ->
+	    return(Port, TRef, {error, timeout})
+    end.
+
+return(Port, TRef, Result) ->
+    case erlang:cancel_timer(TRef) of
+	false ->
+	    receive
+		{timeout, TRef, _} ->
+		    ok
+	    after 0 ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end,
+    catch port_close(Port),
+    Result.
diff -urN ejabberd-2.0.4/src/ejabberd_config.erl ejabberd-2.0.4-new/src/ejabberd_config.erl
--- ejabberd-2.0.4/src/ejabberd_config.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_config.erl	2009-03-14 11:43:35.000000000 +0100
@@ -164,6 +164,10 @@
 	    add_option(watchdog_admins, Admins, State);
 	{registration_timeout, Timeout} ->
 	    add_option(registration_timeout, Timeout, State);
+	{captcha_cmd, Cmd} ->
+	    add_option(captcha_cmd, Cmd, State);
+	{captcha_host, Host} ->
+            add_option(captcha_host, Host, State);
 	{loglevel, Loglevel} ->
 	    ejabberd_loglevel:set(Loglevel),
 	    State;
diff -urN ejabberd-2.0.4/src/ejabberd_sup.erl ejabberd-2.0.4-new/src/ejabberd_sup.erl
--- ejabberd-2.0.4/src/ejabberd_sup.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_sup.erl	2009-03-14 12:36:43.000000000 +0100
@@ -84,6 +84,13 @@
 	 brutal_kill,
 	 worker,
 	 [ejabberd_local]},
+    Captcha =
+	{ejabberd_captcha,
+	 {ejabberd_captcha, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 [ejabberd_captcha]},
     Listener =
 	{ejabberd_listener,
 	 {ejabberd_listener, start_link, []},
@@ -170,6 +177,7 @@
 	   SM,
 	   S2S,
 	   Local,
+           Captcha,
 	   ReceiverSupervisor,
 	   C2SSupervisor,
 	   S2SInSupervisor,
diff -urN ejabberd-2.0.4/src/jlib.hrl ejabberd-2.0.4-new/src/jlib.hrl
--- ejabberd-2.0.4/src/jlib.hrl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/jlib.hrl	2009-03-14 11:41:46.000000000 +0100
@@ -74,6 +74,12 @@
 
 -define(NS_CAPS,          "http://jabber.org/protocol/caps").
 
+%% CAPTCHA related NSes.
+-define(NS_OOB, "jabber:x:oob").
+-define(NS_CAPTCHA, "urn:xmpp:captcha").
+-define(NS_MEDIA, "urn:xmpp:media-element").
+-define(NS_BOB, "urn:xmpp:bob").
+
 % TODO: remove "code" attribute (currently it used for backward-compatibility)
 -define(STANZA_ERROR(Code, Type, Condition),
 	{xmlelement, "error",
diff -urN ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl
--- ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl	2009-03-14 11:40:40.000000000 +0100
@@ -69,6 +69,7 @@
 		 public_list = true,
 		 persistent = false,
 		 moderated = true,
+		 captcha_protected = false,
 		 members_by_default = true,
 		 members_only = false,
 		 allow_user_invites = false,
@@ -98,6 +99,7 @@
 		jid,
 		config = #config{},
 		users = ?DICT:new(),
+		robots = ?DICT:new(),
 		affiliations = ?DICT:new(),
 		history = lqueue_new(20),
 		subject = "",
@@ -382,7 +384,8 @@
 	      (XMLNS == ?NS_MUC_ADMIN) or
 	      (XMLNS == ?NS_MUC_OWNER) or
 	      (XMLNS == ?NS_DISCO_INFO) or
-	      (XMLNS == ?NS_DISCO_ITEMS) ->
+	      (XMLNS == ?NS_DISCO_ITEMS) or 
+	      (XMLNS == ?NS_CAPTCHA) ->
 	    Res1 = case XMLNS of
 		       ?NS_MUC_ADMIN ->
 			   process_iq_admin(From, Type, Lang, SubEl, StateData);
@@ -391,7 +394,9 @@
 		       ?NS_DISCO_INFO ->
 			   process_iq_disco_info(From, Type, Lang, StateData);
 		       ?NS_DISCO_ITEMS ->
-			   process_iq_disco_items(From, Type, Lang, StateData)
+			   process_iq_disco_items(From, Type, Lang, StateData);
+		       ?NS_CAPTCHA ->
+			   process_iq_captcha(From, Type, Lang, SubEl, StateData)
 		   end,
 	    {IQRes, NewStateData} =
 		case Res1 of
@@ -761,6 +766,30 @@
 	{empty, _} ->
 	    {next_state, StateName, StateData}
     end;
+handle_info({captcha_succeed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:store(From, passed, StateData#state.robots),
+		       add_new_user(From, Nick, Packet, StateData#state{robots=Robots});
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
+handle_info({captcha_failed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:erase(From, StateData#state.robots),
+		       Err = jlib:make_error_reply(
+			       Packet, ?ERR_NOT_AUTHORIZED),
+		       ejabberd_router:route( % TODO: s/Nick/""/
+			 jlib:jid_replace_resource(
+			   StateData#state.jid, Nick),
+			 From, Err),
+		       StateData#state{robots=Robots};
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
 handle_info(_Info, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
@@ -1461,7 +1490,8 @@
 	      From, Err),
 	    StateData;
 	{_, _, _, Role} ->
-	    case check_password(ServiceAffiliation, Els, StateData) of
+	    case check_password(ServiceAffiliation, Affiliation,
+				Els, From, StateData) of
 		true ->
 		    NewState =
 			add_user_presence(
@@ -1494,7 +1524,8 @@
 			true ->
 			    NewState#state{just_created = false};
 			false ->
-			    NewState
+			    Robots = ?DICT:erase(From, StateData#state.robots),
+			    NewState#state{robots = Robots}
 		    end;
 		nopass ->
 		    ErrText = "Password required to enter this room",
@@ -1505,6 +1536,29 @@
 			StateData#state.jid, Nick),
 		      From, Err),
 		    StateData;
+                captcha_required ->
+		    ID = randoms:get_string(),
+		    SID = xml:get_attr_s("id", Attrs),
+		    RoomJID = StateData#state.jid,
+		    To = jlib:jid_replace_resource(RoomJID, Nick),
+		    case ejabberd_captcha:create_captcha(
+			   ID, SID, RoomJID, To, Lang, From) of
+			{ok, CaptchaEls} ->
+			    MsgPkt = {xmlelement, "message", [{"id", ID}], CaptchaEls},
+			    Robots = ?DICT:store(From,
+						 {Nick, Packet}, StateData#state.robots),
+			    ejabberd_router:route(RoomJID, From, MsgPkt),
+			    StateData#state{robots = Robots};
+			error ->
+			    ErrText = "Unable to generate a captcha",
+			    Err = jlib:make_error_reply(
+				    Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)),
+			    ejabberd_router:route( % TODO: s/Nick/""/
+			      jlib:jid_replace_resource(
+				StateData#state.jid, Nick),
+			      From, Err),
+			    StateData
+		    end;
 		_ ->
 		    ErrText = "Incorrect password",
 		    Err = jlib:make_error_reply(
@@ -1517,13 +1571,13 @@
 	   end
     end.
 
-check_password(owner, _Els, _StateData) ->
+check_password(owner, _Affiliation, _Els, _From, _StateData) ->
     %% Don't check pass if user is owner in MUC service (access_admin option)
     true;
-check_password(_ServiceAffiliation, Els, StateData) ->
+check_password(_ServiceAffiliation, Affiliation, Els, From, StateData) ->
     case (StateData#state.config)#config.password_protected of
 	false ->
-	    true;
+	    check_captcha(Affiliation, From, StateData);
 	true ->
 	    Pass = extract_password(Els),
 	    case Pass of
@@ -1539,6 +1593,19 @@
 	    end
     end.
 
+check_captcha(Affiliation, From, StateData) ->
+    case (StateData#state.config)#config.captcha_protected of
+	true when Affiliation == none ->
+	    case ?DICT:find(From, StateData#state.robots) of
+		{ok, passed} ->
+		    true;
+		_ ->
+		    captcha_required
+	    end;
+	_ ->
+	    true
+    end.
+
 extract_password([]) ->
     false;
 extract_password([{xmlelement, _Name, Attrs, _SubEls} = El | Els]) ->
@@ -2713,6 +2780,9 @@
 	 ?BOOLXFIELD("Make room members-only",
 		     "muc#roomconfig_membersonly",
 		     Config#config.members_only),
+	 ?BOOLXFIELD("Make room captcha protected",
+		     "captcha_protected",
+		     Config#config.captcha_protected),
 	 ?BOOLXFIELD("Make room moderated",
 		     "muc#roomconfig_moderatedroom",
 		     Config#config.moderated),
@@ -2823,6 +2893,8 @@
     ?SET_BOOL_XOPT(members_by_default, Val);
 set_xoption([{"muc#roomconfig_membersonly", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(members_only, Val);
+set_xoption([{"captcha_protected", [Val]} | Opts], Config) ->
+    ?SET_BOOL_XOPT(captcha_protected, Val);
 set_xoption([{"muc#roomconfig_allowinvites", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(allow_user_invites, Val);
 set_xoption([{"muc#roomconfig_passwordprotectedroom", [Val]} | Opts], Config) ->
@@ -2913,6 +2985,7 @@
 	      ?CASE_CONFIG_OPT(members_only);
 	      ?CASE_CONFIG_OPT(allow_user_invites);
 	      ?CASE_CONFIG_OPT(password_protected);
+	      ?CASE_CONFIG_OPT(captcha_protected);
 	      ?CASE_CONFIG_OPT(password);
 	      ?CASE_CONFIG_OPT(anonymous);
 	      ?CASE_CONFIG_OPT(logging);
@@ -2954,6 +3027,7 @@
      ?MAKE_CONFIG_OPT(members_only),
      ?MAKE_CONFIG_OPT(allow_user_invites),
      ?MAKE_CONFIG_OPT(password_protected),
+     ?MAKE_CONFIG_OPT(captcha_protected),
      ?MAKE_CONFIG_OPT(password),
      ?MAKE_CONFIG_OPT(anonymous),
      ?MAKE_CONFIG_OPT(logging),
@@ -3074,6 +3148,17 @@
 	    {error, ?ERR_FORBIDDEN}
     end.
 
+process_iq_captcha(_From, get, _Lang, _SubEl, _StateData) ->
+    {error, ?ERR_NOT_ALLOWED};
+
+process_iq_captcha(_From, set, _Lang, SubEl, StateData) ->
+    case ejabberd_captcha:process_reply(SubEl) of
+	ok ->
+	    {result, [], StateData};
+	_ ->
+	    {error, ?ERR_NOT_ACCEPTABLE}
+    end.
+
 get_title(StateData) ->
     case (StateData#state.config)#config.title of
 	"" ->
diff -urN ejabberd-2.0.4/src/web/ejabberd_http.erl ejabberd-2.0.4-new/src/web/ejabberd_http.erl
--- ejabberd-2.0.4/src/web/ejabberd_http.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/web/ejabberd_http.erl	2009-03-14 10:57:34.000000000 +0100
@@ -106,6 +106,10 @@
 	    {value, {request_handlers, H}} -> H;
 	    false -> []
         end ++
+	case lists:member(captcha, Opts) of
+	    true -> [{["captcha"], ejabberd_captcha}];
+	    false -> []
+	end ++
         case lists:member(web_admin, Opts) of
             true -> [{["admin"], ejabberd_web_admin}];
             false -> []
Binary files ejabberd-2.0.4/tools/.DS_Store and ejabberd-2.0.4-new/tools/.DS_Store differ
diff -urN ejabberd-2.0.4/tools/captcha.sh ejabberd-2.0.4-new/tools/captcha.sh
--- ejabberd-2.0.4/tools/captcha.sh	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/tools/captcha.sh	2009-03-14 11:46:42.000000000 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+SIGN=$(($RANDOM % 2))
+
+R1=$(($RANDOM % 20))
+R2=$(($RANDOM % 10 + 40))
+
+if [ $SIGN -eq "0" ]; then
+    S1=$(( -1*($RANDOM % 20 + 50) ))
+    S2=$(( $RANDOM % 20 + 50 ))
+else
+    S2=$(( -1*($RANDOM % 20 + 50) ))
+    S1=$(( $RANDOM % 20 + 50 ))
+fi
+
+convert -size 140x60 xc:white \
+    -pointsize 30 -draw "text 20,30 '$1'" \
+    -roll -$R2+$R1 -swirl $S1 \
+    -roll +$R2-$R1 -swirl $S2 \
+    +repage -resize 120x60 \
+    -quality 90 -depth 8 png:-
--- ejabberd-2.0.5/ChangeLog~	2009-04-01 19:23:52.000000000 +0400
+++ ejabberd-2.0.5/ChangeLog	2009-04-03 23:45:03.174979944 +0400
@@ -15,6 +15,15 @@
 	stanza (EJAB-300).
 	* src/ejabberd_c2s.erl: Likewise
 
+2009-03-13  Evgeniy Khramtsov <ekhramtsov at process-one.net>
+
+	* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
+	* src/ejabberd_config.erl: likewise.
+	* src/ejabberd_sup.erl: likewise.
+	* src/jlib.hrl: likewise.
+	* src/web/ejabberd_http.erl: likewise.
+	* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
+
 2009-03-10  Badlop  <badlop at process-one.net>
 
 	* doc/release_notes_2.0.4.txt: Added file for new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	15 Mar 2009 11:33:57 -0000	1.13
+++ .cvsignore	3 Apr 2009 20:09:33 -0000	1.14
@@ -1 +1 @@
-ejabberd-2.0.4.tar.gz
+ejabberd-2.0.5.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ejabberd.spec	15 Mar 2009 11:33:57 -0000	1.35
+++ ejabberd.spec	3 Apr 2009 20:09:33 -0000	1.36
@@ -1,5 +1,5 @@
 Name:           ejabberd
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
@@ -12,7 +12,7 @@
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
+# svn export -r 873 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
 # The following were extracted from a patch found on http://realloc.spb.ru/share/ejabberdad.html
@@ -31,6 +31,10 @@
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
+# CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
+# wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
+Patch4: ejabberd-captcha.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,6 +117,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
+#%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -172,7 +177,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -214,6 +219,14 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
+- Ver. 2.0.5
+- Temporarily disabled CAPTCHA support
+
+* Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-2
+- Support for CAPTCHA (XEP-0158)
+- Updated mod_ctlextra.erl (fixed EJAB-789, EJAB-864)
+
 * Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-1
 - Ver. 2.0.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	15 Mar 2009 11:33:57 -0000	1.8
+++ import.log	3 Apr 2009 20:09:33 -0000	1.9
@@ -6,3 +6,4 @@
 ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272
 ejabberd-2_0_3-1_fc10:HEAD:ejabberd-2.0.3-1.fc10.src.rpm:1232988133
 ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.4-1.fc10.src.rpm:1237116778
+ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/mod_ctlextra.erl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_ctlextra.erl	29 Aug 2008 20:16:17 -0000	1.4
+++ mod_ctlextra.erl	3 Apr 2009 20:09:33 -0000	1.5
@@ -47,14 +47,12 @@
 
      %% ejabberd_auth
      {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+     {"delete-older-users-vhost host days", "delete users that not logged in last 'days' in 'host'"},
      {"set-password user server password", "set password to user at server"},
 
      %% ejd2odbc
      {"export2odbc server output", "export Mnesia tables on server to files on output directory"},
 
-     %% mod_offline
-     {"delete-older-messages days", "delete offline messages older than 'days'"},
-
      %% mod_shared_roster
      {"srg-create group host name description display", "create the group with options"},
      {"srg-delete group host", "delete the group"},
@@ -113,15 +111,16 @@
 %% Commands global
 %%-------------
 
-ctl_process(_Val, ["delete-older-messages", Days]) ->
-    mod_offline:remove_old_messages(list_to_integer(Days)),
-    ?STATUS_SUCCESS;
-
 ctl_process(_Val, ["delete-older-users", Days]) ->
     {removed, N, UR} = delete_older_users(list_to_integer(Days)),
     io:format("Deleted ~p users: ~p~n", [N, UR]),
     ?STATUS_SUCCESS;
 
+ctl_process(_Val, ["delete-older-users-vhost", Host, Days]) ->
+    {removed, N, UR} = delete_older_users_vhost(Host, list_to_integer(Days)),
+    io:format("Deleted ~p users: ~p~n", [N, UR]),
+    ?STATUS_SUCCESS;
+
 ctl_process(_Val, ["export2odbc", Server, Output]) ->
     Tables = [
 	      {export_last, last},
@@ -357,7 +356,7 @@
 ctl_process(_Val, ["stats", Stat]) ->
     Res = case Stat of
 	      "uptime-seconds" -> uptime_seconds();
-	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
 	      "onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
 	      "onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
 	  end,
@@ -752,6 +751,16 @@
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+    delete_older_users(Days, Users).
+
+delete_older_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+    delete_older_users(Days, Users).
+
+delete_older_users(Days, Users) ->
     %% Convert older time
     SecOlder = Days*24*60*60,
 
@@ -759,9 +768,6 @@
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp_now = MegaSecs * 1000000 + Secs,
 
-    %% Get the list of registered users
-    Users = ejabberd_auth:dirty_get_registered_users(),
-
     %% For a user, remove if required and answer true
     F = fun({LUser, LServer}) ->
 		%% Check if the user is logged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Mar 2009 11:33:57 -0000	1.15
+++ sources	3 Apr 2009 20:09:33 -0000	1.16
@@ -1 +1 @@
-1ff37c329e9bc1ddf3c458e051b81d63  ejabberd-2.0.4.tar.gz
+2d85b47df969daf0a78ed3b16562d731  ejabberd-2.0.5.tar.gz



From dodji at fedoraproject.org  Fri Apr  3 20:13:37 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Fri,  3 Apr 2009 20:13:37 +0000 (UTC)
Subject: rpms/nemiver/F-9 nemiver.spec,1.15,1.16
Message-ID: <20090403201337.7337E70134@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9491

Modified Files:
	nemiver.spec 
Log Message:
* Fri Apr 03 2009 Dodji Seketeli <dodji at redhat.com> - 0.6.6-1
- Update to new upstream release (0.6.6)




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-9/nemiver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nemiver.spec	1 Mar 2009 14:00:19 -0000	1.15
+++ nemiver.spec	3 Apr 2009 20:13:07 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.6.5
+Version:	0.6.6
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -151,6 +151,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Dodji Seketeli <dodji at redhat.com> - 0.6.6-1
+- Update to new upstream release (0.6.6)
+
 * Sun Mar 01 2009 Dodji Seketeli <dodji at redhat.org> - 0.6.5-1
 - Update to new upstream release (0.6.5)
 - BuildRequire intltool



From peter at fedoraproject.org  Fri Apr  3 20:14:16 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  3 Apr 2009 20:14:16 +0000 (UTC)
Subject: rpms/ejabberd/F-10 ejabberd-captcha.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 ejabberd.spec, 1.33, 1.34 import.log, 1.8,
	1.9 mod_ctlextra.erl, 1.4, 1.5 sources, 1.15, 1.16
Message-ID: <20090403201416.49B8070134@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9779/F-10

Modified Files:
	.cvsignore ejabberd.spec import.log mod_ctlextra.erl sources 
Added Files:
	ejabberd-captcha.patch 
Log Message:
Ver. 2.0.5

ejabberd-captcha.patch:

--- NEW FILE ejabberd-captcha.patch ---
Binary files ejabberd-2.0.4/src/.DS_Store and ejabberd-2.0.4-new/src/.DS_Store differ
diff -urN ejabberd-2.0.4/src/ejabberd_captcha.erl ejabberd-2.0.4-new/src/ejabberd_captcha.erl
--- ejabberd-2.0.4/src/ejabberd_captcha.erl	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_captcha.erl	2009-03-14 07:27:05.000000000 +0100
@@ -0,0 +1,312 @@
+%%%-------------------------------------------------------------------
+%%% File    : ejabberd_captcha.erl
+%%% Author  : Evgeniy Khramtsov <xramtsov at gmail.com>
+%%% Description : CAPTCHA processing.
+%%%
+%%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov at gmail.com>
+%%%-------------------------------------------------------------------
+-module(ejabberd_captcha).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-export([create_captcha/6, process_reply/1, process/2]).
+
+-include("jlib.hrl").
+-include("ejabberd.hrl").
+-include("web/ejabberd_http.hrl").
+
+-define(VFIELD(Type, Var, Value),
+	{xmlelement, "field", [{"type", Type}, {"var", Var}],
+	 [{xmlelement, "value", [], [Value]}]}).
+
+-define(CAPTCHA_BODY(Lang, Room, URL),
+	translate:translate(Lang, "Your messages to ") ++ Room
+	++ translate:translate(Lang, " are being blocked. To unblock them, visit ")
+	++ URL).
+
+-define(CAPTCHA_TEXT(Lang), translate:translate(Lang, "Enter the text you see")).
+-define(CAPTCHA_LIFETIME, 120000). % two minutes
+
+-record(state, {}).
+-record(captcha, {id, pid, key, tref, args}).
+
+-define(T(S),
+	case catch mnesia:transaction(fun() -> S end) of
+	    {atomic, Res} ->
+		Res;
+	    {_, Reason} ->
+		?ERROR_MSG("mnesia transaction failed: ~p", [Reason]),
+		{error, Reason}
+	end).
+
+%%====================================================================
+%% API
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+create_captcha(Id, SID, From, To, Lang, Args)
+  when is_list(Id), is_list(Lang), is_list(SID),
+       is_record(From, jid), is_record(To, jid) ->
+    case create_image() of
+	{ok, Type, Key, Image} ->
+	    B64Image = jlib:encode_base64(binary_to_list(Image)),
+	    JID = jlib:jid_to_string(From),
+	    CID = "sha1+" ++ sha:sha(Image) ++ "@bob.xmpp.org",
+	    Data = {xmlelement, "data",
+		    [{"xmlns", ?NS_BOB}, {"cid", CID},
+		     {"max-age", "0"}, {"type", Type}],
+		    [{xmlcdata, B64Image}]},
+	    Captcha =
+		{xmlelement, "captcha", [{"xmlns", ?NS_CAPTCHA}],
+		 [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
+		   [?VFIELD("hidden", "FORM_TYPE", {xmlcdata, ?NS_CAPTCHA}),
+		    ?VFIELD("hidden", "from", {xmlcdata, jlib:jid_to_string(To)}),
+		    ?VFIELD("hidden", "challenge", {xmlcdata, Id}),
+		    ?VFIELD("hidden", "sid", {xmlcdata, SID}),
+		    {xmlelement, "field", [{"var", "ocr"}],
+		     [{xmlelement, "media", [{"xmlns", ?NS_MEDIA}],
+		       [{xmlelement, "uri", [{"type", Type}],
+			 [{xmlcdata, "cid:" ++ CID}]}]}]}]}]},
+	    Body = {xmlelement, "body", [],
+		    [{xmlcdata, ?CAPTCHA_BODY(Lang, JID, get_url(Id))}]},
+	    OOB = {xmlelement, "x", [{"xmlns", ?NS_OOB}],
+		   [{xmlelement, "url", [], [{xmlcdata, get_url(Id)}]}]},
+	    Tref = erlang:send_after(?CAPTCHA_LIFETIME, ?MODULE, {remove_id, Id}),
+	    ?T(mnesia:write(#captcha{id=Id, pid=self(), key=Key,
+				     tref=Tref, args=Args})),
+	    {ok, [Body, OOB, Captcha, Data]};
+	_Err ->
+	    error
+    end.
+
+process_reply({xmlelement, "captcha", _, _} = El) ->
+    case xml:get_subtag(El, "x") of
+	false ->
+	    {error, malformed};
+	Xdata ->
+	    Fields = jlib:parse_xdata_submit(Xdata),
+	    [Id | _] = proplists:get_value("challenge", Fields, [none]),
+	    [OCR | _] = proplists:get_value("ocr", Fields, [none]),
+	    ?T(case mnesia:read(captcha, Id, write) of
+		   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+		       mnesia:delete({captcha, Id}),
+		       erlang:cancel_timer(Tref),
+		       if OCR == Key ->
+			       Pid ! {captcha_succeed, Args},
+			       ok;
+			  true ->
+			       Pid ! {captcha_failed, Args},
+			       {error, bad_match}
+		       end;
+		   _ ->
+		       {error, not_found}
+	       end)
+    end;
+process_reply(_) ->
+    {error, malformed}.
+
+process(_Handlers, #request{method='GET', lang=Lang, path=[_, Id]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{}] ->
+	    Form =
+		{xmlelement, "div", [{"align", "center"}],
+		 [{xmlelement, "form", [{"action", get_url(Id)},
+					{"name", "captcha"},
+					{"method", "POST"}],
+		   [{xmlelement, "img", [{"src", get_url(Id ++ "/image")}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlcdata, ?CAPTCHA_TEXT(Lang)},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "text"},
+					   {"name", "key"},
+					   {"size", "10"}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "submit"},
+					   {"name", "enter"},
+					   {"value", "OK"}], []}]}]},
+	    ejabberd_web:make_xhtml([Form]);
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='GET', path=[_, Id, "image"]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{key=Key}] ->
+	    case create_image(Key) of
+		{ok, Type, _, Img} ->
+		    {200,
+		     [{"Content-Type", Type},
+		      {"Cache-Control", "no-cache"},
+		      {"Last-Modified", httpd_util:rfc1123_date()}],
+		     Img};
+		_ ->
+		    ejabberd_web:error(not_found)
+	    end;
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='POST', q=Q, path=[_, Id]}) ->
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+	       mnesia:delete({captcha, Id}),
+	       erlang:cancel_timer(Tref),
+	       Input = proplists:get_value("key", Q, none),
+	       if Input == Key ->
+		       Pid ! {captcha_succeed, Args},
+		       ejabberd_web:make_xhtml([]);
+		  true ->
+		       Pid ! {captcha_failed, Args},
+		       ejabberd_web:error(not_allowed)
+	       end;
+	   _ ->
+	       ejabberd_web:error(not_found)
+       end).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+init([]) ->
+    mnesia:create_table(captcha,
+			[{ram_copies, [node()]},
+			 {attributes, record_info(fields, captcha)}]),
+    mnesia:add_table_copy(captcha, node(), ram_copies),
+    {ok, #state{}}.
+
+handle_call(_Request, _From, State) ->
+    {reply, bad_request, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info({remove_id, Id}, State) ->
+    ?DEBUG("captcha ~p timed out", [Id]),
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{args=Args, pid=Pid}] ->
+	       Pid ! {captcha_failed, Args},
+	       mnesia:delete({captcha, Id});
+	   _ ->
+	       ok
+       end),
+    {noreply, State};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Function: create_image() -> {ok, Type, Key, Image} | {error, Reason}
+%% Type = "image/png" | "image/jpeg" | "image/gif"
+%% Key = string()
+%% Image = binary()
+%% Reason = atom()
+%%--------------------------------------------------------------------
+create_image() ->
+    %% Six numbers from 1 to 9.
+    Key = string:substr(randoms:get_string(), 1, 6),
+    create_image(Key).
+
+create_image(Key) ->
+    FileName = get_prog_name(),
+    Cmd = lists:flatten(io_lib:format("~s ~s", [FileName, Key])),
+    case cmd(Cmd) of
+	{ok, <<16#89, $P, $N, $G, $\r, $\n, 16#1a, $\n, _/binary>> = Img} ->
+	    {ok, "image/png", Key, Img};
+	{ok, <<16#ff, 16#d8, _/binary>> = Img} ->
+	    {ok, "image/jpeg", Key, Img};
+	{ok, <<$G, $I, $F, $8, X, $a, _/binary>> = Img} when X==$7; X==$9 ->
+	    {ok, "image/gif", Key, Img};
+	{error, Reason} ->
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason};
+	_ ->
+	    Reason = malformed_image,
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason}
+    end.
+
+get_prog_name() ->
+    case ejabberd_config:get_local_option(captcha_cmd) of
+	FileName when is_list(FileName) ->
+	    FileName;
+	_ ->
+	    ""
+    end.
+
+get_url(Str) ->
+    case ejabberd_config:get_local_option(captcha_host) of
+	Host when is_list(Host) ->
+	    "http://" ++ Host ++ "/captcha/" ++ Str;
+	_ ->
+	    "http://" ++ ?MYNAME ++ "/captcha/" ++ Str
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: cmd(Cmd) -> Data | {error, Reason}
+%% Cmd = string()
+%% Data = binary()
+%% Description: os:cmd/1 replacement
+%%--------------------------------------------------------------------
+-define(CMD_TIMEOUT, 5000).
+-define(MAX_FILE_SIZE, 64*1024).
+
+cmd(Cmd) ->
+    Port = open_port({spawn, Cmd}, [stream, eof, binary]),
+    TRef = erlang:start_timer(?CMD_TIMEOUT, self(), timeout),
+    recv_data(Port, TRef, <<>>).
+
+recv_data(Port, TRef, Buf) ->
+    receive
+	{Port, {data, Bytes}} ->
+	    NewBuf = <<Buf/binary, Bytes/binary>>,
+	    if size(NewBuf) > ?MAX_FILE_SIZE ->
+		    return(Port, TRef, {error, efbig});
+	       true ->
+		    recv_data(Port, TRef, NewBuf)
+	    end;
+	{Port, {data, _}} ->
+	    return(Port, TRef, {error, efbig});
+	{Port, eof} when Buf /= <<>> ->
+	    return(Port, TRef, {ok, Buf});
+	{Port, eof} ->
+	    return(Port, TRef, {error, enodata});
+	{timeout, TRef, _} ->
+	    return(Port, TRef, {error, timeout})
+    end.
+
+return(Port, TRef, Result) ->
+    case erlang:cancel_timer(TRef) of
+	false ->
+	    receive
+		{timeout, TRef, _} ->
+		    ok
+	    after 0 ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end,
+    catch port_close(Port),
+    Result.
diff -urN ejabberd-2.0.4/src/ejabberd_config.erl ejabberd-2.0.4-new/src/ejabberd_config.erl
--- ejabberd-2.0.4/src/ejabberd_config.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_config.erl	2009-03-14 11:43:35.000000000 +0100
@@ -164,6 +164,10 @@
 	    add_option(watchdog_admins, Admins, State);
 	{registration_timeout, Timeout} ->
 	    add_option(registration_timeout, Timeout, State);
+	{captcha_cmd, Cmd} ->
+	    add_option(captcha_cmd, Cmd, State);
+	{captcha_host, Host} ->
+            add_option(captcha_host, Host, State);
 	{loglevel, Loglevel} ->
 	    ejabberd_loglevel:set(Loglevel),
 	    State;
diff -urN ejabberd-2.0.4/src/ejabberd_sup.erl ejabberd-2.0.4-new/src/ejabberd_sup.erl
--- ejabberd-2.0.4/src/ejabberd_sup.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_sup.erl	2009-03-14 12:36:43.000000000 +0100
@@ -84,6 +84,13 @@
 	 brutal_kill,
 	 worker,
 	 [ejabberd_local]},
+    Captcha =
+	{ejabberd_captcha,
+	 {ejabberd_captcha, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 [ejabberd_captcha]},
     Listener =
 	{ejabberd_listener,
 	 {ejabberd_listener, start_link, []},
@@ -170,6 +177,7 @@
 	   SM,
 	   S2S,
 	   Local,
+           Captcha,
 	   ReceiverSupervisor,
 	   C2SSupervisor,
 	   S2SInSupervisor,
diff -urN ejabberd-2.0.4/src/jlib.hrl ejabberd-2.0.4-new/src/jlib.hrl
--- ejabberd-2.0.4/src/jlib.hrl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/jlib.hrl	2009-03-14 11:41:46.000000000 +0100
@@ -74,6 +74,12 @@
 
 -define(NS_CAPS,          "http://jabber.org/protocol/caps").
 
+%% CAPTCHA related NSes.
+-define(NS_OOB, "jabber:x:oob").
+-define(NS_CAPTCHA, "urn:xmpp:captcha").
+-define(NS_MEDIA, "urn:xmpp:media-element").
+-define(NS_BOB, "urn:xmpp:bob").
+
 % TODO: remove "code" attribute (currently it used for backward-compatibility)
 -define(STANZA_ERROR(Code, Type, Condition),
 	{xmlelement, "error",
diff -urN ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl
--- ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl	2009-03-14 11:40:40.000000000 +0100
@@ -69,6 +69,7 @@
 		 public_list = true,
 		 persistent = false,
 		 moderated = true,
+		 captcha_protected = false,
 		 members_by_default = true,
 		 members_only = false,
 		 allow_user_invites = false,
@@ -98,6 +99,7 @@
 		jid,
 		config = #config{},
 		users = ?DICT:new(),
+		robots = ?DICT:new(),
 		affiliations = ?DICT:new(),
 		history = lqueue_new(20),
 		subject = "",
@@ -382,7 +384,8 @@
 	      (XMLNS == ?NS_MUC_ADMIN) or
 	      (XMLNS == ?NS_MUC_OWNER) or
 	      (XMLNS == ?NS_DISCO_INFO) or
-	      (XMLNS == ?NS_DISCO_ITEMS) ->
+	      (XMLNS == ?NS_DISCO_ITEMS) or 
+	      (XMLNS == ?NS_CAPTCHA) ->
 	    Res1 = case XMLNS of
 		       ?NS_MUC_ADMIN ->
 			   process_iq_admin(From, Type, Lang, SubEl, StateData);
@@ -391,7 +394,9 @@
 		       ?NS_DISCO_INFO ->
 			   process_iq_disco_info(From, Type, Lang, StateData);
 		       ?NS_DISCO_ITEMS ->
-			   process_iq_disco_items(From, Type, Lang, StateData)
+			   process_iq_disco_items(From, Type, Lang, StateData);
+		       ?NS_CAPTCHA ->
+			   process_iq_captcha(From, Type, Lang, SubEl, StateData)
 		   end,
 	    {IQRes, NewStateData} =
 		case Res1 of
@@ -761,6 +766,30 @@
 	{empty, _} ->
 	    {next_state, StateName, StateData}
     end;
+handle_info({captcha_succeed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:store(From, passed, StateData#state.robots),
+		       add_new_user(From, Nick, Packet, StateData#state{robots=Robots});
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
+handle_info({captcha_failed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:erase(From, StateData#state.robots),
+		       Err = jlib:make_error_reply(
+			       Packet, ?ERR_NOT_AUTHORIZED),
+		       ejabberd_router:route( % TODO: s/Nick/""/
+			 jlib:jid_replace_resource(
+			   StateData#state.jid, Nick),
+			 From, Err),
+		       StateData#state{robots=Robots};
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
 handle_info(_Info, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
@@ -1461,7 +1490,8 @@
 	      From, Err),
 	    StateData;
 	{_, _, _, Role} ->
-	    case check_password(ServiceAffiliation, Els, StateData) of
+	    case check_password(ServiceAffiliation, Affiliation,
+				Els, From, StateData) of
 		true ->
 		    NewState =
 			add_user_presence(
@@ -1494,7 +1524,8 @@
 			true ->
 			    NewState#state{just_created = false};
 			false ->
-			    NewState
+			    Robots = ?DICT:erase(From, StateData#state.robots),
+			    NewState#state{robots = Robots}
 		    end;
 		nopass ->
 		    ErrText = "Password required to enter this room",
@@ -1505,6 +1536,29 @@
 			StateData#state.jid, Nick),
 		      From, Err),
 		    StateData;
+                captcha_required ->
+		    ID = randoms:get_string(),
+		    SID = xml:get_attr_s("id", Attrs),
+		    RoomJID = StateData#state.jid,
+		    To = jlib:jid_replace_resource(RoomJID, Nick),
+		    case ejabberd_captcha:create_captcha(
+			   ID, SID, RoomJID, To, Lang, From) of
+			{ok, CaptchaEls} ->
+			    MsgPkt = {xmlelement, "message", [{"id", ID}], CaptchaEls},
+			    Robots = ?DICT:store(From,
+						 {Nick, Packet}, StateData#state.robots),
+			    ejabberd_router:route(RoomJID, From, MsgPkt),
+			    StateData#state{robots = Robots};
+			error ->
+			    ErrText = "Unable to generate a captcha",
+			    Err = jlib:make_error_reply(
+				    Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)),
+			    ejabberd_router:route( % TODO: s/Nick/""/
+			      jlib:jid_replace_resource(
+				StateData#state.jid, Nick),
+			      From, Err),
+			    StateData
+		    end;
 		_ ->
 		    ErrText = "Incorrect password",
 		    Err = jlib:make_error_reply(
@@ -1517,13 +1571,13 @@
 	   end
     end.
 
-check_password(owner, _Els, _StateData) ->
+check_password(owner, _Affiliation, _Els, _From, _StateData) ->
     %% Don't check pass if user is owner in MUC service (access_admin option)
     true;
-check_password(_ServiceAffiliation, Els, StateData) ->
+check_password(_ServiceAffiliation, Affiliation, Els, From, StateData) ->
     case (StateData#state.config)#config.password_protected of
 	false ->
-	    true;
+	    check_captcha(Affiliation, From, StateData);
 	true ->
 	    Pass = extract_password(Els),
 	    case Pass of
@@ -1539,6 +1593,19 @@
 	    end
     end.
 
+check_captcha(Affiliation, From, StateData) ->
+    case (StateData#state.config)#config.captcha_protected of
+	true when Affiliation == none ->
+	    case ?DICT:find(From, StateData#state.robots) of
+		{ok, passed} ->
+		    true;
+		_ ->
+		    captcha_required
+	    end;
+	_ ->
+	    true
+    end.
+
 extract_password([]) ->
     false;
 extract_password([{xmlelement, _Name, Attrs, _SubEls} = El | Els]) ->
@@ -2713,6 +2780,9 @@
 	 ?BOOLXFIELD("Make room members-only",
 		     "muc#roomconfig_membersonly",
 		     Config#config.members_only),
+	 ?BOOLXFIELD("Make room captcha protected",
+		     "captcha_protected",
+		     Config#config.captcha_protected),
 	 ?BOOLXFIELD("Make room moderated",
 		     "muc#roomconfig_moderatedroom",
 		     Config#config.moderated),
@@ -2823,6 +2893,8 @@
     ?SET_BOOL_XOPT(members_by_default, Val);
 set_xoption([{"muc#roomconfig_membersonly", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(members_only, Val);
+set_xoption([{"captcha_protected", [Val]} | Opts], Config) ->
+    ?SET_BOOL_XOPT(captcha_protected, Val);
 set_xoption([{"muc#roomconfig_allowinvites", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(allow_user_invites, Val);
 set_xoption([{"muc#roomconfig_passwordprotectedroom", [Val]} | Opts], Config) ->
@@ -2913,6 +2985,7 @@
 	      ?CASE_CONFIG_OPT(members_only);
 	      ?CASE_CONFIG_OPT(allow_user_invites);
 	      ?CASE_CONFIG_OPT(password_protected);
+	      ?CASE_CONFIG_OPT(captcha_protected);
 	      ?CASE_CONFIG_OPT(password);
 	      ?CASE_CONFIG_OPT(anonymous);
 	      ?CASE_CONFIG_OPT(logging);
@@ -2954,6 +3027,7 @@
      ?MAKE_CONFIG_OPT(members_only),
      ?MAKE_CONFIG_OPT(allow_user_invites),
      ?MAKE_CONFIG_OPT(password_protected),
+     ?MAKE_CONFIG_OPT(captcha_protected),
      ?MAKE_CONFIG_OPT(password),
      ?MAKE_CONFIG_OPT(anonymous),
      ?MAKE_CONFIG_OPT(logging),
@@ -3074,6 +3148,17 @@
 	    {error, ?ERR_FORBIDDEN}
     end.
 
+process_iq_captcha(_From, get, _Lang, _SubEl, _StateData) ->
+    {error, ?ERR_NOT_ALLOWED};
+
+process_iq_captcha(_From, set, _Lang, SubEl, StateData) ->
+    case ejabberd_captcha:process_reply(SubEl) of
+	ok ->
+	    {result, [], StateData};
+	_ ->
+	    {error, ?ERR_NOT_ACCEPTABLE}
+    end.
+
 get_title(StateData) ->
     case (StateData#state.config)#config.title of
 	"" ->
diff -urN ejabberd-2.0.4/src/web/ejabberd_http.erl ejabberd-2.0.4-new/src/web/ejabberd_http.erl
--- ejabberd-2.0.4/src/web/ejabberd_http.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/web/ejabberd_http.erl	2009-03-14 10:57:34.000000000 +0100
@@ -106,6 +106,10 @@
 	    {value, {request_handlers, H}} -> H;
 	    false -> []
         end ++
+	case lists:member(captcha, Opts) of
+	    true -> [{["captcha"], ejabberd_captcha}];
+	    false -> []
+	end ++
         case lists:member(web_admin, Opts) of
             true -> [{["admin"], ejabberd_web_admin}];
             false -> []
Binary files ejabberd-2.0.4/tools/.DS_Store and ejabberd-2.0.4-new/tools/.DS_Store differ
diff -urN ejabberd-2.0.4/tools/captcha.sh ejabberd-2.0.4-new/tools/captcha.sh
--- ejabberd-2.0.4/tools/captcha.sh	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/tools/captcha.sh	2009-03-14 11:46:42.000000000 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+SIGN=$(($RANDOM % 2))
+
+R1=$(($RANDOM % 20))
+R2=$(($RANDOM % 10 + 40))
+
+if [ $SIGN -eq "0" ]; then
+    S1=$(( -1*($RANDOM % 20 + 50) ))
+    S2=$(( $RANDOM % 20 + 50 ))
+else
+    S2=$(( -1*($RANDOM % 20 + 50) ))
+    S1=$(( $RANDOM % 20 + 50 ))
+fi
+
+convert -size 140x60 xc:white \
+    -pointsize 30 -draw "text 20,30 '$1'" \
+    -roll -$R2+$R1 -swirl $S1 \
+    -roll +$R2-$R1 -swirl $S2 \
+    +repage -resize 120x60 \
+    -quality 90 -depth 8 png:-
--- ejabberd-2.0.5/ChangeLog~	2009-04-01 19:23:52.000000000 +0400
+++ ejabberd-2.0.5/ChangeLog	2009-04-03 23:45:03.174979944 +0400
@@ -15,6 +15,15 @@
 	stanza (EJAB-300).
 	* src/ejabberd_c2s.erl: Likewise
 
+2009-03-13  Evgeniy Khramtsov <ekhramtsov at process-one.net>
+
+	* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
+	* src/ejabberd_config.erl: likewise.
+	* src/ejabberd_sup.erl: likewise.
+	* src/jlib.hrl: likewise.
+	* src/web/ejabberd_http.erl: likewise.
+	* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
+
 2009-03-10  Badlop  <badlop at process-one.net>
 
 	* doc/release_notes_2.0.4.txt: Added file for new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	15 Mar 2009 11:36:41 -0000	1.13
+++ .cvsignore	3 Apr 2009 20:13:45 -0000	1.14
@@ -1 +1 @@
-ejabberd-2.0.4.tar.gz
+ejabberd-2.0.5.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ejabberd.spec	15 Mar 2009 11:36:41 -0000	1.33
+++ ejabberd.spec	3 Apr 2009 20:13:45 -0000	1.34
@@ -1,5 +1,5 @@
 Name:           ejabberd
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
@@ -12,7 +12,7 @@
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
+# svn export -r 873 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
 # The following were extracted from a patch found on http://realloc.spb.ru/share/ejabberdad.html
@@ -31,6 +31,10 @@
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
+# CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
+# wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
+Patch4: ejabberd-captcha.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,6 +117,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
+#%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -172,7 +177,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -214,6 +219,14 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
+- Ver. 2.0.5
+- Temporarily disabled CAPTCHA support
+
+* Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-2
+- Support for CAPTCHA (XEP-0158)
+- Updated mod_ctlextra.erl (fixed EJAB-789, EJAB-864)
+
 * Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-1
 - Ver. 2.0.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	15 Mar 2009 11:36:41 -0000	1.8
+++ import.log	3 Apr 2009 20:13:46 -0000	1.9
@@ -6,3 +6,4 @@
 ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272
 ejabberd-2_0_3-1_fc10:F-10:ejabberd-2.0.3-1.fc10.src.rpm:1232988288
 ejabberd-2_0_4-1_fc10:F-10:ejabberd-2.0.4-1.fc10.src.rpm:1237116924
+ejabberd-2_0_5-1_fc10:F-10:ejabberd-2.0.5-1.fc10.src.rpm:1238789573


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/mod_ctlextra.erl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_ctlextra.erl	29 Aug 2008 20:16:17 -0000	1.4
+++ mod_ctlextra.erl	3 Apr 2009 20:13:46 -0000	1.5
@@ -47,14 +47,12 @@
 
      %% ejabberd_auth
      {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+     {"delete-older-users-vhost host days", "delete users that not logged in last 'days' in 'host'"},
      {"set-password user server password", "set password to user at server"},
 
      %% ejd2odbc
      {"export2odbc server output", "export Mnesia tables on server to files on output directory"},
 
-     %% mod_offline
-     {"delete-older-messages days", "delete offline messages older than 'days'"},
-
      %% mod_shared_roster
      {"srg-create group host name description display", "create the group with options"},
      {"srg-delete group host", "delete the group"},
@@ -113,15 +111,16 @@
 %% Commands global
 %%-------------
 
-ctl_process(_Val, ["delete-older-messages", Days]) ->
-    mod_offline:remove_old_messages(list_to_integer(Days)),
-    ?STATUS_SUCCESS;
-
 ctl_process(_Val, ["delete-older-users", Days]) ->
     {removed, N, UR} = delete_older_users(list_to_integer(Days)),
     io:format("Deleted ~p users: ~p~n", [N, UR]),
     ?STATUS_SUCCESS;
 
+ctl_process(_Val, ["delete-older-users-vhost", Host, Days]) ->
+    {removed, N, UR} = delete_older_users_vhost(Host, list_to_integer(Days)),
+    io:format("Deleted ~p users: ~p~n", [N, UR]),
+    ?STATUS_SUCCESS;
+
 ctl_process(_Val, ["export2odbc", Server, Output]) ->
     Tables = [
 	      {export_last, last},
@@ -357,7 +356,7 @@
 ctl_process(_Val, ["stats", Stat]) ->
     Res = case Stat of
 	      "uptime-seconds" -> uptime_seconds();
-	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
 	      "onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
 	      "onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
 	  end,
@@ -752,6 +751,16 @@
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+    delete_older_users(Days, Users).
+
+delete_older_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+    delete_older_users(Days, Users).
+
+delete_older_users(Days, Users) ->
     %% Convert older time
     SecOlder = Days*24*60*60,
 
@@ -759,9 +768,6 @@
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp_now = MegaSecs * 1000000 + Secs,
 
-    %% Get the list of registered users
-    Users = ejabberd_auth:dirty_get_registered_users(),
-
     %% For a user, remove if required and answer true
     F = fun({LUser, LServer}) ->
 		%% Check if the user is logged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Mar 2009 11:36:41 -0000	1.15
+++ sources	3 Apr 2009 20:13:46 -0000	1.16
@@ -1 +1 @@
-1ff37c329e9bc1ddf3c458e051b81d63  ejabberd-2.0.4.tar.gz
+2d85b47df969daf0a78ed3b16562d731  ejabberd-2.0.5.tar.gz



From peter at fedoraproject.org  Fri Apr  3 20:20:14 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  3 Apr 2009 20:20:14 +0000 (UTC)
Subject: rpms/ejabberd/F-9 ejabberd-captcha.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 ejabberd.spec, 1.30, 1.31 import.log, 1.6,
	1.7 mod_ctlextra.erl, 1.4, 1.5 sources, 1.14, 1.15
Message-ID: <20090403202014.2976870134@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10402/F-9

Modified Files:
	.cvsignore ejabberd.spec import.log mod_ctlextra.erl sources 
Added Files:
	ejabberd-captcha.patch 
Log Message:
Ver. 2.0.5

ejabberd-captcha.patch:

--- NEW FILE ejabberd-captcha.patch ---
Binary files ejabberd-2.0.4/src/.DS_Store and ejabberd-2.0.4-new/src/.DS_Store differ
diff -urN ejabberd-2.0.4/src/ejabberd_captcha.erl ejabberd-2.0.4-new/src/ejabberd_captcha.erl
--- ejabberd-2.0.4/src/ejabberd_captcha.erl	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_captcha.erl	2009-03-14 07:27:05.000000000 +0100
@@ -0,0 +1,312 @@
+%%%-------------------------------------------------------------------
+%%% File    : ejabberd_captcha.erl
+%%% Author  : Evgeniy Khramtsov <xramtsov at gmail.com>
+%%% Description : CAPTCHA processing.
+%%%
+%%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov at gmail.com>
+%%%-------------------------------------------------------------------
+-module(ejabberd_captcha).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-export([create_captcha/6, process_reply/1, process/2]).
+
+-include("jlib.hrl").
+-include("ejabberd.hrl").
+-include("web/ejabberd_http.hrl").
+
+-define(VFIELD(Type, Var, Value),
+	{xmlelement, "field", [{"type", Type}, {"var", Var}],
+	 [{xmlelement, "value", [], [Value]}]}).
+
+-define(CAPTCHA_BODY(Lang, Room, URL),
+	translate:translate(Lang, "Your messages to ") ++ Room
+	++ translate:translate(Lang, " are being blocked. To unblock them, visit ")
+	++ URL).
+
+-define(CAPTCHA_TEXT(Lang), translate:translate(Lang, "Enter the text you see")).
+-define(CAPTCHA_LIFETIME, 120000). % two minutes
+
+-record(state, {}).
+-record(captcha, {id, pid, key, tref, args}).
+
+-define(T(S),
+	case catch mnesia:transaction(fun() -> S end) of
+	    {atomic, Res} ->
+		Res;
+	    {_, Reason} ->
+		?ERROR_MSG("mnesia transaction failed: ~p", [Reason]),
+		{error, Reason}
+	end).
+
+%%====================================================================
+%% API
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+create_captcha(Id, SID, From, To, Lang, Args)
+  when is_list(Id), is_list(Lang), is_list(SID),
+       is_record(From, jid), is_record(To, jid) ->
+    case create_image() of
+	{ok, Type, Key, Image} ->
+	    B64Image = jlib:encode_base64(binary_to_list(Image)),
+	    JID = jlib:jid_to_string(From),
+	    CID = "sha1+" ++ sha:sha(Image) ++ "@bob.xmpp.org",
+	    Data = {xmlelement, "data",
+		    [{"xmlns", ?NS_BOB}, {"cid", CID},
+		     {"max-age", "0"}, {"type", Type}],
+		    [{xmlcdata, B64Image}]},
+	    Captcha =
+		{xmlelement, "captcha", [{"xmlns", ?NS_CAPTCHA}],
+		 [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
+		   [?VFIELD("hidden", "FORM_TYPE", {xmlcdata, ?NS_CAPTCHA}),
+		    ?VFIELD("hidden", "from", {xmlcdata, jlib:jid_to_string(To)}),
+		    ?VFIELD("hidden", "challenge", {xmlcdata, Id}),
+		    ?VFIELD("hidden", "sid", {xmlcdata, SID}),
+		    {xmlelement, "field", [{"var", "ocr"}],
+		     [{xmlelement, "media", [{"xmlns", ?NS_MEDIA}],
+		       [{xmlelement, "uri", [{"type", Type}],
+			 [{xmlcdata, "cid:" ++ CID}]}]}]}]}]},
+	    Body = {xmlelement, "body", [],
+		    [{xmlcdata, ?CAPTCHA_BODY(Lang, JID, get_url(Id))}]},
+	    OOB = {xmlelement, "x", [{"xmlns", ?NS_OOB}],
+		   [{xmlelement, "url", [], [{xmlcdata, get_url(Id)}]}]},
+	    Tref = erlang:send_after(?CAPTCHA_LIFETIME, ?MODULE, {remove_id, Id}),
+	    ?T(mnesia:write(#captcha{id=Id, pid=self(), key=Key,
+				     tref=Tref, args=Args})),
+	    {ok, [Body, OOB, Captcha, Data]};
+	_Err ->
+	    error
+    end.
+
+process_reply({xmlelement, "captcha", _, _} = El) ->
+    case xml:get_subtag(El, "x") of
+	false ->
+	    {error, malformed};
+	Xdata ->
+	    Fields = jlib:parse_xdata_submit(Xdata),
+	    [Id | _] = proplists:get_value("challenge", Fields, [none]),
+	    [OCR | _] = proplists:get_value("ocr", Fields, [none]),
+	    ?T(case mnesia:read(captcha, Id, write) of
+		   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+		       mnesia:delete({captcha, Id}),
+		       erlang:cancel_timer(Tref),
+		       if OCR == Key ->
+			       Pid ! {captcha_succeed, Args},
+			       ok;
+			  true ->
+			       Pid ! {captcha_failed, Args},
+			       {error, bad_match}
+		       end;
+		   _ ->
+		       {error, not_found}
+	       end)
+    end;
+process_reply(_) ->
+    {error, malformed}.
+
+process(_Handlers, #request{method='GET', lang=Lang, path=[_, Id]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{}] ->
+	    Form =
+		{xmlelement, "div", [{"align", "center"}],
+		 [{xmlelement, "form", [{"action", get_url(Id)},
+					{"name", "captcha"},
+					{"method", "POST"}],
+		   [{xmlelement, "img", [{"src", get_url(Id ++ "/image")}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlcdata, ?CAPTCHA_TEXT(Lang)},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "text"},
+					   {"name", "key"},
+					   {"size", "10"}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "submit"},
+					   {"name", "enter"},
+					   {"value", "OK"}], []}]}]},
+	    ejabberd_web:make_xhtml([Form]);
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='GET', path=[_, Id, "image"]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{key=Key}] ->
+	    case create_image(Key) of
+		{ok, Type, _, Img} ->
+		    {200,
+		     [{"Content-Type", Type},
+		      {"Cache-Control", "no-cache"},
+		      {"Last-Modified", httpd_util:rfc1123_date()}],
+		     Img};
+		_ ->
+		    ejabberd_web:error(not_found)
+	    end;
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='POST', q=Q, path=[_, Id]}) ->
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+	       mnesia:delete({captcha, Id}),
+	       erlang:cancel_timer(Tref),
+	       Input = proplists:get_value("key", Q, none),
+	       if Input == Key ->
+		       Pid ! {captcha_succeed, Args},
+		       ejabberd_web:make_xhtml([]);
+		  true ->
+		       Pid ! {captcha_failed, Args},
+		       ejabberd_web:error(not_allowed)
+	       end;
+	   _ ->
+	       ejabberd_web:error(not_found)
+       end).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+init([]) ->
+    mnesia:create_table(captcha,
+			[{ram_copies, [node()]},
+			 {attributes, record_info(fields, captcha)}]),
+    mnesia:add_table_copy(captcha, node(), ram_copies),
+    {ok, #state{}}.
+
+handle_call(_Request, _From, State) ->
+    {reply, bad_request, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info({remove_id, Id}, State) ->
+    ?DEBUG("captcha ~p timed out", [Id]),
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{args=Args, pid=Pid}] ->
+	       Pid ! {captcha_failed, Args},
+	       mnesia:delete({captcha, Id});
+	   _ ->
+	       ok
+       end),
+    {noreply, State};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Function: create_image() -> {ok, Type, Key, Image} | {error, Reason}
+%% Type = "image/png" | "image/jpeg" | "image/gif"
+%% Key = string()
+%% Image = binary()
+%% Reason = atom()
+%%--------------------------------------------------------------------
+create_image() ->
+    %% Six numbers from 1 to 9.
+    Key = string:substr(randoms:get_string(), 1, 6),
+    create_image(Key).
+
+create_image(Key) ->
+    FileName = get_prog_name(),
+    Cmd = lists:flatten(io_lib:format("~s ~s", [FileName, Key])),
+    case cmd(Cmd) of
+	{ok, <<16#89, $P, $N, $G, $\r, $\n, 16#1a, $\n, _/binary>> = Img} ->
+	    {ok, "image/png", Key, Img};
+	{ok, <<16#ff, 16#d8, _/binary>> = Img} ->
+	    {ok, "image/jpeg", Key, Img};
+	{ok, <<$G, $I, $F, $8, X, $a, _/binary>> = Img} when X==$7; X==$9 ->
+	    {ok, "image/gif", Key, Img};
+	{error, Reason} ->
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason};
+	_ ->
+	    Reason = malformed_image,
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason}
+    end.
+
+get_prog_name() ->
+    case ejabberd_config:get_local_option(captcha_cmd) of
+	FileName when is_list(FileName) ->
+	    FileName;
+	_ ->
+	    ""
+    end.
+
+get_url(Str) ->
+    case ejabberd_config:get_local_option(captcha_host) of
+	Host when is_list(Host) ->
+	    "http://" ++ Host ++ "/captcha/" ++ Str;
+	_ ->
+	    "http://" ++ ?MYNAME ++ "/captcha/" ++ Str
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: cmd(Cmd) -> Data | {error, Reason}
+%% Cmd = string()
+%% Data = binary()
+%% Description: os:cmd/1 replacement
+%%--------------------------------------------------------------------
+-define(CMD_TIMEOUT, 5000).
+-define(MAX_FILE_SIZE, 64*1024).
+
+cmd(Cmd) ->
+    Port = open_port({spawn, Cmd}, [stream, eof, binary]),
+    TRef = erlang:start_timer(?CMD_TIMEOUT, self(), timeout),
+    recv_data(Port, TRef, <<>>).
+
+recv_data(Port, TRef, Buf) ->
+    receive
+	{Port, {data, Bytes}} ->
+	    NewBuf = <<Buf/binary, Bytes/binary>>,
+	    if size(NewBuf) > ?MAX_FILE_SIZE ->
+		    return(Port, TRef, {error, efbig});
+	       true ->
+		    recv_data(Port, TRef, NewBuf)
+	    end;
+	{Port, {data, _}} ->
+	    return(Port, TRef, {error, efbig});
+	{Port, eof} when Buf /= <<>> ->
+	    return(Port, TRef, {ok, Buf});
+	{Port, eof} ->
+	    return(Port, TRef, {error, enodata});
+	{timeout, TRef, _} ->
+	    return(Port, TRef, {error, timeout})
+    end.
+
+return(Port, TRef, Result) ->
+    case erlang:cancel_timer(TRef) of
+	false ->
+	    receive
+		{timeout, TRef, _} ->
+		    ok
+	    after 0 ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end,
+    catch port_close(Port),
+    Result.
diff -urN ejabberd-2.0.4/src/ejabberd_config.erl ejabberd-2.0.4-new/src/ejabberd_config.erl
--- ejabberd-2.0.4/src/ejabberd_config.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_config.erl	2009-03-14 11:43:35.000000000 +0100
@@ -164,6 +164,10 @@
 	    add_option(watchdog_admins, Admins, State);
 	{registration_timeout, Timeout} ->
 	    add_option(registration_timeout, Timeout, State);
+	{captcha_cmd, Cmd} ->
+	    add_option(captcha_cmd, Cmd, State);
+	{captcha_host, Host} ->
+            add_option(captcha_host, Host, State);
 	{loglevel, Loglevel} ->
 	    ejabberd_loglevel:set(Loglevel),
 	    State;
diff -urN ejabberd-2.0.4/src/ejabberd_sup.erl ejabberd-2.0.4-new/src/ejabberd_sup.erl
--- ejabberd-2.0.4/src/ejabberd_sup.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_sup.erl	2009-03-14 12:36:43.000000000 +0100
@@ -84,6 +84,13 @@
 	 brutal_kill,
 	 worker,
 	 [ejabberd_local]},
+    Captcha =
+	{ejabberd_captcha,
+	 {ejabberd_captcha, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 [ejabberd_captcha]},
     Listener =
 	{ejabberd_listener,
 	 {ejabberd_listener, start_link, []},
@@ -170,6 +177,7 @@
 	   SM,
 	   S2S,
 	   Local,
+           Captcha,
 	   ReceiverSupervisor,
 	   C2SSupervisor,
 	   S2SInSupervisor,
diff -urN ejabberd-2.0.4/src/jlib.hrl ejabberd-2.0.4-new/src/jlib.hrl
--- ejabberd-2.0.4/src/jlib.hrl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/jlib.hrl	2009-03-14 11:41:46.000000000 +0100
@@ -74,6 +74,12 @@
 
 -define(NS_CAPS,          "http://jabber.org/protocol/caps").
 
+%% CAPTCHA related NSes.
+-define(NS_OOB, "jabber:x:oob").
+-define(NS_CAPTCHA, "urn:xmpp:captcha").
+-define(NS_MEDIA, "urn:xmpp:media-element").
+-define(NS_BOB, "urn:xmpp:bob").
+
 % TODO: remove "code" attribute (currently it used for backward-compatibility)
 -define(STANZA_ERROR(Code, Type, Condition),
 	{xmlelement, "error",
diff -urN ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl
--- ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl	2009-03-14 11:40:40.000000000 +0100
@@ -69,6 +69,7 @@
 		 public_list = true,
 		 persistent = false,
 		 moderated = true,
+		 captcha_protected = false,
 		 members_by_default = true,
 		 members_only = false,
 		 allow_user_invites = false,
@@ -98,6 +99,7 @@
 		jid,
 		config = #config{},
 		users = ?DICT:new(),
+		robots = ?DICT:new(),
 		affiliations = ?DICT:new(),
 		history = lqueue_new(20),
 		subject = "",
@@ -382,7 +384,8 @@
 	      (XMLNS == ?NS_MUC_ADMIN) or
 	      (XMLNS == ?NS_MUC_OWNER) or
 	      (XMLNS == ?NS_DISCO_INFO) or
-	      (XMLNS == ?NS_DISCO_ITEMS) ->
+	      (XMLNS == ?NS_DISCO_ITEMS) or 
+	      (XMLNS == ?NS_CAPTCHA) ->
 	    Res1 = case XMLNS of
 		       ?NS_MUC_ADMIN ->
 			   process_iq_admin(From, Type, Lang, SubEl, StateData);
@@ -391,7 +394,9 @@
 		       ?NS_DISCO_INFO ->
 			   process_iq_disco_info(From, Type, Lang, StateData);
 		       ?NS_DISCO_ITEMS ->
-			   process_iq_disco_items(From, Type, Lang, StateData)
+			   process_iq_disco_items(From, Type, Lang, StateData);
+		       ?NS_CAPTCHA ->
+			   process_iq_captcha(From, Type, Lang, SubEl, StateData)
 		   end,
 	    {IQRes, NewStateData} =
 		case Res1 of
@@ -761,6 +766,30 @@
 	{empty, _} ->
 	    {next_state, StateName, StateData}
     end;
+handle_info({captcha_succeed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:store(From, passed, StateData#state.robots),
+		       add_new_user(From, Nick, Packet, StateData#state{robots=Robots});
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
+handle_info({captcha_failed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:erase(From, StateData#state.robots),
+		       Err = jlib:make_error_reply(
+			       Packet, ?ERR_NOT_AUTHORIZED),
+		       ejabberd_router:route( % TODO: s/Nick/""/
+			 jlib:jid_replace_resource(
+			   StateData#state.jid, Nick),
+			 From, Err),
+		       StateData#state{robots=Robots};
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
 handle_info(_Info, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
@@ -1461,7 +1490,8 @@
 	      From, Err),
 	    StateData;
 	{_, _, _, Role} ->
-	    case check_password(ServiceAffiliation, Els, StateData) of
+	    case check_password(ServiceAffiliation, Affiliation,
+				Els, From, StateData) of
 		true ->
 		    NewState =
 			add_user_presence(
@@ -1494,7 +1524,8 @@
 			true ->
 			    NewState#state{just_created = false};
 			false ->
-			    NewState
+			    Robots = ?DICT:erase(From, StateData#state.robots),
+			    NewState#state{robots = Robots}
 		    end;
 		nopass ->
 		    ErrText = "Password required to enter this room",
@@ -1505,6 +1536,29 @@
 			StateData#state.jid, Nick),
 		      From, Err),
 		    StateData;
+                captcha_required ->
+		    ID = randoms:get_string(),
+		    SID = xml:get_attr_s("id", Attrs),
+		    RoomJID = StateData#state.jid,
+		    To = jlib:jid_replace_resource(RoomJID, Nick),
+		    case ejabberd_captcha:create_captcha(
+			   ID, SID, RoomJID, To, Lang, From) of
+			{ok, CaptchaEls} ->
+			    MsgPkt = {xmlelement, "message", [{"id", ID}], CaptchaEls},
+			    Robots = ?DICT:store(From,
+						 {Nick, Packet}, StateData#state.robots),
+			    ejabberd_router:route(RoomJID, From, MsgPkt),
+			    StateData#state{robots = Robots};
+			error ->
+			    ErrText = "Unable to generate a captcha",
+			    Err = jlib:make_error_reply(
+				    Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)),
+			    ejabberd_router:route( % TODO: s/Nick/""/
+			      jlib:jid_replace_resource(
+				StateData#state.jid, Nick),
+			      From, Err),
+			    StateData
+		    end;
 		_ ->
 		    ErrText = "Incorrect password",
 		    Err = jlib:make_error_reply(
@@ -1517,13 +1571,13 @@
 	   end
     end.
 
-check_password(owner, _Els, _StateData) ->
+check_password(owner, _Affiliation, _Els, _From, _StateData) ->
     %% Don't check pass if user is owner in MUC service (access_admin option)
     true;
-check_password(_ServiceAffiliation, Els, StateData) ->
+check_password(_ServiceAffiliation, Affiliation, Els, From, StateData) ->
     case (StateData#state.config)#config.password_protected of
 	false ->
-	    true;
+	    check_captcha(Affiliation, From, StateData);
 	true ->
 	    Pass = extract_password(Els),
 	    case Pass of
@@ -1539,6 +1593,19 @@
 	    end
     end.
 
+check_captcha(Affiliation, From, StateData) ->
+    case (StateData#state.config)#config.captcha_protected of
+	true when Affiliation == none ->
+	    case ?DICT:find(From, StateData#state.robots) of
+		{ok, passed} ->
+		    true;
+		_ ->
+		    captcha_required
+	    end;
+	_ ->
+	    true
+    end.
+
 extract_password([]) ->
     false;
 extract_password([{xmlelement, _Name, Attrs, _SubEls} = El | Els]) ->
@@ -2713,6 +2780,9 @@
 	 ?BOOLXFIELD("Make room members-only",
 		     "muc#roomconfig_membersonly",
 		     Config#config.members_only),
+	 ?BOOLXFIELD("Make room captcha protected",
+		     "captcha_protected",
+		     Config#config.captcha_protected),
 	 ?BOOLXFIELD("Make room moderated",
 		     "muc#roomconfig_moderatedroom",
 		     Config#config.moderated),
@@ -2823,6 +2893,8 @@
     ?SET_BOOL_XOPT(members_by_default, Val);
 set_xoption([{"muc#roomconfig_membersonly", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(members_only, Val);
+set_xoption([{"captcha_protected", [Val]} | Opts], Config) ->
+    ?SET_BOOL_XOPT(captcha_protected, Val);
 set_xoption([{"muc#roomconfig_allowinvites", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(allow_user_invites, Val);
 set_xoption([{"muc#roomconfig_passwordprotectedroom", [Val]} | Opts], Config) ->
@@ -2913,6 +2985,7 @@
 	      ?CASE_CONFIG_OPT(members_only);
 	      ?CASE_CONFIG_OPT(allow_user_invites);
 	      ?CASE_CONFIG_OPT(password_protected);
+	      ?CASE_CONFIG_OPT(captcha_protected);
 	      ?CASE_CONFIG_OPT(password);
 	      ?CASE_CONFIG_OPT(anonymous);
 	      ?CASE_CONFIG_OPT(logging);
@@ -2954,6 +3027,7 @@
      ?MAKE_CONFIG_OPT(members_only),
      ?MAKE_CONFIG_OPT(allow_user_invites),
      ?MAKE_CONFIG_OPT(password_protected),
+     ?MAKE_CONFIG_OPT(captcha_protected),
      ?MAKE_CONFIG_OPT(password),
      ?MAKE_CONFIG_OPT(anonymous),
      ?MAKE_CONFIG_OPT(logging),
@@ -3074,6 +3148,17 @@
 	    {error, ?ERR_FORBIDDEN}
     end.
 
+process_iq_captcha(_From, get, _Lang, _SubEl, _StateData) ->
+    {error, ?ERR_NOT_ALLOWED};
+
+process_iq_captcha(_From, set, _Lang, SubEl, StateData) ->
+    case ejabberd_captcha:process_reply(SubEl) of
+	ok ->
+	    {result, [], StateData};
+	_ ->
+	    {error, ?ERR_NOT_ACCEPTABLE}
+    end.
+
 get_title(StateData) ->
     case (StateData#state.config)#config.title of
 	"" ->
diff -urN ejabberd-2.0.4/src/web/ejabberd_http.erl ejabberd-2.0.4-new/src/web/ejabberd_http.erl
--- ejabberd-2.0.4/src/web/ejabberd_http.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/web/ejabberd_http.erl	2009-03-14 10:57:34.000000000 +0100
@@ -106,6 +106,10 @@
 	    {value, {request_handlers, H}} -> H;
 	    false -> []
         end ++
+	case lists:member(captcha, Opts) of
+	    true -> [{["captcha"], ejabberd_captcha}];
+	    false -> []
+	end ++
         case lists:member(web_admin, Opts) of
             true -> [{["admin"], ejabberd_web_admin}];
             false -> []
Binary files ejabberd-2.0.4/tools/.DS_Store and ejabberd-2.0.4-new/tools/.DS_Store differ
diff -urN ejabberd-2.0.4/tools/captcha.sh ejabberd-2.0.4-new/tools/captcha.sh
--- ejabberd-2.0.4/tools/captcha.sh	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/tools/captcha.sh	2009-03-14 11:46:42.000000000 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+SIGN=$(($RANDOM % 2))
+
+R1=$(($RANDOM % 20))
+R2=$(($RANDOM % 10 + 40))
+
+if [ $SIGN -eq "0" ]; then
+    S1=$(( -1*($RANDOM % 20 + 50) ))
+    S2=$(( $RANDOM % 20 + 50 ))
+else
+    S2=$(( -1*($RANDOM % 20 + 50) ))
+    S1=$(( $RANDOM % 20 + 50 ))
+fi
+
+convert -size 140x60 xc:white \
+    -pointsize 30 -draw "text 20,30 '$1'" \
+    -roll -$R2+$R1 -swirl $S1 \
+    -roll +$R2-$R1 -swirl $S2 \
+    +repage -resize 120x60 \
+    -quality 90 -depth 8 png:-
--- ejabberd-2.0.5/ChangeLog~	2009-04-01 19:23:52.000000000 +0400
+++ ejabberd-2.0.5/ChangeLog	2009-04-03 23:45:03.174979944 +0400
@@ -15,6 +15,15 @@
 	stanza (EJAB-300).
 	* src/ejabberd_c2s.erl: Likewise
 
+2009-03-13  Evgeniy Khramtsov <ekhramtsov at process-one.net>
+
+	* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
+	* src/ejabberd_config.erl: likewise.
+	* src/ejabberd_sup.erl: likewise.
+	* src/jlib.hrl: likewise.
+	* src/web/ejabberd_http.erl: likewise.
+	* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
+
 2009-03-10  Badlop  <badlop at process-one.net>
 
 	* doc/release_notes_2.0.4.txt: Added file for new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Mar 2009 11:43:08 -0000	1.12
+++ .cvsignore	3 Apr 2009 20:19:43 -0000	1.13
@@ -1 +1 @@
-ejabberd-2.0.4.tar.gz
+ejabberd-2.0.5.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/ejabberd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ejabberd.spec	15 Mar 2009 11:43:08 -0000	1.30
+++ ejabberd.spec	3 Apr 2009 20:19:43 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           ejabberd
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
@@ -12,7 +12,7 @@
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
+# svn export -r 873 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
 # The following were extracted from a patch found on http://realloc.spb.ru/share/ejabberdad.html
@@ -31,6 +31,10 @@
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
+# CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
+# wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
+Patch4: ejabberd-captcha.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,6 +117,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
+#%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -172,7 +177,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -214,6 +219,14 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
+- Ver. 2.0.5
+- Temporarily disabled CAPTCHA support
+
+* Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-2
+- Support for CAPTCHA (XEP-0158)
+- Updated mod_ctlextra.erl (fixed EJAB-789, EJAB-864)
+
 * Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-1
 - Ver. 2.0.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	15 Mar 2009 11:43:08 -0000	1.6
+++ import.log	3 Apr 2009 20:19:43 -0000	1.7
@@ -4,3 +4,4 @@
 ejabberd-2_0_2-3_fc9:F-9:ejabberd-2.0.2-3.fc9.src.rpm:1222925461
 ejabberd-2_0_3-1_fc10:F-9:ejabberd-2.0.3-1.fc10.src.rpm:1232988519
 ejabberd-2_0_4-1_fc10:F-9:ejabberd-2.0.4-1.fc10.src.rpm:1237117113
+ejabberd-2_0_5-1_fc10:F-9:ejabberd-2.0.5-1.fc10.src.rpm:1238789863


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/mod_ctlextra.erl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_ctlextra.erl	29 Aug 2008 20:18:07 -0000	1.4
+++ mod_ctlextra.erl	3 Apr 2009 20:19:43 -0000	1.5
@@ -47,14 +47,12 @@
 
      %% ejabberd_auth
      {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+     {"delete-older-users-vhost host days", "delete users that not logged in last 'days' in 'host'"},
      {"set-password user server password", "set password to user at server"},
 
      %% ejd2odbc
      {"export2odbc server output", "export Mnesia tables on server to files on output directory"},
 
-     %% mod_offline
-     {"delete-older-messages days", "delete offline messages older than 'days'"},
-
      %% mod_shared_roster
      {"srg-create group host name description display", "create the group with options"},
      {"srg-delete group host", "delete the group"},
@@ -113,15 +111,16 @@
 %% Commands global
 %%-------------
 
-ctl_process(_Val, ["delete-older-messages", Days]) ->
-    mod_offline:remove_old_messages(list_to_integer(Days)),
-    ?STATUS_SUCCESS;
-
 ctl_process(_Val, ["delete-older-users", Days]) ->
     {removed, N, UR} = delete_older_users(list_to_integer(Days)),
     io:format("Deleted ~p users: ~p~n", [N, UR]),
     ?STATUS_SUCCESS;
 
+ctl_process(_Val, ["delete-older-users-vhost", Host, Days]) ->
+    {removed, N, UR} = delete_older_users_vhost(Host, list_to_integer(Days)),
+    io:format("Deleted ~p users: ~p~n", [N, UR]),
+    ?STATUS_SUCCESS;
+
 ctl_process(_Val, ["export2odbc", Server, Output]) ->
     Tables = [
 	      {export_last, last},
@@ -357,7 +356,7 @@
 ctl_process(_Val, ["stats", Stat]) ->
     Res = case Stat of
 	      "uptime-seconds" -> uptime_seconds();
-	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
 	      "onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
 	      "onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
 	  end,
@@ -752,6 +751,16 @@
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+    delete_older_users(Days, Users).
+
+delete_older_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+    delete_older_users(Days, Users).
+
+delete_older_users(Days, Users) ->
     %% Convert older time
     SecOlder = Days*24*60*60,
 
@@ -759,9 +768,6 @@
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp_now = MegaSecs * 1000000 + Secs,
 
-    %% Get the list of registered users
-    Users = ejabberd_auth:dirty_get_registered_users(),
-
     %% For a user, remove if required and answer true
     F = fun({LUser, LServer}) ->
 		%% Check if the user is logged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	15 Mar 2009 11:43:08 -0000	1.14
+++ sources	3 Apr 2009 20:19:43 -0000	1.15
@@ -1 +1 @@
-1ff37c329e9bc1ddf3c458e051b81d63  ejabberd-2.0.4.tar.gz
+2d85b47df969daf0a78ed3b16562d731  ejabberd-2.0.5.tar.gz



From peter at fedoraproject.org  Fri Apr  3 20:23:09 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  3 Apr 2009 20:23:09 +0000 (UTC)
Subject: rpms/ejabberd/EL-5 ejabberd-captcha.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 ejabberd.spec, 1.25, 1.26 import.log, 1.6,
	1.7 mod_ctlextra.erl, 1.4, 1.5 sources, 1.11, 1.12
Message-ID: <20090403202309.C0C7770134@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10970/EL-5

Modified Files:
	.cvsignore ejabberd.spec import.log mod_ctlextra.erl sources 
Added Files:
	ejabberd-captcha.patch 
Log Message:
Ver. 2.0.5

ejabberd-captcha.patch:

--- NEW FILE ejabberd-captcha.patch ---
Binary files ejabberd-2.0.4/src/.DS_Store and ejabberd-2.0.4-new/src/.DS_Store differ
diff -urN ejabberd-2.0.4/src/ejabberd_captcha.erl ejabberd-2.0.4-new/src/ejabberd_captcha.erl
--- ejabberd-2.0.4/src/ejabberd_captcha.erl	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_captcha.erl	2009-03-14 07:27:05.000000000 +0100
@@ -0,0 +1,312 @@
+%%%-------------------------------------------------------------------
+%%% File    : ejabberd_captcha.erl
+%%% Author  : Evgeniy Khramtsov <xramtsov at gmail.com>
+%%% Description : CAPTCHA processing.
+%%%
+%%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov at gmail.com>
+%%%-------------------------------------------------------------------
+-module(ejabberd_captcha).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-export([create_captcha/6, process_reply/1, process/2]).
+
+-include("jlib.hrl").
+-include("ejabberd.hrl").
+-include("web/ejabberd_http.hrl").
+
+-define(VFIELD(Type, Var, Value),
+	{xmlelement, "field", [{"type", Type}, {"var", Var}],
+	 [{xmlelement, "value", [], [Value]}]}).
+
+-define(CAPTCHA_BODY(Lang, Room, URL),
+	translate:translate(Lang, "Your messages to ") ++ Room
+	++ translate:translate(Lang, " are being blocked. To unblock them, visit ")
+	++ URL).
+
+-define(CAPTCHA_TEXT(Lang), translate:translate(Lang, "Enter the text you see")).
+-define(CAPTCHA_LIFETIME, 120000). % two minutes
+
+-record(state, {}).
+-record(captcha, {id, pid, key, tref, args}).
+
+-define(T(S),
+	case catch mnesia:transaction(fun() -> S end) of
+	    {atomic, Res} ->
+		Res;
+	    {_, Reason} ->
+		?ERROR_MSG("mnesia transaction failed: ~p", [Reason]),
+		{error, Reason}
+	end).
+
+%%====================================================================
+%% API
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+create_captcha(Id, SID, From, To, Lang, Args)
+  when is_list(Id), is_list(Lang), is_list(SID),
+       is_record(From, jid), is_record(To, jid) ->
+    case create_image() of
+	{ok, Type, Key, Image} ->
+	    B64Image = jlib:encode_base64(binary_to_list(Image)),
+	    JID = jlib:jid_to_string(From),
+	    CID = "sha1+" ++ sha:sha(Image) ++ "@bob.xmpp.org",
+	    Data = {xmlelement, "data",
+		    [{"xmlns", ?NS_BOB}, {"cid", CID},
+		     {"max-age", "0"}, {"type", Type}],
+		    [{xmlcdata, B64Image}]},
+	    Captcha =
+		{xmlelement, "captcha", [{"xmlns", ?NS_CAPTCHA}],
+		 [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
+		   [?VFIELD("hidden", "FORM_TYPE", {xmlcdata, ?NS_CAPTCHA}),
+		    ?VFIELD("hidden", "from", {xmlcdata, jlib:jid_to_string(To)}),
+		    ?VFIELD("hidden", "challenge", {xmlcdata, Id}),
+		    ?VFIELD("hidden", "sid", {xmlcdata, SID}),
+		    {xmlelement, "field", [{"var", "ocr"}],
+		     [{xmlelement, "media", [{"xmlns", ?NS_MEDIA}],
+		       [{xmlelement, "uri", [{"type", Type}],
+			 [{xmlcdata, "cid:" ++ CID}]}]}]}]}]},
+	    Body = {xmlelement, "body", [],
+		    [{xmlcdata, ?CAPTCHA_BODY(Lang, JID, get_url(Id))}]},
+	    OOB = {xmlelement, "x", [{"xmlns", ?NS_OOB}],
+		   [{xmlelement, "url", [], [{xmlcdata, get_url(Id)}]}]},
+	    Tref = erlang:send_after(?CAPTCHA_LIFETIME, ?MODULE, {remove_id, Id}),
+	    ?T(mnesia:write(#captcha{id=Id, pid=self(), key=Key,
+				     tref=Tref, args=Args})),
+	    {ok, [Body, OOB, Captcha, Data]};
+	_Err ->
+	    error
+    end.
+
+process_reply({xmlelement, "captcha", _, _} = El) ->
+    case xml:get_subtag(El, "x") of
+	false ->
+	    {error, malformed};
+	Xdata ->
+	    Fields = jlib:parse_xdata_submit(Xdata),
+	    [Id | _] = proplists:get_value("challenge", Fields, [none]),
+	    [OCR | _] = proplists:get_value("ocr", Fields, [none]),
+	    ?T(case mnesia:read(captcha, Id, write) of
+		   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+		       mnesia:delete({captcha, Id}),
+		       erlang:cancel_timer(Tref),
+		       if OCR == Key ->
+			       Pid ! {captcha_succeed, Args},
+			       ok;
+			  true ->
+			       Pid ! {captcha_failed, Args},
+			       {error, bad_match}
+		       end;
+		   _ ->
+		       {error, not_found}
+	       end)
+    end;
+process_reply(_) ->
+    {error, malformed}.
+
+process(_Handlers, #request{method='GET', lang=Lang, path=[_, Id]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{}] ->
+	    Form =
+		{xmlelement, "div", [{"align", "center"}],
+		 [{xmlelement, "form", [{"action", get_url(Id)},
+					{"name", "captcha"},
+					{"method", "POST"}],
+		   [{xmlelement, "img", [{"src", get_url(Id ++ "/image")}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlcdata, ?CAPTCHA_TEXT(Lang)},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "text"},
+					   {"name", "key"},
+					   {"size", "10"}], []},
+		    {xmlelement, "br", [], []},
+		    {xmlelement, "input", [{"type", "submit"},
+					   {"name", "enter"},
+					   {"value", "OK"}], []}]}]},
+	    ejabberd_web:make_xhtml([Form]);
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='GET', path=[_, Id, "image"]}) ->
+    case mnesia:dirty_read(captcha, Id) of
+	[#captcha{key=Key}] ->
+	    case create_image(Key) of
+		{ok, Type, _, Img} ->
+		    {200,
+		     [{"Content-Type", Type},
+		      {"Cache-Control", "no-cache"},
+		      {"Last-Modified", httpd_util:rfc1123_date()}],
+		     Img};
+		_ ->
+		    ejabberd_web:error(not_found)
+	    end;
+	_ ->
+	    ejabberd_web:error(not_found)
+    end;
+
+process(_Handlers, #request{method='POST', q=Q, path=[_, Id]}) ->
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
+	       mnesia:delete({captcha, Id}),
+	       erlang:cancel_timer(Tref),
+	       Input = proplists:get_value("key", Q, none),
+	       if Input == Key ->
+		       Pid ! {captcha_succeed, Args},
+		       ejabberd_web:make_xhtml([]);
+		  true ->
+		       Pid ! {captcha_failed, Args},
+		       ejabberd_web:error(not_allowed)
+	       end;
+	   _ ->
+	       ejabberd_web:error(not_found)
+       end).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+init([]) ->
+    mnesia:create_table(captcha,
+			[{ram_copies, [node()]},
+			 {attributes, record_info(fields, captcha)}]),
+    mnesia:add_table_copy(captcha, node(), ram_copies),
+    {ok, #state{}}.
+
+handle_call(_Request, _From, State) ->
+    {reply, bad_request, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info({remove_id, Id}, State) ->
+    ?DEBUG("captcha ~p timed out", [Id]),
+    ?T(case mnesia:read(captcha, Id, write) of
+	   [#captcha{args=Args, pid=Pid}] ->
+	       Pid ! {captcha_failed, Args},
+	       mnesia:delete({captcha, Id});
+	   _ ->
+	       ok
+       end),
+    {noreply, State};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Function: create_image() -> {ok, Type, Key, Image} | {error, Reason}
+%% Type = "image/png" | "image/jpeg" | "image/gif"
+%% Key = string()
+%% Image = binary()
+%% Reason = atom()
+%%--------------------------------------------------------------------
+create_image() ->
+    %% Six numbers from 1 to 9.
+    Key = string:substr(randoms:get_string(), 1, 6),
+    create_image(Key).
+
+create_image(Key) ->
+    FileName = get_prog_name(),
+    Cmd = lists:flatten(io_lib:format("~s ~s", [FileName, Key])),
+    case cmd(Cmd) of
+	{ok, <<16#89, $P, $N, $G, $\r, $\n, 16#1a, $\n, _/binary>> = Img} ->
+	    {ok, "image/png", Key, Img};
+	{ok, <<16#ff, 16#d8, _/binary>> = Img} ->
+	    {ok, "image/jpeg", Key, Img};
+	{ok, <<$G, $I, $F, $8, X, $a, _/binary>> = Img} when X==$7; X==$9 ->
+	    {ok, "image/gif", Key, Img};
+	{error, Reason} ->
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason};
+	_ ->
+	    Reason = malformed_image,
+	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
+		       [Cmd, Reason]),
+	    {error, Reason}
+    end.
+
+get_prog_name() ->
+    case ejabberd_config:get_local_option(captcha_cmd) of
+	FileName when is_list(FileName) ->
+	    FileName;
+	_ ->
+	    ""
+    end.
+
+get_url(Str) ->
+    case ejabberd_config:get_local_option(captcha_host) of
+	Host when is_list(Host) ->
+	    "http://" ++ Host ++ "/captcha/" ++ Str;
+	_ ->
+	    "http://" ++ ?MYNAME ++ "/captcha/" ++ Str
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: cmd(Cmd) -> Data | {error, Reason}
+%% Cmd = string()
+%% Data = binary()
+%% Description: os:cmd/1 replacement
+%%--------------------------------------------------------------------
+-define(CMD_TIMEOUT, 5000).
+-define(MAX_FILE_SIZE, 64*1024).
+
+cmd(Cmd) ->
+    Port = open_port({spawn, Cmd}, [stream, eof, binary]),
+    TRef = erlang:start_timer(?CMD_TIMEOUT, self(), timeout),
+    recv_data(Port, TRef, <<>>).
+
+recv_data(Port, TRef, Buf) ->
+    receive
+	{Port, {data, Bytes}} ->
+	    NewBuf = <<Buf/binary, Bytes/binary>>,
+	    if size(NewBuf) > ?MAX_FILE_SIZE ->
+		    return(Port, TRef, {error, efbig});
+	       true ->
+		    recv_data(Port, TRef, NewBuf)
+	    end;
+	{Port, {data, _}} ->
+	    return(Port, TRef, {error, efbig});
+	{Port, eof} when Buf /= <<>> ->
+	    return(Port, TRef, {ok, Buf});
+	{Port, eof} ->
+	    return(Port, TRef, {error, enodata});
+	{timeout, TRef, _} ->
+	    return(Port, TRef, {error, timeout})
+    end.
+
+return(Port, TRef, Result) ->
+    case erlang:cancel_timer(TRef) of
+	false ->
+	    receive
+		{timeout, TRef, _} ->
+		    ok
+	    after 0 ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end,
+    catch port_close(Port),
+    Result.
diff -urN ejabberd-2.0.4/src/ejabberd_config.erl ejabberd-2.0.4-new/src/ejabberd_config.erl
--- ejabberd-2.0.4/src/ejabberd_config.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_config.erl	2009-03-14 11:43:35.000000000 +0100
@@ -164,6 +164,10 @@
 	    add_option(watchdog_admins, Admins, State);
 	{registration_timeout, Timeout} ->
 	    add_option(registration_timeout, Timeout, State);
+	{captcha_cmd, Cmd} ->
+	    add_option(captcha_cmd, Cmd, State);
+	{captcha_host, Host} ->
+            add_option(captcha_host, Host, State);
 	{loglevel, Loglevel} ->
 	    ejabberd_loglevel:set(Loglevel),
 	    State;
diff -urN ejabberd-2.0.4/src/ejabberd_sup.erl ejabberd-2.0.4-new/src/ejabberd_sup.erl
--- ejabberd-2.0.4/src/ejabberd_sup.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/ejabberd_sup.erl	2009-03-14 12:36:43.000000000 +0100
@@ -84,6 +84,13 @@
 	 brutal_kill,
 	 worker,
 	 [ejabberd_local]},
+    Captcha =
+	{ejabberd_captcha,
+	 {ejabberd_captcha, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 [ejabberd_captcha]},
     Listener =
 	{ejabberd_listener,
 	 {ejabberd_listener, start_link, []},
@@ -170,6 +177,7 @@
 	   SM,
 	   S2S,
 	   Local,
+           Captcha,
 	   ReceiverSupervisor,
 	   C2SSupervisor,
 	   S2SInSupervisor,
diff -urN ejabberd-2.0.4/src/jlib.hrl ejabberd-2.0.4-new/src/jlib.hrl
--- ejabberd-2.0.4/src/jlib.hrl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/jlib.hrl	2009-03-14 11:41:46.000000000 +0100
@@ -74,6 +74,12 @@
 
 -define(NS_CAPS,          "http://jabber.org/protocol/caps").
 
+%% CAPTCHA related NSes.
+-define(NS_OOB, "jabber:x:oob").
+-define(NS_CAPTCHA, "urn:xmpp:captcha").
+-define(NS_MEDIA, "urn:xmpp:media-element").
+-define(NS_BOB, "urn:xmpp:bob").
+
 % TODO: remove "code" attribute (currently it used for backward-compatibility)
 -define(STANZA_ERROR(Code, Type, Condition),
 	{xmlelement, "error",
diff -urN ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl
--- ejabberd-2.0.4/src/mod_muc/mod_muc_room.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/mod_muc/mod_muc_room.erl	2009-03-14 11:40:40.000000000 +0100
@@ -69,6 +69,7 @@
 		 public_list = true,
 		 persistent = false,
 		 moderated = true,
+		 captcha_protected = false,
 		 members_by_default = true,
 		 members_only = false,
 		 allow_user_invites = false,
@@ -98,6 +99,7 @@
 		jid,
 		config = #config{},
 		users = ?DICT:new(),
+		robots = ?DICT:new(),
 		affiliations = ?DICT:new(),
 		history = lqueue_new(20),
 		subject = "",
@@ -382,7 +384,8 @@
 	      (XMLNS == ?NS_MUC_ADMIN) or
 	      (XMLNS == ?NS_MUC_OWNER) or
 	      (XMLNS == ?NS_DISCO_INFO) or
-	      (XMLNS == ?NS_DISCO_ITEMS) ->
+	      (XMLNS == ?NS_DISCO_ITEMS) or 
+	      (XMLNS == ?NS_CAPTCHA) ->
 	    Res1 = case XMLNS of
 		       ?NS_MUC_ADMIN ->
 			   process_iq_admin(From, Type, Lang, SubEl, StateData);
@@ -391,7 +394,9 @@
 		       ?NS_DISCO_INFO ->
 			   process_iq_disco_info(From, Type, Lang, StateData);
 		       ?NS_DISCO_ITEMS ->
-			   process_iq_disco_items(From, Type, Lang, StateData)
+			   process_iq_disco_items(From, Type, Lang, StateData);
+		       ?NS_CAPTCHA ->
+			   process_iq_captcha(From, Type, Lang, SubEl, StateData)
 		   end,
 	    {IQRes, NewStateData} =
 		case Res1 of
@@ -761,6 +766,30 @@
 	{empty, _} ->
 	    {next_state, StateName, StateData}
     end;
+handle_info({captcha_succeed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:store(From, passed, StateData#state.robots),
+		       add_new_user(From, Nick, Packet, StateData#state{robots=Robots});
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
+handle_info({captcha_failed, From}, normal_state, StateData) ->
+    NewState = case ?DICT:find(From, StateData#state.robots) of
+		   {ok, {Nick, Packet}} ->
+		       Robots = ?DICT:erase(From, StateData#state.robots),
+		       Err = jlib:make_error_reply(
+			       Packet, ?ERR_NOT_AUTHORIZED),
+		       ejabberd_router:route( % TODO: s/Nick/""/
+			 jlib:jid_replace_resource(
+			   StateData#state.jid, Nick),
+			 From, Err),
+		       StateData#state{robots=Robots};
+		   _ ->
+		       StateData
+	       end,
+    {next_state, normal_state, NewState};
 handle_info(_Info, StateName, StateData) ->
     {next_state, StateName, StateData}.
 
@@ -1461,7 +1490,8 @@
 	      From, Err),
 	    StateData;
 	{_, _, _, Role} ->
-	    case check_password(ServiceAffiliation, Els, StateData) of
+	    case check_password(ServiceAffiliation, Affiliation,
+				Els, From, StateData) of
 		true ->
 		    NewState =
 			add_user_presence(
@@ -1494,7 +1524,8 @@
 			true ->
 			    NewState#state{just_created = false};
 			false ->
-			    NewState
+			    Robots = ?DICT:erase(From, StateData#state.robots),
+			    NewState#state{robots = Robots}
 		    end;
 		nopass ->
 		    ErrText = "Password required to enter this room",
@@ -1505,6 +1536,29 @@
 			StateData#state.jid, Nick),
 		      From, Err),
 		    StateData;
+                captcha_required ->
+		    ID = randoms:get_string(),
+		    SID = xml:get_attr_s("id", Attrs),
+		    RoomJID = StateData#state.jid,
+		    To = jlib:jid_replace_resource(RoomJID, Nick),
+		    case ejabberd_captcha:create_captcha(
+			   ID, SID, RoomJID, To, Lang, From) of
+			{ok, CaptchaEls} ->
+			    MsgPkt = {xmlelement, "message", [{"id", ID}], CaptchaEls},
+			    Robots = ?DICT:store(From,
+						 {Nick, Packet}, StateData#state.robots),
+			    ejabberd_router:route(RoomJID, From, MsgPkt),
+			    StateData#state{robots = Robots};
+			error ->
+			    ErrText = "Unable to generate a captcha",
+			    Err = jlib:make_error_reply(
+				    Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)),
+			    ejabberd_router:route( % TODO: s/Nick/""/
+			      jlib:jid_replace_resource(
+				StateData#state.jid, Nick),
+			      From, Err),
+			    StateData
+		    end;
 		_ ->
 		    ErrText = "Incorrect password",
 		    Err = jlib:make_error_reply(
@@ -1517,13 +1571,13 @@
 	   end
     end.
 
-check_password(owner, _Els, _StateData) ->
+check_password(owner, _Affiliation, _Els, _From, _StateData) ->
     %% Don't check pass if user is owner in MUC service (access_admin option)
     true;
-check_password(_ServiceAffiliation, Els, StateData) ->
+check_password(_ServiceAffiliation, Affiliation, Els, From, StateData) ->
     case (StateData#state.config)#config.password_protected of
 	false ->
-	    true;
+	    check_captcha(Affiliation, From, StateData);
 	true ->
 	    Pass = extract_password(Els),
 	    case Pass of
@@ -1539,6 +1593,19 @@
 	    end
     end.
 
+check_captcha(Affiliation, From, StateData) ->
+    case (StateData#state.config)#config.captcha_protected of
+	true when Affiliation == none ->
+	    case ?DICT:find(From, StateData#state.robots) of
+		{ok, passed} ->
+		    true;
+		_ ->
+		    captcha_required
+	    end;
+	_ ->
+	    true
+    end.
+
 extract_password([]) ->
     false;
 extract_password([{xmlelement, _Name, Attrs, _SubEls} = El | Els]) ->
@@ -2713,6 +2780,9 @@
 	 ?BOOLXFIELD("Make room members-only",
 		     "muc#roomconfig_membersonly",
 		     Config#config.members_only),
+	 ?BOOLXFIELD("Make room captcha protected",
+		     "captcha_protected",
+		     Config#config.captcha_protected),
 	 ?BOOLXFIELD("Make room moderated",
 		     "muc#roomconfig_moderatedroom",
 		     Config#config.moderated),
@@ -2823,6 +2893,8 @@
     ?SET_BOOL_XOPT(members_by_default, Val);
 set_xoption([{"muc#roomconfig_membersonly", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(members_only, Val);
+set_xoption([{"captcha_protected", [Val]} | Opts], Config) ->
+    ?SET_BOOL_XOPT(captcha_protected, Val);
 set_xoption([{"muc#roomconfig_allowinvites", [Val]} | Opts], Config) ->
     ?SET_BOOL_XOPT(allow_user_invites, Val);
 set_xoption([{"muc#roomconfig_passwordprotectedroom", [Val]} | Opts], Config) ->
@@ -2913,6 +2985,7 @@
 	      ?CASE_CONFIG_OPT(members_only);
 	      ?CASE_CONFIG_OPT(allow_user_invites);
 	      ?CASE_CONFIG_OPT(password_protected);
+	      ?CASE_CONFIG_OPT(captcha_protected);
 	      ?CASE_CONFIG_OPT(password);
 	      ?CASE_CONFIG_OPT(anonymous);
 	      ?CASE_CONFIG_OPT(logging);
@@ -2954,6 +3027,7 @@
      ?MAKE_CONFIG_OPT(members_only),
      ?MAKE_CONFIG_OPT(allow_user_invites),
      ?MAKE_CONFIG_OPT(password_protected),
+     ?MAKE_CONFIG_OPT(captcha_protected),
      ?MAKE_CONFIG_OPT(password),
      ?MAKE_CONFIG_OPT(anonymous),
      ?MAKE_CONFIG_OPT(logging),
@@ -3074,6 +3148,17 @@
 	    {error, ?ERR_FORBIDDEN}
     end.
 
+process_iq_captcha(_From, get, _Lang, _SubEl, _StateData) ->
+    {error, ?ERR_NOT_ALLOWED};
+
+process_iq_captcha(_From, set, _Lang, SubEl, StateData) ->
+    case ejabberd_captcha:process_reply(SubEl) of
+	ok ->
+	    {result, [], StateData};
+	_ ->
+	    {error, ?ERR_NOT_ACCEPTABLE}
+    end.
+
 get_title(StateData) ->
     case (StateData#state.config)#config.title of
 	"" ->
diff -urN ejabberd-2.0.4/src/web/ejabberd_http.erl ejabberd-2.0.4-new/src/web/ejabberd_http.erl
--- ejabberd-2.0.4/src/web/ejabberd_http.erl	2009-03-12 09:41:02.000000000 +0100
+++ ejabberd-2.0.4-new/src/web/ejabberd_http.erl	2009-03-14 10:57:34.000000000 +0100
@@ -106,6 +106,10 @@
 	    {value, {request_handlers, H}} -> H;
 	    false -> []
         end ++
+	case lists:member(captcha, Opts) of
+	    true -> [{["captcha"], ejabberd_captcha}];
+	    false -> []
+	end ++
         case lists:member(web_admin, Opts) of
             true -> [{["admin"], ejabberd_web_admin}];
             false -> []
Binary files ejabberd-2.0.4/tools/.DS_Store and ejabberd-2.0.4-new/tools/.DS_Store differ
diff -urN ejabberd-2.0.4/tools/captcha.sh ejabberd-2.0.4-new/tools/captcha.sh
--- ejabberd-2.0.4/tools/captcha.sh	1970-01-01 01:00:00.000000000 +0100
+++ ejabberd-2.0.4-new/tools/captcha.sh	2009-03-14 11:46:42.000000000 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+SIGN=$(($RANDOM % 2))
+
+R1=$(($RANDOM % 20))
+R2=$(($RANDOM % 10 + 40))
+
+if [ $SIGN -eq "0" ]; then
+    S1=$(( -1*($RANDOM % 20 + 50) ))
+    S2=$(( $RANDOM % 20 + 50 ))
+else
+    S2=$(( -1*($RANDOM % 20 + 50) ))
+    S1=$(( $RANDOM % 20 + 50 ))
+fi
+
+convert -size 140x60 xc:white \
+    -pointsize 30 -draw "text 20,30 '$1'" \
+    -roll -$R2+$R1 -swirl $S1 \
+    -roll +$R2-$R1 -swirl $S2 \
+    +repage -resize 120x60 \
+    -quality 90 -depth 8 png:-
--- ejabberd-2.0.5/ChangeLog~	2009-04-01 19:23:52.000000000 +0400
+++ ejabberd-2.0.5/ChangeLog	2009-04-03 23:45:03.174979944 +0400
@@ -15,6 +15,15 @@
 	stanza (EJAB-300).
 	* src/ejabberd_c2s.erl: Likewise
 
+2009-03-13  Evgeniy Khramtsov <ekhramtsov at process-one.net>
+
+	* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
+	* src/ejabberd_config.erl: likewise.
+	* src/ejabberd_sup.erl: likewise.
+	* src/jlib.hrl: likewise.
+	* src/web/ejabberd_http.erl: likewise.
+	* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
+
 2009-03-10  Badlop  <badlop at process-one.net>
 
 	* doc/release_notes_2.0.4.txt: Added file for new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Mar 2009 11:51:56 -0000	1.11
+++ .cvsignore	3 Apr 2009 20:22:39 -0000	1.12
@@ -1 +1 @@
-ejabberd-2.0.4.tar.gz
+ejabberd-2.0.5.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ejabberd.spec	15 Mar 2009 11:51:56 -0000	1.25
+++ ejabberd.spec	3 Apr 2009 20:22:39 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           ejabberd
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
@@ -12,7 +12,7 @@
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
+# svn export -r 873 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
 # The following were extracted from a patch found on http://realloc.spb.ru/share/ejabberdad.html
@@ -31,6 +31,10 @@
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
+# CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
+# wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
+Patch4: ejabberd-captcha.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,6 +117,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
+#%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -172,7 +177,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -214,6 +219,14 @@
 %endif
 
 %changelog
+* Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
+- Ver. 2.0.5
+- Temporarily disabled CAPTCHA support
+
+* Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-2
+- Support for CAPTCHA (XEP-0158)
+- Updated mod_ctlextra.erl (fixed EJAB-789, EJAB-864)
+
 * Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.4-1
 - Ver. 2.0.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	15 Mar 2009 11:51:56 -0000	1.6
+++ import.log	3 Apr 2009 20:22:39 -0000	1.7
@@ -4,3 +4,4 @@
 ejabberd-2_0_2-3_fc9:EL-5:ejabberd-2.0.2-3.fc9.src.rpm:1222926241
 ejabberd-2_0_3-1_fc10:EL-5:ejabberd-2.0.3-1.fc10.src.rpm:1232988681
 ejabberd-2_0_4-1_fc10:EL-5:ejabberd-2.0.4-1.fc10.src.rpm:1237117472
+ejabberd-2_0_5-1_fc10:EL-5:ejabberd-2.0.5-1.fc10.src.rpm:1238790091


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/mod_ctlextra.erl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_ctlextra.erl	29 Aug 2008 20:21:45 -0000	1.4
+++ mod_ctlextra.erl	3 Apr 2009 20:22:39 -0000	1.5
@@ -47,14 +47,12 @@
 
      %% ejabberd_auth
      {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+     {"delete-older-users-vhost host days", "delete users that not logged in last 'days' in 'host'"},
      {"set-password user server password", "set password to user at server"},
 
      %% ejd2odbc
      {"export2odbc server output", "export Mnesia tables on server to files on output directory"},
 
-     %% mod_offline
-     {"delete-older-messages days", "delete offline messages older than 'days'"},
-
      %% mod_shared_roster
      {"srg-create group host name description display", "create the group with options"},
      {"srg-delete group host", "delete the group"},
@@ -113,15 +111,16 @@
 %% Commands global
 %%-------------
 
-ctl_process(_Val, ["delete-older-messages", Days]) ->
-    mod_offline:remove_old_messages(list_to_integer(Days)),
-    ?STATUS_SUCCESS;
-
 ctl_process(_Val, ["delete-older-users", Days]) ->
     {removed, N, UR} = delete_older_users(list_to_integer(Days)),
     io:format("Deleted ~p users: ~p~n", [N, UR]),
     ?STATUS_SUCCESS;
 
+ctl_process(_Val, ["delete-older-users-vhost", Host, Days]) ->
+    {removed, N, UR} = delete_older_users_vhost(Host, list_to_integer(Days)),
+    io:format("Deleted ~p users: ~p~n", [N, UR]),
+    ?STATUS_SUCCESS;
+
 ctl_process(_Val, ["export2odbc", Server, Output]) ->
     Tables = [
 	      {export_last, last},
@@ -357,7 +356,7 @@
 ctl_process(_Val, ["stats", Stat]) ->
     Res = case Stat of
 	      "uptime-seconds" -> uptime_seconds();
-	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
 	      "onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
 	      "onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
 	  end,
@@ -752,6 +751,16 @@
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+    delete_older_users(Days, Users).
+
+delete_older_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+    delete_older_users(Days, Users).
+
+delete_older_users(Days, Users) ->
     %% Convert older time
     SecOlder = Days*24*60*60,
 
@@ -759,9 +768,6 @@
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp_now = MegaSecs * 1000000 + Secs,
 
-    %% Get the list of registered users
-    Users = ejabberd_auth:dirty_get_registered_users(),
-
     %% For a user, remove if required and answer true
     F = fun({LUser, LServer}) ->
 		%% Check if the user is logged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Mar 2009 11:51:56 -0000	1.11
+++ sources	3 Apr 2009 20:22:39 -0000	1.12
@@ -1 +1 @@
-1ff37c329e9bc1ddf3c458e051b81d63  ejabberd-2.0.4.tar.gz
+2d85b47df969daf0a78ed3b16562d731  ejabberd-2.0.5.tar.gz



From dwalsh at fedoraproject.org  Fri Apr  3 20:28:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 20:28:10 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.95, 1.96 setroubleshoot.spec,
	1.127, 1.128 sources, 1.106, 1.107
Message-ID: <20090403202810.A83A870134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12456

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.8-1
- Fix sealert segfault



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	3 Apr 2009 14:29:11 -0000	1.95
+++ .cvsignore	3 Apr 2009 20:27:40 -0000	1.96
@@ -11,3 +11,4 @@
 setroubleshoot-2.1.5.tar.gz
 setroubleshoot-2.1.6.tar.gz
 setroubleshoot-2.1.7.tar.gz
+setroubleshoot-2.1.8.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- setroubleshoot.spec	3 Apr 2009 15:30:23 -0000	1.127
+++ setroubleshoot.spec	3 Apr 2009 20:27:40 -0000	1.128
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.1.7
+Version: 2.1.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -194,6 +194,9 @@
 %doc %{pkgdocdir}
 
 %changelog
+* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.8-1
+- Fix sealert segfault
+
 * Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.7-1
 - Stop sending messages with scon or tcon == setroubleshootd_t
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	3 Apr 2009 14:29:11 -0000	1.106
+++ sources	3 Apr 2009 20:27:40 -0000	1.107
@@ -1 +1 @@
-d84d1d7b334b03c646d975b697c648d9  setroubleshoot-2.1.7.tar.gz
+9703bbdf2967967a94631785ee05cae2  setroubleshoot-2.1.8.tar.gz



From dwalsh at fedoraproject.org  Fri Apr  3 20:31:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 20:31:27 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.16,
	1.17 setroubleshoot-plugins.spec, 1.20, 1.21 sources, 1.17, 1.18
Message-ID: <20090403203127.522DF70134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13064

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Fri Apr 3 2009  <dwalsh at redhat.com> - 2.0.15-1
- Update po files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	23 Feb 2009 16:13:58 -0000	1.16
+++ .cvsignore	3 Apr 2009 20:30:56 -0000	1.17
@@ -6,3 +6,4 @@
 setroubleshoot-plugins-2.0.11.tar.gz
 setroubleshoot-plugins-2.0.12.tar.gz
 setroubleshoot-plugins-2.0.14.tar.gz
+setroubleshoot-plugins-2.0.15.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- setroubleshoot-plugins.spec	26 Feb 2009 00:38:07 -0000	1.20
+++ setroubleshoot-plugins.spec	3 Apr 2009 20:30:56 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.0.14
-Release: 2%{?dist}
+Version: 2.0.15
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,9 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Fri Apr 3 2009  <dwalsh at redhat.com> - 2.0.15-1
+- Update po files
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Feb 2009 16:13:58 -0000	1.17
+++ sources	3 Apr 2009 20:30:57 -0000	1.18
@@ -1 +1 @@
-9d5544c902da2a3c2927dc5f56bdd598  setroubleshoot-plugins-2.0.14.tar.gz
+3ef3c051867710035877e706266c8e0d  setroubleshoot-plugins-2.0.15.tar.gz



From dodji at fedoraproject.org  Fri Apr  3 20:32:02 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Fri,  3 Apr 2009 20:32:02 +0000 (UTC)
Subject: rpms/nemiver/F-10 .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20090403203202.593FD70134@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13150

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded nemiver 0.6.6 tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Mar 2009 14:29:27 -0000	1.13
+++ .cvsignore	3 Apr 2009 20:31:32 -0000	1.14
@@ -1 +1 @@
-nemiver-0.6.5.tar.bz2
+nemiver-0.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Mar 2009 14:29:27 -0000	1.13
+++ sources	3 Apr 2009 20:31:32 -0000	1.14
@@ -1 +1 @@
-8986dd9eec47604826a8556d37e51746  nemiver-0.6.5.tar.bz2
+e17c00535e6584668fe785aa7589f98f  nemiver-0.6.6.tar.bz2



From pkgdb at fedoraproject.org  Fri Apr  3 20:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:33:47 +0000
Subject: [pkgdb] R-IRanges was added for pingou
Message-ID: <20090403203326.EE0F120854A@bastion.fedora.phx.redhat.com>

kevin has added Package R-IRanges with summary Low-level containers for storing set of integer ranges
kevin has approved Package R-IRanges
kevin has added a Fedora devel branch for R-IRanges with an owner of pingou
kevin has approved R-IRanges in Fedora devel
kevin has approved Package R-IRanges
kevin has set commit to Approved for provenpackager on R-IRanges (Fedora devel)
kevin has set build to Approved for provenpackager on R-IRanges (Fedora devel)
kevin has set checkout to Approved for provenpackager on R-IRanges (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-IRanges



From pkgdb at fedoraproject.org  Fri Apr  3 20:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:33:49 +0000
Subject: [pkgdb] R-IRanges (Fedora, 9) updated by kevin
Message-ID: <20090403203329.13651208555@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for R-IRanges
kevin has set commit to Approved for provenpackager on R-IRanges (Fedora 9)
kevin has set build to Approved for provenpackager on R-IRanges (Fedora 9)
kevin has set checkout to Approved for provenpackager on R-IRanges (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-IRanges



From kevin at fedoraproject.org  Fri Apr  3 20:33:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:33:29 +0000 (UTC)
Subject: rpms/R-IRanges - New directory
Message-ID: <20090403203329.4B41070134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/R-IRanges
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13640/rpms/R-IRanges

Log Message:
Directory /cvs/pkgs/rpms/R-IRanges added to the repository




From pkgdb at fedoraproject.org  Fri Apr  3 20:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:33:49 +0000
Subject: [pkgdb] R-IRanges (Fedora, 10) updated by kevin
Message-ID: <20090403203329.20311208602@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for R-IRanges
kevin has set commit to Approved for provenpackager on R-IRanges (Fedora 10)
kevin has set build to Approved for provenpackager on R-IRanges (Fedora 10)
kevin has set checkout to Approved for provenpackager on R-IRanges (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-IRanges



From kevin at fedoraproject.org  Fri Apr  3 20:33:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:33:29 +0000 (UTC)
Subject: rpms/R-IRanges/devel - New directory
Message-ID: <20090403203329.A8BA570134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/R-IRanges/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13640/rpms/R-IRanges/devel

Log Message:
Directory /cvs/pkgs/rpms/R-IRanges/devel added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:33:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:33:40 +0000 (UTC)
Subject: rpms/R-IRanges Makefile,NONE,1.1
Message-ID: <20090403203340.F138870134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/R-IRanges
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13640/rpms/R-IRanges

Added Files:
	Makefile 
Log Message:
Setup of module R-IRanges


--- NEW FILE Makefile ---
# Top level Makefile for module R-IRanges
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr  3 20:33:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:33:41 +0000 (UTC)
Subject: rpms/R-IRanges/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403203341.514A170134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/R-IRanges/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13640/rpms/R-IRanges/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-IRanges


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-IRanges
# $Id: Makefile,v 1.1 2009/04/03 20:33:41 kevin Exp $
NAME := R-IRanges
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr  3 20:34:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:34:27 +0000
Subject: [pkgdb] nss_ldap F-11 cloned from devel
Message-ID: <20090403203408.4FA4B208553@bastion.fedora.phx.redhat.com>

kevin cloned nss_ldap F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nss_ldap



From pkgdb at fedoraproject.org  Fri Apr  3 20:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:36:23 +0000
Subject: [pkgdb] nqc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090403203633.5DA40208550@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for nqc
kevin has set commit to Approved for provenpackager on nqc (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on nqc (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on nqc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nqc



From pkgdb at fedoraproject.org  Fri Apr  3 20:38:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:38:15 +0000
Subject: [pkgdb] tulrich-tuffy-fonts was added for toshio
Message-ID: <20090403203755.8561F208514@bastion.fedora.phx.redhat.com>

kevin has added Package tulrich-tuffy-fonts with summary Generic sans font
kevin has approved Package tulrich-tuffy-fonts
kevin has added a Fedora devel branch for tulrich-tuffy-fonts with an owner of toshio
kevin has approved tulrich-tuffy-fonts in Fedora devel
kevin has approved Package tulrich-tuffy-fonts
kevin has set commit to Approved for provenpackager on tulrich-tuffy-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on tulrich-tuffy-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on tulrich-tuffy-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tulrich-tuffy-fonts



From pkgdb at fedoraproject.org  Fri Apr  3 20:38:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:38:18 +0000
Subject: [pkgdb] tulrich-tuffy-fonts (Fedora, devel) updated by kevin
Message-ID: <20090403203757.CCD10208602@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on tulrich-tuffy-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on tulrich-tuffy-fonts (Fedora devel) for fonts-sig
kevin approved watchbugzilla on tulrich-tuffy-fonts (Fedora devel) for fschwarz
kevin approved watchcommits on tulrich-tuffy-fonts (Fedora devel) for fschwarz
kevin approved commit on tulrich-tuffy-fonts (Fedora devel) for fschwarz
kevin approved build on tulrich-tuffy-fonts (Fedora devel) for fschwarz
kevin approved approveacls on tulrich-tuffy-fonts (Fedora devel) for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tulrich-tuffy-fonts



From kevin at fedoraproject.org  Fri Apr  3 20:37:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:37:56 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts - New directory
Message-ID: <20090403203756.2200570134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq14467/rpms/tulrich-tuffy-fonts

Log Message:
Directory /cvs/pkgs/rpms/tulrich-tuffy-fonts added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:37:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:37:56 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts/devel - New directory
Message-ID: <20090403203756.5315E70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq14467/rpms/tulrich-tuffy-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:38:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:38:03 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts Makefile,NONE,1.1
Message-ID: <20090403203803.6875470134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq14467/rpms/tulrich-tuffy-fonts

Added Files:
	Makefile 
Log Message:
Setup of module tulrich-tuffy-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module tulrich-tuffy-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr  3 20:38:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:38:03 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403203803.9E4457013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq14467/rpms/tulrich-tuffy-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tulrich-tuffy-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tulrich-tuffy-fonts
# $Id: Makefile,v 1.1 2009/04/03 20:38:03 kevin Exp $
NAME := tulrich-tuffy-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr  3 20:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:38:53 +0000
Subject: [pkgdb] koffice-langpack F-11 cloned from devel
Message-ID: <20090403203835.075A3208505@bastion.fedora.phx.redhat.com>

kevin cloned koffice-langpack F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice-langpack



From pkgdb at fedoraproject.org  Fri Apr  3 20:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:40:08 +0000
Subject: [pkgdb] eclipse-dltk was added for mbooth
Message-ID: <20090403203949.7F56B208553@bastion.fedora.phx.redhat.com>

kevin has added Package eclipse-dltk with summary Dynamic Languages Toolkit (DLTK) Eclipse plugin
kevin has approved Package eclipse-dltk
kevin has added a Fedora devel branch for eclipse-dltk with an owner of mbooth
kevin has approved eclipse-dltk in Fedora devel
kevin has approved Package eclipse-dltk
kevin has set commit to Approved for provenpackager on eclipse-dltk (Fedora devel)
kevin has set build to Approved for provenpackager on eclipse-dltk (Fedora devel)
kevin has set checkout to Approved for provenpackager on eclipse-dltk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-dltk



From kevin at fedoraproject.org  Fri Apr  3 20:39:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:39:55 +0000 (UTC)
Subject: rpms/eclipse-dltk - New directory
Message-ID: <20090403203955.253A070134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-dltk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14802/rpms/eclipse-dltk

Log Message:
Directory /cvs/pkgs/rpms/eclipse-dltk added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:39:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:39:55 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel - New directory
Message-ID: <20090403203955.5ADE470134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14802/rpms/eclipse-dltk/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-dltk/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr  3 20:40:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:40:10 +0000
Subject: [pkgdb] eclipse-dltk (Fedora, 10) updated by kevin
Message-ID: <20090403203950.EA496208556@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for eclipse-dltk
kevin has set commit to Approved for provenpackager on eclipse-dltk (Fedora 10)
kevin has set build to Approved for provenpackager on eclipse-dltk (Fedora 10)
kevin has set checkout to Approved for provenpackager on eclipse-dltk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-dltk



From kevin at fedoraproject.org  Fri Apr  3 20:40:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:40:03 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403204003.2BAD570134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14802/rpms/eclipse-dltk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-dltk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-dltk
# $Id: Makefile,v 1.1 2009/04/03 20:40:03 kevin Exp $
NAME := eclipse-dltk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Apr  3 20:40:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:40:02 +0000 (UTC)
Subject: rpms/eclipse-dltk Makefile,NONE,1.1
Message-ID: <20090403204002.E6FFA70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-dltk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14802/rpms/eclipse-dltk

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-dltk


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-dltk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr  3 20:41:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:41:54 +0000 (UTC)
Subject: rpms/libhbaapi - New directory
Message-ID: <20090403204154.22D2E70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbaapi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15289/rpms/libhbaapi

Log Message:
Directory /cvs/pkgs/rpms/libhbaapi added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:41:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:41:54 +0000 (UTC)
Subject: rpms/libhbaapi/devel - New directory
Message-ID: <20090403204154.5721370134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbaapi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15289/rpms/libhbaapi/devel

Log Message:
Directory /cvs/pkgs/rpms/libhbaapi/devel added to the repository




From dodji at fedoraproject.org  Fri Apr  3 20:41:58 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Fri,  3 Apr 2009 20:41:58 +0000 (UTC)
Subject: rpms/nemiver/F-9 .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <20090403204158.A1BC970134@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15121

Modified Files:
	.cvsignore sources 
Log Message:
Updated nemiver 0.6.6 tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Mar 2009 15:04:22 -0000	1.9
+++ .cvsignore	3 Apr 2009 20:41:28 -0000	1.10
@@ -1 +1 @@
-nemiver-0.6.5.tar.bz2
+nemiver-0.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Mar 2009 15:04:23 -0000	1.9
+++ sources	3 Apr 2009 20:41:28 -0000	1.10
@@ -1 +1 @@
-8986dd9eec47604826a8556d37e51746  nemiver-0.6.5.tar.bz2
+e17c00535e6584668fe785aa7589f98f  nemiver-0.6.6.tar.bz2



From kevin at fedoraproject.org  Fri Apr  3 20:42:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:42:01 +0000 (UTC)
Subject: rpms/libhbaapi Makefile,NONE,1.1
Message-ID: <20090403204201.7AD7070134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbaapi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15289/rpms/libhbaapi

Added Files:
	Makefile 
Log Message:
Setup of module libhbaapi


--- NEW FILE Makefile ---
# Top level Makefile for module libhbaapi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Apr  3 20:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:41:53 +0000
Subject: [pkgdb] libhbaapi was added for jzeleny
Message-ID: <20090403204153.DACF920854A@bastion.fedora.phx.redhat.com>

kevin has added Package libhbaapi with summary SNIA HBAAPI library
kevin has approved Package libhbaapi
kevin has added a Fedora devel branch for libhbaapi with an owner of jzeleny
kevin has approved libhbaapi in Fedora devel
kevin has approved Package libhbaapi
kevin has set commit to Approved for provenpackager on libhbaapi (Fedora devel)
kevin has set build to Approved for provenpackager on libhbaapi (Fedora devel)
kevin has set checkout to Approved for provenpackager on libhbaapi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhbaapi



From kevin at fedoraproject.org  Fri Apr  3 20:42:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:42:01 +0000 (UTC)
Subject: rpms/libhbaapi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403204201.BB29C70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbaapi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15289/rpms/libhbaapi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libhbaapi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libhbaapi
# $Id: Makefile,v 1.1 2009/04/03 20:42:01 kevin Exp $
NAME := libhbaapi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr  3 20:43:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:43:32 +0000
Subject: [pkgdb] krb5 F-11 cloned from devel
Message-ID: <20090403204312.E1B7620854A@bastion.fedora.phx.redhat.com>

kevin cloned krb5 F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/krb5



From pkgdb at fedoraproject.org  Fri Apr  3 20:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:44:22 +0000
Subject: [pkgdb] arm4 was added for grandcross
Message-ID: <20090403204432.C4A51208514@bastion.fedora.phx.redhat.com>

kevin has added Package arm4 with summary Application Response Measurement V4.0
kevin has approved Package arm4
kevin has added a Fedora devel branch for arm4 with an owner of grandcross
kevin has approved arm4 in Fedora devel
kevin has approved Package arm4
kevin has set commit to Approved for provenpackager on arm4 (Fedora devel)
kevin has set build to Approved for provenpackager on arm4 (Fedora devel)
kevin has set checkout to Approved for provenpackager on arm4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arm4



From pkgdb at fedoraproject.org  Fri Apr  3 20:44:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:44:25 +0000
Subject: [pkgdb] arm4 (Fedora, 10) updated by kevin
Message-ID: <20090403204435.CC5A1208553@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for arm4
kevin has set commit to Approved for provenpackager on arm4 (Fedora 10)
kevin has set build to Approved for provenpackager on arm4 (Fedora 10)
kevin has set checkout to Approved for provenpackager on arm4 (Fedora 10)
kevin approved watchbugzilla on arm4 (Fedora 10) for limb
kevin approved watchcommits on arm4 (Fedora 10) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arm4



From pkgdb at fedoraproject.org  Fri Apr  3 20:44:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:44:25 +0000
Subject: [pkgdb] arm4 (Fedora, devel) updated by kevin
Message-ID: <20090403204435.DB442208557@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on arm4 (Fedora devel) for limb
kevin approved watchcommits on arm4 (Fedora devel) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arm4



From pkgdb at fedoraproject.org  Fri Apr  3 20:44:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:44:25 +0000
Subject: [pkgdb] arm4 (Fedora, 11) updated by kevin
Message-ID: <20090403204435.EC327208604@bastion.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for arm4
kevin has set commit to Approved for provenpackager on arm4 (Fedora 11)
kevin has set build to Approved for provenpackager on arm4 (Fedora 11)
kevin has set checkout to Approved for provenpackager on arm4 (Fedora 11)
kevin approved watchbugzilla on arm4 (Fedora 11) for limb
kevin approved watchcommits on arm4 (Fedora 11) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/arm4



From kevin at fedoraproject.org  Fri Apr  3 20:44:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:44:34 +0000 (UTC)
Subject: rpms/arm4 - New directory
Message-ID: <20090403204434.2386870134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/arm4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15751/rpms/arm4

Log Message:
Directory /cvs/pkgs/rpms/arm4 added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:44:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:44:34 +0000 (UTC)
Subject: rpms/arm4/devel - New directory
Message-ID: <20090403204434.5A62D70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15751/rpms/arm4/devel

Log Message:
Directory /cvs/pkgs/rpms/arm4/devel added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:44:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:44:42 +0000 (UTC)
Subject: rpms/arm4 Makefile,NONE,1.1
Message-ID: <20090403204442.0ACCC70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/arm4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15751/rpms/arm4

Added Files:
	Makefile 
Log Message:
Setup of module arm4


--- NEW FILE Makefile ---
# Top level Makefile for module arm4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr  3 20:44:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:44:42 +0000 (UTC)
Subject: rpms/arm4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090403204442.7310A70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15751/rpms/arm4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module arm4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: arm4
# $Id: Makefile,v 1.1 2009/04/03 20:44:42 kevin Exp $
NAME := arm4
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr  3 20:45:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:45:48 +0000
Subject: [pkgdb] medusa was added for jfch2222
Message-ID: <20090403204527.AA06720854A@bastion.fedora.phx.redhat.com>

kevin has added Package medusa with summary parallel brute forcing pasword cracker
kevin has approved Package medusa
kevin has added a Fedora devel branch for medusa with an owner of jfch2222
kevin has approved medusa in Fedora devel
kevin has approved Package medusa
kevin has set commit to Approved for provenpackager on medusa (Fedora devel)
kevin has set build to Approved for provenpackager on medusa (Fedora devel)
kevin has set checkout to Approved for provenpackager on medusa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/medusa



From pkgdb at fedoraproject.org  Fri Apr  3 20:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:45:49 +0000
Subject: [pkgdb] medusa (Fedora, 10) updated by kevin
Message-ID: <20090403204529.9747E208556@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for medusa
kevin has set commit to Approved for provenpackager on medusa (Fedora 10)
kevin has set build to Approved for provenpackager on medusa (Fedora 10)
kevin has set checkout to Approved for provenpackager on medusa (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/medusa



From pkgdb at fedoraproject.org  Fri Apr  3 20:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:45:49 +0000
Subject: [pkgdb] medusa (Fedora, 11) updated by kevin
Message-ID: <20090403204529.AED6F208604@bastion.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for medusa
kevin has set commit to Approved for provenpackager on medusa (Fedora 11)
kevin has set build to Approved for provenpackager on medusa (Fedora 11)
kevin has set checkout to Approved for provenpackager on medusa (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/medusa



From kevin at fedoraproject.org  Fri Apr  3 20:45:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:45:33 +0000 (UTC)
Subject: rpms/medusa - New directory
Message-ID: <20090403204533.283DB70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/medusa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16027/rpms/medusa

Log Message:
Directory /cvs/pkgs/rpms/medusa added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:45:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:45:33 +0000 (UTC)
Subject: rpms/medusa/devel - New directory
Message-ID: <20090403204533.6011970134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/medusa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16027/rpms/medusa/devel

Log Message:
Directory /cvs/pkgs/rpms/medusa/devel added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:45:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:45:41 +0000 (UTC)
Subject: rpms/medusa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090403204541.41FC270134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/medusa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16027/rpms/medusa/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module medusa


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: medusa
# $Id: Makefile,v 1.1 2009/04/03 20:45:41 kevin Exp $
NAME := medusa
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Apr  3 20:45:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:45:40 +0000 (UTC)
Subject: rpms/medusa Makefile,NONE,1.1
Message-ID: <20090403204540.DC1BB70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/medusa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16027/rpms/medusa

Added Files:
	Makefile 
Log Message:
Setup of module medusa


--- NEW FILE Makefile ---
# Top level Makefile for module medusa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Apr  3 20:46:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:46:46 +0000
Subject: [pkgdb] libgdata was added for hadess
Message-ID: <20090403204628.26D1E20854A@bastion.fedora.phx.redhat.com>

kevin has added Package libgdata with summary Library for the GData protocol
kevin has approved Package libgdata
kevin has added a Fedora devel branch for libgdata with an owner of hadess
kevin has approved libgdata in Fedora devel
kevin has approved Package libgdata
kevin has set commit to Approved for provenpackager on libgdata (Fedora devel)
kevin has set build to Approved for provenpackager on libgdata (Fedora devel)
kevin has set checkout to Approved for provenpackager on libgdata (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgdata



From pkgdb at fedoraproject.org  Fri Apr  3 20:46:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:46:49 +0000
Subject: [pkgdb] libgdata (Fedora, 11) updated by kevin
Message-ID: <20090403204630.209A4208550@bastion.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libgdata
kevin has set commit to Approved for provenpackager on libgdata (Fedora 11)
kevin has set build to Approved for provenpackager on libgdata (Fedora 11)
kevin has set checkout to Approved for provenpackager on libgdata (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgdata



From kevin at fedoraproject.org  Fri Apr  3 20:46:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:46:30 +0000 (UTC)
Subject: rpms/libgdata - New directory
Message-ID: <20090403204630.23F4470134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgdata
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16345/rpms/libgdata

Log Message:
Directory /cvs/pkgs/rpms/libgdata added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:46:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:46:30 +0000 (UTC)
Subject: rpms/libgdata/devel - New directory
Message-ID: <20090403204630.5F36670134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16345/rpms/libgdata/devel

Log Message:
Directory /cvs/pkgs/rpms/libgdata/devel added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:46:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:46:37 +0000 (UTC)
Subject: rpms/libgdata Makefile,NONE,1.1
Message-ID: <20090403204637.B8DB670134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgdata
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16345/rpms/libgdata

Added Files:
	Makefile 
Log Message:
Setup of module libgdata


--- NEW FILE Makefile ---
# Top level Makefile for module libgdata
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr  3 20:46:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:46:38 +0000 (UTC)
Subject: rpms/libgdata/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403204638.1E99070134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16345/rpms/libgdata/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgdata


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libgdata
# $Id: Makefile,v 1.1 2009/04/03 20:46:37 kevin Exp $
NAME := libgdata
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr  3 20:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:47:20 +0000
Subject: [pkgdb] perl-Log-Trace was added for cweyl
Message-ID: <20090403204720.5956F208556@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Log-Trace with summary A unified approach to tracing
kevin has approved Package perl-Log-Trace
kevin has added a Fedora devel branch for perl-Log-Trace with an owner of cweyl
kevin has approved perl-Log-Trace in Fedora devel
kevin has approved Package perl-Log-Trace
kevin has set commit to Approved for provenpackager on perl-Log-Trace (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Log-Trace (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Log-Trace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Trace



From pkgdb at fedoraproject.org  Fri Apr  3 20:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:47:12 +0000
Subject: [pkgdb] perl-Log-Trace (Fedora, 9) updated by kevin
Message-ID: <20090403204722.710D5208602@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Log-Trace
kevin has set commit to Approved for provenpackager on perl-Log-Trace (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Log-Trace (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Log-Trace (Fedora 9)
kevin approved watchbugzilla on perl-Log-Trace (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Log-Trace (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Trace



From pkgdb at fedoraproject.org  Fri Apr  3 20:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:47:12 +0000
Subject: [pkgdb] perl-Log-Trace (Fedora, 10) updated by kevin
Message-ID: <20090403204723.B6642208605@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Log-Trace
kevin has set commit to Approved for provenpackager on perl-Log-Trace (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Log-Trace (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Log-Trace (Fedora 10)
kevin approved watchbugzilla on perl-Log-Trace (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Log-Trace (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Trace



From pkgdb at fedoraproject.org  Fri Apr  3 20:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:47:12 +0000
Subject: [pkgdb] perl-Log-Trace (Fedora, devel) updated by kevin
Message-ID: <20090403204724.6872F208514@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Log-Trace (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Log-Trace (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Trace



From kevin at fedoraproject.org  Fri Apr  3 20:47:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:47:24 +0000 (UTC)
Subject: rpms/perl-Log-Trace - New directory
Message-ID: <20090403204724.2678270134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-Trace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16634/rpms/perl-Log-Trace

Log Message:
Directory /cvs/pkgs/rpms/perl-Log-Trace added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:47:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:47:24 +0000 (UTC)
Subject: rpms/perl-Log-Trace/devel - New directory
Message-ID: <20090403204724.5A60570134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-Trace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16634/rpms/perl-Log-Trace/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Log-Trace/devel added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:47:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:47:31 +0000 (UTC)
Subject: rpms/perl-Log-Trace Makefile,NONE,1.1
Message-ID: <20090403204731.C085070134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-Trace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16634/rpms/perl-Log-Trace

Added Files:
	Makefile 
Log Message:
Setup of module perl-Log-Trace


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Trace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr  3 20:47:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:47:32 +0000 (UTC)
Subject: rpms/perl-Log-Trace/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403204732.23B5770134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-Trace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16634/rpms/perl-Log-Trace/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Trace


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Log-Trace
# $Id: Makefile,v 1.1 2009/04/03 20:47:31 kevin Exp $
NAME := perl-Log-Trace
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr  3 20:48:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:48:01 +0000
Subject: [pkgdb] perl-PlRPC was added for cweyl
Message-ID: <20090403204811.6193C208550@bastion.fedora.phx.redhat.com>

kevin has added Package perl-PlRPC with summary Interface for building pServer Clients
kevin has approved Package perl-PlRPC
kevin has added a Fedora devel branch for perl-PlRPC with an owner of cweyl
kevin has approved perl-PlRPC in Fedora devel
kevin has approved Package perl-PlRPC
kevin has set commit to Approved for provenpackager on perl-PlRPC (Fedora devel)
kevin has set build to Approved for provenpackager on perl-PlRPC (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-PlRPC (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PlRPC



From pkgdb at fedoraproject.org  Fri Apr  3 20:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:48:12 +0000
Subject: [pkgdb] perl-PlRPC (Fedora, 9) updated by kevin
Message-ID: <20090403204813.28D3C208556@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-PlRPC
kevin has set commit to Approved for provenpackager on perl-PlRPC (Fedora 9)
kevin has set build to Approved for provenpackager on perl-PlRPC (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-PlRPC (Fedora 9)
kevin approved watchbugzilla on perl-PlRPC (Fedora 9) for perl-sig
kevin approved watchcommits on perl-PlRPC (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PlRPC



From pkgdb at fedoraproject.org  Fri Apr  3 20:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:48:12 +0000
Subject: [pkgdb] perl-PlRPC (Fedora, devel) updated by kevin
Message-ID: <20090403204813.4096A208603@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-PlRPC (Fedora devel) for perl-sig
kevin approved watchcommits on perl-PlRPC (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PlRPC



From kevin at fedoraproject.org  Fri Apr  3 20:48:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:48:11 +0000 (UTC)
Subject: rpms/perl-PlRPC - New directory
Message-ID: <20090403204811.2B45170134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PlRPC
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16859/rpms/perl-PlRPC

Log Message:
Directory /cvs/pkgs/rpms/perl-PlRPC added to the repository




From kevin at fedoraproject.org  Fri Apr  3 20:48:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:48:11 +0000 (UTC)
Subject: rpms/perl-PlRPC/devel - New directory
Message-ID: <20090403204811.6128470134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PlRPC/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16859/rpms/perl-PlRPC/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-PlRPC/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr  3 20:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:48:12 +0000
Subject: [pkgdb] perl-PlRPC (Fedora, 10) updated by kevin
Message-ID: <20090403204813.6820E208609@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-PlRPC
kevin has set commit to Approved for provenpackager on perl-PlRPC (Fedora 10)
kevin has set build to Approved for provenpackager on perl-PlRPC (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-PlRPC (Fedora 10)
kevin approved watchbugzilla on perl-PlRPC (Fedora 10) for perl-sig
kevin approved watchcommits on perl-PlRPC (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PlRPC



From kevin at fedoraproject.org  Fri Apr  3 20:48:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:48:19 +0000 (UTC)
Subject: rpms/perl-PlRPC/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090403204819.1FA3E70134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PlRPC/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16859/rpms/perl-PlRPC/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PlRPC


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-PlRPC
# $Id: Makefile,v 1.1 2009/04/03 20:48:18 kevin Exp $
NAME := perl-PlRPC
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Apr  3 20:48:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  3 Apr 2009 20:48:18 +0000 (UTC)
Subject: rpms/perl-PlRPC Makefile,NONE,1.1
Message-ID: <20090403204818.C59C970134@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PlRPC
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16859/rpms/perl-PlRPC

Added Files:
	Makefile 
Log Message:
Setup of module perl-PlRPC


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PlRPC
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Apr  3 20:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 20:48:59 +0000
Subject: [pkgdb] koffice F-11 cloned from devel
Message-ID: <20090403204909.B6BB2208555@bastion.fedora.phx.redhat.com>

kevin cloned koffice F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From jwilson at fedoraproject.org  Fri Apr  3 20:56:02 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  3 Apr 2009 20:56:02 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-lying-systems-without-lvds.patch, 1.2,
	1.3
Message-ID: <20090403205602.5534B70134@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17817

Modified Files:
	drm-intel-lying-systems-without-lvds.patch 
Log Message:
put in the right version of the patch this time

drm-intel-lying-systems-without-lvds.patch:

Index: drm-intel-lying-systems-without-lvds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-intel-lying-systems-without-lvds.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 19:48:24 -0000	1.2
+++ drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 20:56:02 -0000	1.3
@@ -16,24 +16,23 @@
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
- drivers/gpu/drm/i915/intel_lvds.c |   50 ++++++++++++++++++++++++++++++------
- 1 files changed, 41 insertions(+), 9 deletions(-)
+ drivers/gpu/drm/i915/intel_lvds.c |   46 ++++++++++++++++++++++++++++++------
+ 1 files changed, 38 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 6619f26..4607662 100644
+index 6619f26..4d64686 100644
 --- a/drivers/gpu/drm/i915/intel_lvds.c
 +++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -384,7 +384,44 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
+@@ -384,7 +384,43 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
  	.destroy = intel_lvds_enc_destroy,
  };
  
 +static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
 +{
-+	//DRM_DEBUG("Skipping LVDS initialization for %s\n", id->ident);
-+	printk("Skipping LVDS initialization for %s\n", id->ident);
++	DRM_DEBUG("Skipping LVDS initialization for %s\n", id->ident);
 +	return 1;
 +}
-+
+ 
 +/* These systems claim to have LVDS, but really don't */
 +static const struct dmi_system_id __initdata intel_no_lvds[] = {
 +	{
@@ -62,13 +61,13 @@
 +	},
 +
 +	/* FIXME: add a check for the Aopen Mini PC */
- 
++
 +	{ }	/* terminating entry */
 +};
  
  /**
   * intel_lvds_init - setup LVDS connectors on this device
-@@ -404,15 +441,10 @@ void intel_lvds_init(struct drm_device *dev)
+@@ -404,15 +440,9 @@ void intel_lvds_init(struct drm_device *dev)
  	u32 lvds;
  	int pipe;
  
@@ -79,12 +78,10 @@
 -	if(dmi_match(DMI_PRODUCT_NAME, "Macmini1,1") ||
 -	   dmi_match(DMI_PRODUCT_NAME, "Macmini2,1")) {
 -		DRM_DEBUG("Skipping LVDS initialization for Apple Mac Mini\n");
--		return;
--	}
 +	/* Skip init on machines we know falsely report LVDS */
 +	if (dmi_check_system(intel_no_lvds))
-+		printk("woulda disabled bogus lvds, but it fucks up Xv...\n");
-+		//return;
+ 		return;
+-	}
  
  	intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
  	if (!intel_output) {



From pkgdb at fedoraproject.org  Fri Apr  3 21:10:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:10:01 +0000
Subject: [pkgdb] libiphone: hadess has requested watchbugzilla
Message-ID: <20090403210941.41BB0208505@bastion.fedora.phx.redhat.com>

hadess has requested the watchbugzilla acl on libiphone (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:10:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:10:04 +0000
Subject: [pkgdb] libiphone: hadess has requested watchcommits
Message-ID: <20090403210944.B51B8208553@bastion.fedora.phx.redhat.com>

hadess has requested the watchcommits acl on libiphone (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:10:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:10:06 +0000
Subject: [pkgdb] libiphone: hadess has requested commit
Message-ID: <20090403210947.193D6208557@bastion.fedora.phx.redhat.com>

hadess has requested the commit acl on libiphone (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:12:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:12:28 +0000
Subject: [pkgdb] libiphone had acl change status
Message-ID: <20090403211228.B0369208505@bastion.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on libiphone (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:12:57 +0000
Subject: [pkgdb] libiphone had acl change status
Message-ID: <20090403211308.03C7D20854A@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on libiphone (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:13:30 +0000
Subject: [pkgdb] libiphone had acl change status
Message-ID: <20090403211310.3076B208555@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on libiphone (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:13:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:13:15 +0000
Subject: [pkgdb] libiphone had acl change status
Message-ID: <20090403211315.3A03C208602@bastion.fedora.phx.redhat.com>

pbrobinson has set the commit acl on libiphone (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libiphone



From pkgdb at fedoraproject.org  Fri Apr  3 21:15:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:15:13 +0000
Subject: [pkgdb] ifuse: hadess has requested watchbugzilla
Message-ID: <20090403211513.BD1FF20854A@bastion.fedora.phx.redhat.com>

hadess has requested the watchbugzilla acl on ifuse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From pkgdb at fedoraproject.org  Fri Apr  3 21:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:15:36 +0000
Subject: [pkgdb] ifuse: hadess has requested watchcommits
Message-ID: <20090403211516.2A0B3208604@bastion.fedora.phx.redhat.com>

hadess has requested the watchcommits acl on ifuse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From pkgdb at fedoraproject.org  Fri Apr  3 21:15:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:15:37 +0000
Subject: [pkgdb] ifuse: hadess has requested commit
Message-ID: <20090403211518.5738A208609@bastion.fedora.phx.redhat.com>

hadess has requested the commit acl on ifuse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From pkgdb at fedoraproject.org  Fri Apr  3 21:16:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:16:36 +0000
Subject: [pkgdb] ifuse had acl change status
Message-ID: <20090403211636.CC4EE208505@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on ifuse (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From pkgdb at fedoraproject.org  Fri Apr  3 21:16:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:16:58 +0000
Subject: [pkgdb] ifuse had acl change status
Message-ID: <20090403211639.5C793208555@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on ifuse (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From pkgdb at fedoraproject.org  Fri Apr  3 21:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:16:43 +0000
Subject: [pkgdb] ifuse had acl change status
Message-ID: <20090403211643.72CB7208603@bastion.fedora.phx.redhat.com>

pbrobinson has set the commit acl on ifuse (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From pkgdb at fedoraproject.org  Fri Apr  3 21:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 03 Apr 2009 21:17:07 +0000
Subject: [pkgdb] ifuse had acl change status
Message-ID: <20090403211647.6601D208608@bastion.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on ifuse (Fedora devel) to Approved for hadess

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifuse



From kwizart at fedoraproject.org  Fri Apr  3 21:20:42 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri,  3 Apr 2009 21:20:42 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel sources, 1.8, 1.9 .cvsignore, 1.8,
	1.9 perl-AnyEvent.spec, 1.10, 1.11
Message-ID: <20090403212042.E402D70134@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20881

Modified Files:
	sources .cvsignore perl-AnyEvent.spec 
Log Message:
Update to 4.35



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Mar 2009 17:20:18 -0000	1.8
+++ sources	3 Apr 2009 21:20:12 -0000	1.9
@@ -1 +1 @@
-1413b299f4124feebb7be7508b84fc91  AnyEvent-4.34.tar.gz
+f1d7066a576aab2be15e78ea238036d0  AnyEvent-4.35.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Mar 2009 17:20:19 -0000	1.8
+++ .cvsignore	3 Apr 2009 21:20:12 -0000	1.9
@@ -1 +1 @@
-AnyEvent-4.34.tar.gz
+AnyEvent-4.35.tar.gz


Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-AnyEvent.spec	5 Mar 2009 17:20:18 -0000	1.10
+++ perl-AnyEvent.spec	3 Apr 2009 21:20:12 -0000	1.11
@@ -1,7 +1,7 @@
-%define         version_anyevent 4.34
+%define         version_anyevent 4.35
 
 Name:           perl-AnyEvent
-Version:        4.340
+Version:        4.350
 Release:        1%{?dist}
 Summary:        Framework for multiple event loops
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Apr  3 2009 kwizart < kwizart at gmail.com > - 4.350-1
+- Update to 4.35   (rpm version : 4.350 )
+
 * Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 4.340-1
 - Update to 4.34   (rpm version : 4.340 )
 



From dwalsh at fedoraproject.org  Fri Apr  3 21:26:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 21:26:00 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.76,
	1.77 selinux-policy.spec, 1.817, 1.818
Message-ID: <20090403212600.3124270134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21762

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-9
- Allow podsleuth to use tmpfs files


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- policy-20090105.patch	3 Apr 2009 19:25:20 -0000	1.76
+++ policy-20090105.patch	3 Apr 2009 21:25:59 -0000	1.77
@@ -1680,7 +1680,7 @@
 +#/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.10/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/gnome.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/apps/gnome.if	2009-04-03 17:09:33.000000000 -0400
 @@ -89,5 +89,154 @@
  
  	allow $1 gnome_home_t:dir manage_dir_perms;
@@ -2843,8 +2843,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.10/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/nsplugin.te	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,288 @@
++++ serefpolicy-3.6.10/policy/modules/apps/nsplugin.te	2009-04-03 17:12:08.000000000 -0400
+@@ -0,0 +1,292 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3129,6 +3129,10 @@
 +')
 +
 +optional_policy(`
++	pulseaudio_stream_connect(nsplugin_t)
++')
++
++optional_policy(`
 +	unconfined_execmem_exec(nsplugin_t)
 +')
 +
@@ -3300,14 +3304,18 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.10/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/podsleuth.te	2009-03-30 10:09:41.000000000 -0400
-@@ -11,21 +11,59 @@
++++ serefpolicy-3.6.10/policy/modules/apps/podsleuth.te	2009-04-03 16:33:08.000000000 -0400
+@@ -11,21 +11,68 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
  
 +type podsleuth_tmp_t;
 +files_tmp_file(podsleuth_tmp_t)
 +
++type podsleuth_tmpfs_t;
++files_tmpfs_file(podsleuth_tmpfs_t)
++ubac_constrained(podsleuth_tmpfs_t)
++
 +type podsleuth_cache_t;
 +files_type(podsleuth_cache_t)
 +
@@ -3352,6 +3360,11 @@
 +files_tmp_filetrans(podsleuth_t, podsleuth_tmp_t, { file dir })
 +manage_dirs_pattern(podsleuth_t, podsleuth_tmp_t, podsleuth_tmp_t)
 +
++manage_dirs_pattern(podsleuth_t, podsleuth_tmpfs_t, podsleuth_tmpfs_t)
++manage_files_pattern(podsleuth_t, podsleuth_tmpfs_t, podsleuth_tmpfs_t)
++manage_lnk_files_pattern(podsleuth_t, podsleuth_tmpfs_t, podsleuth_tmpfs_t)
++fs_tmpfs_filetrans(podsleuth_t, podsleuth_tmpfs_t, { dir file lnk_file })
++
 +manage_dirs_pattern(podsleuth_t, podsleuth_cache_t, podsleuth_cache_t)
 +manage_files_pattern(podsleuth_t, podsleuth_cache_t, podsleuth_cache_t)
 +files_var_filetrans(podsleuth_t, podsleuth_cache_t, { file dir })
@@ -3371,8 +3384,8 @@
 +/usr/bin/pulseaudio	--	gen_context(system_u:object_r:pulseaudio_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.10/policy/modules/apps/pulseaudio.if
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.if	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,105 @@
++++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.if	2009-04-03 17:24:36.000000000 -0400
+@@ -0,0 +1,147 @@
 +
 +## <summary>policy for pulseaudio</summary>
 +
@@ -3476,12 +3489,54 @@
 +	userdom_manage_home_role($1, pulseaudio_t)
 +	userdom_manage_tmp_role($1, pulseaudio_t)
 +	userdom_manage_tmpfs_role($1, pulseaudio_t)
++
++	allow $2 pulseaudio_t:dbus send_msg;
++	allow pulseaudio_t $2:dbus send_msg;
 +')
 +
++########################################
++## <summary>
++##	Send and receive messages from
++##	pulseaudio over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`pulseaudio_dbus_chat',`
++	gen_require(`
++		type pulseaudio_t;
++		class dbus send_msg;
++	')
++
++	allow $1 pulseaudio_t:dbus send_msg;
++	allow pulseaudio_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
++##	pulsaudio connection template.
++## </summary>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
++#
++interface(`pulseaudio_stream_connect',`
++	gen_require(`
++		type pulseaudio_t;
++	')
++
++	allow nsplugin_t pulseaudio_t:process signull;
++	allow $1 pulseaudio_t:unix_stream_socket connectto;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.10/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.te	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,97 @@
++++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.te	2009-04-03 17:03:52.000000000 -0400
+@@ -0,0 +1,109 @@
 +policy_module(pulseaudio,1.0.0)
 +
 +########################################
@@ -3513,9 +3568,21 @@
 +allow pulseaudio_t self:fifo_file rw_file_perms;
 +allow pulseaudio_t self:unix_stream_socket create_stream_socket_perms;
 +allow pulseaudio_t self:unix_dgram_socket { sendto create_socket_perms };
++allow pulseaudio_t self:tcp_socket create_stream_socket_perms;
++allow pulseaudio_t self:udp_socket create_socket_perms;
 +
 +corecmd_exec_bin(pulseaudio_t)
 +
++corenet_all_recvfrom_unlabeled(pulseaudio_t)
++corenet_all_recvfrom_netlabel(pulseaudio_t)
++corenet_tcp_bind_pulseaudio_port(pulseaudio_t)
++corenet_tcp_bind_sound_port(pulseaudio_t)
++corenet_tcp_sendrecv_generic_if(pulseaudio_t)
++corenet_tcp_sendrecv_generic_node(pulseaudio_t)
++corenet_udp_bind_sap_port(pulseaudio_t)
++corenet_udp_sendrecv_generic_if(pulseaudio_t)
++corenet_udp_sendrecv_generic_node(pulseaudio_t)
++
 +dev_read_sound(pulseaudio_t)
 +dev_write_sound(pulseaudio_t)
 +dev_read_sysfs(pulseaudio_t)
@@ -4511,7 +4578,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.10/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-03-23 13:47:10.000000000 -0400
-+++ serefpolicy-3.6.10/policy/modules/kernel/corenetwork.te.in	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/kernel/corenetwork.te.in	2009-04-03 17:02:58.000000000 -0400
 @@ -65,10 +65,12 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -4599,8 +4666,11 @@
  network_port(printer, tcp,515,s0)
  network_port(ptal, tcp,5703,s0)
  network_port(pxe, udp,4011,s0)
-@@ -162,9 +183,11 @@
+@@ -160,11 +181,14 @@
+ network_port(rsh, tcp,514,s0)
+ network_port(rsync, tcp,873,s0, udp,873,s0)
  network_port(rwho, udp,513,s0)
++network_port(sap, tcp,9875,s0, udp,9875,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
 -network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
@@ -4612,7 +4682,7 @@
  network_port(soundd, tcp,8000,s0, tcp,9433,s0, tcp, 16001, s0)
  type socks_port_t, port_type; dnl network_port(socks) # no defined portcon
  type stunnel_port_t, port_type; dnl network_port(stunnel) # no defined portcon in current strict
-@@ -173,14 +196,17 @@
+@@ -173,14 +197,17 @@
  network_port(syslogd, udp,514,s0)
  network_port(telnetd, tcp,23,s0)
  network_port(tftp, udp,69,s0)
@@ -4632,7 +4702,7 @@
  network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
  network_port(xfs, tcp,7100,s0)
-@@ -209,6 +235,8 @@
+@@ -209,6 +236,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -8946,7 +9016,7 @@
 +/var/log/ConsoleKit(/.*)?	gen_context(system_u:object_r:consolekit_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.6.10/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.10/policy/modules/services/consolekit.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/consolekit.if	2009-04-03 16:41:51.000000000 -0400
 @@ -38,3 +38,24 @@
  	allow $1 consolekit_t:dbus send_msg;
  	allow consolekit_t $1:dbus send_msg;
@@ -10806,8 +10876,8 @@
 +/var/run/devkit(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.10/policy/modules/services/devicekit.if
 --- nsaserefpolicy/policy/modules/services/devicekit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/devicekit.if	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,177 @@
++++ serefpolicy-3.6.10/policy/modules/services/devicekit.if	2009-04-03 16:46:10.000000000 -0400
+@@ -0,0 +1,197 @@
 +
 +## <summary>policy for devicekit</summary>
 +
@@ -10985,6 +11055,26 @@
 +	allow $1 devicekit_t:unix_dgram_socket sendto;
 +')
 +
++########################################
++## <summary>
++##	Send and receive messages from
++##	devicekit disk over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_disk_dbus_chat',`
++	gen_require(`
++		type devicekit_disk_t;
++		class dbus send_msg;
++	')
++
++	allow $1 devicekit_disk_t:dbus send_msg;
++	allow devicekit_disk_t $1:dbus send_msg;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.10/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.10/policy/modules/services/devicekit.te	2009-04-03 08:12:27.000000000 -0400
@@ -21580,7 +21670,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.10/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/virt.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/virt.te	2009-04-03 16:51:32.000000000 -0400
 @@ -8,20 +8,18 @@
  
  ## <desc>
@@ -21667,7 +21757,7 @@
  
 -manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
 +virtual_manage_image(virtd_t)
-+virtual_manage_relabel(virtd_t)
++virtual_image_relabel(virtd_t)
 +
 +manage_dirs_pattern(virtd_t, virt_content_t, virt_content_t)
 +manage_files_pattern(virtd_t, virt_content_t, virt_content_t)
@@ -21769,15 +21859,15 @@
 +optional_policy(`
 +	lvm_domtrans(virtd_t)
 +')
- 
- optional_policy(`
--	qemu_domtrans(virtd_t)
++
++optional_policy(`
 +	polkit_domtrans_auth(virtd_t)
 +	polkit_domtrans_resolve(virtd_t)
 +	polkit_read_lib(virtd_t)
 +')
-+
-+optional_policy(`
+ 
+ optional_policy(`
+-	qemu_domtrans(virtd_t)
 +	qemu_spec_domtrans(virtd_t, svirt_t)
  	qemu_read_state(virtd_t)
  	qemu_signal(virtd_t)
@@ -21786,7 +21876,7 @@
  ')
  
  optional_policy(`
-@@ -198,5 +264,74 @@
+@@ -198,5 +264,73 @@
  ')
  
  optional_policy(`
@@ -21807,7 +21897,6 @@
 +#
 +# svirt local policy
 +#
-+
 +manage_dirs_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
 +manage_files_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
 +files_var_filetrans(svirt_t, svirt_cache_t, { file dir })
@@ -27671,7 +27760,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.10/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-03 10:26:58.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-03 16:55:31.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28100,7 +28189,7 @@
  
  	##############################
  	#
-@@ -512,189 +517,198 @@
+@@ -512,189 +517,199 @@
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
  
@@ -28270,6 +28359,7 @@
  		optional_policy(`
 -			hal_dbus_chat($1_t)
 +			devicekit_power_dbus_chat($1_usertype)
++			devicekit_disk_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
@@ -28380,7 +28470,7 @@
  ')
  
  #######################################
-@@ -722,13 +736,26 @@
+@@ -722,13 +737,26 @@
  
  	userdom_base_user_template($1)
  
@@ -28412,7 +28502,7 @@
  
  	userdom_change_password_template($1)
  
-@@ -746,70 +773,71 @@
+@@ -746,70 +774,71 @@
  
  	allow $1_t self:context contains;
  
@@ -28517,7 +28607,7 @@
  	')
  ')
  
-@@ -846,6 +874,28 @@
+@@ -846,6 +875,28 @@
  	# Local policy
  	#
  
@@ -28546,7 +28636,7 @@
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -876,7 +926,7 @@
+@@ -876,7 +927,7 @@
  
  	userdom_restricted_user_template($1)
  
@@ -28555,7 +28645,7 @@
  
  	##############################
  	#
-@@ -884,14 +934,19 @@
+@@ -884,14 +935,19 @@
  	#
  
  	auth_role($1_r, $1_t)
@@ -28580,7 +28670,7 @@
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -899,28 +954,33 @@
+@@ -899,28 +955,33 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -28621,7 +28711,7 @@
  	')
  ')
  
-@@ -954,8 +1014,8 @@
+@@ -954,8 +1015,8 @@
  	# Declarations
  	#
  
@@ -28631,7 +28721,7 @@
  	userdom_common_user_template($1)
  
  	##############################
-@@ -964,11 +1024,12 @@
+@@ -964,11 +1025,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -28646,7 +28736,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1047,47 @@
+@@ -986,37 +1048,47 @@
  		')
  	')
  
@@ -28708,7 +28798,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1121,7 @@
+@@ -1050,7 +1122,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -28717,7 +28807,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1130,7 @@
+@@ -1059,8 +1131,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -28727,7 +28817,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1153,8 @@
+@@ -1083,7 +1154,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -28737,7 +28827,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1099,6 +1170,7 @@
+@@ -1099,6 +1171,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -28745,7 +28835,7 @@
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1106,8 +1178,6 @@
+@@ -1106,8 +1179,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -28754,7 +28844,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1232,6 @@
+@@ -1162,20 +1233,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -28775,7 +28865,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1277,7 @@
+@@ -1221,6 +1278,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -28783,7 +28873,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1343,15 @@
+@@ -1286,11 +1344,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -28799,7 +28889,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1448,7 @@
+@@ -1387,7 +1449,7 @@
  
  ########################################
  ## <summary>
@@ -28808,7 +28898,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1481,14 @@
+@@ -1420,6 +1482,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -28823,7 +28913,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1504,11 @@
+@@ -1435,9 +1505,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -28835,7 +28925,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1565,25 @@
+@@ -1494,6 +1566,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -28861,7 +28951,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1568,6 +1658,8 @@
+@@ -1568,6 +1659,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -28870,7 +28960,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1735,7 @@
+@@ -1643,6 +1736,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -28878,26 +28968,34 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,6 +1834,62 @@
+@@ -1741,30 +1835,79 @@
  
  ########################################
  ## <summary>
+-##	Execute user home files.
 +##	Delete user home subdirectory symbolic links.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+ ##	Domain allowed access.
+ ##	</summary>
+ ## </param>
+-## <rolecap/>
+ #
+-interface(`userdom_exec_user_home_content_files',`
 +interface(`userdom_delete_user_home_content_symlinks',`
-+	gen_require(`
+ 	gen_require(`
+-		type user_home_dir_t, user_home_t;
 +		type user_home_t;
-+	')
-+
+ 	')
+ 
+-	files_search_home($1)
+-	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
 +	allow $1 user_home_t:lnk_file delete_lnk_file_perms;
 +')
-+
+ 
+-	tunable_policy(`use_nfs_home_dirs',`
+-		fs_exec_nfs_files($1)
 +########################################
 +## <summary>
 +##	Delete files
@@ -28912,8 +29010,10 @@
 +interface(`userdom_delete_user_home_content_files',`
 +	gen_require(`
 +		type user_home_t;
-+	')
-+
+ 	')
+ 
+-	tunable_policy(`use_samba_home_dirs',`
+-		fs_exec_cifs_files($1)
 +	allow $1 user_home_t:dir delete_file_perms;
 +')
 +
@@ -28938,25 +29038,27 @@
 +
 +########################################
 +## <summary>
- ##	Execute user home files.
- ## </summary>
- ## <param name="domain">
-@@ -1757,14 +1906,6 @@
- 
- 	files_search_home($1)
- 	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
--
--	tunable_policy(`use_nfs_home_dirs',`
--		fs_exec_nfs_files($1)
--	')
--
--	tunable_policy(`use_samba_home_dirs',`
--		fs_exec_cifs_files($1)
--	')
++##	Execute user home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`userdom_exec_user_home_content_files',`
++	gen_require(`
++		type user_home_dir_t;
++		attribute user_home_type;
+ 	')
++
++	files_search_home($1)
++	exec_files_pattern($1, { user_home_dir_t user_home_type }, user_home_type)
  ')
  
  ########################################
-@@ -1787,6 +1928,46 @@
+@@ -1787,6 +1930,46 @@
  
  ########################################
  ## <summary>
@@ -29003,7 +29105,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -1799,6 +1980,7 @@
+@@ -1799,6 +1982,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -29011,7 +29113,7 @@
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2328,7 +2510,7 @@
+@@ -2328,7 +2512,7 @@
  
  ########################################
  ## <summary>
@@ -29020,7 +29122,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2814,7 +2996,25 @@
+@@ -2814,7 +2998,25 @@
  		type user_tmp_t;
  	')
  
@@ -29047,7 +29149,7 @@
  ')
  
  ########################################
-@@ -2851,6 +3051,7 @@
+@@ -2851,6 +3053,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -29055,7 +29157,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3182,482 @@
+@@ -2981,3 +3184,482 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -29631,8 +29733,8 @@
 +# No application file contexts.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.10/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/virtual.if	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,113 @@
++++ serefpolicy-3.6.10/policy/modules/system/virtual.if	2009-04-03 16:50:58.000000000 -0400
+@@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
 +########################################
@@ -29720,12 +29822,13 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`virtual_manage_relabel',`
++interface(`virtual_image_relabel',`
 +	gen_require(`
 +		attribute virtual_image_type;
 +	')
 +
 +	allow $1 virtual_image_type:file { relabelfrom relabelto };
++	allow $1 virtual_image_type:blk_file { relabelfrom relabelto };
 +')
 +
 +########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- selinux-policy.spec	3 Apr 2009 19:25:21 -0000	1.817
+++ selinux-policy.spec	3 Apr 2009 21:25:59 -0000	1.818
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-9
+- Allow podsleuth to use tmpfs files
+
 * Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-8
 - Add customizable_types for svirt
 



From dwalsh at fedoraproject.org  Fri Apr  3 21:27:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  3 Apr 2009 21:27:40 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.77,1.78
Message-ID: <20090403212740.1C95D70134@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22637

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-9
- Allow podsleuth to use tmpfs files


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- policy-20090105.patch	3 Apr 2009 21:25:59 -0000	1.77
+++ policy-20090105.patch	3 Apr 2009 21:27:39 -0000	1.78
@@ -3535,7 +3535,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.10/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.te	2009-04-03 17:03:52.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.te	2009-04-03 17:26:42.000000000 -0400
 @@ -0,0 +1,109 @@
 +policy_module(pulseaudio,1.0.0)
 +
@@ -3576,7 +3576,7 @@
 +corenet_all_recvfrom_unlabeled(pulseaudio_t)
 +corenet_all_recvfrom_netlabel(pulseaudio_t)
 +corenet_tcp_bind_pulseaudio_port(pulseaudio_t)
-+corenet_tcp_bind_sound_port(pulseaudio_t)
++corenet_tcp_bind_soundd_port(pulseaudio_t)
 +corenet_tcp_sendrecv_generic_if(pulseaudio_t)
 +corenet_tcp_sendrecv_generic_node(pulseaudio_t)
 +corenet_udp_bind_sap_port(pulseaudio_t)



From jgu at fedoraproject.org  Fri Apr  3 21:35:26 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Fri,  3 Apr 2009 21:35:26 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.51, 1.52 shorewall.spec, 1.76,
	1.77 sources, 1.51, 1.52
Message-ID: <20090403213526.864EB70134@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23677

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Fri Apr  3 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-4
- Update shorewall-perl to version 4.2.7.1 (BZ 493984)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	24 Mar 2009 13:14:20 -0000	1.51
+++ .cvsignore	3 Apr 2009 21:34:56 -0000	1.52
@@ -1,6 +1,6 @@
 shorewall-common-4.2.7.tar.bz2
 shorewall-lite-4.2.7.tar.bz2
-shorewall-perl-4.2.7.tar.bz2
+shorewall-perl-4.2.7.1.tar.bz2
 shorewall-shell-4.2.7.tar.bz2
 shorewall6-4.2.7.tar.bz2
 shorewall6-lite-4.2.7.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- shorewall.spec	24 Mar 2009 15:55:14 -0000	1.76
+++ shorewall.spec	3 Apr 2009 21:34:56 -0000	1.77
@@ -3,7 +3,7 @@
 
 %define major_ver 4.2.7
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}
+%define perl_ver %{major_ver}.1
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
 %define shorewall6_ver %{major_ver}
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:        %{major_ver}
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -148,9 +148,7 @@
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 
 # Make the perl compiler the default
-pushd shorewall-common-%{common_ver}
-sed -e 's|SHOREWALL_COMPILER=|SHOREWALL_COMPILER=perl|'
-popd
+sed -i -e 's|SHOREWALL_COMPILER=|SHOREWALL_COMPILER=perl|' shorewall-common-%{common_ver}/shorewall.conf
 
 %build
 
@@ -409,6 +407,12 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Fri Apr  3 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-4
+- Update shorewall-perl to version 4.2.7.1 (BZ 493984)
+
+* Thu Mar 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-3
+- Really make the perl compiler default
+
 * Tue Mar 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-2
 - Make the perl compiler the default. Drop shorewall-shell requirement from
   shorewall package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	24 Mar 2009 13:14:21 -0000	1.51
+++ sources	3 Apr 2009 21:34:56 -0000	1.52
@@ -1,6 +1,6 @@
 47f51b083bdea3904ffaf3a3c9317526  shorewall-common-4.2.7.tar.bz2
 7a18ae9de56aa1836e67b394a5176fc4  shorewall-lite-4.2.7.tar.bz2
-375c9ebdcc8a986d6e67a09bb0f87917  shorewall-perl-4.2.7.tar.bz2
+6bcf27f5eccd7d24f411e5aa9977ae7e  shorewall-perl-4.2.7.1.tar.bz2
 c5555ef10e493af3d3ad40785bf33caa  shorewall-shell-4.2.7.tar.bz2
 807c26daac5fd44f263c16205fdeadc1  shorewall6-4.2.7.tar.bz2
 e5546dceab21046ea0f652febe180779  shorewall6-lite-4.2.7.tar.bz2



From jgu at fedoraproject.org  Fri Apr  3 21:39:42 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Fri,  3 Apr 2009 21:39:42 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.74,1.75 sources,1.51,1.52
Message-ID: <20090403213942.19B2E70134@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24233

Modified Files:
	shorewall.spec sources 
Log Message:
* Fri Apr  6 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-2
- Update shorewall-perl to 4.2.7.1 (BZ 493984)



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- shorewall.spec	24 Mar 2009 13:15:53 -0000	1.74
+++ shorewall.spec	3 Apr 2009 21:39:11 -0000	1.75
@@ -3,7 +3,7 @@
 
 %define major_ver 4.2.7
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}
+%define perl_ver %{major_ver}.1
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
 %define shorewall6_ver %{major_ver}
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:        %{major_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -405,6 +405,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Fri Apr  6 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-2
+- Update shorewall-perl to 4.2.7.1 (BZ 493984)
+
 * Tue Mar 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-1
 - Update to version 4.2.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	24 Mar 2009 13:15:53 -0000	1.51
+++ sources	3 Apr 2009 21:39:11 -0000	1.52
@@ -1,6 +1,6 @@
 47f51b083bdea3904ffaf3a3c9317526  shorewall-common-4.2.7.tar.bz2
 7a18ae9de56aa1836e67b394a5176fc4  shorewall-lite-4.2.7.tar.bz2
-375c9ebdcc8a986d6e67a09bb0f87917  shorewall-perl-4.2.7.tar.bz2
+6bcf27f5eccd7d24f411e5aa9977ae7e  shorewall-perl-4.2.7.1.tar.bz2
 c5555ef10e493af3d3ad40785bf33caa  shorewall-shell-4.2.7.tar.bz2
 807c26daac5fd44f263c16205fdeadc1  shorewall6-4.2.7.tar.bz2
 e5546dceab21046ea0f652febe180779  shorewall6-lite-4.2.7.tar.bz2



From davej at fedoraproject.org  Fri Apr  3 21:48:22 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri,  3 Apr 2009 21:48:22 +0000 (UTC)
Subject: rpms/x86info/F-10 .cvsignore, 1.13, 1.14 sources, 1.11,
	1.12 x86info.spec, 1.34, 1.35
Message-ID: <20090403214822.DDCCE70134@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25027

Modified Files:
	.cvsignore sources x86info.spec 
Log Message:
Update to 1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Nov 2007 00:51:06 -0000	1.13
+++ .cvsignore	3 Apr 2009 21:47:52 -0000	1.14
@@ -1,3 +1,3 @@
 clog
-x86info-1.21
-x86info-1.21.tgz
+x86info-1.24
+x86info-1.24.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Nov 2007 00:51:06 -0000	1.11
+++ sources	3 Apr 2009 21:47:52 -0000	1.12
@@ -1 +1 @@
-1fbfaa392170e2636006603659dec0f0  x86info-1.21.tgz
+f4476fb55918cf3b20312f858af44334  x86info-1.24.tgz


Index: x86info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-10/x86info.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- x86info.spec	17 Mar 2008 20:23:02 -0000	1.34
+++ x86info.spec	3 Apr 2009 21:47:52 -0000	1.35
@@ -1,6 +1,6 @@
 Summary:        x86 processor information tool.
 Name:           x86info
-Version:        1.21
+Version:        1.24
 Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
@@ -41,6 +41,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Apr  3 2009 Dave Jones <davej at redhat.com>
+- Update to 1.24
+
 * Mon Mar 17 2008 Dave Jones <davej at redhat.com>
 - More specfile cleanups.
 



From davej at fedoraproject.org  Fri Apr  3 22:04:10 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri,  3 Apr 2009 22:04:10 +0000 (UTC)
Subject: rpms/x86info/F-9 sources,1.11,1.12 x86info.spec,1.34,1.35
Message-ID: <20090403220410.E490170134@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416

Modified Files:
	sources x86info.spec 
Log Message:
Update to 1.24


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Nov 2007 00:51:06 -0000	1.11
+++ sources	3 Apr 2009 22:03:40 -0000	1.12
@@ -1 +1 @@
-1fbfaa392170e2636006603659dec0f0  x86info-1.21.tgz
+f4476fb55918cf3b20312f858af44334  x86info-1.24.tgz


Index: x86info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-9/x86info.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- x86info.spec	17 Mar 2008 20:23:02 -0000	1.34
+++ x86info.spec	3 Apr 2009 22:03:40 -0000	1.35
@@ -1,6 +1,6 @@
 Summary:        x86 processor information tool.
 Name:           x86info
-Version:        1.21
+Version:        1.24
 Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
@@ -41,6 +41,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Apr  3 2009 Dave Jones <davej at redhat.com>
+- Update to 1.24
+
 * Mon Mar 17 2008 Dave Jones <davej at redhat.com>
 - More specfile cleanups.
 



From davej at fedoraproject.org  Fri Apr  3 22:04:54 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri,  3 Apr 2009 22:04:54 +0000 (UTC)
Subject: rpms/x86info/F-9 .cvsignore,1.13,1.14
Message-ID: <20090403220454.1E35870134@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27511

Modified Files:
	.cvsignore 
Log Message:
Update to 1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Nov 2007 00:51:06 -0000	1.13
+++ .cvsignore	3 Apr 2009 22:04:23 -0000	1.14
@@ -1,3 +1,3 @@
 clog
-x86info-1.21
-x86info-1.21.tgz
+x86info-1.24
+x86info-1.24.tgz



From hadess at fedoraproject.org  Fri Apr  3 22:10:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  3 Apr 2009 22:10:46 +0000 (UTC)
Subject: rpms/libiphone/devel .cvsignore, 1.3, 1.4 libiphone.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20090403221046.CB95970134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libiphone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28148

Modified Files:
	.cvsignore libiphone.spec sources 
Log Message:
* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-11.20090325git443edc8
- Update to latest master version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2009 06:46:01 -0000	1.3
+++ .cvsignore	3 Apr 2009 22:10:16 -0000	1.4
@@ -1 +1 @@
-libiphone-0.1.0-20090103.tar.bz2
+libiphone-0.1.0-20090325.tar.bz2


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libiphone.spec	25 Feb 2009 15:54:11 -0000	1.10
+++ libiphone.spec	3 Apr 2009 22:10:16 -0000	1.11
@@ -1,15 +1,15 @@
 # Tarfile created using git
-# git clone http://git.matt.colyer.name/2008/libiphone/
-# git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-20081201.tar.bz2
+# git clone git://github.com/MattColyer/libiphone.git
+# git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090103
-%define git_version 5cde554
+%define gitdate 20090325
+%define git_version 443edc8
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           libiphone
 Version:        0.1.0
-Release:        10.%{snapshot}%{?dist}
+Release:        11.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -70,6 +70,7 @@
 %{_bindir}/libiphone-initconf
 %{_libdir}/libiphone.so.0
 %{_libdir}/libiphone.so.0.0.0
+%{_sysconfdir}/udev/rules.d/89-libiphone.rules
 %{_datadir}/hal/fdi/information/20thirdparty/31-apple-mobile-device.fdi
 
 %files devel
@@ -79,6 +80,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-11.20090325git443edc8
+- Update to latest master version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-10.20090103git5cde554
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2009 06:53:59 -0000	1.4
+++ sources	3 Apr 2009 22:10:16 -0000	1.5
@@ -1 +1 @@
-1c6950b2ddf6cf2ed103b616cde0b13a  libiphone-0.1.0-20090103.tar.bz2
+97c045662553d73e93a193dfc97bf700  libiphone-0.1.0-20090325.tar.bz2



From hadess at fedoraproject.org  Fri Apr  3 22:12:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  3 Apr 2009 22:12:22 +0000 (UTC)
Subject: rpms/ifuse/devel .cvsignore, 1.2, 1.3 ifuse.spec, 1.2, 1.3 sources, 
	1.2, 1.3 import.log, 1.1, NONE
Message-ID: <20090403221222.9DEAB70134@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28424

Modified Files:
	.cvsignore ifuse.spec sources 
Removed Files:
	import.log 
Log Message:
* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-8.20090401git5db1ccc
- Update to github version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 01:00:14 -0000	1.2
+++ .cvsignore	3 Apr 2009 22:11:52 -0000	1.3
@@ -1 +1 @@
-ifuse-0.1.0-20081214.tar.bz2
+ifuse-0.1.0-20090401.tar.bz2


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ifuse.spec	25 Feb 2009 06:55:18 -0000	1.2
+++ ifuse.spec	3 Apr 2009 22:11:52 -0000	1.3
@@ -1,15 +1,15 @@
 # Tarfile created using git
-# git clone http://git.matt.colyer.name/2008/ifuse/
+# git clone git://github.com/MattColyer/ifuse.git
 # git-archive --format=tar --prefix=ifuse-0.1.0/ %{git_version} | bzip2 > ifuse-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20081214
-%define git_version b0412bf
+%define gitdate 20090401
+%define git_version 5db1ccc
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:          ifuse
 Version:       0.1.0
-Release:       6.%{snapshot}%{?dist}
+Release:       8.%{snapshot}%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -50,10 +50,15 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 /sbin/mount.fuse.ifuse
-%{_bindir}/hal-iphone-setup
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-8.20090401git5db1ccc
+- Update to github version
+
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-7.20090308git8d6eebb
+- Update to latest master
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-6.20081214gitb0412bf
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 01:00:14 -0000	1.2
+++ sources	3 Apr 2009 22:11:52 -0000	1.3
@@ -1 +1 @@
-c9fba4c717ee4e3cc334d9e053110786  ifuse-0.1.0-20081214.tar.bz2
+dcc7efe1b983ca28089494bccdff5e8e  ifuse-0.1.0-20090401.tar.bz2


--- import.log DELETED ---



From bpepple at fedoraproject.org  Fri Apr  3 22:56:59 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  3 Apr 2009 22:56:59 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.42, 1.43 sources, 1.42,
	1.43 telepathy-gabble.spec, 1.52, 1.53
Message-ID: <20090403225659.1BC5670134@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv415

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.25-1
- Update to 0.7.25.
- Bump minimum version of tp-glib-devel needed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	29 Mar 2009 20:56:22 -0000	1.42
+++ .cvsignore	3 Apr 2009 22:56:27 -0000	1.43
@@ -1 +1 @@
-telepathy-gabble-0.7.24.tar.gz
+telepathy-gabble-0.7.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	29 Mar 2009 20:56:22 -0000	1.42
+++ sources	3 Apr 2009 22:56:28 -0000	1.43
@@ -1 +1 @@
-9abc1236332113c19670e04f3cac033c  telepathy-gabble-0.7.24.tar.gz
+5fae7fbfb8e40be28e8dae5cba5cb947  telepathy-gabble-0.7.25.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- telepathy-gabble.spec	29 Mar 2009 20:56:22 -0000	1.52
+++ telepathy-gabble.spec	3 Apr 2009 22:56:28 -0000	1.53
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.24
+Version:        0.7.25
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -8,13 +8,15 @@
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-gthread.patch
+# Patch to add missing pkgconfig check for gthread-2.0
+# https://bugs.freedesktop.org/show_bug.cgi?id=20937 
+Patch0:		%{name}-0.7.24-gthread.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.78
 BuildRequires:  loudmouth-devel >= 1.3.2
-BuildRequires:  telepathy-glib-devel >= 0.7.26
+BuildRequires:  telepathy-glib-devel >= 0.7.29
 BuildRequires:  glib2-devel >= 2.16
 BuildRequires:	libsoup-devel
 BuildRequires:  libxslt
@@ -63,6 +65,10 @@
 
 
 %changelog
+* Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.25-1
+- Update to 0.7.25.
+- Bump minimum version of tp-glib-devel needed.
+
 * Mon Mar 23 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.24-1
 - Update to 0.7.24.
 - Add BR on libsoup-devel.



From grandcross at fedoraproject.org  Fri Apr  3 23:18:33 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri,  3 Apr 2009 23:18:33 +0000 (UTC)
Subject: rpms/arm4/devel arm4-README.fedora, NONE, 1.1 arm4-arm4.cron, NONE, 
	1.1 arm4-arm4.init, NONE, 1.1 arm4.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090403231833.D74AA70134@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	arm4-README.fedora arm4-arm4.cron arm4-arm4.init arm4.spec 
	import.log 
Log Message:
* Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
- Updated to latest release, which removed arm4sdk and all references
- Removed static library versions
- arm4-tests removed until new tests can be added that don't depend on the SDK




--- NEW FILE arm4-README.fedora ---
Using the arm4 package
======================

The arm4 daemon is set to run out of the box, but there are some configuration
options you should be aware of.

The default configuration file is located at /etc/arm4.conf. 'man arm4.conf'
will give more information on the options available to you.

System Configuration Changes
============================

Unless changed from the default configuration, some of the transaction
parameters won't be passed to the daemon. Add the following to
/etc/sysctl.conf:

  kernel.msgmax = 65536
  kernel.msgmnb = 65536

Failure to do so may result in messages in your system log such as
'Transaction uri msgsnd Invalid argument'

Enabling user access to ARM4
============================

The arm4_daemon has access controlled by the use of groups. A user must be a
member of the arm4 group to have access. To add a user to the group, you
can use the administrative GUIs, or you can run the following as root:

 $ usermod -a -G arm4 <username>

Archiving Data
==============

As installed, data is archived once a day. Data older than 31 days is removed.

This can be customized by modifying the cron script at /etc/cron.daily/arm4.cron.

Datastores
==========

This RPM only supports the Berkeley DB datastore. The default configuration for
Sqlite3 doesn't have all the required options, so it hasn't been built into this
installation.

What do I do if no data is collected?
=====================================

The first thing to do is check the system log. Rather than interrupt the flow of
an application, error messages are sent there.

Where can I get more information?
=================================

http://www.arm4.org/


--- NEW FILE arm4-arm4.cron ---
#!/bin/sh

# Because of the way find works, this will actually add a day to the archive
MAX_AGE='+30'

# Archive the current data
/usr/bin/arm4_control archive

# Remove older archives
find /var/lib/arm4/data/backup -ctime $MAX_AGE -exec rm -rf {} \; > /dev/null 2>&1



--- NEW FILE arm4-arm4.init ---
#!/bin/sh
#
# Startup script for the ARM4 daemon
#
# Copyright (c) 2005-2008 David Carter <dcarter at arm4.org> and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# chkconfig: - 85 15
# description: ARM 4 application response measurement agent
# processname: arm4_daemon
# pidfile: /var/run/arm4.pid

# Source function library.
. /etc/rc.d/init.d/functions

arm4=/usr/bin/arm4_daemon
RETVAL=0

case "$1" in
  start)
        echo -n "Starting arm4: "
        daemon  $arm4
	RETVAL=$?
        echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/arm4
        ;;
  stop)
        echo -n "Shutting down arm4: "
        killproc $arm4
	RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f /var/lock/subsys/arm4
        [ $RETVAL = 0 ] && rm -f /var/run/arm4.pid
        ;;
  status)
        status $arm4
	RETVAL=$?
        ;;
  reload)
      	# Same as restart
        $0 stop
        $0 start
        ;;
  restart)
        $0 stop
        $0 start
        ;;
  *)
        echo "Usage: $0 {start|stop|reload|restart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE arm4.spec ---
Name:		arm4
Version:	0.8.1
Release:	0.6%{?dist}
Summary:	Application Response Measurement V4.0

Group:		Development/System
License:	EPL
URL:		http://www.arm4.org/
Source0:	http://downloads.sourceforge.net/arm4/arm4-0.8.1.tar.gz
Source2:	arm4-README.fedora
Source3:	arm4-arm4.cron
Source4:	arm4-arm4.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
Requires:	uuid openssl db4 db4-cxx sqlite
Requires(pre): shadow-utils	

%description
An Open Source implementation of the Open Group's
Application Response Measurement (ARM) standard
version 4.0. The ARM agent allows you to measure
response times for related transactions across
multiple tiers in a distributed environment.

%package devel
Summary: Files needed to build applications using ARM
Requires: %{name} = %{version}-%{release}

Group: Development/Libraries

%description devel
Files needed to build programs using the Application Response Measurement
(ARM) V4.0 standard.

%package java
Summary: Java language bindings for applications using ARM
Requires: %{name} = %{version}-%{release}

Group: Development/Libraries

%description java
Files needed to build java language programs using the Application Response
Measurement (ARM) V4.0 standard.

#
# Location of agent databases
%define contentdir /var/lib/arm4

%prep
%setup -q -n arm4-%{version}
cp -a %{SOURCE2} README.fedora

%build
%configure --disable-static --enable-sqlite --disable-examples --disable-tests
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# These aren't really required in the final system
rm -rf %{buildroot}%{_datadir}/aclocal

#
# Move the java documentation
mv %{buildroot}%{_datadir}/doc/%{name}-%{version} \
	%{buildroot}%{_datadir}/doc/%{name}-java-%{version}

#
# Remove development versions of libraries that aren't intended for development
rm %{buildroot}%{_libdir}/libarm4db.so
rm %{buildroot}%{_libdir}/libarm4db_bdb.so
rm %{buildroot}%{_libdir}/libarm4db_sqlite.so
rm %{buildroot}%{_libdir}/libarm4db_common.so
rm %{buildroot}%{_libdir}/libArmNative.so

#
# Remove any libtool archives
rm %{buildroot}%{_libdir}/*.la

# Make our configuration dir if it doesn't exist
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
install -m 644 -p %{_builddir}/%{name}-%{version}/config/arm4.conf %{buildroot}%{_sysconfdir}
install -m 755 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/rc.d/init.d/arm4
mkdir -p %{buildroot}%{contentdir}

# Install a cron job to archive and age data
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
install -m 755 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/arm4.cron

%pre
# Add the arm4 user and group
getent group arm4 >/dev/null || groupadd -r arm4
getent passwd arm4 >/dev/null || \
	useradd -r -g arm4 -d %{contentdir} -s /sbin/nologin \
	-c "ARM 4 Daemon" arm4
exit 0

%post
/sbin/ldconfig

# Register the arm4 service
/sbin/chkconfig --add arm4

%post devel -p /sbin/ldconfig

%post java -p /sbin/ldconfig

%preun
if [ $1 = 0 ]; then
	/sbin/service arm4 stop > /dev/null 2>&1
	/usr/bin/arm4_control remove > /dev/null 2>&1
	/sbin/chkconfig --del arm4
fi

%postun -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig

%postun java -p /sbin/ldconfig

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README README.fedora COPYING
%{_bindir}/arm4_control
%{_bindir}/arm4_daemon
%{_bindir}/arm4_dump
%{_bindir}/arm4_export
%{_bindir}/arm4_report
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_libdir}/libarm4db.*
%{_libdir}/libarm4db_bdb.*
%{_libdir}/libarm4db_sqlite.*
%{_libdir}/libarm4db_common.*
# The .so file is included here and not in the -devel package
# as many applications link against these libraries dynamically,
# and it is required by the standard
%{_libdir}/libarm4.so*
%{_libdir}/libarm4_null.so*
%config(noreplace) %{_sysconfdir}/arm4.conf
%{_sysconfdir}/rc.d/init.d/arm4
%{_sysconfdir}/cron.daily/arm4.cron
%attr(755,arm4,arm4) %dir %{contentdir}
#%attr(755,arm4,arm4) %dir %{contentdir}/data
#%attr(1777,arm4,arm4) %dir %{contentdir}/queue
%{_datadir}/%{name}-%{version}/arm4db.xsd

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_mandir}/man3/*

%files java
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-java-%{version}/apidocs
%{_libdir}/arm4*
%{_libdir}/libArmNative.*

%changelog
* Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
- Updated to latest release, which removed arm4sdk and all references
- Removed static library versions
- arm4-tests removed until new tests can be added that don't depend on the SDK

* Sat Nov 1 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.5
- Removed assertions that caused early exit from libraries

* Mon Oct 27 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.4
- Update to latest release version
- Includes more documentation and many bug fixes. SE Linux support is
  removed as it's not yet complete.

* Thu Oct 2 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.3.final
- Update to latest beta version
- Includes more documentation and many bug fixes, selinux rules

* Mon Sep 4 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.2.beta3
- Update to latest beta version
- Includes more documentation and many bug fixes

* Sun Aug 3 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.1.beta2
- Initial packaging as RPM


--- NEW FILE import.log ---
arm4-0_8_1-0_6_fc10:HEAD:arm4-0.8.1-0.6.fc10.src.rpm:1238800427


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:44:42 -0000	1.1
+++ .cvsignore	3 Apr 2009 23:18:03 -0000	1.2
@@ -0,0 +1 @@
+arm4-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:44:42 -0000	1.1
+++ sources	3 Apr 2009 23:18:03 -0000	1.2
@@ -0,0 +1 @@
+65b90f3e906b13bd2fb30a4873a3f9ed  arm4-0.8.1.tar.gz



From grandcross at fedoraproject.org  Fri Apr  3 23:20:51 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri,  3 Apr 2009 23:20:51 +0000 (UTC)
Subject: rpms/arm4/F-10 arm4-README.fedora, NONE, 1.1 arm4-arm4.cron, NONE, 
	1.1 arm4-arm4.init, NONE, 1.1 arm4.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090403232051.B755070134@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2660/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	arm4-README.fedora arm4-arm4.cron arm4-arm4.init arm4.spec 
	import.log 
Log Message:
* Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
- Updated to latest release, which removed arm4sdk and all references
- Removed static library versions
- arm4-tests removed until new tests can be added that don't depend on the SDK




--- NEW FILE arm4-README.fedora ---
Using the arm4 package
======================

The arm4 daemon is set to run out of the box, but there are some configuration
options you should be aware of.

The default configuration file is located at /etc/arm4.conf. 'man arm4.conf'
will give more information on the options available to you.

System Configuration Changes
============================

Unless changed from the default configuration, some of the transaction
parameters won't be passed to the daemon. Add the following to
/etc/sysctl.conf:

  kernel.msgmax = 65536
  kernel.msgmnb = 65536

Failure to do so may result in messages in your system log such as
'Transaction uri msgsnd Invalid argument'

Enabling user access to ARM4
============================

The arm4_daemon has access controlled by the use of groups. A user must be a
member of the arm4 group to have access. To add a user to the group, you
can use the administrative GUIs, or you can run the following as root:

 $ usermod -a -G arm4 <username>

Archiving Data
==============

As installed, data is archived once a day. Data older than 31 days is removed.

This can be customized by modifying the cron script at /etc/cron.daily/arm4.cron.

Datastores
==========

This RPM only supports the Berkeley DB datastore. The default configuration for
Sqlite3 doesn't have all the required options, so it hasn't been built into this
installation.

What do I do if no data is collected?
=====================================

The first thing to do is check the system log. Rather than interrupt the flow of
an application, error messages are sent there.

Where can I get more information?
=================================

http://www.arm4.org/


--- NEW FILE arm4-arm4.cron ---
#!/bin/sh

# Because of the way find works, this will actually add a day to the archive
MAX_AGE='+30'

# Archive the current data
/usr/bin/arm4_control archive

# Remove older archives
find /var/lib/arm4/data/backup -ctime $MAX_AGE -exec rm -rf {} \; > /dev/null 2>&1



--- NEW FILE arm4-arm4.init ---
#!/bin/sh
#
# Startup script for the ARM4 daemon
#
# Copyright (c) 2005-2008 David Carter <dcarter at arm4.org> and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# chkconfig: - 85 15
# description: ARM 4 application response measurement agent
# processname: arm4_daemon
# pidfile: /var/run/arm4.pid

# Source function library.
. /etc/rc.d/init.d/functions

arm4=/usr/bin/arm4_daemon
RETVAL=0

case "$1" in
  start)
        echo -n "Starting arm4: "
        daemon  $arm4
	RETVAL=$?
        echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/arm4
        ;;
  stop)
        echo -n "Shutting down arm4: "
        killproc $arm4
	RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f /var/lock/subsys/arm4
        [ $RETVAL = 0 ] && rm -f /var/run/arm4.pid
        ;;
  status)
        status $arm4
	RETVAL=$?
        ;;
  reload)
      	# Same as restart
        $0 stop
        $0 start
        ;;
  restart)
        $0 stop
        $0 start
        ;;
  *)
        echo "Usage: $0 {start|stop|reload|restart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE arm4.spec ---
Name:		arm4
Version:	0.8.1
Release:	0.6%{?dist}
Summary:	Application Response Measurement V4.0

Group:		Development/System
License:	EPL
URL:		http://www.arm4.org/
Source0:	http://downloads.sourceforge.net/arm4/arm4-0.8.1.tar.gz
Source2:	arm4-README.fedora
Source3:	arm4-arm4.cron
Source4:	arm4-arm4.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
Requires:	uuid openssl db4 db4-cxx sqlite
Requires(pre): shadow-utils	

%description
An Open Source implementation of the Open Group's
Application Response Measurement (ARM) standard
version 4.0. The ARM agent allows you to measure
response times for related transactions across
multiple tiers in a distributed environment.

%package devel
Summary: Files needed to build applications using ARM
Requires: %{name} = %{version}-%{release}

Group: Development/Libraries

%description devel
Files needed to build programs using the Application Response Measurement
(ARM) V4.0 standard.

%package java
Summary: Java language bindings for applications using ARM
Requires: %{name} = %{version}-%{release}

Group: Development/Libraries

%description java
Files needed to build java language programs using the Application Response
Measurement (ARM) V4.0 standard.

#
# Location of agent databases
%define contentdir /var/lib/arm4

%prep
%setup -q -n arm4-%{version}
cp -a %{SOURCE2} README.fedora

%build
%configure --disable-static --enable-sqlite --disable-examples --disable-tests
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# These aren't really required in the final system
rm -rf %{buildroot}%{_datadir}/aclocal

#
# Move the java documentation
mv %{buildroot}%{_datadir}/doc/%{name}-%{version} \
	%{buildroot}%{_datadir}/doc/%{name}-java-%{version}

#
# Remove development versions of libraries that aren't intended for development
rm %{buildroot}%{_libdir}/libarm4db.so
rm %{buildroot}%{_libdir}/libarm4db_bdb.so
rm %{buildroot}%{_libdir}/libarm4db_sqlite.so
rm %{buildroot}%{_libdir}/libarm4db_common.so
rm %{buildroot}%{_libdir}/libArmNative.so

#
# Remove any libtool archives
rm %{buildroot}%{_libdir}/*.la

# Make our configuration dir if it doesn't exist
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
install -m 644 -p %{_builddir}/%{name}-%{version}/config/arm4.conf %{buildroot}%{_sysconfdir}
install -m 755 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/rc.d/init.d/arm4
mkdir -p %{buildroot}%{contentdir}

# Install a cron job to archive and age data
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
install -m 755 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/arm4.cron

%pre
# Add the arm4 user and group
getent group arm4 >/dev/null || groupadd -r arm4
getent passwd arm4 >/dev/null || \
	useradd -r -g arm4 -d %{contentdir} -s /sbin/nologin \
	-c "ARM 4 Daemon" arm4
exit 0

%post
/sbin/ldconfig

# Register the arm4 service
/sbin/chkconfig --add arm4

%post devel -p /sbin/ldconfig

%post java -p /sbin/ldconfig

%preun
if [ $1 = 0 ]; then
	/sbin/service arm4 stop > /dev/null 2>&1
	/usr/bin/arm4_control remove > /dev/null 2>&1
	/sbin/chkconfig --del arm4
fi

%postun -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig

%postun java -p /sbin/ldconfig

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README README.fedora COPYING
%{_bindir}/arm4_control
%{_bindir}/arm4_daemon
%{_bindir}/arm4_dump
%{_bindir}/arm4_export
%{_bindir}/arm4_report
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_libdir}/libarm4db.*
%{_libdir}/libarm4db_bdb.*
%{_libdir}/libarm4db_sqlite.*
%{_libdir}/libarm4db_common.*
# The .so file is included here and not in the -devel package
# as many applications link against these libraries dynamically,
# and it is required by the standard
%{_libdir}/libarm4.so*
%{_libdir}/libarm4_null.so*
%config(noreplace) %{_sysconfdir}/arm4.conf
%{_sysconfdir}/rc.d/init.d/arm4
%{_sysconfdir}/cron.daily/arm4.cron
%attr(755,arm4,arm4) %dir %{contentdir}
#%attr(755,arm4,arm4) %dir %{contentdir}/data
#%attr(1777,arm4,arm4) %dir %{contentdir}/queue
%{_datadir}/%{name}-%{version}/arm4db.xsd

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_mandir}/man3/*

%files java
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-java-%{version}/apidocs
%{_libdir}/arm4*
%{_libdir}/libArmNative.*

%changelog
* Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
- Updated to latest release, which removed arm4sdk and all references
- Removed static library versions
- arm4-tests removed until new tests can be added that don't depend on the SDK

* Sat Nov 1 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.5
- Removed assertions that caused early exit from libraries

* Mon Oct 27 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.4
- Update to latest release version
- Includes more documentation and many bug fixes. SE Linux support is
  removed as it's not yet complete.

* Thu Oct 2 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.3.final
- Update to latest beta version
- Includes more documentation and many bug fixes, selinux rules

* Mon Sep 4 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.2.beta3
- Update to latest beta version
- Includes more documentation and many bug fixes

* Sun Aug 3 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.1.beta2
- Initial packaging as RPM


--- NEW FILE import.log ---
arm4-0_8_1-0_6_fc10:F-10:arm4-0.8.1-0.6.fc10.src.rpm:1238800786


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:44:42 -0000	1.1
+++ .cvsignore	3 Apr 2009 23:20:21 -0000	1.2
@@ -0,0 +1 @@
+arm4-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:44:42 -0000	1.1
+++ sources	3 Apr 2009 23:20:21 -0000	1.2
@@ -0,0 +1 @@
+65b90f3e906b13bd2fb30a4873a3f9ed  arm4-0.8.1.tar.gz



From grandcross at fedoraproject.org  Fri Apr  3 23:22:53 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri,  3 Apr 2009 23:22:53 +0000 (UTC)
Subject: rpms/arm4/F-11 arm4-README.fedora, NONE, 1.1 arm4-arm4.cron, NONE, 
	1.1 arm4-arm4.init, NONE, 1.1 arm4.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090403232253.842CB70134@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3029/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	arm4-README.fedora arm4-arm4.cron arm4-arm4.init arm4.spec 
	import.log 
Log Message:
* Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
- Updated to latest release, which removed arm4sdk and all references
- Removed static library versions
- arm4-tests removed until new tests can be added that don't depend on the SDK




--- NEW FILE arm4-README.fedora ---
Using the arm4 package
======================

The arm4 daemon is set to run out of the box, but there are some configuration
options you should be aware of.

The default configuration file is located at /etc/arm4.conf. 'man arm4.conf'
will give more information on the options available to you.

System Configuration Changes
============================

Unless changed from the default configuration, some of the transaction
parameters won't be passed to the daemon. Add the following to
/etc/sysctl.conf:

  kernel.msgmax = 65536
  kernel.msgmnb = 65536

Failure to do so may result in messages in your system log such as
'Transaction uri msgsnd Invalid argument'

Enabling user access to ARM4
============================

The arm4_daemon has access controlled by the use of groups. A user must be a
member of the arm4 group to have access. To add a user to the group, you
can use the administrative GUIs, or you can run the following as root:

 $ usermod -a -G arm4 <username>

Archiving Data
==============

As installed, data is archived once a day. Data older than 31 days is removed.

This can be customized by modifying the cron script at /etc/cron.daily/arm4.cron.

Datastores
==========

This RPM only supports the Berkeley DB datastore. The default configuration for
Sqlite3 doesn't have all the required options, so it hasn't been built into this
installation.

What do I do if no data is collected?
=====================================

The first thing to do is check the system log. Rather than interrupt the flow of
an application, error messages are sent there.

Where can I get more information?
=================================

http://www.arm4.org/


--- NEW FILE arm4-arm4.cron ---
#!/bin/sh

# Because of the way find works, this will actually add a day to the archive
MAX_AGE='+30'

# Archive the current data
/usr/bin/arm4_control archive

# Remove older archives
find /var/lib/arm4/data/backup -ctime $MAX_AGE -exec rm -rf {} \; > /dev/null 2>&1



--- NEW FILE arm4-arm4.init ---
#!/bin/sh
#
# Startup script for the ARM4 daemon
#
# Copyright (c) 2005-2008 David Carter <dcarter at arm4.org> and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# chkconfig: - 85 15
# description: ARM 4 application response measurement agent
# processname: arm4_daemon
# pidfile: /var/run/arm4.pid

# Source function library.
. /etc/rc.d/init.d/functions

arm4=/usr/bin/arm4_daemon
RETVAL=0

case "$1" in
  start)
        echo -n "Starting arm4: "
        daemon  $arm4
	RETVAL=$?
        echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/arm4
        ;;
  stop)
        echo -n "Shutting down arm4: "
        killproc $arm4
	RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f /var/lock/subsys/arm4
        [ $RETVAL = 0 ] && rm -f /var/run/arm4.pid
        ;;
  status)
        status $arm4
	RETVAL=$?
        ;;
  reload)
      	# Same as restart
        $0 stop
        $0 start
        ;;
  restart)
        $0 stop
        $0 start
        ;;
  *)
        echo "Usage: $0 {start|stop|reload|restart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE arm4.spec ---
Name:		arm4
Version:	0.8.1
Release:	0.6%{?dist}
Summary:	Application Response Measurement V4.0

Group:		Development/System
License:	EPL
URL:		http://www.arm4.org/
Source0:	http://downloads.sourceforge.net/arm4/arm4-0.8.1.tar.gz
Source2:	arm4-README.fedora
Source3:	arm4-arm4.cron
Source4:	arm4-arm4.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
Requires:	uuid openssl db4 db4-cxx sqlite
Requires(pre): shadow-utils	

%description
An Open Source implementation of the Open Group's
Application Response Measurement (ARM) standard
version 4.0. The ARM agent allows you to measure
response times for related transactions across
multiple tiers in a distributed environment.

%package devel
Summary: Files needed to build applications using ARM
Requires: %{name} = %{version}-%{release}

Group: Development/Libraries

%description devel
Files needed to build programs using the Application Response Measurement
(ARM) V4.0 standard.

%package java
Summary: Java language bindings for applications using ARM
Requires: %{name} = %{version}-%{release}

Group: Development/Libraries

%description java
Files needed to build java language programs using the Application Response
Measurement (ARM) V4.0 standard.

#
# Location of agent databases
%define contentdir /var/lib/arm4

%prep
%setup -q -n arm4-%{version}
cp -a %{SOURCE2} README.fedora

%build
%configure --disable-static --enable-sqlite --disable-examples --disable-tests
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# These aren't really required in the final system
rm -rf %{buildroot}%{_datadir}/aclocal

#
# Move the java documentation
mv %{buildroot}%{_datadir}/doc/%{name}-%{version} \
	%{buildroot}%{_datadir}/doc/%{name}-java-%{version}

#
# Remove development versions of libraries that aren't intended for development
rm %{buildroot}%{_libdir}/libarm4db.so
rm %{buildroot}%{_libdir}/libarm4db_bdb.so
rm %{buildroot}%{_libdir}/libarm4db_sqlite.so
rm %{buildroot}%{_libdir}/libarm4db_common.so
rm %{buildroot}%{_libdir}/libArmNative.so

#
# Remove any libtool archives
rm %{buildroot}%{_libdir}/*.la

# Make our configuration dir if it doesn't exist
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
install -m 644 -p %{_builddir}/%{name}-%{version}/config/arm4.conf %{buildroot}%{_sysconfdir}
install -m 755 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/rc.d/init.d/arm4
mkdir -p %{buildroot}%{contentdir}

# Install a cron job to archive and age data
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
install -m 755 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/arm4.cron

%pre
# Add the arm4 user and group
getent group arm4 >/dev/null || groupadd -r arm4
getent passwd arm4 >/dev/null || \
	useradd -r -g arm4 -d %{contentdir} -s /sbin/nologin \
	-c "ARM 4 Daemon" arm4
exit 0

%post
/sbin/ldconfig

# Register the arm4 service
/sbin/chkconfig --add arm4

%post devel -p /sbin/ldconfig

%post java -p /sbin/ldconfig

%preun
if [ $1 = 0 ]; then
	/sbin/service arm4 stop > /dev/null 2>&1
	/usr/bin/arm4_control remove > /dev/null 2>&1
	/sbin/chkconfig --del arm4
fi

%postun -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig

%postun java -p /sbin/ldconfig

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README README.fedora COPYING
%{_bindir}/arm4_control
%{_bindir}/arm4_daemon
%{_bindir}/arm4_dump
%{_bindir}/arm4_export
%{_bindir}/arm4_report
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_libdir}/libarm4db.*
%{_libdir}/libarm4db_bdb.*
%{_libdir}/libarm4db_sqlite.*
%{_libdir}/libarm4db_common.*
# The .so file is included here and not in the -devel package
# as many applications link against these libraries dynamically,
# and it is required by the standard
%{_libdir}/libarm4.so*
%{_libdir}/libarm4_null.so*
%config(noreplace) %{_sysconfdir}/arm4.conf
%{_sysconfdir}/rc.d/init.d/arm4
%{_sysconfdir}/cron.daily/arm4.cron
%attr(755,arm4,arm4) %dir %{contentdir}
#%attr(755,arm4,arm4) %dir %{contentdir}/data
#%attr(1777,arm4,arm4) %dir %{contentdir}/queue
%{_datadir}/%{name}-%{version}/arm4db.xsd

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_mandir}/man3/*

%files java
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-java-%{version}/apidocs
%{_libdir}/arm4*
%{_libdir}/libArmNative.*

%changelog
* Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
- Updated to latest release, which removed arm4sdk and all references
- Removed static library versions
- arm4-tests removed until new tests can be added that don't depend on the SDK

* Sat Nov 1 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.5
- Removed assertions that caused early exit from libraries

* Mon Oct 27 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.4
- Update to latest release version
- Includes more documentation and many bug fixes. SE Linux support is
  removed as it's not yet complete.

* Thu Oct 2 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.3.final
- Update to latest beta version
- Includes more documentation and many bug fixes, selinux rules

* Mon Sep 4 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.2.beta3
- Update to latest beta version
- Includes more documentation and many bug fixes

* Sun Aug 3 2008 David Carter <dcarter at entertain-me.com> - 0.8-0.1.beta2
- Initial packaging as RPM


--- NEW FILE import.log ---
arm4-0_8_1-0_6_fc10:F-11:arm4-0.8.1-0.6.fc10.src.rpm:1238800900


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:44:42 -0000	1.1
+++ .cvsignore	3 Apr 2009 23:22:23 -0000	1.2
@@ -0,0 +1 @@
+arm4-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:44:42 -0000	1.1
+++ sources	3 Apr 2009 23:22:23 -0000	1.2
@@ -0,0 +1 @@
+65b90f3e906b13bd2fb30a4873a3f9ed  arm4-0.8.1.tar.gz



From sadmac at fedoraproject.org  Fri Apr  3 23:33:19 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Fri,  3 Apr 2009 23:33:19 +0000 (UTC)
Subject: rpms/upstart/devel upstart-audit-events.patch, NONE,
	1.1 upstart.spec, 1.28, 1.29
Message-ID: <20090403233319.F058870134@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4395

Modified Files:
	upstart.spec 
Added Files:
	upstart-audit-events.patch 
Log Message:
Add Steve Grubb's audit events patch


upstart-audit-events.patch:

--- NEW FILE upstart-audit-events.patch ---
diff -urp upstart-0.3.9.orig/compat/sysv/Makefile.am upstart-0.3.9/compat/sysv/Makefile.am
--- upstart-0.3.9.orig/compat/sysv/Makefile.am	2008-11-03 12:29:30.000000000 -0500
+++ upstart-0.3.9/compat/sysv/Makefile.am	2008-11-05 08:16:22.000000000 -0500
@@ -28,15 +28,17 @@ endif
 
 reboot_SOURCES = reboot.c
 reboot_LDFLAGS = -static
-reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
+reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
+	@LIBAUDIT@
 
 runlevel_SOURCES = runlevel.c
 runlevel_LDFLAGS = -static
-runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
+runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) @LIBAUDIT@
 
 shutdown_SOURCES = shutdown.c
 shutdown_LDFLAGS = -static
-shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
+shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
+	@LIBAUDIT@
 
 telinit_SOURCES = telinit.c
 telinit_LDFLAGS = -static
diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/reboot.c
--- upstart-0.3.9.orig/compat/sysv/reboot.c	2008-11-03 12:29:30.000000000 -0500
+++ upstart-0.3.9/compat/sysv/reboot.c	2008-11-05 08:16:22.000000000 -0500
@@ -37,6 +37,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <utmp.h>
+#ifdef HAVE_LIBAUDIT
+#include <libaudit.h>
+#endif
 
 #include <linux/if.h>
 #include <linux/hdreg.h>
@@ -87,6 +90,7 @@ enum {
 /* Prototypes for static functions */
 static void down_drives     (void);
 static void down_interfaces (void);
+static void send_audit_event(void);
 
 
 /**
@@ -277,6 +281,7 @@ main (int   argc,
 	 */
 	reboot (RB_ENABLE_CAD);
 	kill (1, SIGTSTP);
+	send_audit_event ();
 
 	/* Sync the disks */
 	chdir ("/");
@@ -315,6 +320,23 @@ main (int   argc,
 	return 0;
 }
 
+/**
+ * send_audit_event
+ *
+ * Send system shutdown audit event
+ **/
+static void
+send_audit_event (void)
+{
+#ifdef HAVE_LIBAUDIT
+        int fd = audit_open ();
+        if (fd < 0)
+                return;
+        audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
+                NULL, NULL, NULL, 1);
+        close (fd);
+#endif
+}
 
 /**
  * down_drives:
diff -urp upstart-0.3.9.orig/compat/sysv/runlevel.c upstart-0.3.9/compat/sysv/runlevel.c
--- upstart-0.3.9.orig/compat/sysv/runlevel.c	2008-11-03 12:29:30.000000000 -0500
+++ upstart-0.3.9/compat/sysv/runlevel.c	2008-11-05 08:22:17.000000000 -0500
@@ -33,6 +33,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_LIBAUDIT
+#include <libaudit.h>
+#endif
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -44,6 +47,7 @@
 
 /* Prototypes for static functions */
 static void store (short type, pid_t pid, const char *user);
+static void send_audit_event (int old, int level);
 
 
 /**
@@ -109,6 +113,7 @@ main (int   argc,
 	/* Store the reboot time? */
 	if (reboot) {
 		store (BOOT_TIME, 0, "reboot");
+		send_audit_event (0, 0);
 		exit (0);
 	}
 
@@ -143,6 +148,7 @@ main (int   argc,
 		prev = cur;
 		if (! prev)
 			prev = 'N';
+		send_audit_event (prev, set[0]);
 
 		cur = set[0];
 	}
@@ -203,3 +209,35 @@ store (short       type,
 	/* Write wtmp entry */
 	updwtmp (WTMP_FILE, &utmp);
 }
+
+/**
+ * send_audit_event
+ * @old: current run level
+ * @level: new run level
+ *
+ * Send system runlevel change audit event. If level is 0, then 
+ * we consider this to be a reboot event.
+ **/
+static void
+send_audit_event (int old, int level)
+{
+#ifdef HAVE_LIBAUDIT
+        int fd = audit_open ();
+
+        if (fd < 0)
+                return;
+
+	if (level) {
+		char buf[64];
+
+	        snprintf (buf, sizeof (buf),
+			"old-level=%c new-level=%c", old, level);
+        	audit_log_user_message (fd, AUDIT_SYSTEM_RUNLEVEL, buf,
+                	NULL, NULL, NULL, 1);
+	} else
+        	audit_log_user_message (fd, AUDIT_SYSTEM_BOOT, "init",
+                	NULL, NULL, NULL, 1);
+        close (fd);
+#endif
+}
+
diff -urp upstart-0.3.9.orig/compat/sysv/shutdown.c upstart-0.3.9/compat/sysv/shutdown.c
--- upstart-0.3.9.orig/compat/sysv/shutdown.c	2008-11-03 12:29:30.000000000 -0500
+++ upstart-0.3.9/compat/sysv/shutdown.c	2008-11-05 08:16:22.000000000 -0500
@@ -38,6 +38,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_LIBAUDIT
+#include <libaudit.h>
+#endif
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -452,6 +455,23 @@ runlevel_setter (NihOption  *option,
 	return 0;
 }
 
+/**
+ * send_audit_event
+ *
+ * Send system shutdown audit event
+ **/
+static void
+send_audit_event (void)
+{
+#ifdef HAVE_LIBAUDIT
+	int fd = audit_open ();
+	if (fd < 0)
+		return;
+	audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
+		NULL, NULL, NULL, 1);
+	close (fd);
+#endif
+}
 
 /**
  * shutdown_now:
@@ -496,6 +516,7 @@ shutdown_now (void)
 	NIH_MUST (message = upstart_message_new (NULL, UPSTART_INIT_DAEMON,
 						 UPSTART_EVENT_EMIT,
 						 "runlevel", args, env));
+	send_audit_event ();
 
 	/* Send the message */
 	if (nih_io_message_send (message, sock) < 0) {
@@ -513,7 +534,6 @@ shutdown_now (void)
 		nih_fatal (_("Unable to send message: %s"), err->message);
 		exit (1);
 	}
-
 	unlink (ETC_NOLOGIN);
 	nih_main_unlink_pidfile ();
 
diff -urp upstart-0.3.9.orig/config.h.in upstart-0.3.9/config.h.in
--- upstart-0.3.9.orig/config.h.in	2008-11-03 12:29:30.000000000 -0500
+++ upstart-0.3.9/config.h.in	2008-11-05 08:16:22.000000000 -0500
@@ -250,6 +250,9 @@
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
+/* Define to 1 if you want audit support */
+#undef HAVE_LIBAUDIT
+
 /* Name of package */
 #undef PACKAGE
 
diff -urp upstart-0.3.9.orig/configure.ac upstart-0.3.9/configure.ac
--- upstart-0.3.9.orig/configure.ac	2008-11-03 12:29:30.000000000 -0500
+++ upstart-0.3.9/configure.ac	2008-11-05 08:16:22.000000000 -0500
@@ -38,6 +38,25 @@ AC_ARG_ENABLE(compat,
 esac], [compat_sysv=none])dnl
 AM_CONDITIONAL(COMPAT_SYSV, test "x$compat" = "xsysv")dnl
 
+AC_ARG_WITH(libaudit,
+  [  --with-libaudit=[auto/yes/no]  Add Linux audit support [default=auto]],,
+  with_libaudit=auto)
+
+# Check for Linux auditing API
+#
+# libaudit detection
+if test x$with_libaudit = xno ; then
+    have_libaudit=no;
+else
+    # See if we have audit daemon library
+    AC_CHECK_LIB(audit, audit_log_user_message,
+                 LIBAUDIT=-laudit, LIBAUDIT="")
+fi
+AC_SUBST(LIBAUDIT)
+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$LIBAUDIT != x)
+if test x$LIBAUDIT != x ; then
+    AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support])
+fi
 
 AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in intl/Makefile
 		  nih/Makefile upstart/Makefile init/Makefile util/Makefile


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- upstart.spec	7 Mar 2009 23:32:31 -0000	1.28
+++ upstart.spec	3 Apr 2009 23:32:49 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -101,6 +101,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Fri Apr 3 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-23
+- Add audit events patch from Steve Grubb <sgrubb at redhat.com> (Bug #470661)
+
 * Fri Jan 23 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-22
 - Re-add 'telinit u' support along with patch to fix it (#450488). Patch due to
   <pspencer at fields.utoronto.ca>



From grandcross at fedoraproject.org  Sat Apr  4 00:32:50 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  4 Apr 2009 00:32:50 +0000 (UTC)
Subject: rpms/arm4/devel arm4.spec,1.1,1.2
Message-ID: <20090404003250.AA1C570130@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7098

Modified Files:
	arm4.spec 
Log Message:
* Fri Apr 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.1-0.7
- Missing jni.h caused build issues with F-11 F-12




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/arm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arm4.spec	3 Apr 2009 23:18:03 -0000	1.1
+++ arm4.spec	4 Apr 2009 00:32:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		arm4
 Version:	0.8.1
-Release:	0.6%{?dist}
+Release:	0.7%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -12,7 +12,7 @@
 Source4:	arm4-arm4.init
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
+BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc java-1.5.0-gcj-devel
 Requires:	uuid openssl db4 db4-cxx sqlite
 Requires(pre): shadow-utils	
 
@@ -163,6 +163,9 @@
 %{_libdir}/libArmNative.*
 
 %changelog
+* Fri Apr 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.1-0.7
+- Missing jni.h caused build issues with F-11 F-12
+
 * Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
 - Updated to latest release, which removed arm4sdk and all references
 - Removed static library versions



From konradm at fedoraproject.org  Sat Apr  4 00:42:13 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Sat,  4 Apr 2009 00:42:13 +0000 (UTC)
Subject: rpms/python-polybori/devel import.log, NONE,
	1.1 polybori-0.5-dont-build-libcudd.diff, NONE,
	1.1 python-polybori.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090404004213.80D8570130@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-polybori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8403/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log polybori-0.5-dont-build-libcudd.diff 
	python-polybori.spec 
Log Message:
Import.



--- NEW FILE import.log ---
python-polybori-0_5-5_fc10:HEAD:python-polybori-0.5-5.fc10.src.rpm:1238805520

polybori-0.5-dont-build-libcudd.diff:

--- NEW FILE polybori-0.5-dont-build-libcudd.diff ---
--- SConstruct.orig	2008-09-23 13:40:37.000000000 -0700
+++ SConstruct	2008-12-12 23:14:27.000000000 -0800
@@ -390,16 +390,16 @@
 # exclude the following files
 for fname in ['util/saveimage.c', 'util/test*.c']:
     for file in glob(CuddPath(fname)):
         cudd_resources.remove(file)
 
-cudd_shared = shared_object(cudd_resources)
+#cudd_shared = shared_object(cudd_resources)
 
-libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
-DefaultBuild(libCudd)
+#libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
+#DefaultBuild(libCudd)
 
-shared_resources += cudd_shared
+#shared_resources += cudd_shared
 
 def SymlinkReadableLibname(files):
     """ Generate symbolik link with more readable library name."""
     
     suffix = env.subst('$SHLIBVERSIONSUFFIX')
@@ -432,11 +432,11 @@
     slib = VersionatedSharedLibrary
 #if env['PLATFORM']=="darwin":
 #    slib=env.LoadableModule
 
 
-libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
+#libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
 
 
 ######################################################################
 # Stuff for building PolyBoRi's C++ part
 ######################################################################
@@ -492,16 +492,16 @@
 CPPPATH=env['CPPPATH']+[GBPath('src')]
 #print env['CCFLAGS']
 #print env['CXXFLAGS']
 for t in tests_pb:
     env.Program(TestsPath(t), 
-        [TestsPath('src', t + ".cc"),  libpb] + libCudd, 
+        [TestsPath('src', t + ".cc"),  libpb], #+ libCudd, 
         CPPPATH=CPPPATH, LIBS = env['LIBS'] + pyconf.libs)
 
 for t in tests_gb:
     env.Program(TestsPath(t), 
-        [TestsPath('src', t + ".cc"), libpb, gb]+ libCudd, 
+        [TestsPath('src', t + ".cc"), libpb, gb], #+ libCudd, 
         CPPPATH=CPPPATH)
 
 
 LIBS = env['LIBS']+['boost_python']+USERLIBS
 
@@ -566,11 +566,11 @@
     for (f,n) in installable_python_modules:
         DefaultBuild(env.Install(polybori_modules, f))
 
 
     
-    to_append_for_profile = [libpb, gb] + libCudd
+    to_append_for_profile = [libpb, gb] #+ libCudd
     #to_append_for_profile=File('/lib/libutil.a')
     env.Program(PyPBPath('profiled'), wrapper_files+to_append_for_profile,
             LDMODULESUFFIX=".so",SHLIBPREFIX="", 
             LIBS = LIBS + ["python" + str(pyconf.version)] + USERLIBS + pyconf.libs,
             CPPPATH=CPPPATH, CPPDEFINES=env["CPPDEFINES"]+["PB_STATIC_PROFILING_VERSION"])
@@ -745,11 +745,11 @@
         srcdistri = presrcdistri
                 
     env.AlwaysBuild(srcdistri)
     env.Alias('distribute', srcdistri)
     
-devellibs = [libpb,gb] + libCudd + libpbShared + libgbShared + libCuddShared
+devellibs = [libpb,gb] + libpbShared + libgbShared
 readabledevellibs = SymlinkReadableLibname(devellibs)
 
 # Installation for development purposes
 if 'devel-install' in COMMAND_LINE_TARGETS:
     DevelInstPath = PathJoiner(env['DEVEL_PREFIX'])
@@ -757,13 +757,13 @@
     SymlinkReadableLibname(env.Install(DevelInstPath('lib'), devellibs))
     
     env.Install(DevelInstPath('include/polybori'), glob(PBPath('include/*.h')))
     env.Install(DevelInstPath('include/polybori/groebner'),
                 glob(GBPath('src/*.h')))
-    env.Install(DevelInstPath('include/cudd'), cudd_headers)
-    if not(external_m4ri):
-        env.Install(DevelInstPath('include/polybori/M4RI'), glob('M4RI/*.h'))
+    #env.Install(DevelInstPath('include/cudd'), cudd_headers)
+    #if not(external_m4ri):
+    #    env.Install(DevelInstPath('include/polybori/M4RI'), glob('M4RI/*.h'))
     env.Alias('devel-install', DevelInstPath())
 
 
 env.Append(COPYALL_PATTERNS = ['*'])
 


--- NEW FILE python-polybori.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-polybori
Version:        0.5
Release:        5%{?dist}
Summary:        Framework for Boolean Rings
Group:          Development/Libraries
License:        GPLv2+
URL:            http://polybori.sourceforge.net/
Source0:        http://downloads.sourceforge.net/polybori/polybori-%{version}.tar.gz
Patch0:         polybori-0.5-dont-build-libcudd.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  boost-devel
BuildRequires:  cudd-devel
BuildRequires:  cudd-static
BuildRequires:  doxygen
BuildRequires:  latex2html
BuildRequires:  m4ri-devel
BuildRequires:  python-devel
BuildRequires:  scons
Requires:       python-imaging
Requires:       ipython


%description
PolyBoRi is a special purpose computer algebra system for computations in
Boolean Rings. The core is a C++ library, which provides high-level data
types for Boolean polynomials and related structures. As a unique
approach, binary decision diagrams are used as internal storage type for
polynomial structures. On top of this, we provide a Python interface for
parsing of complex polynomial systems, as well as for sophisticated and
extendable strategies for Groebner base computation.


%package        docs
Summary:        Documentation for %{name}
Group:          Documentation


%description    docs
Documentation for %{name}.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel
Requires:       cudd-devel


%description    devel
Development headers and libraries for %{name}.


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}


%description    static
Static libraries for %{name}.


%prep
%setup -q -n polybori-%{version}
%patch0 -b .orig

# Remove private copy of system lib (cudd)
rm -rf Cudd
sed -i -e 's|#include "cuddInt.h"|#include <cuddInt.h>|' \
  polybori/include/CCuddCore.h

# Remove private copy of system lib (m4ri)
rm -rf M4RI

# Remove private copy of system lib (singular)
rm -rf Singular

sed -i '1,1d' pyroot/polybori/disttar.py

# Try to avoid stripping shared objects at link time.
# Also link in cudd and cuddobj.
sed -i -e 's|^LDFLAGS_LINUX.*-s|LDFLAGS_LINUX = -lcudd -lcuddobj|' \
  polybori/Makefile.in
sed -i -e "s|\['-s'\]|['-lcudd -lcuddobj']|" SConstruct

%ifarch x86_64 ppc64
  sed -i -e "s|DevelInstPath('lib')|DevelInstPath('lib64')|" SConstruct
%endif

# Fix encoding
iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf-8
touch -r ChangeLog ChangeLog.utf-8
mv ChangeLog.utf-8 ChangeLog



%build
# scons = suck
# we have to build in the install section


%install
rm -rf $RPM_BUILD_ROOT
scons install \
  PREFIX=$RPM_BUILD_ROOT%{_prefix} \
  EPREFIX=$RPM_BUILD_ROOT%{_bindir} \
  INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name} \
  MANDIR=$RPM_BUILD_ROOT%{_mandir} \
  PYINSTALLPREFIX=$RPM_BUILD_ROOT%{python_sitearch} \
  DEVEL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
    CFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
   CCFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
  CXXFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri"

scons devel-install \
  PREFIX=$RPM_BUILD_ROOT%{_prefix} \
  EPREFIX=$RPM_BUILD_ROOT%{_bindir} \
  INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name} \
  MANDIR=$RPM_BUILD_ROOT%{_mandir} \
  PYINSTALLPREFIX=$RPM_BUILD_ROOT%{python_sitearch} \
  DEVEL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
    CFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
   CCFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
  CXXFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri"

# Empty header --- seems to be used, keep it for now
#rm $RPM_BUILD_ROOT%{_includedir}/polybori/cacheopts.h

# Remove buildroot from a generated file
sed -i -e 's|%{buildroot}||' %{buildroot}%{_datadir}/%{name}/ipbori/ipythonrc-polybori


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/ipbori
%{_mandir}/man1/ipbori.1*
%{_datadir}/%{name}
%{python_sitearch}/polybori
%{_libdir}/lib*.so.*


%files docs
%defattr(-,root,root,-)
%{_docdir}/%{name}


%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_libdir}/lib*.so
%{_includedir}/polybori


%files static
%defattr(-,root,root,-)
%{_libdir}/lib*.a


%changelog
* Sat Mar 28 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-5
- Add cudd-devel Requires to -devel subpackage.
- Link against cudd at build time.
- Fixed encoding of ChangeLog.

* Tue Mar 24 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-4
- Fix SF.net source0.
- Fix License.
- Fix rpm defines (should be globals).
- Don't strip debugging information.
- Fix Requires.

* Mon Mar 23 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-3
- Remove buildroot from an installed file (thanks, Mamoru).

* Wed Mar 18 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-2
- Add BR on scons.

* Mon Dec 8 2008 Conrad Meyer <konrad at tylerc.org> - 0.5-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polybori/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:54 -0000	1.1
+++ .cvsignore	4 Apr 2009 00:41:43 -0000	1.2
@@ -0,0 +1 @@
+polybori-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polybori/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:54 -0000	1.1
+++ sources	4 Apr 2009 00:41:43 -0000	1.2
@@ -0,0 +1 @@
+0c4af11b90b69d0dac4f008b940d7518  polybori-0.5.tar.gz



From grandcross at fedoraproject.org  Sat Apr  4 00:43:57 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  4 Apr 2009 00:43:57 +0000 (UTC)
Subject: rpms/arm4/F-11 arm4.spec,1.1,1.2
Message-ID: <20090404004357.E654170130@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8854

Modified Files:
	arm4.spec 
Log Message:
* Fri Apr 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.1-0.7
- Missing jni.h caused build issues with F-11 F-12




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-11/arm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arm4.spec	3 Apr 2009 23:22:23 -0000	1.1
+++ arm4.spec	4 Apr 2009 00:43:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		arm4
 Version:	0.8.1
-Release:	0.6%{?dist}
+Release:	0.7%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -12,7 +12,7 @@
 Source4:	arm4-arm4.init
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
+BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc java-1.5.0-gcj-devel
 Requires:	uuid openssl db4 db4-cxx sqlite
 Requires(pre): shadow-utils	
 
@@ -163,6 +163,9 @@
 %{_libdir}/libArmNative.*
 
 %changelog
+* Fri Apr 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.1-0.7
+- Missing jni.h caused build issues with F-11 F-12
+
 * Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
 - Updated to latest release, which removed arm4sdk and all references
 - Removed static library versions



From grandcross at fedoraproject.org  Sat Apr  4 00:53:29 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  4 Apr 2009 00:53:29 +0000 (UTC)
Subject: rpms/arm4/F-10 arm4.spec,1.1,1.2
Message-ID: <20090404005329.93C2870130@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9373

Modified Files:
	arm4.spec 
Log Message:
* Fri Apr 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.1-0.7
- Missing jni.h caused build issues with F-11 F-12




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-10/arm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arm4.spec	3 Apr 2009 23:20:21 -0000	1.1
+++ arm4.spec	4 Apr 2009 00:52:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		arm4
 Version:	0.8.1
-Release:	0.6%{?dist}
+Release:	0.7%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -12,7 +12,7 @@
 Source4:	arm4-arm4.init
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
+BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc java-1.5.0-gcj-devel
 Requires:	uuid openssl db4 db4-cxx sqlite
 Requires(pre): shadow-utils	
 
@@ -163,6 +163,9 @@
 %{_libdir}/libArmNative.*
 
 %changelog
+* Fri Apr 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.1-0.7
+- Missing jni.h caused build issues with F-11 F-12
+
 * Sun Nov 30 2008 David Carter <dcarter at entertain-me.com> - 0.8.1-0.6
 - Updated to latest release, which removed arm4sdk and all references
 - Removed static library versions



From dcantrel at fedoraproject.org  Sat Apr  4 01:50:57 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat,  4 Apr 2009 01:50:57 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.248,1.249
Message-ID: <20090404015057.69E1470130@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16313

Modified Files:
	dhcp.spec 
Log Message:
* Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-15
- Obsolete libdhcp and libdhcp-devel (#493547)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- dhcp.spec	3 Apr 2009 02:53:24 -0000	1.248
+++ dhcp.spec	4 Apr 2009 01:50:27 -0000	1.249
@@ -4,7 +4,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  14%{?dist}
+Release:  15%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -71,8 +71,8 @@
 Requires: initscripts >= 6.75
 Requires(post): coreutils
 Obsoletes: dhcpcd <= 1.3.22pl1-7
-Obsoletes: libdhcp4client <= 12:4.0.0-31
-Obsoletes: libdhcp <= 1.99.8-1
+Obsoletes: libdhcp4client <= 12:4.0.0-31.fc10
+Obsoletes: libdhcp <= 1.99.8-1.fc10
 Provides: dhcpcd = 1.3.22pl1-8
 
 %description -n dhclient
@@ -417,6 +417,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-15
+- Obsolete libdhcp and libdhcp-devel (#493547)
+
 * Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-14
 - Obsolete libdhcp and libdhcp-devel (#493547)
 



From dcantrel at fedoraproject.org  Sat Apr  4 02:24:10 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat,  4 Apr 2009 02:24:10 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.30, 1.31 pyparted.spec, 1.58,
	1.59 sources, 1.35, 1.36
Message-ID: <20090404022410.AFDEF70130@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20949

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.10-1
- Upgrade to pyparted-2.0.10
      Fix LVM problems around parted.Disk.commit() (#491746)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	24 Mar 2009 03:56:43 -0000	1.30
+++ .cvsignore	4 Apr 2009 02:23:40 -0000	1.31
@@ -1 +1 @@
-pyparted-2.0.9.tar.gz
+pyparted-2.0.10.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pyparted.spec	24 Mar 2009 03:56:43 -0000	1.58
+++ pyparted.spec	4 Apr 2009 02:23:40 -0000	1.59
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.0.9
+Version: 2.0.10
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -41,6 +41,10 @@
 %{python_sitearch}/parted
 
 %changelog
+* Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.10-1
+- Upgrade to pyparted-2.0.10
+      Fix LVM problems around parted.Disk.commit() (#491746)
+
 * Mon Mar 23 2009 David Cantrell <dcantrell at redhat.com> - 2.0.9-1
 - Upgrade to pyparted-2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	24 Mar 2009 03:56:43 -0000	1.35
+++ sources	4 Apr 2009 02:23:40 -0000	1.36
@@ -1 +1 @@
-74a0406e8e4b213507c4ad0e0912d969  pyparted-2.0.9.tar.gz
+edaff191f825a759762097f867823aa2  pyparted-2.0.10.tar.gz



From notting at fedoraproject.org  Sat Apr  4 02:40:42 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Sat,  4 Apr 2009 02:40:42 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-lying-systems-without-lvds.patch, 1.3,
	1.4
Message-ID: <20090404024042.5441270130@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23582

Modified Files:
	drm-intel-lying-systems-without-lvds.patch 
Log Message:
Add another DMI entry of a system that doesn't have LVDS.


drm-intel-lying-systems-without-lvds.patch:

Index: drm-intel-lying-systems-without-lvds.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/drm-intel-lying-systems-without-lvds.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 20:56:02 -0000	1.3
+++ drm-intel-lying-systems-without-lvds.patch	4 Apr 2009 02:40:41 -0000	1.4
@@ -23,7 +23,7 @@
 index 6619f26..4d64686 100644
 --- a/drivers/gpu/drm/i915/intel_lvds.c
 +++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -384,7 +384,43 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
+@@ -384,7 +384,51 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
  	.destroy = intel_lvds_enc_destroy,
  };
  
@@ -53,6 +53,14 @@
 +	},
 +	{
 +		.callback = intel_no_lvds_dmi_callback,
++		.ident = "MSI IM-945GSE-A",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "MSI"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "A9830IMS"),
++		},
++	},
++	{
++		.callback = intel_no_lvds_dmi_callback,
 +		.ident = "Dell Studio Hybrid",
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),



From peter at fedoraproject.org  Sat Apr  4 04:32:59 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  4 Apr 2009 04:32:59 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.spec,1.36,1.37 import.log,1.9,1.10
Message-ID: <20090404043259.DB1A270130@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13531/devel

Modified Files:
	ejabberd.spec import.log 
Log Message:
Really disable CAPTCHA


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ejabberd.spec	3 Apr 2009 20:09:33 -0000	1.36
+++ ejabberd.spec	4 Apr 2009 04:32:29 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -177,7 +177,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+# tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -219,6 +220,9 @@
 %endif
 
 %changelog
+* Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
+- Really disable CAPTCHA
+
 * Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
 - Ver. 2.0.5
 - Temporarily disabled CAPTCHA support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	3 Apr 2009 20:09:33 -0000	1.9
+++ import.log	4 Apr 2009 04:32:29 -0000	1.10
@@ -7,3 +7,4 @@
 ejabberd-2_0_3-1_fc10:HEAD:ejabberd-2.0.3-1.fc10.src.rpm:1232988133
 ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.4-1.fc10.src.rpm:1237116778
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
+ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481



From peter at fedoraproject.org  Sat Apr  4 04:35:50 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  4 Apr 2009 04:35:50 +0000 (UTC)
Subject: rpms/ejabberd/F-10 ejabberd.spec,1.34,1.35 import.log,1.9,1.10
Message-ID: <20090404043550.A1E3C70130@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14416/F-10

Modified Files:
	ejabberd.spec import.log 
Log Message:
Really disable CAPTCHA


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ejabberd.spec	3 Apr 2009 20:13:45 -0000	1.34
+++ ejabberd.spec	4 Apr 2009 04:35:20 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -177,7 +177,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+# tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -219,6 +220,9 @@
 %endif
 
 %changelog
+* Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
+- Really disable CAPTCHA
+
 * Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
 - Ver. 2.0.5
 - Temporarily disabled CAPTCHA support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	3 Apr 2009 20:13:46 -0000	1.9
+++ import.log	4 Apr 2009 04:35:20 -0000	1.10
@@ -7,3 +7,4 @@
 ejabberd-2_0_3-1_fc10:F-10:ejabberd-2.0.3-1.fc10.src.rpm:1232988288
 ejabberd-2_0_4-1_fc10:F-10:ejabberd-2.0.4-1.fc10.src.rpm:1237116924
 ejabberd-2_0_5-1_fc10:F-10:ejabberd-2.0.5-1.fc10.src.rpm:1238789573
+ejabberd-2_0_5-2_fc10:F-10:ejabberd-2.0.5-2.fc10.src.rpm:1238819669



From bojan at fedoraproject.org  Sat Apr  4 04:37:57 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Sat,  4 Apr 2009 04:37:57 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel COPYING, 1.2, 1.3 doxygen.conf, 1.3, 
	1.4 subversion-api-docs.spec, 1.22, 1.23
Message-ID: <20090404043757.1394D70130@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15072

Modified Files:
	COPYING doxygen.conf subversion-api-docs.spec 
Log Message:
Bump up to 1.6.0.


Index: COPYING
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/COPYING,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- COPYING	2 Apr 2007 02:49:11 -0000	1.2
+++ COPYING	4 Apr 2009 04:37:26 -0000	1.3
@@ -10,7 +10,7 @@
 on), you may use a newer version instead, at your option.
 
 ================================================================
-Copyright (c) 2000-2006 CollabNet.  All rights reserved.
+Copyright (c) 2000-2009 CollabNet.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions


Index: doxygen.conf
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/doxygen.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- doxygen.conf	7 Jul 2008 22:02:41 -0000	1.3
+++ doxygen.conf	4 Apr 2009 04:37:26 -0000	1.4
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.3
+# Doxyfile 1.5.7.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,11 +14,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file that 
-# follow. The default is UTF-8 which is also the encoding used for all text before 
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
-# possible encodings.
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
@@ -54,10 +54,11 @@
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
@@ -154,13 +155,6 @@
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
@@ -196,14 +190,26 @@
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
-# include (a tag file for) the STL sources as input, then you should 
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
 # set this tag to YES in order to let doxygen match functions declarations and 
 # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
 # func(std::string) {}). This also make the inheritance and collaboration 
@@ -216,6 +222,21 @@
 
 CPP_CLI_SUPPORT        = NO
 
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
 # tag is set to YES, then doxygen will reuse the documentation of the first 
 # member in the group (if any) for the other members of the group. By default 
@@ -231,6 +252,32 @@
 
 SUBGROUPING            = YES
 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -265,10 +312,11 @@
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If this flag is set to YES, the members of anonymous namespaces will be extracted 
-# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
-# where file will be replaced with the base name of the file that contains the anonymous 
-# namespace. By default anonymous namespace are hidden.
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
@@ -347,6 +395,12 @@
 
 SORT_BRIEF_DOCS        = NO
 
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
 # sorted by fully-qualified names, including namespaces. If set to 
 # NO (the default), the class list will be sorted only by class name, 
@@ -408,9 +462,21 @@
 
 SHOW_DIRECTORIES       = NO
 
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from the 
-# version control system). Doxygen will invoke the program by executing (via 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
 # popen()) the command <command> <input-file>, where <command> is the value of 
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
 # provided by doxygen. Whatever the program writes to standard output 
@@ -418,6 +484,15 @@
 
 FILE_VERSION_FILTER    = 
 
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE            = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -478,12 +553,14 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = subversion/include subversion/include/private/svn_doxygen.h
+INPUT                  = subversion/include \
+                         subversion/include/private/svn_doxygen.h
 
-# This tag can be used to specify the character encoding of the source files that 
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
-# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
@@ -492,7 +569,7 @@
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = *.h
 
@@ -523,9 +600,10 @@
 EXCLUDE_PATTERNS       = 
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the output. 
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        = 
 
@@ -587,9 +665,7 @@
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
 # be generated. Documented entities will be cross-referenced with these sources. 
 # Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
-# then you must also enable this option. If you don't then doxygen will produce 
-# a warning and turn it on anyway
+# VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
@@ -604,13 +680,13 @@
 
 STRIP_CODE_COMMENTS    = NO
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# If the REFERENCED_BY_RELATION tag is set to YES 
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
+# If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
@@ -708,13 +784,6 @@
 
 HTML_ALIGN_MEMBERS     = YES
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
 # page has loaded. For this to work a browser that supports 
@@ -723,6 +792,39 @@
 
 HTML_DYNAMIC_SECTIONS  = NO
 
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
@@ -743,6 +845,12 @@
 
 GENERATE_CHI           = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
 # controls whether a binary table of contents is generated (YES) or a 
 # normal table of contents (NO) in the .chm file.
@@ -754,6 +862,38 @@
 
 TOC_EXPAND             = NO
 
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file .
+
+QHG_LOCATION           = 
+
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
@@ -765,12 +905,20 @@
 
 ENUM_VALUES_PER_LINE   = 1
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to FRAME, a side panel will be generated
+# containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
 # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list;
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
+# disables this behavior completely. For backwards compatibility with previous
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
+# respectively.
 
 GENERATE_TREEVIEW      = NO
 
@@ -780,6 +928,14 @@
 
 TREEVIEW_WIDTH         = 250
 
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -1134,10 +1290,11 @@
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
-# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
-# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
-# be found in the default search path.
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
 
 MSCGEN_PATH            = 
 
@@ -1154,6 +1311,29 @@
 
 HAVE_DOT               = NO
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -1198,19 +1378,19 @@
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
-# generate a caller dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable caller graphs for selected 
-# functions only using the \callergraph command.
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
@@ -1243,12 +1423,12 @@
 
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
 # nodes that will be shown in the graph. If the number of nodes in a graph 
 # becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the number 
-# of direct children of the root node in a graph is already larger than 
-# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
@@ -1264,10 +1444,10 @@
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, which results in a white background. 
-# Warning: Depending on the platform used, enabling this option may lead to 
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
-# read).
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- subversion-api-docs.spec	22 Mar 2009 07:51:33 -0000	1.22
+++ subversion-api-docs.spec	4 Apr 2009 04:37:26 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           subversion-api-docs
-Version:        1.5.6
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Subversion API documentation
 
@@ -26,9 +26,9 @@
 
 %build
 cd %{name}-%{version}
-sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1,' \
-    -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
-    -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \
+sed -e 'N;N;s,^\(INPUT *= *\).*$,\1%{_includedir}/subversion-1\n,' \
+    -e 's,^\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
+    -e 's,^\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \
 doxygen.conf | doxygen -
 
 %install
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sat Apr  4 2009 Bojan Smojver <bojan at rexursive.com> 1.6.0-1
+- bump up to 1.6.0
+
 * Sun Mar 22 2009 Bojan Smojver <bojan at rexursive.com> 1.5.6-1
 - bump up to 1.5.6
 



From peter at fedoraproject.org  Sat Apr  4 04:39:34 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  4 Apr 2009 04:39:34 +0000 (UTC)
Subject: rpms/ejabberd/F-9 ejabberd.spec,1.31,1.32 import.log,1.7,1.8
Message-ID: <20090404043934.D29CA70130@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16219/F-9

Modified Files:
	ejabberd.spec import.log 
Log Message:
Really disable CAPTCHA


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/ejabberd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ejabberd.spec	3 Apr 2009 20:19:43 -0000	1.31
+++ ejabberd.spec	4 Apr 2009 04:39:04 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -177,7 +177,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+# tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -219,6 +220,9 @@
 %endif
 
 %changelog
+* Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
+- Really disable CAPTCHA
+
 * Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
 - Ver. 2.0.5
 - Temporarily disabled CAPTCHA support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	3 Apr 2009 20:19:43 -0000	1.7
+++ import.log	4 Apr 2009 04:39:04 -0000	1.8
@@ -5,3 +5,4 @@
 ejabberd-2_0_3-1_fc10:F-9:ejabberd-2.0.3-1.fc10.src.rpm:1232988519
 ejabberd-2_0_4-1_fc10:F-9:ejabberd-2.0.4-1.fc10.src.rpm:1237117113
 ejabberd-2_0_5-1_fc10:F-9:ejabberd-2.0.5-1.fc10.src.rpm:1238789863
+ejabberd-2_0_5-2_fc10:F-9:ejabberd-2.0.5-2.fc10.src.rpm:1238819872



From peter at fedoraproject.org  Sat Apr  4 04:47:44 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  4 Apr 2009 04:47:44 +0000 (UTC)
Subject: rpms/ejabberd/EL-5 ejabberd.spec,1.26,1.27 import.log,1.7,1.8
Message-ID: <20090404044745.065D870130@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18874/EL-5

Modified Files:
	ejabberd.spec import.log 
Log Message:
Really disable CAPTCHA


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ejabberd.spec	3 Apr 2009 20:22:39 -0000	1.26
+++ ejabberd.spec	4 Apr 2009 04:47:14 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -177,7 +177,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
+# tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -219,6 +220,9 @@
 %endif
 
 %changelog
+* Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
+- Really disable CAPTCHA
+
 * Fri Apr  3 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-1
 - Ver. 2.0.5
 - Temporarily disabled CAPTCHA support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	3 Apr 2009 20:22:39 -0000	1.7
+++ import.log	4 Apr 2009 04:47:14 -0000	1.8
@@ -5,3 +5,4 @@
 ejabberd-2_0_3-1_fc10:EL-5:ejabberd-2.0.3-1.fc10.src.rpm:1232988681
 ejabberd-2_0_4-1_fc10:EL-5:ejabberd-2.0.4-1.fc10.src.rpm:1237117472
 ejabberd-2_0_5-1_fc10:EL-5:ejabberd-2.0.5-1.fc10.src.rpm:1238790091
+ejabberd-2_0_5-2_fc10:EL-5:ejabberd-2.0.5-2.fc10.src.rpm:1238820305



From bojan at fedoraproject.org  Sat Apr  4 04:55:17 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Sat,  4 Apr 2009 04:55:17 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.23,1.24
Message-ID: <20090404045517.7547770130@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21010

Modified Files:
	subversion-api-docs.spec 
Log Message:
Sed didn't like that much, try again.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- subversion-api-docs.spec	4 Apr 2009 04:37:26 -0000	1.23
+++ subversion-api-docs.spec	4 Apr 2009 04:54:47 -0000	1.24
@@ -27,9 +27,10 @@
 %build
 cd %{name}-%{version}
 sed -e 'N;N;s,^\(INPUT *= *\).*$,\1%{_includedir}/subversion-1\n,' \
-    -e 's,^\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
-    -e 's,^\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \
-doxygen.conf | doxygen -
+doxygen.conf | 
+sed -e 's,^\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
+    -e 's,^\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' | \
+doxygen -
 
 %install
 cd %{name}-%{version}



From ynemoy at fedoraproject.org  Sat Apr  4 05:55:06 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sat,  4 Apr 2009 05:55:06 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.3,1.4
Message-ID: <20090404055506.E849270130@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3472

Modified Files:
	ghc-X11.spec 
Log Message:
rebuild bump to raise VR manually, to match with F-10 branch



Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-X11.spec	9 Mar 2009 02:23:17 -0000	1.3
+++ ghc-X11.spec	4 Apr 2009 05:54:36 -0000	1.4
@@ -12,7 +12,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Haskell %{pkg_name} librar
 
 Group:          Development/Libraries
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
+- rebuild bump to raise EVR manually, to match with F-10 branch
+
 * Sun Mar  8 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-5
 - corrected a faulty tag
 



From abompard at fedoraproject.org  Sat Apr  4 08:27:14 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  4 Apr 2009 08:27:14 +0000 (UTC)
Subject: rpms/spring-installer/devel spring-installer.spec,1.2,1.3
Message-ID: <20090404082714.B1E8A70130@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring-installer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3555

Modified Files:
	spring-installer.spec 
Log Message:
* Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-5
- fix versioned dependency



Index: spring-installer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/devel/spring-installer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spring-installer.spec	22 Mar 2009 14:11:29 -0000	1.2
+++ spring-installer.spec	4 Apr 2009 08:26:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           spring-installer
 Version:        20090316
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Installer for the Spring game's maps and mods
 
 Group:          Amusements/Games
@@ -14,7 +14,7 @@
 BuildRequires:  ocaml-ocamlnet-devel, ocaml-pcre-devel, chrpath, desktop-file-utils
 BuildRequires:  gtk2-devel
 %if 0%{?fedora} >= 11
-BuildRequires:  ocaml-zip > 1.04
+BuildRequires:  ocaml-zip >= 1.04
 %endif
 
 # For execstack
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-5
+- fix versioned dependency
+
 * Sun Mar 22 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-4
 - rebuild
 



From pbrobinson at fedoraproject.org  Sat Apr  4 09:29:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:29:58 +0000 (UTC)
Subject: rpms/celt/devel import.log,1.1,NONE
Message-ID: <20090404092959.03B9870130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/celt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15680

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:31:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:31:17 +0000 (UTC)
Subject: rpms/geoclue import.log,1.1,NONE
Message-ID: <20090404093117.31D8B70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15952

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:32:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:32:37 +0000 (UTC)
Subject: rpms/gupnp/F-10 import.log,1.1,NONE
Message-ID: <20090404093237.ABB7E70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184/F-10

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:32:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:32:38 +0000 (UTC)
Subject: rpms/gupnp/F-9 import.log,1.1,NONE
Message-ID: <20090404093238.3D4BF70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184/F-9

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:32:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:32:38 +0000 (UTC)
Subject: rpms/gupnp/devel import.log,1.1,NONE
Message-ID: <20090404093238.8B5E770130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184/devel

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:33:08 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:33:08 +0000 (UTC)
Subject: rpms/gupnp/F-8 gupnp.spec,1.1,1.2 import.log,1.1,NONE
Message-ID: <20090404093308.1253B70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184/F-8

Modified Files:
	gupnp.spec 
Removed Files:
	import.log 
Log Message:
remove import.log


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-8/gupnp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gupnp.spec	6 Sep 2008 14:32:40 -0000	1.1
+++ gupnp.spec	4 Apr 2009 09:32:37 -0000	1.2
@@ -6,7 +6,7 @@
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gupnp.org/
-Source0:        http://www.gupnp.org/sources/gupnp/%{name}-%{version}.tar.gz
+Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:33:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:33:47 +0000 (UTC)
Subject: rpms/gupnp-av/F-10 import.log,1.1,NONE
Message-ID: <20090404093347.42AF170130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445/F-10

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:33:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:33:47 +0000 (UTC)
Subject: rpms/gupnp-av/F-9 import.log,1.1,NONE
Message-ID: <20090404093347.CDF4E70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445/F-9

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:33:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:33:48 +0000 (UTC)
Subject: rpms/gupnp-av/devel import.log,1.1,NONE
Message-ID: <20090404093348.11A697013C@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445/devel

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:34:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:34:17 +0000 (UTC)
Subject: rpms/gupnp-av/F-8 gupnp-av.spec,1.1,1.2 import.log,1.1,NONE
Message-ID: <20090404093417.A1C2F70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445/F-8

Modified Files:
	gupnp-av.spec 
Removed Files:
	import.log 
Log Message:
remove import.log


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-8/gupnp-av.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gupnp-av.spec	6 Sep 2008 14:55:14 -0000	1.1
+++ gupnp-av.spec	4 Apr 2009 09:33:47 -0000	1.2
@@ -6,7 +6,7 @@
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gupnp.org/
-Source0:        http://www.gupnp.org/sources/gupnp-av/%{name}-%{version}.tar.gz
+Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:35:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:35:42 +0000 (UTC)
Subject: rpms/gupnp-tools/F-10 import.log,1.1,NONE
Message-ID: <20090404093542.0981070130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16854/F-10

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:35:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:35:42 +0000 (UTC)
Subject: rpms/gupnp-tools/devel import.log,1.1,NONE
Message-ID: <20090404093542.6976870130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16854/devel

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:39:46 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:39:46 +0000 (UTC)
Subject: rpms/gupnp-ui/devel import.log,1.1,NONE
Message-ID: <20090404093946.599E070130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17584

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:43:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:43:30 +0000 (UTC)
Subject: rpms/gupnp-vala/devel import.log,1.1,NONE
Message-ID: <20090404094330.8207D70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18245

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:47:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:47:39 +0000 (UTC)
Subject: rpms/ptlib/F-10 import.log,1.1,NONE
Message-ID: <20090404094739.6C4E870130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19593/F-10

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:47:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:47:39 +0000 (UTC)
Subject: rpms/ptlib/F-9 import.log,1.1,NONE
Message-ID: <20090404094739.9C67070130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19593/F-9

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:48:19 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:48:19 +0000 (UTC)
Subject: rpms/tangogps/F-10 import.log,1.1,NONE
Message-ID: <20090404094819.D5EDA70130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19743/F-10

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:48:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:48:20 +0000 (UTC)
Subject: rpms/tangogps/F-9 import.log,1.1,NONE
Message-ID: <20090404094820.159197013C@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19743/F-9

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:49:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:49:15 +0000 (UTC)
Subject: rpms/gssdp/F-10 import.log,1.1,NONE
Message-ID: <20090404094915.8E91870130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19944/F-10

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:49:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:49:15 +0000 (UTC)
Subject: rpms/gssdp/F-8 import.log,1.1,NONE
Message-ID: <20090404094915.C8A8070130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19944/F-8

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 09:49:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 09:49:16 +0000 (UTC)
Subject: rpms/gssdp/F-9 import.log,1.1,NONE
Message-ID: <20090404094916.0704270130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19944/F-9

Removed Files:
	import.log 
Log Message:
remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sat Apr  4 10:03:19 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 10:03:19 +0000 (UTC)
Subject: rpms/libiphone/F-10 libiphone.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090404100319.35E5370130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22260

Modified Files:
	libiphone.spec sources 
Log Message:
Update to latest git snapshot


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/libiphone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libiphone.spec	3 Jan 2009 14:43:56 -0000	1.3
+++ libiphone.spec	4 Apr 2009 10:02:48 -0000	1.4
@@ -1,15 +1,15 @@
 # Tarfile created using git
-# git clone http://git.matt.colyer.name/2008/libiphone/
-# git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-20081201.tar.bz2
+# git clone git://github.com/MattColyer/libiphone.git
+# git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090103
-%define git_version 5cde554
+%define gitdate 20090325
+%define git_version 443edc8
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           libiphone
 Version:        0.1.0
-Release:        5.%{snapshot}%{?dist}
+Release:        11.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -17,6 +17,7 @@
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
 Source0:        %{tarfile}
+Patch0:         libiphone-fixgnutlsver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .fixgnutlsver
 
 %build
 ./autogen.sh
@@ -68,6 +70,7 @@
 %{_bindir}/libiphone-initconf
 %{_libdir}/libiphone.so.0
 %{_libdir}/libiphone.so.0.0.0
+%{_sysconfdir}/udev/rules.d/89-libiphone.rules
 %{_datadir}/hal/fdi/information/20thirdparty/31-apple-mobile-device.fdi
 
 %files devel
@@ -77,11 +80,29 @@
 %{_includedir}/libiphone
 
 %changelog
-* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-5.git5cde554
-- Actually update the sources file
+* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-11.20090325git443edc8
+- Update to latest master version
 
-* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git5cde554
-- Update to latest git snapshot
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-10.20090103git5cde554
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-9.git5cde554
+- Add back gnutls version patch
+
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-8.git5cde554
+- Upload bzipped source file
+
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-7.git5cde554
+- New git snapshot
+
+* Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-6.git8c3a01e
+- Fix devel dependency 
+
+* Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-5.git8c3a01e
+- Fix gnutls check for new rawhide version
+
+* Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git8c3a01e
+- Rebuild for pkgconfig
 
 * Tue Dec 2 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-3.git8c3a01e
 - Fix git file generation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2009 14:43:56 -0000	1.3
+++ sources	4 Apr 2009 10:02:48 -0000	1.4
@@ -1 +1 @@
-1c6950b2ddf6cf2ed103b616cde0b13a  libiphone-0.1.0-20090103.tar.bz2
+97c045662553d73e93a193dfc97bf700  libiphone-0.1.0-20090325.tar.bz2



From pbrobinson at fedoraproject.org  Sat Apr  4 10:06:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 10:06:45 +0000 (UTC)
Subject: rpms/libiphone/F-10 libiphone-fixgnutlsver.patch, NONE,
	1.1 libiphone.spec, 1.4, 1.5
Message-ID: <20090404100645.1A5F170130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22902

Modified Files:
	libiphone.spec 
Added Files:
	libiphone-fixgnutlsver.patch 
Log Message:
Add patch from devel

libiphone-fixgnutlsver.patch:

--- NEW FILE libiphone-fixgnutlsver.patch ---
--- configure.ac.orig	2008-12-08 16:20:57.000000000 +0100
+++ configure.ac	2008-12-08 16:21:07.000000000 +0100
@@ -18,7 +18,7 @@
 PKG_CHECK_MODULES(libusb, libusb >= 0.1.12)
 PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
 PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
-PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.5.0 )
+PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.7.0 )
 PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1)
 
 # Checks for header files.


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/libiphone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libiphone.spec	4 Apr 2009 10:02:48 -0000	1.4
+++ libiphone.spec	4 Apr 2009 10:06:14 -0000	1.5
@@ -9,7 +9,7 @@
 
 Name:           libiphone
 Version:        0.1.0
-Release:        11.%{snapshot}%{?dist}
+Release:        12.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -80,6 +80,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-12.20090325git443edc8
+- Add patch from devel
+
 * Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-11.20090325git443edc8
 - Update to latest master version
 



From pbrobinson at fedoraproject.org  Sat Apr  4 10:08:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 10:08:48 +0000 (UTC)
Subject: rpms/libiphone/F-9 libiphone-fixgnutlsver.patch, NONE,
	1.1 libiphone.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090404100848.3DBD570130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23403

Modified Files:
	libiphone.spec sources 
Added Files:
	libiphone-fixgnutlsver.patch 
Log Message:
Update to latest git snapshot

libiphone-fixgnutlsver.patch:

--- NEW FILE libiphone-fixgnutlsver.patch ---
--- configure.ac.orig	2008-12-08 16:20:57.000000000 +0100
+++ configure.ac	2008-12-08 16:21:07.000000000 +0100
@@ -18,7 +18,7 @@
 PKG_CHECK_MODULES(libusb, libusb >= 0.1.12)
 PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
 PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
-PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.5.0 )
+PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.7.0 )
 PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1)
 
 # Checks for header files.


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-9/libiphone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libiphone.spec	5 Jan 2009 05:10:48 -0000	1.2
+++ libiphone.spec	4 Apr 2009 10:08:17 -0000	1.3
@@ -1,15 +1,15 @@
 # Tarfile created using git
-# git clone http://git.matt.colyer.name/2008/libiphone/
-# git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-20081201.tar.bz2
+# git clone git://github.com/MattColyer/libiphone.git
+# git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090103
-%define git_version 5cde554
+%define gitdate 20090325
+%define git_version 443edc8
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           libiphone
 Version:        0.1.0
-Release:        4.%{snapshot}%{?dist}
+Release:        11.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -17,6 +17,7 @@
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
 Source0:        %{tarfile}
+Patch0:         libiphone-fixgnutlsver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .fixgnutlsver
 
 %build
 ./autogen.sh
@@ -68,6 +70,7 @@
 %{_bindir}/libiphone-initconf
 %{_libdir}/libiphone.so.0
 %{_libdir}/libiphone.so.0.0.0
+%{_sysconfdir}/udev/rules.d/89-libiphone.rules
 %{_datadir}/hal/fdi/information/20thirdparty/31-apple-mobile-device.fdi
 
 %files devel
@@ -77,8 +80,29 @@
 %{_includedir}/libiphone
 
 %changelog
-* Mon Jan 5 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git5cde554
-- Update to latest git snapshot
+* Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-11.20090325git443edc8
+- Update to latest master version
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-10.20090103git5cde554
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-9.git5cde554
+- Add back gnutls version patch
+
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-8.git5cde554
+- Upload bzipped source file
+
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-7.git5cde554
+- New git snapshot
+
+* Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-6.git8c3a01e
+- Fix devel dependency 
+
+* Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-5.git8c3a01e
+- Fix gnutls check for new rawhide version
+
+* Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git8c3a01e
+- Rebuild for pkgconfig
 
 * Tue Dec 2 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-3.git8c3a01e
 - Fix git file generation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2009 05:10:48 -0000	1.3
+++ sources	4 Apr 2009 10:08:17 -0000	1.4
@@ -1 +1 @@
-1c6950b2ddf6cf2ed103b616cde0b13a  libiphone-0.1.0-20090103.tar.bz2
+97c045662553d73e93a193dfc97bf700  libiphone-0.1.0-20090325.tar.bz2



From mbooth at fedoraproject.org  Sat Apr  4 10:21:59 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sat,  4 Apr 2009 10:21:59 +0000 (UTC)
Subject: rpms/eclipse-dltk/F-10 eclipse-dltk.spec, NONE, 1.1 get-dltk.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090404102159.AF13870130@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-dltk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26308

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-dltk.spec get-dltk.sh 
Log Message:
* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.3.M5
- Fix files listed twice warnings.

* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.2.M5
- Drop GCJ AOT support.

* Mon Mar 30 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.1.M5
- Initial release.




--- NEW FILE eclipse-dltk.spec ---
%define eclipse_base     %{_libdir}/eclipse
%define eclipse_dropin   %{_datadir}/eclipse/dropins

Name:      eclipse-dltk
Version:   1.0.0
Release:   0.3.M5%{?dist}
Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
Group:     System Environment/Libraries
License:   EPL
URL:       http://www.eclipse.org/dltk/

# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-dltk.sh
Source0:   dltk-%{version}.tar.gz
Source1:   get-dltk.sh

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

BuildRequires:    java-devel
BuildRequires:    jpackage-utils
BuildRequires:    eclipse-pde >= 1:3.4.1
BuildRequires:    eclipse-emf
BuildRequires:    eclipse-mylyn
Requires:         java
Requires:         jpackage-utils
Requires:         eclipse-platform >= 1:3.4.1

%description
Dynamic Languages Toolkit (DLTK) is a tool for vendors, researchers, and users
who rely on dynamic languages. DLTK is comprised of a set of extensible
frameworks designed to reduce the complexity of building full featured
development environments for dynamic languages such as PHP and Perl.

%package   ruby
Summary:   Ruby Eclipse plugin
Group:     Development/Tools
Requires:  %{name} = %{version}-%{release}

%description ruby
Ruby development environment for Eclipse based on the Eclipse Dynamic
Languages Toolkit (DLTK).

%package   tcl
Summary:   TCL Eclipse plugin
Group:     Development/Tools
Requires:  %{name} = %{version}-%{release}
Requires:  eclipse-emf

%description tcl
TCL development environment for Eclipse based on the Eclipse Dynamic
Languages Toolkit (DLTK).

%package   itcl
Summary:   Incr TCL extension for the TCL Eclipse plugin
Group:     Development/Tools
Requires:  %{name}-tcl = %{version}-%{release}

%description itcl
Incr TCL extension for the TCL Eclipse plugin.

%package   xotcl
Summary:   XOTCL extension for the TCL Eclipse plugin
Group:     Development/Tools
Requires:  %{name}-tcl = %{version}-%{release}

%description xotcl
XOTCL extension for the TCL Eclipse plugin.

%package   mylyn
Summary:   Mylyn integration for Eclipse DLTK projects
Group:     Development/Tools
Requires:  %{name} = %{version}-%{release}
Requires:  eclipse-mylyn

%description mylyn
Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit
(DLTK) projects.

# TODO: Remote Projects via DSDP TM integration, Python IDE, Javascript IDE

%prep
%setup -q -n dltk-%{version}

# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
  if [ ! -L $j ]; then
    JARS="$JARS $j"
  fi
done
if [ ! -z "$JARS" ]; then
   echo "These jars should be deleted and symlinked to system jars: $JARS"
   exit 1
fi

%build
# build all features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.core \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.ruby \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.tcl \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.itcl \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.xotcl \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-core  build/rpmBuild/org.eclipse.dltk.core.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-ruby  build/rpmBuild/org.eclipse.dltk.ruby.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-tcl   build/rpmBuild/org.eclipse.dltk.tcl.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-itcl  build/rpmBuild/org.eclipse.dltk.itcl.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-xotcl build/rpmBuild/org.eclipse.dltk.xotcl.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-mylyn build/rpmBuild/org.eclipse.dltk.mylyn.zip

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-core
%doc org.eclipse.dltk.core-feature/rootfiles/*

%files ruby
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-ruby
%doc org.eclipse.dltk.ruby-feature/rootfiles/*

%files tcl
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-tcl
%doc org.eclipse.dltk.tcl-feature/rootfiles/*

%files itcl
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-itcl
%doc org.eclipse.dltk.itcl-feature/rootfiles/*

%files xotcl
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-xotcl
%doc org.eclipse.dltk.xotcl-feature/rootfiles/*

%files mylyn
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-mylyn
%doc org.eclipse.dltk.mylyn-feature/rootfiles/*

%changelog
* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.3.M5
- Fix files listed twice warnings.

* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.2.M5
- Drop GCJ AOT support.

* Mon Mar 30 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.1.M5
- Initial release.


--- NEW FILE get-dltk.sh ---
#!/bin/bash
NAME="dltk"
VERSION=1.0.0
TAG="vS200902060933"
SUBPACKAGES="core ruby tcl itcl xotcl mylyn"

echo "Exporting from CVS..."
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null

for SUB in $SUBPACKAGES; do

MAPFILE=org.eclipse.dltk/releng.maps/maps/$SUB.map
TEMPMAPFILE=temp.map
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $TAG $MAPFILE
dos2unix $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE

gawk 'BEGIN {
	FS=","
}
{
if (NF <  4) {

	split($1, version, "=");
	split(version[1], directory, "@");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {

	split($1, version, "=");
	total=split($4, directory, "/");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash";
}

}' $TEMPMAPFILE

rm $TEMPMAPFILE $MAPFILE

done

popd >/dev/null

echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:40:03 -0000	1.1
+++ .cvsignore	4 Apr 2009 10:21:29 -0000	1.2
@@ -0,0 +1 @@
+dltk-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:40:03 -0000	1.1
+++ sources	4 Apr 2009 10:21:29 -0000	1.2
@@ -0,0 +1 @@
+731d4af3ffcd34aeef03da09582a1f00  dltk-1.0.0.tar.gz



From pbrobinson at fedoraproject.org  Sat Apr  4 10:22:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 10:22:49 +0000 (UTC)
Subject: rpms/ifuse/F-10 ifuse.spec,1.1,1.2
Message-ID: <20090404102249.EEB6170130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26563

Modified Files:
	ifuse.spec 
Log Message:
- Update to latest master


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/ifuse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifuse.spec	18 Dec 2008 01:11:32 -0000	1.1
+++ ifuse.spec	4 Apr 2009 10:22:19 -0000	1.2
@@ -1,15 +1,15 @@
 # Tarfile created using git
-# git clone http://git.matt.colyer.name/2008/ifuse/
+# git clone git://github.com/MattColyer/ifuse.git
 # git-archive --format=tar --prefix=ifuse-0.1.0/ %{git_version} | bzip2 > ifuse-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20081214
-%define git_version b0412bf
+%define gitdate 20090401
+%define git_version 5db1ccc
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:          ifuse
 Version:       0.1.0
-Release:       5.%{snapshot}%{?dist}
+Release:       8.%{snapshot}%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -50,10 +50,15 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 /sbin/mount.fuse.ifuse
-%{_bindir}/hal-iphone-setup
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.0-7.20090308git8d6eebb
+- Update to latest master
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-6.20081214gitb0412bf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 16 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-5
 - Review fixes
 



From mbooth at fedoraproject.org  Sat Apr  4 10:29:28 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sat,  4 Apr 2009 10:29:28 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel eclipse-dltk.spec, NONE, 1.1 get-dltk.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090404102928.871A770130@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27845

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-dltk.spec get-dltk.sh 
Log Message:
* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.3.M5
- Fix files listed twice warnings.

* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.2.M5
- Drop GCJ AOT support.

* Mon Mar 30 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.1.M5
- Initial release.




--- NEW FILE eclipse-dltk.spec ---
%define eclipse_base     %{_libdir}/eclipse
%define eclipse_dropin   %{_datadir}/eclipse/dropins

Name:      eclipse-dltk
Version:   1.0.0
Release:   0.3.M5%{?dist}
Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
Group:     System Environment/Libraries
License:   EPL
URL:       http://www.eclipse.org/dltk/

# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-dltk.sh
Source0:   dltk-%{version}.tar.gz
Source1:   get-dltk.sh

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

BuildRequires:    java-devel
BuildRequires:    jpackage-utils
BuildRequires:    eclipse-pde >= 1:3.4.1
BuildRequires:    eclipse-emf
BuildRequires:    eclipse-mylyn
Requires:         java
Requires:         jpackage-utils
Requires:         eclipse-platform >= 1:3.4.1

%description
Dynamic Languages Toolkit (DLTK) is a tool for vendors, researchers, and users
who rely on dynamic languages. DLTK is comprised of a set of extensible
frameworks designed to reduce the complexity of building full featured
development environments for dynamic languages such as PHP and Perl.

%package   ruby
Summary:   Ruby Eclipse plugin
Group:     Development/Tools
Requires:  %{name} = %{version}-%{release}

%description ruby
Ruby development environment for Eclipse based on the Eclipse Dynamic
Languages Toolkit (DLTK).

%package   tcl
Summary:   TCL Eclipse plugin
Group:     Development/Tools
Requires:  %{name} = %{version}-%{release}
Requires:  eclipse-emf

%description tcl
TCL development environment for Eclipse based on the Eclipse Dynamic
Languages Toolkit (DLTK).

%package   itcl
Summary:   Incr TCL extension for the TCL Eclipse plugin
Group:     Development/Tools
Requires:  %{name}-tcl = %{version}-%{release}

%description itcl
Incr TCL extension for the TCL Eclipse plugin.

%package   xotcl
Summary:   XOTCL extension for the TCL Eclipse plugin
Group:     Development/Tools
Requires:  %{name}-tcl = %{version}-%{release}

%description xotcl
XOTCL extension for the TCL Eclipse plugin.

%package   mylyn
Summary:   Mylyn integration for Eclipse DLTK projects
Group:     Development/Tools
Requires:  %{name} = %{version}-%{release}
Requires:  eclipse-mylyn

%description mylyn
Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit
(DLTK) projects.

# TODO: Remote Projects via DSDP TM integration, Python IDE, Javascript IDE

%prep
%setup -q -n dltk-%{version}

# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
  if [ ! -L $j ]; then
    JARS="$JARS $j"
  fi
done
if [ ! -z "$JARS" ]; then
   echo "These jars should be deleted and symlinked to system jars: $JARS"
   exit 1
fi

%build
# build all features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.core \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.ruby \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.tcl \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.itcl \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.xotcl \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn \
  -d "emf mylyn" -a "-DjavacTarget=1.5 -DjavacSource=1.5"

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-core  build/rpmBuild/org.eclipse.dltk.core.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-ruby  build/rpmBuild/org.eclipse.dltk.ruby.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-tcl   build/rpmBuild/org.eclipse.dltk.tcl.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-itcl  build/rpmBuild/org.eclipse.dltk.itcl.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-xotcl build/rpmBuild/org.eclipse.dltk.xotcl.zip
unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-mylyn build/rpmBuild/org.eclipse.dltk.mylyn.zip

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-core
%doc org.eclipse.dltk.core-feature/rootfiles/*

%files ruby
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-ruby
%doc org.eclipse.dltk.ruby-feature/rootfiles/*

%files tcl
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-tcl
%doc org.eclipse.dltk.tcl-feature/rootfiles/*

%files itcl
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-itcl
%doc org.eclipse.dltk.itcl-feature/rootfiles/*

%files xotcl
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-xotcl
%doc org.eclipse.dltk.xotcl-feature/rootfiles/*

%files mylyn
%defattr(-,root,root,-)
%{eclipse_dropin}/dltk-mylyn
%doc org.eclipse.dltk.mylyn-feature/rootfiles/*

%changelog
* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.3.M5
- Fix files listed twice warnings.

* Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.2.M5
- Drop GCJ AOT support.

* Mon Mar 30 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.1.M5
- Initial release.


--- NEW FILE get-dltk.sh ---
#!/bin/bash
NAME="dltk"
VERSION=1.0.0
TAG="vS200902060933"
SUBPACKAGES="core ruby tcl itcl xotcl mylyn"

echo "Exporting from CVS..."
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null

for SUB in $SUBPACKAGES; do

MAPFILE=org.eclipse.dltk/releng.maps/maps/$SUB.map
TEMPMAPFILE=temp.map
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $TAG $MAPFILE
dos2unix $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE

gawk 'BEGIN {
	FS=","
}
{
if (NF <  4) {

	split($1, version, "=");
	split(version[1], directory, "@");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {

	split($1, version, "=");
	total=split($4, directory, "/");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash";
}

}' $TEMPMAPFILE

rm $TEMPMAPFILE $MAPFILE

done

popd >/dev/null

echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:40:03 -0000	1.1
+++ .cvsignore	4 Apr 2009 10:28:58 -0000	1.2
@@ -0,0 +1 @@
+dltk-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:40:03 -0000	1.1
+++ sources	4 Apr 2009 10:28:58 -0000	1.2
@@ -0,0 +1 @@
+731d4af3ffcd34aeef03da09582a1f00  dltk-1.0.0.tar.gz



From pbrobinson at fedoraproject.org  Sat Apr  4 10:34:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 10:34:10 +0000 (UTC)
Subject: rpms/ifuse/F-10 ifuse.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090404103410.67BF470130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28643

Modified Files:
	ifuse.spec sources 
Log Message:
- Update to latest master


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/ifuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ifuse.spec	4 Apr 2009 10:22:19 -0000	1.2
+++ ifuse.spec	4 Apr 2009 10:33:39 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:          ifuse
 Version:       0.1.0
-Release:       8.%{snapshot}%{?dist}
+Release:       9.%{snapshot}%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -53,7 +53,10 @@
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
-* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.0-7.20090308git8d6eebb
+* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.0-9.20090308git8d6eebb
+- Update the sources file!
+
+* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.0-8.20090308git8d6eebb
 - Update to latest master
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-6.20081214gitb0412bf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 01:11:32 -0000	1.2
+++ sources	4 Apr 2009 10:33:39 -0000	1.3
@@ -1 +1 @@
-c9fba4c717ee4e3cc334d9e053110786  ifuse-0.1.0-20081214.tar.bz2
+dcc7efe1b983ca28089494bccdff5e8e  ifuse-0.1.0-20090401.tar.bz2



From pbrobinson at fedoraproject.org  Sat Apr  4 10:34:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  4 Apr 2009 10:34:40 +0000 (UTC)
Subject: rpms/ifuse/F-9 ifuse.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090404103440.90C6070130@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28747

Modified Files:
	ifuse.spec sources 
Log Message:
- Update to latest master


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-9/ifuse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifuse.spec	18 Dec 2008 01:22:37 -0000	1.1
+++ ifuse.spec	4 Apr 2009 10:34:09 -0000	1.2
@@ -1,15 +1,15 @@
 # Tarfile created using git
-# git clone http://git.matt.colyer.name/2008/ifuse/
+# git clone git://github.com/MattColyer/ifuse.git
 # git-archive --format=tar --prefix=ifuse-0.1.0/ %{git_version} | bzip2 > ifuse-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20081214
-%define git_version b0412bf
+%define gitdate 20090401
+%define git_version 5db1ccc
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:          ifuse
 Version:       0.1.0
-Release:       5.%{snapshot}%{?dist}
+Release:       8.%{snapshot}%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -50,10 +50,15 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 /sbin/mount.fuse.ifuse
-%{_bindir}/hal-iphone-setup
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Sat Apr 04 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.0-8.20090308git8d6eebb
+- Update to latest master
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-6.20081214gitb0412bf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 16 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-5
 - Review fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 01:22:37 -0000	1.2
+++ sources	4 Apr 2009 10:34:10 -0000	1.3
@@ -1 +1 @@
-c9fba4c717ee4e3cc334d9e053110786  ifuse-0.1.0-20081214.tar.bz2
+dcc7efe1b983ca28089494bccdff5e8e  ifuse-0.1.0-20090401.tar.bz2



From scop at fedoraproject.org  Sat Apr  4 11:20:23 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  4 Apr 2009 11:20:23 +0000 (UTC)
Subject: rpms/rpmdevtools/EL-5 .cvsignore, 1.5, 1.6 rpmdevtools.spec, 1.6,
	1.7 sources, 1.6, 1.7 rpmdevtools-5.3-el53-conflict.patch, 1.1, NONE
Message-ID: <20090404112023.ED51270130@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5357

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Removed Files:
	rpmdevtools-5.3-el53-conflict.patch 
Log Message:
* Fri Apr  3 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6.8-1
- 6.8.

* Sun Feb 22 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Use %%global instead of %%define in spec templates.
- Handle %%global in addition to %%define in rpmdev-bumpspec.

* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add result dependent exit statuses to rpmdev-vercmp.

* Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
- Add man page for rpmdev-newspec.

* Tue Dec 16 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add imake and intltool to internal list of devel packages in rmdevelrpms.

* Sat Dec 13 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).

* Wed Nov 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms
  (#472641, Michael Schwendt).

* Mon Oct 13 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).

* Fri Sep 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis).
- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's
  user string.

* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).

* Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Improve arch specific %%files in perl spec template (#461177, Chris Weyl).

* Sun Aug  3 2008 Ville Skytt?? <ville.skytta at iki.fi> - 6.7-1
- 6.7.
- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.

* Sat Apr 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Make rpmls work with URLs.

* Sun Apr 20 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Include rpm arch in dir names created by rpmdev-extract (#443266).

* Fri Apr 18 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Remove duplicate "reload" from case block in init script template.
- Fix exit status of "reload" in case service is not running in init
  script template (#442993).

* Thu Mar 27 2008 Ville Skytt?? <ville.skytta at iki.fi> - 6.6-1
- Fix man page generation.

* Wed Mar 26 2008 Ville Skytt?? <ville.skytta at iki.fi> - 6.5-1
- 6.5.

* Sun Mar 23 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Generate man pages at build time.

* Sat Mar 22 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion
  list, they're not essential on non-devel systems any more.

* Mon Mar 17 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Include ocaml spec template.

* Tue Mar 11 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec).

* Tue Feb 12 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Sync with qa-robot upstream.
- Update spectool to 1.0.10.

* Sun Feb  3 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add support for 7-zip, lzma and lzo in rpmdev-extract.

* Fri Feb  1 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add ';;' to the init script template's reload action.
* Sat Dec  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Add option to use macro style instead of shell style variables to newspec.
- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in
  rmdevelrpms.

* Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.4-1
- Import the previous fix into CVS to resync, bump version

* Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.3-1
- Fix paths in qa-robot tools

* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 6.2-1
- Sync deps with Fedora's new "assumed present in buildroots" packages list.

* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Init script template cleanups.

* Tue Aug 28 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Update rpminfo to version 2004-07-07-02.

* Fri Aug 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 6.1-1
- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Work around #250990 in rpmls and rpmdev-extract.
- Clarify copyright info of rpmdev-* and rpmls.

* Sat Jul  7 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
- The long form of the list option in rmdevelrpms is --list-only, not --list.

* Thu Jul  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 6.0-1
- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
- Drop explicit dependency on patch, pulled in by recent rpm-build.
- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
- Add LSB comment block to init script template.

* Wed Jun 27 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Add 2-argument form for comparing EVR strings to rpmdev-vercmp
  (available only if rpmUtils.miscutils is available).

* Sat Jun 16 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
  rpmsoname) from ALT Linux's qa-robot package.
- Include rpmls (#213778).

* Fri Jun 15 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Update spectool to 1.0.9 (#243731).

* Wed Apr 11 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).

* Tue Mar 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
- Update URL.

* Wed Nov  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Arch-qualify output of matched packages in rmdevelrpms and allow
  arch-qualified packages in the config file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Oct 2006 12:26:07 -0000	1.5
+++ .cvsignore	4 Apr 2009 11:19:52 -0000	1.6
@@ -1,2 +1,2 @@
-rpmdevtools-5.3.tar.bz2
-spectool-1.0.8.tar.bz2
+spectool-1.0.10.tar.bz2
+rpmdevtools-6.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/EL-5/rpmdevtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmdevtools.spec	1 Jan 2009 18:32:15 -0000	1.6
+++ rpmdevtools.spec	4 Apr 2009 11:19:52 -0000	1.7
@@ -1,30 +1,60 @@
-%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.8
+%global emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
+%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        5.3
-Release:        2%{?dist}
+Version:        6.8
+Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
-License:        GPL
-URL:            http://fedora.redhat.com/
-Source0:        %{name}-%{version}.tar.bz2
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License:        GPLv2+ and GPLv2
+URL:            https://fedorahosted.org/rpmdevtools/
+Source0:        https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
-# Avoid conflict with EL 5.3 rpm, #466939
-Patch0:         %{name}-5.3-el53-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+# All build deps for man page generation
+BuildRequires:  help2man
+BuildRequires:  %{_bindir}/pod2man
+BuildRequires:  python
+BuildRequires:  rpm-python
 Provides:       spectool = %{spectool_version}
 Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl, wget, file
 # Minimal RPM build requirements
-Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
-Requires:       diffutils, gzip, bzip2, unzip
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
+Requires:       gcc
+Requires:       gcc-c++
+Requires:       grep
+Requires:       gzip
+Requires:       info
+Requires:       make
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build >= 4.4.2.1
+Requires:       sed
+Requires:       tar
+Requires:       unzip
+Requires:       util-linux
+Requires:       which
+# Additionally required for tool operations
+#Requires:      cpio
+Requires:       fakeroot
+Requires:       file
+Requires:       perl
+Requires:       python
+Requires:       rpm-python >= 4.4.2.2
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -35,16 +65,17 @@
 rpmdev-rmdevelrpms  Find (and optionally remove) "development" RPMs
 rpmdev-checksig     Check package signatures using alternate RPM keyring
 rpminfo             Print information about executables and libraries
-rpmdev-md5          Display the md5sum of all files in an RPM
+rpmdev-md5/sha*     Display checksums of all files in an RPM package file
 rpmdev-vercmp       RPM version comparison checker
 spectool            Expand and download sources and patches in specfiles
 rpmdev-wipetree     Erase all files within dirs created by rpmdev-setuptree
 rpmdev-extract      Extract various archives, "tar xvf" style
+rpmdev-bumpspec     Bump revision in specfile
+...and many more.
 
 
 %prep
 %setup -q -a 1
-%patch0 -p1
 cp -p spectool*/README README.spectool
 
 
@@ -79,10 +110,6 @@
 ln -s rpminfo            $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
 
 
-%check
-make check
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -116,15 +143,155 @@
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_datadir}/rpmdevtools/
-%{_bindir}/*
-%{_prefix}/lib/rpm/check-*
+%{_bindir}/fedora-*
+%{_bindir}/rpm*
+%{_bindir}/spectool
 %ghost %{_datadir}/*emacs
-%{_mandir}/man?/*.*
+%{_mandir}/man[18]/rpm*.[18]*
 
 
 %changelog
-* Thu Jan  1 2009 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-2
-- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).
+* Fri Apr  3 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6.8-1
+- 6.8.
+
+* Sun Feb 22 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Use %%global instead of %%define in spec templates.
+- Handle %%global in addition to %%define in rpmdev-bumpspec.
+
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add result dependent exit statuses to rpmdev-vercmp.
+
+* Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
+- Add man page for rpmdev-newspec.
+
+* Tue Dec 16 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add imake and intltool to internal list of devel packages in rmdevelrpms.
+
+* Sat Dec 13 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).
+
+* Wed Nov 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms
+  (#472641, Michael Schwendt).
+
+* Mon Oct 13 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).
+
+* Fri Sep 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis).
+- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's
+  user string.
+
+* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).
+
+* Sun Sep  7 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Improve arch specific %%files in perl spec template (#461177, Chris Weyl).
+
+* Sun Aug  3 2008 Ville Skytt?? <ville.skytta at iki.fi> - 6.7-1
+- 6.7.
+- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.
+
+* Sat Apr 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Make rpmls work with URLs.
+
+* Sun Apr 20 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Include rpm arch in dir names created by rpmdev-extract (#443266).
+
+* Fri Apr 18 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Remove duplicate "reload" from case block in init script template.
+- Fix exit status of "reload" in case service is not running in init
+  script template (#442993).
+
+* Thu Mar 27 2008 Ville Skytt?? <ville.skytta at iki.fi> - 6.6-1
+- Fix man page generation.
+
+* Wed Mar 26 2008 Ville Skytt?? <ville.skytta at iki.fi> - 6.5-1
+- 6.5.
+
+* Sun Mar 23 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Generate man pages at build time.
+
+* Sat Mar 22 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion
+  list, they're not essential on non-devel systems any more.
+
+* Mon Mar 17 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Include ocaml spec template.
+
+* Tue Mar 11 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec).
+
+* Tue Feb 12 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Sync with qa-robot upstream.
+- Update spectool to 1.0.10.
+
+* Sun Feb  3 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add support for 7-zip, lzma and lzo in rpmdev-extract.
+
+* Fri Feb  1 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add ';;' to the init script template's reload action.
+
+* Sat Dec  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Add option to use macro style instead of shell style variables to newspec.
+- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in
+  rmdevelrpms.
+
+* Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.4-1
+- Import the previous fix into CVS to resync, bump version
+
+* Fri Oct 12 2007 Lubomir Kundrak <lkundrak at redhat.com> - 6.3-1
+- Fix paths in qa-robot tools
+
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 6.2-1
+- Sync deps with Fedora's new "assumed present in buildroots" packages list.
+
+* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Init script template cleanups.
+
+* Tue Aug 28 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Update rpminfo to version 2004-07-07-02.
+
+* Fri Aug 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 6.1-1
+- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Work around #250990 in rpmls and rpmdev-extract.
+- Clarify copyright info of rpmdev-* and rpmls.
+
+* Sat Jul  7 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
+- The long form of the list option in rmdevelrpms is --list-only, not --list.
+
+* Thu Jul  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 6.0-1
+- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
+- Drop explicit dependency on patch, pulled in by recent rpm-build.
+- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
+- Add LSB comment block to init script template.
+
+* Wed Jun 27 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Add 2-argument form for comparing EVR strings to rpmdev-vercmp
+  (available only if rpmUtils.miscutils is available).
+
+* Sat Jun 16 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
+  rpmsoname) from ALT Linux's qa-robot package.
+- Include rpmls (#213778).
+
+* Fri Jun 15 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Update spectool to 1.0.9 (#243731).
+
+* Wed Apr 11 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
+
+* Tue Mar 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
+- Update URL.
+
+* Wed Nov  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Arch-qualify output of matched packages in rmdevelrpms and allow
+  arch-qualified packages in the config file.
 
 * Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
 - Update spectool to 1.0.8, fixes #212108.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Oct 2006 12:26:07 -0000	1.6
+++ sources	4 Apr 2009 11:19:52 -0000	1.7
@@ -1,2 +1,2 @@
-4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
-42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2
+d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
+32a879de3650642a75e58f61f3b07d8e  rpmdevtools-6.8.tar.bz2


--- rpmdevtools-5.3-el53-conflict.patch DELETED ---



From thias at fedoraproject.org  Sat Apr  4 11:22:08 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat,  4 Apr 2009 11:22:08 +0000 (UTC)
Subject: rpms/lighttpd/EL-5 .cvsignore, 1.22, 1.23 lighttpd.spec, 1.39,
	1.40 sources, 1.22, 1.23
Message-ID: <20090404112208.8014570130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821/EL-5

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update all current branches to 1.4.22 (already on devel).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	24 Dec 2008 17:27:17 -0000	1.22
+++ .cvsignore	4 Apr 2009 11:21:38 -0000	1.23
@@ -1 +1 @@
-lighttpd-1.4.20.tar.bz2
+lighttpd-1.4.22.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- lighttpd.spec	25 Dec 2008 17:11:03 -0000	1.39
+++ lighttpd.spec	4 Apr 2009 11:21:38 -0000	1.40
@@ -5,8 +5,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.20
-Release: 6%{?dist}
+Version: 1.4.22
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -238,10 +238,24 @@
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files -n spawn-fcgi
+%defattr(-,root,root,-)
 %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
+- Update to 1.4.22.
+- Add missing defattr for the spawn-fcgi package.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Matthias Saou <http://freshrpms.net/> 1.4.21-1
+- Update to 1.4.21.
+
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 1.4.20-7
+- rebuild for dependencies
+
 * Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
 - Partially revert last change by creating a "spawn-fastcgi" symlink, so that
   nothing breaks currently (especially for EL).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	24 Dec 2008 17:27:17 -0000	1.22
+++ sources	4 Apr 2009 11:21:38 -0000	1.23
@@ -1 +1 @@
-ed6ee0bb714f393219a32768d86984d8  lighttpd-1.4.20.tar.bz2
+ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2



From thias at fedoraproject.org  Sat Apr  4 11:22:08 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat,  4 Apr 2009 11:22:08 +0000 (UTC)
Subject: rpms/lighttpd/EL-4 .cvsignore, 1.9, 1.10 lighttpd.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090404112208.5B66870130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821/EL-4

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update all current branches to 1.4.22 (already on devel).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Dec 2008 17:35:30 -0000	1.9
+++ .cvsignore	4 Apr 2009 11:21:37 -0000	1.10
@@ -1 +1 @@
-lighttpd-1.4.20.tar.bz2
+lighttpd-1.4.22.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lighttpd.spec	25 Dec 2008 17:11:03 -0000	1.13
+++ lighttpd.spec	4 Apr 2009 11:21:37 -0000	1.14
@@ -5,8 +5,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.20
-Release: 6%{?dist}
+Version: 1.4.22
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -238,10 +238,24 @@
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files -n spawn-fcgi
+%defattr(-,root,root,-)
 %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
+- Update to 1.4.22.
+- Add missing defattr for the spawn-fcgi package.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Matthias Saou <http://freshrpms.net/> 1.4.21-1
+- Update to 1.4.21.
+
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 1.4.20-7
+- rebuild for dependencies
+
 * Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
 - Partially revert last change by creating a "spawn-fastcgi" symlink, so that
   nothing breaks currently (especially for EL).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Dec 2008 17:35:30 -0000	1.9
+++ sources	4 Apr 2009 11:21:37 -0000	1.10
@@ -1 +1 @@
-ed6ee0bb714f393219a32768d86984d8  lighttpd-1.4.20.tar.bz2
+ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2



From thias at fedoraproject.org  Sat Apr  4 11:22:09 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat,  4 Apr 2009 11:22:09 +0000 (UTC)
Subject: rpms/lighttpd/F-9 .cvsignore, 1.24, 1.25 lighttpd.spec, 1.49,
	1.50 sources, 1.24, 1.25
Message-ID: <20090404112209.8770F70130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821/F-9

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update all current branches to 1.4.22 (already on devel).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-9/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Oct 2008 15:00:09 -0000	1.24
+++ .cvsignore	4 Apr 2009 11:21:38 -0000	1.25
@@ -1 +1 @@
-lighttpd-1.4.20.tar.bz2
+lighttpd-1.4.22.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-9/lighttpd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- lighttpd.spec	26 Dec 2008 11:11:18 -0000	1.49
+++ lighttpd.spec	4 Apr 2009 11:21:39 -0000	1.50
@@ -5,8 +5,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.20
-Release: 6%{?dist}
+Version: 1.4.22
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -238,10 +238,24 @@
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files -n spawn-fcgi
+%defattr(-,root,root,-)
 %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
+- Update to 1.4.22.
+- Add missing defattr for the spawn-fcgi package.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Matthias Saou <http://freshrpms.net/> 1.4.21-1
+- Update to 1.4.21.
+
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 1.4.20-7
+- rebuild for dependencies
+
 * Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
 - Partially revert last change by creating a "spawn-fastcgi" symlink, so that
   nothing breaks currently (especially for EL).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Oct 2008 15:00:09 -0000	1.24
+++ sources	4 Apr 2009 11:21:39 -0000	1.25
@@ -1 +1 @@
-ed6ee0bb714f393219a32768d86984d8  lighttpd-1.4.20.tar.bz2
+ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2



From thias at fedoraproject.org  Sat Apr  4 11:22:08 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat,  4 Apr 2009 11:22:08 +0000 (UTC)
Subject: rpms/lighttpd/F-10 .cvsignore, 1.25, 1.26 lighttpd.spec, 1.50,
	1.51 sources, 1.25, 1.26
Message-ID: <20090404112208.DEF8E70130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821/F-10

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update all current branches to 1.4.22 (already on devel).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Oct 2008 14:48:29 -0000	1.25
+++ .cvsignore	4 Apr 2009 11:21:38 -0000	1.26
@@ -1 +1 @@
-lighttpd-1.4.20.tar.bz2
+lighttpd-1.4.22.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/lighttpd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- lighttpd.spec	26 Dec 2008 11:11:16 -0000	1.50
+++ lighttpd.spec	4 Apr 2009 11:21:38 -0000	1.51
@@ -5,8 +5,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.20
-Release: 6%{?dist}
+Version: 1.4.22
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -238,10 +238,24 @@
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files -n spawn-fcgi
+%defattr(-,root,root,-)
 %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
+- Update to 1.4.22.
+- Add missing defattr for the spawn-fcgi package.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Matthias Saou <http://freshrpms.net/> 1.4.21-1
+- Update to 1.4.21.
+
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 1.4.20-7
+- rebuild for dependencies
+
 * Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
 - Partially revert last change by creating a "spawn-fastcgi" symlink, so that
   nothing breaks currently (especially for EL).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Oct 2008 14:48:29 -0000	1.25
+++ sources	4 Apr 2009 11:21:38 -0000	1.26
@@ -1 +1 @@
-ed6ee0bb714f393219a32768d86984d8  lighttpd-1.4.20.tar.bz2
+ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2



From iarnell at fedoraproject.org  Sat Apr  4 11:48:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat,  4 Apr 2009 11:48:46 +0000 (UTC)
Subject: rpms/perl-Data-Dump-Streamer/devel .cvsignore, 1.2,
	1.3 perl-Data-Dump-Streamer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090404114847.3F6F370130@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Data-Dump-Streamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28192

Modified Files:
	.cvsignore perl-Data-Dump-Streamer.spec sources 
Log Message:
* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Dec 2008 04:51:42 -0000	1.2
+++ .cvsignore	4 Apr 2009 11:48:15 -0000	1.3
@@ -1 +1 @@
-Data-Dump-Streamer-2.08-40.tar.gz
+Data-Dump-Streamer-2.09.tar.gz


Index: perl-Data-Dump-Streamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/devel/perl-Data-Dump-Streamer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Dump-Streamer.spec	26 Feb 2009 14:27:01 -0000	1.2
+++ perl-Data-Dump-Streamer.spec	4 Apr 2009 11:48:15 -0000	1.3
@@ -1,12 +1,11 @@
 Name:           perl-Data-Dump-Streamer
-Version:        2.08
-%define         tarversion %{version}-40
-Release:        2%{?dist}
+Version:        2.09
+Release:        1%{?dist}
 Summary:        Accurately serialize a data structure as Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Dump-Streamer/
-Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{tarversion}.tar.gz
+Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(B::Utils) >= 0.05
 BuildRequires:  perl(Compress::Zlib)
@@ -30,7 +29,7 @@
 output correctly.
 
 %prep
-%setup -q -n Data-Dump-Streamer-%{tarversion}
+%setup -q -n Data-Dump-Streamer-%{version}
 find . -type f | xargs chmod -x
 
 # Strip out private provides/requires
@@ -39,7 +38,7 @@
 %{__perl_provides} $* |\
 sed -e '/perl(Data::Dump::Streamer::_::/d'
 EOF
-%define __perl_provides %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-prov
+%define __perl_provides %{_builddir}/Data-Dump-Streamer-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-req
@@ -47,7 +46,7 @@
 %{__perl_requires} $* |\
 sed -e '/perl(Data::Dump::Streamer::_::/d'
 EOF
-%define __perl_requires %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-req
+%define __perl_requires %{_builddir}/Data-Dump-Streamer-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 
@@ -80,6 +79,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
+- update to latest upstream
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Dec 2008 04:51:43 -0000	1.2
+++ sources	4 Apr 2009 11:48:15 -0000	1.3
@@ -1 +1 @@
-162dc81be6df36d184e516b8ef4b7701  Data-Dump-Streamer-2.08-40.tar.gz
+d29efdba63bb0944fdf998dfef88faa2  Data-Dump-Streamer-2.09.tar.gz



From scop at fedoraproject.org  Sat Apr  4 11:48:50 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  4 Apr 2009 11:48:50 +0000 (UTC)
Subject: rpms/rpmdevtools/devel .cvsignore, 1.14, 1.15 rpmdevtools.spec, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <20090404114850.8C9EA70130@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28225

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Sat Apr  4 2009 Ville Skytt?? <ville.skytta at iki.fi> - 7.1-1
- 7.1.
- Make rpmdev-md5 and friends work on non-srpm package files too.

* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add bash completion.

* Mon Mar  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add query format option to rmdevelrpms, sort output by NEVRA.

* Sun Feb 22 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Use %%global instead of %%define in spec templates.
- Handle %%global in addition to %%define in rpmdev-bumpspec.

* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add result dependent exit statuses to rpmdev-vercmp.

* Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Dec 2008 10:57:15 -0000	1.14
+++ .cvsignore	4 Apr 2009 11:48:20 -0000	1.15
@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-7.0.tar.lzma
+rpmdevtools-7.1.tar.lzma


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmdevtools.spec	25 Feb 2009 20:29:35 -0000	1.15
+++ rpmdevtools.spec	4 Apr 2009 11:48:20 -0000	1.16
@@ -1,17 +1,17 @@
-%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.10
+%global emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
+%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.0
-Release:        2%{?dist}
+Version:        7.1
+Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.lzma
+Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,9 +31,11 @@
 Requires:       gawk
 Requires:       grep
 Requires:       rpm-build >= 4.4.2.1
-Requires:       rpm-python
+Requires:       rpm-python >= 4.4.2.2
 Requires:       sed
 Requires:       wget
+# For _get_cword in bash completion snippet
+Conflicts:      bash-completion < 20080705
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -100,6 +102,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
+%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
 %{_bindir}/rpm*
 %{_bindir}/spectool
@@ -108,8 +111,25 @@
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sat Apr  4 2009 Ville Skytt?? <ville.skytta at iki.fi> - 7.1-1
+- 7.1.
+- Make rpmdev-md5 and friends work on non-srpm package files too.
+
+* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add bash completion.
+
+* Mon Mar  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add query format option to rmdevelrpms, sort output by NEVRA.
+
+* Sun Feb 22 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Use %%global instead of %%define in spec templates.
+- Handle %%global in addition to %%define in rpmdev-bumpspec.
+
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add result dependent exit statuses to rpmdev-vercmp.
+
+* Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
 
 * Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi> - 7.0-1
 - 7.0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Dec 2008 10:57:15 -0000	1.15
+++ sources	4 Apr 2009 11:48:20 -0000	1.16
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-ccdff99d03845ab8ea294a702b5f6681  rpmdevtools-7.0.tar.lzma
+0d0e9fa78d3f5cfe09c25cf69d629ba2  rpmdevtools-7.1.tar.lzma



From abompard at fedoraproject.org  Sat Apr  4 14:34:20 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  4 Apr 2009 14:34:20 +0000 (UTC)
Subject: rpms/spring-installer/devel
	spring-installer-20090316-systemcamlzip.patch, 1.1,
	1.2 spring-installer.spec, 1.3, 1.4
Message-ID: <20090404143420.CCCCF70130@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring-installer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27441

Modified Files:
	spring-installer-20090316-systemcamlzip.patch 
	spring-installer.spec 
Log Message:
* Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-6
- fix patch and buildreq


spring-installer-20090316-systemcamlzip.patch:

Index: spring-installer-20090316-systemcamlzip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/devel/spring-installer-20090316-systemcamlzip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spring-installer-20090316-systemcamlzip.patch	18 Mar 2009 06:52:11 -0000	1.1
+++ spring-installer-20090316-systemcamlzip.patch	4 Apr 2009 14:34:19 -0000	1.2
@@ -1,12 +1,12 @@
 diff -up ./Makefile.systemcamlzip ./Makefile
---- ./Makefile.systemcamlzip	2009-03-17 21:51:18.000000000 +0100
-+++ ./Makefile	2009-03-17 21:52:16.000000000 +0100
+--- ./Makefile.systemcamlzip	2009-03-16 11:53:54.000000000 +0100
++++ ./Makefile	2009-04-04 11:19:10.000000000 +0200
 @@ -35,7 +35,7 @@ endif
  all: spring-installer ca-installer
  
  CAMLZIP = camlzip-1.04
 -CAMLZIP_FLAGS = -I $(CAMLZIP) zip.cmxa
-+CAMLZIP_FLAGS = zip.cmxa
++CAMLZIP_FLAGS = $(shell ocamlfind query -predicates "native,archive,mt" -format "-I %d %a" zip) zip.cmxa
  
  CAMLSEVENZIP = camlsevenzip
  CAMLSEVENZIP_FLAGS = -I $(CAMLSEVENZIP) sevenzip.cmxa


Index: spring-installer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/devel/spring-installer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spring-installer.spec	4 Apr 2009 08:26:43 -0000	1.3
+++ spring-installer.spec	4 Apr 2009 14:34:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           spring-installer
 Version:        20090316
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Installer for the Spring game's maps and mods
 
 Group:          Amusements/Games
@@ -14,7 +14,7 @@
 BuildRequires:  ocaml-ocamlnet-devel, ocaml-pcre-devel, chrpath, desktop-file-utils
 BuildRequires:  gtk2-devel
 %if 0%{?fedora} >= 11
-BuildRequires:  ocaml-zip >= 1.04
+BuildRequires:  ocaml-zip-devel >= 1.04
 %endif
 
 # For execstack
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-6
+- fix patch and buildreq
+
 * Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-5
 - fix versioned dependency
 



From kanarip at fedoraproject.org  Sat Apr  4 14:48:44 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sat,  4 Apr 2009 14:48:44 +0000 (UTC)
Subject: rpms/grib_api/devel grib_api.spec,1.5,1.6 import.log,1.2,1.3
Message-ID: <20090404144844.2D04470130@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/grib_api/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29839/devel

Modified Files:
	grib_api.spec import.log 
Log Message:
1.7.0-2


Index: grib_api.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/grib_api.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grib_api.spec	1 Apr 2009 08:13:20 -0000	1.5
+++ grib_api.spec	4 Apr 2009 14:48:13 -0000	1.6
@@ -19,7 +19,7 @@
 
 %package devel
 Summary:    GRIB API development headers
-Group:      Development/Libraries
+Group:      Development/Languages
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-static = %{version}-%{release}
 
@@ -28,7 +28,7 @@
 
 %package static
 Summary:    GRIB API static libraries
-Group:      Development/Libraries
+Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-devel = %{version}-%{release}
 
@@ -52,6 +52,9 @@
     iconv -f ISO88591 -t utf-8 $file > $file.new && mv $file.new $file || rm -f $file.new
 done
 
+# Move %{_bindir}/parser because it conflicts with coda-client
+mv %{buildroot}/%{_bindir}/parser %{buildroot}/%{_bindir}/grib-parser
+
 # Give these files some normal permissions
 chmod 644 INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
 
@@ -61,7 +64,6 @@
 %files
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%dir %{_datadir}/%{name}
 %doc %{_datadir}/%{name}/samples/
 %doc %{_datadir}/%{name}/definitions/
 %{_bindir}/*
@@ -69,7 +71,7 @@
 %files devel
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%{_includedir}/*
+%{_prefix}/include/*
 
 %files static
 %defattr(-,root,root,-)
@@ -77,10 +79,8 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7.0-2
-- Fix unowned directory.
-- Fix subpackage Group tags.
-- Use %%_includedir in files section.
+* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-2
+- Fix file conflict (#492936)
 
 * Tue Mar 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-1
 - New upstream version


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Mar 2009 03:05:01 -0000	1.2
+++ import.log	4 Apr 2009 14:48:13 -0000	1.3
@@ -1,2 +1,3 @@
 grib_api-1_6_1-1_fc10:HEAD:grib_api-1.6.1-1.fc10.src.rpm:1222729912
 grib_api-1_7_0-1_fc11:HEAD:grib_api-1.7.0-1.fc11.src.rpm:1237345477
+grib_api-1_7_0-2_fc11:HEAD:grib_api-1.7.0-2.fc11.src.rpm:1238856479



From kanarip at fedoraproject.org  Sat Apr  4 14:54:20 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sat,  4 Apr 2009 14:54:20 +0000 (UTC)
Subject: rpms/grib_api/devel grib_api.spec,1.6,1.7 import.log,1.3,1.4
Message-ID: <20090404145420.2A5C770130@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/grib_api/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31182/devel

Modified Files:
	grib_api.spec import.log 
Log Message:
1.7.0-3


Index: grib_api.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/grib_api.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grib_api.spec	4 Apr 2009 14:48:13 -0000	1.6
+++ grib_api.spec	4 Apr 2009 14:53:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grib_api
 Version:        1.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        WMO FM-92 GRIB (v1,v2) interface accessible from C and FORTRAN programs
 
 Group:          Applications/System
@@ -79,7 +79,7 @@
 %{_libdir}/*.a
 
 %changelog
-* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-2
+* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-3
 - Fix file conflict (#492936)
 
 * Tue Mar 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Apr 2009 14:48:13 -0000	1.3
+++ import.log	4 Apr 2009 14:53:49 -0000	1.4
@@ -1,3 +1,4 @@
 grib_api-1_6_1-1_fc10:HEAD:grib_api-1.6.1-1.fc10.src.rpm:1222729912
 grib_api-1_7_0-1_fc11:HEAD:grib_api-1.7.0-1.fc11.src.rpm:1237345477
 grib_api-1_7_0-2_fc11:HEAD:grib_api-1.7.0-2.fc11.src.rpm:1238856479
+grib_api-1_7_0-3_fc11:HEAD:grib_api-1.7.0-3.fc11.src.rpm:1238856815



From kkofler at fedoraproject.org  Sat Apr  4 15:34:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  4 Apr 2009 15:34:21 +0000 (UTC)
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.94,1.95
Message-ID: <20090404153421.BE9BB70130@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-i18n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7386/devel

Modified Files:
	kde-i18n.spec 
Log Message:
* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
- remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- kde-i18n.spec	25 Feb 2009 10:27:48 -0000	1.94
+++ kde-i18n.spec	4 Apr 2009 15:33:50 -0000	1.95
@@ -6,7 +6,7 @@
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1126,8 +1126,9 @@
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcontrol
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcron
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdat
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesvn-build
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdf
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdm
    rm -rf %{buildroot}%{_docdir}/HTML/*/kfind
@@ -1850,6 +1851,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
+- remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kkofler at fedoraproject.org  Sat Apr  4 15:38:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  4 Apr 2009 15:38:36 +0000 (UTC)
Subject: rpms/kde-i18n/F-9 kde-i18n.spec,1.87,1.88
Message-ID: <20090404153836.11C1570130@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-i18n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8264/F-9

Modified Files:
	kde-i18n.spec 
Log Message:
Sync from devel:

* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
- remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/F-9/kde-i18n.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kde-i18n.spec	22 Jan 2009 14:04:18 -0000	1.87
+++ kde-i18n.spec	4 Apr 2009 15:38:05 -0000	1.88
@@ -6,7 +6,7 @@
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1126,8 +1126,9 @@
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcontrol
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcron
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdat
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesvn-build
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdf
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdm
    rm -rf %{buildroot}%{_docdir}/HTML/*/kfind
@@ -1850,6 +1851,12 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
+- remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
 - remove kdgantt.mo that conflict with kde-l10n
 



From kkofler at fedoraproject.org  Sat Apr  4 15:38:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  4 Apr 2009 15:38:35 +0000 (UTC)
Subject: rpms/kde-i18n/F-10 kde-i18n.spec,1.93,1.94
Message-ID: <20090404153835.94B7A70130@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-i18n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8264/F-10

Modified Files:
	kde-i18n.spec 
Log Message:
Sync from devel:

* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
- remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/F-10/kde-i18n.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kde-i18n.spec	22 Jan 2009 14:01:04 -0000	1.93
+++ kde-i18n.spec	4 Apr 2009 15:38:04 -0000	1.94
@@ -6,7 +6,7 @@
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1126,8 +1126,9 @@
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcontrol
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcron
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdat
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesvn-build
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdf
    rm -rf %{buildroot}%{_docdir}/HTML/*/kdm
    rm -rf %{buildroot}%{_docdir}/HTML/*/kfind
@@ -1850,6 +1851,12 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
+- remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
 - remove kdgantt.mo that conflict with kde-l10n
 



From kkofler at fedoraproject.org  Sat Apr  4 16:01:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  4 Apr 2009 16:01:41 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.2.2-ksirk-kde#187235.patch, NONE,
	1.1 kdegames.spec, 1.123, 1.124
Message-ID: <20090404160141.EB94770130@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13575/devel

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-kde#187235.patch 
Log Message:
* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)

kdegames-4.2.2-ksirk-kde#187235.patch:

--- NEW FILE kdegames-4.2.2-ksirk-kde#187235.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp
--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
+++ kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp	2009-04-04 17:58:43.000000000 +0200
@@ -132,6 +132,11 @@
           && (mousePos.x() >= 0) && (mousePos.x() <= m_frame-> viewport()->width()))
     )
   )
+  // safety check for NULL arrow pointers, can happen with Qt 4.5
+  if (m_uparrow == 0 || m_downarrow == 0 || m_leftarrow == 0 || m_rightarrow == 0)
+  {
+    return;
+  }
   if (currentWidget() != 0)
   {
     m_timer.start(200);


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdegames.spec	2 Apr 2009 16:58:32 -0000	1.123
+++ kdegames.spec	4 Apr 2009 16:01:11 -0000	1.124
@@ -3,12 +3,14 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -89,6 +91,7 @@
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1 -b .ksirk-kde#187235
 
 %build
 
@@ -193,6 +196,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
+- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+
 * Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - fix ggz scriptlet logic
 



From kkofler at fedoraproject.org  Sat Apr  4 16:11:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  4 Apr 2009 16:11:07 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames-4.2.2-ksirk-kde#187235.patch, NONE,
	1.1 kdegames.spec, 1.101, 1.102
Message-ID: <20090404161107.DE73C70130@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15578/F-9

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-kde#187235.patch 
Log Message:
Sync from devel:

* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)

kdegames-4.2.2-ksirk-kde#187235.patch:

--- NEW FILE kdegames-4.2.2-ksirk-kde#187235.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp
--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
+++ kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp	2009-04-04 17:58:43.000000000 +0200
@@ -132,6 +132,11 @@
           && (mousePos.x() >= 0) && (mousePos.x() <= m_frame-> viewport()->width()))
     )
   )
+  // safety check for NULL arrow pointers, can happen with Qt 4.5
+  if (m_uparrow == 0 || m_downarrow == 0 || m_leftarrow == 0 || m_rightarrow == 0)
+  {
+    return;
+  }
   if (currentWidget() != 0)
   {
     m_timer.start(200);


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdegames.spec	2 Apr 2009 17:00:46 -0000	1.101
+++ kdegames.spec	4 Apr 2009 16:10:37 -0000	1.102
@@ -3,12 +3,14 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -89,6 +91,7 @@
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1 -b .ksirk-kde#187235
 
 %build
 
@@ -193,6 +196,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
+- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+
 * Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - fix ggz scriptlet logic
 



From kkofler at fedoraproject.org  Sat Apr  4 16:11:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  4 Apr 2009 16:11:07 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.2.2-ksirk-kde#187235.patch, NONE,
	1.1 kdegames.spec, 1.111, 1.112
Message-ID: <20090404161107.B5B4470130@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15578/F-10

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-kde#187235.patch 
Log Message:
Sync from devel:

* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)

kdegames-4.2.2-ksirk-kde#187235.patch:

--- NEW FILE kdegames-4.2.2-ksirk-kde#187235.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp
--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
+++ kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp	2009-04-04 17:58:43.000000000 +0200
@@ -132,6 +132,11 @@
           && (mousePos.x() >= 0) && (mousePos.x() <= m_frame-> viewport()->width()))
     )
   )
+  // safety check for NULL arrow pointers, can happen with Qt 4.5
+  if (m_uparrow == 0 || m_downarrow == 0 || m_leftarrow == 0 || m_rightarrow == 0)
+  {
+    return;
+  }
   if (currentWidget() != 0)
   {
     m_timer.start(200);


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdegames.spec	2 Apr 2009 17:04:03 -0000	1.111
+++ kdegames.spec	4 Apr 2009 16:10:37 -0000	1.112
@@ -3,12 +3,14 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -89,6 +91,7 @@
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1 -b .ksirk-kde#187235
 
 %build
 
@@ -193,6 +196,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
+- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+
 * Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - fix ggz scriptlet logic
 



From mjg59 at fedoraproject.org  Sat Apr  4 17:36:12 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Sat,  4 Apr 2009 17:36:12 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-add-qcserial.patch, NONE,
	1.1 config-generic, 1.270, 1.271 kernel.spec, 1.1511, 1.1512
Message-ID: <20090404173612.B21A370130@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30058

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6-add-qcserial.patch 
Log Message:
* Sat Apr 04 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-add-qcserial.patch: Add the qcserial driver for Qualcomm modems


linux-2.6-add-qcserial.patch:

--- NEW FILE linux-2.6-add-qcserial.patch ---
diff -up linux-2.6.29.noarch/drivers/usb/serial/Kconfig.qcserial linux-2.6.29.noarch/drivers/usb/serial/Kconfig
--- linux-2.6.29.noarch/drivers/usb/serial/Kconfig.qcserial	2009-03-23 23:12:14.000000000 +0000
+++ linux-2.6.29.noarch/drivers/usb/serial/Kconfig	2009-04-04 18:25:46.000000000 +0100
@@ -472,6 +472,15 @@ config USB_SERIAL_OTI6858
 	  To compile this driver as a module, choose M here: the
 	  module will be called oti6858.
 
+config USB_SERIAL_QUALCOMM
+	tristate "USB Qualcomm Serial modem"
+	help
+	  Say Y here if you have a Qualcomm USB modem device.  These are
+	  usually wireless cellular modems.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called qcserial.
+
 config USB_SERIAL_SPCP8X5
 	tristate "USB SPCP8x5 USB To Serial Driver"
 	help
diff -up linux-2.6.29.noarch/drivers/usb/serial/Makefile.qcserial linux-2.6.29.noarch/drivers/usb/serial/Makefile
--- linux-2.6.29.noarch/drivers/usb/serial/Makefile.qcserial	2009-03-23 23:12:14.000000000 +0000
+++ linux-2.6.29.noarch/drivers/usb/serial/Makefile	2009-04-04 18:25:46.000000000 +0100
@@ -45,6 +45,7 @@ obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opt
 obj-$(CONFIG_USB_SERIAL_OPTION)			+= option.o
 obj-$(CONFIG_USB_SERIAL_OTI6858)		+= oti6858.o
 obj-$(CONFIG_USB_SERIAL_PL2303)			+= pl2303.o
+obj-$(CONFIG_USB_SERIAL_QUALCOMM)		+= qcserial.o
 obj-$(CONFIG_USB_SERIAL_SAFE)			+= safe_serial.o
 obj-$(CONFIG_USB_SERIAL_SIEMENS_MPI)		+= siemens_mpi.o
 obj-$(CONFIG_USB_SERIAL_SIERRAWIRELESS)		+= sierra.o
diff -up /dev/null linux-2.6.29.noarch/drivers/usb/serial/qcserial.c
--- /dev/null	2009-04-03 17:11:07.397135076 +0100
+++ linux-2.6.29.noarch/drivers/usb/serial/qcserial.c	2009-04-04 18:26:00.000000000 +0100
@@ -0,0 +1,168 @@
+/*
+ * Qualcomm Serial USB driver
+ *
+ *	Copyright (c) 2008 QUALCOMM Incorporated.
+ *	Copyright (c) 2009 Greg Kroah-Hartman <gregkh at suse.de>
+ *	Copyright (c) 2009 Novell Inc.
+ *
+ *	This program is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU General Public License version
+ *	2 as published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+
+#define DRIVER_AUTHOR "Qualcomm Inc"
+#define DRIVER_DESC "Qualcomm USB Serial driver"
+
+static int debug;
+
+static struct usb_device_id id_table[] = {
+	{USB_DEVICE(0x05c6, 0x9211)},	/* Acer Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */
+	{USB_DEVICE(0x03f0, 0x1f1d)},	/* HP un2400 Gobi Modem Device */
+	{USB_DEVICE(0x03f0, 0x201d)},	/* HP un2400 Gobi QDL Device */
+	{USB_DEVICE(0x04da, 0x250d)},	/* Panasonic Gobi Modem device */
+	{USB_DEVICE(0x04da, 0x250c)},	/* Panasonic Gobi QDL device */
+	{USB_DEVICE(0x413c, 0x8172)},	/* Dell Gobi Modem device */
+	{USB_DEVICE(0x413c, 0x8171)},	/* Dell Gobi QDL device */
+	{USB_DEVICE(0x1410, 0xa001)},	/* Novatel Gobi Modem device */
+	{USB_DEVICE(0x1410, 0xa008)},	/* Novatel Gobi QDL device */
+	{USB_DEVICE(0x0b05, 0x1776)},	/* Asus Gobi Modem device */
+	{USB_DEVICE(0x0b05, 0x1774)},	/* Asus Gobi QDL device */
+	{USB_DEVICE(0x19d2, 0xfff3)},	/* ONDA Gobi Modem device */
+	{USB_DEVICE(0x19d2, 0xfff2)},	/* ONDA Gobi QDL device */
+	{USB_DEVICE(0x1557, 0x0a80)},	/* OQO Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9001)},   /* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9002)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9202)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9203)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9222)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9008)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9201)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9221)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9231)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x1f45, 0x0001)},	/* Unknown Gobi QDL device */
+	{ }				/* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static struct usb_driver qcdriver = {
+	.name			= "qcserial",
+	.probe			= usb_serial_probe,
+	.disconnect		= usb_serial_disconnect,
+	.id_table		= id_table,
+	.suspend		= usb_serial_suspend,
+	.resume			= usb_serial_resume,
+	.supports_autosuspend	= true,
+};
+
+static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
+{
+	int retval = -ENODEV;
+	__u8 nintf;
+	__u8 ifnum;
+
+	dbg("%s", __func__);
+
+	nintf = serial->dev->actconfig->desc.bNumInterfaces;
+	dbg("Num Interfaces = %d", nintf);
+	ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
+	dbg("This Interface = %d", ifnum);
+
+	switch (nintf) {
+	case 1:
+		/* QDL mode */
+		if (serial->interface->num_altsetting == 2) {
+			struct usb_host_interface *intf;
+
+			intf = &serial->interface->altsetting[1];
+			if (intf->desc.bNumEndpoints == 2) {
+				if (usb_endpoint_is_bulk_in(&intf->endpoint[0].desc) &&
+				    usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) {
+					dbg("QDL port found");
+					retval = usb_set_interface(serial->dev, ifnum, 1);
+					if (retval < 0) {
+						dev_err(&serial->dev->dev,
+							"Could not set interface, error %d\n",
+							retval);
+						retval = -ENODEV;
+					}
+					return retval;
+				}
+			}
+		}
+		break;
+
+	case 4:
+		/* Composite mode */
+		if (ifnum == 2) {
+			dbg("Modem port found");
+			retval = usb_set_interface(serial->dev, ifnum, 0);
+			if (retval < 0) {
+				dev_err(&serial->dev->dev,
+					"Could not set interface, error %d\n",
+					retval);
+				retval = -ENODEV;
+			}
+			return retval;
+		}
+		break;
+
+	default:
+		dev_err(&serial->dev->dev,
+			"unknown number of interfaces: %d\n", nintf);
+		return -ENODEV;
+	}
+
+	return retval;
+}
+
+static struct usb_serial_driver qcdevice = {
+	.driver = {
+		.owner     = THIS_MODULE,
+		.name      = "qcserial",
+	},
+	.description         = "Qualcomm USB modem",
+	.id_table            = id_table,
+	.usb_driver          = &qcdriver,
+	.num_ports           = 1,
+	.probe               = qcprobe,
+};
+
+static int __init qcinit(void)
+{
+	int retval;
+
+	retval = usb_serial_register(&qcdevice);
+	if (retval)
+		return retval;
+
+	retval = usb_register(&qcdriver);
+	if (retval) {
+		usb_serial_deregister(&qcdevice);
+		return retval;
+	}
+
+	return 0;
+}
+
+static void __exit qcexit(void)
+{
+	usb_deregister(&qcdriver);
+	usb_serial_deregister(&qcdevice);
+}
+
+module_init(qcinit);
+module_exit(qcexit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL v2");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- config-generic	3 Apr 2009 00:34:25 -0000	1.270
+++ config-generic	4 Apr 2009 17:35:42 -0000	1.271
@@ -2854,6 +2854,7 @@
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1511
retrieving revision 1.1512
diff -u -r1.1511 -r1.1512
--- kernel.spec	3 Apr 2009 19:34:04 -0000	1.1511
+++ kernel.spec	4 Apr 2009 17:35:42 -0000	1.1512
@@ -705,6 +705,8 @@
 
 Patch4000: linux-2.6-bootarg-strict-devmem.patch
 
+Patch5000: linux-2.6-add-qcserial.patch
+
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
@@ -1162,6 +1164,7 @@
 ApplyPatch linux-2.6-bootarg-strict-devmem.patch
 
 # USB
+ApplyPatch linux-2.6-add-qcserial.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1902,6 +1905,9 @@
 # and build.
 
 %changelog
+* Sat Apr 04 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-add-qcserial.patch: Add the qcserial driver for Qualcomm modems
+
 * Fri Apr 03 2009 Jarod Wilson <jarod at redhat.com>
 - Don't set up non-existent LVDS on systems with mobile Intel graphics chips
   that lie about having LVDS (like my Dell Studio Hybrid). Makes plymouth



From mtasaka at fedoraproject.org  Sat Apr  4 17:38:45 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  4 Apr 2009 17:38:45 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.351, 1.352 jd.spec, 1.411, 1.412 sources,
	1.352, 1.353
Message-ID: <20090404173845.D385670130@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30489

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- .cvsignore	2 Apr 2009 05:35:34 -0000	1.351
+++ .cvsignore	4 Apr 2009 17:38:15 -0000	1.352
@@ -1 +1 @@
-jd-2.4.0-svn2761_trunk.tgz
+jd-2.4.0-svn2765_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- jd.spec	2 Apr 2009 05:35:34 -0000	1.411
+++ jd.spec	4 Apr 2009 17:38:15 -0000	1.412
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2761_trunk
+%define         strtag        svn2765_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Sun Apr  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- sources	2 Apr 2009 05:35:34 -0000	1.352
+++ sources	4 Apr 2009 17:38:15 -0000	1.353
@@ -1 +1 @@
-dc36dd9c270abe097c16aa5892f114f3  jd-2.4.0-svn2761_trunk.tgz
+2d9a5fca4bf54a9545b32668345c5a77  jd-2.4.0-svn2765_trunk.tgz



From jorge at fedoraproject.org  Sat Apr  4 18:06:38 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Sat,  4 Apr 2009 18:06:38 +0000 (UTC)
Subject: rpms/scite/devel .cvsignore, 1.5, 1.6 scite-makefile.patch, 1.1,
	1.2 scite.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090404180638.669AD70130@cvs1.fedora.phx.redhat.com>

Author: jorge

Update of /cvs/pkgs/rpms/scite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3677

Modified Files:
	.cvsignore scite-makefile.patch scite.spec sources 
Log Message:
Update to 1.77


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 20:40:03 -0000	1.5
+++ .cvsignore	4 Apr 2009 18:06:07 -0000	1.6
@@ -1 +1 @@
-scite174.tgz
+scite177.tgz

scite-makefile.patch:

Index: scite-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/scite-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scite-makefile.patch	6 Jun 2006 04:40:29 -0000	1.1
+++ scite-makefile.patch	4 Apr 2009 18:06:07 -0000	1.2
@@ -1,21 +1,12 @@
 diff -uNr scite.orig/gtk/makefile scite/gtk/makefile
---- scite.orig/gtk/makefile	2006-02-13 01:27:08.000000000 -0500
-+++ scite/gtk/makefile	2006-06-02 19:00:20.000000000 -0500
-@@ -45,7 +45,7 @@
- bindir=$(prefix)/bin
- SYSCONF_PATH=$(prefix)/share/scite
- 
--INSTALL=install -o root -g root
-+INSTALL=install
- 
- PROG	= ../bin/SciTE
- 
+--- scite.orig/gtk/makefile	2008-05-01 08:40:28.000000000 -0500
++++ scite/gtk/makefile	2009-04-04 12:58:05.000000000 -0500
 @@ -56,12 +56,12 @@
  
  #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
  INCLUDEDIRS=-I ../../scintilla/include -I ../src
--CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
-+CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)


Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/scite.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scite.spec	25 Feb 2009 23:22:16 -0000	1.7
+++ scite.spec	4 Apr 2009 18:06:07 -0000	1.8
@@ -1,12 +1,12 @@
 Name: scite 
-Version: 1.74
-Release: 4%{?dist}
+Version: 1.77
+Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
 Group: Applications/Editors
 Url: http://www.scintilla.org/SciTE.html
 
-Source0: http://download.sourceforge.net/scintilla/scite174.tgz
+Source0: http://download.sourceforge.net/scintilla/scite177.tgz
 patch0: scintilla-makefile-flags.patch
 patch1: scite-makefile.patch
 patch2: scite-use-htmlview.patch
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Apr 4 2009 Jorge Torres <jtorresh at gmail.com> 1.77-1
+- Upgrade to 1.77
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.74-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 20:40:03 -0000	1.5
+++ sources	4 Apr 2009 18:06:07 -0000	1.6
@@ -1 +1 @@
-09ad25f1fa6dab3feec41dba2480047f  scite174.tgz
+ba016919190c12cfb712e1f004df4187  scite177.tgz



From slankes at fedoraproject.org  Sat Apr  4 18:37:25 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat,  4 Apr 2009 18:37:25 +0000 (UTC)
Subject: rpms/pyroom/devel pyroom-locale.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 pyroom.spec, 1.8, 1.9 sources, 1.4, 1.5 pyroom.desktop-patch,
	1.2, NONE
Message-ID: <20090404183725.1F73970130@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/pyroom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9966

Modified Files:
	.cvsignore pyroom.spec sources 
Added Files:
	pyroom-locale.patch 
Removed Files:
	pyroom.desktop-patch 
Log Message:
new upstream release, drop desktop patch, add locale-patch

pyroom-locale.patch:

--- NEW FILE pyroom-locale.patch ---
=== modified file 'setup.py'
--- old/setup.py	2009-03-26 14:07:49.000000000 +0100
+++ new/setup.py	2009-04-04 20:14:41.000000000 +0200
@@ -34,8 +34,11 @@
     
     def find_mo_files(self):
         data_files = []
-        for mo in glob.glob(os.path.join(MO_DIR, '*', 'pyroom.mo')):
+        for mo in glob.glob(os.path.join(MO_DIR, '*', 'LC_MESSAGES', 'pyroom.mo')):
             lang = os.path.basename(os.path.dirname(mo))
+            lang = os.path.basename(
+                os.path.realpath(os.path.join(os.path.dirname(mo), '..'))
+            )
             dest = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
             data_files.append((dest, [mo]))
         return data_files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyroom/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 21:39:02 -0000	1.4
+++ .cvsignore	4 Apr 2009 18:36:54 -0000	1.5
@@ -1 +1 @@
-pyroom-0.3.2.tar.gz
+pyroom-0.4.1.tar.gz


Index: pyroom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyroom/devel/pyroom.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyroom.spec	26 Feb 2009 20:22:29 -0000	1.8
+++ pyroom.spec	4 Apr 2009 18:36:54 -0000	1.9
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyroom
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        PyRoom is a full screen text editor and a clone of Writeroom
 
 Group:          Applications/Editors
 License:        GPLv3+
 URL:            http://pyroom.org/ 
 Source0:        http://launchpad.net/pyroom/0.3/0.3.2/+download/%{name}-%{version}.tar.gz
-Patch0:         pyroom.desktop-patch
+Patch0:         pyroom-locale.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch 
@@ -18,7 +18,9 @@
 Requires:       pyxdg
 Requires:       gnome-python2-gtksourceview
 BuildRequires:  python-devel
+BuildRequires:  pygtk2
 BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 
 %description
 
@@ -28,14 +30,15 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+# %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --root $RPM_BUILD_ROOT
 chmod 755 %{buildroot}/%{python_sitelib}/PyRoom/cmdline.py
 
 desktop-file-install --vendor=""    \
@@ -44,10 +47,12 @@
 gzip pyroom.1
 install -p -D %{name}.1.gz %{buildroot}/%{_mandir}/man1/%{name}.1.gz
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
 %{python_sitelib}/*
@@ -57,6 +62,11 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Wed Mar 25 2009 Sven Lankes <sven at lank.es> - 0.4.1-1
+- new upstream release
+- remove desktop-file-patch
+- add patch to fix mo-file install (patch received from upstream)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyroom/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 21:39:02 -0000	1.4
+++ sources	4 Apr 2009 18:36:54 -0000	1.5
@@ -1 +1 @@
-288d7d5a9853fe38201eec1dec12866d  pyroom-0.3.2.tar.gz
+af33f0713b5cd47c90e5b9747e537a18  pyroom-0.4.1.tar.gz


--- pyroom.desktop-patch DELETED ---



From eponyme at fedoraproject.org  Sat Apr  4 18:46:11 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 18:46:11 +0000 (UTC)
Subject: rpms/fotowall/devel .cvsignore, 1.3, 1.4 fotowall.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090404184611.A3E8370130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11503

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Mar 2009 23:57:00 -0000	1.3
+++ .cvsignore	4 Apr 2009 18:45:41 -0000	1.4
@@ -1 +1 @@
-fotowall-0.3.1.tar.bz2
+fotowall-0.4.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/fotowall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fotowall.spec	13 Mar 2009 23:57:00 -0000	1.4
+++ fotowall.spec	4 Apr 2009 18:45:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.3.1
+Version:        0.4
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
+- Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1
 - Rebuild for 0.3.1
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.21-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Mar 2009 23:57:00 -0000	1.3
+++ sources	4 Apr 2009 18:45:41 -0000	1.4
@@ -1 +1 @@
-8f561fa7241cd6685c6996e590be35dd  fotowall-0.3.1.tar.bz2
+91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2



From eponyme at fedoraproject.org  Sat Apr  4 18:47:49 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 18:47:49 +0000 (UTC)
Subject: rpms/edb/devel edb.spec,1.19,1.20 sources,1.9,1.10
Message-ID: <20090404184749.8D25370130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11982

Modified Files:
	edb.spec sources 
Log Message:
Update to 0.9.8


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/devel/edb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- edb.spec	17 Mar 2009 20:02:01 -0000	1.19
+++ edb.spec	4 Apr 2009 18:47:19 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        0.9.7
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
@@ -30,8 +30,6 @@
 
 %prep
 %setup -q -n debugger
-echo "Icon=%{name}" >> %{name}.desktop
-sed -i -e '2i\#include <stdio.h>' src/DialogPlugins.cpp
 
 %build
 qmake-qt4 -makefile DEFAULT_PLUGIN_PATH="%{_libdir}/%{name}/"
@@ -64,6 +62,8 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
+- Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1
 - Rebuild for 0.9.7
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/edb/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Mar 2009 20:02:01 -0000	1.9
+++ sources	4 Apr 2009 18:47:19 -0000	1.10
@@ -1 +1 @@
-311d798eded71d8b5fcfbe359281546a  debugger-0.9.7.tgz
+d81f30b2c608564c5f8fbd46874628f6  debugger-0.9.8.tgz



From eponyme at fedoraproject.org  Sat Apr  4 18:50:00 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 18:50:00 +0000 (UTC)
Subject: rpms/fotowall/F-10 .cvsignore, 1.3, 1.4 fotowall.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090404185000.69FDC70130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12495

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Mar 2009 00:00:18 -0000	1.3
+++ .cvsignore	4 Apr 2009 18:49:29 -0000	1.4
@@ -1 +1 @@
-fotowall-0.3.1.tar.bz2
+fotowall-0.4.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/fotowall.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fotowall.spec	14 Mar 2009 00:00:18 -0000	1.3
+++ fotowall.spec	4 Apr 2009 18:49:29 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.3.1
+Version:        0.4
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
+- Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1
 - Rebuild for 0.3.1
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.21-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Mar 2009 00:00:18 -0000	1.3
+++ sources	4 Apr 2009 18:49:30 -0000	1.4
@@ -1 +1 @@
-8f561fa7241cd6685c6996e590be35dd  fotowall-0.3.1.tar.bz2
+91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2



From eponyme at fedoraproject.org  Sat Apr  4 18:50:12 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 18:50:12 +0000 (UTC)
Subject: rpms/edb/F-10 edb.spec,1.17,1.18 sources,1.9,1.10
Message-ID: <20090404185012.3DE3870130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12548

Modified Files:
	edb.spec sources 
Log Message:
Update to 0.9.8


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-10/edb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- edb.spec	17 Mar 2009 20:06:28 -0000	1.17
+++ edb.spec	4 Apr 2009 18:49:41 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        0.9.7
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
@@ -30,8 +30,6 @@
 
 %prep
 %setup -q -n debugger
-echo "Icon=%{name}" >> %{name}.desktop
-sed -i -e '2i\#include <stdio.h>' src/DialogPlugins.cpp
 
 %build
 qmake-qt4 -makefile DEFAULT_PLUGIN_PATH="%{_libdir}/%{name}/"
@@ -64,6 +62,8 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
+- Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1
 - Rebuild for 0.9.7
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Mar 2009 20:06:28 -0000	1.9
+++ sources	4 Apr 2009 18:49:42 -0000	1.10
@@ -1 +1 @@
-311d798eded71d8b5fcfbe359281546a  debugger-0.9.7.tgz
+d81f30b2c608564c5f8fbd46874628f6  debugger-0.9.8.tgz



From eponyme at fedoraproject.org  Sat Apr  4 18:51:59 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 18:51:59 +0000 (UTC)
Subject: rpms/fotowall/F-9 .cvsignore, 1.3, 1.4 fotowall.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090404185200.0312670130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13040

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Mar 2009 00:02:42 -0000	1.3
+++ .cvsignore	4 Apr 2009 18:51:29 -0000	1.4
@@ -1 +1 @@
-fotowall-0.3.1.tar.bz2
+fotowall-0.4.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-9/fotowall.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fotowall.spec	14 Mar 2009 00:02:42 -0000	1.3
+++ fotowall.spec	4 Apr 2009 18:51:29 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.3.1
+Version:        0.4
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
+- Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1
 - Rebuild for 0.3.1
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.21-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Mar 2009 00:02:42 -0000	1.3
+++ sources	4 Apr 2009 18:51:29 -0000	1.4
@@ -1 +1 @@
-8f561fa7241cd6685c6996e590be35dd  fotowall-0.3.1.tar.bz2
+91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2



From eponyme at fedoraproject.org  Sat Apr  4 18:52:09 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 18:52:09 +0000 (UTC)
Subject: rpms/edb/F-9 edb.spec,1.17,1.18 sources,1.9,1.10
Message-ID: <20090404185209.1EB5670130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13096

Modified Files:
	edb.spec sources 
Log Message:
Update to 0.9.8


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-9/edb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- edb.spec	17 Mar 2009 20:08:28 -0000	1.17
+++ edb.spec	4 Apr 2009 18:51:38 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        0.9.7
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
@@ -30,8 +30,6 @@
 
 %prep
 %setup -q -n debugger
-echo "Icon=%{name}" >> %{name}.desktop
-sed -i -e '2i\#include <stdio.h>' src/DialogPlugins.cpp
 
 %build
 qmake-qt4 -makefile DEFAULT_PLUGIN_PATH="%{_libdir}/%{name}/"
@@ -64,6 +62,8 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
+- Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1
 - Rebuild for 0.9.7
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Mar 2009 20:08:28 -0000	1.9
+++ sources	4 Apr 2009 18:51:38 -0000	1.10
@@ -1 +1 @@
-311d798eded71d8b5fcfbe359281546a  debugger-0.9.7.tgz
+d81f30b2c608564c5f8fbd46874628f6  debugger-0.9.8.tgz



From slankes at fedoraproject.org  Sat Apr  4 19:01:54 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat,  4 Apr 2009 19:01:54 +0000 (UTC)
Subject: rpms/pyroom/F-10 pyroom-locale.patch, NONE, 1.1 pyroom.spec, 1.7,
	1.8 pyroom.desktop-patch, 1.2, NONE
Message-ID: <20090404190154.A42FD7013C@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/pyroom/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15100

Modified Files:
	pyroom.spec 
Added Files:
	pyroom-locale.patch 
Removed Files:
	pyroom.desktop-patch 
Log Message:
new upstream release, desktopfile patch removed, locale patch added

pyroom-locale.patch:

--- NEW FILE pyroom-locale.patch ---
=== modified file 'setup.py'
--- old/setup.py	2009-03-26 14:07:49.000000000 +0100
+++ new/setup.py	2009-04-04 20:14:41.000000000 +0200
@@ -34,8 +34,11 @@
     
     def find_mo_files(self):
         data_files = []
-        for mo in glob.glob(os.path.join(MO_DIR, '*', 'pyroom.mo')):
+        for mo in glob.glob(os.path.join(MO_DIR, '*', 'LC_MESSAGES', 'pyroom.mo')):
             lang = os.path.basename(os.path.dirname(mo))
+            lang = os.path.basename(
+                os.path.realpath(os.path.join(os.path.dirname(mo), '..'))
+            )
             dest = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
             data_files.append((dest, [mo]))
         return data_files


Index: pyroom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyroom/F-10/pyroom.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyroom.spec	6 Dec 2008 21:54:55 -0000	1.7
+++ pyroom.spec	4 Apr 2009 19:01:24 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyroom
-Version:        0.3.2
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        PyRoom is a full screen text editor and a clone of Writeroom
 
@@ -9,7 +9,7 @@
 License:        GPLv3+
 URL:            http://pyroom.org/ 
 Source0:        http://launchpad.net/pyroom/0.3/0.3.2/+download/%{name}-%{version}.tar.gz
-Patch0:         pyroom.desktop-patch
+Patch0:         pyroom-locale.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch 
@@ -18,7 +18,9 @@
 Requires:       pyxdg
 Requires:       gnome-python2-gtksourceview
 BuildRequires:  python-devel
+BuildRequires:  pygtk2
 BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 
 %description
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -44,10 +46,12 @@
 gzip pyroom.1
 install -p -D %{name}.1.gz %{buildroot}/%{_mandir}/man1/%{name}.1.gz
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
 %{python_sitelib}/*
@@ -57,6 +61,14 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Wed Mar 25 2009 Sven Lankes <sven at lank.es> - 0.4.1-1
+- new upstream release
+- remove desktop-file-patch
+- add patch to fix mo-file install (patch received from upstream)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Dec 06 2008 Sven Lankes <sven at lank.es> - 0.3.2-1
 - new upstream release
 


--- pyroom.desktop-patch DELETED ---



From slankes at fedoraproject.org  Sat Apr  4 19:08:07 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat,  4 Apr 2009 19:08:07 +0000 (UTC)
Subject: rpms/pyroom/F-10 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090404190807.5F0A870130@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/pyroom/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17214

Modified Files:
	.cvsignore sources 
Log Message:
update branch for new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyroom/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 21:54:55 -0000	1.4
+++ .cvsignore	4 Apr 2009 19:07:37 -0000	1.5
@@ -1 +1 @@
-pyroom-0.3.2.tar.gz
+pyroom-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyroom/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 21:54:55 -0000	1.4
+++ sources	4 Apr 2009 19:07:37 -0000	1.5
@@ -1 +1 @@
-288d7d5a9853fe38201eec1dec12866d  pyroom-0.3.2.tar.gz
+af33f0713b5cd47c90e5b9747e537a18  pyroom-0.4.1.tar.gz



From jorge at fedoraproject.org  Sat Apr  4 19:22:25 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Sat,  4 Apr 2009 19:22:25 +0000 (UTC)
Subject: rpms/scite/F-10 .cvsignore, 1.5, 1.6 scite-makefile.patch, 1.1,
	1.2 scite.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090404192225.0BB9D70130@cvs1.fedora.phx.redhat.com>

Author: jorge

Update of /cvs/pkgs/rpms/scite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19730

Modified Files:
	.cvsignore scite-makefile.patch scite.spec sources 
Log Message:
Update to 1.77


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 20:40:03 -0000	1.5
+++ .cvsignore	4 Apr 2009 19:21:54 -0000	1.6
@@ -1 +1 @@
-scite174.tgz
+scite177.tgz

scite-makefile.patch:

Index: scite-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/scite-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scite-makefile.patch	6 Jun 2006 04:40:29 -0000	1.1
+++ scite-makefile.patch	4 Apr 2009 19:21:54 -0000	1.2
@@ -1,21 +1,12 @@
 diff -uNr scite.orig/gtk/makefile scite/gtk/makefile
---- scite.orig/gtk/makefile	2006-02-13 01:27:08.000000000 -0500
-+++ scite/gtk/makefile	2006-06-02 19:00:20.000000000 -0500
-@@ -45,7 +45,7 @@
- bindir=$(prefix)/bin
- SYSCONF_PATH=$(prefix)/share/scite
- 
--INSTALL=install -o root -g root
-+INSTALL=install
- 
- PROG	= ../bin/SciTE
- 
+--- scite.orig/gtk/makefile	2008-05-01 08:40:28.000000000 -0500
++++ scite/gtk/makefile	2009-04-04 12:58:05.000000000 -0500
 @@ -56,12 +56,12 @@
  
  #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
  INCLUDEDIRS=-I ../../scintilla/include -I ../src
--CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
-+CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)


Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/scite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scite.spec	19 Feb 2008 07:00:15 -0000	1.6
+++ scite.spec	4 Apr 2009 19:21:54 -0000	1.7
@@ -1,12 +1,12 @@
 Name: scite 
-Version: 1.74
-Release: 3%{?dist}
+Version: 1.77
+Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
 Group: Applications/Editors
 Url: http://www.scintilla.org/SciTE.html
 
-Source0: http://download.sourceforge.net/scintilla/scite174.tgz
+Source0: http://download.sourceforge.net/scintilla/scite177.tgz
 patch0: scintilla-makefile-flags.patch
 patch1: scite-makefile.patch
 patch2: scite-use-htmlview.patch
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Apr 4 2009 Jorge Torres <jtorresh at gmail.com> 1.77-1
+- Upgrade to 1.77
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.74-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 20:40:03 -0000	1.5
+++ sources	4 Apr 2009 19:21:54 -0000	1.6
@@ -1 +1 @@
-09ad25f1fa6dab3feec41dba2480047f  scite174.tgz
+ba016919190c12cfb712e1f004df4187  scite177.tgz



From eponyme at fedoraproject.org  Sat Apr  4 19:26:36 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 19:26:36 +0000 (UTC)
Subject: rpms/edb/devel edb.spec,1.20,1.21
Message-ID: <20090404192637.0119370130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20627

Modified Files:
	edb.spec 
Log Message:
Update to 0.9.8


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/devel/edb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- edb.spec	4 Apr 2009 18:47:19 -0000	1.20
+++ edb.spec	4 Apr 2009 19:26:06 -0000	1.21
@@ -30,6 +30,8 @@
 
 %prep
 %setup -q -n debugger
+# for ../include/PluginAPI.h:48: error: 'uint32_t' does not name a type
+sed -i '26i\#include <stdint.h>' include/PluginAPI.h
 
 %build
 qmake-qt4 -makefile DEFAULT_PLUGIN_PATH="%{_libdir}/%{name}/"



From eponyme at fedoraproject.org  Sat Apr  4 19:31:13 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 19:31:13 +0000 (UTC)
Subject: rpms/edb/F-10 edb.spec,1.18,1.19
Message-ID: <20090404193113.5C0E370130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21573

Modified Files:
	edb.spec 
Log Message:
Update to 0.9.8


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-10/edb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- edb.spec	4 Apr 2009 18:49:41 -0000	1.18
+++ edb.spec	4 Apr 2009 19:30:43 -0000	1.19
@@ -30,6 +30,8 @@
 
 %prep
 %setup -q -n debugger
+# for ../include/PluginAPI.h:48: error: 'uint32_t' does not name a type
+sed -i '26i\#include <stdint.h>' include/PluginAPI.h
 
 %build
 qmake-qt4 -makefile DEFAULT_PLUGIN_PATH="%{_libdir}/%{name}/"



From eponyme at fedoraproject.org  Sat Apr  4 19:32:40 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 19:32:40 +0000 (UTC)
Subject: rpms/edb/F-9 edb.spec,1.18,1.19
Message-ID: <20090404193240.2B11C7013C@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21991

Modified Files:
	edb.spec 
Log Message:
Update to 0.9.8


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-9/edb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- edb.spec	4 Apr 2009 18:51:38 -0000	1.18
+++ edb.spec	4 Apr 2009 19:32:09 -0000	1.19
@@ -30,6 +30,8 @@
 
 %prep
 %setup -q -n debugger
+# for ../include/PluginAPI.h:48: error: 'uint32_t' does not name a type
+sed -i '26i\#include <stdint.h>' include/PluginAPI.h
 
 %build
 qmake-qt4 -makefile DEFAULT_PLUGIN_PATH="%{_libdir}/%{name}/"



From slankes at fedoraproject.org  Sat Apr  4 19:47:41 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat,  4 Apr 2009 19:47:41 +0000 (UTC)
Subject: rpms/merkaartor/devel merkaartor-eslang.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 merkaartor.spec, 1.9, 1.10 sources, 1.5,
	1.6 merkaartor.desktop, 1.2, NONE
Message-ID: <20090404194741.8CAB670130@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25938

Modified Files:
	.cvsignore merkaartor.spec sources 
Added Files:
	merkaartor-eslang.patch 
Removed Files:
	merkaartor.desktop 
Log Message:
new upstream release

merkaartor-eslang.patch:

--- NEW FILE merkaartor-eslang.patch ---
--- Merkaartor.pro.orig	2009-04-04 21:32:24.832409395 +0200
+++ Merkaartor.pro	2009-04-04 21:30:33.499410121 +0200
@@ -85,7 +85,7 @@
 	translations/merkaartor_ar.qm \
 	translations/merkaartor_cs.qm \
 	translations/merkaartor_de.qm \
-	translations/merkaartor_es.ts \
+	translations/merkaartor_es.qm \
 	translations/merkaartor_fr.qm \
 	translations/merkaartor_it.qm \
 	translations/merkaartor_pl.qm \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2008 19:52:29 -0000	1.5
+++ .cvsignore	4 Apr 2009 19:47:10 -0000	1.6
@@ -1 +1 @@
-merkaartor-0.12.tar.bz2
+merkaartor-0.13.1.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merkaartor.spec	26 Feb 2009 00:23:10 -0000	1.9
+++ merkaartor.spec	4 Apr 2009 19:47:11 -0000	1.10
@@ -1,18 +1,20 @@
 Name:           merkaartor
-Version:        0.12
-Release:        4%{?dist}
+Version:        0.13.1
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        http://www.merkaartor.org/downloads/source/merkaartor-0.12.tar.bz2
-Source1:        %{name}.desktop
+Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
+Patch0:         merkaartor-eslang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiv2-devel
+BuildRequires:  gdal-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -23,12 +25,11 @@
 
 %prep
 %setup -q 
-sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
-chmod 644 LICENSE
+%patch0 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
 make %{?_smp_mflags}
 
 
@@ -37,7 +38,7 @@
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
 install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
 desktop-file-install --vendor="fedora" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,19 +49,16 @@
 %{_bindir}/%{name}
 %dir %{_datadir}/merkaartor
 %dir %{_datadir}/merkaartor/translations
+%dir %{_datadir}/merkaartor/world_shp
+%dir %{_datadir}/merkaartor/world_shp/*
 %{_datadir}/merkaartor/translations/%{name}_*.qm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
-
-
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.12-3 
-- respin (eviv2)
+* Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
+- new upstream release
 
 * Wed Oct 15 2008 Sven Lankes <sven at lank.es> - 0.12-2
 - remove additional source merkaartor.xpm - now included


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2008 19:52:29 -0000	1.5
+++ sources	4 Apr 2009 19:47:11 -0000	1.6
@@ -1 +1 @@
-662320392a7efe427ac1de1a891bdc05  merkaartor-0.12.tar.bz2
+b3eccc1ccf1534a80258f5a24b13e661  merkaartor-0.13.1.tar.bz2


--- merkaartor.desktop DELETED ---



From slankes at fedoraproject.org  Sat Apr  4 19:59:11 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat,  4 Apr 2009 19:59:11 +0000 (UTC)
Subject: rpms/merkaartor/F-10 merkaartor-eslang.patch, NONE, 1.1 .cvsignore, 
	1.5, 1.6 merkaartor.spec, 1.7, 1.8 sources, 1.5,
	1.6 merkaartor.desktop, 1.2, NONE
Message-ID: <20090404195911.594B070130@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28220

Modified Files:
	.cvsignore merkaartor.spec sources 
Added Files:
	merkaartor-eslang.patch 
Removed Files:
	merkaartor.desktop 
Log Message:
new upstream release

merkaartor-eslang.patch:

--- NEW FILE merkaartor-eslang.patch ---
--- Merkaartor.pro.orig	2009-04-04 21:32:24.832409395 +0200
+++ Merkaartor.pro	2009-04-04 21:30:33.499410121 +0200
@@ -85,7 +85,7 @@
 	translations/merkaartor_ar.qm \
 	translations/merkaartor_cs.qm \
 	translations/merkaartor_de.qm \
-	translations/merkaartor_es.ts \
+	translations/merkaartor_es.qm \
 	translations/merkaartor_fr.qm \
 	translations/merkaartor_it.qm \
 	translations/merkaartor_pl.qm \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2008 19:52:29 -0000	1.5
+++ .cvsignore	4 Apr 2009 19:58:40 -0000	1.6
@@ -1 +1 @@
-merkaartor-0.12.tar.bz2
+merkaartor-0.13.1.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/merkaartor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merkaartor.spec	15 Oct 2008 20:58:20 -0000	1.7
+++ merkaartor.spec	4 Apr 2009 19:58:41 -0000	1.8
@@ -1,18 +1,20 @@
 Name:           merkaartor
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13.1
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        http://www.merkaartor.org/downloads/source/merkaartor-0.12.tar.bz2
-Source1:        %{name}.desktop
+Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
+Patch0:         merkaartor-eslang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiv2-devel
+BuildRequires:  gdal-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -23,12 +25,11 @@
 
 %prep
 %setup -q 
-sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
-chmod 644 LICENSE
+%patch0 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
 make %{?_smp_mflags}
 
 
@@ -37,7 +38,7 @@
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
 install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
 desktop-file-install --vendor="fedora" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,14 +49,17 @@
 %{_bindir}/%{name}
 %dir %{_datadir}/merkaartor
 %dir %{_datadir}/merkaartor/translations
+%dir %{_datadir}/merkaartor/world_shp
+%dir %{_datadir}/merkaartor/world_shp/*
 %{_datadir}/merkaartor/translations/%{name}_*.qm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
-
-
 %changelog
+* Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
+- new upstream release
+
 * Wed Oct 15 2008 Sven Lankes <sven at lank.es> - 0.12-2
 - remove additional source merkaartor.xpm - now included
 - minor update of .desktop-file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2008 19:52:29 -0000	1.5
+++ sources	4 Apr 2009 19:58:41 -0000	1.6
@@ -1 +1 @@
-662320392a7efe427ac1de1a891bdc05  merkaartor-0.12.tar.bz2
+b3eccc1ccf1534a80258f5a24b13e661  merkaartor-0.13.1.tar.bz2


--- merkaartor.desktop DELETED ---



From tmz at fedoraproject.org  Sat Apr  4 20:47:47 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  4 Apr 2009 20:47:47 +0000 (UTC)
Subject: rpms/git/devel
	git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch, 
	NONE, 1.1 .cvsignore, 1.73, 1.74 git.spec, 1.82, 1.83 sources,
	1.73, 1.74
Message-ID: <20090404204747.C9DE470130@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6173

Modified Files:
	.cvsignore git.spec sources 
Added Files:
	git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch 
Log Message:
Update to git-1.6.2.2

- Include contrib/ dir in %doc (bug 492490)
- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161)
- Ignore Branches output from cvsps-2.2b1 (bug 490602)
- Remove shebang from bash-completion script
- Include README in gitweb subpackage


git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch:

--- NEW FILE git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch ---
>From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Mon, 23 Mar 2009 00:03:36 -0400
Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output

Signed-off-by: Todd Zullinger <tmz at pobox.com>
---
 git-cvsimport.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index e439202..d020f1a 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -952,7 +952,7 @@ while (<CVS>) {
 	} elsif (/^-+$/) { # end of unknown-line processing
 		$state = 1;
 	} elsif ($state != 11) { # ignore stuff when skipping
-		print STDERR "* UNKNOWN LINE * $_\n";
+		print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /;
 	}
 }
 commit() if $branch and $state != 11;
-- 
1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	9 Mar 2009 20:36:41 -0000	1.73
+++ .cvsignore	4 Apr 2009 20:47:17 -0000	1.74
@@ -1 +1 @@
-git-1.6.2.tar.bz2
+git-1.6.2.2.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- git.spec	9 Mar 2009 20:36:41 -0000	1.82
+++ git.spec	4 Apr 2009 20:47:17 -0000	1.83
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.2
+Version:        1.6.2.2
 Release:        1%{?dist}
 Summary:        Core git tools
 License:        GPLv2
@@ -11,6 +11,8 @@
 Source2:        git.xinetd
 Source3:        git.conf.httpd
 Patch0:         git-1.5-gitweb-home-link.patch
+# https://bugzilla.redhat.com/490602
+Patch1:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
 BuildRequires:  zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -140,6 +142,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Use these same options for every invocation of 'make'.
 # Otherwise it will rebuild in %%install due to flags changes.
@@ -147,7 +150,6 @@
 make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
      ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
      DESTDIR=$RPM_BUILD_ROOT \\\
-     DOCBOOK_XSL_172=YesPlease \\\
      INSTALL="install -p" \\\
      INSTALLDIRS=vendor \\\
      htmldir=%{_docdir}/%{name}-%{version} \\\
@@ -157,6 +159,12 @@
 %{make_git} all %{!?_without_docs: doc}
 make -C contrib/emacs
 
+# Work around odd manpage issues (bug #485161)
+grep -rl '\\&\.ft' Documentation/ | xargs -i sed -i 's/\\&\.ft/.ft/g' {}
+
+# Remove shebang from bash-completion script
+sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{make_git} install %{!?_without_docs: install-doc}
@@ -195,8 +203,9 @@
 
 # quiet some rpmlint complaints
 chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/*
-rm -f Documentation/technical/.gitignore
+rm -f {Documentation/technical,contrib/emacs}/.gitignore
 chmod a-x Documentation/technical/api-index.sh
+find contrib -type f -perm /a+x | xargs chmod -x
 
 
 %clean
@@ -207,7 +216,7 @@
 %defattr(-,root,root)
 %{_datadir}/git-core/
 %dir %{_libexecdir}/git-core/
-%doc README COPYING Documentation/*.txt contrib/hooks
+%doc README COPYING Documentation/*.txt contrib/
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
 %{_sysconfdir}/bash_completion.d
@@ -280,6 +289,7 @@
 
 %files -n gitweb
 %defattr(-,root,root)
+%doc gitweb/README
 %{_var}/www/git/
 %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 
@@ -288,6 +298,14 @@
 # No files for you!
 
 %changelog
+* Fri Apr 03 2009 Todd Zullinger <tmz at pobox.com> - 1.6.2.2-1
+- git-1.6.2.2
+- Include contrib/ dir in %%doc (bug 492490)
+- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161)
+- Ignore Branches output from cvsps-2.2b1 (bug 490602)
+- Remove shebang from bash-completion script
+- Include README in gitweb subpackage
+
 * Mon Mar 09 2009 Todd Zullinger <tmz at pobox.com> - 1.6.2-1
 - git-1.6.2
 - Include contrib/emacs/README in emacs subpackage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	9 Mar 2009 20:36:41 -0000	1.73
+++ sources	4 Apr 2009 20:47:17 -0000	1.74
@@ -1 +1 @@
-12c7d874e17c6e111697b1714b5f4319  git-1.6.2.tar.bz2
+d219aa5480ed6396f8ab968f3f7eb0f9  git-1.6.2.2.tar.bz2



From eponyme at fedoraproject.org  Sat Apr  4 21:37:51 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 21:37:51 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.12, 1.13 clive.spec, 1.13,
	1.14 sources, 1.12, 1.13
Message-ID: <20090404213751.1B84370130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16424

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.1.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Mar 2009 19:02:42 -0000	1.12
+++ .cvsignore	4 Apr 2009 21:37:20 -0000	1.13
@@ -1 +1 @@
-clive-2.1.9.tar.bz2
+clive-2.1.10.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clive.spec	28 Mar 2009 19:02:42 -0000	1.13
+++ clive.spec	4 Apr 2009 21:37:20 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.1.9
+Version:        2.1.10
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -34,11 +34,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES configrc INSTALL LICENSE
+%doc AUTHORS CHANGES INSTALL LICENSE examples/config
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
+- Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1
 - Rebuild for 2.1.9
 * Mon Mar 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Mar 2009 19:02:42 -0000	1.12
+++ sources	4 Apr 2009 21:37:20 -0000	1.13
@@ -1 +1 @@
-c3f4ba00e4fed798830ad1e09b9c9ace  clive-2.1.9.tar.bz2
+8a03dc45f617556ec0aa2f296541ebef  clive-2.1.10.tar.bz2



From eponyme at fedoraproject.org  Sat Apr  4 21:39:53 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 21:39:53 +0000 (UTC)
Subject: rpms/clive/F-10 .cvsignore, 1.12, 1.13 clive.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090404213953.2D56470130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16976

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.1.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Mar 2009 19:04:25 -0000	1.12
+++ .cvsignore	4 Apr 2009 21:39:22 -0000	1.13
@@ -1 +1 @@
-clive-2.1.9.tar.bz2
+clive-2.1.10.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clive.spec	28 Mar 2009 19:04:25 -0000	1.11
+++ clive.spec	4 Apr 2009 21:39:22 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.1.9
+Version:        2.1.10
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -34,11 +34,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES configrc INSTALL LICENSE
+%doc AUTHORS CHANGES INSTALL LICENSE examples/config
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
+- Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1
 - Rebuild for 2.1.9
 * Mon Mar 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Mar 2009 19:04:25 -0000	1.12
+++ sources	4 Apr 2009 21:39:22 -0000	1.13
@@ -1 +1 @@
-c3f4ba00e4fed798830ad1e09b9c9ace  clive-2.1.9.tar.bz2
+8a03dc45f617556ec0aa2f296541ebef  clive-2.1.10.tar.bz2



From eponyme at fedoraproject.org  Sat Apr  4 21:41:39 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  4 Apr 2009 21:41:39 +0000 (UTC)
Subject: rpms/clive/F-9 .cvsignore, 1.12, 1.13 clive.spec, 1.11, 1.12 sources,
	1.12, 1.13
Message-ID: <20090404214139.7869D70130@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17556

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.1.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Mar 2009 19:07:39 -0000	1.12
+++ .cvsignore	4 Apr 2009 21:41:09 -0000	1.13
@@ -1 +1 @@
-clive-2.1.9.tar.bz2
+clive-2.1.10.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/clive.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clive.spec	28 Mar 2009 19:07:39 -0000	1.11
+++ clive.spec	4 Apr 2009 21:41:09 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.1.9
+Version:        2.1.10
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -34,11 +34,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES configrc INSTALL LICENSE
+%doc AUTHORS CHANGES INSTALL LICENSE examples/config
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
+- Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1
 - Rebuild for 2.1.9
 * Mon Mar 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Mar 2009 19:07:39 -0000	1.12
+++ sources	4 Apr 2009 21:41:09 -0000	1.13
@@ -1 +1 @@
-c3f4ba00e4fed798830ad1e09b9c9ace  clive-2.1.9.tar.bz2
+8a03dc45f617556ec0aa2f296541ebef  clive-2.1.10.tar.bz2



From devrim at fedoraproject.org  Sat Apr  4 21:49:50 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat,  4 Apr 2009 21:49:50 +0000 (UTC)
Subject: rpms/mapserver/devel .cvsignore, 1.6, 1.7 mapserver.spec, 1.22,
	1.23 sources, 1.7, 1.8
Message-ID: <20090404214950.265A570130@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19315

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
Update to 5.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2008 08:19:24 -0000	1.6
+++ .cvsignore	4 Apr 2009 21:49:19 -0000	1.7
@@ -0,0 +1 @@
+mapserver-5.2.2.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mapserver.spec	25 Feb 2009 23:39:44 -0000	1.22
+++ mapserver.spec	4 Apr 2009 21:49:19 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           mapserver
-Version:        5.2.1
-Release:        7%{?dist}
+Version:        5.2.2
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -240,6 +240,11 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sun Apr 5 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.2-1
+- Update to 5.2.2 which fixes :
+  CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842, 
+  CVE-2009-0843, CVE-2009-1176, CVE-2009-1177.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Dec 2008 08:19:24 -0000	1.7
+++ sources	4 Apr 2009 21:49:19 -0000	1.8
@@ -0,0 +1 @@
+87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz



From devrim at fedoraproject.org  Sat Apr  4 22:28:12 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat,  4 Apr 2009 22:28:12 +0000 (UTC)
Subject: rpms/mapserver/F-9 .cvsignore, 1.4, 1.5 mapserver.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <20090404222812.D805670130@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27260

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
- Update to 5.2.2 which fixes :
  CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842,
  CVE-2009-0843, CVE-2009-1176, CVE-2009-1177.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jun 2008 17:23:06 -0000	1.4
+++ .cvsignore	4 Apr 2009 22:27:42 -0000	1.5
@@ -1 +1 @@
-mapserver-5.0.3.tar.gz
+mapserver-5.2.2.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-9/mapserver.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mapserver.spec	5 Jul 2008 11:41:59 -0000	1.11
+++ mapserver.spec	4 Apr 2009 22:27:42 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           mapserver
-Version:        5.0.3
-Release:        3%{?dist}
+Version:        5.2.2
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -227,6 +227,11 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sun Apr 5 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.2-1
+- Update to 5.2.2 which fixes :
+  CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842,
+  CVE-2009-0843, CVE-2009-1176, CVE-2009-1177.
+
 * Thu Jul 05 2008 Balint Cristian <rezso at rdsor.ro> 5.0.3-3
 - address bz#453925
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Jun 2008 17:23:06 -0000	1.5
+++ sources	4 Apr 2009 22:27:42 -0000	1.6
@@ -1 +1 @@
-953a131497132baef84ca33f8432d299  mapserver-5.0.3.tar.gz
+87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz



From devrim at fedoraproject.org  Sat Apr  4 22:52:25 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat,  4 Apr 2009 22:52:25 +0000 (UTC)
Subject: rpms/mapserver/F-10 .cvsignore, 1.6, 1.7 mapserver.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20090404225225.1611670130@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv720

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
- Update to 5.2.2 which fixes :
  CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842,
  CVE-2009-0843, CVE-2009-1176, CVE-2009-1177.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2008 08:29:29 -0000	1.6
+++ .cvsignore	4 Apr 2009 22:51:53 -0000	1.7
@@ -1 +1 @@
-mapserver-5.2.1.tar.gz
+mapserver-5.2.2.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-10/mapserver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mapserver.spec	7 Dec 2008 13:13:27 -0000	1.15
+++ mapserver.spec	4 Apr 2009 22:51:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mapserver
-Version:        5.2.1
-Release:        2%{?dist}
+Version:        5.2.2
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -230,6 +230,11 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sun Apr 5 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.2-1
+- Update to 5.2.2 which fixes :
+  CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842,
+  CVE-2009-0843, CVE-2009-1176, CVE-2009-1177.
+
 * Sat Dec 07 2008 Balint Cristian <rezso at rdsor.ro> 5.2.1-2
 - enable agg render engine
 - enable fribidi renderer


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Dec 2008 08:29:30 -0000	1.7
+++ sources	4 Apr 2009 22:51:53 -0000	1.8
@@ -1 +1 @@
-26cea03c01096d994e02802fda019ae1  mapserver-5.2.1.tar.gz
+87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz



From thias at fedoraproject.org  Sat Apr  4 23:16:15 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat,  4 Apr 2009 23:16:15 +0000 (UTC)
Subject: rpms/python-Coherence/devel python-Coherence.spec,1.10,1.11
Message-ID: <20090404231615.AB6CA70130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-Coherence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6554

Modified Files:
	python-Coherence.spec 
Log Message:
Re-add re-needed re-python-twisted re-quirements (#485093).



Index: python-Coherence.spec
===================================================================
RCS file: /cvs/extras/rpms/python-Coherence/devel/python-Coherence.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-Coherence.spec	24 Feb 2009 01:46:52 -0000	1.10
+++ python-Coherence.spec	4 Apr 2009 23:15:44 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Python framework to participate in digital living networks
 Name: python-Coherence
 Version: 0.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/Languages
 URL: https://coherence.beebits.net/
@@ -11,11 +11,14 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-setuptools
 # As of 0.5.8, only "ConfigObj >= 4.3" in the requires.txt egg file
-#Requires: python-twisted-core
-#Requires: python-twisted-web
+# As of 0.6.2, "Twisted >= 2.5.0" is there too, and "web" is req for sure
+Requires: python-twisted-core
+Requires: python-twisted-web
 #Requires: python-nevow
 Requires: python-louie
 Requires: python-configobj
+# Needed for the parent directory
+Requires: dbus
 BuildRequires: python-devel
 # Must have setuptools to build the package
 BuildRequires: python-setuptools-devel
@@ -47,10 +50,10 @@
 %{__python} setup.py install \
     --single-version-externally-managed \
     -O1 --skip-build --root %{buildroot}
+# Install the D-Bus service file
+%{__mkdir_p} %{buildroot}/%{_datadir}/dbus-1/services
+%{__cp} -a misc/org.Coherence.service %{buildroot}/%{_datadir}/dbus-1/services/
 
-# Install the D-Bus service file properly
-mkdir -p %{buildroot}/%{_datadir}/dbus-1/services
-cp -a misc/org.Coherence.service %{buildroot}/%{_datadir}/dbus-1/services
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -61,7 +64,7 @@
 %doc LICENCE README docs/*
 %exclude %{_bindir}/applet-coherence
 %{_bindir}/coherence
-%{_datadir}/dbus-1/services/*
+%{_datadir}/dbus-1/services/org.Coherence.service
 %{python_sitelib}/Coherence-*.egg-info/
 %{python_sitelib}/coherence/
 # We don't want this in the package
@@ -69,6 +72,10 @@
 
 
 %changelog
+* Sun Apr  5 2009 Matthias Saou <http://freshrpms.net/> 0.6.2-2
+- Re-add re-needed re-python-twisted re-quirements (#485093).
+- Require dbus for proper parent directory ownership.
+
 * Tue Feb 24 2009 - Bastien Nocera <bnocera at redhat.com> - 0.6.2-1
 - Update to 0.6.2
 



From pkgdb at fedoraproject.org  Sat Apr  4 23:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 04 Apr 2009 23:26:46 +0000
Subject: [pkgdb] kdegames: rdieter has given up approveacls
Message-ID: <20090404232701.42742208497@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Sat Apr  4 23:27:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 04 Apr 2009 23:27:10 +0000
Subject: [pkgdb] kdegames: rdieter has requested approveacls
Message-ID: <20090404232704.D22452086F3@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From oget at fedoraproject.org  Sat Apr  4 23:47:22 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat,  4 Apr 2009 23:47:22 +0000 (UTC)
Subject: rpms/tuxguitar/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tuxguitar.spec, 1.3, 1.4
Message-ID: <20090404234722.B8F5C70130@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14376

Modified Files:
	.cvsignore sources tuxguitar.spec 
Log Message:
* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
- New upstream version
- Clean-up the SPEC file
- Include GCJ-AOT-bits



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2008 17:40:22 -0000	1.2
+++ .cvsignore	4 Apr 2009 23:46:51 -0000	1.3
@@ -1 +1 @@
-tuxguitar-src-1.0.tar.gz
+tuxguitar-src-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2008 17:40:22 -0000	1.2
+++ sources	4 Apr 2009 23:46:51 -0000	1.3
@@ -1 +1 @@
-a9873adad0df58202d889648eb484879  tuxguitar-src-1.0.tar.gz
+fbb664eca06e564bf1f2384930df2a7e  tuxguitar-src-1.1.tar.gz


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/tuxguitar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tuxguitar.spec	25 Feb 2009 22:13:51 -0000	1.3
+++ tuxguitar.spec	4 Apr 2009 23:46:51 -0000	1.4
@@ -1,46 +1,47 @@
-Summary: A multitrack tablature editor and player written in Java-SWT
-Name: tuxguitar
-Version: 1.0
-Release: 9%{?dist}
-URL: http://www.tuxguitar.com.ar
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-Source9: %{name}.desktop
-License: LGPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The package java-icedtea is not available on F-8 for ppc & ppc64.
-# https://bugzilla.redhat.com/show_bug.cgi?id=464843
-%if "%{fedora}" == "8"
-ExcludeArch: ppc ppc64
+%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+
+Summary:          A multitrack tablature editor and player written in Java-SWT
+Name:             tuxguitar
+Version:          1.1
+Release:          1%{?dist}
+URL:              http://www.tuxguitar.com.ar
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+Source9:          %{name}.desktop
+License:          LGPLv2+
+Group:            Applications/Multimedia
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:         itext
+Requires:         java >= 1.7
+Requires:         jpackage-utils
+Requires:         libswt3-gtk2
+BuildRequires:    alsa-lib-devel
+BuildRequires:    ant
+BuildRequires:    itext
+BuildRequires:    desktop-file-utils
+BuildRequires:    fluidsynth-devel
+BuildRequires:    java-devel >= 1.7
+BuildRequires:    jpackage-utils
+BuildRequires:    libswt3-gtk2
+%if %{with_gcj}
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %endif
-Requires: itext
-Requires: java >= 1.7
-Requires: jpackage-utils
-Requires: libswt3-gtk2
-BuildRequires: alsa-lib-devel
-BuildRequires: ant
-BuildRequires: itext
-BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
-BuildRequires: java-devel >= 1.7
-BuildRequires: jpackage-utils
-BuildRequires: libswt3-gtk2
+
 
 %description
-TuxGuitar is a guitar tablature editor with player support through 
-midi. It can display scores and multitrack tabs. Various features 
-TuxGuitar provides include autoscrolling while playing, note 
-duration management, bend/slide/vibrato/hammer-on/pull-off effects,
-support for tuplets, time signature management, tempo management,
-gp3/gp4/gp5 import and export.
+TuxGuitar is a guitar tablature editor with player support through midi. It can
+display scores and multitrack tabs. Various features TuxGuitar provides include
+autoscrolling while playing, note duration management, bend/slide/vibrato/
+hammer-on/pull-off effects, support for tuplets, time signature management, 
+tempo management, gp3/gp4/gp5 import and export.
 
 %prep
 %setup -q -n %{name}-src-%{version}
 
 # The following issues were discussed in:
 # http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Prevent static library paths to be built in TuxGuitar.jar (META-INF/MANIFEST.MF)
-sed -i 's/<attribute name="Class-Path" value="${lib.swt.jar} ${dist.share.path}"\/>//' TuxGuitar/build.xml
 # Declare the library path and classpath during runtime instead
 sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
 sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
@@ -48,24 +49,39 @@
 sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
 
 # Change /lib to %%{_lib}, just in case
-sed -i 's/\/lib\//\/%{_lib}\//g' Makefile
-sed -i 's/\/lib\//\/%{_lib}\//g' misc/tuxguitar.sh
-sed -i 's/\/lib\//\/%{_lib}\//g' TuxGuitar/xml/build-linux.xml
+sed -i 's|/lib/|/%{_lib}/|g' Makefile
+sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
+sed -i 's|/lib/|/%{_lib}/|g' TuxGuitar/xml/build-linux.xml
 # Don't strip the binaries during %%install
 sed -i 's/install -s/install -m 755/g' Makefile
-# Remove pre-shipped binaries
-find -name .DS_Store -exec rm {} \;
+
+# Enable extra plugins:
+sed -i 's|TuxGuitar-pdf \\|\\\
+ TuxGuitar-pdf \\\
+ TuxGuitar-browser-ftp \\\
+ TuxGuitar-gervill \\|' \
+ Makefile
+sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
+ \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
+ \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
+ \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
+ Makefile
+
+
+# Set debug="true" on javac part of the build scripts.
+for file in $(find . -name build.xml); do
+ sed -i 's|debug="false"|debug="true"|' $file
+done
+
 
 %build
 # Does not compile with %%{?_smp_mflags}. Build using openjdk. 
-# Note that the lib directory is /usr/lib for openjdk, regardless of the architecture.
-%if "%{fedora}" == "8"
- %define openjdkdir /usr/lib/jvm/java-icedtea
-%else
- %define openjdkdir /usr/lib/jvm/java-openjdk
-%endif
 # SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar CFLAGS="${RPM_OPT_FLAGS} -I%{openjdkdir}/include -I%{openjdkdir}/include/linux -fPIC"
+make SWT_JAR=%{_libdir}/java/swt.jar \
+     CFLAGS="${RPM_OPT_FLAGS} \
+             -I%{_jvmdir}/java-openjdk/include \
+             -I%{_jvmdir}/java-openjdk/include/linux \
+             -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,15 +102,15 @@
 # icons
 for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
  install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
+ install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
  install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
   $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
-done
-
-# mime-type icons
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes
-for type in tuxguitar gtp ptb; do
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-96x96.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes/audio-x-${type}.png
+ install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
+ ln -sf audio-x-%{name}.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
+ ln -sf audio-x-%{name}.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
 done
 
 # desktop files
@@ -107,24 +123,41 @@
 install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
 install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
 
+%if %{with_gcj}
+ %{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%if %{with_gcj}
+ if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+  %{_bindir}/rebuild-gcj-db
+ fi
+%endif
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime  >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null || :
 
 %postun
-update-mime-database %{_datadir}/mime  >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%if %{with_gcj}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+  then
+  %{_bindir}/rebuild-gcj-db
+ fi
+%endif
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime  >& /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -136,30 +169,39 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/*.xml
 
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}
+%endif
+
 %{_bindir}/%{name}
 
 %changelog
+* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
+- New upstream version
+- Clean-up the SPEC file
+- Include GCJ-AOT-bits
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Oct 15 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-8
+* Wed Oct 15 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-8
 - Enabled the PDF plugin since all the dependencies are now provided in repos
 
-* Thu Oct 02 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-7
+* Thu Oct 02 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-7
 - Added "exec" to replace the called shell to java process in the launching script
 
-* Wed Oct 01 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-6
+* Wed Oct 01 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-6
 - Required libswt3-gtk2 since rpmbuild doesn't pick it up.
 - Some more cleanup in the spec file
 - Fixed a typo regarding installation of icons
 - Called update-desktop-database in %%post and %%postun
 - jni files put in %%_libdir_/%%name.
 
-* Mon Sep 29 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-5
+* Mon Sep 29 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-5
 - Compiled the package with openjdk instead of gcj.
 - ExcludeArch'ed ppc/ppc64 on F-8.
 
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-4
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-4
 - Added the comment about %%{?_smp_mflags}
 - Used macros more extensively.
 - Changed the license to LGPLv2+
@@ -168,16 +210,16 @@
 - Removed pre-shipped binaries
 - Fixed %%defattr
 
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-3
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-3
 - Fixed java requirement issue by requiring icedtea for F-8 and openjdk for F-9+
 - Patched the source to enable the fluidsynth plugin
 - Added DistTag
 - Patched the source in order to pass RPM_OPT_FLAGS to gcc
 - Removed ExclusiveArch
 
-* Thu Sep 25 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-2
+* Thu Sep 25 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-2
 - Added desktop-file-utils to BuildRequires.
 - Replaced java-1.7.0-icedtea with java-1.6.0-openjdk in Requires.
 
-* Wed Sep 24 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-1
+* Wed Sep 24 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-1
 - Initial build.



From devrim at fedoraproject.org  Sat Apr  4 23:47:51 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat,  4 Apr 2009 23:47:51 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.23,1.24
Message-ID: <20090404234751.E83BF70130@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14430

Modified Files:
	mapserver.spec 
Log Message:
One more try to build package on F11.



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mapserver.spec	4 Apr 2009 21:49:19 -0000	1.23
+++ mapserver.spec	4 Apr 2009 23:47:21 -0000	1.24
@@ -13,7 +13,7 @@
 BuildRequires:  libXpm-devel
 BuildRequires:  httpd-devel php-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  postgresql-devel mysql-devel
+BuildRequires:  postgresql-devel mysql-devel java-1.6.0-openjdk-devel
 BuildRequires:  java-devel swig > 1.3.24 java
 BuildRequires:  geos-devel proj-devel gdal-devel agg-devel
 BuildRequires:  php-devel freetype-devel gd-devel >= 2.0.16



From oget at fedoraproject.org  Sat Apr  4 23:51:56 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat,  4 Apr 2009 23:51:56 +0000 (UTC)
Subject: rpms/tuxguitar/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tuxguitar.spec, 1.2, 1.3
Message-ID: <20090404235156.54D8870130@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15090

Modified Files:
	.cvsignore sources tuxguitar.spec 
Log Message:
* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
- New upstream version
- Clean-up the SPEC file
- Include GCJ-AOT-bits



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2008 17:40:22 -0000	1.2
+++ .cvsignore	4 Apr 2009 23:51:25 -0000	1.3
@@ -1 +1 @@
-tuxguitar-src-1.0.tar.gz
+tuxguitar-src-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2008 17:40:22 -0000	1.2
+++ sources	4 Apr 2009 23:51:25 -0000	1.3
@@ -1 +1 @@
-a9873adad0df58202d889648eb484879  tuxguitar-src-1.0.tar.gz
+fbb664eca06e564bf1f2384930df2a7e  tuxguitar-src-1.1.tar.gz


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-10/tuxguitar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tuxguitar.spec	16 Oct 2008 04:06:22 -0000	1.2
+++ tuxguitar.spec	4 Apr 2009 23:51:26 -0000	1.3
@@ -1,46 +1,47 @@
-Summary: A multitrack tablature editor and player written in Java-SWT
-Name: tuxguitar
-Version: 1.0
-Release: 8%{?dist}
-URL: http://www.tuxguitar.com.ar
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-Source9: %{name}.desktop
-License: LGPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The package java-icedtea is not available on F-8 for ppc & ppc64.
-# https://bugzilla.redhat.com/show_bug.cgi?id=464843
-%if "%{fedora}" == "8"
-ExcludeArch: ppc ppc64
+%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+
+Summary:          A multitrack tablature editor and player written in Java-SWT
+Name:             tuxguitar
+Version:          1.1
+Release:          1%{?dist}
+URL:              http://www.tuxguitar.com.ar
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+Source9:          %{name}.desktop
+License:          LGPLv2+
+Group:            Applications/Multimedia
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:         itext
+Requires:         java >= 1.7
+Requires:         jpackage-utils
+Requires:         libswt3-gtk2
+BuildRequires:    alsa-lib-devel
+BuildRequires:    ant
+BuildRequires:    itext
+BuildRequires:    desktop-file-utils
+BuildRequires:    fluidsynth-devel
+BuildRequires:    java-devel >= 1.7
+BuildRequires:    jpackage-utils
+BuildRequires:    libswt3-gtk2
+%if %{with_gcj}
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %endif
-Requires: itext
-Requires: java >= 1.7
-Requires: jpackage-utils
-Requires: libswt3-gtk2
-BuildRequires: alsa-lib-devel
-BuildRequires: ant
-BuildRequires: itext
-BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
-BuildRequires: java-devel >= 1.7
-BuildRequires: jpackage-utils
-BuildRequires: libswt3-gtk2
+
 
 %description
-TuxGuitar is a guitar tablature editor with player support through 
-midi. It can display scores and multitrack tabs. Various features 
-TuxGuitar provides include autoscrolling while playing, note 
-duration management, bend/slide/vibrato/hammer-on/pull-off effects,
-support for tuplets, time signature management, tempo management,
-gp3/gp4/gp5 import and export.
+TuxGuitar is a guitar tablature editor with player support through midi. It can
+display scores and multitrack tabs. Various features TuxGuitar provides include
+autoscrolling while playing, note duration management, bend/slide/vibrato/
+hammer-on/pull-off effects, support for tuplets, time signature management, 
+tempo management, gp3/gp4/gp5 import and export.
 
 %prep
 %setup -q -n %{name}-src-%{version}
 
 # The following issues were discussed in:
 # http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Prevent static library paths to be built in TuxGuitar.jar (META-INF/MANIFEST.MF)
-sed -i 's/<attribute name="Class-Path" value="${lib.swt.jar} ${dist.share.path}"\/>//' TuxGuitar/build.xml
 # Declare the library path and classpath during runtime instead
 sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
 sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
@@ -48,24 +49,39 @@
 sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
 
 # Change /lib to %%{_lib}, just in case
-sed -i 's/\/lib\//\/%{_lib}\//g' Makefile
-sed -i 's/\/lib\//\/%{_lib}\//g' misc/tuxguitar.sh
-sed -i 's/\/lib\//\/%{_lib}\//g' TuxGuitar/xml/build-linux.xml
+sed -i 's|/lib/|/%{_lib}/|g' Makefile
+sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
+sed -i 's|/lib/|/%{_lib}/|g' TuxGuitar/xml/build-linux.xml
 # Don't strip the binaries during %%install
 sed -i 's/install -s/install -m 755/g' Makefile
-# Remove pre-shipped binaries
-find -name .DS_Store -exec rm {} \;
+
+# Enable extra plugins:
+sed -i 's|TuxGuitar-pdf \\|\\\
+ TuxGuitar-pdf \\\
+ TuxGuitar-browser-ftp \\\
+ TuxGuitar-gervill \\|' \
+ Makefile
+sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
+ \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
+ \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
+ \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
+ Makefile
+
+
+# Set debug="true" on javac part of the build scripts.
+for file in $(find . -name build.xml); do
+ sed -i 's|debug="false"|debug="true"|' $file
+done
+
 
 %build
 # Does not compile with %%{?_smp_mflags}. Build using openjdk. 
-# Note that the lib directory is /usr/lib for openjdk, regardless of the architecture.
-%if "%{fedora}" == "8"
- %define openjdkdir /usr/lib/jvm/java-icedtea
-%else
- %define openjdkdir /usr/lib/jvm/java-openjdk
-%endif
 # SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar CFLAGS="${RPM_OPT_FLAGS} -I%{openjdkdir}/include -I%{openjdkdir}/include/linux -fPIC"
+make SWT_JAR=%{_libdir}/java/swt.jar \
+     CFLAGS="${RPM_OPT_FLAGS} \
+             -I%{_jvmdir}/java-openjdk/include \
+             -I%{_jvmdir}/java-openjdk/include/linux \
+             -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,15 +102,15 @@
 # icons
 for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
  install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
+ install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
  install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
   $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
-done
-
-# mime-type icons
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes
-for type in tuxguitar gtp ptb; do
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-96x96.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes/audio-x-${type}.png
+ install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
+ ln -sf audio-x-%{name}.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
+ ln -sf audio-x-%{name}.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
 done
 
 # desktop files
@@ -107,24 +123,41 @@
 install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
 install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
 
+%if %{with_gcj}
+ %{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%if %{with_gcj}
+ if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+  %{_bindir}/rebuild-gcj-db
+ fi
+%endif
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime  >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null || :
 
 %postun
-update-mime-database %{_datadir}/mime  >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%if %{with_gcj}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+  then
+  %{_bindir}/rebuild-gcj-db
+ fi
+%endif
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime  >& /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -136,27 +169,36 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/*.xml
 
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}
+%endif
+
 %{_bindir}/%{name}
 
 %changelog
-* Wed Oct 15 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-8
+* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
+- New upstream version
+- Clean-up the SPEC file
+- Include GCJ-AOT-bits
+
+* Wed Oct 15 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-8
 - Enabled the PDF plugin since all the dependencies are now provided in repos
 
-* Thu Oct 02 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-7
+* Thu Oct 02 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-7
 - Added "exec" to replace the called shell to java process in the launching script
 
-* Wed Oct 01 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-6
+* Wed Oct 01 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-6
 - Required libswt3-gtk2 since rpmbuild doesn't pick it up.
 - Some more cleanup in the spec file
 - Fixed a typo regarding installation of icons
 - Called update-desktop-database in %%post and %%postun
 - jni files put in %%_libdir_/%%name.
 
-* Mon Sep 29 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-5
+* Mon Sep 29 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-5
 - Compiled the package with openjdk instead of gcj.
 - ExcludeArch'ed ppc/ppc64 on F-8.
 
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-4
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-4
 - Added the comment about %%{?_smp_mflags}
 - Used macros more extensively.
 - Changed the license to LGPLv2+
@@ -165,16 +207,16 @@
 - Removed pre-shipped binaries
 - Fixed %%defattr
 
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-3
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-3
 - Fixed java requirement issue by requiring icedtea for F-8 and openjdk for F-9+
 - Patched the source to enable the fluidsynth plugin
 - Added DistTag
 - Patched the source in order to pass RPM_OPT_FLAGS to gcc
 - Removed ExclusiveArch
 
-* Thu Sep 25 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-2
+* Thu Sep 25 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-2
 - Added desktop-file-utils to BuildRequires.
 - Replaced java-1.7.0-icedtea with java-1.6.0-openjdk in Requires.
 
-* Wed Sep 24 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-1
+* Wed Sep 24 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-1
 - Initial build.



From oget at fedoraproject.org  Sun Apr  5 00:24:02 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun,  5 Apr 2009 00:24:02 +0000 (UTC)
Subject: rpms/tuxguitar/F-9 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tuxguitar.spec, 1.1, 1.2
Message-ID: <20090405002402.EEA207011F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19224

Modified Files:
	.cvsignore sources tuxguitar.spec 
Log Message:
* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
- New upstream version
- Clean-up the SPEC file
- Include GCJ-AOT-bits



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2008 17:43:23 -0000	1.2
+++ .cvsignore	5 Apr 2009 00:23:32 -0000	1.3
@@ -1 +1 @@
-tuxguitar-src-1.0.tar.gz
+tuxguitar-src-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2008 17:43:23 -0000	1.2
+++ sources	5 Apr 2009 00:23:32 -0000	1.3
@@ -1 +1 @@
-a9873adad0df58202d889648eb484879  tuxguitar-src-1.0.tar.gz
+fbb664eca06e564bf1f2384930df2a7e  tuxguitar-src-1.1.tar.gz


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-9/tuxguitar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxguitar.spec	3 Oct 2008 17:43:23 -0000	1.1
+++ tuxguitar.spec	5 Apr 2009 00:23:32 -0000	1.2
@@ -1,72 +1,87 @@
-Summary: A multitrack tablature editor and player written in Java-SWT
-Name: tuxguitar
-Version: 1.0
-Release: 7%{?dist}
-URL: http://www.tuxguitar.com.ar
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-Source9: %{name}.desktop
-License: LGPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The package java-icedtea is not available on F-8 for ppc & ppc64.
-# https://bugzilla.redhat.com/show_bug.cgi?id=464843
-%if "%{fedora}" == "8"
-ExcludeArch: ppc ppc64
+%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+
+Summary:          A multitrack tablature editor and player written in Java-SWT
+Name:             tuxguitar
+Version:          1.1
+Release:          1%{?dist}
+URL:              http://www.tuxguitar.com.ar
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+Source9:          %{name}.desktop
+License:          LGPLv2+
+Group:            Applications/Multimedia
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:         java >= 1.7
+Requires:         jpackage-utils
+Requires:         libswt3-gtk2
+BuildRequires:    alsa-lib-devel
+BuildRequires:    ant
+BuildRequires:    desktop-file-utils
+BuildRequires:    fluidsynth-devel
+BuildRequires:    java-devel >= 1.7
+BuildRequires:    jpackage-utils
+BuildRequires:    libswt3-gtk2
+%if %{with_gcj}
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %endif
-Requires: java >= 1.7
-Requires: jpackage-utils
-Requires: libswt3-gtk2
-BuildRequires: alsa-lib-devel
-BuildRequires: ant
-BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
-BuildRequires: java-devel >= 1.7
-BuildRequires: jpackage-utils
-BuildRequires: libswt3-gtk2
+
 
 %description
-TuxGuitar is a guitar tablature editor with player support through 
-midi. It can display scores and multitrack tabs. Various features 
-TuxGuitar provides include autoscrolling while playing, note 
-duration management, bend/slide/vibrato/hammer-on/pull-off effects,
-support for tuplets, time signature management, tempo management,
-gp3/gp4/gp5 import and export.
+TuxGuitar is a guitar tablature editor with player support through midi. It can
+display scores and multitrack tabs. Various features TuxGuitar provides include
+autoscrolling while playing, note duration management, bend/slide/vibrato/
+hammer-on/pull-off effects, support for tuplets, time signature management, 
+tempo management, gp3/gp4/gp5 import and export.
 
 %prep
 %setup -q -n %{name}-src-%{version}
 
 # The following issues were discussed in:
 # http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Prevent static library paths to be built in TuxGuitar.jar (META-INF/MANIFEST.MF)
-sed -i 's/<attribute name="Class-Path" value="${lib.swt.jar} ${dist.share.path}"\/>//' TuxGuitar/build.xml
 # Declare the library path and classpath during runtime instead
 sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
 sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
 # Add exec to replace the called shell
 sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
+# Disable the pdf plugin that depends on "iText" which is currently not available on Fedora 9
+sed -i '\|TuxGuitar-pdf|d' Makefile
 
-# Disable the pdf plugin that depends on "iText" which is currently not available on Fedora
-sed -i 's/TuxGuitar-pdf \\/\\/g' Makefile
-sed -i 's/.\/TuxGuitar-pdf\/tuxguitar-pdf.jar \\/\\/g' Makefile
 # Change /lib to %%{_lib}, just in case
-sed -i 's/\/lib\//\/%{_lib}\//g' Makefile
-sed -i 's/\/lib\//\/%{_lib}\//g' misc/tuxguitar.sh
-sed -i 's/\/lib\//\/%{_lib}\//g' TuxGuitar/xml/build-linux.xml
+sed -i 's|/lib/|/%{_lib}/|g' Makefile
+sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
+sed -i 's|/lib/|/%{_lib}/|g' TuxGuitar/xml/build-linux.xml
 # Don't strip the binaries during %%install
 sed -i 's/install -s/install -m 755/g' Makefile
-# Remove pre-shipped binaries
-find -name .DS_Store -exec rm {} \;
+
+# Enable extra plugins:
+sed -i 's|TuxGuitar-pdf \\|\\\
+ TuxGuitar-pdf \\\
+ TuxGuitar-browser-ftp \\\
+ TuxGuitar-gervill \\|' \
+ Makefile
+sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
+ \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
+ \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
+ \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
+ Makefile
+
+
+# Set debug="true" on javac part of the build scripts.
+for file in $(find . -name build.xml); do
+ sed -i 's|debug="false"|debug="true"|' $file
+done
+
 
 %build
 # Does not compile with %%{?_smp_mflags}. Build using openjdk. 
-# Note that the lib directory is /usr/lib for openjdk, regardless of the architecture.
-%if "%{fedora}" == "8"
- %define openjdkdir /usr/lib/jvm/java-icedtea
-%else
- %define openjdkdir /usr/lib/jvm/java-openjdk
-%endif
 # SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar CFLAGS="${RPM_OPT_FLAGS} -I%{openjdkdir}/include -I%{openjdkdir}/include/linux -fPIC"
+make SWT_JAR=%{_libdir}/java/swt.jar \
+     CFLAGS="${RPM_OPT_FLAGS} \
+             -I%{_jvmdir}/java-openjdk/include \
+             -I%{_jvmdir}/java-openjdk/include/linux \
+             -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,15 +102,15 @@
 # icons
 for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
  install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
+ install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
  install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
   $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
-done
-
-# mime-type icons
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes
-for type in tuxguitar gtp ptb; do
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-96x96.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes/audio-x-${type}.png
+ install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
+ ln -sf audio-x-%{name}.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
+ ln -sf audio-x-%{name}.png \
+  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
 done
 
 # desktop files
@@ -108,24 +123,41 @@
 install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
 install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
 
+%if %{with_gcj}
+ %{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%if %{with_gcj}
+ if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+  %{_bindir}/rebuild-gcj-db
+ fi
+%endif
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime  >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null || :
 
 %postun
-update-mime-database %{_datadir}/mime  >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%if %{with_gcj}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+  then
+  %{_bindir}/rebuild-gcj-db
+ fi
+%endif
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime  >& /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -137,24 +169,33 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/*.xml
 
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}
+%endif
+
 %{_bindir}/%{name}
 
 %changelog
-* Thu Oct 02 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-7
+* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
+- New upstream version
+- Clean-up the SPEC file
+- Include GCJ-AOT-bits
+
+* Thu Oct 02 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-7
 - Added "exec" to replace the called shell to java process in the launching script
 
-* Wed Oct 01 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-6
+* Wed Oct 01 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-6
 - Required libswt3-gtk2 since rpmbuild doesn't pick it up.
 - Some more cleanup in the spec file
 - Fixed a typo regarding installation of icons
 - Called update-desktop-database in %%post and %%postun
 - jni files put in %%_libdir_/%%name.
 
-* Mon Sep 29 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-5
+* Mon Sep 29 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-5
 - Compiled the package with openjdk instead of gcj.
 - ExcludeArch'ed ppc/ppc64 on F-8.
 
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-4
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-4
 - Added the comment about %%{?_smp_mflags}
 - Used macros more extensively.
 - Changed the license to LGPLv2+
@@ -163,16 +204,16 @@
 - Removed pre-shipped binaries
 - Fixed %%defattr
 
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-3
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-3
 - Fixed java requirement issue by requiring icedtea for F-8 and openjdk for F-9+
 - Patched the source to enable the fluidsynth plugin
 - Added DistTag
 - Patched the source in order to pass RPM_OPT_FLAGS to gcc
 - Removed ExclusiveArch
 
-* Thu Sep 25 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-2
+* Thu Sep 25 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-2
 - Added desktop-file-utils to BuildRequires.
 - Replaced java-1.7.0-icedtea with java-1.6.0-openjdk in Requires.
 
-* Wed Sep 24 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-1
+* Wed Sep 24 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-1
 - Initial build.



From sindrepb at fedoraproject.org  Sun Apr  5 00:35:42 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sun,  5 Apr 2009 00:35:42 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel
	awn-extras-applets-0.3.2.1-python-platform.patch, 1.2,
	1.3 awn-extras-applets.spec, 1.20, 1.21
Message-ID: <20090405003542.3240D7011F@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20688

Modified Files:
	awn-extras-applets-0.3.2.1-python-platform.patch 
	awn-extras-applets.spec 
Log Message:
fix python on 64bit, for real, promise

awn-extras-applets-0.3.2.1-python-platform.patch:

Index: awn-extras-applets-0.3.2.1-python-platform.patch
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets-0.3.2.1-python-platform.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- awn-extras-applets-0.3.2.1-python-platform.patch	2 Apr 2009 18:13:04 -0000	1.2
+++ awn-extras-applets-0.3.2.1-python-platform.patch	5 Apr 2009 00:35:41 -0000	1.3
@@ -1,6 +1,462 @@
+diff -up ./acinclude.m4.orig ./acinclude.m4
+--- ./acinclude.m4.orig	2009-04-03 22:45:50.000000000 +0200
++++ ./acinclude.m4	2009-04-03 22:48:32.000000000 +0200
+@@ -1,11 +1,404 @@
+-m4_include([m4/python.m4])
++dnl AC_PYTHON_DEVEL([version])
++dnl 
++dnl Originally copied from http://autoconf-archive.cryp.to/ac_python_devel.html
++dnl (Original last modified 2007-07-31)
++dnl 
++dnl Copyright ?? 2007 Sebastian Huber <sebastian-huber at web.de>
++dnl Copyright ?? 2007 Alan W. Irwin <irwin at beluga.phys.uvic.ca>
++dnl Copyright ?? 2007 Rafael Laboissiere <rafael at laboissiere.net>
++dnl Copyright ?? 2007 Andrew Collier <colliera at ukzn.ac.za>
++dnl Copyright ?? 2007 Matteo Settenvini <matteo at member.fsf.org>
++dnl Copyright ?? 2007 Horst Knorr <hk_classes at knoda.org>
++dnl
++dnl This program is free software: you can redistribute it and/or modify it
++dnl under the terms of the GNU General Public License as published by the Free
++dnl Software Foundation, either version 3 of the License, or (at your option)
++dnl any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful, but WITHOUT
++dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++dnl more details.
++dnl
++dnl You should have received a copy of the GNU General Public License along with
++dnl this program. If not, see <http://www.gnu.org/licenses/>.
++dnl
++dnl As a special exception, the respective Autoconf Macro's copyright owner
++dnl gives unlimited permission to copy, distribute and modify the configure
++dnl scripts that are the output of Autoconf when processing the Macro. You need
++dnl not follow the terms of the GNU General Public License when using or
++dnl distributing such scripts, even though portions of the text of the Macro
++dnl appear in them. The GNU General Public License (GPL) does govern all other
++dnl use of the material that constitutes the Autoconf Macro.
++dnl
++dnl This special exception to the GPL applies to versions of the Autoconf Macro
++dnl released by the Autoconf Macro Archive. When you make and distribute a
++dnl modified version of the Autoconf Macro, you may extend this special
++dnl exception to the GPL to apply to your modified version as well.
++dnl
++AC_DEFUN([AC_PYTHON_DEVEL],[
++        #
++        # Allow the use of a (user set) custom python version
++        #
++        AC_ARG_VAR([PYTHON_VERSION],[The installed Python
++                version to use, for example '2.3'. This string
++                will be appended to the Python interpreter
++                canonical name.])
++
++        AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
++        if test -z "$PYTHON"; then
++           AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
++           PYTHON_VERSION=""
++        fi
++
++        #
++        # Check for a version of Python >= 2.1.0
++        #
++        AC_MSG_CHECKING([for a version of Python >= 2.1.0])
++        ac_supports_python_ver=`$PYTHON -c "import sys, string; \
++                ver = string.split(sys.version)[[0]]; \
++                print ver >= '2.1.0'"`
++        if test "$ac_supports_python_ver" != "True"; then
++                if test -z "$PYTHON_NOVERSIONCHECK"; then
++                        AC_MSG_RESULT([no])
++                        AC_MSG_FAILURE([
++This version of the AC@&t at _PYTHON_DEVEL macro
++doesn't work properly with versions of Python before
++2.1.0. You may need to re-run configure, setting the
++variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
++PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
++Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
++to something else than an empty string.
++])
++                else
++                        AC_MSG_RESULT([skip at user request])
++                fi
++        else
++                AC_MSG_RESULT([yes])
++        fi
++
++        #
++        # if the macro parameter ``version'' is set, honour it
++        #
++        if test -n "$1"; then
++                AC_MSG_CHECKING([for a version of Python >= $1])
++                ac_supports_python_ver=`$PYTHON -c "import sys, string; \
++                        ver = string.split(sys.version)[[0]]; \
++                        print ver >= '$1'"`
++                if test "$ac_supports_python_ver" = "True"; then
++                   AC_MSG_RESULT([yes])
++                else
++                        AC_MSG_RESULT([no])
++                        AC_MSG_ERROR([this package requires Python $1.
++If you have it installed, but it isn't the default Python
++interpreter in your system path, please pass the PYTHON_VERSION
++variable to configure. See ``configure --help'' for reference.
++])
++                        PYTHON_VERSION=""
++                fi
++        fi
++
++        #
++        # Check if you have distutils, else fail
++        #
++        AC_MSG_CHECKING([for the distutils Python package])
++        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
++        if test -z "$ac_distutils_result"; then
++                AC_MSG_RESULT([yes])
++        else
++                AC_MSG_RESULT([no])
++                AC_MSG_ERROR([cannot import Python module "distutils".
++Please check your Python installation. The error was:
++$ac_distutils_result])
++                PYTHON_VERSION=""
++        fi
++
++        #
++        # Check for Python include path
++        #
++        AC_MSG_CHECKING([for Python include path])
++        if test -z "$PYTHON_CPPFLAGS"; then
++                python_path=`$PYTHON -c "import distutils.sysconfig; \
++                        print distutils.sysconfig.get_python_inc();"`
++                if test -n "${python_path}"; then
++                        python_path="-I$python_path"
++                fi
++                PYTHON_CPPFLAGS=$python_path
++        fi
++        AC_MSG_RESULT([$PYTHON_CPPFLAGS])
++        AC_SUBST([PYTHON_CPPFLAGS])
++
++        #
++        # Check for Python library path
++        #
++        AC_MSG_CHECKING([for Python library path])
++        if test -z "$PYTHON_LDFLAGS"; then
++                # (makes two attempts to ensure we've got a version number
++                # from the interpreter)
++                py_version=`$PYTHON -c "from distutils.sysconfig import *; \
++                        from string import join; \
++                        print join(get_config_vars('VERSION'))"`
++                if test "$py_version" == "[None]"; then
++                        if test -n "$PYTHON_VERSION"; then
++                                py_version=$PYTHON_VERSION
++                        else
++                                py_version=`$PYTHON -c "import sys; \
++                                        print sys.version[[:3]]"`
++                        fi
++                fi
++
++                PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
++                        from string import join; \
++                        print '-L' + get_python_lib(0,1), \
++                        '-lpython';"`$py_version
++        fi
++        AC_MSG_RESULT([$PYTHON_LDFLAGS])
++        AC_SUBST([PYTHON_LDFLAGS])
++
++        #
++        # Check for the site packages
++        #
++        AC_MSG_CHECKING([for Python site-packages path])
++        AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++        if test -z "$PYTHON_SITE_PKG"; then
++                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
++                        print distutils.sysconfig.get_python_lib(0,0,prefix='${PYTHON_EXEC_PREFIX}');"`
++        fi
++        AC_MSG_RESULT([$PYTHON_SITE_PKG])
++        AC_SUBST([PYTHON_SITE_PKG])
++
++        #
++        # Check for the platform-specific site packages directory
++        #
++        AC_MSG_CHECKING([for Python platform-specific site-packages path])
++        if test -z "$PYTHON_PLATFORM_PKG"; then
++                PYTHON_PLATFORM_PKG=`$PYTHON -c "import distutils.sysconfig; \
++                        print distutils.sysconfig.get_python_lib(1,0,prefix='${PYTHON_EXEC_PREFIX}');"`
++        fi
++        AC_MSG_RESULT([$PYTHON_PLATFORM_PKG])
++        AC_SUBST([PYTHON_PLATFORM_PKG])
++
++        #
++        # libraries which must be linked in when embedding
++        #
++        AC_MSG_CHECKING(python extra libraries)
++        if test -z "$PYTHON_EXTRA_LIBS"; then
++           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
++                conf = distutils.sysconfig.get_config_var; \
++                print conf('LOCALMODLIBS'), conf('LIBS')"`
++        fi
++        AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
++        AC_SUBST(PYTHON_EXTRA_LIBS)
++
++        #
++        # linking flags needed when embedding
++        #
++        AC_MSG_CHECKING(python extra linking flags)
++        if test -z "$PYTHON_EXTRA_LDFLAGS"; then
++                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
++                        conf = distutils.sysconfig.get_config_var; \
++                        print conf('LINKFORSHARED')"`
++        fi
++        AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
++        AC_SUBST(PYTHON_EXTRA_LDFLAGS)
++
++        #
++        # final check to see if everything compiles alright
++        #
++        AC_MSG_CHECKING([consistency of all components of python development environment])
++        AC_LANG_PUSH([C])
++        # save current global flags
++        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
++        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
++        AC_TRY_LINK([
++                #include <Python.h>
++        ],[
++                Py_Initialize();
++        ],[pythonexists=yes],[pythonexists=no])
++
++        AC_MSG_RESULT([$pythonexists])
++
++        if test ! "$pythonexists" = "yes"; then
++           AC_MSG_ERROR([
++  Could not link test program to Python. Maybe the main Python library has been
++  installed in some non-standard library path. If so, pass it to configure,
++  via the LDFLAGS environment variable.
++  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
++  ============================================================================
++   ERROR!
++   You probably have to install the development version of the Python package
++   for your distribution.  The exact name of this package varies among them.
++  ============================================================================
++           ])
++          PYTHON_VERSION=""
++        fi
++        AC_LANG_POP
++        # turn back to default flags
++        CPPFLAGS="$ac_save_CPPFLAGS"
++        LIBS="$ac_save_LIBS"
++
++        #
++        # all done!
++        #
++])
++
++dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
++dnl Check if a module containing a given symbol is visible to python.
++AC_DEFUN([AM_CHECK_PYMOD],
++[AC_REQUIRE([AC_PYTHON_DEVEL])
++py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
++AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
++AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
++ifelse([$2],[], [prog="
++import sys
++try:
++        import $1
++except ImportError:
++        sys.exit(1)
++except:
++        sys.exit(0)
++sys.exit(0)"], [prog="
++import $1
++$1.$2"])
++if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
++  then
++    eval "py_cv_mod_$py_mod_var=yes"
++  else
++    eval "py_cv_mod_$py_mod_var=no"
++  fi
++])
++py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
++if test "x$py_val" != xno; then
++  AC_MSG_RESULT(yes)
++  ifelse([$3], [],, [$3
++])dnl
++else
++  AC_MSG_RESULT(no)
++  ifelse([$4], [],, [$4
++])dnl
++fi
++])
++
++dnl
++dnl JH_ADD_CFLAG(FLAG)
++dnl checks whether the C compiler supports the given flag, and if so, adds
++dnl it to $CFLAGS.  If the flag is already present in the list, then the
++dnl check is not performed.
++AC_DEFUN([JH_ADD_CFLAG],
++[
++case " $CFLAGS " in
++*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
++  ;;
++*)
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS $1"
++  AC_MSG_CHECKING([whether [$]CC understands $1])
++  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
++  AC_MSG_RESULT($jh_has_option)
++  if test $jh_has_option = no; then
++    CFLAGS="$save_CFLAGS"
++  fi
++  ;;
++esac])
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
++
++  AC_ARG_WITH(gconf-source, 
++  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
+ 
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
++
++  AC_ARG_WITH(gconf-schema-file-dir, 
++  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++     [  --disable-schemas-install	Disable the schemas installation],
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
++# vala.m4 serial 1 (vala @VERSION@)
++dnl Autoconf scripts for the Vala compiler
++dnl Copyright (C) 2007  Mathias Hasselmann
++dnl
++dnl This library is free software; you can redistribute it and/or
++dnl modify it under the terms of the GNU Lesser General Public
++dnl License as published by the Free Software Foundation; either
++dnl version 2 of the License, or (at your option) any later version.
++
++dnl This library is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++dnl Lesser General Public License for more details.
++
++dnl You should have received a copy of the GNU Lesser General Public
++dnl License along with this library; if not, write to the Free Software
++dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
++dnl
++dnl Author:
++dnl 	Mathias Hasselmann <mathias.hasselmann at gmx.de>
++dnl --------------------------------------------------------------------------
++
++dnl VALA_PROG_VALAC([MINIMUM-VERSION])
++dnl
++dnl Check whether the Vala compiler exists in `PATH'. If it is found the
++dnl variable VALAC is set. Optionally a minimum release number of the compiler
++dnl can be requested.
++dnl --------------------------------------------------------------------------
++AC_DEFUN([VALA_PROG_VALAC],[
++  AC_PATH_PROG([VALAC], [valac], [])
++  AC_SUBST(VALAC)
++
++  if test -z "x${VALAC}"; then
++    AC_MSG_WARN([No Vala compiler found. You will not be able to recompile .vala source files.])
++  elif test -n "x$1"; then
++    AC_REQUIRE([AC_PROG_AWK])
++    AC_MSG_CHECKING([valac is at least version $1])
++
++    if "${VALAC}" --version | "${AWK}" -v r='$1' 'function vn(s) { if (3 == split(s,v,".")) return (v[1]*1000+v[2])*1000+v[3]; else exit 2; } /^Vala / { exit vn(r) > vn($[2]) }'; then
++      AC_MSG_RESULT([yes])
++    else
++      AC_MSG_RESULT([no])
++      AC_MSG_ERROR([Vala $1 not found.])
++    fi
++  fi
++])
++dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
++dnl autostars m4 macro for expanding directories using configure's prefix
++dnl
++dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
++dnl
++dnl Copying and distribution of this file, with or without modification,
++dnl are permitted in any medium without royalty provided the copyright
++dnl notice and this notice are preserved.
++dnl
+ dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+ dnl
+-dnl example
++dnl example:
+ dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+-
+ AC_DEFUN([AS_AC_EXPAND],
+ [
+   EXP_VAR=[$1]
+@@ -17,7 +410,7 @@ AC_DEFUN([AS_AC_EXPAND],
+ 
+   dnl if no prefix given, then use /usr/local, the default prefix
+   if test "x$prefix" = "xNONE"; then
+-    prefix=$ac_default_prefix
++    prefix="$ac_default_prefix"
+   fi
+   dnl if no exec_prefix given, then use prefix
+   if test "x$exec_prefix" = "xNONE"; then
+@@ -28,7 +421,7 @@ AC_DEFUN([AS_AC_EXPAND],
+   dnl loop until it doesn't change anymore
+   while true; do
+     new_full_var="`eval echo $full_var`"
+-    if test "x$new_full_var"="x$full_var"; then break; fi
++    if test "x$new_full_var" = "x$full_var"; then break; fi
+     full_var=$new_full_var
+   done
+ 
+@@ -40,3 +433,4 @@ AC_DEFUN([AS_AC_EXPAND],
+   prefix=$prefix_save
+   exec_prefix=$exec_prefix_save
+ ])
++
+diff -up ./configure.ac.orig ./configure.ac
+--- ./configure.ac.orig	2009-04-03 22:46:03.000000000 +0200
++++ ./configure.ac	2009-04-03 23:29:19.000000000 +0200
+@@ -38,6 +38,9 @@ dnl
+ 
+ AC_PYTHON_DEVEL()
+ 
++PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"`
++AC_SUBST(PLATFORM)
++
+ PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version)
+ PYGTK_CODEGEN_DEFINES="-DHAVE_PYCAIRO $PYGTK_CODEGEN_DEFINES";
+ 
+@@ -252,6 +255,8 @@ AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_C
+ 
+ appletsdir="$datarootdir/avant-window-navigator/applets"
+ 
++AS_AC_EXPAND([PY_SITE_PKG], [$PYTHON_SITE_PKG])
++AS_AC_EXPAND([PY_PLAT_PKG], [$PYTHON_PLATFORM_PKG])
+ AS_AC_EXPAND(APPLETSDIR, $appletsdir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(LIBDIR, $libdir)
 diff -up ./src/libawn-extras/bindings/python/Makefile.am.orig ./src/libawn-extras/bindings/python/Makefile.am
---- ./src/libawn-extras/bindings/python/Makefile.am.orig	2009-04-02 18:59:53.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.am	2009-04-02 19:40:14.000000000 +0200
+--- ./src/libawn-extras/bindings/python/Makefile.am.orig	2009-04-03 22:46:28.000000000 +0200
++++ ./src/libawn-extras/bindings/python/Makefile.am	2009-04-03 22:47:30.000000000 +0200
 @@ -1,7 +1,7 @@
  NULL =
  
@@ -20,17 +476,9 @@
  
  common_ldflags = -module -avoid-version
 diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
---- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-02 18:59:58.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-02 20:12:22.000000000 +0200
-@@ -246,6 +246,7 @@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDF
- PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
- PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
- PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
-+PYTHON_PLATFORM_PKG = @PYTHON_PLATFORM_PKG@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
- SED = @SED@
-@@ -331,7 +332,7 @@ top_srcdir = @top_srcdir@
+--- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-03 22:46:33.000000000 +0200
++++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-03 22:48:14.000000000 +0200
+@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
  NULL = 
  
  # awn python scripts
@@ -39,7 +487,7 @@
  pyawn_extras_PYTHON = \
  	__init__.py	\
  	awnlib.py	\
-@@ -350,7 +351,7 @@ INCLUDES = \
+@@ -350,7 +350,7 @@ INCLUDES = \
  
  
  # libawn-extras python extensions


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- awn-extras-applets.spec	2 Apr 2009 18:13:04 -0000	1.20
+++ awn-extras-applets.spec	5 Apr 2009 00:35:41 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -14,6 +14,7 @@
 
 BuildRequires:  avant-window-navigator-devel >= 0.3.2
 BuildRequires:  libwnck-devel
+BuildRequires:  libXres-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  gnome-menus-devel
 BuildRequires:  gnome-desktop-devel
@@ -33,7 +34,11 @@
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libtool
 BuildRequires:  intltool 
+BuildRequires:  vala-devel
+BuildRequires:  WebKit-gtk-devel
 #BuildRequires:  gettext
+#required for autoreconf:
+BuildRequires:  autoconf, automake
 
 Requires:       avant-window-navigator >= 0.3.2
 Requires:       gnome-python2-gnome
@@ -74,13 +79,11 @@
 %setup -q
 %patch0 -p1
 
-#for f in `find -name '*.py'`; do
-#  head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f 
-#done
 
 %build
-#./autogen.sh --disable-pymod-checks
-%configure --disable-static --disable-pymod-checks
+#required for python-platform patch
+autoreconf
+%configure --disable-static --disable-pymod-checks --with-webkit
 make %{?_smp_mflags}
 
 
@@ -91,10 +94,6 @@
 
 find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
-# resolve conflict
-# mv ${RPM_BUILD_ROOT}/etc/gconf/schemas/notification-daemon.schemas \
-#   ${RPM_BUILD_ROOT}/etc/gconf/schemas/awn-notification-daemon.schemas
-
 #%find_lang
 
 #remove script-shebang in non-executables
@@ -176,10 +175,10 @@
 %{_libdir}/pkgconfig/*
 
 
-
 %changelog
-* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-6
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-7
 - Add patch to fix build on x86_64
+- Enable webkit-gtk powered applets
 
 * Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-4
 - New upstream release



From sindrepb at fedoraproject.org  Sun Apr  5 00:59:09 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sun,  5 Apr 2009 00:59:09 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.21,1.22
Message-ID: <20090405005909.5F4D27011F@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23491

Modified Files:
	awn-extras-applets.spec 
Log Message:



Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- awn-extras-applets.spec	5 Apr 2009 00:35:41 -0000	1.21
+++ awn-extras-applets.spec	5 Apr 2009 00:58:38 -0000	1.22
@@ -9,6 +9,8 @@
 License:        GPLv2+
 URL:            https://launchpad.net/awn-extras/
 Source0:        https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
+#patch modifies autotools files to make python bindings install to sitearch 
+#requires autoreconf to take effect.
 Patch0:         %{name}-%{version}-python-platform.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +29,6 @@
 BuildRequires:  libsexy-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  perl(XML::Parser)
-#BuildRequires:  ed
 BuildRequires:  pycairo-devel
 BuildRequires:  pygtk2-devel
 BuildRequires:  vte-devel
@@ -82,6 +83,7 @@
 
 %build
 #required for python-platform patch
+libtoolize --force
 autoreconf
 %configure --disable-static --disable-pymod-checks --with-webkit
 make %{?_smp_mflags}
@@ -94,6 +96,7 @@
 
 find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
+#translations included in non-standard way. no find_lang for now
 #%find_lang
 
 #remove script-shebang in non-executables



From kevin at fedoraproject.org  Sun Apr  5 01:02:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  5 Apr 2009 01:02:19 +0000 (UTC)
Subject: rpms/gigolo/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 gigolo.spec,
	1.2, 1.3
Message-ID: <20090405010219.77EBA7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gigolo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965

Modified Files:
	sources .cvsignore gigolo.spec 
Log Message:
Update to 0.3.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gigolo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2009 22:44:18 -0000	1.3
+++ sources	5 Apr 2009 01:01:48 -0000	1.4
@@ -1 +1 @@
-0684d5fe1bff198f50ce76544daf1c2f  gigolo-0.3.0.tar.bz2
+7f3c94bd9bcab6c2ff432d083f02ab3e  gigolo-0.3.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gigolo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 22:44:18 -0000	1.3
+++ .cvsignore	5 Apr 2009 01:01:49 -0000	1.4
@@ -1 +1 @@
-gigolo-0.3.0.tar.bz2
+gigolo-0.3.1.tar.bz2


Index: gigolo.spec
===================================================================
RCS file: /cvs/extras/rpms/gigolo/devel/gigolo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gigolo.spec	31 Mar 2009 22:44:18 -0000	1.2
+++ gigolo.spec	5 Apr 2009 01:01:49 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           gigolo
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        GIO/GVFS management application
 
@@ -71,6 +71,9 @@
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Sat Apr 04 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.1-1
+- Update to 0.3.1
+
 * Tue Mar 31 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.0-1
 - Update to 0.3.0 
 



From oget at fedoraproject.org  Sun Apr  5 01:40:11 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun,  5 Apr 2009 01:40:11 +0000 (UTC)
Subject: rpms/deco-archive/devel deco-archive-zoo.diff, NONE,
	1.1 deco-archive.spec, 1.4, 1.5
Message-ID: <20090405014011.8EF897011F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28059

Modified Files:
	deco-archive.spec 
Added Files:
	deco-archive-zoo.diff 
Log Message:
* Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-3
- Handle .zoo format with unzoo (if installed)


deco-archive-zoo.diff:

--- NEW FILE deco-archive-zoo.diff ---
diff -rupN deco-archive-1.4.old/zoo/extract deco-archive-1.4/zoo/extract
--- deco-archive-1.4.old/zoo/extract	2009-01-18 08:04:29.000000000 -0500
+++ deco-archive-1.4/zoo/extract	2009-04-04 21:08:44.000000000 -0400
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec zoo x${Verbose-q} "$1"
+exec unzoo -x "$1" >/dev/null


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/deco-archive.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- deco-archive.spec	24 Feb 2009 11:19:35 -0000	1.4
+++ deco-archive.spec	5 Apr 2009 01:39:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           deco-archive
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -12,6 +12,9 @@
 # Use ffmpeg instead of non-free shorten decoder, which is not available
 # in Fedora
 Patch1:         deco-archive-shn.diff
+# Use unzoo instead of zoo to extract zoo archives. The latter is not available
+# in Fedora
+Patch2:         deco-archive-zoo.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -26,6 +29,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 echo "Nothing to build."
@@ -61,7 +65,7 @@
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
 # Not handled (yet?):
-# dpkg-deb (deb,udeb), zoo
+# dpkg-deb (deb,udeb)
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -148,16 +152,24 @@
 %triggerun -- unalz
 %do_triggerun alz
 
+%triggerin -- unzoo
+%do_triggerin zoo
+%triggerun -- unzoo
+%do_triggerun zoo
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
+* Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-3
+- Handle .zoo format with unzoo (if installed)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-1
 - Version update. New extensions: gem and tbz2
 - Handle .shn format (shorten) with ffmpeg (if installed)
 - Handle .alz format with unalz (if installed)



From mclasen at fedoraproject.org  Sun Apr  5 01:42:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 01:42:23 +0000 (UTC)
Subject: rpms/gnome-sharp/devel gnome-sharp-gconf-init.patch, NONE,
	1.1 gnome-sharp.spec, 1.17, 1.18
Message-ID: <20090405014223.AFBCE7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28356

Modified Files:
	gnome-sharp.spec 
Added Files:
	gnome-sharp-gconf-init.patch 
Log Message:
make tomboy work before gconfd


gnome-sharp-gconf-init.patch:

--- NEW FILE gnome-sharp-gconf-init.patch ---
diff -up gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs.gconf-init gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs
--- gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs.gconf-init	2008-08-06 18:00:49.000000000 -0400
+++ gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs	2009-04-04 21:26:40.419750583 -0400
@@ -40,13 +40,13 @@ namespace GConf
 
 		internal void Initialize ()
 		{
+			GLib.GType.Init ();
 			if (!gconf_is_initialized ())
 			{
 				IntPtr err;
 				gconf_init (0, IntPtr.Zero, out err);
 				if (err != IntPtr.Zero)
 					throw new GLib.GException (err);
-				GLib.GType.Init ();
 			}
 		}
 	}


Index: gnome-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-sharp.spec	24 Feb 2009 23:26:40 -0000	1.17
+++ gnome-sharp.spec	5 Apr 2009 01:41:53 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
 Version:        2.24.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -16,6 +16,8 @@
 # Disabled, gtkhtml has been removed
 #Patch3: %{name}-2.16.0-gtkhtml3-3.14.patch
 #Patch4: %{name}-2.16.1-assemblydir.patch
+# init gtype before using gconf
+Patch2: gnome-sharp-gconf-init.patch
 
 BuildRequires:  mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
 BuildRequires:  gtk-sharp2-devel >= 2.10.0
@@ -51,7 +53,7 @@
 #%patch2 -p1 -b .automake-1.10
 #%patch3 -p1 -b .gtkhtml3-3.14
 #%patch4 -p1 -b .assemblydir
-
+%patch2 -p1 -b .gconf-init
 
 %build
 autoreconf --force --install
@@ -90,6 +92,9 @@
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Sat Apr  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.0-3
+- Make tomboy work before gconfd is started (#494065)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From oget at fedoraproject.org  Sun Apr  5 01:43:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun,  5 Apr 2009 01:43:42 +0000 (UTC)
Subject: rpms/deco-archive/F-10 deco-archive-zoo.diff, NONE,
	1.1 deco-archive.spec, 1.4, 1.5
Message-ID: <20090405014342.0EC037011F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28498

Modified Files:
	deco-archive.spec 
Added Files:
	deco-archive-zoo.diff 
Log Message:
* Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-2
- Handle .zoo format with unzoo (if installed)


deco-archive-zoo.diff:

--- NEW FILE deco-archive-zoo.diff ---
diff -rupN deco-archive-1.4.old/zoo/extract deco-archive-1.4/zoo/extract
--- deco-archive-1.4.old/zoo/extract	2009-01-18 08:04:29.000000000 -0500
+++ deco-archive-1.4/zoo/extract	2009-04-04 21:08:44.000000000 -0400
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec zoo x${Verbose-q} "$1"
+exec unzoo -x "$1" >/dev/null


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/deco-archive.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- deco-archive.spec	20 Jan 2009 02:09:36 -0000	1.4
+++ deco-archive.spec	5 Apr 2009 01:43:11 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           deco-archive
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -12,6 +12,9 @@
 # Use ffmpeg instead of non-free shorten decoder, which is not available
 # in Fedora
 Patch1:         deco-archive-shn.diff
+# Use unzoo instead of zoo to extract zoo archives. The latter is not available
+# in Fedora
+Patch2:         deco-archive-zoo.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -26,6 +29,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 echo "Nothing to build."
@@ -61,7 +65,7 @@
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
 # Not handled (yet?):
-# dpkg-deb (deb,udeb), zoo
+# dpkg-deb (deb,udeb)
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -148,13 +152,21 @@
 %triggerun -- unalz
 %do_triggerun alz
 
+%triggerin -- unzoo
+%do_triggerin zoo
+%triggerun -- unzoo
+%do_triggerun zoo
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
-* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
+* Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-2
+- Handle .zoo format with unzoo (if installed)
+
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-1
 - Version update. New extensions: gem and tbz2
 - Handle .shn format (shorten) with ffmpeg (if installed)
 - Handle .alz format with unalz (if installed)



From itamarjp at fedoraproject.org  Sun Apr  5 03:06:13 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sun,  5 Apr 2009 03:06:13 +0000 (UTC)
Subject: rpms/qt-creator/devel disable_private_header_check.patch, NONE,
	1.1 enable-signal-slot.patch, NONE, 1.1 import.log, NONE,
	1.1 no-docu.diff, NONE, 1.1 pluginPaths.patch, NONE,
	1.1 qt-creator.spec, NONE,
	1.1 qtcreator-qworkbenchlibrary_lib64.patch, NONE,
	1.1 qtcreator-qworkbenchplugin_lib64.patch, NONE,
	1.1 qtcreator.desktop, NONE, 1.1 qtcreator_rpath.patch, NONE,
	1.1 qtdoc3_location.patch, NONE, 1.1 qworkbench_lib64.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405030613.B6CDC7011F@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4889/devel

Modified Files:
	.cvsignore sources 
Added Files:
	disable_private_header_check.patch enable-signal-slot.patch 
	import.log no-docu.diff pluginPaths.patch qt-creator.spec 
	qtcreator-qworkbenchlibrary_lib64.patch 
	qtcreator-qworkbenchplugin_lib64.patch qtcreator.desktop 
	qtcreator_rpath.patch qtdoc3_location.patch 
	qworkbench_lib64.patch 
Log Message:
qt-creator 1.0


disable_private_header_check.patch:

--- NEW FILE disable_private_header_check.patch ---
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 02edb9d..b96bb50 100644
--- a/src/plugins/plugins.pro
+++ src/plugins/plugins.pro
@@ -26,15 +26,9 @@ SUBDIRS   = plugin_coreplugin \
             plugin_qtscripteditor \
 #            plugin_cpaster \
             plugin_cmakeprojectmanager \
-            plugin_fakevim
-
-# These two plugins require private headers from Qt and therefore don't work
-# with an installed/released version of Qt.
-exists($$(QTDIR)/.qmake.cache) {
-    SUBDIRS += plugin_designer plugin_resourceeditor
-} else {
-    message(Designer and Resource Editor plugins are not build! They require private headers and do not compile with your released/installed version of Qt)
-}
+            plugin_fakevim \
+            plugin_designer \
+            plugin_resourceeditor
 
 plugin_coreplugin.subdir = coreplugin
 


enable-signal-slot.patch:

--- NEW FILE enable-signal-slot.patch ---
*** src/plugins/designer/editorwidget.cpp.old	2009-03-18 20:21:01.000000000 -0300
--- src/plugins/designer/editorwidget.cpp	2009-03-18 20:21:24.000000000 -0300
*************** using namespace Designer::Constants;
*** 41,47 ****
  
  enum { ActionEditorTab, SignalSlotEditorTab };
  
! enum { wantSignalSlotEditor = 0 };
  
  namespace Designer {
  namespace Internal {
--- 41,47 ----
  
  enum { ActionEditorTab, SignalSlotEditorTab };
  
! enum { wantSignalSlotEditor = 1 };
  
  namespace Designer {
  namespace Internal {


--- NEW FILE import.log ---
qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717

no-docu.diff:

--- NEW FILE no-docu.diff ---
--- qtcreator.pro
+++ qtcreator.pro
@@ -5,7 +5,6 @@ count(TOO_OLD_LIST, 1) {
     error("Use at least Qt 4.5.")
 }
 
-include(doc/doc.pri)
 
 TEMPLATE  = subdirs
 CONFIG   += ordered

pluginPaths.patch:

--- NEW FILE pluginPaths.patch ---
--- src/app/main.cpp.old	2009-03-18 20:15:43.000000000 -0300
+++ src/app/main.cpp	2009-03-18 21:00:27.000000000 -0300
@@ -179,7 +179,7 @@ static inline QStringList getPluginPaths
     // 1) "plugins" (Win/Linux)
     QString pluginPath = rootDirPath;
     pluginPath += QDir::separator();
-    pluginPath += QLatin1String("lib");
+    pluginPath += QLatin1String("lib64");
     pluginPath += QDir::separator();
     pluginPath += QLatin1String("qtcreator");
     pluginPath += QDir::separator();


--- NEW FILE qt-creator.spec ---
Name:           qt-creator
Version:        1.0.0
Release:        4%{?dist}
Summary:        Lightweight and cross-platform IDE for Qt

Group:          Development/Tools
License:        LGPLv2 with exceptions
URL:            http://www.qtsoftware.com/developer/qt-creator
Source0:        http://download.qtsoftware.com/qtcreator/%name-%version-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1:       qtcreator.desktop

#make ui editor works
#patch from http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff;h=f3f20d96bdfb5266cc25ac91ae0def8a33875a81
Patch0:         disable_private_header_check.patch

#fix qdoc3 executable location in fedora
Patch1:         qtdoc3_location.patch

#make it install into lib64
Patch2:         qtcreator-qworkbenchlibrary_lib64.patch
Patch3:         qtcreator-qworkbenchplugin_lib64.patch
Patch4:         qworkbench_lib64.patch
Patch5:         qtcreator_rpath.patch

#enable signal/slot editor  http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff_plain;h=bf118eba1ee1f5b6e19c6f29cd7d114c121a20ef
Patch6:        enable-signal-slot.patch

#search for plugins in lib64 dir
Patch7:        pluginPaths.patch

#temporary disabled docs
Patch8:       no-docu.diff

BuildRequires:  qt4-devel >= 4.5.0

%description
Qt Creator (previously known as Project Greenhouse) is a new,
lightweight, cross-platform integrated  development environment (IDE)
designed to make development with the Qt application framework
even faster and easier.

%prep
%setup -q -n %name-%version-src
%patch0 -p0
%patch1 -p0

#make it install into lib64
%if "%{_lib}" == "lib64"
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch7 -p0
%endif

%patch6 -p0

%patch8 -p0

%build
QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \

qmake-qt4
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}

desktop-file-install                                    \
--add-category="Development"                            \
--dir=%{buildroot}%{_datadir}/applications              \
%{SOURCE1}



%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
%{_bindir}/qtcreator
%{_libdir}/qtcreator
%{_datadir}/qtcreator
%{_datadir}/pixmaps/qtcreator_logo_*.png
%{_datadir}/applications/qtcreator.desktop

%changelog
* Tue Mar 20 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-4
- fix lib's loading in 64 bit machines

* Tue Mar 18 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-3
- Changed License to LGPLv2 with exceptions and BR to qt4-devel >= 4.5.0

* Tue Mar 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-2
- Improved Version to make it more compatible with fedora guidelines

* Sun Mar 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-1
- initial RPM release

qtcreator-qworkbenchlibrary_lib64.patch:

--- NEW FILE qtcreator-qworkbenchlibrary_lib64.patch ---
--- src/qworkbenchlibrary.pri.old	2009-03-16 23:35:01.000000000 -0300
+++ src/qworkbenchlibrary.pri	2009-03-16 23:35:29.000000000 -0300
@@ -14,6 +14,6 @@ TARGET = $$qtLibraryTarget($$TARGET)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 linux-* {
-	target.path = /lib/qtcreator
+	target.path = /lib64/qtcreator
 	INSTALLS += target
     }

qtcreator-qworkbenchplugin_lib64.patch:

--- NEW FILE qtcreator-qworkbenchplugin_lib64.patch ---
--- src/qworkbenchplugin.pri.old	2009-03-17 20:39:56.000000000 -0300
+++ src/qworkbenchplugin.pri	2009-03-17 20:40:38.000000000 -0300
@@ -54,8 +54,8 @@ contains(QT_CONFIG, reduce_exports):CONF
 CONFIG += plugin plugin_with_soname
 
 linux-* {
-    target.path = /lib/qtcreator/plugins/$$PROVIDER
+    target.path = /lib64/qtcreator/plugins/$$PROVIDER
     pluginspec.files += $${TARGET}.pluginspec
-    pluginspec.path = /lib/qtcreator/plugins/$$PROVIDER
+    pluginspec.path = /lib64/qtcreator/plugins/$$PROVIDER
     INSTALLS += target pluginspec
 }


--- NEW FILE qtcreator.desktop ---
[Desktop Entry]
Type=Application
Exec=qtcreator %F
Name=Qt Creator
GenericName=C++ IDE for developing Qt applications
X-KDE-StartupNotify=true
Icon=Nokia-QtCreator
Terminal=false
Categories=Development;IDE;Qt;
MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;

qtcreator_rpath.patch:

--- NEW FILE qtcreator_rpath.patch ---
--- src/rpath.pri.old	2009-03-17 20:37:28.000000000 -0300
+++ src/rpath.pri	2009-03-17 20:38:08.000000000 -0300
@@ -3,7 +3,7 @@ macx {
 } else:linux-* {
     #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
     # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
-    QMAKE_RPATHDIR += \$\$ORIGIN/../lib/qtcreator
+    QMAKE_RPATHDIR += \$\$ORIGIN/../lib64/qtcreator
     IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
  
     QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'

qtdoc3_location.patch:

--- NEW FILE qtdoc3_location.patch ---
--- doc/doc.pri.old	2009-03-16 23:04:19.000000000 -0300
+++ doc/doc.pri	2009-03-16 23:04:59.000000000 -0300
@@ -1,5 +1,5 @@
 unix {
-    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
+    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/bin/qdoc3
     HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
 } else {
     QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$(QTDIR)\tools\qdoc3\release\qdoc3.exe

qworkbench_lib64.patch:

--- NEW FILE qworkbench_lib64.patch ---
--- src/qworkbench.pri.old	2009-03-18 19:33:33.000000000 -0300
+++ src/qworkbench.pri	2009-03-18 19:34:09.000000000 -0300
@@ -21,7 +21,7 @@ macx {
     contains(QT_CONFIG, ppc):CONFIG += ppc x86
 } else {
     IDE_APP_TARGET   = qtcreator
-    IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib/qtcreator
+    IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib64/qtcreator
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins/
 }
 IDE_APP_PATH = $$IDE_BUILD_TREE/bin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:19:58 -0000	1.1
+++ .cvsignore	5 Apr 2009 03:06:11 -0000	1.2
@@ -0,0 +1 @@
+qt-creator-1.0.0-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:19:58 -0000	1.1
+++ sources	5 Apr 2009 03:06:12 -0000	1.2
@@ -0,0 +1 @@
+5478124035d80a90e66a3db67ab4477a  qt-creator-1.0.0-src.zip



From pkgdb at fedoraproject.org  Sun Apr  5 04:03:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:03:03 +0000
Subject: [pkgdb] qsynth: oget has requested watchbugzilla
Message-ID: <20090405040242.4BEE3208550@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on qsynth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:03:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:03:02 +0000
Subject: [pkgdb] qsynth: oget has requested watchcommits
Message-ID: <20090405040242.98F2C208556@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on qsynth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:02:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:02:30 +0000
Subject: [pkgdb] qsynth: oget has requested approveacls
Message-ID: <20090405040245.60E88208608@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on qsynth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:03:04 +0000
Subject: [pkgdb] qsynth: oget has requested commit
Message-ID: <20090405040243.D115B208603@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on qsynth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:03:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:03:10 +0000
Subject: [pkgdb] qsynth: oget has requested watchbugzilla
Message-ID: <20090405040250.7DC5620860F@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on qsynth (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:02:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:02:50 +0000
Subject: [pkgdb] qsynth: oget has requested watchcommits
Message-ID: <20090405040250.B68372086F3@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on qsynth (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:02:37 +0000
Subject: [pkgdb] qsynth: oget has requested commit
Message-ID: <20090405040252.34CBD2086FF@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on qsynth (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Sun Apr  5 04:03:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 05 Apr 2009 04:03:13 +0000
Subject: [pkgdb] qsynth: oget has requested approveacls
Message-ID: <20090405040252.87E79208703@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on qsynth (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From mclasen at fedoraproject.org  Sun Apr  5 04:32:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 04:32:08 +0000 (UTC)
Subject: rpms/bug-buddy/devel bug-buddy-build-id.patch, NONE,
	1.1 bug-buddy.spec, 1.120, 1.121
Message-ID: <20090405043208.DEFD77011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/bug-buddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14148

Modified Files:
	bug-buddy.spec 
Added Files:
	bug-buddy-build-id.patch 
Log Message:
support build-id


bug-buddy-build-id.patch:

--- NEW FILE bug-buddy-build-id.patch ---
diff -up bug-buddy-2.26.0/gnome-breakpad/gnome-breakpad.cc.build-id bug-buddy-2.26.0/gnome-breakpad/gnome-breakpad.cc
--- bug-buddy-2.26.0/gnome-breakpad/gnome-breakpad.cc.build-id	2009-02-26 19:56:50.000000000 -0500
+++ bug-buddy-2.26.0/gnome-breakpad/gnome-breakpad.cc	2009-03-17 18:23:24.376646444 -0400
@@ -263,6 +263,29 @@ find_in_debug_path (const char *filename
 	return result;
 }
 
+static gboolean
+find_build_id_file (const char *build_id, unsigned int length)
+{
+	char *build_id_abspath;
+	gboolean result = false;
+	int i;
+
+	/* build_id is a 20-byte bitstring. gdb will look for a file named
+	   /usr/lib/debug.build-id/xx/yyy...y.debug, where 'xx' is the first 2
+	   hex characters of the buildid bit string and yyy...y is the hex
+           representation of the rest of the bit string. */
+	GString *s = g_string_new(NULL);
+	g_string_append_printf(s, "%02x/", (unsigned char)build_id[0]);
+	for (i = 1; i < length; i++)
+		g_string_append_printf(s, "%02x", (unsigned char)build_id[i]);
+	g_string_append(s, ".debug");
+
+	build_id_abspath = g_build_filename("/usr", "lib", "debug", ".build-id", s->str, NULL);
+	result = g_file_test(build_id_abspath, G_FILE_TEST_EXISTS);
+	g_free(build_id_abspath);
+	g_string_free(s, TRUE);
+	return result;
+}
 
 static gboolean
 elf_has_debug_symbols (const char *filename)
@@ -310,6 +333,23 @@ elf_has_debug_symbols (const char *filen
 			}
 		}
               }
+                /* Check for .note.gnu.build-id separate debug file */
+		if (shdr.sh_type == SHT_NOTE) {
+			name = elf_strptr(elf, elf_header.e_shstrndx, shdr.sh_name);
+			if (strcmp (name, ".note.gnu.build-id") == 0) {
+				Elf_Data *edata;
+				edata = elf_getdata(section, NULL);
+				if (edata != NULL) {
+					GElf_Nhdr nhdr;
+					size_t off, noff, doff;
+					off = gelf_getnote(edata, 0, &nhdr, &noff, &doff);
+					if ((off > 0) && find_build_id_file((const char*)edata->d_buf + doff, nhdr.n_descsz)) {
+						elf_end (elf);
+						return true;
+					}
+				}
+			}
+		}
        }
 
        /* no symtab neither debug file present */


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- bug-buddy.spec	17 Mar 2009 04:44:41 -0000	1.120
+++ bug-buddy.spec	5 Apr 2009 04:31:37 -0000	1.121
@@ -6,7 +6,7 @@
 
 Name: bug-buddy
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Summary: Crash reporting utility for the GNOME desktop
 License: GPLv2 and BSD
@@ -51,6 +51,7 @@
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: bug-buddy-c++.patch
+Patch1: bug-buddy-build-id.patch
 
 %description
 Bug-buddy is a crash reporting utility for the GNOME desktop.
@@ -61,6 +62,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .c++
+%patch1 -p1 -b .build-id
 
 %build
 %configure --disable-scrollkeeper
@@ -142,6 +144,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-2
+- Support build-id (#490778)
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-1
 - Update to 2.26.0
 



From cweyl at fedoraproject.org  Sun Apr  5 05:18:53 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:18:53 +0000 (UTC)
Subject: rpms/perl-Log-Trace/devel import.log, NONE, 1.1 perl-Log-Trace.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405051853.3307F7011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Log-Trace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18490/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Log-Trace.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Log-Trace-1_070-1_fc10:HEAD:perl-Log-Trace-1.070-1.fc10.src.rpm:1238908692


--- NEW FILE perl-Log-Trace.spec ---
Name:       perl-Log-Trace 
Version:    1.070 
Release:    1%{?dist}
# lib/Log/Trace.pm -> GPLv2+ 
License:    GPLv2+
Group:      Development/Libraries
Summary:    A unified approach to tracing 
Source:     http://search.cpan.org/CPAN/authors/id/B/BB/BBC/Log-Trace-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Log-Trace
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)

# autoprov detects perl(DB), which is just wrong.  In this specific case,
# it's easier just to turn autoprov off.
AutoProv:   no
Provides:   perl(Log::Trace) = %{version}

%description
This module provides a unified approach to tracing. A script can 'use
Log::Trace qw( < mode > )' to set the behaviour of the TRACE function.By
default, the trace functions are exported to the calling package only.
You can export the trace functions to other packages with the 'Deep'
option. See the "OPTIONS" manpage for more information. 


%prep
%setup -q -n Log-Trace-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes COPYING 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.070-1
- submission

* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.070-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Trace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:47:31 -0000	1.1
+++ .cvsignore	5 Apr 2009 05:18:21 -0000	1.2
@@ -0,0 +1 @@
+Log-Trace-1.070.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Trace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:47:32 -0000	1.1
+++ sources	5 Apr 2009 05:18:21 -0000	1.2
@@ -0,0 +1 @@
+773aefa7539b1857edb3e225cfbc4a22  Log-Trace-1.070.tar.gz



From cweyl at fedoraproject.org  Sun Apr  5 05:23:32 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:23:32 +0000 (UTC)
Subject: rpms/perl-Log-Trace/F-9 import.log, NONE, 1.1 perl-Log-Trace.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405052332.368237011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Log-Trace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19734/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Log-Trace.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Log-Trace-1_070-1_fc10:F-9:perl-Log-Trace-1.070-1.fc10.src.rpm:1238908972


--- NEW FILE perl-Log-Trace.spec ---
Name:       perl-Log-Trace 
Version:    1.070 
Release:    1%{?dist}
# lib/Log/Trace.pm -> GPLv2+ 
License:    GPLv2+
Group:      Development/Libraries
Summary:    A unified approach to tracing 
Source:     http://search.cpan.org/CPAN/authors/id/B/BB/BBC/Log-Trace-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Log-Trace
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)

# autoprov detects perl(DB), which is just wrong.  In this specific case,
# it's easier just to turn autoprov off.
AutoProv:   no
Provides:   perl(Log::Trace) = %{version}

%description
This module provides a unified approach to tracing. A script can 'use
Log::Trace qw( < mode > )' to set the behaviour of the TRACE function.By
default, the trace functions are exported to the calling package only.
You can export the trace functions to other packages with the 'Deep'
option. See the "OPTIONS" manpage for more information. 


%prep
%setup -q -n Log-Trace-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes COPYING 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.070-1
- submission

* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.070-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Trace/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:47:31 -0000	1.1
+++ .cvsignore	5 Apr 2009 05:23:01 -0000	1.2
@@ -0,0 +1 @@
+Log-Trace-1.070.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Trace/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:47:32 -0000	1.1
+++ sources	5 Apr 2009 05:23:01 -0000	1.2
@@ -0,0 +1 @@
+773aefa7539b1857edb3e225cfbc4a22  Log-Trace-1.070.tar.gz



From cweyl at fedoraproject.org  Sun Apr  5 05:32:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:32:24 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/devel .cvsignore, 1.2,
	1.3 perl-Catalyst-Model-DBIC-Schema.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090405053224.D78B57011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20958

Modified Files:
	.cvsignore perl-Catalyst-Model-DBIC-Schema.spec sources 
Log Message:
* Sat Apr 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.23-1
- update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2008 03:11:02 -0000	1.2
+++ .cvsignore	5 Apr 2009 05:31:53 -0000	1.3
@@ -1 +1 @@
-Catalyst-Model-DBIC-Schema-0.21.tar.gz
+Catalyst-Model-DBIC-Schema-0.23.tar.gz


Index: perl-Catalyst-Model-DBIC-Schema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel/perl-Catalyst-Model-DBIC-Schema.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Model-DBIC-Schema.spec	26 Feb 2009 12:10:48 -0000	1.3
+++ perl-Catalyst-Model-DBIC-Schema.spec	5 Apr 2009 05:31:54 -0000	1.4
@@ -1,20 +1,23 @@
 Name:           perl-Catalyst-Model-DBIC-Schema
-Version:        0.21
-Release:        3%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 Summary:        DBIx::Class::Schema Model Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Model-DBIC-Schema/
-Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOGDAN/Catalyst-Model-DBIC-Schema-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/Catalyst-Model-DBIC-Schema-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(Catalyst::Runtime)     >= 5.70
 BuildRequires:  perl(Class::Accessor::Fast) >= 0.22
+BuildRequires:  perl(Class::C3)             >= 0.20
+BuildRequires:  perl(Class::C3::XS)         >= 0.08
 BuildRequires:  perl(Class::Data::Accessor) >= 0.02
 BuildRequires:  perl(DBIx::Class)           >= 0.07006
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(UNIVERSAL::require)    >= 0.10
 # Catalyst::Helper::Model::DBIC support
 BuildRequires:  perl(DBIx::Class::Schema::Loader) >= 0.03012
@@ -66,6 +69,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.23-1
+- update to 0.23
+
+* Sat Apr 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.23-1
+- update to 0.23
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Model-DBIC-Schema/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 03:11:02 -0000	1.2
+++ sources	5 Apr 2009 05:31:54 -0000	1.3
@@ -1 +1 @@
-1616235f66aed96e3aa8befc6c8d3b0f  Catalyst-Model-DBIC-Schema-0.21.tar.gz
+ceea60ddf8170ce6142f9c232760789c  Catalyst-Model-DBIC-Schema-0.23.tar.gz



From cweyl at fedoraproject.org  Sun Apr  5 05:34:49 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:34:49 +0000 (UTC)
Subject: rpms/perl-Log-Trace/F-10 import.log, NONE, 1.1 perl-Log-Trace.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405053449.26EA57011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Log-Trace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21415/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Log-Trace.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Log-Trace-1_070-1_fc10:F-10:perl-Log-Trace-1.070-1.fc10.src.rpm:1238909649


--- NEW FILE perl-Log-Trace.spec ---
Name:       perl-Log-Trace 
Version:    1.070 
Release:    1%{?dist}
# lib/Log/Trace.pm -> GPLv2+ 
License:    GPLv2+
Group:      Development/Libraries
Summary:    A unified approach to tracing 
Source:     http://search.cpan.org/CPAN/authors/id/B/BB/BBC/Log-Trace-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Log-Trace
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)

# autoprov detects perl(DB), which is just wrong.  In this specific case,
# it's easier just to turn autoprov off.
AutoProv:   no
Provides:   perl(Log::Trace) = %{version}

%description
This module provides a unified approach to tracing. A script can 'use
Log::Trace qw( < mode > )' to set the behaviour of the TRACE function.By
default, the trace functions are exported to the calling package only.
You can export the trace functions to other packages with the 'Deep'
option. See the "OPTIONS" manpage for more information. 


%prep
%setup -q -n Log-Trace-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes COPYING 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.070-1
- submission

* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.070-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Trace/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:47:31 -0000	1.1
+++ .cvsignore	5 Apr 2009 05:34:18 -0000	1.2
@@ -0,0 +1 @@
+Log-Trace-1.070.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Trace/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:47:32 -0000	1.1
+++ sources	5 Apr 2009 05:34:18 -0000	1.2
@@ -0,0 +1 @@
+773aefa7539b1857edb3e225cfbc4a22  Log-Trace-1.070.tar.gz



From mclasen at fedoraproject.org  Sun Apr  5 05:37:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 05:37:34 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session-alarm-warning.patch, NONE,
	1.1 gnome-session.spec, 1.230, 1.231
Message-ID: <20090405053734.6D0D37011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21739

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-alarm-warning.patch 
Log Message:
avoid some warnings


gnome-session-alarm-warning.patch:

--- NEW FILE gnome-session-alarm-warning.patch ---
diff -up gnome-session-2.26.0/gnome-session/gs-idle-monitor.c.alarm-warning gnome-session-2.26.0/gnome-session/gs-idle-monitor.c
--- gnome-session-2.26.0/gnome-session/gs-idle-monitor.c.alarm-warning	2009-04-05 01:31:17.238537050 -0400
+++ gnome-session-2.26.0/gnome-session/gs-idle-monitor.c	2009-04-05 01:32:57.511751140 -0400
@@ -181,6 +181,10 @@ handle_alarm_notify_event (GSIdleMonitor
         gboolean            res;
         gboolean            condition;
 
+        if (alarm_event->state == XSyncAlarmDestroyed) {
+                return;
+        }
+
         watch = find_watch_for_alarm (monitor, alarm_event->alarm);
 
         if (watch == NULL) {


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- gnome-session.spec	17 Mar 2009 03:03:32 -0000	1.230
+++ gnome-session.spec	5 Apr 2009 05:37:04 -0000	1.231
@@ -10,7 +10,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -62,6 +62,8 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
+Patch0: gnome-session-alarm-warning.patch
+
 %description
 gnome-session manages a GNOME desktop or GDM login session. It starts up
 the other core GNOME components and handles logout and saving the session.
@@ -76,6 +78,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .alarm-warning
 
 #workaround broken perl-XML-Parser on 64bit arches
 export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
@@ -174,6 +177,9 @@
 
 
 %changelog
+* Sun Apr  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-2
+- Avoid some warnings (#493688)
+
 * Mon Mar 16 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From cweyl at fedoraproject.org  Sun Apr  5 05:40:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:40:09 +0000 (UTC)
Subject: rpms/perl-PlRPC/devel import.log, NONE, 1.1 perl-PlRPC.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405054009.EDCEF7011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-PlRPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22367/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PlRPC.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-PlRPC-0_2020-1_fc10:HEAD:perl-PlRPC-0.2020-1.fc10.src.rpm:1238909970


--- NEW FILE perl-PlRPC.spec ---
Name:       perl-PlRPC 
Version:    0.2020 
Release:    1%{?dist} 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Interface for building pServer Clients 
Source:     http://search.cpan.org/CPAN/authors/id/M/MN/MNOONING/PlRPC/PlRPC-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/PlRPC
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Net::Daemon) >= 0.13
BuildRequires: perl(Storable)
# tests
BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(Crypt::DES)

# the better to compress you with, my dear
Requires:      perl(Compress::Zlib)
Requires:      perl(MD5)
Requires:      perl(Crypt::DES)


%description
PlRPC (Perl RPC) is a package that simplifies the writing of Perl based
client/server applications. RPC::PlServer is the package used on the
server side, and you guess what RPC::PlClient is for.  PlRPC works by 
defining a set of methods that may be executed by the client.

%prep
%setup -q -n PlRPC

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
# tests fail in buildsys/mock
%{?_with_tests: make test }

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc ChangeLog README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2020-1
- submission

* Thu Mar 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2020-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PlRPC/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:48:18 -0000	1.1
+++ .cvsignore	5 Apr 2009 05:39:39 -0000	1.2
@@ -0,0 +1 @@
+PlRPC-0.2020.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PlRPC/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:48:18 -0000	1.1
+++ sources	5 Apr 2009 05:39:39 -0000	1.2
@@ -0,0 +1 @@
+5361e137e56d037c5e796926ecb5300b  PlRPC-0.2020.tar.gz



From cweyl at fedoraproject.org  Sun Apr  5 05:45:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:45:09 +0000 (UTC)
Subject: rpms/perl-PlRPC/F-9 import.log, NONE, 1.1 perl-PlRPC.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405054509.2F3567011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-PlRPC/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23249/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PlRPC.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-PlRPC-0_2020-1_fc10:F-9:perl-PlRPC-0.2020-1.fc10.src.rpm:1238910270


--- NEW FILE perl-PlRPC.spec ---
Name:       perl-PlRPC 
Version:    0.2020 
Release:    1%{?dist} 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Interface for building pServer Clients 
Source:     http://search.cpan.org/CPAN/authors/id/M/MN/MNOONING/PlRPC/PlRPC-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/PlRPC
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Net::Daemon) >= 0.13
BuildRequires: perl(Storable)
# tests
BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(Crypt::DES)

# the better to compress you with, my dear
Requires:      perl(Compress::Zlib)
Requires:      perl(MD5)
Requires:      perl(Crypt::DES)


%description
PlRPC (Perl RPC) is a package that simplifies the writing of Perl based
client/server applications. RPC::PlServer is the package used on the
server side, and you guess what RPC::PlClient is for.  PlRPC works by 
defining a set of methods that may be executed by the client.

%prep
%setup -q -n PlRPC

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
# tests fail in buildsys/mock
%{?_with_tests: make test }

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc ChangeLog README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2020-1
- submission

* Thu Mar 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2020-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PlRPC/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:48:18 -0000	1.1
+++ .cvsignore	5 Apr 2009 05:44:38 -0000	1.2
@@ -0,0 +1 @@
+PlRPC-0.2020.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PlRPC/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:48:18 -0000	1.1
+++ sources	5 Apr 2009 05:44:38 -0000	1.2
@@ -0,0 +1 @@
+5361e137e56d037c5e796926ecb5300b  PlRPC-0.2020.tar.gz



From cweyl at fedoraproject.org  Sun Apr  5 05:49:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:49:36 +0000 (UTC)
Subject: rpms/perl-PlRPC/F-10 import.log, NONE, 1.1 perl-PlRPC.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405054936.93A037011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-PlRPC/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23866/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-PlRPC.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-PlRPC-0_2020-1_fc10:F-10:perl-PlRPC-0.2020-1.fc10.src.rpm:1238910535


--- NEW FILE perl-PlRPC.spec ---
Name:       perl-PlRPC 
Version:    0.2020 
Release:    1%{?dist} 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Interface for building pServer Clients 
Source:     http://search.cpan.org/CPAN/authors/id/M/MN/MNOONING/PlRPC/PlRPC-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/PlRPC
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Net::Daemon) >= 0.13
BuildRequires: perl(Storable)
# tests
BuildRequires: perl(Compress::Zlib)
BuildRequires: perl(Crypt::DES)

# the better to compress you with, my dear
Requires:      perl(Compress::Zlib)
Requires:      perl(MD5)
Requires:      perl(Crypt::DES)


%description
PlRPC (Perl RPC) is a package that simplifies the writing of Perl based
client/server applications. RPC::PlServer is the package used on the
server side, and you guess what RPC::PlClient is for.  PlRPC works by 
defining a set of methods that may be executed by the client.

%prep
%setup -q -n PlRPC

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
# tests fail in buildsys/mock
%{?_with_tests: make test }

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc ChangeLog README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2020-1
- submission

* Thu Mar 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2020-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PlRPC/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:48:18 -0000	1.1
+++ .cvsignore	5 Apr 2009 05:49:06 -0000	1.2
@@ -0,0 +1 @@
+PlRPC-0.2020.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PlRPC/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:48:18 -0000	1.1
+++ sources	5 Apr 2009 05:49:06 -0000	1.2
@@ -0,0 +1 @@
+5361e137e56d037c5e796926ecb5300b  PlRPC-0.2020.tar.gz



From cweyl at fedoraproject.org  Sun Apr  5 05:52:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  5 Apr 2009 05:52:02 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.27, 1.28 perl-Class-MOP.spec,
	1.32, 1.33 sources, 1.26, 1.27
Message-ID: <20090405055202.A415D7011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24436

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Sat Apr 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.80-1
- update to 0.80



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	2 Apr 2009 05:13:46 -0000	1.27
+++ .cvsignore	5 Apr 2009 05:51:32 -0000	1.28
@@ -1 +1 @@
-Class-MOP-0.79.tar.gz
+Class-MOP-0.80.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- perl-Class-MOP.spec	2 Apr 2009 05:13:46 -0000	1.32
+++ perl-Class-MOP.spec	5 Apr 2009 05:51:32 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.79
+Version:        0.80
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -91,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.80-1
+- update to 0.80
+
 * Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
 - update to 0.79
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 Apr 2009 05:13:47 -0000	1.26
+++ sources	5 Apr 2009 05:51:32 -0000	1.27
@@ -1 +1 @@
-9c8527e156ba0f2823daffccc20ad6d9  Class-MOP-0.79.tar.gz
+85c480850e1ffc795366159d79b241c4  Class-MOP-0.80.tar.gz



From sharkcz at fedoraproject.org  Sun Apr  5 07:44:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  5 Apr 2009 07:44:49 +0000 (UTC)
Subject: rpms/setools/devel setools.spec,1.86,1.87
Message-ID: <20090405074449.E64607011F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2145

Modified Files:
	setools.spec 
Log Message:
* Sun Apr  5 2009 Dan Hor??k <dan[at]danny.cz> - 3.3.5-7
- add support for s390x



Index: setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setools/devel/setools.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- setools.spec	26 Feb 2009 00:36:06 -0000	1.86
+++ setools.spec	5 Apr 2009 07:44:17 -0000	1.87
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -246,7 +246,7 @@
 %files libs-python
 %defattr(-,root,root,-)
 %{pkg_py_lib}/
-%ifarch x86_64 ppc64 sparc64
+%ifarch x86_64 ppc64 sparc64 s390x
 %{pkg_py_arch}/
 %endif
 
@@ -343,6 +343,9 @@
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Sun Apr  5 2009 Dan Hor??k <dan[at]danny.cz> - 3.3.5-7
+- add support for s390x
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Sun Apr  5 08:52:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  5 Apr 2009 08:52:49 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.358, 1.359 jd.spec, 1.416, 1.417 sources,
	1.359, 1.360
Message-ID: <20090405085250.1E3B27011F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7978

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- .cvsignore	3 Apr 2009 17:09:40 -0000	1.358
+++ .cvsignore	5 Apr 2009 08:52:17 -0000	1.359
@@ -1 +1 @@
-jd-2.4.0-svn2761_trunk.tgz
+jd-2.4.0-svn2765_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- jd.spec	3 Apr 2009 17:09:40 -0000	1.416
+++ jd.spec	5 Apr 2009 08:52:17 -0000	1.417
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2761_trunk
+%define         strtag        svn2765_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Sun Apr  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- sources	3 Apr 2009 17:09:40 -0000	1.359
+++ sources	5 Apr 2009 08:52:17 -0000	1.360
@@ -1 +1 @@
-dc36dd9c270abe097c16aa5892f114f3  jd-2.4.0-svn2761_trunk.tgz
+2d9a5fca4bf54a9545b32668345c5a77  jd-2.4.0-svn2765_trunk.tgz



From mtasaka at fedoraproject.org  Sun Apr  5 08:55:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  5 Apr 2009 08:55:43 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.358, 1.359 jd.spec, 1.407, 1.408 sources, 
	1.359, 1.360
Message-ID: <20090405085543.E692C7011F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8317

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- .cvsignore	3 Apr 2009 17:16:16 -0000	1.358
+++ .cvsignore	5 Apr 2009 08:55:13 -0000	1.359
@@ -1 +1 @@
-jd-2.4.0-svn2761_trunk.tgz
+jd-2.4.0-svn2765_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- jd.spec	3 Apr 2009 17:16:16 -0000	1.407
+++ jd.spec	5 Apr 2009 08:55:13 -0000	1.408
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2761_trunk
+%define         strtag        svn2765_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Sun Apr  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- sources	3 Apr 2009 17:16:16 -0000	1.359
+++ sources	5 Apr 2009 08:55:13 -0000	1.360
@@ -1 +1 @@
-dc36dd9c270abe097c16aa5892f114f3  jd-2.4.0-svn2761_trunk.tgz
+2d9a5fca4bf54a9545b32668345c5a77  jd-2.4.0-svn2765_trunk.tgz



From transif at fedoraproject.org  Sun Apr  5 09:08:11 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun,  5 Apr 2009 09:08:11 +0000 (UTC)
Subject: comps/po mai.po,1.3,1.4
Message-ID: <20090405090811.A5CB27011F@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10158/po

Modified Files:
	mai.po 
Log Message:
Sending translation for Maithili


Index: mai.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mai.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mai.po	9 Jan 2009 11:52:39 -0000	1.3
+++ mai.po	5 Apr 2009 09:07:40 -0000	1.4
@@ -1,21 +1,21 @@
-# translation of comps.HEAD.po to Hindi
+# translation of comps.HEAD.mai.po to Maithili
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Sangeeta Kumari <sangeeta09 at gmail.com>, 2008.
+# Sangeeta Kumari <sangeeta09 at gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD\n"
+"Project-Id-Version: comps.HEAD.mai\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-20 15:40+0530\n"
+"POT-Creation-Date: 2009-04-04 02:06+0000\n"
+"PO-Revision-Date: 2009-04-05 14:37+0530\n"
 "Last-Translator: Sangeeta Kumari <sangeeta09 at gmail.com>\n"
 "Language-Team: Maithili <maithili.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 
@@ -25,192 +25,192 @@
 msgstr "???????????? ???????????????????????? ????????????????????? ?????? ???????????????????????? ???????????? ?????? ????????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "??????????????? ????????????????????? ?????????????????? ???????????? ???' ????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "???????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ???' ????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "?????????????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "?????????????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS ????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "?????? ??????????????????"
 
@@ -219,78 +219,78 @@
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "??????????????????????????? ???' ????????? ???????????????????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "????????????????????????????????? ????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "???????????????????????? (????????????) ??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP ???????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "?????????????????? ??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -300,19 +300,19 @@
 "????????? ????????????????????? ????????? ????????? ??????????????? ?????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -321,86 +321,86 @@
 "????????? ?????????????????? ???????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "????????? ????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "?????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -408,77 +408,74 @@
 msgstr "GTK+ ????????? GNOME ??????????????? ???????????????????????????????????? ??????????????? ??????????????? ????????? ??? ???????????????????????? ???????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????????? XFCE ??????????????? ????????????????????????????????? ??? ??????????????? ???????????? ???' ????????? ??? ????????????????????? ??? ???????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE ??????????????? ????????????????????????????????? ??? ??????????????? ???????????? ???' ????????? ??? ????????????????????? ??? ???????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"?????????????????? ????????? ?????????????????? ???????????? ???????????? ?????????????????? ??????????????? ?????? ??????????????? ??????????????? ???' ????????? ??? ???????????????????????? ???????????????????????? ?????????."
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
+msgid "Install these tools to enable the system to print or act as a print server."
+msgstr "?????????????????? ????????? ?????????????????? ???????????? ???????????? ?????????????????? ??????????????? ?????? ??????????????? ??????????????? ???' ????????? ??? ???????????????????????? ???????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????? ??????????????? (X) ???????????????????????? ????????????????????? ??? ?????????????????? ???????????? ???' ????????? ??? ??????????????? ???????????? ??? ???????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????????????????? ?????????????????????)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -487,121 +484,121 @@
 "????????? ?????????????????? ???????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "?????????????????? ??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "?????????????????? ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "?????????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "????????????????????????/???????????????????????????"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -609,111 +606,110 @@
 msgstr "??????????????? ?????? ?????????????????????????????? ??????????????? ????????? ????????????????????? ???' ????????? ????????????????????????????????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????? ??????????????? ????????????????????? ?????? ????????? ???????????????????????? ????????????????????? ??? ?????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "???????????? ????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "??????????????? ??????????????? ???' ????????? ?????????????????? ???' ????????? ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -722,77 +718,77 @@
 "????????????????????????????????? ????????? ?????????. ?????????????????? ?????????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "??????????????? ????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ?????? ??????????????????????????? ??????????????? ???' ????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ?????????????????? ???????????? ??????????????????????????? ????????? ??????????????? ???' ????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "????????????????????????-?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "????????? ??????????????????"
 
@@ -801,70 +797,64 @@
 msgstr "??????????????? ?????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??????????????????????????? ?????? ???????????????????????? ?????????????????????, PDF ???????????????, ???????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
-msgstr ""
-"??? ???????????? ?????? ?????????????????? ??????????????? ??? ??????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ???' ????????? ?????????????????? ?????????."
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
+msgid "The packages in this group are core libraries needed to develop applications."
+msgstr "??? ???????????? ?????? ?????????????????? ??????????????? ??? ??????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ???' ????????? ?????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ??????????????? ????????????????????? IMAP ???????????? SMTP ????????? ??????????????? ??? ????????????????????? ???????????? ??? ?????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ??????????????????????????? ???????????? X ?????????????????? ?????????????????? ???' ????????? ???????????????????????????????????? ??????????????? ?????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ??????????????? ????????? ??????????????????????????? ????????? ????????? ???????????????????????? ????????????????????? ??????????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ????????????????????? DHCP, ?????????????????? ????????? NIS ??????????????? ???????????????-?????????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"??? ??????????????????????????? rsh ????????? telnet ??????????????? ????????????????????? ??????????????? ??????????????????????????? ???' ????????? ??????????????? ??????????????? ?????????."
+msgstr "??? ??????????????????????????? rsh ????????? telnet ??????????????? ????????????????????? ??????????????? ??????????????????????????? ???' ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "??? ??????????????? ??????????????????????????????????????? ????????????????????? ?????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ??????????????? ??????????????? ????????????????????? ????????? ???????????????????????? ?????????????????? ?????????????????? ?????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr "??? ??????????????? ???????????? ??? ??????????????? ??????????????? ????????? ??????????????? ??????????????? ???' ????????? ?????????????????? ?????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -873,19 +863,19 @@
 "????????? ???????????????????????? ?????? ?????????????????? ?????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ??????????????????????????? ?????????????????? ?????? ???????????? ????????? ??????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ????????????????????? ?????? ?????????????????? ?????? ???????????? FTP ??????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -895,18 +885,18 @@
 "??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr "???????????? ?????????????????? ??????????????? ?????? ????????? ?????????????????? ????????? ??????????????????????????? ???????????? ?????? ?????????????????? ???????????????????????? ?????????"
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ???????????? ?????? Red Hat ???' ???????????? ??????????????? ??????????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -915,13 +905,13 @@
 "?????????????????? ???' ?????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ???????????? ?????? ??????????????? ????????????, ????????? ????????? ????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -929,13 +919,13 @@
 msgstr "??? ???????????? ?????? ???????????? ????????? ??????????????????????????? ??????????????????, ??????????????? ????????? ???????????? ??????????????? ???' ????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ???????????? ?????? ?????????????????? ?????????????????????????????? ????????? ???????????????????????? ???????????? ???' ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -945,7 +935,7 @@
 "?????????????????? ????????? ?????????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -955,21 +945,19 @@
 "???' ????????? ????????? ?????????????????? ?????????????????????????????? ????????????????????? ???' ?????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??????????????????????????? ????????????????????? ???' ????????? ??? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ???????????? ??????????????? ??????????????????????????? ????????????????????? ???????????????????????? ???' ????????? ???????????????????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -979,342 +967,368 @@
 "????????? ??????????????? ????????????????????? ?????????????????? ???????????? ???' ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "??? ??????????????? ???????????? ?????? ???????????? ?????????????????? ?????? DNS ????????? ??????????????? (BIND) ????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
-msgstr ""
-"??? ??????????????? ???????????? ?????? ???????????? Linux ????????? MS Windows(tm) ????????????????????? ????????? ???????????? ?????????????????????????????? ?????? ???????????? ??????."
+msgstr "??? ??????????????? ???????????? ?????? ???????????? Linux ????????? MS Windows(tm) ????????????????????? ????????? ???????????? ?????????????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ??????????????? ???????????? MySQL ??????????????? ???' ????????? ?????????????????? ???????????????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ??????????????? ???????????? ?????? Postgresql ??? ????????? ??????????????? ???' ????????? ??????????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????? ?????????????????? ?????????????????? ??????????????? ??????????????? ???????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "?????????????????? ??? ???????????? ???????????????????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????? ???????????? ????????? ?????????????????? ????????? ???????????? ??????????????? ??????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "??????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows ???????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "????????????????????????????????? ???????????????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
-msgstr "????????????????????????"
+msgstr "?????????????????????"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????? ?????? ????????? ??????????????? ???????????? ???' ????????? ???????????? ???????????????"
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "???????????????????????? ?????? ?????????????????? ?????????????????? ??????????????? ?????????????????????"
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "??????????????? ????????????"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "??????????????? ?????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "??????????????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????????? bitmap ????????? ???????????? ???????????? ???????????????"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "???????????? ???????????????????????? ?????????????????????"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ???????????? ???????????????????????? ????????????????????? ????????? ?????? OLPC XO ???' ????????? ?????????????????? ????????? ????????? ?????????."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "?????????????????????????????? ????????????????????? ?????????????????? ????????? ?????????????????????????????? ????????????????????????????????????"
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "?????????????????? ???????????????"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????? ???????????? ??????????????? ???' ????????? ??????????????? ???????????? ???????????????."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (???????????????) ??????????????????"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "????????????????????? ???????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????' ????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "???????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "??????????????????????????? ??????????????????????????? ????????? ?????????????????? ??? ???????????????????????? ???????????????"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "???????????????????????????????????? ??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
-msgstr ""
+msgstr "??????????????? ?????????????????? ??? ??????????????????"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW ??????????????? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "?????????????????? ????????? ??? ?????????????????????"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "???????????? ???????????????????????? ?????????????????????"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "32 ????????? ?????????????????? ?????????????????? ?????? ??????????????? ??????????????????????????? ?????????????????????????????? ????????? ??????????????????, ???????????? ?????????????????????, ????????? ???????????????????????? ?????? ?????????????????????, ???????????? ???????????? ?????????????????? ????????????."
 
-#: ../comps-f11.xml.in.h:201
-#, fuzzy
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "?????????????????????????????? CAML ???????????????????????????????????? ???????????? ??? ?????????????????????????????? ???????????????????????? ??????????????????????????? ?????????????????? ????????? ??????????????????."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "??????????????????????????? ????????????????????? ???' ????????? ??? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ?????????."
+msgstr "??? ???????????? ?????????????????? ?????????????????? ????????? ?????? ??????????????? ?????? ?????????????????????, ????????????????????????, ????????????-???????????? ?????? ?????????????????? ????????? ???????????????????????? ???????????? ??????."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1365,18 +1379,15 @@
 msgstr "??? ???????????? ????????????????????? ???????????????????????? ???' ????????? ??????????????? ??????????????? ??? ???????????? ?????????."
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ????????????????????? ???' ????????? ??? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ?????????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ????????????????????? ???' ????????? ??? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ?????????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ????????????????????? ???' ????????? ??? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ?????????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1384,6 +1395,6 @@
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ????????????????????? ???' ????????? ??? ???????????? ????????????????????? ??? ??????????????????????????? ???????????? ?????????."
+



From sharkcz at fedoraproject.org  Sun Apr  5 09:15:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  5 Apr 2009 09:15:33 +0000 (UTC)
Subject: rpms/setools/devel setools.spec,1.87,1.88
Message-ID: <20090405091533.ECD827011F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10740

Modified Files:
	setools.spec 
Log Message:
* Sun Apr  5 2009 Dan Hor??k <dan[at]danny.cz> - 3.3.5-8
- don't expect that java-devel resolves as gcj



Index: setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setools/devel/setools.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- setools.spec	5 Apr 2009 07:44:17 -0000	1.87
+++ setools.spec	5 Apr 2009 09:15:02 -0000	1.88
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -187,7 +187,8 @@
 %setup -q
 
 %build
-%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --enable-swig-tcl
+%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
+    --enable-swig-python --enable-swig-java --enable-swig-tcl --with-java-prefix=/usr/lib/jvm/java
 # work around issue with gcc 4.3 + gnu99 + swig-generated code:
 sed -i -e 's:$(CC):gcc -std=gnu89:' libseaudit/swig/python/Makefile
 %ifarch sparc sparcv9 sparc64 s390 s390x                                                                                                
@@ -343,6 +344,9 @@
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Sun Apr  5 2009 Dan Hor??k <dan[at]danny.cz> - 3.3.5-8
+- don't expect that java-devel resolves as gcj
+
 * Sun Apr  5 2009 Dan Hor??k <dan[at]danny.cz> - 3.3.5-7
 - add support for s390x
 



From jwrdegoede at fedoraproject.org  Sun Apr  5 10:22:39 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  5 Apr 2009 10:22:39 +0000 (UTC)
Subject: rpms/beneath-a-steel-sky/devel beneath-a-steel-sky.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090405102239.8D31A7011F@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17004

Modified Files:
	beneath-a-steel-sky.spec sources 
Log Message:
* Fri Apr  3 2009 Hans de Goede <hdegoede at hhs.nl> 0.0348-7
- Switch to latest upstream zip, which has some typo's in the readme
  corrected



Index: beneath-a-steel-sky.spec
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/beneath-a-steel-sky.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- beneath-a-steel-sky.spec	24 Feb 2009 04:27:40 -0000	1.5
+++ beneath-a-steel-sky.spec	5 Apr 2009 10:22:09 -0000	1.6
@@ -1,22 +1,18 @@
 Name:           beneath-a-steel-sky
 Version:        0.0348
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Beneath a Steel Sky - Adventure Game
 Group:          Amusements/Games
 # For further discussion on distribution rights see:
 # http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
 License:        Freely redistributable without restriction
 URL:            http://www.revolution.co.uk/_display.php?id=16
-# There is a new spin of this available here:
-# http://downloads.sourceforge.net/scummvm/BASS-Floppy.zip
-# We are not distributing this as it has dropped the right to modify, making
-# this still Freely redistributable, but no longer Free 
-Source0:        BASS-Floppy.zip
+Source0:        http://downloads.sourceforge.net/scummvm/BASS-Floppy.zip
 Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildArch:      noarch
-Requires:       scummvm >= 0.9.1, hicolor-icon-theme
+Requires:       scummvm >= 0.9.1
 Obsoletes:      bass <= 0-8
 Provides:       bass = 0-8
 
@@ -36,7 +32,7 @@
 
 
 %prep
-%setup -q -n sky-floppy
+%setup -q -c
 
 
 %build
@@ -66,6 +62,10 @@
 
 
 %changelog
+* Fri Apr  3 2009 Hans de Goede <hdegoede at hhs.nl> 0.0348-7
+- Switch to latest upstream zip, which has some typo's in the readme
+  corrected
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0348-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 19:22:35 -0000	1.2
+++ sources	5 Apr 2009 10:22:09 -0000	1.3
@@ -1 +1 @@
-cb968b4cfdde8491069915bf15d275b3  BASS-Floppy.zip
+28152afbd1f3017d2ebee52466ed200d  BASS-Floppy.zip



From jwrdegoede at fedoraproject.org  Sun Apr  5 10:33:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  5 Apr 2009 10:33:50 +0000 (UTC)
Subject: rpms/beneath-a-steel-sky/devel beneath-a-steel-sky.spec,1.6,1.7
Message-ID: <20090405103350.3A7E97011F@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18320

Modified Files:
	beneath-a-steel-sky.spec 
Log Message:
* Sun Apr  5 2009 Hans de Goede <hdegoede at hhs.nl> 0.0348-8
- Bump minimal scummvm version to 0.12.0, as the new upstream zip no
  longer includes sky.cpt, that is part of scummvm itself since 0.12.0



Index: beneath-a-steel-sky.spec
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/beneath-a-steel-sky.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- beneath-a-steel-sky.spec	5 Apr 2009 10:22:09 -0000	1.6
+++ beneath-a-steel-sky.spec	5 Apr 2009 10:33:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           beneath-a-steel-sky
 Version:        0.0348
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Beneath a Steel Sky - Adventure Game
 Group:          Amusements/Games
 # For further discussion on distribution rights see:
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildArch:      noarch
-Requires:       scummvm >= 0.9.1
+Requires:       scummvm >= 0.12.0
 Obsoletes:      bass <= 0-8
 Provides:       bass = 0-8
 
@@ -62,6 +62,10 @@
 
 
 %changelog
+* Sun Apr  5 2009 Hans de Goede <hdegoede at hhs.nl> 0.0348-8
+- Bump minimal scummvm version to 0.12.0, as the new upstream zip no
+  longer includes sky.cpt, that is part of scummvm itself since 0.12.0
+
 * Fri Apr  3 2009 Hans de Goede <hdegoede at hhs.nl> 0.0348-7
 - Switch to latest upstream zip, which has some typo's in the readme
   corrected



From drago01 at fedoraproject.org  Sun Apr  5 11:13:58 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun,  5 Apr 2009 11:13:58 +0000 (UTC)
Subject: rpms/compiz/devel compiz-gtk,1.8,1.9 compiz.spec,1.161,1.162
Message-ID: <20090405111358.653387011F@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22823

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Direct rendering does not mean that we have hw 3D, so fix that check


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compiz-gtk	16 Mar 2009 14:05:01 -0000	1.8
+++ compiz-gtk	5 Apr 2009 11:13:26 -0000	1.9
@@ -5,7 +5,8 @@
 	exec compiz --ignore-desktop-hints glib gconf $@
 }
 
-HAVE3D=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
+DIRECT=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
+ISSW=`glxinfo | grep "Software Rasterizer" -c`
 
 # Disabled for now, does not work as expected
 #HAVETFP=`glxinfo | grep texture_from_pixmap -c`
@@ -19,7 +20,7 @@
 
 HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then 
+if ( [ $DIRECT == "Yes" ] && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
 	runCompiz $@
 fi
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- compiz.spec	16 Mar 2009 14:05:01 -0000	1.161
+++ compiz.spec	5 Apr 2009 11:13:26 -0000	1.162
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -388,6 +388,9 @@
 
 
 %changelog
+* Sun Apr 05 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-18
+- Direct rendering does not mean that we have hw 3D
+
 * Mon Mar 16 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-17
 - Fix compiz-gtk script RH #490383
 



From drago01 at fedoraproject.org  Sun Apr  5 11:27:49 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun,  5 Apr 2009 11:27:49 +0000 (UTC)
Subject: rpms/wxdfast/devel wxdfast.spec,1.3,1.4
Message-ID: <20090405112749.331C47011F@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/wxdfast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12437

Modified Files:
	wxdfast.spec 
Log Message:
Rebuild to fix broken symbols (RH #490470)


Index: wxdfast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxdfast/devel/wxdfast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxdfast.spec	26 Feb 2009 07:29:21 -0000	1.3
+++ wxdfast.spec	5 Apr 2009 11:27:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name: wxdfast
 Version: 0.6.0        
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Multi-threaded download manager        
 
 Group: Applications/Internet        
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sun Apr 05 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.6.0-6
+- Rebuild to fix broken symbols (RH #490470)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Sun Apr  5 12:20:45 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  5 Apr 2009 12:20:45 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.131,1.132
Message-ID: <20090405122045.AC2787011F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15238

Modified Files:
	kexec-tools.spec 
Log Message:
* Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.0.0-11
- Install the correct configuration for i586



Index: kexec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kexec-tools.spec	3 Apr 2009 20:06:29 -0000	1.131
+++ kexec-tools.spec	5 Apr 2009 12:20:13 -0000	1.132
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -121,11 +121,12 @@
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/kdump
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/kdump
-if [ -f $RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} ]; then
-	install -m 644 $RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
-else
-	install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
-fi
+
+SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu}
+[ -f $SYSCONFIG ] || SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_arch}
+[ -f $SYSCONFIG ] || SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig
+install -m 644 $SYSCONFIG $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
+
 install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/sbin/mkdumprd
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
 install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
@@ -242,6 +243,9 @@
 
 
 %changelog
+* Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.0.0-11
+- Install the correct configuration for i586
+
 * Fri Apr 03 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-10
 - Fix problem with quoted CORE_COLLECTOR string (bz 493707)
 



From jwrdegoede at fedoraproject.org  Sun Apr  5 12:39:35 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun,  5 Apr 2009 12:39:35 +0000 (UTC)
Subject: rpms/lure/devel .cvsignore, 1.2, 1.3 lure.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090405123935.7C5807011F@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lure/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17168

Modified Files:
	.cvsignore lure.spec sources 
Log Message:
* Sun Apr  5 2009 Hans de Goede <hdegoede at hhs.nl> 1.1-3
- Drop lure.dat from the included files, as that is part of scummvm itself
  since 0.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lure/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Mar 2008 18:56:35 -0000	1.2
+++ .cvsignore	5 Apr 2009 12:39:03 -0000	1.3
@@ -1,2 +1 @@
 lure-1.1.zip
-lure.dat


Index: lure.spec
===================================================================
RCS file: /cvs/extras/rpms/lure/devel/lure.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lure.spec	25 Feb 2009 22:10:51 -0000	1.2
+++ lure.spec	5 Apr 2009 12:39:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lure
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lure of the Temptress - Adventure Game
 Group:          Amusements/Games
 # For further discussion on distribution rights see:
@@ -8,12 +8,11 @@
 License:        Freely redistributable without restriction
 URL:            http://www.revolution.co.uk/_display.php?id=10
 Source0:        http://downloads.sourceforge.net/scummvm/%{name}-%{version}.zip
-Source1:        https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-11-1/dists/engine-data/lure.dat
-Source2:        %{name}.desktop
+Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildArch:      noarch
-Requires:       scummvm >= 0.11.1-2
+Requires:       scummvm >= 0.12.0
 
 %description
 Lure of the Temptress was Revolution's very first adventure game and work began
@@ -41,12 +40,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 644 *.vga *.ega %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 *.vga *.ega $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE2}
+  %{SOURCE1}
 
 
 %clean
@@ -61,6 +60,10 @@
 
 
 %changelog
+* Sun Apr  5 2009 Hans de Goede <hdegoede at hhs.nl> 1.1-3
+- Drop lure.dat from the included files, as that is part of scummvm itself
+  since 0.12.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lure/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Mar 2008 18:56:35 -0000	1.2
+++ sources	5 Apr 2009 12:39:03 -0000	1.3
@@ -1,2 +1 @@
 d1300cef563bb4b6b1f88a2f1cee7832  lure-1.1.zip
-d92372e7eead8d6e64f40cce381ec6ea  lure.dat



From dcbw at fedoraproject.org  Sun Apr  5 12:41:46 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun,  5 Apr 2009 12:41:46 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.101,
	1.102 NetworkManager.spec, 
	1.267, 1.268 nm-applet-internal-buildfixes.patch, 1.5,
	1.6 sources, 1.138, 1.139
Message-ID: <20090405124146.6CBD87013C@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17573

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
- Update to 0.7.1-rc4
- nm: use PolicyKit for system connection secrets retrieval
- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
- editor: use PolicyKit to get system connection secrets




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	26 Mar 2009 21:27:17 -0000	1.101
+++ .cvsignore	5 Apr 2009 12:41:15 -0000	1.102
@@ -147,3 +147,5 @@
 network-manager-applet-0.7.0.99.svn1233.tar.bz2
 NetworkManager-0.7.0.99.git20090326.tar.bz2
 network-manager-applet-0.7.0.99.svn1235.tar.bz2
+NetworkManager-0.7.0.100.tar.bz2
+network-manager-applet-0.7.0.100.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- NetworkManager.spec	26 Mar 2009 21:27:17 -0000	1.267
+++ NetworkManager.spec	5 Apr 2009 12:41:15 -0000	1.268
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090326
-%define applet_snapshot .svn1235
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.0.99
-Release: 5%{snapshot}%{?dist}
+Version: 0.7.0.100
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -34,7 +34,7 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
-Requires: iproute openssl
+Requires: iproute
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-21
 Requires: libnl >= %{libnl_version}
@@ -56,7 +56,6 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
-BuildRequires: openssl-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
@@ -325,6 +324,12 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
+- Update to 0.7.1-rc4
+- nm: use PolicyKit for system connection secrets retrieval
+- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
+- editor: use PolicyKit to get system connection secrets
+
 * Thu Mar 26 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-5
 - nm: fix crashes with out-of-tree modules that provide no driver link (rh #492246)
 - nm: fix USB modem probing on recent udev versions

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nm-applet-internal-buildfixes.patch	5 Mar 2009 00:22:16 -0000	1.5
+++ nm-applet-internal-buildfixes.patch	5 Apr 2009 12:41:15 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -23,12 +23,12 @@
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
 +
- nm_connection_editor_CPPFLAGS =			\
- 	$(NMA_CFLAGS)				\
- 	-DICONDIR=\""$(datadir)/icons"\"	\
-@@ -64,7 +68,10 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/wireless-security/libwireless-security.la \
+ nm_connection_editor_CPPFLAGS = \
+ 	$(NMA_CFLAGS) \
+ 	-DICONDIR=\""$(datadir)/icons"\" \
+@@ -70,7 +74,10 @@ nm_connection_editor_LDADD = \
  	${top_builddir}/src/utils/libutils.la \
+ 	${top_builddir}/src/marshallers/libmarshallers.la \
  	$(NMA_LIBS) \
 -	$(POLKIT_LIBS)
 +	$(POLKIT_LIBS) \
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  
@@ -116,7 +116,7 @@
  libwireless_security_la_SOURCES = \
  	wireless-security.h \
  	wireless-security.c \
-@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
+@@ -38,5 +42,7 @@ libwireless_security_la_CPPFLAGS = \
  libwireless_security_la_LIBADD = \
  	$(NMA_LIBS) \
  	${top_builddir}/src/utils/libutils.la \


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	26 Mar 2009 21:27:18 -0000	1.138
+++ sources	5 Apr 2009 12:41:16 -0000	1.139
@@ -1,2 +1,2 @@
-11a6eb949e99c1911d3e96ae81c1cb5c  NetworkManager-0.7.0.99.git20090326.tar.bz2
-8fef9799299d24177f91223c15429c4b  network-manager-applet-0.7.0.99.svn1235.tar.bz2
+cc75c0b8b83793050e28ebe39d2c5f57  NetworkManager-0.7.0.100.tar.bz2
+4a332aecf58eefcee33abd39b5038e9e  network-manager-applet-0.7.0.100.tar.bz2



From fschwarz at fedoraproject.org  Sun Apr  5 12:41:55 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sun,  5 Apr 2009 12:41:55 +0000 (UTC)
Subject: rpms/python-beaker/devel .cvsignore, 1.6, 1.7 python-beaker.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090405124155.C167A7013C@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-beaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17555

Modified Files:
	.cvsignore python-beaker.spec sources 
Log Message:

update to Beaker 1.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jan 2009 04:57:41 -0000	1.6
+++ .cvsignore	5 Apr 2009 12:41:25 -0000	1.7
@@ -1 +1 @@
-Beaker-1.1.3.tar.gz
+Beaker-1.2.3.tar.gz


Index: python-beaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/python-beaker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-beaker.spec	26 Feb 2009 20:49:11 -0000	1.7
+++ python-beaker.spec	5 Apr 2009 12:41:25 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-beaker
-Version: 1.1.3
-Release: 2%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
 Summary: WSGI middleware layer to provide sessions
 
 Group: Development/Languages
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Sun Apr 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.2.3-1
+- Update to 1.2.3
+ 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2009 04:57:42 -0000	1.6
+++ sources	5 Apr 2009 12:41:25 -0000	1.7
@@ -1 +1 @@
-bac93e2f39e15aa145dabacc5f15fc2e  Beaker-1.1.3.tar.gz
+ad4748c2ce1e6296a0b4b82d3eac46cf  Beaker-1.2.3.tar.gz



From dcbw at fedoraproject.org  Sun Apr  5 12:49:48 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun,  5 Apr 2009 12:49:48 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 NetworkManager.spec, 1.263,
	1.264 nm-applet-internal-buildfixes.patch, 1.5, 1.6 sources,
	1.136, 1.137
Message-ID: <20090405124948.76DEB7011F@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19149

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
- Update to 0.7.1-rc4
- nm: use PolicyKit for system connection secrets retrieval
- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
- editor: use PolicyKit to get system connection secrets




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- NetworkManager.spec	26 Mar 2009 21:28:05 -0000	1.263
+++ NetworkManager.spec	5 Apr 2009 12:49:17 -0000	1.264
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090326
-%define applet_snapshot .svn1235
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.0.99
-Release: 5%{snapshot}%{?dist}
+Version: 0.7.0.100
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -35,7 +35,7 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
-Requires: iproute openssl
+Requires: iproute
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-21
 Requires: libnl >= %{libnl_version}
@@ -57,7 +57,6 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
-BuildRequires: openssl-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
@@ -327,6 +326,12 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
+- Update to 0.7.1-rc4
+- nm: use PolicyKit for system connection secrets retrieval
+- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
+- editor: use PolicyKit to get system connection secrets
+
 * Thu Mar 26 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-5
 - nm: fix crashes with out-of-tree modules that provide no driver link (rh #492246)
 - nm: fix USB modem probing on recent udev versions

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nm-applet-internal-buildfixes.patch	5 Mar 2009 10:53:40 -0000	1.5
+++ nm-applet-internal-buildfixes.patch	5 Apr 2009 12:49:18 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -23,12 +23,12 @@
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
 +
- nm_connection_editor_CPPFLAGS =			\
- 	$(NMA_CFLAGS)				\
- 	-DICONDIR=\""$(datadir)/icons"\"	\
-@@ -64,7 +68,10 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/wireless-security/libwireless-security.la \
+ nm_connection_editor_CPPFLAGS = \
+ 	$(NMA_CFLAGS) \
+ 	-DICONDIR=\""$(datadir)/icons"\" \
+@@ -70,7 +74,10 @@ nm_connection_editor_LDADD = \
  	${top_builddir}/src/utils/libutils.la \
+ 	${top_builddir}/src/marshallers/libmarshallers.la \
  	$(NMA_LIBS) \
 -	$(POLKIT_LIBS)
 +	$(POLKIT_LIBS) \
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  
@@ -116,7 +116,7 @@
  libwireless_security_la_SOURCES = \
  	wireless-security.h \
  	wireless-security.c \
-@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
+@@ -38,5 +42,7 @@ libwireless_security_la_CPPFLAGS = \
  libwireless_security_la_LIBADD = \
  	$(NMA_LIBS) \
  	${top_builddir}/src/utils/libutils.la \


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	26 Mar 2009 21:28:05 -0000	1.136
+++ sources	5 Apr 2009 12:49:18 -0000	1.137
@@ -1,2 +1,2 @@
-11a6eb949e99c1911d3e96ae81c1cb5c  NetworkManager-0.7.0.99.git20090326.tar.bz2
-8fef9799299d24177f91223c15429c4b  network-manager-applet-0.7.0.99.svn1235.tar.bz2
+cc75c0b8b83793050e28ebe39d2c5f57  NetworkManager-0.7.0.100.tar.bz2
+4a332aecf58eefcee33abd39b5038e9e  network-manager-applet-0.7.0.100.tar.bz2



From dcbw at fedoraproject.org  Sun Apr  5 12:58:40 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun,  5 Apr 2009 12:58:40 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.268,1.269
Message-ID: <20090405125840.6A57B7011F@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	NetworkManager.spec 
Log Message:
need e2fsprogs-devel for libuuid


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- NetworkManager.spec	5 Apr 2009 12:41:15 -0000	1.268
+++ NetworkManager.spec	5 Apr 2009 12:58:09 -0000	1.269
@@ -71,6 +71,8 @@
 BuildRequires: dhclient
 BuildRequires: gtk-doc
 BuildRequires: libudev-devel
+# for libuuid
+BuildRequires: e2fsprogs-devel
 
 %description
 NetworkManager attempts to keep an active network connection available at all



From dcbw at fedoraproject.org  Sun Apr  5 13:01:10 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun,  5 Apr 2009 13:01:10 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 NetworkManager.spec,1.264,1.265
Message-ID: <20090405130110.8AD147011F@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20767

Modified Files:
	NetworkManager.spec 
Log Message:
BuildRequires for libuuid


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- NetworkManager.spec	5 Apr 2009 12:49:17 -0000	1.264
+++ NetworkManager.spec	5 Apr 2009 13:00:40 -0000	1.265
@@ -72,6 +72,8 @@
 BuildRequires: dhclient
 BuildRequires: gtk-doc
 BuildRequires: libudev-devel
+# for libuuid
+BuildRequires: e2fsprogs-devel
 
 %description
 NetworkManager attempts to keep an active network connection available at all



From fschwarz at fedoraproject.org  Sun Apr  5 13:07:46 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sun,  5 Apr 2009 13:07:46 +0000 (UTC)
Subject: rpms/python-zope-interface/devel .cvsignore, 1.4,
	1.5 python-zope-interface.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090405130746.0A1667011F@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-zope-interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21565

Modified Files:
	.cvsignore python-zope-interface.spec sources 
Log Message:

update to zope.interface 3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-interface/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Nov 2008 17:31:01 -0000	1.4
+++ .cvsignore	5 Apr 2009 13:07:15 -0000	1.5
@@ -1 +1 @@
-zope.interface-3.5.0.zip
+zope.interface-3.5.1.tar.gz


Index: python-zope-interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-interface/devel/python-zope-interface.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-zope-interface.spec	27 Feb 2009 00:22:42 -0000	1.10
+++ python-zope-interface.spec	5 Apr 2009 13:07:15 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-zope-interface
-Version:	3.5.0
-Release:	4%{?dist}
+Version:	3.5.1
+Release:	1%{?dist}
 Summary:	Zope 3 Interface Infrastructure
 Group:		Development/Libraries
 License:	ZPLv2.1
@@ -58,6 +58,9 @@
 %{python_sitearch}/zope.interface*
 
 %changelog
+* Sun Apr 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 3.5.1-1
+- update to 3.5.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-interface/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Nov 2008 17:31:01 -0000	1.4
+++ sources	5 Apr 2009 13:07:15 -0000	1.5
@@ -1 +1 @@
-478d05add7cd7faf25a2fd880a739ddb  zope.interface-3.5.0.zip
+685fc532550abb07cca6190c9cd2b901  zope.interface-3.5.1.tar.gz



From dcbw at fedoraproject.org  Sun Apr  5 13:09:56 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun,  5 Apr 2009 13:09:56 +0000 (UTC)
Subject: rpms/NetworkManager/F-9 NetworkManager.spec, 1.257,
	1.258 nm-applet-internal-buildfixes.patch, 1.5, 1.6 sources,
	1.134, 1.135
Message-ID: <20090405130956.7F7A37011F@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21871

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
- Update to 0.7.1-rc4
- nm: use PolicyKit for system connection secrets retrieval
- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
- editor: use PolicyKit to get system connection secrets




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- NetworkManager.spec	26 Mar 2009 21:29:24 -0000	1.257
+++ NetworkManager.spec	5 Apr 2009 13:09:25 -0000	1.258
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090326
-%define applet_snapshot .svn1235
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.0.99
-Release: 5%{snapshot}%{?dist}
+Version: 0.7.0.100
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -36,7 +36,7 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
-Requires: iproute openssl
+Requires: iproute
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-21
 Requires: libnl >= %{libnl_version}
@@ -58,7 +58,6 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
-BuildRequires: openssl-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
@@ -73,6 +72,8 @@
 BuildRequires: PolicyKit-devel PolicyKit-gnome-devel
 BuildRequires: dhclient
 BuildRequires: gtk-doc
+# for libuuid
+BuildRequires: e2fsprogs-devel
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -334,6 +335,12 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
+- Update to 0.7.1-rc4
+- nm: use PolicyKit for system connection secrets retrieval
+- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
+- editor: use PolicyKit to get system connection secrets
+
 * Thu Mar 26 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.99-5
 - nm: fix crashes with out-of-tree modules that provide no driver link (rh #492246)
 - nm: fix USB modem probing on recent udev versions

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nm-applet-internal-buildfixes.patch	5 Mar 2009 11:05:17 -0000	1.5
+++ nm-applet-internal-buildfixes.patch	5 Apr 2009 13:09:26 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -23,12 +23,12 @@
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
 +
- nm_connection_editor_CPPFLAGS =			\
- 	$(NMA_CFLAGS)				\
- 	-DICONDIR=\""$(datadir)/icons"\"	\
-@@ -64,7 +68,10 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/wireless-security/libwireless-security.la \
+ nm_connection_editor_CPPFLAGS = \
+ 	$(NMA_CFLAGS) \
+ 	-DICONDIR=\""$(datadir)/icons"\" \
+@@ -70,7 +74,10 @@ nm_connection_editor_LDADD = \
  	${top_builddir}/src/utils/libutils.la \
+ 	${top_builddir}/src/marshallers/libmarshallers.la \
  	$(NMA_LIBS) \
 -	$(POLKIT_LIBS)
 +	$(POLKIT_LIBS) \
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  
@@ -116,7 +116,7 @@
  libwireless_security_la_SOURCES = \
  	wireless-security.h \
  	wireless-security.c \
-@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
+@@ -38,5 +42,7 @@ libwireless_security_la_CPPFLAGS = \
  libwireless_security_la_LIBADD = \
  	$(NMA_LIBS) \
  	${top_builddir}/src/utils/libutils.la \


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	26 Mar 2009 21:29:24 -0000	1.134
+++ sources	5 Apr 2009 13:09:26 -0000	1.135
@@ -1,2 +1,2 @@
-11a6eb949e99c1911d3e96ae81c1cb5c  NetworkManager-0.7.0.99.git20090326.tar.bz2
-8fef9799299d24177f91223c15429c4b  network-manager-applet-0.7.0.99.svn1235.tar.bz2
+cc75c0b8b83793050e28ebe39d2c5f57  NetworkManager-0.7.0.100.tar.bz2
+4a332aecf58eefcee33abd39b5038e9e  network-manager-applet-0.7.0.100.tar.bz2



From bskeggs at fedoraproject.org  Sun Apr  5 13:46:59 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Sun,  5 Apr 2009 13:46:59 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.32, 1.33 kernel.spec, 1.1512, 
	1.1513
Message-ID: <20090405134659.9BDAE7011F@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26825

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: big update.  mostly cleanups, few functional changes
    Big code cleanup (the scary looking, but hopefully harmless part)
    Now using "full-featured" VBIOS parser from DDX
    Remove custom i2c code in favour of i2c_algo_bit
    Refuse to suspend, we can't possibly resume just yet
    Fix ramht insertions when a collision happens (rh#492427)
    No kms warning on pre-nv50 when kms not acutally enabled (rh#493222)




drm-nouveau.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.32 -r 1.33 drm-nouveau.patch
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- drm-nouveau.patch	31 Mar 2009 06:30:02 -0000	1.32
+++ drm-nouveau.patch	5 Apr 2009 13:46:53 -0000	1.33
@@ -236,7 +236,7 @@
  		drm_put_minor(&dev->control);
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..12af41b
+index 0000000..06483d0
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,24 @@
@@ -249,8 +249,8 @@
 +             nouveau_object.o nouveau_irq.o nouveau_notifier.o \
 +             nouveau_swmthd.o nouveau_sgdma.o nouveau_dma.o \
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o \
-+             nouveau_bios.o nouveau_display.o nouveau_fbcon.o \
-+	     nouveau_backlight.o \
++             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
++	     nouveau_display.o nouveau_fbcon.o nouveau_backlight.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -259,17 +259,17 @@
 +             nv40_graph.o nv50_graph.o \
 +             nv04_instmem.o nv50_instmem.o \
 +             nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
-+             nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o
++             nv50_cursor.o nv50_display.o nv50_fbcon.o
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
-index 0000000..3fc521e
+index 0000000..e3d354f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,152 @@
 +/*
 + * Copyright (C) 2009 Red Hat <mjg at redhat.com>
 + *
@@ -312,7 +312,6 @@
 +static int nv40_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = (nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16;
 +
 +	return val;
@@ -321,7 +320,6 @@
 +static int nv40_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +	int reg = nv_rd32(NV40_PMC_BACKLIGHT);
 +
@@ -340,7 +338,6 @@
 +static int nv50_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +
 +	return nv_rd32(NV50_PDISPLAY_BACKLIGHT);
 +}
@@ -348,7 +345,6 @@
 +static int nv50_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +
 +	nv_wr32(NV50_PDISPLAY_BACKLIGHT, val | NV50_PDISPLAY_BACKLIGHT_ENABLE);
@@ -428,45 +424,65 @@
 +}	
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..ef33b39
+index 0000000..7165a60
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,898 @@
+@@ -0,0 +1,4570 @@
 +/*
-+ * Copyright (C) 2005-2006 Erik Waling
-+ * Copyright (C) 2006 Stephane Marchesin
-+ * Copyright (C) 2007-2008 Stuart Bennett
-+ * Copyright (C) 2008 Maarten Maathuis.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
++ * Copyright 2005-2006 Erik Waling
++ * Copyright 2006 Stephane Marchesin
++ * Copyright 2007-2009 Stuart Bennett
 + *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial
-+ * portions of the Software.
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
 + *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
++ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
 + */
 +
-+#include <asm/byteorder.h>
-+#include "nouveau_bios.h"
++#include "drmP.h"
 +#include "nouveau_drv.h"
++#include "nouveau_hw.h"
++
++/* these defines are made up */
++#define NV_CIO_CRE_44_HEADA 0x0
++#define NV_CIO_CRE_44_HEADB 0x3
++#define FEATURE_MOBILE 0x10	/* also FEATURE_QUADRO for BMP */
++#define LEGACY_I2C_CRT 0x80
++
++#define EDID1_LEN 128
++
++#define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip, fmt, ##arg)
++#define LOG_OLD_VALUE(x) //x
++
++#define BIOS_USLEEP(n) msleep((n)/1000)
++
++#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))
++#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))
 +
-+/* returns true if it mismatches */
-+static bool nv_checksum(const uint8_t *data, unsigned int length)
++static int crtchead = 0;
++
++/* this will need remembering across a suspend */
++static uint32_t saved_nv_pfb_cfg0;
++
++typedef struct {
++	bool execute;
++	bool repeat;
++} init_exec_t;
++
++static bool nv_cksum(const uint8_t *data, unsigned int length)
 +{
 +	/* there's a few checksums in the BIOS, so here's a generic checking function */
 +	int i;
@@ -481,51 +497,67 @@
 +	return false;
 +}
 +
-+static int nv_valid_bios(struct drm_device *dev, uint8_t *data)
++static int
++score_vbios(struct drm_device *dev, const uint8_t *data, const bool writeable)
 +{
-+	/* check for BIOS signature */
 +	if (!(data[0] == 0x55 && data[1] == 0xAA)) {
-+		DRM_ERROR("BIOS signature not found.\n");
++		NV_TRACEWARN(dev, "... BIOS signature not found\n");
 +		return 0;
 +	}
 +
-+	if (nv_checksum(data, data[2] * 512)) {
-+		DRM_ERROR("BIOS checksum invalid.\n");
-+		return 1;
-+	}
++	if (nv_cksum(data, data[2] * 512)) {
++		NV_TRACEWARN(dev, "... BIOS checksum invalid\n");
++		/* if a ro image is somewhat bad, it's probably all rubbish */
++		return writeable ? 2 : 1;
++	} else
[...20907 lines suppressed...]
++#	define NV_CIO_CRE_85			0x85
++#	define NV_CIO_CRE_86			0x86
++#define NV_PRMCIO_INP0__COLOR		0x006013da
++
++#define NV_PRAMDAC_CU_START_POS				0x00680300
++#	define NV_PRAMDAC_CU_START_POS_X			15:0
++#	define NV_PRAMDAC_CU_START_POS_Y			31:16
++#define NV_RAMDAC_NV10_CURSYNC				0x00680404
++
++#define NV_PRAMDAC_NVPLL_COEFF				0x00680500
++#define NV_PRAMDAC_MPLL_COEFF				0x00680504
++#define NV_PRAMDAC_VPLL_COEFF				0x00680508
++#	define NV30_RAMDAC_ENABLE_VCO2				(8 << 4)
++
++#define NV_PRAMDAC_PLL_COEFF_SELECT			0x0068050c
++#	define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE		(4 << 0)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_MPLL	(1 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_VPLL	(2 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_NVPLL	(4 << 8)
++#	define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2		(8 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB2	(1 << 28)
++#	define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2		(2 << 28)
++
++#define NV_PRAMDAC_PLL_SETUP_CONTROL			0x00680510
++#define NV_RAMDAC_VPLL2					0x00680520
++#define NV_PRAMDAC_SEL_CLK				0x00680524
++#define NV_RAMDAC_DITHER_NV11				0x00680528
++#define NV_PRAMDAC_DACCLK				0x0068052c
++#	define NV_PRAMDAC_DACCLK_SEL_DACCLK			(1 << 0)
++
++#define NV_RAMDAC_NVPLL_B				0x00680570
++#define NV_RAMDAC_MPLL_B				0x00680574
++#define NV_RAMDAC_VPLL_B				0x00680578
++#define NV_RAMDAC_VPLL2_B				0x0068057c
++#	define NV31_RAMDAC_ENABLE_VCO2				(8 << 28)
++#define NV_PRAMDAC_580					0x00680580
++#	define NV_RAMDAC_580_VPLL1_ACTIVE			(1 << 8)
++#	define NV_RAMDAC_580_VPLL2_ACTIVE			(1 << 28)
++
++#define NV_PRAMDAC_GENERAL_CONTROL			0x00680600
++#define NV_PRAMDAC_TEST_CONTROL				0x00680608
++#	define NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED	(1 << 12)
++#	define NV_PRAMDAC_TEST_CONTROL_PWRDWN_DAC_OFF		(1 << 16)
++#	define NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI		(1 << 28)
++#define NV_PRAMDAC_TESTPOINT_DATA			0x00680610
++#	define NV_PRAMDAC_TESTPOINT_DATA_NOTBLANK		(8 << 28)
++#define NV_PRAMDAC_630					0x00680630
++#define NV_PRAMDAC_634					0x00680634
++
++#define NV_PRAMDAC_FP_VDISPLAY_END			0x00680800
++#define NV_PRAMDAC_FP_VTOTAL				0x00680804
++#define NV_PRAMDAC_FP_VCRTC				0x00680808
++#define NV_PRAMDAC_FP_VSYNC_START			0x0068080c
++#define NV_PRAMDAC_FP_VSYNC_END				0x00680810
++#define NV_PRAMDAC_FP_VVALID_START			0x00680814
++#define NV_PRAMDAC_FP_VVALID_END			0x00680818
++#define NV_PRAMDAC_FP_HDISPLAY_END			0x00680820
++#define NV_PRAMDAC_FP_HTOTAL				0x00680824
++#define NV_PRAMDAC_FP_HCRTC				0x00680828
++#define NV_PRAMDAC_FP_HSYNC_START			0x0068082c
++#define NV_PRAMDAC_FP_HSYNC_END				0x00680830
++#define NV_PRAMDAC_FP_HVALID_START			0x00680834
++#define NV_PRAMDAC_FP_HVALID_END			0x00680838
++
++#define NV_RAMDAC_FP_DITHER				0x0068083c
++#define NV_PRAMDAC_FP_TG_CONTROL			0x00680848
++#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS		(1 << 0)
++#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_DISABLE		(2 << 0)
++#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS		(1 << 4)
++#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_DISABLE		(2 << 4)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_SCALE		(0 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_CENTER		(1 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_NATIVE		(2 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_READ_PROG		(1 << 20)
++#	define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12		(1 << 24)
++#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS		(1 << 28)
++#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE		(2 << 28)
++#define NV_PRAMDAC_850					0x00680850
++#define NV_PRAMDAC_85C					0x0068085c
++#define NV_PRAMDAC_FP_DEBUG_0				0x00680880
++#	define NV_PRAMDAC_FP_DEBUG_0_XSCALE_ENABLE		(1 << 0)
++#	define NV_PRAMDAC_FP_DEBUG_0_YSCALE_ENABLE		(1 << 4)
++/* This doesn't seem to be essential for tmds, but still often set */
++#	define NV_RAMDAC_FP_DEBUG_0_TMDS_ENABLED		(8 << 4)
++#	define NV_PRAMDAC_FP_DEBUG_0_XINTERP_BILINEAR		(1 << 8)
++#	define NV_PRAMDAC_FP_DEBUG_0_YINTERP_BILINEAR		(1 << 12)
++#	define NV_PRAMDAC_FP_DEBUG_0_XWEIGHT_ROUND		(1 << 20)
++#	define NV_PRAMDAC_FP_DEBUG_0_YWEIGHT_ROUND		(1 << 24)
++#define NV_PRAMDAC_FP_DEBUG_1				0x00680884
++#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_VALUE		11:0
++#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_TESTMODE_ENABLE	(1 << 12)
++#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_VALUE		27:16
++#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_TESTMODE_ENABLE	(1 << 28)
++#define NV_PRAMDAC_FP_DEBUG_2				0x00680888
++#define NV_PRAMDAC_FP_DEBUG_3				0x0068088C
++
++/* Some unknown regs, purely for NV30 it seems. */
++#define NV_PRAMDAC_890					0x00680890
++#define NV_PRAMDAC_89C					0x0068089C
++
++/* see NV_PRAMDAC_INDIR_TMDS in rules.xml */
++#define NV_PRAMDAC_FP_TMDS_CONTROL			0x006808b0
++#	define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE		(1 << 16)
++#define NV_PRAMDAC_FP_TMDS_DATA				0x006808b4
++
++/* Some kind of switch */
++#define NV_PRAMDAC_900					0x00680900
++#define NV_PRAMDAC_A20					0x00680A20
++#define NV_PRAMDAC_A24					0x00680A24
++#define NV_PRAMDAC_A34					0x00680A34
++
++/* names fabricated from NV_USER_DAC info */
++#define NV_PRMDIO_PIXEL_MASK		0x006813c6
++#	define NV_PRMDIO_PIXEL_MASK_MASK	0xff
++#define NV_PRMDIO_READ_MODE_ADDRESS	0x006813c7
++#define NV_PRMDIO_WRITE_MODE_ADDRESS	0x006813c8
++#define NV_PRMDIO_PALETTE_DATA		0x006813c9
++
++#define NV_PGRAPH_DEBUG_0		0x00400080
++#define NV_PGRAPH_DEBUG_1		0x00400084
++#define NV_PGRAPH_DEBUG_2_NV04		0x00400088
++#define NV_PGRAPH_DEBUG_2		0x00400620
++#define NV_PGRAPH_DEBUG_3		0x0040008c
++#define NV_PGRAPH_DEBUG_4		0x00400090
++#define NV_PGRAPH_INTR			0x00400100
++#define NV_PGRAPH_INTR_EN		0x00400140
++#define NV_PGRAPH_CTX_CONTROL		0x00400144
++#define NV_PGRAPH_CTX_CONTROL_NV04	0x00400170
++#define NV_PGRAPH_ABS_UCLIP_XMIN	0x0040053C
++#define NV_PGRAPH_ABS_UCLIP_YMIN	0x00400540
++#define NV_PGRAPH_ABS_UCLIP_XMAX	0x00400544
++#define NV_PGRAPH_ABS_UCLIP_YMAX	0x00400548
++#define NV_PGRAPH_BETA_AND		0x00400608
++#define NV_PGRAPH_LIMIT_VIOL_PIX	0x00400610
++#define NV_PGRAPH_BOFFSET0		0x00400640
++#define NV_PGRAPH_BOFFSET1		0x00400644
++#define NV_PGRAPH_BOFFSET2		0x00400648
++#define NV_PGRAPH_BLIMIT0		0x00400684
++#define NV_PGRAPH_BLIMIT1		0x00400688
++#define NV_PGRAPH_BLIMIT2		0x0040068c
++#define NV_PGRAPH_STATUS		0x00400700
++#define NV_PGRAPH_SURFACE		0x00400710
++#define NV_PGRAPH_STATE			0x00400714
++#define NV_PGRAPH_FIFO			0x00400720
++#define NV_PGRAPH_PATTERN_SHAPE		0x00400810
++#define NV_PGRAPH_TILE			0x00400b00
++
++#define NV_PVIDEO_INTR_EN		0x00008140
++#define NV_PVIDEO_BUFFER		0x00008700
++#define NV_PVIDEO_STOP			0x00008704
++#define NV_PVIDEO_UVPLANE_BASE(buff)	(0x00008800+(buff)*4)
++#define NV_PVIDEO_UVPLANE_LIMIT(buff)	(0x00008808+(buff)*4)
++#define NV_PVIDEO_UVPLANE_OFFSET_BUFF(buff)	(0x00008820+(buff)*4)
++#define NV_PVIDEO_BASE(buff)		(0x00008900+(buff)*4)
++#define NV_PVIDEO_LIMIT(buff)		(0x00008908+(buff)*4)
++#define NV_PVIDEO_LUMINANCE(buff)	(0x00008910+(buff)*4)
++#define NV_PVIDEO_CHROMINANCE(buff)	(0x00008918+(buff)*4)
++#define NV_PVIDEO_OFFSET_BUFF(buff)	(0x00008920+(buff)*4)
++#define NV_PVIDEO_SIZE_IN(buff)		(0x00008928+(buff)*4)
++#define NV_PVIDEO_POINT_IN(buff)	(0x00008930+(buff)*4)
++#define NV_PVIDEO_DS_DX(buff)		(0x00008938+(buff)*4)
++#define NV_PVIDEO_DT_DY(buff)		(0x00008940+(buff)*4)
++#define NV_PVIDEO_POINT_OUT(buff)	(0x00008948+(buff)*4)
++#define NV_PVIDEO_SIZE_OUT(buff)	(0x00008950+(buff)*4)
++#define NV_PVIDEO_FORMAT(buff)		(0x00008958+(buff)*4)
++#	define NV_PVIDEO_FORMAT_PLANAR			(1 << 0)
++#	define NV_PVIDEO_FORMAT_COLOR_LE_CR8YB8CB8YA8	(1 << 16)
++#	define NV_PVIDEO_FORMAT_DISPLAY_COLOR_KEY	(1 << 20)
++#	define NV_PVIDEO_FORMAT_MATRIX_ITURBT709	(1 << 24)
++#define NV_PVIDEO_COLOR_KEY		0x00008B00
++
++/* NV04 overlay defines from VIDIX & Haiku */
++#define NV_PVIDEO_INTR_EN_0		0x00680140
++#define NV_PVIDEO_STEP_SIZE		0x00680200
++#define NV_PVIDEO_CONTROL_Y		0x00680204
++#define NV_PVIDEO_CONTROL_X		0x00680208
++#define NV_PVIDEO_BUFF0_START_ADDRESS	0x0068020c
++#define NV_PVIDEO_BUFF0_PITCH_LENGTH	0x00680214
++#define NV_PVIDEO_BUFF0_OFFSET		0x0068021c
++#define NV_PVIDEO_BUFF1_START_ADDRESS	0x00680210
++#define NV_PVIDEO_BUFF1_PITCH_LENGTH	0x00680218
++#define NV_PVIDEO_BUFF1_OFFSET		0x00680220
++#define NV_PVIDEO_OE_STATE		0x00680224
++#define NV_PVIDEO_SU_STATE		0x00680228
++#define NV_PVIDEO_RM_STATE		0x0068022c
++#define NV_PVIDEO_WINDOW_START		0x00680230
++#define NV_PVIDEO_WINDOW_SIZE		0x00680234
++#define NV_PVIDEO_FIFO_THRES_SIZE	0x00680238
++#define NV_PVIDEO_FIFO_BURST_LENGTH	0x0068023c
++#define NV_PVIDEO_KEY			0x00680240
++#define NV_PVIDEO_OVERLAY		0x00680244
++#define NV_PVIDEO_RED_CSC_OFFSET	0x00680280
++#define NV_PVIDEO_GREEN_CSC_OFFSET	0x00680284
++#define NV_PVIDEO_BLUE_CSC_OFFSET	0x00680288
++#define NV_PVIDEO_CSC_ADJUST		0x0068028c
++
++#endif
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
 index b940fdf..cfa6af4 100644
 --- a/include/drm/Kbuild


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1512
retrieving revision 1.1513
diff -u -r1.1512 -r1.1513
--- kernel.spec	4 Apr 2009 17:35:42 -0000	1.1512
+++ kernel.spec	5 Apr 2009 13:46:56 -0000	1.1513
@@ -1905,6 +1905,15 @@
 # and build.
 
 %changelog
+* Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: big update.  mostly cleanups, few functional changes
+    Big code cleanup (the scary looking, but hopefully harmless part)
+    Now using "full-featured" VBIOS parser from DDX
+    Remove custom i2c code in favour of i2c_algo_bit
+    Refuse to suspend, we can't possibly resume just yet
+    Fix ramht insertions when a collision happens (rh#492427)
+    No kms warning on pre-nv50 when kms not acutally enabled (rh#493222)
+
 * Sat Apr 04 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-add-qcserial.patch: Add the qcserial driver for Qualcomm modems
 



From fschwarz at fedoraproject.org  Sun Apr  5 14:51:48 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sun,  5 Apr 2009 14:51:48 +0000 (UTC)
Subject: rpms/python-zope-interface/devel python-zope-interface.spec, 1.11, 
	1.12
Message-ID: <20090405145148.A3B2B7011F@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-zope-interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2946

Modified Files:
	python-zope-interface.spec 
Log Message:
use correct source filename (upstream switched from zip to tar.gz)



Index: python-zope-interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-interface/devel/python-zope-interface.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-zope-interface.spec	5 Apr 2009 13:07:15 -0000	1.11
+++ python-zope-interface.spec	5 Apr 2009 14:51:17 -0000	1.12
@@ -2,12 +2,12 @@
 
 Name:		python-zope-interface
 Version:	3.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Zope 3 Interface Infrastructure
 Group:		Development/Libraries
 License:	ZPLv2.1
 URL:		http://pypi.python.org/pypi/zope.interface
-Source0:	http://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.zip
+Source0:	http://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz
 Source1:	ZPL-2.1.txt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
@@ -58,6 +58,9 @@
 %{python_sitearch}/zope.interface*
 
 %changelog
+* Sun Apr 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 3.5.1-2
+- use correct source filename (upstream switched from zip to tar.gz)
+
 * Sun Apr 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 3.5.1-1
 - update to 3.5.1
 



From pbrobinson at fedoraproject.org  Sun Apr  5 15:17:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  5 Apr 2009 15:17:16 +0000 (UTC)
Subject: rpms/SDL_mixer/devel SDL_mixer.spec,1.27,1.28
Message-ID: <20090405151716.7AC607011F@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/SDL_mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4988

Modified Files:
	SDL_mixer.spec 
Log Message:
 Remove dependency on timidity++-patches


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SDL_mixer.spec	23 Feb 2009 23:22:51 -0000	1.27
+++ SDL_mixer.spec	5 Apr 2009 15:16:44 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.8
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -13,18 +13,14 @@
 BuildRequires:	SDL-devel >= 1.2.10 
 BuildRequires:	libvorbis-devel
 BuildRequires:	mikmod-devel >= 3.1.10
-Requires:	timidity++-patches
 # Require libvorbis since we build it with dynamically load support.
 Requires:	libvorbis
-Provides:	SDL_mixer-midi
-
 
 %description
 A simple multi-channel audio mixer for SDL. It supports 4 channels of
 16 bit stereo audio, plus a single channel of music, mixed by the popular
 MikMod MOD, Timidity MIDI and Ogg Vorbis libraries.
 
-
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
@@ -36,16 +32,19 @@
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %prep
 %setup -q
 %patch3 -p1 -b .timidity
 
-
 %build
 %configure --disable-dependency-tracking	\
 	   --disable-static 			\
 	   --enable-music-libmikmod
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
@@ -55,17 +54,13 @@
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES COPYING
@@ -78,8 +73,10 @@
 %{_libdir}/lib*.so
 %{_includedir}/SDL
 
-
 %changelog
+* Sun Apr  5 2009 Peter Robinson <pbrobinson at gmail.com> - 1.2.8-12
+- Remove dependency on timidity++-patches
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From robert at fedoraproject.org  Sun Apr  5 16:12:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 16:12:23 +0000 (UTC)
Subject: rpms/mksh/EL-4 .cvsignore, 1.16, 1.17 mksh.spec, 1.19, 1.20 sources,
	1.16, 1.17
Message-ID: <20090405161223.F241C7011F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/EL-4

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 37b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Dec 2008 17:50:09 -0000	1.16
+++ .cvsignore	5 Apr 2009 16:11:52 -0000	1.17
@@ -1,2 +1,2 @@
-mksh-R36b.cpio.gz
+mksh-R37b.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mksh.spec	14 Dec 2008 17:50:09 -0000	1.19
+++ mksh.spec	5 Apr 2009 16:11:52 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          36b
+Version:          37b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 37b-1
+- Upgrade to 37b
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 36b-2
+- Rebuild against gcc 4.4 and rpm 4.6
+
 * Sun Dec 14 2008 Robert Scheck <robert at fedoraproject.org> 36b-1
 - Upgrade to 36b and updated arc4random.c file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Dec 2008 17:50:09 -0000	1.16
+++ sources	5 Apr 2009 16:11:52 -0000	1.17
@@ -1,2 +1,2 @@
-e5f4cfbc55b6fe8211f99d231125224d  mksh-R36b.cpio.gz
+12d8f271ad57593545476c7f0ec35d97  mksh-R37b.cpio.gz
 9479ad2e83ba6a275283ff2eaad49086  arc4random.c



From robert at fedoraproject.org  Sun Apr  5 16:12:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 16:12:23 +0000 (UTC)
Subject: rpms/mksh/F-10 .cvsignore, 1.16, 1.17 mksh.spec, 1.20, 1.21 sources,
	1.16, 1.17
Message-ID: <20090405161223.F28337013D@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/F-10

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 37b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Dec 2008 17:50:10 -0000	1.16
+++ .cvsignore	5 Apr 2009 16:11:53 -0000	1.17
@@ -1,2 +1,2 @@
-mksh-R36b.cpio.gz
+mksh-R37b.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-10/mksh.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mksh.spec	14 Dec 2008 17:50:10 -0000	1.20
+++ mksh.spec	5 Apr 2009 16:11:53 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          36b
+Version:          37b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 37b-1
+- Upgrade to 37b
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 36b-2
+- Rebuild against gcc 4.4 and rpm 4.6
+
 * Sun Dec 14 2008 Robert Scheck <robert at fedoraproject.org> 36b-1
 - Upgrade to 36b and updated arc4random.c file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Dec 2008 17:50:10 -0000	1.16
+++ sources	5 Apr 2009 16:11:53 -0000	1.17
@@ -1,2 +1,2 @@
-e5f4cfbc55b6fe8211f99d231125224d  mksh-R36b.cpio.gz
+12d8f271ad57593545476c7f0ec35d97  mksh-R37b.cpio.gz
 9479ad2e83ba6a275283ff2eaad49086  arc4random.c



From robert at fedoraproject.org  Sun Apr  5 16:12:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 16:12:23 +0000 (UTC)
Subject: rpms/mksh/EL-5 .cvsignore, 1.16, 1.17 mksh.spec, 1.19, 1.20 sources,
	1.16, 1.17
Message-ID: <20090405161223.F27407013C@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/EL-5

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 37b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Dec 2008 17:50:10 -0000	1.16
+++ .cvsignore	5 Apr 2009 16:11:53 -0000	1.17
@@ -1,2 +1,2 @@
-mksh-R36b.cpio.gz
+mksh-R37b.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mksh.spec	14 Dec 2008 17:50:10 -0000	1.19
+++ mksh.spec	5 Apr 2009 16:11:53 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          36b
+Version:          37b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 37b-1
+- Upgrade to 37b
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 36b-2
+- Rebuild against gcc 4.4 and rpm 4.6
+
 * Sun Dec 14 2008 Robert Scheck <robert at fedoraproject.org> 36b-1
 - Upgrade to 36b and updated arc4random.c file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Dec 2008 17:50:10 -0000	1.16
+++ sources	5 Apr 2009 16:11:53 -0000	1.17
@@ -1,2 +1,2 @@
-e5f4cfbc55b6fe8211f99d231125224d  mksh-R36b.cpio.gz
+12d8f271ad57593545476c7f0ec35d97  mksh-R37b.cpio.gz
 9479ad2e83ba6a275283ff2eaad49086  arc4random.c



From robert at fedoraproject.org  Sun Apr  5 16:12:24 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 16:12:24 +0000 (UTC)
Subject: rpms/mksh/F-9 .cvsignore, 1.16, 1.17 mksh.spec, 1.20, 1.21 sources, 
	1.16, 1.17
Message-ID: <20090405161224.271D27013F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/F-9

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 37b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Dec 2008 17:50:11 -0000	1.16
+++ .cvsignore	5 Apr 2009 16:11:53 -0000	1.17
@@ -1,2 +1,2 @@
-mksh-R36b.cpio.gz
+mksh-R37b.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-9/mksh.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mksh.spec	14 Dec 2008 17:50:11 -0000	1.20
+++ mksh.spec	5 Apr 2009 16:11:53 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          36b
+Version:          37b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 37b-1
+- Upgrade to 37b
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 36b-2
+- Rebuild against gcc 4.4 and rpm 4.6
+
 * Sun Dec 14 2008 Robert Scheck <robert at fedoraproject.org> 36b-1
 - Upgrade to 36b and updated arc4random.c file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Dec 2008 17:50:11 -0000	1.16
+++ sources	5 Apr 2009 16:11:53 -0000	1.17
@@ -1,2 +1,2 @@
-e5f4cfbc55b6fe8211f99d231125224d  mksh-R36b.cpio.gz
+12d8f271ad57593545476c7f0ec35d97  mksh-R37b.cpio.gz
 9479ad2e83ba6a275283ff2eaad49086  arc4random.c



From robert at fedoraproject.org  Sun Apr  5 16:12:24 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 16:12:24 +0000 (UTC)
Subject: rpms/mksh/devel .cvsignore, 1.16, 1.17 mksh.spec, 1.21, 1.22 sources,
	1.16, 1.17
Message-ID: <20090405161224.5A8597011F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/devel

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 37b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Dec 2008 17:50:12 -0000	1.16
+++ .cvsignore	5 Apr 2009 16:11:54 -0000	1.17
@@ -1,2 +1,2 @@
-mksh-R36b.cpio.gz
+mksh-R37b.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mksh.spec	23 Feb 2009 20:51:16 -0000	1.21
+++ mksh.spec	5 Apr 2009 16:11:54 -0000	1.22
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          36b
-Release:          2%{?dist}
+Version:          37b
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -71,6 +71,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 37b-1
+- Upgrade to 37b
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 36b-2
 - Rebuild against gcc 4.4 and rpm 4.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Dec 2008 17:50:12 -0000	1.16
+++ sources	5 Apr 2009 16:11:54 -0000	1.17
@@ -1,2 +1,2 @@
-e5f4cfbc55b6fe8211f99d231125224d  mksh-R36b.cpio.gz
+12d8f271ad57593545476c7f0ec35d97  mksh-R37b.cpio.gz
 9479ad2e83ba6a275283ff2eaad49086  arc4random.c



From transif at fedoraproject.org  Sun Apr  5 16:52:29 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun,  5 Apr 2009 16:52:29 +0000 (UTC)
Subject: comps/po da.po,1.14,1.15
Message-ID: <20090405165229.2A9A87013C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16883/po

Modified Files:
	da.po 
Log Message:
Sending translation for Danish


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.14 -r 1.15 da.po
Index: da.po
===================================================================
RCS file: /cvs/pkgs/comps/po/da.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- da.po	9 Jan 2009 11:52:36 -0000	1.14
+++ da.po	5 Apr 2009 16:51:57 -0000	1.15
@@ -1,696 +1,676 @@
-# translation of da.po to
-# translation of da.po to Danish
-# Danish messages for comps-po.
-# This file is distributed under the same license as the comps-po package.
-# Christian Rose <menthos at menthos.com>, 2002.
-# Keld Simonsen <keld at dkuug.dk>, 2002, 2004, 2005.
-# Keld Simonsen <keld at rap.dk>, 2006, 2007.
+# Danish translation of comps
+# Copyright (C) 2009
+# This file is distributed under the same license as the comps package.
+# Kris Thomsen <lakristho at gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: da\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2007-04-15 10:31+0200\n"
-"Last-Translator: Keld Simonsen <keld at rap.dk>\n"
-"Language-Team:  <da at li.org>\n"
+"POT-Creation-Date: 2009-02-15 13:20+0000\n"
+"PO-Revision-Date: 2009-02-15 21:42+0100\n"
+"Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
+"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "Et letv??gts skrivebordsmilj?? som virker godt p?? mindre maskiner."
+msgstr "Et letv??gtsskrivebordsmilj?? der virker godt p?? langsomme computere."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administrationsv??rkt??jer"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
-msgstr "Underst??ttelse for afrikaans"
+msgstr "Underst??ttelse af afrikaans"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#, fuzzy
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
-msgstr "Underst??ttelse for armensk"
+msgstr "Underst??ttelse af albansk"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Programmer"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
-msgstr "Programmer til at lave en r??kke opgaver"
+msgstr "Programmer til at udf??re en r??kke af opgaver"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
-msgstr "Underst??ttelse for arabisk"
+msgstr "Underst??ttelse af arabisk"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
-msgstr "Underst??ttelse for armensk"
+msgstr "Underst??ttelse af armensk"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
-msgstr "Underst??ttelse for assamesisk"
+msgstr "Underst??ttelse af assamesisk"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
-msgstr "Forfatterskab og publicering"
+msgstr "Forfatterskab og udgivning"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "Base"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
-msgstr "Basesystem"
+msgstr "Basissystem"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
-msgstr "Basal underst??ttelse for programmeringssproget Ruby."
+msgstr "Grundl??ggende underst??ttelse af programmeringssproget Ruby."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
-msgstr "Underst??ttelse for baskisk"
+msgstr "Underst??ttelse af baskisk"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
-#, fuzzy
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
-msgstr "Underst??ttelse for bulgarisk"
+msgstr "Underst??ttelse af hviderussisk"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
-msgstr "Underst??ttelse for bengali"
+msgstr "Underst??ttelse af bengalsk"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
-#, fuzzy
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
-msgstr "Underst??ttelse for kinesisk"
+msgstr "Underst??ttelse af bhutanesisk"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
-#, fuzzy
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
-msgstr "Underst??ttelse for estisk"
+msgstr "Underst??ttelse af bosnisk"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
-msgstr "Underst??ttelse for brasiliansk portugisisk"
+msgstr "Underst??ttelse af braziliansk-portugisisk"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
-msgstr "Underst??ttelse for bretonsk"
+msgstr "Underst??ttelse af bretonsk"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
-msgstr "Underst??ttelse for bulgarisk"
+msgstr "Underst??ttelse af bulgarsk"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
-msgstr "Underst??ttelse for katalansk"
+msgstr "Underst??ttelse af catalansk"
 
[...1806 lines suppressed...]
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Disse pakker giver kompatibilitetsunderst??ttelse for tidligere udgaver af "
-#~ "Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Ikke-inderst??ttede udviklingsbiblioteker"
-
-#~ msgid "Workstation Common"
-#~ msgstr "F??lles for arbejdsstation"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Underst??ttelse for ppc64-kompatibilitetsarkitektur"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Underst??ttelse for udvikling af x86-kompatibilitetsarkitektur"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Underst??ttelse for x86-kompatibilitetsarkitektur"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "Brasiliansk portugisisk"
-
-#~ msgid "English"
-#~ msgstr "Engelsk"
-
-#~ msgid "French"
-#~ msgstr "Fransk"
-
-#~ msgid "German"
-#~ msgstr "Tysk"
-
-#~ msgid "Italian"
-#~ msgstr "Italiensk"
-
-#~ msgid "Spanish"
-#~ msgstr "Spansk"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentationen for Red Hat Enterprise Linux p?? "
-#~ "det brasilianskportugisiske sprog."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "engelsk."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "fransk."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "tysk."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "italiensk."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "spansk."
-
-#~ msgid "Japanese"
-#~ msgstr "Japansk"
-
-#~ msgid "Korean"
-#~ msgstr "Koreansk"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "Forenklet kinesisk"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "japansk."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "koreansk."
-
-# Egentligen ikke korrekt, det er forskellige skrivs??tt bara
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "forenklet kinesisk."
-
-# Egentligen ikke korrekt, det er forskellige skrivs??tt bara
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "traditionelt kinesisk."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "Traditionelt kinesisk"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Underst??ttelse for udvikling af ppc64-kompatibilitetsarkitektur"
-
-#~ msgid "Bengali"
-#~ msgstr "Bengali"
-
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
-
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
-
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Dokumentation for Red Hat Enterprise Linux 4"
-
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "bengalsk."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "gujarati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "hindi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "punjabi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Denne gruppe indeholder dokumentation for Red Hat Enterprise Linux p?? "
-#~ "tamilsk."
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux godbidder"
-
-#~ msgid "Workstation"
-#~ msgstr "Arbejdsstation"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Programmer for arbejdsstation"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Kompatibilitetsarkitektur"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Biblioteker for kompatibilitetsarkitektur"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib-bibliotekspakker"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "Pakker som giver funktionalitet for kompatibilitetsarkitekturen"
+"Denne gruppe er en samling af v??rkt??jer og ressourcer til tjekkiske milj??er."



From lennart at fedoraproject.org  Sun Apr  5 17:02:20 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sun,  5 Apr 2009 17:02:20 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.6, 1.7 libatasmart.spec, 1.7, 
	1.8 sources, 1.6, 1.7
Message-ID: <20090405170220.527827011F@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18429

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Apr 2009 17:55:57 -0000	1.6
+++ .cvsignore	5 Apr 2009 17:01:49 -0000	1.7
@@ -1 +1 @@
-libatasmart-0.5.tar.gz
+libatasmart-0.6.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libatasmart.spec	3 Apr 2009 17:54:09 -0000	1.7
+++ libatasmart.spec	5 Apr 2009 17:01:49 -0000	1.8
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -53,6 +53,9 @@
 %{_libdir}/pkgconfig/libatasmart.pc
 
 %changelog
+* Sat Apr 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.6-1
+- New upstream release
+
 * Fri Apr 3 2009 Lennart Poettering <lpoetter at redhat.com> 0.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Apr 2009 17:55:57 -0000	1.6
+++ sources	5 Apr 2009 17:01:49 -0000	1.7
@@ -1 +1 @@
-f8d3beac2161e18c08e4df274c149cc3  libatasmart-0.5.tar.gz
+e96d58a2097c398293c9b10b4c4c2777  libatasmart-0.6.tar.gz



From rdieter at fedoraproject.org  Sun Apr  5 17:02:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  5 Apr 2009 17:02:48 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.232,1.233
Message-ID: <20090405170248.DB5997011F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18461

Modified Files:
	comps-f10.xml.in 
Log Message:
-qgtkstyle (obsoleted by qt45)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- comps-f10.xml.in	24 Mar 2009 16:45:40 -0000	1.232
+++ comps-f10.xml.in	5 Apr 2009 17:02:17 -0000	1.233
@@ -2973,7 +2973,6 @@
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
-      <packagereq type="default">qgtkstyle</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">zenity</packagereq>
       <packagereq type="optional">apollon</packagereq>



From rdieter at fedoraproject.org  Sun Apr  5 17:07:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  5 Apr 2009 17:07:46 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.233,1.234 comps-f11.xml.in,1.171,1.172
Message-ID: <20090405170746.4B4617011F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19246

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
drop EOL'd kickpim



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- comps-f10.xml.in	5 Apr 2009 17:02:17 -0000	1.233
+++ comps-f10.xml.in	5 Apr 2009 17:07:15 -0000	1.234
@@ -2994,7 +2994,6 @@
       <packagereq type="optional">kdissert</packagereq>
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kgrab</packagereq>
-      <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- comps-f11.xml.in	25 Mar 2009 20:16:45 -0000	1.171
+++ comps-f11.xml.in	5 Apr 2009 17:07:15 -0000	1.172
@@ -3227,7 +3227,6 @@
       <packagereq type="optional">kdissert</packagereq>
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kgrab</packagereq>
-      <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>



From rdieter at fedoraproject.org  Sun Apr  5 17:11:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  5 Apr 2009 17:11:45 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.172,1.173
Message-ID: <20090405171145.D33417011F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19603

Modified Files:
	comps-f11.xml.in 
Log Message:
kdeartwork changes -> -screensavers default (rest optional)



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- comps-f11.xml.in	5 Apr 2009 17:07:15 -0000	1.172
+++ comps-f11.xml.in	5 Apr 2009 17:11:15 -0000	1.173
@@ -3186,7 +3186,7 @@
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
-      <packagereq type="default">kdeartwork</packagereq>
+      <packagereq type="default">kdeartwork-screensavers</packagereq>
       <packagereq type="default">kdebase</packagereq>
       <packagereq type="default">kdebluetooth</packagereq>
       <packagereq type="default">kdegames</packagereq>
@@ -3221,7 +3221,10 @@
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
-      <packagereq type="optional">kdeartwork-extras</packagereq>
+      <packagereq type="optional">kdeclassic-icon-theme</packagereq>
+      <packagereq type="optional">kdeartwork</packagereq>
+      <packagereq type="optional">kdeartwork-sounds</packagereq>
+      <packagereq type="optional">kdeartwork-wallpapers</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>



From dodji at fedoraproject.org  Sun Apr  5 18:16:17 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sun,  5 Apr 2009 18:16:17 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore,1.15,1.16 nemiver.spec,1.23,1.24
Message-ID: <20090405181617.204C77011F@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27940

Modified Files:
	.cvsignore nemiver.spec 
Log Message:
Update project homepage URL.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Mar 2009 12:29:17 -0000	1.15
+++ .cvsignore	5 Apr 2009 18:15:45 -0000	1.16
@@ -1 +1 @@
-nemiver-0.6.5.tar.bz2
+nemiver-0.6.6.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nemiver.spec	3 Apr 2009 20:01:01 -0000	1.23
+++ nemiver.spec	5 Apr 2009 18:15:45 -0000	1.24
@@ -5,7 +5,7 @@
 
 Group:		Development/Debuggers
 License:	GPLv2+
-URL:		http://home.gna.org/nemiver/
+URL:		http://projects.gnome.org/nemiver
 
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
 



From sharkcz at fedoraproject.org  Sun Apr  5 18:22:37 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  5 Apr 2009 18:22:37 +0000 (UTC)
Subject: rpms/ht/devel .cvsignore,1.3,1.4 ht.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090405182237.822E67011F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/ht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28595

Modified Files:
	.cvsignore ht.spec sources 
Log Message:
* Sun Apr  5 2009 Dan Hor??k <dan[AT]danny.cz>
- 2.0.16-1
- version update
- added patch for building with gcc 4.4
- remove executable permissions on source files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ht/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Nov 2008 09:40:09 -0000	1.3
+++ .cvsignore	5 Apr 2009 18:22:06 -0000	1.4
@@ -1 +1 @@
-ht-2.0.15.tar.bz2
+ht-2.0.16.tar.bz2


Index: ht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ht/devel/ht.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ht.spec	25 Feb 2009 04:03:22 -0000	1.3
+++ ht.spec	5 Apr 2009 18:22:06 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           ht
-Version:        2.0.15
-Release:        2%{?dist}
+Version:        2.0.16
+Release:        1%{?dist}
 Summary:        File editor/viewer/analyzer for executables
 
 Group:          Applications/Editors
 License:        GPLv2
 URL:            http://hte.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/hte/ht-%{version}.tar.bz2
+# https://sourceforge.net/tracker/?func=detail&aid=2734944&group_id=1066&atid=301066
+Patch0:         %{name}-2.0.16-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libX11-devel ncurses-devel lzo-devel
@@ -20,8 +22,9 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc44
 recode latin1..utf8 TODO
-chmod 644 endianess.cc
+find . -name \*.cc -o -name \*.h | xargs chmod 0644
 
 %build
 %configure --enable-maintainermode
@@ -40,6 +43,12 @@
 %{_bindir}/ht
 
 %changelog
+* Sun Apr  5 2009 Dan Hor??k <dan[AT]danny.cz>
+- 2.0.16-1
+- version update
+- added patch for building with gcc 4.4
+- remove executable permissions on source files
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ht/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Nov 2008 09:40:10 -0000	1.3
+++ sources	5 Apr 2009 18:22:07 -0000	1.4
@@ -1 +1 @@
-662b350013ae1b48c3d3ed50ea6f8e24  ht-2.0.15.tar.bz2
+fce7c4bdea287846740d358e1b747f3a  ht-2.0.16.tar.bz2



From glommer at fedoraproject.org  Sun Apr  5 18:23:50 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Sun,  5 Apr 2009 18:23:50 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-qcow2-2TB.patch, NONE, 1.1 qemu.spec, 1.75,
	1.76
Message-ID: <20090405182350.908787011F@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28751

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-qcow2-2TB.patch 
Log Message:
Fixed qcow2 segfault creating disks over 2TB. #491943



qemu-fix-qcow2-2TB.patch:

--- NEW FILE qemu-fix-qcow2-2TB.patch ---
>From 2d2431f03fc78b532f3a1c5f858cf78859d50fc3 Mon Sep 17 00:00:00 2001
From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 5 Apr 2009 17:40:58 +0000
Subject: [PATCH] qcow2: fix image creation for large, > ~2TB, images (Chris Wright)

When creating large disk images w/ qcow2 format, qcow2_create is hard
coded to creating a single refcount block.  This is insufficient for
large images, and will cause qemu-img to segfault as it walks off the
end of the refcount block.  Keep track of the space needed during image
create and create proper number of refcount blocks accordingly.

https://bugzilla.redhat.com/show_bug.cgi?id=491943

Signed-off-by: Chris Wright <chrisw at redhat.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 6982 c046a42c-6fe2-441c-8c8c-71466251a162
---
 block-qcow2.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

Index: qemu-kvm-0.10/qemu/block-qcow2.c
===================================================================
--- qemu-kvm-0.10.orig/qemu/block-qcow2.c
+++ qemu-kvm-0.10/qemu/block-qcow2.c
@@ -1458,6 +1458,7 @@ static int qcow_create(const char *filen
                       const char *backing_file, int flags)
 {
     int fd, header_size, backing_filename_len, l1_size, i, shift, l2_bits;
+    int ref_clusters = 0;
     QCowHeader header;
     uint64_t tmp, offset;
     QCowCreateState s1, *s = &s1;
@@ -1498,22 +1499,28 @@ static int qcow_create(const char *filen
     offset += align_offset(l1_size * sizeof(uint64_t), s->cluster_size);
 
     s->refcount_table = qemu_mallocz(s->cluster_size);
-    s->refcount_block = qemu_mallocz(s->cluster_size);
 
     s->refcount_table_offset = offset;
     header.refcount_table_offset = cpu_to_be64(offset);
     header.refcount_table_clusters = cpu_to_be32(1);
     offset += s->cluster_size;
-
-    s->refcount_table[0] = cpu_to_be64(offset);
     s->refcount_block_offset = offset;
-    offset += s->cluster_size;
+
+    /* count how many refcount blocks needed */
+    tmp = offset >> s->cluster_bits;
+    ref_clusters = (tmp >> (s->cluster_bits - REFCOUNT_SHIFT)) + 1;
+    for (i=0; i < ref_clusters; i++) {
+        s->refcount_table[i] = cpu_to_be64(offset);
+        offset += s->cluster_size;
+    }
+
+    s->refcount_block = qemu_mallocz(ref_clusters * s->cluster_size);
 
     /* update refcounts */
     create_refcount_update(s, 0, header_size);
     create_refcount_update(s, s->l1_table_offset, l1_size * sizeof(uint64_t));
     create_refcount_update(s, s->refcount_table_offset, s->cluster_size);
-    create_refcount_update(s, s->refcount_block_offset, s->cluster_size);
+    create_refcount_update(s, s->refcount_block_offset, ref_clusters * s->cluster_size);
 
     /* write all the data */
     write(fd, &header, sizeof(header));
@@ -1529,7 +1536,7 @@ static int qcow_create(const char *filen
     write(fd, s->refcount_table, s->cluster_size);
 
     lseek(fd, s->refcount_block_offset, SEEK_SET);
-    write(fd, s->refcount_block, s->cluster_size);
+    write(fd, s->refcount_block, ref_clusters * s->cluster_size);
 
     qemu_free(s->refcount_table);
     qemu_free(s->refcount_block);


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- qemu.spec	3 Apr 2009 17:09:43 -0000	1.75
+++ qemu.spec	5 Apr 2009 18:23:20 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -36,6 +36,7 @@
 Patch12: qemu-roms-more-room.patch
 Patch13: qemu-bios-bigger-roms.patch
 Patch14: qemu-fix-display-breakage.patch
+Patch15: qemu-fix-qcow2-2TB.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -214,6 +215,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -455,6 +457,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Apr  5 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-6
+- Fixed qcow2 segfault creating disks over 2TB. #491943
+
 * Fri Apr  3 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-5
 - Fix vga segfault under kvm-autotest (#494002)
 - Kill kernelrelease hack; it's not needed



From sharkcz at fedoraproject.org  Sun Apr  5 18:26:45 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  5 Apr 2009 18:26:45 +0000 (UTC)
Subject: rpms/ht/devel ht-2.0.16-gcc44.patch,NONE,1.1
Message-ID: <20090405182645.5883E7011F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/ht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30002

Added Files:
	ht-2.0.16-gcc44.patch 
Log Message:
add missing file

ht-2.0.16-gcc44.patch:

--- NEW FILE ht-2.0.16-gcc44.patch ---
diff -Nrup ht-2.0.16.orig/htapp.cc ht-2.0.16/htapp.cc
--- ht-2.0.16.orig/htapp.cc	2008-05-19 00:11:22.000000000 +0200
+++ ht-2.0.16/htapp.cc	2009-04-05 19:10:20.000000000 +0200
@@ -2962,7 +2962,7 @@ void ht_app::project_opencreate(const ch
 		LOG("%s: invalid filename", filename);
 		return;
 	}
-	char *suf = sys_filename_suffix(fn);
+	const char *suf = sys_filename_suffix(fn);
 	/* append HT project file suffix if not already there */
 	if (!(suf && (strcmp(suf, HT_PROJECT_CONFIG_SUFFIX+1)==0))) {
 		strcat(fn, HT_PROJECT_CONFIG_SUFFIX);
diff -Nrup ht-2.0.16.orig/htformat.cc ht-2.0.16/htformat.cc
--- ht-2.0.16.orig/htformat.cc	2008-07-10 01:09:36.000000000 +0200
+++ ht-2.0.16/htformat.cc	2009-04-05 19:14:08.000000000 +0200
@@ -3916,7 +3916,7 @@ void ht_uformat_viewer::update_misc_info
 void ht_uformat_viewer::update_visual_info()
 {
 	cursorline_get();
-	char *s, *t = cursor_line;
+	const char *s, *t = cursor_line;
 	int v = 0, vl = 0;
 	int i = 0, g = 0;
 	while ((s=tag_findnext(t))) {
diff -Nrup ht-2.0.16.orig/htreg.cc ht-2.0.16/htreg.cc
--- ht-2.0.16.orig/htreg.cc	2007-05-09 00:50:24.000000000 +0200
+++ ht-2.0.16/htreg.cc	2009-04-05 19:11:13.000000000 +0200
@@ -781,7 +781,7 @@ bool ht_registry::find_data_entry(const 
 ht_registry_node *ht_registry::find_entry_i(Container **rdir, const char *key, bool follow_symlinks)
 {
 	ht_registry_node *dir = root;
-	char *s;
+	const char *s;
 	char t[256]; /* FIXME: possible buffer overflow */
 	if (key[0]=='/') key++;
 	while (1) {
diff -Nrup ht-2.0.16.orig/httag.cc ht-2.0.16/httag.cc
--- ht-2.0.16.orig/httag.cc	2008-03-26 12:51:36.000000000 +0100
+++ ht-2.0.16/httag.cc	2009-04-05 19:12:33.000000000 +0200
@@ -537,7 +537,7 @@ void statictag_to_tag(const char *static
 	*tag_str = 0;
 }
 
-TAGSTRING *tag_findnext(const TAGSTRING *tagstring)
+const TAGSTRING *tag_findnext(const TAGSTRING *tagstring)
 {
 	return strchr(tagstring, '\e');
 }
diff -Nrup ht-2.0.16.orig/httag.h ht-2.0.16/httag.h
--- ht-2.0.16.orig/httag.h	2007-05-09 01:30:13.000000000 +0200
+++ ht-2.0.16/httag.h	2009-04-05 19:12:48.000000000 +0200
@@ -447,7 +447,7 @@ typedef char TAGSTRING;
 
 void statictag_to_tag(const char *statictag_str, TAGSTRING *tag_str, int maxlen, uint64 relocation, bool std_bigendian);
 
-TAGSTRING *tag_findnext(const TAGSTRING *tagstring);
+const TAGSTRING *tag_findnext(const TAGSTRING *tagstring);
 
 vcp tag_get_color(const TAGSTRING *tagstring);
 void tag_get_id(const TAGSTRING *tagstring, uint32 *id128_1, uint32 *id128_2, uint32 *id128_3, uint32 *id128_4);
diff -Nrup ht-2.0.16.orig/httext.cc ht-2.0.16/httext.cc
--- ht-2.0.16.orig/httext.cc	2007-05-09 00:50:24.000000000 +0200
+++ ht-2.0.16/httext.cc	2009-04-05 19:15:03.000000000 +0200
@@ -103,6 +103,7 @@ void ht_text_viewer2::handlemsg(htmsg *m
  */
 
 /* FIXME: put it somewhere else..., why ain't this a POSIX function ? */
+#if 0
 void *memrchr(const void *string, int ch, size_t num)
 {
 	while (num--) {
@@ -110,6 +111,7 @@ void *memrchr(const void *string, int ch
 	}
 	return NULL;
 }
+#endif
  
 
 #define TEXT_SUB_READSIZE		256
diff -Nrup ht-2.0.16.orig/info/infoview.cc ht-2.0.16/info/infoview.cc
--- ht-2.0.16.orig/info/infoview.cc	2007-12-04 21:27:15.000000000 +0100
+++ ht-2.0.16/info/infoview.cc	2009-04-05 19:07:09.000000000 +0200
@@ -193,7 +193,7 @@ Container *parse_info_node(File *fl, con
 		} else {
 fallback:
 			if (k && k > n) {
-				char *cr = strchr(n, '\n');
+				const char *cr = strchr(n, '\n');
 				if (cr && cr < k) k = cr;
 				if (k-n == 0) goto fallback2;
 				fl->write(n, k-n);
@@ -423,11 +423,11 @@ int ht_info_viewer::find_node(const char
 	const char *tags[] = {"File", "Node", "Prev", "Next", "Up"};
 #define NUM_NODE_TAGS (sizeof (tags) / sizeof (tags[0]))
 	const char *s = infotext;
-	char *firstnode = NULL;
+	const char *firstnode = NULL;
 	while ((s=strchr(s, 0x1f))) {
 		s++;
 		while ((*s>0) && (*s<32)) s++;
-		char *cr = strchr(s, '\n');
+		const char *cr = strchr(s, '\n');
 		if (cr) {
 			while (*s && (s<cr)) {
 				whitespaces(s);
@@ -437,7 +437,7 @@ int ht_info_viewer::find_node(const char
 					if (ht_strncmp(s, tags[i], l) == 0 && s[l] == ':') {
 						s += l+1;
 						whitespaces(s);
-						char *e = strchr(s, ',');
+						const char *e = strchr(s, ',');
 						if (!e || (e>cr)) e = cr;
 						if (!firstnode && (strcmp(tags[i], "Node") == 0)) {
 							firstnode = cr+1;
diff -Nrup ht-2.0.16.orig/io/file.cc ht-2.0.16/io/file.cc
--- ht-2.0.16.orig/io/file.cc	2008-03-05 16:52:27.000000000 +0100
+++ ht-2.0.16/io/file.cc	2009-04-05 19:09:21.000000000 +0200
@@ -210,9 +210,9 @@ static char *_env_replace(char *str, uns
 int sys_basename(char *result, const char *filename)
 {
 	// FIXME: use is_path_delim
-	char *slash1 = strrchr(filename, '/');
-	char *slash2 = strrchr(filename, '\\');
-	char *slash = (slash1 > slash2) ? slash1 : slash2;
+	const char *slash1 = strrchr(filename, '/');
+	const char *slash2 = strrchr(filename, '\\');
+	const char *slash = (slash1 > slash2) ? slash1 : slash2;
 	if (slash) {
 		int l = strlen(filename);
 		ht_strlcpy(result, slash+1, l-(slash-filename)+1);
@@ -395,14 +395,14 @@ int sys_common_canonicalize(char *result
 	return (k == 0) ? 0 : EINVAL;
 }
 
-char *sys_filename_suffix(const char *fn)
+const char *sys_filename_suffix(const char *fn)
 {
 	const char *s = NULL;
 	while (fn && *fn) {
 		if (sys_is_path_delim(*fn)) s = fn+1;
 		fn++;
 	}
-	char *p = s ? strrchr(s, '.') : NULL;
+	const char *p = s ? strrchr(s, '.') : NULL;
 	return p ? p+1 : NULL;
 }
 
diff -Nrup ht-2.0.16.orig/io/file.h ht-2.0.16/io/file.h
--- ht-2.0.16.orig/io/file.h	2007-12-04 21:27:15.000000000 +0100
+++ ht-2.0.16/io/file.h	2009-04-05 19:09:05.000000000 +0200
@@ -154,7 +154,7 @@ char *		sys_dirname(char *path);
 char * 		sys_get_home_dir();
 int		sys_relname(char *result, const char *filename, const char *cwd);
 int		sys_common_canonicalize(char *result, const char *in_name, const char *cwd, is_path_delim delim);
-char *		sys_filename_suffix(const char *fn);
+const char *	sys_filename_suffix(const char *fn);
 int		sys_tmpfile_fd();
 
 /* system-dependant (implementation in $MYSYSTEM/ *.cc) */



From mbooth at fedoraproject.org  Sun Apr  5 19:05:35 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sun,  5 Apr 2009 19:05:35 +0000 (UTC)
Subject: rpms/eclipse-phpeclipse/devel
	eclipse-phpeclipse-fix-phpmanual-view.patch, NONE,
	1.1 eclipse-phpeclipse-httpd-integration.patch, 1.6,
	1.7 eclipse-phpeclipse.spec, 1.11, 1.12 get-phpeclipse.sh, 1.2,
	1.3 sources, 1.4, 1.5 eclipse-phpeclipse-no-htmlparser.patch,
	1.2, NONE
Message-ID: <20090405190535.73D887011F@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/devel

Modified Files:
	eclipse-phpeclipse-httpd-integration.patch 
	eclipse-phpeclipse.spec get-phpeclipse.sh sources 
Added Files:
	eclipse-phpeclipse-fix-phpmanual-view.patch 
Removed Files:
	eclipse-phpeclipse-no-htmlparser.patch 
Log Message:
* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk>
- Drop GCJ AOT support.
- Add htmlparser dependency and drop htmlparser patch.
- Add patch to fix PartInitException and IllegalArgumentException in
  PHP Manual view.



eclipse-phpeclipse-fix-phpmanual-view.patch:

--- NEW FILE eclipse-phpeclipse-fix-phpmanual-view.patch ---
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(working copy)
@@ -181,7 +181,8 @@
 				Display.getDefault().asyncExec(new Runnable() {
 					public void run() {
 						String html = getHtmlSource(funcName);
-						browser.setText(html);
+						if (html != null)
+							browser.setText(html);
 					}
 				});
 			}
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml	(revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml	(working copy)
@@ -13,16 +13,16 @@
             icon="icons/phpmanual.png"
             category="net.sourceforge.phpeclipse.views.category"
             class="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView"
-            id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualViewz">
+            id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
       </view>
    </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
       <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
+            targetID="net.sourceforge.phpeclipse.PHPPerspective">
          <view
                ratio="0.5"
-               relative="org.eclipse.ui.views.TaskList"
+               relative="net.sourceforge.phpeclipse.webbrowser.views"
                relationship="right"
                id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
          </view>

eclipse-phpeclipse-httpd-integration.patch:

Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-phpeclipse-httpd-integration.patch	15 Nov 2008 02:23:30 -0000	1.6
+++ eclipse-phpeclipse-httpd-integration.patch	5 Apr 2009 19:05:35 -0000	1.7
@@ -307,10 +307,10 @@
 +               prefs/default_win32.properties
 +src.excludes = prefs/default_macosx.properties,\
 +               prefs/default_win32.properties
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml
+Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml
 ===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
+--- /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1643)
++++ /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
 @@ -192,11 +192,6 @@
  	  </page>
  	  <page
@@ -323,7 +323,18 @@
  			class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
  			id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
  			name="MySQL"/>
-@@ -268,24 +263,6 @@
+@@ -213,10 +208,6 @@
+ 			targetID="net.sourceforge.phpeclipse.PHPPerspective">
+ 		 <actionSet id="net.sourceforge.phpeclipse.PHPActionSet"/>
+ 	  </perspectiveExtension>
+-	  <perspectiveExtension
+-		   targetID="net.sourceforge.phpeclipse.PHPPerspective">
+-			  <actionSet id="net.sf.eclipsetidy.ActionSet"/>
+-		  </perspectiveExtension>
+    </extension>
+ 
+    <extension
+@@ -268,24 +259,6 @@
  			   toolbarPath="Normal"
  			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
  		 </action>


Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-phpeclipse.spec	24 Feb 2009 13:50:34 -0000	1.11
+++ eclipse-phpeclipse.spec	5 Apr 2009 19:05:35 -0000	1.12
@@ -1,9 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
-%define gcj_support      1
+%define eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-phpeclipse
 Version:   1.2.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -18,27 +18,23 @@
 Patch0:    %{name}-broken-help-links.patch
 Patch1:    %{name}-fix-build-props.patch
 Patch2:    %{name}-httpd-integration.patch
-Patch3:    %{name}-no-htmlparser.patch
 Patch4:    %{name}-rm-win32-help.patch
 Patch5:    %{name}-external-parser.patch
 Patch6:    %{name}-external-preview.patch
+Patch7:    %{name}-fix-phpmanual-view.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildArch:        noarch
-%endif
+
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 3.4
+BuildRequires:    htmlparser
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 3.4
+Requires:         htmlparser
 Requires:         php >= 5
 Requires:         php-pecl-xdebug
 Requires:         httpd
@@ -55,21 +51,19 @@
 %patch0 -p4
 %patch1 -p4
 %patch2 -p4
-%patch3 -p4
 %patch4 -p4
 %patch5 -p4
 %patch6 -p4
+%patch7 -p4
 
 # ditch bundled libs in favor of building against fedora packaged libs
-#rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
-#build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis
-
-#grep -lR sax2 * | xargs sed --in-place "s/sax2/xml-commons-apis/"
+rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
+build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser htmlparser
 
 # fix jar versions
 find -name MANIFEST.MF | xargs sed --in-place "s/0.0.0/%{version}/"
@@ -96,47 +90,35 @@
 
 %install
 rm -rf %{buildroot}
-installDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse
-debugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-debug
-xdebugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-xdebug
-install -d -m 755 $installDir
-install -d -m 755 $debugInstallDir
-install -d -m 755 $xdebugInstallDir
-unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
-unzip -q -d $debugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
-unzip -q -d $xdebugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
+install -d -m 755 %{buildroot}%{eclipse_dropin}
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse        build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse-debug  build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse-xdebug build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-#pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-#rm *.jar
-#build-jar-repository -s -p . xml-commons-apis
-#popd
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+pushd %{buildroot}%{eclipse_dropin}/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+rm *.jar
+build-jar-repository -s -p . htmlparser
+popd
 
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 %doc net.sourceforge.phpeclipse.feature/cpl-v10.html
-%{_datadir}/eclipse/dropins/phpeclipse
-%{_datadir}/eclipse/dropins/phpeclipse-debug
-%{_datadir}/eclipse/dropins/phpeclipse-xdebug
-
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{eclipse_dropin}/phpeclipse
+%{eclipse_dropin}/phpeclipse-debug
+%{eclipse_dropin}/phpeclipse-xdebug
 
 %changelog
+* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.2.1-4
+- Drop GCJ AOT support.
+- Add htmlparser dependency and drop htmlparser patch.
+- Add patch to fix PartInitException and IllegalArgumentException in
+  PHP Manual view.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: get-phpeclipse.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/get-phpeclipse.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-phpeclipse.sh	15 Nov 2008 02:23:30 -0000	1.2
+++ get-phpeclipse.sh	5 Apr 2009 19:05:35 -0000	1.3
@@ -18,6 +18,7 @@
 		net.sourceforge.phpeclipse.launching \
 		net.sourceforge.phpeclipse.phphelp \
 		net.sourceforge.phpeclipse.phpmanual \
+		net.sourceforge.phpeclipse.phpmanual.htmlparser \
 		net.sourceforge.phpeclipse.smarty.ui \
 		net.sourceforge.phpeclipse.ui \
 		net.sourceforge.phpeclipse.webbrowser \


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Nov 2008 02:23:30 -0000	1.4
+++ sources	5 Apr 2009 19:05:35 -0000	1.5
@@ -1 +1 @@
-a0ccdfd8056caa958bff85f7e7b1adc9  phpeclipse-1.2.1.tar.gz
+8ac385ed7418b7cf61cacc7f630adf36  phpeclipse-1.2.1.tar.gz


--- eclipse-phpeclipse-no-htmlparser.patch DELETED ---



From mbooth at fedoraproject.org  Sun Apr  5 19:06:05 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sun,  5 Apr 2009 19:06:05 +0000 (UTC)
Subject: rpms/eclipse-phpeclipse/F-10
	eclipse-phpeclipse-fix-phpmanual-view.patch, NONE,
	1.1 eclipse-phpeclipse-httpd-integration.patch, 1.6,
	1.7 eclipse-phpeclipse.spec, 1.10, 1.11 get-phpeclipse.sh, 1.2,
	1.3 sources, 1.4, 1.5 eclipse-phpeclipse-no-htmlparser.patch,
	1.2, NONE
Message-ID: <20090405190605.15F527011F@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/F-10

Modified Files:
	eclipse-phpeclipse-httpd-integration.patch 
	eclipse-phpeclipse.spec get-phpeclipse.sh sources 
Added Files:
	eclipse-phpeclipse-fix-phpmanual-view.patch 
Removed Files:
	eclipse-phpeclipse-no-htmlparser.patch 
Log Message:
* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk>
- Drop GCJ AOT support.
- Add htmlparser dependency and drop htmlparser patch.
- Add patch to fix PartInitException and IllegalArgumentException in
  PHP Manual view.



eclipse-phpeclipse-fix-phpmanual-view.patch:

--- NEW FILE eclipse-phpeclipse-fix-phpmanual-view.patch ---
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(working copy)
@@ -181,7 +181,8 @@
 				Display.getDefault().asyncExec(new Runnable() {
 					public void run() {
 						String html = getHtmlSource(funcName);
-						browser.setText(html);
+						if (html != null)
+							browser.setText(html);
 					}
 				});
 			}
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml	(revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml	(working copy)
@@ -13,16 +13,16 @@
             icon="icons/phpmanual.png"
             category="net.sourceforge.phpeclipse.views.category"
             class="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView"
-            id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualViewz">
+            id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
       </view>
    </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
       <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
+            targetID="net.sourceforge.phpeclipse.PHPPerspective">
          <view
                ratio="0.5"
-               relative="org.eclipse.ui.views.TaskList"
+               relative="net.sourceforge.phpeclipse.webbrowser.views"
                relationship="right"
                id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
          </view>

eclipse-phpeclipse-httpd-integration.patch:

Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-10/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-phpeclipse-httpd-integration.patch	15 Nov 2008 02:23:29 -0000	1.6
+++ eclipse-phpeclipse-httpd-integration.patch	5 Apr 2009 19:05:34 -0000	1.7
@@ -307,10 +307,10 @@
 +               prefs/default_win32.properties
 +src.excludes = prefs/default_macosx.properties,\
 +               prefs/default_win32.properties
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml
+Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml
 ===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
+--- /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1643)
++++ /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
 @@ -192,11 +192,6 @@
  	  </page>
  	  <page
@@ -323,7 +323,18 @@
  			class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
  			id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
  			name="MySQL"/>
-@@ -268,24 +263,6 @@
+@@ -213,10 +208,6 @@
+ 			targetID="net.sourceforge.phpeclipse.PHPPerspective">
+ 		 <actionSet id="net.sourceforge.phpeclipse.PHPActionSet"/>
+ 	  </perspectiveExtension>
+-	  <perspectiveExtension
+-		   targetID="net.sourceforge.phpeclipse.PHPPerspective">
+-			  <actionSet id="net.sf.eclipsetidy.ActionSet"/>
+-		  </perspectiveExtension>
+    </extension>
+ 
+    <extension
+@@ -268,24 +259,6 @@
  			   toolbarPath="Normal"
  			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
  		 </action>


Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-10/eclipse-phpeclipse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-phpeclipse.spec	16 Nov 2008 21:55:15 -0000	1.10
+++ eclipse-phpeclipse.spec	5 Apr 2009 19:05:34 -0000	1.11
@@ -1,9 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
-%define gcj_support      1
+%define eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-phpeclipse
 Version:   1.2.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -18,27 +18,23 @@
 Patch0:    %{name}-broken-help-links.patch
 Patch1:    %{name}-fix-build-props.patch
 Patch2:    %{name}-httpd-integration.patch
-Patch3:    %{name}-no-htmlparser.patch
 Patch4:    %{name}-rm-win32-help.patch
 Patch5:    %{name}-external-parser.patch
 Patch6:    %{name}-external-preview.patch
+Patch7:    %{name}-fix-phpmanual-view.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildArch:        noarch
-%endif
+
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 3.4
+BuildRequires:    htmlparser
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 3.4
+Requires:         htmlparser
 Requires:         php >= 5
 Requires:         php-pecl-xdebug
 Requires:         httpd
@@ -55,21 +51,19 @@
 %patch0 -p4
 %patch1 -p4
 %patch2 -p4
-%patch3 -p4
 %patch4 -p4
 %patch5 -p4
 %patch6 -p4
+%patch7 -p4
 
 # ditch bundled libs in favor of building against fedora packaged libs
-#rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
-#build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis
-
-#grep -lR sax2 * | xargs sed --in-place "s/sax2/xml-commons-apis/"
+rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
+build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser htmlparser
 
 # fix jar versions
 find -name MANIFEST.MF | xargs sed --in-place "s/0.0.0/%{version}/"
@@ -96,47 +90,35 @@
 
 %install
 rm -rf %{buildroot}
-installDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse
-debugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-debug
-xdebugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-xdebug
-install -d -m 755 $installDir
-install -d -m 755 $debugInstallDir
-install -d -m 755 $xdebugInstallDir
-unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
-unzip -q -d $debugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
-unzip -q -d $xdebugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
+install -d -m 755 %{buildroot}%{eclipse_dropin}
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse        build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse-debug  build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse-xdebug build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-#pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-#rm *.jar
-#build-jar-repository -s -p . xml-commons-apis
-#popd
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+pushd %{buildroot}%{eclipse_dropin}/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+rm *.jar
+build-jar-repository -s -p . htmlparser
+popd
 
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 %doc net.sourceforge.phpeclipse.feature/cpl-v10.html
-%{_datadir}/eclipse/dropins/phpeclipse
-%{_datadir}/eclipse/dropins/phpeclipse-debug
-%{_datadir}/eclipse/dropins/phpeclipse-xdebug
-
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{eclipse_dropin}/phpeclipse
+%{eclipse_dropin}/phpeclipse-debug
+%{eclipse_dropin}/phpeclipse-xdebug
 
 %changelog
+* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.2.1-3
+- Drop GCJ AOT support.
+- Add htmlparser dependency and drop htmlparser patch.
+- Add patch to fix PartInitException and IllegalArgumentException in
+  PHP Manual view.
+
 * Sun Nov 16 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.1-2
 - Add php-pecl-xdebug dependency.
 


Index: get-phpeclipse.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-10/get-phpeclipse.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-phpeclipse.sh	15 Nov 2008 02:23:29 -0000	1.2
+++ get-phpeclipse.sh	5 Apr 2009 19:05:34 -0000	1.3
@@ -18,6 +18,7 @@
 		net.sourceforge.phpeclipse.launching \
 		net.sourceforge.phpeclipse.phphelp \
 		net.sourceforge.phpeclipse.phpmanual \
+		net.sourceforge.phpeclipse.phpmanual.htmlparser \
 		net.sourceforge.phpeclipse.smarty.ui \
 		net.sourceforge.phpeclipse.ui \
 		net.sourceforge.phpeclipse.webbrowser \


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Nov 2008 02:23:29 -0000	1.4
+++ sources	5 Apr 2009 19:05:34 -0000	1.5
@@ -1 +1 @@
-a0ccdfd8056caa958bff85f7e7b1adc9  phpeclipse-1.2.1.tar.gz
+8ac385ed7418b7cf61cacc7f630adf36  phpeclipse-1.2.1.tar.gz


--- eclipse-phpeclipse-no-htmlparser.patch DELETED ---



From bpepple at fedoraproject.org  Sun Apr  5 20:05:36 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun,  5 Apr 2009 20:05:36 +0000 (UTC)
Subject: rpms/freeciv/devel .cvsignore, 1.21, 1.22 freeciv.spec, 1.45,
	1.46 sources, 1.21, 1.22
Message-ID: <20090405200536.20CE67011F@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9848

Modified Files:
	.cvsignore freeciv.spec sources 
Log Message:
* Sun Apr  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.9-1
- Update to 2.1.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Dec 2008 20:07:44 -0000	1.21
+++ .cvsignore	5 Apr 2009 20:05:05 -0000	1.22
@@ -1 +1 @@
-freeciv-2.1.8.tar.bz2
+freeciv-2.1.9.tar.bz2


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- freeciv.spec	9 Mar 2009 14:08:14 -0000	1.45
+++ freeciv.spec	5 Apr 2009 20:05:05 -0000	1.46
@@ -4,8 +4,8 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.1.8
-Release:        3%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        A multi-player strategy game
 
 Group:          Amusements/Games
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sun Apr  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.9-1
+- Update to 2.1.9.
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> - 2.1.8-3
 - drop bind-devel BuildReq, it is not needed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Dec 2008 20:07:45 -0000	1.21
+++ sources	5 Apr 2009 20:05:05 -0000	1.22
@@ -1 +1 @@
-a5b50e596b146616ebebde5c483f59d5  freeciv-2.1.8.tar.bz2
+caffaa201b2f5dfdfe00b6e6c3f32fb1  freeciv-2.1.9.tar.bz2



From robert at fedoraproject.org  Sun Apr  5 20:15:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 20:15:49 +0000 (UTC)
Subject: rpms/mimedefang/EL-4 .cvsignore, 1.6, 1.7 mimedefang.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090405201549.8D3607011F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11346/EL-4

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.67



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Sep 2008 20:24:59 -0000	1.6
+++ .cvsignore	5 Apr 2009 20:15:19 -0000	1.7
@@ -1 +1 @@
-mimedefang-2.65.tar.gz
+mimedefang-2.67.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-4/mimedefang.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mimedefang.spec	4 Sep 2008 20:24:59 -0000	1.9
+++ mimedefang.spec	5 Apr 2009 20:15:19 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.65
+Version:           2.67
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -51,6 +51,11 @@
 install -m 755 gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog
+touch -c -r Changelog Changelog.utf8
+mv -f Changelog.utf8 Changelog
+
 %pre
 if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
   getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang
@@ -98,6 +103,12 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 2.67-1
+- Upgrade to 2.67
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 2.65-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
 - Upgrade to 2.65
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Sep 2008 20:24:59 -0000	1.6
+++ sources	5 Apr 2009 20:15:19 -0000	1.7
@@ -1 +1 @@
-39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz
+d1f67bc03b41484cb9ae52fb0dd4d24b  mimedefang-2.67.tar.gz



From robert at fedoraproject.org  Sun Apr  5 20:15:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 20:15:50 +0000 (UTC)
Subject: rpms/mimedefang/EL-5 .cvsignore, 1.8, 1.9 mimedefang.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20090405201550.0C71B7013C@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11346/EL-5

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.67



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2008 20:24:59 -0000	1.8
+++ .cvsignore	5 Apr 2009 20:15:19 -0000	1.9
@@ -1 +1 @@
-mimedefang-2.65.tar.gz
+mimedefang-2.67.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-5/mimedefang.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mimedefang.spec	4 Sep 2008 20:24:59 -0000	1.11
+++ mimedefang.spec	5 Apr 2009 20:15:19 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.65
+Version:           2.67
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -51,6 +51,11 @@
 install -m 755 gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog
+touch -c -r Changelog Changelog.utf8
+mv -f Changelog.utf8 Changelog
+
 %pre
 if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
   getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang
@@ -98,6 +103,12 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 2.67-1
+- Upgrade to 2.67
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 2.65-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
 - Upgrade to 2.65
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2008 20:24:59 -0000	1.8
+++ sources	5 Apr 2009 20:15:19 -0000	1.9
@@ -1 +1 @@
-39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz
+d1f67bc03b41484cb9ae52fb0dd4d24b  mimedefang-2.67.tar.gz



From robert at fedoraproject.org  Sun Apr  5 20:15:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 20:15:50 +0000 (UTC)
Subject: rpms/mimedefang/F-10 .cvsignore, 1.8, 1.9 mimedefang.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20090405201550.702DC7013D@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11346/F-10

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.67



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2008 20:25:01 -0000	1.8
+++ .cvsignore	5 Apr 2009 20:15:20 -0000	1.9
@@ -1 +1 @@
-mimedefang-2.65.tar.gz
+mimedefang-2.67.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-10/mimedefang.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mimedefang.spec	4 Sep 2008 20:25:01 -0000	1.11
+++ mimedefang.spec	5 Apr 2009 20:15:20 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.65
+Version:           2.67
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -51,6 +51,11 @@
 install -m 755 gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog
+touch -c -r Changelog Changelog.utf8
+mv -f Changelog.utf8 Changelog
+
 %pre
 if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
   getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang
@@ -98,6 +103,12 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 2.67-1
+- Upgrade to 2.67
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 2.65-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
 - Upgrade to 2.65
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2008 20:25:01 -0000	1.8
+++ sources	5 Apr 2009 20:15:20 -0000	1.9
@@ -1 +1 @@
-39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz
+d1f67bc03b41484cb9ae52fb0dd4d24b  mimedefang-2.67.tar.gz



From robert at fedoraproject.org  Sun Apr  5 20:15:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 20:15:50 +0000 (UTC)
Subject: rpms/mimedefang/F-9 .cvsignore, 1.8, 1.9 mimedefang.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20090405201550.B56387011F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11346/F-9

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.67



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2008 20:25:00 -0000	1.8
+++ .cvsignore	5 Apr 2009 20:15:20 -0000	1.9
@@ -1 +1 @@
-mimedefang-2.65.tar.gz
+mimedefang-2.67.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-9/mimedefang.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mimedefang.spec	4 Sep 2008 20:25:00 -0000	1.11
+++ mimedefang.spec	5 Apr 2009 20:15:20 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.65
+Version:           2.67
 Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
@@ -51,6 +51,11 @@
 install -m 755 gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog
+touch -c -r Changelog Changelog.utf8
+mv -f Changelog.utf8 Changelog
+
 %pre
 if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
   getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang
@@ -98,6 +103,12 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 2.67-1
+- Upgrade to 2.67
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 2.65-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Thu Sep 04 2008 Robert Scheck <robert at fedoraproject.org> 2.65-1
 - Upgrade to 2.65
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2008 20:25:00 -0000	1.8
+++ sources	5 Apr 2009 20:15:20 -0000	1.9
@@ -1 +1 @@
-39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz
+d1f67bc03b41484cb9ae52fb0dd4d24b  mimedefang-2.67.tar.gz



From robert at fedoraproject.org  Sun Apr  5 20:15:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  5 Apr 2009 20:15:50 +0000 (UTC)
Subject: rpms/mimedefang/devel .cvsignore, 1.8, 1.9 mimedefang.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090405201550.F25CB7011F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11346/devel

Modified Files:
	.cvsignore mimedefang.spec sources 
Log Message:
Upgrade to 2.67



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2008 20:25:01 -0000	1.8
+++ .cvsignore	5 Apr 2009 20:15:20 -0000	1.9
@@ -1 +1 @@
-mimedefang-2.65.tar.gz
+mimedefang-2.67.tar.gz


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mimedefang.spec	23 Feb 2009 20:12:19 -0000	1.13
+++ mimedefang.spec	5 Apr 2009 20:15:20 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.65
-Release:           2%{?dist}
+Version:           2.67
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -103,6 +103,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sun Apr 05 2009 Robert Scheck <robert at fedoraproject.org> 2.67-1
+- Upgrade to 2.67
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 2.65-2
 - Rebuilt against gcc 4.4 and rpm 4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2008 20:25:01 -0000	1.8
+++ sources	5 Apr 2009 20:15:20 -0000	1.9
@@ -1 +1 @@
-39e889adcf8bda767fc9a2f03e887c4c  mimedefang-2.65.tar.gz
+d1f67bc03b41484cb9ae52fb0dd4d24b  mimedefang-2.67.tar.gz



From silas at fedoraproject.org  Sun Apr  5 20:16:28 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Sun,  5 Apr 2009 20:16:28 +0000 (UTC)
Subject: rpms/python-mutagen/devel import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 python-mutagen.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20090405201628.426297011F@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/python-mutagen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11678/devel

Modified Files:
	.cvsignore python-mutagen.spec sources 
Added Files:
	import.log 
Log Message:
Update to 1.15



--- NEW FILE import.log ---
python-mutagen-1_15-1_fc10:HEAD:python-mutagen-1.15-1.fc10.src.rpm:1238937627


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Dec 2007 20:19:24 -0000	1.9
+++ .cvsignore	5 Apr 2009 20:15:58 -0000	1.10
@@ -1 +1 @@
-mutagen-1.13.tar.gz
+mutagen-1.15.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/python-mutagen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-mutagen.spec	26 Feb 2009 22:27:30 -0000	1.13
+++ python-mutagen.spec	5 Apr 2009 20:15:58 -0000	1.14
@@ -1,17 +1,18 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mutagen
-Version:        1.13
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
+
 Group:          Development/Languages
 License:        GPLv2
-URL:            http://www.sacredchao.net/quodlibet/wiki/Development/Mutagen
-Source0:        http://www.sacredchao.net/~piman/software/mutagen-%{version}.tar.gz
+URL:            http://code.google.com/p/quodlibet/wiki/Mutagen
+Source0:        http://quodlibet.googlecode.com/files/mutagen-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  python-devel
+
 BuildArch:      noarch
+BuildRequires:  python-devel
 
 %description
 Mutagen is a Python module to handle audio metadata. It supports
@@ -23,13 +24,11 @@
 
 %prep
 %setup -q -n mutagen-%{version}
-sed -e 1d -e 2d -i mutagen/__init__.py 
+sed -e 1d -e 2d -i mutagen/__init__.py
+sed -i 's/\r//' TUTORIAL
 
 %build
 %{__python} setup.py build
-mv TUTORIAL TUTORIAL.old
-cat TUTORIAL.old | tr -d "\r" > TUTORIAL
-rm -rf TUTORIAL.old
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,21 +39,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README TUTORIAL
+%doc API-NOTES COPYING NEWS README TODO TUTORIAL
 %{_bindir}/*
 %{_mandir}/man*/*gz
-%{python_sitelib}/*egg*
-%dir %{python_sitelib}/mutagen
-%{python_sitelib}/mutagen/*.py
-%{python_sitelib}/mutagen/*.pyc
-%{python_sitelib}/mutagen/*.pyo
+%{python_sitelib}/*
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.13-3
-- Rebuild for Python 2.6
+* Sun Mar 29 2009 Silas Sewell <silas at sewell ch> - 1.15-1
+- Update to 1.15
 
 * Mon Dec 31 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.13-2
 - Add egg-info to package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Dec 2007 20:19:24 -0000	1.9
+++ sources	5 Apr 2009 20:15:58 -0000	1.10
@@ -1 +1 @@
-7afa5a154c15e777898e3188b743ef74  mutagen-1.13.tar.gz
+c346e1290711a38c123727c31f3602f8  mutagen-1.15.tar.gz



From jkratoch at fedoraproject.org  Sun Apr  5 20:34:21 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sun,  5 Apr 2009 20:34:21 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch,1.10,1.11 gdb.spec,1.337,1.338
Message-ID: <20090405203421.D78617011F@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14931

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Sun Apr  5 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-14
- Archer update to the snapshot: f6273d446ff87e50976600ba3f71b88d61043e20
- Archer backport: f6273d446ff87e50976600ba3f71b88d61043e20
  - Use pretty-printers to print base classes inside a derived class.


gdb-archer.patch:

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdb-archer.patch	30 Mar 2009 17:32:00 -0000	1.10
+++ gdb-archer.patch	5 Apr 2009 20:34:20 -0000	1.11
@@ -2,7 +2,7 @@
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit d144a3633454046aaeae3e2c369c271834431d36
+commit f6273d446ff87e50976600ba3f71b88d61043e20
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-merge-expr
@@ -12318,10 +12318,52 @@
  						  const char *name,
  						  const char *linkage_name,
 diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
-index 8b7d868..dcd32cb 100644
+index 8b7d868..4e33fa0 100644
 --- a/gdb/cp-valprint.c
 +++ b/gdb/cp-valprint.c
-@@ -461,6 +461,7 @@ cp_print_static_field (struct type *type,
+@@ -36,6 +36,7 @@
+ #include "valprint.h"
+ #include "cp-support.h"
+ #include "language.h"
++#include "python/python.h"
+ 
+ /* Controls printing of vtbl's */
+ static void
+@@ -418,12 +419,27 @@ cp_print_value (struct type *type, struct type *real_type,
+       if (skip >= 1)
+ 	fprintf_filtered (stream, "<invalid address>");
+       else
+-	cp_print_value_fields (baseclass, thistype, base_valaddr,
+-			       thisoffset + boffset, address + boffset,
+-			       stream, recurse, options,
+-			       ((struct type **)
+-				obstack_base (&dont_print_vb_obstack)),
+-			       0);
++	{
++	  int result = 0;
++
++	  /* Attempt to run the Python pretty-printers on the
++	     baseclass if possible.  */
++	  if (!options->raw)
++	    result = apply_val_pretty_printer (baseclass, base_valaddr,
++					       thisoffset + boffset,
++					       address + boffset,
++					       stream, recurse,
++					       options,
++					       current_language);
++	  	  
++	  if (!result)
++	    cp_print_value_fields (baseclass, thistype, base_valaddr,
++				   thisoffset + boffset, address + boffset,
++				   stream, recurse, options,
++				   ((struct type **)
++				    obstack_base (&dont_print_vb_obstack)),
++				   0);
++	}
+       fputs_filtered (", ", stream);
+ 
+     flush_it:
+@@ -461,6 +477,7 @@ cp_print_static_field (struct type *type,
    if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
      {
        CORE_ADDR *first_dont_print;
@@ -12329,7 +12371,7 @@
        int i;
  
        first_dont_print
-@@ -470,7 +471,7 @@ cp_print_static_field (struct type *type,
+@@ -470,7 +487,7 @@ cp_print_static_field (struct type *type,
  
        while (--i >= 0)
  	{
@@ -12338,7 +12380,7 @@
  	    {
  	      fputs_filtered ("<same as static member of an already"
  			      " seen type>",
-@@ -479,12 +480,13 @@ cp_print_static_field (struct type *type,
+@@ -479,12 +496,13 @@ cp_print_static_field (struct type *type,
  	    }
  	}
  
@@ -12354,7 +12396,7 @@
  			     stream, recurse, options, NULL, 1);
        return;
      }
-@@ -492,7 +494,7 @@ cp_print_static_field (struct type *type,
+@@ -492,7 +510,7 @@ cp_print_static_field (struct type *type,
    opts = *options;
    opts.deref_ref = 0;
    val_print (type, value_contents_all (val), 
@@ -40681,13 +40723,13 @@
 +mi_varobj_update_with_type_change container int 0 "update after type change"
 diff --git a/gdb/testsuite/gdb.python/python-prettyprint.c b/gdb/testsuite/gdb.python/python-prettyprint.c
 new file mode 100644
-index 0000000..f8c2435
+index 0000000..399be23
 --- /dev/null
 +++ b/gdb/testsuite/gdb.python/python-prettyprint.c
-@@ -0,0 +1,159 @@
+@@ -0,0 +1,191 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
-+   Copyright 2008 Free Software Foundation, Inc.
++   Copyright 2008, 2009 Free Software Foundation, Inc.
 +
 +   This program is free software; you can redistribute it and/or modify
 +   it under the terms of the GNU General Public License as published by
@@ -40731,6 +40773,35 @@
 +  const S &b;
 +};
 +SSS::SSS (int x, const S& r) : a(x), b(r) { }
++
++class VirtualTest 
++{ 
++ private: 
++  int value; 
++
++ public: 
++  VirtualTest () 
++    { 
++      value = 1;
++    } 
++};
++
++class Vbase1 : public virtual VirtualTest { };
++class Vbase2 : public virtual VirtualTest { };
++class Vbase3 : public virtual VirtualTest { };
++
++class Derived : public Vbase1, public Vbase2, public Vbase3
++{ 
++ private: 
++  int value; 
++  
++ public:
++  Derived () 
++    { 
++      value = 2; 
++    }
++};
++
 +#endif
 +
 +typedef struct string_repr
@@ -40833,6 +40904,9 @@
 +  SSS sss(15, cps);
 +
 +  SSS& ref (sss);
++
++  Derived derived;
++  
 +#endif
 +
 +  add_item (&c, 23);		/* MI breakpoint here */
@@ -40846,11 +40920,11 @@
 +}
 diff --git a/gdb/testsuite/gdb.python/python-prettyprint.exp b/gdb/testsuite/gdb.python/python-prettyprint.exp
 new file mode 100644
-index 0000000..b2ccb2b
+index 0000000..f83b1cd
 --- /dev/null
 +++ b/gdb/testsuite/gdb.python/python-prettyprint.exp
-@@ -0,0 +1,90 @@
-+# Copyright (C) 2008 Free Software Foundation, Inc.
+@@ -0,0 +1,92 @@
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -40928,6 +41002,8 @@
 +	gdb_test "print cpssa" " = {{$nl *zss = 11, *$nl *s =  a=<12> b=<$hex>$nl *}, {$nl *zss = 13, *$nl *s =  a=<14> b=<$hex>$nl *}}"
 +	gdb_test "print sss" "= a=<15> b=< a=<8> b=<$hex>>"
 +	gdb_test "print ref" "= a=<15> b=< a=<8> b=<$hex>>"
++	gdb_test "print derived" \
++	    " = \{.*<Vbase1> = pp class name: Vbase1.*<Vbase2> = \{.*<VirtualTest> = pp value variable is: 1,.*members of Vbase2:.*_vptr.Vbase2 = $hex.*<Vbase3> = \{.*members of Vbase3.*members of Derived:.*value = 2.*"
 +    }
 +
 +    gdb_test "print x" " = $hex \"this is x\""
@@ -40942,10 +41018,10 @@
 +run_lang_tests "c++"
 diff --git a/gdb/testsuite/gdb.python/python-prettyprint.py b/gdb/testsuite/gdb.python/python-prettyprint.py
 new file mode 100644
-index 0000000..0d9cb87
+index 0000000..8379ecf
 --- /dev/null
 +++ b/gdb/testsuite/gdb.python/python-prettyprint.py
-@@ -0,0 +1,134 @@
+@@ -0,0 +1,151 @@
 +# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -41026,6 +41102,20 @@
 +    def to_string(self):
 +        return "a=<" + str(self.val['a']) + "> b=<" + str(self.val["b"]) + ">"
 +
++class pp_multiple_virtual:
++    def __init__ (self, val):
++        self.val = val
++
++    def to_string (self):
++        return "pp value variable is: " + str (self.val['value'])
++
++class pp_vbase1:
++    def __init__ (self, val):
++        self.val = val
++
++    def to_string (self):
++        return "pp class name: " + self.val.type ().tag ()
++
 +def lookup_function (val):
 +    "Look-up and return a pretty-printer that can print val."
 +
@@ -41067,6 +41157,9 @@
 +    pretty_printers_dict[re.compile ('^const S &$')]   = pp_s
 +    pretty_printers_dict[re.compile ('^SSS$')]  = pp_sss
 +    
++    pretty_printers_dict[re.compile ('^VirtualTest$')] =  pp_multiple_virtual
++    pretty_printers_dict[re.compile ('^Vbase1$')] =  pp_vbase1
++    
 +    # Note that we purposely omit the typedef names here.
 +    # Printer lookup is based on canonical name.
 +    # However, we do need both tagged and untagged variants, to handle


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- gdb.spec	30 Mar 2009 17:32:01 -0000	1.337
+++ gdb.spec	5 Apr 2009 20:34:21 -0000	1.338
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 13%{?_with_upstream:.upstream}%{?dist}
+Release: 14%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -851,6 +851,11 @@
 %endif
 
 %changelog
+* Sun Apr  5 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-14
+- Archer update to the snapshot: f6273d446ff87e50976600ba3f71b88d61043e20
+- Archer backport: f6273d446ff87e50976600ba3f71b88d61043e20
+  - Use pretty-printers to print base classes inside a derived class.
+
 * Mon Mar 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-13
 - Archer update to the snapshot: d144a3633454046aaeae3e2c369c271834431d36
 - Archer backport: a2c49b7640ebe7ce1376902d48d5bbbee600996b



From mbooth at fedoraproject.org  Sun Apr  5 20:36:43 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sun,  5 Apr 2009 20:36:43 +0000 (UTC)
Subject: rpms/eclipse-phpeclipse/F-9
	eclipse-phpeclipse-fix-phpmanual-view.patch, NONE,
	1.1 eclipse-phpeclipse-httpd-integration.patch, 1.5,
	1.6 eclipse-phpeclipse.spec, 1.8, 1.9 get-phpeclipse.sh, 1.2,
	1.3 sources, 1.4, 1.5 eclipse-phpeclipse-no-htmlparser.patch,
	1.2, NONE
Message-ID: <20090405203643.06BE27011F@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14964

Modified Files:
	eclipse-phpeclipse-httpd-integration.patch 
	eclipse-phpeclipse.spec get-phpeclipse.sh sources 
Added Files:
	eclipse-phpeclipse-fix-phpmanual-view.patch 
Removed Files:
	eclipse-phpeclipse-no-htmlparser.patch 
Log Message:
* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.2.1-3
- Drop GCJ AOT support.
- Add htmlparser dependency and drop htmlparser patch.
- Add patch to fix PartInitException and IllegalArgumentException in
  PHP Manual view.



eclipse-phpeclipse-fix-phpmanual-view.patch:

--- NEW FILE eclipse-phpeclipse-fix-phpmanual-view.patch ---
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(working copy)
@@ -181,7 +181,8 @@
 				Display.getDefault().asyncExec(new Runnable() {
 					public void run() {
 						String html = getHtmlSource(funcName);
-						browser.setText(html);
+						if (html != null)
+							browser.setText(html);
 					}
 				});
 			}
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml	(revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml	(working copy)
@@ -13,16 +13,16 @@
             icon="icons/phpmanual.png"
             category="net.sourceforge.phpeclipse.views.category"
             class="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView"
-            id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualViewz">
+            id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
       </view>
    </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
       <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
+            targetID="net.sourceforge.phpeclipse.PHPPerspective">
          <view
                ratio="0.5"
-               relative="org.eclipse.ui.views.TaskList"
+               relative="net.sourceforge.phpeclipse.webbrowser.views"
                relationship="right"
                id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
          </view>

eclipse-phpeclipse-httpd-integration.patch:

Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-9/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-phpeclipse-httpd-integration.patch	15 Nov 2008 02:23:30 -0000	1.5
+++ eclipse-phpeclipse-httpd-integration.patch	5 Apr 2009 20:36:42 -0000	1.6
@@ -119,9 +119,9 @@
 +_xampp_start_pref=
 +_xampp_stop_pref=
 +__mysql_start=
-+__apache_start=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}"
-+__apache_stop=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k stop
-+__apache_restart=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k restart
++__apache_start=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}"
++__apache_stop=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k stop
++__apache_restart=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k restart
  _mysql_start_background=true
  _apache_start_background=true
  _apache_stop_background=true
@@ -307,10 +307,10 @@
 +               prefs/default_win32.properties
 +src.excludes = prefs/default_macosx.properties,\
 +               prefs/default_win32.properties
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml
+Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml
 ===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
+--- /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1643)
++++ /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
 @@ -192,11 +192,6 @@
  	  </page>
  	  <page
@@ -323,7 +323,18 @@
  			class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
  			id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
  			name="MySQL"/>
-@@ -268,24 +263,6 @@
+@@ -213,10 +208,6 @@
+ 			targetID="net.sourceforge.phpeclipse.PHPPerspective">
+ 		 <actionSet id="net.sourceforge.phpeclipse.PHPActionSet"/>
+ 	  </perspectiveExtension>
+-	  <perspectiveExtension
+-		   targetID="net.sourceforge.phpeclipse.PHPPerspective">
+-			  <actionSet id="net.sf.eclipsetidy.ActionSet"/>
+-		  </perspectiveExtension>
+    </extension>
+ 
+    <extension
+@@ -268,24 +259,6 @@
  			   toolbarPath="Normal"
  			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
  		 </action>


Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-9/eclipse-phpeclipse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-phpeclipse.spec	16 Nov 2008 21:55:15 -0000	1.8
+++ eclipse-phpeclipse.spec	5 Apr 2009 20:36:42 -0000	1.9
@@ -1,9 +1,8 @@
 %define eclipse_base     %{_datadir}/eclipse
-%define gcj_support      1
 
 Name:      eclipse-phpeclipse
 Version:   1.2.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -18,27 +17,23 @@
 Patch0:    %{name}-broken-help-links.patch
 Patch1:    %{name}-fix-build-props.patch
 Patch2:    %{name}-httpd-integration.patch
-Patch3:    %{name}-no-htmlparser.patch
 Patch4:    %{name}-rm-win32-help.patch
 Patch5:    %{name}-external-parser.patch
 Patch6:    %{name}-external-preview.patch
+Patch7:    %{name}-fix-phpmanual-view.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildArch:        noarch
-%endif
+
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.3
+BuildRequires:    eclipse-pde >= 3.3
+BuildRequires:    htmlparser
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.3
+Requires:         eclipse-platform >= 3.3
+Requires:         htmlparser
 Requires:         php >= 5
 Requires:         php-pecl-xdebug
 Requires:         httpd
@@ -55,21 +50,19 @@
 %patch0 -p4
 %patch1 -p4
 %patch2 -p4
-%patch3 -p4
 %patch4 -p4
 %patch5 -p4
 %patch6 -p4
+%patch7 -p4
 
 # ditch bundled libs in favor of building against fedora packaged libs
-#rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
-#   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
-#build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis
-
-#grep -lR sax2 * | xargs sed --in-place "s/sax2/xml-commons-apis/"
+rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
+   net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
+build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser htmlparser
 
 # fix jar versions
 find -name MANIFEST.MF | xargs sed --in-place "s/0.0.0/%{version}/"
@@ -103,39 +96,27 @@
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-#pushd %{buildroot}%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-#rm *.jar
-#build-jar-repository -s -p . xml-commons-apis
-#popd
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+pushd %{buildroot}%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+rm *.jar
+build-jar-repository -s -p . htmlparser
+popd
 
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 
 # main feature
-%doc %{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/cpl-v10.html
-%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/feature.xml
-%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/license.html
-%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/phpeclipse.jpeg
-%dir %{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*
+%doc net.sourceforge.phpeclipse.feature/cpl-v10.html
+%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.core_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.externaltools_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.help_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.phphelp_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual_*
-#%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.smarty.ui_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.ui_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.webbrowser_*
@@ -151,11 +132,13 @@
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.core_*
 %{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.ui_*
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
-
 %changelog
+* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.2.1-3
+- Drop GCJ AOT support.
+- Add htmlparser dependency and drop htmlparser patch.
+- Add patch to fix PartInitException and IllegalArgumentException in
+  PHP Manual view.
+
 * Sun Nov 16 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.1-2
 - Add php-pecl-xdebug dependency.
 


Index: get-phpeclipse.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-9/get-phpeclipse.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-phpeclipse.sh	15 Nov 2008 02:23:30 -0000	1.2
+++ get-phpeclipse.sh	5 Apr 2009 20:36:42 -0000	1.3
@@ -18,6 +18,7 @@
 		net.sourceforge.phpeclipse.launching \
 		net.sourceforge.phpeclipse.phphelp \
 		net.sourceforge.phpeclipse.phpmanual \
+		net.sourceforge.phpeclipse.phpmanual.htmlparser \
 		net.sourceforge.phpeclipse.smarty.ui \
 		net.sourceforge.phpeclipse.ui \
 		net.sourceforge.phpeclipse.webbrowser \


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Nov 2008 02:23:30 -0000	1.4
+++ sources	5 Apr 2009 20:36:42 -0000	1.5
@@ -1 +1 @@
-a0ccdfd8056caa958bff85f7e7b1adc9  phpeclipse-1.2.1.tar.gz
+8ac385ed7418b7cf61cacc7f630adf36  phpeclipse-1.2.1.tar.gz


--- eclipse-phpeclipse-no-htmlparser.patch DELETED ---



From jkratoch at fedoraproject.org  Sun Apr  5 21:02:56 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sun,  5 Apr 2009 21:02:56 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch,1.11,1.12 gdb.spec,1.338,1.339
Message-ID: <20090405210256.248BA7011F@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18667

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Sun Apr  5 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-15
- Archer update to the snapshot: 7c7c77576669d17ad5072daa47ea3a4fd954483d
- Archer backport: 7c7c77576669d17ad5072daa47ea3a4fd954483d (Peter Bergner)
  - Disassemble Power7 instructions right in the default/only -Many GDB mode.


gdb-archer.patch:

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdb-archer.patch	5 Apr 2009 20:34:20 -0000	1.11
+++ gdb-archer.patch	5 Apr 2009 21:02:55 -0000	1.12
@@ -2,7 +2,7 @@
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit f6273d446ff87e50976600ba3f71b88d61043e20
+commit 7c7c77576669d17ad5072daa47ea3a4fd954483d
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-merge-expr
@@ -34188,10 +34188,10 @@
 +gdb_test "break main" "" "Second permanent break"
 diff --git a/gdb/testsuite/gdb.arch/powerpc-power7.exp b/gdb/testsuite/gdb.arch/powerpc-power7.exp
 new file mode 100644
-index 0000000..ae301db
+index 0000000..d9c48f9
 --- /dev/null
 +++ b/gdb/testsuite/gdb.arch/powerpc-power7.exp
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,166 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -34241,23 +34241,14 @@
 +    }
 +}
 +
-+proc instr_to_patt {offset instr} {
-+    # 0x0000000000000018 <func+24>:	stxvd2x vs43,r4,r5
-+    return ".*\r\n[string map {0x 0x0*} $offset] <func\\+?\[0-9\]*>:\[ \t\]*[string map [list { } "\[ \t\]+" . {\.}] $instr]\[ \t\]*\r\n.*"
-+}
-+
-+# KFAIL strings would not exist if -Many would print the same as -Mpower7.
-+# That means the power7 form should be the preferred one.
-+# http://sourceware.org/ml/gdb-patches/2009-03/threads.html#00020
-+
-+proc func_check {offset instr {kfail ""}} {
++proc func_check {offset instr} {
 +    global func
 +
++    # 0x0000000000000018 <func+24>:	stxvd2x vs43,r4,r5
++    set patt ".*\r\n[string map {0x 0x0*} $offset] <func\\+?\[0-9\]*>:\[ \t\]*[string map [list { } "\[ \t\]+" . {\.}] $instr]\[ \t\]*\r\n.*"
 +    set test "Found $offset: $instr"
-+    if [regexp -nocase -line [instr_to_patt $offset $instr] $func] {
++    if [regexp -nocase -line $patt $func] {
 +	pass $test
-+    } elseif {$kfail != "" && [regexp -nocase -line [instr_to_patt $offset $kfail] $func]} {
-+	kfail gdb/NNNN $test
 +    } else {
 +	fail $test
 +    }
@@ -34301,8 +34292,8 @@
 +func_check  0x8c "rvwinkle"
 +func_check  0x90 "prtyw   r3,r4"
 +func_check  0x94 "prtyd   r13,r14"
-+func_check  0x98 "mfcfar  r10"           "mfspr   r10,28"
-+func_check  0x9c "mtcfar  r11"           "mtspr   28,r11"
++func_check  0x98 "mfcfar  r10"
++func_check  0x9c "mtcfar  r11"
 +func_check  0xa0 "cmpb    r3,r4,r5"
 +func_check  0xa4 "lwzcix  r10,r11,r12"
 +func_check  0xa8 "dadd    f16,f17,f18"
@@ -34346,8 +34337,8 @@
 +func_check 0x140 "ftdiv   cr7,f10,f11"
 +func_check 0x144 "ftsqrt  cr0,f10"
 +func_check 0x148 "ftsqrt  cr7,f10"
-+func_check 0x14c "dcbtt   r8,r9"         "dcbt    16,r8,r9"
-+func_check 0x150 "dcbtstt r8,r9"         "dcbtst  16,r8,r9"
++func_check 0x14c "dcbtt   r8,r9"
++func_check 0x150 "dcbtstt r8,r9"
 +func_check 0x154 "dcffix  f10,f12"
 +func_check 0x158 "dcffix. f20,f22"
 +func_check 0x15c "lbarx   r10,r11,r12"
@@ -44807,6 +44798,25 @@
  #define AT_EXECFN	31		/* Filename of executable.  */
  /* Pointer to the global system page used for system calls and other
     nice things.  */
+diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
+index e45fc58..dc9a7ba 100644
+--- a/include/opcode/ppc.h
++++ b/include/opcode/ppc.h
+@@ -1,6 +1,6 @@
+ /* ppc.h -- Header file for PowerPC opcode table
+    Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+-   2007 Free Software Foundation, Inc.
++   2007, 2008, 2009 Free Software Foundation, Inc.
+    Written by Ian Lance Taylor, Cygnus Support
+ 
+ This file is part of GDB, GAS, and the GNU binutils.
+@@ -351,4 +351,6 @@ struct powerpc_macro
+ extern const struct powerpc_macro powerpc_macros[];
+ extern const int powerpc_num_macros;
+ 
++extern ppc_cpu_t ppc_parse_cpu (ppc_cpu_t, const char *);
++
+ #endif /* PPC_H */
 diff --git a/opcodes/po/es.po b/opcodes/po/es.po
 index 873be13..40bea5c 100644
 --- a/opcodes/po/es.po
@@ -46719,10 +46729,453 @@
 +
 +#~ msgid "ignoring least significant bits in branch offset"
 +#~ msgstr "mengabaikan least significant bit dalam offset cabang"
+diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
+index 9a28338..8511345 100644
+--- a/opcodes/ppc-dis.c
++++ b/opcodes/ppc-dis.c
+@@ -1,6 +1,6 @@
+ /* ppc-dis.c -- Disassemble PowerPC instructions
+    Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+-   2008 Free Software Foundation, Inc.
++   2008, 2009 Free Software Foundation, Inc.
+    Written by Ian Lance Taylor, Cygnus Support
+ 
+    This file is part of the GNU opcodes library.
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include "sysdep.h"
+ #include "dis-asm.h"
++#include "opintl.h"
+ #include "opcode/ppc.h"
+ 
+ /* This file provides several disassembler functions, all of which use
+@@ -42,94 +43,198 @@ struct dis_private
+ #define POWERPC_DIALECT(INFO) \
+   (((struct dis_private *) ((INFO)->private_data))->dialect)
+ 
+-/* Determine which set of machines to disassemble for.  PPC403/601 or
+-   BookE.  For convenience, also disassemble instructions supported
+-   by the AltiVec vector unit.  */
++struct ppc_mopt {
++  const char *opt;
++  ppc_cpu_t cpu;
++  ppc_cpu_t sticky;
++};
++
++struct ppc_mopt ppc_opts[] = {
++  { "403",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_403
++		| PPC_OPCODE_32),
++    0 },
++  { "405",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_403
++		| PPC_OPCODE_405 | PPC_OPCODE_32),
++    0 },
++  { "440",     (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_32
++		| PPC_OPCODE_440 | PPC_OPCODE_ISEL | PPC_OPCODE_RFMCI),
++    0 },
++  { "464",     (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_32
++		| PPC_OPCODE_440 | PPC_OPCODE_ISEL | PPC_OPCODE_RFMCI),
++    0 },
++  { "601",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_601
++		| PPC_OPCODE_32),
++    0 },
++  { "603",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32),
++    0 },
++  { "604",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32),
++    0 },
++  { "620",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64),
++    0 },
++  { "7400",    (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ALTIVEC
++		| PPC_OPCODE_32),
++    0 },
++  { "7410",    (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ALTIVEC
++		| PPC_OPCODE_32),
++    0 },
++  { "7450",    (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ALTIVEC
++		| PPC_OPCODE_32),
++    0 },
++  { "7455",    (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ALTIVEC
++		| PPC_OPCODE_32),
++    0 },
++  { "750cl",   (PPC_OPCODE_PPC | PPC_OPCODE_PPCPS)
++    , 0 },
++  { "altivec", (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC),
++    PPC_OPCODE_ALTIVEC },
++  { "any",     0,
++    PPC_OPCODE_ANY },
++  { "booke",   (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_32),
++    0 },
++  { "booke32", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_32),
++    0 },
++  { "cell",    (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64
++		| PPC_OPCODE_POWER4 | PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC),
++    0 },
++  { "com",     (PPC_OPCODE_COMMON | PPC_OPCODE_32),
++    0 },
++  { "e300",    (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32
++		| PPC_OPCODE_E300),
++    0 },
++  { "e500",    (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE
++		| PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
++		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
++		| PPC_OPCODE_E500MC),
++    0 },
++  { "e500mc",  (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
++		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
++		| PPC_OPCODE_E500MC),
++    0 },
++  { "e500x2",  (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE
++		| PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
++		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
++		| PPC_OPCODE_E500MC),
++    0 },
++  { "efs",     (PPC_OPCODE_PPC | PPC_OPCODE_EFS),
++    0 },
++  { "power4",  (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64
++		| PPC_OPCODE_POWER4),
++    0 },
++  { "power5",  (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64
++		| PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5),
++    0 },
++  { "power6",  (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64
++		| PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
++		| PPC_OPCODE_ALTIVEC),
++    0 },
++  { "power7",  (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ISEL
++		| PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5
++		| PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7 | PPC_OPCODE_ALTIVEC
++		| PPC_OPCODE_VSX),
++    0 },
++  { "ppc",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32),
++    0 },
++  { "ppc32",   (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32),
++    0 },
++  { "ppc64",   (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64),
++    0 },
++  { "ppc64bridge", (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64_BRIDGE
++		    | PPC_OPCODE_64),
++    0 },
++  { "ppcps",   (PPC_OPCODE_PPC | PPC_OPCODE_PPCPS),
++    0 },
++  { "pwr",     (PPC_OPCODE_POWER | PPC_OPCODE_32),
++    0 },
++  { "pwr2",    (PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_32),
++    0 },
++  { "pwrx",    (PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_32),
++    0 },
++  { "spe",     (PPC_OPCODE_PPC | PPC_OPCODE_EFS),
++    PPC_OPCODE_SPE },
++  { "vsx",     (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC),
++    PPC_OPCODE_VSX },
++};
++
++/* Handle -m and -M options that set cpu type, and .machine arg.  */
++
++ppc_cpu_t
++ppc_parse_cpu (ppc_cpu_t ppc_cpu, const char *arg)
++{
++  /* Sticky bits.  */
++  ppc_cpu_t retain_flags = ppc_cpu & (PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX
++				      | PPC_OPCODE_SPE | PPC_OPCODE_ANY);
++  unsigned int i;
++
++  for (i = 0; i < sizeof (ppc_opts) / sizeof (ppc_opts[0]); i++)
++    if (strcmp (ppc_opts[i].opt, arg) == 0)
++      {
++	if (ppc_opts[i].sticky)
++	  {
++	    retain_flags |= ppc_opts[i].sticky;
++	    if ((ppc_cpu & ~(PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX
++			     | PPC_OPCODE_SPE | PPC_OPCODE_ANY)) != 0)
++	      break;
++	  }
++	ppc_cpu = ppc_opts[i].cpu;
++	break;
++      }
++  if (i >= sizeof (ppc_opts) / sizeof (ppc_opts[0]))
++    return 0;
++
++  ppc_cpu |= retain_flags;
++  return ppc_cpu;
++}
++
++/* Determine which set of machines to disassemble for.  */
+ 
+ static int
+ powerpc_init_dialect (struct disassemble_info *info)
+ {
+-  ppc_cpu_t dialect = PPC_OPCODE_PPC;
++  ppc_cpu_t dialect = 0;
++  char *arg;
+   struct dis_private *priv = calloc (sizeof (*priv), 1);
+ 
+   if (priv == NULL)
+     return FALSE;
+ 
+-  if (BFD_DEFAULT_TARGET_SIZE == 64)
+-    dialect |= PPC_OPCODE_64;
+-
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "ppcps") != NULL)
+-    dialect |= PPC_OPCODE_PPCPS;
+-  else if (info->disassembler_options
+-      && strstr (info->disassembler_options, "booke") != NULL)
+-    dialect |= PPC_OPCODE_BOOKE;
+-  else if ((info->mach == bfd_mach_ppc_e500mc)
+-	   || (info->disassembler_options
+-	       && strstr (info->disassembler_options, "e500mc") != NULL))
+-    dialect |= (PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
+-		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK
+-		| PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC);
+-  else if ((info->mach == bfd_mach_ppc_e500)
+-	   || (info->disassembler_options
+-	       && strstr (info->disassembler_options, "e500") != NULL))
+-    dialect |= (PPC_OPCODE_BOOKE
+-		| PPC_OPCODE_SPE | PPC_OPCODE_ISEL
+-		| PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
+-		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK
+-		| PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC);
+-  else if (info->disassembler_options
+-	   && strstr (info->disassembler_options, "efs") != NULL)
+-    dialect |= PPC_OPCODE_EFS;
+-  else if (info->disassembler_options
+-	   && strstr (info->disassembler_options, "e300") != NULL)
+-    dialect |= PPC_OPCODE_E300 | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON;
+-  else if (info->disassembler_options
+-	   && (strstr (info->disassembler_options, "440") != NULL
+-	       || strstr (info->disassembler_options, "464") != NULL))
+-    dialect |= PPC_OPCODE_BOOKE | PPC_OPCODE_32
+-      | PPC_OPCODE_440 | PPC_OPCODE_ISEL | PPC_OPCODE_RFMCI;
+-  else
+-    dialect |= (PPC_OPCODE_403 | PPC_OPCODE_601 | PPC_OPCODE_CLASSIC
+-		| PPC_OPCODE_COMMON | PPC_OPCODE_ALTIVEC);
+-
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "power4") != NULL)
+-    dialect |= PPC_OPCODE_POWER4;
+-
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "power5") != NULL)
+-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5;
+-
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "cell") != NULL)
+-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC;
+-
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "power6") != NULL)
+-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
+-	       | PPC_OPCODE_ALTIVEC;
++  arg = info->disassembler_options;
++  while (arg != NULL)
++    {
++      ppc_cpu_t new_cpu = 0;
++      char *end = strchr (arg, ',');
+ 
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "power7") != NULL)
+-    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5
+-	       | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
+-	       | PPC_OPCODE_ISEL | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX;
++      if (end != NULL)
++	*end = 0;
+ 
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "vsx") != NULL)
+-    dialect |= PPC_OPCODE_VSX;
++      if ((new_cpu = ppc_parse_cpu (dialect, arg)) != 0)
++	dialect = new_cpu;
++      else if (strcmp (arg, "32") == 0)
++	{
++	  dialect &= ~PPC_OPCODE_64;
++	  dialect |= PPC_OPCODE_32;
++	}
++      else if (strcmp (arg, "64") == 0)
++	{
++	  dialect |= PPC_OPCODE_64;
++	  dialect &= ~PPC_OPCODE_32;
++	}
++      else
++	fprintf (stderr, _("warning: ignoring unknown -M%s option\n"), arg);
+ 
+-  if (info->disassembler_options
+-      && strstr (info->disassembler_options, "any") != NULL)
+-    dialect |= PPC_OPCODE_ANY;
++      if (end != NULL)
++	*end++ = ',';
++      arg = end;
++    }
+ 
+-  if (info->disassembler_options)
++  if ((dialect & ~(PPC_OPCODE_32 | PPC_OPCODE_64)) == 0)
+     {
+-      if (strstr (info->disassembler_options, "32") != NULL)
+-	dialect &= ~PPC_OPCODE_64;
+-      else if (strstr (info->disassembler_options, "64") != NULL)
++      if (info->mach == bfd_mach_ppc64)
+ 	dialect |= PPC_OPCODE_64;
++      else
++	dialect |= PPC_OPCODE_32;
++      /* Choose a reasonable default.  */
++      dialect |= (PPC_OPCODE_PPC | PPC_OPCODE_COMMON | PPC_OPCODE_CLASSIC
++		  | PPC_OPCODE_601 | PPC_OPCODE_ALTIVEC);
+     }
+ 
+   info->private_data = priv;
+@@ -230,6 +335,7 @@ print_insn_powerpc (bfd_vma memaddr,
+   const struct powerpc_opcode *opcode;
+   const struct powerpc_opcode *opcode_end;
+   unsigned long op;
++  ppc_cpu_t dialect_orig = dialect;
+ 
+   status = (*info->read_memory_func) (memaddr, buffer, 4, info);
+   if (status != 0)
+@@ -268,7 +374,7 @@ print_insn_powerpc (bfd_vma memaddr,
+ 
+       if ((insn & opcode->mask) != opcode->opcode
+ 	  || (opcode->flags & dialect) == 0
+-	  || (opcode->deprecated & dialect) != 0)
++	  || (opcode->deprecated & dialect_orig) != 0)
+ 	continue;
+ 
+       /* Make two passes over the operands.  First see if any of them
+@@ -339,16 +445,14 @@ print_insn_powerpc (bfd_vma memaddr,
+ 	    (*info->print_address_func) (memaddr + value, info);
+ 	  else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0)
+ 	    (*info->print_address_func) ((bfd_vma) value & 0xffffffff, info);
+-	  else if ((operand->flags & PPC_OPERAND_CR) == 0
+-		   || (dialect & PPC_OPCODE_PPC) == 0)
+-	    (*info->fprintf_func) (info->stream, "%ld", value);
+ 	  else if ((operand->flags & PPC_OPERAND_FSL) != 0) 
+ 	    (*info->fprintf_func) (info->stream, "fsl%ld", value);
+ 	  else if ((operand->flags & PPC_OPERAND_FCR) != 0)
+ 	    (*info->fprintf_func) (info->stream, "fcr%ld", value);
+ 	  else if ((operand->flags & PPC_OPERAND_UDI) != 0)
+ 	    (*info->fprintf_func) (info->stream, "%ld", value);
+-	  else
++	  else if ((operand->flags & PPC_OPERAND_CR) != 0
++		   && (dialect & PPC_OPCODE_PPC) != 0)
+ 	    {
+ 	      if (operand->bitm == 7)
+ 		(*info->fprintf_func) (info->stream, "cr%ld", value);
+@@ -365,6 +469,8 @@ print_insn_powerpc (bfd_vma memaddr,
+ 		  (*info->fprintf_func) (info->stream, "%s", cbnames[cc]);
+ 		}
+ 	    }
++	  else
++	    (*info->fprintf_func) (info->stream, "%ld", value);
+ 
+ 	  if (need_paren)
+ 	    {
+@@ -400,23 +506,20 @@ print_insn_powerpc (bfd_vma memaddr,
+ void
+ print_ppc_disassembler_options (FILE *stream)
+ {
+-  fprintf (stream, "\n\
++  unsigned int i, col;
++
++  fprintf (stream, _("\n\
+ The following PPC specific disassembler options are supported for use with\n\
+-the -M switch:\n");
+-
+-  fprintf (stream, "  booke                    Disassemble the BookE instructions\n");
+-  fprintf (stream, "  e300                     Disassemble the e300 instructions\n");
+-  fprintf (stream, "  e500|e500x2              Disassemble the e500 instructions\n");
+-  fprintf (stream, "  e500mc                   Disassemble the e500mc instructions\n");
+-  fprintf (stream, "  440                      Disassemble the 440 instructions\n");
+-  fprintf (stream, "  464                      Disassemble the 464 instructions\n");
+-  fprintf (stream, "  efs                      Disassemble the EFS instructions\n");
+-  fprintf (stream, "  ppcps                    Disassemble the PowerPC paired singles instructions\n");
+-  fprintf (stream, "  power4                   Disassemble the Power4 instructions\n");
+-  fprintf (stream, "  power5                   Disassemble the Power5 instructions\n");
+-  fprintf (stream, "  power6                   Disassemble the Power6 instructions\n");
+-  fprintf (stream, "  power7                   Disassemble the Power7 instructions\n");
+-  fprintf (stream, "  vsx                      Disassemble the Vector-Scalar (VSX) instructions\n");
+-  fprintf (stream, "  32                       Do not disassemble 64-bit instructions\n");
+-  fprintf (stream, "  64                       Allow disassembly of 64-bit instructions\n");
++the -M switch:\n"));
++
++  for (col = 0, i = 0; i < sizeof (ppc_opts) / sizeof (ppc_opts[0]); i++)
++    {
++      col += fprintf (stream, " %s,", ppc_opts[i].opt);
++      if (col > 66)
++	{
++	  fprintf (stream, "\n");
++	  col = 0;
++	}
++    }
++  fprintf (stream, " 32, 64\n");
+ }
 diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
-index c872db5..5e70395 100644
+index c872db5..9fac147 100644
 --- a/opcodes/ppc-opc.c
 +++ b/opcodes/ppc-opc.c
+@@ -3464,8 +3464,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ 
+ {"isellt",	X(31,15),	X_MASK,      PPCISEL,	PPCNONE,	{RT, RA, RB}},
+ 
+-{"mfcr",	XFXM(31,19,0,0), XRARB_MASK, COM,	POWER4,		{RT}},
+ {"mfcr",	XFXM(31,19,0,0), XFXFXM_MASK, POWER4,	PPCNONE,	{RT, FXM4}},
++{"mfcr",	XFXM(31,19,0,0), XRARB_MASK, COM,	POWER4,		{RT}},
+ {"mfocrf",	XFXM(31,19,0,1), XFXFXM_MASK, COM,	PPCNONE,	{RT, FXM}},
+ 
+ {"lwarx",	X(31,20),	XEH_MASK,    PPC,	PPCNONE,	{RT, RA0, RB, EH}},
+@@ -3726,14 +3726,14 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"mullw.",	XO(31,235,0,1),	XO_MASK,     PPCCOM,	PPCNONE,	{RT, RA, RB}},
+ {"muls.",	XO(31,235,0,1),	XO_MASK,     PWRCOM,	PPCNONE,	{RT, RA, RB}},
+ 
++{"icblce",	X(31,238),	X_MASK,      PPCCHLK,	E500MC,		{CT, RA, RB}},
+ {"msgclr",	XRTRA(31,238,0,0),XRTRA_MASK,E500MC,	PPCNONE,	{RB}},
+-{"icblce",	X(31,238),	X_MASK,      PPCCHLK,	PPCNONE,	{CT, RA, RB}},
+ {"mtsrin",	X(31,242),	XRA_MASK,    PPC32,	PPCNONE,	{RS, RB}},
+ {"mtsri",	X(31,242),	XRA_MASK,    POWER32,	PPCNONE,	{RS, RB}},
+ 
+ {"dcbtstt",	XRT(31,246,0x10), XRT_MASK,  POWER7,	PPCNONE,	{RA, RB}},
+-{"dcbtst",	X(31,246),	X_MASK,      PPC,	POWER4,		{CT, RA, RB}},
+ {"dcbtst",	X(31,246),	X_MASK,      POWER4,	PPCNONE,	{RA, RB, CT}},
++{"dcbtst",	X(31,246),	X_MASK,      PPC,	POWER4,		{CT, RA, RB}},
+ 
+ {"stbux",	X(31,247),	X_MASK,      COM,	PPCNONE,	{RS, RAS, RB}},
+ 
+@@ -3767,8 +3767,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"lscbx.",	XRC(31,277,1),	X_MASK,      M601,	PPCNONE,	{RT, RA, RB}},
+ 
+ {"dcbtt",	XRT(31,278,0x10), XRT_MASK,  POWER7,	PPCNONE,	{RA, RB}},
+-{"dcbt",	X(31,278),	X_MASK,      PPC,	POWER4,		{CT, RA, RB}},
+ {"dcbt",	X(31,278),	X_MASK,      POWER4,	PPCNONE,	{RA, RB, CT}},
++{"dcbt",	X(31,278),	X_MASK,      PPC,	POWER4,		{CT, RA, RB}},
+ 
+ {"lhzx",	X(31,279),	X_MASK,      COM,	PPCNONE,	{RT, RA0, RB}},
+ 
+@@ -4399,16 +4399,16 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"lswi",	X(31,597),	X_MASK,      PPCCOM,	PPCNONE,	{RT, RA0, NB}},
+ {"lsi",		X(31,597),	X_MASK,      PWRCOM,	PPCNONE,	{RT, RA0, NB}},
+ 
+-{"msync",	X(31,598),	0xffffffff,  BOOKE,	PPCNONE,	{0}},
+ {"lwsync",	XSYNC(31,598,1), 0xffffffff, PPC,	PPCNONE,	{0}},
+ {"ptesync",	XSYNC(31,598,2), 0xffffffff, PPC64,	PPCNONE,	{0}},
+-{"sync",	X(31,598),	XSYNC_MASK,  PPCCOM,	PPCNONE,	{LS}},
++{"sync",	X(31,598),	XSYNC_MASK,  PPCCOM,	BOOKE,		{LS}},
++{"msync",	X(31,598),	0xffffffff,  BOOKE,	PPCNONE,	{0}},
+ {"dcs",		X(31,598),	0xffffffff,  PWRCOM,	PPCNONE,	{0}},
+ 
+ {"lfdx",	X(31,599),	X_MASK,      COM,	PPCNONE,	{FRT, RA0, RB}},
+ 
+-{"lfdepx",	X(31,607),	X_MASK,      E500MC,	PPCNONE,	{FRT, RA, RB}},
+ {"mffgpr",	XRC(31,607,0),	XRA_MASK,    POWER6,	POWER7,		{FRT, RB}},
++{"lfdepx",	X(31,607),	X_MASK,      E500MC,	PPCNONE,	{FRT, RA, RB}},
+ 
+ {"lddx",	X(31,611),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
+ 
+@@ -4502,8 +4502,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"sreq",	XRC(31,729,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
+ {"sreq.",	XRC(31,729,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
+ 
+-{"stfdepx",	X(31,735),	X_MASK,      E500MC,	PPCNONE,	{FRS, RA, RB}},
+ {"mftgpr",	XRC(31,735,0),	XRA_MASK,    POWER6,	POWER7,		{RT, FRB}},
++{"stfdepx",	X(31,735),	X_MASK,      E500MC,	PPCNONE,	{FRS, RA, RB}},
+ 
+ {"stddx",	X(31,739),	X_MASK,      E500MC,	PPCNONE,	{RS, RA, RB}},
+ 
 @@ -4560,8 +4560,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
  
  {"lhbrx",	X(31,790),	X_MASK,      COM,	PPCNONE,	{RT, RA0, RB}},
@@ -46733,6 +47186,16 @@
  
  {"sraw",	XRC(31,792,0),	X_MASK,      PPCCOM,	PPCNONE,	{RA, RS, RB}},
  {"sra",		XRC(31,792,0),	X_MASK,      PWRCOM,	PPCNONE,	{RA, RS, RB}},
+@@ -4602,8 +4602,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ 
+ {"lbzcix",	X(31,853),	X_MASK,      POWER6,	PPCNONE,	{RT, RA0, RB}},
+ 
++{"eieio",	X(31,854),	0xffffffff,  PPC,	BOOKE,		{0}},
+ {"mbar",	X(31,854),	X_MASK,      BOOKE,	PPCNONE,	{MO}},
+-{"eieio",	X(31,854),	0xffffffff,  PPC,	PPCNONE,	{0}},
+ 
+ {"lfiwax",	X(31,855),	X_MASK,      POWER6,	PPCNONE,	{FRT, RA0, RB}},
+ 
 @@ -4638,8 +4638,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
  
  {"sthbrx",	X(31,918),	X_MASK,      COM,	PPCNONE,	{RS, RA0, RB}},
@@ -46743,22 +47206,62 @@
  
  {"sraq",	XRC(31,920,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
  {"sraq.",	XRC(31,920,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
-@@ -4801,12 +4801,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+@@ -4687,10 +4687,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
  
- {"psq_l",	OP(56),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
+ {"stxvd2x",	X(31,972),	XX1_MASK,    PPCVSX,	PPCNONE,	{XS6, RA, RB}},
  
-+{"lfdp",	OP(57),		OP_MASK,     POWER6,	POWER7,		{FRT, D, RA0}},
-+
- {"lfqu",	OP(57),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
++{"tlbld",	X(31,978),	XRTRA_MASK,  PPC,	PPC403|BOOKE,	{RB}},
+ {"tlbwehi",	XTLB(31,978,0),	XTLB_MASK,   PPC403,	PPCNONE,	{RT, RA}},
+ {"tlbwelo",	XTLB(31,978,1),	XTLB_MASK,   PPC403,	PPCNONE,	{RT, RA}},
+ {"tlbwe",	X(31,978),	X_MASK,   PPC403|BOOKE,	PPCNONE,	{RSO, RAOPT, SHO}},
+-{"tlbld",	X(31,978),	XRTRA_MASK,  PPC,	PPCNONE,	{RB}},
  
- {"psq_lu",	OP(57),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
+ {"stbcix",	X(31,981),	X_MASK,      POWER6,	PPCNONE,	{RS, RA0, RB}},
  
--{"lfdp",	OP(57),		OP_MASK,     POWER6,	POWER7,		{FRT, D, RA0}},
+@@ -4796,16 +4796,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"stfdu",	OP(55),		OP_MASK,     COM,	PPCNONE,	{FRS, D, RAS}},
+ 
+ {"lq",		OP(56),		OP_MASK,     POWER4,	PPCNONE,	{RTQ, DQ, RAQ}},
+-
+-{"lfq",		OP(56),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
+-
+ {"psq_l",	OP(56),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
+-
+-{"lfqu",	OP(57),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
 -
+-{"psq_lu",	OP(57),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
++{"lfq",		OP(56),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
+ 
+ {"lfdp",	OP(57),		OP_MASK,     POWER6,	POWER7,		{FRT, D, RA0}},
++{"psq_lu",	OP(57),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
++{"lfqu",	OP(57),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
+ 
  {"ld",		DSO(58,0),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RA0}},
  {"ldu",		DSO(58,1),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RAL}},
- {"lwa",		DSO(58,2),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RA0}},
-@@ -4921,10 +4921,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+@@ -4829,18 +4825,18 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"fsqrts",	A(59,22,0),    AFRAFRC_MASK, PPC,	PPCNONE,	{FRT, FRB}},
+ {"fsqrts.",	A(59,22,1),    AFRAFRC_MASK, PPC,	PPCNONE,	{FRT, FRB}},
+ 
+-{"fres",	A(59,24,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+-{"fres.",	A(59,24,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+ {"fres",	A(59,24,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"fres",	A(59,24,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+ {"fres.",	A(59,24,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"fres.",	A(59,24,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+ 
+ {"fmuls",	A(59,25,0),	AFRB_MASK,   PPC,	PPCNONE,	{FRT, FRA, FRC}},
+ {"fmuls.",	A(59,25,1),	AFRB_MASK,   PPC,	PPCNONE,	{FRT, FRA, FRC}},
+ 
+-{"frsqrtes",	A(59,26,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+-{"frsqrtes.",	A(59,26,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ {"frsqrtes",	A(59,26,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"frsqrtes",	A(59,26,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ {"frsqrtes.",	A(59,26,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"frsqrtes.",	A(59,26,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ 
+ {"fmsubs",	A(59,28,0),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
+ {"fmsubs.",	A(59,28,1),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
+@@ -4921,10 +4917,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
  {"fcfidus",	XRC(59,974,0),	XRA_MASK,    POWER7,	PPCNONE,	{FRT, FRB}},
  {"fcfidus.",	XRC(59,974,1),	XRA_MASK,    POWER7,	PPCNONE,	{FRT, FRB}},
  
@@ -46769,22 +47272,70 @@
  {"xxsldwi",	XX3(60,2),	XX3SHW_MASK, PPCVSX,	PPCNONE,	{XT6, XA6, XB6, SHW}},
  {"xxsel",	XX4(60,3),	XX4_MASK,    PPCVSX,	PPCNONE,	{XT6, XA6, XB6, XC6}},
  {"xxspltd",	XX3(60,10),	XX3DM_MASK,  PPCVSX,	PPCNONE,	{XT6, XA6, XB6S, DMEX}},
-@@ -5067,12 +5063,16 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+@@ -5067,11 +5059,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
  {"xvcvsxddp",	XX2(60,504),	XX2_MASK,    PPCVSX,	PPCNONE,	{XT6, XB6}},
  {"xvnegdp",	XX2(60,505),	XX2_MASK,    PPCVSX,	PPCNONE,	{XT6, XB6}},
  
 -{"psq_stu",	OP(61),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
-+{"stfq",	OP(60),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
- 
+-
 -{"stfqu",	OP(61),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
 +{"psq_st",	OP(60),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
++{"stfq",	OP(60),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
  
  {"stfdp",	OP(61),		OP_MASK,     POWER6,	PPCNONE,	{FRT, D, RA0}},
- 
-+{"stfqu",	OP(61),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
-+
 +{"psq_stu",	OP(61),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
-+
++{"stfqu",	OP(61),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
+ 
  {"std",		DSO(62,0),	DS_MASK,     PPC64,	PPCNONE,	{RS, DS, RA0}},
  {"stdu",	DSO(62,1),	DS_MASK,     PPC64,	PPCNONE,	{RS, DS, RAS}},
- {"stq",		DSO(62,2),	DS_MASK,     POWER4,	PPCNONE,	{RSQ, DS, RA0}},
+@@ -5122,20 +5115,20 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ {"fsel",	A(63,23,0),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
+ {"fsel.",	A(63,23,1),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
+ 
+-{"fre",		A(63,24,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+-{"fre.",	A(63,24,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ {"fre",		A(63,24,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"fre",		A(63,24,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ {"fre.",	A(63,24,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"fre.",	A(63,24,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ 
+ {"fmul",	A(63,25,0),	AFRB_MASK,   PPCCOM,	PPCNONE,	{FRT, FRA, FRC}},
+ {"fm",		A(63,25,0),	AFRB_MASK,   PWRCOM,	PPCNONE,	{FRT, FRA, FRC}},
+ {"fmul.",	A(63,25,1),	AFRB_MASK,   PPCCOM,	PPCNONE,	{FRT, FRA, FRC}},
+ {"fm.",		A(63,25,1),	AFRB_MASK,   PWRCOM,	PPCNONE,	{FRT, FRA, FRC}},
+ 
+-{"frsqrte",	A(63,26,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+-{"frsqrte.",	A(63,26,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+ {"frsqrte",	A(63,26,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"frsqrte",	A(63,26,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+ {"frsqrte.",	A(63,26,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
++{"frsqrte.",	A(63,26,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
+ 
+ {"fmsub",	A(63,28,0),	A_MASK,      PPCCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
+ {"fms",		A(63,28,0),	A_MASK,      PWRCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
+@@ -5195,10 +5188,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ 
+ {"dcmpoq",	X(63,130),	X_MASK,      POWER6,	PPCNONE,	{BF, FRA, FRB}},
+ 
+-{"mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
+ {"mtfsfi",  XRC(63,134,0), XWRA_MASK|(3<<21)|(1<<11), POWER6, PPCNONE,	{BFF, U, W}},
+-{"mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
++{"mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
+ {"mtfsfi.", XRC(63,134,1), XWRA_MASK|(3<<21)|(1<<11), POWER6, PPCNONE,	{BFF, U, W}},
++{"mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
+ 
+ {"fnabs",	XRC(63,136,0),	XRA_MASK,    COM,	PPCNONE,	{FRT, FRB}},
+ {"fnabs.",	XRC(63,136,1),	XRA_MASK,    COM,	PPCNONE,	{FRT, FRB}},
+@@ -5254,10 +5247,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
+ 
+ {"dtstsfq",	X(63,674),	X_MASK,      POWER6,	PPCNONE,	{BF, FRA, FRB}},
+ 
+-{"mtfsf",	XFL(63,711,0),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
+ {"mtfsf",	XFL(63,711,0),	XFL_MASK,    POWER6,	PPCNONE,	{FLM, FRB, XFL_L, W}},
+-{"mtfsf.",	XFL(63,711,1),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
++{"mtfsf",	XFL(63,711,0),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
+ {"mtfsf.",	XFL(63,711,1),	XFL_MASK,    POWER6,	PPCNONE,	{FLM, FRB, XFL_L, W}},
++{"mtfsf.",	XFL(63,711,1),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
+ 
+ {"drdpq",	XRC(63,770,0),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRB}},
+ {"drdpq.",	XRC(63,770,1),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRB}},


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- gdb.spec	5 Apr 2009 20:34:21 -0000	1.338
+++ gdb.spec	5 Apr 2009 21:02:55 -0000	1.339
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 14%{?_with_upstream:.upstream}%{?dist}
+Release: 15%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -851,6 +851,11 @@
 %endif
 
 %changelog
+* Sun Apr  5 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-15
+- Archer update to the snapshot: 7c7c77576669d17ad5072daa47ea3a4fd954483d
+- Archer backport: 7c7c77576669d17ad5072daa47ea3a4fd954483d (Peter Bergner)
+  - Disassemble Power7 instructions right in the default/only -Many GDB mode.
+
 * Sun Apr  5 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-14
 - Archer update to the snapshot: f6273d446ff87e50976600ba3f71b88d61043e20
 - Archer backport: f6273d446ff87e50976600ba3f71b88d61043e20



From rathann at fedoraproject.org  Sun Apr  5 21:40:40 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  5 Apr 2009 21:40:40 +0000 (UTC)
Subject: rpms/raidutils/devel raidutils-rpm.patch, NONE, 1.1 raidutils.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090405214040.9136F7011F@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/raidutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27005

Modified Files:
	.cvsignore sources 
Added Files:
	raidutils-rpm.patch raidutils.spec 
Log Message:
initial import into devel branch


raidutils-rpm.patch:

--- NEW FILE raidutils-rpm.patch ---
diff -upwbB raidutils-0.0.6/include/device.hh.r raidutils-0.0.6/include/device.hh
--- raidutils-0.0.6/include/device.hh.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/device.hh	2008-09-12 13:41:58.000000000 +0200
@@ -27,6 +27,14 @@
  */
 
 // Data unique to every engine device
+
+
+// use PACK for things that should be packed;
+// PACK_A for things that you'd like packed by would give a
+// warning on anything except an ARM if actually packed; and
+// PACK_WAS if it used to be packed by this gave warnings
+// everywhere so now it isn't.
+
 #undef PACK
 #if (defined(__GNUC__))
 # define PACK __attribute__ ((packed))
@@ -34,11 +42,17 @@
 #define PACK
 #endif
 
+#ifdef __arm__
+# define PACK_A PACK
+#else
+# define PACK_A
+#endif
+
 uSHORT		scsiOffset;	// 0=Async mode
 				// Non-zero = SCSI offset
 uSHORT		xfrSpeed;	// SCSI transfer speed
-dptCcapacity_S	capacity PACK;	// Device capacity
-dptCemuParam_S	emulation PACK;	// Emulated drive parameters
+dptCcapacity_S	capacity PACK_A;	// Device capacity
+dptCemuParam_S	emulation PACK_A;	// Emulated drive parameters
   // DPT specific name (ASCII string)
   // (Up to 8 valid chars + NULL terminator + 1)
 uCHAR		dptName[DPT_NAME_SIZE+2];
diff -upwbB raidutils-0.0.6/include/get_info.h.r raidutils-0.0.6/include/get_info.h
--- raidutils-0.0.6/include/get_info.h.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/get_info.h	2008-09-12 13:41:58.000000000 +0200
@@ -364,6 +364,12 @@ const uLONG DPT_ENGINE_COMPATIBILITY   =
    #include    "device.hh"
    #include    "raid_dev.hh"
 
+     // use PACK for things that should be packed;
+     // PACK_A for things that you'd like packed by would give a
+     // warning on anything except an ARM if actually packed; and
+     // PACK_WAS if it used to be packed by this gave warnings
+     // everywhere so now it isn't.
+
 #undef PACK
 #if (defined(__GNUC__))
 # define PACK __attribute__ ((packed))
@@ -371,6 +377,14 @@ const uLONG DPT_ENGINE_COMPATIBILITY   =
 #define PACK
 #endif
 
+#ifdef __arm__
+# define PACK_A PACK
+#else
+# define PACK_A
+#endif
+
+#define PACK_WAS
+
    uSHORT flags2;        // Supplemental flags word
    uSHORT hbaIndex; // HBA index # (slot #)
    uSHORT hbaFlags; // HBA flags - see bit definitions below
@@ -381,8 +395,8 @@ const uLONG DPT_ENGINE_COMPATIBILITY   =
    uLONG  hbaTag    PACK;     // Reserved for future expansion
    uLONG  flags3    PACK;     // Miscellaneous flags - see bit definitions above
    uSHORT busSpeed  PACK;     // Negotiated bus speed (in Mhz)
-   uCHAR  p2Flags   PACK;     // Path 2 flags - see bit definitions above
-   uCHAR  reserved4 PACK;     // Reserved for future expansion
+   uCHAR  p2Flags   PACK_WAS;	// Path 2 flags - see bit definitions above
+   uCHAR  reserved4 PACK_WAS;	// Reserved for future expansion
    uLONG  availableCapacity PACK;     // Reserved for future expansion
 
    uCHAR  udmaModeSupported;// The maximum UDMA mode supported
diff -upwbB raidutils-0.0.6/include/hba.hh.r raidutils-0.0.6/include/hba.hh
--- raidutils-0.0.6/include/hba.hh.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/hba.hh	2008-09-12 13:41:58.000000000 +0200
@@ -34,13 +34,13 @@
 #define PACK
 #endif
 
-   dptIOaddr_U ioAddr PACK;             // EISA/ISA/PCI address
+   dptIOaddr_U ioAddr PACK_A;             // EISA/ISA/PCI address
    uSHORT drvrRefNum;         // Number by which the driver ref-
 					// erences this HBA
 #if defined (_DPT_STRICT_ALIGN)
    uSHORT sniAdjust4;
 #endif
-   dptHBAid_U  id PACK;       // EISA = ID PAL bytes
+   dptHBAid_U  id PACK_A;       // EISA = ID PAL bytes
 					// ISA = Not used
 					// PCI = vendor ID, product ID
    uSHORT drqNum;             // DRQ # (0,5,6,7,0xffff=invalid)
@@ -80,7 +80,7 @@
    uCHAR  raidID;        // Software selectable RAID ID #
    uCHAR  slotID;        // Slot specific RAID ID #
 
-   dptChanInfo_S chanInfo[NUM_CHAN_INFO] PACK; // SCSI channel info (multi-channel boards)
+   dptChanInfo_S chanInfo[NUM_CHAN_INFO] PACK_A; // SCSI channel info (multi-channel boards)
 
    uCHAR  excludeStart;
    uCHAR  excludeEnd;
diff -upwbB raidutils-0.0.6/include/linux/i2o-dev.h.r raidutils-0.0.6/include/linux/i2o-dev.h
--- raidutils-0.0.6/include/linux/i2o-dev.h.r	2005-01-24 10:25:21.000000000 +0100
+++ raidutils-0.0.6/include/linux/i2o-dev.h	2008-09-12 13:41:58.000000000 +0200
@@ -24,7 +24,6 @@
 /* How many controllers are we allowing */
 #define MAX_I2O_CONTROLLERS	32
 
-#include <linux/compiler.h>
 
 #ifndef __KERNEL__
 
diff -upwbB raidutils-0.0.6/include/mgr.hh.r raidutils-0.0.6/include/mgr.hh
--- raidutils-0.0.6/include/mgr.hh.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/mgr.hh	2008-09-12 13:41:58.000000000 +0200
@@ -34,8 +34,8 @@
 #define PACK
 #endif
 
-   dptCaddr_S	maxAddr PACK;	// Maximum physical address supported
-   dptCaddr_S	minAddr PACK;	// Minimum physical address supported
+   dptCaddr_S	maxAddr PACK_A;	// Maximum physical address supported
+   dptCaddr_S	minAddr PACK_A;	// Minimum physical address supported
 
 // RAID manager information (Ignore if not a RAID manager)
 
diff -upwbB raidutils-0.0.6/lib/engcalls.cpp.r raidutils-0.0.6/lib/engcalls.cpp
--- raidutils-0.0.6/lib/engcalls.cpp.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/lib/engcalls.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -987,7 +987,7 @@ char *AllocBuffers(uLONG toEngSize, uLON
 
   /* The Attach Failed, So DeAllocate The Shared Memory */
 
-        if((int)SharedMemoryPtr == -1)
+        if((long)SharedMemoryPtr == -1)
           {
             shmctl(BufferID,IPC_RMID,&shm_buff);
             SharedMemoryPtr = NULL;
diff -upwbB raidutils-0.0.6/lib/engmsg.c.r raidutils-0.0.6/lib/engmsg.c
--- raidutils-0.0.6/lib/engmsg.c.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/lib/engmsg.c	2008-09-12 13:41:58.000000000 +0200
@@ -152,7 +152,7 @@ int MessageDPTEngine(int EngineMsgKey,in
      //
      // Send off the message to the engine
      //
-     if(i = msgsnd(msqID,(struct msgbuf *)&HdrBuff,MsgDataSize,0) != -1)
+     if((i = msgsnd(msqID,(struct msgbuf *)&HdrBuff,MsgDataSize,0)) != -1)
       {
         //
         // Let's set up a little loop here receiving messages in case
diff -upwbB raidutils-0.0.6/lib/lockunix.c.r raidutils-0.0.6/lib/lockunix.c
--- raidutils-0.0.6/lib/lockunix.c.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/lib/lockunix.c	2008-09-12 13:43:22.000000000 +0200
@@ -30,6 +30,7 @@
  * UNIX locking mechanism
  */
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -82,7 +83,7 @@ MkLock (char * name)
 		return (-1);
 	}
 	sprintf (templateBuffer, Template, Name);
-	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
+	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR)) < 0) {
 		free (templateBuffer);
 		free (lock);
 		return (-1);
@@ -152,7 +153,7 @@ ChLock (char * name, int pid)
 
 	if (lock != (char *)NULL) {
 		sprintf (lock, Lock, Name);
-	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC)) >= 0) {
+	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR)) >= 0) {
 			sprintf (buffer, "%d\n", pid);
 			write (fd, buffer, strlen(buffer));
 			close (fd);
diff -upwbB raidutils-0.0.6/raideng/connect.hpp.r raidutils-0.0.6/raideng/connect.hpp
--- raidutils-0.0.6/raideng/connect.hpp.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/connect.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -189,7 +189,7 @@ public:
 
 // Constructor/Destructor.............................
 
-			dptSCSIcon_C::dptSCSIcon_C();
+			dptSCSIcon_C();
 
 // Message Handlers...................................
 
diff -upwbB raidutils-0.0.6/raideng/eng_unix.cpp.r raidutils-0.0.6/raideng/eng_unix.cpp
--- raidutils-0.0.6/raideng/eng_unix.cpp.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/raideng/eng_unix.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -491,7 +491,7 @@ main(int argc, char *argv[])
 
   /* Make Sure That We Could Attach */
 
-            if((int)toEng_P != -1)
+            if((long)toEng_P != -1)
               {
                  fromEng_P = toEng_P + HdrBuff.FromEngBuffOffset;
 
@@ -909,7 +909,7 @@ void DisplayHelp(void)
 #else
 void DisplayHelp(void)
   {
-    printf("The Pramaters For This Program Are :\n");
+    printf("The Parameters For This Program Are :\n");
     printf(
 "  /VERBOSE            :  Display All Connection And Message Information\n");
     printf(
diff -upwbB raidutils-0.0.6/raideng/i2odep.h.r raidutils-0.0.6/raideng/i2odep.h
--- raidutils-0.0.6/raideng/i2odep.h.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/i2odep.h	2008-09-12 13:41:58.000000000 +0200
@@ -203,7 +203,7 @@ typedef unsigned char BOOL;
 # define _F_set12bit4(w,x,y,z,u) ((w)->z = (u))
 # define _F_get16bit(w,x,y,z)    ((U16)((w)->z))
 # define _F_set16bit(w,x,y,z,u)  ((w)->z = (u))
-#elif (defined(_DPT_BIG_ENDIAN))
+#elif (defined(_DPT_BIG_ENDIAN) || defined(sparc))
 /* First 12 bits */
 # define _F_getTID(w,x,y)     getL12bit(w,x,0)
 # define _F_setTID(w,x,y,z)   setL12bit(w,x,0,z)
diff -upwbB raidutils-0.0.6/raideng/osd_unix.cpp.r raidutils-0.0.6/raideng/osd_unix.cpp
--- raidutils-0.0.6/raideng/osd_unix.cpp.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/osd_unix.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -164,6 +164,10 @@ typedef struct dpt_scsi_ha      HbaInfo;
 #define TO_LOGGER_BUFFER_SIZE    0x1000
 #define FROM_LOGGER_BUFFER_SIZE  0x10000
 
+/* Definitions - Device names -----------------------------------------------*/
+
+char *DEV_CTL = "/dev/i2octl";	// formerly /dev/i2o/ctl
+
 /* Function Prototypes ------------------------------------------------------*/
 
 DPT_RTN_T osdIOrequest(uSHORT ioMethod);
@@ -374,6 +378,17 @@ DPT_RTN_T osdIOrequest(uSHORT ioMethod)
 
    if(ioMethod==DPT_IO_PASS_THRU)
      {
+       // make sure the device entry represents an active device and not
+       // just a device file that was probed without actually finding a
+       // device, so we don't wait 20 seconds trying to connect to 
+       // it...
+       if(DefaultHbaDev->Flags == 0 )
+         {
+           FormatTimeString(TimeString,time(0));
+           printf("\nosdIDrequest   : %s Fatal error, DefaultHbaDev does not point to an active controller.\n", TimeString);
+           fflush(stdout);
+         }
+       else {
 
   /* Try To Open The First Adapter Device */
 
@@ -401,6 +416,7 @@ DPT_RTN_T osdIOrequest(uSHORT ioMethod)
        else printf("\nosdIOrequest : File %s Could Not Be Opened",
                      DefaultHbaDev->NodeName);
      }
+     }
    if(Verbose)
         printf("\nosdIOrequest   : Return = %x",retVal);
    return(retVal);
@@ -501,6 +517,15 @@ DPT_RTN_T osdOpenEngine(void)
    retVal = MSG_RTN_COMPLETED;
    NumHBAs = BuildNodeNameList();
 
+   // If there are no HBAs found, abort with an explict error message.
+   if(NumHBAs == 0)
+     {
+     FormatTimeString(TimeString,time(0));
+     printf("\nosdOpenEngine  : %s Fatal error, no active controller device files found.\n", TimeString);
+     retVal = MSG_RTN_FAILED;
+     fflush(stdout);
+     }
+
    if(Verbose)
      {
         FormatTimeString(TimeString,time(0));
@@ -1232,7 +1257,7 @@ DPT_RTN_T osdSendMessage(uLONG HbaNum, P
 #elif defined (_DPT_SCO) || defined (SNI_MIPS) || defined(_DPT_SOLARIS) || defined(_DPT_BSDI) || defined(_DPT_FREE_BSD) || defined(_DPT_LINUX)
 
 #if defined(_DPT_LINUX_I2O)
-		     if(strcmp(HbaDevs[HbaNum].NodeName, "/dev/i2o/ctl"))
+		     if(strcmp(HbaDevs[HbaNum].NodeName, DEV_CTL))
                         i = ioctl(FileID,I2OUSRCMD,IoctlBuffer_P);
 		     else {
                         struct i2o_cmd_passthru pt;
@@ -2144,7 +2169,7 @@ DPT_RTN_T osdGetCtlrs(uSHORT ioMethod,uS
                        i = 0;
                 }
 #elif defined(_DPT_LINUX_I2O)
-                if(strcmp(HbaDevs[Count].NodeName, "/dev/i2o/ctl"))
+                if(strcmp(HbaDevs[Count].NodeName, DEV_CTL))
                    i = osdSendIoctl(&HbaDevs[Count],DPT_CTRLINFO,DataBuff,&pkt);
 		else {
 		   /*
@@ -2367,7 +2392,7 @@ DPT_RTN_T osdGetSysInfo(sysInfo_S *SysIn
        SysInfo_P->busType = SI_PCI_BUS;
        SysInfo_P->processorFamily = PROC_INTEL;
        buffer_size = sysinfo(SI_ARCHITECTURE, buffer_ptr, 0);
-       buffer_ptr = (char *)malloc((int)buffer_size);
+       buffer_ptr = (char *)malloc((size_t)buffer_size);
        status = sysinfo(SI_ARCHITECTURE, buffer_ptr, buffer_size);
        if (status != -1)
         {
@@ -2647,7 +2672,7 @@ int BufferAlloc(uLONG toLoggerSize, char
 
   /* The Attach Failed, So DeAllocate The Shared Memory */
 
-            if((int)SharedMemoryPtr == -1)
+            if((long)SharedMemoryPtr == -1)
               {
                 Rtnval = 1;
                 shmctl(BufferID,IPC_RMID,&shm_buff);
@@ -2782,7 +2807,7 @@ int BufferAlloc(uLONG toLoggerSize, char
         toLoggerTotalSize = toLoggerSize + sizeof(dptBuffer_S);
         fromLoggerTotalSize = fromEngSize + sizeof(dptBuffer_S);
         FromLoggerBuffOffset = toLoggerTotalSize;
-        Ptr = (char *)malloc((uINT)(toLoggerTotalSize + fromLoggerTotalSize));
+        Ptr = (char *)malloc((size_t)(toLoggerTotalSize + fromLoggerTotalSize));
         if(Ptr != NULL)
           {
             *toLogger_P_P = Ptr;
@@ -3421,7 +3446,7 @@ void *osdAllocIO(uLONG size)
  {
    void *Rtnval;
 
-   Rtnval = (void *)malloc((uINT)size);
+   Rtnval = (void *)malloc((size_t)size);
    if(Verbose)
      {
        FormatTimeString(TimeString,time(0));
@@ -3743,16 +3768,56 @@ uSHORT BuildNodeNameList(void)
    NumEntries = 0;
 
 #  if (defined(_DPT_LINUX_I2O))
+   uCHAR LinuxI2ODataBuff[MAX_I2O_CONTROLLERS];
+
    memset(&pkt, 0, sizeof(EATA_CP));
    HbaDevs[NumEntries].Flags = 0;
-   strcpy(HbaDevs[NumEntries].NodeName, "/dev/i2o/ctl");
-   IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries], I2OGETIOPS, (uCHAR *)&NumEntries, &pkt);
+   strcpy(HbaDevs[NumEntries].NodeName, DEV_CTL);
+   IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries], I2OGETIOPS, LinuxI2ODataBuff, &pkt);
    if(!IoctlRtn) {
-     for(i = 0; i < NumEntries; i ++) {
-       HbaDevs[i].Flags = NODE_FILE_VALID_HBA_B | NODE_FILE_I2O_HBA_B;
-       HbaDevs[i].IoAddress = UINTPTR_MAX;
-       strcpy(HbaDevs[i].NodeName, "/dev/i2o/ctl");
+     // step through the returned data buffer and look for the 
+     // non-zero entries, which indicate an active IOP.  For each
+     // one we find, add a corresponding entry in HbaDevs.
+     for(i = 0; i < MAX_I2O_CONTROLLERS; i ++) {
+       if ( LinuxI2ODataBuff[i] != 0  ) 
+        {
+          if(NumEntries >= MAX_HAS)
+           {
+             FormatTimeString(TimeString,time(0));
+
+             printf("\nBuildNodeNameList  : %s Warning: Found more than %d Linux I2O Controlers; ignoring those that won't fit in the HbaDevs array.",
+                    TimeString, MAX_HAS);
+
+             fflush(stdout);
+             break;
+            }
+          if(Verbose)
+            {
+              FormatTimeString(TimeString,time(0));
+
+              printf("\nBuildNodeNameList  : %s Found Linux I2O Controler, using %s device file for utility-relative controller number %d.",
+                     TimeString, DEV_CTL, NumEntries);
+
+              fflush(stdout);
+            }
+
+          HbaDevs[NumEntries].Flags = NODE_FILE_VALID_HBA_B | NODE_FILE_I2O_HBA_B;
+          HbaDevs[NumEntries].IoAddress = UINTPTR_MAX;
+          strcpy(HbaDevs[NumEntries].NodeName, DEV_CTL);
+
+          ++NumEntries;
+        }
+       else {
+              // for now, we'll assume that all the active IOP entries
+              // are at the front of the returned buffer.  In order to
+              // support "gaps", we'd need to record the IOP index in the
+              // NodeFiles_S structure and use that instead of HbaNum when
+              // we call the I2OPASSTHRU ioctl (or make sure that
+              // everything that looks at HbaDevs can handle inactive
+              // entries in the middle of the array).
+              break;
      }
+     } // for(i = 0; i < MAX_I2O_CONTROLLERS; i ++) 
    }
 #  endif
 
diff -upwbB raidutils-0.0.6/raideng/raid.h.r raidutils-0.0.6/raideng/raid.h
--- raidutils-0.0.6/raideng/raid.h.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/raideng/raid.h	2008-09-12 13:41:58.000000000 +0200
@@ -271,7 +271,7 @@ struct raidDef_S : public raidDefinition
 
 // Constructor/Destructor.............................
 
-			raidDef_S::raidDef_S();
+			raidDef_S();
 
 };
 #endif  // c++
diff -upwbB raidutils-0.0.6/raideng/unreslvd.cpp.r raidutils-0.0.6/raideng/unreslvd.cpp
--- raidutils-0.0.6/raideng/unreslvd.cpp.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/unreslvd.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -34,7 +34,7 @@ extern "C"
    char *__nw__FUi(int size)
    {
         char *p;
-        p = (char *)malloc(size);          
+        p = (char *)malloc((size_t)size);
         return(p);
    }
 
diff -upwbB raidutils-0.0.6/raidutil/alarm.hpp.r raidutils-0.0.6/raidutil/alarm.hpp
--- raidutils-0.0.6/raidutil/alarm.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/alarm.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -58,7 +58,7 @@ enum AlarmCommand { None, On, Off, Enabl
 class AlarmStatus:public Command
 	{
 	public:
-		AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );							
+		AlarmStatus( int hba, AlarmCommand cmd );
 		AlarmStatus( const AlarmStatus &new_AlarmStatus );
 		virtual	~AlarmStatus();
 		AlarmStatus	&operator = ( AlarmStatus &right );
diff -upwbB raidutils-0.0.6/raidutil/command.cpp.r raidutils-0.0.6/raidutil/command.cpp
--- raidutils-0.0.6/raidutil/command.cpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/command.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -2237,13 +2237,14 @@ void Command::MakeArrayOptimal(DPT_TAG_T
 }
 
 
-#ifdef sparc
-# define VOLATILE volatile
-#else
-# define VOLATILE
-#endif
-
-extern "C" { VOLATILE void exit (int);}
+//// Comment out this stuff, for Debian.
+// #ifdef sparc
+// # define VOLATILE volatile
+// #else
+// # define VOLATILE
+// #endif
+//
+// extern "C" { VOLATILE void exit (int);}
 
 void Command::Init_Engine(int scanHbasOnly)
 {
diff -upwbB raidutils-0.0.6/raidutil/eventlog.hpp.r raidutils-0.0.6/raidutil/eventlog.hpp
--- raidutils-0.0.6/raidutil/eventlog.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/eventlog.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -77,7 +77,7 @@ class EventLog:public Command
 	{
 
 	public:
-		EventLog::EventLog(SCSI_Addr_List *deviceList, 
+		EventLog(SCSI_Addr_List *deviceList,
             EventLogOptions cmd);
 		EventLog(const EventLog &new_EventLog);
 		virtual	~EventLog();
diff -upwbB raidutils-0.0.6/raidutil/expand.hpp.r raidutils-0.0.6/raidutil/expand.hpp
--- raidutils-0.0.6/raidutil/expand.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/expand.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -55,7 +55,7 @@
 class Expand:public Command
 {
    public:
-      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
+		Expand (SCSI_Address raid, SCSI_Addr_List *list);
 		Expand (const Expand &new_Expand);
 		virtual ~Expand();
 		Expand &operator = (Expand &right);
diff -upwbB raidutils-0.0.6/raidutil/forcest.hpp.r raidutils-0.0.6/raidutil/forcest.hpp
--- raidutils-0.0.6/raidutil/forcest.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/forcest.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -65,7 +65,7 @@ enum ForceStateOptions { Optimal, Fail, 
 class ForceState:public Command
 	{
 	public:
-		ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
+		ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
 		ForceState(const ForceState &new_ForceState);
 		virtual	~ForceState();
 
diff -upwbB raidutils-0.0.6/raidutil/namarray.hpp.r raidutils-0.0.6/raidutil/namarray.hpp
--- raidutils-0.0.6/raidutil/namarray.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/namarray.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -58,7 +58,7 @@ class NameArray:public Command
 {
 
 	public:
-		NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
+		NameArray(SCSI_Address arrayToName, char *arrayName);
 		NameArray(const NameArray &new_NameArray);
 		virtual	~NameArray();
 
diff -upwbB raidutils-0.0.6/raidutil/parser.cpp.r raidutils-0.0.6/raidutil/parser.cpp
--- raidutils-0.0.6/raidutil/parser.cpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/parser.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -730,6 +730,7 @@ DELETE_HOT_SPARE:
                     {
                              EventLog *temp = new EventLog (components, eventLogOpts);
                              cmd_List->add_Item (*temp);
+                             delete temp;
                     }
                     else
                         Error_in_Parsing(EventStrings[STR_PARSE_ERR_MUST_SPECIFY_ADDRESS], this_Commands_Text);
diff -upwbB raidutils-0.0.6/raidutil/rmwflash.hpp.r raidutils-0.0.6/raidutil/rmwflash.hpp
--- raidutils-0.0.6/raidutil/rmwflash.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/rmwflash.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ class RMWFlash:public Command
 {
 
         public:
-                RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
+                RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
                 RMWFlash(const RMWFlash &new_RMWFlash);
                 virtual ~RMWFlash();
 
diff -upwbB raidutils-0.0.6/raidutil/segment.hpp.r raidutils-0.0.6/raidutil/segment.hpp
--- raidutils-0.0.6/raidutil/segment.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/segment.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -51,7 +51,7 @@ class arraySegment:public Command
 {
 
 	public:
-		arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
+		arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
 		arraySegment(const arraySegment &new_arraySegment);
 		virtual	~arraySegment();
 
diff -upwbB raidutils-0.0.6/raidutil/setcache.hpp.r raidutils-0.0.6/raidutil/setcache.hpp
--- raidutils-0.0.6/raidutil/setcache.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/setcache.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -55,7 +55,7 @@
 class SetCache:public Command
 	{
 	public:
-		SetCache::SetCache(
+		SetCache(
 				SCSI_Addr_List	*addresses,		// a list of addresses
 				int				on,				// Whether to enable or disable
 				int				rw				// Read or write cacheing.
diff -upwbB raidutils-0.0.6/raidutil/setrate.hpp.r raidutils-0.0.6/raidutil/setrate.hpp
--- raidutils-0.0.6/raidutil/setrate.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/setrate.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,8 +59,8 @@ class SetRate: public Command
 	public:
 
 		// Set the (global) rebuild rate
-        SetRate::SetRate(int rate, SCSI_Addr_List *objs);
-        SetRate::SetRate(const SetRate &right);
+		SetRate(int rate, SCSI_Addr_List *objs);
+		SetRate(const SetRate &right);
 		virtual	~SetRate();
 
 		Dpt_Error execute(String_List **output);
diff -upwbB raidutils-0.0.6/raidutil/setscfg.hpp.r raidutils-0.0.6/raidutil/setscfg.hpp
--- raidutils-0.0.6/raidutil/setscfg.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/setscfg.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ class setscfg:public Command
 {
 
 	public:
-		setscfg::setscfg();
+		setscfg();
 		virtual	~setscfg();
 
 		Dpt_Error execute(String_List **output);
diff -upwbB raidutils-0.0.6/raidutil/taskctrl.hpp.r raidutils-0.0.6/raidutil/taskctrl.hpp
--- raidutils-0.0.6/raidutil/taskctrl.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/taskctrl.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ enum TaskCommandOptions { List, Build, R
 class TaskControl:public Command
 	{
 	public:
-		TaskControl::TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
+		TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
 		TaskControl(const TaskControl &new_TaskControl);
 		virtual	~TaskControl();
 
diff -upwbB raidutils-0.0.6/raidutil/uartdmp.hpp.r raidutils-0.0.6/raidutil/uartdmp.hpp
--- raidutils-0.0.6/raidutil/uartdmp.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/uartdmp.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ class UartDmp:public Command
 {
 
 	public:
-		UartDmp::UartDmp(int hbaNo, char *fileName);
+		UartDmp(int hbaNo, char *fileName);
 		UartDmp(const UartDmp &new_UartDmp);
 		virtual	~UartDmp();
 
diff -upwbB raidutils-0.0.6/raidutil/zap.hpp.r raidutils-0.0.6/raidutil/zap.hpp
--- raidutils-0.0.6/raidutil/zap.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/zap.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -55,7 +55,7 @@
 class Zap:public Command
 	{
 	public:
-		Zap::Zap(
+		Zap(
 				SCSI_Addr_List	*addresses,  // a list of addresses
             int resync = 0            // (send reset to hba or not)
       );								         // to delete raid tables on


--- NEW FILE raidutils.spec ---
Summary: Utilities to manage Adaptec I2O compliant RAID controllers
Name: raidutils
Version: 0.0.6
Release: 2%{?dist}
License: BSD
Group: Applications/System
URL: http://i2o.shadowconnect.com/
Source: http://i2o.shadowconnect.com/raidutils/%{name}-%{version}.tar.bz2
# based on http://ftp.de.debian.org/debian/pool/main/r/raidutils/raidutils_0.0.6-8.diff.gz
Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)

%description
The raidutils program allow the user to manage the Adaptec I2O compliant RAID
controllers. It can, for example, create/delete an RAID array, add/remove a hot
spare drive to/from a RAID array, activate/silence the alarm or get information
about the status of the RAID array and disks.

%prep
%setup -q
%patch0 -p1 -b .r

%build
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
rm %{buildroot}%{_libdir}/libraidutil.{la,so}

%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig/modules

cat << __EOF__ >> %{buildroot}%{_sysconfdir}/sysconfig/modules/raidutils.modules
#!/bin/sh
modprobe i2o_config >/dev/null 2>&1
__EOF__
chmod 755 %{buildroot}%{_sysconfdir}/sysconfig/modules/raidutils.modules

%clean
%{__rm} -rf %{buildroot}

%post
/sbin/ldconfig
modprobe i2o_config >/dev/null 2>&1 || :

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_sysconfdir}/sysconfig/modules/raidutils.modules
%{_bindir}/raidutil
%{_bindir}/raideng
%{_libdir}/libraidutil.so.*

%changelog
* Wed Dec 31 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.6-2
- added i2o_config module autoloading
- drop redundant BR: gcc-c++

* Fri Sep 12 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.6-1
- adapted for Fedora/EPEL
- disabled building static library
- extracted relevant bits from Debian patch
- fixed build with recent glibc

* Thu Jun 08 2006 Stephan Lauffer <lauffer at ph-freiburg.de>
- patch raidutils-gcc++-4.1-patch.diff fixes compiler errors with gcc-c++-4.1.0
  This patch is taken from the fix in http://bugs.debian.org/356366
* Mon Jan 24 2005 Markus Lidel <Markus.Lidel at shadowconnect.com>
- New version for FC3.
* Wed May 18 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- Compiled with new kernel interface.
* Wed May 05 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- Changed recognition of I2O pass-thru option availability.
- Now raidutils use the right headers if using gcc version 3.3.
* Mon May 03 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- Cleaned up RPM regarding the guideline of Anvil, warren and mschwendt. Many
  thanks to them.
* Sun May 02 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- first version with SPEC file to build a rpm.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/raidutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2009 17:33:19 -0000	1.1
+++ .cvsignore	5 Apr 2009 21:40:10 -0000	1.2
@@ -0,0 +1 @@
+raidutils-0.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/raidutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2009 17:33:20 -0000	1.1
+++ sources	5 Apr 2009 21:40:10 -0000	1.2
@@ -0,0 +1 @@
+d32ed6789a11dca51cbc6d4428e26d8b  raidutils-0.0.6.tar.bz2



From mclasen at fedoraproject.org  Sun Apr  5 22:27:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 22:27:14 +0000 (UTC)
Subject: rpms/tomboy/devel tomboy.spec,1.110,1.111
Message-ID: <20090405222714.88A6C7011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6670

Modified Files:
	tomboy.spec 
Log Message:
Split of a devel package



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- tomboy.spec	17 Mar 2009 02:30:51 -0000	1.110
+++ tomboy.spec	5 Apr 2009 22:26:43 -0000	1.111
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.14.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -44,6 +44,12 @@
 It lets you organise your notes intelligently by allowing you to easily link
 ideas together with Wiki style interconnects.
 
+%package devel
+Summary: Support for developing addings for tomboy
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper
@@ -125,15 +131,19 @@
 %{_bindir}/tomboy-panel
 %{_libdir}/%{name}/*
 %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
-%{_libdir}/pkgconfig/*.pc
 %{_datadir}/dbus-1/services/org.gnome.Tomboy.service
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/tomboy
 %{_datadir}/icons/hicolor/*/apps/tomboy.*
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
+%files devel
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.0-2
+- Split off a silly one-file devel package (#476251)
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.0-1
 - Update to 0.14.0
 



From mclasen at fedoraproject.org  Sun Apr  5 22:30:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 22:30:25 +0000 (UTC)
Subject: rpms/tomboy/devel tomboy.spec,1.111,1.112
Message-ID: <20090405223025.23C707011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7511

Modified Files:
	tomboy.spec 
Log Message:
Fix spec



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- tomboy.spec	5 Apr 2009 22:26:43 -0000	1.111
+++ tomboy.spec	5 Apr 2009 22:29:54 -0000	1.112
@@ -50,6 +50,10 @@
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
+%description devel
+Tomboy is a desktop note-taking application. This package allows you
+to develop addins that add new functionality to tomboy.
+
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper



From mclasen at fedoraproject.org  Sun Apr  5 22:43:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 22:43:08 +0000 (UTC)
Subject: rpms/bluecurve-xmms-skin/devel bluecurve-xmms-skin.spec,1.2,1.3
Message-ID: <20090405224308.82E777011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/bluecurve-xmms-skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11250

Modified Files:
	bluecurve-xmms-skin.spec 
Log Message:
Drop xmms dependency



Index: bluecurve-xmms-skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluecurve-xmms-skin/devel/bluecurve-xmms-skin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bluecurve-xmms-skin.spec	24 Feb 2009 05:13:50 -0000	1.2
+++ bluecurve-xmms-skin.spec	5 Apr 2009 22:42:36 -0000	1.3
@@ -11,7 +11,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 BuildRequires: zip
-Requires: xmms
 
 %description
 This package contains a skin for the XMMS music player that matches Bluecurve.
@@ -42,6 +41,9 @@
 %{_datadir}/xmms/Skins/Bluecurve-xmms.zip
 
 %changelog
+* Sun Apr  5 2009 Matthias Clasen  <mclasen at redhat.com>
+- Drop xmms dependency (#365821)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From michich at fedoraproject.org  Sun Apr  5 23:01:07 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sun,  5 Apr 2009 23:01:07 +0000 (UTC)
Subject: rpms/icecream/devel icecream-0.9.3-fix-perms-of-cache.patch, NONE, 
	1.1 icecream.spec, 1.19, 1.20 icecream.te, 1.7, 1.8
Message-ID: <20090405230107.D770F7011F@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14354

Modified Files:
	icecream.spec icecream.te 
Added Files:
	icecream-0.9.3-fix-perms-of-cache.patch 
Log Message:
* Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
- Fix wrong permissions on the cache dir preventing the jobs from being
  distributed.
- SELinux policy update based on review comments on refpolicy ML.


icecream-0.9.3-fix-perms-of-cache.patch:

--- NEW FILE icecream-0.9.3-fix-perms-of-cache.patch ---
Patch sent upstream (to Stephan Kulow) on 2009-04-06. -- Michal

commit e5dcc8beda99ffb4cb19b8eef024dbc22b010d54
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Sun Apr 5 23:32:32 2009 +0200

    fix permissions in the cache dir
    
    The way icecream changes permissions of /var/cache/icecream is buggy.
    When the daemon initializes, it creates the directory owned by root:root
    and readable for everyone. As soon as it installs a foreign environment,
    it changes the owner to root:icecream and removes access for everyone
    else.  This causes trouble for locally run icecc which wants read access
    to /var/cache/icecream/native. As a result, local compile jobs can no
    longer determine the native environment and fail to get distributed to
    other nodes.
    
    This patch assigns the owners and permissions like this:
    0755 root:root      /var/cache/icecream/
    0775 root:icecream  /var/cache/icecream/native/
    0770 root:icecream  /var/cache/icecream/target=<target>/
    0770 root:icecream  /var/cache/icecream/target=<target>/<hash>/
    
    It also sets the umask in the initialization of the daemon so that we
    can depend on it being sane and we no longer need some of the chmods.
    
    The access() check in start_install_environment() can be dropped,
    because if we don't have access, we'll soon find out anyway.

diff --git a/daemon/environment.cpp b/daemon/environment.cpp
index 9dc2831..979da91 100644
--- a/daemon/environment.cpp
+++ b/daemon/environment.cpp
@@ -180,8 +180,6 @@ bool cleanup_cache( const string &basedir )
             log_perror( "mkdir in cleanup_cache() failed" );
         return false;
     }
-    chown( basedir.c_str(), 0, 0 );
-    chmod( basedir.c_str(), 0755 );
 
     return ret;
 }
@@ -219,14 +217,14 @@ size_t setup_env_cache(const string &basedir, string &native_environment, uid_t
     if ( ::access( "/usr/bin/gcc", X_OK ) || ::access( "/usr/bin/g++", X_OK ) ) 
 	return 0;
 
-    if ( mkdir( nativedir.c_str(), 0755 ) )
+    if ( mkdir( nativedir.c_str(), 0775 ) )
    	return 0; 
 
-    if ( chown( nativedir.c_str(), nobody_uid, nobody_gid) ) {
+    if ( chown( nativedir.c_str(), 0, nobody_gid ) ||
+         chmod( nativedir.c_str(), 0775 ) ) {
 	rmdir( nativedir.c_str() );
 	return 0;
     }
-    chmod( nativedir.c_str(), 0755 );
 
     flush_debug();
     pid_t pid = fork();
@@ -251,7 +249,6 @@ size_t setup_env_cache(const string &basedir, string &native_environment, uid_t
         }
     }
     // else
-    umask(022);
 
     if ( setgid( nobody_gid ) < 0) {
       log_perror("setgid failed");
@@ -313,30 +310,28 @@ pid_t start_install_environment( const std::string &basename, const std::string
             compression = BZip2;
     }
 
-    if( ::access( basename.c_str(), W_OK ) ) {
-       log_error() << "access for basename " <<  basename.c_str() << " gives " << strerror(errno) << endl;
-       return 0;
-    }
-
-    chown( basename.c_str(), 0, nobody_gid );
-    chmod( basename.c_str(), 0770 );
-
-    if ( mkdir( dirname.c_str(), 0755 ) && errno != EEXIST ) {
+    if ( mkdir( dirname.c_str(), 0770 ) && errno != EEXIST ) {
         log_perror( "mkdir target" );
         return 0;
     }
 
-    chown( dirname.c_str(), 0, nobody_gid );
-    chmod( dirname.c_str(), 0770 );
+    if ( chown( dirname.c_str(), 0, nobody_gid ) ||
+         chmod( dirname.c_str(), 0770 ) ) {
+        log_perror( "chown,chmod target" );
+        return 0;
+    }
 
     dirname = dirname + "/" + name;
-    if ( mkdir( dirname.c_str(), 0700 ) ) {
+    if ( mkdir( dirname.c_str(), 0770 ) ) {
         log_perror( "mkdir name" );
         return 0;
     }
 
-    chown( dirname.c_str(), 0, nobody_gid );
-    chmod( dirname.c_str(), 0770 );
+    if ( chown( dirname.c_str(), 0, nobody_gid ) ||
+         chmod( dirname.c_str(), 0770 ) ) {
+        log_perror( "chown,chmod name" );
+        return 0;
+    }
 
     int fds[2];
     if ( pipe( fds ) )
diff --git a/daemon/main.cpp b/daemon/main.cpp
index 17fc761..7a6498f 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -1598,6 +1598,8 @@ int main( int argc, char ** argv )
         }
     }
 
+    umask(022);
+
     if ( !logfile.length() && detach)
         logfile = "/var/log/iceccd";
 


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- icecream.spec	2 Mar 2009 10:21:00 -0000	1.19
+++ icecream.spec	5 Apr 2009 23:00:36 -0000	1.20
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -31,6 +31,7 @@
 Patch1:		%{name}-cleanup-conffile.patch
 Patch2:		%{name}-0.9.3-fix-gcc44-ftbfs.patch
 Patch3:		%{name}-0.9.3-tighten-security.patch
+Patch4:		%{name}-0.9.3-fix-perms-of-cache.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,6 +81,7 @@
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -237,6 +239,11 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
+- Fix wrong permissions on the cache dir preventing the jobs from being
+  distributed.
+- SELinux policy update based on review comments on refpolicy ML.
+
 * Mon Mar 02 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-5
 - Fix a fd leak from iceccd + avoid using system().
 - Allows tighter SELinux policy.


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.te,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icecream.te	2 Mar 2009 10:21:00 -0000	1.7
+++ icecream.te	5 Apr 2009 23:00:36 -0000	1.8
@@ -1,12 +1,11 @@
 
-policy_module(icecream,0.0.43)
+policy_module(icecream,0.1.3)
 
 ########################################
 #
-# Declarations
+# iceccd declarations
 #
 
-# the compiler node daemon
 type iceccd_t;
 type iceccd_exec_t;
 init_daemon_domain(iceccd_t, iceccd_exec_t)
@@ -20,29 +19,39 @@
 type iceccd_var_run_t;
 files_pid_file(iceccd_var_run_t)
 
-# the working area
 type iceccd_cache_t;
 files_type(iceccd_cache_t)
 
-# icecc-create-env script makes a tarball of the local compiler and its
-# dependencies for other nodes to use
+########################################
+#
+# iceccd_createenv declarations
+#
+
 type iceccd_createenv_t;
 type iceccd_createenv_exec_t;
-domain_type(iceccd_createenv_t)
-domain_entry_file(iceccd_createenv_t, iceccd_createenv_exec_t)
+application_domain(iceccd_createenv_t, iceccd_createenv_exec_t)
 role system_r types iceccd_createenv_t;
 
-# foreign compilers
-type iceccd_untrusted_t;
-domain_type(iceccd_untrusted_t);
-domain_entry_file(iceccd_untrusted_t, iceccd_cache_t)
-role system_r types iceccd_untrusted_t;
+########################################
+#
+# icecc_scheduler declarations
+#
 
-# the scheduler
 type icecc_scheduler_t;
 type icecc_scheduler_exec_t;
 init_daemon_domain(icecc_scheduler_t, icecc_scheduler_exec_t)
 
+########################################
+#
+# iceccd_untrusted declarations
+#
+
+type iceccd_untrusted_t;
+domain_type(iceccd_untrusted_t);
+domain_entry_file(iceccd_untrusted_t, iceccd_cache_t)
+role system_r types iceccd_untrusted_t;
+
+# port declarations. for separate module only.
 type iceccd_port_t;
 type icecc_scheduler_port_t;
 corenet_port(iceccd_port_t);
@@ -50,31 +59,39 @@
 
 ########################################
 #
-# Icecream policy
+# iceccd policy
 #
 
-allow iceccd_t self:process { signal_perms setsched setrlimit };
+allow iceccd_t self:capability { chown dac_override fowner fsetid kill
+	setgid setuid sys_chroot };
+allow iceccd_t self:fifo_file rw_fifo_file_perms;
 allow iceccd_t self:netlink_route_socket r_netlink_socket_perms;
+allow iceccd_t self:process { signal_perms setsched setrlimit };
 allow iceccd_t self:tcp_socket create_stream_socket_perms;
 allow iceccd_t self:udp_socket create_socket_perms;
-allow iceccd_t self:fifo_file rw_fifo_file_perms;
-allow iceccd_t self:capability { chown dac_override fowner fsetid kill setgid setuid sys_chroot };
-allow iceccd_t iceccd_untrusted_t:process { siginh rlimitinh noatsecure signal };
 
-files_read_etc_files(iceccd_t)
-libs_use_ld_so(iceccd_t)
-libs_use_shared_libs(iceccd_t)
-miscfiles_read_localization(iceccd_t)
+dontaudit iceccd_t iceccd_untrusted_t:process { siginh rlimitinh
+	noatsecure };
 
-fs_getattr_all_fs(iceccd_t)
-kernel_read_system_state(iceccd_t)
-sysnet_read_config(iceccd_t)
+allow iceccd_t iceccd_untrusted_t:process signal;
 
-corecmd_exec_bin(iceccd_t)
-corecmd_read_bin_symlinks(iceccd_t)
+domtrans_pattern(iceccd_t, iceccd_createenv_exec_t, iceccd_createenv_t)
+domtrans_pattern(iceccd_t, iceccd_cache_t, iceccd_untrusted_t)
+
+manage_files_pattern(iceccd_t, iceccd_log_t, iceccd_log_t)
+logging_log_filetrans(iceccd_t, iceccd_log_t, file)
+
+manage_files_pattern(iceccd_t, iceccd_var_run_t, iceccd_var_run_t)
+files_pid_filetrans(iceccd_t, iceccd_var_run_t, file)
+
+manage_dirs_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
+manage_files_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
+files_var_filetrans(iceccd_t, iceccd_cache_t, { dir file })
 
-files_getattr_tmp_dirs(iceccd_t)
 files_search_tmp(iceccd_t)
+manage_dirs_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
+manage_files_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
+files_tmp_filetrans(iceccd_t, iceccd_tmp_t, { dir file })
 
 corenet_all_recvfrom_unlabeled(iceccd_t)
 corenet_all_recvfrom_netlabel(iceccd_t)
@@ -88,77 +105,89 @@
 allow iceccd_t iceccd_port_t:tcp_socket { name_bind };
 allow iceccd_t icecc_scheduler_port_t:tcp_socket { name_connect };
 
-domtrans_pattern(iceccd_t, iceccd_createenv_exec_t, iceccd_createenv_t)
-domtrans_pattern(iceccd_t, iceccd_cache_t, iceccd_untrusted_t)
+corecmd_exec_bin(iceccd_t)
+corecmd_read_bin_symlinks(iceccd_t)
 
-manage_files_pattern(iceccd_t, iceccd_log_t, iceccd_log_t)
-logging_log_filetrans(iceccd_t, iceccd_log_t, file)
+#files_getattr_tmp_dirs(iceccd_t)
+files_read_etc_files(iceccd_t)
 
-manage_files_pattern(iceccd_t, iceccd_var_run_t, iceccd_var_run_t)
-files_pid_filetrans(iceccd_t, iceccd_var_run_t, file)
+fs_getattr_all_fs(iceccd_t)
 
-manage_dirs_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
-manage_files_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
+kernel_read_system_state(iceccd_t)
 
-manage_dirs_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
-manage_files_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
-files_tmp_filetrans(iceccd_t, iceccd_tmp_t, file)
+sysnet_read_config(iceccd_t)
 
+libs_use_ld_so(iceccd_t)
+libs_use_shared_libs(iceccd_t)
+
+miscfiles_read_localization(iceccd_t)
+
+########################################
+#
+# iceccd_createenv policy
+#
 
-allow iceccd_createenv_t iceccd_log_t:file { append };
 allow iceccd_createenv_t self:fifo_file rw_fifo_file_perms;
-# icecc-create-env looks for executable files to strip them. It does not
-# really execute them, but the -x check would trigger a denial. Do not allow
-# this, typically the binaries are already stripped anyway. Just silence it.
-dontaudit iceccd_createenv_t iceccd_tmp_t:file { execute };
 
-allow iceccd_untrusted_t self:fifo_file rw_fifo_file_perms;
-allow iceccd_untrusted_t self:process signal_perms;
-allow iceccd_untrusted_t iceccd_t:unix_stream_socket rw_sock_file_perms;
-manage_files_pattern(iceccd_untrusted_t, iceccd_cache_t, iceccd_cache_t)
-allow iceccd_untrusted_t iceccd_cache_t:file { execute_no_trans };
+dontaudit iceccd_createenv_t iceccd_tmp_t:file { execute };
 
-files_read_etc_files(iceccd_createenv_t)
-libs_use_ld_so(iceccd_createenv_t)
-libs_use_shared_libs(iceccd_createenv_t)
-miscfiles_read_localization(iceccd_createenv_t)
+allow iceccd_createenv_t iceccd_log_t:file { append };
 
 manage_dirs_pattern(iceccd_createenv_t, iceccd_cache_t, iceccd_cache_t)
 manage_files_pattern(iceccd_createenv_t, iceccd_cache_t, iceccd_cache_t)
+# no files_var_filetrans, createenv does not create the cache dir itself
+
+manage_dirs_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
+manage_files_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
+files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, { dir file })
 
-files_read_usr_files(iceccd_createenv_t)
-libs_exec_ld_so(iceccd_createenv_t)
-libs_exec_lib_files(iceccd_createenv_t)
-libs_domtrans_ldconfig(iceccd_createenv_t)
 corecmd_exec_bin(iceccd_createenv_t)
 corecmd_exec_shell(iceccd_createenv_t)
+
 dev_read_urand(iceccd_createenv_t)
+
+files_read_etc_files(iceccd_createenv_t)
+files_read_usr_files(iceccd_createenv_t)
+
 kernel_read_system_state(iceccd_createenv_t)
-# silence file(1) looking for /root/.magic
-userdom_dontaudit_search_admin_dir(iceccd_createenv_t)
 
-manage_dirs_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
-manage_files_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
-files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, file)
-files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, dir)
+libs_exec_ld_so(iceccd_createenv_t)
+libs_exec_lib_files(iceccd_createenv_t)
+
+libs_domtrans_ldconfig(iceccd_createenv_t)
+
+libs_use_ld_so(iceccd_createenv_t)
+libs_use_shared_libs(iceccd_createenv_t)
+
+miscfiles_read_localization(iceccd_createenv_t)
+
+userdom_dontaudit_search_user_home_dirs(iceccd_createenv_t)
 
 optional_policy(`
 	nscd_socket_use(iceccd_createenv_t)
 ')
 
-# XXX: This could be avoided if iceccd only nuked the contents of
-# /var/cache/icecream, not the directory itself.
-files_var_filetrans(iceccd_t, iceccd_cache_t, dir)
+########################################
+#
+# iceccd_untrusted policy
+#
+
+allow iceccd_untrusted_t self:fifo_file rw_fifo_file_perms;
+allow iceccd_untrusted_t self:process signal_perms;
+allow iceccd_untrusted_t iceccd_t:unix_stream_socket rw_stream_socket_perms;
+
+manage_files_pattern(iceccd_untrusted_t, iceccd_cache_t, iceccd_cache_t)
+
+can_exec(iceccd_untrusted_t, iceccd_cache_t)
 
+########################################
+#
+# icecc_scheduler policy
+#
 
 allow icecc_scheduler_t self:tcp_socket create_stream_socket_perms;
 allow icecc_scheduler_t self:udp_socket create_socket_perms;
 
-files_read_etc_files(icecc_scheduler_t)
-libs_use_ld_so(icecc_scheduler_t)
-libs_use_shared_libs(icecc_scheduler_t)
-miscfiles_read_localization(icecc_scheduler_t)
-
 corenet_all_recvfrom_unlabeled(icecc_scheduler_t)
 corenet_all_recvfrom_netlabel(icecc_scheduler_t)
 corenet_tcp_sendrecv_generic_if(icecc_scheduler_t)
@@ -171,3 +200,10 @@
 corenet_udp_bind_generic_node(icecc_scheduler_t)
 allow icecc_scheduler_t icecc_scheduler_port_t:tcp_socket { name_bind };
 allow icecc_scheduler_t icecc_scheduler_port_t:udp_socket { name_bind };
+
+files_read_etc_files(icecc_scheduler_t)
+
+libs_use_ld_so(icecc_scheduler_t)
+libs_use_shared_libs(icecc_scheduler_t)
+
+miscfiles_read_localization(icecc_scheduler_t)



From mclasen at fedoraproject.org  Sun Apr  5 23:02:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  5 Apr 2009 23:02:37 +0000 (UTC)
Subject: rpms/bluecurve-xmms-skin/devel bluecurve-xmms-skin.spec,1.3,1.4
Message-ID: <20090405230237.B16697011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/bluecurve-xmms-skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14737

Modified Files:
	bluecurve-xmms-skin.spec 
Log Message:
bump rev



Index: bluecurve-xmms-skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluecurve-xmms-skin/devel/bluecurve-xmms-skin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bluecurve-xmms-skin.spec	5 Apr 2009 22:42:36 -0000	1.3
+++ bluecurve-xmms-skin.spec	5 Apr 2009 23:02:07 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Bluecurve xmms skin
 Name: bluecurve-xmms-skin
 Version: 1.0.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 BuildArch: noarch
 License: GPL+
 Group: User Interface/Desktops
@@ -41,7 +41,7 @@
 %{_datadir}/xmms/Skins/Bluecurve-xmms.zip
 
 %changelog
-* Sun Apr  5 2009 Matthias Clasen  <mclasen at redhat.com>
+* Sun Apr  5 2009 Matthias Clasen  <mclasen at redhat.com> - 1.0.0-3
 - Drop xmms dependency (#365821)
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2



From kyle at fedoraproject.org  Sun Apr  5 23:41:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sun,  5 Apr 2009 23:41:02 +0000 (UTC)
Subject: rpms/squashfs-tools/devel .cvsignore, 1.11, 1.12 sources, 1.9,
	1.10 squashfs-tools.spec, 1.22, 1.23
Message-ID: <20090405234102.D575C7011F@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23506

Modified Files:
	.cvsignore sources squashfs-tools.spec 
Log Message:
* Sun Apr 05 2009 Kyle McMartin <kyle at redhat.com> - 4.0-1
- Update to release 4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Mar 2009 18:41:56 -0000	1.11
+++ .cvsignore	5 Apr 2009 23:40:32 -0000	1.12
@@ -1,3 +1,3 @@
 squashfs
 clog
-squashfs-20090316.tar.bz2
+squashfs-4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Mar 2009 18:41:56 -0000	1.9
+++ sources	5 Apr 2009 23:40:32 -0000	1.10
@@ -1 +1 @@
-0ff6ccb12b102a3d9267d07e64bfd870  squashfs-20090316.tar.bz2
+d6dab195b9f1bbafce0ae00c804babc3  squashfs-4.0.tar.bz2


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- squashfs-tools.spec	16 Mar 2009 18:41:56 -0000	1.22
+++ squashfs-tools.spec	5 Apr 2009 23:40:32 -0000	1.23
@@ -2,11 +2,11 @@
 Name: squashfs-tools
 Version: 4.0
 # cvs snapshot from cvs -d:pserver:anonymous at squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-25
-Release: 0.20090316
+Release: 1
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: squashfs-20090316.tar.bz2
+Source0: squashfs-4.0.tar.bz2
 Patch0: squashfs-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -27,21 +27,22 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/usr/sbin
 install -m 755 squashfs-tools/mksquashfs $RPM_BUILD_ROOT/sbin/mksquashfs
-#install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
-
-chmod -x README
+install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc README
+%doc README-4.0
 /sbin/mksquashfs
-#%{_sbindir}/unsquashfs
+%{_sbindir}/unsquashfs
 
 %changelog
+* Sun Apr 05 2009 Kyle McMartin <kyle at redhat.com> - 4.0-1
+- Update to release 4.0
+
 * Tue Mar 16 2009 Kyle McMartin <kyle at redhat.com> - 4.0-0.20090316
 - update to cvs snap from 2009-03-16.
 



From whot at fedoraproject.org  Mon Apr  6 00:15:49 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  6 Apr 2009 00:15:49 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xorg-x11-apps.spec, 1.31, 1.32
Message-ID: <20090406001549.EEABA700FB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31851

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.3-8
- xinput 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Jan 2009 06:32:48 -0000	1.11
+++ .cvsignore	6 Apr 2009 00:15:19 -0000	1.12
@@ -15,4 +15,4 @@
 xwud-1.0.1.tar.bz2
 xconsole-1.0.3.tar.bz2
 xmessage-1.0.2.tar.bz2
-xinput-1.4.0.tar.bz2
+xinput-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Jan 2009 06:32:50 -0000	1.11
+++ sources	6 Apr 2009 00:15:19 -0000	1.12
@@ -15,4 +15,4 @@
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
-ef43538bb3b445d2d69d5adbf76c149e  xinput-1.4.0.tar.bz2
+47c854a63cc2a50d45d6d9a2289ece07  xinput-1.4.1.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-apps.spec	26 Feb 2009 10:35:15 -0000	1.31
+++ xorg-x11-apps.spec	6 Apr 2009 00:15:19 -0000	1.32
@@ -5,7 +5,7 @@
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -31,7 +31,7 @@
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.0.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.1.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
@@ -179,6 +179,9 @@
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.3-8
+- xinput 1.4.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kkofler at fedoraproject.org  Mon Apr  6 00:28:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  6 Apr 2009 00:28:17 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.83,1.84
Message-ID: <20090406002817.6BB7D700FB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2418/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
- fix libkcal devel symlink hack


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdepimlibs.spec	2 Apr 2009 19:34:07 -0000	1.83
+++ kdepimlibs.spec	6 Apr 2009 00:27:46 -0000	1.84
@@ -13,7 +13,7 @@
 
 Name: kdepimlibs
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -135,6 +135,7 @@
       ;;
 # conflicts with kdepim3 (compat)
     libkcal.so)
+      linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
@@ -208,6 +209,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
+- fix libkcal devel symlink hack
+
 * Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - -apidocs noarch (f10+)
 - package %%_kde4_appsdir/akonadi-kde only once



From kkofler at fedoraproject.org  Mon Apr  6 00:35:26 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  6 Apr 2009 00:35:26 +0000 (UTC)
Subject: rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim.spec,
	1.17, 1.18
Message-ID: <20090406003526.2971E700FB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4049/devel

Modified Files:
	libopensync-plugin-kdepim.spec 
Log Message:
* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.22-5
- rebuild against fixed kdepimlibs (libkcal devel symlink)


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libopensync-plugin-kdepim.spec	2 Apr 2009 06:44:20 -0000	1.17
+++ libopensync-plugin-kdepim.spec	6 Apr 2009 00:34:55 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:           libopensync-plugin-kdepim
 Version:        0.22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        KDE plugin for libopensync
 
@@ -65,6 +65,9 @@
 %{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.22-5
+- rebuild against fixed kdepimlibs (libkcal devel symlink)
+
 * Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.22-4
 - revert to 0.22
 - backport KDE 4 patch



From kkofler at fedoraproject.org  Mon Apr  6 00:46:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  6 Apr 2009 00:46:43 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 kdepimlibs.spec,1.65,1.66
Message-ID: <20090406004643.A31EF700FB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7401/F-10

Modified Files:
	kdepimlibs.spec 
Log Message:
Sync from devel:

* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
- fix libkcal devel symlink hack

* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- -apidocs noarch (f10+)
- package %%_kde4_appsdir/akonadi-kde only once


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kdepimlibs.spec	1 Apr 2009 20:24:10 -0000	1.65
+++ kdepimlibs.spec	6 Apr 2009 00:46:12 -0000	1.66
@@ -1,4 +1,4 @@
-#ifarch noarch
+
 %if 0%{?fedora} > 8
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
@@ -7,16 +7,13 @@
 # files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
 %define apidocs 0
 %endif
-#else
-%define rest 1
-#endif
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
 
 Name: kdepimlibs
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -82,6 +79,9 @@
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -98,9 +98,7 @@
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 # build apidocs
 %if 0%{?apidocs}
@@ -112,7 +110,6 @@
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
@@ -138,6 +135,7 @@
       ;;
 # conflicts with kdepim3 (compat)
     libkcal.so)
+      linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
@@ -152,7 +150,6 @@
   esac
 done
 popd
-%endif
 
 # install apidocs
 %if 0%{?apidocs}
@@ -170,10 +167,8 @@
 rm -rf %{buildroot}
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
@@ -205,7 +200,6 @@
 %{_kde4_libdir}/KdepimLibs*
 %endif
 %{_kde4_libdir}/gpgmepp/
-%endif
 
 %if 0%{?apidocs}
 %files apidocs
@@ -215,6 +209,13 @@
 
 
 %changelog
+* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
+- fix libkcal devel symlink hack
+
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- -apidocs noarch (f10+)
+- package %%_kde4_appsdir/akonadi-kde only once
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From kkofler at fedoraproject.org  Mon Apr  6 00:46:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  6 Apr 2009 00:46:43 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.51,1.52
Message-ID: <20090406004643.C6F60700FB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7401/F-9

Modified Files:
	kdepimlibs.spec 
Log Message:
Sync from devel:

* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
- fix libkcal devel symlink hack

* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- -apidocs noarch (f10+)
- package %%_kde4_appsdir/akonadi-kde only once


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdepimlibs.spec	1 Apr 2009 20:24:10 -0000	1.51
+++ kdepimlibs.spec	6 Apr 2009 00:46:13 -0000	1.52
@@ -1,4 +1,4 @@
-#ifarch noarch
+
 %if 0%{?fedora} > 8
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
@@ -7,16 +7,13 @@
 # files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
 %define apidocs 0
 %endif
-#else
-%define rest 1
-#endif
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
 
 Name: kdepimlibs
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -82,6 +79,9 @@
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -98,9 +98,7 @@
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 # build apidocs
 %if 0%{?apidocs}
@@ -112,7 +110,6 @@
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
@@ -138,6 +135,7 @@
       ;;
 # conflicts with kdepim3 (compat)
     libkcal.so)
+      linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
@@ -152,7 +150,6 @@
   esac
 done
 popd
-%endif
 
 # install apidocs
 %if 0%{?apidocs}
@@ -170,10 +167,8 @@
 rm -rf %{buildroot}
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
@@ -205,7 +200,6 @@
 %{_kde4_libdir}/KdepimLibs*
 %endif
 %{_kde4_libdir}/gpgmepp/
-%endif
 
 %if 0%{?apidocs}
 %files apidocs
@@ -215,6 +209,13 @@
 
 
 %changelog
+* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
+- fix libkcal devel symlink hack
+
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- -apidocs noarch (f10+)
+- package %%_kde4_appsdir/akonadi-kde only once
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From whot at fedoraproject.org  Mon Apr  6 00:53:42 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  6 Apr 2009 00:53:42 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel evdev-2.2.1-read-deadlock.patch, NONE,
	1.1 xorg-x11-drv-evdev.spec, 1.48, 1.49
Message-ID: <20090406005342.A43EC700FB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9195

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-2.2.1-read-deadlock.patch 
Log Message:
* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-2
- evdev-2.2.1-read-deadlock.patch: handle read errors on len <= 0 (#494245)



evdev-2.2.1-read-deadlock.patch:

--- NEW FILE evdev-2.2.1-read-deadlock.patch ---
>From 98ecb5233bb3b899bd696a90d2733c6a345676dd Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 6 Apr 2009 10:22:25 +1000
Subject: [PATCH] Trigger read error handling if len is <= 0.

Red Hat Bug 494245 <https://bugzilla.redhat.com/show_bug.cgi?id=494245>

Reported-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index f65359f..43a90be 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -565,7 +565,7 @@ EvdevReadInput(InputInfoPtr pInfo)
     while (len == sizeof(ev))
     {
         len = read(pInfo->fd, &ev, sizeof(ev));
-        if (len == 0)
+        if (len <= 0)
         {
             if (errno == ENODEV) /* May happen after resume */
             {
-- 
1.6.0.6



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xorg-x11-drv-evdev.spec	24 Mar 2009 05:22:55 -0000	1.48
+++ xorg-x11-drv-evdev.spec	6 Apr 2009 00:53:12 -0000	1.49
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.2.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,6 +17,8 @@
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 #Source1:    make-git-snapshot.sh
 
+Patch1:     evdev-2.2.1-read-deadlock.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -34,6 +36,7 @@
 %setup -q -n %{tarball}-%{version}
 
 # apply patches
+%patch1 -p1 -b .read-deadlock
 
 %build
 autoreconf -v --install || exit 1
@@ -72,6 +75,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-2
+- evdev-2.2.1-read-deadlock.patch: handle read errors on len <= 0 (#494245)
+
 * Tue Mar 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-1
 - evdev 2.2.1 
 



From whot at fedoraproject.org  Mon Apr  6 01:12:04 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  6 Apr 2009 01:12:04 +0000 (UTC)
Subject: rpms/libX11/F-10 libX11-1.1.5-rm-long-composites.patch, NONE,
	1.1 libX11.spec, 1.54, 1.55
Message-ID: <20090406011204.58C53700FB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libX11/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14302

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.5-rm-long-composites.patch 
Log Message:
* Tue Mar 31 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-3
- libX11-1.1.5-rm-long-composites.patch: Re-remove long compositions that
  override shorter (#491813).



libX11-1.1.5-rm-long-composites.patch:

--- NEW FILE libX11-1.1.5-rm-long-composites.patch ---
>From 8502e2567e9550b0800ee83d36ef2f248800ebc1 Mon Sep 17 00:00:00 2001
From: James Cloos <cloos at jhcloos.com>
Date: Wed, 20 Aug 2008 15:28:07 -0400
Subject: [PATCH] nls (en_US) Re-remove long compositions that override shorter
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

As reported in <https://bugs.freedesktop.org/show_bug.cgi?id=17228>:

  Commit a6f4bbf7
    nls (en_US): remove long compositions that override shorter [...]
    removed some longer compose sequences because there are shorter
    ones which take preference over the longer. For example the
    sequences:

      <Multi_key> <apostrophe> <comma> <c>   : U1E09 # ???
      <Multi_key> <apostrophe> <comma> <C>   : U1E08 # ???

    were removed becase there already was:

      <Multi_key> <apostrophe> <comma>       : U201A # ???

  Then commit 4ba09125
    Work on making the en_US and pt_BR UTF-8 Compose as similar as
    possible added exactly the same key sequences again. Obviusly
    they won't work.
(cherry picked from commit a788792e9de95f8db0639557859722a35087481d)
---
 nls/en_US.UTF-8/Compose.pre |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 12806fb..b7df9b6 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1734,7 +1734,6 @@ XCOMM Part 3
 <Multi_key> <acute> <comma> <C>  	: "???"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <cedilla> <C>  	: "???"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <dead_cedilla> <C> 	: "???"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <C>	: "???" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <cedilla> <C>	: "???" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <Ccedilla>     	: "???"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <dead_cedilla> <C> 	: "???"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
@@ -1750,7 +1749,6 @@ XCOMM Part 3
 <Multi_key> <acute> <comma> <c>  	: "???"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <cedilla> <c>  	: "???"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <dead_cedilla> <c> 	: "???"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <c>	: "???" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <cedilla> <c>	: "???" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <ccedilla>     	: "???"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <dead_cedilla> <c> 	: "???"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-- 
1.6.0.6



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-10/libX11.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libX11.spec	26 Mar 2009 03:46:02 -0000	1.54
+++ libX11.spec	6 Apr 2009 01:11:33 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,7 +21,7 @@
 Patch5: libX11-1.1.4-XF86Suspend.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=491813
-Patch6: libX11-1.1.5-revert-compose.patch
+Patch7: libX11-1.1.5-rm-long-composites.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -65,7 +65,7 @@
 %patch3 -p1 -b .xcb-xreply-leak
 %patch4 -p1 -b .keysyms
 %patch5 -p1 -b .xf86suspend
-%patch6 -p1 -b .revert-compose
+%patch7 -p1 -b .rm-long-composites
 
 %build
 %configure \
@@ -126,6 +126,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Mar 31 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-3
+- libX11-1.1.5-rm-long-composites.patch: Re-remove long compositions that
+  override shorter (#491813).
+
 * Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-2
 - libX11-1.1.5-revert-compose.patch: revert an upstream commit in the compose
   table (???) that causes #491813.



From bpepple at fedoraproject.org  Mon Apr  6 01:57:14 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon,  6 Apr 2009 01:57:14 +0000 (UTC)
Subject: rpms/freeciv/F-10 .cvsignore, 1.21, 1.22 freeciv.spec, 1.42,
	1.43 sources, 1.21, 1.22
Message-ID: <20090406015714.8F24B700FB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25837

Modified Files:
	.cvsignore freeciv.spec sources 
Log Message:
* Sun Apr  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.9-1
- Update to 2.1.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Dec 2008 20:31:52 -0000	1.21
+++ .cvsignore	6 Apr 2009 01:56:43 -0000	1.22
@@ -1 +1 @@
-freeciv-2.1.8.tar.bz2
+freeciv-2.1.9.tar.bz2


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-10/freeciv.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- freeciv.spec	4 Dec 2008 20:31:52 -0000	1.42
+++ freeciv.spec	6 Apr 2009 01:56:44 -0000	1.43
@@ -4,7 +4,7 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.1.8
+Version:        2.1.9
 Release:        1%{?dist}
 Summary:        A multi-player strategy game
 
@@ -18,7 +18,6 @@
 BuildRequires:	gtk2-devel
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
-BuildRequires:	bind-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	esound-devel
 BuildRequires:	ncurses-devel
@@ -112,6 +111,12 @@
 
 
 %changelog
+* Sun Apr  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.9-1
+- Update to 2.1.9.
+
+* Mon Mar 09 2009 Adam Tkac <atkac redhat com> - 2.1.8-3
+- drop bind-devel BuildReq, it is not needed
+
 * Thu Dec  4 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.1.8-1
 - Update to 2.1.8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Dec 2008 20:31:52 -0000	1.21
+++ sources	6 Apr 2009 01:56:44 -0000	1.22
@@ -1 +1 @@
-a5b50e596b146616ebebde5c483f59d5  freeciv-2.1.8.tar.bz2
+caffaa201b2f5dfdfe00b6e6c3f32fb1  freeciv-2.1.9.tar.bz2



From jstanley at fedoraproject.org  Mon Apr  6 02:18:10 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon,  6 Apr 2009 02:18:10 +0000 (UTC)
Subject: rpms/supybot-fedora/devel .cvsignore, 1.4, 1.5 sources, 1.7,
	1.8 supybot-fedora.spec, 1.7, 1.8
Message-ID: <20090406021810.4CCFF700FB@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30910

Modified Files:
	.cvsignore sources supybot-fedora.spec 
Log Message:
New upstream 0.2.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Apr 2009 03:01:13 -0000	1.4
+++ .cvsignore	6 Apr 2009 02:17:39 -0000	1.5
@@ -1 +1 @@
-supybot-fedora-0.2.5.tar.bz2
+supybot-fedora-0.2.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Apr 2009 03:01:13 -0000	1.7
+++ sources	6 Apr 2009 02:17:39 -0000	1.8
@@ -1 +1 @@
-59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2
+cb7062a4b1f443abf45b4cc19d8b7654  supybot-fedora-0.2.5.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/supybot-fedora.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- supybot-fedora.spec	2 Apr 2009 03:01:13 -0000	1.7
+++ supybot-fedora.spec	6 Apr 2009 02:17:39 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.5
+Version:        0.2.5.1
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Apr 5 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5.1-1
+- New upstream 0.2.5.1
+
 * Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
 - New upstream -.2.5
 



From whot at fedoraproject.org  Mon Apr  6 02:29:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  6 Apr 2009 02:29:46 +0000 (UTC)
Subject: rpms/linuxwacom/devel linuxwacom-0.8.2.2-serial-check.patch, NONE, 
	1.1 linuxwacom.spec, 1.78, 1.79
Message-ID: <20090406022947.05086700FB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2313

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.8.2.2-serial-check.patch 
Log Message:
* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-11
- linuxwacom-0.8.2.2-serial-check.patch: revert serial channel checking, it
  breaks waltop tablets. 



linuxwacom-0.8.2.2-serial-check.patch:

--- NEW FILE linuxwacom-0.8.2.2-serial-check.patch ---
upstream commit points to http://sourceforge.net/tracker/?func=detail&aid=2499414&group_id=69596&atid=525124
as the source for this change. Doesnt make sense to me, but if it that's
really the cause we don't need to worry on server 1.6.

--- ./src/xdrv/wcmUSB.c	2009-01-19 19:58:37.000000000 +0100
+++ /home/social/rpmbuild/SOURCES/linuxwacom-0.8.2-1/src/xdrv/wcmUSB.c	2008-12-30 22:46:01.000000000 +0100
@@ -815,11 +815,6 @@
 	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))
 	{
 		/* save the serial number so we can look up the channel number later */
-		if (event->value == 0) /* serial number should never be 0 */
-		{
-			ErrorF("usbParse: Ignoring event from invalid serial 0\n");
-			return;
-		}
 		common->wcmLastToolSerial = event->value;
 
 		/* if SYN_REPORT is end of record indicator, we are done */
@@ -852,7 +847,7 @@
 	channel = -1;
 	if (common->wcmProtocolLevel == 4)
 	{
-		/* Protocol 4 doesn't support tool serial numbers */
+		/* Protocol 4 don't support tool serial numbers */
 		if (common->wcmLastToolSerial == 0xf0)
 			channel = 1;
 		else
@@ -864,7 +859,7 @@
 			common->wcmChannel[channel].work.proximity = 1;
 		}
 	}
-	else if (common->wcmLastToolSerial) /* serial number should never be 0 */
+	else
 	{
 		/* find existing channel */
 		for (i=0; i<MAX_CHANNELS; ++i)


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- linuxwacom.spec	26 Mar 2009 05:25:54 -0000	1.78
+++ linuxwacom.spec	6 Apr 2009 02:29:16 -0000	1.79
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Patch5:		linuxwacom-0.8.2.2-export-module.patch
 Patch7:		linuxwacom-0.8.2.2-wcmMaxX.patch
 Patch8:		linuxwacom-0.8.2.2-hal-setup.patch
+Patch9:		linuxwacom-0.8.2.2-serial-check.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -53,6 +54,7 @@
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 
@@ -115,6 +117,10 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-11
+- linuxwacom-0.8.2.2-serial-check.patch: revert serial channel checking, it
+  breaks waltop tablets. 
+
 * Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-10
 - Add WALTOP and N-Trig Duosense devices to the fdi file.
 



From jstanley at fedoraproject.org  Mon Apr  6 02:34:55 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon,  6 Apr 2009 02:34:55 +0000 (UTC)
Subject: rpms/supybot-fedora/F-10 sources, 1.6, 1.7 supybot-fedora.spec, 1.5,
	1.6
Message-ID: <20090406023455.6B075700FB@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3674/F-10

Modified Files:
	sources supybot-fedora.spec 
Log Message:
Update to 0.2.5.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Apr 2009 03:09:14 -0000	1.6
+++ sources	6 Apr 2009 02:34:25 -0000	1.7
@@ -1 +1 @@
-59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2
+cb7062a4b1f443abf45b4cc19d8b7654  supybot-fedora-0.2.5.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/supybot-fedora.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supybot-fedora.spec	2 Apr 2009 03:09:14 -0000	1.5
+++ supybot-fedora.spec	6 Apr 2009 02:34:25 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.5
+Version:        0.2.5.1
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Apr 5 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5.1-1
+- New upstream 0.2.5.1
+
 * Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
 - New upstream -.2.5
 



From jstanley at fedoraproject.org  Mon Apr  6 02:34:55 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon,  6 Apr 2009 02:34:55 +0000 (UTC)
Subject: rpms/supybot-fedora/EL-5 sources, 1.7, 1.8 supybot-fedora.spec, 1.6,
	1.7
Message-ID: <20090406023455.4001B700FB@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3674/EL-5

Modified Files:
	sources supybot-fedora.spec 
Log Message:
Update to 0.2.5.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Apr 2009 03:09:13 -0000	1.7
+++ sources	6 Apr 2009 02:34:24 -0000	1.8
@@ -1 +1 @@
-59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2
+cb7062a4b1f443abf45b4cc19d8b7654  supybot-fedora-0.2.5.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/supybot-fedora.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- supybot-fedora.spec	2 Apr 2009 03:09:13 -0000	1.6
+++ supybot-fedora.spec	6 Apr 2009 02:34:24 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.5
+Version:        0.2.5.1
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Apr 5 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5.1-1
+- New upstream 0.2.5.1
+
 * Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
 - New upstream -.2.5
 



From jstanley at fedoraproject.org  Mon Apr  6 02:34:55 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon,  6 Apr 2009 02:34:55 +0000 (UTC)
Subject: rpms/supybot-fedora/F-9 sources, 1.6, 1.7 supybot-fedora.spec, 1.5,
	1.6
Message-ID: <20090406023455.A9C00700FB@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3674/F-9

Modified Files:
	sources supybot-fedora.spec 
Log Message:
Update to 0.2.5.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Apr 2009 03:09:14 -0000	1.6
+++ sources	6 Apr 2009 02:34:25 -0000	1.7
@@ -1 +1 @@
-59181b0507a618848018224a674cd18b  supybot-fedora-0.2.5.tar.bz2
+cb7062a4b1f443abf45b4cc19d8b7654  supybot-fedora-0.2.5.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/supybot-fedora.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supybot-fedora.spec	2 Apr 2009 03:09:14 -0000	1.5
+++ supybot-fedora.spec	6 Apr 2009 02:34:25 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.5
+Version:        0.2.5.1
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Apr 5 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5.1-1
+- New upstream 0.2.5.1
+
 * Wed Apr 1 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.5-1
 - New upstream -.2.5
 



From mclasen at fedoraproject.org  Mon Apr  6 02:52:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  6 Apr 2009 02:52:44 +0000 (UTC)
Subject: rpms/control-center/devel default-apps-custom.patch, NONE,
	1.1 control-center.spec, 1.441, 1.442
Message-ID: <20090406025244.AF47F700FB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9162

Modified Files:
	control-center.spec 
Added Files:
	default-apps-custom.patch 
Log Message:
fix a minor ui issue in the preferred apps capplet


default-apps-custom.patch:

--- NEW FILE default-apps-custom.patch ---
--- gnome-control-center-2.26.0/capplets/default-applications/gnome-da-capplet.c	2009-03-16 11:14:59.000000000 -0400
+++ hacked/capplets/default-applications/gnome-da-capplet.c	2009-04-05 22:37:44.330832937 -0400
@@ -77,10 +77,10 @@
 	return;
 
     item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index);
-    if (item == NULL)
-        return;
-
-    if (togglebutton == capplet->new_win_radiobutton) {
+    if (item == NULL) {
+	command = "";
+    }
+    else if (togglebutton == capplet->new_win_radiobutton) {
 	command = item->win_command;
     }
     else if (togglebutton == capplet->new_tab_radiobutton) {


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- control-center.spec	17 Mar 2009 03:40:26 -0000	1.441
+++ control-center.spec	6 Apr 2009 02:52:14 -0000	1.442
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -43,6 +43,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=555591
 Patch30: default-layout-toggle.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=578089
+Patch31: default-apps-custom.patch
+
 Patch32: display-no-help.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=546036
@@ -170,6 +173,7 @@
 %patch10 -p0 -b .pam-fprintd
 %patch22 -p0 -b .slab-icon-names
 %patch30 -p1 -b .default-layout-toggle
+%patch31 -p1 -b .default-apps-custom
 %patch32 -p1 -b .display-no-help
 %patch33 -p1 -b .notification-theme
 %patch34 -p0 -b .new-icons
@@ -350,6 +354,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Fix a minor ui issue in the preferred apps capplet (#490421)
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From mclasen at fedoraproject.org  Mon Apr  6 03:10:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  6 Apr 2009 03:10:43 +0000 (UTC)
Subject: rpms/gnome-user-share/devel menu-path.patch, NONE,
	1.1 gnome-user-share.spec, 1.51, 1.52
Message-ID: <20090406031044.01B8B7013C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13957

Modified Files:
	gnome-user-share.spec 
Added Files:
	menu-path.patch 
Log Message:
fix a menu reference in the docs


menu-path.patch:

--- NEW FILE menu-path.patch ---
diff -up gnome-user-share-2.26.0/help/C/gnome-user-share.xml.menu-path gnome-user-share-2.26.0/help/C/gnome-user-share.xml
--- gnome-user-share-2.26.0/help/C/gnome-user-share.xml.menu-path	2009-04-05 23:02:58.710083486 -0400
+++ gnome-user-share-2.26.0/help/C/gnome-user-share.xml	2009-04-05 23:04:00.147797756 -0400
@@ -66,7 +66,7 @@
        <title>Starting &app;</title>
 
        <para>
-         The &app; service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs.
+         The &app; service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs.
        </para>
 
        <para>


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-user-share.spec	16 Mar 2009 10:31:04 -0000	1.51
+++ gnome-user-share.spec	6 Apr 2009 03:10:12 -0000	1.52
@@ -6,6 +6,8 @@
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.25/%{name}-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=578090
+Patch0: menu-path.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
@@ -43,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .menu-path
 
 %build
 %configure
@@ -120,6 +123,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Fix a menu reference in the docs (#494253)
+
 * Mon Mar 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From mclasen at fedoraproject.org  Mon Apr  6 03:12:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  6 Apr 2009 03:12:29 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.52,1.53
Message-ID: <20090406031229.D99C4700FB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15298

Modified Files:
	gnome-user-share.spec 
Log Message:
bump rev



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-user-share.spec	6 Apr 2009 03:10:12 -0000	1.52
+++ gnome-user-share.spec	6 Apr 2009 03:11:59 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -9,7 +9,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
 Requires: obex-data-server >= 0.3
 Requires: mod_dnssd



From kanarip at fedoraproject.org  Mon Apr  6 03:13:33 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Mon,  6 Apr 2009 03:13:33 +0000 (UTC)
Subject: rpms/revisor/devel .cvsignore, 1.23, 1.24 import.log, 1.6,
	1.7 revisor.spec, 1.48, 1.49 sources, 1.48, 1.49
Message-ID: <20090406031333.A97C9700FB@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15774/devel

Modified Files:
	.cvsignore import.log revisor.spec sources 
Log Message:
2.1.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	2 Dec 2008 00:01:54 -0000	1.23
+++ .cvsignore	6 Apr 2009 03:13:02 -0000	1.24
@@ -1 +1 @@
-revisor-2.1.3.tar.gz
+revisor-2.1.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Dec 2008 00:01:54 -0000	1.6
+++ import.log	6 Apr 2009 03:13:02 -0000	1.7
@@ -4,3 +4,4 @@
 revisor-2_1_2-1_fc9:HEAD:revisor-2.1.2-1.fc9.src.rpm:1223231043
 revisor-2_1_2-2_fc9:HEAD:revisor-2.1.2-2.fc9.src.rpm:1223231463
 revisor-2_1_3-1_fc10:HEAD:revisor-2.1.3-1.fc10.src.rpm:1228176091
+revisor-2_1_4-1_fc11:HEAD:revisor-2.1.4-1.fc11.src.rpm:1238987564


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- revisor.spec	25 Feb 2009 19:50:13 -0000	1.48
+++ revisor.spec	6 Apr 2009 03:13:03 -0000	1.49
@@ -2,9 +2,12 @@
 
 %define pkg_cobbler 1
 %define pkg_comps 1
+%define pkg_composer 0
 %define pkg_delta 0
+%define pkg_hub 0
 %define pkg_isolinux 1
 %define pkg_jigdo 0
+%define pkg_mock 1
 %define pkg_rebrand 0
 %define pkg_reuseinstaller 1
 %define pkg_server 0
@@ -14,8 +17,8 @@
 
 Summary:        Fedora "Spin" Graphical User Interface
 Name:           revisor
-Version:        2.1.3
-Release:        3%{?dist}
+Version:        2.1.4
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            http://fedorahosted.org/revisor
@@ -68,15 +71,24 @@
 %if ! %{pkg_cobbler}
 Obsoletes:       revisor-cobbler
 %endif
+%if ! %{pkg_composer}
+Obsoletes:       revisor-composer
+%endif
 %if ! %{pkg_delta}
 Obsoletes:       revisor-delta
 %endif
+%if ! %{pkg_hub}
+Obsoletes:       revisor-hub
+%endif
 %if ! %{pkg_isolinux}
 Obsoletes:       revisor-isolinux
 %endif
 %if ! %{pkg_jigdo}
 Obsoletes:       revisor-jigdo
 %endif
+%if ! %{pkg_mock}
+Obsoletes:       revisor-mock
+%endif
 %if ! %{pkg_rebrand}
 Obsoletes:       revisor-rebrand
 %endif
@@ -131,6 +143,19 @@
 %endif
 
 ##
+## Revisor Composer plugin
+##
+%if %{pkg_composer}
+%package composer
+Summary:    Revisor Composer, for use with the Hub
+Group:      Applications/System
+Requires:   revisor-cli = %{version}-%{release}
+
+%description composer
+Revisor build farms need Composers. This is it.
+%endif
+
+##
 ## Revisor DeltaRPM/DeltaISO plugin
 ##
 %if %{pkg_delta}
@@ -156,6 +181,19 @@
 This is the Revisor GUI package
 
 ##
+## Revisor HUB plugin
+##
+%if %{pkg_hub}
+%package hub
+Summary:    Revisor Hub for build farms
+Group:      Applications/System
+Requires:   revisor-cli = %{version}-%{release}
+
+%description hub
+Revisor build farms need a Hub. This is it.
+%endif
+
+##
 ## Revisor customize isolinux.cfg
 ##
 %if %{pkg_isolinux}
@@ -182,6 +220,19 @@
 %endif
 
 ##
+## Revisor Mock integration
+##
+%if %{pkg_mock}
+%package mock
+Summary:    Revisor Integration with Mock
+Group:      Applications/System
+Requires:   mock, revisor-cli = %{version}-%{release}
+
+%description mock
+Revisor Integration with Mock for building the installer images
+%endif
+
+##
 ## Revisor Rebranding plugin
 ##
 %if %{pkg_rebrand}
@@ -280,14 +331,18 @@
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
 %endif
 
-%if ! %{pkg_cobbler}
-    rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
+%if ! %{pkg_composer}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modcomposer
 %endif
 
 %if ! %{pkg_delta}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
 %endif
 
+%if ! %{pkg_hub}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modhub
+%endif
+
 %if ! %{pkg_isolinux}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
 %endif
@@ -296,6 +351,10 @@
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
 %endif
 
+%if ! %{pkg_mock}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modmock
+%endif
+
 %if ! %{pkg_rebrand}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modrebrand
 %endif
@@ -329,6 +388,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(-,root,root,-)
 
 %files cli
 %defattr(-,root,root,-)
@@ -342,8 +402,8 @@
 %{python_sitelib}/revisor/*.pyo
 %{_bindir}/*
 %{_sbindir}/*
-%dir %{_libdir}/revisor
-%dir %{_libdir}/revisor/scripts
+%dir %{_prefix}/lib/revisor
+%dir %{_prefix}/lib/revisor/scripts
 %dir %{_sysconfdir}/revisor
 %dir %{_sysconfdir}/revisor/conf.d
 %config(noreplace) %{_sysconfdir}/revisor/revisor.conf
@@ -352,10 +412,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_datadir}/locale/*/LC_MESSAGES/revisor.mo
 %defattr(0755,root,root,-)
-%{_libdir}/revisor/scripts/*
+%{_prefix}/lib/revisor/scripts/*
 
 %if %{pkg_comps}
 %files comps
+%defattr(-,root,root,-)
 %dir %{_datadir}/revisor/comps/
 %{_datadir}/revisor/comps/*
 %{_datadir}/revisor/comps-cleanup.xsl
@@ -370,6 +431,15 @@
 %{python_sitelib}/revisor/modcobbler/*.pyo
 %endif
 
+%if %{pkg_composer}
+%files composer
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modcomposer
+%{python_sitelib}/revisor/modcomposer/*.py
+%{python_sitelib}/revisor/modcomposer/*.pyc
+%{python_sitelib}/revisor/modcomposer/*.pyo
+%endif
+
 %if %{pkg_delta}
 %files delta
 %defattr(-,root,root,-)
@@ -392,6 +462,15 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
 
+%if %{pkg_hub}
+%files hub
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modhub
+%{python_sitelib}/revisor/modhub/*.py
+%{python_sitelib}/revisor/modhub/*.pyc
+%{python_sitelib}/revisor/modhub/*.pyo
+%endif
+
 %if %{pkg_isolinux}
 %files isolinux
 %defattr(-,root,root,-)
@@ -410,6 +489,15 @@
 %{python_sitelib}/revisor/modjigdo/*.pyo
 %endif
 
+%if %{pkg_mock}
+%files mock
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modmock
+%{python_sitelib}/revisor/modmock/*.py
+%{python_sitelib}/revisor/modmock/*.pyc
+%{python_sitelib}/revisor/modmock/*.pyo
+%endif
+
 %if %{pkg_rebrand}
 %files rebrand
 %defattr(-,root,root,-)
@@ -465,13 +553,14 @@
 %endif
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.1.3-2
-- Rebuild for Python 2.6
+* Mon Apr 06 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.4-1
+- Fix configuration file issues
+- Better estimation for the size of a tree that is to become an iso
+- Huge improvements to package ordering
+- Exclude boot.iso from installation media iso files
 
-* Mon Dec 01 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
+* Thu Feb 25 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
+- Add modmock, modhub, modcomposer
 - Rebuild for Fedora 10
 - Include modisolinux and modreuseinstaller
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Dec 2008 00:01:54 -0000	1.48
+++ sources	6 Apr 2009 03:13:03 -0000	1.49
@@ -1 +1 @@
-d90d492a216d24ac6ff53c2a18a6a69b  revisor-2.1.3.tar.gz
+c3d98ee3bd8399205e062e848c354ef2  revisor-2.1.4.tar.gz



From pnemade at fedoraproject.org  Mon Apr  6 03:49:01 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Mon,  6 Apr 2009 03:49:01 +0000 (UTC)
Subject: rpms/m17n-contrib/devel m17n-contrib.spec,1.25,1.26
Message-ID: <20090406034901.84826700FB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25013

Modified Files:
	m17n-contrib.spec 
Log Message:

* Mon Apr 06 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-3
- Fix broken deps for maithili subpackage.




Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- m17n-contrib.spec	3 Apr 2009 06:41:25 -0000	1.25
+++ m17n-contrib.spec	6 Apr 2009 03:48:30 -0000	1.26
@@ -74,7 +74,7 @@
 %mk_pkg_uses_db gujarati gu 1
 %mk_pkg_uses_db hindi hi 1
 %mk_pkg_uses_db kannada kn 1
-%mk_pkg_uses_db maithili mai 0
+%mk_pkg maithili mai 0
 %mk_pkg_uses_db malayalam ml 1
 %mk_pkg marathi mr 1
 %mk_pkg nepali ne 1
@@ -126,6 +126,9 @@
 %{_datadir}/m17n/scripts
 
 %changelog
+* Mon Apr 06 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-3
+- Fix broken deps for maithili subpackage.
+
 * Fri Apr 03 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-2
 - Resolves: rh#491794 [mai_IN] Removing @maithili-support removes m17n-db-hindi package
 - Resolves: rh#493793 [mai_IN] No default keymap for language



From pnemade at fedoraproject.org  Mon Apr  6 03:52:58 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Mon,  6 Apr 2009 03:52:58 +0000 (UTC)
Subject: rpms/m17n-contrib/devel m17n-contrib.spec,1.26,1.27
Message-ID: <20090406035258.964AF700FB@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26007

Modified Files:
	m17n-contrib.spec 
Log Message:

-Fix release number




Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- m17n-contrib.spec	6 Apr 2009 03:48:30 -0000	1.26
+++ m17n-contrib.spec	6 Apr 2009 03:52:28 -0000	1.27
@@ -1,7 +1,7 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
 Version:  1.1.9
-Release:  2%{?dist}
+Release:  3%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html



From pkgdb at fedoraproject.org  Mon Apr  6 05:12:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 05:12:52 +0000
Subject: [pkgdb] control-center: whot has requested commit
Message-ID: <20090406051231.3133E208555@bastion.fedora.phx.redhat.com>

whot has requested the commit acl on control-center (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Mon Apr  6 05:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 05:12:14 +0000
Subject: [pkgdb] control-center: whot has requested watchcommits
Message-ID: <20090406051234.437B3208602@bastion.fedora.phx.redhat.com>

whot has requested the watchcommits acl on control-center (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From airlied at fedoraproject.org  Mon Apr  6 05:30:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 05:30:09 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.68,
	1.69 drm-next.patch, 1.12, 1.13 drm-nouveau.patch, 1.33,
	1.34 kernel.spec, 1.1513, 1.1514 drm-radeon-reorder-bm.patch,
	1.1, NONE
Message-ID: <20090406053009.1AD7D700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18360

Modified Files:
	drm-modesetting-radeon.patch drm-next.patch drm-nouveau.patch 
	kernel.spec 
Removed Files:
	drm-radeon-reorder-bm.patch 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com>
- radeon: bust APIs and move to what we want in the end.


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- drm-modesetting-radeon.patch	18 Mar 2009 07:13:54 -0000	1.68
+++ drm-modesetting-radeon.patch	6 Apr 2009 05:30:06 -0000	1.69
@@ -1,3 +1,48 @@
+commit 280d9ff29dead8e85ed603110ed431d99f07fb99
+Merge: 0221c81 54ed280
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 14:35:32 2009 +1000
+
+    Merge branch 'drm-rawhide' into drm-f11
+    
+    Conflicts:
+    	drivers/gpu/drm/radeon/r300_cmdbuf.c
+    	drivers/gpu/drm/radeon/radeon_cp.c
+
+commit 54ed2800977d314d8af6c1c47cd718d82f734cb6
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Fri Apr 3 15:01:31 2009 +0200
+
+    radeon: cleanup userspace API
+    
+    Remove old userspace API we don't want to use and
+    rename wait_rendering to wait_idle
+    change mmap to using userspace mmap call
+
+commit 71c5ad46842fcd214a8e926eb9528e084622d488
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Fri Apr 3 13:48:20 2009 +0200
+
+    radeon: remove pin/unpin userspace ioctl
+
+commit 7628d2d9b66fc891fc0b030772a0ebae8e695561
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 3 14:56:19 2009 +1000
+
+    radeon: fix two issues with uncached allocs on PCIE systems
+
+commit 79a5ca0c53c2a149f51f71352a6bbf73bcdc40df
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 22:34:53 2009 +1000
+
+    radeon: reorder bm enable vs mode set
+
+commit c9e19d53bafaacd883ad9eafd3090eb6bc4e4837
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 25 21:49:49 2009 +1000
+
+    radeon: add vram limit for testing lower vram
+
 commit dea27f6e83efabdc3e37bc5a91d29d6dab893853
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Mar 18 17:07:07 2009 +1000
@@ -1749,7 +1794,7 @@
 
     drm: import TTM basic objects
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index e0ab173..69de2db 100644
+index 640339e..fdc60ea 100644
 --- a/arch/x86/mm/pat.c
 +++ b/arch/x86/mm/pat.c
 @@ -30,6 +30,7 @@
@@ -5283,10 +5328,10 @@
  
  out:
 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index 1c3a8c5..3b78927 100644
+index a04639d..0e46972 100644
 --- a/drivers/gpu/drm/drm_crtc_helper.c
 +++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -840,6 +840,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
+@@ -868,6 +868,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
  						set->x, set->y, old_fb);
  		if (ret != 0)
  		    goto fail_set_mode;
@@ -5295,7 +5340,7 @@
  	}
  
  	kfree(save_encoders);
-@@ -980,3 +982,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
+@@ -1007,3 +1009,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -5359,7 +5404,7 @@
  /**
   * Free a buffer.
 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index c26ee08..7687cc8 100644
+index c4ada8b..5d12e8d 100644
 --- a/drivers/gpu/drm/drm_drv.c
 +++ b/drivers/gpu/drm/drm_drv.c
 @@ -167,8 +167,12 @@ int drm_lastclose(struct drm_device * dev)
@@ -5957,10 +6002,10 @@
 +}
 +
 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index f52663e..4f1a405 100644
+index 09a3571..71da516 100644
 --- a/drivers/gpu/drm/drm_fops.c
 +++ b/drivers/gpu/drm/drm_fops.c
-@@ -481,6 +481,10 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -478,6 +478,10 @@ int drm_release(struct inode *inode, struct file *filp)
  	}
  	mutex_unlock(&dev->ctxlist_mutex);
  
@@ -5971,7 +6016,7 @@
  	mutex_lock(&dev->struct_mutex);
  
  	if (file_priv->is_master) {
-@@ -514,6 +518,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -511,6 +515,7 @@ int drm_release(struct inode *inode, struct file *filp)
  	/* drop the reference held my the file priv */
  	drm_master_put(&file_priv->master);
  	file_priv->is_master = 0;
@@ -5980,7 +6025,7 @@
  	mutex_unlock(&dev->struct_mutex);
  
 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index 60a1b6c..c6bde4c 100644
+index f0f6c6b..dfe452e 100644
 --- a/drivers/gpu/drm/drm_info.c
 +++ b/drivers/gpu/drm/drm_info.c
 @@ -35,6 +35,7 @@
@@ -6886,7 +6931,7 @@
 +}
 +EXPORT_SYMBOL(drm_ttm_bind);
 diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
-index 22f7656..9cd3605 100644
+index 22f7656..e6bbf0e 100644
 --- a/drivers/gpu/drm/drm_vm.c
 +++ b/drivers/gpu/drm/drm_vm.c
 @@ -37,9 +37,15 @@
@@ -6947,6 +6992,15 @@
  static void drm_vm_open(struct vm_area_struct *vma)
  {
  	struct drm_file *priv = vma->vm_file->private_data;
+@@ -572,7 +592,7 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
+ 		return drm_mmap_dma(filp, vma);
+ 
+ 	if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash)) {
+-		DRM_ERROR("Could not find map\n");
++		DRM_ERROR("Could not find map %08x\n", vma->vm_pgoff);
+ 		return -EINVAL;
+ 	}
+ 
 @@ -652,6 +672,8 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
  		vma->vm_flags |= VM_RESERVED;
  		vma->vm_page_prot = drm_dma_prot(map->type, vma);
@@ -7145,10 +7199,10 @@
 +	return 0;
 +}
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 87b6b60..fb548e0 100644
+index ee7ce7b..95422bb 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -374,7 +374,8 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
+@@ -397,7 +397,8 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
  	return ret;
  }
  
@@ -7159,10 +7213,10 @@
  int i915_irq_emit(struct drm_device *dev, void *data,
  			 struct drm_file *file_priv)
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index a283427..1f159ce 100644
+index 64773ce..178386d 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -446,12 +446,18 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -763,12 +763,18 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  	if (!master_priv->sarea_priv)
  		return 0;
  
@@ -7185,7 +7239,7 @@
  	}
  
  	return 0;
-@@ -574,12 +580,12 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
+@@ -891,12 +897,12 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
  
  	switch (pipe) {
  	case 0:
@@ -14793,7 +14847,7 @@
 +}
 +
 diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
-index 3efa633..e093532 100644
+index cb2e470..9489a05 100644
 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
 +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
 @@ -35,6 +35,7 @@
@@ -14826,16 +14880,16 @@
  
  #define ADD_RANGE(reg, count)	ADD_RANGE_MARK(reg, count, MARK_SAFE)
  
-@@ -207,7 +207,7 @@ void r300_init_reg_flags(struct drm_device *dev)
- 	ADD_RANGE(0x42C0, 2);
- 	ADD_RANGE(R300_RS_CNTL_0, 2);
+@@ -211,7 +211,7 @@ void r300_init_reg_flags(struct drm_device *dev)
+ 	if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV530)
+ 		ADD_RANGE(RV530_FG_ZBREG_DEST, 1);
  
 -	ADD_RANGE(R300_SC_HYPERZ, 2);
 +	ADD_RANGE(0x43A4, 2);
  	ADD_RANGE(0x43E8, 1);
  
  	ADD_RANGE(0x46A4, 5);
-@@ -226,12 +226,14 @@ void r300_init_reg_flags(struct drm_device *dev)
+@@ -230,12 +230,15 @@ void r300_init_reg_flags(struct drm_device *dev)
  	ADD_RANGE(0x4E50, 9);
  	ADD_RANGE(0x4E88, 1);
  	ADD_RANGE(0x4EA0, 2);
@@ -14853,10 +14907,11 @@
 +	ADD_RANGE(0x4F30, 2);
 +	ADD_RANGE(0x4F44, 1);
 +	ADD_RANGE(0x4F54, 1);
++
+ 	ADD_RANGE(R300_ZB_ZPASS_DATA, 2); /* ZB_ZPASS_DATA, ZB_ZPASS_ADDR */
  
  	ADD_RANGE(R300_TX_FILTER_0, 16);
- 	ADD_RANGE(R300_TX_FILTER1_0, 16);
-@@ -244,11 +246,16 @@ void r300_init_reg_flags(struct drm_device *dev)
+@@ -249,11 +252,16 @@ void r300_init_reg_flags(struct drm_device *dev)
  	ADD_RANGE(R300_TX_BORDER_COLOR_0, 16);
  
  	/* Sporadic registers used as primitives are emitted */
@@ -14874,7 +14929,7 @@
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
  		ADD_RANGE(R500_VAP_INDEX_OFFSET, 1);
  		ADD_RANGE(R500_US_CONFIG, 2);
-@@ -258,7 +265,10 @@ void r300_init_reg_flags(struct drm_device *dev)
+@@ -263,7 +271,10 @@ void r300_init_reg_flags(struct drm_device *dev)
  		ADD_RANGE(R500_RS_INST_0, 16);
  		ADD_RANGE(R500_RB3D_COLOR_CLEAR_VALUE_AR, 2);
  		ADD_RANGE(R500_RB3D_CONSTANT_COLOR_AR, 2);
@@ -14886,7 +14941,7 @@
  	} else {
  		ADD_RANGE(R300_PFS_CNTL_0, 3);
  		ADD_RANGE(R300_PFS_NODE_0, 4);
-@@ -270,10 +280,125 @@ void r300_init_reg_flags(struct drm_device *dev)
+@@ -275,10 +286,125 @@ void r300_init_reg_flags(struct drm_device *dev)
  		ADD_RANGE(R300_RS_INTERP_0, 8);
  		ADD_RANGE(R300_RS_ROUTE_0, 8);
  
@@ -15013,7 +15068,7 @@
  {
  	int i;
  	if (reg & ~0xffff)
-@@ -284,6 +409,13 @@ static __inline__ int r300_check_range(unsigned reg, int count)
+@@ -289,6 +415,13 @@ static __inline__ int r300_check_range(unsigned reg, int count)
  	return 0;
  }
  
@@ -15028,7 +15083,7 @@
  							  dev_priv,
  							  drm_radeon_kcmd_buffer_t
 diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h
-index ee6f811..12f4abb 100644
+index bdbc95f..906c534 100644
 --- a/drivers/gpu/drm/radeon/r300_reg.h
 +++ b/drivers/gpu/drm/radeon/r300_reg.h
 @@ -126,15 +126,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -15347,7 +15402,7 @@
  /* BEGIN: Vertex program instruction set */
  
 diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
-index 9d14eee..a379ead 100644
+index bc9d09d..c3f12e6 100644
 --- a/drivers/gpu/drm/radeon/r600_cp.c
 +++ b/drivers/gpu/drm/radeon/r600_cp.c
 @@ -1720,7 +1720,7 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev,
@@ -16402,10 +16457,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
 new file mode 100644
-index 0000000..86ab054
+index 0000000..6ea52a8
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,457 @@
+@@ -0,0 +1,464 @@
 +/**************************************************************************
 + * 
 + * Copyright 2007 Dave Airlie
@@ -16855,12 +16910,19 @@
 + */
 +uint64_t radeon_evict_flags(struct drm_buffer_object *bo)
 +{
++	struct drm_device *dev = bo->dev;
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	int cached = 0;
++
++	if (!(dev_priv->flags & RADEON_IS_AGP))
++		cached = DRM_BO_FLAG_CACHED;
++
 +	switch (bo->mem.mem_type) {
 +	case DRM_BO_MEM_LOCAL:
 +	case DRM_BO_MEM_TT:
-+		return DRM_BO_FLAG_MEM_LOCAL;
++		return DRM_BO_FLAG_MEM_LOCAL | cached;
 +	default:
-+		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL;
++		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL | cached;
 +	}
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -19251,7 +19313,7 @@
 +	kfree(connector);
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 6f579a8..ac31d0b 100644
+index 77a7a4d..2028a52 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
@@ -19580,7 +19642,7 @@
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
 -		RADEON_WRITE_PLL(R500_DYN_SCLK_PWMEM_PIPE, (1 | ((gb_pipe_sel >> 8) & 0xf) << 4));
 +		RADEON_WRITE_PLL(dev_priv, R500_DYN_SCLK_PWMEM_PIPE, (1 | ((gb_pipe_sel >> 8) & 0xf) << 4));
- 		RADEON_WRITE(R500_SU_REG_DEST, ((1 << dev_priv->num_gb_pipes) - 1));
+ 		RADEON_WRITE(R300_SU_REG_DEST, ((1 << dev_priv->num_gb_pipes) - 1));
  	}
  	RADEON_WRITE(R300_GB_TILE_CONFIG, gb_tile_config);
 @@ -547,7 +684,6 @@ static void radeon_do_cp_flush(drm_radeon_private_t * dev_priv)
@@ -21288,10 +21350,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
 new file mode 100644
-index 0000000..d4d9110
+index 0000000..5c1082f
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cs.c
-@@ -0,0 +1,687 @@
+@@ -0,0 +1,681 @@
 +/*
 + * Copyright 2008 Jerome Glisse.
 + * All Rights Reserved.
@@ -21393,11 +21455,6 @@
 +		if (parser.chunks[i].chunk_id == RADEON_CHUNK_ID_IB)
 +			parser.ib_index = i;
 +
-+		if (parser.chunks[i].chunk_id == RADEON_CHUNK_ID_OLD) {
-+			parser.ib_index = i;
-+			parser.reloc_index = -1;
-+		}
-+
 +		parser.chunks[i].length_dw = user_chunk.length_dw;
 +		parser.chunks[i].chunk_data = (uint32_t *)(unsigned long)user_chunk.chunk_data;
 +
@@ -21406,7 +21463,6 @@
 +
 +		switch(parser.chunks[i].chunk_id) {
 +		case RADEON_CHUNK_ID_IB:
-+		case RADEON_CHUNK_ID_OLD:
 +			if (size == 0) {
 +				r = -EINVAL;
 +				goto out;
@@ -22878,7 +22934,7 @@
 +	if (!ret)
 +		return ret;
 +
-+	drm_helper_initial_config(dev, false);
++	drm_helper_initial_config(dev);
 +
 +	return 0;
 +}
@@ -22897,10 +22953,10 @@
 +	drm_mode_config_cleanup(dev);
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 13a60f4..fcb05a4 100644
+index 13a60f4..8207f33 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -35,48 +35,97 @@
+@@ -35,48 +35,101 @@
  #include "radeon_drv.h"
  
  #include "drm_pciids.h"
@@ -22912,6 +22968,7 @@
 +int radeon_agpmode = 0;
 +int radeon_vram_zero = 0;
 +int radeon_gart_size = 512; /* default gart size */
++int radeon_vram_limit = -1;
  
  MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
  module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -22944,6 +23001,9 @@
 -		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
 -	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
 -	return 0;
++MODULE_PARM_DESC(vramlimit, "Restrict VRAM vfor testing");
++module_param_named(vramlimit, radeon_vram_limit, int, 0600);
++
 +static struct drm_driver driver;
 +
 +static struct pci_device_id pciidlist[] = {
@@ -23020,7 +23080,7 @@
  	.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
  	.load = radeon_driver_load,
  	.firstopen = radeon_driver_firstopen,
-@@ -92,6 +141,10 @@ static struct drm_driver driver = {
+@@ -92,6 +145,10 @@ static struct drm_driver driver = {
  	.disable_vblank = radeon_disable_vblank,
  	.master_create = radeon_master_create,
  	.master_destroy = radeon_master_destroy,
@@ -23031,7 +23091,7 @@
  	.irq_preinstall = radeon_driver_irq_preinstall,
  	.irq_postinstall = radeon_driver_irq_postinstall,
  	.irq_uninstall = radeon_driver_irq_uninstall,
-@@ -100,7 +153,11 @@ static struct drm_driver driver = {
+@@ -100,7 +157,11 @@ static struct drm_driver driver = {
  	.get_map_ofs = drm_core_get_map_ofs,
  	.get_reg_ofs = drm_core_get_reg_ofs,
  	.ioctls = radeon_ioctls,
@@ -23043,7 +23103,7 @@
  	.fops = {
  		 .owner = THIS_MODULE,
  		 .open = drm_open,
-@@ -117,8 +174,15 @@ static struct drm_driver driver = {
+@@ -117,8 +178,15 @@ static struct drm_driver driver = {
  	.pci_driver = {
  		 .name = DRIVER_NAME,
  		 .id_table = pciidlist,
@@ -23059,7 +23119,7 @@
  	.name = DRIVER_NAME,
  	.desc = DRIVER_DESC,
  	.date = DRIVER_DATE,
-@@ -130,6 +194,29 @@ static struct drm_driver driver = {
+@@ -130,6 +198,29 @@ static struct drm_driver driver = {
  static int __init radeon_init(void)
  {
  	driver.num_ioctls = radeon_max_ioctl;
@@ -23090,7 +23150,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 7091aaf..186e2bc 100644
+index ed4d27e..84f0a8c 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -23332,7 +23392,7 @@
  } drm_radeon_private_t;
  
  typedef struct drm_radeon_buf_priv {
-@@ -362,8 +488,14 @@ typedef struct drm_radeon_kcmd_buffer {
+@@ -362,8 +488,15 @@ typedef struct drm_radeon_kcmd_buffer {
  } drm_radeon_kcmd_buffer_t;
  
  extern int radeon_no_wb;
@@ -23344,10 +23404,11 @@
 +extern int radeon_modeset;
 +extern int radeon_vram_zero;
 +extern int radeon_gart_size;
++extern int radeon_vram_limit;
  
  extern u32 radeon_get_ring_head(drm_radeon_private_t *dev_priv);
  extern void radeon_set_ring_head(drm_radeon_private_t *dev_priv, u32 val);
-@@ -397,7 +529,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi
+@@ -397,7 +530,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi
  extern int radeon_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv);
@@ -23356,7 +23417,7 @@
  extern void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base);
  extern u32 RADEON_READ_MM(drm_radeon_private_t *dev_priv, int addr);
  
-@@ -406,12 +538,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev);
+@@ -406,12 +539,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev);
  
  extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
  
@@ -23370,7 +23431,7 @@
  extern int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *file_priv);
-@@ -443,13 +572,13 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
+@@ -443,13 +573,13 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
  extern int radeon_driver_load(struct drm_device *dev, unsigned long flags);
  extern int radeon_driver_unload(struct drm_device *dev);
  extern int radeon_driver_firstopen(struct drm_device *dev);
@@ -23388,7 +23449,7 @@
  extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
  				unsigned long arg);
  
-@@ -478,6 +607,12 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev,
+@@ -478,6 +608,12 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev,
  extern int r600_page_table_init(struct drm_device *dev);
  extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info);
  
@@ -23401,7 +23462,7 @@
  /* Flags for stats.boxes
   */
  #define RADEON_BOX_DMA_IDLE      0x1
-@@ -486,12 +621,17 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
+@@ -486,12 +622,17 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
  #define RADEON_BOX_WAIT_IDLE     0x8
  #define RADEON_BOX_TEXTURE_LOAD  0x10
  
@@ -23419,7 +23480,7 @@
  #define RADEON_AGP_COMMAND		0x0f60
  #define RADEON_AGP_COMMAND_PCI_CONFIG   0x0060	/* offset in PCI config */
  #	define RADEON_AGP_ENABLE	(1<<8)
-@@ -667,16 +807,6 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
+@@ -667,16 +808,6 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
  #define R520_MC_IND_WR_EN (1 << 24)
  #define R520_MC_IND_DATA  0x74
  
@@ -23436,7 +23497,7 @@
  #define RADEON_MPP_TB_CONFIG		0x01c0
  #define RADEON_MEM_CNTL			0x0140
  #define RADEON_MEM_SDRAM_MODE_REG	0x0158
-@@ -741,6 +871,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
+@@ -740,6 +871,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
  #define RADEON_SCRATCH_REG3		0x15ec
  #define RADEON_SCRATCH_REG4		0x15f0
  #define RADEON_SCRATCH_REG5		0x15f4
@@ -23444,7 +23505,7 @@
  #define RADEON_SCRATCH_UMSK		0x0770
  #define RADEON_SCRATCH_ADDR		0x0774
  
-@@ -763,6 +894,12 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -762,6 +894,12 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  
  #define R600_SCRATCHOFF(x)		(R600_SCRATCH_REG_OFFSET + 4*(x))
  
@@ -23457,7 +23518,7 @@
  #define RADEON_GEN_INT_CNTL		0x0040
  #	define RADEON_CRTC_VBLANK_MASK		(1 << 0)
  #	define RADEON_CRTC2_VBLANK_MASK		(1 << 9)
-@@ -780,10 +917,13 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -779,10 +917,13 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define RADEON_SW_INT_FIRE		(1 << 26)
  #       define R500_DISPLAY_INT_STATUS          (1 << 0)
  
@@ -23475,7 +23536,7 @@
  
  #define RADEON_ISYNC_CNTL		0x1724
  #	define RADEON_ISYNC_ANY2D_IDLE3D	(1 << 0)
-@@ -822,12 +962,17 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -821,12 +962,17 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_PP_TXFILTER_1		0x1c6c
  #define RADEON_PP_TXFILTER_2		0x1c84
  
@@ -23499,7 +23560,7 @@
  #define RADEON_RB3D_CNTL		0x1c3c
  #	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
  #	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
-@@ -854,11 +999,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -853,11 +999,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define R300_ZC_FLUSH		        (1 << 0)
  #	define R300_ZC_FREE		        (1 << 1)
  #	define R300_ZC_BUSY		        (1 << 31)
@@ -23511,7 +23572,7 @@
  #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
  #	define R300_RB3D_DC_FLUSH		(2 << 0)
  #	define R300_RB3D_DC_FREE		(2 << 2)
-@@ -866,15 +1006,15 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -865,15 +1006,15 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_RB3D_ZSTENCILCNTL	0x1c2c
  #	define RADEON_Z_TEST_MASK		(7 << 4)
  #	define RADEON_Z_TEST_ALWAYS		(7 << 4)
@@ -23531,7 +23592,7 @@
  #define RADEON_RBBM_SOFT_RESET		0x00f0
  #	define RADEON_SOFT_RESET_CP		(1 <<  0)
  #	define RADEON_SOFT_RESET_HI		(1 <<  1)
-@@ -1052,6 +1192,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1051,6 +1192,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define RADEON_PRE_WRITE_LIMIT_SHIFT	23
  
  #define RADEON_CP_IB_BASE		0x0738
@@ -23539,7 +23600,7 @@
  
  #define RADEON_CP_CSQ_CNTL		0x0740
  #	define RADEON_CSQ_CNT_PRIMARY_MASK	(0xff << 0)
-@@ -1062,6 +1203,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1061,6 +1203,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define RADEON_CSQ_PRIBM_INDBM		(4 << 28)
  #	define RADEON_CSQ_PRIPIO_INDPIO		(15 << 28)
  
@@ -23548,7 +23609,7 @@
  #define RADEON_AIC_CNTL			0x01d0
  #	define RADEON_PCIGART_TRANSLATE_EN	(1 << 0)
  #	define RS400_MSI_REARM	                (1 << 3)
-@@ -1144,27 +1287,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1143,27 +1287,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_NUM_VERTICES_SHIFT		16
  
  #define RADEON_COLOR_FORMAT_CI8		2
@@ -23576,7 +23637,7 @@
  
  #define R200_PP_TXCBLEND_0                0x2f00
  #define R200_PP_TXCBLEND_1                0x2f10
-@@ -1275,16 +1397,44 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1274,16 +1397,44 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  
  #define R200_SE_TCL_POINT_SPRITE_CNTL     0x22c4
  
@@ -23623,7 +23684,7 @@
  #define R500_D1CRTC_STATUS 0x609c
  #define R500_D2CRTC_STATUS 0x689c
  #define R500_CRTC_V_BLANK (1<<0)
-@@ -1746,6 +1896,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1745,6 +1896,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_RING_HIGH_MARK		128
  
  #define RADEON_PCIGART_TABLE_SIZE      (32*1024)
@@ -23632,7 +23693,7 @@
  
  #define RADEON_READ(reg)	DRM_READ32(  dev_priv->mmio, (reg) )
  #define RADEON_WRITE(reg, val)                                          \
-@@ -1760,11 +1912,24 @@ do {									\
+@@ -1759,11 +1912,24 @@ do {									\
  #define RADEON_READ8(reg)	DRM_READ8(  dev_priv->mmio, (reg) )
  #define RADEON_WRITE8(reg,val)	DRM_WRITE8( dev_priv->mmio, (reg), (val) )
  
@@ -23662,7 +23723,7 @@
  } while (0)
  
  #define RADEON_WRITE_PCIE(addr, val)					\
-@@ -1802,15 +1967,18 @@ do {							        \
+@@ -1801,15 +1967,18 @@ do {							        \
  	RADEON_WRITE(RS600_MC_DATA, val);                       \
  } while (0)
  
@@ -23684,7 +23745,7 @@
  } while (0)
  
  #define CP_PACKET0( reg, n )						\
-@@ -1831,7 +1999,7 @@ do {									\
+@@ -1830,7 +1999,7 @@ do {									\
  #define RADEON_WAIT_UNTIL_2D_IDLE() do {				\
  	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
  	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
@@ -23693,7 +23754,7 @@
  } while (0)
  
  #define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
-@@ -2036,4 +2204,161 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv);
+@@ -2035,4 +2204,158 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv);
  	write &= mask;						\
  } while (0)
  
@@ -23760,9 +23821,6 @@
 +
 +	if (dev->primary->master) {
 +		master_priv = dev->primary->master->driver_priv;
-+		       
-+		if (master_priv->sarea_priv)
-+			master_priv->sarea_priv->last_fence = dev_priv->counter;
 +	}
 +	return dev_priv->counter;
 +}
@@ -26644,10 +26702,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..ebb763d
+index 0000000..2f0c54a
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1577 @@
+@@ -0,0 +1,1457 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -26711,11 +26769,8 @@
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct drm_radeon_gem_info *args = data;
 +
-+	args->vram_start = dev_priv->mm.vram_offset;
 +	args->vram_size = dev_priv->mm.vram_size;
 +	args->vram_visible = dev_priv->mm.vram_visible;
-+
-+	args->gart_start = dev_priv->mm.gart_start;
 +	args->gart_size = dev_priv->mm.gart_useable;
 +
 +	return 0;
@@ -26781,11 +26836,12 @@
 +	struct drm_gem_object *obj;
 +	int ret = 0;
 +	int handle;
++	bool no_backing_store = !!(args->flags & RADEON_GEM_NO_BACKING_STORE);
 +
 +	/* create a gem object to contain this object in */
 +	args->size = roundup(args->size, PAGE_SIZE);
 +
-+	obj = radeon_gem_object_alloc(dev, args->size, args->alignment, args->initial_domain, args->no_backing_store);
++	obj = radeon_gem_object_alloc(dev, args->size, args->alignment, args->initial_domain, no_backing_store);
 +	if (!obj)
 +		return -EINVAL;
 +
@@ -26964,7 +27020,6 @@
 +	struct drm_gem_object *obj;
 +	struct drm_radeon_gem_object *obj_priv;
 +	loff_t offset;
-+	unsigned long addr;
 +
 +	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
 +	if (obj == NULL)
@@ -26972,10 +27027,8 @@
 +
 +	offset = args->offset;
 +
-+	DRM_DEBUG("got here %p\n", obj);
 +	obj_priv = obj->driver_private;
 +
-+	DRM_DEBUG("got here %p %p %lld %ld\n", obj, obj_priv->bo, args->size, obj_priv->bo->num_pages);
 +	if (!obj_priv->bo) {
 +		mutex_lock(&dev->struct_mutex);
 +		drm_gem_object_unreference(obj);
@@ -26983,93 +27036,13 @@
 +		return -EINVAL;
 +	}
 +
-+	down_write(&current->mm->mmap_sem);
-+	addr = do_mmap_pgoff(file_priv->filp, 0, args->size,
-+			     PROT_READ | PROT_WRITE, MAP_SHARED,
-+			     obj_priv->bo->map_list.hash.key);
-+	up_write(&current->mm->mmap_sem);
++	args->addr_ptr = (uint64_t)obj_priv->bo->map_list.hash.key << PAGE_SHIFT;
 +
-+	DRM_DEBUG("got here %p %d\n", obj, obj_priv->bo->mem.mem_type);
 +	mutex_lock(&dev->struct_mutex);
 +	drm_gem_object_unreference(obj);
 +	mutex_unlock(&dev->struct_mutex);
-+	if (IS_ERR((void *)addr))
-+		return addr;
-+
-+	args->addr_ptr = (uint64_t) addr;
 +
 +	return 0;
-+
-+}
-+
-+int radeon_gem_pin_ioctl(struct drm_device *dev, void *data,
-+			 struct drm_file *file_priv)
-+{
-+	struct drm_radeon_gem_pin *args = data;
-+	struct drm_gem_object *obj;
-+	struct drm_radeon_gem_object *obj_priv;
-+	int ret;
-+	int flags = DRM_BO_FLAG_NO_EVICT;
-+	int mask = DRM_BO_FLAG_NO_EVICT;
-+
-+	/* check for valid args */
-+	if (args->pin_domain) {
-+		mask |= DRM_BO_MASK_MEM;
-+		if (args->pin_domain == RADEON_GEM_DOMAIN_GTT)
-+			flags |= DRM_BO_FLAG_MEM_TT;
-+		else if (args->pin_domain == RADEON_GEM_DOMAIN_VRAM)
-+			flags |= DRM_BO_FLAG_MEM_VRAM;
-+		else /* hand back the offset we currently have if no args supplied
-+		      - this is to allow old mesa to work - its a hack */
-+			flags = 0;
-+	}
-+
-+	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
-+	if (obj == NULL)
-+		return -EINVAL;
-+
-+	obj_priv = obj->driver_private;
-+
-+	/* validate into a pin with no fence */
-+	DRM_DEBUG("got here %p %p %d\n", obj, obj_priv->bo, atomic_read(&obj_priv->bo->usage));
-+	if (flags && !(obj_priv->bo->type != drm_bo_type_kernel && !DRM_SUSER(DRM_CURPROC))) {
-+		ret = drm_bo_do_validate(obj_priv->bo, flags, mask,
-+					 DRM_BO_HINT_DONT_FENCE, 0);
-+	} else
-+		ret = 0;
-+
-+	args->offset = obj_priv->bo->offset;
-+	DRM_DEBUG("got here %p %p %lx\n", obj, obj_priv->bo, obj_priv->bo->offset);
-+
-+	mutex_lock(&dev->struct_mutex);
-+	drm_gem_object_unreference(obj);
-+	mutex_unlock(&dev->struct_mutex);
-+	return ret;
-+}
-+
-+int radeon_gem_unpin_ioctl(struct drm_device *dev, void *data,
-+			   struct drm_file *file_priv)
-+{
-+	struct drm_radeon_gem_unpin *args = data;
-+	struct drm_gem_object *obj;
-+	struct drm_radeon_gem_object *obj_priv;
-+	int ret;
-+
-+	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
-+	if (obj == NULL)
-+		return -EINVAL;
-+
-+	obj_priv = obj->driver_private;
-+
-+	/* validate into a pin with no fence */
-+
-+	ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
-+				 DRM_BO_HINT_DONT_FENCE, 0);
-+
-+	mutex_lock(&dev->struct_mutex);
-+	drm_gem_object_unreference(obj);
-+	mutex_unlock(&dev->struct_mutex);
-+	return ret;
 +}
 +
 +int radeon_gem_busy(struct drm_device *dev, void *data,
@@ -27081,7 +27054,7 @@
 +int radeon_gem_wait_rendering(struct drm_device *dev, void *data,
 +			      struct drm_file *file_priv)
 +{
-+	struct drm_radeon_gem_wait_rendering *args = data;
++	struct drm_radeon_gem_wait_idle *args = data;
 +	struct drm_gem_object *obj;
 +	struct drm_radeon_gem_object *obj_priv;
 +	int ret;
@@ -27192,6 +27165,14 @@
 +	if (accessible > bar_size)
 +		accessible = bar_size;
 +
++	if (radeon_vram_limit > 0) {
++		if ((radeon_vram_limit *  1024) < vram) {
++			DRM_INFO("Forcing VRAM limit from %dK to %dK\n",
++				vram, radeon_vram_limit * 1024);
++			vram = radeon_vram_limit * 1024;
++		}
++	}
++		
 +	if (accessible > vram)
 +		accessible = vram;
 +
@@ -27316,11 +27297,15 @@
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	int ret;
++	int cached = 0;
++
++	if (!(dev_priv->flags & RADEON_IS_AGP))
++		cached = DRM_BO_FLAG_CACHED;
 +
 +	ret = drm_buffer_object_create(dev, RADEON_DEFAULT_RING_SIZE,
 +				       drm_bo_type_kernel,
 +				       DRM_BO_FLAG_READ | DRM_BO_FLAG_MEM_TT |
-+				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT,
++				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT | cached,
 +				       0, 1, 0, &dev_priv->mm.ring.bo);
 +	if (ret) {
 +		if (dev_priv->flags & RADEON_IS_AGP)
@@ -27340,7 +27325,7 @@
 +	ret = drm_buffer_object_create(dev, PAGE_SIZE,
 +				       drm_bo_type_kernel,
 +				       DRM_BO_FLAG_WRITE |DRM_BO_FLAG_READ | DRM_BO_FLAG_MEM_TT |
-+				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT,
++				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT | cached,
 +				       0, 1, 0, &dev_priv->mm.ring_read.bo);
 +	if (ret) {
 +		DRM_ERROR("failed to allocate ring read\n");
@@ -28178,53 +28163,6 @@
 +	radeon_gem_ib_destroy(dev);
 +	return -ENOMEM;
 +}
-+
-+static struct drm_gem_object *gem_object_get(struct drm_device *dev, uint32_t name)
-+{
-+	struct drm_gem_object *obj;
-+
-+	spin_lock(&dev->object_name_lock);
-+	obj = idr_find(&dev->object_name_idr, name);
-+	if (obj)
-+		drm_gem_object_reference(obj);
-+	spin_unlock(&dev->object_name_lock);
-+	return obj;
-+}
-+
-+void radeon_gem_update_offsets(struct drm_device *dev, struct drm_master *master)
-+{
-+	drm_radeon_private_t *dev_priv = dev->dev_private;
-+	struct drm_radeon_master_private *master_priv = master->driver_priv;
-+	drm_radeon_sarea_t *sarea_priv = master_priv->sarea_priv;
-+	struct drm_gem_object *obj;
-+	struct drm_radeon_gem_object *obj_priv;
-+
-+	/* update front_pitch_offset and back_pitch_offset */
-+	obj = gem_object_get(dev, sarea_priv->front_handle);
-+	if (obj) {
-+		obj_priv = obj->driver_private;
-+
-+		dev_priv->front_offset = obj_priv->bo->offset;
-+		dev_priv->front_pitch_offset = (((sarea_priv->front_pitch / 64) << 22) |
-+						((obj_priv->bo->offset
-+						  + dev_priv->fb_location) >> 10));
-+		drm_gem_object_unreference(obj);
-+	}
-+
-+	obj = gem_object_get(dev, sarea_priv->back_handle);
-+	if (obj) {
-+		obj_priv = obj->driver_private;
-+		dev_priv->back_offset = obj_priv->bo->offset;
-+		dev_priv->back_pitch_offset = (((sarea_priv->back_pitch / 64) << 22) |
-+						((obj_priv->bo->offset
-+						  + dev_priv->fb_location) >> 10));
-+		drm_gem_object_unreference(obj);
-+	}
-+	dev_priv->color_fmt = RADEON_COLOR_FORMAT_ARGB8888;
-+
-+}
-+
-+
 diff --git a/drivers/gpu/drm/radeon/radeon_gem_debugfs.c b/drivers/gpu/drm/radeon/radeon_gem_debugfs.c
 new file mode 100644
 index 0000000..93f36ce
@@ -31550,10 +31488,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
 new file mode 100644
-index 0000000..ac7bc0a
+index 0000000..0d2f4a5
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_pm.c
-@@ -0,0 +1,257 @@
+@@ -0,0 +1,258 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -31667,8 +31605,6 @@
 +	if (pci_enable_device(dev->pdev))
 +		return -1;
 +
-+	/* Turn on bus mastering -todo fix properly */
-+	radeon_enable_bm(dev_priv);
 +
 +	DRM_ERROR("\n");
 +	/* on atom cards re init the whole card 
@@ -31681,7 +31617,6 @@
 +		radeon_combios_asic_init(dev);
 +	}
 +
-+	pci_set_master(dev->pdev);
 +
 +	for (i = 0; i < 8; i++)
 +		RADEON_WRITE(RADEON_BIOS_0_SCRATCH + (i * 4), dev_priv->pmregs.bios_scratch[i]);
@@ -31706,6 +31641,10 @@
 +	
 +	radeon_init_memory_map(dev);
 +
++	pci_set_master(dev->pdev);
++	/* Turn on bus mastering -todo fix properly */
++	radeon_enable_bm(dev_priv);
++
 +	if (dev_priv->flags & RADEON_IS_PCIE) {
 +		memcpy_toio(dev_priv->mm.pcie_table.kmap.virtual, dev_priv->mm.pcie_table_backup, dev_priv->gart_info.table_size);
 +	}
@@ -37162,7 +37101,7 @@
 +
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index fa728ec..6d96e7e 100644
+index fa728ec..ebc5d6c 100644
 --- a/drivers/gpu/drm/radeon/radeon_state.c
 +++ b/drivers/gpu/drm/radeon/radeon_state.c
 @@ -305,8 +305,9 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
@@ -37268,17 +37207,7 @@
  		/* Update the input parameters for next time */
  		image->y += height;
  		image->height -= height;
-@@ -2213,6 +2216,9 @@ static int radeon_cp_swap(struct drm_device *dev, void *data, struct drm_file *f
- 	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
- 		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
- 
-+	if (dev_priv->mm.vram_offset)
-+		radeon_gem_update_offsets(dev, file_priv->master);
-+
- 	radeon_cp_dispatch_swap(dev, file_priv->master);
- 	sarea_priv->ctx_owner = 0;
- 
-@@ -2610,8 +2616,8 @@ static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
+@@ -2610,8 +2613,8 @@ static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
  	if (id >= RADEON_MAX_STATE_PACKETS)
  		return -EINVAL;
  
@@ -37289,7 +37218,7 @@
  
  	if (sz * sizeof(int) > cmdbuf->bufsz) {
  		DRM_ERROR("Packet size provided larger than data provided\n");
-@@ -2879,7 +2885,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file
+@@ -2879,7 +2882,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file
  
  	orig_nbox = cmdbuf->nbox;
  
@@ -37298,20 +37227,17 @@
  		int temp;
  		temp = r300_do_cp_cmdbuf(dev, file_priv, cmdbuf);
  
-@@ -3081,6 +3087,12 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3081,6 +3084,9 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
  	case RADEON_PARAM_NUM_GB_PIPES:
  		value = dev_priv->num_gb_pipes;
  		break;
-+	case RADEON_PARAM_KERNEL_MM:
-+		value = dev_priv->mm_enabled;
-+		break;
 +	case RADEON_PARAM_DEVICE_ID:
 +		value = dev->pci_device;  /* just return the PCI device ID */
 +		break;
  	default:
  		DRM_DEBUG("Invalid parameter %d\n", param->param);
  		return -EINVAL;
-@@ -3103,11 +3115,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3103,11 +3109,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
  
  	switch (sp->param) {
  	case RADEON_SETPARAM_FB_LOCATION:
@@ -37329,7 +37255,7 @@
  		if (sp->value == 0) {
  			DRM_DEBUG("color tiling disabled\n");
  			dev_priv->front_pitch_offset &= ~RADEON_DST_TILE_MACRO;
-@@ -3123,13 +3141,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3123,13 +3135,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
  		}
  		break;
  	case RADEON_SETPARAM_PCIGART_LOCATION:
@@ -37351,22 +37277,7 @@
  		dev_priv->gart_info.table_size = sp->value;
  		if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE)
  			dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
-@@ -3137,6 +3163,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
- 	case RADEON_SETPARAM_VBLANK_CRTC:
- 		return radeon_vblank_crtc_set(dev, sp->value);
- 		break;
-+	case RADEON_SETPARAM_MM_INIT:
-+		if (drm_core_check_feature(dev, DRIVER_MODESET))
-+			return 0;
-+
-+		dev_priv->new_memmap = true;
-+		dev_priv->user_mm_enable = true;
-+		return radeon_gem_mm_init(dev);
-+		break;
- 	default:
- 		DRM_DEBUG("Invalid parameter %d\n", sp->param);
- 		return -EINVAL;
-@@ -3226,7 +3260,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
+@@ -3226,7 +3246,17 @@ struct drm_ioctl_desc radeon_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
@@ -37377,21 +37288,19 @@
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_CREATE, radeon_gem_create_ioctl, DRM_AUTH),
 +
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_MMAP, radeon_gem_mmap_ioctl, DRM_AUTH),
-+	DRM_IOCTL_DEF(DRM_RADEON_GEM_PIN, radeon_gem_pin_ioctl, DRM_AUTH),
-+	DRM_IOCTL_DEF(DRM_RADEON_GEM_UNPIN, radeon_gem_unpin_ioctl, DRM_AUTH),
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_PREAD, radeon_gem_pread_ioctl, DRM_AUTH),
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_PWRITE, radeon_gem_pwrite_ioctl, DRM_AUTH),
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_SET_DOMAIN, radeon_gem_set_domain_ioctl, DRM_AUTH),
-+	DRM_IOCTL_DEF(DRM_RADEON_GEM_WAIT_RENDERING, radeon_gem_wait_rendering, DRM_AUTH),
++	DRM_IOCTL_DEF(DRM_RADEON_GEM_WAIT_IDLE, radeon_gem_wait_rendering, DRM_AUTH),
 +	DRM_IOCTL_DEF(DRM_RADEON_CS, radeon_cs_ioctl, DRM_AUTH),
  };
  
  int radeon_max_ioctl = DRM_ARRAY_SIZE(radeon_ioctls);
 diff --git a/include/drm/drm.h b/include/drm/drm.h
-index 8e77357..17a1e2c 100644
+index 7cb50bd..fcaef63 100644
 --- a/include/drm/drm.h
 +++ b/include/drm/drm.h
-@@ -174,6 +174,7 @@ enum drm_map_type {
+@@ -173,6 +173,7 @@ enum drm_map_type {
  	_DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
  	_DRM_CONSISTENT = 5,	  /**< Consistent memory for PCI DMA */
  	_DRM_GEM = 6,		  /**< GEM object */
@@ -37400,7 +37309,7 @@
  
  /**
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index ccbcd13..b61b0c6 100644
+index c8c4221..04fbd1e 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -147,9 +147,23 @@ struct drm_device;
@@ -37596,10 +37505,10 @@
  
  #endif				/* __KERNEL__ */
 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index c7d4b2e..3091fc3 100644
+index ec073d8..32ac55d 100644
 --- a/include/drm/drm_crtc_helper.h
 +++ b/include/drm/drm_crtc_helper.h
-@@ -122,4 +122,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
+@@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
  }
  
  extern int drm_helper_resume_force_mode(struct drm_device *dev);
@@ -38526,139 +38435,101 @@
 +#endif
 +#endif
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 937a275..f716e0a 100644
+index fe3e3a4..ed15ce2 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
-@@ -455,6 +455,15 @@ typedef struct {
- 	int pfCurrentPage;	/* which buffer is being displayed? */
- 	int crtc2_base;		/* CRTC2 frame offset */
- 	int tiling_enabled;	/* set by drm, read by 2d + 3d clients */
-+
-+	unsigned int last_fence;
-+
-+	uint32_t front_handle;
-+	uint32_t back_handle;
-+	uint32_t depth_handle;
-+	uint32_t front_pitch;
-+	uint32_t back_pitch;
-+	uint32_t depth_pitch;
- } drm_radeon_sarea_t;
- 
- /* WARNING: If you change any of these defines, make sure to change the
-@@ -495,6 +504,18 @@ typedef struct {
+@@ -496,6 +496,16 @@ typedef struct {
+ #define DRM_RADEON_SETPARAM   0x19
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
++/* KMS ioctl */
++#define DRM_RADEON_GEM_INFO		0x1c
++#define DRM_RADEON_GEM_CREATE		0x1d
++#define DRM_RADEON_GEM_MMAP		0x1e
++#define DRM_RADEON_GEM_PREAD		0x21
++#define DRM_RADEON_GEM_PWRITE		0x22
++#define DRM_RADEON_GEM_SET_DOMAIN	0x23
++#define DRM_RADEON_GEM_WAIT_IDLE	0x24
++#define DRM_RADEON_CS			0x26
++#define DRM_RADEON_INFO			0x27
  
-+#define DRM_RADEON_GEM_INFO   0x1c
-+#define DRM_RADEON_GEM_CREATE 0x1d
-+#define DRM_RADEON_GEM_MMAP   0x1e
-+#define DRM_RADEON_GEM_PIN    0x1f
-+#define DRM_RADEON_GEM_UNPIN  0x20
-+#define DRM_RADEON_GEM_PREAD  0x21
-+#define DRM_RADEON_GEM_PWRITE 0x22
-+#define DRM_RADEON_GEM_SET_DOMAIN 0x23
-+#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
-+
-+#define DRM_RADEON_CS       0x26
-+
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
- #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -523,6 +544,18 @@ typedef struct {
+@@ -524,6 +534,17 @@ typedef struct {
+ #define DRM_IOCTL_RADEON_SETPARAM   DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SETPARAM, drm_radeon_setparam_t)
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
- 
-+#define DRM_IOCTL_RADEON_GEM_INFO   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
-+#define DRM_IOCTL_RADEON_GEM_CREATE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
-+#define DRM_IOCTL_RADEON_GEM_MMAP   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
-+#define DRM_IOCTL_RADEON_GEM_PIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PIN, struct drm_radeon_gem_pin)
-+#define DRM_IOCTL_RADEON_GEM_UNPIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_UNPIN, struct drm_radeon_gem_unpin)
-+#define DRM_IOCTL_RADEON_GEM_PREAD   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
-+#define DRM_IOCTL_RADEON_GEM_PWRITE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
-+#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
-+#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
-+#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+
++/* KMS */
++#define DRM_IOCTL_RADEON_GEM_INFO	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
++#define DRM_IOCTL_RADEON_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
++#define DRM_IOCTL_RADEON_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
++#define DRM_IOCTL_RADEON_GEM_PREAD	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
++#define DRM_IOCTL_RADEON_GEM_PWRITE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
++#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
++#define DRM_IOCTL_RADEON_GEM_WAIT_IDLE	DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle) 
++#define DRM_IOCTL_RADEON_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++#define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
 +
+ 
  typedef struct drm_radeon_init {
  	enum {
- 		RADEON_INIT_CP = 0x01,
-@@ -680,6 +713,8 @@ typedef struct drm_radeon_indirect {
+@@ -682,6 +703,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-+#define RADEON_PARAM_KERNEL_MM             16
-+#define RADEON_PARAM_DEVICE_ID		   17
++#define RADEON_PARAM_DEVICE_ID             16
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -734,6 +769,7 @@ typedef struct drm_radeon_setparam {
- #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
- #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
- #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-+#define RADEON_SETPARAM_MM_INIT 7               /* DDX wants memory manager but has no modesetting */
- /* 1.14: Clients can allocate/free a surface
-  */
- typedef struct drm_radeon_surface_alloc {
-@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free {
+@@ -751,4 +773,112 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
-+#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
-+#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
-+#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
++/*
++ * Kernel modesetting world below.
++ */
++#define RADEON_GEM_DOMAIN_CPU		0x1
++#define RADEON_GEM_DOMAIN_GTT		0x2
++#define RADEON_GEM_DOMAIN_VRAM		0x4
 +
-+/* return to userspace start/size of gtt and vram apertures */
 +struct drm_radeon_gem_info {
-+	uint64_t gart_start;
-+	uint64_t gart_size;
-+	uint64_t vram_start;
-+	uint64_t vram_size;
-+	uint64_t vram_visible;
++	uint64_t	gart_size;
++	uint64_t	vram_size;
++	uint64_t	vram_visible;
 +};
 +
++#define RADEON_GEM_NO_BACKING_STORE 1
++
 +struct drm_radeon_gem_create {
-+	uint64_t size;
-+	uint64_t alignment;
-+	uint32_t handle;
-+	uint32_t initial_domain; // to allow VRAM to be created
-+	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
-+	// pretty much front/back/depth don't need it - other things do
++	uint64_t	size;
++	uint64_t	alignment;
++	uint32_t	handle;
++	uint32_t	initial_domain;
++	uint32_t	flags;
 +};
 +
 +struct drm_radeon_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
++	uint32_t	handle;
++	uint32_t	pad;
++	uint64_t	offset;
++	uint64_t	size;
++	uint64_t	addr_ptr;
 +};
 +
 +struct drm_radeon_gem_set_domain {
-+	uint32_t handle;
-+	uint32_t read_domains;
-+	uint32_t write_domain;
++	uint32_t	handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
 +};
 +
-+struct drm_radeon_gem_wait_rendering {
-+	uint32_t handle;
-+};
-+
-+struct drm_radeon_gem_pin {
-+	uint32_t handle;
-+	uint32_t pin_domain;
-+	uint64_t alignment;
-+	uint64_t offset;
-+};
-+
-+struct drm_radeon_gem_unpin {
-+	uint32_t handle;
-+	uint32_t pad;
++struct drm_radeon_gem_wait_idle {
++	uint32_t	handle;
++	uint32_t	pad;
 +};
 +
 +struct drm_radeon_gem_busy {
-+	uint32_t handle;
-+	uint32_t busy;
++	uint32_t	handle;
++	uint32_t	busy;
 +};
 +
 +struct drm_radeon_gem_pread {
@@ -38670,7 +38541,8 @@
 +	/** Length of data to read */
 +	uint64_t size;
 +	/** Pointer to write the data into. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
 +struct drm_radeon_gem_pwrite {
@@ -38682,28 +38554,43 @@
 +	/** Length of data to write */
 +	uint64_t size;
 +	/** Pointer to read the data from. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
-+
-+/* New interface which obsolete all previous interface.
-+ */
-+#define RADEON_CHUNK_ID_RELOCS 0x01
-+#define RADEON_CHUNK_ID_IB     0x02
-+#define RADEON_CHUNK_ID_OLD 0xff
++#define RADEON_CHUNK_ID_RELOCS	0x01
++#define RADEON_CHUNK_ID_IB	0x02
 +
 +struct drm_radeon_cs_chunk {
-+	uint32_t chunk_id;
-+	uint32_t length_dw;
-+	uint64_t chunk_data;
++	uint32_t		chunk_id;
++	uint32_t		length_dw;
++	uint64_t		chunk_data;
 +};
 +
-+struct drm_radeon_cs {
-+	uint32_t	num_chunks;
-+	uint32_t        cs_id;
-+	uint64_t	chunks; /* this points to uint64_t * which point to
-+				   cs chunks */
++struct drm_radeon_cs_reloc {
++	uint32_t		handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
++	uint32_t		flags;
 +};
 +
++struct drm_radeon_cs {
++	uint32_t		num_chunks;
++	uint32_t		cs_id;
++	/* this points to uint64_t * which point to cs chunks */
++	uint64_t		chunks;
++	/* updates to the limits after this CS ioctl */
++	uint64_t		gart_limit;
++	uint64_t		vram_limit;
++};
++
++#define RADEON_INFO_DEVICE_ID		0x00
++#define RADEON_INFO_NUM_GB_PIPES	0x01
++
++struct drm_radeon_info {
++	uint32_t		request;
++	uint32_t		pad;
++	uint64_t		value;
++};
 +
  #endif

drm-next.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 drm-next.patch
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- drm-next.patch	18 Mar 2009 06:47:16 -0000	1.12
+++ drm-next.patch	6 Apr 2009 05:30:06 -0000	1.13
@@ -1,659 +1,3 @@
-commit 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Mar 16 15:37:02 2009 -0400
-
-    drm/radeon: fix logic in r600_page_table_init() to match ati_gart
-    
-    This fixes page table init on rs600.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 06f0a488c1b642d3cd7769da66600e5148c3fad8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Mar 13 09:35:32 2009 +1000
-
-    drm/radeon: r600 ptes are 64-bit, cleanup cleanup function.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 03efb8853c35aff51c7b901bf412f32765fe0fd9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Mar 10 18:36:38 2009 +1000
-
-    drm/radeon: don't call irq changes on r600 suspend/resume
-    
-    Until we sort out r600 IRQs don't do this.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit d02f7fa77d97a28a4276939f35e44ae995ad13d7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Mar 10 18:34:23 2009 +1000
-
-    drm/radeon: fix r600 writeback across suspend/resume
-    
-    This update was done in mainline radeon, but not in the r600.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 6546bf6d6cbf1f9ac350fd278a1d937d4bb9ad06
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 15:31:20 2009 +1000
-
-    drm/radeon: fix r600 writeback setup.
-    
-    This fixes 2 bugs:
-    1. the AGP calculation wasn't consistent with the PCI(E) calc for the
-    RPTR_ADDR registers. This consolidates the writes and fixes it up.
-    
-    2. The scratch address was being incorrectly calculated, this breaks
-    it out into a lot more linear steps.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 1847a549ac4db1272dea13d86331c492a2640b3b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 12:47:18 2009 +1000
-
-    drm: fix warnings about new mappings in info code.
-    
-    This fixes up the warnings in the debugfs code that conflicted
-    with the mapping fixups.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 8f497aade8df2a619eacda927a43ebe82167a84c
-Author: Hannes Eder <hannes at hanneseder.net>
-Date:   Thu Mar 5 20:14:18 2009 +0100
-
-    drm/radeon: NULL noise: drivers/gpu/drm/radeon/radeon_*.c
-    
-    Fix this sparse warning:
-      drivers/gpu/drm/radeon/r600_cp.c:1811:52: warning: Using plain integer as NULL pointer
-      drivers/gpu/drm/radeon/radeon_cp.c:1363:52: warning: Using plain integer as NULL pointer
-      drivers/gpu/drm/radeon/radeon_state.c:1983:61: warning: Using plain integer as NULL pointer
-    
-    Signed-off-by: Hannes Eder <hannes at hanneseder.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit a763d7dc0adb1159c1a52d43e566409da9fa59f0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 12:17:08 2009 +1000
-
-    drm/radeon: fix r600 pci mapping calls.
-    
-    This realigns the r600 pci mapping calls with the ati pcigart ones,
-    fixing the direction and using the correct interface.
-    
-    Suggested by Jerome Glisse.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 08932156cc2d4f8807dc5ca5c3d6ccd85080610a
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Sat Mar 7 18:21:21 2009 -0500
-
-    drm/radeon: r6xx/r7xx: fix possible oops in r600_page_table_cleanup()
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 53c379e9462b59d4e166429ff064aaf0e7743795
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 12:12:28 2009 +1000
-
-    radeon: call the correct idle function, logic got inverted.
-    
-    This calls the correct idle function for the R600 and previous chips.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 800b69951174f7de294da575d7e7921041a7e783
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Fri Mar 6 11:47:54 2009 -0500
-
-    drm/radeon: RS600: fix interrupt handling
-    
-    the checks weren't updated when RS600 support
-    was added.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:15:24 2009 +1000
-
-    drm/r600: fix rptr address along lines of previous fixes to radeon.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit eb1d91954ededc00ddcfb51e2626f114ff351524
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:14:40 2009 +1000
-
-    drm/r600: fixup r600 gart table accessor like ati_pcigart.c
-    
-    This attempts to fixup the r600 GART accessors so they work on other arches.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 6abf66018f7fe231720e50f9a47b142182388869
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:13:47 2009 +1000
-
-    drm/ati_pcigart: use memset_io to reset the memory
-    
-    Also don't setup pci_gart if we aren't going to need it.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 87f0da55353e23826a54bff57c457a13b97d18f1
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:12:10 2009 +1000
-
-    drm: add DRM_READ/WRITE64 wrappers around readq/writeq.
-    
-    The readq/writeq stuff is from Dave Miller, and he
-    warns users to be careful about using these. Plans are only
-    r600 to use it so far.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 8ced9c75160947d2235fba75de9413e087e1171a
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Feb 25 17:02:19 2009 -0500
-
-    radeon: add RS600 pci ids
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit c1556f71513f2e660fb2bbdc29344361b1ebff35
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Feb 25 16:57:49 2009 -0500
-
-    radeon: add support for rs600 GPUs
-    
-    RS600s are an AMD IGP for Intel CPUs, that look like RS690s from
-    a lot of perspectives but look like r600s from a memory controller
-    point of view.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 7659e9804b7a66047433182d86393d38ba4eff79
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Feb 25 15:55:01 2009 -0500
-
-    radeon: fix r600 AGP support
-    
[...6070 lines suppressed...]
+ #define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
+ 
+ typedef struct _drm_mga_warp_index {
+@@ -310,7 +312,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 */
+ 	/*@{ */
+ 	unsigned long texture_handle; /**< Handle used to map AGP textures. */
+-	uint32_t texture_size;	      /**< Size of the AGP texture region. */
++	__u32 texture_size;	      /**< Size of the AGP texture region. */
+ 	/*@} */
+ 
+ 	/**
+@@ -319,7 +321,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
+ 	 * filled in with the actual AGP mode.  If AGP was not available
+ 	 */
+-	uint32_t primary_size;
++	__u32 primary_size;
+ 
+ 	/**
+ 	 * Requested number of secondary DMA buffers.
+@@ -329,7 +331,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * allocated.  Particularly when PCI DMA is used, this may be
+ 	 * (subtantially) less than the number requested.
+ 	 */
+-	uint32_t secondary_bin_count;
++	__u32 secondary_bin_count;
+ 
+ 	/**
+ 	 * Requested size of each secondary DMA buffer.
+@@ -338,7 +340,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
+ 	 * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
+ 	 */
+-	uint32_t secondary_bin_size;
++	__u32 secondary_bin_size;
+ 
+ 	/**
+ 	 * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
+@@ -350,12 +352,12 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * filled in with the actual AGP mode.  If AGP was not available
+ 	 * (i.e., PCI DMA was used), this value will be zero.
+ 	 */
+-	uint32_t agp_mode;
++	__u32 agp_mode;
+ 
+ 	/**
+ 	 * Desired AGP GART size, measured in megabytes.
+ 	 */
+-	uint8_t agp_size;
++	__u8 agp_size;
+ } drm_mga_dma_bootstrap_t;
+ 
+ typedef struct drm_mga_clear {
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..937a275 100644
+index 73ff51f..fe3e3a4 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
-@@ -304,6 +304,8 @@ typedef union {
+@@ -33,6 +33,8 @@
+ #ifndef __RADEON_DRM_H__
+ #define __RADEON_DRM_H__
+ 
++#include <linux/types.h>
++
+ /* WARNING: If you change any of these defines, make sure to change the
+  * defines in the X server file (radeon_sarea.h)
+  */
+@@ -304,6 +306,8 @@ typedef union {
  
  #define RADEON_SCRATCH_REG_OFFSET	32
  
@@ -31890,7 +36314,7 @@
  #define RADEON_NR_SAREA_CLIPRECTS	12
  
  /* There are 2 heaps (local/GART).  Each region within a heap is a
-@@ -526,7 +528,8 @@ typedef struct drm_radeon_init {
+@@ -526,7 +530,8 @@ typedef struct drm_radeon_init {
  		RADEON_INIT_CP = 0x01,
  		RADEON_CLEANUP_CP = 0x02,
  		RADEON_INIT_R200_CP = 0x03,
@@ -31900,3 +36324,117 @@
  	} func;
  	unsigned long sarea_priv_offset;
  	int is_pci;
+@@ -722,7 +727,7 @@ typedef struct drm_radeon_irq_wait {
+ 
+ typedef struct drm_radeon_setparam {
+ 	unsigned int param;
+-	int64_t value;
++	__s64 value;
+ } drm_radeon_setparam_t;
+ 
+ #define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
+diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
+index a3b5c10..170786e 100644
+--- a/include/drm/via_drm.h
++++ b/include/drm/via_drm.h
+@@ -24,6 +24,8 @@
+ #ifndef _VIA_DRM_H_
+ #define _VIA_DRM_H_
+ 
++#include <linux/types.h>
++
+ /* WARNING: These defines must be the same as what the Xserver uses.
+  * if you change them, you must change the defines in the Xserver.
+  */
+@@ -114,19 +116,19 @@
+ #define VIA_MEM_UNKNOWN 4
+ 
+ typedef struct {
+-	uint32_t offset;
+-	uint32_t size;
++	__u32 offset;
++	__u32 size;
+ } drm_via_agp_t;
+ 
+ typedef struct {
+-	uint32_t offset;
+-	uint32_t size;
++	__u32 offset;
++	__u32 size;
+ } drm_via_fb_t;
+ 
+ typedef struct {
+-	uint32_t context;
+-	uint32_t type;
+-	uint32_t size;
++	__u32 context;
++	__u32 type;
++	__u32 size;
+ 	unsigned long index;
+ 	unsigned long offset;
+ } drm_via_mem_t;
+@@ -148,9 +150,9 @@ typedef struct _drm_via_futex {
+ 		VIA_FUTEX_WAIT = 0x00,
+ 		VIA_FUTEX_WAKE = 0X01
+ 	} func;
+-	uint32_t ms;
+-	uint32_t lock;
+-	uint32_t val;
++	__u32 ms;
++	__u32 lock;
++	__u32 val;
+ } drm_via_futex_t;
+ 
+ typedef struct _drm_via_dma_init {
+@@ -211,7 +213,7 @@ typedef struct _drm_via_cmdbuf_size {
+ 		VIA_CMDBUF_LAG = 0x02
+ 	} func;
+ 	int wait;
+-	uint32_t size;
++	__u32 size;
+ } drm_via_cmdbuf_size_t;
+ 
+ typedef enum {
+@@ -236,8 +238,8 @@ enum drm_via_irqs {
+ struct drm_via_wait_irq_request {
+ 	unsigned irq;
+ 	via_irq_seq_type_t type;
+-	uint32_t sequence;
+-	uint32_t signal;
++	__u32 sequence;
++	__u32 signal;
+ };
+ 
+ typedef union drm_via_irqwait {
+@@ -246,7 +248,7 @@ typedef union drm_via_irqwait {
+ } drm_via_irqwait_t;
+ 
+ typedef struct drm_via_blitsync {
+-	uint32_t sync_handle;
++	__u32 sync_handle;
+ 	unsigned engine;
+ } drm_via_blitsync_t;
+ 
+@@ -257,16 +259,16 @@ typedef struct drm_via_blitsync {
+  */
+ 
+ typedef struct drm_via_dmablit {
+-	uint32_t num_lines;
+-	uint32_t line_length;
++	__u32 num_lines;
++	__u32 line_length;
+ 
+-	uint32_t fb_addr;
+-	uint32_t fb_stride;
++	__u32 fb_addr;
++	__u32 fb_stride;
+ 
+ 	unsigned char *mem_addr;
+-	uint32_t mem_stride;
++	__u32 mem_stride;
+ 
+-	uint32_t flags;
++	__u32 flags;
+ 	int to_fb;
+ 
+ 	drm_via_blitsync_t sync;

drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- drm-nouveau.patch	5 Apr 2009 13:46:53 -0000	1.33
+++ drm-nouveau.patch	6 Apr 2009 05:30:07 -0000	1.34
@@ -17127,7 +17127,7 @@
 +	dev_priv->init_state = NOUVEAU_CARD_INIT_DONE;
 +
 +	if (drm_core_check_feature(dev, DRIVER_MODESET))
-+		drm_helper_initial_config(dev, false);
++		drm_helper_initial_config(dev);
 +
 +	return 0;
 +}
@@ -23927,7 +23927,7 @@
 +	}
 +
 +	if (connector->i2c_chan)
-+		edid = (struct edid *)drm_do_probe_ddc_edid(&connector->i2c_chan->adapter);
++		edid = drm_get_edid(&connector->base, &connector->i2c_chan->adapter);
 +	drm_mode_connector_update_edid_property(drm_connector, edid);
 +
 +	if (edid) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1513
retrieving revision 1.1514
diff -u -r1.1513 -r1.1514
--- kernel.spec	5 Apr 2009 13:46:56 -0000	1.1513
+++ kernel.spec	6 Apr 2009 05:30:08 -0000	1.1514
@@ -677,7 +677,6 @@
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
-Patch1820: drm-radeon-reorder-bm.patch
 Patch1821: drm-intel-lying-systems-without-lvds.patch
 
 # kludge to make ich9 e1000 work
@@ -1290,7 +1289,6 @@
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-radeon-reorder-bm.patch
 ApplyPatch drm-intel-lying-systems-without-lvds.patch
 
 # linux1394 git patches
@@ -1905,6 +1903,9 @@
 # and build.
 
 %changelog
+* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com>
+- radeon: bust APIs and move to what we want in the end.
+
 * Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: big update.  mostly cleanups, few functional changes
     Big code cleanup (the scary looking, but hopefully harmless part)


--- drm-radeon-reorder-bm.patch DELETED ---



From airlied at fedoraproject.org  Mon Apr  6 05:38:40 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 05:38:40 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.12.0-git-fixes.patch, 1.2,
	1.3 radeon-modeset.patch, 1.42, 1.43 radeon.xinf, 1.11,
	1.12 xorg-x11-drv-ati.spec, 1.166, 1.167 radeon-r6xx-fix.patch,
	1.5, NONE
Message-ID: <20090406053840.B1AA6700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20343

Modified Files:
	radeon-6.12.0-git-fixes.patch radeon-modeset.patch radeon.xinf 
	xorg-x11-drv-ati.spec 
Removed Files:
	radeon-r6xx-fix.patch 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-5
- radeon-modeset.patch: break APIs;
- radeon: move to latest git fixups


radeon-6.12.0-git-fixes.patch:

Index: radeon-6.12.0-git-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.12.0-git-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- radeon-6.12.0-git-fixes.patch	1 Apr 2009 08:54:08 -0000	1.2
+++ radeon-6.12.0-git-fixes.patch	6 Apr 2009 05:38:09 -0000	1.3
@@ -12,10 +12,19 @@
          xf86-video-ati)
  
 diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
-index d532f16..f31cadb 100644
+index d532f16..3304e84 100644
 --- a/src/ati_pciids_gen.h
 +++ b/src/ati_pciids_gen.h
-@@ -429,3 +429,10 @@
+@@ -345,6 +345,8 @@
+ #define PCI_CHIP_RV770_9456 0x9456
+ #define PCI_CHIP_RV770_945A 0x945A
+ #define PCI_CHIP_RV770_945B 0x945B
++#define PCI_CHIP_RV790_9460 0x9460
++#define PCI_CHIP_RV790_9462 0x9462
+ #define PCI_CHIP_RV770_946A 0x946A
+ #define PCI_CHIP_RV770_946B 0x946B
+ #define PCI_CHIP_RV770_947A 0x947A
+@@ -429,3 +431,10 @@
  #define PCI_CHIP_RS780_9612 0x9612
  #define PCI_CHIP_RS780_9613 0x9613
  #define PCI_CHIP_RS780_9614 0x9614
@@ -26,11 +35,484 @@
 +#define PCI_CHIP_RS880_9712 0x9712
 +#define PCI_CHIP_RS880_9713 0x9713
 +#define PCI_CHIP_RS880_9714 0x9714
+diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
+index 50db578..31c032b 100644
+--- a/src/atombios_crtc.c
++++ b/src/atombios_crtc.c
+@@ -517,6 +517,9 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
+ 
+     if (IS_AVIVO_VARIANT) {
+ 	uint32_t fb_format;
++#if X_BYTE_ORDER == X_BIG_ENDIAN
++	uint32_t fb_swap = R600_D1GRPH_SWAP_ENDIAN_NONE;
++#endif
+ 
+ 	switch (crtc->scrn->bitsPerPixel) {
+ 	case 15:
+@@ -524,10 +527,16 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
+ 	    break;
+ 	case 16:
+ 	    fb_format = AVIVO_D1GRPH_CONTROL_DEPTH_16BPP | AVIVO_D1GRPH_CONTROL_16BPP_RGB565;
++#if X_BYTE_ORDER == X_BIG_ENDIAN
++	    fb_swap = R600_D1GRPH_SWAP_ENDIAN_16BIT;
++#endif
+ 	    break;
+ 	case 24:
+ 	case 32:
+ 	    fb_format = AVIVO_D1GRPH_CONTROL_DEPTH_32BPP | AVIVO_D1GRPH_CONTROL_32BPP_ARGB8888;
++#if X_BYTE_ORDER == X_BIG_ENDIAN
++	    fb_swap = R600_D1GRPH_SWAP_ENDIAN_32BIT;
++#endif
+ 	    break;
+ 	default:
+ 	    FatalError("Unsupported screen depth: %d\n", xf86GetDepth());
+@@ -555,6 +564,11 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
+ 	OUTREG(AVIVO_D1GRPH_SECONDARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset, fb_location);
+ 	OUTREG(AVIVO_D1GRPH_CONTROL + radeon_crtc->crtc_offset, fb_format);
+ 
++#if X_BYTE_ORDER == X_BIG_ENDIAN
++	if (info->ChipFamily >= CHIP_FAMILY_R600)
++	    OUTREG(R600_D1GRPH_SWAP_CONTROL + radeon_crtc->crtc_offset, fb_swap);
++#endif
++
+ 	OUTREG(AVIVO_D1GRPH_SURFACE_OFFSET_X + radeon_crtc->crtc_offset, 0);
+ 	OUTREG(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
+ 	OUTREG(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0);
 diff --git a/src/atombios_output.c b/src/atombios_output.c
-index 35d1767..4af04c1 100644
+index 35d1767..60d6c10 100644
 --- a/src/atombios_output.c
 +++ b/src/atombios_output.c
-@@ -1406,8 +1406,12 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
+@@ -61,7 +61,7 @@ const char *device_name[12] = {
+ };
+ 
+ static int
+-atombios_output_dac_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_dac_setup(xf86OutputPtr output, int action)
+ {
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+     RADEONInfoPtr info       = RADEONPTR(output->scrn);
+@@ -71,6 +71,7 @@ atombios_output_dac_setup(xf86OutputPtr output, DisplayModePtr mode)
+     AtomBiosArgRec data;
+     unsigned char *space;
+     int index = 0, num = 0;
++    int clock = radeon_output->pixel_clock;
+ 
+     if (radeon_encoder == NULL)
+ 	return ATOM_NOT_IMPLEMENTED;
+@@ -90,7 +91,7 @@ atombios_output_dac_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	break;
+     }
+ 
+-    disp_data.ucAction = ATOM_ENABLE;
++    disp_data.ucAction =action;
+ 
+     if (radeon_output->active_device & (ATOM_DEVICE_CRT_SUPPORT))
+ 	disp_data.ucDacStandard = ATOM_DAC1_PS2;
+@@ -113,7 +114,7 @@ atombios_output_dac_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	    break;
+ 	}
+     }
+-    disp_data.usPixelClock = cpu_to_le16(mode->Clock / 10);
++    disp_data.usPixelClock = cpu_to_le16(clock / 10);
+ 
+     data.exec.index = index;
+     data.exec.dataSpace = (void *)&space;
+@@ -130,7 +131,7 @@ atombios_output_dac_setup(xf86OutputPtr output, DisplayModePtr mode)
+ }
+ 
+ static int
+-atombios_output_tv_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_tv_setup(xf86OutputPtr output, int action)
+ {
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+     radeon_tvout_ptr tvout = &radeon_output->tvout;
+@@ -138,10 +139,11 @@ atombios_output_tv_setup(xf86OutputPtr output, DisplayModePtr mode)
+     TV_ENCODER_CONTROL_PS_ALLOCATION disp_data;
+     AtomBiosArgRec data;
+     unsigned char *space;
++    int clock = radeon_output->pixel_clock;
+ 
+     memset(&disp_data,0, sizeof(disp_data));
+ 
+-    disp_data.sTVEncoder.ucAction = ATOM_ENABLE;
++    disp_data.sTVEncoder.ucAction = action;
+ 
+     if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT))
+ 	disp_data.sTVEncoder.ucTvStandard = ATOM_TV_CV;
+@@ -177,7 +179,7 @@ atombios_output_tv_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	}
+     }
+ 
+-    disp_data.sTVEncoder.usPixelClock = cpu_to_le16(mode->Clock / 10);
++    disp_data.sTVEncoder.usPixelClock = cpu_to_le16(clock / 10);
+     data.exec.index = GetIndexIntoMasterTable(COMMAND, TVEncoderControl);
+     data.exec.dataSpace = (void *)&space;
+     data.exec.pspace = &disp_data;
+@@ -193,19 +195,21 @@ atombios_output_tv_setup(xf86OutputPtr output, DisplayModePtr mode)
+ }
+ 
+ int
+-atombios_external_tmds_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_external_tmds_setup(xf86OutputPtr output, int action)
+ {
++    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+     ScrnInfoPtr pScrn = output->scrn;
+     RADEONInfoPtr info       = RADEONPTR(pScrn);
+     ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION disp_data;
+     AtomBiosArgRec data;
+     unsigned char *space;
++    int clock = radeon_output->pixel_clock;
+ 
+     memset(&disp_data,0, sizeof(disp_data));
+ 
+-    disp_data.sXTmdsEncoder.ucEnable = ATOM_ENABLE;
++    disp_data.sXTmdsEncoder.ucEnable = action;
+ 
+-    if (mode->Clock > 165000)
++    if (clock > 165000)
+ 	disp_data.sXTmdsEncoder.ucMisc = PANEL_ENCODER_MISC_DUAL;
+ 
+     if (pScrn->rgbBits == 8)
+@@ -225,19 +229,21 @@ atombios_external_tmds_setup(xf86OutputPtr output, DisplayModePtr mode)
+ }
+ 
+ static int
+-atombios_output_ddia_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_ddia_setup(xf86OutputPtr output, int action)
+ {
++    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+     RADEONInfoPtr info       = RADEONPTR(output->scrn);
+     DVO_ENCODER_CONTROL_PS_ALLOCATION disp_data;
+     AtomBiosArgRec data;
+     unsigned char *space;
++    int clock = radeon_output->pixel_clock;
+ 
+     memset(&disp_data,0, sizeof(disp_data));
+ 
+-    disp_data.sDVOEncoder.ucAction = ATOM_ENABLE;
+-    disp_data.sDVOEncoder.usPixelClock = cpu_to_le16(mode->Clock / 10);
++    disp_data.sDVOEncoder.ucAction = action;
++    disp_data.sDVOEncoder.usPixelClock = cpu_to_le16(clock / 10);
+ 
+-    if (mode->Clock > 165000)
++    if (clock > 165000)
+ 	disp_data.sDVOEncoder.usDevAttr.sDigAttrib.ucAttribute = PANEL_ENCODER_MISC_DUAL;
+ 
+     data.exec.index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl);
+@@ -254,7 +260,7 @@ atombios_output_ddia_setup(xf86OutputPtr output, DisplayModePtr mode)
+ }
+ 
+ static int
+-atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_digital_setup(xf86OutputPtr output, int action)
+ {
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+     ScrnInfoPtr pScrn = output->scrn;
+@@ -267,6 +273,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
+     int index = 0;
+     int major, minor;
+     int lvds_misc = 0;
++    int clock = radeon_output->pixel_clock;
+ 
+     if (radeon_encoder == NULL)
+ 	return ATOM_NOT_IMPLEMENTED;
+@@ -308,11 +315,11 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	switch (minor) {
+ 	case 1:
+ 	    disp_data.ucMisc = 0;
+-	    disp_data.ucAction = PANEL_ENCODER_ACTION_ENABLE;
++	    disp_data.ucAction = action;
+ 	    if ((radeon_output->ConnectorType == CONNECTOR_HDMI_TYPE_A) ||
+ 		(radeon_output->ConnectorType == CONNECTOR_HDMI_TYPE_B))
+ 		disp_data.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
+-	    disp_data.usPixelClock = cpu_to_le16(mode->Clock / 10);
++	    disp_data.usPixelClock = cpu_to_le16(clock / 10);
+ 	    if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) {
+ 		if (lvds_misc & (1 << 0))
+ 		    disp_data.ucMisc |= PANEL_ENCODER_MISC_DUAL;
+@@ -321,7 +328,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	    } else {
+ 		if (radeon_output->linkb)
+ 		    disp_data.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
+-		if (mode->Clock > 165000)
++		if (clock > 165000)
+ 		    disp_data.ucMisc |= PANEL_ENCODER_MISC_DUAL;
+ 		if (pScrn->rgbBits == 8)
+ 		    disp_data.ucMisc |= (1 << 1);
+@@ -331,7 +338,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	case 2:
+ 	case 3:
+ 	    disp_data2.ucMisc = 0;
+-	    disp_data2.ucAction = PANEL_ENCODER_ACTION_ENABLE;
++	    disp_data2.ucAction = action;
+ 	    if (minor == 3) {
+ 		if (radeon_output->coherent_mode) {
+ 		    disp_data2.ucMisc |= PANEL_ENCODER_MISC_COHERENT;
+@@ -341,7 +348,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	    if ((radeon_output->ConnectorType == CONNECTOR_HDMI_TYPE_A) ||
+ 		(radeon_output->ConnectorType == CONNECTOR_HDMI_TYPE_B))
+ 		disp_data2.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
+-	    disp_data2.usPixelClock = cpu_to_le16(mode->Clock / 10);
++	    disp_data2.usPixelClock = cpu_to_le16(clock / 10);
+ 	    disp_data2.ucTruncate = 0;
+ 	    disp_data2.ucSpatial = 0;
+ 	    disp_data2.ucTemporal = 0;
+@@ -364,7 +371,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	    } else {
+ 		if (radeon_output->linkb)
+ 		    disp_data2.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
+-		if (mode->Clock > 165000)
++		if (clock > 165000)
+ 		    disp_data2.ucMisc |= PANEL_ENCODER_MISC_DUAL;
+ 	    }
+ 	    data.exec.pspace = &disp_data2;
+@@ -488,16 +495,17 @@ dp_link_clock_for_mode_clock(int mode_clock)
+ }
+ 
+ static int
+-atombios_output_dig_encoder_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_dig_encoder_setup(xf86OutputPtr output, int action)
+ {
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+-    RADEONCrtcPrivatePtr radeon_crtc = output->crtc->driver_private;
+     RADEONInfoPtr info       = RADEONPTR(output->scrn);
+     radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output);
+     DIG_ENCODER_CONTROL_PS_ALLOCATION disp_data;
+     AtomBiosArgRec data;
+     unsigned char *space;
+     int index = 0, major, minor, num = 0;
++    int clock = radeon_output->pixel_clock;
++    int dig_block = radeon_output->dig_block;
+ 
+     if (radeon_encoder == NULL)
+ 	return ATOM_NOT_IMPLEMENTED;
+@@ -505,11 +513,11 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, DisplayModePtr mode)
+     memset(&disp_data,0, sizeof(disp_data));
+ 
+     if (IS_DCE32_VARIANT) {
+-	if (radeon_crtc->crtc_id)
++	if (dig_block)
+ 	    index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
+ 	else
+ 	    index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
+-	num = radeon_crtc->crtc_id + 1;
++	num = dig_block + 1;
+     } else {
+ 	switch (radeon_encoder->encoder_id) {
+ 	case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
+@@ -529,8 +537,8 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 
+     atombios_get_command_table_version(info->atomBIOS, index, &major, &minor);
+ 
+-    disp_data.ucAction = ATOM_ENABLE;
+-    disp_data.usPixelClock = cpu_to_le16(mode->Clock / 10);
++    disp_data.ucAction = action;
++    disp_data.usPixelClock = cpu_to_le16(clock / 10);
+ 
+     if (IS_DCE32_VARIANT) {
+ 	switch (radeon_encoder->encoder_id) {
+@@ -569,11 +577,11 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	else
+ 	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKA;
+ 
+-	if (dp_link_clock_for_mode_clock(mode->Clock) == 27000)
++	if (dp_link_clock_for_mode_clock(clock) == 27000)
+ 	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ;
+ 
+-	disp_data.ucLaneNum = dp_lanes_for_mode_clock(mode->Clock);
+-    } else if (mode->Clock > 165000) {
++	disp_data.ucLaneNum = dp_lanes_for_mode_clock(clock);
++    } else if (clock > 165000) {
+ 	disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKA_B;
+ 	disp_data.ucLaneNum = 8;
+     } else {
+@@ -605,10 +613,9 @@ union dig_transmitter_control {
+ };
+ 
+ static int
+-atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
+ {
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+-    RADEONCrtcPrivatePtr radeon_crtc = output->crtc->driver_private;
+     RADEONInfoPtr info       = RADEONPTR(output->scrn);
+     radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output);
+     union dig_transmitter_control disp_data;
+@@ -616,6 +623,8 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+     unsigned char *space;
+     int index = 0, num = 0;
+     int major, minor;
++    int clock = radeon_output->pixel_clock;
++    int dig_block = radeon_output->dig_block;
+ 
+     if (radeon_encoder == NULL)
+         return ATOM_NOT_IMPLEMENTED;
+@@ -641,20 +650,20 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 
+     atombios_get_command_table_version(info->atomBIOS, index, &major, &minor);
+ 
+-    disp_data.v1.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
++    disp_data.v1.ucAction = action;
+ 
+     if (IS_DCE32_VARIANT) {
+ 	if (radeon_output->MonType == MT_DP) {
+ 	    disp_data.v2.usPixelClock =
+-		cpu_to_le16(dp_link_clock_for_mode_clock(mode->Clock));
++		cpu_to_le16(dp_link_clock_for_mode_clock(clock));
+ 	    disp_data.v2.acConfig.fDPConnector = 1;
+-	} else if (mode->Clock > 165000) {
+-	    disp_data.v2.usPixelClock = cpu_to_le16((mode->Clock * 10 * 2) / 100);
++	} else if (clock > 165000) {
++	    disp_data.v2.usPixelClock = cpu_to_le16((clock * 10 * 2) / 100);
+ 	    disp_data.v2.acConfig.fDualLinkConnector = 1;
+ 	} else {
+-	    disp_data.v2.usPixelClock = cpu_to_le16((mode->Clock * 10 * 4) / 100);
++	    disp_data.v2.usPixelClock = cpu_to_le16((clock * 10 * 4) / 100);
+ 	}
+-	if (radeon_crtc->crtc_id)
++	if (dig_block)
+ 	    disp_data.v2.acConfig.ucEncoderSel = 1;
+ 
+ 	switch (radeon_encoder->encoder_id) {
+@@ -684,9 +693,9 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 
+ 	if (radeon_output->MonType == MT_DP)
+ 	    disp_data.v1.usPixelClock =
+-		cpu_to_le16(dp_link_clock_for_mode_clock(mode->Clock));
++		cpu_to_le16(dp_link_clock_for_mode_clock(clock));
+ 	else
+-	    disp_data.v1.usPixelClock = cpu_to_le16((mode->Clock) / 10);
++	    disp_data.v1.usPixelClock = cpu_to_le16((clock) / 10);
+ 
+ 	switch (radeon_encoder->encoder_id) {
+ 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+@@ -704,7 +713,7 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+ 	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
+ 	    if (info->IsIGP) {
+-		if (mode->Clock > 165000) {
++		if (clock > 165000) {
+ 		    disp_data.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
+ 					      ATOM_TRANSMITTER_CONFIG_LINKA_B);
+ 		    /* guess */
+@@ -724,7 +733,7 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15;
+ 		}
+ 	    } else {
+-		if (mode->Clock > 165000)
++		if (clock > 165000)
+ 		    disp_data.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
+ 					      ATOM_TRANSMITTER_CONFIG_LINKA_B |
+ 					      ATOM_TRANSMITTER_CONFIG_LANE_0_7);
+@@ -741,7 +750,7 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+ 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+ 	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
+-	    if (mode->Clock > 165000)
++	    if (clock > 165000)
+ 		disp_data.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
+ 					  ATOM_TRANSMITTER_CONFIG_LINKA_B |
+ 					  ATOM_TRANSMITTER_CONFIG_LANE_0_7);
+@@ -767,7 +776,6 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 	    }
+ 	}
+     }
+-    radeon_output->transmitter_config = disp_data.v1.ucConfig;
+ 
+     data.exec.index = index;
+     data.exec.dataSpace = (void *)&space;
+@@ -1125,7 +1133,7 @@ atombios_output_overscan_setup(xf86OutputPtr output, DisplayModePtr mode, Displa
+ }
+ 
+ static int
+-atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode)
++atombios_output_scaler_setup(xf86OutputPtr output)
+ {
+     RADEONInfoPtr info       = RADEONPTR(output->scrn);
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+@@ -1213,63 +1221,6 @@ atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode)
+ 
+ }
+ 
+-static int
+-atombios_dig_dpms(xf86OutputPtr output, int mode)
+-{
+-    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+-    RADEONInfoPtr info       = RADEONPTR(output->scrn);
+-    radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output);
+-    DIG_TRANSMITTER_CONTROL_PS_ALLOCATION disp_data;
+-    AtomBiosArgRec data;
+-    unsigned char *space;
+-
+-    if (radeon_encoder == NULL)
+-	return ATOM_NOT_IMPLEMENTED;
+-
+-    memset(&disp_data, 0, sizeof(disp_data));
+-
+-    switch (mode) {
+-    case DPMSModeOn:
+-	disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT;
+-	break;
+-    case DPMSModeStandby:
+-    case DPMSModeSuspend:
+-    case DPMSModeOff:
+-	disp_data.ucAction = ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT;
+-	break;
+-    }
+-
+-    disp_data.ucConfig = radeon_output->transmitter_config;
+-
+-    if (IS_DCE32_VARIANT)
+-	data.exec.index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl);
+-    else {
+-	switch (radeon_encoder->encoder_id) {
+-	case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
+-	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+-	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+-	    data.exec.index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl);
+-	    break;
+-	case ENCODER_OBJECT_ID_INTERNAL_LVDS:
+-	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+-	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+-	    data.exec.index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl);
+-	    break;
+-	}
+-    }
+-    data.exec.dataSpace = (void *)&space;
+-    data.exec.pspace = &disp_data;
+-
+-    if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+-	ErrorF("Output DIG dpms success\n");
+-	return ATOM_SUCCESS;
+-    }
+-
+-    ErrorF("Output DIG dpms failed\n");
+-    return ATOM_NOT_IMPLEMENTED;
+-
+-}
+-
+ void
+ atombios_output_dpms(xf86OutputPtr output, int mode)
+ {
+@@ -1334,7 +1285,7 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
+     case DPMSModeOn:
+ 	radeon_encoder->devices |= radeon_output->active_device;
+ 	if (is_dig)
+-	    (void)atombios_dig_dpms(output, mode);
++	    atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT);
+ 	else {
+ 	    disp_data.ucAction = ATOM_ENABLE;
+ 	    data.exec.index = index;
+@@ -1355,7 +1306,7 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
+ 	radeon_encoder->devices &= ~(radeon_output->active_device);
+ 	if (!radeon_encoder->devices) {
+ 	    if (is_dig)
+-		(void)atombios_dig_dpms(output, mode);
++		atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT);
+ 	    else {
+ 		disp_data.ucAction = ATOM_DISABLE;
+ 		data.exec.index = index;
+@@ -1406,8 +1357,12 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
  	default:
  	    if (IS_AVIVO_VARIANT)
  		crtc_src_param.ucCRTC = radeon_crtc->crtc_id;
@@ -45,11 +527,98 @@
  	    switch (radeon_encoder->encoder_id) {
  	    case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
  	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+@@ -1559,13 +1514,16 @@ atombios_output_mode_set(xf86OutputPtr output,
+ 			 DisplayModePtr adjusted_mode)
+ {
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
++    RADEONCrtcPrivatePtr radeon_crtc = output->crtc->driver_private;
+     radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output);
+     RADEONInfoPtr info       = RADEONPTR(output->scrn);
+     if (radeon_encoder == NULL)
+         return;
+ 
++    radeon_output->pixel_clock = adjusted_mode->Clock;
++    radeon_output->dig_block = radeon_crtc->crtc_id;
+     atombios_output_overscan_setup(output, mode, adjusted_mode);
+-    atombios_output_scaler_setup(output, adjusted_mode);
++    atombios_output_scaler_setup(output);
+     atombios_set_output_crtc_source(output);
+ 
+     if (IS_AVIVO_VARIANT) {
+@@ -1580,29 +1538,31 @@ atombios_output_mode_set(xf86OutputPtr output,
+     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+     case ENCODER_OBJECT_ID_INTERNAL_LVDS:
+     case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+-	atombios_output_digital_setup(output, adjusted_mode);
++	atombios_output_digital_setup(output, PANEL_ENCODER_ACTION_ENABLE);
+ 	break;
+     case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+     case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+     case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+-	atombios_output_dig_encoder_setup(output, adjusted_mode);
+-	atombios_output_dig_transmitter_setup(output, adjusted_mode);
++	atombios_output_dig_encoder_setup(output, ATOM_ENABLE);
++	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_INIT);
++	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_SETUP);
++	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE);
+ 	break;
+     case ENCODER_OBJECT_ID_INTERNAL_DDI:
+-	atombios_output_ddia_setup(output, adjusted_mode);
++	atombios_output_ddia_setup(output, ATOM_ENABLE);
+ 	break;
+     case ENCODER_OBJECT_ID_INTERNAL_DVO1:
+     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
+-	atombios_external_tmds_setup(output, adjusted_mode);
++	atombios_external_tmds_setup(output, ATOM_ENABLE);
+ 	break;
+     case ENCODER_OBJECT_ID_INTERNAL_DAC1:
+     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
+     case ENCODER_OBJECT_ID_INTERNAL_DAC2:
+     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
+-	atombios_output_dac_setup(output, adjusted_mode);
++	atombios_output_dac_setup(output, ATOM_ENABLE);
+ 	if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
+-	    atombios_output_tv_setup(output, adjusted_mode);
++	    atombios_output_tv_setup(output, ATOM_ENABLE);
+ 	break;
+     }
+     atombios_apply_output_quirks(output, adjusted_mode);
+diff --git a/src/legacy_output.c b/src/legacy_output.c
+index 6223531..423a3e2 100644
+--- a/src/legacy_output.c
++++ b/src/legacy_output.c
+@@ -1589,6 +1589,7 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+     if (radeon_encoder == NULL)
+ 	return;
+ 
++    radeon_output->pixel_clock = adjusted_mode->Clock;
+     if (radeon_crtc->crtc_id == 0) {
+ 	ErrorF("set RMX\n");
+ 	is_primary = TRUE;
+@@ -1614,7 +1615,7 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+ 	    unsigned char *RADEONMMIO = info->MMIO;
+ 	    uint32_t fp2_gen_cntl;
+ 
+-	    atombios_external_tmds_setup(output, mode);
++	    atombios_external_tmds_setup(output, ATOM_ENABLE);
+ 	    fp2_gen_cntl = INREG(RADEON_FP2_GEN_CNTL) & ~R200_FP2_SOURCE_SEL_MASK;
+ 	    if (radeon_crtc->crtc_id == 1)
+ 		fp2_gen_cntl |= R200_FP2_SOURCE_SEL_CRTC2;
 diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
-index 4d4e625..bff80ca 100644
+index 4d4e625..b361d9d 100644
 --- a/src/pcidb/ati_pciids.csv
 +++ b/src/pcidb/ati_pciids.csv
-@@ -430,3 +430,10 @@
+@@ -346,6 +346,8 @@
+ "0x9456","RV770_9456","RV770",,,,,,"ATI FirePro V8700 (FireGL)"
+ "0x945A","RV770_945A","RV770",1,,,,,"ATI Mobility RADEON HD 4870"
+ "0x945B","RV770_945B","RV770",1,,,,,"ATI Mobility RADEON M98"
++"0x9460","RV790_9460","RV770",,,,,,"ATI Radeon 4800 Series"
++"0x9462","RV790_9462","RV770",,,,,,"ATI Radeon 4800 Series"
+ "0x946A","RV770_946A","RV770",1,,,,,"ATI FirePro M7750"
+ "0x946B","RV770_946B","RV770",1,,,,,"ATI M98"
+ "0x947A","RV770_947A","RV770",1,,,,,"ATI M98"
+@@ -430,3 +432,10 @@
  "0x9612","RS780_9612","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics"
  "0x9613","RS780_9613","RS780",,1,,,1,"ATI Radeon 3100 Graphics"
  "0x9614","RS780_9614","RS780",,1,,,1,"ATI Radeon HD 3300 Graphics"
@@ -647,6 +1216,19 @@
  		(con_obj_id == CONNECTOR_OBJECT_ID_PCIE_CONNECTOR)) {
  		uint32_t slot_config, ct;
  
+diff --git a/src/radeon_atombios.h b/src/radeon_atombios.h
+index efebc62..b9a5398 100644
+--- a/src/radeon_atombios.h
++++ b/src/radeon_atombios.h
+@@ -126,7 +126,7 @@ extern Bool
+ RADEONGetATOMTVInfo(xf86OutputPtr output);
+ 
+ extern int
+-atombios_external_tmds_setup(xf86OutputPtr output, DisplayModePtr mode);
++atombios_external_tmds_setup(xf86OutputPtr output, int action);
+ 
+ extern void
+ atombios_get_command_table_version(atomBiosHandlePtr atomBIOS, int index, int *major, int *minor);
 diff --git a/src/radeon_bios.c b/src/radeon_bios.c
 index 6fc0cf4..9b5cb88 100644
 --- a/src/radeon_bios.c
@@ -673,10 +1255,19 @@
  
  	if (info->sclk == 0) info->sclk = 200;
 diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
-index eb2df17..e36828c 100644
+index eb2df17..6321246 100644
 --- a/src/radeon_chipinfo_gen.h
 +++ b/src/radeon_chipinfo_gen.h
-@@ -349,4 +349,11 @@ RADEONCardInfo RADEONCards[] = {
+@@ -265,6 +265,8 @@ RADEONCardInfo RADEONCards[] = {
+  { 0x9456, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 },
+  { 0x945A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
+  { 0x945B, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
++ { 0x9460, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 },
++ { 0x9462, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 },
+  { 0x946A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
+  { 0x946B, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
+  { 0x947A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
+@@ -349,4 +351,11 @@ RADEONCardInfo RADEONCards[] = {
   { 0x9612, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
   { 0x9613, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
   { 0x9614, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
@@ -689,10 +1280,19 @@
 + { 0x9714, CHIP_FAMILY_RS880, 0, 1, 0, 0, 1 },
  };
 diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
-index 3c86ae6..caa497a 100644
+index 3c86ae6..631eda8 100644
 --- a/src/radeon_chipset_gen.h
 +++ b/src/radeon_chipset_gen.h
-@@ -349,5 +349,12 @@ static SymTabRec RADEONChipsets[] = {
+@@ -265,6 +265,8 @@ static SymTabRec RADEONChipsets[] = {
+   { PCI_CHIP_RV770_9456, "ATI FirePro V8700 (FireGL)" },
+   { PCI_CHIP_RV770_945A, "ATI Mobility RADEON HD 4870" },
+   { PCI_CHIP_RV770_945B, "ATI Mobility RADEON M98" },
++  { PCI_CHIP_RV790_9460, "ATI Radeon 4800 Series" },
++  { PCI_CHIP_RV790_9462, "ATI Radeon 4800 Series" },
+   { PCI_CHIP_RV770_946A, "ATI FirePro M7750" },
+   { PCI_CHIP_RV770_946B, "ATI M98" },
+   { PCI_CHIP_RV770_947A, "ATI M98" },
+@@ -349,5 +351,12 @@ static SymTabRec RADEONChipsets[] = {
    { PCI_CHIP_RS780_9612, "ATI Radeon HD 3200 Graphics" },
    { PCI_CHIP_RS780_9613, "ATI Radeon 3100 Graphics" },
    { PCI_CHIP_RS780_9614, "ATI Radeon HD 3300 Graphics" },
@@ -705,6 +1305,29 @@
 +  { PCI_CHIP_RS880_9714, "ATI Radeon Graphics" },
    { -1,                 NULL }
  };
+diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
+index cd0d55e..4b508ce 100644
+--- a/src/radeon_crtc.c
++++ b/src/radeon_crtc.c
+@@ -115,6 +115,9 @@ radeon_crtc_mode_prepare(xf86CrtcPtr crtc)
+ {
+     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
+ 
++    if (radeon_crtc->initialized)
++	radeon_crtc_dpms(crtc, DPMSModeOff);
++
+     if (radeon_crtc->enabled)
+ 	crtc->funcs->hide_cursor(crtc);
+ }
+@@ -283,6 +286,8 @@ radeon_crtc_mode_commit(xf86CrtcPtr crtc)
+ {
+     if (crtc->scrn->pScreen != NULL)
+ 	xf86_reload_cursors(crtc->scrn->pScreen);
++
++    radeon_crtc_dpms(crtc, DPMSModeOn);
+ }
+ 
+ void
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
 index 5a15c70..8673f5e 100644
 --- a/src/radeon_driver.c
@@ -834,10 +1457,82 @@
 +
  #endif
 diff --git a/src/radeon_output.c b/src/radeon_output.c
-index 3931db4..719f9e8 100644
+index 3931db4..712ac5f 100644
 --- a/src/radeon_output.c
 +++ b/src/radeon_output.c
-@@ -1263,10 +1263,21 @@ radeon_create_resources(xf86OutputPtr output)
+@@ -110,7 +110,6 @@ extern void atombios_output_mode_set(xf86OutputPtr output,
+ 				     DisplayModePtr adjusted_mode);
+ extern void atombios_output_dpms(xf86OutputPtr output, int mode);
+ extern RADEONMonitorType atombios_dac_detect(xf86OutputPtr output);
+-extern int atombios_external_tmds_setup(xf86OutputPtr output, DisplayModePtr mode);
+ extern AtomBiosResult
+ atombios_lock_crtc(atomBiosHandlePtr atomBIOS, int crtc, int lock);
+ static void
+@@ -521,32 +520,8 @@ radeon_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
+ static void
+ radeon_mode_prepare(xf86OutputPtr output)
+ {
+-    RADEONInfoPtr info = RADEONPTR(output->scrn);
+-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (output->scrn);
+-    int o;
+-
+-    for (o = 0; o < config->num_output; o++) {
+-	xf86OutputPtr loop_output = config->output[o];
+-	if (loop_output == output)
+-	    continue;
+-	else if (loop_output->crtc) {
+-	    xf86CrtcPtr other_crtc = loop_output->crtc;
+-	    RADEONCrtcPrivatePtr other_radeon_crtc = other_crtc->driver_private;
+-	    if (other_crtc->enabled) {
+-		if (other_radeon_crtc->initialized) {
+-		    radeon_crtc_dpms(other_crtc, DPMSModeOff);
+-		    if (IS_AVIVO_VARIANT || info->r4xx_atom)
+-			atombios_lock_crtc(info->atomBIOS, other_radeon_crtc->crtc_id, 1);
+-		    radeon_dpms(loop_output, DPMSModeOff);
+-		}
+-	    }
+-	}
+-    }
+-
+     radeon_bios_output_lock(output, TRUE);
+     radeon_dpms(output, DPMSModeOff);
+-    radeon_crtc_dpms(output->crtc, DPMSModeOff);
+-
+ }
+ 
+ static void
+@@ -566,30 +541,7 @@ radeon_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+ static void
+ radeon_mode_commit(xf86OutputPtr output)
+ {
+-    RADEONInfoPtr info = RADEONPTR(output->scrn);
+-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (output->scrn);
+-    int o;
+-
+-    for (o = 0; o < config->num_output; o++) {
+-	xf86OutputPtr loop_output = config->output[o];
+-	if (loop_output == output)
+-	    continue;
+-	else if (loop_output->crtc) {
+-	    xf86CrtcPtr other_crtc = loop_output->crtc;
+-	    RADEONCrtcPrivatePtr other_radeon_crtc = other_crtc->driver_private;
+-	    if (other_crtc->enabled) {
+-		if (other_radeon_crtc->initialized) {
+-		    radeon_crtc_dpms(other_crtc, DPMSModeOn);
+-		    if (IS_AVIVO_VARIANT || info->r4xx_atom)
+-			atombios_lock_crtc(info->atomBIOS, other_radeon_crtc->crtc_id, 0);
+-		    radeon_dpms(loop_output, DPMSModeOn);
+-		}
+-	    }
+-	}
+-    }
+-
+     radeon_dpms(output, DPMSModeOn);
+-    radeon_crtc_dpms(output->crtc, DPMSModeOn);
+     radeon_bios_output_lock(output, FALSE);
+ }
+ 
+@@ -1263,10 +1215,21 @@ radeon_create_resources(xf86OutputPtr output)
  		       "RRConfigureOutputProperty error, %d\n", err);
  	}
  	/* Set the current value of the property */
@@ -862,7 +1557,7 @@
  	err = RRChangeOutputProperty(output->randr_output, rmx_atom,
  				     XA_STRING, 8, PropModeReplace, strlen(s), (pointer)s,
  				     FALSE, FALSE);
-@@ -1884,6 +1895,10 @@ void RADEONInitConnector(xf86OutputPtr output)
+@@ -1884,6 +1847,10 @@ void RADEONInitConnector(xf86OutputPtr output)
      else
  	radeon_output->rmx_type = RMX_OFF;
  
@@ -873,7 +1568,7 @@
      if (!IS_AVIVO_VARIANT) {
  	if (radeon_output->devices & (ATOM_DEVICE_CRT2_SUPPORT)) {
  	    if (xf86ReturnOptValBool(info->Options, OPTION_TVDAC_LOAD_DETECT, FALSE))
-@@ -2067,12 +2082,12 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
+@@ -2067,12 +2034,12 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
  	info->BiosConnector[0].load_detection = FALSE;
  	info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
  	info->BiosConnector[0].valid = TRUE;
@@ -890,7 +1585,7 @@
  	    return FALSE;
  	if (!radeon_add_encoder(pScrn,
  				radeon_get_encoder_id_from_supported_device(pScrn,
-@@ -2098,12 +2113,12 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
+@@ -2098,12 +2065,12 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
  	info->BiosConnector[0].load_detection = FALSE;
  	info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
  	info->BiosConnector[0].valid = TRUE;
@@ -907,11 +1602,37 @@
  	    return FALSE;
  	if (!radeon_add_encoder(pScrn,
  				radeon_get_encoder_id_from_supported_device(pScrn,
+@@ -2502,11 +2469,16 @@ static RADEONMacModel RADEONDetectMacModel(ScrnInfoPtr pScrn)
+ static int
+ radeon_output_clones (ScrnInfoPtr pScrn, xf86OutputPtr output)
+ {
++    RADEONInfoPtr info = RADEONPTR(pScrn);
+     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (pScrn);
+     int			o;
+     int			index_mask = 0;
+ 
++    /* DIG routing gets problematic */
++    if (IS_DCE32_VARIANT)
++	return index_mask;
++
+     /* LVDS is too wacky */
+     if (radeon_output->devices & (ATOM_DEVICE_LCD_SUPPORT))
+ 	return index_mask;
 diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
-index 31b032a..b9368d7 100644
+index 31b032a..d61c57d 100644
 --- a/src/radeon_pci_chipset_gen.h
 +++ b/src/radeon_pci_chipset_gen.h
-@@ -349,5 +349,12 @@ PciChipsets RADEONPciChipsets[] = {
+@@ -265,6 +265,8 @@ PciChipsets RADEONPciChipsets[] = {
+  { PCI_CHIP_RV770_9456, PCI_CHIP_RV770_9456, RES_SHARED_VGA },
+  { PCI_CHIP_RV770_945A, PCI_CHIP_RV770_945A, RES_SHARED_VGA },
+  { PCI_CHIP_RV770_945B, PCI_CHIP_RV770_945B, RES_SHARED_VGA },
++ { PCI_CHIP_RV790_9460, PCI_CHIP_RV790_9460, RES_SHARED_VGA },
++ { PCI_CHIP_RV790_9462, PCI_CHIP_RV790_9462, RES_SHARED_VGA },
+  { PCI_CHIP_RV770_946A, PCI_CHIP_RV770_946A, RES_SHARED_VGA },
+  { PCI_CHIP_RV770_946B, PCI_CHIP_RV770_946B, RES_SHARED_VGA },
+  { PCI_CHIP_RV770_947A, PCI_CHIP_RV770_947A, RES_SHARED_VGA },
+@@ -349,5 +351,12 @@ PciChipsets RADEONPciChipsets[] = {
   { PCI_CHIP_RS780_9612, PCI_CHIP_RS780_9612, RES_SHARED_VGA },
   { PCI_CHIP_RS780_9613, PCI_CHIP_RS780_9613, RES_SHARED_VGA },
   { PCI_CHIP_RS780_9614, PCI_CHIP_RS780_9614, RES_SHARED_VGA },
@@ -925,10 +1646,19 @@
   { -1,                 -1,                 RES_UNDEFINED }
  };
 diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
-index b310ce8..3923371 100644
+index b310ce8..a06b4a6 100644
 --- a/src/radeon_pci_device_match_gen.h
 +++ b/src/radeon_pci_device_match_gen.h
-@@ -349,5 +349,12 @@ static const struct pci_id_match radeon_device_match[] = {
+@@ -265,6 +265,8 @@ static const struct pci_id_match radeon_device_match[] = {
+  ATI_DEVICE_MATCH( PCI_CHIP_RV770_9456, 0 ),
+  ATI_DEVICE_MATCH( PCI_CHIP_RV770_945A, 0 ),
+  ATI_DEVICE_MATCH( PCI_CHIP_RV770_945B, 0 ),
++ ATI_DEVICE_MATCH( PCI_CHIP_RV790_9460, 0 ),
++ ATI_DEVICE_MATCH( PCI_CHIP_RV790_9462, 0 ),
+  ATI_DEVICE_MATCH( PCI_CHIP_RV770_946A, 0 ),
+  ATI_DEVICE_MATCH( PCI_CHIP_RV770_946B, 0 ),
+  ATI_DEVICE_MATCH( PCI_CHIP_RV770_947A, 0 ),
+@@ -349,5 +351,12 @@ static const struct pci_id_match radeon_device_match[] = {
   ATI_DEVICE_MATCH( PCI_CHIP_RS780_9612, 0 ),
   ATI_DEVICE_MATCH( PCI_CHIP_RS780_9613, 0 ),
   ATI_DEVICE_MATCH( PCI_CHIP_RS780_9614, 0 ),
@@ -941,8 +1671,24 @@
 + ATI_DEVICE_MATCH( PCI_CHIP_RS880_9714, 0 ),
   { 0, 0, 0 }
  };
+diff --git a/src/radeon_probe.h b/src/radeon_probe.h
+index a0c6b2c..6479972 100644
+--- a/src/radeon_probe.h
++++ b/src/radeon_probe.h
+@@ -271,8 +271,10 @@ typedef struct _RADEONOutputPrivateRec {
+     radeon_tvout_rec tvout;
+ 
+     /* dce 3.x dig block */
+-    int transmitter_config;
+     int igp_lane_info;
++    int dig_block;
++
++    int pixel_clock;
+ } RADEONOutputPrivateRec, *RADEONOutputPrivatePtr;
+ 
+ struct avivo_pll_state {
 diff --git a/src/radeon_reg.h b/src/radeon_reg.h
-index 0af8859..a130794 100644
+index 0af8859..d74a30a 100644
 --- a/src/radeon_reg.h
 +++ b/src/radeon_reg.h
 @@ -274,6 +274,9 @@
@@ -984,7 +1730,21 @@
  #define RADEON_TV_SYNC_CNTL                          0x0808
  #       define RADEON_SYNC_OE                     (1 <<  0)
  #       define RADEON_SYNC_OUT                    (1 <<  1)
-@@ -4406,6 +4423,7 @@
+@@ -3610,6 +3627,13 @@
+ #       define AVIVO_D1GRPH_MACRO_ADDRESS_MODE          (1<<21)
+ 
+ #define AVIVO_D1GRPH_LUT_SEL                                    0x6108
++
++#define R600_D1GRPH_SWAP_CONTROL                               0x610C
++#       define R600_D1GRPH_SWAP_ENDIAN_NONE                    (0 << 0)
++#       define R600_D1GRPH_SWAP_ENDIAN_16BIT                   (1 << 0)
++#       define R600_D1GRPH_SWAP_ENDIAN_32BIT                   (2 << 0)
++#       define R600_D1GRPH_SWAP_ENDIAN_64BIT                   (3 << 0)
++
+ #define AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS                    0x6110
+ #define AVIVO_D1GRPH_SECONDARY_SURFACE_ADDRESS                  0x6118
+ #define AVIVO_D1GRPH_PITCH                                      0x6120
+@@ -4406,6 +4430,7 @@
  #define R300_TX_INVALTAGS				0x4100
  #define R300_TX_FILTER0_0				0x4400
  #define R300_TX_FILTER0_1				0x4404
@@ -992,7 +1752,7 @@
  #       define R300_TX_CLAMP_S(x)                       ((x) << 0)
  #       define R300_TX_CLAMP_T(x)                       ((x) << 3)
  #       define R300_TX_CLAMP_R(x)                       ((x) << 6)
-@@ -4424,8 +4442,10 @@
+@@ -4424,8 +4449,10 @@
  #       define R300_TX_ID_SHIFT                         28
  #define R300_TX_FILTER1_0				0x4440
  #define R300_TX_FILTER1_1				0x4444
@@ -1003,7 +1763,7 @@
  #       define R300_TXWIDTH_SHIFT                       0
  #       define R300_TXHEIGHT_SHIFT                      11
  #       define R300_NUM_LEVELS_SHIFT                    26
-@@ -4434,6 +4454,7 @@
+@@ -4434,6 +4461,7 @@
  #       define R300_TXPITCH_EN                          (1 << 31)
  #define R300_TX_FORMAT1_0				0x44c0
  #define R300_TX_FORMAT1_1				0x44c4
@@ -1011,7 +1771,7 @@
  #	define R300_TX_FORMAT_X8		    0x0
  #	define R300_TX_FORMAT_X16		    0x1
  #	define R300_TX_FORMAT_Y4X4		    0x2
-@@ -4506,13 +4527,23 @@
+@@ -4506,13 +4534,23 @@
  #       define R300_TX_FORMAT_YUV_TO_RGB_NO_CLAMP      (2 << 22)
  #       define R300_TX_FORMAT_SWAP_YUV                 (1 << 24)
  
@@ -1035,7 +1795,7 @@
  #       define R300_ENDIAN_SWAP_16_BIT                  (1 << 0)
  #       define R300_ENDIAN_SWAP_32_BIT                  (2 << 0)
  #       define R300_ENDIAN_SWAP_HALF_DWORD              (3 << 0)
-@@ -4523,6 +4554,7 @@
+@@ -4523,6 +4561,7 @@
  #define R300_TX_ENABLE				        0x4104
  #       define R300_TEX_0_ENABLE                        (1 << 0)
  #       define R300_TEX_1_ENABLE                        (1 << 1)

radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- radeon-modeset.patch	1 Apr 2009 12:03:34 -0000	1.42
+++ radeon-modeset.patch	6 Apr 2009 05:38:09 -0000	1.43
@@ -1,8 +1,16 @@
 diff --git a/configure.ac b/configure.ac
-index 660ea1f..4279b60 100644
+index 660ea1f..4ddec1c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -114,8 +114,19 @@ if test "$DRI" = yes; then
+@@ -31,6 +31,7 @@ AM_CONFIG_HEADER([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
+ AM_INIT_AUTOMAKE([dist-bzip2])
++AC_SYS_LARGEFILE
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -114,8 +115,19 @@ if test "$DRI" = yes; then
  	if test "$have_damage_h" = yes; then
  		AC_DEFINE(DAMAGE,1,[Use Damage extension])
  	fi
@@ -1066,8 +1074,30 @@
 +extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
 +#endif
 +#endif
+diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
+index 3dfe151..04b6457 100644
+--- a/src/r600_textured_videofuncs.c
++++ b/src/r600_textured_videofuncs.c
+@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+     switch(pPriv->id) {
+     case FOURCC_YV12:
+     case FOURCC_I420:
+-	accel_state->src_mc_addr[0] = pPriv->src_offset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
+ 	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
+ 
+ 	/* flush texture cache */
+@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+     case FOURCC_UYVY:
+     case FOURCC_YUY2:
+     default:
+-	accel_state->src_mc_addr[0] = pPriv->src_offset;
++	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pScrn->fbOffset;
+ 	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
+ 
+ 	/* flush texture cache */
 diff --git a/src/radeon.h b/src/radeon.h
-index d488429..09e15f4 100644
+index d488429..d1bca2e 100644
 --- a/src/radeon.h
 +++ b/src/radeon.h
 @@ -46,6 +46,8 @@
@@ -1181,7 +1211,7 @@
  #ifdef USE_EXA
      Bool              accelDFS;
  #endif
-@@ -892,6 +928,45 @@ typedef struct {
+@@ -892,6 +928,43 @@ typedef struct {
  
      Bool              r4xx_atom;
  
@@ -1191,9 +1221,7 @@
 +    Bool cs_used_depth;
 +    Bool drm_mm; // the drm memory manager exists and is initialised 
 +    struct {
-+      uint64_t vram_start;
 +      uint64_t vram_size;
-+      uint64_t gart_start;
 +      uint64_t gart_size;
 +
 +      struct radeon_memory *bo_list[2];
@@ -1227,7 +1255,7 @@
  } RADEONInfoRec, *RADEONInfoPtr;
  
  #define RADEONWaitForFifo(pScrn, entries)				\
-@@ -1147,6 +1222,24 @@ extern void
+@@ -1147,6 +1220,24 @@ extern void
  radeon_legacy_free_memory(ScrnInfoPtr pScrn,
  		          void *mem_struct);
  
@@ -1252,7 +1280,7 @@
  #ifdef XF86DRI
  #  ifdef USE_XAA
  /* radeon_accelfuncs.c */
-@@ -1165,7 +1258,9 @@ do {									\
+@@ -1165,7 +1256,9 @@ do {									\
  
  #define RADEONCP_RELEASE(pScrn, info)					\
  do {									\
@@ -1263,7 +1291,7 @@
  	RADEON_PURGE_CACHE();						\
  	RADEON_WAIT_UNTIL_IDLE();					\
  	RADEONCPReleaseIndirect(pScrn);					\
-@@ -1200,7 +1295,7 @@ do {									\
+@@ -1200,7 +1293,7 @@ do {									\
  
  #define RADEONCP_REFRESH(pScrn, info)					\
  do {									\
@@ -1272,7 +1300,7 @@
  	if (info->cp->needCacheFlush) {					\
  	    RADEON_PURGE_CACHE();					\
  	    RADEON_PURGE_ZCACHE();					\
-@@ -1227,6 +1322,13 @@ do {									\
+@@ -1227,6 +1320,13 @@ do {									\
  #define RING_LOCALS	uint32_t *__head = NULL; int __expected; int __count = 0
  
  #define BEGIN_RING(n) do {						\
@@ -1286,7 +1314,7 @@
      if (RADEON_VERBOSE) {						\
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO,				\
  		   "BEGIN_RING(%d) in %s\n", (unsigned int)n, __FUNCTION__);\
-@@ -1239,13 +1341,6 @@ do {									\
+@@ -1239,13 +1339,6 @@ do {									\
      }									\
      info->cp->dma_debug_func = __FILE__;				\
      info->cp->dma_debug_lineno = __LINE__;				\
@@ -1300,7 +1328,7 @@
      __expected = n;							\
      __head = (pointer)((char *)info->cp->indirectBuffer->address +	\
  		       info->cp->indirectBuffer->used);			\
-@@ -1288,6 +1383,14 @@ do {									\
+@@ -1288,6 +1381,14 @@ do {									\
      OUT_RING(val);							\
  } while (0)
  
@@ -1705,10 +1733,10 @@
 +#endif
 diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c
 new file mode 100644
-index 0000000..a2fd61a
+index 0000000..6005e51
 --- /dev/null
 +++ b/src/radeon_bufmgr_gem.c
-@@ -0,0 +1,668 @@
+@@ -0,0 +1,635 @@
 +/**************************************************************************
 + *
 + * Copyright ?? 2007-2008 Red Hat Inc.
@@ -1818,7 +1846,7 @@
 +	args.size = size;
 +	args.alignment = alignment;
 +	args.initial_domain = RADEON_GEM_DOMAIN_CPU;
-+	args.no_backing_store = 0;
++	args.flags = 0;
 +
 +	ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_CREATE, &args, sizeof(args));
 +	gem_bo->gem_handle = args.handle;
@@ -1906,6 +1934,7 @@
 +	dri_bo_gem *gem_bo = (dri_bo_gem *)bo;
 +	struct drm_radeon_gem_mmap args;
 +	int ret;
++	void *ptr;
 +
 +	if (gem_bo->map_count++ != 0)
 +		return 0;
@@ -1915,8 +1944,13 @@
 +	args.size = gem_bo->bo.size;
 +
 +	ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_MMAP, &args, sizeof(args));
-+	if (!ret)
-+		gem_bo->bo.virtual = (void *)(unsigned long)args.addr_ptr;
++	if (ret)
++		return ret;
++
++	ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, bufmgr_gem->fd, args.addr_ptr);
++	if (ptr == MAP_FAILED)
++		return -errno;
++	gem_bo->bo.virtual = ptr;
 +
 +	return ret;
 +}
@@ -1943,7 +1977,7 @@
 +void radeon_bufmgr_gem_wait_rendering(dri_bo *buf)
 +{
 +	dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)buf->bufmgr;
-+	struct drm_radeon_gem_wait_rendering args;
++	struct drm_radeon_gem_wait_idle args;
 +	struct drm_radeon_gem_set_domain sd_args;
 +	dri_bo_gem *gem_bo = (dri_bo_gem *)buf;
 +	int ret;
@@ -1964,7 +1998,7 @@
 +		args.handle = gem_bo->gem_handle;
 +
 +		do {
-+		ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_WAIT_RENDERING,
++		ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_WAIT_IDLE,
 +					  &args, sizeof(args));
 +		} while (ret == -EAGAIN);
 +	}
@@ -2111,43 +2145,6 @@
 +	*count_p = __count;
 +}
 +
-+static int radeon_gem_bufmgr_pin(dri_bo *bo, int domain)
-+{
-+	dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo->bufmgr;
-+	dri_bo_gem *gem_bo = (dri_bo_gem *)bo;
-+	struct drm_radeon_gem_pin pin;
-+	int ret;
-+
-+	if (domain == RADEON_GEM_DOMAIN_VRAM)
-+		gem_bo->in_vram = 1;
-+
-+	pin.pin_domain = domain;
-+	pin.handle = gem_bo->gem_handle;
-+	pin.alignment = 0;
-+
-+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_RADEON_GEM_PIN, &pin);
-+	if (ret != 0)
-+		return -1;
-+
-+	/* pinned buffers are considered touched */
-+	gem_bo->touched = 1;
-+	gem_bo->pinned = 1;
-+	return 0;
-+}
-+
-+static void radeon_gem_bufmgr_unpin(dri_bo *bo)
-+{
-+
-+	dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo->bufmgr;
-+	dri_bo_gem *gem_bo = (dri_bo_gem *)bo;
-+	struct drm_radeon_gem_unpin unpin;
-+
-+	unpin.handle = gem_bo->gem_handle;
-+	ioctl(bufmgr_gem->fd, DRM_IOCTL_RADEON_GEM_UNPIN, &unpin);
-+	gem_bo->pinned = 0;
-+}
-+
-+
 +static uint32_t radeon_gem_bufmgr_get_handle(dri_bo *buf)
 +{
 +	dri_bo_gem *gem_bo = (dri_bo_gem *)buf;
@@ -2277,8 +2274,6 @@
 +	bufmgr_gem->bufmgr.bo_map = dri_gem_bo_map;
 +	bufmgr_gem->bufmgr.bo_unmap = dri_gem_bo_unmap;
 +	bufmgr_gem->bufmgr.destroy = dri_bufmgr_gem_destroy;
-+	bufmgr_gem->bufmgr.pin = radeon_gem_bufmgr_pin;
-+	bufmgr_gem->bufmgr.unpin = radeon_gem_bufmgr_unpin;
 +	//bufmgr_gem->bufmgr.bo_wait_rendering = radeon_bufmgr_gem_wait_rendering;
 +	bufmgr_gem->radeon_bufmgr.emit_reloc = radeon_bufmgr_gem_emit_reloc;
 +	bufmgr_gem->bufmgr.get_handle = radeon_gem_bufmgr_get_handle;
@@ -2601,7 +2596,7 @@
  
      CURSOR_SWAPPING_START();
 diff --git a/src/radeon_dri.c b/src/radeon_dri.c
-index f6c6261..1699d8a 100644
+index f6c6261..64b5937 100644
 --- a/src/radeon_dri.c
 +++ b/src/radeon_dri.c
 @@ -40,6 +40,8 @@
@@ -2656,7 +2651,7 @@
  static void RADEONDRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num);
  #endif
  #endif
-@@ -352,6 +371,133 @@ static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
+@@ -352,6 +371,111 @@ static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
  #endif
  }
  
@@ -2683,28 +2678,6 @@
 +    return -1;
 +}
 +
-+static void radeon_update_sarea(ScrnInfoPtr pScrn, drm_radeon_sarea_t * sarea)
-+{
-+    RADEONInfoPtr  info  = RADEONPTR(pScrn);
-+    int cpp = info->CurrentLayout.pixel_bytes;
-+    sarea->front_handle = -1;
-+    sarea->back_handle = -1;
-+    sarea->depth_handle = -1;
-+   
-+    if (info->drm_mm){
-+	/* get handles and use them */
-+	sarea->front_handle = radeon_name_buffer(pScrn, info->mm.front_buffer);
-+
-+	sarea->front_pitch         = info->dri->frontPitch * cpp;
-+	sarea->back_pitch         = info->dri->backPitch * cpp;
-+	sarea->depth_pitch         = info->dri->depthPitch * cpp;
-+	ErrorF("front handle is %x\n", sarea->front_handle);
-+	sarea->back_handle = radeon_name_buffer(pScrn, info->mm.back_buffer);
-+	sarea->depth_handle = radeon_name_buffer(pScrn, info->mm.depth_buffer);
-+
-+    }
-+}
-+
 +/* so we need to add a frontbuffer map no matter what */
 +#define ROUND_TO(x, y)                 (((x) + (y) - 1) / (y) * (y))
 +#define ROUND_TO_PAGE(x)               ROUND_TO((x), radeon_drm_page_size)
@@ -2790,7 +2763,7 @@
  /* Called when the X server is woken up to allow the last client's
   * context to be saved and the X server's context to be loaded.  This is
   * not necessary for the Radeon since the client detects when it's
-@@ -701,25 +847,35 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info)
+@@ -701,25 +825,35 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info)
  
      info->dri->gartOffset = 0;
  
@@ -2845,7 +2818,7 @@
  }
  
  /* AGP Mode Quirk List - Certain hostbridge/gfx-card combos don't work with
-@@ -992,6 +1148,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -992,6 +1126,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
  	       "[agp] ring handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringHandle);
  
@@ -2854,7 +2827,7 @@
      if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize,
  	       &info->dri->ring) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n");
-@@ -1000,9 +1158,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1000,9 +1136,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] Ring mapped at 0x%08lx\n",
  	       (unsigned long)info->dri->ring);
@@ -2866,7 +2839,7 @@
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
  		   "[agp] Could not add ring read ptr mapping\n");
  	return FALSE;
-@@ -1011,6 +1170,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1011,6 +1148,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
   	       "[agp] ring read ptr handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringReadPtrHandle);
  
@@ -2875,7 +2848,7 @@
      if (drmMap(info->dri->drmFD, info->dri->ringReadPtrHandle, info->dri->ringReadMapSize,
  	       &info->dri->ringReadPtr) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
-@@ -1020,6 +1181,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1020,6 +1159,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[agp] Ring read ptr mapped at 0x%08lx\n",
  	       (unsigned long)info->dri->ringReadPtr);
@@ -2883,7 +2856,7 @@
  
      if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize,
  		  DRM_AGP, 0, &info->dri->bufHandle) < 0) {
-@@ -1097,6 +1259,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1097,6 +1237,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
  	       "[pci] ring handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringHandle);
  
@@ -2891,7 +2864,7 @@
      if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize,
  	       &info->dri->ring) < 0) {
  	xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring\n");
-@@ -1108,6 +1271,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1108,6 +1249,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] Ring contents 0x%08lx\n",
  	       *(unsigned long *)(pointer)info->dri->ring);
@@ -2899,7 +2872,7 @@
  
      if (drmAddMap(info->dri->drmFD, info->dri->ringReadOffset, info->dri->ringReadMapSize,
  		  DRM_SCATTER_GATHER, flags, &info->dri->ringReadPtrHandle) < 0) {
-@@ -1119,8 +1283,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1119,8 +1261,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
   	       "[pci] ring read ptr handle = 0x%08x\n",
  	       (unsigned int)info->dri->ringReadPtrHandle);
  
@@ -2910,7 +2883,7 @@
  	xf86DrvMsg(pScreen->myNum, X_ERROR,
  		   "[pci] Could not map ring read ptr\n");
  	return FALSE;
-@@ -1131,6 +1297,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1131,6 +1275,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
      xf86DrvMsg(pScreen->myNum, X_INFO,
  	       "[pci] Ring read ptr contents 0x%08lx\n",
  	       *(unsigned long *)(pointer)info->dri->ringReadPtr);
@@ -2918,7 +2891,7 @@
  
      if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize,
  		  DRM_SCATTER_GATHER, 0, &info->dri->bufHandle) < 0) {
-@@ -1183,6 +1350,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1183,6 +1328,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen)
   */
  static Bool RADEONDRIMapInit(RADEONInfoPtr info, ScreenPtr pScreen)
  {
@@ -2928,7 +2901,7 @@
  				/* Map registers */
      info->dri->registerSize = info->MMIOSize;
      if (drmAddMap(info->dri->drmFD, info->MMIOAddr, info->dri->registerSize,
-@@ -1223,20 +1393,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1223,20 +1371,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
      drmInfo.fb_bpp              = info->CurrentLayout.pixel_code;
      drmInfo.depth_bpp           = (info->dri->depthBits - 8) * 2;
  
@@ -2966,7 +2939,7 @@
      if (drmCommandWrite(info->dri->drmFD, DRM_RADEON_CP_INIT,
  			&drmInfo, sizeof(drm_radeon_init_t)) < 0)
  	return FALSE;
-@@ -1245,8 +1418,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -1245,8 +1396,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
       * registers back to their default values, so we need to restore
       * those engine register here.
       */
@@ -2978,7 +2951,7 @@
  
      return TRUE;
  }
-@@ -1444,12 +1618,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
+@@ -1444,12 +1596,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
  
      /* Get DRM version & close DRM */
      info->dri->pKernelDRMVersion = drmGetVersion(fd);
@@ -2992,7 +2965,7 @@
      }
  
      /* Now check if we qualify */
-@@ -1483,10 +1656,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
+@@ -1483,10 +1634,27 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
  		   req_patch);
  	drmFreeVersion(info->dri->pKernelDRMVersion);
  	info->dri->pKernelDRMVersion = NULL;
@@ -3006,12 +2979,10 @@
 +	    if (!drmCommandWriteRead(fd, DRM_RADEON_GEM_INFO, &mminfo, sizeof(mminfo)))
 +	    {
 +		    info->drm_mm = TRUE;
-+		    info->mm.vram_start = mminfo.vram_start;
 +		    info->mm.vram_size = mminfo.vram_size;
-+		    info->mm.gart_start = mminfo.vram_start;
 +		    info->mm.gart_size = mminfo.gart_size;
-+		    ErrorF("initing %llx %llx %llx %llx\n", mminfo.gart_start,
-+			   mminfo.gart_size, mminfo.vram_start, mminfo.vram_size);
++		    ErrorF("initing %llx %llx %llx %llx\n",
++			   mminfo.gart_size, mminfo.vram_size);
 +	    }
      }
  
@@ -3023,7 +2994,7 @@
  }
  
  Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
-@@ -1495,6 +1687,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
+@@ -1495,6 +1663,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
      xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
      int value = 0;
  
@@ -3033,7 +3004,7 @@
      if (!info->want_vblank_interrupts)
          on = FALSE;
  
-@@ -1514,6 +1709,52 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
+@@ -1514,6 +1685,52 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
      return TRUE;
  }
  
@@ -3086,7 +3057,7 @@
  
  /* Initialize the screen-specific data structures for the DRI and the
   * Radeon.  This is the main entry point to the device-specific
-@@ -1577,10 +1818,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1577,10 +1794,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
      pDRIInfo->ddxDriverMajorVersion      = info->allowColorTiling ? 5 : 4;
      pDRIInfo->ddxDriverMinorVersion      = 3;
      pDRIInfo->ddxDriverPatchVersion      = 0;
@@ -3113,7 +3084,7 @@
      pDRIInfo->ddxDrawableTableEntry      = RADEON_MAX_DRAWABLES;
      pDRIInfo->maxDrawableTableEntry      = (SAREA_MAX_DRAWABLES
  					    < RADEON_MAX_DRAWABLES
-@@ -1633,9 +1886,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1633,9 +1862,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
      pDRIInfo->TransitionTo3d = RADEONDRITransitionTo3d;
      pDRIInfo->TransitionSingleToMulti3D = RADEONDRITransitionSingleToMulti3d;
      pDRIInfo->TransitionMultiToSingle3D = RADEONDRITransitionMultiToSingle3d;
@@ -3124,7 +3095,7 @@
      pDRIInfo->ClipNotify     = RADEONDRIClipNotify;
  #endif
  
-@@ -1667,57 +1918,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
+@@ -1667,57 +1894,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
  	pDRIInfo = NULL;
  	return FALSE;
      }
@@ -3138,7 +3109,7 @@
 -	RADEONDRICloseScreen(pScreen);
 -	return FALSE;
 -    }
- 
+-
 -				/* Initialize PCI */
 -    if ((info->cardType!=CARD_AGP) && !RADEONDRIPciInit(info, pScreen)) {
 -	xf86DrvMsg(pScreen->myNum, X_ERROR,
@@ -3146,12 +3117,7 @@
 -	RADEONDRICloseScreen(pScreen);
 -	return FALSE;
 -    }
-+    /* Now, nuke dri.c's dummy frontbuffer map setup if we did that. */
-+    if (pDRIInfo->frameBufferSize != 0 && info->drm_mm) {
-+	int tmp;
-+	drm_handle_t fb_handle;
-+	void *ptmp;
- 
+-
 -				/* DRIScreenInit doesn't add all the
 -				 * common mappings.  Add additional
 -				 * mappings here.
@@ -3160,13 +3126,18 @@
 -	RADEONDRICloseScreen(pScreen);
 -	return FALSE;
 -    }
--
+ 
 -				/* DRIScreenInit adds the frame buffer
 -				   map, but we need it as well */
 -    {
 -	void *scratch_ptr;
 -        int scratch_int;
--
++    /* Now, nuke dri.c's dummy frontbuffer map setup if we did that. */
++    if (pDRIInfo->frameBufferSize != 0 && info->drm_mm) {
++	int tmp;
++	drm_handle_t fb_handle;
++	void *ptmp;
+ 
 -	DRIGetDeviceInfo(pScreen, &info->dri->fbHandle,
 -                         &scratch_int, &scratch_int,
 -                         &scratch_int, &scratch_int,
@@ -3229,7 +3200,7 @@
  static Bool RADEONDRIDoCloseScreen(int scrnIndex, ScreenPtr pScreen)
  {
      ScrnInfoPtr    pScrn = xf86Screens[pScreen->myNum];
-@@ -1759,17 +2013,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
+@@ -1759,17 +1989,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
  	return FALSE;
      }
  
@@ -3259,7 +3230,7 @@
  
      /* Initialize and start the CP if required */
      RADEONDRICPInit(pScrn);
-@@ -1778,6 +2036,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
+@@ -1778,6 +2012,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen)
      pSAREAPriv = (drm_radeon_sarea_t*)DRIGetSAREAPrivate(pScreen);
      memset(pSAREAPriv, 0, sizeof(*pSAREAPriv));
  
@@ -3270,7 +3241,7 @@
      pRADEONDRI                    = (RADEONDRIPtr)info->dri->pDRIInfo->devPrivate;
  
      pRADEONDRI->deviceID          = info->Chipset;
-@@ -1935,6 +2197,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1935,6 +2173,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  	drmUnmap(info->dri->buf, info->dri->bufMapSize);
  	info->dri->buf = NULL;
      }
@@ -3279,7 +3250,7 @@
      if (info->dri->ringReadPtr) {
  	drmUnmap(info->dri->ringReadPtr, info->dri->ringReadMapSize);
  	info->dri->ringReadPtr = NULL;
-@@ -1943,6 +2207,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
+@@ -1943,6 +2183,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
  	drmUnmap(info->dri->ring, info->dri->ringMapSize);
  	info->dri->ring = NULL;
      }
@@ -3287,7 +3258,7 @@
      if (info->dri->agpMemHandle != DRM_AGP_NO_HANDLE) {
  	drmAgpUnbind(info->dri->drmFD, info->dri->agpMemHandle);
  	drmAgpFree(info->dri->drmFD, info->dri->agpMemHandle);
-@@ -2352,3 +2617,11 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value)
+@@ -2352,3 +2593,11 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value)
  			  &radeonsetparam, sizeof(drm_radeon_setparam_t));
      return ret;
  }
@@ -4058,7 +4029,7 @@
 +
 +#endif
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 8673f5e..8d04d92 100644
+index 8673f5e..1c9d5d9 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
 @@ -67,7 +67,7 @@
@@ -4460,7 +4431,7 @@
  
      if (!RADEONPreInitVisual(pScrn))
  	goto fail;
-@@ -2907,167 +2979,227 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2907,167 +2979,225 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
      xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
  
@@ -4766,12 +4737,10 @@
 +
 +	    if (!drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_GEM_INFO, &mminfo, sizeof(mminfo)))
 +	    {
-+		info->mm.vram_start = mminfo.vram_start;
 +		info->mm.vram_size = mminfo.vram_visible;
-+		info->mm.gart_start = mminfo.gart_start;
 +		info->mm.gart_size = mminfo.gart_size;
-+		ErrorF("initing %llx %llx %llx %llx %llx\n", mminfo.gart_start,
-+		       mminfo.gart_size, mminfo.vram_start, mminfo.vram_size, mminfo.vram_visible);
++		ErrorF("initing gart:%llx vram: s:%llx v:%llx\n",
++		       mminfo.gart_size, mminfo.vram_size, mminfo.vram_visible);
 +	    }
 +	    {
 +	        struct drm_radeon_getparam gp;
@@ -4817,7 +4786,7 @@
  
  	/* Get ScreenInit function */
      if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-@@ -3082,10 +3214,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3082,10 +3212,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  	if (!RADEONPreInitXv(pScrn))                 goto fail;
      }
  
@@ -4834,7 +4803,7 @@
      }
  
      if (pScrn->modes == NULL) {
-@@ -3238,6 +3372,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
+@@ -3238,6 +3370,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
  
  #ifdef USE_EXA
      info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
@@ -4844,7 +4813,7 @@
  #endif
  }
  
-@@ -3326,7 +3463,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3326,7 +3461,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      int            subPixelOrder = SubPixelUnknown;
      char*          s;
  #endif
@@ -4853,7 +4822,7 @@
  
      info->accelOn      = FALSE;
  #ifdef USE_XAA
-@@ -3346,58 +3483,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3346,58 +3481,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  		   "RADEONScreenInit %lx %ld\n",
  		   pScrn->memPhysBase, pScrn->fbOffset);
  #endif
@@ -4954,7 +4923,7 @@
      /* Visual setup */
      miClearVisualTypes();
      if (!miSetVisualTypes(pScrn->depth,
-@@ -3431,19 +3571,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3431,19 +3569,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      hasDRI = info->directRenderingEnabled;
  #endif /* XF86DRI */
  
@@ -4988,7 +4957,7 @@
  	}
      }
  
-@@ -3480,7 +3622,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3480,7 +3620,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #ifdef XF86DRI
  	if (hasDRI) {
  	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
@@ -5000,7 +4969,7 @@
  
  	    /* Reserve approx. half of offscreen memory for local textures by
  	     * default, can be overridden with Option "FBTexPercent".
-@@ -3506,7 +3651,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3506,7 +3649,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #if defined(XF86DRI) && defined(USE_XAA)
@@ -5009,7 +4978,7 @@
  	info->dri->textureSize = -1;
  	if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT,
  				 &(info->dri->textureSize))) {
-@@ -3524,7 +3669,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3524,7 +3667,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #ifdef USE_XAA
@@ -5018,7 +4987,7 @@
  	return FALSE;
  #endif
  
-@@ -3545,7 +3690,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3545,7 +3688,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			    info->CurrentLayout.pixel_bytes);
  	int  maxy        = info->FbMapSize / width_bytes;
  
@@ -5027,7 +4996,7 @@
  	    xf86DrvMsg(scrnIndex, X_ERROR,
  		       "Static buffer allocation failed.  Disabling DRI.\n");
  	    xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3555,19 +3700,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3555,19 +3698,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024);
  	    info->directRenderingEnabled = FALSE;
  	} else {
@@ -5086,7 +5055,7 @@
  #endif
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Initializing fb layer\n");
-@@ -3591,7 +3771,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3591,7 +3769,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      if (info->r600_shadow_fb == FALSE) {
  	/* Init fb layer */
@@ -5095,7 +5064,7 @@
  			  pScrn->virtualX, pScrn->virtualY,
  			  pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
  			  pScrn->bitsPerPixel))
-@@ -3633,8 +3813,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3633,8 +3811,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      /* restore the memory map here otherwise we may get a hang when
       * initializing the drm below
       */
@@ -5108,7 +5077,7 @@
  
      /* Backing store setup */
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -3644,7 +3826,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3644,7 +3824,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      /* DRI finalisation */
  #ifdef XF86DRI
@@ -5117,7 +5086,7 @@
          info->dri->pKernelDRMVersion->version_minor >= 19)
      {
        if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -3660,14 +3842,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3660,14 +3840,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      if (info->directRenderingEnabled) {
          xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		       "DRI Finishing init !\n");
@@ -5143,7 +5112,7 @@
  
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
  
-@@ -3763,10 +3955,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3763,10 +3953,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
              return FALSE;
          }
      }
@@ -5161,7 +5130,7 @@
  
      /* Provide SaveScreen & wrap BlockHandler and CloseScreen */
      /* Wrap CloseScreen */
-@@ -5336,7 +5534,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5336,7 +5532,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #ifdef XF86DRI
      Bool           CPStarted   = info->cp->CPStarted;
  
@@ -5170,7 +5139,7 @@
  	DRILock(pScrn->pScreen, 0);
  	RADEONCP_STOP(pScrn, info);
      }
-@@ -5359,8 +5557,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5359,8 +5555,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #endif
      }
  
@@ -5183,7 +5152,7 @@
  
      ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0);
  
-@@ -5372,16 +5572,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5372,16 +5570,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  	/* xf86SetRootClip would do, but can't access that here */
      }
  
@@ -5211,7 +5180,7 @@
      }
  #endif
  
-@@ -5579,6 +5782,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5579,6 +5780,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
      xf86OutputPtr  output = config->output[config->compat_output];
      xf86CrtcPtr	crtc = output->crtc;
  
@@ -5223,7 +5192,7 @@
      /* not handled */
      if (IS_AVIVO_VARIANT)
  	return;
-@@ -5618,76 +5826,101 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5618,76 +5824,100 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONEnterVT\n");
  
@@ -5301,7 +5270,6 @@
 -    if (IS_R300_VARIANT || IS_RV100_VARIANT)
 -	RADEONForceSomeClocks(pScrn);
 +    if (info->drm_mm) {
-+	radeon_bind_all_memory(pScrn);
 +	info->accel_state->XInited3D = FALSE;
 +	info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
 +    }
@@ -5375,7 +5343,7 @@
      }
  #endif
      /* this will get XVideo going again, but only if XVideo was initialised
-@@ -5702,7 +5935,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5702,7 +5932,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
  	info->accel_state->XInited3D = FALSE;
  
  #ifdef XF86DRI
@@ -5384,7 +5352,7 @@
          if (info->ChipFamily >= CHIP_FAMILY_R600)
  		R600LoadShaders(pScrn);
  	RADEONCP_START(pScrn, info);
-@@ -5726,27 +5959,29 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5726,27 +5956,29 @@ void RADEONLeaveVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONLeaveVT\n");
  #ifdef XF86DRI
@@ -5430,7 +5398,7 @@
  
  	/* Make sure 3D clients will re-upload textures to video RAM */
  	if (info->dri->textureSize) {
-@@ -5762,6 +5997,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5762,6 +5994,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  		i = list[i].next;
  	    } while (i != 0);
  	}
@@ -5442,7 +5410,7 @@
      }
  #endif
  
-@@ -5788,10 +6028,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5788,10 +6025,17 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  
      xf86_hide_cursors (pScrn);
  
@@ -5450,7 +5418,6 @@
 +    if (info->drm_mm) {
 +	info->accel_state->XInited3D = FALSE;
 +	info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
-+	radeon_unbind_all_memory(pScrn);
 +    }
  
 -    for (i = 0; i < config->num_crtc; i++)
@@ -5464,7 +5431,7 @@
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Ok, leaving now...\n");
-@@ -5845,7 +6093,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5845,7 +6089,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
  #endif /* USE_XAA */
  
      if (pScrn->vtSema) {
@@ -5474,13 +5441,12 @@
      }
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5880,6 +6129,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5880,6 +6125,11 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
      info->DGAModes = NULL;
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Unmapping memory\n");
 +
 +    if (info->drm_mm) {
-+	radeon_unbind_all_memory(pScrn);
 +	radeon_free_all_memory(pScrn);
 +    }
 +
@@ -5488,71 +5454,55 @@
  
      pScrn->vtSema = FALSE;
 diff --git a/src/radeon_drm.h b/src/radeon_drm.h
-index 54bc234..06fbad3 100644
+index 54bc234..843cfe8 100644
 --- a/src/radeon_drm.h
 +++ b/src/radeon_drm.h
-@@ -303,7 +303,6 @@ typedef union {
+@@ -303,7 +303,8 @@ typedef union {
  #define RADEON_INDEX_PRIM_OFFSET	20
  
  #define RADEON_SCRATCH_REG_OFFSET	32
 -#define R600_SCRATCH_REG_OFFSET	        256
++
++#define R600_SCRATCH_REG_OFFSET         256
  
  #define RADEON_NR_SAREA_CLIPRECTS	12
  
-@@ -454,6 +453,15 @@ typedef struct {
- 	int pfCurrentPage;	/* which buffer is being displayed? */
- 	int crtc2_base;		/* CRTC2 frame offset */
- 	int tiling_enabled;	/* set by drm, read by 2d + 3d clients */
-+
-+	unsigned int last_fence;
-+
-+	uint32_t front_handle;
-+	uint32_t back_handle;
-+	uint32_t depth_handle;
-+	uint32_t front_pitch;
-+	uint32_t back_pitch;
-+	uint32_t depth_pitch;
- } drm_radeon_sarea_t;
- 
- /* WARNING: If you change any of these defines, make sure to change the
-@@ -494,6 +502,18 @@ typedef struct {
+@@ -493,6 +494,16 @@ typedef struct {
+ #define DRM_RADEON_SETPARAM   0x19
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
++/* KMS ioctl */
++#define DRM_RADEON_GEM_INFO		0x1c
++#define DRM_RADEON_GEM_CREATE		0x1d
++#define DRM_RADEON_GEM_MMAP		0x1e
++#define DRM_RADEON_GEM_PREAD		0x21
++#define DRM_RADEON_GEM_PWRITE		0x22
++#define DRM_RADEON_GEM_SET_DOMAIN	0x23
++#define DRM_RADEON_GEM_WAIT_IDLE	0x24
++#define DRM_RADEON_CS			0x26
++#define DRM_RADEON_INFO			0x27
  
-+#define DRM_RADEON_GEM_INFO   0x1c
-+#define DRM_RADEON_GEM_CREATE 0x1d
-+#define DRM_RADEON_GEM_MMAP   0x1e
-+#define DRM_RADEON_GEM_PIN    0x1f
-+#define DRM_RADEON_GEM_UNPIN  0x20
-+#define DRM_RADEON_GEM_PREAD  0x21
-+#define DRM_RADEON_GEM_PWRITE 0x22
-+#define DRM_RADEON_GEM_SET_DOMAIN 0x23
-+#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
-+
-+#define DRM_RADEON_CS       0x26
-+
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
- #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -522,16 +542,28 @@ typedef struct {
+@@ -521,6 +532,17 @@ typedef struct {
+ #define DRM_IOCTL_RADEON_SETPARAM   DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SETPARAM, drm_radeon_setparam_t)
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
- 
-+#define DRM_IOCTL_RADEON_GEM_INFO   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
-+#define DRM_IOCTL_RADEON_GEM_CREATE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
-+#define DRM_IOCTL_RADEON_GEM_MMAP   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
-+#define DRM_IOCTL_RADEON_GEM_PIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PIN, struct drm_radeon_gem_pin)
-+#define DRM_IOCTL_RADEON_GEM_UNPIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_UNPIN, struct drm_radeon_gem_unpin)
-+#define DRM_IOCTL_RADEON_GEM_PREAD   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
-+#define DRM_IOCTL_RADEON_GEM_PWRITE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
-+#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
-+#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
-+#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+
++/* KMS */
++#define DRM_IOCTL_RADEON_GEM_INFO	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
++#define DRM_IOCTL_RADEON_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
++#define DRM_IOCTL_RADEON_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
++#define DRM_IOCTL_RADEON_GEM_PREAD	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
++#define DRM_IOCTL_RADEON_GEM_PWRITE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
++#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
++#define DRM_IOCTL_RADEON_GEM_WAIT_IDLE	DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle) 
++#define DRM_IOCTL_RADEON_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++#define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
 +
+ 
  typedef struct drm_radeon_init {
  	enum {
- 		RADEON_INIT_CP = 0x01,
+@@ -528,10 +550,10 @@ typedef struct drm_radeon_init {
  		RADEON_CLEANUP_CP = 0x02,
  		RADEON_INIT_R200_CP = 0x03,
  		RADEON_INIT_R300_CP = 0x04,
@@ -5565,7 +5515,19 @@
  	int cp_mode;
  	int gart_size;
  	int ring_size;
-@@ -581,7 +613,7 @@ typedef struct drm_radeon_clear {
+@@ -543,9 +565,8 @@ typedef struct drm_radeon_init {
+ 	unsigned int depth_bpp;
+ 	unsigned int depth_offset, depth_pitch;
+ 
+-	/* DEPRECATED commented out below to allow for -Werror build */
+-	unsigned long fb_offset;	/* deprecated, driver asks hardware */
+-	unsigned long mmio_offset;	/* deprecated, driver asks hardware */
++	unsigned long fb_offset;
++	unsigned long mmio_offset;
+ 	unsigned long ring_offset;
+ 	unsigned long ring_rptr_offset;
+ 	unsigned long buffers_offset;
+@@ -581,7 +602,7 @@ typedef struct drm_radeon_clear {
  	unsigned int clear_depth;
  	unsigned int color_mask;
  	unsigned int depth_mask;	/* misnamed field:  should be stencil */
@@ -5574,7 +5536,7 @@
  } drm_radeon_clear_t;
  
  typedef struct drm_radeon_vertex {
-@@ -607,9 +639,9 @@ typedef struct drm_radeon_vertex2 {
+@@ -607,9 +628,9 @@ typedef struct drm_radeon_vertex2 {
  	int idx;		/* Index of vertex buffer */
  	int discard;		/* Client finished with buffer? */
  	int nr_states;
@@ -5586,7 +5548,7 @@
  } drm_radeon_vertex2_t;
  
  /* v1.3 - obsoletes drm_radeon_vertex2
-@@ -624,15 +656,15 @@ typedef struct drm_radeon_vertex2 {
+@@ -624,15 +645,15 @@ typedef struct drm_radeon_vertex2 {
   */
  typedef struct drm_radeon_cmd_buffer {
  	int bufsz;
@@ -5605,7 +5567,7 @@
  } drm_radeon_tex_image_t;
  
  typedef struct drm_radeon_texture {
-@@ -641,11 +673,11 @@ typedef struct drm_radeon_texture {
+@@ -641,11 +662,11 @@ typedef struct drm_radeon_texture {
  	int format;
  	int width;		/* Texture image coordinates */
  	int height;
@@ -5619,7 +5581,7 @@
  } drm_radeon_stipple_t;
  
  typedef struct drm_radeon_indirect {
-@@ -655,9 +687,6 @@ typedef struct drm_radeon_indirect {
+@@ -655,9 +676,6 @@ typedef struct drm_radeon_indirect {
  	int discard;
  } drm_radeon_indirect_t;
  
@@ -5629,11 +5591,11 @@
  /* enum for card type parameters */
  #define RADEON_CARD_PCI 0
  #define RADEON_CARD_AGP 1
-@@ -683,10 +712,11 @@ typedef struct drm_radeon_indirect {
+@@ -683,10 +701,11 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-+#define RADEON_PARAM_KERNEL_MM             16
++#define RADEON_PARAM_DEVICE_ID             16
  
  typedef struct drm_radeon_getparam {
  	int param;
@@ -5642,7 +5604,7 @@
  } drm_radeon_getparam_t;
  
  /* 1.6: Set up a memory manager for regions of shared memory:
-@@ -698,7 +728,7 @@ typedef struct drm_radeon_mem_alloc {
+@@ -698,7 +717,7 @@ typedef struct drm_radeon_mem_alloc {
  	int region;
  	int alignment;
  	int size;
@@ -5651,7 +5613,7 @@
  } drm_radeon_mem_alloc_t;
  
  typedef struct drm_radeon_mem_free {
-@@ -715,7 +745,7 @@ typedef struct drm_radeon_mem_init_heap {
+@@ -715,7 +734,7 @@ typedef struct drm_radeon_mem_init_heap {
  /* 1.6: Userspace can request & wait on irq's:
   */
  typedef struct drm_radeon_irq_emit {
@@ -5660,7 +5622,7 @@
  } drm_radeon_irq_emit_t;
  
  typedef struct drm_radeon_irq_wait {
-@@ -734,10 +764,10 @@ typedef struct drm_radeon_setparam {
+@@ -734,7 +753,6 @@ typedef struct drm_radeon_setparam {
  #define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
  #define RADEON_SETPARAM_SWITCH_TILING  2	/* enable/disable color tiling */
  #define RADEON_SETPARAM_PCIGART_LOCATION 3	/* PCI Gart Location */
@@ -5668,69 +5630,55 @@
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-+#define RADEON_SETPARAM_MM_INIT 7               /* DDX wants memory manager but has no modesetting */
- /* 1.14: Clients can allocate/free a surface
-  */
- typedef struct drm_radeon_surface_alloc {
-@@ -753,4 +783,107 @@ typedef struct drm_radeon_surface_free {
+@@ -753,4 +771,112 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
-+#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
-+#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
-+#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
++/*
++ * Kernel modesetting world below.
++ */
++#define RADEON_GEM_DOMAIN_CPU		0x1
++#define RADEON_GEM_DOMAIN_GTT		0x2
++#define RADEON_GEM_DOMAIN_VRAM		0x4
 +
-+/* return to userspace start/size of gtt and vram apertures */
 +struct drm_radeon_gem_info {
-+	uint64_t gart_start;
-+	uint64_t gart_size;
-+	uint64_t vram_start;
-+	uint64_t vram_size;
-+	uint64_t vram_visible;
++	uint64_t	gart_size;
++	uint64_t	vram_size;
++	uint64_t	vram_visible;
 +};
 +
++#define RADEON_GEM_NO_BACKING_STORE 1
++
 +struct drm_radeon_gem_create {
-+	uint64_t size;
-+	uint64_t alignment;
-+	uint32_t handle;
-+	uint32_t initial_domain; // to allow VRAM to be created
-+	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
-+	// pretty much front/back/depth don't need it - other things do
++	uint64_t	size;
++	uint64_t	alignment;
++	uint32_t	handle;
++	uint32_t	initial_domain;
++	uint32_t	flags;
 +};
 +
 +struct drm_radeon_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
++	uint32_t	handle;
++	uint32_t	pad;
++	uint64_t	offset;
++	uint64_t	size;
++	uint64_t	addr_ptr;
 +};
 +
 +struct drm_radeon_gem_set_domain {
-+	uint32_t handle;
-+	uint32_t read_domains;
-+	uint32_t write_domain;
-+};
-+
-+struct drm_radeon_gem_wait_rendering {
-+	uint32_t handle;
-+};
-+
-+struct drm_radeon_gem_pin {
-+	uint32_t handle;
-+	uint32_t pin_domain;
-+	uint64_t alignment;
-+	uint64_t offset;
++	uint32_t	handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
 +};
 +
-+struct drm_radeon_gem_unpin {
-+	uint32_t handle;
-+	uint32_t pad;
++struct drm_radeon_gem_wait_idle {
++	uint32_t	handle;
++	uint32_t	pad;
 +};
 +
 +struct drm_radeon_gem_busy {
-+	uint32_t handle;
-+	uint32_t busy;
++	uint32_t	handle;
++	uint32_t	busy;
 +};
 +
 +struct drm_radeon_gem_pread {
@@ -5742,7 +5690,8 @@
 +	/** Length of data to read */
 +	uint64_t size;
 +	/** Pointer to write the data into. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
 +struct drm_radeon_gem_pwrite {
@@ -5754,30 +5703,44 @@
 +	/** Length of data to write */
 +	uint64_t size;
 +	/** Pointer to read the data from. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
-+
-+/* New interface which obsolete all previous interface.
-+ */
-+
-+
-+#define RADEON_CHUNK_ID_RELOCS 0x01
-+#define RADEON_CHUNK_ID_IB     0x02
++#define RADEON_CHUNK_ID_RELOCS	0x01
++#define RADEON_CHUNK_ID_IB	0x02
 +
 +struct drm_radeon_cs_chunk {
-+	uint32_t chunk_id;
-+	uint32_t length_dw;
-+	uint64_t chunk_data;
++	uint32_t		chunk_id;
++	uint32_t		length_dw;
++	uint64_t		chunk_data;
++};
++
++struct drm_radeon_cs_reloc {
++	uint32_t		handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
++	uint32_t		flags;
 +};
 +
 +struct drm_radeon_cs {
-+	uint32_t	num_chunks;
-+	uint32_t        cs_id;
-+	uint64_t	chunks; /* this points to uint64_t * which point to
-+				   cs chunks */
++	uint32_t		num_chunks;
++	uint32_t		cs_id;
++	/* this points to uint64_t * which point to cs chunks */
++	uint64_t		chunks;
++	/* updates to the limits after this CS ioctl */
++	uint64_t		gart_limit;
++	uint64_t		vram_limit;
 +};
 +
++#define RADEON_INFO_DEVICE_ID		0x00
++#define RADEON_INFO_NUM_GB_PIPES	0x01
++
++struct drm_radeon_info {
++	uint32_t		request;
++	uint32_t		pad;
++	uint64_t		value;
++};
 +
  #endif
 diff --git a/src/radeon_exa.c b/src/radeon_exa.c
@@ -7579,10 +7542,10 @@
  
 diff --git a/src/radeon_memory.c b/src/radeon_memory.c
 new file mode 100644
-index 0000000..67868cc
+index 0000000..f4b6c28
 --- /dev/null
 +++ b/src/radeon_memory.c
-@@ -0,0 +1,386 @@
+@@ -0,0 +1,241 @@
 +
 +#include <errno.h>
 +#include <sys/ioctl.h>
@@ -7591,75 +7554,6 @@
 +#include "radeon_drm.h"
 +#include "radeon_bufmgr_gem.h"
 +
-+Bool
-+radeon_bind_memory(ScrnInfoPtr pScrn, struct radeon_memory *mem)
-+{
-+	RADEONInfoPtr info = RADEONPTR(pScrn);	
-+  
-+	if (mem == NULL || mem->bound)
-+		return TRUE;
-+
-+	if (!info->drm_mm)
-+		return FALSE;
-+
-+	if (mem->kernel_bo_handle) {
-+		struct drm_radeon_gem_pin pin;
-+
-+		int ret;
-+
-+    		if (mem->pool == RADEON_POOL_VRAM)
-+		    pin.pin_domain = RADEON_GEM_DOMAIN_VRAM;
-+    		else
-+      		    pin.pin_domain = RADEON_GEM_DOMAIN_GTT;
-+		pin.handle = mem->kernel_bo_handle;
-+		pin.alignment = mem->alignment;
-+
-+		ret = ioctl(info->dri->drmFD, DRM_IOCTL_RADEON_GEM_PIN, &pin);
-+		if (ret != 0) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				   "Failed to pin %s: %s\n", mem->name, strerror(errno));
-+			return FALSE;
-+		}
-+
-+		mem->bound = TRUE;
-+		mem->offset = pin.offset;
-+		//		ErrorF("pin returned 0x%llx\n", pin.offset);
-+		mem->end = mem->offset + mem->size;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static Bool
-+radeon_unbind_memory(ScrnInfoPtr pScrn, struct radeon_memory *mem)
-+{
-+	RADEONInfoPtr info = RADEONPTR(pScrn);
-+	int ret;
-+
-+	if (mem == NULL || !mem->bound)
-+		return TRUE;
-+
-+	if (!info->drm_mm)
-+		return FALSE;
-+
-+	if (mem->kernel_bo_handle) {
-+		struct drm_radeon_gem_unpin unpin;
-+
-+		unpin.handle = mem->kernel_bo_handle;
-+		ret = ioctl(info->dri->drmFD, DRM_IOCTL_RADEON_GEM_UNPIN, &unpin);
-+
-+		if (ret == 0) {
-+			mem->bound = FALSE;
-+			mem->offset = -1;
-+			mem->end = -1;
-+			return TRUE;
-+		} else {
-+			return FALSE;
-+		}
-+	}
-+	return FALSE;
-+}
-+
 +void radeon_free_memory(ScrnInfoPtr pScrn, struct radeon_memory *mem)
 +{
 +	RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -7670,8 +7564,6 @@
 +	if (mem->map)
 +	    radeon_unmap_memory(pScrn, mem);
 +	    
-+	radeon_unbind_memory(pScrn, mem);
-+
 +	if (mem->kernel_bo_handle) {
 +		struct drm_gem_close close;
 +
@@ -7715,14 +7607,13 @@
 +    mem->size = size;
 +    mem->pool = pool;
 +    mem->next = mem->prev = NULL;
-+    mem->vt_bind = static_alloc;
 +    args.size = size;
 +    args.alignment = alignment;
 +    if (pool == RADEON_POOL_VRAM)
 +      args.initial_domain = RADEON_GEM_DOMAIN_VRAM;
 +    else
 +      args.initial_domain = RADEON_GEM_DOMAIN_GTT;
-+    args.no_backing_store = no_backing_store;
++    args.flags = no_backing_store ? RADEON_GEM_NO_BACKING_STORE : 0;
 +
 +    ret = drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_GEM_CREATE, &args, sizeof(args));
 +    if (ret) {
@@ -7745,40 +7636,6 @@
 +    return mem;
 +}
 +
-+Bool radeon_bind_all_memory(ScrnInfoPtr pScrn)
-+{
-+    RADEONInfoPtr  info   = RADEONPTR(pScrn);	
-+    struct radeon_memory *mem;
-+    int i;
-+
-+    for (i = 0; i < 2; i++) {
-+	for (mem = info->mm.bo_list[i]; mem != NULL;
-+	     mem = mem->next) {
-+	    if (mem->vt_bind)
-+		if (!radeon_bind_memory(pScrn, mem)) {
-+		    FatalError("Couldn't bind %s\n", mem->name);
-+		}
-+	}
-+    }
-+    return TRUE;
-+}
-+	    
-+Bool radeon_unbind_all_memory(ScrnInfoPtr pScrn)
-+{
-+    RADEONInfoPtr  info   = RADEONPTR(pScrn);	
-+    struct radeon_memory *mem;
-+    int i;
-+
-+    for (i = 0; i < 2; i++) {
-+	for (mem = info->mm.bo_list[i]; mem != NULL;
-+	     mem = mem->next) {
-+	    if (mem->vt_bind)
-+		radeon_unbind_memory(pScrn, mem);
-+	}
-+    }
-+    return TRUE;
-+}
-+
 +Bool radeon_free_all_memory(ScrnInfoPtr pScrn)
 +{
 +    RADEONInfoPtr  info   = RADEONPTR(pScrn);	
@@ -7801,16 +7658,22 @@
 +    struct drm_radeon_gem_mmap args;
 +    RADEONInfoPtr info = RADEONPTR(pScrn);
 +    int ret;
++    void *ptr;
 +
 +    assert(!mem->map);
 +
-+
 +    args.handle = mem->kernel_bo_handle;
 +    args.size = mem->size;
 +    ret = drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_GEM_MMAP, &args, sizeof(args));
 +
-+    if (!ret)
-+	mem->map = (void *)(unsigned long)args.addr_ptr;
++    if (ret)
++	return ret;
++
++    ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, info->dri->drmFD, args.addr_ptr);
++    if (ptr == MAP_FAILED)
++        return -errno;
++
++    mem->map = ptr;
 +    //    ErrorF("Mapped %s size %ld at %x %p\n", mem->name, mem->size, mem->offset, mem->map);
 +    return ret;
 +}
@@ -7884,27 +7747,6 @@
 +    /* keep area front front buffer - but don't allocate it yet */
 +    total_size_bytes += screen_size;
 +
-+    if (info->directRenderingEnabled && !info->dri2.enabled) {
-+	info->dri->backPitch = pScrn->displayWidth;
-+	info->mm.back_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, screen_size, 0, 1, "Back Buffer", 0);
-+	if (!info->mm.back_buffer) {
-+	    return FALSE;
-+	}
-+	total_size_bytes += screen_size;
-+	
-+	info->dri->depthPitch = RADEON_ALIGN(pScrn->displayWidth, 32);
-+	{
-+	    int depthCpp = (info->dri->depthBits - 8) / 4;
-+	    int depth_size = RADEON_ALIGN(pScrn->virtualY, 16) * info->dri->depthPitch * depthCpp;
-+    	    depth_size = RADEON_ALIGN(depth_size, pagesize);
-+	    info->mm.depth_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, depth_size, 0, 1, "Depth Buffer", 0);
-+	    if (!info->mm.depth_buffer) {
-+		return FALSE;
-+	    }
-+	    total_size_bytes += depth_size;
-+	}
-+    }
-+
 +    /* work out from the mm size what the exa / tex sizes need to be */
 +    remain_size_bytes = info->mm.vram_size - total_size_bytes;
 +
@@ -7927,38 +7769,14 @@
 +
 +    ErrorF("fb size is %dK %dK\n", fb_size_bytes / 1024, total_size_bytes / 1024);
 +
-+    info->mm.front_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, fb_size_bytes, 0, 1, "Front Buffer + EXA", 1);
++    info->mm.front_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, fb_size_bytes, 0, 1, "Front Buffer", 1);
 +    if (!info->mm.front_buffer) {
 +	return FALSE;
 +    }
 +
-+    /* don't need to bind or map memory */
-+    if (!info->dri2.enabled) {
-+      if (radeon_map_memory(pScrn, info->mm.front_buffer)) {
-+	ErrorF("Failed to map front buffer memory\n");
-+      }
-+      info->dri->frontPitch = pScrn->displayWidth;
-+    }
-+
-+    if (info->directRenderingEnabled && info->dri->textureSize) {
-+	info->mm.texture_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, info->dri->textureSize, 0, 1, "Texture Buffer", 1);
-+	if (!info->mm.texture_buffer) {
-+	    return FALSE;
-+	}
-+	radeon_bind_memory(pScrn, info->mm.texture_buffer);
-+    }
-+	
-+    if (info->drm_mode_setting) {
-+	drmmode_set_fb(pScrn, &info->drmmode, pScrn->virtualX, RADEON_ALIGN(pScrn->virtualY, 16), stride, info->mm.front_buffer->kernel_bo_handle);
-+    }
++    drmmode_set_fb(pScrn, &info->drmmode, pScrn->virtualX, RADEON_ALIGN(pScrn->virtualY, 16), stride, info->mm.front_buffer->kernel_bo_handle);
 +
 +    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK at 0x%08x\n", info->mm.front_buffer->size/1024, info->mm.front_buffer->offset);
-+    if (info->directRenderingEnabled && !info->dri2.enabled) {
-+   	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Back buffer size:  %dK at 0x%08x\n", info->mm.back_buffer->size/1024, info->mm.back_buffer->offset);
-+    	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Depth buffer size: %dK at 0x%08x\n", info->mm.depth_buffer->size/1024, info->mm.depth_buffer->offset);
-+    }
-+    if (info->mm.texture_buffer)
-+      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Texture size:      %dK at 0x%08x\n", info->mm.texture_buffer->size/1024, info->mm.texture_buffer->offset);
 +    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Remaining VRAM size (used for pixmaps): %dK\n", remain_size_bytes/1024);
 +
 +    /* set the emit limit at 90% of VRAM */
@@ -7970,10 +7788,10 @@
 +
 +
 diff --git a/src/radeon_probe.h b/src/radeon_probe.h
-index a0c6b2c..30fee18 100644
+index a0c6b2c..b0fd23e 100644
 --- a/src/radeon_probe.h
 +++ b/src/radeon_probe.h
-@@ -146,6 +146,27 @@ typedef struct
+@@ -146,6 +146,26 @@ typedef struct
      Bool hw_capable;
  } RADEONI2CBusRec, *RADEONI2CBusPtr;
  
@@ -7995,13 +7813,12 @@
 +    uint32_t alignment;
 +    uint32_t kernel_bo_handle;
 +    uint32_t kernel_name;
-+    Bool vt_bind;
 +};
 +
  typedef struct _RADEONCrtcPrivateRec {
      void *crtc_rotate_mem;
      void *cursor_mem;
-@@ -159,6 +180,8 @@ typedef struct _RADEONCrtcPrivateRec {
+@@ -159,6 +179,8 @@ typedef struct _RADEONCrtcPrivateRec {
      int can_tile;
      Bool enabled;
      Bool initialized;
@@ -8011,7 +7828,7 @@
  
  typedef struct _radeon_encoder {
 diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
-index 79671c0..1ef8dc3 100644
+index 79671c0..7a70d2f 100644
 --- a/src/radeon_textured_video.c
 +++ b/src/radeon_textured_video.c
 @@ -40,6 +40,7 @@
@@ -8094,6 +7911,30 @@
      pPriv->src_pitch = dstPitch;
      pPriv->planeu_offset = dstPitch * dst_height;
      pPriv->planev_offset = pPriv->planeu_offset + dstPitch2 * ((dst_height + 1) >> 1);
+@@ -481,12 +502,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+ 	    if (info->DMAForXv) {
+ 		if (id == FOURCC_YV12)
+ 		    R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset,
+-				     pPriv->src_offset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
+ 				     srcPitch, srcPitch2, pPriv->src_pitch,
+ 				     width, height);
+ 		else
+ 		    R600CopyPlanarHW(pScrn, buf, buf + s2offset, buf + s3offset,
+-				     pPriv->src_offset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
+ 				     srcPitch, srcPitch2, pPriv->src_pitch,
+ 				     width, height);
+ 	    } else {
+@@ -548,7 +569,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     default:
+ 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
+ 	    if (info->DMAForXv)
+-		R600CopyPackedHW(pScrn, buf, pPriv->src_offset,
++		R600CopyPackedHW(pScrn, buf, pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
+ 				 2 * width, pPriv->src_pitch,
+ 				 width, height);
+ 	    else
 @@ -566,9 +587,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  
      /* Upload bicubic filter tex */


Index: radeon.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon.xinf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- radeon.xinf	27 Feb 2009 03:57:32 -0000	1.11
+++ radeon.xinf	6 Apr 2009 05:38:10 -0000	1.12
@@ -263,6 +263,8 @@
 alias pcivideo:v00001002d00009456sv*sd*bc*sc*i* radeon # ATI FirePro V8700 (FireGL)
 alias pcivideo:v00001002d0000945Asv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4870
 alias pcivideo:v00001002d0000945Bsv*sd*bc*sc*i* radeon # ATI Mobility RADEON M98
+alias pcivideo:v00001002d00009460sv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
+alias pcivideo:v00001002d00009462sv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
 alias pcivideo:v00001002d0000946Asv*sd*bc*sc*i* radeon # ATI FirePro M7750
 alias pcivideo:v00001002d0000946Bsv*sd*bc*sc*i* radeon # ATI M98
 alias pcivideo:v00001002d0000947Asv*sd*bc*sc*i* radeon # ATI M98
@@ -347,3 +349,10 @@
 alias pcivideo:v00001002d00009612sv*sd*bc*sc*i* radeon # ATI Radeon HD 3200 Graphics
 alias pcivideo:v00001002d00009613sv*sd*bc*sc*i* radeon # ATI Radeon 3100 Graphics
 alias pcivideo:v00001002d00009614sv*sd*bc*sc*i* radeon # ATI Radeon HD 3300 Graphics
+alias pcivideo:v00001002d00009615sv*sd*bc*sc*i* radeon # ATI Radeon HD 3200 Graphics
+alias pcivideo:v00001002d00009616sv*sd*bc*sc*i* radeon # ATI Radeon 3000 Graphics
+alias pcivideo:v00001002d00009710sv*sd*bc*sc*i* radeon # ATI Radeon HD Graphics
+alias pcivideo:v00001002d00009711sv*sd*bc*sc*i* radeon # ATI Radeon Graphics
+alias pcivideo:v00001002d00009712sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD Graphics
+alias pcivideo:v00001002d00009713sv*sd*bc*sc*i* radeon # ATI Mobility Radeon Graphics
+alias pcivideo:v00001002d00009714sv*sd*bc*sc*i* radeon # ATI Radeon Graphics


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- xorg-x11-drv-ati.spec	3 Apr 2009 10:03:49 -0000	1.166
+++ xorg-x11-drv-ati.spec	6 Apr 2009 05:38:10 -0000	1.167
@@ -19,7 +19,6 @@
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
-Patch7:	    radeon-r6xx-fix.patch
 
 ExcludeArch: s390 s390x
 
@@ -34,7 +33,7 @@
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 Requires:  libdrm >= 2.4.0-0.21
 # new CS method needs newer kernel
-Requires:  kernel >= 2.6.27.4-58
+Requires:  kernel >= 2.6.29.1-51
 
 %description 
 X.Org X11 ati video driver.
@@ -46,7 +45,6 @@
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
-%patch7 -p1 -b .r6xv
 
 %build
 autoreconf -iv
@@ -78,6 +76,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-5
+- radeon-modeset.patch: break APIs;
+- radeon: move to latest git fixups
+
 * Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-4
 - fix up r600 xv harder
 


--- radeon-r6xx-fix.patch DELETED ---



From airlied at fedoraproject.org  Mon Apr  6 05:41:32 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 05:41:32 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.167,1.168
Message-ID: <20090406054132.7529D700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20810

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-5
- radeon-modeset.patch: break APIs;
- radeon: move to latest git fixups
- bump min kernel required



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- xorg-x11-drv-ati.spec	6 Apr 2009 05:38:10 -0000	1.167
+++ xorg-x11-drv-ati.spec	6 Apr 2009 05:41:02 -0000	1.168
@@ -33,7 +33,7 @@
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 Requires:  libdrm >= 2.4.0-0.21
 # new CS method needs newer kernel
-Requires:  kernel >= 2.6.29.1-51
+Requires:  kernel >= 2.6.29.1-52.fc11
 
 %description 
 X.Org X11 ati video driver.
@@ -79,6 +79,7 @@
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-5
 - radeon-modeset.patch: break APIs;
 - radeon: move to latest git fixups
+- bump min kernel required
 
 * Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-4
 - fix up r600 xv harder



From airlied at fedoraproject.org  Mon Apr  6 05:42:06 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 05:42:06 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm-radeon.patch, 1.7, 1.8 libdrm.spec, 1.68,
	1.69
Message-ID: <20090406054206.C5605700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21160

Modified Files:
	libdrm-radeon.patch libdrm.spec 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com<> 2.4.5-4
- libdrm-radeon: API busting to latest upstream
- bump kernel requires


libdrm-radeon.patch:

Index: libdrm-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-radeon.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdrm-radeon.patch	24 Feb 2009 16:37:29 -0000	1.7
+++ libdrm-radeon.patch	6 Apr 2009 05:41:36 -0000	1.8
@@ -22,23 +22,11 @@
  
  libdrm_la_LTLIBRARIES = libdrm.la
  libdrm_ladir = $(libdir)
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/libdrm_radeon.pc.in
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/libdrm_radeon.pc.in	2009-02-18 09:27:49.000000000 +1000
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libdrm_radeon
-+Description: Userspace interface to kernel DRM services for radeon
-+Version: 1.0.1
-+Libs: -L${libdir} -ldrm_radeon
-+Cflags: -I${includedir} -I${includedir}/drm
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/Makefile.am
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/Makefile.am	2009-02-18 09:27:49.000000000 +1000
+diff --git a/libdrm/radeon/Makefile.am b/libdrm/radeon/Makefile.am
+new file mode 100644
+index 0000000..bc8a5b8
+--- /dev/null
++++ b/libdrm/radeon/Makefile.am
 @@ -0,0 +1,53 @@
 +# Copyright ?? 2008 J??r??me Glisse
 +#
@@ -93,10 +81,213 @@
 +pkgconfig_DATA = libdrm_radeon.pc
 +
 +EXTRA_DIST = libdrm_radeon.pc.in
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_bo_gem.c
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_bo_gem.c	2009-02-18 09:27:49.000000000 +1000
-@@ -0,0 +1,223 @@
+diff --git a/libdrm/radeon/libdrm_radeon.pc.in b/libdrm/radeon/libdrm_radeon.pc.in
+new file mode 100644
+index 0000000..3306844
+--- /dev/null
++++ b/libdrm/radeon/libdrm_radeon.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libdrm_radeon
++Description: Userspace interface to kernel DRM services for radeon
++Version: 1.0.1
++Libs: -L${libdir} -ldrm_radeon
++Cflags: -I${includedir} -I${includedir}/drm
+diff --git a/libdrm/radeon/radeon_bo.h b/libdrm/radeon/radeon_bo.h
+new file mode 100644
+index 0000000..3cabdfc
+--- /dev/null
++++ b/libdrm/radeon/radeon_bo.h
+@@ -0,0 +1,179 @@
++/* 
++ * Copyright ?? 2008 J??r??me Glisse
++ * All Rights Reserved.
++ * 
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sub license, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
++ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
++ * USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial portions
++ * of the Software.
++ */
++/*
++ * Authors:
++ *      J??r??me Glisse <glisse at freedesktop.org>
++ */
++#ifndef RADEON_BO_H
++#define RADEON_BO_H
++
++#include <stdio.h>
++#include <stdint.h>
++#include "radeon_track.h"
++
++/* bo object */
++#define RADEON_BO_FLAGS_MACRO_TILE  1
++#define RADEON_BO_FLAGS_MICRO_TILE  2
++
++struct radeon_bo_manager;
++
++struct radeon_bo {
++    uint32_t                    alignment;
++    uint32_t                    handle;
++    uint32_t                    size;
++    uint32_t                    domains;
++    uint32_t                    flags;
++    unsigned                    cref;
++#ifdef RADEON_BO_TRACK
++    struct radeon_track         *track;
++#endif
++    void                        *ptr;
++    struct radeon_bo_manager    *bom;
++    uint32_t                    space_accounted;
++};
++
++/* bo functions */
++struct radeon_bo_funcs {
++    struct radeon_bo *(*bo_open)(struct radeon_bo_manager *bom,
++                                 uint32_t handle,
++                                 uint32_t size,
++                                 uint32_t alignment,
++                                 uint32_t domains,
++                                 uint32_t flags);
++    void (*bo_ref)(struct radeon_bo *bo);
++    struct radeon_bo *(*bo_unref)(struct radeon_bo *bo);
++    int (*bo_map)(struct radeon_bo *bo, int write);
++    int (*bo_unmap)(struct radeon_bo *bo);
++    int (*bo_wait)(struct radeon_bo *bo);
++};
++
++struct radeon_bo_manager {
++    struct radeon_bo_funcs  *funcs;
++    int                     fd;
++    struct radeon_tracker   tracker;
++};
++    
++static inline void _radeon_bo_debug(struct radeon_bo *bo,
++                                    const char *op,
++                                    const char *file,
++                                    const char *func,
++                                    int line)
++{
++    fprintf(stderr, "%s %p 0x%08X 0x%08X 0x%08X [%s %s %d]\n",
++            op, bo, bo->handle, bo->size, bo->cref, file, func, line);
++}
++
++static inline struct radeon_bo *_radeon_bo_open(struct radeon_bo_manager *bom,
++                                                uint32_t handle,
++                                                uint32_t size,
++                                                uint32_t alignment,
++                                                uint32_t domains,
++                                                uint32_t flags,
++                                                const char *file,
++                                                const char *func,
++                                                int line)
++{
++    struct radeon_bo *bo;
++
++    bo = bom->funcs->bo_open(bom, handle, size, alignment, domains, flags);
++#ifdef RADEON_BO_TRACK
++    if (bo) {
++        bo->track = radeon_tracker_add_track(&bom->tracker, bo->handle);
++        radeon_track_add_event(bo->track, file, func, "open", line);
++    }
++#endif
++    return bo;
++}
++
++static inline void _radeon_bo_ref(struct radeon_bo *bo,
++                                  const char *file,
++                                  const char *func,
++                                  int line)
++{
++    bo->cref++;
++#ifdef RADEON_BO_TRACK
++    radeon_track_add_event(bo->track, file, func, "ref", line); 
++#endif
++    bo->bom->funcs->bo_ref(bo);
++}
++
++static inline struct radeon_bo *_radeon_bo_unref(struct radeon_bo *bo,
++                                                 const char *file,
++                                                 const char *func,
++                                                 int line)
++{
++    bo->cref--;
++#ifdef RADEON_BO_TRACK
++    radeon_track_add_event(bo->track, file, func, "unref", line);
++    if (bo->cref <= 0) {
++        radeon_tracker_remove_track(&bo->bom->tracker, bo->track);
++        bo->track = NULL;
++    }
++#endif
++    return bo->bom->funcs->bo_unref(bo);
++}
++
++static inline int _radeon_bo_map(struct radeon_bo *bo,
++                                 int write,
++                                 const char *file,
++                                 const char *func,
++                                 int line)
++{
++    return bo->bom->funcs->bo_map(bo, write);
++}
++
++static inline int _radeon_bo_unmap(struct radeon_bo *bo,
++                                   const char *file,
++                                   const char *func,
++                                   int line)
++{
++    return bo->bom->funcs->bo_unmap(bo);
++}
++
++static inline int _radeon_bo_wait(struct radeon_bo *bo,
++                                  const char *file,
++                                  const char *func,
++                                  int line)
++{
++    return bo->bom->funcs->bo_wait(bo);
++}
++
++#define radeon_bo_open(bom, h, s, a, d, f)\
++    _radeon_bo_open(bom, h, s, a, d, f, __FILE__, __FUNCTION__, __LINE__)
++#define radeon_bo_ref(bo)\
++    _radeon_bo_ref(bo, __FILE__, __FUNCTION__, __LINE__)
++#define radeon_bo_unref(bo)\
++    _radeon_bo_unref(bo, __FILE__, __FUNCTION__, __LINE__)
++#define radeon_bo_map(bo, w)\
++    _radeon_bo_map(bo, w, __FILE__, __FUNCTION__, __LINE__)
++#define radeon_bo_unmap(bo)\
++    _radeon_bo_unmap(bo, __FILE__, __FUNCTION__, __LINE__)
++#define radeon_bo_debug(bo, opcode)\
++    _radeon_bo_debug(bo, opcode, __FILE__, __FUNCTION__, __LINE__)
++#define radeon_bo_wait(bo) \
++    _radeon_bo_wait(bo, __FILE__, __func__, __LINE__)
++
++#endif
+diff --git a/libdrm/radeon/radeon_bo_gem.c b/libdrm/radeon/radeon_bo_gem.c
+new file mode 100644
+index 0000000..70f4b6b
+--- /dev/null
++++ b/libdrm/radeon/radeon_bo_gem.c
+@@ -0,0 +1,237 @@
 +/* 
 + * Copyright ?? 2008 Dave Airlie
 + * Copyright ?? 2008 J??r??me Glisse
@@ -128,6 +319,9 @@
 + *      Dave Airlie
 + *      J??r??me Glisse <glisse at freedesktop.org>
 + */
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
 +#include <stdio.h>
 +#include <stdint.h>
 +#include <stdlib.h>
@@ -193,7 +387,7 @@
 +        args.size = size;
 +        args.alignment = alignment;
 +        args.initial_domain = bo->base.domains;
-+        args.no_backing_store = 0;
++        args.flags = 0;
 +        args.handle = 0;
 +        r = drmCommandWriteRead(bom->fd, DRM_RADEON_GEM_CREATE,
 +                                &args, sizeof(args));
@@ -243,6 +437,7 @@
 +    struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
 +    struct drm_radeon_gem_mmap args;
 +    int r;
++    void *ptr;
 +
 +    if (bo_gem->map_count++ != 0) {
 +        return 0;
@@ -255,12 +450,16 @@
 +                            DRM_RADEON_GEM_MMAP,
 +                            &args,
 +                            sizeof(args));
-+    if (!r) {
-+        bo->ptr = (void *)(unsigned long)args.addr_ptr;
-+    } else {
++    if (r) {
 +        fprintf(stderr, "error mapping %p 0x%08X (error = %d)\n",
 +                bo, bo->handle, r);
++        return r;
 +    }
++    ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, bo->bom->fd, args.addr_ptr);
++    if (ptr == MAP_FAILED)
++        return -errno;
++    bo->ptr = ptr;
++
 +    return r;
 +}
 +
@@ -278,12 +477,12 @@
 +
 +static int bo_wait(struct radeon_bo *bo)
 +{
-+    struct drm_radeon_gem_wait_rendering args;
++    struct drm_radeon_gem_wait_idle args;
 +    int ret;
 +
 +    args.handle = bo->handle;
 +    do {
-+        ret = drmCommandWriteRead(bo->bom->fd, DRM_RADEON_GEM_WAIT_RENDERING,
++        ret = drmCommandWriteRead(bo->bom->fd, DRM_RADEON_GEM_WAIT_IDLE,
 +                                  &args, sizeof(args));
 +    } while (ret == -EAGAIN);
 +    return ret;
@@ -320,10 +519,18 @@
 +    }
 +    free(bomg);
 +}
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_bo_gem.h
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_bo_gem.h	2009-02-18 09:27:49.000000000 +1000
-@@ -0,0 +1,40 @@
++
++uint32_t radeon_gem_name_bo(struct radeon_bo *bo)
++{
++    struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
++    return bo_gem->name;
++}
+diff --git a/libdrm/radeon/radeon_bo_gem.h b/libdrm/radeon/radeon_bo_gem.h
+new file mode 100644
+index 0000000..980a6a4
+--- /dev/null
++++ b/libdrm/radeon/radeon_bo_gem.h
+@@ -0,0 +1,41 @@
 +/* 
 + * Copyright ?? 2008 Dave Airlie
 + * Copyright ?? 2008 J??r??me Glisse
@@ -363,30 +570,33 @@
 +struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd);
 +void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom);
 +
++uint32_t radeon_gem_name_bo(struct radeon_bo *bo);
 +#endif
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_bo.h
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_bo.h	2009-02-18 09:27:49.000000000 +1000
-@@ -0,0 +1,179 @@
+diff --git a/libdrm/radeon/radeon_cs.h b/libdrm/radeon/radeon_cs.h
+new file mode 100644
+index 0000000..d870961
+--- /dev/null
++++ b/libdrm/radeon/radeon_cs.h
+@@ -0,0 +1,208 @@
 +/* 
++ * Copyright ?? 2008 Nicolai Haehnle
 + * Copyright ?? 2008 J??r??me Glisse
 + * All Rights Reserved.
 + * 
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the
 + * "Software"), to deal in the Software without restriction, including
 + * without limitation the rights to use, copy, modify, merge, publish,
 + * distribute, sub license, and/or sell copies of the Software, and to
 + * permit persons to whom the Software is furnished to do so, subject to
 + * the following conditions:
 + * 
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
-+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
 + * USE OR OTHER DEALINGS IN THE SOFTWARE.
 + *
 + * The above copyright notice and this permission notice (including the
@@ -395,162 +605,193 @@
 + */
 +/*
 + * Authors:
++ *      Aapo Tahkola <aet at rasterburn.org>
++ *      Nicolai Haehnle <prefect_ at gmx.net>
 + *      J??r??me Glisse <glisse at freedesktop.org>
 + */
-+#ifndef RADEON_BO_H
-+#define RADEON_BO_H
++#ifndef RADEON_CS_H
++#define RADEON_CS_H
 +
-+#include <stdio.h>
 +#include <stdint.h>
-+#include "radeon_track.h"
++#include <string.h>
++#include "drm.h"
++#include "radeon_drm.h"
++#include "radeon_bo.h"
 +
-+/* bo object */
-+#define RADEON_BO_FLAGS_MACRO_TILE  1
-+#define RADEON_BO_FLAGS_MICRO_TILE  2
++struct radeon_cs_reloc {
++    struct radeon_bo    *bo;
++    uint32_t            read_domain;
++    uint32_t            write_domain;
++    uint32_t            flags;
++};
 +
-+struct radeon_bo_manager;
 +
-+struct radeon_bo {
-+    uint32_t                    alignment;
-+    uint32_t                    handle;
-+    uint32_t                    size;
-+    uint32_t                    domains;
-+    uint32_t                    flags;
-+    unsigned                    cref;
-+#ifdef RADEON_BO_TRACK
-+    struct radeon_track         *track;
-+#endif
-+    void                        *ptr;
-+    struct radeon_bo_manager    *bom;
-+    uint32_t                    space_accounted;
++#define RADEON_CS_SPACE_OK 0
++#define RADEON_CS_SPACE_OP_TO_BIG 1
++#define RADEON_CS_SPACE_FLUSH 2
++
++struct radeon_cs_space_check {
++    struct radeon_bo *bo;
++    uint32_t read_domains;
++    uint32_t write_domain;
++    uint32_t new_accounted;
 +};
 +
-+/* bo functions */
-+struct radeon_bo_funcs {
-+    struct radeon_bo *(*bo_open)(struct radeon_bo_manager *bom,
-+                                 uint32_t handle,
-+                                 uint32_t size,
-+                                 uint32_t alignment,
-+                                 uint32_t domains,
-+                                 uint32_t flags);
-+    void (*bo_ref)(struct radeon_bo *bo);
-+    struct radeon_bo *(*bo_unref)(struct radeon_bo *bo);
-+    int (*bo_map)(struct radeon_bo *bo, int write);
-+    int (*bo_unmap)(struct radeon_bo *bo);
-+    int (*bo_wait)(struct radeon_bo *bo);
++struct radeon_cs_manager;
++
++struct radeon_cs {
++    struct radeon_cs_manager    *csm;
++    void                        *relocs;
++    uint32_t                    *packets;
++    unsigned                    crelocs;
++    unsigned                    relocs_total_size;
++    unsigned                    cdw;
++    unsigned                    ndw;
++    int                         section;
++    unsigned                    section_ndw;
++    unsigned                    section_cdw;
++    const char                  *section_file;
++    const char                  *section_func;
++    int                         section_line;
++
 +};
 +
-+struct radeon_bo_manager {
-+    struct radeon_bo_funcs  *funcs;
++/* cs functions */
++struct radeon_cs_funcs {
++    struct radeon_cs *(*cs_create)(struct radeon_cs_manager *csm,
++                                   uint32_t ndw);
++    int (*cs_write_reloc)(struct radeon_cs *cs,
++                          struct radeon_bo *bo,
++                          uint32_t read_domain,
++                          uint32_t write_domain,
++                          uint32_t flags);
++    int (*cs_begin)(struct radeon_cs *cs,
++                    uint32_t ndw,
++                    const char *file,
++                    const char *func,
++                    int line);
++    int (*cs_end)(struct radeon_cs *cs,
++                  const char *file,
++                  const char *func,
++                  int line);
++    int (*cs_emit)(struct radeon_cs *cs);
++    int (*cs_destroy)(struct radeon_cs *cs);
++    int (*cs_erase)(struct radeon_cs *cs);
++    int (*cs_need_flush)(struct radeon_cs *cs);
++    void (*cs_print)(struct radeon_cs *cs, FILE *file);
++    int (*cs_space_check)(struct radeon_cs *cs, struct radeon_cs_space_check *bos,
++			  int num_bo);
++};
++
++struct radeon_cs_manager {
++    struct radeon_cs_funcs  *funcs;
 +    int                     fd;
-+    struct radeon_tracker   tracker;
++    uint32_t vram_limit, gart_limit;
++    uint32_t vram_write_used, gart_write_used;
++    uint32_t read_used;
 +};
-+    
-+static inline void _radeon_bo_debug(struct radeon_bo *bo,
-+                                    const char *op,
-+                                    const char *file,
-+                                    const char *func,
-+                                    int line)
++
++static inline struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm,
++                                                 uint32_t ndw)
 +{
-+    fprintf(stderr, "%s %p 0x%08X 0x%08X 0x%08X [%s %s %d]\n",
-+            op, bo, bo->handle, bo->size, bo->cref, file, func, line);
++    return csm->funcs->cs_create(csm, ndw);
 +}
 +
-+static inline struct radeon_bo *_radeon_bo_open(struct radeon_bo_manager *bom,
-+                                                uint32_t handle,
-+                                                uint32_t size,
-+                                                uint32_t alignment,
-+                                                uint32_t domains,
-+                                                uint32_t flags,
-+                                                const char *file,
-+                                                const char *func,
-+                                                int line)
++static inline int radeon_cs_write_reloc(struct radeon_cs *cs,
++                                        struct radeon_bo *bo,
++                                        uint32_t read_domain,
++                                        uint32_t write_domain,
++                                        uint32_t flags)
 +{
-+    struct radeon_bo *bo;
-+
-+    bo = bom->funcs->bo_open(bom, handle, size, alignment, domains, flags);
-+#ifdef RADEON_BO_TRACK
-+    if (bo) {
-+        bo->track = radeon_tracker_add_track(&bom->tracker, bo->handle);
-+        radeon_track_add_event(bo->track, file, func, "open", line);
-+    }
-+#endif
-+    return bo;
++    return cs->csm->funcs->cs_write_reloc(cs,
++                                          bo,
++                                          read_domain,
++                                          write_domain,
++                                          flags);
 +}
 +
-+static inline void _radeon_bo_ref(struct radeon_bo *bo,
++static inline int radeon_cs_begin(struct radeon_cs *cs,
++                                  uint32_t ndw,
 +                                  const char *file,
 +                                  const char *func,
 +                                  int line)
 +{
-+    bo->cref++;
-+#ifdef RADEON_BO_TRACK
-+    radeon_track_add_event(bo->track, file, func, "ref", line); 
-+#endif
-+    bo->bom->funcs->bo_ref(bo);
++    return cs->csm->funcs->cs_begin(cs, ndw, file, func, line);
 +}
 +
-+static inline struct radeon_bo *_radeon_bo_unref(struct radeon_bo *bo,
-+                                                 const char *file,
-+                                                 const char *func,
-+                                                 int line)
++static inline int radeon_cs_end(struct radeon_cs *cs,
++                                const char *file,
++                                const char *func,
++                                int line)
 +{
-+    bo->cref--;
-+#ifdef RADEON_BO_TRACK
-+    radeon_track_add_event(bo->track, file, func, "unref", line);
-+    if (bo->cref <= 0) {
-+        radeon_tracker_remove_track(&bo->bom->tracker, bo->track);
-+        bo->track = NULL;
-+    }
-+#endif
-+    return bo->bom->funcs->bo_unref(bo);
++    return cs->csm->funcs->cs_end(cs, file, func, line);
 +}
 +
-+static inline int _radeon_bo_map(struct radeon_bo *bo,
-+                                 int write,
-+                                 const char *file,
-+                                 const char *func,
-+                                 int line)
++static inline int radeon_cs_emit(struct radeon_cs *cs)
 +{
-+    return bo->bom->funcs->bo_map(bo, write);
++    return cs->csm->funcs->cs_emit(cs);
 +}
 +
-+static inline int _radeon_bo_unmap(struct radeon_bo *bo,
-+                                   const char *file,
-+                                   const char *func,
-+                                   int line)
++static inline int radeon_cs_destroy(struct radeon_cs *cs)
 +{
-+    return bo->bom->funcs->bo_unmap(bo);
++    return cs->csm->funcs->cs_destroy(cs);
 +}
 +
-+static inline int _radeon_bo_wait(struct radeon_bo *bo,
-+                                  const char *file,
-+                                  const char *func,
-+                                  int line)
++static inline int radeon_cs_erase(struct radeon_cs *cs)
 +{
-+    return bo->bom->funcs->bo_wait(bo);
++    return cs->csm->funcs->cs_erase(cs);
 +}
 +
-+#define radeon_bo_open(bom, h, s, a, d, f)\
-+    _radeon_bo_open(bom, h, s, a, d, f, __FILE__, __FUNCTION__, __LINE__)
-+#define radeon_bo_ref(bo)\
-+    _radeon_bo_ref(bo, __FILE__, __FUNCTION__, __LINE__)
-+#define radeon_bo_unref(bo)\
-+    _radeon_bo_unref(bo, __FILE__, __FUNCTION__, __LINE__)
-+#define radeon_bo_map(bo, w)\
-+    _radeon_bo_map(bo, w, __FILE__, __FUNCTION__, __LINE__)
-+#define radeon_bo_unmap(bo)\
-+    _radeon_bo_unmap(bo, __FILE__, __FUNCTION__, __LINE__)
-+#define radeon_bo_debug(bo, opcode)\
-+    _radeon_bo_debug(bo, opcode, __FILE__, __FUNCTION__, __LINE__)
-+#define radeon_bo_wait(bo) \
-+    _radeon_bo_wait(bo, __FILE__, __func__, __LINE__)
++static inline int radeon_cs_need_flush(struct radeon_cs *cs)
++{
++    return cs->csm->funcs->cs_need_flush(cs);
++}
++
++static inline void radeon_cs_print(struct radeon_cs *cs, FILE *file)
++{
++    cs->csm->funcs->cs_print(cs, file);
++}
++
++static inline int radeon_cs_space_check(struct radeon_cs *cs,
++					    struct radeon_cs_space_check *bos,
++					    int num_bo)
++{
++    return cs->csm->funcs->cs_space_check(cs, bos, num_bo);
++}
++
++static inline void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
++{
++    
++    if (domain == RADEON_GEM_DOMAIN_VRAM)
++	cs->csm->vram_limit = limit;
++    else
++	cs->csm->gart_limit = limit;
++}
++
++static inline void radeon_cs_write_dword(struct radeon_cs *cs, uint32_t dword)
++{
++    cs->packets[cs->cdw++] = dword;
++    if (cs->section) {
++        cs->section_cdw++;
++    }
++}
++
++static inline void radeon_cs_write_qword(struct radeon_cs *cs, uint64_t qword)
++{
++    memcpy(cs->packets + cs->cdw, &qword, sizeof(uint64_t));
++    cs->cdw += 2;
++    if (cs->section) {
++        cs->section_cdw += 2;
++    }
++}
 +
 +#endif
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_cs_gem.c
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_cs_gem.c	2009-02-18 09:27:49.000000000 +1000
-@@ -0,0 +1,537 @@
+diff --git a/libdrm/radeon/radeon_cs_gem.c b/libdrm/radeon/radeon_cs_gem.c
+new file mode 100644
+index 0000000..b9f6f4b
+--- /dev/null
++++ b/libdrm/radeon/radeon_cs_gem.c
+@@ -0,0 +1,544 @@
 +/* 
 + * Copyright ?? 2008 J??r??me Glisse
 + * All Rights Reserved.
@@ -582,6 +823,7 @@
 + *      Nicolai Haehnle <prefect_ at gmx.net>
 + *      J??r??me Glisse <glisse at freedesktop.org>
 + */
++#include <assert.h>
 +#include <errno.h>
 +#include <stdlib.h>
 +#include <sys/mman.h>
@@ -670,6 +912,8 @@
 +    uint32_t idx;
 +    unsigned i;
 +
++    assert(bo->space_accounted);
++
 +    /* check domains */
 +    if ((read_domain && write_domain) || (!read_domain && !write_domain)) {
 +        /* in one CS a bo can only be in read or write domain but not
@@ -822,8 +1066,9 @@
 +    r = drmCommandWriteRead(cs->csm->fd, DRM_RADEON_CS,
 +                            &csg->cs, sizeof(struct drm_radeon_cs));
 +    for (i = 0; i < csg->base.crelocs; i++) {
-+        radeon_bo_unref(csg->relocs_bo[i]);
-+        csg->relocs_bo[i] = NULL;
++	    csg->relocs_bo[i]->space_accounted = 0;
++	    radeon_bo_unref(csg->relocs_bo[i]);
++	    csg->relocs_bo[i] = NULL;
 +    }
 +
 +    cs->csm->read_used = 0;
@@ -988,11 +1233,14 @@
 +      write_domain = bos[i].write_domain;
 +		
 +      /* already accounted this bo */
-+      if (write_domain && (write_domain == bo->space_accounted))
-+	  continue;
-+
-+      if (read_domains && ((read_domains << 16) == bo->space_accounted))
-+	  continue;
++      if (write_domain && (write_domain == bo->space_accounted)) {
++	      bos[i].new_accounted = bo->space_accounted;
++	      continue;
++      }
++      if (read_domains && ((read_domains << 16) == bo->space_accounted)) {
++	      bos[i].new_accounted = bo->space_accounted;
++	      continue;
++      }
 +      
 +      if (bo->space_accounted == 0) {
 +	  if (write_domain == RADEON_GEM_DOMAIN_VRAM)
@@ -1029,32 +1277,32 @@
 +	      return RADEON_CS_SPACE_FLUSH;
 +	  }
 +      }
-+	}
++    }
 +	
-+	if (this_op_read < 0)
-+		this_op_read = 0;
++    if (this_op_read < 0)
++	    this_op_read = 0;
 +
-+	/* check sizes - operation first */
-+	if ((this_op_read + this_op_gart_write > csm->gart_limit) ||
-+	    (this_op_vram_write > csm->vram_limit)) {
++    /* check sizes - operation first */
++    if ((this_op_read + this_op_gart_write > csm->gart_limit) ||
++	(this_op_vram_write > csm->vram_limit)) {
 +	    return RADEON_CS_SPACE_OP_TO_BIG;
-+	}
-+
-+	if (((csm->vram_write_used + this_op_vram_write) > csm->vram_limit) ||
-+	    ((csm->read_used + csm->gart_write_used + this_op_gart_write + this_op_read) > csm->gart_limit)) {
-+		return RADEON_CS_SPACE_FLUSH;
-+	}
-+
-+	csm->gart_write_used += this_op_gart_write;
-+	csm->vram_write_used += this_op_vram_write;
-+	csm->read_used += this_op_read;
-+	/* commit */
-+	for (i = 0; i < num_bo; i++) {
-+		bo = bos[i].bo;
-+		bo->space_accounted = bos[i].new_accounted;
-+	}
-+
-+	return RADEON_CS_SPACE_OK;
++    }
++    
++    if (((csm->vram_write_used + this_op_vram_write) > csm->vram_limit) ||
++	((csm->read_used + csm->gart_write_used + this_op_gart_write + this_op_read) > csm->gart_limit)) {
++	    return RADEON_CS_SPACE_FLUSH;
++    }
++    
++    csm->gart_write_used += this_op_gart_write;
++    csm->vram_write_used += this_op_vram_write;
++    csm->read_used += this_op_read;
++    /* commit */
++    for (i = 0; i < num_bo; i++) {
++	    bo = bos[i].bo;
++	    bo->space_accounted = bos[i].new_accounted;
++    }
++    
++    return RADEON_CS_SPACE_OK;
 +}
 +
 +static struct radeon_cs_funcs radeon_cs_gem_funcs = {
@@ -1088,9 +1336,11 @@
 +{
 +    free(csm);
 +}
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_cs_gem.h
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_cs_gem.h	2009-02-18 09:27:49.000000000 +1000
+diff --git a/libdrm/radeon/radeon_cs_gem.h b/libdrm/radeon/radeon_cs_gem.h
+new file mode 100644
+index 0000000..5efd146
+--- /dev/null
++++ b/libdrm/radeon/radeon_cs_gem.h
 @@ -0,0 +1,41 @@
 +/* 
 + * Copyright ?? 2008 Nicolai Haehnle
@@ -1133,221 +1383,11 @@
 +void radeon_cs_manager_gem_dtor(struct radeon_cs_manager *csm);
 +
 +#endif
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_cs.h
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_cs.h	2009-02-18 09:27:49.000000000 +1000
-@@ -0,0 +1,208 @@
-+/* 
-+ * Copyright ?? 2008 Nicolai Haehnle
-+ * Copyright ?? 2008 J??r??me Glisse
-+ * All Rights Reserved.
-+ * 
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ * 
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
-+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ */
-+/*
-+ * Authors:
-+ *      Aapo Tahkola <aet at rasterburn.org>
-+ *      Nicolai Haehnle <prefect_ at gmx.net>
-+ *      J??r??me Glisse <glisse at freedesktop.org>
-+ */
-+#ifndef RADEON_CS_H
-+#define RADEON_CS_H
-+
-+#include <stdint.h>
-+#include <string.h>
-+#include "drm.h"
-+#include "radeon_drm.h"
-+#include "radeon_bo.h"
-+
-+struct radeon_cs_reloc {
-+    struct radeon_bo    *bo;
-+    uint32_t            read_domain;
-+    uint32_t            write_domain;
-+    uint32_t            flags;
-+};
-+
-+
-+#define RADEON_CS_SPACE_OK 0
-+#define RADEON_CS_SPACE_OP_TO_BIG 1
-+#define RADEON_CS_SPACE_FLUSH 2
-+
-+struct radeon_cs_space_check {
-+    struct radeon_bo *bo;
-+    uint32_t read_domains;
-+    uint32_t write_domain;
-+    uint32_t new_accounted;
-+};
-+
-+struct radeon_cs_manager;
-+
-+struct radeon_cs {
-+    struct radeon_cs_manager    *csm;
-+    void                        *relocs;
-+    uint32_t                    *packets;
-+    unsigned                    crelocs;
-+    unsigned                    relocs_total_size;
-+    unsigned                    cdw;
-+    unsigned                    ndw;
-+    int                         section;
-+    unsigned                    section_ndw;
-+    unsigned                    section_cdw;
-+    const char                  *section_file;
-+    const char                  *section_func;
-+    int                         section_line;
-+
-+};
-+
-+/* cs functions */
-+struct radeon_cs_funcs {
-+    struct radeon_cs *(*cs_create)(struct radeon_cs_manager *csm,
-+                                   uint32_t ndw);
-+    int (*cs_write_reloc)(struct radeon_cs *cs,
-+                          struct radeon_bo *bo,
-+                          uint32_t read_domain,
-+                          uint32_t write_domain,
-+                          uint32_t flags);
-+    int (*cs_begin)(struct radeon_cs *cs,
-+                    uint32_t ndw,
-+                    const char *file,
-+                    const char *func,
-+                    int line);
-+    int (*cs_end)(struct radeon_cs *cs,
-+                  const char *file,
-+                  const char *func,
-+                  int line);
-+    int (*cs_emit)(struct radeon_cs *cs);
-+    int (*cs_destroy)(struct radeon_cs *cs);
-+    int (*cs_erase)(struct radeon_cs *cs);
-+    int (*cs_need_flush)(struct radeon_cs *cs);
-+    void (*cs_print)(struct radeon_cs *cs, FILE *file);
-+    int (*cs_space_check)(struct radeon_cs *cs, struct radeon_cs_space_check *bos,
-+			  int num_bo);
-+};
-+
-+struct radeon_cs_manager {
-+    struct radeon_cs_funcs  *funcs;
-+    int                     fd;
-+    uint32_t vram_limit, gart_limit;
-+    uint32_t vram_write_used, gart_write_used;
-+    uint32_t read_used;
-+};
-+
-+static inline struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm,
-+                                                 uint32_t ndw)
-+{
-+    return csm->funcs->cs_create(csm, ndw);
-+}
-+
-+static inline int radeon_cs_write_reloc(struct radeon_cs *cs,
-+                                        struct radeon_bo *bo,
-+                                        uint32_t read_domain,
-+                                        uint32_t write_domain,
-+                                        uint32_t flags)
-+{
-+    return cs->csm->funcs->cs_write_reloc(cs,
-+                                          bo,
-+                                          read_domain,
-+                                          write_domain,
-+                                          flags);
-+}
-+
-+static inline int radeon_cs_begin(struct radeon_cs *cs,
-+                                  uint32_t ndw,
-+                                  const char *file,
-+                                  const char *func,
-+                                  int line)
-+{
-+    return cs->csm->funcs->cs_begin(cs, ndw, file, func, line);
-+}
-+
-+static inline int radeon_cs_end(struct radeon_cs *cs,
-+                                const char *file,
-+                                const char *func,
-+                                int line)
-+{
-+    return cs->csm->funcs->cs_end(cs, file, func, line);
-+}
-+
-+static inline int radeon_cs_emit(struct radeon_cs *cs)
-+{
-+    return cs->csm->funcs->cs_emit(cs);
-+}
-+
-+static inline int radeon_cs_destroy(struct radeon_cs *cs)
-+{
-+    return cs->csm->funcs->cs_destroy(cs);
-+}
-+
-+static inline int radeon_cs_erase(struct radeon_cs *cs)
-+{
-+    return cs->csm->funcs->cs_erase(cs);
-+}
-+
-+static inline int radeon_cs_need_flush(struct radeon_cs *cs)
-+{
-+    return cs->csm->funcs->cs_need_flush(cs);
-+}
-+
-+static inline void radeon_cs_print(struct radeon_cs *cs, FILE *file)
-+{
-+    cs->csm->funcs->cs_print(cs, file);
-+}
-+
-+static inline int radeon_cs_space_check(struct radeon_cs *cs,
-+					    struct radeon_cs_space_check *bos,
-+					    int num_bo)
-+{
-+    return cs->csm->funcs->cs_space_check(cs, bos, num_bo);
-+}
-+
-+static inline void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
-+{
-+    
-+    if (domain == RADEON_GEM_DOMAIN_VRAM)
-+	cs->csm->vram_limit = limit;
-+    else
-+	cs->csm->gart_limit = limit;
-+}
-+
-+static inline void radeon_cs_write_dword(struct radeon_cs *cs, uint32_t dword)
-+{
-+    cs->packets[cs->cdw++] = dword;
-+    if (cs->section) {
-+        cs->section_cdw++;
-+    }
-+}
-+
-+static inline void radeon_cs_write_qword(struct radeon_cs *cs, uint64_t qword)
-+{
-+    memcpy(cs->packets + cs->cdw, &qword, sizeof(uint64_t));
-+    cs->cdw += 2;
-+    if (cs->section) {
-+        cs->section_cdw += 2;
-+    }
-+}
-+
-+#endif
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_track.c
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_track.c	2009-02-18 09:27:49.000000000 +1000
+diff --git a/libdrm/radeon/radeon_track.c b/libdrm/radeon/radeon_track.c
+new file mode 100644
+index 0000000..1623906
+--- /dev/null
++++ b/libdrm/radeon/radeon_track.c
 @@ -0,0 +1,140 @@
 +/* 
 + * Copyright ?? 2008 J??r??me Glisse
@@ -1489,9 +1529,11 @@
 +        free(tmp);
 +    }
 +}
-diff -up /dev/null libdrm-2.4.4/libdrm/radeon/radeon_track.h
---- /dev/null	2009-02-17 18:26:02.221005894 +1000
-+++ libdrm-2.4.4/libdrm/radeon/radeon_track.h	2009-02-18 09:27:49.000000000 +1000
+diff --git a/libdrm/radeon/radeon_track.h b/libdrm/radeon/radeon_track.h
+new file mode 100644
+index 0000000..838d1f3
+--- /dev/null
++++ b/libdrm/radeon/radeon_track.h
 @@ -0,0 +1,64 @@
 +/* 
 + * Copyright ?? 2008 J??r??me Glisse
@@ -1557,48 +1599,28 @@
 +                          FILE *file);
 +
 +#endif
-diff -up libdrm-2.4.4/shared-core/radeon_drm.h.radeon libdrm-2.4.4/shared-core/radeon_drm.h
---- libdrm-2.4.4/shared-core/radeon_drm.h.radeon	2008-10-10 05:02:11.000000000 +1000
-+++ libdrm-2.4.4/shared-core/radeon_drm.h	2009-02-18 09:27:49.000000000 +1000
-@@ -453,8 +453,18 @@ typedef struct {
- 	int pfCurrentPage;	/* which buffer is being displayed? */
- 	int crtc2_base;		/* CRTC2 frame offset */
- 	int tiling_enabled;	/* set by drm, read by 2d + 3d clients */
-+
-+	unsigned int last_fence;
-+
-+	uint32_t front_handle;
-+	uint32_t back_handle;
-+	uint32_t depth_handle;
-+	uint32_t front_pitch;
-+	uint32_t back_pitch;
-+	uint32_t depth_pitch;
- } drm_radeon_sarea_t;
- 
-+
- /* WARNING: If you change any of these defines, make sure to change the
-  * defines in the Xserver file (xf86drmRadeon.h)
-  *
-@@ -493,6 +503,18 @@ typedef struct {
+diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
+index ffaa46e..e9f2afa 100644
+--- a/shared-core/radeon_drm.h
++++ b/shared-core/radeon_drm.h
+@@ -492,6 +492,16 @@ typedef struct {
+ #define DRM_RADEON_SETPARAM   0x19
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
++/* KMS ioctl */
++#define DRM_RADEON_GEM_INFO		0x1c
++#define DRM_RADEON_GEM_CREATE		0x1d
++#define DRM_RADEON_GEM_MMAP		0x1e
++#define DRM_RADEON_GEM_PREAD		0x21
++#define DRM_RADEON_GEM_PWRITE		0x22
++#define DRM_RADEON_GEM_SET_DOMAIN	0x23
++#define DRM_RADEON_GEM_WAIT_IDLE	0x24
++#define DRM_RADEON_CS			0x26
++#define DRM_RADEON_INFO			0x27
  
-+#define DRM_RADEON_GEM_INFO   0x1c
-+#define DRM_RADEON_GEM_CREATE 0x1d
-+#define DRM_RADEON_GEM_MMAP   0x1e
-+#define DRM_RADEON_GEM_PIN    0x1f
-+#define DRM_RADEON_GEM_UNPIN  0x20
-+#define DRM_RADEON_GEM_PREAD  0x21
-+#define DRM_RADEON_GEM_PWRITE 0x22
-+#define DRM_RADEON_GEM_SET_DOMAIN 0x23
-+#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
-+
-+#define DRM_RADEON_CS       0x26
-+
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
- #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -521,6 +543,17 @@ typedef struct {
+@@ -521,6 +531,17 @@ typedef struct {
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
  
@@ -1616,82 +1638,71 @@
  typedef struct drm_radeon_init {
  	enum {
  		RADEON_INIT_CP = 0x01,
-@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +698,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-+#define RADEON_PARAM_KERNEL_MM             16
-+#define RADEON_PARAM_DEVICE_ID            17
++#define RADEON_PARAM_DEVICE_ID             16
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -732,6 +767,7 @@ typedef struct drm_radeon_setparam {
+@@ -728,7 +750,6 @@ typedef struct drm_radeon_setparam {
+ #define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
+ #define RADEON_SETPARAM_SWITCH_TILING  2	/* enable/disable color tiling */
+ #define RADEON_SETPARAM_PCIGART_LOCATION 3	/* PCI Gart Location */
+-
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-+#define RADEON_SETPARAM_MM_INIT 7		/* Initialise the mm */
- /* 1.14: Clients can allocate/free a surface
-  */
- typedef struct drm_radeon_surface_alloc {
-@@ -747,4 +783,106 @@ typedef struct drm_radeon_surface_free {
+@@ -747,4 +768,112 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
-+#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
-+#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
-+#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
++/*
++ * Kernel modesetting world below.
++ */
++#define RADEON_GEM_DOMAIN_CPU		0x1
++#define RADEON_GEM_DOMAIN_GTT		0x2
++#define RADEON_GEM_DOMAIN_VRAM		0x4
 +
-+/* return to userspace start/size of gtt and vram apertures */
 +struct drm_radeon_gem_info {
-+	uint64_t gart_start;
-+	uint64_t gart_size;
-+	uint64_t vram_start;
-+	uint64_t vram_size;
-+	uint64_t vram_visible;
++	uint64_t	gart_size;
++	uint64_t	vram_size;
++	uint64_t	vram_visible;
 +};
 +
++#define RADEON_GEM_NO_BACKING_STORE 1
++
 +struct drm_radeon_gem_create {
-+	uint64_t size;
-+	uint64_t alignment;
-+	uint32_t handle;
-+	uint32_t initial_domain; // to allow VRAM to be created
-+	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
-+	// pretty much front/back/depth don't need it - other things do
++	uint64_t	size;
++	uint64_t	alignment;
++	uint32_t	handle;
++	uint32_t	initial_domain;
++	uint32_t	flags;
 +};
 +
 +struct drm_radeon_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
++	uint32_t	handle;
++	uint32_t	pad;
++	uint64_t	offset;
++	uint64_t	size;
++	uint64_t	addr_ptr;
 +};
 +
 +struct drm_radeon_gem_set_domain {
-+	uint32_t handle;
-+	uint32_t read_domains;
-+	uint32_t write_domain;
++	uint32_t	handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
 +};
 +
-+struct drm_radeon_gem_wait_rendering {
-+	uint32_t handle;
-+};
-+
-+struct drm_radeon_gem_pin {
-+	uint32_t handle;
-+	uint32_t pin_domain;
-+	uint64_t alignment;
-+	uint64_t offset;
-+};
-+
-+struct drm_radeon_gem_unpin {
-+	uint32_t handle;
-+	uint32_t pad;
++struct drm_radeon_gem_wait_idle {
++	uint32_t	handle;
++	uint32_t	pad;
 +};
 +
 +struct drm_radeon_gem_busy {
-+	uint32_t handle;
-+	uint32_t busy;
++	uint32_t	handle;
++	uint32_t	busy;
 +};
 +
 +struct drm_radeon_gem_pread {
@@ -1703,7 +1714,8 @@
 +	/** Length of data to read */
 +	uint64_t size;
 +	/** Pointer to write the data into. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
 +struct drm_radeon_gem_pwrite {
@@ -1715,28 +1727,43 @@
 +	/** Length of data to write */
 +	uint64_t size;
 +	/** Pointer to read the data from. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
-+
-+/* New interface which obsolete all previous interface.
-+ */
-+
-+#define RADEON_CHUNK_ID_RELOCS 0x01
-+#define RADEON_CHUNK_ID_IB     0x02
++#define RADEON_CHUNK_ID_RELOCS	0x01
++#define RADEON_CHUNK_ID_IB	0x02
 +
 +struct drm_radeon_cs_chunk {
-+	uint32_t chunk_id;
-+	uint32_t length_dw;
-+	uint64_t chunk_data;
++	uint32_t		chunk_id;
++	uint32_t		length_dw;
++	uint64_t		chunk_data;
 +};
 +
-+struct drm_radeon_cs {
-+	uint32_t	num_chunks;
-+	uint32_t        cs_id;
-+	uint64_t	chunks; /* this points to uint64_t * which point to
-+				   cs chunks */
++struct drm_radeon_cs_reloc {
++	uint32_t		handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
++	uint32_t		flags;
 +};
 +
++struct drm_radeon_cs {
++	uint32_t		num_chunks;
++	uint32_t		cs_id;
++	/* this points to uint64_t * which point to cs chunks */
++	uint64_t		chunks;
++	/* updates to the limits after this CS ioctl */
++	uint64_t		gart_limit;
++	uint64_t		vram_limit;
++};
++
++#define RADEON_INFO_DEVICE_ID		0x00
++#define RADEON_INFO_NUM_GB_PIPES	0x01
++
++struct drm_radeon_info {
++	uint32_t		request;
++	uint32_t		pad;
++	uint64_t		value;
++};
 +
  #endif


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- libdrm.spec	26 Mar 2009 20:40:30 -0000	1.68
+++ libdrm.spec	6 Apr 2009 05:41:36 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: udev
+Requires: kernel >= 2.6.29.1-52.fc11
 
 BuildRequires: pkgconfig automake autoconf libtool
 BuildRequires: kernel-headers >= 2.6.29-0.145.rc6.fc11
@@ -29,7 +30,6 @@
 # 2.4.5 didn't dist nouveau_private.h and nouveau_dma.h, so add them like this
 Patch9: nouveau-missing-headers.patch
 
-Patch10: radeon-bo-name.patch
 # nouveau fixes from drm.git
 Patch11: nouveau-updates.patch
 # intel gtt map fixes
@@ -55,7 +55,6 @@
 %patch4 -p1 -b .no-bc
 %patch8 -p1 -b .radeon
 %patch9 -p1 -b .nouveau
-%patch10 -p1 -b .boname
 %patch11 -p1 -b .nouveau-updates
 %patch12 -p1 -b .intel-gtt
 
@@ -117,6 +116,10 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com<> 2.4.5-4
+- libdrm-radeon: API busting to latest upstream
+- bump kernel requires
+
 * Thu Mar 26 2009 Adam Jackson <ajax at redhat.com> 2.4.5-3
 - libdrm-intel-gtt.patch: Fix GTT maps for intel.
 



From airlied at fedoraproject.org  Mon Apr  6 05:44:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 05:44:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.168,1.169
Message-ID: <20090406054452.A3A2F700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22160

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
radeon: bump tag



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- xorg-x11-drv-ati.spec	6 Apr 2009 05:41:02 -0000	1.168
+++ xorg-x11-drv-ati.spec	6 Apr 2009 05:44:22 -0000	1.169
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support



From mclasen at fedoraproject.org  Mon Apr  6 05:50:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  6 Apr 2009 05:50:27 +0000 (UTC)
Subject: rpms/yelp/devel yelp.spec,1.155,1.156
Message-ID: <20090406055027.7BAAC700FB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24113

Modified Files:
	yelp.spec 
Log Message:
clean up requires



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- yelp.spec	17 Mar 2009 03:58:22 -0000	1.155
+++ yelp.spec	6 Apr 2009 05:49:56 -0000	1.156
@@ -4,7 +4,6 @@
 %endif
 
 %define gnome_doc_utils 0.11.1
-%define gnome_vfs2_version 2.0.0
 %define gtk2_version 2.10.0
 %define libglade_version 2.0.0
 %define libgnomeui_version 2.14.0
@@ -20,7 +19,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.26/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -40,13 +39,8 @@
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: docbook-dtds
-Requires: gtk2 >= %{gtk2_version}
-Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: gecko-libs >= %{gecko_version}
-Requires: libgnomeui >= %{libgnomeui_version}
-Requires: libxml2 >= %{libxml_version}
 Requires: libxslt >= %{libxslt_version}
-Requires: libglade2 >= %{libglade_version}
 Requires: gnome-doc-utils-stylesheets
 Requires: rarian >= %{rarian_version}
 Requires(pre): GConf2
@@ -56,7 +50,6 @@
 Requires(postun): desktop-file-utils
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: gecko-devel-unstable >= %{gecko_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libglade2-devel >= %{libglade_version}
@@ -68,9 +61,7 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils-stylesheets
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
-BuildRequires: libgnomeprintui22-devel
 BuildRequires: libXt-devel
-BuildRequires: perl(XML::Simple)
 BuildRequires: dbus-devel
 BuildRequires: gettext-devel
 BuildRequires: rarian-devel >= %{rarian_version}
@@ -157,6 +148,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Clean up Requires a bit
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From lucilanga at fedoraproject.org  Mon Apr  6 05:51:05 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  6 Apr 2009 05:51:05 +0000 (UTC)
Subject: rpms/evolution-rspam/devel evolution-rspam.spec,1.6,1.7
Message-ID: <20090406055105.ABD4F700FB@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24365

Modified Files:
	evolution-rspam.spec 
Log Message:
* Mon Apr 06 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-3
- fix for bug #492319


Index: evolution-rspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/devel/evolution-rspam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-rspam.spec	20 Mar 2009 11:08:23 -0000	1.6
+++ evolution-rspam.spec	6 Apr 2009 05:50:35 -0000	1.7
@@ -1,13 +1,13 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
 Version: 0.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Report_as_Spam
-#Patch: rspam-%{version}.patch
+Patch: rspam-0.0.8-razorconfig.patch
 
 Requires: perl-Razor-Agent
 Requires: pyzor
@@ -28,7 +28,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch
+%patch -p1 -b .razorconfig
 
 %build
 %configure
@@ -76,6 +76,9 @@
 %doc TODO
 
 %changelog
+* Mon Apr 06 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-3
+- fix for bug #492319
+
 * Fri Mar 20 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-2
 - update BR
 



From lucilanga at fedoraproject.org  Mon Apr  6 05:51:26 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  6 Apr 2009 05:51:26 +0000 (UTC)
Subject: rpms/evolution-rspam/devel rspam-0.0.8-razorconfig.patch,NONE,1.1
Message-ID: <20090406055126.CAC72700FB@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24628

Added Files:
	rspam-0.0.8-razorconfig.patch 
Log Message:
* Mon Apr 06 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-3
- fix for bug #492319

rspam-0.0.8-razorconfig.patch:

--- NEW FILE rspam-0.0.8-razorconfig.patch ---
--- evolution-rspam-0.0.8/src/rspam.c	2009-03-13 12:41:17.000000000 +0200
+++ evolution-rspam-0.0.8-mod/src/rspam.c	2009-04-06 08:48:39.000000000 +0300
@@ -295,13 +295,7 @@
 
     account = mail_config_get_default_account ();
 
-	 g_print("account:%p\n", account);
-	if (account)
-	 g_print("account->transport:%p\n", account->transport);
-	if (account->transport)
-	 g_print("account->transport->url:%p\n", account->transport->url);
-
-	if ( !account || (account->transport == NULL) ||
+    if ( !account || (account->transport == NULL) ||
                         (account->transport->url == NULL) || (*account->transport->url == '\0'))
 		goto fail;
 



From tbreeds at fedoraproject.org  Mon Apr  6 05:51:51 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Mon,  6 Apr 2009 05:51:51 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-1.3.14-better_netboot.patch, 1.1,
	1.2 yaboot.spec, 1.59, 1.60
Message-ID: <20090406055151.1F912700FB@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24499

Modified Files:
	yaboot-1.3.14-better_netboot.patch yaboot.spec 
Log Message:
Increase the LOAD_BUFFER size from 20MiB to 25MiB.  This allows the F-11-Beta to boot.


yaboot-1.3.14-better_netboot.patch:

Index: yaboot-1.3.14-better_netboot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot-1.3.14-better_netboot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.14-better_netboot.patch	13 Mar 2009 00:32:03 -0000	1.1
+++ yaboot-1.3.14-better_netboot.patch	6 Apr 2009 05:51:50 -0000	1.2
@@ -481,7 +481,7 @@
  
  #define LOAD_BUFFER_POS		0x1000000
 -#define LOAD_BUFFER_SIZE	0x1000000
-+#define LOAD_BUFFER_SIZE	0x1400000
++#define LOAD_BUFFER_SIZE	0x1800000
  
 -static int of_open(struct boot_file_t* file, const char* dev_name,
 -		   struct partition_t* part, const char* file_name);


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- yaboot.spec	13 Mar 2009 00:32:03 -0000	1.59
+++ yaboot.spec	6 Apr 2009 05:51:50 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -97,6 +97,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Mon Apr 06 2009 tony at bakeyournoodle.com - 1.3.14-12
+- Increase the TFTP load buffer from 20MiB to 25MiB. (#483051)
+
 * Fri Mar 13 2009 tony at bakeyournoodle.com - 1.3.14-11
 - Adding better netboot support (#458438)
 - Allocate more buffer space for larger kernels and initrds (#472225)



From airlied at fedoraproject.org  Mon Apr  6 05:53:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 05:53:16 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch,1.34,1.35
Message-ID: <20090406055316.98B6E700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25220

Modified Files:
	drm-nouveau.patch 
Log Message:
nouveau: fix build


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- drm-nouveau.patch	6 Apr 2009 05:30:07 -0000	1.34
+++ drm-nouveau.patch	6 Apr 2009 05:53:15 -0000	1.35
@@ -17337,7 +17337,7 @@
 +		const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size);
 +		if (bios) {
 +			for(i=0;i<size;i+=4)
-+				nv_out32(dev_priv->ramin, i, bios[i/4]);
++				nv_out32(ramin, i, bios[i/4]);
 +			NV_INFO(dev, "OF bios successfully copied (%d bytes)\n",size);
 +		} else
 +			NV_INFO(dev, "Unable to get the OF bios\n");



From awjb at fedoraproject.org  Mon Apr  6 06:39:05 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon,  6 Apr 2009 06:39:05 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-10 .cvsignore, 1.19,
	1.20 claws-mail-plugins.spec, 1.37, 1.38 sources, 1.19, 1.20
Message-ID: <20090406063905.159EC700FB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5135/F-10

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 Dec 2008 18:07:54 -0000	1.19
+++ .cvsignore	6 Apr 2009 06:38:34 -0000	1.20
@@ -1 +1 @@
-claws-mail-extra-plugins-3.7.0.tar.bz2
+claws-mail-extra-plugins-3.7.1.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/claws-mail-plugins.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- claws-mail-plugins.spec	30 Dec 2008 18:07:54 -0000	1.37
+++ claws-mail-plugins.spec	6 Apr 2009 06:38:34 -0000	1.38
@@ -1,30 +1,30 @@
 # define plugin version
-%define acpinotifier	1.0.19
-%define archive		0.6.3
-%define attachwarner    0.2.15
+%define acpinotifier	1.0.20
+%define archive		0.6.4
+%define attachwarner    0.2.16
 %define attremover	1.0.10
-%define cachesaver	0.10.8
+%define cachesaver	0.10.9
 %define fetchinfo	0.4.24
-%define gtkhtml2viewer  0.22
+%define gtkhtml2viewer  0.23
 %define mailmbox	1.14.3
 %define newmail		0.0.15
-%define notification	0.20
+%define notification	0.21
 %define perl		0.9.15
-%define rssyl		0.23
-%define spamreport      0.3.7
+%define rssyl		0.24
+%define spamreport      0.3.8
 %define synce		0.7.5
-%define tnef            0.3.3
-%define vcalendar	2.0.3
+%define tnef            0.3.4
+%define vcalendar	2.0.4
 
 Name:           claws-mail-plugins
-Version:        3.7.0
-Release:        1%{?dist}
+Version:        3.7.1
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
 License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -42,6 +42,7 @@
 BuildRequires:  libarchive-devel
 BuildRequires:  libytnef-devel
 BuildRequires:  ghostscript
+BuildRequires:  enchant-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-archive = %{version}-%{release}
@@ -342,77 +343,91 @@
 # acpi_notifier
 cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang acpi_notifier
 
 # archive
-cd ../archive-%{archive}
+cd archive-%{archive}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang archive
 
 # attachwarner
-cd ../attachwarner-%{attachwarner}
+cd attachwarner-%{attachwarner}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang attachwarner
 
 # att_remover
-cd ../att_remover-%{attremover}
+cd att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 # cachesaver
-cd ../cachesaver-%{cachesaver}
+cd cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-%{fetchinfo}
+cd fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
- 
+cd -
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
+cd gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang gtkhtml2_viewer
 
 #mailmbox
-cd ../mailmbox-%{mailmbox}
+cd mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #newmail
-cd ../newmail-%{newmail}
+cd newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #notification-plugin
-cd ../notification_plugin-%{notification}
+cd notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang notification_plugin
 
 #perl
-cd ../perl_plugin-%{perl}
+cd perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #rssyl
-cd ../rssyl-%{rssyl}
+cd rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang rssyl
 
 #spamreport
-cd ../spam_report-%{spamreport}
+cd spam_report-%{spamreport}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang spam_report
 
 #synce
-cd ../synce_plugin-%{synce}
+cd synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
 
 #tnef
-cd ../tnef_parse-%{tnef}
+cd tnef_parse-%{tnef}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang tnef_parse
 
 #vcalendar
-cd ../vcalendar-%{vcalendar}
+cd vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang vcalendar
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
@@ -424,7 +439,7 @@
 %defattr(-,root,root,-)
 %doc README
 
-%files acpi-notifier
+%files acpi-notifier -f acpi_notifier.lang
 %defattr(-,root,root,-)
 %doc acpi_notifier-%{acpinotifier}/ChangeLog
 %doc acpi_notifier-%{acpinotifier}/COPYING
@@ -432,23 +447,8 @@
 %doc acpi_notifier-%{acpinotifier}/AUTHORS
 %doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/claws-mail/plugins/acpi_notifier*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/acpi_notifier.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/acpi_notifier.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/acpi_notifier.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/acpi_notifier.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/acpi_notifier.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/acpi_notifier.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/acpi_notifier.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/acpi_notifier.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/acpi_notifier.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/acpi_notifier.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/acpi_notifier.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/acpi_notifier.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/acpi_notifier.mo
 
-%files archive
+%files archive -f archive.lang
 %defattr(-,root,root,-)
 %doc archive-%{archive}/ABOUT-NLS
 %doc archive-%{archive}/AUTHORS
@@ -458,16 +458,11 @@
 %doc archive-%{archive}/README
 %doc archive-%{archive}/TODO
 %{_libdir}/claws-mail/plugins/archive*
-%{_includedir}/claws-mail/plugins/archive
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/archive.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/archive.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/archive.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/archive.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/archive.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/archive.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/archive.mo
+%dir %{_includedir}/claws-mail
+%dir %{_includedir}/claws-mail/plugins
+%{_includedir}/claws-mail/plugins/archive/
 
-%files attachwarner
+%files attachwarner -f attachwarner.lang
 %defattr(-,root,root,-)
 %{_libdir}/claws-mail/plugins/attachwarner*
 %doc attachwarner-%{attachwarner}/AUTHORS
@@ -476,19 +471,6 @@
 %doc attachwarner-%{attachwarner}/NEWS
 %doc attachwarner-%{attachwarner}/README
 %doc attachwarner-%{attachwarner}/TODO
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/attachwarner.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/attachwarner.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/attachwarner.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/attachwarner.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/attachwarner.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/attachwarner.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/attachwarner.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/attachwarner.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/attachwarner.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/attachwarner.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/attachwarner.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/attachwarner.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/attachwarner.mo
 
 %files att-remover
 %defattr(-,root,root,-)
@@ -513,26 +495,11 @@
 %doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/claws-mail/plugins/fetchinfo*
 
-%files gtkhtml2-viewer
+%files gtkhtml2-viewer -f gtkhtml2_viewer.lang
 %defattr(-,root,root,-)
 %doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
 %doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/claws-mail/plugins/gtkhtml2_viewer*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
-
 
 %files mailmbox
 %defattr(-,root,root,-)
@@ -551,22 +518,13 @@
 %doc newmail-%{newmail}/README
 %{_libdir}/claws-mail/plugins/newmail.so
 
-%files notification
+%files notification -f notification_plugin.lang
 %defattr(-,root,root,-)
 %doc notification_plugin-%{notification}/AUTHORS
 %doc notification_plugin-%{notification}/ChangeLog
 %doc notification_plugin-%{notification}/COPYING
 %doc notification_plugin-%{notification}/README
 %{_libdir}/claws-mail/plugins/notification_plugin.so
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/notification_plugin.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/notification_plugin.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/notification_plugin.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/notification_plugin.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/notification_plugin.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/notification_plugin.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/notification_plugin.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
 
 %files perl
 %defattr(-,root,root,-)
@@ -576,43 +534,18 @@
 %doc perl_plugin-%{perl}/README
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
-%files rssyl
+%files rssyl -f rssyl.lang
 %defattr(-,root,root,-)
 %doc rssyl-%{rssyl}/AUTHORS
 %doc rssyl-%{rssyl}/ChangeLog
 %doc rssyl-%{rssyl}/COPYING
 %doc rssyl-%{rssyl}/TODO
 %{_libdir}/claws-mail/plugins/rssyl*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/rssyl.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/rssyl.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/rssyl.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/rssyl.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/rssyl.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
-%files spam-report
+%files spam-report -f spam_report.lang
 %defattr(-,root,root,-)
 %doc spam_report-%{spamreport}/{AUTHORS,ChangeLog,COPYING,NEWS,README}
 %{_libdir}/claws-mail/plugins/spamreport.so
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/spam_report.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/spam_report.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/spam_report.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/spam_report.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/spam_report.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/spam_report.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/spam_report.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/spam_report.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/spam_report.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/spam_report.mo
 
 %files synce
 %defattr(-,root,root,-)
@@ -622,47 +555,42 @@
 %doc synce_plugin-%{synce}/README
 %{_libdir}/claws-mail/plugins/synce*
 
-%files tnef
+%files tnef -f tnef_parse.lang
 %defattr(-,root,root,-)
 %doc tnef_parse-%{tnef}/AUTHORS
 %doc tnef_parse-%{tnef}/ChangeLog
 %doc tnef_parse-%{tnef}/COPYING
 %doc tnef_parse-%{tnef}/README
 %{_libdir}/claws-mail/plugins/tnef*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/tnef_parse.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/tnef_parse.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/tnef_parse.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/tnef_parse.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/tnef_parse.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/tnef_parse.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/tnef_parse.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/tnef_parse.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/tnef_parse.mo
 
-%files vcalendar
+%files vcalendar -f vcalendar.lang
 %defattr(-,root,root,-)
 %doc vcalendar-%{vcalendar}/AUTHORS
 %doc vcalendar-%{vcalendar}/ChangeLog
 %doc vcalendar-%{vcalendar}/COPYING
 %doc vcalendar-%{vcalendar}/README
 %{_libdir}/claws-mail/plugins/vcalendar*
+%dir %{_includedir}/claws-mail
+%dir %{_includedir}/claws-mail/plugins
 %{_includedir}/claws-mail/plugins/vcalendar/
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/vcalendar.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/vcalendar.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/vcalendar.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Mar 30 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.1-2
+- use %%find_lang macro
+
+* Sat Mar 28 2009 Kevin Fenzi <kevin at tummy.com> - 3.7.1-1
+- Update to 3.7.1
+
+* Thu Mar 19 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.0-3
+- include directories /usr/include/claws-mail{,/plugins} in
+  "archive" and "vcalendar" sub-packages (#473638)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 30 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Dec 2008 18:07:54 -0000	1.19
+++ sources	6 Apr 2009 06:38:34 -0000	1.20
@@ -1 +1 @@
-b934a63222d8031e6d6c5aace8c4db72  claws-mail-extra-plugins-3.7.0.tar.bz2
+a483d0554365c2409f8921eefcb69a6f  claws-mail-extra-plugins-3.7.1.tar.bz2



From awjb at fedoraproject.org  Mon Apr  6 06:39:05 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon,  6 Apr 2009 06:39:05 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-9 .cvsignore, 1.19,
	1.20 claws-mail-plugins.spec, 1.37, 1.38 sources, 1.19, 1.20
Message-ID: <20090406063905.89C33700FB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5135/F-9

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 Dec 2008 18:07:54 -0000	1.19
+++ .cvsignore	6 Apr 2009 06:38:34 -0000	1.20
@@ -1 +1 @@
-claws-mail-extra-plugins-3.7.0.tar.bz2
+claws-mail-extra-plugins-3.7.1.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-9/claws-mail-plugins.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- claws-mail-plugins.spec	30 Dec 2008 18:07:54 -0000	1.37
+++ claws-mail-plugins.spec	6 Apr 2009 06:38:35 -0000	1.38
@@ -1,30 +1,30 @@
 # define plugin version
-%define acpinotifier	1.0.19
-%define archive		0.6.3
-%define attachwarner    0.2.15
+%define acpinotifier	1.0.20
+%define archive		0.6.4
+%define attachwarner    0.2.16
 %define attremover	1.0.10
-%define cachesaver	0.10.8
+%define cachesaver	0.10.9
 %define fetchinfo	0.4.24
-%define gtkhtml2viewer  0.22
+%define gtkhtml2viewer  0.23
 %define mailmbox	1.14.3
 %define newmail		0.0.15
-%define notification	0.20
+%define notification	0.21
 %define perl		0.9.15
-%define rssyl		0.23
-%define spamreport      0.3.7
+%define rssyl		0.24
+%define spamreport      0.3.8
 %define synce		0.7.5
-%define tnef            0.3.3
-%define vcalendar	2.0.3
+%define tnef            0.3.4
+%define vcalendar	2.0.4
 
 Name:           claws-mail-plugins
-Version:        3.7.0
-Release:        1%{?dist}
+Version:        3.7.1
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
 License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -42,6 +42,7 @@
 BuildRequires:  libarchive-devel
 BuildRequires:  libytnef-devel
 BuildRequires:  ghostscript
+BuildRequires:  enchant-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-archive = %{version}-%{release}
@@ -342,77 +343,91 @@
 # acpi_notifier
 cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang acpi_notifier
 
 # archive
-cd ../archive-%{archive}
+cd archive-%{archive}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang archive
 
 # attachwarner
-cd ../attachwarner-%{attachwarner}
+cd attachwarner-%{attachwarner}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang attachwarner
 
 # att_remover
-cd ../att_remover-%{attremover}
+cd att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 # cachesaver
-cd ../cachesaver-%{cachesaver}
+cd cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-%{fetchinfo}
+cd fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
- 
+cd -
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
+cd gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang gtkhtml2_viewer
 
 #mailmbox
-cd ../mailmbox-%{mailmbox}
+cd mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #newmail
-cd ../newmail-%{newmail}
+cd newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #notification-plugin
-cd ../notification_plugin-%{notification}
+cd notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang notification_plugin
 
 #perl
-cd ../perl_plugin-%{perl}
+cd perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
 
 #rssyl
-cd ../rssyl-%{rssyl}
+cd rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang rssyl
 
 #spamreport
-cd ../spam_report-%{spamreport}
+cd spam_report-%{spamreport}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang spam_report
 
 #synce
-cd ../synce_plugin-%{synce}
+cd synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
 
 #tnef
-cd ../tnef_parse-%{tnef}
+cd tnef_parse-%{tnef}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang tnef_parse
 
 #vcalendar
-cd ../vcalendar-%{vcalendar}
+cd vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
-
+cd -
+%find_lang vcalendar
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
@@ -424,7 +439,7 @@
 %defattr(-,root,root,-)
 %doc README
 
-%files acpi-notifier
+%files acpi-notifier -f acpi_notifier.lang
 %defattr(-,root,root,-)
 %doc acpi_notifier-%{acpinotifier}/ChangeLog
 %doc acpi_notifier-%{acpinotifier}/COPYING
@@ -432,23 +447,8 @@
 %doc acpi_notifier-%{acpinotifier}/AUTHORS
 %doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/claws-mail/plugins/acpi_notifier*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/acpi_notifier.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/acpi_notifier.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/acpi_notifier.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/acpi_notifier.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/acpi_notifier.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/acpi_notifier.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/acpi_notifier.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/acpi_notifier.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/acpi_notifier.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/acpi_notifier.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/acpi_notifier.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/acpi_notifier.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/acpi_notifier.mo
 
-%files archive
+%files archive -f archive.lang
 %defattr(-,root,root,-)
 %doc archive-%{archive}/ABOUT-NLS
 %doc archive-%{archive}/AUTHORS
@@ -458,16 +458,11 @@
 %doc archive-%{archive}/README
 %doc archive-%{archive}/TODO
 %{_libdir}/claws-mail/plugins/archive*
-%{_includedir}/claws-mail/plugins/archive
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/archive.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/archive.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/archive.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/archive.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/archive.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/archive.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/archive.mo
+%dir %{_includedir}/claws-mail
+%dir %{_includedir}/claws-mail/plugins
+%{_includedir}/claws-mail/plugins/archive/
 
-%files attachwarner
+%files attachwarner -f attachwarner.lang
 %defattr(-,root,root,-)
 %{_libdir}/claws-mail/plugins/attachwarner*
 %doc attachwarner-%{attachwarner}/AUTHORS
@@ -476,19 +471,6 @@
 %doc attachwarner-%{attachwarner}/NEWS
 %doc attachwarner-%{attachwarner}/README
 %doc attachwarner-%{attachwarner}/TODO
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/attachwarner.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/attachwarner.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/attachwarner.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/attachwarner.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/attachwarner.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/attachwarner.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/attachwarner.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/attachwarner.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/attachwarner.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/attachwarner.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/attachwarner.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/attachwarner.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/attachwarner.mo
 
 %files att-remover
 %defattr(-,root,root,-)
@@ -513,26 +495,11 @@
 %doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/claws-mail/plugins/fetchinfo*
 
-%files gtkhtml2-viewer
+%files gtkhtml2-viewer -f gtkhtml2_viewer.lang
 %defattr(-,root,root,-)
 %doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
 %doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/claws-mail/plugins/gtkhtml2_viewer*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/gtkhtml2_viewer.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
-
 
 %files mailmbox
 %defattr(-,root,root,-)
@@ -551,22 +518,13 @@
 %doc newmail-%{newmail}/README
 %{_libdir}/claws-mail/plugins/newmail.so
 
-%files notification
+%files notification -f notification_plugin.lang
 %defattr(-,root,root,-)
 %doc notification_plugin-%{notification}/AUTHORS
 %doc notification_plugin-%{notification}/ChangeLog
 %doc notification_plugin-%{notification}/COPYING
 %doc notification_plugin-%{notification}/README
 %{_libdir}/claws-mail/plugins/notification_plugin.so
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/notification_plugin.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/notification_plugin.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/notification_plugin.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/notification_plugin.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/notification_plugin.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/notification_plugin.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/notification_plugin.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
 
 %files perl
 %defattr(-,root,root,-)
@@ -576,43 +534,18 @@
 %doc perl_plugin-%{perl}/README
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
-%files rssyl
+%files rssyl -f rssyl.lang
 %defattr(-,root,root,-)
 %doc rssyl-%{rssyl}/AUTHORS
 %doc rssyl-%{rssyl}/ChangeLog
 %doc rssyl-%{rssyl}/COPYING
 %doc rssyl-%{rssyl}/TODO
 %{_libdir}/claws-mail/plugins/rssyl*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/rssyl.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/rssyl.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/rssyl.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/rssyl.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/rssyl.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
-%files spam-report
+%files spam-report -f spam_report.lang
 %defattr(-,root,root,-)
 %doc spam_report-%{spamreport}/{AUTHORS,ChangeLog,COPYING,NEWS,README}
 %{_libdir}/claws-mail/plugins/spamreport.so
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/spam_report.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/spam_report.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/spam_report.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/spam_report.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/spam_report.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/spam_report.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/spam_report.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/spam_report.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/spam_report.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/spam_report.mo
 
 %files synce
 %defattr(-,root,root,-)
@@ -622,47 +555,42 @@
 %doc synce_plugin-%{synce}/README
 %{_libdir}/claws-mail/plugins/synce*
 
-%files tnef
+%files tnef -f tnef_parse.lang
 %defattr(-,root,root,-)
 %doc tnef_parse-%{tnef}/AUTHORS
 %doc tnef_parse-%{tnef}/ChangeLog
 %doc tnef_parse-%{tnef}/COPYING
 %doc tnef_parse-%{tnef}/README
 %{_libdir}/claws-mail/plugins/tnef*
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/tnef_parse.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/tnef_parse.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/tnef_parse.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/tnef_parse.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/tnef_parse.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/tnef_parse.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/tnef_parse.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/tnef_parse.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/tnef_parse.mo
 
-%files vcalendar
+%files vcalendar -f vcalendar.lang
 %defattr(-,root,root,-)
 %doc vcalendar-%{vcalendar}/AUTHORS
 %doc vcalendar-%{vcalendar}/ChangeLog
 %doc vcalendar-%{vcalendar}/COPYING
 %doc vcalendar-%{vcalendar}/README
 %{_libdir}/claws-mail/plugins/vcalendar*
+%dir %{_includedir}/claws-mail
+%dir %{_includedir}/claws-mail/plugins
 %{_includedir}/claws-mail/plugins/vcalendar/
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/vcalendar.mo
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/vcalendar.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/vcalendar.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Mar 30 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.1-2
+- use %%find_lang macro
+
+* Sat Mar 28 2009 Kevin Fenzi <kevin at tummy.com> - 3.7.1-1
+- Update to 3.7.1
+
+* Thu Mar 19 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.0-3
+- include directories /usr/include/claws-mail{,/plugins} in
+  "archive" and "vcalendar" sub-packages (#473638)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 30 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Dec 2008 18:07:55 -0000	1.19
+++ sources	6 Apr 2009 06:38:35 -0000	1.20
@@ -1 +1 @@
-b934a63222d8031e6d6c5aace8c4db72  claws-mail-extra-plugins-3.7.0.tar.bz2
+a483d0554365c2409f8921eefcb69a6f  claws-mail-extra-plugins-3.7.1.tar.bz2



From airlied at fedoraproject.org  Mon Apr  6 07:11:22 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 07:11:22 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch,1.35,1.36
Message-ID: <20090406071122.67ED4700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12664

Modified Files:
	drm-nouveau.patch 
Log Message:
fix more powerpc


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- drm-nouveau.patch	6 Apr 2009 05:53:15 -0000	1.35
+++ drm-nouveau.patch	6 Apr 2009 07:11:20 -0000	1.36
@@ -2977,9 +2977,9 @@
 +		BIOS_USLEEP(ROM16(bios->data[bios->fp.xlated_entry + 7]));
 +#ifdef __powerpc__
 +	/* Powerbook specific quirks */
-+	if (script == LVDS_RESET && ((dev->Chipset & 0xffff) == 0x0179 || (dev->Chipset & 0xffff) == 0x0329))
++	if (script == LVDS_RESET && ((dev_priv->chipset & 0xffff) == 0x0179 || (dev_priv->chipset & 0xffff) == 0x0329))
 +		nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
-+	if ((dev->Chipset & 0xffff) == 0x0179 || (dev->Chipset & 0xffff) == 0x0189 || (dev->Chipset & 0xffff) == 0x0329) {
++	if ((dev_priv->chipset & 0xffff) == 0x0179 || (dev_priv->chipset & 0xffff) == 0x0189 || (dev_priv->chipset & 0xffff) == 0x0329) {
 +		if (script == LVDS_PANEL_ON) {
 +			bios_wr32(dev, NV_PBUS_DEBUG_DUALHEAD_CTL, bios_rd32(dev, NV_PBUS_DEBUG_DUALHEAD_CTL) | (1 << 31));
 +			bios_wr32(dev, NV_PCRTC_GPIO_EXT, bios_rd32(dev, NV_PCRTC_GPIO_EXT) | 1);



From pingou at fedoraproject.org  Mon Apr  6 08:14:58 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon,  6 Apr 2009 08:14:58 +0000 (UTC)
Subject: rpms/R-IRanges/devel R-IRanges.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090406081458.B4105700FB@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27726/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R-IRanges.spec import.log 
Log Message:
Original import for devel



--- NEW FILE R-IRanges.spec ---
%global BioC      2.4
%global packname  IRanges

Name:             R-%{packname}
Version:          1.1.55
Release:          1%{?dist}
Summary:          Low-level containers for storing sets of integer ranges

Group:            Applications/Engineering 
License:          Artistic 2.0 and Copyright only
# See https://www.redhat.com/archives/fedora-r-devel-list/2009-April/msg00001.html
URL:              http://bioconductor.org/packages/%{BioC}/bioc/html/IRanges.html
Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 

%description
The IRanges class and its extensions are low-level containers
for storing sets of integer ranges. A typical use of these containers
in biology is for representing a set of chromosome regions.
More specific extensions of the IRanges class will typically
allow the storage of additional information attached to each
chromosome region as well as a hierarchical relationship between
these regions.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


# x86/x86_64 -> Architecture dependent package
mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%dir %{_libdir}/R/library/%{packname}/
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/extdata
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/libs

%files devel
%defattr(-,root,root,-)
%{_libdir}/R/library/%{packname}/include

%changelog
* Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
- New release from bioconductor 2.4 which includes the change in
 the description file for the license used
- Update the license to its correct format

* Sun Mar 22 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-3
- The main package owns the directory
- Remove pkgconfig as R for the devel package
- Define becomes global

* Sat Mar 21 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-2
- Add R-Matrix as R and BR

* Fri Mar 13 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-1
- Update to 1.0.14

* Wed Feb 18 2009 pingou <pingou -AT- pingoured.fr> 1.0.11-1
- initial package for Fedora


--- NEW FILE import.log ---
R-IRanges-1_1_55-1_fc10:HEAD:R-IRanges-1.1.55-1.fc10.src.rpm:1239005638


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:33:41 -0000	1.1
+++ .cvsignore	6 Apr 2009 08:14:26 -0000	1.2
@@ -0,0 +1 @@
+IRanges_1.1.55.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:33:41 -0000	1.1
+++ sources	6 Apr 2009 08:14:26 -0000	1.2
@@ -0,0 +1 @@
+5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz



From pingou at fedoraproject.org  Mon Apr  6 08:16:40 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon,  6 Apr 2009 08:16:40 +0000 (UTC)
Subject: rpms/R-IRanges/F-10 R-IRanges.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090406081640.6DDDC700FB@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28371/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	R-IRanges.spec import.log 
Log Message:
Original import for F-10



--- NEW FILE R-IRanges.spec ---
%global BioC      2.4
%global packname  IRanges

Name:             R-%{packname}
Version:          1.1.55
Release:          1%{?dist}
Summary:          Low-level containers for storing sets of integer ranges

Group:            Applications/Engineering 
License:          Artistic 2.0 and Copyright only
# See https://www.redhat.com/archives/fedora-r-devel-list/2009-April/msg00001.html
URL:              http://bioconductor.org/packages/%{BioC}/bioc/html/IRanges.html
Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 

%description
The IRanges class and its extensions are low-level containers
for storing sets of integer ranges. A typical use of these containers
in biology is for representing a set of chromosome regions.
More specific extensions of the IRanges class will typically
allow the storage of additional information attached to each
chromosome region as well as a hierarchical relationship between
these regions.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


# x86/x86_64 -> Architecture dependent package
mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%dir %{_libdir}/R/library/%{packname}/
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/extdata
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/libs

%files devel
%defattr(-,root,root,-)
%{_libdir}/R/library/%{packname}/include

%changelog
* Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
- New release from bioconductor 2.4 which includes the change in
 the description file for the license used
- Update the license to its correct format

* Sun Mar 22 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-3
- The main package owns the directory
- Remove pkgconfig as R for the devel package
- Define becomes global

* Sat Mar 21 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-2
- Add R-Matrix as R and BR

* Fri Mar 13 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-1
- Update to 1.0.14

* Wed Feb 18 2009 pingou <pingou -AT- pingoured.fr> 1.0.11-1
- initial package for Fedora


--- NEW FILE import.log ---
R-IRanges-1_1_55-1_fc10:F-10:R-IRanges-1.1.55-1.fc10.src.rpm:1239005732


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:33:41 -0000	1.1
+++ .cvsignore	6 Apr 2009 08:16:09 -0000	1.2
@@ -0,0 +1 @@
+IRanges_1.1.55.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:33:41 -0000	1.1
+++ sources	6 Apr 2009 08:16:10 -0000	1.2
@@ -0,0 +1 @@
+5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz



From pingou at fedoraproject.org  Mon Apr  6 08:18:10 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Mon,  6 Apr 2009 08:18:10 +0000 (UTC)
Subject: rpms/R-IRanges/F-9 R-IRanges.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090406081810.A3CC6700FB@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28956/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	R-IRanges.spec import.log 
Log Message:
Original import for F-9



--- NEW FILE R-IRanges.spec ---
%global BioC      2.4
%global packname  IRanges

Name:             R-%{packname}
Version:          1.1.55
Release:          1%{?dist}
Summary:          Low-level containers for storing sets of integer ranges

Group:            Applications/Engineering 
License:          Artistic 2.0 and Copyright only
# See https://www.redhat.com/archives/fedora-r-devel-list/2009-April/msg00001.html
URL:              http://bioconductor.org/packages/%{BioC}/bioc/html/IRanges.html
Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 

%description
The IRanges class and its extensions are low-level containers
for storing sets of integer ranges. A typical use of these containers
in biology is for representing a set of chromosome regions.
More specific extensions of the IRanges class will typically
allow the storage of additional information attached to each
chromosome region as well as a hierarchical relationship between
these regions.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


# x86/x86_64 -> Architecture dependent package
mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%dir %{_libdir}/R/library/%{packname}/
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/extdata
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/libs

%files devel
%defattr(-,root,root,-)
%{_libdir}/R/library/%{packname}/include

%changelog
* Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
- New release from bioconductor 2.4 which includes the change in
 the description file for the license used
- Update the license to its correct format

* Sun Mar 22 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-3
- The main package owns the directory
- Remove pkgconfig as R for the devel package
- Define becomes global

* Sat Mar 21 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-2
- Add R-Matrix as R and BR

* Fri Mar 13 2009 pingou <pingou -AT- pingoured.fr> 1.0.14-1
- Update to 1.0.14

* Wed Feb 18 2009 pingou <pingou -AT- pingoured.fr> 1.0.11-1
- initial package for Fedora


--- NEW FILE import.log ---
R-IRanges-1_1_55-1_fc10:F-9:R-IRanges-1.1.55-1.fc10.src.rpm:1239005831


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:33:41 -0000	1.1
+++ .cvsignore	6 Apr 2009 08:17:40 -0000	1.2
@@ -0,0 +1 @@
+IRanges_1.1.55.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:33:41 -0000	1.1
+++ sources	6 Apr 2009 08:17:40 -0000	1.2
@@ -0,0 +1 @@
+5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz



From rrakus at fedoraproject.org  Mon Apr  6 08:38:14 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  6 Apr 2009 08:38:14 +0000 (UTC)
Subject: rpms/powerpc-utils/devel .cvsignore, 1.4, 1.5 powerpc-utils.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090406083814.28EAF700FB@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/powerpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1410

Modified Files:
	.cvsignore powerpc-utils.spec sources 
Log Message:
new upstream version 1.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Mar 2009 11:19:48 -0000	1.4
+++ .cvsignore	6 Apr 2009 08:37:43 -0000	1.5
@@ -1 +1 @@
-powerpc-utils-1.1.2.tar.gz
+powerpc-utils-1.1.3.tar.gz


Index: powerpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/powerpc-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- powerpc-utils.spec	3 Mar 2009 11:19:48 -0000	1.6
+++ powerpc-utils.spec	6 Apr 2009 08:37:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           powerpc-utils
-Version:        1.1.2
+Version:        1.1.3
 Release:        2%{?dist}
 Summary:        Utilities for PowerPC platforms
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Roman Rakus <rrakus at redhat.com> - 1.1.3-1
+- new upstream version 1.1.3
+
 * Tue Mar 03 2009 Roman Rakus <rrakus at redhat.com> - 1.1.2-1
 - new upstream version 1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 11:19:48 -0000	1.4
+++ sources	6 Apr 2009 08:37:43 -0000	1.5
@@ -1 +1 @@
-f551aa8c35db8204daef3cc2312c06bd  powerpc-utils-1.1.2.tar.gz
+36c254e48941b177242118c51539421c  powerpc-utils-1.1.3.tar.gz



From pkgdb at fedoraproject.org  Mon Apr  6 08:48:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:48:36 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406084816.50A0F208550@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on jwhois (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:48:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:48:44 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406084844.694AD208550@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on jwhois (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:49:14 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406084914.58B66208553@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on jwhois (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From airlied at fedoraproject.org  Mon Apr  6 08:48:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 08:48:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.43,
	1.44 xorg-x11-drv-ati.spec, 1.169, 1.170
Message-ID: <20090406084856.4771D700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4071

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-6
- kms: add config.h to get mmap working properly


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- radeon-modeset.patch	6 Apr 2009 05:38:09 -0000	1.43
+++ radeon-modeset.patch	6 Apr 2009 08:48:25 -0000	1.44
@@ -7542,10 +7542,14 @@
  
 diff --git a/src/radeon_memory.c b/src/radeon_memory.c
 new file mode 100644
-index 0000000..f4b6c28
+index 0000000..3d722fb
 --- /dev/null
 +++ b/src/radeon_memory.c
-@@ -0,0 +1,241 @@
+@@ -0,0 +1,245 @@
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
 +
 +#include <errno.h>
 +#include <sys/ioctl.h>


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- xorg-x11-drv-ati.spec	6 Apr 2009 05:44:22 -0000	1.169
+++ xorg-x11-drv-ati.spec	6 Apr 2009 08:48:25 -0000	1.170
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -76,6 +76,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-6
+- kms: add config.h to get mmap working properly
+
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-5
 - radeon-modeset.patch: break APIs;
 - radeon: move to latest git fixups



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:26 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085005.819A6208553@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on jwhois (Fedora 9) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:49:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:49:44 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085006.2961B208556@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on jwhois (Fedora 10) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:09 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085010.60191208603@bastion.fedora.phx.redhat.com>

vcrhonek has set the approveacls acl on jwhois (Fedora devel) to Obsolete for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:32 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085011.DAC72208608@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchbugzilla acl on jwhois (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:16 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085016.C3C3120860F@bastion.fedora.phx.redhat.com>

vcrhonek has set the commit acl on jwhois (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:40 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085020.C6E152086F6@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchbugzilla acl on jwhois (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:49:56 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085017.0B7F52086F3@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on jwhois (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:01 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085021.E0D21208701@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on jwhois (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:45 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085024.806F2208704@bastion.fedora.phx.redhat.com>

vcrhonek has set the commit acl on jwhois (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:27 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085027.2DCFC208710@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchbugzilla acl on jwhois (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:14 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085035.72806208557@bastion.fedora.phx.redhat.com>

vcrhonek has set the commit acl on jwhois (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From pkgdb at fedoraproject.org  Mon Apr  6 08:50:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 08:50:48 +0000
Subject: [pkgdb] jwhois had acl change status
Message-ID: <20090406085028.8C1E3208556@bastion.fedora.phx.redhat.com>

vcrhonek has set the watchcommits acl on jwhois (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jwhois



From mtasaka at fedoraproject.org  Mon Apr  6 08:55:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 08:55:33 +0000 (UTC)
Subject: rpms/pcmanfm/devel pcmanfm-0.5-exec-from-non-terminal.patch, NONE, 
	1.1 pcmanfm.spec, 1.28, 1.29
Message-ID: <20090406085533.79039700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6473

Modified Files:
	pcmanfm.spec 
Added Files:
	pcmanfm-0.5-exec-from-non-terminal.patch 
Log Message:
* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-7
- Fix the issue when application cannot be lauched from desktop menu
  (sourceforge bug 2313286)


pcmanfm-0.5-exec-from-non-terminal.patch:

--- NEW FILE pcmanfm-0.5-exec-from-non-terminal.patch ---
--- pcmanfm-0.5/src/vfs/vfs-execute.c.debug	2008-05-25 21:59:15.000000000 +0900
+++ pcmanfm-0.5/src/vfs/vfs-execute.c	2009-04-06 17:26:14.000000000 +0900
@@ -131,8 +131,8 @@
         {
             if ( 0 == strncmp( envp[ i ], "DESKTOP_STARTUP_ID=", 19 ) )
                 startup_id_index = i;
-            new_env[i] = g_strdup( envp[ i ] );
         }
+        new_env[i] = g_strdup( envp[ i ] );
     }
 
     display = sn_display_new ( GDK_SCREEN_XDISPLAY ( screen ),
@@ -170,8 +170,11 @@
 
     /* This is taken from gdk_spawn_on_screen */
     display_name = gdk_screen_make_display_name ( screen );
-    if ( display_index >= 0 )
+    if ( display_index >= 0 ){
+        /* Now display_index points to the last entry of "DISPLAY=" */
+        g_free(new_env[ display_index ]);
         new_env[ display_index ] = g_strconcat( "DISPLAY=", display_name, NULL );
+    }
     else
         new_env[ i++ ] = g_strconcat( "DISPLAY=", display_name, NULL );
 


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pcmanfm.spec	24 Feb 2009 04:00:49 -0000	1.28
+++ pcmanfm.spec	6 Apr 2009 08:55:03 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:		pcmanfm
 Version:	0.5
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -12,6 +12,8 @@
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 Patch0:		pcmanfm-0.5-kill-find-immediately.patch
 Patch1:		pcmanfm-0.5-icon-fallback.patch
+# Sent upstream (sf bug 2313286)
+Patch10:	pcmanfm-0.5-exec-from-non-terminal.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-glib-devel
@@ -31,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .search_hang
+%patch10 -p1 -b .non_terminal
 
 %if 0%{?fedora} >= 10
 function replace_icon(){
@@ -134,6 +137,10 @@
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-7
+- Fix the issue when application cannot be lauched from desktop menu
+  (sourceforge bug 2313286)
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-6
 - F-11: Mass rebuild
 



From mhlavink at fedoraproject.org  Mon Apr  6 08:55:58 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  6 Apr 2009 08:55:58 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.51,
	1.52 dovecot-1.1-default-settings.patch, 1.5, 1.6 dovecot.spec,
	1.124, 1.125 sources, 1.54, 1.55 dovecot-1.2-ldap.patch, 1.1, NONE
Message-ID: <20090406085558.B4058700FB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544

Modified Files:
	.cvsignore dovecot-1.1-default-settings.patch dovecot.spec 
	sources 
Removed Files:
	dovecot-1.2-ldap.patch 
Log Message:
update to 1.2.rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	30 Mar 2009 14:43:55 -0000	1.51
+++ .cvsignore	6 Apr 2009 08:55:27 -0000	1.52
@@ -1,4 +1,4 @@
 dovecot-1.2-managesieve-0.11.3.tar.gz
-dovecot-1.2.beta4.tar.gz
-dovecot-1.2.beta4-managesieve-0.11.3.diff.gz
+dovecot-1.2.rc2.tar.gz
+dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
 dovecot-sieve-1.1.6.tar.gz

dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot-1.1-default-settings.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dovecot-1.1-default-settings.patch	30 Mar 2009 14:35:23 -0000	1.5
+++ dovecot-1.1-default-settings.patch	6 Apr 2009 08:55:28 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up dovecot-1.2.beta4/dovecot-example.conf.default-settings dovecot-1.2.beta4/dovecot-example.conf
---- dovecot-1.2.beta4/dovecot-example.conf.default-settings	2009-03-30 15:56:26.941208108 +0200
-+++ dovecot-1.2.beta4/dovecot-example.conf	2009-03-30 15:56:26.969311839 +0200
+diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/dovecot-example.conf
+--- dovecot-1.2.rc2/dovecot-example.conf.default-settings	2009-04-06 10:45:53.519651253 +0200
++++ dovecot-1.2.rc2/dovecot-example.conf	2009-04-06 10:45:53.525647967 +0200
 @@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -48,7 +48,7 @@
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -481,7 +478,7 @@
+@@ -485,7 +482,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -57,9 +57,9 @@
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.2.beta4/src/master/master-settings.c.default-settings dovecot-1.2.beta4/src/master/master-settings.c
---- dovecot-1.2.beta4/src/master/master-settings.c.default-settings	2009-03-30 15:56:26.966311559 +0200
-+++ dovecot-1.2.beta4/src/master/master-settings.c	2009-03-30 15:57:10.994066535 +0200
+diff -up dovecot-1.2.rc2/src/master/master-settings.c.default-settings dovecot-1.2.rc2/src/master/master-settings.c
+--- dovecot-1.2.rc2/src/master/master-settings.c.default-settings	2009-04-06 10:45:53.523648309 +0200
++++ dovecot-1.2.rc2/src/master/master-settings.c	2009-04-06 10:48:05.630586332 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  
@@ -80,9 +80,9 @@
  	MEMBER(verbose_ssl) FALSE,
  	MEMBER(shutdown_clients) TRUE,
  	MEMBER(nfs_check) TRUE,
-@@ -254,7 +254,7 @@ struct settings default_settings = {
- 	MEMBER(maildir_copy_with_hardlinks) TRUE,
+@@ -255,7 +255,7 @@ struct settings default_settings = {
  	MEMBER(maildir_copy_preserve_filename) FALSE,
+ 	MEMBER(maildir_very_dirty_syncs) FALSE,
  	MEMBER(mbox_read_locks) "fcntl",
 -	MEMBER(mbox_write_locks) "dotlock fcntl",
 +	MEMBER(mbox_write_locks) "fcntl",


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- dovecot.spec	30 Mar 2009 14:43:55 -0000	1.124
+++ dovecot.spec	6 Apr 2009 08:55:28 -0000	1.125
@@ -2,8 +2,8 @@
 Name: dovecot
 Epoch: 1
 Version: 1.2
-%define betaver beta4
-Release: 0.%{betaver}.2%{?dist}
+%define betaver rc2
+Release: 0.%{betaver}.1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -33,16 +33,12 @@
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
 Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz
-Patch0: dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-# from upstream, for dovecot <= 1.2.beta4
-Patch4: dovecot-1.2-ldap.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -171,11 +167,10 @@
 
 %setup -q -n %{name}-%{version}.%{betaver}
 
-%patch0 -p1 -b .managesieve
+zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
-%patch4 -p1 -b .ldap
 
 %if %{build_sieve}
 %setup -q -n %{name}-%{version}.%{betaver} -D -T -a 8
@@ -434,6 +429,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc2.1
+- updated to 1.2.rc2
+
 * Mon Mar 30 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.beta4.2
 - fix typo and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	30 Mar 2009 14:43:55 -0000	1.54
+++ sources	6 Apr 2009 08:55:28 -0000	1.55
@@ -1,4 +1,4 @@
 a651e2f12a17157d716eedc622032fdc  dovecot-1.2-managesieve-0.11.3.tar.gz
-9f2e1e0f0f18dbb3d31f255e61bbf722  dovecot-1.2.beta4.tar.gz
-f7458682b4e17a0b636068cf0daefd65  dovecot-1.2.beta4-managesieve-0.11.3.diff.gz
+0c568a2eb5170ab287f5f3ef38c13e1a  dovecot-1.2.rc2.tar.gz
+0588f613de160dfee0234954666a6a68  dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz


--- dovecot-1.2-ldap.patch DELETED ---



From mnowak at fedoraproject.org  Mon Apr  6 08:57:00 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Mon,  6 Apr 2009 08:57:00 +0000 (UTC)
Subject: rpms/ncmpcpp/devel .cvsignore, 1.5, 1.6 import.log, 1.4,
	1.5 ncmpcpp.spec, 1.5, 1.6 sources, 1.5,
	1.6 ncmpcpp-0.3.2-charset.patch, 1.1, NONE
Message-ID: <20090406085700.C0643700FB@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6907/devel

Modified Files:
	.cvsignore import.log ncmpcpp.spec sources 
Removed Files:
	ncmpcpp-0.3.2-charset.patch 
Log Message:
0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Mar 2009 08:40:04 -0000	1.5
+++ .cvsignore	6 Apr 2009 08:56:30 -0000	1.6
@@ -1 +1 @@
-ncmpcpp-0.3.2.tar.bz2
+ncmpcpp-0.3.3.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	18 Mar 2009 08:40:04 -0000	1.4
+++ import.log	6 Apr 2009 08:56:30 -0000	1.5
@@ -2,3 +2,4 @@
 ncmpcpp-0_3-1_fc10:HEAD:ncmpcpp-0.3-1.fc10.src.rpm:1233686760
 ncmpcpp-0_3_1-1_fc10:HEAD:ncmpcpp-0.3.1-1.fc10.src.rpm:1235383091
 ncmpcpp-0_3_2-1_fc11:HEAD:ncmpcpp-0.3.2-1.fc11.src.rpm:1237365482
+ncmpcpp-0_3_3-1_fc11:HEAD:ncmpcpp-0.3.3-1.fc11.src.rpm:1239008066


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/ncmpcpp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncmpcpp.spec	18 Mar 2009 08:40:04 -0000	1.5
+++ ncmpcpp.spec	6 Apr 2009 08:56:30 -0000	1.6
@@ -1,12 +1,11 @@
 Name:           ncmpcpp
-Version:        0.3.2
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://unkart.ovh.org/ncmpcpp
 Source0:        http://unkart.ovh.org/ncmpcpp/%{name}-%{version}.tar.bz2
-Patch0:         ncmpcpp-0.3.2-charset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -23,9 +22,6 @@
 
 %prep
 %setup -q
-# upstream patch, compilation was failing
-# --> http://repo.or.cz/w/ncmpcpp.git?a=commitdiff;h=503c4964d56a1140331d02c0f56dfc7efb733c40#patch1
-%patch0 -p1
 
 
 %build
@@ -52,6 +48,10 @@
 
 
 %changelog
+* Mon Apr 06 2009 Michal Nowak <mnowak at redhat.com> - 0.3.3-1
+- dumped ncmpcpp-0.3.2-charset.patch -- upstream already 
+- 0.3.3
+
 * Wed Mar 18 2009 Michal Nowak <mnowak at redhat.com> - 0.3.2-1
 - 0.3.2
 - added ncmpcpp man page


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Mar 2009 08:40:04 -0000	1.5
+++ sources	6 Apr 2009 08:56:30 -0000	1.6
@@ -1 +1 @@
-e2159a391b21d3fcf9a4613f589fb213  ncmpcpp-0.3.2.tar.bz2
+409406e353bc8a7f5b8cfc4247d7d562  ncmpcpp-0.3.3.tar.bz2


--- ncmpcpp-0.3.2-charset.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr  6 09:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 09:19:56 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20090406091934.F2AAD208550@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegames (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Apr  6 09:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 09:19:35 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20090406091935.635D9208556@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegames (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Apr  6 09:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 09:19:56 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20090406091935.CD9CC208603@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegames (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From laxathom at fedoraproject.org  Mon Apr  6 09:20:31 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Mon,  6 Apr 2009 09:20:31 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/devel .cvsignore, 1.3,
	1.4 gnome-desktop-sharp.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090406092031.1F001700FB@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11890

Modified Files:
	.cvsignore gnome-desktop-sharp.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2008 17:43:07 -0000	1.3
+++ .cvsignore	6 Apr 2009 09:20:00 -0000	1.4
@@ -1 +1 @@
-gnome-desktop-sharp-2.24.0.tar.bz2
+gnome-desktop-sharp-2.26.0.tar.bz2


Index: gnome-desktop-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/gnome-desktop-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-desktop-sharp.spec	24 Feb 2009 22:48:33 -0000	1.5
+++ gnome-desktop-sharp.spec	6 Apr 2009 09:20:00 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnome-desktop-sharp
-Version:        2.24.0
-Release:        4%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 Summary:        .NET language binding for mono
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.mono-project.com/GtkSharp
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-%{version}-libdir.patch
+Patch0:         %{name}-2.24.0-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel, gtk2-devel, gtkhtml3-devel
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 06 2009 Xavier Lamien <lxtnow at gmail.com> - 2.26.0-1
+- UPdate release.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2008 17:43:07 -0000	1.3
+++ sources	6 Apr 2009 09:20:00 -0000	1.4
@@ -1 +1 @@
-2d36f04223a52e09908ddbdc1c767f5e  gnome-desktop-sharp-2.24.0.tar.bz2
+4bc990900bb318b2ba0b0e7998bb47d1  gnome-desktop-sharp-2.26.0.tar.bz2



From caolanm at fedoraproject.org  Mon Apr  6 09:46:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  6 Apr 2009 09:46:37 +0000 (UTC)
Subject: rpms/mythes-es/devel mythes-es.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090406094637.24D72700FB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-es/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18863

Modified Files:
	mythes-es.spec sources 
Log Message:
latest version


Index: mythes-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/mythes-es.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythes-es.spec	6 Mar 2009 10:05:53 -0000	1.3
+++ mythes-es.spec	6 Apr 2009 09:46:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name: mythes-es
 Summary: Spanish thesaurus
-%define upstreamid 20090306
+%define upstreamid 20090406
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://openthes-es.berlios.de/download/OOo2-thes_es_ES.tar.bz2
@@ -43,6 +43,9 @@
 %{_datadir}/mythes/*
 
 %changelog
+* Mon Apr 06 2009 Caol??n McNamara <caolanm at redhat.com> - 0.20090406-1
+- latest version
+
 * Fri Mar 06 2009 Caol??n McNamara <caolanm at redhat.com> - 0.20090306-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2009 10:05:53 -0000	1.3
+++ sources	6 Apr 2009 09:46:06 -0000	1.4
@@ -1 +1 @@
-4c33ac651ad5fbd71f028dbb2d0c1064  OOo2-thes_es_ES.tar.bz2
+ea2665073341bc3e594b92fc365b9203  OOo2-thes_es_ES.tar.bz2



From denis at fedoraproject.org  Mon Apr  6 10:27:02 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  6 Apr 2009 10:27:02 +0000 (UTC)
Subject: rpms/pangomm/devel .cvsignore, 1.4, 1.5 pangomm.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090406102703.045F0700FB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28519

Modified Files:
	.cvsignore pangomm.spec sources 
Log Message:
Update to upstream 2.24.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Nov 2008 10:16:45 -0000	1.4
+++ .cvsignore	6 Apr 2009 10:26:31 -0000	1.5
@@ -1 +1 @@
-pangomm-2.14.1.tar.bz2
+pangomm-2.24.0.tar.bz2


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pangomm.spec	26 Feb 2009 09:44:39 -0000	1.6
+++ pangomm.spec	6 Apr 2009 10:26:31 -0000	1.7
@@ -1,8 +1,8 @@
 %define apiver 1.4
 
 Name:           pangomm
-Version:        2.14.1
-Release:        2%{?dist}
+Version:        2.24.0
+Release:        1%{?dist}
 Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
@@ -13,7 +13,7 @@
 
 BuildRequires:  glibmm24-devel >= 2.14.1
 BuildRequires:  cairomm-devel >= 1.2.2
-BuildRequires:  pango-devel >= 1.21.4
+BuildRequires:  pango-devel >= 1.23.0
 BuildRequires:  doxygen graphviz
 
 Obsoletes:      gtkmm24 < 2.13.5
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Denis Leroy <denis at poolshark.org> - 2.24.0-1
+- Update to upstream 2.24.0
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.14.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2008 10:16:45 -0000	1.4
+++ sources	6 Apr 2009 10:26:31 -0000	1.5
@@ -1 +1 @@
-c67228ea93dd977394d2872b61754b53  pangomm-2.14.1.tar.bz2
+fa0f44c37499433455857becad4bbcda  pangomm-2.24.0.tar.bz2



From denis at fedoraproject.org  Mon Apr  6 10:30:54 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  6 Apr 2009 10:30:54 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.32, 1.33 gtkmm.spec, 1.50,
	1.51 sources, 1.34, 1.35
Message-ID: <20090406103054.E045E700FB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29859

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to upstream 2.16.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	14 Feb 2009 07:05:34 -0000	1.32
+++ .cvsignore	6 Apr 2009 10:30:24 -0000	1.33
@@ -1 +1 @@
-gtkmm-2.15.3.tar.bz2
+gtkmm-2.16.0.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gtkmm.spec	25 Feb 2009 02:23:45 -0000	1.50
+++ gtkmm.spec	6 Apr 2009 10:30:24 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.15.3
-Release:        2%{?dist}
+Version:        2.16.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -13,7 +13,7 @@
 BuildRequires:  glibmm24-devel >= 2.18.0
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.5.2
-BuildRequires:  gtk2-devel >= 2.15.3
+BuildRequires:  gtk2-devel >= 2.15.5
 BuildRequires:  cairomm-devel >= 1.2.2
 BuildRequires:  pangomm-devel >= 2.14.0
 
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Denis Leroy <denis at poolshark.org> - 2.16.0-1
+- Update to upstream 2.16.0
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.15.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	14 Feb 2009 07:05:34 -0000	1.34
+++ sources	6 Apr 2009 10:30:24 -0000	1.35
@@ -1 +1 @@
-27b69b9532421cb9c380c6f84a619150  gtkmm-2.15.3.tar.bz2
+a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2



From denis at fedoraproject.org  Mon Apr  6 10:33:26 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  6 Apr 2009 10:33:26 +0000 (UTC)
Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.9,
	1.10 libgnomecanvasmm.spec, 1.19, 1.20 sources, 1.9, 1.10
Message-ID: <20090406103326.379B4700FB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30561

Modified Files:
	.cvsignore libgnomecanvasmm.spec sources 
Log Message:
Update to upstream 2.26.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Aug 2008 16:01:58 -0000	1.9
+++ .cvsignore	6 Apr 2009 10:32:55 -0000	1.10
@@ -1 +1 @@
-libgnomecanvasmm-2.23.1.tar.bz2
+libgnomecanvasmm-2.26.0.tar.bz2


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libgnomecanvasmm.spec	25 Feb 2009 15:15:43 -0000	1.19
+++ libgnomecanvasmm.spec	6 Apr 2009 10:32:55 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           libgnomecanvasmm26
-Version:        2.23.1
-Release:        2%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr  6 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-1
+- Update to upstream 2.26.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.23.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Aug 2008 16:01:58 -0000	1.9
+++ sources	6 Apr 2009 10:32:55 -0000	1.10
@@ -1 +1 @@
-9990eb5560db197e16be3497873fe1d9  libgnomecanvasmm-2.23.1.tar.bz2
+a148c99311d46397de6e4a31736771ab  libgnomecanvasmm-2.26.0.tar.bz2



From kengert at fedoraproject.org  Mon Apr  6 10:33:54 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Mon,  6 Apr 2009 10:33:54 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.62,1.63
Message-ID: <20090406103354.29585700FB@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30717

Modified Files:
	nss.spec 
Log Message:
* Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-6
- fix softokn-freebl dependency for multilib (bug 494122)



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- nss.spec	2 Apr 2009 22:06:40 -0000	1.62
+++ nss.spec	6 Apr 2009 10:33:23 -0000	1.63
@@ -4,12 +4,12 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.99.3
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
-Requires:         nss-softokn-freebl >= %{version}
+Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
@@ -469,6 +469,8 @@
 
 
 %changelog
+* Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-6
+- fix softokn-freebl dependency for multilib (bug 494122)
 * Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-5
 - introduce separate nss-softokn-freebl package
 * Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-4



From transif at fedoraproject.org  Mon Apr  6 10:41:40 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  6 Apr 2009 10:41:40 +0000 (UTC)
Subject: comps/po bn_IN.po,1.18,1.19
Message-ID: <20090406104140.1921A700FB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32692/po

Modified Files:
	bn_IN.po 
Log Message:
Sending translation for Bengali (India)


Index: bn_IN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bn_IN.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bn_IN.po	31 Mar 2009 12:41:34 -0000	1.18
+++ bn_IN.po	6 Apr 2009 10:41:09 -0000	1.19
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.bn_IN.po to Bengali INDIA
+# translation of comps.HEAD.po to Bengali INDIA
 # Bangla INDIA Translation of Comps.po
 # Copyright (C) 2003, 2004, Red Hat, Inc.
 # This file is distributed under the same license as the COMPS package.
@@ -6,14 +6,14 @@
 # Deepayan Sarkar <deepayan at bengalinux.org>, 2003, 2004.
 # Progga <progga at BengaLinux.Org>, 2004.
 # Runa Bhattacharjee <runab at redhat.com>, 2004, 2005, 2006, 2007, 2008, 2009.
-# Runa Bhattacharjee <runab at fedoraproject.org>, 2008.
+# Runa Bhattacharjee <runab at fedoraproject.org>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.bn_IN\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-03-31 08:02+0000\n"
-"PO-Revision-Date: 2009-03-31 15:51+0530\n"
-"Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
+"PO-Revision-Date: 2009-04-06 16:09+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab at fedoraproject.org>\n"
 "Language-Team: Bengali INDIA <fedora-trans-bn_in at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1281,7 +1281,7 @@
 
 #: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
 msgid "A software playground for learning about learning."
-msgstr ""
+msgstr "????????????????????? ??????????????????????????? ???????????? ?????????????????????????????? ?????????????????????????????? ??????????????????????????????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77



From airlied at fedoraproject.org  Mon Apr  6 10:46:18 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 10:46:18 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec, 1.238, 1.239 radeon-rewrite.patch, 1.16, 
	1.17 radeon-fix-r100.patch, 1.1, NONE
Message-ID: <20090406104618.14673700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1216

Modified Files:
	mesa.spec radeon-rewrite.patch 
Removed Files:
	radeon-fix-r100.patch 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 7.5-0.7
- rebase to latest radeon-rewrite



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- mesa.spec	1 Apr 2009 12:23:39 -0000	1.238
+++ mesa.spec	6 Apr 2009 10:45:46 -0000	1.239
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -46,7 +46,6 @@
 Patch9: intel-revert-vbl.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
-Patch13: radeon-fix-r100.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -174,7 +173,6 @@
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
-%patch13 -p1 -b .r100
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -431,6 +429,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 7.5-0.7
+- rebase to latest radeon-rewrite
+
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 7.5-0.6
 - Build fbo files for r100
 

radeon-rewrite.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.16 -r 1.17 radeon-rewrite.patch
Index: radeon-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- radeon-rewrite.patch	31 Mar 2009 06:07:01 -0000	1.16
+++ radeon-rewrite.patch	6 Apr 2009 10:45:46 -0000	1.17
@@ -125,7 +125,7 @@
  ##### TARGETS #####
  
 diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
-index e163377..83375c8 100644
+index e163377..3a11a44 100644
 --- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
 +++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
 @@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -387,18 +387,18 @@
 +		if (!rmesa->radeon.radeonScreen->kernel_mm) {
 +			OUT_BATCH_PACKET3(R200_CP_CMD_INDX_BUFFER, 2);
 +			OUT_BATCH((0x80 << 24) | (0 << 16) | 0x810);
-+			OUT_BATCH_RELOC(rmesa->tcl.elt_dma_offset,
-+					rmesa->tcl.elt_dma_bo,
-+					rmesa->tcl.elt_dma_offset,
++			OUT_BATCH_RELOC(rmesa->radeon.tcl.elt_dma_offset,
++					rmesa->radeon.tcl.elt_dma_bo,
++					rmesa->radeon.tcl.elt_dma_offset,
 +					RADEON_GEM_DOMAIN_GTT, 0, 0);
 +			OUT_BATCH(vertex_count/2);
 +		} else {
 +			OUT_BATCH_PACKET3(R200_CP_CMD_INDX_BUFFER, 2);
 +			OUT_BATCH((0x80 << 24) | (0 << 16) | 0x810);
-+			OUT_BATCH(rmesa->tcl.elt_dma_offset);
++			OUT_BATCH(rmesa->radeon.tcl.elt_dma_offset);
 +			OUT_BATCH(vertex_count/2);
 +			radeon_cs_write_reloc(rmesa->radeon.cmdbuf.cs,
-+					      rmesa->tcl.elt_dma_bo,
++					      rmesa->radeon.tcl.elt_dma_bo,
 +					      RADEON_GEM_DOMAIN_GTT, 0, 0);
 +		}
 +		END_BATCH();
@@ -431,14 +431,14 @@
 -    */
 -   rmesa->store.cmd_used = (rmesa->store.cmd_used + 2) & ~2;
 -   dwords = (rmesa->store.cmd_used - rmesa->store.elts_start) / 4;
-+   radeon_bo_unmap(rmesa->tcl.elt_dma_bo);
++   radeon_bo_unmap(rmesa->radeon.tcl.elt_dma_bo);
  
 -   cmd[1] |= (dwords - 3) << 16;
 -   cmd[2] |= nr << R200_VF_VERTEX_NUMBER_SHIFT;
 +   r200FireEB(rmesa, nr, rmesa->tcl.hw_primitive);
 +
-+   radeon_bo_unref(rmesa->tcl.elt_dma_bo);
-+   rmesa->tcl.elt_dma_bo = NULL;
++   radeon_bo_unref(rmesa->radeon.tcl.elt_dma_bo);
++   rmesa->radeon.tcl.elt_dma_bo = NULL;
  
     if (R200_DEBUG & DEBUG_SYNC) {
        fprintf(stderr, "%s: Syncing\n", __FUNCTION__);
@@ -471,14 +471,14 @@
 -	       R200_VF_COLOR_ORDER_RGBA);
 +   radeonEmitState(&rmesa->radeon);
 +
-+   rmesa->tcl.elt_dma_bo = radeon_bo_open(rmesa->radeon.radeonScreen->bom,
++   rmesa->radeon.tcl.elt_dma_bo = radeon_bo_open(rmesa->radeon.radeonScreen->bom,
 +					  0, R200_ELT_BUF_SZ, 4,
 +					  RADEON_GEM_DOMAIN_GTT, 0);
-+   rmesa->tcl.elt_dma_offset = 0;
++   rmesa->radeon.tcl.elt_dma_offset = 0;
 +   rmesa->tcl.elt_used = min_nr * 2;
  
-+   radeon_bo_map(rmesa->tcl.elt_dma_bo, 1);
-+   retval = rmesa->tcl.elt_dma_bo->ptr + rmesa->tcl.elt_dma_offset;
++   radeon_bo_map(rmesa->radeon.tcl.elt_dma_bo, 1);
++   retval = rmesa->radeon.tcl.elt_dma_bo->ptr + rmesa->radeon.tcl.elt_dma_offset;
     
 -   retval = (GLushort *)(cmd+3);
  
@@ -578,22 +578,22 @@
 +    
 +   if (!rmesa->radeon.radeonScreen->kernel_mm) {
 +      for (i = 0; i + 1 < nr; i += 2) {
-+	 OUT_BATCH((rmesa->tcl.aos[i].components << 0) |
-+		   (rmesa->tcl.aos[i].stride << 8) |
-+		   (rmesa->tcl.aos[i + 1].components << 16) |
-+		   (rmesa->tcl.aos[i + 1].stride << 24));
++	 OUT_BATCH((rmesa->radeon.tcl.aos[i].components << 0) |
++		   (rmesa->radeon.tcl.aos[i].stride << 8) |
++		   (rmesa->radeon.tcl.aos[i + 1].components << 16) |
++		   (rmesa->radeon.tcl.aos[i + 1].stride << 24));
 +			
-+	 voffset =  rmesa->tcl.aos[i + 0].offset +
-+	    offset * 4 * rmesa->tcl.aos[i + 0].stride;
++	 voffset =  rmesa->radeon.tcl.aos[i + 0].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[i + 0].stride;
 +	 OUT_BATCH_RELOC(voffset,
-+			 rmesa->tcl.aos[i].bo,
++			 rmesa->radeon.tcl.aos[i].bo,
 +			 voffset,
 +			 RADEON_GEM_DOMAIN_GTT,
 +			 0, 0);
-+	 voffset =  rmesa->tcl.aos[i + 1].offset +
-+	    offset * 4 * rmesa->tcl.aos[i + 1].stride;
++	 voffset =  rmesa->radeon.tcl.aos[i + 1].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[i + 1].stride;
 +	 OUT_BATCH_RELOC(voffset,
-+			 rmesa->tcl.aos[i+1].bo,
++			 rmesa->radeon.tcl.aos[i+1].bo,
 +			 voffset,
 +			 RADEON_GEM_DOMAIN_GTT,
 +			 0, 0);
@@ -605,57 +605,57 @@
 -		     offset * component[i]->aos_stride * 4);
 +      
 +      if (nr & 1) {
-+	 OUT_BATCH((rmesa->tcl.aos[nr - 1].components << 0) |
-+		   (rmesa->tcl.aos[nr - 1].stride << 8));
-+	 voffset =  rmesa->tcl.aos[nr - 1].offset +
-+	    offset * 4 * rmesa->tcl.aos[nr - 1].stride;
++	 OUT_BATCH((rmesa->radeon.tcl.aos[nr - 1].components << 0) |
++		   (rmesa->radeon.tcl.aos[nr - 1].stride << 8));
++	 voffset =  rmesa->radeon.tcl.aos[nr - 1].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[nr - 1].stride;
 +	 OUT_BATCH_RELOC(voffset,
-+			 rmesa->tcl.aos[nr - 1].bo,
++			 rmesa->radeon.tcl.aos[nr - 1].bo,
 +			 voffset,
 +			 RADEON_GEM_DOMAIN_GTT,
 +			 0, 0);
 +      }
 +   } else {
 +      for (i = 0; i + 1 < nr; i += 2) {
-+	 OUT_BATCH((rmesa->tcl.aos[i].components << 0) |
-+		   (rmesa->tcl.aos[i].stride << 8) |
-+		   (rmesa->tcl.aos[i + 1].components << 16) |
-+		   (rmesa->tcl.aos[i + 1].stride << 24));
++	 OUT_BATCH((rmesa->radeon.tcl.aos[i].components << 0) |
++		   (rmesa->radeon.tcl.aos[i].stride << 8) |
++		   (rmesa->radeon.tcl.aos[i + 1].components << 16) |
++		   (rmesa->radeon.tcl.aos[i + 1].stride << 24));
 +	 
-+	 voffset =  rmesa->tcl.aos[i + 0].offset +
-+	    offset * 4 * rmesa->tcl.aos[i + 0].stride;
++	 voffset =  rmesa->radeon.tcl.aos[i + 0].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[i + 0].stride;
 +	 OUT_BATCH(voffset);
-+	 voffset =  rmesa->tcl.aos[i + 1].offset +
-+	    offset * 4 * rmesa->tcl.aos[i + 1].stride;
++	 voffset =  rmesa->radeon.tcl.aos[i + 1].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[i + 1].stride;
 +	 OUT_BATCH(voffset);
 +      }
 +      
 +      if (nr & 1) {
-+	 OUT_BATCH((rmesa->tcl.aos[nr - 1].components << 0) |
-+		   (rmesa->tcl.aos[nr - 1].stride << 8));
-+	 voffset =  rmesa->tcl.aos[nr - 1].offset +
-+	    offset * 4 * rmesa->tcl.aos[nr - 1].stride;
++	 OUT_BATCH((rmesa->radeon.tcl.aos[nr - 1].components << 0) |
++		   (rmesa->radeon.tcl.aos[nr - 1].stride << 8));
++	 voffset =  rmesa->radeon.tcl.aos[nr - 1].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[nr - 1].stride;
 +	 OUT_BATCH(voffset);
 +      }
 +      for (i = 0; i + 1 < nr; i += 2) {
-+	 voffset =  rmesa->tcl.aos[i + 0].offset +
-+	    offset * 4 * rmesa->tcl.aos[i + 0].stride;
++	 voffset =  rmesa->radeon.tcl.aos[i + 0].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[i + 0].stride;
 +	 radeon_cs_write_reloc(rmesa->radeon.cmdbuf.cs,
-+			       rmesa->tcl.aos[i+0].bo,
++			       rmesa->radeon.tcl.aos[i+0].bo,
 +			       RADEON_GEM_DOMAIN_GTT,
 +			       0, 0);
-+	 voffset =  rmesa->tcl.aos[i + 1].offset +
-+	    offset * 4 * rmesa->tcl.aos[i + 1].stride;
++	 voffset =  rmesa->radeon.tcl.aos[i + 1].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[i + 1].stride;
 +	 radeon_cs_write_reloc(rmesa->radeon.cmdbuf.cs,
-+			       rmesa->tcl.aos[i+1].bo,
++			       rmesa->radeon.tcl.aos[i+1].bo,
 +			       RADEON_GEM_DOMAIN_GTT,
 +			       0, 0);
 +      }
 +      if (nr & 1) {
-+	 voffset =  rmesa->tcl.aos[nr - 1].offset +
-+	    offset * 4 * rmesa->tcl.aos[nr - 1].stride;
++	 voffset =  rmesa->radeon.tcl.aos[nr - 1].offset +
++	    offset * 4 * rmesa->radeon.tcl.aos[nr - 1].stride;
 +	 radeon_cs_write_reloc(rmesa->radeon.cmdbuf.cs,
-+			       rmesa->tcl.aos[nr-1].bo,
++			       rmesa->radeon.tcl.aos[nr-1].bo,
 +			       RADEON_GEM_DOMAIN_GTT,
 +			       0, 0);
        }
@@ -732,7 +732,7 @@
 +   END_BATCH();
  }
 diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
-index c067515..564e168 100644
[...4610 lines suppressed...]
 @@ -42,6 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -33533,13 +33766,13 @@
 -   radeonEnsureCmdBufSpace(rmesa, AOS_BUFSZ(rmesa->tcl.nr_aos_components) +
 -			   rmesa->hw.max_state_size + ELTS_BUFSZ(nr));
 +      rcommonEnsureCmdBufSpace(&rmesa->radeon, rmesa->radeon.hw.max_state_size + ELTS_BUFSZ(nr) + 
-+			       AOS_BUFSZ(rmesa->tcl.nr_aos_components), __FUNCTION__);
++			       AOS_BUFSZ(rmesa->radeon.tcl.aos_count), __FUNCTION__);
  
 -   radeonEmitAOS( rmesa,
 -		rmesa->tcl.aos_components,
 -		rmesa->tcl.nr_aos_components, 0 );
 +      radeonEmitAOS( rmesa,
-+		     rmesa->tcl.nr_aos_components, 0 );
++		     rmesa->radeon.tcl.aos_count, 0 );
  
 -   return radeonAllocEltsOpenEnded( rmesa,
 -				    rmesa->tcl.vertex_format, 
@@ -33553,7 +33786,7 @@
  
  
  
-@@ -174,14 +173,14 @@ static void radeonEmitPrim( GLcontext *ctx,
+@@ -174,15 +173,15 @@ static void radeonEmitPrim( GLcontext *ctx,
  		       GLuint start, 
  		       GLuint count)	
  {
@@ -33564,14 +33797,16 @@
 -   radeonEnsureCmdBufSpace( rmesa, AOS_BUFSZ(rmesa->tcl.nr_aos_components) +
 -			    rmesa->hw.max_state_size + VBUF_BUFSZ );
 +   rcommonEnsureCmdBufSpace( &rmesa->radeon,
-+			     AOS_BUFSZ(rmesa->tcl.nr_aos_components) +
++			     AOS_BUFSZ(rmesa->radeon.tcl.aos_count) +
 +			     rmesa->radeon.hw.max_state_size + VBUF_BUFSZ, __FUNCTION__ );
  
     radeonEmitAOS( rmesa,
 -		  rmesa->tcl.aos_components,
- 		  rmesa->tcl.nr_aos_components,
+-		  rmesa->tcl.nr_aos_components,
++		  rmesa->radeon.tcl.aos_count,
  		  start );
     
+    /* Why couldn't this packet have taken an offset param?
 @@ -254,7 +253,7 @@ void radeonTclPrimitive( GLcontext *ctx,
  			 GLenum prim,
  			 int hw_prim )
@@ -33664,7 +33899,7 @@
  	 if (RADEON_DEBUG & DEBUG_FALLBACKS) 
  	    fprintf(stderr, "Radeon end tcl fallback %s\n",
 diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c
-index b0aec21..2dfb504 100644
+index b0aec21..21509c6 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c
 @@ -44,6 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -34232,7 +34467,7 @@
     GLuint unit = ctx->Texture.CurrentUnit;
     rmesa->recheck_texgen[unit] = GL_TRUE;
  }
-@@ -846,17 +424,27 @@ static void radeonTexGen( GLcontext *ctx,
+@@ -846,29 +424,40 @@ static void radeonTexGen( GLcontext *ctx,
  static struct gl_texture_object *
  radeonNewTextureObject( GLcontext *ctx, GLuint name, GLenum target )
  {
@@ -34267,8 +34502,9 @@
 +
  void radeonInitTextureFuncs( struct dd_function_table *functions )
  {
-    functions->ChooseTextureFormat	= radeonChooseTextureFormat;
-@@ -864,11 +452,12 @@ void radeonInitTextureFuncs( struct dd_function_table *functions )
+-   functions->ChooseTextureFormat	= radeonChooseTextureFormat;
++   functions->ChooseTextureFormat	= radeonChooseTextureFormat_mesa;
+    functions->TexImage1D		= radeonTexImage1D;
     functions->TexImage2D		= radeonTexImage2D;
     functions->TexSubImage1D		= radeonTexSubImage1D;
     functions->TexSubImage2D		= radeonTexSubImage2D;
@@ -34730,7 +34966,7 @@
 -   return 0;
 -}
 diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
-index b165205..dab0df0 100644
+index b165205..e4df337 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
 @@ -39,10 +39,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -35129,7 +35365,7 @@
 +	texImage->RowStride = rb->pitch / rb->cpp;
 +	texImage->TexFormat = radeonChooseTextureFormat(radeon->glCtx,
 +							internalFormat,
-+							type, format);
++							type, format, 0);
 +	rImage->bo = rb->bo;
 +	radeon_bo_ref(rImage->bo);
 +	t->bo = rb->bo;
@@ -35706,10 +35942,10 @@
  }
 diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
 new file mode 100644
-index 0000000..21529f6
+index 0000000..35ed542
 --- /dev/null
 +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
-@@ -0,0 +1,987 @@
+@@ -0,0 +1,996 @@
 +/*
 + * Copyright (C) 2008 Nicolai Haehnle.
 + * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
@@ -35969,13 +36205,13 @@
 +/* try to find a format which will only need a memcopy */
 +static const struct gl_texture_format *radeonChoose8888TexFormat(radeonContextPtr rmesa,
 +								 GLenum srcFormat,
-+								 GLenum srcType)
++								 GLenum srcType, GLboolean fbo)
 +{
 +	const GLuint ui = 1;
 +	const GLubyte littleEndian = *((const GLubyte *)&ui);
 +
 +	/* r100 can only do this */
-+	if (IS_R100_CLASS(rmesa->radeonScreen))
++	if (IS_R100_CLASS(rmesa->radeonScreen) || fbo)
 +	  return _dri_texformat_argb8888;
 +
 +	if ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8) ||
@@ -36000,11 +36236,20 @@
 +		return _dri_texformat_argb8888;
 +}
 +
-+const struct gl_texture_format *radeonChooseTextureFormat(GLcontext * ctx,
++const struct gl_texture_format *radeonChooseTextureFormat_mesa(GLcontext * ctx,
 +							  GLint internalFormat,
 +							  GLenum format,
 +							  GLenum type)
 +{
++	return radeonChooseTextureFormat(ctx, internalFormat, format,
++					 type, 0);
++}
++
++const struct gl_texture_format *radeonChooseTextureFormat(GLcontext * ctx,
++							  GLint internalFormat,
++							  GLenum format,
++							  GLenum type, GLboolean fbo)
++{
 +	radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
 +	const GLboolean do32bpt =
 +	    (rmesa->texture_depth == DRI_CONF_TEXTURE_DEPTH_32);
@@ -36035,7 +36280,7 @@
 +		case GL_UNSIGNED_SHORT_1_5_5_5_REV:
 +			return _dri_texformat_argb1555;
 +		default:
-+			return do32bpt ? radeonChoose8888TexFormat(rmesa, format, type) :
++			return do32bpt ? radeonChoose8888TexFormat(rmesa, format, type, fbo) :
 +			    _dri_texformat_argb4444;
 +		}
 +
@@ -36062,7 +36307,7 @@
 +	case GL_RGBA12:
 +	case GL_RGBA16:
 +		return !force16bpt ?
-+			radeonChoose8888TexFormat(rmesa, format,type) :
++			radeonChoose8888TexFormat(rmesa, format, type, fbo) :
 +			_dri_texformat_argb4444;
 +
 +	case GL_RGBA4:
@@ -36222,7 +36467,7 @@
 +	}
 +
 +	/* Choose and fill in the texture format for this image */
-+	texImage->TexFormat = radeonChooseTextureFormat(ctx, internalFormat, format, type);
++	texImage->TexFormat = radeonChooseTextureFormat(ctx, internalFormat, format, type, 0);
 +	_mesa_set_fetch_functions(texImage, dims);
 +
 +	if (texImage->TexFormat->TexelBytes == 0) {
@@ -36699,10 +36944,10 @@
 +}
 diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.h b/src/mesa/drivers/dri/radeon/radeon_texture.h
 new file mode 100644
-index 0000000..d90fda7
+index 0000000..888a55b
 --- /dev/null
 +++ b/src/mesa/drivers/dri/radeon/radeon_texture.h
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,122 @@
 +/*
 + * Copyright (C) 2008 Nicolai Haehnle.
 + * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
@@ -36745,10 +36990,14 @@
 +void radeonGenerateMipmap(GLcontext* ctx, GLenum target, struct gl_texture_object *texObj);
 +int radeon_validate_texture_miptree(GLcontext * ctx, struct gl_texture_object *texObj);
 +GLuint radeon_face_for_target(GLenum target);
-+const struct gl_texture_format *radeonChooseTextureFormat(GLcontext * ctx,
++const struct gl_texture_format *radeonChooseTextureFormat_mesa(GLcontext * ctx,
 +							  GLint internalFormat,
 +							  GLenum format,
 +							  GLenum type);
++const struct gl_texture_format *radeonChooseTextureFormat(GLcontext * ctx,
++							  GLint internalFormat,
++							  GLenum format,
++							  GLenum type, GLboolean fbo);
 +
 +void radeonTexImage1D(GLcontext * ctx, GLenum target, GLint level,
 +		      GLint internalFormat,


--- radeon-fix-r100.patch DELETED ---



From than at fedoraproject.org  Mon Apr  6 11:01:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  6 Apr 2009 11:01:57 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.2.2-korganizer-crash.patch, NONE,
	1.1 kdepim.spec, 1.213, 1.214
Message-ID: <20090406110157.417F1700FB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6069

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.2.2-korganizer-crash.patch 
Log Message:
- apply upstream patch to fix crash in korganizer


kdepim-4.2.2-korganizer-crash.patch:

--- NEW FILE kdepim-4.2.2-korganizer-crash.patch ---
Index: korganizer/incidencechanger.cpp
===================================================================
--- korganizer/incidencechanger.cpp	(Revision 949917)
+++ korganizer/incidencechanger.cpp	(Revision 949918)
@@ -363,7 +363,7 @@
     // widgets sooner or later
     stdcal->setDialogParentWidget( tmpparent );
   }
-  if ( !success ) {
+  if ( !success && stdcal ) {
     // We can have a failure if the user pressed [cancel] in the resource
     // selectdialog, so check the exception.
     ErrorFormat *e = stdcal->exception();


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- kdepim.spec	1 Apr 2009 19:13:37 -0000	1.213
+++ kdepim.spec	6 Apr 2009 11:01:26 -0000	1.214
@@ -6,13 +6,15 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# 4.2 upstream patches
+Patch100: kdepim-4.2.2-korganizer-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,7 +91,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-
+%patch100 -p0 -b .crash
 
 %build
 mkdir -p %{_target_platform}
@@ -186,6 +188,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- apply upstream patch to fix crash in korganizer
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 



From than at fedoraproject.org  Mon Apr  6 11:12:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  6 Apr 2009 11:12:53 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.2.2-korganizer-crash.patch, NONE,
	1.1 kdepim.spec, 1.208, 1.209 kdepim-4.2.1-imap.patch, 1.1,
	NONE kdepim-4.2.1-korganizer_view.patch, 1.1, NONE
Message-ID: <20090406111254.141D3700FB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8710

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.2.2-korganizer-crash.patch 
Removed Files:
	kdepim-4.2.1-imap.patch kdepim-4.2.1-korganizer_view.patch 
Log Message:
apply upstream patch to fix crash in korganizer


kdepim-4.2.2-korganizer-crash.patch:

--- NEW FILE kdepim-4.2.2-korganizer-crash.patch ---
Index: korganizer/incidencechanger.cpp
===================================================================
--- korganizer/incidencechanger.cpp	(Revision 949917)
+++ korganizer/incidencechanger.cpp	(Revision 949918)
@@ -363,7 +363,7 @@
     // widgets sooner or later
     stdcal->setDialogParentWidget( tmpparent );
   }
-  if ( !success ) {
+  if ( !success && stdcal ) {
     // We can have a failure if the user pressed [cancel] in the resource
     // selectdialog, so check the exception.
     ErrorFormat *e = stdcal->exception();


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- kdepim.spec	2 Apr 2009 15:10:25 -0000	1.208
+++ kdepim.spec	6 Apr 2009 11:12:22 -0000	1.209
@@ -6,13 +6,15 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# 4.2 upstream patches
+Patch100: kdepim-4.2.2-korganizer-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,7 +91,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-
+%patch100 -p0 -b .crash
 
 %build
 mkdir -p %{_target_platform}
@@ -186,6 +188,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- apply upstream patch to fix crash in korganizer
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 


--- kdepim-4.2.1-imap.patch DELETED ---


--- kdepim-4.2.1-korganizer_view.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr  6 11:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 11:15:36 +0000
Subject: [pkgdb] NetworkManager-vpnc (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20090406111536.5B5CF208553@bastion.fedora.phx.redhat.com>

huzaifas changed owner of NetworkManager-vpnc in Fedora EPEL 5 to huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From lkundrak at fedoraproject.org  Mon Apr  6 11:22:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  6 Apr 2009 11:22:12 +0000 (UTC)
Subject: rpms/perl-TAP-Harness/EL-5 perl-TAP-Harness.spec,1.2,1.3
Message-ID: <20090406112212.8BBA1700FB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10889

Modified Files:
	perl-TAP-Harness.spec 
Log Message:
* Mon Apr  6 2009 Daniel P. Berrange <berrange at redhat.com> - 3.16-1
- Rebase to 3.16 release
- Include App::Prove modules & man pages
- Include 'prove' command, renamed to 'prove-tap' to avoid clash with base Perl



Index: perl-TAP-Harness.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness/EL-5/perl-TAP-Harness.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-TAP-Harness.spec	20 Jul 2008 14:01:06 -0000	1.2
+++ perl-TAP-Harness.spec	6 Apr 2009 11:21:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness
-Version:        3.10
-Release:        2%{?dist}
+Version:        3.16
+Release:        1%{?dist}
 Summary:        Run Perl standard test scripts with statistics
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -31,6 +31,10 @@
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
+# Avoid clash with RHEL5 'prove' command
+mv $RPM_BUILD_ROOT%{_bindir}/prove $RPM_BUILD_ROOT%{_bindir}/prove-tap
+mv $RPM_BUILD_ROOT%{_mandir}/man1/prove.1 $RPM_BUILD_ROOT%{_mandir}/man1/prove-tap.1
+
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
@@ -47,17 +51,19 @@
 %doc Changes Changes-2.64 README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
+%{_mandir}/man1/*
+%{_bindir}/prove-tap
 # These do conflict with Test::Harness that is part of perl
 %exclude %{perl_vendorlib}/Test
 %exclude %{_mandir}/man3/Test::Harness*
-%exclude %{_mandir}/man1/prove*
-%exclude %{_bindir}
-# App::Prove is kind of useless when we don't ship prove included
-# in this package
-%exclude %{perl_vendorlib}/App
 %exclude %{_mandir}/man3/App::Prove*
 
 %changelog
+* Mon Apr  6 2009 Daniel P. Berrange <berrange at redhat.com> - 3.16-1
+- Rebase to 3.16 release
+- Include App::Prove modules & man pages
+- Include 'prove' command, renamed to 'prove-tap' to avoid clash with base Perl
+
 * Sun Jul 20 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 3.10-2
 - Do not omit the manual
 



From lkundrak at fedoraproject.org  Mon Apr  6 11:25:08 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  6 Apr 2009 11:25:08 +0000 (UTC)
Subject: rpms/perl-TAP-Harness/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090406112508.6D7B4700FB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11601

Modified Files:
	.cvsignore sources 
Log Message:
Update sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2008 17:17:57 -0000	1.2
+++ .cvsignore	6 Apr 2009 11:24:37 -0000	1.3
@@ -1 +1 @@
-Test-Harness-3.10.tar.gz
+Test-Harness-3.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2008 17:17:57 -0000	1.2
+++ sources	6 Apr 2009 11:24:37 -0000	1.3
@@ -1 +1 @@
-69b6f90a01448583f0f9bf484daceed8  Test-Harness-3.10.tar.gz
+cd2f3b018767ae9e61d09b23845cb68a  Test-Harness-3.16.tar.gz



From sdz at fedoraproject.org  Mon Apr  6 11:37:04 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Mon,  6 Apr 2009 11:37:04 +0000 (UTC)
Subject: rpms/sugar-jukebox/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sugar-jukebox.spec, 1.5, 1.6
Message-ID: <20090406113704.D5F1A700FB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-jukebox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32508

Modified Files:
	.cvsignore sources sugar-jukebox.spec 
Log Message:
update to version 8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2009 15:35:27 -0000	1.4
+++ .cvsignore	6 Apr 2009 11:36:34 -0000	1.5
@@ -1 +1 @@
-Jukebox-7.tar.bz2
+Jukebox-8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2009 15:35:27 -0000	1.4
+++ sources	6 Apr 2009 11:36:34 -0000	1.5
@@ -1 +1 @@
-9a9a3c534d2e11913da5ed6a13d4d27b  Jukebox-7.tar.bz2
+4f2a372c566f677c866c6dce7d15951d  Jukebox-8.tar.bz2


Index: sugar-jukebox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/sugar-jukebox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sugar-jukebox.spec	4 Mar 2009 15:35:27 -0000	1.5
+++ sugar-jukebox.spec	6 Apr 2009 11:36:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		sugar-jukebox
-Version:	7
+Version:	8
 Release:	1%{?dist}
 Summary:	Media player activity for Sugar
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Sebastian Dziallas <sebastian at when.com> - 8-1
+- update to version 8
+
 * Wed Mar 04 2009 Sebastian Dziallas <sebastian at when.com> - 7-1
 - update to version 7
 



From sdz at fedoraproject.org  Mon Apr  6 11:37:11 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Mon,  6 Apr 2009 11:37:11 +0000 (UTC)
Subject: rpms/sugar-jukebox/F-10 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sugar-jukebox.spec, 1.3, 1.4
Message-ID: <20090406113711.D82A7700FB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-jukebox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32537

Modified Files:
	.cvsignore sources sugar-jukebox.spec 
Log Message:
update to version 8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2009 15:38:05 -0000	1.4
+++ .cvsignore	6 Apr 2009 11:36:41 -0000	1.5
@@ -1 +1 @@
-Jukebox-7.tar.bz2
+Jukebox-8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2009 15:38:05 -0000	1.4
+++ sources	6 Apr 2009 11:36:41 -0000	1.5
@@ -1 +1 @@
-9a9a3c534d2e11913da5ed6a13d4d27b  Jukebox-7.tar.bz2
+4f2a372c566f677c866c6dce7d15951d  Jukebox-8.tar.bz2


Index: sugar-jukebox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/F-10/sugar-jukebox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sugar-jukebox.spec	4 Mar 2009 15:38:05 -0000	1.3
+++ sugar-jukebox.spec	6 Apr 2009 11:36:41 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		sugar-jukebox
-Version:	7
+Version:	8
 Release:	1%{?dist}
 Summary:	Media player activity for Sugar
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Sebastian Dziallas <sebastian at when.com> - 8-1
+- update to version 8
+
 * Wed Mar 04 2009 Sebastian Dziallas <sebastian at when.com> - 7-1
 - update to version 7
 



From pkgdb at fedoraproject.org  Mon Apr  6 12:42:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 12:42:06 +0000
Subject: [pkgdb] gajim: michich has requested watchcommits
Message-ID: <20090406124144.F2A30208555@bastion.fedora.phx.redhat.com>

michich has requested the watchcommits acl on gajim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gajim



From pkgdb at fedoraproject.org  Mon Apr  6 12:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 12:41:45 +0000
Subject: [pkgdb] gajim: michich has requested watchbugzilla
Message-ID: <20090406124145.DC896208602@bastion.fedora.phx.redhat.com>

michich has requested the watchbugzilla acl on gajim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gajim



From tbzatek at fedoraproject.org  Mon Apr  6 12:42:42 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  6 Apr 2009 12:42:42 +0000 (UTC)
Subject: rpms/nautilus/F-10 nautilus-2.26.1-dnd-not-recurse.patch, NONE,
	1.1 nautilus.spec, 1.236, 1.237
Message-ID: <20090406124242.3C740700FB@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14957

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.26.1-dnd-not-recurse.patch 
Log Message:
* Mon Apr  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
- Fix dragging files via NFS moves instead of copy (#456515)


nautilus-2.26.1-dnd-not-recurse.patch:

--- NEW FILE nautilus-2.26.1-dnd-not-recurse.patch ---
diff -up nautilus-2.24.2/libnautilus-private/nautilus-dnd.c.dnd-recurse nautilus-2.24.2/libnautilus-private/nautilus-dnd.c
--- nautilus-2.24.2/libnautilus-private/nautilus-dnd.c.dnd-recurse	2008-10-06 19:22:21.000000000 +0200
+++ nautilus-2.24.2/libnautilus-private/nautilus-dnd.c	2009-04-06 13:44:43.000000000 +0200
@@ -419,7 +419,7 @@ nautilus_drag_default_drop_action_for_ic
 	gboolean same_fs;
 	gboolean target_is_source_parent;
 	const char *dropped_uri;
-	GFile *target, *dropped;
+	GFile *target, *dropped, *dropped_directory;
 	GdkDragAction actions;
 	NautilusFile *dropped_file, *target_file;
 
@@ -501,7 +501,16 @@ nautilus_drag_default_drop_action_for_ic
 	
 	/* Compare the first dropped uri with the target uri for same fs match. */
 	dropped = g_file_new_for_uri (dropped_uri);
-	target_is_source_parent = g_file_has_prefix (dropped, target);
+	dropped_directory = g_file_get_parent (dropped);
+	target_is_source_parent = FALSE;
+	if (dropped_directory != NULL) {
+		/* If the dropped file is already in the same directory but
+		   is in another filesystem we still want to move, not copy
+		   as this is then just a move of a mountpoint to another
+		   position in the dir */
+		target_is_source_parent = g_file_equal (dropped_directory, target);
+		g_object_unref (dropped_directory);
+	}
 	
 	if (same_fs || target_is_source_parent ||
 	    g_file_has_uri_scheme (dropped, "trash")) {


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-10/nautilus.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- nautilus.spec	5 Dec 2008 14:19:37 -0000	1.236
+++ nautilus.spec	6 Apr 2009 12:42:11 -0000	1.237
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.24.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
@@ -102,6 +102,10 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=524485 
 Patch18:        nautilus_new_windows_after_mount.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=456515
+# Dragging Files via NFS share moves instead of copy
+Patch19:	nautilus-2.26.1-dnd-not-recurse.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -141,6 +145,7 @@
 %patch15 -p0 -b .xds
 %patch17 -p0 -b .symlink
 %patch18 -p0 -b .new-windows
+%patch19 -p1 -b .dnd-recurse
 
 %build
 
@@ -269,6 +274,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
+- Fix dragging files via NFS moves instead of copy (#456515)
+
 * Fri Dec  5 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-2
 - Properly open new windows after long mount operation
 



From ruben at fedoraproject.org  Mon Apr  6 12:57:00 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon,  6 Apr 2009 12:57:00 +0000 (UTC)
Subject: rpms/Ajaxterm/devel Ajaxterm-init.patch, 1.1, 1.2 Ajaxterm.spec, 1.3,
	1.4
Message-ID: <20090406125700.DFD7C700FB@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Ajaxterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18309

Modified Files:
	Ajaxterm-init.patch Ajaxterm.spec 
Log Message:
* Mon Apr 06 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
- Fix ajaxterm homedir
- Add status command to init script


Ajaxterm-init.patch:

Index: Ajaxterm-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/devel/Ajaxterm-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm-init.patch	22 Nov 2008 13:07:06 -0000	1.1
+++ Ajaxterm-init.patch	6 Apr 2009 12:57:00 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat
---- Ajaxterm-0.10/configure.initd.redhat.orig	2008-11-22 13:45:35.000000000 +0100
-+++ Ajaxterm-0.10/configure.initd.redhat	2008-11-22 13:46:38.000000000 +0100
+--- Ajaxterm-0.10/configure.initd.redhat.orig	2006-10-29 03:52:39.000000000 +0100
++++ Ajaxterm-0.10/configure.initd.redhat	2009-04-06 14:51:15.000000000 +0200
 @@ -1,8 +1,8 @@
 -#
 +#!/bin/bash
@@ -45,3 +45,12 @@
          RETVAL=$?
          ;;
      restart)
+@@ -68,7 +68,7 @@ case "$1" in
+         fi
+         ;;
+     *)
+-    echo $"Usage: $prog {start|stop|restart|condrestart}"
++    echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+     exit 1
+ esac
+ 


Index: Ajaxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/devel/Ajaxterm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ajaxterm.spec	23 Feb 2009 19:59:31 -0000	1.3
+++ Ajaxterm.spec	6 Apr 2009 12:57:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           Ajaxterm
 Version:        0.10
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A web-based terminal
 
 Group:          Development/Languages
@@ -55,7 +55,7 @@
 %pre
 getent group ajaxterm >/dev/null || groupadd -r ajaxterm
 getent passwd ajaxterm >/dev/null || \
-useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \
+useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \
 -c "Ajaxterm user" ajaxterm
 exit 0
 
@@ -85,6 +85,10 @@
 
 
 %changelog
+* Mon Apr 06 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
+- Fix ajaxterm homedir
+- Add status command to init script
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -95,7 +99,6 @@
 - set LANG=C in initscript, Ajaxterm doesn't support UTF-8
 - One last spec cleanup
 
-
 * Sun Nov 09 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-4
 - More review fixes (#470508)
 



From tbzatek at fedoraproject.org  Mon Apr  6 13:09:24 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  6 Apr 2009 13:09:24 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-2.26.1-dnd-not-recurse.patch, NONE,
	1.1 nautilus.spec, 1.268, 1.269
Message-ID: <20090406130924.F0886700FB@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21896

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.26.1-dnd-not-recurse.patch 
Log Message:
* Mon Apr  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.1-2
- Fix dragging files via NFS moves instead of copy (#456515)


nautilus-2.26.1-dnd-not-recurse.patch:

--- NEW FILE nautilus-2.26.1-dnd-not-recurse.patch ---
Index: libnautilus-private/nautilus-dnd.c
===================================================================
--- libnautilus-private/nautilus-dnd.c	(revision 15162)
+++ libnautilus-private/nautilus-dnd.c	(revision 15163)
@@ -437,7 +437,7 @@
 	gboolean target_is_source_parent;
 	gboolean source_deletable;
 	const char *dropped_uri;
-	GFile *target, *dropped;
+	GFile *target, *dropped, *dropped_directory;
 	GdkDragAction actions;
 	NautilusFile *dropped_file, *target_file;
 
@@ -519,7 +519,16 @@
 	
 	/* Compare the first dropped uri with the target uri for same fs match. */
 	dropped = g_file_new_for_uri (dropped_uri);
-	target_is_source_parent = g_file_has_prefix (dropped, target);
+	dropped_directory = g_file_get_parent (dropped);
+	target_is_source_parent = FALSE;
+	if (dropped_directory != NULL) {
+		/* If the dropped file is already in the same directory but
+		   is in another filesystem we still want to move, not copy
+		   as this is then just a move of a mountpoint to another
+		   position in the dir */
+		target_is_source_parent = g_file_equal (dropped_directory, target);
+		g_object_unref (dropped_directory);
+	}
 	source_deletable = source_is_deletable (dropped);
 
 	if ((same_fs && source_deletable) || target_is_source_parent ||


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- nautilus.spec	3 Apr 2009 03:03:38 -0000	1.268
+++ nautilus.spec	6 Apr 2009 13:08:54 -0000	1.269
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -87,6 +87,10 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=456515
+# Dragging Files via NFS share moves instead of copy
+Patch18:	nautilus-2.26.1-dnd-not-recurse.patch
+
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -125,6 +129,7 @@
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p0 -b .dnd-recurse
 
 %build
 
@@ -262,6 +267,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.1-2
+- Fix dragging files via NFS moves instead of copy (#456515)
+
 * Thu Apr  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 



From robmv at fedoraproject.org  Mon Apr  6 13:23:01 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Mon,  6 Apr 2009 13:23:01 +0000 (UTC)
Subject: rpms/eclipse-subclipse/F-10
	eclipse-subclipse-1.4.7-dependencies.patch, NONE,
	1.1 subclipse-fetch-1.4.7.sh, NONE, 1.1 .cvsignore, 1.6,
	1.7 eclipse-subclipse.spec, 1.24, 1.25 sources, 1.6,
	1.7 eclipse-subclipse-1.2.2-default-svnkit.patch, 1.1,
	NONE eclipse-subclipse-1.2.4-plugin-classpath.patch, 1.1,
	NONE subclipse-fetch-1.2.4.sh, 1.1, NONE
Message-ID: <20090406132301.08E56700FB@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25126

Modified Files:
	.cvsignore eclipse-subclipse.spec sources 
Added Files:
	eclipse-subclipse-1.4.7-dependencies.patch 
	subclipse-fetch-1.4.7.sh 
Removed Files:
	eclipse-subclipse-1.2.2-default-svnkit.patch 
	eclipse-subclipse-1.2.4-plugin-classpath.patch 
	subclipse-fetch-1.2.4.sh 
Log Message:
Update to upstream 1.4.7


eclipse-subclipse-1.4.7-dependencies.patch:

--- NEW FILE eclipse-subclipse-1.4.7-dependencies.patch ---
diff -Naur subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/build.properties subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/build.properties
--- subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/build.properties	2009-02-24 20:14:44.000000000 -0430
+++ subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/build.properties	2009-02-24 21:29:54.000000000 -0430
@@ -1,5 +1,5 @@
-source.. = src/
-output.. = bin/
+source.clientadapter-javahl.jar = src/
+output.clientadapter-javahl.jar = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
@@ -7,4 +7,5 @@
                about.ini,\
                about.properties,\
                epl-v10.html,\
-               svn.gif
+               svn.gif,\
+               svn-javahl.jar
diff -Naur subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
--- subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-24 20:14:44.000000000 -0430
+++ subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-24 21:35:03.000000000 -0430
@@ -8,6 +8,9 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.tigris.subversion.clientadapter;bundle-version="[1.5.1,1.6.0)"
 Eclipse-LazyStart: true
+Bundle-ClassPath: clientadapter-javahl.jar,
+ svn-javahl.jar,
+ .
 Export-Package: org.tigris.subversion.javahl,
  org.tigris.subversion.svnclientadapter.javahl
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Naur subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl.feature/feature.xml
--- subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-24 20:14:44.000000000 -0430
+++ subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-24 21:16:55.000000000 -0430
@@ -33,14 +33,14 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="true"/>
 
-   <plugin
+<!--   <plugin
          id="org.tigris.subversion.clientadapter.javahl.win32"
          os="win32"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"/>
+         fragment="true"/>-->
 
 </feature>


--- NEW FILE subclipse-fetch-1.4.7.sh ---
#!/bin/sh
VERSION=1.4.7
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win32
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Sep 2007 15:18:16 -0000	1.6
+++ .cvsignore	6 Apr 2009 13:22:30 -0000	1.7
@@ -1 +1 @@
-subclipse-1.2.4.tgz
+subclipse-1.4.7.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-10/eclipse-subclipse.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- eclipse-subclipse.spec	13 Oct 2008 14:56:28 -0000	1.24
+++ eclipse-subclipse.spec	6 Apr 2009 13:22:30 -0000	1.25
@@ -1,194 +1,136 @@
-%define gcj_support     0
+%define eclipse_name       eclipse
+%define eclipse_base       %{_libdir}/%{eclipse_name}
+%define install_loc        %{_datadir}/eclipse/dropins
+%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.5.4.1
 
-%define eclipse_name    eclipse
-%define eclipse_base    %{_libdir}/%{eclipse_name}
-%define install_loc     %{_datadir}/eclipse/dropins
-%define core_plugin_jar %{install_loc}/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}.jar
-%define core_plugin_dir %{install_loc}/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}
-
-%define disable_javahl  0
-%if 0%{?fedora} == 6
-%define disable_javahl  1
-%endif
-%if 0%{?rhel} == 5
-%define disable_javahl  1
-%endif
-
-%define javahl_dir      %{_libdir}/svn-javahl
-%if 0%{?fedora} >= 8
-%define javahl_dir      %{_javadir}
-%endif
 
 Name:           eclipse-subclipse
-Version:        1.2.4
-Release:        12%{?dist}
+Version:        1.4.7
+Release:        3%{?dist}
 Summary:        Subversion Eclipse plugin
 
-Group:          Text Editors/Integrated Development Environments (IDE)
-License:        EPL
+Group:          Development/Tools
+License:        EPL and CC-BY
 URL:            http://subclipse.tigris.org/
 Source0:        subclipse-%{version}.tgz
 # Script to fetch the source code
-# the new source tarball does not includes the book feature and the layout is
-# different than the source repository
-Source10:       subclipse-fetch-1.2.4.sh
-# Disable javahl support temporaly until apparent classloader problem is fixed
-Patch0:         eclipse-subclipse-1.2.2-default-svnkit.patch
-Patch1:         eclipse-subclipse-1.2.4-plugin-classpath.patch
+Source10:       subclipse-fetch-%{version}.sh
+Patch0:         eclipse-subclipse-1.4.7-dependencies.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:              noarch
+
 BuildRequires:          ant
 BuildRequires:          jpackage-utils >= 0:1.6
 BuildRequires:          coreutils
 BuildRequires:          eclipse-pde
-%if %{gcj_support}
-BuildRequires:          gcc-java >= 4.0.2
-BuildRequires:          java-gcj-compat-devel >= 1.0.33
-Requires(post):         java-gcj-compat >= 1.0.33
-Requires(postun):       java-gcj-compat >= 1.0.33
-%else
-BuildRequires:          java-devel >= 1.4.2
-%endif
-
-%if %{gcj_support}
-%else
-BuildArch:              noarch
-%endif
-
+BuildRequires:          eclipse-gef
 Requires:               eclipse-platform
 
-BuildRequires:          subversion-javahl >= 1.3.1
-Requires:               subversion-javahl >= 1.3.1
-BuildRequires:          svnkit >= 1.1.2
-Requires:               svnkit >= 1.1.2
-BuildRequires:          ganymed-ssh2 >= 209
-Requires:               ganymed-ssh2 >= 209
-
-%package book
-Summary:        Subversion book
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
+BuildRequires:          eclipse-svnkit >= 1.2.2
+Requires:               eclipse-svnkit >= 1.2.2
+BuildRequires:          subversion-javahl >= 1.5
+Requires:               subversion-javahl >= 1.5
 
+Obsoletes:              eclipse-subclipse-book < 1.4
 
 %description
 Subclipse is an Eclipse plugin that adds Subversion integration to the Eclipse
 IDE.
 
-%description book
-The Subversion book as an Eclipse documentation plugin.
+%package graph
+Summary:        Subversion Revision Graph
+Group:          Development/Tools
+
+Requires:               %{name} = %{version}
+Requires:               eclipse-gef
+
+%description graph
+Subversion Revision Graph for Subclipse.
 
 
 %prep
 %setup -q -n subclipse-%{version}
-%if 0%{disable_javahl}
-%patch0 -p1 
-%endif
-%patch1 -p1 
-
-# delete the jars that are in the archive
-rm svnClientAdapter/lib/svnjavahl.jar
-ln -s %{javahl_dir}/svn-javahl.jar svnClientAdapter/lib/svnjavahl.jar
-rm -f svnClientAdapter/lib/svnkit.jar
-ln -s %{_javadir}/svnkit.jar svnClientAdapter/lib/svnkit.jar
-rm -f svnClientAdapter/lib/ganymed.jar
-ln -s %{_javadir}/ganymed-ssh2.jar svnClientAdapter/lib/ganymed.jar
-
-rm -f subclipse/core/lib/svnjavahl.jar
-ln -s %{javahl_dir}/svn-javahl.jar subclipse/core/lib/svnjavahl.jar
-rm -f subclipse/core/lib/svnClientAdapter.jar
-# svnClientAdapter.jar is copied after being built
-rm -f subclipse/core/lib/svnkit.jar
-ln -s %{_javadir}/svnkit.jar subclipse/core/lib/svnkit.jar
-rm -f subclipse/core/lib/ganymed.jar
-ln -s %{_javadir}/ganymed-ssh2.jar subclipse/core/lib/ganymed.jar
+%patch0 -p1
+
+# remove javahl sources
+rm -rf org.tigris.subversion.clientadapter.javahl/src/org/tigris/subversion/javahl
+ln -s %{_javadir}/svn-javahl.jar org.tigris.subversion.clientadapter.javahl
+
+# fixing wrong-file-end-of-line-encoding warnings
+sed -i 's/\r//' org.tigris.subversion.subclipse.graph/icons/readme.txt
 
 
 %build
-# ---------------------------------
-# building svnClientAdapter
-pushd svnClientAdapter
-%{ant} svnClientAdapter.jar
-popd
-
-# copying svnClientAdapter inside subclipse module
-cp svnClientAdapter/build/lib/svnClientAdapter.jar subclipse/core/lib/svnClientAdapter.jar
-
-# ---------------------------------
-# building subclipse
-pushd subclipse
-
-%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.subclipse
-%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.book
-
-# returning to base build directory
-popd
-
-# Link source files to fix -debuginfo generation.
-rm -rf subclipse/org
-mkdir -p subclipse/org/tigris/subversion
-ln -s $(pwd)/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter subclipse/org/tigris/subversion
-mkdir -p subclipse/org/tigris/subversion/subclipse
-ln -s $(pwd)/subclipse/core/src/org/tigris/subversion/subclipse/core subclipse/org/tigris/subversion/subclipse
-ln -s $(pwd)/subclipse/ui/src/org/tigris/subversion/subclipse/ui subclipse/org/tigris/subversion/subclipse
+%{eclipse_base}/buildscripts/pdebuild            \
+  -f org.tigris.subversion.clientadapter.feature \
+  -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild                   \
+  -f org.tigris.subversion.clientadapter.javahl.feature \
+  -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild                   \
+  -f org.tigris.subversion.clientadapter.svnkit.feature \
+  -o `pwd`/orbitDeps                                    \
+  -d svnkit
+%{eclipse_base}/buildscripts/pdebuild \
+  -f org.tigris.subversion.subclipse  \
+  -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild              \
+  -f org.tigris.subversion.subclipse.graph.feature \
+  -o `pwd`/orbitDeps                               \
+  -d gef
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
 
-installDir=$RPM_BUILD_ROOT%{install_loc}/subclipse
-install -d -m 755 $installDir
-install -d -m 755 ${installDir}-book
-pushd subclipse
-unzip -q -d $installDir build/rpmBuild/org.tigris.subversion.subclipse.zip
-unzip -q -d ${installDir}-book build/rpmBuild/org.tigris.subversion.book.zip
-popd
-
-# repacking core plugin as a directory based plugin, needed in order to replace some jars with symlinks
-mkdir $RPM_BUILD_ROOT%{core_plugin_dir}
-unzip -q -d $RPM_BUILD_ROOT%{core_plugin_dir} $RPM_BUILD_ROOT%{core_plugin_jar}
-rm $RPM_BUILD_ROOT%{core_plugin_jar}
-# packaging .class files as a jar file
-jar -cf $RPM_BUILD_ROOT%{core_plugin_dir}/lib/subclipse-core.jar -C $RPM_BUILD_ROOT%{core_plugin_dir} org
-rm -rf $RPM_BUILD_ROOT%{core_plugin_dir}/org
-
-# removing core plugin internal jars
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar
-
-%if %{gcj_support}
-  aot-compile-rpm
-%endif
-
-# We need to setup the symlink because the ant copy task doesn't preserve symlinks
-# TODO file a bug about this
-ln -s %{javahl_dir}/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
-ln -s %{_javadir}/svnkit.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar
-ln -s %{_javadir}/ganymed-ssh2.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar
+installBase=$RPM_BUILD_ROOT%{install_loc}
+install -d -m 755 $installBase
+
+# installing features
+install -d -m 755 $installBase/subclipse-clientadapter
+unzip -q -d $installBase/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
+install -d -m 755 $installBase/subclipse-clientadapter-javahl
+unzip -q -d $installBase/subclipse-clientadapter-javahl build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
+install -d -m 755 $installBase/subclipse-clientadapter-svnkit
+unzip -q -d $installBase/subclipse-clientadapter-svnkit build/rpmBuild/org.tigris.subversion.clientadapter.svnkit.feature.zip
+install -d -m 755 $installBase/subclipse
+unzip -q -d $installBase/subclipse build/rpmBuild/org.tigris.subversion.subclipse.zip
+install -d -m 755 $installBase/subclipse-graph
+unzip -q -d $installBase/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
+
+# replacing jar with links to system libraries
+rm $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}/svn-javahl.jar
+ln -s %{_javadir}/svn-javahl.jar $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
 
 %files
 %defattr(-,root,root)
 %{install_loc}/subclipse
-%doc svnClientAdapter/readme.txt svnClientAdapter/changelog.txt svnClientAdapter/license.txt 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{install_loc}/subclipse-clientadapter*
+%doc org.tigris.subversion.subclipse.graph/icons/readme.txt 
 
-%files book
+
+%files graph
 %defattr(-,root,root)
-%{install_loc}/subclipse-book
+%{install_loc}/subclipse-graph
+
 
 %changelog
+* Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-3
+- Update to upstream 1.4.7
+- eclipse-subclipse-book is obsoleted, not provided upstream
+- New eclipse-subclipse-graph subpackage
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 13 2008 Alexander Kurtakov <akurtako at redhat.com> - 1.2.4-12
 - Bump revision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Sep 2007 15:18:16 -0000	1.6
+++ sources	6 Apr 2009 13:22:30 -0000	1.7
@@ -1 +1 @@
-3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz
+c0faddf79339cf86b757a8679c7f592d  subclipse-1.4.7.tgz


--- eclipse-subclipse-1.2.2-default-svnkit.patch DELETED ---


--- eclipse-subclipse-1.2.4-plugin-classpath.patch DELETED ---


--- subclipse-fetch-1.2.4.sh DELETED ---



From ixs at fedoraproject.org  Mon Apr  6 13:27:56 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Mon,  6 Apr 2009 13:27:56 +0000 (UTC)
Subject: rpms/commoncpp2/devel .cvsignore, 1.6, 1.7 commoncpp2.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20090406132756.53D90700FB@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/commoncpp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26331

Modified Files:
	.cvsignore commoncpp2.spec sources 
Log Message:
* Mon Apr 06 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.3-1
- Updated to new upstream version 1.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Feb 2008 22:41:03 -0000	1.6
+++ .cvsignore	6 Apr 2009 13:27:25 -0000	1.7
@@ -1 +1 @@
-commoncpp2-1.6.1.tar.gz
+commoncpp2-1.7.3.tar.gz


Index: commoncpp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/devel/commoncpp2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- commoncpp2.spec	24 Feb 2009 08:27:46 -0000	1.8
+++ commoncpp2.spec	6 Apr 2009 13:27:25 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.6.1
-Release: 3%{?dist}
+Version: 1.7.3
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: System Environment/Libraries
-Source0: http://download.sourceforge.net/gnutelephony/commoncpp2-%{version}.tar.gz
+Source0: http://www.gnutelephony.org/dist/tarballs/commoncpp2-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel, zlib-devel, doxygen
@@ -78,6 +78,9 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
+* Mon Apr 06 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.3-1
+- Updated to new upstream version 1.7.3
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Feb 2008 22:41:03 -0000	1.6
+++ sources	6 Apr 2009 13:27:25 -0000	1.7
@@ -1 +1 @@
-2ebd8eb80996515be0385378da783091  commoncpp2-1.6.1.tar.gz
+ca741179a728d264eb276ae471ebaf70  commoncpp2-1.7.3.tar.gz



From hadess at fedoraproject.org  Mon Apr  6 13:31:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  6 Apr 2009 13:31:59 +0000 (UTC)
Subject: rpms/libgdata/devel import.log, NONE, 1.1 libgdata.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090406133159.E44B8700FB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27496/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libgdata.spec 
Log Message:
First commit



--- NEW FILE import.log ---
libgdata-0_1_1-2_fc10:HEAD:libgdata-0.1.1-2.fc10.src.rpm:1239024663


--- NEW FILE libgdata.spec ---
Name:           libgdata
Version:        0.1.1
Release:        2%{?dist}
Summary:        Library for the GData protocol

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://live.gnome.org/libgdata
Source0:        http://tecnocode.co.uk/downloads/libgdata-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel libsoup-devel libxml2-devel gtk-doc intltool

%description
libgdata is a GLib-based library for accessing online service APIs using the
GData protocol --- most notably, Google's services. It provides APIs to access
the common Google services, and has full asynchronous support.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       gtk-doc


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT

%check
# Only the general test can be run without network access
cd gdata/tests
./general

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.LIB NEWS README AUTHORS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/gtk-doc/html/gdata/

%changelog
* Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.1-2
- Add check, snippet from Jason Tibbitts

* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.1-1
- Update to 0.1.1

* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-1
- First package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:46:37 -0000	1.1
+++ .cvsignore	6 Apr 2009 13:31:29 -0000	1.2
@@ -0,0 +1 @@
+libgdata-0.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:46:37 -0000	1.1
+++ sources	6 Apr 2009 13:31:29 -0000	1.2
@@ -0,0 +1 @@
+b1bde0dfa104c6457c97d7e09b4d0e86  libgdata-0.1.1.tar.bz2



From ixs at fedoraproject.org  Mon Apr  6 13:32:48 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Mon,  6 Apr 2009 13:32:48 +0000 (UTC)
Subject: rpms/commoncpp2/devel commoncpp2-ldconfig.patch,1.1,NONE
Message-ID: <20090406133248.F11117013C@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/commoncpp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28504

Removed Files:
	commoncpp2-ldconfig.patch 
Log Message:
remove unneeded patch


--- commoncpp2-ldconfig.patch DELETED ---



From hadess at fedoraproject.org  Mon Apr  6 13:33:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  6 Apr 2009 13:33:43 +0000 (UTC)
Subject: rpms/libgdata/devel import.log,1.1,NONE
Message-ID: <20090406133343.1CB35700FB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28711

Removed Files:
	import.log 
Log Message:
Remove import.log



--- import.log DELETED ---



From hadess at fedoraproject.org  Mon Apr  6 13:36:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  6 Apr 2009 13:36:33 +0000 (UTC)
Subject: rpms/libgdata/F-11 libgdata.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090406133633.D10AD700FB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29646

Modified Files:
	.cvsignore sources 
Added Files:
	libgdata.spec 
Log Message:
First build



--- NEW FILE libgdata.spec ---
Name:           libgdata
Version:        0.1.1
Release:        2%{?dist}
Summary:        Library for the GData protocol

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://live.gnome.org/libgdata
Source0:        http://tecnocode.co.uk/downloads/libgdata-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel libsoup-devel libxml2-devel gtk-doc intltool

%description
libgdata is a GLib-based library for accessing online service APIs using the
GData protocol --- most notably, Google's services. It provides APIs to access
the common Google services, and has full asynchronous support.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       gtk-doc


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT

%check
# Only the general test can be run without network access
cd gdata/tests
./general

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.LIB NEWS README AUTHORS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/gtk-doc/html/gdata/

%changelog
* Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.1-2
- Add check, snippet from Jason Tibbitts

* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.1-1
- Update to 0.1.1

* Wed Apr 01 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-1
- First package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:46:37 -0000	1.1
+++ .cvsignore	6 Apr 2009 13:36:03 -0000	1.2
@@ -0,0 +1 @@
+libgdata-0.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:46:37 -0000	1.1
+++ sources	6 Apr 2009 13:36:03 -0000	1.2
@@ -0,0 +1 @@
+b1bde0dfa104c6457c97d7e09b4d0e86  libgdata-0.1.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr  6 13:39:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  6 Apr 2009 13:39:47 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec, 1.203, 1.204 glib-i386-atomic.patch,
	1.1, NONE glib2-CVE-2008-4316.patch, 1.1, NONE
Message-ID: <20090406133947.8A80C700FB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30448

Modified Files:
	glib2.spec 
Removed Files:
	glib-i386-atomic.patch glib2-CVE-2008-4316.patch 
Log Message:
drop obsolete patches



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- glib2.spec	13 Mar 2009 06:18:10 -0000	1.203
+++ glib2.spec	6 Apr 2009 13:39:17 -0000	1.204
@@ -19,8 +19,6 @@
 # for sys/inotify.h
 BuildRequires: glibc-devel
 
-Patch0: glib2-CVE-2008-4316.patch
-
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -52,7 +50,6 @@
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p0 -b .CVE-2008-4316
 
 %build
 %configure --disable-gtk-doc --enable-static


--- glib-i386-atomic.patch DELETED ---


--- glib2-CVE-2008-4316.patch DELETED ---



From tuxbrewr at fedoraproject.org  Mon Apr  6 13:41:05 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Mon,  6 Apr 2009 13:41:05 +0000 (UTC)
Subject: rpms/sugar-log/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sugar-log.spec, 1.4, 1.5
Message-ID: <20090406134105.24CE6700FB@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/sugar-log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30886

Modified Files:
	.cvsignore sources sugar-log.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Mar 2009 21:54:47 -0000	1.3
+++ .cvsignore	6 Apr 2009 13:40:34 -0000	1.4
@@ -1 +1 @@
-Log-17.tar.bz2
+Log-18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Mar 2009 21:54:47 -0000	1.3
+++ sources	6 Apr 2009 13:40:34 -0000	1.4
@@ -1 +1 @@
-546c0df9bcd75ea0100dc657c4124d57  Log-17.tar.bz2
+8e6351bbeb04e2c3fe9d9b9d273838c3  Log-18.tar.bz2


Index: sugar-log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-log/devel/sugar-log.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sugar-log.spec	3 Mar 2009 21:54:47 -0000	1.4
+++ sugar-log.spec	6 Apr 2009 13:40:34 -0000	1.5
@@ -1,5 +1,5 @@
 Name: sugar-log
-Version: 17
+Version: 18
 Release: 1%{?dist}
 Summary: Log activity for Sugar
 Group: Sugar/Activities
@@ -38,6 +38,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 18-1
+- New upstream release
+
 * Tue Mar 03 2009 Simon Schampijer <simon at schampijer.de> - 17-1
 - Rebuild for 0.84
 



From dwalsh at fedoraproject.org  Mon Apr  6 13:47:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  6 Apr 2009 13:47:07 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.128,1.129
Message-ID: <20090406134707.A72DE700FB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32189

Modified Files:
	setroubleshoot.spec 
Log Message:
* Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.9-1
- Change multiple signatures from exception to warning



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- setroubleshoot.spec	3 Apr 2009 20:27:40 -0000	1.128
+++ setroubleshoot.spec	6 Apr 2009 13:46:37 -0000	1.129
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.1.8
+Version: 2.1.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -194,6 +194,9 @@
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.9-1
+- Change multiple signatures from exception to warning
+
 * Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.8-1
 - Fix sealert segfault
 



From cassmodiah at fedoraproject.org  Mon Apr  6 13:53:13 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon,  6 Apr 2009 13:53:13 +0000 (UTC)
Subject: rpms/hosts3d/devel .cvsignore, 1.2, 1.3 hosts3d.spec, 1.5,
	1.6 import.log, 1.4, 1.5 sources, 1.2,
	1.3 hosts3d-0.97-autoconf.patch, 1.1,
	NONE hosts3d-0.97-autoreconf.patch, 1.1, NONE
Message-ID: <20090406135313.E995F700FB@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/hosts3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv897/devel

Modified Files:
	.cvsignore hosts3d.spec import.log sources 
Removed Files:
	hosts3d-0.97-autoconf.patch hosts3d-0.97-autoreconf.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Feb 2009 21:58:21 -0000	1.2
+++ .cvsignore	6 Apr 2009 13:52:43 -0000	1.3
@@ -1 +1 @@
-hosts3d-097.tar.gz
+hosts3d-098.tar.gz


Index: hosts3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/devel/hosts3d.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hosts3d.spec	25 Feb 2009 19:03:27 -0000	1.5
+++ hosts3d.spec	6 Apr 2009 13:52:43 -0000	1.6
@@ -1,8 +1,8 @@
-%define srcversion 097
+%define srcversion 098
 
 Name:            hosts3d
-Version:         0.97
-Release:         6%{?dist}
+Version:         0.98
+Release:         1%{?dist}
 Summary:         3D real-time network visualiser
 
 Group:           Applications/Internet
@@ -11,8 +11,6 @@
 Source0:         http://downloads.sourceforge.net/%{name}/%{name}-%{srcversion}.tar.gz
 Source1:         %{name}.desktop
 Source2:         %{name}.png
-Patch0:          %{name}-0.97-autoconf.patch
-Patch1:          %{name}-0.97-autoreconf.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #%if 0%{?fedora}
@@ -61,11 +59,6 @@
 
 %prep
 %setup -q -n %{name}-%{srcversion}
-%patch0 -p1
-
-%if 0%{?rhel}
-%patch1 -p1
-%endif
 
 
 %build
@@ -111,6 +104,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.98-1
+- New upstream release
+
 * Tue Feb 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.97-6
 - Use "Obsoletes: homestead-sensor <= 0.95" instead of "Obsoletes: homestead-sensor < 0.95-1"
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	25 Feb 2009 19:03:27 -0000	1.4
+++ import.log	6 Apr 2009 13:52:43 -0000	1.5
@@ -2,3 +2,4 @@
 hosts3d-0_97-5_fc10:HEAD:hosts3d-0.97-5.fc10.src.rpm:1235586067
 hosts3d-0_97-5_fc10:HEAD:hosts3d-0.97-5.fc10.src.rpm:1235587065
 hosts3d-0_97-6_fc10:HEAD:hosts3d-0.97-6.fc10.src.rpm:1235588491
+hosts3d-0_98-1_fc10:HEAD:hosts3d-0.98-1.fc10.src.rpm:1239025904


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Feb 2009 21:58:21 -0000	1.2
+++ sources	6 Apr 2009 13:52:43 -0000	1.3
@@ -1 +1 @@
-260c55fe010520cbe894c97b224f996b  hosts3d-097.tar.gz
+a185a5ffe2f53d862525ac4b419a335b  hosts3d-098.tar.gz


--- hosts3d-0.97-autoconf.patch DELETED ---


--- hosts3d-0.97-autoreconf.patch DELETED ---



From robmv at fedoraproject.org  Mon Apr  6 13:53:45 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Mon,  6 Apr 2009 13:53:45 +0000 (UTC)
Subject: rpms/svnkit/F-10 svnkit.spec,1.9,1.10
Message-ID: <20090406135345.1E76B700FB@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1157

Modified Files:
	svnkit.spec 
Log Message:
Rebuild



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-10/svnkit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- svnkit.spec	23 Mar 2009 13:52:44 -0000	1.9
+++ svnkit.spec	6 Apr 2009 13:53:14 -0000	1.10
@@ -13,7 +13,7 @@
 
 Name:           svnkit
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Robert Marcano <robert at marcanoonline.com> - 1.2.3-2
+- Rebuild
+
 * Mon Mar 23 2009 Robert Marcano <robert at marcanoonline.com> - 1.2.3-1
 - Update to upstream 1.2.3
 



From cassmodiah at fedoraproject.org  Mon Apr  6 13:55:04 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon,  6 Apr 2009 13:55:04 +0000 (UTC)
Subject: rpms/hosts3d/F-10 .cvsignore, 1.2, 1.3 hosts3d.spec, 1.3,
	1.4 import.log, 1.3, 1.4 sources, 1.2,
	1.3 hosts3d-0.97-autoconf.patch, 1.1,
	NONE hosts3d-0.97-autoreconf.patch, 1.1, NONE
Message-ID: <20090406135504.92E47700FB@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/hosts3d/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1696/F-10

Modified Files:
	.cvsignore hosts3d.spec import.log sources 
Removed Files:
	hosts3d-0.97-autoconf.patch hosts3d-0.97-autoreconf.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Feb 2009 22:00:22 -0000	1.2
+++ .cvsignore	6 Apr 2009 13:54:34 -0000	1.3
@@ -1 +1 @@
-hosts3d-097.tar.gz
+hosts3d-098.tar.gz


Index: hosts3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/F-10/hosts3d.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hosts3d.spec	25 Feb 2009 19:09:43 -0000	1.3
+++ hosts3d.spec	6 Apr 2009 13:54:34 -0000	1.4
@@ -1,8 +1,8 @@
-%define srcversion 097
+%define srcversion 098
 
 Name:            hosts3d
-Version:         0.97
-Release:         6%{?dist}
+Version:         0.98
+Release:         1%{?dist}
 Summary:         3D real-time network visualiser
 
 Group:           Applications/Internet
@@ -11,8 +11,6 @@
 Source0:         http://downloads.sourceforge.net/%{name}/%{name}-%{srcversion}.tar.gz
 Source1:         %{name}.desktop
 Source2:         %{name}.png
-Patch0:          %{name}-0.97-autoconf.patch
-Patch1:          %{name}-0.97-autoreconf.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #%if 0%{?fedora}
@@ -61,11 +59,6 @@
 
 %prep
 %setup -q -n %{name}-%{srcversion}
-%patch0 -p1
-
-%if 0%{?rhel}
-%patch1 -p1
-%endif
 
 
 %build
@@ -111,6 +104,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.98-1
+- New upstream release
+
 * Tue Feb 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.97-6
 - Use "Obsoletes: homestead-sensor <= 0.95" instead of "Obsoletes: homestead-sensor < 0.95-1"
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	25 Feb 2009 19:09:43 -0000	1.3
+++ import.log	6 Apr 2009 13:54:34 -0000	1.4
@@ -1,3 +1,4 @@
 hosts3d-0_97-3_fc10:F-10:hosts3d-0.97-3.fc10.src.rpm:1234821593
 hosts3d-0_97-5_fc10:F-10:hosts3d-0.97-5.fc10.src.rpm:1235586380
 hosts3d-0_97-6_fc10:F-10:hosts3d-0.97-6.fc10.src.rpm:1235588875
+hosts3d-0_98-1_fc10:F-10:hosts3d-0.98-1.fc10.src.rpm:1239026043


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Feb 2009 22:00:22 -0000	1.2
+++ sources	6 Apr 2009 13:54:34 -0000	1.3
@@ -1 +1 @@
-260c55fe010520cbe894c97b224f996b  hosts3d-097.tar.gz
+a185a5ffe2f53d862525ac4b419a335b  hosts3d-098.tar.gz


--- hosts3d-0.97-autoconf.patch DELETED ---


--- hosts3d-0.97-autoreconf.patch DELETED ---



From cassmodiah at fedoraproject.org  Mon Apr  6 13:56:45 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon,  6 Apr 2009 13:56:45 +0000 (UTC)
Subject: rpms/hosts3d/EL-5 .cvsignore, 1.2, 1.3 hosts3d.spec, 1.4,
	1.5 import.log, 1.4, 1.5 sources, 1.2,
	1.3 hosts3d-0.97-autoconf.patch, 1.1,
	NONE hosts3d-0.97-autoreconf.patch, 1.1, NONE
Message-ID: <20090406135645.D0207700FB@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/hosts3d/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2308/EL-5

Modified Files:
	.cvsignore hosts3d.spec import.log sources 
Removed Files:
	hosts3d-0.97-autoconf.patch hosts3d-0.97-autoreconf.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Feb 2009 22:02:20 -0000	1.2
+++ .cvsignore	6 Apr 2009 13:56:15 -0000	1.3
@@ -1 +1 @@
-hosts3d-097.tar.gz
+hosts3d-098.tar.gz


Index: hosts3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/hosts3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hosts3d.spec	25 Feb 2009 19:06:32 -0000	1.4
+++ hosts3d.spec	6 Apr 2009 13:56:15 -0000	1.5
@@ -1,8 +1,8 @@
-%define srcversion 097
+%define srcversion 098
 
 Name:            hosts3d
-Version:         0.97
-Release:         6%{?dist}
+Version:         0.98
+Release:         1%{?dist}
 Summary:         3D real-time network visualiser
 
 Group:           Applications/Internet
@@ -11,8 +11,6 @@
 Source0:         http://downloads.sourceforge.net/%{name}/%{name}-%{srcversion}.tar.gz
 Source1:         %{name}.desktop
 Source2:         %{name}.png
-Patch0:          %{name}-0.97-autoconf.patch
-Patch1:          %{name}-0.97-autoreconf.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #%if 0%{?fedora}
@@ -61,11 +59,6 @@
 
 %prep
 %setup -q -n %{name}-%{srcversion}
-%patch0 -p1
-
-%if 0%{?rhel}
-%patch1 -p1
-%endif
 
 
 %build
@@ -111,6 +104,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.98-1
+- New upstream release
+
 * Tue Feb 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.97-6
 - Use "Obsoletes: homestead-sensor <= 0.95" instead of "Obsoletes: homestead-sensor < 0.95-1"
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	25 Feb 2009 19:06:32 -0000	1.4
+++ import.log	6 Apr 2009 13:56:15 -0000	1.5
@@ -2,3 +2,4 @@
 hosts3d-0_97-4_fc10:EL-5:hosts3d-0.97-4.fc10.src.rpm:1235075080
 hosts3d-0_97-5_fc10:EL-5:hosts3d-0.97-5.fc10.src.rpm:1235586240
 hosts3d-0_97-6_fc10:EL-5:hosts3d-0.97-6.fc10.src.rpm:1235588688
+hosts3d-0_98-1_fc10:EL-5:hosts3d-0.98-1.fc10.src.rpm:1239026148


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Feb 2009 22:02:20 -0000	1.2
+++ sources	6 Apr 2009 13:56:15 -0000	1.3
@@ -1 +1 @@
-260c55fe010520cbe894c97b224f996b  hosts3d-097.tar.gz
+a185a5ffe2f53d862525ac4b419a335b  hosts3d-098.tar.gz


--- hosts3d-0.97-autoconf.patch DELETED ---


--- hosts3d-0.97-autoreconf.patch DELETED ---



From robmv at fedoraproject.org  Mon Apr  6 13:57:03 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Mon,  6 Apr 2009 13:57:03 +0000 (UTC)
Subject: rpms/svnkit/devel svnkit.spec,1.11,1.12
Message-ID: <20090406135703.99EA8700FB@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2331

Modified Files:
	svnkit.spec 
Log Message:
Rebuild



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- svnkit.spec	23 Mar 2009 13:17:15 -0000	1.11
+++ svnkit.spec	6 Apr 2009 13:56:33 -0000	1.12
@@ -13,7 +13,7 @@
 
 Name:           svnkit
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Robert Marcano <robert at marcanoonline.com> - 1.2.3-2
+- Rebuild
+
 * Mon Mar 23 2009 Robert Marcano <robert at marcanoonline.com> - 1.2.3-1
 - Update to upstream 1.2.3
 



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:42 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135820.BE4EA208550@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdepim (Fedora devel) to Obsolete for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:03 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135824.0DBE7208557@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdepim (Fedora 7) to Obsolete for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:47 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135827.1357A208608@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdepim (Fedora 8) to Obsolete for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:28 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135828.360312086EF@bastion.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdepim (Fedora 9) to Obsolete for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:31 +0000
Subject: [pkgdb] kdepim: rdieter has requested watchbugzilla
Message-ID: <20090406135832.530612086F6@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdepim (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:57 +0000
Subject: [pkgdb] kdepim: rdieter has requested watchcommits
Message-ID: <20090406135836.EB768208553@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdepim (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:59 +0000
Subject: [pkgdb] kdepim: rdieter has requested commit
Message-ID: <20090406135839.038B1208701@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdepim (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:39 +0000
Subject: [pkgdb] kdepim: rdieter has requested approveacls
Message-ID: <20090406135839.8C82F208705@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepim (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:47 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135848.086B8208557@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:48 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135848.8AF53208710@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim (Fedora 9) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:58:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:58:32 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135852.F0E08208743@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:15 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406135854.81962208770@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:30 +0000
Subject: [pkgdb] kdepimlibs: rdieter has given up approveacls
Message-ID: <20090406135909.1D50920860B@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:36 +0000
Subject: [pkgdb] kdepimlibs: rdieter has given up approveacls
Message-ID: <20090406135916.D7465208555@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdepimlibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:40 +0000
Subject: [pkgdb] kdepimlibs: rdieter has requested approveacls
Message-ID: <20090406135918.D8388208553@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepimlibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:54 +0000
Subject: [pkgdb] kdesdk: rdieter has given up approveacls
Message-ID: <20090406135934.99401208702@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdesdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:57 +0000
Subject: [pkgdb] kdesdk: rdieter has requested approveacls
Message-ID: <20090406135937.0DA7D208704@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdesdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:28 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090406135949.310BA208711@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Mon Apr  6 13:59:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 13:59:29 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090406135949.BFD7420892D@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Mon Apr  6 14:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:00:14 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090406135952.E81DB208604@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora EPEL 5) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Mon Apr  6 14:00:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:00:15 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090406135954.7AAC8208933@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora EPEL 5) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From mbarnes at fedoraproject.org  Mon Apr  6 13:59:54 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  6 Apr 2009 13:59:54 +0000 (UTC)
Subject: rpms/evolution-data-server/F-10
	evolution-data-server-2.24.5-caldav-leak-fix.patch, NONE,
	1.1 evolution-data-server-2.24.5-display-smime-sign-and-encrypt.patch,
	NONE, 1.1 evolution-data-server.spec, 1.248, 1.249
Message-ID: <20090406135954.6775A700FB@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3231

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.24.5-caldav-leak-fix.patch 
	evolution-data-server-2.24.5-display-smime-sign-and-encrypt.patch 
Log Message:

* Mon Apr 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-5.fc10
- Add patch for RH bug #492852 (fix S/MIME signature verification).
- Add patch for GNOME bug #573187 (CalDAV memory leaks).


evolution-data-server-2.24.5-caldav-leak-fix.patch:

--- NEW FILE evolution-data-server-2.24.5-caldav-leak-fix.patch ---
diff -up evolution-data-server-2.24.5/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-leak-fix evolution-data-server-2.24.5/calendar/backends/caldav/e-cal-backend-caldav.c
--- evolution-data-server-2.24.5/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-leak-fix	2009-01-29 13:55:21.000000000 +0100
+++ evolution-data-server-2.24.5/calendar/backends/caldav/e-cal-backend-caldav.c	2009-04-02 13:24:32.000000000 +0200
@@ -123,6 +123,7 @@ struct _ECalBackendCalDAVPrivate {
 #define DEBUG_MESSAGE "message"
 #define DEBUG_MESSAGE_HEADER "message:header"
 #define DEBUG_MESSAGE_BODY "message:body"
+#define DEBUG_SERVER_ITEMS "items"
 
 static gboolean caldav_debug_all = FALSE;
 static GHashTable *caldav_debug_table = NULL;
@@ -151,7 +152,7 @@ add_debug_key (const char *start, const 
 			     debug_key,
 			     debug_value);
 
-	g_debug ("Adding %s to enabled debugging keys", debug_key);
+	d(g_debug ("Adding %s to enabled debugging keys", debug_key));
 }
 
 static gpointer
@@ -164,7 +165,7 @@ caldav_debug_init_once (gpointer data)
 	if (dbg) {
 		const char *ptr;
 
-		g_debug ("Got debug env variable: [%s]", dbg);
+		d(g_debug ("Got debug env variable: [%s]", dbg));
 
 		caldav_debug_table = g_hash_table_new (g_str_hash,
 						       g_str_equal);
@@ -199,7 +200,7 @@ caldav_debug_init_once (gpointer data)
 }
 
 static void
-caldav_debug_init ()
+caldav_debug_init (void)
 {
 	static GOnce debug_once = G_ONCE_INIT;
 
@@ -237,7 +238,7 @@ caldav_debug_setup (SoupSession *session
 		level = SOUP_LOGGER_LOG_MINIMAL;
 
 	logger = soup_logger_new (level, DEBUG_MAX_BODY_SIZE);
-	soup_logger_attach (logger, session);
+	soup_session_add_feature (session, SOUP_SESSION_FEATURE (logger));
 	g_object_unref (logger);
 }
 
@@ -309,7 +310,10 @@ e_cal_component_set_href (ECalComponent 
 {
 	icalcomponent *icomp;
 
+	g_return_if_fail (href != NULL);
+
 	icomp = e_cal_component_get_icalcomponent (comp);
+	g_return_if_fail (icomp != NULL);
 
 	icomp_x_prop_set (icomp, X_E_CALDAV "HREF", href);
 }
@@ -322,6 +326,7 @@ e_cal_component_get_href (ECalComponent 
 
 	str = NULL;
 	icomp = e_cal_component_get_icalcomponent (comp);
+	g_return_val_if_fail (icomp != NULL, NULL);
 
 	str =  icomp_x_prop_get (icomp, X_E_CALDAV "HREF");
 
@@ -334,11 +339,12 @@ e_cal_component_set_etag (ECalComponent 
 {
 	icalcomponent *icomp;
 
+	g_return_if_fail (etag != NULL);
+
 	icomp = e_cal_component_get_icalcomponent (comp);
+	g_return_if_fail (icomp != NULL);
 
 	icomp_x_prop_set (icomp, X_E_CALDAV "ETAG", etag);
-
-
 }
 
 static char *
@@ -349,6 +355,7 @@ e_cal_component_get_etag (ECalComponent 
 
 	str = NULL;
 	icomp = e_cal_component_get_icalcomponent (comp);
+	g_return_val_if_fail (icomp != NULL, NULL);
 
 	str =  icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
 
@@ -542,13 +549,14 @@ parse_status_node (xmlNodePtr node, guin
 static char *
 xp_object_get_string (xmlXPathObjectPtr result)
 {
-	char *ret;
+	char *ret = NULL;
 
-	if (result == NULL || result->type != XPATH_STRING) {
-		return NULL;
-	}
+	if (result == NULL)
+		return ret;
 
-	ret = g_strdup ((char *) result->stringval);
+	if (result->type == XPATH_STRING) {
+		ret = g_strdup ((char *) result->stringval);
+	}
 
 	xmlXPathFreeObject (result);
 	return ret;
@@ -559,23 +567,26 @@ xp_object_get_string (xmlXPathObjectPtr 
 static char *
 xp_object_get_href (xmlXPathObjectPtr result)
 {
-	char *ret;
+	char *ret = NULL;
 	char *val;
 
-	if (result == NULL || result->type != XPATH_STRING) {
-		return NULL;
-	}
+	if (result == NULL)
+		return ret;
 
-	val = (char *) result->stringval;
+	if (result->type == XPATH_STRING) {
+		val = (char *) result->stringval;
 
-	if ((ret = g_strrstr (val, "/")) == NULL) {
-		ret = val;
-	} else {
-		ret++; /* skip the unwanted "/" */
-	}
+		if ((ret = g_strrstr (val, "/")) == NULL) {
+			ret = val;
+		} else {
+			ret++; /* skip the unwanted "/" */
+		}
 
-	ret = g_strdup (ret);
-	d(g_debug ("found href: %s", ret));
+		ret = g_strdup (ret);
+
+		if (caldav_debug_show (DEBUG_SERVER_ITEMS))
+			printf ("CalDAV found href: %s\n", ret);
+	}
 
 	xmlXPathFreeObject (result);
 	return ret;
@@ -585,16 +596,17 @@ xp_object_get_href (xmlXPathObjectPtr re
 static char *
 xp_object_get_etag (xmlXPathObjectPtr result)
 {
-	char *ret;
+	char *ret = NULL;
 	char *str;
 
-	if (result == NULL || result->type != XPATH_STRING) {
-		return NULL;
-	}
+	if (result == NULL)
+		return ret;
 
-	str = (char *) result->stringval;
+	if (result->type == XPATH_STRING) {
+		str = (char *) result->stringval;
 
-	ret = quote_etag (str);
+		ret = quote_etag (str);
+	}
 
 	xmlXPathFreeObject (result);
 	return ret;
@@ -604,20 +616,20 @@ static guint
 xp_object_get_status (xmlXPathObjectPtr result)
 {
 	gboolean res;
-	guint    ret;
-
+	guint    ret = 0;
 
-	if (result == NULL || result->type != XPATH_STRING) {
-		return 0;
-	}
+	if (result == NULL)
+		return ret;
 
-	res = soup_headers_parse_status_line ((char *) result->stringval,
-					      NULL,
-					      &ret,
-					      NULL);
+	if (result->type == XPATH_STRING) {
+		res = soup_headers_parse_status_line ((char *) result->stringval,
+							NULL,
+							&ret,
+							NULL);
 
-	if (res != TRUE) {
-		ret = 0;
+		if (!res) {
+			ret = 0;
+		}
 	}
 
 	xmlXPathFreeObject (result);
@@ -628,13 +640,14 @@ xp_object_get_status (xmlXPathObjectPtr 
 static int
 xp_object_get_number (xmlXPathObjectPtr result)
 {
-	int ret;
+	int ret = -1;
 
-	if (result == NULL || result->type != XPATH_STRING) {
-		return -1;
-	}
+	if (result == NULL)
+		return ret;
 
-	ret = result->boolval;
+	if (result->type == XPATH_STRING) {
+		ret = result->boolval;
+	}
 
 	xmlXPathFreeObject (result);
 	return ret;
@@ -750,6 +763,8 @@ parse_report_response (SoupMessage *soup
 	}
 
 out:
+	if (result != NULL)
+		xmlXPathFreeObject (result);
 	xmlXPathFreeContext (xpctx);
 	xmlFreeDoc (doc);
 	return res;
@@ -928,6 +943,8 @@ caldav_server_open_calendar (ECalBackend
 	/* FIXME: setup text_uri */
 
 	message = soup_message_new (SOUP_METHOD_OPTIONS, priv->uri);
+	if (message == NULL)
+		return GNOME_Evolution_Calendar_NoSuchCal;
 	soup_message_headers_append (message->request_headers,
 				     "User-Agent", "Evolution/" VERSION);
 
@@ -985,14 +1002,18 @@ caldav_server_list_objects (ECalBackendC
 	gboolean             result;
 
 	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
+	/* Allocate the soup message */
+	message = soup_message_new ("REPORT", priv->uri);
+	if (message == NULL)
+		return FALSE;
 
 	/* Maybe we should just do a g_strdup_printf here? */
 	/* Prepare request body */
 	doc = xmlNewDoc ((xmlChar *) "1.0");
-	root = xmlNewNode (NULL, (xmlChar *) "calendar-query");
-	nscd = xmlNewNs (root, (xmlChar *) "urn:ietf:params:xml:ns:caldav",
-			 (xmlChar *) "C");
+	root = xmlNewDocNode (doc, NULL, (xmlChar *) "calendar-query", NULL);
+	nscd = xmlNewNs (root, (xmlChar *) "urn:ietf:params:xml:ns:caldav", (xmlChar *) "C");
 	xmlSetNs (root, nscd);
+	xmlDocSetRootElement (doc, root);
 
 	/* Add webdav tags */
 	nsdav = xmlNewNs (root, (xmlChar *) "DAV:", (xmlChar *) "D");
@@ -1013,7 +1034,6 @@ caldav_server_list_objects (ECalBackendC
 	xmlOutputBufferFlush (buf);
 
 	/* Prepare the soup message */
-	message = soup_message_new ("REPORT", priv->uri);
 	soup_message_headers_append (message->request_headers,
 				     "User-Agent", "Evolution/" VERSION);
 	soup_message_headers_append (message->request_headers,
@@ -1034,7 +1054,9 @@ caldav_server_list_objects (ECalBackendC
 
 	/* Check the result */
 	if (message->status_code != 207) {
-		g_warning ("Sever did not response with 207, but with code %d\n", message->status_code);
+		g_warning ("Server did not response with 207, but with code %d (%s)", message->status_code, soup_status_get_phrase (message->status_code) ? soup_status_get_phrase (message->status_code) : "Unknown code");
+
+		g_object_unref (message);
 		return FALSE;
 	}
 
@@ -1062,18 +1084,23 @@ caldav_server_get_object (ECalBackendCal
 
 	uri = caldav_generate_uri (cbdav, object->href);
 	message = soup_message_new (SOUP_METHOD_GET, uri);
-	g_free (uri);
+	if (message == NULL) {
+		g_free (uri);
+		return GNOME_Evolution_Calendar_NoSuchCal;
+	}
 
 	soup_message_headers_append (message->request_headers,
 				     "User-Agent", "Evolution/" VERSION);
 
 	send_and_handle_redirection (priv->session, message, NULL);
 
-	if (! SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
-		result = status_code_to_result (message->status_code);
+	if (!SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
+		guint status_code = message->status_code;
 		g_object_unref (message);
-		g_warning ("Could not fetch object from server\n");
-		return result;
+
+		g_warning ("Could not fetch object '%s' from server, status:%d (%s)", uri, status_code, soup_status_get_phrase (status_code) ? soup_status_get_phrase (status_code) : "Unknown code");
+		g_free (uri);
+		return status_code_to_result (status_code);
 	}
 
 	hdr = soup_message_headers_get (message->response_headers, "Content-Type");
@@ -1081,7 +1108,8 @@ caldav_server_get_object (ECalBackendCal
 	if (hdr == NULL || g_ascii_strncasecmp (hdr, "text/calendar", 13)) {
 		result = GNOME_Evolution_Calendar_InvalidObject;
 		g_object_unref (message);
-		g_warning ("Object to fetch not of type text/calendar");
+		g_warning ("Object to fetch '%s' not of type text/calendar", uri);
+		g_free (uri);
 		return result;
 	}
 
@@ -1091,8 +1119,9 @@ caldav_server_get_object (ECalBackendCal
 		g_free (object->etag);
 		object->etag = quote_etag (hdr);
 	} else if (!object->etag) {
-		g_warning ("UUHH no ETag, now that's bad!");
+		g_warning ("UUHH no ETag, now that's bad! (at '%s')", uri);
 	}
+	g_free (uri);
 
 	g_free (object->cdata);
 	object->cdata = g_strdup (message->response_body->data);
@@ -1119,6 +1148,8 @@ caldav_server_put_object (ECalBackendCal
 	uri = caldav_generate_uri (cbdav, object->href);
 	message = soup_message_new (SOUP_METHOD_PUT, uri);
 	g_free (uri);
+	if (message == NULL)
+		return GNOME_Evolution_Calendar_NoSuchCal;
 
 	soup_message_headers_append (message->request_headers,
 				     "User-Agent", "Evolution/" VERSION);
@@ -1159,15 +1190,25 @@ caldav_server_put_object (ECalBackendCal
 	result = status_code_to_result (message->status_code);
 
 	if (result == GNOME_Evolution_Calendar_Success) {
-		hdr = soup_message_headers_get (message->response_headers,
-						"ETag");
-	}
+		hdr = soup_message_headers_get (message->response_headers, "ETag");
+		if (hdr != NULL) {
+			g_free (object->etag);
+			object->etag = quote_etag (hdr);
+		} else {
+			/* no ETag header returned, check for it with a GET */
+			hdr = soup_message_headers_get (message->response_headers, "Location");
+			if (hdr) {
+				/* reflect possible href change first */
+				char *file = strrchr (hdr, '/');
+
+				if (file) {
+					g_free (object->href);
+					object->href = soup_uri_encode (file + 1, NULL);
+				}
+			}
 
-	if (hdr != NULL) {
-		g_free (object->etag);
-		object->etag = quote_etag (hdr);
-	} else {
-		g_warning ("Ups no Etag in put response");
+			result = caldav_server_get_object (cbdav, object);
+		}
 	}
 
 	g_object_unref (message);
@@ -1190,6 +1231,8 @@ caldav_server_delete_object (ECalBackend
 	uri = caldav_generate_uri (cbdav, object->href);
 	message = soup_message_new (SOUP_METHOD_DELETE, uri);
 	g_free (uri);
+	if (message == NULL)
+		return GNOME_Evolution_Calendar_NoSuchCal;
 
 	soup_message_headers_append (message->request_headers,
 				     "User-Agent", "Evolution/" VERSION);
@@ -1230,10 +1273,8 @@ synchronize_object (ECalBackendCalDAV *c
 	res  = TRUE;
 	result  = caldav_server_get_object (cbdav, object);
 
-	if (result != GNOME_Evolution_Calendar_Success) {
-		g_warning ("Could not fetch object from server");
+	if (result != GNOME_Evolution_Calendar_Success)
 		return FALSE;
-	}
 
 	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
 
@@ -1242,31 +1283,34 @@ synchronize_object (ECalBackendCalDAV *c
 	bkend = E_CAL_BACKEND (cbdav);
 
 	if (kind == ICAL_VCALENDAR_COMPONENT) {
-
 		kind = e_cal_backend_get_kind (bkend);
 		subcomp = icalcomponent_get_first_component (icomp, kind);
 
-		comp = e_cal_component_new ();
-		res = e_cal_component_set_icalcomponent (comp,
+		if (!subcomp) {
+			res = FALSE;
+		} else {
+			comp = e_cal_component_new ();
+			res = e_cal_component_set_icalcomponent (comp,
 						   icalcomponent_new_clone (subcomp));
-		if (res == TRUE) {
-			icaltimezone *zone = icaltimezone_new ();
+			if (res) {
+				icaltimezone *zone = icaltimezone_new ();
 
-			e_cal_component_set_href (comp, object->href);
-			e_cal_component_set_etag (comp, object->etag);
+				e_cal_component_set_href (comp, object->href);
+				e_cal_component_set_etag (comp, object->etag);
 
-			for (subcomp = icalcomponent_get_first_component (icomp, ICAL_VTIMEZONE_COMPONENT);
-			    subcomp;
-			    subcomp = icalcomponent_get_next_component (icomp, ICAL_VTIMEZONE_COMPONENT)) {
-				/* copy timezones of the component to our cache to have it available later */
-				if (icaltimezone_set_component (zone, subcomp))
-					e_cal_backend_cache_put_timezone (priv->cache, zone);
-			}
+				for (subcomp = icalcomponent_get_first_component (icomp, ICAL_VTIMEZONE_COMPONENT);
+				    subcomp;
+				    subcomp = icalcomponent_get_next_component (icomp, ICAL_VTIMEZONE_COMPONENT)) {
+					/* copy timezones of the component to our cache to have it available later */
+					if (icaltimezone_set_component (zone, subcomp))
+						e_cal_backend_cache_put_timezone (priv->cache, zone);
+				}
 
-			icaltimezone_free (zone, TRUE);
-		} else {
-			g_object_unref (comp);
-			comp = NULL;
+				icaltimezone_free (zone, TRUE);
+			} else {
+				g_object_unref (comp);
+				comp = NULL;
+			}
 		}
 	} else {
 		res = FALSE;
@@ -1367,8 +1411,10 @@ synchronize_cache (ECalBackendCalDAV *cb
 			res = synchronize_object (cbdav, object, ccomp, &created, &modified);
 		}
 
-		if (res == TRUE) {
+		if (res) {
 			cobjs = g_list_remove (cobjs, ccomp);
+			if (ccomp)
+				g_object_unref (ccomp);
 		}
 
 		caldav_object_free (object, FALSE);
@@ -1475,6 +1521,8 @@ synch_slave_loop (gpointer data)
 	/* signal we are done */
 	g_cond_signal (priv->slave_gone_cond);
 
+	priv->synch_slave = NULL;
+
 	/* we got killed ... */
 	g_mutex_unlock (priv->lock);
 	return NULL;
@@ -1570,14 +1618,13 @@ initialize_backend (ECalBackendCalDAV *c
 	}
 
 	os_val = e_source_get_property (source, "auth");
-
-	if (os_val) {
-		priv->need_auth = TRUE;
-	}
+	priv->need_auth = os_val != NULL;
 
 	os_val = e_source_get_property(source, "ssl");
 	uri = e_cal_backend_get_uri (E_CAL_BACKEND (cbdav));
 
+	g_free (priv->uri);
+	priv->uri = NULL;
 	if (g_str_has_prefix (uri, "caldav://")) {
 		const char *proto;
 
@@ -1756,6 +1803,7 @@ pack_cobj (ECalBackendCalDAV *cbdav, ECa
 	}
 
 	objstr = icalcomponent_as_ical_string (calcomp);
+	icalcomponent_free (calcomp);
 
 	g_assert (objstr);
 
@@ -1853,7 +1901,6 @@ caldav_create_object (ECalBackendSync  *
 
 	if (online) {
 		CalDAVObject object;
-		const char *id = NULL;
 
 		href = e_cal_component_gen_href (comp);
 		
@@ -1862,12 +1909,12 @@ caldav_create_object (ECalBackendSync  *
 		object.cdata = pack_cobj (cbdav, comp);
 
 		status = caldav_server_put_object (cbdav, &object);
+		if (status == GNOME_Evolution_Calendar_Success) {
+			e_cal_component_set_href (comp, object.href);
+			e_cal_component_set_etag (comp, object.etag);
+		}
 
-		e_cal_component_get_uid (comp, &id);
-		e_cal_component_set_href (comp, object.href);
-		e_cal_component_set_etag (comp, object.etag);
 		caldav_object_free (&object, FALSE);
-
 	} else {
 		/* mark component as out of synch */
 		e_cal_component_set_synch_state (comp,
@@ -1949,11 +1996,12 @@ caldav_modify_object (ECalBackendSync  *
 		object.cdata = pack_cobj (cbdav, comp);
 
 		status = caldav_server_put_object (cbdav, &object);
+		if (status == GNOME_Evolution_Calendar_Success) {
+			e_cal_component_set_href (comp, object.href);
+			e_cal_component_set_etag (comp, object.etag);
+		}
 
-		e_cal_component_set_href (comp, object.href);
-		e_cal_component_set_etag (comp, object.etag);
 		caldav_object_free (&object, FALSE);
-
 	} else {
 		/* mark component as out of synch */
 		e_cal_component_set_synch_state (comp,
@@ -2032,8 +2080,10 @@ caldav_remove_object (ECalBackendSync  *
 			caldav_object.cdata = pack_cobj (cbdav, cache_comp);
 
 			status = caldav_server_put_object (cbdav, &caldav_object);
-			e_cal_component_set_href (cache_comp, caldav_object.href);
-			e_cal_component_set_etag (cache_comp, caldav_object.etag);
+			if (status == GNOME_Evolution_Calendar_Success) {
+				e_cal_component_set_href (cache_comp, caldav_object.href);
+				e_cal_component_set_etag (cache_comp, caldav_object.etag);
+			}
 		} else
 			status = caldav_server_delete_object (cbdav, &caldav_object);
 
@@ -2258,11 +2308,11 @@ process_object (ECalBackendCalDAV   *cbd
 							      rid);
 
 			id = e_cal_component_get_id (ccomp);
-
 			e_cal_backend_notify_object_removed (E_CAL_BACKEND (backend),
 							     id,
 							     oostr,
 							     ostr);
+			e_cal_component_free_id (id);
 			break;
 
 		default:
@@ -2271,7 +2321,6 @@ process_object (ECalBackendCalDAV   *cbd
 			break;
 	}
 
-	g_object_unref (ecomp);
 	g_free (ostr);
 	g_free (oostr);
 	g_free (rid);
@@ -2323,9 +2372,13 @@ caldav_receive_objects (ECalBackendSync 
 
 	if (status == GNOME_Evolution_Calendar_Success) {
 		for (iter = timezones; iter; iter = iter->next) {
-			icaltimezone *zone = iter->data;
+			icaltimezone *zone = icaltimezone_new ();
+
+			if (icaltimezone_set_component (zone, iter->data))
+				e_cal_backend_cache_put_timezone (priv->cache, zone);
+			else
+				icalcomponent_free (iter->data);
 
-			e_cal_backend_cache_put_timezone (priv->cache, zone);
 			icaltimezone_free (zone, TRUE);
 		}
 	}

evolution-data-server-2.24.5-display-smime-sign-and-encrypt.patch:

--- NEW FILE evolution-data-server-2.24.5-display-smime-sign-and-encrypt.patch ---
diff -up evolution-data-server-2.24.5/camel/camel-smime-context.c.display-smime-sign-and-encrypt evolution-data-server-2.24.5/camel/camel-smime-context.c
--- evolution-data-server-2.24.5/camel/camel-smime-context.c.display-smime-sign-and-encrypt	2009-04-02 13:11:58.000000000 +0200
+++ evolution-data-server-2.24.5/camel/camel-smime-context.c	2009-04-02 13:13:14.000000000 +0200
@@ -969,7 +969,8 @@ sm_decrypt(CamelCipherContext *context, 
 	camel_data_wrapper_construct_from_stream((CamelDataWrapper *)opart, ostream);
 
 	if (NSS_CMSMessage_IsSigned(cmsg)) {
-		valid = sm_verify_cmsg(context, cmsg, NULL, ex);
+		camel_stream_reset (ostream);
+		valid = sm_verify_cmsg (context, cmsg, ostream, ex);
 	} else {
 		valid = camel_cipher_validity_new();
 		valid->encrypt.description = g_strdup(_("Encrypted content"));


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/evolution-data-server.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- evolution-data-server.spec	17 Mar 2009 18:15:02 -0000	1.248
+++ evolution-data-server.spec	6 Apr 2009 13:59:24 -0000	1.249
@@ -29,7 +29,7 @@
 
 Name: evolution-data-server
 Version: 2.24.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -60,6 +60,12 @@
 # RH bug #487685 / CVE-2009-0582
 Patch16: evolution-data-server-2.24.5-CVE-2009-0582.patch
 
+# RH bug #492852 / GNOME bug #564465
+Patch17: evolution-data-server-2.24.5-display-smime-sign-and-encrypt.patch
+
+# GNOME bug #573187 (plus other changes)
+Patch18: evolution-data-server-2.24.5-caldav-leak-fix.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -141,6 +147,8 @@
 %patch14 -p1 -b .sqlite-fsync-rework
 %patch15 -p1 -b .CVE-2009-0582
 %patch16 -p1 -b .CVE-2009-0587
+%patch17 -p1 -b .display-smime-sign-and-encrypt
+%patch18 -p1 -b .caldav-leak-fix
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -386,6 +394,10 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Apr 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-5.fc10
+- Add patch for RH bug #492852 (fix S/MIME signature verification).
+- Add patch for GNOME bug #573187 (CalDAV memory leaks).
+
 * Tue Mar 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-4.fc10
 - Add patch for RH bug #484925 (CVE-2009-0547, S/MIME signatures).
 - Add patch for RH bug #487685 (CVE-2009-0582, NTLM authentication).



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:22 +0000
Subject: [pkgdb] kdeutils: rdieter has given up approveacls
Message-ID: <20090406140101.A21D9208550@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdeutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:04 +0000
Subject: [pkgdb] kdeutils: rdieter has requested approveacls
Message-ID: <20090406140105.4175F208609@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:42 +0000
Subject: [pkgdb] kdegraphics: rdieter has given up approveacls
Message-ID: <20090406140122.CF3962086F3@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdegraphics (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:03 +0000
Subject: [pkgdb] evolution-data-server had acl change status
Message-ID: <20090406140123.60ECD2086FF@bastion.fedora.phx.redhat.com>

mbarnes has set the watchbugzilla acl on evolution-data-server (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:47 +0000
Subject: [pkgdb] kdegraphics: rdieter has requested approveacls
Message-ID: <20090406140126.318D6208702@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegraphics (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:47 +0000
Subject: [pkgdb] evolution-data-server had acl change status
Message-ID: <20090406140126.82E55208705@bastion.fedora.phx.redhat.com>

mbarnes has set the watchcommits acl on evolution-data-server (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:53 +0000
Subject: [pkgdb] evolution-data-server had acl change status
Message-ID: <20090406140132.1BB2820876C@bastion.fedora.phx.redhat.com>

mbarnes has set the approveacls acl on evolution-data-server (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:08 +0000
Subject: [pkgdb] evolution-data-server had acl change status
Message-ID: <20090406140129.28F3B208711@bastion.fedora.phx.redhat.com>

mbarnes has set the commit acl on evolution-data-server (Fedora devel) to Approved for mbarnes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:58 +0000
Subject: [pkgdb] kdegames: rdieter has given up approveacls
Message-ID: <20090406140137.D01712087F3@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Apr  6 14:01:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:01:39 +0000
Subject: [pkgdb] kdegames: rdieter has requested approveacls
Message-ID: <20090406140140.078542087F6@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Mon Apr  6 14:02:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:02:15 +0000
Subject: [pkgdb] kdeedu: rdieter has given up approveacls
Message-ID: <20090406140155.96F882087F8@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdeedu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Mon Apr  6 14:02:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:02:19 +0000
Subject: [pkgdb] kdeedu: rdieter has requested approveacls
Message-ID: <20090406140158.1A3E520892D@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeedu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Mon Apr  6 14:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:02:46 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406140306.6099E208605@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepim (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 14:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:03:26 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406140306.921E52086EF@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepim (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 14:03:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:03:07 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090406140307.AC3402086F3@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepim (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Mon Apr  6 14:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:04:53 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20090406140432.7EC94208605@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdepimlibs (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Mon Apr  6 14:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:04:53 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20090406140433.D0BCC2086F6@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdepimlibs (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Mon Apr  6 14:04:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:04:34 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20090406140434.BD9CE208701@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdepimlibs (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Mon Apr  6 14:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:05:03 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20090406140503.86290208555@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdesdk (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Mon Apr  6 14:05:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:05:25 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20090406140504.BA494208603@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdesdk (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Mon Apr  6 14:05:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 14:05:25 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20090406140505.82D4A208703@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdesdk (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From langel at fedoraproject.org  Mon Apr  6 14:06:42 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  6 Apr 2009 14:06:42 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-lcms.patch, 1.3,
	1.4 java-1.6.0-openjdk.spec, 1.115, 1.116
Message-ID: <20090406140642.91E47700FB@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5338

Modified Files:
	java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec 
Log Message:
* Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b14
- Updated java-1.6.0-openjdk-lcms.patch



java-1.6.0-openjdk-lcms.patch:

Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.6.0-openjdk-lcms.patch	2 Apr 2009 13:50:50 -0000	1.3
+++ java-1.6.0-openjdk-lcms.patch	6 Apr 2009 14:06:42 -0000	1.4
@@ -1,6 +1,6 @@
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -79,9 +79,9 @@
  }
  
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -118,9 +118,9 @@
  #else
      VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
      MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1562,9 +1562,9 @@
  void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
  {
      LPIT8 it8 = (LPIT8) hIT8;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1590,9 +1590,9 @@
 +
 +
 +      
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1622,9 +1622,9 @@
                strcat(Buffer1, Buffer2);
                MessageBox(NULL, Buffer1, "Little cms",
                                            MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1769,9 +1769,9 @@
  
  
      if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1873,9 +1873,9 @@
  
      }
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1912,9 +1912,9 @@
  
          f = ((Value - b) / a);
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1993,7 +1993,7 @@
  {
      FILEMEM* ResData = (FILEMEM*) Icc ->stream;
  
-@@ -147,19 +163,18 @@
+@@ -147,10 +163,10 @@
  }
  
  
@@ -2006,32 +2006,19 @@
  {
          FILEMEM* ResData = (FILEMEM*) Icc ->stream;
  
-        if (size == 0) return TRUE;
- 
-        if (ResData != NULL)
--           CopyMemory(ResData ->Block + ResData ->Pointer, Ptr, size);
-+           CopyMemory(ResData ->Block + Icc ->UsedSpace, Ptr, size);
+@@ -167,7 +183,7 @@
  
--       ResData->Pointer += size;
-        Icc->UsedSpace += size;
  
-        return TRUE;
-@@ -167,27 +182,15 @@
+ static
+-BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
++LCMSBOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
+ {
+   FILEMEM* ResData = (FILEMEM*) Icc->stream;
+   ResData->Size += size;
+@@ -179,15 +195,15 @@
  
  
  static
--BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
--{
--  FILEMEM* ResData = (FILEMEM*) Icc->stream;
--  ResData->Size += size;
--  ResData->Block = realloc(ResData->Block, ResData->Size);
--  if (!ResData->Block)
--    return FALSE;
--  return TRUE;
--}
--
--
--static
 -BOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
 +LCMSBOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
  {
@@ -2047,7 +2034,7 @@
      return 0;
  }
  
-@@ -205,7 +208,7 @@
+@@ -205,7 +221,7 @@
  {
      size_t nReaded = fread(buffer, size, count, (FILE*) Icc->stream);
      if (nReaded != count) {
@@ -2056,7 +2043,7 @@
              return 0;
      }
  
-@@ -214,7 +217,7 @@
+@@ -214,7 +230,7 @@
  
  
  static
@@ -2065,7 +2052,7 @@
  {
      if (fseek((FILE*) Icc ->stream, (long) offset, SEEK_SET) != 0) {
  
-@@ -236,7 +239,7 @@
+@@ -236,7 +252,7 @@
  
  
  static
@@ -2074,23 +2061,24 @@
  {
         if (size == 0) return TRUE;
  
-@@ -252,14 +255,7 @@
+@@ -252,14 +268,14 @@
  
  
  static
 -BOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
--{
--  return TRUE;
--}
--
--
--static
++LCMSBOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
+ {
+   return TRUE;
+ }
+ 
+ 
+ static
 -BOOL FileClose(struct _lcms_iccprofile_struct* Icc)
 +LCMSBOOL FileClose(struct _lcms_iccprofile_struct* Icc)
  {
      return fclose((FILE*) Icc ->stream);
  }
-@@ -272,7 +268,7 @@
+@@ -272,7 +288,7 @@
  cmsHPROFILE _cmsCreateProfilePlaceholder(void)
  {
  
@@ -2099,7 +2087,7 @@
      if (Icc == NULL) return NULL;
  
      // Empty values
-@@ -310,7 +306,7 @@
+@@ -310,7 +326,7 @@
  // Search for a specific tag in tag dictionary
  // Returns position or -1 if tag not found
  
@@ -2108,7 +2096,7 @@
  {
         icInt32Number i;
  
-@@ -331,7 +327,7 @@
+@@ -331,7 +347,7 @@
  
  // Check existance
  
@@ -2117,7 +2105,7 @@
  {
         LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
         return _cmsSearchTag(Icc, sig, FALSE) >= 0;
-@@ -350,7 +346,7 @@
+@@ -350,7 +366,7 @@
  
      if (i >=0) {
  
@@ -2126,7 +2114,7 @@
      }
      else  {
  
-@@ -361,11 +357,14 @@
+@@ -361,11 +377,14 @@
  
              cmsSignalError(LCMS_ERRC_ABORTED, "Too many tags (%d)", MAX_TABLE_TAG);
              Icc ->TagCount = MAX_TABLE_TAG-1;
@@ -2142,7 +2130,7 @@
      CopyMemory(Ptr, Init, size);
  
      Icc ->TagNames[i] = sig;
-@@ -396,13 +395,14 @@
+@@ -396,6 +415,8 @@
      if (NewIcc == NULL) return NULL;
  
      strncpy(NewIcc -> PhysicalFile, FileName, MAX_PATH-1);
@@ -2151,24 +2139,7 @@
      NewIcc ->stream = ICCfile;
  
      NewIcc ->Read  = FileRead;
-     NewIcc ->Seek  = FileSeek;
-     NewIcc ->Tell  = FileTell;
-     NewIcc ->Close = FileClose;
--    NewIcc ->Grow  = FileGrow;
-     NewIcc ->Write = NULL;
- 
-     NewIcc ->IsWrite = FALSE;
-@@ -440,8 +440,7 @@
-     NewIcc ->Seek  = MemorySeek;
-     NewIcc ->Tell  = MemoryTell;
-     NewIcc ->Close = MemoryClose;
--    NewIcc ->Grow  = MemoryGrow;
--    NewIcc ->Write = MemoryWrite;
-+    NewIcc ->Write = NULL;
- 
-     NewIcc ->IsWrite = FALSE;
- 
-@@ -498,7 +497,7 @@
+@@ -498,7 +519,7 @@
  
  
  
@@ -2177,7 +2148,7 @@
  {
       LPLCMSICCPROFILE    Icc = (LPLCMSICCPROFILE) hProfile;
       *Dest = Icc -> MediaWhitePoint;
-@@ -506,14 +505,14 @@
+@@ -506,14 +527,14 @@
  }
  
  
@@ -2194,7 +2165,7 @@
  {
         LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) hProfile;
         *Dest = Icc -> Illuminant;
-@@ -571,7 +570,7 @@
+@@ -571,7 +592,7 @@
  }
  
  
@@ -2203,7 +2174,7 @@
  {
      LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
      CopyMemory(Dest, &Icc ->Created, sizeof(struct tm));
-@@ -660,7 +659,7 @@
+@@ -660,7 +681,7 @@
  
  // This is tricky, since LUT structs does have pointers
  
@@ -2212,7 +2183,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
         LPLUT Orig, Stored;
-@@ -688,7 +687,7 @@
+@@ -688,7 +709,7 @@
  }
  
  
@@ -2221,7 +2192,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -697,7 +696,7 @@
+@@ -697,7 +718,7 @@
  }
  
  
@@ -2230,7 +2201,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -705,7 +704,7 @@
+@@ -705,7 +726,7 @@
         return TRUE;
  }
  
@@ -2239,7 +2210,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -714,7 +713,7 @@
+@@ -714,7 +735,7 @@
  }
  
  
@@ -2248,7 +2219,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -723,7 +722,7 @@
+@@ -723,7 +744,7 @@
  }
  
  
@@ -2257,7 +2228,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -733,28 +732,40 @@
+@@ -733,28 +754,40 @@
  }
  
  
@@ -2304,9 +2275,9 @@
  }
 +
 +
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -2874,10 +2845,10 @@
 +        if (Curves[i] == NULL) goto Error;
          SkipAlignment(Icc);
 +    }
-+
+ 
 +    // March-26'08: some V4 profiles may have different sampling
 +    // rates, in this case resample all curves to maximum
- 
++
 +    for (i=1; i < nCurves; i++) {
 +        if (Curves[i]->nEntries != Curves[0]->nEntries) {
 +            ResampleCurves(Curves, nCurves);
@@ -4139,149 +4110,22 @@
  
      // update BytesSaved so caller knows how many bytes put into stream
      *BytesNeeded = Icc ->UsedSpace;
-@@ -3662,139 +3764,3 @@
+@@ -3662,10 +3764,10 @@
      return FALSE;
  }
  
 -BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
--				  void *data, size_t size)
--{
++LCMSBOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
+ 				  void *data, size_t size)
+ {
 -  BOOL isNew;
--  int i, idx, delta, count;
--  LPBYTE padChars[3] = {0, 0, 0};
--  LPBYTE beforeBuf, afterBuf, ptr;
--  size_t beforeSize, afterSize;
--  icUInt32Number profileSize, temp;
--  LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
--
--  isNew = FALSE;
--  idx = _cmsSearchTag(Icc, sig, FALSE);
--  if (idx < 0)
--    {
--      isNew = TRUE;
--      idx = Icc->TagCount++;
--      if (Icc->TagCount >= MAX_TABLE_TAG)
--	{
--	  fprintf(stderr, "Too many tags (%d)\n", Icc->TagCount);
--	  Icc->TagCount = MAX_TABLE_TAG-1;
--	  return FALSE;
--	}
--    }
--
--  /* Read in size from header */
--  Icc->Seek(Icc, 0);
--  Icc->Read(&profileSize, sizeof(icUInt32Number), 1, Icc);
--  AdjustEndianess32((LPBYTE) &profileSize);
--
--  /* Compute the change in profile size */
--  if (isNew)
--    delta = sizeof(icTag) + ALIGNLONG(size);
--  else
--    delta = ALIGNLONG(size) - ALIGNLONG(Icc->TagSizes[idx]);
--
--  /* Add tag to internal structures */
--  ptr = malloc(size);
--  CopyMemory(ptr, data, size);
--  Icc->TagSizes[idx] = size;
--  Icc->TagNames[idx] = sig;
--  if (Icc->TagPtrs[idx])
--    free(Icc->TagPtrs[idx]);
--  Icc->TagPtrs[idx] = ptr;
--  if (isNew)
--    Icc->TagOffsets[idx] = profileSize;
--
--  /* Compute size of tag data before/after the modified tag */
--  beforeSize = Icc->TagOffsets[idx] - Icc->TagOffsets[0];
--  if (Icc->TagCount == (idx + 1))
--    afterSize = 0;
--  else
--    afterSize = profileSize - Icc->TagOffsets[idx+1];
--
--  /* Make copies of the data before/after the modified tag */
--  if (beforeSize > 0)
--    {
--      beforeBuf = malloc(beforeSize);
--      Icc->Seek(Icc, Icc->TagOffsets[0]);
--      Icc->Read(beforeBuf, beforeSize, 1, Icc);
--    }
--  
--  if (afterSize > 0)
--    {
--      afterBuf = malloc(afterSize);
--      Icc->Seek(Icc, Icc->TagOffsets[idx+1]);
--      Icc->Read(afterBuf, afterSize, 1, Icc);
--    }
--
--  /* Update the profile size in the header */
--  profileSize += delta;
--  Icc->Seek(Icc, 0);
--  temp = TransportValue32(profileSize);
--  Icc->Write(Icc, sizeof(icUInt32Number), &temp);
--
--  Icc->Grow(Icc, delta);
--
--  /* Adjust tag offsets: if the tag is new, we must account
--     for the new tag table entry; otherwise, only those tags after
--     the modified tag are changed (by delta) */
--  if (isNew)
--    {
--      for (i = 0; i < Icc->TagCount; ++i)
--	Icc->TagOffsets[i] += sizeof(icTag);
--    }
--  else
--    {
--      for (i = idx+1; i < Icc->TagCount; ++i)
--	Icc->TagOffsets[i] += delta;
--    }
--
--  /* Write out a new tag table */
--  count = 0;
--  for (i = 0; i < Icc->TagCount; ++i)
--    {
--      if (Icc->TagNames[i] != 0)
--	++count;
--    }
--  Icc->Seek(Icc, sizeof(icHeader));
--  temp = TransportValue32(count);
--  Icc->Write(Icc, sizeof(icUInt32Number), &temp);
--
--  for (i = 0; i < Icc->TagCount; ++i)
--    {
--      if (Icc->TagNames[i] != 0)
--	{
--	  icTag tag;
--	  tag.sig = TransportValue32(Icc->TagNames[i]);
--	  tag.offset = TransportValue32((icInt32Number) Icc->TagOffsets[i]);
--	  tag.size = TransportValue32((icInt32Number) Icc->TagSizes[i]);
--	  Icc->Write(Icc, sizeof(icTag), &tag);
--	}
--    }
--
--  /* Write unchanged data before the modified tag */
--  if (beforeSize > 0)
--    {
--      Icc->Write(Icc, beforeSize, beforeBuf);
--      free(beforeBuf);
--    }
--
--  /* Write modified tag data */
--  Icc->Write(Icc, size, data);
--  if (size % 4)
--    Icc->Write(Icc, 4 - (size % 4), padChars);
--
--  /* Write unchanged data after the modified tag */
--  if (afterSize > 0)
--    {
--      Icc->Write(Icc, afterSize, afterBuf);
--      free(afterBuf);
--    }
--
--  return TRUE;
--}
--
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-26 15:13:30.000000000 -0400
++  LCMSBOOL isNew;
+   int i, idx, delta, count;
+   LPBYTE padChars[3] = {0, 0, 0};
+   LPBYTE beforeBuf, afterBuf, ptr;
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4437,9 +4281,9 @@
                                                         &Lut -> In16params);
                Lut ->wFlags &= ~LUT_HASTL1;
             }
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4500,9 +4344,9 @@
  }
  
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4564,9 +4408,9 @@
  {
          MAT3 m, a_1;
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4625,9 +4469,9 @@
  {
      _LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-04-03 13:42:46.000000000 -0400
 @@ -28,7 +28,7 @@
  // file:
  //
@@ -4809,9 +4653,9 @@
                              break;
  
                       default:;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4821,9 +4665,9 @@
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5185,9 +5029,9 @@
  
      // Finally, return used byte count
      return dwBytesUsed;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5297,9 +5141,9 @@
  {
  
         WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5452,9 +5296,9 @@
  
         Lut -> InputChan = 3;
         Lut -> OutputChan = 1;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5609,9 +5453,9 @@
      if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
              (cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
              (cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-26 15:18:47.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5844,9 +5688,9 @@
      if ((Intent != INTENT_ABSOLUTE_COLORIMETRIC) &&
          !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP))
                              _cmsFixWhiteMisalignment(p);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-04-03 13:42:46.000000000 -0400
 @@ -1,5 +1,8 @@
 +/* Header file guard bands */
 +#ifndef ICC_H
@@ -5910,10 +5754,10 @@
  typedef uint8_t   icUInt8Number;
  typedef uint16_t  icUInt16Number;
  typedef uint32_t  icUInt32Number;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-26 15:16:19.000000000 -0400
-@@ -356,12 +356,18 @@
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-04-03 13:44:42.000000000 -0400
+@@ -356,6 +356,12 @@
        fprintf(stderr, "setTagData on icSigHead not permitted");
        return;
      }
@@ -5926,16 +5770,9 @@
  
      sProf.j = id;
      profile = (cmsHPROFILE) sProf.pf;
-     dataArray = (*env)->GetByteArrayElements(env, data, 0);    
-     tagSize =(*env)->GetArrayLength(env, data);
--    _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-+    _cmsInitTag(profile, (icTagSignature) tagSig, tagSize, dataArray);
-     (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
- }
- 
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -6305,7 +6142,7 @@
  
  // Converts a transform to a devicelink profile
  LCMSAPI cmsHPROFILE LCMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, DWORD dwFlags);
-@@ -1240,12 +1218,11 @@
+@@ -1240,12 +1218,14 @@
  
  
  // Save profile
@@ -6315,13 +6152,15 @@
 +LCMSAPI LCMSBOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr, 
                                                                  size_t* BytesNeeded);
  
--// Modify data for a tag in a profile
--LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
 +
++
+ // Modify data for a tag in a profile
+-LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
++LCMSAPI LCMSBOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
  
  // PostScript ColorRenderingDictionary and ColorSpaceArray
  
-@@ -1326,35 +1303,37 @@
+@@ -1326,35 +1306,37 @@
  // Persistence
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
@@ -6371,7 +6210,7 @@
                                                  double Val);
  
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
-@@ -1362,25 +1341,28 @@
+@@ -1362,25 +1344,28 @@
  
  LCMSAPI double          LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
  
@@ -6403,7 +6242,7 @@
  // Formatter for double
  LCMSAPI void            LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter);
  
-@@ -1406,15 +1388,16 @@
+@@ -1406,15 +1391,16 @@
  
  // Profiling Extensions --- Would be removed from API in future revisions
  
@@ -6429,7 +6268,7 @@
  
  // --------------------------------------------------------------------------------------------------- Inline functions
  
-@@ -1456,6 +1439,34 @@
+@@ -1456,6 +1442,34 @@
         return (WORD) in;
  }
  
@@ -6464,7 +6303,7 @@
  // ------------------------------------------------------------------------------------------- end of inline functions
  
  // Signal error from inside lcms code
-@@ -1542,8 +1553,8 @@
+@@ -1542,8 +1556,8 @@
  void   cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
  void   cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
@@ -6475,7 +6314,7 @@
  void   cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
  void   cdecl VEC3saturate(LPVEC3 v);
-@@ -1554,13 +1565,13 @@
+@@ -1554,13 +1568,13 @@
  void   cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
  void   cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
  int    cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
@@ -6491,7 +6330,7 @@
  void   cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
  
  // Is a table linear?
-@@ -1609,7 +1620,7 @@
+@@ -1609,7 +1623,7 @@
  void    cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
@@ -6500,7 +6339,7 @@
  
  WORD    cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
  Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
-@@ -1693,7 +1704,7 @@
+@@ -1693,7 +1707,7 @@
  
                 // Gray axes fixup. Only on v2 8-bit Lab LUT
  
@@ -6509,7 +6348,7 @@
  
  
                             // Parameters used for curve creation
-@@ -1704,7 +1715,7 @@
+@@ -1704,7 +1718,7 @@
                 }; // LUT, FAR* LPLUT;
  
  
@@ -6518,7 +6357,7 @@
  
  
  // CRC of gamma tables
-@@ -1722,7 +1733,7 @@
+@@ -1722,7 +1736,7 @@
  
  void           cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
  void           cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
@@ -6527,7 +6366,7 @@
  void           cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
  
  LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
-@@ -1756,7 +1767,7 @@
+@@ -1756,7 +1770,7 @@
  void        cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
  void        cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
  
@@ -6536,7 +6375,7 @@
  
  LPMATSHAPER  cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
  LPMATSHAPER  cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
-@@ -1764,11 +1775,11 @@
+@@ -1764,11 +1778,11 @@
  
  
  // White Point & Primary chromas handling
@@ -6552,7 +6391,7 @@
  
  // Inter-PCS conversion routines. They assume D50 as white point.
  void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
-@@ -1783,7 +1794,7 @@
+@@ -1783,7 +1797,7 @@
  LPcmsNAMEDCOLORLIST  cdecl cmsAllocNamedColorList(int n);
  int                  cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
  void                 cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
@@ -6561,7 +6400,7 @@
  
  
  // I/O
-@@ -1827,8 +1838,8 @@
+@@ -1827,8 +1841,8 @@
  
                 char                    PhysicalFile[MAX_PATH];
  
@@ -6572,7 +6411,7 @@
  
                 struct tm               Created;
  
-@@ -1836,14 +1847,13 @@
+@@ -1836,14 +1850,13 @@
  
                 size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
  
@@ -6582,7 +6421,8 @@
 +               LCMSBOOL (* Close)(struct _lcms_iccprofile_struct* Icc);
                 size_t (* Tell)(struct _lcms_iccprofile_struct* Icc);
 -               BOOL   (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
- 
+-
++               LCMSBOOL   (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
                 // Writting
  
 -               BOOL   (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr);
@@ -6590,7 +6430,7 @@
  
                 size_t UsedSpace;
  
-@@ -1855,7 +1865,7 @@
+@@ -1855,7 +1868,7 @@
  cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
  
  // Search into tag dictionary
@@ -6599,7 +6439,7 @@
  
  // Search for a particular tag, replace if found or add new one else
  LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
-@@ -1871,6 +1881,7 @@
+@@ -1871,6 +1884,7 @@
  
  // These macros unpack format specifiers into integers
  
@@ -6607,7 +6447,7 @@
  #define T_COLORSPACE(s)       (((s)>>16)&31)
  #define T_SWAPFIRST(s)        (((s)>>14)&1)
  #define T_FLAVOR(s)           (((s)>>13)&1)
-@@ -1967,7 +1978,7 @@
+@@ -1967,7 +1981,7 @@
  
                      // Flag for transform involving v4 profiles
  
@@ -6616,7 +6456,7 @@
  
  
                      // 1-pixel cache
-@@ -2014,7 +2025,7 @@
+@@ -2014,7 +2028,7 @@
  
  // Clamping & Gamut handling
  
@@ -6625,7 +6465,7 @@
                              WORD **White, WORD **Black, int *nOutputs);
  
  WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
-@@ -2043,7 +2054,7 @@
+@@ -2043,7 +2057,7 @@
  LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
  
  // Hot fixes bad profiles
@@ -6634,7 +6474,7 @@
  
  // Marks LUT as 8 bit on input
  LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
-@@ -2061,6 +2072,10 @@
+@@ -2061,6 +2075,10 @@
  // Build a tone curve for K->K' if possible (only works on CMYK)
  LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- java-1.6.0-openjdk.spec	2 Apr 2009 13:50:50 -0000	1.115
+++ java-1.6.0-openjdk.spec	6 Apr 2009 14:06:42 -0000	1.116
@@ -120,7 +120,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 18.%{openjdkver}%{?dist}
+Release: 19.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -927,6 +927,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b14
+- Updated java-1.6.0-openjdk-lcms.patch
+
 * Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-18.b14
 - Added java-1.6.0-openjdk-pulsejava.patch.
 - Updated release.



From langel at fedoraproject.org  Mon Apr  6 14:07:35 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  6 Apr 2009 14:07:35 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk-lcms.patch, 1.3,
	1.4 java-1.6.0-openjdk.spec, 1.106, 1.107
Message-ID: <20090406140735.9F823700FB@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5624

Modified Files:
	java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec 
Log Message:
* Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-15.b14
- Updated java-1.6.0-openjdk-lcms.patch



java-1.6.0-openjdk-lcms.patch:

Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.6.0-openjdk-lcms.patch	2 Apr 2009 13:50:36 -0000	1.3
+++ java-1.6.0-openjdk-lcms.patch	6 Apr 2009 14:07:35 -0000	1.4
@@ -1,6 +1,6 @@
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -79,9 +79,9 @@
  }
  
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -118,9 +118,9 @@
  #else
      VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
      MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1562,9 +1562,9 @@
  void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
  {
      LPIT8 it8 = (LPIT8) hIT8;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1590,9 +1590,9 @@
 +
 +
 +      
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1622,9 +1622,9 @@
                strcat(Buffer1, Buffer2);
                MessageBox(NULL, Buffer1, "Little cms",
                                            MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1769,9 +1769,9 @@
  
  
      if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1873,9 +1873,9 @@
  
      }
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1912,9 +1912,9 @@
  
          f = ((Value - b) / a);
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1993,7 +1993,7 @@
  {
      FILEMEM* ResData = (FILEMEM*) Icc ->stream;
  
-@@ -147,19 +163,18 @@
+@@ -147,10 +163,10 @@
  }
  
  
@@ -2006,32 +2006,19 @@
  {
          FILEMEM* ResData = (FILEMEM*) Icc ->stream;
  
-        if (size == 0) return TRUE;
- 
-        if (ResData != NULL)
--           CopyMemory(ResData ->Block + ResData ->Pointer, Ptr, size);
-+           CopyMemory(ResData ->Block + Icc ->UsedSpace, Ptr, size);
+@@ -167,7 +183,7 @@
  
--       ResData->Pointer += size;
-        Icc->UsedSpace += size;
  
-        return TRUE;
-@@ -167,27 +182,15 @@
+ static
+-BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
++LCMSBOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
+ {
+   FILEMEM* ResData = (FILEMEM*) Icc->stream;
+   ResData->Size += size;
+@@ -179,15 +195,15 @@
  
  
  static
--BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
--{
--  FILEMEM* ResData = (FILEMEM*) Icc->stream;
--  ResData->Size += size;
--  ResData->Block = realloc(ResData->Block, ResData->Size);
--  if (!ResData->Block)
--    return FALSE;
--  return TRUE;
--}
--
--
--static
 -BOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
 +LCMSBOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
  {
@@ -2047,7 +2034,7 @@
      return 0;
  }
  
-@@ -205,7 +208,7 @@
+@@ -205,7 +221,7 @@
  {
      size_t nReaded = fread(buffer, size, count, (FILE*) Icc->stream);
      if (nReaded != count) {
@@ -2056,7 +2043,7 @@
              return 0;
      }
  
-@@ -214,7 +217,7 @@
+@@ -214,7 +230,7 @@
  
  
  static
@@ -2065,7 +2052,7 @@
  {
      if (fseek((FILE*) Icc ->stream, (long) offset, SEEK_SET) != 0) {
  
-@@ -236,7 +239,7 @@
+@@ -236,7 +252,7 @@
  
  
  static
@@ -2074,23 +2061,24 @@
  {
         if (size == 0) return TRUE;
  
-@@ -252,14 +255,7 @@
+@@ -252,14 +268,14 @@
  
  
  static
 -BOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
--{
--  return TRUE;
--}
--
--
--static
++LCMSBOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
+ {
+   return TRUE;
+ }
+ 
+ 
+ static
 -BOOL FileClose(struct _lcms_iccprofile_struct* Icc)
 +LCMSBOOL FileClose(struct _lcms_iccprofile_struct* Icc)
  {
      return fclose((FILE*) Icc ->stream);
  }
-@@ -272,7 +268,7 @@
+@@ -272,7 +288,7 @@
  cmsHPROFILE _cmsCreateProfilePlaceholder(void)
  {
  
@@ -2099,7 +2087,7 @@
      if (Icc == NULL) return NULL;
  
      // Empty values
-@@ -310,7 +306,7 @@
+@@ -310,7 +326,7 @@
  // Search for a specific tag in tag dictionary
  // Returns position or -1 if tag not found
  
@@ -2108,7 +2096,7 @@
  {
         icInt32Number i;
  
-@@ -331,7 +327,7 @@
+@@ -331,7 +347,7 @@
  
  // Check existance
  
@@ -2117,7 +2105,7 @@
  {
         LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
         return _cmsSearchTag(Icc, sig, FALSE) >= 0;
-@@ -350,7 +346,7 @@
+@@ -350,7 +366,7 @@
  
      if (i >=0) {
  
@@ -2126,7 +2114,7 @@
      }
      else  {
  
-@@ -361,11 +357,14 @@
+@@ -361,11 +377,14 @@
  
              cmsSignalError(LCMS_ERRC_ABORTED, "Too many tags (%d)", MAX_TABLE_TAG);
              Icc ->TagCount = MAX_TABLE_TAG-1;
@@ -2142,7 +2130,7 @@
      CopyMemory(Ptr, Init, size);
  
      Icc ->TagNames[i] = sig;
-@@ -396,13 +395,14 @@
+@@ -396,6 +415,8 @@
      if (NewIcc == NULL) return NULL;
  
      strncpy(NewIcc -> PhysicalFile, FileName, MAX_PATH-1);
@@ -2151,24 +2139,7 @@
      NewIcc ->stream = ICCfile;
  
      NewIcc ->Read  = FileRead;
-     NewIcc ->Seek  = FileSeek;
-     NewIcc ->Tell  = FileTell;
-     NewIcc ->Close = FileClose;
--    NewIcc ->Grow  = FileGrow;
-     NewIcc ->Write = NULL;
- 
-     NewIcc ->IsWrite = FALSE;
-@@ -440,8 +440,7 @@
-     NewIcc ->Seek  = MemorySeek;
-     NewIcc ->Tell  = MemoryTell;
-     NewIcc ->Close = MemoryClose;
--    NewIcc ->Grow  = MemoryGrow;
--    NewIcc ->Write = MemoryWrite;
-+    NewIcc ->Write = NULL;
- 
-     NewIcc ->IsWrite = FALSE;
- 
-@@ -498,7 +497,7 @@
+@@ -498,7 +519,7 @@
  
  
  
@@ -2177,7 +2148,7 @@
  {
       LPLCMSICCPROFILE    Icc = (LPLCMSICCPROFILE) hProfile;
       *Dest = Icc -> MediaWhitePoint;
-@@ -506,14 +505,14 @@
+@@ -506,14 +527,14 @@
  }
  
  
@@ -2194,7 +2165,7 @@
  {
         LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) hProfile;
         *Dest = Icc -> Illuminant;
-@@ -571,7 +570,7 @@
+@@ -571,7 +592,7 @@
  }
  
  
@@ -2203,7 +2174,7 @@
  {
      LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
      CopyMemory(Dest, &Icc ->Created, sizeof(struct tm));
-@@ -660,7 +659,7 @@
+@@ -660,7 +681,7 @@
  
  // This is tricky, since LUT structs does have pointers
  
@@ -2212,7 +2183,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
         LPLUT Orig, Stored;
-@@ -688,7 +687,7 @@
+@@ -688,7 +709,7 @@
  }
  
  
@@ -2221,7 +2192,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -697,7 +696,7 @@
+@@ -697,7 +718,7 @@
  }
  
  
@@ -2230,7 +2201,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -705,7 +704,7 @@
+@@ -705,7 +726,7 @@
         return TRUE;
  }
  
@@ -2239,7 +2210,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -714,7 +713,7 @@
+@@ -714,7 +735,7 @@
  }
  
  
@@ -2248,7 +2219,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -723,7 +722,7 @@
+@@ -723,7 +744,7 @@
  }
  
  
@@ -2257,7 +2228,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -733,28 +732,40 @@
+@@ -733,28 +754,40 @@
  }
  
  
@@ -2304,9 +2275,9 @@
  }
 +
 +
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -2874,10 +2845,10 @@
 +        if (Curves[i] == NULL) goto Error;
          SkipAlignment(Icc);
 +    }
-+
+ 
 +    // March-26'08: some V4 profiles may have different sampling
 +    // rates, in this case resample all curves to maximum
- 
++
 +    for (i=1; i < nCurves; i++) {
 +        if (Curves[i]->nEntries != Curves[0]->nEntries) {
 +            ResampleCurves(Curves, nCurves);
@@ -4139,149 +4110,22 @@
  
      // update BytesSaved so caller knows how many bytes put into stream
      *BytesNeeded = Icc ->UsedSpace;
-@@ -3662,139 +3764,3 @@
+@@ -3662,10 +3764,10 @@
      return FALSE;
  }
  
 -BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
--				  void *data, size_t size)
--{
++LCMSBOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
+ 				  void *data, size_t size)
+ {
 -  BOOL isNew;
--  int i, idx, delta, count;
--  LPBYTE padChars[3] = {0, 0, 0};
--  LPBYTE beforeBuf, afterBuf, ptr;
--  size_t beforeSize, afterSize;
--  icUInt32Number profileSize, temp;
--  LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
--
--  isNew = FALSE;
--  idx = _cmsSearchTag(Icc, sig, FALSE);
--  if (idx < 0)
--    {
--      isNew = TRUE;
--      idx = Icc->TagCount++;
--      if (Icc->TagCount >= MAX_TABLE_TAG)
--	{
--	  fprintf(stderr, "Too many tags (%d)\n", Icc->TagCount);
--	  Icc->TagCount = MAX_TABLE_TAG-1;
--	  return FALSE;
--	}
--    }
--
--  /* Read in size from header */
--  Icc->Seek(Icc, 0);
--  Icc->Read(&profileSize, sizeof(icUInt32Number), 1, Icc);
--  AdjustEndianess32((LPBYTE) &profileSize);
--
--  /* Compute the change in profile size */
--  if (isNew)
--    delta = sizeof(icTag) + ALIGNLONG(size);
--  else
--    delta = ALIGNLONG(size) - ALIGNLONG(Icc->TagSizes[idx]);
--
--  /* Add tag to internal structures */
--  ptr = malloc(size);
--  CopyMemory(ptr, data, size);
--  Icc->TagSizes[idx] = size;
--  Icc->TagNames[idx] = sig;
--  if (Icc->TagPtrs[idx])
--    free(Icc->TagPtrs[idx]);
--  Icc->TagPtrs[idx] = ptr;
--  if (isNew)
--    Icc->TagOffsets[idx] = profileSize;
--
--  /* Compute size of tag data before/after the modified tag */
--  beforeSize = Icc->TagOffsets[idx] - Icc->TagOffsets[0];
--  if (Icc->TagCount == (idx + 1))
--    afterSize = 0;
--  else
--    afterSize = profileSize - Icc->TagOffsets[idx+1];
--
--  /* Make copies of the data before/after the modified tag */
--  if (beforeSize > 0)
--    {
--      beforeBuf = malloc(beforeSize);
--      Icc->Seek(Icc, Icc->TagOffsets[0]);
--      Icc->Read(beforeBuf, beforeSize, 1, Icc);
--    }
--  
--  if (afterSize > 0)
--    {
--      afterBuf = malloc(afterSize);
--      Icc->Seek(Icc, Icc->TagOffsets[idx+1]);
--      Icc->Read(afterBuf, afterSize, 1, Icc);
--    }
--
--  /* Update the profile size in the header */
--  profileSize += delta;
--  Icc->Seek(Icc, 0);
--  temp = TransportValue32(profileSize);
--  Icc->Write(Icc, sizeof(icUInt32Number), &temp);
--
--  Icc->Grow(Icc, delta);
--
--  /* Adjust tag offsets: if the tag is new, we must account
--     for the new tag table entry; otherwise, only those tags after
--     the modified tag are changed (by delta) */
--  if (isNew)
--    {
--      for (i = 0; i < Icc->TagCount; ++i)
--	Icc->TagOffsets[i] += sizeof(icTag);
--    }
--  else
--    {
--      for (i = idx+1; i < Icc->TagCount; ++i)
--	Icc->TagOffsets[i] += delta;
--    }
--
--  /* Write out a new tag table */
--  count = 0;
--  for (i = 0; i < Icc->TagCount; ++i)
--    {
--      if (Icc->TagNames[i] != 0)
--	++count;
--    }
--  Icc->Seek(Icc, sizeof(icHeader));
--  temp = TransportValue32(count);
--  Icc->Write(Icc, sizeof(icUInt32Number), &temp);
--
--  for (i = 0; i < Icc->TagCount; ++i)
--    {
--      if (Icc->TagNames[i] != 0)
--	{
--	  icTag tag;
--	  tag.sig = TransportValue32(Icc->TagNames[i]);
--	  tag.offset = TransportValue32((icInt32Number) Icc->TagOffsets[i]);
--	  tag.size = TransportValue32((icInt32Number) Icc->TagSizes[i]);
--	  Icc->Write(Icc, sizeof(icTag), &tag);
--	}
--    }
--
--  /* Write unchanged data before the modified tag */
--  if (beforeSize > 0)
--    {
--      Icc->Write(Icc, beforeSize, beforeBuf);
--      free(beforeBuf);
--    }
--
--  /* Write modified tag data */
--  Icc->Write(Icc, size, data);
--  if (size % 4)
--    Icc->Write(Icc, 4 - (size % 4), padChars);
--
--  /* Write unchanged data after the modified tag */
--  if (afterSize > 0)
--    {
--      Icc->Write(Icc, afterSize, afterBuf);
--      free(afterBuf);
--    }
--
--  return TRUE;
--}
--
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-26 15:13:30.000000000 -0400
++  LCMSBOOL isNew;
+   int i, idx, delta, count;
+   LPBYTE padChars[3] = {0, 0, 0};
+   LPBYTE beforeBuf, afterBuf, ptr;
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4437,9 +4281,9 @@
                                                         &Lut -> In16params);
                Lut ->wFlags &= ~LUT_HASTL1;
             }
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4500,9 +4344,9 @@
  }
  
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4564,9 +4408,9 @@
  {
          MAT3 m, a_1;
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4625,9 +4469,9 @@
  {
      _LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-04-03 13:42:46.000000000 -0400
 @@ -28,7 +28,7 @@
  // file:
  //
@@ -4809,9 +4653,9 @@
                              break;
  
                       default:;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4821,9 +4665,9 @@
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5185,9 +5029,9 @@
  
      // Finally, return used byte count
      return dwBytesUsed;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5297,9 +5141,9 @@
  {
  
         WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5452,9 +5296,9 @@
  
         Lut -> InputChan = 3;
         Lut -> OutputChan = 1;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5609,9 +5453,9 @@
      if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
              (cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
              (cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-26 15:18:47.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5844,9 +5688,9 @@
      if ((Intent != INTENT_ABSOLUTE_COLORIMETRIC) &&
          !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP))
                              _cmsFixWhiteMisalignment(p);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-04-03 13:42:46.000000000 -0400
 @@ -1,5 +1,8 @@
 +/* Header file guard bands */
 +#ifndef ICC_H
@@ -5910,10 +5754,10 @@
  typedef uint8_t   icUInt8Number;
  typedef uint16_t  icUInt16Number;
  typedef uint32_t  icUInt32Number;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-26 15:16:19.000000000 -0400
-@@ -356,12 +356,18 @@
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-04-03 13:44:42.000000000 -0400
+@@ -356,6 +356,12 @@
        fprintf(stderr, "setTagData on icSigHead not permitted");
        return;
      }
@@ -5926,16 +5770,9 @@
  
      sProf.j = id;
      profile = (cmsHPROFILE) sProf.pf;
-     dataArray = (*env)->GetByteArrayElements(env, data, 0);    
-     tagSize =(*env)->GetArrayLength(env, data);
--    _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-+    _cmsInitTag(profile, (icTagSignature) tagSig, tagSize, dataArray);
-     (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
- }
- 
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -6305,7 +6142,7 @@
  
  // Converts a transform to a devicelink profile
  LCMSAPI cmsHPROFILE LCMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, DWORD dwFlags);
-@@ -1240,12 +1218,11 @@
+@@ -1240,12 +1218,14 @@
  
  
  // Save profile
@@ -6315,13 +6152,15 @@
 +LCMSAPI LCMSBOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr, 
                                                                  size_t* BytesNeeded);
  
--// Modify data for a tag in a profile
--LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
 +
++
+ // Modify data for a tag in a profile
+-LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
++LCMSAPI LCMSBOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
  
  // PostScript ColorRenderingDictionary and ColorSpaceArray
  
-@@ -1326,35 +1303,37 @@
+@@ -1326,35 +1306,37 @@
  // Persistence
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
@@ -6371,7 +6210,7 @@
                                                  double Val);
  
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
-@@ -1362,25 +1341,28 @@
+@@ -1362,25 +1344,28 @@
  
  LCMSAPI double          LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
  
@@ -6403,7 +6242,7 @@
  // Formatter for double
  LCMSAPI void            LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter);
  
-@@ -1406,15 +1388,16 @@
+@@ -1406,15 +1391,16 @@
  
  // Profiling Extensions --- Would be removed from API in future revisions
  
@@ -6429,7 +6268,7 @@
  
  // --------------------------------------------------------------------------------------------------- Inline functions
  
-@@ -1456,6 +1439,34 @@
+@@ -1456,6 +1442,34 @@
         return (WORD) in;
  }
  
@@ -6464,7 +6303,7 @@
  // ------------------------------------------------------------------------------------------- end of inline functions
  
  // Signal error from inside lcms code
-@@ -1542,8 +1553,8 @@
+@@ -1542,8 +1556,8 @@
  void   cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
  void   cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
@@ -6475,7 +6314,7 @@
  void   cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
  void   cdecl VEC3saturate(LPVEC3 v);
-@@ -1554,13 +1565,13 @@
+@@ -1554,13 +1568,13 @@
  void   cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
  void   cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
  int    cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
@@ -6491,7 +6330,7 @@
  void   cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
  
  // Is a table linear?
-@@ -1609,7 +1620,7 @@
+@@ -1609,7 +1623,7 @@
  void    cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
@@ -6500,7 +6339,7 @@
  
  WORD    cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
  Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
-@@ -1693,7 +1704,7 @@
+@@ -1693,7 +1707,7 @@
  
                 // Gray axes fixup. Only on v2 8-bit Lab LUT
  
@@ -6509,7 +6348,7 @@
  
  
                             // Parameters used for curve creation
-@@ -1704,7 +1715,7 @@
+@@ -1704,7 +1718,7 @@
                 }; // LUT, FAR* LPLUT;
  
  
@@ -6518,7 +6357,7 @@
  
  
  // CRC of gamma tables
-@@ -1722,7 +1733,7 @@
+@@ -1722,7 +1736,7 @@
  
  void           cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
  void           cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
@@ -6527,7 +6366,7 @@
  void           cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
  
  LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
-@@ -1756,7 +1767,7 @@
+@@ -1756,7 +1770,7 @@
  void        cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
  void        cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
  
@@ -6536,7 +6375,7 @@
  
  LPMATSHAPER  cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
  LPMATSHAPER  cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
-@@ -1764,11 +1775,11 @@
+@@ -1764,11 +1778,11 @@
  
  
  // White Point & Primary chromas handling
@@ -6552,7 +6391,7 @@
  
  // Inter-PCS conversion routines. They assume D50 as white point.
  void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
-@@ -1783,7 +1794,7 @@
+@@ -1783,7 +1797,7 @@
  LPcmsNAMEDCOLORLIST  cdecl cmsAllocNamedColorList(int n);
  int                  cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
  void                 cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
@@ -6561,7 +6400,7 @@
  
  
  // I/O
-@@ -1827,8 +1838,8 @@
+@@ -1827,8 +1841,8 @@
  
                 char                    PhysicalFile[MAX_PATH];
  
@@ -6572,7 +6411,7 @@
  
                 struct tm               Created;
  
-@@ -1836,14 +1847,13 @@
+@@ -1836,14 +1850,13 @@
  
                 size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
  
@@ -6582,7 +6421,8 @@
 +               LCMSBOOL (* Close)(struct _lcms_iccprofile_struct* Icc);
                 size_t (* Tell)(struct _lcms_iccprofile_struct* Icc);
 -               BOOL   (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
- 
+-
++               LCMSBOOL   (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
                 // Writting
  
 -               BOOL   (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr);
@@ -6590,7 +6430,7 @@
  
                 size_t UsedSpace;
  
-@@ -1855,7 +1865,7 @@
+@@ -1855,7 +1868,7 @@
  cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
  
  // Search into tag dictionary
@@ -6599,7 +6439,7 @@
  
  // Search for a particular tag, replace if found or add new one else
  LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
-@@ -1871,6 +1881,7 @@
+@@ -1871,6 +1884,7 @@
  
  // These macros unpack format specifiers into integers
  
@@ -6607,7 +6447,7 @@
  #define T_COLORSPACE(s)       (((s)>>16)&31)
  #define T_SWAPFIRST(s)        (((s)>>14)&1)
  #define T_FLAVOR(s)           (((s)>>13)&1)
-@@ -1967,7 +1978,7 @@
+@@ -1967,7 +1981,7 @@
  
                      // Flag for transform involving v4 profiles
  
@@ -6616,7 +6456,7 @@
  
  
                      // 1-pixel cache
-@@ -2014,7 +2025,7 @@
+@@ -2014,7 +2028,7 @@
  
  // Clamping & Gamut handling
  
@@ -6625,7 +6465,7 @@
                              WORD **White, WORD **Black, int *nOutputs);
  
  WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
-@@ -2043,7 +2054,7 @@
+@@ -2043,7 +2057,7 @@
  LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
  
  // Hot fixes bad profiles
@@ -6634,7 +6474,7 @@
  
  // Marks LUT as 8 bit on input
  LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
-@@ -2061,6 +2072,10 @@
+@@ -2061,6 +2075,10 @@
  // Build a tone curve for K->K' if possible (only works on CMYK)
  LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- java-1.6.0-openjdk.spec	2 Apr 2009 13:50:36 -0000	1.106
+++ java-1.6.0-openjdk.spec	6 Apr 2009 14:07:35 -0000	1.107
@@ -117,7 +117,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 14.%{openjdkver}%{?dist}
+Release: 15.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -913,6 +913,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-15.b14
+- Updated java-1.6.0-openjdk-lcms.patch
+
 * Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-14.b14
 - Added java-1.6.0-openjdk-pulsejava.patch.
 - Updated release.



From langel at fedoraproject.org  Mon Apr  6 14:08:18 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  6 Apr 2009 14:08:18 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-lcms.patch, 1.3,
	1.4 java-1.6.0-openjdk.spec, 1.66, 1.67
Message-ID: <20090406140818.A5803700FB@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5835

Modified Files:
	java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk.spec 
Log Message:
* Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-25.b14
- Updated java-1.6.0-openjdk-lcms.patch



java-1.6.0-openjdk-lcms.patch:

Index: java-1.6.0-openjdk-lcms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk-lcms.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.6.0-openjdk-lcms.patch	2 Apr 2009 13:50:21 -0000	1.3
+++ java-1.6.0-openjdk-lcms.patch	6 Apr 2009 14:08:18 -0000	1.4
@@ -1,6 +1,6 @@
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -79,9 +79,9 @@
  }
  
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -118,9 +118,9 @@
  #else
      VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y);
      MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1562,9 +1562,9 @@
  void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE hIT8, const char* Formatter)
  {
      LPIT8 it8 = (LPIT8) hIT8;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1590,9 +1590,9 @@
 +
 +
 +      
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1622,9 +1622,9 @@
                strcat(Buffer1, Buffer2);
                MessageBox(NULL, Buffer1, "Little cms",
                                            MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1769,9 +1769,9 @@
  
  
      if (cmsIsLinear(Table, nEntries)) return FALSE; // Nothing to do
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1873,9 +1873,9 @@
  
      }
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1912,9 +1912,9 @@
  
          f = ((Value - b) / a);
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -1993,7 +1993,7 @@
  {
      FILEMEM* ResData = (FILEMEM*) Icc ->stream;
  
-@@ -147,19 +163,18 @@
+@@ -147,10 +163,10 @@
  }
  
  
@@ -2006,32 +2006,19 @@
  {
          FILEMEM* ResData = (FILEMEM*) Icc ->stream;
  
-        if (size == 0) return TRUE;
- 
-        if (ResData != NULL)
--           CopyMemory(ResData ->Block + ResData ->Pointer, Ptr, size);
-+           CopyMemory(ResData ->Block + Icc ->UsedSpace, Ptr, size);
+@@ -167,7 +183,7 @@
  
--       ResData->Pointer += size;
-        Icc->UsedSpace += size;
  
-        return TRUE;
-@@ -167,27 +182,15 @@
+ static
+-BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
++LCMSBOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
+ {
+   FILEMEM* ResData = (FILEMEM*) Icc->stream;
+   ResData->Size += size;
+@@ -179,15 +195,15 @@
  
  
  static
--BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
--{
--  FILEMEM* ResData = (FILEMEM*) Icc->stream;
--  ResData->Size += size;
--  ResData->Block = realloc(ResData->Block, ResData->Size);
--  if (!ResData->Block)
--    return FALSE;
--  return TRUE;
--}
--
--
--static
 -BOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
 +LCMSBOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
  {
@@ -2047,7 +2034,7 @@
      return 0;
  }
  
-@@ -205,7 +208,7 @@
+@@ -205,7 +221,7 @@
  {
      size_t nReaded = fread(buffer, size, count, (FILE*) Icc->stream);
      if (nReaded != count) {
@@ -2056,7 +2043,7 @@
              return 0;
      }
  
-@@ -214,7 +217,7 @@
+@@ -214,7 +230,7 @@
  
  
  static
@@ -2065,7 +2052,7 @@
  {
      if (fseek((FILE*) Icc ->stream, (long) offset, SEEK_SET) != 0) {
  
-@@ -236,7 +239,7 @@
+@@ -236,7 +252,7 @@
  
  
  static
@@ -2074,23 +2061,24 @@
  {
         if (size == 0) return TRUE;
  
-@@ -252,14 +255,7 @@
+@@ -252,14 +268,14 @@
  
  
  static
 -BOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
--{
--  return TRUE;
--}
--
--
--static
++LCMSBOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
+ {
+   return TRUE;
+ }
+ 
+ 
+ static
 -BOOL FileClose(struct _lcms_iccprofile_struct* Icc)
 +LCMSBOOL FileClose(struct _lcms_iccprofile_struct* Icc)
  {
      return fclose((FILE*) Icc ->stream);
  }
-@@ -272,7 +268,7 @@
+@@ -272,7 +288,7 @@
  cmsHPROFILE _cmsCreateProfilePlaceholder(void)
  {
  
@@ -2099,7 +2087,7 @@
      if (Icc == NULL) return NULL;
  
      // Empty values
-@@ -310,7 +306,7 @@
+@@ -310,7 +326,7 @@
  // Search for a specific tag in tag dictionary
  // Returns position or -1 if tag not found
  
@@ -2108,7 +2096,7 @@
  {
         icInt32Number i;
  
-@@ -331,7 +327,7 @@
+@@ -331,7 +347,7 @@
  
  // Check existance
  
@@ -2117,7 +2105,7 @@
  {
         LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
         return _cmsSearchTag(Icc, sig, FALSE) >= 0;
-@@ -350,7 +346,7 @@
+@@ -350,7 +366,7 @@
  
      if (i >=0) {
  
@@ -2126,7 +2114,7 @@
      }
      else  {
  
-@@ -361,11 +357,14 @@
+@@ -361,11 +377,14 @@
  
              cmsSignalError(LCMS_ERRC_ABORTED, "Too many tags (%d)", MAX_TABLE_TAG);
              Icc ->TagCount = MAX_TABLE_TAG-1;
@@ -2142,7 +2130,7 @@
      CopyMemory(Ptr, Init, size);
  
      Icc ->TagNames[i] = sig;
-@@ -396,13 +395,14 @@
+@@ -396,6 +415,8 @@
      if (NewIcc == NULL) return NULL;
  
      strncpy(NewIcc -> PhysicalFile, FileName, MAX_PATH-1);
@@ -2151,24 +2139,7 @@
      NewIcc ->stream = ICCfile;
  
      NewIcc ->Read  = FileRead;
-     NewIcc ->Seek  = FileSeek;
-     NewIcc ->Tell  = FileTell;
-     NewIcc ->Close = FileClose;
--    NewIcc ->Grow  = FileGrow;
-     NewIcc ->Write = NULL;
- 
-     NewIcc ->IsWrite = FALSE;
-@@ -440,8 +440,7 @@
-     NewIcc ->Seek  = MemorySeek;
-     NewIcc ->Tell  = MemoryTell;
-     NewIcc ->Close = MemoryClose;
--    NewIcc ->Grow  = MemoryGrow;
--    NewIcc ->Write = MemoryWrite;
-+    NewIcc ->Write = NULL;
- 
-     NewIcc ->IsWrite = FALSE;
- 
-@@ -498,7 +497,7 @@
+@@ -498,7 +519,7 @@
  
  
  
@@ -2177,7 +2148,7 @@
  {
       LPLCMSICCPROFILE    Icc = (LPLCMSICCPROFILE) hProfile;
       *Dest = Icc -> MediaWhitePoint;
-@@ -506,14 +505,14 @@
+@@ -506,14 +527,14 @@
  }
  
  
@@ -2194,7 +2165,7 @@
  {
         LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) hProfile;
         *Dest = Icc -> Illuminant;
-@@ -571,7 +570,7 @@
+@@ -571,7 +592,7 @@
  }
  
  
@@ -2203,7 +2174,7 @@
  {
      LPLCMSICCPROFILE  Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
      CopyMemory(Dest, &Icc ->Created, sizeof(struct tm));
-@@ -660,7 +659,7 @@
+@@ -660,7 +681,7 @@
  
  // This is tricky, since LUT structs does have pointers
  
@@ -2212,7 +2183,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
         LPLUT Orig, Stored;
-@@ -688,7 +687,7 @@
+@@ -688,7 +709,7 @@
  }
  
  
@@ -2221,7 +2192,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -697,7 +696,7 @@
+@@ -697,7 +718,7 @@
  }
  
  
@@ -2230,7 +2201,7 @@
  {
         LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -705,7 +704,7 @@
+@@ -705,7 +726,7 @@
         return TRUE;
  }
  
@@ -2239,7 +2210,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -714,7 +713,7 @@
+@@ -714,7 +735,7 @@
  }
  
  
@@ -2248,7 +2219,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -723,7 +722,7 @@
+@@ -723,7 +744,7 @@
  }
  
  
@@ -2257,7 +2228,7 @@
  {
      LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
  
-@@ -733,28 +732,40 @@
+@@ -733,28 +754,40 @@
  }
  
  
@@ -2304,9 +2275,9 @@
  }
 +
 +
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -2874,10 +2845,10 @@
 +        if (Curves[i] == NULL) goto Error;
          SkipAlignment(Icc);
 +    }
-+
+ 
 +    // March-26'08: some V4 profiles may have different sampling
 +    // rates, in this case resample all curves to maximum
- 
++
 +    for (i=1; i < nCurves; i++) {
 +        if (Curves[i]->nEntries != Curves[0]->nEntries) {
 +            ResampleCurves(Curves, nCurves);
@@ -4139,149 +4110,22 @@
  
      // update BytesSaved so caller knows how many bytes put into stream
      *BytesNeeded = Icc ->UsedSpace;
-@@ -3662,139 +3764,3 @@
+@@ -3662,10 +3764,10 @@
      return FALSE;
  }
  
 -BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
--				  void *data, size_t size)
--{
++LCMSBOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
+ 				  void *data, size_t size)
+ {
 -  BOOL isNew;
--  int i, idx, delta, count;
--  LPBYTE padChars[3] = {0, 0, 0};
--  LPBYTE beforeBuf, afterBuf, ptr;
--  size_t beforeSize, afterSize;
--  icUInt32Number profileSize, temp;
--  LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
--
--  isNew = FALSE;
--  idx = _cmsSearchTag(Icc, sig, FALSE);
--  if (idx < 0)
--    {
--      isNew = TRUE;
--      idx = Icc->TagCount++;
--      if (Icc->TagCount >= MAX_TABLE_TAG)
--	{
--	  fprintf(stderr, "Too many tags (%d)\n", Icc->TagCount);
--	  Icc->TagCount = MAX_TABLE_TAG-1;
--	  return FALSE;
--	}
--    }
--
--  /* Read in size from header */
--  Icc->Seek(Icc, 0);
--  Icc->Read(&profileSize, sizeof(icUInt32Number), 1, Icc);
--  AdjustEndianess32((LPBYTE) &profileSize);
--
--  /* Compute the change in profile size */
--  if (isNew)
--    delta = sizeof(icTag) + ALIGNLONG(size);
--  else
--    delta = ALIGNLONG(size) - ALIGNLONG(Icc->TagSizes[idx]);
--
--  /* Add tag to internal structures */
--  ptr = malloc(size);
--  CopyMemory(ptr, data, size);
--  Icc->TagSizes[idx] = size;
--  Icc->TagNames[idx] = sig;
--  if (Icc->TagPtrs[idx])
--    free(Icc->TagPtrs[idx]);
--  Icc->TagPtrs[idx] = ptr;
--  if (isNew)
--    Icc->TagOffsets[idx] = profileSize;
--
--  /* Compute size of tag data before/after the modified tag */
--  beforeSize = Icc->TagOffsets[idx] - Icc->TagOffsets[0];
--  if (Icc->TagCount == (idx + 1))
--    afterSize = 0;
--  else
--    afterSize = profileSize - Icc->TagOffsets[idx+1];
--
--  /* Make copies of the data before/after the modified tag */
--  if (beforeSize > 0)
--    {
--      beforeBuf = malloc(beforeSize);
--      Icc->Seek(Icc, Icc->TagOffsets[0]);
--      Icc->Read(beforeBuf, beforeSize, 1, Icc);
--    }
--  
--  if (afterSize > 0)
--    {
--      afterBuf = malloc(afterSize);
--      Icc->Seek(Icc, Icc->TagOffsets[idx+1]);
--      Icc->Read(afterBuf, afterSize, 1, Icc);
--    }
--
--  /* Update the profile size in the header */
--  profileSize += delta;
--  Icc->Seek(Icc, 0);
--  temp = TransportValue32(profileSize);
--  Icc->Write(Icc, sizeof(icUInt32Number), &temp);
--
--  Icc->Grow(Icc, delta);
--
--  /* Adjust tag offsets: if the tag is new, we must account
--     for the new tag table entry; otherwise, only those tags after
--     the modified tag are changed (by delta) */
--  if (isNew)
--    {
--      for (i = 0; i < Icc->TagCount; ++i)
--	Icc->TagOffsets[i] += sizeof(icTag);
--    }
--  else
--    {
--      for (i = idx+1; i < Icc->TagCount; ++i)
--	Icc->TagOffsets[i] += delta;
--    }
--
--  /* Write out a new tag table */
--  count = 0;
--  for (i = 0; i < Icc->TagCount; ++i)
--    {
--      if (Icc->TagNames[i] != 0)
--	++count;
--    }
--  Icc->Seek(Icc, sizeof(icHeader));
--  temp = TransportValue32(count);
--  Icc->Write(Icc, sizeof(icUInt32Number), &temp);
--
--  for (i = 0; i < Icc->TagCount; ++i)
--    {
--      if (Icc->TagNames[i] != 0)
--	{
--	  icTag tag;
--	  tag.sig = TransportValue32(Icc->TagNames[i]);
--	  tag.offset = TransportValue32((icInt32Number) Icc->TagOffsets[i]);
--	  tag.size = TransportValue32((icInt32Number) Icc->TagSizes[i]);
--	  Icc->Write(Icc, sizeof(icTag), &tag);
--	}
--    }
--
--  /* Write unchanged data before the modified tag */
--  if (beforeSize > 0)
--    {
--      Icc->Write(Icc, beforeSize, beforeBuf);
--      free(beforeBuf);
--    }
--
--  /* Write modified tag data */
--  Icc->Write(Icc, size, data);
--  if (size % 4)
--    Icc->Write(Icc, 4 - (size % 4), padChars);
--
--  /* Write unchanged data after the modified tag */
--  if (afterSize > 0)
--    {
--      Icc->Write(Icc, afterSize, afterBuf);
--      free(afterBuf);
--    }
--
--  return TRUE;
--}
--
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-03-26 15:13:30.000000000 -0400
++  LCMSBOOL isNew;
+   int i, idx, delta, count;
+   LPBYTE padChars[3] = {0, 0, 0};
+   LPBYTE beforeBuf, afterBuf, ptr;
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4437,9 +4281,9 @@
                                                         &Lut -> In16params);
                Lut ->wFlags &= ~LUT_HASTL1;
             }
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4500,9 +4344,9 @@
  }
  
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4564,9 +4408,9 @@
  {
          MAT3 m, a_1;
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4625,9 +4469,9 @@
  {
      _LPcmsTRANSFORM v = (_LPcmsTRANSFORM) xform;
  
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c	2009-04-03 13:42:46.000000000 -0400
 @@ -28,7 +28,7 @@
  // file:
  //
@@ -4809,9 +4653,9 @@
                              break;
  
                       default:;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -4821,9 +4665,9 @@
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5185,9 +5029,9 @@
  
      // Finally, return used byte count
      return dwBytesUsed;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5297,9 +5141,9 @@
  {
  
         WORD *WhitePointIn, *WhitePointOut, *BlackPointIn, *BlackPointOut;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5452,9 +5296,9 @@
  
         Lut -> InputChan = 3;
         Lut -> OutputChan = 1;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5609,9 +5453,9 @@
      if (Intent == INTENT_RELATIVE_COLORIMETRIC &&
              (cmsGetDeviceClass(hProfile) == icSigOutputClass) &&
              (cmsGetColorSpace(hProfile) == icSigCmykData))
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-03-26 15:18:47.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c	2009-04-03 13:42:46.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -5844,9 +5688,9 @@
      if ((Intent != INTENT_ABSOLUTE_COLORIMETRIC) &&
          !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP))
                              _cmsFixWhiteMisalignment(p);
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/icc34.h	2009-04-03 13:42:46.000000000 -0400
 @@ -1,5 +1,8 @@
 +/* Header file guard bands */
 +#ifndef ICC_H
@@ -5910,10 +5754,10 @@
  typedef uint8_t   icUInt8Number;
  typedef uint16_t  icUInt16Number;
  typedef uint32_t  icUInt32Number;
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-03-26 15:16:19.000000000 -0400
-@@ -356,12 +356,18 @@
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2008-11-25 04:06:03.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2009-04-03 13:44:42.000000000 -0400
+@@ -356,6 +356,12 @@
        fprintf(stderr, "setTagData on icSigHead not permitted");
        return;
      }
@@ -5926,16 +5770,9 @@
  
      sProf.j = id;
      profile = (cmsHPROFILE) sProf.pf;
-     dataArray = (*env)->GetByteArrayElements(env, data, 0);    
-     tagSize =(*env)->GetArrayLength(env, data);
--    _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-+    _cmsInitTag(profile, (icTagSignature) tagSig, tagSize, dataArray);
-     (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
- }
- 
-diff -ruN ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
---- ../openjdk6/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-03-26 15:13:30.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h
+--- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2008-11-25 04:06:04.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2009-04-03 13:43:04.000000000 -0400
 @@ -29,7 +29,7 @@
  //
  //
@@ -6305,7 +6142,7 @@
  
  // Converts a transform to a devicelink profile
  LCMSAPI cmsHPROFILE LCMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, DWORD dwFlags);
-@@ -1240,12 +1218,11 @@
+@@ -1240,12 +1218,14 @@
  
  
  // Save profile
@@ -6315,13 +6152,15 @@
 +LCMSAPI LCMSBOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr, 
                                                                  size_t* BytesNeeded);
  
--// Modify data for a tag in a profile
--LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
 +
++
+ // Modify data for a tag in a profile
+-LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
++LCMSAPI LCMSBOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
  
  // PostScript ColorRenderingDictionary and ColorSpaceArray
  
-@@ -1326,35 +1303,37 @@
+@@ -1326,35 +1306,37 @@
  // Persistence
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName);
  LCMSAPI LCMSHANDLE      LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len);
@@ -6371,7 +6210,7 @@
                                                  double Val);
  
  LCMSAPI const char*     LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
-@@ -1362,25 +1341,28 @@
+@@ -1362,25 +1344,28 @@
  
  LCMSAPI double          LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample);
  
@@ -6403,7 +6242,7 @@
  // Formatter for double
  LCMSAPI void            LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter);
  
-@@ -1406,15 +1388,16 @@
+@@ -1406,15 +1391,16 @@
  
  // Profiling Extensions --- Would be removed from API in future revisions
  
@@ -6429,7 +6268,7 @@
  
  // --------------------------------------------------------------------------------------------------- Inline functions
  
-@@ -1456,6 +1439,34 @@
+@@ -1456,6 +1442,34 @@
         return (WORD) in;
  }
  
@@ -6464,7 +6303,7 @@
  // ------------------------------------------------------------------------------------------- end of inline functions
  
  // Signal error from inside lcms code
-@@ -1542,8 +1553,8 @@
+@@ -1542,8 +1556,8 @@
  void   cdecl VEC3perK(LPVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3minus(LPVEC3 r, LPVEC3 a, LPVEC3 b);
  void   cdecl VEC3perComp(LPVEC3 r, LPVEC3 a, LPVEC3 b);
@@ -6475,7 +6314,7 @@
  void   cdecl VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d);
  void   cdecl VEC3cross(LPVEC3 r, LPVEC3 u, LPVEC3 v);
  void   cdecl VEC3saturate(LPVEC3 v);
-@@ -1554,13 +1565,13 @@
+@@ -1554,13 +1568,13 @@
  void   cdecl MAT3per(LPMAT3 r, LPMAT3 a, LPMAT3 b);
  void   cdecl MAT3perK(LPMAT3 r, LPMAT3 v, double d);
  int    cdecl MAT3inverse(LPMAT3 a, LPMAT3 b);
@@ -6491,7 +6330,7 @@
  void   cdecl MAT3scaleAndCut(LPWMAT3 r, LPMAT3 v, double d);
  
  // Is a table linear?
-@@ -1609,7 +1620,7 @@
+@@ -1609,7 +1623,7 @@
  void    cdecl cmsCalcL16Params(int nSamples, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16Params(int nSamples, int InputChan, int OutputChan, LPL16PARAMS p);
  void    cdecl cmsCalcCLUT16ParamsEx(int nSamples, int InputChan, int OutputChan,
@@ -6500,7 +6339,7 @@
  
  WORD    cdecl cmsLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p);
  Fixed32 cdecl cmsLinearInterpFixed(WORD Value1, WORD LutTable[], LPL16PARAMS p);
-@@ -1693,7 +1704,7 @@
+@@ -1693,7 +1707,7 @@
  
                 // Gray axes fixup. Only on v2 8-bit Lab LUT
  
@@ -6509,7 +6348,7 @@
  
  
                             // Parameters used for curve creation
-@@ -1704,7 +1715,7 @@
+@@ -1704,7 +1718,7 @@
                 }; // LUT, FAR* LPLUT;
  
  
@@ -6518,7 +6357,7 @@
  
  
  // CRC of gamma tables
-@@ -1722,7 +1733,7 @@
+@@ -1722,7 +1736,7 @@
  
  void           cdecl cmsEndpointsOfSampledCurve(LPSAMPLEDCURVE p, double* Min, double* Max);
  void           cdecl cmsClampSampledCurve(LPSAMPLEDCURVE p, double Min, double Max);
@@ -6527,7 +6366,7 @@
  void           cdecl cmsRescaleSampledCurve(LPSAMPLEDCURVE p, double Min, double Max, int nPoints);
  
  LPSAMPLEDCURVE cdecl cmsJoinSampledCurves(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints);
-@@ -1756,7 +1767,7 @@
+@@ -1756,7 +1770,7 @@
  void        cdecl cmsFreeMatShaper(LPMATSHAPER MatShaper);
  void        cdecl cmsEvalMatShaper(LPMATSHAPER MatShaper, WORD In[], WORD Out[]);
  
@@ -6536,7 +6375,7 @@
  
  LPMATSHAPER  cdecl cmsBuildInputMatrixShaper(cmsHPROFILE InputProfile);
  LPMATSHAPER  cdecl cmsBuildOutputMatrixShaper(cmsHPROFILE OutputProfile);
-@@ -1764,11 +1775,11 @@
+@@ -1764,11 +1778,11 @@
  
  
  // White Point & Primary chromas handling
@@ -6552,7 +6391,7 @@
  
  // Inter-PCS conversion routines. They assume D50 as white point.
  void cdecl cmsXYZ2LabEncoded(WORD XYZ[3], WORD Lab[3]);
-@@ -1783,7 +1794,7 @@
+@@ -1783,7 +1797,7 @@
  LPcmsNAMEDCOLORLIST  cdecl cmsAllocNamedColorList(int n);
  int                  cdecl cmsReadICCnamedColorList(cmsHTRANSFORM xform, cmsHPROFILE hProfile, icTagSignature sig);
  void                 cdecl cmsFreeNamedColorList(LPcmsNAMEDCOLORLIST List);
@@ -6561,7 +6400,7 @@
  
  
  // I/O
-@@ -1827,8 +1838,8 @@
+@@ -1827,8 +1841,8 @@
  
                 char                    PhysicalFile[MAX_PATH];
  
@@ -6572,7 +6411,7 @@
  
                 struct tm               Created;
  
-@@ -1836,14 +1847,13 @@
+@@ -1836,14 +1850,13 @@
  
                 size_t (* Read)(void *buffer, size_t size, size_t count, struct _lcms_iccprofile_struct* Icc);
  
@@ -6582,7 +6421,8 @@
 +               LCMSBOOL (* Close)(struct _lcms_iccprofile_struct* Icc);
                 size_t (* Tell)(struct _lcms_iccprofile_struct* Icc);
 -               BOOL   (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
- 
+-
++               LCMSBOOL   (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
                 // Writting
  
 -               BOOL   (* Write)(struct _lcms_iccprofile_struct* Icc, size_t size, LPVOID Ptr);
@@ -6590,7 +6430,7 @@
  
                 size_t UsedSpace;
  
-@@ -1855,7 +1865,7 @@
+@@ -1855,7 +1868,7 @@
  cmsHPROFILE cdecl _cmsCreateProfilePlaceholder(void);
  
  // Search into tag dictionary
@@ -6599,7 +6439,7 @@
  
  // Search for a particular tag, replace if found or add new one else
  LPVOID _cmsInitTag(LPLCMSICCPROFILE Icc, icTagSignature sig, size_t size, const void* Init);
-@@ -1871,6 +1881,7 @@
+@@ -1871,6 +1884,7 @@
  
  // These macros unpack format specifiers into integers
  
@@ -6607,7 +6447,7 @@
  #define T_COLORSPACE(s)       (((s)>>16)&31)
  #define T_SWAPFIRST(s)        (((s)>>14)&1)
  #define T_FLAVOR(s)           (((s)>>13)&1)
-@@ -1967,7 +1978,7 @@
+@@ -1967,7 +1981,7 @@
  
                      // Flag for transform involving v4 profiles
  
@@ -6616,7 +6456,7 @@
  
  
                      // 1-pixel cache
-@@ -2014,7 +2025,7 @@
+@@ -2014,7 +2028,7 @@
  
  // Clamping & Gamut handling
  
@@ -6625,7 +6465,7 @@
                              WORD **White, WORD **Black, int *nOutputs);
  
  WORD * cdecl _cmsWhiteBySpace(icColorSpaceSignature Space);
-@@ -2043,7 +2054,7 @@
+@@ -2043,7 +2057,7 @@
  LPLUT cdecl _cmsPrecalculateGamutCheck(cmsHTRANSFORM h);
  
  // Hot fixes bad profiles
@@ -6634,7 +6474,7 @@
  
  // Marks LUT as 8 bit on input
  LPLUT cdecl _cmsBlessLUT8(LPLUT Lut);
-@@ -2061,6 +2072,10 @@
+@@ -2061,6 +2075,10 @@
  // Build a tone curve for K->K' if possible (only works on CMYK)
  LPGAMMATABLE _cmsBuildKToneCurve(cmsHTRANSFORM hCMYK2CMYK, int nPoints);
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- java-1.6.0-openjdk.spec	2 Apr 2009 13:50:21 -0000	1.66
+++ java-1.6.0-openjdk.spec	6 Apr 2009 14:08:18 -0000	1.67
@@ -134,7 +134,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.24.%{openjdkver}%{?dist}
+Release: 0.25.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -931,6 +931,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-25.b14
+- Updated java-1.6.0-openjdk-lcms.patch
+
 * Thu Apr  2 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.24.b09
 - Updated java-1.6.0-openjdk-lcms.patch.
 - Resolves: rhbz#493276



From mmaslano at fedoraproject.org  Mon Apr  6 14:28:53 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon,  6 Apr 2009 14:28:53 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel .cvsignore, 1.18, 1.19 perl-DBD-MySQL.spec,
	1.43, 1.44 sources, 1.18, 1.19
Message-ID: <20090406142853.32FC4700FB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9582

Modified Files:
	.cvsignore perl-DBD-MySQL.spec sources 
Log Message:
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4.010-1
- update to the latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Aug 2007 19:07:46 -0000	1.18
+++ .cvsignore	6 Apr 2009 14:28:22 -0000	1.19
@@ -1 +1 @@
-DBD-mysql-4.005.tar.gz
+DBD-mysql-4.010.tar.gz


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- perl-DBD-MySQL.spec	26 Feb 2009 14:07:12 -0000	1.43
+++ perl-DBD-MySQL.spec	6 Apr 2009 14:28:22 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
-Version:        4.005
-Release:        10%{?dist}
+Version:        4.010
+Release:        1%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://www.cpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBI) >= 1.607
 BuildRequires:  mysql, mysql-devel, zlib-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4.010-1
+- update to the latest version
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.005-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Aug 2007 19:07:46 -0000	1.18
+++ sources	6 Apr 2009 14:28:22 -0000	1.19
@@ -1 +1 @@
-39181a061348ad76b67c99326873ccd5  DBD-mysql-4.005.tar.gz
+a63c9f73afef70b6c80d899424b003e9  DBD-mysql-4.010.tar.gz



From pghmcfc at fedoraproject.org  Mon Apr  6 14:33:39 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  6 Apr 2009 14:33:39 +0000 (UTC)
Subject: rpms/bittorrent/devel bittorrent-4.4.0-bencode-float.patch, NONE,
	1.1 bittorrent-4.4.0-keyerror.patch, NONE, 1.1 bittorrent.spec,
	1.48, 1.49
Message-ID: <20090406143339.F12B87013C@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/bittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10829

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.4.0-bencode-float.patch 
	bittorrent-4.4.0-keyerror.patch 
Log Message:
- Add support for floating point values in bencode (#451496), resolving
  tracebacks with KeyError: <type 'float'>
  (thanks to Oleg Aprotskiy for the patch)
- Don't apply format string patch; it serves no purpose really
- Fix for KeyError: 'max_incomplete' in tracker (#451496)
- Define RPM macros in global context in spec file


bittorrent-4.4.0-bencode-float.patch:

--- NEW FILE bittorrent-4.4.0-bencode-float.patch ---
diff -ur BitTorrent-4.4.0.orig/BitTorrent/bencode.py BitTorrent-4.4.0/BitTorrent/bencode.py
--- BitTorrent-4.4.0.orig/BitTorrent/bencode.py	2006-01-31 20:16:33.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/bencode.py	2009-04-03 13:54:12.000000000 +0100
@@ -14,6 +14,8 @@
 
 from BitTorrent import BTFailure
 
+import string
+
 def decode_int(x, f):
     f += 1
     newf = x.index('e', f)
@@ -25,6 +27,23 @@
         raise ValueError
     return (n, newf+1)
 
+def assert_finite(n):
+  """Raises ValueError if n is NaN or infinite."""
+
+  valid_chars = '0123456789.-+eE'
+  if repr(n).translate(string.maketrans('',''), valid_chars) != '':
+    raise ValueError('encountered NaN or infinite')
+
+def decode_float(x, f):
+    f += 1
+    newf = x.index('e', f)
+    try:
+        n = float(x[f:newf].replace('E', 'e'))
+        assert_finite(n)
+    except (OverflowError, ValueError):
+        raise ValueError('encountered NaN or infinite')
+    return (n, newf+1)
+
 def decode_string(x, f):
     colon = x.index(':', f)
     n = int(x[f:colon])
@@ -55,6 +74,7 @@
 decode_func['l'] = decode_list
 decode_func['d'] = decode_dict
 decode_func['i'] = decode_int
+decode_func['f'] = decode_float
 decode_func['0'] = decode_string
 decode_func['1'] = decode_string
 decode_func['2'] = decode_string
@@ -75,7 +95,7 @@
         raise BTFailure, _("invalid bencoded value (data after valid prefix)")
     return r
 
-from types import StringType, IntType, LongType, DictType, ListType, TupleType
+from types import StringType, IntType, LongType, DictType, ListType, TupleType, FloatType
 
 
 class Bencached(object):
@@ -91,6 +111,10 @@
 def encode_int(x, r):
     r.extend(('i', str(x), 'e'))
 
+def encode_float(x, r):
+    assert_finite(x)
+    r.extend(('f', repr(x).replace('e', 'E'), 'e'))
+
 def encode_bool(x, r):
     if x:
         encode_int(1, r)
@@ -119,6 +143,7 @@
 encode_func[Bencached] = encode_bencached
 encode_func[IntType] = encode_int
 encode_func[LongType] = encode_int
+encode_func[FloatType] = encode_float
 encode_func[StringType] = encode_string
 encode_func[ListType] = encode_list
 encode_func[TupleType] = encode_list

bittorrent-4.4.0-keyerror.patch:

--- NEW FILE bittorrent-4.4.0-keyerror.patch ---
--- BitTorrent-4.4.0/BitTorrent/track.py	2009-04-06 14:00:39.000000000 +0100
+++ BitTorrent-4.4.0/BitTorrent/track.py	2009-04-06 14:01:22.000000000 +0100
@@ -107,6 +107,8 @@
      _("scrape access allowed (can be none, specific or full)")),
     ('max_give', 200,
      _("maximum number of peers to give with any one request")),
+    ('max_incomplete', 100,
+     _("max number of outgoing incomplete connections")),
     ('twisted', -1,
      _("Use Twisted network libraries for network connections. 1 means use twisted, 0 means do not use twisted, -1 means autodetect, and prefer twisted")),
     ('pid', '/var/run/bittorrent-tracker.pid',


Index: bittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- bittorrent.spec	1 Mar 2009 13:21:17 -0000	1.48
+++ bittorrent.spec	6 Apr 2009 14:33:09 -0000	1.49
@@ -1,15 +1,15 @@
 # A few useful macros
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define desktopvendor	fedora
-%define bt_dir		%{_localstatedir}/lib/bittorrent
-%define bt_datadir	%{bt_dir}/data
-%define bt_statedir	%{bt_dir}/state
-%define pkidir		%{_sysconfdir}/pki
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global desktopvendor	fedora
+%global bt_dir		%{_localstatedir}/lib/bittorrent
+%global bt_datadir	%{bt_dir}/data
+%global bt_statedir	%{bt_dir}/state
+%global pkidir		%{_sysconfdir}/pki
 
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
 Version:	4.4.0
-Release:	10%{?dist}
+Release:	11%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent
 URL:		http://www.bittorrent.com/
@@ -27,6 +27,8 @@
 Patch5:		bittorrent-4.4.0-fastresume.patch
 Patch6:		bittorrent-4.4.0-syntax.patch
 Patch7:		bittorrent-4.4.0-formatstrings.patch
+Patch8:		bittorrent-4.4.0-bencode-float.patch
+Patch9:		bittorrent-4.4.0-keyerror.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel >= 2.4.0, desktop-file-utils, gettext
@@ -96,7 +98,17 @@
 %patch6 -p1 -b .syntax
 
 # Fix format strings that can't be properly translated
+# Not much point doing this really as translations don't work anyway and
+# it doesn't prevent the build itself from working
+%if 0
 %patch7 -p1 -b .strings
+%endif
+
+# Add bencode support for floating point values (#451496)
+%patch8 -p1 -b .float
+
+# Fix keyerror on tracker (#451496)
+%patch9 -p1 -b .keyerror
 
 # Update icon
 %{__sed} -i -e 's,bittorrent\.png,%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png,' \
@@ -237,6 +249,14 @@
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Mon Apr  6 2009 Paul Howarth <paul at city-fan.org> 4.4.0-11
+- Add support for floating point values in bencode (#451496), resolving
+  tracebacks with KeyError: <type 'float'>
+  (thanks to Oleg Aprotskiy for the patch)
+- Don't apply format string patch; it serves no purpose really
+- Fix for KeyError: 'max_incomplete' in tracker (#451496)
+- Define RPM macros in global context in spec file
+
 * Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 4.4.0-10
 - Fix syntax issues causing failure to build for Fedora 11
 - Update format strings to enable re-ordering of parameters in translations



From dwalsh at fedoraproject.org  Mon Apr  6 14:44:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  6 Apr 2009 14:44:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.78,1.79
Message-ID: <20090406144452.412C4700FB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14154

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-9
- Allow podsleuth to use tmpfs files


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- policy-20090105.patch	3 Apr 2009 21:27:39 -0000	1.78
+++ policy-20090105.patch	6 Apr 2009 14:44:51 -0000	1.79
@@ -3384,8 +3384,8 @@
 +/usr/bin/pulseaudio	--	gen_context(system_u:object_r:pulseaudio_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.10/policy/modules/apps/pulseaudio.if
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.if	2009-04-03 17:24:36.000000000 -0400
-@@ -0,0 +1,147 @@
++++ serefpolicy-3.6.10/policy/modules/apps/pulseaudio.if	2009-04-06 08:51:37.000000000 -0400
+@@ -0,0 +1,148 @@
 +
 +## <summary>policy for pulseaudio</summary>
 +
@@ -3470,6 +3470,7 @@
 +interface(`pulseaudio_role',`
 +	gen_require(`
 +		type pulseaudio_t, pulseaudio_exec_t, print_spool_t;
++		class dbus { send_msg };
 +	')
 +
 +	role $1 types pulseaudio_t;
@@ -10708,7 +10709,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.10/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/dbus.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/dbus.te	2009-04-06 08:40:45.000000000 -0400
 @@ -9,14 +9,15 @@
  #
  # Delcarations
@@ -10801,7 +10802,7 @@
  
  logging_send_audit_msgs(system_dbusd_t)
  logging_send_syslog_msg(system_dbusd_t)
-@@ -128,9 +149,37 @@
+@@ -128,9 +149,38 @@
  ')
  
  optional_policy(`
@@ -10838,6 +10839,7 @@
 +')
 +
 +allow dbusd_unconfined session_bus_type:dbus all_dbus_perms;
++allow dbusd_unconfined dbusd_unconfined:dbus all_dbus_perms;
 +allow session_bus_type dbusd_unconfined:dbus send_msg;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.fc serefpolicy-3.6.10/policy/modules/services/dcc.fc
 --- nsaserefpolicy/policy/modules/services/dcc.fc	2008-08-07 11:15:11.000000000 -0400
@@ -16403,7 +16405,7 @@
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.10/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/services/postfix.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/services/postfix.if	2009-04-06 08:26:28.000000000 -0400
 @@ -46,6 +46,7 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
@@ -27760,7 +27762,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.10/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-03 16:55:31.000000000 -0400
++++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-06 08:22:27.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  



From kengert at fedoraproject.org  Mon Apr  6 14:47:23 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Mon,  6 Apr 2009 14:47:23 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.63,1.64
Message-ID: <20090406144723.80BDD700FB@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14756

Modified Files:
	nss.spec 
Log Message:
* Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-7
- temporarily disable the test suite because of bug 494266



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- nss.spec	6 Apr 2009 10:33:23 -0000	1.63
+++ nss.spec	6 Apr 2009 14:46:53 -0000	1.64
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.99.3
-Release:          6%{?dist}
+Release:          7%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -214,20 +214,21 @@
 
 killall $RANDSERV || :
 
-rm -rf ./mozilla/tests_results
-cd ./mozilla/security/nss/tests/
-# all.sh is the test suite script
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
-cd ../../../../
-
-killall $RANDSERV || :
-
-TEST_FAILURES=`grep -c FAILED ./mozilla/tests_results/security/localhost.1/output.log` || :
-if [ $TEST_FAILURES -ne 0 ]; then
-  echo "error: test suite returned failure(s)"
-  exit 1
-fi
-echo "test suite completed"
+#temporarily disable the test suite because of bug 494266
+#rm -rf ./mozilla/tests_results
+#cd ./mozilla/security/nss/tests/
+## all.sh is the test suite script
+#HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
+#cd ../../../../
+
+#killall $RANDSERV || :
+
+#TEST_FAILURES=`grep -c FAILED ./mozilla/tests_results/security/localhost.1/output.log` || :
+#if [ $TEST_FAILURES -ne 0 ]; then
+#  echo "error: test suite returned failure(s)"
+#  exit 1
+#fi
+#echo "test suite completed"
 
 
 %install
@@ -469,6 +470,8 @@
 
 
 %changelog
+* Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-7
+- temporarily disable the test suite because of bug 494266
 * Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-6
 - fix softokn-freebl dependency for multilib (bug 494122)
 * Thu Apr 02 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-5



From pghmcfc at fedoraproject.org  Mon Apr  6 14:48:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  6 Apr 2009 14:48:46 +0000 (UTC)
Subject: rpms/bittorrent/F-10 bittorrent-4.4.0-bencode-float.patch, NONE,
	1.1 bittorrent-4.4.0-formatstrings.patch, NONE,
	1.1 bittorrent-4.4.0-keyerror.patch, NONE,
	1.1 bittorrent-4.4.0-syntax.patch, NONE,
	1.1 bittorrent-4.4.0-threads-warning.patch, 1.1,
	1.2 bittorrent.desktop, 1.3, 1.4 bittorrent.spec, 1.44,
	1.45 bittorrent-5.0.1-shellbang.patch, 1.1,
	NONE bittorrent-5.0.5-wxversion.patch, 1.1, NONE
Message-ID: <20090406144846.C30B0700FB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/bittorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15243

Modified Files:
	bittorrent-4.4.0-threads-warning.patch bittorrent.desktop 
	bittorrent.spec 
Added Files:
	bittorrent-4.4.0-bencode-float.patch 
	bittorrent-4.4.0-formatstrings.patch 
	bittorrent-4.4.0-keyerror.patch bittorrent-4.4.0-syntax.patch 
Removed Files:
	bittorrent-5.0.1-shellbang.patch 
	bittorrent-5.0.5-wxversion.patch 
Log Message:
Resync with devel

bittorrent-4.4.0-bencode-float.patch:

--- NEW FILE bittorrent-4.4.0-bencode-float.patch ---
diff -ur BitTorrent-4.4.0.orig/BitTorrent/bencode.py BitTorrent-4.4.0/BitTorrent/bencode.py
--- BitTorrent-4.4.0.orig/BitTorrent/bencode.py	2006-01-31 20:16:33.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/bencode.py	2009-04-03 13:54:12.000000000 +0100
@@ -14,6 +14,8 @@
 
 from BitTorrent import BTFailure
 
+import string
+
 def decode_int(x, f):
     f += 1
     newf = x.index('e', f)
@@ -25,6 +27,23 @@
         raise ValueError
     return (n, newf+1)
 
+def assert_finite(n):
+  """Raises ValueError if n is NaN or infinite."""
+
+  valid_chars = '0123456789.-+eE'
+  if repr(n).translate(string.maketrans('',''), valid_chars) != '':
+    raise ValueError('encountered NaN or infinite')
+
+def decode_float(x, f):
+    f += 1
+    newf = x.index('e', f)
+    try:
+        n = float(x[f:newf].replace('E', 'e'))
+        assert_finite(n)
+    except (OverflowError, ValueError):
+        raise ValueError('encountered NaN or infinite')
+    return (n, newf+1)
+
 def decode_string(x, f):
     colon = x.index(':', f)
     n = int(x[f:colon])
@@ -55,6 +74,7 @@
 decode_func['l'] = decode_list
 decode_func['d'] = decode_dict
 decode_func['i'] = decode_int
+decode_func['f'] = decode_float
 decode_func['0'] = decode_string
 decode_func['1'] = decode_string
 decode_func['2'] = decode_string
@@ -75,7 +95,7 @@
         raise BTFailure, _("invalid bencoded value (data after valid prefix)")
     return r
 
-from types import StringType, IntType, LongType, DictType, ListType, TupleType
+from types import StringType, IntType, LongType, DictType, ListType, TupleType, FloatType
 
 
 class Bencached(object):
@@ -91,6 +111,10 @@
 def encode_int(x, r):
     r.extend(('i', str(x), 'e'))
 
+def encode_float(x, r):
+    assert_finite(x)
+    r.extend(('f', repr(x).replace('e', 'E'), 'e'))
+
 def encode_bool(x, r):
     if x:
         encode_int(1, r)
@@ -119,6 +143,7 @@
 encode_func[Bencached] = encode_bencached
 encode_func[IntType] = encode_int
 encode_func[LongType] = encode_int
+encode_func[FloatType] = encode_float
 encode_func[StringType] = encode_string
 encode_func[ListType] = encode_list
 encode_func[TupleType] = encode_list

bittorrent-4.4.0-formatstrings.patch:

--- NEW FILE bittorrent-4.4.0-formatstrings.patch ---
xgettext wants named parameters in format strings so that they can be
re-ordered in translations. This will break the existing translations but
they don't actually work since Fedora 6 and python 2.4 anyway
(http://bugzilla.redhat.com/237254)

--- BitTorrent-4.4.0/bittorrent.py	2006-01-31 20:16:42.000000000 +0000
+++ BitTorrent-4.4.0/bittorrent.py	2009-02-25 10:28:11.000000000 +0000
@@ -527,7 +527,7 @@
         self.label = gtk.Label()
         self.label.set_markup(
             (_("A newer version of %s is available.\n") % app_name) +
-            (_("You are using %s, and the new version is %s.\n") % (version, newversion)) +
+            (_("You are using %(version)s, and the new version is %(newversion)s.\n") % dict(version = version, newversion = newversion)) +
             (_("You can always get the latest version from \n%s") % self.download_url)
             ) 
         self.label.set_selectable(True)
@@ -2198,18 +2198,18 @@
             self.share_ratio = FancyLabel(_("Share ratio: %0.02f%%"), 0)
             self.extrabox.pack_start(lalign(self.share_ratio))
 
-            self.peer_info = FancyLabel(_("%s peers, %s seeds. Totals from "
-                                          "tracker: %s"), 0, 0, 'NA')
+            self.peer_info = FancyLabel(_("%(peers)s peers, %(seeds)s seeds. Totals from "
+                                          "tracker: %(totals)s"), dict(peers = 0, seeds = 0, totals = 'NA'))
             self.extrabox.pack_start(lalign(self.peer_info))
 
-            self.dist_copies = FancyLabel(_("Distributed copies: %d; Next: %s"), 0, '')
+            self.dist_copies = FancyLabel(_("Distributed copies: %(copies)d; Next: %(next)s"), dict(copies = 0, next = ''))
             self.extrabox.pack_start(lalign(self.dist_copies))
 
-            self.piece_info = FancyLabel(_("Pieces: %d total, %d complete, "
-                                           "%d partial, %d active (%d empty)"), *(0,)*5)
+            self.piece_info = FancyLabel(_("Pieces: %(a)d total, %(b)d complete, "
+                                           "%(c)d partial, %(d)d active (%(e)d empty)"), dict(a = 0, b = 0, c = 0, d = 0, e = 0))
             self.extrabox.pack_start(lalign(self.piece_info))
 
-            self.bad_info = FancyLabel(_("%d bad pieces + %s in discarded requests"), 0, 0)
+            self.bad_info = FancyLabel(_("%(bad)d bad pieces + %(discard)s in discarded requests"), dict(bad = 0, discard = 0))
             self.extrabox.pack_start(lalign(self.bad_info))
 
             # extra info
@@ -2266,7 +2266,7 @@
     rate_label = ': %s'
     eta_label = '?'
     done_label = _("Done")
-    progress_bar_label = _("%.1f%% done, %s remaining")
+    progress_bar_label = _("%(pcdone).1f%% done, %(pcrem)s remaining")
     down_rate_label = _("Download rate")
     up_rate_label = _("Upload rate"  )
     
@@ -2306,7 +2306,7 @@
         else:
             self.progressbar.set_fraction(fractionDone)
             progress_bar_label = self.progress_bar_label % \
-                                 (int(fractionDone*1000)/10, eta_label) 
+                                 dict(pcdone = int(fractionDone*1000)/10, pcrem = eta_label) 
             self.progressbar.set_text(progress_bar_label)
             
 
@@ -3162,8 +3162,8 @@
     def confirm_install_new_version(self):
         MessageDialog(self.mainwindow,
                       _("Install new %s now?")%app_name,
-                      _("Do you want to quit %s and install the new version, "
-                        "%s, now?")%(app_name,self.updater.version),
+                      _("Do you want to quit %(app)s and install the new version, "
+                        "%(vers)s, now?")%dict(app = app_name, vers = self.updater.version),
                       type=gtk.MESSAGE_QUESTION,
                       buttons=gtk.BUTTONS_YES_NO,
                       yesfunc=self.install_new_version,
@@ -3178,8 +3178,8 @@
 
     def open_help(self,widget):
         if self.helpwindow is None:
-            msg = (_("%s help is at \n%s\nWould you like to go there now?")%
-                  (app_name, HELP_URL))
+            msg = (_("%(app)s help is at \n%(url)s\nWould you like to go there now?")%
+                  dict(app = app_name, url = HELP_URL))
             self.helpwindow = MessageDialog(self.mainwindow,
                                             _("Visit help web page?"),
                                             msg,
--- BitTorrent-4.4.0/maketorrent.py	2006-01-31 20:16:52.000000000 +0000
+++ BitTorrent-4.4.0/maketorrent.py	2009-02-25 10:42:28.000000000 +0000
@@ -57,7 +57,7 @@
         self.mainwindow = self # temp hack to make modal win32 file choosers work
         self.tooltips = gtk.Tooltips()
         self.connect('destroy', self.quit)
-        self.set_title(_("%s torrent file creator %s")%(app_name, version))
+        self.set_title(_("%(app)s torrent file creator %(ver)s")%dict(app = app_name, ver = version))
         self.set_border_width(SPACING)
 
         self.config = config
--- BitTorrent-4.4.0/BitTorrent/GUI.py	2009-02-25 10:40:14.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/GUI.py	2009-02-25 10:46:49.000000000 +0000
@@ -203,9 +203,9 @@
         elif self >= 86400:
             return _("1 day %d hours") % ((self-86400)//3600) # 1-2 days
         elif self >= 3600:
-            return _("%d:%02d hours") % (self//3600, (self%3600)//60) # 1 h - 1 day
+            return _("%(hour)d:%(min)02d hours") % dict(hour = self//3600, min = (self%3600)//60) # 1 h - 1 day
         elif self >= 60:
-            return _("%d:%02d minutes") % (self//60, self%60) # 1 minute to 1 hour
+            return _("%(min)d:%(sec)02d minutes") % dict(min = self//60, sec = self%60) # 1 minute to 1 hour
         elif self >= 0:
             return _("%d seconds") % int(self)
         else:
--- BitTorrent-4.4.0/BitTorrent/TorrentQueue.py	2006-01-31 20:16:32.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/TorrentQueue.py	2009-02-25 10:49:00.000000000 +0000
@@ -672,11 +672,11 @@
                'max_running_torrents'] or self.config['def_running_torrents']):
                 if force_running:
                     self.global_error(ERROR,
-                                      _("Can't run more than %d torrents " 
+                                      _("Can't run more than %(maxt)d torrents " 
                                         "simultaneously. For more info see the"
-                                        " FAQ at %s.")%
-                                      (self.config['max_running_torrents'],
-                                       FAQ_URL))
+                                        " FAQ at %(url)s.")%
+                                      dict(maxt = self.config['max_running_torrents'],
+                                       url = FAQ_URL))
                 newstate = QUEUED
                 pos = 0
         l = self._get_list(newstate)
--- BitTorrent-4.4.0/BitTorrent/NewVersion.py	2009-02-25 10:40:14.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/NewVersion.py	2009-02-25 10:52:16.000000000 +0000
@@ -242,7 +242,7 @@
         else:
             self.errorfunc(WARNING,
                            _("Could not find a suitable temporary location to "
-                             "save the %s %s installer.") % (app_name, self.version))
+                             "save the %(app)s %(ver)s installer.") % dict(app = app_name, ver = self.version))
 
     def installer_downloaded(self):
         if self.installer_path() and os.access(self.installer_path(), os.F_OK):
@@ -260,8 +260,8 @@
         if self.torrentfile is not None:
             self.startfunc(self.torrentfile, self.installer_path())
         else:
-            self.errorfunc(WARNING, _("No torrent file available for %s %s "
-                                      "installer.")%(app_name, self.version))
+            self.errorfunc(WARNING, _("No torrent file available for %(app)s %(ver)s "
+                                      "installer.")%dict(app = app_name, ver = self.version))
 
     def start_install(self):
         if not self.asked_for_install:
@@ -270,9 +270,9 @@
                 self.installfunc()
             else:
                 self.errorfunc(WARNING,
-                               _("%s %s installer appears to be incomplete, "
-                                 "missing, or corrupt.")%(app_name,
-                                                          self.version))
+                               _("%(app)s %(ver)s installer appears to be incomplete, "
+                                 "missing, or corrupt.")%dict(app = app_name,
+                                                          ver = self.version))
 
     def launch_installer(self, torrentqueue):
         if os.name == 'nt':
--- BitTorrent-4.4.0/bittorrent-console.py	2006-01-31 20:16:36.000000000 +0000
+++ BitTorrent-4.4.0/bittorrent-console.py	2009-02-25 11:06:26.000000000 +0000
@@ -46,7 +46,7 @@
         return _("<unknown>")
     m, s = divmod(n, 60)
     h, m = divmod(m, 60)
-    return _("finishing in %d:%02d:%02d") % (h, m, s)
+    return _("finishing in %(h)d:%(m)02d:%(s)02d") % dict(h = h, m = m, s = s)
 
 def fmtsize(n):
     s = str(n)
@@ -127,22 +127,22 @@
         if downTotal is not None:
             upTotal = statistics['upTotal']
             if downTotal <= upTotal / 100:
-                self.shareRating = _("oo  (%.1f MB up / %.1f MB down)") % (
-                    upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("oo  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                    up = upTotal / (1<<20), down = downTotal / (1<<20))
             else:
-                self.shareRating = _("%.3f  (%.1f MB up / %.1f MB down)") % (
-                   upTotal / downTotal, upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("%(ratio).3f  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                   ratio = upTotal / downTotal, up = upTotal / (1<<20), down = downTotal / (1<<20))
             numCopies = statistics['numCopies']
             nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
                     zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
             if not self.done:
-                self.seedStatus = _("%d seen now, plus %d distributed copies "
-                                    "(%s)") % (statistics['numSeeds' ],
-                                               statistics['numCopies'],
-                                               nextCopies)
+                self.seedStatus = _("%(s)d seen now, plus %(d)d distributed copies "
+                                    "(%(n)s)") % dict(s = statistics['numSeeds' ],
+                                               d = statistics['numCopies'],
+                                               n = nextCopies)
             else:
-                self.seedStatus = _("%d distributed copies (next: %s)") % (
-                    statistics['numCopies'], nextCopies)
+                self.seedStatus = _("%(d)d distributed copies (next: %(n)s)") % dict(
+                    d = statistics['numCopies'], n = nextCopies)
             self.peerStatus = _("%d seen now") % statistics['numPeers']
 
         for err in self.errors[-4:]:
--- BitTorrent-4.4.0/bittorrent-curses.py	2006-01-31 20:16:36.000000000 +0000
+++ BitTorrent-4.4.0/bittorrent-curses.py	2009-02-25 11:13:24.000000000 +0000
@@ -65,7 +65,7 @@
         return _("<unknown>")
     m, s = divmod(n, 60)
     h, m = divmod(m, 60)
-    return _("finishing in %d:%02d:%02d") % (h, m, s)
+    return _("finishing in %(h)d:%(m)02d:%(s)02d") % dict(h = h, m = m, s = s)
 
 def fmtsize(n):
     s = str(n)
@@ -228,22 +228,22 @@
         if downTotal is not None:
             upTotal = statistics['upTotal']
             if downTotal <= upTotal / 100:
-                self.shareRating = _("oo  (%.1f MB up / %.1f MB down)") % (
-                    upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("oo  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                    up = upTotal / (1<<20), down = downTotal / (1<<20))
             else:
-                self.shareRating = _("%.3f  (%.1f MB up / %.1f MB down)") % (
-                   upTotal / downTotal, upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("%(ratio).3f  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                   ratio = upTotal / downTotal, up = upTotal / (1<<20), down = downTotal / (1<<20))
             numCopies = statistics['numCopies']
             nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
                     zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
             if not self.done:
-                self.seedStatus = _("%d seen now, plus %d distributed copies"
-                                    "(%s)") % (statistics['numSeeds' ],
-                                               statistics['numCopies'],
-                                               nextCopies)
+                self.seedStatus = _("%(s)d seen now, plus %(d)d distributed copies"
+                                    "(%(n)s)") % dict(s = statistics['numSeeds' ],
+                                               d = statistics['numCopies'],
+                                               n = nextCopies)
             else:
-                self.seedStatus = _("%d distributed copies (next: %s)") % (
-                    statistics['numCopies'], nextCopies)
+                self.seedStatus = _("%(d)d distributed copies (next: %(n)s)") % dict(
+                    d = statistics['numCopies'], n = nextCopies)
             self.peerStatus = _("%d seen now") % statistics['numPeers']
 
         self.fieldwin.erase()
@@ -321,10 +321,10 @@
                     self.spewwin.addnstr(i+3, 64, '%5.0f KB/s' % (spew[i]['speed']/1000), 10)
 
             self.spewwin.addnstr(self.spewh-1, 0,
-                    _("downloading %d pieces, have %d fragments, "
-                      "%d of %d pieces completed") %
-                    (statistics['storage_active'], statistics['storage_dirty'],
-                     statistics['storage_numcomplete'], self.numpieces),
+                    _("downloading %(p)d pieces, have %(f)d fragments, "
+                      "%(c)d of %(n)d pieces completed") %
+                    dict(p = statistics['storage_active'], f = statistics['storage_dirty'],
+                     c = statistics['storage_numcomplete'], n = self.numpieces),
                     self.speww-1)
 
         curses.panel.update_panels()
--- BitTorrent-4.4.0/changetracker-console.py	2006-01-31 20:16:42.000000000 +0000
+++ BitTorrent-4.4.0/changetracker-console.py	2009-02-25 13:27:33.000000000 +0000
@@ -29,7 +29,7 @@
     metainfo = bdecode(h.read())
     h.close()
     if metainfo['announce'] != argv[1]:
-        print _("old announce for %s: %s") % (f, metainfo['announce'])
+        print _("old announce for %(f)s: %(a)s") % dict(f = f, a = metainfo['announce'])
         metainfo['announce'] = argv[1]
         h = open(f, 'wb')
         h.write(bencode(metainfo))
--- BitTorrent-4.4.0/launchmany-curses.py	2006-01-31 20:16:51.000000000 +0000
+++ BitTorrent-4.4.0/launchmany-curses.py	2009-02-25 13:31:36.000000000 +0000
@@ -57,7 +57,7 @@
     h, m = divmod(m, 60)
     if h > 1000000:
         return _("connecting to peers")
-    return _("ETA in %d:%02d:%02d") % (h, m, s)
+    return _("ETA in %(h)d:%(m)02d:%(s)02d") % dict(h = h, m = m, s = s)
 
 def fmtsize(n):
     n = long(n)
@@ -211,9 +211,9 @@
             line = "%3d %s%s%s%s" % (ii+1, name, size, dnrate, uprate)
             self._display_line(line, True)
             if peers + seeds:
-                datastr = _("    (%s) %s - %s peers %s seeds %s dist copies - %s dn %s up") % (
-                    progress, status, peers, seeds, dist,
-                    fmtsize(dnamt), fmtsize(upamt) )
+                datastr = _("    (%(progress)s) %(status)s - %(peers)s peers %(seeds)s seeds %(dist)s dist copies - %(down)s dn %(up)s up") % dict(
+                    progress = progress, status = status, peers = peers, seeds = seeds, dist = dist,
+                    down = fmtsize(dnamt), up = fmtsize(upamt) )
             else:
                 datastr = '    '+status+' ('+progress+')'
             self._display_line(datastr)
--- BitTorrent-4.4.0/torrentinfo-console.py	2006-01-31 20:17:46.000000000 +0000
+++ BitTorrent-4.4.0/torrentinfo-console.py	2009-02-25 13:33:29.000000000 +0000
@@ -23,7 +23,7 @@
 
 NAME, EXT = splitext(basename(argv[0]))
 
-print _("%s %s - decode %s metainfo files") % (NAME, version, app_name)
+print _("%(n)s %(v)s - decode %(a)s metainfo files") % dict(n = NAME, v = version, a = app_name)
 print 
 
 if len(argv) == 1:
--- BitTorrent-4.4.0/BitTorrent/makemetafile.py	2009-02-25 10:40:14.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/makemetafile.py	2009-02-25 13:36:16.000000000 +0000
@@ -180,10 +180,10 @@
         try:
             u = name.decode(encoding)
         except Exception, e:
-            raise BTFailure(_('Could not convert file/directory name "%s" to '
-                              'utf-8 (%s). Either the assumed filesystem '
-                              'encoding "%s" is wrong or the filename contains '
-                              'illegal bytes.') % (name, str(e), encoding))
+            raise BTFailure(_('Could not convert file/directory name "%(n)s" to '
+                              'utf-8 (%(e)s). Either the assumed filesystem '
+                              'encoding "%(f)s" is wrong or the filename contains '
+                              'illegal bytes.') % dict(n = name, e = str(e), f = encoding))
         if u.translate(noncharacter_translate) != u:
             raise BTFailure(_('File/directory name "%s" contains reserved '
                               'unicode values that do not correspond to '
--- BitTorrent-4.4.0/BitTorrent/parsedir.py	2006-01-31 20:16:35.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/parsedir.py	2009-02-25 13:38:30.000000000 +0000
@@ -81,8 +81,8 @@
         v = new_file[0]
         if new_file[1] in new_parsed:  # duplicate
             if p not in blocked or files[p][0] != v:
-                errfunc(_("**warning** %s is a duplicate torrent for %s") %
-                        (p, new_parsed[new_file[1]]['path']))
+                errfunc(_("**warning** %(a)s is a duplicate torrent for %(b)s") %
+                        dict(a = p, b = new_parsed[new_file[1]]['path']))
             new_blocked[p] = None
             continue
 
@@ -95,8 +95,8 @@
             h = sha(bencode(d['info'])).digest()
             new_file[1] = h
             if new_parsed.has_key(h):
-                errfunc(_("**warning** %s is a duplicate torrent for %s") %
-                        (p, new_parsed[h]['path']))
+                errfunc(_("**warning** %(a)s is a duplicate torrent for %(b)s") %
+                        dict(a = p, b = new_parsed[h]['path']))
                 new_blocked[p] = None
                 continue
 
--- BitTorrent-4.4.0/BitTorrent/HTTPHandler.py	2006-01-31 20:16:30.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/HTTPHandler.py	2009-02-25 13:51:04.000000000 +0000
@@ -123,7 +123,7 @@
                 self.encoding = 'identity'
             else:
                 if DEBUG:
-                   print _("Compressed: %i  Uncompressed: %i\n") % (len(cdata),len(data))
+                   print _("Compressed: %(c)i  Uncompressed: %(u)i\n") % dict(c = len(cdata), d = len(data))
                 data = cdata
                 headers['Content-Encoding'] = 'gzip'
 
--- BitTorrent-4.4.0/BitTorrent/configfile.py	2006-01-31 20:16:34.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/configfile.py	2009-02-25 13:55:25.000000000 +0000
@@ -130,7 +130,7 @@
         else:
             err_str = _("Configuration option mismatch: '%s'") % name
             if is_frozen_exe:
-                err_str = _("You must quit %s and reinstall it. (%s)") % (app_name, err_str)
+                err_str = _("You must quit %(app)s and reinstall it. (%(err)s)") % dict(app = app_name, err = err_str)
             error_callback(ERROR, err_str)
     _write_config(error_callback, filename, p)
 
--- BitTorrent-4.4.0/BitTorrent/parseargs.py	2006-01-31 20:16:35.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/parseargs.py	2009-02-25 13:57:00.000000000 +0000
@@ -183,5 +183,5 @@
                 raise TypeError, str(t)
 
         except ValueError, e:
-            raise BTFailure(_("wrong format of %s - %s") % (format_key(key), str(e)))
+            raise BTFailure(_("wrong format of %(k)s - %(e)s") % dict(k = format_key(key), e = str(e)))
 
--- BitTorrent-4.4.0/BitTorrent/IPC.py	2006-01-31 20:16:30.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/IPC.py	2009-02-25 14:28:20.000000000 +0000
@@ -130,7 +130,7 @@
     def handle_command(self, command, *args):
         if callable(self.callback):
             return self.callback(command, *args)
-        self.log(WARNING, _("Unhandled command: %s %s"  % (str(command), str(args))))
+        self.log(WARNING, _("Unhandled command: %(c)s %(a)s"  % dict(c = str(command), a = str(args))))
 
     def set_rawserver(self, rawserver):
         self.rawserver = rawserver
@@ -439,4 +439,4 @@
     ipc_interface = IPCWin32DDE
 else:
     ipc_interface = IPCUnixSocket
-    
\ No newline at end of file
+    

bittorrent-4.4.0-keyerror.patch:

--- NEW FILE bittorrent-4.4.0-keyerror.patch ---
--- BitTorrent-4.4.0/BitTorrent/track.py	2009-04-06 14:00:39.000000000 +0100
+++ BitTorrent-4.4.0/BitTorrent/track.py	2009-04-06 14:01:22.000000000 +0100
@@ -107,6 +107,8 @@
      _("scrape access allowed (can be none, specific or full)")),
     ('max_give', 200,
      _("maximum number of peers to give with any one request")),
+    ('max_incomplete', 100,
+     _("max number of outgoing incomplete connections")),
     ('twisted', -1,
      _("Use Twisted network libraries for network connections. 1 means use twisted, 0 means do not use twisted, -1 means autodetect, and prefer twisted")),
     ('pid', '/var/run/bittorrent-tracker.pid',

bittorrent-4.4.0-syntax.patch:

--- NEW FILE bittorrent-4.4.0-syntax.patch ---
--- BitTorrent-4.4.0/khashmir/test_krpc.py.syntax	2009-02-24 21:25:10.000000000 +0000
+++ BitTorrent-4.4.0/khashmir/test_krpc.py		2009-02-24 21:38:25.000000000 +0000
@@ -44,20 +44,20 @@
         self.r = RawServer(Event(), d)
 
         addr = ('127.0.0.1', 1180)
-        self.as = self.r.create_udpsocket(addr[1], addr[0], True)
+        self.asock = self.r.create_udpsocket(addr[1], addr[0], True)
         self.af = Receiver(addr)
-        self.a = hostbroker(self.af, addr, self.as, self.r.add_task)
-        self.r.start_listening_udp(self.as, self.a)
+        self.a = hostbroker(self.af, addr, self.asock, self.r.add_task)
+        self.r.start_listening_udp(self.asock, self.a)
 
         addr = ('127.0.0.1', 1181)
-        self.bs = self.r.create_udpsocket(addr[1], addr[0], True)
+        self.bsock = self.r.create_udpsocket(addr[1], addr[0], True)
         self.bf = Receiver(addr)
-        self.b = hostbroker(self.bf, addr, self.bs, self.r.add_task)
-        self.r.start_listening_udp(self.bs, self.b)
+        self.b = hostbroker(self.bf, addr, self.bsock, self.r.add_task)
+        self.r.start_listening_udp(self.bsock, self.b)
         
     def tearDown(self):
-        self.as.close()
-        self.bs.close()
+        self.asock.close()
+        self.bsock.close()
 
     def testSimpleMessage(self):
         self.noisy = 0
--- BitTorrent-4.4.0/khashmir/inserter.py.syntax	2006-01-31 20:16:50.000000000 +0000
+++ BitTorrent-4.4.0/khashmir/inserter.py		2009-02-25 09:57:10.000000000 +0000
@@ -28,7 +28,6 @@
     done = done+1
     
 if __name__=="__main__":
-    global done
     host, port = sys.argv[1:]
     x = UTKhashmir("", 22038, "/tmp/cgcgcgc")
     x.addContact(host, int(port))

bittorrent-4.4.0-threads-warning.patch:

Index: bittorrent-4.4.0-threads-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-10/bittorrent-4.4.0-threads-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bittorrent-4.4.0-threads-warning.patch	9 Apr 2008 12:58:21 -0000	1.1
+++ bittorrent-4.4.0-threads-warning.patch	6 Apr 2009 14:48:46 -0000	1.2
@@ -1,5 +1,5 @@
---- BitTorrent-4.4.0/bittorrent	2008-04-08 16:01:30.000000000 +0100
-+++ BitTorrent-4.4.0/bittorrent	2008-04-08 16:02:50.000000000 +0100
+--- BitTorrent-4.4.0/bittorrent.py	2008-04-08 16:01:30.000000000 +0100
++++ BitTorrent-4.4.0/bittorrent.py	2008-04-08 16:02:50.000000000 +0100
 @@ -2742,7 +2742,7 @@
          if self.config['start_minimized']:
              self.mainwindow.iconify()


Index: bittorrent.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-10/bittorrent.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bittorrent.desktop	18 Jan 2007 16:36:52 -0000	1.3
+++ bittorrent.desktop	6 Apr 2009 14:48:46 -0000	1.4
@@ -3,9 +3,9 @@
 Name=BitTorrent File Transfer
 Comment=Distributed download of files from the Internet
 Exec=bittorrent
-Icon=bittorrent.png
+Icon=bittorrent
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Network;
+Categories=Network;FileTransfer;P2P;
 MimeType=application/x-bittorrent;


Index: bittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-10/bittorrent.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- bittorrent.spec	15 Aug 2008 10:52:45 -0000	1.44
+++ bittorrent.spec	6 Apr 2009 14:48:46 -0000	1.45
@@ -1,15 +1,15 @@
 # A few useful macros
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define desktopvendor	fedora
-%define bt_dir		%{_localstatedir}/lib/bittorrent
-%define bt_datadir	%{bt_dir}/data
-%define bt_statedir	%{bt_dir}/state
-%define pkidir		%{_sysconfdir}/pki
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global desktopvendor	fedora
+%global bt_dir		%{_localstatedir}/lib/bittorrent
+%global bt_datadir	%{bt_dir}/data
+%global bt_statedir	%{bt_dir}/state
+%global pkidir		%{_sysconfdir}/pki
 
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
 Version:	4.4.0
-Release:	7%{?dist}
+Release:	11%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent
 URL:		http://www.bittorrent.com/
@@ -25,6 +25,10 @@
 Patch3:		bittorrent-4.4.0-shellbang.patch
 Patch4:		bittorrent-4.4.0-threads-warning.patch
 Patch5:		bittorrent-4.4.0-fastresume.patch
+Patch6:		bittorrent-4.4.0-syntax.patch
+Patch7:		bittorrent-4.4.0-formatstrings.patch
+Patch8:		bittorrent-4.4.0-bencode-float.patch
+Patch9:		bittorrent-4.4.0-keyerror.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel >= 2.4.0, desktop-file-utils, gettext
@@ -90,6 +94,22 @@
 # Write fastresume data properly so that it's recognized at next startup
 %patch5 -p1 -b .fastresume
 
+# Fix syntax error on python 2.6
+%patch6 -p1 -b .syntax
+
+# Fix format strings that can't be properly translated
+# Not much point doing this really as translations don't work anyway and
+# it doesn't prevent the build itself from working
+%if 0
+%patch7 -p1 -b .strings
+%endif
+
+# Add bencode support for floating point values (#451496)
+%patch8 -p1 -b .float
+
+# Fix keyerror on tracker (#451496)
+%patch9 -p1 -b .keyerror
+
 # Update icon
 %{__sed} -i -e 's,bittorrent\.png,%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png,' \
 	bittorrent.desktop
@@ -229,6 +249,25 @@
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Mon Apr  6 2009 Paul Howarth <paul at city-fan.org> 4.4.0-11
+- Add support for floating point values in bencode (#451496), resolving
+  tracebacks with KeyError: <type 'float'>
+  (thanks to Oleg Aprotskiy for the patch)
+- Don't apply format string patch; it serves no purpose really
+- Fix for KeyError: 'max_incomplete' in tracker (#451496)
+- Define RPM macros in global context in spec file
+
+* Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 4.4.0-10
+- Fix syntax issues causing failure to build for Fedora 11
+- Update format strings to enable re-ordering of parameters in translations
+- Add additional categories FileTransfer and P2P in desktop entry (#487789)
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.4.0-8
+- Rebuild for Python 2.6
+
 * Fri Aug 15 2008 Paul Howarth <paul at city-fan.org> 4.4.0-7
 - Use new scriptlets for user/group creation
 - Fix up torrent homedir silently (#457563)


--- bittorrent-5.0.1-shellbang.patch DELETED ---


--- bittorrent-5.0.5-wxversion.patch DELETED ---



From pghmcfc at fedoraproject.org  Mon Apr  6 14:56:42 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  6 Apr 2009 14:56:42 +0000 (UTC)
Subject: rpms/bittorrent/F-9 bittorrent-4.4.0-bencode-float.patch, NONE,
	1.1 bittorrent-4.4.0-formatstrings.patch, NONE,
	1.1 bittorrent-4.4.0-keyerror.patch, NONE,
	1.1 bittorrent-4.4.0-syntax.patch, NONE,
	1.1 bittorrent-4.4.0-threads-warning.patch, 1.1,
	1.2 bittorrent.desktop, 1.3, 1.4 bittorrent.spec, 1.44,
	1.45 bittorrent-5.0.1-shellbang.patch, 1.1,
	NONE bittorrent-5.0.5-wxversion.patch, 1.1, NONE
Message-ID: <20090406145642.23337700FB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/bittorrent/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17097

Modified Files:
	bittorrent-4.4.0-threads-warning.patch bittorrent.desktop 
	bittorrent.spec 
Added Files:
	bittorrent-4.4.0-bencode-float.patch 
	bittorrent-4.4.0-formatstrings.patch 
	bittorrent-4.4.0-keyerror.patch bittorrent-4.4.0-syntax.patch 
Removed Files:
	bittorrent-5.0.1-shellbang.patch 
	bittorrent-5.0.5-wxversion.patch 
Log Message:
Resync with devel

bittorrent-4.4.0-bencode-float.patch:

--- NEW FILE bittorrent-4.4.0-bencode-float.patch ---
diff -ur BitTorrent-4.4.0.orig/BitTorrent/bencode.py BitTorrent-4.4.0/BitTorrent/bencode.py
--- BitTorrent-4.4.0.orig/BitTorrent/bencode.py	2006-01-31 20:16:33.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/bencode.py	2009-04-03 13:54:12.000000000 +0100
@@ -14,6 +14,8 @@
 
 from BitTorrent import BTFailure
 
+import string
+
 def decode_int(x, f):
     f += 1
     newf = x.index('e', f)
@@ -25,6 +27,23 @@
         raise ValueError
     return (n, newf+1)
 
+def assert_finite(n):
+  """Raises ValueError if n is NaN or infinite."""
+
+  valid_chars = '0123456789.-+eE'
+  if repr(n).translate(string.maketrans('',''), valid_chars) != '':
+    raise ValueError('encountered NaN or infinite')
+
+def decode_float(x, f):
+    f += 1
+    newf = x.index('e', f)
+    try:
+        n = float(x[f:newf].replace('E', 'e'))
+        assert_finite(n)
+    except (OverflowError, ValueError):
+        raise ValueError('encountered NaN or infinite')
+    return (n, newf+1)
+
 def decode_string(x, f):
     colon = x.index(':', f)
     n = int(x[f:colon])
@@ -55,6 +74,7 @@
 decode_func['l'] = decode_list
 decode_func['d'] = decode_dict
 decode_func['i'] = decode_int
+decode_func['f'] = decode_float
 decode_func['0'] = decode_string
 decode_func['1'] = decode_string
 decode_func['2'] = decode_string
@@ -75,7 +95,7 @@
         raise BTFailure, _("invalid bencoded value (data after valid prefix)")
     return r
 
-from types import StringType, IntType, LongType, DictType, ListType, TupleType
+from types import StringType, IntType, LongType, DictType, ListType, TupleType, FloatType
 
 
 class Bencached(object):
@@ -91,6 +111,10 @@
 def encode_int(x, r):
     r.extend(('i', str(x), 'e'))
 
+def encode_float(x, r):
+    assert_finite(x)
+    r.extend(('f', repr(x).replace('e', 'E'), 'e'))
+
 def encode_bool(x, r):
     if x:
         encode_int(1, r)
@@ -119,6 +143,7 @@
 encode_func[Bencached] = encode_bencached
 encode_func[IntType] = encode_int
 encode_func[LongType] = encode_int
+encode_func[FloatType] = encode_float
 encode_func[StringType] = encode_string
 encode_func[ListType] = encode_list
 encode_func[TupleType] = encode_list

bittorrent-4.4.0-formatstrings.patch:

--- NEW FILE bittorrent-4.4.0-formatstrings.patch ---
xgettext wants named parameters in format strings so that they can be
re-ordered in translations. This will break the existing translations but
they don't actually work since Fedora 6 and python 2.4 anyway
(http://bugzilla.redhat.com/237254)

--- BitTorrent-4.4.0/bittorrent.py	2006-01-31 20:16:42.000000000 +0000
+++ BitTorrent-4.4.0/bittorrent.py	2009-02-25 10:28:11.000000000 +0000
@@ -527,7 +527,7 @@
         self.label = gtk.Label()
         self.label.set_markup(
             (_("A newer version of %s is available.\n") % app_name) +
-            (_("You are using %s, and the new version is %s.\n") % (version, newversion)) +
+            (_("You are using %(version)s, and the new version is %(newversion)s.\n") % dict(version = version, newversion = newversion)) +
             (_("You can always get the latest version from \n%s") % self.download_url)
             ) 
         self.label.set_selectable(True)
@@ -2198,18 +2198,18 @@
             self.share_ratio = FancyLabel(_("Share ratio: %0.02f%%"), 0)
             self.extrabox.pack_start(lalign(self.share_ratio))
 
-            self.peer_info = FancyLabel(_("%s peers, %s seeds. Totals from "
-                                          "tracker: %s"), 0, 0, 'NA')
+            self.peer_info = FancyLabel(_("%(peers)s peers, %(seeds)s seeds. Totals from "
+                                          "tracker: %(totals)s"), dict(peers = 0, seeds = 0, totals = 'NA'))
             self.extrabox.pack_start(lalign(self.peer_info))
 
-            self.dist_copies = FancyLabel(_("Distributed copies: %d; Next: %s"), 0, '')
+            self.dist_copies = FancyLabel(_("Distributed copies: %(copies)d; Next: %(next)s"), dict(copies = 0, next = ''))
             self.extrabox.pack_start(lalign(self.dist_copies))
 
-            self.piece_info = FancyLabel(_("Pieces: %d total, %d complete, "
-                                           "%d partial, %d active (%d empty)"), *(0,)*5)
+            self.piece_info = FancyLabel(_("Pieces: %(a)d total, %(b)d complete, "
+                                           "%(c)d partial, %(d)d active (%(e)d empty)"), dict(a = 0, b = 0, c = 0, d = 0, e = 0))
             self.extrabox.pack_start(lalign(self.piece_info))
 
-            self.bad_info = FancyLabel(_("%d bad pieces + %s in discarded requests"), 0, 0)
+            self.bad_info = FancyLabel(_("%(bad)d bad pieces + %(discard)s in discarded requests"), dict(bad = 0, discard = 0))
             self.extrabox.pack_start(lalign(self.bad_info))
 
             # extra info
@@ -2266,7 +2266,7 @@
     rate_label = ': %s'
     eta_label = '?'
     done_label = _("Done")
-    progress_bar_label = _("%.1f%% done, %s remaining")
+    progress_bar_label = _("%(pcdone).1f%% done, %(pcrem)s remaining")
     down_rate_label = _("Download rate")
     up_rate_label = _("Upload rate"  )
     
@@ -2306,7 +2306,7 @@
         else:
             self.progressbar.set_fraction(fractionDone)
             progress_bar_label = self.progress_bar_label % \
-                                 (int(fractionDone*1000)/10, eta_label) 
+                                 dict(pcdone = int(fractionDone*1000)/10, pcrem = eta_label) 
             self.progressbar.set_text(progress_bar_label)
             
 
@@ -3162,8 +3162,8 @@
     def confirm_install_new_version(self):
         MessageDialog(self.mainwindow,
                       _("Install new %s now?")%app_name,
-                      _("Do you want to quit %s and install the new version, "
-                        "%s, now?")%(app_name,self.updater.version),
+                      _("Do you want to quit %(app)s and install the new version, "
+                        "%(vers)s, now?")%dict(app = app_name, vers = self.updater.version),
                       type=gtk.MESSAGE_QUESTION,
                       buttons=gtk.BUTTONS_YES_NO,
                       yesfunc=self.install_new_version,
@@ -3178,8 +3178,8 @@
 
     def open_help(self,widget):
         if self.helpwindow is None:
-            msg = (_("%s help is at \n%s\nWould you like to go there now?")%
-                  (app_name, HELP_URL))
+            msg = (_("%(app)s help is at \n%(url)s\nWould you like to go there now?")%
+                  dict(app = app_name, url = HELP_URL))
             self.helpwindow = MessageDialog(self.mainwindow,
                                             _("Visit help web page?"),
                                             msg,
--- BitTorrent-4.4.0/maketorrent.py	2006-01-31 20:16:52.000000000 +0000
+++ BitTorrent-4.4.0/maketorrent.py	2009-02-25 10:42:28.000000000 +0000
@@ -57,7 +57,7 @@
         self.mainwindow = self # temp hack to make modal win32 file choosers work
         self.tooltips = gtk.Tooltips()
         self.connect('destroy', self.quit)
-        self.set_title(_("%s torrent file creator %s")%(app_name, version))
+        self.set_title(_("%(app)s torrent file creator %(ver)s")%dict(app = app_name, ver = version))
         self.set_border_width(SPACING)
 
         self.config = config
--- BitTorrent-4.4.0/BitTorrent/GUI.py	2009-02-25 10:40:14.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/GUI.py	2009-02-25 10:46:49.000000000 +0000
@@ -203,9 +203,9 @@
         elif self >= 86400:
             return _("1 day %d hours") % ((self-86400)//3600) # 1-2 days
         elif self >= 3600:
-            return _("%d:%02d hours") % (self//3600, (self%3600)//60) # 1 h - 1 day
+            return _("%(hour)d:%(min)02d hours") % dict(hour = self//3600, min = (self%3600)//60) # 1 h - 1 day
         elif self >= 60:
-            return _("%d:%02d minutes") % (self//60, self%60) # 1 minute to 1 hour
+            return _("%(min)d:%(sec)02d minutes") % dict(min = self//60, sec = self%60) # 1 minute to 1 hour
         elif self >= 0:
             return _("%d seconds") % int(self)
         else:
--- BitTorrent-4.4.0/BitTorrent/TorrentQueue.py	2006-01-31 20:16:32.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/TorrentQueue.py	2009-02-25 10:49:00.000000000 +0000
@@ -672,11 +672,11 @@
                'max_running_torrents'] or self.config['def_running_torrents']):
                 if force_running:
                     self.global_error(ERROR,
-                                      _("Can't run more than %d torrents " 
+                                      _("Can't run more than %(maxt)d torrents " 
                                         "simultaneously. For more info see the"
-                                        " FAQ at %s.")%
-                                      (self.config['max_running_torrents'],
-                                       FAQ_URL))
+                                        " FAQ at %(url)s.")%
+                                      dict(maxt = self.config['max_running_torrents'],
+                                       url = FAQ_URL))
                 newstate = QUEUED
                 pos = 0
         l = self._get_list(newstate)
--- BitTorrent-4.4.0/BitTorrent/NewVersion.py	2009-02-25 10:40:14.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/NewVersion.py	2009-02-25 10:52:16.000000000 +0000
@@ -242,7 +242,7 @@
         else:
             self.errorfunc(WARNING,
                            _("Could not find a suitable temporary location to "
-                             "save the %s %s installer.") % (app_name, self.version))
+                             "save the %(app)s %(ver)s installer.") % dict(app = app_name, ver = self.version))
 
     def installer_downloaded(self):
         if self.installer_path() and os.access(self.installer_path(), os.F_OK):
@@ -260,8 +260,8 @@
         if self.torrentfile is not None:
             self.startfunc(self.torrentfile, self.installer_path())
         else:
-            self.errorfunc(WARNING, _("No torrent file available for %s %s "
-                                      "installer.")%(app_name, self.version))
+            self.errorfunc(WARNING, _("No torrent file available for %(app)s %(ver)s "
+                                      "installer.")%dict(app = app_name, ver = self.version))
 
     def start_install(self):
         if not self.asked_for_install:
@@ -270,9 +270,9 @@
                 self.installfunc()
             else:
                 self.errorfunc(WARNING,
-                               _("%s %s installer appears to be incomplete, "
-                                 "missing, or corrupt.")%(app_name,
-                                                          self.version))
+                               _("%(app)s %(ver)s installer appears to be incomplete, "
+                                 "missing, or corrupt.")%dict(app = app_name,
+                                                          ver = self.version))
 
     def launch_installer(self, torrentqueue):
         if os.name == 'nt':
--- BitTorrent-4.4.0/bittorrent-console.py	2006-01-31 20:16:36.000000000 +0000
+++ BitTorrent-4.4.0/bittorrent-console.py	2009-02-25 11:06:26.000000000 +0000
@@ -46,7 +46,7 @@
         return _("<unknown>")
     m, s = divmod(n, 60)
     h, m = divmod(m, 60)
-    return _("finishing in %d:%02d:%02d") % (h, m, s)
+    return _("finishing in %(h)d:%(m)02d:%(s)02d") % dict(h = h, m = m, s = s)
 
 def fmtsize(n):
     s = str(n)
@@ -127,22 +127,22 @@
         if downTotal is not None:
             upTotal = statistics['upTotal']
             if downTotal <= upTotal / 100:
-                self.shareRating = _("oo  (%.1f MB up / %.1f MB down)") % (
-                    upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("oo  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                    up = upTotal / (1<<20), down = downTotal / (1<<20))
             else:
-                self.shareRating = _("%.3f  (%.1f MB up / %.1f MB down)") % (
-                   upTotal / downTotal, upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("%(ratio).3f  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                   ratio = upTotal / downTotal, up = upTotal / (1<<20), down = downTotal / (1<<20))
             numCopies = statistics['numCopies']
             nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
                     zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
             if not self.done:
-                self.seedStatus = _("%d seen now, plus %d distributed copies "
-                                    "(%s)") % (statistics['numSeeds' ],
-                                               statistics['numCopies'],
-                                               nextCopies)
+                self.seedStatus = _("%(s)d seen now, plus %(d)d distributed copies "
+                                    "(%(n)s)") % dict(s = statistics['numSeeds' ],
+                                               d = statistics['numCopies'],
+                                               n = nextCopies)
             else:
-                self.seedStatus = _("%d distributed copies (next: %s)") % (
-                    statistics['numCopies'], nextCopies)
+                self.seedStatus = _("%(d)d distributed copies (next: %(n)s)") % dict(
+                    d = statistics['numCopies'], n = nextCopies)
             self.peerStatus = _("%d seen now") % statistics['numPeers']
 
         for err in self.errors[-4:]:
--- BitTorrent-4.4.0/bittorrent-curses.py	2006-01-31 20:16:36.000000000 +0000
+++ BitTorrent-4.4.0/bittorrent-curses.py	2009-02-25 11:13:24.000000000 +0000
@@ -65,7 +65,7 @@
         return _("<unknown>")
     m, s = divmod(n, 60)
     h, m = divmod(m, 60)
-    return _("finishing in %d:%02d:%02d") % (h, m, s)
+    return _("finishing in %(h)d:%(m)02d:%(s)02d") % dict(h = h, m = m, s = s)
 
 def fmtsize(n):
     s = str(n)
@@ -228,22 +228,22 @@
         if downTotal is not None:
             upTotal = statistics['upTotal']
             if downTotal <= upTotal / 100:
-                self.shareRating = _("oo  (%.1f MB up / %.1f MB down)") % (
-                    upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("oo  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                    up = upTotal / (1<<20), down = downTotal / (1<<20))
             else:
-                self.shareRating = _("%.3f  (%.1f MB up / %.1f MB down)") % (
-                   upTotal / downTotal, upTotal / (1<<20), downTotal / (1<<20))
+                self.shareRating = _("%(ratio).3f  (%(up).1f MB up / %(down).1f MB down)") % dict(
+                   ratio = upTotal / downTotal, up = upTotal / (1<<20), down = downTotal / (1<<20))
             numCopies = statistics['numCopies']
             nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
                     zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
             if not self.done:
-                self.seedStatus = _("%d seen now, plus %d distributed copies"
-                                    "(%s)") % (statistics['numSeeds' ],
-                                               statistics['numCopies'],
-                                               nextCopies)
+                self.seedStatus = _("%(s)d seen now, plus %(d)d distributed copies"
+                                    "(%(n)s)") % dict(s = statistics['numSeeds' ],
+                                               d = statistics['numCopies'],
+                                               n = nextCopies)
             else:
-                self.seedStatus = _("%d distributed copies (next: %s)") % (
-                    statistics['numCopies'], nextCopies)
+                self.seedStatus = _("%(d)d distributed copies (next: %(n)s)") % dict(
+                    d = statistics['numCopies'], n = nextCopies)
             self.peerStatus = _("%d seen now") % statistics['numPeers']
 
         self.fieldwin.erase()
@@ -321,10 +321,10 @@
                     self.spewwin.addnstr(i+3, 64, '%5.0f KB/s' % (spew[i]['speed']/1000), 10)
 
             self.spewwin.addnstr(self.spewh-1, 0,
-                    _("downloading %d pieces, have %d fragments, "
-                      "%d of %d pieces completed") %
-                    (statistics['storage_active'], statistics['storage_dirty'],
-                     statistics['storage_numcomplete'], self.numpieces),
+                    _("downloading %(p)d pieces, have %(f)d fragments, "
+                      "%(c)d of %(n)d pieces completed") %
+                    dict(p = statistics['storage_active'], f = statistics['storage_dirty'],
+                     c = statistics['storage_numcomplete'], n = self.numpieces),
                     self.speww-1)
 
         curses.panel.update_panels()
--- BitTorrent-4.4.0/changetracker-console.py	2006-01-31 20:16:42.000000000 +0000
+++ BitTorrent-4.4.0/changetracker-console.py	2009-02-25 13:27:33.000000000 +0000
@@ -29,7 +29,7 @@
     metainfo = bdecode(h.read())
     h.close()
     if metainfo['announce'] != argv[1]:
-        print _("old announce for %s: %s") % (f, metainfo['announce'])
+        print _("old announce for %(f)s: %(a)s") % dict(f = f, a = metainfo['announce'])
         metainfo['announce'] = argv[1]
         h = open(f, 'wb')
         h.write(bencode(metainfo))
--- BitTorrent-4.4.0/launchmany-curses.py	2006-01-31 20:16:51.000000000 +0000
+++ BitTorrent-4.4.0/launchmany-curses.py	2009-02-25 13:31:36.000000000 +0000
@@ -57,7 +57,7 @@
     h, m = divmod(m, 60)
     if h > 1000000:
         return _("connecting to peers")
-    return _("ETA in %d:%02d:%02d") % (h, m, s)
+    return _("ETA in %(h)d:%(m)02d:%(s)02d") % dict(h = h, m = m, s = s)
 
 def fmtsize(n):
     n = long(n)
@@ -211,9 +211,9 @@
             line = "%3d %s%s%s%s" % (ii+1, name, size, dnrate, uprate)
             self._display_line(line, True)
             if peers + seeds:
-                datastr = _("    (%s) %s - %s peers %s seeds %s dist copies - %s dn %s up") % (
-                    progress, status, peers, seeds, dist,
-                    fmtsize(dnamt), fmtsize(upamt) )
+                datastr = _("    (%(progress)s) %(status)s - %(peers)s peers %(seeds)s seeds %(dist)s dist copies - %(down)s dn %(up)s up") % dict(
+                    progress = progress, status = status, peers = peers, seeds = seeds, dist = dist,
+                    down = fmtsize(dnamt), up = fmtsize(upamt) )
             else:
                 datastr = '    '+status+' ('+progress+')'
             self._display_line(datastr)
--- BitTorrent-4.4.0/torrentinfo-console.py	2006-01-31 20:17:46.000000000 +0000
+++ BitTorrent-4.4.0/torrentinfo-console.py	2009-02-25 13:33:29.000000000 +0000
@@ -23,7 +23,7 @@
 
 NAME, EXT = splitext(basename(argv[0]))
 
-print _("%s %s - decode %s metainfo files") % (NAME, version, app_name)
+print _("%(n)s %(v)s - decode %(a)s metainfo files") % dict(n = NAME, v = version, a = app_name)
 print 
 
 if len(argv) == 1:
--- BitTorrent-4.4.0/BitTorrent/makemetafile.py	2009-02-25 10:40:14.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/makemetafile.py	2009-02-25 13:36:16.000000000 +0000
@@ -180,10 +180,10 @@
         try:
             u = name.decode(encoding)
         except Exception, e:
-            raise BTFailure(_('Could not convert file/directory name "%s" to '
-                              'utf-8 (%s). Either the assumed filesystem '
-                              'encoding "%s" is wrong or the filename contains '
-                              'illegal bytes.') % (name, str(e), encoding))
+            raise BTFailure(_('Could not convert file/directory name "%(n)s" to '
+                              'utf-8 (%(e)s). Either the assumed filesystem '
+                              'encoding "%(f)s" is wrong or the filename contains '
+                              'illegal bytes.') % dict(n = name, e = str(e), f = encoding))
         if u.translate(noncharacter_translate) != u:
             raise BTFailure(_('File/directory name "%s" contains reserved '
                               'unicode values that do not correspond to '
--- BitTorrent-4.4.0/BitTorrent/parsedir.py	2006-01-31 20:16:35.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/parsedir.py	2009-02-25 13:38:30.000000000 +0000
@@ -81,8 +81,8 @@
         v = new_file[0]
         if new_file[1] in new_parsed:  # duplicate
             if p not in blocked or files[p][0] != v:
-                errfunc(_("**warning** %s is a duplicate torrent for %s") %
-                        (p, new_parsed[new_file[1]]['path']))
+                errfunc(_("**warning** %(a)s is a duplicate torrent for %(b)s") %
+                        dict(a = p, b = new_parsed[new_file[1]]['path']))
             new_blocked[p] = None
             continue
 
@@ -95,8 +95,8 @@
             h = sha(bencode(d['info'])).digest()
             new_file[1] = h
             if new_parsed.has_key(h):
-                errfunc(_("**warning** %s is a duplicate torrent for %s") %
-                        (p, new_parsed[h]['path']))
+                errfunc(_("**warning** %(a)s is a duplicate torrent for %(b)s") %
+                        dict(a = p, b = new_parsed[h]['path']))
                 new_blocked[p] = None
                 continue
 
--- BitTorrent-4.4.0/BitTorrent/HTTPHandler.py	2006-01-31 20:16:30.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/HTTPHandler.py	2009-02-25 13:51:04.000000000 +0000
@@ -123,7 +123,7 @@
                 self.encoding = 'identity'
             else:
                 if DEBUG:
-                   print _("Compressed: %i  Uncompressed: %i\n") % (len(cdata),len(data))
+                   print _("Compressed: %(c)i  Uncompressed: %(u)i\n") % dict(c = len(cdata), d = len(data))
                 data = cdata
                 headers['Content-Encoding'] = 'gzip'
 
--- BitTorrent-4.4.0/BitTorrent/configfile.py	2006-01-31 20:16:34.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/configfile.py	2009-02-25 13:55:25.000000000 +0000
@@ -130,7 +130,7 @@
         else:
             err_str = _("Configuration option mismatch: '%s'") % name
             if is_frozen_exe:
-                err_str = _("You must quit %s and reinstall it. (%s)") % (app_name, err_str)
+                err_str = _("You must quit %(app)s and reinstall it. (%(err)s)") % dict(app = app_name, err = err_str)
             error_callback(ERROR, err_str)
     _write_config(error_callback, filename, p)
 
--- BitTorrent-4.4.0/BitTorrent/parseargs.py	2006-01-31 20:16:35.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/parseargs.py	2009-02-25 13:57:00.000000000 +0000
@@ -183,5 +183,5 @@
                 raise TypeError, str(t)
 
         except ValueError, e:
-            raise BTFailure(_("wrong format of %s - %s") % (format_key(key), str(e)))
+            raise BTFailure(_("wrong format of %(k)s - %(e)s") % dict(k = format_key(key), e = str(e)))
 
--- BitTorrent-4.4.0/BitTorrent/IPC.py	2006-01-31 20:16:30.000000000 +0000
+++ BitTorrent-4.4.0/BitTorrent/IPC.py	2009-02-25 14:28:20.000000000 +0000
@@ -130,7 +130,7 @@
     def handle_command(self, command, *args):
         if callable(self.callback):
             return self.callback(command, *args)
-        self.log(WARNING, _("Unhandled command: %s %s"  % (str(command), str(args))))
+        self.log(WARNING, _("Unhandled command: %(c)s %(a)s"  % dict(c = str(command), a = str(args))))
 
     def set_rawserver(self, rawserver):
         self.rawserver = rawserver
@@ -439,4 +439,4 @@
     ipc_interface = IPCWin32DDE
 else:
     ipc_interface = IPCUnixSocket
-    
\ No newline at end of file
+    

bittorrent-4.4.0-keyerror.patch:

--- NEW FILE bittorrent-4.4.0-keyerror.patch ---
--- BitTorrent-4.4.0/BitTorrent/track.py	2009-04-06 14:00:39.000000000 +0100
+++ BitTorrent-4.4.0/BitTorrent/track.py	2009-04-06 14:01:22.000000000 +0100
@@ -107,6 +107,8 @@
      _("scrape access allowed (can be none, specific or full)")),
     ('max_give', 200,
      _("maximum number of peers to give with any one request")),
+    ('max_incomplete', 100,
+     _("max number of outgoing incomplete connections")),
     ('twisted', -1,
      _("Use Twisted network libraries for network connections. 1 means use twisted, 0 means do not use twisted, -1 means autodetect, and prefer twisted")),
     ('pid', '/var/run/bittorrent-tracker.pid',

bittorrent-4.4.0-syntax.patch:

--- NEW FILE bittorrent-4.4.0-syntax.patch ---
--- BitTorrent-4.4.0/khashmir/test_krpc.py.syntax	2009-02-24 21:25:10.000000000 +0000
+++ BitTorrent-4.4.0/khashmir/test_krpc.py		2009-02-24 21:38:25.000000000 +0000
@@ -44,20 +44,20 @@
         self.r = RawServer(Event(), d)
 
         addr = ('127.0.0.1', 1180)
-        self.as = self.r.create_udpsocket(addr[1], addr[0], True)
+        self.asock = self.r.create_udpsocket(addr[1], addr[0], True)
         self.af = Receiver(addr)
-        self.a = hostbroker(self.af, addr, self.as, self.r.add_task)
-        self.r.start_listening_udp(self.as, self.a)
+        self.a = hostbroker(self.af, addr, self.asock, self.r.add_task)
+        self.r.start_listening_udp(self.asock, self.a)
 
         addr = ('127.0.0.1', 1181)
-        self.bs = self.r.create_udpsocket(addr[1], addr[0], True)
+        self.bsock = self.r.create_udpsocket(addr[1], addr[0], True)
         self.bf = Receiver(addr)
-        self.b = hostbroker(self.bf, addr, self.bs, self.r.add_task)
-        self.r.start_listening_udp(self.bs, self.b)
+        self.b = hostbroker(self.bf, addr, self.bsock, self.r.add_task)
+        self.r.start_listening_udp(self.bsock, self.b)
         
     def tearDown(self):
-        self.as.close()
-        self.bs.close()
+        self.asock.close()
+        self.bsock.close()
 
     def testSimpleMessage(self):
         self.noisy = 0
--- BitTorrent-4.4.0/khashmir/inserter.py.syntax	2006-01-31 20:16:50.000000000 +0000
+++ BitTorrent-4.4.0/khashmir/inserter.py		2009-02-25 09:57:10.000000000 +0000
@@ -28,7 +28,6 @@
     done = done+1
     
 if __name__=="__main__":
-    global done
     host, port = sys.argv[1:]
     x = UTKhashmir("", 22038, "/tmp/cgcgcgc")
     x.addContact(host, int(port))

bittorrent-4.4.0-threads-warning.patch:



Index: bittorrent.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-9/bittorrent.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bittorrent.desktop	18 Jan 2007 16:36:52 -0000	1.3
+++ bittorrent.desktop	6 Apr 2009 14:56:41 -0000	1.4
@@ -3,9 +3,9 @@
 Name=BitTorrent File Transfer
 Comment=Distributed download of files from the Internet
 Exec=bittorrent
-Icon=bittorrent.png
+Icon=bittorrent
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Network;
+Categories=Network;FileTransfer;P2P;
 MimeType=application/x-bittorrent;


Index: bittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/F-9/bittorrent.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- bittorrent.spec	15 Aug 2008 11:26:58 -0000	1.44
+++ bittorrent.spec	6 Apr 2009 14:56:41 -0000	1.45
@@ -1,15 +1,15 @@
 # A few useful macros
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define desktopvendor	fedora
-%define bt_dir		%{_localstatedir}/lib/bittorrent
-%define bt_datadir	%{bt_dir}/data
-%define bt_statedir	%{bt_dir}/state
-%define pkidir		%{_sysconfdir}/pki
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global desktopvendor	fedora
+%global bt_dir		%{_localstatedir}/lib/bittorrent
+%global bt_datadir	%{bt_dir}/data
+%global bt_statedir	%{bt_dir}/state
+%global pkidir		%{_sysconfdir}/pki
 
 Summary:	BitTorrent swarming network file transfer tool
 Name:		bittorrent
 Version:	4.4.0
-Release:	7%{?dist}
+Release:	11%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent
 URL:		http://www.bittorrent.com/
@@ -25,6 +25,10 @@
 Patch3:		bittorrent-4.4.0-shellbang.patch
 Patch4:		bittorrent-4.4.0-threads-warning.patch
 Patch5:		bittorrent-4.4.0-fastresume.patch
+Patch6:		bittorrent-4.4.0-syntax.patch
+Patch7:		bittorrent-4.4.0-formatstrings.patch
+Patch8:		bittorrent-4.4.0-bencode-float.patch
+Patch9:		bittorrent-4.4.0-keyerror.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel >= 2.4.0, desktop-file-utils, gettext
@@ -90,6 +94,22 @@
 # Write fastresume data properly so that it's recognized at next startup
 %patch5 -p1 -b .fastresume
 
+# Fix syntax error on python 2.6
+%patch6 -p1 -b .syntax
+
+# Fix format strings that can't be properly translated
+# Not much point doing this really as translations don't work anyway and
+# it doesn't prevent the build itself from working
+%if 0
+%patch7 -p1 -b .strings
+%endif
+
+# Add bencode support for floating point values (#451496)
+%patch8 -p1 -b .float
+
+# Fix keyerror on tracker (#451496)
+%patch9 -p1 -b .keyerror
+
 # Update icon
 %{__sed} -i -e 's,bittorrent\.png,%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png,' \
 	bittorrent.desktop
@@ -229,6 +249,25 @@
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Mon Apr  6 2009 Paul Howarth <paul at city-fan.org> 4.4.0-11
+- Add support for floating point values in bencode (#451496), resolving
+  tracebacks with KeyError: <type 'float'>
+  (thanks to Oleg Aprotskiy for the patch)
+- Don't apply format string patch; it serves no purpose really
+- Fix for KeyError: 'max_incomplete' in tracker (#451496)
+- Define RPM macros in global context in spec file
+
+* Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 4.4.0-10
+- Fix syntax issues causing failure to build for Fedora 11
+- Update format strings to enable re-ordering of parameters in translations
+- Add additional categories FileTransfer and P2P in desktop entry (#487789)
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.4.0-8
+- Rebuild for Python 2.6
+
 * Fri Aug 15 2008 Paul Howarth <paul at city-fan.org> 4.4.0-7
 - Use new scriptlets for user/group creation
 - Fix up torrent homedir silently (#457563)


--- bittorrent-5.0.1-shellbang.patch DELETED ---


--- bittorrent-5.0.5-wxversion.patch DELETED ---



From nalin at fedoraproject.org  Mon Apr  6 14:58:29 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 14:58:29 +0000 (UTC)
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.107,1.108
Message-ID: <20090406145830.0267E700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17448

Modified Files:
	nss_ldap.spec 
Log Message:
- split pam_ldap off into a separate binary package
- require /%{_lib}/security/pam_ldap.so to pull in pam_ldap on upgrades
- require our configuration file to come from somewhere



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- nss_ldap.spec	26 Feb 2009 06:13:39 -0000	1.107
+++ nss_ldap.spec	6 Apr 2009 14:57:59 -0000	1.108
@@ -1,8 +1,9 @@
+%define nss_ldap_version 264
 %define pam_ldap_version 184
-Summary: NSS library and PAM module for LDAP
+Summary: NSS library for LDAP
 Name: nss_ldap
-Version: 264
-Release: 2%{?dist}
+Version: %{nss_ldap_version}
+Release: 100%{?dist}
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -28,23 +29,34 @@
 URL: http://www.padl.com/
 License: LGPLv2+
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{nss_ldap_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool
 BuildRequires: openssl-devel, pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openldap-devel >= 2.0.27
 BuildRequires: krb5-devel >= 1.4
 Requires: nscd
-Obsoletes: pam_ldap
+Requires(post): grep, mktemp, sed, textutils, /sbin/ldconfig
+# We need this file, and for now it belongs to pam_ldap (we use that one,
+# anyway).
+Requires: /etc/ldap.conf
+# Don't risk anything weird happening at upgrade-time by making sure we pull in
+# the matching pam_ldap package.
+Requires: /%{_lib}/security/pam_ldap.so
+
+%package -n pam_ldap
+Summary: PAM module for LDAP
+Version: %{pam_ldap_version}
+License: LGPLv2+
 Requires(post): grep, mktemp, sed, textutils, /sbin/ldconfig
 
 %description
-This package includes two LDAP access clients: nss_ldap and pam_ldap.
 Nss_ldap is a set of C library extensions that allow X.500 and LDAP
 directory servers to be used as a primary source of aliases, ethers,
 groups, hosts, networks, protocol, users, RPCs, services, and shadow
 passwords (instead of or in addition to using flat files or NIS).
 
+%description -n pam_ldap
 Pam_ldap is a module for Linux-PAM that supports password changes, V2
 clients, Netscape's SSL, ypldapd, Netscape Directory Server password
 policies, access authorization, and crypted hashes.
@@ -52,15 +64,15 @@
 %prep
 %setup -q -c -a 1
 cp %{SOURCE5} .
-cp nss_ldap-%{version}/ldap.conf ldap.conf.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/ldap.conf ldap.conf.nss_ldap
 cp pam_ldap-%{pam_ldap_version}/ldap.conf ldap.conf.pam_ldap
 
-cp nss_ldap-%{version}/resolve.c pam_ldap-%{pam_ldap_version}/
-cp nss_ldap-%{version}/resolve.h pam_ldap-%{pam_ldap_version}/
-cp nss_ldap-%{version}/snprintf.c pam_ldap-%{pam_ldap_version}/
-cp nss_ldap-%{version}/snprintf.h pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{nss_ldap_version}/resolve.c pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{nss_ldap_version}/resolve.h pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{nss_ldap_version}/snprintf.c pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{nss_ldap_version}/snprintf.h pam_ldap-%{pam_ldap_version}/
 
-pushd nss_ldap-%{version}
+pushd nss_ldap-%{nss_ldap_version}
 %patch8 -p1 -b .soname
 %patch17 -p1 -b .res_init
 autoreconf -f -i
@@ -81,13 +93,13 @@
 
 rm -f pam.d/*.pam_console
 
-cp nss_ldap-%{version}/ANNOUNCE             ANNOUNCE.nss_ldap
-cp nss_ldap-%{version}/AUTHORS              AUTHORS.nss_ldap
-cp nss_ldap-%{version}/ChangeLog            ChangeLog.nss_ldap
-cp nss_ldap-%{version}/COPYING              COPYING.nss_ldap
-cp nss_ldap-%{version}/NEWS                 NEWS.nss_ldap
-cp nss_ldap-%{version}/README               README.nss_ldap
-cp nss_ldap-%{version}/nsswitch.ldap        nsswitch.ldap
+cp nss_ldap-%{nss_ldap_version}/ANNOUNCE             ANNOUNCE.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/AUTHORS              AUTHORS.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/ChangeLog            ChangeLog.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/COPYING              COPYING.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/NEWS                 NEWS.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/README               README.nss_ldap
+cp nss_ldap-%{nss_ldap_version}/nsswitch.ldap        nsswitch.ldap
 cp pam_ldap-%{pam_ldap_version}/AUTHORS     AUTHORS.pam_ldap
 cp pam_ldap-%{pam_ldap_version}/ChangeLog   ChangeLog.pam_ldap
 cp pam_ldap-%{pam_ldap_version}/COPYING     COPYING.pam_ldap
@@ -95,7 +107,7 @@
 cp pam_ldap-%{pam_ldap_version}/NEWS        NEWS.pam_ldap
 cp pam_ldap-%{pam_ldap_version}/README      README.pam_ldap
 
-cp %{_datadir}/libtool/config/config.{sub,guess} nss_ldap-%{version}/
+cp %{_datadir}/libtool/config/config.{sub,guess} nss_ldap-%{nss_ldap_version}/
 cp %{_datadir}/libtool/config/config.{sub,guess} pam_ldap-%{pam_ldap_version}/
 
 %build
@@ -108,17 +120,17 @@
 make %{?_smp_mflags}
 popd
 
-pushd nss_ldap-%{version}
+pushd nss_ldap-%{nss_ldap_version}
 %configure \
         --with-ldap=openldap \
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lz -lsasl2 -lssl -lgssapi_krb5 -lcrypto -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
-%{SOURCE7}       ./nss_ldap-%{version}/nss_ldap.so
+%{SOURCE7}       ./nss_ldap-%{nss_ldap_version}/nss_ldap.so
 %{SOURCE7} -lpam ./pam_ldap-%{pam_ldap_version}/pam_ldap.so
 
 %install
@@ -131,8 +143,8 @@
 # filenames that the glibc-bundled modules do, but that doesn't tell us anything
 # more than which version of libc was available at build time.  People tend to
 # assume that's also the nss_ldap version, too, so forget that.
-libcver=%{version}
-make -C nss_ldap-%{version} install \
+libcver=%{nss_ldap_version}
+make -C nss_ldap-%{nss_ldap_version} install \
         DESTDIR=$RPM_BUILD_ROOT \
         INST_UID=`id -un` INST_GID=`id -gn` \
         LIBC_VERS=$libcver
@@ -179,17 +191,38 @@
 %defattr(-,root,root)
 %attr(0755,root,root) /%{_libdir}/libnss_ldap-*.so
 %attr(0755,root,root) /%{_libdir}/libnss_ldap.so.?
-%attr(0755,root,root) /%{_lib}/security/*.so*
 %attr(0755,root,root) %{_libdir}/libnss_ldap.so
-%attr(0644,root,root) %{_mandir}/man5/*.5*
-%attr(0644,root,root) %config(noreplace) /etc/ldap.conf
+%attr(0644,root,root) %{_mandir}/man5/nss_ldap.5*
 %doc README.TLS
-%doc nsswitch.ldap *.nss_ldap *.pam_ldap
+%doc nss_ldap-%{nss_ldap_version}/ANNOUNCE
+%doc nss_ldap-%{nss_ldap_version}/AUTHORS
+%doc nss_ldap-%{nss_ldap_version}/ChangeLog
+%doc nss_ldap-%{nss_ldap_version}/COPYING
+%doc nss_ldap-%{nss_ldap_version}/NEWS
+%doc nss_ldap-%{nss_ldap_version}/README
+%doc nss_ldap-%{nss_ldap_version}/nsswitch.ldap
+
+%files -n pam_ldap
+%defattr(-,root,root)
+%attr(0755,root,root) /%{_lib}/security/*.so*
+%attr(0644,root,root) %{_mandir}/man5/pam_ldap.5*
+%attr(0644,root,root) %config(noreplace) /etc/ldap.conf
 %doc pam_ldap-%{pam_ldap_version}/pam.d
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
+%doc pam_ldap-%{pam_ldap_version}/AUTHORS
+%doc pam_ldap-%{pam_ldap_version}/ChangeLog
+%doc pam_ldap-%{pam_ldap_version}/COPYING
+%doc pam_ldap-%{pam_ldap_version}/COPYING.LIB
+%doc pam_ldap-%{pam_ldap_version}/NEWS
+%doc pam_ldap-%{pam_ldap_version}/README
 
 %changelog
+* Mon Apr  6 2009 Nalin Dahyabhai <nalin at redhat.com> - 264/184-100
+- split pam_ldap off into a separate binary package
+- require /%{_lib}/security/pam_ldap.so to pull in pam_ldap on upgrades
+- require our configuration file to come from somewhere
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 264-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From robmv at fedoraproject.org  Mon Apr  6 15:10:18 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Mon,  6 Apr 2009 15:10:18 +0000 (UTC)
Subject: rpms/eclipse-subclipse/devel
	eclipse-subclipse-1.6.0-dependencies.patch, NONE,
	1.1 subclipse-fetch.sh, NONE, 1.1 .cvsignore, 1.7,
	1.8 eclipse-subclipse.spec, 1.29, 1.30 sources, 1.7,
	1.8 eclipse-subclipse-1.4.7-dependencies.patch, 1.1,
	NONE subclipse-fetch-1.4.7.sh, 1.1, NONE
Message-ID: <20090406151018.431E8700FB@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20565

Modified Files:
	.cvsignore eclipse-subclipse.spec sources 
Added Files:
	eclipse-subclipse-1.6.0-dependencies.patch subclipse-fetch.sh 
Removed Files:
	eclipse-subclipse-1.4.7-dependencies.patch 
	subclipse-fetch-1.4.7.sh 
Log Message:
Update to upstream 1.6.0


eclipse-subclipse-1.6.0-dependencies.patch:

--- NEW FILE eclipse-subclipse-1.6.0-dependencies.patch ---
diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/build.properties subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/build.properties
--- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/build.properties	2007-08-21 21:29:01.000000000 -0400
+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/build.properties	2009-04-06 10:22:46.000000000 -0430
@@ -1,5 +1,5 @@
-source.. = src/
-output.. = bin/
+source.clientadapter-javahl.jar = src/
+output.clientadapter-javahl.jar = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
@@ -7,4 +7,5 @@
                about.ini,\
                about.properties,\
                epl-v10.html,\
-               svn.gif
+               svn.gif,\
+               svn-javahl.jar
diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
--- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-23 15:51:38.000000000 -0430
+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-04-06 10:22:46.000000000 -0430
@@ -8,6 +8,9 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.tigris.subversion.clientadapter;bundle-version="[1.6.0,1.7.0)"
 Eclipse-LazyStart: true
+Bundle-ClassPath: clientadapter-javahl.jar,
+ svn-javahl.jar,
+ .
 Export-Package: org.tigris.subversion.javahl,
  org.tigris.subversion.svnclientadapter.javahl
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml
--- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-23 15:51:38.000000000 -0430
+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-04-06 10:22:46.000000000 -0430
@@ -33,14 +33,14 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="true"/>
 
-   <plugin
+<!--   <plugin
          id="org.tigris.subversion.clientadapter.javahl.win32"
          os="win32"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"/>
+         fragment="true"/>-->
 
 </feature>


--- NEW FILE subclipse-fetch.sh ---
#!/bin/sh
VERSION=1.6.0
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win32
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Feb 2009 16:11:35 -0000	1.7
+++ .cvsignore	6 Apr 2009 15:09:47 -0000	1.8
@@ -1 +1 @@
-subclipse-1.4.7.tgz
+subclipse-1.6.0.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eclipse-subclipse.spec	23 Mar 2009 16:40:42 -0000	1.29
+++ eclipse-subclipse.spec	6 Apr 2009 15:09:47 -0000	1.30
@@ -1,12 +1,12 @@
 %define eclipse_name       eclipse
 %define eclipse_base       %{_libdir}/%{eclipse_name}
 %define install_loc        %{_datadir}/eclipse/dropins
-%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.5.4.1
+%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_%{version}
 
 
 Name:           eclipse-subclipse
-Version:        1.4.7
-Release:        4%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Development/Tools
@@ -14,8 +14,8 @@
 URL:            http://subclipse.tigris.org/
 Source0:        subclipse-%{version}.tgz
 # Script to fetch the source code
-Source10:       subclipse-fetch-%{version}.sh
-Patch0:         eclipse-subclipse-1.4.7-dependencies.patch
+Source10:       subclipse-fetch.sh
+Patch0:         eclipse-subclipse-1.6.0-dependencies.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,8 +30,8 @@
 
 BuildRequires:          eclipse-svnkit >= 1.2.2
 Requires:               eclipse-svnkit >= 1.2.2
-BuildRequires:          subversion-javahl >= 1.5
-Requires:               subversion-javahl >= 1.5
+BuildRequires:          subversion-javahl >= 1.6
+Requires:               subversion-javahl >= 1.6
 
 Obsoletes:              eclipse-subclipse-book < 1.4
 
@@ -123,9 +123,15 @@
 
 
 %changelog
+<<<<<<< eclipse-subclipse.spec
+* Mon Apr 26 2009 Robert Marcano <robert at marcanoonline.com> 1.6.0-1
+- Update to upstream 1.6.0
+
+=======
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.7-4
 - Rebuild to not ship p2 context.xml.
 
+>>>>>>> 1.29
 * Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-3
 - Update to upstream 1.4.7
 - eclipse-subclipse-book is obsoleted, not provided upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Feb 2009 16:11:36 -0000	1.7
+++ sources	6 Apr 2009 15:09:47 -0000	1.8
@@ -1 +1 @@
-c0faddf79339cf86b757a8679c7f592d  subclipse-1.4.7.tgz
+847948fa1ec5888219d259fd94d85198  subclipse-1.6.0.tgz


--- eclipse-subclipse-1.4.7-dependencies.patch DELETED ---


--- subclipse-fetch-1.4.7.sh DELETED ---



From robmv at fedoraproject.org  Mon Apr  6 15:11:44 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Mon,  6 Apr 2009 15:11:44 +0000 (UTC)
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.30,1.31
Message-ID: <20090406151144.C76A8700FB@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20939

Modified Files:
	eclipse-subclipse.spec 
Log Message:
fix bad merge



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- eclipse-subclipse.spec	6 Apr 2009 15:09:47 -0000	1.30
+++ eclipse-subclipse.spec	6 Apr 2009 15:11:14 -0000	1.31
@@ -123,15 +123,12 @@
 
 
 %changelog
-<<<<<<< eclipse-subclipse.spec
 * Mon Apr 26 2009 Robert Marcano <robert at marcanoonline.com> 1.6.0-1
 - Update to upstream 1.6.0
 
-=======
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.7-4
 - Rebuild to not ship p2 context.xml.
 
->>>>>>> 1.29
 * Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-3
 - Update to upstream 1.4.7
 - eclipse-subclipse-book is obsoleted, not provided upstream



From atkac at fedoraproject.org  Mon Apr  6 15:12:25 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  6 Apr 2009 15:12:25 +0000 (UTC)
Subject: rpms/dump/devel dump-rh489853.patch, NONE, 1.1 dump-rh490627.patch, 
	NONE, 1.1 dump-rh493635.patch, NONE, 1.1 dump.spec, 1.51, 1.52
Message-ID: <20090406151225.00EB3700FB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/dump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21193

Modified Files:
	dump.spec 
Added Files:
	dump-rh489853.patch dump-rh490627.patch dump-rh493635.patch 
Log Message:
- display dump level correctly in all cases (#493635)
- -A option is not valid when -P is specified, correct manual page (#490627)
- fix typos in manual pages (#489853)


dump-rh489853.patch:

--- NEW FILE dump-rh489853.patch ---
diff -up dump-0.4b41/dump/dump.8.in.rh489853 dump-0.4b41/dump/dump.8.in
--- dump-0.4b41/dump/dump.8.in.rh489853	2009-04-06 16:50:26.042022876 +0200
+++ dump-0.4b41/dump/dump.8.in	2009-04-06 16:51:04.966485882 +0200
@@ -434,7 +434,7 @@ option causes
 .B dump
 to print out, for all file systems in
 .I __DUMPDATES__ ,
-and regognized file systems in
+and recognized file systems in
 .I /etc/mtab
 and
 .IR /etc/fstab .
@@ -598,7 +598,7 @@ correctly with either pre-0.4b34 or 0.4b
 .B dump
 provided that the machine on which
 .B dump
-is run did not change timezones (which should be a fairly rare occurence).
+is run did not change timezones (which should be a fairly rare occurrence).
 .SH EXIT STATUS
 .B Dump
 exits with zero status on success. Startup errors are indicated with an exit
@@ -615,7 +615,7 @@ from dump can be parsed to look for line
 When a read error occurs,
 .B dump
 prints out the corresponding physical disk block and sector number and the
-ext2/3 logical block number. It doesn't print out the corresponing file name or
+ext2/3 logical block number. It doesn't print out the corresponding file name or
 even the inode number. The user has to use 
 .BR debugfs (8),
 commands
@@ -652,7 +652,7 @@ The 
 backup suite was ported to Linux's Second Extended File System by Remy Card 
 <card at Linux.EU.Org>. He maintained the initial versions of 
 .B dump
-(up and including 0.4b4, released in january 1997).
+(up and including 0.4b4, released in January 1997).
 .PP
 Starting with 0.4b5, the new maintainer is Stelian Pop <stelian at popies.net>.
 .SH AVAILABILITY
diff -up dump-0.4b41/restore/restore.8.in.rh489853 dump-0.4b41/restore/restore.8.in
--- dump-0.4b41/restore/restore.8.in.rh489853	2009-04-06 16:51:15.498003818 +0200
+++ dump-0.4b41/restore/restore.8.in	2009-04-06 16:51:31.606435999 +0200
@@ -377,7 +377,7 @@ prevents hierarchical restoration of com
 .BI \-H " hash_size"
 Use a hashtable having the specified number of entries for storing the
 directories entries instead of a linked list. This hashtable will
-considerably speed up inode lookups (visible especialy in interactive
+considerably speed up inode lookups (visible especially in interactive
 mode when adding/removing files from the restore list), but at the
 price of much more memory usage. The default value is 1, meaning no
 hashtable is used.
@@ -751,7 +751,7 @@ The
 backup suite was ported to Linux's Second Extended File System by Remy Card 
 <card at Linux.EU.Org>. He maintained the initial versions of 
 .B dump
-(up and including 0.4b4, released in january 1997).
+(up and including 0.4b4, released in January 1997).
 .PP
 Starting with 0.4b5, the new maintainer is Stelian Pop <stelian at popies.net>.
 .SH AVAILABILITY

dump-rh490627.patch:

--- NEW FILE dump-rh490627.patch ---
diff -up dump-0.4b41/restore/main.c.rh490627 dump-0.4b41/restore/main.c
--- dump-0.4b41/restore/main.c.rh490627	2009-04-06 16:48:15.730002753 +0200
+++ dump-0.4b41/restore/main.c	2009-04-06 16:48:24.578003355 +0200
@@ -727,7 +727,7 @@ usage(void)
 		"\t%s -i [-acd" tseflag "hH" kerbflag "lmMouvVy] [-A file] [-b blocksize] " tsEflag"\n"
 		"\t%s    [-f file] [-F script] " qfaflag "[-s fileno]\n"
 #ifdef USE_QFA
-		"\t%s -P file [-acdhH" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+		"\t%s -P file [-acdhH" kerbflag "lmMuvVy] [-b blocksize]\n"
 		"\t%s    [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
 #endif
 		"\t%s -r [-cd" tseflag "H" kerbflag "lMuvVy] [-b blocksize] " tsEflag"\n"
diff -up dump-0.4b41/restore/restore.8.in.rh490627 dump-0.4b41/restore/restore.8.in
--- dump-0.4b41/restore/restore.8.in.rh490627	2009-04-06 16:46:35.046519977 +0200
+++ dump-0.4b41/restore/restore.8.in	2009-04-06 16:47:03.318003509 +0200
@@ -54,7 +54,6 @@ restore \- restore files or file systems
 .B restore \-P 
 .I file
 [\fB\-acdhHklmMNuvVy\fR]
-[\fB\-A \fIfile\fR]
 [\fB\-b \fIblocksize\fR]
 [\fB\-f \fIfile\fR]
 [\fB\-F \fIscript\fR]

dump-rh493635.patch:

--- NEW FILE dump-rh493635.patch ---
diff -up dump-0.4b41/dump/main.c.rh493635 dump-0.4b41/dump/main.c
--- dump-0.4b41/dump/main.c.rh493635	2009-04-06 16:28:17.534367185 +0200
+++ dump-0.4b41/dump/main.c	2009-04-06 16:32:15.762151077 +0200
@@ -239,6 +239,8 @@ main(int argc, char *argv[])
 		quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
 	memset(&lastlevel, 0, NUM_STR_SIZE);
 	memset(&level, 0, NUM_STR_SIZE);
+	/* Default dump level is zero. */
+	level[0] = '0';
 
 	if (argc < 2)
 		usage();


Index: dump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dump/devel/dump.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dump.spec	9 Mar 2009 13:37:33 -0000	1.51
+++ dump.spec	6 Apr 2009 15:11:54 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Version: 0.4b41
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -15,6 +15,9 @@
 Patch2: dump-immutable.patch
 Patch4: dump-0.4b41-libtinfo.patch
 Patch5: dump-rh356121.patch
+Patch6: dump-rh493635.patch
+Patch7: dump-rh490627.patch
+Patch8: dump-rh489853.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2
 BuildRequires: zlib-devel, bzip2-devel, automake
@@ -54,6 +57,9 @@
 %patch2 -p1 -b .orig
 %patch4 -p1 -b .libtinfo
 %patch5 -p1 -b .rh356121
+%patch6 -p1 -b .rh493635
+%patch7 -p1 -b .rh490627
+%patch8 -p1 -b .rh489853
 
 for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
     iconv -f iso-8859-1 -t utf-8  $i -o $i.new
@@ -126,6 +132,11 @@
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Mon Apr 04 2009 Adam Tkac <atkac redhat com> 0.4b41-13
+- display dump level correctly in all cases (#493635)
+- -A option is not valid when -P is specified, correct manual page (#490627)
+- fix typos in manual pages (#489853)
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> 0.4b41-12
 - correct manual page (dump level is 0 by default, #356121)
 



From pjones at fedoraproject.org  Mon Apr  6 15:13:28 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon,  6 Apr 2009 15:13:28 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-efipxe.patch,1.2,1.3 grub.spec,1.89,1.90
Message-ID: <20090406151328.9ED9B700FB@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21829

Modified Files:
	grub-0.97-efipxe.patch grub.spec 
Log Message:
* Mon Apr 06 2009 Peter Jones <pjones at redhat.com> - 0.97-46
- Update gnu-efi buildreq.
- Fix up pxe code for i386


grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-0.97-efipxe.patch	3 Apr 2009 19:10:52 -0000	1.2
+++ grub-0.97-efipxe.patch	6 Apr 2009 15:13:28 -0000	1.3
@@ -1,27 +1,27 @@
-From 379129c619281449e4c441a932080c68b57f0ab8 Mon Sep 17 00:00:00 2001
+From cc3b0e11c8322c2c4f81e9964301157cfbcfdf16 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
 Date: Tue, 31 Mar 2009 14:55:00 +0500
 Subject: [PATCH] add basic pxe boot support in efi
 
 ---
  efi/Makefile.am    |    2 +-
- efi/byteswap.h     |   37 +++++
+ efi/byteswap.h     |   37 ++++
  efi/dhcp.h         |  133 +++++++++++++++
  efi/eficore.c      |   12 ++
  efi/efimain.c      |   41 ++++--
  efi/efimisc.c      |   14 +-
  efi/efitftp.c      |  182 +++++++++++++++++++++
  efi/grub/efi/efi.h |    6 +
- efi/pxe.c          |  456 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ efi/pxe.c          |  462 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  efi/pxe.h          |  237 +++++++++++++++++++++++++++
  grub/Makefile.am   |    2 +-
- grub/efitftp.c     |   29 ++++
+ grub/efitftp.c     |   34 ++++
  stage2/Makefile.am |    4 +-
  stage2/disk_io.c   |   17 ++-
- stage2/efistubs.c  |    9 +
+ stage2/efistubs.c  |    7 +
  stage2/efistubs.h  |    8 +
  stage2/filesys.h   |   13 ++-
- 17 files changed, 1176 insertions(+), 26 deletions(-)
+ 17 files changed, 1185 insertions(+), 26 deletions(-)
  create mode 100644 efi/byteswap.h
  create mode 100644 efi/dhcp.h
  create mode 100644 efi/efitftp.c
@@ -343,7 +343,7 @@
    path_name_len = dir_end + 1 - path_name;
 diff --git a/efi/efitftp.c b/efi/efitftp.c
 new file mode 100644
-index 0000000..9138165
+index 0000000..9f207e3
 --- /dev/null
 +++ b/efi/efitftp.c
 @@ -0,0 +1,182 @@
@@ -413,7 +413,7 @@
 +static grub_efi_status_t tftp_read_file(
 +	char *Filename,
 +	char *Buffer,
-+	grub_efi_uintn_t BufferSize)
++	grub_efi_uint64_t BufferSize)
 +{
 +	EFI_PXE_BASE_CODE_TFTP_OPCODE OpCode = EFI_PXE_BASE_CODE_TFTP_READ_FILE;
 +	grub_efi_boolean_t Overwrite = 0;
@@ -548,10 +548,10 @@
  grub_efi_handle_t *grub_efi_locate_handle (grub_efi_locate_search_type_t
 diff --git a/efi/pxe.c b/efi/pxe.c
 new file mode 100644
-index 0000000..375f47d
+index 0000000..b38b95a
 --- /dev/null
 +++ b/efi/pxe.c
-@@ -0,0 +1,456 @@
+@@ -0,0 +1,462 @@
 +
 +#include <grub/efi/efi.h>
 +#include <grub/efi/api.h>
@@ -593,8 +593,10 @@
 +static void dhcp_option_parser_reset(dhcp_option_parser *parser,
 +				EFI_PXE_BASE_CODE_PACKET *packet)
 +{
-+	grub_uint64_t addr = (grub_uint64_t)packet;
++	char *addr;
++	//grub_uint64_t addr = (grub_uint64_t)(void *)packet;
 +
++	addr = (char *)packet;
 +	addr += offsetof(EFI_PXE_BASE_CODE_DHCPV4_PACKET, DhcpOptions);
 +	parser->current_option = (void *)addr;
 +	parser->options = (void *)addr;
@@ -603,11 +605,15 @@
 +static int dhcp_option_parser_next(dhcp_option_parser *parser,
 +				EFI_DHCP4_PACKET_OPTION **option)
 +{
++	char *current_option;
 +	if (parser->current_option->OpCode == 255) {
 +		*option = NULL;
 +		return 0;
 +	}
-+	parser->current_option = (void *)((grub_uint64_t)parser->current_option + 2 + parser->current_option->Length);
++	current_option = (char *)parser->current_option;
++	current_option += 2 + parser->current_option->Length;
++	parser->current_option = (EFI_DHCP4_PACKET_OPTION *)current_option;
++
 +	*option = parser->current_option;
 +	return 1;
 +}
@@ -967,7 +973,7 @@
 +	char *FileName = NULL;
 +	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
 +	uuid_t uuid;
-+	size_t FileSize = 0;
++	grub_efi_uintn_t FileSize = 0;
 +	grub_efi_status_t rc = GRUB_EFI_SUCCESS;
 +	char *ConfigPath = NULL;
 +
@@ -1264,7 +1270,7 @@
  grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)
 diff --git a/grub/efitftp.c b/grub/efitftp.c
 new file mode 100644
-index 0000000..383c451
+index 0000000..5355dec
 --- /dev/null
 +++ b/grub/efitftp.c
 @@ -0,0 +1,34 @@
@@ -1395,7 +1401,7 @@
  		  && (!ptr
 diff --git a/stage2/efistubs.c b/stage2/efistubs.c
 new file mode 100644
-index 0000000..79db331
+index 0000000..29b086a
 --- /dev/null
 +++ b/stage2/efistubs.c
 @@ -0,0 +1,7 @@
@@ -1452,5 +1458,5 @@
  
  /* defines for the block filesystem info area */
 -- 
-1.6.2
+1.6.2.2
 


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- grub.spec	3 Apr 2009 18:34:11 -0000	1.89
+++ grub.spec	6 Apr 2009 15:13:28 -0000	1.90
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 45%{?dist}
+Release: 46%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -8,7 +8,7 @@
 ExclusiveArch: i586 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
 BuildRequires: autoconf /usr/lib/crt1.o automake
-BuildRequires: gnu-efi >= 3.0e-5
+BuildRequires: gnu-efi >= 3.0e-7
 BuildRequires: glibc-static
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -36,7 +36,8 @@
 Patch8: grub-0.97-xfs-buildfix.patch
 Patch9: grub-0.97-efigraph-use-blt.patch
 Patch10: grub-0.97-efislice.patch
-Patch11: grub-0.97-efipxe.patch
+Patch11: grub-0.97-efistatus.patch
+Patch12: grub-0.97-efipxe.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -58,6 +59,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 autoreconf
@@ -120,6 +122,10 @@
 %{_datadir}/grub
 
 %changelog
+* Mon Apr 06 2009 Peter Jones <pjones at redhat.com> - 0.97-46
+- Update gnu-efi buildreq.
+- Fix up pxe code for i386
+
 * Fri Apr 03 2009 Peter Jones <pjones at redhat.com> - 0.97-45
 - Add very basic PXE support for EFI.
 



From pjones at fedoraproject.org  Mon Apr  6 15:13:41 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon,  6 Apr 2009 15:13:41 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-efistatus.patch,NONE,1.1
Message-ID: <20090406151341.67F33700FB@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21916

Added Files:
	grub-0.97-efistatus.patch 
Log Message:
* Mon Apr 06 2009 Peter Jones <pjones at redhat.com> - 0.97-46
- Update gnu-efi buildreq.
- Fix up pxe code for i386


grub-0.97-efistatus.patch:

--- NEW FILE grub-0.97-efistatus.patch ---
From: Peter Jones <pjones at redhat.com>
Date: Mon, 6 APR 2009 10:22:00 +0500
Subject: [PATCH] Make sure EFI_STATUS is defined on ia32.

diff -urpN grub-0.97/efi/grub/efi/eficall.h.status grub-0.97/efi/grub/efi/eficall.h
--- grub-0.97/efi/grub/efi/eficall.h.status	2009-04-06 10:18:39.000000000 -0400
+++ grub-0.97/efi/grub/efi/eficall.h	2009-04-06 10:18:58.000000000 -0400
@@ -145,6 +145,7 @@ EFI_STATUS x64_call10(unsigned long func
 
 #else
 
+typedef long EFI_STATUS;
 #define Call_Service(func)                      func()
 #define Call_Service_1(func,a)                  func(a)
 #define Call_Service_2(func,a,b)                func(a,b)



From nalin at fedoraproject.org  Mon Apr  6 15:15:24 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 15:15:24 +0000 (UTC)
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.108,1.109
Message-ID: <20090406151524.6A7D2700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22294

Modified Files:
	nss_ldap.spec 
Log Message:
- remove some cruft
- move the %%postun that fixes up pam configs to the pam_ldap package



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- nss_ldap.spec	6 Apr 2009 14:57:59 -0000	1.108
+++ nss_ldap.spec	6 Apr 2009 15:14:54 -0000	1.109
@@ -64,9 +64,6 @@
 %prep
 %setup -q -c -a 1
 cp %{SOURCE5} .
-cp nss_ldap-%{nss_ldap_version}/ldap.conf ldap.conf.nss_ldap
-cp pam_ldap-%{pam_ldap_version}/ldap.conf ldap.conf.pam_ldap
-
 cp nss_ldap-%{nss_ldap_version}/resolve.c pam_ldap-%{pam_ldap_version}/
 cp nss_ldap-%{nss_ldap_version}/resolve.h pam_ldap-%{pam_ldap_version}/
 cp nss_ldap-%{nss_ldap_version}/snprintf.c pam_ldap-%{pam_ldap_version}/
@@ -93,20 +90,6 @@
 
 rm -f pam.d/*.pam_console
 
-cp nss_ldap-%{nss_ldap_version}/ANNOUNCE             ANNOUNCE.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/AUTHORS              AUTHORS.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/ChangeLog            ChangeLog.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/COPYING              COPYING.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/NEWS                 NEWS.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/README               README.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/nsswitch.ldap        nsswitch.ldap
-cp pam_ldap-%{pam_ldap_version}/AUTHORS     AUTHORS.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/ChangeLog   ChangeLog.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/COPYING     COPYING.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/COPYING.LIB COPYING.LIB.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/NEWS        NEWS.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/README      README.pam_ldap
-
 cp %{_datadir}/libtool/config/config.{sub,guess} nss_ldap-%{nss_ldap_version}/
 cp %{_datadir}/libtool/config/config.{sub,guess} pam_ldap-%{pam_ldap_version}/
 
@@ -172,8 +155,9 @@
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%post -n pam_ldap
 # Fix a logic mismatch between what the version of authconfig in RHL 7.2 would
 # generate and this version of pam_ldap.
 if grep -q '^account     required      /lib/security/pam_ldap.so$' /etc/pam.d/system-auth ; then
@@ -222,6 +206,8 @@
 - split pam_ldap off into a separate binary package
 - require /%{_lib}/security/pam_ldap.so to pull in pam_ldap on upgrades
 - require our configuration file to come from somewhere
+- remove some cruft
+- move the %%postun that fixes up pam configs to the pam_ldap package
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 264-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From toshio at fedoraproject.org  Mon Apr  6 15:40:43 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon,  6 Apr 2009 15:40:43 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts/devel import.log, NONE,
	1.1 tulrich-tuffy-fonts-fontconfig.conf, NONE,
	1.1 tulrich-tuffy-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090406154043.77BC9700FB@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28537/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tulrich-tuffy-fonts-fontconfig.conf 
	tulrich-tuffy-fonts.spec 
Log Message:
Iniital import.



--- NEW FILE import.log ---
tulrich-tuffy-fonts-1_1-3_fc10:HEAD:tulrich-tuffy-fonts-1.1-3.fc10.src.rpm:1239031994


--- NEW FILE tulrich-tuffy-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>tuffy</family>
    </prefer>
  </alias>
  <alias>
    <family>tuffy</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE tulrich-tuffy-fonts.spec ---
%global fontname tulrich-tuffy
%global fontconf 60-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.1
Release:        3%{?dist}
Summary:        Generic sans font

Group:          User Interface/X
License:        Public Domain
URL:            http://tulrich.com/fonts/
Source0:        http://tulrich.com/fonts/tuffy-20071106.tar.gz
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
BuildRequires:  fontforge
Requires:       fontpackages-filesystem

%description
Tuffy is an innocuous looking sans font.

%prep
%setup -q -n tuffy-20071106

%build
# be really sure that we don't package pre-generated ttf files
rm *.ttf
# We use the legacy font forge script to generate the TTF files (instead of a 
# Python one) because of bug 489109.
fontforge -lang=ff -script "-" *.sfd <<"EOF"
i = 1
while ( i < $argc )
  Open ($argv[i], 1)
  Generate ($fontname + ".ttf")
  PrintSetup (5)
  PrintFont (0, 0, "", $fontname + "-sample.pdf")
  Close()
  i++
endloop
EOF


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc LICENSE.txt


%changelog
* Tue Mar 31 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-3
- Change fontconfig file to use "sans-serif" generic.

* Sat Mar 07 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.1-2
- Modified fontforge script to make it compatible with rawhide fontforge

* Tue Feb 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:38:03 -0000	1.1
+++ .cvsignore	6 Apr 2009 15:40:13 -0000	1.2
@@ -0,0 +1 @@
+tuffy-20071106.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:38:03 -0000	1.1
+++ sources	6 Apr 2009 15:40:13 -0000	1.2
@@ -0,0 +1 @@
+f6b6fed6791ba6fa92af1f5e97c7b81d  tuffy-20071106.tar.gz



From kyle at fedoraproject.org  Mon Apr  6 15:44:59 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon,  6 Apr 2009 15:44:59 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-git13.bz2.sign, NONE, 1.1 .cvsignore,
	1.1043, 1.1044 config-generic, 1.272,
	1.273 config-powerpc-generic, 1.41, 1.42 config-powerpc64, 1.29,
	1.30 config-x86-generic, 1.75, 1.76 config-x86_64-generic, 1.74,
	1.75 kernel.spec, 1.1500, 1.1501 sources, 1.1005,
	1.1006 upstream, 1.916,
	1.917 alsa-pcm-always-reset-invalid-position.patch, 1.1,
	NONE alsa-pcm-fix-delta-calc-at-overlap.patch, 1.1,
	NONE alsa-pcm-safer-boundary-checks.patch, 1.1,
	NONE alsa-rewrite-hw_ptr-updaters.patch, 1.1,
	NONE dma-api-debug-fixes.patch, 1.1,
	NONE linux-2.6-acpi-strict-resources.patch, 1.1,
	NONE linux-2.6-acpi-video-didl-intel-outputs.patch, 1.2,
	NONE linux-2.6-btrfs-fix-umount-hang.patch, 1.1,
	NONE linux-2.6-debug-dma-api.patch, 1.3,
	NONE linux-2.6-dropwatch-protocol.patch, 1.1,
	NONE linux-2.6-ext4-flush-on-close.patch, 1.1,
	NONE linux-2.6-fiemap-header-install.patch, 1.1,
	NONE linux-2.6-input-hid-extra-gamepad.patch, 1.1,
	NONE linux-2.6-ipw2x00-age-scan-results-on-resume.patch, 1.1,
	NONE linux-2.6-net-fix-another-gro-bug.patch, 1.1,
	NONE linux-2.6-net-fix-gro-bug.patch, 1.1,
	NONE linux-2.6-net-xfrm-fix-spin-unlock.patch, 1.1,
	NONE linux-2.6-pci-sysfs-remove-id.patch, 1.1,
	NONE linux-2.6-relatime-by-default.patch, 1.1,
	NONE linux-2.6-scsi-cpqarray-set-master.patch, 1.1,
	NONE linux-2.6-sony-laptop-rfkill.patch, 1.2, NONE
	linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch,
	1.1, NONE linux-2.6.29-pat-pci-change-prot-for-inherit.patch,
	1.1, NONE patch-2.6.29-git9.bz2.sign, 1.1, NONE
Message-ID: <20090406154459.CA120700FB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29722

Modified Files:
	.cvsignore config-generic config-powerpc-generic 
	config-powerpc64 config-x86-generic config-x86_64-generic 
	kernel.spec sources upstream 
Added Files:
	patch-2.6.29-git13.bz2.sign 
Removed Files:
	alsa-pcm-always-reset-invalid-position.patch 
	alsa-pcm-fix-delta-calc-at-overlap.patch 
	alsa-pcm-safer-boundary-checks.patch 
	alsa-rewrite-hw_ptr-updaters.patch dma-api-debug-fixes.patch 
	linux-2.6-acpi-strict-resources.patch 
	linux-2.6-acpi-video-didl-intel-outputs.patch 
	linux-2.6-btrfs-fix-umount-hang.patch 
	linux-2.6-debug-dma-api.patch 
	linux-2.6-dropwatch-protocol.patch 
	linux-2.6-ext4-flush-on-close.patch 
	linux-2.6-fiemap-header-install.patch 
	linux-2.6-input-hid-extra-gamepad.patch 
	linux-2.6-ipw2x00-age-scan-results-on-resume.patch 
	linux-2.6-net-fix-another-gro-bug.patch 
	linux-2.6-net-fix-gro-bug.patch 
	linux-2.6-net-xfrm-fix-spin-unlock.patch 
	linux-2.6-pci-sysfs-remove-id.patch 
	linux-2.6-relatime-by-default.patch 
	linux-2.6-scsi-cpqarray-set-master.patch 
	linux-2.6-sony-laptop-rfkill.patch 
	linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch 
	linux-2.6.29-pat-pci-change-prot-for-inherit.patch 
	patch-2.6.29-git9.bz2.sign 
Log Message:
* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.29-git13
- drop patches merged upstream:
  - fix-ppc-debug_kmap_atomic.patch
  - fix-staging-at76.patch
  - linux-2.6-acpi-video-didl-intel-outputs.patch
  - linux-2.6-acpi-strict-resources.patch
  - linux-2.6-sony-laptop-rfkill.patch
  - linux-2.6-btrfs-fix-umount-hang.patch
  - linux-2.6-fiemap-header-install.patch
  - linux-2.6-debug-dma-api.patch
  - dma-api-debug-fixes.patch
  - linux-2.6-ext4-flush-on-close.patch
  - linux-2.6-relatime-by-default.patch
  - linux-2.6-pci-sysfs-remove-id.patch
  - linux-2.6-scsi-cpqarray-set-master.patch
  - alsa-rewrite-hw_ptr-updaters.patch
  - alsa-pcm-always-reset-invalid-position.patch
  - alsa-pcm-fix-delta-calc-at-overlap.patch
  - alsa-pcm-safer-boundary-checks.patch
  - linux-2.6-input-hid-extra-gamepad.patch
  - linux-2.6-ipw2x00-age-scan-results-on-resume.patch
  - linux-2.6-dropwatch-protocol.patch
  - linux-2.6-net-fix-gro-bug.patch
  - linux-2.6-net-fix-another-gro-bug.patch
  - linux-2.6-net-xfrm-fix-spin-unlock.patch
  - linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
  - linux-2.6.29-pat-pci-change-prot-for-inherit.patch



--- NEW FILE patch-2.6.29-git13.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ2UgcyGugalF9Dw4RAuUYAJ9LMdbws6sYhZjGvYoxznPQM1wFQwCeKi15
0AEa9WfSTbyfES4p5jWn9oc=
=G7PN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -r1.1043 -r1.1044
--- .cvsignore	2 Apr 2009 04:04:33 -0000	1.1043
+++ .cvsignore	6 Apr 2009 15:44:28 -0000	1.1044
@@ -5,4 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29-git9.bz2
+patch-2.6.29-git13.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- config-generic	2 Apr 2009 04:04:34 -0000	1.272
+++ config-generic	6 Apr 2009 15:44:28 -0000	1.273
@@ -1298,6 +1298,8 @@
 CONFIG_NIU=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_TEHUTI=m
 CONFIG_ENIC=m
 CONFIG_MLX4_EN=m
@@ -2729,6 +2731,7 @@
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
+CONFIG_DRAGONRISE_FF=m
 
 #
 # USB Imaging devices
@@ -3041,6 +3044,17 @@
 # Autofsv3 is obsolete.
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=m
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3121,6 +3135,7 @@
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
+CONFIG_NFS_FSCACHE=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
@@ -3651,6 +3666,7 @@
 CONFIG_DMA_ENGINE=y
 CONFIG_NET_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_ASYNC_TX_DMA=y
 
 CONFIG_UNUSED_SYMBOLS=y
 
@@ -3661,6 +3677,10 @@
 CONFIG_SCHED_TRACER=y
 CONFIG_PROCESS_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_WORKQUEUE_TRACER=y
+CONFIG_EVENT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_KMEMTRACE=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
@@ -3815,6 +3835,7 @@
 
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_WM8350=m
@@ -3865,6 +3886,16 @@
 # CONFIG_INPUT_MIMIO is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_EPL is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_USB_SERIAL_ATEN2011 is not set
+# CONFIG_B3DFG is not set
+# CONFIG_DST is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_HECI is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
+# CONFIG_RT3070 is not set
 
 #
 # Android
@@ -3900,3 +3931,5 @@
 # CONFIG_IMA is not set
 
 # CONFIG_PAGE_POISONING is not set
+
+CONFIG_SLOW_WORK=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-powerpc-generic	31 Mar 2009 04:09:01 -0000	1.41
+++ config-powerpc-generic	6 Apr 2009 15:44:28 -0000	1.42
@@ -36,6 +36,7 @@
 # CONFIG_GEN_RTC is not set
 # CONFIG_GEN_RTC_X is not set
 CONFIG_RTC_DRV_PPC=y
+CONFIG_RTC_DRV_GENERIC=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ELECTRA_IDE=y
@@ -200,6 +201,8 @@
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_PASEMI=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 CONFIG_AXON_RAM=m
 CONFIG_OPROFILE_CELL=y
@@ -312,3 +315,5 @@
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 
 CONFIG_DTL=y
+
+CONFIG_MMC_SDHCI_OF=m


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-powerpc64	31 Mar 2009 04:09:01 -0000	1.29
+++ config-powerpc64	6 Apr 2009 15:44:28 -0000	1.30
@@ -176,3 +176,4 @@
 CONFIG_PPC_IBM_CELL_POWERBUTTON=m
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
 
+CONFIG_RTC_DRV_PS3=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- config-x86-generic	31 Mar 2009 04:09:01 -0000	1.75
+++ config-x86-generic	6 Apr 2009 15:44:28 -0000	1.76
@@ -87,6 +87,11 @@
 CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 
+CONFIG_DMAR=y
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=y
 CONFIG_FB_GEODE_GX=y
@@ -296,6 +301,8 @@
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I5400=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 CONFIG_SCHED_MC=y
 
@@ -328,6 +335,7 @@
 CONFIG_ACER_WMI=m
 CONFIG_TC1100_WMI=m
 CONFIG_HP_WMI=m
+CONFIG_DELL_WMI=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
@@ -388,6 +396,7 @@
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 
 CONFIG_MACINTOSH_DRIVERS=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- config-x86_64-generic	31 Mar 2009 04:09:01 -0000	1.74
+++ config-x86_64-generic	6 Apr 2009 15:44:28 -0000	1.75
@@ -117,6 +117,7 @@
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_HP_WMI=m
+CONFIG_DELL_WMI=m
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
@@ -124,6 +125,7 @@
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -200,6 +202,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 CONFIG_SCHED_MC=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1500
retrieving revision 1.1501
diff -u -r1.1500 -r1.1501
--- kernel.spec	3 Apr 2009 05:04:00 -0000	1.1500
+++ kernel.spec	6 Apr 2009 15:44:28 -0000	1.1501
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 9
+%define gitrev 13
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -594,8 +594,6 @@
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ftrace.patch
 
-Patch30: linux-2.6-debug-dma-api.patch
-Patch31: dma-api-debug-fixes.patch
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch50: rds-only-on-64-bit-or-x86.patch
@@ -618,17 +616,11 @@
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
-Patch383: linux-2.6-pci-sysfs-remove-id.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch392: linux-2.6-acpi-strict-resources.patch
 Patch393: linux-2.6-hwmon-atk0110.patch
-Patch394: linux-2.6-acpi-video-didl-intel-outputs.patch
-Patch395: linux-2.6-sony-laptop-rfkill.patch
-Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
-Patch452: linux-2.6-input-hid-extra-gamepad.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -641,18 +633,12 @@
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch601: alsa-rewrite-hw_ptr-updaters.patch
-Patch602: alsa-pcm-always-reset-invalid-position.patch
-Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
-Patch604: alsa-pcm-safer-boundary-checks.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-Patch683: fix-staging-at76.patch
 Patch684: at76-netdev_ops.patch
 
 Patch1515: linux-2.6.29-lirc.patch
@@ -688,11 +674,7 @@
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
-Patch2920: linux-2.6-ext4-flush-on-close.patch
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
-Patch3001: linux-2.6-btrfs-fix-umount-hang.patch
-Patch3010: linux-2.6-relatime-by-default.patch
-Patch3020: linux-2.6-fiemap-header-install.patch
 
 Patch4000: linux-2.6-bootarg-strict-devmem.patch
 
@@ -700,19 +682,7 @@
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
-#Adding dropwatch into rawhide until we get to 2.6.30
-Patch9003: linux-2.6-dropwatch-protocol.patch
-
-# fix for net lockups, will be in 2.6.29.1
-Patch9100: linux-2.6-net-fix-gro-bug.patch
-Patch9101: linux-2.6-net-fix-another-gro-bug.patch
-
-# fix locking in ipsec (#489764)
-Patch9200: linux-2.6-net-xfrm-fix-spin-unlock.patch
-
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
-Patch9208: linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
-Patch9209: linux-2.6.29-pat-pci-change-prot-for-inherit.patch
 Patch9210: linux-2.6.29-pat-fixes.patch
 
 %endif
@@ -1097,18 +1067,13 @@
 
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-tracehook.patch
-ApplyPatch linux-2.6-utrace.patch
-ApplyPatch linux-2.6-utrace-ftrace.patch
-
-# DMA API debugging
-#ApplyPatch linux-2.6-debug-dma-api.patch
-#ApplyPatch dma-api-debug-fixes.patch
+#ApplyPatch linux-2.6-utrace.patch
+#ApplyPatch linux-2.6-utrace-ftrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
 ApplyPatch rds-only-on-64-bit-or-x86.patch
-ApplyPatch fix-ppc-debug_kmap_atomic.patch
 
 # Architecture patches
 # x86(-64)
@@ -1131,7 +1096,6 @@
 #
 # SPARC64
 #
-
 ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
 #
@@ -1144,19 +1108,11 @@
 #
 
 # ext4
-#ApplyPatch linux-2.6-ext4-flush-on-close.patch
 
 # xfs
 
 # btrfs
 #ApplyPatch linux-2.6-btrfs-experimental-branch.patch
-ApplyPatch linux-2.6-btrfs-fix-umount-hang.patch
-
-# relatime
-#ApplyPatch linux-2.6-relatime-by-default.patch
-
-# get fiemap.h into kernel-headers
-ApplyPatch linux-2.6-fiemap-header-install.patch
 
 # Make strict devmem a boot arg
 ApplyPatch linux-2.6-bootarg-strict-devmem.patch
@@ -1166,15 +1122,12 @@
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acpi-strict-resources.patch
 ApplyPatch linux-2.6-hwmon-atk0110.patch
-ApplyPatch linux-2.6-acpi-video-didl-intel-outputs.patch
-ApplyPatch linux-2.6-sony-laptop-rfkill.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
 #ApplyPatch linux-2.6-debug-nmi-timeout.patch
-ApplyPatch linux-2.6-debug-taint-vm.patch
+#ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-spinlock-taint.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
@@ -1188,25 +1141,14 @@
 #ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
 #ApplyPatch linux-2.6-defaults-pciehp.patch
-# Add /sys/bus/pci/devices/*/remove_id
-#ApplyPatch linux-2.6-pci-sysfs-remove-id.patch
 
 #
 # SCSI Bits.
 #
-# fix cpqarray pci enable
-#ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 
 # ALSA
 # squelch hda_beep by default
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-
-# fix alsa for pulseaudio
-#ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
-#ApplyPatch alsa-pcm-always-reset-invalid-position.patch
-#ApplyPatch alsa-pcm-fix-delta-calc-at-overlap.patch
-#ApplyPatch alsa-pcm-safer-boundary-checks.patch
-
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
@@ -1218,9 +1160,6 @@
 # Get away from having to poll Toshibas
 ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
-# HID: add support for another version of 0e8f:0003 device in hid-pl
-ApplyPatch linux-2.6-input-hid-extra-gamepad.patch
-
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
@@ -1248,8 +1187,6 @@
 
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-#ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-ApplyPatch fix-staging-at76.patch
 ApplyPatch at76-netdev_ops.patch
 
 # http://www.lirc.org/
@@ -1293,15 +1230,6 @@
 
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
-#ApplyPatch linux-2.6-dropwatch-protocol.patch
-
-#ApplyPatch linux-2.6-net-fix-gro-bug.patch
-#ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
-
-#ApplyPatch linux-2.6-net-xfrm-fix-spin-unlock.patch
-
-#ApplyPatch linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
-#ApplyPatch linux-2.6.29-pat-pci-change-prot-for-inherit.patch
 ApplyPatch linux-2.6.29-pat-fixes.patch
 
 # END OF PATCH APPLICATIONS
@@ -1897,6 +1825,35 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git13
+- drop patches merged upstream:
+  - fix-ppc-debug_kmap_atomic.patch
+  - fix-staging-at76.patch
+  - linux-2.6-acpi-video-didl-intel-outputs.patch
+  - linux-2.6-acpi-strict-resources.patch
+  - linux-2.6-sony-laptop-rfkill.patch
+  - linux-2.6-btrfs-fix-umount-hang.patch
+  - linux-2.6-fiemap-header-install.patch
+  - linux-2.6-debug-dma-api.patch
+  - dma-api-debug-fixes.patch
+  - linux-2.6-ext4-flush-on-close.patch
+  - linux-2.6-relatime-by-default.patch
+  - linux-2.6-pci-sysfs-remove-id.patch
+  - linux-2.6-scsi-cpqarray-set-master.patch
+  - alsa-rewrite-hw_ptr-updaters.patch
+  - alsa-pcm-always-reset-invalid-position.patch
+  - alsa-pcm-fix-delta-calc-at-overlap.patch
+  - alsa-pcm-safer-boundary-checks.patch
+  - linux-2.6-input-hid-extra-gamepad.patch
+  - linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+  - linux-2.6-dropwatch-protocol.patch
+  - linux-2.6-net-fix-gro-bug.patch
+  - linux-2.6-net-fix-another-gro-bug.patch
+  - linux-2.6-net-xfrm-fix-spin-unlock.patch
+  - linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
+  - linux-2.6.29-pat-pci-change-prot-for-inherit.patch
+
 * Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>
 - linux-2.6-btrfs-fix-umount-hang.patch: fix umount hang on btrfs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -r1.1005 -r1.1006
--- sources	2 Apr 2009 04:04:34 -0000	1.1005
+++ sources	6 Apr 2009 15:44:29 -0000	1.1006
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-57870b0f201c7cf04e701c59dfb026c6  patch-2.6.29-git9.bz2
+de7c0d87b213419993d26bf3916d2733  patch-2.6.29-git13.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- upstream	2 Apr 2009 04:04:34 -0000	1.916
+++ upstream	6 Apr 2009 15:44:29 -0000	1.917
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29-git9.bz2
+patch-2.6.29-git13.bz2


--- alsa-pcm-always-reset-invalid-position.patch DELETED ---


--- alsa-pcm-fix-delta-calc-at-overlap.patch DELETED ---


--- alsa-pcm-safer-boundary-checks.patch DELETED ---


--- alsa-rewrite-hw_ptr-updaters.patch DELETED ---


--- dma-api-debug-fixes.patch DELETED ---


--- linux-2.6-acpi-strict-resources.patch DELETED ---


--- linux-2.6-acpi-video-didl-intel-outputs.patch DELETED ---


--- linux-2.6-btrfs-fix-umount-hang.patch DELETED ---


--- linux-2.6-debug-dma-api.patch DELETED ---


--- linux-2.6-dropwatch-protocol.patch DELETED ---


--- linux-2.6-ext4-flush-on-close.patch DELETED ---


--- linux-2.6-fiemap-header-install.patch DELETED ---


--- linux-2.6-input-hid-extra-gamepad.patch DELETED ---


--- linux-2.6-ipw2x00-age-scan-results-on-resume.patch DELETED ---


--- linux-2.6-net-fix-another-gro-bug.patch DELETED ---


--- linux-2.6-net-fix-gro-bug.patch DELETED ---


--- linux-2.6-net-xfrm-fix-spin-unlock.patch DELETED ---


--- linux-2.6-pci-sysfs-remove-id.patch DELETED ---


--- linux-2.6-relatime-by-default.patch DELETED ---


--- linux-2.6-scsi-cpqarray-set-master.patch DELETED ---


--- linux-2.6-sony-laptop-rfkill.patch DELETED ---


--- linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch DELETED ---


--- linux-2.6.29-pat-pci-change-prot-for-inherit.patch DELETED ---


--- patch-2.6.29-git9.bz2.sign DELETED ---



From limb at fedoraproject.org  Mon Apr  6 15:49:31 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  6 Apr 2009 15:49:31 +0000 (UTC)
Subject: rpms/nexuiz/devel .cvsignore, 1.13, 1.14 nexuiz.spec, 1.30,
	1.31 sources, 1.13, 1.14
Message-ID: <20090406154932.0204C700FB@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30699

Modified Files:
	.cvsignore nexuiz.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 May 2008 14:57:19 -0000	1.13
+++ .cvsignore	6 Apr 2009 15:49:01 -0000	1.14
@@ -1 +1 @@
-enginesource20080511.zip
+enginesource20090403.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nexuiz.spec	26 Feb 2009 05:30:24 -0000	1.30
+++ nexuiz.spec	6 Apr 2009 15:49:01 -0000	1.31
@@ -1,14 +1,14 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 2.4.2
-Release: 5%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://downloads.sourceforge.net/nexuiz/nexuiz-242.zip
-# unzip -j nexuiz-24.zip Nexuiz/sources/enginesource20080511.zip
-Source: enginesource20080511.zip
+# wget http://downloads.sourceforge.net/nexuiz/nexuiz-25.zip
+# unzip -j nexuiz-25.zip Nexuiz/sources/enginesource20090403.zip
+Source: enginesource20090403.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # For the .ico extraction
 BuildRequires: ImageMagick, file
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Jon Ciesla <limb at jcomserv.net> - 2.5-1
+- New upstream release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 May 2008 14:57:19 -0000	1.13
+++ sources	6 Apr 2009 15:49:01 -0000	1.14
@@ -1 +1 @@
-4827f52cbd2538b94729a02688248976  enginesource20080511.zip
+085d7eb7929d990003146a90bfcd274c  enginesource20090403.zip



From nalin at fedoraproject.org  Mon Apr  6 15:57:15 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 15:57:15 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec, 1.180, 1.181 krb524.sysconfig, 1.1,
	NONE krb524d.init, 1.7, NONE
Message-ID: <20090406155715.DC6FF700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31976

Modified Files:
	krb5.spec 
Removed Files:
	krb524.sysconfig krb524d.init 
Log Message:
- turn off krb4 support (it won't be part of the 1.7 release, but do it now)
- use triggeruns to properly shut down and disable krb524d when -server and
  -workstation-servers gets upgraded, because it's gone now



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- krb5.spec	17 Mar 2009 22:26:27 -0000	1.180
+++ krb5.spec	6 Apr 2009 15:56:45 -0000	1.181
@@ -16,13 +16,12 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.3
-Release: 19%{?dist}
+Release: 100%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
 Source1: krb5-%{version}.tar.gz.asc
 Source2: kpropd.init
-Source3: krb524d.init
 Source4: kadmind.init
 Source5: krb5kdc.init
 Source6: krb5.conf
@@ -40,7 +39,6 @@
 Source18: gssftp.xinetd
 Source19: krb5kdc.sysconfig
 Source20: kadmin.sysconfig
-Source21: krb524.sysconfig
 Source22: ekrb5-telnet.xinetd
 # The same source files we "check", generated with "krb5-tex-pdf.sh create"
 # and tarred up.
@@ -233,6 +231,11 @@
 certificate.
 
 %changelog
+* Mon Apr  6 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-100
+- turn off krb4 support (it won't be part of the 1.7 release, but do it now)
+- use triggeruns to properly shut down and disable krb524d when -server and
+  -workstation-servers gets upgraded, because it's gone now
+
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
   we fail to set up the server half of a context (CVE-2009-0845)
@@ -1402,7 +1405,6 @@
 %patch79 -p0 -b .ftp_mget_case
 %patch80 -p0 -b .preauth_master
 %patch81 -p0 -b .spnego-crash
-cp src/krb524/README README.krb524
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -1423,7 +1425,6 @@
 # Check that the PDFs we built earlier match this source tree.
 $RPM_SOURCE_DIR/krb5-tex-pdf.sh check << EOF
 doc/api       library krb5
-doc/api       libdes
 doc/implement implement
 doc/kadm5     adb-unit-test
 doc/kadm5     api-unit-test
@@ -1486,7 +1487,7 @@
 	--sbindir=%{krb5prefix}/sbin \
 	--datadir=%{krb5prefix}/share \
 	--localstatedir=%{_var}/kerberos \
-	--with-krb4 \
+	--without-krb4 \
 	--with-system-et \
 	--with-system-ss \
 	--with-netlib=-lresolv \
@@ -1543,11 +1544,9 @@
 install -pm 755 $RPM_SOURCE_DIR/krb5kdc.init $RPM_BUILD_ROOT/etc/rc.d/init.d/krb5kdc
 install -pm 755 $RPM_SOURCE_DIR/kadmind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kadmin
 install -pm 755 $RPM_SOURCE_DIR/kpropd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kprop
-install -pm 755 $RPM_SOURCE_DIR/krb524d.init $RPM_BUILD_ROOT/etc/rc.d/init.d/krb524
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 install -pm 644 $RPM_SOURCE_DIR/krb5kdc.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/krb5kdc
 install -pm 644 $RPM_SOURCE_DIR/kadmin.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kadmin
-install -pm 644 $RPM_SOURCE_DIR/krb524.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/krb524
 
 # Xinetd configuration files.
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d/
@@ -1594,7 +1593,6 @@
 # Install the new ones.
 /sbin/chkconfig --add krb5kdc
 /sbin/chkconfig --add kadmin
-/sbin/chkconfig --add krb524
 /sbin/chkconfig --add kprop
 # Install info pages.
 /sbin/install-info %{_infodir}/krb425.info.gz %{_infodir}/dir
@@ -1603,14 +1601,12 @@
 exit 0
 
 %preun server
-if [ "$1" = "0" ] ; then
+if [ "$1" -eq "0" ] ; then
 	/sbin/chkconfig --del krb5kdc
 	/sbin/chkconfig --del kadmin
-	/sbin/chkconfig --del krb524
 	/sbin/chkconfig --del kprop
 	/sbin/service krb5kdc stop > /dev/null 2>&1 || :
 	/sbin/service kadmin stop > /dev/null 2>&1 || :
-	/sbin/service krb524 stop > /dev/null 2>&1 || :
 	/sbin/service kprop stop > /dev/null 2>&1 || :
 	/sbin/install-info --delete %{_infodir}/krb425.info.gz %{_infodir}/dir
 	/sbin/install-info --delete %{_infodir}/krb5-admin.info.gz %{_infodir}/dir
@@ -1622,16 +1618,28 @@
 if [ "$1" -ge 1 ] ; then
 	/sbin/service krb5kdc condrestart > /dev/null 2>&1 || :
 	/sbin/service kadmin condrestart > /dev/null 2>&1 || :
-	/sbin/service krb524 condrestart > /dev/null 2>&1 || :
 	/sbin/service kprop condrestart > /dev/null 2>&1 || :
 fi
 exit 0
 
+%triggerun server -- krb5-server < 1.6.3-100
+if [ "$2" -eq "0" ] ; then
+	/sbin/service krb524 stop > /dev/null 2>&1 || :
+	/sbin/chkconfig --del krb524 > /dev/null 2>&1 || :
+fi
+exit 0
+
+%triggerun workstation-servers -- krb5-workstation-servers < 1.6.3-100
+if [ "$2" -eq "0" ] ; then
+	/sbin/service krb524 stop > /dev/null 2>&1 || :
+	/sbin/chkconfig --del krb524 > /dev/null 2>&1 || :
+fi
+exit 0
+
 %if %{split_workstation}
 %post workstation-servers
 /sbin/service xinetd reload > /dev/null 2>&1 || :
 exit 0
-
 %postun workstation-servers
 /sbin/service xinetd reload > /dev/null 2>&1 || :
 exit 0
@@ -1646,7 +1654,7 @@
 exit 0
 
 %preun workstation
-if [ "$1" = "0" ] ; then
+if [ "$1" -eq "0" ] ; then
 	/sbin/install-info --delete %{_infodir}/krb5-user.info %{_infodir}/dir
 fi
 exit 0
@@ -1678,8 +1686,6 @@
 %{krb5prefix}/man/man1/klist.1*
 %{krb5prefix}/bin/kpasswd
 %{krb5prefix}/man/man1/kpasswd.1*
-%{krb5prefix}/bin/krb524init
-%{krb5prefix}/man/man1/krb524init.1*
 
 %{krb5prefix}/bin/kvno
 %{krb5prefix}/man/man1/kvno.1*
@@ -1716,8 +1722,6 @@
 # Used by both clients and servers.
 %{krb5prefix}/bin/rcp
 %{krb5prefix}/man/man1/rcp.1*
-%attr(0755,root,root) %{krb5prefix}/bin/v4rcp
-%{krb5prefix}/man/man1/v4rcp.1*
 
 # Client network bits.
 %{krb5prefix}/bin/ftp
@@ -1755,8 +1759,6 @@
 # Used by both clients and servers.
 %{krb5prefix}/bin/rcp
 %{krb5prefix}/man/man1/rcp.1*
-%attr(0755,root,root) %{krb5prefix}/bin/v4rcp
-%{krb5prefix}/man/man1/v4rcp.1*
 %endif
 
 %config(noreplace) /etc/xinetd.d/*
@@ -1788,12 +1790,6 @@
 %{krb5prefix}/sbin/telnetd
 %{krb5prefix}/man/man8/telnetd.8*
 
-# Here, so that it can be run in keytab mode.
-%config /etc/rc.d/init.d/krb524
-%config(noreplace) /etc/sysconfig/krb524
-%{krb5prefix}/sbin/krb524d
-%{krb5prefix}/man/man8/krb524d.8*
-
 # Protocol test servers.
 %{krb5prefix}/sbin/sim_server
 %{krb5prefix}/sbin/gss-server
@@ -1805,16 +1801,13 @@
 
 %config /etc/rc.d/init.d/krb5kdc
 %config /etc/rc.d/init.d/kadmin
-%config /etc/rc.d/init.d/krb524
 %config /etc/rc.d/init.d/kprop
 %config(noreplace) /etc/sysconfig/krb5kdc
 %config(noreplace) /etc/sysconfig/kadmin
-%config(noreplace) /etc/sysconfig/krb524
 
 %doc doc/admin*.ps.gz
 %doc doc/krb425*.ps.gz
 %doc doc/install*.ps.gz
-%doc README.krb524
 
 %{_infodir}/krb5-admin.info*
 %{_infodir}/krb5-install.info*
@@ -1853,8 +1846,6 @@
 %{krb5prefix}/man/man8/kprop.8*
 %{krb5prefix}/sbin/kpropd
 %{krb5prefix}/man/man8/kpropd.8*
-%{krb5prefix}/sbin/krb524d
-%{krb5prefix}/man/man8/krb524d.8*
 %{krb5prefix}/sbin/krb5kdc
 %{krb5prefix}/man/man8/krb5kdc.8*
 
@@ -1905,13 +1896,11 @@
 %{_libdir}/libkadm5clnt.so.*
 %{_libdir}/libkadm5srv.so.*
 %{_libdir}/libkdb5.so.*
-%{_libdir}/libkrb4.so.*
 %{_libdir}/libkrb5.so.*
 %{_libdir}/libkrb5support.so.*
 %dir %{_libdir}/krb5
 %dir %{_libdir}/krb5/plugins
 %dir %{_libdir}/krb5/plugins/*
-%dir %{_libdir}/krb5/plugins/*
 %{_libdir}/krb5/plugins/kdb/db2.so
 %{krb5prefix}/share
 
@@ -1954,7 +1943,6 @@
 %{_libdir}/libkadm5clnt.so
 %{_libdir}/libkadm5srv.so
 %{_libdir}/libkdb5.so
-%{_libdir}/libkrb4.so
 %{_libdir}/libkrb5.so
 %{_libdir}/libkrb5support.so
 


--- krb524.sysconfig DELETED ---


--- krb524d.init DELETED ---



From pkgdb at fedoraproject.org  Mon Apr  6 16:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:06:43 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090406160621.CB2D5208553@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeutils (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Mon Apr  6 16:06:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:06:42 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090406160622.055FF208557@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeutils (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Mon Apr  6 16:06:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:06:23 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090406160623.55BC5208604@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdeutils (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Mon Apr  6 16:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:06:47 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090406160626.1E1DC2086FE@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdeutils (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Mon Apr  6 16:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:06:46 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090406160626.6F12C208702@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdeutils (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From mclasen at fedoraproject.org  Mon Apr  6 16:06:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  6 Apr 2009 16:06:35 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.173,1.174
Message-ID: <20090406160635.C3E8B700FB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1180

Modified Files:
	comps-f11.xml.in 
Log Message:
Update gnome-software-development group:
eel2-devel
libgnomeprintui22-devel
libart_lgpl-devel
are now optional, and 
glade3 is in default instead of glade2



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- comps-f11.xml.in	5 Apr 2009 17:11:15 -0000	1.173
+++ comps-f11.xml.in	6 Apr 2009 16:06:05 -0000	1.174
@@ -2281,17 +2281,14 @@
       <packagereq type="mandatory">pango-devel</packagereq>
       <packagereq type="default">at-spi-devel</packagereq>
       <packagereq type="default">devhelp</packagereq>
-      <packagereq type="default">eel2-devel</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
-      <packagereq type="default">glade2</packagereq>
+      <packagereq type="default">glade3</packagereq>
       <packagereq type="default">gnome-desktop-devel</packagereq>
       <packagereq type="default">gnome-devel-docs</packagereq>
       <packagereq type="default">gnome-panel-devel</packagereq>
       <packagereq type="default">gnome-pilot-devel</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
       <packagereq type="default">hal-devel</packagereq>
-      <packagereq type="default">libart_lgpl-devel</packagereq>
-      <packagereq type="default">libgnomeprintui22-devel</packagereq>
       <packagereq type="default">libgtop2-devel</packagereq>
       <packagereq type="default">pygtk2-devel</packagereq>
       <packagereq type="default">xulrunner-devel</packagereq>
@@ -2307,11 +2304,12 @@
       <packagereq type="optional">conexus-nss-devel</packagereq>
       <packagereq type="optional">conexus-ssl-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
+      <packagereq type="optional">eel2-devel</packagereq>
       <packagereq type="optional">gazpacho</packagereq>
       <packagereq type="optional">gconfmm26-devel</packagereq>
       <packagereq type="optional">gedit-vala</packagereq>
       <packagereq type="optional">ghc-gtk</packagereq>
-      <packagereq type="optional">glade3</packagereq>
+      <packagereq type="optional">glade2</packagereq>
       <packagereq type="optional">glibmm24-devel</packagereq>
       <packagereq type="optional">gnome-common</packagereq>
       <packagereq type="optional">gnome-python2-gda-devel</packagereq>
@@ -2324,12 +2322,14 @@
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
       <packagereq type="optional">gtkparasite</packagereq>
+      <packagereq type="optional">libart_lgpl-devel</packagereq>
       <packagereq type="optional">libgconf-java</packagereq>
       <packagereq type="optional">libglade-java</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>
       <packagereq type="optional">libgnome-java</packagereq>
       <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
       <packagereq type="optional">libgnomemm26-devel</packagereq>
+      <packagereq type="optional">libgnomeprintui22-devel</packagereq>
       <packagereq type="optional">libgnomeuimm26-devel</packagereq>
       <packagereq type="optional">libgtk-java</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>



From pkgdb at fedoraproject.org  Mon Apr  6 16:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:07:28 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20090406160708.580722086F6@bastion.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdegraphics (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Apr  6 16:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:07:08 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20090406160708.C8D65208701@bastion.fedora.phx.redhat.com>

than has set the watchcommits acl on kdegraphics (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Mon Apr  6 16:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 16:07:31 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20090406160710.4F1AC208705@bastion.fedora.phx.redhat.com>

than has set the commit acl on kdegraphics (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From nalin at fedoraproject.org  Mon Apr  6 16:23:15 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 16:23:15 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.181,1.182
Message-ID: <20090406162315.EE2A8700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4926

Modified Files:
	krb5.spec 
Log Message:
- move the libraries to /%{_lib}, but leave --libdir alone so that plugins
  get installed and are searched for in the same locations (#473333)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- krb5.spec	6 Apr 2009 15:56:45 -0000	1.181
+++ krb5.spec	6 Apr 2009 16:22:45 -0000	1.182
@@ -235,6 +235,8 @@
 - turn off krb4 support (it won't be part of the 1.7 release, but do it now)
 - use triggeruns to properly shut down and disable krb524d when -server and
   -workstation-servers gets upgraded, because it's gone now
+- move the libraries to /%{_lib}, but leave --libdir alone so that plugins
+  get installed and are searched for in the same locations (#473333)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
@@ -1580,6 +1582,21 @@
 # Remove the randomly-generated compile-et filename comment from header files.
 sed -i -e 's|^ \* ettmp[^ \t]*\.h:$| * ettmpXXXXXX.h:|g' $RPM_BUILD_ROOT%{_includedir}/*{,/*}.h
 
+# Move specific libraries from %{_libdir} to /%{_lib}, and fixup the symlinks.
+touch $RPM_BUILD_ROOT/rootfile
+rellibdir=..
+while ! test -r $RPM_BUILD_ROOT/%{_libdir}/${rellibdir}/rootfile ; do
+	rellibdir=../${rellibdir}
+done
+rm -f $RPM_BUILD_ROOT/rootfile
+mkdir -p $RPM_BUILD_ROOT/%{_lib}
+for library in libdes425 libgssapi_krb5 libgssrpc libk5crypto libkrb5 libkrb5support ; do
+	mv $RPM_BUILD_ROOT/%{_libdir}/${library}.so.* $RPM_BUILD_ROOT/%{_lib}/
+	pushd $RPM_BUILD_ROOT/%{_libdir}
+	ln -fs ${rellibdir}/%{_lib}/${library}.so.*.* ${library}.so
+	popd
+done
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -1889,15 +1906,15 @@
 %{krb5prefix}/man/man1/kerberos.1*
 %{krb5prefix}/man/man5/.k5login.5*
 %{krb5prefix}/man/man5/krb5.conf.5*
-%{_libdir}/libdes425.so.*
-%{_libdir}/libgssapi_krb5.so.*
-%{_libdir}/libgssrpc.so.*
-%{_libdir}/libk5crypto.so.*
+/%{_lib}/libdes425.so.*
+/%{_lib}/libgssapi_krb5.so.*
+/%{_lib}/libgssrpc.so.*
+/%{_lib}/libk5crypto.so.*
 %{_libdir}/libkadm5clnt.so.*
 %{_libdir}/libkadm5srv.so.*
 %{_libdir}/libkdb5.so.*
-%{_libdir}/libkrb5.so.*
-%{_libdir}/libkrb5support.so.*
+/%{_lib}/libkrb5.so.*
+/%{_lib}/libkrb5support.so.*
 %dir %{_libdir}/krb5
 %dir %{_libdir}/krb5/plugins
 %dir %{_libdir}/krb5/plugins/*



From mdomsch at fedoraproject.org  Mon Apr  6 16:37:18 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Mon,  6 Apr 2009 16:37:18 +0000 (UTC)
Subject: rpms/mirrormanager/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 mirrormanager.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090406163718.E9A8E700FB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7781/devel

Modified Files:
	.cvsignore import.log mirrormanager.spec sources 
Log Message:
update to 1.2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Feb 2009 16:32:57 -0000	1.4
+++ .cvsignore	6 Apr 2009 16:36:48 -0000	1.5
@@ -1 +1 @@
-mirrormanager-1.2.9.tar.bz2
+mirrormanager-1.2.10.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2008 15:04:31 -0000	1.1
+++ import.log	6 Apr 2009 16:36:48 -0000	1.2
@@ -1 +1,2 @@
 mirrormanager-1_2_3-1_fc9:HEAD:mirrormanager-1.2.3-1.fc9.src.rpm:1222959811
+mirrormanager-1_2_10-1_fc10:HEAD:mirrormanager-1.2.10-1.fc10.src.rpm:1239035739


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/mirrormanager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mirrormanager.spec	26 Feb 2009 01:34:44 -0000	1.5
+++ mirrormanager.spec	6 Apr 2009 16:36:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           mirrormanager
-Version:        1.2.9
-Release:        2%{?dist}
+Version:        1.2.10
+Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
@@ -9,10 +9,15 @@
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum
 
+%include /usr/lib/rpm/macros.python
+%if "%{py_ver}" < "2.5"
+# for md5, sha1, sha256, which are native to python 2.5 and higher
+Requires: python-hashlib
+%endif
+
 %description
 MirrorManager tracks all the content provided on a master mirror
 server, and that of all public and private mirrors of that content.
@@ -53,6 +58,7 @@
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
 %doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2 LICENSE-GPLv3
 %doc server/*.cfg
@@ -62,12 +68,18 @@
 %{_bindir}/report_mirror
 %dir %{_sysconfdir}/%{name}-client
 %config(noreplace) %{_sysconfdir}/%{name}-client/report_mirror.conf
-%doc LICENSE-MIT-X11
+%doc LICENSE-MIT-X11 client/README
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-1
+- improved crawler repomd.xml verification
+- improved publiclist generation
+- fix categorymap logic
+- WSGI-ify web application
+- vastly speed up report_mirror (no more stat()s on every file)
+- vastly speed up umdl
+- add rsyncFilter
 
 * Mon Feb 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.9-1
 - Adrian Reber:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Feb 2009 16:32:57 -0000	1.4
+++ sources	6 Apr 2009 16:36:48 -0000	1.5
@@ -1 +1 @@
-e14bf560359ffcf9f48f367abc4a8000  mirrormanager-1.2.9.tar.bz2
+688893a7c3d56611dbd079dc1fe770e3  mirrormanager-1.2.10.tar.bz2



From mdomsch at fedoraproject.org  Mon Apr  6 16:42:06 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Mon,  6 Apr 2009 16:42:06 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 .cvsignore, 1.7, 1.8 mirrormanager.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20090406164206.75FBE700FB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9511

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
update to 1.2.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2009 16:35:20 -0000	1.7
+++ .cvsignore	6 Apr 2009 16:41:36 -0000	1.8
@@ -1 +1 @@
-mirrormanager-1.2.9.tar.bz2
+mirrormanager-1.2.10.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mirrormanager.spec	23 Feb 2009 16:35:20 -0000	1.6
+++ mirrormanager.spec	6 Apr 2009 16:41:36 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mirrormanager
-Version:        1.2.9
+Version:        1.2.10
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
@@ -9,10 +9,15 @@
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum
 
+%include /usr/lib/rpm/macros.python
+%if "%{py_ver}" < "2.5"
+# for md5, sha1, sha256, which are native to python 2.5 and higher
+Requires: python-hashlib
+%endif
+
 %description
 MirrorManager tracks all the content provided on a master mirror
 server, and that of all public and private mirrors of that content.
@@ -53,6 +58,7 @@
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
 %doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2 LICENSE-GPLv3
 %doc server/*.cfg
@@ -62,10 +68,19 @@
 %{_bindir}/report_mirror
 %dir %{_sysconfdir}/%{name}-client
 %config(noreplace) %{_sysconfdir}/%{name}-client/report_mirror.conf
-%doc LICENSE-MIT-X11
+%doc LICENSE-MIT-X11 client/README
 
 
 %changelog
+* Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-1
+- improved crawler repomd.xml verification
+- improved publiclist generation
+- fix categorymap logic
+- WSGI-ify web application
+- vastly speed up report_mirror (no more stat()s on every file)
+- vastly speed up umdl
+- add rsyncFilter
+
 * Mon Feb 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.9-1
 - Adrian Reber:
       mirrorlist-server: check values returned by geoip before printing


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2009 16:35:20 -0000	1.7
+++ sources	6 Apr 2009 16:41:36 -0000	1.8
@@ -1 +1 @@
-e14bf560359ffcf9f48f367abc4a8000  mirrormanager-1.2.9.tar.bz2
+688893a7c3d56611dbd079dc1fe770e3  mirrormanager-1.2.10.tar.bz2



From nalin at fedoraproject.org  Mon Apr  6 16:47:06 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 16:47:06 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.182,1.183
Message-ID: <20090406164706.2E104700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10149

Modified Files:
	krb5.spec 
Log Message:
- make splitting up of the workstation bits unconditional



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- krb5.spec	6 Apr 2009 16:22:45 -0000	1.182
+++ krb5.spec	6 Apr 2009 16:46:35 -0000	1.183
@@ -4,9 +4,6 @@
 
 %define krb5prefix %{_prefix}/kerberos
 
-# This'll be made unconditional at some point.
-%define split_workstation 1
-
 # This'll be pulled out at some point.
 %define build_static 0
 
@@ -188,7 +185,6 @@
 kpasswd). If your network uses Kerberos, this package should be
 installed on every workstation.
 
-%if %{split_workstation}
 %package workstation-clients
 Summary: Kerberos 5 clients for use on workstations.
 Group: System Environment/Base
@@ -217,7 +213,6 @@
 package contains kerberized versions of Telnet, FTP, and rsh/rlogin
 servers. If your network uses Kerberos, this package should be
 installed on systems which are meant provide these services.
-%endif
 
 %package pkinit-openssl
 Summary: The PKINIT module for Kerberos 5.
@@ -1653,18 +1648,13 @@
 fi
 exit 0
 
-%if %{split_workstation}
 %post workstation-servers
 /sbin/service xinetd reload > /dev/null 2>&1 || :
 exit 0
+
 %postun workstation-servers
 /sbin/service xinetd reload > /dev/null 2>&1 || :
 exit 0
-%else
-%postun workstation
-/sbin/service xinetd reload > /dev/null 2>&1 || :
-exit 0
-%endif
 
 %post workstation
 /sbin/install-info %{_infodir}/krb5-user.info %{_infodir}/dir
@@ -1721,7 +1711,6 @@
 %{krb5prefix}/sbin/krb5-send-pr
 %{krb5prefix}/man/man1/krb5-send-pr.1*
 
-%if %{split_workstation}
 %files workstation-clients
 %defattr(-,root,root)
 %docdir %{krb5prefix}/man
@@ -1734,7 +1723,6 @@
 %dir %{krb5prefix}/man
 %dir %{krb5prefix}/man/man1
 %dir %{krb5prefix}/sbin
-%endif
 
 # Used by both clients and servers.
 %{krb5prefix}/bin/rcp
@@ -1757,7 +1745,6 @@
 %{krb5prefix}/bin/gss-client
 %{krb5prefix}/bin/uuclient
 
-%if %{split_workstation}
 %files workstation-servers
 %defattr(-,root,root)
 %docdir %{krb5prefix}/man
@@ -1776,7 +1763,6 @@
 # Used by both clients and servers.
 %{krb5prefix}/bin/rcp
 %{krb5prefix}/man/man1/rcp.1*
-%endif
 
 %config(noreplace) /etc/xinetd.d/*
 %config(noreplace) /etc/pam.d/*
@@ -1785,7 +1771,6 @@
 %{krb5prefix}/sbin/login.krb5
 %{krb5prefix}/man/man8/login.krb5.8*
 
-%if %{split_workstation}
 # Tools you're likely to need if you're running these app servers.
 %{krb5prefix}/bin/kvno
 %{krb5prefix}/man/man1/kvno.1*
@@ -1795,7 +1780,6 @@
 %{krb5prefix}/man/man8/k5srvutil.8*
 %{krb5prefix}/sbin/ktutil
 %{krb5prefix}/man/man8/ktutil.8*
-%endif
 
 # Application servers.
 %{krb5prefix}/sbin/ftpd



From mdomsch at fedoraproject.org  Mon Apr  6 16:47:33 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Mon,  6 Apr 2009 16:47:33 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 mirrormanager.spec,1.7,1.8
Message-ID: <20090406164733.0FC87700FB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10618

Modified Files:
	mirrormanager.spec 
Log Message:
fix building on rhel5


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mirrormanager.spec	6 Apr 2009 16:41:36 -0000	1.7
+++ mirrormanager.spec	6 Apr 2009 16:47:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mirrormanager
 Version:        1.2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
@@ -12,7 +12,7 @@
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum
 
-%include /usr/lib/rpm/macros.python
+%define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
 %if "%{py_ver}" < "2.5"
 # for md5, sha1, sha256, which are native to python 2.5 and higher
 Requires: python-hashlib
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-2
+- fix building on RHEL5
+
 * Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-1
 - improved crawler repomd.xml verification
 - improved publiclist generation



From limb at fedoraproject.org  Mon Apr  6 16:54:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  6 Apr 2009 16:54:22 +0000 (UTC)
Subject: rpms/moodle/devel moodle-cron,1.4,1.5 moodle.spec,1.42,1.43
Message-ID: <20090406165422.F1F3A700FB@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12033

Modified Files:
	moodle-cron moodle.spec 
Log Message:
Probable cron and symlink fixes.



Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle-cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle-cron	23 Feb 2009 18:01:10 -0000	1.4
+++ moodle-cron	6 Apr 2009 16:53:52 -0000	1.5
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-[ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php
+[ -f /var/lock/subsys/moodle ] && [ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- moodle.spec	1 Apr 2009 19:29:33 -0000	1.42
+++ moodle.spec	6 Apr 2009 16:53:52 -0000	1.43
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -1548,7 +1548,7 @@
   /sbin/chkconfig --del %{name}
 fi
 
-%pre
+%pretrans
 if [ -d /var/www/moodle/web/lib/smarty ]; then
   rm -rf /var/www/moodle/web/lib/smarty
 fi
@@ -1694,6 +1694,10 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
+- Move symlink scripts from pre to pretrans.
+- Corrented moodle-cron BZ 494090.
+
 * Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
 - Patch for CVE-2009-1171, BZ 493109.
 



From kyle at fedoraproject.org  Mon Apr  6 17:00:33 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon,  6 Apr 2009 17:00:33 +0000 (UTC)
Subject: rpms/kernel/F-10 git-bluetooth.patch, NONE, 1.1 kernel.spec, 1.1315,
	1.1316
Message-ID: <20090406170033.C7A26700FB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13533

Modified Files:
	kernel.spec 
Added Files:
	git-bluetooth.patch 
Log Message:
* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
- add git-bluetooth.patch from F-11, bluetooth fixes from 2.6.30


git-bluetooth.patch:

--- NEW FILE git-bluetooth.patch ---
commit b1fb06830dc870d862f7f80e276130c0ab84d59f
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date:   Wed Feb 25 18:09:33 2009 +0800

    Bluetooth: Remove some pointless conditionals before kfree_skb()
    
    Remove some pointless conditionals before kfree_skb().
    
    Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

commit 7585b97a48180f754ebdade1be94092e36bef365
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date:   Wed Feb 25 18:29:52 2009 +0800

    Bluetooth: Remove some pointless conditionals before kfree_skb()
    
    Remove some pointless conditionals before kfree_skb().
    
    Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

commit 2ae9a6be5f476f3512839a4d11a8f432bfd2914c
Author: Dave Young <hidave.darkstar at gmail.com>
Date:   Sat Feb 21 16:13:34 2009 +0800

    Bluetooth: Move hci_conn_del_sysfs() back to avoid device destruct too early
    
    The following commit introduce a regression:
    
    	commit 7d0db0a373195385a2e0b19d1f5e4b186fdcffac
    	Author: Marcel Holtmann <marcel at holtmann.org>
    	Date:   Mon Jul 14 20:13:51 2008 +0200
    
    		[Bluetooth] Use a more unique bus name for connections
    
    I get panic as following (by netconsole):
    
    [ 2709.344034] usb 5-1: new full speed USB device using uhci_hcd and address 4
    [ 2709.505776] usb 5-1: configuration #1 chosen from 1 choice
    [ 2709.569207] Bluetooth: Generic Bluetooth USB driver ver 0.4
    [ 2709.570169] usbcore: registered new interface driver btusb
    [ 2845.742781] BUG: unable to handle kernel paging request at 6b6b6c2f
    [ 2845.742958] IP: [<c015515c>] __lock_acquire+0x6c/0xa80
    [ 2845.743087] *pde = 00000000
    [ 2845.743206] Oops: 0002 [#1] SMP
    [ 2845.743377] last sysfs file: /sys/class/bluetooth/hci0/hci0:6/type
    [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev
    [ 2845.743742]
    [ 2845.743742] Pid: 0, comm: swapper Not tainted (2.6.29-rc5-smp #54) Dell DM051
    [ 2845.743742] EIP: 0060:[<c015515c>] EFLAGS: 00010002 CPU: 0
    [ 2845.743742] EIP is at __lock_acquire+0x6c/0xa80
    [ 2845.743742] EAX: 00000046 EBX: 00000046 ECX: 6b6b6b6b EDX: 00000002
    [ 2845.743742] ESI: 6b6b6b6b EDI: 00000000 EBP: c064fd14 ESP: c064fcc8
    [ 2845.743742]  DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
    [ 2845.743742] Process swapper (pid: 0, ti=c064e000 task=c05d1400 task.ti=c064e000)
    [ 2845.743742] Stack:
    [ 2845.743742]  c05d1400 00000002 c05d1400 00000001 00000002 00000000 f65388dc c05d1400
    [ 2845.743742]  6b6b6b6b 00000292 c064fd0c c0153732 00000000 00000000 00000001 f700fa50
    [ 2845.743742]  00000046 00000000 00000000 c064fd40 c0155be6 00000000 00000002 00000001
    [ 2845.743742] Call Trace:
    [ 2845.743742]  [<c0153732>] ? trace_hardirqs_on_caller+0x72/0x1c0
    [ 2845.743742]  [<c0155be6>] ? lock_acquire+0x76/0xa0
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c046c885>] ? _spin_lock_irqsave+0x45/0x80
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c03e1f94>] ? skb_queue_purge+0x14/0x20
    [ 2845.743742]  [<f8171f5a>] ? hci_conn_del+0x10a/0x1c0 [bluetooth]
    [ 2845.743742]  [<f81399c9>] ? l2cap_disconn_ind+0x59/0xb0 [l2cap]
    [ 2845.743742]  [<f81795ce>] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth]
    [ 2845.743742]  [<f8175758>] ? hci_event_packet+0x5f8/0x31c0 [bluetooth]
    [ 2845.743742]  [<c03dfe19>] ? sock_def_readable+0x59/0x80
    [ 2845.743742]  [<c046c14d>] ? _read_unlock+0x1d/0x20
    [ 2845.743742]  [<f8178aa9>] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth]
    [ 2845.743742]  [<c015388b>] ? trace_hardirqs_on+0xb/0x10
    [ 2845.743742]  [<f816fa6a>] ? hci_rx_task+0x2ba/0x490 [bluetooth]
    [ 2845.743742]  [<c0133661>] ? tasklet_action+0x31/0xc0
    [ 2845.743742]  [<c013367c>] ? tasklet_action+0x4c/0xc0
    [ 2845.743742]  [<c0132eb7>] ? __do_softirq+0xa7/0x170
    [ 2845.743742]  [<c0116dec>] ? ack_apic_level+0x5c/0x1c0
    [ 2845.743742]  [<c0132fd7>] ? do_softirq+0x57/0x60
    [ 2845.743742]  [<c01333dc>] ? irq_exit+0x7c/0x90
    [ 2845.743742]  [<c01055bb>] ? do_IRQ+0x4b/0x90
    [ 2845.743742]  [<c01333d5>] ? irq_exit+0x75/0x90
    [ 2845.743742]  [<c010392c>] ? common_interrupt+0x2c/0x34
    [ 2845.743742]  [<c010a14f>] ? mwait_idle+0x4f/0x70
    [ 2845.743742]  [<c0101c05>] ? cpu_idle+0x65/0xb0
    [ 2845.743742]  [<c045731e>] ? rest_init+0x4e/0x60
    [ 2845.743742] Code: 0f 84 69 02 00 00 83 ff 07 0f 87 1e 06 00 00 85 ff 0f 85 08 05 00 00 8b 4d cc 8b 49 04 85 c9 89 4d d4 0f 84 f7 04 00 00 8b 75 d4 <f0> ff 86 c4 00 00 00 89 f0 e8 56 a9 ff ff 85 c0 0f 85 6e 03 00
    [ 2845.743742] EIP: [<c015515c>] __lock_acquire+0x6c/0xa80 SS:ESP 0068:c064fcc8
    [ 2845.743742] ---[ end trace 4c985b38f022279f ]---
    [ 2845.743742] Kernel panic - not syncing: Fatal exception in interrupt
    [ 2845.743742] ------------[ cut here ]------------
    [ 2845.743742] WARNING: at kernel/smp.c:329 smp_call_function_many+0x151/0x200()
    [ 2845.743742] Hardware name: Dell DM051
    [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev
    [ 2845.743742] Pid: 0, comm: swapper Tainted: G      D    2.6.29-rc5-smp #54
    [ 2845.743742] Call Trace:
    [ 2845.743742]  [<c012e076>] warn_slowpath+0x86/0xa0
    [ 2845.743742]  [<c015041b>] ? trace_hardirqs_off+0xb/0x10
    [ 2845.743742]  [<c0146384>] ? up+0x14/0x40
    [ 2845.743742]  [<c012e661>] ? release_console_sem+0x31/0x1e0
    [ 2845.743742]  [<c046c8ab>] ? _spin_lock_irqsave+0x6b/0x80
    [ 2845.743742]  [<c015041b>] ? trace_hardirqs_off+0xb/0x10
    [ 2845.743742]  [<c046c900>] ? _read_lock_irqsave+0x40/0x80
    [ 2845.743742]  [<c012e7f2>] ? release_console_sem+0x1c2/0x1e0
    [ 2845.743742]  [<c0146384>] ? up+0x14/0x40
    [ 2845.743742]  [<c015041b>] ? trace_hardirqs_off+0xb/0x10
    [ 2845.743742]  [<c046a3d7>] ? __mutex_unlock_slowpath+0x97/0x160
    [ 2845.743742]  [<c046a563>] ? mutex_trylock+0xb3/0x180
    [ 2845.743742]  [<c046a4a8>] ? mutex_unlock+0x8/0x10
    [ 2845.743742]  [<c015b991>] smp_call_function_many+0x151/0x200
    [ 2845.743742]  [<c010a1a0>] ? stop_this_cpu+0x0/0x40
    [ 2845.743742]  [<c015ba61>] smp_call_function+0x21/0x30
    [ 2845.743742]  [<c01137ae>] native_smp_send_stop+0x1e/0x50
    [ 2845.743742]  [<c012e0f5>] panic+0x55/0x110
    [ 2845.743742]  [<c01065a8>] oops_end+0xb8/0xc0
    [ 2845.743742]  [<c010668f>] die+0x4f/0x70
    [ 2845.743742]  [<c011a8c9>] do_page_fault+0x269/0x610
    [ 2845.743742]  [<c011a660>] ? do_page_fault+0x0/0x610
    [ 2845.743742]  [<c046cbaf>] error_code+0x77/0x7c
    [ 2845.743742]  [<c015515c>] ? __lock_acquire+0x6c/0xa80
    [ 2845.743742]  [<c0153732>] ? trace_hardirqs_on_caller+0x72/0x1c0
    [ 2845.743742]  [<c0155be6>] lock_acquire+0x76/0xa0
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c046c885>] _spin_lock_irqsave+0x45/0x80
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c03e1aad>] skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c03e1f94>] skb_queue_purge+0x14/0x20
    [ 2845.743742]  [<f8171f5a>] hci_conn_del+0x10a/0x1c0 [bluetooth]
    [ 2845.743742]  [<f81399c9>] ? l2cap_disconn_ind+0x59/0xb0 [l2cap]
    [ 2845.743742]  [<f81795ce>] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth]
    [ 2845.743742]  [<f8175758>] hci_event_packet+0x5f8/0x31c0 [bluetooth]
    [ 2845.743742]  [<c03dfe19>] ? sock_def_readable+0x59/0x80
    [ 2845.743742]  [<c046c14d>] ? _read_unlock+0x1d/0x20
    [ 2845.743742]  [<f8178aa9>] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth]
    [ 2845.743742]  [<c015388b>] ? trace_hardirqs_on+0xb/0x10
    [ 2845.743742]  [<f816fa6a>] hci_rx_task+0x2ba/0x490 [bluetooth]
    [ 2845.743742]  [<c0133661>] ? tasklet_action+0x31/0xc0
    [ 2845.743742]  [<c013367c>] tasklet_action+0x4c/0xc0
    [ 2845.743742]  [<c0132eb7>] __do_softirq+0xa7/0x170
    [ 2845.743742]  [<c0116dec>] ? ack_apic_level+0x5c/0x1c0
    [ 2845.743742]  [<c0132fd7>] do_softirq+0x57/0x60
    [ 2845.743742]  [<c01333dc>] irq_exit+0x7c/0x90
    [ 2845.743742]  [<c01055bb>] do_IRQ+0x4b/0x90
    [ 2845.743742]  [<c01333d5>] ? irq_exit+0x75/0x90
    [ 2845.743742]  [<c010392c>] common_interrupt+0x2c/0x34
    [ 2845.743742]  [<c010a14f>] ? mwait_idle+0x4f/0x70
    [ 2845.743742]  [<c0101c05>] cpu_idle+0x65/0xb0
    [ 2845.743742]  [<c045731e>] rest_init+0x4e/0x60
    [ 2845.743742] ---[ end trace 4c985b38f02227a0 ]---
    [ 2845.743742] ------------[ cut here ]------------
    [ 2845.743742] WARNING: at kernel/smp.c:226 smp_call_function_single+0x8e/0x110()
    [ 2845.743742] Hardware name: Dell DM051
    [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev
    [ 2845.743742] Pid: 0, comm: swapper Tainted: G      D W  2.6.29-rc5-smp #54
    [ 2845.743742] Call Trace:
    [ 2845.743742]  [<c012e076>] warn_slowpath+0x86/0xa0
    [ 2845.743742]  [<c012e000>] ? warn_slowpath+0x10/0xa0
    [ 2845.743742]  [<c015041b>] ? trace_hardirqs_off+0xb/0x10
    [ 2845.743742]  [<c0146384>] ? up+0x14/0x40
    [ 2845.743742]  [<c012e661>] ? release_console_sem+0x31/0x1e0
    [ 2845.743742]  [<c046c8ab>] ? _spin_lock_irqsave+0x6b/0x80
    [ 2845.743742]  [<c015041b>] ? trace_hardirqs_off+0xb/0x10
    [ 2845.743742]  [<c046c900>] ? _read_lock_irqsave+0x40/0x80
    [ 2845.743742]  [<c012e7f2>] ? release_console_sem+0x1c2/0x1e0
    [ 2845.743742]  [<c0146384>] ? up+0x14/0x40
    [ 2845.743742]  [<c015b7be>] smp_call_function_single+0x8e/0x110
    [ 2845.743742]  [<c010a1a0>] ? stop_this_cpu+0x0/0x40
    [ 2845.743742]  [<c026d23f>] ? cpumask_next_and+0x1f/0x40
    [ 2845.743742]  [<c015b95a>] smp_call_function_many+0x11a/0x200
    [ 2845.743742]  [<c010a1a0>] ? stop_this_cpu+0x0/0x40
    [ 2845.743742]  [<c015ba61>] smp_call_function+0x21/0x30
    [ 2845.743742]  [<c01137ae>] native_smp_send_stop+0x1e/0x50
    [ 2845.743742]  [<c012e0f5>] panic+0x55/0x110
    [ 2845.743742]  [<c01065a8>] oops_end+0xb8/0xc0
    [ 2845.743742]  [<c010668f>] die+0x4f/0x70
    [ 2845.743742]  [<c011a8c9>] do_page_fault+0x269/0x610
    [ 2845.743742]  [<c011a660>] ? do_page_fault+0x0/0x610
    [ 2845.743742]  [<c046cbaf>] error_code+0x77/0x7c
    [ 2845.743742]  [<c015515c>] ? __lock_acquire+0x6c/0xa80
    [ 2845.743742]  [<c0153732>] ? trace_hardirqs_on_caller+0x72/0x1c0
    [ 2845.743742]  [<c0155be6>] lock_acquire+0x76/0xa0
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c046c885>] _spin_lock_irqsave+0x45/0x80
    [ 2845.743742]  [<c03e1aad>] ? skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c03e1aad>] skb_dequeue+0x1d/0x70
    [ 2845.743742]  [<c03e1f94>] skb_queue_purge+0x14/0x20
    [ 2845.743742]  [<f8171f5a>] hci_conn_del+0x10a/0x1c0 [bluetooth]
    [ 2845.743742]  [<f81399c9>] ? l2cap_disconn_ind+0x59/0xb0 [l2cap]
    [ 2845.743742]  [<f81795ce>] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth]
    [ 2845.743742]  [<f8175758>] hci_event_packet+0x5f8/0x31c0 [bluetooth]
    [ 2845.743742]  [<c03dfe19>] ? sock_def_readable+0x59/0x80
    [ 2845.743742]  [<c046c14d>] ? _read_unlock+0x1d/0x20
    [ 2845.743742]  [<f8178aa9>] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth]
    [ 2845.743742]  [<c015388b>] ? trace_hardirqs_on+0xb/0x10
    [ 2845.743742]  [<f816fa6a>] hci_rx_task+0x2ba/0x490 [bluetooth]
    [ 2845.743742]  [<c0133661>] ? tasklet_action+0x31/0xc0
[...2945 lines suppressed...]
+		case BT_SECURITY_HIGH:
+			opt = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT |
+							RFCOMM_LM_SECURE;
+			break;
+		default:
+			opt = 0;
+			break;
+		}
+
+		if (rfcomm_pi(sk)->role_switch)
+			opt |= RFCOMM_LM_MASTER;
+
+		if (put_user(opt, (u32 __user *) optval))
 			err = -EFAULT;
 		break;
 
 	case RFCOMM_CONNINFO:
-		if (sk->sk_state != BT_CONNECTED) {
+		if (sk->sk_state != BT_CONNECTED &&
+					!rfcomm_pi(sk)->dlc->defer_setup) {
 			err = -ENOTCONN;
 			break;
 		}
@@ -785,6 +896,60 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
 	return err;
 }
 
+static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
+{
+	struct sock *sk = sock->sk;
+	struct bt_security sec;
+	int len, err = 0;
+
+	BT_DBG("sk %p", sk);
+
+	if (level == SOL_RFCOMM)
+		return rfcomm_sock_getsockopt_old(sock, optname, optval, optlen);
+
+	if (level != SOL_BLUETOOTH)
+		return -ENOPROTOOPT;
+
+	if (get_user(len, optlen))
+		return -EFAULT;
+
+	lock_sock(sk);
+
+	switch (optname) {
+	case BT_SECURITY:
+		if (sk->sk_type != SOCK_STREAM) {
+			err = -EINVAL;
+			break;
+		}
+
+		sec.level = rfcomm_pi(sk)->sec_level;
+
+		len = min_t(unsigned int, len, sizeof(sec));
+		if (copy_to_user(optval, (char *) &sec, len))
+			err = -EFAULT;
+
+		break;
+
+	case BT_DEFER_SETUP:
+		if (sk->sk_state != BT_BOUND && sk->sk_state != BT_LISTEN) {
+			err = -EINVAL;
+			break;
+		}
+
+		if (put_user(bt_sk(sk)->defer_setup, (u32 __user *) optval))
+			err = -EFAULT;
+
+		break;
+
+	default:
+		err = -ENOPROTOOPT;
+		break;
+	}
+
+	release_sock(sk);
+	return err;
+}
+
 static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
 	struct sock *sk __maybe_unused = sock->sk;
@@ -888,6 +1053,10 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc *
 
 done:
 	bh_unlock_sock(parent);
+
+	if (bt_sk(parent)->defer_setup)
+		parent->sk_state_change(parent);
+
 	return result;
 }
 
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 46fd8bf..51ae0c3 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -195,7 +195,7 @@ static int sco_connect(struct sock *sk)
 	else
 		type = SCO_LINK;
 
-	hcon = hci_connect(hdev, type, dst, HCI_AT_NO_BONDING);
+	hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
 	if (!hcon)
 		goto done;
 
@@ -668,7 +668,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char
 	return err;
 }
 
-static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
+static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen)
 {
 	struct sock *sk = sock->sk;
 	struct sco_options opts;
@@ -723,6 +723,31 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char
 	return err;
 }
 
+static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
+{
+	struct sock *sk = sock->sk;
+	int len, err = 0;
+
+	BT_DBG("sk %p", sk);
+
+	if (level == SOL_SCO)
+		return sco_sock_getsockopt_old(sock, optname, optval, optlen);
+
+	if (get_user(len, optlen))
+		return -EFAULT;
+
+	lock_sock(sk);
+
+	switch (optname) {
+	default:
+		err = -ENOPROTOOPT;
+		break;
+	}
+
+	release_sock(sk);
+	return err;
+}
+
 static int sco_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
@@ -832,10 +857,30 @@ done:
 /* ----- SCO interface with lower layer (HCI) ----- */
 static int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type)
 {
+	register struct sock *sk;
+	struct hlist_node *node;
+	int lm = 0;
+
+	if (type != SCO_LINK && type != ESCO_LINK)
+		return 0;
+
 	BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr));
 
-	/* Always accept connection */
-	return HCI_LM_ACCEPT;
+	/* Find listening sockets */
+	read_lock(&sco_sk_list.lock);
+	sk_for_each(sk, node, &sco_sk_list.head) {
+		if (sk->sk_state != BT_LISTEN)
+			continue;
+
+		if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) ||
+				!bacmp(&bt_sk(sk)->src, BDADDR_ANY)) {
+			lm |= HCI_LM_ACCEPT;
+			break;
+		}
+	}
+	read_unlock(&sco_sk_list.lock);
+
+	return lm;
 }
 
 static int sco_connect_cfm(struct hci_conn *hcon, __u8 status)
@@ -857,7 +902,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status)
 	return 0;
 }
 
-static int sco_disconn_ind(struct hci_conn *hcon, __u8 reason)
+static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
 {
 	BT_DBG("hcon %p reason %d", hcon, reason);
 
@@ -940,7 +985,7 @@ static struct hci_proto sco_hci_proto = {
 	.id		= HCI_PROTO_SCO,
 	.connect_ind	= sco_connect_ind,
 	.connect_cfm	= sco_connect_cfm,
-	.disconn_ind	= sco_disconn_ind,
+	.disconn_cfm	= sco_disconn_cfm,
 	.recv_scodata	= sco_recv_scodata
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1315
retrieving revision 1.1316
diff -u -r1.1315 -r1.1316
--- kernel.spec	3 Apr 2009 03:26:37 -0000	1.1315
+++ kernel.spec	6 Apr 2009 17:00:03 -0000	1.1316
@@ -582,6 +582,7 @@
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
 Patch10: git-cpufreq.patch
+Patch11: git-bluetooth.patch
 
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
@@ -1064,6 +1065,7 @@
 fi
 
 #ApplyPatch git-cpufreq.patch
+ApplyPatch git-bluetooth.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -1821,6 +1823,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
+- add git-bluetooth.patch from F-11, bluetooth fixes from 2.6.30
+
 * Fri Apr 03 2009 Dave Airlie <airlied at redhat.com>
 - add backwards drm compat for radeon kms
 



From pkgdb at fedoraproject.org  Mon Apr  6 17:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 17:01:27 +0000
Subject: [pkgdb] evolution F-10 cloned from devel
Message-ID: <20090406170106.3B6D520854A@bastion.fedora.phx.redhat.com>

toshio cloned evolution F-10 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Apr  6 17:01:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 17:01:31 +0000
Subject: [pkgdb] evolution F-10 cloned from devel
Message-ID: <20090406170131.7D1CB208553@bastion.fedora.phx.redhat.com>

toshio cloned evolution F-10 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Apr  6 17:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 17:01:54 +0000
Subject: [pkgdb] evolution-data-server F-10 cloned from devel
Message-ID: <20090406170134.7FA83208556@bastion.fedora.phx.redhat.com>

toshio cloned evolution-data-server F-10 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Apr  6 17:01:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 17:01:37 +0000
Subject: [pkgdb] gtkhtml3 F-10 cloned from devel
Message-ID: <20090406170137.8432F208604@bastion.fedora.phx.redhat.com>

toshio cloned gtkhtml3 F-10 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From suravee at fedoraproject.org  Mon Apr  6 17:02:06 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Mon,  6 Apr 2009 17:02:06 +0000 (UTC)
Subject: rpms/CodeAnalyst-gui/F-10 ca-configure-libdwarf.patch, NONE,
	1.1 ca-fix-splash.patch, NONE, 1.1 CodeAnalyst-gui.spec, 1.1, 1.2
Message-ID: <20090406170206.A5AD1700FB@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/rpms/CodeAnalyst-gui/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687

Modified Files:
	CodeAnalyst-gui.spec 
Added Files:
	ca-configure-libdwarf.patch ca-fix-splash.patch 
Log Message:
- Add patch to enable libdwarf configuration
- Add patch to fix splash screen
- Add libdwarf configuration
- Bump version number


ca-configure-libdwarf.patch:

--- NEW FILE ca-configure-libdwarf.patch ---
diff -uarN CodeAnalyst-gui-2.8.38/configure.ac CodeAnalyst-gui-2.8.38-libdwarf/configure.ac
--- CodeAnalyst-gui-2.8.38/configure.ac	2009-02-19 05:55:00.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/configure.ac	2009-04-06 11:27:23.000000000 -0500
@@ -1,4 +1,4 @@
-#$Id: configure.ac 16162 2009-02-17 18:07:41Z ssuthiku $
+#$Id: configure.ac 16431 2009-04-03 20:06:32Z ssuthiku $
 
 # Process this file with autoconf to produce a configure script
 
@@ -46,13 +46,29 @@
 #Get Oprofile configuration 
 AC_ARG_WITH(oprofile, 
 	[  --with-oprofile=DIR                  absolute location where the Oprofile is installed])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-includes, 
 	[  --with-oprofile-includes=DIR         absolute location where the Oprofile includes are])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-libraries, 
 	[  --with-oprofile-libraries=DIR        absolute location where the Oprofile libraries are])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-source, 
 	[  --with-oprofile-source=DIR           absolute location where the Oprofile source code is])
 
+#Get libdwarf configuration 
+AC_ARG_WITH(libdwarf-includes, 
+	[  --with-libdwarf-includes=DIR         absolute location where the libdwarf includes are])
+AC_ARG_WITH(libdwarf-libraries, 
+	[  --with-libdwarf-libraries=DIR        absolute location where the libdwarf libraries are])
+
+# Disable dwarf library
+AC_ARG_ENABLE(dwarf,
+	[  --disable-dwarf		disable usage of Dwarf Library (default is enabled)],
+	enable_dwarf=$enableval, 
+	enable_dwarf=yes)
+AM_CONDITIONAL(enable_dwarf, test "$enable_dwarf" = yes)
+if test "$enable_dwarf" = "yes"; then
+	AC_DEFINE_UNQUOTED(ENABLE_DWARF,1, [Enable dwarf-symbol-engine])
+fi
+
 #Turn on debug
 AC_ARG_ENABLE(debug,
 	[  --enable-debug		Turn on debugging],
@@ -77,11 +93,11 @@
 
 AC_DEFINE_UNQUOTED([DEBUGDIR], "$debugdir", [Directory with separate debug info files])
 
-dnl disable -Werr flag
+dnl enable -Werr flag
 AC_ARG_ENABLE(werror,
-	[  --disable-werror		disable -Werror flag (default is enabled for non-release)],
+	[  --enable-werror		enable -Werror flag (default is disabled)],
         enable_werror=$enableval, 
-	enable_werror=yes)
+	enable_werror=no)
 
 dnl disable-optimization flag
 AC_ARG_ENABLE(optimization,
@@ -89,16 +105,6 @@
 	enable_optimization=$enableval, 
 	enable_optimization=yes)
 
-# Disable dwarf library
-AC_ARG_ENABLE(dwarf,
-	[  --disable-dwarf		disable usage of Dwarf Library (default is enabled)],
-	enable_dwarf=$enableval, 
-	enable_dwarf=yes)
-AM_CONDITIONAL(enable_dwarf, test "$enable_dwarf" = yes)
-if test "$enable_dwarf" = "yes"; then
-	AC_DEFINE_UNQUOTED(ENABLE_DWARF,1, [Enable dwarf-symbol-engine])
-fi
-
 # Enable Oprofile XML library
 AC_ARG_ENABLE(oprofile-lib,
 	[  --disable-oprofile-lib	disable usage of Oprofile Library (default is enabled)],
@@ -181,21 +187,19 @@
 		ELF_LIB="-l$ELF"; AC_SUBST(ELF_LIB), 
 		ELF_LIB=""; AC_MSG_ERROR([libelf liberary not found]))
 
+LIBS="$ELF_LIB $LIBS"
+
 dnl check for popt
 AC_CHECK_LIB(popt, poptGetContext,
 		POPT_LIB="-lpopt"; AC_SUBST(POPT_LIB),
 		POPT_LIB=""; AC_MSG_ERROR([popt library not found]))
+LIBS="$POPT_LIB $LIBS"
 
 dnl check for dl
 AC_CHECK_LIB(dl, dlopen, 
 		DL_LIB="-ldl", 
 		DL_LIB=""; AC_MSG_ERROR([dl library not found]))
-
-dnl check for bfd
-CHECK_LBFD
-AC_CHECK_LIB($BFD, bfd_openr, 
-		BFD_LIB="-l$BFD"; AC_SUBST(BFD_LIB), 
-		BFD_LIB=""; AC_MSG_ERROR([bfd_openr bfd library not found]))
+LIBS="$DL_LIB $LIBS"
 
 dnl some distro have a libiberty.a but does not have a libiberty.h
 AC_CHECK_HEADERS(libiberty.h,,AC_MSG_ERROR([libiberth.h not found]))
@@ -204,7 +208,25 @@
 		AC_CHECK_LIB(iberty, cplus_demangle,
 			IBERTY_LIB="-liberty";AC_SUBST(IBERTY_LIB), 
 			IBERTY_LIB=""; AC_MSG_ERROR([liberty library not found])))
-LIBS="$ELF_LIB $POPT_LIB $DL_LIB $BFD_LIB $IBERTY_LIB"
+LIBS="$IBERTY_LIB $LIBS"
+
+dnl check for dl (needed by libbfd)
+AC_CHECK_LIB(z, compress,
+		Z_LIB="-lz"; AC_SUBST(Z_LIB), 
+		Z_LIB=""; [AC_MSG_ERROR([libz library not found; required by libbfd])])
+LIBS="$Z_LIB $LIBS"
+
+dnl check for libbfd
+#AC_CHECK_LIB(bfd, bfd_fdopenr, 
+#	BFD_LIB="-lbfd"; AC_SUBST(BFD_LIB), 
+#	[AC_MSG_ERROR([bfd library not found])])
+CHECK_LBFD
+AC_CHECK_LIB($BFD, bfd_openr, 
+		BFD_LIB="-l$BFD"; AC_SUBST(BFD_LIB), 
+		BFD_LIB=""; AC_MSG_ERROR([bfd_openr bfd library not found]))
+
+LIBS="$BFD_LIB $LIBS"
+
 ORIG_SAVE_LIBS="$LIBS"
 
 dnl Check for X Window stuff
@@ -266,9 +288,10 @@
 	AX_CFLAGS_OPTION(CA_CFLAGS,[-DCA_ENABLE_DEBUG])
 fi
 
-if test "$enable_werror" = yes; then
+if test "$enable_werror" = "yes"; then
 	# enable -Werror for non-release versions.
-	if ls `pwd` | grep .svn >/dev/null; then
+	ls `pwd`/.svn > /dev/null
+	if test "$?" = "0" ; then
 		AX_CFLAGS_OPTION(CA_CFLAGS,[-Werror])
 	fi
 fi
@@ -282,12 +305,13 @@
 AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-ftemplate-depth-50])
 AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-fPIC])
 if test x$debug = xtrue; then
-	AX_CFLAGS_OPTION(CA_CXXFLAGS,[-DCA_ENABLE_DEBUG])
+	AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-DCA_ENABLE_DEBUG])
 fi
 
-if test "$enable_werror" = yes; then
+if test "$enable_werror" = "yes"; then
 	# enable -Werror for non-release versions.
-	if ls `pwd` | grep .svn >/dev/null; then
+	ls `pwd`/.svn > /dev/null
+	if test "$?" = "0" ; then
 		AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-Werror])
 	fi
 fi
@@ -325,11 +349,37 @@
 fi
 my_bindir="$my_exec_prefix/bin"
 
-CA_DATA_DIR=`eval echo "$my_datadir/codeanalyst/"`
+CA_DATA_DIR="$my_datadir/codeanalyst/"
 AC_DEFINE_DIR(CA_DATA_DIR, CA_DATA_DIR,[Defines the data directory])
 AC_DEFINE_DIR(CA_BIN_DIR, bindir, [Defines the binary directory])
 AC_DEFINE_DIR(CA_SBIN_DIR, sbindir, [Defines the super-user binary directory])
 
+############################################
+# Setup for libdwarf
+############################################
+
+dnl Check with_libdwarf_includes
+if test "$with_libdwarf_includes" != "" ; then
+	LIBDWARF_INC="-I $with_libdwarf_includes"
+fi
+
+dnl Check with_libdwarf_libraries
+if test "$with_libdwarf_libraries" != "" ; then
+	LIBDWARF_LIB="$with_libdwarf_libraries"
+fi
+
+if test "$LIBDWARF_INC" = "" ; then
+if test "$LIBDWARF_LIB" = "" ; then
+	echo "---------- Begin Setup for libdwarf ----------"
+	CA_LIBDWARF_CONFIG()
+	if test "$LIBDWARF_DIR" != "" ; then
+		LIBDWARF_INC="-I $LIBDWARF_DIR"
+		LIBDWARF_LIB="$LIBDWARF_DIR"
+	fi
+	echo "---------- Finish Setup for libdwarf ----------"
+fi fi
+AC_SUBST(LIBDWARF_INC)
+AC_SUBST(LIBDWARF_LIB)
 
 ############################################
 # Setup for Oprofile
@@ -338,7 +388,7 @@
 
 dnl Check with_oprofile
 if test ! -z $with_oprofile; then
-	OPINST=`eval echo "$with_oprofile"`
+	OPINST="$with_oprofile"
 
 	# TODO: check where the default bin should be
 	OPBIN=$OPINST/bin
@@ -352,18 +402,17 @@
 
 dnl Check with_oprofile_includes
 if test ! -z $with_oprofile_includes; then
-	OPINC=`eval echo "$with_oprofile_includes/"`
+	OPINC="$with_oprofile_includes/"
 fi
 
-
 dnl Check with_oprofile_libraries
 if test ! -z $with_oprofile_libraries; then
-	OPLIB=`eval echo "$with_oprofile_libraries/"`
+	OPLIB="$with_oprofile_libraries/"
 fi
 
 dnl Check with_oprofile_bin
 if test ! -z $with_oprofile_bin; then
-	OPBIN=`eval echo "$with_oprofile_bin/"`
+	OPBIN="$with_oprofile_bin/"
 	AC_SUBST(OPBIN)
 fi
 
@@ -401,7 +450,7 @@
 
 dnl Setup oprofile src dir
 if test ! -z $with_oprofile_source ; then
-	OPSRC=`eval echo "$with_oprofile_source/"`
+	OPSRC="$with_oprofile_source/"
 	AC_SUBST(OPSRC)
 	CHECK_OPROFILE_CONFIG($OPSRC)
 fi
diff -uarN CodeAnalyst-gui-2.8.38/m4/calibdwarfconfig.m4 CodeAnalyst-gui-2.8.38-libdwarf/m4/calibdwarfconfig.m4
--- CodeAnalyst-gui-2.8.38/m4/calibdwarfconfig.m4	1969-12-31 18:00:00.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/m4/calibdwarfconfig.m4	2009-04-04 10:41:01.000000000 -0500
@@ -0,0 +1,16 @@
+AC_DEFUN([CA_LIBDWARF_CONFIG],
+[
+	dnl Check for configure
+	echo "... Configuring libdwarf"
+	test -f "src/dwarf-20090217/libdwarf/configure" 
+	if test "$?" = "0" ; then
+		pushd src/dwarf-20090217/libdwarf/
+		echo "... running src/dwarf-20090217/libdwarf/configure"
+		./configure --prefix=$prefix --libdir=$libdir --enable-shared CFLAGS=-fPIC 
+		LIBDWARF_DIR=${topdir}/src/dwarf-20090217/libdwarf/
+		AC_SUBST(LIBDWARF_DIR)	
+		popd
+	fi
+		
+])
+
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/diffgui/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/diffgui/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/diffgui/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/diffgui/Makefile.am	2009-04-04 10:42:05.000000000 -0500
@@ -68,7 +68,7 @@
 DiffAnalyst_LDADD= \
         ${top_srcdir}/${CADIR}/libs/libca/libCA.la \
         ${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
         ${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${op_libs} \
 	@QT_LIB@ \
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/gui/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/gui/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/Makefile.am	2009-04-04 10:42:17.000000000 -0500
@@ -174,7 +174,7 @@
 CodeAnalyst_LDADD= \
 	${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
 	${top_srcdir}/${CADIR}/libs/libca/libCA.la \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
 	${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la \
 	${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${op_libs} \
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/libs/libca/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libca/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/libs/libca/Makefile.am	2009-02-12 12:06:37.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libca/Makefile.am	2009-04-06 10:41:36.000000000 -0500
@@ -12,8 +12,8 @@
 AM_CPPFLAGS= \
 	@QT_INCLUDES@ \
 	${op_includes} \
+	${LIBDWARF_INC} \
 	-I ../../include \
-	-I ../libdwarf-20070223/include/ \
 	-I /usr/include/libelf \
 	-I ../libopdata \
 	-I ../liboutput \
@@ -35,7 +35,7 @@
 if enable_dwarf
 libCA_la_LIBADD = \
 	${op_libs} \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
 	${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la 
 
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/libs/libcabba/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libcabba/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/libs/libcabba/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libcabba/Makefile.am	2009-04-04 17:24:46.000000000 -0500
@@ -7,8 +7,8 @@
 #	bbatest
 
 INCLUDES = \
-    -I ../libdwarf-20070223/include/ \
-    -I /usr/include/libelf 
+	${LIBDWARF_INC} \
+	-I /usr/include/libelf 
 
 AM_CPPFLAGS = $(INCLUDES) $(FLAG64)\
     	-pipe -Wno-unused -Wno-parentheses ${CA_CXXFLAGS}
@@ -16,7 +16,7 @@
 libCAbba_la_LDFLAGS = -Wl -fPIC --no-undefined -version-number ${libVersion}
 
 if enable_dwarf
-libCAbba_la_LIBADD = ../libdwarf-20070223/lib/${build_cpu}/libdwarf.a
+libCAbba_la_LIBADD  = -L${LIBDWARF_LIB}  -ldwarf
 else
 libCAbba_la_LIBADD = 
 endif
diff -uarN CodeAnalyst-gui-2.8.38/src/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/Makefile.am	2009-01-29 00:48:12.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/Makefile.am	2009-04-04 10:41:45.000000000 -0500
@@ -1,4 +1,19 @@
 SUBDIRS = \
+	$(LIBDWARF_DIR) \
 	$(CA_OPROFILE_DIR) \
 	ca 
 
+install-exec-hook:
+	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+		ldconfig ;\
+	fi
+
+uninstall-hook:
+	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
+			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+			ldconfig ; \
+		fi ; \
+	fi
+

ca-fix-splash.patch:

--- NEW FILE ca-fix-splash.patch ---
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/gui/main.cpp CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/main.cpp
--- CodeAnalyst-gui-2.8.38/src/ca/gui/main.cpp	2009-02-10 16:07:21.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/main.cpp	2009-04-06 11:36:58.000000000 -0500
@@ -54,20 +54,16 @@
 	}
 
 	QApplication a (argc, argv);
-	
-	ApplicationWindow * mw = new ApplicationWindow();
-	mw->setCaption( "Advanced Micro Devices - CodeAnalyst Performance Analyzer" );
 
 	QString BinDirectory = QString(CA_DATA_DIR) + "/" + CODEANALYST_SPLASH;
 	QSplashScreen splash ( QPixmap(BinDirectory), Qt::WStyle_StaysOnTop);
 	splash.show();
-	
-	// Show the splash screen for 2 seconds
-	sleep(2);	
+
+	ApplicationWindow * mw = new ApplicationWindow();
 	splash.finish (mw);
-	
+	mw->setCaption( "Advanced Micro Devices - CodeAnalyst Performance Analyzer" );
 	mw->show();
-	
+
 	a.connect ( &a, SIGNAL (lastWindowClosed()), &a, SLOT (quit()) );
 	//a.syncX();
 	ret_value =  a.exec();


Index: CodeAnalyst-gui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/F-10/CodeAnalyst-gui.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeAnalyst-gui.spec	16 Mar 2009 16:38:20 -0000	1.1
+++ CodeAnalyst-gui.spec	6 Apr 2009 17:01:36 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:       CodeAnalyst is a Performance Analysis Suite for AMD-based System
 Name:          CodeAnalyst-gui
 Version:       2.8.38
-Release:       9%{?dist}
+Release:       10%{?dist}
 License:       GPLv2
 Group:         Development/System
 URL:           http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux
@@ -20,6 +20,12 @@
 # This patch allows to succesfully build with --disable-dwarf
 Patch2:        ca-disable-dwarf.patch
 
+# This patch allows to CA to be configured with any libdwarf
+Patch3:        ca-configure-libdwarf.patch
+
+# This patch fix the splash screen
+Patch4:        ca-fix-splash.patch
+
 Requires:      popt
 Requires:      binutils
 Requires:      elfutils-libelf
@@ -41,6 +47,7 @@
 BuildRequires: qt3-designer >= 3.3
 BuildRequires: oprofile >= 0.9.4
 BuildRequires: desktop-file-utils
+BuildRequires: libdwarf-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -61,6 +68,8 @@
 %patch0 -p1 -b .ca-use-oprofile-default-buffersize
 %patch1 -p0 -b .ca-destdir
 %patch2 -p0 -b .ca-disable-dwarf
+%patch3 -p1 -b .ca-configure-libdwarf
+%patch4 -p1 -b .ca-fix-splash
 
 
 %build
@@ -68,8 +77,9 @@
 %configure \
   --with-oprofile=%{_prefix} \
   --disable-oprofile-lib \
-  --disable-dwarf \
-  --disable-static
+  --disable-static \
+  --with-libdwarf-includes=%{_includedir}/libdwarf \
+  --with-libdwarf-libraries=%{_libdir}
 
 make %{?_smp_mflags} all \
   CFLAGS="${RPM_OPT_FLAGS}" \
@@ -155,6 +165,13 @@
 
 
 %changelog
+* Mon Apr 6 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
+- 2.8.38-10
+- Remove --disable-dwarf from configuration
+- Add patch ca-configure-libdwarf.patch
+- Add patch ca-fix-splash.patch
+- configure to build with libdwarf package
+
 * Thu Mar 12 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
 - 2.8.38-9
 - Disable dwarf



From dwalsh at fedoraproject.org  Mon Apr  6 17:08:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  6 Apr 2009 17:08:30 +0000 (UTC)
Subject: rpms/selinux-policy/devel nsadiff, 1.3, 1.4 policy-20090105.patch, 
	1.79, 1.80 selinux-policy.spec, 1.818, 1.819
Message-ID: <20090406170830.5AB9E700FB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15308

Modified Files:
	nsadiff policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.11-1
- Dontaudit binds to ports < 1024 for named
- Upgrade to latest upstream



Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsadiff	20 Mar 2009 18:18:50 -0000	1.3
+++ nsadiff	6 Apr 2009 17:07:59 -0000	1.4
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.10 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.11 > /tmp/diff

policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.79 -r 1.80 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- policy-20090105.patch	6 Apr 2009 14:44:51 -0000	1.79
+++ policy-20090105.patch	6 Apr 2009 17:07:59 -0000	1.80
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.10/config/appconfig-mcs/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.11/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -22,25 +22,15 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.10/config/appconfig-mcs/failsafe_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.11/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.10/config/appconfig-mcs/failsafe_context	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/failsafe_context	2009-04-06 12:59:54.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/guest_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/guest_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,6 @@
-+system_r:local_login_t:s0	guest_r:guest_t:s0
-+system_r:remote_login_t:s0	guest_r:guest_t:s0
-+system_r:sshd_t:s0		guest_r:guest_t:s0
-+system_r:crond_t:s0		guest_r:guest_t:s0
-+system_r:initrc_su_t:s0		guest_r:guest_t:s0
-+guest_r:guest_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/root_default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/root_default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -55,18 +45,18 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.10/config/appconfig-mcs/seusers
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.11/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.10/config/appconfig-mcs/seusers	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/seusers	2009-04-06 12:59:54.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +root:unconfined_u:s0-mcs_systemhigh
 +__default__:unconfined_u:s0-mcs_systemhigh
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/staff_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/staff_u_default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -81,9 +71,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/unconfined_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/unconfined_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -97,15 +87,15 @@
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.10/config/appconfig-mcs/userhelper_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.11/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.10/config/appconfig-mcs/userhelper_context	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/userhelper_context	2009-04-06 12:59:54.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/user_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/user_u_default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -118,31 +108,20 @@
 -
 +system_r:initrc_su_t:s0		user_r:user_t:s0
 +user_r:user_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.10/config/appconfig-mcs/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.11/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/virtual_domain_context	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/virtual_domain_context	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.10/config/appconfig-mcs/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.11/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/virtual_image_context	2009-04-03 14:55:45.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mcs/virtual_image_context	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.10/config/appconfig-mcs/xguest_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mcs/xguest_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,7 @@
-+system_r:local_login_t	xguest_r:xguest_t:s0
-+system_r:remote_login_t	xguest_r:xguest_t:s0
-+system_r:sshd_t		xguest_r:xguest_t:s0
-+system_r:crond_t	xguest_r:xguest_t:s0
-+system_r:xdm_t		xguest_r:xguest_t:s0
-+system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
-+xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.10/config/appconfig-mls/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.11/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mls/default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -164,17 +143,9 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.10/config/appconfig-mls/guest_u_default_contexts
---- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/guest_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,4 @@
-+system_r:local_login_t:s0	guest_r:guest_t:s0
-+system_r:remote_login_t:s0	guest_r:guest_t:s0
-+system_r:sshd_t:s0		guest_r:guest_t:s0
-+system_r:crond_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.10/config/appconfig-mls/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.11/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/root_default_contexts	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mls/root_default_contexts	2009-04-06 12:59:54.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -193,31 +164,20 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.10/config/appconfig-mls/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.11/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/virtual_domain_context	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mls/virtual_domain_context	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.10/config/appconfig-mls/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.11/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/virtual_image_context	2009-04-03 14:56:16.000000000 -0400
++++ serefpolicy-3.6.11/config/appconfig-mls/virtual_image_context	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.10/config/appconfig-mls/xguest_u_default_contexts
---- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/config/appconfig-mls/xguest_u_default_contexts	2009-03-30 10:09:41.000000000 -0400
-@@ -0,0 +1,7 @@
-+system_r:local_login_t	xguest_r:xguest_t:s0
-+system_r:remote_login_t	xguest_r:xguest_t:s0
-+system_r:sshd_t		xguest_r:xguest_t:s0
-+system_r:crond_t	xguest_r:xguest_t:s0
-+system_r:xdm_t		xguest_r:xguest_t:s0
-+system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
-+xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.10/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.11/Makefile
 --- nsaserefpolicy/Makefile	2009-01-19 11:07:35.000000000 -0500
-+++ serefpolicy-3.6.10/Makefile	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/Makefile	2009-04-06 12:59:54.000000000 -0400
 @@ -241,7 +241,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -280,9 +240,9 @@
  $(appdir)/%: $(appconf)/%
[...4269 lines suppressed...]
  
@@ -27062,9 +26769,9 @@
 +optional_policy(`
  	xserver_read_xdm_pid(udev_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.10/policy/modules/system/unconfined.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.11/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.10/policy/modules/system/unconfined.fc	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/unconfined.fc	2009-04-06 12:59:54.000000000 -0400
 @@ -2,15 +2,28 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -27103,9 +26810,9 @@
 +/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.10/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.11/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/unconfined.if	2009-04-03 10:28:13.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/unconfined.if	2009-04-06 12:59:54.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -27383,9 +27090,9 @@
 +
 +	allow $1 unconfined_r;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.10/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.11/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/unconfined.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/unconfined.te	2009-04-06 12:59:54.000000000 -0400
 @@ -5,6 +5,35 @@
  #
  # Declarations
@@ -27748,9 +27455,9 @@
 +
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 +	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.10/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.11/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.fc	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/userdomain.fc	2009-04-06 12:59:54.000000000 -0400
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -27760,9 +27467,9 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.10/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.11/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.if	2009-04-06 08:22:27.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/userdomain.if	2009-04-06 12:59:54.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29642,9 +29349,9 @@
 +	dontaudit $1 userdomain:unix_stream_socket rw_socket_perms;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.10/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.11/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/userdomain.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/userdomain.te	2009-04-06 12:59:54.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -29728,14 +29435,14 @@
 +	fs_read_cifs_named_sockets(userhomereader)
 +	fs_read_cifs_named_pipes(userhomereader)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.10/policy/modules/system/virtual.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.11/policy/modules/system/virtual.fc
 --- nsaserefpolicy/policy/modules/system/virtual.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/virtual.fc	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/virtual.fc	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1 @@
 +# No application file contexts.
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.10/policy/modules/system/virtual.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.11/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/virtual.if	2009-04-03 16:50:58.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/virtual.if	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
@@ -29851,9 +29558,9 @@
 +	allow $1 virtualdomain:process { setsched transition signal signull sigkill };
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.10/policy/modules/system/virtual.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.11/policy/modules/system/virtual.te
 --- nsaserefpolicy/policy/modules/system/virtual.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/virtual.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/virtual.te	2009-04-06 12:59:54.000000000 -0400
 @@ -0,0 +1,80 @@
 +
 +policy_module(virtualization, 1.1.2)
@@ -29935,9 +29642,9 @@
 +	xserver_read_xdm_pid(virtualdomain)
 +	xserver_rw_shm(virtualdomain)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.10/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.11/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/xen.fc	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/xen.fc	2009-04-06 12:59:54.000000000 -0400
 @@ -1,32 +1,31 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -29977,9 +29684,9 @@
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.10/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.11/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/xen.if	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/xen.if	2009-04-06 12:59:54.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -30043,9 +29750,9 @@
 +        files_search_pids($1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.10/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.11/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.10/policy/modules/system/xen.te	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/xen.te	2009-04-06 12:59:54.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -30315,9 +30022,9 @@
 +libs_use_ld_so(evtchnd_t)
 +libs_use_shared_libs(evtchnd_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/ipc_patterns.spt serefpolicy-3.6.10/policy/support/ipc_patterns.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/ipc_patterns.spt serefpolicy-3.6.11/policy/support/ipc_patterns.spt
 --- nsaserefpolicy/policy/support/ipc_patterns.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.10/policy/support/ipc_patterns.spt	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/support/ipc_patterns.spt	2009-04-06 12:59:54.000000000 -0400
 @@ -3,12 +3,12 @@
  #
  define(`stream_connect_pattern',`
@@ -30333,9 +30040,9 @@
 +	allow $1 $3:sock_file { getattr write };
  	allow $1 $4:unix_dgram_socket sendto;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.10/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.11/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.10/policy/support/obj_perm_sets.spt	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/support/obj_perm_sets.spt	2009-04-06 12:59:54.000000000 -0400
 @@ -225,7 +225,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')
@@ -30359,9 +30066,9 @@
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.10/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.11/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.10/policy/users	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/policy/users	2009-04-06 12:59:54.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -30386,9 +30093,9 @@
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.10/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.11/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/Rules.modular	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/Rules.modular	2009-04-06 12:59:54.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -30418,9 +30125,9 @@
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.10/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.11/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.10/support/Makefile.devel	2009-03-30 10:09:41.000000000 -0400
++++ serefpolicy-3.6.11/support/Makefile.devel	2009-04-06 12:59:54.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -r1.818 -r1.819
--- selinux-policy.spec	3 Apr 2009 21:25:59 -0000	1.818
+++ selinux-policy.spec	6 Apr 2009 17:07:59 -0000	1.819
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.10
-Release: 9%{?dist}
+Version: 3.6.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -187,7 +187,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision  2936.
+Based off of reference policy: Checked out revision  2943.
 
 %build
 
@@ -444,6 +444,10 @@
 %endif
 
 %changelog
+* Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.11-1
+- Dontaudit binds to ports < 1024 for named
+- Upgrade to latest upstream
+
 * Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.10-9
 - Allow podsleuth to use tmpfs files
 



From suravee at fedoraproject.org  Mon Apr  6 17:13:20 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Mon,  6 Apr 2009 17:13:20 +0000 (UTC)
Subject: rpms/CodeAnalyst-gui/devel ca-configure-libdwarf.patch, NONE,
	1.1 ca-fix-splash.patch, NONE, 1.1 CodeAnalyst-gui.spec, 1.3, 1.4
Message-ID: <20090406171320.367C3700FB@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/rpms/CodeAnalyst-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17021

Modified Files:
	CodeAnalyst-gui.spec 
Added Files:
	ca-configure-libdwarf.patch ca-fix-splash.patch 
Log Message:
- Add patch to enable libdwarf configuration
- Add patch to fix CA splash screen
- configure to use libdwarf
- Bump version number


ca-configure-libdwarf.patch:

--- NEW FILE ca-configure-libdwarf.patch ---
diff -uarN CodeAnalyst-gui-2.8.38/configure.ac CodeAnalyst-gui-2.8.38-libdwarf/configure.ac
--- CodeAnalyst-gui-2.8.38/configure.ac	2009-02-19 05:55:00.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/configure.ac	2009-04-06 11:27:23.000000000 -0500
@@ -1,4 +1,4 @@
-#$Id: configure.ac 16162 2009-02-17 18:07:41Z ssuthiku $
+#$Id: configure.ac 16431 2009-04-03 20:06:32Z ssuthiku $
 
 # Process this file with autoconf to produce a configure script
 
@@ -46,13 +46,29 @@
 #Get Oprofile configuration 
 AC_ARG_WITH(oprofile, 
 	[  --with-oprofile=DIR                  absolute location where the Oprofile is installed])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-includes, 
 	[  --with-oprofile-includes=DIR         absolute location where the Oprofile includes are])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-libraries, 
 	[  --with-oprofile-libraries=DIR        absolute location where the Oprofile libraries are])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-source, 
 	[  --with-oprofile-source=DIR           absolute location where the Oprofile source code is])
 
+#Get libdwarf configuration 
+AC_ARG_WITH(libdwarf-includes, 
+	[  --with-libdwarf-includes=DIR         absolute location where the libdwarf includes are])
+AC_ARG_WITH(libdwarf-libraries, 
+	[  --with-libdwarf-libraries=DIR        absolute location where the libdwarf libraries are])
+
+# Disable dwarf library
+AC_ARG_ENABLE(dwarf,
+	[  --disable-dwarf		disable usage of Dwarf Library (default is enabled)],
+	enable_dwarf=$enableval, 
+	enable_dwarf=yes)
+AM_CONDITIONAL(enable_dwarf, test "$enable_dwarf" = yes)
+if test "$enable_dwarf" = "yes"; then
+	AC_DEFINE_UNQUOTED(ENABLE_DWARF,1, [Enable dwarf-symbol-engine])
+fi
+
 #Turn on debug
 AC_ARG_ENABLE(debug,
 	[  --enable-debug		Turn on debugging],
@@ -77,11 +93,11 @@
 
 AC_DEFINE_UNQUOTED([DEBUGDIR], "$debugdir", [Directory with separate debug info files])
 
-dnl disable -Werr flag
+dnl enable -Werr flag
 AC_ARG_ENABLE(werror,
-	[  --disable-werror		disable -Werror flag (default is enabled for non-release)],
+	[  --enable-werror		enable -Werror flag (default is disabled)],
         enable_werror=$enableval, 
-	enable_werror=yes)
+	enable_werror=no)
 
 dnl disable-optimization flag
 AC_ARG_ENABLE(optimization,
@@ -89,16 +105,6 @@
 	enable_optimization=$enableval, 
 	enable_optimization=yes)
 
-# Disable dwarf library
-AC_ARG_ENABLE(dwarf,
-	[  --disable-dwarf		disable usage of Dwarf Library (default is enabled)],
-	enable_dwarf=$enableval, 
-	enable_dwarf=yes)
-AM_CONDITIONAL(enable_dwarf, test "$enable_dwarf" = yes)
-if test "$enable_dwarf" = "yes"; then
-	AC_DEFINE_UNQUOTED(ENABLE_DWARF,1, [Enable dwarf-symbol-engine])
-fi
-
 # Enable Oprofile XML library
 AC_ARG_ENABLE(oprofile-lib,
 	[  --disable-oprofile-lib	disable usage of Oprofile Library (default is enabled)],
@@ -181,21 +187,19 @@
 		ELF_LIB="-l$ELF"; AC_SUBST(ELF_LIB), 
 		ELF_LIB=""; AC_MSG_ERROR([libelf liberary not found]))
 
+LIBS="$ELF_LIB $LIBS"
+
 dnl check for popt
 AC_CHECK_LIB(popt, poptGetContext,
 		POPT_LIB="-lpopt"; AC_SUBST(POPT_LIB),
 		POPT_LIB=""; AC_MSG_ERROR([popt library not found]))
+LIBS="$POPT_LIB $LIBS"
 
 dnl check for dl
 AC_CHECK_LIB(dl, dlopen, 
 		DL_LIB="-ldl", 
 		DL_LIB=""; AC_MSG_ERROR([dl library not found]))
-
-dnl check for bfd
-CHECK_LBFD
-AC_CHECK_LIB($BFD, bfd_openr, 
-		BFD_LIB="-l$BFD"; AC_SUBST(BFD_LIB), 
-		BFD_LIB=""; AC_MSG_ERROR([bfd_openr bfd library not found]))
+LIBS="$DL_LIB $LIBS"
 
 dnl some distro have a libiberty.a but does not have a libiberty.h
 AC_CHECK_HEADERS(libiberty.h,,AC_MSG_ERROR([libiberth.h not found]))
@@ -204,7 +208,25 @@
 		AC_CHECK_LIB(iberty, cplus_demangle,
 			IBERTY_LIB="-liberty";AC_SUBST(IBERTY_LIB), 
 			IBERTY_LIB=""; AC_MSG_ERROR([liberty library not found])))
-LIBS="$ELF_LIB $POPT_LIB $DL_LIB $BFD_LIB $IBERTY_LIB"
+LIBS="$IBERTY_LIB $LIBS"
+
+dnl check for dl (needed by libbfd)
+AC_CHECK_LIB(z, compress,
+		Z_LIB="-lz"; AC_SUBST(Z_LIB), 
+		Z_LIB=""; [AC_MSG_ERROR([libz library not found; required by libbfd])])
+LIBS="$Z_LIB $LIBS"
+
+dnl check for libbfd
+#AC_CHECK_LIB(bfd, bfd_fdopenr, 
+#	BFD_LIB="-lbfd"; AC_SUBST(BFD_LIB), 
+#	[AC_MSG_ERROR([bfd library not found])])
+CHECK_LBFD
+AC_CHECK_LIB($BFD, bfd_openr, 
+		BFD_LIB="-l$BFD"; AC_SUBST(BFD_LIB), 
+		BFD_LIB=""; AC_MSG_ERROR([bfd_openr bfd library not found]))
+
+LIBS="$BFD_LIB $LIBS"
+
 ORIG_SAVE_LIBS="$LIBS"
 
 dnl Check for X Window stuff
@@ -266,9 +288,10 @@
 	AX_CFLAGS_OPTION(CA_CFLAGS,[-DCA_ENABLE_DEBUG])
 fi
 
-if test "$enable_werror" = yes; then
+if test "$enable_werror" = "yes"; then
 	# enable -Werror for non-release versions.
-	if ls `pwd` | grep .svn >/dev/null; then
+	ls `pwd`/.svn > /dev/null
+	if test "$?" = "0" ; then
 		AX_CFLAGS_OPTION(CA_CFLAGS,[-Werror])
 	fi
 fi
@@ -282,12 +305,13 @@
 AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-ftemplate-depth-50])
 AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-fPIC])
 if test x$debug = xtrue; then
-	AX_CFLAGS_OPTION(CA_CXXFLAGS,[-DCA_ENABLE_DEBUG])
+	AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-DCA_ENABLE_DEBUG])
 fi
 
-if test "$enable_werror" = yes; then
+if test "$enable_werror" = "yes"; then
 	# enable -Werror for non-release versions.
-	if ls `pwd` | grep .svn >/dev/null; then
+	ls `pwd`/.svn > /dev/null
+	if test "$?" = "0" ; then
 		AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-Werror])
 	fi
 fi
@@ -325,11 +349,37 @@
 fi
 my_bindir="$my_exec_prefix/bin"
 
-CA_DATA_DIR=`eval echo "$my_datadir/codeanalyst/"`
+CA_DATA_DIR="$my_datadir/codeanalyst/"
 AC_DEFINE_DIR(CA_DATA_DIR, CA_DATA_DIR,[Defines the data directory])
 AC_DEFINE_DIR(CA_BIN_DIR, bindir, [Defines the binary directory])
 AC_DEFINE_DIR(CA_SBIN_DIR, sbindir, [Defines the super-user binary directory])
 
+############################################
+# Setup for libdwarf
+############################################
+
+dnl Check with_libdwarf_includes
+if test "$with_libdwarf_includes" != "" ; then
+	LIBDWARF_INC="-I $with_libdwarf_includes"
+fi
+
+dnl Check with_libdwarf_libraries
+if test "$with_libdwarf_libraries" != "" ; then
+	LIBDWARF_LIB="$with_libdwarf_libraries"
+fi
+
+if test "$LIBDWARF_INC" = "" ; then
+if test "$LIBDWARF_LIB" = "" ; then
+	echo "---------- Begin Setup for libdwarf ----------"
+	CA_LIBDWARF_CONFIG()
+	if test "$LIBDWARF_DIR" != "" ; then
+		LIBDWARF_INC="-I $LIBDWARF_DIR"
+		LIBDWARF_LIB="$LIBDWARF_DIR"
+	fi
+	echo "---------- Finish Setup for libdwarf ----------"
+fi fi
+AC_SUBST(LIBDWARF_INC)
+AC_SUBST(LIBDWARF_LIB)
 
 ############################################
 # Setup for Oprofile
@@ -338,7 +388,7 @@
 
 dnl Check with_oprofile
 if test ! -z $with_oprofile; then
-	OPINST=`eval echo "$with_oprofile"`
+	OPINST="$with_oprofile"
 
 	# TODO: check where the default bin should be
 	OPBIN=$OPINST/bin
@@ -352,18 +402,17 @@
 
 dnl Check with_oprofile_includes
 if test ! -z $with_oprofile_includes; then
-	OPINC=`eval echo "$with_oprofile_includes/"`
+	OPINC="$with_oprofile_includes/"
 fi
 
-
 dnl Check with_oprofile_libraries
 if test ! -z $with_oprofile_libraries; then
-	OPLIB=`eval echo "$with_oprofile_libraries/"`
+	OPLIB="$with_oprofile_libraries/"
 fi
 
 dnl Check with_oprofile_bin
 if test ! -z $with_oprofile_bin; then
-	OPBIN=`eval echo "$with_oprofile_bin/"`
+	OPBIN="$with_oprofile_bin/"
 	AC_SUBST(OPBIN)
 fi
 
@@ -401,7 +450,7 @@
 
 dnl Setup oprofile src dir
 if test ! -z $with_oprofile_source ; then
-	OPSRC=`eval echo "$with_oprofile_source/"`
+	OPSRC="$with_oprofile_source/"
 	AC_SUBST(OPSRC)
 	CHECK_OPROFILE_CONFIG($OPSRC)
 fi
diff -uarN CodeAnalyst-gui-2.8.38/m4/calibdwarfconfig.m4 CodeAnalyst-gui-2.8.38-libdwarf/m4/calibdwarfconfig.m4
--- CodeAnalyst-gui-2.8.38/m4/calibdwarfconfig.m4	1969-12-31 18:00:00.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/m4/calibdwarfconfig.m4	2009-04-04 10:41:01.000000000 -0500
@@ -0,0 +1,16 @@
+AC_DEFUN([CA_LIBDWARF_CONFIG],
+[
+	dnl Check for configure
+	echo "... Configuring libdwarf"
+	test -f "src/dwarf-20090217/libdwarf/configure" 
+	if test "$?" = "0" ; then
+		pushd src/dwarf-20090217/libdwarf/
+		echo "... running src/dwarf-20090217/libdwarf/configure"
+		./configure --prefix=$prefix --libdir=$libdir --enable-shared CFLAGS=-fPIC 
+		LIBDWARF_DIR=${topdir}/src/dwarf-20090217/libdwarf/
+		AC_SUBST(LIBDWARF_DIR)	
+		popd
+	fi
+		
+])
+
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/diffgui/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/diffgui/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/diffgui/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/diffgui/Makefile.am	2009-04-04 10:42:05.000000000 -0500
@@ -68,7 +68,7 @@
 DiffAnalyst_LDADD= \
         ${top_srcdir}/${CADIR}/libs/libca/libCA.la \
         ${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
         ${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${op_libs} \
 	@QT_LIB@ \
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/gui/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/gui/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/Makefile.am	2009-04-04 10:42:17.000000000 -0500
@@ -174,7 +174,7 @@
 CodeAnalyst_LDADD= \
 	${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
 	${top_srcdir}/${CADIR}/libs/libca/libCA.la \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
 	${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la \
 	${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${op_libs} \
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/libs/libca/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libca/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/libs/libca/Makefile.am	2009-02-12 12:06:37.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libca/Makefile.am	2009-04-06 10:41:36.000000000 -0500
@@ -12,8 +12,8 @@
 AM_CPPFLAGS= \
 	@QT_INCLUDES@ \
 	${op_includes} \
+	${LIBDWARF_INC} \
 	-I ../../include \
-	-I ../libdwarf-20070223/include/ \
 	-I /usr/include/libelf \
 	-I ../libopdata \
 	-I ../liboutput \
@@ -35,7 +35,7 @@
 if enable_dwarf
 libCA_la_LIBADD = \
 	${op_libs} \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
 	${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la 
 
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/libs/libcabba/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libcabba/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/libs/libcabba/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libcabba/Makefile.am	2009-04-04 17:24:46.000000000 -0500
@@ -7,8 +7,8 @@
 #	bbatest
 
 INCLUDES = \
-    -I ../libdwarf-20070223/include/ \
-    -I /usr/include/libelf 
+	${LIBDWARF_INC} \
+	-I /usr/include/libelf 
 
 AM_CPPFLAGS = $(INCLUDES) $(FLAG64)\
     	-pipe -Wno-unused -Wno-parentheses ${CA_CXXFLAGS}
@@ -16,7 +16,7 @@
 libCAbba_la_LDFLAGS = -Wl -fPIC --no-undefined -version-number ${libVersion}
 
 if enable_dwarf
-libCAbba_la_LIBADD = ../libdwarf-20070223/lib/${build_cpu}/libdwarf.a
+libCAbba_la_LIBADD  = -L${LIBDWARF_LIB}  -ldwarf
 else
 libCAbba_la_LIBADD = 
 endif
diff -uarN CodeAnalyst-gui-2.8.38/src/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/Makefile.am	2009-01-29 00:48:12.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/Makefile.am	2009-04-04 10:41:45.000000000 -0500
@@ -1,4 +1,19 @@
 SUBDIRS = \
+	$(LIBDWARF_DIR) \
 	$(CA_OPROFILE_DIR) \
 	ca 
 
+install-exec-hook:
+	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+		ldconfig ;\
+	fi
+
+uninstall-hook:
+	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
+			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+			ldconfig ; \
+		fi ; \
+	fi
+

ca-fix-splash.patch:

--- NEW FILE ca-fix-splash.patch ---
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/gui/main.cpp CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/main.cpp
--- CodeAnalyst-gui-2.8.38/src/ca/gui/main.cpp	2009-02-10 16:07:21.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/main.cpp	2009-04-06 11:36:58.000000000 -0500
@@ -54,20 +54,16 @@
 	}
 
 	QApplication a (argc, argv);
-	
-	ApplicationWindow * mw = new ApplicationWindow();
-	mw->setCaption( "Advanced Micro Devices - CodeAnalyst Performance Analyzer" );
 
 	QString BinDirectory = QString(CA_DATA_DIR) + "/" + CODEANALYST_SPLASH;
 	QSplashScreen splash ( QPixmap(BinDirectory), Qt::WStyle_StaysOnTop);
 	splash.show();
-	
-	// Show the splash screen for 2 seconds
-	sleep(2);	
+
+	ApplicationWindow * mw = new ApplicationWindow();
 	splash.finish (mw);
-	
+	mw->setCaption( "Advanced Micro Devices - CodeAnalyst Performance Analyzer" );
 	mw->show();
-	
+
 	a.connect ( &a, SIGNAL (lastWindowClosed()), &a, SLOT (quit()) );
 	//a.syncX();
 	ret_value =  a.exec();


Index: CodeAnalyst-gui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/CodeAnalyst-gui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CodeAnalyst-gui.spec	1 Apr 2009 01:07:22 -0000	1.3
+++ CodeAnalyst-gui.spec	6 Apr 2009 17:12:49 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:       CodeAnalyst is a Performance Analysis Suite for AMD-based System
 Name:          CodeAnalyst-gui
 Version:       2.8.38
-Release:       10%{?dist}
+Release:       11%{?dist}
 License:       GPLv2
 Group:         Development/System
 URL:           http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux
@@ -20,6 +20,12 @@
 # This patch allows to succesfully build with --disable-dwarf
 Patch2:        ca-disable-dwarf.patch
 
+# This patch allows to CA to be configured with any libdwarf
+Patch3:        ca-configure-libdwarf.patch
+
+# This patch fix the splash screen
+Patch4:        ca-fix-splash.patch
+
 Requires:      popt
 Requires:      binutils
 Requires:      elfutils-libelf
@@ -41,6 +47,7 @@
 BuildRequires: qt3-designer >= 3.3
 BuildRequires: oprofile >= 0.9.4
 BuildRequires: desktop-file-utils
+BuildRequires: libdwarf-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -61,6 +68,8 @@
 %patch0 -p1 -b .ca-use-oprofile-default-buffersize
 %patch1 -p0 -b .ca-destdir
 %patch2 -p0 -b .ca-disable-dwarf
+%patch3 -p1 -b .ca-configure-libdwarf
+%patch4 -p1 -b .ca-fix-splash
 
 
 %build
@@ -68,8 +77,9 @@
 %configure \
   --with-oprofile=%{_prefix} \
   --disable-oprofile-lib \
-  --disable-dwarf \
-  --disable-static
+  --disable-static \
+  --with-libdwarf-includes=%{_includedir}/libdwarf \
+  --with-libdwarf-libraries=%{_libdir}
 
 make %{?_smp_mflags} all \
   CFLAGS="${RPM_OPT_FLAGS}" \
@@ -155,6 +165,13 @@
 
 
 %changelog
+* Mon Apr 6 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
+- 2.8.38-11
+- Remove --disable-dwarf from configuration
+- Add patch ca-configure-libdwarf.patch
+- Add patch ca-fix-splash.patch
+- configure to build with libdwarf package
+
 * Tue Mar 31 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
 - 2.8.38-10
 - Rebuild with new libbfd-2.19.51.0.2-16.fc11.so



From erikos at fedoraproject.org  Mon Apr  6 17:32:58 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 17:32:58 +0000 (UTC)
Subject: rpms/sugar-read/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sugar-read.spec, 1.1, 1.2
Message-ID: <20090406173258.E664E700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-read/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21168

Modified Files:
	.cvsignore sources sugar-read.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 66-1
- Support evince binding w/o document_links support #703
- Update translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 09:18:42 -0000	1.2
+++ .cvsignore	6 Apr 2009 17:32:25 -0000	1.3
@@ -1 +1 @@
-Read-65.tar.bz2
+Read-66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Mar 2009 09:18:42 -0000	1.2
+++ sources	6 Apr 2009 17:32:25 -0000	1.3
@@ -1 +1 @@
-3a7c7cc764e139691a7f57c16cd6433c  Read-65.tar.bz2
+92f10686798df2196a8f45922b2b9278  Read-66.tar.bz2


Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sugar-read.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar-read.spec	6 Mar 2009 09:18:42 -0000	1.1
+++ sugar-read.spec	6 Apr 2009 17:32:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name: sugar-read
-Version: 65
-Release: 2%{?dist}
+Version: 66
+Release: 1%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -45,6 +45,10 @@
 
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 66-1
+- Support evince binding w/o document_links support #703
+- Update translations
+
 * Fri Mar 06 2009 Simon Schampijer <simon at schampijer.de> - 65-2
 - make dependency only on gnome-python2-evince to not drag in 
   all gnome-python



From kyle at fedoraproject.org  Mon Apr  6 17:36:05 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon,  6 Apr 2009 17:36:05 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1501,
	1.1502 linux-2.6-execshield.patch, 1.104, 1.105
Message-ID: <20090406173605.5421C700FB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21925

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
- linux-2.6-execshield.patch: rebase for 2.6.30



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1501
retrieving revision 1.1502
diff -u -r1.1501 -r1.1502
--- kernel.spec	6 Apr 2009 15:44:28 -0000	1.1501
+++ kernel.spec	6 Apr 2009 17:35:34 -0000	1.1502
@@ -1101,7 +1101,7 @@
 #
 # Exec shield
 #
-#ApplyPatch linux-2.6-execshield.patch
+ApplyPatch linux-2.6-execshield.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -1826,6 +1826,9 @@
 #	                ||     ||
 %changelog
 * Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-execshield.patch: rebase for 2.6.30
+
+* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.29-git13
 - drop patches merged upstream:
   - fix-ppc-debug_kmap_atomic.patch

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- linux-2.6-execshield.patch	11 Mar 2009 16:28:50 -0000	1.104
+++ linux-2.6-execshield.patch	6 Apr 2009 17:35:34 -0000	1.105
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index dc27705..34ed3a2 100644
+index 5623c50..353a24e 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -10,7 +10,7 @@
  
  static inline void fill_ldt(struct desc_struct *desc,
  			    const struct user_desc *info)
-@@ -95,6 +96,9 @@ static inline int desc_empty(const void *ptr)
+@@ -94,6 +95,9 @@ static inline int desc_empty(const void *ptr)
  
  #define load_TLS(t, cpu) native_load_tls(t, cpu)
  #define set_ldt native_set_ldt
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -379,6 +383,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -380,6 +384,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -73,10 +73,10 @@
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index e299287..aaa8a35 100644
+index 7727aa8..5d6083c 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
-@@ -113,6 +113,9 @@ struct pv_cpu_ops {
+@@ -138,6 +138,9 @@ struct pv_cpu_ops {
  	void (*store_gdt)(struct desc_ptr *);
  	void (*store_idt)(struct desc_ptr *);
  	void (*set_ldt)(const void *desc, unsigned entries);
@@ -86,7 +86,7 @@
  	unsigned long (*store_tr)(void);
  	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
  #ifdef CONFIG_X86_64
-@@ -860,6 +863,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+@@ -953,6 +956,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
  {
  	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
  }
@@ -100,10 +100,10 @@
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 3bfd523..99c8119 100644
+index 34c5237..4fc080f 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
+@@ -159,6 +159,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -114,12 +114,12 @@
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 83492b1..a84c787 100644
+index c4f6678..0a680c0 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -708,6 +708,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
- 	 * we do "generic changes."
- 	 */
+@@ -789,6 +789,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+ 	/* Filter out anything that depends on CPUID levels we don't have */
+ 	filter_cpuid_features(c, true);
  
 +	/*
 +	 *  emulation of NX with segment limits unfortunately means
@@ -135,15 +135,14 @@
 +			clear_cpu_cap(c, X86_FEATURE_SEP);
 +	}
 +
-+
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
- 		char *p;
+ 		const char *p;
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index c6520a4..2066aa1 100644
+index 8e45f44..13c0535 100644
 --- a/arch/x86/kernel/paravirt.c
 +++ b/arch/x86/kernel/paravirt.c
-@@ -352,6 +352,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -369,6 +369,9 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.read_tscp = native_read_tscp,
  	.load_tr_desc = native_load_tr_desc,
  	.set_ldt = native_set_ldt,
@@ -154,19 +153,21 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index bd4da2a..60823d4 100644
+index 76f8f84..4118f17 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -343,6 +343,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+@@ -301,7 +301,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  void
  start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  {
 +	int cpu;
 +
- 	__asm__("movl %0, %%gs" : : "r"(0));
+ 	set_user_gs(regs, 0);
++
  	regs->fs		= 0;
  	set_fs(USER_DS);
-@@ -352,6 +354,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ 	regs->ds		= __USER_DS;
+@@ -310,6 +313,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -178,7 +179,7 @@
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -519,7 +526,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -356,7 +364,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -188,7 +189,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -692,3 +700,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -509,3 +518,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -230,34 +231,13 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
-diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
-index ce50546..bd6593a 100644
---- a/arch/x86/kernel/tlb_32.c
-+++ b/arch/x86/kernel/tlb_32.c
-@@ -2,6 +2,7 @@
- #include <linux/cpu.h>
- #include <linux/interrupt.h>
- 
-+#include <asm/desc.h>
- #include <asm/tlbflush.h>
- 
- DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -91,6 +92,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
- 	unsigned long cpu;
- 
- 	cpu = get_cpu();
-+	if (current->active_mm)
-+		load_user_cs_desc(cpu, current->active_mm);
- 
- 	if (!cpu_isset(cpu, flush_cpumask))
- 		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index a9e7548..af0f8f0 100644
+index a1d2883..453b616 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -160,6 +160,76 @@ static int lazy_iobitmap_copy(void)
- 
- 	return 0;
+@@ -118,6 +118,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
+ 	if (!user_mode_vm(regs))
+ 		die(str, regs, err);
  }
 +
 +static inline int
@@ -332,7 +312,7 @@
  #endif
  
  static void __kprobes
-@@ -323,6 +393,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -276,6 +346,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -362,7 +342,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -934,19 +1027,37 @@ dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs)
+@@ -888,19 +981,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -388,7 +368,7 @@
 -	info.si_signo = SIGILL;
 -	info.si_errno = 0;
 -	info.si_code = ILL_BADSTK;
--	info.si_addr = 0;
+-	info.si_addr = NULL;
 -	if (notify_die(DIE_TRAP, "iret exception",
 -			regs, error_code, 32, SIGILL) == NOTIFY_STOP)
 -		return;
@@ -409,11 +389,27 @@
  }
  #endif
  
+diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
+index fd3da1d..ac54294 100644
+--- a/arch/x86/mm/init.c
++++ b/arch/x86/mm/init.c
+@@ -163,7 +163,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+ 	set_nx();
+ 	if (nx_enabled)
+ 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
++	else
+ #endif
++	if (exec_shield)
++		printk(KERN_INFO "Using x86 segment limits to approximate "
++			"NX protection\n");
+ 
+ 	/* Enable PSE if available */
+ 	if (cpu_has_pse)
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 2cef050..a18ae07 100644
+index 749559e..ad9943c 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -617,7 +617,7 @@ static int disable_nx __initdata;
+@@ -602,7 +602,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -422,7 +418,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -626,14 +626,12 @@ static int __init noexec_setup(char *str)
+@@ -611,14 +611,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -443,20 +439,8 @@
  
  	return 0;
  }
-@@ -892,7 +890,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
- 	set_nx();
- 	if (nx_enabled)
- 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
-+	else
- #endif
-+	if (exec_shield)
-+		printk(KERN_INFO "Using x86 segment limits to approximate "
-+			"NX protection\n");
- 
- 	/* Enable PSE if available */
- 	if (cpu_has_pse)
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 56fe712..30d2be7 100644
+index 1658296..72056cf 100644
 --- a/arch/x86/mm/mmap.c
 +++ b/arch/x86/mm/mmap.c
 @@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void)
@@ -477,6 +461,28 @@
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
  }
+diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
+index 821e970..cc106da 100644
+--- a/arch/x86/mm/tlb.c
++++ b/arch/x86/mm/tlb.c
+@@ -6,6 +6,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ 
++#include <asm/desc.h>
+ #include <asm/tlbflush.h>
+ #include <asm/mmu_context.h>
+ #include <asm/apic.h>
+@@ -129,6 +130,9 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+ 	union smp_flush_state *f;
+ 
+ 	cpu = smp_processor_id();
++	if (current->active_mm)
++		load_user_cs_desc(cpu, current->active_mm);
++
+ 	/*
+ 	 * orig_rax contains the negated interrupt vector.
+ 	 * Use that to determine where the sender put the data.
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
 index 1241f11..3f2c44c 100644
 --- a/arch/x86/vdso/vdso32-setup.c
@@ -491,10 +497,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index b58e963..cdc83ce 100644
+index 82cd39a..702e3a0 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -282,6 +282,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -519,7 +525,7 @@
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long *frames;
-@@ -1232,6 +1250,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -792,6 +810,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -530,10 +536,10 @@
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 33b7235..ce1f044 100644
+index 40381df..f856fab 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
+@@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -542,7 +548,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -735,6 +735,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -721,6 +721,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -554,7 +560,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -754,6 +759,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -740,6 +745,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -570,7 +576,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -761,7 +775,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -747,7 +761,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex);
@@ -580,7 +586,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -926,7 +941,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -912,7 +927,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -589,34 +595,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
-diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 7e4877d..0c368c1 100644
---- a/fs/proc/array.c
-+++ b/fs/proc/array.c
-@@ -424,8 +424,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
- 		unlock_task_sighand(task, &flags);
- 	}
- 
--	if (!whole || num_threads < 2)
--		wchan = get_wchan(task);
-+	if (!whole || num_threads < 2) {
-+		const struct cred *cred;
-+
-+		wchan = 0;
-+		cred = __task_cred(task);
-+		if (current_uid() == cred->uid || current_euid() == cred->uid ||
-+			capable(CAP_SYS_NICE))
-+				wchan = get_wchan(task);
-+	}
-+
- 	if (!whole) {
- 		min_flt = task->min_flt;
- 		maj_flt = task->maj_flt;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 065cdf8..aa94aa9 100644
+index bff1f0d..88c5efa 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1135,7 +1135,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1138,7 +1138,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -632,10 +615,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 92915e8..4bfd050 100644
+index 0e80e26..af904ea 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -194,6 +194,9 @@ struct mm_struct {
+@@ -198,6 +198,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -663,12 +646,12 @@
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 8c216e0..79eca33 100644
+index b94f354..aed6221 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -98,6 +98,9 @@ struct robust_list_head;
- struct bio;
+@@ -99,6 +99,9 @@ struct bio;
  struct bts_tracer;
+ struct fs_struct;
  
 +extern int exec_shield;
 +extern int print_fatal_signals;
@@ -676,7 +659,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -346,6 +349,10 @@ extern int sysctl_max_map_count;
+@@ -351,6 +354,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -688,10 +671,10 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index c5ef44f..f7abce4 100644
+index 82350f8..d89dd29 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -86,6 +86,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
  #ifndef CONFIG_MMU
  extern int sysctl_nr_trim_pages;
  #endif
@@ -718,7 +701,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -379,6 +399,14 @@ static struct ctl_table kern_table[] = {
+@@ -377,6 +397,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -734,10 +717,10 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 00ced3e..931bc3b 100644
+index 4a38411..12ca810 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
  #include <linux/mempolicy.h>
  #include <linux/rmap.h>
  #include <linux/mmu_notifier.h>
@@ -745,7 +728,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-@@ -43,6 +44,18 @@
+@@ -44,6 +45,18 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -764,7 +747,7 @@
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -391,6 +404,8 @@ static inline void
+@@ -392,6 +405,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -773,7 +756,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -782,7 +765,7 @@
  }
  
  /*
-@@ -802,6 +819,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -803,6 +820,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -791,7 +774,7 @@
  		return prev;
  	}
  
-@@ -956,7 +975,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -957,7 +976,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -801,7 +784,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1436,13 +1456,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -822,7 +805,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1456,8 +1480,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -900,7 +883,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1532,6 +1624,14 @@ out:
+@@ -1536,6 +1628,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -915,7 +898,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1548,7 +1648,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -924,7 +907,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1858,10 +1958,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -941,7 +924,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2110,6 +2214,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2114,6 +2218,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);



From rmeggins at fedoraproject.org  Mon Apr  6 17:38:05 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  6 Apr 2009 17:38:05 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 fedora-ds-base-cvs.sh, 1.9,
	1.10 fedora-ds-base.spec, 1.29, 1.30 sources, 1.18, 1.19
Message-ID: <20090406173805.A2FC1700FB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22345/F-10

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
re-enable ppc builds


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base-cvs.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-ds-base-cvs.sh	1 Apr 2009 19:55:09 -0000	1.9
+++ fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC1
+CVSTAG=FedoraDirSvr_1_2_0_RC2
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fedora-ds-base.spec	2 Apr 2009 14:01:42 -0000	1.29
+++ fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.30
@@ -5,13 +5,11 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# the ppc builds have many problems - needs porting
-ExcludeArch:      ppc ppc64
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -171,6 +169,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
+- re-enable ppc builds
+
 * Thu Apr  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
 - exclude ppc builds - needs extensive porting work
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Apr 2009 19:55:09 -0000	1.18
+++ sources	6 Apr 2009 17:37:35 -0000	1.19
@@ -1 +1 @@
-9524493ace50fd8103e5c23950c91b96  fedora-ds-base-1.2.0.tar.bz2
+03ac48687f460d0c652cff727f0dda02  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Mon Apr  6 17:38:05 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  6 Apr 2009 17:38:05 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 fedora-ds-base-cvs.sh, 1.9,
	1.10 fedora-ds-base.spec, 1.23, 1.24 sources, 1.18, 1.19
Message-ID: <20090406173805.E1087700FB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22345/F-9

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
re-enable ppc builds


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base-cvs.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-ds-base-cvs.sh	1 Apr 2009 19:55:10 -0000	1.9
+++ fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC1
+CVSTAG=FedoraDirSvr_1_2_0_RC2
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fedora-ds-base.spec	2 Apr 2009 14:29:15 -0000	1.23
+++ fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.24
@@ -5,13 +5,11 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# the ppc builds have many problems - needs porting
-ExcludeArch:      ppc ppc64
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -171,6 +169,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
+- re-enable ppc builds
+
 * Thu Apr  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
 - exclude ppc builds - needs extensive porting work
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Apr 2009 19:55:10 -0000	1.18
+++ sources	6 Apr 2009 17:37:35 -0000	1.19
@@ -1 +1 @@
-9524493ace50fd8103e5c23950c91b96  fedora-ds-base-1.2.0.tar.bz2
+03ac48687f460d0c652cff727f0dda02  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Mon Apr  6 17:38:06 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  6 Apr 2009 17:38:06 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel fedora-ds-base-cvs.sh, 1.9,
	1.10 fedora-ds-base.spec, 1.29, 1.30 sources, 1.18, 1.19
Message-ID: <20090406173806.56972700FB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22345/devel

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
re-enable ppc builds


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base-cvs.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-ds-base-cvs.sh	1 Apr 2009 19:55:10 -0000	1.9
+++ fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC1
+CVSTAG=FedoraDirSvr_1_2_0_RC2
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fedora-ds-base.spec	2 Apr 2009 14:29:15 -0000	1.29
+++ fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.30
@@ -5,13 +5,11 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# the ppc builds have many problems - needs porting
-ExcludeArch:      ppc ppc64
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -171,6 +169,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
+- re-enable ppc builds
+
 * Thu Apr  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
 - exclude ppc builds - needs extensive porting work
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Apr 2009 19:55:11 -0000	1.18
+++ sources	6 Apr 2009 17:37:35 -0000	1.19
@@ -1 +1 @@
-9524493ace50fd8103e5c23950c91b96  fedora-ds-base-1.2.0.tar.bz2
+03ac48687f460d0c652cff727f0dda02  fedora-ds-base-1.2.0.tar.bz2



From erikos at fedoraproject.org  Mon Apr  6 17:45:11 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 17:45:11 +0000 (UTC)
Subject: rpms/sugar-browse/devel .cvsignore, 1.7, 1.8 sources, 1.8,
	1.9 sugar-browse.spec, 1.16, 1.17
Message-ID: <20090406174511.737F5700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24601

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 108-1
- Browse hangs when trying to open file:/// #456




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Apr 2009 15:15:35 -0000	1.7
+++ .cvsignore	6 Apr 2009 17:44:40 -0000	1.8
@@ -1 +1 @@
-Browse-107.tar.bz2
+Browse-108.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2009 15:15:35 -0000	1.8
+++ sources	6 Apr 2009 17:44:40 -0000	1.9
@@ -1 +1 @@
-afadb3bab2e2d2f55c135bec6c6c4a4c  Browse-107.tar.bz2
+148b5bfbe7f51749b51515a6009ded28  Browse-108.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-browse.spec	3 Apr 2009 15:15:35 -0000	1.16
+++ sugar-browse.spec	6 Apr 2009 17:44:40 -0000	1.17
@@ -1,5 +1,5 @@
 Name: sugar-browse
-Version: 107
+Version: 108
 Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 108-1
+- Browse hangs when trying to open file:/// #456
+
 * Fri Apr 03 2009 Simon Schampijer <simon at schampijer.de> - 107-1
 - Don't pick up the sugar theme #684
 - Add a static welcome-page #645



From nalin at fedoraproject.org  Mon Apr  6 17:46:00 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 17:46:00 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.183,1.184
Message-ID: <20090406174600.08681700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24774

Modified Files:
	krb5.spec 
Log Message:
- clean up buildprereq/prereqs, explicit mktemp requires, and add the 
  ldconfig for the -server-ldap subpackage (part of #225974)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- krb5.spec	6 Apr 2009 16:46:35 -0000	1.183
+++ krb5.spec	6 Apr 2009 17:45:29 -0000	1.184
@@ -103,9 +103,8 @@
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Prereq: grep, info, sh-utils, /sbin/install-info
-BuildPrereq: autoconf, bison, e2fsprogs-devel >= 1.35, flex, gawk
-BuildPrereq: gzip, ncurses-devel, rsh, texinfo, texinfo-tex, tar
+BuildRequires: autoconf, bison, e2fsprogs-devel >= 1.35, flex, gawk
+BuildRequires: gzip, ncurses-devel, rsh, texinfo, texinfo-tex, tar
 BuildRequires: tetex-latex
 BuildRequires: keyutils-libs-devel
 BuildRequires: libselinux-devel
@@ -138,8 +137,6 @@
 %package libs
 Summary: The shared libraries used by Kerberos 5.
 Group: System Environment/Libraries
-Prereq: grep, /sbin/ldconfig, sh-utils
-Obsoletes: krb5-configs
 
 %description libs
 Kerberos is a network authentication system. The krb5-libs package
@@ -150,7 +147,11 @@
 Group: System Environment/Daemons
 Summary: The KDC and related programs for Kerberos 5.
 Requires: %{name}-libs = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils, /sbin/chkconfig
+Requires(post): /sbin/install-info, chkconfig
+Requires(preun): /sbin/install-info, chkconfig, initscripts
+Requires(postun): initscripts
+# mktemp is used by krb5-send-pr
+Requires: mktemp
 
 %description server
 Kerberos is a network authentication system. The krb5-server package
@@ -175,7 +176,8 @@
 Summary: Kerberos 5 programs for use on workstations.
 Group: System Environment/Base
 Requires: %{name}-libs = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 # mktemp is used by krb5-send-pr
 Requires: mktemp
 
@@ -189,9 +191,6 @@
 Summary: Kerberos 5 clients for use on workstations.
 Group: System Environment/Base
 Requires: %{name}-workstation = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils
-# mktemp is used by krb5-send-pr
-Requires: mktemp
 
 %description workstation-clients
 Kerberos is a network authentication system. The krb5-workstation-clients
@@ -204,7 +203,8 @@
 Summary: Kerberos 5 servers for use on workstations.
 Group: System Environment/Base
 Requires: %{name}-workstation = %{version}-%{release}
-Prereq: grep, /sbin/install-info, /bin/sh, sh-utils
+Requires(post): initscripts
+Requires(postun): initscripts
 # mktemp is used by krb5-send-pr
 Requires: mktemp, xinetd, /etc/pam.d/%{login_pam_service}
 
@@ -232,6 +232,8 @@
   -workstation-servers gets upgraded, because it's gone now
 - move the libraries to /%{_lib}, but leave --libdir alone so that plugins
   get installed and are searched for in the same locations (#473333)
+- clean up buildprereq/prereqs, explicit mktemp requires, and add the
+  ldconfig for the -server-ldap subpackage (part of #225974)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
@@ -1599,6 +1601,10 @@
 
 %postun libs -p /sbin/ldconfig
 
+%post server-ldap -p /sbin/ldconfig
+
+%postun server-ldap -p /sbin/ldconfig
+
 %post server
 # Remove the init script for older servers.
 [ -x /etc/rc.d/init.d/krb5server ] && /sbin/chkconfig --del krb5server



From nalin at fedoraproject.org  Mon Apr  6 17:52:52 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 17:52:52 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.184,1.185
Message-ID: <20090406175252.6D229700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26115

Modified Files:
	krb5.spec 
Log Message:
- escape possible macros in the changelog (part of #225974)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- krb5.spec	6 Apr 2009 17:45:29 -0000	1.184
+++ krb5.spec	6 Apr 2009 17:52:21 -0000	1.185
@@ -230,10 +230,11 @@
 - turn off krb4 support (it won't be part of the 1.7 release, but do it now)
 - use triggeruns to properly shut down and disable krb524d when -server and
   -workstation-servers gets upgraded, because it's gone now
-- move the libraries to /%{_lib}, but leave --libdir alone so that plugins
+- move the libraries to /%%{_lib}, but leave --libdir alone so that plugins
   get installed and are searched for in the same locations (#473333)
 - clean up buildprereq/prereqs, explicit mktemp requires, and add the
   ldconfig for the -server-ldap subpackage (part of #225974)
+- escape possible macros in the changelog (part of #225974)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
@@ -1092,7 +1093,7 @@
 
 * Thu Feb  8 2001 Nalin Dahyabhai <nalin at redhat.com>
 - build alpha with -O0 for now
-- own %{_var}/kerberos
+- own %%{_var}/kerberos
 
 * Tue Feb  6 2001 Nalin Dahyabhai <nalin at redhat.com>
 - own the directories which are created for each package (#26342)
@@ -1129,7 +1130,7 @@
 - make krb5-libs obsolete the old krb5-configs package (#18351)
 - don't quit from the kpropd init script if there's no principal database so
   that you can propagate the first time without running kpropd manually
-- don't complain if /etc/ld.so.conf doesn't exist in the -libs %post
+- don't complain if /etc/ld.so.conf doesn't exist in the -libs %%post
 
 * Tue Sep 12 2000 Nalin Dahyabhai <nalin at redhat.com>
 - fix credential forwarding problem in klogind (goof in KRB5CCNAME handling)
@@ -1253,7 +1254,7 @@
 
 * Mon Apr 10 2000 Nalin Dahyabhai <nalin at redhat.com>
 - add LDCOMBINE=-lc to configure invocation to use libc versioning (bug #10653)
-- change Requires: for/in subpackages to include %{version}
+- change Requires: for/in subpackages to include %%{version}
 
 * Wed Apr 05 2000 Nalin Dahyabhai <nalin at redhat.com>
 - add man pages for kerberos(1), kvno(1), .k5login(5)



From nalin at fedoraproject.org  Mon Apr  6 18:01:23 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 18:01:23 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.185,1.186
Message-ID: <20090406180124.02B30700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734

Modified Files:
	krb5.spec 
Log Message:
- fixup summary texts (part of #225974)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- krb5.spec	6 Apr 2009 17:52:21 -0000	1.185
+++ krb5.spec	6 Apr 2009 18:00:53 -0000	1.186
@@ -10,7 +10,7 @@
 # For consistency with regular login.
 %define login_pam_service remote
 
-Summary: The Kerberos network authentication system.
+Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.6.3
 Release: 100%{?dist}
@@ -123,7 +123,7 @@
 practice of cleartext passwords.
 
 %package devel
-Summary: Development files needed to compile Kerberos 5 programs.
+Summary: Development files needed to compile Kerberos 5 programs
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}, e2fsprogs-devel
 Requires: keyutils-libs-devel, libselinux-devel
@@ -135,7 +135,7 @@
 to install this package.
 
 %package libs
-Summary: The shared libraries used by Kerberos 5.
+Summary: The shared libraries used by Kerberos 5
 Group: System Environment/Libraries
 
 %description libs
@@ -145,7 +145,7 @@
 
 %package server
 Group: System Environment/Daemons
-Summary: The KDC and related programs for Kerberos 5.
+Summary: The KDC and related programs for Kerberos 5
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info, chkconfig
 Requires(preun): /sbin/install-info, chkconfig, initscripts
@@ -162,7 +162,7 @@
 
 %package server-ldap
 Group: System Environment/Daemons
-Summary: The LDAP storage plugin for the Kerberos 5 KDC.
+Summary: The LDAP storage plugin for the Kerberos 5 KDC
 Requires: %{name}-server = %{version}-%{release}
 
 %description server-ldap
@@ -173,7 +173,7 @@
 realm, you need to install this package.
 
 %package workstation
-Summary: Kerberos 5 programs for use on workstations.
+Summary: Kerberos 5 programs for use on workstations
 Group: System Environment/Base
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info
@@ -188,7 +188,7 @@
 installed on every workstation.
 
 %package workstation-clients
-Summary: Kerberos 5 clients for use on workstations.
+Summary: Kerberos 5 clients for use on workstations
 Group: System Environment/Base
 Requires: %{name}-workstation = %{version}-%{release}
 
@@ -200,7 +200,7 @@
 these services.
 
 %package workstation-servers
-Summary: Kerberos 5 servers for use on workstations.
+Summary: Kerberos 5 servers for use on workstations
 Group: System Environment/Base
 Requires: %{name}-workstation = %{version}-%{release}
 Requires(post): initscripts
@@ -215,7 +215,7 @@
 installed on systems which are meant provide these services.
 
 %package pkinit-openssl
-Summary: The PKINIT module for Kerberos 5.
+Summary: The PKINIT module for Kerberos 5
 Group: System Environment/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -235,6 +235,7 @@
 - clean up buildprereq/prereqs, explicit mktemp requires, and add the
   ldconfig for the -server-ldap subpackage (part of #225974)
 - escape possible macros in the changelog (part of #225974)
+- fixup summary texts (part of #225974)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when



From mtasaka at fedoraproject.org  Mon Apr  6 18:04:19 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 18:04:19 +0000 (UTC)
Subject: rpms/alexandria/F-10
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch, NONE,
	1.1 alexandria-0.6.4.1-right-click-left-pane.patch, NONE,
	1.1 alexandria-0.6.4.1-use-2args-bindtextdomain.patch, NONE,
	1.1 alexandria.spec, 1.22,
	1.23 alexandria-0.6.3-crash_tooltips.patch, 1.1,
	NONE alexandria-0.6.3-library-utf8-string.patch, 1.1,
	NONE alexandria-0.6.4-bookentry-after-sorting.patch, 1.1, NONE
Message-ID: <20090406180419.2344E700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28783/F-10

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch 
	alexandria-0.6.4.1-right-click-left-pane.patch 
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
Removed Files:
	alexandria-0.6.3-crash_tooltips.patch 
	alexandria-0.6.3-library-utf8-string.patch 
	alexandria-0.6.4-bookentry-after-sorting.patch 
Log Message:
* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
- Workaround for strange behavior with right click on left pane
  (alexandria-Bugs-25021)


alexandria-0.6.4.1-right-click-left-pane-morefix.patch:

--- NEW FILE alexandria-0.6.4.1-right-click-left-pane-morefix.patch ---
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1070)
+++ lib/alexandria/ui/ui_manager.rb	(working copy)
@@ -335,6 +335,7 @@
 
           
           if library_already_selected
+            sensitize_library selected_library
             Gtk.idle_add do
               menu.popup(nil, nil, event.button, event.time)
               false

alexandria-0.6.4.1-right-click-left-pane.patch:

--- NEW FILE alexandria-0.6.4.1-right-click-left-pane.patch ---
Index: lib/alexandria/ui/callbacks.rb
===================================================================
--- lib/alexandria/ui/callbacks.rb	(revision 1067)
+++ lib/alexandria/ui/callbacks.rb	(revision 1070)
@@ -19,6 +19,9 @@
 module Alexandria
   module UI
     module Callbacks
+
+      include Logging
+
       def on_new widget, event
         name = Library.generate_new_name(@libraries.all_libraries)
         library = Library.load(name)
@@ -208,6 +211,11 @@
       def on_delete widget, event
         library = selected_library
         books = @library_listview.focus? ? nil : selected_books
+        last_library = (@libraries.all_regular_libraries.length == 1)
+        if last_library
+          log.warn { "Attempted to delete last library, fix GUI" }
+          return
+        end
         if library.empty? or ReallyDeleteDialog.new(@main_app,
                                                     library,
                                                     books).ok?
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1067)
+++ lib/alexandria/ui/ui_manager.rb	(revision 1070)
@@ -306,6 +306,7 @@
 
         if event_is_right_click event
           log.debug { "library right click!" }
+          library_already_selected = true
           if path = widget.get_path_at_pos(event.x, event.y)
             obj, path = widget.is_a?(Gtk::TreeView) \
               ? [widget.selection, path.first] : [widget, path]
@@ -313,6 +314,7 @@
 
             unless obj.path_is_selected?(path)
               log.debug { "Select #{path}" }
+              library_already_selected = false
               widget.unselect_all
               obj.select_path(path)
             end
@@ -321,10 +323,24 @@
           end
 
           menu = determine_library_popup widget, event
-          Gtk.idle_add do
-            menu.popup(nil, nil, event.button, event.time)
-            false
+
+          # Fixes part of bug #25021.
+          #
+          # If the library was not selected when it was right-clicked
+          # we should select the library first (we call on_focus
+          # manually, since the above call to obj.select_path(path) doesn't
+          # seem to suffice).
+          #
+          # Then we wait a while and only *then* pop up the menu.
+
+          
+          if library_already_selected
+            Gtk.idle_add do
+              menu.popup(nil, nil, event.button, event.time)
+              false
+            end
           end
+          
         end
       end
 

alexandria-0.6.4.1-use-2args-bindtextdomain.patch:

--- NEW FILE alexandria-0.6.4.1-use-2args-bindtextdomain.patch ---
Index: lib/alexandria/models/library.rb
===================================================================
--- lib/alexandria/models/library.rb	(revision 1066)
+++ lib/alexandria/models/library.rb	(revision 1067)
@@ -41,7 +41,7 @@
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a
     include Observable
Index: lib/alexandria/book_providers/renaud.rb
===================================================================
--- lib/alexandria/book_providers/renaud.rb	(revision 1066)
+++ lib/alexandria/book_providers/renaud.rb	(revision 1067)
@@ -24,7 +24,7 @@
   class BookProviders
     class RENAUDProvider < GenericProvider
       include GetText
-      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
       BASE_URI = "http://www.renaud-bray.com/"
       ACCENTUATED_CHARS = "??????????????????????????????????????????"
 
Index: lib/alexandria/book_providers/amazon_aws.rb
===================================================================
--- lib/alexandria/book_providers/amazon_aws.rb	(revision 1066)
+++ lib/alexandria/book_providers/amazon_aws.rb	(revision 1067)
@@ -25,7 +25,7 @@
     class AmazonProvider < GenericProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       #CACHE_DIR = File.join(Alexandria::Library::DIR, '.amazon_cache')
 
Index: lib/alexandria/book_providers/mcu.rb
===================================================================
--- lib/alexandria/book_providers/mcu.rb	(revision 1066)
+++ lib/alexandria/book_providers/mcu.rb	(revision 1067)
@@ -27,7 +27,7 @@
     class MCUProvider < GenericProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       LANGUAGES = {
         'es' => '1'
Index: lib/alexandria/book_providers/proxis.rb
===================================================================
--- lib/alexandria/book_providers/proxis.rb	(revision 1066)
+++ lib/alexandria/book_providers/proxis.rb	(revision 1067)
@@ -23,7 +23,7 @@
     class ProxisProvider < GenericProvider
       include GetText
       include Logging
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       LANGUAGES = {
         'nl' => '1',
Index: lib/alexandria/book_providers/z3950.rb
===================================================================
--- lib/alexandria/book_providers/z3950.rb	(revision 1066)
+++ lib/alexandria/book_providers/z3950.rb	(revision 1067)
@@ -26,7 +26,7 @@
     class Z3950Provider < AbstractProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(name="Z3950", fullname="Z39.50")
         super
@@ -174,7 +174,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("LOC", _("Library of Congress (Usa)"))
@@ -207,7 +207,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("BL", _("British Library"))
@@ -296,7 +296,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("SBN", "Servizio Bibliotecario Nazionale (Italy)")
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb	(revision 1066)
+++ lib/alexandria/book_providers.rb	(revision 1067)
@@ -25,7 +25,7 @@
     include Singleton
     include Observable
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS,
     SEARCH_BY_KEYWORD = (0..3).to_a
Index: lib/alexandria/import_library.rb
===================================================================
--- lib/alexandria/import_library.rb	(revision 1066)
+++ lib/alexandria/import_library.rb	(revision 1067)
@@ -22,7 +22,7 @@
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     def self.all
       [
Index: lib/alexandria/export_library.rb
===================================================================
--- lib/alexandria/export_library.rb	(revision 1066)
+++ lib/alexandria/export_library.rb	(revision 1067)
@@ -102,7 +102,7 @@
     include GetText
     include Logging
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     def self.all
       [
Index: lib/alexandria/smart_library.rb
===================================================================
--- lib/alexandria/smart_library.rb	(revision 1066)
+++ lib/alexandria/smart_library.rb	(revision 1067)
@@ -23,7 +23,7 @@
     include Logging
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     ALL_RULES, ANY_RULE = 1, 2
     attr_reader :name
@@ -290,7 +290,7 @@
     class Rule
       include GetText
       extend GetText
-      bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       attr_accessor :operand, :operation, :value
 
@@ -343,7 +343,7 @@
       module Operands
         include GetText
         extend GetText
-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
         LEFT = [
                 LeftOperand.new(:title, _("Title"), String),
@@ -375,7 +375,7 @@
         include Logging
         include GetText
         extend GetText
-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
         IS_TRUE = Operator.new(
                                :is_true,
Index: lib/alexandria/about.rb
===================================================================
--- lib/alexandria/about.rb	(revision 1066)
+++ lib/alexandria/about.rb	(revision 1067)
@@ -20,7 +20,7 @@
   TITLE = 'Alexandria'
   TEXTDOMAIN = 'alexandria'
   extend GetText
-  bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+  bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
   DESCRIPTION = _('A program to help you manage your book collection.')
   COPYRIGHT = "Copyright (C) 2004,2005,2006 Laurent Sansonetti\n" +
     "Copyright (C) 2007,2008,2009 Alexandria Contributors"
Index: lib/alexandria/ui/dialogs/misc_dialogs.rb
===================================================================
--- lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class ConflictWhileCopyingDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, book)
         super(parent,
@@ -42,7 +42,7 @@
 
     class ReallyDeleteDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, books=nil)
         # Deleting a library.
Index: lib/alexandria/ui/dialogs/book_properties_dialog_base.rb
===================================================================
--- lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class BookPropertiesDialogBase < GladeBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       COVER_MAXWIDTH = 140    # pixels
 
Index: lib/alexandria/ui/dialogs/new_book_dialog_manual.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class NewBookDialogManual < BookPropertiesDialogBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover")
       def initialize(parent, library, &on_add_cb)
Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb
===================================================================
--- lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class SmartLibraryPropertiesDialogBase < Gtk::Dialog
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       attr_reader :predicate_operator_rule
 
Index: lib/alexandria/ui/dialogs/export_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class ConfirmEraseDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, filename)
         super(parent, _("File already exists"),
@@ -42,7 +42,7 @@
     class ExportDialog < Gtk::FileChooserDialog
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       FORMATS = Alexandria::ExportFormat.all
       THEMES = Alexandria::WebTheme.all
Index: lib/alexandria/ui/dialogs/preferences_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1067)
@@ -95,7 +95,7 @@
 
     class ProviderPreferencesDialog < ProviderPreferencesBaseDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, provider)
         super(_("Preferences for %s") % provider.fullname,
@@ -120,7 +120,7 @@
 
     class NewProviderDialog <  ProviderPreferencesBaseDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent)
         super(_("New Provider"),
@@ -209,7 +209,7 @@
     class PreferencesDialog < GladeBase
       include Alexandria::Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, &changed_block)
         super('preferences_dialog.glade')
Index: lib/alexandria/ui/dialogs/new_book_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1067)
@@ -26,7 +26,7 @@
   module UI
     class KeepBadISBNDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, book)
         super(parent, _("Invalid ISBN '%s'") % book.isbn,
@@ -51,7 +51,7 @@
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, selected_library=nil, &block)
         super('new_book_dialog.glade')
Index: lib/alexandria/ui/dialogs/new_smart_library_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, &block)
         super(parent)
Index: lib/alexandria/ui/dialogs/book_properties_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1067)
@@ -21,7 +21,7 @@
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, book)
         super(parent, library.cover(book))
Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, smart_library, &block)
         super(parent)
Index: lib/alexandria/ui/dialogs/acquire_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1067)
@@ -213,7 +213,7 @@
       include GetText
       include Logging
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, selected_library=nil, &block)
         super('acquire_dialog.glade')
Index: lib/alexandria/ui/dialogs/about_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class AboutDialog < Gtk::AboutDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       GPL = <<EOL
 Alexandria is free software; you can redistribute it and/or
Index: lib/alexandria/ui/dialogs/import_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1067)
@@ -30,7 +30,7 @@
   module UI
     class SkipEntryDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, message)
         super(parent, _("Error while importing"),
@@ -53,7 +53,7 @@
       include GetText
       include Logging
 
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       FILTERS = Alexandria::ImportFilter.all
 
Index: lib/alexandria/ui/main_app.rb
===================================================================
--- lib/alexandria/ui/main_app.rb	(revision 1066)
+++ lib/alexandria/ui/main_app.rb	(revision 1067)
@@ -43,7 +43,7 @@
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     class MainApp
       include Logging
Index: lib/alexandria/ui/listview.rb
===================================================================
--- lib/alexandria/ui/listview.rb	(revision 1066)
+++ lib/alexandria/ui/listview.rb	(revision 1067)
@@ -20,7 +20,7 @@
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
     class ListViewManager
       include Logging
       include GetText
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1066)
+++ lib/alexandria/ui/ui_manager.rb	(revision 1067)
@@ -24,7 +24,7 @@
         :iconview_model, :filtered_model, :on_books_selection_changed
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       module Columns
         COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
Index: lib/alexandria/ui/libraries_combo.rb
===================================================================
--- lib/alexandria/ui/libraries_combo.rb	(revision 1066)
+++ lib/alexandria/ui/libraries_combo.rb	(revision 1067)
@@ -19,7 +19,7 @@
 class Gtk::ComboBox
   include GetText
   extend GetText
-  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
   def populate_with_libraries(libraries, selected_library)
     libraries_names = libraries.map { |x| x.name }


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- alexandria.spec	25 Mar 2009 19:30:07 -0000	1.22
+++ alexandria.spec	6 Apr 2009 18:03:48 -0000	1.23
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,8 +19,15 @@
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Ref: upstream bug 24568
-#Patch0:		alexandria-0.6.4-bookentry-after-sorting.patch
+# Use 2 arguments format for bindtextdomain() instead of
+# deprecated 4 arguments format
+# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
+Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
+# Workaround for issue with right click on left pane
+# ref: alexandria-Bugs-25021
+Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# And try more fix
+Patch2:		alexandria-0.6.4.1-right-click-left-pane-morefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -70,15 +77,13 @@
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-#%%patch0 -p0 -b .up24568
+%patch0 -p0 -b .up24882
+%patch1 -p0 -b .up25021
+%patch2 -p0 -b .moretry
 
 %build
 rake build
 
-# ruby(gettext) >= 2.0.0 no longer accepts 4 arguments for
-# bindtextdomain()
-find . -name \*.rb | xargs \
-	%{__sed} -i.bind -e '/bindtextdomain/s|(\([^,][^,]*\), nil, nil, \([^,][^,]*\))|(\1, :charset => \2)|'
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -196,8 +201,13 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
+- Workaround for strange behavior with right click on left pane
+  (alexandria-Bugs-25021)
+
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-2
 - Fix arguments of bindtextdomain() for ruby(gettext) 2.0.0
+  (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
 - 0.6.4.1 (fixing upstream bug 24568)


--- alexandria-0.6.3-crash_tooltips.patch DELETED ---


--- alexandria-0.6.3-library-utf8-string.patch DELETED ---


--- alexandria-0.6.4-bookentry-after-sorting.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Apr  6 18:04:19 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 18:04:19 +0000 (UTC)
Subject: rpms/alexandria/F-9
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch, NONE,
	1.1 alexandria-0.6.4.1-right-click-left-pane.patch, NONE,
	1.1 alexandria-0.6.4.1-use-2args-bindtextdomain.patch, NONE,
	1.1 alexandria.spec, 1.22,
	1.23 alexandria-0.6.3-crash_tooltips.patch, 1.1,
	NONE alexandria-0.6.3-library-utf8-string.patch, 1.1,
	NONE alexandria-0.6.4-bookentry-after-sorting.patch, 1.1, NONE
Message-ID: <20090406180419.A83B7700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28783/F-9

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch 
	alexandria-0.6.4.1-right-click-left-pane.patch 
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
Removed Files:
	alexandria-0.6.3-crash_tooltips.patch 
	alexandria-0.6.3-library-utf8-string.patch 
	alexandria-0.6.4-bookentry-after-sorting.patch 
Log Message:
* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
- Workaround for strange behavior with right click on left pane
  (alexandria-Bugs-25021)


alexandria-0.6.4.1-right-click-left-pane-morefix.patch:

--- NEW FILE alexandria-0.6.4.1-right-click-left-pane-morefix.patch ---
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1070)
+++ lib/alexandria/ui/ui_manager.rb	(working copy)
@@ -335,6 +335,7 @@
 
           
           if library_already_selected
+            sensitize_library selected_library
             Gtk.idle_add do
               menu.popup(nil, nil, event.button, event.time)
               false

alexandria-0.6.4.1-right-click-left-pane.patch:

--- NEW FILE alexandria-0.6.4.1-right-click-left-pane.patch ---
Index: lib/alexandria/ui/callbacks.rb
===================================================================
--- lib/alexandria/ui/callbacks.rb	(revision 1067)
+++ lib/alexandria/ui/callbacks.rb	(revision 1070)
@@ -19,6 +19,9 @@
 module Alexandria
   module UI
     module Callbacks
+
+      include Logging
+
       def on_new widget, event
         name = Library.generate_new_name(@libraries.all_libraries)
         library = Library.load(name)
@@ -208,6 +211,11 @@
       def on_delete widget, event
         library = selected_library
         books = @library_listview.focus? ? nil : selected_books
+        last_library = (@libraries.all_regular_libraries.length == 1)
+        if last_library
+          log.warn { "Attempted to delete last library, fix GUI" }
+          return
+        end
         if library.empty? or ReallyDeleteDialog.new(@main_app,
                                                     library,
                                                     books).ok?
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1067)
+++ lib/alexandria/ui/ui_manager.rb	(revision 1070)
@@ -306,6 +306,7 @@
 
         if event_is_right_click event
           log.debug { "library right click!" }
+          library_already_selected = true
           if path = widget.get_path_at_pos(event.x, event.y)
             obj, path = widget.is_a?(Gtk::TreeView) \
               ? [widget.selection, path.first] : [widget, path]
@@ -313,6 +314,7 @@
 
             unless obj.path_is_selected?(path)
               log.debug { "Select #{path}" }
+              library_already_selected = false
               widget.unselect_all
               obj.select_path(path)
             end
@@ -321,10 +323,24 @@
           end
 
           menu = determine_library_popup widget, event
-          Gtk.idle_add do
-            menu.popup(nil, nil, event.button, event.time)
-            false
+
+          # Fixes part of bug #25021.
+          #
+          # If the library was not selected when it was right-clicked
+          # we should select the library first (we call on_focus
+          # manually, since the above call to obj.select_path(path) doesn't
+          # seem to suffice).
+          #
+          # Then we wait a while and only *then* pop up the menu.
+
+          
+          if library_already_selected
+            Gtk.idle_add do
+              menu.popup(nil, nil, event.button, event.time)
+              false
+            end
           end
+          
         end
       end
 

alexandria-0.6.4.1-use-2args-bindtextdomain.patch:

--- NEW FILE alexandria-0.6.4.1-use-2args-bindtextdomain.patch ---
Index: lib/alexandria/models/library.rb
===================================================================
--- lib/alexandria/models/library.rb	(revision 1066)
+++ lib/alexandria/models/library.rb	(revision 1067)
@@ -41,7 +41,7 @@
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a
     include Observable
Index: lib/alexandria/book_providers/renaud.rb
===================================================================
--- lib/alexandria/book_providers/renaud.rb	(revision 1066)
+++ lib/alexandria/book_providers/renaud.rb	(revision 1067)
@@ -24,7 +24,7 @@
   class BookProviders
     class RENAUDProvider < GenericProvider
       include GetText
-      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
       BASE_URI = "http://www.renaud-bray.com/"
       ACCENTUATED_CHARS = "??????????????????????????????????????????"
 
Index: lib/alexandria/book_providers/amazon_aws.rb
===================================================================
--- lib/alexandria/book_providers/amazon_aws.rb	(revision 1066)
+++ lib/alexandria/book_providers/amazon_aws.rb	(revision 1067)
@@ -25,7 +25,7 @@
     class AmazonProvider < GenericProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       #CACHE_DIR = File.join(Alexandria::Library::DIR, '.amazon_cache')
 
Index: lib/alexandria/book_providers/mcu.rb
===================================================================
--- lib/alexandria/book_providers/mcu.rb	(revision 1066)
+++ lib/alexandria/book_providers/mcu.rb	(revision 1067)
@@ -27,7 +27,7 @@
     class MCUProvider < GenericProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       LANGUAGES = {
         'es' => '1'
Index: lib/alexandria/book_providers/proxis.rb
===================================================================
--- lib/alexandria/book_providers/proxis.rb	(revision 1066)
+++ lib/alexandria/book_providers/proxis.rb	(revision 1067)
@@ -23,7 +23,7 @@
     class ProxisProvider < GenericProvider
       include GetText
       include Logging
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       LANGUAGES = {
         'nl' => '1',
Index: lib/alexandria/book_providers/z3950.rb
===================================================================
--- lib/alexandria/book_providers/z3950.rb	(revision 1066)
+++ lib/alexandria/book_providers/z3950.rb	(revision 1067)
@@ -26,7 +26,7 @@
     class Z3950Provider < AbstractProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(name="Z3950", fullname="Z39.50")
         super
@@ -174,7 +174,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("LOC", _("Library of Congress (Usa)"))
@@ -207,7 +207,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("BL", _("British Library"))
@@ -296,7 +296,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("SBN", "Servizio Bibliotecario Nazionale (Italy)")
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb	(revision 1066)
+++ lib/alexandria/book_providers.rb	(revision 1067)
@@ -25,7 +25,7 @@
     include Singleton
     include Observable
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS,
     SEARCH_BY_KEYWORD = (0..3).to_a
Index: lib/alexandria/import_library.rb
===================================================================
--- lib/alexandria/import_library.rb	(revision 1066)
+++ lib/alexandria/import_library.rb	(revision 1067)
@@ -22,7 +22,7 @@
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     def self.all
       [
Index: lib/alexandria/export_library.rb
===================================================================
--- lib/alexandria/export_library.rb	(revision 1066)
+++ lib/alexandria/export_library.rb	(revision 1067)
@@ -102,7 +102,7 @@
     include GetText
     include Logging
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     def self.all
       [
Index: lib/alexandria/smart_library.rb
===================================================================
--- lib/alexandria/smart_library.rb	(revision 1066)
+++ lib/alexandria/smart_library.rb	(revision 1067)
@@ -23,7 +23,7 @@
     include Logging
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     ALL_RULES, ANY_RULE = 1, 2
     attr_reader :name
@@ -290,7 +290,7 @@
     class Rule
       include GetText
       extend GetText
-      bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       attr_accessor :operand, :operation, :value
 
@@ -343,7 +343,7 @@
       module Operands
         include GetText
         extend GetText
-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
         LEFT = [
                 LeftOperand.new(:title, _("Title"), String),
@@ -375,7 +375,7 @@
         include Logging
         include GetText
         extend GetText
-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
         IS_TRUE = Operator.new(
                                :is_true,
Index: lib/alexandria/about.rb
===================================================================
--- lib/alexandria/about.rb	(revision 1066)
+++ lib/alexandria/about.rb	(revision 1067)
@@ -20,7 +20,7 @@
   TITLE = 'Alexandria'
   TEXTDOMAIN = 'alexandria'
   extend GetText
-  bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+  bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
   DESCRIPTION = _('A program to help you manage your book collection.')
   COPYRIGHT = "Copyright (C) 2004,2005,2006 Laurent Sansonetti\n" +
     "Copyright (C) 2007,2008,2009 Alexandria Contributors"
Index: lib/alexandria/ui/dialogs/misc_dialogs.rb
===================================================================
--- lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class ConflictWhileCopyingDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, book)
         super(parent,
@@ -42,7 +42,7 @@
 
     class ReallyDeleteDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, books=nil)
         # Deleting a library.
Index: lib/alexandria/ui/dialogs/book_properties_dialog_base.rb
===================================================================
--- lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class BookPropertiesDialogBase < GladeBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       COVER_MAXWIDTH = 140    # pixels
 
Index: lib/alexandria/ui/dialogs/new_book_dialog_manual.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class NewBookDialogManual < BookPropertiesDialogBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover")
       def initialize(parent, library, &on_add_cb)
Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb
===================================================================
--- lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class SmartLibraryPropertiesDialogBase < Gtk::Dialog
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       attr_reader :predicate_operator_rule
 
Index: lib/alexandria/ui/dialogs/export_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class ConfirmEraseDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, filename)
         super(parent, _("File already exists"),
@@ -42,7 +42,7 @@
     class ExportDialog < Gtk::FileChooserDialog
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       FORMATS = Alexandria::ExportFormat.all
       THEMES = Alexandria::WebTheme.all
Index: lib/alexandria/ui/dialogs/preferences_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1067)
@@ -95,7 +95,7 @@
 
     class ProviderPreferencesDialog < ProviderPreferencesBaseDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, provider)
         super(_("Preferences for %s") % provider.fullname,
@@ -120,7 +120,7 @@
 
     class NewProviderDialog <  ProviderPreferencesBaseDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent)
         super(_("New Provider"),
@@ -209,7 +209,7 @@
     class PreferencesDialog < GladeBase
       include Alexandria::Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, &changed_block)
         super('preferences_dialog.glade')
Index: lib/alexandria/ui/dialogs/new_book_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1067)
@@ -26,7 +26,7 @@
   module UI
     class KeepBadISBNDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, book)
         super(parent, _("Invalid ISBN '%s'") % book.isbn,
@@ -51,7 +51,7 @@
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, selected_library=nil, &block)
         super('new_book_dialog.glade')
Index: lib/alexandria/ui/dialogs/new_smart_library_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, &block)
         super(parent)
Index: lib/alexandria/ui/dialogs/book_properties_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1067)
@@ -21,7 +21,7 @@
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, book)
         super(parent, library.cover(book))
Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, smart_library, &block)
         super(parent)
Index: lib/alexandria/ui/dialogs/acquire_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1067)
@@ -213,7 +213,7 @@
       include GetText
       include Logging
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, selected_library=nil, &block)
         super('acquire_dialog.glade')
Index: lib/alexandria/ui/dialogs/about_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class AboutDialog < Gtk::AboutDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       GPL = <<EOL
 Alexandria is free software; you can redistribute it and/or
Index: lib/alexandria/ui/dialogs/import_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1067)
@@ -30,7 +30,7 @@
   module UI
     class SkipEntryDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, message)
         super(parent, _("Error while importing"),
@@ -53,7 +53,7 @@
       include GetText
       include Logging
 
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       FILTERS = Alexandria::ImportFilter.all
 
Index: lib/alexandria/ui/main_app.rb
===================================================================
--- lib/alexandria/ui/main_app.rb	(revision 1066)
+++ lib/alexandria/ui/main_app.rb	(revision 1067)
@@ -43,7 +43,7 @@
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     class MainApp
       include Logging
Index: lib/alexandria/ui/listview.rb
===================================================================
--- lib/alexandria/ui/listview.rb	(revision 1066)
+++ lib/alexandria/ui/listview.rb	(revision 1067)
@@ -20,7 +20,7 @@
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
     class ListViewManager
       include Logging
       include GetText
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1066)
+++ lib/alexandria/ui/ui_manager.rb	(revision 1067)
@@ -24,7 +24,7 @@
         :iconview_model, :filtered_model, :on_books_selection_changed
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       module Columns
         COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
Index: lib/alexandria/ui/libraries_combo.rb
===================================================================
--- lib/alexandria/ui/libraries_combo.rb	(revision 1066)
+++ lib/alexandria/ui/libraries_combo.rb	(revision 1067)
@@ -19,7 +19,7 @@
 class Gtk::ComboBox
   include GetText
   extend GetText
-  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
   def populate_with_libraries(libraries, selected_library)
     libraries_names = libraries.map { |x| x.name }


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- alexandria.spec	25 Mar 2009 19:30:07 -0000	1.22
+++ alexandria.spec	6 Apr 2009 18:03:49 -0000	1.23
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,8 +19,15 @@
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Ref: upstream bug 24568
-#Patch0:		alexandria-0.6.4-bookentry-after-sorting.patch
+# Use 2 arguments format for bindtextdomain() instead of
+# deprecated 4 arguments format
+# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
+Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
+# Workaround for issue with right click on left pane
+# ref: alexandria-Bugs-25021
+Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# And try more fix
+Patch2:		alexandria-0.6.4.1-right-click-left-pane-morefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -70,15 +77,13 @@
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-#%%patch0 -p0 -b .up24568
+%patch0 -p0 -b .up24882
+%patch1 -p0 -b .up25021
+%patch2 -p0 -b .moretry
 
 %build
 rake build
 
-# ruby(gettext) >= 2.0.0 no longer accepts 4 arguments for
-# bindtextdomain()
-find . -name \*.rb | xargs \
-	%{__sed} -i.bind -e '/bindtextdomain/s|(\([^,][^,]*\), nil, nil, \([^,][^,]*\))|(\1, :charset => \2)|'
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -196,8 +201,13 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
+- Workaround for strange behavior with right click on left pane
+  (alexandria-Bugs-25021)
+
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-2
 - Fix arguments of bindtextdomain() for ruby(gettext) 2.0.0
+  (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
 - 0.6.4.1 (fixing upstream bug 24568)


--- alexandria-0.6.3-crash_tooltips.patch DELETED ---


--- alexandria-0.6.3-library-utf8-string.patch DELETED ---


--- alexandria-0.6.4-bookentry-after-sorting.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Apr  6 18:04:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 18:04:20 +0000 (UTC)
Subject: rpms/alexandria/devel
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch, NONE,
	1.1 alexandria-0.6.4.1-right-click-left-pane.patch, NONE,
	1.1 alexandria-0.6.4.1-use-2args-bindtextdomain.patch, NONE,
	1.1 alexandria.spec, 1.29,
	1.30 alexandria-0.6.3-crash_tooltips.patch, 1.1,
	NONE alexandria-0.6.3-library-utf8-string.patch, 1.5,
	NONE alexandria-0.6.4-bookentry-after-sorting.patch, 1.1, NONE
Message-ID: <20090406180420.52FDA700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28783/devel

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch 
	alexandria-0.6.4.1-right-click-left-pane.patch 
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
Removed Files:
	alexandria-0.6.3-crash_tooltips.patch 
	alexandria-0.6.3-library-utf8-string.patch 
	alexandria-0.6.4-bookentry-after-sorting.patch 
Log Message:
* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
- Workaround for strange behavior with right click on left pane
  (alexandria-Bugs-25021)


alexandria-0.6.4.1-right-click-left-pane-morefix.patch:

--- NEW FILE alexandria-0.6.4.1-right-click-left-pane-morefix.patch ---
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1070)
+++ lib/alexandria/ui/ui_manager.rb	(working copy)
@@ -335,6 +335,7 @@
 
           
           if library_already_selected
+            sensitize_library selected_library
             Gtk.idle_add do
               menu.popup(nil, nil, event.button, event.time)
               false

alexandria-0.6.4.1-right-click-left-pane.patch:

--- NEW FILE alexandria-0.6.4.1-right-click-left-pane.patch ---
Index: lib/alexandria/ui/callbacks.rb
===================================================================
--- lib/alexandria/ui/callbacks.rb	(revision 1067)
+++ lib/alexandria/ui/callbacks.rb	(revision 1070)
@@ -19,6 +19,9 @@
 module Alexandria
   module UI
     module Callbacks
+
+      include Logging
+
       def on_new widget, event
         name = Library.generate_new_name(@libraries.all_libraries)
         library = Library.load(name)
@@ -208,6 +211,11 @@
       def on_delete widget, event
         library = selected_library
         books = @library_listview.focus? ? nil : selected_books
+        last_library = (@libraries.all_regular_libraries.length == 1)
+        if last_library
+          log.warn { "Attempted to delete last library, fix GUI" }
+          return
+        end
         if library.empty? or ReallyDeleteDialog.new(@main_app,
                                                     library,
                                                     books).ok?
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1067)
+++ lib/alexandria/ui/ui_manager.rb	(revision 1070)
@@ -306,6 +306,7 @@
 
         if event_is_right_click event
           log.debug { "library right click!" }
+          library_already_selected = true
           if path = widget.get_path_at_pos(event.x, event.y)
             obj, path = widget.is_a?(Gtk::TreeView) \
               ? [widget.selection, path.first] : [widget, path]
@@ -313,6 +314,7 @@
 
             unless obj.path_is_selected?(path)
               log.debug { "Select #{path}" }
+              library_already_selected = false
               widget.unselect_all
               obj.select_path(path)
             end
@@ -321,10 +323,24 @@
           end
 
           menu = determine_library_popup widget, event
-          Gtk.idle_add do
-            menu.popup(nil, nil, event.button, event.time)
-            false
+
+          # Fixes part of bug #25021.
+          #
+          # If the library was not selected when it was right-clicked
+          # we should select the library first (we call on_focus
+          # manually, since the above call to obj.select_path(path) doesn't
+          # seem to suffice).
+          #
+          # Then we wait a while and only *then* pop up the menu.
+
+          
+          if library_already_selected
+            Gtk.idle_add do
+              menu.popup(nil, nil, event.button, event.time)
+              false
+            end
           end
+          
         end
       end
 

alexandria-0.6.4.1-use-2args-bindtextdomain.patch:

--- NEW FILE alexandria-0.6.4.1-use-2args-bindtextdomain.patch ---
Index: lib/alexandria/models/library.rb
===================================================================
--- lib/alexandria/models/library.rb	(revision 1066)
+++ lib/alexandria/models/library.rb	(revision 1067)
@@ -41,7 +41,7 @@
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a
     include Observable
Index: lib/alexandria/book_providers/renaud.rb
===================================================================
--- lib/alexandria/book_providers/renaud.rb	(revision 1066)
+++ lib/alexandria/book_providers/renaud.rb	(revision 1067)
@@ -24,7 +24,7 @@
   class BookProviders
     class RENAUDProvider < GenericProvider
       include GetText
-      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
       BASE_URI = "http://www.renaud-bray.com/"
       ACCENTUATED_CHARS = "??????????????????????????????????????????"
 
Index: lib/alexandria/book_providers/amazon_aws.rb
===================================================================
--- lib/alexandria/book_providers/amazon_aws.rb	(revision 1066)
+++ lib/alexandria/book_providers/amazon_aws.rb	(revision 1067)
@@ -25,7 +25,7 @@
     class AmazonProvider < GenericProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       #CACHE_DIR = File.join(Alexandria::Library::DIR, '.amazon_cache')
 
Index: lib/alexandria/book_providers/mcu.rb
===================================================================
--- lib/alexandria/book_providers/mcu.rb	(revision 1066)
+++ lib/alexandria/book_providers/mcu.rb	(revision 1067)
@@ -27,7 +27,7 @@
     class MCUProvider < GenericProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       LANGUAGES = {
         'es' => '1'
Index: lib/alexandria/book_providers/proxis.rb
===================================================================
--- lib/alexandria/book_providers/proxis.rb	(revision 1066)
+++ lib/alexandria/book_providers/proxis.rb	(revision 1067)
@@ -23,7 +23,7 @@
     class ProxisProvider < GenericProvider
       include GetText
       include Logging
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       LANGUAGES = {
         'nl' => '1',
Index: lib/alexandria/book_providers/z3950.rb
===================================================================
--- lib/alexandria/book_providers/z3950.rb	(revision 1066)
+++ lib/alexandria/book_providers/z3950.rb	(revision 1067)
@@ -26,7 +26,7 @@
     class Z3950Provider < AbstractProvider
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(name="Z3950", fullname="Z39.50")
         super
@@ -174,7 +174,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("LOC", _("Library of Congress (Usa)"))
@@ -207,7 +207,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("BL", _("British Library"))
@@ -296,7 +296,7 @@
       unabstract
 
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize
         super("SBN", "Servizio Bibliotecario Nazionale (Italy)")
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb	(revision 1066)
+++ lib/alexandria/book_providers.rb	(revision 1067)
@@ -25,7 +25,7 @@
     include Singleton
     include Observable
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS,
     SEARCH_BY_KEYWORD = (0..3).to_a
Index: lib/alexandria/import_library.rb
===================================================================
--- lib/alexandria/import_library.rb	(revision 1066)
+++ lib/alexandria/import_library.rb	(revision 1067)
@@ -22,7 +22,7 @@
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     def self.all
       [
Index: lib/alexandria/export_library.rb
===================================================================
--- lib/alexandria/export_library.rb	(revision 1066)
+++ lib/alexandria/export_library.rb	(revision 1067)
@@ -102,7 +102,7 @@
     include GetText
     include Logging
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     def self.all
       [
Index: lib/alexandria/smart_library.rb
===================================================================
--- lib/alexandria/smart_library.rb	(revision 1066)
+++ lib/alexandria/smart_library.rb	(revision 1067)
@@ -23,7 +23,7 @@
     include Logging
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     ALL_RULES, ANY_RULE = 1, 2
     attr_reader :name
@@ -290,7 +290,7 @@
     class Rule
       include GetText
       extend GetText
-      bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       attr_accessor :operand, :operation, :value
 
@@ -343,7 +343,7 @@
       module Operands
         include GetText
         extend GetText
-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
         LEFT = [
                 LeftOperand.new(:title, _("Title"), String),
@@ -375,7 +375,7 @@
         include Logging
         include GetText
         extend GetText
-        bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+        bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
         IS_TRUE = Operator.new(
                                :is_true,
Index: lib/alexandria/about.rb
===================================================================
--- lib/alexandria/about.rb	(revision 1066)
+++ lib/alexandria/about.rb	(revision 1067)
@@ -20,7 +20,7 @@
   TITLE = 'Alexandria'
   TEXTDOMAIN = 'alexandria'
   extend GetText
-  bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+  bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
   DESCRIPTION = _('A program to help you manage your book collection.')
   COPYRIGHT = "Copyright (C) 2004,2005,2006 Laurent Sansonetti\n" +
     "Copyright (C) 2007,2008,2009 Alexandria Contributors"
Index: lib/alexandria/ui/dialogs/misc_dialogs.rb
===================================================================
--- lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/misc_dialogs.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class ConflictWhileCopyingDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, book)
         super(parent,
@@ -42,7 +42,7 @@
 
     class ReallyDeleteDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, books=nil)
         # Deleting a library.
Index: lib/alexandria/ui/dialogs/book_properties_dialog_base.rb
===================================================================
--- lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/book_properties_dialog_base.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class BookPropertiesDialogBase < GladeBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       COVER_MAXWIDTH = 140    # pixels
 
Index: lib/alexandria/ui/dialogs/new_book_dialog_manual.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_book_dialog_manual.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class NewBookDialogManual < BookPropertiesDialogBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover")
       def initialize(parent, library, &on_add_cb)
Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb
===================================================================
--- lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb	(revision 1067)
@@ -20,7 +20,7 @@
     class SmartLibraryPropertiesDialogBase < Gtk::Dialog
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       attr_reader :predicate_operator_rule
 
Index: lib/alexandria/ui/dialogs/export_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/export_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class ConfirmEraseDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, filename)
         super(parent, _("File already exists"),
@@ -42,7 +42,7 @@
     class ExportDialog < Gtk::FileChooserDialog
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       FORMATS = Alexandria::ExportFormat.all
       THEMES = Alexandria::WebTheme.all
Index: lib/alexandria/ui/dialogs/preferences_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/preferences_dialog.rb	(revision 1067)
@@ -95,7 +95,7 @@
 
     class ProviderPreferencesDialog < ProviderPreferencesBaseDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, provider)
         super(_("Preferences for %s") % provider.fullname,
@@ -120,7 +120,7 @@
 
     class NewProviderDialog <  ProviderPreferencesBaseDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent)
         super(_("New Provider"),
@@ -209,7 +209,7 @@
     class PreferencesDialog < GladeBase
       include Alexandria::Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, &changed_block)
         super('preferences_dialog.glade')
Index: lib/alexandria/ui/dialogs/new_book_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1067)
@@ -26,7 +26,7 @@
   module UI
     class KeepBadISBNDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, book)
         super(parent, _("Invalid ISBN '%s'") % book.isbn,
@@ -51,7 +51,7 @@
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, selected_library=nil, &block)
         super('new_book_dialog.glade')
Index: lib/alexandria/ui/dialogs/new_smart_library_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/new_smart_library_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, &block)
         super(parent)
Index: lib/alexandria/ui/dialogs/book_properties_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/book_properties_dialog.rb	(revision 1067)
@@ -21,7 +21,7 @@
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, library, book)
         super(parent, library.cover(book))
Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, smart_library, &block)
         super(parent)
Index: lib/alexandria/ui/dialogs/acquire_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/acquire_dialog.rb	(revision 1067)
@@ -213,7 +213,7 @@
       include GetText
       include Logging
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, selected_library=nil, &block)
         super('acquire_dialog.glade')
Index: lib/alexandria/ui/dialogs/about_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/about_dialog.rb	(revision 1067)
@@ -19,7 +19,7 @@
   module UI
     class AboutDialog < Gtk::AboutDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       GPL = <<EOL
 Alexandria is free software; you can redistribute it and/or
Index: lib/alexandria/ui/dialogs/import_dialog.rb
===================================================================
--- lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1066)
+++ lib/alexandria/ui/dialogs/import_dialog.rb	(revision 1067)
@@ -30,7 +30,7 @@
   module UI
     class SkipEntryDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       def initialize(parent, message)
         super(parent, _("Error while importing"),
@@ -53,7 +53,7 @@
       include GetText
       include Logging
 
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       FILTERS = Alexandria::ImportFilter.all
 
Index: lib/alexandria/ui/main_app.rb
===================================================================
--- lib/alexandria/ui/main_app.rb	(revision 1066)
+++ lib/alexandria/ui/main_app.rb	(revision 1067)
@@ -43,7 +43,7 @@
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
     class MainApp
       include Logging
Index: lib/alexandria/ui/listview.rb
===================================================================
--- lib/alexandria/ui/listview.rb	(revision 1066)
+++ lib/alexandria/ui/listview.rb	(revision 1067)
@@ -20,7 +20,7 @@
   module UI
     include Logging
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
     class ListViewManager
       include Logging
       include GetText
Index: lib/alexandria/ui/ui_manager.rb
===================================================================
--- lib/alexandria/ui/ui_manager.rb	(revision 1066)
+++ lib/alexandria/ui/ui_manager.rb	(revision 1067)
@@ -24,7 +24,7 @@
         :iconview_model, :filtered_model, :on_books_selection_changed
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       module Columns
         COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
Index: lib/alexandria/ui/libraries_combo.rb
===================================================================
--- lib/alexandria/ui/libraries_combo.rb	(revision 1066)
+++ lib/alexandria/ui/libraries_combo.rb	(revision 1067)
@@ -19,7 +19,7 @@
 class Gtk::ComboBox
   include GetText
   extend GetText
-  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8")
+  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
   def populate_with_libraries(libraries, selected_library)
     libraries_names = libraries.map { |x| x.name }


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- alexandria.spec	26 Mar 2009 06:14:09 -0000	1.29
+++ alexandria.spec	6 Apr 2009 18:03:50 -0000	1.30
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,8 +19,15 @@
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Ref: upstream bug 24568
-#Patch0:		alexandria-0.6.4-bookentry-after-sorting.patch
+# Use 2 arguments format for bindtextdomain() instead of
+# deprecated 4 arguments format
+# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
+Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
+# Workaround for issue with right click on left pane
+# ref: alexandria-Bugs-25021
+Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# And try more fix
+Patch2:		alexandria-0.6.4.1-right-click-left-pane-morefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -70,16 +77,13 @@
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-#%%patch0 -p0 -b .up24568
+%patch0 -p0 -b .up24882
+%patch1 -p0 -b .up25021
+%patch2 -p0 -b .moretry
 
 %build
 rake build
 
-# ruby(gettext) >= 2.0.0 no longer accepts 4 arguments for
-# bindtextdomain()
-# Filed as upstream bug 24882, resolution accepted
-find . -name \*.rb | xargs \
-	%{__sed} -i.bind -e '/bindtextdomain/s|(\([^,][^,]*\), nil, nil, \([^,][^,]*\))|(\1, :charset => \2)|'
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -197,8 +201,13 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
+- Workaround for strange behavior with right click on left pane
+  (alexandria-Bugs-25021)
+
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-2
 - Fix arguments of bindtextdomain() for ruby(gettext) 2.0.0
+  (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
 - 0.6.4.1 (fixing upstream bug 24568)


--- alexandria-0.6.3-crash_tooltips.patch DELETED ---


--- alexandria-0.6.3-library-utf8-string.patch DELETED ---


--- alexandria-0.6.4-bookentry-after-sorting.patch DELETED ---



From scop at fedoraproject.org  Mon Apr  6 18:08:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon,  6 Apr 2009 18:08:24 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion-repomanage, 1.4,
	1.5 .cvsignore, 1.14, 1.15 bash-completion.spec, 1.37,
	1.38 sources, 1.14, 1.15 bash-completion-snapshot.sh, 1.2, NONE
Message-ID: <20090406180824.2CB5B700FB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29924

Modified Files:
	.cvsignore bash-completion.spec sources 
Added Files:
	bash-completion-repomanage 
Removed Files:
	bash-completion-snapshot.sh 
Log Message:
* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
- 1.0.



Index: bash-completion-repomanage
===================================================================
RCS file: bash-completion-repomanage
diff -N bash-completion-repomanage
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bash-completion-repomanage	6 Apr 2009 18:07:53 -0000	1.5
@@ -0,0 +1,24 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for repomanage
+
+have repomanage &&
+_repomanage()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	[[ "$prev" == -@(h|-help|k|-keep) ]] && return 0
+
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \
+				--keep -c --nocheck -h --help' -- $cur ) )
+	else
+		_filedir -d
+	fi
+} &&
+complete -F _repomanage $filenames repomanage


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	15 Mar 2009 19:20:39 -0000	1.14
+++ .cvsignore	6 Apr 2009 18:07:53 -0000	1.15
@@ -1 +1 @@
-bash-completion-20090314gitf4f0984.tar.gz
+bash-completion-1.0.tar.gz


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bash-completion.spec	23 Mar 2009 19:14:45 -0000	1.37
+++ bash-completion.spec	6 Apr 2009 18:07:53 -0000	1.38
@@ -1,22 +1,16 @@
-%define snap    20090314gitf4f0984
-
 Name:           bash-completion
-Version:        20080705
-Release:        4%{?snap:.%{snap}}
+Version:        1.0
+Release:        1%{?dist}
+Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
 URL:            http://bash-completion.alioth.debian.org/
-# Snapshot tarballs created with Source99
-%if 0%{?snap:1}
-Source0:        %{name}-%{snap}.tar.gz
-%else
-Source0:        http://ftp.debian.org/debian/pool/main/b/bash-completion/%{name}_%{version}.tar.gz
-%endif
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
 Source1:        %{name}-mock
 Source2:        %{name}-plague-client
-Source99:       %{name}-snapshot.sh
+Source3:        %{name}-repomanage
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,10 +24,11 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 install -pm 644 %{SOURCE1} contrib/mock
 install -pm 644 %{SOURCE2} contrib/plague-client
-mv to_review/repomanage contrib/
+install -pm 644 %{SOURCE3} contrib/repomanage
+
 
 %build
 
@@ -254,10 +249,15 @@
 %triggerun -- yum-utils
 %do_triggerun repomanage
 
+%triggerin -- vnc
+%do_triggerin vncviewer
+%triggerun -- vnc
+%do_triggerun vncviewer
+
 
 %files -f %{name}-ghosts.list
 %defattr(-,root,root,-)
-%doc AUTHORS README TODO debian/changelog debian/copyright
+%doc AUTHORS CHANGES COPYING README TODO
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
@@ -265,6 +265,9 @@
 
 
 %changelog
+* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
+- 1.0.
+
 * Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
 - Add dependency on coreutils for triggers (#490768).
 - Update and improve mock completion.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	15 Mar 2009 19:20:40 -0000	1.14
+++ sources	6 Apr 2009 18:07:53 -0000	1.15
@@ -1 +1 @@
-b507df0fa02482b6e54c7dfc741834f5  bash-completion-20090314gitf4f0984.tar.gz
+cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz


--- bash-completion-snapshot.sh DELETED ---



From trasher at fedoraproject.org  Mon Apr  6 18:12:56 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon,  6 Apr 2009 18:12:56 +0000 (UTC)
Subject: rpms/eric/devel eric.spec,1.40,1.41 sources,1.19,1.20
Message-ID: <20090406181256.4C5B6700FB@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31967

Modified Files:
	eric.spec sources 
Log Message:
New upstream release



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- eric.spec	8 Mar 2009 10:30:35 -0000	1.40
+++ eric.spec	6 Apr 2009 18:12:25 -0000	1.41
@@ -7,7 +7,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPL+
@@ -147,7 +147,10 @@
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
-* Sun Mar 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.0-1
+* Mon Apr 6 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.2-1
+- 4.3.2
+
+* Sun Mar 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.1-1
 - 4.3.1
 
 * Thu Mar 5 2009 Johan Cwiklinski <johan AT x-tnd DOT be> - 4.3.0-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Mar 2009 10:30:35 -0000	1.19
+++ sources	6 Apr 2009 18:12:25 -0000	1.20
@@ -1,8 +1,8 @@
-f7060154d397ca53dcc3fc43995c73b7  eric4-4.3.1.tar.gz
-2829cd57dc9d817be19bdf4243531086  eric4-i18n-fr-4.3.1.tar.gz
-fdbbcb08cde6c9b409ff9f96537e238c  eric4-i18n-de-4.3.1.tar.gz
-8bd1f98855456b38e84951e1c085e760  eric4-i18n-ru-4.3.1.tar.gz
-4a1c78ff3d5e6bc07c28492364a9aed0  eric4-i18n-cs-4.3.1.tar.gz
-d9d5bc76e586dbde47ad83bd4c62d106  eric4-i18n-es-4.3.1.tar.gz
-74fcd0fcad8cd394ec903d9d2f937f12  eric4-i18n-tr-4.3.1.tar.gz
-90bddf5c5a87aba71de3d2b480ac94b2  eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz
+7b62ee59f0a03ae7a400d7e41679d33e  eric4-4.3.2.tar.gz
+d2ca5125440104615f9d8611b5e3023c  eric4-i18n-fr-4.3.2.tar.gz
+da0656485058e7620eabba84e15523b3  eric4-i18n-de-4.3.2.tar.gz
+8dbe6f79e2cad8cce50f89772c51b69e  eric4-i18n-ru-4.3.2.tar.gz
+374171cdfd6cd432aa18774726e1cda3  eric4-i18n-cs-4.3.2.tar.gz
+6a3173c80ce28909e0baad9502bf8487  eric4-i18n-es-4.3.2.tar.gz
+b747cbcf252fc14b3eb12afb4b979fa1  eric4-i18n-tr-4.3.2.tar.gz
+777ea5ea1397610e3c9c20d6436371db  eric4-i18n-zh_CN.GB2312-4.3.2.tar.gz



From erikos at fedoraproject.org  Mon Apr  6 18:13:49 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 18:13:49 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.35, 1.36 sources, 1.37,
	1.38 sugar.spec, 1.59, 1.60
Message-ID: <20090406181349.2AC0D700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32349

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.3-1
- If user updates an activity installed in /usr/share/activities, both versions remain installed #707
- Sometimes an activity will not start #461
- Grey out the erase option if an activity bundle cannot be erased #620
- AP: Do not write timestamp when not managed to connect #623
- Correct date in 'About my Computer' CP section #639
- Make Jukebox the default activity for ogg-vorbis #423
- Find an available icon for displaying the removable device #627
- CP: Disallow the user from selecting any fallbacks if English (USA) is 
selected (#slo:561)
- Call *mount_finish when the callback is called #326
- Add full licence to data dir #357
- The logout option is available by default
- Resume from home is duplicating activity instances again #600




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	1 Apr 2009 05:13:20 -0000	1.35
+++ .cvsignore	6 Apr 2009 18:13:18 -0000	1.36
@@ -1 +1 @@
-sugar-0.84.1-git4232758da5.tar.bz2
+sugar-0.84.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	1 Apr 2009 05:13:21 -0000	1.37
+++ sources	6 Apr 2009 18:13:18 -0000	1.38
@@ -1 +1 @@
-3115f37c94c6a200dc71a2ed82cb356a  sugar-0.84.1-git4232758da5.tar.bz2
+d512dedb5ded2a368722cfe0e2d7251d  sugar-0.84.3.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sugar.spec	1 Apr 2009 05:13:21 -0000	1.59
+++ sugar.spec	6 Apr 2009 18:13:18 -0000	1.60
@@ -5,15 +5,15 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.1
-#Release: 1%{?dist}
-Release: 4.%{alphatag}%{?dist}
+Version: 0.84.3
+Release: 1%{?dist}
+#Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
 # cd sugar
 # git-checkout %{commitid}
-Source0: %{name}-%{version}-git%{commitid}.tar.bz2
-#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,6 +140,21 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.3-1
+- If user updates an activity installed in /usr/share/activities, both versions remain installed #707
+- Sometimes an activity will not start #461
+- Grey out the erase option if an activity bundle cannot be erased #620
+- AP: Do not write timestamp when not managed to connect #623
+- Correct date in 'About my Computer' CP section #639
+- Make Jukebox the default activity for ogg-vorbis #423
+- Find an available icon for displaying the removable device #627
+- CP: Disallow the user from selecting any fallbacks if English (USA) is 
+selected (#slo:561)
+- Call *mount_finish when the callback is called #326
+- Add full licence to data dir #357
+- The logout option is available by default
+- Resume from home is duplicating activity instances again #600
+
 * Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-4.20090401git4232758da5
 - git snapshot
 



From rmeggins at fedoraproject.org  Mon Apr  6 18:15:03 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  6 Apr 2009 18:15:03 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 sources,1.19,1.20
Message-ID: <20090406181503.DEE90700FB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv441/F-9

Modified Files:
	sources 
Log Message:
disable ppc 64-bit atomic counters in order to enable ppc builds


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Apr 2009 17:37:35 -0000	1.19
+++ sources	6 Apr 2009 18:14:33 -0000	1.20
@@ -1 +1 @@
-03ac48687f460d0c652cff727f0dda02  fedora-ds-base-1.2.0.tar.bz2
+2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Mon Apr  6 18:15:03 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  6 Apr 2009 18:15:03 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 sources,1.19,1.20
Message-ID: <20090406181503.96790700FB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv441/F-10

Modified Files:
	sources 
Log Message:
disable ppc 64-bit atomic counters in order to enable ppc builds


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Apr 2009 17:37:35 -0000	1.19
+++ sources	6 Apr 2009 18:14:33 -0000	1.20
@@ -1 +1 @@
-03ac48687f460d0c652cff727f0dda02  fedora-ds-base-1.2.0.tar.bz2
+2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Mon Apr  6 18:15:04 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  6 Apr 2009 18:15:04 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel sources,1.19,1.20
Message-ID: <20090406181504.28856700FB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv441/devel

Modified Files:
	sources 
Log Message:
disable ppc 64-bit atomic counters in order to enable ppc builds


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Apr 2009 17:37:35 -0000	1.19
+++ sources	6 Apr 2009 18:14:33 -0000	1.20
@@ -1 +1 @@
-03ac48687f460d0c652cff727f0dda02  fedora-ds-base-1.2.0.tar.bz2
+2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2



From mtasaka at fedoraproject.org  Mon Apr  6 18:19:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 18:19:37 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.30,
	1.31 gnome-commander.spec, 1.54, 1.55 sources, 1.30, 1.31
Message-ID: <20090406181937.2D359700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1769/devel

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
rev 2517


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	1 Apr 2009 17:31:50 -0000	1.30
+++ .cvsignore	6 Apr 2009 18:19:06 -0000	1.31
@@ -1 +1 @@
-gnome-commander-1.3-svn2502_13dev.tar.bz2
+gnome-commander-1.3-svn2517_13dev.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-commander.spec	1 Apr 2009 17:31:50 -0000	1.54
+++ gnome-commander.spec	6 Apr 2009 18:19:06 -0000	1.55
@@ -19,7 +19,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          1 
-%define        extratag              svn2502_13dev
+%define        extratag              svn2517_13dev
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -213,12 +213,12 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Tue Apr  7 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2517
+
 * Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.1.svn2502_13dev
 - F-12: switch to 1.3 development branch
 
-* Sat Mar 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2497
-
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Apr 2009 17:31:51 -0000	1.30
+++ sources	6 Apr 2009 18:19:06 -0000	1.31
@@ -1 +1 @@
-e69597d524783a0622a509f02db0d3d7  gnome-commander-1.3-svn2502_13dev.tar.bz2
+d3183ebfb06030462e9660ca64e8b366  gnome-commander-1.3-svn2517_13dev.tar.bz2



From mtasaka at fedoraproject.org  Mon Apr  6 18:19:36 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 18:19:36 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.30,
	1.31 gnome-commander.spec, 1.54, 1.55 sources, 1.30, 1.31
Message-ID: <20090406181936.DFA68700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1769/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
rev 2517


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	1 Apr 2009 17:31:50 -0000	1.30
+++ .cvsignore	6 Apr 2009 18:19:06 -0000	1.31
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2502_trunk.tar.bz2
+gnome-commander-1.2.8-svn2517_trunk.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-commander.spec	1 Apr 2009 17:31:50 -0000	1.54
+++ gnome-commander.spec	6 Apr 2009 18:19:06 -0000	1.55
@@ -18,7 +18,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          3 
-%define        extratag              svn2502_trunk
+%define        extratag              svn2517_trunk
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -210,12 +210,12 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Tue Apr  7 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2517
+
 * Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-0.3.svn2502_trunk
 - rev 2502
 
-* Sat Mar 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2497
-
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Apr 2009 17:31:50 -0000	1.30
+++ sources	6 Apr 2009 18:19:06 -0000	1.31
@@ -1 +1 @@
-1acab6a1db0eac704fcbb3e473252737  gnome-commander-1.2.8-svn2502_trunk.tar.bz2
+d495ba792513e73746f1191602bd5bd0  gnome-commander-1.2.8-svn2517_trunk.tar.bz2



From linville at fedoraproject.org  Mon Apr  6 18:20:34 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon,  6 Apr 2009 18:20:34 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore,1.5,1.6 iw.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090406182034.B23BB700FB@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2344

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jan 2009 18:32:35 -0000	1.5
+++ .cvsignore	6 Apr 2009 18:20:04 -0000	1.6
@@ -1 +1 @@
-iw-0.9.7.tar.bz2
+iw-0.9.11.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iw.spec	25 Feb 2009 08:24:53 -0000	1.8
+++ iw.spec	6 Apr 2009 18:20:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           iw
-Version:        0.9.7
-Release:        2%{?dist}
+Version:        0.9.11
+Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -43,6 +43,9 @@
 %doc COPYING
 
 %changelog
+* Mon Apr  6 2009 John W. Linville <linville at redhat.com> 0.9.11-1
+- Update to 0.9.11
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jan 2009 18:32:35 -0000	1.5
+++ sources	6 Apr 2009 18:20:04 -0000	1.6
@@ -1 +1 @@
-52fa948eb5e2cb525fc884d6e58cdd88  iw-0.9.7.tar.bz2
+a8198e7f6bf41ead9e9ade3ec5cae9b2  iw-0.9.11.tar.bz2



From pkgdb at fedoraproject.org  Mon Apr  6 18:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:21:15 +0000
Subject: [pkgdb] eclipse: akurtakov has requested watchcommits
Message-ID: <20090406182115.5372220854A@bastion.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on eclipse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From pkgdb at fedoraproject.org  Mon Apr  6 18:21:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:21:37 +0000
Subject: [pkgdb] eclipse: akurtakov has requested commit
Message-ID: <20090406182116.2614F208556@bastion.fedora.phx.redhat.com>

akurtakov has requested the commit acl on eclipse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From mbarnes at fedoraproject.org  Mon Apr  6 18:21:12 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  6 Apr 2009 18:21:12 +0000 (UTC)
Subject: rpms/samba4/devel samba4.spec,1.11,1.12
Message-ID: <20090406182112.60C5C700FB@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2577

Modified Files:
	samba4.spec 
Log Message:

* Mon Apr 06 2009 Matthew Barnes <mbarnes at redhat.com> - 4.0.0-14alpha7
- Fix a build issue in samba4-common (RH bug #494243).



Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- samba4.spec	26 Mar 2009 00:24:52 -0000	1.11
+++ samba4.spec	6 Apr 2009 18:20:41 -0000	1.12
@@ -1,4 +1,4 @@
-%define main_release 13
+%define main_release 14
 %define samba4_version 4.0.0
 
 %define talloc_version 1.2.0
@@ -737,8 +737,6 @@
 %defattr(-,root,root,-)
 %{_bindir}/net
 %{_bindir}/testparm
-%{_bindir}/ad2oLschema
-%{_bindir}/oLschema2ldif
 %{_bindir}/regdiff
 %{_bindir}/regpatch
 %{_bindir}/regshell
@@ -834,6 +832,9 @@
 %endif
 
 %changelog
+* Mon Apr 06 2009 Matthew Barnes <mbarnes at redhat.com> - 4.0.0-14alpha7
+- Fix a build issue in samba4-common (RH bug #494243).
+
 * Wed Mar 25 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-13alpha7
 - rebuild with correct CFLAGS (also fixes debuginfo)
 



From pkgdb at fedoraproject.org  Mon Apr  6 18:21:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:21:36 +0000
Subject: [pkgdb] eclipse: akurtakov has requested watchbugzilla
Message-ID: <20090406182116.4176D208603@bastion.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on eclipse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From pkgdb at fedoraproject.org  Mon Apr  6 18:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:23:41 +0000
Subject: [pkgdb] eclipse had acl change status
Message-ID: <20090406182321.D46B0208553@bastion.fedora.phx.redhat.com>

overholt has set the watchcommits acl on eclipse (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From pkgdb at fedoraproject.org  Mon Apr  6 18:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:23:41 +0000
Subject: [pkgdb] eclipse had acl change status
Message-ID: <20090406182321.EA1D5208557@bastion.fedora.phx.redhat.com>

overholt has set the watchbugzilla acl on eclipse (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From pkgdb at fedoraproject.org  Mon Apr  6 18:23:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:23:44 +0000
Subject: [pkgdb] eclipse had acl change status
Message-ID: <20090406182322.C418F208604@bastion.fedora.phx.redhat.com>

overholt has set the commit acl on eclipse (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From pkgdb at fedoraproject.org  Mon Apr  6 18:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:23:23 +0000
Subject: [pkgdb] eclipse had acl change status
Message-ID: <20090406182323.A23EA208609@bastion.fedora.phx.redhat.com>

overholt has set the approveacls acl on eclipse (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From nalin at fedoraproject.org  Mon Apr  6 18:23:29 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 18:23:29 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.186,1.187
Message-ID: <20090406182329.2F872700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3313

Modified Files:
	krb5.spec 
Log Message:
- take the execute bit off of the protocol docs (part of #225974)
- unflag init scripts as configuration files (part of #225974)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- krb5.spec	6 Apr 2009 18:00:53 -0000	1.186
+++ krb5.spec	6 Apr 2009 18:22:58 -0000	1.187
@@ -236,6 +236,8 @@
   ldconfig for the -server-ldap subpackage (part of #225974)
 - escape possible macros in the changelog (part of #225974)
 - fixup summary texts (part of #225974)
+- take the execute bit off of the protocol docs (part of #225974)
+- unflag init scripts as configuration files (part of #225974)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
@@ -1416,6 +1418,9 @@
 \\usepackage{fancyheadings}\
 \\usepackage{hyperref}' doc/implement/implement.tex
 
+# Take the execute bit off of documentation.
+chmod -x doc/krb5-protocol/*.txt
+
 # Rename the man pages so that they'll get generated correctly.
 pushd src
 cat $RPM_SOURCE_DIR/krb5-trunk-manpaths.txt | while read manpage ; do
@@ -1808,9 +1813,9 @@
 %defattr(-,root,root)
 %docdir %{krb5prefix}/man
 
-%config /etc/rc.d/init.d/krb5kdc
-%config /etc/rc.d/init.d/kadmin
-%config /etc/rc.d/init.d/kprop
+/etc/rc.d/init.d/krb5kdc
+/etc/rc.d/init.d/kadmin
+/etc/rc.d/init.d/kprop
 %config(noreplace) /etc/sysconfig/krb5kdc
 %config(noreplace) /etc/sysconfig/kadmin
 



From pkgdb at fedoraproject.org  Mon Apr  6 18:23:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 18:23:05 +0000
Subject: [pkgdb] eclipse had acl change status
Message-ID: <20090406182328.2E1642084A7@bastion.fedora.phx.redhat.com>

overholt has set the approveacls acl on eclipse (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From rathann at fedoraproject.org  Mon Apr  6 18:25:28 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon,  6 Apr 2009 18:25:28 +0000 (UTC)
Subject: rpms/raidutils/EL-5 raidutils-rpm.patch, NONE, 1.1 raidutils.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090406182528.2C000700FB@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/raidutils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3968

Modified Files:
	.cvsignore sources 
Added Files:
	raidutils-rpm.patch raidutils.spec 
Log Message:
initial import into EL-5 branch

raidutils-rpm.patch:

--- NEW FILE raidutils-rpm.patch ---
diff -upwbB raidutils-0.0.6/include/device.hh.r raidutils-0.0.6/include/device.hh
--- raidutils-0.0.6/include/device.hh.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/device.hh	2008-09-12 13:41:58.000000000 +0200
@@ -27,6 +27,14 @@
  */
 
 // Data unique to every engine device
+
+
+// use PACK for things that should be packed;
+// PACK_A for things that you'd like packed by would give a
+// warning on anything except an ARM if actually packed; and
+// PACK_WAS if it used to be packed by this gave warnings
+// everywhere so now it isn't.
+
 #undef PACK
 #if (defined(__GNUC__))
 # define PACK __attribute__ ((packed))
@@ -34,11 +42,17 @@
 #define PACK
 #endif
 
+#ifdef __arm__
+# define PACK_A PACK
+#else
+# define PACK_A
+#endif
+
 uSHORT		scsiOffset;	// 0=Async mode
 				// Non-zero = SCSI offset
 uSHORT		xfrSpeed;	// SCSI transfer speed
-dptCcapacity_S	capacity PACK;	// Device capacity
-dptCemuParam_S	emulation PACK;	// Emulated drive parameters
+dptCcapacity_S	capacity PACK_A;	// Device capacity
+dptCemuParam_S	emulation PACK_A;	// Emulated drive parameters
   // DPT specific name (ASCII string)
   // (Up to 8 valid chars + NULL terminator + 1)
 uCHAR		dptName[DPT_NAME_SIZE+2];
diff -upwbB raidutils-0.0.6/include/get_info.h.r raidutils-0.0.6/include/get_info.h
--- raidutils-0.0.6/include/get_info.h.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/get_info.h	2008-09-12 13:41:58.000000000 +0200
@@ -364,6 +364,12 @@ const uLONG DPT_ENGINE_COMPATIBILITY   =
    #include    "device.hh"
    #include    "raid_dev.hh"
 
+     // use PACK for things that should be packed;
+     // PACK_A for things that you'd like packed by would give a
+     // warning on anything except an ARM if actually packed; and
+     // PACK_WAS if it used to be packed by this gave warnings
+     // everywhere so now it isn't.
+
 #undef PACK
 #if (defined(__GNUC__))
 # define PACK __attribute__ ((packed))
@@ -371,6 +377,14 @@ const uLONG DPT_ENGINE_COMPATIBILITY   =
 #define PACK
 #endif
 
+#ifdef __arm__
+# define PACK_A PACK
+#else
+# define PACK_A
+#endif
+
+#define PACK_WAS
+
    uSHORT flags2;        // Supplemental flags word
    uSHORT hbaIndex; // HBA index # (slot #)
    uSHORT hbaFlags; // HBA flags - see bit definitions below
@@ -381,8 +395,8 @@ const uLONG DPT_ENGINE_COMPATIBILITY   =
    uLONG  hbaTag    PACK;     // Reserved for future expansion
    uLONG  flags3    PACK;     // Miscellaneous flags - see bit definitions above
    uSHORT busSpeed  PACK;     // Negotiated bus speed (in Mhz)
-   uCHAR  p2Flags   PACK;     // Path 2 flags - see bit definitions above
-   uCHAR  reserved4 PACK;     // Reserved for future expansion
+   uCHAR  p2Flags   PACK_WAS;	// Path 2 flags - see bit definitions above
+   uCHAR  reserved4 PACK_WAS;	// Reserved for future expansion
    uLONG  availableCapacity PACK;     // Reserved for future expansion
 
    uCHAR  udmaModeSupported;// The maximum UDMA mode supported
diff -upwbB raidutils-0.0.6/include/hba.hh.r raidutils-0.0.6/include/hba.hh
--- raidutils-0.0.6/include/hba.hh.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/hba.hh	2008-09-12 13:41:58.000000000 +0200
@@ -34,13 +34,13 @@
 #define PACK
 #endif
 
-   dptIOaddr_U ioAddr PACK;             // EISA/ISA/PCI address
+   dptIOaddr_U ioAddr PACK_A;             // EISA/ISA/PCI address
    uSHORT drvrRefNum;         // Number by which the driver ref-
 					// erences this HBA
 #if defined (_DPT_STRICT_ALIGN)
    uSHORT sniAdjust4;
 #endif
-   dptHBAid_U  id PACK;       // EISA = ID PAL bytes
+   dptHBAid_U  id PACK_A;       // EISA = ID PAL bytes
 					// ISA = Not used
 					// PCI = vendor ID, product ID
    uSHORT drqNum;             // DRQ # (0,5,6,7,0xffff=invalid)
@@ -80,7 +80,7 @@
    uCHAR  raidID;        // Software selectable RAID ID #
    uCHAR  slotID;        // Slot specific RAID ID #
 
-   dptChanInfo_S chanInfo[NUM_CHAN_INFO] PACK; // SCSI channel info (multi-channel boards)
+   dptChanInfo_S chanInfo[NUM_CHAN_INFO] PACK_A; // SCSI channel info (multi-channel boards)
 
    uCHAR  excludeStart;
    uCHAR  excludeEnd;
diff -upwbB raidutils-0.0.6/include/linux/i2o-dev.h.r raidutils-0.0.6/include/linux/i2o-dev.h
--- raidutils-0.0.6/include/linux/i2o-dev.h.r	2005-01-24 10:25:21.000000000 +0100
+++ raidutils-0.0.6/include/linux/i2o-dev.h	2008-09-12 13:41:58.000000000 +0200
@@ -24,7 +24,6 @@
 /* How many controllers are we allowing */
 #define MAX_I2O_CONTROLLERS	32
 
-#include <linux/compiler.h>
 
 #ifndef __KERNEL__
 
diff -upwbB raidutils-0.0.6/include/mgr.hh.r raidutils-0.0.6/include/mgr.hh
--- raidutils-0.0.6/include/mgr.hh.r	2005-01-24 10:41:03.000000000 +0100
+++ raidutils-0.0.6/include/mgr.hh	2008-09-12 13:41:58.000000000 +0200
@@ -34,8 +34,8 @@
 #define PACK
 #endif
 
-   dptCaddr_S	maxAddr PACK;	// Maximum physical address supported
-   dptCaddr_S	minAddr PACK;	// Minimum physical address supported
+   dptCaddr_S	maxAddr PACK_A;	// Maximum physical address supported
+   dptCaddr_S	minAddr PACK_A;	// Minimum physical address supported
 
 // RAID manager information (Ignore if not a RAID manager)
 
diff -upwbB raidutils-0.0.6/lib/engcalls.cpp.r raidutils-0.0.6/lib/engcalls.cpp
--- raidutils-0.0.6/lib/engcalls.cpp.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/lib/engcalls.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -987,7 +987,7 @@ char *AllocBuffers(uLONG toEngSize, uLON
 
   /* The Attach Failed, So DeAllocate The Shared Memory */
 
-        if((int)SharedMemoryPtr == -1)
+        if((long)SharedMemoryPtr == -1)
           {
             shmctl(BufferID,IPC_RMID,&shm_buff);
             SharedMemoryPtr = NULL;
diff -upwbB raidutils-0.0.6/lib/engmsg.c.r raidutils-0.0.6/lib/engmsg.c
--- raidutils-0.0.6/lib/engmsg.c.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/lib/engmsg.c	2008-09-12 13:41:58.000000000 +0200
@@ -152,7 +152,7 @@ int MessageDPTEngine(int EngineMsgKey,in
      //
      // Send off the message to the engine
      //
-     if(i = msgsnd(msqID,(struct msgbuf *)&HdrBuff,MsgDataSize,0) != -1)
+     if((i = msgsnd(msqID,(struct msgbuf *)&HdrBuff,MsgDataSize,0)) != -1)
       {
         //
         // Let's set up a little loop here receiving messages in case
diff -upwbB raidutils-0.0.6/lib/lockunix.c.r raidutils-0.0.6/lib/lockunix.c
--- raidutils-0.0.6/lib/lockunix.c.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/lib/lockunix.c	2008-09-12 13:43:22.000000000 +0200
@@ -30,6 +30,7 @@
  * UNIX locking mechanism
  */
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -82,7 +83,7 @@ MkLock (char * name)
 		return (-1);
 	}
 	sprintf (templateBuffer, Template, Name);
-	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
+	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR)) < 0) {
 		free (templateBuffer);
 		free (lock);
 		return (-1);
@@ -152,7 +153,7 @@ ChLock (char * name, int pid)
 
 	if (lock != (char *)NULL) {
 		sprintf (lock, Lock, Name);
-	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC)) >= 0) {
+	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR)) >= 0) {
 			sprintf (buffer, "%d\n", pid);
 			write (fd, buffer, strlen(buffer));
 			close (fd);
diff -upwbB raidutils-0.0.6/raideng/connect.hpp.r raidutils-0.0.6/raideng/connect.hpp
--- raidutils-0.0.6/raideng/connect.hpp.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/connect.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -189,7 +189,7 @@ public:
 
 // Constructor/Destructor.............................
 
-			dptSCSIcon_C::dptSCSIcon_C();
+			dptSCSIcon_C();
 
 // Message Handlers...................................
 
diff -upwbB raidutils-0.0.6/raideng/eng_unix.cpp.r raidutils-0.0.6/raideng/eng_unix.cpp
--- raidutils-0.0.6/raideng/eng_unix.cpp.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/raideng/eng_unix.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -491,7 +491,7 @@ main(int argc, char *argv[])
 
   /* Make Sure That We Could Attach */
 
-            if((int)toEng_P != -1)
+            if((long)toEng_P != -1)
               {
                  fromEng_P = toEng_P + HdrBuff.FromEngBuffOffset;
 
@@ -909,7 +909,7 @@ void DisplayHelp(void)
 #else
 void DisplayHelp(void)
   {
-    printf("The Pramaters For This Program Are :\n");
+    printf("The Parameters For This Program Are :\n");
     printf(
 "  /VERBOSE            :  Display All Connection And Message Information\n");
     printf(
diff -upwbB raidutils-0.0.6/raideng/i2odep.h.r raidutils-0.0.6/raideng/i2odep.h
--- raidutils-0.0.6/raideng/i2odep.h.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/i2odep.h	2008-09-12 13:41:58.000000000 +0200
@@ -203,7 +203,7 @@ typedef unsigned char BOOL;
 # define _F_set12bit4(w,x,y,z,u) ((w)->z = (u))
 # define _F_get16bit(w,x,y,z)    ((U16)((w)->z))
 # define _F_set16bit(w,x,y,z,u)  ((w)->z = (u))
-#elif (defined(_DPT_BIG_ENDIAN))
+#elif (defined(_DPT_BIG_ENDIAN) || defined(sparc))
 /* First 12 bits */
 # define _F_getTID(w,x,y)     getL12bit(w,x,0)
 # define _F_setTID(w,x,y,z)   setL12bit(w,x,0,z)
diff -upwbB raidutils-0.0.6/raideng/osd_unix.cpp.r raidutils-0.0.6/raideng/osd_unix.cpp
--- raidutils-0.0.6/raideng/osd_unix.cpp.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/osd_unix.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -164,6 +164,10 @@ typedef struct dpt_scsi_ha      HbaInfo;
 #define TO_LOGGER_BUFFER_SIZE    0x1000
 #define FROM_LOGGER_BUFFER_SIZE  0x10000
 
+/* Definitions - Device names -----------------------------------------------*/
+
+char *DEV_CTL = "/dev/i2octl";	// formerly /dev/i2o/ctl
+
 /* Function Prototypes ------------------------------------------------------*/
 
 DPT_RTN_T osdIOrequest(uSHORT ioMethod);
@@ -374,6 +378,17 @@ DPT_RTN_T osdIOrequest(uSHORT ioMethod)
 
    if(ioMethod==DPT_IO_PASS_THRU)
      {
+       // make sure the device entry represents an active device and not
+       // just a device file that was probed without actually finding a
+       // device, so we don't wait 20 seconds trying to connect to 
+       // it...
+       if(DefaultHbaDev->Flags == 0 )
+         {
+           FormatTimeString(TimeString,time(0));
+           printf("\nosdIDrequest   : %s Fatal error, DefaultHbaDev does not point to an active controller.\n", TimeString);
+           fflush(stdout);
+         }
+       else {
 
   /* Try To Open The First Adapter Device */
 
@@ -401,6 +416,7 @@ DPT_RTN_T osdIOrequest(uSHORT ioMethod)
        else printf("\nosdIOrequest : File %s Could Not Be Opened",
                      DefaultHbaDev->NodeName);
      }
+     }
    if(Verbose)
         printf("\nosdIOrequest   : Return = %x",retVal);
    return(retVal);
@@ -501,6 +517,15 @@ DPT_RTN_T osdOpenEngine(void)
    retVal = MSG_RTN_COMPLETED;
    NumHBAs = BuildNodeNameList();
 
+   // If there are no HBAs found, abort with an explict error message.
+   if(NumHBAs == 0)
+     {
+     FormatTimeString(TimeString,time(0));
+     printf("\nosdOpenEngine  : %s Fatal error, no active controller device files found.\n", TimeString);
+     retVal = MSG_RTN_FAILED;
+     fflush(stdout);
+     }
+
    if(Verbose)
      {
         FormatTimeString(TimeString,time(0));
@@ -1232,7 +1257,7 @@ DPT_RTN_T osdSendMessage(uLONG HbaNum, P
 #elif defined (_DPT_SCO) || defined (SNI_MIPS) || defined(_DPT_SOLARIS) || defined(_DPT_BSDI) || defined(_DPT_FREE_BSD) || defined(_DPT_LINUX)
 
 #if defined(_DPT_LINUX_I2O)
-		     if(strcmp(HbaDevs[HbaNum].NodeName, "/dev/i2o/ctl"))
+		     if(strcmp(HbaDevs[HbaNum].NodeName, DEV_CTL))
                         i = ioctl(FileID,I2OUSRCMD,IoctlBuffer_P);
 		     else {
                         struct i2o_cmd_passthru pt;
@@ -2144,7 +2169,7 @@ DPT_RTN_T osdGetCtlrs(uSHORT ioMethod,uS
                        i = 0;
                 }
 #elif defined(_DPT_LINUX_I2O)
-                if(strcmp(HbaDevs[Count].NodeName, "/dev/i2o/ctl"))
+                if(strcmp(HbaDevs[Count].NodeName, DEV_CTL))
                    i = osdSendIoctl(&HbaDevs[Count],DPT_CTRLINFO,DataBuff,&pkt);
 		else {
 		   /*
@@ -2367,7 +2392,7 @@ DPT_RTN_T osdGetSysInfo(sysInfo_S *SysIn
        SysInfo_P->busType = SI_PCI_BUS;
        SysInfo_P->processorFamily = PROC_INTEL;
        buffer_size = sysinfo(SI_ARCHITECTURE, buffer_ptr, 0);
-       buffer_ptr = (char *)malloc((int)buffer_size);
+       buffer_ptr = (char *)malloc((size_t)buffer_size);
        status = sysinfo(SI_ARCHITECTURE, buffer_ptr, buffer_size);
        if (status != -1)
         {
@@ -2647,7 +2672,7 @@ int BufferAlloc(uLONG toLoggerSize, char
 
   /* The Attach Failed, So DeAllocate The Shared Memory */
 
-            if((int)SharedMemoryPtr == -1)
+            if((long)SharedMemoryPtr == -1)
               {
                 Rtnval = 1;
                 shmctl(BufferID,IPC_RMID,&shm_buff);
@@ -2782,7 +2807,7 @@ int BufferAlloc(uLONG toLoggerSize, char
         toLoggerTotalSize = toLoggerSize + sizeof(dptBuffer_S);
         fromLoggerTotalSize = fromEngSize + sizeof(dptBuffer_S);
         FromLoggerBuffOffset = toLoggerTotalSize;
-        Ptr = (char *)malloc((uINT)(toLoggerTotalSize + fromLoggerTotalSize));
+        Ptr = (char *)malloc((size_t)(toLoggerTotalSize + fromLoggerTotalSize));
         if(Ptr != NULL)
           {
             *toLogger_P_P = Ptr;
@@ -3421,7 +3446,7 @@ void *osdAllocIO(uLONG size)
  {
    void *Rtnval;
 
-   Rtnval = (void *)malloc((uINT)size);
+   Rtnval = (void *)malloc((size_t)size);
    if(Verbose)
      {
        FormatTimeString(TimeString,time(0));
@@ -3743,16 +3768,56 @@ uSHORT BuildNodeNameList(void)
    NumEntries = 0;
 
 #  if (defined(_DPT_LINUX_I2O))
+   uCHAR LinuxI2ODataBuff[MAX_I2O_CONTROLLERS];
+
    memset(&pkt, 0, sizeof(EATA_CP));
    HbaDevs[NumEntries].Flags = 0;
-   strcpy(HbaDevs[NumEntries].NodeName, "/dev/i2o/ctl");
-   IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries], I2OGETIOPS, (uCHAR *)&NumEntries, &pkt);
+   strcpy(HbaDevs[NumEntries].NodeName, DEV_CTL);
+   IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries], I2OGETIOPS, LinuxI2ODataBuff, &pkt);
    if(!IoctlRtn) {
-     for(i = 0; i < NumEntries; i ++) {
-       HbaDevs[i].Flags = NODE_FILE_VALID_HBA_B | NODE_FILE_I2O_HBA_B;
-       HbaDevs[i].IoAddress = UINTPTR_MAX;
-       strcpy(HbaDevs[i].NodeName, "/dev/i2o/ctl");
+     // step through the returned data buffer and look for the 
+     // non-zero entries, which indicate an active IOP.  For each
+     // one we find, add a corresponding entry in HbaDevs.
+     for(i = 0; i < MAX_I2O_CONTROLLERS; i ++) {
+       if ( LinuxI2ODataBuff[i] != 0  ) 
+        {
+          if(NumEntries >= MAX_HAS)
+           {
+             FormatTimeString(TimeString,time(0));
+
+             printf("\nBuildNodeNameList  : %s Warning: Found more than %d Linux I2O Controlers; ignoring those that won't fit in the HbaDevs array.",
+                    TimeString, MAX_HAS);
+
+             fflush(stdout);
+             break;
+            }
+          if(Verbose)
+            {
+              FormatTimeString(TimeString,time(0));
+
+              printf("\nBuildNodeNameList  : %s Found Linux I2O Controler, using %s device file for utility-relative controller number %d.",
+                     TimeString, DEV_CTL, NumEntries);
+
+              fflush(stdout);
+            }
+
+          HbaDevs[NumEntries].Flags = NODE_FILE_VALID_HBA_B | NODE_FILE_I2O_HBA_B;
+          HbaDevs[NumEntries].IoAddress = UINTPTR_MAX;
+          strcpy(HbaDevs[NumEntries].NodeName, DEV_CTL);
+
+          ++NumEntries;
+        }
+       else {
+              // for now, we'll assume that all the active IOP entries
+              // are at the front of the returned buffer.  In order to
+              // support "gaps", we'd need to record the IOP index in the
+              // NodeFiles_S structure and use that instead of HbaNum when
+              // we call the I2OPASSTHRU ioctl (or make sure that
+              // everything that looks at HbaDevs can handle inactive
+              // entries in the middle of the array).
+              break;
      }
+     } // for(i = 0; i < MAX_I2O_CONTROLLERS; i ++) 
    }
 #  endif
 
diff -upwbB raidutils-0.0.6/raideng/raid.h.r raidutils-0.0.6/raideng/raid.h
--- raidutils-0.0.6/raideng/raid.h.r	2005-01-24 10:41:04.000000000 +0100
+++ raidutils-0.0.6/raideng/raid.h	2008-09-12 13:41:58.000000000 +0200
@@ -271,7 +271,7 @@ struct raidDef_S : public raidDefinition
 
 // Constructor/Destructor.............................
 
-			raidDef_S::raidDef_S();
+			raidDef_S();
 
 };
 #endif  // c++
diff -upwbB raidutils-0.0.6/raideng/unreslvd.cpp.r raidutils-0.0.6/raideng/unreslvd.cpp
--- raidutils-0.0.6/raideng/unreslvd.cpp.r	2005-01-24 10:41:05.000000000 +0100
+++ raidutils-0.0.6/raideng/unreslvd.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -34,7 +34,7 @@ extern "C"
    char *__nw__FUi(int size)
    {
         char *p;
-        p = (char *)malloc(size);          
+        p = (char *)malloc((size_t)size);
         return(p);
    }
 
diff -upwbB raidutils-0.0.6/raidutil/alarm.hpp.r raidutils-0.0.6/raidutil/alarm.hpp
--- raidutils-0.0.6/raidutil/alarm.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/alarm.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -58,7 +58,7 @@ enum AlarmCommand { None, On, Off, Enabl
 class AlarmStatus:public Command
 	{
 	public:
-		AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );							
+		AlarmStatus( int hba, AlarmCommand cmd );
 		AlarmStatus( const AlarmStatus &new_AlarmStatus );
 		virtual	~AlarmStatus();
 		AlarmStatus	&operator = ( AlarmStatus &right );
diff -upwbB raidutils-0.0.6/raidutil/command.cpp.r raidutils-0.0.6/raidutil/command.cpp
--- raidutils-0.0.6/raidutil/command.cpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/command.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -2237,13 +2237,14 @@ void Command::MakeArrayOptimal(DPT_TAG_T
 }
 
 
-#ifdef sparc
-# define VOLATILE volatile
-#else
-# define VOLATILE
-#endif
-
-extern "C" { VOLATILE void exit (int);}
+//// Comment out this stuff, for Debian.
+// #ifdef sparc
+// # define VOLATILE volatile
+// #else
+// # define VOLATILE
+// #endif
+//
+// extern "C" { VOLATILE void exit (int);}
 
 void Command::Init_Engine(int scanHbasOnly)
 {
diff -upwbB raidutils-0.0.6/raidutil/eventlog.hpp.r raidutils-0.0.6/raidutil/eventlog.hpp
--- raidutils-0.0.6/raidutil/eventlog.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/eventlog.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -77,7 +77,7 @@ class EventLog:public Command
 	{
 
 	public:
-		EventLog::EventLog(SCSI_Addr_List *deviceList, 
+		EventLog(SCSI_Addr_List *deviceList,
             EventLogOptions cmd);
 		EventLog(const EventLog &new_EventLog);
 		virtual	~EventLog();
diff -upwbB raidutils-0.0.6/raidutil/expand.hpp.r raidutils-0.0.6/raidutil/expand.hpp
--- raidutils-0.0.6/raidutil/expand.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/expand.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -55,7 +55,7 @@
 class Expand:public Command
 {
    public:
-      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
+		Expand (SCSI_Address raid, SCSI_Addr_List *list);
 		Expand (const Expand &new_Expand);
 		virtual ~Expand();
 		Expand &operator = (Expand &right);
diff -upwbB raidutils-0.0.6/raidutil/forcest.hpp.r raidutils-0.0.6/raidutil/forcest.hpp
--- raidutils-0.0.6/raidutil/forcest.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/forcest.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -65,7 +65,7 @@ enum ForceStateOptions { Optimal, Fail, 
 class ForceState:public Command
 	{
 	public:
-		ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
+		ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
 		ForceState(const ForceState &new_ForceState);
 		virtual	~ForceState();
 
diff -upwbB raidutils-0.0.6/raidutil/namarray.hpp.r raidutils-0.0.6/raidutil/namarray.hpp
--- raidutils-0.0.6/raidutil/namarray.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/namarray.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -58,7 +58,7 @@ class NameArray:public Command
 {
 
 	public:
-		NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
+		NameArray(SCSI_Address arrayToName, char *arrayName);
 		NameArray(const NameArray &new_NameArray);
 		virtual	~NameArray();
 
diff -upwbB raidutils-0.0.6/raidutil/parser.cpp.r raidutils-0.0.6/raidutil/parser.cpp
--- raidutils-0.0.6/raidutil/parser.cpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/parser.cpp	2008-09-12 13:41:58.000000000 +0200
@@ -730,6 +730,7 @@ DELETE_HOT_SPARE:
                     {
                              EventLog *temp = new EventLog (components, eventLogOpts);
                              cmd_List->add_Item (*temp);
+                             delete temp;
                     }
                     else
                         Error_in_Parsing(EventStrings[STR_PARSE_ERR_MUST_SPECIFY_ADDRESS], this_Commands_Text);
diff -upwbB raidutils-0.0.6/raidutil/rmwflash.hpp.r raidutils-0.0.6/raidutil/rmwflash.hpp
--- raidutils-0.0.6/raidutil/rmwflash.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/rmwflash.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ class RMWFlash:public Command
 {
 
         public:
-                RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
+                RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
                 RMWFlash(const RMWFlash &new_RMWFlash);
                 virtual ~RMWFlash();
 
diff -upwbB raidutils-0.0.6/raidutil/segment.hpp.r raidutils-0.0.6/raidutil/segment.hpp
--- raidutils-0.0.6/raidutil/segment.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/segment.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -51,7 +51,7 @@ class arraySegment:public Command
 {
 
 	public:
-		arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
+		arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
 		arraySegment(const arraySegment &new_arraySegment);
 		virtual	~arraySegment();
 
diff -upwbB raidutils-0.0.6/raidutil/setcache.hpp.r raidutils-0.0.6/raidutil/setcache.hpp
--- raidutils-0.0.6/raidutil/setcache.hpp.r	2005-01-24 10:41:07.000000000 +0100
+++ raidutils-0.0.6/raidutil/setcache.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -55,7 +55,7 @@
 class SetCache:public Command
 	{
 	public:
-		SetCache::SetCache(
+		SetCache(
 				SCSI_Addr_List	*addresses,		// a list of addresses
 				int				on,				// Whether to enable or disable
 				int				rw				// Read or write cacheing.
diff -upwbB raidutils-0.0.6/raidutil/setrate.hpp.r raidutils-0.0.6/raidutil/setrate.hpp
--- raidutils-0.0.6/raidutil/setrate.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/setrate.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,8 +59,8 @@ class SetRate: public Command
 	public:
 
 		// Set the (global) rebuild rate
-        SetRate::SetRate(int rate, SCSI_Addr_List *objs);
-        SetRate::SetRate(const SetRate &right);
+		SetRate(int rate, SCSI_Addr_List *objs);
+		SetRate(const SetRate &right);
 		virtual	~SetRate();
 
 		Dpt_Error execute(String_List **output);
diff -upwbB raidutils-0.0.6/raidutil/setscfg.hpp.r raidutils-0.0.6/raidutil/setscfg.hpp
--- raidutils-0.0.6/raidutil/setscfg.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/setscfg.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ class setscfg:public Command
 {
 
 	public:
-		setscfg::setscfg();
+		setscfg();
 		virtual	~setscfg();
 
 		Dpt_Error execute(String_List **output);
diff -upwbB raidutils-0.0.6/raidutil/taskctrl.hpp.r raidutils-0.0.6/raidutil/taskctrl.hpp
--- raidutils-0.0.6/raidutil/taskctrl.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/taskctrl.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ enum TaskCommandOptions { List, Build, R
 class TaskControl:public Command
 	{
 	public:
-		TaskControl::TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
+		TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
 		TaskControl(const TaskControl &new_TaskControl);
 		virtual	~TaskControl();
 
diff -upwbB raidutils-0.0.6/raidutil/uartdmp.hpp.r raidutils-0.0.6/raidutil/uartdmp.hpp
--- raidutils-0.0.6/raidutil/uartdmp.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/uartdmp.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -59,7 +59,7 @@ class UartDmp:public Command
 {
 
 	public:
-		UartDmp::UartDmp(int hbaNo, char *fileName);
+		UartDmp(int hbaNo, char *fileName);
 		UartDmp(const UartDmp &new_UartDmp);
 		virtual	~UartDmp();
 
diff -upwbB raidutils-0.0.6/raidutil/zap.hpp.r raidutils-0.0.6/raidutil/zap.hpp
--- raidutils-0.0.6/raidutil/zap.hpp.r	2005-01-24 10:41:06.000000000 +0100
+++ raidutils-0.0.6/raidutil/zap.hpp	2008-09-12 13:41:58.000000000 +0200
@@ -55,7 +55,7 @@
 class Zap:public Command
 	{
 	public:
-		Zap::Zap(
+		Zap(
 				SCSI_Addr_List	*addresses,  // a list of addresses
             int resync = 0            // (send reset to hba or not)
       );								         // to delete raid tables on


--- NEW FILE raidutils.spec ---
Summary: Utilities to manage Adaptec I2O compliant RAID controllers
Name: raidutils
Version: 0.0.6
Release: 2%{?dist}
License: BSD
Group: Applications/System
URL: http://i2o.shadowconnect.com/
Source: http://i2o.shadowconnect.com/raidutils/%{name}-%{version}.tar.bz2
# based on http://ftp.de.debian.org/debian/pool/main/r/raidutils/raidutils_0.0.6-8.diff.gz
Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)

%description
The raidutils program allow the user to manage the Adaptec I2O compliant RAID
controllers. It can, for example, create/delete an RAID array, add/remove a hot
spare drive to/from a RAID array, activate/silence the alarm or get information
about the status of the RAID array and disks.

%prep
%setup -q
%patch0 -p1 -b .r

%build
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
rm %{buildroot}%{_libdir}/libraidutil.{la,so}

%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig/modules

cat << __EOF__ >> %{buildroot}%{_sysconfdir}/sysconfig/modules/raidutils.modules
#!/bin/sh
modprobe i2o_config >/dev/null 2>&1
__EOF__
chmod 755 %{buildroot}%{_sysconfdir}/sysconfig/modules/raidutils.modules

%clean
%{__rm} -rf %{buildroot}

%post
/sbin/ldconfig
modprobe i2o_config >/dev/null 2>&1 || :

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_sysconfdir}/sysconfig/modules/raidutils.modules
%{_bindir}/raidutil
%{_bindir}/raideng
%{_libdir}/libraidutil.so.*

%changelog
* Wed Dec 31 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.6-2
- added i2o_config module autoloading
- drop redundant BR: gcc-c++

* Fri Sep 12 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.6-1
- adapted for Fedora/EPEL
- disabled building static library
- extracted relevant bits from Debian patch
- fixed build with recent glibc

* Thu Jun 08 2006 Stephan Lauffer <lauffer at ph-freiburg.de>
- patch raidutils-gcc++-4.1-patch.diff fixes compiler errors with gcc-c++-4.1.0
  This patch is taken from the fix in http://bugs.debian.org/356366
* Mon Jan 24 2005 Markus Lidel <Markus.Lidel at shadowconnect.com>
- New version for FC3.
* Wed May 18 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- Compiled with new kernel interface.
* Wed May 05 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- Changed recognition of I2O pass-thru option availability.
- Now raidutils use the right headers if using gcc version 3.3.
* Mon May 03 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- Cleaned up RPM regarding the guideline of Anvil, warren and mschwendt. Many
  thanks to them.
* Sun May 02 2004 Markus Lidel <Markus.Lidel at shadowconnect.com>
- first version with SPEC file to build a rpm.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/raidutils/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2009 17:33:19 -0000	1.1
+++ .cvsignore	6 Apr 2009 18:24:57 -0000	1.2
@@ -0,0 +1 @@
+raidutils-0.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/raidutils/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2009 17:33:20 -0000	1.1
+++ sources	6 Apr 2009 18:24:57 -0000	1.2
@@ -0,0 +1 @@
+d32ed6789a11dca51cbc6d4428e26d8b  raidutils-0.0.6.tar.bz2



From erikos at fedoraproject.org  Mon Apr  6 18:31:23 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 18:31:23 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.31, 1.32 sources, 1.35,
	1.36 sugar-toolkit.spec, 1.45, 1.46
Message-ID: <20090406183123.561BE700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5453

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.3-1
- Journal Palette does not manage too many characters for a title correctly #610
- Bundlebuilder list_files: Better error handling #635
- Only call read_file once on activity startup #428
- Revert "Listen for map in Window instead of in Canvas (alsroot) #428"
- Use git ls-files instead of git-ls-files, to work with newer Git. d.sl.o #647
- Bundlebuilder: Don't include whole directory in src tarball #397




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	1 Apr 2009 05:30:33 -0000	1.31
+++ .cvsignore	6 Apr 2009 18:30:52 -0000	1.32
@@ -1 +1 @@
-sugar-toolkit-0.84.1-git0a65259dc5.tar.bz2
+sugar-toolkit-0.84.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	1 Apr 2009 05:30:35 -0000	1.35
+++ sources	6 Apr 2009 18:30:52 -0000	1.36
@@ -1 +1 @@
-6850f235fbb1f1e95136fb359a3e9c3a  sugar-toolkit-0.84.1-git0a65259dc5.tar.bz2
+2a2d1a7fd54fa01b7547489bce0c2088  sugar-toolkit-0.84.3.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sugar-toolkit.spec	1 Apr 2009 05:30:35 -0000	1.45
+++ sugar-toolkit.spec	6 Apr 2009 18:30:52 -0000	1.46
@@ -5,15 +5,15 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.84.1
-#Release: 1%{?dist}
-Release: 2.%{alphatag}%{?dist}
+Version: 0.84.3
+Release: 1%{?dist}
+#Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
 # cd sugar
 # git-checkout %{commitid}
-Source0: %{name}-%{version}-git%{commitid}.tar.bz2
-#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
 License: LGPLv2
 Group: System Environment/Libraries
@@ -69,6 +69,14 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.3-1
+- Journal Palette does not manage too many characters for a title correctly #610
+- Bundlebuilder list_files: Better error handling #635
+- Only call read_file once on activity startup #428
+- Revert "Listen for map in Window instead of in Canvas (alsroot) #428"
+- Use git ls-files instead of git-ls-files, to work with newer Git. d.sl.o #647
+- Bundlebuilder: Don't include whole directory in src tarball #397
+
 * Wed Apr 01 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-2.20090401git0a65259dc5
 - git snapshot
 



From akurtakov at fedoraproject.org  Mon Apr  6 18:32:17 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon,  6 Apr 2009 18:32:17 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse.spec,1.626,1.627
Message-ID: <20090406183217.567F9700FB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5777/F-11

Modified Files:
	eclipse.spec 
Log Message:
Fix jdt owning dropins/jdt folder.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- eclipse.spec	2 Apr 2009 22:28:22 -0000	1.626
+++ eclipse.spec	6 Apr 2009 18:31:46 -0000	1.627
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1477,27 +1477,7 @@
 %files jdt
 %defattr(-,root,root)
 %{_bindir}/efj
-%{_libdir}/%{name}/dropins/jdt/content.xml
-%{_libdir}/%{name}/dropins/jdt/features
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*
+%{_libdir}/%{name}/dropins/jdt
 
 %files pde
 %defattr(-,root,root)
@@ -1507,6 +1487,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-8
+- Fix jdt owning dropins/jdt folder.
+
 * Thu Apr 2 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-7
 - Add patch from upstream to work with XULRunner 1.9.1.
 - Red Hat bugzilla #483832 (and its duplicates).



From trasher at fedoraproject.org  Mon Apr  6 18:37:57 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Mon,  6 Apr 2009 18:37:57 +0000 (UTC)
Subject: rpms/eric/F-10 .cvsignore, 1.16, 1.17 eric.spec, 1.37, 1.38 sources,
	1.19, 1.20
Message-ID: <20090406183757.2D972700FB@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7265

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	8 Mar 2009 09:59:30 -0000	1.16
+++ .cvsignore	6 Apr 2009 18:37:26 -0000	1.17
@@ -1,8 +1,8 @@
-eric4-4.3.1.tar.gz
-eric4-i18n-fr-4.3.1.tar.gz
-eric4-i18n-de-4.3.1.tar.gz
-eric4-i18n-ru-4.3.1.tar.gz
-eric4-i18n-cs-4.3.1.tar.gz
-eric4-i18n-es-4.3.1.tar.gz
-eric4-i18n-tr-4.3.1.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz
+eric4-4.3.2.tar.gz
+eric4-i18n-fr-4.3.2.tar.gz
+eric4-i18n-de-4.3.2.tar.gz
+eric4-i18n-ru-4.3.2.tar.gz
+eric4-i18n-cs-4.3.2.tar.gz
+eric4-i18n-es-4.3.2.tar.gz
+eric4-i18n-tr-4.3.2.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.2.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/eric.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- eric.spec	8 Mar 2009 09:59:30 -0000	1.37
+++ eric.spec	6 Apr 2009 18:37:26 -0000	1.38
@@ -7,7 +7,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPL+
@@ -147,7 +147,10 @@
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
-* Sun Mar 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.0-1
+* Mon Apr 6 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.2-1
+- 4.3.2
+
+* Sun Mar 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.1-1
 - 4.3.1
 
 * Mon Feb 9 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Mar 2009 09:59:30 -0000	1.19
+++ sources	6 Apr 2009 18:37:26 -0000	1.20
@@ -1,8 +1,8 @@
-f7060154d397ca53dcc3fc43995c73b7  eric4-4.3.1.tar.gz
-2829cd57dc9d817be19bdf4243531086  eric4-i18n-fr-4.3.1.tar.gz
-fdbbcb08cde6c9b409ff9f96537e238c  eric4-i18n-de-4.3.1.tar.gz
-8bd1f98855456b38e84951e1c085e760  eric4-i18n-ru-4.3.1.tar.gz
-4a1c78ff3d5e6bc07c28492364a9aed0  eric4-i18n-cs-4.3.1.tar.gz
-d9d5bc76e586dbde47ad83bd4c62d106  eric4-i18n-es-4.3.1.tar.gz
-74fcd0fcad8cd394ec903d9d2f937f12  eric4-i18n-tr-4.3.1.tar.gz
-90bddf5c5a87aba71de3d2b480ac94b2  eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz
+7b62ee59f0a03ae7a400d7e41679d33e  eric4-4.3.2.tar.gz
+d2ca5125440104615f9d8611b5e3023c  eric4-i18n-fr-4.3.2.tar.gz
+da0656485058e7620eabba84e15523b3  eric4-i18n-de-4.3.2.tar.gz
+8dbe6f79e2cad8cce50f89772c51b69e  eric4-i18n-ru-4.3.2.tar.gz
+374171cdfd6cd432aa18774726e1cda3  eric4-i18n-cs-4.3.2.tar.gz
+6a3173c80ce28909e0baad9502bf8487  eric4-i18n-es-4.3.2.tar.gz
+b747cbcf252fc14b3eb12afb4b979fa1  eric4-i18n-tr-4.3.2.tar.gz
+777ea5ea1397610e3c9c20d6436371db  eric4-i18n-zh_CN.GB2312-4.3.2.tar.gz



From jsanders at fedoraproject.org  Mon Apr  6 18:44:50 2009
From: jsanders at fedoraproject.org (Jeremy Sanders)
Date: Mon,  6 Apr 2009 18:44:50 +0000 (UTC)
Subject: rpms/veusz/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 veusz.spec, 
	1.21, 1.22
Message-ID: <20090406184450.11D87700FB@cvs1.fedora.phx.redhat.com>

Author: jsanders

Update of /cvs/pkgs/rpms/veusz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9414

Modified Files:
	.cvsignore sources veusz.spec 
Log Message:
Update to veusz 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Dec 2008 16:57:19 -0000	1.5
+++ .cvsignore	6 Apr 2009 18:44:19 -0000	1.6
@@ -1 +1 @@
-veusz-1.2.1.tar.gz
+veusz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Dec 2008 16:57:19 -0000	1.6
+++ sources	6 Apr 2009 18:44:19 -0000	1.7
@@ -1 +1 @@
-bff626129e81eb7708ebd68998743f75  veusz-1.2.1.tar.gz
+b76a1581d54f78c59958e7c110778b29  veusz-1.3.tar.gz


Index: veusz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/veusz.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- veusz.spec	26 Feb 2009 00:14:22 -0000	1.21
+++ veusz.spec	6 Apr 2009 18:44:19 -0000	1.22
@@ -3,8 +3,8 @@
 %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
 
 Name:           veusz
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        GUI scientific plotting package
 
 Group:          Applications/Productivity
@@ -77,6 +77,8 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/veusz
 mv ${RPM_BUILD_ROOT}%{python_sitearch}/veusz/windows/icons/*.png \
         ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/veusz
+mv ${RPM_BUILD_ROOT}%{python_sitearch}/veusz/windows/icons/*.svg \
+        ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/veusz
 ln -s veusz/veusz_48.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/veusz.png
 
 # Mark some scripts as executable.
@@ -131,9 +133,13 @@
 %{python_sitearch}/veusz/windows/*.py[co]
 %dir %{_datadir}/pixmaps/veusz
 %{_datadir}/pixmaps/veusz/*.png
+%{_datadir}/pixmaps/veusz/*.svg
 %{_datadir}/pixmaps/veusz.png
 
 %changelog
+* Mon Apr 6 2009 Jeremy Sanders <jeremysanders at jeremysanders.net> - 1.3-1
+- Update to Veusz 1.3
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From erikos at fedoraproject.org  Mon Apr  6 18:47:00 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 18:47:00 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 sugar-base.spec, 1.16, 1.17
Message-ID: <20090406184700.CB195700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10076

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-1
- sugar/dispatch/license.txt is missing from the sugar-base source tarball #704




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Mar 2009 21:08:00 -0000	1.11
+++ .cvsignore	6 Apr 2009 18:46:30 -0000	1.12
@@ -1 +1 @@
-sugar-base-0.84.0.tar.bz2
+sugar-base-0.84.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Mar 2009 21:08:00 -0000	1.11
+++ sources	6 Apr 2009 18:46:30 -0000	1.12
@@ -1 +1 @@
-7dd197a597d01808784aa350000f26af  sugar-base-0.84.0.tar.bz2
+0ef47ff5a8931e0e7c732d22a514d297  sugar-base-0.84.1.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-base.spec	3 Mar 2009 21:08:00 -0000	1.16
+++ sugar-base.spec	6 Apr 2009 18:46:30 -0000	1.17
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.84.0
+Version: 0.84.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -45,6 +45,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-1
+- sugar/dispatch/license.txt is missing from the sugar-base source tarball #704
+
 * Tue Mar 03 2009 Simon Schampijer <simon at schampijer.de> - 0.84.0-1
 - Rebuild for 0.84
 



From orion at fedoraproject.org  Mon Apr  6 18:49:09 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  6 Apr 2009 18:49:09 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine-6.2u2_1-Werror.patch, NONE,
	1.1 gridengine-6.2u2_1-izpack.patch, NONE,
	1.1 gridengine-6.2u2_1-libs.patch, NONE,
	1.1 gridengine-6.2u2_1-rctemplates.patch, NONE,
	1.1 gridengine-6.2u2_1-rpath.patch, NONE,
	1.1 gridengine-6.2u2_1-sge_ca.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 gridengine.spec, 1.13, 1.14 sources, 1.6,
	1.7 gridengine-6.1pre-Werror.patch, 1.1,
	NONE gridengine-6.1u3-rpath.patch, 1.1,
	NONE gridengine-6.2-sge_ca.patch, 1.1,
	NONE gridengine-6.2beta2-libs.patch, 1.1,
	NONE gridengine-6.2u1-rctemplates.patch, 1.1, NONE
Message-ID: <20090406184909.5D443700FB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10976

Modified Files:
	.cvsignore gridengine.spec sources 
Added Files:
	gridengine-6.2u2_1-Werror.patch 
	gridengine-6.2u2_1-izpack.patch gridengine-6.2u2_1-libs.patch 
	gridengine-6.2u2_1-rctemplates.patch 
	gridengine-6.2u2_1-rpath.patch gridengine-6.2u2_1-sge_ca.patch 
Removed Files:
	gridengine-6.1pre-Werror.patch gridengine-6.1u3-rpath.patch 
	gridengine-6.2-sge_ca.patch gridengine-6.2beta2-libs.patch 
	gridengine-6.2u1-rctemplates.patch 
Log Message:
* Mon Apr 6 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u2_1-1
- Update to 6.2u2_1
- Rebase several patches


gridengine-6.2u2_1-Werror.patch:

--- NEW FILE gridengine-6.2u2_1-Werror.patch ---
--- gridengine/source/aimk.Werror	2009-03-19 16:16:18.000000000 -0600
+++ gridengine/source/aimk	2009-03-19 16:25:58.000000000 -0600
@@ -1392,7 +1392,7 @@
       set CFLAGS = "$CFLAGS -Wno-strict-aliasing"
    endif
 
-   set CFLAGS = "$OFLAG -Wall -Werror -Wstrict-prototypes -DUSE_POLL -DLINUX -D$BUILDARCH -D$COMPILE_ARCH -D_GNU_SOURCE -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
+   set CFLAGS = "$OFLAG -Wall -Wstrict-prototypes -DUSE_POLL -DLINUX -D$BUILDARCH -D$COMPILE_ARCH -D_GNU_SOURCE -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
 
    if ("$ADOC" == 1) then
       set CFLAGS = "$CFLAGS -Wno-error"

gridengine-6.2u2_1-izpack.patch:

--- NEW FILE gridengine-6.2u2_1-izpack.patch ---
--- gridengine/source/clients/gui-installer/build.xml.izpack	2009-02-16 04:15:38.000000000 -0700
+++ gridengine/source/clients/gui-installer/build.xml	2009-03-25 14:05:54.000000000 -0600
@@ -66,20 +66,20 @@
         <echo message="Check IzPack"/>
             <!-- Check IzPack is build, if not build it -->
         <condition property="izpack.isbuild">
-            <available file="${izpack.home}/_build"/>
+            <available file="${izpack.lib}/standalone-compiler.jar"/>
         </condition>
         <antcall target="build.izpack"/>
             <!-- Check that IzPack was build and we have it on the classpath -->
         <condition property="izpack.complete">
             <available classpath="${javac.classpath}" classname="com.izforge.izpack.installer.IzPanel"/>
         </condition>
-        <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.home property in the gridengine/source/build_private.properties first!"/>
+        <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.lib property in the gridengine/source/build_private.properties first!"/>
 
         <!-- Let's copy the stuff we need locally to our build.dir, so each user works with his own files -->
         <property name="build.panels.dir" value="bin/panels"/>
         <property name="compiler.path" value="${build.dir}/standalone-compiler.jar"/>
         <mkdir dir="${build.panels.dir}"/>
-        <copyfile src="${izpack.home}/lib/standalone-compiler.jar" dest="${compiler.path}"/>
+        <copyfile src="${izpack.lib}/standalone-compiler.jar" dest="${compiler.path}"/>
 
         <echo message="Building prerequsities from source/3rdparty/IzPack/src ..."/>
         <javac srcdir="../../3rdparty/IzPack/src" 

gridengine-6.2u2_1-libs.patch:

--- NEW FILE gridengine-6.2u2_1-libs.patch ---
--- gridengine/source/3rdparty/qmon/ltree/Makefile.aimk.libs	2008-02-01 14:19:16.000000000 -0700
+++ gridengine/source/3rdparty/qmon/ltree/Makefile.aimk	2008-02-01 14:19:09.000000000 -0700
@@ -27,7 +27,7 @@
 	$(RANLIB) libXltree.a
 
 libXltree$(SHAREDEXT): $(XLTREE_OBJS)
-	$(SHAREDLD) $(XLFLAGS) $(GSHARED_LFLAGS) -o libXltree$(SHAREDEXT) $(XLTREE_OBJS) $(XLIBS)
+	$(SHAREDLD) $(XLFLAGS) $(GSHARED_LFLAGS) -o libXltree$(SHAREDEXT) $(XLTREE_OBJS) -lXm
 
 Xltree_clean:
 	$(RM) $(XLTREE_OBJS) libXltree.a libXltree$(SHAREDEXT)

gridengine-6.2u2_1-rctemplates.patch:

--- NEW FILE gridengine-6.2u2_1-rctemplates.patch ---
--- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates	2008-11-05 14:01:08.000000000 -0700
+++ gridengine/source/dist/util/install_modules/inst_common.sh	2008-11-06 08:56:03.000000000 -0700
@@ -2189,14 +2189,6 @@
 
       rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
 
-      if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" -a $hosttype = "master" ]; then
-         AddDefaultManager root $ADMINUSER
-         AddDefaultOperator $ADMINUSER
-      elif [ $euid != 0 -a $hosttype = "master" ]; then
-         AddDefaultManager $USER
-         AddDefaultOperator $USER
-      fi
-
       $INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME 
    fi
 
@@ -2204,6 +2196,22 @@
 
 
 #-------------------------------------------------------------------------
+# SetupDefaultUsers: Add the default manager and operator
+#
+SetupDefaultUsers() {
+   euid=$1
+
+   if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" ]; then
+      AddDefaultManager root $ADMINUSER
+      AddDefaultOperator $ADMINUSER
+   elif [ $euid != 0 ]; then
+      AddDefaultManager $USER
+      AddDefaultOperator $USER
+   fi
+}
+
+
+#-------------------------------------------------------------------------
 # AddSGEStartUpScript: Add startup script to rc files if root installs
 #
 AddSGEStartUpScript()
--- gridengine/source/scripts/distinst.rctemplates	2008-06-04 04:04:10.000000000 -0600
+++ gridengine/source/scripts/distinst	2008-07-15 16:05:33.000000000 -0600
@@ -810,15 +810,9 @@
       Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
       if [ $enforce_shlibpath = true ]; then
          Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
          Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
       else
          Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
          Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
       fi
       Cleanup util
@@ -833,7 +827,6 @@
 
       Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
 			$DEST_SGE_ROOT/util/upgrade_modules \
-                        $DEST_SGE_ROOT/util/rctemplates \
                         $DEST_SGE_ROOT/util/resources \
                         $DEST_SGE_ROOT/util/sgeCA \
                         $DEST_SGE_ROOT/util/resources/calendars \
@@ -858,7 +851,6 @@
                         $DEST_SGE_ROOT/util/resources/starter_methods/*
 
       Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
-                        $DEST_SGE_ROOT/util/rctemplates/* \
                         $DEST_SGE_ROOT/util/sgeCA/*.cnf \
                         $DEST_SGE_ROOT/util/sgeSMF/*.xml \
                         $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates	2008-12-18 15:26:15.000000000 -0700
+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh	2008-12-18 15:29:59.000000000 -0700
@@ -198,8 +198,8 @@
                    "Grid Engine Installation and Administration Manual for details) the account\n" \
                    "on the shadow master hosts also needs read/write access to this directory.\n\n" \
                    "The following directory\n\n [%s]\n\n will be used as qmaster spool directory by default!\n" \
-                   $SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster
-                   QMDIR=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster
+                   /var/spool/gridengine/$SGE_CELL_VAL/qmaster
+                   QMDIR=/var/spool/gridengine/$SGE_CELL_VAL/qmaster
 
       $INFOTEXT -auto $AUTO -ask "y" "n" -def "n" -n \
                 "Do you want to select another qmaster spool directory (y/n) [n] >> "
@@ -208,7 +208,7 @@
          done=true
       else
          $INFOTEXT -n "Please enter a qmaster spool directory now! >>" 
-         QMDIR=`Enter $SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster`
+         QMDIR=`Enter /var/spool/gridengine/$SGE_CELL_VAL/qmaster`
          done=true
       fi
    done
@@ -721,6 +721,9 @@
    ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap
    PrintBootstrap >> $COMMONDIR/bootstrap
    ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap
+   rm -f /etc/sysconfig/gridengine
+   echo "SGE_ROOT=/usr/share/gridengine" >> /etc/sysconfig/gridengine
+   echo "SGE_CELL=$SGE_CELL" >> /etc/sysconfig/gridengine
 }
 
 #-------------------------------------------------------------------------
@@ -936,7 +939,7 @@
       fi
       
       if [ -z "$1" ]; then
-         default_value=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool
+         default_value=/var/spool/gridengine/$SGE_CELL_VAL
       else
          default_value="$1"
       fi
@@ -1195,6 +1198,7 @@
          touch /tmp/pwfile.$$
          chmod 600 /tmp/pwfile.$$
          echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$
+         ExecuteAsAdmin mkdir -p `dirname $SGE_JMX_SSL_KEYSTORE`
          OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1`
          if [ $? != 0 ]; then
             $INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT"
@@ -1236,7 +1240,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE -qmaster
+      /sbin/service sgemaster start
    fi
    # wait till qmaster.pid file is written
    sleep 1
@@ -1812,6 +1816,7 @@
       # Extract the seperate micro and patch numbers, ignoring anything
       # after the 2-digit patch.
       patch=`echo $micro | awk -F_ '{print substr($2, 1, 2)}'`
+      [ "$patch" = "0" ] && patch="00"
       micro=`echo $micro | awk -F_ '{print $1}'`
    fi
 
@@ -1832,7 +1837,7 @@
    if [ "$JAVA_HOME" != "" ]; then
       java_home=$JAVA_HOME
    else
-      java_home=/usr/java
+      java_home=/usr/lib/jvm/jre
    fi
    
    # set JRE_HOME 
--- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates	2008-07-15 16:03:19.000000000 -0600
+++ gridengine/source/dist/util/install_modules/inst_execd.sh	2008-07-15 16:09:53.000000000 -0600
@@ -430,7 +430,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE
+      /sbin/service sge_execd start
    fi
    $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
    $CLEAR
--- gridengine/source/dist/util/create_settings.sh.rctemplates	2008-02-08 04:57:29.000000000 -0700
+++ gridengine/source/dist/util/create_settings.sh	2008-11-11 11:04:20.000000000 -0700
@@ -67,8 +67,6 @@
 echo "setenv SGE_ROOT $SGE_ROOT"                         >  $SP_CSH
 echo ""                                                  >> $SP_CSH
 echo "set ARCH = \`\$SGE_ROOT/util/arch\`"               >> $SP_CSH
-echo "set DEFAULTMANPATH = \`\$SGE_ROOT/util/arch -m\`"  >> $SP_CSH
-echo "set MANTYPE = \`\$SGE_ROOT/util/arch -mt\`"        >> $SP_CSH
 echo ""                                                  >> $SP_CSH
 
 #if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
@@ -93,31 +91,9 @@
 
 
 echo ""                                                          >> $SP_CSH
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH
-echo 'if ( $?MANPATH == 1 ) then'                                >> $SP_CSH
-echo "   setenv MANPATH \$SGE_ROOT/"'${MANTYPE}':'$MANPATH'      >> $SP_CSH
-echo "else"                                                      >> $SP_CSH
-echo "   setenv MANPATH \$SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH
-echo "endif"                                                     >> $SP_CSH
-echo ""                                                          >> $SP_CSH
 echo "set path = ( \$SGE_ROOT/bin/"'$ARCH $path )'               >> $SP_CSH
 
-echo 'switch ($ARCH)'                                            >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "sol*":'                           >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "lx*":'                            >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "hp11-64":'                        >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo '   breaksw'                             >> $SP_CSH
-echo 'case "*":'                                                 >> $SP_CSH
-echo "   set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`"       >> $SP_CSH
-echo "   if ( \`eval echo '\$?'\$shlib_path_name\` ) then"          >> $SP_CSH
-echo "      set old_value = \`eval echo '\$'\$shlib_path_name\`"    >> $SP_CSH
-echo "      setenv \$shlib_path_name \"\$SGE_ROOT/lib/\$ARCH\":\"\$old_value\""   >> $SP_CSH
-echo "   else"                                                      >> $SP_CSH
-echo "      setenv \$shlib_path_name \$SGE_ROOT/lib/\$ARCH"         >> $SP_CSH
-echo "   endif"                                                     >> $SP_CSH
-echo "   unset shlib_path_name  old_value"                          >> $SP_CSH
-echo "endsw"                                                        >> $SP_CSH
-echo "unset ARCH DEFAULTMANPATH MANTYPE"                            >> $SP_CSH
+echo "unset ARCH"                                                   >> $SP_CSH
 
 #
 # bourne shell settings file
@@ -126,8 +102,6 @@
 echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT"                        > $SP_SH
 echo ""                                                          >> $SP_SH
 echo "ARCH=\`\$SGE_ROOT/util/arch\`"                             >> $SP_SH
-echo "DEFAULTMANPATH=\`\$SGE_ROOT/util/arch -m\`"                >> $SP_SH
-echo "MANTYPE=\`\$SGE_ROOT/util/arch -mt\`"                      >> $SP_SH
 echo ""                                                          >> $SP_SH
 
 if [ "$SGE_CELL" != "" ]; then
@@ -151,28 +125,7 @@
 
 
 echo ""                                                          >> $SP_SH
-echo "if [ \"\$MANPATH\" = \"\" ]; then"                         >> $SP_SH
-echo "   MANPATH=\$DEFAULTMANPATH"                               >> $SP_SH
-echo "fi"                                                        >> $SP_SH
-echo "MANPATH=\$SGE_ROOT/\$MANTYPE:\$MANPATH; export MANPATH"    >> $SP_SH
-echo ""                                                          >> $SP_SH
 echo "PATH=\$SGE_ROOT/bin/\$ARCH:\$PATH; export PATH"            >> $SP_SH
 
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
-echo 'case $ARCH in'                                                >> $SP_SH
-#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64)'                         >> $SP_SH
-#ENFORCE_SHLIBPATH#echo '   ;;'                                     >> $SP_SH
-echo '*)'                                                           >> $SP_SH
-echo "   shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`"             >> $SP_SH
-echo "   old_value=\`eval echo '\$'\$shlib_path_name\`"             >> $SP_SH
-echo "   if [ x\$old_value = "x" ]; then"                           >> $SP_SH
-echo "      eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH"           >> $SP_SH
-echo "   else"                                                      >> $SP_SH
-echo "      eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH:\$old_value" >> $SP_SH
-echo "   fi"                                                        >> $SP_SH
-echo "   export \$shlib_path_name"                                  >> $SP_SH
-echo '   unset shlib_path_name old_value'                           >> $SP_SH
-echo '   ;;'                                                        >> $SP_SH
-echo 'esac'                                                         >> $SP_SH
-echo "unset ARCH DEFAULTMANPATH MANTYPE"                            >> $SP_SH
+echo "unset ARCH"                                                   >> $SP_SH
 
--- gridengine/source/dist/inst_sge.rctemplates	2009-02-16 05:01:28.000000000 -0700
+++ gridengine/source/dist/inst_sge	2009-03-19 16:04:37.000000000 -0600
@@ -591,8 +591,7 @@
    fi
    AddJMXFiles
    RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
-   CreateSGEStartUpScripts $euid true master
-   CreateSGEStartUpScripts $euid true execd
+   SetupDefaultUsers $euid
    CreateSettingsFile
    InitCA
    SetupRcScriptNames master #New qmaster RC script/SMF
@@ -745,7 +744,6 @@
       Makedir $COMMONDIR
       ProcessSGEClusterName "bdb"
       SetSpoolingOptions
-      AddSGEStartUpScript $euid "bdb"
       PrepareRPCServerStart
       GiveBerkelyHints
    else
@@ -797,11 +795,9 @@
  AddDefaultUsersets
  AddCommonFiles
  AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
  CreateSettingsFile
  InitCA
- AddSGEStartUpScript $euid master
  StartQmaster
  AddWindowsAdmin
  AddHosts
@@ -975,7 +971,6 @@
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
       AddSubmitHostsExecd
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst     #service install during execd installation -> param: execinst
       CopyIBMLoadSensor
       StartExecd
@@ -1011,7 +1006,6 @@
       CheckHostNameResolving install
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst  #service install during execd installation -> param: execinst
       CopyIBMLoadSensor
       StartExecd
@@ -1268,7 +1262,6 @@
       if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
          . $SGE_ROOT/$SGE_CELL/common/settings.sh
          SGE_ARCH=`$SGE_ROOT/util/arch`
-         AddSGEStartUpScript $euid shadow
 	     $INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
 	     if [ "$SGE_ENABLE_SMF" = "true" ]; then
 	        $SVCADM enable -s "svc:/application/sge/shadowd:$SGE_CLUSTER_NAME"
@@ -1305,7 +1298,6 @@
             . $SGE_ROOT/$CELL_NAME/common/settings.sh
             SGE_ARCH=`$SGE_ROOT/util/arch`
             $SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &
-            AddSGEStartUpScript $euid shadow
          else
               echo ". $SGE_ROOT/$CELL_NAME/common/settings.sh; SGE_ARCH=`$SGE_ROOT/util/arch`; $SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &" | $SHELL_NAME $SHADOW /bin/sh &
               #TODO: install rc script
@@ -1501,20 +1493,7 @@
 
    COMMONDIR=$SGE_CELL/common
 
-   CreateSGEStartUpScripts 0 true master
-   CreateSGEStartUpScripts 0 true execd
-   
-   $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \
-             "directory:\n\n" \
-             "   %s\n\n" \
-             "Your old startup scripts are saved in this directory as\n\n" \
-             "   %s\n" \
-             "   %s\n\n" \
-             \$SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE
-   
-   $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \
-             "file location on all qmaster, shadowd and execution hosts."
-   
+   SetupDefaultUser 0
 fi
 
 exit 0

gridengine-6.2u2_1-rpath.patch:

--- NEW FILE gridengine-6.2u2_1-rpath.patch ---
--- gridengine/source/aimk.rpath	2009-03-19 16:30:16.000000000 -0600
+++ gridengine/source/aimk	2009-03-20 08:11:37.000000000 -0600
@@ -1454,10 +1454,8 @@
    endif
    set JAVA_ARCH = "linux"
 
-   # due to -rpath relative_path the LD_LIBRARY_PATH not needed anymore
-   set RUNPATH       = -Wl,-rpath,'\$$ORIGIN'/../../lib/$buildarch
-   set LFLAGS        = "$LFLAGS $RUNPATH"
-   set SHARED_LFLAGS = "$SHARED_LFLAGS $RUNPATH"
+   set LFLAGS        = "$LFLAGS"
+   set SHARED_LFLAGS = "$SHARED_LFLAGS"
 
    if ( $COMPILE_ARCH == "ULINUX86_24" || $COMPILE_ARCH == "ULINUXAMD64_24" ) then
       echo "Ignore jemalloc for unsupported architectures!"

gridengine-6.2u2_1-sge_ca.patch:

--- NEW FILE gridengine-6.2u2_1-sge_ca.patch ---
--- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca	2008-12-08 13:38:02.000000000 -0700
+++ gridengine/source/dist/util/sgeCA/sge_ca	2009-03-19 16:11:13.000000000 -0600
@@ -928,7 +928,10 @@
       return 1
    fi
 
-   JVM_ARGS="-cp $ROOT_PATH/lib/juti.jar"
+   case "$ARCH" in
+   *64) JVM_ARGS="-cp /usr/lib64/gridengine/juti.jar";;
+     *) JVM_ARGS="-cp /usr/lib/gridengine/juti.jar";;
+   esac
    JVM_ARGS="$JVM_ARGS -Djava.util.logging.config.file=$ROOT_PATH/util/sgeCA/logging.properties"
 
    OUTPUT=`$JAVA $JVM_ARGS com.sun.grid.ca.Main $CA_ARGS 2>&1`
@@ -1722,22 +1725,6 @@
    exit 1
 fi
 
-if [ ! -d "$ROOT_PATH/lib/$ARCH" ]; then
-    echo
-    echo "Error: The lib directory \"$ROOT_PATH/lib/$ARCH\" does not exist"
-    echo "Please verify your setup and restart this script. Exit."
-    exit 1
-fi
-
-shlib_path_name=`$ROOT_PATH/util/arch -lib`
-old_shlib_path_name=`eval echo '$'$shlib_path_name`
-if [ x$old_shlib_path_name  = x ]; then
-   eval $shlib_path_name=$ROOT_PATH/lib/$ARCH
-else
-   eval $shlib_path_name="$ROOT_PATH/lib/${ARCH}:${old_shlib_path_name}"
-fi
-export $shlib_path_name
-
 #---------------------------------------
 # setup INFOTEXT begin
 #---------------------------------------
@@ -1776,7 +1763,7 @@
 #
 #  Check wether all needed binaries are exists
 #
-for i in adminrun openssl uidgid; do
+for i in adminrun uidgid; do
    if [ ! -x $V5UTILBIN/$i ]; then
       PrintErrorAndExit 1 "Error: Can't find binary \"%s\"" $V5UTILBIN/$i
    fi
@@ -1805,7 +1792,7 @@
 
 CAKEY=cakey.pem
 CACERT=cacert.pem
-OPENSSL=$V5UTILBIN/openssl
+OPENSSL=/usr/bin/openssl
 
 AUTO="false"
 #-----------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2008 23:37:13 -0000	1.5
+++ .cvsignore	6 Apr 2009 18:49:08 -0000	1.6
@@ -1 +1 @@
-ge-V62u1_TAG-src.tar.gz
+ge-V62u2_1_TAG-src.tar.gz


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gridengine.spec	25 Feb 2009 01:07:24 -0000	1.13
+++ gridengine.spec	6 Apr 2009 18:49:08 -0000	1.14
@@ -5,8 +5,8 @@
 %define gecos Grid Engine
 
 Name:    gridengine
-Version: 6.2u1
-Release: 4%{?dist}
+Version: 6.2u2_1
+Release: 1%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -18,7 +18,7 @@
 # which is not used or linked by other parts of gridengine.
 License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
 URL:     http://gridengine.sunsource.net/
-Source0: http://gridengine.sunsource.net/files/documents/7/190/ge-V62u1_TAG-src.tar.gz
+Source0: http://gridengine.sunsource.net/files/documents/7/197/ge-V62u2_1_TAG-src.tar.gz
 Source1: gridengine-ppc.tar.gz
 Source2: my_configuration.conf
 Source3: sge.csh
@@ -37,16 +37,16 @@
 Patch2: gridengine-6.2beta-inst.patch
 # Don't need to make rc files in inst_common.sh
 # Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
-Patch3: gridengine-6.2u1-rctemplates.patch
+Patch3: gridengine-6.2u2_1-rctemplates.patch
 # Fixup sge_ca to use system openssl and java paths
-Patch4: gridengine-6.2-sge_ca.patch
+Patch4: gridengine-6.2u2_1-sge_ca.patch
 # Fixup jni paths
 Patch5: gridengine-6.2-jni.patch
 # Use system db_ utils
 Patch6: gridengine-6.2-db.patch
 # aimk sets -Werror, but there are lots of warnings
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
-Patch7: gridengine-6.1pre-Werror.patch
+Patch7: gridengine-6.2u2_1-Werror.patch
 # Import specific classes to avoid pulling in other ones
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2924
 Patch8: gridengine-6.2-import.patch
@@ -56,12 +56,14 @@
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2586
 Patch19: gridengine-6.1u2-auto.patch
 # Don't use rpaths
-Patch22: gridengine-6.1u3-rpath.patch
+Patch22: gridengine-6.2u2_1-rpath.patch
 # Fix linking with proper libs
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2588
-Patch25: gridengine-6.2beta2-libs.patch
+Patch25: gridengine-6.2u2_1-libs.patch
 # Handle ignoring return codes
 Patch26: gridengine-6.2beta2-error.patch
+# Handle packaged izpack
+Patch27: gridengine-6.2u2_1-izpack.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
@@ -174,6 +176,7 @@
 %patch22 -p1 -b .rpath
 %patch25 -p1 -b .libs
 %patch26 -p1 -b .error
+%patch27 -p1 -b .izpack
 sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
 #Don't ship rctemplates
 rm -rf source/dist/util/rctemplates
@@ -217,6 +220,7 @@
 cat > build_private.properties <<EOF
 javacc.home=%{_javadir}
 libs.junit.classpath=%{_javadir}/junit.jar
+izpack.lib=/usr/share/java/izpack
 EOF
 
 #Build libcore.so
@@ -227,7 +231,8 @@
 ./aimk -only-depend
 scripts/zerodepend
 ./aimk depend
-./aimk
+#TODO - Need IzPack for GUI Installer
+./aimk -no-gui-inst
 ./aimk -man 
 
 
@@ -365,6 +370,9 @@
 #Cleanup some patch backups that get shipped
 rm $RPM_BUILD_ROOT%{_datadir}/gridengine/util/install_modules/inst_*.sh.*
 
+#TODO - Ship the GUI installer
+rm $RPM_BUILD_ROOT%{_datadir}/gridengine/start_gui_installer
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -528,6 +536,10 @@
 
 
 %changelog
+* Mon Apr 6 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u2_1-1
+- Update to 6.2u2_1
+- Rebase several patches
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2u1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Dec 2008 23:37:14 -0000	1.6
+++ sources	6 Apr 2009 18:49:08 -0000	1.7
@@ -1,2 +1,2 @@
-9ba9fbdfa3568bc278ba53db8b52223c  ge-V62u1_TAG-src.tar.gz
 5ba34d534cdeda9afe74cd367cb51ce0  gridengine-ppc.tar.gz
+5340a5f6c260a819ba224ad5fe3cba45  ge-V62u2_1_TAG-src.tar.gz


--- gridengine-6.1pre-Werror.patch DELETED ---


--- gridengine-6.1u3-rpath.patch DELETED ---


--- gridengine-6.2-sge_ca.patch DELETED ---


--- gridengine-6.2beta2-libs.patch DELETED ---


--- gridengine-6.2u1-rctemplates.patch DELETED ---



From jsanders at fedoraproject.org  Mon Apr  6 18:56:36 2009
From: jsanders at fedoraproject.org (Jeremy Sanders)
Date: Mon,  6 Apr 2009 18:56:36 +0000 (UTC)
Subject: rpms/veusz/devel veusz.spec,1.22,1.23
Message-ID: <20090406185636.F33A9700FB@cvs1.fedora.phx.redhat.com>

Author: jsanders

Update of /cvs/pkgs/rpms/veusz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12237

Modified Files:
	veusz.spec 
Log Message:
Fix build issue with README



Index: veusz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/veusz.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- veusz.spec	6 Apr 2009 18:44:19 -0000	1.22
+++ veusz.spec	6 Apr 2009 18:56:06 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:           veusz
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GUI scientific plotting package
 
 Group:          Applications/Productivity
@@ -51,9 +51,6 @@
 sed -i "/f =/s+utils.veuszDirectory+'%{_docdir}/veusz-%{version}'+" \
 	${RPM_BUILD_DIR}/veusz-%{version}/dialogs/aboutdialog.py
 
-# avoid clash of README files
-mv ${RPM_BUILD_DIR}/veusz-%{version}/windows/icons/README README-icons
-
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -137,13 +134,16 @@
 %{_datadir}/pixmaps/veusz.png
 
 %changelog
-* Mon Apr 6 2009 Jeremy Sanders <jeremysanders at jeremysanders.net> - 1.3-1
+* Mon Apr 6 2009 Jeremy Sanders <jeremy at jeremysanders.net> - 1.3-2
+- Fix readme location build issue
+
+* Mon Apr 6 2009 Jeremy Sanders <jeremy at jeremysanders.net> - 1.3-1
 - Update to Veusz 1.3
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Dec 7 2008 Jeremy Sanders <jeremysanders at jeremysanders.net> - 1.2.1-1
+* Sun Dec 7 2008 Jeremy Sanders <jeremy at jeremysanders.net> - 1.2.1-1
 - Update to Veusz 1.2.1
 - Fix location of COPYING file for about dialog
 



From jsanders at fedoraproject.org  Mon Apr  6 19:04:39 2009
From: jsanders at fedoraproject.org (Jeremy Sanders)
Date: Mon,  6 Apr 2009 19:04:39 +0000 (UTC)
Subject: rpms/veusz/devel veusz.spec,1.23,1.24
Message-ID: <20090406190439.4BB90700FB@cvs1.fedora.phx.redhat.com>

Author: jsanders

Update of /cvs/pkgs/rpms/veusz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13903

Modified Files:
	veusz.spec 
Log Message:
Remove README-icons from spec



Index: veusz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/veusz/devel/veusz.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- veusz.spec	6 Apr 2009 18:56:06 -0000	1.23
+++ veusz.spec	6 Apr 2009 19:04:08 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name:           veusz
 Version:        1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GUI scientific plotting package
 
 Group:          Applications/Productivity
@@ -98,7 +98,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README AUTHORS COPYING README-icons
+%doc README AUTHORS COPYING
 %doc examples
 %doc Documents/manual.html
 %doc Documents/manimages
@@ -134,6 +134,9 @@
 %{_datadir}/pixmaps/veusz.png
 
 %changelog
+* Mon Apr 6 2009 Jeremy Sanders <jeremy at jeremysanders.net> - 1.3-3
+- Remove file that is not included
+
 * Mon Apr 6 2009 Jeremy Sanders <jeremy at jeremysanders.net> - 1.3-2
 - Fix readme location build issue
 



From orion at fedoraproject.org  Mon Apr  6 19:11:08 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  6 Apr 2009 19:11:08 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine-6.2u2_1-getline.patch, NONE,
	1.1 gridengine.spec, 1.14, 1.15
Message-ID: <20090406191108.0D369700FB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15395

Modified Files:
	gridengine.spec 
Added Files:
	gridengine-6.2u2_1-getline.patch 
Log Message:
Patch to avoid getline() conflict.


gridengine-6.2u2_1-getline.patch:

--- NEW FILE gridengine-6.2u2_1-getline.patch ---
--- gridengine/source/3rdparty/sge_depend/def.h.getline	2003-03-08 22:06:35.000000000 -0700
+++ gridengine/source/3rdparty/sge_depend/def.h	2009-04-06 13:06:37.000000000 -0600
@@ -136,7 +136,7 @@
 #if NeedFunctionPrototypes
 char *copy( char *str);
 char *base_name(char *file, int strip);
-char *getline(struct filepointer *filep);
+char *sge_getline(struct filepointer *filep);
 struct filepointer *getfile(char *file);
 struct inclist *newinclude(char *newfile, char *incstring);
 struct inclist *inc_path(char	*file, char *include, boolean	dot);
@@ -155,7 +155,7 @@
 #else
 char *copy();
 char *base_name();
-char *getline();
+char *sge_getline();
 struct filepointer *getfile();
 struct inclist *newinclude();
 struct inclist *inc_path();
--- gridengine/source/3rdparty/sge_depend/parse.c.getline	2008-04-16 03:11:05.000000000 -0600
+++ gridengine/source/3rdparty/sge_depend/parse.c	2009-04-06 13:06:45.000000000 -0600
@@ -80,7 +80,7 @@
    register char   *line;
    register int   type;
 
-   while ((line = getline(filep))) {
+   while ((line = sge_getline(filep))) {
       switch(type = deftype(line, filep, file_red, file, FALSE)) {
       case IF:
       case IFFALSE:
@@ -571,7 +571,7 @@
    register int   type;
    boolean recfailOK;
 
-   while ((line = getline(filep))) {
+   while ((line = sge_getline(filep))) {
       switch(type = deftype(line, filep, file_red, file, TRUE)) {
       case IF:
       doif:
--- gridengine/source/3rdparty/sge_depend/main.c.getline	2007-07-26 09:41:43.000000000 -0600
+++ gridengine/source/3rdparty/sge_depend/main.c	2009-04-06 13:06:49.000000000 -0600
@@ -510,7 +510,7 @@
  * Get the next line.  We only return lines beginning with '#' since that
  * is all this program is ever interested in.
  */
-char *getline(filep)
+char *sge_getline(filep)
    register struct filepointer   *filep;
 {
    register char   *p,   /* walking pointer */


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gridengine.spec	6 Apr 2009 18:49:08 -0000	1.14
+++ gridengine.spec	6 Apr 2009 19:10:37 -0000	1.15
@@ -50,6 +50,9 @@
 # Import specific classes to avoid pulling in other ones
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2924
 Patch8: gridengine-6.2-import.patch
+# Rename getline() to sge_getline()
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2980
+Patch9: gridengine-6.2u2_1-getline.patch
 # Support lesstif - http://gridengine.sunsource.net/issues/show_bug.cgi?id=2310
 Patch15: gridengine-6.2beta2-lesstif.patch
 # Make inst_sge exit with status 1 if usage is incorrect
@@ -169,6 +172,7 @@
 %patch6 -p1 -b .db
 %patch7 -p1 -b .Werror
 %patch8 -p1 -b .import
+%patch9 -p1 -b .getline
 %if !0%{?rhel}
 %patch15 -p1 -b .lesstif
 %endif



From dwalsh at fedoraproject.org  Mon Apr  6 19:27:49 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  6 Apr 2009 19:27:49 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.163,
	1.164 policy-20090105.patch, 1.80, 1.81 sources, 1.183, 1.184
Message-ID: <20090406192749.61626700FB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19719

Modified Files:
	.cvsignore policy-20090105.patch sources 
Log Message:
* Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.11-1
- Dontaudit binds to ports < 1024 for named
- Upgrade to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- .cvsignore	20 Mar 2009 18:42:38 -0000	1.163
+++ .cvsignore	6 Apr 2009 19:27:19 -0000	1.164
@@ -165,3 +165,4 @@
 serefpolicy-3.6.8.tgz
 serefpolicy-3.6.9.tgz
 serefpolicy-3.6.10.tgz
+serefpolicy-3.6.11.tgz

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- policy-20090105.patch	6 Apr 2009 17:07:59 -0000	1.80
+++ policy-20090105.patch	6 Apr 2009 19:27:19 -0000	1.81
@@ -3926,7 +3926,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.11/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/apps/qemu.te	2009-04-06 13:07:12.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/apps/qemu.te	2009-04-06 14:08:29.000000000 -0400
 @@ -13,28 +13,96 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
@@ -3993,8 +3993,8 @@
  ')
  
 +tunable_policy(`qemu_use_comm',`
-+	term_use_unallocated_ttys(sqemu_t)
-+	dev_rw_printer(sqemu_t)
++	term_use_unallocated_ttys(qemu_t)
++	dev_rw_printer(qemu_t)
 +')
 +
 +tunable_policy(`qemu_use_nfs',`
@@ -8295,12 +8295,12 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.6.11/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/services/bind.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/services/bind.te	2009-04-06 14:03:35.000000000 -0400
 @@ -123,6 +123,7 @@
  corenet_sendrecv_dns_client_packets(named_t)
  corenet_sendrecv_rndc_server_packets(named_t)
  corenet_sendrecv_rndc_client_packets(named_t)
-+corenet_udp_dontaudit_bind_all_reserved_ports(named_t)
++corenet_dontaudit_udp_bind_all_reserved_ports(named_t)
  corenet_udp_bind_all_unreserved_ports(named_t)
  
  dev_read_sysfs(named_t)
@@ -18331,7 +18331,7 @@
  	ccs_read_config(ricci_modstorage_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.11/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.11/policy/modules/services/rpc.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/services/rpc.te	2009-04-06 15:25:10.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -18349,7 +18349,7 @@
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -183,6 +184,7 @@
+@@ -183,9 +184,12 @@
  files_read_usr_symlinks(gssd_t) 
  
  auth_use_nsswitch(gssd_t)
@@ -18357,6 +18357,11 @@
  
  miscfiles_read_certs(gssd_t)
  
++mount_signal(gssd_t)
++
+ tunable_policy(`allow_gssd_read_tmp',`
+ 	userdom_list_user_tmp(gssd_t) 
+ 	userdom_read_user_tmp_files(gssd_t) 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.6.11/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.11/policy/modules/services/rshd.te	2009-04-06 12:59:54.000000000 -0400
@@ -21462,8 +21467,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.11/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/services/virt.te	2009-04-06 12:59:54.000000000 -0400
-@@ -8,19 +8,38 @@
++++ serefpolicy-3.6.11/policy/modules/services/virt.te	2009-04-06 14:11:37.000000000 -0400
+@@ -8,19 +8,24 @@
  
  ## <desc>
  ## <p>
@@ -21476,13 +21481,6 @@
  ## <desc>
  ## <p>
 -## Allow virt to manage cifs files
-+## Allow svirt to manage nfs files
-+## </p>
-+## </desc>
-+gen_tunable(virt_use_nfs, false)
-+
-+## <desc>
-+## <p>
 +## Allow svirt to manage cifs files
  ## </p>
  ## </desc>
@@ -21491,13 +21489,6 @@
 -attribute virt_image_type;
 +## <desc>
 +## <p>
-+## Allow svirt to manage nfs files
-+## </p>
-+## </desc>
-+gen_tunable(virt_use_nfs, false)
-+
-+## <desc>
-+## <p>
 +## Allow svirt to user serial/parallell communication ports
 +## </p>
 +## </desc>
@@ -21505,7 +21496,7 @@
  
  type virt_etc_t;
  files_config_file(virt_etc_t)
-@@ -29,8 +48,12 @@
+@@ -29,8 +34,12 @@
  files_type(virt_etc_rw_t)
  
  # virt Image files
@@ -21520,7 +21511,7 @@
  
  type virt_log_t;
  logging_log_file(virt_log_t)
-@@ -48,17 +71,39 @@
+@@ -48,17 +57,39 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -21562,7 +21553,7 @@
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
-@@ -67,7 +112,11 @@
+@@ -67,7 +98,11 @@
  manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
  filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir)
  
@@ -21575,7 +21566,7 @@
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -86,6 +135,7 @@
+@@ -86,6 +121,7 @@
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
  kernel_load_module(virtd_t)
@@ -21583,7 +21574,7 @@
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -96,7 +146,7 @@
+@@ -96,7 +132,7 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -21592,7 +21583,7 @@
  corenet_tcp_bind_vnc_port(virtd_t)
  corenet_tcp_connect_vnc_port(virtd_t)
  corenet_tcp_connect_soundd_port(virtd_t)
-@@ -104,21 +154,39 @@
+@@ -104,21 +140,39 @@
  
  dev_read_sysfs(virtd_t)
  dev_read_rand(virtd_t)
@@ -21633,7 +21624,7 @@
  term_getattr_pty_fs(virtd_t)
  term_use_ptmx(virtd_t)
  
-@@ -129,6 +197,13 @@
+@@ -129,6 +183,13 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -21647,7 +21638,7 @@
  userdom_read_all_users_state(virtd_t)
  
  tunable_policy(`virt_use_nfs',`
-@@ -167,22 +242,34 @@
+@@ -167,22 +228,34 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -21670,15 +21661,15 @@
 +optional_policy(`
 +	lvm_domtrans(virtd_t)
 +')
-+
-+optional_policy(`
+ 
+ optional_policy(`
+-	qemu_domtrans(virtd_t)
 +	polkit_domtrans_auth(virtd_t)
 +	polkit_domtrans_resolve(virtd_t)
 +	polkit_read_lib(virtd_t)
 +')
- 
- optional_policy(`
--	qemu_domtrans(virtd_t)
++
++optional_policy(`
 +	qemu_spec_domtrans(virtd_t, svirt_t)
  	qemu_read_state(virtd_t)
  	qemu_signal(virtd_t)
@@ -21687,7 +21678,7 @@
  ')
  
  optional_policy(`
-@@ -198,5 +285,78 @@
+@@ -198,5 +271,78 @@
  ')
  
  optional_policy(`
@@ -25205,7 +25196,7 @@
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.11/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/mount.if	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/mount.if	2009-04-06 15:24:32.000000000 -0400
 @@ -43,9 +43,11 @@
  
  	mount_domtrans($1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- sources	24 Mar 2009 19:45:02 -0000	1.183
+++ sources	6 Apr 2009 19:27:19 -0000	1.184
@@ -1 +1 @@
-38720499e445f99f9e2d4df792f2b6f5  serefpolicy-3.6.10.tgz
+8692c0a1feea7a6914bc3f33019c0570  serefpolicy-3.6.11.tgz



From pkgdb at fedoraproject.org  Mon Apr  6 19:38:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 19:38:00 +0000
Subject: [pkgdb] gajim had acl change status
Message-ID: <20090406193823.2CFB120854A@bastion.fedora.phx.redhat.com>

rishi has set the watchbugzilla acl on gajim (Fedora devel) to Approved for michich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gajim



From pkgdb at fedoraproject.org  Mon Apr  6 19:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 19:38:44 +0000
Subject: [pkgdb] gajim had acl change status
Message-ID: <20090406193824.6E74E208556@bastion.fedora.phx.redhat.com>

rishi has set the watchcommits acl on gajim (Fedora devel) to Approved for michich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gajim



From ixs at fedoraproject.org  Mon Apr  6 19:54:01 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Mon,  6 Apr 2009 19:54:01 +0000 (UTC)
Subject: rpms/commoncpp2/devel commoncpp2-1.7.3-gcc44.patch, NONE,
	1.1 commoncpp2.spec, 1.9, 1.10
Message-ID: <20090406195401.1EC20700FB@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/commoncpp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25931

Modified Files:
	commoncpp2.spec 
Added Files:
	commoncpp2-1.7.3-gcc44.patch 
Log Message:
Added patch to compile on gcc44

commoncpp2-1.7.3-gcc44.patch:

--- NEW FILE commoncpp2-1.7.3-gcc44.patch ---
diff -up commoncpp2-1.7.3/src/cidr.cpp.orig commoncpp2-1.7.3/src/cidr.cpp
--- commoncpp2-1.7.3/src/cidr.cpp.orig	2009-04-06 21:24:07.857718325 +0200
+++ commoncpp2-1.7.3/src/cidr.cpp	2009-04-06 21:50:26.874088776 +0200
@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp)
 #if defined(_MSC_VER) && _MSC_VER >= 1500
 	ep = (char *)strchr(cp, '/');
 #else
- 	ep = strchr(cp, '/');
+ 	ep = (char *)strchr(cp, '/');
 #endif
 
 	if(ep)
@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp)
 	memset(&netmask, 0, sizeof(netmask));
 	bitset((bit_t *)&netmask, getMask(cp));
 	setString(cbuf, sizeof(cbuf), cp);
-	ep = strchr(cp, '/');
+	ep = (char *)strchr(cp, '/');
 	if(ep)
 		*ep = 0;
 


Index: commoncpp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/devel/commoncpp2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- commoncpp2.spec	6 Apr 2009 13:27:25 -0000	1.9
+++ commoncpp2.spec	6 Apr 2009 19:53:30 -0000	1.10
@@ -6,6 +6,7 @@
 Group: System Environment/Libraries
 Source0: http://www.gnutelephony.org/dist/tarballs/commoncpp2-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
+Patch0: commoncpp2-1.7.3-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel, zlib-devel, doxygen
 
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \



From lkundrak at fedoraproject.org  Mon Apr  6 20:04:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  6 Apr 2009 20:04:06 +0000 (UTC)
Subject: rpms/gcx/devel gcx-0.9.11-bounds.patch,NONE,1.1 gcx.spec,1.4,1.5
Message-ID: <20090406200406.9FC3D700FB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gcx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28127

Modified Files:
	gcx.spec 
Added Files:
	gcx-0.9.11-bounds.patch 
Log Message:
* Mon Apr 6 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.11-6
- Fix a stack overflow (#494345)


gcx-0.9.11-bounds.patch:

--- NEW FILE gcx-0.9.11-bounds.patch ---
Don't overwrite the stack canary with out-of-bound write.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp gcx-0.9.11/src/ccd/ccd_frame.c gcx-0.9.11.fixed/src/ccd/ccd_frame.c
--- gcx-0.9.11/src/ccd/ccd_frame.c	2007-03-26 15:24:14.000000000 +0200
+++ gcx-0.9.11.fixed/src/ccd/ccd_frame.c	2009-04-06 21:40:19.161312909 +0200
@@ -1348,7 +1348,7 @@ static int frame_to_float(struct ccd_fra
  * or -1 for an error */
 int fits_get_double(struct ccd_frame *fr, char *kwd, double *v)
 {
-	char vs[FITS_HCOLS+1];
+	char vs[FITS_HCOLS+2];
 	FITS_row *row;
 	char * end;
 	double vv;


Index: gcx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcx/devel/gcx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gcx.spec	24 Mar 2009 13:39:44 -0000	1.4
+++ gcx.spec	6 Apr 2009 20:03:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gcx
 Version:	0.9.11
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Data-reduction tool for CCD photometry
 
 License:	GPLv2+
@@ -9,6 +9,7 @@
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	gcx.desktop
 Source2:	gcx.svg
+Patch0:         gcx-0.9.11-bounds.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gnuplot
@@ -46,6 +47,9 @@
 %{_datadir}/gcx
 
 %changelog
+* Mon Apr 6 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.11-6
+- Fix a stack overflow (#494345)
+
 * Tue Mar 24 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.11-5
 - Fix the icon location
 



From lkundrak at fedoraproject.org  Mon Apr  6 20:07:48 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  6 Apr 2009 20:07:48 +0000 (UTC)
Subject: rpms/spacechart/devel spacechart-0.9.5-bounds.patch, NONE,
	1.1 spacechart-0.9.5-format.patch, NONE,
	1.1 spacechart-0.9.5-open.patch, NONE, 1.1 spacechart.spec, 1.3, 1.4
Message-ID: <20090406200749.012EA700FB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/spacechart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29055

Modified Files:
	spacechart.spec 
Added Files:
	spacechart-0.9.5-bounds.patch spacechart-0.9.5-format.patch 
	spacechart-0.9.5-open.patch 
Log Message:
* Mon Apr 6 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.5-4
- Fix a couple of crashes
- Accept a file to open as command line argument, default to shipped map


spacechart-0.9.5-bounds.patch:

--- NEW FILE spacechart-0.9.5-bounds.patch ---
* 6 + 2 + 2 = 20
* 20 >= 50
* 5 + 1 + 2 = 5

Someone must definitely have sucked at maths and FORTIFY_SOURCE doesn't seem
to be overly impressed with it for some reason.

Lubomir Rintel <lkundrak at v3.sk>

diff -up spacechart-0.9.5/src/star_list_dialog.c.bounds spacechart-0.9.5/src/star_list_dialog.c
--- spacechart-0.9.5/src/star_list_dialog.c.bounds	2009-04-06 17:40:14.000000000 +0200
+++ spacechart-0.9.5/src/star_list_dialog.c	2009-04-06 17:41:25.000000000 +0200
@@ -185,7 +185,7 @@ void cb_append_component( star_component
         star_component_get_bayer_name( comp, bayer_name );
         star_component_get_dm_name( comp, dm );
         star_component_get_spectrum( comp, spectral );
-        snprintf( luminosity, 50, "%6.2f", star_component_get_luminosity(comp) );
+        snprintf( luminosity, sizeof(luminosity), "%6.2f", star_component_get_luminosity(comp) );
         i = gtk_clist_append( GTK_CLIST(data->dialog->clist), row );
         gtk_clist_set_row_data( GTK_CLIST(data->dialog->clist), 
                                 i, data->star );
diff -urp spacechart-0.9.5/src/map.c spacechart-0.9.5.fixed/src/map.c
--- spacechart-0.9.5/src/map.c	2002-06-04 17:49:16.000000000 +0200
+++ spacechart-0.9.5.fixed/src/map.c	2009-04-06 18:09:14.000000000 +0200
@@ -265,7 +265,7 @@ void draw_link( link_t* link, double x1,
         GdkLineStyle style;
         double rgb[3];
         double distance, x, y;
-        char label[5];
+        char label[8];
         distance_unit_t unit;
 
         settings_find_link_draw( map->settings, link, &width, &style, rgb );
@@ -275,7 +275,7 @@ void draw_link( link_t* link, double x1,
         {
                 distance = link_get_distance( link );
                 unit = settings_get_distance_unit( map->settings );
-                sprintf( label, "%5.1f", (unit==DISTANCE_PARSECS) ? distance : 
+                snprintf( label, sizeof(label), "%5.1f", (unit==DISTANCE_PARSECS) ? distance : 
                          distance*PARSEC_TO_LY );
                 x = (x1+x2)/2;
                 y = (y1+y2)/2;

spacechart-0.9.5-format.patch:

--- NEW FILE spacechart-0.9.5-format.patch ---
Don't hurt user's feelings by crashing on attempts to load a complete junk.
Maybe he didn't mean it and you'd regret it one day.

Lubomir Rintel <lkundrak at v3.sk>

diff -up spacechart-0.9.5/src/star_catalog.c.format spacechart-0.9.5/src/star_catalog.c
--- spacechart-0.9.5/src/star_catalog.c.format	2009-04-06 17:47:13.000000000 +0200
+++ spacechart-0.9.5/src/star_catalog.c	2009-04-06 17:54:35.000000000 +0200
@@ -95,7 +95,7 @@ int star_catalog_read( star_catalog_t* c
                 /* Before reading the stars we read the header. It is supposed
                  * to contain data the user should know */
                 old_length = 0;
-                while(  (fgets( tmp, 256, data_file )[0]) &&
+                while(  fgets( tmp, 256, data_file ) &&
                        tmp[0] != '%' )
                 {
                         length = strlen(tmp);
@@ -116,6 +116,12 @@ int star_catalog_read( star_catalog_t* c
                 }
                 catalog->filename = basename(file);
 
+                if( feof( data_file ) )
+                {
+                        /* No header end found yet and we've encountered EOF */
+                        error = 2;
+                }
+
                 while( !error )
                 {
                         star = star_new();

spacechart-0.9.5-open.patch:

--- NEW FILE spacechart-0.9.5-open.patch ---
Accept map file name as argument.
Default to shipped star map for improved FTUE.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp spacechart-0.9.5/src/main.c spacechart-0.9.5.fixed/src/main.c
--- spacechart-0.9.5/src/main.c	2002-11-24 19:18:54.000000000 +0100
+++ spacechart-0.9.5.fixed/src/main.c	2009-04-06 18:36:52.000000000 +0200
@@ -59,6 +59,11 @@ int main( int argc, char** argv ) 
 
         gtk_init_add (settings_enable_callbacks, settings);
 
+	if ( argc > 1 )
+		settings_set_catalog_filename(settings, (char *)(argv[1]) );
+	else
+		settings_set_catalog_filename(settings, DATADIR "hip30.dat" );
+
         /* Here we go... */
         gtk_main();
 


Index: spacechart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spacechart/devel/spacechart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spacechart.spec	24 Mar 2009 16:03:12 -0000	1.3
+++ spacechart.spec	6 Apr 2009 20:07:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		spacechart
 Version:	0.9.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A 3D star-mapping program
 
 Group:		Applications/Engineering
@@ -12,6 +12,9 @@
 # From Debian:
 # http://ftp.debian.org/debian/pool/main/s/spacechart/spacechart_0.9.5-13.diff.gz
 Source3:	spacechart.1
+Patch0:         spacechart-0.9.5-bounds.patch
+Patch1:         spacechart-0.9.5-format.patch
+Patch2:         spacechart-0.9.5-open.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	flex, gnome-libs-devel, desktop-file-utils
@@ -25,6 +28,9 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .bounds
+%patch1 -p1 -b .format
+%patch2 -p1 -b .open
 
 %build
 %configure
@@ -53,6 +59,10 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Apr 6 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.5-4
+- Fix a couple of crashes
+- Accept a file to open as command line argument, default to shipped map
+
 * Tue Mar 24 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.5-3
 - Add icon
 - Add manual page



From pkgdb at fedoraproject.org  Mon Apr  6 20:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:08:37 +0000
Subject: [pkgdb] sugar-datastore ownership updated
Message-ID: <20090406200837.2CABD20854A@bastion.fedora.phx.redhat.com>

Package sugar-datastore in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-datastore



From pkgdb at fedoraproject.org  Mon Apr  6 20:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:08:52 +0000
Subject: [pkgdb] sugar-datastore ownership updated
Message-ID: <20090406200852.D3DEB20854A@bastion.fedora.phx.redhat.com>

Package sugar-datastore in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-datastore



From dodji at fedoraproject.org  Mon Apr  6 20:09:29 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  6 Apr 2009 20:09:29 +0000 (UTC)
Subject: rpms/cloog/devel .cvsignore, 1.2, 1.3 cloog.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <20090406200930.00725700FB@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29410

Modified Files:
	.cvsignore cloog.spec sources 
Log Message:
Upload cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Feb 2009 23:38:27 -0000	1.2
+++ .cvsignore	6 Apr 2009 20:08:59 -0000	1.3
@@ -1 +1 @@
-cloog-0.15-gitad322.tar.gz
+cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch


Index: cloog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/cloog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cloog.spec	24 Feb 2009 07:57:57 -0000	1.2
+++ cloog.spec	6 Apr 2009 20:08:59 -0000	1.3
@@ -1,7 +1,7 @@
 %define         git_revision   gitad322
 Name:           cloog
 Version:        0.15
-Release:        0.4.%{git_revision}%{?dist}
+Release:        0.5.%{git_revision}%{?dist}
 Summary:        The Chunky Loop Generator
 
 Group:          System Environment/Libraries
@@ -16,6 +16,11 @@
 # make distcheck
 Source0:        %{name}-%{version}-%{git_revision}.tar.gz
 Source1:        README.cloog.txt
+# Patch to add dircategory and direntry nodes to the cloog.texi
+# file. Otherwise, install-info complains at package install time,
+# leading to bug https://bugzilla.redhat.com/show_bug.cgi?id=492794.
+# Patch Sent upstream
+Patch0 :        cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ppl-devel >= 0.10, gmp-devel >= 4.1.3
 Requires(post): info
@@ -43,9 +48,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure --with-ppl
+%configure --with-ppl=%{_prefix}
 # Remove the -fomit-frame-pointer compile flag
 make %{?_smp_mflags} AM_CFLAGS=
 
@@ -82,6 +88,10 @@
 fi
 
 %changelog
+* Mon Apr 06 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.5.gitfcceb
+- Added patch to fix #492794
+- Need to add an argument to the --with-ppl switch now.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-0.4.gitad322
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Feb 2009 23:38:27 -0000	1.2
+++ sources	6 Apr 2009 20:08:59 -0000	1.3
@@ -1 +1 @@
-9c6beccc6b3fd380b824ec7ad69ba93b  cloog-0.15-gitad322.tar.gz
+c2aa3765aefa9dbf4b7f024907c0362f  cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch



From ajax at fedoraproject.org  Mon Apr  6 20:09:41 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  6 Apr 2009 20:09:41 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.0-displayfd.patch, NONE,
	1.1 xorg-x11-server.spec, 1.428, 1.429
Message-ID: <20090406200941.5F593700FB@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29545

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.0-displayfd.patch 
Log Message:
* Mon Apr 06 2009 Adam Jackson <ajax at redhat.com> 1.6.0-17
- xserver-1.6.0-displayfd.patch: Add -displayfd commandline option.


xserver-1.6.0-displayfd.patch:

--- NEW FILE xserver-1.6.0-displayfd.patch ---
>From ac43dac0a18778081ea784c98391f0333981ca13 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 6 Apr 2009 15:44:05 -0400
Subject: [PATCH] displayfd hack

---
 dix/globals.c    |    1 +
 include/opaque.h |    1 +
 os/connection.c  |   72 ++++++++++++++++++++++++++++++++++++-----------------
 os/utils.c       |   11 ++++++++
 4 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/dix/globals.c b/dix/globals.c
index dbd76bb..749bf9b 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -152,6 +152,7 @@ _X_EXPORT int defaultColorVisualClass = -1;
 _X_EXPORT int monitorResolution = 0;
 
 _X_EXPORT char *display;
+int displayfd;
 char *ConnectionInfo;
 
 CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
diff --git a/include/opaque.h b/include/opaque.h
index be1577b..2ae6680 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -50,6 +50,7 @@ extern int ScreenSaverAllowExposures;
 extern int defaultScreenSaverBlanking;
 extern int defaultScreenSaverAllowExposures;
 extern char *display;
+extern int displayfd;
 
 extern int defaultBackingStore;
 extern Bool disableBackingStore;
diff --git a/os/connection.c b/os/connection.c
index 8f1f73e..4351117 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -146,6 +146,7 @@ Bool NewOutputPending;		/* not yet attempted to write some new output */
 Bool AnyClientsWriteBlocked;	/* true if some client blocked on write */
 
 static Bool RunFromSmartParent;	/* send SIGUSR1 to parent process */
+static char dynamic_display[7];
 Bool PartialNetwork;		/* continue even if unable to bind all addrs */
 static Pid_t ParentProcess;
 
@@ -367,9 +368,23 @@ NotifyParentProcess(void)
 	    kill (ParentProcess, SIGUSR1);
 	}
     }
+    if (dynamic_display[0])
+	write(displayfd, dynamic_display, strlen(dynamic_display));
 #endif
 }
 
+static Bool
+TryCreateSocket(int num, int *partial)
+{
+    char port[20];
+
+    sprintf(port, "%d", num);
+
+    return _XSERVTransMakeAllCOTSServerListeners(port, partial,
+						 &ListenTransCount,
+						 &ListenTransConns);
+}
+
 /*****************
  * CreateWellKnownSockets
  *    At initialization, create the sockets to listen on for new clients.
@@ -380,7 +395,6 @@ CreateWellKnownSockets(void)
 {
     int		i;
     int		partial;
-    char 	port[20];
 
     FD_ZERO(&AllSockets);
     FD_ZERO(&AllClients);
@@ -395,32 +409,44 @@ CreateWellKnownSockets(void)
 
     FD_ZERO (&WellKnownConnections);
 
-    sprintf (port, "%d", atoi (display));
-
-    if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial,
-	&ListenTransCount, &ListenTransConns) >= 0) &&
-	(ListenTransCount >= 1))
+    if (display)
     {
-	if (!PartialNetwork && partial)
-	{
-	    FatalError ("Failed to establish all listening sockets");
-	}
-	else
+	if (TryCreateSocket(atoi(display), &partial) &&
+	    (ListenTransCount >= 1))
+	    if (!PartialNetwork && partial)
+		FatalError ("Failed to establish all listening sockets");
+    }
+    else /* -displayfd */
+    {
+	Bool found = 0;
+	for (i = 0; i < 65535 - 1024; i++)
 	{
-	    ListenTransFds = (int *) xalloc (ListenTransCount * sizeof (int));
-
-	    for (i = 0; i < ListenTransCount; i++)
+	    if (!TryCreateSocket(i, &partial) && !partial)
 	    {
-		int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]);
-		
-		ListenTransFds[i] = fd;
-		FD_SET (fd, &WellKnownConnections);
-
-		if (!_XSERVTransIsLocal (ListenTransConns[i]))
-		{
-		    DefineSelf (fd);
-		}
+		found = 1;
+		break;
 	    }
+	    else
+		CloseWellKnownConnections();
+	}
+	if (!found)
+	    FatalError("Failed to find a socket to listen on");
+	sprintf(dynamic_display, "%d\n", i);
+	display = dynamic_display;
+    }
+
+    ListenTransFds = xalloc (ListenTransCount * sizeof (int));
+
+    for (i = 0; i < ListenTransCount; i++)
+    {
+	int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]);
+	
+	ListenTransFds[i] = fd;
+	FD_SET (fd, &WellKnownConnections);
+
+	if (!_XSERVTransIsLocal (ListenTransConns[i]))
+	{
+	    DefineSelf (fd);
 	}
     }
 
diff --git a/os/utils.c b/os/utils.c
index c41b45b..2372588 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -674,6 +674,17 @@ ProcessCommandLine(int argc, char *argv[])
 	    else
 		UseMsg();
 	}
+	else if (strcmp(argv[i], "-displayfd") == 0)
+	{
+	    if (++i < argc)
+	    {
+		displayfd = atoi(argv[i]);
+		display = NULL;
+		nolock = TRUE;
+	    }
+	    else
+		UseMsg();
+	}
 #ifdef DPMSExtension
 	else if ( strcmp( argv[i], "dpms") == 0)
 	    DPMSEnabledSwitch = TRUE;
-- 
1.6.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- xorg-x11-server.spec	30 Mar 2009 16:02:45 -0000	1.428
+++ xorg-x11-server.spec	6 Apr 2009 20:09:11 -0000	1.429
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   16%{?dist}
+Release:   17%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -107,6 +107,8 @@
 # http://bugs.freedesktop.org/show_bug.cgi?id=20557
 Patch6026: xserver-1.6.0-xinerama-crashes.patch
 
+# ajax needs to upstream this
+Patch6027: xserver-1.6.0-displayfd.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -524,6 +526,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Adam Jackson <ajax at redhat.com> 1.6.0-17
+- xserver-1.6.0-displayfd.patch: Add -displayfd commandline option.
+
 * Mon Mar 30 2009 Adam Jackson <ajax at redhat.com> 1.6.0-16
 - Don't nuke ModulePath lines in xorg.conf anymore.  If you're still doing
   this it's probably because you need to. (#490294)



From pkgdb at fedoraproject.org  Mon Apr  6 20:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:10:27 +0000
Subject: [pkgdb] sugar-artwork ownership updated
Message-ID: <20090406201007.73811208556@bastion.fedora.phx.redhat.com>

Package sugar-artwork in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-artwork



From pkgdb at fedoraproject.org  Mon Apr  6 20:09:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:09:53 +0000
Subject: [pkgdb] sugar-artwork ownership updated
Message-ID: <20090406201016.46454208603@bastion.fedora.phx.redhat.com>

Package sugar-artwork in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-artwork



From pkgdb at fedoraproject.org  Mon Apr  6 20:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:12:11 +0000
Subject: [pkgdb] sugar-toolkit ownership updated
Message-ID: <20090406201234.7A3F3208556@bastion.fedora.phx.redhat.com>

Package sugar-toolkit in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-toolkit



From pkgdb at fedoraproject.org  Mon Apr  6 20:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:12:49 +0000
Subject: [pkgdb] sugar-toolkit ownership updated
Message-ID: <20090406201227.AF216208553@bastion.fedora.phx.redhat.com>

Package sugar-toolkit in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-toolkit



From pkgdb at fedoraproject.org  Mon Apr  6 20:13:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:13:13 +0000
Subject: [pkgdb] sugar-base ownership updated
Message-ID: <20090406201252.3B42B208555@bastion.fedora.phx.redhat.com>

Package sugar-base in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-base



From pkgdb at fedoraproject.org  Mon Apr  6 20:12:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:12:36 +0000
Subject: [pkgdb] sugar-base ownership updated
Message-ID: <20090406201258.93BDA208557@bastion.fedora.phx.redhat.com>

Package sugar-base in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-base



From pkgdb at fedoraproject.org  Mon Apr  6 20:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:13:52 +0000
Subject: [pkgdb] sugar-presence-service ownership updated
Message-ID: <20090406201331.8CD8E208556@bastion.fedora.phx.redhat.com>

Package sugar-presence-service in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Mon Apr  6 20:13:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:13:17 +0000
Subject: [pkgdb] sugar-presence-service ownership updated
Message-ID: <20090406201339.AC776208602@bastion.fedora.phx.redhat.com>

Package sugar-presence-service in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Mon Apr  6 20:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:13:35 +0000
Subject: [pkgdb] sugar ownership updated
Message-ID: <20090406201357.827FE208553@bastion.fedora.phx.redhat.com>

Package sugar in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Apr  6 20:14:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:14:24 +0000
Subject: [pkgdb] sugar ownership updated
Message-ID: <20090406201404.1240B208608@bastion.fedora.phx.redhat.com>

Package sugar in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Apr  6 20:14:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:14:44 +0000
Subject: [pkgdb] hulahop ownership updated
Message-ID: <20090406201425.5890B208556@bastion.fedora.phx.redhat.com>

Package hulahop in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Mon Apr  6 20:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:14:32 +0000
Subject: [pkgdb] hulahop ownership updated
Message-ID: <20090406201432.459FC208603@bastion.fedora.phx.redhat.com>

Package hulahop in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hulahop



From rathann at fedoraproject.org  Mon Apr  6 20:14:18 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon,  6 Apr 2009 20:14:18 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel .cvsignore, 1.11, 1.12 mkvtoolnix.spec, 1.26, 
	1.27 sources, 1.11, 1.12 mkvtoolnix-compile.patch, 1.1,
	NONE mkvtoolnix-ppc64.patch, 1.1, NONE
Message-ID: <20090406201418.E2403700FB@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30597

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Removed Files:
	mkvtoolnix-compile.patch mkvtoolnix-ppc64.patch 
Log Message:
* Mon Apr 06 2009 Dominik Mierzejewski <rpm at greysector.net> 2.6.0-1
- updated to 2.6.0
- dropped upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Mar 2009 09:36:35 -0000	1.11
+++ .cvsignore	6 Apr 2009 20:13:48 -0000	1.12
@@ -1 +1 @@
-mkvtoolnix-2.5.2.tar.bz2
+mkvtoolnix-2.6.0.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mkvtoolnix.spec	1 Mar 2009 09:36:35 -0000	1.26
+++ mkvtoolnix.spec	6 Apr 2009 20:13:48 -0000	1.27
@@ -1,16 +1,12 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.5.2
+Version: 2.6.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-# https://www.bunkus.org/bugzilla/show_bug.cgi?id=348
-Patch0: %{name}-compile.patch
-# https://www.bunkus.org/bugzilla/show_bug.cgi?id=347
-Patch4: %{name}-ppc64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -42,8 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .compile
-%patch4 -p1 -b .ppc64
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -118,6 +112,10 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Mon Apr 06 2009 Dominik Mierzejewski <rpm at greysector.net> 2.6.0-1
+- updated to 2.6.0
+- dropped upstreamed patches
+
 * Sun Mar 01 2009 Dominik Mierzejewski <rpm at greysector.net> 2.5.2-1
 - updated to 2.5.2
 - fix compilation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Mar 2009 09:36:35 -0000	1.11
+++ sources	6 Apr 2009 20:13:48 -0000	1.12
@@ -1 +1 @@
-85ae3a5e447f0cdc41d9bc3b5c9b1358  mkvtoolnix-2.5.2.tar.bz2
+034e6c4a11b4a9536d250a309c16be85  mkvtoolnix-2.6.0.tar.bz2


--- mkvtoolnix-compile.patch DELETED ---


--- mkvtoolnix-ppc64.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr  6 20:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:21:00 +0000
Subject: [pkgdb] matchbox-window-manager ownership updated
Message-ID: <20090406202100.5D1E320854A@bastion.fedora.phx.redhat.com>

Package matchbox-window-manager in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 20:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:21:27 +0000
Subject: [pkgdb] matchbox-window-manager ownership updated
Message-ID: <20090406202105.DE760208555@bastion.fedora.phx.redhat.com>

Package matchbox-window-manager in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pfj at fedoraproject.org  Mon Apr  6 20:21:15 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon,  6 Apr 2009 20:21:15 +0000 (UTC)
Subject: rpms/xsp/devel import.log,1.13,1.14 xsp.spec,1.36,1.37
Message-ID: <20090406202115.BF87B700FB@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32636/devel

Modified Files:
	import.log xsp.spec 
Log Message:

Remove ppc 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	26 Mar 2009 23:20:43 -0000	1.13
+++ import.log	6 Apr 2009 20:20:45 -0000	1.14
@@ -11,3 +11,4 @@
 xsp-2_4-5_RC2_fc11:HEAD:xsp-2.4-5.RC2.fc11.src.rpm:1237126131
 xsp-2_4-6_RC3_fc11:HEAD:xsp-2.4-6.RC3.fc11.src.rpm:1237418212
 xsp-2_4-7_fc11:HEAD:xsp-2.4-7.fc11.src.rpm:1238109613
+xsp-2_4-7_1_fc11:HEAD:xsp-2.4-7.1.fc11.src.rpm:1239049215


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xsp.spec	26 Mar 2009 23:20:43 -0000	1.36
+++ xsp.spec	6 Apr 2009 20:20:45 -0000	1.37
@@ -1,6 +1,6 @@
 Name:     	xsp
 Version: 	2.4
-Release:	7%{?dist}
+Release:	7.1%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://mono.ximian.com/monobuild/preview/sources-preview/
@@ -10,7 +10,7 @@
 Requires:	mono-core >= 2.4
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
 %define debug_package %{nil}
 
@@ -96,6 +96,9 @@
 %{_libdir}/xsp/test
 
 %changelog
+* Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-7.1
+- Remove ppc build
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-7
 - Full 2.4 release
 



From erikos at fedoraproject.org  Mon Apr  6 20:22:34 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 20:22:34 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.36, 1.37 sources, 1.38,
	1.39 sugar.spec, 1.60, 1.61
Message-ID: <20090406202234.871E8700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv614

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.4-1
- new german and spanish translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	6 Apr 2009 18:13:18 -0000	1.36
+++ .cvsignore	6 Apr 2009 20:22:04 -0000	1.37
@@ -1 +1 @@
-sugar-0.84.3.tar.bz2
+sugar-0.84.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	6 Apr 2009 18:13:18 -0000	1.38
+++ sources	6 Apr 2009 20:22:04 -0000	1.39
@@ -1 +1 @@
-d512dedb5ded2a368722cfe0e2d7251d  sugar-0.84.3.tar.bz2
+57a650efb9a9b79eca3a9bc16e5d54ca  sugar-0.84.4.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sugar.spec	6 Apr 2009 18:13:18 -0000	1.60
+++ sugar.spec	6 Apr 2009 20:22:04 -0000	1.61
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.3
+Version: 0.84.4
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -140,6 +140,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.4-1
+- new german and spanish translations
+
 * Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.3-1
 - If user updates an activity installed in /usr/share/activities, both versions remain installed #707
 - Sometimes an activity will not start #461



From pfj at fedoraproject.org  Mon Apr  6 20:23:19 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon,  6 Apr 2009 20:23:19 +0000 (UTC)
Subject: rpms/mono-tools/devel import.log, 1.29, 1.30 mono-tools.spec, 1.35,
	1.36
Message-ID: <20090406202319.AC83C700FB@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv876/devel

Modified Files:
	import.log mono-tools.spec 
Log Message:

Remove ppc 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- import.log	26 Mar 2009 23:19:20 -0000	1.29
+++ import.log	6 Apr 2009 20:22:49 -0000	1.30
@@ -27,3 +27,4 @@
 mono-tools-2_4-6_RC2_fc11:HEAD:mono-tools-2.4-6.RC2.fc11.src.rpm:1237126025
 mono-tools-2_4-7_RC3_fc11:HEAD:mono-tools-2.4-7.RC3.fc11.src.rpm:1237418407
 mono-tools-2_4-8_fc11:HEAD:mono-tools-2.4-8.fc11.src.rpm:1238109531
+mono-tools-2_4-8_1_fc11:HEAD:mono-tools-2.4-8.1.fc11.src.rpm:1239049338


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mono-tools.spec	26 Mar 2009 23:19:20 -0000	1.35
+++ mono-tools.spec	6 Apr 2009 20:22:49 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.4
-Release: 8%{?dist}
+Release: 8.1%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
@@ -16,7 +16,7 @@
 BuildRequires: mono-jscript mono-data-oracle monodoc-devel mono-web-devel
 Requires: mono-core >= 2.4 links monodoc
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
 %description
 Monotools are a number of tools for mono such as allowing monodoc to be run
@@ -132,6 +132,9 @@
 %{_libdir}/monodoc/sources/gendarme*
 
 %changelog
+* Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-8.1
+- remove ppc
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-8
 - Full 2.4 release
 



From pkgdb at fedoraproject.org  Mon Apr  6 20:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:25:02 +0000
Subject: [pkgdb] pyxapian ownership updated
Message-ID: <20090406202442.BF943208555@bastion.fedora.phx.redhat.com>

Package pyxapian in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxapian



From pkgdb at fedoraproject.org  Mon Apr  6 20:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:24:47 +0000
Subject: [pkgdb] pyxapian ownership updated
Message-ID: <20090406202447.90DF320860F@bastion.fedora.phx.redhat.com>

Package pyxapian in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxapian



From pfj at fedoraproject.org  Mon Apr  6 20:25:55 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon,  6 Apr 2009 20:25:55 +0000 (UTC)
Subject: rpms/mono-basic/devel import.log, 1.14, 1.15 mono-basic.spec, 1.22,
	1.23
Message-ID: <20090406202555.E9192700FB@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1646/devel

Modified Files:
	import.log mono-basic.spec 
Log Message:

Remove ppc 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	26 Mar 2009 23:13:40 -0000	1.14
+++ import.log	6 Apr 2009 20:25:25 -0000	1.15
@@ -12,3 +12,4 @@
 mono-basic-2_4-1_RC1_fc11:HEAD:mono-basic-2.4-1.RC1.fc11.src.rpm:1235775049
 mono-basic-2_4-3_RC3_fc11:HEAD:mono-basic-2.4-3.RC3.fc11.src.rpm:1237418844
 mono-basic-2_4-4_fc11:HEAD:mono-basic-2.4-4.fc11.src.rpm:1238109188
+mono-basic-2_4-4_1_fc11:HEAD:mono-basic-2.4-4.1.fc11.src.rpm:1239049489


Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mono-basic.spec	26 Mar 2009 23:13:40 -0000	1.22
+++ mono-basic.spec	6 Apr 2009 20:25:25 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:		mono-basic
 Version:	2.4
-Release:	4%{?dist}
+Release:	4.1%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
@@ -20,7 +20,7 @@
 BuildRequires:  mono-devel >= 2.4
 Requires: 	mono-winforms
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
 %description
 This package contains the Visual Basic .NET compiler and language
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
+* Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-4.1
+- Remove ppc
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-4
 - Full 2.4 release
 



From pkgdb at fedoraproject.org  Mon Apr  6 20:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:26:39 +0000
Subject: [pkgdb] libmatchbox ownership updated
Message-ID: <20090406202639.E8DD620854A@bastion.fedora.phx.redhat.com>

Package libmatchbox in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 20:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:26:22 +0000
Subject: [pkgdb] libmatchbox ownership updated
Message-ID: <20090406202644.AA32C208556@bastion.fedora.phx.redhat.com>

Package libmatchbox in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From lmacken at fedoraproject.org  Mon Apr  6 20:26:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  6 Apr 2009 20:26:53 +0000 (UTC)
Subject: rpms/bodhi/devel .cvsignore, 1.22, 1.23 bodhi.spec, 1.31,
	1.32 sources, 1.24, 1.25
Message-ID: <20090406202653.50CDD700FB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2074

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Jan 2009 20:05:50 -0000	1.22
+++ .cvsignore	6 Apr 2009 20:26:22 -0000	1.23
@@ -1 +1 @@
-bodhi-0.5.17.tar.bz2
+bodhi-0.5.19.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/bodhi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bodhi.spec	15 Mar 2009 02:53:18 -0000	1.31
+++ bodhi.spec	6 Apr 2009 20:26:22 -0000	1.32
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.17
-Release:        4%{?dist}
+Version:        0.5.19
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Luke Macken <lmacken at redhat.com> - 0.5.19-1
+- 0.5.19
+
 * Sat Mar 14 2009 Luke Macken <lmacken at redhat.com> - 0.5.17-4
 - Require httpd
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Jan 2009 20:05:50 -0000	1.24
+++ sources	6 Apr 2009 20:26:23 -0000	1.25
@@ -1 +1 @@
-f22a298d3aff0f9e740f810971e5028f  bodhi-0.5.17.tar.bz2
+fb064c2e7e5e79f5fc1283640aef4207  bodhi-0.5.19.tar.bz2



From pkgdb at fedoraproject.org  Mon Apr  6 20:27:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:27:21 +0000
Subject: [pkgdb] xapian-core ownership updated
Message-ID: <20090406202721.9FAB0208603@bastion.fedora.phx.redhat.com>

Package xapian-core in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-core



From pkgdb at fedoraproject.org  Mon Apr  6 20:27:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:27:04 +0000
Subject: [pkgdb] xapian-core ownership updated
Message-ID: <20090406202727.E2F482086EF@bastion.fedora.phx.redhat.com>

Package xapian-core in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-core



From pkgdb at fedoraproject.org  Mon Apr  6 20:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:28:02 +0000
Subject: [pkgdb] xapian-bindings ownership updated
Message-ID: <20090406202802.A69E220860B@bastion.fedora.phx.redhat.com>

Package xapian-bindings in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-bindings



From pkgdb at fedoraproject.org  Mon Apr  6 20:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:27:43 +0000
Subject: [pkgdb] xapian-bindings ownership updated
Message-ID: <20090406202806.E217E2086FF@bastion.fedora.phx.redhat.com>

Package xapian-bindings in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-bindings



From pfj at fedoraproject.org  Mon Apr  6 20:27:56 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon,  6 Apr 2009 20:27:56 +0000 (UTC)
Subject: rpms/mono/devel import.log,1.43,1.44 mono.spec,1.120,1.121
Message-ID: <20090406202756.B8512700FB@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2408/devel

Modified Files:
	import.log mono.spec 
Log Message:

Enable moonlight support
Disable ppc build 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- import.log	26 Mar 2009 23:12:10 -0000	1.43
+++ import.log	6 Apr 2009 20:27:26 -0000	1.44
@@ -41,3 +41,4 @@
 mono-2_4-10_RC2_fc11:HEAD:mono-2.4-10.RC2.fc11.src.rpm:1237125605
 mono-2_4-11_RC3_fc11:HEAD:mono-2.4-11.RC3.fc11.src.rpm:1237420759
 mono-2_4-12_fc11:HEAD:mono-2.4-12.fc11.src.rpm:1238109092
+mono-2_4-12_1_fc11:HEAD:mono-2.4-12.1.fc11.src.rpm:1239049596





From pkgdb at fedoraproject.org  Mon Apr  6 20:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:29:40 +0000
Subject: [pkgdb] olpc-hardware-manager ownership updated
Message-ID: <20090406202940.E37F1208603@bastion.fedora.phx.redhat.com>

Package olpc-hardware-manager in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/olpc-hardware-manager



From pkgdb at fedoraproject.org  Mon Apr  6 20:29:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:29:21 +0000
Subject: [pkgdb] olpc-hardware-manager ownership updated
Message-ID: <20090406202944.D3B0F208604@bastion.fedora.phx.redhat.com>

Package olpc-hardware-manager in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/olpc-hardware-manager



From pfj at fedoraproject.org  Mon Apr  6 20:30:37 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon,  6 Apr 2009 20:30:37 +0000 (UTC)
Subject: rpms/mod_mono/devel import.log,1.12,1.13 mod_mono.spec,1.22,1.23
Message-ID: <20090406203037.45D98700FB@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mod_mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2873/devel

Modified Files:
	import.log mod_mono.spec 
Log Message:

Disable PPC 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	26 Mar 2009 23:10:36 -0000	1.12
+++ import.log	6 Apr 2009 20:30:06 -0000	1.13
@@ -10,3 +10,4 @@
 mod_mono-2_4-3_RC2_fc11:HEAD:mod_mono-2.4-3.RC2.fc11.src.rpm:1237125787
 mod_mono-2_4-4_RC3_fc11:HEAD:mod_mono-2.4-4.RC3.fc11.src.rpm:1237421050
 mod_mono-2_4-4_fc11:HEAD:mod_mono-2.4-4.fc11.src.rpm:1238109005
+mod_mono-2_4-4_1_fc11:HEAD:mod_mono-2.4-4.1.fc11.src.rpm:1239049771


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_mono.spec	26 Mar 2009 23:10:36 -0000	1.22
+++ mod_mono.spec	6 Apr 2009 20:30:06 -0000	1.23
@@ -1,6 +1,6 @@
 Name: mod_mono
 Version: 2.4
-Release: 4%{?dist}
+Release: 4.1%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
@@ -11,7 +11,7 @@
 Summary: A module to deploy an ASP.NET application on Apache with Mono
 Group: System Environment/Daemons
 
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
 %description
 
@@ -53,6 +53,9 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-4.1
+- Remove ppc support
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-4
 - Full 2.4 release
 



From nalin at fedoraproject.org  Mon Apr  6 20:34:14 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 20:34:14 +0000 (UTC)
Subject: rpms/krb5/devel kpropd.init,1.4,1.5 krb5.spec,1.187,1.188
Message-ID: <20090406203414.89880700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3231

Modified Files:
	kpropd.init krb5.spec 
Log Message:
- make the kpropd init script treat reload as restart (part of #225974)


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kpropd.init	2 Jan 2008 17:03:38 -0000	1.4
+++ kpropd.init	6 Apr 2009 20:33:44 -0000	1.5
@@ -45,7 +45,8 @@
   stop)
 	stop
 	;;
-  restart)
+  # We don't really "do" reload, so treat it as a restart.
+  restart|reload)
 	stop
 	start
 	;;


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- krb5.spec	6 Apr 2009 18:22:58 -0000	1.187
+++ krb5.spec	6 Apr 2009 20:33:44 -0000	1.188
@@ -238,6 +238,7 @@
 - fixup summary texts (part of #225974)
 - take the execute bit off of the protocol docs (part of #225974)
 - unflag init scripts as configuration files (part of #225974)
+- make the kpropd init script treat 'reload' as 'restart' (part of #225974)
 
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when



From pkgdb at fedoraproject.org  Mon Apr  6 20:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:37:25 +0000
Subject: [pkgdb] xapian-bindings ownership updated
Message-ID: <20090406203725.C9CD3208550@bastion.fedora.phx.redhat.com>

Package xapian-bindings in Fedora devel is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-bindings



From pkgdb at fedoraproject.org  Mon Apr  6 20:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:37:56 +0000
Subject: [pkgdb] xapian-core ownership updated
Message-ID: <20090406203735.5F1A7208719@bastion.fedora.phx.redhat.com>

Package xapian-core in Fedora devel is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-core



From pkgdb at fedoraproject.org  Mon Apr  6 20:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:37:17 +0000
Subject: [pkgdb] libmatchbox ownership updated
Message-ID: <20090406203740.1A16720876E@bastion.fedora.phx.redhat.com>

Package libmatchbox in Fedora devel is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 20:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:38:05 +0000
Subject: [pkgdb] pyxapian ownership updated
Message-ID: <20090406203744.D3283208770@bastion.fedora.phx.redhat.com>

Package pyxapian in Fedora devel is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxapian



From pkgdb at fedoraproject.org  Mon Apr  6 20:38:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:38:10 +0000
Subject: [pkgdb] matchbox-window-manager ownership updated
Message-ID: <20090406203748.D9D982086EF@bastion.fedora.phx.redhat.com>

Package matchbox-window-manager in Fedora devel is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From erikos at fedoraproject.org  Mon Apr  6 20:37:50 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon,  6 Apr 2009 20:37:50 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.32, 1.33 sources, 1.36,
	1.37 sugar-toolkit.spec, 1.46, 1.47
Message-ID: <20090406203750.AE646700FB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3586

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.4-1
- new german and spanish translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	6 Apr 2009 18:30:52 -0000	1.32
+++ .cvsignore	6 Apr 2009 20:37:20 -0000	1.33
@@ -1 +1 @@
-sugar-toolkit-0.84.3.tar.bz2
+sugar-toolkit-0.84.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	6 Apr 2009 18:30:52 -0000	1.36
+++ sources	6 Apr 2009 20:37:20 -0000	1.37
@@ -1 +1 @@
-2a2d1a7fd54fa01b7547489bce0c2088  sugar-toolkit-0.84.3.tar.bz2
+5ad76015d382ec4125c2ef01022dc898  sugar-toolkit-0.84.4.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sugar-toolkit.spec	6 Apr 2009 18:30:52 -0000	1.46
+++ sugar-toolkit.spec	6 Apr 2009 20:37:20 -0000	1.47
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.84.3
+Version: 0.84.4
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -69,6 +69,9 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.4-1
+- new german and spanish translations
+
 * Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.3-1
 - Journal Palette does not manage too many characters for a title correctly #610
 - Bundlebuilder list_files: Better error handling #635



From pkgdb at fedoraproject.org  Mon Apr  6 20:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:39:21 +0000
Subject: [pkgdb] sugar-datastore ownership updated
Message-ID: <20090406203901.547F7208608@bastion.fedora.phx.redhat.com>

Package sugar-datastore in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-datastore



From pkgdb at fedoraproject.org  Mon Apr  6 20:39:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:39:44 +0000
Subject: [pkgdb] sugar-artwork ownership updated
Message-ID: <20090406203923.EDBFF2086FE@bastion.fedora.phx.redhat.com>

Package sugar-artwork in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-artwork



From pkgdb at fedoraproject.org  Mon Apr  6 20:39:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:39:34 +0000
Subject: [pkgdb] sugar-toolkit ownership updated
Message-ID: <20090406203934.C5554208604@bastion.fedora.phx.redhat.com>

Package sugar-toolkit in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-toolkit



From pkgdb at fedoraproject.org  Mon Apr  6 20:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:40:07 +0000
Subject: [pkgdb] sugar-base ownership updated
Message-ID: <20090406203946.0FB6D2086FF@bastion.fedora.phx.redhat.com>

Package sugar-base in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-base



From pkgdb at fedoraproject.org  Mon Apr  6 20:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:40:21 +0000
Subject: [pkgdb] sugar-presence-service ownership updated
Message-ID: <20090406203959.B1FA3208609@bastion.fedora.phx.redhat.com>

Package sugar-presence-service in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Mon Apr  6 20:39:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:39:55 +0000
Subject: [pkgdb] sugar ownership updated
Message-ID: <20090406204017.C9B1C2086F3@bastion.fedora.phx.redhat.com>

Package sugar in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Apr  6 20:40:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:40:03 +0000
Subject: [pkgdb] hulahop ownership updated
Message-ID: <20090406204026.5A8B0208604@bastion.fedora.phx.redhat.com>

Package hulahop in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Mon Apr  6 20:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:40:52 +0000
Subject: [pkgdb] hulahop ownership updated
Message-ID: <20090406204052.57A73208556@bastion.fedora.phx.redhat.com>

Package hulahop in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hulahop



From pkgdb at fedoraproject.org  Mon Apr  6 20:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:40:40 +0000
Subject: [pkgdb] sugar ownership updated
Message-ID: <20090406204102.971132086EF@bastion.fedora.phx.redhat.com>

Package sugar in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:31 +0000
Subject: [pkgdb] sugar-presence-service ownership updated
Message-ID: <20090406204110.80759208603@bastion.fedora.phx.redhat.com>

Package sugar-presence-service in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:37 +0000
Subject: [pkgdb] sugar-base ownership updated
Message-ID: <20090406204117.107EF20854A@bastion.fedora.phx.redhat.com>

Package sugar-base in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-base



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:26 +0000
Subject: [pkgdb] sugar-toolkit ownership updated
Message-ID: <20090406204126.361062084A7@bastion.fedora.phx.redhat.com>

Package sugar-toolkit in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-toolkit



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:11 +0000
Subject: [pkgdb] sugar-artwork ownership updated
Message-ID: <20090406204133.8CE3D208605@bastion.fedora.phx.redhat.com>

Package sugar-artwork in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-artwork



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:35 +0000
Subject: [pkgdb] xapian-bindings ownership updated
Message-ID: <20090406204135.6618B208711@bastion.fedora.phx.redhat.com>

Package xapian-bindings in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-bindings



From pkgdb at fedoraproject.org  Mon Apr  6 20:42:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:42:01 +0000
Subject: [pkgdb] sugar-datastore ownership updated
Message-ID: <20090406204141.0BB6120876E@bastion.fedora.phx.redhat.com>

Package sugar-datastore in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-datastore



From pkgdb at fedoraproject.org  Mon Apr  6 20:42:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:42:06 +0000
Subject: [pkgdb] libmatchbox ownership updated
Message-ID: <20090406204145.CF0A2208719@bastion.fedora.phx.redhat.com>

Package libmatchbox in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:18 +0000
Subject: [pkgdb] xapian-core ownership updated
Message-ID: <20090406204141.92D0A208557@bastion.fedora.phx.redhat.com>

Package xapian-core in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xapian-core



From pkgdb at fedoraproject.org  Mon Apr  6 20:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:42:12 +0000
Subject: [pkgdb] pyxapian ownership updated
Message-ID: <20090406204151.47C7D20860F@bastion.fedora.phx.redhat.com>

Package pyxapian in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxapian



From pkgdb at fedoraproject.org  Mon Apr  6 20:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 20:41:38 +0000
Subject: [pkgdb] matchbox-window-manager ownership updated
Message-ID: <20090406204201.61C57208702@bastion.fedora.phx.redhat.com>

Package matchbox-window-manager in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From lmacken at fedoraproject.org  Mon Apr  6 20:41:45 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  6 Apr 2009 20:41:45 +0000 (UTC)
Subject: rpms/bodhi/EL-5 bodhi-0.5.19-tg-paginate.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 bodhi.spec, 1.13, 1.14 sources, 1.12, 1.13
Message-ID: <20090406204145.65C02700FB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4074

Modified Files:
	.cvsignore bodhi.spec sources 
Added Files:
	bodhi-0.5.19-tg-paginate.patch 
Log Message:
0.5.19, and add a patch to get pagination working in TG 1.0.4.4


bodhi-0.5.19-tg-paginate.patch:

--- NEW FILE bodhi-0.5.19-tg-paginate.patch ---
--- bodhi/controllers.py.orig	2009-04-06 11:58:54.000000000 -0400
+++ bodhi/controllers.py	2009-04-06 12:20:34.000000000 -0400
@@ -179,7 +179,7 @@
         raise redirect('/')
 
     @expose(template="bodhi.templates.list", allow_json=True)
-    @paginate('updates', limit=20, max_limit=50, allow_limit_override=True)
+    @paginate('updates', limit=20, allow_limit_override=True)
     @validate(validators={
             'release': validators.UnicodeString(),
             'bugs': validators.UnicodeString(),
@@ -325,7 +325,7 @@
 
     @expose(template="bodhi.templates.mine", allow_json=True)
     @identity.require(identity.not_anonymous())
-    @paginate('updates', limit=20, max_limit=20, allow_limit_override=True)
+    @paginate('updates', limit=20, allow_limit_override=True)
     def mine(self):
         """ List all updates submitted by the current user """
         updates = PackageUpdate.select(
@@ -781,7 +781,7 @@
             raise redirect(updates[0].get_url())
 
     @expose(template='bodhi.templates.list')
-    @paginate('updates', limit=20, max_limit=20, allow_limit_override=True)
+    @paginate('updates', limit=20, allow_limit_override=True)
     def default(self, *args, **kw):
         """
         This method allows for the following requests
@@ -974,7 +974,7 @@
         raise redirect('/')
 
     @expose(template='bodhi.templates.comments')
-    @paginate('comments', limit=20, max_limit=20, allow_limit_override=True)
+    @paginate('comments', limit=20, allow_limit_override=True)
     def comments(self):
         data = Comment.select(Comment.q.author != 'bodhi',
                               orderBy=Comment.q.timestamp).reversed()
@@ -1054,7 +1054,7 @@
         return dict(updates=updates)
 
     @expose(template="bodhi.templates.user")
-    @paginate('updates', limit=25, max_limit=20, allow_limit_override=True)
+    @paginate('updates', limit=25, allow_limit_override=True)
     def user(self, username):
         """ Return a list of updates submitted by a given person """
         updates = PackageUpdate.select(PackageUpdate.q.submitter == username,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Jan 2009 23:33:36 -0000	1.11
+++ .cvsignore	6 Apr 2009 20:41:15 -0000	1.12
@@ -1 +1 @@
-bodhi-0.5.16.tar.bz2
+bodhi-0.5.19.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/bodhi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bodhi.spec	3 Feb 2009 00:57:19 -0000	1.13
+++ bodhi.spec	6 Apr 2009 20:41:15 -0000	1.14
@@ -2,13 +2,14 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.16
-Release:        2%{?dist}
+Version:        0.5.19
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://fedorahosted.org/bodhi
 Source0:        bodhi-%{version}.tar.bz2
+Patch0:         bodhi-%{version}-tg-paginate.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 rm -rf bodhi/tests bodhi/tools/test-bodhi.py
+%patch0 -p0 -b .tg1044
 
 %build
 %{__python} setup.py build --install-data=%{_datadir}
@@ -100,7 +102,6 @@
 %{_bindir}/start-%{name}
 %{_bindir}/%{name}-*
 %{_sysconfdir}/httpd/conf.d/bodhi.conf
-%dir %{_sysconfdir}/bodhi/
 %attr(-,apache,root) %{_datadir}/%{name}
 %attr(-,apache,root) %config(noreplace) %{_sysconfdir}/bodhi/*
 %attr(-,apache,root) %{_localstatedir}/log/bodhi
@@ -114,8 +115,15 @@
 
 
 %changelog
-* Mon Feb 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.16-2
-- Own the %%{_sysconfdir}/bodhi directory.
+* Sat Mar 21 2009 Luke Macken <lmacken at redhat.com> - 0.5.19-1
+- 0.5.19
+- Add a patch to get pagination working in TG 1.0.4.4
+
+* Tue Feb 10 2009 Luke Macken <lmacken at redhat.com> - 0.5.18-1
+- Bugfix release, and to stop using deprecated python-fedora APIs.
+
+* Thu Jan 22 2009 Luke Macken <lmacken at redhat.com> - 0.5.17-1
+- Latest upstream bugfix release.
 
 * Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
 - Latest upstream bugfix release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jan 2009 23:33:36 -0000	1.12
+++ sources	6 Apr 2009 20:41:15 -0000	1.13
@@ -1 +1 @@
-a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2
+b373010f503945a764d4cf7034394d2e  bodhi-0.5.19.tar.bz2



From spot at fedoraproject.org  Mon Apr  6 20:47:19 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 20:47:19 +0000 (UTC)
Subject: rpms/pyke/devel .cvsignore, 1.6, 1.7 pyke.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <20090406204719.A8A2770137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4642

Modified Files:
	.cvsignore pyke.spec sources 
Log Message:
1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Mar 2009 20:31:12 -0000	1.6
+++ .cvsignore	6 Apr 2009 20:46:49 -0000	1.7
@@ -1 +1 @@
-pyke-1.0.tar.gz
+pyke-1.0.1.tar.gz


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/pyke.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyke.spec	19 Mar 2009 20:31:12 -0000	1.8
+++ pyke.spec	6 Apr 2009 20:46:49 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		1.0
+Version:		1.0.1
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -44,6 +44,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Mon Apr  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1
+- update to 1.0.1
+
 * Thu Mar 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-1
 - update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 20:31:12 -0000	1.7
+++ sources	6 Apr 2009 20:46:49 -0000	1.8
@@ -1 +1 @@
-207d1809faa4d7a7504702b097f085ec  pyke-1.0.tar.gz
+387610224a4bc87777710c6a406aa9a4  pyke-1.0.1.tar.gz



From ixs at fedoraproject.org  Mon Apr  6 20:48:40 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Mon,  6 Apr 2009 20:48:40 +0000 (UTC)
Subject: rpms/ccrtp/devel .cvsignore, 1.6, 1.7 ccrtp.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <20090406204840.BFEC0700FB@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ccrtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5428

Modified Files:
	.cvsignore ccrtp.spec sources 
Log Message:
* Mon Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.1-1
- Update to upstream release 1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccrtp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Feb 2008 06:47:07 -0000	1.6
+++ .cvsignore	6 Apr 2009 20:48:10 -0000	1.7
@@ -1 +1 @@
-ccrtp-1.6.0.tar.gz
+ccrtp-1.7.1.tar.gz


Index: ccrtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccrtp/devel/ccrtp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ccrtp.spec	24 Feb 2009 06:41:37 -0000	1.12
+++ ccrtp.spec	6 Apr 2009 20:48:10 -0000	1.13
@@ -1,14 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.6.0
-Release: 3%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source0: http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-%{version}.tar.gz
-Patch0: ccrtp-1.6.0-gcc.patch
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel >= 1.6.0, doxygen, libgcrypt-devel
+BuildRequires: commoncpp2-devel >= 1.7.0, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -37,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p 1 -b .gcc
 chmod 644 src/ccrtp/rtp.h
 
 %build
@@ -82,6 +80,9 @@
 
 
 %changelog
+* Mon Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.1-1
+- Update to upstream release 1.7.1
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccrtp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Feb 2008 06:47:07 -0000	1.6
+++ sources	6 Apr 2009 20:48:10 -0000	1.7
@@ -1 +1 @@
-ce02643d9091d769943c9b186203a7b4  ccrtp-1.6.0.tar.gz
+9f5d34a18f2c1c779d2e5818cc4987f8  ccrtp-1.7.1.tar.gz



From mtasaka at fedoraproject.org  Mon Apr  6 20:50:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 20:50:03 +0000 (UTC)
Subject: rpms/alexandria/devel
	alexandria-0.6.4.1-right-click-left-pane.patch, 
	1.1, 1.2 alexandria.spec, 1.30, 1.31
Message-ID: <20090406205003.3BF68700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5607/devel

Modified Files:
	alexandria-0.6.4.1-right-click-left-pane.patch alexandria.spec 
Log Message:
After hard work by upstream, bug 25021 is now solved

alexandria-0.6.4.1-right-click-left-pane.patch:

Index: alexandria-0.6.4.1-right-click-left-pane.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria-0.6.4.1-right-click-left-pane.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alexandria-0.6.4.1-right-click-left-pane.patch	6 Apr 2009 18:03:49 -0000	1.1
+++ alexandria-0.6.4.1-right-click-left-pane.patch	6 Apr 2009 20:50:02 -0000	1.2
@@ -1,7 +1,7 @@
 Index: lib/alexandria/ui/callbacks.rb
 ===================================================================
 --- lib/alexandria/ui/callbacks.rb	(revision 1067)
-+++ lib/alexandria/ui/callbacks.rb	(revision 1070)
++++ lib/alexandria/ui/callbacks.rb	(revision 1072)
 @@ -19,6 +19,9 @@
  module Alexandria
    module UI
@@ -12,12 +12,13 @@
        def on_new widget, event
          name = Library.generate_new_name(@libraries.all_libraries)
          library = Library.load(name)
-@@ -208,6 +211,11 @@
+@@ -208,6 +211,12 @@
        def on_delete widget, event
          library = selected_library
          books = @library_listview.focus? ? nil : selected_books
++        is_smart = library.is_a?(SmartLibrary)
 +        last_library = (@libraries.all_regular_libraries.length == 1)
-+        if last_library
++        if (!is_smart && last_library)
 +          log.warn { "Attempted to delete last library, fix GUI" }
 +          return
 +        end
@@ -27,7 +28,7 @@
 Index: lib/alexandria/ui/ui_manager.rb
 ===================================================================
 --- lib/alexandria/ui/ui_manager.rb	(revision 1067)
-+++ lib/alexandria/ui/ui_manager.rb	(revision 1070)
++++ lib/alexandria/ui/ui_manager.rb	(revision 1072)
 @@ -306,6 +306,7 @@
  
          if event_is_right_click event
@@ -44,7 +45,7 @@
                widget.unselect_all
                obj.select_path(path)
              end
-@@ -321,10 +323,24 @@
+@@ -321,10 +323,25 @@
            end
  
            menu = determine_library_popup widget, event
@@ -63,6 +64,7 @@
 +
 +          
 +          if library_already_selected
++            sensitize_library selected_library
 +            Gtk.idle_add do
 +              menu.popup(nil, nil, event.button, event.time)
 +              false
@@ -72,3 +74,13 @@
          end
        end
  
+@@ -972,7 +989,8 @@
+         @actiongroup["AddBook"].sensitive = !smart
+         @actiongroup["AddBookManual"].sensitive = !smart
+         @actiongroup["Properties"].sensitive = true
+-        @actiongroup["Delete"].sensitive = true #(@libraries.all_regular_libraries.length > 1)
++        can_delete = smart || (@libraries.all_regular_libraries.length > 1)
++        @actiongroup["Delete"].sensitive = can_delete ## true #(@libraries.all_regular_libraries.length > 1)
+         log.debug { "sensitize_library delete: #{@actiongroup["Delete"].sensitive?}" }
+       end
+ 


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- alexandria.spec	6 Apr 2009 18:03:50 -0000	1.30
+++ alexandria.spec	6 Apr 2009 20:50:02 -0000	1.31
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -23,11 +23,9 @@
 # deprecated 4 arguments format
 # ref: alexandria-Bugs-24882 alexandria-Bugs-24882
 Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Workaround for issue with right click on left pane
+# Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
-# And try more fix
-Patch2:		alexandria-0.6.4.1-right-click-left-pane-morefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -79,7 +77,6 @@
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
-%patch2 -p0 -b .moretry
 
 %build
 rake build
@@ -201,8 +198,8 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
-- Workaround for strange behavior with right click on left pane
+* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-4
+- Fix for strange behavior with right click on left pane
   (alexandria-Bugs-25021)
 
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-2



From mtasaka at fedoraproject.org  Mon Apr  6 20:50:32 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 20:50:32 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria-0.6.4.1-right-click-left-pane.patch,
	1.1, 1.2 alexandria.spec, 1.23, 1.24
Message-ID: <20090406205032.BF051700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5607/F-10

Modified Files:
	alexandria-0.6.4.1-right-click-left-pane.patch alexandria.spec 
Log Message:
After hard work by upstream, bug 25021 is now solved

alexandria-0.6.4.1-right-click-left-pane.patch:

Index: alexandria-0.6.4.1-right-click-left-pane.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria-0.6.4.1-right-click-left-pane.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alexandria-0.6.4.1-right-click-left-pane.patch	6 Apr 2009 18:03:48 -0000	1.1
+++ alexandria-0.6.4.1-right-click-left-pane.patch	6 Apr 2009 20:50:02 -0000	1.2
@@ -1,7 +1,7 @@
 Index: lib/alexandria/ui/callbacks.rb
 ===================================================================
 --- lib/alexandria/ui/callbacks.rb	(revision 1067)
-+++ lib/alexandria/ui/callbacks.rb	(revision 1070)
++++ lib/alexandria/ui/callbacks.rb	(revision 1072)
 @@ -19,6 +19,9 @@
  module Alexandria
    module UI
@@ -12,12 +12,13 @@
        def on_new widget, event
          name = Library.generate_new_name(@libraries.all_libraries)
          library = Library.load(name)
-@@ -208,6 +211,11 @@
+@@ -208,6 +211,12 @@
        def on_delete widget, event
          library = selected_library
          books = @library_listview.focus? ? nil : selected_books
++        is_smart = library.is_a?(SmartLibrary)
 +        last_library = (@libraries.all_regular_libraries.length == 1)
-+        if last_library
++        if (!is_smart && last_library)
 +          log.warn { "Attempted to delete last library, fix GUI" }
 +          return
 +        end
@@ -27,7 +28,7 @@
 Index: lib/alexandria/ui/ui_manager.rb
 ===================================================================
 --- lib/alexandria/ui/ui_manager.rb	(revision 1067)
-+++ lib/alexandria/ui/ui_manager.rb	(revision 1070)
++++ lib/alexandria/ui/ui_manager.rb	(revision 1072)
 @@ -306,6 +306,7 @@
  
          if event_is_right_click event
@@ -44,7 +45,7 @@
                widget.unselect_all
                obj.select_path(path)
              end
-@@ -321,10 +323,24 @@
+@@ -321,10 +323,25 @@
            end
  
            menu = determine_library_popup widget, event
@@ -63,6 +64,7 @@
 +
 +          
 +          if library_already_selected
++            sensitize_library selected_library
 +            Gtk.idle_add do
 +              menu.popup(nil, nil, event.button, event.time)
 +              false
@@ -72,3 +74,13 @@
          end
        end
  
+@@ -972,7 +989,8 @@
+         @actiongroup["AddBook"].sensitive = !smart
+         @actiongroup["AddBookManual"].sensitive = !smart
+         @actiongroup["Properties"].sensitive = true
+-        @actiongroup["Delete"].sensitive = true #(@libraries.all_regular_libraries.length > 1)
++        can_delete = smart || (@libraries.all_regular_libraries.length > 1)
++        @actiongroup["Delete"].sensitive = can_delete ## true #(@libraries.all_regular_libraries.length > 1)
+         log.debug { "sensitize_library delete: #{@actiongroup["Delete"].sensitive?}" }
+       end
+ 


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- alexandria.spec	6 Apr 2009 18:03:48 -0000	1.23
+++ alexandria.spec	6 Apr 2009 20:50:02 -0000	1.24
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -23,11 +23,9 @@
 # deprecated 4 arguments format
 # ref: alexandria-Bugs-24882 alexandria-Bugs-24882
 Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Workaround for issue with right click on left pane
+# Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
-# And try more fix
-Patch2:		alexandria-0.6.4.1-right-click-left-pane-morefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -79,7 +77,6 @@
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
-%patch2 -p0 -b .moretry
 
 %build
 rake build
@@ -201,8 +198,8 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
-- Workaround for strange behavior with right click on left pane
+* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-4
+- Fix for strange behavior with right click on left pane
   (alexandria-Bugs-25021)
 
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-2



From mtasaka at fedoraproject.org  Mon Apr  6 20:50:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  6 Apr 2009 20:50:33 +0000 (UTC)
Subject: rpms/alexandria/F-9 alexandria-0.6.4.1-right-click-left-pane.patch, 
	1.1, 1.2 alexandria.spec, 1.23, 1.24
Message-ID: <20090406205033.04486700FB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5607/F-9

Modified Files:
	alexandria-0.6.4.1-right-click-left-pane.patch alexandria.spec 
Log Message:
After hard work by upstream, bug 25021 is now solved

alexandria-0.6.4.1-right-click-left-pane.patch:

Index: alexandria-0.6.4.1-right-click-left-pane.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria-0.6.4.1-right-click-left-pane.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alexandria-0.6.4.1-right-click-left-pane.patch	6 Apr 2009 18:03:49 -0000	1.1
+++ alexandria-0.6.4.1-right-click-left-pane.patch	6 Apr 2009 20:50:02 -0000	1.2
@@ -1,7 +1,7 @@
 Index: lib/alexandria/ui/callbacks.rb
 ===================================================================
 --- lib/alexandria/ui/callbacks.rb	(revision 1067)
-+++ lib/alexandria/ui/callbacks.rb	(revision 1070)
++++ lib/alexandria/ui/callbacks.rb	(revision 1072)
 @@ -19,6 +19,9 @@
  module Alexandria
    module UI
@@ -12,12 +12,13 @@
        def on_new widget, event
          name = Library.generate_new_name(@libraries.all_libraries)
          library = Library.load(name)
-@@ -208,6 +211,11 @@
+@@ -208,6 +211,12 @@
        def on_delete widget, event
          library = selected_library
          books = @library_listview.focus? ? nil : selected_books
++        is_smart = library.is_a?(SmartLibrary)
 +        last_library = (@libraries.all_regular_libraries.length == 1)
-+        if last_library
++        if (!is_smart && last_library)
 +          log.warn { "Attempted to delete last library, fix GUI" }
 +          return
 +        end
@@ -27,7 +28,7 @@
 Index: lib/alexandria/ui/ui_manager.rb
 ===================================================================
 --- lib/alexandria/ui/ui_manager.rb	(revision 1067)
-+++ lib/alexandria/ui/ui_manager.rb	(revision 1070)
++++ lib/alexandria/ui/ui_manager.rb	(revision 1072)
 @@ -306,6 +306,7 @@
  
          if event_is_right_click event
@@ -44,7 +45,7 @@
                widget.unselect_all
                obj.select_path(path)
              end
-@@ -321,10 +323,24 @@
+@@ -321,10 +323,25 @@
            end
  
            menu = determine_library_popup widget, event
@@ -63,6 +64,7 @@
 +
 +          
 +          if library_already_selected
++            sensitize_library selected_library
 +            Gtk.idle_add do
 +              menu.popup(nil, nil, event.button, event.time)
 +              false
@@ -72,3 +74,13 @@
          end
        end
  
+@@ -972,7 +989,8 @@
+         @actiongroup["AddBook"].sensitive = !smart
+         @actiongroup["AddBookManual"].sensitive = !smart
+         @actiongroup["Properties"].sensitive = true
+-        @actiongroup["Delete"].sensitive = true #(@libraries.all_regular_libraries.length > 1)
++        can_delete = smart || (@libraries.all_regular_libraries.length > 1)
++        @actiongroup["Delete"].sensitive = can_delete ## true #(@libraries.all_regular_libraries.length > 1)
+         log.debug { "sensitize_library delete: #{@actiongroup["Delete"].sensitive?}" }
+       end
+ 


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- alexandria.spec	6 Apr 2009 18:03:49 -0000	1.23
+++ alexandria.spec	6 Apr 2009 20:50:02 -0000	1.24
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -23,11 +23,9 @@
 # deprecated 4 arguments format
 # ref: alexandria-Bugs-24882 alexandria-Bugs-24882
 Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Workaround for issue with right click on left pane
+# Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
-# And try more fix
-Patch2:		alexandria-0.6.4.1-right-click-left-pane-morefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -79,7 +77,6 @@
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
-%patch2 -p0 -b .moretry
 
 %build
 rake build
@@ -201,8 +198,8 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-3
-- Workaround for strange behavior with right click on left pane
+* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-4
+- Fix for strange behavior with right click on left pane
   (alexandria-Bugs-25021)
 
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-2



From spot at fedoraproject.org  Mon Apr  6 20:56:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 20:56:58 +0000 (UTC)
Subject: rpms/olpc-hardware-manager/devel dead.package,NONE,1.1
Message-ID: <20090406205658.684DD700FB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/olpc-hardware-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6716

Added Files:
	dead.package 
Log Message:
dead packaged


--- NEW FILE dead.package ---
Obsoleted by ohm.



From lmacken at fedoraproject.org  Mon Apr  6 21:02:10 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  6 Apr 2009 21:02:10 +0000 (UTC)
Subject: rpms/bodhi/EL-5 bodhi.spec,1.14,1.15
Message-ID: <20090406210210.A262D700FB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7190

Modified Files:
	bodhi.spec 
Log Message:
Revert an accidental spec change


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/bodhi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bodhi.spec	6 Apr 2009 20:41:15 -0000	1.14
+++ bodhi.spec	6 Apr 2009 21:01:40 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           bodhi
 Version:        0.5.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -67,7 +67,7 @@
 %prep
 %setup -q
 rm -rf bodhi/tests bodhi/tools/test-bodhi.py
-%patch0 -p0 -b .tg1044
+%patch0 -b .tg1044
 
 %build
 %{__python} setup.py build --install-data=%{_datadir}
@@ -102,6 +102,7 @@
 %{_bindir}/start-%{name}
 %{_bindir}/%{name}-*
 %{_sysconfdir}/httpd/conf.d/bodhi.conf
+%dir %{_sysconfdir}/bodhi/
 %attr(-,apache,root) %{_datadir}/%{name}
 %attr(-,apache,root) %config(noreplace) %{_sysconfdir}/bodhi/*
 %attr(-,apache,root) %{_localstatedir}/log/bodhi
@@ -115,6 +116,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Luke Macken <lmacken at redhat.com> - 0.5.19-2
+- Revert an accidental spec change
+
 * Sat Mar 21 2009 Luke Macken <lmacken at redhat.com> - 0.5.19-1
 - 0.5.19
 - Add a patch to get pagination working in TG 1.0.4.4



From pkgdb at fedoraproject.org  Mon Apr  6 21:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:07:31 +0000
Subject: [pkgdb] iaxclient (Fedora, 10) updated by spot
Message-ID: <20090406210710.F2F082084A7@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for iaxclient
spot has set commit to Approved for provenpackager on iaxclient (Fedora 10)
spot has set build to Approved for provenpackager on iaxclient (Fedora 10)
spot has set checkout to Approved for provenpackager on iaxclient (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iaxclient



From pkgdb at fedoraproject.org  Mon Apr  6 21:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:07:31 +0000
Subject: [pkgdb] iaxclient was added for spot
Message-ID: <20090406210709.B6D46208553@bastion.fedora.phx.redhat.com>

spot has added Package iaxclient with summary Library for creating telephony solutions that interoperate with Asterisk
spot has approved Package iaxclient
spot has added a Fedora devel branch for iaxclient with an owner of spot
spot has approved iaxclient in Fedora devel
spot has approved Package iaxclient
spot has set commit to Approved for provenpackager on iaxclient (Fedora devel)
spot has set build to Approved for provenpackager on iaxclient (Fedora devel)
spot has set checkout to Approved for provenpackager on iaxclient (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iaxclient



From spot at fedoraproject.org  Mon Apr  6 21:06:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:06:55 +0000 (UTC)
Subject: rpms/iaxclient/devel - New directory
Message-ID: <20090406210655.74A1A70137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWn7943/rpms/iaxclient/devel

Log Message:
Directory /cvs/pkgs/rpms/iaxclient/devel added to the repository




From spot at fedoraproject.org  Mon Apr  6 21:06:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:06:55 +0000 (UTC)
Subject: rpms/iaxclient - New directory
Message-ID: <20090406210655.3E2A7700FB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWn7943/rpms/iaxclient

Log Message:
Directory /cvs/pkgs/rpms/iaxclient added to the repository




From pkgdb at fedoraproject.org  Mon Apr  6 21:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:07:31 +0000
Subject: [pkgdb] iaxclient (Fedora, 9) updated by spot
Message-ID: <20090406210712.E7027208556@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for iaxclient
spot has set commit to Approved for provenpackager on iaxclient (Fedora 9)
spot has set build to Approved for provenpackager on iaxclient (Fedora 9)
spot has set checkout to Approved for provenpackager on iaxclient (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iaxclient



From spot at fedoraproject.org  Mon Apr  6 21:07:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:07:03 +0000 (UTC)
Subject: rpms/iaxclient Makefile,NONE,1.1
Message-ID: <20090406210703.0F6B5700FB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWn7943/rpms/iaxclient

Added Files:
	Makefile 
Log Message:
Setup of module iaxclient


--- NEW FILE Makefile ---
# Top level Makefile for module iaxclient
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Mon Apr  6 21:07:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:07:03 +0000 (UTC)
Subject: rpms/iaxclient/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090406210703.4C0927013D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsWn7943/rpms/iaxclient/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iaxclient


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: iaxclient
# $Id: Makefile,v 1.1 2009/04/06 21:07:03 spot Exp $
NAME := iaxclient
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From dodji at fedoraproject.org  Mon Apr  6 21:08:33 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  6 Apr 2009 21:08:33 +0000 (UTC)
Subject: rpms/cloog/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090406210833.82A51700FB@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8175

Modified Files:
	.cvsignore sources 
Log Message:
Upload cloog-0.15-gitad322.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Apr 2009 20:08:59 -0000	1.3
+++ .cvsignore	6 Apr 2009 21:08:03 -0000	1.4
@@ -1 +1 @@
-cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch
+cloog-0.15-gitad322.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Apr 2009 20:08:59 -0000	1.3
+++ sources	6 Apr 2009 21:08:03 -0000	1.4
@@ -1 +1 @@
-c2aa3765aefa9dbf4b7f024907c0362f  cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch
+0c293a1fb958b7616df742de22679deb  cloog-0.15-gitad322.tar.gz



From lmacken at fedoraproject.org  Mon Apr  6 21:10:05 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  6 Apr 2009 21:10:05 +0000 (UTC)
Subject: rpms/bodhi/F-10 .cvsignore, 1.21, 1.22 bodhi.spec, 1.28,
	1.29 sources, 1.23, 1.24
Message-ID: <20090406211005.0D597700FB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8461

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Jan 2009 20:06:56 -0000	1.21
+++ .cvsignore	6 Apr 2009 21:09:34 -0000	1.22
@@ -1 +1 @@
-bodhi-0.5.17.tar.bz2
+bodhi-0.5.19.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/bodhi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bodhi.spec	3 Feb 2009 00:57:19 -0000	1.28
+++ bodhi.spec	6 Apr 2009 21:09:34 -0000	1.29
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.17
-Release:        2%{?dist}
+Version:        0.5.19
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -57,6 +57,7 @@
 Requires: python-tgcaptcha
 Requires: python-decorator
 Requires: mod_wsgi
+Requires: httpd
 
 
 %description server
@@ -114,6 +115,15 @@
 
 
 %changelog
+* Mon Apr 06 2009 Luke Macken <lmacken at redhat.com> - 0.5.19-1
+- 0.5.19
+
+* Sat Mar 14 2009 Luke Macken <lmacken at redhat.com> - 0.5.17-4
+- Require httpd
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.17-2
 - Own the %%{_sysconfdir}/bodhi directory.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	22 Jan 2009 20:06:56 -0000	1.23
+++ sources	6 Apr 2009 21:09:34 -0000	1.24
@@ -1 +1 @@
-f22a298d3aff0f9e740f810971e5028f  bodhi-0.5.17.tar.bz2
+334f99515d635cf07c1fbb83e40f1f36  bodhi-0.5.19.tar.bz2



From dodji at fedoraproject.org  Mon Apr  6 21:14:20 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  6 Apr 2009 21:14:20 +0000 (UTC)
Subject: rpms/cloog/devel
	cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch,
	NONE, 1.1
Message-ID: <20090406211420.7E098700FB@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9271

Added Files:
	cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch 
Log Message:
Add cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch


cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch:

--- NEW FILE cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch ---
>From 0d7e9335d12ecd1ef7baafadd78439a31f285505 Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji at redhat.com>
Date: Mon, 6 Apr 2009 15:00:53 +0200
Subject: [PATCH 3/3] Add @dircategory and @direntry to the texi file

	* doc/cloog.texi: Add @dircategory and @direntry nodes otherwise
	install-info complains at info file install time.
---
 doc/cloog.texi |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/doc/cloog.texi b/doc/cloog.texi
index a7dfe97..9ba5b07 100644
--- a/doc/cloog.texi
+++ b/doc/cloog.texi
@@ -31,9 +31,15 @@
 @c %  *                              PART I: HEADER                           *
 @c %  *************************************************************************/
 @c %**start of header
+
 @setfilename cloog.info
 @settitle CLooG - a loop generator for scanning polyhedra
 
+ at dircategory Software development
+ at direntry
+* cloog: (cloog)  A loop generator for scanning polyhedra
+ at end direntry
+
 @set EDITION 2.1
 @include gitversion.texi
 @set UPDATED October 15th 2007
-- 
1.6.2




From spot at fedoraproject.org  Mon Apr  6 21:15:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:15:05 +0000 (UTC)
Subject: rpms/iaxclient/devel iaxclient-2.1beta3-tcl-libdir.patch, NONE,
	1.1 iaxclient-2.1beta3-tcl-nodoc.patch, NONE,
	1.1 iaxclient-2.1beta3-theora-detection.patch, NONE,
	1.1 iaxclient-2.1beta3-tkphone-cleanups.patch, NONE,
	1.1 iaxclient-2.1beta3-wxGTK28.patch, NONE, 1.1 iaxclient.spec,
	NONE, 1.1 import.log, NONE, 1.1 phone.png, NONE,
	1.1 run-tkiaxphone.sh, NONE, 1.1 tkiaxphone.desktop, NONE,
	1.1 wxiax.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090406211505.D5881700FB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9507/devel

Modified Files:
	.cvsignore sources 
Added Files:
	iaxclient-2.1beta3-tcl-libdir.patch 
	iaxclient-2.1beta3-tcl-nodoc.patch 
	iaxclient-2.1beta3-theora-detection.patch 
	iaxclient-2.1beta3-tkphone-cleanups.patch 
	iaxclient-2.1beta3-wxGTK28.patch iaxclient.spec import.log 
	phone.png run-tkiaxphone.sh tkiaxphone.desktop wxiax.desktop 
Log Message:

initial commit


iaxclient-2.1beta3-tcl-libdir.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-libdir.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:24:44.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:25:14.000000000 -0400
@@ -108,7 +108,7 @@ RANLIB		= @RANLIB@
 RANLIB_STUB	= @RANLIB_STUB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS	= -L../../lib/.libs @SHLIB_LD_LIBS@
 STLIB_LD	= @STLIB_LD@
 #TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@

iaxclient-2.1beta3-tcl-nodoc.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-nodoc.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:28:59.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:29:06.000000000 -0400
@@ -203,7 +203,7 @@ doc:
 	@echo "        xml2nroff sample.xml > sample.n"
 	@echo "        xml2html sample.xml > sample.html"
 
-install: all install-binaries install-libraries install-doc
+install: all install-binaries install-libraries
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 

iaxclient-2.1beta3-theora-detection.patch:

--- NEW FILE iaxclient-2.1beta3-theora-detection.patch ---
diff -up iaxclient-2.1beta3/configure.ac.BAD iaxclient-2.1beta3/configure.ac
--- iaxclient-2.1beta3/configure.ac.BAD	2008-11-03 09:22:20.000000000 -0500
+++ iaxclient-2.1beta3/configure.ac	2008-11-03 09:22:28.000000000 -0500
@@ -193,7 +193,7 @@ PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.
 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
 PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no)
 PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
-PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no)
+PKG_CHECK_MODULES(THEORA, [theora >= 1.0], has_theora=yes, has_theora=no)
 PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no)
 PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no)
 
diff -up iaxclient-2.1beta3/configure.BAD iaxclient-2.1beta3/configure
--- iaxclient-2.1beta3/configure.BAD	2008-11-03 09:20:58.000000000 -0500
+++ iaxclient-2.1beta3/configure	2008-11-03 09:21:31.000000000 -0500
@@ -23115,12 +23115,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0alpha7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "theora >= 1.0alpha7") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "theora >= 1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "theora >= 1.0alpha7" 2>/dev/null`
+  pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "theora >= 1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23133,12 +23133,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_THEORA_LIBS="$THEORA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0alpha7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "theora >= 1.0alpha7") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "theora >= 1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "theora >= 1.0alpha7" 2>/dev/null`
+  pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "theora >= 1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23157,9 +23157,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora >= 1.0alpha7"`
+	        THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora >= 1.0"`
         else
-	        THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora >= 1.0alpha7"`
+	        THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora >= 1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$THEORA_PKG_ERRORS" >&5

iaxclient-2.1beta3-tkphone-cleanups.patch:

--- NEW FILE iaxclient-2.1beta3-tkphone-cleanups.patch ---
diff -up iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c.BAD iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c
--- iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c.BAD	2008-06-10 13:11:28.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c	2008-06-10 13:11:34.000000000 -0400
@@ -413,7 +413,7 @@ int main(int argc, char **argv) {
 #endif
 
     atexit(iaxc_shutdown); /* activate the exit handler */
-    if (iaxc_initialize(AUDIO_INTERNAL_PA,1)) {
+    if (iaxc_initialize(1)) {
 	fatal_error("cannot initialize iaxclient!");
     }
 
diff -up iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am.BAD iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am
--- iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am.BAD	2008-06-10 13:13:44.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am	2008-06-10 13:13:49.000000000 -0400
@@ -1,5 +1,5 @@
 # Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
-bin_SCRIPTS = tkphone
+bin_SCRIPTS = tkiaxphone
 
 iaxcli_PROGRAMS=iaxcli
 iaxcli_SOURCES = iaxcli.c tones.c tones.h
diff -up iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in.BAD iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in
--- iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in.BAD	2008-06-10 13:13:29.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in	2008-06-10 13:13:33.000000000 -0400
@@ -251,7 +251,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
-bin_SCRIPTS = tkphone
+bin_SCRIPTS = tkiaxphone
 iaxcli_SOURCES = iaxcli.c tones.c tones.h
 iaxclidir = ${libdir}/iaxclient/tkphone
 iaxcli_SCRIPTS = tkiaxphone
diff -up iaxclient-2.1beta3/simpleclient/tkphone/tones.c.BAD iaxclient-2.1beta3/simpleclient/tkphone/tones.c
--- iaxclient-2.1beta3/simpleclient/tkphone/tones.c.BAD	2008-06-10 13:12:03.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/tones.c	2008-06-10 13:12:09.000000000 -0400
@@ -32,7 +32,7 @@
 #ifdef TONES_MAIN
 #  include <stdio.h>
 #endif
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <math.h>
 #include "tones.h"

iaxclient-2.1beta3-wxGTK28.patch:

--- NEW FILE iaxclient-2.1beta3-wxGTK28.patch ---
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.BAD iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.BAD	2008-06-10 11:08:12.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc	2008-06-10 12:54:23.000000000 -0400
@@ -81,7 +81,7 @@ IAXCalls::IAXCalls(wxWindow *parent, int
 
     Hide();
     for(i=0;i<nCalls;i++) {
-        InsertItem(i,wxString::Format("%ld", i+1), 0);
+        InsertItem(i,wxString::Format(wxT("%ld"), i+1), 0);
         SetItem(i, 2, _T("No call"));
         item.m_itemId=i;
         item.m_mask = 0;
@@ -159,7 +159,7 @@ int IAXCalls::HandleStateEvent(struct ia
         stateItem.SetBackgroundColour(*wxWHITE);
     } else {
         // set remote 
-        SetItem(c.callNo, 2, c.remote );
+        SetItem(c.callNo, 2, wxString::FromAscii(c.remote) );
 
         bool outgoing = c.state & IAXC_CALL_STATE_OUTGOING;
         bool ringing = c.state & IAXC_CALL_STATE_RINGING;
@@ -226,7 +226,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
                  : wxFrame((wxFrame *) NULL, -1, title, wxPoint(xpos, ypos),
                    wxSize(width, height))
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString str;
     long     dummy;
     bool     bCont;
@@ -262,9 +262,9 @@ IAXFrame::IAXFrame(const wxChar *title, 
     wxMenu *optionsMenu = new wxMenu();
     optionsMenu->AppendCheckItem(ID_PTT, _T("Enable &Push to Talk\tCtrl-P"));
     optionsMenu->AppendCheckItem(ID_SILENCE, _T("Enable &Silence Suppression\tCtrl-S"));
-    optionsMenu->Append(ID_AUDIO,  "&Audio ...", "Show audio settings dialog");
-    optionsMenu->Append(ID_SERVER, "&Servers ...", "Manage servers list");
-    optionsMenu->Append(ID_SPEED,  "&Speed Dials ...", "Manage Speed Dials");
+    optionsMenu->Append(ID_AUDIO,  wxT("&Audio ..."), wxT("Show audio settings dialog"));
+    optionsMenu->Append(ID_SERVER, wxT("&Servers ..."), wxT("Manage servers list"));
+    optionsMenu->Append(ID_SPEED,  wxT("&Speed Dials ..."), wxT("Manage Speed Dials"));
    
     wxMenuBar *menuBar = new wxMenuBar();
 
@@ -293,7 +293,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
         wxGridSizer *dialpadsizer = new wxGridSizer(3);
         for(int i=0; i<12;i++)
         {
-            dialpadsizer->Add(new wxButton(aPanel, i, wxString(buttonlabels[i]),
+            dialpadsizer->Add(new wxButton(aPanel, i, wxString::FromAscii(buttonlabels[i]),
                                            wxDefaultPosition, wxDefaultSize,
                                            wxBU_EXACTFIT), 1, wxEXPAND|wxALL, 3);
         }
@@ -327,10 +327,10 @@ IAXFrame::IAXFrame(const wxChar *title, 
     }
 
     /* Speed Dial */
-    topsizer->Add(SpeedDial = new wxComboBox(aPanel, ID_SPEEDDIAL, "", 
+    topsizer->Add(SpeedDial = new wxComboBox(aPanel, ID_SPEEDDIAL, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Speed Dials");
+    config->SetPath(wxT("/Speed Dials"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       SpeedDial->Append(str);
@@ -356,7 +356,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
 
     topsizer->Add(row3sizer,0,wxEXPAND);
 
-    topsizer->Add(muteState = new wxStaticText(aPanel,-1,"PTT Disabled",
+    topsizer->Add(muteState = new wxStaticText(aPanel,-1,wxT("PTT Disabled"),
                                                wxDefaultPosition, wxDefaultSize),
                                                0,wxEXPAND);
 
@@ -411,7 +411,7 @@ void IAXFrame::SetPTT(bool state)
         iaxc_set_audio_output(0);  // unmute output
     }
 
-    muteState->SetLabel( pttState ? "Talk" : "Mute");
+    muteState->SetLabel( pttState ? wxT("Talk") : wxT("Mute"));
 }
 
 void IAXFrame::CheckPTT()
@@ -422,28 +422,28 @@ void IAXFrame::CheckPTT()
     SetPTT(newState);
 }
 
-void IAXFrame::OnDTMF(wxEvent &evt)
+void IAXFrame::OnDTMF(wxCommandEvent &evt)
 {
     iaxc_send_dtmf(*buttonlabels[evt.m_id]);
 }
 
-void IAXFrame::OnDial(wxEvent &evt)
+void IAXFrame::OnDial(wxCommandEvent &evt)
 {
     theFrame->DialBySpeedDialName(SpeedDial->GetValue());
 }
 
-void IAXFrame::OnHangup(wxEvent &evt)
+void IAXFrame::OnHangup(wxCommandEvent &evt)
 {
     iaxc_dump_call();
 }
 
-void IAXFrame::OnQuit(wxEvent &evt)
+void IAXFrame::OnQuit(wxCommandEvent &evt)
 {
     Close(TRUE);
 }
 
 void IAXFrame::RegisterByName(wxString RegName) {
-    wxConfig    *config = new wxConfig("iaxPhone");
+    wxConfig    *config = new wxConfig(wxT("iaxPhone"));
     wxChar      KeyPath[256];
     wxListItem  item;
     long        index;
@@ -451,26 +451,26 @@ void IAXFrame::RegisterByName(wxString R
     wxStringTokenizer tok(RegName, _T(":@"));
     char user[256], pass[256], host[256];
 
-    if(strlen(RegName) == 0)
+    if(wxStrlen(RegName) == 0)
         return;
 
     if(tok.CountTokens() == 3) {
 
-        strncpy( user , tok.GetNextToken().c_str(), 256);
-        strncpy( pass , tok.GetNextToken().c_str(), 256);
-        strncpy( host , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)user , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)pass , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)host , tok.GetNextToken().c_str(), 256);
     } else {
         // Check if it's a Speed Dial
-        wxStrcpy(KeyPath,     "/Servers/");
+        wxStrcpy(KeyPath,     wxT("/Servers/"));
         wxStrcat(KeyPath,     RegName);
         config->SetPath(KeyPath);
         if(!config->Exists(KeyPath)) {
-            theFrame->SetStatusText("Register format error");
+            theFrame->SetStatusText(wxT("Register format error"));
             return;
         }
-        wxStrcpy(user, config->Read("Username", ""));
-        wxStrcpy(pass, config->Read("Password", ""));
-        wxStrcpy(host, config->Read("Host", ""));
+        wxStrcpy((wchar_t *)user, config->Read(wxT("Username"), wxT("")));
+        wxStrcpy((wchar_t *)pass, config->Read(wxT("Password"), wxT("")));
+        wxStrcpy((wchar_t *)host, config->Read(wxT("Host"), wxT("")));
     }
     iaxc_register(user, pass, host);
 
@@ -490,7 +490,7 @@ void IAXFrame::RegisterByName(wxString R
         // need to find some way to update status -- is there any
         // server data in the "reg accepted" message??
 
-        registrations->SetItem(index, 1, "----");
+        registrations->SetItem(index, 1, wxT("----"));
 
         registrations->Refresh();
         registrations->Show();
@@ -512,7 +512,7 @@ void IAXFrame::OnPTTChange(wxCommandEven
             iaxc_set_silence_threshold(-99);
         }
         iaxc_set_audio_output(0);  // unmute output
-        muteState->SetLabel("PTT Disabled");
+        muteState->SetLabel(wxT("PTT Disabled"));
     }
 }
 
@@ -532,25 +532,25 @@ void IAXFrame::OnSilenceChange(wxCommand
 
 void IAXFrame::OnAudioDialog(wxCommandEvent& WXUNUSED(event))
 {
-    AudioDialog dialog(this, "Audio Properties", wxDefaultPosition, wxSize(520,220));
+    AudioDialog dialog(this, wxT("Audio Properties"), wxDefaultPosition, wxSize(520,220));
     dialog.ShowModal();
 }
 
 void IAXFrame::OnServerDialog(wxCommandEvent& WXUNUSED(event))
 {
-    ServerDialog dialog(this, "Server Dialog", wxDefaultPosition, wxSize(500,260));
+    ServerDialog dialog(this, wxT("Server Dialog"), wxDefaultPosition, wxSize(500,260));
     dialog.ShowModal();
 }
 
 void IAXFrame::OnDialDialog(wxCommandEvent& WXUNUSED(event))
 {
-    DialDialog dialog(this, "Dial Dialog", wxDefaultPosition, wxSize(500,240));
+    DialDialog dialog(this, wxT("Dial Dialog"), wxDefaultPosition, wxSize(500,240));
     dialog.ShowModal();
 }
 
 int IAXFrame::HandleStatusEvent(char *msg)
 {
-    theFrame->SetStatusText(msg);
+    theFrame->SetStatusText(wxString::FromAscii(msg));
     return 1;
 }
 
@@ -616,7 +616,7 @@ void IAXFrame::HandleEvent(wxCommandEven
 
 void IAXFrame::DialBySpeedDialName(wxString name)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString ServerName;
     wxString Extension;
@@ -625,20 +625,20 @@ void IAXFrame::DialBySpeedDialName(wxStr
     if(name.IsEmpty())
         return;
 
-    KeyPath = "/Speed Dials/" + name;
+    KeyPath = wxT("/Speed Dials/") + name;
 
     if(config->Exists(KeyPath)) {
         config->SetPath(KeyPath);
 
-        ServerName = config->Read("Server",    "");
-        Extension =  config->Read("Extension", "");
+        ServerName = config->Read(wxT("Server"),    wxT(""));
+        Extension =  config->Read(wxT("Extension"), wxT(""));
 
-        KeyPath = "/Servers/" + ServerName;
+        KeyPath = wxT("/Servers/") + ServerName;
         config->SetPath(KeyPath);
 
-        Destination  = config->Read("Username", "") + ":" +
-                       config->Read("Password", "") + "@" +
-                       config->Read("Host", "")     + "/" + 
+        Destination  = config->Read(wxT("Username"), wxT("")) + wxT(":") +
+                       config->Read(wxT("Password"), wxT("")) + wxT("@") +
+                       config->Read(wxT("Host"), wxT(""))     + wxT("/") + 
                        Extension;
     } else {
         Destination = name;
@@ -716,7 +716,7 @@ bool IAXClient::OnCmdLineParsed(wxCmdLin
 
 bool IAXClient::OnInit() 
 { 
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
 
     wxString str;
     wxString reginfo;
@@ -726,19 +726,19 @@ bool IAXClient::OnInit() 
     if(!wxApp::OnInit())
         return false;
 
-    optNoDialPad = (config->Read("/DialPad",  1l) == 0);
-    optNumCalls  =  config->Read("/NumCalls", 4l);
+    optNoDialPad = (config->Read(wxT("/DialPad"),  1l) == 0);
+    optNumCalls  =  config->Read(wxT("/NumCalls"), 4l);
 
-    theFrame = new IAXFrame("IAXPhone", 0,0,150,220);
+    theFrame = new IAXFrame(wxT("IAXPhone"), 0,0,150,220);
 
     theFrame->Show(TRUE); 
     SetTopWindow(theFrame); 
 
-    iaxc_initialize(AUDIO_INTERNAL_PA, wxGetApp().optNumCalls);
+    iaxc_initialize(wxGetApp().optNumCalls);
    
-    theFrame->SetAudioDeviceByName(config->Read("/Input Device", ""),
-                                   config->Read("/Output Device", ""),
-                                   config->Read("/Ring Device", ""));
+    theFrame->SetAudioDeviceByName(config->Read(wxT("/Input Device"), wxT("")),
+                                   config->Read(wxT("/Output Device"), wxT("")),
+                                   config->Read(wxT("/Ring Device"), wxT("")));
 
     //    iaxc_set_encode_format(IAXC_FORMAT_GSM);
     iaxc_set_silence_threshold(-99);
@@ -748,10 +748,10 @@ bool IAXClient::OnInit() 
 
     // Register from wxConfig
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
-        reginfo = str + "/Auto Register";
+        reginfo = str + wxT("/Auto Register");
         if((config->Read(reginfo, 0l) != 0)) {
             theFrame->RegisterByName(str);
         }
@@ -822,7 +822,7 @@ AudioDialog::AudioDialog(wxWindow *paren
 {
     wxBoxSizer        *dialogSizer =  new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer   *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig          *config =       new wxConfig("iaxPhone");
+    wxConfig          *config =       new wxConfig(wxT("iaxPhone"));
     wxString          str;
     struct
     iaxc_audio_device *devices;
@@ -832,47 +832,47 @@ AudioDialog::AudioDialog(wxWindow *paren
     long              caps;
     wxString          devname;
 
-    config->SetPath("/");
+    config->SetPath(wxT("/"));
     
     controlSizer->Add( 20,16);
     controlSizer->Add(280,16);
     controlSizer->Add(110,16);
 
     /* Input Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Input Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Input Device:  ")));
     controlSizer->Add(InDevice = new wxChoice(this, ID_INDEVICE,
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* Save */
-    controlSizer->Add(Save = new wxButton(this, ID_SAVE, "Save"));
+    controlSizer->Add(Save = new wxButton(this, ID_SAVE, wxT("Save")));
 
     /* Output Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Output Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Output Device:  ")));
     controlSizer->Add(OutDevice = new wxChoice(this, ID_OUTDEVICE,
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* OK */
-    controlSizer->Add(new wxButton(this, wxID_OK, "Set"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Set")));
 
     /* Ring Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Ring Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Ring Device:  ")));
     controlSizer->Add(RingDevice = new wxChoice(this, ID_RINGDEVICE,
                                        wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* CANCEL */
-    controlSizer->Add(new wxButton(this, wxID_CANCEL, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_CANCEL, wxT("Done")));
 
     /* Echo Cancel */
     controlSizer->Add( 20,16);
     controlSizer->Add(EchoCancel = new wxCheckBox(this, ID_ECHOCANCEL, 
-                                       " Echo Cancel"));
-    EchoCancel->SetValue(config->Read("Echo Cancel", 0l) != 0);
+                                       wxT(" Echo Cancel")));
+    EchoCancel->SetValue(config->Read(wxT("Echo Cancel"), 0l) != 0);
 
     iaxc_audio_devices_get(&devices, &nDevs, &input, &output, &ring);
 
     for(i=0; i<nDevs; i++) {
         caps =    devices->capabilities;
-        devname = devices->name;
+        devname = wxString::FromAscii(devices->name);
 
         if(caps & IAXC_AD_INPUT)
             InDevice->Append(devname);
@@ -904,17 +904,17 @@ AudioDialog::AudioDialog(wxWindow *paren
 
 void AudioDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
 
-    config->SetPath("/");
+    config->SetPath(wxT("/"));
 
     switch(event.GetId())
     {
       case ID_SAVE:
-           config->Write("Input Device",  InDevice->GetStringSelection());
-           config->Write("Output Device", OutDevice->GetStringSelection());
-           config->Write("Ring Device",   RingDevice->GetStringSelection());
-           config->Write("Echo Cancel",   EchoCancel->GetValue());
+           config->Write(wxT("Input Device"),  InDevice->GetStringSelection());
+           config->Write(wxT("Output Device"), OutDevice->GetStringSelection());
+           config->Write(wxT("Ring Device"),   RingDevice->GetStringSelection());
+           config->Write(wxT("Echo Cancel"),   EchoCancel->GetValue());
            delete config;
            break;
 
@@ -942,17 +942,17 @@ void IAXFrame::SetAudioDeviceByName(wxSt
 
     for(i=0; i<nDevs; i++) {
         if(devices->capabilities & IAXC_AD_INPUT) {
-            if(inname.Cmp(devices->name) == 0)
+            if(inname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 input = devices->devID;
         }
 
         if(devices->capabilities & IAXC_AD_OUTPUT) {
-            if(outname.Cmp(devices->name) == 0)
+            if(outname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 output = devices->devID;
         }
 
         if(devices->capabilities & IAXC_AD_RING) {
-            if(ringname.Cmp(devices->name) == 0)
+            if(ringname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 ring = devices->devID;
         }
         devices++;
@@ -972,7 +972,7 @@ ServerDialog::ServerDialog(wxWindow *par
 {
     wxBoxSizer      *dialogSizer  = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig        *config =       new wxConfig("iaxPhone");
+    wxConfig        *config =       new wxConfig(wxT("iaxPhone"));
 
     wxString        str;
     long            dummy;
@@ -983,11 +983,11 @@ ServerDialog::ServerDialog(wxWindow *par
     controlSizer->Add(110,16);
 
     /* Servers */
-    controlSizer->Add(new wxStaticText(this, -1, "   Server:  "));
-    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Server:  ")));
+    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, wxT(""), 
                                    wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
         Server->Append(str);
@@ -995,35 +995,35 @@ ServerDialog::ServerDialog(wxWindow *par
     }
 
     /* Add */
-    controlSizer->Add(Add = new wxButton(this, ID_ADD, "Add"));
+    controlSizer->Add(Add = new wxButton(this, ID_ADD, wxT("Add")));
 
     /* AutoRegister */
     controlSizer->Add( 20,16);
-    controlSizer->Add(AutoRegister = new wxCheckBox(this, ID_AUTOREGISTER, " Auto Register"));
+    controlSizer->Add(AutoRegister = new wxCheckBox(this, ID_AUTOREGISTER, wxT(" Auto Register")));
 
     /* Remove */
-    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, "Remove"));
+    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, wxT("Remove")));
 
     /* Host */
-    controlSizer->Add(new wxStaticText(this, -1, "   Host:  "));
-    controlSizer->Add(Host = new wxTextCtrl(this, ID_HOST, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Host:  ")));
+    controlSizer->Add(Host = new wxTextCtrl(this, ID_HOST, wxT(""), 
                                  wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     controlSizer->Add(110,1);
 
     /* Username */
-    controlSizer->Add(new wxStaticText(this, -1, "   Username:  "));
-    controlSizer->Add(Username = new wxTextCtrl(this, ID_USERNAME, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Username:  ")));
+    controlSizer->Add(Username = new wxTextCtrl(this, ID_USERNAME, wxT(""), 
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     /* Register */
-    controlSizer->Add(new wxButton(this, wxID_OK, "Register"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Register")));
 
     /* Password */
-    controlSizer->Add(new wxStaticText(this, -1, "   Password:  "));
-    controlSizer->Add(Password = new wxTextCtrl(this, ID_PASSWORD, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Password:  ")));
+    controlSizer->Add(Password = new wxTextCtrl(this, ID_PASSWORD, wxT(""), 
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* Done */
-    controlSizer->Add(new wxButton(this, wxID_CANCEL, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_CANCEL, wxT("Done")));
 
     dialogSizer->Add(controlSizer);
 
@@ -1034,22 +1034,22 @@ ServerDialog::ServerDialog(wxWindow *par
 
 void ServerDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString ServerVal;
 
     ServerVal = Server->GetValue();
 
-    KeyPath = "/Servers/" + ServerVal;
+    KeyPath = wxT("/Servers/") + ServerVal;
     config->SetPath(KeyPath);
 
     switch(event.GetId())
     {
       case ID_ADD:
-           config->Write("Auto Register", AutoRegister->GetValue());
-           config->Write("Host",          Host->GetValue());
-           config->Write("Username",      Username->GetValue());
-           config->Write("Password",      Password->GetValue());
+           config->Write(wxT("Auto Register"), AutoRegister->GetValue());
+           config->Write(wxT("Host"),          Host->GetValue());
+           config->Write(wxT("Username"),      Username->GetValue());
+           config->Write(wxT("Password"),      Password->GetValue());
 
            if(Server->FindString(ServerVal) < 0) {
              Server->Append(ServerVal);
@@ -1075,18 +1075,18 @@ void ServerDialog::OnButton(wxCommandEve
 
 void ServerDialog::OnComboBox(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString val;
     wxString KeyPath;
 
     // Update the Host/Username/Password boxes
-    KeyPath = "/Servers/" + Server->GetStringSelection();
+    KeyPath = wxT("/Servers/") + Server->GetStringSelection();
     config->SetPath(KeyPath);
 
-    Host->SetValue(config->Read("Host", ""));
-    Username->SetValue(config->Read("Username", ""));
-    Password->SetValue(config->Read("Password", ""));
-    AutoRegister->SetValue(config->Read("Auto Register", 0l) != 0);
+    Host->SetValue(config->Read(wxT("Host"), wxT("")));
+    Username->SetValue(config->Read(wxT("Username"), wxT("")));
+    Password->SetValue(config->Read(wxT("Password"), wxT("")));
+    AutoRegister->SetValue(config->Read(wxT("Auto Register"), 0l) != 0);
 }
 
 BEGIN_EVENT_TABLE(ServerDialog, wxDialog)
@@ -1104,7 +1104,7 @@ DialDialog::DialDialog(wxWindow *parent,
 
     wxBoxSizer      *dialogSizer  = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig        *config =       new wxConfig("iaxPhone");
+    wxConfig        *config =       new wxConfig(wxT("iaxPhone"));
 
     wxString        str;
     long            dummy;
@@ -1115,11 +1115,11 @@ DialDialog::DialDialog(wxWindow *parent,
     controlSizer->Add( 96,16);
 
     /* Speed Dial */
-    controlSizer->Add(new wxStaticText(this, -1, "   Speed Dial:  "));
-    controlSizer->Add(SpeedDial = new wxComboBox(this, ID_SPEEDDIAL, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Speed Dial:  ")));
+    controlSizer->Add(SpeedDial = new wxComboBox(this, ID_SPEEDDIAL, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Speed Dials");
+    config->SetPath(wxT("/Speed Dials"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       SpeedDial->Append(str);
@@ -1127,14 +1127,14 @@ DialDialog::DialDialog(wxWindow *parent,
     }
 
     /* Add */
-    controlSizer->Add(Save = new wxButton(this, ID_ADD, "Add"));
+    controlSizer->Add(Save = new wxButton(this, ID_ADD, wxT("Add")));
 
     /* Server */
-    controlSizer->Add(new wxStaticText(this, -1, "   Server:  "));
-    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Server:  ")));
+    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, wxT(""), 
                                    wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       Server->Append(str);
@@ -1142,19 +1142,19 @@ DialDialog::DialDialog(wxWindow *parent,
     }
 
     /* Remove */
-    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, "Remove"));
+    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, wxT("Remove")));
 
     /* Extention */
-    controlSizer->Add(new wxStaticText(this, -1, "   Extension:  "));
-    controlSizer->Add(Extension = new wxTextCtrl(this, ID_EXTENSION, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Extension:  ")));
+    controlSizer->Add(Extension = new wxTextCtrl(this, ID_EXTENSION, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     /* Dial */
-    controlSizer->Add(new wxButton(this, ID_DIAL, "Dial"));
+    controlSizer->Add(new wxButton(this, ID_DIAL, wxT("Dial")));
 
     /* Done */
     controlSizer->Add( 20,16);
     controlSizer->Add(280,16);
-    controlSizer->Add(new wxButton(this, wxID_OK, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Done")));
 
     dialogSizer->Add(controlSizer);
 
@@ -1165,34 +1165,34 @@ DialDialog::DialDialog(wxWindow *parent,
 
 void DialDialog::OnComboBox(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString val;
     wxString KeyPath;
 
     // Update the Server/Extension boxes
-    KeyPath = "/Speed Dials/" + SpeedDial->GetStringSelection();
+    KeyPath = wxT("/Speed Dials/") + SpeedDial->GetStringSelection();
     config->SetPath(KeyPath);
 
-    Server->SetValue(config->Read("Server", ""));
-    Extension->SetValue(config->Read("Extension", ""));
+    Server->SetValue(config->Read(wxT("Server"), wxT("")));
+    Extension->SetValue(config->Read(wxT("Extension"), wxT("")));
 }
 
 void DialDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString SpeedDialVal;
 
     SpeedDialVal = SpeedDial->GetValue();
 
-    KeyPath = "/Speed Dials/" + SpeedDialVal;
+    KeyPath = wxT("/Speed Dials/") + SpeedDialVal;
     config->SetPath(KeyPath);
 
     switch(event.GetId())
     {
       case ID_ADD:
-           config->Write("Server",    Server->GetValue());
-           config->Write("Extension", Extension->GetValue());
+           config->Write(wxT("Server"),    Server->GetValue());
+           config->Write(wxT("Extension"), Extension->GetValue());
 
            if(SpeedDial->FindString(SpeedDialVal) < 0) {
              SpeedDial->Append(SpeedDialVal);
@@ -1203,7 +1203,7 @@ void DialDialog::OnButton(wxCommandEvent
            config->DeleteGroup(KeyPath);
            // Remove it from the combobox, as well
            SpeedDial->Delete(SpeedDial->FindString(SpeedDialVal));
-           Server->SetValue("");
+           Server->SetValue(wxT(""));
            Extension->Clear();
            break;
 
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h.BAD iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h.BAD	2008-06-10 12:03:28.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h	2008-06-10 12:53:42.000000000 -0400
@@ -220,10 +220,10 @@ class IAXFrame : public wxFrame
 
             ~IAXFrame();
 
-            void OnDTMF(wxEvent &evt);
-            void OnDial(wxEvent &evt);
-            void OnHangup(wxEvent &evt);
-            void OnQuit(wxEvent &evt);
+            void OnDTMF(wxCommandEvent &evt);
+            void OnDial(wxCommandEvent &evt);
+            void OnHangup(wxCommandEvent &evt);
+            void OnQuit(wxCommandEvent &evt);
             void OnPTTChange(wxCommandEvent &evt);
             void OnSilenceChange(wxCommandEvent &evt);
             void OnNotify(void);
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.BAD iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc
--- iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.BAD	2008-06-10 13:05:01.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc	2008-06-10 13:05:07.000000000 -0400
@@ -425,7 +425,7 @@ void MyFrame::ShowDirectoryControls()
     config->SetPath(_T("/OT"));
     bCont = config->GetFirstGroup(OTName, dummy);
     while ( bCont ) {
-#if defined(__UNICODE__)
+#if defined(wxUSE_UNICODE)
         ot = ((wxButton *)((*aPanel).FindWindow(wxXmlResource::GetXRCID(OTName))));
 #else
         ot = XRCCTRL(*aPanel, OTName, wxButton);


--- NEW FILE iaxclient.spec ---
%define betaver beta3
%define tclver 0.2
%define mainver 2.1
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%ifarch sparcv9
%define tkphonearch sparc
%else
%define tkphonearch %{_arch}
%endif

Name:		iaxclient
Version:	%{mainver}
Release:	0.3.%{betaver}%{?dist}
Summary:	Library for creating telephony solutions that interoperate with Asterisk
Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://iaxclient.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/iaxclient/%{name}-%{version}%{betaver}.tar.gz
Source1:	tkiaxphone.desktop
Source2:	wxiax.desktop
Source3:	phone.png
Source4:	run-tkiaxphone.sh
Patch0:		iaxclient-2.1beta3-wxGTK28.patch
Patch1:		iaxclient-2.1beta3-tkphone-cleanups.patch
Patch2:		iaxclient-2.1beta3-tcl-includedir.patch
Patch3:		iaxclient-2.1beta3-tcl-libdir.patch
Patch4:		iaxclient-2.1beta3-tcl-nodoc.patch
Patch5:		iaxclient-2.1beta3-theora-detection.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	speex-devel, libtheora-devel, gsm-devel, portaudio-devel, iax-devel
BuildRequires:	tk-devel, gtk2-devel, SDL-devel, libogg-devel, liboggz-devel 
BuildRequires:	wxGTK-devel, libvidcap-devel, desktop-file-utils

%description
Iaxclient is an open source, multiplatform library for creating telephony 
solutions that interoperate with Asterisk, the Open Source PBX.

Although asterisk supports other VOIP protocols (including SIP, and with 
patches, H.323), IAX's simple, lightweight nature gives it several advantages, 
particularly in that it can operate easily through NAT and packet firewalls, 
and it is easily extensible and simple to understand.
Iaxclient pulls together the wide array of open source technologies required 
for telephony applications.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	pkgconfig
Requires:	%{name} = %{mainver}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package -n tcl-iaxclient
Summary:	Tcl interface to iax2 client lib
Version:	%{tclver}
Group:		System Environment/Libraries
License:	BSD
Requires:	tcl(abi) = 8.5
Requires:	%{name} = %{mainver}-%{release}

%description -n tcl-iaxclient
Tcl extensions to iaxclient libraries.

%package -n tkiaxphone
Summary:	Tk IAX Phone Client
Version:	%{mainver}
Group:		Applications/Internet
License:	LGPLv2+
Requires:	tcl(abi) = 8.5
Requires:	%{name} = %{mainver}-%{release}

%description -n tkiaxphone
Tk IAX Phone Client.

%package -n wxiax
Summary:	wx IAX Phone Client
Version:	%{mainver}
Group:		Applications/Internet
License:	LGPLv2+
Requires:	%{name} = %{mainver}-%{release}

%description -n wxiax
wx IAX Phone Client.

%prep
%setup -q -n %{name}-%{mainver}%{betaver}
%patch0 -p1 -b .wxGTK28
%patch1 -p1 -b .tkphone
%patch2 -p1 -b .includedir
%patch3 -p1 -b .libdir
%patch4 -p1 -b .nodoc
%patch5 -p1 -b .theoradetect
chmod -x contrib/tcl/README.txt

sed -i 's|/usr/lib|%{_libdir}|g' lib/libiax2/iax-config.in

%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
cd contrib/tcl/
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/iaxclient %{buildroot}%{tcl_sitearch}/
cd contrib/tcl
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_libdir}/tcliaxclient0.2 %{buildroot}%{tcl_sitearch}/tcliaxclient0.2
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/phone.ui.tcl
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/pref.ui.tcl
install -p %{SOURCE4} %{buildroot}%{_bindir}

mkdir %{buildroot}%{_datadir}/pixmaps/
install -p %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/tkiaxphone.png
install -p %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/wxiax.png

mkdir %{buildroot}%{_datadir}/applications/

desktop-file-install --vendor ""			\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE1}

desktop-file-install --vendor ""			\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE2}	

cd %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/
ln -s iaxcli iaxcli-Linux-%{tkphonearch}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB ChangeLog README
%{_bindir}/iaxcomm
%{_bindir}/iaxphone
%{_datadir}/iaxcomm/
%{_libdir}/libiaxclient.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/stresstest
%{_bindir}/testcall
%{_bindir}/vtestcall
%{_includedir}/iaxclient.h
%{_libdir}/libiaxclient.so
%{_libdir}/pkgconfig/iaxclient.pc

%files -n tcl-iaxclient
%defattr(-,root,root,-)
%doc contrib/tcl/README.txt
%{tcl_sitearch}/tcliaxclient0.2/

%files -n tkiaxphone
%defattr(-,root,root,-)
%{_bindir}/run-tkiaxphone.sh
%{_bindir}/tkiaxphone
%{tcl_sitearch}/iaxclient/
%{_datadir}/applications/tkiaxphone.desktop
%{_datadir}/pixmaps/tkiaxphone.png

%files -n wxiax
%defattr(-,root,root,-)
%{_bindir}/wxiax
%{_datadir}/applications/wxiax.desktop
%{_datadir}/pixmaps/wxiax.png

%changelog
* Thu Mar 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.3.beta3
- fix lib/libiax2/iax-config.in to not use wrong /usr/lib

* Mon Nov  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.2.beta3
- fix theora detection

* Tue Jun 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.1.beta3
- Initial package for Fedora



--- NEW FILE import.log ---
iaxclient-2_1-0_3_beta3_fc11:HEAD:iaxclient-2.1-0.3.beta3.fc11.src.rpm:1239052352


--- NEW FILE run-tkiaxphone.sh ---
#!/bin/bash
export IAXPHONEHOME=/usr/lib64/tcl8.5/iaxclient/tkphone 
exec /usr/bin/tkiaxphone


--- NEW FILE tkiaxphone.desktop ---

[Desktop Entry]
Encoding=UTF-8
Name=Tkphone
GenericName=Tk IAX Phone Client
Exec=/usr/bin/run-tkiaxphone.sh
Icon=tkiaxphone
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;Telephony;


--- NEW FILE wxiax.desktop ---

[Desktop Entry]
Encoding=UTF-8
Name=wxiax
GenericName=wx IAX Phone Client
Exec=/usr/bin/wxiax
Icon=wxiax
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;Telephony;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iaxclient/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Apr 2009 21:07:03 -0000	1.1
+++ .cvsignore	6 Apr 2009 21:15:05 -0000	1.2
@@ -0,0 +1 @@
+iaxclient-2.1beta3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iaxclient/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Apr 2009 21:07:03 -0000	1.1
+++ sources	6 Apr 2009 21:15:05 -0000	1.2
@@ -0,0 +1 @@
+47d54b9d5d48dc6aa1f6d7e506c72ba7  iaxclient-2.1beta3.tar.gz



From spot at fedoraproject.org  Mon Apr  6 21:17:30 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:17:30 +0000 (UTC)
Subject: rpms/iaxclient/devel iaxclient-2.1beta3-tcl-includedir.patch, NONE, 
	1.1
Message-ID: <20090406211730.13AF070137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9859/devel

Added Files:
	iaxclient-2.1beta3-tcl-includedir.patch 
Log Message:
initial branching

iaxclient-2.1beta3-tcl-includedir.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-includedir.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:11:52.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:12:06.000000000 -0400
@@ -144,7 +144,7 @@ TCLSH	= $(TCLSH_ENV) $(TCLSH_PROG)
 
 SHARED_BUILD	= @SHARED_BUILD@
 
-INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
+INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ -I../../lib
 #INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
 
 PKG_CFLAGS	= @PKG_CFLAGS@



From spot at fedoraproject.org  Mon Apr  6 21:17:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:17:59 +0000 (UTC)
Subject: rpms/iaxclient/F-9 iaxclient-2.1beta3-tcl-includedir.patch, NONE,
	1.1 iaxclient-2.1beta3-tcl-libdir.patch, NONE,
	1.1 iaxclient-2.1beta3-tcl-nodoc.patch, NONE,
	1.1 iaxclient-2.1beta3-theora-detection.patch, NONE,
	1.1 iaxclient-2.1beta3-tkphone-cleanups.patch, NONE,
	1.1 iaxclient-2.1beta3-wxGTK28.patch, NONE, 1.1 iaxclient.spec,
	NONE, 1.1 phone.png, NONE, 1.1 run-tkiaxphone.sh, NONE,
	1.1 tkiaxphone.desktop, NONE, 1.1 wxiax.desktop, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090406211759.CEEE070137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9859/F-9

Modified Files:
	sources 
Added Files:
	iaxclient-2.1beta3-tcl-includedir.patch 
	iaxclient-2.1beta3-tcl-libdir.patch 
	iaxclient-2.1beta3-tcl-nodoc.patch 
	iaxclient-2.1beta3-theora-detection.patch 
	iaxclient-2.1beta3-tkphone-cleanups.patch 
	iaxclient-2.1beta3-wxGTK28.patch iaxclient.spec phone.png 
	run-tkiaxphone.sh tkiaxphone.desktop wxiax.desktop 
Log Message:
initial branching

iaxclient-2.1beta3-tcl-includedir.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-includedir.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:11:52.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:12:06.000000000 -0400
@@ -144,7 +144,7 @@ TCLSH	= $(TCLSH_ENV) $(TCLSH_PROG)
 
 SHARED_BUILD	= @SHARED_BUILD@
 
-INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
+INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ -I../../lib
 #INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
 
 PKG_CFLAGS	= @PKG_CFLAGS@

iaxclient-2.1beta3-tcl-libdir.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-libdir.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:24:44.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:25:14.000000000 -0400
@@ -108,7 +108,7 @@ RANLIB		= @RANLIB@
 RANLIB_STUB	= @RANLIB_STUB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS	= -L../../lib/.libs @SHLIB_LD_LIBS@
 STLIB_LD	= @STLIB_LD@
 #TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@

iaxclient-2.1beta3-tcl-nodoc.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-nodoc.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:28:59.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:29:06.000000000 -0400
@@ -203,7 +203,7 @@ doc:
 	@echo "        xml2nroff sample.xml > sample.n"
 	@echo "        xml2html sample.xml > sample.html"
 
-install: all install-binaries install-libraries install-doc
+install: all install-binaries install-libraries
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 

iaxclient-2.1beta3-theora-detection.patch:

--- NEW FILE iaxclient-2.1beta3-theora-detection.patch ---
diff -up iaxclient-2.1beta3/configure.ac.BAD iaxclient-2.1beta3/configure.ac
--- iaxclient-2.1beta3/configure.ac.BAD	2008-11-03 09:22:20.000000000 -0500
+++ iaxclient-2.1beta3/configure.ac	2008-11-03 09:22:28.000000000 -0500
@@ -193,7 +193,7 @@ PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.
 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
 PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no)
 PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
-PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no)
+PKG_CHECK_MODULES(THEORA, [theora >= 1.0], has_theora=yes, has_theora=no)
 PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no)
 PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no)
 
diff -up iaxclient-2.1beta3/configure.BAD iaxclient-2.1beta3/configure
--- iaxclient-2.1beta3/configure.BAD	2008-11-03 09:20:58.000000000 -0500
+++ iaxclient-2.1beta3/configure	2008-11-03 09:21:31.000000000 -0500
@@ -23115,12 +23115,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0alpha7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "theora >= 1.0alpha7") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "theora >= 1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "theora >= 1.0alpha7" 2>/dev/null`
+  pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "theora >= 1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23133,12 +23133,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_THEORA_LIBS="$THEORA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0alpha7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "theora >= 1.0alpha7") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "theora >= 1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "theora >= 1.0alpha7" 2>/dev/null`
+  pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "theora >= 1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23157,9 +23157,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora >= 1.0alpha7"`
+	        THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora >= 1.0"`
         else
-	        THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora >= 1.0alpha7"`
+	        THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora >= 1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$THEORA_PKG_ERRORS" >&5

iaxclient-2.1beta3-tkphone-cleanups.patch:

--- NEW FILE iaxclient-2.1beta3-tkphone-cleanups.patch ---
diff -up iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c.BAD iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c
--- iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c.BAD	2008-06-10 13:11:28.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c	2008-06-10 13:11:34.000000000 -0400
@@ -413,7 +413,7 @@ int main(int argc, char **argv) {
 #endif
 
     atexit(iaxc_shutdown); /* activate the exit handler */
-    if (iaxc_initialize(AUDIO_INTERNAL_PA,1)) {
+    if (iaxc_initialize(1)) {
 	fatal_error("cannot initialize iaxclient!");
     }
 
diff -up iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am.BAD iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am
--- iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am.BAD	2008-06-10 13:13:44.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am	2008-06-10 13:13:49.000000000 -0400
@@ -1,5 +1,5 @@
 # Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
-bin_SCRIPTS = tkphone
+bin_SCRIPTS = tkiaxphone
 
 iaxcli_PROGRAMS=iaxcli
 iaxcli_SOURCES = iaxcli.c tones.c tones.h
diff -up iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in.BAD iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in
--- iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in.BAD	2008-06-10 13:13:29.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in	2008-06-10 13:13:33.000000000 -0400
@@ -251,7 +251,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
-bin_SCRIPTS = tkphone
+bin_SCRIPTS = tkiaxphone
 iaxcli_SOURCES = iaxcli.c tones.c tones.h
 iaxclidir = ${libdir}/iaxclient/tkphone
 iaxcli_SCRIPTS = tkiaxphone
diff -up iaxclient-2.1beta3/simpleclient/tkphone/tones.c.BAD iaxclient-2.1beta3/simpleclient/tkphone/tones.c
--- iaxclient-2.1beta3/simpleclient/tkphone/tones.c.BAD	2008-06-10 13:12:03.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/tones.c	2008-06-10 13:12:09.000000000 -0400
@@ -32,7 +32,7 @@
 #ifdef TONES_MAIN
 #  include <stdio.h>
 #endif
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <math.h>
 #include "tones.h"

iaxclient-2.1beta3-wxGTK28.patch:

--- NEW FILE iaxclient-2.1beta3-wxGTK28.patch ---
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.BAD iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.BAD	2008-06-10 11:08:12.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc	2008-06-10 12:54:23.000000000 -0400
@@ -81,7 +81,7 @@ IAXCalls::IAXCalls(wxWindow *parent, int
 
     Hide();
     for(i=0;i<nCalls;i++) {
-        InsertItem(i,wxString::Format("%ld", i+1), 0);
+        InsertItem(i,wxString::Format(wxT("%ld"), i+1), 0);
         SetItem(i, 2, _T("No call"));
         item.m_itemId=i;
         item.m_mask = 0;
@@ -159,7 +159,7 @@ int IAXCalls::HandleStateEvent(struct ia
         stateItem.SetBackgroundColour(*wxWHITE);
     } else {
         // set remote 
-        SetItem(c.callNo, 2, c.remote );
+        SetItem(c.callNo, 2, wxString::FromAscii(c.remote) );
 
         bool outgoing = c.state & IAXC_CALL_STATE_OUTGOING;
         bool ringing = c.state & IAXC_CALL_STATE_RINGING;
@@ -226,7 +226,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
                  : wxFrame((wxFrame *) NULL, -1, title, wxPoint(xpos, ypos),
                    wxSize(width, height))
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString str;
     long     dummy;
     bool     bCont;
@@ -262,9 +262,9 @@ IAXFrame::IAXFrame(const wxChar *title, 
     wxMenu *optionsMenu = new wxMenu();
     optionsMenu->AppendCheckItem(ID_PTT, _T("Enable &Push to Talk\tCtrl-P"));
     optionsMenu->AppendCheckItem(ID_SILENCE, _T("Enable &Silence Suppression\tCtrl-S"));
-    optionsMenu->Append(ID_AUDIO,  "&Audio ...", "Show audio settings dialog");
-    optionsMenu->Append(ID_SERVER, "&Servers ...", "Manage servers list");
-    optionsMenu->Append(ID_SPEED,  "&Speed Dials ...", "Manage Speed Dials");
+    optionsMenu->Append(ID_AUDIO,  wxT("&Audio ..."), wxT("Show audio settings dialog"));
+    optionsMenu->Append(ID_SERVER, wxT("&Servers ..."), wxT("Manage servers list"));
+    optionsMenu->Append(ID_SPEED,  wxT("&Speed Dials ..."), wxT("Manage Speed Dials"));
    
     wxMenuBar *menuBar = new wxMenuBar();
 
@@ -293,7 +293,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
         wxGridSizer *dialpadsizer = new wxGridSizer(3);
         for(int i=0; i<12;i++)
         {
-            dialpadsizer->Add(new wxButton(aPanel, i, wxString(buttonlabels[i]),
+            dialpadsizer->Add(new wxButton(aPanel, i, wxString::FromAscii(buttonlabels[i]),
                                            wxDefaultPosition, wxDefaultSize,
                                            wxBU_EXACTFIT), 1, wxEXPAND|wxALL, 3);
         }
@@ -327,10 +327,10 @@ IAXFrame::IAXFrame(const wxChar *title, 
     }
 
     /* Speed Dial */
-    topsizer->Add(SpeedDial = new wxComboBox(aPanel, ID_SPEEDDIAL, "", 
+    topsizer->Add(SpeedDial = new wxComboBox(aPanel, ID_SPEEDDIAL, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Speed Dials");
+    config->SetPath(wxT("/Speed Dials"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       SpeedDial->Append(str);
@@ -356,7 +356,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
 
     topsizer->Add(row3sizer,0,wxEXPAND);
 
-    topsizer->Add(muteState = new wxStaticText(aPanel,-1,"PTT Disabled",
+    topsizer->Add(muteState = new wxStaticText(aPanel,-1,wxT("PTT Disabled"),
                                                wxDefaultPosition, wxDefaultSize),
                                                0,wxEXPAND);
 
@@ -411,7 +411,7 @@ void IAXFrame::SetPTT(bool state)
         iaxc_set_audio_output(0);  // unmute output
     }
 
-    muteState->SetLabel( pttState ? "Talk" : "Mute");
+    muteState->SetLabel( pttState ? wxT("Talk") : wxT("Mute"));
 }
 
 void IAXFrame::CheckPTT()
@@ -422,28 +422,28 @@ void IAXFrame::CheckPTT()
     SetPTT(newState);
 }
 
-void IAXFrame::OnDTMF(wxEvent &evt)
+void IAXFrame::OnDTMF(wxCommandEvent &evt)
 {
     iaxc_send_dtmf(*buttonlabels[evt.m_id]);
 }
 
-void IAXFrame::OnDial(wxEvent &evt)
+void IAXFrame::OnDial(wxCommandEvent &evt)
 {
     theFrame->DialBySpeedDialName(SpeedDial->GetValue());
 }
 
-void IAXFrame::OnHangup(wxEvent &evt)
+void IAXFrame::OnHangup(wxCommandEvent &evt)
 {
     iaxc_dump_call();
 }
 
-void IAXFrame::OnQuit(wxEvent &evt)
+void IAXFrame::OnQuit(wxCommandEvent &evt)
 {
     Close(TRUE);
 }
 
 void IAXFrame::RegisterByName(wxString RegName) {
-    wxConfig    *config = new wxConfig("iaxPhone");
+    wxConfig    *config = new wxConfig(wxT("iaxPhone"));
     wxChar      KeyPath[256];
     wxListItem  item;
     long        index;
@@ -451,26 +451,26 @@ void IAXFrame::RegisterByName(wxString R
     wxStringTokenizer tok(RegName, _T(":@"));
     char user[256], pass[256], host[256];
 
-    if(strlen(RegName) == 0)
+    if(wxStrlen(RegName) == 0)
         return;
 
     if(tok.CountTokens() == 3) {
 
-        strncpy( user , tok.GetNextToken().c_str(), 256);
-        strncpy( pass , tok.GetNextToken().c_str(), 256);
-        strncpy( host , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)user , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)pass , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)host , tok.GetNextToken().c_str(), 256);
     } else {
         // Check if it's a Speed Dial
-        wxStrcpy(KeyPath,     "/Servers/");
+        wxStrcpy(KeyPath,     wxT("/Servers/"));
         wxStrcat(KeyPath,     RegName);
         config->SetPath(KeyPath);
         if(!config->Exists(KeyPath)) {
-            theFrame->SetStatusText("Register format error");
+            theFrame->SetStatusText(wxT("Register format error"));
             return;
         }
-        wxStrcpy(user, config->Read("Username", ""));
-        wxStrcpy(pass, config->Read("Password", ""));
-        wxStrcpy(host, config->Read("Host", ""));
+        wxStrcpy((wchar_t *)user, config->Read(wxT("Username"), wxT("")));
+        wxStrcpy((wchar_t *)pass, config->Read(wxT("Password"), wxT("")));
+        wxStrcpy((wchar_t *)host, config->Read(wxT("Host"), wxT("")));
     }
     iaxc_register(user, pass, host);
 
@@ -490,7 +490,7 @@ void IAXFrame::RegisterByName(wxString R
         // need to find some way to update status -- is there any
         // server data in the "reg accepted" message??
 
-        registrations->SetItem(index, 1, "----");
+        registrations->SetItem(index, 1, wxT("----"));
 
         registrations->Refresh();
         registrations->Show();
@@ -512,7 +512,7 @@ void IAXFrame::OnPTTChange(wxCommandEven
             iaxc_set_silence_threshold(-99);
         }
         iaxc_set_audio_output(0);  // unmute output
-        muteState->SetLabel("PTT Disabled");
+        muteState->SetLabel(wxT("PTT Disabled"));
     }
 }
 
@@ -532,25 +532,25 @@ void IAXFrame::OnSilenceChange(wxCommand
 
 void IAXFrame::OnAudioDialog(wxCommandEvent& WXUNUSED(event))
 {
-    AudioDialog dialog(this, "Audio Properties", wxDefaultPosition, wxSize(520,220));
+    AudioDialog dialog(this, wxT("Audio Properties"), wxDefaultPosition, wxSize(520,220));
     dialog.ShowModal();
 }
 
 void IAXFrame::OnServerDialog(wxCommandEvent& WXUNUSED(event))
 {
-    ServerDialog dialog(this, "Server Dialog", wxDefaultPosition, wxSize(500,260));
+    ServerDialog dialog(this, wxT("Server Dialog"), wxDefaultPosition, wxSize(500,260));
     dialog.ShowModal();
 }
 
 void IAXFrame::OnDialDialog(wxCommandEvent& WXUNUSED(event))
 {
-    DialDialog dialog(this, "Dial Dialog", wxDefaultPosition, wxSize(500,240));
+    DialDialog dialog(this, wxT("Dial Dialog"), wxDefaultPosition, wxSize(500,240));
     dialog.ShowModal();
 }
 
 int IAXFrame::HandleStatusEvent(char *msg)
 {
-    theFrame->SetStatusText(msg);
+    theFrame->SetStatusText(wxString::FromAscii(msg));
     return 1;
 }
 
@@ -616,7 +616,7 @@ void IAXFrame::HandleEvent(wxCommandEven
 
 void IAXFrame::DialBySpeedDialName(wxString name)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString ServerName;
     wxString Extension;
@@ -625,20 +625,20 @@ void IAXFrame::DialBySpeedDialName(wxStr
     if(name.IsEmpty())
         return;
 
-    KeyPath = "/Speed Dials/" + name;
+    KeyPath = wxT("/Speed Dials/") + name;
 
     if(config->Exists(KeyPath)) {
         config->SetPath(KeyPath);
 
-        ServerName = config->Read("Server",    "");
-        Extension =  config->Read("Extension", "");
+        ServerName = config->Read(wxT("Server"),    wxT(""));
+        Extension =  config->Read(wxT("Extension"), wxT(""));
 
-        KeyPath = "/Servers/" + ServerName;
+        KeyPath = wxT("/Servers/") + ServerName;
         config->SetPath(KeyPath);
 
-        Destination  = config->Read("Username", "") + ":" +
-                       config->Read("Password", "") + "@" +
-                       config->Read("Host", "")     + "/" + 
+        Destination  = config->Read(wxT("Username"), wxT("")) + wxT(":") +
+                       config->Read(wxT("Password"), wxT("")) + wxT("@") +
+                       config->Read(wxT("Host"), wxT(""))     + wxT("/") + 
                        Extension;
     } else {
         Destination = name;
@@ -716,7 +716,7 @@ bool IAXClient::OnCmdLineParsed(wxCmdLin
 
 bool IAXClient::OnInit() 
 { 
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
 
     wxString str;
     wxString reginfo;
@@ -726,19 +726,19 @@ bool IAXClient::OnInit() 
     if(!wxApp::OnInit())
         return false;
 
-    optNoDialPad = (config->Read("/DialPad",  1l) == 0);
-    optNumCalls  =  config->Read("/NumCalls", 4l);
+    optNoDialPad = (config->Read(wxT("/DialPad"),  1l) == 0);
+    optNumCalls  =  config->Read(wxT("/NumCalls"), 4l);
 
-    theFrame = new IAXFrame("IAXPhone", 0,0,150,220);
+    theFrame = new IAXFrame(wxT("IAXPhone"), 0,0,150,220);
 
     theFrame->Show(TRUE); 
     SetTopWindow(theFrame); 
 
-    iaxc_initialize(AUDIO_INTERNAL_PA, wxGetApp().optNumCalls);
+    iaxc_initialize(wxGetApp().optNumCalls);
    
-    theFrame->SetAudioDeviceByName(config->Read("/Input Device", ""),
-                                   config->Read("/Output Device", ""),
-                                   config->Read("/Ring Device", ""));
+    theFrame->SetAudioDeviceByName(config->Read(wxT("/Input Device"), wxT("")),
+                                   config->Read(wxT("/Output Device"), wxT("")),
+                                   config->Read(wxT("/Ring Device"), wxT("")));
 
     //    iaxc_set_encode_format(IAXC_FORMAT_GSM);
     iaxc_set_silence_threshold(-99);
@@ -748,10 +748,10 @@ bool IAXClient::OnInit() 
 
     // Register from wxConfig
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
-        reginfo = str + "/Auto Register";
+        reginfo = str + wxT("/Auto Register");
         if((config->Read(reginfo, 0l) != 0)) {
             theFrame->RegisterByName(str);
         }
@@ -822,7 +822,7 @@ AudioDialog::AudioDialog(wxWindow *paren
 {
     wxBoxSizer        *dialogSizer =  new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer   *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig          *config =       new wxConfig("iaxPhone");
+    wxConfig          *config =       new wxConfig(wxT("iaxPhone"));
     wxString          str;
     struct
     iaxc_audio_device *devices;
@@ -832,47 +832,47 @@ AudioDialog::AudioDialog(wxWindow *paren
     long              caps;
     wxString          devname;
 
-    config->SetPath("/");
+    config->SetPath(wxT("/"));
     
     controlSizer->Add( 20,16);
     controlSizer->Add(280,16);
     controlSizer->Add(110,16);
 
     /* Input Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Input Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Input Device:  ")));
     controlSizer->Add(InDevice = new wxChoice(this, ID_INDEVICE,
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* Save */
-    controlSizer->Add(Save = new wxButton(this, ID_SAVE, "Save"));
+    controlSizer->Add(Save = new wxButton(this, ID_SAVE, wxT("Save")));
 
     /* Output Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Output Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Output Device:  ")));
     controlSizer->Add(OutDevice = new wxChoice(this, ID_OUTDEVICE,
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* OK */
-    controlSizer->Add(new wxButton(this, wxID_OK, "Set"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Set")));
 
     /* Ring Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Ring Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Ring Device:  ")));
     controlSizer->Add(RingDevice = new wxChoice(this, ID_RINGDEVICE,
                                        wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* CANCEL */
-    controlSizer->Add(new wxButton(this, wxID_CANCEL, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_CANCEL, wxT("Done")));
 
     /* Echo Cancel */
     controlSizer->Add( 20,16);
     controlSizer->Add(EchoCancel = new wxCheckBox(this, ID_ECHOCANCEL, 
-                                       " Echo Cancel"));
-    EchoCancel->SetValue(config->Read("Echo Cancel", 0l) != 0);
+                                       wxT(" Echo Cancel")));
+    EchoCancel->SetValue(config->Read(wxT("Echo Cancel"), 0l) != 0);
 
     iaxc_audio_devices_get(&devices, &nDevs, &input, &output, &ring);
 
     for(i=0; i<nDevs; i++) {
         caps =    devices->capabilities;
-        devname = devices->name;
+        devname = wxString::FromAscii(devices->name);
 
         if(caps & IAXC_AD_INPUT)
             InDevice->Append(devname);
@@ -904,17 +904,17 @@ AudioDialog::AudioDialog(wxWindow *paren
 
 void AudioDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
 
-    config->SetPath("/");
+    config->SetPath(wxT("/"));
 
     switch(event.GetId())
     {
       case ID_SAVE:
-           config->Write("Input Device",  InDevice->GetStringSelection());
-           config->Write("Output Device", OutDevice->GetStringSelection());
-           config->Write("Ring Device",   RingDevice->GetStringSelection());
-           config->Write("Echo Cancel",   EchoCancel->GetValue());
+           config->Write(wxT("Input Device"),  InDevice->GetStringSelection());
+           config->Write(wxT("Output Device"), OutDevice->GetStringSelection());
+           config->Write(wxT("Ring Device"),   RingDevice->GetStringSelection());
+           config->Write(wxT("Echo Cancel"),   EchoCancel->GetValue());
            delete config;
            break;
 
@@ -942,17 +942,17 @@ void IAXFrame::SetAudioDeviceByName(wxSt
 
     for(i=0; i<nDevs; i++) {
         if(devices->capabilities & IAXC_AD_INPUT) {
-            if(inname.Cmp(devices->name) == 0)
+            if(inname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 input = devices->devID;
         }
 
         if(devices->capabilities & IAXC_AD_OUTPUT) {
-            if(outname.Cmp(devices->name) == 0)
+            if(outname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 output = devices->devID;
         }
 
         if(devices->capabilities & IAXC_AD_RING) {
-            if(ringname.Cmp(devices->name) == 0)
+            if(ringname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 ring = devices->devID;
         }
         devices++;
@@ -972,7 +972,7 @@ ServerDialog::ServerDialog(wxWindow *par
 {
     wxBoxSizer      *dialogSizer  = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig        *config =       new wxConfig("iaxPhone");
+    wxConfig        *config =       new wxConfig(wxT("iaxPhone"));
 
     wxString        str;
     long            dummy;
@@ -983,11 +983,11 @@ ServerDialog::ServerDialog(wxWindow *par
     controlSizer->Add(110,16);
 
     /* Servers */
-    controlSizer->Add(new wxStaticText(this, -1, "   Server:  "));
-    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Server:  ")));
+    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, wxT(""), 
                                    wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
         Server->Append(str);
@@ -995,35 +995,35 @@ ServerDialog::ServerDialog(wxWindow *par
     }
 
     /* Add */
-    controlSizer->Add(Add = new wxButton(this, ID_ADD, "Add"));
+    controlSizer->Add(Add = new wxButton(this, ID_ADD, wxT("Add")));
 
     /* AutoRegister */
     controlSizer->Add( 20,16);
-    controlSizer->Add(AutoRegister = new wxCheckBox(this, ID_AUTOREGISTER, " Auto Register"));
+    controlSizer->Add(AutoRegister = new wxCheckBox(this, ID_AUTOREGISTER, wxT(" Auto Register")));
 
     /* Remove */
-    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, "Remove"));
+    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, wxT("Remove")));
 
     /* Host */
-    controlSizer->Add(new wxStaticText(this, -1, "   Host:  "));
-    controlSizer->Add(Host = new wxTextCtrl(this, ID_HOST, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Host:  ")));
+    controlSizer->Add(Host = new wxTextCtrl(this, ID_HOST, wxT(""), 
                                  wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     controlSizer->Add(110,1);
 
     /* Username */
-    controlSizer->Add(new wxStaticText(this, -1, "   Username:  "));
-    controlSizer->Add(Username = new wxTextCtrl(this, ID_USERNAME, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Username:  ")));
+    controlSizer->Add(Username = new wxTextCtrl(this, ID_USERNAME, wxT(""), 
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     /* Register */
-    controlSizer->Add(new wxButton(this, wxID_OK, "Register"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Register")));
 
     /* Password */
-    controlSizer->Add(new wxStaticText(this, -1, "   Password:  "));
-    controlSizer->Add(Password = new wxTextCtrl(this, ID_PASSWORD, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Password:  ")));
+    controlSizer->Add(Password = new wxTextCtrl(this, ID_PASSWORD, wxT(""), 
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* Done */
-    controlSizer->Add(new wxButton(this, wxID_CANCEL, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_CANCEL, wxT("Done")));
 
     dialogSizer->Add(controlSizer);
 
@@ -1034,22 +1034,22 @@ ServerDialog::ServerDialog(wxWindow *par
 
 void ServerDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString ServerVal;
 
     ServerVal = Server->GetValue();
 
-    KeyPath = "/Servers/" + ServerVal;
+    KeyPath = wxT("/Servers/") + ServerVal;
     config->SetPath(KeyPath);
 
     switch(event.GetId())
     {
       case ID_ADD:
-           config->Write("Auto Register", AutoRegister->GetValue());
-           config->Write("Host",          Host->GetValue());
-           config->Write("Username",      Username->GetValue());
-           config->Write("Password",      Password->GetValue());
+           config->Write(wxT("Auto Register"), AutoRegister->GetValue());
+           config->Write(wxT("Host"),          Host->GetValue());
+           config->Write(wxT("Username"),      Username->GetValue());
+           config->Write(wxT("Password"),      Password->GetValue());
 
            if(Server->FindString(ServerVal) < 0) {
              Server->Append(ServerVal);
@@ -1075,18 +1075,18 @@ void ServerDialog::OnButton(wxCommandEve
 
 void ServerDialog::OnComboBox(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString val;
     wxString KeyPath;
 
     // Update the Host/Username/Password boxes
-    KeyPath = "/Servers/" + Server->GetStringSelection();
+    KeyPath = wxT("/Servers/") + Server->GetStringSelection();
     config->SetPath(KeyPath);
 
-    Host->SetValue(config->Read("Host", ""));
-    Username->SetValue(config->Read("Username", ""));
-    Password->SetValue(config->Read("Password", ""));
-    AutoRegister->SetValue(config->Read("Auto Register", 0l) != 0);
+    Host->SetValue(config->Read(wxT("Host"), wxT("")));
+    Username->SetValue(config->Read(wxT("Username"), wxT("")));
+    Password->SetValue(config->Read(wxT("Password"), wxT("")));
+    AutoRegister->SetValue(config->Read(wxT("Auto Register"), 0l) != 0);
 }
 
 BEGIN_EVENT_TABLE(ServerDialog, wxDialog)
@@ -1104,7 +1104,7 @@ DialDialog::DialDialog(wxWindow *parent,
 
     wxBoxSizer      *dialogSizer  = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig        *config =       new wxConfig("iaxPhone");
+    wxConfig        *config =       new wxConfig(wxT("iaxPhone"));
 
     wxString        str;
     long            dummy;
@@ -1115,11 +1115,11 @@ DialDialog::DialDialog(wxWindow *parent,
     controlSizer->Add( 96,16);
 
     /* Speed Dial */
-    controlSizer->Add(new wxStaticText(this, -1, "   Speed Dial:  "));
-    controlSizer->Add(SpeedDial = new wxComboBox(this, ID_SPEEDDIAL, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Speed Dial:  ")));
+    controlSizer->Add(SpeedDial = new wxComboBox(this, ID_SPEEDDIAL, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Speed Dials");
+    config->SetPath(wxT("/Speed Dials"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       SpeedDial->Append(str);
@@ -1127,14 +1127,14 @@ DialDialog::DialDialog(wxWindow *parent,
     }
 
     /* Add */
-    controlSizer->Add(Save = new wxButton(this, ID_ADD, "Add"));
+    controlSizer->Add(Save = new wxButton(this, ID_ADD, wxT("Add")));
 
     /* Server */
-    controlSizer->Add(new wxStaticText(this, -1, "   Server:  "));
-    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Server:  ")));
+    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, wxT(""), 
                                    wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       Server->Append(str);
@@ -1142,19 +1142,19 @@ DialDialog::DialDialog(wxWindow *parent,
     }
 
     /* Remove */
-    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, "Remove"));
+    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, wxT("Remove")));
 
     /* Extention */
-    controlSizer->Add(new wxStaticText(this, -1, "   Extension:  "));
-    controlSizer->Add(Extension = new wxTextCtrl(this, ID_EXTENSION, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Extension:  ")));
+    controlSizer->Add(Extension = new wxTextCtrl(this, ID_EXTENSION, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     /* Dial */
-    controlSizer->Add(new wxButton(this, ID_DIAL, "Dial"));
+    controlSizer->Add(new wxButton(this, ID_DIAL, wxT("Dial")));
 
     /* Done */
     controlSizer->Add( 20,16);
     controlSizer->Add(280,16);
-    controlSizer->Add(new wxButton(this, wxID_OK, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Done")));
 
     dialogSizer->Add(controlSizer);
 
@@ -1165,34 +1165,34 @@ DialDialog::DialDialog(wxWindow *parent,
 
 void DialDialog::OnComboBox(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString val;
     wxString KeyPath;
 
     // Update the Server/Extension boxes
-    KeyPath = "/Speed Dials/" + SpeedDial->GetStringSelection();
+    KeyPath = wxT("/Speed Dials/") + SpeedDial->GetStringSelection();
     config->SetPath(KeyPath);
 
-    Server->SetValue(config->Read("Server", ""));
-    Extension->SetValue(config->Read("Extension", ""));
+    Server->SetValue(config->Read(wxT("Server"), wxT("")));
+    Extension->SetValue(config->Read(wxT("Extension"), wxT("")));
 }
 
 void DialDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString SpeedDialVal;
 
     SpeedDialVal = SpeedDial->GetValue();
 
-    KeyPath = "/Speed Dials/" + SpeedDialVal;
+    KeyPath = wxT("/Speed Dials/") + SpeedDialVal;
     config->SetPath(KeyPath);
 
     switch(event.GetId())
     {
       case ID_ADD:
-           config->Write("Server",    Server->GetValue());
-           config->Write("Extension", Extension->GetValue());
+           config->Write(wxT("Server"),    Server->GetValue());
+           config->Write(wxT("Extension"), Extension->GetValue());
 
            if(SpeedDial->FindString(SpeedDialVal) < 0) {
              SpeedDial->Append(SpeedDialVal);
@@ -1203,7 +1203,7 @@ void DialDialog::OnButton(wxCommandEvent
            config->DeleteGroup(KeyPath);
            // Remove it from the combobox, as well
            SpeedDial->Delete(SpeedDial->FindString(SpeedDialVal));
-           Server->SetValue("");
+           Server->SetValue(wxT(""));
            Extension->Clear();
            break;
 
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h.BAD iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h.BAD	2008-06-10 12:03:28.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h	2008-06-10 12:53:42.000000000 -0400
@@ -220,10 +220,10 @@ class IAXFrame : public wxFrame
 
             ~IAXFrame();
 
-            void OnDTMF(wxEvent &evt);
-            void OnDial(wxEvent &evt);
-            void OnHangup(wxEvent &evt);
-            void OnQuit(wxEvent &evt);
+            void OnDTMF(wxCommandEvent &evt);
+            void OnDial(wxCommandEvent &evt);
+            void OnHangup(wxCommandEvent &evt);
+            void OnQuit(wxCommandEvent &evt);
             void OnPTTChange(wxCommandEvent &evt);
             void OnSilenceChange(wxCommandEvent &evt);
             void OnNotify(void);
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.BAD iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc
--- iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.BAD	2008-06-10 13:05:01.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc	2008-06-10 13:05:07.000000000 -0400
@@ -425,7 +425,7 @@ void MyFrame::ShowDirectoryControls()
     config->SetPath(_T("/OT"));
     bCont = config->GetFirstGroup(OTName, dummy);
     while ( bCont ) {
-#if defined(__UNICODE__)
+#if defined(wxUSE_UNICODE)
         ot = ((wxButton *)((*aPanel).FindWindow(wxXmlResource::GetXRCID(OTName))));
 #else
         ot = XRCCTRL(*aPanel, OTName, wxButton);


--- NEW FILE iaxclient.spec ---
%define betaver beta3
%define tclver 0.2
%define mainver 2.1
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%ifarch sparcv9
%define tkphonearch sparc
%else
%define tkphonearch %{_arch}
%endif

Name:		iaxclient
Version:	%{mainver}
Release:	0.3.%{betaver}%{?dist}
Summary:	Library for creating telephony solutions that interoperate with Asterisk
Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://iaxclient.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/iaxclient/%{name}-%{version}%{betaver}.tar.gz
Source1:	tkiaxphone.desktop
Source2:	wxiax.desktop
Source3:	phone.png
Source4:	run-tkiaxphone.sh
Patch0:		iaxclient-2.1beta3-wxGTK28.patch
Patch1:		iaxclient-2.1beta3-tkphone-cleanups.patch
Patch2:		iaxclient-2.1beta3-tcl-includedir.patch
Patch3:		iaxclient-2.1beta3-tcl-libdir.patch
Patch4:		iaxclient-2.1beta3-tcl-nodoc.patch
Patch5:		iaxclient-2.1beta3-theora-detection.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	speex-devel, libtheora-devel, gsm-devel, portaudio-devel, iax-devel
BuildRequires:	tk-devel, gtk2-devel, SDL-devel, libogg-devel, liboggz-devel 
BuildRequires:	wxGTK-devel, libvidcap-devel, desktop-file-utils

%description
Iaxclient is an open source, multiplatform library for creating telephony 
solutions that interoperate with Asterisk, the Open Source PBX.

Although asterisk supports other VOIP protocols (including SIP, and with 
patches, H.323), IAX's simple, lightweight nature gives it several advantages, 
particularly in that it can operate easily through NAT and packet firewalls, 
and it is easily extensible and simple to understand.
Iaxclient pulls together the wide array of open source technologies required 
for telephony applications.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	pkgconfig
Requires:	%{name} = %{mainver}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package -n tcl-iaxclient
Summary:	Tcl interface to iax2 client lib
Version:	%{tclver}
Group:		System Environment/Libraries
License:	BSD
Requires:	tcl(abi) = 8.5
Requires:	%{name} = %{mainver}-%{release}

%description -n tcl-iaxclient
Tcl extensions to iaxclient libraries.

%package -n tkiaxphone
Summary:	Tk IAX Phone Client
Version:	%{mainver}
Group:		Applications/Internet
License:	LGPLv2+
Requires:	tcl(abi) = 8.5
Requires:	%{name} = %{mainver}-%{release}

%description -n tkiaxphone
Tk IAX Phone Client.

%package -n wxiax
Summary:	wx IAX Phone Client
Version:	%{mainver}
Group:		Applications/Internet
License:	LGPLv2+
Requires:	%{name} = %{mainver}-%{release}

%description -n wxiax
wx IAX Phone Client.

%prep
%setup -q -n %{name}-%{mainver}%{betaver}
%patch0 -p1 -b .wxGTK28
%patch1 -p1 -b .tkphone
%patch2 -p1 -b .includedir
%patch3 -p1 -b .libdir
%patch4 -p1 -b .nodoc
%patch5 -p1 -b .theoradetect
chmod -x contrib/tcl/README.txt

sed -i 's|/usr/lib|%{_libdir}|g' lib/libiax2/iax-config.in

%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
cd contrib/tcl/
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/iaxclient %{buildroot}%{tcl_sitearch}/
cd contrib/tcl
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_libdir}/tcliaxclient0.2 %{buildroot}%{tcl_sitearch}/tcliaxclient0.2
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/phone.ui.tcl
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/pref.ui.tcl
install -p %{SOURCE4} %{buildroot}%{_bindir}

mkdir %{buildroot}%{_datadir}/pixmaps/
install -p %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/tkiaxphone.png
install -p %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/wxiax.png

mkdir %{buildroot}%{_datadir}/applications/

desktop-file-install --vendor ""			\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE1}

desktop-file-install --vendor ""			\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE2}	

cd %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/
ln -s iaxcli iaxcli-Linux-%{tkphonearch}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB ChangeLog README
%{_bindir}/iaxcomm
%{_bindir}/iaxphone
%{_datadir}/iaxcomm/
%{_libdir}/libiaxclient.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/stresstest
%{_bindir}/testcall
%{_bindir}/vtestcall
%{_includedir}/iaxclient.h
%{_libdir}/libiaxclient.so
%{_libdir}/pkgconfig/iaxclient.pc

%files -n tcl-iaxclient
%defattr(-,root,root,-)
%doc contrib/tcl/README.txt
%{tcl_sitearch}/tcliaxclient0.2/

%files -n tkiaxphone
%defattr(-,root,root,-)
%{_bindir}/run-tkiaxphone.sh
%{_bindir}/tkiaxphone
%{tcl_sitearch}/iaxclient/
%{_datadir}/applications/tkiaxphone.desktop
%{_datadir}/pixmaps/tkiaxphone.png

%files -n wxiax
%defattr(-,root,root,-)
%{_bindir}/wxiax
%{_datadir}/applications/wxiax.desktop
%{_datadir}/pixmaps/wxiax.png

%changelog
* Thu Mar 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.3.beta3
- fix lib/libiax2/iax-config.in to not use wrong /usr/lib

* Mon Nov  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.2.beta3
- fix theora detection

* Tue Jun 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.1.beta3
- Initial package for Fedora



--- NEW FILE run-tkiaxphone.sh ---
#!/bin/bash
export IAXPHONEHOME=/usr/lib64/tcl8.5/iaxclient/tkphone 
exec /usr/bin/tkiaxphone


--- NEW FILE tkiaxphone.desktop ---

[Desktop Entry]
Encoding=UTF-8
Name=Tkphone
GenericName=Tk IAX Phone Client
Exec=/usr/bin/run-tkiaxphone.sh
Icon=tkiaxphone
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;Telephony;


--- NEW FILE wxiax.desktop ---

[Desktop Entry]
Encoding=UTF-8
Name=wxiax
GenericName=wx IAX Phone Client
Exec=/usr/bin/wxiax
Icon=wxiax
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;Telephony;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iaxclient/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Apr 2009 21:07:03 -0000	1.1
+++ sources	6 Apr 2009 21:17:29 -0000	1.2
@@ -0,0 +1 @@
+47d54b9d5d48dc6aa1f6d7e506c72ba7  iaxclient-2.1beta3.tar.gz



From spot at fedoraproject.org  Mon Apr  6 21:17:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  6 Apr 2009 21:17:59 +0000 (UTC)
Subject: rpms/iaxclient/F-10 iaxclient-2.1beta3-tcl-includedir.patch, NONE, 
	1.1 iaxclient-2.1beta3-tcl-libdir.patch, NONE,
	1.1 iaxclient-2.1beta3-tcl-nodoc.patch, NONE,
	1.1 iaxclient-2.1beta3-theora-detection.patch, NONE,
	1.1 iaxclient-2.1beta3-tkphone-cleanups.patch, NONE,
	1.1 iaxclient-2.1beta3-wxGTK28.patch, NONE, 1.1 iaxclient.spec,
	NONE, 1.1 phone.png, NONE, 1.1 run-tkiaxphone.sh, NONE,
	1.1 tkiaxphone.desktop, NONE, 1.1 wxiax.desktop, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090406211759.840DF70137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/iaxclient/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9859/F-10

Modified Files:
	sources 
Added Files:
	iaxclient-2.1beta3-tcl-includedir.patch 
	iaxclient-2.1beta3-tcl-libdir.patch 
	iaxclient-2.1beta3-tcl-nodoc.patch 
	iaxclient-2.1beta3-theora-detection.patch 
	iaxclient-2.1beta3-tkphone-cleanups.patch 
	iaxclient-2.1beta3-wxGTK28.patch iaxclient.spec phone.png 
	run-tkiaxphone.sh tkiaxphone.desktop wxiax.desktop 
Log Message:
initial branching

iaxclient-2.1beta3-tcl-includedir.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-includedir.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:11:52.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:12:06.000000000 -0400
@@ -144,7 +144,7 @@ TCLSH	= $(TCLSH_ENV) $(TCLSH_PROG)
 
 SHARED_BUILD	= @SHARED_BUILD@
 
-INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
+INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ -I../../lib
 #INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
 
 PKG_CFLAGS	= @PKG_CFLAGS@

iaxclient-2.1beta3-tcl-libdir.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-libdir.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:24:44.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:25:14.000000000 -0400
@@ -108,7 +108,7 @@ RANLIB		= @RANLIB@
 RANLIB_STUB	= @RANLIB_STUB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS	= -L../../lib/.libs @SHLIB_LD_LIBS@
 STLIB_LD	= @STLIB_LD@
 #TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@

iaxclient-2.1beta3-tcl-nodoc.patch:

--- NEW FILE iaxclient-2.1beta3-tcl-nodoc.patch ---
diff -up iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD iaxclient-2.1beta3/contrib/tcl/Makefile.in
--- iaxclient-2.1beta3/contrib/tcl/Makefile.in.BAD	2008-06-10 16:28:59.000000000 -0400
+++ iaxclient-2.1beta3/contrib/tcl/Makefile.in	2008-06-10 16:29:06.000000000 -0400
@@ -203,7 +203,7 @@ doc:
 	@echo "        xml2nroff sample.xml > sample.n"
 	@echo "        xml2html sample.xml > sample.html"
 
-install: all install-binaries install-libraries install-doc
+install: all install-binaries install-libraries
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 

iaxclient-2.1beta3-theora-detection.patch:

--- NEW FILE iaxclient-2.1beta3-theora-detection.patch ---
diff -up iaxclient-2.1beta3/configure.ac.BAD iaxclient-2.1beta3/configure.ac
--- iaxclient-2.1beta3/configure.ac.BAD	2008-11-03 09:22:20.000000000 -0500
+++ iaxclient-2.1beta3/configure.ac	2008-11-03 09:22:28.000000000 -0500
@@ -193,7 +193,7 @@ PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.
 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
 PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no)
 PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
-PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no)
+PKG_CHECK_MODULES(THEORA, [theora >= 1.0], has_theora=yes, has_theora=no)
 PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no)
 PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no)
 
diff -up iaxclient-2.1beta3/configure.BAD iaxclient-2.1beta3/configure
--- iaxclient-2.1beta3/configure.BAD	2008-11-03 09:20:58.000000000 -0500
+++ iaxclient-2.1beta3/configure	2008-11-03 09:21:31.000000000 -0500
@@ -23115,12 +23115,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0alpha7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "theora >= 1.0alpha7") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "theora >= 1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "theora >= 1.0alpha7" 2>/dev/null`
+  pkg_cv_THEORA_CFLAGS=`$PKG_CONFIG --cflags "theora >= 1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23133,12 +23133,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_THEORA_LIBS="$THEORA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0alpha7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "theora >= 1.0alpha7") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "theora >= 1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "theora >= 1.0alpha7" 2>/dev/null`
+  pkg_cv_THEORA_LIBS=`$PKG_CONFIG --libs "theora >= 1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23157,9 +23157,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora >= 1.0alpha7"`
+	        THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora >= 1.0"`
         else
-	        THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora >= 1.0alpha7"`
+	        THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora >= 1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$THEORA_PKG_ERRORS" >&5

iaxclient-2.1beta3-tkphone-cleanups.patch:

--- NEW FILE iaxclient-2.1beta3-tkphone-cleanups.patch ---
diff -up iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c.BAD iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c
--- iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c.BAD	2008-06-10 13:11:28.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/iaxcli.c	2008-06-10 13:11:34.000000000 -0400
@@ -413,7 +413,7 @@ int main(int argc, char **argv) {
 #endif
 
     atexit(iaxc_shutdown); /* activate the exit handler */
-    if (iaxc_initialize(AUDIO_INTERNAL_PA,1)) {
+    if (iaxc_initialize(1)) {
 	fatal_error("cannot initialize iaxclient!");
     }
 
diff -up iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am.BAD iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am
--- iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am.BAD	2008-06-10 13:13:44.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/Makefile.am	2008-06-10 13:13:49.000000000 -0400
@@ -1,5 +1,5 @@
 # Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
-bin_SCRIPTS = tkphone
+bin_SCRIPTS = tkiaxphone
 
 iaxcli_PROGRAMS=iaxcli
 iaxcli_SOURCES = iaxcli.c tones.c tones.h
diff -up iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in.BAD iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in
--- iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in.BAD	2008-06-10 13:13:29.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/Makefile.in	2008-06-10 13:13:33.000000000 -0400
@@ -251,7 +251,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
-bin_SCRIPTS = tkphone
+bin_SCRIPTS = tkiaxphone
 iaxcli_SOURCES = iaxcli.c tones.c tones.h
 iaxclidir = ${libdir}/iaxclient/tkphone
 iaxcli_SCRIPTS = tkiaxphone
diff -up iaxclient-2.1beta3/simpleclient/tkphone/tones.c.BAD iaxclient-2.1beta3/simpleclient/tkphone/tones.c
--- iaxclient-2.1beta3/simpleclient/tkphone/tones.c.BAD	2008-06-10 13:12:03.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/tkphone/tones.c	2008-06-10 13:12:09.000000000 -0400
@@ -32,7 +32,7 @@
 #ifdef TONES_MAIN
 #  include <stdio.h>
 #endif
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <math.h>
 #include "tones.h"

iaxclient-2.1beta3-wxGTK28.patch:

--- NEW FILE iaxclient-2.1beta3-wxGTK28.patch ---
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.BAD iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.BAD	2008-06-10 11:08:12.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc	2008-06-10 12:54:23.000000000 -0400
@@ -81,7 +81,7 @@ IAXCalls::IAXCalls(wxWindow *parent, int
 
     Hide();
     for(i=0;i<nCalls;i++) {
-        InsertItem(i,wxString::Format("%ld", i+1), 0);
+        InsertItem(i,wxString::Format(wxT("%ld"), i+1), 0);
         SetItem(i, 2, _T("No call"));
         item.m_itemId=i;
         item.m_mask = 0;
@@ -159,7 +159,7 @@ int IAXCalls::HandleStateEvent(struct ia
         stateItem.SetBackgroundColour(*wxWHITE);
     } else {
         // set remote 
-        SetItem(c.callNo, 2, c.remote );
+        SetItem(c.callNo, 2, wxString::FromAscii(c.remote) );
 
         bool outgoing = c.state & IAXC_CALL_STATE_OUTGOING;
         bool ringing = c.state & IAXC_CALL_STATE_RINGING;
@@ -226,7 +226,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
                  : wxFrame((wxFrame *) NULL, -1, title, wxPoint(xpos, ypos),
                    wxSize(width, height))
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString str;
     long     dummy;
     bool     bCont;
@@ -262,9 +262,9 @@ IAXFrame::IAXFrame(const wxChar *title, 
     wxMenu *optionsMenu = new wxMenu();
     optionsMenu->AppendCheckItem(ID_PTT, _T("Enable &Push to Talk\tCtrl-P"));
     optionsMenu->AppendCheckItem(ID_SILENCE, _T("Enable &Silence Suppression\tCtrl-S"));
-    optionsMenu->Append(ID_AUDIO,  "&Audio ...", "Show audio settings dialog");
-    optionsMenu->Append(ID_SERVER, "&Servers ...", "Manage servers list");
-    optionsMenu->Append(ID_SPEED,  "&Speed Dials ...", "Manage Speed Dials");
+    optionsMenu->Append(ID_AUDIO,  wxT("&Audio ..."), wxT("Show audio settings dialog"));
+    optionsMenu->Append(ID_SERVER, wxT("&Servers ..."), wxT("Manage servers list"));
+    optionsMenu->Append(ID_SPEED,  wxT("&Speed Dials ..."), wxT("Manage Speed Dials"));
    
     wxMenuBar *menuBar = new wxMenuBar();
 
@@ -293,7 +293,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
         wxGridSizer *dialpadsizer = new wxGridSizer(3);
         for(int i=0; i<12;i++)
         {
-            dialpadsizer->Add(new wxButton(aPanel, i, wxString(buttonlabels[i]),
+            dialpadsizer->Add(new wxButton(aPanel, i, wxString::FromAscii(buttonlabels[i]),
                                            wxDefaultPosition, wxDefaultSize,
                                            wxBU_EXACTFIT), 1, wxEXPAND|wxALL, 3);
         }
@@ -327,10 +327,10 @@ IAXFrame::IAXFrame(const wxChar *title, 
     }
 
     /* Speed Dial */
-    topsizer->Add(SpeedDial = new wxComboBox(aPanel, ID_SPEEDDIAL, "", 
+    topsizer->Add(SpeedDial = new wxComboBox(aPanel, ID_SPEEDDIAL, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Speed Dials");
+    config->SetPath(wxT("/Speed Dials"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       SpeedDial->Append(str);
@@ -356,7 +356,7 @@ IAXFrame::IAXFrame(const wxChar *title, 
 
     topsizer->Add(row3sizer,0,wxEXPAND);
 
-    topsizer->Add(muteState = new wxStaticText(aPanel,-1,"PTT Disabled",
+    topsizer->Add(muteState = new wxStaticText(aPanel,-1,wxT("PTT Disabled"),
                                                wxDefaultPosition, wxDefaultSize),
                                                0,wxEXPAND);
 
@@ -411,7 +411,7 @@ void IAXFrame::SetPTT(bool state)
         iaxc_set_audio_output(0);  // unmute output
     }
 
-    muteState->SetLabel( pttState ? "Talk" : "Mute");
+    muteState->SetLabel( pttState ? wxT("Talk") : wxT("Mute"));
 }
 
 void IAXFrame::CheckPTT()
@@ -422,28 +422,28 @@ void IAXFrame::CheckPTT()
     SetPTT(newState);
 }
 
-void IAXFrame::OnDTMF(wxEvent &evt)
+void IAXFrame::OnDTMF(wxCommandEvent &evt)
 {
     iaxc_send_dtmf(*buttonlabels[evt.m_id]);
 }
 
-void IAXFrame::OnDial(wxEvent &evt)
+void IAXFrame::OnDial(wxCommandEvent &evt)
 {
     theFrame->DialBySpeedDialName(SpeedDial->GetValue());
 }
 
-void IAXFrame::OnHangup(wxEvent &evt)
+void IAXFrame::OnHangup(wxCommandEvent &evt)
 {
     iaxc_dump_call();
 }
 
-void IAXFrame::OnQuit(wxEvent &evt)
+void IAXFrame::OnQuit(wxCommandEvent &evt)
 {
     Close(TRUE);
 }
 
 void IAXFrame::RegisterByName(wxString RegName) {
-    wxConfig    *config = new wxConfig("iaxPhone");
+    wxConfig    *config = new wxConfig(wxT("iaxPhone"));
     wxChar      KeyPath[256];
     wxListItem  item;
     long        index;
@@ -451,26 +451,26 @@ void IAXFrame::RegisterByName(wxString R
     wxStringTokenizer tok(RegName, _T(":@"));
     char user[256], pass[256], host[256];
 
-    if(strlen(RegName) == 0)
+    if(wxStrlen(RegName) == 0)
         return;
 
     if(tok.CountTokens() == 3) {
 
-        strncpy( user , tok.GetNextToken().c_str(), 256);
-        strncpy( pass , tok.GetNextToken().c_str(), 256);
-        strncpy( host , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)user , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)pass , tok.GetNextToken().c_str(), 256);
+        wxStrncpy( (wchar_t *)host , tok.GetNextToken().c_str(), 256);
     } else {
         // Check if it's a Speed Dial
-        wxStrcpy(KeyPath,     "/Servers/");
+        wxStrcpy(KeyPath,     wxT("/Servers/"));
         wxStrcat(KeyPath,     RegName);
         config->SetPath(KeyPath);
         if(!config->Exists(KeyPath)) {
-            theFrame->SetStatusText("Register format error");
+            theFrame->SetStatusText(wxT("Register format error"));
             return;
         }
-        wxStrcpy(user, config->Read("Username", ""));
-        wxStrcpy(pass, config->Read("Password", ""));
-        wxStrcpy(host, config->Read("Host", ""));
+        wxStrcpy((wchar_t *)user, config->Read(wxT("Username"), wxT("")));
+        wxStrcpy((wchar_t *)pass, config->Read(wxT("Password"), wxT("")));
+        wxStrcpy((wchar_t *)host, config->Read(wxT("Host"), wxT("")));
     }
     iaxc_register(user, pass, host);
 
@@ -490,7 +490,7 @@ void IAXFrame::RegisterByName(wxString R
         // need to find some way to update status -- is there any
         // server data in the "reg accepted" message??
 
-        registrations->SetItem(index, 1, "----");
+        registrations->SetItem(index, 1, wxT("----"));
 
         registrations->Refresh();
         registrations->Show();
@@ -512,7 +512,7 @@ void IAXFrame::OnPTTChange(wxCommandEven
             iaxc_set_silence_threshold(-99);
         }
         iaxc_set_audio_output(0);  // unmute output
-        muteState->SetLabel("PTT Disabled");
+        muteState->SetLabel(wxT("PTT Disabled"));
     }
 }
 
@@ -532,25 +532,25 @@ void IAXFrame::OnSilenceChange(wxCommand
 
 void IAXFrame::OnAudioDialog(wxCommandEvent& WXUNUSED(event))
 {
-    AudioDialog dialog(this, "Audio Properties", wxDefaultPosition, wxSize(520,220));
+    AudioDialog dialog(this, wxT("Audio Properties"), wxDefaultPosition, wxSize(520,220));
     dialog.ShowModal();
 }
 
 void IAXFrame::OnServerDialog(wxCommandEvent& WXUNUSED(event))
 {
-    ServerDialog dialog(this, "Server Dialog", wxDefaultPosition, wxSize(500,260));
+    ServerDialog dialog(this, wxT("Server Dialog"), wxDefaultPosition, wxSize(500,260));
     dialog.ShowModal();
 }
 
 void IAXFrame::OnDialDialog(wxCommandEvent& WXUNUSED(event))
 {
-    DialDialog dialog(this, "Dial Dialog", wxDefaultPosition, wxSize(500,240));
+    DialDialog dialog(this, wxT("Dial Dialog"), wxDefaultPosition, wxSize(500,240));
     dialog.ShowModal();
 }
 
 int IAXFrame::HandleStatusEvent(char *msg)
 {
-    theFrame->SetStatusText(msg);
+    theFrame->SetStatusText(wxString::FromAscii(msg));
     return 1;
 }
 
@@ -616,7 +616,7 @@ void IAXFrame::HandleEvent(wxCommandEven
 
 void IAXFrame::DialBySpeedDialName(wxString name)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString ServerName;
     wxString Extension;
@@ -625,20 +625,20 @@ void IAXFrame::DialBySpeedDialName(wxStr
     if(name.IsEmpty())
         return;
 
-    KeyPath = "/Speed Dials/" + name;
+    KeyPath = wxT("/Speed Dials/") + name;
 
     if(config->Exists(KeyPath)) {
         config->SetPath(KeyPath);
 
-        ServerName = config->Read("Server",    "");
-        Extension =  config->Read("Extension", "");
+        ServerName = config->Read(wxT("Server"),    wxT(""));
+        Extension =  config->Read(wxT("Extension"), wxT(""));
 
-        KeyPath = "/Servers/" + ServerName;
+        KeyPath = wxT("/Servers/") + ServerName;
         config->SetPath(KeyPath);
 
-        Destination  = config->Read("Username", "") + ":" +
-                       config->Read("Password", "") + "@" +
-                       config->Read("Host", "")     + "/" + 
+        Destination  = config->Read(wxT("Username"), wxT("")) + wxT(":") +
+                       config->Read(wxT("Password"), wxT("")) + wxT("@") +
+                       config->Read(wxT("Host"), wxT(""))     + wxT("/") + 
                        Extension;
     } else {
         Destination = name;
@@ -716,7 +716,7 @@ bool IAXClient::OnCmdLineParsed(wxCmdLin
 
 bool IAXClient::OnInit() 
 { 
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
 
     wxString str;
     wxString reginfo;
@@ -726,19 +726,19 @@ bool IAXClient::OnInit() 
     if(!wxApp::OnInit())
         return false;
 
-    optNoDialPad = (config->Read("/DialPad",  1l) == 0);
-    optNumCalls  =  config->Read("/NumCalls", 4l);
+    optNoDialPad = (config->Read(wxT("/DialPad"),  1l) == 0);
+    optNumCalls  =  config->Read(wxT("/NumCalls"), 4l);
 
-    theFrame = new IAXFrame("IAXPhone", 0,0,150,220);
+    theFrame = new IAXFrame(wxT("IAXPhone"), 0,0,150,220);
 
     theFrame->Show(TRUE); 
     SetTopWindow(theFrame); 
 
-    iaxc_initialize(AUDIO_INTERNAL_PA, wxGetApp().optNumCalls);
+    iaxc_initialize(wxGetApp().optNumCalls);
    
-    theFrame->SetAudioDeviceByName(config->Read("/Input Device", ""),
-                                   config->Read("/Output Device", ""),
-                                   config->Read("/Ring Device", ""));
+    theFrame->SetAudioDeviceByName(config->Read(wxT("/Input Device"), wxT("")),
+                                   config->Read(wxT("/Output Device"), wxT("")),
+                                   config->Read(wxT("/Ring Device"), wxT("")));
 
     //    iaxc_set_encode_format(IAXC_FORMAT_GSM);
     iaxc_set_silence_threshold(-99);
@@ -748,10 +748,10 @@ bool IAXClient::OnInit() 
 
     // Register from wxConfig
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
-        reginfo = str + "/Auto Register";
+        reginfo = str + wxT("/Auto Register");
         if((config->Read(reginfo, 0l) != 0)) {
             theFrame->RegisterByName(str);
         }
@@ -822,7 +822,7 @@ AudioDialog::AudioDialog(wxWindow *paren
 {
     wxBoxSizer        *dialogSizer =  new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer   *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig          *config =       new wxConfig("iaxPhone");
+    wxConfig          *config =       new wxConfig(wxT("iaxPhone"));
     wxString          str;
     struct
     iaxc_audio_device *devices;
@@ -832,47 +832,47 @@ AudioDialog::AudioDialog(wxWindow *paren
     long              caps;
     wxString          devname;
 
-    config->SetPath("/");
+    config->SetPath(wxT("/"));
     
     controlSizer->Add( 20,16);
     controlSizer->Add(280,16);
     controlSizer->Add(110,16);
 
     /* Input Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Input Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Input Device:  ")));
     controlSizer->Add(InDevice = new wxChoice(this, ID_INDEVICE,
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* Save */
-    controlSizer->Add(Save = new wxButton(this, ID_SAVE, "Save"));
+    controlSizer->Add(Save = new wxButton(this, ID_SAVE, wxT("Save")));
 
     /* Output Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Output Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Output Device:  ")));
     controlSizer->Add(OutDevice = new wxChoice(this, ID_OUTDEVICE,
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* OK */
-    controlSizer->Add(new wxButton(this, wxID_OK, "Set"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Set")));
 
     /* Ring Device */
-    controlSizer->Add(new wxStaticText(this, -1, "   Ring Device:  "));
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Ring Device:  ")));
     controlSizer->Add(RingDevice = new wxChoice(this, ID_RINGDEVICE,
                                        wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* CANCEL */
-    controlSizer->Add(new wxButton(this, wxID_CANCEL, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_CANCEL, wxT("Done")));
 
     /* Echo Cancel */
     controlSizer->Add( 20,16);
     controlSizer->Add(EchoCancel = new wxCheckBox(this, ID_ECHOCANCEL, 
-                                       " Echo Cancel"));
-    EchoCancel->SetValue(config->Read("Echo Cancel", 0l) != 0);
+                                       wxT(" Echo Cancel")));
+    EchoCancel->SetValue(config->Read(wxT("Echo Cancel"), 0l) != 0);
 
     iaxc_audio_devices_get(&devices, &nDevs, &input, &output, &ring);
 
     for(i=0; i<nDevs; i++) {
         caps =    devices->capabilities;
-        devname = devices->name;
+        devname = wxString::FromAscii(devices->name);
 
         if(caps & IAXC_AD_INPUT)
             InDevice->Append(devname);
@@ -904,17 +904,17 @@ AudioDialog::AudioDialog(wxWindow *paren
 
 void AudioDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
 
-    config->SetPath("/");
+    config->SetPath(wxT("/"));
 
     switch(event.GetId())
     {
       case ID_SAVE:
-           config->Write("Input Device",  InDevice->GetStringSelection());
-           config->Write("Output Device", OutDevice->GetStringSelection());
-           config->Write("Ring Device",   RingDevice->GetStringSelection());
-           config->Write("Echo Cancel",   EchoCancel->GetValue());
+           config->Write(wxT("Input Device"),  InDevice->GetStringSelection());
+           config->Write(wxT("Output Device"), OutDevice->GetStringSelection());
+           config->Write(wxT("Ring Device"),   RingDevice->GetStringSelection());
+           config->Write(wxT("Echo Cancel"),   EchoCancel->GetValue());
            delete config;
            break;
 
@@ -942,17 +942,17 @@ void IAXFrame::SetAudioDeviceByName(wxSt
 
     for(i=0; i<nDevs; i++) {
         if(devices->capabilities & IAXC_AD_INPUT) {
-            if(inname.Cmp(devices->name) == 0)
+            if(inname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 input = devices->devID;
         }
 
         if(devices->capabilities & IAXC_AD_OUTPUT) {
-            if(outname.Cmp(devices->name) == 0)
+            if(outname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 output = devices->devID;
         }
 
         if(devices->capabilities & IAXC_AD_RING) {
-            if(ringname.Cmp(devices->name) == 0)
+            if(ringname.Cmp(wxString::FromAscii(devices->name)) == 0)
                 ring = devices->devID;
         }
         devices++;
@@ -972,7 +972,7 @@ ServerDialog::ServerDialog(wxWindow *par
 {
     wxBoxSizer      *dialogSizer  = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig        *config =       new wxConfig("iaxPhone");
+    wxConfig        *config =       new wxConfig(wxT("iaxPhone"));
 
     wxString        str;
     long            dummy;
@@ -983,11 +983,11 @@ ServerDialog::ServerDialog(wxWindow *par
     controlSizer->Add(110,16);
 
     /* Servers */
-    controlSizer->Add(new wxStaticText(this, -1, "   Server:  "));
-    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Server:  ")));
+    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, wxT(""), 
                                    wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
         Server->Append(str);
@@ -995,35 +995,35 @@ ServerDialog::ServerDialog(wxWindow *par
     }
 
     /* Add */
-    controlSizer->Add(Add = new wxButton(this, ID_ADD, "Add"));
+    controlSizer->Add(Add = new wxButton(this, ID_ADD, wxT("Add")));
 
     /* AutoRegister */
     controlSizer->Add( 20,16);
-    controlSizer->Add(AutoRegister = new wxCheckBox(this, ID_AUTOREGISTER, " Auto Register"));
+    controlSizer->Add(AutoRegister = new wxCheckBox(this, ID_AUTOREGISTER, wxT(" Auto Register")));
 
     /* Remove */
-    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, "Remove"));
+    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, wxT("Remove")));
 
     /* Host */
-    controlSizer->Add(new wxStaticText(this, -1, "   Host:  "));
-    controlSizer->Add(Host = new wxTextCtrl(this, ID_HOST, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Host:  ")));
+    controlSizer->Add(Host = new wxTextCtrl(this, ID_HOST, wxT(""), 
                                  wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     controlSizer->Add(110,1);
 
     /* Username */
-    controlSizer->Add(new wxStaticText(this, -1, "   Username:  "));
-    controlSizer->Add(Username = new wxTextCtrl(this, ID_USERNAME, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Username:  ")));
+    controlSizer->Add(Username = new wxTextCtrl(this, ID_USERNAME, wxT(""), 
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     /* Register */
-    controlSizer->Add(new wxButton(this, wxID_OK, "Register"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Register")));
 
     /* Password */
-    controlSizer->Add(new wxStaticText(this, -1, "   Password:  "));
-    controlSizer->Add(Password = new wxTextCtrl(this, ID_PASSWORD, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Password:  ")));
+    controlSizer->Add(Password = new wxTextCtrl(this, ID_PASSWORD, wxT(""), 
                                      wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
     /* Done */
-    controlSizer->Add(new wxButton(this, wxID_CANCEL, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_CANCEL, wxT("Done")));
 
     dialogSizer->Add(controlSizer);
 
@@ -1034,22 +1034,22 @@ ServerDialog::ServerDialog(wxWindow *par
 
 void ServerDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString ServerVal;
 
     ServerVal = Server->GetValue();
 
-    KeyPath = "/Servers/" + ServerVal;
+    KeyPath = wxT("/Servers/") + ServerVal;
     config->SetPath(KeyPath);
 
     switch(event.GetId())
     {
       case ID_ADD:
-           config->Write("Auto Register", AutoRegister->GetValue());
-           config->Write("Host",          Host->GetValue());
-           config->Write("Username",      Username->GetValue());
-           config->Write("Password",      Password->GetValue());
+           config->Write(wxT("Auto Register"), AutoRegister->GetValue());
+           config->Write(wxT("Host"),          Host->GetValue());
+           config->Write(wxT("Username"),      Username->GetValue());
+           config->Write(wxT("Password"),      Password->GetValue());
 
            if(Server->FindString(ServerVal) < 0) {
              Server->Append(ServerVal);
@@ -1075,18 +1075,18 @@ void ServerDialog::OnButton(wxCommandEve
 
 void ServerDialog::OnComboBox(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString val;
     wxString KeyPath;
 
     // Update the Host/Username/Password boxes
-    KeyPath = "/Servers/" + Server->GetStringSelection();
+    KeyPath = wxT("/Servers/") + Server->GetStringSelection();
     config->SetPath(KeyPath);
 
-    Host->SetValue(config->Read("Host", ""));
-    Username->SetValue(config->Read("Username", ""));
-    Password->SetValue(config->Read("Password", ""));
-    AutoRegister->SetValue(config->Read("Auto Register", 0l) != 0);
+    Host->SetValue(config->Read(wxT("Host"), wxT("")));
+    Username->SetValue(config->Read(wxT("Username"), wxT("")));
+    Password->SetValue(config->Read(wxT("Password"), wxT("")));
+    AutoRegister->SetValue(config->Read(wxT("Auto Register"), 0l) != 0);
 }
 
 BEGIN_EVENT_TABLE(ServerDialog, wxDialog)
@@ -1104,7 +1104,7 @@ DialDialog::DialDialog(wxWindow *parent,
 
     wxBoxSizer      *dialogSizer  = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
-    wxConfig        *config =       new wxConfig("iaxPhone");
+    wxConfig        *config =       new wxConfig(wxT("iaxPhone"));
 
     wxString        str;
     long            dummy;
@@ -1115,11 +1115,11 @@ DialDialog::DialDialog(wxWindow *parent,
     controlSizer->Add( 96,16);
 
     /* Speed Dial */
-    controlSizer->Add(new wxStaticText(this, -1, "   Speed Dial:  "));
-    controlSizer->Add(SpeedDial = new wxComboBox(this, ID_SPEEDDIAL, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Speed Dial:  ")));
+    controlSizer->Add(SpeedDial = new wxComboBox(this, ID_SPEEDDIAL, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Speed Dials");
+    config->SetPath(wxT("/Speed Dials"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       SpeedDial->Append(str);
@@ -1127,14 +1127,14 @@ DialDialog::DialDialog(wxWindow *parent,
     }
 
     /* Add */
-    controlSizer->Add(Save = new wxButton(this, ID_ADD, "Add"));
+    controlSizer->Add(Save = new wxButton(this, ID_ADD, wxT("Add")));
 
     /* Server */
-    controlSizer->Add(new wxStaticText(this, -1, "   Server:  "));
-    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Server:  ")));
+    controlSizer->Add(Server = new wxComboBox(this, ID_SERVER, wxT(""), 
                                    wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
 
-    config->SetPath("/Servers");
+    config->SetPath(wxT("/Servers"));
     bCont = config->GetFirstGroup(str, dummy);
     while ( bCont ) {
       Server->Append(str);
@@ -1142,19 +1142,19 @@ DialDialog::DialDialog(wxWindow *parent,
     }
 
     /* Remove */
-    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, "Remove"));
+    controlSizer->Add(Remove = new wxButton(this, ID_REMOVE, wxT("Remove")));
 
     /* Extention */
-    controlSizer->Add(new wxStaticText(this, -1, "   Extension:  "));
-    controlSizer->Add(Extension = new wxTextCtrl(this, ID_EXTENSION, "", 
+    controlSizer->Add(new wxStaticText(this, -1, wxT("   Extension:  ")));
+    controlSizer->Add(Extension = new wxTextCtrl(this, ID_EXTENSION, wxT(""), 
                                       wxDefaultPosition, wxDefaultSize),0,wxEXPAND);
     /* Dial */
-    controlSizer->Add(new wxButton(this, ID_DIAL, "Dial"));
+    controlSizer->Add(new wxButton(this, ID_DIAL, wxT("Dial")));
 
     /* Done */
     controlSizer->Add( 20,16);
     controlSizer->Add(280,16);
-    controlSizer->Add(new wxButton(this, wxID_OK, "Done"));
+    controlSizer->Add(new wxButton(this, wxID_OK, wxT("Done")));
 
     dialogSizer->Add(controlSizer);
 
@@ -1165,34 +1165,34 @@ DialDialog::DialDialog(wxWindow *parent,
 
 void DialDialog::OnComboBox(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString val;
     wxString KeyPath;
 
     // Update the Server/Extension boxes
-    KeyPath = "/Speed Dials/" + SpeedDial->GetStringSelection();
+    KeyPath = wxT("/Speed Dials/") + SpeedDial->GetStringSelection();
     config->SetPath(KeyPath);
 
-    Server->SetValue(config->Read("Server", ""));
-    Extension->SetValue(config->Read("Extension", ""));
+    Server->SetValue(config->Read(wxT("Server"), wxT("")));
+    Extension->SetValue(config->Read(wxT("Extension"), wxT("")));
 }
 
 void DialDialog::OnButton(wxCommandEvent &event)
 {
-    wxConfig *config = new wxConfig("iaxPhone");
+    wxConfig *config = new wxConfig(wxT("iaxPhone"));
     wxString KeyPath;
     wxString SpeedDialVal;
 
     SpeedDialVal = SpeedDial->GetValue();
 
-    KeyPath = "/Speed Dials/" + SpeedDialVal;
+    KeyPath = wxT("/Speed Dials/") + SpeedDialVal;
     config->SetPath(KeyPath);
 
     switch(event.GetId())
     {
       case ID_ADD:
-           config->Write("Server",    Server->GetValue());
-           config->Write("Extension", Extension->GetValue());
+           config->Write(wxT("Server"),    Server->GetValue());
+           config->Write(wxT("Extension"), Extension->GetValue());
 
            if(SpeedDial->FindString(SpeedDialVal) < 0) {
              SpeedDial->Append(SpeedDialVal);
@@ -1203,7 +1203,7 @@ void DialDialog::OnButton(wxCommandEvent
            config->DeleteGroup(KeyPath);
            // Remove it from the combobox, as well
            SpeedDial->Delete(SpeedDial->FindString(SpeedDialVal));
-           Server->SetValue("");
+           Server->SetValue(wxT(""));
            Extension->Clear();
            break;
 
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h.BAD iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h.BAD	2008-06-10 12:03:28.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.h	2008-06-10 12:53:42.000000000 -0400
@@ -220,10 +220,10 @@ class IAXFrame : public wxFrame
 
             ~IAXFrame();
 
-            void OnDTMF(wxEvent &evt);
-            void OnDial(wxEvent &evt);
-            void OnHangup(wxEvent &evt);
-            void OnQuit(wxEvent &evt);
+            void OnDTMF(wxCommandEvent &evt);
+            void OnDial(wxCommandEvent &evt);
+            void OnHangup(wxCommandEvent &evt);
+            void OnQuit(wxCommandEvent &evt);
             void OnPTTChange(wxCommandEvent &evt);
             void OnSilenceChange(wxCommandEvent &evt);
             void OnNotify(void);
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.BAD iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc
--- iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc.BAD	2008-06-10 13:05:01.000000000 -0400
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/frame.cc	2008-06-10 13:05:07.000000000 -0400
@@ -425,7 +425,7 @@ void MyFrame::ShowDirectoryControls()
     config->SetPath(_T("/OT"));
     bCont = config->GetFirstGroup(OTName, dummy);
     while ( bCont ) {
-#if defined(__UNICODE__)
+#if defined(wxUSE_UNICODE)
         ot = ((wxButton *)((*aPanel).FindWindow(wxXmlResource::GetXRCID(OTName))));
 #else
         ot = XRCCTRL(*aPanel, OTName, wxButton);


--- NEW FILE iaxclient.spec ---
%define betaver beta3
%define tclver 0.2
%define mainver 2.1
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%ifarch sparcv9
%define tkphonearch sparc
%else
%define tkphonearch %{_arch}
%endif

Name:		iaxclient
Version:	%{mainver}
Release:	0.3.%{betaver}%{?dist}
Summary:	Library for creating telephony solutions that interoperate with Asterisk
Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://iaxclient.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/iaxclient/%{name}-%{version}%{betaver}.tar.gz
Source1:	tkiaxphone.desktop
Source2:	wxiax.desktop
Source3:	phone.png
Source4:	run-tkiaxphone.sh
Patch0:		iaxclient-2.1beta3-wxGTK28.patch
Patch1:		iaxclient-2.1beta3-tkphone-cleanups.patch
Patch2:		iaxclient-2.1beta3-tcl-includedir.patch
Patch3:		iaxclient-2.1beta3-tcl-libdir.patch
Patch4:		iaxclient-2.1beta3-tcl-nodoc.patch
Patch5:		iaxclient-2.1beta3-theora-detection.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	speex-devel, libtheora-devel, gsm-devel, portaudio-devel, iax-devel
BuildRequires:	tk-devel, gtk2-devel, SDL-devel, libogg-devel, liboggz-devel 
BuildRequires:	wxGTK-devel, libvidcap-devel, desktop-file-utils

%description
Iaxclient is an open source, multiplatform library for creating telephony 
solutions that interoperate with Asterisk, the Open Source PBX.

Although asterisk supports other VOIP protocols (including SIP, and with 
patches, H.323), IAX's simple, lightweight nature gives it several advantages, 
particularly in that it can operate easily through NAT and packet firewalls, 
and it is easily extensible and simple to understand.
Iaxclient pulls together the wide array of open source technologies required 
for telephony applications.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	pkgconfig
Requires:	%{name} = %{mainver}-%{release}

%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package -n tcl-iaxclient
Summary:	Tcl interface to iax2 client lib
Version:	%{tclver}
Group:		System Environment/Libraries
License:	BSD
Requires:	tcl(abi) = 8.5
Requires:	%{name} = %{mainver}-%{release}

%description -n tcl-iaxclient
Tcl extensions to iaxclient libraries.

%package -n tkiaxphone
Summary:	Tk IAX Phone Client
Version:	%{mainver}
Group:		Applications/Internet
License:	LGPLv2+
Requires:	tcl(abi) = 8.5
Requires:	%{name} = %{mainver}-%{release}

%description -n tkiaxphone
Tk IAX Phone Client.

%package -n wxiax
Summary:	wx IAX Phone Client
Version:	%{mainver}
Group:		Applications/Internet
License:	LGPLv2+
Requires:	%{name} = %{mainver}-%{release}

%description -n wxiax
wx IAX Phone Client.

%prep
%setup -q -n %{name}-%{mainver}%{betaver}
%patch0 -p1 -b .wxGTK28
%patch1 -p1 -b .tkphone
%patch2 -p1 -b .includedir
%patch3 -p1 -b .libdir
%patch4 -p1 -b .nodoc
%patch5 -p1 -b .theoradetect
chmod -x contrib/tcl/README.txt

sed -i 's|/usr/lib|%{_libdir}|g' lib/libiax2/iax-config.in

%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
cd contrib/tcl/
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/iaxclient %{buildroot}%{tcl_sitearch}/
cd contrib/tcl
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_libdir}/tcliaxclient0.2 %{buildroot}%{tcl_sitearch}/tcliaxclient0.2
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/phone.ui.tcl
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/pref.ui.tcl
install -p %{SOURCE4} %{buildroot}%{_bindir}

mkdir %{buildroot}%{_datadir}/pixmaps/
install -p %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/tkiaxphone.png
install -p %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/wxiax.png

mkdir %{buildroot}%{_datadir}/applications/

desktop-file-install --vendor ""			\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE1}

desktop-file-install --vendor ""			\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	%{SOURCE2}	

cd %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/
ln -s iaxcli iaxcli-Linux-%{tkphonearch}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB ChangeLog README
%{_bindir}/iaxcomm
%{_bindir}/iaxphone
%{_datadir}/iaxcomm/
%{_libdir}/libiaxclient.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/stresstest
%{_bindir}/testcall
%{_bindir}/vtestcall
%{_includedir}/iaxclient.h
%{_libdir}/libiaxclient.so
%{_libdir}/pkgconfig/iaxclient.pc

%files -n tcl-iaxclient
%defattr(-,root,root,-)
%doc contrib/tcl/README.txt
%{tcl_sitearch}/tcliaxclient0.2/

%files -n tkiaxphone
%defattr(-,root,root,-)
%{_bindir}/run-tkiaxphone.sh
%{_bindir}/tkiaxphone
%{tcl_sitearch}/iaxclient/
%{_datadir}/applications/tkiaxphone.desktop
%{_datadir}/pixmaps/tkiaxphone.png

%files -n wxiax
%defattr(-,root,root,-)
%{_bindir}/wxiax
%{_datadir}/applications/wxiax.desktop
%{_datadir}/pixmaps/wxiax.png

%changelog
* Thu Mar 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.3.beta3
- fix lib/libiax2/iax-config.in to not use wrong /usr/lib

* Mon Nov  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.2.beta3
- fix theora detection

* Tue Jun 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-0.1.beta3
- Initial package for Fedora



--- NEW FILE run-tkiaxphone.sh ---
#!/bin/bash
export IAXPHONEHOME=/usr/lib64/tcl8.5/iaxclient/tkphone 
exec /usr/bin/tkiaxphone


--- NEW FILE tkiaxphone.desktop ---

[Desktop Entry]
Encoding=UTF-8
Name=Tkphone
GenericName=Tk IAX Phone Client
Exec=/usr/bin/run-tkiaxphone.sh
Icon=tkiaxphone
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;Telephony;


--- NEW FILE wxiax.desktop ---

[Desktop Entry]
Encoding=UTF-8
Name=wxiax
GenericName=wx IAX Phone Client
Exec=/usr/bin/wxiax
Icon=wxiax
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;Telephony;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iaxclient/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Apr 2009 21:07:03 -0000	1.1
+++ sources	6 Apr 2009 21:17:29 -0000	1.2
@@ -0,0 +1 @@
+47d54b9d5d48dc6aa1f6d7e506c72ba7  iaxclient-2.1beta3.tar.gz



From thias at fedoraproject.org  Mon Apr  6 21:19:15 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 21:19:15 +0000 (UTC)
Subject: rpms/pigment/devel .cvsignore, 1.14, 1.15 pigment.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <20090406211915.C4C05700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pigment/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10706

Modified Files:
	.cvsignore pigment.spec sources 
Log Message:
Update to 0.3.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	24 Mar 2009 09:46:43 -0000	1.14
+++ .cvsignore	6 Apr 2009 21:18:45 -0000	1.15
@@ -1 +1 @@
-pigment-0.3.15.tar.bz2
+pigment-0.3.16.tar.bz2


Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pigment.spec	24 Mar 2009 09:46:43 -0000	1.21
+++ pigment.spec	6 Apr 2009 21:18:45 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Media Center Toolkit
 Name: pigment
-Version: 0.3.15
+Version: 0.3.16
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
@@ -44,12 +44,11 @@
 
 %prep
 %setup -q
-# Required to get 0.3.6 working. Some lib64 problems. Still as of 0.3.14.
-libtoolize --copy --force
-aclocal -I common/m4
-autoheader
-automake
-autoconf
+# Get our version of libtool back into place...
+%{__rm} -f common/m4/{libtool.m4,lt*.m4}
+%{__cp} -a /usr/share/aclocal/{libtool.m4,ltdl.m4} common/m4/
+# Required to get 0.3.6 working. Some lib64 problems. Still as of 0.3.16.
+autoreconf --install --force -I common/m4 -Wno-portability
 
 
 %build
@@ -102,6 +101,10 @@
 
 
 %changelog
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 0.3.16-1
+- Update to 0.3.16.
+- Replace libtool m4 files with our own to get autoreconf working.
+
 * Tue Mar 24 2009 Matthias Saou <http://freshrpms.net/> 0.3.15-1
 - Update to 0.3.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	24 Mar 2009 09:46:43 -0000	1.14
+++ sources	6 Apr 2009 21:18:45 -0000	1.15
@@ -1 +1 @@
-21171b424f440f77e0fd0162ee7aca18  pigment-0.3.15.tar.bz2
+63af7cf55c30673c4fea19239197bbfb  pigment-0.3.16.tar.bz2



From orion at fedoraproject.org  Mon Apr  6 21:19:43 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  6 Apr 2009 21:19:43 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine-6.2u2_1-ppc.patch, NONE,
	1.1 gridengine.spec, 1.15, 1.16
Message-ID: <20090406211943.5D3A7700FB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10946

Modified Files:
	gridengine.spec 
Added Files:
	gridengine-6.2u2_1-ppc.patch 
Log Message:
Add patch to compile with correct libs on ppc/ppc64


gridengine-6.2u2_1-ppc.patch:

--- NEW FILE gridengine-6.2u2_1-ppc.patch ---
--- gridengine/source/aimk.ppc	2009-03-25 14:13:48.000000000 -0600
+++ gridengine/source/aimk	2009-04-06 15:14:27.000000000 -0600
@@ -2013,7 +2013,7 @@
       set LFLAGS = "-L $MYILIB"
       echo "Using $MYILIB path for i18n support"
    else
-      if ( $BUILDARCH == "SOLARIS" || $BUILDARCH == "SOLARIS64" || $BUILDARCH == "SOLARIS86" || $BUILDARCH == "SOLARISAMD64" || $BUILDARCH == "LINUX86" || $BUILDARCH == LINUXIA64 || $BUILDARCH == LINUXAMD64) then
+      if ( $BUILDARCH == "SOLARIS" || $BUILDARCH == "SOLARIS64" || $BUILDARCH == "SOLARIS86" || $BUILDARCH == "SOLARISAMD64" || $BUILDARCH == "LINUX86" || $BUILDARCH == LINUXIA64 || $BUILDARCH == LINUXAMD64 || $BUILDARCH == LINUXPPC || $BUILDARCH == LINUXPPC64) then
          set LIBINTL = ""
          set HFLAGS = ""
       else


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gridengine.spec	6 Apr 2009 19:10:37 -0000	1.15
+++ gridengine.spec	6 Apr 2009 21:19:13 -0000	1.16
@@ -53,6 +53,9 @@
 # Rename getline() to sge_getline()
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2980
 Patch9: gridengine-6.2u2_1-getline.patch
+# Linux ppc build issue
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2981
+Patch10: gridengine-6.2u2_1-ppc.patch
 # Support lesstif - http://gridengine.sunsource.net/issues/show_bug.cgi?id=2310
 Patch15: gridengine-6.2beta2-lesstif.patch
 # Make inst_sge exit with status 1 if usage is incorrect
@@ -173,6 +176,7 @@
 %patch7 -p1 -b .Werror
 %patch8 -p1 -b .import
 %patch9 -p1 -b .getline
+%patch10 -p1 -b .ppc
 %if !0%{?rhel}
 %patch15 -p1 -b .lesstif
 %endif
@@ -543,6 +547,8 @@
 * Mon Apr 6 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u2_1-1
 - Update to 6.2u2_1
 - Rebase several patches
+- Add patch to rename getline()
+- Add patch to compile with correct libs on ppc/ppc64
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2u1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From pkgdb at fedoraproject.org  Mon Apr  6 21:21:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:21:46 +0000
Subject: [pkgdb] libmatchbox: cwickert has requested watchcommits
Message-ID: <20090406212124.EEBAB208555@bastion.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on libmatchbox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 21:22:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:22:47 +0000
Subject: [pkgdb] libmatchbox: cwickert has requested commit
Message-ID: <20090406212227.35C04208608@bastion.fedora.phx.redhat.com>

cwickert has requested the commit acl on libmatchbox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 21:22:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:22:53 +0000
Subject: [pkgdb] libmatchbox: cwickert has requested watchbugzilla
Message-ID: <20090406212233.10103208553@bastion.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on libmatchbox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 21:22:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:22:35 +0000
Subject: [pkgdb] libmatchbox: cwickert has requested approveacls
Message-ID: <20090406212235.7DDD4208557@bastion.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on libmatchbox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From thias at fedoraproject.org  Mon Apr  6 21:22:22 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 21:22:22 +0000 (UTC)
Subject: rpms/pigment-python/devel .cvsignore, 1.9, 1.10 pigment-python.spec,
	1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20090406212222.09C68700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pigment-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11407

Modified Files:
	.cvsignore pigment-python.spec sources 
Log Message:
Update to 0.3.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pigment-python/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Feb 2009 18:42:43 -0000	1.9
+++ .cvsignore	6 Apr 2009 21:21:51 -0000	1.10
@@ -1 +1 @@
-pigment-python-0.3.10.tar.bz2
+pigment-python-0.3.11.tar.bz2


Index: pigment-python.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment-python/devel/pigment-python.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pigment-python.spec	27 Feb 2009 00:24:24 -0000	1.13
+++ pigment-python.spec	6 Apr 2009 21:21:51 -0000	1.14
@@ -3,8 +3,8 @@
 
 Summary: Python bindings to the Pigment Media Center Toolkit
 Name: pigment-python
-Version: 0.3.10
-Release: 3%{?dist}
+Version: 0.3.11
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
@@ -12,9 +12,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gstreamer-python
 Requires: pygtk2
-Requires: pigment >= 0.3.14
+Requires: pigment >= 0.3.16
 BuildRequires: glib2-devel
-BuildRequires: pigment-devel >= 0.3.14
+BuildRequires: pigment-devel >= 0.3.16
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: gstreamer-devel
@@ -66,7 +66,11 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.10-3
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 0.3.11-1
+- Update to 0.3.11.
+- Update minimum pigment requirement to 0.3.16.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Feb  8 2009 Matthias Saou <http://freshrpms.net/> 0.3.10-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pigment-python/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Feb 2009 18:42:43 -0000	1.9
+++ sources	6 Apr 2009 21:21:51 -0000	1.10
@@ -1 +1 @@
-691b704fab0ac93fcd13944975decfdf  pigment-python-0.3.10.tar.bz2
+a7853556b1b0b38c757defef2eb8e466  pigment-python-0.3.11.tar.bz2



From overholt at fedoraproject.org  Mon Apr  6 21:26:35 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon,  6 Apr 2009 21:26:35 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse-swt-buildagainstxulrunner.patch, 1.1,
	1.2 eclipse.spec, 1.627, 1.628
Message-ID: <20090406212635.88EE9700FB@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11904

Modified Files:
	eclipse-swt-buildagainstxulrunner.patch eclipse.spec 
Log Message:
* Mon Apr 6 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-9
- Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
- RHBZ#484453
- Eclipse.org BZ#226356

eclipse-swt-buildagainstxulrunner.patch:

Index: eclipse-swt-buildagainstxulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse-swt-buildagainstxulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-swt-buildagainstxulrunner.patch	16 Mar 2009 18:14:14 -0000	1.1
+++ eclipse-swt-buildagainstxulrunner.patch	6 Apr 2009 21:26:05 -0000	1.2
@@ -3,13 +3,23 @@
 Index: Eclipse SWT PI/gtk/library/build.sh
 ===================================================================
 RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
-retrieving revision 1.50
-diff -u -r1.50 build.sh
---- Eclipse SWT PI/gtk/library/build.sh	23 Jan 2009 23:22:21 -0000	1.50
-+++ Eclipse SWT PI/gtk/library/build.sh	5 Mar 2009 20:41:43 -0000
-@@ -107,11 +107,11 @@
+retrieving revision 1.48
+diff -u -r1.48 build.sh
+--- Eclipse SWT PI/gtk/library/build.sh	5 Jun 2008 17:31:51 -0000	1.48
++++ Eclipse SWT PI/gtk/library/build.sh	6 Apr 2009 21:11:22 -0000
+@@ -96,19 +96,19 @@
+ 		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+ 		export MOZILLA_INCLUDES
  		export MOZILLA_LIBS
- 		MAKE_MOZILLA=make_mozilla
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
+ 	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
+ 		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
+ 		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
+ 		export MOZILLA_INCLUDES
+ 		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
  	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
 -		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
 -		MOZILLA_LIBS=`pkg-config --libs libxul`
@@ -17,10 +27,10 @@
 -		export MOZILLA_LIBS
 -		MAKE_MOZILLA=make_mozilla
 +		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-+		XULRUNNER_LIBS=`pkg-config --libs libxul`
++		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
 +		export XULRUNNER_INCLUDES
 +		export XULRUNNER_LIBS
-+		MAKE_MOZILLA=make_xulrunner
++		MAKE_MOZILLA="make_xulrunner make_xpcominit"
  	else
  		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
  		echo "    *** Mozilla embedding support will not be compiled."


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- eclipse.spec	6 Apr 2009 18:31:46 -0000	1.627
+++ eclipse.spec	6 Apr 2009 21:26:05 -0000	1.628
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -149,7 +149,11 @@
 
 # Since we're building against XULRunner, build using XR flags
 # https://bugs.eclipse.org/226356
-# https://bugzilla.redhat.com/show_bug.cgi?id=484453
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
+# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
+# it should perhaps be -lxpcomglue.  This patch uses that instead but will
+# be replaced with the former when libxul.pc is fixed.
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
 Patch45:        %{name}-swt-buildagainstxulrunner.patch
 # Work with changed interface in XULRunner 1.9.1
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
@@ -356,9 +360,9 @@
 #%patch40
 #popd
 
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch45 -p3
-#popd
+pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+%patch45 -p3
+popd
 pushd plugins/org.eclipse.swt
 %patch46
 popd
@@ -1487,6 +1491,11 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 6 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-9
+- Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
+- RHBZ#484453
+- Eclipse.org BZ#226356
+
 * Mon Apr 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-8
 - Fix jdt owning dropins/jdt folder.
 



From pkgdb at fedoraproject.org  Mon Apr  6 21:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:28:11 +0000
Subject: [pkgdb] matchbox-window-manager: cwickert has requested
	watchbugzilla
Message-ID: <20090406212750.E1695208553@bastion.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on matchbox-window-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:28:11 +0000
Subject: [pkgdb] matchbox-window-manager: cwickert has requested watchcommits
Message-ID: <20090406212751.A4F16208557@bastion.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on matchbox-window-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:28:16 +0000
Subject: [pkgdb] matchbox-window-manager: cwickert has requested commit
Message-ID: <20090406212754.95BF9208603@bastion.fedora.phx.redhat.com>

cwickert has requested the commit acl on matchbox-window-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:27:34 +0000
Subject: [pkgdb] matchbox-window-manager: cwickert has requested approveacls
Message-ID: <20090406212756.CE7B2208608@bastion.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on matchbox-window-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:28:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:28:48 +0000
Subject: [pkgdb] matchbox-window-manager had acl change status
Message-ID: <20090406212911.2CA56208553@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on matchbox-window-manager (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:29:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:29:34 +0000
Subject: [pkgdb] matchbox-window-manager had acl change status
Message-ID: <20090406212913.5896E208602@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on matchbox-window-manager (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:29:39 +0000
Subject: [pkgdb] matchbox-window-manager had acl change status
Message-ID: <20090406212919.16C6B208605@bastion.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on matchbox-window-manager (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:28:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:28:53 +0000
Subject: [pkgdb] matchbox-window-manager had acl change status
Message-ID: <20090406212915.BDB90208604@bastion.fedora.phx.redhat.com>

pbrobinson has set the commit acl on matchbox-window-manager (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/matchbox-window-manager



From pkgdb at fedoraproject.org  Mon Apr  6 21:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:30:07 +0000
Subject: [pkgdb] libmatchbox had acl change status
Message-ID: <20090406212946.7FEC4208556@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on libmatchbox (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 21:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:29:26 +0000
Subject: [pkgdb] libmatchbox had acl change status
Message-ID: <20090406212949.16D59208603@bastion.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on libmatchbox (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 21:30:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:30:10 +0000
Subject: [pkgdb] libmatchbox had acl change status
Message-ID: <20090406212950.3A111208704@bastion.fedora.phx.redhat.com>

pbrobinson has set the commit acl on libmatchbox (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From pkgdb at fedoraproject.org  Mon Apr  6 21:30:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 21:30:13 +0000
Subject: [pkgdb] libmatchbox had acl change status
Message-ID: <20090406212952.83F89208608@bastion.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on libmatchbox (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmatchbox



From hadess at fedoraproject.org  Mon Apr  6 21:35:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  6 Apr 2009 21:35:47 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.6, 1.7 obexd.spec, 1.6, 1.7 sources, 
	1.6, 1.7
Message-ID: <20090406213547.98112700FB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12774

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10-1
- Update to 0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Mar 2009 11:51:10 -0000	1.6
+++ .cvsignore	6 Apr 2009 21:35:17 -0000	1.7
@@ -1 +1 @@
-obexd-0.9.tar.gz
+obexd-0.10.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- obexd.spec	15 Mar 2009 11:51:10 -0000	1.6
+++ obexd.spec	6 Apr 2009 21:35:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		obexd
-Version:	0.9
+Version:	0.10
 Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
@@ -43,6 +43,9 @@
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10-1
+- Update to 0.10
+
 * Sun Mar 15 2009 - Bastien Nocera <bnocera at redhat.com> - 0.9-1
 - Udpate to 0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Mar 2009 11:51:10 -0000	1.6
+++ sources	6 Apr 2009 21:35:17 -0000	1.7
@@ -1 +1 @@
-0048546c5140109d7b9e79ac2ef28d74  obexd-0.9.tar.gz
+b9fbc1386b24f59b36aeb9d764c11fb5  obexd-0.10.tar.gz



From ixs at fedoraproject.org  Mon Apr  6 21:38:07 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Mon,  6 Apr 2009 21:38:07 +0000 (UTC)
Subject: rpms/commoncpp2/EL-5 .cvsignore, 1.5, 1.6 commoncpp2.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090406213807.2DE73700FB@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/commoncpp2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13100

Modified Files:
	.cvsignore commoncpp2.spec sources 
Log Message:
* Mon Apr 06 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.3-1
- Updated to new upstream version 1.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2006 00:20:38 -0000	1.5
+++ .cvsignore	6 Apr 2009 21:37:36 -0000	1.6
@@ -1 +1 @@
-commoncpp2-1.5.0.tar.gz
+commoncpp2-1.7.3.tar.gz


Index: commoncpp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/EL-5/commoncpp2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- commoncpp2.spec	10 Nov 2006 00:07:45 -0000	1.4
+++ commoncpp2.spec	6 Apr 2009 21:37:36 -0000	1.5
@@ -1,12 +1,12 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.5.0
+Version: 1.7.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+ with exceptions
 Group: System Environment/Libraries
-Source0: http://download.sourceforge.net/gnutelephony/commoncpp2-%{version}.tar.gz
-Patch0: commoncpp2-ldconfig.patch
+Source0: http://www.gnutelephony.org/dist/tarballs/commoncpp2-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
+Patch0: commoncpp2-1.7.3-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel, zlib-devel, doxygen
 
@@ -33,13 +33,13 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ldconfig
+%patch0 -p1
 
 %build
 %configure \
 	--disable-static \
 	--disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} #%%{?_smp_mflags} smp building disabled
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +80,19 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
+* Mon Apr 06 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.3-1
+- Updated to new upstream version 1.7.3
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.1-2
+- fix license tag
+
+* Wed Feb 06 2008 Andreas Thienemann <andreas at bawue.net> - 1.6.1-1
+- Updated to new upstream version 1.6.1
+- Reverted the ld-check patch as it's no longer needed
+
 * Fri Nov 10 2006 Andreas Thienemann <andreas at bawue.net> - 1.5.0-1
 - Updated package to 1.5.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2006 00:20:38 -0000	1.5
+++ sources	6 Apr 2009 21:37:36 -0000	1.6
@@ -1 +1 @@
-c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz
+ca741179a728d264eb276ae471ebaf70  commoncpp2-1.7.3.tar.gz



From roma at fedoraproject.org  Mon Apr  6 21:41:31 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Mon,  6 Apr 2009 21:41:31 +0000 (UTC)
Subject: rpms/memtest86+/devel .cvsignore, 1.19, 1.20 import.log, 1.3,
	1.4 memtest86+.spec, 1.43, 1.44 sources, 1.19,
	1.20 memtest-setup, 1.3, NONE new-memtest-pkg, 1.1, NONE
Message-ID: <20090406214131.071AA700FB@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13597/devel

Modified Files:
	.cvsignore import.log memtest86+.spec sources 
Removed Files:
	memtest-setup new-memtest-pkg 
Log Message:
Building the elf and the bin versions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	28 Feb 2009 00:21:49 -0000	1.19
+++ .cvsignore	6 Apr 2009 21:41:00 -0000	1.20
@@ -1 +1,2 @@
 memtest86+-2.11.tar.gz
+temp.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Apr 2009 13:34:30 -0000	1.3
+++ import.log	6 Apr 2009 21:41:00 -0000	1.4
@@ -1,3 +1,4 @@
 memtest86+-2_11-4_fc10:HEAD:memtest86+-2.11-4.fc10.src.rpm:1236973348
 memtest86+-2_11-5_fc10:HEAD:memtest86+-2.11-5.fc10.src.rpm:1238510694
 memtest86+-2_11-6_fc10:HEAD:memtest86+-2.11-6.fc10.src.rpm:1238679177
+memtest86+-2_11-7_fc10:HEAD:memtest86+-2.11-7.fc10.src.rpm:1239054010


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- memtest86+.spec	2 Apr 2009 13:34:30 -0000	1.43
+++ memtest86+.spec	6 Apr 2009 21:41:00 -0000	1.44
@@ -1,29 +1,25 @@
+%bcond_with update_grub
+
 # Prevent stripping
 %define __spec_install_post /usr/lib/rpm/brp-compress
 # Turn off debuginfo package
 %define debug_package %{nil}
-%bcond_with update_grub
 
-Summary: Stand-alone memory tester for x86 and x86-64 computers
-Name: memtest86+
-Version: 2.11
-Release: 6%{?dist}
-License: GPLv2
-ExclusiveArch: %{ix86} x86_64
-Group: System Environment/Base
-Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-URL: http://www.memtest.org
-Source1: new-memtest-pkg
-Source2: memtest-setup
+Name:     memtest86+
+Version:  2.11
+Release:  7%{?dist}
+License:  GPLv2
+Summary:  Stand-alone memory tester for x86 and x86-64 computers
+Group:    System Environment/Base
+Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
+Source1:  temp.tar.gz
+URL:      http://www.memtest.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby sed
-%if %{with update_grub}
-Requires(preun): coreutils
-Requires(post): coreutils
-%endif
+Requires: /sbin/grubby sed coreutils
+ExclusiveArch: %{ix86} x86_64
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -31,23 +27,24 @@
 check and often miss many of the failures that are detected by 
 Memtest86+.
 
-This version avoids the following errors when booting from grub:
+The ELF version should be used for booting from grub,
+and avoids the following errors:
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
 
-Please, run '/usr/sbin/memtest-setup' as root to add 
-the memtest86+ entry to your GRUB or lilo boot menu.
+The script '%{_sbindir}/memtest-setup' can be run (as root)
+to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q
+%setup -q -a 1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
 # Regular build flags not wanted for this binary
 # Note: i486 minimum runtime arch
-make CC=gcc34
 # It makes no sense to use smp flags here.
+make CC=gcc34
 
 %install
 rm -rf %{buildroot}
@@ -55,17 +52,21 @@
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_sbindir}
 
-# install the ELF version, not the floppy (memtest.bin) one.
-install -m644 memtest %{buildroot}/boot/%{name}-%{version}
-install -m755 %{SOURCE1} %{buildroot}/sbin/new-memtest-pkg
-install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
+# the ELF (memtest) version.
+install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+
+# the floppy (memtest.bin) version.
+install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
+
+install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
+install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -76,10 +77,17 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
+/boot/%{name}-elf-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
+
 %changelog
+
+* Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
+- adapted the spec file for building the elf and 
+  the bin versions #494157
+
 * Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
 - grub.conf will not be updated by default. The user
   will have to add and/or remove memtest86+ entries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	28 Feb 2009 00:21:49 -0000	1.19
+++ sources	6 Apr 2009 21:41:00 -0000	1.20
@@ -1 +1,2 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+518763b187bb85249120d06dfebd1235  temp.tar.gz


--- memtest-setup DELETED ---


--- new-memtest-pkg DELETED ---



From pbrobinson at fedoraproject.org  Mon Apr  6 21:42:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  6 Apr 2009 21:42:26 +0000 (UTC)
Subject: rpms/xapian-core/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xapian-core.spec, 1.20, 1.21
Message-ID: <20090406214226.8D2BF700FB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13888

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Nov 2008 15:59:29 -0000	1.9
+++ .cvsignore	6 Apr 2009 21:41:56 -0000	1.10
@@ -1 +1 @@
-xapian-core-1.0.9.tar.gz
+xapian-core-1.0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Nov 2008 15:59:30 -0000	1.9
+++ sources	6 Apr 2009 21:41:56 -0000	1.10
@@ -1 +1 @@
-f9e6798b45fab2af90273f73570df5cc  xapian-core-1.0.9.tar.gz
+f80a2f51b109e2a065bdcbf1ba03b808  xapian-core-1.0.11.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xapian-core.spec	4 Mar 2009 13:16:29 -0000	1.20
+++ xapian-core.spec	6 Apr 2009 21:41:56 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.9
-Release: 4%{?dist}
+Version: 1.0.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
 URL: http://www.xapian.org/
@@ -43,7 +43,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .multilibfix
-%patch1 -p1 -b .includes
+#%patch1 -p1 -b .includes
 
 %build
 # FC6 (at least) has a patched libtool which knows not to set rpath for
@@ -122,6 +122,9 @@
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Mon Apr 06 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.11-1
+- Update to 1.0.11
+
 * Wed Mar 04 2009 Caol??n McNamara <caolanm at redhat.com> - 1.0.9-4
 - include stdio.h for rename, fix bare #elif, EOF -> -1 for getopt
 



From pbrobinson at fedoraproject.org  Mon Apr  6 21:46:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  6 Apr 2009 21:46:06 +0000 (UTC)
Subject: rpms/xapian-bindings/devel .cvsignore, 1.7, 1.8 sources, 1.8,
	1.9 xapian-bindings.spec, 1.17, 1.18
Message-ID: <20090406214606.1B748700FB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14368

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Nov 2008 15:59:43 -0000	1.7
+++ .cvsignore	6 Apr 2009 21:45:35 -0000	1.8
@@ -1 +1 @@
-xapian-bindings-1.0.9.tar.gz
+xapian-bindings-1.0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2008 15:59:43 -0000	1.8
+++ sources	6 Apr 2009 21:45:35 -0000	1.9
@@ -1 +1 @@
-fa37abeb8927dde6b8f9655c893ebfac  xapian-bindings-1.0.9.tar.gz
+7297a1d09564fe31b768fe58eabd219d  xapian-bindings-1.0.11.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xapian-bindings.spec	26 Feb 2009 07:38:04 -0000	1.17
+++ xapian-bindings.spec	6 Apr 2009 21:45:35 -0000	1.18
@@ -4,8 +4,8 @@
 
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
-Version: 1.0.9
-Release: 3%{?dist}
+Version: 1.0.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://www.xapian.org/
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-1
+- Update to 1.0.11
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From thias at fedoraproject.org  Mon Apr  6 21:47:47 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 21:47:47 +0000 (UTC)
Subject: rpms/proftpd/devel .cvsignore, 1.12, 1.13 proftpd.spec, 1.44,
	1.45 sources, 1.12, 1.13
Message-ID: <20090406214747.4F446700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14691

Modified Files:
	.cvsignore proftpd.spec sources 
Log Message:
Update to 1.3.2 and include mod_wrap (#479813).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	2 Jan 2009 12:53:48 -0000	1.12
+++ .cvsignore	6 Apr 2009 21:47:16 -0000	1.13
@@ -1 +1 @@
-proftpd-1.3.2rc3.tar.bz2
+proftpd-1.3.2.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- proftpd.spec	27 Feb 2009 02:28:26 -0000	1.44
+++ proftpd.spec	6 Apr 2009 21:47:16 -0000	1.45
@@ -1,9 +1,9 @@
-%define prever rc3
+#define prever rc3
 
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 0.4%{?prever:.%{prever}}%{?dist}
+Release: 1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -23,7 +23,16 @@
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -84,7 +93,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -167,6 +176,7 @@
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -197,7 +207,12 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-0.4.rc3
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Caol??n McNamara 1.3.2-0.3.rc3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	2 Jan 2009 12:53:48 -0000	1.12
+++ sources	6 Apr 2009 21:47:16 -0000	1.13
@@ -1 +1 @@
-8ecfc2976aa6a5016bd4f4f6745aa3d4  proftpd-1.3.2rc3.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2



From krh at fedoraproject.org  Mon Apr  6 21:51:06 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon,  6 Apr 2009 21:51:06 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.19, 1.20 libdrm.spec, 1.69,
	1.70 sources, 1.19, 1.20
Message-ID: <20090406215106.BC848700FB@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15709

Modified Files:
	.cvsignore libdrm.spec sources 
Log Message:
* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com<> 2.4.5-4
- libdrm-radeon: API busting to latest upstream
- bump kernel requires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	24 Feb 2009 16:37:29 -0000	1.19
+++ .cvsignore	6 Apr 2009 21:50:36 -0000	1.20
@@ -1 +1 @@
-libdrm-2.4.5.tar.bz2
+libdrm-2.4.6.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- libdrm.spec	6 Apr 2009 05:41:36 -0000	1.69
+++ libdrm.spec	6 Apr 2009 21:50:36 -0000	1.70
@@ -2,8 +2,8 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.5
-Release: 4%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -27,14 +27,6 @@
 Patch4: libdrm-2.4.0-no-bc.patch
 # radeon libdrm patches from modesetting-gem branch of upstream
 Patch8: libdrm-radeon.patch
-# 2.4.5 didn't dist nouveau_private.h and nouveau_dma.h, so add them like this
-Patch9: nouveau-missing-headers.patch
-
-# nouveau fixes from drm.git
-Patch11: nouveau-updates.patch
-# intel gtt map fixes
-# http://lists.freedesktop.org/archives/intel-gfx/2009-March/001869.html
-Patch12: libdrm-intel-gtt.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -54,9 +46,6 @@
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch8 -p1 -b .radeon
-%patch9 -p1 -b .nouveau
-%patch11 -p1 -b .nouveau-updates
-%patch12 -p1 -b .intel-gtt
 
 %build
 autoreconf -v --install || exit 1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Feb 2009 16:37:29 -0000	1.19
+++ sources	6 Apr 2009 21:50:36 -0000	1.20
@@ -1 +1 @@
-0d09025f069ff1a986cf3339e51908b3  libdrm-2.4.5.tar.bz2
+77fb9621fbcc7a75599b656065c232a6  libdrm-2.4.6.tar.bz2



From krh at fedoraproject.org  Mon Apr  6 21:52:24 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon,  6 Apr 2009 21:52:24 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm.spec,1.70,1.71
Message-ID: <20090406215224.14CCC700FB@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15983

Modified Files:
	libdrm.spec 
Log Message:
* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-1
- Bump to 2.4.6



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- libdrm.spec	6 Apr 2009 21:50:36 -0000	1.70
+++ libdrm.spec	6 Apr 2009 21:51:53 -0000	1.71
@@ -105,6 +105,9 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-1
+- Bump to 2.4.6
+
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com<> 2.4.5-4
 - libdrm-radeon: API busting to latest upstream
 - bump kernel requires



From krh at fedoraproject.org  Mon Apr  6 21:53:28 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Mon,  6 Apr 2009 21:53:28 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm.spec,1.71,1.72
Message-ID: <20090406215328.DDF4F700FB@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16250

Modified Files:
	libdrm.spec 
Log Message:
* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-1
- Bump to 2.4.6



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- libdrm.spec	6 Apr 2009 21:51:53 -0000	1.71
+++ libdrm.spec	6 Apr 2009 21:52:58 -0000	1.72
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -105,7 +105,7 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
-* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-1
+* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-2
 - Bump to 2.4.6
 
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com<> 2.4.5-4



From thias at fedoraproject.org  Mon Apr  6 21:58:01 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 21:58:01 +0000 (UTC)
Subject: rpms/proftpd/F-10 .cvsignore, 1.11, 1.12 proftpd.spec, 1.42,
	1.43 sources, 1.11, 1.12 proftpd-1.3.1-csrf.patch, 1.1,
	NONE proftpd-1.3.1-tls_debug.patch, 1.1,
	NONE proftpd-1.3.1-tls_shutdown.patch, 1.1,
	NONE proftpd-1.3.1-tls_sighup.patch, 1.1, NONE
Message-ID: <20090406215801.21CE1700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16766/F-10

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.1-csrf.patch proftpd-1.3.1-tls_debug.patch 
	proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update to 1.3.2 and enable mod_wrap.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Oct 2007 17:37:01 -0000	1.11
+++ .cvsignore	6 Apr 2009 21:57:30 -0000	1.12
@@ -1 +1 @@
-proftpd-1.3.1.tar.bz2
+proftpd-1.3.2.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- proftpd.spec	2 Jan 2009 13:45:48 -0000	1.42
+++ proftpd.spec	6 Apr 2009 21:57:30 -0000	1.43
@@ -1,11 +1,13 @@
+#define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 8%{?dist}
+Version: 1.3.2
+Release: 1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -14,11 +16,6 @@
 Source6: proftpd.pam
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
-Patch0: proftpd-1.3.1-find-umode_t.patch
-Patch1: proftpd-1.3.1-csrf.patch
-Patch2: proftpd-1.3.1-tls_shutdown.patch
-Patch3: proftpd-1.3.1-tls_debug.patch
-Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -26,7 +23,16 @@
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -68,12 +74,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
-%patch1 -p1 -b .csrf
-%patch2 -p0 -b .tls_shutdown
-%patch3 -p1 -b .tls_debug.patch
-%patch4 -p0 -b .tls_sighup.patch
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -92,7 +93,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -168,12 +169,14 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -204,13 +207,27 @@
 
 
 %changelog
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caol??n McNamara 1.3.2-0.3.rc3
+- rebuild for dependencies
+
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more
   example configuration for them.
-- Include patches to fix TLS issues (#457280).
 
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
-- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
+- Update to 1.3.2rc3 (fixes security issue #464127)
+- Exclude new pkgconfig file, as we already exclude header files (if someone
+  ever needs to rebuild something against this proftpd, just ask and I'll split
+  out a devel package... but it seems pretty useless currently).
+- Remove no longer needed find-umode_t patch.
 
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Oct 2007 17:37:01 -0000	1.11
+++ sources	6 Apr 2009 21:57:30 -0000	1.12
@@ -1 +1 @@
-175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2


--- proftpd-1.3.1-csrf.patch DELETED ---


--- proftpd-1.3.1-tls_debug.patch DELETED ---


--- proftpd-1.3.1-tls_shutdown.patch DELETED ---


--- proftpd-1.3.1-tls_sighup.patch DELETED ---



From thias at fedoraproject.org  Mon Apr  6 21:58:00 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 21:58:00 +0000 (UTC)
Subject: rpms/proftpd/F-9 .cvsignore, 1.11, 1.12 proftpd.spec, 1.41,
	1.42 sources, 1.11, 1.12 proftpd-1.3.1-csrf.patch, 1.1,
	NONE proftpd-1.3.1-tls_debug.patch, 1.1,
	NONE proftpd-1.3.1-tls_shutdown.patch, 1.1,
	NONE proftpd-1.3.1-tls_sighup.patch, 1.1, NONE
Message-ID: <20090406215800.EB190700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16766/F-9

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.1-csrf.patch proftpd-1.3.1-tls_debug.patch 
	proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update to 1.3.2 and enable mod_wrap.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Oct 2007 17:37:01 -0000	1.11
+++ .cvsignore	6 Apr 2009 21:57:30 -0000	1.12
@@ -1 +1 @@
-proftpd-1.3.1.tar.bz2
+proftpd-1.3.2.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/proftpd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- proftpd.spec	2 Jan 2009 13:45:49 -0000	1.41
+++ proftpd.spec	6 Apr 2009 21:57:30 -0000	1.42
@@ -1,11 +1,13 @@
+#define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 8%{?dist}
+Version: 1.3.2
+Release: 1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -14,11 +16,6 @@
 Source6: proftpd.pam
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
-Patch0: proftpd-1.3.1-find-umode_t.patch
-Patch1: proftpd-1.3.1-csrf.patch
-Patch2: proftpd-1.3.1-tls_shutdown.patch
-Patch3: proftpd-1.3.1-tls_debug.patch
-Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -26,7 +23,16 @@
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -68,12 +74,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
-%patch1 -p1 -b .csrf
-%patch2 -p0 -b .tls_shutdown
-%patch3 -p1 -b .tls_debug.patch
-%patch4 -p0 -b .tls_sighup.patch
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -92,7 +93,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -168,12 +169,14 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -204,13 +207,27 @@
 
 
 %changelog
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caol??n McNamara 1.3.2-0.3.rc3
+- rebuild for dependencies
+
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more
   example configuration for them.
-- Include patches to fix TLS issues (#457280).
 
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
-- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
+- Update to 1.3.2rc3 (fixes security issue #464127)
+- Exclude new pkgconfig file, as we already exclude header files (if someone
+  ever needs to rebuild something against this proftpd, just ask and I'll split
+  out a devel package... but it seems pretty useless currently).
+- Remove no longer needed find-umode_t patch.
 
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Oct 2007 17:37:01 -0000	1.11
+++ sources	6 Apr 2009 21:57:30 -0000	1.12
@@ -1 +1 @@
-175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2


--- proftpd-1.3.1-csrf.patch DELETED ---


--- proftpd-1.3.1-tls_debug.patch DELETED ---


--- proftpd-1.3.1-tls_shutdown.patch DELETED ---


--- proftpd-1.3.1-tls_sighup.patch DELETED ---



From thias at fedoraproject.org  Mon Apr  6 22:06:50 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 22:06:50 +0000 (UTC)
Subject: rpms/proftpd/EL-4 .cvsignore, 1.7, 1.8 proftpd.spec, 1.11,
	1.12 sources, 1.7, 1.8 proftpd-1.3.1-csrf.patch, 1.1,
	NONE proftpd-1.3.1-tls_debug.patch, 1.1,
	NONE proftpd-1.3.1-tls_shutdown.patch, 1.1,
	NONE proftpd-1.3.1-tls_sighup.patch, 1.1, NONE
Message-ID: <20090406220650.E8DAB700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17894/EL-4

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.1-csrf.patch proftpd-1.3.1-tls_debug.patch 
	proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update to 1.3.2 and enable mod_wrap.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Feb 2008 18:02:39 -0000	1.7
+++ .cvsignore	6 Apr 2009 22:06:20 -0000	1.8
@@ -1 +1 @@
-proftpd-1.3.1.tar.bz2
+proftpd-1.3.2.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- proftpd.spec	2 Jan 2009 13:45:47 -0000	1.11
+++ proftpd.spec	6 Apr 2009 22:06:20 -0000	1.12
@@ -1,11 +1,13 @@
+#define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 8%{?dist}
+Version: 1.3.2
+Release: 1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -14,11 +16,6 @@
 Source6: proftpd.pam
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
-Patch0: proftpd-1.3.1-find-umode_t.patch
-Patch1: proftpd-1.3.1-csrf.patch
-Patch2: proftpd-1.3.1-tls_shutdown.patch
-Patch3: proftpd-1.3.1-tls_debug.patch
-Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -26,7 +23,16 @@
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -68,12 +74,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
-%patch1 -p1 -b .csrf
-%patch2 -p0 -b .tls_shutdown
-%patch3 -p1 -b .tls_debug.patch
-%patch4 -p0 -b .tls_sighup.patch
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -92,7 +93,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -168,12 +169,14 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -204,13 +207,27 @@
 
 
 %changelog
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caol??n McNamara 1.3.2-0.3.rc3
+- rebuild for dependencies
+
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more
   example configuration for them.
-- Include patches to fix TLS issues (#457280).
 
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
-- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
+- Update to 1.3.2rc3 (fixes security issue #464127)
+- Exclude new pkgconfig file, as we already exclude header files (if someone
+  ever needs to rebuild something against this proftpd, just ask and I'll split
+  out a devel package... but it seems pretty useless currently).
+- Remove no longer needed find-umode_t patch.
 
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Feb 2008 18:02:39 -0000	1.7
+++ sources	6 Apr 2009 22:06:20 -0000	1.8
@@ -1 +1 @@
-175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2


--- proftpd-1.3.1-csrf.patch DELETED ---


--- proftpd-1.3.1-tls_debug.patch DELETED ---


--- proftpd-1.3.1-tls_shutdown.patch DELETED ---


--- proftpd-1.3.1-tls_sighup.patch DELETED ---



From thias at fedoraproject.org  Mon Apr  6 22:06:51 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  6 Apr 2009 22:06:51 +0000 (UTC)
Subject: rpms/proftpd/EL-5 .cvsignore, 1.10, 1.11 proftpd.spec, 1.31,
	1.32 sources, 1.10, 1.11 proftpd-1.3.1-csrf.patch, 1.1,
	NONE proftpd-1.3.1-tls_debug.patch, 1.1,
	NONE proftpd-1.3.1-tls_shutdown.patch, 1.1,
	NONE proftpd-1.3.1-tls_sighup.patch, 1.1, NONE
Message-ID: <20090406220651.1DEBD700FB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17894/EL-5

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.1-csrf.patch proftpd-1.3.1-tls_debug.patch 
	proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update to 1.3.2 and enable mod_wrap.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Feb 2008 17:54:06 -0000	1.10
+++ .cvsignore	6 Apr 2009 22:06:20 -0000	1.11
@@ -1 +1 @@
-proftpd-1.3.1.tar.bz2
+proftpd-1.3.2.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- proftpd.spec	2 Jan 2009 13:45:48 -0000	1.31
+++ proftpd.spec	6 Apr 2009 22:06:20 -0000	1.32
@@ -1,11 +1,13 @@
+#define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 8%{?dist}
+Version: 1.3.2
+Release: 1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -14,11 +16,6 @@
 Source6: proftpd.pam
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
-Patch0: proftpd-1.3.1-find-umode_t.patch
-Patch1: proftpd-1.3.1-csrf.patch
-Patch2: proftpd-1.3.1-tls_shutdown.patch
-Patch3: proftpd-1.3.1-tls_debug.patch
-Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -26,7 +23,16 @@
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -68,12 +74,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
-%patch1 -p1 -b .csrf
-%patch2 -p0 -b .tls_shutdown
-%patch3 -p1 -b .tls_debug.patch
-%patch4 -p0 -b .tls_sighup.patch
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -92,7 +93,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -168,12 +169,14 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -204,13 +207,27 @@
 
 
 %changelog
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caol??n McNamara 1.3.2-0.3.rc3
+- rebuild for dependencies
+
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more
   example configuration for them.
-- Include patches to fix TLS issues (#457280).
 
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
-- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
+- Update to 1.3.2rc3 (fixes security issue #464127)
+- Exclude new pkgconfig file, as we already exclude header files (if someone
+  ever needs to rebuild something against this proftpd, just ask and I'll split
+  out a devel package... but it seems pretty useless currently).
+- Remove no longer needed find-umode_t patch.
 
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2008 17:54:06 -0000	1.10
+++ sources	6 Apr 2009 22:06:20 -0000	1.11
@@ -1 +1 @@
-175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2


--- proftpd-1.3.1-csrf.patch DELETED ---


--- proftpd-1.3.1-tls_debug.patch DELETED ---


--- proftpd-1.3.1-tls_shutdown.patch DELETED ---


--- proftpd-1.3.1-tls_sighup.patch DELETED ---



From bskeggs at fedoraproject.org  Mon Apr  6 22:26:23 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon,  6 Apr 2009 22:26:23 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.36, 1.37 kernel.spec, 1.1514, 
	1.1515
Message-ID: <20090406222623.54518700FB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22429

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Apr 06 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: rebase on drm-f11




drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- drm-nouveau.patch	6 Apr 2009 07:11:20 -0000	1.36
+++ drm-nouveau.patch	6 Apr 2009 22:26:21 -0000	1.37
@@ -103,7 +103,7 @@
  	if (mask & ~fence->type) {
  		DRM_ERROR("Wait trying to extend fence type"
 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index c1173d8..2e4e667 100644
+index 4984aa8..dee9b40 100644
 --- a/drivers/gpu/drm/drm_gem.c
 +++ b/drivers/gpu/drm/drm_gem.c
 @@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
@@ -424,7 +424,7 @@
 +}	
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..7165a60
+index 0000000..78a3733
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
 @@ -0,0 +1,4570 @@
@@ -2977,9 +2977,9 @@
 +		BIOS_USLEEP(ROM16(bios->data[bios->fp.xlated_entry + 7]));
 +#ifdef __powerpc__
 +	/* Powerbook specific quirks */
-+	if (script == LVDS_RESET && ((dev_priv->chipset & 0xffff) == 0x0179 || (dev_priv->chipset & 0xffff) == 0x0329))
++	if (script == LVDS_RESET && ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0329))
 +		nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
-+	if ((dev_priv->chipset & 0xffff) == 0x0179 || (dev_priv->chipset & 0xffff) == 0x0189 || (dev_priv->chipset & 0xffff) == 0x0329) {
++	if ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0189 || (dev->pci_device & 0xffff) == 0x0329) {
 +		if (script == LVDS_PANEL_ON) {
 +			bios_wr32(dev, NV_PBUS_DEBUG_DUALHEAD_CTL, bios_rd32(dev, NV_PBUS_DEBUG_DUALHEAD_CTL) | (1 << 31));
 +			bios_wr32(dev, NV_PCRTC_GPIO_EXT, bios_rd32(dev, NV_PCRTC_GPIO_EXT) | 1);
@@ -16687,7 +16687,7 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..47680b8
+index 0000000..ac03162
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
 @@ -0,0 +1,1044 @@
@@ -17336,7 +17336,7 @@
 +		int size, i;
 +		const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size);
 +		if (bios) {
-+			for(i=0;i<size;i+=4)
++			for (i = 0; i < size; i+=4)
 +				nv_out32(ramin, i, bios[i/4]);
 +			NV_INFO(dev, "OF bios successfully copied (%d bytes)\n",size);
 +		} else
@@ -23515,7 +23515,7 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c
 new file mode 100644
-index 0000000..aab3166
+index 0000000..7a21b70
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
 @@ -0,0 +1,594 @@
@@ -23927,7 +23927,7 @@
 +	}
 +
 +	if (connector->i2c_chan)
-+		edid = drm_get_edid(&connector->base, &connector->i2c_chan->adapter);
++		edid = drm_get_edid(drm_connector, &connector->i2c_chan->adapter);
 +	drm_mode_connector_update_edid_property(drm_connector, edid);
 +
 +	if (edid) {
@@ -49137,7 +49137,7 @@
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index b61b0c6..5b7ce2d 100644
+index 04fbd1e..f2a6bff 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1514
retrieving revision 1.1515
diff -u -r1.1514 -r1.1515
--- kernel.spec	6 Apr 2009 05:30:08 -0000	1.1514
+++ kernel.spec	6 Apr 2009 22:26:22 -0000	1.1515
@@ -1903,6 +1903,9 @@
 # and build.
 
 %changelog
+* Mon Apr 06 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: rebase on drm-f11
+
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com>
 - radeon: bust APIs and move to what we want in the end.
 



From robert at fedoraproject.org  Mon Apr  6 22:26:35 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon,  6 Apr 2009 22:26:35 +0000 (UTC)
Subject: rpms/gnumeric/devel .cvsignore, 1.7, 1.8 gnumeric.spec, 1.43,
	1.44 sources, 1.7, 1.8 gnumeric-1.8.2-desktop.patch, 1.1, NONE
Message-ID: <20090406222635.0EF27700FB@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22394

Modified Files:
	.cvsignore gnumeric.spec sources 
Removed Files:
	gnumeric-1.8.2-desktop.patch 
Log Message:
Upgrade to 1.8.4 (#491769)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2008 20:27:30 -0000	1.7
+++ .cvsignore	6 Apr 2009 22:26:04 -0000	1.8
@@ -1 +1 @@
-gnumeric-1.8.2.tar.bz2
+gnumeric-1.8.4.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnumeric.spec	25 Feb 2009 00:04:37 -0000	1.43
+++ gnumeric.spec	6 Apr 2009 22:26:04 -0000	1.44
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
-Version:          1.8.2
-Release:          7%{?dist}
+Version:          1.8.4
+Release:          1%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -9,7 +9,6 @@
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
-Patch0:           gnumeric-1.8.2-desktop.patch
 Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
 Patch2:		  gnumeric-1.8.2-python.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
@@ -20,7 +19,7 @@
 BuildRequires:    pygtk2-devel >= 2.6.0
 BuildRequires:    goffice-devel >= 0.6.1
 BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
-BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed)
+BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed) intltool
 Requires:         scrollkeeper hicolor-icon-theme
 Requires(pre):    GConf2
 Requires(post):   /sbin/ldconfig GConf2 scrollkeeper
@@ -60,7 +59,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
 
@@ -191,6 +189,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Robert Scheck <robert at fedoraproject.org> 1:1.8.4-1
+- Upgrade to 1.8.4 (#491769)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2008 20:27:30 -0000	1.7
+++ sources	6 Apr 2009 22:26:04 -0000	1.8
@@ -1 +1 @@
-f60edc6ca42daa2fb3717f3c90fa8a6e  gnumeric-1.8.2.tar.bz2
+338f0084f04a16f78797ad01f85d3251  gnumeric-1.8.4.tar.bz2


--- gnumeric-1.8.2-desktop.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr  6 22:42:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 22:42:40 +0000
Subject: [pkgdb] bugzilla ownership updated
Message-ID: <20090406224240.5A7CE2084A7@bastion.fedora.phx.redhat.com>

Package bugzilla in Fedora EPEL 5 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Mon Apr  6 22:42:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 06 Apr 2009 22:42:34 +0000
Subject: [pkgdb] bugzilla ownership updated
Message-ID: <20090406224256.912C42084A7@bastion.fedora.phx.redhat.com>

Package bugzilla in Fedora EPEL 4 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From nalin at fedoraproject.org  Mon Apr  6 22:47:25 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon,  6 Apr 2009 22:47:25 +0000 (UTC)
Subject: rpms/krb5/F-9 krb5-1.6.3-login-lpass.patch, NONE,
	1.1 krb5-1.6.1-pam.patch, 1.6, 1.7 krb5-CVE-2008-0947.patch, 1.1,
	1.2 krb5-trunk-doublelog.patch, 1.1,
	1.2 krb5-trunk-manpaths.patch, 1.1, 1.2 krb5.spec, 1.170,
	1.171 krb5-1.2.7-login-lpass.patch, 1.2,
	NONE krb5-1.2.7-reject-bad-transited.patch, 1.5, NONE
Message-ID: <20090406224725.B97B4700FB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26304

Modified Files:
	krb5-1.6.1-pam.patch krb5-CVE-2008-0947.patch 
	krb5-trunk-doublelog.patch krb5-trunk-manpaths.patch krb5.spec 
Added Files:
	krb5-1.6.3-login-lpass.patch 
Removed Files:
	krb5-1.2.7-login-lpass.patch 
	krb5-1.2.7-reject-bad-transited.patch 
Log Message:
- pull in a couple of defuzzed patches from the F-10 version of this package,
  dropping a redundant man page patch in the process


krb5-1.6.3-login-lpass.patch:

--- NEW FILE krb5-1.6.3-login-lpass.patch ---
The local crypt() may support hash types which use more than the first 8
characters.  It also doesn't modify the input string, so we should just
stop truncating it.  Are there platforms where the input string *is* modified?

--- krb5-1.2.7/src/appl/bsd/login.c	2005-11-15 16:20:34.000000000 -0500
+++ krb5-1.2.7/src/appl/bsd/login.c	2005-11-15 16:20:29.000000000 -0500
@@ -461,17 +461,14 @@
 static int unix_passwd_okay (pass)
     char *pass;
 {
-    char user_pwcopy[9], *namep;
+    char *namep;
     char *crypt ();
 
     assert (pwd != 0);
 
-    /* copy the first 8 chars of the password for unix crypt */
-    strncpy(user_pwcopy, pass, sizeof(user_pwcopy));
-    user_pwcopy[sizeof(user_pwcopy) - 1]='\0';
-    namep = crypt(user_pwcopy, salt);
-    memset (user_pwcopy, 0, sizeof(user_pwcopy));
-    /* ... and wipe the copy now that we have the string */
+    namep = crypt(pass, salt);
+    if (strlen(namep) < 13)
+	return 0;
 
     /* verify the local password string */
 #ifdef HAVE_SHADOW

krb5-1.6.1-pam.patch:

Index: krb5-1.6.1-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-9/krb5-1.6.1-pam.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krb5-1.6.1-pam.patch	25 Feb 2008 18:33:34 -0000	1.6
+++ krb5-1.6.1-pam.patch	6 Apr 2009 22:47:25 -0000	1.7
@@ -941,8 +941,8 @@
 +KRB5_WITH_PAM
 +
  AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
+ V5_AC_OUTPUT_MAKEFILE(.
  
- mansysconfdir=$sysconfdir
 --- krb5-1.6.1/src/config/pre.in	2007-06-21 17:39:57.000000000 -0400
 +++ krb5-1.6.1/src/config/pre.in	2007-06-21 17:39:57.000000000 -0400
 @@ -180,6 +180,7 @@ SRVLIBS = @SRVLIBS@

krb5-CVE-2008-0947.patch:

Index: krb5-CVE-2008-0947.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-9/krb5-CVE-2008-0947.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krb5-CVE-2008-0947.patch	18 Mar 2008 18:13:22 -0000	1.1
+++ krb5-CVE-2008-0947.patch	6 Apr 2009 22:47:25 -0000	1.2
@@ -21,7 +21,7 @@
 -	if (sock > svc_maxfd)
 -		svc_maxfd = sock;
  }
-  
+ 
  /*
 === src/lib/rpc/svc_tcp.c
 ==================================================================

krb5-trunk-doublelog.patch:

Index: krb5-trunk-doublelog.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-9/krb5-trunk-doublelog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krb5-trunk-doublelog.patch	25 Feb 2008 20:53:41 -0000	1.1
+++ krb5-trunk-doublelog.patch	6 Apr 2009 22:47:25 -0000	1.2
@@ -5,7 +5,7 @@
 ===================================================================
 --- src/include/Makefile.in	(revision 20235)
 +++ src/include/Makefile.in	(working copy)
-@@ -67,7 +67,9 @@
+@@ -61,7 +61,9 @@
  		  -e "s+ at SBINDIR+$(SBINDIR)+" \
  		  -e "s+ at MODULEDIR+$(MODULE_DIR)+" \
  	-e 's+ at LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
@@ -14,5 +14,5 @@
 +	-e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \
 +	-e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+'
  
- OSCONFSRC = $(srcdir)/osconf.hin
+ OSCONFSRC = $(srcdir)/stock/osconf.h
  

krb5-trunk-manpaths.patch:

Index: krb5-trunk-manpaths.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-9/krb5-trunk-manpaths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krb5-trunk-manpaths.patch	22 Jun 2007 22:02:16 -0000	1.1
+++ krb5-trunk-manpaths.patch	6 Apr 2009 22:47:25 -0000	1.2
@@ -52,7 +52,7 @@
 --- configure.in	(revision 19589)
 +++ configure.in	(working copy)
 @@ -986,6 +986,73 @@
- AC_CONFIG_SUBDIRS(appl/libpty appl/bsd appl/gssftp appl/telnet)
+ KRB5_WITH_PAM
  
  AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
 +


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-9/krb5.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- krb5.spec	17 Mar 2009 22:21:04 -0000	1.170
+++ krb5.spec	6 Apr 2009 22:47:25 -0000	1.171
@@ -61,7 +61,6 @@
 Patch13: krb5-1.3-large-file.patch
 Patch14: krb5-1.3-ftp-glob.patch
 Patch16: krb5-1.6-buildconf.patch
-Patch18: krb5-1.2.7-reject-bad-transited.patch
 Patch23: krb5-1.3.1-dns.patch
 Patch26: krb5-1.3.2-efence.patch
 Patch27: krb5-1.3.3-rcp-sendlarge.patch
@@ -73,7 +72,7 @@
 Patch36: krb5-1.3.3-rcp-markus.patch
 Patch39: krb5-1.4.1-api.patch
 Patch40: krb5-1.4.1-telnet-environ.patch
-Patch41: krb5-1.2.7-login-lpass.patch
+Patch41: krb5-1.6.3-login-lpass.patch
 Patch44: krb5-1.4.3-enospc.patch
 Patch47: krb5-1.6-sort-of-static.patch
 Patch51: krb5-1.6-ldap-init.patch
@@ -233,6 +232,10 @@
 certificate.
 
 %changelog
+* Mon Apr  6 2009 Nalin Dahyabhai <nalin at redhat.com>
+- pull in a couple of defuzzed patches from the F-10 version of this package,
+  dropping a redundant man page patch in the process
+
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-15
 - libgssapi_krb5: backport fix for some errors which can occur when
   we fail to set up the server half of a context (CVE-2009-0845)
@@ -1336,7 +1339,6 @@
 %patch13 -p1 -b .large-file
 %patch14 -p1 -b .ftp-glob
 %patch16 -p1 -b .buildconf
-%patch18 -p1 -b .reject-bad-transited
 %patch23 -p1 -b .dns
 # Removes a malloc(0) case, nothing more.
 # %patch26 -p1 -b .efence


--- krb5-1.2.7-login-lpass.patch DELETED ---


--- krb5-1.2.7-reject-bad-transited.patch DELETED ---



From drago01 at fedoraproject.org  Mon Apr  6 22:55:40 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Mon,  6 Apr 2009 22:55:40 +0000 (UTC)
Subject: rpms/iw/F-10 .cvsignore,1.5,1.6 iw.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20090406225540.8F425700FB@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28943

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jan 2009 18:33:50 -0000	1.5
+++ .cvsignore	6 Apr 2009 22:55:10 -0000	1.6
@@ -1 +1 @@
-iw-0.9.7.tar.bz2
+iw-0.9.11.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-10/iw.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iw.spec	10 Jan 2009 18:33:50 -0000	1.7
+++ iw.spec	6 Apr 2009 22:55:10 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           iw
-Version:        0.9.7
+Version:        0.9.11
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
@@ -43,6 +43,9 @@
 %doc COPYING
 
 %changelog
+* Tue Apr 07 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.11-1
+- Update to 0.9.11
+
 * Sat Jan 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.7-1
 - Update to 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jan 2009 18:33:50 -0000	1.5
+++ sources	6 Apr 2009 22:55:10 -0000	1.6
@@ -1 +1 @@
-52fa948eb5e2cb525fc884d6e58cdd88  iw-0.9.7.tar.bz2
+a8198e7f6bf41ead9e9ade3ec5cae9b2  iw-0.9.11.tar.bz2



From cweyl at fedoraproject.org  Mon Apr  6 23:05:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  6 Apr 2009 23:05:30 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/devel .cvsignore, 1.7,
	1.8 perl-MooseX-AttributeHelpers.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090406230530.82FAD700FB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31029

Modified Files:
	.cvsignore perl-MooseX-AttributeHelpers.spec sources 
Log Message:
* Mon Apr 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
- update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Nov 2008 01:34:55 -0000	1.7
+++ .cvsignore	6 Apr 2009 23:05:00 -0000	1.8
@@ -1,9 +1 @@
-*.tar
-*.gz
-*.rpm
-*.log
-*.old
-*.bak
-noarch
-MooseX-AttributeHelpers-*
-MooseX-AttributeHelpers-0.14.tar.gz
+MooseX-AttributeHelpers-0.16.tar.gz


Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MooseX-AttributeHelpers.spec	26 Feb 2009 22:18:10 -0000	1.10
+++ perl-MooseX-AttributeHelpers.spec	6 Apr 2009 23:05:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
+- update to 0.16
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Nov 2008 01:34:56 -0000	1.7
+++ sources	6 Apr 2009 23:05:00 -0000	1.8
@@ -1 +1 @@
-6f8589c9f8b246bb6ebff245a274b62b  MooseX-AttributeHelpers-0.14.tar.gz
+c6a4f8545483e430deaf8b4ca9d2dbae  MooseX-AttributeHelpers-0.16.tar.gz



From drago01 at fedoraproject.org  Mon Apr  6 23:07:07 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Mon,  6 Apr 2009 23:07:07 +0000 (UTC)
Subject: rpms/iw/F-9 .cvsignore,1.5,1.6 iw.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090406230707.00FE9700FB@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31435

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jan 2009 18:38:02 -0000	1.5
+++ .cvsignore	6 Apr 2009 23:06:36 -0000	1.6
@@ -1 +1 @@
-iw-0.9.7.tar.bz2
+iw-0.9.11.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/iw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iw.spec	24 Jan 2009 18:53:06 -0000	1.5
+++ iw.spec	6 Apr 2009 23:06:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           iw
-Version:        0.9.7
-Release:        2%{?dist}
+Version:        0.9.11
+Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -43,6 +43,9 @@
 %doc COPYING
 
 %changelog
+* Tue Apr 07 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.11-1
+- Update to 0.9.11
+
 * Sat Jan 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.7-2 
 - BuildRequires kernel-headers not kernel-devel
 - (sparc32 has no kernel so no kernel-devel)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jan 2009 18:38:02 -0000	1.5
+++ sources	6 Apr 2009 23:06:36 -0000	1.6
@@ -1 +1 @@
-52fa948eb5e2cb525fc884d6e58cdd88  iw-0.9.7.tar.bz2
+a8198e7f6bf41ead9e9ade3ec5cae9b2  iw-0.9.11.tar.bz2



From lspooky at fedoraproject.org  Mon Apr  6 23:10:42 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Mon,  6 Apr 2009 23:10:42 +0000 (UTC)
Subject: rpms/python-oasa/F-9 .cvsignore, 1.5, 1.6 import.log, 1.4,
	1.5 python-oasa.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090406231042.C131E700FB@cvs1.fedora.phx.redhat.com>

Author: lspooky

Update of /cvs/pkgs/rpms/python-oasa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32158/F-9

Modified Files:
	.cvsignore import.log python-oasa.spec sources 
Log Message:
This release of OASA includes several fixes, most notably of lockup during generation of images of complex systems of fused rings. Also image generation now works much faster for larger systems



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Mar 2009 15:12:47 -0000	1.5
+++ .cvsignore	6 Apr 2009 23:10:12 -0000	1.6
@@ -1 +1 @@
-oasa-0.12.7.tar.gz
+oasa-0.13.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-9/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Mar 2009 15:12:47 -0000	1.4
+++ import.log	6 Apr 2009 23:10:12 -0000	1.5
@@ -2,3 +2,4 @@
 python-oasa-0_12_7-1_fc10:F-9:python-oasa-0.12.7-1.fc10.src.rpm:1235064084
 python-oasa-0_13_0-1_fc10:F-9:python-oasa-0.13.0-1.fc10.src.rpm:1235699425
 python-oasa-0_13_0-2_fc10:F-9:python-oasa-0.13.0-2.fc10.src.rpm:1236525039
+python-oasa-0_13_1-1_fc10:F-9:python-oasa-0.13.1-1.fc10.src.rpm:1239059446


Index: python-oasa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-9/python-oasa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-oasa.spec	8 Mar 2009 15:12:47 -0000	1.4
+++ python-oasa.spec	6 Apr 2009 23:10:12 -0000	1.5
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-oasa
-Version:	0.13.0
-Release:	2%{?dist}
+Version:	0.13.1
+Release:	1%{?dist}
 Summary:	Python library for manipulation of chemical formats
 Group:		Development/Libraries
 License:	GPLv2+
 URL:		http://bkchem.zirael.org
-Source0:	http://bkchem.zirael.org/download/oasa-0.12.7.tar.gz
+Source0:	http://bkchem.zirael.org/download/oasa-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel
@@ -18,7 +18,7 @@
 
 
 %prep
-%setup -q -n oasa-0.12.7
+%setup -q -n oasa-%{version}
 
 
 %build
@@ -38,15 +38,31 @@
 %defattr(-, root ,root, -)
 %doc PKG-INFO progress.log README
 %{python_sitelib}/oasa/
-%{python_sitelib}/oasa-*-py*.egg-info
+%{python_sitelib}/oasa-%{version}-py*.egg-info
 
 
 
 %changelog
-* Thu Feb 12 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.0-2
-- One step back to solve one bug
+* Sun Apr 5 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.1-1
+- This release of OASA includes several fixes, most notably of lockup during generation
+of images of complex systems of fused rings. Also image generation now works much faster
+for larger systems
+
+* Thu Feb 24 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.0-1
+- cairo_out - double bonds in 3D rotated molecules look much better (z-coordinate is
+taken into account when the bond is drawn)
+smiles - smiles encoder did not prefix two digit ring numbers with "%"
+graph - SSSR code did not find really smallest rings in case no vertices with
+degree 2 were present in the initial drawing (fullerene and such)
+molecule - aromatic bond detection uses SSSR instead of all possible rings
+when there are more then 10 smallest rings - fixes lockup for fullerene
+cairo_out - when scaling != 1 the resulting image was improperly cropped
+
 
 * Thu Feb 12 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.7-1
+- cairo_out - mols_to_cairo and mol_to_cairo convenience functions added
+cairo_out - background was not properly painted (thanks to Noel O'Boyle for reporting this)
+
 
 * Fri Jun 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
 - initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Mar 2009 15:12:47 -0000	1.5
+++ sources	6 Apr 2009 23:10:12 -0000	1.6
@@ -1 +1 @@
-c9a07989eb47c3effc60a451a4cc8c2a  oasa-0.12.7.tar.gz
+49f573537cf81db3892627bc3b5c31dd  oasa-0.13.1.tar.gz



From lspooky at fedoraproject.org  Mon Apr  6 23:14:10 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Mon,  6 Apr 2009 23:14:10 +0000 (UTC)
Subject: rpms/python-oasa/F-10 .cvsignore, 1.5, 1.6 import.log, 1.4,
	1.5 python-oasa.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090406231410.09AE5700FB@cvs1.fedora.phx.redhat.com>

Author: lspooky

Update of /cvs/pkgs/rpms/python-oasa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv556/F-10

Modified Files:
	.cvsignore import.log python-oasa.spec sources 
Log Message:
This release of OASA includes several fixes, most notably of lockup during generation of images of complex systems of fused rings. Also image generation now works much faster for larger systems



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Mar 2009 15:14:40 -0000	1.5
+++ .cvsignore	6 Apr 2009 23:13:39 -0000	1.6
@@ -1 +1 @@
-oasa-0.12.7.tar.gz
+oasa-0.13.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Mar 2009 15:14:40 -0000	1.4
+++ import.log	6 Apr 2009 23:13:39 -0000	1.5
@@ -2,3 +2,4 @@
 python-oasa-0_12_7-1_fc10:F-10:python-oasa-0.12.7-1.fc10.src.rpm:1235064271
 python-oasa-0_13_0-1_fc10:F-10:python-oasa-0.13.0-1.fc10.src.rpm:1235699540
 python-oasa-0_13_0-2_fc10:F-10:python-oasa-0.13.0-2.fc10.src.rpm:1236525206
+python-oasa-0_13_1-1_fc10:F-10:python-oasa-0.13.1-1.fc10.src.rpm:1239059737


Index: python-oasa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-10/python-oasa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-oasa.spec	8 Mar 2009 15:14:40 -0000	1.4
+++ python-oasa.spec	6 Apr 2009 23:13:39 -0000	1.5
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-oasa
-Version:	0.13.0
-Release:	2%{?dist}
+Version:	0.13.1
+Release:	1%{?dist}
 Summary:	Python library for manipulation of chemical formats
 Group:		Development/Libraries
 License:	GPLv2+
 URL:		http://bkchem.zirael.org
-Source0:	http://bkchem.zirael.org/download/oasa-0.12.7.tar.gz
+Source0:	http://bkchem.zirael.org/download/oasa-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel
@@ -18,7 +18,7 @@
 
 
 %prep
-%setup -q -n oasa-0.12.7
+%setup -q -n oasa-%{version}
 
 
 %build
@@ -38,15 +38,31 @@
 %defattr(-, root ,root, -)
 %doc PKG-INFO progress.log README
 %{python_sitelib}/oasa/
-%{python_sitelib}/oasa-*-py*.egg-info
+%{python_sitelib}/oasa-%{version}-py*.egg-info
 
 
 
 %changelog
-* Thu Feb 12 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.0-2
-- One step back to solve one bug
+* Sun Apr 5 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.1-1
+- This release of OASA includes several fixes, most notably of lockup during generation
+of images of complex systems of fused rings. Also image generation now works much faster
+for larger systems
+
+* Thu Feb 24 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.0-1
+- cairo_out - double bonds in 3D rotated molecules look much better (z-coordinate is
+taken into account when the bond is drawn)
+smiles - smiles encoder did not prefix two digit ring numbers with "%"
+graph - SSSR code did not find really smallest rings in case no vertices with
+degree 2 were present in the initial drawing (fullerene and such)
+molecule - aromatic bond detection uses SSSR instead of all possible rings
+when there are more then 10 smallest rings - fixes lockup for fullerene
+cairo_out - when scaling != 1 the resulting image was improperly cropped
+
 
 * Thu Feb 12 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.7-1
+- cairo_out - mols_to_cairo and mol_to_cairo convenience functions added
+cairo_out - background was not properly painted (thanks to Noel O'Boyle for reporting this)
+
 
 * Fri Jun 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
 - initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Mar 2009 15:14:41 -0000	1.5
+++ sources	6 Apr 2009 23:13:39 -0000	1.6
@@ -1 +1 @@
-c9a07989eb47c3effc60a451a4cc8c2a  oasa-0.12.7.tar.gz
+49f573537cf81db3892627bc3b5c31dd  oasa-0.13.1.tar.gz



From lspooky at fedoraproject.org  Mon Apr  6 23:18:04 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Mon,  6 Apr 2009 23:18:04 +0000 (UTC)
Subject: rpms/python-oasa/devel .cvsignore, 1.5, 1.6 import.log, 1.4,
	1.5 python-oasa.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090406231804.237C4700FB@cvs1.fedora.phx.redhat.com>

Author: lspooky

Update of /cvs/pkgs/rpms/python-oasa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1588/devel

Modified Files:
	.cvsignore import.log python-oasa.spec sources 
Log Message:
This release of OASA includes several fixes, most notably of lockup during generation of images of complex systems of fused rings. Also image generation now works much faster for larger systems



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Mar 2009 15:17:35 -0000	1.5
+++ .cvsignore	6 Apr 2009 23:17:33 -0000	1.6
@@ -1 +1 @@
-oasa-0.12.7.tar.gz
+oasa-0.13.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Mar 2009 15:17:35 -0000	1.4
+++ import.log	6 Apr 2009 23:17:33 -0000	1.5
@@ -2,3 +2,4 @@
 python-oasa-0_12_7-1_fc10:HEAD:python-oasa-0.12.7-1.fc10.src.rpm:1235064436
 python-oasa-0_13_0-1_fc10:HEAD:python-oasa-0.13.0-1.fc10.src.rpm:1235699652
 python-oasa-0_13_0-2_fc10:HEAD:python-oasa-0.13.0-2.fc10.src.rpm:1236525339
+python-oasa-0_13_1-1_fc10:HEAD:python-oasa-0.13.1-1.fc10.src.rpm:1239059976


Index: python-oasa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/devel/python-oasa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-oasa.spec	8 Mar 2009 15:17:35 -0000	1.5
+++ python-oasa.spec	6 Apr 2009 23:17:33 -0000	1.6
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-oasa
-Version:	0.13.0
-Release:	2%{?dist}
+Version:	0.13.1
+Release:	1%{?dist}
 Summary:	Python library for manipulation of chemical formats
 Group:		Development/Libraries
 License:	GPLv2+
 URL:		http://bkchem.zirael.org
-Source0:	http://bkchem.zirael.org/download/oasa-0.12.7.tar.gz
+Source0:	http://bkchem.zirael.org/download/oasa-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel
@@ -18,7 +18,7 @@
 
 
 %prep
-%setup -q -n oasa-0.12.7
+%setup -q -n oasa-%{version}
 
 
 %build
@@ -38,15 +38,31 @@
 %defattr(-, root ,root, -)
 %doc PKG-INFO progress.log README
 %{python_sitelib}/oasa/
-%{python_sitelib}/oasa-*-py*.egg-info
+%{python_sitelib}/oasa-%{version}-py*.egg-info
 
 
 
 %changelog
-* Thu Feb 12 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.0-2
-- One step back to solve one bug
+* Sun Apr 5 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.1-1
+- This release of OASA includes several fixes, most notably of lockup during generation
+of images of complex systems of fused rings. Also image generation now works much faster
+for larger systems
+
+* Thu Feb 24 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.13.0-1
+- cairo_out - double bonds in 3D rotated molecules look much better (z-coordinate is
+taken into account when the bond is drawn)
+smiles - smiles encoder did not prefix two digit ring numbers with "%"
+graph - SSSR code did not find really smallest rings in case no vertices with
+degree 2 were present in the initial drawing (fullerene and such)
+molecule - aromatic bond detection uses SSSR instead of all possible rings
+when there are more then 10 smallest rings - fixes lockup for fullerene
+cairo_out - when scaling != 1 the resulting image was improperly cropped
+
 
 * Thu Feb 12 2009 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.7-1
+- cairo_out - mols_to_cairo and mol_to_cairo convenience functions added
+cairo_out - background was not properly painted (thanks to Noel O'Boyle for reporting this)
+
 
 * Fri Jun 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
 - initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Mar 2009 15:17:35 -0000	1.5
+++ sources	6 Apr 2009 23:17:33 -0000	1.6
@@ -1 +1 @@
-c9a07989eb47c3effc60a451a4cc8c2a  oasa-0.12.7.tar.gz
+49f573537cf81db3892627bc3b5c31dd  oasa-0.13.1.tar.gz



From itamarjp at fedoraproject.org  Mon Apr  6 23:21:19 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon,  6 Apr 2009 23:21:19 +0000 (UTC)
Subject: rpms/bugzilla/devel .cvsignore, 1.10, 1.11 bugzilla.spec, 1.24,
	1.25 import.log, 1.2, 1.3 sources, 1.10,
	1.11 maxpacket-mysql-3.2.patch, 1.1, NONE
Message-ID: <20090406232119.644CE70137@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2304/devel

Modified Files:
	.cvsignore bugzilla.spec import.log sources 
Removed Files:
	maxpacket-mysql-3.2.patch 
Log Message:
3.2.3 - fix CVE-2009-1213



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Mar 2009 15:15:11 -0000	1.10
+++ .cvsignore	6 Apr 2009 23:20:48 -0000	1.11
@@ -1 +1 @@
-bugzilla-3.2.2.tar.gz
+bugzilla-3.2.3.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bugzilla.spec	5 Mar 2009 15:15:11 -0000	1.24
+++ bugzilla.spec	6 Apr 2009 23:20:48 -0000	1.25
@@ -4,16 +4,15 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.2.2
+Version: 3.2.3
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
-Patch1: maxpacket-mysql-3.2.patch
-# patch1 from https://bugzilla.mozilla.org/show_bug.cgi?id=480001
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which
@@ -42,7 +41,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p0
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -101,9 +99,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-pushd %{bzinstallprefix}/bugzilla > /dev/null
+(pushd %{bzinstallprefix}/bugzilla > /dev/null
 ./checksetup.pl > /dev/null
-popd > /dev/null
+popd > /dev/null)
 
 %files
 %defattr(-,root,root,-)
@@ -145,6 +143,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Apr 06 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 3.2.3-1
+- fix CVE-2009-1213
+
 * Thu Mar 05 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 3.2.2-2
 - fix from BZ #474250 Comment #16, from Chris Eveleigh -->
 - add python BR for contrib subpackage


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	5 Mar 2009 15:15:11 -0000	1.2
+++ import.log	6 Apr 2009 23:20:48 -0000	1.3
@@ -1,2 +1,3 @@
 bugzilla-3_0_8-1_fc11:HEAD:bugzilla-3.0.8-1.fc11.src.rpm:1235878106
 bugzilla-3_2_2-2_fc10:HEAD:bugzilla-3.2.2-2.fc10.src.rpm:1236265998
+bugzilla-3_2_3-1_fc11:HEAD:bugzilla-3.2.3-1.fc11.src.rpm:1239059931


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Mar 2009 15:15:11 -0000	1.10
+++ sources	6 Apr 2009 23:20:48 -0000	1.11
@@ -1 +1 @@
-ad9eca21b6bafdd7a9a34e4c1b55281e  bugzilla-3.2.2.tar.gz
+fcc8f64fec821e76718fbda13e232b59  bugzilla-3.2.3.tar.gz


--- maxpacket-mysql-3.2.patch DELETED ---



From itamarjp at fedoraproject.org  Mon Apr  6 23:23:27 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon,  6 Apr 2009 23:23:27 +0000 (UTC)
Subject: rpms/bugzilla/F-10 .cvsignore, 1.10, 1.11 bugzilla.spec, 1.22,
	1.23 import.log, 1.2, 1.3 sources, 1.10,
	1.11 maxpacket-mysql-3.2.patch, 1.1, NONE
Message-ID: <20090406232327.AB0F2700FB@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bugzilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3643/F-10

Modified Files:
	.cvsignore bugzilla.spec import.log sources 
Removed Files:
	maxpacket-mysql-3.2.patch 
Log Message:
3.2.3 - fix CVE-2009-1213



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Mar 2009 15:22:45 -0000	1.10
+++ .cvsignore	6 Apr 2009 23:22:57 -0000	1.11
@@ -1 +1 @@
-bugzilla-3.2.2.tar.gz
+bugzilla-3.2.3.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/bugzilla.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bugzilla.spec	5 Mar 2009 15:22:45 -0000	1.22
+++ bugzilla.spec	6 Apr 2009 23:22:57 -0000	1.23
@@ -4,16 +4,15 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.2.2
+Version: 3.2.3
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
-Patch1: maxpacket-mysql-3.2.patch
-# patch1 from https://bugzilla.mozilla.org/show_bug.cgi?id=480001
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which
@@ -42,7 +41,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p0
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -101,9 +99,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-pushd %{bzinstallprefix}/bugzilla > /dev/null
+(pushd %{bzinstallprefix}/bugzilla > /dev/null
 ./checksetup.pl > /dev/null
-popd > /dev/null
+popd > /dev/null)
 
 %files
 %defattr(-,root,root,-)
@@ -145,6 +143,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Apr 06 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 3.2.3-1
+- fix CVE-2009-1213
+
 * Thu Mar 05 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 3.2.2-2
 - fix from BZ #474250 Comment #16, from Chris Eveleigh -->
 - add python BR for contrib subpackage


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	5 Mar 2009 15:22:45 -0000	1.2
+++ import.log	6 Apr 2009 23:22:57 -0000	1.3
@@ -1,2 +1,3 @@
 bugzilla-3_0_8-1_fc11:F-10:bugzilla-3.0.8-1.fc11.src.rpm:1235878257
 bugzilla-3_2_2-2_fc10:F-10:bugzilla-3.2.2-2.fc10.src.rpm:1236266484
+bugzilla-3_2_3-1_fc11:F-10:bugzilla-3.2.3-1.fc11.src.rpm:1239060133


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Mar 2009 15:22:45 -0000	1.10
+++ sources	6 Apr 2009 23:22:57 -0000	1.11
@@ -1 +1 @@
-ad9eca21b6bafdd7a9a34e4c1b55281e  bugzilla-3.2.2.tar.gz
+fcc8f64fec821e76718fbda13e232b59  bugzilla-3.2.3.tar.gz


--- maxpacket-mysql-3.2.patch DELETED ---



From itamarjp at fedoraproject.org  Mon Apr  6 23:27:55 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon,  6 Apr 2009 23:27:55 +0000 (UTC)
Subject: rpms/bugzilla/F-9 .cvsignore, 1.9, 1.10 bugzilla.spec, 1.20,
	1.21 import.log, 1.2, 1.3 sources, 1.9,
	1.10 maxpacket-mysql-3.2.patch, 1.1, NONE
Message-ID: <20090406232755.EE83A700FB@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bugzilla/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4550/F-9

Modified Files:
	.cvsignore bugzilla.spec import.log sources 
Removed Files:
	maxpacket-mysql-3.2.patch 
Log Message:
3.2.3 fix CVE-2009-1213



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Mar 2009 15:26:21 -0000	1.9
+++ .cvsignore	6 Apr 2009 23:27:25 -0000	1.10
@@ -1 +1 @@
-bugzilla-3.2.2.tar.gz
+bugzilla-3.2.3.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-9/bugzilla.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bugzilla.spec	5 Mar 2009 15:26:21 -0000	1.20
+++ bugzilla.spec	6 Apr 2009 23:27:25 -0000	1.21
@@ -4,16 +4,15 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.2.2
+Version: 3.2.3
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
-Patch1: maxpacket-mysql-3.2.patch
-# patch1 from https://bugzilla.mozilla.org/show_bug.cgi?id=480001
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which
@@ -42,7 +41,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p0
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -101,9 +99,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-pushd %{bzinstallprefix}/bugzilla > /dev/null
+(pushd %{bzinstallprefix}/bugzilla > /dev/null
 ./checksetup.pl > /dev/null
-popd > /dev/null
+popd > /dev/null)
 
 %files
 %defattr(-,root,root,-)
@@ -145,6 +143,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Apr 06 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 3.2.3-1
+- fix CVE-2009-1213
+
 * Thu Mar 05 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 3.2.2-2
 - fix from BZ #474250 Comment #16, from Chris Eveleigh -->
 - add python BR for contrib subpackage


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	5 Mar 2009 15:26:21 -0000	1.2
+++ import.log	6 Apr 2009 23:27:25 -0000	1.3
@@ -1,2 +1,3 @@
 bugzilla-3_0_8-1_fc11:F-9:bugzilla-3.0.8-1.fc11.src.rpm:1235878378
 bugzilla-3_2_2-2_fc10:F-9:bugzilla-3.2.2-2.fc10.src.rpm:1236266726
+bugzilla-3_2_3-1_fc11:F-9:bugzilla-3.2.3-1.fc11.src.rpm:1239060269


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Mar 2009 15:26:22 -0000	1.9
+++ sources	6 Apr 2009 23:27:25 -0000	1.10
@@ -1 +1 @@
-ad9eca21b6bafdd7a9a34e4c1b55281e  bugzilla-3.2.2.tar.gz
+fcc8f64fec821e76718fbda13e232b59  bugzilla-3.2.3.tar.gz


--- maxpacket-mysql-3.2.patch DELETED ---



From airlied at fedoraproject.org  Mon Apr  6 23:34:04 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  6 Apr 2009 23:34:04 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset-fix-nomodeset.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.170, 1.171
Message-ID: <20090406233404.8ACA3700FB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6040

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-fix-nomodeset.patch 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-7
- radeon-modeset-fix-nomodeset.patch: fix no modeset paths


radeon-modeset-fix-nomodeset.patch:

--- NEW FILE radeon-modeset-fix-nomodeset.patch ---
>From 982598d830691cd1b39e5aa2c9c409786e059fd3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 7 Apr 2009 09:15:08 +1000
Subject: [PATCH] radeon: remove function

---
 src/radeon_dri.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 64b5937..347ab44 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -471,7 +471,6 @@ Bool radeon_update_dri_buffers(ScreenPtr pScreen)
     if (!success)
 	return FALSE;
 
-    radeon_update_sarea(pScrn, sarea);
     radeon_update_screen_private(pScrn, sarea);
     return TRUE;
 }
@@ -1707,8 +1706,6 @@ Bool RADEONDRIDoMappings(ScreenPtr pScreen)
 	return FALSE;
     }
     
-    radeon_update_sarea(pScrn, pSAREAPriv);
-    
 				/* DRIScreenInit adds the frame buffer
 				   map, but we need it as well */
     {
-- 
1.6.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- xorg-x11-drv-ati.spec	6 Apr 2009 08:48:25 -0000	1.170
+++ xorg-x11-drv-ati.spec	6 Apr 2009 23:33:34 -0000	1.171
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@
 
 Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
+Patch2:     radeon-modeset-fix-nomodeset.patch
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
@@ -42,6 +43,7 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
+%patch2 -p1 -b .modeset-fix
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
@@ -76,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-7
+- radeon-modeset-fix-nomodeset.patch: fix no modeset paths
+
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-6
 - kms: add config.h to get mmap working properly
 



From davidz at fedoraproject.org  Tue Apr  7 00:09:28 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  7 Apr 2009 00:09:28 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.3, 1.4 DeviceKit-disks.spec,
	1.13, 1.14 sources, 1.3,
	1.4 devicekit-disks-dbus-permissions.patch, 1.1,
	NONE devkit-disks-dashdash.patch, 1.2,
	NONE devkit-disks-dm-is-system-internal.patch, 1.1,
	NONE devkit-disks-dump-option.patch, 1.1,
	NONE devkit-disks-fstab-unmount.patch, 1.1,
	NONE devkit-disks-use-devt-to-identify-mounts.patch, 1.1, NONE
Message-ID: <20090407000928.CD38670100@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12697

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Removed Files:
	devicekit-disks-dbus-permissions.patch 
	devkit-disks-dashdash.patch 
	devkit-disks-dm-is-system-internal.patch 
	devkit-disks-dump-option.patch 
	devkit-disks-fstab-unmount.patch 
	devkit-disks-use-devt-to-identify-mounts.patch 
Log Message:
* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.1.20080406git%{?dist}
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2009 21:39:47 -0000	1.3
+++ .cvsignore	7 Apr 2009 00:08:58 -0000	1.4
@@ -1,2 +1,3 @@
 DeviceKit-disks-002.git20080720.tar.gz
 DeviceKit-disks-003.tar.gz
+DeviceKit-disks-004.20080406git.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DeviceKit-disks.spec	28 Mar 2009 03:59:06 -0000	1.13
+++ DeviceKit-disks.spec	7 Apr 2009 00:08:58 -0000	1.14
@@ -7,15 +7,16 @@
 %define udev_version            139
 %define mdadm_version           2.6.7
 %define device_mapper_version   1.02
+%define libatasmart_version     0.5
 
 Summary: Disk Management Service
 Name: DeviceKit-disks
-Version: 003
-Release: 9%{?dist}
+Version: 004
+Release: 0.1.20080406git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.20080406git.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -26,6 +27,8 @@
 BuildRequires: sqlite-devel
 BuildRequires: device-mapper-devel >= %{device_mapper_version}
 BuildRequires: intltool
+BuildRequires: libatasmart-devel >= %{libatasmart_version}
+BuildRequires: zlib-devel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
@@ -34,7 +37,8 @@
 Requires: DeviceKit >= %{devicekit_version}
 Requires: udev >= %{udev_version}
 Requires: mdadm >= %{mdadm_version}
-Requires: smartmontools
+Requires: libatasmart >= %{libatasmart_version}
+Requires: zlib
 # for mount, umount, mkswap
 Requires: util-linux-ng
 # for mkfs.ext3, mkfs.ext3, e2label
@@ -51,15 +55,8 @@
 Requires: ntfsprogs
 %endif
 
-Conflicts: kernel < 2.6.25
-
-Patch0: devkit-disks-use-devt-to-identify-mounts.patch
-Patch1: devkit-disks-dump-option.patch
-Patch2: devkit-disks-fstab-unmount.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=488850
-Patch3: devkit-disks-dashdash.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=489397
-Patch4: devkit-disks-dm-is-system-internal.patch
+# for /proc/self/mountinfo, only available in 2.6.26 or higher
+Conflicts: kernel < 2.6.26
 
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
@@ -78,12 +75,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .use-devt-for-mounts
-%patch1 -p1 -b .fstab-unmount
-%patch2 -p1 -b .dump-option
-%patch3 -p1 -b .dashdash
-%patch4 -p1 -b .dm-is-system-internal
-
 %build
 %configure
 make
@@ -109,10 +100,11 @@
 
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/profile.d/*.sh
-%{_sysconfdir}/udev/rules.d/*.rules
+/lib/udev/rules.d/*.rules
 
 /lib/udev/devkit-disks-part-id
 /lib/udev/devkit-disks-dm-export
+/lib/udev/devkit-disks-probe-ata-smart
 /sbin/umount.devkit
 
 %{_bindir}/*
@@ -126,7 +118,8 @@
 
 %{_datadir}/dbus-1/system-services/*.service
 
-%dir %{_localstatedir}/lib/DeviceKit-disks
+%attr(0770,root,root) %dir %{_localstatedir}/run/DeviceKit-disks
+%attr(0770,root,root) %dir %{_localstatedir}/lib/DeviceKit-disks
 
 %files devel
 %defattr(-,root,root,-)
@@ -138,6 +131,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.1.20080406git%{?dist}
+- New snapshot
+
 * Fri Mar 27 2009 Matthias Clasen  <mclasen at redhat.com> - 003-9.f11
 - Don't require ntfsprogs on ppc, where it doesn't exist
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2009 21:39:47 -0000	1.3
+++ sources	7 Apr 2009 00:08:58 -0000	1.4
@@ -1 +1 @@
-7b88acc8cb0744b110e96557f5bcd9e3  DeviceKit-disks-003.tar.gz
+4fb14a3d53ea3d773dc81ae1cd501a66  DeviceKit-disks-004.20080406git.tar.gz


--- devicekit-disks-dbus-permissions.patch DELETED ---


--- devkit-disks-dashdash.patch DELETED ---


--- devkit-disks-dm-is-system-internal.patch DELETED ---


--- devkit-disks-dump-option.patch DELETED ---


--- devkit-disks-fstab-unmount.patch DELETED ---


--- devkit-disks-use-devt-to-identify-mounts.patch DELETED ---



From davidz at fedoraproject.org  Tue Apr  7 00:12:32 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  7 Apr 2009 00:12:32 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.4, 1.5 DeviceKit-disks.spec,
	1.14, 1.15 sources, 1.4, 1.5
Message-ID: <20090407001232.45B4470100@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13402

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Log Message:
* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.2.20090406git%{?dist}
- New snapshot, this time with the right date




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2009 00:08:58 -0000	1.4
+++ .cvsignore	7 Apr 2009 00:12:01 -0000	1.5
@@ -1,3 +1,4 @@
 DeviceKit-disks-002.git20080720.tar.gz
 DeviceKit-disks-003.tar.gz
 DeviceKit-disks-004.20080406git.tar.gz
+DeviceKit-disks-004.20090406git.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DeviceKit-disks.spec	7 Apr 2009 00:08:58 -0000	1.14
+++ DeviceKit-disks.spec	7 Apr 2009 00:12:01 -0000	1.15
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.1.20080406git%{?dist}
+Release: 0.2.20090406git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -131,6 +131,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.2.20090406git%{?dist}
+- New snapshot, this time with the right date
+
 * Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.1.20080406git%{?dist}
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Apr 2009 00:08:58 -0000	1.4
+++ sources	7 Apr 2009 00:12:01 -0000	1.5
@@ -1 +1 @@
-4fb14a3d53ea3d773dc81ae1cd501a66  DeviceKit-disks-004.20080406git.tar.gz
+4fb14a3d53ea3d773dc81ae1cd501a66  DeviceKit-disks-004.20090406git.tar.gz



From davidz at fedoraproject.org  Tue Apr  7 00:15:14 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  7 Apr 2009 00:15:14 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel DeviceKit-disks.spec,1.15,1.16
Message-ID: <20090407001514.759E070100@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13981

Modified Files:
	DeviceKit-disks.spec 
Log Message:
* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.3.20090406git%{?dist}
- BR libudev-devel




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DeviceKit-disks.spec	7 Apr 2009 00:12:01 -0000	1.15
+++ DeviceKit-disks.spec	7 Apr 2009 00:14:44 -0000	1.16
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.2.20090406git%{?dist}
+Release: 0.3.20090406git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -29,6 +29,7 @@
 BuildRequires: intltool
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: zlib-devel
+BuildRequires: libudev-devel >= %{udev_version}
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
@@ -131,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.3.20090406git%{?dist}
+- BR libudev-devel
+
 * Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.2.20090406git%{?dist}
 - New snapshot, this time with the right date
 



From davidz at fedoraproject.org  Tue Apr  7 00:18:35 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  7 Apr 2009 00:18:35 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel DeviceKit-disks.spec,1.16,1.17
Message-ID: <20090407001836.0267070100@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14713

Modified Files:
	DeviceKit-disks.spec 
Log Message:
* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.4.20090406git%{?dist}
- Rebuild




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DeviceKit-disks.spec	7 Apr 2009 00:14:44 -0000	1.16
+++ DeviceKit-disks.spec	7 Apr 2009 00:18:05 -0000	1.17
@@ -12,11 +12,11 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.3.20090406git%{?dist}
+Release: 0.4.20090406git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
-Source0: %{name}-%{version}.20080406git.tar.gz
+Source0: %{name}-%{version}.20090406git.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -132,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.4.20090406git%{?dist}
+- Rebuild
+
 * Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.3.20090406git%{?dist}
 - BR libudev-devel
 



From davidz at fedoraproject.org  Tue Apr  7 00:31:17 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  7 Apr 2009 00:31:17 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec, 1.6,
	1.7 gdu-0.2-passphrase-change-crash.patch, 1.1, NONE
Message-ID: <20090407003117.492E570100@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17838

Modified Files:
	gnome-disk-utility.spec 
Removed Files:
	gdu-0.2-passphrase-change-crash.patch 
Log Message:
* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.1.20090406git%{?dist}
- New snapshot




Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-disk-utility.spec	4 Mar 2009 22:07:28 -0000	1.6
+++ gnome-disk-utility.spec	7 Apr 2009 00:30:46 -0000	1.7
@@ -6,16 +6,17 @@
 %define polkit_version            0.8
 %define polkit_gnome_version      0.8
 %define gnome_keyring_version     2.22
-%define devicekit_disks_version   003
+%define devicekit_disks_version   004
+%define unique_version            1.0.4
 
 Summary: Disk management application
 Name: gnome-disk-utility
-Version: 0.2
-Release: 2%{?dist}
+Version: 0.3
+Release: 0.1.20090406git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-URL: http://gitweb.freedesktop.org/?p=users/david/gnome-disk-utility.git;a=summary
-Source0: %{name}-%{version}.tar.bz2
+URL: http://git.gnome.org/cgit/gnome-disk-utility
+Source0: %{name}-%{version}.20090406git.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -29,13 +30,12 @@
 BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version}
 BuildRequires: DeviceKit-disks-devel >= %{devicekit_disks_version}
 BuildRequires: PolicyKit-gnome-devel >= %{polkit_gnome_version}
+BuildRequires: unique-devel >= %{unique_version}
 BuildRequires: libsexy-devel
 BuildRequires: intltool
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
-Patch0: gdu-0.2-passphrase-change-crash.patch
-
 %description
 This package contains the Palimpsest disk management application.
 Palimpsest supports partitioning, file system creation, encryption,
@@ -89,7 +89,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .luks-passphrase-change
 
 %build
 %configure
@@ -197,6 +196,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.1.20090406git%{?dist}
+- New snapshot
+
 * Wed Mar 04 2009 David Zeuthen <davidz at redhat.com> - 0.2-2%{?dist}
 - Don't crash when changing the LUKS passphrase on a device
 


--- gdu-0.2-passphrase-change-crash.patch DELETED ---



From davidz at fedoraproject.org  Tue Apr  7 00:32:58 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  7 Apr 2009 00:32:58 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090407003258.5F4BC70100@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18199

Modified Files:
	.cvsignore sources 
Log Message:
upload new tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2009 21:42:15 -0000	1.3
+++ .cvsignore	7 Apr 2009 00:32:28 -0000	1.4
@@ -1,2 +1,3 @@
 gnome-disk-utility-0.1.git20080720.tar.bz2
 gnome-disk-utility-0.2.tar.bz2
+gnome-disk-utility-0.3.20090406git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2009 21:42:15 -0000	1.3
+++ sources	7 Apr 2009 00:32:28 -0000	1.4
@@ -1 +1 @@
-b320e428fdbc63445c310a538e10e4bc  gnome-disk-utility-0.2.tar.bz2
+5d1c0065390398bf599e23a2c6386352  gnome-disk-utility-0.3.20090406git.tar.bz2



From pkgdb at fedoraproject.org  Tue Apr  7 00:39:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 00:39:38 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20090407003938.F25E9208550@bastion.fedora.phx.redhat.com>

deji has set the watchbugzilla acl on exaile (Fedora 10) to Approved for tvvikram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Tue Apr  7 00:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 00:39:42 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20090407003942.91CCE208556@bastion.fedora.phx.redhat.com>

deji has set the watchcommits acl on exaile (Fedora 10) to Approved for tvvikram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/exaile



From airlied at fedoraproject.org  Tue Apr  7 00:54:47 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  7 Apr 2009 00:54:47 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-enable-dfs.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.171, 1.172
Message-ID: <20090407005447.D53ED70100@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22685

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-enable-dfs.patch 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-8
- re-enable DFS for kms


radeon-enable-dfs.patch:

--- NEW FILE radeon-enable-dfs.patch ---
>From add7f96a096ac2403aae259a5a457137207015d4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 7 Apr 2009 10:48:48 +1000
Subject: [PATCH] radeon: mismerge accel dfs only if we have non-agp

---
 src/radeon_driver.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1c9d5d9..3808c34 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3622,9 +3622,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
 	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
                                                   info->cardType != CARD_AGP);
 
-	    if (info->drm_mm)
-	      info->accelDFS = FALSE;
-
 	    /* Reserve approx. half of offscreen memory for local textures by
 	     * default, can be overridden with Option "FBTexPercent".
 	     * Round down to a whole number of texture regions.
-- 
1.6.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- xorg-x11-drv-ati.spec	6 Apr 2009 23:33:34 -0000	1.171
+++ xorg-x11-drv-ati.spec	7 Apr 2009 00:54:17 -0000	1.172
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-modeset-fix-nomodeset.patch
+Patch3:     radeon-enable-dfs.patch
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
@@ -44,6 +45,7 @@
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .modeset-fix
+%patch3 -p1 -b .kms-dfs
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
@@ -78,6 +80,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-8
+- re-enable DFS for kms
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-7
 - radeon-modeset-fix-nomodeset.patch: fix no modeset paths
 



From airlied at fedoraproject.org  Tue Apr  7 01:41:00 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  7 Apr 2009 01:41:00 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset-fixes.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.172, 1.173 radeon-enable-dfs.patch,
	1.1, NONE radeon-modeset-fix-nomodeset.patch, 1.1, NONE
Message-ID: <20090407014100.5750C70100@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30679

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-fixes.patch 
Removed Files:
	radeon-enable-dfs.patch radeon-modeset-fix-nomodeset.patch 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-9
- cache mmaps for objects until remove time.


radeon-modeset-fixes.patch:

--- NEW FILE radeon-modeset-fixes.patch ---
diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c
index 6005e51..51a27f8 100644
--- a/src/radeon_bufmgr_gem.c
+++ b/src/radeon_bufmgr_gem.c
@@ -75,6 +75,7 @@ typedef struct _dri_bo_gem {
 	int force_gtt;
 	int pinned;
 	int touched;
+	void *priv_map;
 	uint32_t space_accounted;
 } dri_bo_gem;
 
@@ -146,8 +147,8 @@ static void dri_gem_bo_free(dri_bo *bo)
 	dri_bo_gem *gem_bo = (dri_bo_gem *)bo, *trav, *prev;
 	struct drm_gem_close args;
 
-	if (gem_bo->map_count)
-		munmap(gem_bo->bo.virtual, gem_bo->bo.size);
+	if (gem_bo->priv_map)
+		munmap(gem_bo->priv_map, gem_bo->bo.size);
 
 	/* close object */
 	args.handle = gem_bo->gem_handle;
@@ -200,18 +201,21 @@ dri_gem_bo_map(dri_bo *bo, int write_enable)
 	if (gem_bo->map_count++ != 0)
 		return 0;
 
-	args.handle = gem_bo->gem_handle;
-	args.offset = 0;
-	args.size = gem_bo->bo.size;
+	if (!gem_bo->priv_map) {
+		args.handle = gem_bo->gem_handle;
+		args.offset = 0;
+		args.size = gem_bo->bo.size;
 
-	ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_MMAP, &args, sizeof(args));
-	if (ret)
-		return ret;
+		ret = drmCommandWriteRead(bufmgr_gem->fd, DRM_RADEON_GEM_MMAP, &args, sizeof(args));
+		if (ret)
+			return ret;
 
-	ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, bufmgr_gem->fd, args.addr_ptr);
-	if (ptr == MAP_FAILED)
-		return -errno;
-	gem_bo->bo.virtual = ptr;
+		ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, bufmgr_gem->fd, args.addr_ptr);
+		if (ptr == MAP_FAILED)
+			return -errno;
+		gem_bo->priv_map = ptr;
+	}
+	gem_bo->bo.virtual = gem_bo->priv_map;
 
 	return ret;
 }
@@ -224,8 +228,7 @@ dri_gem_bo_unmap(dri_bo *buf)
 	if (--gem_bo->map_count > 0)
 		return 0;
 
-        munmap(gem_bo->bo.virtual, gem_bo->bo.size);
-	gem_bo->bo.virtual = 0;
+	gem_bo->bo.virtual = NULL;
 	return 0;
 }
 
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 64b5937..347ab44 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -471,7 +471,6 @@ Bool radeon_update_dri_buffers(ScreenPtr pScreen)
     if (!success)
 	return FALSE;
 
-    radeon_update_sarea(pScrn, sarea);
     radeon_update_screen_private(pScrn, sarea);
     return TRUE;
 }
@@ -1707,8 +1706,6 @@ Bool RADEONDRIDoMappings(ScreenPtr pScreen)
 	return FALSE;
     }
     
-    radeon_update_sarea(pScrn, pSAREAPriv);
-    
 				/* DRIScreenInit adds the frame buffer
 				   map, but we need it as well */
     {
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1c9d5d9..3808c34 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3622,9 +3622,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
 	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
                                                   info->cardType != CARD_AGP);
 
-	    if (info->drm_mm)
-	      info->accelDFS = FALSE;
-
 	    /* Reserve approx. half of offscreen memory for local textures by
 	     * default, can be overridden with Option "FBTexPercent".
 	     * Round down to a whole number of texture regions.


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- xorg-x11-drv-ati.spec	7 Apr 2009 00:54:17 -0000	1.172
+++ xorg-x11-drv-ati.spec	7 Apr 2009 01:40:30 -0000	1.173
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,8 +16,7 @@
 
 Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
-Patch2:     radeon-modeset-fix-nomodeset.patch
-Patch3:     radeon-enable-dfs.patch
+Patch2:     radeon-modeset-fixes.patch
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
@@ -45,7 +44,6 @@
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .modeset-fix
-%patch3 -p1 -b .kms-dfs
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
@@ -80,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-9
+- cache mmaps for objects until remove time.
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-8
 - re-enable DFS for kms
 


--- radeon-enable-dfs.patch DELETED ---


--- radeon-modeset-fix-nomodeset.patch DELETED ---



From cweyl at fedoraproject.org  Tue Apr  7 01:59:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue,  7 Apr 2009 01:59:34 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/F-10
	perl-MooseX-AttributeHelpers.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090407015934.4C65B70100@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1929

Modified Files:
	perl-MooseX-AttributeHelpers.spec sources 
Log Message:
* Mon Apr 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
- update to 0.16



Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-10/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MooseX-AttributeHelpers.spec	10 Jan 2009 19:09:10 -0000	1.9
+++ perl-MooseX-AttributeHelpers.spec	7 Apr 2009 01:59:03 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.14
+Version:        0.16
 Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
@@ -60,6 +60,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
+- update to 0.16
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - updating to 0.14
 - POD tests are now explicitly for author/maintainers only; removing deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Jan 2009 19:09:11 -0000	1.7
+++ sources	7 Apr 2009 01:59:03 -0000	1.8
@@ -1 +1 @@
-6f8589c9f8b246bb6ebff245a274b62b  MooseX-AttributeHelpers-0.14.tar.gz
+c6a4f8545483e430deaf8b4ca9d2dbae  MooseX-AttributeHelpers-0.16.tar.gz



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:31 +0000
Subject: [pkgdb] qjackctl: oget has requested watchbugzilla
Message-ID: <20090407024010.02B3E208550@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on qjackctl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Tue Apr  7 02:39:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:39:46 +0000
Subject: [pkgdb] qjackctl: oget has requested watchcommits
Message-ID: <20090407024011.250F8208556@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on qjackctl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:36 +0000
Subject: [pkgdb] qjackctl: oget has requested approveacls
Message-ID: <20090407024014.B271F208608@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on qjackctl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:31 +0000
Subject: [pkgdb] qjackctl: oget has requested commit
Message-ID: <20090407024011.5D6DD208603@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on qjackctl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:31 +0000
Subject: [pkgdb] qsynth: oget has requested watchcommits
Message-ID: <20090407024031.8978B20860F@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on qsynth (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:53 +0000
Subject: [pkgdb] qsynth: oget has requested watchbugzilla
Message-ID: <20090407024031.BFF222086F3@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on qsynth (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:09 +0000
Subject: [pkgdb] qsynth: oget has requested commit
Message-ID: <20090407024033.672E12086FF@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on qsynth (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Tue Apr  7 02:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:40:54 +0000
Subject: [pkgdb] qsynth: oget has requested approveacls
Message-ID: <20090407024034.50873208553@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on qsynth (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Tue Apr  7 02:47:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:47:27 +0000
Subject: [pkgdb] ibus-table-erbi was added for cchance
Message-ID: <20090407024707.89BA62084B7@bastion.fedora.phx.redhat.com>

petersen has added Package ibus-table-erbi with summary Erbi input method for ibus-table
petersen has approved Package ibus-table-erbi
petersen has added a Fedora devel branch for ibus-table-erbi with an owner of cchance
petersen has approved ibus-table-erbi in Fedora devel
petersen has approved Package ibus-table-erbi
petersen has set commit to Approved for provenpackager on ibus-table-erbi (Fedora devel)
petersen has set build to Approved for provenpackager on ibus-table-erbi (Fedora devel)
petersen has set checkout to Approved for provenpackager on ibus-table-erbi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-erbi



From pkgdb at fedoraproject.org  Tue Apr  7 02:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 02:47:08 +0000
Subject: [pkgdb] ibus-table-erbi (Fedora, devel) updated by petersen
Message-ID: <20090407024708.8B25B208555@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on ibus-table-erbi (Fedora devel) for i18n-team
petersen approved watchcommits on ibus-table-erbi (Fedora devel) for i18n-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-erbi



From petersen at fedoraproject.org  Tue Apr  7 02:46:52 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  7 Apr 2009 02:46:52 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel - New directory
Message-ID: <20090407024652.84BCB7013C@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsed9610/rpms/ibus-table-erbi/devel

Log Message:
Directory /cvs/pkgs/rpms/ibus-table-erbi/devel added to the repository




From petersen at fedoraproject.org  Tue Apr  7 02:46:52 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  7 Apr 2009 02:46:52 +0000 (UTC)
Subject: rpms/ibus-table-erbi - New directory
Message-ID: <20090407024652.4AAB370100@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus-table-erbi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsed9610/rpms/ibus-table-erbi

Log Message:
Directory /cvs/pkgs/rpms/ibus-table-erbi added to the repository




From petersen at fedoraproject.org  Tue Apr  7 02:47:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  7 Apr 2009 02:47:00 +0000 (UTC)
Subject: rpms/ibus-table-erbi Makefile,NONE,1.1
Message-ID: <20090407024700.712BC70100@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus-table-erbi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsed9610/rpms/ibus-table-erbi

Added Files:
	Makefile 
Log Message:
Setup of module ibus-table-erbi


--- NEW FILE Makefile ---
# Top level Makefile for module ibus-table-erbi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Tue Apr  7 02:47:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  7 Apr 2009 02:47:00 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407024700.B0CA070100@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsed9610/rpms/ibus-table-erbi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ibus-table-erbi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ibus-table-erbi
# $Id: Makefile,v 1.1 2009/04/07 02:47:00 petersen Exp $
NAME := ibus-table-erbi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From phuang at fedoraproject.org  Tue Apr  7 03:10:03 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue,  7 Apr 2009 03:10:03 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.27, 1.28 ibus.spec, 1.58, 1.59 sources,
	1.30, 1.31
Message-ID: <20090407031003.DA8A770100@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13696

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to ibus-1.1.0.20090407


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	31 Mar 2009 03:55:08 -0000	1.27
+++ .cvsignore	7 Apr 2009 03:09:32 -0000	1.28
@@ -1 +1 @@
-ibus-1.1.0.20090331.tar.gz
+ibus-1.1.0.20090407.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ibus.spec	31 Mar 2009 04:12:59 -0000	1.58
+++ ibus.spec	7 Apr 2009 03:09:32 -0000	1.59
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090331
+Version:    1.1.0.20090407
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -218,6 +218,14 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-1
+- Update to ibus-1.1.0.20090407.
+- Fix bug 491042 - ibus default trigger hotkeys
+- Fix bug 492929 - ibus-hangul can cause gtk app to lockup
+- Fix bug 493701 -  (ibus) imsettings disconnect/reconnect kills gtk app
+- Fix bug 493687 -  ibus-hangul should default to vertical candidate selection
+- Fix bug 493449 -  ibus broke Alt-F2 command auto-completion
+
 * Tue Mar 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090331-1
 - Update to ibus-1.1.0.20090331.
 - Fix bug 492956 - screws up keyboard input in firefox


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	31 Mar 2009 03:55:08 -0000	1.30
+++ sources	7 Apr 2009 03:09:32 -0000	1.31
@@ -1 +1 @@
-787a78e36da753835b059dbb46f54a40  ibus-1.1.0.20090331.tar.gz
+64c9b4d9bd33cf63082d73ce96454b5b  ibus-1.1.0.20090407.tar.gz



From pkgdb at fedoraproject.org  Tue Apr  7 03:13:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:13:36 +0000
Subject: [pkgdb] dirvish (Fedora EPEL, 5) updated by kevin
Message-ID: <20090407031336.CC397208553@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for dirvish
kevin has set commit to Approved for provenpackager on dirvish (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on dirvish (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on dirvish (Fedora EPEL 5)
kevin changed owner of dirvish in Fedora EPEL 5 to robmv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Apr  7 03:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:15:36 +0000
Subject: [pkgdb] globus-common was added for ellert
Message-ID: <20090407031536.F39FC208550@bastion.fedora.phx.redhat.com>

kevin has added Package globus-common with summary Globus Toolkit - Common Library
kevin has approved Package globus-common
kevin has added a Fedora devel branch for globus-common with an owner of ellert
kevin has approved globus-common in Fedora devel
kevin has approved Package globus-common
kevin has set commit to Approved for provenpackager on globus-common (Fedora devel)
kevin has set build to Approved for provenpackager on globus-common (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-common (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-common



From pkgdb at fedoraproject.org  Tue Apr  7 03:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:15:59 +0000
Subject: [pkgdb] globus-common (Fedora, 9) updated by kevin
Message-ID: <20090407031539.362A7208557@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-common
kevin has set commit to Approved for provenpackager on globus-common (Fedora 9)
kevin has set build to Approved for provenpackager on globus-common (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-common (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-common



From pkgdb at fedoraproject.org  Tue Apr  7 03:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:15:59 +0000
Subject: [pkgdb] globus-common (Fedora EPEL, 4) updated by kevin
Message-ID: <20090407031539.39C6E208603@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-common
kevin has set commit to Approved for provenpackager on globus-common (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-common (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-common (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-common



From pkgdb at fedoraproject.org  Tue Apr  7 03:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:15:59 +0000
Subject: [pkgdb] globus-common (Fedora EPEL, 5) updated by kevin
Message-ID: <20090407031539.4A56A208608@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-common
kevin has set commit to Approved for provenpackager on globus-common (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-common (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-common (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-common



From kevin at fedoraproject.org  Tue Apr  7 03:15:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:15:25 +0000 (UTC)
Subject: rpms/globus-common - New directory
Message-ID: <20090407031525.3FC5670100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-common
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ14744/rpms/globus-common

Log Message:
Directory /cvs/pkgs/rpms/globus-common added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:15:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:15:25 +0000 (UTC)
Subject: rpms/globus-common/devel - New directory
Message-ID: <20090407031525.8403170137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ14744/rpms/globus-common/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-common/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:15:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:15:32 +0000 (UTC)
Subject: rpms/globus-common Makefile,NONE,1.1
Message-ID: <20090407031532.C863470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-common
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ14744/rpms/globus-common

Added Files:
	Makefile 
Log Message:
Setup of module globus-common


--- NEW FILE Makefile ---
# Top level Makefile for module globus-common
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Apr  7 03:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:15:59 +0000
Subject: [pkgdb] globus-common (Fedora, 10) updated by kevin
Message-ID: <20090407031539.5C54620860F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-common
kevin has set commit to Approved for provenpackager on globus-common (Fedora 10)
kevin has set build to Approved for provenpackager on globus-common (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-common (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-common



From kevin at fedoraproject.org  Tue Apr  7 03:15:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:15:33 +0000 (UTC)
Subject: rpms/globus-common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407031533.0C40B70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ14744/rpms/globus-common/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-common


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-common
# $Id: Makefile,v 1.1 2009/04/07 03:15:32 kevin Exp $
NAME := globus-common
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:18:37 +0000
Subject: [pkgdb] rubygem-ferret was added for kanarip
Message-ID: <20090407031838.141A1208550@bastion.fedora.phx.redhat.com>

kevin has added Package rubygem-ferret with summary Full-featured text search engine library
kevin has approved Package rubygem-ferret
kevin has added a Fedora devel branch for rubygem-ferret with an owner of kanarip
kevin has approved rubygem-ferret in Fedora devel
kevin has approved Package rubygem-ferret
kevin has set commit to Approved for provenpackager on rubygem-ferret (Fedora devel)
kevin has set build to Approved for provenpackager on rubygem-ferret (Fedora devel)
kevin has set checkout to Approved for provenpackager on rubygem-ferret (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ferret



From pkgdb at fedoraproject.org  Tue Apr  7 03:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:18:59 +0000
Subject: [pkgdb] rubygem-ferret (Fedora EPEL, 5) updated by kevin
Message-ID: <20090407031839.639B6208556@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-ferret
kevin has set commit to Approved for provenpackager on rubygem-ferret (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on rubygem-ferret (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on rubygem-ferret (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ferret



From pkgdb at fedoraproject.org  Tue Apr  7 03:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:18:59 +0000
Subject: [pkgdb] rubygem-ferret (Fedora EPEL, 4) updated by kevin
Message-ID: <20090407031839.705F9208608@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for rubygem-ferret
kevin has set commit to Approved for provenpackager on rubygem-ferret (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on rubygem-ferret (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on rubygem-ferret (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ferret



From pkgdb at fedoraproject.org  Tue Apr  7 03:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:18:59 +0000
Subject: [pkgdb] rubygem-ferret (Fedora, 9) updated by kevin
Message-ID: <20090407031839.6AB9F208604@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rubygem-ferret
kevin has set commit to Approved for provenpackager on rubygem-ferret (Fedora 9)
kevin has set build to Approved for provenpackager on rubygem-ferret (Fedora 9)
kevin has set checkout to Approved for provenpackager on rubygem-ferret (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ferret



From kevin at fedoraproject.org  Tue Apr  7 03:18:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:18:22 +0000 (UTC)
Subject: rpms/rubygem-ferret/devel - New directory
Message-ID: <20090407031822.5A5647013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ferret/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15507/rpms/rubygem-ferret/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ferret/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:18:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:18:22 +0000 (UTC)
Subject: rpms/rubygem-ferret - New directory
Message-ID: <20090407031822.2F3D170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ferret
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15507/rpms/rubygem-ferret

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ferret added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:18:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:18:29 +0000 (UTC)
Subject: rpms/rubygem-ferret Makefile,NONE,1.1
Message-ID: <20090407031829.B85DE70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ferret
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15507/rpms/rubygem-ferret

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-ferret


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-ferret
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Apr  7 03:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:18:59 +0000
Subject: [pkgdb] rubygem-ferret (Fedora, 10) updated by kevin
Message-ID: <20090407031839.7DFCA20860F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-ferret
kevin has set commit to Approved for provenpackager on rubygem-ferret (Fedora 10)
kevin has set build to Approved for provenpackager on rubygem-ferret (Fedora 10)
kevin has set checkout to Approved for provenpackager on rubygem-ferret (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ferret



From kevin at fedoraproject.org  Tue Apr  7 03:18:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:18:30 +0000 (UTC)
Subject: rpms/rubygem-ferret/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407031830.2137870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ferret/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15507/rpms/rubygem-ferret/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-ferret


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-ferret
# $Id: Makefile,v 1.1 2009/04/07 03:18:29 kevin Exp $
NAME := rubygem-ferret
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:19:33 +0000
Subject: [pkgdb] xfce4-power-manager F-11 cloned from devel
Message-ID: <20090407031912.96D82208556@bastion.fedora.phx.redhat.com>

kevin cloned xfce4-power-manager F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-power-manager



From pkgdb at fedoraproject.org  Tue Apr  7 03:22:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:22:13 +0000
Subject: [pkgdb] chisholm-letterslaughing-fonts was added for ankursinha
Message-ID: <20090407032153.75952208550@bastion.fedora.phx.redhat.com>

kevin has added Package chisholm-letterslaughing-fonts with summary Letters Laughing is a decorative/LED sans-serif font
kevin has approved Package chisholm-letterslaughing-fonts
kevin has added a Fedora devel branch for chisholm-letterslaughing-fonts with an owner of ankursinha
kevin has approved chisholm-letterslaughing-fonts in Fedora devel
kevin has approved Package chisholm-letterslaughing-fonts
kevin has set commit to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-letterslaughing-fonts



From pkgdb at fedoraproject.org  Tue Apr  7 03:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:22:16 +0000
Subject: [pkgdb] chisholm-letterslaughing-fonts (Fedora, 9) updated by kevin
Message-ID: <20090407032155.EDA1E208556@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for chisholm-letterslaughing-fonts
kevin has set commit to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora 9)
kevin approved watchbugzilla on chisholm-letterslaughing-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on chisholm-letterslaughing-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-letterslaughing-fonts



From pkgdb at fedoraproject.org  Tue Apr  7 03:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:22:16 +0000
Subject: [pkgdb] chisholm-letterslaughing-fonts (Fedora, 10) updated by kevin
Message-ID: <20090407032156.1C9B3208608@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for chisholm-letterslaughing-fonts
kevin has set commit to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on chisholm-letterslaughing-fonts (Fedora 10)
kevin approved watchbugzilla on chisholm-letterslaughing-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on chisholm-letterslaughing-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-letterslaughing-fonts



From pkgdb at fedoraproject.org  Tue Apr  7 03:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:22:16 +0000
Subject: [pkgdb] chisholm-letterslaughing-fonts (Fedora,
	devel) updated by kevin
Message-ID: <20090407032156.0C255208603@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on chisholm-letterslaughing-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on chisholm-letterslaughing-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-letterslaughing-fonts



From kevin at fedoraproject.org  Tue Apr  7 03:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:21:46 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts - New directory
Message-ID: <20090407032146.3C6DB70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16364/rpms/chisholm-letterslaughing-fonts

Log Message:
Directory /cvs/pkgs/rpms/chisholm-letterslaughing-fonts added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:21:46 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts/devel - New directory
Message-ID: <20090407032146.6D2B770100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16364/rpms/chisholm-letterslaughing-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:21:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:21:53 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts Makefile,NONE,1.1
Message-ID: <20090407032153.D2F1170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16364/rpms/chisholm-letterslaughing-fonts

Added Files:
	Makefile 
Log Message:
Setup of module chisholm-letterslaughing-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module chisholm-letterslaughing-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:21:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:21:54 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090407032154.1F2E07013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16364/rpms/chisholm-letterslaughing-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chisholm-letterslaughing-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: chisholm-letterslaughing-fonts
# $Id: Makefile,v 1.1 2009/04/07 03:21:53 kevin Exp $
NAME := chisholm-letterslaughing-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:23:13 +0000
Subject: [pkgdb] mingw32-glibmm24 was added for sailer
Message-ID: <20090407032251.B400320854A@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-glibmm24 with summary MinGW Windows C++ interface for GTK2 (a GUI library for X)
kevin has approved Package mingw32-glibmm24
kevin has added a Fedora devel branch for mingw32-glibmm24 with an owner of sailer
kevin has approved mingw32-glibmm24 in Fedora devel
kevin has approved Package mingw32-glibmm24
kevin has set commit to Approved for provenpackager on mingw32-glibmm24 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-glibmm24 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-glibmm24 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glibmm24



From pkgdb at fedoraproject.org  Tue Apr  7 03:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:23:15 +0000
Subject: [pkgdb] mingw32-glibmm24 (Fedora, devel) updated by kevin
Message-ID: <20090407032253.F1488208604@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-glibmm24 (Fedora devel) for rjones
kevin approved watchcommits on mingw32-glibmm24 (Fedora devel) for rjones
kevin approved commit on mingw32-glibmm24 (Fedora devel) for rjones
kevin approved build on mingw32-glibmm24 (Fedora devel) for rjones
kevin approved approveacls on mingw32-glibmm24 (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glibmm24



From pkgdb at fedoraproject.org  Tue Apr  7 03:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:23:15 +0000
Subject: [pkgdb] mingw32-glibmm24 (Fedora, 10) updated by kevin
Message-ID: <20090407032254.137C220860B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-glibmm24
kevin has set commit to Approved for provenpackager on mingw32-glibmm24 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-glibmm24 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-glibmm24 (Fedora 10)
kevin approved watchbugzilla on mingw32-glibmm24 (Fedora 10) for rjones
kevin approved watchcommits on mingw32-glibmm24 (Fedora 10) for rjones
kevin approved commit on mingw32-glibmm24 (Fedora 10) for rjones
kevin approved build on mingw32-glibmm24 (Fedora 10) for rjones
kevin approved approveacls on mingw32-glibmm24 (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glibmm24



From kevin at fedoraproject.org  Tue Apr  7 03:22:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:22:37 +0000 (UTC)
Subject: rpms/mingw32-glibmm24 - New directory
Message-ID: <20090407032237.22A9470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glibmm24
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16618/rpms/mingw32-glibmm24

Log Message:
Directory /cvs/pkgs/rpms/mingw32-glibmm24 added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:22:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:22:37 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel - New directory
Message-ID: <20090407032237.5CE7C70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16618/rpms/mingw32-glibmm24/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-glibmm24/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:22:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:22:45 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407032245.0EC2F70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16618/rpms/mingw32-glibmm24/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-glibmm24


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-glibmm24
# $Id: Makefile,v 1.1 2009/04/07 03:22:44 kevin Exp $
NAME := mingw32-glibmm24
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Apr  7 03:22:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:22:44 +0000 (UTC)
Subject: rpms/mingw32-glibmm24 Makefile,NONE,1.1
Message-ID: <20090407032244.A8E4570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glibmm24
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16618/rpms/mingw32-glibmm24

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-glibmm24


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-glibmm24
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Apr  7 03:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:24:00 +0000
Subject: [pkgdb] healpix was added for lkundrak
Message-ID: <20090407032425.4B40620854A@bastion.fedora.phx.redhat.com>

kevin has added Package healpix with summary Hierarchical Equal Area isoLatitude Pixelization of a sphere
kevin has approved Package healpix
kevin has added a Fedora devel branch for healpix with an owner of lkundrak
kevin has approved healpix in Fedora devel
kevin has approved Package healpix
kevin has set commit to Approved for provenpackager on healpix (Fedora devel)
kevin has set build to Approved for provenpackager on healpix (Fedora devel)
kevin has set checkout to Approved for provenpackager on healpix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/healpix



From pkgdb at fedoraproject.org  Tue Apr  7 03:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:24:47 +0000
Subject: [pkgdb] healpix (Fedora, 11) updated by kevin
Message-ID: <20090407032427.9C39B208555@bastion.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for healpix
kevin has set commit to Approved for provenpackager on healpix (Fedora 11)
kevin has set build to Approved for provenpackager on healpix (Fedora 11)
kevin has set checkout to Approved for provenpackager on healpix (Fedora 11)
kevin approved watchbugzilla on healpix (Fedora 11) for astronomy-sig
kevin approved watchcommits on healpix (Fedora 11) for astronomy-sig
kevin approved watchbugzilla on healpix (Fedora 11) for jussilehtola
kevin approved watchcommits on healpix (Fedora 11) for jussilehtola
kevin approved commit on healpix (Fedora 11) for jussilehtola
kevin approved build on healpix (Fedora 11) for jussilehtola
kevin approved approveacls on healpix (Fedora 11) for jussilehtola

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/healpix



From pkgdb at fedoraproject.org  Tue Apr  7 03:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:24:47 +0000
Subject: [pkgdb] healpix (Fedora EPEL, 5) updated by kevin
Message-ID: <20090407032427.AADDF208604@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for healpix
kevin has set commit to Approved for provenpackager on healpix (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on healpix (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on healpix (Fedora EPEL 5)
kevin approved watchbugzilla on healpix (Fedora EPEL 5) for astronomy-sig
kevin approved watchcommits on healpix (Fedora EPEL 5) for astronomy-sig
kevin approved watchbugzilla on healpix (Fedora EPEL 5) for jussilehtola
kevin approved watchcommits on healpix (Fedora EPEL 5) for jussilehtola
kevin approved commit on healpix (Fedora EPEL 5) for jussilehtola
kevin approved build on healpix (Fedora EPEL 5) for jussilehtola
kevin approved approveacls on healpix (Fedora EPEL 5) for jussilehtola

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/healpix



From pkgdb at fedoraproject.org  Tue Apr  7 03:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:24:48 +0000
Subject: [pkgdb] healpix (Fedora, 10) updated by kevin
Message-ID: <20090407032427.B9C7020860B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for healpix
kevin has set commit to Approved for provenpackager on healpix (Fedora 10)
kevin has set build to Approved for provenpackager on healpix (Fedora 10)
kevin has set checkout to Approved for provenpackager on healpix (Fedora 10)
kevin approved watchbugzilla on healpix (Fedora 10) for astronomy-sig
kevin approved watchcommits on healpix (Fedora 10) for astronomy-sig
kevin approved watchbugzilla on healpix (Fedora 10) for jussilehtola
kevin approved watchcommits on healpix (Fedora 10) for jussilehtola
kevin approved commit on healpix (Fedora 10) for jussilehtola
kevin approved build on healpix (Fedora 10) for jussilehtola
kevin approved approveacls on healpix (Fedora 10) for jussilehtola

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/healpix



From kevin at fedoraproject.org  Tue Apr  7 03:24:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:24:12 +0000 (UTC)
Subject: rpms/healpix - New directory
Message-ID: <20090407032412.23B2870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/healpix
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16922/rpms/healpix

Log Message:
Directory /cvs/pkgs/rpms/healpix added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:24:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:24:12 +0000 (UTC)
Subject: rpms/healpix/devel - New directory
Message-ID: <20090407032412.5728370100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16922/rpms/healpix/devel

Log Message:
Directory /cvs/pkgs/rpms/healpix/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr  7 03:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:24:48 +0000
Subject: [pkgdb] healpix (Fedora, devel) updated by kevin
Message-ID: <20090407032427.C99992086F3@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on healpix (Fedora devel) for astronomy-sig
kevin approved watchcommits on healpix (Fedora devel) for astronomy-sig
kevin approved watchbugzilla on healpix (Fedora devel) for jussilehtola
kevin approved watchcommits on healpix (Fedora devel) for jussilehtola
kevin approved commit on healpix (Fedora devel) for jussilehtola
kevin approved build on healpix (Fedora devel) for jussilehtola
kevin approved approveacls on healpix (Fedora devel) for jussilehtola

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/healpix



From kevin at fedoraproject.org  Tue Apr  7 03:24:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:24:19 +0000 (UTC)
Subject: rpms/healpix Makefile,NONE,1.1
Message-ID: <20090407032419.DF12B70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/healpix
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16922/rpms/healpix

Added Files:
	Makefile 
Log Message:
Setup of module healpix


--- NEW FILE Makefile ---
# Top level Makefile for module healpix
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:24:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:24:20 +0000 (UTC)
Subject: rpms/healpix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090407032420.2D2F870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM16922/rpms/healpix/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module healpix


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: healpix
# $Id: Makefile,v 1.1 2009/04/07 03:24:20 kevin Exp $
NAME := healpix
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:25:05 +0000
Subject: [pkgdb] libmkv was added for bjohnson
Message-ID: <20090407032529.DDD6D2086EF@bastion.fedora.phx.redhat.com>

kevin has added Package libmkv with summary An alternative to the official libmatroska library
kevin has approved Package libmkv
kevin has added a Fedora devel branch for libmkv with an owner of bjohnson
kevin has approved libmkv in Fedora devel
kevin has approved Package libmkv
kevin has set commit to Approved for provenpackager on libmkv (Fedora devel)
kevin has set build to Approved for provenpackager on libmkv (Fedora devel)
kevin has set checkout to Approved for provenpackager on libmkv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmkv



From pkgdb at fedoraproject.org  Tue Apr  7 03:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:25:06 +0000
Subject: [pkgdb] libmkv (Fedora, 10) updated by kevin
Message-ID: <20090407032531.665B22086F3@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libmkv
kevin has set commit to Approved for provenpackager on libmkv (Fedora 10)
kevin has set build to Approved for provenpackager on libmkv (Fedora 10)
kevin has set checkout to Approved for provenpackager on libmkv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmkv



From kevin at fedoraproject.org  Tue Apr  7 03:25:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:25:15 +0000 (UTC)
Subject: rpms/libmkv - New directory
Message-ID: <20090407032515.23FEC70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmkv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17275/rpms/libmkv

Log Message:
Directory /cvs/pkgs/rpms/libmkv added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:25:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:25:15 +0000 (UTC)
Subject: rpms/libmkv/devel - New directory
Message-ID: <20090407032515.5981870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmkv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17275/rpms/libmkv/devel

Log Message:
Directory /cvs/pkgs/rpms/libmkv/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:25:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:25:22 +0000 (UTC)
Subject: rpms/libmkv Makefile,NONE,1.1
Message-ID: <20090407032522.C764670100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmkv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17275/rpms/libmkv

Added Files:
	Makefile 
Log Message:
Setup of module libmkv


--- NEW FILE Makefile ---
# Top level Makefile for module libmkv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:25:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:25:23 +0000 (UTC)
Subject: rpms/libmkv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090407032523.2632D70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmkv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17275/rpms/libmkv/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmkv


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libmkv
# $Id: Makefile,v 1.1 2009/04/07 03:25:22 kevin Exp $
NAME := libmkv
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:26:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:26:54 +0000
Subject: [pkgdb] redir was added for itamarjp
Message-ID: <20090407032632.DF364208555@bastion.fedora.phx.redhat.com>

kevin has added Package redir with summary Redirect TCP connections
kevin has approved Package redir
kevin has added a Fedora devel branch for redir with an owner of itamarjp
kevin has approved redir in Fedora devel
kevin has approved Package redir
kevin has set commit to Approved for provenpackager on redir (Fedora devel)
kevin has set build to Approved for provenpackager on redir (Fedora devel)
kevin has set checkout to Approved for provenpackager on redir (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redir



From pkgdb at fedoraproject.org  Tue Apr  7 03:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:26:55 +0000
Subject: [pkgdb] redir (Fedora, 10) updated by kevin
Message-ID: <20090407032634.EDEC2208602@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for redir
kevin has set commit to Approved for provenpackager on redir (Fedora 10)
kevin has set build to Approved for provenpackager on redir (Fedora 10)
kevin has set checkout to Approved for provenpackager on redir (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redir



From pkgdb at fedoraproject.org  Tue Apr  7 03:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:26:55 +0000
Subject: [pkgdb] redir (Fedora, 11) updated by kevin
Message-ID: <20090407032635.06C77208605@bastion.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for redir
kevin has set commit to Approved for provenpackager on redir (Fedora 11)
kevin has set build to Approved for provenpackager on redir (Fedora 11)
kevin has set checkout to Approved for provenpackager on redir (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redir



From kevin at fedoraproject.org  Tue Apr  7 03:26:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:26:19 +0000 (UTC)
Subject: rpms/redir - New directory
Message-ID: <20090407032619.25CC970100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/redir
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17435/rpms/redir

Log Message:
Directory /cvs/pkgs/rpms/redir added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:26:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:26:19 +0000 (UTC)
Subject: rpms/redir/devel - New directory
Message-ID: <20090407032619.630CF70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/redir/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17435/rpms/redir/devel

Log Message:
Directory /cvs/pkgs/rpms/redir/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr  7 03:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:26:55 +0000
Subject: [pkgdb] redir (Fedora, 9) updated by kevin
Message-ID: <20090407032635.23C7520860B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for redir
kevin has set commit to Approved for provenpackager on redir (Fedora 9)
kevin has set build to Approved for provenpackager on redir (Fedora 9)
kevin has set checkout to Approved for provenpackager on redir (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redir



From kevin at fedoraproject.org  Tue Apr  7 03:26:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:26:26 +0000 (UTC)
Subject: rpms/redir Makefile,NONE,1.1
Message-ID: <20090407032626.DE7CD70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/redir
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17435/rpms/redir

Added Files:
	Makefile 
Log Message:
Setup of module redir


--- NEW FILE Makefile ---
# Top level Makefile for module redir
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:26:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:26:27 +0000 (UTC)
Subject: rpms/redir/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090407032627.2004D70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/redir/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17435/rpms/redir/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module redir


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: redir
# $Id: Makefile,v 1.1 2009/04/07 03:26:26 kevin Exp $
NAME := redir
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:28:33 +0000
Subject: [pkgdb] pidgin-privacy-please (Fedora EPEL, 5) updated by kevin
Message-ID: <20090407032833.7D294208550@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pidgin-privacy-please
kevin has set commit to Approved for provenpackager on pidgin-privacy-please (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pidgin-privacy-please (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pidgin-privacy-please (Fedora EPEL 5)
kevin changed owner of pidgin-privacy-please in Fedora EPEL 5 to llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-privacy-please



From pkgdb at fedoraproject.org  Tue Apr  7 03:29:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:29:02 +0000
Subject: [pkgdb] perl-Devel-Hide was added for iarnell
Message-ID: <20090407032926.D451B208553@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Devel-Hide with summary Forces the unavailability of specified Perl modules
kevin has approved Package perl-Devel-Hide
kevin has added a Fedora devel branch for perl-Devel-Hide with an owner of iarnell
kevin has approved perl-Devel-Hide in Fedora devel
kevin has approved Package perl-Devel-Hide
kevin has set commit to Approved for provenpackager on perl-Devel-Hide (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Devel-Hide (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Devel-Hide (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Hide



From pkgdb at fedoraproject.org  Tue Apr  7 03:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:29:04 +0000
Subject: [pkgdb] perl-Devel-Hide (Fedora, 9) updated by kevin
Message-ID: <20090407032928.9928F208557@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Devel-Hide
kevin has set commit to Approved for provenpackager on perl-Devel-Hide (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Devel-Hide (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Devel-Hide (Fedora 9)
kevin approved watchbugzilla on perl-Devel-Hide (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Devel-Hide (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Hide



From pkgdb at fedoraproject.org  Tue Apr  7 03:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:29:04 +0000
Subject: [pkgdb] perl-Devel-Hide (Fedora, 10) updated by kevin
Message-ID: <20090407032929.65D91208604@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Devel-Hide
kevin has set commit to Approved for provenpackager on perl-Devel-Hide (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Devel-Hide (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Devel-Hide (Fedora 10)
kevin approved watchbugzilla on perl-Devel-Hide (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Devel-Hide (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Hide



From kevin at fedoraproject.org  Tue Apr  7 03:29:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:29:12 +0000 (UTC)
Subject: rpms/perl-Devel-Hide - New directory
Message-ID: <20090407032912.2A7D570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Hide
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18741/rpms/perl-Devel-Hide

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-Hide added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:29:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:29:12 +0000 (UTC)
Subject: rpms/perl-Devel-Hide/devel - New directory
Message-ID: <20090407032912.6C67D70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Hide/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18741/rpms/perl-Devel-Hide/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-Hide/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr  7 03:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:29:04 +0000
Subject: [pkgdb] perl-Devel-Hide (Fedora, devel) updated by kevin
Message-ID: <20090407032930.2174B20860F@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Devel-Hide (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Devel-Hide (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Hide



From kevin at fedoraproject.org  Tue Apr  7 03:29:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:29:19 +0000 (UTC)
Subject: rpms/perl-Devel-Hide Makefile,NONE,1.1
Message-ID: <20090407032919.B7EDB70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Hide
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18741/rpms/perl-Devel-Hide

Added Files:
	Makefile 
Log Message:
Setup of module perl-Devel-Hide


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Devel-Hide
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:29:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:29:19 +0000 (UTC)
Subject: rpms/perl-Devel-Hide/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407032919.EFB7B7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Hide/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18741/rpms/perl-Devel-Hide/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Devel-Hide


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Devel-Hide
# $Id: Makefile,v 1.1 2009/04/07 03:29:19 kevin Exp $
NAME := perl-Devel-Hide
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:29:50 +0000
Subject: [pkgdb] perl-Term-Size-Perl was added for iarnell
Message-ID: <20090407033014.DB0DF208605@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Term-Size-Perl with summary Perl extension for retrieving terminal size
kevin has approved Package perl-Term-Size-Perl
kevin has added a Fedora devel branch for perl-Term-Size-Perl with an owner of iarnell
kevin has approved perl-Term-Size-Perl in Fedora devel
kevin has approved Package perl-Term-Size-Perl
kevin has set commit to Approved for provenpackager on perl-Term-Size-Perl (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Term-Size-Perl (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Term-Size-Perl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Perl



From pkgdb at fedoraproject.org  Tue Apr  7 03:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:30:38 +0000
Subject: [pkgdb] perl-Term-Size-Perl (Fedora, 9) updated by kevin
Message-ID: <20090407033016.DD0BC20860F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Term-Size-Perl
kevin has set commit to Approved for provenpackager on perl-Term-Size-Perl (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Term-Size-Perl (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Term-Size-Perl (Fedora 9)
kevin approved watchbugzilla on perl-Term-Size-Perl (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Term-Size-Perl (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Perl



From pkgdb at fedoraproject.org  Tue Apr  7 03:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:30:38 +0000
Subject: [pkgdb] perl-Term-Size-Perl (Fedora, 10) updated by kevin
Message-ID: <20090407033016.EC1BE208553@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Term-Size-Perl
kevin has set commit to Approved for provenpackager on perl-Term-Size-Perl (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Term-Size-Perl (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Term-Size-Perl (Fedora 10)
kevin approved watchbugzilla on perl-Term-Size-Perl (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Term-Size-Perl (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Perl



From kevin at fedoraproject.org  Tue Apr  7 03:30:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:00 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl - New directory
Message-ID: <20090407033000.374EE70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19020/rpms/perl-Term-Size-Perl

Log Message:
Directory /cvs/pkgs/rpms/perl-Term-Size-Perl added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:30:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:00 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl/devel - New directory
Message-ID: <20090407033000.6ACE070100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19020/rpms/perl-Term-Size-Perl/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Term-Size-Perl/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr  7 03:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:30:38 +0000
Subject: [pkgdb] perl-Term-Size-Perl (Fedora, devel) updated by kevin
Message-ID: <20090407033017.11A242086F3@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Term-Size-Perl (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Term-Size-Perl (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Perl



From kevin at fedoraproject.org  Tue Apr  7 03:30:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:07 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl Makefile,NONE,1.1
Message-ID: <20090407033007.E54D470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19020/rpms/perl-Term-Size-Perl

Added Files:
	Makefile 
Log Message:
Setup of module perl-Term-Size-Perl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Term-Size-Perl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:30:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:08 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407033008.271CE70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19020/rpms/perl-Term-Size-Perl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Term-Size-Perl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Term-Size-Perl
# $Id: Makefile,v 1.1 2009/04/07 03:30:08 kevin Exp $
NAME := perl-Term-Size-Perl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:31:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:31:25 +0000
Subject: [pkgdb] perl-Test-Assertions was added for iarnell
Message-ID: <20090407033103.D85DB208555@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Test-Assertions with summary Simple set of building blocks for both unit and runtime testing
kevin has approved Package perl-Test-Assertions
kevin has added a Fedora devel branch for perl-Test-Assertions with an owner of iarnell
kevin has approved perl-Test-Assertions in Fedora devel
kevin has approved Package perl-Test-Assertions
kevin has set commit to Approved for provenpackager on perl-Test-Assertions (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Test-Assertions (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Test-Assertions (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Assertions



From pkgdb at fedoraproject.org  Tue Apr  7 03:31:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:31:05 +0000
Subject: [pkgdb] perl-Test-Assertions (Fedora, 9) updated by kevin
Message-ID: <20090407033106.0B4B1208602@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Test-Assertions
kevin has set commit to Approved for provenpackager on perl-Test-Assertions (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Test-Assertions (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Test-Assertions (Fedora 9)
kevin approved watchbugzilla on perl-Test-Assertions (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Test-Assertions (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Assertions



From pkgdb at fedoraproject.org  Tue Apr  7 03:31:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:31:05 +0000
Subject: [pkgdb] perl-Test-Assertions (Fedora, 10) updated by kevin
Message-ID: <20090407033106.14C93208605@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Test-Assertions
kevin has set commit to Approved for provenpackager on perl-Test-Assertions (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Test-Assertions (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Test-Assertions (Fedora 10)
kevin approved watchbugzilla on perl-Test-Assertions (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Test-Assertions (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Assertions



From pkgdb at fedoraproject.org  Tue Apr  7 03:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:31:06 +0000
Subject: [pkgdb] perl-Test-Assertions (Fedora, devel) updated by kevin
Message-ID: <20090407033106.21F5120860B@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-Assertions (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-Assertions (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Assertions



From kevin at fedoraproject.org  Tue Apr  7 03:30:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:51 +0000 (UTC)
Subject: rpms/perl-Test-Assertions - New directory
Message-ID: <20090407033051.1FC8D70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Assertions
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19306/rpms/perl-Test-Assertions

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Assertions added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:30:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:51 +0000 (UTC)
Subject: rpms/perl-Test-Assertions/devel - New directory
Message-ID: <20090407033051.516387013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Assertions/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19306/rpms/perl-Test-Assertions/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Assertions/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:30:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:58 +0000 (UTC)
Subject: rpms/perl-Test-Assertions Makefile,NONE,1.1
Message-ID: <20090407033058.B41A070100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Assertions
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19306/rpms/perl-Test-Assertions

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-Assertions


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Assertions
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr  7 03:30:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:30:59 +0000 (UTC)
Subject: rpms/perl-Test-Assertions/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090407033059.0AEF170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Assertions/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19306/rpms/perl-Test-Assertions/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Assertions


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-Assertions
# $Id: Makefile,v 1.1 2009/04/07 03:30:58 kevin Exp $
NAME := perl-Test-Assertions
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr  7 03:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:32:20 +0000
Subject: [pkgdb] pyrrd was added for fab
Message-ID: <20090407033200.B9637208603@bastion.fedora.phx.redhat.com>

kevin has added Package pyrrd with summary A Pure Python Wrapper for RRDTool
kevin has approved Package pyrrd
kevin has added a Fedora devel branch for pyrrd with an owner of fab
kevin has approved pyrrd in Fedora devel
kevin has approved Package pyrrd
kevin has set commit to Approved for provenpackager on pyrrd (Fedora devel)
kevin has set build to Approved for provenpackager on pyrrd (Fedora devel)
kevin has set checkout to Approved for provenpackager on pyrrd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyrrd



From pkgdb at fedoraproject.org  Tue Apr  7 03:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:32:24 +0000
Subject: [pkgdb] pyrrd (Fedora, 9) updated by kevin
Message-ID: <20090407033203.79C5820854A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pyrrd
kevin has set commit to Approved for provenpackager on pyrrd (Fedora 9)
kevin has set build to Approved for provenpackager on pyrrd (Fedora 9)
kevin has set checkout to Approved for provenpackager on pyrrd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyrrd



From kevin at fedoraproject.org  Tue Apr  7 03:31:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:31:47 +0000 (UTC)
Subject: rpms/pyrrd - New directory
Message-ID: <20090407033147.2164670100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyrrd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX19617/rpms/pyrrd

Log Message:
Directory /cvs/pkgs/rpms/pyrrd added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:31:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:31:47 +0000 (UTC)
Subject: rpms/pyrrd/devel - New directory
Message-ID: <20090407033147.58BC170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyrrd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX19617/rpms/pyrrd/devel

Log Message:
Directory /cvs/pkgs/rpms/pyrrd/devel added to the repository




From kevin at fedoraproject.org  Tue Apr  7 03:31:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:31:54 +0000 (UTC)
Subject: rpms/pyrrd Makefile,NONE,1.1
Message-ID: <20090407033154.E417C70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyrrd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX19617/rpms/pyrrd

Added Files:
	Makefile 
Log Message:
Setup of module pyrrd


--- NEW FILE Makefile ---
# Top level Makefile for module pyrrd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Apr  7 03:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 03:32:24 +0000
Subject: [pkgdb] pyrrd (Fedora, 10) updated by kevin
Message-ID: <20090407033203.A237820860B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pyrrd
kevin has set commit to Approved for provenpackager on pyrrd (Fedora 10)
kevin has set build to Approved for provenpackager on pyrrd (Fedora 10)
kevin has set checkout to Approved for provenpackager on pyrrd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyrrd



From kevin at fedoraproject.org  Tue Apr  7 03:31:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 03:31:55 +0000 (UTC)
Subject: rpms/pyrrd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090407033155.2AAA170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyrrd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX19617/rpms/pyrrd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyrrd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pyrrd
# $Id: Makefile,v 1.1 2009/04/07 03:31:55 kevin Exp $
NAME := pyrrd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rishi at fedoraproject.org  Tue Apr  7 03:34:24 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  7 Apr 2009 03:34:24 +0000 (UTC)
Subject: rpms/anjuta/devel .cvsignore, 1.17, 1.18 anjuta.spec, 1.69,
	1.70 sources, 1.17, 1.18 anjuta-2.25.903.0-configure.patch, 1.1, NONE
Message-ID: <20090407033424.EA80970100@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20137

Modified Files:
	.cvsignore anjuta.spec sources 
Removed Files:
	anjuta-2.25.903.0-configure.patch 
Log Message:
* Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-1
- Version bump to 2.26.0.1.
  * Get rid of libgnomecanvas. (GNOME Bugzilla #571740)
  * Huge improvements in the tooltip area.
  * Prevent hang when pressing backspace in the editor.
  * Git plugin:
    + Fixed crash.
  * GtkSourceView editor plugin:
    + Actually save modified files on exit. (GNOME Bugzilla #574376)
  * Language support (C, C++, Java) plugin:
    + Showing calltips should not hinder editing. (GNOME Bugzilla #574802)
  * Scintilla editor plugin:
    + Use line endings correctly. (GNOME Bugzilla #574607)
  * Search plugin:
    + Should point to correct line number. (GNOME Bugzilla #576959)
  * Translation updates: pt_BR, en_GB, da, fi, fr, gl, el, it, ca, pt, sv, es,
    tr, hu, vi, de, sl, ru, ja, mr, ar, th and pl.
  * http://ftp.acc.umu.se/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.news
- configure fixes accepted by upstream.
- Stripped redundant translations from .mo files. (GNOME Bugzilla #474987)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	11 Mar 2009 11:25:43 -0000	1.17
+++ .cvsignore	7 Apr 2009 03:33:54 -0000	1.18
@@ -1 +1 @@
-anjuta-2.25.903.0.tar.gz
+anjuta-2.26.0.1.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- anjuta.spec	11 Mar 2009 11:25:43 -0000	1.69
+++ anjuta.spec	7 Apr 2009 03:33:54 -0000	1.70
@@ -1,14 +1,12 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.25.903.0
+Version:	2.26.0.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/%{name}-%{version}.tar.gz
-
-Patch0:		%{name}-%{version}-configure.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/%{name}-%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,13 +32,13 @@
 BuildRequires:	devhelp-devel >= 0.22
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	gettext
-BuildRequires:	glade3-libgladeui-devel >= 3.5.7
+BuildRequires:	glade3-libgladeui-devel >= 3.6.0
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtksourceview2-devel >= 2.3.1
+BuildRequires:	gtksourceview2-devel >= 2.4.0
 BuildRequires:	libgda-devel >= 3.99.7
 BuildRequires:	graphviz-devel
 BuildRequires:	intltool
-BuildRequires:	libgdl-devel >= 2.23.0
+BuildRequires:	libgdl-devel >= 2.26.0
 BuildRequires:	libgnomeui-devel
 BuildRequires:	neon-devel
 BuildRequires:	pcre-devel
@@ -48,7 +46,7 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
 BuildRequires:	subversion-devel
-BuildRequires:	unique-devel
+BuildRequires:	unique-devel >= 1.0.0
 BuildRequires:	vte-devel
 
 %description
@@ -93,7 +91,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Filter unwanted Provides.
 cat << \EOF > %{name}-prov
@@ -141,7 +138,7 @@
 %build
 export PKG_CONFIG_PATH="./PKGCONFIG"
 %configure --disable-schemas-install --disable-static --enable-gtk-doc \
-  --enable-devhelp --enable-graphviz --enable-plugin-glade \
+  --enable-plugin-devhelp --enable-graphviz --enable-plugin-glade \
   --enable-plugin-scintilla --enable-plugin-sourceview \
   --enable-plugin-subversion --enable-plugin-valgrind \
   --with-svn-lib=%{_libdir}
@@ -151,6 +148,20 @@
 
 make %{?_smp_mflags}
 
+# Strip unneeded translations from .mo files:
+# http://bugzilla.gnome.org/474987
+pushd ./po
+  grep --invert-match \
+    ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" \
+    POTFILES.in > POTFILES.keep
+  mv POTFILES.keep POTFILES.in
+  intltool-update --pot
+  for p in *.po; do
+    msgmerge $p %{name}.pot > $p.out
+    msgfmt -o `basename $p .po`.gmo $p.out
+  done
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -311,6 +322,27 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-1
+- Version bump to 2.26.0.1.
+  * Get rid of libgnomecanvas. (GNOME Bugzilla #571740)
+  * Huge improvements in the tooltip area.
+  * Prevent hang when pressing backspace in the editor.
+  * Git plugin:
+    + Fixed crash.
+  * GtkSourceView editor plugin:
+    + Actually save modified files on exit. (GNOME Bugzilla #574376)
+  * Language support (C, C++, Java) plugin:
+    + Showing calltips should not hinder editing. (GNOME Bugzilla #574802)
+  * Scintilla editor plugin:
+    + Use line endings correctly. (GNOME Bugzilla #574607)
+  * Search plugin:
+    + Should point to correct line number. (GNOME Bugzilla #576959)
+  * Translation updates: pt_BR, en_GB, da, fi, fr, gl, el, it, ca, pt, sv, es,
+    tr, hu, vi, de, sl, ru, ja, mr, ar, th and pl.
+  * http://ftp.acc.umu.se/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.news
+- configure fixes accepted by upstream.
+- Stripped redundant translations from .mo files. (GNOME Bugzilla #474987)
+
 * Tue Mar 10 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.25.903.0-1
 - Version bump to 2.25.903.0.
   * Fixed Glade and version control integration.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Mar 2009 11:25:44 -0000	1.17
+++ sources	7 Apr 2009 03:33:54 -0000	1.18
@@ -1 +1 @@
-de93cc2a14f0169a29f0c10e18ff1c52  anjuta-2.25.903.0.tar.gz
+35624d399ae9083a46deb9e7f2da8bcb  anjuta-2.26.0.1.tar.gz


--- anjuta-2.25.903.0-configure.patch DELETED ---



From iarnell at fedoraproject.org  Tue Apr  7 03:46:07 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 03:46:07 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl/F-10 perl-Term-Size-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407034607.451BA70100@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22393/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-Size-Perl.spec 
Log Message:
initial import


--- NEW FILE perl-Term-Size-Perl.spec ---
Name:           perl-Term-Size-Perl
Version:        0.029
Release:        2%{?dist}
Summary:        Perl extension for retrieving terminal size (Perl version)
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-Size-Perl/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::CBuilder)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# although the resulting rpm appears to be noarch, the build is arch-dependent
# and produces different code for ppc and x86
%global  debug_package %nil

%description
Yet another implementation of Term::Size. Now in pure Perl, with the
exception of a C probe run on build time.

%prep
%setup -q -n Term-Size-Perl-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 07 2009 Iain Arnell <iarnell at gmail.com> 0.029-2
- BR Test::Pod Test::Pod::Coverage

* Sat Apr 04 2009 Iain Arnell 0.029-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:30:08 -0000	1.1
+++ .cvsignore	7 Apr 2009 03:45:36 -0000	1.2
@@ -0,0 +1 @@
+Term-Size-Perl-0.029.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:30:08 -0000	1.1
+++ sources	7 Apr 2009 03:45:36 -0000	1.2
@@ -0,0 +1 @@
+e647aed35b0c4973e949c311a8222dbf  Term-Size-Perl-0.029.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 03:46:07 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 03:46:07 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl/devel perl-Term-Size-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407034607.A401270100@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22393/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-Size-Perl.spec 
Log Message:
initial import


--- NEW FILE perl-Term-Size-Perl.spec ---
Name:           perl-Term-Size-Perl
Version:        0.029
Release:        2%{?dist}
Summary:        Perl extension for retrieving terminal size (Perl version)
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-Size-Perl/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::CBuilder)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# although the resulting rpm appears to be noarch, the build is arch-dependent
# and produces different code for ppc and x86
%global  debug_package %nil

%description
Yet another implementation of Term::Size. Now in pure Perl, with the
exception of a C probe run on build time.

%prep
%setup -q -n Term-Size-Perl-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 07 2009 Iain Arnell <iarnell at gmail.com> 0.029-2
- BR Test::Pod Test::Pod::Coverage

* Sat Apr 04 2009 Iain Arnell 0.029-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:30:08 -0000	1.1
+++ .cvsignore	7 Apr 2009 03:45:37 -0000	1.2
@@ -0,0 +1 @@
+Term-Size-Perl-0.029.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:30:08 -0000	1.1
+++ sources	7 Apr 2009 03:45:37 -0000	1.2
@@ -0,0 +1 @@
+e647aed35b0c4973e949c311a8222dbf  Term-Size-Perl-0.029.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 03:46:07 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 03:46:07 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl/F-9 perl-Term-Size-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407034607.72C9270100@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22393/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-Size-Perl.spec 
Log Message:
initial import


--- NEW FILE perl-Term-Size-Perl.spec ---
Name:           perl-Term-Size-Perl
Version:        0.029
Release:        2%{?dist}
Summary:        Perl extension for retrieving terminal size (Perl version)
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-Size-Perl/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::CBuilder)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

# although the resulting rpm appears to be noarch, the build is arch-dependent
# and produces different code for ppc and x86
%global  debug_package %nil

%description
Yet another implementation of Term::Size. Now in pure Perl, with the
exception of a C probe run on build time.

%prep
%setup -q -n Term-Size-Perl-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 07 2009 Iain Arnell <iarnell at gmail.com> 0.029-2
- BR Test::Pod Test::Pod::Coverage

* Sat Apr 04 2009 Iain Arnell 0.029-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:30:08 -0000	1.1
+++ .cvsignore	7 Apr 2009 03:45:37 -0000	1.2
@@ -0,0 +1 @@
+Term-Size-Perl-0.029.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:30:08 -0000	1.1
+++ sources	7 Apr 2009 03:45:37 -0000	1.2
@@ -0,0 +1 @@
+e647aed35b0c4973e949c311a8222dbf  Term-Size-Perl-0.029.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 03:53:51 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 03:53:51 +0000 (UTC)
Subject: rpms/perl-Devel-Hide/F-10 perl-Devel-Hide.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407035351.09DC670100@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-Hide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23980/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-Hide.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-Hide.spec ---
Name:           perl-Devel-Hide
Version:        0.0008
Release:        1%{?dist}
Summary:        Forces the unavailability of specified Perl modules (for testing)
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-Hide/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Devel-Hide-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod) >= 1.18
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a list of Perl modules/filenames, this module makes require and
use statements fail (no matter the specified files/modules are
installed or not).

%prep
%setup -q -n Devel-Hide-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 0.0008-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:29:19 -0000	1.1
+++ .cvsignore	7 Apr 2009 03:53:20 -0000	1.2
@@ -0,0 +1 @@
+Devel-Hide-0.0008.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:29:19 -0000	1.1
+++ sources	7 Apr 2009 03:53:20 -0000	1.2
@@ -0,0 +1 @@
+3b38c60feed1e922093f5f68dd6d5c20  Devel-Hide-0.0008.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 03:53:51 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 03:53:51 +0000 (UTC)
Subject: rpms/perl-Devel-Hide/F-9 perl-Devel-Hide.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407035351.228927013C@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-Hide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23980/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-Hide.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-Hide.spec ---
Name:           perl-Devel-Hide
Version:        0.0008
Release:        1%{?dist}
Summary:        Forces the unavailability of specified Perl modules (for testing)
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-Hide/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Devel-Hide-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod) >= 1.18
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a list of Perl modules/filenames, this module makes require and
use statements fail (no matter the specified files/modules are
installed or not).

%prep
%setup -q -n Devel-Hide-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 0.0008-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:29:19 -0000	1.1
+++ .cvsignore	7 Apr 2009 03:53:20 -0000	1.2
@@ -0,0 +1 @@
+Devel-Hide-0.0008.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:29:19 -0000	1.1
+++ sources	7 Apr 2009 03:53:20 -0000	1.2
@@ -0,0 +1 @@
+3b38c60feed1e922093f5f68dd6d5c20  Devel-Hide-0.0008.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 03:53:51 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 03:53:51 +0000 (UTC)
Subject: rpms/perl-Devel-Hide/devel perl-Devel-Hide.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407035351.5A5FC70142@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-Hide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23980/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-Hide.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-Hide.spec ---
Name:           perl-Devel-Hide
Version:        0.0008
Release:        1%{?dist}
Summary:        Forces the unavailability of specified Perl modules (for testing)
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-Hide/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Devel-Hide-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod) >= 1.18
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a list of Perl modules/filenames, this module makes require and
use statements fail (no matter the specified files/modules are
installed or not).

%prep
%setup -q -n Devel-Hide-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 0.0008-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:29:19 -0000	1.1
+++ .cvsignore	7 Apr 2009 03:53:21 -0000	1.2
@@ -0,0 +1 @@
+Devel-Hide-0.0008.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:29:19 -0000	1.1
+++ sources	7 Apr 2009 03:53:21 -0000	1.2
@@ -0,0 +1 @@
+3b38c60feed1e922093f5f68dd6d5c20  Devel-Hide-0.0008.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 04:03:26 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 04:03:26 +0000 (UTC)
Subject: rpms/perl-Test-Assertions/F-9 perl-Test-Assertions.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407040326.62E5570137@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Test-Assertions/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26701/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Assertions.spec 
Log Message:
initial import


--- NEW FILE perl-Test-Assertions.spec ---
Name:           perl-Test-Assertions
Version:        1.054
Release:        1%{?dist}
Summary:        Simple set of building blocks for both unit and runtime testing
License:        GPLv2
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Assertions/
Source0:        http://www.cpan.org/authors/id/B/BB/BBC/Test-Assertions-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Log::Trace)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Assertions provides a convenient set of tools for constructing tests,
such as unit tests or run-time assertion checks (like C's ASSERT macro).
Unlike some of the Test:: modules available on CPAN, Test::Assertions is
not limited to unit test scripts; for example it can be used to check
output is as expected within a benchmarking script. When it is used for
unit tests, it generates output in the standard form for CPAN unit testing
(under Test::Harness).

%prep
%setup -q -n Test-Assertions-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 1.054-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:30:58 -0000	1.1
+++ .cvsignore	7 Apr 2009 04:02:56 -0000	1.2
@@ -0,0 +1 @@
+Test-Assertions-1.054.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:30:58 -0000	1.1
+++ sources	7 Apr 2009 04:02:56 -0000	1.2
@@ -0,0 +1 @@
+71359868674fd4290bd7d9da407c1cda  Test-Assertions-1.054.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 04:03:26 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 04:03:26 +0000 (UTC)
Subject: rpms/perl-Test-Assertions/devel perl-Test-Assertions.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407040326.9886D7013C@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Test-Assertions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26701/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Assertions.spec 
Log Message:
initial import


--- NEW FILE perl-Test-Assertions.spec ---
Name:           perl-Test-Assertions
Version:        1.054
Release:        1%{?dist}
Summary:        Simple set of building blocks for both unit and runtime testing
License:        GPLv2
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Assertions/
Source0:        http://www.cpan.org/authors/id/B/BB/BBC/Test-Assertions-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Log::Trace)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Assertions provides a convenient set of tools for constructing tests,
such as unit tests or run-time assertion checks (like C's ASSERT macro).
Unlike some of the Test:: modules available on CPAN, Test::Assertions is
not limited to unit test scripts; for example it can be used to check
output is as expected within a benchmarking script. When it is used for
unit tests, it generates output in the standard form for CPAN unit testing
(under Test::Harness).

%prep
%setup -q -n Test-Assertions-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 1.054-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:30:58 -0000	1.1
+++ .cvsignore	7 Apr 2009 04:02:56 -0000	1.2
@@ -0,0 +1 @@
+Test-Assertions-1.054.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:30:58 -0000	1.1
+++ sources	7 Apr 2009 04:02:56 -0000	1.2
@@ -0,0 +1 @@
+71359868674fd4290bd7d9da407c1cda  Test-Assertions-1.054.tar.gz



From iarnell at fedoraproject.org  Tue Apr  7 04:03:26 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  7 Apr 2009 04:03:26 +0000 (UTC)
Subject: rpms/perl-Test-Assertions/F-10 perl-Test-Assertions.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407040326.4E42370100@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Test-Assertions/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26701/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Assertions.spec 
Log Message:
initial import


--- NEW FILE perl-Test-Assertions.spec ---
Name:           perl-Test-Assertions
Version:        1.054
Release:        1%{?dist}
Summary:        Simple set of building blocks for both unit and runtime testing
License:        GPLv2
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Assertions/
Source0:        http://www.cpan.org/authors/id/B/BB/BBC/Test-Assertions-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Log::Trace)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Assertions provides a convenient set of tools for constructing tests,
such as unit tests or run-time assertion checks (like C's ASSERT macro).
Unlike some of the Test:: modules available on CPAN, Test::Assertions is
not limited to unit test scripts; for example it can be used to check
output is as expected within a benchmarking script. When it is used for
unit tests, it generates output in the standard form for CPAN unit testing
(under Test::Harness).

%prep
%setup -q -n Test-Assertions-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 1.054-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:30:58 -0000	1.1
+++ .cvsignore	7 Apr 2009 04:02:55 -0000	1.2
@@ -0,0 +1 @@
+Test-Assertions-1.054.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:30:58 -0000	1.1
+++ sources	7 Apr 2009 04:02:56 -0000	1.2
@@ -0,0 +1 @@
+71359868674fd4290bd7d9da407c1cda  Test-Assertions-1.054.tar.gz



From rishi at fedoraproject.org  Tue Apr  7 04:17:23 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  7 Apr 2009 04:17:23 +0000 (UTC)
Subject: rpms/glade3/devel glade3-3.6.1-desktop.patch, NONE, 1.1 .cvsignore, 
	1.11, 1.12 glade3.spec, 1.23, 1.24 sources, 1.11,
	1.12 glade3-3.6.0-desktop.patch, 1.1, NONE
Message-ID: <20090407041723.2124E70100@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29494

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.6.1-desktop.patch 
Removed Files:
	glade3-3.6.0-desktop.patch 
Log Message:
* Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-1
- Version bump to 3.6.1.
  * Fixed crash during internal widget selection.
  * Fixed Libglade regression. Libglade needs specific ordering of properties,
    ATK props, signals and accelerators.
  * Disable loading and displaying of 'data' property on GtkTreeStore. Only
    GtkListStore understands the 'data' construct.
  * Properly initialize a GValue on the stack. (GNOME Bugzilla #577822)
  * Translation updates: ar and cs.
  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.news


glade3-3.6.1-desktop.patch:

--- NEW FILE glade3-3.6.1-desktop.patch ---
diff -urNp glade3-3.5.5.orig/data/glade-3.desktop.in.in glade3-3.5.5/data/glade-3.desktop.in.in
--- glade3-3.5.5.orig/data/glade-3.desktop.in.in	2009-01-07 00:41:35.000000000 +0530
+++ glade3-3.5.5/data/glade-3.desktop.in.in	2009-01-07 00:42:21.000000000 +0530
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Glade Interface Designer
+_Name=Glade-3 Interface Designer
 _GenericName=User Interface Designer
 _Comment=Create or open user interface designs for GTK+ applications
 Exec=glade-3 %F


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Mar 2009 23:08:31 -0000	1.11
+++ .cvsignore	7 Apr 2009 04:16:52 -0000	1.12
@@ -1 +1 @@
-glade3-3.6.0.tar.gz
+glade3-3.6.1.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- glade3.spec	17 Mar 2009 23:08:31 -0000	1.23
+++ glade3.spec	7 Apr 2009 04:16:52 -0000	1.24
@@ -1,6 +1,6 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.6.0
+Version:	3.6.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -22,7 +22,7 @@
 BuildRequires:	intltool
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libtool
-BuildRequires:	pygtk2-devel >= 2.10.0
+BuildRequires:	pygtk2-devel
 BuildRequires:	scrollkeeper
 
 %description
@@ -192,6 +192,17 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-1
+- Version bump to 3.6.1.
+  * Fixed crash during internal widget selection.
+  * Fixed Libglade regression. Libglade needs specific ordering of properties,
+    ATK props, signals and accelerators.
+  * Disable loading and displaying of 'data' property on GtkTreeStore. Only
+    GtkListStore understands the 'data' construct.
+  * Properly initialize a GValue on the stack. (GNOME Bugzilla #577822)
+  * Translation updates: ar and cs.
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.news
+
 * Tue Mar 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.0-1
 - Version bump to 3.6.0.
   * Support for both GtkBuilder and Libglade, and conversion from one format


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2009 23:08:31 -0000	1.11
+++ sources	7 Apr 2009 04:16:52 -0000	1.12
@@ -1 +1 @@
-84bcae0beb890515f29fca88ce27f496  glade3-3.6.0.tar.gz
+9215ade3cc65e746e0d0b16a65500bb9  glade3-3.6.1.tar.gz


--- glade3-3.6.0-desktop.patch DELETED ---



From trasher at fedoraproject.org  Tue Apr  7 04:36:14 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Tue,  7 Apr 2009 04:36:14 +0000 (UTC)
Subject: rpms/eric/F-9 eric.spec,1.35,1.36 sources,1.20,1.21
Message-ID: <20090407043614.23D3C70100@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1182

Modified Files:
	eric.spec sources 
Log Message:
New upstream release



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/eric.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- eric.spec	8 Mar 2009 11:27:08 -0000	1.35
+++ eric.spec	7 Apr 2009 04:35:43 -0000	1.36
@@ -7,7 +7,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPL+
@@ -147,7 +147,10 @@
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
-* Sun Mar 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.0-1
+* Mon Apr 6 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.2-1
+- 4.3.2
+
+* Sun Mar 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.1-1
 - 4.3.1
 
 * Mon Feb 9 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Mar 2009 11:27:09 -0000	1.20
+++ sources	7 Apr 2009 04:35:43 -0000	1.21
@@ -1,8 +1,8 @@
-f7060154d397ca53dcc3fc43995c73b7  eric4-4.3.1.tar.gz
-2829cd57dc9d817be19bdf4243531086  eric4-i18n-fr-4.3.1.tar.gz
-fdbbcb08cde6c9b409ff9f96537e238c  eric4-i18n-de-4.3.1.tar.gz
-8bd1f98855456b38e84951e1c085e760  eric4-i18n-ru-4.3.1.tar.gz
-4a1c78ff3d5e6bc07c28492364a9aed0  eric4-i18n-cs-4.3.1.tar.gz
-d9d5bc76e586dbde47ad83bd4c62d106  eric4-i18n-es-4.3.1.tar.gz
-74fcd0fcad8cd394ec903d9d2f937f12  eric4-i18n-tr-4.3.1.tar.gz
-90bddf5c5a87aba71de3d2b480ac94b2  eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz
+7b62ee59f0a03ae7a400d7e41679d33e  eric4-4.3.2.tar.gz
+d2ca5125440104615f9d8611b5e3023c  eric4-i18n-fr-4.3.2.tar.gz
+da0656485058e7620eabba84e15523b3  eric4-i18n-de-4.3.2.tar.gz
+8dbe6f79e2cad8cce50f89772c51b69e  eric4-i18n-ru-4.3.2.tar.gz
+374171cdfd6cd432aa18774726e1cda3  eric4-i18n-cs-4.3.2.tar.gz
+6a3173c80ce28909e0baad9502bf8487  eric4-i18n-es-4.3.2.tar.gz
+b747cbcf252fc14b3eb12afb4b979fa1  eric4-i18n-tr-4.3.2.tar.gz
+777ea5ea1397610e3c9c20d6436371db  eric4-i18n-zh_CN.GB2312-4.3.2.tar.gz



From pkgdb at fedoraproject.org  Tue Apr  7 04:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 04:40:43 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090407044022.D2C4F208550@bastion.fedora.phx.redhat.com>

phuang has set the watchbugzilla acl on awn-extras-applets (Fedora 10) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Tue Apr  7 04:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 04:40:23 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090407044024.5BAA9208556@bastion.fedora.phx.redhat.com>

phuang has set the watchcommits acl on awn-extras-applets (Fedora 10) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Tue Apr  7 04:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 04:40:01 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090407044025.D01E3208603@bastion.fedora.phx.redhat.com>

phuang has set the commit acl on awn-extras-applets (Fedora 10) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Tue Apr  7 04:40:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 04:40:46 +0000
Subject: [pkgdb] awn-extras-applets had acl change status
Message-ID: <20090407044026.6071D208608@bastion.fedora.phx.redhat.com>

phuang has set the approveacls acl on awn-extras-applets (Fedora 10) to Approved for sindrepb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets



From pgordon at fedoraproject.org  Tue Apr  7 04:56:04 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue,  7 Apr 2009 04:56:04 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.56, 1.57 deluge.spec, 1.88,
	1.89 sources, 1.56, 1.57
Message-ID: <20090407045604.257A770100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5039

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.1.6; License change (GPLv2+ --> GPLv3 with OpenSSL exception); remove old BuildRequires (libtool, openssl-devel, boost-devel).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	17 Mar 2009 05:48:20 -0000	1.56
+++ .cvsignore	7 Apr 2009 04:55:33 -0000	1.57
@@ -1 +1 @@
-deluge-1.1.5.tar.bz2
+deluge-1.1.6.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- deluge.spec	17 Mar 2009 05:48:21 -0000	1.88
+++ deluge.spec	7 Apr 2009 04:55:33 -0000	1.89
@@ -6,11 +6,11 @@
 %define	min_rblibtorrent_ver	0.14.1
 
 Name:		deluge
-Version:	1.1.5
+Version:	1.1.6
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
-License:	GPLv2+
+License:	GPLv3 with exceptions
 URL:		http://deluge-torrent.org/           
 
 Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2
@@ -21,10 +21,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-BuildRequires:	boost-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	libtool
-BuildRequires:	openssl-devel
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
 ## The build script checks for the libtorrent module and skips compiling the
@@ -144,6 +141,12 @@
 
 
 %changelog
+* Mon Apr 06 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.6-1
+- Update to new upstream bug-fix release (1.1.6)
+- Fix GPL version, add OpenSSL exception to License.
+- Remove libtool, openssl-devel, and boost-devel BuildRequires (were only
+  necessary when building the in-tarball libtorrent copy).
+
 * Mon Mar 16 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.5-1
 - Update to new upstream bug-fix release (1.1.5)
 - Remove FIXME comment about parallel-compilation. We're not building the


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	17 Mar 2009 05:48:21 -0000	1.56
+++ sources	7 Apr 2009 04:55:33 -0000	1.57
@@ -1 +1 @@
-027fec63e189a39939df6777c0426814  deluge-1.1.5.tar.bz2
+78ef75153bbd5ef6a06ed876d66a9fb9  deluge-1.1.6.tar.bz2



From mtasaka at fedoraproject.org  Tue Apr  7 05:30:40 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  7 Apr 2009 05:30:40 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.352, 1.353 jd.spec, 1.412, 1.413 sources,
	1.353, 1.354
Message-ID: <20090407053040.B804670137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11857

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- .cvsignore	4 Apr 2009 17:38:15 -0000	1.352
+++ .cvsignore	7 Apr 2009 05:30:10 -0000	1.353
@@ -1 +1 @@
-jd-2.4.0-svn2765_trunk.tgz
+jd-2.4.0-svn2768_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- jd.spec	4 Apr 2009 17:38:15 -0000	1.412
+++ jd.spec	7 Apr 2009 05:30:10 -0000	1.413
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2765_trunk
+%define         strtag        svn2768_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Apr  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- sources	4 Apr 2009 17:38:15 -0000	1.353
+++ sources	7 Apr 2009 05:30:10 -0000	1.354
@@ -1 +1 @@
-2d9a5fca4bf54a9545b32668345c5a77  jd-2.4.0-svn2765_trunk.tgz
+e4851dc06a5dbdec05794abd7c1d6321  jd-2.4.0-svn2768_trunk.tgz



From sailer at fedoraproject.org  Tue Apr  7 05:58:26 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Tue,  7 Apr 2009 05:58:26 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel mingw32-glibmm24.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407055826.2B21570100@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16198

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-glibmm24.spec 
Log Message:
import from review



--- NEW FILE mingw32-glibmm24.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-glibmm24
Version:        2.19.2
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.19/glibmm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libsigc++20 >= 2.0.0
BuildRequires:  mingw32-glib2 >= 2.17.3
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
glibmm provides a C++ interface to the GTK+ GLib low-level core
library. Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.


%prep
%setup -q -n glibmm-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove docs, duplicate native package.
rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/glibmm-2.4
rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING.tools
%{_mingw32_bindir}/libgiomm-2.4-1.dll
%{_mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll
%{_mingw32_bindir}/libglibmm-2.4-1.dll
%{_mingw32_libdir}/libgiomm-2.4.dll.a
%{_mingw32_libdir}/libgiomm-2.4.la
%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.la
%{_mingw32_libdir}/libglibmm-2.4.dll.a
%{_mingw32_libdir}/libglibmm-2.4.la
%{_mingw32_libdir}/giomm-2.4
%{_mingw32_libdir}/glibmm-2.4
%{_mingw32_includedir}/giomm-2.4
%{_mingw32_includedir}/glibmm-2.4
%{_mingw32_libdir}/pkgconfig/giomm-2.4.pc
%{_mingw32_libdir}/pkgconfig/glibmm-2.4.pc
%{_mingw32_datadir}/aclocal/glibmm_check_perl.m4


%changelog
* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-1
- update to 2.19.2

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-4
- Include license.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-3
- Use _smp_mflags.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:22:44 -0000	1.1
+++ .cvsignore	7 Apr 2009 05:57:55 -0000	1.2
@@ -0,0 +1 @@
+glibmm-2.19.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:22:44 -0000	1.1
+++ sources	7 Apr 2009 05:57:55 -0000	1.2
@@ -0,0 +1 @@
+9915c92a5a4b55fc2696bedf0d7af4cb  glibmm-2.19.2.tar.bz2



From sailer at fedoraproject.org  Tue Apr  7 06:03:26 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Tue,  7 Apr 2009 06:03:26 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/F-10 mingw32-glibmm24.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407060326.8E45370100@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17533

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-glibmm24.spec 
Log Message:
import from review.



--- NEW FILE mingw32-glibmm24.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-glibmm24
Version:        2.19.2
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.19/glibmm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libsigc++20 >= 2.0.0
BuildRequires:  mingw32-glib2 >= 2.17.3
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
glibmm provides a C++ interface to the GTK+ GLib low-level core
library. Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.


%prep
%setup -q -n glibmm-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove docs, duplicate native package.
rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/glibmm-2.4
rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING.tools
%{_mingw32_bindir}/libgiomm-2.4-1.dll
%{_mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll
%{_mingw32_bindir}/libglibmm-2.4-1.dll
%{_mingw32_libdir}/libgiomm-2.4.dll.a
%{_mingw32_libdir}/libgiomm-2.4.la
%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.la
%{_mingw32_libdir}/libglibmm-2.4.dll.a
%{_mingw32_libdir}/libglibmm-2.4.la
%{_mingw32_libdir}/giomm-2.4
%{_mingw32_libdir}/glibmm-2.4
%{_mingw32_includedir}/giomm-2.4
%{_mingw32_includedir}/glibmm-2.4
%{_mingw32_libdir}/pkgconfig/giomm-2.4.pc
%{_mingw32_libdir}/pkgconfig/glibmm-2.4.pc
%{_mingw32_datadir}/aclocal/glibmm_check_perl.m4


%changelog
* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-1
- update to 2.19.2

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-4
- Include license.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-3
- Use _smp_mflags.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:22:44 -0000	1.1
+++ .cvsignore	7 Apr 2009 06:02:56 -0000	1.2
@@ -0,0 +1 @@
+glibmm-2.19.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:22:44 -0000	1.1
+++ sources	7 Apr 2009 06:02:56 -0000	1.2
@@ -0,0 +1 @@
+9915c92a5a4b55fc2696bedf0d7af4cb  glibmm-2.19.2.tar.bz2



From cchance at fedoraproject.org  Tue Apr  7 06:19:28 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  7 Apr 2009 06:19:28 +0000 (UTC)
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec,1.6,1.7
Message-ID: <20090407061928.A6EF170100@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19294

Modified Files:
	baekmuk-bdf-fonts.spec 
Log Message:
rebuilt for fedora 11



Index: baekmuk-bdf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel/baekmuk-bdf-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baekmuk-bdf-fonts.spec	24 Feb 2009 03:55:39 -0000	1.6
+++ baekmuk-bdf-fonts.spec	7 Apr 2009 06:18:58 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Korean bitmap fonts
 
 Group:          User Interface/X
@@ -72,6 +72,9 @@
 %{catalogue}/%{name}
 
 %changelog
+* Tue Apr 07 2009 Caius 'kaio' Chance <cchance at redhat.com> - 2.2-7.fc11
+- Rebuilt for Fedora 11.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From fschwarz at fedoraproject.org  Tue Apr  7 06:26:36 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Tue,  7 Apr 2009 06:26:36 +0000 (UTC)
Subject: rpms/python-beaker/devel .cvsignore, 1.7, 1.8 python-beaker.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090407062636.25FE770100@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-beaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20477

Modified Files:
	.cvsignore python-beaker.spec sources 
Log Message:
update to Beaker 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2009 12:41:25 -0000	1.7
+++ .cvsignore	7 Apr 2009 06:26:05 -0000	1.8
@@ -1 +1 @@
-Beaker-1.2.3.tar.gz
+Beaker-1.3.tar.gz


Index: python-beaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/python-beaker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-beaker.spec	5 Apr 2009 12:41:25 -0000	1.8
+++ python-beaker.spec	7 Apr 2009 06:26:05 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-beaker
-Version: 1.2.3
+Version: 1.3
 Release: 1%{?dist}
 Summary: WSGI middleware layer to provide sessions
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.3-1
+- Update to 1.3
+ 
 * Sun Apr 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.2.3-1
 - Update to 1.2.3
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2009 12:41:25 -0000	1.7
+++ sources	7 Apr 2009 06:26:05 -0000	1.8
@@ -1 +1 @@
-ad4748c2ce1e6296a0b4b82d3eac46cf  Beaker-1.2.3.tar.gz
+b38afdc892460113609bf933284c75c5  Beaker-1.3.tar.gz



From phuang at fedoraproject.org  Tue Apr  7 06:32:13 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue,  7 Apr 2009 06:32:13 +0000 (UTC)
Subject: rpms/ibus/devel ibus-default-hotkeys.patch, NONE, 1.1 ibus.spec,
	1.59, 1.60
Message-ID: <20090407063214.0630270137@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21441

Modified Files:
	ibus.spec 
Added Files:
	ibus-default-hotkeys.patch 
Log Message:
Update default hotkeys

ibus-default-hotkeys.patch:

--- NEW FILE ibus-default-hotkeys.patch ---
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 9a6330d..9c0345f 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -18,17 +18,11 @@
       <owner>ibus</owner>
       <type>list</type>
       <list_type>string</list_type>
+      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul]</default>
       <locale name="C">
-        <default>[Control+space]</default>
         <short>Trigger Hotkey</short>
 	    <long>Trigger hotkey for enable or disable input context</long>
       </locale>
-      <locale name="ja">
-        <default>[Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave]</default>
-	  </locale>
-      <locale name="ko">
-        <default>[Hangul,Shift+space]</default>
-	  </locale>
     </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/next_engine</key>
@@ -36,7 +30,7 @@
       <owner>ibus</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[]</default>
+      <default>[Alt+Shift_L]</default>
       <locale name="C">
         <short>Next Engine Hotkey</short>
 	    <long>Next engine hotkey for switch to next input method engine</long>


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ibus.spec	7 Apr 2009 03:09:32 -0000	1.59
+++ ibus.spec	7 Apr 2009 06:31:43 -0000	1.60
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090407
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -16,6 +16,7 @@
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 Patch0:     ibus-HEAD.patch
+Patch1:     ibus-default-hotkeys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -108,6 +109,7 @@
 # rm -rf docs/reference/ibus/ibus-sections.txt
 # %patch0 -p1
 # ./autogen.sh --help
+%patch1 -p1
 
 %build
 %configure --disable-static \
@@ -218,6 +220,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-2
+- Update default hotkey settings.
+
 * Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-1
 - Update to ibus-1.1.0.20090407.
 - Fix bug 491042 - ibus default trigger hotkeys



From denis at fedoraproject.org  Tue Apr  7 06:35:42 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue,  7 Apr 2009 06:35:42 +0000 (UTC)
Subject: rpms/libgnomemm26/devel .cvsignore, 1.12, 1.13 libgnomemm.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <20090407063542.347B970100@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22849

Modified Files:
	.cvsignore libgnomemm.spec sources 
Log Message:
Update to upstream 2.26.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Sep 2008 04:22:40 -0000	1.12
+++ .cvsignore	7 Apr 2009 06:35:11 -0000	1.13
@@ -1 +1 @@
-libgnomemm-2.24.0.tar.bz2
+libgnomemm-2.26.0.tar.bz2


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgnomemm.spec	25 Feb 2009 15:20:19 -0000	1.21
+++ libgnomemm.spec	7 Apr 2009 06:35:11 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           libgnomemm26
-Version:        2.24.0
-Release:        2
+Version:        2.26.0
+Release:        1
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr  7 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-1
+- Update to upstream 2.26.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Sep 2008 04:22:40 -0000	1.13
+++ sources	7 Apr 2009 06:35:11 -0000	1.14
@@ -1 +1 @@
-e77dd1df8e2eb1652d28e30d7c5252a4  libgnomemm-2.24.0.tar.bz2
+4801c2b60d73b08ea01fe79aafc678df  libgnomemm-2.26.0.tar.bz2



From cchance at fedoraproject.org  Tue Apr  7 06:36:27 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  7 Apr 2009 06:36:27 +0000 (UTC)
Subject: rpms/taipeifonts/devel taipeifonts.spec,1.3,1.4
Message-ID: <20090407063627.272E470100@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/taipeifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22947

Modified Files:
	taipeifonts.spec 
Log Message:
rebuilt for fedora 11.



Index: taipeifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taipeifonts/devel/taipeifonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- taipeifonts.spec	25 Feb 2009 18:24:06 -0000	1.3
+++ taipeifonts.spec	7 Apr 2009 06:35:56 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:       taipeifonts
 Version:    1.2
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Chinese Bitmap Fonts
 
 Group:      User Interface/X
@@ -72,6 +72,9 @@
 %{catalogue}/%{name}
 
 %changelog
+* Tue Apr 07 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.2-7.fc11
+- Rebuilt for Fedora 11.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From denis at fedoraproject.org  Tue Apr  7 06:38:27 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue,  7 Apr 2009 06:38:27 +0000 (UTC)
Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.12, 1.13 libgnomeuimm.spec, 
	1.21, 1.22 sources, 1.13, 1.14
Message-ID: <20090407063827.DDDA870100@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23512

Modified Files:
	.cvsignore libgnomeuimm.spec sources 
Log Message:
Update to upstream 2.26.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Sep 2008 08:55:13 -0000	1.12
+++ .cvsignore	7 Apr 2009 06:37:57 -0000	1.13
@@ -1 +1 @@
-libgnomeuimm-2.24.0.tar.bz2
+libgnomeuimm-2.26.0.tar.bz2


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgnomeuimm.spec	25 Feb 2009 15:24:06 -0000	1.21
+++ libgnomeuimm.spec	7 Apr 2009 06:37:57 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           libgnomeuimm26
-Version:        2.24.0
-Release:        2%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
@@ -82,6 +82,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr  7 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-1
+- Update to upstream 2.26.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Sep 2008 08:55:14 -0000	1.13
+++ sources	7 Apr 2009 06:37:57 -0000	1.14
@@ -1 +1 @@
-e4caf43ee829200bef9ad87415ae39a5  libgnomeuimm-2.24.0.tar.bz2
+7a9c8426a227a80ca70f2c976fcb1ae3  libgnomeuimm-2.26.0.tar.bz2



From lkundrak at fedoraproject.org  Tue Apr  7 07:04:48 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 07:04:48 +0000 (UTC)
Subject: rpms/healpix/EL-5 healpix-2.11c-shlib.patch, NONE, 1.1 healpix.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407070448.96E2070100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28582/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	healpix-2.11c-shlib.patch healpix.spec 
Log Message:
Import Healpix

healpix-2.11c-shlib.patch:

--- NEW FILE healpix-2.11c-shlib.patch ---
Compile the Fortran library into a shared object instead
of static library.

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
--- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
--- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
--- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
--- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.f90
 	$(FC) $(FFLAGS) -c $< -o $@
 
-default: libgif.a
+default: libgif.so
 
 libgif.a: $(allobj)
 	$(AR) libgif.a $(allobj)
@@ -25,3 +25,16 @@ libgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libgif.so
+libgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
--- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
--- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
--- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
 	esac
 
 
-default: libhealpix.a healpix_fft.o
+default: libhealpix.so healpix_fft.o
 
 libhealpix.a: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
 	$(AR) libhealpix.a $(obj)
@@ -74,6 +74,15 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	./gen_alm_code
 
diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
--- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
--- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
--- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
--- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


--- NEW FILE healpix.spec ---
Name:           healpix
Version:        2.11c
Release:        3%{?dist}
Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere

Group:          Development/Libraries
License:        GPLv2+
URL:            http://healpix.jpl.nasa.gov/
Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
Patch0:         healpix-2.11c-shlib.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  gcc-gfortran

%description
HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
of a sphere. As suggested in the name, this pixelization produces a
subdivision of a spherical surface in which each pixel covers the same
surface area as every other pixel.


%package -n c%{name}
Summary:        HEALPix C Bindings Library
Group:          System Environment/Libraries

%description -n c%{name}
Library for tools that use HEALPix C bindings.


%package -n c%{name}-devel
Summary:        HEALPix C Bindings Library development files
Group:          Development/Libraries
Requires:       c%{name} = %{version}

%description -n c%{name}-devel
Include file for development with HEALPix.


%package fortran
Summary:        HEALPix Fortran binaries
Group:          Applications/Engineering

%description fortran
Fortran HEALPix library and binaries.


%package fortran-devel
Summary:        HEALPix Fortran headers and static libraries
Group:          Development/Libraries

%description fortran-devel
Fortran modules used for developing HEALPix applications.


%prep
%setup -q -n Healpix_%{version}
%patch0 -p1 -b .shlib


%build
### C bindings

make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
        CFITSIO_INCDIR=%{_includedir}/cfitsio shared

### F90 bindings

# Make nonsense
export MOD=mod
export OS=Linux

# Directories for the created include, library and binary files
export BINDIR=$PWD/bin
export INCDIR=$PWD/include
export LIBDIR=$PWD/lib
mkdir $INCDIR $LIBDIR $BINDIR

# Compiler stuff
export FC=gfortran
export CFLAGS="%{optflags} -fPIC"
export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"

# SMP make doesn't work
make -C src/f90/mod 
make -C src/f90/lib
for dir in anafast map2gif hotspot smoothing synfast ud_grade plmgen \
        alteralm median_filter ngsims_full_sky
do
        make -C src/f90/$dir
done


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}/healpix

# C bindings
make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
        INCDIR=$RPM_BUILD_ROOT%{_includedir}

# Fortran stuff
install -p bin/* $RPM_BUILD_ROOT%{_bindir}
install -p lib/* $RPM_BUILD_ROOT%{_libdir}
install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix


%clean
rm -rf $RPM_BUILD_ROOT


%files -n chealpix
%defattr(-,root,root,-)
%{_libdir}/libchealpix.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n chealpix-devel
%defattr(-,root,root,-)
%{_includedir}/chealpix.h


%files -n healpix-fortran
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/libhealpix.so
%{_libdir}/libgif.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n healpix-fortran-devel
%defattr(-,root,root,-)
%{_includedir}/healpix


%changelog
* Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
- Build Fortran library as DSO

* Thu Mar 26 2009 Jussi Lehtola <jussi.lehtola at helsinki.fi> - 2.11c-2
- Add Fortran bindings.

* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-1
- Initial packaging of the C bindings


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:24:20 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:04:17 -0000	1.2
@@ -0,0 +1 @@
+Healpix_2.11c_2009Feb19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:24:20 -0000	1.1
+++ sources	7 Apr 2009 07:04:17 -0000	1.2
@@ -0,0 +1 @@
+df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz



From lkundrak at fedoraproject.org  Tue Apr  7 07:04:50 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 07:04:50 +0000 (UTC)
Subject: rpms/healpix/devel healpix-2.11c-shlib.patch, NONE, 1.1 healpix.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407070450.0D6F57013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28582/devel

Modified Files:
	.cvsignore sources 
Added Files:
	healpix-2.11c-shlib.patch healpix.spec 
Log Message:
Import Healpix

healpix-2.11c-shlib.patch:

--- NEW FILE healpix-2.11c-shlib.patch ---
Compile the Fortran library into a shared object instead
of static library.

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
--- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
--- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
--- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
--- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.f90
 	$(FC) $(FFLAGS) -c $< -o $@
 
-default: libgif.a
+default: libgif.so
 
 libgif.a: $(allobj)
 	$(AR) libgif.a $(allobj)
@@ -25,3 +25,16 @@ libgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libgif.so
+libgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
--- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
--- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
--- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
 	esac
 
 
-default: libhealpix.a healpix_fft.o
+default: libhealpix.so healpix_fft.o
 
 libhealpix.a: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
 	$(AR) libhealpix.a $(obj)
@@ -74,6 +74,15 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	./gen_alm_code
 
diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
--- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
--- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
--- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
--- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


--- NEW FILE healpix.spec ---
Name:           healpix
Version:        2.11c
Release:        3%{?dist}
Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere

Group:          Development/Libraries
License:        GPLv2+
URL:            http://healpix.jpl.nasa.gov/
Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
Patch0:         healpix-2.11c-shlib.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  gcc-gfortran

%description
HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
of a sphere. As suggested in the name, this pixelization produces a
subdivision of a spherical surface in which each pixel covers the same
surface area as every other pixel.


%package -n c%{name}
Summary:        HEALPix C Bindings Library
Group:          System Environment/Libraries

%description -n c%{name}
Library for tools that use HEALPix C bindings.


%package -n c%{name}-devel
Summary:        HEALPix C Bindings Library development files
Group:          Development/Libraries
Requires:       c%{name} = %{version}

%description -n c%{name}-devel
Include file for development with HEALPix.


%package fortran
Summary:        HEALPix Fortran binaries
Group:          Applications/Engineering

%description fortran
Fortran HEALPix library and binaries.


%package fortran-devel
Summary:        HEALPix Fortran headers and static libraries
Group:          Development/Libraries

%description fortran-devel
Fortran modules used for developing HEALPix applications.


%prep
%setup -q -n Healpix_%{version}
%patch0 -p1 -b .shlib


%build
### C bindings

make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
        CFITSIO_INCDIR=%{_includedir}/cfitsio shared

### F90 bindings

# Make nonsense
export MOD=mod
export OS=Linux

# Directories for the created include, library and binary files
export BINDIR=$PWD/bin
export INCDIR=$PWD/include
export LIBDIR=$PWD/lib
mkdir $INCDIR $LIBDIR $BINDIR

# Compiler stuff
export FC=gfortran
export CFLAGS="%{optflags} -fPIC"
export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"

# SMP make doesn't work
make -C src/f90/mod 
make -C src/f90/lib
for dir in anafast map2gif hotspot smoothing synfast ud_grade plmgen \
        alteralm median_filter ngsims_full_sky
do
        make -C src/f90/$dir
done


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}/healpix

# C bindings
make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
        INCDIR=$RPM_BUILD_ROOT%{_includedir}

# Fortran stuff
install -p bin/* $RPM_BUILD_ROOT%{_bindir}
install -p lib/* $RPM_BUILD_ROOT%{_libdir}
install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix


%clean
rm -rf $RPM_BUILD_ROOT


%files -n chealpix
%defattr(-,root,root,-)
%{_libdir}/libchealpix.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n chealpix-devel
%defattr(-,root,root,-)
%{_includedir}/chealpix.h


%files -n healpix-fortran
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/libhealpix.so
%{_libdir}/libgif.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n healpix-fortran-devel
%defattr(-,root,root,-)
%{_includedir}/healpix


%changelog
* Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
- Build Fortran library as DSO

* Thu Mar 26 2009 Jussi Lehtola <jussi.lehtola at helsinki.fi> - 2.11c-2
- Add Fortran bindings.

* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-1
- Initial packaging of the C bindings


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:24:20 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:04:19 -0000	1.2
@@ -0,0 +1 @@
+Healpix_2.11c_2009Feb19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:24:20 -0000	1.1
+++ sources	7 Apr 2009 07:04:19 -0000	1.2
@@ -0,0 +1 @@
+df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz



From lkundrak at fedoraproject.org  Tue Apr  7 07:04:49 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 07:04:49 +0000 (UTC)
Subject: rpms/healpix/F-10 healpix-2.11c-shlib.patch, NONE, 1.1 healpix.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407070449.4247C70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28582/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	healpix-2.11c-shlib.patch healpix.spec 
Log Message:
Import Healpix

healpix-2.11c-shlib.patch:

--- NEW FILE healpix-2.11c-shlib.patch ---
Compile the Fortran library into a shared object instead
of static library.

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
--- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
--- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
--- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
--- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.f90
 	$(FC) $(FFLAGS) -c $< -o $@
 
-default: libgif.a
+default: libgif.so
 
 libgif.a: $(allobj)
 	$(AR) libgif.a $(allobj)
@@ -25,3 +25,16 @@ libgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libgif.so
+libgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
--- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
--- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
--- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
 	esac
 
 
-default: libhealpix.a healpix_fft.o
+default: libhealpix.so healpix_fft.o
 
 libhealpix.a: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
 	$(AR) libhealpix.a $(obj)
@@ -74,6 +74,15 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	./gen_alm_code
 
diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
--- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
--- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
--- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
--- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


--- NEW FILE healpix.spec ---
Name:           healpix
Version:        2.11c
Release:        3%{?dist}
Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere

Group:          Development/Libraries
License:        GPLv2+
URL:            http://healpix.jpl.nasa.gov/
Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
Patch0:         healpix-2.11c-shlib.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  gcc-gfortran

%description
HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
of a sphere. As suggested in the name, this pixelization produces a
subdivision of a spherical surface in which each pixel covers the same
surface area as every other pixel.


%package -n c%{name}
Summary:        HEALPix C Bindings Library
Group:          System Environment/Libraries

%description -n c%{name}
Library for tools that use HEALPix C bindings.


%package -n c%{name}-devel
Summary:        HEALPix C Bindings Library development files
Group:          Development/Libraries
Requires:       c%{name} = %{version}

%description -n c%{name}-devel
Include file for development with HEALPix.


%package fortran
Summary:        HEALPix Fortran binaries
Group:          Applications/Engineering

%description fortran
Fortran HEALPix library and binaries.


%package fortran-devel
Summary:        HEALPix Fortran headers and static libraries
Group:          Development/Libraries

%description fortran-devel
Fortran modules used for developing HEALPix applications.


%prep
%setup -q -n Healpix_%{version}
%patch0 -p1 -b .shlib


%build
### C bindings

make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
        CFITSIO_INCDIR=%{_includedir}/cfitsio shared

### F90 bindings

# Make nonsense
export MOD=mod
export OS=Linux

# Directories for the created include, library and binary files
export BINDIR=$PWD/bin
export INCDIR=$PWD/include
export LIBDIR=$PWD/lib
mkdir $INCDIR $LIBDIR $BINDIR

# Compiler stuff
export FC=gfortran
export CFLAGS="%{optflags} -fPIC"
export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"

# SMP make doesn't work
make -C src/f90/mod 
make -C src/f90/lib
for dir in anafast map2gif hotspot smoothing synfast ud_grade plmgen \
        alteralm median_filter ngsims_full_sky
do
        make -C src/f90/$dir
done


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}/healpix

# C bindings
make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
        INCDIR=$RPM_BUILD_ROOT%{_includedir}

# Fortran stuff
install -p bin/* $RPM_BUILD_ROOT%{_bindir}
install -p lib/* $RPM_BUILD_ROOT%{_libdir}
install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix


%clean
rm -rf $RPM_BUILD_ROOT


%files -n chealpix
%defattr(-,root,root,-)
%{_libdir}/libchealpix.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n chealpix-devel
%defattr(-,root,root,-)
%{_includedir}/chealpix.h


%files -n healpix-fortran
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/libhealpix.so
%{_libdir}/libgif.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n healpix-fortran-devel
%defattr(-,root,root,-)
%{_includedir}/healpix


%changelog
* Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
- Build Fortran library as DSO

* Thu Mar 26 2009 Jussi Lehtola <jussi.lehtola at helsinki.fi> - 2.11c-2
- Add Fortran bindings.

* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-1
- Initial packaging of the C bindings


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:24:20 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:04:18 -0000	1.2
@@ -0,0 +1 @@
+Healpix_2.11c_2009Feb19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:24:20 -0000	1.1
+++ sources	7 Apr 2009 07:04:18 -0000	1.2
@@ -0,0 +1 @@
+df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz



From lkundrak at fedoraproject.org  Tue Apr  7 07:04:49 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 07:04:49 +0000 (UTC)
Subject: rpms/healpix/F-11 healpix-2.11c-shlib.patch, NONE, 1.1 healpix.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407070449.7B61770137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28582/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	healpix-2.11c-shlib.patch healpix.spec 
Log Message:
Import Healpix

healpix-2.11c-shlib.patch:

--- NEW FILE healpix-2.11c-shlib.patch ---
Compile the Fortran library into a shared object instead
of static library.

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
--- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
--- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
--- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
--- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.f90
 	$(FC) $(FFLAGS) -c $< -o $@
 
-default: libgif.a
+default: libgif.so
 
 libgif.a: $(allobj)
 	$(AR) libgif.a $(allobj)
@@ -25,3 +25,16 @@ libgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libgif.so
+libgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
--- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
--- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
--- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
 	esac
 
 
-default: libhealpix.a healpix_fft.o
+default: libhealpix.so healpix_fft.o
 
 libhealpix.a: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
 	$(AR) libhealpix.a $(obj)
@@ -74,6 +74,15 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	./gen_alm_code
 
diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2)
+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
--- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
--- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
--- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
--- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


--- NEW FILE healpix.spec ---
Name:           healpix
Version:        2.11c
Release:        3%{?dist}
Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere

Group:          Development/Libraries
License:        GPLv2+
URL:            http://healpix.jpl.nasa.gov/
Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
Patch0:         healpix-2.11c-shlib.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  gcc-gfortran

%description
HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
of a sphere. As suggested in the name, this pixelization produces a
subdivision of a spherical surface in which each pixel covers the same
surface area as every other pixel.


%package -n c%{name}
Summary:        HEALPix C Bindings Library
Group:          System Environment/Libraries

%description -n c%{name}
Library for tools that use HEALPix C bindings.


%package -n c%{name}-devel
Summary:        HEALPix C Bindings Library development files
Group:          Development/Libraries
Requires:       c%{name} = %{version}

%description -n c%{name}-devel
Include file for development with HEALPix.


%package fortran
Summary:        HEALPix Fortran binaries
Group:          Applications/Engineering

%description fortran
Fortran HEALPix library and binaries.


%package fortran-devel
Summary:        HEALPix Fortran headers and static libraries
Group:          Development/Libraries

%description fortran-devel
Fortran modules used for developing HEALPix applications.


%prep
%setup -q -n Healpix_%{version}
%patch0 -p1 -b .shlib


%build
### C bindings

make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
        CFITSIO_INCDIR=%{_includedir}/cfitsio shared

### F90 bindings

# Make nonsense
export MOD=mod
export OS=Linux

# Directories for the created include, library and binary files
export BINDIR=$PWD/bin
export INCDIR=$PWD/include
export LIBDIR=$PWD/lib
mkdir $INCDIR $LIBDIR $BINDIR

# Compiler stuff
export FC=gfortran
export CFLAGS="%{optflags} -fPIC"
export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"

# SMP make doesn't work
make -C src/f90/mod 
make -C src/f90/lib
for dir in anafast map2gif hotspot smoothing synfast ud_grade plmgen \
        alteralm median_filter ngsims_full_sky
do
        make -C src/f90/$dir
done


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}/healpix

# C bindings
make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
        INCDIR=$RPM_BUILD_ROOT%{_includedir}

# Fortran stuff
install -p bin/* $RPM_BUILD_ROOT%{_bindir}
install -p lib/* $RPM_BUILD_ROOT%{_libdir}
install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix


%clean
rm -rf $RPM_BUILD_ROOT


%files -n chealpix
%defattr(-,root,root,-)
%{_libdir}/libchealpix.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n chealpix-devel
%defattr(-,root,root,-)
%{_includedir}/chealpix.h


%files -n healpix-fortran
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/libhealpix.so
%{_libdir}/libgif.so
%doc COPYING READ_Copyrights_Licenses.txt


%files -n healpix-fortran-devel
%defattr(-,root,root,-)
%{_includedir}/healpix


%changelog
* Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
- Build Fortran library as DSO

* Thu Mar 26 2009 Jussi Lehtola <jussi.lehtola at helsinki.fi> - 2.11c-2
- Add Fortran bindings.

* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-1
- Initial packaging of the C bindings


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:24:20 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:04:19 -0000	1.2
@@ -0,0 +1 @@
+Healpix_2.11c_2009Feb19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:24:20 -0000	1.1
+++ sources	7 Apr 2009 07:04:19 -0000	1.2
@@ -0,0 +1 @@
+df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz



From cchance at fedoraproject.org  Tue Apr  7 07:19:18 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  7 Apr 2009 07:19:18 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407071918.CCDE270100@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31770/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-table-erbi.spec import.log 
Log Message:
split from ibus-table



--- NEW FILE ibus-table-erbi.spec ---
%bcond_without bootstrap

Name:       ibus-table-erbi
Version:    1.1.0.20090407
Release:    2%{?dist}
Summary:    Erbi input methods for ibus-table
License:    GPLv2+
Group:      System Environment/Libraries
URL:        http://code.google.com/p/ibus/
Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

BuildRequires: ibus-table >= 1.1.0.20090220-5 
%if %{with bootstrap}
BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.2
%endif
# uncomment if build with extra phrases.
# BuildRequires: ibus-table-extraphrase >= 1.1.0
Requires(post):   ibus-table > 1.1.0

%description
The package contains Erbi input methods for Table engine of IBus platform. 

Erbi is released under released under GPLv2.

%prep
%setup -q

%build
export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
%if %{with bootstrap}
./autogen.sh \
    --prefix=%{_prefix} \
%else
%configure \
%endif
# replace below blank line with --enable-extra-phrases, 
# if build with extra phrases.

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install INSTALL="install -p"

%clean
rm -rf %{buildroot}

%post
%{_bindir}/ibus-table-createdb  -n erbi_qs.db -s erbi_qs.txt

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangLog COPYING README
%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/erbi_qs.db
%{_datadir}/ibus-table/icons/erbi-qs.svg

%changelog
* Tue Apr 07 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-2.fc11
- Updated spec file info.

* Tue Apr 07 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-1.fc11
- Corrected license to GPLv2.

* Mon Apr 06 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090403-2.fc11
- Added ChangeLog as doc.

* Thu Apr 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090403-1.fc11
- Updated source tarball.

* Thu Apr 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090402-1.fc11
- Resolves: rhbz#488173
- Splited from ibus-table.


--- NEW FILE import.log ---
ibus-table-erbi-1_1_0_20090407-2_fc11:HEAD:ibus-table-erbi-1.1.0.20090407-2.fc11.src.rpm:1239089340


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 02:47:00 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:18:48 -0000	1.2
@@ -0,0 +1 @@
+ibus-table-erbi-1.1.0.20090407.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 02:47:00 -0000	1.1
+++ sources	7 Apr 2009 07:18:48 -0000	1.2
@@ -0,0 +1 @@
+266cce156dd0488ad3f06b8909187818  ibus-table-erbi-1.1.0.20090407.tar.gz



From cchance at fedoraproject.org  Tue Apr  7 07:34:53 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  7 Apr 2009 07:34:53 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec,1.1,1.2
Message-ID: <20090407073453.8BA7C70100@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2470

Modified Files:
	ibus-table-erbi.spec 
Log Message:
typo of ChangeLog



Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-table-erbi.spec	7 Apr 2009 07:18:48 -0000	1.1
+++ ibus-table-erbi.spec	7 Apr 2009 07:34:23 -0000	1.2
@@ -53,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangLog COPYING README
+%doc AUTHORS ChangeLog COPYING README
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/erbi_qs.db
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 



From denis at fedoraproject.org  Tue Apr  7 07:36:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue,  7 Apr 2009 07:36:48 +0000 (UTC)
Subject: rpms/cdrdao/devel cdrdao-1.2.2-desktop.patch, NONE,
	1.1 cdrdao-1.2.2-gcc44.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 cdrdao.spec, 1.44, 1.45 sources, 1.9,
	1.10 cdrdao-1.1.7-endianness.patch, 1.3,
	NONE cdrdao-1.2.2-gcc43.patch, 1.1,
	NONE cdrtools-2.0-O_EXCL.patch, 1.1,
	NONE cdrtools-2.01a27-silly-warnings.patch, 1.1,
	NONE mkisofs-changelog.patch, 1.1, NONE xcdrdao.desktop, 1.1, NONE
Message-ID: <20090407073648.BC15870100@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cdrdao/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3815

Modified Files:
	.cvsignore cdrdao.spec sources 
Added Files:
	cdrdao-1.2.2-desktop.patch cdrdao-1.2.2-gcc44.patch 
Removed Files:
	cdrdao-1.1.7-endianness.patch cdrdao-1.2.2-gcc43.patch 
	cdrtools-2.0-O_EXCL.patch 
	cdrtools-2.01a27-silly-warnings.patch mkisofs-changelog.patch 
	xcdrdao.desktop 
Log Message:
- Update to latest 1.2.3 release candidate
- Merged with gcdmaster spec file
- Added scripts to manage gcdmaster new schemas file
- Moved desktop file fix into patch
- Added patch to fix gcc 4.4 compile


cdrdao-1.2.2-desktop.patch:

--- NEW FILE cdrdao-1.2.2-desktop.patch ---
--- cdrdao-1.2.3rc2/xdao/gcdmaster.desktop~	2004-06-28 20:05:57.000000000 +0200
+++ cdrdao-1.2.3rc2/xdao/gcdmaster.desktop	2009-04-07 09:13:56.000000000 +0200
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Gnome CD Master
 Comment=Gnome Audio CD editor and burner
 Exec=gcdmaster %F
-Icon=gcdmaster.png
+Icon=gcdmaster
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;AudioVideo;Application;X-Fedora;
+Categories=GNOME;AudioVideo;X-Fedora;
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;

cdrdao-1.2.2-gcc44.patch:

--- NEW FILE cdrdao-1.2.2-gcc44.patch ---
--- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~	2008-02-17 14:05:05.000000000 +0100
+++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc	2009-04-07 09:05:41.000000000 +0200
@@ -20,6 +20,7 @@
 #include "TempFileManager.h"
 #include "log.h"
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
--- cdrdao-1.2.3rc2/dao/CdrDriver.cc~	2009-02-21 11:01:32.000000000 +0100
+++ cdrdao-1.2.3rc2/dao/CdrDriver.cc	2009-04-07 09:07:14.000000000 +0200
@@ -2114,8 +2114,8 @@
 	ret = 1;
     }
     else {
-      if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
-	ret = 1;
+      if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
+        ret = 1;
     }
     break;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Jan 2007 13:49:24 -0000	1.9
+++ .cvsignore	7 Apr 2009 07:36:18 -0000	1.10
@@ -1 +1 @@
-cdrdao-1.2.2.tar.bz2
+cdrdao-1.2.3rc2.tar.bz2


Index: cdrdao.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cdrdao.spec	24 Feb 2009 06:53:21 -0000	1.44
+++ cdrdao.spec	7 Apr 2009 07:36:18 -0000	1.45
@@ -1,28 +1,28 @@
-Summary: Writes audio CD-Rs in disk-at-once (DAO) mode
-Name: cdrdao
-Version: 1.2.2
-Release: 6
-License: GPLv2
-Group: Applications/Multimedia
-URL: http://cdrdao.sourceforge.net/
-Source: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/%{name}-%{version}.tar.bz2
-
-Patch1: mkisofs-changelog.patch 
-Patch2: cdrdao-1.2.2-gcc43.patch
-Patch9: cdrdao-1.1.7-endianness.patch
-Patch23: cdrtools-2.01a27-silly-warnings.patch
-Patch30: cdrtools-2.0-O_EXCL.patch
+%define rcversion rc2
 
+Summary:   Writes audio CD-Rs in disk-at-once (DAO) mode
+Name:      cdrdao
+Version:   1.2.3
+Release:   0.%{rcversion}.1
+License:   GPLv2
+Group:     Applications/Multimedia
+URL:       http://cdrdao.sourceforge.net/
+Source0:   %{name}-%{version}%{rcversion}.tar.bz2
+Patch0:    cdrdao-1.2.2-gcc44.patch
+Patch1:    cdrdao-1.2.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Only for gcdmaster
-#BuildRequires: libvorbis-devel >= 1.0
-
-BuildRequires: libpng-devel
+BuildRequires:  gtkmm24-devel
+BuildRequires:  libgnomeuimm26-devel
+BuildRequires:  libsigc++20-devel
+BuildRequires:  libvorbis-devel >= 1.0
+BuildRequires:  desktop-file-utils
+BuildRequires:  libao-devel
 
 # Only exclude s390
 ExcludeArch: s390 s390x
 
+
 %description
 Cdrdao records audio CD-Rs in disk-at-once (DAO) mode, based on a
 textual description of the CD contents. Recording in DAO mode writes
@@ -30,38 +30,117 @@
 single step. DAO allows full control over the length and the contents
 of pre-gaps, the pause areas between tracks.
 
+
+%package -n gcdmaster
+Summary:      A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Group:        Applications/Multimedia
+Requires:     cdrdao = %{version}-%{release}
+
+Requires(post):   shared-mime-info desktop-file-utils
+Requires(postun): shared-mime-info desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2
+Requires(preun):  GConf2
+
+
+%description -n gcdmaster
+Gcdmaster is a GNOME2 GUI front-end to cdrdao that makes it easy to
+visualize and manipulate audio information before burning it onto
+CD. Its features include: cut/copy/paste of sound samples, track marks
+edition and silence insertion.
+
+
 %prep
-%setup -q
-chmod a+rX -R .
-%patch1 -p1 -b .changelog
-%patch2 -p1 -b .gcc43
-%patch9 -p1 -b .endian
-%patch23 -p1 -b .silly
-%patch30 -p1 -b .excl
+%setup -q -n %{name}-%{version}%{rcversion}
+%patch0 -p1 -b .gcc4
+%patch1 -p1 -b .desktop
+
 
 %build
-%configure --prefix=%{_prefix}\
-	--without-xdao --without-lame 
+%configure \
+        --with-xdao \
+        --without-scglib \
+        --with-mp3-support \
+        --without-lame
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
+desktop-file-install \
+  --vendor "" \
+  --mode 644 \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gcdmaster.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post -n gcdmaster
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcdmaster.schemas > /dev/null  || :
+killall -HUP gconfd-2 &>/dev/null || :
+
+
+%postun -n gcdmaster
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gcdmaster.schemas >/dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gcdmaster.schemas > /dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
 %files
-%defattr(-,root,root)
-%doc COPYING README 
-%{_bindir}/*
-%dir %{_datadir}/cdrdao
-%{_datadir}/cdrdao/*
-%{_mandir}/*/*
+%defattr(-, root, root, -)
+%doc AUTHORS COPYING README CREDITS ChangeLog
+%{_bindir}/cdrdao
+%{_bindir}/*toc*
+%{_datadir}/cdrdao
+%{_mandir}/*/cdrdao*
+%{_mandir}/*/cue2toc*
+
+
+%files -n gcdmaster
+%defattr(-, root, root, -)
+%{_bindir}/gcdmaster
+%{_datadir}/gcdmaster
+%{_datadir}/applications/*.desktop
+%{_datadir}/mime-info/gcdmaster*
+%{_datadir}/mime/packages/gcdmaster.xml
+%{_datadir}/application-registry/gcdmaster.applications
+%{_datadir}/pixmaps/*
+%{_sysconfdir}/gconf/schemas/gcdmaster.schemas
+%{_mandir}/man1/gcdmaster*
+
 
 %changelog
+* Tue Apr  7 2009 Denis Leroy <denis at poolshark.org> - 1.2.3-0.rc2.1
+- Update to latest 1.2.3 release candidate
+- Merged with gcdmaster spec file
+- Added scripts to manage gcdmaster new schemas file
+- Moved desktop file fix into patch
+- Added patch to fix gcc 4.4 compile
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Jan 2007 13:49:24 -0000	1.9
+++ sources	7 Apr 2009 07:36:18 -0000	1.10
@@ -1 +1 @@
-f0cbf36907406cb4f4c568f9e6669a34  cdrdao-1.2.2.tar.bz2
+55966f60e88cbf82bad91f3accfdc50b  cdrdao-1.2.3rc2.tar.bz2


--- cdrdao-1.1.7-endianness.patch DELETED ---


--- cdrdao-1.2.2-gcc43.patch DELETED ---


--- cdrtools-2.0-O_EXCL.patch DELETED ---


--- cdrtools-2.01a27-silly-warnings.patch DELETED ---


--- mkisofs-changelog.patch DELETED ---


--- xcdrdao.desktop DELETED ---



From cchance at fedoraproject.org  Tue Apr  7 07:37:27 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  7 Apr 2009 07:37:27 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec,1.2,1.3
Message-ID: <20090407073727.1B1AF70100@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3928

Modified Files:
	ibus-table-erbi.spec 
Log Message:
ChangeLog typo




Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ibus-table-erbi.spec	7 Apr 2009 07:34:23 -0000	1.2
+++ ibus-table-erbi.spec	7 Apr 2009 07:36:56 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:       ibus-table-erbi
 Version:    1.1.0.20090407
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Erbi input methods for ibus-table
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Tue Apr 07 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-3.fc11
+- Fixed files typo.
+
 * Tue Apr 07 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-2.fc11
 - Updated spec file info.
 



From jakub at fedoraproject.org  Tue Apr  7 07:39:40 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue,  7 Apr 2009 07:39:40 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.266, 1.267 glibc-fedora.patch, 1.299,
	1.300 glibc.spec, 1.386, 1.387 import.log, 1.10, 1.11 sources,
	1.291, 1.292
Message-ID: <20090407073940.9A86070100@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4521/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- .cvsignore	1 Apr 2009 10:41:20 -0000	1.266
+++ .cvsignore	7 Apr 2009 07:39:09 -0000	1.267
@@ -1,2 +1,2 @@
-glibc-20090401T0935.tar.bz2
-glibc-fedora-20090401T0935.tar.bz2
+glibc-20090407T0657.tar.bz2
+glibc-fedora-20090407T0657.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- glibc-fedora.patch	1 Apr 2009 10:41:20 -0000	1.299
+++ glibc-fedora.patch	7 Apr 2009 07:39:09 -0000	1.300
@@ -1,6 +1,6 @@
---- glibc-20090401T0935/ChangeLog	1 Apr 2009 00:26:36 -0000	1.11556
-+++ glibc-20090401T0935-fedora/ChangeLog	1 Apr 2009 09:41:35 -0000	1.8782.2.323
-@@ -7030,6 +7030,13 @@
+--- glibc-20090407T0657/ChangeLog	7 Apr 2009 06:51:59 -0000	1.11569
++++ glibc-20090407T0657-fedora/ChangeLog	7 Apr 2009 07:04:22 -0000	1.8782.2.325
+@@ -7124,6 +7124,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7325,6 +7332,10 @@
+@@ -7419,6 +7426,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8582,6 +8593,15 @@
+@@ -8676,6 +8687,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090401T0935/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090401T0935-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090407T0657/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090407T0657-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090401T0935/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090401T0935-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090407T0657/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090407T0657-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090401T0935/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090401T0935-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090407T0657/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090407T0657-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090401T0935/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090401T0935-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090407T0657/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090407T0657-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090401T0935/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090401T0935-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090407T0657/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090407T0657-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090401T0935/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090401T0935-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090407T0657/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090407T0657-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090401T0935/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090401T0935-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090407T0657/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090407T0657-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090401T0935/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090401T0935-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090407T0657/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090407T0657-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090401T0935/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090407T0657/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090401T0935/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090407T0657/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090401T0935/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090401T0935-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090407T0657/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090407T0657-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090401T0935/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090401T0935-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090407T0657/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090407T0657-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090401T0935/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090401T0935-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090407T0657/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090407T0657-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090401T0935/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090401T0935-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090407T0657/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090407T0657-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090401T0935/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090401T0935-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090407T0657/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090407T0657-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090401T0935/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090401T0935-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090407T0657/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090407T0657-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090401T0935/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090401T0935-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090407T0657/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090407T0657-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090401T0935/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090401T0935-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090407T0657/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090407T0657-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090401T0935/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090407T0657/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090401T0935/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090401T0935-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090407T0657/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090407T0657-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090401T0935/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090401T0935-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090407T0657/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090407T0657-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090401T0935/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090401T0935-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090407T0657/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090407T0657-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090401T0935/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090401T0935-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090407T0657/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090407T0657-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090401T0935/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090401T0935-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090407T0657/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090407T0657-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090401T0935/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090401T0935-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090407T0657/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090407T0657-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090401T0935/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090401T0935-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090407T0657/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090407T0657-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090401T0935/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090401T0935-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090407T0657/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090407T0657-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090401T0935/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090407T0657/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090401T0935/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090401T0935-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090407T0657/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090407T0657-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090401T0935/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090401T0935-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090407T0657/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090407T0657-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090401T0935/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090401T0935-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090407T0657/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090407T0657-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090401T0935/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090401T0935-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090407T0657/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090407T0657-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090401T0935/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090407T0657/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090401T0935/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
-+++ glibc-20090401T0935-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
+--- glibc-20090407T0657/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
++++ glibc-20090407T0657-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
 @@ -102,7 +102,7 @@ libnss_dns {
      _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
      _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
@@ -1225,8 +1225,8 @@
    }
  }
  
---- glibc-20090401T0935/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090401T0935-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090407T0657/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090407T0657-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1236,8 +1236,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090401T0935/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090401T0935-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090407T0657/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090407T0657-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1253,8 +1253,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090401T0935/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090401T0935-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090407T0657/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090407T0657-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1270,8 +1270,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090401T0935/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090401T0935-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090407T0657/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090407T0657-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1283,8 +1283,8 @@
  endif
  endif
  
---- glibc-20090401T0935/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090401T0935-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090407T0657/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090407T0657-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1636,8 +1636,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090401T0935/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090407T0657/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1723,8 +1723,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090401T0935/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090401T0935-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090407T0657/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090407T0657-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1733,8 +1733,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090401T0935/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090401T0935-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090407T0657/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090407T0657-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1749,8 +1749,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1766,8 +1766,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1815,8 +1815,8 @@
      }
    else
  #endif
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1859,8 +1859,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1886,8 +1886,8 @@
  
  struct netlink_res
  {
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1897,8 +1897,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1944,8 +1944,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1964,8 +1964,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2026,8 +2026,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2060,29 +2060,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090401T0935/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090401T0935-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090407T0657/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- glibc.spec	1 Apr 2009 10:41:21 -0000	1.386
+++ glibc.spec	7 Apr 2009 07:39:09 -0000	1.387
@@ -1,6 +1,6 @@
-%define glibcdate 20090401T0935
+%define glibcdate 20090407T0657
 %define glibcname glibc
-%define glibcsrcdir glibc-20090401T0935
+%define glibcsrcdir glibc-20090407T0657
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 12
+Release: 13
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -52,7 +52,7 @@
 # This is for building auxiliary programs like memusage, nscd
 # For initial glibc bootstraps it can be commented out
 BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3
-BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext
+BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel
 BuildRequires: /bin/ps, /bin/kill, /bin/awk
 # This is to ensure that __frame_state_for is exported by glibc
 # will be compatible with egcs 1.x.y
@@ -324,7 +324,7 @@
 	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
-	--disable-profile --enable-experimental-malloc
+	--disable-profile --enable-experimental-malloc --enable-nss-crypt
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1013,6 +1013,11 @@
 %endif
 
 %changelog
+* Tue Apr  7 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-13
+- update from trunk
+  - fix strverscmp (#494457)
+- configure with --enable-nss-crypt
+
 * Wed Apr  1 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-12
 - update from trunk
 - configure with --enable-experimental-malloc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	1 Apr 2009 10:41:21 -0000	1.10
+++ import.log	7 Apr 2009 07:39:09 -0000	1.11
@@ -8,3 +8,4 @@
 glibc-2_9_90-10:HEAD:glibc-2.9.90-10.src.rpm:1236715256
 glibc-2_9_90-11:HEAD:glibc-2.9.90-11.src.rpm:1237580739
 glibc-2_9_90-12:HEAD:glibc-2.9.90-12.src.rpm:1238582344
+glibc-2_9_90-13:HEAD:glibc-2.9.90-13.src.rpm:1239089921


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- sources	1 Apr 2009 10:41:21 -0000	1.291
+++ sources	7 Apr 2009 07:39:09 -0000	1.292
@@ -1,2 +1,2 @@
-2ba6e9abcb430ceb0817bd34f3bc6152  glibc-20090401T0935.tar.bz2
-12a79bf25e050840713075538d01c13e  glibc-fedora-20090401T0935.tar.bz2
+3a63115d0bee85fe85f9fb1e8fdd1257  glibc-20090407T0657.tar.bz2
+8578b66b3d0571f1a7152e1c92bd595a  glibc-fedora-20090407T0657.tar.bz2



From ellert at fedoraproject.org  Tue Apr  7 07:40:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue,  7 Apr 2009 07:40:27 +0000 (UTC)
Subject: rpms/globus-common/devel globus-common-bad-age.patch, NONE,
	1.1 globus-common-deps.patch, NONE,
	1.1 globus-common-doxygen.patch, NONE,
	1.1 globus-common-extradist.patch, NONE,
	1.1 globus-common-ltdlmutex.patch, NONE,
	1.1 globus-common-no-pthread-exceptions.patch, NONE,
	1.1 globus-common-noflavext.patch, NONE,
	1.1 globus-common-nosuchfile.patch, NONE,
	1.1 globus-common-setup.patch, NONE,
	1.1 globus-common-typo.patch, NONE, 1.1 globus-common-usr.patch,
	NONE, 1.1 globus-common.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407074027.D388070100@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4289/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-common-bad-age.patch globus-common-deps.patch 
	globus-common-doxygen.patch globus-common-extradist.patch 
	globus-common-ltdlmutex.patch 
	globus-common-no-pthread-exceptions.patch 
	globus-common-noflavext.patch globus-common-nosuchfile.patch 
	globus-common-setup.patch globus-common-typo.patch 
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals


globus-common-bad-age.patch:

--- NEW FILE globus-common-bad-age.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-09-29 23:20:49.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-10-12 01:28:20.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Name="globus_common" Format_Version="0.02">
 
-    <Aging_Version Major="10" Minor="2" Age="11"/>
+    <Aging_Version Major="10" Minor="2" Age="10"/>
     <Description >Common Library</Description>
     <Functional_Group >Common</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>

globus-common-deps.patch:

--- NEW FILE globus-common-deps.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-06-25 00:11:11.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-07-14 11:57:49.000000000 +0200
@@ -51,14 +51,6 @@
             <pkg_libs>-lglobus_common</pkg_libs>
         </Build_Environment>
 
-        <Source_Setup_Dependency PkgType="rtl">
-            <Setup_Dependency Name="globus_common_setup"> 
-                <Version>
-                    <Simple_Version Major="2"/>
-                </Version>
-            </Setup_Dependency>
-        </Source_Setup_Dependency>
-		   
         <Source_Setup_Dependency PkgType="pgm">
             <Setup_Dependency Name="globus_common_setup"> 
                 <Version>

globus-common-doxygen.patch:

--- NEW FILE globus-common-doxygen.patch ---
diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h
--- globus_common-10.2.orig/library/globus_callback.h	2006-01-19 06:54:13.000000000 +0100
+++ globus_common-10.2/library/globus_callback.h	2008-10-08 05:05:28.000000000 +0200
@@ -19,10 +19,10 @@
 /**
  * @file globus_callback.h Globus Callback API
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $<br />
- * $Date: 2006/01/19 05:54:13 $<br />
- * $Revision: 1.12 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
+ * $Date: 2006/01/19 05:54:13 $
+ * $Revision: 1.12 $
+ * $Author: mlink $
  */
 
 /**
diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/library/globus_common.h.in
--- globus_common-10.2.orig/library/globus_common.h.in	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_common.h.in	2008-10-08 05:04:11.000000000 +0200
@@ -44,14 +44,6 @@
 
 EXTERN_C_BEGIN
 
-/* TODO remove this if we ever doxyegenate common fully */
-/**
- * @mainpage 
- *
- *   @note <b>More globus_common API documentation is available <a href="../../../common/">here</a>.</b>
- * 
- */
- 
 /******************************************************************************
 			       Type definitions
 ******************************************************************************/
diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h
--- globus_common-10.2.orig/library/globus_thread_common.h	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_thread_common.h	2008-10-08 05:04:58.000000000 +0200
@@ -17,10 +17,10 @@
 /**
  * @file globus_thread_common.h Common Thread Interface
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $<br />
- * $Date: 2006/01/19 05:54:14 $<br />
- * $Revision: 1.6 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
+ * $Date: 2006/01/19 05:54:14 $
+ * $Revision: 1.6 $
+ * $Author: mlink $
  */
 
 /******************************************************************************
diff -ur globus_common-10.2.orig/library/globus_url.h globus_common-10.2/library/globus_url.h
--- globus_common-10.2.orig/library/globus_url.h	2008-01-23 18:26:04.000000000 +0100
+++ globus_common-10.2/library/globus_url.h	2008-10-08 06:02:49.000000000 +0200
@@ -67,7 +67,7 @@
     GLOBUS_URL_SCHEME_X_NEXUS,
     /** GASS Cache Entry */
     GLOBUS_URL_SCHEME_X_GASS_CACHE,
-    /** Any other URL of the form <scheme>://<something */
+    /** Any other URL of the form <scheme>://<something> */
     GLOBUS_URL_SCHEME_UNKNOWN,
     GLOBUS_URL_SCHEME_SSHFTP,
     /** Total number of URL schemes supported */

globus-common-extradist.patch:

--- NEW FILE globus-common-extradist.patch ---
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2008-12-11 16:13:45.120989000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-12-11 16:15:09.868546294 +0100
@@ -5,8 +5,6 @@
 
 sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
-EXTRA_DIST = globus-sh-exec.in globus-version.in
-
 INCLUDES = -I$(top_srcdir)/library $(GPT_INCLUDES) 
 
 globus_libc_hostname_SOURCES = globus_libc_hostname.c
@@ -21,5 +19,7 @@
 globus_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@
 endif
 
+EXTRA_DIST = globus-sh-exec.in globus-version.in
+
 include $(top_srcdir)/globus_automake_post
 

globus-common-ltdlmutex.patch:

--- NEW FILE globus-common-ltdlmutex.patch ---
diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in
--- globus_common-10.2.orig/configure.in	2007-12-12 00:29:27.000000000 +0100
+++ globus_common-10.2/configure.in	2008-12-18 09:02:27.000000000 +0100
@@ -24,6 +24,11 @@
 
 GPT_SET_LIBS(["$EXTERNAL_LIBS"])
 
+save_LIBS=$LIBS
+LIBS="$LIBS $GPT_LIBS"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$save_LIBS
+
 AC_SUBST(GLOBUS_THREADS)
 
 if test x"$GLOBUS_VERSIONNAME" = "x" ; then
diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
+++ globus_common-10.2/library/globus_extension.c	2008-12-18 09:04:27.000000000 +0100
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include "globus_extension.h"
 #include "globus_debug.h"
 #include GLOBUS_THREAD_INCLUDE
@@ -169,6 +170,7 @@
         {
             goto error_dlinit;
         }
+#       ifdef HAVE_LT_DLMUTEX_REGISTER
         if(lt_dlmutex_register(
             globus_l_libtool_mutex_lock,
             globus_l_libtool_mutex_unlock,
@@ -177,6 +179,7 @@
         {
             goto error_dlmutex;
         }
+#       endif /* HAVE_LT_DLMUTEX_REGISTER */
 #       endif /* !BUILD_STATIC_ONLY */
         
         globus_hashtable_init(

globus-common-no-pthread-exceptions.patch:

--- NEW FILE globus-common-no-pthread-exceptions.patch ---
diff -ur globus-common-7.30.orig/library/globus_thread_pthreads.h globus-common-7.30/library/globus_thread_pthreads.h
--- globus-common-7.30.orig/library/globus_thread_pthreads.h	2005-04-19 00:59:37.000000000 +0200
+++ globus-common-7.30/library/globus_thread_pthreads.h	2008-06-30 18:22:33.000000000 +0200
@@ -57,7 +57,13 @@
 #include <pthread.h>
 EXTERN_C_END
 #else  /* TARGET_ARCH_AIX */
+#if defined __GNUC__ && defined __EXCEPTIONS
+#undef __EXCEPTIONS
 #include <pthread.h>
+#define __EXCEPTIONS
+#else
+#include <pthread.h>
+#endif
 #endif /* TARGET_ARCH_AIX */
 
 EXTERN_C_BEGIN

globus-common-noflavext.patch:

--- NEW FILE globus-common-noflavext.patch ---
diff -ur globus-common-7.30.orig/library/globus_extension.c globus-common-7.30/library/globus_extension.c
--- globus-common-7.30.orig/library/globus_extension.c	2005-04-19 00:59:29.000000000 +0200
+++ globus-common-7.30/library/globus_extension.c	2008-07-05 09:22:39.000000000 +0200
@@ -357,11 +357,24 @@
     dlhandle = lt_dlopenext(library);
     if(!dlhandle)
     {
+        snprintf(library, 1024, "lib%s", name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
+    if(!dlhandle)
+    {
         /* older libtools dont search the extensions correctly */
         snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor);
         library[1023] = 0;
         dlhandle = lt_dlopenext(library);
     }
+    if(!dlhandle)
+    {
+        /* older libtools dont search the extensions correctly */
+        snprintf(library, 1024, "lib%s" MY_LIB_EXT, name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
 
     if(!dlhandle)
     {

globus-common-nosuchfile.patch:

--- NEW FILE globus-common-nosuchfile.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-10-11 12:11:57.000000000 +0200
@@ -157,7 +157,6 @@
 	globus_thread_sproc.c \
 	globus_thread_sproc.h
 
-EXTRA_HEADERS = \
-        globus_netos_dir.h
+EXTRA_HEADERS =
 
 include $(top_srcdir)/globus_automake_post

globus-common-setup.patch:

--- NEW FILE globus-common-setup.patch ---
diff -ur globus_common_setup-2.6.orig/configure.in globus_common_setup-2.6/configure.in
--- globus_common_setup-2.6.orig/configure.in	2002-01-10 03:26:32.000000000 +0100
+++ globus_common_setup-2.6/configure.in	2008-10-13 00:09:15.000000000 +0200
@@ -9,10 +9,31 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
+AC_ARG_WITH(tmpdir,
+        AC_HELP_STRING([--with-tmpdir=DIR],
+        [directory for temporary files [[/tmp]]]),
+        [tmpdir="$withval"],
+        [tmpdir=/tmp])
+AC_SUBST(tmpdir)
 
+AC_ARG_WITH(local-tmpdir,
+        AC_HELP_STRING([--with-local-tmpdir=DIR],
+        [local directory for temporary files [[TMPDIR]]]),
+        [local_tmpdir="$withval"],
+        [local_tmpdir='${tmpdir}'])
+AC_SUBST(local_tmpdir)
+
+AC_ARG_WITH(secure-tmpdir,
+        AC_HELP_STRING([--with-secure-tmpdir=DIR],
+        [secure directory for temporary files [[PREFIX/tmp]]]),
+        [secure_tmpdir="$withval"],
+        [secure_tmpdir='${prefix}/tmp'])
+AC_SUBST(secure_tmpdir)
 
 AC_OUTPUT(
         Makefile
+        globus-script-initializer
+        Paths.pm:Paths.in
         pkgdata/Makefile
         pkgdata/pkg_data_src.gpt
 )
diff -ur globus_common_setup-2.6.orig/findshelltools.in globus_common_setup-2.6/findshelltools.in
--- globus_common_setup-2.6.orig/findshelltools.in	2004-09-29 14:52:55.000000000 +0200
+++ globus_common_setup-2.6/findshelltools.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,16 +1,6 @@
 AC_REVISION($Revision: 1.2 $)
 AC_INIT(globus-sh-tools-vars.sh.in)
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
-
 if test "x$PERL" = "x"; then
         AC_PATH_PROG(PERL,perl)
 fi
diff -ur globus_common_setup-2.6.orig/globus-script-initializer.in globus_common_setup-2.6/globus-script-initializer.in
--- globus_common_setup-2.6.orig/globus-script-initializer.in	2005-11-29 21:08:58.000000000 +0100
+++ globus_common_setup-2.6/globus-script-initializer.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,49 +1,53 @@
-
-
-exec_prefix=${GLOBUS_LOCATION}
-prefix=$GLOBUS_LOCATION
-sbindir=${exec_prefix}/sbin
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-libexecdir=${exec_prefix}/libexec
-includedir=${exec_prefix}/include
-datadir=${prefix}/share
-sysconfdir=${prefix}/etc
-sharedstatedir=${prefix}/com
-localstatedir=${prefix}/var
+prefix=${GLOBUS_LOCATION:-/usr}
+exec_prefix=${GLOBUS_LOCATION:-/usr}
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+flavorincludedir=@flavorincludedir@
+datadir=@datadir@
+libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+setupdir=@setupdir@
+testdir=@testdir@
+perlmoduledir=@perlmoduledir@
 tmpdir=@tmpdir@
 local_tmpdir=@local_tmpdir@
 secure_tmpdir=@secure_tmpdir@
 
+if [ x$prefix != "x/usr" ]; then
+
 DELIM=
 if [ -n "${LD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}"
 
 DELIM=
 if [ -n "${DYLD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}"
 
 if [ -z "${LIBPATH}" ]; then
     LIBPATH="/usr/lib:/lib"
 fi
-LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}"
+LIBPATH="${libdir}:${LIBPATH}"
 
 DELIM=
 if [ -n "${SHLIB_PATH}" ]; then
     DELIM=:
 fi
-SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}"
+SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}"
 
-if [ -d $GLOBUS_LOCATION/lib/sasl ]; then
+if [ -d ${libdir}/sasl ]; then
     DELIM=
     if [ -n "${SASL_PATH}" ]; then
         DELIM=:
     fi
-    SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}"
+    SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}"
 fi
 
 export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH
@@ -53,7 +57,7 @@
     if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}"
+    LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}"
     export LD_LIBRARYN32_PATH
 fi
 
@@ -62,10 +66,19 @@
     if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}"
+    LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}"
     export LD_LIBRARY64_PATH
 fi
 
+DELIM=
+if [ -n "${PERLLIB}" ]; then
+    DELIM=:
+fi
+PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}"
+export PERLLIB
+
+fi
+
 globus_source () {
 
   # Check if file exists and source it
diff -ur globus_common_setup-2.6.orig/Makefile.am globus_common_setup-2.6/Makefile.am
--- globus_common_setup-2.6.orig/Makefile.am	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Makefile.am	2008-10-13 00:09:15.000000000 +0200
@@ -3,25 +3,26 @@
 
 setup_SCRIPTS = \
 	findshelltools \
-	setup-tmpdirs \
 	setup-globus-common \
 	setup-globus-common.pl
 
 setup_DATA = \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in 
+        globus-sh-tools-vars.sh.in
+
+libexec_SCRIPTS = globus-script-initializer
+
+globusperldir = $(perlmoduledir)/Globus/Core
+globusperl_DATA = Paths.pm
+
+findshelltools: findshelltools.in
+	autoconf -o findshelltools findshelltools.in
 
 SUBDIRS = pkgdata
 
 EXTRA_DIST = \
 	findshelltools \
 	findshelltools.in \
-	setup-tmpdirs \
-	setup-tmpdirs.in \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in \
+	globus-sh-tools-vars.sh.in \
 	setup-globus-common \
 	setup-globus-common.pl
 
diff -ur globus_common_setup-2.6.orig/Paths.in globus_common_setup-2.6/Paths.in
--- globus_common_setup-2.6.orig/Paths.in	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Paths.in	2008-10-13 00:09:15.000000000 +0200
@@ -4,26 +4,38 @@
 
 @ISA = qw(Exporter);
 
- at EXPORT = qw($exec_prefix $prefix
-             $sbindir $bindir
-	     $libdir $libexecdir $includedir
-	     $datadir $sysconfdir $sharedstatedir
+ at EXPORT = qw($prefix $exec_prefix
+	     $bindir $sbindir $libdir
+	     $includedir $flavorincludedir
+	     $datadir $libexecdir
+	     $sysconfdir $sharedstatedir
 	     $localstatedir
+	     $setupdir $testdir
+	     $perlmoduledir
 	     $tmpdir
 	     $local_tmpdir
 	     $secure_tmpdir);
 
-$exec_prefix=$ENV{GLOBUS_LOCATION};
+my $PACKAGE = "\$PACKAGE";
+my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME";
+
 $prefix=$ENV{GLOBUS_LOCATION};
-$sbindir="${exec_prefix}/sbin";
-$bindir="${exec_prefix}/bin";
-$libdir="${exec_prefix}/lib";
-$libexecdir="${exec_prefix}/libexec";
-$includedir="${exec_prefix}/include";
-$datadir="${prefix}/share";
-$sysconfdir="${prefix}/etc";
-$sharedstatedir="${prefix}/com";
-$localstatedir="${prefix}/var";
+$prefix="/usr" if (!defined $prefix);
+$exec_prefix=$ENV{GLOBUS_LOCATION};
+$exec_prefix="/usr" if (!defined $exec_prefix);
+$bindir="@bindir@";
+$sbindir="@sbindir@";
+$libdir="@libdir@";
+$includedir="@includedir@";
+$flavorincludedir="@flavorincludedir@";
+$datadir="@datadir@";
+$libexecdir="@libexecdir@";
+$sysconfdir="@sysconfdir@";
+$sharedstatedir="@sharedstatedir@";
+$localstatedir="@localstatedir@";
+$setupdir="@setupdir@";
+$testdir="@testdir@";
+$perlmoduledir="@perlmoduledir@";
 $tmpdir="@tmpdir@";
 $local_tmpdir="@local_tmpdir@";
 $secure_tmpdir="@secure_tmpdir@";
diff -ur globus_common_setup-2.6.orig/setup-globus-common globus_common_setup-2.6/setup-globus-common
--- globus_common_setup-2.6.orig/setup-globus-common	2001-06-21 00:24:26.000000000 +0200
+++ globus_common_setup-2.6/setup-globus-common	2008-10-13 00:09:15.000000000 +0200
@@ -1,3 +1,8 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+perl ${setupdir}/setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup-2.6/setup-globus-common.pl
--- globus_common_setup-2.6.orig/setup-globus-common.pl	2006-01-19 06:54:11.000000000 +0100
+++ globus_common_setup-2.6/setup-globus-common.pl	2008-10-13 00:09:15.000000000 +0200
@@ -19,13 +19,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -34,37 +28,25 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-
-if((!defined($globusdir)))
-{
-    die "GLOBUS_LOCATION needs to be set before running this script"
-}
-
-my $setupdir = "$globusdir/setup/globus/";
+require Globus::Core::Paths;
+my $setupdir = $Globus::Core::Paths::setupdir;
+my $libexecdir = $Globus::Core::Paths::libexecdir;
+my $bindir = $Globus::Core::Paths::bindir;
 
 print "creating globus-sh-tools-vars.sh\n";
 my $result = `$setupdir/findshelltools`;
 
-print "creating globus-script-initializer\n";
-print "creating Globus::Core::Paths\n";
-
-$result = `$setupdir/setup-tmpdirs`;
-
-for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh')
+for my $setupfile ('globus-sh-tools-vars.sh')
 {
-    $result = system("cp $setupdir/$setupfile $globusdir/libexec");
-    $result = system("chmod 0755 $globusdir/libexec/$setupfile");
-
+    $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile");
+    $result = system("chmod 0644 $libexecdir/$setupfile");
 }
 
-system("mkdir -p $globusdir/lib/perl/Globus/Core");
-system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/");
-system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm");
+system("rm -f config.log config.status");
 
 print "checking globus-hostname\n";
 
-my $hostname = `$globusdir/bin/globus-hostname`;
+my $hostname = `$bindir/globus-hostname`;
 
 $hostname =~ s/\w//g; #strip whitespace
 

globus-common-typo.patch:

--- NEW FILE globus-common-typo.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-07-14 17:33:08.000000000 +0200
@@ -143,7 +143,7 @@
 
 libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@
 libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
-libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@
+libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@
 
 EXTRA_DIST = \
 	globus_callback_nothreads.c \

globus-common-usr.patch:

--- NEW FILE globus-common-usr.patch ---
diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
--- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -9,7 +9,7 @@
 	config \
 	doxygen
 
-sbin_SCRIPTS= \
+libexec_SCRIPTS= \
 	config.guess
 
 EXTRA_DIST = \
diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
--- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
@@ -17,7 +17,11 @@
 # 
 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 # This was done by the script initializer before V2.0
diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
--- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
@@ -43,7 +43,11 @@
 
 usage()
 {
-    . ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+    fi
     globus_source ${libexecdir}/globus-sh-tools.sh
 
     ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -3,7 +3,7 @@
 if ENABLE_PROGRAMS
 bin_SCRIPTS = globus-sh-exec globus-version
 
-libexec_PROGRAMS = globus-libc-hostname globus-is-local-user
+sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
 EXTRA_DIST = globus-sh-exec.in globus-version.in
 
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
@@ -23,13 +23,12 @@
 # domainname
 
 
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
 fi
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-
 PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'`
 PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2`
 
@@ -67,7 +66,7 @@
 EOF
 }
 
-. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header
+. ${libexecdir}/globus-args-parser-header
 
 if [ -n "$1" ]; then
     globus_args_unrecognized_option "$1"
@@ -79,8 +78,8 @@
 if [ -z "${GLOBUS_HOSTNAME}" ] ; then
 
   # Set the _fullname based upon Globus's hostname command
-  if [ -x "${libexecdir}/globus-libc-hostname" ]; then
-    _fullname="`${libexecdir}/globus-libc-hostname`"
+  if [ -x "${sbindir}/globus-libc-hostname" ]; then
+    _fullname="`${sbindir}/globus-libc-hostname`"
   fi
 
   # if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
@@ -25,29 +25,15 @@
 
 my $gpt_path = $ENV{GPT_LOCATION};
 my $globus_path = $ENV{GLOBUS_LOCATION};
-my $gpath;
 
-if ( !defined($gpt_path) && !defined($globus_path) )
+if ( !defined($gpt_path) )
 {
-    die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+    $gpt_path = "/usr";
 }
 
-if ( defined($gpt_path) )
+if ( !defined($globus_path) )
 {
-    $gpath = $gpt_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
-}
-
-if ( !defined($gpath) && defined($globus_path) )
-{
-    $gpath = $globus_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
+    $globus_path = "/usr";
 }
 
 
@@ -60,7 +46,7 @@
 #
 
 my($environment);
- at INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+ at INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
 
 if ( defined eval "require Grid::GPT::V1::Package" )
 {
@@ -240,7 +226,9 @@
     # point our installation object at our globus location
     #
 
-    $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
+    $installation = -d "$globus_path/share/globus/packages" ?
+        new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") :
+        new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
     $installation->set_depenv('Build');
 
     #
@@ -313,10 +301,17 @@
     # push all of our entries onto our header array
     #
 
+    @INC = ("$globus_path/lib/perl", @INC);
+
+    require Globus::Core::Paths;
+    my $includedir = $Globus::Core::Paths::includedir;
+    my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+    my $libdir = $Globus::Core::Paths::libdir;
+
     push(@$header, "GLOBUS_CFLAGS=\"$cflagslist\"");
-    push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\"");
+    push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\"");
     push(@$header, "GLOBUS_LIBS=\"$libslist\"");
-    push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\"");
+    push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\"");
     push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\"");
     push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\"");
 }
@@ -332,7 +327,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") ||
+      open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") ||
+      die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n";
 
     while (<IN>)
     { 
@@ -370,7 +367,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") ||
+      open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") ||
+      die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n";
 
     while (<IN>) 
     {
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
--- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
@@ -15,18 +15,13 @@
 
 my $flavor;
 my $link="static";
-my $gpt=$ENV{GPT_LOCATION};
+
 my $gpath = $ENV{GPT_LOCATION};
 if (!defined($gpath))
 {
-	  $gpath = $ENV{GLOBUS_LOCATION};
-	   
-  }
-  if (!defined($gpath))
-  {
-	     die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
-     }
-      
+  $gpath = "/usr";
+}
+
      @INC = (@INC, "$gpath/lib/perl");
 
 require Grid::GPT::Dependencies;
@@ -40,20 +35,10 @@
 my $pgm_linkslist;
 my $lib_linkslist;
 
-if(!defined($gpt))
-{
-  $gpt=$ENV{GLOBUS_LOCATION};
-}
-if(!defined($gpt))
-{
-  die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n";
-}
-
 my $globus=$ENV{GLOBUS_LOCATION};
-
 if(!defined($globus))
 {
-  die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n";
+  $globus = "/usr";
 }
 
 my %hash;
@@ -102,14 +87,23 @@
 
 	assemble_link_lines($fakepkg, $flavor, $link);
 	  
+ at INC = ("$globus/lib/perl", @INC);
+
+require Globus::Core::Paths;
+my $includedir = $Globus::Core::Paths::includedir;
+my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+my $libdir = $Globus::Core::Paths::libdir;
+
 push @temp_header,  "GLOBUS_CFLAGS=\"$cflagslist\"\n";
-push @temp_header,  "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n";
+push @temp_header,  "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n";
 push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n";
-push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n";
+push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n";
 push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n";
 push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n";
 
-open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n";
+open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") ||
+  open(IN, "$globus/libexec/globus-build-env-$flavor.sh") ||
+  die "ERROR: Cannot open globus-build-env-$flavor.sh\n";
 
 while(<IN>)
 { 
@@ -130,7 +124,9 @@
 
 #END of Section one:  prepending GLOBUS_
 close (IN);
-open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n";
+open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") ||
+  open(IN, "$globus/libexec/globus-sh-tools-vars.sh") ||
+  die "ERROR: Cannot open globus-sh-tools-vars.sh\n";
 while(<IN>) 
 {
 	if(m!\S!)  
diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
--- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
@@ -18,7 +18,11 @@
 
 if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
     
-    . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh
+    fi
     
     # export all commands:
 


--- NEW FILE globus-common.spec ---
Name:		globus-common
%global _name %(tr - _ <<< %{name})
Version:	10.2
%global setupversion 2.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
#		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
#		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
Source1:	%{_name}_setup-%{setupversion}.tar.gz
Source8:	epstopdf-2.9.5gw
Source9:	GLOBUS_LICENSE
#		Environment variable elimination patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
Patch0:		%{name}-usr.patch
#		Segfault fix patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6460
Patch1:		%{name}-no-pthread-exceptions.patch
#		Allow plugins without the flavor extension in the name:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6461
Patch2:		%{name}-noflavext.patch
#		Remove bogus inter-package dependency:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6462
Patch3:		%{name}-deps.patch
#		Fixes a stupid typo in library/Makefile.am:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6463
Patch4:		%{name}-typo.patch
#		The file globus_netos_dir.h does not exist:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6464
Patch5:		%{name}-nosuchfile.patch
#		Doxygen warning fix:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6465
Patch6:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6466
Patch7:		%{name}-bad-age.patch
#		Extradist should not be conditional:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6576
Patch8:		%{name}-extradist.patch
#		Check for function removed from newer versions of libltdl:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578
Patch9:		%{name}-ltdlmutex.patch
#		Configure options not propagated in globus common setup:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
Patch10:	%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Common Library Programs
Group:		Applications/Internet
Provides:	%{name}-setup = %{setupversion}
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool >= 1
Requires:	globus-common-progs >= 3
Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%if %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
%endif

%package devel
Summary:	Globus Toolkit - Common Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-core >= 4
Requires:	pkgconfig

%package doc
Summary:	Globus Toolkit - Common Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

%description
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name} package contains:
Common Library

%description progs
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-progs package contains:
Common Library Programs
Common Setup

%description devel
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-devel package contains:
Common Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-doc package contains:
Common Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1 -b .usr
%patch1 -p1 -b .segfault
%patch2 -p1 -b .noflavext
%patch3 -p1 -b .deps
%patch4 -p1 -b .typo
%patch5 -p1 -b .nofile
%patch6 -p1 -b .doxygen
%patch7 -p1 -b .age
%patch8 -p1 -b .extradist
%patch9 -p1 -b .ltdlmutex
cd %{_name}_setup-%{setupversion}
%patch10 -p1 -b .setup
cd -

# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Grid::GPT::.*)/d'
EOF
%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
  mv $f.new $f
done

sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in

/usr/share/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

# setup package
cd %{_name}_setup-%{setupversion}

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

/usr/share/globus/globus-bootstrap.sh

%configure --without-flavor --with-secure-tmpdir=/var/tmp

make %{?_smp_mflags}

cd -

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# Remove libtool archives (.la files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.la$' < $l > $l.new
  mv $l.new $l
done

# Remove static libraries (.a files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.a$' < $l > $l.new
  mv $l.new $l
done

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move globus-makefile-header to devel package
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep globus-makefile-header >> \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep -v globus-makefile-header > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
  sed 's/P\.RS/P\n.RS/' < $f > $f.new
  mv $f.new $f
done

rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | grep -v 'deprecated\.3' \
  | grep -v '_%{_name}-%{version}_.*\.3' > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed 's!/man/.*!&*!' \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post progs
cd %{_datadir}/globus/setup
./findshelltools > /dev/null
cp -p globus-sh-tools-vars.sh ..
rm -f config.log config.status

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}_setup
%dir %{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/packages/setup/%{_name}_setup
%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
%dir %{_datadir}/globus/setup
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
%ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
%ghost %{_datadir}/globus/globus-sh-tools-vars.sh

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%dir %{_includedir}/globus
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals

* Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
- Make comment about source retieval more explicit

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.4
- Add s390x to the list of 64 bit platforms
- Move globus-makefile-header to devel package

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:15:32 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:40:27 -0000	1.2
@@ -0,0 +1,4 @@
+GLOBUS_LICENSE
+epstopdf-2.9.5gw
+globus_common-10.2.tar.gz
+globus_common_setup-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:15:32 -0000	1.1
+++ sources	7 Apr 2009 07:40:27 -0000	1.2
@@ -0,0 +1,4 @@
+2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
+7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz



From ellert at fedoraproject.org  Tue Apr  7 07:43:10 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue,  7 Apr 2009 07:43:10 +0000 (UTC)
Subject: rpms/globus-common/F-9 globus-common-bad-age.patch, NONE,
	1.1 globus-common-deps.patch, NONE,
	1.1 globus-common-doxygen.patch, NONE,
	1.1 globus-common-extradist.patch, NONE,
	1.1 globus-common-ltdlmutex.patch, NONE,
	1.1 globus-common-no-pthread-exceptions.patch, NONE,
	1.1 globus-common-noflavext.patch, NONE,
	1.1 globus-common-nosuchfile.patch, NONE,
	1.1 globus-common-setup.patch, NONE,
	1.1 globus-common-typo.patch, NONE, 1.1 globus-common-usr.patch,
	NONE, 1.1 globus-common.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407074310.11AF670100@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5793/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-common-bad-age.patch globus-common-deps.patch 
	globus-common-doxygen.patch globus-common-extradist.patch 
	globus-common-ltdlmutex.patch 
	globus-common-no-pthread-exceptions.patch 
	globus-common-noflavext.patch globus-common-nosuchfile.patch 
	globus-common-setup.patch globus-common-typo.patch 
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals


globus-common-bad-age.patch:

--- NEW FILE globus-common-bad-age.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-09-29 23:20:49.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-10-12 01:28:20.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Name="globus_common" Format_Version="0.02">
 
-    <Aging_Version Major="10" Minor="2" Age="11"/>
+    <Aging_Version Major="10" Minor="2" Age="10"/>
     <Description >Common Library</Description>
     <Functional_Group >Common</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>

globus-common-deps.patch:

--- NEW FILE globus-common-deps.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-06-25 00:11:11.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-07-14 11:57:49.000000000 +0200
@@ -51,14 +51,6 @@
             <pkg_libs>-lglobus_common</pkg_libs>
         </Build_Environment>
 
-        <Source_Setup_Dependency PkgType="rtl">
-            <Setup_Dependency Name="globus_common_setup"> 
-                <Version>
-                    <Simple_Version Major="2"/>
-                </Version>
-            </Setup_Dependency>
-        </Source_Setup_Dependency>
-		   
         <Source_Setup_Dependency PkgType="pgm">
             <Setup_Dependency Name="globus_common_setup"> 
                 <Version>

globus-common-doxygen.patch:

--- NEW FILE globus-common-doxygen.patch ---
diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h
--- globus_common-10.2.orig/library/globus_callback.h	2006-01-19 06:54:13.000000000 +0100
+++ globus_common-10.2/library/globus_callback.h	2008-10-08 05:05:28.000000000 +0200
@@ -19,10 +19,10 @@
 /**
  * @file globus_callback.h Globus Callback API
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $<br />
- * $Date: 2006/01/19 05:54:13 $<br />
- * $Revision: 1.12 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
+ * $Date: 2006/01/19 05:54:13 $
+ * $Revision: 1.12 $
+ * $Author: mlink $
  */
 
 /**
diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/library/globus_common.h.in
--- globus_common-10.2.orig/library/globus_common.h.in	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_common.h.in	2008-10-08 05:04:11.000000000 +0200
@@ -44,14 +44,6 @@
 
 EXTERN_C_BEGIN
 
-/* TODO remove this if we ever doxyegenate common fully */
-/**
- * @mainpage 
- *
- *   @note <b>More globus_common API documentation is available <a href="../../../common/">here</a>.</b>
- * 
- */
- 
 /******************************************************************************
 			       Type definitions
 ******************************************************************************/
diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h
--- globus_common-10.2.orig/library/globus_thread_common.h	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_thread_common.h	2008-10-08 05:04:58.000000000 +0200
@@ -17,10 +17,10 @@
 /**
  * @file globus_thread_common.h Common Thread Interface
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $<br />
- * $Date: 2006/01/19 05:54:14 $<br />
- * $Revision: 1.6 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
+ * $Date: 2006/01/19 05:54:14 $
+ * $Revision: 1.6 $
+ * $Author: mlink $
  */
 
 /******************************************************************************
diff -ur globus_common-10.2.orig/library/globus_url.h globus_common-10.2/library/globus_url.h
--- globus_common-10.2.orig/library/globus_url.h	2008-01-23 18:26:04.000000000 +0100
+++ globus_common-10.2/library/globus_url.h	2008-10-08 06:02:49.000000000 +0200
@@ -67,7 +67,7 @@
     GLOBUS_URL_SCHEME_X_NEXUS,
     /** GASS Cache Entry */
     GLOBUS_URL_SCHEME_X_GASS_CACHE,
-    /** Any other URL of the form <scheme>://<something */
+    /** Any other URL of the form <scheme>://<something> */
     GLOBUS_URL_SCHEME_UNKNOWN,
     GLOBUS_URL_SCHEME_SSHFTP,
     /** Total number of URL schemes supported */

globus-common-extradist.patch:

--- NEW FILE globus-common-extradist.patch ---
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2008-12-11 16:13:45.120989000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-12-11 16:15:09.868546294 +0100
@@ -5,8 +5,6 @@
 
 sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
-EXTRA_DIST = globus-sh-exec.in globus-version.in
-
 INCLUDES = -I$(top_srcdir)/library $(GPT_INCLUDES) 
 
 globus_libc_hostname_SOURCES = globus_libc_hostname.c
@@ -21,5 +19,7 @@
 globus_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@
 endif
 
+EXTRA_DIST = globus-sh-exec.in globus-version.in
+
 include $(top_srcdir)/globus_automake_post
 

globus-common-ltdlmutex.patch:

--- NEW FILE globus-common-ltdlmutex.patch ---
diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in
--- globus_common-10.2.orig/configure.in	2007-12-12 00:29:27.000000000 +0100
+++ globus_common-10.2/configure.in	2008-12-18 09:02:27.000000000 +0100
@@ -24,6 +24,11 @@
 
 GPT_SET_LIBS(["$EXTERNAL_LIBS"])
 
+save_LIBS=$LIBS
+LIBS="$LIBS $GPT_LIBS"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$save_LIBS
+
 AC_SUBST(GLOBUS_THREADS)
 
 if test x"$GLOBUS_VERSIONNAME" = "x" ; then
diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
+++ globus_common-10.2/library/globus_extension.c	2008-12-18 09:04:27.000000000 +0100
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include "globus_extension.h"
 #include "globus_debug.h"
 #include GLOBUS_THREAD_INCLUDE
@@ -169,6 +170,7 @@
         {
             goto error_dlinit;
         }
+#       ifdef HAVE_LT_DLMUTEX_REGISTER
         if(lt_dlmutex_register(
             globus_l_libtool_mutex_lock,
             globus_l_libtool_mutex_unlock,
@@ -177,6 +179,7 @@
         {
             goto error_dlmutex;
         }
+#       endif /* HAVE_LT_DLMUTEX_REGISTER */
 #       endif /* !BUILD_STATIC_ONLY */
         
         globus_hashtable_init(

globus-common-no-pthread-exceptions.patch:

--- NEW FILE globus-common-no-pthread-exceptions.patch ---
diff -ur globus-common-7.30.orig/library/globus_thread_pthreads.h globus-common-7.30/library/globus_thread_pthreads.h
--- globus-common-7.30.orig/library/globus_thread_pthreads.h	2005-04-19 00:59:37.000000000 +0200
+++ globus-common-7.30/library/globus_thread_pthreads.h	2008-06-30 18:22:33.000000000 +0200
@@ -57,7 +57,13 @@
 #include <pthread.h>
 EXTERN_C_END
 #else  /* TARGET_ARCH_AIX */
+#if defined __GNUC__ && defined __EXCEPTIONS
+#undef __EXCEPTIONS
 #include <pthread.h>
+#define __EXCEPTIONS
+#else
+#include <pthread.h>
+#endif
 #endif /* TARGET_ARCH_AIX */
 
 EXTERN_C_BEGIN

globus-common-noflavext.patch:

--- NEW FILE globus-common-noflavext.patch ---
diff -ur globus-common-7.30.orig/library/globus_extension.c globus-common-7.30/library/globus_extension.c
--- globus-common-7.30.orig/library/globus_extension.c	2005-04-19 00:59:29.000000000 +0200
+++ globus-common-7.30/library/globus_extension.c	2008-07-05 09:22:39.000000000 +0200
@@ -357,11 +357,24 @@
     dlhandle = lt_dlopenext(library);
     if(!dlhandle)
     {
+        snprintf(library, 1024, "lib%s", name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
+    if(!dlhandle)
+    {
         /* older libtools dont search the extensions correctly */
         snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor);
         library[1023] = 0;
         dlhandle = lt_dlopenext(library);
     }
+    if(!dlhandle)
+    {
+        /* older libtools dont search the extensions correctly */
+        snprintf(library, 1024, "lib%s" MY_LIB_EXT, name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
 
     if(!dlhandle)
     {

globus-common-nosuchfile.patch:

--- NEW FILE globus-common-nosuchfile.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-10-11 12:11:57.000000000 +0200
@@ -157,7 +157,6 @@
 	globus_thread_sproc.c \
 	globus_thread_sproc.h
 
-EXTRA_HEADERS = \
-        globus_netos_dir.h
+EXTRA_HEADERS =
 
 include $(top_srcdir)/globus_automake_post

globus-common-setup.patch:

--- NEW FILE globus-common-setup.patch ---
diff -ur globus_common_setup-2.6.orig/configure.in globus_common_setup-2.6/configure.in
--- globus_common_setup-2.6.orig/configure.in	2002-01-10 03:26:32.000000000 +0100
+++ globus_common_setup-2.6/configure.in	2008-10-13 00:09:15.000000000 +0200
@@ -9,10 +9,31 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
+AC_ARG_WITH(tmpdir,
+        AC_HELP_STRING([--with-tmpdir=DIR],
+        [directory for temporary files [[/tmp]]]),
+        [tmpdir="$withval"],
+        [tmpdir=/tmp])
+AC_SUBST(tmpdir)
 
+AC_ARG_WITH(local-tmpdir,
+        AC_HELP_STRING([--with-local-tmpdir=DIR],
+        [local directory for temporary files [[TMPDIR]]]),
+        [local_tmpdir="$withval"],
+        [local_tmpdir='${tmpdir}'])
+AC_SUBST(local_tmpdir)
+
+AC_ARG_WITH(secure-tmpdir,
+        AC_HELP_STRING([--with-secure-tmpdir=DIR],
+        [secure directory for temporary files [[PREFIX/tmp]]]),
+        [secure_tmpdir="$withval"],
+        [secure_tmpdir='${prefix}/tmp'])
+AC_SUBST(secure_tmpdir)
 
 AC_OUTPUT(
         Makefile
+        globus-script-initializer
+        Paths.pm:Paths.in
         pkgdata/Makefile
         pkgdata/pkg_data_src.gpt
 )
diff -ur globus_common_setup-2.6.orig/findshelltools.in globus_common_setup-2.6/findshelltools.in
--- globus_common_setup-2.6.orig/findshelltools.in	2004-09-29 14:52:55.000000000 +0200
+++ globus_common_setup-2.6/findshelltools.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,16 +1,6 @@
 AC_REVISION($Revision: 1.2 $)
 AC_INIT(globus-sh-tools-vars.sh.in)
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
-
 if test "x$PERL" = "x"; then
         AC_PATH_PROG(PERL,perl)
 fi
diff -ur globus_common_setup-2.6.orig/globus-script-initializer.in globus_common_setup-2.6/globus-script-initializer.in
--- globus_common_setup-2.6.orig/globus-script-initializer.in	2005-11-29 21:08:58.000000000 +0100
+++ globus_common_setup-2.6/globus-script-initializer.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,49 +1,53 @@
-
-
-exec_prefix=${GLOBUS_LOCATION}
-prefix=$GLOBUS_LOCATION
-sbindir=${exec_prefix}/sbin
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-libexecdir=${exec_prefix}/libexec
-includedir=${exec_prefix}/include
-datadir=${prefix}/share
-sysconfdir=${prefix}/etc
-sharedstatedir=${prefix}/com
-localstatedir=${prefix}/var
+prefix=${GLOBUS_LOCATION:-/usr}
+exec_prefix=${GLOBUS_LOCATION:-/usr}
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+flavorincludedir=@flavorincludedir@
+datadir=@datadir@
+libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+setupdir=@setupdir@
+testdir=@testdir@
+perlmoduledir=@perlmoduledir@
 tmpdir=@tmpdir@
 local_tmpdir=@local_tmpdir@
 secure_tmpdir=@secure_tmpdir@
 
+if [ x$prefix != "x/usr" ]; then
+
 DELIM=
 if [ -n "${LD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}"
 
 DELIM=
 if [ -n "${DYLD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}"
 
 if [ -z "${LIBPATH}" ]; then
     LIBPATH="/usr/lib:/lib"
 fi
-LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}"
+LIBPATH="${libdir}:${LIBPATH}"
 
 DELIM=
 if [ -n "${SHLIB_PATH}" ]; then
     DELIM=:
 fi
-SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}"
+SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}"
 
-if [ -d $GLOBUS_LOCATION/lib/sasl ]; then
+if [ -d ${libdir}/sasl ]; then
     DELIM=
     if [ -n "${SASL_PATH}" ]; then
         DELIM=:
     fi
-    SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}"
+    SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}"
 fi
 
 export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH
@@ -53,7 +57,7 @@
     if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}"
+    LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}"
     export LD_LIBRARYN32_PATH
 fi
 
@@ -62,10 +66,19 @@
     if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}"
+    LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}"
     export LD_LIBRARY64_PATH
 fi
 
+DELIM=
+if [ -n "${PERLLIB}" ]; then
+    DELIM=:
+fi
+PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}"
+export PERLLIB
+
+fi
+
 globus_source () {
 
   # Check if file exists and source it
diff -ur globus_common_setup-2.6.orig/Makefile.am globus_common_setup-2.6/Makefile.am
--- globus_common_setup-2.6.orig/Makefile.am	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Makefile.am	2008-10-13 00:09:15.000000000 +0200
@@ -3,25 +3,26 @@
 
 setup_SCRIPTS = \
 	findshelltools \
-	setup-tmpdirs \
 	setup-globus-common \
 	setup-globus-common.pl
 
 setup_DATA = \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in 
+        globus-sh-tools-vars.sh.in
+
+libexec_SCRIPTS = globus-script-initializer
+
+globusperldir = $(perlmoduledir)/Globus/Core
+globusperl_DATA = Paths.pm
+
+findshelltools: findshelltools.in
+	autoconf -o findshelltools findshelltools.in
 
 SUBDIRS = pkgdata
 
 EXTRA_DIST = \
 	findshelltools \
 	findshelltools.in \
-	setup-tmpdirs \
-	setup-tmpdirs.in \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in \
+	globus-sh-tools-vars.sh.in \
 	setup-globus-common \
 	setup-globus-common.pl
 
diff -ur globus_common_setup-2.6.orig/Paths.in globus_common_setup-2.6/Paths.in
--- globus_common_setup-2.6.orig/Paths.in	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Paths.in	2008-10-13 00:09:15.000000000 +0200
@@ -4,26 +4,38 @@
 
 @ISA = qw(Exporter);
 
- at EXPORT = qw($exec_prefix $prefix
-             $sbindir $bindir
-	     $libdir $libexecdir $includedir
-	     $datadir $sysconfdir $sharedstatedir
+ at EXPORT = qw($prefix $exec_prefix
+	     $bindir $sbindir $libdir
+	     $includedir $flavorincludedir
+	     $datadir $libexecdir
+	     $sysconfdir $sharedstatedir
 	     $localstatedir
+	     $setupdir $testdir
+	     $perlmoduledir
 	     $tmpdir
 	     $local_tmpdir
 	     $secure_tmpdir);
 
-$exec_prefix=$ENV{GLOBUS_LOCATION};
+my $PACKAGE = "\$PACKAGE";
+my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME";
+
 $prefix=$ENV{GLOBUS_LOCATION};
-$sbindir="${exec_prefix}/sbin";
-$bindir="${exec_prefix}/bin";
-$libdir="${exec_prefix}/lib";
-$libexecdir="${exec_prefix}/libexec";
-$includedir="${exec_prefix}/include";
-$datadir="${prefix}/share";
-$sysconfdir="${prefix}/etc";
-$sharedstatedir="${prefix}/com";
-$localstatedir="${prefix}/var";
+$prefix="/usr" if (!defined $prefix);
+$exec_prefix=$ENV{GLOBUS_LOCATION};
+$exec_prefix="/usr" if (!defined $exec_prefix);
+$bindir="@bindir@";
+$sbindir="@sbindir@";
+$libdir="@libdir@";
+$includedir="@includedir@";
+$flavorincludedir="@flavorincludedir@";
+$datadir="@datadir@";
+$libexecdir="@libexecdir@";
+$sysconfdir="@sysconfdir@";
+$sharedstatedir="@sharedstatedir@";
+$localstatedir="@localstatedir@";
+$setupdir="@setupdir@";
+$testdir="@testdir@";
+$perlmoduledir="@perlmoduledir@";
 $tmpdir="@tmpdir@";
 $local_tmpdir="@local_tmpdir@";
 $secure_tmpdir="@secure_tmpdir@";
diff -ur globus_common_setup-2.6.orig/setup-globus-common globus_common_setup-2.6/setup-globus-common
--- globus_common_setup-2.6.orig/setup-globus-common	2001-06-21 00:24:26.000000000 +0200
+++ globus_common_setup-2.6/setup-globus-common	2008-10-13 00:09:15.000000000 +0200
@@ -1,3 +1,8 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+perl ${setupdir}/setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup-2.6/setup-globus-common.pl
--- globus_common_setup-2.6.orig/setup-globus-common.pl	2006-01-19 06:54:11.000000000 +0100
+++ globus_common_setup-2.6/setup-globus-common.pl	2008-10-13 00:09:15.000000000 +0200
@@ -19,13 +19,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -34,37 +28,25 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-
-if((!defined($globusdir)))
-{
-    die "GLOBUS_LOCATION needs to be set before running this script"
-}
-
-my $setupdir = "$globusdir/setup/globus/";
+require Globus::Core::Paths;
+my $setupdir = $Globus::Core::Paths::setupdir;
+my $libexecdir = $Globus::Core::Paths::libexecdir;
+my $bindir = $Globus::Core::Paths::bindir;
 
 print "creating globus-sh-tools-vars.sh\n";
 my $result = `$setupdir/findshelltools`;
 
-print "creating globus-script-initializer\n";
-print "creating Globus::Core::Paths\n";
-
-$result = `$setupdir/setup-tmpdirs`;
-
-for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh')
+for my $setupfile ('globus-sh-tools-vars.sh')
 {
-    $result = system("cp $setupdir/$setupfile $globusdir/libexec");
-    $result = system("chmod 0755 $globusdir/libexec/$setupfile");
-
+    $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile");
+    $result = system("chmod 0644 $libexecdir/$setupfile");
 }
 
-system("mkdir -p $globusdir/lib/perl/Globus/Core");
-system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/");
-system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm");
+system("rm -f config.log config.status");
 
 print "checking globus-hostname\n";
 
-my $hostname = `$globusdir/bin/globus-hostname`;
+my $hostname = `$bindir/globus-hostname`;
 
 $hostname =~ s/\w//g; #strip whitespace
 

globus-common-typo.patch:

--- NEW FILE globus-common-typo.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-07-14 17:33:08.000000000 +0200
@@ -143,7 +143,7 @@
 
 libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@
 libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
-libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@
+libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@
 
 EXTRA_DIST = \
 	globus_callback_nothreads.c \

globus-common-usr.patch:

--- NEW FILE globus-common-usr.patch ---
diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
--- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -9,7 +9,7 @@
 	config \
 	doxygen
 
-sbin_SCRIPTS= \
+libexec_SCRIPTS= \
 	config.guess
 
 EXTRA_DIST = \
diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
--- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
@@ -17,7 +17,11 @@
 # 
 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 # This was done by the script initializer before V2.0
diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
--- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
@@ -43,7 +43,11 @@
 
 usage()
 {
-    . ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+    fi
     globus_source ${libexecdir}/globus-sh-tools.sh
 
     ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -3,7 +3,7 @@
 if ENABLE_PROGRAMS
 bin_SCRIPTS = globus-sh-exec globus-version
 
-libexec_PROGRAMS = globus-libc-hostname globus-is-local-user
+sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
 EXTRA_DIST = globus-sh-exec.in globus-version.in
 
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
@@ -23,13 +23,12 @@
 # domainname
 
 
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
 fi
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-
 PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'`
 PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2`
 
@@ -67,7 +66,7 @@
 EOF
 }
 
-. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header
+. ${libexecdir}/globus-args-parser-header
 
 if [ -n "$1" ]; then
     globus_args_unrecognized_option "$1"
@@ -79,8 +78,8 @@
 if [ -z "${GLOBUS_HOSTNAME}" ] ; then
 
   # Set the _fullname based upon Globus's hostname command
-  if [ -x "${libexecdir}/globus-libc-hostname" ]; then
-    _fullname="`${libexecdir}/globus-libc-hostname`"
+  if [ -x "${sbindir}/globus-libc-hostname" ]; then
+    _fullname="`${sbindir}/globus-libc-hostname`"
   fi
 
   # if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
@@ -25,29 +25,15 @@
 
 my $gpt_path = $ENV{GPT_LOCATION};
 my $globus_path = $ENV{GLOBUS_LOCATION};
-my $gpath;
 
-if ( !defined($gpt_path) && !defined($globus_path) )
+if ( !defined($gpt_path) )
 {
-    die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+    $gpt_path = "/usr";
 }
 
-if ( defined($gpt_path) )
+if ( !defined($globus_path) )
 {
-    $gpath = $gpt_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
-}
-
-if ( !defined($gpath) && defined($globus_path) )
-{
-    $gpath = $globus_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
+    $globus_path = "/usr";
 }
 
 
@@ -60,7 +46,7 @@
 #
 
 my($environment);
- at INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+ at INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
 
 if ( defined eval "require Grid::GPT::V1::Package" )
 {
@@ -240,7 +226,9 @@
     # point our installation object at our globus location
     #
 
-    $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
+    $installation = -d "$globus_path/share/globus/packages" ?
+        new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") :
+        new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
     $installation->set_depenv('Build');
 
     #
@@ -313,10 +301,17 @@
     # push all of our entries onto our header array
     #
 
+    @INC = ("$globus_path/lib/perl", @INC);
+
+    require Globus::Core::Paths;
+    my $includedir = $Globus::Core::Paths::includedir;
+    my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+    my $libdir = $Globus::Core::Paths::libdir;
+
     push(@$header, "GLOBUS_CFLAGS=\"$cflagslist\"");
-    push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\"");
+    push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\"");
     push(@$header, "GLOBUS_LIBS=\"$libslist\"");
-    push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\"");
+    push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\"");
     push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\"");
     push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\"");
 }
@@ -332,7 +327,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") ||
+      open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") ||
+      die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n";
 
     while (<IN>)
     { 
@@ -370,7 +367,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") ||
+      open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") ||
+      die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n";
 
     while (<IN>) 
     {
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
--- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
@@ -15,18 +15,13 @@
 
 my $flavor;
 my $link="static";
-my $gpt=$ENV{GPT_LOCATION};
+
 my $gpath = $ENV{GPT_LOCATION};
 if (!defined($gpath))
 {
-	  $gpath = $ENV{GLOBUS_LOCATION};
-	   
-  }
-  if (!defined($gpath))
-  {
-	     die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
-     }
-      
+  $gpath = "/usr";
+}
+
      @INC = (@INC, "$gpath/lib/perl");
 
 require Grid::GPT::Dependencies;
@@ -40,20 +35,10 @@
 my $pgm_linkslist;
 my $lib_linkslist;
 
-if(!defined($gpt))
-{
-  $gpt=$ENV{GLOBUS_LOCATION};
-}
-if(!defined($gpt))
-{
-  die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n";
-}
-
 my $globus=$ENV{GLOBUS_LOCATION};
-
 if(!defined($globus))
 {
-  die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n";
+  $globus = "/usr";
 }
 
 my %hash;
@@ -102,14 +87,23 @@
 
 	assemble_link_lines($fakepkg, $flavor, $link);
 	  
+ at INC = ("$globus/lib/perl", @INC);
+
+require Globus::Core::Paths;
+my $includedir = $Globus::Core::Paths::includedir;
+my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+my $libdir = $Globus::Core::Paths::libdir;
+
 push @temp_header,  "GLOBUS_CFLAGS=\"$cflagslist\"\n";
-push @temp_header,  "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n";
+push @temp_header,  "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n";
 push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n";
-push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n";
+push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n";
 push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n";
 push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n";
 
-open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n";
+open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") ||
+  open(IN, "$globus/libexec/globus-build-env-$flavor.sh") ||
+  die "ERROR: Cannot open globus-build-env-$flavor.sh\n";
 
 while(<IN>)
 { 
@@ -130,7 +124,9 @@
 
 #END of Section one:  prepending GLOBUS_
 close (IN);
-open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n";
+open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") ||
+  open(IN, "$globus/libexec/globus-sh-tools-vars.sh") ||
+  die "ERROR: Cannot open globus-sh-tools-vars.sh\n";
 while(<IN>) 
 {
 	if(m!\S!)  
diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
--- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
@@ -18,7 +18,11 @@
 
 if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
     
-    . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh
+    fi
     
     # export all commands:
 


--- NEW FILE globus-common.spec ---
Name:		globus-common
%global _name %(tr - _ <<< %{name})
Version:	10.2
%global setupversion 2.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
#		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
#		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
Source1:	%{_name}_setup-%{setupversion}.tar.gz
Source8:	epstopdf-2.9.5gw
Source9:	GLOBUS_LICENSE
#		Environment variable elimination patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
Patch0:		%{name}-usr.patch
#		Segfault fix patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6460
Patch1:		%{name}-no-pthread-exceptions.patch
#		Allow plugins without the flavor extension in the name:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6461
Patch2:		%{name}-noflavext.patch
#		Remove bogus inter-package dependency:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6462
Patch3:		%{name}-deps.patch
#		Fixes a stupid typo in library/Makefile.am:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6463
Patch4:		%{name}-typo.patch
#		The file globus_netos_dir.h does not exist:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6464
Patch5:		%{name}-nosuchfile.patch
#		Doxygen warning fix:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6465
Patch6:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6466
Patch7:		%{name}-bad-age.patch
#		Extradist should not be conditional:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6576
Patch8:		%{name}-extradist.patch
#		Check for function removed from newer versions of libltdl:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578
Patch9:		%{name}-ltdlmutex.patch
#		Configure options not propagated in globus common setup:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
Patch10:	%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Common Library Programs
Group:		Applications/Internet
Provides:	%{name}-setup = %{setupversion}
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool >= 1
Requires:	globus-common-progs >= 3
Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%if %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
%endif

%package devel
Summary:	Globus Toolkit - Common Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-core >= 4
Requires:	pkgconfig

%package doc
Summary:	Globus Toolkit - Common Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

%description
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name} package contains:
Common Library

%description progs
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-progs package contains:
Common Library Programs
Common Setup

%description devel
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-devel package contains:
Common Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-doc package contains:
Common Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1 -b .usr
%patch1 -p1 -b .segfault
%patch2 -p1 -b .noflavext
%patch3 -p1 -b .deps
%patch4 -p1 -b .typo
%patch5 -p1 -b .nofile
%patch6 -p1 -b .doxygen
%patch7 -p1 -b .age
%patch8 -p1 -b .extradist
%patch9 -p1 -b .ltdlmutex
cd %{_name}_setup-%{setupversion}
%patch10 -p1 -b .setup
cd -

# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Grid::GPT::.*)/d'
EOF
%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
  mv $f.new $f
done

sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in

/usr/share/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

# setup package
cd %{_name}_setup-%{setupversion}

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

/usr/share/globus/globus-bootstrap.sh

%configure --without-flavor --with-secure-tmpdir=/var/tmp

make %{?_smp_mflags}

cd -

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# Remove libtool archives (.la files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.la$' < $l > $l.new
  mv $l.new $l
done

# Remove static libraries (.a files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.a$' < $l > $l.new
  mv $l.new $l
done

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move globus-makefile-header to devel package
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep globus-makefile-header >> \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep -v globus-makefile-header > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
  sed 's/P\.RS/P\n.RS/' < $f > $f.new
  mv $f.new $f
done

rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | grep -v 'deprecated\.3' \
  | grep -v '_%{_name}-%{version}_.*\.3' > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed 's!/man/.*!&*!' \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post progs
cd %{_datadir}/globus/setup
./findshelltools > /dev/null
cp -p globus-sh-tools-vars.sh ..
rm -f config.log config.status

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}_setup
%dir %{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/packages/setup/%{_name}_setup
%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
%dir %{_datadir}/globus/setup
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
%ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
%ghost %{_datadir}/globus/globus-sh-tools-vars.sh

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%dir %{_includedir}/globus
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals

* Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
- Make comment about source retieval more explicit

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.4
- Add s390x to the list of 64 bit platforms
- Move globus-makefile-header to devel package

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-common-10_2-1_fc9:F-9:globus-common-10.2-1.fc9.src.rpm:1239090158


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:15:32 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:43:09 -0000	1.2
@@ -0,0 +1,4 @@
+GLOBUS_LICENSE
+epstopdf-2.9.5gw
+globus_common-10.2.tar.gz
+globus_common_setup-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:15:32 -0000	1.1
+++ sources	7 Apr 2009 07:43:09 -0000	1.2
@@ -0,0 +1,4 @@
+2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
+7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz



From cchance at fedoraproject.org  Tue Apr  7 07:44:21 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  7 Apr 2009 07:44:21 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.7,1.8
Message-ID: <20090407074421.6B29370100@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5966

Modified Files:
	cjkuni-fonts.spec 
Log Message:
Resolves: rhbz#491956
rebuilt for fedora 11



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cjkuni-fonts.spec	24 Feb 2009 07:35:16 -0000	1.7
+++ cjkuni-fonts.spec	7 Apr 2009 07:43:51 -0000	1.8
@@ -12,7 +12,7 @@
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     21%{?dist}
+Release:     22%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -221,6 +221,10 @@
 %__rm -fr %{buildroot}
 
 %changelog
+* Tue Apr 07 2009 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-22
+- Resolves: rhbz#491956.
+- Rebuilt for Fedora 11.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.20080216.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ellert at fedoraproject.org  Tue Apr  7 07:45:46 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue,  7 Apr 2009 07:45:46 +0000 (UTC)
Subject: rpms/globus-common/EL-4 globus-common-bad-age.patch, NONE,
	1.1 globus-common-deps.patch, NONE,
	1.1 globus-common-doxygen.patch, NONE,
	1.1 globus-common-extradist.patch, NONE,
	1.1 globus-common-ltdlmutex.patch, NONE,
	1.1 globus-common-no-pthread-exceptions.patch, NONE,
	1.1 globus-common-noflavext.patch, NONE,
	1.1 globus-common-nosuchfile.patch, NONE,
	1.1 globus-common-setup.patch, NONE,
	1.1 globus-common-typo.patch, NONE, 1.1 globus-common-usr.patch,
	NONE, 1.1 globus-common.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407074546.D183770100@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6722/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-common-bad-age.patch globus-common-deps.patch 
	globus-common-doxygen.patch globus-common-extradist.patch 
	globus-common-ltdlmutex.patch 
	globus-common-no-pthread-exceptions.patch 
	globus-common-noflavext.patch globus-common-nosuchfile.patch 
	globus-common-setup.patch globus-common-typo.patch 
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals


globus-common-bad-age.patch:

--- NEW FILE globus-common-bad-age.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-09-29 23:20:49.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-10-12 01:28:20.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Name="globus_common" Format_Version="0.02">
 
-    <Aging_Version Major="10" Minor="2" Age="11"/>
+    <Aging_Version Major="10" Minor="2" Age="10"/>
     <Description >Common Library</Description>
     <Functional_Group >Common</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>

globus-common-deps.patch:

--- NEW FILE globus-common-deps.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-06-25 00:11:11.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-07-14 11:57:49.000000000 +0200
@@ -51,14 +51,6 @@
             <pkg_libs>-lglobus_common</pkg_libs>
         </Build_Environment>
 
-        <Source_Setup_Dependency PkgType="rtl">
-            <Setup_Dependency Name="globus_common_setup"> 
-                <Version>
-                    <Simple_Version Major="2"/>
-                </Version>
-            </Setup_Dependency>
-        </Source_Setup_Dependency>
-		   
         <Source_Setup_Dependency PkgType="pgm">
             <Setup_Dependency Name="globus_common_setup"> 
                 <Version>

globus-common-doxygen.patch:

--- NEW FILE globus-common-doxygen.patch ---
diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h
--- globus_common-10.2.orig/library/globus_callback.h	2006-01-19 06:54:13.000000000 +0100
+++ globus_common-10.2/library/globus_callback.h	2008-10-08 05:05:28.000000000 +0200
@@ -19,10 +19,10 @@
 /**
  * @file globus_callback.h Globus Callback API
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $<br />
- * $Date: 2006/01/19 05:54:13 $<br />
- * $Revision: 1.12 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
+ * $Date: 2006/01/19 05:54:13 $
+ * $Revision: 1.12 $
+ * $Author: mlink $
  */
 
 /**
diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/library/globus_common.h.in
--- globus_common-10.2.orig/library/globus_common.h.in	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_common.h.in	2008-10-08 05:04:11.000000000 +0200
@@ -44,14 +44,6 @@
 
 EXTERN_C_BEGIN
 
-/* TODO remove this if we ever doxyegenate common fully */
-/**
- * @mainpage 
- *
- *   @note <b>More globus_common API documentation is available <a href="../../../common/">here</a>.</b>
- * 
- */
- 
 /******************************************************************************
 			       Type definitions
 ******************************************************************************/
diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h
--- globus_common-10.2.orig/library/globus_thread_common.h	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_thread_common.h	2008-10-08 05:04:58.000000000 +0200
@@ -17,10 +17,10 @@
 /**
  * @file globus_thread_common.h Common Thread Interface
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $<br />
- * $Date: 2006/01/19 05:54:14 $<br />
- * $Revision: 1.6 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
+ * $Date: 2006/01/19 05:54:14 $
+ * $Revision: 1.6 $
+ * $Author: mlink $
  */
 
 /******************************************************************************
diff -ur globus_common-10.2.orig/library/globus_url.h globus_common-10.2/library/globus_url.h
--- globus_common-10.2.orig/library/globus_url.h	2008-01-23 18:26:04.000000000 +0100
+++ globus_common-10.2/library/globus_url.h	2008-10-08 06:02:49.000000000 +0200
@@ -67,7 +67,7 @@
     GLOBUS_URL_SCHEME_X_NEXUS,
     /** GASS Cache Entry */
     GLOBUS_URL_SCHEME_X_GASS_CACHE,
-    /** Any other URL of the form <scheme>://<something */
+    /** Any other URL of the form <scheme>://<something> */
     GLOBUS_URL_SCHEME_UNKNOWN,
     GLOBUS_URL_SCHEME_SSHFTP,
     /** Total number of URL schemes supported */

globus-common-extradist.patch:

--- NEW FILE globus-common-extradist.patch ---
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2008-12-11 16:13:45.120989000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-12-11 16:15:09.868546294 +0100
@@ -5,8 +5,6 @@
 
 sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
-EXTRA_DIST = globus-sh-exec.in globus-version.in
-
 INCLUDES = -I$(top_srcdir)/library $(GPT_INCLUDES) 
 
 globus_libc_hostname_SOURCES = globus_libc_hostname.c
@@ -21,5 +19,7 @@
 globus_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@
 endif
 
+EXTRA_DIST = globus-sh-exec.in globus-version.in
+
 include $(top_srcdir)/globus_automake_post
 

globus-common-ltdlmutex.patch:

--- NEW FILE globus-common-ltdlmutex.patch ---
diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in
--- globus_common-10.2.orig/configure.in	2007-12-12 00:29:27.000000000 +0100
+++ globus_common-10.2/configure.in	2008-12-18 09:02:27.000000000 +0100
@@ -24,6 +24,11 @@
 
 GPT_SET_LIBS(["$EXTERNAL_LIBS"])
 
+save_LIBS=$LIBS
+LIBS="$LIBS $GPT_LIBS"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$save_LIBS
+
 AC_SUBST(GLOBUS_THREADS)
 
 if test x"$GLOBUS_VERSIONNAME" = "x" ; then
diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
+++ globus_common-10.2/library/globus_extension.c	2008-12-18 09:04:27.000000000 +0100
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include "globus_extension.h"
 #include "globus_debug.h"
 #include GLOBUS_THREAD_INCLUDE
@@ -169,6 +170,7 @@
         {
             goto error_dlinit;
         }
+#       ifdef HAVE_LT_DLMUTEX_REGISTER
         if(lt_dlmutex_register(
             globus_l_libtool_mutex_lock,
             globus_l_libtool_mutex_unlock,
@@ -177,6 +179,7 @@
         {
             goto error_dlmutex;
         }
+#       endif /* HAVE_LT_DLMUTEX_REGISTER */
 #       endif /* !BUILD_STATIC_ONLY */
         
         globus_hashtable_init(

globus-common-no-pthread-exceptions.patch:

--- NEW FILE globus-common-no-pthread-exceptions.patch ---
diff -ur globus-common-7.30.orig/library/globus_thread_pthreads.h globus-common-7.30/library/globus_thread_pthreads.h
--- globus-common-7.30.orig/library/globus_thread_pthreads.h	2005-04-19 00:59:37.000000000 +0200
+++ globus-common-7.30/library/globus_thread_pthreads.h	2008-06-30 18:22:33.000000000 +0200
@@ -57,7 +57,13 @@
 #include <pthread.h>
 EXTERN_C_END
 #else  /* TARGET_ARCH_AIX */
+#if defined __GNUC__ && defined __EXCEPTIONS
+#undef __EXCEPTIONS
 #include <pthread.h>
+#define __EXCEPTIONS
+#else
+#include <pthread.h>
+#endif
 #endif /* TARGET_ARCH_AIX */
 
 EXTERN_C_BEGIN

globus-common-noflavext.patch:

--- NEW FILE globus-common-noflavext.patch ---
diff -ur globus-common-7.30.orig/library/globus_extension.c globus-common-7.30/library/globus_extension.c
--- globus-common-7.30.orig/library/globus_extension.c	2005-04-19 00:59:29.000000000 +0200
+++ globus-common-7.30/library/globus_extension.c	2008-07-05 09:22:39.000000000 +0200
@@ -357,11 +357,24 @@
     dlhandle = lt_dlopenext(library);
     if(!dlhandle)
     {
+        snprintf(library, 1024, "lib%s", name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
+    if(!dlhandle)
+    {
         /* older libtools dont search the extensions correctly */
         snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor);
         library[1023] = 0;
         dlhandle = lt_dlopenext(library);
     }
+    if(!dlhandle)
+    {
+        /* older libtools dont search the extensions correctly */
+        snprintf(library, 1024, "lib%s" MY_LIB_EXT, name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
 
     if(!dlhandle)
     {

globus-common-nosuchfile.patch:

--- NEW FILE globus-common-nosuchfile.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-10-11 12:11:57.000000000 +0200
@@ -157,7 +157,6 @@
 	globus_thread_sproc.c \
 	globus_thread_sproc.h
 
-EXTRA_HEADERS = \
-        globus_netos_dir.h
+EXTRA_HEADERS =
 
 include $(top_srcdir)/globus_automake_post

globus-common-setup.patch:

--- NEW FILE globus-common-setup.patch ---
diff -ur globus_common_setup-2.6.orig/configure.in globus_common_setup-2.6/configure.in
--- globus_common_setup-2.6.orig/configure.in	2002-01-10 03:26:32.000000000 +0100
+++ globus_common_setup-2.6/configure.in	2008-10-13 00:09:15.000000000 +0200
@@ -9,10 +9,31 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
+AC_ARG_WITH(tmpdir,
+        AC_HELP_STRING([--with-tmpdir=DIR],
+        [directory for temporary files [[/tmp]]]),
+        [tmpdir="$withval"],
+        [tmpdir=/tmp])
+AC_SUBST(tmpdir)
 
+AC_ARG_WITH(local-tmpdir,
+        AC_HELP_STRING([--with-local-tmpdir=DIR],
+        [local directory for temporary files [[TMPDIR]]]),
+        [local_tmpdir="$withval"],
+        [local_tmpdir='${tmpdir}'])
+AC_SUBST(local_tmpdir)
+
+AC_ARG_WITH(secure-tmpdir,
+        AC_HELP_STRING([--with-secure-tmpdir=DIR],
+        [secure directory for temporary files [[PREFIX/tmp]]]),
+        [secure_tmpdir="$withval"],
+        [secure_tmpdir='${prefix}/tmp'])
+AC_SUBST(secure_tmpdir)
 
 AC_OUTPUT(
         Makefile
+        globus-script-initializer
+        Paths.pm:Paths.in
         pkgdata/Makefile
         pkgdata/pkg_data_src.gpt
 )
diff -ur globus_common_setup-2.6.orig/findshelltools.in globus_common_setup-2.6/findshelltools.in
--- globus_common_setup-2.6.orig/findshelltools.in	2004-09-29 14:52:55.000000000 +0200
+++ globus_common_setup-2.6/findshelltools.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,16 +1,6 @@
 AC_REVISION($Revision: 1.2 $)
 AC_INIT(globus-sh-tools-vars.sh.in)
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
-
 if test "x$PERL" = "x"; then
         AC_PATH_PROG(PERL,perl)
 fi
diff -ur globus_common_setup-2.6.orig/globus-script-initializer.in globus_common_setup-2.6/globus-script-initializer.in
--- globus_common_setup-2.6.orig/globus-script-initializer.in	2005-11-29 21:08:58.000000000 +0100
+++ globus_common_setup-2.6/globus-script-initializer.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,49 +1,53 @@
-
-
-exec_prefix=${GLOBUS_LOCATION}
-prefix=$GLOBUS_LOCATION
-sbindir=${exec_prefix}/sbin
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-libexecdir=${exec_prefix}/libexec
-includedir=${exec_prefix}/include
-datadir=${prefix}/share
-sysconfdir=${prefix}/etc
-sharedstatedir=${prefix}/com
-localstatedir=${prefix}/var
+prefix=${GLOBUS_LOCATION:-/usr}
+exec_prefix=${GLOBUS_LOCATION:-/usr}
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+flavorincludedir=@flavorincludedir@
+datadir=@datadir@
+libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+setupdir=@setupdir@
+testdir=@testdir@
+perlmoduledir=@perlmoduledir@
 tmpdir=@tmpdir@
 local_tmpdir=@local_tmpdir@
 secure_tmpdir=@secure_tmpdir@
 
+if [ x$prefix != "x/usr" ]; then
+
 DELIM=
 if [ -n "${LD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}"
 
 DELIM=
 if [ -n "${DYLD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}"
 
 if [ -z "${LIBPATH}" ]; then
     LIBPATH="/usr/lib:/lib"
 fi
-LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}"
+LIBPATH="${libdir}:${LIBPATH}"
 
 DELIM=
 if [ -n "${SHLIB_PATH}" ]; then
     DELIM=:
 fi
-SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}"
+SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}"
 
-if [ -d $GLOBUS_LOCATION/lib/sasl ]; then
+if [ -d ${libdir}/sasl ]; then
     DELIM=
     if [ -n "${SASL_PATH}" ]; then
         DELIM=:
     fi
-    SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}"
+    SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}"
 fi
 
 export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH
@@ -53,7 +57,7 @@
     if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}"
+    LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}"
     export LD_LIBRARYN32_PATH
 fi
 
@@ -62,10 +66,19 @@
     if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}"
+    LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}"
     export LD_LIBRARY64_PATH
 fi
 
+DELIM=
+if [ -n "${PERLLIB}" ]; then
+    DELIM=:
+fi
+PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}"
+export PERLLIB
+
+fi
+
 globus_source () {
 
   # Check if file exists and source it
diff -ur globus_common_setup-2.6.orig/Makefile.am globus_common_setup-2.6/Makefile.am
--- globus_common_setup-2.6.orig/Makefile.am	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Makefile.am	2008-10-13 00:09:15.000000000 +0200
@@ -3,25 +3,26 @@
 
 setup_SCRIPTS = \
 	findshelltools \
-	setup-tmpdirs \
 	setup-globus-common \
 	setup-globus-common.pl
 
 setup_DATA = \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in 
+        globus-sh-tools-vars.sh.in
+
+libexec_SCRIPTS = globus-script-initializer
+
+globusperldir = $(perlmoduledir)/Globus/Core
+globusperl_DATA = Paths.pm
+
+findshelltools: findshelltools.in
+	autoconf -o findshelltools findshelltools.in
 
 SUBDIRS = pkgdata
 
 EXTRA_DIST = \
 	findshelltools \
 	findshelltools.in \
-	setup-tmpdirs \
-	setup-tmpdirs.in \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in \
+	globus-sh-tools-vars.sh.in \
 	setup-globus-common \
 	setup-globus-common.pl
 
diff -ur globus_common_setup-2.6.orig/Paths.in globus_common_setup-2.6/Paths.in
--- globus_common_setup-2.6.orig/Paths.in	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Paths.in	2008-10-13 00:09:15.000000000 +0200
@@ -4,26 +4,38 @@
 
 @ISA = qw(Exporter);
 
- at EXPORT = qw($exec_prefix $prefix
-             $sbindir $bindir
-	     $libdir $libexecdir $includedir
-	     $datadir $sysconfdir $sharedstatedir
+ at EXPORT = qw($prefix $exec_prefix
+	     $bindir $sbindir $libdir
+	     $includedir $flavorincludedir
+	     $datadir $libexecdir
+	     $sysconfdir $sharedstatedir
 	     $localstatedir
+	     $setupdir $testdir
+	     $perlmoduledir
 	     $tmpdir
 	     $local_tmpdir
 	     $secure_tmpdir);
 
-$exec_prefix=$ENV{GLOBUS_LOCATION};
+my $PACKAGE = "\$PACKAGE";
+my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME";
+
 $prefix=$ENV{GLOBUS_LOCATION};
-$sbindir="${exec_prefix}/sbin";
-$bindir="${exec_prefix}/bin";
-$libdir="${exec_prefix}/lib";
-$libexecdir="${exec_prefix}/libexec";
-$includedir="${exec_prefix}/include";
-$datadir="${prefix}/share";
-$sysconfdir="${prefix}/etc";
-$sharedstatedir="${prefix}/com";
-$localstatedir="${prefix}/var";
+$prefix="/usr" if (!defined $prefix);
+$exec_prefix=$ENV{GLOBUS_LOCATION};
+$exec_prefix="/usr" if (!defined $exec_prefix);
+$bindir="@bindir@";
+$sbindir="@sbindir@";
+$libdir="@libdir@";
+$includedir="@includedir@";
+$flavorincludedir="@flavorincludedir@";
+$datadir="@datadir@";
+$libexecdir="@libexecdir@";
+$sysconfdir="@sysconfdir@";
+$sharedstatedir="@sharedstatedir@";
+$localstatedir="@localstatedir@";
+$setupdir="@setupdir@";
+$testdir="@testdir@";
+$perlmoduledir="@perlmoduledir@";
 $tmpdir="@tmpdir@";
 $local_tmpdir="@local_tmpdir@";
 $secure_tmpdir="@secure_tmpdir@";
diff -ur globus_common_setup-2.6.orig/setup-globus-common globus_common_setup-2.6/setup-globus-common
--- globus_common_setup-2.6.orig/setup-globus-common	2001-06-21 00:24:26.000000000 +0200
+++ globus_common_setup-2.6/setup-globus-common	2008-10-13 00:09:15.000000000 +0200
@@ -1,3 +1,8 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+perl ${setupdir}/setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup-2.6/setup-globus-common.pl
--- globus_common_setup-2.6.orig/setup-globus-common.pl	2006-01-19 06:54:11.000000000 +0100
+++ globus_common_setup-2.6/setup-globus-common.pl	2008-10-13 00:09:15.000000000 +0200
@@ -19,13 +19,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -34,37 +28,25 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-
-if((!defined($globusdir)))
-{
-    die "GLOBUS_LOCATION needs to be set before running this script"
-}
-
-my $setupdir = "$globusdir/setup/globus/";
+require Globus::Core::Paths;
+my $setupdir = $Globus::Core::Paths::setupdir;
+my $libexecdir = $Globus::Core::Paths::libexecdir;
+my $bindir = $Globus::Core::Paths::bindir;
 
 print "creating globus-sh-tools-vars.sh\n";
 my $result = `$setupdir/findshelltools`;
 
-print "creating globus-script-initializer\n";
-print "creating Globus::Core::Paths\n";
-
-$result = `$setupdir/setup-tmpdirs`;
-
-for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh')
+for my $setupfile ('globus-sh-tools-vars.sh')
 {
-    $result = system("cp $setupdir/$setupfile $globusdir/libexec");
-    $result = system("chmod 0755 $globusdir/libexec/$setupfile");
-
+    $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile");
+    $result = system("chmod 0644 $libexecdir/$setupfile");
 }
 
-system("mkdir -p $globusdir/lib/perl/Globus/Core");
-system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/");
-system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm");
+system("rm -f config.log config.status");
 
 print "checking globus-hostname\n";
 
-my $hostname = `$globusdir/bin/globus-hostname`;
+my $hostname = `$bindir/globus-hostname`;
 
 $hostname =~ s/\w//g; #strip whitespace
 

globus-common-typo.patch:

--- NEW FILE globus-common-typo.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-07-14 17:33:08.000000000 +0200
@@ -143,7 +143,7 @@
 
 libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@
 libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
-libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@
+libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@
 
 EXTRA_DIST = \
 	globus_callback_nothreads.c \

globus-common-usr.patch:

--- NEW FILE globus-common-usr.patch ---
diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
--- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -9,7 +9,7 @@
 	config \
 	doxygen
 
-sbin_SCRIPTS= \
+libexec_SCRIPTS= \
 	config.guess
 
 EXTRA_DIST = \
diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
--- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
@@ -17,7 +17,11 @@
 # 
 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 # This was done by the script initializer before V2.0
diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
--- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
@@ -43,7 +43,11 @@
 
 usage()
 {
-    . ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+    fi
     globus_source ${libexecdir}/globus-sh-tools.sh
 
     ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -3,7 +3,7 @@
 if ENABLE_PROGRAMS
 bin_SCRIPTS = globus-sh-exec globus-version
 
-libexec_PROGRAMS = globus-libc-hostname globus-is-local-user
+sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
 EXTRA_DIST = globus-sh-exec.in globus-version.in
 
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
@@ -23,13 +23,12 @@
 # domainname
 
 
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
 fi
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-
 PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'`
 PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2`
 
@@ -67,7 +66,7 @@
 EOF
 }
 
-. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header
+. ${libexecdir}/globus-args-parser-header
 
 if [ -n "$1" ]; then
     globus_args_unrecognized_option "$1"
@@ -79,8 +78,8 @@
 if [ -z "${GLOBUS_HOSTNAME}" ] ; then
 
   # Set the _fullname based upon Globus's hostname command
-  if [ -x "${libexecdir}/globus-libc-hostname" ]; then
-    _fullname="`${libexecdir}/globus-libc-hostname`"
+  if [ -x "${sbindir}/globus-libc-hostname" ]; then
+    _fullname="`${sbindir}/globus-libc-hostname`"
   fi
 
   # if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
@@ -25,29 +25,15 @@
 
 my $gpt_path = $ENV{GPT_LOCATION};
 my $globus_path = $ENV{GLOBUS_LOCATION};
-my $gpath;
 
-if ( !defined($gpt_path) && !defined($globus_path) )
+if ( !defined($gpt_path) )
 {
-    die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+    $gpt_path = "/usr";
 }
 
-if ( defined($gpt_path) )
+if ( !defined($globus_path) )
 {
-    $gpath = $gpt_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
-}
-
-if ( !defined($gpath) && defined($globus_path) )
-{
-    $gpath = $globus_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
+    $globus_path = "/usr";
 }
 
 
@@ -60,7 +46,7 @@
 #
 
 my($environment);
- at INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+ at INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
 
 if ( defined eval "require Grid::GPT::V1::Package" )
 {
@@ -240,7 +226,9 @@
     # point our installation object at our globus location
     #
 
-    $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
+    $installation = -d "$globus_path/share/globus/packages" ?
+        new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") :
+        new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
     $installation->set_depenv('Build');
 
     #
@@ -313,10 +301,17 @@
     # push all of our entries onto our header array
     #
 
+    @INC = ("$globus_path/lib/perl", @INC);
+
+    require Globus::Core::Paths;
+    my $includedir = $Globus::Core::Paths::includedir;
+    my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+    my $libdir = $Globus::Core::Paths::libdir;
+
     push(@$header, "GLOBUS_CFLAGS=\"$cflagslist\"");
-    push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\"");
+    push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\"");
     push(@$header, "GLOBUS_LIBS=\"$libslist\"");
-    push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\"");
+    push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\"");
     push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\"");
     push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\"");
 }
@@ -332,7 +327,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") ||
+      open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") ||
+      die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n";
 
     while (<IN>)
     { 
@@ -370,7 +367,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") ||
+      open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") ||
+      die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n";
 
     while (<IN>) 
     {
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
--- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
@@ -15,18 +15,13 @@
 
 my $flavor;
 my $link="static";
-my $gpt=$ENV{GPT_LOCATION};
+
 my $gpath = $ENV{GPT_LOCATION};
 if (!defined($gpath))
 {
-	  $gpath = $ENV{GLOBUS_LOCATION};
-	   
-  }
-  if (!defined($gpath))
-  {
-	     die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
-     }
-      
+  $gpath = "/usr";
+}
+
      @INC = (@INC, "$gpath/lib/perl");
 
 require Grid::GPT::Dependencies;
@@ -40,20 +35,10 @@
 my $pgm_linkslist;
 my $lib_linkslist;
 
-if(!defined($gpt))
-{
-  $gpt=$ENV{GLOBUS_LOCATION};
-}
-if(!defined($gpt))
-{
-  die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n";
-}
-
 my $globus=$ENV{GLOBUS_LOCATION};
-
 if(!defined($globus))
 {
-  die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n";
+  $globus = "/usr";
 }
 
 my %hash;
@@ -102,14 +87,23 @@
 
 	assemble_link_lines($fakepkg, $flavor, $link);
 	  
+ at INC = ("$globus/lib/perl", @INC);
+
+require Globus::Core::Paths;
+my $includedir = $Globus::Core::Paths::includedir;
+my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+my $libdir = $Globus::Core::Paths::libdir;
+
 push @temp_header,  "GLOBUS_CFLAGS=\"$cflagslist\"\n";
-push @temp_header,  "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n";
+push @temp_header,  "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n";
 push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n";
-push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n";
+push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n";
 push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n";
 push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n";
 
-open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n";
+open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") ||
+  open(IN, "$globus/libexec/globus-build-env-$flavor.sh") ||
+  die "ERROR: Cannot open globus-build-env-$flavor.sh\n";
 
 while(<IN>)
 { 
@@ -130,7 +124,9 @@
 
 #END of Section one:  prepending GLOBUS_
 close (IN);
-open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n";
+open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") ||
+  open(IN, "$globus/libexec/globus-sh-tools-vars.sh") ||
+  die "ERROR: Cannot open globus-sh-tools-vars.sh\n";
 while(<IN>) 
 {
 	if(m!\S!)  
diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
--- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
@@ -18,7 +18,11 @@
 
 if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
     
-    . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh
+    fi
     
     # export all commands:
 


--- NEW FILE globus-common.spec ---
Name:		globus-common
%global _name %(tr - _ <<< %{name})
Version:	10.2
%global setupversion 2.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
#		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
#		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
Source1:	%{_name}_setup-%{setupversion}.tar.gz
Source8:	epstopdf-2.9.5gw
Source9:	GLOBUS_LICENSE
#		Environment variable elimination patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
Patch0:		%{name}-usr.patch
#		Segfault fix patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6460
Patch1:		%{name}-no-pthread-exceptions.patch
#		Allow plugins without the flavor extension in the name:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6461
Patch2:		%{name}-noflavext.patch
#		Remove bogus inter-package dependency:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6462
Patch3:		%{name}-deps.patch
#		Fixes a stupid typo in library/Makefile.am:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6463
Patch4:		%{name}-typo.patch
#		The file globus_netos_dir.h does not exist:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6464
Patch5:		%{name}-nosuchfile.patch
#		Doxygen warning fix:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6465
Patch6:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6466
Patch7:		%{name}-bad-age.patch
#		Extradist should not be conditional:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6576
Patch8:		%{name}-extradist.patch
#		Check for function removed from newer versions of libltdl:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578
Patch9:		%{name}-ltdlmutex.patch
#		Configure options not propagated in globus common setup:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
Patch10:	%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Common Library Programs
Group:		Applications/Internet
Provides:	%{name}-setup = %{setupversion}
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool >= 1
Requires:	globus-common-progs >= 3
Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%if %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
%endif

%package devel
Summary:	Globus Toolkit - Common Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-core >= 4
Requires:	pkgconfig

%package doc
Summary:	Globus Toolkit - Common Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

%description
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name} package contains:
Common Library

%description progs
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-progs package contains:
Common Library Programs
Common Setup

%description devel
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-devel package contains:
Common Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-doc package contains:
Common Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1 -b .usr
%patch1 -p1 -b .segfault
%patch2 -p1 -b .noflavext
%patch3 -p1 -b .deps
%patch4 -p1 -b .typo
%patch5 -p1 -b .nofile
%patch6 -p1 -b .doxygen
%patch7 -p1 -b .age
%patch8 -p1 -b .extradist
%patch9 -p1 -b .ltdlmutex
cd %{_name}_setup-%{setupversion}
%patch10 -p1 -b .setup
cd -

# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Grid::GPT::.*)/d'
EOF
%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
  mv $f.new $f
done

sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in

/usr/share/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

# setup package
cd %{_name}_setup-%{setupversion}

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

/usr/share/globus/globus-bootstrap.sh

%configure --without-flavor --with-secure-tmpdir=/var/tmp

make %{?_smp_mflags}

cd -

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# Remove libtool archives (.la files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.la$' < $l > $l.new
  mv $l.new $l
done

# Remove static libraries (.a files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.a$' < $l > $l.new
  mv $l.new $l
done

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move globus-makefile-header to devel package
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep globus-makefile-header >> \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep -v globus-makefile-header > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
  sed 's/P\.RS/P\n.RS/' < $f > $f.new
  mv $f.new $f
done

rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | grep -v 'deprecated\.3' \
  | grep -v '_%{_name}-%{version}_.*\.3' > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed 's!/man/.*!&*!' \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post progs
cd %{_datadir}/globus/setup
./findshelltools > /dev/null
cp -p globus-sh-tools-vars.sh ..
rm -f config.log config.status

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}_setup
%dir %{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/packages/setup/%{_name}_setup
%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
%dir %{_datadir}/globus/setup
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
%ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
%ghost %{_datadir}/globus/globus-sh-tools-vars.sh

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%dir %{_includedir}/globus
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals

* Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
- Make comment about source retieval more explicit

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.4
- Add s390x to the list of 64 bit platforms
- Move globus-makefile-header to devel package

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-common-10_2-1_fc9:EL-4:globus-common-10.2-1.fc9.src.rpm:1239090310


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:15:32 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:45:46 -0000	1.2
@@ -0,0 +1,4 @@
+GLOBUS_LICENSE
+epstopdf-2.9.5gw
+globus_common-10.2.tar.gz
+globus_common_setup-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:15:32 -0000	1.1
+++ sources	7 Apr 2009 07:45:46 -0000	1.2
@@ -0,0 +1,4 @@
+2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
+7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz



From ellert at fedoraproject.org  Tue Apr  7 07:48:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue,  7 Apr 2009 07:48:05 +0000 (UTC)
Subject: rpms/globus-common/EL-5 globus-common-bad-age.patch, NONE,
	1.1 globus-common-deps.patch, NONE,
	1.1 globus-common-doxygen.patch, NONE,
	1.1 globus-common-extradist.patch, NONE,
	1.1 globus-common-ltdlmutex.patch, NONE,
	1.1 globus-common-no-pthread-exceptions.patch, NONE,
	1.1 globus-common-noflavext.patch, NONE,
	1.1 globus-common-nosuchfile.patch, NONE,
	1.1 globus-common-setup.patch, NONE,
	1.1 globus-common-typo.patch, NONE, 1.1 globus-common-usr.patch,
	NONE, 1.1 globus-common.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407074805.0F13270100@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7692/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-common-bad-age.patch globus-common-deps.patch 
	globus-common-doxygen.patch globus-common-extradist.patch 
	globus-common-ltdlmutex.patch 
	globus-common-no-pthread-exceptions.patch 
	globus-common-noflavext.patch globus-common-nosuchfile.patch 
	globus-common-setup.patch globus-common-typo.patch 
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals


globus-common-bad-age.patch:

--- NEW FILE globus-common-bad-age.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-09-29 23:20:49.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-10-12 01:28:20.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Name="globus_common" Format_Version="0.02">
 
-    <Aging_Version Major="10" Minor="2" Age="11"/>
+    <Aging_Version Major="10" Minor="2" Age="10"/>
     <Description >Common Library</Description>
     <Functional_Group >Common</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>

globus-common-deps.patch:

--- NEW FILE globus-common-deps.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-06-25 00:11:11.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-07-14 11:57:49.000000000 +0200
@@ -51,14 +51,6 @@
             <pkg_libs>-lglobus_common</pkg_libs>
         </Build_Environment>
 
-        <Source_Setup_Dependency PkgType="rtl">
-            <Setup_Dependency Name="globus_common_setup"> 
-                <Version>
-                    <Simple_Version Major="2"/>
-                </Version>
-            </Setup_Dependency>
-        </Source_Setup_Dependency>
-		   
         <Source_Setup_Dependency PkgType="pgm">
             <Setup_Dependency Name="globus_common_setup"> 
                 <Version>

globus-common-doxygen.patch:

--- NEW FILE globus-common-doxygen.patch ---
diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h
--- globus_common-10.2.orig/library/globus_callback.h	2006-01-19 06:54:13.000000000 +0100
+++ globus_common-10.2/library/globus_callback.h	2008-10-08 05:05:28.000000000 +0200
@@ -19,10 +19,10 @@
 /**
  * @file globus_callback.h Globus Callback API
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $<br />
- * $Date: 2006/01/19 05:54:13 $<br />
- * $Revision: 1.12 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
+ * $Date: 2006/01/19 05:54:13 $
+ * $Revision: 1.12 $
+ * $Author: mlink $
  */
 
 /**
diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/library/globus_common.h.in
--- globus_common-10.2.orig/library/globus_common.h.in	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_common.h.in	2008-10-08 05:04:11.000000000 +0200
@@ -44,14 +44,6 @@
 
 EXTERN_C_BEGIN
 
-/* TODO remove this if we ever doxyegenate common fully */
-/**
- * @mainpage 
- *
- *   @note <b>More globus_common API documentation is available <a href="../../../common/">here</a>.</b>
- * 
- */
- 
 /******************************************************************************
 			       Type definitions
 ******************************************************************************/
diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h
--- globus_common-10.2.orig/library/globus_thread_common.h	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_thread_common.h	2008-10-08 05:04:58.000000000 +0200
@@ -17,10 +17,10 @@
 /**
  * @file globus_thread_common.h Common Thread Interface
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $<br />
- * $Date: 2006/01/19 05:54:14 $<br />
- * $Revision: 1.6 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
+ * $Date: 2006/01/19 05:54:14 $
+ * $Revision: 1.6 $
+ * $Author: mlink $
  */
 
 /******************************************************************************
diff -ur globus_common-10.2.orig/library/globus_url.h globus_common-10.2/library/globus_url.h
--- globus_common-10.2.orig/library/globus_url.h	2008-01-23 18:26:04.000000000 +0100
+++ globus_common-10.2/library/globus_url.h	2008-10-08 06:02:49.000000000 +0200
@@ -67,7 +67,7 @@
     GLOBUS_URL_SCHEME_X_NEXUS,
     /** GASS Cache Entry */
     GLOBUS_URL_SCHEME_X_GASS_CACHE,
-    /** Any other URL of the form <scheme>://<something */
+    /** Any other URL of the form <scheme>://<something> */
     GLOBUS_URL_SCHEME_UNKNOWN,
     GLOBUS_URL_SCHEME_SSHFTP,
     /** Total number of URL schemes supported */

globus-common-extradist.patch:

--- NEW FILE globus-common-extradist.patch ---
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2008-12-11 16:13:45.120989000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-12-11 16:15:09.868546294 +0100
@@ -5,8 +5,6 @@
 
 sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
-EXTRA_DIST = globus-sh-exec.in globus-version.in
-
 INCLUDES = -I$(top_srcdir)/library $(GPT_INCLUDES) 
 
 globus_libc_hostname_SOURCES = globus_libc_hostname.c
@@ -21,5 +19,7 @@
 globus_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@
 endif
 
+EXTRA_DIST = globus-sh-exec.in globus-version.in
+
 include $(top_srcdir)/globus_automake_post
 

globus-common-ltdlmutex.patch:

--- NEW FILE globus-common-ltdlmutex.patch ---
diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in
--- globus_common-10.2.orig/configure.in	2007-12-12 00:29:27.000000000 +0100
+++ globus_common-10.2/configure.in	2008-12-18 09:02:27.000000000 +0100
@@ -24,6 +24,11 @@
 
 GPT_SET_LIBS(["$EXTERNAL_LIBS"])
 
+save_LIBS=$LIBS
+LIBS="$LIBS $GPT_LIBS"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$save_LIBS
+
 AC_SUBST(GLOBUS_THREADS)
 
 if test x"$GLOBUS_VERSIONNAME" = "x" ; then
diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
+++ globus_common-10.2/library/globus_extension.c	2008-12-18 09:04:27.000000000 +0100
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include "globus_extension.h"
 #include "globus_debug.h"
 #include GLOBUS_THREAD_INCLUDE
@@ -169,6 +170,7 @@
         {
             goto error_dlinit;
         }
+#       ifdef HAVE_LT_DLMUTEX_REGISTER
         if(lt_dlmutex_register(
             globus_l_libtool_mutex_lock,
             globus_l_libtool_mutex_unlock,
@@ -177,6 +179,7 @@
         {
             goto error_dlmutex;
         }
+#       endif /* HAVE_LT_DLMUTEX_REGISTER */
 #       endif /* !BUILD_STATIC_ONLY */
         
         globus_hashtable_init(

globus-common-no-pthread-exceptions.patch:

--- NEW FILE globus-common-no-pthread-exceptions.patch ---
diff -ur globus-common-7.30.orig/library/globus_thread_pthreads.h globus-common-7.30/library/globus_thread_pthreads.h
--- globus-common-7.30.orig/library/globus_thread_pthreads.h	2005-04-19 00:59:37.000000000 +0200
+++ globus-common-7.30/library/globus_thread_pthreads.h	2008-06-30 18:22:33.000000000 +0200
@@ -57,7 +57,13 @@
 #include <pthread.h>
 EXTERN_C_END
 #else  /* TARGET_ARCH_AIX */
+#if defined __GNUC__ && defined __EXCEPTIONS
+#undef __EXCEPTIONS
 #include <pthread.h>
+#define __EXCEPTIONS
+#else
+#include <pthread.h>
+#endif
 #endif /* TARGET_ARCH_AIX */
 
 EXTERN_C_BEGIN

globus-common-noflavext.patch:

--- NEW FILE globus-common-noflavext.patch ---
diff -ur globus-common-7.30.orig/library/globus_extension.c globus-common-7.30/library/globus_extension.c
--- globus-common-7.30.orig/library/globus_extension.c	2005-04-19 00:59:29.000000000 +0200
+++ globus-common-7.30/library/globus_extension.c	2008-07-05 09:22:39.000000000 +0200
@@ -357,11 +357,24 @@
     dlhandle = lt_dlopenext(library);
     if(!dlhandle)
     {
+        snprintf(library, 1024, "lib%s", name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
+    if(!dlhandle)
+    {
         /* older libtools dont search the extensions correctly */
         snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor);
         library[1023] = 0;
         dlhandle = lt_dlopenext(library);
     }
+    if(!dlhandle)
+    {
+        /* older libtools dont search the extensions correctly */
+        snprintf(library, 1024, "lib%s" MY_LIB_EXT, name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
 
     if(!dlhandle)
     {

globus-common-nosuchfile.patch:

--- NEW FILE globus-common-nosuchfile.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-10-11 12:11:57.000000000 +0200
@@ -157,7 +157,6 @@
 	globus_thread_sproc.c \
 	globus_thread_sproc.h
 
-EXTRA_HEADERS = \
-        globus_netos_dir.h
+EXTRA_HEADERS =
 
 include $(top_srcdir)/globus_automake_post

globus-common-setup.patch:

--- NEW FILE globus-common-setup.patch ---
diff -ur globus_common_setup-2.6.orig/configure.in globus_common_setup-2.6/configure.in
--- globus_common_setup-2.6.orig/configure.in	2002-01-10 03:26:32.000000000 +0100
+++ globus_common_setup-2.6/configure.in	2008-10-13 00:09:15.000000000 +0200
@@ -9,10 +9,31 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
+AC_ARG_WITH(tmpdir,
+        AC_HELP_STRING([--with-tmpdir=DIR],
+        [directory for temporary files [[/tmp]]]),
+        [tmpdir="$withval"],
+        [tmpdir=/tmp])
+AC_SUBST(tmpdir)
 
+AC_ARG_WITH(local-tmpdir,
+        AC_HELP_STRING([--with-local-tmpdir=DIR],
+        [local directory for temporary files [[TMPDIR]]]),
+        [local_tmpdir="$withval"],
+        [local_tmpdir='${tmpdir}'])
+AC_SUBST(local_tmpdir)
+
+AC_ARG_WITH(secure-tmpdir,
+        AC_HELP_STRING([--with-secure-tmpdir=DIR],
+        [secure directory for temporary files [[PREFIX/tmp]]]),
+        [secure_tmpdir="$withval"],
+        [secure_tmpdir='${prefix}/tmp'])
+AC_SUBST(secure_tmpdir)
 
 AC_OUTPUT(
         Makefile
+        globus-script-initializer
+        Paths.pm:Paths.in
         pkgdata/Makefile
         pkgdata/pkg_data_src.gpt
 )
diff -ur globus_common_setup-2.6.orig/findshelltools.in globus_common_setup-2.6/findshelltools.in
--- globus_common_setup-2.6.orig/findshelltools.in	2004-09-29 14:52:55.000000000 +0200
+++ globus_common_setup-2.6/findshelltools.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,16 +1,6 @@
 AC_REVISION($Revision: 1.2 $)
 AC_INIT(globus-sh-tools-vars.sh.in)
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
-
 if test "x$PERL" = "x"; then
         AC_PATH_PROG(PERL,perl)
 fi
diff -ur globus_common_setup-2.6.orig/globus-script-initializer.in globus_common_setup-2.6/globus-script-initializer.in
--- globus_common_setup-2.6.orig/globus-script-initializer.in	2005-11-29 21:08:58.000000000 +0100
+++ globus_common_setup-2.6/globus-script-initializer.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,49 +1,53 @@
-
-
-exec_prefix=${GLOBUS_LOCATION}
-prefix=$GLOBUS_LOCATION
-sbindir=${exec_prefix}/sbin
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-libexecdir=${exec_prefix}/libexec
-includedir=${exec_prefix}/include
-datadir=${prefix}/share
-sysconfdir=${prefix}/etc
-sharedstatedir=${prefix}/com
-localstatedir=${prefix}/var
+prefix=${GLOBUS_LOCATION:-/usr}
+exec_prefix=${GLOBUS_LOCATION:-/usr}
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+flavorincludedir=@flavorincludedir@
+datadir=@datadir@
+libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+setupdir=@setupdir@
+testdir=@testdir@
+perlmoduledir=@perlmoduledir@
 tmpdir=@tmpdir@
 local_tmpdir=@local_tmpdir@
 secure_tmpdir=@secure_tmpdir@
 
+if [ x$prefix != "x/usr" ]; then
+
 DELIM=
 if [ -n "${LD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}"
 
 DELIM=
 if [ -n "${DYLD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}"
 
 if [ -z "${LIBPATH}" ]; then
     LIBPATH="/usr/lib:/lib"
 fi
-LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}"
+LIBPATH="${libdir}:${LIBPATH}"
 
 DELIM=
 if [ -n "${SHLIB_PATH}" ]; then
     DELIM=:
 fi
-SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}"
+SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}"
 
-if [ -d $GLOBUS_LOCATION/lib/sasl ]; then
+if [ -d ${libdir}/sasl ]; then
     DELIM=
     if [ -n "${SASL_PATH}" ]; then
         DELIM=:
     fi
-    SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}"
+    SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}"
 fi
 
 export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH
@@ -53,7 +57,7 @@
     if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}"
+    LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}"
     export LD_LIBRARYN32_PATH
 fi
 
@@ -62,10 +66,19 @@
     if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}"
+    LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}"
     export LD_LIBRARY64_PATH
 fi
 
+DELIM=
+if [ -n "${PERLLIB}" ]; then
+    DELIM=:
+fi
+PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}"
+export PERLLIB
+
+fi
+
 globus_source () {
 
   # Check if file exists and source it
diff -ur globus_common_setup-2.6.orig/Makefile.am globus_common_setup-2.6/Makefile.am
--- globus_common_setup-2.6.orig/Makefile.am	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Makefile.am	2008-10-13 00:09:15.000000000 +0200
@@ -3,25 +3,26 @@
 
 setup_SCRIPTS = \
 	findshelltools \
-	setup-tmpdirs \
 	setup-globus-common \
 	setup-globus-common.pl
 
 setup_DATA = \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in 
+        globus-sh-tools-vars.sh.in
+
+libexec_SCRIPTS = globus-script-initializer
+
+globusperldir = $(perlmoduledir)/Globus/Core
+globusperl_DATA = Paths.pm
+
+findshelltools: findshelltools.in
+	autoconf -o findshelltools findshelltools.in
 
 SUBDIRS = pkgdata
 
 EXTRA_DIST = \
 	findshelltools \
 	findshelltools.in \
-	setup-tmpdirs \
-	setup-tmpdirs.in \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in \
+	globus-sh-tools-vars.sh.in \
 	setup-globus-common \
 	setup-globus-common.pl
 
diff -ur globus_common_setup-2.6.orig/Paths.in globus_common_setup-2.6/Paths.in
--- globus_common_setup-2.6.orig/Paths.in	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Paths.in	2008-10-13 00:09:15.000000000 +0200
@@ -4,26 +4,38 @@
 
 @ISA = qw(Exporter);
 
- at EXPORT = qw($exec_prefix $prefix
-             $sbindir $bindir
-	     $libdir $libexecdir $includedir
-	     $datadir $sysconfdir $sharedstatedir
+ at EXPORT = qw($prefix $exec_prefix
+	     $bindir $sbindir $libdir
+	     $includedir $flavorincludedir
+	     $datadir $libexecdir
+	     $sysconfdir $sharedstatedir
 	     $localstatedir
+	     $setupdir $testdir
+	     $perlmoduledir
 	     $tmpdir
 	     $local_tmpdir
 	     $secure_tmpdir);
 
-$exec_prefix=$ENV{GLOBUS_LOCATION};
+my $PACKAGE = "\$PACKAGE";
+my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME";
+
 $prefix=$ENV{GLOBUS_LOCATION};
-$sbindir="${exec_prefix}/sbin";
-$bindir="${exec_prefix}/bin";
-$libdir="${exec_prefix}/lib";
-$libexecdir="${exec_prefix}/libexec";
-$includedir="${exec_prefix}/include";
-$datadir="${prefix}/share";
-$sysconfdir="${prefix}/etc";
-$sharedstatedir="${prefix}/com";
-$localstatedir="${prefix}/var";
+$prefix="/usr" if (!defined $prefix);
+$exec_prefix=$ENV{GLOBUS_LOCATION};
+$exec_prefix="/usr" if (!defined $exec_prefix);
+$bindir="@bindir@";
+$sbindir="@sbindir@";
+$libdir="@libdir@";
+$includedir="@includedir@";
+$flavorincludedir="@flavorincludedir@";
+$datadir="@datadir@";
+$libexecdir="@libexecdir@";
+$sysconfdir="@sysconfdir@";
+$sharedstatedir="@sharedstatedir@";
+$localstatedir="@localstatedir@";
+$setupdir="@setupdir@";
+$testdir="@testdir@";
+$perlmoduledir="@perlmoduledir@";
 $tmpdir="@tmpdir@";
 $local_tmpdir="@local_tmpdir@";
 $secure_tmpdir="@secure_tmpdir@";
diff -ur globus_common_setup-2.6.orig/setup-globus-common globus_common_setup-2.6/setup-globus-common
--- globus_common_setup-2.6.orig/setup-globus-common	2001-06-21 00:24:26.000000000 +0200
+++ globus_common_setup-2.6/setup-globus-common	2008-10-13 00:09:15.000000000 +0200
@@ -1,3 +1,8 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+perl ${setupdir}/setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup-2.6/setup-globus-common.pl
--- globus_common_setup-2.6.orig/setup-globus-common.pl	2006-01-19 06:54:11.000000000 +0100
+++ globus_common_setup-2.6/setup-globus-common.pl	2008-10-13 00:09:15.000000000 +0200
@@ -19,13 +19,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -34,37 +28,25 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-
-if((!defined($globusdir)))
-{
-    die "GLOBUS_LOCATION needs to be set before running this script"
-}
-
-my $setupdir = "$globusdir/setup/globus/";
+require Globus::Core::Paths;
+my $setupdir = $Globus::Core::Paths::setupdir;
+my $libexecdir = $Globus::Core::Paths::libexecdir;
+my $bindir = $Globus::Core::Paths::bindir;
 
 print "creating globus-sh-tools-vars.sh\n";
 my $result = `$setupdir/findshelltools`;
 
-print "creating globus-script-initializer\n";
-print "creating Globus::Core::Paths\n";
-
-$result = `$setupdir/setup-tmpdirs`;
-
-for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh')
+for my $setupfile ('globus-sh-tools-vars.sh')
 {
-    $result = system("cp $setupdir/$setupfile $globusdir/libexec");
-    $result = system("chmod 0755 $globusdir/libexec/$setupfile");
-
+    $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile");
+    $result = system("chmod 0644 $libexecdir/$setupfile");
 }
 
-system("mkdir -p $globusdir/lib/perl/Globus/Core");
-system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/");
-system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm");
+system("rm -f config.log config.status");
 
 print "checking globus-hostname\n";
 
-my $hostname = `$globusdir/bin/globus-hostname`;
+my $hostname = `$bindir/globus-hostname`;
 
 $hostname =~ s/\w//g; #strip whitespace
 

globus-common-typo.patch:

--- NEW FILE globus-common-typo.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-07-14 17:33:08.000000000 +0200
@@ -143,7 +143,7 @@
 
 libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@
 libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
-libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@
+libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@
 
 EXTRA_DIST = \
 	globus_callback_nothreads.c \

globus-common-usr.patch:

--- NEW FILE globus-common-usr.patch ---
diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
--- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -9,7 +9,7 @@
 	config \
 	doxygen
 
-sbin_SCRIPTS= \
+libexec_SCRIPTS= \
 	config.guess
 
 EXTRA_DIST = \
diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
--- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
@@ -17,7 +17,11 @@
 # 
 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 # This was done by the script initializer before V2.0
diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
--- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
@@ -43,7 +43,11 @@
 
 usage()
 {
-    . ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+    fi
     globus_source ${libexecdir}/globus-sh-tools.sh
 
     ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -3,7 +3,7 @@
 if ENABLE_PROGRAMS
 bin_SCRIPTS = globus-sh-exec globus-version
 
-libexec_PROGRAMS = globus-libc-hostname globus-is-local-user
+sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
 EXTRA_DIST = globus-sh-exec.in globus-version.in
 
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
@@ -23,13 +23,12 @@
 # domainname
 
 
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
 fi
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-
 PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'`
 PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2`
 
@@ -67,7 +66,7 @@
 EOF
 }
 
-. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header
+. ${libexecdir}/globus-args-parser-header
 
 if [ -n "$1" ]; then
     globus_args_unrecognized_option "$1"
@@ -79,8 +78,8 @@
 if [ -z "${GLOBUS_HOSTNAME}" ] ; then
 
   # Set the _fullname based upon Globus's hostname command
-  if [ -x "${libexecdir}/globus-libc-hostname" ]; then
-    _fullname="`${libexecdir}/globus-libc-hostname`"
+  if [ -x "${sbindir}/globus-libc-hostname" ]; then
+    _fullname="`${sbindir}/globus-libc-hostname`"
   fi
 
   # if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
@@ -25,29 +25,15 @@
 
 my $gpt_path = $ENV{GPT_LOCATION};
 my $globus_path = $ENV{GLOBUS_LOCATION};
-my $gpath;
 
-if ( !defined($gpt_path) && !defined($globus_path) )
+if ( !defined($gpt_path) )
 {
-    die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+    $gpt_path = "/usr";
 }
 
-if ( defined($gpt_path) )
+if ( !defined($globus_path) )
 {
-    $gpath = $gpt_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
-}
-
-if ( !defined($gpath) && defined($globus_path) )
-{
-    $gpath = $globus_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
+    $globus_path = "/usr";
 }
 
 
@@ -60,7 +46,7 @@
 #
 
 my($environment);
- at INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+ at INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
 
 if ( defined eval "require Grid::GPT::V1::Package" )
 {
@@ -240,7 +226,9 @@
     # point our installation object at our globus location
     #
 
-    $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
+    $installation = -d "$globus_path/share/globus/packages" ?
+        new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") :
+        new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
     $installation->set_depenv('Build');
 
     #
@@ -313,10 +301,17 @@
     # push all of our entries onto our header array
     #
 
+    @INC = ("$globus_path/lib/perl", @INC);
+
+    require Globus::Core::Paths;
+    my $includedir = $Globus::Core::Paths::includedir;
+    my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+    my $libdir = $Globus::Core::Paths::libdir;
+
     push(@$header, "GLOBUS_CFLAGS=\"$cflagslist\"");
-    push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\"");
+    push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\"");
     push(@$header, "GLOBUS_LIBS=\"$libslist\"");
-    push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\"");
+    push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\"");
     push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\"");
     push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\"");
 }
@@ -332,7 +327,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") ||
+      open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") ||
+      die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n";
 
     while (<IN>)
     { 
@@ -370,7 +367,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") ||
+      open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") ||
+      die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n";
 
     while (<IN>) 
     {
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
--- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
@@ -15,18 +15,13 @@
 
 my $flavor;
 my $link="static";
-my $gpt=$ENV{GPT_LOCATION};
+
 my $gpath = $ENV{GPT_LOCATION};
 if (!defined($gpath))
 {
-	  $gpath = $ENV{GLOBUS_LOCATION};
-	   
-  }
-  if (!defined($gpath))
-  {
-	     die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
-     }
-      
+  $gpath = "/usr";
+}
+
      @INC = (@INC, "$gpath/lib/perl");
 
 require Grid::GPT::Dependencies;
@@ -40,20 +35,10 @@
 my $pgm_linkslist;
 my $lib_linkslist;
 
-if(!defined($gpt))
-{
-  $gpt=$ENV{GLOBUS_LOCATION};
-}
-if(!defined($gpt))
-{
-  die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n";
-}
-
 my $globus=$ENV{GLOBUS_LOCATION};
-
 if(!defined($globus))
 {
-  die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n";
+  $globus = "/usr";
 }
 
 my %hash;
@@ -102,14 +87,23 @@
 
 	assemble_link_lines($fakepkg, $flavor, $link);
 	  
+ at INC = ("$globus/lib/perl", @INC);
+
+require Globus::Core::Paths;
+my $includedir = $Globus::Core::Paths::includedir;
+my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+my $libdir = $Globus::Core::Paths::libdir;
+
 push @temp_header,  "GLOBUS_CFLAGS=\"$cflagslist\"\n";
-push @temp_header,  "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n";
+push @temp_header,  "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n";
 push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n";
-push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n";
+push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n";
 push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n";
 push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n";
 
-open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n";
+open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") ||
+  open(IN, "$globus/libexec/globus-build-env-$flavor.sh") ||
+  die "ERROR: Cannot open globus-build-env-$flavor.sh\n";
 
 while(<IN>)
 { 
@@ -130,7 +124,9 @@
 
 #END of Section one:  prepending GLOBUS_
 close (IN);
-open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n";
+open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") ||
+  open(IN, "$globus/libexec/globus-sh-tools-vars.sh") ||
+  die "ERROR: Cannot open globus-sh-tools-vars.sh\n";
 while(<IN>) 
 {
 	if(m!\S!)  
diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
--- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
@@ -18,7 +18,11 @@
 
 if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
     
-    . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh
+    fi
     
     # export all commands:
 


--- NEW FILE globus-common.spec ---
Name:		globus-common
%global _name %(tr - _ <<< %{name})
Version:	10.2
%global setupversion 2.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
#		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
#		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
Source1:	%{_name}_setup-%{setupversion}.tar.gz
Source8:	epstopdf-2.9.5gw
Source9:	GLOBUS_LICENSE
#		Environment variable elimination patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
Patch0:		%{name}-usr.patch
#		Segfault fix patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6460
Patch1:		%{name}-no-pthread-exceptions.patch
#		Allow plugins without the flavor extension in the name:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6461
Patch2:		%{name}-noflavext.patch
#		Remove bogus inter-package dependency:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6462
Patch3:		%{name}-deps.patch
#		Fixes a stupid typo in library/Makefile.am:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6463
Patch4:		%{name}-typo.patch
#		The file globus_netos_dir.h does not exist:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6464
Patch5:		%{name}-nosuchfile.patch
#		Doxygen warning fix:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6465
Patch6:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6466
Patch7:		%{name}-bad-age.patch
#		Extradist should not be conditional:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6576
Patch8:		%{name}-extradist.patch
#		Check for function removed from newer versions of libltdl:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578
Patch9:		%{name}-ltdlmutex.patch
#		Configure options not propagated in globus common setup:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
Patch10:	%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Common Library Programs
Group:		Applications/Internet
Provides:	%{name}-setup = %{setupversion}
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool >= 1
Requires:	globus-common-progs >= 3
Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%if %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
%endif

%package devel
Summary:	Globus Toolkit - Common Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-core >= 4
Requires:	pkgconfig

%package doc
Summary:	Globus Toolkit - Common Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

%description
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name} package contains:
Common Library

%description progs
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-progs package contains:
Common Library Programs
Common Setup

%description devel
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-devel package contains:
Common Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-doc package contains:
Common Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1 -b .usr
%patch1 -p1 -b .segfault
%patch2 -p1 -b .noflavext
%patch3 -p1 -b .deps
%patch4 -p1 -b .typo
%patch5 -p1 -b .nofile
%patch6 -p1 -b .doxygen
%patch7 -p1 -b .age
%patch8 -p1 -b .extradist
%patch9 -p1 -b .ltdlmutex
cd %{_name}_setup-%{setupversion}
%patch10 -p1 -b .setup
cd -

# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Grid::GPT::.*)/d'
EOF
%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
  mv $f.new $f
done

sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in

/usr/share/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

# setup package
cd %{_name}_setup-%{setupversion}

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

/usr/share/globus/globus-bootstrap.sh

%configure --without-flavor --with-secure-tmpdir=/var/tmp

make %{?_smp_mflags}

cd -

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# Remove libtool archives (.la files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.la$' < $l > $l.new
  mv $l.new $l
done

# Remove static libraries (.a files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.a$' < $l > $l.new
  mv $l.new $l
done

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move globus-makefile-header to devel package
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep globus-makefile-header >> \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep -v globus-makefile-header > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
  sed 's/P\.RS/P\n.RS/' < $f > $f.new
  mv $f.new $f
done

rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | grep -v 'deprecated\.3' \
  | grep -v '_%{_name}-%{version}_.*\.3' > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed 's!/man/.*!&*!' \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post progs
cd %{_datadir}/globus/setup
./findshelltools > /dev/null
cp -p globus-sh-tools-vars.sh ..
rm -f config.log config.status

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}_setup
%dir %{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/packages/setup/%{_name}_setup
%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
%dir %{_datadir}/globus/setup
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
%ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
%ghost %{_datadir}/globus/globus-sh-tools-vars.sh

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%dir %{_includedir}/globus
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals

* Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
- Make comment about source retieval more explicit

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.4
- Add s390x to the list of 64 bit platforms
- Move globus-makefile-header to devel package

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-common-10_2-1_fc9:EL-5:globus-common-10.2-1.fc9.src.rpm:1239090450


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:15:32 -0000	1.1
+++ .cvsignore	7 Apr 2009 07:48:04 -0000	1.2
@@ -0,0 +1,4 @@
+GLOBUS_LICENSE
+epstopdf-2.9.5gw
+globus_common-10.2.tar.gz
+globus_common_setup-2.6.tar.gz





From denis at fedoraproject.org  Tue Apr  7 07:49:23 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue,  7 Apr 2009 07:49:23 +0000 (UTC)
Subject: rpms/gcdmaster/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE gcdmaster-1.2.2-gcc43.patch, 1.1,
	NONE gcdmaster-1.2.2-sigc2.patch, 1.1, NONE gcdmaster.spec, 1.10,
	NONE sources, 1.3, NONE
Message-ID: <20090407074923.DC44B70100@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gcdmaster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7958

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gcdmaster-1.2.2-gcc43.patch 
	gcdmaster-1.2.2-sigc2.patch gcdmaster.spec sources 
Log Message:
Gcdmaster has been merged back into cdrdao, so this package is now orphaned/obsolete


--- NEW FILE dead.package ---
Gcdmaster has been merged back into the cdrdao package.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gcdmaster-1.2.2-gcc43.patch DELETED ---


--- gcdmaster-1.2.2-sigc2.patch DELETED ---


--- gcdmaster.spec DELETED ---


--- sources DELETED ---



From jussilehtola at fedoraproject.org  Tue Apr  7 07:58:49 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue,  7 Apr 2009 07:58:49 +0000 (UTC)
Subject: rpms/healpix/devel import.log,NONE,1.1
Message-ID: <20090407075849.3ABB870100@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9561/devel

Added Files:
	import.log 
Log Message:
* Tue 07 Apr 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-5
- Fix import - THIS is the latest version.



--- NEW FILE import.log ---
healpix-2_11c-3_el5:HEAD:healpix-2.11c-5.el5.src.rpm:1239091049



From pnemade at fedoraproject.org  Tue Apr  7 08:05:57 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Tue,  7 Apr 2009 08:05:57 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.174,1.175
Message-ID: <20090407080557.3F77170100@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11378

Modified Files:
	comps-f11.xml.in 
Log Message:

- Remove Hindi packages for Maithili language group.
- Add Maithili keymap package for Maithili language group.




Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- comps-f11.xml.in	6 Apr 2009 16:06:05 -0000	1.174
+++ comps-f11.xml.in	7 Apr 2009 08:05:26 -0000	1.175
@@ -3650,8 +3650,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">lohit-maithili-fonts</packagereq>
-      <packagereq type="default">m17n-contrib-hindi</packagereq>
-      <packagereq type="default">m17n-db-hindi</packagereq>
+      <packagereq type="default">m17n-contrib-maithili</packagereq>
     </packagelist>
   </group>
   <group>



From ellert at fedoraproject.org  Tue Apr  7 08:31:54 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue,  7 Apr 2009 08:31:54 +0000 (UTC)
Subject: rpms/globus-common/F-10 globus-common-bad-age.patch, NONE,
	1.1 globus-common-deps.patch, NONE,
	1.1 globus-common-doxygen.patch, NONE,
	1.1 globus-common-extradist.patch, NONE,
	1.1 globus-common-ltdlmutex.patch, NONE,
	1.1 globus-common-no-pthread-exceptions.patch, NONE,
	1.1 globus-common-noflavext.patch, NONE,
	1.1 globus-common-nosuchfile.patch, NONE,
	1.1 globus-common-setup.patch, NONE,
	1.1 globus-common-typo.patch, NONE, 1.1 globus-common-usr.patch,
	NONE, 1.1 globus-common.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407083154.D1A3370100@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16359/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-common-bad-age.patch globus-common-deps.patch 
	globus-common-doxygen.patch globus-common-extradist.patch 
	globus-common-ltdlmutex.patch 
	globus-common-no-pthread-exceptions.patch 
	globus-common-noflavext.patch globus-common-nosuchfile.patch 
	globus-common-setup.patch globus-common-typo.patch 
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals


globus-common-bad-age.patch:

--- NEW FILE globus-common-bad-age.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-09-29 23:20:49.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-10-12 01:28:20.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Name="globus_common" Format_Version="0.02">
 
-    <Aging_Version Major="10" Minor="2" Age="11"/>
+    <Aging_Version Major="10" Minor="2" Age="10"/>
     <Description >Common Library</Description>
     <Functional_Group >Common</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>

globus-common-deps.patch:

--- NEW FILE globus-common-deps.patch ---
diff -ur globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_common-10.2/pkgdata/pkg_data_src.gpt.in
--- globus_common-10.2.orig/pkgdata/pkg_data_src.gpt.in	2008-06-25 00:11:11.000000000 +0200
+++ globus_common-10.2/pkgdata/pkg_data_src.gpt.in	2008-07-14 11:57:49.000000000 +0200
@@ -51,14 +51,6 @@
             <pkg_libs>-lglobus_common</pkg_libs>
         </Build_Environment>
 
-        <Source_Setup_Dependency PkgType="rtl">
-            <Setup_Dependency Name="globus_common_setup"> 
-                <Version>
-                    <Simple_Version Major="2"/>
-                </Version>
-            </Setup_Dependency>
-        </Source_Setup_Dependency>
-		   
         <Source_Setup_Dependency PkgType="pgm">
             <Setup_Dependency Name="globus_common_setup"> 
                 <Version>

globus-common-doxygen.patch:

--- NEW FILE globus-common-doxygen.patch ---
diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h
--- globus_common-10.2.orig/library/globus_callback.h	2006-01-19 06:54:13.000000000 +0100
+++ globus_common-10.2/library/globus_callback.h	2008-10-08 05:05:28.000000000 +0200
@@ -19,10 +19,10 @@
 /**
  * @file globus_callback.h Globus Callback API
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $<br />
- * $Date: 2006/01/19 05:54:13 $<br />
- * $Revision: 1.12 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
+ * $Date: 2006/01/19 05:54:13 $
+ * $Revision: 1.12 $
+ * $Author: mlink $
  */
 
 /**
diff -ur globus_common-10.2.orig/library/globus_common.h.in globus_common-10.2/library/globus_common.h.in
--- globus_common-10.2.orig/library/globus_common.h.in	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_common.h.in	2008-10-08 05:04:11.000000000 +0200
@@ -44,14 +44,6 @@
 
 EXTERN_C_BEGIN
 
-/* TODO remove this if we ever doxyegenate common fully */
-/**
- * @mainpage 
- *
- *   @note <b>More globus_common API documentation is available <a href="../../../common/">here</a>.</b>
- * 
- */
- 
 /******************************************************************************
 			       Type definitions
 ******************************************************************************/
diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h
--- globus_common-10.2.orig/library/globus_thread_common.h	2006-01-19 06:54:14.000000000 +0100
+++ globus_common-10.2/library/globus_thread_common.h	2008-10-08 05:04:58.000000000 +0200
@@ -17,10 +17,10 @@
 /**
  * @file globus_thread_common.h Common Thread Interface
  *
- * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $<br />
- * $Date: 2006/01/19 05:54:14 $<br />
- * $Revision: 1.6 $<br />
- * $Author: mlink $<br />
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
+ * $Date: 2006/01/19 05:54:14 $
+ * $Revision: 1.6 $
+ * $Author: mlink $
  */
 
 /******************************************************************************
diff -ur globus_common-10.2.orig/library/globus_url.h globus_common-10.2/library/globus_url.h
--- globus_common-10.2.orig/library/globus_url.h	2008-01-23 18:26:04.000000000 +0100
+++ globus_common-10.2/library/globus_url.h	2008-10-08 06:02:49.000000000 +0200
@@ -67,7 +67,7 @@
     GLOBUS_URL_SCHEME_X_NEXUS,
     /** GASS Cache Entry */
     GLOBUS_URL_SCHEME_X_GASS_CACHE,
-    /** Any other URL of the form <scheme>://<something */
+    /** Any other URL of the form <scheme>://<something> */
     GLOBUS_URL_SCHEME_UNKNOWN,
     GLOBUS_URL_SCHEME_SSHFTP,
     /** Total number of URL schemes supported */

globus-common-extradist.patch:

--- NEW FILE globus-common-extradist.patch ---
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2008-12-11 16:13:45.120989000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-12-11 16:15:09.868546294 +0100
@@ -5,8 +5,6 @@
 
 sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
-EXTRA_DIST = globus-sh-exec.in globus-version.in
-
 INCLUDES = -I$(top_srcdir)/library $(GPT_INCLUDES) 
 
 globus_libc_hostname_SOURCES = globus_libc_hostname.c
@@ -21,5 +19,7 @@
 globus_is_local_user_LDADD = ../library/libglobus_common_$(GLOBUS_FLAVOR_NAME).la @GPT_PGM_LINKS@
 endif
 
+EXTRA_DIST = globus-sh-exec.in globus-version.in
+
 include $(top_srcdir)/globus_automake_post
 

globus-common-ltdlmutex.patch:

--- NEW FILE globus-common-ltdlmutex.patch ---
diff -ur globus_common-10.2.orig/configure.in globus_common-10.2/configure.in
--- globus_common-10.2.orig/configure.in	2007-12-12 00:29:27.000000000 +0100
+++ globus_common-10.2/configure.in	2008-12-18 09:02:27.000000000 +0100
@@ -24,6 +24,11 @@
 
 GPT_SET_LIBS(["$EXTERNAL_LIBS"])
 
+save_LIBS=$LIBS
+LIBS="$LIBS $GPT_LIBS"
+AC_CHECK_FUNCS([lt_dlmutex_register])
+LIBS=$save_LIBS
+
 AC_SUBST(GLOBUS_THREADS)
 
 if test x"$GLOBUS_VERSIONNAME" = "x" ; then
diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
+++ globus_common-10.2/library/globus_extension.c	2008-12-18 09:04:27.000000000 +0100
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include "globus_extension.h"
 #include "globus_debug.h"
 #include GLOBUS_THREAD_INCLUDE
@@ -169,6 +170,7 @@
         {
             goto error_dlinit;
         }
+#       ifdef HAVE_LT_DLMUTEX_REGISTER
         if(lt_dlmutex_register(
             globus_l_libtool_mutex_lock,
             globus_l_libtool_mutex_unlock,
@@ -177,6 +179,7 @@
         {
             goto error_dlmutex;
         }
+#       endif /* HAVE_LT_DLMUTEX_REGISTER */
 #       endif /* !BUILD_STATIC_ONLY */
         
         globus_hashtable_init(

globus-common-no-pthread-exceptions.patch:

--- NEW FILE globus-common-no-pthread-exceptions.patch ---
diff -ur globus-common-7.30.orig/library/globus_thread_pthreads.h globus-common-7.30/library/globus_thread_pthreads.h
--- globus-common-7.30.orig/library/globus_thread_pthreads.h	2005-04-19 00:59:37.000000000 +0200
+++ globus-common-7.30/library/globus_thread_pthreads.h	2008-06-30 18:22:33.000000000 +0200
@@ -57,7 +57,13 @@
 #include <pthread.h>
 EXTERN_C_END
 #else  /* TARGET_ARCH_AIX */
+#if defined __GNUC__ && defined __EXCEPTIONS
+#undef __EXCEPTIONS
 #include <pthread.h>
+#define __EXCEPTIONS
+#else
+#include <pthread.h>
+#endif
 #endif /* TARGET_ARCH_AIX */
 
 EXTERN_C_BEGIN

globus-common-noflavext.patch:

--- NEW FILE globus-common-noflavext.patch ---
diff -ur globus-common-7.30.orig/library/globus_extension.c globus-common-7.30/library/globus_extension.c
--- globus-common-7.30.orig/library/globus_extension.c	2005-04-19 00:59:29.000000000 +0200
+++ globus-common-7.30/library/globus_extension.c	2008-07-05 09:22:39.000000000 +0200
@@ -357,11 +357,24 @@
     dlhandle = lt_dlopenext(library);
     if(!dlhandle)
     {
+        snprintf(library, 1024, "lib%s", name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
+    if(!dlhandle)
+    {
         /* older libtools dont search the extensions correctly */
         snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor);
         library[1023] = 0;
         dlhandle = lt_dlopenext(library);
     }
+    if(!dlhandle)
+    {
+        /* older libtools dont search the extensions correctly */
+        snprintf(library, 1024, "lib%s" MY_LIB_EXT, name);
+        library[1023] = 0;
+        dlhandle = lt_dlopenext(library);
+    }
 
     if(!dlhandle)
     {

globus-common-nosuchfile.patch:

--- NEW FILE globus-common-nosuchfile.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-10-11 12:11:57.000000000 +0200
@@ -157,7 +157,6 @@
 	globus_thread_sproc.c \
 	globus_thread_sproc.h
 
-EXTRA_HEADERS = \
-        globus_netos_dir.h
+EXTRA_HEADERS =
 
 include $(top_srcdir)/globus_automake_post

globus-common-setup.patch:

--- NEW FILE globus-common-setup.patch ---
diff -ur globus_common_setup-2.6.orig/configure.in globus_common_setup-2.6/configure.in
--- globus_common_setup-2.6.orig/configure.in	2002-01-10 03:26:32.000000000 +0100
+++ globus_common_setup-2.6/configure.in	2008-10-13 00:09:15.000000000 +0200
@@ -9,10 +9,31 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
+AC_ARG_WITH(tmpdir,
+        AC_HELP_STRING([--with-tmpdir=DIR],
+        [directory for temporary files [[/tmp]]]),
+        [tmpdir="$withval"],
+        [tmpdir=/tmp])
+AC_SUBST(tmpdir)
 
+AC_ARG_WITH(local-tmpdir,
+        AC_HELP_STRING([--with-local-tmpdir=DIR],
+        [local directory for temporary files [[TMPDIR]]]),
+        [local_tmpdir="$withval"],
+        [local_tmpdir='${tmpdir}'])
+AC_SUBST(local_tmpdir)
+
+AC_ARG_WITH(secure-tmpdir,
+        AC_HELP_STRING([--with-secure-tmpdir=DIR],
+        [secure directory for temporary files [[PREFIX/tmp]]]),
+        [secure_tmpdir="$withval"],
+        [secure_tmpdir='${prefix}/tmp'])
+AC_SUBST(secure_tmpdir)
 
 AC_OUTPUT(
         Makefile
+        globus-script-initializer
+        Paths.pm:Paths.in
         pkgdata/Makefile
         pkgdata/pkg_data_src.gpt
 )
diff -ur globus_common_setup-2.6.orig/findshelltools.in globus_common_setup-2.6/findshelltools.in
--- globus_common_setup-2.6.orig/findshelltools.in	2004-09-29 14:52:55.000000000 +0200
+++ globus_common_setup-2.6/findshelltools.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,16 +1,6 @@
 AC_REVISION($Revision: 1.2 $)
 AC_INIT(globus-sh-tools-vars.sh.in)
 
-# checking for the GLOBUS_LOCATION
-
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
-prefix='$(GLOBUS_LOCATION)'
-exec_prefix='$(GLOBUS_LOCATION)'
-
 if test "x$PERL" = "x"; then
         AC_PATH_PROG(PERL,perl)
 fi
diff -ur globus_common_setup-2.6.orig/globus-script-initializer.in globus_common_setup-2.6/globus-script-initializer.in
--- globus_common_setup-2.6.orig/globus-script-initializer.in	2005-11-29 21:08:58.000000000 +0100
+++ globus_common_setup-2.6/globus-script-initializer.in	2008-10-13 00:09:15.000000000 +0200
@@ -1,49 +1,53 @@
-
-
-exec_prefix=${GLOBUS_LOCATION}
-prefix=$GLOBUS_LOCATION
-sbindir=${exec_prefix}/sbin
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-libexecdir=${exec_prefix}/libexec
-includedir=${exec_prefix}/include
-datadir=${prefix}/share
-sysconfdir=${prefix}/etc
-sharedstatedir=${prefix}/com
-localstatedir=${prefix}/var
+prefix=${GLOBUS_LOCATION:-/usr}
+exec_prefix=${GLOBUS_LOCATION:-/usr}
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+flavorincludedir=@flavorincludedir@
+datadir=@datadir@
+libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+setupdir=@setupdir@
+testdir=@testdir@
+perlmoduledir=@perlmoduledir@
 tmpdir=@tmpdir@
 local_tmpdir=@local_tmpdir@
 secure_tmpdir=@secure_tmpdir@
 
+if [ x$prefix != "x/usr" ]; then
+
 DELIM=
 if [ -n "${LD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}"
 
 DELIM=
 if [ -n "${DYLD_LIBRARY_PATH}" ]; then
     DELIM=:
 fi
-DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}"
 
 if [ -z "${LIBPATH}" ]; then
     LIBPATH="/usr/lib:/lib"
 fi
-LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}"
+LIBPATH="${libdir}:${LIBPATH}"
 
 DELIM=
 if [ -n "${SHLIB_PATH}" ]; then
     DELIM=:
 fi
-SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}"
+SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}"
 
-if [ -d $GLOBUS_LOCATION/lib/sasl ]; then
+if [ -d ${libdir}/sasl ]; then
     DELIM=
     if [ -n "${SASL_PATH}" ]; then
         DELIM=:
     fi
-    SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}"
+    SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}"
 fi
 
 export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH
@@ -53,7 +57,7 @@
     if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}"
+    LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}"
     export LD_LIBRARYN32_PATH
 fi
 
@@ -62,10 +66,19 @@
     if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then
         DELIM=:
     fi
-    LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}"
+    LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}"
     export LD_LIBRARY64_PATH
 fi
 
+DELIM=
+if [ -n "${PERLLIB}" ]; then
+    DELIM=:
+fi
+PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}"
+export PERLLIB
+
+fi
+
 globus_source () {
 
   # Check if file exists and source it
diff -ur globus_common_setup-2.6.orig/Makefile.am globus_common_setup-2.6/Makefile.am
--- globus_common_setup-2.6.orig/Makefile.am	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Makefile.am	2008-10-13 00:09:15.000000000 +0200
@@ -3,25 +3,26 @@
 
 setup_SCRIPTS = \
 	findshelltools \
-	setup-tmpdirs \
 	setup-globus-common \
 	setup-globus-common.pl
 
 setup_DATA = \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in 
+        globus-sh-tools-vars.sh.in
+
+libexec_SCRIPTS = globus-script-initializer
+
+globusperldir = $(perlmoduledir)/Globus/Core
+globusperl_DATA = Paths.pm
+
+findshelltools: findshelltools.in
+	autoconf -o findshelltools findshelltools.in
 
 SUBDIRS = pkgdata
 
 EXTRA_DIST = \
 	findshelltools \
 	findshelltools.in \
-	setup-tmpdirs \
-	setup-tmpdirs.in \
-        globus-script-initializer.in \
-        globus-sh-tools-vars.sh.in \
-        Paths.in \
+	globus-sh-tools-vars.sh.in \
 	setup-globus-common \
 	setup-globus-common.pl
 
diff -ur globus_common_setup-2.6.orig/Paths.in globus_common_setup-2.6/Paths.in
--- globus_common_setup-2.6.orig/Paths.in	2002-09-24 23:33:53.000000000 +0200
+++ globus_common_setup-2.6/Paths.in	2008-10-13 00:09:15.000000000 +0200
@@ -4,26 +4,38 @@
 
 @ISA = qw(Exporter);
 
- at EXPORT = qw($exec_prefix $prefix
-             $sbindir $bindir
-	     $libdir $libexecdir $includedir
-	     $datadir $sysconfdir $sharedstatedir
+ at EXPORT = qw($prefix $exec_prefix
+	     $bindir $sbindir $libdir
+	     $includedir $flavorincludedir
+	     $datadir $libexecdir
+	     $sysconfdir $sharedstatedir
 	     $localstatedir
+	     $setupdir $testdir
+	     $perlmoduledir
 	     $tmpdir
 	     $local_tmpdir
 	     $secure_tmpdir);
 
-$exec_prefix=$ENV{GLOBUS_LOCATION};
+my $PACKAGE = "\$PACKAGE";
+my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME";
+
 $prefix=$ENV{GLOBUS_LOCATION};
-$sbindir="${exec_prefix}/sbin";
-$bindir="${exec_prefix}/bin";
-$libdir="${exec_prefix}/lib";
-$libexecdir="${exec_prefix}/libexec";
-$includedir="${exec_prefix}/include";
-$datadir="${prefix}/share";
-$sysconfdir="${prefix}/etc";
-$sharedstatedir="${prefix}/com";
-$localstatedir="${prefix}/var";
+$prefix="/usr" if (!defined $prefix);
+$exec_prefix=$ENV{GLOBUS_LOCATION};
+$exec_prefix="/usr" if (!defined $exec_prefix);
+$bindir="@bindir@";
+$sbindir="@sbindir@";
+$libdir="@libdir@";
+$includedir="@includedir@";
+$flavorincludedir="@flavorincludedir@";
+$datadir="@datadir@";
+$libexecdir="@libexecdir@";
+$sysconfdir="@sysconfdir@";
+$sharedstatedir="@sharedstatedir@";
+$localstatedir="@localstatedir@";
+$setupdir="@setupdir@";
+$testdir="@testdir@";
+$perlmoduledir="@perlmoduledir@";
 $tmpdir="@tmpdir@";
 $local_tmpdir="@local_tmpdir@";
 $secure_tmpdir="@secure_tmpdir@";
diff -ur globus_common_setup-2.6.orig/setup-globus-common globus_common_setup-2.6/setup-globus-common
--- globus_common_setup-2.6.orig/setup-globus-common	2001-06-21 00:24:26.000000000 +0200
+++ globus_common_setup-2.6/setup-globus-common	2008-10-13 00:09:15.000000000 +0200
@@ -1,3 +1,8 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+perl ${setupdir}/setup-globus-common.pl
diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup-2.6/setup-globus-common.pl
--- globus_common_setup-2.6.orig/setup-globus-common.pl	2006-01-19 06:54:11.000000000 +0100
+++ globus_common_setup-2.6/setup-globus-common.pl	2008-10-13 00:09:15.000000000 +0200
@@ -19,13 +19,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -34,37 +28,25 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-
-if((!defined($globusdir)))
-{
-    die "GLOBUS_LOCATION needs to be set before running this script"
-}
-
-my $setupdir = "$globusdir/setup/globus/";
+require Globus::Core::Paths;
+my $setupdir = $Globus::Core::Paths::setupdir;
+my $libexecdir = $Globus::Core::Paths::libexecdir;
+my $bindir = $Globus::Core::Paths::bindir;
 
 print "creating globus-sh-tools-vars.sh\n";
 my $result = `$setupdir/findshelltools`;
 
-print "creating globus-script-initializer\n";
-print "creating Globus::Core::Paths\n";
-
-$result = `$setupdir/setup-tmpdirs`;
-
-for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh')
+for my $setupfile ('globus-sh-tools-vars.sh')
 {
-    $result = system("cp $setupdir/$setupfile $globusdir/libexec");
-    $result = system("chmod 0755 $globusdir/libexec/$setupfile");
-
+    $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile");
+    $result = system("chmod 0644 $libexecdir/$setupfile");
 }
 
-system("mkdir -p $globusdir/lib/perl/Globus/Core");
-system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/");
-system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm");
+system("rm -f config.log config.status");
 
 print "checking globus-hostname\n";
 
-my $hostname = `$globusdir/bin/globus-hostname`;
+my $hostname = `$bindir/globus-hostname`;
 
 $hostname =~ s/\w//g; #strip whitespace
 

globus-common-typo.patch:

--- NEW FILE globus-common-typo.patch ---
diff -ur globus_common-10.2.orig/library/Makefile.am globus_common-10.2/library/Makefile.am
--- globus_common-10.2.orig/library/Makefile.am	2006-01-13 22:24:29.000000000 +0100
+++ globus_common-10.2/library/Makefile.am	2008-07-14 17:33:08.000000000 +0200
@@ -143,7 +143,7 @@
 
 libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@
 libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
-libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@
+libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@
 
 EXTRA_DIST = \
 	globus_callback_nothreads.c \

globus-common-usr.patch:

--- NEW FILE globus-common-usr.patch ---
diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
--- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -9,7 +9,7 @@
 	config \
 	doxygen
 
-sbin_SCRIPTS= \
+libexec_SCRIPTS= \
 	config.guess
 
 EXTRA_DIST = \
diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
--- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
@@ -17,7 +17,11 @@
 # 
 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 # This was done by the script initializer before V2.0
diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
--- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
@@ -43,7 +43,11 @@
 
 usage()
 {
-    . ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+    fi
     globus_source ${libexecdir}/globus-sh-tools.sh
 
     ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
@@ -3,7 +3,7 @@
 if ENABLE_PROGRAMS
 bin_SCRIPTS = globus-sh-exec globus-version
 
-libexec_PROGRAMS = globus-libc-hostname globus-is-local-user
+sbin_PROGRAMS = globus-libc-hostname globus-is-local-user
 
 EXTRA_DIST = globus-sh-exec.in globus-version.in
 
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
@@ -23,13 +23,12 @@
 # domainname
 
 
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
 fi
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-
 PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'`
 PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2`
 
@@ -67,7 +66,7 @@
 EOF
 }
 
-. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header
+. ${libexecdir}/globus-args-parser-header
 
 if [ -n "$1" ]; then
     globus_args_unrecognized_option "$1"
@@ -79,8 +78,8 @@
 if [ -z "${GLOBUS_HOSTNAME}" ] ; then
 
   # Set the _fullname based upon Globus's hostname command
-  if [ -x "${libexecdir}/globus-libc-hostname" ]; then
-    _fullname="`${libexecdir}/globus-libc-hostname`"
+  if [ -x "${sbindir}/globus-libc-hostname" ]; then
+    _fullname="`${sbindir}/globus-libc-hostname`"
   fi
 
   # if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
@@ -25,29 +25,15 @@
 
 my $gpt_path = $ENV{GPT_LOCATION};
 my $globus_path = $ENV{GLOBUS_LOCATION};
-my $gpath;
 
-if ( !defined($gpt_path) && !defined($globus_path) )
+if ( !defined($gpt_path) )
 {
-    die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script");
+    $gpt_path = "/usr";
 }
 
-if ( defined($gpt_path) )
+if ( !defined($globus_path) )
 {
-    $gpath = $gpt_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
-}
-
-if ( !defined($gpath) && defined($globus_path) )
-{
-    $gpath = $globus_path;
-    if ( ! -d $gpath )
-    {
-        die("ERROR: $gpath doesn't exist!\n");
-    }
+    $globus_path = "/usr";
 }
 
 
@@ -60,7 +46,7 @@
 #
 
 my($environment);
- at INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
+ at INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC);
 
 if ( defined eval "require Grid::GPT::V1::Package" )
 {
@@ -240,7 +226,9 @@
     # point our installation object at our globus location
     #
 
-    $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
+    $installation = -d "$globus_path/share/globus/packages" ?
+        new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") :
+        new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages");
     $installation->set_depenv('Build');
 
     #
@@ -313,10 +301,17 @@
     # push all of our entries onto our header array
     #
 
+    @INC = ("$globus_path/lib/perl", @INC);
+
+    require Globus::Core::Paths;
+    my $includedir = $Globus::Core::Paths::includedir;
+    my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+    my $libdir = $Globus::Core::Paths::libdir;
+
     push(@$header, "GLOBUS_CFLAGS=\"$cflagslist\"");
-    push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\"");
+    push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\"");
     push(@$header, "GLOBUS_LIBS=\"$libslist\"");
-    push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\"");
+    push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\"");
     push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\"");
     push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\"");
 }
@@ -332,7 +327,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") ||
+      open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") ||
+      die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n";
 
     while (<IN>)
     { 
@@ -370,7 +367,9 @@
     my($header) = @_;
     my($copy);
 
-    open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n";
+    open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") ||
+      open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") ||
+      die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n";
 
     while (<IN>) 
     {
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
--- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
@@ -15,18 +15,13 @@
 
 my $flavor;
 my $link="static";
-my $gpt=$ENV{GPT_LOCATION};
+
 my $gpath = $ENV{GPT_LOCATION};
 if (!defined($gpath))
 {
-	  $gpath = $ENV{GLOBUS_LOCATION};
-	   
-  }
-  if (!defined($gpath))
-  {
-	     die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
-     }
-      
+  $gpath = "/usr";
+}
+
      @INC = (@INC, "$gpath/lib/perl");
 
 require Grid::GPT::Dependencies;
@@ -40,20 +35,10 @@
 my $pgm_linkslist;
 my $lib_linkslist;
 
-if(!defined($gpt))
-{
-  $gpt=$ENV{GLOBUS_LOCATION};
-}
-if(!defined($gpt))
-{
-  die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n";
-}
-
 my $globus=$ENV{GLOBUS_LOCATION};
-
 if(!defined($globus))
 {
-  die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n";
+  $globus = "/usr";
 }
 
 my %hash;
@@ -102,14 +87,23 @@
 
 	assemble_link_lines($fakepkg, $flavor, $link);
 	  
+ at INC = ("$globus/lib/perl", @INC);
+
+require Globus::Core::Paths;
+my $includedir = $Globus::Core::Paths::includedir;
+my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
+my $libdir = $Globus::Core::Paths::libdir;
+
 push @temp_header,  "GLOBUS_CFLAGS=\"$cflagslist\"\n";
-push @temp_header,  "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n";
+push @temp_header,  "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n";
 push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n";
-push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n";
+push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n";
 push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n";
 push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n";
 
-open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n";
+open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") ||
+  open(IN, "$globus/libexec/globus-build-env-$flavor.sh") ||
+  die "ERROR: Cannot open globus-build-env-$flavor.sh\n";
 
 while(<IN>)
 { 
@@ -130,7 +124,9 @@
 
 #END of Section one:  prepending GLOBUS_
 close (IN);
-open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n";
+open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") ||
+  open(IN, "$globus/libexec/globus-sh-tools-vars.sh") ||
+  die "ERROR: Cannot open globus-sh-tools-vars.sh\n";
 while(<IN>) 
 {
 	if(m!\S!)  
diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
--- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
@@ -18,7 +18,11 @@
 
 if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
     
-    . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh
+    if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh
+    else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh
+    fi
     
     # export all commands:
 


--- NEW FILE globus-common.spec ---
Name:		globus-common
%global _name %(tr - _ <<< %{name})
Version:	10.2
%global setupversion 2.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
#		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
#		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
Source1:	%{_name}_setup-%{setupversion}.tar.gz
Source8:	epstopdf-2.9.5gw
Source9:	GLOBUS_LICENSE
#		Environment variable elimination patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
Patch0:		%{name}-usr.patch
#		Segfault fix patch:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6460
Patch1:		%{name}-no-pthread-exceptions.patch
#		Allow plugins without the flavor extension in the name:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6461
Patch2:		%{name}-noflavext.patch
#		Remove bogus inter-package dependency:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6462
Patch3:		%{name}-deps.patch
#		Fixes a stupid typo in library/Makefile.am:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6463
Patch4:		%{name}-typo.patch
#		The file globus_netos_dir.h does not exist:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6464
Patch5:		%{name}-nosuchfile.patch
#		Doxygen warning fix:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6465
Patch6:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6466
Patch7:		%{name}-bad-age.patch
#		Extradist should not be conditional:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6576
Patch8:		%{name}-extradist.patch
#		Check for function removed from newer versions of libltdl:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6578
Patch9:		%{name}-ltdlmutex.patch
#		Configure options not propagated in globus common setup:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
Patch10:	%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Common Library Programs
Group:		Applications/Internet
Provides:	%{name}-setup = %{setupversion}
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool >= 1
Requires:	globus-common-progs >= 3
Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%if %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
%endif

%package devel
Summary:	Globus Toolkit - Common Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-core >= 4
Requires:	pkgconfig

%package doc
Summary:	Globus Toolkit - Common Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

%description
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name} package contains:
Common Library

%description progs
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-progs package contains:
Common Library Programs
Common Setup

%description devel
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-devel package contains:
Common Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.

The %{name}-doc package contains:
Common Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1 -b .usr
%patch1 -p1 -b .segfault
%patch2 -p1 -b .noflavext
%patch3 -p1 -b .deps
%patch4 -p1 -b .typo
%patch5 -p1 -b .nofile
%patch6 -p1 -b .doxygen
%patch7 -p1 -b .age
%patch8 -p1 -b .extradist
%patch9 -p1 -b .ltdlmutex
cd %{_name}_setup-%{setupversion}
%patch10 -p1 -b .setup
cd -

# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Grid::GPT::.*)/d'
EOF
%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
chmod +x %{__perl_requires}

# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
  mv $f.new $f
done

sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in

/usr/share/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

# setup package
cd %{_name}_setup-%{setupversion}

rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

/usr/share/globus/globus-bootstrap.sh

%configure --without-flavor --with-secure-tmpdir=/var/tmp

make %{?_smp_mflags}

cd -

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# Remove libtool archives (.la files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.la$' < $l > $l.new
  mv $l.new $l
done

# Remove static libraries (.a files)
test -d $RPM_BUILD_ROOT%{_libdir} && \
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;

for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
  grep -v 'lib.*\.a$' < $l > $l.new
  mv $l.new $l
done

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move globus-makefile-header to devel package
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep globus-makefile-header >> \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | grep -v globus-makefile-header > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
  sed 's/P\.RS/P\n.RS/' < $f > $f.new
  mv $f.new $f
done

rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | grep -v 'deprecated\.3' \
  | grep -v '_%{_name}-%{version}_.*\.3' > \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
    $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed 's!/man/.*!&*!' \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post progs
cd %{_datadir}/globus/setup
./findshelltools > /dev/null
cp -p globus-sh-tools-vars.sh ..
rm -f config.log config.status

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}_setup
%dir %{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/packages/setup/%{_name}_setup
%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
%dir %{_datadir}/globus/setup
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
%ghost %{_datadir}/globus/setup/globus-sh-tools-vars.sh
%ghost %{_datadir}/globus/globus-sh-tools-vars.sh

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%dir %{_includedir}/globus
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
- Change defines to globals

* Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
- Make comment about source retieval more explicit

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.4
- Add s390x to the list of 64 bit platforms
- Move globus-makefile-header to devel package

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-common-10_2-1_fc9:F-10:globus-common-10.2-1.fc9.src.rpm:1239093082


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:15:32 -0000	1.1
+++ .cvsignore	7 Apr 2009 08:31:53 -0000	1.2
@@ -0,0 +1,4 @@
+GLOBUS_LICENSE
+epstopdf-2.9.5gw
+globus_common-10.2.tar.gz
+globus_common_setup-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:15:32 -0000	1.1
+++ sources	7 Apr 2009 08:31:54 -0000	1.2
@@ -0,0 +1,4 @@
+2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
+7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz



From sharkcz at fedoraproject.org  Tue Apr  7 08:03:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  7 Apr 2009 08:03:09 +0000 (UTC)
Subject: rpms/s390utils/devel 0001-s390-tools-1.5.0-su.patch, NONE,
	1.1 0002-s390-tools-1.5.0-fdasd-raid.patch, NONE,
	1.1 0003-s390-tools-1.5.0-fmtpercentage.patch, NONE,
	1.1 0004-s390-tools-1.8.0-automenu.patch, NONE,
	1.1 0005-s390-tools-1.5.3-lvm.patch, NONE,
	1.1 0006-s390-tools-1.5.3-dumpconf-vmlinuz.patch, NONE,
	1.1 0007-s390-tools-1.5.3-zipl-zfcpdump-2.patch, NONE,
	1.1 0008-s390-tools-1.8.0-zipl-timeout.patch, NONE,
	1.1 0009-s390-tools-1.8.0-zipl-target.patch, NONE,
	1.1 0010-s390-tools-1.5.3-zipl-zfcpdump-man.patch, NONE,
	1.1 0011-s390-tools-1.5.3-fdasd-raid.patch, NONE,
	1.1 0012-s390-tools-1.8.0-initscript-fix.patch, NONE,
	1.1 0013-s390-tools-1.8.0-cflags.patch, NONE,
	1.1 cmsfs-1.1.8-kernel26.patch, NONE,
	1.1 cmsfs-1.1.8-warnings.patch, NONE, 1.1 dasd.udev, NONE,
	1.1 s390.csh, NONE, 1.1 s390.sh, NONE, 1.1 s390utils.spec, NONE,
	1.1 src_vipa-2.0.4-locations.patch, NONE, 1.1 zfcp.udev, NONE,
	1.1 zfcpconf.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407080309.C8BB670100@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10970

Modified Files:
	.cvsignore sources 
Added Files:
	0001-s390-tools-1.5.0-su.patch 
	0002-s390-tools-1.5.0-fdasd-raid.patch 
	0003-s390-tools-1.5.0-fmtpercentage.patch 
	0004-s390-tools-1.8.0-automenu.patch 
	0005-s390-tools-1.5.3-lvm.patch 
	0006-s390-tools-1.5.3-dumpconf-vmlinuz.patch 
	0007-s390-tools-1.5.3-zipl-zfcpdump-2.patch 
	0008-s390-tools-1.8.0-zipl-timeout.patch 
	0009-s390-tools-1.8.0-zipl-target.patch 
	0010-s390-tools-1.5.3-zipl-zfcpdump-man.patch 
	0011-s390-tools-1.5.3-fdasd-raid.patch 
	0012-s390-tools-1.8.0-initscript-fix.patch 
	0013-s390-tools-1.8.0-cflags.patch cmsfs-1.1.8-kernel26.patch 
	cmsfs-1.1.8-warnings.patch dasd.udev s390.csh s390.sh 
	s390utils.spec src_vipa-2.0.4-locations.patch zfcp.udev 
	zfcpconf.sh 
Log Message:
initial import

0001-s390-tools-1.5.0-su.patch:

--- NEW FILE 0001-s390-tools-1.5.0-su.patch ---
>From 118f2f03b639dd2ccfb518ceb82e89fcb1eaf024 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 19 Jul 2008 16:30:04 +0200
Subject: [PATCH] s390-tools-1.5.0-su

---
 fdasd/fdasd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index 5bec7cc..dce9ed3 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -1851,10 +1851,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
 	if (anc->verbose) printf("disk type check     : ok\n");
 
         if (dasd_info.FBA_layout != 0) {
-                snprintf(err_str, ERROR_STRING_SIZE, 
-			"%s is not formatted with z/OS compatible "
-			"disk layout!", options.device);
-                fdasd_error(anc, wrong_disk_format, err_str);
+                if(!anc->silent) {
+                    snprintf(err_str, ERROR_STRING_SIZE, 
+			    "%s is not formatted with z/OS compatible "
+			    "disk layout!", options.device);
+                    fdasd_error(anc, wrong_disk_format, err_str);
+                }
         }      
 
 	if (anc->verbose) printf("disk layout check   : ok\n");
-- 
1.6.0.6


0002-s390-tools-1.5.0-fdasd-raid.patch:

--- NEW FILE 0002-s390-tools-1.5.0-fdasd-raid.patch ---
>From b492189d95a523e9176c1dac4de0fb1216a3af14 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 19 Jul 2008 16:32:00 +0200
Subject: [PATCH] s390-tools-1.5.0-fdasd-raid

---
 fdasd/fdasd.c |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index dce9ed3..d011b69 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -214,10 +214,10 @@ fdasd_error(fdasd_anchor_t *anc, enum fdasd_failure why, char *str)
 static int
 read_line(void) 
 {
-	bzero(line_buffer, LINE_LENGTH);
 	line_ptr = line_buffer;
         if (!fgets(line_buffer, LINE_LENGTH, stdin))
 		return 0;
+	line_buffer[LINE_LENGTH-1] = 0;
 	while (*line_ptr && !isgraph(*line_ptr))
 		line_ptr++;
 	return *line_ptr;
@@ -278,6 +278,8 @@ fdasd_partition_type (char *str)
 		strcpy(str, "Linux native");
 	else if (strncmp("SWAP  ", str, 6) == 0)
 		strcpy(str, "Linux swap");
+	else if (strncmp("RAID  ", str, 6) == 0)
+		strcpy(str, "Linux Raid");
 	else
 		strcpy(str, "unknown");
 
@@ -1062,6 +1064,7 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, s2, 31);
 		}
 		else {
+			char str[20];
 			char *tmp = strstr(ch, "SWAP");
 
 			/* create a new data set name */
@@ -1069,7 +1072,15 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 				k++;
 
 			setpos(anc, k, i-1);
-			
+
+			strncpy(s2, ch, 44);
+			s2[44]=0;
+			vtoc_ebcdic_dec(s2, s2, 44);
+			c2 = strstr(s2, "PART");
+			if (c2 != NULL) strncpy(str, c2+=9, 6);
+			str[6] = '\0';
+			fdasd_partition_type(str);
+
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
 
@@ -1087,8 +1098,16 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			c1 += 4;
 			if (tmp)
 				strncpy(c1, ".SWAP", 5);
-			else
-				strncpy(c1, ".NATIVE", 7);
+			else {
+				if (strcmp("unknown", str) == 0) {
+					strncpy(c1, ".NATIVE", 7);
+				}
+				else {
+					strncpy(c1, ".", 1);
+					strncpy(c1+1, c2, 6);
+				}
+			}
+
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose) printf("f1 ");
@@ -1325,9 +1344,10 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
 
 	printf("current partition type is: %s\n\n", fdasd_partition_type(str));
 	printf("   1  Linux native\n" \
-	       "   2  Linux swap\n\n");
+	       "   2  Linux swap\n" \
+	       "   3  Linux raid\n\n");
 	part_type = 0;
-	while ((part_type < 1) || (part_type > 2)) {
+	while ((part_type < 1) || (part_type > 3)) {
         	while (!isdigit(part_type = 
 				read_char("new partition type: ")));
         	part_type -= 48;
@@ -1340,6 +1360,9 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
         case 2:
 		strncpy(str, "SWAP  ", 6);
                 break;
+        case 3:
+		strncpy(str, "RAID  ", 6);
+                break;
         default:
                 printf("'%d' is not supported!\n", part_type);
         }
@@ -1503,7 +1526,7 @@ fdasd_process_invalid_vtoc(fdasd_anchor_t *anc)
 static void
 fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 {
-	int f1_counter = 0, f7_counter = 0, f5_counter = 0;
+	int f1_counter = 0, f7_counter = 0, f5_counter = 0, oldfmt = 0;
 	int i, part_no, f1_size = sizeof(format1_label_t);
 	partition_info_t *part_info = anc->first;
 	format1_label_t f1_label;
@@ -1538,14 +1561,26 @@ fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 			vtoc_ebcdic_enc(part_info->f1->DS1DSNAM,
 					part_info->f1->DS1DSNAM, 44);
 
-			if ((part_no < 0) || (part_no >= USABLE_PARTITIONS))
+			/* this dasd has data set names 0000-0002
+                           but we use now 0001-0003 */
+                        if (part_no == -1)
+                                oldfmt++;
+
+			if (((oldfmt == 0) && (part_no < 0))
+			    || (part_no >= USABLE_PARTITIONS))
 				printf("WARNING: partition number (%i) found "
 				       "in data set name of an existing "
 				       "partition\ndoes not match range of "
 				       "possible partition numbers (1-%d)\n\n",
 				       part_no + 1, USABLE_PARTITIONS);
-			else
-				setpos(anc, part_no, f1_counter);
+			else {
+				if (oldfmt) /* correct +1 */ {
+					setpos(anc, part_no+1, f1_counter);
+					printf("Correcting f1 header number!\n");
+				}
+				else
+					setpos(anc, part_no, f1_counter);
+			}
 
 			part_info = part_info->next;
 			f1_counter++;
-- 
1.6.0.6


0003-s390-tools-1.5.0-fmtpercentage.patch:

--- NEW FILE 0003-s390-tools-1.5.0-fmtpercentage.patch ---
>From 6e939e7804c33e54577a6801e266bab9a8c6a24c Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 19 Jul 2008 16:32:52 +0200
Subject: [PATCH] s390-tools-1.5.0-fmtpercentage

---
 dasdfmt/dasdfmt.c |   32 +++++++++++++++++++++++++++++---
 dasdfmt/dasdfmt.h |    4 +++-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/dasdfmt/dasdfmt.c b/dasdfmt/dasdfmt.c
index 55616cc..54e8950 100644
--- a/dasdfmt/dasdfmt.c
+++ b/dasdfmt/dasdfmt.c
@@ -47,6 +47,7 @@ static void exit_usage(int exitcode)
 	       "       -V or --version  means print version\n"
 	       "       -L or --no_label means don't write disk label\n"
 	       "       -p or --progressbar means show a progress bar\n"
+	       "       -P or --percentage means show a progress bar\n"
 	       "       -m x or --hashmarks=x means show a hashmark every x "
 	       "cylinders\n"
 	       "       -v means verbose mode\n"
@@ -169,6 +170,7 @@ static void init_info(dasdfmt_info_t *info)
 	info->print_progressbar = 0;
 	info->print_hashmarks   = 0;
 	info->hashstep          = 0;
+	info->print_percentage  = 0;
 	info->force             = 0;
 	info->writenolabel      = 0;
 	info->labelspec         = 0;
@@ -550,7 +552,7 @@ static void dasdfmt_format(dasdfmt_info_t *info, struct hd_geometry *drive_geo,
 			   format_data_t *format_params)
 {
 	format_data_t format_step;
-	int j, k, cyl, tmp, p1, p2;
+	int j, k, cyl, tmp, p1, p2, p;
 
 	if (info->print_hashmarks) {
 		if ((info->hashstep < 1) || (info->hashstep > 1000)) {
@@ -609,6 +611,24 @@ static void dasdfmt_format(dasdfmt_info_t *info, struct hd_geometry *drive_geo,
 				printf("#");
 				fflush(stdout);
 			}
+                if(info->print_percentage)
+                {
+                        p2 = p1;
+                        p1 = cyl*100/drive_geo->cylinders;
+                        if (p1 != p2)
+                         {
+                                p = (k - format_params->start_unit) * 100 /
+                                    (format_params->stop_unit
+                                     - format_params->start_unit);
+                                printf("cyl %5d of %5d |  %3d%%\n",
+                                    (k - format_params->start_unit)
+                                    / drive_geo->heads,
+                                    (format_params->stop_unit
+                                     - format_params->start_unit)
+                                    / drive_geo->heads, p);
+                                fflush(stdout);
+                        }
+                }
 
 		if (k % drive_geo->heads == 0) {
 			k += drive_geo->heads;
@@ -840,11 +860,17 @@ int main(int argc,char *argv[])
 			break;
 
 		case 'p':
-			if (!info.print_hashmarks) info.print_progressbar=1;
+			if (!info.print_hashmarks && !info.print_percentage)
+				info.print_progressbar=1;
+			break;
+
+                case 'P':
+                        if (!info.print_hashmarks && !info.print_progressbar)
+                                info.print_percentage=1;
 			break;
 
 		case 'm':
-			if (!info.print_progressbar) 
+			if (!info.print_progressbar && !info.print_percentage) 
 			{
 				hashstep_str=optarg;
 				info.print_hashmarks=1;
diff --git a/dasdfmt/dasdfmt.h b/dasdfmt/dasdfmt.h
index 2dc1583..32d0803 100644
--- a/dasdfmt/dasdfmt.h
+++ b/dasdfmt/dasdfmt.h
@@ -147,7 +147,7 @@ struct hd_geometry {
 	if (*endptr) ERRMSG_EXIT(EXIT_MISUSE,"%s: " str " "    \
 	"is in invalid format\n",prog_name);}
 
-#define dasdfmt_getopt_string "b:n:l:f:d:m:hpLtyvVFk"
+#define dasdfmt_getopt_string "b:n:l:f:d:m:hpPLtyvVFk"
 
 static struct option dasdfmt_getopt_long_options[]=
 {
@@ -158,6 +158,7 @@ static struct option dasdfmt_getopt_long_options[]=
         { "force",       0, 0, 'F'},
         { "progressbar", 0, 0, 'p'},
         { "hashmarks",   1, 0, 'm'},
+	{ "percentage",  0, 0, 'P'},
         { "label",       1, 0, 'l'},
         { "devno",       1, 0, 'n'},
         { "device",      1, 0, 'f'},
@@ -192,6 +193,7 @@ typedef struct dasdfmt_info {
         int   withoutprompt;
         int   print_progressbar;
         int   print_hashmarks, hashstep;
+	int   print_percentage;
         int   force;
         int   writenolabel;
         int   labelspec;
-- 
1.6.0.6


0004-s390-tools-1.8.0-automenu.patch:

--- NEW FILE 0004-s390-tools-1.8.0-automenu.patch ---
>From 91275200e3d22d56d8722ec308617c6b3ba9911b Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 13 Mar 2009 10:33:22 +0100
Subject: [PATCH] s390-tools-1.8.0-automenu.patch

---
 zipl/man/zipl.8 |    7 +++
 zipl/src/job.c  |  162 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 zipl/src/scan.c |    4 +-
 zipl/src/zipl.c |    1 +
 4 files changed, 168 insertions(+), 6 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 8a83c01..6ebf240 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -249,6 +249,13 @@ whether they contain a dump signature or not.
 This option can only be used together with
 .BR \-\-mvdump .
 
+.TP
+.BR "\-x" " or " "\-\-no-automenu"
+Disables the automatic creation of a multiboot menu. Specifying a menu with the
+"-m <MENU>" option or a section disables this feature, too. This option was
+added for compatibility with previous versions of the multiboot version of
+zipl.
+
 .SH EXAMPLE
 1. Scenario: prepare disk for booting a Linux kernel image using the
 following parameters:
diff --git a/zipl/src/job.c b/zipl/src/job.c
index 2f69104..388e63a 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -43,6 +43,7 @@ static struct option options[] = {
 	{ "version",		no_argument,		NULL, 'v'},
 	{ "verbose",		no_argument,		NULL, 'V'},
 	{ "add-files",		no_argument,		NULL, 'a'},
+	{ "no-automenu",        no_argument,            NULL, 'x'},
 	{ "tape",		required_argument,	NULL, 'T'},
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ "force",		no_argument,		NULL, 'f'},
@@ -50,7 +51,7 @@ static struct option options[] = {
 };
 
 /* Command line option abbreviations */
-static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaT:f";
+static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaxT:f";
 
 struct command_line {
 	char* data[SCAN_KEYWORD_NUM];
@@ -62,11 +63,14 @@ struct command_line {
 	int version;
 	int verbose;
 	int add_files;
+	int automenu;
 	int dry_run;
 	int force;
 	enum scan_section_type type;
 };
 
+/* Global variable for default boot target. Ugly but necessary... */
+static char *default_target;
 
 static int
 store_option(struct command_line* cmdline, enum scan_keyword_id keyword,
@@ -92,6 +96,7 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	int i;
 
 	memset((void *) &cmdline, 0, sizeof(struct command_line));
+	cmdline.automenu = 1;
 	cmdline.type = section_invalid;
 	is_keyword = 0;
 	/* Process options */
@@ -101,16 +106,22 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		switch (opt) {
 		case 'd':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumpto,
 					  optarg);
 			break;
 		case 'D':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumptofs,
 					  optarg);
 			break;
 		case 'M':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_mvdump,
 					  optarg);
 #ifndef __s390x__
@@ -121,35 +132,49 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 			break;
 		case 'i':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_image,
 					  optarg);
 			break;
 		case 'P':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parameters,
 					  optarg);
 			break;
 		case 'p':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parmfile,
 					  optarg);
 			break;
 		case 'r':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_ramdisk,
 					  optarg);
 			break;
 		case 's':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_segment,
 					  optarg);
 			break;
 		case 't':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_target,
 					  optarg);
 			break;
 		case 'T':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_tape,
 					  optarg);
 			break;
@@ -190,6 +215,10 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		case 'f':
 			cmdline.force = 1;
 			break;
+		case 'x':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -214,6 +243,10 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	if (cmdline.help || cmdline.version) {
 		/* Always accept --help and --version */
 	} else if ((cmdline.menu != NULL) || (cmdline.section != NULL)) {
+		/* If either menu or section has been selected disable
+		   automenu generation */
+		cmdline.automenu = 0;
+		scan_key_table[1][8] = req;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -832,7 +865,14 @@ get_job_from_section_data(char* data[], struct job_data* job, char* section)
 		/* IPL job */
 		job->id = job_ipl;
 		/* Fill in name of bootmap directory */
-		job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
+		if (data[(int) scan_keyword_target] == NULL) {
+			if (default_target == NULL) {
+				error_text("Unable to find default section in your config file.");
+				break;
+			}
+			job->bootmap_dir = misc_strdup(default_target);
+		} else
+			job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
 		if (job->bootmap_dir == NULL)
 			return -1;
 		/* Fill in name and address of image file */
@@ -1102,6 +1142,8 @@ get_menu_job(struct scan_token* scan, char* menu, struct job_data* job)
 		if (temp_job == NULL)
 			return -1;
 		memset((void *) temp_job, 0, sizeof(struct job_data));
+		if (data[(int) scan_keyword_target] == NULL)
+			data[(int) scan_keyword_target] = misc_strdup(job->bootmap_dir);
 		rc = get_job_from_section_data(data, temp_job,
 					job->data.menu.entry[current].name);
 		if (rc) {
@@ -1268,10 +1310,109 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 }
 
 
+/* Create a fake menu to simulate the old s390utils-1.1.7 multiboot
+ * behaviour. */
+static struct scan_token *
+create_fake_menu(struct scan_token *scan)
+{
+	int i, j, pos, numsec, size, defaultpos;
+	char *name;
+	char *target;
+	char *seclist[1024];
+	char *defaultsection;
+	char buf[1024];
+	struct scan_token *tmp;
+
+	/* Count # of sections */
+	numsec = 0;
+	name = NULL;
+	target = NULL;
+	for (i = 0; (int) scan[i].id != 0; i++) {
+		if (scan[i].id == scan_id_section_heading) {
+			name = scan[i].content.section.name;
+			if (strcmp(DEFAULTBOOT_SECTION, name))
+				seclist[numsec++] = name;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    (scan[i].content.keyword.keyword == scan_keyword_dumpto ||
+		     scan[i].content.keyword.keyword == scan_keyword_dumptofs)) {
+			numsec--;
+			continue;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_target &&
+		    !strcmp(DEFAULTBOOT_SECTION, name))
+			target = scan[i].content.keyword.value;
+	}
+	get_default_section(scan, &defaultsection, &j);
+
+	if (defaultsection == NULL) {
+		error_text("Unable to find default section in your config file.");
+		return NULL;
+	}
+
+	if (target == NULL) {
+		error_text("Keyword target is missing in default section.");
+		return NULL;
+	}
+
+	default_target = misc_strdup(target);
+
+	size = i+6+numsec;
+	tmp = (struct scan_token *) misc_malloc(size * sizeof(struct scan_token));
+	if (tmp == NULL) {
+		error_text("Couldn't allocate memory for menu entries");
+		return NULL;
+	}
+
+	memset(tmp, 0, size * sizeof(struct scan_token));
+	memcpy(tmp, scan, i * sizeof(struct scan_token)); 
+	free(scan);
+	scan = tmp;
+
+	defaultpos = 0;
+	for (j = 0; j < numsec; j++) {
+		if (!strcmp(defaultsection, seclist[j]))
+			defaultpos = j+1;
+	}
+
+	snprintf(buf, 1024, "%d", defaultpos);
+
+	scan[i].id = scan_id_menu_heading;
+	scan[i].line = i;
+	scan[i++].content.menu.name = misc_strdup("rh-automatic-menu");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_target;
+	scan[i++].content.keyword.value = misc_strdup(target);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_default;
+	scan[i++].content.keyword.value = misc_strdup(buf);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_prompt;
+	scan[i++].content.keyword.value = misc_strdup("1");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_timeout;
+	scan[i++].content.keyword.value = misc_strdup("15");
+
+	pos = i;
+	for (i = 0; i<numsec; i++) {
+		scan[pos].id = scan_id_number_assignment;
+		scan[pos].line = pos;
+		scan[pos].content.number.number = i+1;
+		scan[pos++].content.number.value = misc_strdup(seclist[i]);
+	}
+
+	return scan;
+}
+
 static int
 get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 {
-	struct scan_token* scan;
+	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
 	int rc;
@@ -1303,9 +1444,22 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
+
+	if (cmdline->automenu) {
+		nscan = create_fake_menu(scan);
+		if (nscan == NULL) {
+			scan_free(scan);
+			return -1;
+		}
+		scan = nscan;
+	}
+
 	/* Get job from config file data */
-	if (cmdline->menu != NULL)
+	if (cmdline->menu != NULL || cmdline->automenu) {
+		if (cmdline->automenu)
+			cmdline->menu = misc_strdup("rh-automatic-menu");
 		rc = get_menu_job(scan, cmdline->menu, job);
+	}
 	else {
 		rc = get_section_job(scan, cmdline->section, job,
 				cmdline->data[(int) scan_keyword_parameters]);
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
index 9948092..7227a33 100644
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -33,9 +33,9 @@ enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, inv, opt, inv, inv},
 /* ipl		*/
-	{inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
+	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv, inv},
 /* segment load */
 	{inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
 /* part dump	*/
diff --git a/zipl/src/zipl.c b/zipl/src/zipl.c
index e466e34..9dfb469 100644
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -71,6 +71,7 @@ static const char* usage_text[] = {
 "-n, --noninteractive            Answer all confirmation questions with 'yes'",
 "-V, --verbose                   Provide more verbose output",
 "-a, --add-files                 Add all referenced files to bootmap file",
+"-x, --no-automenu               Don't autogenerate multiboot menu",
 "    --dry-run                   Simulate run but don't modify IPL records"
 };
 
-- 
1.6.0.6


0005-s390-tools-1.5.3-lvm.patch:

--- NEW FILE 0005-s390-tools-1.5.3-lvm.patch ---
>From 1e1e66f65675343567b47406ceb4d4ff50a25dce Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:14:30 +0200
Subject: [PATCH] s390-tools-1.5.3-lvm

---
 fdasd/fdasd.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index d011b69..9101c01 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -280,6 +280,8 @@ fdasd_partition_type (char *str)
 		strcpy(str, "Linux swap");
 	else if (strncmp("RAID  ", str, 6) == 0)
 		strcpy(str, "Linux Raid");
+	else if (strncmp("LVM   ", str, 6) == 0)
+		strcpy(str, "Linux LVM");
 	else
 		strcpy(str, "unknown");
 
-- 
1.6.0.6


0006-s390-tools-1.5.3-dumpconf-vmlinuz.patch:

--- NEW FILE 0006-s390-tools-1.5.3-dumpconf-vmlinuz.patch ---
>From 52473d7292d58ec0343123ee10b1005d9ff62d37 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:22:48 +0200
Subject: [PATCH] s390-tools-1.5.3-dumpconf-vmlinuz

---
 etc/init.d/dumpconf |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 etc/init.d/dumpconf

diff --git a/etc/init.d/dumpconf b/etc/init.d/dumpconf
old mode 100755
new mode 100644
index 17a7c29..1f719f5
--- a/etc/init.d/dumpconf
+++ b/etc/init.d/dumpconf
@@ -287,6 +287,13 @@ status_vmcmd()
 
 start()
 {
+	# create zfcp dump symlink
+	if [ -f /boot/vmlinuz-`uname -r`kdump ]; then
+		ln -sf /boot/vmlinuz-`uname -r`kdump /boot/zfcpdump
+	else
+		rm -f /boot/zfcpdump
+	fi
+	
 	if [ "$ON_PANIC" == "" ]; then
 		ON_PANIC="stop"
 	fi
-- 
1.6.0.6


0007-s390-tools-1.5.3-zipl-zfcpdump-2.patch:

--- NEW FILE 0007-s390-tools-1.5.3-zipl-zfcpdump-2.patch ---
>From 1536e0140cbce3c8837478cfc25ea45dc3681cce Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:24:05 +0200
Subject: [PATCH] s390-tools-1.5.3-zipl-zfcpdump-2

---
 common.mak |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index 62c17e2..3acb534 100644
--- a/common.mak
+++ b/common.mak
@@ -38,8 +38,8 @@ GROUP		= $(shell id -gn)
 export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
-ZFCPDUMP_IMAGE  = zfcpdump.image
+ZFCPDUMP_DIR    = /boot
+ZFCPDUMP_IMAGE  = zfcpdump
 ZFCPDUMP_RD     = zfcpdump.rd
 export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
 endif
-- 
1.6.0.6


0008-s390-tools-1.8.0-zipl-timeout.patch:

--- NEW FILE 0008-s390-tools-1.8.0-zipl-timeout.patch ---
>From a43e6e889fe44cae8a4da73ac3d81c1389fee905 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 13 Mar 2009 10:34:50 +0100
Subject: [PATCH] s390-tools-1.8.0-zipl-timeout

---
 zipl/src/job.c  |   11 ++++++++++-
 zipl/src/scan.c |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/zipl/src/job.c b/zipl/src/job.c
index 388e63a..fe3286e 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -1318,6 +1318,7 @@ create_fake_menu(struct scan_token *scan)
 	int i, j, pos, numsec, size, defaultpos;
 	char *name;
 	char *target;
+	char *timeout;
 	char *seclist[1024];
 	char *defaultsection;
 	char buf[1024];
@@ -1327,6 +1328,7 @@ create_fake_menu(struct scan_token *scan)
 	numsec = 0;
 	name = NULL;
 	target = NULL;
+	timeout = NULL;
 	for (i = 0; (int) scan[i].id != 0; i++) {
 		if (scan[i].id == scan_id_section_heading) {
 			name = scan[i].content.section.name;
@@ -1343,6 +1345,10 @@ create_fake_menu(struct scan_token *scan)
 		    scan[i].content.keyword.keyword == scan_keyword_target &&
 		    !strcmp(DEFAULTBOOT_SECTION, name))
 			target = scan[i].content.keyword.value;
+
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_timeout)
+			timeout = scan[i].content.keyword.value;
 	}
 	get_default_section(scan, &defaultsection, &j);
 
@@ -1396,7 +1402,10 @@ create_fake_menu(struct scan_token *scan)
 	scan[i].id = scan_id_keyword_assignment;
 	scan[i].line = i;
 	scan[i].content.keyword.keyword = scan_keyword_timeout;
-	scan[i++].content.keyword.value = misc_strdup("15");
+	if (timeout)
+		scan[i++].content.keyword.value = misc_strdup(timeout);
+	else
+		scan[i++].content.keyword.value = misc_strdup("15");
 
 	pos = i;
 	for (i = 0; i<numsec; i++) {
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
index 7227a33..caca3cf 100644
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -33,7 +33,7 @@ enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, inv, opt, inv, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, opt, opt, inv, inv},
 /* ipl		*/
 	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv, inv},
 /* segment load */
-- 
1.6.0.6


0009-s390-tools-1.8.0-zipl-target.patch:

--- NEW FILE 0009-s390-tools-1.8.0-zipl-target.patch ---
>From a4d2366cc716f8ce3f159fd8e8b585b04b7a5924 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 13 Mar 2009 10:35:14 +0100
Subject: [PATCH] s390-tools-1.8.0-zipl-target

---
 zipl/src/job.c |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/zipl/src/job.c b/zipl/src/job.c
index fe3286e..3be5520 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -246,7 +246,6 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		/* If either menu or section has been selected disable
 		   automenu generation */
 		cmdline.automenu = 0;
-		scan_key_table[1][8] = req;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -1226,19 +1225,35 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 {
 	char* data[SCAN_KEYWORD_NUM];
 	char* buffer;
+	char* default_section;
 	int rc;
 	int i;
 
+	rc = get_default_section(scan, &default_section, &i);
+	if (rc)
+		return rc;
 	if (section == NULL) {
-		rc = get_default_section(scan, &section, &i);
-		if (rc)
-			return rc;
+		section = default_section;
 		if (i) {
 			/* 'defaultmenu' was specified */
 			rc = get_menu_job(scan, section, job);
 			return rc;
 		}
 	}
+	else
+	{
+		char* name = NULL;
+		
+		for (i = 0; (int) scan[i].id != 0; i++) {
+			if (scan[i].id == scan_id_section_heading) {
+				name = scan[i].content.section.name;
+			}
+			if (scan[i].id == scan_id_keyword_assignment &&
+			    scan[i].content.keyword.keyword == scan_keyword_target &&
+			    !strcmp(DEFAULTBOOT_SECTION, name))
+				default_target = misc_strdup(scan[i].content.keyword.value);
+		}
+	}
 	if (strcmp(section, DEFAULTBOOT_SECTION) == 0) {
 		error_reason("Special section '" DEFAULTBOOT_SECTION "' cannot "
 			     "be used as target section");
-- 
1.6.0.6


0010-s390-tools-1.5.3-zipl-zfcpdump-man.patch:

--- NEW FILE 0010-s390-tools-1.5.3-zipl-zfcpdump-man.patch ---
>From eedf33ef46224a67e09c38ee58c57f3dd8d9acf8 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:26:13 +0200
Subject: [PATCH] s390-tools-1.5.3-zipl-zfcpdump-man

---
 zipl/man/zipl.8 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 6ebf240..8d2b42c 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -198,6 +198,10 @@ larger than any single ECKD DASD partition could hold.
 It is not possible to specify both this parameter and the name of a menu
 or configuration section on the command line at the same time.
 
+Note that before using this option the "kernel-kdump" rpm has to be installed
+and the dumpconf service script has to be started using
+"service dumpconf start".
+
 .TP
 .BR "\-m <MENU>" " or " "--menu=<MENU>"
 Install the multi-boot configuration defined in menu section <MENU> of the
-- 
1.6.0.6


0011-s390-tools-1.5.3-fdasd-raid.patch:

--- NEW FILE 0011-s390-tools-1.5.3-fdasd-raid.patch ---
>From 1fc8467cdb52feb751a711c304ef0fc88ec82155 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Fri, 25 Jul 2008 13:57:00 +0200
Subject: [PATCH] s390-tools-1.5.3-fdasd-raid

---
 fdasd/fdasd.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index 9101c01..f63ce5a 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -1068,6 +1068,7 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 		else {
 			char str[20];
 			char *tmp = strstr(ch, "SWAP");
+			char *tmp1 = strstr(ch, "RAID");
 
 			/* create a new data set name */
 			while (getpos(anc, k) > -1)
@@ -1098,9 +1099,12 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, dsno, 4);
 
 			c1 += 4;
-			if (tmp)
-				strncpy(c1, ".SWAP", 5);
-			else {
+			if (tmp || tmp1) {
+				if (tmp)
+					strncpy(c1, ".SWAP", 5);
+				if (tmp1)
+					strncpy(c1, ".RAID", 5);
+			} else {
 				if (strcmp("unknown", str) == 0) {
 					strncpy(c1, ".NATIVE", 7);
 				}
-- 
1.6.0.6


0012-s390-tools-1.8.0-initscript-fix.patch:

--- NEW FILE 0012-s390-tools-1.8.0-initscript-fix.patch ---
>From 6235108700462cc4b425ae7a697915f8147f46c3 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 13 Mar 2009 10:37:36 +0100
Subject: [PATCH] s390-tools-1.8.0-initscript-fix

---
 etc/init.d/cpuplugd  |   21 +++++++++++++++------
 etc/init.d/dumpconf  |    9 ++++++---
 etc/init.d/mon_statd |   31 ++++++++++++++++++++++---------
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/etc/init.d/cpuplugd b/etc/init.d/cpuplugd
index f8df06b..cbd5f90 100755
--- a/etc/init.d/cpuplugd
+++ b/etc/init.d/cpuplugd
@@ -1,16 +1,18 @@
 #!/bin/bash
 ### BEGIN INIT INFO
 # Provides: cpuplugd
-# Required-Start: $remote_fs
-# Required-Stop: $remote_fs
-# Default-Start:  1 2 3 4 5
-# Default-Stop: 0 6
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Start the cpu hotplug daemon for Linux on System z
 # Description: Starts the cpuplugd. It uses the configuration
 #              file /etc/sysconfig/cpuplugd
 ### END INIT INFO
 
-# chkconfig: 12345 01 99
+# chkconfig: - 01 99
 
 DAEMON=cpuplugd
 DAEMON_PATH=/usr/sbin/cpuplugd
@@ -26,7 +28,13 @@ start()
 {
 	if [ ! -f $RUN_PID_FILE ]; then
 		echo -n $"Starting $DAEMON:"
-		$DAEMON_PATH $OPTIONS && log_success_msg || log_failure_msg
+		$DAEMON_PATH $OPTIONS
+		if [ $? == "0" ]; then
+			touch /var/lock/subsys/cpuplugd
+			log_success_msg
+		else
+			log_failure_msg
+		fi
 		echo
 	else
 		echo "$DAEMON (pid $(cat $RUN_PID_FILE)) is already running..."
@@ -41,6 +49,7 @@ stop()
 		killproc $DAEMON_PATH -TERM
 		log_success_msg
 		rm -f $RUN_PID_FILE
+		rm -f /var/lock/subsys/cpuplugd
 	else
 		log_failure_msg
 	fi
diff --git a/etc/init.d/dumpconf b/etc/init.d/dumpconf
index 1f719f5..3935582 100644
--- a/etc/init.d/dumpconf
+++ b/etc/init.d/dumpconf
@@ -3,14 +3,14 @@
 # Provides: dumpconf
 # Required-Start: $local_fs
 # Required-Stop: $local_fs
-# Default-Start:  1 2 3 4 5
-# Default-Stop: 0 6
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Configure s390 dump feature
 # Description: Configures the s390 dump feature. It uses the configuration file
 #              /etc/sysconfig/dumpconf
 ### END INIT INFO
 
-# chkconfig: 12345 01 99
+# chkconfig: - 01 99
 
 DUMP_CONFIG_FILE=/etc/sysconfig/dumpconf
 
@@ -320,6 +320,8 @@ start()
 		echo stop > $ON_PANIC_CONFIG_FILE
 		echo "ERROR: $ERRMSG Check $DUMP_CONFIG_FILE!" >&2
 		return $RETVAL
+	else
+		touch /var/lock/subsys/dumpconf
 	fi
 
 	return $RETVAL
@@ -334,6 +336,7 @@ stop()
 	else
 		echo "Disabling dump on panic failed" >&2
 	fi
+	rm -f /var/lock/subsys/dumpconf
 	return $RETVAL
 }
 
diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd
index 18f920b..fe1e0e4 100755
--- a/etc/init.d/mon_statd
+++ b/etc/init.d/mon_statd
@@ -1,16 +1,18 @@
 #!/bin/bash
 ### BEGIN INIT INFO
 # Provides: mon_statd
-# Required-Start: $remote_fs
-# Required-Stop: $remote_fs
-# Default-Start:  1 2 3 4 5
-# Default-Stop: 0 6
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Configure the mon_fsstatd and mon_procd daemons.
 # Description: Configures the mon_fsstatd and mon_procd daemons. It uses the
 #              configuration file /etc/sysconfig/mon_statd.
 ### END INIT INFO
 
-# chkconfig: 12345 01 99
+# chkconfig: - 01 99
 
 DAEMON=mon_statd
 FSSTATD=mon_fsstatd
@@ -45,16 +47,26 @@ start()
 
 	if [ ! -f $FSSTATD_PID_FILE -a "$FSSTAT" = "yes" ]; then
 		echo -n $"Starting $FSSTATD:"
-		$FSSTATD_PATH -i $FSSTAT_INTERVAL && log_success_msg ||
-						     log_failure_msg
+		$FSSTATD_PATH -i $FSSTAT_INTERVAL
+		if [ $? == 0 ]; then
+			touch /var/lock/subsys/mon_statd
+			log_success_msg
+		else
+			log_failure_msg
+		fi
 	elif [ "$FSSTAT" = "yes" ]; then
 		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE)) is already running..."
 	fi
 
 	if [ ! -f $PROCD_PID_FILE -a "$PROC" = "yes" ]; then
 		echo -n $"Starting $PROCD:"
-		$PROCD_PATH -i $PROC_INTERVAL && log_success_msg ||
-						 log_failure_msg
+		$PROCD_PATH -i $PROC_INTERVAL
+		if [ $? == 0 ]; then
+			touch /var/lock/subsys/mon_statd
+			log_success_msg
+		else
+			log_failure_msg
+		fi
 	elif [ "$PROC" = "yes" ]; then
 		echo "$PROCD (pid $(cat $PROCD_PID_FILE)) is already running..."
 	fi
@@ -80,6 +92,7 @@ stop()
 	else
 		log_failure_msg
 	fi
+	rm -f /var/lock/subsys/mon_statd
 	echo
 }
 
-- 
1.6.0.6


0013-s390-tools-1.8.0-cflags.patch:

--- NEW FILE 0013-s390-tools-1.8.0-cflags.patch ---
>From a6ca2114c948a71c0bb5c9a5e7d0392315f1cefd Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 25 Mar 2009 08:56:38 +0100
Subject: [PATCH] allow override of default optimization level

---
 common.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common.mak b/common.mak
index 3acb534..0aff3ba 100644
--- a/common.mak
+++ b/common.mak
@@ -22,7 +22,7 @@ STRIP           = $(CROSS_COMPILE)strip
 OBJCOPY         = $(CROSS_COMPILE)objcopy
 OBJDUMP         = $(CROSS_COMPILE)objdump
 INSTALL         = install # FIXME: We need s390-install (strip)
-CFLAGS		= $(OPT_FLAGS) -Wall -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
+CFLAGS		= -Wall -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) $(OPT_FLAGS)
 export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS
 
 # Support alternate install root
-- 
1.6.0.6


cmsfs-1.1.8-kernel26.patch:

--- NEW FILE cmsfs-1.1.8-kernel26.patch ---
diff -urN cmsfs-1.1.8/cmsfssed.sh cmsfs-1.1.8_/cmsfssed.sh
--- cmsfs-1.1.8/cmsfssed.sh	2003-02-28 17:52:59.000000000 -0500
+++ cmsfs-1.1.8_/cmsfssed.sh	2004-05-28 16:36:22.000000000 -0400
@@ -85,7 +85,7 @@
         DRIVER_SOURCE="cmsfs22x.c"
         MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
         ;;
-    2.4*|2.5*)
+    2.4*|2.5*|2.6*)
         LINUX_RELEASE="2.4"
 #       ln -s cmsfs24x.c cmsfsvfs.c
         INCLUDES="-I/lib/modules/`uname -r`/build/include"

cmsfs-1.1.8-warnings.patch:

--- NEW FILE cmsfs-1.1.8-warnings.patch ---
--- cmsfs-1.1.8/cmsfsvol.c.warnings	2003-07-18 01:38:57.000000000 +0200
+++ cmsfs-1.1.8/cmsfsvol.c	2005-09-06 16:57:15.000000000 +0200
@@ -52,7 +52,7 @@
 
     /*  print a header;  looks like CMS  */
     (void) printf("LABEL  VDEV M  STAT   CYL TYPE \
-BLKSZ   FILES  BLKS USED-(%) BLKS LEFT  BLK TOTAL\n");
+BLKSZ   FILES  BLKS USED-(%%) BLKS LEFT  BLK TOTAL\n");
 
     for (      ; i < argc ; i++)
       {


--- NEW FILE dasd.udev ---
KERNEL=="dasd*[a-z]", SUBSYSTEM=="block", PROGRAM=="/bin/sh -c 'cd /sys/block/$kernel/device;a=$$(pwd -P);echo $${a##*/}'", SYMLINK+="dasd/%c/disc"
KERNEL=="dasd*[0-9]", SUBSYSTEM=="block", PROGRAM=="/bin/sh -c 'cd /sys/block/$parent/device;a=$$(pwd -P);echo $${a##*/}'", SYMLINK+="dasd/%c/part%n"


--- NEW FILE s390.csh ---
# /etc/profile.d/s390.csh - set TERM variable

if ( `/sbin/consoletype` == "serial" ) then
    setenv TERM dumb
endif


--- NEW FILE s390.sh ---
# /etc/profile.d/s390.sh - set TERM variable

contype=`/sbin/consoletype`
if [ "$contype" == "serial" ]; then
    export TERM=dumb
fi


--- NEW FILE s390utils.spec ---
%define cmsfsver 1.1.8c
%define vipaver 2.0.4
%define hbaapiver 2.0

%{!?_initddir: %define _initddir %{_initrddir}}

Name:           s390utils
Summary:        Utilities and daemons for IBM System/z
Group:          System Environment/Base
Version:        1.8.0
Release:        5%{?dist}
Epoch:          2
License:        GPLv2 and GPLv2+ and CPL
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:  s390 s390x
URL:            http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
# http://www.ibm.com/developerworks/linux/linux390/s390-tools-%{version}.html
Source0:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-%{version}.tar.bz2
Source2:        s390.sh
Source3:        s390.csh
Source4:        http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz
Source5:        zfcpconf.sh
# http://www.ibm.com/developerworks/linux/linux390/src_vipa-%{vipaver}.html
Source6:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/src_vipa-%{vipaver}.tar.gz
Source7:        zfcp.udev
Source8:        dasd.udev
# http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
Patch1:         0001-s390-tools-1.5.0-su.patch
Patch2:         0002-s390-tools-1.5.0-fdasd-raid.patch
Patch3:         0003-s390-tools-1.5.0-fmtpercentage.patch
Patch4:         0004-s390-tools-1.8.0-automenu.patch
Patch5:         0005-s390-tools-1.5.3-lvm.patch
Patch6:         0006-s390-tools-1.5.3-dumpconf-vmlinuz.patch
Patch7:         0007-s390-tools-1.5.3-zipl-zfcpdump-2.patch
Patch8:         0008-s390-tools-1.8.0-zipl-timeout.patch
Patch9:         0009-s390-tools-1.8.0-zipl-target.patch
Patch10:        0010-s390-tools-1.5.3-zipl-zfcpdump-man.patch
Patch11:        0011-s390-tools-1.5.3-fdasd-raid.patch
Patch12:        0012-s390-tools-1.8.0-initscript-fix.patch
Patch13:        0013-s390-tools-1.8.0-cflags.patch
Patch100:       cmsfs-1.1.8-warnings.patch
Patch101:       cmsfs-1.1.8-kernel26.patch
Patch200:       src_vipa-2.0.4-locations.patch
Requires:       s390utils-base = %{epoch}:%{version}-%{release}
Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
Requires:       s390utils-libzfcphbaapi = %{epoch}:%{version}-%{release}
Requires:       s390utils-libzfcphbaapi-devel = %{epoch}:%{version}-%{release}
Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}


%description
This is a meta package for installing all s390-tools sub packages.
If you do not need all sub packages, it is recommended to install the
required sub packages separately.

The s390utils packages contain a set of user space utilities that should to
be used together with the zSeries (s390) Linux kernel and device drivers.

%prep
%setup -q -n s390-tools-%{version} -a 4 -a 6 -a 9

# Fix to honor the silent flag for wrongly formated disks
%patch1 -p1 -b .su

# Enhancement to add raid partiton support to dasds
%patch2 -p1 -b .fdasd-raid

# Enhancement to add a percentage output bar to dasdfmt, needed for anaconda
%patch3 -p1 -b .fmtpercentage

# Patch to maintain backwards compatibility with older zipl multiboot feature
%patch4 -p1 -b .automenu

# Patch to fix installer LVM partitions that show up as "unknown" in fdasd (#250176)
%patch5 -p1 -b .lvm

# Added zfcpdump kernel symlink to dumpconf init script (#430550)
%patch6 -p1 -b .dumpconf-vmlinuz

# Updates for cleanup SCSI dumper code for upstream integration - tool (#253118)
%patch7 -p1 -b .zipl-zfcpdump-2

# Add support for timeout parameter in /etc/zipl.conf (#323651)
%patch8 -p1 -b .zipl-timeout

# Fix for zipl fail when section is specified and target is not repeated for all sections (#381201)
%patch9 -p1 -b .zipl-target

# Update documentation for zfcpdump (#437477)
%patch10 -p1 -b .zipl-zfcpdump-man

# fix the Linux Raid partition type is not retained when changed through fdasd (#445271)
%patch11 -p1 -b .fdasd-raid

# fix init scripts of cpuplugd, dumpconf and mon_statd
%patch12 -p1 -b .initscripts-fix

# allow override of optimization level in CFLAGS
%patch13 -p1 -b .cflags

#
# cmsfs
#
pushd cmsfs-%{cmsfsver}
# Patch to fix a couple of code bugs
%patch100 -p1 -b .warnings

# build on kernel-2.6, too
%patch101 -p1 -b .cmsfs26
popd

#
# src_vipa
#
pushd src_vipa-%{vipaver}
# fix location of the library
%patch200 -p1 -b .locations
popd

# remove --strip from install
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'

pushd cmsfs-%{cmsfsver}
# cmdfs: fix encoding
iconv -f ISO8859-1 -t UTF-8 -o README.new README
touch -r README README.new
mv README.new README
# prepare docs
mv README README.cmsfs
mv CREDITS CREDITS.cmsfs
popd


pushd lib-zfcp-hbaapi-%{hbaapiver}
# lib-zfcp-hbaapi: fix perms
chmod a-x *.h AUTHORS README ChangeLog LICENSE
# update sg3_utils library name
%if 0%{?fedora} >= 10
sed -i 's/-lsgutils/-lsgutils2/g' Makefile.in
%endif
popd


%build
make OPT_FLAGS="$RPM_OPT_FLAGS"

pushd cmsfs-%{cmsfsver}
./configure
make CC="gcc $RPM_OPT_FLAGS"
popd

pushd src_vipa-%{vipaver}
make CC_FLAGS="$RPM_OPT_FLAGS -fPIC" LIBDIR=%{_libdir}
popd

pushd lib-zfcp-hbaapi-%{hbaapiver}
%configure --disable-static --enable-vendor-lib=no
make EXTRA_CFLAGS="$RPM_OPT_FLAGS"
popd

%install
rm -rf ${RPM_BUILD_ROOT}

mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,rc.d/init.d,sysconfig}}

make install \
        INSTROOT=$RPM_BUILD_ROOT \
        MANDIR=$RPM_BUILD_ROOT%{_mandir} \
        LIBDIR=${RPM_BUILD_ROOT}/%{_lib}

%{__mkdir} -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
%{__mkdir} -p ${RPM_BUILD_ROOT}%{_initddir}
%{__mkdir} -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
%{__mkdir} -p ${RPM_BUILD_ROOT}/sbin

install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT/sbin
install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-zfcp.rules
install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-dasd.rules

install -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf

install -m 644 etc/sysconfig/mon_statd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -m 755 etc/init.d/mon_statd ${RPM_BUILD_ROOT}%{_initddir}/mon_statd

install -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd

install -D -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d

install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT%{_sbindir}
install -p -m 755 cmsfs-%{cmsfsver}/cmsfslst $RPM_BUILD_ROOT%{_sbindir}
install -p -m 755 cmsfs-%{cmsfsver}/cmsfsvol $RPM_BUILD_ROOT%{_sbindir}
install -p -m 755 cmsfs-%{cmsfsver}/cmsfscp  $RPM_BUILD_ROOT%{_sbindir}
install -p -m 755 cmsfs-%{cmsfsver}/cmsfsck  $RPM_BUILD_ROOT%{_sbindir}
install -p -m 644 cmsfs-%{cmsfsver}/cmsfscat.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 cmsfs-%{cmsfsver}/cmsfslst.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 cmsfs-%{cmsfsver}/cmsfsvol.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 cmsfs-%{cmsfsver}/cmsfscp.8  $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 cmsfs-%{cmsfsver}/cmsfsck.8  $RPM_BUILD_ROOT%{_mandir}/man8

# src_vipa
pushd src_vipa-%{vipaver}
make install LIBDIR=%{_libdir} INSTROOT=$RPM_BUILD_ROOT
popd

pushd lib-zfcp-hbaapi-%{hbaapiver}
%makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/lib-zfcp-hbaapi-devel-%{hbaapiver}
# keep only html docs
rm -rf $RPM_BUILD_ROOT%{_docdir}/lib-zfcp-hbaapi-devel-%{hbaapiver}/latex
popd


%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%doc README

#
# ************************* s390-tools base package  *************************
#
%package base
# src_vipa is CPL, the rest is GPLv2 or GPLv2+
License:        GPLv2 and GPLv2+ and CPL
Summary:        S390 base tools
Group:          System Environment/Base
Requires:       perl gawk sed coreutils
Requires:       sysfsutils
Requires(pre):   chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts


%description base
s390 base tools. This collection provides the following utilities:
   * dasdfmt:
     Low-level format ECKD DASDs with the classical linux disk layout or the
     new z/OS compatible disk layout.

   * fdasd:
     Create or modify partitions on ECKD DASDs formatted with the z/OS
     compatible disk layout.

   * dasdview:
     Display DASD and VTOC information or dump the contents of a DASD to the
     console.

   * dasdinfo:
     Display unique DASD ID, either UID or volser.

   * udev rules:
     - 59-dasd.rules: rules for unique DASD device nodes created in /dev/disk/.

   * zipl:
     Make DASDs or tapes bootable for system IPL or system dump.

   * zgetdump:
     Retrieve system dumps from either tapes or DASDs.

   * qetharp:
     Read and flush the ARP cache on OSA Express network cards.

   * tape390_display:
     Display information on the message display facility of a zSeries tape
     device.

   * tape390_crypt:
     Control and query crypto settings for 3592 zSeries tape devices.

   * qethconf:
     bash shell script simplifying the usage of qeth IPA (IP address
     takeover), VIPA (Virtual IP address) and Proxy ARP.

   * dbginfo.sh:
     Shell script collecting useful information about the current system for
     debugging purposes.

   * zfcpdump:
     Dump tool to create system dumps on fibre channel attached SCSI disks.
     It is installed using the zipl command.

   * zfcpdump_v2:
     Version 2 of the zfcpdump tool. Now based on the upstream 2.6.26 Linux
     kernel.

   * ip_watcher:
     Provides HiperSockets Network Concentrator functionality.
     It looks for addresses in the HiperSockets and sets them as Proxy ARP
     on the OSA cards. It also adds routing entries for all IP addresses
     configured on active HiperSockets devices.
     Use start_hsnc.sh to start HiperSockets Network Concentrator.

   * tunedasd:
     Adjust tunable parameters on DASD devices.

   * vmconvert:
     Convert system dumps created by the z/VM VMDUMP command into dumps with
     LKCD format. These LKCD dumps can then be analyzed with the dump analysis
     tool lcrash.

   * vmcp:
     Allows Linux users to send commands to the z/VM control program (CP).
     The normal usage is to invoke vmcp with the command you want to
     execute. The response of z/VM is written to the standard output.

   * vmur:
     Allows to work with z/VM spool file queues (reader, punch, printer).

   * zfcpdbf:
     Display debug data of zfcp. zfcp provides traces via the s390 debug
     feature. Those traces are filtered with the zfcpdbf script, i.e. merge
     several traces, make it more readable etc.

   * scsi_logging_level:
     Create, get or set the logging level for the SCSI logging facility.

   * zconf:
     Set of scripts to configure and list status information of Linux for
     zSeries IO devices.
     - chccwdev: Modify generic attributes of channel attached devices.
     - lscss:    List channel subsystem devices.
     - lsdasd:   List channel attached direct access storage devices (DASD).
     - lsqeth:   List all qeth-based network devices with their corresponding
                 settings.
     - lstape:   List tape devices, both channel and FCP attached.
     - lszfcp:   Shows information contained in sysfs about zfcp adapters,
                 ports and units that are online.
     - lschp:    List information about available channel-paths.
     - chchp:    Modify channel-path state.
     - lsluns:   List available SCSI LUNs depending on adapter or port.
     - lszcrypt: Show Information about zcrypt devices and configuration.
     - chzcrypt: Modify zcrypt configuration.

   * dumpconf:
     Allows to configure the dump device used for system dump in case a kernel
     panic occurs. This tool can also be used as an init script for etc/init.d.
     Prerequisite for dumpconf is a Linux kernel with the "dump on panic"
     feature.

   * ipl_tools:
     Tools set to configure and list reipl and shutdown actions.
     - lsreipl: List information of reipl device.
     - chreipl: Change reipl device settings.
     - lsshut:  List actions which will be done in case of halt, poff, reboot
                or panic.
     - chshut:  Change actions which should be done in case of halt, poff,
                reboot or panic.

For more information refer to the following publications:
   * "Device Drivers, Features, and Commands" chapter "Useful Linux commands"
   * "Using the dump tools"

%post base
/sbin/chkconfig --add dumpconf

%preun base
if [ $1 = 0 ]; then
        # not for updates
        /sbin/service dumpconf stop > /dev/null 2>&1
        /sbin/chkconfig --del dumpconf
fi
:

%files base
%defattr(-,root,root,-)
%doc README
%doc LICENSE
/sbin/vmur
/sbin/zipl
/sbin/dasdfmt
/sbin/dasdinfo
/sbin/dasdview
/sbin/fdasd
/sbin/chccwdev
/sbin/chchp
/sbin/chzcrypt
/sbin/lschp
/sbin/lscss
/sbin/lsdasd
/sbin/lsluns
/sbin/lsqeth
/sbin/lstape
/sbin/lszcrypt
/sbin/lszfcp
/sbin/scsi_logging_level
/sbin/zfcpdbf
/sbin/qetharp
/sbin/qetharp-2.4
/sbin/qetharp-2.6
/sbin/qethconf
/sbin/tape390_display
/sbin/tape390_crypt
/sbin/tunedasd
/sbin/vmcp
/sbin/zgetdump
/sbin/dbginfo.sh
%{_sbindir}/lsreipl
%{_sbindir}/lsshut
%{_sbindir}/chreipl
%{_sbindir}/chshut
%{_sbindir}/ip_watcher.pl
%{_sbindir}/start_hsnc.sh
%{_sbindir}/xcec-bridge
%{_bindir}/vmconvert
%{_initddir}/dumpconf
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
%{_mandir}/man1/zfcpdbf.1*
%{_mandir}/man4/prandom.4*
%{_mandir}/man5/zipl.conf.5*
%{_mandir}/man8/chccwdev.8*
%{_mandir}/man8/chchp.8*
%{_mandir}/man8/chreipl.8*
%{_mandir}/man8/chshut.8*
%{_mandir}/man8/chzcrypt.8*
%{_mandir}/man8/dasdfmt.8*
%{_mandir}/man8/dasdinfo.8*
%{_mandir}/man8/dasdview.8*
%{_mandir}/man8/dumpconf.8*
%{_mandir}/man8/fdasd.8*
%{_mandir}/man8/lschp.8*
%{_mandir}/man8/lscss.8*
%{_mandir}/man8/lsdasd.8*
%{_mandir}/man8/lsluns.8*
%{_mandir}/man8/lsqeth.8*
%{_mandir}/man8/lsreipl.8*
%{_mandir}/man8/lsshut.8*
%{_mandir}/man8/lstape.8*
%{_mandir}/man8/lszcrypt.8*
%{_mandir}/man8/lszfcp.8*
%{_mandir}/man8/qetharp.8*
%{_mandir}/man8/qethconf.8*
%{_mandir}/man8/tape390_crypt.8*
%{_mandir}/man8/tape390_display.8*
%{_mandir}/man8/tunedasd.8*
%{_mandir}/man8/vmconvert.8*
%{_mandir}/man8/vmcp.8*
%{_mandir}/man8/vmur.8*
%{_mandir}/man8/zgetdump.8*
%{_mandir}/man8/zipl.8*

# Additional Redhat specific stuff
/boot/tape0
%{_sysconfdir}/profile.d/s390.csh
%{_sysconfdir}/profile.d/s390.sh
%config(noreplace) %{_sysconfdir}/udev/rules.d/56-dasd.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/56-zfcp.rules
/sbin/zfcpconf.sh

# src_vipa
%{_sbindir}/src_vipa.sh
%{_libdir}/src_vipa.so
%{_mandir}/man8/src_vipa.8.gz

#
# *********************** s390-tools osasnmpd package  ***********************
#
%package osasnmpd
License:        GPLv2+
Summary:        SNMP sub-agent for OSA-Express cards
Group:          System Environment/Daemons
Requires:       net-snmp
BuildRequires:  net-snmp-devel openssl-devel

%description osasnmpd
UCD-SNMP/NET-SNMP sub-agent implementing MIBs provided by OSA-Express
features Fast Ethernet, Gigabit Ethernet, High Speed Token Ring and
ATM Ethernet LAN Emulation in QDIO mode.

%files osasnmpd
%defattr(-,root,root,-)
%{_sbindir}/osasnmpd-2.4
%{_sbindir}/osasnmpd-2.6
%{_sbindir}/osasnmpd
%config(noreplace) %{_sysconfdir}/udev/rules.d/57-osasnmpd.rules
%{_mandir}/man8/osasnmpd.8*

#
# *********************** s390-tools mon_statd package  **********************
#
%package mon_statd
License:         GPLv2
Summary:         Monitoring daemons for Linux in z/VM
Group:           System Environment/Daemons
Requires:        redhat-lsb coreutils
Requires(pre):   chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts

%description mon_statd
Monitoring daemons for Linux in z/VM:

  - mon_fsstatd: Daemon that writes file system utilization data to the
                 z/VM monitor stream.

  - mon_procd:   Daemon that writes process information data to the z/VM
                 monitor stream.

%post mon_statd
/sbin/chkconfig --add mon_statd

%preun mon_statd
if [ $1 = 0 ]; then
        # not for updates
        /sbin/service mon_statd stop > /dev/null 2>&1
        /sbin/chkconfig --del mon_statd
fi
:

%files mon_statd
%defattr(-,root,root,-)
%{_sbindir}/mon_fsstatd
%{_sbindir}/mon_procd
%config(noreplace) %{_sysconfdir}/sysconfig/mon_statd
%{_initddir}/mon_statd
%{_mandir}/man8/mon_fsstatd.8*
%{_mandir}/man8/mon_procd.8*

#
# *********************** s390-tools cpuplugd package  ***********************
#
%package cpuplugd
License:         GPLv2+
Summary:         Daemon that manages CPU and memory resources
Group:           System Environment/Daemons
Requires:        redhat-lsb coreutils
Requires(pre):   chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts

%description cpuplugd
Daemon that manages CPU and memory resources based on a set of rules.
Depending on the workload CPUs can be enabled or disabled. The amount of
memory can be increased or decreased exploiting the CMM1 feature.

%post cpuplugd
/sbin/chkconfig --add cpuplugd

%preun cpuplugd
if [ $1 = 0 ]; then
        # not for updates
        /sbin/service cpuplugd stop > /dev/null 2>&1
        /sbin/chkconfig --del cpuplugd
fi
:

%files cpuplugd
%defattr(-,root,root,-)
%{_initddir}/cpuplugd
%config(noreplace) %{_sysconfdir}/sysconfig/cpuplugd
%{_sbindir}/cpuplugd
%{_mandir}/man5/cpuplugd.conf.5*
%{_mandir}/man8/cpuplugd.8*

#
# *********************** s390-tools ziomon package  *************************
#
%package ziomon
License:        GPLv2
Summary:        S390 ziomon tools
Group:          Applications/System
Requires:       perl lsscsi coreutils blktrace >= 1.0

%description ziomon
Tool set to collect data for zfcp performance analysis.

%files ziomon
%defattr(-,root,root,-)
/sbin/ziomon
/sbin/ziomon_fcpconf
/sbin/ziomon_mgr
/sbin/ziomon_util
/sbin/ziomon_zfcpdd
%{_mandir}/man8/ziomon.8*
%{_mandir}/man8/ziomon_fcpconf.8*
%{_mandir}/man8/ziomon_mgr.8*
%{_mandir}/man8/ziomon_util.8*
%{_mandir}/man8/ziomon_zfcpdd.8*

#
# *********************** libzfcphbaapi package  ***********************
#
%package libzfcphbaapi
License:       CPL
Summary:       ZFCP HBA API Library -- HBA API for the zfcp device driver
Group:         System Environment/Libraries
URL:           http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
BuildRequires: automake autoconf
BuildRequires: doxygen libsysfs-devel
BuildRequires: sg3_utils-devel


%description libzfcphbaapi
ZFCP HBA API Library is an implementation of FC-HBA (see www.t11.org ) for
the zfcp device driver.

%post libzfcphbaapi -p /sbin/ldconfig

%postun libzfcphbaapi -p /sbin/ldconfig

%files libzfcphbaapi
%defattr (-,root,root,-)
%doc lib-zfcp-hbaapi-%{hbaapiver}/README
%doc lib-zfcp-hbaapi-%{hbaapiver}/COPYING
%doc lib-zfcp-hbaapi-%{hbaapiver}/ChangeLog
%doc lib-zfcp-hbaapi-%{hbaapiver}/AUTHORS
%doc lib-zfcp-hbaapi-%{hbaapiver}/LICENSE
%{_libdir}/libzfcphbaapi.so.0*
%{_mandir}/man3/libzfcphbaapi.3*
%{_mandir}/man3/SupportedHBAAPIs.3*
%{_mandir}/man3/UnSupportedHBAAPIs.3*
%{_mandir}/man3/hbaapi.h.3*

#
# *********************** libzfcphbaapi-devel package  ***********************
#
%package libzfcphbaapi-devel
License:  CPL
Summary:  ZFCP HBA API Library -- Development
Group:    Development/Libraries
URL:      http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
Requires: %{name}-libzfcphbaapi = %{epoch}:%{version}-%{release}

%description libzfcphbaapi-devel
Headers, libraries and documentation for development to link against
ZFCP HBA API Library.


%files libzfcphbaapi-devel
%defattr (-,root,root,-)
%docdir %{_docdir}/lib-zfcp-hbaapi-devel-%{hbaapiver}
%{_docdir}/lib-zfcp-hbaapi-devel-%{hbaapiver}/
%{_includedir}/hbaapi.h
%{_libdir}/libzfcphbaapi.so
%exclude %{_libdir}/libzfcphbaapi.la

#
# *********************** cmsfs package  ***********************
#
%package cmsfs
License:        GPLv2
Summary:        CMS file system tools
Group:          System Environment/Base
URL:            http://www.casita.net/pub/cmsfs/cmsfs.html
# Requires:

%description cmsfs
This package contains the CMS file system tools.

%files cmsfs
%defattr(-,root,root,-)
%{_sbindir}/cmsfscat
%{_sbindir}/cmsfsck
%{_sbindir}/cmsfscp
%{_sbindir}/cmsfslst
%{_sbindir}/cmsfsvol
%{_mandir}/man8/cmsfscat.8*
%{_mandir}/man8/cmsfsck.8*
%{_mandir}/man8/cmsfscp.8*
%{_mandir}/man8/cmsfslst.8*
%{_mandir}/man8/cmsfsvol.8*


%changelog
* Wed Mar 25 2009 Dan Hor??k <dan[at]danny.cz> 2:1.8.0-5
- reword the summaries a bit
- add downloadable URLs for Sources
- fix CFLAGS usage

* Fri Mar 13 2009 Dan Hor??k <dan[at]danny.cz> 2:1.8.0-4
- next round of clean-up for compliance with Fedora

* Sun Mar  8 2009 Dan Hor??k <dan[at]danny.cz> 2:1.8.0-3
- little clean-up for compliance with Fedora

* Fri Dec 12 2008 Hans-Joachim Picht <hans at linux.vnet.ibm.com> 2:1.8.0-2
- Adapted package for F9

* Tue Dec 8 2008 Michael Holzheu <michael.holzheu at de.ibm.com> 2:1.8.0-1
- Changed spec file to create sub packages
- Updated to zfcphbaapi version 2.0

* Tue Oct 28 2008 Dan Hor??k <dan[at]danny.cz> 2:1.7.0-4
- disable build-id feature in zipl (#468017)

* Wed Sep 24 2008 Dan Hor??k <dan[at]danny.cz> 2:1.7.0-3
- drop the mon_tools patch (mon_statd service starts both mon_procd and mon_fsstatd since 1.7.0)

* Thu Aug 28 2008 Dan Hor??k <dan[at]danny.cz> 2:1.7.0-2
- preserve timestamps on installed files
- add proper handling of initscripts
- fix permissions for some files

* Tue Aug 12 2008 Dan Hor??k <dan[at]danny.cz> 2:1.7.0-1
- update to s390-tools 1.7.0, src_vipa 2.0.4 and cmsfs 1.1.8c
- rebase or drop RHEL5 patches

* Fri Jul 25 2008 Dan Hor??k <dhorak at redhat.com> 2:1.5.3-19.el5
- fix use "vmconvert" directly on the vmur device node (#439389)
- fix the Linux Raid partition type is not retained when changed through fdasd (#445271)
- include missing files into the package (#442584)
- Resolves: #439389, #445271, #442584

* Fri Jul 25 2008 Dan Hor??k <dhorak at redhat.com> 2:1.5.3-18.el5
- split the warnings patch into s390-tools and cmsfs parts
- mismatch between installed /etc/zfcp.conf and zfcpconf.sh expected format (#236016)
- dbginfo.sh exits before running all tests and drops errors (#243299)
- updates for cleanup SCSI dumper code for upstream integration - tool (#253118)
- fix segfault when using LD_PRELOAD=/usr/lib64/src_vipa.so (#282751)
- add support for timeout parameter in /etc/zipl.conf (#323651)
- fixes not listing all the dasds passed as arguments to lsdasd command (#369891)
- fix for zipl fail when section is specified and target is not repeated for all sections (#381201)
- fix for dasdview -s option fails to ignore the garbage value passed (#412951)
- update documentation for zfcpdump (#437477)
- update documentation for lsqeth (#455908)
- Resolves: #236016, #243299, #253118, #282751, #323651, #369891, #381201, #412951, #437477, #455908

* Fri Mar 28 2008 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-17.el5
- Fix error messages and proc/0 entry are not handled correctly (#438819)

* Wed Feb 06 2008 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-16.el5
- Fixed a build problem with the mon_tools patch (#253029)

* Mon Feb 04 2008 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-14.el5
- Added zfcpdump kernel symlink to dumpconf init script (#430550)

* Fri Jan 18 2008 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-13.el5
- Fix tape390_crypt query shows wrong msg 'Kernel does not support tape encryption' (#269181)

* Wed Jan 16 2008 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-12.el5
- Add System z guest file system size in Monitor APPLDATA (#253029)
- Add Dynamic CHPID reconfiguration via SCLP - tools (#253076)
- Add z/VM unit-record device driver - tools (#253078)
- Cleanup SCSI dumper code for upstream integration - tool (#253118)

* Tue Jan 08 2008 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-11.el5
- Fix installer LVM partitions that show up as "unknown" in fdasd (#250176)
- Fixed zfcpconf.sh failure if / and /usr are separated (#279201)

* Mon Sep 24 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.14
- Added missing openssl-devel buildrequires (#281361)

* Thu Aug 23 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.13
- Last updage for -t parameter patch (#202086)

* Tue Aug 14 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.12
- Fix handling of external timer interrupts (#250352)

* Tue Jul 31 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.11
- Update fix for -t parameter for image operations (#202086)

* Fri Jul 27 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.10
- Fixed udev regression from RHEL 4 with /dev/dasd/ (#208189)
- Fixed missing -d option for zgetdump (#228094)

* Thu Jun 28 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.9
- Fix optional -t parameter for image operations (#202086)

* Wed Jun 27 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.8
- Fix wrong manpage (#202250)
- Fix zfcp devices not showing up after boot (#223569)
- Fix help menu of lsqeth showing wrong file (#225159)
- Add tape encryption userspace tool (#228080)
- Add dump on panic initscript and sysconf (#228094)
- Fix a off-by-one error in zfcpdbf (#230527)
- Fix zipl aborting with floating point exception if the target specified is a logical volume (#231240)
- Fix boot menu use wrong conversion table for input on LPAR (#240399)

* Mon Jan 22 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.6
- Fixed problem with invisible zfcp devices after boot (#223569)

* Mon Jan 15 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.5
- Extended fix for automenu bug (#202086)

* Thu Jan 11 2007 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.4
- Updated dbginfo.sh patch to final fix from IBM (#214805)

* Wed Nov 29 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.3
- Fixed problem with missing debugfs for dbginfo.sh (#214805)

* Thu Nov 09 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.2
- Fixed lszfcp bug related to sysfsutils (#210515)

* Tue Nov 07 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10.el5.1
- Removed wrong additional $ in src_vipa.sh (#213395)
- Release and Buildroot specfile fixes

* Wed Sep 13 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-10
- Needed to bump release

* Tue Sep 12 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-9
- Added libsysfs requirement (#201863)
- Fixed zipl problem with missing default target for automenus (#202086)

* Thu Aug 10 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-8
- Added missing sysfsutils requirement for lszfcp (#201863)

* Tue Jul 25 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-7
- Included zfcpdbf, dbginfo.sh and the man1 manpages to package (#184812)

* Tue Jul 18 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-6
- Disabled sysfs support due to API changes in sysfs-2.0.0

* Fri Jul 14 2006 Karsten Hopp <karsten at redhat.de> 2:1.5.3-5
- buildrequire net-snmp-devel

* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-4
- rebuild
- Add missing br libsysfs-devel, indent, zlib-devel

* Wed May 17 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-1
- Made src_vipa build on current toolchain again

* Tue May 16 2006 Phil Knirsch <pknirsch at redhat.com>
- Update to s390-tools-1.5.3 from IBM
- Included vmconvert
- Dropped obsolete asm patch

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.0-2.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Mon Jan 30 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.0-2
- Fixed problem with s390-tools-1.5.0-fdasd-raid.patch
- Don't try to remove the non empty _bindir
- Some more install cleanups

* Thu Jan 26 2006 Phil Knirsch <pknirsch at redhat.com>
- Fixed some .macro errors in zipl/boot

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Thu Oct 20 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.5.0-1
- Large update from 1.3.2 to 1.5.0
- Include osasnmpd and vmcp now by default

* Tue Sep 06 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-7
- Fixed a couple of code bugs (#143808)

* Fri Jul 29 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-6
- Corrected filelist for libdir to only include *.so files

* Tue Jun 21 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-5
- Added src_vipa to s390utils

* Wed Mar 02 2005 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-4
- bump release and rebuild with gcc 4

* Tue Oct 26 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-3
- Put binaries for system recovery in /sbin again.

* Fri Oct 15 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.2-1
- Update to s390-tools-1.3.2
- Added qetharp, qethconf, ip_watcher, tunedasd and various other tools to
  improve functionality on s390(x).

* Wed Oct 06 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.1-7
- Made the raid patch less verbose (#129656)

* Thu Sep 16 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.1-6
- Added prompt=1 and timeout=15 to automatically generated menu

* Tue Aug 31 2004 Karsten Hopp <karsten at redhat.de> 2:1.3.1-5
- install zfcpconf.sh into /sbin

* Tue Aug 24 2004 Karsten Hopp <karsten at redhat.de> 2:1.3.1-4 
- add zfcpconf.sh to read /etc/zfcp.conf and configure the zfcp
  devices

* Thu Jun 24 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.1-3
- Fixed another automenu bug with dumpto and dumptofs (#113204).

* Thu Jun 17 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.1-2
- Fixed automenu patch.
- Fixed problem with installation from tape (#121788).

* Wed Jun 16 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.3.1-1
- Updated to latest upstream version s390-tools-1.3.1

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jun 07 2004 Karsten Hopp <karsten at redhat.com>
- add cmsfs utils

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 19 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.2.4-4
- Fixed rebuilt on fc2.

* Thu Feb 19 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.2.4-3
- Fixed automenu patch, was allocating 1 line to little.

* Mon Feb 16 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.2.4-2
- rebuilt

* Mon Feb 16 2004 Phil Knirsch <pknirsch at redhat.com> 2:1.2.4-1
- Updated to latest developerworks release 1.2.4
- Disabled zfcpdump build until i find a way to build it as none-root.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com> 2:1.2.3-3
- rebuilt

* Thu Dec 04 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.3-2
- Fixed zfcpdump build.

* Fri Nov 28 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.3-1
- New bugfix release 1.2.3 came out today, updated again.

* Wed Nov 26 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.2-1
- Updated to latest Developerworks version 1.2.2
- Cleaned up specfile and patches a little.

* Wed Nov 12 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.1-4.1
- rebuilt

* Wed Nov 12 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.1-4
- Another fix for the new automenu patch. Target was an optional parameter in
  old s390utils, provided compatibility behaviour.

* Mon Oct 20 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.1-3.1
- rebuilt

* Mon Oct 20 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.1-3
- Small fix for the new automenu patch, default section didn't work correctly

* Mon Oct 20 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.1-2.1
- rebuilt

* Fri Oct 17 2003 Phil Knirsch <pknirsch at redhat.com> 2:1.2.1-2
- Patched new zipl to be backwards compatible to old multiboot feature.

* Thu Oct  9 2003 Harald Hoyer <harald at redhat.de> 2:1.2.1-1
- second round at updating to 1.2.1

* Thu Oct 09 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- first round at updating to 1.2.1

* Sat Sep 27 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add /boot/tape0 for .tdf tape boots

* Fri Jul 25 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- apply dasdfmt patch from 1.2.1

* Fri Jun 20 2003 Phil Knirsch <pknirsch at redhat.com> 1.1.7-1
- Updated to latest upstream version 1.1.7

* Fri May 02 2003 Pete Zaitcev <zaitcev at redhat.com> 1.1.6-7
- Fix usage of initialized permissions for bootmap.

* Tue Apr 29 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add extra tape loader from Pete Zaitcev

* Mon Apr 14 2003 Karsten Hopp <karsten at redhat.de> 2:1.1.6-5
- drop cpint support

* Mon Mar 24 2003 Karsten Hopp <karsten at redhat.de> 1.1.6-4
- use multiboot as default
- add option to disable multiboot 

* Sat Mar 22 2003 Karsten Hopp <karsten at redhat.de> 1.1.6-3
- add multiboot patch

* Mon Mar 10 2003 Karsten Hopp <karsten at redhat.de> 1.1.6-2
- added percentage patch (used by anaconda to display progress bars)

* Thu Feb 27 2003 Phil Knirsch <pknirsch at redhat.com> 1.1.6-1
- Updated to newest upstream version 1.1.6

* Tue Feb 04 2003 Phil Knirsch <pknirsch at redhat.com> 1.1.5-1
- Updated to newest upstream version 1.1.5

* Tue Feb 04 2003 Karsten Hopp <karsten at redhat.de> 1.1.4-3
- install libraries in /lib*, not /usr/lib*, they are required
  by some tools in /sbin

* Sun Feb 02 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- fix filelist to not include debug files

* Fri Jan 24 2003 Phil Knirsch <pknirsch at redhat.com> 1.1.4-1
- Updated to latest upstream version of IBM.
- Removed all unecessary patches and updated still needed patches.
- Fixed version number. Needed to introduce epoch though.
- A little specfile cleanup.
- Dropped oco-setver and oco-convert as we don't need them anymore.

* Wed Jan 22 2003 Phil Knirsch <pknirsch at redhat.com> 20020226-4
- Added ExclusiveArch tag.

* Mon Oct 21 2002 Phil Knirsch <pknirsch at redhat.com> 20020226-3
- Removed fdisk -> fdasd symlink. Is now provided by util-linux.
- Disabled f5 patch for s390x for now. Enable it later for newer kernels again.

* Mon May 27 2002 Phil Knirsch <pknirsch at redhat.com>
- Fixed dasdview to build on kernels > 2.4.18.

* Wed Apr 24 2002 Karsten Hopp <karsten at redhat.de>
- add IBM 5 patch

* Tue Jan 29 2002 Karsten Hopp <karsten at redhat.de>
- add IBM 4 patch
- add profile.d scripts to set correct TERM in 3270 console

* Thu Dec 18 2001 Karsten Hopp <karsten at redhat.de>
- add cpint programs

* Mon Nov 26 2001 Harald Hoyer <harald at redhat.de> 20011012-6
- fix for #56720

* Thu Nov 15 2001 Karsten Hopp <karsten at redhat.de>
- add fdisk - > fdasd symlink

* Thu Nov 12 2001 Karsten Hopp <karsten at redhat.de>
- add IBM patch (11/09/2001) and redo percentage patch

* Thu Nov 08 2001 Karsten Hopp <karsten at redhat.de>
- re-enable DASD if dasdfmt is interrupted with Ctrl-C

* Mon Nov 05 2001 Harald Hoyer <harald at redhat.de> 20011012-4
- added s390-tools-dasdfmt-percentage.patch

* Mon Oct 22 2001 Karsten Hopp <karsten at redhat.de>
- remove postinstall script

* Mon Oct 15 2001 Karsten Hopp <karsten at redhat.de>
- add IBM's s390-utils-2.patch
- add console to securetty

* Mon Oct 01 2001 Karsten Hopp <karsten at redhat.de>
- added oco-setkver and oco-convert

* Fri Aug 31 2001 Karsten Hopp <karsten at redhat.de>
- don't write error message in silent mode

* Thu Aug 23 2001 Harald Hoyer <harald at redhat.de>
- added s390-tools-dasdfmt-status.patch

* Tue Aug 21 2001 Karsten Hopp <karsten at redhat.de>
- update to the version from Aug 20

* Tue Aug 14 2001 Karsten Hopp <karsten at redhat.de>
- fix permissions

* Mon Aug 13 2001 Karsten Hopp <karsten at redhat.de>
- rename package to s390utils. s390-tools is no longer needed.

* Thu Aug 02 2001 Karsten Hopp <karsten at redhat.de>
- initial build



src_vipa-2.0.4-locations.patch:

--- NEW FILE src_vipa-2.0.4-locations.patch ---
>From b2f1bf78400c686bbdbcf4c29fbbb93367abe409 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 25 Mar 2009 09:36:08 +0100
Subject: [PATCH] fix location of the library

---
 Makefile |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 669b6c6..d395fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,8 @@ INSTALL=install
 VERSION=2.0.4
 
 # the path to the .so
-SRC_VIPA_PATH=$(INSTROOT)/usr/lib
+LIBDIR=/usr/lib
+SRC_VIPA_PATH=$(INSTROOT)$(LIBDIR)
 # the path to the starter script
 SRC_VIPA_STARTER_PATH=$(INSTROOT)/usr/sbin
 # path to man page
@@ -34,8 +35,7 @@ src_vipa.so: src_vipa.c
 
 src_vipa.sh:
 	echo '#!/bin/bash' > src_vipa.sh
-	echo 'export LD_LIBRARY_PATH=$(SRC_VIPA_PATH):$$LD_LIBRARY_PATH' >> src_vipa.sh
-	echo 'export LD_PRELOAD=$(SRC_VIPA_PATH)/src_vipa.so' >> src_vipa.sh
+	echo 'export LD_PRELOAD=$(LIBDIR)/src_vipa.so' >> src_vipa.sh
 	echo 'exec $$@' >> src_vipa.sh
 	chmod 755 src_vipa.sh
 
@@ -44,7 +44,6 @@ install: src_vipa.so src_vipa.sh
 	$(INSTALL) -m 755 src_vipa.so $(SRC_VIPA_PATH)
 	$(INSTALL) -m 755 src_vipa.sh $(SRC_VIPA_STARTER_PATH)
 	$(INSTALL) -m 644 src_vipa.8 $(SRC_VIPA_MANPAGE_PATH)/man8
-	ldconfig
 
 clean:
 	rm -f src_vipa.{i,s,o,sh,so} core src_vipa-$(VERSION).tar.gz
-- 
1.6.0.6



--- NEW FILE zfcp.udev ---
KERNEL=="zfcp_cfdc", RUN+="/sbin/zfcpconf.sh"


--- NEW FILE zfcpconf.sh ---
#!/bin/bash

# config file syntax:
# deviceno   WWPN   FCPLUN
#
# Example:
# 0.0.4000 0x5005076300C213e9 0x5022000000000000 
# 0.0.4001 0x5005076300c213e9 0x5023000000000000 
#
#
# manual setup:
# modprobe zfcp
# echo WWPN > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
# echo LUN  > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
# echo 1    > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
# 
# Example:
# modprobe zfcp
# echo 0x5005076300c213e9 > /sys/bus/ccw/drivers/zfcp/0.0.4000/port_add
# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
# echo 1                  > /sys/bus/ccw/drivers/zfcp/0.0.4000/online

CONFIG=/etc/zfcp.conf
PATH=/bin:/usr/bin:/sbin:/usr/sbin

if [ -f "$CONFIG" ]; then

   if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
      modprobe zfcp
   fi
   if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
      return
   fi
   cat $CONFIG | grep -v "^#" | tr "A-Z" "a-z" | while read line; do
      numparams=$(echo $line | wc -w)
      if [ $numparams == 5 ]; then
         read DEVICE SCSIID WWPN SCSILUN FCPLUN < <(echo $line)
         echo "Warning: Deprecated values in /etc/zfcp.conf, ignoring SCSI ID $SCSIID and SCSI LUN $SCSILUN"
      elif [ $numparams == 3 ]; then
         read DEVICE WWPN FCPLUN < <(echo $line)
      fi
      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN ] && echo $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add
      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
      echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
   done
fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:28:25 -0000	1.1
+++ .cvsignore	7 Apr 2009 08:03:08 -0000	1.2
@@ -0,0 +1,4 @@
+s390-tools-1.8.0.tar.bz2
+cmsfs-1.1.8c.tar.gz
+lib-zfcp-hbaapi-2.0.tar.gz
+src_vipa-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:28:25 -0000	1.1
+++ sources	7 Apr 2009 08:03:09 -0000	1.2
@@ -0,0 +1,4 @@
+5033eee356663d160784e37b193f93fa  s390-tools-1.8.0.tar.bz2
+71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
+2cbfffca3f07c61420899f45d221d451  lib-zfcp-hbaapi-2.0.tar.gz
+ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz



From pmatilai at fedoraproject.org  Tue Apr  7 08:36:12 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  7 Apr 2009 08:36:12 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite.spec,1.55,1.56
Message-ID: <20090407083612.1578370137@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17228

Modified Files:
	sqlite.spec 
Log Message:
- disable strict aliasing to work around brokenness on 3.6.12 (#494266)
- run test-suite on build but let it fail for now



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sqlite.spec	3 Apr 2009 09:56:25 -0000	1.55
+++ sqlite.spec	7 Apr 2009 08:35:41 -0000	1.56
@@ -1,12 +1,12 @@
 # bcond default logic is nicely backwards...
 %bcond_without tcl
 %bcond_with static
-%bcond_with check
+%bcond_without check
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.6.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -82,7 +82,7 @@
 
 %build
 autoconf
-export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -Wall"
+export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -Wall -fno-strict-aliasing"
 %configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks \
@@ -112,7 +112,11 @@
 
 %if %{with check}
 %check
-make test
+# let this fail for now:
+# - io-4.1 and io-4.2.3 fail everywhere
+# - five nan-test broken on PPC (upstream ticket #3404)
+# - bunch of rtree-tests failing on PPC atm
+make test ||:
 %endif
 
 %clean
@@ -151,6 +155,10 @@
 %endif
 
 %changelog
+* Tue Apr 07 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.12-2
+- disable strict aliasing to work around brokenness on 3.6.12 (#494266)
+- run test-suite on build but let it fail for now
+
 * Fri Apr 03 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.12-1
 - update to 3.6.12 (#492662)
 - remove reference to non-existent sqlite-doc from manual (#488883)



From lkundrak at fedoraproject.org  Tue Apr  7 08:45:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:45:06 +0000 (UTC)
Subject: rpms/healpix/EL-5 healpix.spec,1.1,1.2
Message-ID: <20090407084506.F184770100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19607/EL-5

Modified Files:
	healpix.spec 
Log Message:
Import -5 revision that was actually reviewed


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/healpix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix.spec	7 Apr 2009 07:04:17 -0000	1.1
+++ healpix.spec	7 Apr 2009 08:44:36 -0000	1.2
@@ -1,17 +1,20 @@
 Name:           healpix
 Version:        2.11c
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
 Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source1:        healpix-f90test.sh
 Patch0:         healpix-2.11c-shlib.patch
+Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cfitsio-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gcc-gfortran
 
 %description
@@ -20,13 +23,63 @@
 subdivision of a spherical surface in which each pixel covers the same
 surface area as every other pixel.
 
+This package contains Fortran binaries and libraries.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package devel
+Summary:        Healpix Fortran headers
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+This package contains the Fortran module files needed to compile against
+the HEALPix Fortran libraries.
+
+
+%package c++
+Summary:        Healpix C++ binaries and libraries
+Group:          System Environment/Libraries
+
+%description c++
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains HEALPix binaries and libraries that are written in C++.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package c++-devel
+Summary:        Healpix C++ headers
+Group:          System Environment/Libraries
+Requires:       %{name}-c++ = %{version}-%{release}
+
+%description c++-devel
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains development headers for the C++ part of HEALPix.
+
 
 %package -n c%{name}
 Summary:        HEALPix C Bindings Library
 Group:          System Environment/Libraries
 
 %description -n c%{name}
-Library for tools that use HEALPix C bindings.
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains the library for tools that use HEALPix C bindings.
 
 
 %package -n c%{name}-devel
@@ -35,36 +88,78 @@
 Requires:       c%{name} = %{version}
 
 %description -n c%{name}-devel
-Include file for development with HEALPix.
-
-
-%package fortran
-Summary:        HEALPix Fortran binaries
-Group:          Applications/Engineering
-
-%description fortran
-Fortran HEALPix library and binaries.
-
-
-%package fortran-devel
-Summary:        HEALPix Fortran headers and static libraries
-Group:          Development/Libraries
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
 
-%description fortran-devel
-Fortran modules used for developing HEALPix applications.
+This package contains the C include file for development with HEALPix.
 
 
 %prep
 %setup -q -n Healpix_%{version}
 %patch0 -p1 -b .shlib
+%patch1 -p1 -b .gcc44
+
+# Fortran tests:
+rm test/README
+install -p -m 755 %{SOURCE1} runtest.sh
 
+# Remove patch backup from doc
+rm src/cxx/test/*.shlib
 
 %build
+# Generic stuff
+export CC="gcc"
+export CXX="g++"
+export CXXL="g++"
+export FC="gfortran"
+
+
 ### C bindings
+export CFITSIO_LIBDIR="%{_libdir}"
 
 make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
         CFITSIO_INCDIR=%{_includedir}/cfitsio shared
 
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags} " \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_chealpix2
+
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_cio
+
+
+### C++ bindings
+
+# directories
+export DESTBIN=$PWD/cxxbin
+export DESTINC=$PWD/cxxinc
+export DESTLIB=$PWD/cxxlib
+export DESTDOC=$PWD/cxxdoc
+mkdir -p $DESTBIN $DESTINC $DESTLIB $DESTDOC
+
+export INCDIR="%{_includedir}/cfitsio"
+export LIBDIR=$DESTLIB
+
+# Make nonsense
+export TEMP1="."
+export PARAMFILE=$PWD/src/cxx/config/rules.common
+
+# Compiler flags
+export CCFLAGS_NO_C="%{optflags} -I%{_includedir}/cfitsio -I$PWD/src/cxx/cxxsupport -fPIC -I${DESTINC} -fopenmp" 
+export CCFLAGS="$CCFLAGS_NO_C -c"
+export CXXFLAGS="$CCFLAGS"
+export CXXFLAGS_NO_C="$CCFLAGS_NO_C"
+export CXXCFLAGS="$CCFLAGS"
+export CXXLFLAGS="%{optflags} -L. -L$DESTLIB"
+export CXX_EXTRALIBS="-lcfitsio -lhealpix_cxx -lhealpix_cxxsupport -lhealpix_fft --as-needed"
+
+# SMP make doesn't work
+for dir in cxxsupport libfftpack Healpix_cxx alice docsrc; do
+        make -C src/cxx/$dir -f planck.make SRCROOT=$PWD/src/cxx/$dir
+done
+
+
 ### F90 bindings
 
 # Make nonsense
@@ -72,13 +167,12 @@
 export OS=Linux
 
 # Directories for the created include, library and binary files
-export BINDIR=$PWD/bin
-export INCDIR=$PWD/include
-export LIBDIR=$PWD/lib
-mkdir $INCDIR $LIBDIR $BINDIR
+export BINDIR=$PWD/f90bin
+export INCDIR=$PWD/f90inc
+export LIBDIR=$PWD/f90lib
+mkdir -p $INCDIR $LIBDIR $BINDIR
 
 # Compiler stuff
-export FC=gfortran
 export CFLAGS="%{optflags} -fPIC"
 export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"
 
@@ -91,6 +185,19 @@
         make -C src/f90/$dir
 done
 
+# Rename binaries
+cd f90bin
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
+
+cd cxxbin
+mv median_filter median_filter_cxx # Binary with same name exists in Fortran
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,41 +211,119 @@
 make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
         INCDIR=$RPM_BUILD_ROOT%{_includedir}
 
+# C test binaries
+install -p -m 0755 src/C/subs/test_chealpix2 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 src/C/subs/test_cio $RPM_BUILD_ROOT%{_bindir}
+
+# C++ stuff
+install -p cxxbin/* $RPM_BUILD_ROOT%{_bindir}
+install -p cxxlib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 cxxinc/* $RPM_BUILD_ROOT%{_includedir}/healpix
+
 # Fortran stuff
-install -p bin/* $RPM_BUILD_ROOT%{_bindir}
-install -p lib/* $RPM_BUILD_ROOT%{_libdir}
-install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix
+install -p f90bin/* $RPM_BUILD_ROOT%{_bindir}
+install -p f90lib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_includedir}/healpix
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n chealpix
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
+
+%post -n c%{name} -p /sbin/ldconfig
+%postun -n c%{name} -p /sbin/ldconfig
+
+
+%files
 %defattr(-,root,root,-)
-%{_libdir}/libchealpix.so
-%doc COPYING READ_Copyrights_Licenses.txt
+%{_bindir}/hp_alteralm
+%{_bindir}/hp_anafast
+%{_bindir}/hp_hotspot
+%{_bindir}/hp_map2gif
+%{_bindir}/hp_median_filter
+%{_bindir}/hp_plmgen
+%{_bindir}/hp_sky_ng_sim
+%{_bindir}/hp_sky_ng_sim_bin
+%{_bindir}/hp_smoothing
+%{_bindir}/hp_synfast
+%{_bindir}/hp_ud_grade
+%{_libdir}/libhealpix.so
+%{_libdir}/libhealpix_gif.so
+%doc COPYING READ_Copyrights_Licenses.txt test
 
 
-%files -n chealpix-devel
+%files devel
 %defattr(-,root,root,-)
-%{_includedir}/chealpix.h
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.mod
 
 
-%files -n healpix-fortran
+%files c++
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/libhealpix.so
-%{_libdir}/libgif.so
+%{_bindir}/hp_alice2
+%{_bindir}/hp_alice_test
+%{_bindir}/hp_alm2map_cxx
+%{_bindir}/hp_anafast_cxx
+%{_bindir}/hp_calc_powspec
+%{_bindir}/hp_generateTexture
+%{_bindir}/hp_hotspots_cxx
+%{_bindir}/hp_hpxtest
+%{_bindir}/hp_map2tga
+%{_bindir}/hp_median_filter_cxx
+%{_bindir}/hp_mult_alm
+%{_bindir}/hp_rotalm_cxx
+%{_bindir}/hp_smoothing_cxx
+%{_bindir}/hp_syn_alm_cxx
+%{_bindir}/hp_testMollweideSkyMap
+%{_bindir}/hp_testOrthogonalSkyMap
+%{_bindir}/hp_testSoSSkyMap
+%{_bindir}/hp_udgrade_cxx
+%{_libdir}/libhealpix_cxx.so
+%{_libdir}/libhealpix_cxxsupport.so
+%{_libdir}/libhealpix_fft.so
+
+
+%files c++-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.h
+%doc src/cxx/test
+
+
+%files -n chealpix
+%defattr(-,root,root,-)
+%{_libdir}/libchealpix.so
 %doc COPYING READ_Copyrights_Licenses.txt
 
 
-%files -n healpix-fortran-devel
+%files -n chealpix-devel
 %defattr(-,root,root,-)
-%{_includedir}/healpix
+%{_bindir}/test_chealpix2
+%{_bindir}/test_cio
+%{_includedir}/chealpix.h
 
 
 %changelog
+* Sat Apr 04 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-5
+- Minor style adjustments
+- Don't override sane gcc flags
+- Moved tests to -devel packages
+- C++ -devel doesn't depend on fortran ones anymore
+- mkdir with -p to allow short-circuit builds
+- Fix build with GCC 4.4
+
+* Sat Apr 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-4
+- Review fixes.
+- Add C++ bindings, rename C++ and Fortran binaries (general names!).
+
 * Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
 - Build Fortran library as DSO
 



From lkundrak at fedoraproject.org  Tue Apr  7 08:45:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:45:07 +0000 (UTC)
Subject: rpms/healpix/F-10 healpix.spec,1.1,1.2
Message-ID: <20090407084507.0EBFD70137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19607/F-10

Modified Files:
	healpix.spec 
Log Message:
Import -5 revision that was actually reviewed


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-10/healpix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix.spec	7 Apr 2009 07:04:18 -0000	1.1
+++ healpix.spec	7 Apr 2009 08:44:36 -0000	1.2
@@ -1,17 +1,20 @@
 Name:           healpix
 Version:        2.11c
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
 Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source1:        healpix-f90test.sh
 Patch0:         healpix-2.11c-shlib.patch
+Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cfitsio-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gcc-gfortran
 
 %description
@@ -20,13 +23,63 @@
 subdivision of a spherical surface in which each pixel covers the same
 surface area as every other pixel.
 
+This package contains Fortran binaries and libraries.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package devel
+Summary:        Healpix Fortran headers
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+This package contains the Fortran module files needed to compile against
+the HEALPix Fortran libraries.
+
+
+%package c++
+Summary:        Healpix C++ binaries and libraries
+Group:          System Environment/Libraries
+
+%description c++
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains HEALPix binaries and libraries that are written in C++.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package c++-devel
+Summary:        Healpix C++ headers
+Group:          System Environment/Libraries
+Requires:       %{name}-c++ = %{version}-%{release}
+
+%description c++-devel
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains development headers for the C++ part of HEALPix.
+
 
 %package -n c%{name}
 Summary:        HEALPix C Bindings Library
 Group:          System Environment/Libraries
 
 %description -n c%{name}
-Library for tools that use HEALPix C bindings.
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains the library for tools that use HEALPix C bindings.
 
 
 %package -n c%{name}-devel
@@ -35,36 +88,78 @@
 Requires:       c%{name} = %{version}
 
 %description -n c%{name}-devel
-Include file for development with HEALPix.
-
-
-%package fortran
-Summary:        HEALPix Fortran binaries
-Group:          Applications/Engineering
-
-%description fortran
-Fortran HEALPix library and binaries.
-
-
-%package fortran-devel
-Summary:        HEALPix Fortran headers and static libraries
-Group:          Development/Libraries
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
 
-%description fortran-devel
-Fortran modules used for developing HEALPix applications.
+This package contains the C include file for development with HEALPix.
 
 
 %prep
 %setup -q -n Healpix_%{version}
 %patch0 -p1 -b .shlib
+%patch1 -p1 -b .gcc44
+
+# Fortran tests:
+rm test/README
+install -p -m 755 %{SOURCE1} runtest.sh
 
+# Remove patch backup from doc
+rm src/cxx/test/*.shlib
 
 %build
+# Generic stuff
+export CC="gcc"
+export CXX="g++"
+export CXXL="g++"
+export FC="gfortran"
+
+
 ### C bindings
+export CFITSIO_LIBDIR="%{_libdir}"
 
 make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
         CFITSIO_INCDIR=%{_includedir}/cfitsio shared
 
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags} " \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_chealpix2
+
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_cio
+
+
+### C++ bindings
+
+# directories
+export DESTBIN=$PWD/cxxbin
+export DESTINC=$PWD/cxxinc
+export DESTLIB=$PWD/cxxlib
+export DESTDOC=$PWD/cxxdoc
+mkdir -p $DESTBIN $DESTINC $DESTLIB $DESTDOC
+
+export INCDIR="%{_includedir}/cfitsio"
+export LIBDIR=$DESTLIB
+
+# Make nonsense
+export TEMP1="."
+export PARAMFILE=$PWD/src/cxx/config/rules.common
+
+# Compiler flags
+export CCFLAGS_NO_C="%{optflags} -I%{_includedir}/cfitsio -I$PWD/src/cxx/cxxsupport -fPIC -I${DESTINC} -fopenmp" 
+export CCFLAGS="$CCFLAGS_NO_C -c"
+export CXXFLAGS="$CCFLAGS"
+export CXXFLAGS_NO_C="$CCFLAGS_NO_C"
+export CXXCFLAGS="$CCFLAGS"
+export CXXLFLAGS="%{optflags} -L. -L$DESTLIB"
+export CXX_EXTRALIBS="-lcfitsio -lhealpix_cxx -lhealpix_cxxsupport -lhealpix_fft --as-needed"
+
+# SMP make doesn't work
+for dir in cxxsupport libfftpack Healpix_cxx alice docsrc; do
+        make -C src/cxx/$dir -f planck.make SRCROOT=$PWD/src/cxx/$dir
+done
+
+
 ### F90 bindings
 
 # Make nonsense
@@ -72,13 +167,12 @@
 export OS=Linux
 
 # Directories for the created include, library and binary files
-export BINDIR=$PWD/bin
-export INCDIR=$PWD/include
-export LIBDIR=$PWD/lib
-mkdir $INCDIR $LIBDIR $BINDIR
+export BINDIR=$PWD/f90bin
+export INCDIR=$PWD/f90inc
+export LIBDIR=$PWD/f90lib
+mkdir -p $INCDIR $LIBDIR $BINDIR
 
 # Compiler stuff
-export FC=gfortran
 export CFLAGS="%{optflags} -fPIC"
 export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"
 
@@ -91,6 +185,19 @@
         make -C src/f90/$dir
 done
 
+# Rename binaries
+cd f90bin
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
+
+cd cxxbin
+mv median_filter median_filter_cxx # Binary with same name exists in Fortran
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,41 +211,119 @@
 make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
         INCDIR=$RPM_BUILD_ROOT%{_includedir}
 
+# C test binaries
+install -p -m 0755 src/C/subs/test_chealpix2 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 src/C/subs/test_cio $RPM_BUILD_ROOT%{_bindir}
+
+# C++ stuff
+install -p cxxbin/* $RPM_BUILD_ROOT%{_bindir}
+install -p cxxlib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 cxxinc/* $RPM_BUILD_ROOT%{_includedir}/healpix
+
 # Fortran stuff
-install -p bin/* $RPM_BUILD_ROOT%{_bindir}
-install -p lib/* $RPM_BUILD_ROOT%{_libdir}
-install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix
+install -p f90bin/* $RPM_BUILD_ROOT%{_bindir}
+install -p f90lib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_includedir}/healpix
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n chealpix
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
+
+%post -n c%{name} -p /sbin/ldconfig
+%postun -n c%{name} -p /sbin/ldconfig
+
+
+%files
 %defattr(-,root,root,-)
-%{_libdir}/libchealpix.so
-%doc COPYING READ_Copyrights_Licenses.txt
+%{_bindir}/hp_alteralm
+%{_bindir}/hp_anafast
+%{_bindir}/hp_hotspot
+%{_bindir}/hp_map2gif
+%{_bindir}/hp_median_filter
+%{_bindir}/hp_plmgen
+%{_bindir}/hp_sky_ng_sim
+%{_bindir}/hp_sky_ng_sim_bin
+%{_bindir}/hp_smoothing
+%{_bindir}/hp_synfast
+%{_bindir}/hp_ud_grade
+%{_libdir}/libhealpix.so
+%{_libdir}/libhealpix_gif.so
+%doc COPYING READ_Copyrights_Licenses.txt test
 
 
-%files -n chealpix-devel
+%files devel
 %defattr(-,root,root,-)
-%{_includedir}/chealpix.h
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.mod
 
 
-%files -n healpix-fortran
+%files c++
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/libhealpix.so
-%{_libdir}/libgif.so
+%{_bindir}/hp_alice2
+%{_bindir}/hp_alice_test
+%{_bindir}/hp_alm2map_cxx
+%{_bindir}/hp_anafast_cxx
+%{_bindir}/hp_calc_powspec
+%{_bindir}/hp_generateTexture
+%{_bindir}/hp_hotspots_cxx
+%{_bindir}/hp_hpxtest
+%{_bindir}/hp_map2tga
+%{_bindir}/hp_median_filter_cxx
+%{_bindir}/hp_mult_alm
+%{_bindir}/hp_rotalm_cxx
+%{_bindir}/hp_smoothing_cxx
+%{_bindir}/hp_syn_alm_cxx
+%{_bindir}/hp_testMollweideSkyMap
+%{_bindir}/hp_testOrthogonalSkyMap
+%{_bindir}/hp_testSoSSkyMap
+%{_bindir}/hp_udgrade_cxx
+%{_libdir}/libhealpix_cxx.so
+%{_libdir}/libhealpix_cxxsupport.so
+%{_libdir}/libhealpix_fft.so
+
+
+%files c++-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.h
+%doc src/cxx/test
+
+
+%files -n chealpix
+%defattr(-,root,root,-)
+%{_libdir}/libchealpix.so
 %doc COPYING READ_Copyrights_Licenses.txt
 
 
-%files -n healpix-fortran-devel
+%files -n chealpix-devel
 %defattr(-,root,root,-)
-%{_includedir}/healpix
+%{_bindir}/test_chealpix2
+%{_bindir}/test_cio
+%{_includedir}/chealpix.h
 
 
 %changelog
+* Sat Apr 04 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-5
+- Minor style adjustments
+- Don't override sane gcc flags
+- Moved tests to -devel packages
+- C++ -devel doesn't depend on fortran ones anymore
+- mkdir with -p to allow short-circuit builds
+- Fix build with GCC 4.4
+
+* Sat Apr 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-4
+- Review fixes.
+- Add C++ bindings, rename C++ and Fortran binaries (general names!).
+
 * Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
 - Build Fortran library as DSO
 



From lkundrak at fedoraproject.org  Tue Apr  7 08:45:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:45:07 +0000 (UTC)
Subject: rpms/healpix/F-11 healpix.spec,1.1,1.2
Message-ID: <20090407084507.4807C70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19607/F-11

Modified Files:
	healpix.spec 
Log Message:
Import -5 revision that was actually reviewed


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/healpix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix.spec	7 Apr 2009 07:04:19 -0000	1.1
+++ healpix.spec	7 Apr 2009 08:44:37 -0000	1.2
@@ -1,17 +1,20 @@
 Name:           healpix
 Version:        2.11c
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
 Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source1:        healpix-f90test.sh
 Patch0:         healpix-2.11c-shlib.patch
+Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cfitsio-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gcc-gfortran
 
 %description
@@ -20,13 +23,63 @@
 subdivision of a spherical surface in which each pixel covers the same
 surface area as every other pixel.
 
+This package contains Fortran binaries and libraries.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package devel
+Summary:        Healpix Fortran headers
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+This package contains the Fortran module files needed to compile against
+the HEALPix Fortran libraries.
+
+
+%package c++
+Summary:        Healpix C++ binaries and libraries
+Group:          System Environment/Libraries
+
+%description c++
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains HEALPix binaries and libraries that are written in C++.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package c++-devel
+Summary:        Healpix C++ headers
+Group:          System Environment/Libraries
+Requires:       %{name}-c++ = %{version}-%{release}
+
+%description c++-devel
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains development headers for the C++ part of HEALPix.
+
 
 %package -n c%{name}
 Summary:        HEALPix C Bindings Library
 Group:          System Environment/Libraries
 
 %description -n c%{name}
-Library for tools that use HEALPix C bindings.
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains the library for tools that use HEALPix C bindings.
 
 
 %package -n c%{name}-devel
@@ -35,36 +88,78 @@
 Requires:       c%{name} = %{version}
 
 %description -n c%{name}-devel
-Include file for development with HEALPix.
-
-
-%package fortran
-Summary:        HEALPix Fortran binaries
-Group:          Applications/Engineering
-
-%description fortran
-Fortran HEALPix library and binaries.
-
-
-%package fortran-devel
-Summary:        HEALPix Fortran headers and static libraries
-Group:          Development/Libraries
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
 
-%description fortran-devel
-Fortran modules used for developing HEALPix applications.
+This package contains the C include file for development with HEALPix.
 
 
 %prep
 %setup -q -n Healpix_%{version}
 %patch0 -p1 -b .shlib
+%patch1 -p1 -b .gcc44
+
+# Fortran tests:
+rm test/README
+install -p -m 755 %{SOURCE1} runtest.sh
 
+# Remove patch backup from doc
+rm src/cxx/test/*.shlib
 
 %build
+# Generic stuff
+export CC="gcc"
+export CXX="g++"
+export CXXL="g++"
+export FC="gfortran"
+
+
 ### C bindings
+export CFITSIO_LIBDIR="%{_libdir}"
 
 make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
         CFITSIO_INCDIR=%{_includedir}/cfitsio shared
 
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags} " \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_chealpix2
+
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_cio
+
+
+### C++ bindings
+
+# directories
+export DESTBIN=$PWD/cxxbin
+export DESTINC=$PWD/cxxinc
+export DESTLIB=$PWD/cxxlib
+export DESTDOC=$PWD/cxxdoc
+mkdir -p $DESTBIN $DESTINC $DESTLIB $DESTDOC
+
+export INCDIR="%{_includedir}/cfitsio"
+export LIBDIR=$DESTLIB
+
+# Make nonsense
+export TEMP1="."
+export PARAMFILE=$PWD/src/cxx/config/rules.common
+
+# Compiler flags
+export CCFLAGS_NO_C="%{optflags} -I%{_includedir}/cfitsio -I$PWD/src/cxx/cxxsupport -fPIC -I${DESTINC} -fopenmp" 
+export CCFLAGS="$CCFLAGS_NO_C -c"
+export CXXFLAGS="$CCFLAGS"
+export CXXFLAGS_NO_C="$CCFLAGS_NO_C"
+export CXXCFLAGS="$CCFLAGS"
+export CXXLFLAGS="%{optflags} -L. -L$DESTLIB"
+export CXX_EXTRALIBS="-lcfitsio -lhealpix_cxx -lhealpix_cxxsupport -lhealpix_fft --as-needed"
+
+# SMP make doesn't work
+for dir in cxxsupport libfftpack Healpix_cxx alice docsrc; do
+        make -C src/cxx/$dir -f planck.make SRCROOT=$PWD/src/cxx/$dir
+done
+
+
 ### F90 bindings
 
 # Make nonsense
@@ -72,13 +167,12 @@
 export OS=Linux
 
 # Directories for the created include, library and binary files
-export BINDIR=$PWD/bin
-export INCDIR=$PWD/include
-export LIBDIR=$PWD/lib
-mkdir $INCDIR $LIBDIR $BINDIR
+export BINDIR=$PWD/f90bin
+export INCDIR=$PWD/f90inc
+export LIBDIR=$PWD/f90lib
+mkdir -p $INCDIR $LIBDIR $BINDIR
 
 # Compiler stuff
-export FC=gfortran
 export CFLAGS="%{optflags} -fPIC"
 export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"
 
@@ -91,6 +185,19 @@
         make -C src/f90/$dir
 done
 
+# Rename binaries
+cd f90bin
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
+
+cd cxxbin
+mv median_filter median_filter_cxx # Binary with same name exists in Fortran
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,41 +211,119 @@
 make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
         INCDIR=$RPM_BUILD_ROOT%{_includedir}
 
+# C test binaries
+install -p -m 0755 src/C/subs/test_chealpix2 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 src/C/subs/test_cio $RPM_BUILD_ROOT%{_bindir}
+
+# C++ stuff
+install -p cxxbin/* $RPM_BUILD_ROOT%{_bindir}
+install -p cxxlib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 cxxinc/* $RPM_BUILD_ROOT%{_includedir}/healpix
+
 # Fortran stuff
-install -p bin/* $RPM_BUILD_ROOT%{_bindir}
-install -p lib/* $RPM_BUILD_ROOT%{_libdir}
-install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix
+install -p f90bin/* $RPM_BUILD_ROOT%{_bindir}
+install -p f90lib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_includedir}/healpix
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n chealpix
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
+
+%post -n c%{name} -p /sbin/ldconfig
+%postun -n c%{name} -p /sbin/ldconfig
+
+
+%files
 %defattr(-,root,root,-)
-%{_libdir}/libchealpix.so
-%doc COPYING READ_Copyrights_Licenses.txt
+%{_bindir}/hp_alteralm
+%{_bindir}/hp_anafast
+%{_bindir}/hp_hotspot
+%{_bindir}/hp_map2gif
+%{_bindir}/hp_median_filter
+%{_bindir}/hp_plmgen
+%{_bindir}/hp_sky_ng_sim
+%{_bindir}/hp_sky_ng_sim_bin
+%{_bindir}/hp_smoothing
+%{_bindir}/hp_synfast
+%{_bindir}/hp_ud_grade
+%{_libdir}/libhealpix.so
+%{_libdir}/libhealpix_gif.so
+%doc COPYING READ_Copyrights_Licenses.txt test
 
 
-%files -n chealpix-devel
+%files devel
 %defattr(-,root,root,-)
-%{_includedir}/chealpix.h
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.mod
 
 
-%files -n healpix-fortran
+%files c++
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/libhealpix.so
-%{_libdir}/libgif.so
+%{_bindir}/hp_alice2
+%{_bindir}/hp_alice_test
+%{_bindir}/hp_alm2map_cxx
+%{_bindir}/hp_anafast_cxx
+%{_bindir}/hp_calc_powspec
+%{_bindir}/hp_generateTexture
+%{_bindir}/hp_hotspots_cxx
+%{_bindir}/hp_hpxtest
+%{_bindir}/hp_map2tga
+%{_bindir}/hp_median_filter_cxx
+%{_bindir}/hp_mult_alm
+%{_bindir}/hp_rotalm_cxx
+%{_bindir}/hp_smoothing_cxx
+%{_bindir}/hp_syn_alm_cxx
+%{_bindir}/hp_testMollweideSkyMap
+%{_bindir}/hp_testOrthogonalSkyMap
+%{_bindir}/hp_testSoSSkyMap
+%{_bindir}/hp_udgrade_cxx
+%{_libdir}/libhealpix_cxx.so
+%{_libdir}/libhealpix_cxxsupport.so
+%{_libdir}/libhealpix_fft.so
+
+
+%files c++-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.h
+%doc src/cxx/test
+
+
+%files -n chealpix
+%defattr(-,root,root,-)
+%{_libdir}/libchealpix.so
 %doc COPYING READ_Copyrights_Licenses.txt
 
 
-%files -n healpix-fortran-devel
+%files -n chealpix-devel
 %defattr(-,root,root,-)
-%{_includedir}/healpix
+%{_bindir}/test_chealpix2
+%{_bindir}/test_cio
+%{_includedir}/chealpix.h
 
 
 %changelog
+* Sat Apr 04 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-5
+- Minor style adjustments
+- Don't override sane gcc flags
+- Moved tests to -devel packages
+- C++ -devel doesn't depend on fortran ones anymore
+- mkdir with -p to allow short-circuit builds
+- Fix build with GCC 4.4
+
+* Sat Apr 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-4
+- Review fixes.
+- Add C++ bindings, rename C++ and Fortran binaries (general names!).
+
 * Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
 - Build Fortran library as DSO
 



From lkundrak at fedoraproject.org  Tue Apr  7 08:45:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:45:07 +0000 (UTC)
Subject: rpms/healpix/devel healpix.spec,1.1,1.2
Message-ID: <20090407084507.802CC7013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19607/devel

Modified Files:
	healpix.spec 
Log Message:
Import -5 revision that was actually reviewed


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/healpix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix.spec	7 Apr 2009 07:04:19 -0000	1.1
+++ healpix.spec	7 Apr 2009 08:44:37 -0000	1.2
@@ -1,17 +1,20 @@
 Name:           healpix
 Version:        2.11c
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
 Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source1:        healpix-f90test.sh
 Patch0:         healpix-2.11c-shlib.patch
+Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cfitsio-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gcc-gfortran
 
 %description
@@ -20,13 +23,63 @@
 subdivision of a spherical surface in which each pixel covers the same
 surface area as every other pixel.
 
+This package contains Fortran binaries and libraries.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package devel
+Summary:        Healpix Fortran headers
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+This package contains the Fortran module files needed to compile against
+the HEALPix Fortran libraries.
+
+
+%package c++
+Summary:        Healpix C++ binaries and libraries
+Group:          System Environment/Libraries
+
+%description c++
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains HEALPix binaries and libraries that are written in C++.
+
+NB. Due to some generic names, the binaries have been renamed to start with
+hp_, e.g. anafast is now hp_anafast.
+
+
+%package c++-devel
+Summary:        Healpix C++ headers
+Group:          System Environment/Libraries
+Requires:       %{name}-c++ = %{version}-%{release}
+
+%description c++-devel
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains development headers for the C++ part of HEALPix.
+
 
 %package -n c%{name}
 Summary:        HEALPix C Bindings Library
 Group:          System Environment/Libraries
 
 %description -n c%{name}
-Library for tools that use HEALPix C bindings.
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
+
+This package contains the library for tools that use HEALPix C bindings.
 
 
 %package -n c%{name}-devel
@@ -35,36 +88,78 @@
 Requires:       c%{name} = %{version}
 
 %description -n c%{name}-devel
-Include file for development with HEALPix.
-
-
-%package fortran
-Summary:        HEALPix Fortran binaries
-Group:          Applications/Engineering
-
-%description fortran
-Fortran HEALPix library and binaries.
-
-
-%package fortran-devel
-Summary:        HEALPix Fortran headers and static libraries
-Group:          Development/Libraries
+HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
+of a sphere. As suggested in the name, this pixelization produces a
+subdivision of a spherical surface in which each pixel covers the same
+surface area as every other pixel.
 
-%description fortran-devel
-Fortran modules used for developing HEALPix applications.
+This package contains the C include file for development with HEALPix.
 
 
 %prep
 %setup -q -n Healpix_%{version}
 %patch0 -p1 -b .shlib
+%patch1 -p1 -b .gcc44
+
+# Fortran tests:
+rm test/README
+install -p -m 755 %{SOURCE1} runtest.sh
 
+# Remove patch backup from doc
+rm src/cxx/test/*.shlib
 
 %build
+# Generic stuff
+export CC="gcc"
+export CXX="g++"
+export CXXL="g++"
+export FC="gfortran"
+
+
 ### C bindings
+export CFITSIO_LIBDIR="%{_libdir}"
 
 make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
         CFITSIO_INCDIR=%{_includedir}/cfitsio shared
 
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags} " \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_chealpix2
+
+make %{?_smp_mflags} -C src/C/subs PIC="-fPIC" OPT="%{optflags}" \
+        CFITSIO_INCDIR=%{_includedir}/cfitsio test_cio
+
+
+### C++ bindings
+
+# directories
+export DESTBIN=$PWD/cxxbin
+export DESTINC=$PWD/cxxinc
+export DESTLIB=$PWD/cxxlib
+export DESTDOC=$PWD/cxxdoc
+mkdir -p $DESTBIN $DESTINC $DESTLIB $DESTDOC
+
+export INCDIR="%{_includedir}/cfitsio"
+export LIBDIR=$DESTLIB
+
+# Make nonsense
+export TEMP1="."
+export PARAMFILE=$PWD/src/cxx/config/rules.common
+
+# Compiler flags
+export CCFLAGS_NO_C="%{optflags} -I%{_includedir}/cfitsio -I$PWD/src/cxx/cxxsupport -fPIC -I${DESTINC} -fopenmp" 
+export CCFLAGS="$CCFLAGS_NO_C -c"
+export CXXFLAGS="$CCFLAGS"
+export CXXFLAGS_NO_C="$CCFLAGS_NO_C"
+export CXXCFLAGS="$CCFLAGS"
+export CXXLFLAGS="%{optflags} -L. -L$DESTLIB"
+export CXX_EXTRALIBS="-lcfitsio -lhealpix_cxx -lhealpix_cxxsupport -lhealpix_fft --as-needed"
+
+# SMP make doesn't work
+for dir in cxxsupport libfftpack Healpix_cxx alice docsrc; do
+        make -C src/cxx/$dir -f planck.make SRCROOT=$PWD/src/cxx/$dir
+done
+
+
 ### F90 bindings
 
 # Make nonsense
@@ -72,13 +167,12 @@
 export OS=Linux
 
 # Directories for the created include, library and binary files
-export BINDIR=$PWD/bin
-export INCDIR=$PWD/include
-export LIBDIR=$PWD/lib
-mkdir $INCDIR $LIBDIR $BINDIR
+export BINDIR=$PWD/f90bin
+export INCDIR=$PWD/f90inc
+export LIBDIR=$PWD/f90lib
+mkdir -p $INCDIR $LIBDIR $BINDIR
 
 # Compiler stuff
-export FC=gfortran
 export CFLAGS="%{optflags} -fPIC"
 export FFLAGS="%{optflags} -fPIC -DGFORTRAN -I$INCDIR -ffree-line-length-none"
 
@@ -91,6 +185,19 @@
         make -C src/f90/$dir
 done
 
+# Rename binaries
+cd f90bin
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
+
+cd cxxbin
+mv median_filter median_filter_cxx # Binary with same name exists in Fortran
+for exec in *; do
+        mv $exec hp_$exec
+done
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,41 +211,119 @@
 make install -C src/C/subs LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
         INCDIR=$RPM_BUILD_ROOT%{_includedir}
 
+# C test binaries
+install -p -m 0755 src/C/subs/test_chealpix2 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 src/C/subs/test_cio $RPM_BUILD_ROOT%{_bindir}
+
+# C++ stuff
+install -p cxxbin/* $RPM_BUILD_ROOT%{_bindir}
+install -p cxxlib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 cxxinc/* $RPM_BUILD_ROOT%{_includedir}/healpix
+
 # Fortran stuff
-install -p bin/* $RPM_BUILD_ROOT%{_bindir}
-install -p lib/* $RPM_BUILD_ROOT%{_libdir}
-install -pm 0644 include/* $RPM_BUILD_ROOT%{_includedir}/healpix
+install -p f90bin/* $RPM_BUILD_ROOT%{_bindir}
+install -p f90lib/* $RPM_BUILD_ROOT%{_libdir}
+install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_includedir}/healpix
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n chealpix
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
+
+%post -n c%{name} -p /sbin/ldconfig
+%postun -n c%{name} -p /sbin/ldconfig
+
+
+%files
 %defattr(-,root,root,-)
-%{_libdir}/libchealpix.so
-%doc COPYING READ_Copyrights_Licenses.txt
+%{_bindir}/hp_alteralm
+%{_bindir}/hp_anafast
+%{_bindir}/hp_hotspot
+%{_bindir}/hp_map2gif
+%{_bindir}/hp_median_filter
+%{_bindir}/hp_plmgen
+%{_bindir}/hp_sky_ng_sim
+%{_bindir}/hp_sky_ng_sim_bin
+%{_bindir}/hp_smoothing
+%{_bindir}/hp_synfast
+%{_bindir}/hp_ud_grade
+%{_libdir}/libhealpix.so
+%{_libdir}/libhealpix_gif.so
+%doc COPYING READ_Copyrights_Licenses.txt test
 
 
-%files -n chealpix-devel
+%files devel
 %defattr(-,root,root,-)
-%{_includedir}/chealpix.h
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.mod
 
 
-%files -n healpix-fortran
+%files c++
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/libhealpix.so
-%{_libdir}/libgif.so
+%{_bindir}/hp_alice2
+%{_bindir}/hp_alice_test
+%{_bindir}/hp_alm2map_cxx
+%{_bindir}/hp_anafast_cxx
+%{_bindir}/hp_calc_powspec
+%{_bindir}/hp_generateTexture
+%{_bindir}/hp_hotspots_cxx
+%{_bindir}/hp_hpxtest
+%{_bindir}/hp_map2tga
+%{_bindir}/hp_median_filter_cxx
+%{_bindir}/hp_mult_alm
+%{_bindir}/hp_rotalm_cxx
+%{_bindir}/hp_smoothing_cxx
+%{_bindir}/hp_syn_alm_cxx
+%{_bindir}/hp_testMollweideSkyMap
+%{_bindir}/hp_testOrthogonalSkyMap
+%{_bindir}/hp_testSoSSkyMap
+%{_bindir}/hp_udgrade_cxx
+%{_libdir}/libhealpix_cxx.so
+%{_libdir}/libhealpix_cxxsupport.so
+%{_libdir}/libhealpix_fft.so
+
+
+%files c++-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/healpix
+%{_includedir}/healpix/*.h
+%doc src/cxx/test
+
+
+%files -n chealpix
+%defattr(-,root,root,-)
+%{_libdir}/libchealpix.so
 %doc COPYING READ_Copyrights_Licenses.txt
 
 
-%files -n healpix-fortran-devel
+%files -n chealpix-devel
 %defattr(-,root,root,-)
-%{_includedir}/healpix
+%{_bindir}/test_chealpix2
+%{_bindir}/test_cio
+%{_includedir}/chealpix.h
 
 
 %changelog
+* Sat Apr 04 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-5
+- Minor style adjustments
+- Don't override sane gcc flags
+- Moved tests to -devel packages
+- C++ -devel doesn't depend on fortran ones anymore
+- mkdir with -p to allow short-circuit builds
+- Fix build with GCC 4.4
+
+* Sat Apr 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-4
+- Review fixes.
+- Add C++ bindings, rename C++ and Fortran binaries (general names!).
+
 * Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
 - Build Fortran library as DSO
 



From airlied at fedoraproject.org  Tue Apr  7 08:46:41 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  7 Apr 2009 08:46:41 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.69,
	1.70 kernel.spec, 1.1515, 1.1516
Message-ID: <20090407084641.7293A70100@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20134

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com>
- drm-modesetting-radeon: repair vt switch


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- drm-modesetting-radeon.patch	6 Apr 2009 05:30:06 -0000	1.69
+++ drm-modesetting-radeon.patch	7 Apr 2009 08:46:40 -0000	1.70
@@ -1,3 +1,34 @@
+commit fd8377e53c5bb885904e8d1784276bdacee3a650
+Merge: e94c6e1 a6dd68b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 18:35:27 2009 +1000
+
+    Merge remote branch 'origin/drm-rawhide' into drm-f11
+
+commit a6dd68b3a5dee15f59bdaabf37b6a36da18a03f4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 17:25:13 2009 +1000
+
+    radeon: fix pinning/unpinning for frontbuffer
+
+commit 828d4bc8e75d8e8ac532269521d2aeb3b50ee529
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 16:58:35 2009 +1000
+
+    radeon: actually unpin cursor on freeing
+
+commit 70c85b35945d11fae318957c7fbc52ce566a6f03
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 20:33:56 2009 +1000
+
+    radeon: add info ioctl
+
+commit e94c6e10efb4dec58e4c0ab419050b11a913eaf9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 15:01:00 2009 +1000
+
+    drop initial config args
+
 commit 280d9ff29dead8e85ed603110ed431d99f07fb99
 Merge: 0221c81 54ed280
 Author: Dave Airlie <airlied at redhat.com>
@@ -22037,10 +22068,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
 new file mode 100644
-index 0000000..531774a
+index 0000000..7ddc8fd
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cursor.c
-@@ -0,0 +1,262 @@
+@@ -0,0 +1,264 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -22203,7 +22234,8 @@
 +	if (!handle) {
 +		/* turn off cursor */
 +		radeon_hide_cursor(crtc);
-+		return 0;
++		obj = NULL;
++		goto unpin;
 +	}
 +
 +	if ((width > CURSOR_WIDTH) || (height > CURSOR_HEIGHT)) {
@@ -22227,6 +22259,7 @@
 +	radeon_show_cursor(crtc);
 +	radeon_lock_cursor(crtc, false);
 +
++unpin:
 +	if (radeon_crtc->cursor_bo) {
 +		radeon_gem_object_unpin(radeon_crtc->cursor_bo);
 +		mutex_lock(&crtc->dev->struct_mutex);
@@ -22305,7 +22338,7 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..2d5ffc9
+index 0000000..0e0f1bf
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
 @@ -0,0 +1,643 @@
@@ -23150,7 +23183,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index ed4d27e..84f0a8c 100644
+index ed4d27e..c7d2265 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -23754,7 +23787,7 @@
  } while (0)
  
  #define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
-@@ -2035,4 +2204,158 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv);
+@@ -2035,4 +2204,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv);
  	write &= mask;						\
  } while (0)
  
@@ -23764,7 +23797,7 @@
 +	struct drm_buffer_object *bo;
 +	struct drm_fence_object *fence;
 +	struct drm_gem_object *obj;
-+	
++	int pin_count;
 +};
 +
 +#define RADEON_IB_MEMORY (1*1024*1024)
@@ -23912,6 +23945,7 @@
 +extern int r300_get_reg_flags(unsigned reg);
 +int radeon_gem_prelocate(struct drm_radeon_cs_parser *parser);
 +void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base);
++int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
@@ -25664,10 +25698,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
 new file mode 100644
-index 0000000..244b066
+index 0000000..148ee30
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_fb.c
-@@ -0,0 +1,927 @@
+@@ -0,0 +1,928 @@
 +/*
 + * Copyright ?? 2007 David Airlie
 + *
@@ -26583,6 +26617,7 @@
 +		drm_bo_kunmap(&radeon_fb->kmap_obj);
 +		dev_priv->mm.vram_visible += radeon_fb->obj->size;
 +		mutex_lock(&dev->struct_mutex);
++		radeon_gem_object_unpin(radeon_fb->obj);
 +		drm_gem_object_unreference(radeon_fb->obj);
 +		radeon_fb->obj = NULL;
 +		mutex_unlock(&dev->struct_mutex);
@@ -26702,10 +26737,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..2f0c54a
+index 0000000..d1abc6e
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1457 @@
+@@ -0,0 +1,1496 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -27841,6 +27876,10 @@
 +
 +	obj_priv = obj->driver_private;
 +
++	obj_priv->pin_count++;
++	if (obj_priv->pin_count != 1)
++		return 0;
++
 +	if (pin_domain) {
 +		mask |= DRM_BO_MASK_MEM;
 +		if (pin_domain == RADEON_GEM_DOMAIN_GTT)
@@ -27863,6 +27902,10 @@
 +
 +	obj_priv = obj->driver_private;
 +
++	obj_priv->pin_count--;
++	if (obj_priv->pin_count != 0)
++		return 0;
++
 +	ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
 +				 DRM_BO_HINT_DONT_FENCE, 0);
 +
@@ -28163,6 +28206,37 @@
 +	radeon_gem_ib_destroy(dev);
 +	return -ENOMEM;
 +}
++
++/*
++ *  * Userspace get informations ioctl
++ *   */
++int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
++{
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	struct drm_radeon_info *info;
++	uint32_t *value_ptr;
++	uint32_t value;
++
++	info = data;
++	value_ptr = (uint32_t*)(unsigned long)info->value;
++	switch (info->request) {
++	case RADEON_INFO_DEVICE_ID:
++		value = dev->pci_device;
++		break;
++	case RADEON_INFO_NUM_GB_PIPES:
++		value = dev_priv->num_gb_pipes;
++		break;
++	default:
++		DRM_DEBUG("Invalid request %d\n", info->request);
++		return -EINVAL;
++	}
++	if (DRM_COPY_TO_USER(value_ptr, &value, sizeof(uint32_t))) {
++		DRM_ERROR("copy_to_user\n");
++		return -EFAULT;
++	}
++	return 0;
++}
++
 diff --git a/drivers/gpu/drm/radeon/radeon_gem_debugfs.c b/drivers/gpu/drm/radeon/radeon_gem_debugfs.c
 new file mode 100644
 index 0000000..93f36ce
@@ -37101,7 +37175,7 @@
 +
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index fa728ec..ebc5d6c 100644
+index fa728ec..30af2d7 100644
 --- a/drivers/gpu/drm/radeon/radeon_state.c
 +++ b/drivers/gpu/drm/radeon/radeon_state.c
 @@ -305,8 +305,9 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
@@ -37277,7 +37351,7 @@
  		dev_priv->gart_info.table_size = sp->value;
  		if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE)
  			dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
-@@ -3226,7 +3246,17 @@ struct drm_ioctl_desc radeon_ioctls[] = {
+@@ -3226,7 +3246,18 @@ struct drm_ioctl_desc radeon_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
@@ -37293,6 +37367,7 @@
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_SET_DOMAIN, radeon_gem_set_domain_ioctl, DRM_AUTH),
 +	DRM_IOCTL_DEF(DRM_RADEON_GEM_WAIT_IDLE, radeon_gem_wait_rendering, DRM_AUTH),
 +	DRM_IOCTL_DEF(DRM_RADEON_CS, radeon_cs_ioctl, DRM_AUTH),
++	DRM_IOCTL_DEF(DRM_RADEON_INFO, radeon_info_ioctl, DRM_AUTH),
  };
  
  int radeon_max_ioctl = DRM_ARRAY_SIZE(radeon_ioctls);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1515
retrieving revision 1.1516
diff -u -r1.1515 -r1.1516
--- kernel.spec	6 Apr 2009 22:26:22 -0000	1.1515
+++ kernel.spec	7 Apr 2009 08:46:40 -0000	1.1516
@@ -1903,6 +1903,9 @@
 # and build.
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com>
+- drm-modesetting-radeon: repair vt switch
+
 * Mon Apr 06 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: rebase on drm-f11
 



From lkundrak at fedoraproject.org  Tue Apr  7 08:49:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:49:09 +0000 (UTC)
Subject: rpms/healpix/devel healpix-2.11c-gcc44.patch, NONE,
	1.1 healpix-f90test.sh, NONE, 1.1 healpix-2.11c-shlib.patch, 1.1, 1.2
Message-ID: <20090407084909.9A5D170100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20712/devel

Modified Files:
	healpix-2.11c-shlib.patch 
Added Files:
	healpix-2.11c-gcc44.patch healpix-f90test.sh 
Log Message:
Add missing sources

healpix-2.11c-gcc44.patch:

--- NEW FILE healpix-2.11c-gcc44.patch ---
Fix build with GCC 4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44	2009-04-04 14:57:00.959422841 +0200
+++ Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc	2009-04-04 14:57:07.608305831 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>
diff -up Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44	2009-04-04 14:57:38.576299113 +0200
+++ Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc	2009-04-04 14:57:44.702423754 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>


--- NEW FILE healpix-f90test.sh ---
#!/bin/bash

\rm test*
hp_synfast syn.par; \
hp_map2gif -inp test_map.fits -out test_map.gif -bar t -ttl 'CMB Map'; \
hp_smoothing smo.par; \
hp_map2gif -inp test_sm.fits -out test_sm.gif -bar t -ttl 'Smoothed CMB Map'; \
hp_ud_grade udg.par ; \
hp_map2gif -inp test_LOres.fits -out test_LOres.gif -bar t -ttl 'Degraded Map'; \
hp_hotspot hot.par ; \
hp_map2gif -inp test_ext.fits -out test_ext.gif -bar t -ttl 'Extrema Only Map'; \
hp_anafast ana.par; \
hp_alteralm alt.par; \
hp_median_filter med.par ; \
hp_map2gif -inp test_mf.fits -out test_mf.gif -bar t -ttl 'Median Filtered Map'; \
hp_sky_ng_sim ngfs.par ; \
hp_map2gif -inp test_ngfs.fits -out test_ngfs.gif -bar t -ttl 'Non-Gaussian Map'; \
echo "Healpix F90 tests done"

healpix-2.11c-shlib.patch:

Index: healpix-2.11c-shlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/healpix-2.11c-shlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix-2.11c-shlib.patch	7 Apr 2009 07:04:19 -0000	1.1
+++ healpix-2.11c-shlib.patch	7 Apr 2009 08:49:09 -0000	1.2
@@ -1,11 +1,333 @@
-Compile the Fortran library into a shared object instead
-of static library.
-
-Lubomir Rintel <lkundrak at v3.sk>
-
-diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
---- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/cxx/alice/planck.make.orig Healpix_2.11c/src/cxx/alice/planck.make
+--- Healpix_2.11c/src/cxx/alice/planck.make.orig	2009-01-08 18:19:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/alice/planck.make	2009-04-04 13:06:20.000000000 +0300
+@@ -20,28 +20,28 @@ test.o: alice_utils.h
+ alice2.o: alice_usage.h OrthogonalSkyMap.h
+ testOrthogonalSkyMap.o: OrthogonalSkyMap.h
+ 
+-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++generateTexture.o: 
+ generateTexture: generateTexture.o
+ 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++$(ALICE2_OBJ):
++alice2: $(ALICE2_OBJ)
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++alice_test: $(TEST_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 
+-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testSoSSkyMap: $(TESTSOS_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+ 
+-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testMollweideSkyMap: $(TESTMOL_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 	
+-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+diff -up Healpix_2.11c/src/cxx/config/rules.common.orig Healpix_2.11c/src/cxx/config/rules.common
+--- Healpix_2.11c/src/cxx/config/rules.common.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/config/rules.common	2009-04-04 12:57:03.000000000 +0300
+@@ -1,10 +1,6 @@
+ SRCROOT = $(LEVELS_SRC)
+ BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
+ PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
+-BINDIR	= $(PREFIX)/bin
+-INCDIR	= $(PREFIX)/include
+-LIBDIR	= $(PREFIX)/lib
+-DOCDIR	= $(SRCROOT)/doc
+ 
+ # do not use any suffix rules
+ .SUFFIXES:
+@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
+ prep:
+ 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
+ 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
+-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
+-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
+-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
+-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
++	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
++	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
++	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
++	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
+ 
+ $(SUBCLEAN):
+ 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
+@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
+ subdir_clean: $(SUBCLEAN)
+ 
+ install:
+-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
+-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
+-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
++	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
++	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
++	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
+ 
+ install: $(BINARIES) $(LIBRARIES)
+ $(BINARIES) $(LIBRARIES): $(OBJECTS)
+diff -up Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig Healpix_2.11c/src/cxx/cxxsupport/planck.make
+--- Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/cxxsupport/planck.make	2009-04-04 13:09:33.000000000 +0300
+@@ -1,7 +1,6 @@
+-TEMP1	= $(SRCROOT)/cxxsupport
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libcxxsupport.a
++LIBRARIES= libhealpix_cxxsupport.so
+ 
+ HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
+ 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
+@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
+ SIMPARAMS_H := simparams.h $(CXXUTILS_H)
+ PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
+ ARR_H := arr.h $(CXXUTILS_H)
+-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
++FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
+ VEC3_H := vec3.h
+ ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
+ POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
+@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
+ 
+ libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
+ 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
++
++.PHONY: libhealpix_cxxsupport.so
++libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
++	cp -p $@ $(DESTLIB)/
+diff -up Healpix_2.11c/src/cxx/docsrc/planck.make.orig Healpix_2.11c/src/cxx/docsrc/planck.make
+diff -up Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig Healpix_2.11c/src/cxx/Healpix_cxx/planck.make
+--- Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig	2006-12-04 21:31:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/Healpix_cxx/planck.make	2009-04-04 13:44:19.000000000 +0300
+@@ -1,21 +1,16 @@
+-TEMP1	= $(SRCROOT)/Healpix_cxx
+ VPATH	= $(TEMP1) $(LIBDIR)
+ 
+-LIBRARIES= libhealpix_cxx.a
++LIBRARIES= libhealpix_cxx.so
+ 
+ BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
+ 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
+ 	  rotalm_cxx mult_alm
+ 
+-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
+-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
+-	$(TEMP1)/powspec_fitsio.h \
+-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
+-
+-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
+-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
+-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
+-	$(SPHERE_HEADERS)
++SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
++	powspec_fitsio.h ylmgen.h alm_map_tools.h
++
++HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
++	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
+ 
+ include $(PARAMFILE)
+ 
+@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
+ HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
+ 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
+ 
+-healpix_base.o: healpix_base.h libcxxsupport.a
+-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
+-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
+-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
+-	libcxxsupport.a
+-alm_fitsio.o: alm_fitsio.h alm.h \
+-	libcxxsupport.a
+-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
+-powspec_fitsio.o: powspec.h libcxxsupport.a
+-powspec.o: powspec.h libcxxsupport.a
++healpix_base.o: healpix_base.h 
++healpix_base2.o: healpix_base.h healpix_base2.h 
++healpix_map.o: healpix_base.h healpix_map.h 
++healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
++alm_fitsio.o: alm_fitsio.h alm.h 
++healpix_data_io.o: healpix_data_io.h
++powspec_fitsio.o: powspec.h 
++powspec.o: powspec.h
+ alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
+-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
+-	libfftpack.a libcxxsupport.a
+-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
+-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
++	ylmgen.h alm_healpix_tools.h alm_map_tools.h
++alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
++alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
+ 
+ libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
+ 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
+ 
+-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++.PHONY: libhealpix_cxx.so
++libhealpix_cxx.so: $(HEALPIX_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
++	cp -p $@ $(DESTLIB)/
++
++
++syn_alm_cxx.o: libhealpix_cxx.so
+ syn_alm_cxx: syn_alm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
+-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
+ 
+-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++alm2map_cxx.o: libhealpix_cxx.so
+ alm2map_cxx: alm2map_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
+ 
+-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++anafast_cxx.o: libhealpix_cxx.so
+ anafast_cxx: anafast_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
+ 
+-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++map2tga.o: libhealpix_cxx.so
+ map2tga: map2tga.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
+ 
+-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++udgrade_cxx.o: libhealpix_cxx.so
+ udgrade_cxx: udgrade_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
+ 
+-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++hotspots_cxx.o: libhealpix_cxx.so
+ hotspots_cxx: hotspots_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
+ 
+-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++calc_powspec.o: libhealpix_cxx.so
+ calc_powspec: calc_powspec.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
+ 
+-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++median_filter.o: libhealpix_cxx.so
+ median_filter: median_filter.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
+ 
+-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
++hpxtest.o: libhealpix_cxx.so
+ hpxtest: hpxtest.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
+ 
+-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++smoothing_cxx.o: libhealpix_cxx.so
+ smoothing_cxx: smoothing_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
+ 
+-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
++rotalm_cxx.o: libhealpix_cxxsupport.so
+ rotalm_cxx: rotalm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
+ 
+-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++mult_alm.o: libhealpix_cxx.so
+ mult_alm: mult_alm.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
+diff -up Healpix_2.11c/src/cxx/libcfitsio/planck.make.orig Healpix_2.11c/src/cxx/libcfitsio/planck.make
+diff -up Healpix_2.11c/src/cxx/libfftpack/planck.make.orig Healpix_2.11c/src/cxx/libfftpack/planck.make
+--- Healpix_2.11c/src/cxx/libfftpack/planck.make.orig	2006-01-26 11:25:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/libfftpack/planck.make	2009-04-04 12:58:11.000000000 +0300
+@@ -1,9 +1,7 @@
+-TEMP1	= $(SRCROOT)/libfftpack
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libfftpack.a
++LIBRARIES= libhealpix_fft.so
+ 
+-HEADERS= $(TEMP1)/ls_fft.h
+ 
+ include $(PARAMFILE)
+ 
+@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
+ 
+ libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
+ 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
++
++libhealpix_fft.so: $(FFTPACK_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
++	cp -p $@ $(DESTLIB)/
++	cp -p *.h $(DESTINC)/
+diff -up Healpix_2.11c/src/cxx/test/runtest.sh.orig Healpix_2.11c/src/cxx/test/runtest.sh
+--- Healpix_2.11c/src/cxx/test/runtest.sh.orig	2006-03-12 13:29:24.000000000 +0200
++++ Healpix_2.11c/src/cxx/test/runtest.sh	2009-04-04 14:05:11.000000000 +0300
+@@ -1,16 +1,15 @@
+ #!/bin/sh
+ 
+-BINPATH=../$HEALPIX_TARGET/bin
+ 
+-time $BINPATH/syn_alm_cxx syn_alm.par && \
+-time $BINPATH/alm2map_cxx alm2map.par && \
+-time $BINPATH/map2tga test.fits test.tga -bar -title "Synthesized Map" && \
+-time $BINPATH/anafast_cxx anafast.par && \
+-time $BINPATH/alm2map_cxx alm2map2.par && \
+-time $BINPATH/map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
+-time $BINPATH/udgrade_cxx udgrade.par && \
+-time $BINPATH/map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
+-time $BINPATH/map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
+-time $BINPATH/alm2map_cxx alm2map3.par && \
+-time $BINPATH/map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
++time hp_syn_alm_cxx syn_alm.par && \
++time hp_alm2map_cxx alm2map.par && \
++time hp_map2tga test.fits test.tga -bar -title "Synthesized Map" && \
++time hp_anafast_cxx anafast.par && \
++time hp_alm2map_cxx alm2map2.par && \
++time hp_map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
++time hp_udgrade_cxx udgrade.par && \
++time hp_map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
++time hp_map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
++time hp_alm2map_cxx alm2map3.par && \
++time hp_map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
+ xv test.tga test2.tga test3.tga test4.tga test5.tga
+diff -up Healpix_2.11c/src/f90/alteralm/Makefile.orig Healpix_2.11c/src/f90/alteralm/Makefile
+--- Healpix_2.11c/src/f90/alteralm/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
  
  default: $(exec)
@@ -14,9 +336,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
---- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/anafast/Makefile.orig Healpix_2.11c/src/f90/anafast/Makefile
+--- Healpix_2.11c/src/f90/anafast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
  
  default: $(exec)
@@ -25,9 +347,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
---- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
-+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
+diff -up Healpix_2.11c/src/f90/hotspot/Makefile.orig Healpix_2.11c/src/f90/hotspot/Makefile
+--- Healpix_2.11c/src/f90/hotspot/Makefile.orig	2002-11-27 09:36:18.000000000 +0200
++++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
  
  default: $(exec)
@@ -36,15 +358,15 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
---- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
-+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/lib/Makefile.orig Healpix_2.11c/src/f90/lib/Makefile
+--- Healpix_2.11c/src/f90/lib/Makefile.orig	2005-01-28 09:33:25.000000000 +0200
++++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-04 13:54:44.000000000 +0300
 @@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
  %.o: %.f90
  	$(FC) $(FFLAGS) -c $< -o $@
  
 -default: libgif.a
-+default: libgif.so
++default: libhealpix_gif.so
  
  libgif.a: $(allobj)
  	$(AR) libgif.a $(allobj)
@@ -58,16 +380,16 @@
 +# he's really really sick, he's really really sick
 +# he's sick, he's sick.
 +# -- Alice Cooper
-+.PHONY: libgif.so
-+libgif.so: $(allobj)
++.PHONY: libhealpix_gif.so
++libhealpix_gif.so: $(allobj)
 +	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
 +	cp -p $@ $(LIBDIR)/
 +	for p in *.$(MOD); do \
 +	cp $$p $(INCDIR)/; \
 +	done
-diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
---- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
-+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/map2gif/Makefile.orig Healpix_2.11c/src/f90/map2gif/Makefile
+--- Healpix_2.11c/src/f90/map2gif/Makefile.orig	2003-02-17 13:06:10.000000000 +0200
++++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-04 13:55:21.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= map2gif.o
  
  default: $(exec)
@@ -75,10 +397,10 @@
 -$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
---- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
-+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhealpix_gif -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.11c/src/f90/median_filter/Makefile.orig Healpix_2.11c/src/f90/median_filter/Makefile
+--- Healpix_2.11c/src/f90/median_filter/Makefile.orig	2005-04-26 04:50:34.000000000 +0300
++++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
  
  default: $(exec)
@@ -87,9 +409,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
---- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
-+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/mod/Makefile.orig Healpix_2.11c/src/f90/mod/Makefile
+--- Healpix_2.11c/src/f90/mod/Makefile.orig	2008-01-29 18:39:20.000000000 +0200
++++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
  	esac
  
@@ -115,9 +437,9 @@
  alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
  	./gen_alm_code
  
-diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
---- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
-+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
+--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig	2009-02-09 22:24:46.000000000 +0200
++++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
  
  default: $(exec1) $(exec2)
@@ -131,9 +453,9 @@
 -	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 +$(exec2): $(obj2)
 +	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
---- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
-+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/plmgen/Makefile.orig Healpix_2.11c/src/f90/plmgen/Makefile
+--- Healpix_2.11c/src/f90/plmgen/Makefile.orig	2004-08-25 04:27:24.000000000 +0300
++++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -10,5 +10,5 @@ obj 	= plmgen.o
  
  default: $(exec)
@@ -142,9 +464,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
---- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/smoothing/Makefile.orig Healpix_2.11c/src/f90/smoothing/Makefile
+--- Healpix_2.11c/src/f90/smoothing/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
  
  default: $(exec)
@@ -153,9 +475,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
---- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/synfast/Makefile.orig Healpix_2.11c/src/f90/synfast/Makefile
+--- Healpix_2.11c/src/f90/synfast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
  
  default: $(exec)
@@ -164,9 +486,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
---- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
-+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.orig Healpix_2.11c/src/f90/ud_grade/Makefile
+--- Healpix_2.11c/src/f90/ud_grade/Makefile.orig	2005-06-03 12:44:52.000000000 +0300
++++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
  
  default: $(exec)



From lkundrak at fedoraproject.org  Tue Apr  7 08:49:38 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:49:38 +0000 (UTC)
Subject: rpms/healpix/EL-5 healpix-2.11c-gcc44.patch, NONE,
	1.1 healpix-f90test.sh, NONE, 1.1 healpix-2.11c-shlib.patch, 1.1, 1.2
Message-ID: <20090407084938.BBD6E70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20712/EL-5

Modified Files:
	healpix-2.11c-shlib.patch 
Added Files:
	healpix-2.11c-gcc44.patch healpix-f90test.sh 
Log Message:
Add missing sources

healpix-2.11c-gcc44.patch:

--- NEW FILE healpix-2.11c-gcc44.patch ---
Fix build with GCC 4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44	2009-04-04 14:57:00.959422841 +0200
+++ Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc	2009-04-04 14:57:07.608305831 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>
diff -up Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44	2009-04-04 14:57:38.576299113 +0200
+++ Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc	2009-04-04 14:57:44.702423754 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>


--- NEW FILE healpix-f90test.sh ---
#!/bin/bash

\rm test*
hp_synfast syn.par; \
hp_map2gif -inp test_map.fits -out test_map.gif -bar t -ttl 'CMB Map'; \
hp_smoothing smo.par; \
hp_map2gif -inp test_sm.fits -out test_sm.gif -bar t -ttl 'Smoothed CMB Map'; \
hp_ud_grade udg.par ; \
hp_map2gif -inp test_LOres.fits -out test_LOres.gif -bar t -ttl 'Degraded Map'; \
hp_hotspot hot.par ; \
hp_map2gif -inp test_ext.fits -out test_ext.gif -bar t -ttl 'Extrema Only Map'; \
hp_anafast ana.par; \
hp_alteralm alt.par; \
hp_median_filter med.par ; \
hp_map2gif -inp test_mf.fits -out test_mf.gif -bar t -ttl 'Median Filtered Map'; \
hp_sky_ng_sim ngfs.par ; \
hp_map2gif -inp test_ngfs.fits -out test_ngfs.gif -bar t -ttl 'Non-Gaussian Map'; \
echo "Healpix F90 tests done"

healpix-2.11c-shlib.patch:

Index: healpix-2.11c-shlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/healpix-2.11c-shlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix-2.11c-shlib.patch	7 Apr 2009 07:04:17 -0000	1.1
+++ healpix-2.11c-shlib.patch	7 Apr 2009 08:49:08 -0000	1.2
@@ -1,11 +1,333 @@
-Compile the Fortran library into a shared object instead
-of static library.
-
-Lubomir Rintel <lkundrak at v3.sk>
-
-diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
---- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/cxx/alice/planck.make.orig Healpix_2.11c/src/cxx/alice/planck.make
+--- Healpix_2.11c/src/cxx/alice/planck.make.orig	2009-01-08 18:19:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/alice/planck.make	2009-04-04 13:06:20.000000000 +0300
+@@ -20,28 +20,28 @@ test.o: alice_utils.h
+ alice2.o: alice_usage.h OrthogonalSkyMap.h
+ testOrthogonalSkyMap.o: OrthogonalSkyMap.h
+ 
+-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++generateTexture.o: 
+ generateTexture: generateTexture.o
+ 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++$(ALICE2_OBJ):
++alice2: $(ALICE2_OBJ)
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++alice_test: $(TEST_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 
+-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testSoSSkyMap: $(TESTSOS_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+ 
+-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testMollweideSkyMap: $(TESTMOL_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 	
+-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+diff -up Healpix_2.11c/src/cxx/config/rules.common.orig Healpix_2.11c/src/cxx/config/rules.common
+--- Healpix_2.11c/src/cxx/config/rules.common.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/config/rules.common	2009-04-04 12:57:03.000000000 +0300
+@@ -1,10 +1,6 @@
+ SRCROOT = $(LEVELS_SRC)
+ BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
+ PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
+-BINDIR	= $(PREFIX)/bin
+-INCDIR	= $(PREFIX)/include
+-LIBDIR	= $(PREFIX)/lib
+-DOCDIR	= $(SRCROOT)/doc
+ 
+ # do not use any suffix rules
+ .SUFFIXES:
+@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
+ prep:
+ 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
+ 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
+-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
+-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
+-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
+-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
++	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
++	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
++	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
++	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
+ 
+ $(SUBCLEAN):
+ 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
+@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
+ subdir_clean: $(SUBCLEAN)
+ 
+ install:
+-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
+-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
+-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
++	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
++	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
++	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
+ 
+ install: $(BINARIES) $(LIBRARIES)
+ $(BINARIES) $(LIBRARIES): $(OBJECTS)
+diff -up Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig Healpix_2.11c/src/cxx/cxxsupport/planck.make
+--- Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/cxxsupport/planck.make	2009-04-04 13:09:33.000000000 +0300
+@@ -1,7 +1,6 @@
+-TEMP1	= $(SRCROOT)/cxxsupport
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libcxxsupport.a
++LIBRARIES= libhealpix_cxxsupport.so
+ 
+ HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
+ 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
+@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
+ SIMPARAMS_H := simparams.h $(CXXUTILS_H)
+ PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
+ ARR_H := arr.h $(CXXUTILS_H)
+-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
++FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
+ VEC3_H := vec3.h
+ ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
+ POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
+@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
+ 
+ libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
+ 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
++
++.PHONY: libhealpix_cxxsupport.so
++libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
++	cp -p $@ $(DESTLIB)/
+diff -up Healpix_2.11c/src/cxx/docsrc/planck.make.orig Healpix_2.11c/src/cxx/docsrc/planck.make
+diff -up Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig Healpix_2.11c/src/cxx/Healpix_cxx/planck.make
+--- Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig	2006-12-04 21:31:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/Healpix_cxx/planck.make	2009-04-04 13:44:19.000000000 +0300
+@@ -1,21 +1,16 @@
+-TEMP1	= $(SRCROOT)/Healpix_cxx
+ VPATH	= $(TEMP1) $(LIBDIR)
+ 
+-LIBRARIES= libhealpix_cxx.a
++LIBRARIES= libhealpix_cxx.so
+ 
+ BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
+ 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
+ 	  rotalm_cxx mult_alm
+ 
+-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
+-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
+-	$(TEMP1)/powspec_fitsio.h \
+-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
+-
+-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
+-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
+-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
+-	$(SPHERE_HEADERS)
++SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
++	powspec_fitsio.h ylmgen.h alm_map_tools.h
++
++HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
++	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
+ 
+ include $(PARAMFILE)
+ 
+@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
+ HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
+ 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
+ 
+-healpix_base.o: healpix_base.h libcxxsupport.a
+-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
+-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
+-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
+-	libcxxsupport.a
+-alm_fitsio.o: alm_fitsio.h alm.h \
+-	libcxxsupport.a
+-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
+-powspec_fitsio.o: powspec.h libcxxsupport.a
+-powspec.o: powspec.h libcxxsupport.a
++healpix_base.o: healpix_base.h 
++healpix_base2.o: healpix_base.h healpix_base2.h 
++healpix_map.o: healpix_base.h healpix_map.h 
++healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
++alm_fitsio.o: alm_fitsio.h alm.h 
++healpix_data_io.o: healpix_data_io.h
++powspec_fitsio.o: powspec.h 
++powspec.o: powspec.h
+ alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
+-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
+-	libfftpack.a libcxxsupport.a
+-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
+-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
++	ylmgen.h alm_healpix_tools.h alm_map_tools.h
++alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
++alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
+ 
+ libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
+ 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
+ 
+-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++.PHONY: libhealpix_cxx.so
++libhealpix_cxx.so: $(HEALPIX_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
++	cp -p $@ $(DESTLIB)/
++
++
++syn_alm_cxx.o: libhealpix_cxx.so
+ syn_alm_cxx: syn_alm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
+-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
+ 
+-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++alm2map_cxx.o: libhealpix_cxx.so
+ alm2map_cxx: alm2map_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
+ 
+-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++anafast_cxx.o: libhealpix_cxx.so
+ anafast_cxx: anafast_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
+ 
+-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++map2tga.o: libhealpix_cxx.so
+ map2tga: map2tga.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
+ 
+-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++udgrade_cxx.o: libhealpix_cxx.so
+ udgrade_cxx: udgrade_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
+ 
+-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++hotspots_cxx.o: libhealpix_cxx.so
+ hotspots_cxx: hotspots_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
+ 
+-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++calc_powspec.o: libhealpix_cxx.so
+ calc_powspec: calc_powspec.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
+ 
+-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++median_filter.o: libhealpix_cxx.so
+ median_filter: median_filter.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
+ 
+-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
++hpxtest.o: libhealpix_cxx.so
+ hpxtest: hpxtest.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
+ 
+-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++smoothing_cxx.o: libhealpix_cxx.so
+ smoothing_cxx: smoothing_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
+ 
+-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
++rotalm_cxx.o: libhealpix_cxxsupport.so
+ rotalm_cxx: rotalm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
+ 
+-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++mult_alm.o: libhealpix_cxx.so
+ mult_alm: mult_alm.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
+diff -up Healpix_2.11c/src/cxx/libcfitsio/planck.make.orig Healpix_2.11c/src/cxx/libcfitsio/planck.make
+diff -up Healpix_2.11c/src/cxx/libfftpack/planck.make.orig Healpix_2.11c/src/cxx/libfftpack/planck.make
+--- Healpix_2.11c/src/cxx/libfftpack/planck.make.orig	2006-01-26 11:25:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/libfftpack/planck.make	2009-04-04 12:58:11.000000000 +0300
+@@ -1,9 +1,7 @@
+-TEMP1	= $(SRCROOT)/libfftpack
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libfftpack.a
++LIBRARIES= libhealpix_fft.so
+ 
+-HEADERS= $(TEMP1)/ls_fft.h
+ 
+ include $(PARAMFILE)
+ 
+@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
+ 
+ libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
+ 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
++
++libhealpix_fft.so: $(FFTPACK_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
++	cp -p $@ $(DESTLIB)/
++	cp -p *.h $(DESTINC)/
+diff -up Healpix_2.11c/src/cxx/test/runtest.sh.orig Healpix_2.11c/src/cxx/test/runtest.sh
+--- Healpix_2.11c/src/cxx/test/runtest.sh.orig	2006-03-12 13:29:24.000000000 +0200
++++ Healpix_2.11c/src/cxx/test/runtest.sh	2009-04-04 14:05:11.000000000 +0300
+@@ -1,16 +1,15 @@
+ #!/bin/sh
+ 
+-BINPATH=../$HEALPIX_TARGET/bin
+ 
+-time $BINPATH/syn_alm_cxx syn_alm.par && \
+-time $BINPATH/alm2map_cxx alm2map.par && \
+-time $BINPATH/map2tga test.fits test.tga -bar -title "Synthesized Map" && \
+-time $BINPATH/anafast_cxx anafast.par && \
+-time $BINPATH/alm2map_cxx alm2map2.par && \
+-time $BINPATH/map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
+-time $BINPATH/udgrade_cxx udgrade.par && \
+-time $BINPATH/map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
+-time $BINPATH/map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
+-time $BINPATH/alm2map_cxx alm2map3.par && \
+-time $BINPATH/map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
++time hp_syn_alm_cxx syn_alm.par && \
++time hp_alm2map_cxx alm2map.par && \
++time hp_map2tga test.fits test.tga -bar -title "Synthesized Map" && \
++time hp_anafast_cxx anafast.par && \
++time hp_alm2map_cxx alm2map2.par && \
++time hp_map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
++time hp_udgrade_cxx udgrade.par && \
++time hp_map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
++time hp_map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
++time hp_alm2map_cxx alm2map3.par && \
++time hp_map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
+ xv test.tga test2.tga test3.tga test4.tga test5.tga
+diff -up Healpix_2.11c/src/f90/alteralm/Makefile.orig Healpix_2.11c/src/f90/alteralm/Makefile
+--- Healpix_2.11c/src/f90/alteralm/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
  
  default: $(exec)
@@ -14,9 +336,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
---- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/anafast/Makefile.orig Healpix_2.11c/src/f90/anafast/Makefile
+--- Healpix_2.11c/src/f90/anafast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
  
  default: $(exec)
@@ -25,9 +347,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
---- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
-+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
+diff -up Healpix_2.11c/src/f90/hotspot/Makefile.orig Healpix_2.11c/src/f90/hotspot/Makefile
+--- Healpix_2.11c/src/f90/hotspot/Makefile.orig	2002-11-27 09:36:18.000000000 +0200
++++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
  
  default: $(exec)
@@ -36,15 +358,15 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
---- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
-+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/lib/Makefile.orig Healpix_2.11c/src/f90/lib/Makefile
+--- Healpix_2.11c/src/f90/lib/Makefile.orig	2005-01-28 09:33:25.000000000 +0200
++++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-04 13:54:44.000000000 +0300
 @@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
  %.o: %.f90
  	$(FC) $(FFLAGS) -c $< -o $@
  
 -default: libgif.a
-+default: libgif.so
++default: libhealpix_gif.so
  
  libgif.a: $(allobj)
  	$(AR) libgif.a $(allobj)
@@ -58,16 +380,16 @@
 +# he's really really sick, he's really really sick
 +# he's sick, he's sick.
 +# -- Alice Cooper
-+.PHONY: libgif.so
-+libgif.so: $(allobj)
++.PHONY: libhealpix_gif.so
++libhealpix_gif.so: $(allobj)
 +	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
 +	cp -p $@ $(LIBDIR)/
 +	for p in *.$(MOD); do \
 +	cp $$p $(INCDIR)/; \
 +	done
-diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
---- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
-+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/map2gif/Makefile.orig Healpix_2.11c/src/f90/map2gif/Makefile
+--- Healpix_2.11c/src/f90/map2gif/Makefile.orig	2003-02-17 13:06:10.000000000 +0200
++++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-04 13:55:21.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= map2gif.o
  
  default: $(exec)
@@ -75,10 +397,10 @@
 -$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
---- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
-+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhealpix_gif -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.11c/src/f90/median_filter/Makefile.orig Healpix_2.11c/src/f90/median_filter/Makefile
+--- Healpix_2.11c/src/f90/median_filter/Makefile.orig	2005-04-26 04:50:34.000000000 +0300
++++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
  
  default: $(exec)
@@ -87,9 +409,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
---- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
-+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/mod/Makefile.orig Healpix_2.11c/src/f90/mod/Makefile
+--- Healpix_2.11c/src/f90/mod/Makefile.orig	2008-01-29 18:39:20.000000000 +0200
++++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
  	esac
  
@@ -115,9 +437,9 @@
  alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
  	./gen_alm_code
  
-diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
---- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
-+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
+--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig	2009-02-09 22:24:46.000000000 +0200
++++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
  
  default: $(exec1) $(exec2)
@@ -131,9 +453,9 @@
 -	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 +$(exec2): $(obj2)
 +	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
---- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
-+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/plmgen/Makefile.orig Healpix_2.11c/src/f90/plmgen/Makefile
+--- Healpix_2.11c/src/f90/plmgen/Makefile.orig	2004-08-25 04:27:24.000000000 +0300
++++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -10,5 +10,5 @@ obj 	= plmgen.o
  
  default: $(exec)
@@ -142,9 +464,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
---- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/smoothing/Makefile.orig Healpix_2.11c/src/f90/smoothing/Makefile
+--- Healpix_2.11c/src/f90/smoothing/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
  
  default: $(exec)
@@ -153,9 +475,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
---- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/synfast/Makefile.orig Healpix_2.11c/src/f90/synfast/Makefile
+--- Healpix_2.11c/src/f90/synfast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
  
  default: $(exec)
@@ -164,9 +486,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
---- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
-+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.orig Healpix_2.11c/src/f90/ud_grade/Makefile
+--- Healpix_2.11c/src/f90/ud_grade/Makefile.orig	2005-06-03 12:44:52.000000000 +0300
++++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
  
  default: $(exec)



From lkundrak at fedoraproject.org  Tue Apr  7 08:49:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:49:39 +0000 (UTC)
Subject: rpms/healpix/F-11 healpix-2.11c-gcc44.patch, NONE,
	1.1 healpix-f90test.sh, NONE, 1.1 healpix-2.11c-shlib.patch, 1.1, 1.2
Message-ID: <20090407084939.4009B70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20712/F-11

Modified Files:
	healpix-2.11c-shlib.patch 
Added Files:
	healpix-2.11c-gcc44.patch healpix-f90test.sh 
Log Message:
Add missing sources

healpix-2.11c-gcc44.patch:

--- NEW FILE healpix-2.11c-gcc44.patch ---
Fix build with GCC 4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44	2009-04-04 14:57:00.959422841 +0200
+++ Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc	2009-04-04 14:57:07.608305831 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>
diff -up Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44	2009-04-04 14:57:38.576299113 +0200
+++ Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc	2009-04-04 14:57:44.702423754 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>


--- NEW FILE healpix-f90test.sh ---
#!/bin/bash

\rm test*
hp_synfast syn.par; \
hp_map2gif -inp test_map.fits -out test_map.gif -bar t -ttl 'CMB Map'; \
hp_smoothing smo.par; \
hp_map2gif -inp test_sm.fits -out test_sm.gif -bar t -ttl 'Smoothed CMB Map'; \
hp_ud_grade udg.par ; \
hp_map2gif -inp test_LOres.fits -out test_LOres.gif -bar t -ttl 'Degraded Map'; \
hp_hotspot hot.par ; \
hp_map2gif -inp test_ext.fits -out test_ext.gif -bar t -ttl 'Extrema Only Map'; \
hp_anafast ana.par; \
hp_alteralm alt.par; \
hp_median_filter med.par ; \
hp_map2gif -inp test_mf.fits -out test_mf.gif -bar t -ttl 'Median Filtered Map'; \
hp_sky_ng_sim ngfs.par ; \
hp_map2gif -inp test_ngfs.fits -out test_ngfs.gif -bar t -ttl 'Non-Gaussian Map'; \
echo "Healpix F90 tests done"

healpix-2.11c-shlib.patch:

Index: healpix-2.11c-shlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/healpix-2.11c-shlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix-2.11c-shlib.patch	7 Apr 2009 07:04:19 -0000	1.1
+++ healpix-2.11c-shlib.patch	7 Apr 2009 08:49:08 -0000	1.2
@@ -1,11 +1,333 @@
-Compile the Fortran library into a shared object instead
-of static library.
-
-Lubomir Rintel <lkundrak at v3.sk>
-
-diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
---- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/cxx/alice/planck.make.orig Healpix_2.11c/src/cxx/alice/planck.make
+--- Healpix_2.11c/src/cxx/alice/planck.make.orig	2009-01-08 18:19:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/alice/planck.make	2009-04-04 13:06:20.000000000 +0300
+@@ -20,28 +20,28 @@ test.o: alice_utils.h
+ alice2.o: alice_usage.h OrthogonalSkyMap.h
+ testOrthogonalSkyMap.o: OrthogonalSkyMap.h
+ 
+-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++generateTexture.o: 
+ generateTexture: generateTexture.o
+ 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++$(ALICE2_OBJ):
++alice2: $(ALICE2_OBJ)
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++alice_test: $(TEST_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 
+-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testSoSSkyMap: $(TESTSOS_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+ 
+-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testMollweideSkyMap: $(TESTMOL_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 	
+-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+diff -up Healpix_2.11c/src/cxx/config/rules.common.orig Healpix_2.11c/src/cxx/config/rules.common
+--- Healpix_2.11c/src/cxx/config/rules.common.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/config/rules.common	2009-04-04 12:57:03.000000000 +0300
+@@ -1,10 +1,6 @@
+ SRCROOT = $(LEVELS_SRC)
+ BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
+ PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
+-BINDIR	= $(PREFIX)/bin
+-INCDIR	= $(PREFIX)/include
+-LIBDIR	= $(PREFIX)/lib
+-DOCDIR	= $(SRCROOT)/doc
+ 
+ # do not use any suffix rules
+ .SUFFIXES:
+@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
+ prep:
+ 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
+ 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
+-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
+-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
+-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
+-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
++	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
++	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
++	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
++	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
+ 
+ $(SUBCLEAN):
+ 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
+@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
+ subdir_clean: $(SUBCLEAN)
+ 
+ install:
+-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
+-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
+-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
++	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
++	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
++	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
+ 
+ install: $(BINARIES) $(LIBRARIES)
+ $(BINARIES) $(LIBRARIES): $(OBJECTS)
+diff -up Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig Healpix_2.11c/src/cxx/cxxsupport/planck.make
+--- Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/cxxsupport/planck.make	2009-04-04 13:09:33.000000000 +0300
+@@ -1,7 +1,6 @@
+-TEMP1	= $(SRCROOT)/cxxsupport
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libcxxsupport.a
++LIBRARIES= libhealpix_cxxsupport.so
+ 
+ HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
+ 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
+@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
+ SIMPARAMS_H := simparams.h $(CXXUTILS_H)
+ PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
+ ARR_H := arr.h $(CXXUTILS_H)
+-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
++FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
+ VEC3_H := vec3.h
+ ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
+ POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
+@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
+ 
+ libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
+ 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
++
++.PHONY: libhealpix_cxxsupport.so
++libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
++	cp -p $@ $(DESTLIB)/
+diff -up Healpix_2.11c/src/cxx/docsrc/planck.make.orig Healpix_2.11c/src/cxx/docsrc/planck.make
+diff -up Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig Healpix_2.11c/src/cxx/Healpix_cxx/planck.make
+--- Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig	2006-12-04 21:31:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/Healpix_cxx/planck.make	2009-04-04 13:44:19.000000000 +0300
+@@ -1,21 +1,16 @@
+-TEMP1	= $(SRCROOT)/Healpix_cxx
+ VPATH	= $(TEMP1) $(LIBDIR)
+ 
+-LIBRARIES= libhealpix_cxx.a
++LIBRARIES= libhealpix_cxx.so
+ 
+ BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
+ 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
+ 	  rotalm_cxx mult_alm
+ 
+-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
+-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
+-	$(TEMP1)/powspec_fitsio.h \
+-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
+-
+-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
+-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
+-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
+-	$(SPHERE_HEADERS)
++SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
++	powspec_fitsio.h ylmgen.h alm_map_tools.h
++
++HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
++	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
+ 
+ include $(PARAMFILE)
+ 
+@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
+ HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
+ 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
+ 
+-healpix_base.o: healpix_base.h libcxxsupport.a
+-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
+-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
+-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
+-	libcxxsupport.a
+-alm_fitsio.o: alm_fitsio.h alm.h \
+-	libcxxsupport.a
+-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
+-powspec_fitsio.o: powspec.h libcxxsupport.a
+-powspec.o: powspec.h libcxxsupport.a
++healpix_base.o: healpix_base.h 
++healpix_base2.o: healpix_base.h healpix_base2.h 
++healpix_map.o: healpix_base.h healpix_map.h 
++healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
++alm_fitsio.o: alm_fitsio.h alm.h 
++healpix_data_io.o: healpix_data_io.h
++powspec_fitsio.o: powspec.h 
++powspec.o: powspec.h
+ alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
+-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
+-	libfftpack.a libcxxsupport.a
+-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
+-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
++	ylmgen.h alm_healpix_tools.h alm_map_tools.h
++alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
++alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
+ 
+ libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
+ 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
+ 
+-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++.PHONY: libhealpix_cxx.so
++libhealpix_cxx.so: $(HEALPIX_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
++	cp -p $@ $(DESTLIB)/
++
++
++syn_alm_cxx.o: libhealpix_cxx.so
+ syn_alm_cxx: syn_alm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
+-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
+ 
+-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++alm2map_cxx.o: libhealpix_cxx.so
+ alm2map_cxx: alm2map_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
+ 
+-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++anafast_cxx.o: libhealpix_cxx.so
+ anafast_cxx: anafast_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
+ 
+-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++map2tga.o: libhealpix_cxx.so
+ map2tga: map2tga.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
+ 
+-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++udgrade_cxx.o: libhealpix_cxx.so
+ udgrade_cxx: udgrade_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
+ 
+-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++hotspots_cxx.o: libhealpix_cxx.so
+ hotspots_cxx: hotspots_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
+ 
+-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++calc_powspec.o: libhealpix_cxx.so
+ calc_powspec: calc_powspec.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
+ 
+-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++median_filter.o: libhealpix_cxx.so
+ median_filter: median_filter.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
+ 
+-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
++hpxtest.o: libhealpix_cxx.so
+ hpxtest: hpxtest.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
+ 
+-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++smoothing_cxx.o: libhealpix_cxx.so
+ smoothing_cxx: smoothing_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
+ 
+-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
++rotalm_cxx.o: libhealpix_cxxsupport.so
+ rotalm_cxx: rotalm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
+ 
+-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++mult_alm.o: libhealpix_cxx.so
+ mult_alm: mult_alm.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
+diff -up Healpix_2.11c/src/cxx/libcfitsio/planck.make.orig Healpix_2.11c/src/cxx/libcfitsio/planck.make
+diff -up Healpix_2.11c/src/cxx/libfftpack/planck.make.orig Healpix_2.11c/src/cxx/libfftpack/planck.make
+--- Healpix_2.11c/src/cxx/libfftpack/planck.make.orig	2006-01-26 11:25:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/libfftpack/planck.make	2009-04-04 12:58:11.000000000 +0300
+@@ -1,9 +1,7 @@
+-TEMP1	= $(SRCROOT)/libfftpack
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libfftpack.a
++LIBRARIES= libhealpix_fft.so
+ 
+-HEADERS= $(TEMP1)/ls_fft.h
+ 
+ include $(PARAMFILE)
+ 
+@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
+ 
+ libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
+ 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
++
++libhealpix_fft.so: $(FFTPACK_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
++	cp -p $@ $(DESTLIB)/
++	cp -p *.h $(DESTINC)/
+diff -up Healpix_2.11c/src/cxx/test/runtest.sh.orig Healpix_2.11c/src/cxx/test/runtest.sh
+--- Healpix_2.11c/src/cxx/test/runtest.sh.orig	2006-03-12 13:29:24.000000000 +0200
++++ Healpix_2.11c/src/cxx/test/runtest.sh	2009-04-04 14:05:11.000000000 +0300
+@@ -1,16 +1,15 @@
+ #!/bin/sh
+ 
+-BINPATH=../$HEALPIX_TARGET/bin
+ 
+-time $BINPATH/syn_alm_cxx syn_alm.par && \
+-time $BINPATH/alm2map_cxx alm2map.par && \
+-time $BINPATH/map2tga test.fits test.tga -bar -title "Synthesized Map" && \
+-time $BINPATH/anafast_cxx anafast.par && \
+-time $BINPATH/alm2map_cxx alm2map2.par && \
+-time $BINPATH/map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
+-time $BINPATH/udgrade_cxx udgrade.par && \
+-time $BINPATH/map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
+-time $BINPATH/map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
+-time $BINPATH/alm2map_cxx alm2map3.par && \
+-time $BINPATH/map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
++time hp_syn_alm_cxx syn_alm.par && \
++time hp_alm2map_cxx alm2map.par && \
++time hp_map2tga test.fits test.tga -bar -title "Synthesized Map" && \
++time hp_anafast_cxx anafast.par && \
++time hp_alm2map_cxx alm2map2.par && \
++time hp_map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
++time hp_udgrade_cxx udgrade.par && \
++time hp_map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
++time hp_map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
++time hp_alm2map_cxx alm2map3.par && \
++time hp_map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
+ xv test.tga test2.tga test3.tga test4.tga test5.tga
+diff -up Healpix_2.11c/src/f90/alteralm/Makefile.orig Healpix_2.11c/src/f90/alteralm/Makefile
+--- Healpix_2.11c/src/f90/alteralm/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
  
  default: $(exec)
@@ -14,9 +336,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
---- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/anafast/Makefile.orig Healpix_2.11c/src/f90/anafast/Makefile
+--- Healpix_2.11c/src/f90/anafast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
  
  default: $(exec)
@@ -25,9 +347,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
---- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
-+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
+diff -up Healpix_2.11c/src/f90/hotspot/Makefile.orig Healpix_2.11c/src/f90/hotspot/Makefile
+--- Healpix_2.11c/src/f90/hotspot/Makefile.orig	2002-11-27 09:36:18.000000000 +0200
++++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
  
  default: $(exec)
@@ -36,15 +358,15 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
---- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
-+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/lib/Makefile.orig Healpix_2.11c/src/f90/lib/Makefile
+--- Healpix_2.11c/src/f90/lib/Makefile.orig	2005-01-28 09:33:25.000000000 +0200
++++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-04 13:54:44.000000000 +0300
 @@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
  %.o: %.f90
  	$(FC) $(FFLAGS) -c $< -o $@
  
 -default: libgif.a
-+default: libgif.so
++default: libhealpix_gif.so
  
  libgif.a: $(allobj)
  	$(AR) libgif.a $(allobj)
@@ -58,16 +380,16 @@
 +# he's really really sick, he's really really sick
 +# he's sick, he's sick.
 +# -- Alice Cooper
-+.PHONY: libgif.so
-+libgif.so: $(allobj)
++.PHONY: libhealpix_gif.so
++libhealpix_gif.so: $(allobj)
 +	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
 +	cp -p $@ $(LIBDIR)/
 +	for p in *.$(MOD); do \
 +	cp $$p $(INCDIR)/; \
 +	done
-diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
---- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
-+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/map2gif/Makefile.orig Healpix_2.11c/src/f90/map2gif/Makefile
+--- Healpix_2.11c/src/f90/map2gif/Makefile.orig	2003-02-17 13:06:10.000000000 +0200
++++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-04 13:55:21.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= map2gif.o
  
  default: $(exec)
@@ -75,10 +397,10 @@
 -$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
---- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
-+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhealpix_gif -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.11c/src/f90/median_filter/Makefile.orig Healpix_2.11c/src/f90/median_filter/Makefile
+--- Healpix_2.11c/src/f90/median_filter/Makefile.orig	2005-04-26 04:50:34.000000000 +0300
++++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
  
  default: $(exec)
@@ -87,9 +409,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
---- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
-+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/mod/Makefile.orig Healpix_2.11c/src/f90/mod/Makefile
+--- Healpix_2.11c/src/f90/mod/Makefile.orig	2008-01-29 18:39:20.000000000 +0200
++++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
  	esac
  
@@ -115,9 +437,9 @@
  alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
  	./gen_alm_code
  
-diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
---- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
-+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
+--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig	2009-02-09 22:24:46.000000000 +0200
++++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
  
  default: $(exec1) $(exec2)
@@ -131,9 +453,9 @@
 -	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 +$(exec2): $(obj2)
 +	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
---- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
-+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/plmgen/Makefile.orig Healpix_2.11c/src/f90/plmgen/Makefile
+--- Healpix_2.11c/src/f90/plmgen/Makefile.orig	2004-08-25 04:27:24.000000000 +0300
++++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -10,5 +10,5 @@ obj 	= plmgen.o
  
  default: $(exec)
@@ -142,9 +464,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
---- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/smoothing/Makefile.orig Healpix_2.11c/src/f90/smoothing/Makefile
+--- Healpix_2.11c/src/f90/smoothing/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
  
  default: $(exec)
@@ -153,9 +475,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
---- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/synfast/Makefile.orig Healpix_2.11c/src/f90/synfast/Makefile
+--- Healpix_2.11c/src/f90/synfast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
  
  default: $(exec)
@@ -164,9 +486,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
---- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
-+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.orig Healpix_2.11c/src/f90/ud_grade/Makefile
+--- Healpix_2.11c/src/f90/ud_grade/Makefile.orig	2005-06-03 12:44:52.000000000 +0300
++++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
  
  default: $(exec)



From lkundrak at fedoraproject.org  Tue Apr  7 08:49:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 08:49:39 +0000 (UTC)
Subject: rpms/healpix/F-10 healpix-2.11c-gcc44.patch, NONE,
	1.1 healpix-f90test.sh, NONE, 1.1 healpix-2.11c-shlib.patch, 1.1, 1.2
Message-ID: <20090407084939.018DF70137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/healpix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20712/F-10

Modified Files:
	healpix-2.11c-shlib.patch 
Added Files:
	healpix-2.11c-gcc44.patch healpix-f90test.sh 
Log Message:
Add missing sources

healpix-2.11c-gcc44.patch:

--- NEW FILE healpix-2.11c-gcc44.patch ---
Fix build with GCC 4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -up Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc.gcc44	2009-04-04 14:57:00.959422841 +0200
+++ Healpix_2.11c/src/cxx/alice/testMollweideSkyMap.cc	2009-04-04 14:57:07.608305831 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>
diff -up Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44 Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc
--- Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc.gcc44	2009-04-04 14:57:38.576299113 +0200
+++ Healpix_2.11c/src/cxx/alice/testOrthogonalSkyMap.cc	2009-04-04 14:57:44.702423754 +0200
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <math.h>


--- NEW FILE healpix-f90test.sh ---
#!/bin/bash

\rm test*
hp_synfast syn.par; \
hp_map2gif -inp test_map.fits -out test_map.gif -bar t -ttl 'CMB Map'; \
hp_smoothing smo.par; \
hp_map2gif -inp test_sm.fits -out test_sm.gif -bar t -ttl 'Smoothed CMB Map'; \
hp_ud_grade udg.par ; \
hp_map2gif -inp test_LOres.fits -out test_LOres.gif -bar t -ttl 'Degraded Map'; \
hp_hotspot hot.par ; \
hp_map2gif -inp test_ext.fits -out test_ext.gif -bar t -ttl 'Extrema Only Map'; \
hp_anafast ana.par; \
hp_alteralm alt.par; \
hp_median_filter med.par ; \
hp_map2gif -inp test_mf.fits -out test_mf.gif -bar t -ttl 'Median Filtered Map'; \
hp_sky_ng_sim ngfs.par ; \
hp_map2gif -inp test_ngfs.fits -out test_ngfs.gif -bar t -ttl 'Non-Gaussian Map'; \
echo "Healpix F90 tests done"

healpix-2.11c-shlib.patch:

Index: healpix-2.11c-shlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-10/healpix-2.11c-shlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- healpix-2.11c-shlib.patch	7 Apr 2009 07:04:18 -0000	1.1
+++ healpix-2.11c-shlib.patch	7 Apr 2009 08:49:08 -0000	1.2
@@ -1,11 +1,333 @@
-Compile the Fortran library into a shared object instead
-of static library.
-
-Lubomir Rintel <lkundrak at v3.sk>
-
-diff -up Healpix_2.11c/src/f90/alteralm/Makefile.shlib Healpix_2.11c/src/f90/alteralm/Makefile
---- Healpix_2.11c/src/f90/alteralm/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/cxx/alice/planck.make.orig Healpix_2.11c/src/cxx/alice/planck.make
+--- Healpix_2.11c/src/cxx/alice/planck.make.orig	2009-01-08 18:19:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/alice/planck.make	2009-04-04 13:06:20.000000000 +0300
+@@ -20,28 +20,28 @@ test.o: alice_utils.h
+ alice2.o: alice_usage.h OrthogonalSkyMap.h
+ testOrthogonalSkyMap.o: OrthogonalSkyMap.h
+ 
+-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++generateTexture.o: 
+ generateTexture: generateTexture.o
+ 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++$(ALICE2_OBJ):
++alice2: $(ALICE2_OBJ)
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++alice_test: $(TEST_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 
+-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testSoSSkyMap: $(TESTSOS_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+ 
+-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testMollweideSkyMap: $(TESTMOL_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 	
+-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+diff -up Healpix_2.11c/src/cxx/config/rules.common.orig Healpix_2.11c/src/cxx/config/rules.common
+--- Healpix_2.11c/src/cxx/config/rules.common.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/config/rules.common	2009-04-04 12:57:03.000000000 +0300
+@@ -1,10 +1,6 @@
+ SRCROOT = $(LEVELS_SRC)
+ BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
+ PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
+-BINDIR	= $(PREFIX)/bin
+-INCDIR	= $(PREFIX)/include
+-LIBDIR	= $(PREFIX)/lib
+-DOCDIR	= $(SRCROOT)/doc
+ 
+ # do not use any suffix rules
+ .SUFFIXES:
+@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
+ prep:
+ 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
+ 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
+-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
+-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
+-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
+-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
++	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
++	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
++	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
++	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
+ 
+ $(SUBCLEAN):
+ 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
+@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
+ subdir_clean: $(SUBCLEAN)
+ 
+ install:
+-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
+-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
+-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
++	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
++	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
++	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
+ 
+ install: $(BINARIES) $(LIBRARIES)
+ $(BINARIES) $(LIBRARIES): $(OBJECTS)
+diff -up Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig Healpix_2.11c/src/cxx/cxxsupport/planck.make
+--- Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/cxxsupport/planck.make	2009-04-04 13:09:33.000000000 +0300
+@@ -1,7 +1,6 @@
+-TEMP1	= $(SRCROOT)/cxxsupport
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libcxxsupport.a
++LIBRARIES= libhealpix_cxxsupport.so
+ 
+ HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
+ 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
+@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
+ SIMPARAMS_H := simparams.h $(CXXUTILS_H)
+ PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
+ ARR_H := arr.h $(CXXUTILS_H)
+-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
++FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
+ VEC3_H := vec3.h
+ ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
+ POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
+@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
+ 
+ libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
+ 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
++
++.PHONY: libhealpix_cxxsupport.so
++libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
++	cp -p $@ $(DESTLIB)/
+diff -up Healpix_2.11c/src/cxx/docsrc/planck.make.orig Healpix_2.11c/src/cxx/docsrc/planck.make
+diff -up Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig Healpix_2.11c/src/cxx/Healpix_cxx/planck.make
+--- Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig	2006-12-04 21:31:45.000000000 +0200
++++ Healpix_2.11c/src/cxx/Healpix_cxx/planck.make	2009-04-04 13:44:19.000000000 +0300
+@@ -1,21 +1,16 @@
+-TEMP1	= $(SRCROOT)/Healpix_cxx
+ VPATH	= $(TEMP1) $(LIBDIR)
+ 
+-LIBRARIES= libhealpix_cxx.a
++LIBRARIES= libhealpix_cxx.so
+ 
+ BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
+ 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
+ 	  rotalm_cxx mult_alm
+ 
+-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
+-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
+-	$(TEMP1)/powspec_fitsio.h \
+-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
+-
+-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
+-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
+-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
+-	$(SPHERE_HEADERS)
++SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
++	powspec_fitsio.h ylmgen.h alm_map_tools.h
++
++HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
++	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
+ 
+ include $(PARAMFILE)
+ 
+@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
+ HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
+ 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
+ 
+-healpix_base.o: healpix_base.h libcxxsupport.a
+-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
+-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
+-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
+-	libcxxsupport.a
+-alm_fitsio.o: alm_fitsio.h alm.h \
+-	libcxxsupport.a
+-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
+-powspec_fitsio.o: powspec.h libcxxsupport.a
+-powspec.o: powspec.h libcxxsupport.a
++healpix_base.o: healpix_base.h 
++healpix_base2.o: healpix_base.h healpix_base2.h 
++healpix_map.o: healpix_base.h healpix_map.h 
++healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
++alm_fitsio.o: alm_fitsio.h alm.h 
++healpix_data_io.o: healpix_data_io.h
++powspec_fitsio.o: powspec.h 
++powspec.o: powspec.h
+ alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
+-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
+-	libfftpack.a libcxxsupport.a
+-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
+-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
++	ylmgen.h alm_healpix_tools.h alm_map_tools.h
++alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
++alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
+ 
+ libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
+ 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
+ 
+-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++.PHONY: libhealpix_cxx.so
++libhealpix_cxx.so: $(HEALPIX_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
++	cp -p $@ $(DESTLIB)/
++
++
++syn_alm_cxx.o: libhealpix_cxx.so
+ syn_alm_cxx: syn_alm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
+-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
+ 
+-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++alm2map_cxx.o: libhealpix_cxx.so
+ alm2map_cxx: alm2map_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
+ 
+-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++anafast_cxx.o: libhealpix_cxx.so
+ anafast_cxx: anafast_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
+ 
+-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++map2tga.o: libhealpix_cxx.so
+ map2tga: map2tga.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
+ 
+-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++udgrade_cxx.o: libhealpix_cxx.so
+ udgrade_cxx: udgrade_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
+ 
+-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++hotspots_cxx.o: libhealpix_cxx.so
+ hotspots_cxx: hotspots_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
+ 
+-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++calc_powspec.o: libhealpix_cxx.so
+ calc_powspec: calc_powspec.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
+ 
+-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++median_filter.o: libhealpix_cxx.so
+ median_filter: median_filter.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
+ 
+-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
++hpxtest.o: libhealpix_cxx.so
+ hpxtest: hpxtest.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
+ 
+-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++smoothing_cxx.o: libhealpix_cxx.so
+ smoothing_cxx: smoothing_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
+ 
+-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
++rotalm_cxx.o: libhealpix_cxxsupport.so
+ rotalm_cxx: rotalm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
+ 
+-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++mult_alm.o: libhealpix_cxx.so
+ mult_alm: mult_alm.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
+diff -up Healpix_2.11c/src/cxx/libcfitsio/planck.make.orig Healpix_2.11c/src/cxx/libcfitsio/planck.make
+diff -up Healpix_2.11c/src/cxx/libfftpack/planck.make.orig Healpix_2.11c/src/cxx/libfftpack/planck.make
+--- Healpix_2.11c/src/cxx/libfftpack/planck.make.orig	2006-01-26 11:25:58.000000000 +0200
++++ Healpix_2.11c/src/cxx/libfftpack/planck.make	2009-04-04 12:58:11.000000000 +0300
+@@ -1,9 +1,7 @@
+-TEMP1	= $(SRCROOT)/libfftpack
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libfftpack.a
++LIBRARIES= libhealpix_fft.so
+ 
+-HEADERS= $(TEMP1)/ls_fft.h
+ 
+ include $(PARAMFILE)
+ 
+@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
+ 
+ libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
+ 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
++
++libhealpix_fft.so: $(FFTPACK_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
++	cp -p $@ $(DESTLIB)/
++	cp -p *.h $(DESTINC)/
+diff -up Healpix_2.11c/src/cxx/test/runtest.sh.orig Healpix_2.11c/src/cxx/test/runtest.sh
+--- Healpix_2.11c/src/cxx/test/runtest.sh.orig	2006-03-12 13:29:24.000000000 +0200
++++ Healpix_2.11c/src/cxx/test/runtest.sh	2009-04-04 14:05:11.000000000 +0300
+@@ -1,16 +1,15 @@
+ #!/bin/sh
+ 
+-BINPATH=../$HEALPIX_TARGET/bin
+ 
+-time $BINPATH/syn_alm_cxx syn_alm.par && \
+-time $BINPATH/alm2map_cxx alm2map.par && \
+-time $BINPATH/map2tga test.fits test.tga -bar -title "Synthesized Map" && \
+-time $BINPATH/anafast_cxx anafast.par && \
+-time $BINPATH/alm2map_cxx alm2map2.par && \
+-time $BINPATH/map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
+-time $BINPATH/udgrade_cxx udgrade.par && \
+-time $BINPATH/map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
+-time $BINPATH/map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
+-time $BINPATH/alm2map_cxx alm2map3.par && \
+-time $BINPATH/map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
++time hp_syn_alm_cxx syn_alm.par && \
++time hp_alm2map_cxx alm2map.par && \
++time hp_map2tga test.fits test.tga -bar -title "Synthesized Map" && \
++time hp_anafast_cxx anafast.par && \
++time hp_alm2map_cxx alm2map2.par && \
++time hp_map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
++time hp_udgrade_cxx udgrade.par && \
++time hp_map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
++time hp_map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
++time hp_alm2map_cxx alm2map3.par && \
++time hp_map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
+ xv test.tga test2.tga test3.tga test4.tga test5.tga
+diff -up Healpix_2.11c/src/f90/alteralm/Makefile.orig Healpix_2.11c/src/f90/alteralm/Makefile
+--- Healpix_2.11c/src/f90/alteralm/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
  
  default: $(exec)
@@ -14,9 +336,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/anafast/Makefile.shlib Healpix_2.11c/src/f90/anafast/Makefile
---- Healpix_2.11c/src/f90/anafast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/anafast/Makefile.orig Healpix_2.11c/src/f90/anafast/Makefile
+--- Healpix_2.11c/src/f90/anafast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
  
  default: $(exec)
@@ -25,9 +347,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/hotspot/Makefile.shlib Healpix_2.11c/src/f90/hotspot/Makefile
---- Healpix_2.11c/src/f90/hotspot/Makefile.shlib	2009-04-03 13:01:12.000000000 +0200
-+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-03 13:01:27.000000000 +0200
+diff -up Healpix_2.11c/src/f90/hotspot/Makefile.orig Healpix_2.11c/src/f90/hotspot/Makefile
+--- Healpix_2.11c/src/f90/hotspot/Makefile.orig	2002-11-27 09:36:18.000000000 +0200
++++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
  
  default: $(exec)
@@ -36,15 +358,15 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/lib/Makefile.shlib Healpix_2.11c/src/f90/lib/Makefile
---- Healpix_2.11c/src/f90/lib/Makefile.shlib	2005-01-28 08:33:25.000000000 +0100
-+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/lib/Makefile.orig Healpix_2.11c/src/f90/lib/Makefile
+--- Healpix_2.11c/src/f90/lib/Makefile.orig	2005-01-28 09:33:25.000000000 +0200
++++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-04 13:54:44.000000000 +0300
 @@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
  %.o: %.f90
  	$(FC) $(FFLAGS) -c $< -o $@
  
 -default: libgif.a
-+default: libgif.so
++default: libhealpix_gif.so
  
  libgif.a: $(allobj)
  	$(AR) libgif.a $(allobj)
@@ -58,16 +380,16 @@
 +# he's really really sick, he's really really sick
 +# he's sick, he's sick.
 +# -- Alice Cooper
-+.PHONY: libgif.so
-+libgif.so: $(allobj)
++.PHONY: libhealpix_gif.so
++libhealpix_gif.so: $(allobj)
 +	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
 +	cp -p $@ $(LIBDIR)/
 +	for p in *.$(MOD); do \
 +	cp $$p $(INCDIR)/; \
 +	done
-diff -up Healpix_2.11c/src/f90/map2gif/Makefile.shlib Healpix_2.11c/src/f90/map2gif/Makefile
---- Healpix_2.11c/src/f90/map2gif/Makefile.shlib	2003-02-17 12:06:10.000000000 +0100
-+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/map2gif/Makefile.orig Healpix_2.11c/src/f90/map2gif/Makefile
+--- Healpix_2.11c/src/f90/map2gif/Makefile.orig	2003-02-17 13:06:10.000000000 +0200
++++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-04 13:55:21.000000000 +0300
 @@ -31,5 +31,5 @@ obj 	= map2gif.o
  
  default: $(exec)
@@ -75,10 +397,10 @@
 -$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lgif -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/median_filter/Makefile.shlib Healpix_2.11c/src/f90/median_filter/Makefile
---- Healpix_2.11c/src/f90/median_filter/Makefile.shlib	2005-04-26 03:50:34.000000000 +0200
-+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-03 13:00:43.000000000 +0200
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhealpix_gif -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.11c/src/f90/median_filter/Makefile.orig Healpix_2.11c/src/f90/median_filter/Makefile
+--- Healpix_2.11c/src/f90/median_filter/Makefile.orig	2005-04-26 04:50:34.000000000 +0300
++++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
  
  default: $(exec)
@@ -87,9 +409,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/mod/Makefile.shlib Healpix_2.11c/src/f90/mod/Makefile
---- Healpix_2.11c/src/f90/mod/Makefile.shlib	2008-01-29 17:39:20.000000000 +0100
-+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/mod/Makefile.orig Healpix_2.11c/src/f90/mod/Makefile
+--- Healpix_2.11c/src/f90/mod/Makefile.orig	2008-01-29 18:39:20.000000000 +0200
++++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
  	esac
  
@@ -115,9 +437,9 @@
  alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
  	./gen_alm_code
  
-diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
---- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.shlib	2009-02-09 21:24:46.000000000 +0100
-+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
+--- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig	2009-02-09 22:24:46.000000000 +0200
++++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
  
  default: $(exec1) $(exec2)
@@ -131,9 +453,9 @@
 -	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 +$(exec2): $(obj2)
 +	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/plmgen/Makefile.shlib Healpix_2.11c/src/f90/plmgen/Makefile
---- Healpix_2.11c/src/f90/plmgen/Makefile.shlib	2004-08-25 03:27:24.000000000 +0200
-+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/plmgen/Makefile.orig Healpix_2.11c/src/f90/plmgen/Makefile
+--- Healpix_2.11c/src/f90/plmgen/Makefile.orig	2004-08-25 04:27:24.000000000 +0300
++++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -10,5 +10,5 @@ obj 	= plmgen.o
  
  default: $(exec)
@@ -142,9 +464,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/smoothing/Makefile.shlib Healpix_2.11c/src/f90/smoothing/Makefile
---- Healpix_2.11c/src/f90/smoothing/Makefile.shlib	2005-02-24 11:22:59.000000000 +0100
-+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/smoothing/Makefile.orig Healpix_2.11c/src/f90/smoothing/Makefile
+--- Healpix_2.11c/src/f90/smoothing/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
  
  default: $(exec)
@@ -153,9 +475,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/synfast/Makefile.shlib Healpix_2.11c/src/f90/synfast/Makefile
---- Healpix_2.11c/src/f90/synfast/Makefile.shlib	2005-02-16 05:55:38.000000000 +0100
-+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/synfast/Makefile.orig Healpix_2.11c/src/f90/synfast/Makefile
+--- Healpix_2.11c/src/f90/synfast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
  
  default: $(exec)
@@ -164,9 +486,9 @@
 -	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
 +$(exec): $(obj)
 +	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.shlib Healpix_2.11c/src/f90/ud_grade/Makefile
---- Healpix_2.11c/src/f90/ud_grade/Makefile.shlib	2005-06-03 11:44:52.000000000 +0200
-+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-03 13:00:43.000000000 +0200
+diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.orig Healpix_2.11c/src/f90/ud_grade/Makefile
+--- Healpix_2.11c/src/f90/ud_grade/Makefile.orig	2005-06-03 12:44:52.000000000 +0300
++++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-04 13:54:13.000000000 +0300
 @@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
  
  default: $(exec)



From bskeggs at fedoraproject.org  Tue Apr  7 08:52:05 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  7 Apr 2009 08:52:05 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.28,
	1.29 nouveau-fedora.patch, 1.17, 1.18 sources, 1.29,
	1.30 xorg-x11-drv-nouveau.spec, 1.34, 1.35
Message-ID: <20090407085205.CEE6170100@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21505

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Apr 07 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-23.20090407git11451ca
- upstream update: rh#492399, nv50 PROM fixes





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	3 Apr 2009 16:17:59 -0000	1.28
+++ .cvsignore	7 Apr 2009 08:51:35 -0000	1.29
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2
+xf86-video-nouveau-0.0.12-20090407git11451ca.tar.bz2

nouveau-fedora.patch:

Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nouveau-fedora.patch	3 Apr 2009 16:17:59 -0000	1.17
+++ nouveau-fedora.patch	7 Apr 2009 08:51:35 -0000	1.18
@@ -485,7 +485,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index e5ef11a..735fee0 100644
+index 0679289..1369863 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@
@@ -498,7 +498,7 @@
  #include "nv_include.h"
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4486,7 +4489,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4492,7 +4495,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
  
  bool NVInitVBIOS(ScrnInfoPtr pScrn)
  {
@@ -509,7 +509,7 @@
  
  	memset(bios, 0, sizeof(struct nvbios));
  
-@@ -4497,6 +4503,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4503,6 +4509,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
  	if (bios->length > NV_PROM_SIZE)
  		bios->length = NV_PROM_SIZE;
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	3 Apr 2009 16:17:59 -0000	1.29
+++ sources	7 Apr 2009 08:51:35 -0000	1.30
@@ -1 +1 @@
-2b3bc53449226e0f3028afc78c578602  xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2
+8eab4ec072c5ab7f779e18604a9f0008  xf86-video-nouveau-0.0.12-20090407git11451ca.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-nouveau.spec	3 Apr 2009 16:17:59 -0000	1.34
+++ xorg-x11-drv-nouveau.spec	7 Apr 2009 08:51:35 -0000	1.35
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090404
-%define git_version 836d985
+%define gitdate 20090407
+%define git_version 11451ca
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -77,6 +77,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Apr 07 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-23.20090407git11451ca
+- upstream update: rh#492399, nv50 PROM fixes
+
 * Sat Apr 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-22.20090404git836d985
 - use consistent connector names across all modesetting paths
 - rh#493981



From airlied at fedoraproject.org  Tue Apr  7 08:57:32 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  7 Apr 2009 08:57:32 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec, 1.239, 1.240 radeon-rewrite.patch, 1.17,
	1.18
Message-ID: <20090407085732.6498870100@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22789

Modified Files:
	mesa.spec radeon-rewrite.patch 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 7.5-0.8
- radeon: fix gnome-shell startup



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- mesa.spec	6 Apr 2009 10:45:46 -0000	1.239
+++ mesa.spec	7 Apr 2009 08:57:01 -0000	1.240
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.7%{?dist}
+Release: 0.8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -429,6 +429,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 7.5-0.8
+- radeon: fix gnome-shell startup
+
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 7.5-0.7
 - rebase to latest radeon-rewrite
 

radeon-rewrite.patch:

Index: radeon-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- radeon-rewrite.patch	6 Apr 2009 10:45:46 -0000	1.17
+++ radeon-rewrite.patch	7 Apr 2009 08:57:01 -0000	1.18
@@ -4354,7 +4354,7 @@
 -
 -#endif
 diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
-index 0eaaaf6..f040713 100644
+index 0eaaaf6..1b9724d 100644
 --- a/src/mesa/drivers/dri/r200/r200_state.c
 +++ b/src/mesa/drivers/dri/r200/r200_state.c
 @@ -47,6 +47,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -4849,7 +4849,7 @@
        }
        break;
  
-@@ -2432,64 +2270,70 @@ static void update_texturematrix( GLcontext *ctx )
+@@ -2432,64 +2270,73 @@ static void update_texturematrix( GLcontext *ctx )
     }
  }
  
@@ -4922,7 +4922,9 @@
 +			   RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
     }
 -}
--
+ 
++   if (rmesa->radeon.dma.current)
++      radeon_validate_bo(&rmesa->radeon, rmesa->radeon.dma.current, RADEON_GEM_DOMAIN_GTT, 0);
  
 +   return radeon_revalidate_bos(ctx);
 +}
@@ -4957,7 +4959,7 @@
  /* FIXME: don't really need most of these when vertex progs are enabled */
  
     /* Need an event driven matrix update?
-@@ -2533,7 +2377,8 @@ void r200ValidateState( GLcontext *ctx )
+@@ -2533,7 +2380,8 @@ void r200ValidateState( GLcontext *ctx )
        else TCL_FALLBACK(ctx, R200_TCL_FALLBACK_VERTEX_PROGRAM, 0);
     }
  
@@ -4967,7 +4969,7 @@
  }
  
  
-@@ -2544,7 +2389,7 @@ static void r200InvalidateState( GLcontext *ctx, GLuint new_state )
+@@ -2544,7 +2392,7 @@ static void r200InvalidateState( GLcontext *ctx, GLuint new_state )
     _vbo_InvalidateState( ctx, new_state );
     _tnl_InvalidateState( ctx, new_state );
     _ae_invalidate_state( ctx, new_state );
@@ -4976,7 +4978,7 @@
  }
  
  /* A hack.  The r200 can actually cope just fine with materials
-@@ -2573,12 +2418,13 @@ static void r200WrapRunPipeline( GLcontext *ctx )
+@@ -2573,12 +2421,13 @@ static void r200WrapRunPipeline( GLcontext *ctx )
     GLboolean has_material;
  
     if (0)
@@ -4993,7 +4995,7 @@
  
     has_material = !ctx->VertexProgram._Enabled && ctx->Light.Enabled && check_material( ctx );
  
-@@ -2603,8 +2449,8 @@ void r200InitStateFuncs( struct dd_function_table *functions )
+@@ -2603,8 +2452,8 @@ void r200InitStateFuncs( struct dd_function_table *functions )
     functions->UpdateState		= r200InvalidateState;
     functions->LightingSpaceChange	= r200LightingSpaceChange;
  
@@ -5004,7 +5006,7 @@
  
     functions->AlphaFunc			= r200AlphaFunc;
     functions->BlendColor		= r200BlendColor;
-@@ -2636,7 +2482,7 @@ void r200InitStateFuncs( struct dd_function_table *functions )
+@@ -2636,7 +2485,7 @@ void r200InitStateFuncs( struct dd_function_table *functions )
     functions->PointParameterfv		= r200PointParameter;
     functions->PointSize			= r200PointSize;
     functions->RenderMode		= r200RenderMode;
@@ -9409,10 +9411,10 @@
  ##### TARGETS #####
  
 diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
-index 3eb2dc8..1ecbeea 100644
+index 3eb2dc8..2dd2c6a 100644
 --- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
 +++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
-@@ -44,245 +44,288 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+@@ -44,245 +44,306 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  #include "drm.h"
  #include "radeon_drm.h"
  
@@ -9739,6 +9741,24 @@
 +	OUT_BATCH_REGSEQ(R300_RB3D_COLORPITCH0, 1);
 +	OUT_BATCH_RELOC(cbpitch, rrb->bo, cbpitch, 0, RADEON_GEM_DOMAIN_VRAM, 0);
 +	END_BATCH();
++    if (r300->radeon.radeonScreen->driScreen->dri2.enabled) {
++        if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) {
++            BEGIN_BATCH_NO_AUTOSTATE(3);
++            OUT_BATCH_REGSEQ(R300_SC_SCISSORS_TL, 2);
++            OUT_BATCH(0);
++            OUT_BATCH((rrb->width << R300_SCISSORS_X_SHIFT) |
++                    (rrb->height << R300_SCISSORS_Y_SHIFT));
++            END_BATCH();
++        } else {
++            BEGIN_BATCH_NO_AUTOSTATE(3);
++            OUT_BATCH_REGSEQ(R300_SC_SCISSORS_TL, 2);
++            OUT_BATCH((R300_SCISSORS_OFFSET << R300_SCISSORS_X_SHIFT) |
++                    (R300_SCISSORS_OFFSET << R300_SCISSORS_Y_SHIFT));
++            OUT_BATCH(((rrb->width + R300_SCISSORS_OFFSET) << R300_SCISSORS_X_SHIFT) |
++                    ((rrb->height + R300_SCISSORS_OFFSET) << R300_SCISSORS_Y_SHIFT));
++            END_BATCH();
++        }
++    }
  }
  
 -/**
@@ -9873,7 +9893,7 @@
  	cnt = r500fp_count(atom->cmd);
  	return cnt ? (cnt * 4) + 1 : 0;
  }
-@@ -295,8 +338,8 @@ static int check_r500fp_const(r300ContextPtr r300, struct r300_state_atom *atom)
+@@ -295,8 +356,8 @@ static int check_r500fp_const(r300ContextPtr r300, struct r300_state_atom *atom)
        r300->hw.ATOM.idx = (IDX);					\
        r300->hw.ATOM.check = check_##CHK;				\
        r300->hw.ATOM.dirty = GL_FALSE;					\
@@ -9884,7 +9904,7 @@
     } while (0)
  /**
   * Allocate memory for the command buffer and initialize the state atom
-@@ -304,7 +347,7 @@ static int check_r500fp_const(r300ContextPtr r300, struct r300_state_atom *atom)
+@@ -304,7 +365,7 @@ static int check_r500fp_const(r300ContextPtr r300, struct r300_state_atom *atom)
   */
  void r300InitCmdBuf(r300ContextPtr r300)
  {
@@ -9893,7 +9913,7 @@
  	int has_tcl = 1;
  	int is_r500 = 0;
  	int i;
-@@ -315,7 +358,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
+@@ -315,7 +376,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
  	if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515)
  		is_r500 = 1;
  
@@ -9902,7 +9922,7 @@
  
  	mtu = r300->radeon.glCtx->Const.MaxTextureUnits;
  	if (RADEON_DEBUG & DEBUG_TEXTURE) {
-@@ -323,97 +366,97 @@ void r300InitCmdBuf(r300ContextPtr r300)
+@@ -323,97 +384,97 @@ void r300InitCmdBuf(r300ContextPtr r300)
  	}
  
  	/* Setup the atom linked list */
@@ -10037,7 +10057,7 @@
  		for (i = 0; i < 8; i++) {
  			r300->hw.ri.cmd[R300_RI_CMD_0 + i +1] =
  			  (R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_S_SHIFT) |
-@@ -422,133 +465,149 @@ void r300InitCmdBuf(r300ContextPtr r300)
+@@ -422,133 +483,149 @@ void r300InitCmdBuf(r300ContextPtr r300)
                            (R500_RS_IP_PTR_K1 << R500_RS_IP_TEX_PTR_Q_SHIFT);
  		}
  		ALLOC_STATE(rr, variable, R300_RR_CMDSIZE, 0);
@@ -10243,7 +10263,7 @@
  			}
  		}
  	}
-@@ -556,130 +615,37 @@ void r300InitCmdBuf(r300ContextPtr r300)
+@@ -556,130 +633,37 @@ void r300InitCmdBuf(r300ContextPtr r300)
  	/* Textures */
  	ALLOC_STATE(tex.filter, variable, mtu + 1, 0);
  	r300->hw.tex.filter.cmd[R300_TEX_CMD_0] =
@@ -16613,7 +16633,7 @@
 -	return 0;
 -}
 diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
-index e2329f0..5a87b5d 100644
+index e2329f0..cf4cad7 100644
 --- a/src/mesa/drivers/dri/r300/r300_texstate.c
 +++ b/src/mesa/drivers/dri/r300/r300_texstate.c
 @@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -16658,7 +16678,7 @@
  		break;
  	default:
  		/* Error...which should have already been caught by higher
-@@ -190,399 +189,132 @@ void r300SetDepthTexMode(struct gl_texture_object *tObj)
+@@ -190,399 +189,134 @@ void r300SetDepthTexMode(struct gl_texture_object *tObj)
  
  
  /**
@@ -17129,13 +17149,15 @@
 +			radeon_validate_bo(&rmesa->radeon, t->mt->bo,
 +					   RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
  	}
++	if (rmesa->radeon.dma.current)
++		radeon_validate_bo(&rmesa->radeon, rmesa->radeon.dma.current, RADEON_GEM_DOMAIN_GTT, 0);
  
 -	return !t->border_fallback;
 +	return radeon_revalidate_bos(ctx);
  }
  
  void r300SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
-@@ -591,78 +323,164 @@ void r300SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
+@@ -591,78 +325,164 @@ void r300SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
  	r300ContextPtr rmesa = pDRICtx->driverPrivate;
  	struct gl_texture_object *tObj =
  	    _mesa_lookup_texture(rmesa->radeon.glCtx, texname);
@@ -20609,10 +20631,10 @@
 +#endif
 diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
 new file mode 100644
-index 0000000..4f7bfeb
+index 0000000..756c09f
 --- /dev/null
 +++ b/src/mesa/drivers/dri/radeon/radeon_common.c
-@@ -0,0 +1,1409 @@
+@@ -0,0 +1,1407 @@
 +/**************************************************************************
 +
 +Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
@@ -20992,9 +21014,11 @@
 +
 +static void radeonWaitForIdle(radeonContextPtr radeon)
 +{
-+	LOCK_HARDWARE(radeon);
-+	radeonWaitForIdleLocked(radeon);
-+	UNLOCK_HARDWARE(radeon);
++	if (!radeon->radeonScreen->driScreen->dri2.enabled) {
++        LOCK_HARDWARE(radeon);
++	    radeonWaitForIdleLocked(radeon);
++	    UNLOCK_HARDWARE(radeon);
++    }
 +}
 +
 +static void radeon_flip_renderbuffers(struct radeon_framebuffer *rfb)
@@ -21402,14 +21426,10 @@
 + */
 +void radeonDrawBuffer( GLcontext *ctx, GLenum mode )
 +{
-+	radeonContextPtr radeon = RADEON_CONTEXT(ctx);
-+	
 +	if (RADEON_DEBUG & DEBUG_DRI)
 +		fprintf(stderr, "%s %s\n", __FUNCTION__,
 +			_mesa_lookup_enum_by_nr( mode ));
 +	
-+	radeon_firevertices(radeon);	/* don't pipeline cliprect changes */
-+	
 +	radeon_draw_buffer(ctx, ctx->DrawBuffer);
 +}
 +
@@ -29616,7 +29636,7 @@
  				  drm_clip_rect_t *boxes );
  
 diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index e964feb..ecfdce9 100644
+index e964feb..49c7eae 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
 @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -29725,7 +29745,7 @@
  
  static const struct dri_debug_control debug_control[] = {
  	{"fall", DEBUG_FALLBACKS},
-@@ -236,6 +241,7 @@ static const struct dri_debug_control debug_control[] = {
+@@ -236,19 +241,36 @@ static const struct dri_debug_control debug_control[] = {
  #endif /* RADEON_COMMON && defined(RADEON_COMMON_FOR_R300) */
  
  extern const struct dri_extension card_extensions[];
@@ -29733,7 +29753,41 @@
  
  static int getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo );
  
-@@ -330,6 +336,12 @@ static const __DRItexOffsetExtension radeonTexOffsetExtension = {
+ static int
+-radeonGetParam(int fd, int param, void *value)
++radeonGetParam(__DRIscreenPrivate *sPriv, int param, void *value)
+ {
+   int ret;
+   drm_radeon_getparam_t gp;
++  struct drm_radeon_info info;
++
++  if (sPriv->drm_version.major >= 2) {
++      info.value = (uint64_t)value;
++      switch (param) {
++      case RADEON_PARAM_DEVICE_ID:
++          info.request = RADEON_INFO_DEVICE_ID;
++          break;
++      case RADEON_PARAM_NUM_GB_PIPES:
++          info.request = RADEON_INFO_NUM_GB_PIPES;
++          break;
++      default:
++          return -EINVAL;
++      }
++      ret = drmCommandWriteRead(sPriv->fd, DRM_RADEON_INFO, &info, sizeof(info));
++  } else {
++      gp.param = param;
++      gp.value = value;
+ 
+-  gp.param = param;
+-  gp.value = value;
+-
+-  ret = drmCommandWriteRead( fd, DRM_RADEON_GETPARAM, &gp, sizeof(gp));
++      ret = drmCommandWriteRead(sPriv->fd, DRM_RADEON_GETPARAM, &gp, sizeof(gp));
++  }
+   return ret;
+ }
+ 
+@@ -330,6 +352,12 @@ static const __DRItexOffsetExtension radeonTexOffsetExtension = {
      { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
      radeonSetTexOffset,
  };
@@ -29746,7 +29800,7 @@
  #endif
  
  #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
-@@ -344,6 +356,12 @@ static const __DRItexOffsetExtension r200texOffsetExtension = {
+@@ -344,6 +372,12 @@ static const __DRItexOffsetExtension r200texOffsetExtension = {
      { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
     r200SetTexOffset,
  };
@@ -29759,7 +29813,7 @@
  #endif
  
  #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
-@@ -351,137 +369,18 @@ static const __DRItexOffsetExtension r300texOffsetExtension = {
+@@ -351,137 +385,18 @@ static const __DRItexOffsetExtension r300texOffsetExtension = {
      { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
     r300SetTexOffset,
  };
@@ -29905,7 +29959,7 @@
     case PCI_CHIP_RADEON_LY:
     case PCI_CHIP_RADEON_LZ:
     case PCI_CHIP_RADEON_QY:
-@@ -819,9 +718,162 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -819,9 +734,161 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
  
     default:
        fprintf(stderr, "unknown chip id 0x%x, can't guess.\n",
@@ -29959,8 +30013,7 @@
 +      int ret;
 +
 +#ifdef RADEON_PARAM_KERNEL_MM
-+     ret = radeonGetParam( sPriv->fd, RADEON_PARAM_KERNEL_MM,
-+                            &screen->kernel_mm);
++     ret = radeonGetParam(sPriv, RADEON_PARAM_KERNEL_MM, &screen->kernel_mm);
 +
 +      if (ret && ret != -EINVAL) {
 +         FREE( screen );
@@ -29972,7 +30025,7 @@
 +          screen->kernel_mm = 0;
 +#endif
 +
-+      ret = radeonGetParam( sPriv->fd, RADEON_PARAM_GART_BUFFER_OFFSET,
++      ret = radeonGetParam(sPriv, RADEON_PARAM_GART_BUFFER_OFFSET,
 +			    &screen->gart_buffer_offset);
 +
 +      if (ret) {
@@ -29981,7 +30034,7 @@
 +	 return NULL;
 +      }
 +
-+      ret = radeonGetParam( sPriv->fd, RADEON_PARAM_GART_BASE,
++      ret = radeonGetParam(sPriv, RADEON_PARAM_GART_BASE,
 +			    &screen->gart_base);
 +      if (ret) {
 +	 FREE( screen );
@@ -29989,7 +30042,7 @@
 +	 return NULL;
 +      }
 +
-+      ret = radeonGetParam( sPriv->fd, RADEON_PARAM_IRQ_NR,
++      ret = radeonGetParam(sPriv, RADEON_PARAM_IRQ_NR,
 +			    &screen->irq);
 +      if (ret) {
 +	 FREE( screen );
@@ -30069,22 +30122,35 @@
     if ((screen->chip_family == CHIP_FAMILY_R350 || screen->chip_family == CHIP_FAMILY_R300) &&
         sPriv->ddx_version.minor < 2) {
        fprintf(stderr, "xf86-video-ati-6.6.2 or newer needed for Radeon 9500/9700/9800 cards.\n");
-@@ -849,7 +901,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
-    ret = radeonGetParam( sPriv->fd, RADEON_PARAM_FB_LOCATION,
-                          &temp);
+@@ -846,10 +913,9 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+    screen->cpp = dri_priv->bpp / 8;
+    screen->AGPMode = dri_priv->AGPMode;
+ 
+-   ret = radeonGetParam( sPriv->fd, RADEON_PARAM_FB_LOCATION,
+-                         &temp);
++   ret = radeonGetParam(sPriv, RADEON_PARAM_FB_LOCATION, &temp);
     if (ret) {
 -       if (screen->chip_family < CHIP_FAMILY_RS600)
 +       if (screen->chip_family < CHIP_FAMILY_RS600 && !screen->kernel_mm)
  	   screen->fbLocation      = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
         else {
             FREE( screen );
-@@ -951,26 +1003,161 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -861,8 +927,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+    }
+ 
+    if (screen->chip_family >= CHIP_FAMILY_R300) {
+-       ret = radeonGetParam( sPriv->fd, RADEON_PARAM_NUM_GB_PIPES,
+-			     &temp);
++       ret = radeonGetParam(sPriv, RADEON_PARAM_NUM_GB_PIPES, &temp);
+        if (ret) {
+ 	   fprintf(stderr, "Unable to get num_pipes, need newer drm\n");
+ 	   switch (screen->chip_family) {
+@@ -951,26 +1016,158 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
         screen->extensions[i++] = &driMediaStreamCounterExtension.base;
     }
  
 +   if (!screen->kernel_mm) {
- #if !RADEON_COMMON
--   screen->extensions[i++] = &radeonTexOffsetExtension.base;
++#if !RADEON_COMMON
 +   	screen->extensions[i++] = &radeonTexOffsetExtension.base;
 +#endif
 +
@@ -30149,11 +30215,9 @@
 +   screen->kernel_mm = 1;
 +   screen->chip_flags = 0;
 +
-+   ret = radeonGetParam( sPriv->fd, RADEON_PARAM_IRQ_NR,
-+			 &screen->irq);
++   ret = radeonGetParam(sPriv, RADEON_PARAM_IRQ_NR, &screen->irq);
 +
-+   ret = radeonGetParam( sPriv->fd, RADEON_PARAM_DEVICE_ID,
-+			 &device_id);
++   ret = radeonGetParam(sPriv, RADEON_PARAM_DEVICE_ID, &device_id);
 +   if (ret) {
 +     FREE( screen );
 +     fprintf(stderr, "drm_radeon_getparam_t (RADEON_PARAM_DEVICE_ID): %d\n", ret);
@@ -30165,8 +30229,7 @@
 +     return NULL;
 +
 +   if (screen->chip_family >= CHIP_FAMILY_R300) {
-+       ret = radeonGetParam( sPriv->fd, RADEON_PARAM_NUM_GB_PIPES,
-+			     &temp);
++       ret = radeonGetParam(sPriv, RADEON_PARAM_NUM_GB_PIPES, &temp);
 +       if (ret) {
 +	   fprintf(stderr, "Unable to get num_pipes, need newer drm\n");
 +	   switch (screen->chip_family) {
@@ -30214,7 +30277,8 @@
 +       screen->extensions[i++] = &driMediaStreamCounterExtension.base;
 +   }
 +
-+#if !RADEON_COMMON
+ #if !RADEON_COMMON
+-   screen->extensions[i++] = &radeonTexOffsetExtension.base;
 +   screen->extensions[i++] = &radeonTexBufferExtension.base;
  #endif
  
@@ -30244,7 +30308,7 @@
     return screen;
  }
  
-@@ -979,23 +1166,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -979,23 +1176,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
  static void
  radeonDestroyScreen( __DRIscreenPrivate *sPriv )
  {
@@ -30290,7 +30354,7 @@
  }
  
  
-@@ -1004,16 +1200,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
+@@ -1004,16 +1210,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
  static GLboolean
  radeonInitDriver( __DRIscreenPrivate *sPriv )
  {
@@ -30318,7 +30382,7 @@
  /**
   * Create the Mesa framebuffer and renderbuffers for a given window/drawable.
   *
-@@ -1026,101 +1227,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
+@@ -1026,101 +1237,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
                      const __GLcontextModes *mesaVis,
                      GLboolean isPixmap )
  {
@@ -30510,7 +30574,7 @@
  /**
   * Choose the appropriate CreateContext function based on the chipset.
   * Eventually, all drivers will go through this process.
-@@ -1131,25 +1342,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
+@@ -1131,25 +1352,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
  {
  	__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
  	radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
@@ -30546,7 +30610,7 @@
  
  
  /**
-@@ -1211,13 +1418,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1211,13 +1428,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
     if (!radeonInitDriver(psp))
         return NULL;
  
@@ -30559,7 +30623,7 @@
 +			     (dri_priv->bpp == 16) ? 0  : 8, 1);
  }
 +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
- 
++
 +/**
 + * This is the driver specific part of the createNewScreen entry point.
 + * Called when using DRI2.
@@ -30600,7 +30664,7 @@
 +   driInitSingleExtension( NULL, ATI_fs_extension );
 +   driInitExtensions( NULL, point_extensions, GL_FALSE );
 +#endif
-+
+ 
 +   if (!radeonInitDriver(psp)) {
 +       return NULL;
 +    }
@@ -30652,7 +30716,7 @@
  
  /**
   * Get information about previous buffer swaps.
-@@ -1225,31 +1522,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1225,31 +1532,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
  static int
  getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo )
  {
@@ -30694,7 +30758,7 @@
  const struct __DriverAPIRec driDriverAPI = {
     .InitScreen      = radeonInitScreen,
     .DestroyScreen   = radeonDestroyScreen,
-@@ -1266,23 +1558,7 @@ const struct __DriverAPIRec driDriverAPI = {
+@@ -1266,23 +1568,7 @@ const struct __DriverAPIRec driDriverAPI = {
     .WaitForSBC      = NULL,
     .SwapBuffersMSC  = NULL,
     .CopySubBuffer   = radeonCopySubBuffer,
@@ -30755,7 +30819,7 @@
 +extern void radeonDestroyBuffer(__DRIdrawablePrivate *driDrawPriv);
  #endif /* __RADEON_SCREEN_H__ */
 diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
-index 12051ff..b0c77be 100644
+index 12051ff..e28f286 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_span.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_span.c
 @@ -43,46 +43,203 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -31223,7 +31287,7 @@
     d = (tmp & 0xff000000) >> 24;					\
  } while (0)
  #endif
-@@ -271,29 +433,103 @@ do {									\
+@@ -271,29 +433,105 @@ do {									\
  #define TAG(x) radeon##x##_z24_s8
  #include "stenciltmp.h"
  
@@ -31298,6 +31362,8 @@
 -#else
 -	RADEON_FIREVERTICES(rmesa);
 -#endif
+-	LOCK_HARDWARE(rmesa);
+-	radeonWaitForIdleLocked(rmesa);
 +	int i;
 +
 +	radeon_firevertices(rmesa);
@@ -31307,9 +31373,10 @@
 +	 * unnecessary due to the fact that mapping our buffers, textures, etc.
 +	 * should implicitly wait for any previous rendering commands that must
 +	 * be waited on. */
- 	LOCK_HARDWARE(rmesa);
- 	radeonWaitForIdleLocked(rmesa);
-+
++	if (!rmesa->radeonScreen->driScreen->dri2.enabled) {
++		LOCK_HARDWARE(rmesa);
++		radeonWaitForIdleLocked(rmesa);
++	}
 +	for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
 +		if (ctx->Texture.Unit[i]._ReallyEnabled)
 +			ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[i]._Current);
@@ -31326,8 +31393,10 @@
  	radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
 +	int i;
  	_swrast_flush(ctx);
- 	UNLOCK_HARDWARE(rmesa);
-+
+-	UNLOCK_HARDWARE(rmesa);
++	if (!rmesa->radeonScreen->driScreen->dri2.enabled) {
++		UNLOCK_HARDWARE(rmesa);
++	}
 +	for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
 +		if (ctx->Texture.Unit[i]._ReallyEnabled)
 +			ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[i]._Current);
@@ -31337,7 +31406,7 @@
  }
  
  void radeonInitSpanFuncs(GLcontext * ctx)
-@@ -307,20 +543,21 @@ void radeonInitSpanFuncs(GLcontext * ctx)
+@@ -307,20 +545,21 @@ void radeonInitSpanFuncs(GLcontext * ctx)
  /**
   * Plug in the Get/Put routines for the given driRenderbuffer.
   */
@@ -31388,7 +31457,7 @@
  
  #endif
 diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
-index 32bcff3..dcca326 100644
+index 32bcff3..28eea44 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_state.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_state.c
 @@ -47,6 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -32160,7 +32229,7 @@
     GLuint tpc = rmesa->hw.tcl.cmd[TCL_TEXTURE_PROC_CTL];
     GLuint vs = rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXSEL];
     int unit;
-@@ -2209,61 +2044,68 @@ static void update_texturematrix( GLcontext *ctx )
+@@ -2209,61 +2044,72 @@ static void update_texturematrix( GLcontext *ctx )
     }
  }
  
@@ -32234,10 +32303,14 @@
     }
 -}
  
-+   return radeon_revalidate_bos(ctx);
-+}
++   if (rmesa->radeon.dma.current)
++       radeon_validate_bo(&rmesa->radeon, rmesa->radeon.dma.current,
++			  RADEON_GEM_DOMAIN_GTT, 0);
  
 -void radeonValidateState( GLcontext *ctx )
++   return radeon_revalidate_bos(ctx);
++}
++
 +GLboolean radeonValidateState( GLcontext *ctx )
  {
 -   radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
@@ -32266,7 +32339,7 @@
     /* Need an event driven matrix update?
      */
     if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION)) 
-@@ -2295,7 +2137,7 @@ void radeonValidateState( GLcontext *ctx )
+@@ -2295,7 +2141,7 @@ void radeonValidateState( GLcontext *ctx )
     }
  
  
@@ -32275,7 +32348,7 @@
  }
  
  
-@@ -2306,7 +2148,7 @@ static void radeonInvalidateState( GLcontext *ctx, GLuint new_state )
+@@ -2306,7 +2152,7 @@ static void radeonInvalidateState( GLcontext *ctx, GLuint new_state )
     _vbo_InvalidateState( ctx, new_state );
     _tnl_InvalidateState( ctx, new_state );
     _ae_invalidate_state( ctx, new_state );
@@ -32284,7 +32357,7 @@
  }
  
  
-@@ -2330,16 +2172,17 @@ static GLboolean check_material( GLcontext *ctx )
+@@ -2330,16 +2176,17 @@ static GLboolean check_material( GLcontext *ctx )
  
  static void radeonWrapRunPipeline( GLcontext *ctx )
  {



From jakub at fedoraproject.org  Tue Apr  7 09:18:00 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue,  7 Apr 2009 09:18:00 +0000 (UTC)
Subject: rpms/glibc/devel glibc.spec,1.387,1.388
Message-ID: <20090407091800.D0BED70100@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27101

Modified Files:
	glibc.spec 
Log Message:
2.9.90-13


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- glibc.spec	7 Apr 2009 07:39:09 -0000	1.387
+++ glibc.spec	7 Apr 2009 09:17:30 -0000	1.388
@@ -54,6 +54,17 @@
 BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3
 BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel
 BuildRequires: /bin/ps, /bin/kill, /bin/awk
+%ifarch %{ix86} x86_64 ppc ppc64
+BuildRequires: /usr/bin/setarch
+%ifarch %{ix86}
+%define setarch /usr/bin/setarch i386 -R
+%endif
+%ifarch x86_64 ppc ppc64
+%define setarch /usr/bin/setarch %{_target_cpu} -R
+%endif
+%else
+%define setarch %{nil}
+%endif
 # This is to ensure that __frame_state_for is exported by glibc
 # will be compatible with egcs 1.x.y
 BuildRequires: gcc >= 3.2
@@ -325,7 +336,7 @@
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt
-make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
+%{setarch} make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
 }
@@ -377,7 +388,7 @@
 make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s
 %ifnarch %{auxarches}
 cd build-%{nptl_target_cpu}-linuxnptl && \
-  make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
+  %{setarch} make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
   cd ..
 %endif
 
@@ -706,7 +717,7 @@
 parent=$$
 echo ====================TESTING=========================
 cd build-%{nptl_target_cpu}-linuxnptl
-( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+( %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -715,7 +726,7 @@
 %if %{buildxen}
 echo ====================TESTING -mno-tls-direct-seg-refs=============
 cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
-( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+( %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -728,7 +739,7 @@
 ( if [ -d ../power6emul ]; then
     export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
   fi
-  make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+  %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -1017,6 +1028,7 @@
 - update from trunk
   - fix strverscmp (#494457)
 - configure with --enable-nss-crypt
+- workaround buggy kernels during glibc build process, argh
 
 * Wed Apr  1 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-12
 - update from trunk



From pghmcfc at fedoraproject.org  Tue Apr  7 09:32:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue,  7 Apr 2009 09:32:55 +0000 (UTC)
Subject: rpms/mod_fcgid/devel mod_fcgid-2.1-README.SELinux, 1.4,
	1.5 mod_fcgid.spec, 1.17, 1.18
Message-ID: <20090407093255.CDBA270100@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29557

Modified Files:
	mod_fcgid-2.1-README.SELinux mod_fcgid.spec 
Log Message:
EL-5.3 has fastcgi policy merged into httpd policy


Index: mod_fcgid-2.1-README.SELinux
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid-2.1-README.SELinux,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_fcgid-2.1-README.SELinux	26 Feb 2009 12:50:40 -0000	1.4
+++ mod_fcgid-2.1-README.SELinux	7 Apr 2009 09:32:25 -0000	1.5
@@ -1,11 +1,11 @@
 Using mod_fcgid with SELinux in Fedora Core 5 / RHEL 5 onwards
 ==============================================================
 
-Versions of this package built for Fedora Core 5, 6, or 7 and Red Hat
-Enterprise Linux 5 or later include an SELinux policy module to support
-FastCGI applications. Later Fedora releases include the policy in the main
-selinux-policy package and do not require the separate module. This has only
-been tested so far with moin, so feedback from other applications is welcome.
+Versions of this package built for Fedora Core 5, 6, or 7 include an SELinux
+policy module to support FastCGI applications. Later Fedora releases and Red
+Hat Enterprise Linux 5.3 onwards include the policy in the main selinux-policy
+package and do not require the separate module. This has only been tested so
+far with moin, so feedback from other applications is welcome.
 
 The module source (fastcgi.{fc,te}) is included for reference as documentation
 in the package.


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_fcgid.spec	26 Feb 2009 12:50:40 -0000	1.17
+++ mod_fcgid.spec	7 Apr 2009 09:32:25 -0000	1.18
@@ -1,7 +1,8 @@
-# Fedora 5,6,7 and EPEL5 versions includes SELinux policy module package
+# Fedora 5, 6, and 7 versions includes SELinux policy module package
 # Fedora 8 and 9 versions include policy in errata selinux-policy releases
 # Fedora 10 onwards include policy in standard selinux-policy releases
-%if 0%{?fedora}%{?rhel} < 5 || 0%{?fedora} > 7 || 0%{?rhel} > 5
+# RHEL 5.3 onwards include policy in standard selinux-policy releases
+%if 0%{?fedora} < 5 || 0%{?fedora} > 7
 %global selinux_module 0
 %global selinux_types %{nil}
 %global selinux_variants %{nil}
@@ -15,7 +16,7 @@
 
 Name:		mod_fcgid
 Version:	2.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -34,6 +35,11 @@
 BuildRequires:	gawk, httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
 # Make sure that selinux-policy is sufficiently up-to-date if it's installed
+%if "%{?rhel}" == "5"
+Conflicts:	selinux-policy < 2.4.6-203.el5
+# No provide here because selinux-policy >= 2.4.6-203.el5 does the providing
+Obsoletes:	mod_fcgid-selinux <= %{version}-%{release}
+%endif
 %if "%{?fedora}" == "8"
 Conflicts:	selinux-policy < 3.0.8-123.fc8
 %endif
@@ -169,6 +175,12 @@
 %endif
 
 %changelog
+* Mon Apr  6 2009 Paul Howarth <paul at city-fan.org> 2.2-10
+- EL 5.3 now has SELinux support in the main selinux-policy package so handle
+  that release as per Fedora >= 8, except that the RHEL selinux-policy package
+  doesn't Obsolete/Provide mod_fcgid-selinux like the Fedora version, so do
+  the obsoletion here instead
+
 * Thu Feb 26 2009 Paul Howarth <paul at city-fan.org> 2.2-9
 - Update documentation for MoinMoin, Rails (#476658), and SELinux
 



From ixs at fedoraproject.org  Tue Apr  7 09:33:00 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Tue,  7 Apr 2009 09:33:00 +0000 (UTC)
Subject: rpms/commoncpp2/EL-5 commoncpp2-1.7.3-gcc44.patch,NONE,1.1
Message-ID: <20090407093300.271C270100@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/commoncpp2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29681

Added Files:
	commoncpp2-1.7.3-gcc44.patch 
Log Message:
Added patch to compile on gcc44, even though not needed on rhel5

commoncpp2-1.7.3-gcc44.patch:

--- NEW FILE commoncpp2-1.7.3-gcc44.patch ---
diff -up commoncpp2-1.7.3/src/cidr.cpp.orig commoncpp2-1.7.3/src/cidr.cpp
--- commoncpp2-1.7.3/src/cidr.cpp.orig	2009-04-06 21:24:07.857718325 +0200
+++ commoncpp2-1.7.3/src/cidr.cpp	2009-04-06 21:50:26.874088776 +0200
@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp)
 #if defined(_MSC_VER) && _MSC_VER >= 1500
 	ep = (char *)strchr(cp, '/');
 #else
- 	ep = strchr(cp, '/');
+ 	ep = (char *)strchr(cp, '/');
 #endif
 
 	if(ep)
@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp)
 	memset(&netmask, 0, sizeof(netmask));
 	bitset((bit_t *)&netmask, getMask(cp));
 	setString(cbuf, sizeof(cbuf), cp);
-	ep = strchr(cp, '/');
+	ep = (char *)strchr(cp, '/');
 	if(ep)
 		*ep = 0;
 



From pfj at fedoraproject.org  Tue Apr  7 09:42:09 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Tue,  7 Apr 2009 09:42:09 +0000 (UTC)
Subject: rpms/mono/devel import.log,1.44,1.45 mono.spec,1.121,1.122
Message-ID: <20090407094209.9728970100@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31828/devel

Modified Files:
	import.log mono.spec 
Log Message:

Moved all moonlight parts to new subpackage
Removed PPC for now 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- import.log	6 Apr 2009 20:27:26 -0000	1.44
+++ import.log	7 Apr 2009 09:41:39 -0000	1.45
@@ -42,3 +42,4 @@
 mono-2_4-11_RC3_fc11:HEAD:mono-2.4-11.RC3.fc11.src.rpm:1237420759
 mono-2_4-12_fc11:HEAD:mono-2.4-12.fc11.src.rpm:1238109092
 mono-2_4-12_1_fc11:HEAD:mono-2.4-12.1.fc11.src.rpm:1239049596
+mono-2_4-13_1_fc11:HEAD:mono-2.4-13.1.fc11.src.rpm:1239097233


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- mono.spec	6 Apr 2009 20:27:26 -0000	1.121
+++ mono.spec	7 Apr 2009 09:41:39 -0000	1.122
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.4
-Release:        12.1%{?dist}
+Release:        13.1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -32,7 +32,7 @@
 BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -249,10 +249,21 @@
 %description -n monodoc-devel
 Development file for monodoc
 
+%package moonlight
+Summary:	All the parts required for moonlight compilation
+Group:		Development/Libraries
+Requires:	mono-core = %{version}-%{release}
+
+%description moonlight
+mono-moonlight are all the parts required for moonlight compilation
+
 %define monodir %{_libdir}/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.0/%{1}.dll \
   %{nil}
+%define moon_dll(dll) %{monodir}/gac/%{1} \
+  %{monodir}/2.1/%{1}.dll \
+  %{nil}
 %define mono_bin(bin) %{_bindir}/%{1} \
   %{monodir}/?.0/%{1}.exe \
   %{monodir}/?.0/%{1}.exe.* \
@@ -301,7 +312,9 @@
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes --with-moonlight=no --disable-static --with-preview=yes --with-libgdiplus=installed
+%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes \
+           --with-moonlight=yes --disable-static --with-preview=yes \
+           --with-libgdiplus=installed
 make
 
 
@@ -530,6 +543,13 @@
 %dir %{_datadir}/mono-1.0/mono/cil
 %{_libdir}/mono/1.0/culevel*
 
+%files moonlight
+%defattr(-,root,root,-)
+%{_libdir}/mono/2.1/*.dll
+%{_libdir}/mono/2.1/*.mdb
+%{_libdir}/mono/2.1/smcs.exe
+%moon_dll System.Net
+
 %files nunit
 %defattr(-,root,root,-)
 %mono_bin_1 nunit-console nunit-console
@@ -687,7 +707,14 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
-* Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-12.1
+* Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-13.1
+- Remove ppc support
+- moonlight parts are now in their own subpackage
+
+* Thu Apr 02 2009 Xavier Lamien <lxtnow at gmail.com> - 2.4-13
+- Enable moonlight support.
+
+* Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-12
 - Full 2.4 release
 
 * Wed Mar 18 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-11.RC3



From jwrdegoede at fedoraproject.org  Tue Apr  7 09:44:05 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  7 Apr 2009 09:44:05 +0000 (UTC)
Subject: rpms/libcddb/devel .cvsignore, 1.8, 1.9 libcddb.spec, 1.28,
	1.29 sources, 1.9, 1.10
Message-ID: <20090407094405.C258970100@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32348

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Tue Apr  7 2009 Hans de Goede <hdegoede at redhat.com> 1.3.2-1
- New upstream release 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Mar 2009 09:17:34 -0000	1.8
+++ .cvsignore	7 Apr 2009 09:43:35 -0000	1.9
@@ -1 +1 @@
-libcddb-1.3.1.tar.bz2
+libcddb-1.3.2.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libcddb.spec	9 Mar 2009 09:17:34 -0000	1.28
+++ libcddb.spec	7 Apr 2009 09:43:35 -0000	1.29
@@ -1,6 +1,6 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.3.1
+Version:	1.3.2
 Release:	1%{?dist}
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Hans de Goede <hdegoede at redhat.com> 1.3.2-1
+- New upstream release 1.3.2
+
 * Mon Mar  9 2009 Hans de Goede <hdegoede at redhat.com> 1.3.1-1
 - New upstream release 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Mar 2009 09:17:34 -0000	1.9
+++ sources	7 Apr 2009 09:43:35 -0000	1.10
@@ -1 +1 @@
-9adeae462d6791ed8b75f2ec5fa7903b  libcddb-1.3.1.tar.bz2
+8bb4a6f542197e8e9648ae597cd6bc8a  libcddb-1.3.2.tar.bz2



From pghmcfc at fedoraproject.org  Tue Apr  7 09:50:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue,  7 Apr 2009 09:50:55 +0000 (UTC)
Subject: rpms/mod_fcgid/EL-5 fastcgi-2.5.te, 1.2, 1.3 fastcgi.fc, 1.2,
	1.3 fastcgi.te, 1.3, 1.4 mod_fcgid-2.1-README.RPM, 1.1,
	1.2 mod_fcgid-2.1-README.SELinux, 1.2, 1.3 mod_fcgid.spec, 1.6, 1.7
Message-ID: <20090407095055.54D2E70100@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1303

Modified Files:
	fastcgi-2.5.te fastcgi.fc fastcgi.te mod_fcgid-2.1-README.RPM 
	mod_fcgid-2.1-README.SELinux mod_fcgid.spec 
Log Message:
Merge changes from Fedora since EL 5.3 now contains merged fastcgi SELinux policy


Index: fastcgi-2.5.te
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/EL-5/fastcgi-2.5.te,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fastcgi-2.5.te	27 Apr 2008 22:52:57 -0000	1.2
+++ fastcgi-2.5.te	7 Apr 2009 09:50:24 -0000	1.3
@@ -1,131 +1,63 @@
-policy_module(fastcgi, 0.2.2)
+# This policy module provides support for mod_fcgid using the httpd system script domain.
+# It provides "allow" rules that will overlap to varying degrees with selinux-policy
+# packages for Fedora 5 onwards, and is a stepping stone to the merged policy included
+# as updates for selinux-policy in Fedora 8, 9, and 10.
+#
+# Rules existing in selinux-policy 2.6.4 (F7) have been stripped from this policy
+#
+# Previous versions of this policy module used a separate domain, httpd_fastcgi_script_t,
+# which is now an alias for httpd_sys_script_t.
 
-type httpd_fastcgi_var_run_t;
-files_type(httpd_fastcgi_var_run_t)
+policy_module(fastcgi, 0.2.6)
 
 require {
 	type devpts_t;
 	type httpd_t;
-	type httpd_config_t;
 	type httpd_log_t;
-	type httpd_sys_script_exec_t;
 	type httpd_sys_content_t;
+	type httpd_sys_content_ra_t;
+	type httpd_sys_content_ro_t;
+	type httpd_sys_content_rw_t;
+	type httpd_sys_script_exec_t;
+	type httpd_sys_script_ra_t;
+	type httpd_sys_script_ro_t;
+	type httpd_sys_script_rw_t;
+	type httpd_sys_script_t;
 	type httpd_tmp_t;
+	type httpd_var_run_t;
 };
 
+# Type aliases for contexts used with older policy modules
+typealias httpd_sys_content_t     alias httpd_fastcgi_content_t;
+typealias httpd_sys_content_ra_t  alias httpd_fastcgi_content_ra_t;
+typealias httpd_sys_content_ro_t  alias httpd_fastcgi_content_ro_t;
+typealias httpd_sys_content_rw_t  alias httpd_fastcgi_content_rw_t;
+typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
+typealias httpd_sys_script_ra_t   alias httpd_fastcgi_script_ra_t;
+typealias httpd_sys_script_ro_t   alias httpd_fastcgi_script_ro_t;
+typealias httpd_sys_script_rw_t   alias httpd_fastcgi_script_rw_t;
+typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
+typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
+
 # ==========================================================
-# Create and use httpd_fastcgi_script_t for mod_fcgid apps
+# Re-use httpd_sys_script_t for mod_fcgid apps
 # ==========================================================
 
-apache_content_template(fastcgi)
-kernel_read_kernel_sysctls(httpd_fastcgi_script_t)
-
-## <desc>
-## <p>
-## Allow FastCGI applications to write to public content 
-## </p>
-## </desc>
-gen_tunable(allow_httpd_fastcgi_script_anon_write,false)
-
-## <desc>
-## <p>
-## Allow FastCGI applications to make outbound SMTP connections
-## </p>
-## </desc>
-gen_tunable(httpd_fastcgi_can_sendmail,false)
-
-tunable_policy(`allow_httpd_fastcgi_script_anon_write',`
-	miscfiles_manage_public_files(httpd_fastcgi_script_t)
-')
-
-tunable_policy(`httpd_fastcgi_can_sendmail',`
-	corenet_tcp_connect_smtp_port(httpd_fastcgi_script_t)
-	corenet_tcp_sendrecv_smtp_port(httpd_fastcgi_script_t)
-')
-
-# Allow FastCGI applications to do DNS lookups
-sysnet_dns_name_resolve(httpd_fastcgi_script_t)
-
-# Allow FastCGI applications to live alongside regular CGI apps
-allow httpd_fastcgi_script_t httpd_sys_script_exec_t:dir { search_dir_perms };
-allow httpd_fastcgi_script_t httpd_sys_content_t:dir { search_dir_perms };
-
-# Allow FastCGI applications to read the routing table
-allow httpd_fastcgi_script_t self:netlink_route_socket { r_netlink_socket_perms };
+# Allow web applications to call getpw* functions
+auth_use_nsswitch(httpd_sys_script_t)
 
 # Allow httpd to create and use files and sockets for communicating with mod_fcgid
-manage_files_pattern(httpd_t,httpd_fastcgi_var_run_t,httpd_fastcgi_var_run_t)
-manage_sock_files_pattern(httpd_t,httpd_fastcgi_var_run_t,httpd_fastcgi_var_run_t)
-setattr_dirs_pattern(httpd_t,httpd_fastcgi_var_run_t,httpd_fastcgi_var_run_t)
-
-# Allow httpd to read httpd_fastcgi_content_t
-allow httpd_t httpd_fastcgi_content_t:dir list_dir_perms;
-read_files_pattern(httpd_t,httpd_fastcgi_content_t,httpd_fastcgi_content_t)
-read_lnk_files_pattern(httpd_t,httpd_fastcgi_content_t,httpd_fastcgi_content_t)
+# Rules to do this are already in selinux-policy apart from dir setattr
+setattr_dirs_pattern(httpd_t,httpd_var_run_t,httpd_var_run_t)
 
 # Allow FastCGI applications to listen for FastCGI requests on their
 # sockets and respond to them
-allow httpd_fastcgi_script_t httpd_t:unix_stream_socket { rw_stream_socket_perms };
+allow httpd_sys_script_t httpd_t:unix_stream_socket { rw_stream_socket_perms };
 
 # These are probably leaked file descriptors
 dontaudit httpd_t devpts_t:chr_file ioctl;
-dontaudit httpd_fastcgi_script_t httpd_log_t:file ioctl;
-
-# ======================================================
-# Equivalent policy cribbed from httpd_sys_script_t
-# ======================================================
-
-dontaudit httpd_fastcgi_script_t httpd_config_t:dir search;
-
-fs_search_auto_mountpoints(httpd_fastcgi_script_t)
+dontaudit httpd_sys_script_t httpd_log_t:file ioctl;
 
 # PHP uploads a file to /tmp and then execs programs to action them
-manage_dirs_pattern(httpd_fastcgi_script_t,httpd_tmp_t,httpd_tmp_t)
-manage_files_pattern(httpd_fastcgi_script_t,httpd_tmp_t,httpd_tmp_t)
-files_tmp_filetrans(httpd_fastcgi_script_t,httpd_fastcgi_script_rw_t,{ dir file lnk_file sock_file fifo_file })
-
-files_search_var_lib(httpd_fastcgi_script_t)
-files_search_spool(httpd_fastcgi_script_t)
-
-# Should we add a boolean?
-apache_domtrans_rotatelogs(httpd_fastcgi_script_t)
-
-ifdef(`distro_redhat',`
-	allow httpd_fastcgi_script_t httpd_log_t:file { getattr append };
-')
-
-ifdef(`targeted_policy',`
-	tunable_policy(`httpd_enable_homedirs',`
-		userdom_search_generic_user_home_dirs(httpd_fastcgi_script_t)
-	')
-')
-
-tunable_policy(`httpd_use_nfs', `
-	fs_read_nfs_files(httpd_fastcgi_script_t)
-	fs_read_nfs_symlinks(httpd_fastcgi_script_t)
-')
-
-tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-	fs_read_nfs_files(httpd_fastcgi_script_t)
-	fs_read_nfs_symlinks(httpd_fastcgi_script_t)
-')
-
-tunable_policy(`httpd_use_cifs', `
-	fs_read_cifs_files(httpd_fastcgi_script_t)
-	fs_read_cifs_symlinks(httpd_fastcgi_script_t)
-')
-
-tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
-	fs_read_cifs_files(httpd_fastcgi_script_t)
-	fs_read_cifs_symlinks(httpd_fastcgi_script_t)
-')
-
-optional_policy(`
-	mysql_stream_connect(httpd_fastcgi_script_t)
-	mysql_rw_db_sockets(httpd_fastcgi_script_t)
-')
-
-optional_policy(`
-	clamav_domtrans_clamscan(httpd_fastcgi_script_t)
-')
-
+# Rules to do this are already in selinux-policy 2.6.4 (F7) apart from filetrans
+files_tmp_filetrans(httpd_sys_script_t,httpd_sys_script_rw_t,{ dir file lnk_file sock_file fifo_file })


Index: fastcgi.fc
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/EL-5/fastcgi.fc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fastcgi.fc	27 Apr 2008 22:52:57 -0000	1.2
+++ fastcgi.fc	7 Apr 2009 09:50:24 -0000	1.3
@@ -1 +1 @@
-/var/run/mod_fcgid(/.*)?		 gen_context(system_u:object_r:httpd_fastcgi_var_run_t,s0)
+/var/run/mod_fcgid(/.*)?		 gen_context(system_u:object_r:httpd_var_run_t,s0)


Index: fastcgi.te
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/EL-5/fastcgi.te,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fastcgi.te	27 Apr 2008 22:52:57 -0000	1.3
+++ fastcgi.te	7 Apr 2009 09:50:24 -0000	1.4
@@ -1,111 +1,77 @@
-policy_module(fastcgi, 0.1.9)
+# This policy module provides support for mod_fcgid using the httpd system script domain.
+# It provides "allow" rules that will overlap to varying degrees with selinux-policy
+# packages for Fedora 5 onwards, and is a stepping stone to the merged policy included
+# as updates for selinux-policy in Fedora 8, 9, and 10.
+#
+# Rules existing in selinux-policy 2.3.7 (FC5) have been stripped from this policy
+#
+# Previous versions of this policy module used a separate domain, httpd_fastcgi_script_t,
+# which is now an alias for httpd_sys_script_t.
 
-type httpd_fastcgi_var_run_t;
-files_type(httpd_fastcgi_var_run_t)
+policy_module(fastcgi, 0.1.10)
 
 require {
 	type devpts_t;
 	type httpd_t;
-	type httpd_config_t;
 	type httpd_log_t;
-	type httpd_sys_script_exec_t;
 	type httpd_sys_content_t;
+	type httpd_sys_content_ra_t;
+	type httpd_sys_content_ro_t;
+	type httpd_sys_content_rw_t;
+	type httpd_sys_script_exec_t;
+	type httpd_sys_script_ra_t;
+	type httpd_sys_script_ro_t;
+	type httpd_sys_script_rw_t;
+	type httpd_sys_script_t;
 	type httpd_tmp_t;
+	type httpd_var_run_t;
 };
 
+# Type aliases for contexts used with older policy modules
+typealias httpd_sys_content_t     alias httpd_fastcgi_content_t;
+typealias httpd_sys_content_ra_t  alias httpd_fastcgi_content_ra_t;
+typealias httpd_sys_content_ro_t  alias httpd_fastcgi_content_ro_t;
+typealias httpd_sys_content_rw_t  alias httpd_fastcgi_content_rw_t;
+typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
+typealias httpd_sys_script_ra_t   alias httpd_fastcgi_script_ra_t;
+typealias httpd_sys_script_ro_t   alias httpd_fastcgi_script_ro_t;
+typealias httpd_sys_script_rw_t   alias httpd_fastcgi_script_rw_t;
+typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
+typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
+
 # ==========================================================
-# Create and use httpd_fastcgi_script_t for mod_fcgid apps
+# Re-use httpd_sys_script_t for mod_fcgid apps
 # ==========================================================
 
-apache_content_template(fastcgi)
-kernel_read_kernel_sysctls(httpd_fastcgi_script_t)
-
-## <desc>
-## <p>
-## Allow FastCGI applications to make outbound SMTP connections
-## </p>
-## </desc>
-gen_tunable(httpd_fastcgi_can_sendmail,false)
-
-tunable_policy(`httpd_fastcgi_can_sendmail',`
-	corenet_tcp_connect_smtp_port(httpd_fastcgi_script_t)
-	corenet_tcp_sendrecv_smtp_port(httpd_fastcgi_script_t)
-')
-
-# Allow FastCGI applications to do DNS lookups
-sysnet_dns_name_resolve(httpd_fastcgi_script_t)
-
-# Allow FastCGI applications to live alongside regular CGI apps
-allow httpd_fastcgi_script_t httpd_sys_script_exec_t:dir { search_dir_perms };
-allow httpd_fastcgi_script_t httpd_sys_content_t:dir { search_dir_perms };
-
-# Allow FastCGI applications to read the routing table
-allow httpd_fastcgi_script_t self:netlink_route_socket { r_netlink_socket_perms };
+# Allow web applications to call getpw* functions
+auth_use_nsswitch(httpd_sys_script_t)
 
 # Allow httpd to create and use files and sockets for communicating with mod_fcgid
-allow httpd_t httpd_fastcgi_var_run_t:dir { rw_dir_perms setattr };
-allow httpd_t httpd_fastcgi_var_run_t:file { create_file_perms };
-allow httpd_t httpd_fastcgi_var_run_t:sock_file { create_file_perms };
-
-# Allow httpd to read httpd_fastcgi_content_t
-# (shouldn't this be in the content template?)
-allow httpd_t httpd_fastcgi_content_t:dir r_dir_perms;
-allow httpd_t httpd_fastcgi_content_t:file r_file_perms;
-allow httpd_t httpd_fastcgi_content_t:lnk_file { getattr read };
+# Rules to do this are already in selinux-policy apart from dir setattr
+allow httpd_t httpd_var_run_t:dir setattr;
 
 # Allow FastCGI applications to listen for FastCGI requests on their
 # sockets and respond to them
-allow httpd_fastcgi_script_t httpd_t:unix_stream_socket { rw_stream_socket_perms };
+allow httpd_sys_script_t httpd_t:unix_stream_socket { rw_stream_socket_perms };
 
 # These are probably leaked file descriptors
 dontaudit httpd_t devpts_t:chr_file ioctl;
-dontaudit httpd_fastcgi_script_t httpd_log_t:file ioctl;
-
-# ======================================================
-# Equivalent policy cribbed from httpd_sys_script_t
-# ======================================================
+dontaudit httpd_sys_script_t httpd_log_t:file ioctl;
 
-dontaudit httpd_fastcgi_script_t httpd_config_t:dir search;
-
-fs_search_auto_mountpoints(httpd_fastcgi_script_t)
+# Search automount filesystem to use automatically mounted filesystems
+fs_search_auto_mountpoints(httpd_sys_script_t)
 
 # PHP uploads a file to /tmp and then execs programs to action them
-allow httpd_fastcgi_script_t httpd_tmp_t:dir manage_dir_perms;
-allow httpd_fastcgi_script_t httpd_tmp_t:file manage_file_perms;
-files_tmp_filetrans(httpd_fastcgi_script_t,httpd_fastcgi_script_rw_t,{ dir file lnk_file sock_file fifo_file })
-
-files_search_var_lib(httpd_fastcgi_script_t)
-files_search_spool(httpd_fastcgi_script_t)
-
-# Should we add a boolean?
-apache_domtrans_rotatelogs(httpd_fastcgi_script_t)
-
-ifdef(`distro_redhat',`
-	allow httpd_fastcgi_script_t httpd_log_t:file { getattr append };
-')
-
-ifdef(`targeted_policy',`
-	tunable_policy(`httpd_enable_homedirs',`
-		userdom_search_generic_user_home_dirs(httpd_fastcgi_script_t)
-	')
-')
+allow httpd_sys_script_t httpd_tmp_t:dir manage_dir_perms;
+allow httpd_sys_script_t httpd_tmp_t:file manage_file_perms;
+files_tmp_filetrans(httpd_sys_script_t,httpd_sys_script_rw_t,{ dir file lnk_file sock_file fifo_file })
 
+# Support network home directories
 tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-	fs_read_nfs_files(httpd_fastcgi_script_t)
-	fs_read_nfs_symlinks(httpd_fastcgi_script_t)
+	fs_read_nfs_files(httpd_sys_script_t)
+	fs_read_nfs_symlinks(httpd_sys_script_t)
 ')
-
 tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
-	fs_read_cifs_files(httpd_fastcgi_script_t)
-	fs_read_cifs_symlinks(httpd_fastcgi_script_t)
+	fs_read_cifs_files(httpd_sys_script_t)
+	fs_read_cifs_symlinks(httpd_sys_script_t)
 ')
-
-optional_policy(`
-	mysql_stream_connect(httpd_fastcgi_script_t)
-	mysql_rw_db_sockets(httpd_fastcgi_script_t)
-')
-
-optional_policy(`
-	clamav_domtrans_clamscan(httpd_fastcgi_script_t)
-')
-


Index: mod_fcgid-2.1-README.RPM
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/EL-5/mod_fcgid-2.1-README.RPM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_fcgid-2.1-README.RPM	15 Jul 2007 14:17:25 -0000	1.1
+++ mod_fcgid-2.1-README.RPM	7 Apr 2009 09:50:24 -0000	1.2
@@ -37,12 +37,16 @@
    /etc/httpd/conf.d/mywiki.conf
 
     # Wiki application data common to all wiki instances
-    Alias /wiki/ "/usr/share/moin/htdocs/"
+    Alias /moin_static182 "/usr/share/moin/htdocs/"
     <Directory "/usr/share/moin/htdocs/">
       Options Indexes FollowSymLinks
       AllowOverride None
       Order allow,deny
       Allow from all
+      <IfModule mod_expires.c>
+        ExpiresActive On
+        ExpiresDefault "access plus 1 year"
+      </IfModule>
     </Directory>
 
     # Wiki instance with mod_fcgid
@@ -56,12 +60,21 @@
       </Directory>
     </IfModule>
 
- * If you are using SELinux with Fedora Core 5 or later, or Red Hat Enterprise
-   Linux 5 or later, install the mod_fcgid-selinux package and see the
-   README.SELinux file in that package for details of the file contexts to use
-
  * Restart the web server to load the new configuration:
 
    service httpd restart
 
 That should do it!
+
+Ruby on Rails with mod_fcgid
+============================
+
+One of the differences between mod_fastcgi and mod_fcgid is that the former
+sets the SCRIPT_NAME environment variable whilst the latter does not, and it's
+reported (http://bugzilla.redhat.com/476658) that Ruby on Rails expects this
+environment variable to be present. A workaround for this is to add:
+
+ActionController::AbstractRequest.relative_url_root = ""
+
+to the Rails::Initializer.run segment of config/environment.rb
+


Index: mod_fcgid-2.1-README.SELinux
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/EL-5/mod_fcgid-2.1-README.SELinux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_fcgid-2.1-README.SELinux	15 Jul 2007 14:17:25 -0000	1.2
+++ mod_fcgid-2.1-README.SELinux	7 Apr 2009 09:50:24 -0000	1.3
@@ -1,70 +1,62 @@
 Using mod_fcgid with SELinux in Fedora Core 5 / RHEL 5 onwards
 ==============================================================
 
-Versions of this package built for Fedora Core 5 / Red Hat Enterprise Linux 5
-or later include an SELinux policy module to support FastCGI applications.
-This has only been tested so far with moin, so feedback from other applications
-is welcome. The intention is for this module to be included in the SELinux
-reference policy eventually.
+Versions of this package built for Fedora Core 5, 6, or 7 include an SELinux
+policy module to support FastCGI applications. Later Fedora releases and Red
+Hat Enterprise Linux 5.3 onwards include the policy in the main selinux-policy
+package and do not require the separate module. This has only been tested so
+far with moin, so feedback from other applications is welcome.
 
 The module source (fastcgi.{fc,te}) is included for reference as documentation
 in the package.
 
-The module introduces a new set of SELinux types for FastCGI applications,
-comparable with the types described in "man httpd_selinux" for regular CGI
-scripts (or "system scripts" as they are known in SELinux):
+The module uses the same set of SELinux types for FastCGI applications as for
+regular CGI scripts (or "system scripts" as they are known in SELinux), as
+described in "man httpd_selinux".
 
- * httpd_fastcgi_content_t (equivalent to httpd_sys_content_t)
- - Set files with httpd_fastcgi_content_t for content that is available
+ * httpd_sys_content_t
+ - Set files with httpd_sys_content_t for content that is available
    from all FastCGI scripts and the daemon.
 
- * httpd_fastcgi_script_exec_t (equivalent to httpd_sys_script_exec_t)
- - Set FastCGI scripts with httpd_fastcgi_script_exec_t to allow them to run
-   with access to all fastcgi types.
-
- * httpd_fastcgi_script_ro_t (equivalent to httpd_sys_script_ro_t)
- - Set files with httpd_fastcgi_script_ro_t if you want
-   httpd_fastcgi_script_exec_t scripts to read the data, and disallow other
-   non-fastcgi scripts from access.
-
- * httpd_fastcgi_script_rw_t (equivalent to httpd_sys_script_rw_t)
- - Set files with httpd_fastcgi_script_rw_t if you want
-   httpd_fastcgi_script_exec_t scripts to read/write the data, and disallow
-   other non-fastcgi scripts from access.
-
- * httpd_fastcgi_script_ra_t (equivalent to httpd_sys_script_ra_t)
- - Set files with httpd_fastcgi_script_ra_t if you want
-   httpd_fastcgi_script_exec_t scripts to read/append to the file, and
-   disallow other non-fastcgi scripts from access.
+ * httpd_sys_script_exec_t
+ - Set FastCGI scripts with httpd_sys_script_exec_t to allow them to run
+   with access to all system script types.
+
+ * httpd_sys_script_ro_t
+ - Set files with httpd_sys_script_ro_t if you want httpd_sys_script_exec_t
+   scripts to read but not write the data, and disallow other processes from
+   access.
+
+ * httpd_sys_script_rw_t
+ - Set files with httpd_sys_script_rw_t if you want httpd_sys_script_exec_t
+   scripts to read/write the data, and disallow other processes from access.
+
+ * httpd_sys_script_ra_t
+ - Set files with httpd_sys_script_ra_t if you want httpd_sys_script_exec_t
+   scripts to read/append to the file, and disallow other processes from
+   access.
 
 So for the moin wiki layout described in README.RPM of the main mod_fcgid
 package, the contexts would be set as follows:
 
     cd /var/www/mywiki
-    chcon -t httpd_fastcgi_content_t .
-    chcon -R -t httpd_fastcgi_script_exec_t cgi-bin
-    chcon -R -t httpd_fastcgi_script_rw_t data underlay
+    chcon -t httpd_sys_content_t .
+    chcon -R -t httpd_sys_script_exec_t cgi-bin
+    chcon -R -t httpd_sys_script_rw_t data underlay
 
 It is necessary to turn on the httpd_enable_cgi boolean to run either regular
 or FastCGI scripts:
 
     setsebool -P httpd_enable_cgi 1
 
-If the httpd_unified boolean is set, "sys" and "fastcgi" scripts can access
-each other's data. This means that you only need to set the actual FastCGI
-scripts themselves to httpd_fastcgi_script_exec_t and can leave the file
-contexts for everything else set to the "sys" types if you prefer. This is
-useful if you have a mixture of CGI and FastCGI applications accessing the
-same data.
-
-The httpd_fastcgi_can_sendmail boolean is used to specify whether any of your
-FastCGI applications can make outbound SMTP connections (e.g. moin sending
+The httpd_can_sendmail boolean is used to specify whether any of your
+web applications can make outbound SMTP connections (e.g. moin sending
 notifications). By default it is off, but can be enabled as follows:
 
-    setsebool -P httpd_fastcgi_can_sendmail 1
+    setsebool -P httpd_can_sendmail 1
 
 Only enable this functionality if you actually need it, since it increases the
-chances that any vulnerability in any of your FastCGI applications could be
+chances that any vulnerability in any of your web applications could be
 exploited by a spammer.
 
 If you have any questions or issues regarding FastCGI and SELinux, please don't


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/EL-5/mod_fcgid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_fcgid.spec	27 Apr 2008 22:52:57 -0000	1.6
+++ mod_fcgid.spec	7 Apr 2009 09:50:24 -0000	1.7
@@ -1,17 +1,22 @@
-# FC5, RHEL5 and later include SELinux policy module packages
-%if 0%{?fedora}%{?rhel} < 5
-%define selinux_module 0
-%define selinux_variants %{nil}
-%define selinux_buildreqs %{nil}
+# Fedora 5, 6, and 7 versions includes SELinux policy module package
+# Fedora 8 and 9 versions include policy in errata selinux-policy releases
+# Fedora 10 onwards include policy in standard selinux-policy releases
+# RHEL 5.3 onwards include policy in standard selinux-policy releases
+%if 0%{?fedora} < 5 || 0%{?fedora} > 7
+%global selinux_module 0
+%global selinux_types %{nil}
+%global selinux_variants %{nil}
+%global selinux_buildreqs %{nil}
 %else
-%define selinux_module 1
-%define selinux_variants mls strict targeted
-%define selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink
+%global selinux_module 1
+%global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if ($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null)
+%global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types})
+%global selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink
 %endif
 
 Name:		mod_fcgid
 Version:	2.2
-Release:	4%{?dist}
+Release:	10%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -29,6 +34,21 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gawk, httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
+# Make sure that selinux-policy is sufficiently up-to-date if it's installed
+%if "%{?rhel}" == "5"
+Conflicts:	selinux-policy < 2.4.6-203.el5
+# No provide here because selinux-policy >= 2.4.6-203.el5 does the providing
+Obsoletes:	mod_fcgid-selinux <= %{version}-%{release}
+%endif
+%if "%{?fedora}" == "8"
+Conflicts:	selinux-policy < 3.0.8-123.fc8
+%endif
+%if "%{?fedora}" == "9"
+Conflicts:	selinux-policy < 3.3.1-107.fc9
+%endif
+%if "%{?fedora}" == "10"
+Conflicts:	selinux-policy < 3.5.13-8.fc10
+%endif
 
 %description
 mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi.
@@ -37,8 +57,8 @@
 as possible.
 
 %if %{selinux_module}
-%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
-%define selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }')
+%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+%global selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }')
 %package selinux
 Summary:	  SELinux policy module supporting FastCGI applications with mod_fcgid
 Group:		  System Environment/Base
@@ -49,9 +69,7 @@
 # http://www.redhat.com/archives/fedora-selinux-list/2006-May/msg00102.html
 # Hence the versioned dependency. The versioning will hopefully be replaced by
 # an ABI version requirement or something similar in the future
-%if "%{selinux_policyver}" != ""
 Requires:	  selinux-policy >= %{selinux_policyver}
-%endif
 Requires:	  %{name} = %{version}-%{release}
 Requires(post):	  /usr/sbin/semodule, /sbin/restorecon
 Requires(postun): /usr/sbin/semodule, /sbin/restorecon
@@ -124,7 +142,7 @@
 	/usr/sbin/semodule -s ${selinuxvariant} -i \
 		%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
 done
-# Fix up non-standard directory context
+# Fix up non-standard directory context from earlier packages
 /sbin/restorecon -R %{_localstatedir}/run/mod_fcgid || :
 
 %postun selinux
@@ -157,6 +175,33 @@
 %endif
 
 %changelog
+* Mon Apr  6 2009 Paul Howarth <paul at city-fan.org> 2.2-10
+- EL 5.3 now has SELinux support in the main selinux-policy package so handle
+  that release as per Fedora >= 8, except that the RHEL selinux-policy package
+  doesn't Obsolete/Provide mod_fcgid-selinux like the Fedora version, so do
+  the obsoletion here instead
+
+* Thu Feb 26 2009 Paul Howarth <paul at city-fan.org> 2.2-9
+- Update documentation for MoinMoin, Rails (#476658), and SELinux
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Nov 12 2008 Paul Howarth <paul at city-fan.org> 2.2-7
+- SELinux policy module no longer built for Fedora 8 onwards as it is
+  obsoleted by the main selinux-policy package
+- Conflicts for selinux-policy packages older than the releases where mod_fcgid
+  policy was incorporated have been added for Fedora 8, 9, and 10 versions, to
+  ensure that SELinux support will work if installed
+
+* Tue Oct 21 2008 Paul Howarth <paul at city-fan.org> 2.2-6
+- SELinux policy module rewritten to merge fastcgi and system script domains
+  in preparation for merge into main selinux-policy package (#462318)
+- Try to determine supported SELinux policy types by reading /etc/selinux/config
+
+* Thu Jul 24 2008 Paul Howarth <paul at city-fan.org> 2.2-5
+- Tweak selinux-policy version detection macro to work with current Rawhide
+
 * Thu Feb 14 2008 Paul Howarth <paul at city-fan.org> 2.2-4
 - Rebuild with gcc 4.3.0 for Fedora 9
 



From kasal at fedoraproject.org  Tue Apr  7 09:57:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  7 Apr 2009 09:57:51 +0000 (UTC)
Subject: rpms/perl/devel perl-CGI-escape.patch, NONE,
	1.1 perl-CGI-t-util-58.patch, NONE, 1.1 perl.spec, 1.214, 1.215
Message-ID: <20090407095751.149CD70100@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2477

Modified Files:
	perl.spec 
Added Files:
	perl-CGI-escape.patch perl-CGI-t-util-58.patch 
Log Message:
- fix CGI::escape for all strings (#472571)
- perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t
  http://rt.perl.org/rt3/Ticket/Display.html?id=64502

perl-CGI-escape.patch:

--- NEW FILE perl-CGI-escape.patch ---
2009-04-06  Stepan Kasal  <skasal at redhat.com>

	* t/util-58.t: Add tests reflecting common usage.
	* CGI/Util.pm (encode): State what conversions are needed, in
	accordance to the common usage mentioned above; and code it.

diff -ur perl-5.10.0/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
--- perl-5.10.0/lib/CGI/Util.pm	2008-09-08 15:58:52.000000000 +0200
+++ perl-5.10.0/lib/CGI/Util.pm	2009-04-04 16:30:29.000000000 +0200
@@ -210,7 +210,6 @@
   my $todecode = shift;
   return undef unless defined($todecode);
   $todecode =~ tr/+/ /;       # pluses become spaces
-    $EBCDIC = "\t" ne "\011";
     if ($EBCDIC) {
       $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
     } else {
@@ -232,16 +231,24 @@
 }
 
 # URL-encode data
+#
+# We cannot use the %u escapes, they were rejected by W3C, so the official
+# way is %XX-escaped utf-8 encoding.
+# Naturally, Unicode strings have to be converted to their utf-8 byte
+# representation.  (No action is required on 5.6.)
+# Byte strings were traditionally used directly as a sequence of octets.
+# This worked if they actually represented binary data (i.e. in CGI::Compress).
+# This also worked if these byte strings were actually utf-8 encoded; e.g.,
+# when the source file used utf-8 without the apropriate "use utf8;".
+# This fails if the byte string is actually a Latin 1 encoded string, but it
+# was always so and cannot be fixed without breaking the binary data case.
+# -- Stepan Kasal <skasal at redhat.com>
+#
 sub escape {
   shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
   my $toencode = shift;
   return undef unless defined($toencode);
-  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-
-  # force bytes while preserving backward compatibility -- dankogai
-  # but commented out because it was breaking CGI::Compress -- lstein
-  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-
+  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
     if ($EBCDIC) {
       $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
     } else {
diff -ur perl-5.10.0/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
--- perl-5.10.0/lib/CGI/t/util-58.t	2003-04-14 20:32:22.000000000 +0200
+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-06 16:49:42.000000000 +0200
@@ -1,16 +1,29 @@
+# test CGI::Util::escape
+use Test::More tests => 4;
+use_ok("CGI::Util");
+
+# Byte strings should be escaped byte by byte:
+# 1) not a valid utf-8 sequence:
+my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
+is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
+
+# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
+#    This happens often: people write utf-8 strings to source, but forget
+#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
+#    have to handle it gracefully, for compatibility with GCI.pm under
+#    perl-5.8.x
 #
-# This tests CGI::Util::escape() when fed with UTF-8-flagged string
-# -- dankogai
-BEGIN {
-    if ($] < 5.008) {
-       print "1..0 # \$] == $] < 5.008\n";
-       exit(0);
-    }
-}
+$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
+is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
+	"Escape an utf-8 byte string");
 
-use Test::More tests => 2;
-use_ok("CGI::Util");
-my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-   "# Escape string with UTF-8 flag");
+SKIP:
+{
+	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
+	# -- dankogai
+	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
+	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
+	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+   		"Escape string with UTF-8 flag");
+}
 __END__

perl-CGI-t-util-58.patch:

--- NEW FILE perl-CGI-t-util-58.patch ---
2009-04-06  Stepan Kasal  <skasal at redhat.com>

	* lib/CGI/t/util-58.t: return to the upstream version, do not
	hide bugs.

diff -ur perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
--- perl-5.10.0.orig/lib/CGI/t/util-58.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
@@ -11,11 +11,6 @@
 use Test::More tests => 2;
 use_ok("CGI::Util");
 my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-if (ord('A') == 193) { # EBCDIC.
-    is(CGI::Util::escape($uri), "%FC%C3%A0%EE%F9%E5%E7%F8%20%FC%C3%C7%CA.txt",
-       "# Escape string with UTF-8 (UTF-EBCDIC) flag");
-} else {
-    is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-       "# Escape string with UTF-8 flag");
-}
+is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+   "# Escape string with UTF-8 flag");
 __END__


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- perl.spec	27 Mar 2009 18:36:02 -0000	1.214
+++ perl.spec	7 Apr 2009 09:57:20 -0000	1.215
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        65%{?dist}
+Release:        66%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -97,8 +97,13 @@
 
 # Fix from Archive::Extract maintainer to only look at stdout
 # We need this because we're using tar >= 1.21
+# included upstream in 0.31_03
 Patch36:	perl-5.10.0-Archive-Extract-onlystdout.patch
 
+# Do not distort lib/CGI/t/util-58.t
+# http://rt.perl.org/rt3/Ticket/Display.html?id=64502
+Patch37:	perl-CGI-t-util-58.patch
+
 ### Debian Patches ###
 
 # Fix issue with (nested) definition lists in lib/Pod/Html.pm
@@ -160,7 +165,7 @@
 Patch53:	32_fix_fork_rand
 
 # Fix memory leak with qr//.
-# Adapted from upstream changhe 34506.
+# Adapted from upstream change 34506.
 Patch54:	34_fix_qr-memory-leak-2
 
 # CVE-2005-0448 revisited: File::Path::rmtree no longer allows creating of setuid files.
@@ -224,6 +229,11 @@
 # patches File-Fetch and CPAN
 Patch201:	perl-5.10.0-links.patch
 
+# Fix CGI::escape to work with all strings, started as #472571,
+# brought upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34528,
+# accepted there for CGI.pm-3.43
+Patch202:	perl-CGI-escape.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -952,6 +962,7 @@
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 ### Debian patches ###
 %patch40 -p1
@@ -993,6 +1004,7 @@
 %patch117 -p1
 %patch118 -p1
 %patch201 -p1
+%patch202 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1218,6 +1230,7 @@
 	'34507 Fix memory leak in single-char character class optimization' \
 	'Fedora Patch35: Reorder @INC, based on b9ba2fadb18b54e35e5de54f945111a56cbcb249' \
 	'Fedora Patch36: Fix from Archive::Extract maintainer to only look at stdout from tar' \
+	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
 	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
 	'33287 Fix NULLOK items' \
 	'33554 Fix a typo in the predefined common protocols to make "udp" resolve without netbase' \
@@ -1256,6 +1269,7 @@
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
+	'Fedora Patch202: Fix CGI::escape to work with all strings' \
 	%{nil}
 
 rm patchlevel.bak
@@ -1880,6 +1894,11 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-66
+- fix CGI::escape for all strings (#472571)
+- perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t
+  http://rt.perl.org/rt3/Ticket/Display.html?id=64502
+
 * Fri Mar 27 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-65
 - Move the gargantuan Changes* collection to -devel (#492605)
 



From mmahut at fedoraproject.org  Tue Apr  7 09:58:12 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue,  7 Apr 2009 09:58:12 +0000 (UTC)
Subject: rpms/gcx/devel gcx.desktop,1.2,1.3 gcx.spec,1.5,1.6
Message-ID: <20090407095812.1658370100@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/gcx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2545

Modified Files:
	gcx.desktop gcx.spec 
Log Message:
494430 -  GCX lacks association with FITS file



Index: gcx.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gcx/devel/gcx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcx.desktop	24 Mar 2009 13:39:44 -0000	1.2
+++ gcx.desktop	7 Apr 2009 09:57:41 -0000	1.3
@@ -6,3 +6,4 @@
 Icon=/usr/share/gcx/gcx.svg
 Exec=gcx
 Categories=Education;Science;Astronomy;
+MimeType=application/fits;image/fits;image/x-fits;


Index: gcx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcx/devel/gcx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcx.spec	6 Apr 2009 20:03:36 -0000	1.5
+++ gcx.spec	7 Apr 2009 09:57:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gcx
 Version:	0.9.11
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Data-reduction tool for CCD photometry
 
 License:	GPLv2+
@@ -38,6 +38,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -47,6 +52,9 @@
 %{_datadir}/gcx
 
 %changelog
+* Tue Apr 7 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.9.11-7
+- Fix mime association with FITS files (RHBZ#494430)
+
 * Mon Apr 6 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.11-6
 - Fix a stack overflow (#494345)
 



From transif at fedoraproject.org  Tue Apr  7 10:02:52 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  7 Apr 2009 10:02:52 +0000 (UTC)
Subject: comps/po hi.po,1.18,1.19
Message-ID: <20090407100252.2296970100@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/po

Modified Files:
	hi.po 
Log Message:
Sending translation for Hindi


Index: hi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hi.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hi.po	1 Apr 2009 07:12:04 -0000	1.18
+++ hi.po	7 Apr 2009 10:02:21 -0000	1.19
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 02:03+0000\n"
-"PO-Revision-Date: 2009-04-01 12:41+0530\n"
+"POT-Creation-Date: 2009-04-06 08:00+0000\n"
+"PO-Revision-Date: 2009-04-07 15:28+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,7 @@
 "\n"
 "\n"
 "\n"
+"\n"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
@@ -39,7 +40,7 @@
 #: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
-msgstr "????????????????????? ???????????????"
+msgstr "????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
@@ -94,7 +95,7 @@
 #: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
-msgstr "????????? ??????????????????"
+msgstr "????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
@@ -119,7 +120,7 @@
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
@@ -159,12 +160,12 @@
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
 #: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
-msgstr "?????????????????????????????? ??????????????????."
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
 #: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
-msgstr "?????????"
+msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
 #: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
@@ -213,12 +214,12 @@
 #: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
-msgstr "?????????????????????????????? ???????????????"
+msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
 #: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
-msgstr "????????????????????? ?????????????????? ??????????????????"
+msgstr "?????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
 #: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
@@ -239,13 +240,13 @@
 #: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
-msgstr "???????????????????????? ???????????????????????????"
+msgstr "???????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
 #: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr "??????????????????????????? ?????? ???????????? ???????????????????????? ???????????????????????????"
+msgstr "??????????????????????????? ?????? ???????????? ???????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
 #: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
@@ -283,7 +284,7 @@
 #: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
-msgstr "?????????????????? ??????????????? ???????????????"
+msgstr "?????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
 #: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
@@ -307,7 +308,7 @@
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
 msgstr ""
-"CD ????????????????????? ?????? ???????????? ?????????????????? CD ?????? ??????????????????????????? ???????????? ?????? ??????????????? ?????????, ?????? ??????????????? ????????????, ?????????????????? ?????? ??????????????? "
+"CD ????????????????????? ?????? ???????????? ?????????????????? CD ?????? ??????????????????????????? ??????????????? ?????? ??????????????? ?????????, ?????? ??????????????? ????????????, ??????????????? ?????? ??????????????? "
 "?????? ?????????????????? ?????? ????????? ????????? ???????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
@@ -320,7 +321,7 @@
 #: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
-msgstr "GNOME ??????????????????????????? ???????????????"
+msgstr "GNOME ?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
 #: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
@@ -328,8 +329,8 @@
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"GNOME ?????? ??????????????????????????? ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ?????????????????? ??????????????????, ?????? "
-"?????????????????? ???????????? ????????????????????? ??????."
+"GNOME ?????? ??????????????????????????? ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ??????????????? ??????????????????, ?????? "
+"?????????????????? ??????????????? ????????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
 #: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
@@ -366,12 +367,12 @@
 #: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
-msgstr "???????????????"
+msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
 #: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
 #: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
@@ -416,31 +417,31 @@
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr "GTK+ ?????? GNOME ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
+msgstr "GTK+ ?????? GNOME ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr "GTK+ ?????? XFCE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
+msgstr "GTK+ ?????? XFCE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr "QT ?????? KDE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
+msgstr "QT ?????? KDE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
 msgid "Install these tools to enable the system to print or act as a print server."
-msgstr "?????????????????? ?????? ?????????????????? ???????????? ?????? ?????????????????? ??????????????? ????????? ??????????????? ??????????????? ?????? ????????? ?????? ????????????????????? ?????? ??????????????????????????? ????????????."
+msgstr "??????????????? ?????? ???????????? ?????? ?????????????????? ??????????????? ????????? ??????????????? ??????????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
 msgid "Install this group of packages to use the base graphical (X) user interface."
-msgstr "???????????? ??????????????? (X) ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ?????? ????????? ?????? ??????????????? ???????????? ?????? ??????????????????????????? ????????????."
+msgstr "???????????? ??????????????? (X) ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ?????? ????????? ?????? ??????????????? ???????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
 #: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
@@ -483,7 +484,7 @@
 #: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
-msgstr "KDE ??????????????????????????? ???????????????"
+msgstr "KDE ?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
 #: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
@@ -491,8 +492,8 @@
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"KDE ?????? ??????????????????????????? ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ?????????????????? ??????????????????, ?????? "
-"?????????????????? ???????????? ????????????????????? ??????."
+"KDE ?????? ??????????????????????????? ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ??????????????? ??????????????????, ?????? "
+"?????????????????? ??????????????? ????????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
 #: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
@@ -512,7 +513,7 @@
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
 #: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
-msgstr "?????????????????????"
+msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
 #: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
@@ -522,7 +523,7 @@
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
 #: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
 #: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
@@ -532,12 +533,12 @@
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
 #: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
-msgstr "?????????????????? ??????????????????????????? ???????????????"
+msgstr "?????????????????? ?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
 #: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
-msgstr "?????????????????? ??????????????????????????? ??????????????????"
+msgstr "?????????????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
 #: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
@@ -639,7 +640,7 @@
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
 #: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
 #: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
@@ -674,7 +675,7 @@
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
 #: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
-msgstr "??????????????? ????????????????????? ???????????????"
+msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
 #: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
@@ -706,13 +707,13 @@
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
 #: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
-msgstr "???????????? ???????????? ????????????????????? ???????????????????????????"
+msgstr "??????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
 #: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
-msgstr "??????????????? ??????????????? ?????? ???????????? ?????????????????? ?????? ???????????? ???????????????????????????"
+msgstr "??????????????? ??????????????? ??????????????? ?????? ????????? ???????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
 #: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
@@ -725,7 +726,7 @@
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
 msgstr ""
-"????????? ????????? ?????????????????? ?????? ????????? ?????? ???????????? ???????????? ???????????? ?????? ??????????????????????????? ???????????? ???????????? ??????????????? ?????? ????????????????????? ???????????? ?????? "
+"????????? ????????? ?????????????????? ?????? ????????? ?????? ???????????? ???????????? ???????????? ?????? ??????????????????????????? ???????????? ??????????????? ??????????????? ?????? ????????????????????? ???????????? ?????? "
 "?????????????????? ???????????? ?????????. ??????????????? ?????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
@@ -737,7 +738,7 @@
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
 #: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
-msgstr "????????????????????? ???????????????????????? ??????????????????"
+msgstr "????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
 #: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
@@ -775,7 +776,7 @@
 #: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
-msgstr "?????????????????? ???????????????"
+msgstr "??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
 #: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
@@ -816,7 +817,7 @@
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
 msgid "The packages in this group are core libraries needed to develop applications."
-msgstr "?????? ???????????? ????????? ?????????????????? ??????????????? ?????? ??????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ?????? ????????? ?????????????????? ??????."
+msgstr "?????? ???????????? ????????? ?????????????????? ??????????????? ?????? ?????????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ?????? ????????? ?????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
@@ -827,7 +828,7 @@
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
 msgid "These packages allow you to develop applications for the X Window System."
-msgstr "?????? ????????????????????? ?????? ?????? X ?????????????????? ?????????????????? ?????? ????????? ????????????????????????????????? ?????? ??????????????? ?????? ???????????? ?????????."
+msgstr "?????? ????????????????????? ?????? ?????? X ?????????????????? ??????????????? ?????? ????????? ????????????????????????????????? ?????? ??????????????? ?????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
@@ -838,14 +839,14 @@
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr "?????? ??????????????? ????????? DHCP, ?????????????????? ?????? NIS ???????????? ???????????????-?????????????????? ??????????????? ?????????."
+msgstr "?????? ??????????????? ????????? DHCP, ?????????????????? ?????? NIS ???????????? ???????????????-?????????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
 #: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr "?????? ????????????????????? ????????? rsh ?????? telnet ???????????? ????????????????????? ??????????????? ??????????????????????????? ?????? ????????? ??????????????? ??????????????? ?????????."
+msgstr "?????? ????????????????????? ????????? rsh ?????? ?????????????????? ???????????? ????????????????????? ??????????????? ??????????????????????????? ?????? ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
 #: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
@@ -855,14 +856,14 @@
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
 #: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
-msgstr "?????? ??????????????? ??????????????? ???????????????????????? ????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ??????."
+msgstr "?????? ??????????????? ??????????????? ???????????????????????? ????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
 #: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr "?????? ??????????????? ????????? ??? ??????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
+msgstr "?????? ??????????????? ?????????????????? ??? ??????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
 #: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
@@ -870,20 +871,20 @@
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
 msgstr ""
-"?????? ???????????? ???????????? DocBook ????????????????????? ????????? ??????????????????????????? ??????????????? ?????? ?????????????????? HTML, PDF, Postscript, ?????? "
+"?????? ??????????????? ???????????? DocBook ????????????????????? ????????? ??????????????????????????? ??????????????? ?????? ?????????????????? HTML, PDF, ??????????????????????????????????????????, ?????? "
 "???????????????????????? ????????? ??????????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
 #: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
-msgstr "?????? ????????????????????? ?????? ?????????????????? ?????? ?????? ????????? ??????????????? ????????? ???????????? ?????????."
+msgstr "?????? ????????????????????? ?????? ??????????????? ?????? ?????? ????????? ??????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
 #: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
-msgstr "?????? ????????????????????? ?????? ?????????????????? ?????? ?????? FTP ??????????????? ????????? ???????????? ?????????."
+msgstr "?????? ????????????????????? ?????? ??????????????? ?????? ?????? FTP ??????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
 #: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
@@ -891,18 +892,18 @@
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
-msgstr "?????? ????????????????????? ????????? automake, gcc, perl, python, ?????? debuggers ???????????? ???????????????????????? ??????????????? ??????????????? ?????????."
+msgstr "?????? ????????????????????? ????????? ??????????????????, ??????????????????, ????????????, ???????????????, ?????? ??????????????? ???????????? ???????????????????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
 #: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
-msgstr "?????? ?????????????????? ??????????????? ?????? ????????? ?????????????????? ?????? ??????????????????????????? ???????????? ?????? ?????????????????? ???????????? ??????"
+msgstr "?????? ???????????? ???????????? ?????????????????? ??????????????? ??????????????? ??????????????????????????? ???????????? ?????? ?????????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
 #: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
-msgstr "?????? ???????????? ????????? Red Hat ?????? ????????? ??????????????? ??????????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ??????."
+msgstr "?????? ???????????? ????????? Red Hat ?????? ????????? ??????????????? ??????????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ??????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
 #: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
@@ -910,14 +911,14 @@
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr ""
-"?????? ???????????? ??????????????? ?????? ????????????????????? ???????????? ?????? ??????????????? ???????????? ??????. ???????????? router/firewall ??????????????? ?????? ????????? "
+"?????? ???????????? ??????????????? ?????? ????????????????????? ???????????? ?????? ??????????????? ???????????? ??????. ???????????? ????????????/???????????????????????? ???????????? ?????? ????????? "
 "??????????????????, ?????????????????? ?????? ?????????."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
 #: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "?????? ???????????? ????????? ??????????????? ????????????, ????????? ?????? ????????? ????????????????????? ?????????."
+msgstr "?????? ???????????? ????????? ?????????????????? ????????????, ????????? ?????? ????????? ????????????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
 #: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
@@ -931,7 +932,7 @@
 #: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr "?????? ???????????? ????????? ?????????????????? ?????? ?????????????????????????????? ?????? ???????????????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????????."
+msgstr "?????? ???????????? ????????? ????????? ?????? ????????????-???????????? ?????? ???????????????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
 #: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
@@ -940,7 +941,7 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"?????? ???????????? ????????? ???????????????????????? ?????????????????? ????????????, ?????????, ?????? ????????? ????????????????????? ??????. ?????? ????????????????????????????????? ?????? X ??????????????? ?????????????????? "
+"?????? ???????????? ????????? ???????????????????????? ?????????????????? ????????????, ?????????, ?????? ????????? ????????????????????? ??????. ?????? ????????????????????????????????? ?????? X ??????????????? ??????????????? "
 "?????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
@@ -950,20 +951,20 @@
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
 msgstr ""
-"?????? ???????????? ????????? ?????????????????? ?????? ????????? ??????????????? ????????????????????? ??????????????? ?????? ???????????????????????? ??????, ???????????? ???????????????????????? ???????????? ????????????????????? ?????? "
-"????????? ?????? ?????????????????? ??????????????????????????? ?????? ????????????????????? ?????? ????????????."
+"?????? ???????????? ??????????????? ?????? ????????? ??????????????? ????????????????????? ??????????????? ?????? ?????????????????? ??????, ???????????? ???????????????????????? ???????????? ????????????????????? ?????? "
+"????????? ?????? ??????????????? ??????????????????????????? ????????????????????? ?????? ????????????."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid "This group is a collection of tools and resources of Armenian environments."
-msgstr "??????????????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+msgstr "?????? ???????????? ??????????????????????????? ????????????????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools for various hardware specific utilities."
-msgstr "?????? ???????????? ??????????????? ??????????????????????????? ????????????????????? ???????????????????????? ?????? ???????????? ?????????????????? ?????? ???????????? ??????."
+msgstr "?????? ???????????? ??????????????? ??????????????????????????? ????????????????????? ???????????????????????? ?????? ???????????? ????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
 #: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
@@ -972,30 +973,30 @@
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
 msgstr ""
-"?????? ???????????? ?????????????????? ?????? ????????? ??????????????? ????????????????????? ?????? ???????????? ??????, ???????????? SMB ???????????? ?????? ????????????????????? ?????? ?????????????????? ?????? ????????? "
-"?????? ??????????????? ????????????????????? ?????????????????? ???????????? ?????? ????????? ???????????????."
+"?????? ???????????? ??????????????? ?????? ????????? ??????????????? ????????????????????? ?????? ???????????? ??????, ???????????? SMB ???????????? ?????? ????????????????????? ?????? ?????????????????? ?????? ????????? "
+"?????? ??????????????? ????????????????????? ?????????????????? ???????????? ?????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
-msgstr "?????? ??????????????? ???????????? ?????? ?????? ?????????????????? ?????? DNS ????????? ??????????????? (BIND) ?????? ????????? ???????????? ?????????."
+msgstr "?????? ??????????????? ???????????? ?????? ?????? ??????????????? ?????? DNS ????????? ??????????????? (BIND) ?????? ????????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
 #: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
-msgstr "?????? ??????????????? ???????????? ?????? ?????? Linux ?????? MS Windows(tm) ???????????????????????? ?????? ????????? ???????????? ?????????????????????????????? ?????? ???????????? ?????????."
+msgstr "?????? ??????????????? ???????????? ?????? ?????? Linux ?????? MS Windows(tm) ????????????????????? ?????? ????????? ??????????????? ?????????????????????????????? ?????? ???????????? ?????????."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
 #: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
-msgstr "?????? ??????????????? ???????????? MySQL ??????????????? ?????? ????????? ?????????????????? ????????????????????? ?????? ???????????? ??????."
+msgstr "?????? ??????????????? ???????????? MySQL ??????????????? ?????? ????????? ?????????????????? ????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
 #: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr "?????? ??????????????? ???????????? ????????? Postgresql ?????? ????????? ??????????????? ?????? ????????? ??????????????? ??????????????? ??????????????? ??????."
+msgstr "?????? ??????????????? ???????????? ????????? Postgresql ?????? ????????? ??????????????? ?????? ????????? ??????????????? ??????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
 #: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
@@ -1011,7 +1012,7 @@
 #: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
-msgstr "?????????????????? ??????????????? ?????? ?????????????????? ??????????????? ???????????? ?????? ????????????????????????"
+msgstr "?????????????????? ??????????????? ?????? ?????????????????? ??????????????? ??????????????? ?????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
 #: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
@@ -1042,7 +1043,7 @@
 #: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
-msgstr "?????????????????? ?????? ?????? ???????????????????????? ??????????????????."
+msgstr "??????????????? ?????? ?????? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
@@ -1091,18 +1092,18 @@
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
 #: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
-msgstr "Windows ???????????? ???????????????"
+msgstr "????????????????????? ??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
 #: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
-msgstr "X ??????????????????????????? ???????????????"
+msgstr "X ?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
 #: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
-msgstr "X ??????????????? ??????????????????"
+msgstr "X ??????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
 #: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
@@ -1112,7 +1113,7 @@
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
 #: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
-msgstr "XFCE ??????????????????????????? ???????????????"
+msgstr "XFCE ?????????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
 #: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
@@ -1127,7 +1128,7 @@
 #: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
 #: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
-msgstr "????????????????????????????????? ???????????????????????? ????????????"
+msgstr "?????????????????????????????? ???????????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
 #: ../comps-f11.xml.in.h:53
@@ -1142,7 +1143,7 @@
 #: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
 #: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
-msgstr "???????????????????????? ?????? ????????? ??????????????? ???????????? ?????? ????????? ??????????????? ???????????????"
+msgstr "???????????????????????? ?????? ????????? ??????????????? ???????????? ?????? ????????? ?????????????????? ???????????????"
 
 #: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
 #: ../comps-f11.xml.in.h:90
@@ -1152,7 +1153,7 @@
 #: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
 #: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
-msgstr "?????????????????? ???????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:117
@@ -1172,7 +1173,7 @@
 #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
-msgstr "?????????????????? bitmap ?????? ???????????? ??????????????? ???????????????"
+msgstr "?????????????????? ?????????????????? ?????? ???????????? ?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
@@ -1207,7 +1208,7 @@
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
-msgstr "??????????????? ??????????????????"
+msgstr "???????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
 msgid "A software playground for learning about learning."
@@ -1307,7 +1308,7 @@
 
 #: ../comps-f11.xml.in.h:140
 msgid "Online Help and Documentation"
-msgstr "?????????????????? ????????? ??? ????????????????????????????????????"
+msgstr "?????????????????? ????????? ??? ???????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:169
 msgid "Sugar Desktop Environment"
@@ -1317,7 +1318,9 @@
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
-msgstr "32 ????????? ?????????????????? ?????????????????? ????????? ??????????????? ??????????????????????????? ??????????????????????????? ?????? ????????? ??????????????????, ?????????????????? ??????????????????, ?????? ???????????????????????? ?????? ?????????????????????, ????????? ????????? ?????????????????? ?????? ????????????."
+msgstr ""
+"32 ????????? ?????????????????? ?????????????????? ????????? ??????????????? ??????????????????????????? ??????????????????????????? ?????? ????????? ??????????????????, ?????????????????? ??????????????????, ?????? ???????????????????????? "
+"?????? ?????????????????????, ????????? ????????? ?????????????????? ?????? ????????????."
 
 #: ../comps-f11.xml.in.h:173
 msgid ""
@@ -1329,7 +1332,9 @@
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????? ???????????? ????????????????????? ?????? ?????????????????? ?????? ?????? ?????? ?????????????????? ?????? ?????????????????????, ????????????????????????, ????????????-???????????? ?????? ?????????????????? ????????? ???????????????????????? ???????????? ??????."
+msgstr ""
+"?????? ???????????? ????????????????????? ?????? ?????????????????? ?????? ?????? ?????? ?????????????????? ?????? ?????????????????????, ????????????????????????, ????????????-???????????? ?????? ?????????????????? ????????? ???????????????????????? "
+"???????????? ??????."
 
 #: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
@@ -1337,7 +1342,7 @@
 
 #: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "???????????? ????????????????????? ??????????????????"
+msgstr "????????? ????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1352,23 +1357,23 @@
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
-"GNOME ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ?????????????????? ??????????????????, ?????? "
-"?????????????????? ???????????? ????????????????????? ??????."
+"GNOME ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ??????????????? ??????????????????, ?????? "
+"?????????????????? ??????????????? ????????????????????? ??????."
 
 #: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"KDE ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ?????????????????? ??????????????????, ?????? "
-"?????????????????? ???????????? ????????????????????? ??????."
+"KDE ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ??????????????? ??????????????????, ?????? "
+"?????????????????? ??????????????? ????????????????????? ??????."
 
 #: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr ""
-"????????? ???????????????????????? ?????????????????? ?????? ????????? ?????? ???????????? ???????????? ???????????? ?????? ??????????????????????????? ???????????? ???????????? ??????????????? ?????? ????????????????????? ???????????? "
+"????????? ???????????????????????? ?????????????????? ?????? ????????? ?????? ???????????? ???????????? ???????????? ?????? ??????????????????????????? ???????????? ??????????????? ??????????????? ?????? ????????????????????? ???????????? "
 "?????? ?????????????????? ???????????? ?????????. ??????????????? ?????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
@@ -1380,7 +1385,7 @@
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
-"?????? ????????????????????? ?????? DocBook ????????????????????? ????????? ??????????????????????????? ??????????????? ?????? ?????????????????? HTML, PDF, Postscript, ?????? "
+"?????? ????????????????????? ?????? DocBook ????????????????????? ????????? ??????????????????????????????????????? ???????????? ?????? ?????????????????? HTML, PDF, ??????????????????????????????????????????, ?????? "
 "???????????????????????? ????????? ????????? ???????????? ?????????."
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
@@ -1389,15 +1394,15 @@
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
@@ -1405,5 +1410,5 @@
 
 #: ../comps-el5.xml.in.h:65
 msgid "This group is a collection of tools and resources of Czech environments."
-msgstr "????????? ????????????????????? ?????? ???????????? ?????? ???????????? ?????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
+msgstr "????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 



From itamarjp at fedoraproject.org  Tue Apr  7 10:17:34 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  7 Apr 2009 10:17:34 +0000 (UTC)
Subject: rpms/redir/devel 01_fix_max_bandwidth_docs.dpatch, NONE,
	1.1 02_use_ntohs.dpatch, NONE, 1.1 03_fix_tcp_wrappers.dpatch,
	NONE, 1.1 04_fix_timeouts.dpatch, NONE, 1.1 05_pedantic.dpatch,
	NONE, 1.1 06_fix_shaper_buffer.dpatch, NONE,
	1.1 07_cosmetics.dpatch, NONE, 1.1 08_add_wrappers.dpatch, NONE,
	1.1 09_add_linux_software_map.dpatch, NONE,
	1.1 15_deb_cosmetics.dpatch, NONE, 1.1 20_do_not_strip.dpatch,
	NONE, 1.1 25_fix_setsockopt.dpatch, NONE,
	1.1 30_fix_manpage.dpatch, NONE,
	1.1 31_fix_transproxy_location.patch, NONE, 1.1 import.log, NONE,
	1.1 redir.spec, NONE, 1.1 redir_gcc4.4-signedness.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407101734.173CE70100@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6789/devel

Modified Files:
	.cvsignore sources 
Added Files:
	01_fix_max_bandwidth_docs.dpatch 02_use_ntohs.dpatch 
	03_fix_tcp_wrappers.dpatch 04_fix_timeouts.dpatch 
	05_pedantic.dpatch 06_fix_shaper_buffer.dpatch 
	07_cosmetics.dpatch 08_add_wrappers.dpatch 
	09_add_linux_software_map.dpatch 15_deb_cosmetics.dpatch 
	20_do_not_strip.dpatch 25_fix_setsockopt.dpatch 
	30_fix_manpage.dpatch 31_fix_transproxy_location.patch 
	import.log redir.spec redir_gcc4.4-signedness.patch 
Log Message:
Initial RPM version



--- NEW FILE 01_fix_max_bandwidth_docs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fix_max_bandwidth_docs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix docs and --help to show --max_bandwidth instead of --maxbandwidth

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:21:56.849499952 -0400
@@ -233,7 +233,7 @@
 #ifndef NO_SHAPER
         /* options for bandwidth */
         fprintf(stderr, "\t\t--bufsize=<octets>\tsize of the buffer\n");
-        fprintf(stderr, "\t\t--maxbandwidth=<bit-per-sec>\tlimit the bandwidth\n");
+        fprintf(stderr, "\t\t--max_bandwidth=<bit-per-sec>\tlimit the bandwidth\n");
         fprintf(stderr, "\t\t--random_wait=<millisec>\twait before each packet\n");
         fprintf(stderr, "\t\t--wait_in_out=<flag>\t1 wait for in, 2 out, 3 in&out\n");
         /* end options for bandwidth */
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	1999-12-26 15:52:24.000000000 -0500
+++ redir-2.2.1/redir.man	2005-10-22 21:22:28.882630176 -0400
@@ -18,7 +18,7 @@
 .I --lport=port
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -35,7 +35,7 @@
 .RB [ \--connect=host:port ]
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -102,9 +102,9 @@
 .TP
 .B \--bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---maxbandwidth or --random_wait to simulate a slow connection.
+--max_bandwidth or --random_wait to simulate a slow connection.
 .TP
-.B \--maxbandwidth n
+.B \--max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
@@ -115,7 +115,7 @@
 than the bufsize (see also --bufsize).
 .TP
 .B \--wait_in_out n
-Apply --maxbandwidth and --random_wait for input if n=1, output if n=2 and
+Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)



--- NEW FILE 02_use_ntohs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_use_ntohs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use ntohs() to generate comprehensible debug()s and syslog()s.

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:29:55.491735272 -0400
@@ -745,7 +745,7 @@
 	}
      
 	debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-	debug1("peer socket is %d\n", client.sin_port);
+	debug1("peer socket is %d\n", ntohs(client.sin_port));
 
 	/*
 	 * Double fork here so we don't have to wait later
@@ -871,8 +871,8 @@
 		strcpy(tmp2, inet_ntoa(target->sin_addr));
 	  
 		syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-		       tmp1, client.sin_port,
-		       tmp2, target->sin_port);
+		       tmp1, ntohs(client.sin_port),
+		       tmp2, ntohs(target->sin_port));
 	}
 
 	/* do proxy stuff */
@@ -1066,7 +1066,7 @@
 
 		if (!getpeername(0, (struct sockaddr *) &client, &client_size)) {
 			debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-			debug1("peer socket is %d\n", client.sin_port);
+			debug1("peer socket is %d\n", ntohs(client.sin_port));
 		}
 		if ((targetsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 			perror("target: socket");
@@ -1109,8 +1109,8 @@
 
 		if (dosyslog) {
 			syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-			       inet_ntoa(client.sin_addr), client.sin_port,
-			       target_ip, target.sin_port);
+			       inet_ntoa(client.sin_addr), ntohs(client.sin_port),
+			       target_ip, ntohs(target.sin_port));
 		}
 
 		/* Just start copying - one side of the loop is stdin - 0 */



--- NEW FILE 03_fix_tcp_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_fix_tcp_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix calls to tcp wrappers

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:10:11.439455392 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:10:51.625346208 -0400
@@ -802,8 +802,8 @@
 #ifdef USE_TCP_WRAPPERS
 	request_init(&request, RQ_DAEMON, ident, RQ_FILE, clisock, 0);
 	sock_host(&request);
-	sock_hostname(&request);
-	sock_hostaddr(&request);
+	sock_hostname(request.client);
+	sock_hostaddr(request.client);
 
 	if (!hosts_access(&request)) {
 		refuse(&request);
@@ -1057,8 +1057,8 @@
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
 		sock_host(&request);
-		sock_hostname(&request);
-		sock_hostaddr(&request);
+		sock_hostname(request.client);
+		sock_hostaddr(request.client);
 	
 		if (!hosts_access(&request))
 			refuse(&request);



--- NEW FILE 04_fix_timeouts.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_fix_timeouts.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Apply a close approximation of Robert de Bath's patch for bug #142382

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:44:39.504061784 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:47:14.746461352 -0400
@@ -598,10 +598,6 @@
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
 
-	/* Set up timeout */
-	timeout.tv_sec = timeout_secs;
-	timeout.tv_usec = 0;
-
 	/* file descriptor bits */
 	FD_ZERO(&iofds);
 	FD_SET(insock, &iofds);
@@ -618,14 +614,21 @@
 	while(1) {
 		(void) memcpy(&c_iofds, &iofds, sizeof(iofds));
 
+		/* Set up timeout, Linux returns seconds left in this structure
+		 * so we have to reset it before each select(). */
+		timeout.tv_sec = timeout_secs;
+		timeout.tv_usec = 0;
+
 
 		if (select(max_fd + 1,
 			   &c_iofds,
 			   (fd_set *)0,
 			   (fd_set *)0,
 			   (timeout_secs ? &timeout : NULL)) <= 0) {
-			/*	    syslog(LLEV,"connection timeout: %d sec",timeout.tv_sec);*/
-			break;
+		  if (dosyslog) {
+		    syslog(LOG_NOTICE,"connection timeout: %d sec",timeout_secs);
+		  }
+		  break;
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {



--- NEW FILE 05_pedantic.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_pedantic.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: changes to make clean up compilation

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2005-10-22 23:11:41.000000000 -0400
+++ redir-2.2.1/Makefile	2005-10-22 23:11:48.818368360 -0400
@@ -32,7 +32,7 @@
 # if your system lacks getopt_long, remove the comment from this line
 OBJS = redir.o $(GETOPT_OBJS)
 
-CFLAGS = -O2 -Wall $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
+CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
 LDFLAGS = -s
 
 # solaris, and others, may also need these libraries to link
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:11:48.282449832 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:12:23.201141384 -0400
@@ -73,6 +73,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -460,7 +461,7 @@
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	int socksize = sizeof(struct sockaddr_in);
+	size_t socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -509,7 +510,7 @@
 	if(getsockname(localsock, (struct sockaddr *)&sockname, &socksize) < 0) {
 		perror("getsockname");
 		if (dosyslog)
-			syslog(LOG_ERR, "getsockname failed: %m");
+			syslog(LOG_ERR, "getsockname failed: %s",strerror(errno));
 		exit(1);
 	}
 
@@ -562,7 +563,7 @@
 	switch(fork())
 	{
      	case -1: /* Error */
-     		syslog(LOG_ERR, "Couldn't fork: %m");
+     		syslog(LOG_ERR, "Couldn't fork: %s",strerror(errno));
      		_exit(1);
      	case 0:  /* Child */
 	{
@@ -723,7 +724,7 @@
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	int clientlen = sizeof(client);
+	size_t clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -734,7 +735,7 @@
 		perror("server: accept");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "accept failed: %m");
+			syslog(LOG_ERR, "accept failed: %s",strerror(errno));
 
 		/* determine if this error is fatal */
 		switch(accept_errno) {
@@ -768,7 +769,7 @@
      		perror("(server) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(server) fork failed: %m");
+     			syslog(LOG_ERR, "(server) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -795,7 +796,7 @@
      		perror("(child) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(child) fork failed: %m");
+     			syslog(LOG_ERR, "(child) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -826,7 +827,7 @@
 		perror("target: socket");
 	  
 		if (dosyslog)
-			syslog(LOG_ERR, "socket failed: %m");
+			syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 		
 		_exit(1);
 	}
@@ -850,7 +851,7 @@
    only be different if the input value is 0 (let the system pick a 
    port) */
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			_exit(1);
 		}
@@ -862,7 +863,7 @@
 		perror("target: connect");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "bind failed: %m");
+			syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 		_exit(1);
 	}
@@ -923,7 +924,7 @@
 			perror("server: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "socket failed: %m");
+				syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -962,7 +963,7 @@
 			perror("server: bind");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -980,7 +981,7 @@
 			perror("server: listen");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "listen failed: %m");
+				syslog(LOG_ERR, "listen failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1059,7 +1060,7 @@
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		int client_size = sizeof(client);
+		size_t client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
@@ -1079,7 +1080,7 @@
 			perror("target: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "targetsock failed: %m");
+				syslog(LOG_ERR, "targetsock failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1097,7 +1098,7 @@
 				perror("bind_addr: cannot bind to forcerd outgoing addr");
 				 
 				if (dosyslog)
-					syslog(LOG_ERR, "bind failed: %m");
+					syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 				 
 				exit(1);
 			}
@@ -1109,7 +1110,7 @@
 			perror("target: connect");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "connect failed: %m");
+				syslog(LOG_ERR, "connect failed: %s",strerror(errno));
 
 			exit(1);
 		}



--- NEW FILE 06_fix_shaper_buffer.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_fix_shaper_buffer.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: properly allocate copyloop buffer

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:20:05.235901424 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:22:20.198384008 -0400
@@ -260,7 +260,7 @@
 #endif
 	   int *transproxy,
 #ifndef NO_SHAPER
-           unsigned int * bufsize,
+           unsigned int * bufsizeout,
            int * max_bandwidth,
            int * random_wait,
            int * wait_in_out,
@@ -367,7 +367,7 @@
 
 #ifndef NO_SHAPER
                 case 'z':
-                  *bufsize = (unsigned int)atol(optarg);
+                  *bufsizeout = (unsigned int)atol(optarg);
                   break;
  
                 case 'm':
@@ -594,7 +594,7 @@
 	unsigned long bytes_in = 0;
 	unsigned long bytes_out = 0;
 	unsigned int start_time, end_time;
-	char buf[bufsize];
+	char* buf = malloc(bufsize);
 
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
@@ -637,7 +637,7 @@
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {
-			if((bytes = read(insock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(insock, buf, bufsize)) <= 0)
 				break;
 #ifndef NO_FTP
 			if (ftp & FTP_PORT)
@@ -652,7 +652,7 @@
 			bytes_out += bytes;
 		}
 		if(FD_ISSET(outsock, &c_iofds)) {
-			if((bytes = read(outsock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(outsock, buf, bufsize)) <= 0)
 				break;
 			/* if we're correcting for PASV on ftp redirections, then
 			   fix buf and bytes to have the new address, among other
@@ -689,6 +689,7 @@
 		syslog(LOG_NOTICE, "disconnect %d secs, %ld in %ld out",
 		       (end_time - start_time), bytes_in, bytes_out);
 	}
+	free(buf);
 	return;
 }
 



--- NEW FILE 07_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 07_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic fixes which could be applied upstream

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:41:51.284918168 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:42:42.115190792 -0400
@@ -73,7 +73,7 @@
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
 .B --timeout
-Timeout and close the connection after n seconds on inactivity.
+Timeout and close the connection after n seconds of inactivity.
 .TP
 .B \--syslog
 Log information to syslog.
@@ -90,7 +90,7 @@
 undesirable. 
 .TP
 .B \--transproxy
-On a linux system with transparany proxying enables, causes redir to
+On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see transproxy.txt in the source archive)
 .TP



--- NEW FILE 08_add_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 08_add_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Enabling TCP wrapper support

@DPATCH@

--- redir-2.2.1.orig/Makefile
+++ redir-2.2.1/Makefile
@@ -9,8 +9,8 @@
 # if you would like support for TCP wrappers (and have libwrap.a
 # installed), remove these comments.
 
-WRAP_CFLAGS = # -DUSE_TCP_WRAPPERS 
-WRAP_LIBS = # -lwrap
+WRAP_CFLAGS = -DUSE_TCP_WRAPPERS 
+WRAP_LIBS = -lwrap
 
 # if your system needs any additional libraries (solaris, for example, 
 # needs the ones commented out below), edit this line.




--- NEW FILE 09_add_linux_software_map.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_add_linux_software_map.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add linux software map file

@DPATCH@

--- redir-2.2.1.orig/redir-2.2.lsm
+++ redir-2.2.1/redir-2.2.lsm
@@ -0,0 +1,11 @@
+Begin3
+Title:   redir
+Version:  2.2
+Entered-date:  15DEC1999
+Description:  TCP Port redirector (for firewalls etc).
+Keywords:  tcp port redirector bouncer proxy
+Author:   sammy at oh.verio.com
+Primary-site:  sunsite.unc.edu /pub/Linux/system/Network/daemons
+   39936 redir-2.2.tar.gz
+Copying-policy:  GPL
+End




--- NEW FILE 15_deb_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_deb_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic changes applicable only to debian

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:47:44.067287096 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:48:34.218662928 -0400
@@ -92,7 +92,7 @@
 .B \--transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see transproxy.txt in the source archive)
+(see /usr/share/doc/redir/transproxy.txt)
 .TP
 .B \--connect
 Redirects connections through an HTTP proxy which supports the CONNECT 



--- NEW FILE 20_do_not_strip.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_do_not_strip.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: don't strip by default.  let dh_strip take care of it.

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2007-08-15 14:53:41.908911693 -0400
+++ redir-2.2.1/Makefile	2007-08-15 14:53:59.409909018 -0400
@@ -33,7 +33,7 @@
 OBJS = redir.o $(GETOPT_OBJS)
 
 CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
-LDFLAGS = -s
+LDFLAGS = # -s
 
 # solaris, and others, may also need these libraries to link
 # also edit here if you're using the TCP wrappers code



--- NEW FILE 25_fix_setsockopt.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 25_fix_setsockopt.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that the server socket has SO_REUSEADDR and SO_LINGER set properly.

@DPATCH@
diff -urNad redir~/redir.c redir/redir.c
--- redir~/redir.c	2009-03-03 17:35:12.022427586 -0500
+++ redir/redir.c	2009-03-03 17:45:28.998426896 -0500
@@ -90,8 +90,8 @@
 /* let's set up some globals... */
 int dodebug = 0;
 int dosyslog = 0;
-unsigned char reuse_addr = 1;
-unsigned char linger_opt = 0;
+int reuse_addr = 1; /* allow address reuse */
+struct linger linger_opt = { 0, 0}; /* do not linger */
 char * bind_addr = NULL;
 struct sockaddr_in addr_out;
 int timeout = 0;
@@ -906,6 +906,7 @@
 
 	int servsock;
 	struct sockaddr_in server;
+	int ret;
      
 	/*
 	 * Get a socket to work with.  This socket will
@@ -944,8 +945,30 @@
 		server.sin_addr.s_addr = htonl(inet_addr("0.0.0.0"));
 	}
      
-	setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
-	setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(SO_LINGER)); 
+	ret = setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_REUSEADDR)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_REUSEADDR: %s",strerror(errno));
+			exit(1);
+		}
+	}
+	ret = setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(linger_opt)); 
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_LINGER)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_LINGER: %s",strerror(errno));
+			exit(1);
+		}
+	}
      
 	/*
 	 * Try to bind the address to the socket.



--- NEW FILE 30_fix_manpage.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_fix_manpage.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Clean up questionable formatting in man page.

@DPATCH@
diff -urNad redir~/redir.man redir/redir.man
--- redir~/redir.man	2009-03-03 18:55:37.790428922 -0500
+++ redir/redir.man	2009-03-03 18:58:48.486428715 -0500
@@ -1,43 +1,42 @@
-.PU
 .TH REDIR 1 local
 .SH NAME
-redir \- redirect tcp connections
+redir - redirect tcp connections
 .SH SYNOPSIS
 .ll +8
 .B redir
-.RB [ \--laddr=incoming.ip.address ]
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--bind_addr=my.other.ip.address ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --lport=port
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB [ \-\-laddr=incoming.ip.address ]
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog 
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-bind_addr=my.other.ip.address ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-lport=port
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .B redir
-.RB \--inetd
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB \-\-inetd
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog ]
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .SH DESCRIPTION
@@ -49,74 +48,73 @@
 Depending on how redir was compiled, not all options may be available.
 .SH OPTIONS
 .TP
-.B \--lport
+.B \-\-lport
 Specifies port to listen for connections on (when not running from inetd)
 .TP
-.B \--laddr
+.B \-\-laddr
 IP address to bind to when listening for connections (when not
 running from inetd) 
 .TP
-.B \--cport
+.B \-\-cport
 Specifies port to connect to.
 .TP
-.B \--caddr
+.B \-\-caddr
 Specifies remote host to connect to. (localhost if omitted)
 .TP
-.B \--inetd
+.B \-\-inetd
 Run as a process started from inetd, with the connection passed as stdin
 and stdout on startup.
 .TP
-.B \--debug
+.B \-\-debug
 Write debug output to stderr or syslog.
 .TP
-.B \--name
+.B \-\-name
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
-.B --timeout
+.B \-\-timeout
 Timeout and close the connection after n seconds of inactivity.
 .TP
-.B \--syslog
+.B \-\-syslog
 Log information to syslog.
 .TP
-.B \--bind_addr
+.B \-\-bind_addr
 Forces redir to pick a specific address/interface to bind to when it listens 
 for incoming connections. 
 .TP
-.B \--ftp
+.B \-\-ftp
 When using redir for an FTP server, this will cause redir to also
 redirect ftp connections.  Type should be specified as either "port",
 "pasv", or "both", to specify what type of FTP connection to handle.
-Note that --transproxy often makes one or the other (generally port)
+Note that \-\-transproxy often makes one or the other (generally port)
 undesirable. 
 .TP
-.B \--transproxy
+.B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see /usr/share/doc/redir/transproxy.txt)
 .TP
-.B \--connect
+.B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 
-command.  Specify the address and port of the proxy using --caddr and
---cport.  --connect requires the hostname and port which the HTTP
+command.  Specify the address and port of the proxy using \-\-caddr and
+\-\-cport.  \-\-connect requires the hostname and port which the HTTP
 proxy will be asked to connect to.
 .TP
-.B \--bufsize n
+.B \-\-bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---max_bandwidth or --random_wait to simulate a slow connection.
+\-\-max_bandwidth or \-\-random_wait to simulate a slow connection.
 .TP
-.B \--max_bandwidth n
+.B \-\-max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
 .TP
-.B \--random_wait n
+.B \-\-random_wait n
 Wait between 0 and 2 x n milliseconds before each "packet". A "packet" is
 a bloc of data read in one time by redir. A "packet" size is always less
-than the bufsize (see also --bufsize).
+than the bufsize (see also \-\-bufsize).
 .TP
-.B \--wait_in_out n
-Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
+.B \-\-wait_in_out n
+Apply \-\-max_bandwidth and \-\-random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)
-


31_fix_transproxy_location.patch:

--- NEW FILE 31_fix_transproxy_location.patch ---
diff -ruNp a/redir-2.2.1/redir.man b/redir-2.2.1/redir.man
--- a/redir-2.2.1/redir.man	2009-04-06 13:21:06.000000000 -0300
+++ b/redir-2.2.1/redir.man	2009-04-06 13:23:59.000000000 -0300
@@ -91,7 +91,7 @@ undesirable. 
 .B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see /usr/share/doc/redir/transproxy.txt)
+(see /usr/share/doc/redir-2.2.1/transproxy.txt)
 .TP
 .B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 


--- NEW FILE import.log ---
redir-2_2_1-3_fc11:HEAD:redir-2.2.1-3.fc11.src.rpm:1239099294


--- NEW FILE redir.spec ---
Name:           redir
Version:        2.2.1
Release:        3%{?dist}
Summary:        Redirect TCP connections

Group:          Applications/Internet
License:        GPL+
URL:            http://sammy.net/~sammy/hacks/
Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcp_wrappers-devel

#Include Debian Patches
Patch0:         01_fix_max_bandwidth_docs.dpatch
Patch1:         02_use_ntohs.dpatch
Patch2:         03_fix_tcp_wrappers.dpatch
Patch3:         04_fix_timeouts.dpatch
Patch4:         05_pedantic.dpatch
Patch5:         06_fix_shaper_buffer.dpatch
Patch6:         07_cosmetics.dpatch
Patch7:         08_add_wrappers.dpatch
Patch8:         09_add_linux_software_map.dpatch
Patch9:         15_deb_cosmetics.dpatch
Patch10:        20_do_not_strip.dpatch
Patch11:        25_fix_setsockopt.dpatch
Patch12:        30_fix_manpage.dpatch
#end of debian patches

Patch13:        redir_gcc4.4-signedness.patch
Patch14:        31_fix_transproxy_location.patch
%description
a port redirector, used to forward incoming connections to somewhere else.
by far the cleanest piece of code here, because someone else liked it
enough to fix it.

%prep
%setup -q

# Fix docs and --help to show --max_bandwidth instead of --maxbandwidth
%patch0 -p1

#use ntohs() to generate comprehensible debug()s and syslog()s
%patch1 -p1

#fix calls to tcp wrappers
%patch2 -p1

# fix and make timeout more verbose
%patch3 -p1

#changes to make clean up compilation, include missing time.h include
%patch4 -p1

#properly allocate copyloop buffer
%patch5 -p1

#cosmestic only patch
%patch6 -p1

#add tcp_wrapper support
%patch7 -p1

#description of redir
%patch8 -p1

#comestic only patch
%patch9 -p1

# do not stripping needed for debug-info package
%patch10 -p1

#make usage os setsockopt more verbose
%patch11 -p1

#Clean up questionable formatting in man page
%patch12 -p1

#fix compile warning with gcc 4.4
%patch13 -p2

# fix location of transproxy.txt
%patch14 -p2

# Convert to utf-8
for file in CHANGES; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
install -Dp -m 644 %{name}.man $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README CHANGES COPYING trans*.txt
%{_sbindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Sat Apr 04 2009 Itamar Reis Peixoto - 2.2.1-3
- fix compile warning with gcc 4.4
- include README and COPYING into %%doc section
- remove attr from files section
- convert CHANGES TO utf-8
- fix location of transproxy.txt file in manpage

* Wed Apr 01 2009 Itamar Reis Peixoto - 2.2.1-2
- Include Debian Patches

* Tue Mar 31 2009 Itamar Reis Peixoto - 2.2.1-1
- Initial RPM version

redir_gcc4.4-signedness.patch:

--- NEW FILE redir_gcc4.4-signedness.patch ---
Binary files a/redir-2.2.1/redir and b/redir-2.2.1/redir differ
diff -ruNp a/redir-2.2.1/redir.c b/redir-2.2.1/redir.c
--- a/redir-2.2.1/redir.c	2009-04-04 16:36:24.000000000 -0300
+++ b/redir-2.2.1/redir.c	2009-04-04 16:46:06.000000000 -0300
@@ -461,7 +461,7 @@ void ftp_clean(int send, char *buf, unsi
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	size_t socksize = sizeof(struct sockaddr_in);
+	unsigned int socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -721,7 +721,7 @@ do_accept(int servsock, struct sockaddr_
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	size_t clientlen = sizeof(client);
+	unsigned int clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -1080,7 +1080,7 @@ main(int argc, char *argv[])
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		size_t client_size = sizeof(client);
+		unsigned int client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
Binary files a/redir-2.2.1/redir.o and b/redir-2.2.1/redir.o differ


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redir/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:26:26 -0000	1.1
+++ .cvsignore	7 Apr 2009 10:17:03 -0000	1.2
@@ -0,0 +1 @@
+redir-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redir/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:26:27 -0000	1.1
+++ sources	7 Apr 2009 10:17:03 -0000	1.2
@@ -0,0 +1 @@
+4342fadac30504c86c8db7beefe01995  redir-2.2.1.tar.gz



From than at fedoraproject.org  Tue Apr  7 10:25:00 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  7 Apr 2009 10:25:00 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-kio_http.patch, NONE,
	1.1 kdelibs.spec, 1.461, 1.462
Message-ID: <20090407102500.1B9B670100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8806

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kio_http.patch 
Log Message:
upstream patch to fix kio_http issue


kdelibs-4.2.2-kio_http.patch:

--- NEW FILE kdelibs-4.2.2-kio_http.patch ---
Index: kioslave/http/http.cpp
===================================================================
--- kioslave/http/http.cpp	(Revision 950464)
+++ kioslave/http/http.cpp	(Revision 950465)
@@ -229,16 +229,12 @@
 }
 
 
+#define NO_SIZE ((KIO::filesize_t) -1)
 
-
-
-
-#define NO_SIZE		((KIO::filesize_t) -1)
-
 #ifdef HAVE_STRTOLL
-#define STRTOLL	strtoll
+#define STRTOLL strtoll
 #else
-#define STRTOLL	strtol
+#define STRTOLL strtol
 #endif
 
 
@@ -259,6 +255,7 @@
     , m_proxyAuth(0)
     , m_socketProxyAuth(0)
     , m_isError(false)
+    , m_isLoadingErrorPage(false)
     , m_remoteRespTimeout(DEFAULT_RESPONSE_TIMEOUT)
 {
     reparseConfiguration();
@@ -292,6 +289,7 @@
 {
   m_isEOF = false;
   m_isError = false;
+  m_isLoadingErrorPage = false;
 }
 
 void HTTPProtocol::resetResponseParsing()
@@ -575,8 +573,11 @@
               m_server.initFrom(m_request);
           }
           break;
-      } else if (m_isError) {
-          // Hard error, abort everything.
+      } else if (m_isError || m_isLoadingErrorPage) {
+          // Unrecoverable error, abort everything.
+          // Also, if we've just loaded an error page there is nothing more to do.
+          // In that case we abort to avoid loops; some webservers manage to send 401 and
+          // no authentication request. Or an auth request we don't understand.
           return false;
       }
 
@@ -1728,6 +1729,15 @@
   error( ERR_SLAVE_DEFINED, errorString );
 }
 
+void HTTPProtocol::setLoadingErrorPage()
+{
+    if (m_isLoadingErrorPage) {
+        kWarning(7113) << "called twice during one request, something is probably wrong.";
+    }
+    m_isLoadingErrorPage = true;
+    SlaveBase::errorPage();
+}
+
 bool HTTPProtocol::isOffline(const KUrl &url)
 {
   const int NetWorkStatusUnknown = 1;
@@ -2720,7 +2730,7 @@
             ; // Ignore error
         } else {
             if (m_request.preferErrorPage) {
-                errorPage();
+                setLoadingErrorPage();
             } else {
                 error(ERR_INTERNAL_SERVER, m_request.url.url());
                 return false;
@@ -2743,7 +2753,7 @@
         // Any other client errors
         // Tell that we will only get an error page here.
         if (m_request.preferErrorPage) {
-            errorPage();
+            setLoadingErrorPage();
         } else {
             error(ERR_DOES_NOT_EXIST, m_request.url.url());
             return false;
@@ -3303,14 +3313,14 @@
         kDebug(7113) << "pointer to auth class is now" << *auth;
         if (!(*auth)) {
             if (m_request.preferErrorPage) {
-                errorPage();
+                setLoadingErrorPage();
             } else {
                 error(ERR_UNSUPPORTED_ACTION, "Unknown Authorization method!");
                 return false;
             }
         }
 
-        // auth may still be null due to errorPage().
+        // *auth may still be null due to setLoadingErrorPage().
 
         if (*auth) {
             // remove trailing space from the method string, or digest auth will fail
@@ -3357,7 +3367,7 @@
 
             if ((*auth)->isError()) {
                 if (m_request.preferErrorPage) {
-                    errorPage();
+                    setLoadingErrorPage();
                 } else {
                     error(ERR_UNSUPPORTED_ACTION, "Authorization failed!");
                     return false;
Index: kioslave/http/http.h
===================================================================
--- kioslave/http/http.h	(Revision 950464)
+++ kioslave/http/http.h	(Revision 950465)
@@ -259,6 +259,7 @@
   void cacheUpdate( const KUrl &url, bool nocache, time_t expireDate);
 
   void httpError(); // Generate error message based on response code
+  void setLoadingErrorPage(); // Call SlaveBase::errorPage() and remember that we've called it
 
   bool isOffline(const KUrl &url); // Check network status
 
@@ -523,6 +524,8 @@
 
   // Indicates whether there was some connection error.
   bool m_isError;
+  // Whether we are loading an error page (we should close the connection afterwards)
+  bool m_isLoadingErrorPage;
 
   // Values that determine the remote connection timeouts.
   int m_remoteRespTimeout;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- kdelibs.spec	1 Apr 2009 10:40:09 -0000	1.461
+++ kdelibs.spec	7 Apr 2009 10:24:29 -0000	1.462
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -86,6 +86,7 @@
 
 # upstream
 # 4.2 branch
+Patch100: kdelibs-4.2.2-kio_http.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -225,6 +226,7 @@
 
 # upstream patches
 # 4.2
+%patch100 -p0 -b .kio_http
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -409,6 +411,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- upstream patch to fix kio_http issue
+
 * Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From than at fedoraproject.org  Tue Apr  7 10:26:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  7 Apr 2009 10:26:59 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-kio_http.patch, NONE,
	1.1 kdelibs.spec, 1.411, 1.412
Message-ID: <20090407102659.9B54070100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9252

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kio_http.patch 
Log Message:
upstream patch to fix kio_http issue


kdelibs-4.2.2-kio_http.patch:

--- NEW FILE kdelibs-4.2.2-kio_http.patch ---
Index: kioslave/http/http.cpp
===================================================================
--- kioslave/http/http.cpp	(Revision 950464)
+++ kioslave/http/http.cpp	(Revision 950465)
@@ -229,16 +229,12 @@
 }
 
 
+#define NO_SIZE ((KIO::filesize_t) -1)
 
-
-
-
-#define NO_SIZE		((KIO::filesize_t) -1)
-
 #ifdef HAVE_STRTOLL
-#define STRTOLL	strtoll
+#define STRTOLL strtoll
 #else
-#define STRTOLL	strtol
+#define STRTOLL strtol
 #endif
 
 
@@ -259,6 +255,7 @@
     , m_proxyAuth(0)
     , m_socketProxyAuth(0)
     , m_isError(false)
+    , m_isLoadingErrorPage(false)
     , m_remoteRespTimeout(DEFAULT_RESPONSE_TIMEOUT)
 {
     reparseConfiguration();
@@ -292,6 +289,7 @@
 {
   m_isEOF = false;
   m_isError = false;
+  m_isLoadingErrorPage = false;
 }
 
 void HTTPProtocol::resetResponseParsing()
@@ -575,8 +573,11 @@
               m_server.initFrom(m_request);
           }
           break;
-      } else if (m_isError) {
-          // Hard error, abort everything.
+      } else if (m_isError || m_isLoadingErrorPage) {
+          // Unrecoverable error, abort everything.
+          // Also, if we've just loaded an error page there is nothing more to do.
+          // In that case we abort to avoid loops; some webservers manage to send 401 and
+          // no authentication request. Or an auth request we don't understand.
           return false;
       }
 
@@ -1728,6 +1729,15 @@
   error( ERR_SLAVE_DEFINED, errorString );
 }
 
+void HTTPProtocol::setLoadingErrorPage()
+{
+    if (m_isLoadingErrorPage) {
+        kWarning(7113) << "called twice during one request, something is probably wrong.";
+    }
+    m_isLoadingErrorPage = true;
+    SlaveBase::errorPage();
+}
+
 bool HTTPProtocol::isOffline(const KUrl &url)
 {
   const int NetWorkStatusUnknown = 1;
@@ -2720,7 +2730,7 @@
             ; // Ignore error
         } else {
             if (m_request.preferErrorPage) {
-                errorPage();
+                setLoadingErrorPage();
             } else {
                 error(ERR_INTERNAL_SERVER, m_request.url.url());
                 return false;
@@ -2743,7 +2753,7 @@
         // Any other client errors
         // Tell that we will only get an error page here.
         if (m_request.preferErrorPage) {
-            errorPage();
+            setLoadingErrorPage();
         } else {
             error(ERR_DOES_NOT_EXIST, m_request.url.url());
             return false;
@@ -3303,14 +3313,14 @@
         kDebug(7113) << "pointer to auth class is now" << *auth;
         if (!(*auth)) {
             if (m_request.preferErrorPage) {
-                errorPage();
+                setLoadingErrorPage();
             } else {
                 error(ERR_UNSUPPORTED_ACTION, "Unknown Authorization method!");
                 return false;
             }
         }
 
-        // auth may still be null due to errorPage().
+        // *auth may still be null due to setLoadingErrorPage().
 
         if (*auth) {
             // remove trailing space from the method string, or digest auth will fail
@@ -3357,7 +3367,7 @@
 
             if ((*auth)->isError()) {
                 if (m_request.preferErrorPage) {
-                    errorPage();
+                    setLoadingErrorPage();
                 } else {
                     error(ERR_UNSUPPORTED_ACTION, "Authorization failed!");
                     return false;
Index: kioslave/http/http.h
===================================================================
--- kioslave/http/http.h	(Revision 950464)
+++ kioslave/http/http.h	(Revision 950465)
@@ -259,6 +259,7 @@
   void cacheUpdate( const KUrl &url, bool nocache, time_t expireDate);
 
   void httpError(); // Generate error message based on response code
+  void setLoadingErrorPage(); // Call SlaveBase::errorPage() and remember that we've called it
 
   bool isOffline(const KUrl &url); // Check network status
 
@@ -523,6 +524,8 @@
 
   // Indicates whether there was some connection error.
   bool m_isError;
+  // Whether we are loading an error page (we should close the connection afterwards)
+  bool m_isLoadingErrorPage;
 
   // Values that determine the remote connection timeouts.
   int m_remoteRespTimeout;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- kdelibs.spec	1 Apr 2009 17:50:32 -0000	1.411
+++ kdelibs.spec	7 Apr 2009 10:26:29 -0000	1.412
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -86,6 +86,7 @@
 
 # upstream
 # 4.2 branch
+Patch100: kdelibs-4.2.2-kio_http.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -225,6 +226,7 @@
 
 # upstream patches
 # 4.2
+%patch100 -p0 -b .kio_http
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -409,6 +411,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- upstream patch to fix kio_http issue
+
 * Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From itamarjp at fedoraproject.org  Tue Apr  7 10:26:52 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  7 Apr 2009 10:26:52 +0000 (UTC)
Subject: rpms/redir/F-10 01_fix_max_bandwidth_docs.dpatch, NONE,
	1.1 02_use_ntohs.dpatch, NONE, 1.1 03_fix_tcp_wrappers.dpatch,
	NONE, 1.1 04_fix_timeouts.dpatch, NONE, 1.1 05_pedantic.dpatch,
	NONE, 1.1 06_fix_shaper_buffer.dpatch, NONE,
	1.1 07_cosmetics.dpatch, NONE, 1.1 08_add_wrappers.dpatch, NONE,
	1.1 09_add_linux_software_map.dpatch, NONE,
	1.1 15_deb_cosmetics.dpatch, NONE, 1.1 20_do_not_strip.dpatch,
	NONE, 1.1 25_fix_setsockopt.dpatch, NONE,
	1.1 30_fix_manpage.dpatch, NONE,
	1.1 31_fix_transproxy_location.patch, NONE, 1.1 import.log, NONE,
	1.1 redir.spec, NONE, 1.1 redir_gcc4.4-signedness.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407102652.CFA6870100@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8938/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	01_fix_max_bandwidth_docs.dpatch 02_use_ntohs.dpatch 
	03_fix_tcp_wrappers.dpatch 04_fix_timeouts.dpatch 
	05_pedantic.dpatch 06_fix_shaper_buffer.dpatch 
	07_cosmetics.dpatch 08_add_wrappers.dpatch 
	09_add_linux_software_map.dpatch 15_deb_cosmetics.dpatch 
	20_do_not_strip.dpatch 25_fix_setsockopt.dpatch 
	30_fix_manpage.dpatch 31_fix_transproxy_location.patch 
	import.log redir.spec redir_gcc4.4-signedness.patch 
Log Message:
Initial RPM



--- NEW FILE 01_fix_max_bandwidth_docs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fix_max_bandwidth_docs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix docs and --help to show --max_bandwidth instead of --maxbandwidth

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:21:56.849499952 -0400
@@ -233,7 +233,7 @@
 #ifndef NO_SHAPER
         /* options for bandwidth */
         fprintf(stderr, "\t\t--bufsize=<octets>\tsize of the buffer\n");
-        fprintf(stderr, "\t\t--maxbandwidth=<bit-per-sec>\tlimit the bandwidth\n");
+        fprintf(stderr, "\t\t--max_bandwidth=<bit-per-sec>\tlimit the bandwidth\n");
         fprintf(stderr, "\t\t--random_wait=<millisec>\twait before each packet\n");
         fprintf(stderr, "\t\t--wait_in_out=<flag>\t1 wait for in, 2 out, 3 in&out\n");
         /* end options for bandwidth */
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	1999-12-26 15:52:24.000000000 -0500
+++ redir-2.2.1/redir.man	2005-10-22 21:22:28.882630176 -0400
@@ -18,7 +18,7 @@
 .I --lport=port
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -35,7 +35,7 @@
 .RB [ \--connect=host:port ]
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -102,9 +102,9 @@
 .TP
 .B \--bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---maxbandwidth or --random_wait to simulate a slow connection.
+--max_bandwidth or --random_wait to simulate a slow connection.
 .TP
-.B \--maxbandwidth n
+.B \--max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
@@ -115,7 +115,7 @@
 than the bufsize (see also --bufsize).
 .TP
 .B \--wait_in_out n
-Apply --maxbandwidth and --random_wait for input if n=1, output if n=2 and
+Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)



--- NEW FILE 02_use_ntohs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_use_ntohs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use ntohs() to generate comprehensible debug()s and syslog()s.

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:29:55.491735272 -0400
@@ -745,7 +745,7 @@
 	}
      
 	debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-	debug1("peer socket is %d\n", client.sin_port);
+	debug1("peer socket is %d\n", ntohs(client.sin_port));
 
 	/*
 	 * Double fork here so we don't have to wait later
@@ -871,8 +871,8 @@
 		strcpy(tmp2, inet_ntoa(target->sin_addr));
 	  
 		syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-		       tmp1, client.sin_port,
-		       tmp2, target->sin_port);
+		       tmp1, ntohs(client.sin_port),
+		       tmp2, ntohs(target->sin_port));
 	}
 
 	/* do proxy stuff */
@@ -1066,7 +1066,7 @@
 
 		if (!getpeername(0, (struct sockaddr *) &client, &client_size)) {
 			debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-			debug1("peer socket is %d\n", client.sin_port);
+			debug1("peer socket is %d\n", ntohs(client.sin_port));
 		}
 		if ((targetsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 			perror("target: socket");
@@ -1109,8 +1109,8 @@
 
 		if (dosyslog) {
 			syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-			       inet_ntoa(client.sin_addr), client.sin_port,
-			       target_ip, target.sin_port);
+			       inet_ntoa(client.sin_addr), ntohs(client.sin_port),
+			       target_ip, ntohs(target.sin_port));
 		}
 
 		/* Just start copying - one side of the loop is stdin - 0 */



--- NEW FILE 03_fix_tcp_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_fix_tcp_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix calls to tcp wrappers

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:10:11.439455392 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:10:51.625346208 -0400
@@ -802,8 +802,8 @@
 #ifdef USE_TCP_WRAPPERS
 	request_init(&request, RQ_DAEMON, ident, RQ_FILE, clisock, 0);
 	sock_host(&request);
-	sock_hostname(&request);
-	sock_hostaddr(&request);
+	sock_hostname(request.client);
+	sock_hostaddr(request.client);
 
 	if (!hosts_access(&request)) {
 		refuse(&request);
@@ -1057,8 +1057,8 @@
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
 		sock_host(&request);
-		sock_hostname(&request);
-		sock_hostaddr(&request);
+		sock_hostname(request.client);
+		sock_hostaddr(request.client);
 	
 		if (!hosts_access(&request))
 			refuse(&request);



--- NEW FILE 04_fix_timeouts.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_fix_timeouts.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Apply a close approximation of Robert de Bath's patch for bug #142382

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:44:39.504061784 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:47:14.746461352 -0400
@@ -598,10 +598,6 @@
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
 
-	/* Set up timeout */
-	timeout.tv_sec = timeout_secs;
-	timeout.tv_usec = 0;
-
 	/* file descriptor bits */
 	FD_ZERO(&iofds);
 	FD_SET(insock, &iofds);
@@ -618,14 +614,21 @@
 	while(1) {
 		(void) memcpy(&c_iofds, &iofds, sizeof(iofds));
 
+		/* Set up timeout, Linux returns seconds left in this structure
+		 * so we have to reset it before each select(). */
+		timeout.tv_sec = timeout_secs;
+		timeout.tv_usec = 0;
+
 
 		if (select(max_fd + 1,
 			   &c_iofds,
 			   (fd_set *)0,
 			   (fd_set *)0,
 			   (timeout_secs ? &timeout : NULL)) <= 0) {
-			/*	    syslog(LLEV,"connection timeout: %d sec",timeout.tv_sec);*/
-			break;
+		  if (dosyslog) {
+		    syslog(LOG_NOTICE,"connection timeout: %d sec",timeout_secs);
+		  }
+		  break;
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {



--- NEW FILE 05_pedantic.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_pedantic.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: changes to make clean up compilation

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2005-10-22 23:11:41.000000000 -0400
+++ redir-2.2.1/Makefile	2005-10-22 23:11:48.818368360 -0400
@@ -32,7 +32,7 @@
 # if your system lacks getopt_long, remove the comment from this line
 OBJS = redir.o $(GETOPT_OBJS)
 
-CFLAGS = -O2 -Wall $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
+CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
 LDFLAGS = -s
 
 # solaris, and others, may also need these libraries to link
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:11:48.282449832 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:12:23.201141384 -0400
@@ -73,6 +73,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -460,7 +461,7 @@
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	int socksize = sizeof(struct sockaddr_in);
+	size_t socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -509,7 +510,7 @@
 	if(getsockname(localsock, (struct sockaddr *)&sockname, &socksize) < 0) {
 		perror("getsockname");
 		if (dosyslog)
-			syslog(LOG_ERR, "getsockname failed: %m");
+			syslog(LOG_ERR, "getsockname failed: %s",strerror(errno));
 		exit(1);
 	}
 
@@ -562,7 +563,7 @@
 	switch(fork())
 	{
      	case -1: /* Error */
-     		syslog(LOG_ERR, "Couldn't fork: %m");
+     		syslog(LOG_ERR, "Couldn't fork: %s",strerror(errno));
      		_exit(1);
      	case 0:  /* Child */
 	{
@@ -723,7 +724,7 @@
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	int clientlen = sizeof(client);
+	size_t clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -734,7 +735,7 @@
 		perror("server: accept");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "accept failed: %m");
+			syslog(LOG_ERR, "accept failed: %s",strerror(errno));
 
 		/* determine if this error is fatal */
 		switch(accept_errno) {
@@ -768,7 +769,7 @@
      		perror("(server) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(server) fork failed: %m");
+     			syslog(LOG_ERR, "(server) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -795,7 +796,7 @@
      		perror("(child) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(child) fork failed: %m");
+     			syslog(LOG_ERR, "(child) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -826,7 +827,7 @@
 		perror("target: socket");
 	  
 		if (dosyslog)
-			syslog(LOG_ERR, "socket failed: %m");
+			syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 		
 		_exit(1);
 	}
@@ -850,7 +851,7 @@
    only be different if the input value is 0 (let the system pick a 
    port) */
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			_exit(1);
 		}
@@ -862,7 +863,7 @@
 		perror("target: connect");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "bind failed: %m");
+			syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 		_exit(1);
 	}
@@ -923,7 +924,7 @@
 			perror("server: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "socket failed: %m");
+				syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -962,7 +963,7 @@
 			perror("server: bind");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -980,7 +981,7 @@
 			perror("server: listen");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "listen failed: %m");
+				syslog(LOG_ERR, "listen failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1059,7 +1060,7 @@
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		int client_size = sizeof(client);
+		size_t client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
@@ -1079,7 +1080,7 @@
 			perror("target: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "targetsock failed: %m");
+				syslog(LOG_ERR, "targetsock failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1097,7 +1098,7 @@
 				perror("bind_addr: cannot bind to forcerd outgoing addr");
 				 
 				if (dosyslog)
-					syslog(LOG_ERR, "bind failed: %m");
+					syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 				 
 				exit(1);
 			}
@@ -1109,7 +1110,7 @@
 			perror("target: connect");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "connect failed: %m");
+				syslog(LOG_ERR, "connect failed: %s",strerror(errno));
 
 			exit(1);
 		}



--- NEW FILE 06_fix_shaper_buffer.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_fix_shaper_buffer.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: properly allocate copyloop buffer

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:20:05.235901424 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:22:20.198384008 -0400
@@ -260,7 +260,7 @@
 #endif
 	   int *transproxy,
 #ifndef NO_SHAPER
-           unsigned int * bufsize,
+           unsigned int * bufsizeout,
            int * max_bandwidth,
            int * random_wait,
            int * wait_in_out,
@@ -367,7 +367,7 @@
 
 #ifndef NO_SHAPER
                 case 'z':
-                  *bufsize = (unsigned int)atol(optarg);
+                  *bufsizeout = (unsigned int)atol(optarg);
                   break;
  
                 case 'm':
@@ -594,7 +594,7 @@
 	unsigned long bytes_in = 0;
 	unsigned long bytes_out = 0;
 	unsigned int start_time, end_time;
-	char buf[bufsize];
+	char* buf = malloc(bufsize);
 
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
@@ -637,7 +637,7 @@
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {
-			if((bytes = read(insock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(insock, buf, bufsize)) <= 0)
 				break;
 #ifndef NO_FTP
 			if (ftp & FTP_PORT)
@@ -652,7 +652,7 @@
 			bytes_out += bytes;
 		}
 		if(FD_ISSET(outsock, &c_iofds)) {
-			if((bytes = read(outsock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(outsock, buf, bufsize)) <= 0)
 				break;
 			/* if we're correcting for PASV on ftp redirections, then
 			   fix buf and bytes to have the new address, among other
@@ -689,6 +689,7 @@
 		syslog(LOG_NOTICE, "disconnect %d secs, %ld in %ld out",
 		       (end_time - start_time), bytes_in, bytes_out);
 	}
+	free(buf);
 	return;
 }
 



--- NEW FILE 07_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 07_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic fixes which could be applied upstream

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:41:51.284918168 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:42:42.115190792 -0400
@@ -73,7 +73,7 @@
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
 .B --timeout
-Timeout and close the connection after n seconds on inactivity.
+Timeout and close the connection after n seconds of inactivity.
 .TP
 .B \--syslog
 Log information to syslog.
@@ -90,7 +90,7 @@
 undesirable. 
 .TP
 .B \--transproxy
-On a linux system with transparany proxying enables, causes redir to
+On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see transproxy.txt in the source archive)
 .TP



--- NEW FILE 08_add_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 08_add_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Enabling TCP wrapper support

@DPATCH@

--- redir-2.2.1.orig/Makefile
+++ redir-2.2.1/Makefile
@@ -9,8 +9,8 @@
 # if you would like support for TCP wrappers (and have libwrap.a
 # installed), remove these comments.
 
-WRAP_CFLAGS = # -DUSE_TCP_WRAPPERS 
-WRAP_LIBS = # -lwrap
+WRAP_CFLAGS = -DUSE_TCP_WRAPPERS 
+WRAP_LIBS = -lwrap
 
 # if your system needs any additional libraries (solaris, for example, 
 # needs the ones commented out below), edit this line.




--- NEW FILE 09_add_linux_software_map.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_add_linux_software_map.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add linux software map file

@DPATCH@

--- redir-2.2.1.orig/redir-2.2.lsm
+++ redir-2.2.1/redir-2.2.lsm
@@ -0,0 +1,11 @@
+Begin3
+Title:   redir
+Version:  2.2
+Entered-date:  15DEC1999
+Description:  TCP Port redirector (for firewalls etc).
+Keywords:  tcp port redirector bouncer proxy
+Author:   sammy at oh.verio.com
+Primary-site:  sunsite.unc.edu /pub/Linux/system/Network/daemons
+   39936 redir-2.2.tar.gz
+Copying-policy:  GPL
+End




--- NEW FILE 15_deb_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_deb_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic changes applicable only to debian

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:47:44.067287096 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:48:34.218662928 -0400
@@ -92,7 +92,7 @@
 .B \--transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see transproxy.txt in the source archive)
+(see /usr/share/doc/redir/transproxy.txt)
 .TP
 .B \--connect
 Redirects connections through an HTTP proxy which supports the CONNECT 



--- NEW FILE 20_do_not_strip.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_do_not_strip.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: don't strip by default.  let dh_strip take care of it.

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2007-08-15 14:53:41.908911693 -0400
+++ redir-2.2.1/Makefile	2007-08-15 14:53:59.409909018 -0400
@@ -33,7 +33,7 @@
 OBJS = redir.o $(GETOPT_OBJS)
 
 CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
-LDFLAGS = -s
+LDFLAGS = # -s
 
 # solaris, and others, may also need these libraries to link
 # also edit here if you're using the TCP wrappers code



--- NEW FILE 25_fix_setsockopt.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 25_fix_setsockopt.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that the server socket has SO_REUSEADDR and SO_LINGER set properly.

@DPATCH@
diff -urNad redir~/redir.c redir/redir.c
--- redir~/redir.c	2009-03-03 17:35:12.022427586 -0500
+++ redir/redir.c	2009-03-03 17:45:28.998426896 -0500
@@ -90,8 +90,8 @@
 /* let's set up some globals... */
 int dodebug = 0;
 int dosyslog = 0;
-unsigned char reuse_addr = 1;
-unsigned char linger_opt = 0;
+int reuse_addr = 1; /* allow address reuse */
+struct linger linger_opt = { 0, 0}; /* do not linger */
 char * bind_addr = NULL;
 struct sockaddr_in addr_out;
 int timeout = 0;
@@ -906,6 +906,7 @@
 
 	int servsock;
 	struct sockaddr_in server;
+	int ret;
      
 	/*
 	 * Get a socket to work with.  This socket will
@@ -944,8 +945,30 @@
 		server.sin_addr.s_addr = htonl(inet_addr("0.0.0.0"));
 	}
      
-	setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
-	setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(SO_LINGER)); 
+	ret = setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_REUSEADDR)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_REUSEADDR: %s",strerror(errno));
+			exit(1);
+		}
+	}
+	ret = setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(linger_opt)); 
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_LINGER)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_LINGER: %s",strerror(errno));
+			exit(1);
+		}
+	}
      
 	/*
 	 * Try to bind the address to the socket.



--- NEW FILE 30_fix_manpage.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_fix_manpage.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Clean up questionable formatting in man page.

@DPATCH@
diff -urNad redir~/redir.man redir/redir.man
--- redir~/redir.man	2009-03-03 18:55:37.790428922 -0500
+++ redir/redir.man	2009-03-03 18:58:48.486428715 -0500
@@ -1,43 +1,42 @@
-.PU
 .TH REDIR 1 local
 .SH NAME
-redir \- redirect tcp connections
+redir - redirect tcp connections
 .SH SYNOPSIS
 .ll +8
 .B redir
-.RB [ \--laddr=incoming.ip.address ]
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--bind_addr=my.other.ip.address ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --lport=port
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB [ \-\-laddr=incoming.ip.address ]
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog 
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-bind_addr=my.other.ip.address ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-lport=port
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .B redir
-.RB \--inetd
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB \-\-inetd
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog ]
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .SH DESCRIPTION
@@ -49,74 +48,73 @@
 Depending on how redir was compiled, not all options may be available.
 .SH OPTIONS
 .TP
-.B \--lport
+.B \-\-lport
 Specifies port to listen for connections on (when not running from inetd)
 .TP
-.B \--laddr
+.B \-\-laddr
 IP address to bind to when listening for connections (when not
 running from inetd) 
 .TP
-.B \--cport
+.B \-\-cport
 Specifies port to connect to.
 .TP
-.B \--caddr
+.B \-\-caddr
 Specifies remote host to connect to. (localhost if omitted)
 .TP
-.B \--inetd
+.B \-\-inetd
 Run as a process started from inetd, with the connection passed as stdin
 and stdout on startup.
 .TP
-.B \--debug
+.B \-\-debug
 Write debug output to stderr or syslog.
 .TP
-.B \--name
+.B \-\-name
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
-.B --timeout
+.B \-\-timeout
 Timeout and close the connection after n seconds of inactivity.
 .TP
-.B \--syslog
+.B \-\-syslog
 Log information to syslog.
 .TP
-.B \--bind_addr
+.B \-\-bind_addr
 Forces redir to pick a specific address/interface to bind to when it listens 
 for incoming connections. 
 .TP
-.B \--ftp
+.B \-\-ftp
 When using redir for an FTP server, this will cause redir to also
 redirect ftp connections.  Type should be specified as either "port",
 "pasv", or "both", to specify what type of FTP connection to handle.
-Note that --transproxy often makes one or the other (generally port)
+Note that \-\-transproxy often makes one or the other (generally port)
 undesirable. 
 .TP
-.B \--transproxy
+.B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see /usr/share/doc/redir/transproxy.txt)
 .TP
-.B \--connect
+.B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 
-command.  Specify the address and port of the proxy using --caddr and
---cport.  --connect requires the hostname and port which the HTTP
+command.  Specify the address and port of the proxy using \-\-caddr and
+\-\-cport.  \-\-connect requires the hostname and port which the HTTP
 proxy will be asked to connect to.
 .TP
-.B \--bufsize n
+.B \-\-bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---max_bandwidth or --random_wait to simulate a slow connection.
+\-\-max_bandwidth or \-\-random_wait to simulate a slow connection.
 .TP
-.B \--max_bandwidth n
+.B \-\-max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
 .TP
-.B \--random_wait n
+.B \-\-random_wait n
 Wait between 0 and 2 x n milliseconds before each "packet". A "packet" is
 a bloc of data read in one time by redir. A "packet" size is always less
-than the bufsize (see also --bufsize).
+than the bufsize (see also \-\-bufsize).
 .TP
-.B \--wait_in_out n
-Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
+.B \-\-wait_in_out n
+Apply \-\-max_bandwidth and \-\-random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)
-


31_fix_transproxy_location.patch:

--- NEW FILE 31_fix_transproxy_location.patch ---
diff -ruNp a/redir-2.2.1/redir.man b/redir-2.2.1/redir.man
--- a/redir-2.2.1/redir.man	2009-04-06 13:21:06.000000000 -0300
+++ b/redir-2.2.1/redir.man	2009-04-06 13:23:59.000000000 -0300
@@ -91,7 +91,7 @@ undesirable. 
 .B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see /usr/share/doc/redir/transproxy.txt)
+(see /usr/share/doc/redir-2.2.1/transproxy.txt)
 .TP
 .B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 


--- NEW FILE import.log ---
redir-2_2_1-3_fc11:F-10:redir-2.2.1-3.fc11.src.rpm:1239099764


--- NEW FILE redir.spec ---
Name:           redir
Version:        2.2.1
Release:        3%{?dist}
Summary:        Redirect TCP connections

Group:          Applications/Internet
License:        GPL+
URL:            http://sammy.net/~sammy/hacks/
Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcp_wrappers-devel

#Include Debian Patches
Patch0:         01_fix_max_bandwidth_docs.dpatch
Patch1:         02_use_ntohs.dpatch
Patch2:         03_fix_tcp_wrappers.dpatch
Patch3:         04_fix_timeouts.dpatch
Patch4:         05_pedantic.dpatch
Patch5:         06_fix_shaper_buffer.dpatch
Patch6:         07_cosmetics.dpatch
Patch7:         08_add_wrappers.dpatch
Patch8:         09_add_linux_software_map.dpatch
Patch9:         15_deb_cosmetics.dpatch
Patch10:        20_do_not_strip.dpatch
Patch11:        25_fix_setsockopt.dpatch
Patch12:        30_fix_manpage.dpatch
#end of debian patches

Patch13:        redir_gcc4.4-signedness.patch
Patch14:        31_fix_transproxy_location.patch
%description
a port redirector, used to forward incoming connections to somewhere else.
by far the cleanest piece of code here, because someone else liked it
enough to fix it.

%prep
%setup -q

# Fix docs and --help to show --max_bandwidth instead of --maxbandwidth
%patch0 -p1

#use ntohs() to generate comprehensible debug()s and syslog()s
%patch1 -p1

#fix calls to tcp wrappers
%patch2 -p1

# fix and make timeout more verbose
%patch3 -p1

#changes to make clean up compilation, include missing time.h include
%patch4 -p1

#properly allocate copyloop buffer
%patch5 -p1

#cosmestic only patch
%patch6 -p1

#add tcp_wrapper support
%patch7 -p1

#description of redir
%patch8 -p1

#comestic only patch
%patch9 -p1

# do not stripping needed for debug-info package
%patch10 -p1

#make usage os setsockopt more verbose
%patch11 -p1

#Clean up questionable formatting in man page
%patch12 -p1

#fix compile warning with gcc 4.4
%patch13 -p2

# fix location of transproxy.txt
%patch14 -p2

# Convert to utf-8
for file in CHANGES; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
install -Dp -m 644 %{name}.man $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README CHANGES COPYING trans*.txt
%{_sbindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Sat Apr 04 2009 Itamar Reis Peixoto - 2.2.1-3
- fix compile warning with gcc 4.4
- include README and COPYING into %%doc section
- remove attr from files section
- convert CHANGES TO utf-8
- fix location of transproxy.txt file in manpage

* Wed Apr 01 2009 Itamar Reis Peixoto - 2.2.1-2
- Include Debian Patches

* Tue Mar 31 2009 Itamar Reis Peixoto - 2.2.1-1
- Initial RPM version

redir_gcc4.4-signedness.patch:

--- NEW FILE redir_gcc4.4-signedness.patch ---
Binary files a/redir-2.2.1/redir and b/redir-2.2.1/redir differ
diff -ruNp a/redir-2.2.1/redir.c b/redir-2.2.1/redir.c
--- a/redir-2.2.1/redir.c	2009-04-04 16:36:24.000000000 -0300
+++ b/redir-2.2.1/redir.c	2009-04-04 16:46:06.000000000 -0300
@@ -461,7 +461,7 @@ void ftp_clean(int send, char *buf, unsi
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	size_t socksize = sizeof(struct sockaddr_in);
+	unsigned int socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -721,7 +721,7 @@ do_accept(int servsock, struct sockaddr_
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	size_t clientlen = sizeof(client);
+	unsigned int clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -1080,7 +1080,7 @@ main(int argc, char *argv[])
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		size_t client_size = sizeof(client);
+		unsigned int client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
Binary files a/redir-2.2.1/redir.o and b/redir-2.2.1/redir.o differ


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redir/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:26:26 -0000	1.1
+++ .cvsignore	7 Apr 2009 10:26:22 -0000	1.2
@@ -0,0 +1 @@
+redir-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redir/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:26:27 -0000	1.1
+++ sources	7 Apr 2009 10:26:22 -0000	1.2
@@ -0,0 +1 @@
+4342fadac30504c86c8db7beefe01995  redir-2.2.1.tar.gz



From than at fedoraproject.org  Tue Apr  7 10:28:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  7 Apr 2009 10:28:32 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-kio_http.patch, NONE,
	1.1 kdelibs.spec, 1.386, 1.387
Message-ID: <20090407102832.85D0E70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9745

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kio_http.patch 
Log Message:
upstream patch to fix kio_http issue



kdelibs-4.2.2-kio_http.patch:

--- NEW FILE kdelibs-4.2.2-kio_http.patch ---
Index: kioslave/http/http.cpp
===================================================================
--- kioslave/http/http.cpp	(Revision 950464)
+++ kioslave/http/http.cpp	(Revision 950465)
@@ -229,16 +229,12 @@
 }
 
 
+#define NO_SIZE ((KIO::filesize_t) -1)
 
-
-
-
-#define NO_SIZE		((KIO::filesize_t) -1)
-
 #ifdef HAVE_STRTOLL
-#define STRTOLL	strtoll
+#define STRTOLL strtoll
 #else
-#define STRTOLL	strtol
+#define STRTOLL strtol
 #endif
 
 
@@ -259,6 +255,7 @@
     , m_proxyAuth(0)
     , m_socketProxyAuth(0)
     , m_isError(false)
+    , m_isLoadingErrorPage(false)
     , m_remoteRespTimeout(DEFAULT_RESPONSE_TIMEOUT)
 {
     reparseConfiguration();
@@ -292,6 +289,7 @@
 {
   m_isEOF = false;
   m_isError = false;
+  m_isLoadingErrorPage = false;
 }
 
 void HTTPProtocol::resetResponseParsing()
@@ -575,8 +573,11 @@
               m_server.initFrom(m_request);
           }
           break;
-      } else if (m_isError) {
-          // Hard error, abort everything.
+      } else if (m_isError || m_isLoadingErrorPage) {
+          // Unrecoverable error, abort everything.
+          // Also, if we've just loaded an error page there is nothing more to do.
+          // In that case we abort to avoid loops; some webservers manage to send 401 and
+          // no authentication request. Or an auth request we don't understand.
           return false;
       }
 
@@ -1728,6 +1729,15 @@
   error( ERR_SLAVE_DEFINED, errorString );
 }
 
+void HTTPProtocol::setLoadingErrorPage()
+{
+    if (m_isLoadingErrorPage) {
+        kWarning(7113) << "called twice during one request, something is probably wrong.";
+    }
+    m_isLoadingErrorPage = true;
+    SlaveBase::errorPage();
+}
+
 bool HTTPProtocol::isOffline(const KUrl &url)
 {
   const int NetWorkStatusUnknown = 1;
@@ -2720,7 +2730,7 @@
             ; // Ignore error
         } else {
             if (m_request.preferErrorPage) {
-                errorPage();
+                setLoadingErrorPage();
             } else {
                 error(ERR_INTERNAL_SERVER, m_request.url.url());
                 return false;
@@ -2743,7 +2753,7 @@
         // Any other client errors
         // Tell that we will only get an error page here.
         if (m_request.preferErrorPage) {
-            errorPage();
+            setLoadingErrorPage();
         } else {
             error(ERR_DOES_NOT_EXIST, m_request.url.url());
             return false;
@@ -3303,14 +3313,14 @@
         kDebug(7113) << "pointer to auth class is now" << *auth;
         if (!(*auth)) {
             if (m_request.preferErrorPage) {
-                errorPage();
+                setLoadingErrorPage();
             } else {
                 error(ERR_UNSUPPORTED_ACTION, "Unknown Authorization method!");
                 return false;
             }
         }
 
-        // auth may still be null due to errorPage().
+        // *auth may still be null due to setLoadingErrorPage().
 
         if (*auth) {
             // remove trailing space from the method string, or digest auth will fail
@@ -3357,7 +3367,7 @@
 
             if ((*auth)->isError()) {
                 if (m_request.preferErrorPage) {
-                    errorPage();
+                    setLoadingErrorPage();
                 } else {
                     error(ERR_UNSUPPORTED_ACTION, "Authorization failed!");
                     return false;
Index: kioslave/http/http.h
===================================================================
--- kioslave/http/http.h	(Revision 950464)
+++ kioslave/http/http.h	(Revision 950465)
@@ -259,6 +259,7 @@
   void cacheUpdate( const KUrl &url, bool nocache, time_t expireDate);
 
   void httpError(); // Generate error message based on response code
+  void setLoadingErrorPage(); // Call SlaveBase::errorPage() and remember that we've called it
 
   bool isOffline(const KUrl &url); // Check network status
 
@@ -523,6 +524,8 @@
 
   // Indicates whether there was some connection error.
   bool m_isError;
+  // Whether we are loading an error page (we should close the connection afterwards)
+  bool m_isLoadingErrorPage;
 
   // Values that determine the remote connection timeouts.
   int m_remoteRespTimeout;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- kdelibs.spec	1 Apr 2009 17:52:26 -0000	1.386
+++ kdelibs.spec	7 Apr 2009 10:28:02 -0000	1.387
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -86,6 +86,7 @@
 
 # upstream
 # 4.2 branch
+Patch100: kdelibs-4.2.2-kio_http.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -225,6 +226,7 @@
 
 # upstream patches
 # 4.2
+%patch100 -p0 -b .kio_http
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -409,6 +411,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- upstream patch to fix kio_http issue
+
 * Wed Apr  1 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From itamarjp at fedoraproject.org  Tue Apr  7 10:31:32 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  7 Apr 2009 10:31:32 +0000 (UTC)
Subject: rpms/redir/F-9 01_fix_max_bandwidth_docs.dpatch, NONE,
	1.1 02_use_ntohs.dpatch, NONE, 1.1 03_fix_tcp_wrappers.dpatch,
	NONE, 1.1 04_fix_timeouts.dpatch, NONE, 1.1 05_pedantic.dpatch,
	NONE, 1.1 06_fix_shaper_buffer.dpatch, NONE,
	1.1 07_cosmetics.dpatch, NONE, 1.1 08_add_wrappers.dpatch, NONE,
	1.1 09_add_linux_software_map.dpatch, NONE,
	1.1 15_deb_cosmetics.dpatch, NONE, 1.1 20_do_not_strip.dpatch,
	NONE, 1.1 25_fix_setsockopt.dpatch, NONE,
	1.1 30_fix_manpage.dpatch, NONE,
	1.1 31_fix_transproxy_location.patch, NONE, 1.1 import.log, NONE,
	1.1 redir.spec, NONE, 1.1 redir_gcc4.4-signedness.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407103132.E00D270100@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	01_fix_max_bandwidth_docs.dpatch 02_use_ntohs.dpatch 
	03_fix_tcp_wrappers.dpatch 04_fix_timeouts.dpatch 
	05_pedantic.dpatch 06_fix_shaper_buffer.dpatch 
	07_cosmetics.dpatch 08_add_wrappers.dpatch 
	09_add_linux_software_map.dpatch 15_deb_cosmetics.dpatch 
	20_do_not_strip.dpatch 25_fix_setsockopt.dpatch 
	30_fix_manpage.dpatch 31_fix_transproxy_location.patch 
	import.log redir.spec redir_gcc4.4-signedness.patch 
Log Message:
Initial RPM



--- NEW FILE 01_fix_max_bandwidth_docs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fix_max_bandwidth_docs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix docs and --help to show --max_bandwidth instead of --maxbandwidth

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:21:56.849499952 -0400
@@ -233,7 +233,7 @@
 #ifndef NO_SHAPER
         /* options for bandwidth */
         fprintf(stderr, "\t\t--bufsize=<octets>\tsize of the buffer\n");
-        fprintf(stderr, "\t\t--maxbandwidth=<bit-per-sec>\tlimit the bandwidth\n");
+        fprintf(stderr, "\t\t--max_bandwidth=<bit-per-sec>\tlimit the bandwidth\n");
         fprintf(stderr, "\t\t--random_wait=<millisec>\twait before each packet\n");
         fprintf(stderr, "\t\t--wait_in_out=<flag>\t1 wait for in, 2 out, 3 in&out\n");
         /* end options for bandwidth */
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	1999-12-26 15:52:24.000000000 -0500
+++ redir-2.2.1/redir.man	2005-10-22 21:22:28.882630176 -0400
@@ -18,7 +18,7 @@
 .I --lport=port
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -35,7 +35,7 @@
 .RB [ \--connect=host:port ]
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -102,9 +102,9 @@
 .TP
 .B \--bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---maxbandwidth or --random_wait to simulate a slow connection.
+--max_bandwidth or --random_wait to simulate a slow connection.
 .TP
-.B \--maxbandwidth n
+.B \--max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
@@ -115,7 +115,7 @@
 than the bufsize (see also --bufsize).
 .TP
 .B \--wait_in_out n
-Apply --maxbandwidth and --random_wait for input if n=1, output if n=2 and
+Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)



--- NEW FILE 02_use_ntohs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_use_ntohs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use ntohs() to generate comprehensible debug()s and syslog()s.

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:29:55.491735272 -0400
@@ -745,7 +745,7 @@
 	}
      
 	debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-	debug1("peer socket is %d\n", client.sin_port);
+	debug1("peer socket is %d\n", ntohs(client.sin_port));
 
 	/*
 	 * Double fork here so we don't have to wait later
@@ -871,8 +871,8 @@
 		strcpy(tmp2, inet_ntoa(target->sin_addr));
 	  
 		syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-		       tmp1, client.sin_port,
-		       tmp2, target->sin_port);
+		       tmp1, ntohs(client.sin_port),
+		       tmp2, ntohs(target->sin_port));
 	}
 
 	/* do proxy stuff */
@@ -1066,7 +1066,7 @@
 
 		if (!getpeername(0, (struct sockaddr *) &client, &client_size)) {
 			debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-			debug1("peer socket is %d\n", client.sin_port);
+			debug1("peer socket is %d\n", ntohs(client.sin_port));
 		}
 		if ((targetsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 			perror("target: socket");
@@ -1109,8 +1109,8 @@
 
 		if (dosyslog) {
 			syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-			       inet_ntoa(client.sin_addr), client.sin_port,
-			       target_ip, target.sin_port);
+			       inet_ntoa(client.sin_addr), ntohs(client.sin_port),
+			       target_ip, ntohs(target.sin_port));
 		}
 
 		/* Just start copying - one side of the loop is stdin - 0 */



--- NEW FILE 03_fix_tcp_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_fix_tcp_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix calls to tcp wrappers

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:10:11.439455392 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:10:51.625346208 -0400
@@ -802,8 +802,8 @@
 #ifdef USE_TCP_WRAPPERS
 	request_init(&request, RQ_DAEMON, ident, RQ_FILE, clisock, 0);
 	sock_host(&request);
-	sock_hostname(&request);
-	sock_hostaddr(&request);
+	sock_hostname(request.client);
+	sock_hostaddr(request.client);
 
 	if (!hosts_access(&request)) {
 		refuse(&request);
@@ -1057,8 +1057,8 @@
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
 		sock_host(&request);
-		sock_hostname(&request);
-		sock_hostaddr(&request);
+		sock_hostname(request.client);
+		sock_hostaddr(request.client);
 	
 		if (!hosts_access(&request))
 			refuse(&request);



--- NEW FILE 04_fix_timeouts.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_fix_timeouts.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Apply a close approximation of Robert de Bath's patch for bug #142382

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:44:39.504061784 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:47:14.746461352 -0400
@@ -598,10 +598,6 @@
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
 
-	/* Set up timeout */
-	timeout.tv_sec = timeout_secs;
-	timeout.tv_usec = 0;
-
 	/* file descriptor bits */
 	FD_ZERO(&iofds);
 	FD_SET(insock, &iofds);
@@ -618,14 +614,21 @@
 	while(1) {
 		(void) memcpy(&c_iofds, &iofds, sizeof(iofds));
 
+		/* Set up timeout, Linux returns seconds left in this structure
+		 * so we have to reset it before each select(). */
+		timeout.tv_sec = timeout_secs;
+		timeout.tv_usec = 0;
+
 
 		if (select(max_fd + 1,
 			   &c_iofds,
 			   (fd_set *)0,
 			   (fd_set *)0,
 			   (timeout_secs ? &timeout : NULL)) <= 0) {
-			/*	    syslog(LLEV,"connection timeout: %d sec",timeout.tv_sec);*/
-			break;
+		  if (dosyslog) {
+		    syslog(LOG_NOTICE,"connection timeout: %d sec",timeout_secs);
+		  }
+		  break;
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {



--- NEW FILE 05_pedantic.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_pedantic.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: changes to make clean up compilation

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2005-10-22 23:11:41.000000000 -0400
+++ redir-2.2.1/Makefile	2005-10-22 23:11:48.818368360 -0400
@@ -32,7 +32,7 @@
 # if your system lacks getopt_long, remove the comment from this line
 OBJS = redir.o $(GETOPT_OBJS)
 
-CFLAGS = -O2 -Wall $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
+CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
 LDFLAGS = -s
 
 # solaris, and others, may also need these libraries to link
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:11:48.282449832 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:12:23.201141384 -0400
@@ -73,6 +73,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -460,7 +461,7 @@
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	int socksize = sizeof(struct sockaddr_in);
+	size_t socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -509,7 +510,7 @@
 	if(getsockname(localsock, (struct sockaddr *)&sockname, &socksize) < 0) {
 		perror("getsockname");
 		if (dosyslog)
-			syslog(LOG_ERR, "getsockname failed: %m");
+			syslog(LOG_ERR, "getsockname failed: %s",strerror(errno));
 		exit(1);
 	}
 
@@ -562,7 +563,7 @@
 	switch(fork())
 	{
      	case -1: /* Error */
-     		syslog(LOG_ERR, "Couldn't fork: %m");
+     		syslog(LOG_ERR, "Couldn't fork: %s",strerror(errno));
      		_exit(1);
      	case 0:  /* Child */
 	{
@@ -723,7 +724,7 @@
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	int clientlen = sizeof(client);
+	size_t clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -734,7 +735,7 @@
 		perror("server: accept");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "accept failed: %m");
+			syslog(LOG_ERR, "accept failed: %s",strerror(errno));
 
 		/* determine if this error is fatal */
 		switch(accept_errno) {
@@ -768,7 +769,7 @@
      		perror("(server) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(server) fork failed: %m");
+     			syslog(LOG_ERR, "(server) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -795,7 +796,7 @@
      		perror("(child) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(child) fork failed: %m");
+     			syslog(LOG_ERR, "(child) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -826,7 +827,7 @@
 		perror("target: socket");
 	  
 		if (dosyslog)
-			syslog(LOG_ERR, "socket failed: %m");
+			syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 		
 		_exit(1);
 	}
@@ -850,7 +851,7 @@
    only be different if the input value is 0 (let the system pick a 
    port) */
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			_exit(1);
 		}
@@ -862,7 +863,7 @@
 		perror("target: connect");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "bind failed: %m");
+			syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 		_exit(1);
 	}
@@ -923,7 +924,7 @@
 			perror("server: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "socket failed: %m");
+				syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -962,7 +963,7 @@
 			perror("server: bind");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -980,7 +981,7 @@
 			perror("server: listen");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "listen failed: %m");
+				syslog(LOG_ERR, "listen failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1059,7 +1060,7 @@
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		int client_size = sizeof(client);
+		size_t client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
@@ -1079,7 +1080,7 @@
 			perror("target: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "targetsock failed: %m");
+				syslog(LOG_ERR, "targetsock failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1097,7 +1098,7 @@
 				perror("bind_addr: cannot bind to forcerd outgoing addr");
 				 
 				if (dosyslog)
-					syslog(LOG_ERR, "bind failed: %m");
+					syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 				 
 				exit(1);
 			}
@@ -1109,7 +1110,7 @@
 			perror("target: connect");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "connect failed: %m");
+				syslog(LOG_ERR, "connect failed: %s",strerror(errno));
 
 			exit(1);
 		}



--- NEW FILE 06_fix_shaper_buffer.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_fix_shaper_buffer.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: properly allocate copyloop buffer

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:20:05.235901424 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:22:20.198384008 -0400
@@ -260,7 +260,7 @@
 #endif
 	   int *transproxy,
 #ifndef NO_SHAPER
-           unsigned int * bufsize,
+           unsigned int * bufsizeout,
            int * max_bandwidth,
            int * random_wait,
            int * wait_in_out,
@@ -367,7 +367,7 @@
 
 #ifndef NO_SHAPER
                 case 'z':
-                  *bufsize = (unsigned int)atol(optarg);
+                  *bufsizeout = (unsigned int)atol(optarg);
                   break;
  
                 case 'm':
@@ -594,7 +594,7 @@
 	unsigned long bytes_in = 0;
 	unsigned long bytes_out = 0;
 	unsigned int start_time, end_time;
-	char buf[bufsize];
+	char* buf = malloc(bufsize);
 
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
@@ -637,7 +637,7 @@
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {
-			if((bytes = read(insock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(insock, buf, bufsize)) <= 0)
 				break;
 #ifndef NO_FTP
 			if (ftp & FTP_PORT)
@@ -652,7 +652,7 @@
 			bytes_out += bytes;
 		}
 		if(FD_ISSET(outsock, &c_iofds)) {
-			if((bytes = read(outsock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(outsock, buf, bufsize)) <= 0)
 				break;
 			/* if we're correcting for PASV on ftp redirections, then
 			   fix buf and bytes to have the new address, among other
@@ -689,6 +689,7 @@
 		syslog(LOG_NOTICE, "disconnect %d secs, %ld in %ld out",
 		       (end_time - start_time), bytes_in, bytes_out);
 	}
+	free(buf);
 	return;
 }
 



--- NEW FILE 07_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 07_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic fixes which could be applied upstream

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:41:51.284918168 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:42:42.115190792 -0400
@@ -73,7 +73,7 @@
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
 .B --timeout
-Timeout and close the connection after n seconds on inactivity.
+Timeout and close the connection after n seconds of inactivity.
 .TP
 .B \--syslog
 Log information to syslog.
@@ -90,7 +90,7 @@
 undesirable. 
 .TP
 .B \--transproxy
-On a linux system with transparany proxying enables, causes redir to
+On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see transproxy.txt in the source archive)
 .TP



--- NEW FILE 08_add_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 08_add_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Enabling TCP wrapper support

@DPATCH@

--- redir-2.2.1.orig/Makefile
+++ redir-2.2.1/Makefile
@@ -9,8 +9,8 @@
 # if you would like support for TCP wrappers (and have libwrap.a
 # installed), remove these comments.
 
-WRAP_CFLAGS = # -DUSE_TCP_WRAPPERS 
-WRAP_LIBS = # -lwrap
+WRAP_CFLAGS = -DUSE_TCP_WRAPPERS 
+WRAP_LIBS = -lwrap
 
 # if your system needs any additional libraries (solaris, for example, 
 # needs the ones commented out below), edit this line.




--- NEW FILE 09_add_linux_software_map.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_add_linux_software_map.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add linux software map file

@DPATCH@

--- redir-2.2.1.orig/redir-2.2.lsm
+++ redir-2.2.1/redir-2.2.lsm
@@ -0,0 +1,11 @@
+Begin3
+Title:   redir
+Version:  2.2
+Entered-date:  15DEC1999
+Description:  TCP Port redirector (for firewalls etc).
+Keywords:  tcp port redirector bouncer proxy
+Author:   sammy at oh.verio.com
+Primary-site:  sunsite.unc.edu /pub/Linux/system/Network/daemons
+   39936 redir-2.2.tar.gz
+Copying-policy:  GPL
+End




--- NEW FILE 15_deb_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_deb_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic changes applicable only to debian

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:47:44.067287096 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:48:34.218662928 -0400
@@ -92,7 +92,7 @@
 .B \--transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see transproxy.txt in the source archive)
+(see /usr/share/doc/redir/transproxy.txt)
 .TP
 .B \--connect
 Redirects connections through an HTTP proxy which supports the CONNECT 



--- NEW FILE 20_do_not_strip.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_do_not_strip.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: don't strip by default.  let dh_strip take care of it.

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2007-08-15 14:53:41.908911693 -0400
+++ redir-2.2.1/Makefile	2007-08-15 14:53:59.409909018 -0400
@@ -33,7 +33,7 @@
 OBJS = redir.o $(GETOPT_OBJS)
 
 CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
-LDFLAGS = -s
+LDFLAGS = # -s
 
 # solaris, and others, may also need these libraries to link
 # also edit here if you're using the TCP wrappers code



--- NEW FILE 25_fix_setsockopt.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 25_fix_setsockopt.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that the server socket has SO_REUSEADDR and SO_LINGER set properly.

@DPATCH@
diff -urNad redir~/redir.c redir/redir.c
--- redir~/redir.c	2009-03-03 17:35:12.022427586 -0500
+++ redir/redir.c	2009-03-03 17:45:28.998426896 -0500
@@ -90,8 +90,8 @@
 /* let's set up some globals... */
 int dodebug = 0;
 int dosyslog = 0;
-unsigned char reuse_addr = 1;
-unsigned char linger_opt = 0;
+int reuse_addr = 1; /* allow address reuse */
+struct linger linger_opt = { 0, 0}; /* do not linger */
 char * bind_addr = NULL;
 struct sockaddr_in addr_out;
 int timeout = 0;
@@ -906,6 +906,7 @@
 
 	int servsock;
 	struct sockaddr_in server;
+	int ret;
      
 	/*
 	 * Get a socket to work with.  This socket will
@@ -944,8 +945,30 @@
 		server.sin_addr.s_addr = htonl(inet_addr("0.0.0.0"));
 	}
      
-	setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
-	setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(SO_LINGER)); 
+	ret = setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_REUSEADDR)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_REUSEADDR: %s",strerror(errno));
+			exit(1);
+		}
+	}
+	ret = setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(linger_opt)); 
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_LINGER)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_LINGER: %s",strerror(errno));
+			exit(1);
+		}
+	}
      
 	/*
 	 * Try to bind the address to the socket.



--- NEW FILE 30_fix_manpage.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_fix_manpage.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Clean up questionable formatting in man page.

@DPATCH@
diff -urNad redir~/redir.man redir/redir.man
--- redir~/redir.man	2009-03-03 18:55:37.790428922 -0500
+++ redir/redir.man	2009-03-03 18:58:48.486428715 -0500
@@ -1,43 +1,42 @@
-.PU
 .TH REDIR 1 local
 .SH NAME
-redir \- redirect tcp connections
+redir - redirect tcp connections
 .SH SYNOPSIS
 .ll +8
 .B redir
-.RB [ \--laddr=incoming.ip.address ]
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--bind_addr=my.other.ip.address ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --lport=port
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB [ \-\-laddr=incoming.ip.address ]
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog 
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-bind_addr=my.other.ip.address ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-lport=port
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .B redir
-.RB \--inetd
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB \-\-inetd
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog ]
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .SH DESCRIPTION
@@ -49,74 +48,73 @@
 Depending on how redir was compiled, not all options may be available.
 .SH OPTIONS
 .TP
-.B \--lport
+.B \-\-lport
 Specifies port to listen for connections on (when not running from inetd)
 .TP
-.B \--laddr
+.B \-\-laddr
 IP address to bind to when listening for connections (when not
 running from inetd) 
 .TP
-.B \--cport
+.B \-\-cport
 Specifies port to connect to.
 .TP
-.B \--caddr
+.B \-\-caddr
 Specifies remote host to connect to. (localhost if omitted)
 .TP
-.B \--inetd
+.B \-\-inetd
 Run as a process started from inetd, with the connection passed as stdin
 and stdout on startup.
 .TP
-.B \--debug
+.B \-\-debug
 Write debug output to stderr or syslog.
 .TP
-.B \--name
+.B \-\-name
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
-.B --timeout
+.B \-\-timeout
 Timeout and close the connection after n seconds of inactivity.
 .TP
-.B \--syslog
+.B \-\-syslog
 Log information to syslog.
 .TP
-.B \--bind_addr
+.B \-\-bind_addr
 Forces redir to pick a specific address/interface to bind to when it listens 
 for incoming connections. 
 .TP
-.B \--ftp
+.B \-\-ftp
 When using redir for an FTP server, this will cause redir to also
 redirect ftp connections.  Type should be specified as either "port",
 "pasv", or "both", to specify what type of FTP connection to handle.
-Note that --transproxy often makes one or the other (generally port)
+Note that \-\-transproxy often makes one or the other (generally port)
 undesirable. 
 .TP
-.B \--transproxy
+.B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see /usr/share/doc/redir/transproxy.txt)
 .TP
-.B \--connect
+.B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 
-command.  Specify the address and port of the proxy using --caddr and
---cport.  --connect requires the hostname and port which the HTTP
+command.  Specify the address and port of the proxy using \-\-caddr and
+\-\-cport.  \-\-connect requires the hostname and port which the HTTP
 proxy will be asked to connect to.
 .TP
-.B \--bufsize n
+.B \-\-bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---max_bandwidth or --random_wait to simulate a slow connection.
+\-\-max_bandwidth or \-\-random_wait to simulate a slow connection.
 .TP
-.B \--max_bandwidth n
+.B \-\-max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
 .TP
-.B \--random_wait n
+.B \-\-random_wait n
 Wait between 0 and 2 x n milliseconds before each "packet". A "packet" is
 a bloc of data read in one time by redir. A "packet" size is always less
-than the bufsize (see also --bufsize).
+than the bufsize (see also \-\-bufsize).
 .TP
-.B \--wait_in_out n
-Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
+.B \-\-wait_in_out n
+Apply \-\-max_bandwidth and \-\-random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)
-


31_fix_transproxy_location.patch:

--- NEW FILE 31_fix_transproxy_location.patch ---
diff -ruNp a/redir-2.2.1/redir.man b/redir-2.2.1/redir.man
--- a/redir-2.2.1/redir.man	2009-04-06 13:21:06.000000000 -0300
+++ b/redir-2.2.1/redir.man	2009-04-06 13:23:59.000000000 -0300
@@ -91,7 +91,7 @@ undesirable. 
 .B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see /usr/share/doc/redir/transproxy.txt)
+(see /usr/share/doc/redir-2.2.1/transproxy.txt)
 .TP
 .B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 


--- NEW FILE import.log ---
redir-2_2_1-3_fc11:F-9:redir-2.2.1-3.fc11.src.rpm:1239100171


--- NEW FILE redir.spec ---
Name:           redir
Version:        2.2.1
Release:        3%{?dist}
Summary:        Redirect TCP connections

Group:          Applications/Internet
License:        GPL+
URL:            http://sammy.net/~sammy/hacks/
Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcp_wrappers-devel

#Include Debian Patches
Patch0:         01_fix_max_bandwidth_docs.dpatch
Patch1:         02_use_ntohs.dpatch
Patch2:         03_fix_tcp_wrappers.dpatch
Patch3:         04_fix_timeouts.dpatch
Patch4:         05_pedantic.dpatch
Patch5:         06_fix_shaper_buffer.dpatch
Patch6:         07_cosmetics.dpatch
Patch7:         08_add_wrappers.dpatch
Patch8:         09_add_linux_software_map.dpatch
Patch9:         15_deb_cosmetics.dpatch
Patch10:        20_do_not_strip.dpatch
Patch11:        25_fix_setsockopt.dpatch
Patch12:        30_fix_manpage.dpatch
#end of debian patches

Patch13:        redir_gcc4.4-signedness.patch
Patch14:        31_fix_transproxy_location.patch
%description
a port redirector, used to forward incoming connections to somewhere else.
by far the cleanest piece of code here, because someone else liked it
enough to fix it.

%prep
%setup -q

# Fix docs and --help to show --max_bandwidth instead of --maxbandwidth
%patch0 -p1

#use ntohs() to generate comprehensible debug()s and syslog()s
%patch1 -p1

#fix calls to tcp wrappers
%patch2 -p1

# fix and make timeout more verbose
%patch3 -p1

#changes to make clean up compilation, include missing time.h include
%patch4 -p1

#properly allocate copyloop buffer
%patch5 -p1

#cosmestic only patch
%patch6 -p1

#add tcp_wrapper support
%patch7 -p1

#description of redir
%patch8 -p1

#comestic only patch
%patch9 -p1

# do not stripping needed for debug-info package
%patch10 -p1

#make usage os setsockopt more verbose
%patch11 -p1

#Clean up questionable formatting in man page
%patch12 -p1

#fix compile warning with gcc 4.4
%patch13 -p2

# fix location of transproxy.txt
%patch14 -p2

# Convert to utf-8
for file in CHANGES; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
install -Dp -m 644 %{name}.man $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README CHANGES COPYING trans*.txt
%{_sbindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Sat Apr 04 2009 Itamar Reis Peixoto - 2.2.1-3
- fix compile warning with gcc 4.4
- include README and COPYING into %%doc section
- remove attr from files section
- convert CHANGES TO utf-8
- fix location of transproxy.txt file in manpage

* Wed Apr 01 2009 Itamar Reis Peixoto - 2.2.1-2
- Include Debian Patches

* Tue Mar 31 2009 Itamar Reis Peixoto - 2.2.1-1
- Initial RPM version

redir_gcc4.4-signedness.patch:

--- NEW FILE redir_gcc4.4-signedness.patch ---
Binary files a/redir-2.2.1/redir and b/redir-2.2.1/redir differ
diff -ruNp a/redir-2.2.1/redir.c b/redir-2.2.1/redir.c
--- a/redir-2.2.1/redir.c	2009-04-04 16:36:24.000000000 -0300
+++ b/redir-2.2.1/redir.c	2009-04-04 16:46:06.000000000 -0300
@@ -461,7 +461,7 @@ void ftp_clean(int send, char *buf, unsi
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	size_t socksize = sizeof(struct sockaddr_in);
+	unsigned int socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -721,7 +721,7 @@ do_accept(int servsock, struct sockaddr_
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	size_t clientlen = sizeof(client);
+	unsigned int clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -1080,7 +1080,7 @@ main(int argc, char *argv[])
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		size_t client_size = sizeof(client);
+		unsigned int client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
Binary files a/redir-2.2.1/redir.o and b/redir-2.2.1/redir.o differ


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redir/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:26:26 -0000	1.1
+++ .cvsignore	7 Apr 2009 10:31:02 -0000	1.2
@@ -0,0 +1 @@
+redir-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redir/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:26:27 -0000	1.1
+++ sources	7 Apr 2009 10:31:02 -0000	1.2
@@ -0,0 +1 @@
+4342fadac30504c86c8db7beefe01995  redir-2.2.1.tar.gz



From kasal at fedoraproject.org  Tue Apr  7 10:34:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  7 Apr 2009 10:34:38 +0000 (UTC)
Subject: rpms/perl/F-9 perl-CGI-escape.patch, NONE,
	1.1 perl-CGI-t-util-58.patch, NONE, 1.1 perl.spec, 1.190, 1.191
Message-ID: <20090407103438.6204C70100@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11487

Modified Files:
	perl.spec 
Added Files:
	perl-CGI-escape.patch perl-CGI-t-util-58.patch 
Log Message:
- fix CGI::escape for all strings (#472571)
- perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t
  http://rt.perl.org/rt3/Ticket/Display.html?id=64502

perl-CGI-escape.patch:

--- NEW FILE perl-CGI-escape.patch ---
2009-04-06  Stepan Kasal  <skasal at redhat.com>

	* t/util-58.t: Add tests reflecting common usage.
	* CGI/Util.pm (encode): State what conversions are needed, in
	accordance to the common usage mentioned above; and code it.

diff -ur perl-5.10.0/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
--- perl-5.10.0/lib/CGI/Util.pm	2008-09-08 15:58:52.000000000 +0200
+++ perl-5.10.0/lib/CGI/Util.pm	2009-04-04 16:30:29.000000000 +0200
@@ -210,7 +210,6 @@
   my $todecode = shift;
   return undef unless defined($todecode);
   $todecode =~ tr/+/ /;       # pluses become spaces
-    $EBCDIC = "\t" ne "\011";
     if ($EBCDIC) {
       $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
     } else {
@@ -232,16 +231,24 @@
 }
 
 # URL-encode data
+#
+# We cannot use the %u escapes, they were rejected by W3C, so the official
+# way is %XX-escaped utf-8 encoding.
+# Naturally, Unicode strings have to be converted to their utf-8 byte
+# representation.  (No action is required on 5.6.)
+# Byte strings were traditionally used directly as a sequence of octets.
+# This worked if they actually represented binary data (i.e. in CGI::Compress).
+# This also worked if these byte strings were actually utf-8 encoded; e.g.,
+# when the source file used utf-8 without the apropriate "use utf8;".
+# This fails if the byte string is actually a Latin 1 encoded string, but it
+# was always so and cannot be fixed without breaking the binary data case.
+# -- Stepan Kasal <skasal at redhat.com>
+#
 sub escape {
   shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
   my $toencode = shift;
   return undef unless defined($toencode);
-  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-
-  # force bytes while preserving backward compatibility -- dankogai
-  # but commented out because it was breaking CGI::Compress -- lstein
-  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-
+  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
     if ($EBCDIC) {
       $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
     } else {
diff -ur perl-5.10.0/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
--- perl-5.10.0/lib/CGI/t/util-58.t	2003-04-14 20:32:22.000000000 +0200
+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-06 16:49:42.000000000 +0200
@@ -1,16 +1,29 @@
+# test CGI::Util::escape
+use Test::More tests => 4;
+use_ok("CGI::Util");
+
+# Byte strings should be escaped byte by byte:
+# 1) not a valid utf-8 sequence:
+my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
+is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
+
+# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
+#    This happens often: people write utf-8 strings to source, but forget
+#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
+#    have to handle it gracefully, for compatibility with GCI.pm under
+#    perl-5.8.x
 #
-# This tests CGI::Util::escape() when fed with UTF-8-flagged string
-# -- dankogai
-BEGIN {
-    if ($] < 5.008) {
-       print "1..0 # \$] == $] < 5.008\n";
-       exit(0);
-    }
-}
+$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
+is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
+	"Escape an utf-8 byte string");
 
-use Test::More tests => 2;
-use_ok("CGI::Util");
-my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-   "# Escape string with UTF-8 flag");
+SKIP:
+{
+	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
+	# -- dankogai
+	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
+	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
+	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+   		"Escape string with UTF-8 flag");
+}
 __END__

perl-CGI-t-util-58.patch:

--- NEW FILE perl-CGI-t-util-58.patch ---
2009-04-06  Stepan Kasal  <skasal at redhat.com>

	* lib/CGI/t/util-58.t: return to the upstream version, do not
	hide bugs.

diff -ur perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
--- perl-5.10.0.orig/lib/CGI/t/util-58.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
@@ -11,11 +11,6 @@
 use Test::More tests => 2;
 use_ok("CGI::Util");
 my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-if (ord('A') == 193) { # EBCDIC.
-    is(CGI::Util::escape($uri), "%FC%C3%A0%EE%F9%E5%E7%F8%20%FC%C3%C7%CA.txt",
-       "# Escape string with UTF-8 (UTF-EBCDIC) flag");
-} else {
-    is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-       "# Escape string with UTF-8 flag");
-}
+is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+   "# Escape string with UTF-8 flag");
 __END__


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-9/perl.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- perl.spec	24 Mar 2009 15:06:30 -0000	1.190
+++ perl.spec	7 Apr 2009 10:34:07 -0000	1.191
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        64%{?dist}
+Release:        66%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -97,8 +97,13 @@
 
 # Fix from Archive::Extract maintainer to only look at stdout
 # We need this because we're using tar >= 1.21
+# included upstream in 0.31_03
 Patch36:	perl-5.10.0-Archive-Extract-onlystdout.patch
 
+# Do not distort lib/CGI/t/util-58.t
+# http://rt.perl.org/rt3/Ticket/Display.html?id=64502
+Patch37:	perl-CGI-t-util-58.patch
+
 ### Debian Patches ###
 
 # Fix issue with (nested) definition lists in lib/Pod/Html.pm
@@ -160,7 +165,7 @@
 Patch53:	32_fix_fork_rand
 
 # Fix memory leak with qr//.
-# Adapted from upstream changhe 34506.
+# Adapted from upstream change 34506.
 Patch54:	34_fix_qr-memory-leak-2
 
 # CVE-2005-0448 revisited: File::Path::rmtree no longer allows creating of setuid files.
@@ -224,6 +229,11 @@
 # patches File-Fetch and CPAN
 Patch201:	perl-5.10.0-links.patch
 
+# Fix CGI::escape to work with all strings, started as #472571,
+# brought upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34528,
+# accepted there for CGI.pm-3.43
+Patch202:	perl-CGI-escape.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -952,6 +962,7 @@
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 ### Debian patches ###
 %patch40 -p1
@@ -993,6 +1004,7 @@
 %patch117 -p1
 %patch118 -p1
 %patch201 -p1
+%patch202 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1185,7 +1197,9 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 # Compress Changes* to save space
-%{__gzip} Changes*
+bzip2 -9 Changes*
+echo "The Changes* files were moved to %{_docdir}/%{name}-devel*" \
+	> Changes-moved-to-perl-devel
 
 # Local patch tracking
 cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/
@@ -1216,6 +1230,7 @@
 	'34507 Fix memory leak in single-char character class optimization' \
 	'Fedora Patch35: Reorder @INC, based on b9ba2fadb18b54e35e5de54f945111a56cbcb249' \
 	'Fedora Patch36: Fix from Archive::Extract maintainer to only look at stdout from tar' \
+	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
 	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
 	'33287 Fix NULLOK items' \
 	'33554 Fix a typo in the predefined common protocols to make "udp" resolve without netbase' \
@@ -1254,6 +1269,7 @@
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
+	'Fedora Patch202: Fix CGI::escape to work with all strings' \
 	%{nil}
 
 rm patchlevel.bak
@@ -1275,7 +1291,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic AUTHORS Changes* Copying README
+%doc Artistic AUTHORS Copying README
+%doc Changes-moved-to-perl-devel
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 %{_bindir}/*
@@ -1563,6 +1580,8 @@
 
 %files devel
 %defattr(-,root,root,-)
+# the following includes the file "Changes" -- it's compressed
+%doc Changes*.*
 %{_bindir}/enc2xs
 %{_mandir}/man1/enc2xs*
 %{_prefix}/lib/perl5/%{perl_version}/Encode/
@@ -1875,6 +1894,14 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-66
+- fix CGI::escape for all strings (#472571)
+- perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t
+  http://rt.perl.org/rt3/Ticket/Display.html?id=64502
+
+* Fri Mar 27 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-65
+- Move the gargantuan Changes* collection to -devel (#492605)
+
 * Tue Mar 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-64
 - update module autodie
 



From kasal at fedoraproject.org  Tue Apr  7 10:35:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  7 Apr 2009 10:35:24 +0000 (UTC)
Subject: rpms/perl/F-10 perl-CGI-escape.patch, NONE,
	1.1 perl-CGI-t-util-58.patch, NONE, 1.1 perl.spec, 1.209, 1.210
Message-ID: <20090407103524.207CF70100@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11655

Modified Files:
	perl.spec 
Added Files:
	perl-CGI-escape.patch perl-CGI-t-util-58.patch 
Log Message:
- fix CGI::escape for all strings (#472571)
- perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t
  http://rt.perl.org/rt3/Ticket/Display.html?id=64502

perl-CGI-escape.patch:

--- NEW FILE perl-CGI-escape.patch ---
2009-04-06  Stepan Kasal  <skasal at redhat.com>

	* t/util-58.t: Add tests reflecting common usage.
	* CGI/Util.pm (encode): State what conversions are needed, in
	accordance to the common usage mentioned above; and code it.

diff -ur perl-5.10.0/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
--- perl-5.10.0/lib/CGI/Util.pm	2008-09-08 15:58:52.000000000 +0200
+++ perl-5.10.0/lib/CGI/Util.pm	2009-04-04 16:30:29.000000000 +0200
@@ -210,7 +210,6 @@
   my $todecode = shift;
   return undef unless defined($todecode);
   $todecode =~ tr/+/ /;       # pluses become spaces
-    $EBCDIC = "\t" ne "\011";
     if ($EBCDIC) {
       $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
     } else {
@@ -232,16 +231,24 @@
 }
 
 # URL-encode data
+#
+# We cannot use the %u escapes, they were rejected by W3C, so the official
+# way is %XX-escaped utf-8 encoding.
+# Naturally, Unicode strings have to be converted to their utf-8 byte
+# representation.  (No action is required on 5.6.)
+# Byte strings were traditionally used directly as a sequence of octets.
+# This worked if they actually represented binary data (i.e. in CGI::Compress).
+# This also worked if these byte strings were actually utf-8 encoded; e.g.,
+# when the source file used utf-8 without the apropriate "use utf8;".
+# This fails if the byte string is actually a Latin 1 encoded string, but it
+# was always so and cannot be fixed without breaking the binary data case.
+# -- Stepan Kasal <skasal at redhat.com>
+#
 sub escape {
   shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
   my $toencode = shift;
   return undef unless defined($toencode);
-  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-
-  # force bytes while preserving backward compatibility -- dankogai
-  # but commented out because it was breaking CGI::Compress -- lstein
-  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-
+  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
     if ($EBCDIC) {
       $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
     } else {
diff -ur perl-5.10.0/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
--- perl-5.10.0/lib/CGI/t/util-58.t	2003-04-14 20:32:22.000000000 +0200
+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-06 16:49:42.000000000 +0200
@@ -1,16 +1,29 @@
+# test CGI::Util::escape
+use Test::More tests => 4;
+use_ok("CGI::Util");
+
+# Byte strings should be escaped byte by byte:
+# 1) not a valid utf-8 sequence:
+my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
+is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
+
+# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
+#    This happens often: people write utf-8 strings to source, but forget
+#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
+#    have to handle it gracefully, for compatibility with GCI.pm under
+#    perl-5.8.x
 #
-# This tests CGI::Util::escape() when fed with UTF-8-flagged string
-# -- dankogai
-BEGIN {
-    if ($] < 5.008) {
-       print "1..0 # \$] == $] < 5.008\n";
-       exit(0);
-    }
-}
+$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
+is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
+	"Escape an utf-8 byte string");
 
-use Test::More tests => 2;
-use_ok("CGI::Util");
-my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-   "# Escape string with UTF-8 flag");
+SKIP:
+{
+	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
+	# -- dankogai
+	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
+	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
+	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+   		"Escape string with UTF-8 flag");
+}
 __END__

perl-CGI-t-util-58.patch:

--- NEW FILE perl-CGI-t-util-58.patch ---
2009-04-06  Stepan Kasal  <skasal at redhat.com>

	* lib/CGI/t/util-58.t: return to the upstream version, do not
	hide bugs.

diff -ur perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
--- perl-5.10.0.orig/lib/CGI/t/util-58.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
@@ -11,11 +11,6 @@
 use Test::More tests => 2;
 use_ok("CGI::Util");
 my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-if (ord('A') == 193) { # EBCDIC.
-    is(CGI::Util::escape($uri), "%FC%C3%A0%EE%F9%E5%E7%F8%20%FC%C3%C7%CA.txt",
-       "# Escape string with UTF-8 (UTF-EBCDIC) flag");
-} else {
-    is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-       "# Escape string with UTF-8 flag");
-}
+is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+   "# Escape string with UTF-8 flag");
 __END__


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-10/perl.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- perl.spec	24 Mar 2009 15:08:36 -0000	1.209
+++ perl.spec	7 Apr 2009 10:34:53 -0000	1.210
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        64%{?dist}
+Release:        66%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -97,8 +97,13 @@
 
 # Fix from Archive::Extract maintainer to only look at stdout
 # We need this because we're using tar >= 1.21
+# included upstream in 0.31_03
 Patch36:	perl-5.10.0-Archive-Extract-onlystdout.patch
 
+# Do not distort lib/CGI/t/util-58.t
+# http://rt.perl.org/rt3/Ticket/Display.html?id=64502
+Patch37:	perl-CGI-t-util-58.patch
+
 ### Debian Patches ###
 
 # Fix issue with (nested) definition lists in lib/Pod/Html.pm
@@ -160,7 +165,7 @@
 Patch53:	32_fix_fork_rand
 
 # Fix memory leak with qr//.
-# Adapted from upstream changhe 34506.
+# Adapted from upstream change 34506.
 Patch54:	34_fix_qr-memory-leak-2
 
 # CVE-2005-0448 revisited: File::Path::rmtree no longer allows creating of setuid files.
@@ -224,6 +229,11 @@
 # patches File-Fetch and CPAN
 Patch201:	perl-5.10.0-links.patch
 
+# Fix CGI::escape to work with all strings, started as #472571,
+# brought upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34528,
+# accepted there for CGI.pm-3.43
+Patch202:	perl-CGI-escape.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -952,6 +962,7 @@
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 ### Debian patches ###
 %patch40 -p1
@@ -993,6 +1004,7 @@
 %patch117 -p1
 %patch118 -p1
 %patch201 -p1
+%patch202 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1185,7 +1197,9 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 # Compress Changes* to save space
-%{__gzip} Changes*
+bzip2 -9 Changes*
+echo "The Changes* files were moved to %{_docdir}/%{name}-devel*" \
+	> Changes-moved-to-perl-devel
 
 # Local patch tracking
 cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/
@@ -1216,6 +1230,7 @@
 	'34507 Fix memory leak in single-char character class optimization' \
 	'Fedora Patch35: Reorder @INC, based on b9ba2fadb18b54e35e5de54f945111a56cbcb249' \
 	'Fedora Patch36: Fix from Archive::Extract maintainer to only look at stdout from tar' \
+	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
 	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
 	'33287 Fix NULLOK items' \
 	'33554 Fix a typo in the predefined common protocols to make "udp" resolve without netbase' \
@@ -1254,6 +1269,7 @@
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
+	'Fedora Patch202: Fix CGI::escape to work with all strings' \
 	%{nil}
 
 rm patchlevel.bak
@@ -1275,7 +1291,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic AUTHORS Changes* Copying README
+%doc Artistic AUTHORS Copying README
+%doc Changes-moved-to-perl-devel
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 %{_bindir}/*
@@ -1563,6 +1580,8 @@
 
 %files devel
 %defattr(-,root,root,-)
+# the following includes the file "Changes" -- it's compressed
+%doc Changes*.*
 %{_bindir}/enc2xs
 %{_mandir}/man1/enc2xs*
 %{_prefix}/lib/perl5/%{perl_version}/Encode/
@@ -1875,6 +1894,14 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-66
+- fix CGI::escape for all strings (#472571)
+- perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t
+  http://rt.perl.org/rt3/Ticket/Display.html?id=64502
+
+* Fri Mar 27 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-65
+- Move the gargantuan Changes* collection to -devel (#492605)
+
 * Tue Mar 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-64
 - update module autodie
 



From phuang at fedoraproject.org  Tue Apr  7 10:45:45 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue,  7 Apr 2009 10:45:45 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec, 1.60, 1.61 sources, 1.31,
	1.32 ibus-default-hotkeys.patch, 1.1, NONE
Message-ID: <20090407104545.D8F8D70100@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14681

Modified Files:
	ibus.spec sources 
Removed Files:
	ibus-default-hotkeys.patch 
Log Message:
Update tarball & fix bug 494511


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ibus.spec	7 Apr 2009 06:31:43 -0000	1.60
+++ ibus.spec	7 Apr 2009 10:45:15 -0000	1.61
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090407
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -16,7 +16,6 @@
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 Patch0:     ibus-HEAD.patch
-Patch1:     ibus-default-hotkeys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -109,7 +108,6 @@
 # rm -rf docs/reference/ibus/ibus-sections.txt
 # %patch0 -p1
 # ./autogen.sh --help
-%patch1 -p1
 
 %build
 %configure --disable-static \
@@ -220,6 +218,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-3
+- Update the tarball.
+- Fix bug 494511 - ibus-gtk makes gnome-terminal abort 
+  when a key is pressed
+
 * Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-2
 - Update default hotkey settings.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	7 Apr 2009 03:09:32 -0000	1.31
+++ sources	7 Apr 2009 10:45:15 -0000	1.32
@@ -1 +1 @@
-64c9b4d9bd33cf63082d73ce96454b5b  ibus-1.1.0.20090407.tar.gz
+6b335d802d131f6937613da7cd6da011  ibus-1.1.0.20090407.tar.gz


--- ibus-default-hotkeys.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Apr  7 10:47:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:47:23 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104750.23D26208553@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora devel) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:48:15 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104753.C10AD208609@bastion.fedora.phx.redhat.com>

kasal has set the commit acl on perl (Fedora devel) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:48:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:48:14 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104815.03EFA208550@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora 9) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:48:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:48:41 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104821.3FD74208605@bastion.fedora.phx.redhat.com>

kasal has set the commit acl on perl (Fedora 9) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:48:35 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104835.EDED42086EF@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora 10) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:48:59 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104839.590BA208706@bastion.fedora.phx.redhat.com>

kasal has set the commit acl on perl (Fedora 10) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:49:21 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104859.C3F47208555@bastion.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on perl (Fedora 10) to Approved for lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:49:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:49:08 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104908.495BC2086F6@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora 10) to Approved for lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:49:38 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104916.BAD5D20876C@bastion.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on perl (Fedora 10) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:49:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:49:20 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104920.977B820860F@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora 10) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:48:59 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104925.2E70F2087F7@bastion.fedora.phx.redhat.com>

kasal has set the commit acl on perl (Fedora 10) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:49:07 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407104932.9BEF9208702@bastion.fedora.phx.redhat.com>

kasal has set the approveacls acl on perl (Fedora 10) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:50:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:50:23 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105002.0C84D208557@bastion.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on perl (Fedora 9) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:50:26 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105005.C92AD208712@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora 9) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From atkac at fedoraproject.org  Tue Apr  7 10:51:49 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  7 Apr 2009 10:51:49 +0000 (UTC)
Subject: rpms/mtools/devel .cvsignore, 1.12, 1.13 mtools.spec, 1.43,
	1.44 sources, 1.12, 1.13
Message-ID: <20090407105149.80EDB70100@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15674

Modified Files:
	.cvsignore mtools.spec sources 
Log Message:
- update to 4.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Mar 2009 19:56:18 -0000	1.12
+++ .cvsignore	7 Apr 2009 10:51:19 -0000	1.13
@@ -1 +1 @@
-mtools-4.0.9.tar.bz2
+mtools-4.0.10.tar.bz2


Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mtools.spec	9 Mar 2009 19:24:16 -0000	1.43
+++ mtools.spec	7 Apr 2009 10:51:19 -0000	1.44
@@ -1,6 +1,6 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
-Version: 4.0.9
+Version: 4.0.10
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -67,6 +67,9 @@
 %{_infodir}/%{name}.info.gz
 
 %changelog
+* Tue Apr 04 2009 Adam Tkac <atkac redhat com> 4.0.10-1
+- update to 4.0.10
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> 4.0.9-1
 - updated to 4.0.9
 - merged mtools-3.9.7-bigdisk.patch to config patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Mar 2009 19:56:18 -0000	1.12
+++ sources	7 Apr 2009 10:51:19 -0000	1.13
@@ -1 +1 @@
-4e73fb58fad16f48259a01abd0377d8d  mtools-4.0.9.tar.bz2
+750c2beba968a5d46dbaae24551a82b9  mtools-4.0.10.tar.bz2



From pkgdb at fedoraproject.org  Tue Apr  7 10:55:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:55:40 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105518.A98DD208550@bastion.fedora.phx.redhat.com>

kasal has set the commit acl on perl (Fedora 9) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:55:19 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105519.165DF208603@bastion.fedora.phx.redhat.com>

kasal has set the approveacls acl on perl (Fedora 9) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:55:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:55:53 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105532.8FD0620854A@bastion.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on perl (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:55:32 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105532.B7D1D2086F6@bastion.fedora.phx.redhat.com>

kasal has set the watchcommits acl on perl (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:55:54 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105533.D5279208704@bastion.fedora.phx.redhat.com>

kasal has set the commit acl on perl (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Tue Apr  7 10:56:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 10:56:18 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090407105556.E1D1B208604@bastion.fedora.phx.redhat.com>

kasal has set the approveacls acl on perl (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl



From mmahut at fedoraproject.org  Tue Apr  7 10:57:19 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue,  7 Apr 2009 10:57:19 +0000 (UTC)
Subject: rpms/gcx/devel gcx.spec,1.6,1.7
Message-ID: <20090407105719.9B5A270100@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/gcx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16627

Modified Files:
	gcx.spec 
Log Message:
Lubos forgot to apply the patch



Index: gcx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcx/devel/gcx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcx.spec	7 Apr 2009 09:57:41 -0000	1.6
+++ gcx.spec	7 Apr 2009 10:56:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gcx
 Version:	0.9.11
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Data-reduction tool for CCD photometry
 
 License:	GPLv2+
@@ -24,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .bounds
 
 %build
 %configure
@@ -52,7 +53,7 @@
 %{_datadir}/gcx
 
 %changelog
-* Tue Apr 7 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.9.11-7
+* Tue Apr 7 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.9.11-8
 - Fix mime association with FITS files (RHBZ#494430)
 
 * Mon Apr 6 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9.11-6



From sindrepb at fedoraproject.org  Tue Apr  7 11:16:30 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Tue,  7 Apr 2009 11:16:30 +0000 (UTC)
Subject: rpms/awn-extras-applets/F-10
	awn-extras-applets-0.3.2.1-python-platform.patch, NONE,
	1.1 awn-extras-applets.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090407111631.0270E70100@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20231

Modified Files:
	awn-extras-applets.spec sources 
Added Files:
	awn-extras-applets-0.3.2.1-python-platform.patch 
Log Message:
new upstream release, fixes

awn-extras-applets-0.3.2.1-python-platform.patch:

--- NEW FILE awn-extras-applets-0.3.2.1-python-platform.patch ---
diff -up ./acinclude.m4.orig ./acinclude.m4
--- ./acinclude.m4.orig	2009-04-03 22:45:50.000000000 +0200
+++ ./acinclude.m4	2009-04-03 22:48:32.000000000 +0200
@@ -1,11 +1,404 @@
-m4_include([m4/python.m4])
+dnl AC_PYTHON_DEVEL([version])
+dnl 
+dnl Originally copied from http://autoconf-archive.cryp.to/ac_python_devel.html
+dnl (Original last modified 2007-07-31)
+dnl 
+dnl Copyright ?? 2007 Sebastian Huber <sebastian-huber at web.de>
+dnl Copyright ?? 2007 Alan W. Irwin <irwin at beluga.phys.uvic.ca>
+dnl Copyright ?? 2007 Rafael Laboissiere <rafael at laboissiere.net>
+dnl Copyright ?? 2007 Andrew Collier <colliera at ukzn.ac.za>
+dnl Copyright ?? 2007 Matteo Settenvini <matteo at member.fsf.org>
+dnl Copyright ?? 2007 Horst Knorr <hk_classes at knoda.org>
+dnl
+dnl This program is free software: you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the Free
+dnl Software Foundation, either version 3 of the License, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+dnl more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along with
+dnl this program. If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl As a special exception, the respective Autoconf Macro's copyright owner
+dnl gives unlimited permission to copy, distribute and modify the configure
+dnl scripts that are the output of Autoconf when processing the Macro. You need
+dnl not follow the terms of the GNU General Public License when using or
+dnl distributing such scripts, even though portions of the text of the Macro
+dnl appear in them. The GNU General Public License (GPL) does govern all other
+dnl use of the material that constitutes the Autoconf Macro.
+dnl
+dnl This special exception to the GPL applies to versions of the Autoconf Macro
+dnl released by the Autoconf Macro Archive. When you make and distribute a
+dnl modified version of the Autoconf Macro, you may extend this special
+dnl exception to the GPL to apply to your modified version as well.
+dnl
+AC_DEFUN([AC_PYTHON_DEVEL],[
+        #
+        # Allow the use of a (user set) custom python version
+        #
+        AC_ARG_VAR([PYTHON_VERSION],[The installed Python
+                version to use, for example '2.3'. This string
+                will be appended to the Python interpreter
+                canonical name.])
+
+        AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+        if test -z "$PYTHON"; then
+           AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
+           PYTHON_VERSION=""
+        fi
+
+        #
+        # Check for a version of Python >= 2.1.0
+        #
+        AC_MSG_CHECKING([for a version of Python >= 2.1.0])
+        ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+                ver = string.split(sys.version)[[0]]; \
+                print ver >= '2.1.0'"`
+        if test "$ac_supports_python_ver" != "True"; then
+                if test -z "$PYTHON_NOVERSIONCHECK"; then
+                        AC_MSG_RESULT([no])
+                        AC_MSG_FAILURE([
+This version of the AC@&t at _PYTHON_DEVEL macro
+doesn't work properly with versions of Python before
+2.1.0. You may need to re-run configure, setting the
+variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+to something else than an empty string.
+])
+                else
+                        AC_MSG_RESULT([skip at user request])
+                fi
+        else
+                AC_MSG_RESULT([yes])
+        fi
+
+        #
+        # if the macro parameter ``version'' is set, honour it
+        #
+        if test -n "$1"; then
+                AC_MSG_CHECKING([for a version of Python >= $1])
+                ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+                        ver = string.split(sys.version)[[0]]; \
+                        print ver >= '$1'"`
+                if test "$ac_supports_python_ver" = "True"; then
+                   AC_MSG_RESULT([yes])
+                else
+                        AC_MSG_RESULT([no])
+                        AC_MSG_ERROR([this package requires Python $1.
+If you have it installed, but it isn't the default Python
+interpreter in your system path, please pass the PYTHON_VERSION
+variable to configure. See ``configure --help'' for reference.
+])
+                        PYTHON_VERSION=""
+                fi
+        fi
+
+        #
+        # Check if you have distutils, else fail
+        #
+        AC_MSG_CHECKING([for the distutils Python package])
+        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+        if test -z "$ac_distutils_result"; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+                AC_MSG_ERROR([cannot import Python module "distutils".
+Please check your Python installation. The error was:
+$ac_distutils_result])
+                PYTHON_VERSION=""
+        fi
+
+        #
+        # Check for Python include path
+        #
+        AC_MSG_CHECKING([for Python include path])
+        if test -z "$PYTHON_CPPFLAGS"; then
+                python_path=`$PYTHON -c "import distutils.sysconfig; \
+                        print distutils.sysconfig.get_python_inc();"`
+                if test -n "${python_path}"; then
+                        python_path="-I$python_path"
+                fi
+                PYTHON_CPPFLAGS=$python_path
+        fi
+        AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+        AC_SUBST([PYTHON_CPPFLAGS])
+
+        #
+        # Check for Python library path
+        #
+        AC_MSG_CHECKING([for Python library path])
+        if test -z "$PYTHON_LDFLAGS"; then
+                # (makes two attempts to ensure we've got a version number
+                # from the interpreter)
+                py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+                        from string import join; \
+                        print join(get_config_vars('VERSION'))"`
+                if test "$py_version" == "[None]"; then
+                        if test -n "$PYTHON_VERSION"; then
+                                py_version=$PYTHON_VERSION
+                        else
+                                py_version=`$PYTHON -c "import sys; \
+                                        print sys.version[[:3]]"`
+                        fi
+                fi
+
+                PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
+                        from string import join; \
+                        print '-L' + get_python_lib(0,1), \
+                        '-lpython';"`$py_version
+        fi
+        AC_MSG_RESULT([$PYTHON_LDFLAGS])
+        AC_SUBST([PYTHON_LDFLAGS])
+
+        #
+        # Check for the site packages
+        #
+        AC_MSG_CHECKING([for Python site-packages path])
+        AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+        if test -z "$PYTHON_SITE_PKG"; then
+                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+                        print distutils.sysconfig.get_python_lib(0,0,prefix='${PYTHON_EXEC_PREFIX}');"`
+        fi
+        AC_MSG_RESULT([$PYTHON_SITE_PKG])
+        AC_SUBST([PYTHON_SITE_PKG])
+
+        #
+        # Check for the platform-specific site packages directory
+        #
+        AC_MSG_CHECKING([for Python platform-specific site-packages path])
+        if test -z "$PYTHON_PLATFORM_PKG"; then
+                PYTHON_PLATFORM_PKG=`$PYTHON -c "import distutils.sysconfig; \
+                        print distutils.sysconfig.get_python_lib(1,0,prefix='${PYTHON_EXEC_PREFIX}');"`
+        fi
+        AC_MSG_RESULT([$PYTHON_PLATFORM_PKG])
+        AC_SUBST([PYTHON_PLATFORM_PKG])
+
+        #
+        # libraries which must be linked in when embedding
+        #
+        AC_MSG_CHECKING(python extra libraries)
+        if test -z "$PYTHON_EXTRA_LIBS"; then
+           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+                conf = distutils.sysconfig.get_config_var; \
+                print conf('LOCALMODLIBS'), conf('LIBS')"`
+        fi
+        AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+        AC_SUBST(PYTHON_EXTRA_LIBS)
+
+        #
+        # linking flags needed when embedding
+        #
+        AC_MSG_CHECKING(python extra linking flags)
+        if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+                        conf = distutils.sysconfig.get_config_var; \
+                        print conf('LINKFORSHARED')"`
+        fi
+        AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+        AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+        #
+        # final check to see if everything compiles alright
+        #
+        AC_MSG_CHECKING([consistency of all components of python development environment])
+        AC_LANG_PUSH([C])
+        # save current global flags
+        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+        AC_TRY_LINK([
+                #include <Python.h>
+        ],[
+                Py_Initialize();
+        ],[pythonexists=yes],[pythonexists=no])
+
+        AC_MSG_RESULT([$pythonexists])
+
+        if test ! "$pythonexists" = "yes"; then
+           AC_MSG_ERROR([
+  Could not link test program to Python. Maybe the main Python library has been
+  installed in some non-standard library path. If so, pass it to configure,
+  via the LDFLAGS environment variable.
+  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
+  ============================================================================
+   ERROR!
+   You probably have to install the development version of the Python package
+   for your distribution.  The exact name of this package varies among them.
+  ============================================================================
+           ])
+          PYTHON_VERSION=""
+        fi
+        AC_LANG_POP
+        # turn back to default flags
+        CPPFLAGS="$ac_save_CPPFLAGS"
+        LIBS="$ac_save_LIBS"
+
+        #
+        # all done!
+        #
+])
+
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN([AM_CHECK_PYMOD],
+[AC_REQUIRE([AC_PYTHON_DEVEL])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
+dnl AM_GCONF_SOURCE_2
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+dnl  (i.e. pass to gconftool-2
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+dnl  you should install foo.schemas files
+dnl
+
+AC_DEFUN([AM_GCONF_SOURCE_2],
+[
+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  else
+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+  fi
+
+  AC_ARG_WITH(gconf-source, 
+  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
 
+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+  fi
+
+  AC_ARG_WITH(gconf-schema-file-dir, 
+  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
+
+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+  AC_ARG_ENABLE(schemas-install,
+     [  --disable-schemas-install	Disable the schemas installation],
+     [case ${enableval} in
+       yes|no) ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
+      esac])
+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])
+# vala.m4 serial 1 (vala @VERSION@)
+dnl Autoconf scripts for the Vala compiler
+dnl Copyright (C) 2007  Mathias Hasselmann
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2 of the License, or (at your option) any later version.
+
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+dnl
+dnl Author:
+dnl 	Mathias Hasselmann <mathias.hasselmann at gmx.de>
+dnl --------------------------------------------------------------------------
+
+dnl VALA_PROG_VALAC([MINIMUM-VERSION])
+dnl
+dnl Check whether the Vala compiler exists in `PATH'. If it is found the
+dnl variable VALAC is set. Optionally a minimum release number of the compiler
+dnl can be requested.
+dnl --------------------------------------------------------------------------
+AC_DEFUN([VALA_PROG_VALAC],[
+  AC_PATH_PROG([VALAC], [valac], [])
+  AC_SUBST(VALAC)
+
+  if test -z "x${VALAC}"; then
+    AC_MSG_WARN([No Vala compiler found. You will not be able to recompile .vala source files.])
+  elif test -n "x$1"; then
+    AC_REQUIRE([AC_PROG_AWK])
+    AC_MSG_CHECKING([valac is at least version $1])
+
+    if "${VALAC}" --version | "${AWK}" -v r='$1' 'function vn(s) { if (3 == split(s,v,".")) return (v[1]*1000+v[2])*1000+v[3]; else exit 2; } /^Vala / { exit vn(r) > vn($[2]) }'; then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Vala $1 not found.])
+    fi
+  fi
+])
+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+dnl
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+dnl
 dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
 dnl
-dnl example
+dnl example:
 dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
 AC_DEFUN([AS_AC_EXPAND],
 [
   EXP_VAR=[$1]
@@ -17,7 +410,7 @@ AC_DEFUN([AS_AC_EXPAND],
 
   dnl if no prefix given, then use /usr/local, the default prefix
   if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
+    prefix="$ac_default_prefix"
   fi
   dnl if no exec_prefix given, then use prefix
   if test "x$exec_prefix" = "xNONE"; then
@@ -28,7 +421,7 @@ AC_DEFUN([AS_AC_EXPAND],
   dnl loop until it doesn't change anymore
   while true; do
     new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
+    if test "x$new_full_var" = "x$full_var"; then break; fi
     full_var=$new_full_var
   done
 
@@ -40,3 +433,4 @@ AC_DEFUN([AS_AC_EXPAND],
   prefix=$prefix_save
   exec_prefix=$exec_prefix_save
 ])
+
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig	2009-04-03 22:46:03.000000000 +0200
+++ ./configure.ac	2009-04-03 23:29:19.000000000 +0200
@@ -38,6 +38,9 @@ dnl
 
 AC_PYTHON_DEVEL()
 
+PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"`
+AC_SUBST(PLATFORM)
+
 PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version)
 PYGTK_CODEGEN_DEFINES="-DHAVE_PYCAIRO $PYGTK_CODEGEN_DEFINES";
 
@@ -252,6 +255,8 @@ AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_C
 
 appletsdir="$datarootdir/avant-window-navigator/applets"
 
+AS_AC_EXPAND([PY_SITE_PKG], [$PYTHON_SITE_PKG])
+AS_AC_EXPAND([PY_PLAT_PKG], [$PYTHON_PLATFORM_PKG])
 AS_AC_EXPAND(APPLETSDIR, $appletsdir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(LIBDIR, $libdir)
diff -up ./src/libawn-extras/bindings/python/Makefile.am.orig ./src/libawn-extras/bindings/python/Makefile.am
--- ./src/libawn-extras/bindings/python/Makefile.am.orig	2009-04-03 22:46:28.000000000 +0200
+++ ./src/libawn-extras/bindings/python/Makefile.am	2009-04-03 22:47:30.000000000 +0200
@@ -1,7 +1,7 @@
 NULL =
 
 # awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extras_PYTHON =	\
 	__init__.py	\
 	awnlib.py	\
@@ -19,7 +19,7 @@ INCLUDES = \
 	$(NULL)
 
 # libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extrasexec_LTLIBRARIES = _extras.la
 
 common_ldflags = -module -avoid-version
diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
--- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-03 22:46:33.000000000 +0200
+++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-03 22:48:14.000000000 +0200
@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
 NULL = 
 
 # awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extras_PYTHON = \
 	__init__.py	\
 	awnlib.py	\
@@ -350,7 +350,7 @@ INCLUDES = \
 
 
 # libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extrasexec_LTLIBRARIES = _extras.la
 common_ldflags = -module -avoid-version
 AWN_EXTRAS_DEFS = awn_extras.defs


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-10/awn-extras-applets.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- awn-extras-applets.spec	25 Aug 2008 22:13:55 -0000	1.10
+++ awn-extras-applets.spec	7 Apr 2009 11:15:59 -0000	1.11
@@ -1,18 +1,22 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           awn-extras-applets
-Version:        0.2.6
-Release:        6%{?dist}
+Version:        0.3.2.1
+Release:        7%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            https://launchpad.net/awn-extras/
-Source0:        https://edge.launchpad.net/awn-extras/0.2/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
+#patch modifies autotools files to make python bindings install to sitearch 
+#requires autoreconf to take effect.
+Patch0:         %{name}-%{version}-python-platform.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  avant-window-navigator-devel >= 0.2.6
+BuildRequires:  avant-window-navigator-devel >= 0.3.2
 BuildRequires:  libwnck-devel
+BuildRequires:  libXres-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  gnome-menus-devel
 BuildRequires:  gnome-desktop-devel
@@ -25,13 +29,19 @@
 BuildRequires:  libsexy-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  ed
 BuildRequires:  pycairo-devel
 BuildRequires:  pygtk2-devel
 BuildRequires:  vte-devel
 BuildRequires:  libXcomposite-devel
+BuildRequires:  libtool
+BuildRequires:  intltool 
+BuildRequires:  vala-devel
+BuildRequires:  WebKit-gtk-devel
+#BuildRequires:  gettext
+#required for autoreconf:
+BuildRequires:  autoconf, automake
 
-Requires:       avant-window-navigator >= 0.2.6
+Requires:       avant-window-navigator >= 0.3.2
 Requires:       gnome-python2-gnome
 Requires:       gnome-python2-gnomedesktop
 Requires:       gnome-python2-gnomevfs
@@ -56,14 +66,26 @@
 %description
 awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
-#for f in `find -name '*.py'`; do
-#  head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f 
-#done
+%patch0 -p1
+
 
 %build
-%configure --disable-static --disable-pymod-checks
+#required for python-platform patch
+libtoolize --force
+autoreconf
+%configure --disable-static --disable-pymod-checks --with-webkit
 make %{?_smp_mflags}
 
 
@@ -74,15 +96,23 @@
 
 find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
-# resolve conflict
-# mv ${RPM_BUILD_ROOT}/etc/gconf/schemas/notification-daemon.schemas \
-#   ${RPM_BUILD_ROOT}/etc/gconf/schemas/awn-notification-daemon.schemas
+#translations included in non-standard way. no find_lang for now
+#%find_lang
+
+#remove script-shebang in non-executables
+stripscript()
+{
+  sed '1d' "$1" > "${1}_"
+  mv -f "${1}_" "$1"
+}
+for f in `find $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/ -name *.py ! -executable`
+ do stripscript $f
+done
+stripscript $RPM_BUILD_ROOT%{python_sitearch}/awn/extras/detach.py
 
-# This project does not have translations
-# %find_lang %{name}
 
 %pre
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     for name in ${SCHEMAS}; do
@@ -92,15 +122,20 @@
 fi
 
 %post
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 for name in ${SCHEMAS}; do
   gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/${name}.schemas > /dev/null || :
 done
 
+/sbin/ldconfig
+
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %preun
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     for name in ${SCHEMAS}; do
@@ -109,28 +144,64 @@
     done
 fi
 
+%postun
+/sbin/ldconfig
+
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files 
 %defattr(-,root,root,-)
-%doc COPYING
+%doc ChangeLog COPYING README
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/affinity-preferences
-%{_libdir}/libawn-extras.so*
-%{python_sitelib}/awn/extras/*
-%dir %{python_sitelib}/awn/extras
-%{_includedir}/libawn-extras
-
-%{_libdir}/awn/applets/*
-
-%{_datadir}/icons
-%{_datadir}/avant-window-navigator/applets/icons
-%{_datadir}/avant-window-navigator/defs/awn_extras.defs
-%dir %{_datadir}/awn-extras-applets
-%{_datadir}/awn-extras-applets/*
+%{_libdir}/libawn-extras.so.*
+%{_libdir}/awn
+%{python_sitearch}/awn/extras
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/avant-window-navigator/applets/*
+%{_datadir}/avant-window-navigator/defs/*
+
+%files devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
 
 %changelog
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-7
+- Add patch to fix build on x86_64
+- Enable webkit-gtk powered applets
+
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-4
+- New upstream release
+- Add devel package
+- Update schemas scriplets
+- Fix rpmlint warnings about non-executable scripts
+- Add gnome-icon-cache scriplet
+- Add shared library scriplet
+- clean up files list
+- Use python_sitearch, not sitelib as package is arch.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 06 2009 Caol??n McNamara <caolanm at redhat.com> - 0.2.6-8
+- Resolves: rhbz#478696 make build again
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.6-7
+- Rebuild for Python 2.6
+
 * Thu Aug 26 2008 Huang Peng <phuang at redhat.com> - 0.2.6-6
 - Replace require gnome-python2 with gnome-python2-gnome
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Mar 2008 06:15:46 -0000	1.4
+++ sources	7 Apr 2009 11:15:59 -0000	1.5
@@ -1 +1 @@
-a02a7d82f086db96bca35d7865d2fa03  awn-extras-applets-0.2.6.tar.gz
+54f975f4a9a0798b5cce1b3239ed7b96  awn-extras-applets-0.3.2.1.tar.gz



From itamarjp at fedoraproject.org  Tue Apr  7 11:21:37 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  7 Apr 2009 11:21:37 +0000 (UTC)
Subject: rpms/redir/F-11 01_fix_max_bandwidth_docs.dpatch, NONE,
	1.1 02_use_ntohs.dpatch, NONE, 1.1 03_fix_tcp_wrappers.dpatch,
	NONE, 1.1 04_fix_timeouts.dpatch, NONE, 1.1 05_pedantic.dpatch,
	NONE, 1.1 06_fix_shaper_buffer.dpatch, NONE,
	1.1 07_cosmetics.dpatch, NONE, 1.1 08_add_wrappers.dpatch, NONE,
	1.1 09_add_linux_software_map.dpatch, NONE,
	1.1 15_deb_cosmetics.dpatch, NONE, 1.1 20_do_not_strip.dpatch,
	NONE, 1.1 25_fix_setsockopt.dpatch, NONE,
	1.1 30_fix_manpage.dpatch, NONE,
	1.1 31_fix_transproxy_location.patch, NONE, 1.1 import.log, NONE,
	1.1 redir.spec, NONE, 1.1 redir_gcc4.4-signedness.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407112137.3BBA770100@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/redir/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21460/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	01_fix_max_bandwidth_docs.dpatch 02_use_ntohs.dpatch 
	03_fix_tcp_wrappers.dpatch 04_fix_timeouts.dpatch 
	05_pedantic.dpatch 06_fix_shaper_buffer.dpatch 
	07_cosmetics.dpatch 08_add_wrappers.dpatch 
	09_add_linux_software_map.dpatch 15_deb_cosmetics.dpatch 
	20_do_not_strip.dpatch 25_fix_setsockopt.dpatch 
	30_fix_manpage.dpatch 31_fix_transproxy_location.patch 
	import.log redir.spec redir_gcc4.4-signedness.patch 
Log Message:
Initial RPM



--- NEW FILE 01_fix_max_bandwidth_docs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fix_max_bandwidth_docs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix docs and --help to show --max_bandwidth instead of --maxbandwidth

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:21:56.849499952 -0400
@@ -233,7 +233,7 @@
 #ifndef NO_SHAPER
         /* options for bandwidth */
         fprintf(stderr, "\t\t--bufsize=<octets>\tsize of the buffer\n");
-        fprintf(stderr, "\t\t--maxbandwidth=<bit-per-sec>\tlimit the bandwidth\n");
+        fprintf(stderr, "\t\t--max_bandwidth=<bit-per-sec>\tlimit the bandwidth\n");
         fprintf(stderr, "\t\t--random_wait=<millisec>\twait before each packet\n");
         fprintf(stderr, "\t\t--wait_in_out=<flag>\t1 wait for in, 2 out, 3 in&out\n");
         /* end options for bandwidth */
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	1999-12-26 15:52:24.000000000 -0500
+++ redir-2.2.1/redir.man	2005-10-22 21:22:28.882630176 -0400
@@ -18,7 +18,7 @@
 .I --lport=port
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -35,7 +35,7 @@
 .RB [ \--connect=host:port ]
 .I --cport=port
 .RB [ \--bufsize=n ]
-.RB [ \--maxbandwidth=n ]
+.RB [ \--max_bandwidth=n ]
 .RB [ \--random_wait=n ]
 .RB [ \--wait_in_out=n ]
 .ll -8
@@ -102,9 +102,9 @@
 .TP
 .B \--bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---maxbandwidth or --random_wait to simulate a slow connection.
+--max_bandwidth or --random_wait to simulate a slow connection.
 .TP
-.B \--maxbandwidth n
+.B \--max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
@@ -115,7 +115,7 @@
 than the bufsize (see also --bufsize).
 .TP
 .B \--wait_in_out n
-Apply --maxbandwidth and --random_wait for input if n=1, output if n=2 and
+Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)



--- NEW FILE 02_use_ntohs.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_use_ntohs.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use ntohs() to generate comprehensible debug()s and syslog()s.

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	1999-12-26 15:50:06.000000000 -0500
+++ redir-2.2.1/redir.c	2005-10-22 21:29:55.491735272 -0400
@@ -745,7 +745,7 @@
 	}
      
 	debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-	debug1("peer socket is %d\n", client.sin_port);
+	debug1("peer socket is %d\n", ntohs(client.sin_port));
 
 	/*
 	 * Double fork here so we don't have to wait later
@@ -871,8 +871,8 @@
 		strcpy(tmp2, inet_ntoa(target->sin_addr));
 	  
 		syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-		       tmp1, client.sin_port,
-		       tmp2, target->sin_port);
+		       tmp1, ntohs(client.sin_port),
+		       tmp2, ntohs(target->sin_port));
 	}
 
 	/* do proxy stuff */
@@ -1066,7 +1066,7 @@
 
 		if (!getpeername(0, (struct sockaddr *) &client, &client_size)) {
 			debug1("peer IP is %s\n", inet_ntoa(client.sin_addr));
-			debug1("peer socket is %d\n", client.sin_port);
+			debug1("peer socket is %d\n", ntohs(client.sin_port));
 		}
 		if ((targetsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 			perror("target: socket");
@@ -1109,8 +1109,8 @@
 
 		if (dosyslog) {
 			syslog(LOG_NOTICE, "connecting %s/%d to %s/%d",
-			       inet_ntoa(client.sin_addr), client.sin_port,
-			       target_ip, target.sin_port);
+			       inet_ntoa(client.sin_addr), ntohs(client.sin_port),
+			       target_ip, ntohs(target.sin_port));
 		}
 
 		/* Just start copying - one side of the loop is stdin - 0 */



--- NEW FILE 03_fix_tcp_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_fix_tcp_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix calls to tcp wrappers

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:10:11.439455392 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:10:51.625346208 -0400
@@ -802,8 +802,8 @@
 #ifdef USE_TCP_WRAPPERS
 	request_init(&request, RQ_DAEMON, ident, RQ_FILE, clisock, 0);
 	sock_host(&request);
-	sock_hostname(&request);
-	sock_hostaddr(&request);
+	sock_hostname(request.client);
+	sock_hostaddr(request.client);
 
 	if (!hosts_access(&request)) {
 		refuse(&request);
@@ -1057,8 +1057,8 @@
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
 		sock_host(&request);
-		sock_hostname(&request);
-		sock_hostaddr(&request);
+		sock_hostname(request.client);
+		sock_hostaddr(request.client);
 	
 		if (!hosts_access(&request))
 			refuse(&request);



--- NEW FILE 04_fix_timeouts.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_fix_timeouts.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Apply a close approximation of Robert de Bath's patch for bug #142382

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 22:44:39.504061784 -0400
+++ redir-2.2.1/redir.c	2005-10-22 22:47:14.746461352 -0400
@@ -598,10 +598,6 @@
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
 
-	/* Set up timeout */
-	timeout.tv_sec = timeout_secs;
-	timeout.tv_usec = 0;
-
 	/* file descriptor bits */
 	FD_ZERO(&iofds);
 	FD_SET(insock, &iofds);
@@ -618,14 +614,21 @@
 	while(1) {
 		(void) memcpy(&c_iofds, &iofds, sizeof(iofds));
 
+		/* Set up timeout, Linux returns seconds left in this structure
+		 * so we have to reset it before each select(). */
+		timeout.tv_sec = timeout_secs;
+		timeout.tv_usec = 0;
+
 
 		if (select(max_fd + 1,
 			   &c_iofds,
 			   (fd_set *)0,
 			   (fd_set *)0,
 			   (timeout_secs ? &timeout : NULL)) <= 0) {
-			/*	    syslog(LLEV,"connection timeout: %d sec",timeout.tv_sec);*/
-			break;
+		  if (dosyslog) {
+		    syslog(LOG_NOTICE,"connection timeout: %d sec",timeout_secs);
+		  }
+		  break;
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {



--- NEW FILE 05_pedantic.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_pedantic.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: changes to make clean up compilation

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2005-10-22 23:11:41.000000000 -0400
+++ redir-2.2.1/Makefile	2005-10-22 23:11:48.818368360 -0400
@@ -32,7 +32,7 @@
 # if your system lacks getopt_long, remove the comment from this line
 OBJS = redir.o $(GETOPT_OBJS)
 
-CFLAGS = -O2 -Wall $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
+CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
 LDFLAGS = -s
 
 # solaris, and others, may also need these libraries to link
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:11:48.282449832 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:12:23.201141384 -0400
@@ -73,6 +73,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -460,7 +461,7 @@
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	int socksize = sizeof(struct sockaddr_in);
+	size_t socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -509,7 +510,7 @@
 	if(getsockname(localsock, (struct sockaddr *)&sockname, &socksize) < 0) {
 		perror("getsockname");
 		if (dosyslog)
-			syslog(LOG_ERR, "getsockname failed: %m");
+			syslog(LOG_ERR, "getsockname failed: %s",strerror(errno));
 		exit(1);
 	}
 
@@ -562,7 +563,7 @@
 	switch(fork())
 	{
      	case -1: /* Error */
-     		syslog(LOG_ERR, "Couldn't fork: %m");
+     		syslog(LOG_ERR, "Couldn't fork: %s",strerror(errno));
      		_exit(1);
      	case 0:  /* Child */
 	{
@@ -723,7 +724,7 @@
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	int clientlen = sizeof(client);
+	size_t clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -734,7 +735,7 @@
 		perror("server: accept");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "accept failed: %m");
+			syslog(LOG_ERR, "accept failed: %s",strerror(errno));
 
 		/* determine if this error is fatal */
 		switch(accept_errno) {
@@ -768,7 +769,7 @@
      		perror("(server) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(server) fork failed: %m");
+     			syslog(LOG_ERR, "(server) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -795,7 +796,7 @@
      		perror("(child) fork");
 
      		if (dosyslog)
-     			syslog(LOG_ERR, "(child) fork failed: %m");
+     			syslog(LOG_ERR, "(child) fork failed: %s",strerror(errno));
 
      		_exit(1);
      	case 0:  /* Child */
@@ -826,7 +827,7 @@
 		perror("target: socket");
 	  
 		if (dosyslog)
-			syslog(LOG_ERR, "socket failed: %m");
+			syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 		
 		_exit(1);
 	}
@@ -850,7 +851,7 @@
    only be different if the input value is 0 (let the system pick a 
    port) */
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			_exit(1);
 		}
@@ -862,7 +863,7 @@
 		perror("target: connect");
 
 		if (dosyslog)
-			syslog(LOG_ERR, "bind failed: %m");
+			syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 		_exit(1);
 	}
@@ -923,7 +924,7 @@
 			perror("server: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "socket failed: %m");
+				syslog(LOG_ERR, "socket failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -962,7 +963,7 @@
 			perror("server: bind");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "bind failed: %m");
+				syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -980,7 +981,7 @@
 			perror("server: listen");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "listen failed: %m");
+				syslog(LOG_ERR, "listen failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1059,7 +1060,7 @@
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		int client_size = sizeof(client);
+		size_t client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
@@ -1079,7 +1080,7 @@
 			perror("target: socket");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "targetsock failed: %m");
+				syslog(LOG_ERR, "targetsock failed: %s",strerror(errno));
 
 			exit(1);
 		}
@@ -1097,7 +1098,7 @@
 				perror("bind_addr: cannot bind to forcerd outgoing addr");
 				 
 				if (dosyslog)
-					syslog(LOG_ERR, "bind failed: %m");
+					syslog(LOG_ERR, "bind failed: %s",strerror(errno));
 				 
 				exit(1);
 			}
@@ -1109,7 +1110,7 @@
 			perror("target: connect");
 
 			if (dosyslog)
-				syslog(LOG_ERR, "connect failed: %m");
+				syslog(LOG_ERR, "connect failed: %s",strerror(errno));
 
 			exit(1);
 		}



--- NEW FILE 06_fix_shaper_buffer.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_fix_shaper_buffer.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: properly allocate copyloop buffer

@DPATCH@
diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c
--- redir-2.2.1~/redir.c	2005-10-22 23:20:05.235901424 -0400
+++ redir-2.2.1/redir.c	2005-10-22 23:22:20.198384008 -0400
@@ -260,7 +260,7 @@
 #endif
 	   int *transproxy,
 #ifndef NO_SHAPER
-           unsigned int * bufsize,
+           unsigned int * bufsizeout,
            int * max_bandwidth,
            int * random_wait,
            int * wait_in_out,
@@ -367,7 +367,7 @@
 
 #ifndef NO_SHAPER
                 case 'z':
-                  *bufsize = (unsigned int)atol(optarg);
+                  *bufsizeout = (unsigned int)atol(optarg);
                   break;
  
                 case 'm':
@@ -594,7 +594,7 @@
 	unsigned long bytes_in = 0;
 	unsigned long bytes_out = 0;
 	unsigned int start_time, end_time;
-	char buf[bufsize];
+	char* buf = malloc(bufsize);
 
 	/* Record start time */
 	start_time = (unsigned int) time(NULL);
@@ -637,7 +637,7 @@
 		}
 
 		if(FD_ISSET(insock, &c_iofds)) {
-			if((bytes = read(insock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(insock, buf, bufsize)) <= 0)
 				break;
 #ifndef NO_FTP
 			if (ftp & FTP_PORT)
@@ -652,7 +652,7 @@
 			bytes_out += bytes;
 		}
 		if(FD_ISSET(outsock, &c_iofds)) {
-			if((bytes = read(outsock, buf, sizeof(buf))) <= 0)
+			if((bytes = read(outsock, buf, bufsize)) <= 0)
 				break;
 			/* if we're correcting for PASV on ftp redirections, then
 			   fix buf and bytes to have the new address, among other
@@ -689,6 +689,7 @@
 		syslog(LOG_NOTICE, "disconnect %d secs, %ld in %ld out",
 		       (end_time - start_time), bytes_in, bytes_out);
 	}
+	free(buf);
 	return;
 }
 



--- NEW FILE 07_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 07_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic fixes which could be applied upstream

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:41:51.284918168 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:42:42.115190792 -0400
@@ -73,7 +73,7 @@
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
 .B --timeout
-Timeout and close the connection after n seconds on inactivity.
+Timeout and close the connection after n seconds of inactivity.
 .TP
 .B \--syslog
 Log information to syslog.
@@ -90,7 +90,7 @@
 undesirable. 
 .TP
 .B \--transproxy
-On a linux system with transparany proxying enables, causes redir to
+On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see transproxy.txt in the source archive)
 .TP



--- NEW FILE 08_add_wrappers.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 08_add_wrappers.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Enabling TCP wrapper support

@DPATCH@

--- redir-2.2.1.orig/Makefile
+++ redir-2.2.1/Makefile
@@ -9,8 +9,8 @@
 # if you would like support for TCP wrappers (and have libwrap.a
 # installed), remove these comments.
 
-WRAP_CFLAGS = # -DUSE_TCP_WRAPPERS 
-WRAP_LIBS = # -lwrap
+WRAP_CFLAGS = -DUSE_TCP_WRAPPERS 
+WRAP_LIBS = -lwrap
 
 # if your system needs any additional libraries (solaris, for example, 
 # needs the ones commented out below), edit this line.




--- NEW FILE 09_add_linux_software_map.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_add_linux_software_map.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add linux software map file

@DPATCH@

--- redir-2.2.1.orig/redir-2.2.lsm
+++ redir-2.2.1/redir-2.2.lsm
@@ -0,0 +1,11 @@
+Begin3
+Title:   redir
+Version:  2.2
+Entered-date:  15DEC1999
+Description:  TCP Port redirector (for firewalls etc).
+Keywords:  tcp port redirector bouncer proxy
+Author:   sammy at oh.verio.com
+Primary-site:  sunsite.unc.edu /pub/Linux/system/Network/daemons
+   39936 redir-2.2.tar.gz
+Copying-policy:  GPL
+End




--- NEW FILE 15_deb_cosmetics.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_deb_cosmetics.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Cosmetic changes applicable only to debian

@DPATCH@
diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man
--- redir-2.2.1~/redir.man	2005-10-22 21:47:44.067287096 -0400
+++ redir-2.2.1/redir.man	2005-10-22 21:48:34.218662928 -0400
@@ -92,7 +92,7 @@
 .B \--transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see transproxy.txt in the source archive)
+(see /usr/share/doc/redir/transproxy.txt)
 .TP
 .B \--connect
 Redirects connections through an HTTP proxy which supports the CONNECT 



--- NEW FILE 20_do_not_strip.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_do_not_strip.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: don't strip by default.  let dh_strip take care of it.

@DPATCH@
diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile
--- redir-2.2.1~/Makefile	2007-08-15 14:53:41.908911693 -0400
+++ redir-2.2.1/Makefile	2007-08-15 14:53:59.409909018 -0400
@@ -33,7 +33,7 @@
 OBJS = redir.o $(GETOPT_OBJS)
 
 CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS)
-LDFLAGS = -s
+LDFLAGS = # -s
 
 # solaris, and others, may also need these libraries to link
 # also edit here if you're using the TCP wrappers code



--- NEW FILE 25_fix_setsockopt.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 25_fix_setsockopt.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that the server socket has SO_REUSEADDR and SO_LINGER set properly.

@DPATCH@
diff -urNad redir~/redir.c redir/redir.c
--- redir~/redir.c	2009-03-03 17:35:12.022427586 -0500
+++ redir/redir.c	2009-03-03 17:45:28.998426896 -0500
@@ -90,8 +90,8 @@
 /* let's set up some globals... */
 int dodebug = 0;
 int dosyslog = 0;
-unsigned char reuse_addr = 1;
-unsigned char linger_opt = 0;
+int reuse_addr = 1; /* allow address reuse */
+struct linger linger_opt = { 0, 0}; /* do not linger */
 char * bind_addr = NULL;
 struct sockaddr_in addr_out;
 int timeout = 0;
@@ -906,6 +906,7 @@
 
 	int servsock;
 	struct sockaddr_in server;
+	int ret;
      
 	/*
 	 * Get a socket to work with.  This socket will
@@ -944,8 +945,30 @@
 		server.sin_addr.s_addr = htonl(inet_addr("0.0.0.0"));
 	}
      
-	setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
-	setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(SO_LINGER)); 
+	ret = setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr));
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_REUSEADDR)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_REUSEADDR: %s",strerror(errno));
+			exit(1);
+		}
+	}
+	ret = setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(linger_opt)); 
+	if (ret != 0) {
+		if(fail) {
+			return -1;
+		}
+		else {
+			perror("server: setsockopt (SO_LINGER)");
+			if (dosyslog)
+				syslog(LOG_ERR, "setsockopt failed with SO_LINGER: %s",strerror(errno));
+			exit(1);
+		}
+	}
      
 	/*
 	 * Try to bind the address to the socket.



--- NEW FILE 30_fix_manpage.dpatch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_fix_manpage.dpatch by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Clean up questionable formatting in man page.

@DPATCH@
diff -urNad redir~/redir.man redir/redir.man
--- redir~/redir.man	2009-03-03 18:55:37.790428922 -0500
+++ redir/redir.man	2009-03-03 18:58:48.486428715 -0500
@@ -1,43 +1,42 @@
-.PU
 .TH REDIR 1 local
 .SH NAME
-redir \- redirect tcp connections
+redir - redirect tcp connections
 .SH SYNOPSIS
 .ll +8
 .B redir
-.RB [ \--laddr=incoming.ip.address ]
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--bind_addr=my.other.ip.address ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --lport=port
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB [ \-\-laddr=incoming.ip.address ]
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog 
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-bind_addr=my.other.ip.address ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-lport=port
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .B redir
-.RB \--inetd
-.RB [ \--caddr=host ]
-.RB [ \--debug ]
-.RB [ \--syslog 
-.RB [ \--name=str ] 
-.RB [ \--timeout=n ]
-.RB [ \--ftp=type ]
-.RB [ \--transproxy ]
-.RB [ \--connect=host:port ]
-.I --cport=port
-.RB [ \--bufsize=n ]
-.RB [ \--max_bandwidth=n ]
-.RB [ \--random_wait=n ]
-.RB [ \--wait_in_out=n ]
+.RB \-\-inetd
+.RB [ \-\-caddr=host ]
+.RB [ \-\-debug ]
+.RB [ \-\-syslog ]
+.RB [ \-\-name=str ] 
+.RB [ \-\-timeout=n ]
+.RB [ \-\-ftp=type ]
+.RB [ \-\-transproxy ]
+.RB [ \-\-connect=host:port ]
+.I \-\-cport=port
+.RB [ \-\-bufsize=n ]
+.RB [ \-\-max_bandwidth=n ]
+.RB [ \-\-random_wait=n ]
+.RB [ \-\-wait_in_out=n ]
 .ll -8
 .br
 .SH DESCRIPTION
@@ -49,74 +48,73 @@
 Depending on how redir was compiled, not all options may be available.
 .SH OPTIONS
 .TP
-.B \--lport
+.B \-\-lport
 Specifies port to listen for connections on (when not running from inetd)
 .TP
-.B \--laddr
+.B \-\-laddr
 IP address to bind to when listening for connections (when not
 running from inetd) 
 .TP
-.B \--cport
+.B \-\-cport
 Specifies port to connect to.
 .TP
-.B \--caddr
+.B \-\-caddr
 Specifies remote host to connect to. (localhost if omitted)
 .TP
-.B \--inetd
+.B \-\-inetd
 Run as a process started from inetd, with the connection passed as stdin
 and stdout on startup.
 .TP
-.B \--debug
+.B \-\-debug
 Write debug output to stderr or syslog.
 .TP
-.B \--name
+.B \-\-name
 Specify program name to be used for TCP wrapper checks and syslog logging.
 .TP
-.B --timeout
+.B \-\-timeout
 Timeout and close the connection after n seconds of inactivity.
 .TP
-.B \--syslog
+.B \-\-syslog
 Log information to syslog.
 .TP
-.B \--bind_addr
+.B \-\-bind_addr
 Forces redir to pick a specific address/interface to bind to when it listens 
 for incoming connections. 
 .TP
-.B \--ftp
+.B \-\-ftp
 When using redir for an FTP server, this will cause redir to also
 redirect ftp connections.  Type should be specified as either "port",
 "pasv", or "both", to specify what type of FTP connection to handle.
-Note that --transproxy often makes one or the other (generally port)
+Note that \-\-transproxy often makes one or the other (generally port)
 undesirable. 
 .TP
-.B \--transproxy
+.B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
 (see /usr/share/doc/redir/transproxy.txt)
 .TP
-.B \--connect
+.B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 
-command.  Specify the address and port of the proxy using --caddr and
---cport.  --connect requires the hostname and port which the HTTP
+command.  Specify the address and port of the proxy using \-\-caddr and
+\-\-cport.  \-\-connect requires the hostname and port which the HTTP
 proxy will be asked to connect to.
 .TP
-.B \--bufsize n
+.B \-\-bufsize n
 Set the bufsize (defaut 4096) in bytes. Can be used combined with
---max_bandwidth or --random_wait to simulate a slow connection.
+\-\-max_bandwidth or \-\-random_wait to simulate a slow connection.
 .TP
-.B \--max_bandwidth n
+.B \-\-max_bandwidth n
 Reduce the bandwidth to be no more than n bits/sec.  The algorithme is
 basic, the goal is to simulate a slow connection, so there is no pic
 acceptance.
 .TP
-.B \--random_wait n
+.B \-\-random_wait n
 Wait between 0 and 2 x n milliseconds before each "packet". A "packet" is
 a bloc of data read in one time by redir. A "packet" size is always less
-than the bufsize (see also --bufsize).
+than the bufsize (see also \-\-bufsize).
 .TP
-.B \--wait_in_out n
-Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and
+.B \-\-wait_in_out n
+Apply \-\-max_bandwidth and \-\-random_wait for input if n=1, output if n=2 and
 both if n=3.
 .SH "SEE ALSO"
 inetd(1)
-


31_fix_transproxy_location.patch:

--- NEW FILE 31_fix_transproxy_location.patch ---
diff -ruNp a/redir-2.2.1/redir.man b/redir-2.2.1/redir.man
--- a/redir-2.2.1/redir.man	2009-04-06 13:21:06.000000000 -0300
+++ b/redir-2.2.1/redir.man	2009-04-06 13:23:59.000000000 -0300
@@ -91,7 +91,7 @@ undesirable. 
 .B \-\-transproxy
 On a linux system with transparent proxying enabled, causes redir to
 make connections appear as if they had come from their true origin.
-(see /usr/share/doc/redir/transproxy.txt)
+(see /usr/share/doc/redir-2.2.1/transproxy.txt)
 .TP
 .B \-\-connect
 Redirects connections through an HTTP proxy which supports the CONNECT 


--- NEW FILE import.log ---
redir-2_2_1-3_fc11:F-11:redir-2.2.1-3.fc11.src.rpm:1239103217


--- NEW FILE redir.spec ---
Name:           redir
Version:        2.2.1
Release:        3%{?dist}
Summary:        Redirect TCP connections

Group:          Applications/Internet
License:        GPL+
URL:            http://sammy.net/~sammy/hacks/
Source0:        http://sammy.net/~sammy/hacks/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcp_wrappers-devel

#Include Debian Patches
Patch0:         01_fix_max_bandwidth_docs.dpatch
Patch1:         02_use_ntohs.dpatch
Patch2:         03_fix_tcp_wrappers.dpatch
Patch3:         04_fix_timeouts.dpatch
Patch4:         05_pedantic.dpatch
Patch5:         06_fix_shaper_buffer.dpatch
Patch6:         07_cosmetics.dpatch
Patch7:         08_add_wrappers.dpatch
Patch8:         09_add_linux_software_map.dpatch
Patch9:         15_deb_cosmetics.dpatch
Patch10:        20_do_not_strip.dpatch
Patch11:        25_fix_setsockopt.dpatch
Patch12:        30_fix_manpage.dpatch
#end of debian patches

Patch13:        redir_gcc4.4-signedness.patch
Patch14:        31_fix_transproxy_location.patch
%description
a port redirector, used to forward incoming connections to somewhere else.
by far the cleanest piece of code here, because someone else liked it
enough to fix it.

%prep
%setup -q

# Fix docs and --help to show --max_bandwidth instead of --maxbandwidth
%patch0 -p1

#use ntohs() to generate comprehensible debug()s and syslog()s
%patch1 -p1

#fix calls to tcp wrappers
%patch2 -p1

# fix and make timeout more verbose
%patch3 -p1

#changes to make clean up compilation, include missing time.h include
%patch4 -p1

#properly allocate copyloop buffer
%patch5 -p1

#cosmestic only patch
%patch6 -p1

#add tcp_wrapper support
%patch7 -p1

#description of redir
%patch8 -p1

#comestic only patch
%patch9 -p1

# do not stripping needed for debug-info package
%patch10 -p1

#make usage os setsockopt more verbose
%patch11 -p1

#Clean up questionable formatting in man page
%patch12 -p1

#fix compile warning with gcc 4.4
%patch13 -p2

# fix location of transproxy.txt
%patch14 -p2

# Convert to utf-8
for file in CHANGES; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
install -Dp -m 644 %{name}.man $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README CHANGES COPYING trans*.txt
%{_sbindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Sat Apr 04 2009 Itamar Reis Peixoto - 2.2.1-3
- fix compile warning with gcc 4.4
- include README and COPYING into %%doc section
- remove attr from files section
- convert CHANGES TO utf-8
- fix location of transproxy.txt file in manpage

* Wed Apr 01 2009 Itamar Reis Peixoto - 2.2.1-2
- Include Debian Patches

* Tue Mar 31 2009 Itamar Reis Peixoto - 2.2.1-1
- Initial RPM version

redir_gcc4.4-signedness.patch:

--- NEW FILE redir_gcc4.4-signedness.patch ---
Binary files a/redir-2.2.1/redir and b/redir-2.2.1/redir differ
diff -ruNp a/redir-2.2.1/redir.c b/redir-2.2.1/redir.c
--- a/redir-2.2.1/redir.c	2009-04-04 16:36:24.000000000 -0300
+++ b/redir-2.2.1/redir.c	2009-04-04 16:46:06.000000000 -0300
@@ -461,7 +461,7 @@ void ftp_clean(int send, char *buf, unsi
 	int lport, rport;
 	int remip[4];
 	int localsock;
-	size_t socksize = sizeof(struct sockaddr_in);
+	unsigned int socksize = sizeof(struct sockaddr_in);
 
 	struct sockaddr_in newsession;
 	struct sockaddr_in sockname;
@@ -721,7 +721,7 @@ do_accept(int servsock, struct sockaddr_
 	int clisock;
 	int targetsock;
 	struct sockaddr_in client;
-	size_t clientlen = sizeof(client);
+	unsigned int clientlen = sizeof(client);
 	int accept_errno;
      
 	debug("top of accept loop\n");
@@ -1080,7 +1080,7 @@ main(int argc, char *argv[])
 	if (inetd) {
 		int targetsock;
 		struct sockaddr_in client;
-		size_t client_size = sizeof(client);
+		unsigned int client_size = sizeof(client);
 
 #ifdef USE_TCP_WRAPPERS
 		request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0);
Binary files a/redir-2.2.1/redir.o and b/redir-2.2.1/redir.o differ


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redir/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:26:26 -0000	1.1
+++ .cvsignore	7 Apr 2009 11:21:05 -0000	1.2
@@ -0,0 +1 @@
+redir-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redir/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:26:27 -0000	1.1
+++ sources	7 Apr 2009 11:21:06 -0000	1.2
@@ -0,0 +1 @@
+4342fadac30504c86c8db7beefe01995  redir-2.2.1.tar.gz



From cwickert at fedoraproject.org  Tue Apr  7 11:24:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  7 Apr 2009 11:24:43 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.4, 1.5 rednotebook.spec, 1.3, 
	1.4 sources, 1.4, 1.5
Message-ID: <20090407112443.9D6A970100@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22327

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Tue Apr 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.6-1
- Updated to new upstream version 0.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Apr 2009 10:18:28 -0000	1.4
+++ .cvsignore	7 Apr 2009 11:24:12 -0000	1.5
@@ -1 +1 @@
-rednotebook-0.6.5.tar.gz
+rednotebook-0.6.6.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rednotebook.spec	3 Apr 2009 10:18:28 -0000	1.3
+++ rednotebook.spec	7 Apr 2009 11:24:13 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.6.5
+Version:        0.6.6
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.6-1
+- Updated to new upstream version 0.6.6
+
 * Fri Apr 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.5-1
 - Updated to new upstream version 0.6.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Apr 2009 10:18:28 -0000	1.4
+++ sources	7 Apr 2009 11:24:13 -0000	1.5
@@ -1 +1 @@
-76e35cd47bc02360e802ec7785862d3d  rednotebook-0.6.5.tar.gz
+6e6c0d7574d44d1918133f46bcd04fc4  rednotebook-0.6.6.tar.gz



From llaumgui at fedoraproject.org  Tue Apr  7 11:47:42 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 11:47:42 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/devel pidgin-privacy-please.spec, 1.3,
	1.4
Message-ID: <20090407114742.403027013C@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13089

Modified Files:
	pidgin-privacy-please.spec 
Log Message:
EL-5 modification



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/pidgin-privacy-please.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pidgin-privacy-please.spec	16 Mar 2009 07:06:05 -0000	1.3
+++ pidgin-privacy-please.spec	7 Apr 2009 11:47:11 -0000	1.4
@@ -1,16 +1,18 @@
-Name:            pidgin-privacy-please
-Version:         0.5.3
-Release:         1%{?dist}
-Summary:         Security and Privacy plugin for Pidgin
-
-Group:           Applications/Internet
-License:         GPLv2+
-URL:             http://code.google.com/p/pidgin-privacy-please/
-Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:   pidgin-devel
-Requires:        pidgin
+Name:           pidgin-privacy-please
+Version:        0.5.3
+Release:        2%{?dist}
+Summary:        Security and Privacy plugin for Pidgin
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://code.google.com/p/pidgin-privacy-please/
+Source0:        http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} > 1 
+ExcludeArch:    ppc
+%endif
+BuildRequires:  pidgin-devel
+Requires:       pidgin
 
 
 %description
@@ -50,7 +52,10 @@
 
 
 %changelog
-* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
+- Modifications for EL-5
+
+ Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From dwalsh at fedoraproject.org  Tue Apr  7 11:29:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  7 Apr 2009 11:29:11 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.81,1.82
Message-ID: <20090407112911.1BD7B70100@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23312

Modified Files:
	policy-20090105.patch 
Log Message:
* Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.11-1
- Dontaudit binds to ports < 1024 for named
- Upgrade to latest upstream


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- policy-20090105.patch	6 Apr 2009 19:27:19 -0000	1.81
+++ policy-20090105.patch	7 Apr 2009 11:29:08 -0000	1.82
@@ -5392,7 +5392,7 @@
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.11/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/kernel/kernel.if	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/kernel/kernel.if	2009-04-07 07:25:16.000000000 -0400
 @@ -1197,6 +1197,26 @@
  	')
  
@@ -10869,7 +10869,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.11/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/services/devicekit.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/services/devicekit.te	2009-04-07 07:01:32.000000000 -0400
 @@ -0,0 +1,211 @@
 +policy_module(devicekit,1.0.0)
 +
@@ -11019,7 +11019,7 @@
 +# DeviceKit disk local policy
 +#
 +
-+allow devicekit_disk_t self:capability sys_nice;
++allow devicekit_disk_t self:capability { sys_nice sys_ptrace };
 +
 +allow devicekit_disk_t self:fifo_file rw_fifo_file_perms;
 +
@@ -18331,7 +18331,7 @@
  	ccs_read_config(ricci_modstorage_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.11/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.11/policy/modules/services/rpc.te	2009-04-06 15:25:10.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/services/rpc.te	2009-04-07 07:27:16.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -18341,7 +18341,33 @@
  
  rpc_domain_template(gssd)
  
-@@ -141,6 +141,7 @@
+@@ -79,16 +79,25 @@
+ fs_read_rpc_symlinks(rpcd_t)
+ fs_rw_rpc_sockets(rpcd_t) 
+ 
++kernel_signal(rpcd_t) 
++
+ selinux_dontaudit_read_fs(rpcd_t)
+ 
+ miscfiles_read_certs(rpcd_t)
+ 
+ seutil_dontaudit_search_config(rpcd_t)
+ 
++userdom_signal_unpriv_users(rpcd_t)
++
+ optional_policy(`
+ 	nis_read_ypserv_config(rpcd_t)
+ ')
+ 
++optional_policy(`
++	unconfined_execmem_signal(rpcd_t)
++	unconfined_signal(rpcd_t)
++')
++
+ ########################################
+ #
+ # NFSD local policy
+@@ -141,6 +150,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
  ')
@@ -18349,7 +18375,7 @@
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -183,9 +184,12 @@
+@@ -183,9 +193,12 @@
  files_read_usr_symlinks(gssd_t) 
  
  auth_use_nsswitch(gssd_t)
@@ -26803,7 +26829,7 @@
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.11/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/unconfined.if	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/unconfined.if	2009-04-07 07:26:40.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -26879,7 +26905,7 @@
  ')
  
  ########################################
-@@ -367,6 +374,24 @@
+@@ -367,6 +374,42 @@
  
  ########################################
  ## <summary>
@@ -26901,10 +26927,28 @@
 +
 +########################################
 +## <summary>
++##	Send a signal to the unconfined execmem domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_execmem_signal',`
++	gen_require(`
++		type unconfined_execmem_t;
++	')
++
++	allow $1 unconfined_execmem_t:process signal;
++')
++
++########################################
++## <summary>
  ##	Send generic signals to the unconfined domain.
  ## </summary>
  ## <param name="domain">
-@@ -458,6 +483,25 @@
+@@ -458,6 +501,25 @@
  
  ########################################
  ## <summary>
@@ -26930,7 +26974,7 @@
  ##	Connect to the unconfined domain using
  ##	a unix domain stream socket.
  ## </summary>
-@@ -581,3 +625,150 @@
+@@ -581,3 +643,150 @@
  
  	allow $1 unconfined_t:dbus acquire_svc;
  ')
@@ -27460,7 +27504,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.11/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/userdomain.if	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.11/policy/modules/system/userdomain.if	2009-04-07 07:23:04.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  



From llaumgui at fedoraproject.org  Tue Apr  7 11:52:19 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 11:52:19 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-10 pidgin-privacy-please.spec,1.2,1.3
Message-ID: <20090407115219.3428F70100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13966

Modified Files:
	pidgin-privacy-please.spec 
Log Message:
EL-5 modification



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/pidgin-privacy-please.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pidgin-privacy-please.spec	16 Mar 2009 07:07:52 -0000	1.2
+++ pidgin-privacy-please.spec	7 Apr 2009 11:51:48 -0000	1.3
@@ -1,16 +1,18 @@
-Name:            pidgin-privacy-please
-Version:         0.5.3
-Release:         1%{?dist}
-Summary:         Security and Privacy plugin for Pidgin
-
-Group:           Applications/Internet
-License:         GPLv2+
-URL:             http://code.google.com/p/pidgin-privacy-please/
-Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:   pidgin-devel
-Requires:        pidgin
+Name:           pidgin-privacy-please
+Version:        0.5.3
+Release:        2%{?dist}
+Summary:        Security and Privacy plugin for Pidgin
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://code.google.com/p/pidgin-privacy-please/
+Source0:        http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} > 1 
+ExcludeArch:    ppc
+%endif
+BuildRequires:  pidgin-devel
+Requires:       pidgin
 
 
 %description
@@ -50,7 +52,10 @@
 
 
 %changelog
-* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
+- Modifications for EL-5
+
+ Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From llaumgui at fedoraproject.org  Tue Apr  7 11:53:48 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 11:53:48 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/EL-5 pidgin-privacy-please.spec,1.3,1.4
Message-ID: <20090407115348.7F86170100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14369

Modified Files:
	pidgin-privacy-please.spec 
Log Message:
EL-5 modification 



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/EL-5/pidgin-privacy-please.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pidgin-privacy-please.spec	16 Mar 2009 07:06:05 -0000	1.3
+++ pidgin-privacy-please.spec	7 Apr 2009 11:53:18 -0000	1.4
@@ -1,16 +1,18 @@
-Name:            pidgin-privacy-please
-Version:         0.5.3
-Release:         1%{?dist}
-Summary:         Security and Privacy plugin for Pidgin
-
-Group:           Applications/Internet
-License:         GPLv2+
-URL:             http://code.google.com/p/pidgin-privacy-please/
-Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:   pidgin-devel
-Requires:        pidgin
+Name:           pidgin-privacy-please
+Version:        0.5.3
+Release:        2%{?dist}
+Summary:        Security and Privacy plugin for Pidgin
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://code.google.com/p/pidgin-privacy-please/
+Source0:        http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} > 1 
+ExcludeArch:    ppc
+%endif
+BuildRequires:  pidgin-devel
+Requires:       pidgin
 
 
 %description
@@ -50,7 +52,10 @@
 
 
 %changelog
-* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
+- Modifications for EL-5
+
+ Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From llaumgui at fedoraproject.org  Tue Apr  7 11:57:08 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 11:57:08 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-9 pidgin-privacy-please.spec,1.2,1.3
Message-ID: <20090407115708.882AE70100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14905

Modified Files:
	pidgin-privacy-please.spec 
Log Message:
EL-5 modification



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-9/pidgin-privacy-please.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pidgin-privacy-please.spec	16 Mar 2009 07:10:12 -0000	1.2
+++ pidgin-privacy-please.spec	7 Apr 2009 11:56:38 -0000	1.3
@@ -1,16 +1,18 @@
-Name:            pidgin-privacy-please
-Version:         0.5.3
-Release:         1%{?dist}
-Summary:         Security and Privacy plugin for Pidgin
-
-Group:           Applications/Internet
-License:         GPLv2+
-URL:             http://code.google.com/p/pidgin-privacy-please/
-Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:   pidgin-devel
-Requires:        pidgin
+Name:           pidgin-privacy-please
+Version:        0.5.3
+Release:        2%{?dist}
+Summary:        Security and Privacy plugin for Pidgin
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://code.google.com/p/pidgin-privacy-please/
+Source0:        http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} > 1 
+ExcludeArch:    ppc
+%endif
+BuildRequires:  pidgin-devel
+Requires:       pidgin
 
 
 %description
@@ -50,7 +52,10 @@
 
 
 %changelog
-* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
+- Modifications for EL-5
+
+ Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From llaumgui at fedoraproject.org  Tue Apr  7 12:00:33 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 12:00:33 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-10 pidgin-privacy-please.spec,1.3,1.4
Message-ID: <20090407120033.249F870100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15458

Modified Files:
	pidgin-privacy-please.spec 
Log Message:



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/pidgin-privacy-please.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pidgin-privacy-please.spec	7 Apr 2009 11:51:48 -0000	1.3
+++ pidgin-privacy-please.spec	7 Apr 2009 12:00:02 -0000	1.4
@@ -55,7 +55,7 @@
 * Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
 - Modifications for EL-5
 
- Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From llaumgui at fedoraproject.org  Tue Apr  7 12:00:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 12:00:38 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/devel pidgin-privacy-please.spec, 1.4,
	1.5
Message-ID: <20090407120038.9D4BE70100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15529

Modified Files:
	pidgin-privacy-please.spec 
Log Message:



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/pidgin-privacy-please.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pidgin-privacy-please.spec	7 Apr 2009 11:47:11 -0000	1.4
+++ pidgin-privacy-please.spec	7 Apr 2009 12:00:08 -0000	1.5
@@ -55,7 +55,7 @@
 * Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
 - Modifications for EL-5
 
- Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From llaumgui at fedoraproject.org  Tue Apr  7 12:01:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 12:01:38 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-9 pidgin-privacy-please.spec,1.3,1.4
Message-ID: <20090407120138.0D90970100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15712

Modified Files:
	pidgin-privacy-please.spec 
Log Message:



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-9/pidgin-privacy-please.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pidgin-privacy-please.spec	7 Apr 2009 11:56:38 -0000	1.3
+++ pidgin-privacy-please.spec	7 Apr 2009 12:01:07 -0000	1.4
@@ -55,7 +55,7 @@
 * Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
 - Modifications for EL-5
 
- Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From llaumgui at fedoraproject.org  Tue Apr  7 12:01:57 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue,  7 Apr 2009 12:01:57 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/EL-5 pidgin-privacy-please.spec,1.4,1.5
Message-ID: <20090407120157.570ED70100@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15758

Modified Files:
	pidgin-privacy-please.spec 
Log Message:



Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/EL-5/pidgin-privacy-please.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pidgin-privacy-please.spec	7 Apr 2009 11:53:18 -0000	1.4
+++ pidgin-privacy-please.spec	7 Apr 2009 12:01:27 -0000	1.5
@@ -55,7 +55,7 @@
 * Tue Apr 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-2
 - Modifications for EL-5
 
- Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
+* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.3-1
 - Update to 0.5.3
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3



From cwickert at fedoraproject.org  Tue Apr  7 11:34:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  7 Apr 2009 11:34:42 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.234,1.235 comps-f11.xml.in,1.175,1.176
Message-ID: <20090407113442.5584070137@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24648

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
make slim default in lxde


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- comps-f10.xml.in	5 Apr 2009 17:07:15 -0000	1.234
+++ comps-f10.xml.in	7 Apr 2009 11:34:11 -0000	1.235
@@ -3331,12 +3331,12 @@
       <packagereq type="default">lxtask</packagereq>
       <packagereq type="default">lxterminal</packagereq>
       <packagereq type="default">obconf</packagereq>
+      <packagereq type="default">slim</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">parcellite</packagereq>
-      <packagereq type="optional">slim</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- comps-f11.xml.in	7 Apr 2009 08:05:26 -0000	1.175
+++ comps-f11.xml.in	7 Apr 2009 11:34:11 -0000	1.176
@@ -3579,12 +3579,12 @@
       <packagereq type="default">lxtask</packagereq>
       <packagereq type="default">lxterminal</packagereq>
       <packagereq type="default">obconf</packagereq>
+      <packagereq type="default">slim</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">parcellite</packagereq>
-      <packagereq type="optional">slim</packagereq>
     </packagelist>
   </group>
   <group>



From limb at fedoraproject.org  Tue Apr  7 12:11:29 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  7 Apr 2009 12:11:29 +0000 (UTC)
Subject: rpms/nexuiz-data/devel .cvsignore, 1.12, 1.13 nexuiz-data.spec, 1.16,
	1.17 sources, 1.13, 1.14
Message-ID: <20090407121129.EF65470100@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17506

Modified Files:
	.cvsignore nexuiz-data.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	19 May 2008 17:35:56 -0000	1.12
+++ .cvsignore	7 Apr 2009 12:10:59 -0000	1.13
@@ -1 +1 @@
-nexuiz-data-2.4.2.tar
+nexuiz-data-2.5.tar


Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/devel/nexuiz-data.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nexuiz-data.spec	26 Feb 2009 05:31:27 -0000	1.16
+++ nexuiz-data.spec	7 Apr 2009 12:10:59 -0000	1.17
@@ -1,19 +1,19 @@
-%define datadate 20080511
+%define datadate 20090403
 
 Summary: Game data for the Nexuiz first person shooter
 Name: nexuiz-data
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget  http://downloads.sourceforge.net/nexuiz/nexuiz-242.zip
-# unzip nexuiz-242.zip
-# mkdir nexuiz-data-2.4.2/
+# wget  http://downloads.sourceforge.net/nexuiz/nexuiz-25.zip
+# unzip nexuiz-25.zip
+# mkdir nexuiz-data-2.5/
 # mv Nexuiz/data/ Nexuiz/Docs/* \
-#    Nexuiz/gpl.txt nexuiz-data-2.4.2/
-# tar cvf nexuiz-data-2.4.2.tar nexuiz-data-2.4.2/
+#    Nexuiz/gpl.txt nexuiz-data-2.5/
+# tar cvf nexuiz-data-2.5.tar nexuiz-data-2.5/
 Source0: nexuiz-data-%{version}.tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -26,14 +26,15 @@
 
 %prep
 %setup -q
-%{__sed} -i 's/\r//' Readme.htm *.txt FAQ*
-%{__sed} -i 's/\r//' server/rcon2irc/*  server/rcon.pl  server/readme.txt \
-    server/server.cfg  server/server_linux.sh  server/server_mac.sh  \
-    server/server_pro_linux.sh  server/server_pro_mac.sh \
-    server/server_pro_windows.bat  server/server_windows.bat
-%{__chmod} 644 server/*
-%{__chmod} 755 server/rcon2irc
-%{__chmod} 644 server/rcon2irc/*
+%{__sed} -i 's/\r//' *.txt
+#%{__sed} -i 's/\r//' Readme.htm *.txt FAQ*
+#%{__sed} -i 's/\r//' server/rcon2irc/*  server/rcon.pl  server/readme.txt \
+#    server/server.cfg  server/server_linux.sh  server/server_mac.sh  \
+#    server/server_pro_linux.sh  server/server_pro_mac.sh \
+#    server/server_pro_windows.bat  server/server_windows.bat
+#%{__chmod} 644 server/*
+#%{__chmod} 755 server/rcon2irc
+#%{__chmod} 644 server/rcon2irc/*
 
 %build
 
@@ -51,13 +52,15 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc Readme.htm cvars.txt mapping.txt
-%doc gamemodes.txt FAQ* gpl.txt
-%doc mapping.txt say-escapes.txt scorelog.txt
-%doc eventlog.txt mapdownload.txt server
+%doc gpl.txt *.html
+%doc mapping.txt scorelog.txt
+%doc eventlog.txt mapdownload.txt htmlfiles
 %{_datadir}/nexuiz/
 
 %changelog
+* Mon Apr 06 2009 Jon Ciesla <limb at jcomserv.net> - 2.5-1
+- New upstream release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 May 2008 17:35:56 -0000	1.13
+++ sources	7 Apr 2009 12:10:59 -0000	1.14
@@ -1 +1 @@
-df105420c3d2d5aa0bde7ad2d24c6365  nexuiz-data-2.4.2.tar
+077e9e0818e1f288fce9467ba333364b  nexuiz-data-2.5.tar



From ltinkl at fedoraproject.org  Tue Apr  7 12:14:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:14:57 +0000 (UTC)
Subject: rpms/konq-plugins/devel .cvsignore, 1.8, 1.9 konq-plugins.spec, 1.23,
	1.24 sources, 1.9, 1.10 konq-plugins-4.2.0-fix_docs.patch, 1.1, NONE
Message-ID: <20090407121457.B782770100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19367

Modified Files:
	.cvsignore konq-plugins.spec sources 
Removed Files:
	konq-plugins-4.2.0-fix_docs.patch 
Log Message:
KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Feb 2009 20:40:08 -0000	1.8
+++ .cvsignore	7 Apr 2009 12:14:27 -0000	1.9
@@ -1 +1 @@
-konq-plugins-4.2.0.tar.bz2
+konq-plugins-4.2.2.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- konq-plugins.spec	25 Mar 2009 18:21:15 -0000	1.23
+++ konq-plugins.spec	7 Apr 2009 12:14:27 -0000	1.24
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.0
-Release:        4%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -12,8 +12,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         konq-plugins-4.2.0-fsview.patch
-# upstream patches
-Patch100:        konq-plugins-4.2.0-fix_docs.patch
 
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
@@ -51,7 +49,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fsview
-%patch100 -p1 -b .fix_docs
 
 
 %build
@@ -134,6 +131,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
 - fixup handbook install
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2009 10:45:01 -0000	1.9
+++ sources	7 Apr 2009 12:14:27 -0000	1.10
@@ -1 +1 @@
-1ee6818891745af896d0d397292f759d  konq-plugins-4.2.0.tar.bz2
+2d101c63aed29e67d19838708e7fc5e4  konq-plugins-4.2.2.tar.bz2


--- konq-plugins-4.2.0-fix_docs.patch DELETED ---



From mgrepl at fedoraproject.org  Tue Apr  7 12:15:40 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue,  7 Apr 2009 12:15:40 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.158,
	1.159 selinux-policy.spec, 1.786, 1.787
Message-ID: <20090407121540.3044870100@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19566

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Add qemu_use_comm boolean



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- policy-20080710.patch	3 Apr 2009 13:33:31 -0000	1.158
+++ policy-20080710.patch	7 Apr 2009 12:15:38 -0000	1.159
@@ -5844,7 +5844,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.13/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/apps/qemu.te	2009-02-26 15:42:13.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/apps/qemu.te	2009-04-06 22:47:33.000000000 +0200
 @@ -6,6 +6,9 @@
  # Declarations
  #
@@ -5855,7 +5855,7 @@
  ## <desc>
  ## <p>
  ## Allow qemu to connect fully to the network
-@@ -13,16 +16,120 @@
+@@ -13,16 +16,128 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
  
@@ -5880,6 +5880,14 @@
 +## </desc>
 +gen_tunable(qemu_use_usb, true)
 +
++## <desc>
++## <p>
++## Allow qemu to user serial/parallell communication ports
++## </p>
++## </desc>
++gen_tunable(qemu_use_comm, false)
++
++
  type qemu_exec_t;
  qemu_domain_template(qemu)
  application_domain(qemu_t, qemu_exec_t)
@@ -5976,10 +5984,15 @@
  tunable_policy(`qemu_full_network',`
  	allow qemu_t self:udp_socket create_socket_perms;
  
-@@ -35,6 +142,38 @@
+@@ -35,6 +150,43 @@
  	corenet_tcp_connect_all_ports(qemu_t)
  ')
  
++tunable_policy(`qemu_use_comm',`
++        term_use_unallocated_ttys(qemu_t)
++        dev_rw_printer(qemu_t)
++')
++
 +tunable_policy(`qemu_use_cifs',`
 +	fs_manage_cifs_dirs(qemu_t)
 +	fs_manage_cifs_files(qemu_t)
@@ -7200,7 +7213,7 @@
  network_port(xfs, tcp,7100,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.13/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/kernel/devices.fc	2009-04-03 15:22:46.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.fc	2009-04-07 09:18:47.000000000 +0200
 @@ -1,8 +1,9 @@
  
  /dev			-d	gen_context(system_u:object_r:device_t,s0)
@@ -7212,7 +7225,7 @@
  /dev/admmidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/adsp.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/(misc/)?agpgart	-c	gen_context(system_u:object_r:agp_device_t,s0)
-@@ -12,44 +13,65 @@
+@@ -12,44 +13,66 @@
  /dev/apm_bios		-c	gen_context(system_u:object_r:apm_bios_t,s0)
  /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -7250,6 +7263,7 @@
 +/dev/kqemu		-c	gen_context(system_u:object_r:qemu_device_t,s0)
 +/dev/kvm		-c	gen_context(system_u:object_r:kvm_device_t,s0)
 +/dev/lik.*		-c	gen_context(system_u:object_r:event_device_t,s0)
++/dev/lirc[0-9]+         -c      gen_context(system_u:object_r:lirc_device_t,s0)
  /dev/lircm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/logibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
@@ -7278,7 +7292,7 @@
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
  /dev/port		-c	gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
  /dev/(misc/)?psaux	-c	gen_context(system_u:object_r:mouse_device_t,s0)
-@@ -68,18 +90,20 @@
+@@ -68,18 +91,20 @@
  /dev/sndstat		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sonypi		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/tlk[0-3]		-c	gen_context(system_u:object_r:v4l_device_t,s0)
@@ -7302,7 +7316,7 @@
  /dev/vttuner		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/vtx.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/watchdog		-c	gen_context(system_u:object_r:watchdog_device_t,s0)
-@@ -91,14 +115,20 @@
+@@ -91,14 +116,20 @@
  
  /dev/cmx.*		-c	gen_context(system_u:object_r:smartcard_device_t,s0)
  
@@ -7324,7 +7338,7 @@
  /dev/input/event.*	-c	gen_context(system_u:object_r:event_device_t,s0)
  /dev/input/mice		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/input/js.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
-@@ -106,10 +136,15 @@
+@@ -106,10 +137,15 @@
  
  /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
  
@@ -7342,7 +7356,7 @@
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.13/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/kernel/devices.if	2009-04-03 10:50:33.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.if	2009-04-06 22:35:09.000000000 +0200
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1, device_t, device_node)
@@ -7535,7 +7549,7 @@
  ')
  
  ########################################
-@@ -1507,6 +1638,96 @@
+@@ -1507,6 +1638,151 @@
  
  ########################################
  ## <summary>
@@ -7627,12 +7641,67 @@
 +	rw_chr_files_pattern($1, device_t, kvm_device_t)
 +')
 +
++#######################################
++## <summary>
++##      Read the lirc device.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dev_read_lirc',`
++        gen_require(`
++                type device_t, lirc_device_t;
++        ')
++
++        read_chr_files_pattern($1, device_t, lirc_device_t)
++')
++
++#######################################
++## <summary>
++##      Read and write the lirc device.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dev_rw_lirc',`
++        gen_require(`
++                type device_t, lirc_device_t;
++        ')
++
++        rw_chr_files_pattern($1, device_t, lirc_device_t)
++')
++
++#######################################
++## <summary>
++##      Automatic type transition to the type
++##      for lirc device nodes when created in /dev.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dev_filetrans_lirc',`
++        gen_require(`
++                type device_t, lirc_device_t;
++        ')
++
++        filetrans_pattern($1, device_t, lirc_device_t, chr_file)
++')
++
 +########################################
 +## <summary>
  ##	Read the lvm comtrol device.
  ## </summary>
  ## <param name="domain">
-@@ -1958,6 +2179,96 @@
+@@ -1958,6 +2234,96 @@
  
  ########################################
  ## <summary>
@@ -7729,7 +7798,7 @@
  ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
-@@ -2104,6 +2415,98 @@
+@@ -2104,6 +2470,98 @@
  
  ########################################
  ## <summary>
@@ -7828,7 +7897,7 @@
  ##	Read from random number generator
  ##	devices (e.g., /dev/random)
  ## </summary>
-@@ -2142,6 +2545,25 @@
+@@ -2142,6 +2600,25 @@
  
  ########################################
  ## <summary>
@@ -7854,7 +7923,7 @@
  ##	Write to the random device (e.g., /dev/random). This adds
  ##	entropy used to generate the random data read from the
  ##	random device.
-@@ -2769,6 +3191,24 @@
+@@ -2769,6 +3246,24 @@
  
  ########################################
  ## <summary>
@@ -7879,7 +7948,7 @@
  ##	Read and write generic the USB devices.
  ## </summary>
  ## <param name="domain">
-@@ -2957,6 +3397,25 @@
+@@ -2957,6 +3452,25 @@
  	read_lnk_files_pattern($1, usbfs_t, usbfs_t)
  ')
  
@@ -7905,7 +7974,7 @@
  ########################################
  ## <summary>
  ##	Get the attributes of video4linux devices.
-@@ -3322,3 +3781,22 @@
+@@ -3322,3 +3836,22 @@
  
  	typeattribute $1 devices_unconfined_type;
  ')
@@ -7930,7 +7999,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.5.13/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/kernel/devices.te	2009-04-03 10:51:23.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.te	2009-04-07 00:12:12.000000000 +0200
 @@ -1,5 +1,5 @@
  
 -policy_module(devices, 1.7.0)
@@ -7951,7 +8020,7 @@
  type cardmgr_dev_t;
  dev_node(cardmgr_dev_t)
  files_tmp_file(cardmgr_dev_t)
-@@ -66,12 +72,25 @@
+@@ -66,12 +72,31 @@
  dev_node(framebuf_device_t)
  
  #
@@ -7974,10 +8043,16 @@
 +dev_node(kvm_device_t)
 +
 +#
++## Type for /dev/lirc
++##
++type lirc_device_t;
++dev_node(lirc_device_t)
++
++#
  # Type for /dev/mapper/control
  #
  type lvm_control_t;
-@@ -104,6 +123,12 @@
+@@ -104,6 +129,12 @@
  genfscon proc /mtrr gen_context(system_u:object_r:mtrr_device_t,s0)
  
  #
@@ -7990,7 +8065,7 @@
  # null_device_t is the type of /dev/null.
  #
  type null_device_t;
-@@ -128,6 +153,12 @@
+@@ -128,6 +159,12 @@
  mls_file_write_within_range(printer_device_t)
  
  #
@@ -8003,7 +8078,7 @@
  # random_device_t is the type of /dev/random
  #
  type random_device_t;
-@@ -157,6 +188,12 @@
+@@ -157,6 +194,12 @@
  genfscon sysfs / gen_context(system_u:object_r:sysfs_t,s0)
  
  #
@@ -16003,15 +16078,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.fc serefpolicy-3.5.13/policy/modules/services/dcc.fc
 --- nsaserefpolicy/policy/modules/services/dcc.fc	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/dcc.fc	2009-03-27 15:03:55.000000000 +0100
-@@ -10,6 +10,7 @@
- /usr/libexec/dcc/dccifd		--	gen_context(system_u:object_r:dccifd_exec_t,s0)
- /usr/libexec/dcc/dccm		--	gen_context(system_u:object_r:dccm_exec_t,s0)
++++ serefpolicy-3.5.13/policy/modules/services/dcc.fc	2009-04-06 13:11:38.000000000 +0200
+@@ -12,6 +12,8 @@
  
-+/var/lib/dcc(/.*)?   			gen_context(system_u:object_r:dcc_var_t,s0)
  /var/dcc(/.*)?				gen_context(system_u:object_r:dcc_var_t,s0)
  /var/dcc/map			--	gen_context(system_u:object_r:dcc_client_map_t,s0)
++/var/lib/dcc(/.*)?   			gen_context(system_u:object_r:dcc_var_t,s0)
++/var/lib/dcc/map		--	gen_context(system_u:object_r:dcc_client_map_t,s0)
  
+ /var/run/dcc(/.*)?			gen_context(system_u:object_r:dcc_var_run_t,s0)
+ /var/run/dcc/map		--	gen_context(system_u:object_r:dcc_client_map_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.5.13/policy/modules/services/dcc.if
 --- nsaserefpolicy/policy/modules/services/dcc.if	2008-10-17 14:49:11.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/services/dcc.if	2009-02-10 15:07:15.000000000 +0100
@@ -18406,8 +18482,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.5.13/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/services/lircd.te	2009-04-03 15:23:05.000000000 +0200
-@@ -0,0 +1,60 @@
++++ serefpolicy-3.5.13/policy/modules/services/lircd.te	2009-04-07 09:19:24.000000000 +0200
+@@ -0,0 +1,64 @@
 +policy_module(lircd,1.0.0)
 +
 +########################################
@@ -18440,6 +18516,7 @@
 +#
 +
 +allow lircd_t self:process signal;
++allow lircd_t self:fifo_file rw_fifo_file_perms;
 +allow lircd_t self:unix_dgram_socket create_socket_perms;
 +
 +# etc file
@@ -18454,6 +18531,9 @@
 +manage_sock_files_pattern(lircd_t, lircd_sock_t, lircd_sock_t)
 +dev_filetrans(lircd_t, lircd_sock_t, sock_file )
 +
++dev_filetrans_lirc(lircd_t)
++dev_rw_lirc(lircd_t)
++
 +files_read_etc_files(lircd_t)
 +
 +files_list_var(lircd_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- selinux-policy.spec	30 Mar 2009 14:56:27 -0000	1.786
+++ selinux-policy.spec	7 Apr 2009 12:15:39 -0000	1.787
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -460,6 +460,9 @@
 %endif
 
 %changelog
+* Tue Apr 7 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-55
+- Allow swat_t domtrans to smbd_t
+
 * Mon Mar 30 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-54
 - Allow bitlbee_t to read /proc/meminfo
 - Fix lircd policy



From tagoh at fedoraproject.org  Tue Apr  7 12:15:40 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  7 Apr 2009 12:15:40 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.13, 1.14 imsettings.spec, 1.27, 
	1.28 sources, 1.12, 1.13 imsettings-xim-fixes.patch, 1.2, NONE
Message-ID: <20090407121540.0D25B70100@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19619

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	imsettings-xim-fixes.patch 
Log Message:
* Tue Apr  7 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-1
- New upstream release.
  - Fix a freeze issue on X applications with switching IM (#488877)
  - Fix a segfault issue with switching IM (#488899)
  - Fix not creating .xinputrc with disabiling IM first time (#490587)
  - Invoke IM for certain locales. (#493406)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Mar 2009 10:13:19 -0000	1.13
+++ .cvsignore	7 Apr 2009 12:15:09 -0000	1.14
@@ -12,3 +12,4 @@
 imsettings-0.105.1.tar.bz2
 imsettings-0.106.0.tar.bz2
 imsettings-0.106.1.tar.bz2
+imsettings-0.106.2.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- imsettings.spec	18 Mar 2009 07:32:48 -0000	1.27
+++ imsettings.spec	7 Apr 2009 12:15:09 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	0.106.1
-Release:	2%{?dist}
+Version:	0.106.2
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,7 +15,6 @@
 # workaround for KDE, it will be removed when we have a correct fix
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
-Patch1:		imsettings-xim-fixes.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -81,7 +80,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
-%patch1 -p0 -b .1-xim-fixes
 
 %build
 %configure	\
@@ -199,6 +197,13 @@
 
 
 %changelog
+* Tue Apr  7 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-1
+- New upstream release.
+  - Fix a freeze issue on X applications with switching IM (#488877)
+  - Fix a segfault issue with switching IM (#488899)
+  - Fix not creating .xinputrc with disabiling IM first time (#490587)
+  - Invoke IM for certain locales. (#493406)
+
 * Wed Mar 18 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.1-2
 - Fix XIM-related issues.
 - Fix a parser error during reading Compose data. (#484142)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Mar 2009 10:13:19 -0000	1.12
+++ sources	7 Apr 2009 12:15:09 -0000	1.13
@@ -1 +1 @@
-c561896f78388e5cab13f95fa9996259  imsettings-0.106.1.tar.bz2
+d7f713a1b0d621aae7f5cc4b72f08c6e  imsettings-0.106.2.tar.bz2


--- imsettings-xim-fixes.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Apr  7 12:20:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:20:50 +0000 (UTC)
Subject: rpms/konq-plugins/F-10 konq-plugins.spec, 1.13, 1.14 sources, 1.9,
	1.10
Message-ID: <20090407122050.75D8970100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20875/F-10

Modified Files:
	konq-plugins.spec sources 
Log Message:
sync with devel (4.2.2)



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/konq-plugins.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- konq-plugins.spec	22 Feb 2009 22:50:27 -0000	1.13
+++ konq-plugins.spec	7 Apr 2009 12:20:20 -0000	1.14
@@ -1,17 +1,18 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.0
-Release:        2%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
-Patch0:         konq-plugins-4.2.0-fsview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         konq-plugins-4.2.0-fsview.patch
+
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -19,9 +20,6 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdebase4 >= 4.2
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 %description
 Some additional plugins that interact with konqueror
 * adblock: AdBlock plugin
@@ -85,12 +83,20 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %files -f %{name}.lang 
@@ -112,7 +118,6 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_docdir}/HTML/en/doc/
 %{_kde4_docdir}/HTML/en/konq-plugins/
 %lang(ca) %{_kde4_docdir}/HTML/ca/konq-plugins/
 %lang(de) %{_kde4_docdir}/HTML/de/konq-plugins/
@@ -126,6 +131,16 @@
 
 
 %changelog
+* Tue Apr  7 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
+- fixup handbook install
+- optimize scriptlets
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - update %%description
 - Requires: kdebase4 >= 4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Feb 2009 22:50:28 -0000	1.9
+++ sources	7 Apr 2009 12:20:20 -0000	1.10
@@ -1 +1 @@
-1ee6818891745af896d0d397292f759d  konq-plugins-4.2.0.tar.bz2
+2d101c63aed29e67d19838708e7fc5e4  konq-plugins-4.2.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Apr  7 12:20:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:20:50 +0000 (UTC)
Subject: rpms/konq-plugins/F-9 konq-plugins.spec,1.15,1.16 sources,1.8,1.9
Message-ID: <20090407122050.B795470100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20875/F-9

Modified Files:
	konq-plugins.spec sources 
Log Message:
sync with devel (4.2.2)



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- konq-plugins.spec	23 Feb 2009 15:48:32 -0000	1.15
+++ konq-plugins.spec	7 Apr 2009 12:20:20 -0000	1.16
@@ -1,17 +1,18 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.0
-Release:        2%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
-Patch0:         konq-plugins-4.2.0-fsview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         konq-plugins-4.2.0-fsview.patch
+
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -19,9 +20,6 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdebase4 >= 4.2
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 %description
 Some additional plugins that interact with konqueror
 * adblock: AdBlock plugin
@@ -85,12 +83,20 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %files -f %{name}.lang 
@@ -112,7 +118,6 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_docdir}/HTML/en/doc/
 %{_kde4_docdir}/HTML/en/konq-plugins/
 %lang(ca) %{_kde4_docdir}/HTML/ca/konq-plugins/
 %lang(de) %{_kde4_docdir}/HTML/de/konq-plugins/
@@ -126,6 +131,16 @@
 
 
 %changelog
+* Tue Apr  7 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
+- fixup handbook install
+- optimize scriptlets
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - update %%description
 - Requires: kdebase4 >= 4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Feb 2009 15:48:32 -0000	1.8
+++ sources	7 Apr 2009 12:20:20 -0000	1.9
@@ -1 +1 @@
-1ee6818891745af896d0d397292f759d  konq-plugins-4.2.0.tar.bz2
+2d101c63aed29e67d19838708e7fc5e4  konq-plugins-4.2.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Apr  7 12:22:18 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:22:18 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec, 1.24,
	1.25 konq-plugins-4.2.0-fsview.patch, 1.1, NONE
Message-ID: <20090407122218.D44E670100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21347

Modified Files:
	konq-plugins.spec 
Removed Files:
	konq-plugins-4.2.0-fsview.patch 
Log Message:
drop upstream patch



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- konq-plugins.spec	7 Apr 2009 12:14:27 -0000	1.24
+++ konq-plugins.spec	7 Apr 2009 12:21:48 -0000	1.25
@@ -11,8 +11,6 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         konq-plugins-4.2.0-fsview.patch
-
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -48,7 +46,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fsview
 
 
 %build


--- konq-plugins-4.2.0-fsview.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Apr  7 12:24:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:24:38 +0000 (UTC)
Subject: rpms/konq-plugins/F-10 konq-plugins.spec, 1.14,
	1.15 konq-plugins-4.2.0-fsview.patch, 1.1, NONE
Message-ID: <20090407122438.0D77670100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21884/F-10

Modified Files:
	konq-plugins.spec 
Removed Files:
	konq-plugins-4.2.0-fsview.patch 
Log Message:
drop upstream patches



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/konq-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- konq-plugins.spec	7 Apr 2009 12:20:20 -0000	1.14
+++ konq-plugins.spec	7 Apr 2009 12:24:07 -0000	1.15
@@ -11,8 +11,6 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         konq-plugins-4.2.0-fsview.patch
-
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -48,7 +46,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fsview
 
 
 %build


--- konq-plugins-4.2.0-fsview.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Apr  7 12:24:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:24:38 +0000 (UTC)
Subject: rpms/konq-plugins/F-9 konq-plugins.spec, 1.16,
	1.17 konq-plugins-4.2.0-fsview.patch, 1.1, NONE
Message-ID: <20090407122438.3E42470100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21884/F-9

Modified Files:
	konq-plugins.spec 
Removed Files:
	konq-plugins-4.2.0-fsview.patch 
Log Message:
drop upstream patches



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- konq-plugins.spec	7 Apr 2009 12:20:20 -0000	1.16
+++ konq-plugins.spec	7 Apr 2009 12:24:08 -0000	1.17
@@ -11,8 +11,6 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         konq-plugins-4.2.0-fsview.patch
-
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -48,7 +46,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fsview
 
 
 %build


--- konq-plugins-4.2.0-fsview.patch DELETED ---



From akurtakov at fedoraproject.org  Tue Apr  7 12:29:30 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  7 Apr 2009 12:29:30 +0000 (UTC)
Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.17,1.18
Message-ID: <20090407122930.0E4D470100@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-gef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23013/devel

Modified Files:
	eclipse-gef.spec 
Log Message:
- Fix directory ownership.
- Drop gcj support.


Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- eclipse-gef.spec	23 Mar 2009 16:43:05 -0000	1.17
+++ eclipse-gef.spec	7 Apr 2009 12:28:59 -0000	1.18
@@ -1,10 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
 %define eclipse_dropin   %{_datadir}/eclipse/dropins/gef
-%define gcj_support      1
 
 Name:      eclipse-gef
 Version:   3.4.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -18,14 +17,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildArch:        noarch
-%endif
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:3.4.2
@@ -86,25 +78,15 @@
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -d %{buildroot}%{eclipse_dropin} build/rpmBuild/org.eclipse.gef.all.zip
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%post sdk -p %{_bindir}/rebuild-gcj-db
-%post examples -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%postun sdk -p %{_bindir}/rebuild-gcj-db
-%postun examples -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 %dir %{eclipse_dropin}
+%dir %{eclipse_dropin}/eclipse
+%dir %{eclipse_dropin}/eclipse/features
+%dir %{eclipse_dropin}/eclipse/plugins
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
 %doc %{eclipse_dropin}/eclipse/notice.html
 %doc %{eclipse_dropin}/eclipse/readme
@@ -117,14 +99,6 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.core_*
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.layouts_*
 
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.gef_*
-%{_libdir}/gcj/%{name}/org.eclipse.draw2d_*
-%{_libdir}/gcj/%{name}/org.eclipse.zest.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.zest.layouts_*
-%endif
-
 %files sdk
 %defattr(-,root,root,-)
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
@@ -143,10 +117,6 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.draw2d.source_*
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.source_*
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.ui.pde_*
-%endif
-
 %files examples
 %defattr(-,root,root,-)
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
@@ -160,14 +130,11 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.source_*
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.text_*
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.flow_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.logic_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.shapes_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.text_*
-%endif
-
 %changelog
+* Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 3.4.2-3
+- Fix directory ownership.
+- Drop gcj support.
+
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 3.4.2-2
 - Rebuild to not ship p2 context.xml.
 - Remove context.xml from %%files section.



From ltinkl at fedoraproject.org  Tue Apr  7 12:31:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:31:19 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.25,1.26
Message-ID: <20090407123119.BC96C70100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23316

Modified Files:
	konq-plugins.spec 
Log Message:
drop microformat (no longer used?)



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- konq-plugins.spec	7 Apr 2009 12:21:48 -0000	1.25
+++ konq-plugins.spec	7 Apr 2009 12:30:49 -0000	1.26
@@ -33,7 +33,6 @@
 * kimggalleryplugin:  Creates an HTML page with thumbnails of
   all the images in the current directory.
 * mediarealfolder:  service menu to open a medium mountpoints
-* microformat:
 * minitools: Implement bookmarklets into konqueror
 * rellinks: Allows access to relations defined in the header of a document
 * searchbar: Search Bar
@@ -108,7 +107,6 @@
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
-%{_kde4_appsdir}/microformat/
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*



From ltinkl at fedoraproject.org  Tue Apr  7 12:46:01 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:46:01 +0000 (UTC)
Subject: rpms/konq-plugins/F-10 konq-plugins.spec,1.15,1.16
Message-ID: <20090407124601.1479C70100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27432/F-10

Modified Files:
	konq-plugins.spec 
Log Message:
sync with devel



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/konq-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- konq-plugins.spec	7 Apr 2009 12:24:07 -0000	1.15
+++ konq-plugins.spec	7 Apr 2009 12:45:30 -0000	1.16
@@ -33,7 +33,6 @@
 * kimggalleryplugin:  Creates an HTML page with thumbnails of
   all the images in the current directory.
 * mediarealfolder:  service menu to open a medium mountpoints
-* microformat:
 * minitools: Implement bookmarklets into konqueror
 * rellinks: Allows access to relations defined in the header of a document
 * searchbar: Search Bar
@@ -108,7 +107,6 @@
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
-%{_kde4_appsdir}/microformat/
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*



From ltinkl at fedoraproject.org  Tue Apr  7 12:46:01 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  7 Apr 2009 12:46:01 +0000 (UTC)
Subject: rpms/konq-plugins/F-9 konq-plugins.spec,1.17,1.18
Message-ID: <20090407124601.381C270137@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27432/F-9

Modified Files:
	konq-plugins.spec 
Log Message:
sync with devel



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- konq-plugins.spec	7 Apr 2009 12:24:08 -0000	1.17
+++ konq-plugins.spec	7 Apr 2009 12:45:31 -0000	1.18
@@ -33,7 +33,6 @@
 * kimggalleryplugin:  Creates an HTML page with thumbnails of
   all the images in the current directory.
 * mediarealfolder:  service menu to open a medium mountpoints
-* microformat:
 * minitools: Implement bookmarklets into konqueror
 * rellinks: Allows access to relations defined in the header of a document
 * searchbar: Search Bar
@@ -108,7 +107,6 @@
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
-%{_kde4_appsdir}/microformat/
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*



From kasal at fedoraproject.org  Tue Apr  7 12:51:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  7 Apr 2009 12:51:29 +0000 (UTC)
Subject: rpms/perl/devel perl-update-CGI.patch, 1.1, 1.2 perl.spec, 1.215,
	1.216 perl-CGI-escape.patch, 1.1, NONE
Message-ID: <20090407125129.490DA70100@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29169

Modified Files:
	perl-update-CGI.patch perl.spec 
Removed Files:
	perl-CGI-escape.patch 
Log Message:
update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch

perl-update-CGI.patch:

Index: perl-update-CGI.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl-update-CGI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-update-CGI.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-CGI.patch	7 Apr 2009 12:51:28 -0000	1.2
@@ -1,8 +1,8 @@
-CGI.pm-3.42
+CGI.pm-3.43
 
 diff -urN perl-5.10.0.orig/lib/CGI/Carp.pm perl-5.10.0/lib/CGI/Carp.pm
---- perl-5.10.0.orig/lib/CGI/Carp.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Carp.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Carp.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Carp.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -323,7 +323,7 @@
  
  $main::SIG{__WARN__}=\&CGI::Carp::warn;
@@ -21,9 +21,13 @@
          print STDOUT $mess;
      }
 diff -urN perl-5.10.0.orig/lib/CGI/Changes perl-5.10.0/lib/CGI/Changes
---- perl-5.10.0.orig/lib/CGI/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Changes	2009-02-13 18:09:15.000000000 +0100
-@@ -1,3 +1,70 @@
+--- perl-5.10.0.orig/lib/CGI/Changes	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Changes	2009-04-07 14:36:12.000000000 +0200
+@@ -1,3 +1,74 @@
++  Version 3.43
++  1. Documentation patch from MARKSTOS at cpan.org to replace all occurrences of
++  "new CGI" with CGI->new()" to reflect best perl practices.
++  2. Patch from Stepan Kasal to fix utf-8 related problems in perl 5.10
 +
 +  Version 3.42
 +  1. Added patch from Renee Baecker that makes it possible to subclass
@@ -95,8 +99,8 @@
    1. The position of file handles is now reset to zero when CGI->new is called.
      (Mark Stosberg)
 diff -urN perl-5.10.0.orig/lib/CGI/Cookie.pm perl-5.10.0/lib/CGI/Cookie.pm
---- perl-5.10.0.orig/lib/CGI/Cookie.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Cookie.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Cookie.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Cookie.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -13,7 +13,7 @@
  # wish, but if you redistribute a modified version, please attach a note
  # listing the modifications you have made.
@@ -125,8 +129,8 @@
      s/\s*(.*?)\s*/$1/;
      my($key,$value) = split("=",$_,2);
 diff -urN perl-5.10.0.orig/lib/CGI/Fast.pm perl-5.10.0/lib/CGI/Fast.pm
---- perl-5.10.0.orig/lib/CGI/Fast.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Fast.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Fast.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Fast.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -55,6 +55,7 @@
       }
       }
@@ -172,8 +176,8 @@
      &do_some_initialization();
      while ($q = new CGI::Fast) {
 diff -urN perl-5.10.0.orig/lib/CGI/Pretty.pm perl-5.10.0/lib/CGI/Pretty.pm
---- perl-5.10.0.orig/lib/CGI/Pretty.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Pretty.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Pretty.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Pretty.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -176,6 +176,35 @@
  }
  sub _reset_globals { initialize_globals(); }
@@ -210,45 +214,9 @@
  1;
  
  =head1 NAME
-diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
---- perl-5.10.0.orig/lib/CGI/t/request.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/t/request.t	2009-02-13 18:09:57.000000000 +0100
-@@ -4,7 +4,7 @@
- ######################### We start with some black magic to print on failure.
- use lib '.','../blib/lib','../blib/arch';
- 
--BEGIN {$| = 1; print "1..33\n"; }
-+BEGIN {$| = 1; print "1..34\n"; }
- END {print "not ok 1\n" unless $loaded;}
- use CGI ();
- use Config;
-@@ -74,6 +74,7 @@
- test(29,$p->{bar} eq 'froz',"tied interface fetch");
- $p->{bar} = join("\0",qw(foo bar baz));
- test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
-+test(31,exists $p->{bar});
- 
- # test posting
- $q->_reset_globals;
-@@ -88,11 +89,11 @@
-     exit 0;
-   }
-   # at this point, we're in a new (child) process
--  test(31,$q=new CGI,"CGI::new() from POST");
--  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
--  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
-+  test(32,$q=new CGI,"CGI::new() from POST");
-+  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
-+  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
- } else {
--  print "ok 31 # Skip\n";
-   print "ok 32 # Skip\n";
-   print "ok 33 # Skip\n";
-+  print "ok 34 # Skip\n";
- }
 diff -urN perl-5.10.0.orig/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
---- perl-5.10.0.orig/lib/CGI/Util.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Util.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Util.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Util.pm	2009-04-07 14:36:12.000000000 +0200
 @@ -4,7 +4,7 @@
  use vars qw($VERSION @EXPORT_OK @ISA $EBCDIC @A2E @E2A);
  require Exporter;
@@ -340,7 +308,11 @@
          if ($c < 0x80) {
                  return sprintf("%c", $c);
          } elsif ($c < 0x800) {
-@@ -189,6 +214,17 @@
+@@ -185,10 +210,20 @@
+   my $todecode = shift;
+   return undef unless defined($todecode);
+   $todecode =~ tr/+/ /;       # pluses become spaces
+-    $EBCDIC = "\t" ne "\011";
      if ($EBCDIC) {
        $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
      } else {
@@ -358,23 +330,118 @@
        $todecode =~ s/%(?:([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/
  	defined($1)? chr hex($1) : utf8_chr(hex($2))/ge;
      }
-@@ -200,8 +236,12 @@
+@@ -196,12 +231,24 @@
+ }
+ 
+ # URL-encode data
++#
++# We cannot use the %u escapes, they were rejected by W3C, so the official
++# way is %XX-escaped utf-8 encoding.
++# Naturally, Unicode strings have to be converted to their utf-8 byte
++# representation.  (No action is required on 5.6.)
++# Byte strings were traditionally used directly as a sequence of octets.
++# This worked if they actually represented binary data (i.e. in CGI::Compress).
++# This also worked if these byte strings were actually utf-8 encoded; e.g.,
++# when the source file used utf-8 without the apropriate "use utf8;".
++# This fails if the byte string is actually a Latin 1 encoded string, but it
++# was always so and cannot be fixed without breaking the binary data case.
++# -- Stepan Kasal <skasal at redhat.com>
++#
+ sub escape {
    shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
    my $toencode = shift;
    return undef unless defined($toencode);
-+  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
-   # force bytes while preserving backward compatibility -- dankogai
+-  # force bytes while preserving backward compatibility -- dankogai
 -  $toencode = pack("C*", unpack("U0C*", $toencode));
-+  # but commented out because it was breaking CGI::Compress -- lstein
-+  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
++  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
      if ($EBCDIC) {
        $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
      } else {
+diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
+--- perl-5.10.0.orig/lib/CGI/t/request.t	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/t/request.t	2009-04-07 14:36:05.000000000 +0200
+@@ -4,7 +4,7 @@
+ ######################### We start with some black magic to print on failure.
+ use lib '.','../blib/lib','../blib/arch';
+ 
+-BEGIN {$| = 1; print "1..33\n"; }
++BEGIN {$| = 1; print "1..34\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ use CGI ();
+ use Config;
+@@ -74,6 +74,7 @@
+ test(29,$p->{bar} eq 'froz',"tied interface fetch");
+ $p->{bar} = join("\0",qw(foo bar baz));
+ test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
++test(31,exists $p->{bar});
+ 
+ # test posting
+ $q->_reset_globals;
+@@ -88,11 +89,11 @@
+     exit 0;
+   }
+   # at this point, we're in a new (child) process
+-  test(31,$q=new CGI,"CGI::new() from POST");
+-  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
+-  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
++  test(32,$q=new CGI,"CGI::new() from POST");
++  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
++  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
+ } else {
+-  print "ok 31 # Skip\n";
+   print "ok 32 # Skip\n";
+   print "ok 33 # Skip\n";
++  print "ok 34 # Skip\n";
+ }
+diff -urN perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
+--- perl-5.10.0.orig/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
++++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-07 14:36:12.000000000 +0200
+@@ -1,16 +1,29 @@
++# test CGI::Util::escape
++use Test::More tests => 4;
++use_ok("CGI::Util");
++
++# Byte strings should be escaped byte by byte:
++# 1) not a valid utf-8 sequence:
++my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
++is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
++
++# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
++#    This happens often: people write utf-8 strings to source, but forget
++#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
++#    have to handle it gracefully, for compatibility with GCI.pm under
++#    perl-5.8.x
+ #
+-# This tests CGI::Util::escape() when fed with UTF-8-flagged string
+-# -- dankogai
+-BEGIN {
+-    if ($] < 5.008) {
+-       print "1..0 # \$] == $] < 5.008\n";
+-       exit(0);
+-    }
+-}
++$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
++is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
++	"Escape an utf-8 byte string");
+ 
+-use Test::More tests => 2;
+-use_ok("CGI::Util");
+-my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
+-is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+-   "# Escape string with UTF-8 flag");
++SKIP:
++{
++	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
++	# -- dankogai
++	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
++	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
++	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
++   		"Escape string with UTF-8 flag");
++}
+ __END__
 diff -urN perl-5.10.0.orig/lib/CGI.pm perl-5.10.0/lib/CGI.pm
---- perl-5.10.0.orig/lib/CGI.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI.pm	2009-02-13 18:08:55.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI.pm	2009-04-07 14:36:12.000000000 +0200
 @@ -18,13 +18,13 @@
  # The most recent version and complete docs are available at:
  #   http://stein.cshl.org/WWW/software/CGI/
@@ -382,7 +449,7 @@
 -$CGI::revision = '$Id$';
 -$CGI::VERSION='3.29';
 +$CGI::revision = '$Id$';
-+$CGI::VERSION='3.42';
++$CGI::VERSION='3.43';
  
  # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
  # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
@@ -439,6 +506,28 @@
  			   embed basefont style span layer ilayer font frameset frame script small big Area Map/],
                  ':html4'=>[qw/abbr acronym bdo col colgroup del fieldset iframe
                              ins label legend noframes noscript object optgroup Q 
+@@ -293,10 +294,10 @@
+     # To allow overriding, search through the packages
+     # Till we find one in which the correct subroutine is defined.
+     my @packages = ($self,@{"$self\:\:ISA"});
+-    foreach $sym (keys %EXPORT) {
++    for $sym (keys %EXPORT) {
+ 	my $pck;
+ 	my $def = ${"$self\:\:AutoloadClass"} || $DefaultClass;
+-	foreach $pck (@packages) {
++	for $pck (@packages) {
+ 	    if (defined(&{"$pck\:\:$sym"})) {
+ 		$def = $pck;
+ 		last;
+@@ -316,7 +317,7 @@
+     return ("start_$1","end_$1") if $tag=~/^(?:\*|start_|end_)(.+)/;
+     my(@r);
+     return ($tag) unless $EXPORT_TAGS{$tag};
+-    foreach (@{$EXPORT_TAGS{$tag}}) {
++    for (@{$EXPORT_TAGS{$tag}}) {
+ 	push(@r,&expand_tags($_));
+     }
+     return @r;
 @@ -352,6 +353,7 @@
        $self->r(Apache->request) unless $self->r;
        my $r = $self->r;
@@ -455,7 +544,24 @@
      }
      undef $NPH;
    }
-@@ -437,23 +440,22 @@
+@@ -378,7 +381,7 @@
+ sub DESTROY {
+   my $self = shift;
+   if ($OS eq 'WINDOWS') {
+-    foreach my $href (values %{$self->{'.tmpfiles'}}) {
++    for my $href (values %{$self->{'.tmpfiles'}}) {
+       $href->{hndl}->DESTROY if defined $href->{hndl};
+       $href->{name}->DESTROY if defined $href->{name};
+     }
+@@ -430,30 +433,29 @@
+ 	if (substr($p[0],0,1) eq '-') {
+ 	    @values = defined($value) ? (ref($value) && ref($value) eq 'ARRAY' ? @{$value} : $value) : ();
+ 	} else {
+-	    foreach ($value, at other) {
++	    for ($value, at other) {
+ 		push(@values,$_) if defined($_);
+ 	    }
+ 	}
  	# If values is provided, then we set it.
  	if (@values or defined $value) {
  	    $self->add_parameter($name);
@@ -488,6 +594,15 @@
  }
  
  sub self_or_default {
+@@ -486,7 +488,7 @@
+ 
+ # Initialize the query object from the environment.
+ # If a parameter list is found, this object will be set
+-# to an associative array in which parameter names are keys
++# to a hash in which parameter names are keys
+ # and the values are stored as lists
+ # If a keyword list is found, this method creates a bogus
+ # parameter list with the single parameter 'keywords'.
 @@ -574,14 +576,14 @@
                        $self->add_parameter($param);
                        $self->read_from_client(\$value,$content_length,0)
@@ -505,6 +620,15 @@
                        if ($MOD_PERL) {
                                $query_string = $self->r->args;
                        } else {
+@@ -601,7 +603,7 @@
+ 	      last METHOD;
+ 	  }
+ 	  if (ref($initializer) && ref($initializer) eq 'HASH') {
+-	      foreach (keys %$initializer) {
++	      for (keys %$initializer) {
+ 		  $self->param('-name'=>$_,'-value'=>$initializer->{$_});
+ 	      }
+ 	      last METHOD;
 @@ -641,7 +643,7 @@
  	  last METHOD;
        }
@@ -540,15 +664,39 @@
  	}
      }
  
-@@ -752,7 +754,7 @@
+@@ -695,9 +697,9 @@
+       $self->delete_all();
+     }
+ 
+-    # Associative array containing our defined fieldnames
++    # hash containing our defined fieldnames
+     $self->{'.fieldnames'} = {};
+-    foreach ($self->param('.cgifields')) {
++    for ($self->param('.cgifields')) {
+ 	$self->{'.fieldnames'}->{$_}++;
+     }
+     
+@@ -750,9 +752,9 @@
+     # again, we initialize ourselves in exactly the same way.  This allows
+     # us to have several of these objects.
      @QUERY_PARAM = $self->param; # save list of parameters
-     foreach (@QUERY_PARAM) {
+-    foreach (@QUERY_PARAM) {
++    for (@QUERY_PARAM) {
        next unless defined $_;
 -      $QUERY_PARAM{$_}=$self->{$_};
 +      $QUERY_PARAM{$_}=$self->{param}{$_};
      }
      $QUERY_CHARSET = $self->charset;
      %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}};
+@@ -763,7 +765,7 @@
+     my($self,$tosplit) = @_;
+     my(@pairs) = split(/[&;]/,$tosplit);
+     my($param,$value);
+-    foreach (@pairs) {
++    for (@pairs) {
+ 	($param,$value) = split('=',$_,2);
+ 	next unless defined $param;
+ 	next if $NO_UNDEF_PARAMS and not defined $value;
 @@ -771,7 +773,7 @@
  	$param = unescape($param);
  	$value = unescape($value);
@@ -567,7 +715,15 @@
  }
  
  sub all_parameters {
-@@ -904,6 +906,7 @@
+@@ -897,13 +899,14 @@
+     # to avoid reexporting unwanted variables
+     undef %EXPORT;
+ 
+-    foreach (@_) {
++    for (@_) {
+ 	$HEADERS_ONCE++,         next if /^[:-]unique_headers$/;
+ 	$NPH++,                  next if /^[:-]nph$/;
+ 	$NOSTICKY++,             next if /^[:-]nosticky$/;
  	$DEBUG=0,                next if /^[:-]no_?[Dd]ebug$/;
  	$DEBUG=2,                next if /^[:-][Dd]ebug$/;
  	$USE_PARAM_SEMICOLONS++, next if /^[:-]newstyle_urls$/;
@@ -575,15 +731,45 @@
  	$XHTML++,                next if /^[:-]xhtml$/;
  	$XHTML=0,                next if /^[:-]no_?xhtml$/;
  	$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
-@@ -1005,7 +1008,7 @@
+@@ -925,7 +928,7 @@
+ 	    next;
+ 	}
+ 
+-	foreach (&expand_tags($_)) {
++	for (&expand_tags($_)) {
+ 	    tr/a-zA-Z0-9_//cd;  # don't allow weird function names
+ 	    $EXPORT{$_}++;
+ 	}
+@@ -1003,9 +1006,9 @@
+     my(@names) = rearrange([NAME], at p);
+     my @to_delete = ref($names[0]) eq 'ARRAY' ? @$names[0] : @names;
      my %to_delete;
-     foreach my $name (@to_delete)
+-    foreach my $name (@to_delete)
++    for my $name (@to_delete)
      {
 -        CORE::delete $self->{$name};
 +        CORE::delete $self->{param}{$name};
          CORE::delete $self->{'.fieldnames'}->{$name};
          $to_delete{$name}++;
      }
+@@ -1025,7 +1028,7 @@
+     die "Can't import names into \"main\"\n" if \%{"${namespace}::"} == \%::;
+     if ($delete || $MOD_PERL || exists $ENV{'FCGI_ROLE'}) {
+ 	# can anyone find an easier way to do this?
+-	foreach (keys %{"${namespace}::"}) {
++	for (keys %{"${namespace}::"}) {
+ 	    local *symbol = "${namespace}::${_}";
+ 	    undef $symbol;
+ 	    undef @symbol;
+@@ -1033,7 +1036,7 @@
+ 	}
+     }
+     my($param, at value,$var);
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	# protect against silly names
+ 	($var = $param)=~tr/a-zA-Z0-9_/_/c;
+ 	$var =~ s/^(?=\d)/_/;
 @@ -1054,8 +1057,8 @@
  sub keywords {
      my($self, at values) = self_or_default(@_);
@@ -613,6 +799,47 @@
      }
      return $self->param($name);
  }
+@@ -1267,7 +1270,7 @@
+ 	if ($ENV{QUERY_STRING} =~ /=/) {
+ 	    my(@pairs) = split(/[&;]/,$ENV{QUERY_STRING});
+ 	    my($param,$value);
+-	    foreach (@pairs) {
++	    for (@pairs) {
+ 		($param,$value) = split('=',$_,2);
+ 		$param = unescape($param);
+ 		$value = unescape($value);
+@@ -1295,11 +1298,11 @@
+     my($param,$value, at result);
+     return '<ul></ul>' unless $self->param;
+     push(@result,"<ul>");
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($name)=$self->escapeHTML($param);
+ 	push(@result,"<li><strong>$param</strong></li>");
+ 	push(@result,"<ul>");
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    $value = $self->escapeHTML($value);
+             $value =~ s/\n/<br \/>\n/g;
+ 	    push(@result,"<li>$value</li>");
+@@ -1332,14 +1335,14 @@
+     my($param);
+     local($,) = '';  # set print field separator back to a sane value
+     local($\) = '';  # set output line separator to a sane value
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($escaped_param) = escape($param);
+ 	my($value);
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    print $filehandle "$escaped_param=",escape("$value"),"\n";
+ 	}
+     }
+-    foreach (keys %{$self->{'.fieldnames'}}) {
++    for (keys %{$self->{'.fieldnames'}}) {
+           print $filehandle ".cgifields=",escape("$_"),"\n";
+     }
+     print $filehandle "=\n";    # end of record
 @@ -1378,7 +1381,7 @@
  'multipart_init' => <<'END_OF_FUNC',
  sub multipart_init {
@@ -622,6 +849,33 @@
      $boundary = $boundary || '------- =_aaaaaaaaaa0';
      $self->{'separator'} = "$CRLF--$boundary$CRLF";
      $self->{'final_separator'} = "$CRLF--$boundary--$CRLF";
+@@ -1408,7 +1411,7 @@
+ 
+     # rearrange() was designed for the HTML portion, so we
+     # need to fix it up a little.
+-    foreach (@other) {
++    for (@other) {
+         # Don't use \s because of perl bug 21951
+         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
+ 	($_ = $header) =~ s/^(\w)(.*)/$1 . lc ($2) . ': '.$self->unescapeHTML($value)/e;
+@@ -1477,7 +1480,7 @@
+ 
+     # rearrange() was designed for the HTML portion, so we
+     # need to fix it up a little.
+-    foreach (@other) {
++    for (@other) {
+         # Don't use \s because of perl bug 21951
+         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
+         ($_ = $header) =~ s/^(\w)(.*)/"\u$1\L$2" . ': '.$self->unescapeHTML($value)/e;
+@@ -1503,7 +1506,7 @@
+     # push all the cookies -- there may be several
+     if ($cookie) {
+ 	my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie;
+-	foreach (@cookie) {
++	for (@cookie) {
+             my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
+ 	    push(@header,"Set-Cookie: $cs") if $cs ne '';
+ 	}
 @@ -1519,7 +1522,7 @@
      push(@header,map {ucfirst $_} @other);
      push(@header,"Content-Type: $type") if $type ne '';
@@ -631,7 +885,21 @@
          $self->r->send_cgi_header($header);
          return '';
      }
-@@ -1663,12 +1666,22 @@
+@@ -1556,7 +1559,7 @@
+     $status = '302 Found' unless defined $status;
+     $url ||= $self->self_url;
+     my(@o);
+-    foreach (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
++    for (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
+     unshift(@o,
+ 	 '-Status'  => $status,
+ 	 '-Location'=> $url,
+@@ -1659,16 +1662,26 @@
+     }
+ 
+     if ($meta && ref($meta) && (ref($meta) eq 'HASH')) {
+-	foreach (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
++	for (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
  			: qq(<meta name="$_" content="$meta->{$_}">)); }
      }
  
@@ -664,7 +932,7 @@
  
      for my $s (@s) {
        if (ref($s)) {
-@@ -1708,7 +1722,7 @@
+@@ -1708,11 +1722,11 @@
                         ref($s) eq 'ARRAY' ? @$s : %$s));
         my $type = defined $stype ? $stype : 'text/css';
         my $rel  = $alternate ? 'alternate stylesheet' : 'stylesheet';
@@ -673,6 +941,33 @@
  
         if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference
         { # If it is, push a LINK tag for each one
+-           foreach $src (@$src)
++           for $src (@$src)
+          {
+            push(@result,$XHTML ? qq(<link rel="$rel" type="$type" href="$src" $other/>)
+                              : qq(<link rel="$rel" type="$type" href="$src"$other>)) if $src;
+@@ -1726,10 +1740,10 @@
+         }
+      if ($verbatim) {
+            my @v = ref($verbatim) eq 'ARRAY' ? @$verbatim : $verbatim;
+-           push(@result, "<style type=\"text/css\">\n$_\n</style>") foreach @v;
++           push(@result, "<style type=\"text/css\">\n$_\n</style>") for @v;
+       }
+       my @c = ref($code) eq 'ARRAY' ? @$code : $code if $code;
+-      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) foreach @c;
++      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) for @c;
+ 
+       } else {
+            my $src = $s;
+@@ -1747,7 +1761,7 @@
+     my (@result);
+ 
+     my (@scripts) = ref($script) eq 'ARRAY' ? @$script : ($script);
+-    foreach $script (@scripts) {
++    for $script (@scripts) {
+ 	my($src,$code,$language);
+ 	if (ref($script)) { # script is a hash
+ 	    ($src,$code,$type) =
 @@ -1831,7 +1845,7 @@
      my($method,$action,$enctype, at other) = 
  	rearrange([METHOD,ACTION,ENCTYPE], at p);
@@ -719,6 +1014,33 @@
                  $toencode =~ s{'}{&#39;}gso;
                  $toencode =~ s{\x8b}{&#8249;}gso;
                  $toencode =~ s{\x9b}{&#8250;}gso;
+@@ -2251,7 +2269,7 @@
+     my($row,$column);
+     unshift(@colheaders,'') if @colheaders && @rowheaders;
+     $result .= "<tr>" if @colheaders;
+-    foreach (@colheaders) {
++    for (@colheaders) {
+ 	$result .= "<th>$_</th>";
+     }
+     for ($row=0;$row<$rows;$row++) {
+@@ -2280,7 +2298,7 @@
+ #   $linebreak -> (optional) Set to true to place linebreaks
+ #             between the buttons.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
+@@ -2308,7 +2326,7 @@
+ #   $linebreak -> (optional) Set to true to place linebreaks
+ #             between the buttons.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2327,13 +2345,14 @@
      my $self     = shift;
      my $box_type = shift;
@@ -740,6 +1062,20 @@
  
      my($result,$checked, at elements, at values);
  
+@@ -2361,11 +2380,11 @@
+ 
+     # for disabling groups of radio/checkbox buttons
+     my %disabled;
+-    foreach (@{$disabled}) {
++    for (@{$disabled}) {
+    	$disabled{$_}=1;
+     }
+ 
+-    foreach (@values) {
++    for (@values) {
+     	 my $disable="";
+ 	 if ($disabled{$_}) {
+ 		$disable="disabled='1'";
 @@ -2393,7 +2412,7 @@
  
          if ($XHTML) {
@@ -749,6 +1085,15 @@
                     qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
          } else {
              push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
+@@ -2415,7 +2434,7 @@
+ #             text of each menu item.
+ #   $default -> (optional) Default item to display
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2428,12 +2447,14 @@
      my($name,$values,$default,$labels,$attributes,$override,$tabindex, at other) =
         rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LABELS,
@@ -768,9 +1113,12 @@
      }
      $name=$self->escapeHTML($name);
      my($other) = @other ? " @other" : '';
-@@ -2444,20 +2465,22 @@
+@@ -2442,22 +2463,24 @@
+     @values = $self->_set_values_and_labels($values,\$labels,$name);
+     $tabindex = $self->element_tab($tabindex);
      $result = qq/<select name="$name" $tabindex$other>\n/;
-     foreach (@values) {
+-    foreach (@values) {
++    for (@values) {
          if (/<optgroup/) {
 -            foreach (split(/\n/)) {
 +            for my $v (split(/\n/)) {
@@ -801,6 +1149,36 @@
          }
      }
  
+@@ -2474,7 +2497,7 @@
+ #   $values -> A pointer to a regular array containing the
+ #              values for each option line in the group.
+ #   $labels -> (optional)
+-#              A pointer to an associative array of labels to print next to each item
++#              A pointer to a hash of labels to print next to each item
+ #              in the form $label{'value'}="Long explanatory label".
+ #              Otherwise the provided values are used as the labels.
+ #   $labeled -> (optional)
+@@ -2501,9 +2524,9 @@
+ 
+     $name=$self->escapeHTML($name);
+     $result = qq/<optgroup label="$name"$other>\n/;
+-    foreach (@values) {
++    for (@values) {
+         if (/<optgroup/) {
+-            foreach (split(/\n/)) {
++            for (split(/\n/)) {
+                 my $selectit = $XHTML ? 'selected="selected"' : 'selected';
+                 s/(value="$selected")/$selectit $1/ if defined $selected;
+                 $result .= "$_\n";
+@@ -2541,7 +2564,7 @@
+ #   $size -> (optional) Size of the list.
+ #   $multiple -> (optional) If set, allow multiple selections.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2560,6 +2583,7 @@
      $size = $size || scalar(@values);
  
@@ -809,6 +1187,33 @@
      my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
      my($has_size) = $size ? qq/ size="$size"/: '';
      my($other) = @other ? " @other" : '';
+@@ -2567,7 +2591,7 @@
+     $name=$self->escapeHTML($name);
+     $tabindex = $self->element_tab($tabindex);
+     $result = qq/<select name="$name" $tabindex$has_size$is_multiple$other>\n/;
+-    foreach (@values) {
++    for (@values) {
+ 	my($selectit) = $self->_selected($selected{$_});
+ 	my($label) = $_;
+ 	$label = $labels->{$_} if defined($labels) && defined($labels->{$_});
+@@ -2607,7 +2631,7 @@
+ 	@value = ref($default) ? @{$default} : $default;
+ 	$do_override = $override;
+     } else {
+-	foreach ($default,$override, at other) {
++	for ($default,$override, at other) {
+ 	    push(@value,$_) if defined($_);
+ 	}
+     }
+@@ -2617,7 +2641,7 @@
+     @value = @prev if !$do_override && @prev;
+ 
+     $name=$self->escapeHTML($name);
+-    foreach (@value) {
++    for (@value) {
+ 	$_ = defined($_) ? $self->escapeHTML($_,1) : '';
+ 	push @result,$XHTML ? qq(<input type="hidden" name="$name" value="$_" @other />)
+                             : qq(<input type="hidden" name="$name" value="$_" @other>);
 @@ -2692,12 +2716,13 @@
      my $request_uri =  unescape($self->request_uri) || '';
      my $query_str   =  $self->query_string;
@@ -931,7 +1336,26 @@
  }
  END_OF_FUNC
  
-@@ -2931,7 +2985,9 @@
+@@ -2899,15 +2953,15 @@
+ sub query_string {
+     my($self) = self_or_default(@_);
+     my($param,$value, at pairs);
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($eparam) = escape($param);
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    $value = escape($value);
+             next unless defined $value;
+ 	    push(@pairs,"$eparam=$value");
+ 	}
+     }
+-    foreach (keys %{$self->{'.fieldnames'}}) {
++    for (keys %{$self->{'.fieldnames'}}) {
+       push(@pairs,".cgifields=".escape("$_"));
+     }
+     return join($USE_PARAM_SEMICOLONS ? ';' : '&', at pairs);
+@@ -2931,9 +2985,11 @@
      my($self,$search) = self_or_CGI(@_);
      my(%prefs,$type,$pref,$pat);
      
@@ -940,8 +1364,38 @@
 +                ? split(',',$self->http('accept'))
 +                : ();
  
-     foreach (@accept) {
+-    foreach (@accept) {
++    for (@accept) {
  	($pref) = /q=(\d\.\d+|\d+)/;
+ 	($type) = m#(\S+/[^;]+)#;
+ 	next unless $type;
+@@ -2952,7 +3008,7 @@
+     return $prefs{$search} if $prefs{$search};
+ 
+     # Didn't get it, so try pattern matching.
+-    foreach (keys %prefs) {
++    for (keys %prefs) {
+ 	next unless /\*/;       # not a pattern match
+ 	($pat = $_) =~ s/([^\w*])/\\$1/g; # escape meta characters
+ 	$pat =~ s/\*/.*/g; # turn it into a pattern
+@@ -3133,7 +3189,7 @@
+     $parameter =~ tr/-/_/;
+     return $ENV{"HTTP_\U$parameter\E"} if $parameter;
+     my(@p);
+-    foreach (keys %ENV) {
++    for (keys %ENV) {
+ 	push(@p,$_) if /^HTTP/;
+     }
+     return @p;
+@@ -3152,7 +3208,7 @@
+     $parameter =~ tr/-/_/;
+     return $ENV{"HTTPS_\U$parameter\E"} if $parameter;
+     my(@p);
+-    foreach (keys %ENV) {
++    for (keys %ENV) {
+ 	push(@p,$_) if /^HTTPS/;
+     }
+     return @p;
 @@ -3284,10 +3340,10 @@
  
      if (!$override && ($self->{'.fieldnames'}->{$name} || 
@@ -955,6 +1409,15 @@
      } else {
  	$selected{$defaults}++ if defined($defaults);
      }
+@@ -3326,7 +3382,7 @@
+ 	$input = join(" ", at lines);
+ 	@words = &shellwords($input);    
+     }
+-    foreach (@words) {
++    for (@words) {
+ 	s/\\=/%3D/g;
+ 	s/\\&/%26/g;	    
+     }
 @@ -3368,11 +3424,20 @@
  	    return;
  	}
@@ -987,6 +1450,15 @@
  	    next;
  	}
  
+@@ -3423,7 +3488,7 @@
+ 	  # together with the body for later parsing with an external
+ 	  # MIME parser module
+ 	  if ( $multipart ) {
+-	      foreach ( keys %header ) {
++	      for ( keys %header ) {
+ 		  print $filehandle "$_: $header{$_}${CRLF}";
+ 	      }
+ 	      print $filehandle "${CRLF}";
 @@ -3431,7 +3496,7 @@
  
  	  my ($data);
@@ -1014,6 +1486,24 @@
        }
      }
      return $returnvalue;
+@@ -3616,7 +3681,7 @@
+     my($element, $attributes) = @_;
+     return '' unless defined($attributes->{$element});
+     $attribs = ' ';
+-    foreach my $attrib (keys %{$attributes->{$element}}) {
++    for my $attrib (keys %{$attributes->{$element}}) {
+         (my $clean_attrib = $attrib) =~ s/^-//;
+         $attribs .= "@{[lc($clean_attrib)]}=\"$attributes->{$element}{$attrib}\" ";
+     }
+@@ -3627,7 +3692,7 @@
+ 
+ '_compile_all' => <<'END_OF_FUNC',
+ sub _compile_all {
+-    foreach (@_) {
++    for (@_) {
+ 	next if defined(&$_);
+ 	$AUTOLOAD = "CGI::$_";
+ 	_compile();
 @@ -3645,6 +3710,7 @@
  
  ################### Fh -- lightweight filehandle ###############
@@ -1070,6 +1560,15 @@
      unshift(@TEMP,$ENV{'TMPDIR'}) if defined $ENV{'TMPDIR'};
  
      # this feature was supposed to provide per-user tmpfiles, but
+@@ -3997,7 +4079,7 @@
+     #    : Refer to getpwuid() only at run-time if we're fortunate and have  UNIX.
+     # unshift(@TEMP,(eval {(getpwuid($>))[7]}).'/tmp') if $CGI::OS eq 'UNIX' and $> != 0;
+ 
+-    foreach (@TEMP) {
++    for (@TEMP) {
+       do {$TMPDIRECTORY = $_; last} if -d $_ && -w _;
+     }
+   }
 @@ -4014,7 +4096,7 @@
  
  sub DESTROY {
@@ -1092,16 +1591,116 @@
      # this used to untaint, now it doesn't
      # $filename = $1;
      return bless \$filename;
-@@ -4109,6 +4191,8 @@
- 	     hr;
-    }
+@@ -4075,64 +4157,52 @@
  
-+   print end_html;
-+
- =head1 ABSTRACT
+ =head1 NAME
+ 
+-CGI - Simple Common Gateway Interface Class
++CGI - Handle Common Gateway Interface requests and responses
+ 
+ =head1 SYNOPSIS
+ 
+-  # CGI script that creates a fill-out form
+-  # and echoes back its values.
+-
+-  use CGI qw/:standard/;
+-  print header,
+-        start_html('A Simple Example'),
+-        h1('A Simple Example'),
+-        start_form,
+-        "What's your name? ",textfield('name'),p,
+-        "What's the combination?", p,
+-        checkbox_group(-name=>'words',
+-		       -values=>['eenie','meenie','minie','moe'],
+-		       -defaults=>['eenie','minie']), p,
+-        "What's your favorite color? ",
+-        popup_menu(-name=>'color',
+-	           -values=>['red','green','blue','chartreuse']),p,
+-        submit,
+-        end_form,
+-        hr;
+-
+-   if (param()) {
+-       my $name      = param('name');
+-       my $keywords  = join ', ',param('words');
+-       my $color     = param('color');
+-       print "Your name is",em(escapeHTML($name)),p,
+-	     "The keywords are: ",em(escapeHTML($keywords)),p,
+-	     "Your favorite color is ",em(escapeHTML($color)),
+-	     hr;
+-   }
++    use CGI;
+ 
+-=head1 ABSTRACT
++    my $q = CGI->new;
+ 
+-This perl library uses perl5 objects to make it easy to create Web
+-fill-out forms and parse their contents.  This package defines CGI
+-objects, entities that contain the values of the current query string
+-and other state variables.  Using a CGI object's methods, you can
+-examine keywords and parameters passed to your script, and create
+-forms whose initial values are taken from the current query (thereby
+-preserving state information).  The module provides shortcut functions
+-that produce boilerplate HTML, reducing typing and coding errors. It
+-also provides functionality for some of the more advanced features of
+-CGI scripting, including support for file uploads, cookies, cascading
+-style sheets, server push, and frames.
++    # Process an HTTP request
++     @values  = $q->param('form_field');
+ 
+-CGI.pm also provides a simple function-oriented programming style for
+-those who don't need its object-oriented features.
++     $fh      = $q->upload('file_field');
+ 
+-The current version of CGI.pm is available at
++     $riddle  = $query->cookie('riddle_name');
++     %answers = $query->cookie('answers');
++
++    # Prepare various HTTP responses
++    print $q->header();
++    print $q->header('application/json');
++
++	$cookie1 = $q->cookie(-name=>'riddle_name', -value=>"The Sphynx's Question");
++	$cookie2 = $q->cookie(-name=>'answers', -value=>\%answers);
++    print $q->header(
++        -type    => 'image/gif',
++        -expires => '+3d',
++        -cookie  => [$cookie1,$cookie2]
++        );
+ 
+-  http://www.genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
+-  ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
++   print  $q->redirect('http://somewhere.else/in/movie/land');
+ 
+ =head1 DESCRIPTION
+ 
++CGI.pm is a stable, complete and mature solution for processing and preparing
++HTTP requests and responses.  Major features including processing form
++submissions, file uploads, reading and writing cookies, query string generation
++and manipulation, and processing and preparing HTTP headers. Some HTML
++generation utilities are included as well.
++
++CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
++with built-in support for mod_perl and mod_perl2 as well as FastCGI.
++
++It has the benefit of having developed and refined over 10 years with input
++from dozens of contributors and being deployed on thousands of websites.
++CGI.pm has been included in the Perl distribution since Perl 5.4, and has
++become a de-facto standard.
++
+ =head2 PROGRAMMING STYLE
+ 
+ There are two styles of programming with CGI.pm, an object-oriented
+@@ -4327,7 +4397,7 @@
+     restore_parameters(IN);
+     close IN;
+ 
+-You can also initialize the query object from an associative array
++You can also initialize the query object from a hash
+ reference:
  
- This perl library uses perl5 objects to make it easy to create Web
-@@ -4392,8 +4476,7 @@
+     $query = new CGI( {'dinosaur'=>'barney',
+@@ -4392,8 +4462,7 @@
  the method will return a single value.
  
  If a value is not given in the query string, as in the queries
@@ -1111,7 +1710,7 @@
  
  
  If the parameter does not exist at all, then param() will return undef
-@@ -4477,6 +4560,10 @@
+@@ -4477,6 +4546,10 @@
  
     my $data = $query->param('POSTDATA');
  
@@ -1122,7 +1721,16 @@
  (If you don't know what the preceding means, don't worry about it.  It
  only affects people trying to use CGI for XML processing and other
  specialized tasks.)
-@@ -4812,6 +4899,16 @@
+@@ -4554,7 +4627,7 @@
+ 
+    open (OUT,">>test.out") || die;
+    $records = 5;
+-   foreach (0..$records) {
++   for (0..$records) {
+        my $q = new CGI;
+        $q->param(-name=>'counter',-value=>$_);
+        $q->save(\*OUT);
+@@ -4812,6 +4885,16 @@
  XHTML will automatically be disabled without needing to use this 
  pragma.
  
@@ -1139,7 +1747,16 @@
  =item -nph
  
  This makes CGI.pm produce a header appropriate for an NPH (no
-@@ -5388,7 +5485,7 @@
+@@ -5129,7 +5212,7 @@
+ 
+ All relative links will be interpreted relative to this tag.
+ You add arbitrary meta information to the header with the B<-meta>
+-argument.  This argument expects a reference to an associative array
++argument.  This argument expects a reference to a hash
+ containing name/value pairs of meta information.  These will be turned
+ into a series of header <meta> tags that look something like this:
+ 
+@@ -5388,7 +5471,7 @@
  If Apache's mod_rewrite is turned on, then the script name and path
  info probably won't match the request that the user sent. Set
  -rewrite=>1 (default) to return URLs that match what the user sent
@@ -1148,7 +1765,18 @@
  the URL after mod_rewrite's rules have run. Because the additional
  path information only makes sense in the context of the rewritten URL,
  -rewrite is set to false when you request path info in the URL.
-@@ -5987,24 +6084,27 @@
+@@ -5468,8 +5551,8 @@
+ 
+    print h1("Chapter","1"); # <h1>Chapter 1</h1>"
+ 
+-If the first argument is an associative array reference, then the keys
+-and values of the associative array become the HTML tag's attributes:
++If the first argument is a hash reference, then the keys
++and values of the hash become the HTML tag's attributes:
+ 
+    print a({-href=>'fred.html',-target=>'_new'},
+       "Open a new frame");
+@@ -5987,31 +6070,34 @@
  
  To be safe, use the I<upload()> function (new in version 2.47).  When
  called with the name of an upload field, I<upload()> returns a
@@ -1182,7 +1810,15 @@
  
  When a file is uploaded the browser usually sends along some
  information along with it in the format of headers.  The information
-@@ -6102,7 +6202,7 @@
+ usually includes the MIME content type.  Future browsers may send
+ other information as well (such as modification date and size). To
+ retrieve this information, call uploadInfo().  It returns a reference to
+-an associative array containing all the document headers.
++a hash containing all the document headers.
+ 
+        $filename = param('uploaded_file');
+        $type = uploadInfo($filename)->{'Content-Type'};
+@@ -6102,7 +6188,7 @@
  
     print popup_menu(-name=>'menu_name',
  			    -values=>['eenie','meenie','minie'],
@@ -1191,7 +1827,7 @@
            -labels=>\%labels,
            -attributes=>\%attributes);
  
-@@ -6125,7 +6225,8 @@
+@@ -6125,14 +6211,15 @@
  
  The optional third parameter (-default) is the name of the default
  menu choice.  If not specified, the first item will be the default.
@@ -1201,7 +1837,84 @@
  
  =item 4.
  
-@@ -6389,6 +6490,9 @@
+ The optional fourth parameter (-labels) is provided for people who
+ want to use different values for the user-visible label inside the
+ popup menu and the value returned to your script.  It's a pointer to an
+-associative array relating menu values to user-visible labels.  If you
++hash relating menu values to user-visible labels.  If you
+ leave this parameter blank, the menu values will be displayed by
+ default.  (You can also leave a label undefined if you want to).
+ 
+@@ -6140,8 +6227,8 @@
+ 
+ The optional fifth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ =back
+@@ -6193,7 +6280,7 @@
+ =item 3.
+ 
+ The optional third parameter (B<-labels>) allows you to pass a reference
+-to an associative array containing user-visible labels for one or more
++to a hash containing user-visible labels for one or more
+ of the menu items.  You can use this when you want the user to see one
+ menu string, but have the browser return your program a different one.
+ If you don't specify this, the value string will be used instead
+@@ -6220,8 +6307,8 @@
+ 
+ An optional sixth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ =back
+@@ -6281,7 +6368,7 @@
+ 
+ =item 5.
+ 
+-The optional sixth argument is a pointer to an associative array
++The optional sixth argument is a pointer to a hash
+ containing long user-visible labels for the list items (-labels).
+ If not provided, the values will be displayed.
+ 
+@@ -6289,8 +6376,8 @@
+ 
+ The optional sixth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ When this form is processed, all selected list items will be returned as
+@@ -6354,7 +6441,7 @@
+ =back
+ 
+ 
+-The optional b<-labels> argument is a pointer to an associative array
++The optional b<-labels> argument is a pointer to a hash
+ relating the checkbox values to the user-visible labels that will be
+ printed next to them.  If not provided, the values will be used as the
+ default.
+@@ -6371,7 +6458,7 @@
+ 
+ The optional B<-attributes> argument is provided to assign any of the
+ common HTML attributes to an individual menu item. It's a pointer to
+-an associative array relating menu values to another associative array
++a hash relating menu values to another hash
+ with the attribute's name as the key and the attribute's value as the
+ value.
+ 
+@@ -6389,6 +6476,9 @@
    -tabindex => ['moe','minie','eenie','meenie']  # tab in this order
    -tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
  
@@ -1211,7 +1924,12 @@
  When the form is processed, all checked boxes will be returned as
  a list under the parameter name 'group_name'.  The values of the
  "on" checkboxes can be retrieved with:
-@@ -6546,6 +6650,9 @@
+@@ -6542,10 +6632,13 @@
+ 
+ The optional B<-attributes> argument is provided to assign any of the
+ common HTML attributes to an individual menu item. It's a pointer to
+-an associative array relating menu values to another associative array
++a hash relating menu values to another hash
  with the attribute's name as the key and the attribute's value as the
  value.
  
@@ -1221,7 +1939,102 @@
  When the form is processed, the selected radio button can
  be retrieved using:
  
-@@ -7658,10 +7765,8 @@
+@@ -6709,16 +6802,13 @@
+ 
+ button() produces a button that is compatible with Netscape 2.0's
+ JavaScript.  When it's pressed the fragment of JavaScript code
+-pointed to by the B<-onClick> parameter will be executed.  On
+-non-Netscape browsers this form element will probably not even
+-display.
++pointed to by the B<-onClick> parameter will be executed.
+ 
+ =head1 HTTP COOKIES
+ 
+-Netscape browsers versions 1.1 and higher, and all versions of
+-Internet Explorer, support a so-called "cookie" designed to help
+-maintain state within a browser session.  CGI.pm has several methods
+-that support cookies.
++Browsers support a so-called "cookie" designed to help maintain state
++within a browser session.  CGI.pm has several methods that support
++cookies.
+ 
+ A cookie is a name=value pair much like the named parameters in a CGI
+ query string.  CGI scripts create one or more cookies and send
+@@ -6793,8 +6883,8 @@
+ =item B<-value>
+ 
+ The value of the cookie.  This can be any scalar value,
+-array reference, or even associative array reference.  For example,
+-you can store an entire associative array into a cookie this way:
++array reference, or even hash reference.  For example,
++you can store an entire hash into a cookie this way:
+ 
+ 	$cookie=cookie(-name=>'family information',
+ 			       -value=>\%childrens_ages);
+@@ -6921,19 +7011,6 @@
+ 
+ =head1 SUPPORT FOR JAVASCRIPT
+ 
+-Netscape versions 2.0 and higher incorporate an interpreted language
+-called JavaScript. Internet Explorer, 3.0 and higher, supports a
+-closely-related dialect called JScript. JavaScript isn't the same as
+-Java, and certainly isn't at all the same as Perl, which is a great
+-pity. JavaScript allows you to programmatically change the contents of
+-fill-out forms, create new windows, and pop up dialog box from within
+-Netscape itself. From the point of view of CGI scripting, JavaScript
+-is quite useful for validating fill-out forms prior to submitting
+-them.
+-
+-You'll need to know JavaScript in order to use it. There are many good
+-sources in bookstores and on the web.
+-
+ The usual way to use JavaScript is to define a set of functions in a
+ <SCRIPT> block inside the HTML header and then to register event
+ handlers in the various elements of the page. Events include such
+@@ -7275,11 +7352,9 @@
+ 
+ =item B<raw_cookie()>
+ 
+-Returns the HTTP_COOKIE variable, an HTTP extension implemented by
+-Netscape browsers version 1.1 and higher, and all versions of Internet
+-Explorer.  Cookies have a special format, and this method call just
+-returns the raw form (?cookie dough).  See cookie() for ways of
+-setting and retrieving cooked cookies.
++Returns the HTTP_COOKIE variable.  Cookies have a special format, and
++this method call just returns the raw form (?cookie dough).  See
++cookie() for ways of setting and retrieving cooked cookies.
+ 
+ Called with no parameters, raw_cookie() returns the packed cookie
+ structure.  You can separate it into individual cookies by splitting
+@@ -7293,7 +7368,7 @@
+ Returns the HTTP_USER_AGENT variable.  If you give
+ this method a single argument, it will attempt to
+ pattern match on it, allowing you to do something
+-like user_agent(netscape);
++like user_agent(Mozilla);
+ 
+ =item B<path_info()>
+ 
+@@ -7476,7 +7551,7 @@
+   use CGI qw/:push -nph/;
+   $| = 1;
+   print multipart_init(-boundary=>'----here we go!');
+-  foreach (0 .. 4) {
++  for (0 .. 4) {
+       print multipart_start(-type=>'text/plain'),
+             "The current time is ",scalar(localtime),"\n";
+       if ($_ < 4) {
+@@ -7532,9 +7607,6 @@
+ Users interested in server push applications should also have a look
+ at the CGI::Push module.
+ 
+-Only Netscape Navigator supports server push.  Internet Explorer
+-browsers do not.
+-
+ =head1 Avoiding Denial of Service Attacks
+ 
+ A potential problem with CGI.pm is that, by default, it attempts to
+@@ -7658,10 +7730,8 @@
  
  =head1 AUTHOR INFORMATION
  
@@ -1234,3 +2047,12 @@
  
  Address bug reports and comments to: lstein at cshl.org.  When sending
  bug reports, please provide the version of CGI.pm, the version of
+@@ -7788,7 +7858,7 @@
+ 
+ 	   print "<h2>Here are the current settings in this form</h2>";
+ 
+-	   foreach $key (param) {
++	   for $key (param) {
+ 	      print "<strong>$key</strong> -> ";
+ 	      @values = param($key);
+ 	      print join(", ", at values),"<br>\n";


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- perl.spec	7 Apr 2009 09:57:20 -0000	1.215
+++ perl.spec	7 Apr 2009 12:51:28 -0000	1.216
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        66%{?dist}
+Release:        67%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -190,7 +190,7 @@
 Patch102:	perl-update-Archive-Tar.patch
 %define			    Archive_Tar_version 1.46
 Patch103:	perl-update-CGI.patch
-%define			    CGI_version 3.42
+%define			    CGI_version 3.43
 Patch104:	perl-update-ExtUtils-CBuilder.patch
 %define			    ExtUtils_CBuilder_version 0.24
 Patch105:	perl-update-File-Fetch.patch
@@ -229,11 +229,6 @@
 # patches File-Fetch and CPAN
 Patch201:	perl-5.10.0-links.patch
 
-# Fix CGI::escape to work with all strings, started as #472571,
-# brought upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34528,
-# accepted there for CGI.pm-3.43
-Patch202:	perl-CGI-escape.patch
-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -1004,7 +999,6 @@
 %patch117 -p1
 %patch118 -p1
 %patch201 -p1
-%patch202 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1269,7 +1263,6 @@
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
-	'Fedora Patch202: Fix CGI::escape to work with all strings' \
 	%{nil}
 
 rm patchlevel.bak
@@ -1894,6 +1887,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-67
+- update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch
+
 * Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-66
 - fix CGI::escape for all strings (#472571)
 - perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t


--- perl-CGI-escape.patch DELETED ---



From akurtakov at fedoraproject.org  Tue Apr  7 13:07:50 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  7 Apr 2009 13:07:50 +0000 (UTC)
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.14,1.15
Message-ID: <20090407130750.D24D870100@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-emf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32036/devel

Modified Files:
	eclipse-emf.spec 
Log Message:
Fix directory ownership.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- eclipse-emf.spec	23 Mar 2009 16:46:25 -0000	1.14
+++ eclipse-emf.spec	7 Apr 2009 13:07:20 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:      eclipse-emf
 Version:   2.4.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -163,6 +163,9 @@
 %files
 %defattr(-,root,root,-)
 %dir %{eclipse_dropin}
+%dir %{eclipse_dropin}/eclipse
+%dir %{eclipse_dropin}/eclipse/features
+%dir %{eclipse_dropin}/eclipse/plugins
 %doc %{eclipse_dropin}/eclipse/epl-v10.html
 %doc %{eclipse_dropin}/eclipse/notice.html
 #%{eclipse_dropin}/eclipse/content.xml
@@ -306,6 +309,9 @@
 %{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example_*
 
 %changelog
+* Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 2.4.2-3
+- Fix directory ownership.
+
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 2.4.2-2
 - Rebuild to not ship p2 context.xml.
 - Remove context.xml from %%files section.



From pingou at fedoraproject.org  Tue Apr  7 13:17:57 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue,  7 Apr 2009 13:17:57 +0000 (UTC)
Subject: rpms/guake/devel .cvsignore, 1.5, 1.6 guake.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <20090407131757.235ED70100@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/guake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2868

Modified Files:
	.cvsignore guake.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guake/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Mar 2009 17:28:49 -0000	1.5
+++ .cvsignore	7 Apr 2009 13:17:26 -0000	1.6
@@ -1 +1 @@
-guake-0.3.1.20090321git.tar.gz
+guake-0.4.0.tar.gz


Index: guake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guake/devel/guake.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- guake.spec	21 Mar 2009 17:28:49 -0000	1.11
+++ guake.spec	7 Apr 2009 13:17:26 -0000	1.12
@@ -1,19 +1,22 @@
 Name:           guake
-Version:        0.3.1
-Release:        10.20090321git%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Drop-down terminal for GNOME
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.guake-terminal.org/
-#Source0:        http://guake-terminal.org/releases/%{version}/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.20090321git.tar.gz
+Source0:        http://trac.guake-terminal.org/files/%{name}-%{version}.tar.gz
+
+# Not used here -- official release --
+#Source0:        %{name}-%{version}.20090321git.tar.gz
 # Source generated from
 # git clone git://repos.guake-terminal.org/guake
 # cd guake
 # ./autogen.sh
 # cd ../
 # tar zcvf guake-0.3.1.20090321git.tar.gz guake/
+# ---------------------------------------------
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel
@@ -30,18 +33,12 @@
 and press again to hide.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
+#-n %{name}
 
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 
-# Quick and dirty patch to get rid of the Num Lock error --> should be corrected - see http://trac.guake-terminal.org/ticket/76 
-#sed -i -e "s|key = cellrendererkeys.accelerator_name(keyval, keycode, mask)|key = cellrendererkeys.accelerator_name(keyval, keycode, mask).replace('<Mod2>','')|" src/guake.py
-
-# Correct the tab problem see http://trac.guake-terminal.org/ticket/103 
-#sed -i -e 's|self.notebook.set_current_page(last_added))|self.notebook.set_current_page(self.notebook.page_num(box)))|' src/guake.py
-
-
 %build
 %configure --disable-schemas-install --disable-static
 make %{?_smp_mflags}
@@ -51,13 +48,22 @@
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-desktop-file-install --vendor="fedora"                     \
+
+desktop-file-install --vendor=""                           \
   --delete-original                                        \
   --dir=%{buildroot}%{_datadir}/applications               \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+
+desktop-file-install --vendor=""                           \
+  --delete-original                                        \
+  --dir=%{buildroot}%{_datadir}/applications               \
+  %{buildroot}%{_datadir}/applications/%{name}-prefs.desktop
+
+
+
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la
-
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,8 +96,10 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/%{name}
+%{_bindir}/%{name}-prefs
 %{_libdir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}-prefs.desktop
 %{_datadir}/dbus-1/services/org.gnome.Guake.service
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}
@@ -99,6 +107,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 pingou <pingou at pingoured.fr> - 0.4.0-1
+- Update to version 0.4.0
+
 * Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 0.3.1-10.20090321git
 - New version from git
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guake/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Mar 2009 17:28:49 -0000	1.5
+++ sources	7 Apr 2009 13:17:26 -0000	1.6
@@ -1 +1 @@
-5251afda727f3e3cfb2c3aacb93f5472  guake-0.3.1.20090321git.tar.gz
+9e04de9c05c031d763f4c9bdc194223b  guake-0.4.0.tar.gz



From pingou at fedoraproject.org  Tue Apr  7 13:20:23 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue,  7 Apr 2009 13:20:23 +0000 (UTC)
Subject: rpms/guake/F-10 guake.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20090407132023.8DDC170100@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/guake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3699/F-10

Modified Files:
	guake.spec sources 
Log Message:
Update to 0.4.0


Index: guake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guake/F-10/guake.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- guake.spec	21 Mar 2009 17:43:51 -0000	1.7
+++ guake.spec	7 Apr 2009 13:19:52 -0000	1.8
@@ -1,19 +1,22 @@
 Name:           guake
-Version:        0.3.1
-Release:        10.20090321git%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Drop-down terminal for GNOME
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.guake-terminal.org/
-#Source0:        http://guake-terminal.org/releases/%{version}/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.20090321git.tar.gz
+Source0:        http://trac.guake-terminal.org/files/%{name}-%{version}.tar.gz
+
+# Not used here -- official release --
+#Source0:        %{name}-%{version}.20090321git.tar.gz
 # Source generated from
 # git clone git://repos.guake-terminal.org/guake
 # cd guake
 # ./autogen.sh
 # cd ../
 # tar zcvf guake-0.3.1.20090321git.tar.gz guake/
+# ---------------------------------------------
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel
@@ -30,18 +33,12 @@
 and press again to hide.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
+#-n %{name}
 
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 
-# Quick and dirty patch to get rid of the Num Lock error --> should be corrected - see http://trac.guake-terminal.org/ticket/76 
-#sed -i -e "s|key = cellrendererkeys.accelerator_name(keyval, keycode, mask)|key = cellrendererkeys.accelerator_name(keyval, keycode, mask).replace('<Mod2>','')|" src/guake.py
-
-# Correct the tab problem see http://trac.guake-terminal.org/ticket/103 
-#sed -i -e 's|self.notebook.set_current_page(last_added))|self.notebook.set_current_page(self.notebook.page_num(box)))|' src/guake.py
-
-
 %build
 %configure --disable-schemas-install --disable-static
 make %{?_smp_mflags}
@@ -51,13 +48,22 @@
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-desktop-file-install --vendor="fedora"                     \
+
+desktop-file-install --vendor=""                           \
   --delete-original                                        \
   --dir=%{buildroot}%{_datadir}/applications               \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+
+desktop-file-install --vendor=""                           \
+  --delete-original                                        \
+  --dir=%{buildroot}%{_datadir}/applications               \
+  %{buildroot}%{_datadir}/applications/%{name}-prefs.desktop
+
+
+
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la
-
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,8 +96,10 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/%{name}
+%{_bindir}/%{name}-prefs
 %{_libdir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}-prefs.desktop
 %{_datadir}/dbus-1/services/org.gnome.Guake.service
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}
@@ -99,6 +107,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 pingou <pingou at pingoured.fr> - 0.4.0-1
+- Update to version 0.4.0
+
 * Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 0.3.1-10.20090321git
 - New version from git
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guake/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Mar 2009 17:43:52 -0000	1.5
+++ sources	7 Apr 2009 13:19:53 -0000	1.6
@@ -1 +1 @@
-5251afda727f3e3cfb2c3aacb93f5472  guake-0.3.1.20090321git.tar.gz
+9e04de9c05c031d763f4c9bdc194223b  guake-0.4.0.tar.gz



From pingou at fedoraproject.org  Tue Apr  7 13:20:23 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue,  7 Apr 2009 13:20:23 +0000 (UTC)
Subject: rpms/guake/F-9 guake.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090407132023.A981270137@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/guake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3699/F-9

Modified Files:
	guake.spec sources 
Log Message:
Update to 0.4.0


Index: guake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guake/F-9/guake.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- guake.spec	21 Mar 2009 17:43:52 -0000	1.5
+++ guake.spec	7 Apr 2009 13:19:53 -0000	1.6
@@ -1,19 +1,22 @@
 Name:           guake
-Version:        0.3.1
-Release:        10.20090321git%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Drop-down terminal for GNOME
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.guake-terminal.org/
-#Source0:        http://guake-terminal.org/releases/%{version}/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.20090321git.tar.gz
+Source0:        http://trac.guake-terminal.org/files/%{name}-%{version}.tar.gz
+
+# Not used here -- official release --
+#Source0:        %{name}-%{version}.20090321git.tar.gz
 # Source generated from
 # git clone git://repos.guake-terminal.org/guake
 # cd guake
 # ./autogen.sh
 # cd ../
 # tar zcvf guake-0.3.1.20090321git.tar.gz guake/
+# ---------------------------------------------
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel
@@ -30,18 +33,12 @@
 and press again to hide.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
+#-n %{name}
 
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 
-# Quick and dirty patch to get rid of the Num Lock error --> should be corrected - see http://trac.guake-terminal.org/ticket/76 
-#sed -i -e "s|key = cellrendererkeys.accelerator_name(keyval, keycode, mask)|key = cellrendererkeys.accelerator_name(keyval, keycode, mask).replace('<Mod2>','')|" src/guake.py
-
-# Correct the tab problem see http://trac.guake-terminal.org/ticket/103 
-#sed -i -e 's|self.notebook.set_current_page(last_added))|self.notebook.set_current_page(self.notebook.page_num(box)))|' src/guake.py
-
-
 %build
 %configure --disable-schemas-install --disable-static
 make %{?_smp_mflags}
@@ -51,13 +48,22 @@
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-desktop-file-install --vendor="fedora"                     \
+
+desktop-file-install --vendor=""                           \
   --delete-original                                        \
   --dir=%{buildroot}%{_datadir}/applications               \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+
+desktop-file-install --vendor=""                           \
+  --delete-original                                        \
+  --dir=%{buildroot}%{_datadir}/applications               \
+  %{buildroot}%{_datadir}/applications/%{name}-prefs.desktop
+
+
+
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la
-
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,8 +96,10 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/%{name}
+%{_bindir}/%{name}-prefs
 %{_libdir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}-prefs.desktop
 %{_datadir}/dbus-1/services/org.gnome.Guake.service
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}
@@ -99,6 +107,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 pingou <pingou at pingoured.fr> - 0.4.0-1
+- Update to version 0.4.0
+
 * Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 0.3.1-10.20090321git
 - New version from git
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guake/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Mar 2009 17:43:52 -0000	1.5
+++ sources	7 Apr 2009 13:19:53 -0000	1.6
@@ -1 +1 @@
-5251afda727f3e3cfb2c3aacb93f5472  guake-0.3.1.20090321git.tar.gz
+9e04de9c05c031d763f4c9bdc194223b  guake-0.4.0.tar.gz



From krh at fedoraproject.org  Tue Apr  7 13:22:01 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Tue,  7 Apr 2009 13:22:01 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm.spec,1.72,1.73
Message-ID: <20090407132201.1B73570100@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4428

Modified Files:
	libdrm.spec 
Log Message:
* Tue Apr  7 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-3
- BuildRequire libudev-devel for test cases.



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- libdrm.spec	6 Apr 2009 21:52:58 -0000	1.72
+++ libdrm.spec	7 Apr 2009 13:21:30 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -18,6 +18,7 @@
 BuildRequires: pkgconfig automake autoconf libtool
 BuildRequires: kernel-headers >= 2.6.29-0.145.rc6.fc11
 BuildRequires: libxcb-devel
+BuildRequires: libudev-devel
 
 Source2: 91-drm-modeset.rules
 
@@ -105,6 +106,9 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Tue Apr  7 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-3
+- BuildRequire libudev-devel for test cases.
+
 * Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-2
 - Bump to 2.4.6
 



From bpepple at fedoraproject.org  Tue Apr  7 13:25:24 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  7 Apr 2009 13:25:24 +0000 (UTC)
Subject: rpms/farsight2/devel .cvsignore, 1.4, 1.5 farsight2.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090407132524.AE07070100@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5353

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
* Tue Apr  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
- Update to 0.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Mar 2009 23:28:12 -0000	1.4
+++ .cvsignore	7 Apr 2009 13:24:54 -0000	1.5
@@ -1 +1 @@
-farsight2-0.0.8.tar.gz
+farsight2-0.0.9.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- farsight2.spec	17 Mar 2009 23:28:13 -0000	1.8
+++ farsight2.spec	7 Apr 2009 13:24:54 -0000	1.9
@@ -7,7 +7,7 @@
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.8
+Version:        0.0.9
 Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
+- Update to 0.0.9.
+
 * Tue Mar 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.8-1
 - Update to 0.0.8.
 - Bump min version of gstreamer needed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Mar 2009 23:28:13 -0000	1.4
+++ sources	7 Apr 2009 13:24:54 -0000	1.5
@@ -1 +1 @@
-2fda6cc38c62e9752e1072f6f84d1573  farsight2-0.0.8.tar.gz
+f2d4fad95009bc7eae29f97c6f560dcd  farsight2-0.0.9.tar.gz



From jakub at fedoraproject.org  Tue Apr  7 13:40:19 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue,  7 Apr 2009 13:40:19 +0000 (UTC)
Subject: rpms/glibc/devel glibc.spec,1.388,1.389
Message-ID: <20090407134019.9912970100@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8845

Modified Files:
	glibc.spec 
Log Message:
2.9.90-13


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- glibc.spec	7 Apr 2009 09:17:30 -0000	1.388
+++ glibc.spec	7 Apr 2009 13:39:49 -0000	1.389
@@ -54,17 +54,6 @@
 BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3
 BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel
 BuildRequires: /bin/ps, /bin/kill, /bin/awk
-%ifarch %{ix86} x86_64 ppc ppc64
-BuildRequires: /usr/bin/setarch
-%ifarch %{ix86}
-%define setarch /usr/bin/setarch i386 -R
-%endif
-%ifarch x86_64 ppc ppc64
-%define setarch /usr/bin/setarch %{_target_cpu} -R
-%endif
-%else
-%define setarch %{nil}
-%endif
 # This is to ensure that __frame_state_for is exported by glibc
 # will be compatible with egcs 1.x.y
 BuildRequires: gcc >= 3.2
@@ -255,6 +244,8 @@
 rm -f sysdeps/powerpc/powerpc32/power4/hp-timing.[ch]
 %endif
 
+rm -rf sysdeps/x86_64/memchr.S
+
 find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
 cat > find_provides.sh <<EOF
 #!/bin/sh
@@ -336,7 +327,7 @@
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt
-%{setarch} make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
+make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
 }
@@ -388,7 +379,7 @@
 make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s
 %ifnarch %{auxarches}
 cd build-%{nptl_target_cpu}-linuxnptl && \
-  %{setarch} make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
+  make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
   cd ..
 %endif
 
@@ -717,7 +708,7 @@
 parent=$$
 echo ====================TESTING=========================
 cd build-%{nptl_target_cpu}-linuxnptl
-( %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -726,7 +717,7 @@
 %if %{buildxen}
 echo ====================TESTING -mno-tls-direct-seg-refs=============
 cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
-( %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -739,7 +730,7 @@
 ( if [ -d ../power6emul ]; then
     export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
   fi
-  %{setarch} make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+  make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -1028,7 +1019,6 @@
 - update from trunk
   - fix strverscmp (#494457)
 - configure with --enable-nss-crypt
-- workaround buggy kernels during glibc build process, argh
 
 * Wed Apr  1 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-12
 - update from trunk



From awjb at fedoraproject.org  Tue Apr  7 13:41:10 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  7 Apr 2009 13:41:10 +0000 (UTC)
Subject: rpms/wine/devel winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.71,
	1.72 sources, 1.72, 1.73 wine.spec, 1.100,
	1.101 winepulse-0.20.patch, 1.1, NONE
Message-ID: <20090407134110.F163570100@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8920/devel

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	winepulse-0.24.patch 
Removed Files:
	winepulse-0.20.patch 
Log Message:
- version upgrade


winepulse-0.24.patch:

--- NEW FILE winepulse-0.24.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..327f225
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = dxguid uuid winmm user32 advapi32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = dsoutput.c \
+	waveout.c \
+	wavein.c \
+	pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/dsoutput.c b/dlls/winepulse.drv/dsoutput.c
new file mode 100644
index 0000000..b37313a
--- /dev/null
+++ b/dlls/winepulse.drv/dsoutput.c
@@ -0,0 +1,576 @@
+/*
+ * Wine Driver for PulseAudio - DSound Output Functionality
+ * http://pulseaudio.org/
+ *
+ * Copyright	2009 Arthur Talyor <theycallhimart at gmail.com>
+ *
+ * Conatins code from other wine multimedia drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "mmddk.h"
+#include "dsound.h"
+#include "dsdriver.h"
+#include "winreg.h"
+
+#include <winepulse.h>
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dspulse);
+
+#if HAVE_PULSEAUDIO
+
+/*======================================================================*
+ *                  Low level DSOUND implementation			*
+ *======================================================================*/
+
+/* A buffer is allocated with a pointer indicating the read position in the
+ * buffer. The pulse write callback reads data from the buffer, updating the
+ * read pointer to the location at the end of the read. Upon reaching the end
+ * or attempting to read past the end of buffer the read pointer wraps around
+ * to the beginning again. DirectSound applications can write anywhere in the
+ * buffer at anytime without locking and can know the location of the read
+ * pointer. The position of the read pointer cannot be changed by the
+ * application and access to it uses a locking scheme. A fake pointer
+ * indicating estimated playback position is also available to the application.
+ * Applications can potentially write to the same area of memory which is also
+ * being read by the pulse thread. However, this is uncommon as directsound
+ * applications know where pulse should be reading from via the pointer
+ * locations and MSDN says that such an operation should be avoided with the
+ * results being undefined.
+ */
+
+/* Fragment lengths try to be a power of two close to 10ms worth of data. See
+ * dlls/dsound/mixer.c
+ */
+static int fragment_length(pa_sample_spec *s) {
+    if (s->rate <= 12800)
+        return 128 * pa_frame_size(s);
+
+    if (s->rate <= 25600)
+        return 256 * pa_frame_size(s);
+
+    if (s->rate <= 51200)
+        return 512 * pa_frame_size(s);
+
+    return 1024 * pa_frame_size(s);
+}
+
+/* Callback from the pulse thread for stream data */
+static void DSPULSE_BufferReadCallback(pa_stream *s, size_t nbytes, void *userdata) {
+    IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)userdata;
+
+    if (!This->buffer)
+        return;
+
+    /* Fraglens are always powers of 2 */
+    nbytes+= This->fraglen - 1;
+    nbytes&= ~(This->fraglen - 1);
+
+    /* If we advance more than 10 fragments at a time it appears that the buffer
+     * pointer is never advancing because of wrap-around. Evil magic numbers. */
+    if (nbytes > This->fraglen * 5)
+        nbytes = This->fraglen * 5;
+
+    TRACE("Reading %u bytes.\n", nbytes);
+
+    if (This->buffer_read_offset + nbytes <= This->buffer_length) {
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset += nbytes;
+    } else {
+        size_t write_length = This->buffer_length - This->buffer_read_offset;
+        nbytes -= write_length;
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, write_length, NULL, 0, PA_SEEK_RELATIVE);
+        pa_stream_write(s, This->buffer, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset = nbytes;
+    }
+
+    This->buffer_read_offset %= This->buffer_length;
+}
+
+/* Called when the stream underruns. Just for information */
+static void DSPULSE_BufferUnderflowCallback(pa_stream *s, void *userdata) {
+    WARN("(%p) underrun.\n", userdata);
+}
+
+/* Connects a stream to the server. Does not update
+ * IDsDriverBufferImpl->fraglen. Does not lock the pulse mainloop or free
+ * objects in case of failure. This should be handled by the calling function.
+ */
+static HRESULT DSPULSE_ConnectStream(IDsDriverBufferImpl* This) {
+    pa_buffer_attr ba_request;
+    const pa_buffer_attr *ba_obtained;
+    char c[PA_SAMPLE_SPEC_SNPRINT_MAX];
+    pa_stream_flags_t stream_flags = PA_STREAM_START_CORKED;
+
+#if PA_PROTOCOL_VERSION >= 14
+    /* We are a "fragment wait based" application, so this flag should be
+     * acceptable. */
+    stream_flags |= PA_STREAM_EARLY_REQUESTS;
+#elif PA_PROTOCOL_VERSION >= 13 && PA_API_VERSION >= 12
+    stream_flags |= PA_STREAM_ADJUST_LATENCY;
+#endif
+
+    pa_sample_spec_snprint(c, PA_SAMPLE_SPEC_SNPRINT_MAX, &This->sample_spec);
+    TRACE("Sample spec %s fragment size %u.\n", c, This->fraglen);
+
+    ba_request.tlength = This->fraglen * 4;     //  ~40ms
+    ba_request.minreq = This->fraglen;          //  ~10ms
+    ba_request.prebuf = (uint32_t)-1;           //  same as tlength
+    ba_request.maxlength = This->buffer_length; //  2^x = ~3s
+
+    TRACE("Asking for buffer tlength:%u (%llums) minreq:%u (%llums)\n",
+        ba_request.tlength, pa_bytes_to_usec(ba_request.tlength, &This->sample_spec)/1000,
+        ba_request.minreq, pa_bytes_to_usec(ba_request.minreq, &This->sample_spec)/1000);
+
+    This->stream = pa_stream_new(PULSE_context, "DirectSound Buffer", &This->sample_spec, NULL);
+    if (!This->stream) return DSERR_BADFORMAT;
+
+    pa_stream_set_state_callback(This->stream, PULSE_StreamStateCallback, This);
+    pa_stream_set_write_callback(This->stream, DSPULSE_BufferReadCallback, This);
+    pa_stream_set_underflow_callback(This->stream, DSPULSE_BufferUnderflowCallback, This);
+
+    TRACE("Attempting to connect (%p)->stream for playback on %s\n", This, WOutDev[This->drv->wDevID].device_name);
+    pa_stream_connect_playback(This->stream, WOutDev[This->drv->wDevID].device_name, &ba_request, stream_flags, NULL, NULL);
+    for (;;) {
+        pa_context_state_t cstate = pa_context_get_state(PULSE_context);
+        pa_stream_state_t sstate = pa_stream_get_state(This->stream);
+
+        if (cstate == PA_CONTEXT_FAILED || cstate == PA_CONTEXT_TERMINATED ||
+            sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED) {
+            ERR("Failed to connect stream context object: %s\n", pa_strerror(pa_context_errno(PULSE_context)));
+            return DSERR_BUFFERLOST;
+        }
+
+        if (sstate == PA_STREAM_READY)
+            break;
+
[...2991 lines suppressed...]
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |	/* Mono	    11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |	/* Mono	    11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |	/* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |	/* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |	/* Mono	    22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |	/* Mono	    22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |	/* Stereo   22050Hz 8-bit  */\
+	WAVE_FORMAT_2S16 |	/* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |	/* Mono	    44100Hz 8-bit  */\
+	WAVE_FORMAT_4M16 |	/* Mono	    44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |	/* Stereo   44100Hz 8-bit  */\
+	WAVE_FORMAT_4S16 |	/* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |	/* Mono	    48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |	/* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |	/* Mono	    48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |	/* Stereo   48000Hz 16-bit */\
+	WAVE_FORMAT_96M08 |	/* Mono	    96000Hz 8-bit  */\
+	WAVE_FORMAT_96S08 |	/* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |	/* Mono	    96000Hz 16-bit */\
+	WAVE_FORMAT_96S16	/* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message 	msg;	/* message identifier */
+    DWORD	                param;  /* parameter for this message */
+    HANDLE	                hEvent;	/* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG			* messages;
+    int                         ring_buffer_size;
+    int				msg_tosave;
+    int				msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION		msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+typedef struct IDsDriverImpl IDsDriverImpl;
+typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
+
+struct IDsDriverImpl {
+    /* IUnknown fields */
+    const IDsDriverVtbl *lpVtbl;
+    LONG    ref;
+
+    IDsDriverBufferImpl *primary;
+    UINT    wDevID;
+};
+
+struct IDsDriverBufferImpl {
+    const IDsDriverBufferVtbl	*lpVtbl;
+    IDsDriverImpl*		drv;
+    LONG			ref;
+    pa_stream			*stream;
+    pa_sample_spec		sample_spec;
+    pa_cvolume			volume;
+
+    PBYTE		buffer;
+    DWORD		buffer_length;
+    DWORD		buffer_read_offset;
+    DWORD		buffer_play_offset;
+    DWORD		fraglen;
+};
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char		*device_name;
+    pa_cvolume		volume;
+
+    union {
+        WAVEOUTCAPSW	out;
+	WAVEINCAPSW	in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    volatile INT        state;		    /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD		wFlags;
+
+    pa_stream		*stream;	    /* The PulseAudio stream */
+    const pa_timing_info	*timing_info;
+    pa_sample_spec	sample_spec;	    /* Sample spec of this stream / device */
+    pa_cvolume		volume;
+    pa_buffer_attr	buffer_attr;
+
+    /* waveIn / waveOut wavaHdr information */
+    LPWAVEHDR		lpQueuePtr;	    /* start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR		lpPlayPtr;	    /* start of not yet fully written buffers */
+    DWORD		dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR		lpLoopPtr;          /* pointer of first buffer in loop, if any */
+    DWORD		dwLoops;	    /* private copy of loop counter */
+
+    /* Virtual stream positioning information */
+    DWORD		last_reset;	    /* When the last reset occured, as pa stream time doesn't reset */
+    struct timeval	last_header;	    /* When the last wavehdr was received, only updated when audio is not playing yet */
+    BOOL		is_releasing;	    /* Whether we are releasing wavehdrs */
+    struct timeval	started_releasing;  /* When wavehdr releasing started, for comparison to queued written wavehdrs */
+    DWORD		releasing_offset;   /* How much audio has been released prior when releasing started in this instance */
+
+    /* waveIn */
+    const void		*buffer;	    /* Pointer to the latest data fragment for recording streams */
+    DWORD		buffer_length;	    /* How large the latest data fragment is */
+    DWORD		buffer_read_offset; /* How far into latest data fragment we last read */
+    DWORD		fraglen;    
+
+    /* Thread communication and synchronization stuff */
+    HANDLE		hStartUpEvent;
+    HANDLE		hThread;
+    DWORD		dwThreadID;
+    PULSE_MSG_RING	msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context		*PULSE_context;   /* Connection Context */
+pa_threaded_mainloop	*PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c */
+void	PULSE_WaitForOperation(pa_operation *o);
+void	PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void	PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamRequestCallback(pa_stream *s, size_t n, void *userdata);
+void	PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamOverflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void	PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+BOOL	PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+void	PULSE_GetMMTime(const pa_timing_info *t, pa_sample_spec *s, size_t last_reset, LPMMTIME lpTime);
+int	PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int	PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int	PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int	PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+const char * PULSE_getCmdString(enum win_wm_message msg);
+
+/* dsoutput.c */
+DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
+DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
+#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	24 Feb 2009 20:45:08 -0000	1.71
+++ .cvsignore	7 Apr 2009 13:40:40 -0000	1.72
@@ -1 +1 @@
-wine-1.1.15-fe.tar.bz2
+wine-1.1.18-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	24 Feb 2009 20:45:08 -0000	1.72
+++ sources	7 Apr 2009 13:40:40 -0000	1.73
@@ -1 +1 @@
-cfeb6cfd7404c2fed2c9f2623976ea7e  wine-1.1.15-fe.tar.bz2
+1933049a7cc725bcb488c6669fa5ca9e  wine-1.1.18-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- wine.spec	15 Mar 2009 19:43:11 -0000	1.100
+++ wine.spec	7 Apr 2009 13:40:40 -0000	1.101
@@ -1,6 +1,6 @@
 Name:		wine
-Version:	1.1.15
-Release:	3%{?dist}
+Version:	1.1.18
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -43,7 +43,7 @@
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.17-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.20.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.24.patch
 Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
@@ -402,15 +402,12 @@
 %{_bindir}/regsvr32
 %{_bindir}/wine
 %{_bindir}/wineboot
-%{_bindir}/winebrowser
 %{_bindir}/wineconsole
 %{_bindir}/wineprefixcreate
 %{_mandir}/man1/wineprefixcreate.1*
 %{_bindir}/winecfg
-%{_bindir}/uninstaller
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
-%{_libdir}/wine/winhelp.exe16
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -438,11 +435,7 @@
 %lang(fr) %{_mandir}/fr.UTF-8/man1/*
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
-%{_bindir}/wine-kthread
 %{_bindir}/wine-preloader
-%{_bindir}/wine-pthread
-# < 0.9.60
-#%{_bindir}/winelauncher
 %{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
 %dir %{_libdir}/wine
@@ -458,7 +451,6 @@
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
-%{_libdir}/wine/avifile.dll16
 %{_libdir}/wine/browseui.dll.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
@@ -468,9 +460,7 @@
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/comm.drv16
 %{_libdir}/wine/commdlg.dll16
-%{_libdir}/wine/compobj.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -480,9 +470,7 @@
 %{_libdir}/wine/cryptnet.dll.so
 %{_libdir}/wine/cryptui.dll.so
 %{_libdir}/wine/ctapi32.dll.so
-%{_libdir}/wine/ctl3d.dll16
 %{_libdir}/wine/ctl3d32.dll.so
-%{_libdir}/wine/ctl3dv2.dll16
 %{_libdir}/wine/d3d10.dll.so
 %{_libdir}/wine/d3d10core.dll.so
 %{_libdir}/wine/d3dim.dll.so
@@ -497,8 +485,6 @@
 %{_libdir}/wine/devenum.dll.so
 %{_libdir}/wine/dinput.dll.so
 %{_libdir}/wine/dinput8.dll.so
-%{_libdir}/wine/dispdib.dll16
-%{_libdir}/wine/display.drv16
 %{_libdir}/wine/dmband.dll.so
 %{_libdir}/wine/dmcompos.dll.so
 %{_libdir}/wine/dmime.dll.so
@@ -543,7 +529,6 @@
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
-%{_libdir}/wine/imm.dll16
 %{_libdir}/wine/imm32.dll.so
 %{_libdir}/wine/inetcomm.dll.so
 %{_libdir}/wine/inetmib1.dll.so
@@ -556,14 +541,12 @@
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/keyboard.drv16
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
 %{_libdir}/wine/lodctr.exe.so
 %{_libdir}/wine/lz32.dll.so
-%{_libdir}/wine/lzexpand.dll16
 %{_libdir}/wine/mapi32.dll.so
 %{_libdir}/wine/mciavi32.dll.so
 %{_libdir}/wine/mcicda.dll.so
@@ -575,10 +558,8 @@
 %{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
-%{_libdir}/wine/mouse.drv16
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
-%{_libdir}/wine/msacm.dll16
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
@@ -620,20 +601,12 @@
 %{_libdir}/wine/objsel.dll.so
 %{_libdir}/wine/odbc32.dll.so
 %{_libdir}/wine/odbccp32.dll.so
-%{_libdir}/wine/ole2.dll16
-%{_libdir}/wine/ole2conv.dll16
-%{_libdir}/wine/ole2disp.dll16
-%{_libdir}/wine/ole2nls.dll16
-%{_libdir}/wine/ole2prox.dll16
-%{_libdir}/wine/ole2thk.dll16
 %{_libdir}/wine/ole32.dll.so
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
-%{_libdir}/wine/olecli.dll16
 %{_libdir}/wine/olecli32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
-%{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
@@ -649,7 +622,6 @@
 %{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
-%{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
 %{_libdir}/wine/rasdlg.dll.so
 %{_libdir}/wine/resutils.dll.so
@@ -676,13 +648,10 @@
 %{_libdir}/wine/slc.dll.so
 %{_libdir}/wine/snmpapi.dll.so
 %{_libdir}/wine/softpub.dll.so
-%{_libdir}/wine/sound.drv16
 %{_libdir}/wine/spoolsv.exe.so
 %{_libdir}/wine/stdole2.tlb.so
 %{_libdir}/wine/stdole32.tlb.so
 %{_libdir}/wine/sti.dll.so
-%{_libdir}/wine/storage.dll16
-%{_libdir}/wine/stress.dll16
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
@@ -690,7 +659,6 @@
 %{_libdir}/wine/tapi32.dll.so
 %{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
-%{_libdir}/wine/typelib.dll16
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
@@ -711,11 +679,6 @@
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/w32sys.dll16
-%{_libdir}/wine/win32s16.dll16
-%{_libdir}/wine/win87em.dll16
-%{_libdir}/wine/winaspi.dll16
-%{_libdir}/wine/windebug.dll16
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/wineoss.drv.so
@@ -727,15 +690,12 @@
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
-%{_libdir}/wine/winnls.dll16
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/spoolss.dll.so
-%{_libdir}/wine/winoldap.mod16
 %{_libdir}/wine/winscard.dll.so
-%{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
@@ -764,11 +724,47 @@
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
+# 16bit
+%{_libdir}/wine/avifile.dll16.so
+%{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/compobj.dll16.so
+%{_libdir}/wine/ctl3d.dll16.so
+%{_libdir}/wine/ctl3dv2.dll16.so
+%{_libdir}/wine/dispdib.dll16.so
+%{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/keyboard.drv16.so
+%{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mciqtz32.dll.so
+%{_libdir}/wine/mouse.drv16.so
+%{_libdir}/wine/msacm.dll16.so
+%{_libdir}/wine/ole2.dll16.so
+%{_libdir}/wine/ole2conv.dll16.so
+%{_libdir}/wine/ole2disp.dll16.so
+%{_libdir}/wine/ole2nls.dll16.so
+%{_libdir}/wine/ole2prox.dll16.so
+%{_libdir}/wine/ole2thk.dll16.so
+%{_libdir}/wine/olecli.dll16.so
+%{_libdir}/wine/olesvr.dll16.so
+%{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/sound.drv16.so
+%{_libdir}/wine/storage.dll16.so
+%{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/twain.dll16.so
+%{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/w32sys.dll16.so
+%{_libdir}/wine/win32s16.dll16.so
+%{_libdir}/wine/win87em.dll16.so
+%{_libdir}/wine/winaspi.dll16.so
+%{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/winhelp.exe16.so
+%{_libdir}/wine/winnls.dll16.so
+%{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/wintab.dll16.so
 
 %files tools
 %defattr(-,root,root,-)
 %{_bindir}/notepad
-%{_bindir}/progman
 %{_bindir}/winedbg
 %{_bindir}/winedump
 %{_bindir}/winefile
@@ -826,7 +822,6 @@
 
 %files twain
 %defattr(-,root,root,-)
-%{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
@@ -869,6 +864,11 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Mar 30 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.18-1
+- version upgrade (#490672, #491321)
+- winepulse update
+
 * Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.1.15-3
 ??? Make sure F11 font packages have been built with F11 fontforge
 


--- winepulse-0.20.patch DELETED ---



From awjb at fedoraproject.org  Tue Apr  7 13:41:10 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  7 Apr 2009 13:41:10 +0000 (UTC)
Subject: rpms/wine/F-11 winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.71,
	1.72 sources, 1.72, 1.73 wine.spec, 1.100,
	1.101 winepulse-0.20.patch, 1.1, NONE
Message-ID: <20090407134110.9973B70100@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8920/F-11

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	winepulse-0.24.patch 
Removed Files:
	winepulse-0.20.patch 
Log Message:
- version upgrade


winepulse-0.24.patch:

--- NEW FILE winepulse-0.24.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..327f225
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = dxguid uuid winmm user32 advapi32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = dsoutput.c \
+	waveout.c \
+	wavein.c \
+	pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/dsoutput.c b/dlls/winepulse.drv/dsoutput.c
new file mode 100644
index 0000000..b37313a
--- /dev/null
+++ b/dlls/winepulse.drv/dsoutput.c
@@ -0,0 +1,576 @@
+/*
+ * Wine Driver for PulseAudio - DSound Output Functionality
+ * http://pulseaudio.org/
+ *
+ * Copyright	2009 Arthur Talyor <theycallhimart at gmail.com>
+ *
+ * Conatins code from other wine multimedia drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "mmddk.h"
+#include "dsound.h"
+#include "dsdriver.h"
+#include "winreg.h"
+
+#include <winepulse.h>
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dspulse);
+
+#if HAVE_PULSEAUDIO
+
+/*======================================================================*
+ *                  Low level DSOUND implementation			*
+ *======================================================================*/
+
+/* A buffer is allocated with a pointer indicating the read position in the
+ * buffer. The pulse write callback reads data from the buffer, updating the
+ * read pointer to the location at the end of the read. Upon reaching the end
+ * or attempting to read past the end of buffer the read pointer wraps around
+ * to the beginning again. DirectSound applications can write anywhere in the
+ * buffer at anytime without locking and can know the location of the read
+ * pointer. The position of the read pointer cannot be changed by the
+ * application and access to it uses a locking scheme. A fake pointer
+ * indicating estimated playback position is also available to the application.
+ * Applications can potentially write to the same area of memory which is also
+ * being read by the pulse thread. However, this is uncommon as directsound
+ * applications know where pulse should be reading from via the pointer
+ * locations and MSDN says that such an operation should be avoided with the
+ * results being undefined.
+ */
+
+/* Fragment lengths try to be a power of two close to 10ms worth of data. See
+ * dlls/dsound/mixer.c
+ */
+static int fragment_length(pa_sample_spec *s) {
+    if (s->rate <= 12800)
+        return 128 * pa_frame_size(s);
+
+    if (s->rate <= 25600)
+        return 256 * pa_frame_size(s);
+
+    if (s->rate <= 51200)
+        return 512 * pa_frame_size(s);
+
+    return 1024 * pa_frame_size(s);
+}
+
+/* Callback from the pulse thread for stream data */
+static void DSPULSE_BufferReadCallback(pa_stream *s, size_t nbytes, void *userdata) {
+    IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)userdata;
+
+    if (!This->buffer)
+        return;
+
+    /* Fraglens are always powers of 2 */
+    nbytes+= This->fraglen - 1;
+    nbytes&= ~(This->fraglen - 1);
+
+    /* If we advance more than 10 fragments at a time it appears that the buffer
+     * pointer is never advancing because of wrap-around. Evil magic numbers. */
+    if (nbytes > This->fraglen * 5)
+        nbytes = This->fraglen * 5;
+
+    TRACE("Reading %u bytes.\n", nbytes);
+
+    if (This->buffer_read_offset + nbytes <= This->buffer_length) {
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset += nbytes;
+    } else {
+        size_t write_length = This->buffer_length - This->buffer_read_offset;
+        nbytes -= write_length;
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, write_length, NULL, 0, PA_SEEK_RELATIVE);
+        pa_stream_write(s, This->buffer, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset = nbytes;
+    }
+
+    This->buffer_read_offset %= This->buffer_length;
+}
+
+/* Called when the stream underruns. Just for information */
+static void DSPULSE_BufferUnderflowCallback(pa_stream *s, void *userdata) {
+    WARN("(%p) underrun.\n", userdata);
+}
+
+/* Connects a stream to the server. Does not update
+ * IDsDriverBufferImpl->fraglen. Does not lock the pulse mainloop or free
+ * objects in case of failure. This should be handled by the calling function.
+ */
+static HRESULT DSPULSE_ConnectStream(IDsDriverBufferImpl* This) {
+    pa_buffer_attr ba_request;
+    const pa_buffer_attr *ba_obtained;
+    char c[PA_SAMPLE_SPEC_SNPRINT_MAX];
+    pa_stream_flags_t stream_flags = PA_STREAM_START_CORKED;
+
+#if PA_PROTOCOL_VERSION >= 14
+    /* We are a "fragment wait based" application, so this flag should be
+     * acceptable. */
+    stream_flags |= PA_STREAM_EARLY_REQUESTS;
+#elif PA_PROTOCOL_VERSION >= 13 && PA_API_VERSION >= 12
+    stream_flags |= PA_STREAM_ADJUST_LATENCY;
+#endif
+
+    pa_sample_spec_snprint(c, PA_SAMPLE_SPEC_SNPRINT_MAX, &This->sample_spec);
+    TRACE("Sample spec %s fragment size %u.\n", c, This->fraglen);
+
+    ba_request.tlength = This->fraglen * 4;     //  ~40ms
+    ba_request.minreq = This->fraglen;          //  ~10ms
+    ba_request.prebuf = (uint32_t)-1;           //  same as tlength
+    ba_request.maxlength = This->buffer_length; //  2^x = ~3s
+
+    TRACE("Asking for buffer tlength:%u (%llums) minreq:%u (%llums)\n",
+        ba_request.tlength, pa_bytes_to_usec(ba_request.tlength, &This->sample_spec)/1000,
+        ba_request.minreq, pa_bytes_to_usec(ba_request.minreq, &This->sample_spec)/1000);
+
+    This->stream = pa_stream_new(PULSE_context, "DirectSound Buffer", &This->sample_spec, NULL);
+    if (!This->stream) return DSERR_BADFORMAT;
+
+    pa_stream_set_state_callback(This->stream, PULSE_StreamStateCallback, This);
+    pa_stream_set_write_callback(This->stream, DSPULSE_BufferReadCallback, This);
+    pa_stream_set_underflow_callback(This->stream, DSPULSE_BufferUnderflowCallback, This);
+
+    TRACE("Attempting to connect (%p)->stream for playback on %s\n", This, WOutDev[This->drv->wDevID].device_name);
+    pa_stream_connect_playback(This->stream, WOutDev[This->drv->wDevID].device_name, &ba_request, stream_flags, NULL, NULL);
+    for (;;) {
+        pa_context_state_t cstate = pa_context_get_state(PULSE_context);
+        pa_stream_state_t sstate = pa_stream_get_state(This->stream);
+
+        if (cstate == PA_CONTEXT_FAILED || cstate == PA_CONTEXT_TERMINATED ||
+            sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED) {
+            ERR("Failed to connect stream context object: %s\n", pa_strerror(pa_context_errno(PULSE_context)));
+            return DSERR_BUFFERLOST;
+        }
+
+        if (sstate == PA_STREAM_READY)
+            break;
+
[...2991 lines suppressed...]
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |	/* Mono	    11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |	/* Mono	    11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |	/* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |	/* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |	/* Mono	    22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |	/* Mono	    22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |	/* Stereo   22050Hz 8-bit  */\
+	WAVE_FORMAT_2S16 |	/* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |	/* Mono	    44100Hz 8-bit  */\
+	WAVE_FORMAT_4M16 |	/* Mono	    44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |	/* Stereo   44100Hz 8-bit  */\
+	WAVE_FORMAT_4S16 |	/* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |	/* Mono	    48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |	/* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |	/* Mono	    48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |	/* Stereo   48000Hz 16-bit */\
+	WAVE_FORMAT_96M08 |	/* Mono	    96000Hz 8-bit  */\
+	WAVE_FORMAT_96S08 |	/* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |	/* Mono	    96000Hz 16-bit */\
+	WAVE_FORMAT_96S16	/* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message 	msg;	/* message identifier */
+    DWORD	                param;  /* parameter for this message */
+    HANDLE	                hEvent;	/* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG			* messages;
+    int                         ring_buffer_size;
+    int				msg_tosave;
+    int				msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION		msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+typedef struct IDsDriverImpl IDsDriverImpl;
+typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
+
+struct IDsDriverImpl {
+    /* IUnknown fields */
+    const IDsDriverVtbl *lpVtbl;
+    LONG    ref;
+
+    IDsDriverBufferImpl *primary;
+    UINT    wDevID;
+};
+
+struct IDsDriverBufferImpl {
+    const IDsDriverBufferVtbl	*lpVtbl;
+    IDsDriverImpl*		drv;
+    LONG			ref;
+    pa_stream			*stream;
+    pa_sample_spec		sample_spec;
+    pa_cvolume			volume;
+
+    PBYTE		buffer;
+    DWORD		buffer_length;
+    DWORD		buffer_read_offset;
+    DWORD		buffer_play_offset;
+    DWORD		fraglen;
+};
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char		*device_name;
+    pa_cvolume		volume;
+
+    union {
+        WAVEOUTCAPSW	out;
+	WAVEINCAPSW	in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    volatile INT        state;		    /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD		wFlags;
+
+    pa_stream		*stream;	    /* The PulseAudio stream */
+    const pa_timing_info	*timing_info;
+    pa_sample_spec	sample_spec;	    /* Sample spec of this stream / device */
+    pa_cvolume		volume;
+    pa_buffer_attr	buffer_attr;
+
+    /* waveIn / waveOut wavaHdr information */
+    LPWAVEHDR		lpQueuePtr;	    /* start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR		lpPlayPtr;	    /* start of not yet fully written buffers */
+    DWORD		dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR		lpLoopPtr;          /* pointer of first buffer in loop, if any */
+    DWORD		dwLoops;	    /* private copy of loop counter */
+
+    /* Virtual stream positioning information */
+    DWORD		last_reset;	    /* When the last reset occured, as pa stream time doesn't reset */
+    struct timeval	last_header;	    /* When the last wavehdr was received, only updated when audio is not playing yet */
+    BOOL		is_releasing;	    /* Whether we are releasing wavehdrs */
+    struct timeval	started_releasing;  /* When wavehdr releasing started, for comparison to queued written wavehdrs */
+    DWORD		releasing_offset;   /* How much audio has been released prior when releasing started in this instance */
+
+    /* waveIn */
+    const void		*buffer;	    /* Pointer to the latest data fragment for recording streams */
+    DWORD		buffer_length;	    /* How large the latest data fragment is */
+    DWORD		buffer_read_offset; /* How far into latest data fragment we last read */
+    DWORD		fraglen;    
+
+    /* Thread communication and synchronization stuff */
+    HANDLE		hStartUpEvent;
+    HANDLE		hThread;
+    DWORD		dwThreadID;
+    PULSE_MSG_RING	msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context		*PULSE_context;   /* Connection Context */
+pa_threaded_mainloop	*PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c */
+void	PULSE_WaitForOperation(pa_operation *o);
+void	PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void	PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamRequestCallback(pa_stream *s, size_t n, void *userdata);
+void	PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamOverflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void	PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+BOOL	PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+void	PULSE_GetMMTime(const pa_timing_info *t, pa_sample_spec *s, size_t last_reset, LPMMTIME lpTime);
+int	PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int	PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int	PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int	PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+const char * PULSE_getCmdString(enum win_wm_message msg);
+
+/* dsoutput.c */
+DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
+DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
+#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	24 Feb 2009 20:45:08 -0000	1.71
+++ .cvsignore	7 Apr 2009 13:40:40 -0000	1.72
@@ -1 +1 @@
-wine-1.1.15-fe.tar.bz2
+wine-1.1.18-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	24 Feb 2009 20:45:08 -0000	1.72
+++ sources	7 Apr 2009 13:40:40 -0000	1.73
@@ -1 +1 @@
-cfeb6cfd7404c2fed2c9f2623976ea7e  wine-1.1.15-fe.tar.bz2
+1933049a7cc725bcb488c6669fa5ca9e  wine-1.1.18-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- wine.spec	15 Mar 2009 19:43:11 -0000	1.100
+++ wine.spec	7 Apr 2009 13:40:40 -0000	1.101
@@ -1,6 +1,6 @@
 Name:		wine
-Version:	1.1.15
-Release:	3%{?dist}
+Version:	1.1.18
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -43,7 +43,7 @@
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.17-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.20.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.24.patch
 Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
@@ -402,15 +402,12 @@
 %{_bindir}/regsvr32
 %{_bindir}/wine
 %{_bindir}/wineboot
-%{_bindir}/winebrowser
 %{_bindir}/wineconsole
 %{_bindir}/wineprefixcreate
 %{_mandir}/man1/wineprefixcreate.1*
 %{_bindir}/winecfg
-%{_bindir}/uninstaller
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
-%{_libdir}/wine/winhelp.exe16
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -438,11 +435,7 @@
 %lang(fr) %{_mandir}/fr.UTF-8/man1/*
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
-%{_bindir}/wine-kthread
 %{_bindir}/wine-preloader
-%{_bindir}/wine-pthread
-# < 0.9.60
-#%{_bindir}/winelauncher
 %{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
 %dir %{_libdir}/wine
@@ -458,7 +451,6 @@
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
-%{_libdir}/wine/avifile.dll16
 %{_libdir}/wine/browseui.dll.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
@@ -468,9 +460,7 @@
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/comm.drv16
 %{_libdir}/wine/commdlg.dll16
-%{_libdir}/wine/compobj.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -480,9 +470,7 @@
 %{_libdir}/wine/cryptnet.dll.so
 %{_libdir}/wine/cryptui.dll.so
 %{_libdir}/wine/ctapi32.dll.so
-%{_libdir}/wine/ctl3d.dll16
 %{_libdir}/wine/ctl3d32.dll.so
-%{_libdir}/wine/ctl3dv2.dll16
 %{_libdir}/wine/d3d10.dll.so
 %{_libdir}/wine/d3d10core.dll.so
 %{_libdir}/wine/d3dim.dll.so
@@ -497,8 +485,6 @@
 %{_libdir}/wine/devenum.dll.so
 %{_libdir}/wine/dinput.dll.so
 %{_libdir}/wine/dinput8.dll.so
-%{_libdir}/wine/dispdib.dll16
-%{_libdir}/wine/display.drv16
 %{_libdir}/wine/dmband.dll.so
 %{_libdir}/wine/dmcompos.dll.so
 %{_libdir}/wine/dmime.dll.so
@@ -543,7 +529,6 @@
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
-%{_libdir}/wine/imm.dll16
 %{_libdir}/wine/imm32.dll.so
 %{_libdir}/wine/inetcomm.dll.so
 %{_libdir}/wine/inetmib1.dll.so
@@ -556,14 +541,12 @@
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/keyboard.drv16
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
 %{_libdir}/wine/lodctr.exe.so
 %{_libdir}/wine/lz32.dll.so
-%{_libdir}/wine/lzexpand.dll16
 %{_libdir}/wine/mapi32.dll.so
 %{_libdir}/wine/mciavi32.dll.so
 %{_libdir}/wine/mcicda.dll.so
@@ -575,10 +558,8 @@
 %{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
-%{_libdir}/wine/mouse.drv16
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
-%{_libdir}/wine/msacm.dll16
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
@@ -620,20 +601,12 @@
 %{_libdir}/wine/objsel.dll.so
 %{_libdir}/wine/odbc32.dll.so
 %{_libdir}/wine/odbccp32.dll.so
-%{_libdir}/wine/ole2.dll16
-%{_libdir}/wine/ole2conv.dll16
-%{_libdir}/wine/ole2disp.dll16
-%{_libdir}/wine/ole2nls.dll16
-%{_libdir}/wine/ole2prox.dll16
-%{_libdir}/wine/ole2thk.dll16
 %{_libdir}/wine/ole32.dll.so
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
-%{_libdir}/wine/olecli.dll16
 %{_libdir}/wine/olecli32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
-%{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
@@ -649,7 +622,6 @@
 %{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
-%{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
 %{_libdir}/wine/rasdlg.dll.so
 %{_libdir}/wine/resutils.dll.so
@@ -676,13 +648,10 @@
 %{_libdir}/wine/slc.dll.so
 %{_libdir}/wine/snmpapi.dll.so
 %{_libdir}/wine/softpub.dll.so
-%{_libdir}/wine/sound.drv16
 %{_libdir}/wine/spoolsv.exe.so
 %{_libdir}/wine/stdole2.tlb.so
 %{_libdir}/wine/stdole32.tlb.so
 %{_libdir}/wine/sti.dll.so
-%{_libdir}/wine/storage.dll16
-%{_libdir}/wine/stress.dll16
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
@@ -690,7 +659,6 @@
 %{_libdir}/wine/tapi32.dll.so
 %{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
-%{_libdir}/wine/typelib.dll16
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
@@ -711,11 +679,6 @@
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/w32sys.dll16
-%{_libdir}/wine/win32s16.dll16
-%{_libdir}/wine/win87em.dll16
-%{_libdir}/wine/winaspi.dll16
-%{_libdir}/wine/windebug.dll16
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/wineoss.drv.so
@@ -727,15 +690,12 @@
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
-%{_libdir}/wine/winnls.dll16
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/spoolss.dll.so
-%{_libdir}/wine/winoldap.mod16
 %{_libdir}/wine/winscard.dll.so
-%{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
@@ -764,11 +724,47 @@
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
+# 16bit
+%{_libdir}/wine/avifile.dll16.so
+%{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/compobj.dll16.so
+%{_libdir}/wine/ctl3d.dll16.so
+%{_libdir}/wine/ctl3dv2.dll16.so
+%{_libdir}/wine/dispdib.dll16.so
+%{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/keyboard.drv16.so
+%{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mciqtz32.dll.so
+%{_libdir}/wine/mouse.drv16.so
+%{_libdir}/wine/msacm.dll16.so
+%{_libdir}/wine/ole2.dll16.so
+%{_libdir}/wine/ole2conv.dll16.so
+%{_libdir}/wine/ole2disp.dll16.so
+%{_libdir}/wine/ole2nls.dll16.so
+%{_libdir}/wine/ole2prox.dll16.so
+%{_libdir}/wine/ole2thk.dll16.so
+%{_libdir}/wine/olecli.dll16.so
+%{_libdir}/wine/olesvr.dll16.so
+%{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/sound.drv16.so
+%{_libdir}/wine/storage.dll16.so
+%{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/twain.dll16.so
+%{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/w32sys.dll16.so
+%{_libdir}/wine/win32s16.dll16.so
+%{_libdir}/wine/win87em.dll16.so
+%{_libdir}/wine/winaspi.dll16.so
+%{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/winhelp.exe16.so
+%{_libdir}/wine/winnls.dll16.so
+%{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/wintab.dll16.so
 
 %files tools
 %defattr(-,root,root,-)
 %{_bindir}/notepad
-%{_bindir}/progman
 %{_bindir}/winedbg
 %{_bindir}/winedump
 %{_bindir}/winefile
@@ -826,7 +822,6 @@
 
 %files twain
 %defattr(-,root,root,-)
-%{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
@@ -869,6 +864,11 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Mar 30 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.18-1
+- version upgrade (#490672, #491321)
+- winepulse update
+
 * Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.1.15-3
 ??? Make sure F11 font packages have been built with F11 fontforge
 


--- winepulse-0.20.patch DELETED ---



From krh at fedoraproject.org  Tue Apr  7 13:42:02 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Tue,  7 Apr 2009 13:42:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel rc1-to-2.7.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.10, 1.11 no-legacy3d.patch, 1.1, NONE
Message-ID: <20090407134202.9707470100@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9361

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	rc1-to-2.7.patch 
Removed Files:
	no-legacy3d.patch 
Log Message:
* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.6.99.902-1
- Update to newer 2.7 snapshot, drop no-legacy3d.patch.


rc1-to-2.7.patch:

--- NEW FILE rc1-to-2.7.patch ---
diff --git a/configure.ac b/configure.ac
index aeb675c..7d38cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ if test "x$GCC" = "xyes"; then
 	-Wnested-externs -fno-strict-aliasing"
 fi
 
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.5])
+PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.6])
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
diff --git a/man/Makefile.am b/man/Makefile.am
index 7432d5a..ac08621 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,21 +25,12 @@
 # 
 
 drivermandir = $(DRIVER_MAN_DIR)
+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
 
-DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
-
-driverman_PRE = @DRIVER_NAME at .man
-
-driverman_DATA = \
-	$(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
-	i810. at DRIVER_MAN_SUFFIX@
-
-EXTRA_DIST = @DRIVER_NAME at .man
+EXTRA_DIST = $(DRIVER_NAME).man
 
 CLEANFILES = $(driverman_DATA)
 
-SED = sed
-
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
@@ -60,10 +51,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
-
-BUILT_SOURCES = shadows.DONE
-
-shadows.DONE:
-	-rm -f i810. at DRIVER_MAN_SUFFIX@
-	echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
-		i810. at DRIVER_MAN_SUFFIX@
diff --git a/man/intel.man b/man/intel.man
index ee237f8..ffe69a1 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -146,15 +146,6 @@ have options for selecting adaptors.
 .IP
 Default: Textured video adaptor is preferred.
 .TP
-.BI "Option \*qLegacy3D\*q \*q" boolean \*q
-Enable support for the non-GEM mode of the 3D driver on i830 and newer.
-This will allocate a large static area for older Mesa to use for its texture
-pool.  On systems with a working GEM environment, this can be disabled to
-increase the memory pool available to other graphics tasks.
-.IP
-Default for i830 and newer: Enabled.
-.IP
-Default for i810: this option is not used.
 .BI "Option \*qAccelMethod\*q \*q" string \*q
 Choose acceleration architecture, either "XAA", "EXA", or "UXA".  XAA is the old
 XFree86 based acceleration architecture.  EXA is a simpler
@@ -322,7 +313,7 @@ This property allows you to control the output standard used on your TV output p
 .B TV_Connector
 - connector type
 .TP 2
-This config option should be added to xorg.conf TV monitor's section, it allows you to control the TV output connector type, which bypass load detect. You can select between S-Video, Composite and Component.
+This config option should be added to xorg.conf TV monitor's section, it allows you to force the TV output connector type, which bypass load detect and TV will always be taken as connected. You can select between S-Video, Composite and Component.
 
 .SS "TMDS-1"
 First DVI SDVO output
diff --git a/src/Makefile.am b/src/Makefile.am
index e05dbab..ad87afc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -220,9 +220,3 @@ if XVMC
 intel_drv_la_SOURCES += \
 	$(INTEL_XVMC_SRCS)
 endif
-
-install-data-local: install-intel_drv_laLTLIBRARIES
-	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
-
-uninstall-local:
-	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 141c027..a276ff7 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -60,6 +60,9 @@ typedef struct {
 } drmmode_output_private_rec, *drmmode_output_private_ptr;
 
 static void
+drmmode_output_dpms(xf86OutputPtr output, int mode);
+
+static void
 drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
 			 drmModeModeInfoPtr kmode,
 			 DisplayModePtr	mode)
@@ -210,6 +213,16 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 	else
 		ret = TRUE;
 
+	/* Turn on any outputs on this crtc that may have been disabled */
+	for (i = 0; i < xf86_config->num_output; i++) {
+		xf86OutputPtr output = xf86_config->output[i];
+
+		if (output->crtc != crtc)
+			continue;
+
+		drmmode_output_dpms(output, DPMSModeOn);
+	}
+
 done:
 	if (!ret) {
 		crtc->x = saved_x;
@@ -359,7 +372,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *dat
 		 * unbound. */
 		drmModeRmFB(drmmode->fd, drmmode_crtc->rotate_fb_id);
 		drmmode_crtc->rotate_fb_id = 0;
-		drm_intel_bo_unmap(drmmode_crtc->rotate_bo);
+		drm_intel_gem_bo_unmap_gtt(drmmode_crtc->rotate_bo);
 		dri_bo_unreference(drmmode_crtc->rotate_bo);
 		drmmode_crtc->rotate_bo = NULL;
 	}
diff --git a/src/i810.h b/src/i810.h
index 7ea2043..c88771e 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define I810_VERSION 4000
 #define I810_NAME "intel"
 #define I810_DRIVER_NAME "intel"
-#define I810_LEGACY_DRIVER_NAME "i810"
 
 #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR
 #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 6ae388d..fe4bd62 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -472,21 +472,6 @@ static XF86ModuleVersionInfo intelVersRec = {
 
 _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL };
 
-static XF86ModuleVersionInfo i810VersRec = {
-   "i810",
-   MODULEVENDORSTRING,
-   MODINFOSTRING1,
-   MODINFOSTRING2,
-   XORG_VERSION_CURRENT,
-   INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
-   ABI_CLASS_VIDEODRV,
-   ABI_VIDEODRV_VERSION,
-   MOD_CLASS_VIDEODRV,
-   {0, 0, 0, 0}
-};
-
-_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL };
-
 static pointer
 i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
@@ -681,9 +666,7 @@ I810Probe(DriverPtr drv, int flags)
     * driver, and return if there are none.
     */
    if ((numDevSections =
-	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 &&
-       (numDevSections =
-	xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) {
+	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) {
       return FALSE;
    }
 
diff --git a/src/i830_bios.c b/src/i830_bios.c
index 7f20553..4f2355d 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -161,7 +161,7 @@ parse_general_features(I830Ptr pI830, struct bdb_header *bdb)
     pI830->tv_present = general->int_tv_support;
     pI830->lvds_use_ssc = general->enable_ssc;
     if (pI830->lvds_use_ssc) {
-	if (IS_I855(pI830))
+	if (IS_I85X(pI830))
 	    pI830->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
 	else
 	    pI830->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
@@ -181,6 +181,12 @@ parse_driver_feature(I830Ptr pI830, struct bdb_header *bdb)
     if (!IS_I9XX(pI830))
 	return;
 
+    /* XXX Disable this parsing, as it looks doesn't work for all
+       VBIOS. Reenable it if we could find out the reliable VBT parsing
+       for LVDS config later. */
+    if (1)
+	return;
+
     feature = find_section(bdb, BDB_DRIVER_FEATURES);
     if (!feature)
 	return;
diff --git a/src/i830_display.c b/src/i830_display.c
index ca55906..43ea4d4 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -865,6 +865,9 @@ i830_disable_vga_plane (xf86CrtcPtr crtc)
     sr01 = INREG8(SRX + 1);
     OUTREG8(SRX + 1, sr01 | (1 << 5));
     usleep(30);
+    /* disable center mode on 965GM and G4X platform */
+    if (IS_I965GM(pI830) || IS_G4X(pI830))
+        vgacntrl &= ~(3 << 24);
 
     vgacntrl |= VGA_DISP_DISABLE;
 
@@ -873,14 +876,8 @@ i830_disable_vga_plane (xf86CrtcPtr crtc)
 
 }
 
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void
-i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
+void
+i830_crtc_enable(xf86CrtcPtr crtc)
 {
     ScrnInfoPtr pScrn = crtc->scrn;
     I830Ptr pI830 = I830PTR(pScrn);
@@ -893,112 +890,148 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
     int dspbase_reg = (plane == 0) ? DSPABASE : DSPBBASE;
     uint32_t temp;
 
-    /* XXX: When our outputs are all unaware of DPMS modes other than off and
-     * on, we should map those modes to DPMSModeOff in the CRTC.
-     */
-    switch (mode) {
-    case DPMSModeOn:
-    case DPMSModeStandby:
-    case DPMSModeSuspend:
-	/* Enable the DPLL */
-	temp = INREG(dpll_reg);
-	if ((temp & DPLL_VCO_ENABLE) == 0)
-	{
-	    OUTREG(dpll_reg, temp);
-	    POSTING_READ(dpll_reg);
-	    /* Wait for the clocks to stabilize. */
-	    usleep(150);
-	    OUTREG(dpll_reg, temp | DPLL_VCO_ENABLE);
-	    POSTING_READ(dpll_reg);
-	    /* Wait for the clocks to stabilize. */
-	    usleep(150);
-	    OUTREG(dpll_reg, temp | DPLL_VCO_ENABLE);
-	    POSTING_READ(dpll_reg);
-	    /* Wait for the clocks to stabilize. */
-	    usleep(150);
-	}
+    /* Enable the DPLL */
+    temp = INREG(dpll_reg);
+    if ((temp & DPLL_VCO_ENABLE) == 0)
+    {
+	OUTREG(dpll_reg, temp);
+	POSTING_READ(dpll_reg);
+	/* Wait for the clocks to stabilize. */
+	usleep(150);
+	OUTREG(dpll_reg, temp | DPLL_VCO_ENABLE);
+	POSTING_READ(dpll_reg);
+	/* Wait for the clocks to stabilize. */
+	usleep(150);
+	OUTREG(dpll_reg, temp | DPLL_VCO_ENABLE);
+	POSTING_READ(dpll_reg);
+	/* Wait for the clocks to stabilize. */
+	usleep(150);
+    }
 
-	/* Enable the pipe */
-	temp = INREG(pipeconf_reg);
-	if ((temp & PIPEACONF_ENABLE) == 0)
-	    OUTREG(pipeconf_reg, temp | PIPEACONF_ENABLE);
+    /* Enable the pipe */
+    temp = INREG(pipeconf_reg);
+    if ((temp & PIPEACONF_ENABLE) == 0)
+	OUTREG(pipeconf_reg, temp | PIPEACONF_ENABLE);
 
-	/* Enable the plane */
-	temp = INREG(dspcntr_reg);
-	if ((temp & DISPLAY_PLANE_ENABLE) == 0)
-	{
-	    OUTREG(dspcntr_reg, temp | DISPLAY_PLANE_ENABLE);
-	    /* Flush the plane changes */
-	    OUTREG(dspbase_reg, INREG(dspbase_reg));
-	}
+    /* Enable the plane */
+    temp = INREG(dspcntr_reg);
+    if ((temp & DISPLAY_PLANE_ENABLE) == 0)
+    {
+	OUTREG(dspcntr_reg, temp | DISPLAY_PLANE_ENABLE);
+	/* Flush the plane changes */
+	OUTREG(dspbase_reg, INREG(dspbase_reg));
+    }
 
-	i830_crtc_load_lut(crtc);
+    i830_crtc_load_lut(crtc);
 
-	/* Give the overlay scaler a chance to enable if it's on this pipe */
-	i830_crtc_dpms_video(crtc, TRUE);
+    /* Give the overlay scaler a chance to enable if it's on this pipe */
+    i830_crtc_dpms_video(crtc, TRUE);
 
-	/* Reenable compression if needed */
-	if (i830_use_fb_compression(crtc))
-	    i830_enable_fb_compression(crtc);
-	i830_modeset_ctl(crtc, 0);
-	break;
-    case DPMSModeOff:
-	i830_modeset_ctl(crtc, 1);
-	/* Shut off compression if in use */
-	if (i830_use_fb_compression(crtc))
-	    i830_disable_fb_compression(crtc);
+    /* Reenable compression if needed */
+    if (i830_use_fb_compression(crtc))
+	i830_enable_fb_compression(crtc);
+    i830_modeset_ctl(crtc, 0);
+}
 
-	/* Give the overlay scaler a chance to disable if it's on this pipe */
-	i830_crtc_dpms_video(crtc, FALSE);
+void
+i830_crtc_disable(xf86CrtcPtr crtc, Bool disable_pipe)
+{
+    ScrnInfoPtr pScrn = crtc->scrn;
+    I830Ptr pI830 = I830PTR(pScrn);
+    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+    int pipe = intel_crtc->pipe;
+    int plane = intel_crtc->plane;
+    int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
+    int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
+    int dspcntr_reg = (plane == 0) ? DSPACNTR : DSPBCNTR;
+    int dspbase_reg = (plane == 0) ? DSPABASE : DSPBBASE;
+    uint32_t temp;
 
-	/* 
-	 * The documentation says :
-	 * - Disable planes (VGA or hires)
-	 * - Disable pipe
-	 * - Disable VGA display
-	 */
+    i830_modeset_ctl(crtc, 1);
+    /* Shut off compression if in use */
+    if (i830_use_fb_compression(crtc))
+	i830_disable_fb_compression(crtc);
 
-	/* Disable display plane */
-	temp = INREG(dspcntr_reg);
-	if ((temp & DISPLAY_PLANE_ENABLE) != 0)
-	{
-	    OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
-	    /* Flush the plane changes */
-	    OUTREG(dspbase_reg, INREG(dspbase_reg));
-	    POSTING_READ(dspbase_reg);
-	}
+    /* Give the overlay scaler a chance to disable if it's on this pipe */
+    i830_crtc_dpms_video(crtc, FALSE);
 
-	if (!IS_I9XX(pI830)) {
-	    /* Wait for vblank for the disable to take effect */
-	    i830WaitForVblank(pScrn);
-	}
+    /* 
+     * The documentation says :
+     * - Disable planes (VGA or hires)
+     * - Disable pipe
+     * - Disable VGA display
+     */
 
-	/* May need to leave pipe A on */
-	if ((pipe != 0) || !(pI830->quirk_flag & QUIRK_PIPEA_FORCE))
-	{
-		/* Next, disable display pipes */
-		temp = INREG(pipeconf_reg);
-		if ((temp & PIPEACONF_ENABLE) != 0) {
-		    OUTREG(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
-		    POSTING_READ(pipeconf_reg);
-		}
+    /* Disable display plane */
+    temp = INREG(dspcntr_reg);
+    if ((temp & DISPLAY_PLANE_ENABLE) != 0)
+    {
+	OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
+	/* Flush the plane changes */
+	OUTREG(dspbase_reg, INREG(dspbase_reg));
+	POSTING_READ(dspbase_reg);
+    }
 
-		/* Wait for vblank for the disable to take effect. */
-		i830WaitForVblank(pScrn);
+    if (!IS_I9XX(pI830)) {
+	/* Wait for vblank for the disable to take effect */
+	i830WaitForVblank(pScrn);
+    }
 
-		temp = INREG(dpll_reg);
-		if ((temp & DPLL_VCO_ENABLE) != 0) {
-		    OUTREG(dpll_reg, temp & ~DPLL_VCO_ENABLE);
-		    POSTING_READ(dpll_reg);
-		}
+    /* May need to leave pipe A on */
+    if (disable_pipe)
+    {
+	/* Next, disable display pipes */
+	temp = INREG(pipeconf_reg);
+	if ((temp & PIPEACONF_ENABLE) != 0) {
+	    OUTREG(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
+	    POSTING_READ(pipeconf_reg);
+	}
 
-		/* Wait for the clocks to turn off. */
-		usleep(150);
+	/* Wait for vblank for the disable to take effect. */
+	i830WaitForVblank(pScrn);
+
+	temp = INREG(dpll_reg);
+	if ((temp & DPLL_VCO_ENABLE) != 0) {
+	    OUTREG(dpll_reg, temp & ~DPLL_VCO_ENABLE);
+	    POSTING_READ(dpll_reg);
 	}
 
-	/* Disable the VGA plane that we never use. */
-	i830_disable_vga_plane (crtc);
+	/* Wait for the clocks to turn off. */
+	usleep(150);
+    }
 
+    /* Disable the VGA plane that we never use. */
+    i830_disable_vga_plane (crtc);
+}
+
+/**
+ * Sets the power management mode of the pipe and plane.
+ *
+ * This code should probably grow support for turning the cursor off and back
+ * on appropriately at the same time as we're turning the pipe off/on.
+ */
+static void
+i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
+{
+    ScrnInfoPtr pScrn = crtc->scrn;
+    I830Ptr pI830 = I830PTR(pScrn);
+    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+    int pipe = intel_crtc->pipe;
+    Bool disable_pipe = TRUE;
+
+    /* XXX: When our outputs are all unaware of DPMS modes other than off and
+     * on, we should map those modes to DPMSModeOff in the CRTC.
+     */
+    switch (mode) {
+    case DPMSModeOn:
+    case DPMSModeStandby:
+    case DPMSModeSuspend:
+	i830_crtc_enable(crtc);
+	break;
+    case DPMSModeOff:
+	if ((pipe == 0) && (pI830->quirk_flag & QUIRK_PIPEA_FORCE))
+	    disable_pipe = FALSE;
+	i830_crtc_disable(crtc, disable_pipe);
 	break;
     }
 
diff --git a/src/i830_display.h b/src/i830_display.h
index 8d767b1..0ba196d 100644
--- a/src/i830_display.h
+++ b/src/i830_display.h
@@ -32,6 +32,8 @@ void i830PipeSetBase(xf86CrtcPtr crtc, int x, int y);
 void i830WaitForVblank(ScrnInfoPtr pScrn);
 void i830DescribeOutputConfiguration(ScrnInfoPtr pScrn);
 void i830_set_new_crtc_bo(ScrnInfoPtr pScrn);
+void i830_crtc_disable(xf86CrtcPtr crtc, Bool disable_pipe);
+void i830_crtc_enable(xf86CrtcPtr crtc);
 
 xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode, int *dpms_mode);
 void i830ReleaseLoadDetectPipe(xf86OutputPtr output, int dpms_mode);
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 6ec1a48..d7ee615 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -311,7 +311,6 @@ typedef enum {
    OPTION_LVDS24BITMODE,
    OPTION_FBC,
    OPTION_TILING,
-   OPTION_LEGACY3D,
    OPTION_LVDSFIXEDMODE,
    OPTION_FORCEENABLEPIPEA,
 #ifdef INTEL_XVMC
@@ -332,9 +331,6 @@ static OptionInfoRec I830Options[] = {
    {OPTION_LVDS24BITMODE, "LVDS24Bit",	OPTV_BOOLEAN,	{0},	FALSE},
    {OPTION_FBC,		"FramebufferCompression", OPTV_BOOLEAN, {0}, TRUE},
    {OPTION_TILING,	"Tiling",	OPTV_BOOLEAN,	{0},	TRUE},
-#ifdef XF86DRI
-   {OPTION_LEGACY3D,	"Legacy3D",     OPTV_BOOLEAN,	{0},	FALSE},
-#endif
    {OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN,	{0},	FALSE},
    {OPTION_FORCEENABLEPIPEA, "ForceEnablePipeA", OPTV_BOOLEAN,	{0},	FALSE},
 #ifdef INTEL_XVMC
@@ -827,22 +823,40 @@ i830_update_front_offset(ScrnInfoPtr pScrn)
    ScreenPtr pScreen = pScrn->pScreen;
    I830Ptr pI830 = I830PTR(pScrn);
    int pitch = pScrn->displayWidth * pI830->cpp;
+   pointer data = NULL;
 
    /* Update buffer locations, which may have changed as a result of
     * i830_bind_all_memory().
     */
    pScrn->fbOffset = pI830->front_buffer->offset;
 
+   if (pI830->starting || pI830->accel == ACCEL_UXA)
+       return;
+
    /* If we are still in ScreenInit, there is no screen pixmap to be updated
     * yet.  We'll fix it up at CreateScreenResources.
     */
-   if (!pI830->starting && pI830->accel != ACCEL_UXA) {
-      if (!pScreen->ModifyPixmapHeader(pScreen->GetScreenPixmap(pScreen),
+   if (!pI830->memory_manager) {
+       data = pI830->FbBase + pScrn->fbOffset; /* default to legacy */
+   } else {
+      dri_bo *bo = pI830->front_buffer->bo;
+
+      if (bo) {
+	  if (pI830->kernel_exec_fencing) {
+	      if (drm_intel_gem_bo_map_gtt(bo))
+		  xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
+			     __FUNCTION__);
+	  } else {
+	      /* Will already be pinned by bind_all_memory in this case */
+	      drm_intel_gem_bo_start_gtt_access(bo, 1);
+	  }
+	  data = bo->virtual;
+      }
+   }
+   if (!pScreen->ModifyPixmapHeader(pScreen->GetScreenPixmap(pScreen),
 				       pScrn->virtualX, pScrn->virtualY, -1, -1,
-				       pitch, (pointer)(pI830->FbBase +
-							pScrn->fbOffset)))
+				       pitch, data))
        FatalError("Couldn't adjust screen pixmap\n");
-   }
 }
 
 /**
@@ -1707,12 +1721,8 @@ I830DrmModeInit(ScrnInfoPtr pScrn)
     pI830->accel = ACCEL_UXA;
 
     if ((s = (char *)xf86GetOptValString(pI830->Options, OPTION_ACCELMETHOD))) {
-	if (!xf86NameCmp(s, "EXA"))
-	    pI830->accel = ACCEL_EXA;
-	else if (!xf86NameCmp(s, "UXA"))
-	    pI830->accel = ACCEL_UXA;
-	else
-	    pI830->accel = ACCEL_UXA;
+	if (xf86NameCmp(s, "UXA"))
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "kernel mode setting active,overridding accelmethod and using UXA\n");
     }
 
     pI830->can_resize = FALSE;
@@ -2283,7 +2293,7 @@ RestoreHWState(ScrnInfoPtr pScrn)
    /* Disable pipes */
    for (i = 0; i < xf86_config->num_crtc; i++) {
       xf86CrtcPtr crtc = xf86_config->crtc[i];
-      crtc->funcs->dpms(crtc, DPMSModeOff);
+      i830_crtc_disable(crtc, TRUE);
    }
    i830WaitForVblank(pScrn);
 
@@ -3019,11 +3029,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     */
    if (!pI830->can_resize && pI830->directRenderingType == DRI_NONE && I830DRIScreenInit(pScreen))
        pI830->directRenderingType = DRI_XF86DRI;
-
-   if (pI830->directRenderingType == DRI_XF86DRI) {
-       pI830->allocate_classic_textures =
-	   xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE);
-   }
 #endif
 
    /* Enable tiling by default */
@@ -3473,8 +3478,9 @@ static Bool
 I830EnterVT(int scrnIndex, int flags)
 {
    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+   xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
    I830Ptr  pI830 = I830PTR(pScrn);
-   int ret;
+   int i, ret;
 
    DPRINTF(PFX, "Enter VT\n");
 
@@ -3495,6 +3501,23 @@ I830EnterVT(int scrnIndex, int flags)
 	  SaveHWState(pScrn);
    }
 
+   /* Get the hardware into a known state if needed */
+   if (!pI830->use_drm_mode) {
+       /* Disable outputs */
+       for (i = 0; i < xf86_config->num_output; i++) {
+	   xf86OutputPtr   output = xf86_config->output[i];
+	   output->funcs->dpms(output, DPMSModeOff);
+       }
+       i830WaitForVblank(pScrn);
+
+       /* Disable pipes */
+       for (i = 0; i < xf86_config->num_crtc; i++) {
+	   xf86CrtcPtr crtc = xf86_config->crtc[i];
+	   i830_crtc_disable(crtc, TRUE);
+       }
+       i830WaitForVblank(pScrn);
+   }
+
    pI830->leaving = FALSE;
 
    if (!pI830->use_drm_mode)
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 0a22486..fc4e66c 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "i810_reg.h"
 #include "i915_drm.h"
 #include <string.h>
+#include <sys/mman.h>
 
 #define ALWAYS_SYNC		0
 #define ALWAYS_FLUSH		0
@@ -837,8 +838,6 @@ i830_uxa_set_pixmap_bo (PixmapPtr pixmap, dri_bo *bo)
 static Bool
 i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
     dri_bo *bo = i830_get_pixmap_bo (pixmap);
 
     if (bo) {
@@ -853,16 +852,27 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
 	    i830->need_sync = FALSE;
 	}
 
-	if (pScrn->vtSema && !pI830->use_drm_mode && pI830->memory_manager) {
-	    if (drm_intel_bo_pin(bo, 4096) != 0)
-		return FALSE;
-	    drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW);
-	    pixmap->devPrivate.ptr = pI830->FbBase + bo->offset;
-	} else {
+	/* No VT sema or GEM?  No GTT mapping. */
+	if (!scrn->vtSema || !i830->memory_manager) {
 	    if (dri_bo_map(bo, access == UXA_ACCESS_RW) != 0)
 		return FALSE;
 	    pixmap->devPrivate.ptr = bo->virtual;
+	    return TRUE;
+	}
+
+	/* Kernel manages fences at GTT map/fault time */
+	if (i830->kernel_exec_fencing) {
+	    if (drm_intel_gem_bo_map_gtt(bo)) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
+			   __FUNCTION__);
+		return FALSE;
+	    }
+	} else { /* or not... */
+	    if (drm_intel_bo_pin(bo, 4096) != 0)
+		return FALSE;
+	    drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW);
 	}
+	pixmap->devPrivate.ptr = bo->virtual;
     }
     return TRUE;
 }
@@ -870,8 +880,6 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
 static void
 i830_uxa_finish_access (PixmapPtr pixmap)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
     dri_bo *bo = i830_get_pixmap_bo (pixmap);
 
     if (bo) {
@@ -879,14 +887,20 @@ i830_uxa_finish_access (PixmapPtr pixmap)
 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	I830Ptr i830 = I830PTR(scrn);
 
-	if (pScrn->vtSema && !pI830->use_drm_mode && pI830->memory_manager)
-	    drm_intel_bo_unpin(bo);
-	else
+	if (bo == i830->front_buffer->bo)
+	    i830->need_flush = TRUE;
+
+	if (!scrn->vtSema || !i830->memory_manager) {
 	    dri_bo_unmap(bo);
+	    pixmap->devPrivate.ptr = NULL;
+	    return;
+	}
 
+	if (i830->kernel_exec_fencing)
+	    drm_intel_gem_bo_unmap_gtt(bo);
+	else
+	    drm_intel_bo_unpin(bo);
 	pixmap->devPrivate.ptr = NULL;
-	if (bo == i830->front_buffer->bo)
-	    i830->need_flush = TRUE;
     }
 }
 
diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index 7569e99..7fc0bce 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -881,6 +881,13 @@ i830_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 static xf86OutputStatus
 i830_lvds_detect(xf86OutputPtr output)
 {
+    /* Fallback to origin, mark LVDS always connected.
+     * From wider tests, we have seen both broken cases with
+     * ACPI lid and SWF bit. So disable them for now until we
+     * get a reliable way for LVDS detect.
+     */
+    return XF86OutputStatusConnected;
+
     enum lid_status lid;
 
     lid = i830_lvds_acpi_lid_open(output);
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 361fff7..e3314c5 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -253,7 +253,8 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem)
 	mem->bound = TRUE;
     }
 
-    if (mem->tiling != TILE_NONE && !pI830->use_drm_mode) {
+    if (mem->tiling != TILE_NONE && !pI830->use_drm_mode &&
+	!pI830->kernel_exec_fencing) {
 	mem->fence_nr = i830_set_tiling(pScrn, mem->offset, mem->pitch,
 					mem->allocated_size, mem->tiling);
     }
@@ -269,7 +270,8 @@ i830_unbind_memory(ScrnInfoPtr pScrn, i830_memory *mem)
     if (mem == NULL || !mem->bound)
 	return TRUE;
 
-    if (mem->tiling != TILE_NONE && !pI830->use_drm_mode)
+    if (mem->tiling != TILE_NONE && !pI830->use_drm_mode &&
+	!pI830->kernel_exec_fencing)
 	i830_clear_tiling(pScrn, mem->fence_nr);
 
 #ifdef XF86DRI
@@ -504,9 +506,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 	    mmsize -= ROUND_TO_PAGE(3 * pScrn->displayWidth * pI830->cpp *
 				    pScrn->virtualY);
 	}
-	/* Classic textures are fixed. */
-	if (pI830->allocate_classic_textures)
-	    mmsize -= MB(32);
 	/* Overlay and cursors, if physical, need to be allocated outside
 	 * of the kernel memory manager.
 	 */
@@ -535,12 +534,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 		int ret;
 
 		sp.param = I915_SETPARAM_NUM_USED_FENCES;
-		if (pI830->use_drm_mode)
-		    sp.value = 0; /* kernel gets them all */
-		else if (pI830->directRenderingType == DRI_XF86DRI)
-		    sp.value = 3; /* front/back/depth */
-		else
-		    sp.value = 2; /* just front for DRI2 (both old & new though) */
+		sp.value = 0; /* kernel gets them all */
+
 		ret = drmCommandWrite(pI830->drmSubFD, DRM_I915_SETPARAM, &sp,
 				      sizeof(sp));
 		if (ret == 0)
@@ -566,6 +561,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 	    i830_free_memory(pScrn, pI830->memory_manager);
 	    pI830->memory_manager = NULL;
 	}
+    } else {
+	pI830->allocate_classic_textures = TRUE;
     }
 #endif /* XF86DRI */
 
@@ -961,8 +958,6 @@ i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
 	}
     }
 
-    mem->tiling = TILE_NONE;
-
     return mem;
 }
 
@@ -1445,7 +1440,7 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn)
 
     if (pI830->memory_manager == NULL) {
 	pI830->fake_bufmgr_mem = i830_allocate_memory(pScrn, "fake bufmgr",
-						      MB(1), PITCH_NONE, GTT_PAGE_SIZE, 0,
+						      MB(8), PITCH_NONE, GTT_PAGE_SIZE, 0,
 						      TILE_NONE);
 	if (pI830->fake_bufmgr_mem == NULL) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 1f2578e..254b866 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1039,8 +1039,13 @@ i830_sdvo_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 
 	    ErrorF("input modeline:\n");
 	    xf86PrintModeline(0, adjusted_mode);
+
+	    /* adjust origin mode's clock for current input,
+	       for correct pixel mulitiplier setting. */
+	    mode->Clock = adjusted_mode->Clock;
+
 	    /* Clock range is required to be in 100-200Mhz */
-	    adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(adjusted_mode);
+	    adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(mode);
 	} else {
 	    return FALSE;
 	}
@@ -1385,7 +1390,9 @@ i830_sdvo_ddc_i2c_start(I2CBusPtr b, int timeout)
     xf86OutputPtr	    output = b->DriverPrivate.ptr;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     I2CBusPtr		    i2cbus = intel_output->pI2CBus;
+    struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
 
+    i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus);
     return i2cbus->I2CStart(i2cbus, timeout);
 }
 
@@ -1539,6 +1546,10 @@ i830_sdvo_output_setup (xf86OutputPtr output, uint16_t flag)
     else
 	name_suffix = "-2";
 
+    /* clear up privates */
+    dev_priv->is_tv = FALSE;
+    intel_output->needs_tv_clock = FALSE;
+
     if (flag & (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1))
     {
 	if (flag & SDVO_OUTPUT_TMDS0)
@@ -1709,11 +1720,9 @@ i830_sdvo_get_ddc_modes(xf86OutputPtr output)
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
     DisplayModePtr modes = NULL;
     xf86OutputPtr crt;
-    I830OutputPrivatePtr intel_output = output->driver_private;
+    I830OutputPrivatePtr intel_output;
     xf86MonPtr edid_mon = NULL;
-    struct i830_sdvo_priv *dev_priv = intel_output->dev_priv;
-
-    i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus);
+    struct i830_sdvo_priv *dev_priv;
 
     modes = i830_ddc_get_modes(output);
     if (modes != NULL)
diff --git a/src/i830_tv.c b/src/i830_tv.c
index 1e3cf7b..8eb3e26 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -1079,7 +1079,7 @@ i830_tv_update_contrast(I830Ptr pI830, uint8_t contrast)
 	c = float_to_fix_2_6(con);
     } else {
 	/* 2.6 floating point */
-	con = 8.875 * ((float) contrast / 255);
+	con = 2.65625 * ((float) contrast / 255);
 	c = float_to_float_2_6(con);
     }
     val |= (c << TV_CONTRAST_SHIFT) & TV_CONTRAST_MASK;
@@ -1098,7 +1098,7 @@ i830_tv_update_saturation(I830Ptr pI830, uint8_t saturation)
 	sat = 3.0 * ((float) saturation / 255);
 	s = float_to_fix_2_6(sat);
     } else {
-	sat = 8.875 * ((float) saturation / 255);
+	sat = 2.65625 * ((float) saturation / 255);
 	s = float_to_float_2_6(sat);
     }
     val |= (s << TV_SATURATION_SHIFT) & TV_SATURATION_MASK;
@@ -1458,6 +1458,10 @@ i830_tv_detect(xf86OutputPtr output)
     int			    dpms_mode;
     int			    type = dev_priv->type;
 
+    /* If TV connector type set by user, always return connected */
+    if (dev_priv->force_type)
+	return XF86OutputStatusConnected;
+
     mode = reported_modes[0];
     xf86SetModeCrtc (&mode, INTERLACE_HALVE_V);
     crtc = i830GetLoadDetectPipe (output, &mode, &dpms_mode);
@@ -1467,13 +1471,6 @@ i830_tv_detect(xf86OutputPtr output)
         i830ReleaseLoadDetectPipe (output, dpms_mode);
     }
 
-    if (dev_priv->force_type) {
-	if (type == TV_TYPE_NONE)
-	    return XF86OutputStatusDisconnected;
-	else
-	    return XF86OutputStatusConnected;
-    }
-
     if (type != dev_priv->type)
     {
 	dev_priv->type = type;
diff --git a/src/i830_video.c b/src/i830_video.c
index daa2411..3f3aaac 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1048,11 +1048,14 @@ I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
 	if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
 	    i830_overlay_off(pScrn);
 	}
-	if (!pPriv->textured)
-	    drm_intel_bo_unpin(pPriv->buf);
-	drm_intel_bo_unreference(pPriv->buf);
-	pPriv->buf = NULL;
-	pPriv->videoStatus = 0;
+
+	if (pPriv->buf) {
+	    if (!pPriv->textured)
+		drm_intel_bo_unpin(pPriv->buf);
+	    drm_intel_bo_unreference(pPriv->buf);
+	    pPriv->buf = NULL;
+	    pPriv->videoStatus = 0;
+	}
     } else {
 	if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
 	    pPriv->videoStatus |= OFF_TIMER;
@@ -1382,7 +1385,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
 	dst_base = pPriv->buf->virtual;
     } else {
 	drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE);
-	dst_base = pI830->FbBase + pPriv->buf->offset;
+	dst_base = pI830->FbBase;
     }
 
     if (pPriv->currentBuf == 0)
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 9e62683..a376eb7 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -1,5 +1,6 @@
 if XVMC
 lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
+endif
 
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
@@ -123,4 +124,3 @@ BUILT_SOURCES= $(INTEL_G4B)
 clean-local:
 	-rm -f $(INTEL_G4B)
 endif
-endif
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
index 5abd001..3cb03f5 100644
--- a/uxa/uxa-glyphs.c
+++ b/uxa/uxa-glyphs.c
@@ -353,9 +353,7 @@ uxa_glyph_cache_hash_remove(uxa_glyph_cache_t *cache,
 #define CACHE_Y(pos) (cache->yOffset + ((pos) / cache->columns) * cache->glyphHeight)
 
 /* The most efficient thing to way to upload the glyph to the screen
- * is to use the UploadToScreen() driver hook; this allows us to
- * pipeline glyph uploads and to avoid creating offscreen pixmaps for
- * glyphs that we'll never use again.
+ * is to use CopyArea; uxa pixmaps are always offscreen.
  */
 static Bool
 uxa_glyph_cache_upload_glyph(ScreenPtr		    pScreen,
@@ -363,37 +361,23 @@ uxa_glyph_cache_upload_glyph(ScreenPtr		    pScreen,
 			     int		    pos,
 			     GlyphPtr		    pGlyph)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
     PicturePtr	    pGlyphPicture = GlyphPicture(pGlyph)[pScreen->myNum];
     PixmapPtr	    pGlyphPixmap = (PixmapPtr)pGlyphPicture->pDrawable;
     PixmapPtr	    pCachePixmap = (PixmapPtr)cache->picture->pDrawable;
-    int		    cacheXoff, cacheYoff;
-
-    if (!uxa_screen->info->put_image || uxa_screen->swappedOut)
-	return FALSE;
-
-    /* If the glyph pixmap is already uploaded, no point in doing
-     * things this way */
-    if (uxa_pixmap_is_offscreen(pGlyphPixmap))
-	return FALSE;
+    GCPtr	    pGC;
 
     /* UploadToScreen only works if bpp match */
     if (pGlyphPixmap->drawable.bitsPerPixel != pCachePixmap->drawable.bitsPerPixel)
 	return FALSE;
 
-    pCachePixmap = uxa_get_offscreen_pixmap ((DrawablePtr)pCachePixmap, &cacheXoff, &cacheYoff);
-    if (!pCachePixmap)
-	return FALSE;
-
-    if (!uxa_screen->info->put_image(pCachePixmap,
-				     CACHE_X(pos) + cacheXoff,
-				     CACHE_Y(pos) + cacheYoff,
-				     pGlyph->info.width,
-				     pGlyph->info.height,
-				     (char *)pGlyphPixmap->devPrivate.ptr,
-				     pGlyphPixmap->devKind))
-	return FALSE;
-
+    pGC = GetScratchGC(pCachePixmap->drawable.depth, pScreen);
+    ValidateGC(&pCachePixmap->drawable, pGC);
+    (void) uxa_copy_area (&pGlyphPixmap->drawable,
+			  &pCachePixmap->drawable,
+			  pGC,
+			  0, 0, pGlyph->info.width, pGlyph->info.height,
+			  CACHE_X(pos), CACHE_Y(pos));
+    FreeScratchGC (pGC);
     return TRUE;
 }
 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-intel.spec	12 Mar 2009 22:53:18 -0000	1.10
+++ xorg-x11-drv-intel.spec	7 Apr 2009 13:41:32 -0000	1.11
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-intel
 Version:   2.6.99.902
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,7 +21,7 @@
 #Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
 Source2:   intel.xinf
 
-Patch1: no-legacy3d.patch
+Patch1: rc1-to-2.7.patch
 Patch2: kill-svideo.patch
 Patch3: copy-fb.patch
 Patch4: intel-2.6.99.902-kms-get-crtc.patch
@@ -32,7 +32,7 @@
 BuildRequires: xorg-x11-server-devel >= 1.4.99.1
 BuildRequires: libXvMC-devel
 BuildRequires: mesa-libGL-devel >= 6.5-9
-BuildRequires: libdrm-devel >= 2.4.5
+BuildRequires: libdrm-devel >= 2.4.6
 BuildRequires: kernel-headers
 
 Requires:  hwdata
@@ -59,7 +59,7 @@
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
-%patch1 -p1 -b .no-legacy3d
+%patch1 -p1 -b .rc1-to-2.7
 %patch2 -p1 -b .svideo
 %patch3 -p1 -b .copy-fb
 %patch4 -p1 -b .get-crtc
@@ -84,7 +84,6 @@
 
 %files
 %defattr(-,root,root,-)
-%{driverdir}/i810_drv.so
 %{driverdir}/intel_drv.so
 %{driverdir}/ch7xxx.so
 %{driverdir}/sil164.so
@@ -102,6 +101,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.6.99.902-2
+- Update to newer 2.7 snapshot, drop no-legacy3d.patch.
+
 * Thu Mar 12 2009 Adam Jackson <ajax at redhat.com> 2.6.99.902-1
 - intel-2.6.99.902-kms-get-crtc.patch: Add drmmode_get_crtc() so we
   blink less on VT switches.


--- no-legacy3d.patch DELETED ---



From davej at fedoraproject.org  Tue Apr  7 13:42:53 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  7 Apr 2009 13:42:53 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.273, 1.274 kernel.spec, 1.1502, 
	1.1503
Message-ID: <20090407134253.D368570100@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9634

Modified Files:
	config-generic kernel.spec 
Log Message:
Enable CONFIG_CIFS_STATS (#494545)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- config-generic	6 Apr 2009 15:44:28 -0000	1.273
+++ config-generic	7 Apr 2009 13:42:23 -0000	1.274
@@ -3149,7 +3149,8 @@
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -r1.1502 -r1.1503
--- kernel.spec	6 Apr 2009 17:35:34 -0000	1.1502
+++ kernel.spec	7 Apr 2009 13:42:23 -0000	1.1503
@@ -1825,6 +1825,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 07 2009 Dave Jones <davej at redhat.com>
+- Enable CONFIG_CIFS_STATS (#494545)
+
 * Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
 - linux-2.6-execshield.patch: rebase for 2.6.30
 



From sindrepb at fedoraproject.org  Tue Apr  7 13:44:49 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Tue,  7 Apr 2009 13:44:49 +0000 (UTC)
Subject: rpms/solfege/devel solfege-3.14.1-desktop.patch, NONE,
	1.1 solfege-3.14.1-no-x.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 solfege.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20090407134449.E16F070100@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10250

Modified Files:
	.cvsignore solfege.spec sources 
Added Files:
	solfege-3.14.1-desktop.patch solfege-3.14.1-no-x.patch 
Log Message:
new upstream release, fixes

solfege-3.14.1-desktop.patch:

--- NEW FILE solfege-3.14.1-desktop.patch ---
diff -up ./solfege.desktop.orig ./solfege.desktop
--- ./solfege.desktop.orig	2009-04-07 15:19:17.000000000 +0200
+++ ./solfege.desktop	2009-04-07 15:19:24.000000000 +0200
@@ -3,5 +3,5 @@ Name=GNU Solfege
 Exec=solfege
 Terminal=false
 Type=Application
-Icon=solfege.png
+Icon=solfege
 Categories=GNOME;Application;AudioVideo;Audio;Education;

solfege-3.14.1-no-x.patch:

--- NEW FILE solfege-3.14.1-no-x.patch ---
=== modified file 'Makefile.in'
--- Makefile.in	2009-03-11 18:47:36 +0000
+++ Makefile.in	2009-04-06 22:03:08 +0000
@@ -107,7 +107,7 @@
 
 # We need src/_version.py because solfege imports it at runtime.
 solfege.1: solfege.1.txt src/_version.py
-	cat $< | sed -e "s/XXOPTIONS/LANGUAGE=C .\/solfege.py --help|sed -n '5,999p'/e" | txt2man -t Solfege -s 1 > $@
+	LANGUAGE=C $(PYTHON) -c "import tools.buildutil; tools.buildutil.create_manpage()" | txt2man -t Solfege -s 1 > $@
 
 rsync-manual: $(foreach lang,$(USER_MANUAL_LANGUAGES),help/$(lang)/one-big-page.html) help/C/one-big-page.html
 	rm -rf tmp-build

=== modified file 'src/abstract.py'
--- src/abstract.py	2009-04-05 20:22:16 +0000
+++ src/abstract.py	2009-04-06 19:48:52 +0000
@@ -29,6 +29,7 @@
 import cfg
 import lessonfile
 import osutils
+import const
 
 class QstatusDefs:
     QSTATUS_NO = 0
@@ -219,24 +220,6 @@
 
 
 class RhythmAddOnClass:
-    RHYTHMS = ("c4", "c8 c8", "c16 c16 c16 c16", "c8 c16 c16",
-               "c16 c16 c8", "c16 c8 c16", "c8. c16", "c16 c8.",
-               "r4", "r8c8", "r8 c16 c16", "r16 c16 c8", "r16c8c16",
-               "r16 c16 c16 c16", "r8 r16 c16", "r16 c8.",
-               "c12 c12 c12", "r12 c12 c12",
-               "c12 r12 c12", "c12 c12 r12", "r12 r12 c12", "r12 c12 r12",
-               "c4.", "c4 c8", # 22, 23
-               "c8 c4", "c8 c8 c8", # 24, 25
-               "c4 c16 c16", # 26
-               "c16 c16 c4", # 27
-               "c8 c8 c16 c16", #28
-               "c8 c16 c16 c8", #29
-               "c16 c16 c8 c8", #30
-               "c8 c16 c16 c16 c16", #31
-               "c16 c16 c8 c16 c16", #32
-               "c16 c16 c16 c16 c8", #33
-               "c16 c16 c16 c16 c16 c16", #34
-               )
     def new_question(self):
         """returns:
                self.ERR_PICKY : if the question is not yet solved and the
@@ -258,7 +241,7 @@
         norest_v = []
         v = []
         for x in self.m_P.header.rhythm_elements:
-            if not (self.RHYTHMS[x][0] == "r"
+            if not (const.RHYTHMS[x][0] == "r"
                     and self.get_bool("not_start_with_rest")):
                 norest_v.append(x)
             v.append(x)
@@ -283,7 +266,7 @@
             else:
                 count_in_notelen = "4"
             s = "d%s " % count_in_notelen * self.get_int("count_in")
-        s += " ".join([self.RHYTHMS[k] for k in self.m_question])
+        s += " ".join([const.RHYTHMS[k] for k in self.m_question])
         return s
     def get_music_string(self):
         """
@@ -572,7 +555,7 @@
         table.show_all()
     def pngcheckbutton(self, i):
         btn = gtk.CheckButton()
-        btn.add(gu.create_rhythm_image(RhythmAddOnClass.RHYTHMS[i]))
+        btn.add(gu.create_rhythm_image(const.RHYTHMS[i]))
         btn.show()
         btn.connect('clicked', self.select_element_cb, i)
         return btn

=== modified file 'src/app.py'
--- src/app.py	2009-04-04 18:28:28 +0000
+++ src/app.py	2009-04-06 22:11:51 +0000
@@ -33,6 +33,7 @@
 import reportlib
 import filesystem
 import osutils
+from optionparser import SolfegeOptionParser
 
 def check_rcfile():
     """See default.config for rcfileversion values, meanings and
=== added file 'src/const.py'
--- src/const.py	1970-01-01 00:00:00 +0000
+++ src/const.py	2009-04-06 19:48:52 +0000
@@ -0,0 +1,38 @@
+# GNU Solfege - free ear training software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008  Tom Cato Amundsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Moved RHYTHMS here because is should be available from a module that does
+# not pull in the gtk module.
+
+RHYTHMS = ("c4", "c8 c8", "c16 c16 c16 c16", "c8 c16 c16",
+           "c16 c16 c8", "c16 c8 c16", "c8. c16", "c16 c8.",
+           "r4", "r8c8", "r8 c16 c16", "r16 c16 c8", "r16c8c16",
+           "r16 c16 c16 c16", "r8 r16 c16", "r16 c8.",
+           "c12 c12 c12", "r12 c12 c12",
+           "c12 r12 c12", "c12 c12 r12", "r12 r12 c12", "r12 c12 r12",
+           "c4.", "c4 c8", # 22, 23
+           "c8 c4", "c8 c8 c8", # 24, 25
+           "c4 c16 c16", # 26
+           "c16 c16 c4", # 27
+           "c8 c8 c16 c16", #28
+           "c8 c16 c16 c8", #29
+           "c16 c16 c8 c8", #30
+           "c8 c16 c16 c16 c16", #31
+           "c16 c16 c8 c16 c16", #32
+           "c16 c16 c16 c16 c8", #33
+           "c16 c16 c16 c16 c16 c16", #34
+)
+

=== modified file 'src/learning_tree_editor.py'
--- src/learning_tree_editor.py	2008-06-01 09:44:59 +0000
+++ src/learning_tree_editor.py	2009-04-06 19:48:52 +0000
@@ -17,7 +17,6 @@
 
 import gtk
 import gobject
-import pprint
 import copy
 import sys
 import os
@@ -26,473 +25,8 @@
 import lessonfilegui
 from gpath import Path
 import filesystem
-
-def get_learning_tree_list(debug):
-    """
-    Return a list of tuples with info about the learning trees found.
-    Tuple objects:
-    1. The string "user" or "solfege"
-    2. The filename, not including the name of the directory
-    3. Full path to the learning tree.
-    """
-    trees = []
-    for cls, dir in (('solfege', u'learningtrees'),
-        ('user', os.path.join(filesystem.user_data(), "learningtrees"))):
-        try:
-            v = os.listdir(dir)
-        except OSError:
-            v = []
-        for fn in v:
-            if cls == 'solfege':
-                fullpath = os.path.join("learningtrees", fn)
-            else:
-                fullpath = os.path.join(filesystem.user_data(), "learningtrees", fn)
-            trees.append((cls, fn, fullpath))
-    if not debug:
-        try:
-            trees.remove(('solfege', 'debugtree.txt', os.path.join('learningtrees', 'debugtree.txt')))
-        except ValueError:
-            # The debugtree.txtfile is for some reason missing
-            pass
-    return trees
-
-class Menu(dict):
-    def new_from_name(name):
-        m = Menu({'name': name, 'children': []})
-        return m
-    new_from_name = staticmethod(new_from_name)
-    def get_name(self):
-        return self['name']
-    def set_name(self, name):
-        self['name'] = name
-    name = property(get_name, set_name)
-    def get_children(self):
-        return self['children']
-    def set_children(self, children):
-        self['children'] = children
-    children = property(get_children, set_children)
-    def pformat(self, indent):
-        return "%(indent)s{'name': %(name)r,\n" \
-        "%(indent)s 'nametotranslate': _(%(name)r),\n" \
-        "%(indent)s 'children': [\n" \
-        "%(children)s ]\n" \
-        "%(indent)s}," %  {
-            'indent': " " * indent,
-            'name': self.name,
-            'children': self.pformat_children(indent + 4)
-        }
-    def pformat_children(self, indent):
-        v = []
-        for child in self.children:
-            if isinstance(child, basestring):
-                v.append("%s%r," % (" " * indent, child))
-            else:
-                v.append(child.pformat(indent))
-        return "\n".join(v)
-
-
-class LearningTree:
-    def __init__(self, lessonfile_manager):
-        self.lessonfile_manager = lessonfile_manager
-        self.m_menus = []
-        self.m_deps = {}
-        self.m_modified = False
-        self.m_title = ''
-        self.m_learning_tree_version = 3
-        self.m_visibility = 0
-    def load(self, filename):
-        self.read_file(filename)
-        self.post_load()
-    def read_file(self, filename):
-        self.m_visibility = 0
-        self.m_learning_tree_version = 0
-        g = {'_': lambda s: s}
-        v = eval(open(filename, 'rU').read(), g)
-        if type(v) == dict:
-            self.m_menus = v['menu']
-            self.m_deps = v['deps']
-            self.m_title = v.get('title', '')
-            self.m_visibility = v['visibility']
-            self.m_learning_tree_version = v['version']
-        # The different lengths of v below is to be able to read
-        # old formats of the learning tree.
-        elif len(v) == 2:
-            self.m_menus, self.m_deps = v
-        elif len(v) == 3:
-            self.m_menus, self.m_deps, self.m_visibility = v
-        elif len(v) == 4:
-            self.m_learning_tree_version, self.m_menus, self.m_deps, self.m_visibility = v
-        if self.m_learning_tree_version == 0:
-            # Change from old style with one menu to multiple exercise
-            # menus on the menu bar. If version == 0, then the tree only
-            # have one menu "Exercises"
-            self.m_menus = [
-              {'name': "_Practise",
-               'submenus': self.m_menus},
-            ]
-            self.m_menus[0]['children'] = [{'name': n['name'], 'children': n['lessons']} for n in self.m_menus[0]['submenus']]
-            del self.m_menus[0]['submenus']
-        if not self.m_title:
-            self.m_title = filename
-    def post_load(self):
-        self.m_menus = [Menu(d) for d in self.m_menus]
-        for idx, menu in enumerate(self.m_menus):
-            self.m_menus[idx].children = [Menu(s) for s in menu.children]
-        self.m_learning_tree_version = 2
-        junk_id = []
-        # FIXME here we are assuming that there are only two levels of menus
-        if self.lessonfile_manager:
-            # lessonfile_manager is None in some test cases
-            for menu in self.m_menus:
-                for topic in menu.children:
-                    for j in topic.children:
-                        if j not in self.lessonfile_manager.m_uiddb:
-                            print >> sys.stderr, "Junking the registration of lesson_id '%s'\nfrom learning tree. File not found." % j
-                            junk_id.append(j)
-        for j in junk_id:
-            for menu in self.m_menus:
-                for topic in menu.children:
-                    if j in topic.children:
-                        del topic.children[topic.children.index(j)]
-                if j in self.m_deps:
-                    del self.m_deps[j]
-                for d in self.m_deps:
-                    if j in self.m_deps[d]:
-                        self.m_deps[d].remove(j)
-        self.sort_topics()
-        self.calculate_visibilities()
-        self.m_modified = False
-    def save(self, filename):
-        self.m_learning_tree_version = 3
-        ofile = open(filename, 'w')
-        print >> ofile, "# GNU Solfege learning tree"
-        print >> ofile, "{"
-        print >> ofile, " 'version': %i," % self.m_learning_tree_version
-        print >> ofile, " 'title': '%s'," % self.m_title.replace("'", r"\'")
-        print >> ofile, " 'titletotranslate': _('%s')," % self.m_title.replace("'", r"\'")
-        print >> ofile, " 'visibility': %i," % self.m_visibility
-        print >> ofile, " 'menu': [ # start of list of menus"
-        for menu in self.m_menus:
-            print >> ofile, menu.pformat(4)
-        print >> ofile, "  ], # end of list of menus"
-        # Delete dependency info about lesson files that are not in the
-        # learning tree.
-        lesson_ids = list(self.iterate_all_lessons())
-        for dep in [d for d in self.m_deps if d not in lesson_ids]:
-            del self.m_deps[dep]
-        print >> ofile, " 'deps':",
-        print >> ofile, "%s," % pprint.pformat(self.m_deps)
-        print >> ofile, "# End of dict mappding dependencies."
-        print >> ofile, "}"
-        ofile.close()
-        self.m_modified = False
-    def new_menu(self, menuname):
-        self.m_menus.append(Menu({'name': menuname, 'children': []}))
-        self.m_modified = True
-    def new_topic(self, menu_idx, topicname):
-        assert topicname not in [s.name for s in self.m_menus[menu_idx].children]
-        self.m_menus[menu_idx].children.append(Menu.new_from_name(topicname))
-        self.m_modified = True
-    def sort_topics(self):
-        """
-        Sort the lessons in each topic.
-        """
-        for menu in self.m_menus:
-            for topic in menu.children:
-                topic.children.sort(lambda a, b: self.cmp(a, b))
-    def move_elem_up(self, path):
-        """
-        Move elem up. Return True if success.
-        Return False if we are the first elem.
-        This function only moves the element within the menu.
-        """
-        if path[-1] == 0:
-            return False
-        p = path[:-1]
-        new_path = path[:-1] + (path[-1],)
-        try:
-            self.get(p).children[path[-1]], self.get(p).children[path[-1]-1] = \
-                self.get(p).children[path[-1]-1], self.get(p).children[path[-1]]
-        except IndexError:
-            return False
-        self.m_modified = True
-        return True
-    def move_elem_to_prev_menu(self, path):
-        """
-        Move the element pointed to by path to the prev menu.
-        Return None if we are on the first menu.
-        """
-        assert path[-2] > 0
-        to_path = list(path[:-1])
-        to_path[-1] -= 1
-        to_path = tuple(to_path)
-        self.get(to_path).children.append(self.get(path))
-        del self.get(path[:-1]).children[path[-1]]
-        self.m_modified = True
-        return to_path + (len(self.get(to_path).children)-1,)
-    def move_elem_down(self, path):
-        """
-        Move move the element (submenu or lesson) one step down on the menu
-        containing it, and return True if successfull.  Return False and do
-        nothing if the element path points to are the last element.
-        """
-        p = path[:-1]
-        try:
-            self.get(p).children[path[-1]], \
-                    self.get(p).children[path[-1]+1] = \
-                    self.get(p).children[path[-1]+1], \
-                    self.get(p).children[path[-1]]
-        except IndexError:
-            return False
-        self.m_modified = True
-        return True
-    def move_elem_to_next_menu(self, path):
-        """
-        Move the element pointed to by path to the next menu.
-        Faild miserably if we are on the last menu, because the
-        gui checks this right now. Return the path to the new
-        position.
-        """
-        pn = list(path[:-1])
-        pn[0] += 1
-        pn = tuple(pn)
-        self.get(pn).children.insert(0, self.get(path))
-        del self.get(path[:-1]).children[path[-1]]
-        self.m_modified = True
-        return pn + (0,)
-    def move_lesson_up(self, path):
-        """
-        Return True if successful, else False.
-        The tree is unchanged if we return False.
-        """
-        if path[-1] == 0:
-            # We are the first lesson
-            return False
-        move_id = self.get(path)
-        prev_id = self.get(Path(path).prev())
-        if prev_id not in list(self.iter_subdeps(move_id)):
-            self.move_elem_up(path)
-            self.m_modified = True
-            return True
-        return False
-    def move_lesson_down(self, path):
-        """
-        Return True if successful, else None.
-        The tree is unchanged if we return None.
-        """
-        p = path[:-1]
-        i = path[-1]
-        move_id = self.get(path)
-        try:
-            next_id = self.get(Path(path).next())
-        except IndexError:
-            return
-        if move_id not in list(self.iter_subdeps(next_id)):
-            try:
-                self.get(p).children[i], self.get(p).children[i + 1] = \
-                    self.get(p).children[i + 1], self.get(p).children[i]
-            except IndexError:
-                return False
-            self.m_modified = True
-            return True
-        return False
-    def add_lesson(self, path, lesson_id):
-        """
-        Each lesson can only be once in a topic.
-        Return True if sucessful, False if not
-        """
-        menu = self.get(path)
-        if lesson_id not in menu.children:
-            if not lesson_id in self.m_deps:
-                self.m_deps[lesson_id] = []
-            menu.children.append(lesson_id)
-            menu.children.sort(lambda a, b: self.cmp(a, b))
-        else:
-            return False
-        self.m_modified = True
-        return True
-    def delete_lesson(self, path):
-        menu = self.get(path[:-1])
-        del menu.children[path[-1]]
-        self.m_modified = True
-    def add_dependency(self, lesson_id, dep_id):
-        assert dep_id not in self.m_deps[lesson_id]
-        self.m_deps[lesson_id].append(dep_id)
-        self.sort_topics()
-        self.m_modified = True
-    def delete_dependency(self, lesson_id, id_to_delete):
-        i = self.m_deps[lesson_id].index(id_to_delete)
-        del self.m_deps[lesson_id][i]
-        self.sort_topics()
-        self.m_modified = True
-    def iterate_all_lessons2(self):
-        """
-        Iterate all lessons that are added to the learning tree.
-        Yields the tuple (lesson_ids, path,)
-        """
-        def do_children(item, path):
-            # path == (0,) is the first menu on the menubar
-            path = path.child()
-            for c in item.children:
-                if isinstance(c, Menu):
-                    for x in do_children(c, path):
-                        yield x
-                else:
-                    assert isinstance(c, basestring)
-                    yield c, path
-                path = path.next()
-        path = Path((0,))
-        for menu in self.m_menus:
-            for x in do_children(menu, path):
-                yield x
-            path = path.next()
-    def iterate_all_lessons(self):
-        """
-        Iterate all lessons that are added to the learning tree.
-        Yields lesson_ids
-        """
-        def do_children(item):
-            for c in item.children:
-                if isinstance(c, Menu):
-                    for x in do_children(c):
-                        yield x
-                else:
-                    assert isinstance(c, basestring)
-                    yield c
-        for menu in self.m_menus:
-            for x in do_children(menu):
-                yield x
-    def iterate_topics_for_id(self, lesson_id):
-        """
-        Yield a string with the name of the submenu containing
-        the lesson_id.
-        """
-        def do_menu(menu):
-            if lesson_id in menu.children:
-                yield menu.name
-            for child in menu.children:
-                if isinstance(child, Menu):
-                    for n in do_menu(child):
-                        yield n
-        for menu in self.m_menus:
-            for n in do_menu(menu):
-                yield n
-    def iterate_deps_for_id(self, lesson_id):
-        """
-        Iterate all the direct dependencies for lesson_id.
-        It does not iterate the sub-dependencies.
-        """
-        for dep in self.m_deps[lesson_id]:
-            yield dep
-    def iterate_possible_deps_for(self, path):
-        """
-        All lessons, except those on the x-list.
-        You get on the x-list if:
-        1. is OBJECT
-        2. already in the depends list of OBJECT
-        3. depend on anything in the x-list
-        4. is a dep (of dep)* of OBJ
-
-
-        Filter out lessons that
-        1. is OBJECT
-        2. is in depends tree below OBJECT
-        3. has OBJECT in its depends tree
-        """
-        # The lesson_id we are finding possible deps for
-        this_id = self.get(path)
-        # First, lets make a list of all lessons that currently are in a topic
-        used = {}
-        for lesson_id in self.iterate_all_lessons():
-            used[lesson_id] = True
-        # Filter out this_id (point 1 in the list in the docstring)
-        del used[this_id]
-        def check(lesson_id):
-            # Filter out according to #2 and #3 in the docstring
-            if lesson_id in list(self.iter_subdeps(this_id)) \
-                    or this_id in list(self.iter_subdeps(lesson_id)):
-                return False
-            return True
-        for i in [k for k in used.keys() if check(k)]:
-            yield i
-    def iter_subdeps(self, lesson_id):
-        for n in self.m_deps[lesson_id]:
-            yield n
-            for nn in self.iter_subdeps(n):
-                yield nn
-    def is_practisable(self, lesson_id):
-        for i in self.iterate_deps_for_id(lesson_id):
-            if not self.lessonfile_manager.is_test_passed(i):
-                return False
-        return True
-    def calculate_visibilities(self):
-        self.m_visibilities = {}
-        v = self.m_deps.keys()
-        v.sort(lambda a, b: self.cmp(a, b))
-        for i in v:
-            if i not in self.lessonfile_manager.m_uiddb:
-                continue
-            if not self.lessonfile_manager.get(i, 'test'):
-                self.m_visibilities[i] = 0
-            elif not list(self.iterate_deps_for_id(i)):
-                self.m_visibilities[i] = 0
-            elif self.is_practisable(i):
-                self.m_visibilities[i] = 0
-            else:
-                self.m_visibilities[i] = max([self.m_visibilities[x] for x in self.m_deps[i]]) + 1
-    def cmp(self, id_a, id_b):
-        """
-        Return -1, 0, 1, like a cmp function.
-        """
-        deps_a = list(self.iter_subdeps(id_b))
-        if id_a in deps_a:
-            return -1
-        deps_b = list(self.iter_subdeps(id_a))
-        if id_b in deps_b:
-            return 1
-        return cmp(len(deps_b), len(deps_a))
-    def get_use_dict(self):
-        """
-        return a dict mapping lesson_id to the number of times the lesson
-        has been added to the learning tree.
-        """
-        retval = {}
-        for lesson_id in self.iterate_all_lessons():
-            retval[lesson_id] = retval.get(lesson_id, 0) + 1
-        return retval
-    def get_use_count(self, lesson_id):
-        """
-        Return an integer telling how many times the lesson lesson_id
-        is used as an exercise.
-        """
-        count = 0
-        for i in self.iterate_all_lessons():
-            if i == lesson_id:
-                count += 1
-        return count
-    def get_dep_use_count(self, lesson_id):
-        """
-        Return an integer telling how many lessons that depends on lesson_id.
-        """
-        count = 0
-        for v in self.m_deps.values():
-            for i in v:
-                if i == lesson_id:
-                    count += 1
-        return count
-    def remove_all_deps_of(self, del_id):
-        for v in self.m_deps.values():
-            if del_id in v:
-                del v[v.index(del_id)]
-        self.m_modified = True
-    def get(self, path):
-        """
-        Return the element pointed to by path.
-        """
-        elem = self.m_menus[path[0]]
-        for idx in path[1:]:
-            elem = elem.children[idx]
-        return elem
+from learningtree import LearningTree, get_learning_tree_list, Menu
+
 
 class LessonFileDialogCommon(gtk.Dialog):
     def __init__(self, app, tree, path):

=== added file 'src/learningtree.py'
--- src/learningtree.py	1970-01-01 00:00:00 +0000
+++ src/learningtree.py	2009-04-06 19:48:52 +0000
@@ -0,0 +1,490 @@
+# GNU Solfege - free ear training software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008  Tom Cato Amundsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import pprint
+import os
+
+import filesystem
+from gpath import Path
+
+def get_learning_tree_list(debug):
+    """
+    Return a list of tuples with info about the learning trees found.
+    Tuple objects:
+    1. The string "user" or "solfege"
+    2. The filename, not including the name of the directory
+    3. Full path to the learning tree.
+    """
+    trees = []
+    for cls, dir in (('solfege', u'learningtrees'),
+        ('user', os.path.join(filesystem.user_data(), "learningtrees"))):
+        try:
+            v = os.listdir(dir)
+        except OSError:
+            v = []
+        for fn in v:
+            if cls == 'solfege':
+                fullpath = os.path.join("learningtrees", fn)
+            else:
+                fullpath = os.path.join(filesystem.user_data(), "learningtrees", fn)
+            trees.append((cls, fn, fullpath))
+    if not debug:
+        try:
+            trees.remove(('solfege', 'debugtree.txt', os.path.join('learningtrees', 'debugtree.txt')))
+        except ValueError:
+            # The debugtree.txtfile is for some reason missing
+            pass
+    return trees
+
+class Menu(dict):
+    def new_from_name(name):
+        m = Menu({'name': name, 'children': []})
+        return m
+    new_from_name = staticmethod(new_from_name)
+    def get_name(self):
+        return self['name']
+    def set_name(self, name):
+        self['name'] = name
+    name = property(get_name, set_name)
+    def get_children(self):
+        return self['children']
+    def set_children(self, children):
+        self['children'] = children
+    children = property(get_children, set_children)
+    def pformat(self, indent):
+        return "%(indent)s{'name': %(name)r,\n" \
+        "%(indent)s 'nametotranslate': _(%(name)r),\n" \
+        "%(indent)s 'children': [\n" \
+        "%(children)s ]\n" \
+        "%(indent)s}," %  {
+            'indent': " " * indent,
+            'name': self.name,
+            'children': self.pformat_children(indent + 4)
+        }
+    def pformat_children(self, indent):
+        v = []
+        for child in self.children:
+            if isinstance(child, basestring):
+                v.append("%s%r," % (" " * indent, child))
+            else:
+                v.append(child.pformat(indent))
+        return "\n".join(v)
+
+
+class LearningTree:
+    def __init__(self, lessonfile_manager):
+        self.lessonfile_manager = lessonfile_manager
+        self.m_menus = []
+        self.m_deps = {}
+        self.m_modified = False
+        self.m_title = ''
+        self.m_learning_tree_version = 3
+        self.m_visibility = 0
+    def load(self, filename):
+        self.read_file(filename)
+        self.post_load()
+    def read_file(self, filename):
+        self.m_visibility = 0
+        self.m_learning_tree_version = 0
+        g = {'_': lambda s: s}
+        v = eval(open(filename, 'rU').read(), g)
+        if type(v) == dict:
+            self.m_menus = v['menu']
+            self.m_deps = v['deps']
+            self.m_title = v.get('title', '')
+            self.m_visibility = v['visibility']
+            self.m_learning_tree_version = v['version']
+        # The different lengths of v below is to be able to read
+        # old formats of the learning tree.
+        elif len(v) == 2:
+            self.m_menus, self.m_deps = v
+        elif len(v) == 3:
+            self.m_menus, self.m_deps, self.m_visibility = v
+        elif len(v) == 4:
+            self.m_learning_tree_version, self.m_menus, self.m_deps, self.m_visibility = v
+        if self.m_learning_tree_version == 0:
+            # Change from old style with one menu to multiple exercise
+            # menus on the menu bar. If version == 0, then the tree only
+            # have one menu "Exercises"
+            self.m_menus = [
+              {'name': "_Practise",
+               'submenus': self.m_menus},
+            ]
+            self.m_menus[0]['children'] = [{'name': n['name'], 'children': n['lessons']} for n in self.m_menus[0]['submenus']]
+            del self.m_menus[0]['submenus']
+        if not self.m_title:
+            self.m_title = filename
+    def post_load(self):
+        self.m_menus = [Menu(d) for d in self.m_menus]
+        for idx, menu in enumerate(self.m_menus):
+            self.m_menus[idx].children = [Menu(s) for s in menu.children]
+        self.m_learning_tree_version = 2
+        junk_id = []
+        # FIXME here we are assuming that there are only two levels of menus
+        if self.lessonfile_manager:
+            # lessonfile_manager is None in some test cases
+            for menu in self.m_menus:
+                for topic in menu.children:
+                    for j in topic.children:
+                        if j not in self.lessonfile_manager.m_uiddb:
+                            print >> sys.stderr, "Junking the registration of lesson_id '%s'\nfrom learning tree. File not found." % j
+                            junk_id.append(j)
+        for j in junk_id:
+            for menu in self.m_menus:
+                for topic in menu.children:
+                    if j in topic.children:
+                        del topic.children[topic.children.index(j)]
+                if j in self.m_deps:
+                    del self.m_deps[j]
+                for d in self.m_deps:
+                    if j in self.m_deps[d]:
+                        self.m_deps[d].remove(j)
+        self.sort_topics()
+        self.calculate_visibilities()
+        self.m_modified = False
+    def save(self, filename):
+        self.m_learning_tree_version = 3
+        ofile = open(filename, 'w')
+        print >> ofile, "# GNU Solfege learning tree"
+        print >> ofile, "{"
+        print >> ofile, " 'version': %i," % self.m_learning_tree_version
+        print >> ofile, " 'title': '%s'," % self.m_title.replace("'", r"\'")
+        print >> ofile, " 'titletotranslate': _('%s')," % self.m_title.replace("'", r"\'")
+        print >> ofile, " 'visibility': %i," % self.m_visibility
+        print >> ofile, " 'menu': [ # start of list of menus"
+        for menu in self.m_menus:
+            print >> ofile, menu.pformat(4)
+        print >> ofile, "  ], # end of list of menus"
+        # Delete dependency info about lesson files that are not in the
+        # learning tree.
+        lesson_ids = list(self.iterate_all_lessons())
+        for dep in [d for d in self.m_deps if d not in lesson_ids]:
+            del self.m_deps[dep]
+        print >> ofile, " 'deps':",
+        print >> ofile, "%s," % pprint.pformat(self.m_deps)
+        print >> ofile, "# End of dict mappding dependencies."
+        print >> ofile, "}"
+        ofile.close()
+        self.m_modified = False
+    def new_menu(self, menuname):
+        self.m_menus.append(Menu({'name': menuname, 'children': []}))
+        self.m_modified = True
+    def new_topic(self, menu_idx, topicname):
+        assert topicname not in [s.name for s in self.m_menus[menu_idx].children]
+        self.m_menus[menu_idx].children.append(Menu.new_from_name(topicname))
+        self.m_modified = True
+    def sort_topics(self):
+        """
+        Sort the lessons in each topic.
+        """
+        for menu in self.m_menus:
+            for topic in menu.children:
+                topic.children.sort(lambda a, b: self.cmp(a, b))
+    def move_elem_up(self, path):
+        """
+        Move elem up. Return True if success.
+        Return False if we are the first elem.
+        This function only moves the element within the menu.
+        """
+        if path[-1] == 0:
+            return False
+        p = path[:-1]
+        new_path = path[:-1] + (path[-1],)
+        try:
+            self.get(p).children[path[-1]], self.get(p).children[path[-1]-1] = \
+                self.get(p).children[path[-1]-1], self.get(p).children[path[-1]]
+        except IndexError:
+            return False
+        self.m_modified = True
+        return True
+    def move_elem_to_prev_menu(self, path):
+        """
+        Move the element pointed to by path to the prev menu.
+        Return None if we are on the first menu.
+        """
+        assert path[-2] > 0
+        to_path = list(path[:-1])
+        to_path[-1] -= 1
+        to_path = tuple(to_path)
+        self.get(to_path).children.append(self.get(path))
+        del self.get(path[:-1]).children[path[-1]]
+        self.m_modified = True
+        return to_path + (len(self.get(to_path).children)-1,)
+    def move_elem_down(self, path):
+        """
+        Move move the element (submenu or lesson) one step down on the menu
+        containing it, and return True if successfull.  Return False and do
+        nothing if the element path points to are the last element.
+        """
+        p = path[:-1]
+        try:
+            self.get(p).children[path[-1]], \
+                    self.get(p).children[path[-1]+1] = \
+                    self.get(p).children[path[-1]+1], \
+                    self.get(p).children[path[-1]]
+        except IndexError:
+            return False
+        self.m_modified = True
+        return True
+    def move_elem_to_next_menu(self, path):
+        """
+        Move the element pointed to by path to the next menu.
+        Faild miserably if we are on the last menu, because the
+        gui checks this right now. Return the path to the new
+        position.
+        """
+        pn = list(path[:-1])
+        pn[0] += 1
+        pn = tuple(pn)
+        self.get(pn).children.insert(0, self.get(path))
+        del self.get(path[:-1]).children[path[-1]]
+        self.m_modified = True
+        return pn + (0,)
+    def move_lesson_up(self, path):
+        """
+        Return True if successful, else False.
+        The tree is unchanged if we return False.
+        """
+        if path[-1] == 0:
+            # We are the first lesson
+            return False
+        move_id = self.get(path)
+        prev_id = self.get(Path(path).prev())
+        if prev_id not in list(self.iter_subdeps(move_id)):
+            self.move_elem_up(path)
+            self.m_modified = True
+            return True
+        return False
+    def move_lesson_down(self, path):
+        """
+        Return True if successful, else None.
+        The tree is unchanged if we return None.
+        """
+        p = path[:-1]
+        i = path[-1]
+        move_id = self.get(path)
+        try:
+            next_id = self.get(Path(path).next())
+        except IndexError:
+            return
+        if move_id not in list(self.iter_subdeps(next_id)):
+            try:
+                self.get(p).children[i], self.get(p).children[i + 1] = \
+                    self.get(p).children[i + 1], self.get(p).children[i]
+            except IndexError:
+                return False
+            self.m_modified = True
+            return True
+        return False
+    def add_lesson(self, path, lesson_id):
+        """
+        Each lesson can only be once in a topic.
+        Return True if sucessful, False if not
+        """
+        menu = self.get(path)
+        if lesson_id not in menu.children:
+            if not lesson_id in self.m_deps:
+                self.m_deps[lesson_id] = []
+            menu.children.append(lesson_id)
+            menu.children.sort(lambda a, b: self.cmp(a, b))
+        else:
+            return False
+        self.m_modified = True
+        return True
+    def delete_lesson(self, path):
+        menu = self.get(path[:-1])
+        del menu.children[path[-1]]
+        self.m_modified = True
+    def add_dependency(self, lesson_id, dep_id):
+        assert dep_id not in self.m_deps[lesson_id]
+        self.m_deps[lesson_id].append(dep_id)
+        self.sort_topics()
+        self.m_modified = True
+    def delete_dependency(self, lesson_id, id_to_delete):
+        i = self.m_deps[lesson_id].index(id_to_delete)
+        del self.m_deps[lesson_id][i]
+        self.sort_topics()
+        self.m_modified = True
+    def iterate_all_lessons2(self):
+        """
+        Iterate all lessons that are added to the learning tree.
+        Yields the tuple (lesson_ids, path,)
+        """
+        def do_children(item, path):
+            # path == (0,) is the first menu on the menubar
+            path = path.child()
+            for c in item.children:
+                if isinstance(c, Menu):
+                    for x in do_children(c, path):
+                        yield x
+                else:
+                    assert isinstance(c, basestring)
+                    yield c, path
+                path = path.next()
+        path = Path((0,))
+        for menu in self.m_menus:
+            for x in do_children(menu, path):
+                yield x
+            path = path.next()
+    def iterate_all_lessons(self):
+        """
+        Iterate all lessons that are added to the learning tree.
+        Yields lesson_ids
+        """
+        def do_children(item):
+            for c in item.children:
+                if isinstance(c, Menu):
+                    for x in do_children(c):
+                        yield x
+                else:
+                    assert isinstance(c, basestring)
+                    yield c
+        for menu in self.m_menus:
+            for x in do_children(menu):
+                yield x
+    def iterate_topics_for_id(self, lesson_id):
+        """
+        Yield a string with the name of the submenu containing
+        the lesson_id.
+        """
+        def do_menu(menu):
+            if lesson_id in menu.children:
+                yield menu.name
+            for child in menu.children:
+                if isinstance(child, Menu):
+                    for n in do_menu(child):
+                        yield n
+        for menu in self.m_menus:
+            for n in do_menu(menu):
+                yield n
+    def iterate_deps_for_id(self, lesson_id):
+        """
+        Iterate all the direct dependencies for lesson_id.
+        It does not iterate the sub-dependencies.
+        """
+        for dep in self.m_deps[lesson_id]:
+            yield dep
+    def iterate_possible_deps_for(self, path):
+        """
+        All lessons, except those on the x-list.
+        You get on the x-list if:
+        1. is OBJECT
+        2. already in the depends list of OBJECT
+        3. depend on anything in the x-list
+        4. is a dep (of dep)* of OBJ
+
+
+        Filter out lessons that
+        1. is OBJECT
+        2. is in depends tree below OBJECT
+        3. has OBJECT in its depends tree
+        """
+        # The lesson_id we are finding possible deps for
+        this_id = self.get(path)
+        # First, lets make a list of all lessons that currently are in a topic
+        used = {}
+        for lesson_id in self.iterate_all_lessons():
+            used[lesson_id] = True
+        # Filter out this_id (point 1 in the list in the docstring)
+        del used[this_id]
+        def check(lesson_id):
+            # Filter out according to #2 and #3 in the docstring
+            if lesson_id in list(self.iter_subdeps(this_id)) \
+                    or this_id in list(self.iter_subdeps(lesson_id)):
+                return False
+            return True
+        for i in [k for k in used.keys() if check(k)]:
+            yield i
+    def iter_subdeps(self, lesson_id):
+        for n in self.m_deps[lesson_id]:
+            yield n
+            for nn in self.iter_subdeps(n):
+                yield nn
+    def is_practisable(self, lesson_id):
+        for i in self.iterate_deps_for_id(lesson_id):
+            if not self.lessonfile_manager.is_test_passed(i):
+                return False
+        return True
+    def calculate_visibilities(self):
+        self.m_visibilities = {}
+        v = self.m_deps.keys()
+        v.sort(lambda a, b: self.cmp(a, b))
+        for i in v:
+            if i not in self.lessonfile_manager.m_uiddb:
+                continue
+            if not self.lessonfile_manager.get(i, 'test'):
+                self.m_visibilities[i] = 0
+            elif not list(self.iterate_deps_for_id(i)):
+                self.m_visibilities[i] = 0
+            elif self.is_practisable(i):
+                self.m_visibilities[i] = 0
+            else:
+                self.m_visibilities[i] = max([self.m_visibilities[x] for x in self.m_deps[i]]) + 1
+    def cmp(self, id_a, id_b):
+        """
+        Return -1, 0, 1, like a cmp function.
+        """
+        deps_a = list(self.iter_subdeps(id_b))
+        if id_a in deps_a:
+            return -1
+        deps_b = list(self.iter_subdeps(id_a))
+        if id_b in deps_b:
+            return 1
+        return cmp(len(deps_b), len(deps_a))
+    def get_use_dict(self):
+        """
+        return a dict mapping lesson_id to the number of times the lesson
+        has been added to the learning tree.
+        """
+        retval = {}
+        for lesson_id in self.iterate_all_lessons():
+            retval[lesson_id] = retval.get(lesson_id, 0) + 1
+        return retval
+    def get_use_count(self, lesson_id):
+        """
+        Return an integer telling how many times the lesson lesson_id
+        is used as an exercise.
+        """
+        count = 0
+        for i in self.iterate_all_lessons():
+            if i == lesson_id:
+                count += 1
+        return count
+    def get_dep_use_count(self, lesson_id):
+        """
+        Return an integer telling how many lessons that depends on lesson_id.
+        """
+        count = 0
+        for v in self.m_deps.values():
+            for i in v:
+                if i == lesson_id:
+                    count += 1
+        return count
+    def remove_all_deps_of(self, del_id):
+        for v in self.m_deps.values():
+            if del_id in v:
+                del v[v.index(del_id)]
+        self.m_modified = True
+    def get(self, path):
+        """
+        Return the element pointed to by path.
+        """
+        elem = self.m_menus[path[0]]
+        for idx in path[1:]:
+            elem = elem.children[idx]
+        return elem
+

=== added file 'src/optionparser.py'
--- src/optionparser.py	1970-01-01 00:00:00 +0000
+++ src/optionparser.py	2009-04-06 22:12:02 +0000
@@ -0,0 +1,44 @@
+import optparse
+
+class SolfegeOptionParser(optparse.OptionParser):
+    def __init__(self):
+        optparse.OptionParser.__init__(self)
+        self.add_option('-v', '--version', action='store_true', dest='version')
+        self.add_option('-w', '--warranty', action='store_true', dest='warranty',
+            help=_('Show warranty and copyright.'))
+        self.add_option('--no-splash', action='store_false', dest='no_splash',
+            help=_('Do not show the startup window.'),
+            default=False)
+        self.add_option('--verbose-sound-init', action='store_true',
+            default=False,
+            dest='verbose_sound_init',
+            help=_('Display more info about the sound setup.'))
+        self.add_option('--no-sound', action='store_true', dest='no_sound',
+            default=False,
+            help=_('Do not play any sounds. Instead some data is printed to standard output. Use this for debugging and porting.'))
+        self.add_option('--debug', action='store_true', dest='debug',
+            help=_('Include features used by the Solfege developers to debug the program.'))
+        self.add_option('--disable-exception-handler', action='store_true',
+            dest='disable_exception_handler',
+            help=_("Disable the exception handling in Gui.standard_exception_handler."))
+        self.add_option('--no-random', action='store_true', dest='no_random',
+            help=_('For debugging only: Select questions from lesson files in sequential order.'))
+        self.add_option('--enable-gtkhtml', action='store_true', 
+            dest='enable_gtkhtml',
+            help=_('Run using gtkhtml2 instead of the built in HTML viewer.'))
+        self.add_option('--no-cairo-widgets', action='store_true',
+            dest='no_cairo_widgets',
+            help=_("Do not use the cairo version of input widgets, even if we run gtk+ 2.8.0 or newer."))
+        self.add_option('--show-gtk-warnings', action='store_true',
+            dest='show_gtk_warnings',
+            help=_('Show GtkWarnings and PangoWarnings in the traceback window.'))
+    def print_help(self, outfile=None):
+        if outfile is None:
+            outfile = sys.stdout
+        encoding = outfile.encoding
+        if not encoding:
+            encoding = "iso-8859-1"
+        outfile.write(self.format_help().encode(encoding, 'replace'))
+
+
+

=== modified file 'src/rhythm.py'
--- src/rhythm.py	2008-02-05 20:06:45 +0000
+++ src/rhythm.py	2009-04-06 19:48:52 +0000
@@ -18,7 +18,7 @@
 import gtk, gobject
 import abstract, gu
 import lessonfile
-
+import const
 
 class Teacher(abstract.Teacher, abstract.RhythmAddOnClass):
     OK = 0
@@ -99,7 +99,7 @@
             self.g_box.get_children()[self.m_num_beats-1].destroy()
         vbox = gtk.VBox()
         vbox.show()
-        im = gu.create_rhythm_image(abstract.RhythmAddOnClass.RHYTHMS[i])
+        im = gu.create_rhythm_image(const.RHYTHMS[i])
         vbox.pack_start(im)
         vbox.pack_start(gu.create_png_image('rhythm-wrong'), False, False)
         vbox.get_children()[-1].hide()
@@ -230,13 +230,13 @@
     def pngbutton(self, i):
         "used by the constructor"
         btn = gtk.Button()
-        if i > len(abstract.RhythmAddOnClass.RHYTHMS):
+        if i > len(const.RHYTHMS):
             im = gtk.Image()
             im.set_from_stock("gtk-missing-image", gtk.ICON_SIZE_LARGE_TOOLBAR)
             im.show()
             btn.add(im)
         else:
-            btn.add(gu.create_rhythm_image(abstract.RhythmAddOnClass.RHYTHMS[i]))
+            btn.add(gu.create_rhythm_image(const.RHYTHMS[i]))
         btn.show()
         btn.connect('clicked', self.guess_element, i)
         return btn
@@ -251,7 +251,7 @@
             self.g_backspace.set_sensitive(False)
     def play_users_answer(self, widget):
         if self.g_rhythm_viewer.m_data:
-            rhythm = " ".join([abstract.RhythmAddOnClass.RHYTHMS[c] for c in self.g_rhythm_viewer.m_data])
+            rhythm = " ".join([const.RHYTHMS[c] for c in self.g_rhythm_viewer.m_data])
             self.m_t.play_rhythm(r"\staff{ %s }" % rhythm)
     def guess_element(self, sender, i):
         if self.m_t.q_status == self.QSTATUS_NO:

=== modified file 'tools/buildutil.py'
--- tools/buildutil.py	2008-03-13 08:08:01 +0000
+++ tools/buildutil.py	2009-04-06 22:13:15 +0000
@@ -18,6 +18,7 @@
 import glob
 import os.path
 import sys
+import re
 sys.path.append(".")
 
 def create_languages_py():
@@ -33,3 +34,19 @@
     print >> f, "]"
     f.close()
 
+def create_manpage():
+    sys.argv = ['solfege']
+    import src.i18n
+    src.i18n.setup(".")
+    import src.optionparser
+    options = src.optionparser.SolfegeOptionParser().format_help().encode('iso-8859-1', 'replace')
+    v = options.split("\n")
+    del v[0]
+    del v[0]
+    del v[0]
+    options = "\n".join(v)
+    # This option is so long that it messes with the columns, and it confuses txt2man.
+    options = re.sub('--disable-exception-handler\s*', '--disable-exception-handler  ', options)
+    s = open("solfege.1.txt", "r").read()
+    s = s.replace('XXOPTIONS', options)
+    print >> sys.stdout, s

=== modified file 'tools/gen_rhythms_table.py'
--- tools/gen_rhythms_table.py	2007-11-02 20:36:55 +0000
+++ tools/gen_rhythms_table.py	2009-04-06 19:48:52 +0000
@@ -9,7 +9,7 @@
     os.path.join(filesystem.rcfile()))
 import src.i18n
 src.i18n.setup(".")
-import src.abstract
+import src.const
 
 img_str = """%i:<inlinemediaobject>
       <imageobject>
@@ -21,9 +21,9 @@
     </inlinemediaobject>"""
 f = open("help/C/rhythmtable.xml", "w")
 print >> f, "<para>"
-for i, r in enumerate(src.abstract.RhythmAddOnClass.RHYTHMS):
+for i, r in enumerate(src.const.RHYTHMS):
     print >> f, img_str % (i, r.replace(" ", ""), r),
-    if i != len(src.abstract.RhythmAddOnClass.RHYTHMS) - 1:
+    if i != len(src.const.RHYTHMS) - 1:
         print >> f, ", "
 print >> f, "</para>"
 f.close()

=== modified file 'tools/generate_lessonfiles.py'
--- tools/generate_lessonfiles.py	2008-11-06 21:43:44 +0000
+++ tools/generate_lessonfiles.py	2009-04-06 19:48:52 +0000
@@ -12,8 +12,13 @@
 sys.path.insert(0, ".")
 import src.i18n
 src.i18n.setup(".")
-from src.learning_tree_editor import LearningTree
-import mpd
+
+from src.learningtree import LearningTree
+
+# We do this sys.path trick to dragging in dependencies on gtk
+sys.path.insert(0, "mpd")
+from musicalpitch import MusicalPitch
+from interval import Interval
 
 header = """
 header {
@@ -32,9 +37,9 @@
 
 def question(f, b, c):
     low = 60
-    tone_a = mpd.MusicalPitch.new_from_int(low)
-    tone_b = mpd.MusicalPitch.new_from_int(low + b)
-    tone_c = mpd.MusicalPitch.new_from_int(low + c)
+    tone_a = MusicalPitch.new_from_int(low)
+    tone_b = MusicalPitch.new_from_int(low + b)
+    tone_c = MusicalPitch.new_from_int(low + c)
     print >> f, 'question {'
     print >> f, '  question_text = _("Sing the three tones")'
     print >> f, '  music = voice("< %s2 %s %s >")' % (
@@ -135,7 +140,7 @@
     return s.replace("m", "min").replace("M", "maj")
 
 def csound_intonation2(harmonic, interval_name, cent):
-    i = mpd.Interval(interval_name)
+    i = Interval(interval_name)
     if harmonic:
         hs = "harmonic-"
     else:
@@ -196,7 +201,7 @@
     tree.new_menu("_Melodic intervals")
     for idx, cname in enumerate(("m2", "M2", "m3", "M3", "p4", "p5",
             "m6", "M6", "m7", "M7")):
-        tree.new_topic(0, mpd.Interval(cname).get_cname())
+        tree.new_topic(0, Interval(cname).get_cname())
         for cent in (40, 30, 20, 15, 10, 8, 6, 5):
             csound_intonation2(False, cname, cent)
             tree.add_lesson((0, idx), "csound-intonation-%s-%icent" % (
@@ -204,7 +209,7 @@
     tree.new_menu("_Harmonic intervals")
     for idx, cname in enumerate(("m2", "M2", "m3", "M3", "p4", "p5",
             "m6", "M6", "m7", "M7")):
-        tree.new_topic(1, mpd.Interval(cname).get_cname())
+        tree.new_topic(1, Interval(cname).get_cname())
         for cent in (40, 30, 20, 15, 10, 8, 6, 5):
             csound_intonation2(True, cname, cent)
             tree.add_lesson((1, idx), "csound-intonation-harmonic-%s-%icent" % (



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 May 2008 12:39:51 -0000	1.7
+++ .cvsignore	7 Apr 2009 13:44:19 -0000	1.8
@@ -1 +1 @@
-solfege-3.10.4.tar.gz
+solfege-3.14.1.tar.gz


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/solfege.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- solfege.spec	26 Feb 2009 02:00:24 -0000	1.17
+++ solfege.spec	7 Apr 2009 13:44:19 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		solfege
-Version:	3.10.4       
-Release:	3%{?dist}
+Version:	3.14.1       
+Release:	1%{?dist}
 Summary:	Music education software
 
 Group:		Applications/Multimedia
@@ -8,14 +8,21 @@
 URL:		http://www.solfege.org/
 Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Source1:	solfege.sh.in
+#don't require X to build from Tom Cato Amundsen, to be merged upstream
+Patch0:         solfege-%{version}-no-x.patch
+#make sure desktop file is sane, don't use extension without path in Icon=
+Patch1:         solfege-%{version}-desktop.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	texinfo, swig, gettext, docbook-style-xsl 
-BuildRequires:	pygtk2-devel, libxslt
-BuildRequires:	desktop-file-utils
-
-Requires:	timidity++, gnome-python2-gtkhtml2, esound
-Requires:	pygtk2
+BuildRequires:	pygtk2-devel >= 2.12, libxslt
+BuildRequires:  lilypond, swig
+BuildRequires:	desktop-file-utils, gettext
+
+Requires:	timidity++, lilypond
+Requires:       gnome-python2-gtkhtml2, esound
+Requires:	pygtk2 >= 2.12
 
 %description
 Solfege is free music education software. Use it to train your rhythm, 
@@ -23,9 +30,15 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
+
 #preserve timestamps
 %{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
 
+#fix permissios for debuginfo package
+chmod 0755 $RPM_BUILD_DIR/%{name}-%{version}/src/_version.py
+
 %build
 export INSTALL="%{__install} -c -p"
 #override hardocded path
@@ -75,8 +88,14 @@
 %{_mandir}/man?/*
 
 
-
 %changelog
+* Wed Apr 7 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-1
+- New upstream release
+- Add patch to not require X to build
+- Add patch to fix desktop file, don't use extensions without path in Icon=
+- Add lilypond dependency
+- Make sure permissions in debuginfo are sane
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 May 2008 12:39:51 -0000	1.7
+++ sources	7 Apr 2009 13:44:19 -0000	1.8
@@ -1 +1 @@
-74705388c446a10ed574e68bcd3134d4  solfege-3.10.4.tar.gz
+bb7720a9c847232fad6c8cd462fa1dcc  solfege-3.14.1.tar.gz



From awjb at fedoraproject.org  Tue Apr  7 13:55:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  7 Apr 2009 13:55:12 +0000 (UTC)
Subject: rpms/wine/F-9 winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.70,
	1.71 sources, 1.71, 1.72 wine.spec, 1.100,
	1.101 winepulse-0.20.patch, 1.1, NONE
Message-ID: <20090407135512.3D86F70100@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13232/F-9

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	winepulse-0.24.patch 
Removed Files:
	winepulse-0.20.patch 
Log Message:
- upgrade


winepulse-0.24.patch:

--- NEW FILE winepulse-0.24.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..327f225
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = dxguid uuid winmm user32 advapi32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = dsoutput.c \
+	waveout.c \
+	wavein.c \
+	pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/dsoutput.c b/dlls/winepulse.drv/dsoutput.c
new file mode 100644
index 0000000..b37313a
--- /dev/null
+++ b/dlls/winepulse.drv/dsoutput.c
@@ -0,0 +1,576 @@
+/*
+ * Wine Driver for PulseAudio - DSound Output Functionality
+ * http://pulseaudio.org/
+ *
+ * Copyright	2009 Arthur Talyor <theycallhimart at gmail.com>
+ *
+ * Conatins code from other wine multimedia drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "mmddk.h"
+#include "dsound.h"
+#include "dsdriver.h"
+#include "winreg.h"
+
+#include <winepulse.h>
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dspulse);
+
+#if HAVE_PULSEAUDIO
+
+/*======================================================================*
+ *                  Low level DSOUND implementation			*
+ *======================================================================*/
+
+/* A buffer is allocated with a pointer indicating the read position in the
+ * buffer. The pulse write callback reads data from the buffer, updating the
+ * read pointer to the location at the end of the read. Upon reaching the end
+ * or attempting to read past the end of buffer the read pointer wraps around
+ * to the beginning again. DirectSound applications can write anywhere in the
+ * buffer at anytime without locking and can know the location of the read
+ * pointer. The position of the read pointer cannot be changed by the
+ * application and access to it uses a locking scheme. A fake pointer
+ * indicating estimated playback position is also available to the application.
+ * Applications can potentially write to the same area of memory which is also
+ * being read by the pulse thread. However, this is uncommon as directsound
+ * applications know where pulse should be reading from via the pointer
+ * locations and MSDN says that such an operation should be avoided with the
+ * results being undefined.
+ */
+
+/* Fragment lengths try to be a power of two close to 10ms worth of data. See
+ * dlls/dsound/mixer.c
+ */
+static int fragment_length(pa_sample_spec *s) {
+    if (s->rate <= 12800)
+        return 128 * pa_frame_size(s);
+
+    if (s->rate <= 25600)
+        return 256 * pa_frame_size(s);
+
+    if (s->rate <= 51200)
+        return 512 * pa_frame_size(s);
+
+    return 1024 * pa_frame_size(s);
+}
+
+/* Callback from the pulse thread for stream data */
+static void DSPULSE_BufferReadCallback(pa_stream *s, size_t nbytes, void *userdata) {
+    IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)userdata;
+
+    if (!This->buffer)
+        return;
+
+    /* Fraglens are always powers of 2 */
+    nbytes+= This->fraglen - 1;
+    nbytes&= ~(This->fraglen - 1);
+
+    /* If we advance more than 10 fragments at a time it appears that the buffer
+     * pointer is never advancing because of wrap-around. Evil magic numbers. */
+    if (nbytes > This->fraglen * 5)
+        nbytes = This->fraglen * 5;
+
+    TRACE("Reading %u bytes.\n", nbytes);
+
+    if (This->buffer_read_offset + nbytes <= This->buffer_length) {
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset += nbytes;
+    } else {
+        size_t write_length = This->buffer_length - This->buffer_read_offset;
+        nbytes -= write_length;
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, write_length, NULL, 0, PA_SEEK_RELATIVE);
+        pa_stream_write(s, This->buffer, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset = nbytes;
+    }
+
+    This->buffer_read_offset %= This->buffer_length;
+}
+
+/* Called when the stream underruns. Just for information */
+static void DSPULSE_BufferUnderflowCallback(pa_stream *s, void *userdata) {
+    WARN("(%p) underrun.\n", userdata);
+}
+
+/* Connects a stream to the server. Does not update
+ * IDsDriverBufferImpl->fraglen. Does not lock the pulse mainloop or free
+ * objects in case of failure. This should be handled by the calling function.
+ */
+static HRESULT DSPULSE_ConnectStream(IDsDriverBufferImpl* This) {
+    pa_buffer_attr ba_request;
+    const pa_buffer_attr *ba_obtained;
+    char c[PA_SAMPLE_SPEC_SNPRINT_MAX];
+    pa_stream_flags_t stream_flags = PA_STREAM_START_CORKED;
+
+#if PA_PROTOCOL_VERSION >= 14
+    /* We are a "fragment wait based" application, so this flag should be
+     * acceptable. */
+    stream_flags |= PA_STREAM_EARLY_REQUESTS;
+#elif PA_PROTOCOL_VERSION >= 13 && PA_API_VERSION >= 12
+    stream_flags |= PA_STREAM_ADJUST_LATENCY;
+#endif
+
+    pa_sample_spec_snprint(c, PA_SAMPLE_SPEC_SNPRINT_MAX, &This->sample_spec);
+    TRACE("Sample spec %s fragment size %u.\n", c, This->fraglen);
+
+    ba_request.tlength = This->fraglen * 4;     //  ~40ms
+    ba_request.minreq = This->fraglen;          //  ~10ms
+    ba_request.prebuf = (uint32_t)-1;           //  same as tlength
+    ba_request.maxlength = This->buffer_length; //  2^x = ~3s
+
+    TRACE("Asking for buffer tlength:%u (%llums) minreq:%u (%llums)\n",
+        ba_request.tlength, pa_bytes_to_usec(ba_request.tlength, &This->sample_spec)/1000,
+        ba_request.minreq, pa_bytes_to_usec(ba_request.minreq, &This->sample_spec)/1000);
+
+    This->stream = pa_stream_new(PULSE_context, "DirectSound Buffer", &This->sample_spec, NULL);
+    if (!This->stream) return DSERR_BADFORMAT;
+
+    pa_stream_set_state_callback(This->stream, PULSE_StreamStateCallback, This);
+    pa_stream_set_write_callback(This->stream, DSPULSE_BufferReadCallback, This);
+    pa_stream_set_underflow_callback(This->stream, DSPULSE_BufferUnderflowCallback, This);
+
+    TRACE("Attempting to connect (%p)->stream for playback on %s\n", This, WOutDev[This->drv->wDevID].device_name);
+    pa_stream_connect_playback(This->stream, WOutDev[This->drv->wDevID].device_name, &ba_request, stream_flags, NULL, NULL);
+    for (;;) {
+        pa_context_state_t cstate = pa_context_get_state(PULSE_context);
+        pa_stream_state_t sstate = pa_stream_get_state(This->stream);
+
+        if (cstate == PA_CONTEXT_FAILED || cstate == PA_CONTEXT_TERMINATED ||
+            sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED) {
+            ERR("Failed to connect stream context object: %s\n", pa_strerror(pa_context_errno(PULSE_context)));
+            return DSERR_BUFFERLOST;
+        }
+
+        if (sstate == PA_STREAM_READY)
+            break;
+
[...2991 lines suppressed...]
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |	/* Mono	    11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |	/* Mono	    11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |	/* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |	/* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |	/* Mono	    22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |	/* Mono	    22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |	/* Stereo   22050Hz 8-bit  */\
+	WAVE_FORMAT_2S16 |	/* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |	/* Mono	    44100Hz 8-bit  */\
+	WAVE_FORMAT_4M16 |	/* Mono	    44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |	/* Stereo   44100Hz 8-bit  */\
+	WAVE_FORMAT_4S16 |	/* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |	/* Mono	    48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |	/* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |	/* Mono	    48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |	/* Stereo   48000Hz 16-bit */\
+	WAVE_FORMAT_96M08 |	/* Mono	    96000Hz 8-bit  */\
+	WAVE_FORMAT_96S08 |	/* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |	/* Mono	    96000Hz 16-bit */\
+	WAVE_FORMAT_96S16	/* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message 	msg;	/* message identifier */
+    DWORD	                param;  /* parameter for this message */
+    HANDLE	                hEvent;	/* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG			* messages;
+    int                         ring_buffer_size;
+    int				msg_tosave;
+    int				msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION		msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+typedef struct IDsDriverImpl IDsDriverImpl;
+typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
+
+struct IDsDriverImpl {
+    /* IUnknown fields */
+    const IDsDriverVtbl *lpVtbl;
+    LONG    ref;
+
+    IDsDriverBufferImpl *primary;
+    UINT    wDevID;
+};
+
+struct IDsDriverBufferImpl {
+    const IDsDriverBufferVtbl	*lpVtbl;
+    IDsDriverImpl*		drv;
+    LONG			ref;
+    pa_stream			*stream;
+    pa_sample_spec		sample_spec;
+    pa_cvolume			volume;
+
+    PBYTE		buffer;
+    DWORD		buffer_length;
+    DWORD		buffer_read_offset;
+    DWORD		buffer_play_offset;
+    DWORD		fraglen;
+};
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char		*device_name;
+    pa_cvolume		volume;
+
+    union {
+        WAVEOUTCAPSW	out;
+	WAVEINCAPSW	in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    volatile INT        state;		    /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD		wFlags;
+
+    pa_stream		*stream;	    /* The PulseAudio stream */
+    const pa_timing_info	*timing_info;
+    pa_sample_spec	sample_spec;	    /* Sample spec of this stream / device */
+    pa_cvolume		volume;
+    pa_buffer_attr	buffer_attr;
+
+    /* waveIn / waveOut wavaHdr information */
+    LPWAVEHDR		lpQueuePtr;	    /* start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR		lpPlayPtr;	    /* start of not yet fully written buffers */
+    DWORD		dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR		lpLoopPtr;          /* pointer of first buffer in loop, if any */
+    DWORD		dwLoops;	    /* private copy of loop counter */
+
+    /* Virtual stream positioning information */
+    DWORD		last_reset;	    /* When the last reset occured, as pa stream time doesn't reset */
+    struct timeval	last_header;	    /* When the last wavehdr was received, only updated when audio is not playing yet */
+    BOOL		is_releasing;	    /* Whether we are releasing wavehdrs */
+    struct timeval	started_releasing;  /* When wavehdr releasing started, for comparison to queued written wavehdrs */
+    DWORD		releasing_offset;   /* How much audio has been released prior when releasing started in this instance */
+
+    /* waveIn */
+    const void		*buffer;	    /* Pointer to the latest data fragment for recording streams */
+    DWORD		buffer_length;	    /* How large the latest data fragment is */
+    DWORD		buffer_read_offset; /* How far into latest data fragment we last read */
+    DWORD		fraglen;    
+
+    /* Thread communication and synchronization stuff */
+    HANDLE		hStartUpEvent;
+    HANDLE		hThread;
+    DWORD		dwThreadID;
+    PULSE_MSG_RING	msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context		*PULSE_context;   /* Connection Context */
+pa_threaded_mainloop	*PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c */
+void	PULSE_WaitForOperation(pa_operation *o);
+void	PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void	PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamRequestCallback(pa_stream *s, size_t n, void *userdata);
+void	PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamOverflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void	PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+BOOL	PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+void	PULSE_GetMMTime(const pa_timing_info *t, pa_sample_spec *s, size_t last_reset, LPMMTIME lpTime);
+int	PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int	PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int	PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int	PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+const char * PULSE_getCmdString(enum win_wm_message msg);
+
+/* dsoutput.c */
+DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
+DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
+#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	24 Feb 2009 20:45:08 -0000	1.70
+++ .cvsignore	7 Apr 2009 13:54:41 -0000	1.71
@@ -1 +1 @@
-wine-1.1.15-fe.tar.bz2
+wine-1.1.18-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	24 Feb 2009 20:45:08 -0000	1.71
+++ sources	7 Apr 2009 13:54:41 -0000	1.72
@@ -1 +1 @@
-cfeb6cfd7404c2fed2c9f2623976ea7e  wine-1.1.15-fe.tar.bz2
+1933049a7cc725bcb488c6669fa5ca9e  wine-1.1.18-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- wine.spec	24 Feb 2009 20:45:08 -0000	1.100
+++ wine.spec	7 Apr 2009 13:54:41 -0000	1.101
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.15
+Version:	1.1.18
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -43,7 +43,7 @@
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.17-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.20.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.24.patch
 Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
@@ -53,7 +53,7 @@
 Patch2:         wine-desktop-mime.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch:  i386
+ExclusiveArch:  %{ix86}
 
 # BR: All builds
 BuildRequires:	bison
@@ -81,7 +81,7 @@
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
 BuildRequires:  fontforge
-BuildRequires:  gphoto2 gphoto2-devel
+BuildRequires:  libgphoto2-devel
 BuildRequires:  jack-audio-connection-kit-devel
 # #217338
 BuildRequires:  isdn4k-utils-devel
@@ -402,15 +402,12 @@
 %{_bindir}/regsvr32
 %{_bindir}/wine
 %{_bindir}/wineboot
-%{_bindir}/winebrowser
 %{_bindir}/wineconsole
 %{_bindir}/wineprefixcreate
 %{_mandir}/man1/wineprefixcreate.1*
 %{_bindir}/winecfg
-%{_bindir}/uninstaller
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
-%{_libdir}/wine/winhelp.exe16
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -438,11 +435,7 @@
 %lang(fr) %{_mandir}/fr.UTF-8/man1/*
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
-%{_bindir}/wine-kthread
 %{_bindir}/wine-preloader
-%{_bindir}/wine-pthread
-# < 0.9.60
-#%{_bindir}/winelauncher
 %{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
 %dir %{_libdir}/wine
@@ -458,7 +451,6 @@
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
-%{_libdir}/wine/avifile.dll16
 %{_libdir}/wine/browseui.dll.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
@@ -468,9 +460,7 @@
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/comm.drv16
 %{_libdir}/wine/commdlg.dll16
-%{_libdir}/wine/compobj.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -480,9 +470,7 @@
 %{_libdir}/wine/cryptnet.dll.so
 %{_libdir}/wine/cryptui.dll.so
 %{_libdir}/wine/ctapi32.dll.so
-%{_libdir}/wine/ctl3d.dll16
 %{_libdir}/wine/ctl3d32.dll.so
-%{_libdir}/wine/ctl3dv2.dll16
 %{_libdir}/wine/d3d10.dll.so
 %{_libdir}/wine/d3d10core.dll.so
 %{_libdir}/wine/d3dim.dll.so
@@ -497,8 +485,6 @@
 %{_libdir}/wine/devenum.dll.so
 %{_libdir}/wine/dinput.dll.so
 %{_libdir}/wine/dinput8.dll.so
-%{_libdir}/wine/dispdib.dll16
-%{_libdir}/wine/display.drv16
 %{_libdir}/wine/dmband.dll.so
 %{_libdir}/wine/dmcompos.dll.so
 %{_libdir}/wine/dmime.dll.so
@@ -543,7 +529,6 @@
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
-%{_libdir}/wine/imm.dll16
 %{_libdir}/wine/imm32.dll.so
 %{_libdir}/wine/inetcomm.dll.so
 %{_libdir}/wine/inetmib1.dll.so
@@ -556,14 +541,12 @@
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/keyboard.drv16
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
 %{_libdir}/wine/lodctr.exe.so
 %{_libdir}/wine/lz32.dll.so
-%{_libdir}/wine/lzexpand.dll16
 %{_libdir}/wine/mapi32.dll.so
 %{_libdir}/wine/mciavi32.dll.so
 %{_libdir}/wine/mcicda.dll.so
@@ -575,10 +558,8 @@
 %{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
-%{_libdir}/wine/mouse.drv16
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
-%{_libdir}/wine/msacm.dll16
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
@@ -620,20 +601,12 @@
 %{_libdir}/wine/objsel.dll.so
 %{_libdir}/wine/odbc32.dll.so
 %{_libdir}/wine/odbccp32.dll.so
-%{_libdir}/wine/ole2.dll16
-%{_libdir}/wine/ole2conv.dll16
-%{_libdir}/wine/ole2disp.dll16
-%{_libdir}/wine/ole2nls.dll16
-%{_libdir}/wine/ole2prox.dll16
-%{_libdir}/wine/ole2thk.dll16
 %{_libdir}/wine/ole32.dll.so
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
-%{_libdir}/wine/olecli.dll16
 %{_libdir}/wine/olecli32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
-%{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
@@ -649,7 +622,6 @@
 %{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
-%{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
 %{_libdir}/wine/rasdlg.dll.so
 %{_libdir}/wine/resutils.dll.so
@@ -676,13 +648,10 @@
 %{_libdir}/wine/slc.dll.so
 %{_libdir}/wine/snmpapi.dll.so
 %{_libdir}/wine/softpub.dll.so
-%{_libdir}/wine/sound.drv16
 %{_libdir}/wine/spoolsv.exe.so
 %{_libdir}/wine/stdole2.tlb.so
 %{_libdir}/wine/stdole32.tlb.so
 %{_libdir}/wine/sti.dll.so
-%{_libdir}/wine/storage.dll16
-%{_libdir}/wine/stress.dll16
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
@@ -690,7 +659,6 @@
 %{_libdir}/wine/tapi32.dll.so
 %{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
-%{_libdir}/wine/typelib.dll16
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
@@ -711,11 +679,6 @@
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/w32sys.dll16
-%{_libdir}/wine/win32s16.dll16
-%{_libdir}/wine/win87em.dll16
-%{_libdir}/wine/winaspi.dll16
-%{_libdir}/wine/windebug.dll16
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/wineoss.drv.so
@@ -727,15 +690,12 @@
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
-%{_libdir}/wine/winnls.dll16
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/spoolss.dll.so
-%{_libdir}/wine/winoldap.mod16
 %{_libdir}/wine/winscard.dll.so
-%{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
@@ -764,11 +724,47 @@
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
+# 16bit
+%{_libdir}/wine/avifile.dll16.so
+%{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/compobj.dll16.so
+%{_libdir}/wine/ctl3d.dll16.so
+%{_libdir}/wine/ctl3dv2.dll16.so
+%{_libdir}/wine/dispdib.dll16.so
+%{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/keyboard.drv16.so
+%{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mciqtz32.dll.so
+%{_libdir}/wine/mouse.drv16.so
+%{_libdir}/wine/msacm.dll16.so
+%{_libdir}/wine/ole2.dll16.so
+%{_libdir}/wine/ole2conv.dll16.so
+%{_libdir}/wine/ole2disp.dll16.so
+%{_libdir}/wine/ole2nls.dll16.so
+%{_libdir}/wine/ole2prox.dll16.so
+%{_libdir}/wine/ole2thk.dll16.so
+%{_libdir}/wine/olecli.dll16.so
+%{_libdir}/wine/olesvr.dll16.so
+%{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/sound.drv16.so
+%{_libdir}/wine/storage.dll16.so
+%{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/twain.dll16.so
+%{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/w32sys.dll16.so
+%{_libdir}/wine/win32s16.dll16.so
+%{_libdir}/wine/win87em.dll16.so
+%{_libdir}/wine/winaspi.dll16.so
+%{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/winhelp.exe16.so
+%{_libdir}/wine/winnls.dll16.so
+%{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/wintab.dll16.so
 
 %files tools
 %defattr(-,root,root,-)
 %{_bindir}/notepad
-%{_bindir}/progman
 %{_bindir}/winedbg
 %{_bindir}/winedump
 %{_bindir}/winefile
@@ -826,7 +822,6 @@
 
 %files twain
 %defattr(-,root,root,-)
-%{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
@@ -869,6 +864,18 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Mar 30 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.18-1
+- version upgrade (#490672, #491321)
+- winepulse update
+
+* Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.1.15-3
+??? Make sure F11 font packages have been built with F11 fontforge
+
+* Tue Feb 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.15-2
+- switch from i386 to ix86
+
 * Sun Feb 15 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.15-1
 - version upgrade
@@ -897,14 +904,6 @@
 - 1.1.9-2
 - fix #469907
 
-* Mon Nov 24 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 1.1.9-1.fc9.2
-- more isa fixes
-
-* Sun Nov 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 1.1.9-1.fc9.1
-- fix #472694
-
 * Sun Nov 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.9-1
 - version upgrade


--- winepulse-0.20.patch DELETED ---



From awjb at fedoraproject.org  Tue Apr  7 13:55:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  7 Apr 2009 13:55:12 +0000 (UTC)
Subject: rpms/wine/F-10 winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.71,
	1.72 sources, 1.72, 1.73 wine.spec, 1.98,
	1.99 winepulse-0.20.patch, 1.1, NONE
Message-ID: <20090407135512.8A54470100@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13232/F-10

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	winepulse-0.24.patch 
Removed Files:
	winepulse-0.20.patch 
Log Message:
- upgrade


winepulse-0.24.patch:

--- NEW FILE winepulse-0.24.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..327f225
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = dxguid uuid winmm user32 advapi32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = dsoutput.c \
+	waveout.c \
+	wavein.c \
+	pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/dsoutput.c b/dlls/winepulse.drv/dsoutput.c
new file mode 100644
index 0000000..b37313a
--- /dev/null
+++ b/dlls/winepulse.drv/dsoutput.c
@@ -0,0 +1,576 @@
+/*
+ * Wine Driver for PulseAudio - DSound Output Functionality
+ * http://pulseaudio.org/
+ *
+ * Copyright	2009 Arthur Talyor <theycallhimart at gmail.com>
+ *
+ * Conatins code from other wine multimedia drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "mmddk.h"
+#include "dsound.h"
+#include "dsdriver.h"
+#include "winreg.h"
+
+#include <winepulse.h>
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dspulse);
+
+#if HAVE_PULSEAUDIO
+
+/*======================================================================*
+ *                  Low level DSOUND implementation			*
+ *======================================================================*/
+
+/* A buffer is allocated with a pointer indicating the read position in the
+ * buffer. The pulse write callback reads data from the buffer, updating the
+ * read pointer to the location at the end of the read. Upon reaching the end
+ * or attempting to read past the end of buffer the read pointer wraps around
+ * to the beginning again. DirectSound applications can write anywhere in the
+ * buffer at anytime without locking and can know the location of the read
+ * pointer. The position of the read pointer cannot be changed by the
+ * application and access to it uses a locking scheme. A fake pointer
+ * indicating estimated playback position is also available to the application.
+ * Applications can potentially write to the same area of memory which is also
+ * being read by the pulse thread. However, this is uncommon as directsound
+ * applications know where pulse should be reading from via the pointer
+ * locations and MSDN says that such an operation should be avoided with the
+ * results being undefined.
+ */
+
+/* Fragment lengths try to be a power of two close to 10ms worth of data. See
+ * dlls/dsound/mixer.c
+ */
+static int fragment_length(pa_sample_spec *s) {
+    if (s->rate <= 12800)
+        return 128 * pa_frame_size(s);
+
+    if (s->rate <= 25600)
+        return 256 * pa_frame_size(s);
+
+    if (s->rate <= 51200)
+        return 512 * pa_frame_size(s);
+
+    return 1024 * pa_frame_size(s);
+}
+
+/* Callback from the pulse thread for stream data */
+static void DSPULSE_BufferReadCallback(pa_stream *s, size_t nbytes, void *userdata) {
+    IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)userdata;
+
+    if (!This->buffer)
+        return;
+
+    /* Fraglens are always powers of 2 */
+    nbytes+= This->fraglen - 1;
+    nbytes&= ~(This->fraglen - 1);
+
+    /* If we advance more than 10 fragments at a time it appears that the buffer
+     * pointer is never advancing because of wrap-around. Evil magic numbers. */
+    if (nbytes > This->fraglen * 5)
+        nbytes = This->fraglen * 5;
+
+    TRACE("Reading %u bytes.\n", nbytes);
+
+    if (This->buffer_read_offset + nbytes <= This->buffer_length) {
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset += nbytes;
+    } else {
+        size_t write_length = This->buffer_length - This->buffer_read_offset;
+        nbytes -= write_length;
+        pa_stream_write(s, This->buffer + This->buffer_read_offset, write_length, NULL, 0, PA_SEEK_RELATIVE);
+        pa_stream_write(s, This->buffer, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+        This->buffer_play_offset = This->buffer_read_offset;
+        This->buffer_read_offset = nbytes;
+    }
+
+    This->buffer_read_offset %= This->buffer_length;
+}
+
+/* Called when the stream underruns. Just for information */
+static void DSPULSE_BufferUnderflowCallback(pa_stream *s, void *userdata) {
+    WARN("(%p) underrun.\n", userdata);
+}
+
+/* Connects a stream to the server. Does not update
+ * IDsDriverBufferImpl->fraglen. Does not lock the pulse mainloop or free
+ * objects in case of failure. This should be handled by the calling function.
+ */
+static HRESULT DSPULSE_ConnectStream(IDsDriverBufferImpl* This) {
+    pa_buffer_attr ba_request;
+    const pa_buffer_attr *ba_obtained;
+    char c[PA_SAMPLE_SPEC_SNPRINT_MAX];
+    pa_stream_flags_t stream_flags = PA_STREAM_START_CORKED;
+
+#if PA_PROTOCOL_VERSION >= 14
+    /* We are a "fragment wait based" application, so this flag should be
+     * acceptable. */
+    stream_flags |= PA_STREAM_EARLY_REQUESTS;
+#elif PA_PROTOCOL_VERSION >= 13 && PA_API_VERSION >= 12
+    stream_flags |= PA_STREAM_ADJUST_LATENCY;
+#endif
+
+    pa_sample_spec_snprint(c, PA_SAMPLE_SPEC_SNPRINT_MAX, &This->sample_spec);
+    TRACE("Sample spec %s fragment size %u.\n", c, This->fraglen);
+
+    ba_request.tlength = This->fraglen * 4;     //  ~40ms
+    ba_request.minreq = This->fraglen;          //  ~10ms
+    ba_request.prebuf = (uint32_t)-1;           //  same as tlength
+    ba_request.maxlength = This->buffer_length; //  2^x = ~3s
+
+    TRACE("Asking for buffer tlength:%u (%llums) minreq:%u (%llums)\n",
+        ba_request.tlength, pa_bytes_to_usec(ba_request.tlength, &This->sample_spec)/1000,
+        ba_request.minreq, pa_bytes_to_usec(ba_request.minreq, &This->sample_spec)/1000);
+
+    This->stream = pa_stream_new(PULSE_context, "DirectSound Buffer", &This->sample_spec, NULL);
+    if (!This->stream) return DSERR_BADFORMAT;
+
+    pa_stream_set_state_callback(This->stream, PULSE_StreamStateCallback, This);
+    pa_stream_set_write_callback(This->stream, DSPULSE_BufferReadCallback, This);
+    pa_stream_set_underflow_callback(This->stream, DSPULSE_BufferUnderflowCallback, This);
+
+    TRACE("Attempting to connect (%p)->stream for playback on %s\n", This, WOutDev[This->drv->wDevID].device_name);
+    pa_stream_connect_playback(This->stream, WOutDev[This->drv->wDevID].device_name, &ba_request, stream_flags, NULL, NULL);
+    for (;;) {
+        pa_context_state_t cstate = pa_context_get_state(PULSE_context);
+        pa_stream_state_t sstate = pa_stream_get_state(This->stream);
+
+        if (cstate == PA_CONTEXT_FAILED || cstate == PA_CONTEXT_TERMINATED ||
+            sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED) {
+            ERR("Failed to connect stream context object: %s\n", pa_strerror(pa_context_errno(PULSE_context)));
+            return DSERR_BUFFERLOST;
+        }
+
+        if (sstate == PA_STREAM_READY)
+            break;
+
[...2991 lines suppressed...]
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |	/* Mono	    11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |	/* Mono	    11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |	/* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |	/* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |	/* Mono	    22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |	/* Mono	    22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |	/* Stereo   22050Hz 8-bit  */\
+	WAVE_FORMAT_2S16 |	/* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |	/* Mono	    44100Hz 8-bit  */\
+	WAVE_FORMAT_4M16 |	/* Mono	    44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |	/* Stereo   44100Hz 8-bit  */\
+	WAVE_FORMAT_4S16 |	/* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |	/* Mono	    48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |	/* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |	/* Mono	    48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |	/* Stereo   48000Hz 16-bit */\
+	WAVE_FORMAT_96M08 |	/* Mono	    96000Hz 8-bit  */\
+	WAVE_FORMAT_96S08 |	/* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |	/* Mono	    96000Hz 16-bit */\
+	WAVE_FORMAT_96S16	/* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message 	msg;	/* message identifier */
+    DWORD	                param;  /* parameter for this message */
+    HANDLE	                hEvent;	/* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG			* messages;
+    int                         ring_buffer_size;
+    int				msg_tosave;
+    int				msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION		msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+typedef struct IDsDriverImpl IDsDriverImpl;
+typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
+
+struct IDsDriverImpl {
+    /* IUnknown fields */
+    const IDsDriverVtbl *lpVtbl;
+    LONG    ref;
+
+    IDsDriverBufferImpl *primary;
+    UINT    wDevID;
+};
+
+struct IDsDriverBufferImpl {
+    const IDsDriverBufferVtbl	*lpVtbl;
+    IDsDriverImpl*		drv;
+    LONG			ref;
+    pa_stream			*stream;
+    pa_sample_spec		sample_spec;
+    pa_cvolume			volume;
+
+    PBYTE		buffer;
+    DWORD		buffer_length;
+    DWORD		buffer_read_offset;
+    DWORD		buffer_play_offset;
+    DWORD		fraglen;
+};
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char		*device_name;
+    pa_cvolume		volume;
+
+    union {
+        WAVEOUTCAPSW	out;
+	WAVEINCAPSW	in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    volatile INT        state;		    /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD		wFlags;
+
+    pa_stream		*stream;	    /* The PulseAudio stream */
+    const pa_timing_info	*timing_info;
+    pa_sample_spec	sample_spec;	    /* Sample spec of this stream / device */
+    pa_cvolume		volume;
+    pa_buffer_attr	buffer_attr;
+
+    /* waveIn / waveOut wavaHdr information */
+    LPWAVEHDR		lpQueuePtr;	    /* start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR		lpPlayPtr;	    /* start of not yet fully written buffers */
+    DWORD		dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR		lpLoopPtr;          /* pointer of first buffer in loop, if any */
+    DWORD		dwLoops;	    /* private copy of loop counter */
+
+    /* Virtual stream positioning information */
+    DWORD		last_reset;	    /* When the last reset occured, as pa stream time doesn't reset */
+    struct timeval	last_header;	    /* When the last wavehdr was received, only updated when audio is not playing yet */
+    BOOL		is_releasing;	    /* Whether we are releasing wavehdrs */
+    struct timeval	started_releasing;  /* When wavehdr releasing started, for comparison to queued written wavehdrs */
+    DWORD		releasing_offset;   /* How much audio has been released prior when releasing started in this instance */
+
+    /* waveIn */
+    const void		*buffer;	    /* Pointer to the latest data fragment for recording streams */
+    DWORD		buffer_length;	    /* How large the latest data fragment is */
+    DWORD		buffer_read_offset; /* How far into latest data fragment we last read */
+    DWORD		fraglen;    
+
+    /* Thread communication and synchronization stuff */
+    HANDLE		hStartUpEvent;
+    HANDLE		hThread;
+    DWORD		dwThreadID;
+    PULSE_MSG_RING	msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context		*PULSE_context;   /* Connection Context */
+pa_threaded_mainloop	*PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c */
+void	PULSE_WaitForOperation(pa_operation *o);
+void	PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void	PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamRequestCallback(pa_stream *s, size_t n, void *userdata);
+void	PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamOverflowCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void	PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void	PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+BOOL	PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+void	PULSE_GetMMTime(const pa_timing_info *t, pa_sample_spec *s, size_t last_reset, LPMMTIME lpTime);
+int	PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int	PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void	PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int	PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int	PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+const char * PULSE_getCmdString(enum win_wm_message msg);
+
+/* dsoutput.c */
+DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
+DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
+#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	24 Feb 2009 20:45:07 -0000	1.71
+++ .cvsignore	7 Apr 2009 13:54:42 -0000	1.72
@@ -1 +1 @@
-wine-1.1.15-fe.tar.bz2
+wine-1.1.18-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	24 Feb 2009 20:45:07 -0000	1.72
+++ sources	7 Apr 2009 13:54:42 -0000	1.73
@@ -1 +1 @@
-cfeb6cfd7404c2fed2c9f2623976ea7e  wine-1.1.15-fe.tar.bz2
+1933049a7cc725bcb488c6669fa5ca9e  wine-1.1.18-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/wine.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- wine.spec	24 Feb 2009 20:45:07 -0000	1.98
+++ wine.spec	7 Apr 2009 13:54:42 -0000	1.99
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.15
+Version:	1.1.18
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -43,7 +43,7 @@
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.17-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.20.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.24.patch
 Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
@@ -53,7 +53,7 @@
 Patch2:         wine-desktop-mime.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch:  i386
+ExclusiveArch:  %{ix86}
 
 # BR: All builds
 BuildRequires:	bison
@@ -402,15 +402,12 @@
 %{_bindir}/regsvr32
 %{_bindir}/wine
 %{_bindir}/wineboot
-%{_bindir}/winebrowser
 %{_bindir}/wineconsole
 %{_bindir}/wineprefixcreate
 %{_mandir}/man1/wineprefixcreate.1*
 %{_bindir}/winecfg
-%{_bindir}/uninstaller
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
-%{_libdir}/wine/winhelp.exe16
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -438,11 +435,7 @@
 %lang(fr) %{_mandir}/fr.UTF-8/man1/*
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
-%{_bindir}/wine-kthread
 %{_bindir}/wine-preloader
-%{_bindir}/wine-pthread
-# < 0.9.60
-#%{_bindir}/winelauncher
 %{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
 %dir %{_libdir}/wine
@@ -458,7 +451,6 @@
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
-%{_libdir}/wine/avifile.dll16
 %{_libdir}/wine/browseui.dll.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
@@ -468,9 +460,7 @@
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/comm.drv16
 %{_libdir}/wine/commdlg.dll16
-%{_libdir}/wine/compobj.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -480,9 +470,7 @@
 %{_libdir}/wine/cryptnet.dll.so
 %{_libdir}/wine/cryptui.dll.so
 %{_libdir}/wine/ctapi32.dll.so
-%{_libdir}/wine/ctl3d.dll16
 %{_libdir}/wine/ctl3d32.dll.so
-%{_libdir}/wine/ctl3dv2.dll16
 %{_libdir}/wine/d3d10.dll.so
 %{_libdir}/wine/d3d10core.dll.so
 %{_libdir}/wine/d3dim.dll.so
@@ -497,8 +485,6 @@
 %{_libdir}/wine/devenum.dll.so
 %{_libdir}/wine/dinput.dll.so
 %{_libdir}/wine/dinput8.dll.so
-%{_libdir}/wine/dispdib.dll16
-%{_libdir}/wine/display.drv16
 %{_libdir}/wine/dmband.dll.so
 %{_libdir}/wine/dmcompos.dll.so
 %{_libdir}/wine/dmime.dll.so
@@ -543,7 +529,6 @@
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
-%{_libdir}/wine/imm.dll16
 %{_libdir}/wine/imm32.dll.so
 %{_libdir}/wine/inetcomm.dll.so
 %{_libdir}/wine/inetmib1.dll.so
@@ -556,14 +541,12 @@
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/keyboard.drv16
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
 %{_libdir}/wine/lodctr.exe.so
 %{_libdir}/wine/lz32.dll.so
-%{_libdir}/wine/lzexpand.dll16
 %{_libdir}/wine/mapi32.dll.so
 %{_libdir}/wine/mciavi32.dll.so
 %{_libdir}/wine/mcicda.dll.so
@@ -575,10 +558,8 @@
 %{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
-%{_libdir}/wine/mouse.drv16
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
-%{_libdir}/wine/msacm.dll16
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
@@ -620,20 +601,12 @@
 %{_libdir}/wine/objsel.dll.so
 %{_libdir}/wine/odbc32.dll.so
 %{_libdir}/wine/odbccp32.dll.so
-%{_libdir}/wine/ole2.dll16
-%{_libdir}/wine/ole2conv.dll16
-%{_libdir}/wine/ole2disp.dll16
-%{_libdir}/wine/ole2nls.dll16
-%{_libdir}/wine/ole2prox.dll16
-%{_libdir}/wine/ole2thk.dll16
 %{_libdir}/wine/ole32.dll.so
 %{_libdir}/wine/oleacc.dll.so
 %{_libdir}/wine/oleaut32.dll.so
-%{_libdir}/wine/olecli.dll16
 %{_libdir}/wine/olecli32.dll.so
 %{_libdir}/wine/oledlg.dll.so
 %{_libdir}/wine/olepro32.dll.so
-%{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
@@ -649,7 +622,6 @@
 %{_libdir}/wine/qmgrprxy.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
-%{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
 %{_libdir}/wine/rasdlg.dll.so
 %{_libdir}/wine/resutils.dll.so
@@ -676,13 +648,10 @@
 %{_libdir}/wine/slc.dll.so
 %{_libdir}/wine/snmpapi.dll.so
 %{_libdir}/wine/softpub.dll.so
-%{_libdir}/wine/sound.drv16
 %{_libdir}/wine/spoolsv.exe.so
 %{_libdir}/wine/stdole2.tlb.so
 %{_libdir}/wine/stdole32.tlb.so
 %{_libdir}/wine/sti.dll.so
-%{_libdir}/wine/storage.dll16
-%{_libdir}/wine/stress.dll16
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
@@ -690,7 +659,6 @@
 %{_libdir}/wine/tapi32.dll.so
 %{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
-%{_libdir}/wine/typelib.dll16
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
@@ -711,11 +679,6 @@
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/w32sys.dll16
-%{_libdir}/wine/win32s16.dll16
-%{_libdir}/wine/win87em.dll16
-%{_libdir}/wine/winaspi.dll16
-%{_libdir}/wine/windebug.dll16
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/wineoss.drv.so
@@ -727,15 +690,12 @@
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
-%{_libdir}/wine/winnls.dll16
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/spoolss.dll.so
-%{_libdir}/wine/winoldap.mod16
 %{_libdir}/wine/winscard.dll.so
-%{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
@@ -764,11 +724,47 @@
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
+# 16bit
+%{_libdir}/wine/avifile.dll16.so
+%{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/compobj.dll16.so
+%{_libdir}/wine/ctl3d.dll16.so
+%{_libdir}/wine/ctl3dv2.dll16.so
+%{_libdir}/wine/dispdib.dll16.so
+%{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/keyboard.drv16.so
+%{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mciqtz32.dll.so
+%{_libdir}/wine/mouse.drv16.so
+%{_libdir}/wine/msacm.dll16.so
+%{_libdir}/wine/ole2.dll16.so
+%{_libdir}/wine/ole2conv.dll16.so
+%{_libdir}/wine/ole2disp.dll16.so
+%{_libdir}/wine/ole2nls.dll16.so
+%{_libdir}/wine/ole2prox.dll16.so
+%{_libdir}/wine/ole2thk.dll16.so
+%{_libdir}/wine/olecli.dll16.so
+%{_libdir}/wine/olesvr.dll16.so
+%{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/sound.drv16.so
+%{_libdir}/wine/storage.dll16.so
+%{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/twain.dll16.so
+%{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/w32sys.dll16.so
+%{_libdir}/wine/win32s16.dll16.so
+%{_libdir}/wine/win87em.dll16.so
+%{_libdir}/wine/winaspi.dll16.so
+%{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/winhelp.exe16.so
+%{_libdir}/wine/winnls.dll16.so
+%{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/wintab.dll16.so
 
 %files tools
 %defattr(-,root,root,-)
 %{_bindir}/notepad
-%{_bindir}/progman
 %{_bindir}/winedbg
 %{_bindir}/winedump
 %{_bindir}/winefile
@@ -826,7 +822,6 @@
 
 %files twain
 %defattr(-,root,root,-)
-%{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
@@ -869,6 +864,18 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Mar 30 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.18-1
+- version upgrade (#490672, #491321)
+- winepulse update
+
+* Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.1.15-3
+??? Make sure F11 font packages have been built with F11 fontforge
+
+* Tue Feb 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.15-2
+- switch from i386 to ix86
+
 * Sun Feb 15 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.15-1
 - version upgrade


--- winepulse-0.20.patch DELETED ---



From nhorman at fedoraproject.org  Tue Apr  7 13:57:52 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  7 Apr 2009 13:57:52 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.132, 1.133 mkdumprd, 1.26,
	1.27
Message-ID: <20090407135752.3D74470100@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14360

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz 494416


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kexec-tools.spec	5 Apr 2009 12:20:13 -0000	1.132
+++ kexec-tools.spec	7 Apr 2009 13:57:21 -0000	1.133
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-12
+- Simplifed rootfs mounting code in mkdumprd (bz 494416)
+
 * Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.0.0-11
 - Install the correct configuration for i586
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mkdumprd	3 Apr 2009 20:06:29 -0000	1.26
+++ mkdumprd	7 Apr 2009 13:57:21 -0000	1.27
@@ -2102,19 +2102,9 @@
 
 emit "echo Checking root filesystem."
 emit "fsck \$ROOTDEV"
-emit "echo Mounting root filesystem."
-emit "for FSTYPE in ext3 ext2 minix"
-emit "do"
-emit "  echo Trying mount -t \$FSTYPE \$ROOTDEV /sysroot"
-emit "  mount -t \$FSTYPE \$ROOTDEV /sysroot >/dev/null 2>&1 "
-emit "  if [ \$? == 0 ]"
-emit "  then"
-emit "      echo Using \$FSTYPE on root filesystem"
-emit "      ROOT_MOUNT_GOOD=1"
-emit "      break;"
-emit "  fi"
-emit "done"
-emit "if [ -z \"\$ROOT_MOUNT_GOOD\" ]"
+emit "echo Mounting root filesystem: mount -t $rootfs \$ROOTDEV /sysroot"
+emit "mount -t $rootfs \$ROOTDEV /sysroot >/dev/null 2>&1 "
+emit "if [ \$? != 0 ]"
 emit "then"
 emit "   echo unable to mount rootfs. Dropping to shell"
 emit "   /bin/msh"



From lkundrak at fedoraproject.org  Tue Apr  7 13:59:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 13:59:19 +0000 (UTC)
Subject: rpms/siril/devel siril-0.8-nobuf.patch,NONE,1.1 siril.spec,1.4,1.5
Message-ID: <20090407135919.4E0BE70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/siril/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15014

Modified Files:
	siril.spec 
Added Files:
	siril-0.8-nobuf.patch 
Log Message:
* Tue Apr 4 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-7
- Fix crash on incorrectly loaded pictures (#494536)


siril-0.8-nobuf.patch:

--- NEW FILE siril-0.8-nobuf.patch ---
Fix a NULL dereference crash on incorreclty loaded
FITS images.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp siril-0.8/src/callbacks.c siril-0.8.fixed/src/callbacks.c
--- siril-0.8/src/callbacks.c	2006-05-27 18:58:50.000000000 +0200
+++ siril-0.8.fixed/src/callbacks.c	2009-04-07 15:51:05.994372980 +0200
@@ -604,6 +604,9 @@ gboolean redraw(int vport, int doremap){
 		case RED_VPORT:
 		case BLUE_VPORT:
 		case GREEN_VPORT:
+			if (!com.graybuf[vport])
+				break;
+
 			if (doremap==REMAP){
 				if(gfit.naxis==3){
 					remap(RED_VPORT);


Index: siril.spec
===================================================================
RCS file: /cvs/pkgs/rpms/siril/devel/siril.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- siril.spec	26 Feb 2009 01:14:41 -0000	1.4
+++ siril.spec	7 Apr 2009 13:58:49 -0000	1.5
@@ -1,12 +1,13 @@
 Name:		siril
 Version:	0.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Siril is an astronomical image processing software for Linux
 
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://sourceforge.net/projects/siril/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         siril-0.8-nobuf.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel, fftw3-devel, cfitsio-devel, netpbm-devel
 Requires:	gtk+, fftw3, cfitsio
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nobuf
 
 %build
 %configure
@@ -40,6 +42,9 @@
 %{_datadir}/siril/pixmaps/siril_1.xpm
 
 %changelog
+* Tue Apr 4 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-7
+- Fix crash on incorrectly loaded pictures (#494536)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hedayat at fedoraproject.org  Tue Apr  7 14:05:12 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Tue,  7 Apr 2009 14:05:12 +0000 (UTC)
Subject: rpms/rcssserver/devel .cvsignore, 1.7, 1.8 rcssserver.spec, 1.9,
	1.10 sources, 1.7, 1.8 rcssserver-13.1.0-gcc4_4fix.patch, 1.1, NONE
Message-ID: <20090407140512.D017770100@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17165

Modified Files:
	.cvsignore rcssserver.spec sources 
Removed Files:
	rcssserver-13.1.0-gcc4_4fix.patch 
Log Message:
New upstream release: 13.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Dec 2008 15:05:40 -0000	1.7
+++ .cvsignore	7 Apr 2009 14:05:11 -0000	1.8
@@ -1 +1 @@
-rcssserver-13.1.0.tar.gz
+rcssserver-13.2.0.tar.gz


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/rcssserver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rcssserver.spec	1 Mar 2009 13:04:12 -0000	1.9
+++ rcssserver.spec	7 Apr 2009 14:05:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rcssserver
-Version:        13.1.0
-Release:        3%{?dist}
+Version:        13.2.0
+Release:        1%{?dist}
 Summary:        Robocup 2D Soccer Simulation Server
 
 Group:          Applications/System
@@ -10,7 +10,6 @@
 Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
 # Source 1 is created by me.
 Source1:        %{name}.desktop
-Patch0:         %{name}-13.1.0-gcc4_4fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake libtool boost-devel zlib-devel
@@ -53,7 +52,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4_4fix
 sed -i.lib \
     -e 's|\$ac_boost_path/lib|\$libdir|' \
     -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
@@ -100,6 +98,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
+- Updated to the latest upstream release
+
 * Sun Mar 01 2009 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-3
 - Added a patch for gcc 4.4 compatibility.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Dec 2008 15:05:40 -0000	1.7
+++ sources	7 Apr 2009 14:05:11 -0000	1.8
@@ -1 +1 @@
-ee0ef1d08878c85d73af14785c3abc76  rcssserver-13.1.0.tar.gz
+fb50619cddf6a1514f220a960fed91f1  rcssserver-13.2.0.tar.gz


--- rcssserver-13.1.0-gcc4_4fix.patch DELETED ---



From davej at fedoraproject.org  Tue Apr  7 14:13:03 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue,  7 Apr 2009 14:13:03 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.271, 1.272 kernel.spec, 1.1516, 
	1.1517
Message-ID: <20090407141303.9B18170100@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18835

Modified Files:
	config-generic kernel.spec 
Log Message:
Enable CONFIG_CIFS_STATS (#494545)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- config-generic	4 Apr 2009 17:35:42 -0000	1.271
+++ config-generic	7 Apr 2009 14:12:32 -0000	1.272
@@ -3101,7 +3101,8 @@
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1516
retrieving revision 1.1517
diff -u -r1.1516 -r1.1517
--- kernel.spec	7 Apr 2009 08:46:40 -0000	1.1516
+++ kernel.spec	7 Apr 2009 14:12:33 -0000	1.1517
@@ -1903,6 +1903,9 @@
 # and build.
 
 %changelog
+* Tue Apr 07 2009 Dave Jones <davej at redhat.com>
+- Enable CONFIG_CIFS_STATS (#494545)
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com>
 - drm-modesetting-radeon: repair vt switch
 



From hedayat at fedoraproject.org  Tue Apr  7 14:14:46 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Tue,  7 Apr 2009 14:14:46 +0000 (UTC)
Subject: rpms/rcssmonitor/devel .cvsignore, 1.3, 1.4 rcssmonitor.spec, 1.5, 
	1.6 sources, 1.3, 1.4
Message-ID: <20090407141446.2EEED70100@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssmonitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19196

Modified Files:
	.cvsignore rcssmonitor.spec sources 
Log Message:
New upstream release: 13.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2008 20:14:32 -0000	1.3
+++ .cvsignore	7 Apr 2009 14:14:15 -0000	1.4
@@ -1 +1 @@
-rcssmonitor-13.0.0.tar.gz
+rcssmonitor-13.1.0.tar.gz


Index: rcssmonitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/devel/rcssmonitor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rcssmonitor.spec	25 Feb 2009 19:01:27 -0000	1.5
+++ rcssmonitor.spec	7 Apr 2009 14:14:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           rcssmonitor
-Version:        13.0.0
-Release:        4%{?dist}
+Version:        13.1.0
+Release:        1%{?dist}
 Summary:        RoboCup 2D Soccer Simulator Monitor
 
 Group:          Applications/System
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-1
+- Updated to new upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2008 20:14:32 -0000	1.3
+++ sources	7 Apr 2009 14:14:15 -0000	1.4
@@ -1 +1 @@
-beac4ee8c0b91065dacb9e083f35fd54  rcssmonitor-13.0.0.tar.gz
+7023aa27466d5988f5b1aae960420dac  rcssmonitor-13.1.0.tar.gz



From sindrepb at fedoraproject.org  Tue Apr  7 14:21:01 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Tue,  7 Apr 2009 14:21:01 +0000 (UTC)
Subject: rpms/solfege/F-10 solfege-3.14.1-desktop.patch, NONE,
	1.1 solfege-3.14.1-no-x.patch, NONE, 1.1 solfege.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20090407142101.562C970100@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21176

Modified Files:
	solfege.spec sources 
Added Files:
	solfege-3.14.1-desktop.patch solfege-3.14.1-no-x.patch 
Log Message:
new upstream, fixes

solfege-3.14.1-desktop.patch:

--- NEW FILE solfege-3.14.1-desktop.patch ---
diff -up ./solfege.desktop.orig ./solfege.desktop
--- ./solfege.desktop.orig	2009-04-07 15:19:17.000000000 +0200
+++ ./solfege.desktop	2009-04-07 15:19:24.000000000 +0200
@@ -3,5 +3,5 @@ Name=GNU Solfege
 Exec=solfege
 Terminal=false
 Type=Application
-Icon=solfege.png
+Icon=solfege
 Categories=GNOME;Application;AudioVideo;Audio;Education;

solfege-3.14.1-no-x.patch:

--- NEW FILE solfege-3.14.1-no-x.patch ---
=== modified file 'Makefile.in'
--- Makefile.in	2009-03-11 18:47:36 +0000
+++ Makefile.in	2009-04-06 22:03:08 +0000
@@ -107,7 +107,7 @@
 
 # We need src/_version.py because solfege imports it at runtime.
 solfege.1: solfege.1.txt src/_version.py
-	cat $< | sed -e "s/XXOPTIONS/LANGUAGE=C .\/solfege.py --help|sed -n '5,999p'/e" | txt2man -t Solfege -s 1 > $@
+	LANGUAGE=C $(PYTHON) -c "import tools.buildutil; tools.buildutil.create_manpage()" | txt2man -t Solfege -s 1 > $@
 
 rsync-manual: $(foreach lang,$(USER_MANUAL_LANGUAGES),help/$(lang)/one-big-page.html) help/C/one-big-page.html
 	rm -rf tmp-build

=== modified file 'src/abstract.py'
--- src/abstract.py	2009-04-05 20:22:16 +0000
+++ src/abstract.py	2009-04-06 19:48:52 +0000
@@ -29,6 +29,7 @@
 import cfg
 import lessonfile
 import osutils
+import const
 
 class QstatusDefs:
     QSTATUS_NO = 0
@@ -219,24 +220,6 @@
 
 
 class RhythmAddOnClass:
-    RHYTHMS = ("c4", "c8 c8", "c16 c16 c16 c16", "c8 c16 c16",
-               "c16 c16 c8", "c16 c8 c16", "c8. c16", "c16 c8.",
-               "r4", "r8c8", "r8 c16 c16", "r16 c16 c8", "r16c8c16",
-               "r16 c16 c16 c16", "r8 r16 c16", "r16 c8.",
-               "c12 c12 c12", "r12 c12 c12",
-               "c12 r12 c12", "c12 c12 r12", "r12 r12 c12", "r12 c12 r12",
-               "c4.", "c4 c8", # 22, 23
-               "c8 c4", "c8 c8 c8", # 24, 25
-               "c4 c16 c16", # 26
-               "c16 c16 c4", # 27
-               "c8 c8 c16 c16", #28
-               "c8 c16 c16 c8", #29
-               "c16 c16 c8 c8", #30
-               "c8 c16 c16 c16 c16", #31
-               "c16 c16 c8 c16 c16", #32
-               "c16 c16 c16 c16 c8", #33
-               "c16 c16 c16 c16 c16 c16", #34
-               )
     def new_question(self):
         """returns:
                self.ERR_PICKY : if the question is not yet solved and the
@@ -258,7 +241,7 @@
         norest_v = []
         v = []
         for x in self.m_P.header.rhythm_elements:
-            if not (self.RHYTHMS[x][0] == "r"
+            if not (const.RHYTHMS[x][0] == "r"
                     and self.get_bool("not_start_with_rest")):
                 norest_v.append(x)
             v.append(x)
@@ -283,7 +266,7 @@
             else:
                 count_in_notelen = "4"
             s = "d%s " % count_in_notelen * self.get_int("count_in")
-        s += " ".join([self.RHYTHMS[k] for k in self.m_question])
+        s += " ".join([const.RHYTHMS[k] for k in self.m_question])
         return s
     def get_music_string(self):
         """
@@ -572,7 +555,7 @@
         table.show_all()
     def pngcheckbutton(self, i):
         btn = gtk.CheckButton()
-        btn.add(gu.create_rhythm_image(RhythmAddOnClass.RHYTHMS[i]))
+        btn.add(gu.create_rhythm_image(const.RHYTHMS[i]))
         btn.show()
         btn.connect('clicked', self.select_element_cb, i)
         return btn

=== modified file 'src/app.py'
--- src/app.py	2009-04-04 18:28:28 +0000
+++ src/app.py	2009-04-06 22:11:51 +0000
@@ -33,6 +33,7 @@
 import reportlib
 import filesystem
 import osutils
+from optionparser import SolfegeOptionParser
 
 def check_rcfile():
     """See default.config for rcfileversion values, meanings and
=== added file 'src/const.py'
--- src/const.py	1970-01-01 00:00:00 +0000
+++ src/const.py	2009-04-06 19:48:52 +0000
@@ -0,0 +1,38 @@
+# GNU Solfege - free ear training software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008  Tom Cato Amundsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Moved RHYTHMS here because is should be available from a module that does
+# not pull in the gtk module.
+
+RHYTHMS = ("c4", "c8 c8", "c16 c16 c16 c16", "c8 c16 c16",
+           "c16 c16 c8", "c16 c8 c16", "c8. c16", "c16 c8.",
+           "r4", "r8c8", "r8 c16 c16", "r16 c16 c8", "r16c8c16",
+           "r16 c16 c16 c16", "r8 r16 c16", "r16 c8.",
+           "c12 c12 c12", "r12 c12 c12",
+           "c12 r12 c12", "c12 c12 r12", "r12 r12 c12", "r12 c12 r12",
+           "c4.", "c4 c8", # 22, 23
+           "c8 c4", "c8 c8 c8", # 24, 25
+           "c4 c16 c16", # 26
+           "c16 c16 c4", # 27
+           "c8 c8 c16 c16", #28
+           "c8 c16 c16 c8", #29
+           "c16 c16 c8 c8", #30
+           "c8 c16 c16 c16 c16", #31
+           "c16 c16 c8 c16 c16", #32
+           "c16 c16 c16 c16 c8", #33
+           "c16 c16 c16 c16 c16 c16", #34
+)
+

=== modified file 'src/learning_tree_editor.py'
--- src/learning_tree_editor.py	2008-06-01 09:44:59 +0000
+++ src/learning_tree_editor.py	2009-04-06 19:48:52 +0000
@@ -17,7 +17,6 @@
 
 import gtk
 import gobject
-import pprint
 import copy
 import sys
 import os
@@ -26,473 +25,8 @@
 import lessonfilegui
 from gpath import Path
 import filesystem
-
-def get_learning_tree_list(debug):
-    """
-    Return a list of tuples with info about the learning trees found.
-    Tuple objects:
-    1. The string "user" or "solfege"
-    2. The filename, not including the name of the directory
-    3. Full path to the learning tree.
-    """
-    trees = []
-    for cls, dir in (('solfege', u'learningtrees'),
-        ('user', os.path.join(filesystem.user_data(), "learningtrees"))):
-        try:
-            v = os.listdir(dir)
-        except OSError:
-            v = []
-        for fn in v:
-            if cls == 'solfege':
-                fullpath = os.path.join("learningtrees", fn)
-            else:
-                fullpath = os.path.join(filesystem.user_data(), "learningtrees", fn)
-            trees.append((cls, fn, fullpath))
-    if not debug:
-        try:
-            trees.remove(('solfege', 'debugtree.txt', os.path.join('learningtrees', 'debugtree.txt')))
-        except ValueError:
-            # The debugtree.txtfile is for some reason missing
-            pass
-    return trees
-
-class Menu(dict):
-    def new_from_name(name):
-        m = Menu({'name': name, 'children': []})
-        return m
-    new_from_name = staticmethod(new_from_name)
-    def get_name(self):
-        return self['name']
-    def set_name(self, name):
-        self['name'] = name
-    name = property(get_name, set_name)
-    def get_children(self):
-        return self['children']
-    def set_children(self, children):
-        self['children'] = children
-    children = property(get_children, set_children)
-    def pformat(self, indent):
-        return "%(indent)s{'name': %(name)r,\n" \
-        "%(indent)s 'nametotranslate': _(%(name)r),\n" \
-        "%(indent)s 'children': [\n" \
-        "%(children)s ]\n" \
-        "%(indent)s}," %  {
-            'indent': " " * indent,
-            'name': self.name,
-            'children': self.pformat_children(indent + 4)
-        }
-    def pformat_children(self, indent):
-        v = []
-        for child in self.children:
-            if isinstance(child, basestring):
-                v.append("%s%r," % (" " * indent, child))
-            else:
-                v.append(child.pformat(indent))
-        return "\n".join(v)
-
-
-class LearningTree:
-    def __init__(self, lessonfile_manager):
-        self.lessonfile_manager = lessonfile_manager
-        self.m_menus = []
-        self.m_deps = {}
-        self.m_modified = False
-        self.m_title = ''
-        self.m_learning_tree_version = 3
-        self.m_visibility = 0
-    def load(self, filename):
-        self.read_file(filename)
-        self.post_load()
-    def read_file(self, filename):
-        self.m_visibility = 0
-        self.m_learning_tree_version = 0
-        g = {'_': lambda s: s}
-        v = eval(open(filename, 'rU').read(), g)
-        if type(v) == dict:
-            self.m_menus = v['menu']
-            self.m_deps = v['deps']
-            self.m_title = v.get('title', '')
-            self.m_visibility = v['visibility']
-            self.m_learning_tree_version = v['version']
-        # The different lengths of v below is to be able to read
-        # old formats of the learning tree.
-        elif len(v) == 2:
-            self.m_menus, self.m_deps = v
-        elif len(v) == 3:
-            self.m_menus, self.m_deps, self.m_visibility = v
-        elif len(v) == 4:
-            self.m_learning_tree_version, self.m_menus, self.m_deps, self.m_visibility = v
-        if self.m_learning_tree_version == 0:
-            # Change from old style with one menu to multiple exercise
-            # menus on the menu bar. If version == 0, then the tree only
-            # have one menu "Exercises"
-            self.m_menus = [
-              {'name': "_Practise",
-               'submenus': self.m_menus},
-            ]
-            self.m_menus[0]['children'] = [{'name': n['name'], 'children': n['lessons']} for n in self.m_menus[0]['submenus']]
-            del self.m_menus[0]['submenus']
-        if not self.m_title:
-            self.m_title = filename
-    def post_load(self):
-        self.m_menus = [Menu(d) for d in self.m_menus]
-        for idx, menu in enumerate(self.m_menus):
-            self.m_menus[idx].children = [Menu(s) for s in menu.children]
-        self.m_learning_tree_version = 2
-        junk_id = []
-        # FIXME here we are assuming that there are only two levels of menus
-        if self.lessonfile_manager:
-            # lessonfile_manager is None in some test cases
-            for menu in self.m_menus:
-                for topic in menu.children:
-                    for j in topic.children:
-                        if j not in self.lessonfile_manager.m_uiddb:
-                            print >> sys.stderr, "Junking the registration of lesson_id '%s'\nfrom learning tree. File not found." % j
-                            junk_id.append(j)
-        for j in junk_id:
-            for menu in self.m_menus:
-                for topic in menu.children:
-                    if j in topic.children:
-                        del topic.children[topic.children.index(j)]
-                if j in self.m_deps:
-                    del self.m_deps[j]
-                for d in self.m_deps:
-                    if j in self.m_deps[d]:
-                        self.m_deps[d].remove(j)
-        self.sort_topics()
-        self.calculate_visibilities()
-        self.m_modified = False
-    def save(self, filename):
-        self.m_learning_tree_version = 3
-        ofile = open(filename, 'w')
-        print >> ofile, "# GNU Solfege learning tree"
-        print >> ofile, "{"
-        print >> ofile, " 'version': %i," % self.m_learning_tree_version
-        print >> ofile, " 'title': '%s'," % self.m_title.replace("'", r"\'")
-        print >> ofile, " 'titletotranslate': _('%s')," % self.m_title.replace("'", r"\'")
-        print >> ofile, " 'visibility': %i," % self.m_visibility
-        print >> ofile, " 'menu': [ # start of list of menus"
-        for menu in self.m_menus:
-            print >> ofile, menu.pformat(4)
-        print >> ofile, "  ], # end of list of menus"
-        # Delete dependency info about lesson files that are not in the
-        # learning tree.
-        lesson_ids = list(self.iterate_all_lessons())
-        for dep in [d for d in self.m_deps if d not in lesson_ids]:
-            del self.m_deps[dep]
-        print >> ofile, " 'deps':",
-        print >> ofile, "%s," % pprint.pformat(self.m_deps)
-        print >> ofile, "# End of dict mappding dependencies."
-        print >> ofile, "}"
-        ofile.close()
-        self.m_modified = False
-    def new_menu(self, menuname):
-        self.m_menus.append(Menu({'name': menuname, 'children': []}))
-        self.m_modified = True
-    def new_topic(self, menu_idx, topicname):
-        assert topicname not in [s.name for s in self.m_menus[menu_idx].children]
-        self.m_menus[menu_idx].children.append(Menu.new_from_name(topicname))
-        self.m_modified = True
-    def sort_topics(self):
-        """
-        Sort the lessons in each topic.
-        """
-        for menu in self.m_menus:
-            for topic in menu.children:
-                topic.children.sort(lambda a, b: self.cmp(a, b))
-    def move_elem_up(self, path):
-        """
-        Move elem up. Return True if success.
-        Return False if we are the first elem.
-        This function only moves the element within the menu.
-        """
-        if path[-1] == 0:
-            return False
-        p = path[:-1]
-        new_path = path[:-1] + (path[-1],)
-        try:
-            self.get(p).children[path[-1]], self.get(p).children[path[-1]-1] = \
-                self.get(p).children[path[-1]-1], self.get(p).children[path[-1]]
-        except IndexError:
-            return False
-        self.m_modified = True
-        return True
-    def move_elem_to_prev_menu(self, path):
-        """
-        Move the element pointed to by path to the prev menu.
-        Return None if we are on the first menu.
-        """
-        assert path[-2] > 0
-        to_path = list(path[:-1])
-        to_path[-1] -= 1
-        to_path = tuple(to_path)
-        self.get(to_path).children.append(self.get(path))
-        del self.get(path[:-1]).children[path[-1]]
-        self.m_modified = True
-        return to_path + (len(self.get(to_path).children)-1,)
-    def move_elem_down(self, path):
-        """
-        Move move the element (submenu or lesson) one step down on the menu
-        containing it, and return True if successfull.  Return False and do
-        nothing if the element path points to are the last element.
-        """
-        p = path[:-1]
-        try:
-            self.get(p).children[path[-1]], \
-                    self.get(p).children[path[-1]+1] = \
-                    self.get(p).children[path[-1]+1], \
-                    self.get(p).children[path[-1]]
-        except IndexError:
-            return False
-        self.m_modified = True
-        return True
-    def move_elem_to_next_menu(self, path):
-        """
-        Move the element pointed to by path to the next menu.
-        Faild miserably if we are on the last menu, because the
-        gui checks this right now. Return the path to the new
-        position.
-        """
-        pn = list(path[:-1])
-        pn[0] += 1
-        pn = tuple(pn)
-        self.get(pn).children.insert(0, self.get(path))
-        del self.get(path[:-1]).children[path[-1]]
-        self.m_modified = True
-        return pn + (0,)
-    def move_lesson_up(self, path):
-        """
-        Return True if successful, else False.
-        The tree is unchanged if we return False.
-        """
-        if path[-1] == 0:
-            # We are the first lesson
-            return False
-        move_id = self.get(path)
-        prev_id = self.get(Path(path).prev())
-        if prev_id not in list(self.iter_subdeps(move_id)):
-            self.move_elem_up(path)
-            self.m_modified = True
-            return True
-        return False
-    def move_lesson_down(self, path):
-        """
-        Return True if successful, else None.
-        The tree is unchanged if we return None.
-        """
-        p = path[:-1]
-        i = path[-1]
-        move_id = self.get(path)
-        try:
-            next_id = self.get(Path(path).next())
-        except IndexError:
-            return
-        if move_id not in list(self.iter_subdeps(next_id)):
-            try:
-                self.get(p).children[i], self.get(p).children[i + 1] = \
-                    self.get(p).children[i + 1], self.get(p).children[i]
-            except IndexError:
-                return False
-            self.m_modified = True
-            return True
-        return False
-    def add_lesson(self, path, lesson_id):
-        """
-        Each lesson can only be once in a topic.
-        Return True if sucessful, False if not
-        """
-        menu = self.get(path)
-        if lesson_id not in menu.children:
-            if not lesson_id in self.m_deps:
-                self.m_deps[lesson_id] = []
-            menu.children.append(lesson_id)
-            menu.children.sort(lambda a, b: self.cmp(a, b))
-        else:
-            return False
-        self.m_modified = True
-        return True
-    def delete_lesson(self, path):
-        menu = self.get(path[:-1])
-        del menu.children[path[-1]]
-        self.m_modified = True
-    def add_dependency(self, lesson_id, dep_id):
-        assert dep_id not in self.m_deps[lesson_id]
-        self.m_deps[lesson_id].append(dep_id)
-        self.sort_topics()
-        self.m_modified = True
-    def delete_dependency(self, lesson_id, id_to_delete):
-        i = self.m_deps[lesson_id].index(id_to_delete)
-        del self.m_deps[lesson_id][i]
-        self.sort_topics()
-        self.m_modified = True
-    def iterate_all_lessons2(self):
-        """
-        Iterate all lessons that are added to the learning tree.
-        Yields the tuple (lesson_ids, path,)
-        """
-        def do_children(item, path):
-            # path == (0,) is the first menu on the menubar
-            path = path.child()
-            for c in item.children:
-                if isinstance(c, Menu):
-                    for x in do_children(c, path):
-                        yield x
-                else:
-                    assert isinstance(c, basestring)
-                    yield c, path
-                path = path.next()
-        path = Path((0,))
-        for menu in self.m_menus:
-            for x in do_children(menu, path):
-                yield x
-            path = path.next()
-    def iterate_all_lessons(self):
-        """
-        Iterate all lessons that are added to the learning tree.
-        Yields lesson_ids
-        """
-        def do_children(item):
-            for c in item.children:
-                if isinstance(c, Menu):
-                    for x in do_children(c):
-                        yield x
-                else:
-                    assert isinstance(c, basestring)
-                    yield c
-        for menu in self.m_menus:
-            for x in do_children(menu):
-                yield x
-    def iterate_topics_for_id(self, lesson_id):
-        """
-        Yield a string with the name of the submenu containing
-        the lesson_id.
-        """
-        def do_menu(menu):
-            if lesson_id in menu.children:
-                yield menu.name
-            for child in menu.children:
-                if isinstance(child, Menu):
-                    for n in do_menu(child):
-                        yield n
-        for menu in self.m_menus:
-            for n in do_menu(menu):
-                yield n
-    def iterate_deps_for_id(self, lesson_id):
-        """
-        Iterate all the direct dependencies for lesson_id.
-        It does not iterate the sub-dependencies.
-        """
-        for dep in self.m_deps[lesson_id]:
-            yield dep
-    def iterate_possible_deps_for(self, path):
-        """
-        All lessons, except those on the x-list.
-        You get on the x-list if:
-        1. is OBJECT
-        2. already in the depends list of OBJECT
-        3. depend on anything in the x-list
-        4. is a dep (of dep)* of OBJ
-
-
-        Filter out lessons that
-        1. is OBJECT
-        2. is in depends tree below OBJECT
-        3. has OBJECT in its depends tree
-        """
-        # The lesson_id we are finding possible deps for
-        this_id = self.get(path)
-        # First, lets make a list of all lessons that currently are in a topic
-        used = {}
-        for lesson_id in self.iterate_all_lessons():
-            used[lesson_id] = True
-        # Filter out this_id (point 1 in the list in the docstring)
-        del used[this_id]
-        def check(lesson_id):
-            # Filter out according to #2 and #3 in the docstring
-            if lesson_id in list(self.iter_subdeps(this_id)) \
-                    or this_id in list(self.iter_subdeps(lesson_id)):
-                return False
-            return True
-        for i in [k for k in used.keys() if check(k)]:
-            yield i
-    def iter_subdeps(self, lesson_id):
-        for n in self.m_deps[lesson_id]:
-            yield n
-            for nn in self.iter_subdeps(n):
-                yield nn
-    def is_practisable(self, lesson_id):
-        for i in self.iterate_deps_for_id(lesson_id):
-            if not self.lessonfile_manager.is_test_passed(i):
-                return False
-        return True
-    def calculate_visibilities(self):
-        self.m_visibilities = {}
-        v = self.m_deps.keys()
-        v.sort(lambda a, b: self.cmp(a, b))
-        for i in v:
-            if i not in self.lessonfile_manager.m_uiddb:
-                continue
-            if not self.lessonfile_manager.get(i, 'test'):
-                self.m_visibilities[i] = 0
-            elif not list(self.iterate_deps_for_id(i)):
-                self.m_visibilities[i] = 0
-            elif self.is_practisable(i):
-                self.m_visibilities[i] = 0
-            else:
-                self.m_visibilities[i] = max([self.m_visibilities[x] for x in self.m_deps[i]]) + 1
-    def cmp(self, id_a, id_b):
-        """
-        Return -1, 0, 1, like a cmp function.
-        """
-        deps_a = list(self.iter_subdeps(id_b))
-        if id_a in deps_a:
-            return -1
-        deps_b = list(self.iter_subdeps(id_a))
-        if id_b in deps_b:
-            return 1
-        return cmp(len(deps_b), len(deps_a))
-    def get_use_dict(self):
-        """
-        return a dict mapping lesson_id to the number of times the lesson
-        has been added to the learning tree.
-        """
-        retval = {}
-        for lesson_id in self.iterate_all_lessons():
-            retval[lesson_id] = retval.get(lesson_id, 0) + 1
-        return retval
-    def get_use_count(self, lesson_id):
-        """
-        Return an integer telling how many times the lesson lesson_id
-        is used as an exercise.
-        """
-        count = 0
-        for i in self.iterate_all_lessons():
-            if i == lesson_id:
-                count += 1
-        return count
-    def get_dep_use_count(self, lesson_id):
-        """
-        Return an integer telling how many lessons that depends on lesson_id.
-        """
-        count = 0
-        for v in self.m_deps.values():
-            for i in v:
-                if i == lesson_id:
-                    count += 1
-        return count
-    def remove_all_deps_of(self, del_id):
-        for v in self.m_deps.values():
-            if del_id in v:
-                del v[v.index(del_id)]
-        self.m_modified = True
-    def get(self, path):
-        """
-        Return the element pointed to by path.
-        """
-        elem = self.m_menus[path[0]]
-        for idx in path[1:]:
-            elem = elem.children[idx]
-        return elem
+from learningtree import LearningTree, get_learning_tree_list, Menu
+
 
 class LessonFileDialogCommon(gtk.Dialog):
     def __init__(self, app, tree, path):

=== added file 'src/learningtree.py'
--- src/learningtree.py	1970-01-01 00:00:00 +0000
+++ src/learningtree.py	2009-04-06 19:48:52 +0000
@@ -0,0 +1,490 @@
+# GNU Solfege - free ear training software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008  Tom Cato Amundsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import pprint
+import os
+
+import filesystem
+from gpath import Path
+
+def get_learning_tree_list(debug):
+    """
+    Return a list of tuples with info about the learning trees found.
+    Tuple objects:
+    1. The string "user" or "solfege"
+    2. The filename, not including the name of the directory
+    3. Full path to the learning tree.
+    """
+    trees = []
+    for cls, dir in (('solfege', u'learningtrees'),
+        ('user', os.path.join(filesystem.user_data(), "learningtrees"))):
+        try:
+            v = os.listdir(dir)
+        except OSError:
+            v = []
+        for fn in v:
+            if cls == 'solfege':
+                fullpath = os.path.join("learningtrees", fn)
+            else:
+                fullpath = os.path.join(filesystem.user_data(), "learningtrees", fn)
+            trees.append((cls, fn, fullpath))
+    if not debug:
+        try:
+            trees.remove(('solfege', 'debugtree.txt', os.path.join('learningtrees', 'debugtree.txt')))
+        except ValueError:
+            # The debugtree.txtfile is for some reason missing
+            pass
+    return trees
+
+class Menu(dict):
+    def new_from_name(name):
+        m = Menu({'name': name, 'children': []})
+        return m
+    new_from_name = staticmethod(new_from_name)
+    def get_name(self):
+        return self['name']
+    def set_name(self, name):
+        self['name'] = name
+    name = property(get_name, set_name)
+    def get_children(self):
+        return self['children']
+    def set_children(self, children):
+        self['children'] = children
+    children = property(get_children, set_children)
+    def pformat(self, indent):
+        return "%(indent)s{'name': %(name)r,\n" \
+        "%(indent)s 'nametotranslate': _(%(name)r),\n" \
+        "%(indent)s 'children': [\n" \
+        "%(children)s ]\n" \
+        "%(indent)s}," %  {
+            'indent': " " * indent,
+            'name': self.name,
+            'children': self.pformat_children(indent + 4)
+        }
+    def pformat_children(self, indent):
+        v = []
+        for child in self.children:
+            if isinstance(child, basestring):
+                v.append("%s%r," % (" " * indent, child))
+            else:
+                v.append(child.pformat(indent))
+        return "\n".join(v)
+
+
+class LearningTree:
+    def __init__(self, lessonfile_manager):
+        self.lessonfile_manager = lessonfile_manager
+        self.m_menus = []
+        self.m_deps = {}
+        self.m_modified = False
+        self.m_title = ''
+        self.m_learning_tree_version = 3
+        self.m_visibility = 0
+    def load(self, filename):
+        self.read_file(filename)
+        self.post_load()
+    def read_file(self, filename):
+        self.m_visibility = 0
+        self.m_learning_tree_version = 0
+        g = {'_': lambda s: s}
+        v = eval(open(filename, 'rU').read(), g)
+        if type(v) == dict:
+            self.m_menus = v['menu']
+            self.m_deps = v['deps']
+            self.m_title = v.get('title', '')
+            self.m_visibility = v['visibility']
+            self.m_learning_tree_version = v['version']
+        # The different lengths of v below is to be able to read
+        # old formats of the learning tree.
+        elif len(v) == 2:
+            self.m_menus, self.m_deps = v
+        elif len(v) == 3:
+            self.m_menus, self.m_deps, self.m_visibility = v
+        elif len(v) == 4:
+            self.m_learning_tree_version, self.m_menus, self.m_deps, self.m_visibility = v
+        if self.m_learning_tree_version == 0:
+            # Change from old style with one menu to multiple exercise
+            # menus on the menu bar. If version == 0, then the tree only
+            # have one menu "Exercises"
+            self.m_menus = [
+              {'name': "_Practise",
+               'submenus': self.m_menus},
+            ]
+            self.m_menus[0]['children'] = [{'name': n['name'], 'children': n['lessons']} for n in self.m_menus[0]['submenus']]
+            del self.m_menus[0]['submenus']
+        if not self.m_title:
+            self.m_title = filename
+    def post_load(self):
+        self.m_menus = [Menu(d) for d in self.m_menus]
+        for idx, menu in enumerate(self.m_menus):
+            self.m_menus[idx].children = [Menu(s) for s in menu.children]
+        self.m_learning_tree_version = 2
+        junk_id = []
+        # FIXME here we are assuming that there are only two levels of menus
+        if self.lessonfile_manager:
+            # lessonfile_manager is None in some test cases
+            for menu in self.m_menus:
+                for topic in menu.children:
+                    for j in topic.children:
+                        if j not in self.lessonfile_manager.m_uiddb:
+                            print >> sys.stderr, "Junking the registration of lesson_id '%s'\nfrom learning tree. File not found." % j
+                            junk_id.append(j)
+        for j in junk_id:
+            for menu in self.m_menus:
+                for topic in menu.children:
+                    if j in topic.children:
+                        del topic.children[topic.children.index(j)]
+                if j in self.m_deps:
+                    del self.m_deps[j]
+                for d in self.m_deps:
+                    if j in self.m_deps[d]:
+                        self.m_deps[d].remove(j)
+        self.sort_topics()
+        self.calculate_visibilities()
+        self.m_modified = False
+    def save(self, filename):
+        self.m_learning_tree_version = 3
+        ofile = open(filename, 'w')
+        print >> ofile, "# GNU Solfege learning tree"
+        print >> ofile, "{"
+        print >> ofile, " 'version': %i," % self.m_learning_tree_version
+        print >> ofile, " 'title': '%s'," % self.m_title.replace("'", r"\'")
+        print >> ofile, " 'titletotranslate': _('%s')," % self.m_title.replace("'", r"\'")
+        print >> ofile, " 'visibility': %i," % self.m_visibility
+        print >> ofile, " 'menu': [ # start of list of menus"
+        for menu in self.m_menus:
+            print >> ofile, menu.pformat(4)
+        print >> ofile, "  ], # end of list of menus"
+        # Delete dependency info about lesson files that are not in the
+        # learning tree.
+        lesson_ids = list(self.iterate_all_lessons())
+        for dep in [d for d in self.m_deps if d not in lesson_ids]:
+            del self.m_deps[dep]
+        print >> ofile, " 'deps':",
+        print >> ofile, "%s," % pprint.pformat(self.m_deps)
+        print >> ofile, "# End of dict mappding dependencies."
+        print >> ofile, "}"
+        ofile.close()
+        self.m_modified = False
+    def new_menu(self, menuname):
+        self.m_menus.append(Menu({'name': menuname, 'children': []}))
+        self.m_modified = True
+    def new_topic(self, menu_idx, topicname):
+        assert topicname not in [s.name for s in self.m_menus[menu_idx].children]
+        self.m_menus[menu_idx].children.append(Menu.new_from_name(topicname))
+        self.m_modified = True
+    def sort_topics(self):
+        """
+        Sort the lessons in each topic.
+        """
+        for menu in self.m_menus:
+            for topic in menu.children:
+                topic.children.sort(lambda a, b: self.cmp(a, b))
+    def move_elem_up(self, path):
+        """
+        Move elem up. Return True if success.
+        Return False if we are the first elem.
+        This function only moves the element within the menu.
+        """
+        if path[-1] == 0:
+            return False
+        p = path[:-1]
+        new_path = path[:-1] + (path[-1],)
+        try:
+            self.get(p).children[path[-1]], self.get(p).children[path[-1]-1] = \
+                self.get(p).children[path[-1]-1], self.get(p).children[path[-1]]
+        except IndexError:
+            return False
+        self.m_modified = True
+        return True
+    def move_elem_to_prev_menu(self, path):
+        """
+        Move the element pointed to by path to the prev menu.
+        Return None if we are on the first menu.
+        """
+        assert path[-2] > 0
+        to_path = list(path[:-1])
+        to_path[-1] -= 1
+        to_path = tuple(to_path)
+        self.get(to_path).children.append(self.get(path))
+        del self.get(path[:-1]).children[path[-1]]
+        self.m_modified = True
+        return to_path + (len(self.get(to_path).children)-1,)
+    def move_elem_down(self, path):
+        """
+        Move move the element (submenu or lesson) one step down on the menu
+        containing it, and return True if successfull.  Return False and do
+        nothing if the element path points to are the last element.
+        """
+        p = path[:-1]
+        try:
+            self.get(p).children[path[-1]], \
+                    self.get(p).children[path[-1]+1] = \
+                    self.get(p).children[path[-1]+1], \
+                    self.get(p).children[path[-1]]
+        except IndexError:
+            return False
+        self.m_modified = True
+        return True
+    def move_elem_to_next_menu(self, path):
+        """
+        Move the element pointed to by path to the next menu.
+        Faild miserably if we are on the last menu, because the
+        gui checks this right now. Return the path to the new
+        position.
+        """
+        pn = list(path[:-1])
+        pn[0] += 1
+        pn = tuple(pn)
+        self.get(pn).children.insert(0, self.get(path))
+        del self.get(path[:-1]).children[path[-1]]
+        self.m_modified = True
+        return pn + (0,)
+    def move_lesson_up(self, path):
+        """
+        Return True if successful, else False.
+        The tree is unchanged if we return False.
+        """
+        if path[-1] == 0:
+            # We are the first lesson
+            return False
+        move_id = self.get(path)
+        prev_id = self.get(Path(path).prev())
+        if prev_id not in list(self.iter_subdeps(move_id)):
+            self.move_elem_up(path)
+            self.m_modified = True
+            return True
+        return False
+    def move_lesson_down(self, path):
+        """
+        Return True if successful, else None.
+        The tree is unchanged if we return None.
+        """
+        p = path[:-1]
+        i = path[-1]
+        move_id = self.get(path)
+        try:
+            next_id = self.get(Path(path).next())
+        except IndexError:
+            return
+        if move_id not in list(self.iter_subdeps(next_id)):
+            try:
+                self.get(p).children[i], self.get(p).children[i + 1] = \
+                    self.get(p).children[i + 1], self.get(p).children[i]
+            except IndexError:
+                return False
+            self.m_modified = True
+            return True
+        return False
+    def add_lesson(self, path, lesson_id):
+        """
+        Each lesson can only be once in a topic.
+        Return True if sucessful, False if not
+        """
+        menu = self.get(path)
+        if lesson_id not in menu.children:
+            if not lesson_id in self.m_deps:
+                self.m_deps[lesson_id] = []
+            menu.children.append(lesson_id)
+            menu.children.sort(lambda a, b: self.cmp(a, b))
+        else:
+            return False
+        self.m_modified = True
+        return True
+    def delete_lesson(self, path):
+        menu = self.get(path[:-1])
+        del menu.children[path[-1]]
+        self.m_modified = True
+    def add_dependency(self, lesson_id, dep_id):
+        assert dep_id not in self.m_deps[lesson_id]
+        self.m_deps[lesson_id].append(dep_id)
+        self.sort_topics()
+        self.m_modified = True
+    def delete_dependency(self, lesson_id, id_to_delete):
+        i = self.m_deps[lesson_id].index(id_to_delete)
+        del self.m_deps[lesson_id][i]
+        self.sort_topics()
+        self.m_modified = True
+    def iterate_all_lessons2(self):
+        """
+        Iterate all lessons that are added to the learning tree.
+        Yields the tuple (lesson_ids, path,)
+        """
+        def do_children(item, path):
+            # path == (0,) is the first menu on the menubar
+            path = path.child()
+            for c in item.children:
+                if isinstance(c, Menu):
+                    for x in do_children(c, path):
+                        yield x
+                else:
+                    assert isinstance(c, basestring)
+                    yield c, path
+                path = path.next()
+        path = Path((0,))
+        for menu in self.m_menus:
+            for x in do_children(menu, path):
+                yield x
+            path = path.next()
+    def iterate_all_lessons(self):
+        """
+        Iterate all lessons that are added to the learning tree.
+        Yields lesson_ids
+        """
+        def do_children(item):
+            for c in item.children:
+                if isinstance(c, Menu):
+                    for x in do_children(c):
+                        yield x
+                else:
+                    assert isinstance(c, basestring)
+                    yield c
+        for menu in self.m_menus:
+            for x in do_children(menu):
+                yield x
+    def iterate_topics_for_id(self, lesson_id):
+        """
+        Yield a string with the name of the submenu containing
+        the lesson_id.
+        """
+        def do_menu(menu):
+            if lesson_id in menu.children:
+                yield menu.name
+            for child in menu.children:
+                if isinstance(child, Menu):
+                    for n in do_menu(child):
+                        yield n
+        for menu in self.m_menus:
+            for n in do_menu(menu):
+                yield n
+    def iterate_deps_for_id(self, lesson_id):
+        """
+        Iterate all the direct dependencies for lesson_id.
+        It does not iterate the sub-dependencies.
+        """
+        for dep in self.m_deps[lesson_id]:
+            yield dep
+    def iterate_possible_deps_for(self, path):
+        """
+        All lessons, except those on the x-list.
+        You get on the x-list if:
+        1. is OBJECT
+        2. already in the depends list of OBJECT
+        3. depend on anything in the x-list
+        4. is a dep (of dep)* of OBJ
+
+
+        Filter out lessons that
+        1. is OBJECT
+        2. is in depends tree below OBJECT
+        3. has OBJECT in its depends tree
+        """
+        # The lesson_id we are finding possible deps for
+        this_id = self.get(path)
+        # First, lets make a list of all lessons that currently are in a topic
+        used = {}
+        for lesson_id in self.iterate_all_lessons():
+            used[lesson_id] = True
+        # Filter out this_id (point 1 in the list in the docstring)
+        del used[this_id]
+        def check(lesson_id):
+            # Filter out according to #2 and #3 in the docstring
+            if lesson_id in list(self.iter_subdeps(this_id)) \
+                    or this_id in list(self.iter_subdeps(lesson_id)):
+                return False
+            return True
+        for i in [k for k in used.keys() if check(k)]:
+            yield i
+    def iter_subdeps(self, lesson_id):
+        for n in self.m_deps[lesson_id]:
+            yield n
+            for nn in self.iter_subdeps(n):
+                yield nn
+    def is_practisable(self, lesson_id):
+        for i in self.iterate_deps_for_id(lesson_id):
+            if not self.lessonfile_manager.is_test_passed(i):
+                return False
+        return True
+    def calculate_visibilities(self):
+        self.m_visibilities = {}
+        v = self.m_deps.keys()
+        v.sort(lambda a, b: self.cmp(a, b))
+        for i in v:
+            if i not in self.lessonfile_manager.m_uiddb:
+                continue
+            if not self.lessonfile_manager.get(i, 'test'):
+                self.m_visibilities[i] = 0
+            elif not list(self.iterate_deps_for_id(i)):
+                self.m_visibilities[i] = 0
+            elif self.is_practisable(i):
+                self.m_visibilities[i] = 0
+            else:
+                self.m_visibilities[i] = max([self.m_visibilities[x] for x in self.m_deps[i]]) + 1
+    def cmp(self, id_a, id_b):
+        """
+        Return -1, 0, 1, like a cmp function.
+        """
+        deps_a = list(self.iter_subdeps(id_b))
+        if id_a in deps_a:
+            return -1
+        deps_b = list(self.iter_subdeps(id_a))
+        if id_b in deps_b:
+            return 1
+        return cmp(len(deps_b), len(deps_a))
+    def get_use_dict(self):
+        """
+        return a dict mapping lesson_id to the number of times the lesson
+        has been added to the learning tree.
+        """
+        retval = {}
+        for lesson_id in self.iterate_all_lessons():
+            retval[lesson_id] = retval.get(lesson_id, 0) + 1
+        return retval
+    def get_use_count(self, lesson_id):
+        """
+        Return an integer telling how many times the lesson lesson_id
+        is used as an exercise.
+        """
+        count = 0
+        for i in self.iterate_all_lessons():
+            if i == lesson_id:
+                count += 1
+        return count
+    def get_dep_use_count(self, lesson_id):
+        """
+        Return an integer telling how many lessons that depends on lesson_id.
+        """
+        count = 0
+        for v in self.m_deps.values():
+            for i in v:
+                if i == lesson_id:
+                    count += 1
+        return count
+    def remove_all_deps_of(self, del_id):
+        for v in self.m_deps.values():
+            if del_id in v:
+                del v[v.index(del_id)]
+        self.m_modified = True
+    def get(self, path):
+        """
+        Return the element pointed to by path.
+        """
+        elem = self.m_menus[path[0]]
+        for idx in path[1:]:
+            elem = elem.children[idx]
+        return elem
+

=== added file 'src/optionparser.py'
--- src/optionparser.py	1970-01-01 00:00:00 +0000
+++ src/optionparser.py	2009-04-06 22:12:02 +0000
@@ -0,0 +1,44 @@
+import optparse
+
+class SolfegeOptionParser(optparse.OptionParser):
+    def __init__(self):
+        optparse.OptionParser.__init__(self)
+        self.add_option('-v', '--version', action='store_true', dest='version')
+        self.add_option('-w', '--warranty', action='store_true', dest='warranty',
+            help=_('Show warranty and copyright.'))
+        self.add_option('--no-splash', action='store_false', dest='no_splash',
+            help=_('Do not show the startup window.'),
+            default=False)
+        self.add_option('--verbose-sound-init', action='store_true',
+            default=False,
+            dest='verbose_sound_init',
+            help=_('Display more info about the sound setup.'))
+        self.add_option('--no-sound', action='store_true', dest='no_sound',
+            default=False,
+            help=_('Do not play any sounds. Instead some data is printed to standard output. Use this for debugging and porting.'))
+        self.add_option('--debug', action='store_true', dest='debug',
+            help=_('Include features used by the Solfege developers to debug the program.'))
+        self.add_option('--disable-exception-handler', action='store_true',
+            dest='disable_exception_handler',
+            help=_("Disable the exception handling in Gui.standard_exception_handler."))
+        self.add_option('--no-random', action='store_true', dest='no_random',
+            help=_('For debugging only: Select questions from lesson files in sequential order.'))
+        self.add_option('--enable-gtkhtml', action='store_true', 
+            dest='enable_gtkhtml',
+            help=_('Run using gtkhtml2 instead of the built in HTML viewer.'))
+        self.add_option('--no-cairo-widgets', action='store_true',
+            dest='no_cairo_widgets',
+            help=_("Do not use the cairo version of input widgets, even if we run gtk+ 2.8.0 or newer."))
+        self.add_option('--show-gtk-warnings', action='store_true',
+            dest='show_gtk_warnings',
+            help=_('Show GtkWarnings and PangoWarnings in the traceback window.'))
+    def print_help(self, outfile=None):
+        if outfile is None:
+            outfile = sys.stdout
+        encoding = outfile.encoding
+        if not encoding:
+            encoding = "iso-8859-1"
+        outfile.write(self.format_help().encode(encoding, 'replace'))
+
+
+

=== modified file 'src/rhythm.py'
--- src/rhythm.py	2008-02-05 20:06:45 +0000
+++ src/rhythm.py	2009-04-06 19:48:52 +0000
@@ -18,7 +18,7 @@
 import gtk, gobject
 import abstract, gu
 import lessonfile
-
+import const
 
 class Teacher(abstract.Teacher, abstract.RhythmAddOnClass):
     OK = 0
@@ -99,7 +99,7 @@
             self.g_box.get_children()[self.m_num_beats-1].destroy()
         vbox = gtk.VBox()
         vbox.show()
-        im = gu.create_rhythm_image(abstract.RhythmAddOnClass.RHYTHMS[i])
+        im = gu.create_rhythm_image(const.RHYTHMS[i])
         vbox.pack_start(im)
         vbox.pack_start(gu.create_png_image('rhythm-wrong'), False, False)
         vbox.get_children()[-1].hide()
@@ -230,13 +230,13 @@
     def pngbutton(self, i):
         "used by the constructor"
         btn = gtk.Button()
-        if i > len(abstract.RhythmAddOnClass.RHYTHMS):
+        if i > len(const.RHYTHMS):
             im = gtk.Image()
             im.set_from_stock("gtk-missing-image", gtk.ICON_SIZE_LARGE_TOOLBAR)
             im.show()
             btn.add(im)
         else:
-            btn.add(gu.create_rhythm_image(abstract.RhythmAddOnClass.RHYTHMS[i]))
+            btn.add(gu.create_rhythm_image(const.RHYTHMS[i]))
         btn.show()
         btn.connect('clicked', self.guess_element, i)
         return btn
@@ -251,7 +251,7 @@
             self.g_backspace.set_sensitive(False)
     def play_users_answer(self, widget):
         if self.g_rhythm_viewer.m_data:
-            rhythm = " ".join([abstract.RhythmAddOnClass.RHYTHMS[c] for c in self.g_rhythm_viewer.m_data])
+            rhythm = " ".join([const.RHYTHMS[c] for c in self.g_rhythm_viewer.m_data])
             self.m_t.play_rhythm(r"\staff{ %s }" % rhythm)
     def guess_element(self, sender, i):
         if self.m_t.q_status == self.QSTATUS_NO:

=== modified file 'tools/buildutil.py'
--- tools/buildutil.py	2008-03-13 08:08:01 +0000
+++ tools/buildutil.py	2009-04-06 22:13:15 +0000
@@ -18,6 +18,7 @@
 import glob
 import os.path
 import sys
+import re
 sys.path.append(".")
 
 def create_languages_py():
@@ -33,3 +34,19 @@
     print >> f, "]"
     f.close()
 
+def create_manpage():
+    sys.argv = ['solfege']
+    import src.i18n
+    src.i18n.setup(".")
+    import src.optionparser
+    options = src.optionparser.SolfegeOptionParser().format_help().encode('iso-8859-1', 'replace')
+    v = options.split("\n")
+    del v[0]
+    del v[0]
+    del v[0]
+    options = "\n".join(v)
+    # This option is so long that it messes with the columns, and it confuses txt2man.
+    options = re.sub('--disable-exception-handler\s*', '--disable-exception-handler  ', options)
+    s = open("solfege.1.txt", "r").read()
+    s = s.replace('XXOPTIONS', options)
+    print >> sys.stdout, s

=== modified file 'tools/gen_rhythms_table.py'
--- tools/gen_rhythms_table.py	2007-11-02 20:36:55 +0000
+++ tools/gen_rhythms_table.py	2009-04-06 19:48:52 +0000
@@ -9,7 +9,7 @@
     os.path.join(filesystem.rcfile()))
 import src.i18n
 src.i18n.setup(".")
-import src.abstract
+import src.const
 
 img_str = """%i:<inlinemediaobject>
       <imageobject>
@@ -21,9 +21,9 @@
     </inlinemediaobject>"""
 f = open("help/C/rhythmtable.xml", "w")
 print >> f, "<para>"
-for i, r in enumerate(src.abstract.RhythmAddOnClass.RHYTHMS):
+for i, r in enumerate(src.const.RHYTHMS):
     print >> f, img_str % (i, r.replace(" ", ""), r),
-    if i != len(src.abstract.RhythmAddOnClass.RHYTHMS) - 1:
+    if i != len(src.const.RHYTHMS) - 1:
         print >> f, ", "
 print >> f, "</para>"
 f.close()

=== modified file 'tools/generate_lessonfiles.py'
--- tools/generate_lessonfiles.py	2008-11-06 21:43:44 +0000
+++ tools/generate_lessonfiles.py	2009-04-06 19:48:52 +0000
@@ -12,8 +12,13 @@
 sys.path.insert(0, ".")
 import src.i18n
 src.i18n.setup(".")
-from src.learning_tree_editor import LearningTree
-import mpd
+
+from src.learningtree import LearningTree
+
+# We do this sys.path trick to dragging in dependencies on gtk
+sys.path.insert(0, "mpd")
+from musicalpitch import MusicalPitch
+from interval import Interval
 
 header = """
 header {
@@ -32,9 +37,9 @@
 
 def question(f, b, c):
     low = 60
-    tone_a = mpd.MusicalPitch.new_from_int(low)
-    tone_b = mpd.MusicalPitch.new_from_int(low + b)
-    tone_c = mpd.MusicalPitch.new_from_int(low + c)
+    tone_a = MusicalPitch.new_from_int(low)
+    tone_b = MusicalPitch.new_from_int(low + b)
+    tone_c = MusicalPitch.new_from_int(low + c)
     print >> f, 'question {'
     print >> f, '  question_text = _("Sing the three tones")'
     print >> f, '  music = voice("< %s2 %s %s >")' % (
@@ -135,7 +140,7 @@
     return s.replace("m", "min").replace("M", "maj")
 
 def csound_intonation2(harmonic, interval_name, cent):
-    i = mpd.Interval(interval_name)
+    i = Interval(interval_name)
     if harmonic:
         hs = "harmonic-"
     else:
@@ -196,7 +201,7 @@
     tree.new_menu("_Melodic intervals")
     for idx, cname in enumerate(("m2", "M2", "m3", "M3", "p4", "p5",
             "m6", "M6", "m7", "M7")):
-        tree.new_topic(0, mpd.Interval(cname).get_cname())
+        tree.new_topic(0, Interval(cname).get_cname())
         for cent in (40, 30, 20, 15, 10, 8, 6, 5):
             csound_intonation2(False, cname, cent)
             tree.add_lesson((0, idx), "csound-intonation-%s-%icent" % (
@@ -204,7 +209,7 @@
     tree.new_menu("_Harmonic intervals")
     for idx, cname in enumerate(("m2", "M2", "m3", "M3", "p4", "p5",
             "m6", "M6", "m7", "M7")):
-        tree.new_topic(1, mpd.Interval(cname).get_cname())
+        tree.new_topic(1, Interval(cname).get_cname())
         for cent in (40, 30, 20, 15, 10, 8, 6, 5):
             csound_intonation2(True, cname, cent)
             tree.add_lesson((1, idx), "csound-intonation-harmonic-%s-%icent" % (



Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-10/solfege.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- solfege.spec	5 May 2008 12:39:51 -0000	1.15
+++ solfege.spec	7 Apr 2009 14:20:30 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		solfege
-Version:	3.10.4       
+Version:	3.14.1       
 Release:	1%{?dist}
 Summary:	Music education software
 
@@ -8,14 +8,21 @@
 URL:		http://www.solfege.org/
 Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Source1:	solfege.sh.in
+#don't require X to build from Tom Cato Amundsen, to be merged upstream
+Patch0:         solfege-%{version}-no-x.patch
+#make sure desktop file is sane, don't use extension without path in Icon=
+Patch1:         solfege-%{version}-desktop.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	texinfo, swig, gettext, docbook-style-xsl 
-BuildRequires:	pygtk2-devel, libxslt
-BuildRequires:	desktop-file-utils
-
-Requires:	timidity++, gnome-python2-gtkhtml2, esound
-Requires:	pygtk2
+BuildRequires:	pygtk2-devel >= 2.12, libxslt
+BuildRequires:  lilypond, swig
+BuildRequires:	desktop-file-utils, gettext
+
+Requires:	timidity++, lilypond
+Requires:       gnome-python2-gtkhtml2, esound
+Requires:	pygtk2 >= 2.12
 
 %description
 Solfege is free music education software. Use it to train your rhythm, 
@@ -23,9 +30,15 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
+
 #preserve timestamps
 %{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
 
+#fix permissios for debuginfo package
+chmod 0755 $RPM_BUILD_DIR/%{name}-%{version}/src/_version.py
+
 %build
 export INSTALL="%{__install} -c -p"
 #override hardocded path
@@ -75,8 +88,20 @@
 %{_mandir}/man?/*
 
 
-
 %changelog
+* Wed Apr 7 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-1
+- New upstream release
+- Add patch to not require X to build
+- Add patch to fix desktop file, don't use extensions without path in Icon=
+- Add lilypond dependency
+- Make sure permissions in debuginfo are sane
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.10.4-2
+- Rebuild for Python 2.6
+
 * Tue Mar 18 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.10.4-1
 - New bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 May 2008 12:39:51 -0000	1.7
+++ sources	7 Apr 2009 14:20:30 -0000	1.8
@@ -1 +1 @@
-74705388c446a10ed574e68bcd3134d4  solfege-3.10.4.tar.gz
+bb7720a9c847232fad6c8cd462fa1dcc  solfege-3.14.1.tar.gz



From hedayat at fedoraproject.org  Tue Apr  7 14:27:07 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Tue,  7 Apr 2009 14:27:07 +0000 (UTC)
Subject: rpms/rcssserver/F-10 .cvsignore, 1.7, 1.8 rcssserver.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20090407142707.4A25570100@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22654

Modified Files:
	.cvsignore rcssserver.spec sources 
Log Message:
New upstream release: 13.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Dec 2008 15:26:38 -0000	1.7
+++ .cvsignore	7 Apr 2009 14:26:36 -0000	1.8
@@ -1 +1 @@
-rcssserver-13.1.0.tar.gz
+rcssserver-13.2.0.tar.gz


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/rcssserver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rcssserver.spec	18 Dec 2008 15:26:38 -0000	1.6
+++ rcssserver.spec	7 Apr 2009 14:26:36 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           rcssserver
-Version:        13.1.0
+Version:        13.2.0
 Release:        1%{?dist}
 Summary:        Robocup 2D Soccer Simulation Server
 
@@ -98,6 +98,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
+- Updated to the latest upstream release
+
 * Thu Dec 18 2008 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-1
 - Bump to 13.1.0 version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Dec 2008 15:26:38 -0000	1.7
+++ sources	7 Apr 2009 14:26:36 -0000	1.8
@@ -1 +1 @@
-ee0ef1d08878c85d73af14785c3abc76  rcssserver-13.1.0.tar.gz
+fb50619cddf6a1514f220a960fed91f1  rcssserver-13.2.0.tar.gz



From hedayat at fedoraproject.org  Tue Apr  7 14:35:56 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Tue,  7 Apr 2009 14:35:56 +0000 (UTC)
Subject: rpms/rcssserver/F-9 .cvsignore, 1.4, 1.5 rcssserver.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090407143556.2726B70100@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24484

Modified Files:
	.cvsignore rcssserver.spec sources 
Log Message:
New upstream release: 13.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Dec 2008 17:10:15 -0000	1.4
+++ .cvsignore	7 Apr 2009 14:35:25 -0000	1.5
@@ -1 +1 @@
-rcssserver-13.0.2.tar.gz
+rcssserver-13.2.0.tar.gz


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-9/rcssserver.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rcssserver.spec	18 Dec 2008 15:26:39 -0000	1.5
+++ rcssserver.spec	7 Apr 2009 14:35:25 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           rcssserver
-Version:        13.1.0
+Version:        13.2.0
 Release:        1%{?dist}
 Summary:        Robocup 2D Soccer Simulation Server
 
@@ -98,6 +98,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
+- Updated to the latest upstream release
+
 * Thu Dec 18 2008 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-1
 - Bump to 13.1.0 version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Dec 2008 15:26:39 -0000	1.6
+++ sources	7 Apr 2009 14:35:25 -0000	1.7
@@ -1 +1 @@
-ee0ef1d08878c85d73af14785c3abc76  rcssserver-13.1.0.tar.gz
+fb50619cddf6a1514f220a960fed91f1  rcssserver-13.2.0.tar.gz



From hedayat at fedoraproject.org  Tue Apr  7 14:55:18 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Tue,  7 Apr 2009 14:55:18 +0000 (UTC)
Subject: rpms/rcssmonitor/devel rcssmonitor-13.1.0-gcc4_4fix.patch, NONE,
	1.1 rcssmonitor.spec, 1.6, 1.7
Message-ID: <20090407145518.4960470100@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssmonitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29466

Modified Files:
	rcssmonitor.spec 
Added Files:
	rcssmonitor-13.1.0-gcc4_4fix.patch 
Log Message:
New upstream release: 13.1.0

rcssmonitor-13.1.0-gcc4_4fix.patch:

--- NEW FILE rcssmonitor-13.1.0-gcc4_4fix.patch ---
diff -up rcssmonitor-13.1.0/src/2dview.C.gcc4_4fix rcssmonitor-13.1.0/src/2dview.C
--- rcssmonitor-13.1.0/src/2dview.C.gcc4_4fix	2009-04-07 18:57:12.000000000 +0430
+++ rcssmonitor-13.1.0/src/2dview.C	2009-04-07 18:57:50.000000000 +0430
@@ -54,6 +54,7 @@
 #include <ctime>
 #include <cstring>
 #include <cerrno>   //for return values of select
+#include <cstdio>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>


Index: rcssmonitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/devel/rcssmonitor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rcssmonitor.spec	7 Apr 2009 14:14:15 -0000	1.6
+++ rcssmonitor.spec	7 Apr 2009 14:54:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           rcssmonitor
 Version:        13.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RoboCup 2D Soccer Simulator Monitor
 
 Group:          Applications/System
@@ -9,6 +9,7 @@
 Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
 # Source 1 is created by me.
 Source1:        %{name}.desktop
+Patch0:         %{name}-13.1.0-gcc4_4fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake boost-devel libXpm-devel libX11-devel desktop-file-utils
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc4_4fix
 sed -i.lib \
     -e 's|\$ac_boost_path/lib|\$libdir|' \
     -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
@@ -60,6 +62,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-2
+- Added a patch for gcc4.4 compilation fixing.
+
 * Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-1
 - Updated to new upstream release
 



From orion at fedoraproject.org  Tue Apr  7 14:58:22 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  7 Apr 2009 14:58:22 +0000 (UTC)
Subject: rpms/eclipse-photran/devel eclipse-photran-4.0.0b5-outline.patch,
	NONE, 1.1 eclipse-photran.spec, 1.8, 1.9
Message-ID: <20090407145822.3552670100@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30073

Modified Files:
	eclipse-photran.spec 
Added Files:
	eclipse-photran-4.0.0b5-outline.patch 
Log Message:
* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.6.b5
- Add patch from discussion list to fix outline view


eclipse-photran-4.0.0b5-outline.patch:

--- NEW FILE eclipse-photran-4.0.0b5-outline.patch ---
--- org.eclipse.photran-v20090220_4_0_0_Beta5/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/AbstractFortranEditor.java.outline	2009-02-11 11:00:52.000000000 -0700
+++ org.eclipse.photran-v20090220_4_0_0_Beta5/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/AbstractFortranEditor.java	2009-04-06 09:01:50.000000000 -0600
@@ -17,11 +17,11 @@
 import org.eclipse.cdt.core.model.IWorkingCopy;
 import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
 import org.eclipse.cdt.internal.ui.editor.CContentOutlinePage;
+import org.eclipse.cdt.internal.ui.editor.CEditor;
 import org.eclipse.cdt.internal.ui.editor.CEditorMessages;
 import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
 import org.eclipse.cdt.internal.ui.text.CCompositeReconcilingStrategy;
 import org.eclipse.cdt.internal.ui.text.CReconciler;
-import org.eclipse.cdt.internal.ui.text.CReconcilingStrategy;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.IWorkingCopyManager;
 import org.eclipse.core.resources.IFile;
@@ -442,7 +442,7 @@
 	 */
 	public CContentOutlinePage getOutlinePage() {
 		if (fOutlinePage == null) {
-			fOutlinePage = new CContentOutlinePage(null);
+			fOutlinePage = new CContentOutlinePage(new CEditor());
 			fOutlinePage.addSelectionChangedListener(this);
 		}
 		setOutlinePageInput(fOutlinePage, getEditorInput());


Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-photran.spec	23 Mar 2009 18:38:24 -0000	1.8
+++ eclipse-photran.spec	7 Apr 2009 14:57:51 -0000	1.9
@@ -8,7 +8,7 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.5.b5%{?dist}
+Release:        0.6.b5%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
@@ -17,6 +17,7 @@
 # The following tarball was generated by the makesource.sh script
 Source0: org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
 Source1: makesource.sh
+Patch0:  eclipse-photran-4.0.0b5-outline.patch
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-cdt >= 4.0.1
 %if %{gcj_support}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n org.eclipse.photran-v20090220_4_0_0_Beta5
+%patch0 -p1 -b .outline
 # Fixup to use 1.5 source level
 find -name \*.prefs | xargs sed -i -e 's/source=1.3/source=1.5/'
 # This prevents the intel feature from building
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.6.b5
+- Add patch from discussion list to fix outline view
+
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 4.0.0-0.5.b5
 - Rebuild to not ship p2 content.xml.
 



From mkasik at fedoraproject.org  Tue Apr  7 15:01:15 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue,  7 Apr 2009 15:01:15 +0000 (UTC)
Subject: rpms/gtk2/devel print_authentication.patch, NONE, 1.1 gtk2.spec,
	1.367, 1.368
Message-ID: <20090407150115.6356470100@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30901

Modified Files:
	gtk2.spec 
Added Files:
	print_authentication.patch 
Log Message:
* Tue Apr  7 2009 Marek Kasik <mkasik at redhat.com> - 2.16.0-2
- Add authentication support to GtkPrintBackend.


print_authentication.patch:

--- NEW FILE print_authentication.patch ---
Index: gtk/gtkmarshalers.list
===================================================================
--- gtk/gtkmarshalers.list	(revision 22586)
+++ gtk/gtkmarshalers.list	(working copy)
@@ -97,6 +97,7 @@
 VOID:STRING
 VOID:STRING,BOXED
 VOID:STRING,STRING
+VOID:STRING,STRING,STRING
 VOID:STRING,INT,POINTER
 VOID:STRING,UINT,FLAGS
 VOID:STRING,UINT,FLAGS,UINT
Index: gtk/gtkprintbackend.c
===================================================================
--- gtk/gtkprintbackend.c	(revision 22586)
+++ gtk/gtkprintbackend.c	(working copy)
@@ -25,6 +25,7 @@
 
 #include "gtkintl.h"
 #include "gtkmodules.h"
+#include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkprintbackend.h"
 #include "gtkprinter-private.h"
@@ -49,6 +50,9 @@
   guint printer_list_requested : 1;
   guint printer_list_done : 1;
   GtkPrintBackendStatus status;
+  char *hostname;
+  char *username;
+  char *password;
 };
 
 enum {
@@ -57,6 +61,7 @@
   PRINTER_ADDED,
   PRINTER_REMOVED,
   PRINTER_STATUS_CHANGED,
+  REQUEST_PASSWORD,
   LAST_SIGNAL
 };
 
@@ -353,6 +358,10 @@
 static GList *              fallback_printer_list_papers           (GtkPrinter          *printer);
 static GtkPageSetup *       fallback_printer_get_default_page_size (GtkPrinter          *printer);
 static GtkPrintCapabilities fallback_printer_get_capabilities      (GtkPrinter          *printer);
+static void                 request_password                       (GtkPrintBackend     *backend,
+                                                                    const gchar         *hostname,
+                                                                    const gchar         *username,
+                                                                    const gchar         *prompt);
   
 static void
 gtk_print_backend_class_init (GtkPrintBackendClass *class)
@@ -372,6 +381,7 @@
   class->printer_list_papers = fallback_printer_list_papers;
   class->printer_get_default_page_size = fallback_printer_get_default_page_size;
   class->printer_get_capabilities = fallback_printer_get_capabilities;
+  class->request_password = request_password;
   
   g_object_class_install_property (object_class, 
                                    PROP_STATUS,
@@ -425,6 +435,14 @@
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__OBJECT,
 		  G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
+  signals[REQUEST_PASSWORD] =
+    g_signal_new (I_("request-password"),
+		  G_TYPE_FROM_CLASS (class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GtkPrintBackendClass, request_password),
+		  NULL, NULL,
+		  _gtk_marshal_VOID__STRING_STRING_STRING,
+		  G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 }
 
 static void
@@ -437,6 +455,9 @@
   priv->printers = g_hash_table_new_full (g_str_hash, g_str_equal, 
 					  (GDestroyNotify) g_free,
 					  (GDestroyNotify) g_object_unref);
+  priv->hostname = NULL;
+  priv->username = NULL;
+  priv->password = NULL;
 }
 
 static void
@@ -640,6 +661,167 @@
 						       dnotify);
 }
 
+void 
+gtk_print_backend_set_password (GtkPrintBackend *backend,
+                                const gchar     *hostname,
+                                const gchar     *username,
+                                const gchar     *password)
+{
+  g_return_if_fail (GTK_IS_PRINT_BACKEND (backend));
+
+  if (GTK_PRINT_BACKEND_GET_CLASS (backend)->set_password)
+    GTK_PRINT_BACKEND_GET_CLASS (backend)->set_password (backend, hostname, username, password);
+}
+
+static void
+store_password (GtkEntry        *entry,
+                GtkPrintBackend *backend)
+{
+  GtkPrintBackendPrivate *priv = backend->priv;
+
+  if (priv->password != NULL)
+    {
+      memset (priv->password, 0, strlen (priv->password));
+      g_free (priv->password);
+    }
+
+  priv->password = g_strdup (gtk_entry_get_text (entry));
+}
+
+static void
+store_username (GtkEntry        *entry,
+                GtkPrintBackend *backend)
+{
+  GtkPrintBackendPrivate *priv = backend->priv;
+
+  g_free (priv->username);
+  priv->username = g_strdup (gtk_entry_get_text (entry));
+}
+
+static void
+password_dialog_response (GtkWidget       *dialog,
+                          gint             response_id,
+                          GtkPrintBackend *backend)
+{
+  GtkPrintBackendPrivate *priv = backend->priv;
+
+  if (response_id == GTK_RESPONSE_OK)
+    gtk_print_backend_set_password (backend, priv->hostname, priv->username, priv->password);
+  else
+    gtk_print_backend_set_password (backend, priv->hostname, priv->username, NULL);
+
+  if (priv->password != NULL)
+    {
+      memset (priv->password, 0, strlen (priv->password));
+      g_free (priv->password);
+      priv->password = NULL;
+    }
+
+  g_free (priv->username);
+  priv->username = NULL;
+
+  gtk_widget_destroy (dialog);
+
+  g_object_unref (backend);
+}
+
+static void
+request_password (GtkPrintBackend *backend,
+                  const gchar     *hostname,
+                  const gchar     *username,
+                  const gchar     *prompt)
+{
+  GtkPrintBackendPrivate *priv = backend->priv;
+  GtkWidget *dialog, *username_box, *password_box, *main_box, *label, *icon, *vbox,
+            *password_prompt, *username_prompt,
+            *password_entry, *username_entry;
+  gchar     *markup;
+
+  dialog = gtk_dialog_new_with_buttons ( _("Authentication"), NULL, GTK_DIALOG_MODAL, 
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                         NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+
+  main_box = gtk_hbox_new (FALSE, 0);
+
+  /* Left */
+  icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
+  gtk_misc_set_padding (GTK_MISC (icon), 6, 6);
+
+
+  /* Right */
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_size_request (GTK_WIDGET (vbox), 320, -1);
+
+  /* Right - 1. */
+  label = gtk_label_new (NULL);
+  markup = g_markup_printf_escaped ("<span weight=\"bold\" size=\"large\">%s</span>", prompt);
+  gtk_label_set_markup (GTK_LABEL (label), markup);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_widget_set_size_request (GTK_WIDGET (label), 320, -1);
+  g_free (markup);
+
+
+  /* Right - 2. */
+  username_box = gtk_hbox_new (TRUE, 0);
+
+  username_prompt = gtk_label_new (_("Username:"));
+  gtk_misc_set_alignment (GTK_MISC (username_prompt), 0.0, 0.5);
+
+  username_entry = gtk_entry_new ();
+  gtk_entry_set_text (GTK_ENTRY (username_entry), username);
+
+
+  /* Right - 3. */
+  password_box = gtk_hbox_new (TRUE, 0);
+
+  password_prompt = gtk_label_new (_("Password:"));
+  gtk_misc_set_alignment (GTK_MISC (password_prompt), 0.0, 0.5);
+
+  password_entry = gtk_entry_new ();
+  gtk_entry_set_visibility (GTK_ENTRY (password_entry), FALSE);
+  gtk_entry_set_activates_default (GTK_ENTRY (password_entry), TRUE);
+
+
+  /* Packing */
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_box, TRUE, FALSE, 0);
+
+  gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE, FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE, FALSE, 6);
+
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), username_box, FALSE, TRUE, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), password_box, FALSE, TRUE, 6);
+
+  gtk_box_pack_start (GTK_BOX (username_box), username_prompt, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (username_box), username_entry, TRUE, TRUE, 0);
+
+  gtk_box_pack_start (GTK_BOX (password_box), password_prompt, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (password_box), password_entry, TRUE, TRUE, 0);
+
+
+  gtk_widget_grab_focus (password_entry);
+
+  priv->hostname = g_strdup (hostname);
+  priv->username = g_strdup (username);
+
+  g_signal_connect (password_entry, "changed",
+                    G_CALLBACK (store_password), backend);
+
+  g_signal_connect (username_entry, "changed",
+                    G_CALLBACK (store_username), backend);
+
+  g_object_ref (backend);
+  g_signal_connect (G_OBJECT (dialog), "response",
+                    G_CALLBACK (password_dialog_response), backend);
+
+  gtk_widget_show_all (dialog);
+}
+
 void
 gtk_print_backend_destroy (GtkPrintBackend *print_backend)
 {
Index: gtk/gtkprintbackend.h
===================================================================
--- gtk/gtkprintbackend.h	(revision 22586)
+++ gtk/gtkprintbackend.h	(working copy)
@@ -120,14 +120,22 @@
 							      GtkPrinter          *printer);
   void                  (*printer_status_changed)            (GtkPrintBackend     *backend,
 							      GtkPrinter          *printer);
+  void                  (*request_password)                  (GtkPrintBackend     *backend,
+                                                              const gchar         *hostname,
+                                                              const gchar         *username,
+                                                              const gchar         *prompt);
 
+  /* not a signal */
+  void                  (*set_password)                      (GtkPrintBackend     *backend,
+                                                              const gchar         *hostname,
+                                                              const gchar         *username,
+                                                              const gchar         *password);
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
 };
 
 GType   gtk_print_backend_get_type       (void) G_GNUC_CONST;
@@ -144,6 +152,10 @@
 						    GDestroyNotify           dnotify);
 GList *     gtk_print_backend_load_modules         (void);
 void        gtk_print_backend_destroy              (GtkPrintBackend         *print_backend);
+void        gtk_print_backend_set_password         (GtkPrintBackend         *backend, 
+                                                    const gchar             *hostname,
+                                                    const gchar             *username,
+                                                    const gchar             *password);
 
 /* Backend-only functions for GtkPrintBackend */
 
Index: gtk/gtkprintunixdialog.c
===================================================================
--- gtk/gtkprintunixdialog.c	(revision 22586)
+++ gtk/gtkprintunixdialog.c	(working copy)
@@ -757,7 +757,10 @@
     priv->print_backends = gtk_print_backend_load_modules ();
 
   for (node = priv->print_backends; node != NULL; node = node->next)
-    printer_list_initialize (dialog, GTK_PRINT_BACKEND (node->data));
+    {
+      GtkPrintBackend *backend = node->data;
+      printer_list_initialize (dialog, backend);
+    }
 }
 
 static void
Index: modules/printbackends/cups/gtkcupsutils.c
===================================================================
--- modules/printbackends/cups/gtkcupsutils.c	(revision 22586)
+++ modules/printbackends/cups/gtkcupsutils.c	(working copy)
@@ -39,10 +39,12 @@
 static void _post_write_request (GtkCupsRequest *request);
 static void _post_write_data    (GtkCupsRequest *request);
 static void _post_check         (GtkCupsRequest *request);
+static void _post_auth          (GtkCupsRequest *request);
 static void _post_read_response (GtkCupsRequest *request);
 
 static void _get_send           (GtkCupsRequest *request);
 static void _get_check          (GtkCupsRequest *request);
+static void _get_auth           (GtkCupsRequest *request);
 static void _get_read_data      (GtkCupsRequest *request);
 
 struct _GtkCupsResult
@@ -69,6 +71,7 @@
   _post_write_request,
   _post_write_data,
   _post_check,
+  _post_auth,
   _post_read_response
 };
 
@@ -76,6 +79,7 @@
   _connect,
   _get_send,
   _get_check,
+  _get_auth,
   _get_read_data
 };
 
@@ -101,12 +105,13 @@
 }
 
 GtkCupsRequest *
-gtk_cups_request_new (http_t             *connection,
-                      GtkCupsRequestType  req_type, 
-                      gint                operation_id,
-                      GIOChannel         *data_io,
-                      const char         *server,
-                      const char         *resource)
+gtk_cups_request_new_with_username (http_t             *connection,
+                                    GtkCupsRequestType  req_type, 
+                                    gint                operation_id,
+                                    GIOChannel         *data_io,
+                                    const char         *server,
+                                    const char         *resource,
+                                    const char         *username)
 {
   GtkCupsRequest *request;
   cups_lang_t *language;
@@ -123,6 +128,8 @@
   request->type = req_type;
   request->state = GTK_CUPS_REQUEST_START;
 
+  request->password_state = GTK_CUPS_PASSWORD_NONE;
+
    if (server)
     request->server = g_strdup (server);
   else
@@ -171,15 +178,37 @@
                                    "attributes-natural-language", 
                                    NULL, language->language);
 
-  gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                                   "requesting-user-name",
-                                   NULL, cupsUser ());
-  
+  if (username != NULL)
+    gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                                     "requesting-user-name",
+                                     NULL, username);
+  else
+    gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                                     "requesting-user-name",
+                                     NULL, cupsUser ());
+
   cupsLangFree (language);
 
   return request;
 }
 
+GtkCupsRequest *
+gtk_cups_request_new (http_t             *connection,
+                      GtkCupsRequestType  req_type, 
+                      gint                operation_id,
+                      GIOChannel         *data_io,
+                      const char         *server,
+                      const char         *resource)
+{
+  return gtk_cups_request_new_with_username (connection,
+                                             req_type,
+                                             operation_id,
+                                             data_io,
+                                             server,
+                                             resource,
+                                             NULL);
+}
+
 static void
 gtk_cups_result_free (GtkCupsResult *result)
 {
@@ -205,7 +234,14 @@
 
   g_free (request->server);
   g_free (request->resource);
+  if (request->password != NULL)
+    {
+      memset (request->password, 0, strlen (request->password));
+      g_free (request->password);
+    }
 
+  g_free (request->username);
+
   gtk_cups_result_free (request->result);
 
   g_free (request);
@@ -290,8 +326,25 @@
 		 values);
 }
 
+const char *
+gtk_cups_request_ipp_get_string (GtkCupsRequest *request,
+                                 ipp_tag_t       tag,
+                                 const char     *name)
+{
+  ipp_attribute_t *attribute = NULL;
 
+  if (request != NULL && request->ipp_request != NULL)
+    attribute = ippFindAttribute (request->ipp_request,
+                                  name,
+                                  tag);
 
+  if (attribute != NULL && attribute->values != NULL)
+    return attribute->values[0].string.text;
+  else
+    return NULL;
+}
+
+
 typedef struct
 {
   const char	*name;
@@ -786,12 +839,83 @@
           return;
         }
     }
-   else
+  else if (http_status == HTTP_UNAUTHORIZED)
     {
+      request->state = GTK_CUPS_POST_CHECK;
+      request->poll_state = GTK_CUPS_HTTP_READ;
+
+      request->attempts = 0;
+      return;
+    }
+  else
+    {
       request->attempts++;
     }
 }
 
+static void
+_post_auth (GtkCupsRequest *request)
+{
+  if (request->password_state == GTK_CUPS_PASSWORD_HAS)
+    {
+      if (request->password == NULL)
+        {
+          request->state = GTK_CUPS_POST_DONE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
+
+          gtk_cups_result_set_error (request->result, 
+                                     GTK_CUPS_ERROR_AUTH,
+                                     0,
+                                     1,
+                                     "Canceled by user");
+        }
+      else
+        request->state = GTK_CUPS_POST_CHECK;
+    }
+}
+
+static void
+_get_auth (GtkCupsRequest *request)
+{
+  if (request->password_state == GTK_CUPS_PASSWORD_HAS)
+    {
+      if (request->password == NULL)
+        {
+          request->state = GTK_CUPS_GET_DONE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
+
+          gtk_cups_result_set_error (request->result, 
+                                     GTK_CUPS_ERROR_AUTH,
+                                     0,
+                                     1,
+                                     "Canceled by user");
+        }
+      else
+        request->state = GTK_CUPS_GET_CHECK;
+    }
+}
+
+/* Very ugly hack: cups has a stupid synchronous password callback 
+ * that doesn't even take the request or user data parameters, so 
+ * we have to use a static variable to pass the password to it.
+ * Not threadsafe !
+ * The callback sets cups_password to NULL to signal that the 
+ * password has been used.
+ */
+static char *cups_password;
+static char *cups_username;
+
+static const char *
+passwordCB (const char *prompt)
+{
+  char *pwd = cups_password;
+  cups_password = NULL;
+
+  cupsSetUser (cups_username);
+
+  return pwd;
+}
+
 static void 
 _post_check (GtkCupsRequest *request)
 {
@@ -810,18 +934,91 @@
     }
   else if (http_status == HTTP_UNAUTHORIZED)
     {
-      /* TODO: callout for auth */
-      g_warning ("NOT IMPLEMENTED: We need to prompt for authorization");
-      request->state = GTK_CUPS_POST_DONE;
-      request->poll_state = GTK_CUPS_HTTP_IDLE;
+      int auth_result = -1;
+      httpFlush (request->http);
+
+      if (request->password_state == GTK_CUPS_PASSWORD_APPLIED)
+        {
+          request->password_state = GTK_CUPS_PASSWORD_NOT_VALID;
+          request->state = GTK_CUPS_POST_AUTH;
+          request->need_password = TRUE;
+
+          return;
+        }
+
+      /* Negotiate */
+      if (strncmp (httpGetField (request->http, HTTP_FIELD_WWW_AUTHENTICATE), "Negotiate", 9) == 0)
+        {
+          auth_result = cupsDoAuthentication (request->http, "POST", request->resource);
+        }
+      /* Basic, BasicDigest, Digest and PeerCred */
+      else
+        {
+          if (request->password_state == GTK_CUPS_PASSWORD_NONE)
+            {
+              cups_password = g_strdup ("");
+              cups_username = request->username;
+              cupsSetPasswordCB (passwordCB);
+
+              /* This call success for PeerCred authentication */
+              auth_result = cupsDoAuthentication (request->http, "POST", request->resource);
+
+              if (auth_result != 0)
+                {
+                  /* move to AUTH state to let the backend 
+                   * ask for a password
+                   */ 
+                  request->state = GTK_CUPS_POST_AUTH;
+                  request->need_password = TRUE;
+
+                  return;
+                }
+            }
+          else
+            {
+              cups_password = request->password;
+              cups_username = request->username;
+
+              auth_result = cupsDoAuthentication (request->http, "POST", request->resource);
+
+              if (cups_password != NULL)
+                return;
+
+              if (request->password != NULL)
+                {
+                  memset (request->password, 0, strlen (request->password));
+                  g_free (request->password);
+                  request->password = NULL;
+                }
+
+              request->password_state = GTK_CUPS_PASSWORD_APPLIED;
+            }
+        }
+
+      if (auth_result ||
+          httpReconnect (request->http))
+        {
+          /* if the password has been used, reset password_state
+           * so that we ask for a new one next time around
+           */ 
+          if (cups_password == NULL)
+            request->password_state = GTK_CUPS_PASSWORD_NONE;
+
+          request->state = GTK_CUPS_POST_DONE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
+          gtk_cups_result_set_error (request->result, 
+                                     GTK_CUPS_ERROR_AUTH,
+                                     0,
+                                     0,
+                                     "Not authorized");
+          return;
+        }
       
-      /* TODO: create a not implemented error code */
-      gtk_cups_result_set_error (request->result, 
-                                 GTK_CUPS_ERROR_GENERAL,
-                                 0,
-                                 0,
-                                 "Can't prompt for authorization");
-      return;
+      if (request->data_io != NULL)
+        g_io_channel_seek_position (request->data_io, 0, G_SEEK_SET, NULL);
+
+      request->state = GTK_CUPS_POST_CONNECT;
+      request->poll_state = GTK_CUPS_HTTP_WRITE;
     }
   else if (http_status == HTTP_ERROR)
     {
@@ -883,7 +1080,7 @@
                                      http_errno, 
                                      "HTTP Error in POST %s", 
                                      g_strerror (http_errno));
-         request->poll_state = GTK_CUPS_HTTP_IDLE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
  
           httpFlush (request->http); 
           return;
@@ -975,9 +1172,13 @@
     }
 
   httpClearFields (request->http);
+#ifdef HAVE_HTTPGETAUTHSTRING
+  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
+#else
 #ifdef HAVE_HTTP_AUTHSTRING
   httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
 #endif
+#endif
 
   if (httpGet (request->http, request->resource))
     {
@@ -997,6 +1198,9 @@
       request->attempts++;
       return;    
     }
+
+  if (httpCheck (request->http))
+    request->last_status = httpUpdate (request->http);
         
   request->attempts = 0;
 
@@ -1024,18 +1228,90 @@
     }
   else if (http_status == HTTP_UNAUTHORIZED)
     {
-      /* TODO: callout for auth */
-      g_warning ("NOT IMPLEMENTED: We need to prompt for authorization in a non blocking manner");
-      request->state = GTK_CUPS_GET_DONE;
-      request->poll_state = GTK_CUPS_HTTP_IDLE;
+      int auth_result = -1;
+      httpFlush (request->http);
 
-      /* TODO: should add a status or error code for not implemented */ 
-      gtk_cups_result_set_error (request->result, 
-                                 GTK_CUPS_ERROR_GENERAL,
-                                 0,
-                                 0,
-                                 "Can't prompt for authorization");
-      return;
+      if (request->password_state == GTK_CUPS_PASSWORD_APPLIED)
+        {
+          request->password_state = GTK_CUPS_PASSWORD_NOT_VALID;
+          request->state = GTK_CUPS_GET_AUTH;
+          request->need_password = TRUE;
+
+          return;
+        }
+
+      /* Negotiate */
+      if (strncmp (httpGetField (request->http, HTTP_FIELD_WWW_AUTHENTICATE), "Negotiate", 9) == 0)
+        {
+          auth_result = cupsDoAuthentication (request->http, "GET", request->resource);
+        }
+      /* Basic, BasicDigest, Digest and PeerCred */
+      else
+        {
+          if (request->password_state == GTK_CUPS_PASSWORD_NONE)
+            {
+              cups_password = g_strdup ("");
+              cups_username = request->username;
+              cupsSetPasswordCB (passwordCB);
+
+              /* This call success for PeerCred authentication */
+              auth_result = cupsDoAuthentication (request->http, "GET", request->resource);
+
+              if (auth_result != 0)
+                {
+                  /* move to AUTH state to let the backend
+                   * ask for a password
+                   */
+                  request->state = GTK_CUPS_GET_AUTH;
+                  request->need_password = TRUE;
+
+                  return;
+                }
+            }
+          else
+            {
+              cups_password = request->password;
+              cups_username = request->username;
+
+              auth_result = cupsDoAuthentication (request->http, "GET", request->resource);
+
+              if (cups_password != NULL)
+                return;
+
+              if (request->password != NULL)
+                {
+                  memset (request->password, 0, strlen (request->password));
+                  g_free (request->password);
+                  request->password = NULL;
+                }
+
+              request->password_state = GTK_CUPS_PASSWORD_APPLIED;
+            }
+        }
+
+      if (auth_result ||
+          httpReconnect (request->http))
+        {
+          /* if the password has been used, reset password_state
+           * so that we ask for a new one next time around
+           */
+          if (cups_password == NULL)
+            request->password_state = GTK_CUPS_PASSWORD_NONE;
+
+          request->state = GTK_CUPS_GET_DONE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
+          gtk_cups_result_set_error (request->result, 
+                                     GTK_CUPS_ERROR_AUTH,
+                                     0,
+                                     0,
+                                     "Not authorized");
+          return;
+        }
+
+      request->state = GTK_CUPS_GET_SEND;
+      request->last_status = HTTP_CONTINUE;
+
+     return;
     }
   else if (http_status == HTTP_UPGRADE_REQUIRED)
     {
@@ -1043,7 +1319,7 @@
       httpFlush (request->http);
 
       cupsSetEncryption (HTTP_ENCRYPT_REQUIRED);
-      request->state = GTK_CUPS_POST_CONNECT;
+      request->state = GTK_CUPS_GET_CONNECT;
 
       /* Reconnect... */
       httpReconnect (request->http);
@@ -1143,7 +1419,7 @@
 
   if (io_status == G_IO_STATUS_ERROR)
     {
-      request->state = GTK_CUPS_POST_DONE;
+      request->state = GTK_CUPS_GET_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
     
       gtk_cups_result_set_error (request->result,
Index: modules/printbackends/cups/gtkprintbackendcups.c
===================================================================
--- modules/printbackends/cups/gtkprintbackendcups.c	(revision 22586)
+++ modules/printbackends/cups/gtkprintbackendcups.c	(working copy)
@@ -118,6 +118,11 @@
   char  *default_cover_before;
   char  *default_cover_after;
   int    number_of_covers;
+
+  GList      *requests;
+  GHashTable *auth;
+  gchar      *username;
+  gboolean    authentication_lock;
 };
 
 static GObjectClass *backend_parent_class;
@@ -176,7 +181,14 @@
 								    gdouble                            height,
 								    GIOChannel                        *cache_io);
 
+static void                 gtk_print_backend_cups_set_password    (GtkPrintBackend *backend, 
+                                                                    const gchar     *hostname,
+                                                                    const gchar     *username,
+                                                                    const gchar     *password);
 
+void                        overwrite_and_free                      (gpointer data);
+static gboolean             is_address_local                        (const gchar *address);
+
 static void
 gtk_print_backend_cups_register_type (GTypeModule *module)
 {
@@ -271,6 +283,7 @@
   backend_class->printer_get_default_page_size = cups_printer_get_default_page_size;
   backend_class->printer_get_hard_margins = cups_printer_get_hard_margins;
   backend_class->printer_get_capabilities = cups_printer_get_capabilities;
+  backend_class->set_password = gtk_print_backend_cups_set_password;
 }
 
 static cairo_status_t
@@ -511,12 +524,13 @@
   cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
   settings = gtk_print_job_get_settings (job);
 
-  request = gtk_cups_request_new (NULL,
-                                  GTK_CUPS_POST,
-                                  IPP_PRINT_JOB,
-				  data_io,
-				  NULL, 
-				  cups_printer->device_uri);
+  request = gtk_cups_request_new_with_username (NULL,
+                                                GTK_CUPS_POST,
+                                                IPP_PRINT_JOB,
+                                                data_io,
+                                                NULL,
+                                                cups_printer->device_uri,
+                                                GTK_PRINT_BACKEND_CUPS (print_backend)->username);
 
 #if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1
   httpAssembleURIf (HTTP_URI_CODING_ALL,
@@ -561,7 +575,17 @@
                         (GDestroyNotify)cups_free_print_stream_data);
 }
 
+void overwrite_and_free (gpointer data)
+{
+  gchar *password = (gchar *) data;
 
+  if (password != NULL)
+    {
+      memset (password, 0, strlen (password));
+      g_free (password);
+    }
+}
+
 static void
 gtk_print_backend_cups_init (GtkPrintBackendCups *backend_cups)
 {
@@ -569,6 +593,10 @@
   backend_cups->got_default_printer = FALSE;  
   backend_cups->list_printers_pending = FALSE;
 
+  backend_cups->requests = NULL;
+  backend_cups->auth = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, overwrite_and_free);
+  backend_cups->authentication_lock = FALSE;
+
   backend_cups->covers = NULL;
   backend_cups->default_cover_before = NULL;
   backend_cups->default_cover_after = NULL;
@@ -577,6 +605,8 @@
   backend_cups->default_printer_poll = 0;
   backend_cups->cups_connection_test = NULL;
 
+  backend_cups->username = NULL;
+
   cups_get_local_default_printer (backend_cups);
 }
 
@@ -602,6 +632,10 @@
   gtk_cups_connection_test_free (backend_cups->cups_connection_test);
   backend_cups->cups_connection_test = NULL;
 
+  g_hash_table_destroy (backend_cups->auth);
+
+  g_free (backend_cups->username);
+
   backend_parent_class->finalize (object);
 }
 
@@ -626,8 +660,157 @@
   backend_parent_class->dispose (object);
 }
 
+static gboolean
+is_address_local (const gchar *address)
+{
+  if (address[0] == '/' ||
+      strcmp (address, "127.0.0.1") == 0 ||
+      strcmp (address, "[::1]") == 0)
+    return TRUE;
+  else
+    return FALSE;
+}
 
+static void
+gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
+                                     const gchar     *hostname,
+                                     const gchar     *username, 
+                                     const gchar     *password)
+{
+  GtkPrintBackendCups *cups_backend = GTK_PRINT_BACKEND_CUPS (backend);
+  GList *l;
+  char   dispatch_hostname[HTTP_MAX_URI];
+  gchar *key;
+
+  key = g_strconcat (username, "@", hostname, NULL);
+  g_hash_table_insert (cups_backend->auth, key, g_strdup (password));
+
+  g_free (cups_backend->username);
+  cups_backend->username = g_strdup (username);
+
+  GTK_NOTE (PRINTING,
+            g_print ("CUPS backend: storing password for %s\n", key));
+
+  for (l = cups_backend->requests; l; l = l->next)
+    {
+      GtkPrintCupsDispatchWatch *dispatch = l->data;
+
+      httpGetHostname (dispatch->request->http, dispatch_hostname, sizeof (dispatch_hostname));
+      if (is_address_local (dispatch_hostname))
+        strcpy (dispatch_hostname, "localhost");
+
+      if (strcmp (hostname, dispatch_hostname) == 0) 
+        {
+          overwrite_and_free (dispatch->request->password);
+          dispatch->request->password = g_strdup (password);
+          g_free (dispatch->request->username);
+          dispatch->request->username = g_strdup (username);
+          dispatch->request->password_state = GTK_CUPS_PASSWORD_HAS;
+          dispatch->backend->authentication_lock = FALSE;
+        }
+    }
+}
+
 static gboolean
+request_password (gpointer data)
+{
+  GtkPrintCupsDispatchWatch *dispatch = data;
+  const gchar               *username;
+  gchar                     *password;
+  gchar                     *prompt = NULL;
+  gchar                     *key = NULL;
+  char                       hostname[HTTP_MAX_URI];
+
+  if (dispatch->backend->authentication_lock)
+    return FALSE;
+
+  httpGetHostname (dispatch->request->http, hostname, sizeof (hostname));
+  if (is_address_local (hostname))
+    strcpy (hostname, "localhost");
+
+  if (dispatch->backend->username != NULL)
+    username = dispatch->backend->username;
+  else
+    username = cupsUser ();
+
+  key = g_strconcat (username, "@", hostname, NULL);
+  password = g_hash_table_lookup (dispatch->backend->auth, key);
+
+  if (password && dispatch->request->password_state != GTK_CUPS_PASSWORD_NOT_VALID)
+    {
+      GTK_NOTE (PRINTING,
+                g_print ("CUPS backend: using stored password for %s\n", key));
+
+      overwrite_and_free (dispatch->request->password);
+      dispatch->request->password = g_strdup (password);
+      g_free (dispatch->request->username);
+      dispatch->request->username = g_strdup (username);
+      dispatch->request->password_state = GTK_CUPS_PASSWORD_HAS;
+    }
+  else
+    {
+      const char *job_title = gtk_cups_request_ipp_get_string (dispatch->request, IPP_TAG_NAME, "job-name");
+      const char *printer_uri = gtk_cups_request_ipp_get_string (dispatch->request, IPP_TAG_URI, "printer-uri");
+      char *printer_name = NULL;
+
+      if (printer_uri != NULL && strrchr (printer_uri, '/') != NULL)
+        printer_name = g_strdup (strrchr (printer_uri, '/') + 1);
+
+      if (dispatch->request->password_state == GTK_CUPS_PASSWORD_NOT_VALID)
+        g_hash_table_remove (dispatch->backend->auth, key);
+
+      dispatch->request->password_state = GTK_CUPS_PASSWORD_REQUESTED;
+
+      dispatch->backend->authentication_lock = TRUE;
+
+      switch (dispatch->request->ipp_request->request.op.operation_id)
+        {
+          case 0:
+            prompt = g_strdup_printf ( _("Authentication is required to get a file from %s"), hostname);
+            break;
+          case IPP_PRINT_JOB:
+            if (job_title != NULL && printer_name != NULL)
+              prompt = g_strdup_printf ( _("Authentication is required to print document '%s' on printer %s"), job_title, printer_name);
+            else
+              prompt = g_strdup_printf ( _("Authentication is required to print a document on %s"), hostname);
+            break;
+          case IPP_GET_JOB_ATTRIBUTES:
+            if (job_title != NULL)
+              prompt = g_strdup_printf ( _("Authentication is required to get attributes of job '%s'"), job_title);
+            else
+              prompt = g_strdup ( _("Authentication is required to get attributes of a job"));
+            break;
+          case IPP_GET_PRINTER_ATTRIBUTES:
+            if (printer_name != NULL)
+              prompt = g_strdup_printf ( _("Authentication is required to get attributes of printer %s"), printer_name);
+            else
+              prompt = g_strdup ( _("Authentication is required to get attributes of a printer"));
+            break;
+          case CUPS_GET_DEFAULT:
+            prompt = g_strdup_printf ( _("Authentication is required to get default printer of %s"), hostname);
+            break;
+          case CUPS_GET_PRINTERS:
+            prompt = g_strdup_printf ( _("Authentication is required to get printers from %s"), hostname);
+            break;
+          default:
+            prompt = g_strdup_printf ( _("Authentication is required on %s"), hostname);
+            break;
+        }
+
+      g_free (printer_name);
+
+      g_signal_emit_by_name (dispatch->backend, "request-password", 
+                             hostname, username, prompt);
+
+      g_free (prompt);
+    }
+
+  g_free (key);
+
+  return FALSE;
+}
+
+static gboolean
 cups_dispatch_watch_check (GSource *source)
 {
   GtkPrintCupsDispatchWatch *dispatch;
@@ -665,7 +848,7 @@
 #endif
     }
     
-  if (poll_state != GTK_CUPS_HTTP_IDLE)  
+  if (poll_state != GTK_CUPS_HTTP_IDLE && !dispatch->request->need_password)
     if (!(dispatch->data_poll->revents & dispatch->data_poll->events)) 
        return FALSE;
   
@@ -676,6 +859,13 @@
       g_free (dispatch->data_poll);
       dispatch->data_poll = NULL;
     }
+
+  if (dispatch->request->need_password && dispatch->request->password_state != GTK_CUPS_PASSWORD_REQUESTED)
+    {
+      dispatch->request->need_password = FALSE;
+      g_idle_add (request_password, dispatch);
+      result = FALSE;
+    }
   
   return result;
 }
@@ -735,12 +925,39 @@
 cups_dispatch_watch_finalize (GSource *source)
 {
   GtkPrintCupsDispatchWatch *dispatch;
+  GtkCupsResult *result;
 
   GTK_NOTE (PRINTING,
             g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
 
   dispatch = (GtkPrintCupsDispatchWatch *) source;
 
+  result = gtk_cups_request_get_result (dispatch->request);
+  if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH)
+    {
+      const gchar *username;
+      gchar        hostname[HTTP_MAX_URI];
+      gchar       *key;
+    
+      httpGetHostname (dispatch->request->http, hostname, sizeof (hostname));
+      if (is_address_local (hostname))
+        strcpy (hostname, "localhost");
+
+      if (dispatch->backend->username != NULL)
+        username = dispatch->backend->username;
+      else
+        username = cupsUser ();
+
+      key = g_strconcat (username, "@", hostname, NULL);
+      GTK_NOTE (PRINTING,
+                g_print ("CUPS backend: removing stored password for %s\n", key));
+      g_hash_table_remove (dispatch->backend->auth, key);
+      g_free (key);
+      
+      if (dispatch->backend)
+        dispatch->backend->authentication_lock = FALSE;
+    }
+
   gtk_cups_request_free (dispatch->request);
 
   if (dispatch->backend)
@@ -754,6 +971,10 @@
        * of print backends. See _gtk_print_backend_create for the
        * disabling.
        */
+
+      dispatch->backend->requests = g_list_remove (dispatch->backend->requests, dispatch);
+
+      
       g_object_unref (dispatch->backend);
       dispatch->backend = NULL;
     }
@@ -788,6 +1009,8 @@
   dispatch->backend = g_object_ref (print_backend);
   dispatch->data_poll = NULL;
 
+  print_backend->requests = g_list_prepend (print_backend->requests, dispatch);
+
   g_source_set_callback ((GSource *) dispatch, (GSourceFunc) callback, user_data, notify);
 
   g_source_attach ((GSource *) dispatch, NULL);
@@ -890,12 +1113,13 @@
       "job-sheets-default"
     };
 
-  request = gtk_cups_request_new (NULL,
-                                  GTK_CUPS_POST,
-                                  IPP_GET_PRINTER_ATTRIBUTES,
-				  NULL,
-				  NULL,
-				  NULL);
+  request = gtk_cups_request_new_with_username (NULL,
+                                                GTK_CUPS_POST,
+                                                IPP_GET_PRINTER_ATTRIBUTES,
+                                                NULL,
+                                                NULL,
+                                                NULL,
+                                                print_backend->username);
 
   printer_uri = g_strdup_printf ("ipp://localhost/printers/%s",
                                   printer_name);
@@ -1029,12 +1253,13 @@
   GtkCupsRequest *request;
   gchar *job_uri;
 
-  request = gtk_cups_request_new (NULL,
-                                  GTK_CUPS_POST,
-                                  IPP_GET_JOB_ATTRIBUTES,
-				  NULL,
-				  NULL,
-				  NULL);
+  request = gtk_cups_request_new_with_username (NULL,
+                                                GTK_CUPS_POST,
+                                                IPP_GET_JOB_ATTRIBUTES,
+                                                NULL,
+                                                NULL,
+                                                NULL,
+                                                data->print_backend->username);
 
   job_uri = g_strdup_printf ("ipp://localhost/jobs/%d", data->job_id);
   gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_URI,
@@ -1121,9 +1346,20 @@
   if (gtk_cups_result_is_error (result))
     {
       GTK_NOTE (PRINTING, 
-                g_warning ("CUPS Backend: Error getting printer list: %s", 
-        	           gtk_cups_result_get_error_string (result)));
+                g_warning ("CUPS Backend: Error getting printer list: %s %d %d", 
+                           gtk_cups_result_get_error_string (result),
+                           gtk_cups_result_get_error_type (result),
+                           gtk_cups_result_get_error_code (result)));
 
+      if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH &&
+          gtk_cups_result_get_error_code (result) == 1)
+        {
+          /* Canceled by user, stop popping up more password dialogs */
+          if (cups_backend->list_printers_poll > 0)
+            g_source_remove (cups_backend->list_printers_poll);
+          cups_backend->list_printers_poll = 0;
+        }
+
       goto done;
     }
   
@@ -1609,12 +1845,13 @@
 
   cups_backend->list_printers_pending = TRUE;
 
-  request = gtk_cups_request_new (NULL,
-                                  GTK_CUPS_POST,
-                                  CUPS_GET_PRINTERS,
-				  NULL,
-				  NULL,
-				  NULL);
+  request = gtk_cups_request_new_with_username (NULL,
+                                                GTK_CUPS_POST,
+                                                CUPS_GET_PRINTERS,
+                                                NULL,
+                                                NULL,
+                                                NULL,
+                                                cups_backend->username);
 
   gtk_cups_request_ipp_add_strings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
 				    "requested-attributes", G_N_ELEMENTS (pattrs),
@@ -1776,28 +2013,30 @@
   resource = g_strdup_printf ("/printers/%s.ppd", 
                               gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
 
-  request = gtk_cups_request_new (data->http,
-                                  GTK_CUPS_GET,
-				  0,
-                                  data->ppd_io,
-				  cups_printer->hostname,
-				  resource);
+  print_backend = gtk_printer_get_backend (printer);
 
+  request = gtk_cups_request_new_with_username (data->http,
+                                                GTK_CUPS_GET,
+                                                0,
+                                                data->ppd_io,
+                                                cups_printer->hostname,
+                                                resource,
+                                                GTK_PRINT_BACKEND_CUPS (print_backend)->username);
+
   GTK_NOTE (PRINTING,
             g_print ("CUPS Backend: Requesting resource %s to be written to temp file %s\n", resource, ppd_filename));
 
-  g_free (resource);
-  g_free (ppd_filename);
 
   cups_printer->reading_ppd = TRUE;
 
-  print_backend = gtk_printer_get_backend (printer);
-
   cups_request_execute (GTK_PRINT_BACKEND_CUPS (print_backend),
                         request,
                         (GtkPrintCupsResponseCallbackFunc) cups_request_ppd_cb,
                         data,
                         (GDestroyNotify)get_ppd_data_free);
+
+  g_free (resource);
+  g_free (ppd_filename);
 }
 
 /* Ordering matters for default preference */
@@ -2018,6 +2257,20 @@
 
   GDK_THREADS_ENTER ();
 
+  if (gtk_cups_result_is_error (result))
+    {
+      if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH &&
+          gtk_cups_result_get_error_code (result) == 1)
+        {
+          /* Canceled by user, stop popping up more password dialogs */
+          if (print_backend->list_printers_poll > 0)
+            g_source_remove (print_backend->list_printers_poll);
+          print_backend->list_printers_poll = 0;
+        }
+
+      return;
+    }
+
   response = gtk_cups_result_get_response (result);
   
   if ((attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME)) != NULL)
@@ -2056,12 +2309,13 @@
   if (state == GTK_CUPS_CONNECTION_IN_PROGRESS || state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
     return TRUE;
 
-  request = gtk_cups_request_new (NULL,
-                                  GTK_CUPS_POST,
-                                  CUPS_GET_DEFAULT,
-				  NULL,
-				  NULL,
-				  NULL);
+  request = gtk_cups_request_new_with_username (NULL,
+                                                GTK_CUPS_POST,
+                                                CUPS_GET_DEFAULT,
+                                                NULL,
+                                                NULL,
+                                                NULL,
+                                                print_backend->username);
   
   cups_request_execute (print_backend,
                         request,
Index: modules/printbackends/cups/gtkcupsutils.h
===================================================================
--- modules/printbackends/cups/gtkcupsutils.h	(revision 22586)
+++ modules/printbackends/cups/gtkcupsutils.h	(working copy)
@@ -37,6 +37,7 @@
   GTK_CUPS_ERROR_HTTP,
   GTK_CUPS_ERROR_IPP,
   GTK_CUPS_ERROR_IO,
+  GTK_CUPS_ERROR_AUTH,
   GTK_CUPS_ERROR_GENERAL
 } GtkCupsErrorType;
 
@@ -66,6 +67,15 @@
   GTK_CUPS_CONNECTION_IN_PROGRESS  
 } GtkCupsConnectionState;
 
+typedef enum
+{
+  GTK_CUPS_PASSWORD_NONE,
+  GTK_CUPS_PASSWORD_REQUESTED,
+  GTK_CUPS_PASSWORD_HAS,
+  GTK_CUPS_PASSWORD_APPLIED,
+  GTK_CUPS_PASSWORD_NOT_VALID
+} GtkCupsPasswordState;
+
 struct _GtkCupsRequest 
 {
   GtkCupsRequestType type;
@@ -84,7 +94,12 @@
   gint state;
   GtkCupsPollState poll_state;
 
-  gint own_http : 1; 
+  gchar *password;
+  gchar *username;
+
+  gint own_http : 1;
+  gint need_password : 1;
+  GtkCupsPasswordState password_state;
 };
 
 struct _GtkCupsConnectionTest
@@ -108,6 +123,7 @@
   GTK_CUPS_POST_WRITE_REQUEST,
   GTK_CUPS_POST_WRITE_DATA,
   GTK_CUPS_POST_CHECK,
+  GTK_CUPS_POST_AUTH,
   GTK_CUPS_POST_READ_RESPONSE,
   GTK_CUPS_POST_DONE = GTK_CUPS_REQUEST_DONE
 };
@@ -118,10 +134,18 @@
   GTK_CUPS_GET_CONNECT = GTK_CUPS_REQUEST_START,
   GTK_CUPS_GET_SEND,
   GTK_CUPS_GET_CHECK,
+  GTK_CUPS_GET_AUTH,
   GTK_CUPS_GET_READ_DATA,
   GTK_CUPS_GET_DONE = GTK_CUPS_REQUEST_DONE
 };
 
+GtkCupsRequest        * gtk_cups_request_new_with_username (http_t             *connection,
+							    GtkCupsRequestType  req_type,
+							    gint                operation_id,
+							    GIOChannel         *data_io,
+							    const char         *server,
+							    const char         *resource,
+							    const char         *username);
 GtkCupsRequest        * gtk_cups_request_new               (http_t             *connection,
 							    GtkCupsRequestType  req_type,
 							    gint                operation_id,
@@ -141,6 +165,9 @@
 							    int                 num_values,
 							    const char         *charset,
 							    const char * const *values);
+const char            * gtk_cups_request_ipp_get_string    (GtkCupsRequest     *request,
+							    ipp_tag_t           tag,
+							    const char         *name);
 gboolean                gtk_cups_request_read_write        (GtkCupsRequest     *request);
 GtkCupsPollState        gtk_cups_request_get_poll_state    (GtkCupsRequest     *request);
 void                    gtk_cups_request_free              (GtkCupsRequest     *request);


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- gtk2.spec	13 Mar 2009 18:02:00 -0000	1.367
+++ gtk2.spec	7 Apr 2009 15:00:44 -0000	1.368
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
@@ -31,6 +31,8 @@
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=384940
+Patch4: print_authentication.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -135,7 +137,12 @@
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
+%patch4 -p0 -b .print-authentication
 
+# make sure that gtkmarshalers.{c, h} get regenerated during the build
+#  - caused by print_authentication.patch
+rm --force ./gtk/gtkmarshalers.c
+rm --force ./gtk/gtkmarshalers.h
 
 %build
 libtoolize --force --copy
@@ -335,6 +342,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Marek Kasik <mkasik at redhat.com> - 2.16.0-2
+- Add authentication support to GtkPrintBackend.
+
 * Fri Mar 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1
 - Update to 2.16.0
 



From orion at fedoraproject.org  Tue Apr  7 15:03:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  7 Apr 2009 15:03:36 +0000 (UTC)
Subject: rpms/hdf/devel hdf.spec,1.30,1.31
Message-ID: <20090407150336.251DD70100@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31686

Modified Files:
	hdf.spec 
Log Message:
* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-2
- Add Provides hdf-static to hdf-devel (bug #494529)



Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- hdf.spec	25 Feb 2009 18:11:26 -0000	1.30
+++ hdf.spec	7 Apr 2009 15:03:05 -0000	1.31
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -30,6 +30,7 @@
 %package devel
 Summary: HDF development files
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: libjpeg-devel zlib-devel
 
@@ -110,6 +111,9 @@
 
 
 %changelog
+* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-2
+- Add Provides hdf-static to hdf-devel (bug #494529)
+
 * Wed Feb 25 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-1
 - Update to 4.2r4
 - Add patch to increase buffer size in test



From jjames at fedoraproject.org  Tue Apr  7 15:03:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  7 Apr 2009 15:03:43 +0000 (UTC)
Subject: rpms/check/F-10 check-0.9.6-strdup.patch, NONE, 1.1 check.spec, 1.10,
	1.11
Message-ID: <20090407150343.CDC7970100@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31489/F-10

Modified Files:
	check.spec 
Added Files:
	check-0.9.6-strdup.patch 
Log Message:
* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
- Add check-0.9.6-strdup.patch


check-0.9.6-strdup.patch:

--- NEW FILE check-0.9.6-strdup.patch ---
diff -dur check-0.9.6.ORIG/src/Makefile.am check-0.9.6/src/Makefile.am
--- check-0.9.6.ORIG/src/Makefile.am	2008-12-29 06:48:45.000000000 -0700
+++ check-0.9.6/src/Makefile.am	2009-04-07 08:51:13.000000000 -0600
@@ -7,7 +7,7 @@
 
 EXTRA_DIST		= check.h.in
 
-AM_CFLAGS		= @GCOV_CFLAGS@ -ansi -pedantic 
+AM_CFLAGS		= @GCOV_CFLAGS@ -pedantic 
 
 
 CFILES =\
diff -dur check-0.9.6.ORIG/src/Makefile.in check-0.9.6/src/Makefile.in
--- check-0.9.6.ORIG/src/Makefile.in	2008-12-29 07:07:01.000000000 -0700
+++ check-0.9.6/src/Makefile.in	2009-04-07 08:51:22.000000000 -0600
@@ -206,7 +206,7 @@
 noinst_LTLIBRARIES = libcheckinternal.la
 include_HEADERS = check.h
 EXTRA_DIST = check.h.in
-AM_CFLAGS = @GCOV_CFLAGS@ -ansi -pedantic 
+AM_CFLAGS = @GCOV_CFLAGS@ -pedantic 
 CFILES = \
 	check.c		\
 	check_error.c	\


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/check.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- check.spec	6 Jan 2009 22:08:58 -0000	1.10
+++ check.spec	7 Apr 2009 15:03:13 -0000	1.11
@@ -1,8 +1,11 @@
 Name:           check
 Version:        0.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
+# This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
+# usage.  Debian sent this patch upstream already.
+Patch0:         check-0.9.6-strdup.patch
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
@@ -35,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
@@ -82,6 +86,9 @@
 %{_libdir}/libcheck.a
 
 %changelog
+* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-2
+- Add check-0.9.6-strdup.patch
+
 * Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
 - update to 0.9.6
 



From jjames at fedoraproject.org  Tue Apr  7 15:03:44 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  7 Apr 2009 15:03:44 +0000 (UTC)
Subject: rpms/check/F-9 check-0.9.6-strdup.patch, NONE, 1.1 check.spec, 1.10,
	1.11
Message-ID: <20090407150344.5BCEE70100@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31489/F-9

Modified Files:
	check.spec 
Added Files:
	check-0.9.6-strdup.patch 
Log Message:
* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
- Add check-0.9.6-strdup.patch


check-0.9.6-strdup.patch:

--- NEW FILE check-0.9.6-strdup.patch ---
diff -dur check-0.9.6.ORIG/src/Makefile.am check-0.9.6/src/Makefile.am
--- check-0.9.6.ORIG/src/Makefile.am	2008-12-29 06:48:45.000000000 -0700
+++ check-0.9.6/src/Makefile.am	2009-04-07 08:51:13.000000000 -0600
@@ -7,7 +7,7 @@
 
 EXTRA_DIST		= check.h.in
 
-AM_CFLAGS		= @GCOV_CFLAGS@ -ansi -pedantic 
+AM_CFLAGS		= @GCOV_CFLAGS@ -pedantic 
 
 
 CFILES =\
diff -dur check-0.9.6.ORIG/src/Makefile.in check-0.9.6/src/Makefile.in
--- check-0.9.6.ORIG/src/Makefile.in	2008-12-29 07:07:01.000000000 -0700
+++ check-0.9.6/src/Makefile.in	2009-04-07 08:51:22.000000000 -0600
@@ -206,7 +206,7 @@
 noinst_LTLIBRARIES = libcheckinternal.la
 include_HEADERS = check.h
 EXTRA_DIST = check.h.in
-AM_CFLAGS = @GCOV_CFLAGS@ -ansi -pedantic 
+AM_CFLAGS = @GCOV_CFLAGS@ -pedantic 
 CFILES = \
 	check.c		\
 	check_error.c	\


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-9/check.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- check.spec	6 Jan 2009 22:08:59 -0000	1.10
+++ check.spec	7 Apr 2009 15:03:14 -0000	1.11
@@ -1,8 +1,11 @@
 Name:           check
 Version:        0.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
+# This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
+# usage.  Debian sent this patch upstream already.
+Patch0:         check-0.9.6-strdup.patch
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
@@ -35,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
@@ -82,6 +86,9 @@
 %{_libdir}/libcheck.a
 
 %changelog
+* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-2
+- Add check-0.9.6-strdup.patch
+
 * Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
 - update to 0.9.6
 



From jjames at fedoraproject.org  Tue Apr  7 15:03:44 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  7 Apr 2009 15:03:44 +0000 (UTC)
Subject: rpms/check/devel check-0.9.6-strdup.patch, NONE, 1.1 check.spec,
	1.11, 1.12
Message-ID: <20090407150344.B61EF70100@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31489/devel

Modified Files:
	check.spec 
Added Files:
	check-0.9.6-strdup.patch 
Log Message:
* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
- Add check-0.9.6-strdup.patch


check-0.9.6-strdup.patch:

--- NEW FILE check-0.9.6-strdup.patch ---
diff -dur check-0.9.6.ORIG/src/Makefile.am check-0.9.6/src/Makefile.am
--- check-0.9.6.ORIG/src/Makefile.am	2008-12-29 06:48:45.000000000 -0700
+++ check-0.9.6/src/Makefile.am	2009-04-07 08:51:13.000000000 -0600
@@ -7,7 +7,7 @@
 
 EXTRA_DIST		= check.h.in
 
-AM_CFLAGS		= @GCOV_CFLAGS@ -ansi -pedantic 
+AM_CFLAGS		= @GCOV_CFLAGS@ -pedantic 
 
 
 CFILES =\
diff -dur check-0.9.6.ORIG/src/Makefile.in check-0.9.6/src/Makefile.in
--- check-0.9.6.ORIG/src/Makefile.in	2008-12-29 07:07:01.000000000 -0700
+++ check-0.9.6/src/Makefile.in	2009-04-07 08:51:22.000000000 -0600
@@ -206,7 +206,7 @@
 noinst_LTLIBRARIES = libcheckinternal.la
 include_HEADERS = check.h
 EXTRA_DIST = check.h.in
-AM_CFLAGS = @GCOV_CFLAGS@ -ansi -pedantic 
+AM_CFLAGS = @GCOV_CFLAGS@ -pedantic 
 CFILES = \
 	check.c		\
 	check_error.c	\


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/check.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- check.spec	24 Feb 2009 07:12:44 -0000	1.11
+++ check.spec	7 Apr 2009 15:03:14 -0000	1.12
@@ -1,8 +1,11 @@
 Name:           check
 Version:        0.9.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
+# This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
+# usage.  Debian sent this patch upstream already.
+Patch0:         check-0.9.6-strdup.patch
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
@@ -35,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
@@ -82,6 +86,9 @@
 %{_libdir}/libcheck.a
 
 %changelog
+* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
+- Add check-0.9.6-strdup.patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twoerner at fedoraproject.org  Tue Apr  7 15:04:23 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue,  7 Apr 2009 15:04:23 +0000 (UTC)
Subject: rpms/SDL/devel SDL-1.2.13-rh487720.patch, NONE, 1.1 SDL.spec, 1.64,
	1.65
Message-ID: <20090407150423.A4D2370100@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31944

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.13-rh487720.patch 
Log Message:
- fixed qemu-kvm segfaults on startup in SDL_memcpyMMX/SSE (rhbz#487720)
  upstream patch



SDL-1.2.13-rh487720.patch:

--- NEW FILE SDL-1.2.13-rh487720.patch ---
diff -up SDL-1.2.13/src/cpuinfo/SDL_cpuinfo.c.rh487720 SDL-1.2.13/src/cpuinfo/SDL_cpuinfo.c
--- SDL-1.2.13/src/cpuinfo/SDL_cpuinfo.c.rh487720	2007-12-31 05:47:59.000000000 +0100
+++ SDL-1.2.13/src/cpuinfo/SDL_cpuinfo.c	2009-04-07 16:55:36.000000000 +0200
@@ -146,7 +146,7 @@ done:
 static __inline__ int CPU_getCPUIDFeatures(void)
 {
 	int features = 0;
-#if defined(__GNUC__) && ( defined(i386) || defined(__x86_64__) )
+#if defined(__GNUC__) && defined(i386)
 	__asm__ (
 "        movl    %%ebx,%%edi\n"
 "        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
@@ -163,6 +163,23 @@ static __inline__ int CPU_getCPUIDFeatur
 	:
 	: "%eax", "%ecx", "%edx", "%edi"
 	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+	__asm__ (
+"        movq    %%rbx,%%rdi\n"
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+"        movq    %%rdi,%%rbx\n"
+	: "=m" (features)
+	:
+	: "%rax", "%rcx", "%rdx", "%rdi"
+	);
 #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
 	__asm {
         xor     eax, eax            ; Set up for CPUID instruction
@@ -199,7 +216,7 @@ done:
 static __inline__ int CPU_getCPUIDFeaturesExt(void)
 {
 	int features = 0;
-#if defined(__GNUC__) && (defined(i386) || defined (__x86_64__) )
+#if defined(__GNUC__) && defined(i386)
 	__asm__ (
 "        movl    %%ebx,%%edi\n"
 "        movl    $0x80000000,%%eax   # Query for extended functions    \n"
@@ -215,6 +232,22 @@ static __inline__ int CPU_getCPUIDFeatur
 	:
 	: "%eax", "%ecx", "%edx", "%edi"
 	);
+#elif defined(__GNUC__) && defined (__x86_64__)
+	__asm__ (
+"        movq    %%rbx,%%rdi\n"
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        cpuid                       # Get extended function limit     \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        cpuid                       # and get the information         \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+"        movq    %%rdi,%%rbx\n"
+	: "=m" (features)
+	:
+	: "%rax", "%rcx", "%rdx", "%rdi"
+	);
 #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
 	__asm {
         mov     eax,80000000h       ; Query for extended functions


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- SDL.spec	23 Feb 2009 23:19:10 -0000	1.64
+++ SDL.spec	7 Apr 2009 15:03:53 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.13
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source1: SDL_config.h
 Patch0: SDL-1.2.10-byteorder.patch
@@ -18,6 +18,9 @@
 # submitted upstream:
 # http://bugzilla.libsdl.org/show_bug.cgi?id=699
 Patch30: SDL-1.2.13-rh484362.patch
+# upstream patch:
+# qemu-kvm segfaults on startup in SDL_memcpyMMX/SSE
+Patch31: SDL-1.2.13-rh487720.patch
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -81,6 +84,7 @@
 %patch28 -p1 -b .audiodriver
 %patch29 -p1 -b .pa-rewrite
 %patch30 -p1 -b .rh484362
+%patch31 -p1 -b .rh487720
 
 %build
 aclocal
@@ -138,6 +142,10 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Apr  7 2009 Thomas Woerner <twoerner at redhat.com> 1.2.13-9
+- fixed qemu-kvm segfaults on startup in SDL_memcpyMMX/SSE (rhbz#487720)
+  upstream patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.13-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From orion at fedoraproject.org  Tue Apr  7 15:05:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  7 Apr 2009 15:05:06 +0000 (UTC)
Subject: rpms/hdf/F-10 hdf.spec,1.29,1.30
Message-ID: <20090407150506.64EB470100@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32101

Modified Files:
	hdf.spec 
Log Message:
* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-2
- Add Provides hdf-static to hdf-devel (bug #494529)



Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/F-10/hdf.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- hdf.spec	2 Mar 2009 21:28:08 -0000	1.29
+++ hdf.spec	7 Apr 2009 15:04:35 -0000	1.30
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -30,6 +30,7 @@
 %package devel
 Summary: HDF development files
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: libjpeg-devel zlib-devel
 
@@ -110,6 +111,9 @@
 
 
 %changelog
+* Tue Apr 7 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-2
+- Add Provides hdf-static to hdf-devel (bug #494529)
+
 * Wed Feb 25 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-1
 - Update to 4.2r4
 - Add patch to increase buffer size in test



From pbrobinson at fedoraproject.org  Tue Apr  7 15:07:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  7 Apr 2009 15:07:54 +0000 (UTC)
Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.18,1.19
Message-ID: <20090407150754.AD2DA70100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv655

Modified Files:
	xapian-bindings.spec 
Log Message:
- Obsolete pyxapian


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xapian-bindings.spec	6 Apr 2009 21:45:35 -0000	1.18
+++ xapian-bindings.spec	7 Apr 2009 15:07:24 -0000	1.19
@@ -5,7 +5,7 @@
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
 Version: 1.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://www.xapian.org/
@@ -25,6 +25,7 @@
 %package python
 Group: Development/Libraries
 Summary: Files needed for developing Python scripts which use Xapian
+Obsoletes: pyxapian
 
 %description python
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -76,6 +77,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-2
+- Obsolete pyxapian
+
 * Mon Apr 06 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-1
 - Update to 1.0.11
 



From awjb at fedoraproject.org  Tue Apr  7 15:19:13 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue,  7 Apr 2009 15:19:13 +0000 (UTC)
Subject: rpms/wine/F-9 wine.spec,1.101,1.102
Message-ID: <20090407151913.4A74070100@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3673

Modified Files:
	wine.spec 
Log Message:
- fix spec for f9



Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- wine.spec	7 Apr 2009 13:54:41 -0000	1.101
+++ wine.spec	7 Apr 2009 15:18:42 -0000	1.102
@@ -81,7 +81,7 @@
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
 BuildRequires:  fontforge
-BuildRequires:  libgphoto2-devel
+BuildRequires:  gphoto2 gphoto2-devel
 BuildRequires:  jack-audio-connection-kit-devel
 # #217338
 BuildRequires:  isdn4k-utils-devel



From pbrobinson at fedoraproject.org  Tue Apr  7 15:23:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  7 Apr 2009 15:23:05 +0000 (UTC)
Subject: rpms/pyxapian/F-10 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.1, NONE
Message-ID: <20090407152305.C1B6970100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pyxapian/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5321/F-10

Added Files:
	dead.package 
Removed Files:
	Makefile branch sources 
Log Message:
Mark package as dead


--- NEW FILE dead.package ---
This package is dead. It was only used by OLPC in the OLPC-2 branch (Fedora-7) timeframe. It is replaced by xapian-bindings-python (in Fedora) or xappy (not yet packaged). 


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From pbrobinson at fedoraproject.org  Tue Apr  7 15:23:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  7 Apr 2009 15:23:06 +0000 (UTC)
Subject: rpms/pyxapian/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE sources, 1.1, NONE
Message-ID: <20090407152306.09E5670100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pyxapian/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5321/F-9

Added Files:
	dead.package 
Removed Files:
	Makefile branch sources 
Log Message:
Mark package as dead


--- NEW FILE dead.package ---
This package is dead. It was only used by OLPC in the OLPC-2 branch (Fedora-7) timeframe. It is replaced by xapian-bindings-python (in Fedora) or xappy (not yet packaged). 


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From pbrobinson at fedoraproject.org  Tue Apr  7 15:23:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  7 Apr 2009 15:23:06 +0000 (UTC)
Subject: rpms/pyxapian/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE sources, 1.1, NONE
Message-ID: <20090407152306.59B1170100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pyxapian/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5321/devel

Added Files:
	dead.package 
Removed Files:
	Makefile sources 
Log Message:
Mark package as dead


--- NEW FILE dead.package ---
This package is dead. It was only used by OLPC in the OLPC-2 branch (Fedora-7) timeframe. It is replaced by xapian-bindings-python (in Fedora) or xappy (not yet packaged). 


--- Makefile DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Tue Apr  7 15:31:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 15:31:59 +0000 (UTC)
Subject: rpms/ladspa-swh-plugins/F-10 swh-plugins-0.4.15-pic.patch, NONE,
	1.1 swh-plugins-0.4.15-riceitdown.patch, NONE,
	1.1 ladspa-swh-plugins.spec, 1.7, 1.8
Message-ID: <20090407153159.84CF970100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ladspa-swh-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7206/F-10

Modified Files:
	ladspa-swh-plugins.spec 
Added Files:
	swh-plugins-0.4.15-pic.patch 
	swh-plugins-0.4.15-riceitdown.patch 
Log Message:
fix this package so it builds properly, with the right optflags, and without tons of missing symbols

swh-plugins-0.4.15-pic.patch:

--- NEW FILE swh-plugins-0.4.15-pic.patch ---
diff -up swh-plugins-0.4.15/gverb/Makefile.am.pic swh-plugins-0.4.15/gverb/Makefile.am
--- swh-plugins-0.4.15/gverb/Makefile.am.pic	2004-03-16 17:49:00.000000000 -0500
+++ swh-plugins-0.4.15/gverb/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,9 +3,9 @@ RANLIB=ranlib
 
 noinst_HEADERS = gverb.h gverbdsp.h
 
-noinst_LIBRARIES = libgverb.a
+noinst_LTLIBRARIES = libgverb.la
 
-libgverb_a_SOURCES = gverb.c gverbdsp.c
+libgverb_la_SOURCES = gverb.c gverbdsp.c
 
 # Disable autoheader. 
 AUTOHEADER=echo
diff -up swh-plugins-0.4.15/Makefile.am.pic swh-plugins-0.4.15/Makefile.am
--- swh-plugins-0.4.15/Makefile.am.pic	2009-04-07 10:55:49.000000000 -0400
+++ swh-plugins-0.4.15/Makefile.am	2009-04-07 11:14:51.000000000 -0400
@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
 DISTFN = $(distdir)
 
 # Files needed for FFT based plugins
-pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
-pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
 mbeq_1197_la_LIBADD = $(FFTW_LIBS)
@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
 imp_1199_la_LIBADD = $(FFTW_LIBS)
 imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
 imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
-hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
-hermes_filter_1200_la_LIBADD = util/libblo.a
-fm_osc_1415_la_DEPENDENCIES = util/libblo.a
-fm_osc_1415_la_LIBADD = util/libblo.a
-analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
-analogue_osc_1416_la_LIBADD = util/libblo.a
-sc1_1425_la_LIBADD = util/libdb.a util/librms.a
-sc2_1426_la_LIBADD = util/libdb.a util/librms.a
-sc3_1427_la_LIBADD = util/libdb.a util/librms.a
-sc4_1882_la_LIBADD = util/libdb.a util/librms.a
-sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
-se4_1883_la_LIBADD = util/libdb.a util/librms.a
+hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
+hermes_filter_1200_la_LIBADD = util/libblo.la
+fm_osc_1415_la_DEPENDENCIES = util/libblo.la
+fm_osc_1415_la_LIBADD = util/libblo.la
+analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
+analogue_osc_1416_la_LIBADD = util/libblo.la
+sc1_1425_la_LIBADD = util/libdb.la util/librms.la
+sc2_1426_la_LIBADD = util/libdb.la util/librms.la
+sc3_1427_la_LIBADD = util/libdb.la util/librms.la
+sc4_1882_la_LIBADD = util/libdb.la util/librms.la
+sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
+se4_1883_la_LIBADD = util/libdb.la util/librms.la
 gsm_1215_la_LIBADD = -lgsm
-gverb_1216_la_LIBADD = gverb/libgverb.a
+gverb_1216_la_LIBADD = gverb/libgverb.la
 lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
 
-highpass_iir_1890_la_LIBADD = util/libiir.a
+highpass_iir_1890_la_LIBADD = util/libiir.la
 highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
-lowpass_iir_1891_la_LIBADD = util/libiir.a
+lowpass_iir_1891_la_LIBADD = util/libiir.la
 lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
-bandpass_iir_1892_la_LIBADD = util/libiir.a
+bandpass_iir_1892_la_LIBADD = util/libiir.la
 bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
-bandpass_a_iir_1893_la_LIBADD = util/libiir.a
+bandpass_a_iir_1893_la_LIBADD = util/libiir.la
 bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
-notch_iir_1894_la_LIBADD = util/libiir.a
+notch_iir_1894_la_LIBADD = util/libiir.la
 notch_iir_1894_la_SOURCES = notch_iir_1894.c
-butterworth_1902_la_LIBADD = util/libiir.a
+butterworth_1902_la_LIBADD = util/libiir.la
 butterworth_1902_la_SOURCES = butterworth_1902.c
 
 # Rule to build .c files from XML source
diff -up swh-plugins-0.4.15/util/Makefile.am.pic swh-plugins-0.4.15/util/Makefile.am
--- swh-plugins-0.4.15/util/Makefile.am.pic	2005-06-01 05:52:00.000000000 -0400
+++ swh-plugins-0.4.15/util/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,16 +3,16 @@ RANLIB=ranlib
 
 noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h iir.h buffer.h ls_filter.h
 
-noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
+noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
 
-librms_a_SOURCES = rms.c
-libdb_a_SOURCES = db.c
-libblo_a_SOURCES = blo.c
-libblo_a_CFLAGS = -I at top_srcdir@
-libpitchscale_a_SOURCES = pitchscale.c
-libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
+librms_la_SOURCES = rms.c
+libdb_la_SOURCES = db.c
+libblo_la_SOURCES = blo.c
+libblo_la_CFLAGS = -I at top_srcdir@
+libpitchscale_la_SOURCES = pitchscale.c
+libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
 #libpitchscale_a_LIBS = $(FFTW_LIBS)
-libiir_a_SOURCES = iir.c
+libiir_la_SOURCES = iir.c
 #libbuffer_a_SOURCES = buffer.c
 # Disable autoheader. 
 AUTOHEADER=echo

swh-plugins-0.4.15-riceitdown.patch:

--- NEW FILE swh-plugins-0.4.15-riceitdown.patch ---
Index: swh-plugins-0.4.15/configure.in
===================================================================
--- swh-plugins-0.4.15.orig/configure.in
+++ swh-plugins-0.4.15/configure.in
@@ -99,12 +99,12 @@ else
   AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
   AC_MSG_WARN([May result in non-portable code])
   dnl For gcc use:
-  MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
+  # MACHINE="-march=${build_cpu}"
+  # if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
+  # if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
+  # if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
+  # 
+  # CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
 
   dnl For Intel's C compiler use:
   dnl CC="icc"


Index: ladspa-swh-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-swh-plugins/F-10/ladspa-swh-plugins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ladspa-swh-plugins.spec	19 Feb 2008 04:11:31 -0000	1.7
+++ ladspa-swh-plugins.spec	7 Apr 2009 15:31:29 -0000	1.8
@@ -3,12 +3,14 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         ladspa-%{pkgname}
 Version:      0.4.15
-Release:      12%{?dist}
+Release:      15%{?dist}
 License:      GPLv2+
 Group:        Applications/Multimedia
-Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
+Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-%{version}.tar.gz
 Patch0:       ladspa-swh-plugins-libgsm.patch
 Patch1:       swh-plugins-plugin-Makefile.am.patch
+Patch2:       swh-plugins-0.4.15-pic.patch
+Patch3:       swh-plugins-0.4.15-riceitdown.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,9 +28,11 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 
 %build
-autoreconf
+autoreconf -f -i
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
@@ -47,6 +51,15 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Tue Apr 07 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.15-15
+- fix this package so it builds properly, with the right optflags, and without tons of missing symbols
+
+* Thu Mar 05 2009 Caol??n McNamara <caolanm at redhat.com> - 0.4.15-14
+- make it build
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.15-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.15-12
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Tue Apr  7 15:31:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 15:31:59 +0000 (UTC)
Subject: rpms/ladspa-swh-plugins/F-9 swh-plugins-0.4.15-pic.patch, NONE,
	1.1 swh-plugins-0.4.15-riceitdown.patch, NONE,
	1.1 ladspa-swh-plugins.spec, 1.7, 1.8
Message-ID: <20090407153159.C3E5670100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ladspa-swh-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7206/F-9

Modified Files:
	ladspa-swh-plugins.spec 
Added Files:
	swh-plugins-0.4.15-pic.patch 
	swh-plugins-0.4.15-riceitdown.patch 
Log Message:
fix this package so it builds properly, with the right optflags, and without tons of missing symbols

swh-plugins-0.4.15-pic.patch:

--- NEW FILE swh-plugins-0.4.15-pic.patch ---
diff -up swh-plugins-0.4.15/gverb/Makefile.am.pic swh-plugins-0.4.15/gverb/Makefile.am
--- swh-plugins-0.4.15/gverb/Makefile.am.pic	2004-03-16 17:49:00.000000000 -0500
+++ swh-plugins-0.4.15/gverb/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,9 +3,9 @@ RANLIB=ranlib
 
 noinst_HEADERS = gverb.h gverbdsp.h
 
-noinst_LIBRARIES = libgverb.a
+noinst_LTLIBRARIES = libgverb.la
 
-libgverb_a_SOURCES = gverb.c gverbdsp.c
+libgverb_la_SOURCES = gverb.c gverbdsp.c
 
 # Disable autoheader. 
 AUTOHEADER=echo
diff -up swh-plugins-0.4.15/Makefile.am.pic swh-plugins-0.4.15/Makefile.am
--- swh-plugins-0.4.15/Makefile.am.pic	2009-04-07 10:55:49.000000000 -0400
+++ swh-plugins-0.4.15/Makefile.am	2009-04-07 11:14:51.000000000 -0400
@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
 DISTFN = $(distdir)
 
 # Files needed for FFT based plugins
-pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
-pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
 mbeq_1197_la_LIBADD = $(FFTW_LIBS)
@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
 imp_1199_la_LIBADD = $(FFTW_LIBS)
 imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
 imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
-hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
-hermes_filter_1200_la_LIBADD = util/libblo.a
-fm_osc_1415_la_DEPENDENCIES = util/libblo.a
-fm_osc_1415_la_LIBADD = util/libblo.a
-analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
-analogue_osc_1416_la_LIBADD = util/libblo.a
-sc1_1425_la_LIBADD = util/libdb.a util/librms.a
-sc2_1426_la_LIBADD = util/libdb.a util/librms.a
-sc3_1427_la_LIBADD = util/libdb.a util/librms.a
-sc4_1882_la_LIBADD = util/libdb.a util/librms.a
-sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
-se4_1883_la_LIBADD = util/libdb.a util/librms.a
+hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
+hermes_filter_1200_la_LIBADD = util/libblo.la
+fm_osc_1415_la_DEPENDENCIES = util/libblo.la
+fm_osc_1415_la_LIBADD = util/libblo.la
+analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
+analogue_osc_1416_la_LIBADD = util/libblo.la
+sc1_1425_la_LIBADD = util/libdb.la util/librms.la
+sc2_1426_la_LIBADD = util/libdb.la util/librms.la
+sc3_1427_la_LIBADD = util/libdb.la util/librms.la
+sc4_1882_la_LIBADD = util/libdb.la util/librms.la
+sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
+se4_1883_la_LIBADD = util/libdb.la util/librms.la
 gsm_1215_la_LIBADD = -lgsm
-gverb_1216_la_LIBADD = gverb/libgverb.a
+gverb_1216_la_LIBADD = gverb/libgverb.la
 lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
 
-highpass_iir_1890_la_LIBADD = util/libiir.a
+highpass_iir_1890_la_LIBADD = util/libiir.la
 highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
-lowpass_iir_1891_la_LIBADD = util/libiir.a
+lowpass_iir_1891_la_LIBADD = util/libiir.la
 lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
-bandpass_iir_1892_la_LIBADD = util/libiir.a
+bandpass_iir_1892_la_LIBADD = util/libiir.la
 bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
-bandpass_a_iir_1893_la_LIBADD = util/libiir.a
+bandpass_a_iir_1893_la_LIBADD = util/libiir.la
 bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
-notch_iir_1894_la_LIBADD = util/libiir.a
+notch_iir_1894_la_LIBADD = util/libiir.la
 notch_iir_1894_la_SOURCES = notch_iir_1894.c
-butterworth_1902_la_LIBADD = util/libiir.a
+butterworth_1902_la_LIBADD = util/libiir.la
 butterworth_1902_la_SOURCES = butterworth_1902.c
 
 # Rule to build .c files from XML source
diff -up swh-plugins-0.4.15/util/Makefile.am.pic swh-plugins-0.4.15/util/Makefile.am
--- swh-plugins-0.4.15/util/Makefile.am.pic	2005-06-01 05:52:00.000000000 -0400
+++ swh-plugins-0.4.15/util/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,16 +3,16 @@ RANLIB=ranlib
 
 noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h iir.h buffer.h ls_filter.h
 
-noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
+noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
 
-librms_a_SOURCES = rms.c
-libdb_a_SOURCES = db.c
-libblo_a_SOURCES = blo.c
-libblo_a_CFLAGS = -I at top_srcdir@
-libpitchscale_a_SOURCES = pitchscale.c
-libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
+librms_la_SOURCES = rms.c
+libdb_la_SOURCES = db.c
+libblo_la_SOURCES = blo.c
+libblo_la_CFLAGS = -I at top_srcdir@
+libpitchscale_la_SOURCES = pitchscale.c
+libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
 #libpitchscale_a_LIBS = $(FFTW_LIBS)
-libiir_a_SOURCES = iir.c
+libiir_la_SOURCES = iir.c
 #libbuffer_a_SOURCES = buffer.c
 # Disable autoheader. 
 AUTOHEADER=echo

swh-plugins-0.4.15-riceitdown.patch:

--- NEW FILE swh-plugins-0.4.15-riceitdown.patch ---
Index: swh-plugins-0.4.15/configure.in
===================================================================
--- swh-plugins-0.4.15.orig/configure.in
+++ swh-plugins-0.4.15/configure.in
@@ -99,12 +99,12 @@ else
   AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
   AC_MSG_WARN([May result in non-portable code])
   dnl For gcc use:
-  MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
+  # MACHINE="-march=${build_cpu}"
+  # if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
+  # if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
+  # if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
+  # 
+  # CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
 
   dnl For Intel's C compiler use:
   dnl CC="icc"


Index: ladspa-swh-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-swh-plugins/F-9/ladspa-swh-plugins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ladspa-swh-plugins.spec	19 Feb 2008 04:11:31 -0000	1.7
+++ ladspa-swh-plugins.spec	7 Apr 2009 15:31:29 -0000	1.8
@@ -3,12 +3,14 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         ladspa-%{pkgname}
 Version:      0.4.15
-Release:      12%{?dist}
+Release:      15%{?dist}
 License:      GPLv2+
 Group:        Applications/Multimedia
-Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
+Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-%{version}.tar.gz
 Patch0:       ladspa-swh-plugins-libgsm.patch
 Patch1:       swh-plugins-plugin-Makefile.am.patch
+Patch2:       swh-plugins-0.4.15-pic.patch
+Patch3:       swh-plugins-0.4.15-riceitdown.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,9 +28,11 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 
 %build
-autoreconf
+autoreconf -f -i
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
@@ -47,6 +51,15 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Tue Apr 07 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.15-15
+- fix this package so it builds properly, with the right optflags, and without tons of missing symbols
+
+* Thu Mar 05 2009 Caol??n McNamara <caolanm at redhat.com> - 0.4.15-14
+- make it build
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.15-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.15-12
 - Autorebuild for GCC 4.3
 



From spot at fedoraproject.org  Tue Apr  7 15:32:00 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 15:32:00 +0000 (UTC)
Subject: rpms/ladspa-swh-plugins/devel swh-plugins-0.4.15-pic.patch, NONE,
	1.1 swh-plugins-0.4.15-riceitdown.patch, NONE,
	1.1 ladspa-swh-plugins.spec, 1.9, 1.10
Message-ID: <20090407153200.22EEB70100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ladspa-swh-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7206/devel

Modified Files:
	ladspa-swh-plugins.spec 
Added Files:
	swh-plugins-0.4.15-pic.patch 
	swh-plugins-0.4.15-riceitdown.patch 
Log Message:
fix this package so it builds properly, with the right optflags, and without tons of missing symbols

swh-plugins-0.4.15-pic.patch:

--- NEW FILE swh-plugins-0.4.15-pic.patch ---
diff -up swh-plugins-0.4.15/gverb/Makefile.am.pic swh-plugins-0.4.15/gverb/Makefile.am
--- swh-plugins-0.4.15/gverb/Makefile.am.pic	2004-03-16 17:49:00.000000000 -0500
+++ swh-plugins-0.4.15/gverb/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,9 +3,9 @@ RANLIB=ranlib
 
 noinst_HEADERS = gverb.h gverbdsp.h
 
-noinst_LIBRARIES = libgverb.a
+noinst_LTLIBRARIES = libgverb.la
 
-libgverb_a_SOURCES = gverb.c gverbdsp.c
+libgverb_la_SOURCES = gverb.c gverbdsp.c
 
 # Disable autoheader. 
 AUTOHEADER=echo
diff -up swh-plugins-0.4.15/Makefile.am.pic swh-plugins-0.4.15/Makefile.am
--- swh-plugins-0.4.15/Makefile.am.pic	2009-04-07 10:55:49.000000000 -0400
+++ swh-plugins-0.4.15/Makefile.am	2009-04-07 11:14:51.000000000 -0400
@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
 DISTFN = $(distdir)
 
 # Files needed for FFT based plugins
-pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
-pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
+pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
 pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
 pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
 mbeq_1197_la_LIBADD = $(FFTW_LIBS)
@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
 imp_1199_la_LIBADD = $(FFTW_LIBS)
 imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
 imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
-hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
-hermes_filter_1200_la_LIBADD = util/libblo.a
-fm_osc_1415_la_DEPENDENCIES = util/libblo.a
-fm_osc_1415_la_LIBADD = util/libblo.a
-analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
-analogue_osc_1416_la_LIBADD = util/libblo.a
-sc1_1425_la_LIBADD = util/libdb.a util/librms.a
-sc2_1426_la_LIBADD = util/libdb.a util/librms.a
-sc3_1427_la_LIBADD = util/libdb.a util/librms.a
-sc4_1882_la_LIBADD = util/libdb.a util/librms.a
-sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
-se4_1883_la_LIBADD = util/libdb.a util/librms.a
+hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
+hermes_filter_1200_la_LIBADD = util/libblo.la
+fm_osc_1415_la_DEPENDENCIES = util/libblo.la
+fm_osc_1415_la_LIBADD = util/libblo.la
+analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
+analogue_osc_1416_la_LIBADD = util/libblo.la
+sc1_1425_la_LIBADD = util/libdb.la util/librms.la
+sc2_1426_la_LIBADD = util/libdb.la util/librms.la
+sc3_1427_la_LIBADD = util/libdb.la util/librms.la
+sc4_1882_la_LIBADD = util/libdb.la util/librms.la
+sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
+se4_1883_la_LIBADD = util/libdb.la util/librms.la
 gsm_1215_la_LIBADD = -lgsm
-gverb_1216_la_LIBADD = gverb/libgverb.a
+gverb_1216_la_LIBADD = gverb/libgverb.la
 lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
 
-highpass_iir_1890_la_LIBADD = util/libiir.a
+highpass_iir_1890_la_LIBADD = util/libiir.la
 highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
-lowpass_iir_1891_la_LIBADD = util/libiir.a
+lowpass_iir_1891_la_LIBADD = util/libiir.la
 lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
-bandpass_iir_1892_la_LIBADD = util/libiir.a
+bandpass_iir_1892_la_LIBADD = util/libiir.la
 bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
-bandpass_a_iir_1893_la_LIBADD = util/libiir.a
+bandpass_a_iir_1893_la_LIBADD = util/libiir.la
 bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
-notch_iir_1894_la_LIBADD = util/libiir.a
+notch_iir_1894_la_LIBADD = util/libiir.la
 notch_iir_1894_la_SOURCES = notch_iir_1894.c
-butterworth_1902_la_LIBADD = util/libiir.a
+butterworth_1902_la_LIBADD = util/libiir.la
 butterworth_1902_la_SOURCES = butterworth_1902.c
 
 # Rule to build .c files from XML source
diff -up swh-plugins-0.4.15/util/Makefile.am.pic swh-plugins-0.4.15/util/Makefile.am
--- swh-plugins-0.4.15/util/Makefile.am.pic	2005-06-01 05:52:00.000000000 -0400
+++ swh-plugins-0.4.15/util/Makefile.am	2009-04-07 10:55:49.000000000 -0400
@@ -3,16 +3,16 @@ RANLIB=ranlib
 
 noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h iir.h buffer.h ls_filter.h
 
-noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
+noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
 
-librms_a_SOURCES = rms.c
-libdb_a_SOURCES = db.c
-libblo_a_SOURCES = blo.c
-libblo_a_CFLAGS = -I at top_srcdir@
-libpitchscale_a_SOURCES = pitchscale.c
-libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
+librms_la_SOURCES = rms.c
+libdb_la_SOURCES = db.c
+libblo_la_SOURCES = blo.c
+libblo_la_CFLAGS = -I at top_srcdir@
+libpitchscale_la_SOURCES = pitchscale.c
+libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
 #libpitchscale_a_LIBS = $(FFTW_LIBS)
-libiir_a_SOURCES = iir.c
+libiir_la_SOURCES = iir.c
 #libbuffer_a_SOURCES = buffer.c
 # Disable autoheader. 
 AUTOHEADER=echo

swh-plugins-0.4.15-riceitdown.patch:

--- NEW FILE swh-plugins-0.4.15-riceitdown.patch ---
Index: swh-plugins-0.4.15/configure.in
===================================================================
--- swh-plugins-0.4.15.orig/configure.in
+++ swh-plugins-0.4.15/configure.in
@@ -99,12 +99,12 @@ else
   AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
   AC_MSG_WARN([May result in non-portable code])
   dnl For gcc use:
-  MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
+  # MACHINE="-march=${build_cpu}"
+  # if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
+  # if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
+  # if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
+  # 
+  # CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
 
   dnl For Intel's C compiler use:
   dnl CC="icc"


Index: ladspa-swh-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa-swh-plugins/devel/ladspa-swh-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ladspa-swh-plugins.spec	5 Mar 2009 16:19:00 -0000	1.9
+++ ladspa-swh-plugins.spec	7 Apr 2009 15:31:29 -0000	1.10
@@ -3,12 +3,14 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         ladspa-%{pkgname}
 Version:      0.4.15
-Release:      14%{?dist}
+Release:      15%{?dist}
 License:      GPLv2+
 Group:        Applications/Multimedia
-Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
+Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-%{version}.tar.gz
 Patch0:       ladspa-swh-plugins-libgsm.patch
 Patch1:       swh-plugins-plugin-Makefile.am.patch
+Patch2:       swh-plugins-0.4.15-pic.patch
+Patch3:       swh-plugins-0.4.15-riceitdown.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +28,8 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -f -i
@@ -47,6 +51,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Tue Apr 07 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.15-15
+- fix this package so it builds properly, with the right optflags, and without tons of missing symbols
+
 * Thu Mar 05 2009 Caol??n McNamara <caolanm at redhat.com> - 0.4.15-14
 - make it build
 



From remi at fedoraproject.org  Tue Apr  7 15:35:39 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 15:35:39 +0000 (UTC)
Subject: rpms/php-pear-HTML-Common/devel .cvsignore, 1.3,
	1.4 php-pear-HTML-Common.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090407153539.9CEEF70100@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8054

Modified Files:
	.cvsignore php-pear-HTML-Common.spec sources 
Log Message:
update to 1.2.5 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jul 2007 02:04:17 -0000	1.3
+++ .cvsignore	7 Apr 2009 15:35:09 -0000	1.4
@@ -1 +1 @@
-HTML_Common-1.2.4.tgz
+HTML_Common-1.2.5.tgz


Index: php-pear-HTML-Common.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/php-pear-HTML-Common.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-HTML-Common.spec	26 Feb 2009 21:12:52 -0000	1.5
+++ php-pear-HTML-Common.spec	7 Apr 2009 15:35:09 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name HTML_Common
 
 Name:           php-pear-HTML-Common
-Version:        1.2.4
-Release:        3%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Base class for other HTML classes
 
 Group:          Development/Libraries
@@ -29,8 +29,8 @@
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is v2
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
 cd %{pear_name}-%{version}
 
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.2.5-1
+- update to 1.2.5 (bugfix)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jul 2007 02:04:17 -0000	1.3
+++ sources	7 Apr 2009 15:35:09 -0000	1.4
@@ -1 +1 @@
-e8a287e6d2099c07aea40a0a843ce596  HTML_Common-1.2.4.tgz
+e69765be9d5b5932273fe8b213d8c3c0  HTML_Common-1.2.5.tgz



From pkgdb at fedoraproject.org  Tue Apr  7 15:41:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 15:41:40 +0000
Subject: [pkgdb] system-config-kdump ownership updated
Message-ID: <20090407154054.78A97208550@bastion.fedora.phx.redhat.com>

Package system-config-kdump in Fedora devel was orphaned by dlehman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-kdump



From pkgdb at fedoraproject.org  Tue Apr  7 15:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 15:41:59 +0000
Subject: [pkgdb] system-config-kdump ownership updated
Message-ID: <20090407154113.2FE7B208602@bastion.fedora.phx.redhat.com>

Package system-config-kdump in Fedora 10 was orphaned by dlehman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-kdump



From pkgdb at fedoraproject.org  Tue Apr  7 15:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 15:41:07 +0000
Subject: [pkgdb] system-config-kdump ownership updated
Message-ID: <20090407154107.DE7F9208551@bastion.fedora.phx.redhat.com>

Package system-config-kdump in Fedora 9 was orphaned by dlehman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-kdump



From remi at fedoraproject.org  Tue Apr  7 15:41:40 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 15:41:40 +0000 (UTC)
Subject: rpms/php-pear-HTML-Common/F-10 php-pear-HTML-Common.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090407154140.BD73370100@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-Common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9626

Modified Files:
	php-pear-HTML-Common.spec sources 
Log Message:
update to 1.2.5 (bugfix)


Index: php-pear-HTML-Common.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/F-10/php-pear-HTML-Common.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-HTML-Common.spec	28 Aug 2008 18:44:25 -0000	1.4
+++ php-pear-HTML-Common.spec	7 Apr 2009 15:41:10 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name HTML_Common
 
 Name:           php-pear-HTML-Common
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Base class for other HTML classes
 
 Group:          Development/Libraries
@@ -29,8 +29,8 @@
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is v2
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
 cd %{pear_name}-%{version}
 
@@ -76,6 +76,12 @@
 
 
 %changelog
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.2.5-1
+- update to 1.2.5 (bugfix)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.4-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jul 2007 02:04:17 -0000	1.3
+++ sources	7 Apr 2009 15:41:10 -0000	1.4
@@ -1 +1 @@
-e8a287e6d2099c07aea40a0a843ce596  HTML_Common-1.2.4.tgz
+e69765be9d5b5932273fe8b213d8c3c0  HTML_Common-1.2.5.tgz



From rdieter at fedoraproject.org  Tue Apr  7 15:42:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 15:42:35 +0000 (UTC)
Subject: rpms/qtscriptgenerator/devel import.log, NONE,
	1.1 qtscriptgenerator-0.1.0-gcc44.patch, NONE,
	1.1 qtscriptgenerator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090407154235.8170670100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qtscriptgenerator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10157/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtscriptgenerator-0.1.0-gcc44.patch 
	qtscriptgenerator.spec 
Log Message:
import



--- NEW FILE import.log ---
qtscriptgenerator-0_1_0-5_fc10:HEAD:qtscriptgenerator-0.1.0-5.fc10.src.rpm:1239118948

qtscriptgenerator-0.1.0-gcc44.patch:

--- NEW FILE qtscriptgenerator-0.1.0-gcc44.patch ---
diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
+++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
@@ -30,6 +30,7 @@
 #include <cctype>
 
 #include <fcntl.h>
+#include <cstdio>
 
 #ifdef HAVE_MMAP
 #  include <sys/mman.h>


--- NEW FILE qtscriptgenerator.spec ---

Name:		qtscriptgenerator
Version:	0.1.0
Release:	5%{?dist}
Summary: 	A tool to generate Qt bindings for Qt Script	

Group:		System Environment/Libraries
License: 	GPLv2	
URL:		http://code.google.com/p/qtscriptgenerator/	
Source0:	http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-%{version}.tar.gz	
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: qtscriptgenerator-0.1.0-gcc44.patch

# explictly BR libxslt, for xsltproc
BuildRequires: libxslt
BuildRequires: phonon-devel >= 4.3.1
BuildRequires: qt4-devel >= 4.5.0-7

# not strictly required, but the expectation would be for the 
# bindings to be present
Requires: qtscriptbindings = %{version}-%{release}

%description
Qt Script Generator is a tool to generate Qt bindings for Qt Script.

%package -n qtscriptbindings 
Summary: Qt bindings for Qt Script
Group: System Environment/Libraries
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
%description -n qtscriptbindings
Bindings providing access to substantial portions of the Qt API
from within Qt Script.



%prep
%setup -q -n %{name}-src-%{version}

%patch1 -p0 -b .gcc44


%build

# workaround buildsys bogosity, see also:
# http://code.google.com/p/qtscriptgenerator/issues/detail?id=38
export INCLUDE=%{_qt4_headerdir}

pushd generator 
%{_qt4_qmake}
make %{?_smp_mflags}
./generator
popd

pushd qtbindings
%{_qt4_qmake}
make %{?_smp_mflags}
popd

pushd tools/qsexec/src
%{_qt4_qmake}
make  %{?_smp_mflags}
popd


%install
rm -rf %{buildroot} 

mkdir -p %{buildroot}%{_qt4_plugindir}/script/
# install doesn't do symlinks
cp -a plugins/script/libqtscript* \
  %{buildroot}%{_qt4_plugindir}/script/

cp -a tools/qsexec/README.TXT README.qsexec
install -D -p -m755 tools/qsexec/qsexec %{buildroot}%{_bindir}/qsexec

install -D -p -m755 generator/generator %{buildroot}%{_qt4_bindir}/generator


%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{_qt4_bindir}/generator

%files -n qtscriptbindings
%defattr(-,root,root,-)
%doc README LICENSE.GPL
%doc README.qsexec 
%doc doc/
%doc examples/
%{_bindir}/qsexec
%{_qt4_plugindir}/script/libqtscript*


%changelog
* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-5
- qtscriptgenerator/qtscriptbindings pkgs 
- qtscriptbindings: include docs, examples

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-4
- include qsexec

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-3
- BR: phonon-devel

* Fri Mar 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-2
- qt-4.5.0-7 fixed wrt phonon, drop no_phonon patch

* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-1
- first try



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:14:05 -0000	1.1
+++ .cvsignore	7 Apr 2009 15:42:05 -0000	1.2
@@ -0,0 +1 @@
+qtscriptgenerator-src-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:14:05 -0000	1.1
+++ sources	7 Apr 2009 15:42:05 -0000	1.2
@@ -0,0 +1 @@
+ca4046ad4bda36cd4e21649d4b98886d  qtscriptgenerator-src-0.1.0.tar.gz



From than at fedoraproject.org  Tue Apr  7 15:43:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  7 Apr 2009 15:43:35 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-plasma-focus.patch, NONE,
	1.1 kdelibs.spec, 1.462, 1.463
Message-ID: <20090407154335.29E5970100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10639

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-plasma-focus.patch 
Log Message:
fix kickoff focus issue


kdelibs-4.2.2-plasma-focus.patch:

--- NEW FILE kdelibs-4.2.2-plasma-focus.patch ---
diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
--- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
                 //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                 //else.
                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
-                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
 
                 if (passive) {
                     wflags |= Qt::X11BypassWindowManagerHint;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- kdelibs.spec	7 Apr 2009 10:24:29 -0000	1.462
+++ kdelibs.spec	7 Apr 2009 15:43:04 -0000	1.463
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,6 +83,7 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
+Patch26: kdelibs-4.2.2-plasma-focus.patch
 
 # upstream
 # 4.2 branch
@@ -223,6 +224,7 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
+%patch26 -p1 -b .kickoff-focus
 
 # upstream patches
 # 4.2
@@ -411,6 +413,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- fix kickoff focus issue
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-2
 - upstream patch to fix kio_http issue
 



From nphilipp at fedoraproject.org  Tue Apr  7 15:43:54 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  7 Apr 2009 15:43:54 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.64, 1.65 sources, 1.67,
	1.68 system-config-samba.spec, 1.71, 1.72
Message-ID: <20090407154354.F2F7270100@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10815

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.72



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	2 Mar 2009 08:15:22 -0000	1.64
+++ .cvsignore	7 Apr 2009 15:43:24 -0000	1.65
@@ -1 +1 @@
-system-config-samba-1.2.71.tar.bz2
+system-config-samba-1.2.72.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	2 Mar 2009 08:15:22 -0000	1.67
+++ sources	7 Apr 2009 15:43:24 -0000	1.68
@@ -1 +1 @@
-9e907b0ceb4f777c20302967cd868a14  system-config-samba-1.2.71.tar.bz2
+6b13f8ec1194e34fd8649f827d2bd1fa  system-config-samba-1.2.72.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- system-config-samba.spec	2 Mar 2009 08:15:22 -0000	1.71
+++ system-config-samba.spec	7 Apr 2009 15:43:24 -0000	1.72
@@ -3,7 +3,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.71
+Version: 1.2.72
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -86,6 +86,20 @@
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Apr 07 2009 Nils Philippsen <nils at redhat.com> - 1.2.72-1
+- merge SambaBackend and UserData classes (#490050)
+
+* Mon Apr 06 2009 Nils Philippsen <nils at redhat.com>
+- remove unnecessary mainWindow import
+- keep section information with parser object
+
+* Mon Mar 30 2009 Nils Philippsen <nils at redhat.com>
+- further backend cleanup
+
+* Tue Mar 24 2009 Nils Philippsen <nils at redhat.com>
+- remove commented out old code
+- don't pass off GUI objects into backend code
+
 * Mon Mar 02 2009 Nils Philippsen <nils at redhat.com> - 1.2.71-1
 - require PolicyKit-authentication-agent from F-11 on (#487191)
 



From remi at fedoraproject.org  Tue Apr  7 15:48:06 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 15:48:06 +0000 (UTC)
Subject: rpms/php-pear-HTML-Common/F-9 php-pear-HTML-Common.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090407154806.39CC170100@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-Common/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11986

Modified Files:
	php-pear-HTML-Common.spec sources 
Log Message:
update to 1.2.5 (bugfix)


Index: php-pear-HTML-Common.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/F-9/php-pear-HTML-Common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-HTML-Common.spec	3 Jul 2007 02:01:39 -0000	1.3
+++ php-pear-HTML-Common.spec	7 Apr 2009 15:47:35 -0000	1.4
@@ -2,12 +2,12 @@
 %define pear_name HTML_Common
 
 Name:           php-pear-HTML-Common
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Summary:        Base class for other HTML classes
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/HTML_Common
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -29,8 +29,8 @@
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is v2
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
 cd %{pear_name}-%{version}
 
@@ -76,6 +76,15 @@
 
 
 %changelog
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.2.5-1
+- update to 1.2.5 (bugfix)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.4-2
+- fix license tag
+
 * Mon Jul 02 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-1
 - Upstream sync
 - Update license file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jul 2007 02:04:17 -0000	1.3
+++ sources	7 Apr 2009 15:47:35 -0000	1.4
@@ -1 +1 @@
-e8a287e6d2099c07aea40a0a843ce596  HTML_Common-1.2.4.tgz
+e69765be9d5b5932273fe8b213d8c3c0  HTML_Common-1.2.5.tgz



From rdieter at fedoraproject.org  Tue Apr  7 15:48:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 15:48:47 +0000 (UTC)
Subject: rpms/qtscriptgenerator/F-10 qtscriptgenerator-0.1.0-gcc44.patch,
	NONE, 1.1 qtscriptgenerator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090407154847.3749770137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qtscriptgenerator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12184

Modified Files:
	.cvsignore sources 
Added Files:
	qtscriptgenerator-0.1.0-gcc44.patch qtscriptgenerator.spec 
Log Message:
import


qtscriptgenerator-0.1.0-gcc44.patch:

--- NEW FILE qtscriptgenerator-0.1.0-gcc44.patch ---
diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
+++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
@@ -30,6 +30,7 @@
 #include <cctype>
 
 #include <fcntl.h>
+#include <cstdio>
 
 #ifdef HAVE_MMAP
 #  include <sys/mman.h>


--- NEW FILE qtscriptgenerator.spec ---

Name:		qtscriptgenerator
Version:	0.1.0
Release:	5%{?dist}
Summary: 	A tool to generate Qt bindings for Qt Script	

Group:		System Environment/Libraries
License: 	GPLv2	
URL:		http://code.google.com/p/qtscriptgenerator/	
Source0:	http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-%{version}.tar.gz	
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: qtscriptgenerator-0.1.0-gcc44.patch

# explictly BR libxslt, for xsltproc
BuildRequires: libxslt
BuildRequires: phonon-devel >= 4.3.1
BuildRequires: qt4-devel >= 4.5.0-7

# not strictly required, but the expectation would be for the 
# bindings to be present
Requires: qtscriptbindings = %{version}-%{release}

%description
Qt Script Generator is a tool to generate Qt bindings for Qt Script.

%package -n qtscriptbindings 
Summary: Qt bindings for Qt Script
Group: System Environment/Libraries
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
%description -n qtscriptbindings
Bindings providing access to substantial portions of the Qt API
from within Qt Script.



%prep
%setup -q -n %{name}-src-%{version}

%patch1 -p0 -b .gcc44


%build

# workaround buildsys bogosity, see also:
# http://code.google.com/p/qtscriptgenerator/issues/detail?id=38
export INCLUDE=%{_qt4_headerdir}

pushd generator 
%{_qt4_qmake}
make %{?_smp_mflags}
./generator
popd

pushd qtbindings
%{_qt4_qmake}
make %{?_smp_mflags}
popd

pushd tools/qsexec/src
%{_qt4_qmake}
make  %{?_smp_mflags}
popd


%install
rm -rf %{buildroot} 

mkdir -p %{buildroot}%{_qt4_plugindir}/script/
# install doesn't do symlinks
cp -a plugins/script/libqtscript* \
  %{buildroot}%{_qt4_plugindir}/script/

cp -a tools/qsexec/README.TXT README.qsexec
install -D -p -m755 tools/qsexec/qsexec %{buildroot}%{_bindir}/qsexec

install -D -p -m755 generator/generator %{buildroot}%{_qt4_bindir}/generator


%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{_qt4_bindir}/generator

%files -n qtscriptbindings
%defattr(-,root,root,-)
%doc README LICENSE.GPL
%doc README.qsexec 
%doc doc/
%doc examples/
%{_bindir}/qsexec
%{_qt4_plugindir}/script/libqtscript*


%changelog
* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-5
- qtscriptgenerator/qtscriptbindings pkgs 
- qtscriptbindings: include docs, examples

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-4
- include qsexec

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-3
- BR: phonon-devel

* Fri Mar 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-2
- qt-4.5.0-7 fixed wrt phonon, drop no_phonon patch

* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-1
- first try



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:14:05 -0000	1.1
+++ .cvsignore	7 Apr 2009 15:48:16 -0000	1.2
@@ -0,0 +1 @@
+qtscriptgenerator-src-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:14:05 -0000	1.1
+++ sources	7 Apr 2009 15:48:16 -0000	1.2
@@ -0,0 +1 @@
+ca4046ad4bda36cd4e21649d4b98886d  qtscriptgenerator-src-0.1.0.tar.gz



From remi at fedoraproject.org  Tue Apr  7 15:49:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 15:49:32 +0000 (UTC)
Subject: rpms/php-pear-HTML-Common/EL-5 php-pear-HTML-Common.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090407154932.B93E970137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-Common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12597

Modified Files:
	php-pear-HTML-Common.spec sources 
Log Message:
update to 1.2.5 (bugfix)


Index: php-pear-HTML-Common.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/EL-5/php-pear-HTML-Common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-HTML-Common.spec	3 Jul 2007 02:01:19 -0000	1.3
+++ php-pear-HTML-Common.spec	7 Apr 2009 15:49:02 -0000	1.4
@@ -2,12 +2,12 @@
 %define pear_name HTML_Common
 
 Name:           php-pear-HTML-Common
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Summary:        Base class for other HTML classes
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/HTML_Common
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -29,8 +29,8 @@
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is v2
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
 cd %{pear_name}-%{version}
 
@@ -76,6 +76,15 @@
 
 
 %changelog
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.2.5-1
+- update to 1.2.5 (bugfix)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.4-2
+- fix license tag
+
 * Mon Jul 02 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-1
 - Upstream sync
 - Update license file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jul 2007 02:03:58 -0000	1.3
+++ sources	7 Apr 2009 15:49:02 -0000	1.4
@@ -1 +1 @@
-e8a287e6d2099c07aea40a0a843ce596  HTML_Common-1.2.4.tgz
+e69765be9d5b5932273fe8b213d8c3c0  HTML_Common-1.2.5.tgz



From notting at fedoraproject.org  Tue Apr  7 15:55:01 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  7 Apr 2009 15:55:01 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.163, 1.164 initscripts.spec,
	1.192, 1.193 sources, 1.182, 1.183
Message-ID: <20090407155501.E608670100@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14843

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.94-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- .cvsignore	2 Apr 2009 19:41:36 -0000	1.163
+++ .cvsignore	7 Apr 2009 15:54:31 -0000	1.164
@@ -1 +1 @@
-initscripts-8.93.tar.bz2
+initscripts-8.94.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- initscripts.spec	2 Apr 2009 19:41:36 -0000	1.192
+++ initscripts.spec	7 Apr 2009 15:54:31 -0000	1.193
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.93
+Version: 8.94
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -249,6 +249,10 @@
 /etc/profile.d/debug*
 
 %changelog
+* Tue Apr  7 2009 Bill Nottingham <notting at redhat.com> - 8.94-1
+- prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461)
+- translation updates; bn, de, pt, ru, te
+
 * Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.93-1
 - rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
 - netfs: drop smbfs support, we don't even ship the module or tools any more


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- sources	2 Apr 2009 19:41:36 -0000	1.182
+++ sources	7 Apr 2009 15:54:31 -0000	1.183
@@ -1 +1 @@
-10f089c83b7b0d0cb4ee3592fcff98dd  initscripts-8.93.tar.bz2
+bb0ee36cf2b695a669bb9efae0d67cb4  initscripts-8.94.tar.bz2



From remi at fedoraproject.org  Tue Apr  7 15:56:27 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 15:56:27 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel .cvsignore, 1.4, 
	1.5 php-pear-HTML-QuickForm-advmultiselect.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090407155627.03D0870100@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15346

Modified Files:
	.cvsignore php-pear-HTML-QuickForm-advmultiselect.spec sources 
Log Message:
update to 1.5.1 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Feb 2009 18:52:53 -0000	1.4
+++ .cvsignore	7 Apr 2009 15:55:56 -0000	1.5
@@ -1 +1 @@
-HTML_QuickForm_advmultiselect-1.5.0.tgz
+HTML_QuickForm_advmultiselect-1.5.1.tgz


Index: php-pear-HTML-QuickForm-advmultiselect.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/php-pear-HTML-QuickForm-advmultiselect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-HTML-QuickForm-advmultiselect.spec	26 Feb 2009 21:15:51 -0000	1.4
+++ php-pear-HTML-QuickForm-advmultiselect.spec	7 Apr 2009 15:55:56 -0000	1.5
@@ -2,8 +2,8 @@
 %define pear_name HTML_QuickForm_advmultiselect
 
 Name:           php-pear-HTML-QuickForm-advmultiselect
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Element for HTML_QuickForm that emulate a multi-select
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.5.4
-Requires:       php-pear(PEAR) >= 1.5.4, php-pear(HTML_QuickForm) >= 3.2.10, php-pear(HTML_Common) >= 1.2.4
+Requires:       php-pear(PEAR) >= 1.5.4, php-pear(HTML_QuickForm) >= 3.2.10, php-pear(HTML_Common) >= 1.2.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -28,8 +28,7 @@
 
 %prep
 %setup -q -c
-
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -39,7 +38,7 @@
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
@@ -52,7 +51,7 @@
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -61,7 +60,7 @@
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -76,21 +75,21 @@
 # cd /usr/share/pear/test/HTML_QuickForm_advmultiselect/tests
 # php AllTests.php
 # should display : 
-# OK, but incomplete or skipped tests!
-# Tests: 16, Assertions: 46, Skipped: 1.
+# OK (21 tests, 62 assertions)
 
 
 %files
 %defattr(-,root,root,-)
 %doc docdir/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_datadir}/%{pear_name}
 %{pear_phpdir}/HTML/QuickForm/advmultiselect.php
 %{pear_testdir}/%{pear_name}
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
+- update to 1.5.1 (bugfix)
+- raise requirement for php-pear(HTML_Common) >= 1.2.5
 
 * Sun Feb 15 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.0-1
 - update to 1.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Feb 2009 18:52:53 -0000	1.4
+++ sources	7 Apr 2009 15:55:56 -0000	1.5
@@ -1 +1 @@
-70832b24d66d538ba3a28926746387d0  HTML_QuickForm_advmultiselect-1.5.0.tgz
+eab022b47db9e262f6d126a9c875264f  HTML_QuickForm_advmultiselect-1.5.1.tgz



From ruben at fedoraproject.org  Tue Apr  7 15:58:31 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue,  7 Apr 2009 15:58:31 +0000 (UTC)
Subject: rpms/Ajaxterm/F-10 Ajaxterm-init.patch, 1.1, 1.2 Ajaxterm.spec, 1.1,
	1.2
Message-ID: <20090407155831.6076570100@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Ajaxterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16244

Modified Files:
	Ajaxterm-init.patch Ajaxterm.spec 
Log Message:
* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
- Fix ajaxterm homedir
- Add status command to init script


Ajaxterm-init.patch:

Index: Ajaxterm-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/F-10/Ajaxterm-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm-init.patch	22 Nov 2008 13:17:06 -0000	1.1
+++ Ajaxterm-init.patch	7 Apr 2009 15:58:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat
---- Ajaxterm-0.10/configure.initd.redhat.orig	2008-11-22 13:45:35.000000000 +0100
-+++ Ajaxterm-0.10/configure.initd.redhat	2008-11-22 13:46:38.000000000 +0100
+--- Ajaxterm-0.10/configure.initd.redhat.orig	2006-10-29 03:52:39.000000000 +0100
++++ Ajaxterm-0.10/configure.initd.redhat	2009-04-06 14:51:15.000000000 +0200
 @@ -1,8 +1,8 @@
 -#
 +#!/bin/bash
@@ -45,3 +45,12 @@
          RETVAL=$?
          ;;
      restart)
+@@ -68,7 +68,7 @@ case "$1" in
+         fi
+         ;;
+     *)
+-    echo $"Usage: $prog {start|stop|restart|condrestart}"
++    echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+     exit 1
+ esac
+ 


Index: Ajaxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/F-10/Ajaxterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm.spec	22 Nov 2008 13:17:06 -0000	1.1
+++ Ajaxterm.spec	7 Apr 2009 15:58:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Ajaxterm
 Version:        0.10
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        A web-based terminal
 
 Group:          Development/Languages
@@ -55,7 +55,7 @@
 %pre
 getent group ajaxterm >/dev/null || groupadd -r ajaxterm
 getent passwd ajaxterm >/dev/null || \
-useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \
+useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \
 -c "Ajaxterm user" ajaxterm
 exit 0
 
@@ -85,6 +85,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
+- Fix ajaxterm homedir
+- Add status command to init script
+
 * Sat Nov 22 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-5
 - set LANG=C in initscript, Ajaxterm doesn't support UTF-8
 - One last spec cleanup



From scop at fedoraproject.org  Tue Apr  7 15:59:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  7 Apr 2009 15:59:33 +0000 (UTC)
Subject: rpms/vdr-ttxtsubs/devel .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 vdr-ttxtsubs.spec, 1.10, 1.11
Message-ID: <20090407155933.B7D1370100@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-ttxtsubs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16541

Modified Files:
	.cvsignore sources vdr-ttxtsubs.spec 
Log Message:
* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.9-1
- 0.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jan 2009 09:23:54 -0000	1.5
+++ .cvsignore	7 Apr 2009 15:59:03 -0000	1.6
@@ -1 +1 @@
-vdr-ttxtsubs-0.0.8.tar.gz
+vdr-ttxtsubs-0.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2009 09:23:54 -0000	1.6
+++ sources	7 Apr 2009 15:59:03 -0000	1.7
@@ -1 +1 @@
-d16339e23e427a941828eb58c55977d9  vdr-ttxtsubs-0.0.8.tar.gz
+56ab64069165f9906bcef01377e8a5aa  vdr-ttxtsubs-0.0.9.tar.gz


Index: vdr-ttxtsubs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/vdr-ttxtsubs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vdr-ttxtsubs.spec	26 Feb 2009 00:02:14 -0000	1.10
+++ vdr-ttxtsubs.spec	7 Apr 2009 15:59:03 -0000	1.11
@@ -5,14 +5,14 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.0.8
-Release:        2%{?dist}
+Version:        0.0.9
+Release:        1%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
-Source0:        http://projects.vdr-developer.org/attachments/download/39/%{name}-%{version}.tar.gz
+Source0:        http://projects.vdr-developer.org/attachments/download/94/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.9-1
+- 0.0.9.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From notting at fedoraproject.org  Tue Apr  7 16:00:48 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  7 Apr 2009 16:00:48 +0000 (UTC)
Subject: rpms/initscripts/F-10 .cvsignore, 1.159, 1.160 initscripts.spec,
	1.186, 1.187 sources, 1.177, 1.178
Message-ID: <20090407160048.1C72470100@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16859

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.86.3-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/.cvsignore,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- .cvsignore	2 Apr 2009 19:45:19 -0000	1.159
+++ .cvsignore	7 Apr 2009 16:00:17 -0000	1.160
@@ -1 +1 @@
-initscripts-8.86.2.tar.bz2
+initscripts-8.86.3.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/initscripts.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- initscripts.spec	2 Apr 2009 19:45:19 -0000	1.186
+++ initscripts.spec	7 Apr 2009 16:00:17 -0000	1.187
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.86.2
+Version: 8.86.3
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -250,6 +250,10 @@
 /etc/profile.d/debug*
 
 %changelog
+* Tue Apr  7 2009 Bill Nottingham <notting at redhat.com> - 8.86.3-1
+- prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461)
+- backport accidentally missed fix for #480799
+
 * Thu Apr  2 2009 Bill Nottingham <notting at redhat.com> - 8.86.2-1
 - rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
 - setsysfont: honor LC_CTYPE (#487133, <skasal at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-10/sources,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- sources	2 Apr 2009 19:45:19 -0000	1.177
+++ sources	7 Apr 2009 16:00:17 -0000	1.178
@@ -1 +1 @@
-2e5cfb10c089109e21b6cea9030abc37  initscripts-8.86.2.tar.bz2
+da1e426570cbb80c95dfe8ba182137d9  initscripts-8.86.3.tar.bz2



From remi at fedoraproject.org  Tue Apr  7 16:04:03 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 16:04:03 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/F-10
	php-pear-HTML-QuickForm-advmultiselect.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090407160403.2A98C70100@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17704

Modified Files:
	php-pear-HTML-QuickForm-advmultiselect.spec sources 
Log Message:
update to 1.5.1 (bugfix)


Index: php-pear-HTML-QuickForm-advmultiselect.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-10/php-pear-HTML-QuickForm-advmultiselect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-HTML-QuickForm-advmultiselect.spec	27 Apr 2008 05:49:07 -0000	1.2
+++ php-pear-HTML-QuickForm-advmultiselect.spec	7 Apr 2009 16:03:32 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name HTML_QuickForm_advmultiselect
 
 Name:           php-pear-HTML-QuickForm-advmultiselect
-Version:        1.4.1
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Element for HTML_QuickForm that emulate a multi-select
 
@@ -10,13 +10,12 @@
 License:        BSD
 URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
+BuildRequires:  php-pear(PEAR) >= 1.5.4
+Requires:       php-pear(PEAR) >= 1.5.4, php-pear(HTML_QuickForm) >= 3.2.10, php-pear(HTML_Common) >= 1.2.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -29,9 +28,7 @@
 
 %prep
 %setup -q -c
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -41,21 +38,20 @@
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
 
 # Fix the documentation
-sed -i -e 's/\r//' ../docdir/docs/TDG/*.{htc,html,css} \
-                   ../docdir/examples/*.{html,php}
+sed -i -e 's/\r//' ../docdir/examples/*.{html,php}
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -64,7 +60,7 @@
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -73,15 +69,33 @@
 fi
 
 
+%check
+# yum install php-pear-Net-FTP
+# yum install php-pear-PHPUnit  # (tested with 3.3.2)
+# cd /usr/share/pear/test/HTML_QuickForm_advmultiselect/tests
+# php AllTests.php
+# should display : 
+# OK (21 tests, 62 assertions)
+
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
-%{pear_xmldir}/%{pear_name}.xml
+%doc docdir/*
+%{pear_xmldir}/%{name}.xml
 %{pear_datadir}/%{pear_name}
 %{pear_phpdir}/HTML/QuickForm/advmultiselect.php
-
+%{pear_testdir}/%{pear_name}
 
 %changelog
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
+- update to 1.5.1 (bugfix)
+- raise requirement for php-pear(HTML_Common) >= 1.2.5
+
+* Sun Feb 15 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.0-1
+- update to 1.5.0
+- Add %%check for doc purpose
+- remove generated CHANGELOG, ChangeLog provided upstream
+
 * Sun Apr 27 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-1
 - update to 1.4.1
 - add generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2008 05:49:07 -0000	1.3
+++ sources	7 Apr 2009 16:03:32 -0000	1.4
@@ -1 +1 @@
-32e27d3ff3d6a96b1cd5f2ba0a38eb92  HTML_QuickForm_advmultiselect-1.4.1.tgz
+eab022b47db9e262f6d126a9c875264f  HTML_QuickForm_advmultiselect-1.5.1.tgz



From remi at fedoraproject.org  Tue Apr  7 16:06:15 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue,  7 Apr 2009 16:06:15 +0000 (UTC)
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/F-9
	php-pear-HTML-QuickForm-advmultiselect.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090407160615.A7AA370100@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18243

Modified Files:
	php-pear-HTML-QuickForm-advmultiselect.spec sources 
Log Message:
update to 1.5.1 (bugfix)


Index: php-pear-HTML-QuickForm-advmultiselect.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-9/php-pear-HTML-QuickForm-advmultiselect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-HTML-QuickForm-advmultiselect.spec	27 Apr 2008 05:55:07 -0000	1.2
+++ php-pear-HTML-QuickForm-advmultiselect.spec	7 Apr 2009 16:05:45 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name HTML_QuickForm_advmultiselect
 
 Name:           php-pear-HTML-QuickForm-advmultiselect
-Version:        1.4.1
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Element for HTML_QuickForm that emulate a multi-select
 
@@ -10,13 +10,12 @@
 License:        BSD
 URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
+BuildRequires:  php-pear(PEAR) >= 1.5.4
+Requires:       php-pear(PEAR) >= 1.5.4, php-pear(HTML_QuickForm) >= 3.2.10, php-pear(HTML_Common) >= 1.2.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -29,9 +28,7 @@
 
 %prep
 %setup -q -c
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -41,21 +38,20 @@
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
 
 # Fix the documentation
-sed -i -e 's/\r//' ../docdir/docs/TDG/*.{htc,html,css} \
-                   ../docdir/examples/*.{html,php}
+sed -i -e 's/\r//' ../docdir/examples/*.{html,php}
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -64,7 +60,7 @@
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -73,15 +69,33 @@
 fi
 
 
+%check
+# yum install php-pear-Net-FTP
+# yum install php-pear-PHPUnit  # (tested with 3.3.2)
+# cd /usr/share/pear/test/HTML_QuickForm_advmultiselect/tests
+# php AllTests.php
+# should display : 
+# OK (21 tests, 62 assertions)
+
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
-%{pear_xmldir}/%{pear_name}.xml
+%doc docdir/*
+%{pear_xmldir}/%{name}.xml
 %{pear_datadir}/%{pear_name}
 %{pear_phpdir}/HTML/QuickForm/advmultiselect.php
-
+%{pear_testdir}/%{pear_name}
 
 %changelog
+* Tue Apr 07 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
+- update to 1.5.1 (bugfix)
+- raise requirement for php-pear(HTML_Common) >= 1.2.5
+
+* Sun Feb 15 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.0-1
+- update to 1.5.0
+- Add %%check for doc purpose
+- remove generated CHANGELOG, ChangeLog provided upstream
+
 * Sun Apr 27 2008 Remi Collet <Fedora at FamilleCollet.com> 1.4.1-1
 - update to 1.4.1
 - add generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2008 05:55:07 -0000	1.3
+++ sources	7 Apr 2009 16:05:45 -0000	1.4
@@ -1 +1 @@
-32e27d3ff3d6a96b1cd5f2ba0a38eb92  HTML_QuickForm_advmultiselect-1.4.1.tgz
+eab022b47db9e262f6d126a9c875264f  HTML_QuickForm_advmultiselect-1.5.1.tgz



From akurtakov at fedoraproject.org  Tue Apr  7 16:07:53 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  7 Apr 2009 16:07:53 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.626,1.627
Message-ID: <20090407160753.0220470100@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18740/devel

Modified Files:
	eclipse.spec 
Log Message:
Fix patch name.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- eclipse.spec	2 Apr 2009 08:12:56 -0000	1.626
+++ eclipse.spec	7 Apr 2009 16:07:22 -0000	1.627
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.6%{?dist}
+Release:        0.1.7%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -119,7 +119,7 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
 Patch29:        %{name}-memorypermsizeandjvmcrash.patch
 
-Patch31:	%{name}-ia64-qualifierpackaging.patch
+Patch31:	%{name}-ia64-packaging.patch
 
 # Make ECF bundles have the same qualifier as they do upstream
 Patch35:	%{name}-ecf-qualifier.patch
@@ -581,7 +581,7 @@
 ln -s %{_javadir}/commons-codec.jar \
   plugins/org.apache.commons.codec_$COMMONSCODECVERSION
   
-# link to commons-logging
+# link to commons-httpclient
 COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
   sed 's/org.apache.commons.httpclient_//')
 rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
@@ -1571,6 +1571,8 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.7
+- Fix patch name.
+
 * Thu Apr 2 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.6
 - First try for 3.5 build.
-



From mjakubicek at fedoraproject.org  Tue Apr  7 16:09:10 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue,  7 Apr 2009 16:09:10 +0000 (UTC)
Subject: rpms/orsa/devel orsa-file.patch,NONE,1.1 orsa.spec,1.4,1.5
Message-ID: <20090407160910.4323870100@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19039

Modified Files:
	orsa.spec 
Added Files:
	orsa-file.patch 
Log Message:
- Do not complain loudly if the configuration file is missing (fix #494342)



orsa-file.patch:

--- NEW FILE orsa-file.patch ---
--- src/liborsa/orsa_file.cc.orig	2009-04-07 16:27:28.000000000 +0200
+++ src/liborsa/orsa_file.cc	2009-04-07 17:33:23.000000000 +0200
@@ -1399,6 +1399,36 @@
     list_enum.push_back(TEXTURE_NEPTUNE);
   }
   
+  void OrsaConfigFile::Open(const FILE_STATUS st) {
+    
+    // already in the right status
+    if (status == st) return;
+    
+    // anomalous...
+    if (st == CLOSE) {
+      Close();
+      return;
+    }
+    
+    Close();
+    
+    if ((st == OPEN_R) && ((file = OPEN_FILE(filename.c_str(),OPEN_READ)) != 0)) {
+      status = OPEN_R;
+      return;
+    }
+    
+    if ((st == OPEN_W) && ((file = OPEN_FILE(filename.c_str(),OPEN_WRITE)) != 0)) {
+      status = OPEN_W;
+      return;
+    }
+    
+    if (file == 0) {
+      ORSA_DEBUG("Configuration file %s not found.",filename.c_str());
+    }
+    
+    status = CLOSE;
+  }
+  
   void OrsaConfigFile::Read() {
     
     // if (file == 0) Open();
@@ -1406,13 +1436,7 @@
     
     Open(OPEN_R);
     
-    // should improve this check
-    // if (status != OPEN_R) return;
-    
-    if (status != OPEN_R) {
-      ORSA_ERROR("Status error!");
-      return;
-    }
+    if (status != OPEN_R) return;
     
     char line[1024];    
     string stag, svalue;
--- src/liborsa/orsa_file.h.orig	2009-04-07 17:22:52.000000000 +0200
+++ src/liborsa/orsa_file.h	2009-04-07 17:35:59.000000000 +0200
@@ -491,6 +491,7 @@
     OrsaConfigFile();
     // OrsaConfigFile(Config*);
     
+    void Open(const FILE_STATUS st = OPEN_R);
     void Read();
     void Write();
     
--- src/liborsa/orsa_universe.cc.orig	2009-04-07 08:49:49.000000000 +0200
+++ src/liborsa/orsa_universe.cc	2009-04-07 17:45:02.000000000 +0200
@@ -79,7 +79,7 @@
     //
     units->SetSystem(tu,lu,mu);
     //
-    if (!jpl_file) {
+    if (!jpl_file && !config->paths[JPL_EPHEM_FILE]->GetValue().empty()) {
       jpl_file = new JPLFile(config->paths[JPL_EPHEM_FILE]->GetValue().c_str());
     }
     //
@@ -87,7 +87,7 @@
       jpl_cache = new JPLCache;
     }
     //
-    if (!location_file) {
+    if (!location_file && !config->paths[OBSCODE]->GetValue().empty()) {
       location_file = new LocationFile; 
       location_file->SetFileName(config->paths[OBSCODE]->GetValue().c_str());
       location_file->Open();


Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orsa.spec	28 Mar 2009 10:37:45 -0000	1.4
+++ orsa.spec	7 Apr 2009 16:08:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			orsa
 Version:		0.7.0
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -18,6 +18,11 @@
 # Reported into upstream bugtracker as
 # http://sourceforge.net/tracker/index.php?func=detail&aid=2099054&group_id=44502&atid=439768
 Patch1:			%{name}-configure.patch
+# Patch that prevents orsa from printing many errors on startup because of missing
+# configuration files.
+# Reported into upstream bugtracker as
+# http://sourceforge.net/tracker/?func=detail&aid=2741094&group_id=44502&atid=439768
+Patch2:			%{name}-file.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	readline-devel
@@ -50,6 +55,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2
 
 %build
 # honor $RPM_OPT_FLAGS
@@ -87,6 +93,9 @@
 %{_libdir}/libxorsa.so
 
 %changelog
+* Tue Apr 07 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-6
+- Do not complain loudly if the configuration file is missing (fix #494342)
+
 * Sat Feb 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-5
 - Rebuilt against new ginac 1.5
 



From rdieter at fedoraproject.org  Tue Apr  7 16:09:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 16:09:59 +0000 (UTC)
Subject: rpms/koffice/devel exiv2-0.18-attempt1.diff, 1.2, 1.3 import.log,
	NONE, 
	1.1 .cvsignore, 1.27, 1.28 koffice.spec, 1.101, 1.102 sources,
	1.27, 1.28 koffice-1.6.3-gcc43.patch, 1.5,
	NONE koffice-1.6.3-glibc_strrchr.patch, 1.1,
	NONE koffice-1.6.3-quint32.patch, 1.1,
	NONE koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.5,
	NONE koffice-20090306svn.patch, 1.1,
	NONE koffice-svn_checkout.sh, 1.1,
	NONE koffice-xpdf-CVE-2007-3387.diff, 1.5, NONE
Message-ID: <20090407160959.BF10E70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19183/devel

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	exiv2-0.18-attempt1.diff import.log 
Removed Files:
	koffice-1.6.3-gcc43.patch koffice-1.6.3-glibc_strrchr.patch 
	koffice-1.6.3-quint32.patch 
	koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 
	koffice-20090306svn.patch koffice-svn_checkout.sh 
	koffice-xpdf-CVE-2007-3387.diff 
Log Message:
import koffice2


exiv2-0.18-attempt1.diff:

Index: exiv2-0.18-attempt1.diff
===================================================================
RCS file: exiv2-0.18-attempt1.diff
diff -N exiv2-0.18-attempt1.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ exiv2-0.18-attempt1.diff	7 Apr 2009 16:09:29 -0000	1.3
@@ -0,0 +1,37 @@
+Index: kis_exif_io.cpp
+===================================================================
+--- kis_exif_io.cpp	(revision 917290)
++++ kis_exif_io.cpp	(working copy)
+@@ -457,12 +457,14 @@
+     ioDevice->open(QIODevice::ReadOnly);
+     QByteArray arr = ioDevice->readAll();
+     Exiv2::ExifData exifData;
++    Exiv2::ByteOrder byteOrder;
+ #if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
+     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
++    byteOrder = exifData.byteOrder();
+ #else
+-    Exiv2::ExifParser::decode( exifData, (const Exiv2::byte*)arr.data(), arr.size());
++    byteOrder = Exiv2::ExifParser::decode( exifData, (const Exiv2::byte*)arr.data(), arr.size());
+ #endif
+-    dbgFile << "Byte order = " << exifData.byteOrder() << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
++    dbgFile << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
+     dbgFile << "There are" << exifData.count() << " entries in the exif section";
+     const KisMetaData::Schema* tiffSchema = KisMetaData::SchemaRegistry::instance()->schemaFromUri(KisMetaData::Schema::TIFFSchemaUri);
+     const KisMetaData::Schema* exifSchema = KisMetaData::SchemaRegistry::instance()->schemaFromUri(KisMetaData::Schema::EXIFSchemaUri);
+@@ -508,13 +510,13 @@
+             } else if (it->key() == "Exif.Photo.ComponentsConfiguration") {
+                 v = exifArrayToKMDIntOrderedArray(it->getValue());
+             } else if (it->key() == "Exif.Photo.OECF") {
+-                v = exifOECFToKMDOECFStructure(it->getValue(), exifData.byteOrder());
++                v = exifOECFToKMDOECFStructure(it->getValue(), byteOrder);
+             } else if (it->key() == "Exif.Photo.DateTimeDigitized" || it->key() == "Exif.Photo.DateTimeOriginal") {
+                 v = KisMetaData::Value(exivValueToDateTime(it->getValue()));
+             } else if (it->key() == "Exif.Photo.DeviceSettingDescription") {
+                 v = deviceSettingDescriptionExifToKMD(it->getValue());
+             } else if (it->key() == "Exif.Photo.CFAPattern") {
+-                v = cfaPatternExifToKMD(it->getValue(), exifData.byteOrder());
++                v = cfaPatternExifToKMD(it->getValue(), byteOrder);
+             } else if (it->key() == "Exif.Photo.Flash") {
+                 v = flashExifToKMD(it->getValue());
+             } else if (it->key() == "Exif.Photo.UserComment") {


--- NEW FILE import.log ---
koffice-1_9_98_7-1:HEAD:koffice-1.9.98.7-1.src.rpm:1239120544


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Mar 2009 21:10:00 -0000	1.27
+++ .cvsignore	7 Apr 2009 16:09:29 -0000	1.28
@@ -1,5 +1 @@
-koffice-1.6.0.tar.bz2
-koffice-1.6.1.tar.bz2
-koshell.png
-koffice-1.6.2.tar.bz2
-koffice-1.6.3.tar.bz2
+koffice-1.9.98.7.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- koffice.spec	10 Mar 2009 01:21:27 -0000	1.101
+++ koffice.spec	7 Apr 2009 16:09:29 -0000	1.102
@@ -1,97 +1,68 @@
 
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-#define svn 20081103
-%define svn 20090306
+#define kchart 1
+#define kexi 1
+#define kformula 1
+#define kivio 1
+#define kugar 1
 
 Name:           koffice
-Epoch:          2
-Version:        1.6.3
-Release:        20.%{svn}svn%{?dist}
+Epoch:          1 
+Version:        1.9.98.7
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
+# apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
+Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source100:      koshell.png
+Patch1: exiv2-0.18-attempt1.diff
 
-Patch50: koffice-1.6.3-glibc_strrchr.patch
-
-## hand-crafted patch, pretty close to:
-# LANG=en_US.UTF-8 svn diff \
-#  svn://anonsvn.kde.org/home/kde/tags/koffice/1.6.3/koffice \
-#  svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \
-#  > koffice-%{svn}svn.patch
-Patch100: koffice-%{svn}svn.patch
-# Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
-Patch101: koffice-1.6.3-quint32.patch
-
-# http://www.kde.org/info/security/advisory-20070730-1.txt
-Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
-
-# http://www.kde.org/info/security/advisory-20071107-1.txt
-Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
-
-# upstream patch pulled via: svn diff -c 738929 
-# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
-# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
-Patch3: koffice-1.6.3-gcc43.patch
-
-# BuildRequires: world-devel ;)
-BuildRequires:  %{kdelibs3}-devel
-# See http://bugzilla.redhat.com/244091
-%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-BuildRequires: automake libtool
-BuildRequires:  freetype-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  libart_lgpl-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  ImageMagick-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  zlib-devel
-BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  pcre-devel
-BuildRequires:  lcms-devel
-BuildRequires:  gettext-devel
-BuildRequires:  mysql-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  perl
-BuildRequires:  wv2-devel
-BuildRequires:  libpqxx-devel
-BuildRequires:  doxygen
-BuildRequires:  aspell-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  OpenEXR-devel
-BuildRequires:  libexif-devel
-BuildRequires:  libGL-devel libGLU-devel
-BuildRequires:  readline-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define ruby 1
-BuildRequires:  ruby ruby-devel >= 1.8.2
-%endif
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:  libpaper-devel
-BuildRequires:  libXi-devel
-%endif
-# FIXME: work to get these into EPEL
-%if 0%{?fedora} > 6
+#-- The following OPTIONAL packages could NOT be located on your system.
+#-- Consider installing them to enable more features from this software.
+#+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
+#+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
+
+BuildRequires: boost-devel
+BuildRequires: bzip2-devel
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: doxygen
+BuildRequires: eigen2-devel
+BuildRequires: exiv2-devel
+BuildRequires: fontconfig-devel
+BuildRequires: freeglut-devel
+BuildRequires: freetype-devel
+BuildRequires: gettext-devel
+BuildRequires: glew-devel
+BuildRequires: gmm-devel
 BuildRequires: GraphicsMagick-devel
+BuildRequires: gsl-devel
+BuildRequires: kdelibs4-devel
+BuildRequires: kdepimlibs-devel
+BuildRequires: lcms-devel
+BuildRequires: libGL-devel libGLU-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libkdcraw-devel >= 0.2.0
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
 BuildRequires: libwpd-devel
-%define libwpd 1
-BuildRequires: poppler-qt-devel
+BuildRequires: libxslt-devel
+%if 0%{?kexi}
+BuildRequires: mysql-devel
+BuildRequires: libpqxx-devel
 %endif
-
+BuildRequires: OpenEXR-devel
+BuildRequires: perl
+BuildRequires: poppler-qt4-devel
+BuildRequires: python-devel
+BuildRequires: qca2-devel
+BuildRequires: qimageblitz-devel
+BuildRequires: readline-devel
+BuildRequires: ruby-devel ruby
+BuildRequires: wv2-devel
 
 %description
 KOffice is an integrated office suite.
@@ -101,295 +72,298 @@
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
-Requires:       koffice-core = %{epoch}:%{version}-%{release} 
-Requires:       koffice-kword = %{epoch}:%{version}-%{release} 
-Requires:       koffice-kspread = %{epoch}:%{version}-%{release} 
-Requires:       koffice-kpresenter = %{epoch}:%{version}-%{release}
-Requires:       koffice-kivio = %{epoch}:%{version}-%{release}
-Requires:       koffice-karbon = %{epoch}:%{version}-%{release}
-Requires:       koffice-krita = %{epoch}:%{version}-%{release}
-Requires:       koffice-kugar = %{epoch}:%{version}-%{release}
-Requires:       koffice-kexi = %{epoch}:%{version}-%{release}
-Requires:       koffice-kexi-driver-mysql = %{epoch}:%{version}-%{release}
-Requires:       koffice-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
-Requires:       koffice-kchart = %{epoch}:%{version}-%{release}
-Requires:       koffice-kformula = %{epoch}:%{version}-%{release}
-Requires:       koffice-filters = %{epoch}:%{version}-%{release}
-Requires:       koffice-kplato = %{epoch}:%{version}-%{release}
+Requires:       %{name}-core = %{epoch}:%{version}-%{release} 
+Requires:       %{name}-kword = %{epoch}:%{version}-%{release} 
+Requires:       %{name}-kspread = %{epoch}:%{version}-%{release} 
+Requires:       %{name}-kpresenter = %{epoch}:%{version}-%{release}
+%if 0%{?kivio}
+Requires:       %{name}-kivio = %{epoch}:%{version}-%{release}
+%endif
+Requires:       %{name}-karbon = %{epoch}:%{version}-%{release}
+Requires:       %{name}-krita = %{epoch}:%{version}-%{release}
+%if 0%{?kugar}
+Requires:       %{name}-kugar = %{epoch}:%{version}-%{release}
+%endif
+%if 0%{?kexi}
+Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
+%endif
+%if 0%{?kchart}
+Requires:       %{name}-kchart = %{epoch}:%{version}-%{release}
+%endif
+%if 0%{?kformula}
+Requires:       %{name}-kformula = %{epoch}:%{version}-%{release}
+%endif
+Requires:       %{name}-filters = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kplato = %{epoch}:%{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
 
 %package core
-Summary:        Core support files for %{name} 
+Summary:        Core support files for koffice
 Group:          Applications/Productivity
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires:       perl
-Conflicts:      koffice-i18n < 4:%{version}
+%if ! 0%{?kchart}
+Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
+%endif
+%if ! 0%{?kexi}
+Obsoletes: koffice-kexi < %{epoch}:%{version}-%{release}
+Obsoletes: koffice-kexi-driver-mysql < %{epoch}:%{version}-%{release}
+Obsoletes: koffice-kexi-driver-pgsql < %{epoch}:%{version}-%{release}
+%endif
+%if ! 0%{?kivio}
+Obsoletes: koffice-kivio < %{epoch}:%{version}-%{release}
+%endif
+%if ! 0%{?kformula}
+Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release}
+%endif
+%if ! 0%{?kukar}
+Obsoletes: koffice-kugar < %{epoch}:%{version}-%{release}
+%endif
+
 %description core
 %{summary}.
 
 %package libs
-Summary:        Runtime libraries for %{name} 
+Summary:        Runtime libraries for koffice
 Group:          System Environment/Libraries
-Conflicts:      koffice <= 4:%{version}-%{release}
-Requires:       %{kdelibs3} >= %{kdelibs3_ver}
-License:        LGPLv2+
 %description libs
 %{summary}.
 
 %package devel
-Summary:        Development files for %{name} 
+Summary:        Libraries needed for koffice development
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
-License:        LGPLv2+
+Requires:       kdelibs4-devel
+
 %description devel
-%{summary}.
+%{summary}
 
 %package kword
-Summary:	A frame-based word processor capable of professional standard documents
+Summary:A frame-based word processor capable of professional standard documents
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kword
-%{summary}.
+%{summary}
 
 %package kspread
 Summary:        A powerful spreadsheet application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kspread
-%{summary}.
+%{summary}
 
 %package kpresenter
 Summary:        A full-featured presentation program
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kpresenter
-%{summary}.
+%{summary}
 
 %package kivio
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:      kivio < %{version}-%{release}
+
 %description kivio
-%{summary}.
+%{summary}
 
 %package karbon
 Summary:        A vector drawing application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description karbon
-%{summary}.
+%{summary}
 
 %package krita
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-filters
+
 %description krita
-%{summary}.
+%{summary}
 
 %package kugar
 Summary:        A tool for generating business quality reports
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kugar
-%{summary}.
+%{summary}
 
 %package kexi
 Summary:        An integrated environment for managing data
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kexi
-%{summary}.
+%{summary}
 For additional database drivers take a look at %{name}-kexi-driver-*
 
 %package kexi-driver-mysql
-Summary:        Mysql-driver for kexi
+Summary:        mysql-driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
+
 %description kexi-driver-mysql
-%{summary}.
+%{summary}
 
 %package kexi-driver-pgsql
-Summary:        Postresql driver for kexi
+Summary:        pgsql-driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
+
 %description kexi-driver-pgsql
-%{summary}.
+%{summary}
 
+%if 0%{?kchart}
 %package kchart
 Summary:        An integrated graph and chart drawing tool
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kchart
-%{summary}.
+%{summary}
+%endif
 
 %package kformula
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Requires:       mathml-fonts
+
 %description kformula
-%{summary}.
+%{summary}
 
 %package filters
 Summary:        Import and Export Filters for KOffice
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+
 %description filters
-%{summary}.
+%{summary}
 
 %package kplato
 Summary:         An integrated project management and planning tool
 Group:           Applications/Productivity
 Requires:        %{name}-core = %{epoch}:%{version}-%{release}
+
 %description kplato
-%{summary}.
+%{summary}
 
 
 %prep
 %setup -q
 
-#patch1 -p0 -b .CVE-2007-3387
-#patch2 -p0 -b .CVE-2007-4352-5392-5393
-#patch3 -p1 -b .gcc43
-
-%patch50 -p1 -b glibc_strrchr
-
-%patch100 -p1 -b .svn
-%patch101 -p1 -b .quint32
-
-make -f admin/Makefile.common
+pushd krita/ui/kisexiv2
+#patch1 -p0 -b .exiv2-0.18
+popd
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --disable-rpath --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --with-pic --enable-shared --disable-static \
-  --with-extra-libs=%{_libdir} \
-  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
-  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
-  --disable-final
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
+%{cmake_kde4} \
+  -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
+  ..
+popd
 
-make %{?_smp_mflags} -k
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
 
-[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
-install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# Replace absolute symlinks with relative ones
-pushd %{buildroot}%{_docdir}/HTML
-for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
-    for i in */*; do
-      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-    done
-    popd
-  fi
-done
-popd
+# unpackaged files
+# conflicts with oxygen-icon-theme  
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
+# extraneous stuff we don't want in -devel
+rm -fv %{buildroot}%{_kde4_libdir}/lib*common.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*filters.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*private.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkformdesigner.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
+%if ! 0%{?kchart}
+rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
+rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+%endif
+%if ! 0%{?kexi}
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
+%endif
+%if ! 0%{?kformula}
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+%endif
+%if ! 0%{?kivio}
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
+%endif
 
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications/kde \
-  --vendor="" \
-  --delete-original \
-  %{buildroot}%{_datadir}/applnk/Office/*.desktop
-
-## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
-## until http://bugzilla.redhat.com/245190 is fixed
-for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
-  grep "^NoDisplay=" ${desktop_file} || \
-    echo "NoDisplay=True" >> ${desktop_file}
-done
 
-## unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-# shouldn't these be in koffice-l10n? 
-rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
-# -devel symlinks to nuke
-rm -f %{buildroot}%{_libdir}/lib*common.so
-rm -f %{buildroot}%{_libdir}/lib*filters.so
-rm -f %{buildroot}%{_libdir}/lib*private.so
-rm -f %{buildroot}%{_libdir}/libkarbon*.so
-rm -f %{buildroot}%{_libdir}/libkchart*.so
-rm -f %{buildroot}%{_libdir}/libkexi*.so
-rm -f %{buildroot}%{_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{_libdir}/libkplato*.so
-rm -f %{buildroot}%{_libdir}/libkpresenter*.so
-rm -f %{buildroot}%{_libdir}/libkword*.so
-rm -f %{buildroot}%{_libdir}/libkrita*.so
-rm -f %{buildroot}%{_libdir}/libkross*.so
-rm -f %{buildroot}%{_libdir}/libkugar*.so
+%check
+for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+desktop-file-validate ${desktop_file}
+done
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf %{buildroot} 
 
 
 %post core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kpresenter
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kpresenter 
-/sbin/ldconfig
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%post kword -p /sbin/ldconfig
+%postun kword -p /sbin/ldconfig
 
-%postun kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%post kpresenter -p /sbin/ldconfig
+%postun kpresenter -p /sbin/ldconfig
 
-%post kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%post kugar -p /sbin/ldconfig
+%postun kugar -p /sbin/ldconfig
 
-%postun kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%post kexi -p /sbin/ldconfig
+%postun kexi -p /sbin/ldconfig
 
-%postun kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+%if 0%{?kchart}
+%post kchart -p /sbin/ldconfig
+%postun kchart -p /sbin/ldconfig
+%endif
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -402,358 +376,415 @@
 
 %files core
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/koshell
-%{_bindir}/kthesaurus
-%{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.so
-%{_libdir}/libkdeinit_kthesaurus.so
-%{_libdir}/kde3/kfile_koffice.*
-%{_libdir}/kde3/kfile_ooo.*
-%{_libdir}/kde3/kfile_abiword.*
-%{_libdir}/kde3/kfile_gnumeric.*
-%{_libdir}/kde3/kodocinfopropspage.*
-%{_libdir}/kde3/kofficescan.*
-%{_libdir}/kde3/kofficethumbnail.*
-%{_libdir}/kde3/koshell.*
-%{_libdir}/kde3/kthesaurus.*
-%{_libdir}/kde3/kwmailmerge_classic.*
-%{_libdir}/kde3/kwmailmerge_kabc.*
-%{_libdir}/kde3/kwmailmerge_qtsqldb_power.*
-%{_libdir}/kde3/kwmailmerge_qtsqldb.*
-%{_libdir}/kde3/libkounavailpart.*
-%{_libdir}/kde3/libkprkword.*
-%{_libdir}/kde3/libthesaurustool.*
-%{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice/
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell/
-%{_datadir}/apps/thesaurus/
-%{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice/
-%{_datadir}/doc/HTML/en/koshell/
-%{_datadir}/doc/HTML/en/thesaurus/
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/clipartthumbnail.desktop
-%{_datadir}/services/kfile*.desktop
-%{_datadir}/services/kwmailmerge*.desktop
-%{_datadir}/services/kodocinfopropspage.desktop
-%{_datadir}/services/kofficethumbnail.desktop
-%{_datadir}/services/kounavail.desktop
-%{_datadir}/services/kprkword.desktop
-%{_datadir}/services/thesaurustool.desktop
-%{_datadir}/servicetypes/kochart.desktop
-%{_datadir}/servicetypes/kofficepart.desktop
-%{_datadir}/servicetypes/koplugin.desktop
-%{_datadir}/servicetypes/kwmailmerge.desktop
-%{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/kde/*koffice.desktop
-%{_datadir}/applications/kde/*KThesaurus.desktop
-%{_datadir}/applications/kde/*koshell.desktop
-%{_datadir}/apps/kofficewidgets/
-%{_datadir}/apps/kross/
-%{_libdir}/kde3/krosspython.*
-%{?ruby:%{_libdir}/kde3/krossruby.*}
+%doc AUTHORS COPYING COPYING.LIB README
+%{_kde4_bindir}/kthesaurus
+%{_kde4_bindir}/koconverter
+%{_kde4_libdir}/libkdeinit4_kthesaurus.so
+%{_kde4_libdir}/kde4/autocorrect.so
+%{_kde4_libdir}/kde4/changecase.so
+%{_kde4_libdir}/kde4/defaulttools.so
+%{_kde4_libdir}/kde4/kodocinfopropspage.*
+%{_kde4_libdir}/kde4/kofficescan.*
+%{_kde4_libdir}/kde4/kofficethumbnail.*
+%{_kde4_libdir}/kde4/kopabackgroundtool.*
+%{_kde4_libdir}/kde4/libkounavailpart.*
+%{_kde4_libdir}/kde4/clipartthumbnail.*
+%{_kde4_libdir}/kde4/thesaurustool.so
+%{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
+%{_kde4_libdir}/kde4/kofficegrayau8plugin.so
+%{_kde4_libdir}/kde4/kofficedockers.so
+%{_kde4_libdir}/kde4/kofficesimpletextedit.so
+%{_kde4_libdir}/kde4/spellcheck.so
+%{_kde4_libdir}/kde4/textvariables.so
+%{_kde4_appsdir}/koffice/
+%{_kde4_docdir}/HTML/en/koffice/
+%{_kde4_docdir}/HTML/en/thesaurus/
+%{_kde4_datadir}/applications/kde4/KThesaurus.desktop
+%{_kde4_datadir}/icons/hicolor/*/*/*
+%{_kde4_datadir}/icons/oxygen/*/*/*
+%{_kde4_datadir}/kde4/services/autocorrect.desktop
+%{_kde4_datadir}/kde4/services/changecase.desktop
+%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
+%{_kde4_datadir}/kde4/services/defaulttools.desktop
+%{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop
+%{_kde4_datadir}/kde4/services/kofficethumbnail.desktop
+%{_kde4_datadir}/kde4/services/koffice_graya_u16_plugin.desktop
+%{_kde4_datadir}/kde4/services/kofficegrayaplugin.desktop
+%{_kde4_datadir}/kde4/services/kofficedockers.desktop
+%{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
+%{_kde4_datadir}/kde4/services/kounavail.desktop
+%{_kde4_datadir}/kde4/services/thesaurustool.desktop
+%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
+%{_kde4_datadir}/kde4/services/spellcheck.desktop
+%{_kde4_datadir}/kde4/services/textvariables.desktop
+%{_kde4_datadir}/kde4/servicetypes/kochart.desktop
+%{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
+%{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
+%{_kde4_datadir}/kde4/servicetypes/koplugin.desktop
+%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
+%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
+%{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop
+%{_kde4_datadir}/applications/kde4/*koffice.desktop
+%{_kde4_datadir}/kde4/services/*shape.desktop
+%if 0%{?kformula}
+%{_kde4_appsdir}/formulashape/
+%endif
+%{_kde4_appsdir}/musicshape/
+%dir %{_datadir}/color/
+%dir %{_datadir}/color/icc/
+%{_datadir}/color/icc/pigment/
+%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
+%{_kde4_libdir}/kde4/pathshapes.so
+%{_kde4_datadir}/kde4/services/pathshapes.desktop
 
 %files libs
 %defattr(-,root,root,-)
-%doc COPYING.LIB
-#_libdir/libk*common.so.*
-%{_libdir}/libkarboncommon.so.*
-%{_libdir}/libkspreadcommon.so.*
-%{_libdir}/libkdchart.so.*
-%{_libdir}/libkochart.so.*
-%{_libdir}/libkofficecore.so.*
-%{_libdir}/libkofficeui.so.*
-%{_libdir}/libkotext.so.*
-%{_libdir}/libkowmf.so.*
-%{_libdir}/libkopainter.so.*
-%{_libdir}/libkstore.so.*
-%{_libdir}/libkwmailmerge_interface.so.*
-%{_libdir}/libkwmf.so.*
-%{_libdir}/libkformulalib.so.*
-%{_libdir}/libkopalette.so.*
-%{_libdir}/libkoproperty.so.*
-%{_libdir}/libkrossapi.so.*
-%{_libdir}/libkrossmain.so.*
+%{_kde4_datadir}/kde4/servicetypes/flake*.desktop
+%{_kde4_libdir}/libflake.so.*
+%{_kde4_libdir}/kde4/*shape.so
+%if 0%{?kformula}
+%exclude %{_kde4_libdir}/kde4/formulashape.*
+%endif
+#exclude %{_kde4_libdir}/kde4/kritashape.*
+%{_kde4_libdir}/libchartshapelib.so.*
+%{_kde4_libdir}/libkdchart.so.*
+%{_kde4_libdir}/libkochart.so.*
+%{_kde4_libdir}/libkotext.so.*
+%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkokross.so.*
+%{_kde4_libdir}/libkoguiutils.so.*
+%{_kde4_libdir}/libkomain.so.*
+%{_kde4_libdir}/libkoodf.so.*
+%{_kde4_libdir}/libkopageapp.so.*
+%{_kde4_libdir}/libkoresources.so.*
+%{_kde4_libdir}/libkostore.so.*
+%{_kde4_libdir}/libkoffice_graya_u16.so.*
+%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
+%{_kde4_libdir}/libkspreadcommon.so.*
+%{_kde4_libdir}/libkwmf.so.*
+%if 0%{?kformula}
+%{_kde4_libdir}/libkformulalib.so.*
+%endif
+%{_kde4_libdir}/libpigmentcms.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
 %{_includedir}/*
 # FIXME: include only shlib symlinks we know/want to export
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libkudesignercore.so
-
-%files kword
-%defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kword/
-%{_bindir}/kword
-%{_libdir}/libkdeinit_kword.so
-%{_libdir}/libkwordprivate.so.*
-%{_libdir}/kde3/libkwordpart.*
-%{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword/
-%{_datadir}/services/kword*.desktop
-%{_datadir}/services/kwserial*.desktop
-%{_datadir}/templates/TextDocument.desktop
-%{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/kde/*kword.desktop
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkdeinit4_*.so
+%exclude %{_kde4_libdir}/libKrita*.so
+%{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
 
 %files kspread
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kspread/
-%{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.so
-%{_libdir}/kde3/kspread.*
-%{_libdir}/kde3/libkspreadpart.*
-%{_libdir}/kde3/kwmailmerge_kspread.*
-%{_libdir}/kde3/libcsvexport.*
-%{_libdir}/kde3/libcsvimport.*
-%{_libdir}/kde3/libgnumericexport.*
-%{_libdir}/kde3/libgnumericimport.*
-%{_libdir}/kde3/libkspreadhtmlexport.*
-%{_libdir}/kde3/libkspreadinsertcalendar.*
-%{_libdir}/kde3/libopencalcexport.*
-%{_libdir}/kde3/libopencalcimport.*
-%{_libdir}/kde3/libqproimport.*
-%{_libdir}/kde3/kspreadscripting.*
-%{_libdir}/kde3/krosskspreadcore.*
-%{_datadir}/apps/kspread/
-%{_datadir}/services/kspread*.desktop
-%{_datadir}/templates/SpreadSheet.desktop
-%{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/kde/*kspread.desktop
+%{_kde4_bindir}/kspread
+%{_kde4_libdir}/libkdeinit4_kspread.so
+%{_kde4_libdir}/kde4/krossmodulekspread.so
+%{_kde4_libdir}/kde4/kspread*.so
+%{_kde4_libdir}/kde4/libkspreadpart.*
+%{_kde4_libdir}/kde4/libcsvexport.*
+%{_kde4_libdir}/kde4/libcsvimport.*
+%{_kde4_libdir}/kde4/libgnumericexport.*
+%{_kde4_libdir}/kde4/libgnumericimport.*
+%{_kde4_libdir}/kde4/libkspreadhtmlexport.*
+%{_kde4_libdir}/kde4/libkspreadsolver.so
+%{_kde4_libdir}/kde4/libopencalcexport.*
+%{_kde4_libdir}/kde4/libopencalcimport.*
+%{_kde4_libdir}/kde4/libqproimport.*
+%{_kde4_appsdir}/kspread/
+%{_kde4_docdir}/HTML/en/kspread/
+%{_kde4_datadir}/config.kcfg/kspread.kcfg
+%{_kde4_datadir}/kde4/services/kspread*.desktop
+%{_kde4_datadir}/templates/SpreadSheet.desktop
+%{_kde4_datadir}/templates/.source/SpreadSheet.kst
+%{_kde4_datadir}/applications/kde4/*kspread.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
+%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
+%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kpresenter/
-%{_bindir}/kpresenter
-%{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.so
-%{_libdir}/libkpresenterimageexport.so.*
-%{_libdir}/libkpresenterprivate.so.*
-%{_libdir}/kde3/*kpresenter*.*
-%{_datadir}/apps/kpresenter/
-%{_datadir}/services/kpresenter*.desktop
-%{_datadir}/templates/Presentation.desktop
-%{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/kde/*kpresenter.desktop
+%{_kde4_bindir}/kpresenter
+%{_kde4_libdir}/libkdeinit4_kpresenter.so
+%{_kde4_libdir}/libkpresenterprivate.so.*
+%{_kde4_libdir}/kde4/*kpresenter*.*
+%{_kde4_libdir}/kde4/kpr_*.*
+%{_kde4_libdir}/kde4/libFilterkpr2odf.so
+%{_kde4_appsdir}/kpresenter/
+%{_kde4_docdir}/HTML/en/kpresenter/
+%{_kde4_datadir}/kde4/services/kpr*.desktop
+%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
+%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop
+%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop
+%{_kde4_datadir}/templates/Presentation.desktop
+%{_kde4_datadir}/templates/.source/Presentation.kpt
+%{_kde4_datadir}/applications/kde4/*kpresenter.desktop
+%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
 
 %files karbon
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/karbon/
-%{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.so
-%{_libdir}/kde3/*karbon*.*
-%{_libdir}/kde3/libwmfexport.*
-%{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon/
-%{_datadir}/services/karbon*
-%{_datadir}/servicetypes/karbon_module.desktop
-%{_datadir}/templates/Illustration.desktop
-%{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/kde/*karbon.desktop
+%{_kde4_bindir}/karbon
+%{_kde4_libdir}/libkdeinit4_karbon.so
+%{_kde4_libdir}/libkarboncommon.so.*
+%{_kde4_libdir}/libkarbonui.so.*
+%{_kde4_libdir}/kde4/*karbon*.*
+#{_kde4_libdir}/kde4/libwmfexport.*
+#{_kde4_libdir}/kde4/libwmfimport.*
+%{_kde4_appsdir}/karbon/
+%{_kde4_datadir}/kde4/services/karbon*
+%{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop
+%{_kde4_datadir}/templates/Illustration.desktop
+%{_kde4_datadir}/templates/.source/Illustration.karbon
+%{_kde4_datadir}/applications/kde4/*karbon.desktop
+#{_kde4_docdir}/HTML/en/karbon/
+%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
 
 %files krita
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/krita/
-%{_bindir}/krita
-%{_libdir}/libkdeinit_krita.so
-%{_libdir}/libkrita*.so.*
-%{_libdir}/kde3/*krita*.*
-%{_datadir}/apps/krita/
-%{_datadir}/services/krita*.desktop
-%{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/kde/*krita*.desktop
-%{_datadir}/applnk/.hidden/*krita*.desktop
-%{_datadir}/apps/kritaplugins/
+%{_kde4_bindir}/krita
+%{_kde4_libdir}/libkdeinit4_krita.so
+%{_kde4_libdir}/libkrita*.so.*
+%{_kde4_libdir}/libKrita*.so
+%{_kde4_libdir}/libKritaRulerAssistantCommon.so.*
+%{_kde4_libdir}/kde4/*krita*.*
+%{_kde4_libdir}/libkrossmodulekrita.so.*
+%{_kde4_appsdir}/krita/
+%{_kde4_datadir}/kde4/services/krita*.desktop
+%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
+%{_kde4_datadir}/applications/kde4/*krita*.desktop
+# FIXME: add scriptlet
+%{_datadir}/mime/packages/krita_ora.xml
+%{_kde4_appsdir}/kritaplugins/
+%{_kde4_docdir}/HTML/en/krita/
+%{_datadir}/color/icc/krita/
+%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
 
+%if 0%{?kexi}
 %files kugar
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kugar/
-%{_bindir}/kugar
-%{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.so
-%{_libdir}/libkdeinit_kudesigner.so
-%{_libdir}/libkugarlib.so.*
-%{_libdir}/libkudesignercore.so
-%{_libdir}/kde3/kudesigner.*
-%{_libdir}/kde3/kugar.*
-%{_libdir}/kde3/libkudesignerpart.*
-%{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner/
-%{_datadir}/apps/kugar/
-%{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/kde/*kugar.desktop
-%{_datadir}/applications/kde/*kudesigner.desktop
+%{_kde4_docdir}/HTML/en/kugar/
+%endif
 
+%if 0%{?kexi}
 %files kexi
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kexi/
-%{_bindir}/kexi*
-%{_bindir}/ksqlite*
-%{_bindir}/krossrunner
-%{_libdir}/libkdeinit_kexi.so
-%{_libdir}/libkexi*.so.*
-%{_libdir}/libkformdesigner.so.*
-%{_libdir}/kde3/kformdesigner_*.*
-%{_libdir}/kde3/kexidb_sqlite2driver.*
-%{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexihandler_*.*
-%{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/krosskexiapp.*
-%{_libdir}/kde3/krosskexidb.*
-# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
-%{_libdir}/kde3/libkspreadkexiimport.*
-%{_datadir}/config/kexirc
-%{_datadir}/config/magic/kexi.magic
-%{_datadir}/mimelnk/application/*
-%{_datadir}/servicetypes/kexi*.desktop
-%{_datadir}/services/kexi/
-%{_datadir}/apps/kexi/
-%{_datadir}/services/kformdesigner/*
-%{_datadir}/applications/kde/*kexi.desktop
-%{_datadir}/services/kexidb_sqlite*driver.desktop
+%{_kde4_bindir}/kexi*
+%{_kde4_bindir}/ksqlite*
+%{_kde4_libdir}/libkexi*.so.*
+%{_kde4_libdir}/libkformdesigner.so.*
+%{_kde4_libdir}/kde4/kformdesigner_*.*
+%{_kde4_libdir}/kde4/kexidb_sqlite3driver.*
+%{_kde4_libdir}/kde4/kexihandler_*.*
+%{_kde4_libdir}/kde4/krossmodulekexidb.so
+%{_kde4_libdir}/kde4/pgzkexireportpart2.so
+%{_kde4_datadir}/config/kexirc
+%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
+%{_kde4_datadir}/kde4/services/kexi
+%{_kde4_appsdir}/kexi/
+%{_kde4_datadir}/kde4/services/kformdesigner/*
+%{_kde4_docdir}/HTML/en/kexi/
+%{_kde4_datadir}/applications/kde4/*kexi.desktop
+%{_kde4_datadir}/kde4/services/kexidb_sqlite*driver.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kexidb_mysqldriver.*
-%{_libdir}/kde3/keximigrate_mysql.*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/kexidb_mysqldriver.desktop
+%{_kde4_libdir}/kde4/kexidb_mysqldriver.*
+%{_kde4_libdir}/kde4/keximigrate_mysql.*
+%{_kde4_datadir}/kde4/services/keximigrate_mysql.desktop
+%{_kde4_datadir}/kde4/services/kexidb_mysqldriver.desktop
 
 %files kexi-driver-pgsql
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
-%{_datadir}/services/kexidb_pqxxsqldriver.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
+%{_kde4_libdir}/kde4/kexidb_pqxxsqldriver.*
+%{_kde4_libdir}/kde4/keximigrate_pqxx.*
+%{_kde4_datadir}/kde4/services/kexidb_pqxxsqldriver.desktop
+%{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop
+%endif
 
+%if 0%{?kchart}
 %files kchart
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kchart/
-%{_bindir}/kchart
-%{_libdir}/libkchart*.so.*
-%{_libdir}/libkdeinit_kchart.so
-%{_libdir}/kde3/*kchart*.*
-%{_datadir}/apps/kchart/
-%{_datadir}/services/kchart*.desktop
-%{_datadir}/applications/kde/*kchart.desktop
+## Some parts of kchart went awol 1.9.98.1 -> 1.9.98.2, bug?
+#{_kde4_bindir}/kchart
+%{_kde4_libdir}/libkchartcommon.so.*
+#{_kde4_libdir}/libkdeinit4_kchart.so
+%{_kde4_libdir}/kde4/*kchart*.*
+%{_kde4_appsdir}/kchart/
+%{_kde4_datadir}/config.kcfg/kchart.kcfg
+%{_kde4_datadir}/kde4/services/kchart*.desktop
+%{_kde4_docdir}/HTML/en/kchart/
+#{_kde4_datadir}/applications/kde4/*kchart.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+%endif
 
+%if 0%{?kformula}
 %files kformula
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kformula/
-%{_bindir}/kformula
-%{_libdir}/libkdeinit_kformula.so
-%{_libdir}/kde3/*kformula*.*
-%{_datadir}/apps/kformula/
-%{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/kde/*kformula.desktop
+%{_kde4_bindir}/kformula
+%{_kde4_libdir}/libkdeinit4_kformula.so
+%{_kde4_libdir}/libkformulaprivate.so.*
+%{_kde4_libdir}/kde4/*kformula*.*
+%{_kde4_libdir}/kde4/formulashape.*
+%{_kde4_appsdir}/kformula/
+%{_kde4_datadir}/kde4/services/kformula*.desktop
+%{_kde4_datadir}/applications/kde4/*kformula.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+%{_kde4_docdir}/HTML/en/kformula/
+%endif
 
+%if 0%{?kivio}
 %files kivio
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kivio/
-%{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.so
-%{_libdir}/libkiviocommon.so.*
-%{_libdir}/kde3/*kivio*.*
-%{_libdir}/kde3/straight_connector.*
-%{_datadir}/apps/kivio/
-%{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/kde/*kivio.desktop
+%{_kde4_bindir}/kivio
+%{_kde4_libdir}/libkdeinit4_kivio.so
+%{_kde4_libdir}/libkivioprivate.so.*
+%{_kde4_libdir}/kde4/*kivio*.*
+%{_kde4_appsdir}/kivio/
+%{_kde4_docdir}/HTML/en/kivio/
+%{_kde4_datadir}/kde4/services/kivio*.desktop
+%{_kde4_datadir}/applications/kde4/kivio.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
+%{_kde4_docdir}/HTML/en/kivio/
+%endif
 
 %files filters
 %defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.so.*
-%{_libdir}/kde3/libabiwordexport.*
-%{_libdir}/kde3/libabiwordimport.*
-%{_libdir}/kde3/libamiproexport.*
-%{_libdir}/kde3/libamiproimport.*
-%{_libdir}/kde3/libapplixspreadimport.*
-%{_libdir}/kde3/libapplixwordimport.*
-%{_libdir}/kde3/libasciiexport.*
-%{_libdir}/kde3/libasciiimport.*
-%{_libdir}/kde3/libdbaseimport.*
-%{_libdir}/kde3/libdocbookexport.*
-%{_libdir}/kde3/libexcelimport.*
-%{_libdir}/kde3/libgenerickofilter.*
-%{_libdir}/kde3/libhtmlexport.*
-%{_libdir}/kde3/libhtmlimport.*
-%{_libdir}/kde3/libkarbonepsimport.*
-%{_libdir}/kde3/libkfolatexexport.*
-%{_libdir}/kde3/libkfomathmlexport.*
-%{_libdir}/kde3/libkfomathmlimport.*
-%{_libdir}/kde3/libkfopngexport.*
-%{_libdir}/kde3/libkspreadlatexexport.*
-%{_libdir}/kde3/libkugarnopimport.*
-%{_libdir}/kde3/libkwordkword1dot3import.*
-%{_libdir}/kde3/libkwordlatexexport.*
-%{_libdir}/kde3/libmswriteexport.*
-%{_libdir}/kde3/libmswriteimport.*
-%{_libdir}/kde3/libooimpressexport.*
-%{_libdir}/kde3/libooimpressimport.*
-%{_libdir}/kde3/liboowriterexport.*
-%{_libdir}/kde3/liboowriterimport.*
-%{_libdir}/kde3/libpalmdocexport.*
-%{_libdir}/kde3/libpalmdocimport.*
-%{_libdir}/kde3/libpdfimport.*
-%{_libdir}/kde3/librtfexport.*
-%{_libdir}/kde3/librtfimport.*
-%{_libdir}/kde3/libwmlexport.*
-%{_libdir}/kde3/libwmlimport.*
-%{_libdir}/kde3/libwpexport.*
-%if 0%{?libwpd}
-%{_libdir}/kde3/libwpimport.*
-%endif
-%{_libdir}/kde3/libmswordimport.*
-%{_libdir}/kde3/libxsltimport.*
-%{_libdir}/kde3/libxsltexport.*
-%{_libdir}/kde3/libhancomwordimport.*
-%{_libdir}/kde3/libkfosvgexport.*
-%{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libolefilter.*
-%{_datadir}/apps/xsltfilter/
-%{_datadir}/services/generic_filter.desktop
-%{_datadir}/services/ole_powerpoint97_import.desktop
-%{_datadir}/services/xslt*.desktop
-%{_datadir}/servicetypes/kofilter*.desktop
+%{_kde4_libdir}/libkwordexportfilters.so.*
+%{_kde4_libdir}/kde4/libabiwordexport.*
+%{_kde4_libdir}/kde4/libabiwordimport.*
+%{_kde4_libdir}/kde4/libamiproexport.*
+%{_kde4_libdir}/kde4/libamiproimport.*
+%{_kde4_libdir}/kde4/libapplixspreadimport.*
+%{_kde4_libdir}/kde4/libapplixwordimport.*
+%{_kde4_libdir}/kde4/libasciiexport.*
+%{_kde4_libdir}/kde4/libasciiimport.*
+%{_kde4_libdir}/kde4/libdbaseimport.*
+%{_kde4_libdir}/kde4/libdocbookexport.*
+%{_kde4_libdir}/kde4/libexcelimport.*
+%{_kde4_libdir}/kde4/libgenerickofilter.*
+%{_kde4_libdir}/kde4/libhtmlexport.*
+%{_kde4_libdir}/kde4/libhtmlimport.*
+%{_kde4_libdir}/kde4/libkspreadlatexexport.*
+%{_kde4_libdir}/kde4/libkwordkword1dot3import.*
+%{_kde4_libdir}/kde4/libmswriteexport.*
+%{_kde4_libdir}/kde4/libmswriteimport.*
+%{_kde4_libdir}/kde4/liboowriterexport.*
+%{_kde4_libdir}/kde4/liboowriterimport.*
+%{_kde4_libdir}/kde4/libpalmdocexport.*
+%{_kde4_libdir}/kde4/libpalmdocimport.*
+%{_kde4_libdir}/kde4/librtfexport.*
+%{_kde4_libdir}/kde4/librtfimport.*
+%{_kde4_libdir}/kde4/libwmlexport.*
+%{_kde4_libdir}/kde4/libwmlimport.*
+%{_kde4_libdir}/kde4/libwpexport.*
+%{_kde4_libdir}/kde4/libwpimport.*
+#{_kde4_libdir}/kde4/libmswordimport.*
+%{_kde4_libdir}/kde4/libmswordodf_import.*
+%{_kde4_libdir}/kde4/libxsltimport.*
+%{_kde4_libdir}/kde4/libxsltexport.*
+%{_kde4_libdir}/kde4/libhancomwordimport.*
+%{_kde4_appsdir}/xsltfilter/
+%{_kde4_datadir}/kde4/services/generic_filter.desktop
+%{_kde4_datadir}/kde4/services/xslt*.desktop
+%{_kde4_datadir}/kde4/servicetypes/kofilter*.desktop
 
 %files kplato
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kplato/
-%{_bindir}/kplato
-%{_libdir}/libkdeinit_kplato.so
-%{_libdir}/kde3/kplato.*
-%{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato/
-%{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/kde/*kplato.desktop
+%{_kde4_bindir}/kplato
+%{_kde4_configdir}/kplatorc
+%{_kde4_libdir}/libkdeinit4_kplato.so
+%{_kde4_libdir}/kde4/libkplatopart.*
+%{_kde4_libdir}/libkplato*.so.*
+%{_kde4_libdir}/kde4/krossmodulekplato.so
+%{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
+%{_kde4_appsdir}/kplato/
+%{_kde4_docdir}/HTML/en/kplato/
+%{_kde4_datadir}/kde4/services/kplato*.desktop
+%{_kde4_datadir}/applications/kde4/kplato.desktop
+
+%files kword
+%defattr(-,root,root,-)
+%{_kde4_bindir}/kword
+%{_kde4_libdir}/libkdeinit4_kword.so
+%{_kde4_libdir}/libkwordprivate.so.*
+%{_kde4_libdir}/kde4/krossmodulekword.so
+%{_kde4_libdir}/kde4/libkwordpart.*
+%{_kde4_appsdir}/kword/
+%{_kde4_docdir}/HTML/en/kword/
+%{_kde4_datadir}/kde4/services/*kword*.desktop
+%{_kde4_datadir}/templates/TextDocument.desktop
+%{_kde4_datadir}/templates/.source/TextDocument.kwt
+%{_kde4_datadir}/applications/kde4/*kword.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
 
 
 %changelog
-* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:1.6.3-20.20090306svn
-- rebuild for new ImageMagick
+* Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.7-1
+- koffice-1.9.98.7, koffice2 beta 7
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.98.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.6-1
+- koffice-1.9.98.6, koffice2 beta 6
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-2 
+- respin (mysql)
+
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-1
+- koffice-1.9.98.5, koffice2 beta 5 (take 2)
+
+* Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.4-1
+- koffice-1.9.98.4 (koffice2 beta5) 
+
+* Sun Dec 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-2
+- respin (omit broken eviv2 support, for now)
+
+* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-1
+- koffice-1.9.98.3 (koffice2 beta4)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:1.9.98.2-4
+- Rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Wed Dec 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.2-3
+- Conflicts with oxygen-icon-theme-4.1.80 (#474268)
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:1.9.98.2-2
+- Rebuild for Python 2.6
+
+* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-2
+- fix conflicts with oxygen-icon-theme
+
+* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-1
+- koffice-1.9.98.2 (koffice2 beta3)
+- kchart awol
+
+* Thu Oct 09 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.1-1
+- koffice-1.9.98.1 (koffice2 beta2)
+
+* Wed Oct 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-2
+- -krita: move %%{_kde4_libdir}/libKrita*.so here
+- BR: libkdcraw-devel >= 0.2.0
+
+* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-1
+- koffice-1.9.98.0 (koffice2 beta1)
+- Epoch: 1
+
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1
+- koffice-1.9.95.10
+
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
+- koffice-1.9.95.9
+- fix pkg interdependencies, multilib issues
+
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8.2
+- respin (eviv2)
 
-* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-19.20090306svn
-- revert koffice2 -> koffice1, Epoch bump
-- 20090306svn
-
-* Mon Nov 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-18
-- pull in svn updates
-
-* Mon Oct 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-17
-- move libkiviocommon to -kivio (avoids libpython/multilib issues)
-
-* Thu Sep 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-16
-- revert koffice2->koffice1, introduce Epoch (F-10)
-- fix pkg interdependencies (#394101), multilib issues
-- -krita: drop Requires: %%name-filters (#394101)
-- cleanup scriptlets
+* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
+- koffice-1.9.95.8
 
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-15
 - upstream gcc43 patch (#433994)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Mar 2009 21:10:00 -0000	1.27
+++ sources	7 Apr 2009 16:09:29 -0000	1.28
@@ -1,2 +1 @@
-03382edf62db9913b57ad8760c7d5f52  koshell.png
-386d388094734f9759977c3267098e30  koffice-1.6.3.tar.bz2
+1b44eb284f35d148ea6aacb0f2408277  koffice-1.9.98.7.tar.bz2


--- koffice-1.6.3-gcc43.patch DELETED ---


--- koffice-1.6.3-glibc_strrchr.patch DELETED ---


--- koffice-1.6.3-quint32.patch DELETED ---


--- koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff DELETED ---


--- koffice-20090306svn.patch DELETED ---


--- koffice-svn_checkout.sh DELETED ---


--- koffice-xpdf-CVE-2007-3387.diff DELETED ---



From than at fedoraproject.org  Tue Apr  7 16:10:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  7 Apr 2009 16:10:35 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-plasma-focus.patch, NONE,
	1.1 kdelibs.spec, 1.412, 1.413
Message-ID: <20090407161035.A2A0970100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19419

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-plasma-focus.patch 
Log Message:
fix kickoff focus issue


kdelibs-4.2.2-plasma-focus.patch:

--- NEW FILE kdelibs-4.2.2-plasma-focus.patch ---
diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
--- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
                 //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                 //else.
                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
-                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
 
                 if (passive) {
                     wflags |= Qt::X11BypassWindowManagerHint;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- kdelibs.spec	7 Apr 2009 10:26:29 -0000	1.412
+++ kdelibs.spec	7 Apr 2009 16:10:05 -0000	1.413
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,6 +83,7 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
+Patch26: kdelibs-4.2.2-plasma-focus.patch
 
 # upstream
 # 4.2 branch
@@ -223,6 +224,7 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
+%patch26 -p1 -b .kickoff-focus
 
 # upstream patches
 # 4.2
@@ -411,6 +413,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- fix kickoff focus issue
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-2
 - upstream patch to fix kio_http issue
 



From ruben at fedoraproject.org  Tue Apr  7 16:13:45 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue,  7 Apr 2009 16:13:45 +0000 (UTC)
Subject: rpms/Ajaxterm/F-9 Ajaxterm-init.patch, 1.1, 1.2 Ajaxterm.spec, 1.1,
	1.2
Message-ID: <20090407161345.8317470100@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Ajaxterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20226

Modified Files:
	Ajaxterm-init.patch Ajaxterm.spec 
Log Message:
* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
- Fix ajaxterm homedir
- Add status command to init script


Ajaxterm-init.patch:

Index: Ajaxterm-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/F-9/Ajaxterm-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm-init.patch	22 Nov 2008 13:52:46 -0000	1.1
+++ Ajaxterm-init.patch	7 Apr 2009 16:13:14 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat
---- Ajaxterm-0.10/configure.initd.redhat.orig	2008-11-22 13:45:35.000000000 +0100
-+++ Ajaxterm-0.10/configure.initd.redhat	2008-11-22 13:46:38.000000000 +0100
+--- Ajaxterm-0.10/configure.initd.redhat.orig	2006-10-29 03:52:39.000000000 +0100
++++ Ajaxterm-0.10/configure.initd.redhat	2009-04-06 14:51:15.000000000 +0200
 @@ -1,8 +1,8 @@
 -#
 +#!/bin/bash
@@ -45,3 +45,12 @@
          RETVAL=$?
          ;;
      restart)
+@@ -68,7 +68,7 @@ case "$1" in
+         fi
+         ;;
+     *)
+-    echo $"Usage: $prog {start|stop|restart|condrestart}"
++    echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+     exit 1
+ esac
+ 


Index: Ajaxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/F-9/Ajaxterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm.spec	22 Nov 2008 13:52:46 -0000	1.1
+++ Ajaxterm.spec	7 Apr 2009 16:13:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Ajaxterm
 Version:        0.10
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        A web-based terminal
 
 Group:          Development/Languages
@@ -55,7 +55,7 @@
 %pre
 getent group ajaxterm >/dev/null || groupadd -r ajaxterm
 getent passwd ajaxterm >/dev/null || \
-useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \
+useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \
 -c "Ajaxterm user" ajaxterm
 exit 0
 
@@ -85,6 +85,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
+- Fix ajaxterm homedir
+- Add status command to init script
+
 * Sat Nov 22 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-5
 - set LANG=C in initscript, Ajaxterm doesn't support UTF-8
 - One last spec cleanup



From than at fedoraproject.org  Tue Apr  7 16:15:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  7 Apr 2009 16:15:25 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-plasma-focus.patch, NONE,
	1.1 kdelibs.spec, 1.387, 1.388
Message-ID: <20090407161525.46A1F70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20616

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-plasma-focus.patch 
Log Message:
fix kickoff focus issue


kdelibs-4.2.2-plasma-focus.patch:

--- NEW FILE kdelibs-4.2.2-plasma-focus.patch ---
diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
--- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
                 //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                 //else.
                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
-                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
 
                 if (passive) {
                     wflags |= Qt::X11BypassWindowManagerHint;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- kdelibs.spec	7 Apr 2009 10:28:02 -0000	1.387
+++ kdelibs.spec	7 Apr 2009 16:14:54 -0000	1.388
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,6 +83,7 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
+Patch26: kdelibs-4.2.2-plasma-focus.patch
 
 # upstream
 # 4.2 branch
@@ -223,6 +224,7 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
+%patch26 -p1 -b .kickoff-focus
 
 # upstream patches
 # 4.2
@@ -411,6 +413,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- fix kickoff focus issue
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-2
 - upstream patch to fix kio_http issue
 



From ruben at fedoraproject.org  Tue Apr  7 16:17:34 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue,  7 Apr 2009 16:17:34 +0000 (UTC)
Subject: rpms/Ajaxterm/EL-5 Ajaxterm-init.patch, 1.1, 1.2 Ajaxterm.spec, 1.1,
	1.2
Message-ID: <20090407161734.CEA8B70100@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Ajaxterm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21280

Modified Files:
	Ajaxterm-init.patch Ajaxterm.spec 
Log Message:
* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
- Fix ajaxterm homedir
- Add status command to init script


Ajaxterm-init.patch:

Index: Ajaxterm-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/EL-5/Ajaxterm-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm-init.patch	22 Nov 2008 15:27:39 -0000	1.1
+++ Ajaxterm-init.patch	7 Apr 2009 16:17:34 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat
---- Ajaxterm-0.10/configure.initd.redhat.orig	2008-11-22 13:45:35.000000000 +0100
-+++ Ajaxterm-0.10/configure.initd.redhat	2008-11-22 13:46:38.000000000 +0100
+--- Ajaxterm-0.10/configure.initd.redhat.orig	2006-10-29 03:52:39.000000000 +0100
++++ Ajaxterm-0.10/configure.initd.redhat	2009-04-06 14:51:15.000000000 +0200
 @@ -1,8 +1,8 @@
 -#
 +#!/bin/bash
@@ -45,3 +45,12 @@
          RETVAL=$?
          ;;
      restart)
+@@ -68,7 +68,7 @@ case "$1" in
+         fi
+         ;;
+     *)
+-    echo $"Usage: $prog {start|stop|restart|condrestart}"
++    echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+     exit 1
+ esac
+ 


Index: Ajaxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/EL-5/Ajaxterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm.spec	22 Nov 2008 15:27:39 -0000	1.1
+++ Ajaxterm.spec	7 Apr 2009 16:17:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Ajaxterm
 Version:        0.10
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        A web-based terminal
 
 Group:          Development/Languages
@@ -55,7 +55,7 @@
 %pre
 getent group ajaxterm >/dev/null || groupadd -r ajaxterm
 getent passwd ajaxterm >/dev/null || \
-useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \
+useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \
 -c "Ajaxterm user" ajaxterm
 exit 0
 
@@ -85,6 +85,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
+- Fix ajaxterm homedir
+- Add status command to init script
+
 * Sat Nov 22 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-5
 - set LANG=C in initscript, Ajaxterm doesn't support UTF-8
 - One last spec cleanup



From limb at fedoraproject.org  Tue Apr  7 16:20:27 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  7 Apr 2009 16:20:27 +0000 (UTC)
Subject: rpms/numpy/devel .cvsignore, 1.16, 1.17 numpy.spec, 1.32,
	1.33 sources, 1.16, 1.17
Message-ID: <20090407162027.43FC770137@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22023

Modified Files:
	.cvsignore numpy.spec sources 
Log Message:
1.3.0 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Apr 2009 19:33:29 -0000	1.16
+++ .cvsignore	7 Apr 2009 16:19:56 -0000	1.17
@@ -1 +1 @@
-numpy-1.3.0rc1.tar.gz
+numpy-1.3.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- numpy.spec	2 Apr 2009 19:33:29 -0000	1.32
+++ numpy.spec	7 Apr 2009 16:19:56 -0000	1.33
@@ -4,13 +4,13 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        0.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://numeric.scipy.org/
-Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}rc1.tar.gz
+Source0:        http://downloads.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-1.0.1-f2py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +33,7 @@
 this package is a version of f2py that works properly with NumPy.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .f2py
 
 %build
@@ -76,6 +76,10 @@
 %endif
 
 %changelog
+* Tue Apr 07 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-1
+- Update to latest upstream.
+- Fixed Source0 URL.
+
 * Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-0.rc1
 - Update to latest upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Apr 2009 19:33:29 -0000	1.16
+++ sources	7 Apr 2009 16:19:56 -0000	1.17
@@ -1 +1 @@
-20cdddd69594420b0f8556bbc4a27a5a  numpy-1.3.0rc1.tar.gz
+3f7773ff0971a5ebb8591536d8ec7bd6  numpy-1.3.0.tar.gz



From ruben at fedoraproject.org  Tue Apr  7 16:20:32 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue,  7 Apr 2009 16:20:32 +0000 (UTC)
Subject: rpms/Ajaxterm/EL-4 Ajaxterm-init.patch, 1.1, 1.2 Ajaxterm.spec, 1.1,
	1.2
Message-ID: <20090407162032.233EF70137@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Ajaxterm/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22604

Modified Files:
	Ajaxterm-init.patch Ajaxterm.spec 
Log Message:
* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
- Fix ajaxterm homedir
- Add status command to init script


Ajaxterm-init.patch:

Index: Ajaxterm-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/EL-4/Ajaxterm-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm-init.patch	22 Nov 2008 15:29:19 -0000	1.1
+++ Ajaxterm-init.patch	7 Apr 2009 16:20:31 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up Ajaxterm-0.10/configure.initd.redhat.orig Ajaxterm-0.10/configure.initd.redhat
---- Ajaxterm-0.10/configure.initd.redhat.orig	2008-11-22 13:45:35.000000000 +0100
-+++ Ajaxterm-0.10/configure.initd.redhat	2008-11-22 13:46:38.000000000 +0100
+--- Ajaxterm-0.10/configure.initd.redhat.orig	2006-10-29 03:52:39.000000000 +0100
++++ Ajaxterm-0.10/configure.initd.redhat	2009-04-06 14:51:15.000000000 +0200
 @@ -1,8 +1,8 @@
 -#
 +#!/bin/bash
@@ -45,3 +45,12 @@
          RETVAL=$?
          ;;
      restart)
+@@ -68,7 +68,7 @@ case "$1" in
+         fi
+         ;;
+     *)
+-    echo $"Usage: $prog {start|stop|restart|condrestart}"
++    echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+     exit 1
+ esac
+ 


Index: Ajaxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Ajaxterm/EL-4/Ajaxterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ajaxterm.spec	22 Nov 2008 15:29:19 -0000	1.1
+++ Ajaxterm.spec	7 Apr 2009 16:20:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Ajaxterm
 Version:        0.10
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        A web-based terminal
 
 Group:          Development/Languages
@@ -55,7 +55,7 @@
 %pre
 getent group ajaxterm >/dev/null || groupadd -r ajaxterm
 getent passwd ajaxterm >/dev/null || \
-useradd -r -g ajaxterm -d ajaxterm -s /sbin/nologin \
+useradd -r -g ajaxterm -d %{_datadir}/ajaxterm -s /sbin/nologin \
 -c "Ajaxterm user" ajaxterm
 exit 0
 
@@ -85,6 +85,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-8
+- Fix ajaxterm homedir
+- Add status command to init script
+
 * Sat Nov 22 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.10-5
 - set LANG=C in initscript, Ajaxterm doesn't support UTF-8
 - One last spec cleanup



From sindrepb at fedoraproject.org  Tue Apr  7 16:40:33 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Tue,  7 Apr 2009 16:40:33 +0000 (UTC)
Subject: rpms/solfege/devel solfege.sh.in,1.1,1.2 solfege.spec,1.18,1.19
Message-ID: <20090407164033.8CD2F70100@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26472

Modified Files:
	solfege.sh.in solfege.spec 
Log Message:
fix launcher script


Index: solfege.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/solfege.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- solfege.sh.in	21 Dec 2006 11:27:37 -0000	1.1
+++ solfege.sh.in	7 Apr 2009 16:40:02 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 #Wrapper script for solfege to ensure that the esound daemon is running
 solfegebin="/usr/libexec/solfege-bin"
-esdpid=`/sbin/pidof -o %PPID /usr/bin/esd`
+esdpid=`/sbin/pidof -o %PPID /usr/bin/esdcompat`
 #check if esd is running
 if [ -z $esdpid ] 
 then
 #start esound daemon, terminate it when all client close
-esd -nobeeps &
+esdcompat -nobeeps &
 echo $!> ~/.solfege-esd.pid
 fi
 #start solfege


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/solfege.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- solfege.spec	7 Apr 2009 13:44:19 -0000	1.18
+++ solfege.spec	7 Apr 2009 16:40:02 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		solfege
 Version:	3.14.1       
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Music education software
 
 Group:		Applications/Multimedia
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Wed Apr 7 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-2
+- Update launcher script to use esdcompat and not esd
+
 * Wed Apr 7 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-1
 - New upstream release
 - Add patch to not require X to build



From jjohnstn at fedoraproject.org  Tue Apr  7 16:45:12 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue,  7 Apr 2009 16:45:12 +0000 (UTC)
Subject: rpms/jetty/devel jetty.spec,1.13,1.14
Message-ID: <20090407164512.3B6CD70100@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27593

Modified Files:
	jetty.spec 
Log Message:

* Fri Apr 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
- Add %%{libdir} to files list.
- Resolves #473585




Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jetty.spec	25 Feb 2009 09:17:02 -0000	1.13
+++ jetty.spec	7 Apr 2009 16:44:41 -0000	1.14
@@ -56,7 +56,7 @@
 
 Name:           jetty
 Version:        5.1.14
-Release:        2.10%{?dist}
+Release:        3%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -541,6 +541,7 @@
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
 %dir %{jettycachedir}
+%dir %{libdir}
 %{libdir}/org.mortbay.jetty.jar
 %{libdir}/org.mortbay.jmx.jar
 %dir %{homedir}
@@ -606,6 +607,10 @@
 %endif
 
 %changelog
+* Fri Apr 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
+- Add %%{libdir} to files list.
+- Resolves #473585
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.14-2.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -615,7 +620,6 @@
 
 * Tue Feb 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.9
 - Change %%{_sysconfdir}/init.d references to be %%{_initrddir}
-- Resolves #473585
 
 * Mon Feb 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.8
 - Fixes for unowned directories.



From mdomsch at fedoraproject.org  Tue Apr  7 16:53:38 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  7 Apr 2009 16:53:38 +0000 (UTC)
Subject: rpms/mirrormanager/devel .cvsignore, 1.5, 1.6 mirrormanager.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090407165338.EEC6470100@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30032

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
update to 1.2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Apr 2009 16:36:48 -0000	1.5
+++ .cvsignore	7 Apr 2009 16:53:08 -0000	1.6
@@ -1 +1 @@
-mirrormanager-1.2.10.tar.bz2
+mirrormanager-1.2.11.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/mirrormanager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mirrormanager.spec	6 Apr 2009 16:36:48 -0000	1.6
+++ mirrormanager.spec	7 Apr 2009 16:53:08 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mirrormanager
-Version:        1.2.10
+Version:        1.2.11
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
@@ -12,7 +12,7 @@
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum
 
-%include /usr/lib/rpm/macros.python
+%define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
 %if "%{py_ver}" < "2.5"
 # for md5, sha1, sha256, which are native to python 2.5 and higher
 Requires: python-hashlib
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.11-1
+- fix quite a few bugs from previous version
+
 * Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-1
 - improved crawler repomd.xml verification
 - improved publiclist generation


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Apr 2009 16:36:48 -0000	1.5
+++ sources	7 Apr 2009 16:53:08 -0000	1.6
@@ -1 +1 @@
-688893a7c3d56611dbd079dc1fe770e3  mirrormanager-1.2.10.tar.bz2
+e984e646df8154dcbe511fc8d384ceaa  mirrormanager-1.2.11.tar.bz2



From mdomsch at fedoraproject.org  Tue Apr  7 16:56:17 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  7 Apr 2009 16:56:17 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 .cvsignore, 1.8, 1.9 mirrormanager.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20090407165617.7B52B70100@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30670

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
update to 1.2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Apr 2009 16:41:36 -0000	1.8
+++ .cvsignore	7 Apr 2009 16:55:47 -0000	1.9
@@ -1 +1 @@
-mirrormanager-1.2.10.tar.bz2
+mirrormanager-1.2.11.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mirrormanager.spec	6 Apr 2009 16:47:02 -0000	1.8
+++ mirrormanager.spec	7 Apr 2009 16:55:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           mirrormanager
-Version:        1.2.10
-Release:        2%{?dist}
+Version:        1.2.11
+Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
@@ -72,8 +72,8 @@
 
 
 %changelog
-* Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-2
-- fix building on RHEL5
+* Tue Apr  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.11-1
+- fix quite a few bugs from previous version
 
 * Mon Apr  6 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.2.10-1
 - improved crawler repomd.xml verification


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Apr 2009 16:41:36 -0000	1.8
+++ sources	7 Apr 2009 16:55:47 -0000	1.9
@@ -1 +1 @@
-688893a7c3d56611dbd079dc1fe770e3  mirrormanager-1.2.10.tar.bz2
+e984e646df8154dcbe511fc8d384ceaa  mirrormanager-1.2.11.tar.bz2



From kyle at fedoraproject.org  Tue Apr  7 17:14:08 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  7 Apr 2009 17:14:08 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-git15.bz2.sign, NONE, 1.1 .cvsignore,
	1.1044, 1.1045 config-generic, 1.274,
	1.275 config-powerpc-generic, 1.42, 1.43 config-x86_64-generic,
	1.75, 1.76 kernel.spec, 1.1503, 1.1504 sources, 1.1006,
	1.1007 upstream, 1.917, 1.918 patch-2.6.29-git13.bz2.sign, 1.1, NONE
Message-ID: <20090407171408.F008A70100@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1675

Modified Files:
	.cvsignore config-generic config-powerpc-generic 
	config-x86_64-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.29-git15.bz2.sign 
Removed Files:
	patch-2.6.29-git13.bz2.sign 
Log Message:
* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.29-git15
- EXT3_DEFAULTS_TO_ORDERED on for now.
- X86_X2APIC enabled.
- LEDS_LP5521, LEDS_BD2802 off... look not generally relevant.
- LIBFCOE on.



--- NEW FILE patch-2.6.29-git15.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBJ20M/yGugalF9Dw4RAtNuAKCBKo/8K+xP+4FRlrhw0VtrUDxGDQCWNOI9
DrXsYT02BxKDE0MGhh4nVA==
=9G0A
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1044
retrieving revision 1.1045
diff -u -r1.1044 -r1.1045
--- .cvsignore	6 Apr 2009 15:44:28 -0000	1.1044
+++ .cvsignore	7 Apr 2009 17:13:39 -0000	1.1045
@@ -5,4 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29-git13.bz2
+patch-2.6.29-git15.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- config-generic	7 Apr 2009 13:42:23 -0000	1.274
+++ config-generic	7 Apr 2009 17:13:39 -0000	1.275
@@ -3002,6 +3002,7 @@
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XIP=y
 CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
@@ -3650,6 +3651,8 @@
 # CONFIG_LEDS_NET48XX is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_S3C24XX is not set
 # CONFIG_LEDS_SPITZ is not set
 # CONFIG_LEDS_TOSA is not set
@@ -3922,6 +3925,7 @@
 
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- config-powerpc-generic	6 Apr 2009 15:44:28 -0000	1.42
+++ config-powerpc-generic	7 Apr 2009 17:13:39 -0000	1.43
@@ -112,6 +112,7 @@
 # CONFIG_PMAC_BACKLIGHT_LEGACY is not set
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
 
 # FIXME: Should depend on IA64/x86
 # CONFIG_SGI_IOC4 is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- config-x86_64-generic	6 Apr 2009 15:44:28 -0000	1.75
+++ config-x86_64-generic	7 Apr 2009 17:13:39 -0000	1.76
@@ -357,5 +357,6 @@
 CONFIG_POWER_TRACER=y
 CONFIG_HW_BRANCH_TRACER=y
 
+CONFIG_X86_X2APIC=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_NUMA_MIGRATE_IRQ_DESC=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1503
retrieving revision 1.1504
diff -u -r1.1503 -r1.1504
--- kernel.spec	7 Apr 2009 13:42:23 -0000	1.1503
+++ kernel.spec	7 Apr 2009 17:13:39 -0000	1.1504
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 13
+%define gitrev 15
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1825,6 +1825,13 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git15
+- EXT3_DEFAULTS_TO_ORDERED on for now.
+- X86_X2APIC enabled.
+- LEDS_LP5521, LEDS_BD2802 off... look not generally relevant.
+- LIBFCOE on.
+
 * Tue Apr 07 2009 Dave Jones <davej at redhat.com>
 - Enable CONFIG_CIFS_STATS (#494545)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -r1.1006 -r1.1007
--- sources	6 Apr 2009 15:44:29 -0000	1.1006
+++ sources	7 Apr 2009 17:13:39 -0000	1.1007
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-de7c0d87b213419993d26bf3916d2733  patch-2.6.29-git13.bz2
+56ef0b166442ce0e16b47deba9e66f26  patch-2.6.29-git15.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -r1.917 -r1.918
--- upstream	6 Apr 2009 15:44:29 -0000	1.917
+++ upstream	7 Apr 2009 17:13:39 -0000	1.918
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29-git13.bz2
+patch-2.6.29-git15.bz2


--- patch-2.6.29-git13.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:16 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested watchbugzilla
Message-ID: <20090407172129.2769A2086EF@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on ladspa-swh-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:16 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested watchcommits
Message-ID: <20090407172129.5010A2086F6@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on ladspa-swh-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:15 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested commit
Message-ID: <20090407172129.7CFFB208701@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on ladspa-swh-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:21:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:21:30 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested approveacls
Message-ID: <20090407172132.0F982208711@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on ladspa-swh-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:22 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested watchbugzilla
Message-ID: <20090407172136.34083208719@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on ladspa-swh-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:21:35 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested watchcommits
Message-ID: <20090407172136.771BD208743@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on ladspa-swh-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:24 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested commit
Message-ID: <20090407172137.1728C20876C@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on ladspa-swh-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:25 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested approveacls
Message-ID: <20090407172139.6BB64208770@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on ladspa-swh-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:21:42 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested watchbugzilla
Message-ID: <20090407172143.CC85C2087F7@bastion.fedora.phx.redhat.com>

oget has requested the watchbugzilla acl on ladspa-swh-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:31 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested approveacls
Message-ID: <20090407172143.D47DD2087F8@bastion.fedora.phx.redhat.com>

oget has requested the approveacls acl on ladspa-swh-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:22:34 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested commit
Message-ID: <20090407172148.0B07920866A@bastion.fedora.phx.redhat.com>

oget has requested the commit acl on ladspa-swh-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:21:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:21:48 +0000
Subject: [pkgdb] ladspa-swh-plugins: oget has requested watchcommits
Message-ID: <20090407172148.9742620892B@bastion.fedora.phx.redhat.com>

oget has requested the watchcommits acl on ladspa-swh-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From mclasen at fedoraproject.org  Tue Apr  7 17:24:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  7 Apr 2009 17:24:28 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.119,1.120
Message-ID: <20090407172428.12C1070100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3844

Modified Files:
	gnome-keyring.spec 
Log Message:
Revert crashy patch



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-keyring.spec	2 Apr 2009 14:04:52 -0000	1.119
+++ gnome-keyring.spec	7 Apr 2009 17:23:57 -0000	1.120
@@ -8,15 +8,12 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
-# already in gnome svn, fixes a nasty bug described in http://bugzilla.gnome.org/show_bug.cgi?id=575247
-Patch0:    gnome-keyring-2.26.0-egg-endless-loop.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -29,15 +26,14 @@
 BuildRequires: autoconf, automake, libtool
 BuildRequires: gettext
 BuildRequires: intltool
-BuildRequires: perl(XML::Parser)
 BuildRequires: libtasn1-tools
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
 
 %description
-The gnome-keyring session daemon manages passwords and other types of 
-secrets for the user, storing them encrypted with a main password. 
+The gnome-keyring session daemon manages passwords and other types of
+secrets for the user, storing them encrypted with a main password.
 Applications can use the gnome-keyring library to integrate with the keyring.
 
 %package devel
@@ -69,7 +65,6 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .nasty-endless-loop
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -146,6 +141,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
+- Revert the previous patch since it causes crashes
+
 * Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-2
 - Fix a nasty bug that's been fixed upstream where gnome-keyring-daemon
   would hang when re-allocating from a pool of secure memory.



From kyle at fedoraproject.org  Tue Apr  7 17:24:50 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  7 Apr 2009 17:24:50 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, NONE,
	1.1 kernel.spec, 1.1316, 1.1317
Message-ID: <20090407172450.262E670100@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3992

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch 
Log Message:
* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)


linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch:

--- NEW FILE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch ---
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -76,7 +76,7 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
 } audio_karaoke_t;     /* into left and right  */
 
 
-typedef uint16_t audio_attributes_t;
+typedef __u16 audio_attributes_t;
 /*   bits: descr. */
 /*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
 /*   12    multichannel extension */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1316
retrieving revision 1.1317
diff -u -r1.1316 -r1.1317
--- kernel.spec	6 Apr 2009 17:00:03 -0000	1.1316
+++ kernel.spec	7 Apr 2009 17:24:19 -0000	1.1317
@@ -664,6 +664,8 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
+Patch2900: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
+
 Patch2911: linux-2.6-ext4-flush-on-close.patch
 
 # relatime patches from 2.6.30
@@ -1241,6 +1243,9 @@
 ApplyPatch squashfs3.patch
 ApplyPatch squashfs-fixups.patch
 
+# s/uint16_t/__u16/ (#493053)
+ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
+
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1823,6 +1828,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
+
 * Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
 - add git-bluetooth.patch from F-11, bluetooth fixes from 2.6.30
 



From kyle at fedoraproject.org  Tue Apr  7 17:25:39 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  7 Apr 2009 17:25:39 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, NONE,
	1.1 kernel.spec, 1.1517, 1.1518
Message-ID: <20090407172539.5E18B70100@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4200

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch 
Log Message:
* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)


linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch:

--- NEW FILE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch ---
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -76,7 +76,7 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
 } audio_karaoke_t;     /* into left and right  */
 
 
-typedef uint16_t audio_attributes_t;
+typedef __u16 audio_attributes_t;
 /*   bits: descr. */
 /*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
 /*   12    multichannel extension */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1517
retrieving revision 1.1518
diff -u -r1.1517 -r1.1518
--- kernel.spec	7 Apr 2009 14:12:33 -0000	1.1517
+++ kernel.spec	7 Apr 2009 17:25:09 -0000	1.1518
@@ -693,6 +693,7 @@
 Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
+Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
@@ -1305,6 +1306,7 @@
 ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-update.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
+ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
@@ -1903,6 +1905,9 @@
 # and build.
 
 %changelog
+* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
+
 * Tue Apr 07 2009 Dave Jones <davej at redhat.com>
 - Enable CONFIG_CIFS_STATS (#494545)
 



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:36 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407172948.E87B3208609@bastion.fedora.phx.redhat.com>

green has set the watchbugzilla acl on ladspa-swh-plugins (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:38 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407172951.3E74020866A@bastion.fedora.phx.redhat.com>

green has set the watchcommits acl on ladspa-swh-plugins (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:29:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:29:53 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407172954.25C312086F3@bastion.fedora.phx.redhat.com>

green has set the commit acl on ladspa-swh-plugins (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:42 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407172955.A4EC22086FF@bastion.fedora.phx.redhat.com>

green has set the approveacls acl on ladspa-swh-plugins (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:53 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173006.34B35208704@bastion.fedora.phx.redhat.com>

green has set the watchcommits acl on ladspa-swh-plugins (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:52 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173004.B3727208609@bastion.fedora.phx.redhat.com>

green has set the watchbugzilla acl on ladspa-swh-plugins (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:54 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173007.EAFA1208710@bastion.fedora.phx.redhat.com>

green has set the commit acl on ladspa-swh-plugins (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:58 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173012.7C415208719@bastion.fedora.phx.redhat.com>

green has set the approveacls acl on ladspa-swh-plugins (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:31:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:31:02 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173014.61F4720860F@bastion.fedora.phx.redhat.com>

green has set the approveacls acl on ladspa-swh-plugins (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:16 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173016.ABCE920871B@bastion.fedora.phx.redhat.com>

green has set the commit acl on ladspa-swh-plugins (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:31:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:31:03 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173017.6970C20876A@bastion.fedora.phx.redhat.com>

green has set the watchcommits acl on ladspa-swh-plugins (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From pkgdb at fedoraproject.org  Tue Apr  7 17:30:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 17:30:21 +0000
Subject: [pkgdb] ladspa-swh-plugins had acl change status
Message-ID: <20090407173022.1C3A32087F6@bastion.fedora.phx.redhat.com>

green has set the watchbugzilla acl on ladspa-swh-plugins (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-swh-plugins



From robmv at fedoraproject.org  Tue Apr  7 17:56:22 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Tue,  7 Apr 2009 17:56:22 +0000 (UTC)
Subject: rpms/dirvish/EL-5 dirvish.spec,1.2,1.3
Message-ID: <20090407175622.1C87B70100@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9489

Modified Files:
	dirvish.spec 
Log Message:
Update to devel branch



Index: dirvish.spec
===================================================================
RCS file: /cvs/extras/rpms/dirvish/EL-5/dirvish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dirvish.spec	6 Oct 2006 01:26:13 -0000	1.2
+++ dirvish.spec	7 Apr 2009 17:55:51 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           dirvish
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Fast, disk based, rotating network backup system
 
 Group:          Applications/Archiving
-License:        OSL
+License:        OSL 2.0
 URL:            http://www.dirvish.org/
 Source0:        http://www.dirvish.org/dirvish-%{version}.tgz
 # converts the installer to work in unattended mode
@@ -46,6 +46,12 @@
 
 
 %changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.1-3
+- fix license tag
+
 * Thu Oct 05 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-2
 - Fix License field
 - Add license text



From jspaleta at fedoraproject.org  Tue Apr  7 17:58:20 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue,  7 Apr 2009 17:58:20 +0000 (UTC)
Subject: rpms/scipy/devel scipy.spec,1.19,1.20
Message-ID: <20090407175820.781CB70100@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/scipy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10161

Modified Files:
	scipy.spec 
Log Message:
* Tue Apr 7  2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-3
- Add f2py requires to prepared for numpy packaging split



Index: scipy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/devel/scipy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scipy.spec	2 Mar 2009 02:10:30 -0000	1.19
+++ scipy.spec	7 Apr 2009 17:57:50 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: Scipy: Scientific Tools for Python
 Name: scipy
 Version: 0.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: Development/Libraries
 License: BSD and LGPLv2+
@@ -16,11 +16,11 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: numpy, python-devel
+BuildRequires: numpy, python-devel,f2py
 BuildRequires: fftw-devel, blas-devel, lapack-devel, ufsparse-devel
 BuildRequires: atlas-devel
 BuildRequires: gcc-gfortran, swig
-Requires: numpy, python
+Requires: numpy, python,f2py
 
 
 %description
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 7  2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-3
+- Add f2py requires to prepared for numpy packaging split
+
 * Sun Mar 1  2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-2
 - Patch for stsci image function syntax fix.
 



From ajax at fedoraproject.org  Tue Apr  7 17:58:12 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  7 Apr 2009 17:58:12 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.32, 1.33 import.log, 1.2, 
	1.3 nv-save-rom.patch, 1.1, 1.2 nv.xinf, 1.11, 1.12 sources,
	1.34, 1.35 xorg-x11-drv-nv.spec, 1.84,
	1.85 nv-1.1.1-nv34-tweaks.patch, 1.2, NONE nv-2.1.12-eedid.patch,
	1.1, NONE
Message-ID: <20090407175812.F223370100@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10074/devel

Modified Files:
	.cvsignore import.log nv-save-rom.patch nv.xinf sources 
	xorg-x11-drv-nv.spec 
Removed Files:
	nv-1.1.1-nv34-tweaks.patch nv-2.1.12-eedid.patch 
Log Message:
nv 2.1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	28 Aug 2008 19:23:10 -0000	1.32
+++ .cvsignore	7 Apr 2009 17:57:42 -0000	1.33
@@ -1 +1 @@
-xf86-video-nv-2.1.12.tar.bz2
+xf86-video-nv-2.1.13.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Aug 2008 19:23:11 -0000	1.2
+++ import.log	7 Apr 2009 17:57:42 -0000	1.3
@@ -1,2 +1,3 @@
 xorg-x11-drv-nv-2_1_11-1_fc10:HEAD:xorg-x11-drv-nv-2.1.11-1.fc10.src.rpm:1219853076
 xorg-x11-drv-nv-2_1_12-1_fc10:HEAD:xorg-x11-drv-nv-2.1.12-1.fc10.src.rpm:1219951385
+xorg-x11-drv-nv-2_1_13-1_fc11:HEAD:xorg-x11-drv-nv-2.1.13-1.fc11.src.rpm:1239127039

nv-save-rom.patch:

Index: nv-save-rom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-save-rom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-save-rom.patch	20 May 2008 18:01:54 -0000	1.1
+++ nv-save-rom.patch	7 Apr 2009 17:57:42 -0000	1.2
@@ -1,15 +1,6 @@
-Only in xf86-video-nv-2.1.8: ChangeLog
-Only in xf86-video-nv-2.1.8.new/compat: Makefile
-Only in xf86-video-nv-2.1.8.new/: config.h
-Only in xf86-video-nv-2.1.8.new/: config.log
-Only in xf86-video-nv-2.1.8.new/: config.status
-Only in xf86-video-nv-2.1.8.new/: libtool
-Only in xf86-video-nv-2.1.8.new/: Makefile
-Only in xf86-video-nv-2.1.8.new/man: Makefile
-Only in xf86-video-nv-2.1.8.new/src: .deps
-diff -ur xf86-video-nv-2.1.8/src/g80_driver.c xf86-video-nv-2.1.8.new/src/g80_driver.c
---- xf86-video-nv-2.1.8/src/g80_driver.c	2008-03-06 20:33:15.000000000 +0000
-+++ xf86-video-nv-2.1.8.new/src/g80_driver.c	2008-05-16 18:41:31.000000000 +0100
+diff -up xf86-video-nv-2.1.13/src/g80_driver.c.save-rom xf86-video-nv-2.1.13/src/g80_driver.c
+--- xf86-video-nv-2.1.13/src/g80_driver.c.save-rom	2008-10-27 17:54:04.000000000 -0400
++++ xf86-video-nv-2.1.13/src/g80_driver.c	2009-04-07 13:50:34.000000000 -0400
 @@ -28,6 +28,10 @@
  
  #include <string.h>
@@ -21,15 +12,15 @@
  #include <xf86_OSproc.h>
  #include <xf86Resources.h>
  #include <xf86RandR12.h>
-@@ -203,6 +207,7 @@
+@@ -205,6 +209,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
      char *s;
      CARD32 tmp;
      memType BAR1sizeKB;
 +    int fd;
  
-     if(flags & PROBE_DETECT) {
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -429,6 +434,14 @@
+     if(flags & PROBE_DETECT)
+         return TRUE;
+@@ -429,6 +434,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
      else
          pNv->table1 -= 0x10000;
  
@@ -44,7 +35,7 @@
      xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
      xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
  
-@@ -984,6 +997,8 @@
+@@ -984,6 +997,8 @@ G80EnterVT(int scrnIndex, int flags)
      ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
      G80Ptr pNv = G80PTR(pScrn);
  
@@ -53,6 +44,3 @@
      /* Reinit the hardware */
      if(pNv->xaa)
          G80InitHW(pScrn);
-Only in xf86-video-nv-2.1.8.new/src: g80_driver.c~
-Only in xf86-video-nv-2.1.8.new/src: Makefile
-Only in xf86-video-nv-2.1.8.new/: stamp-h1


Index: nv.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nv.xinf	22 Feb 2008 18:54:28 -0000	1.11
+++ nv.xinf	7 Apr 2009 17:57:42 -0000	1.12
@@ -363,6 +363,8 @@
 alias pcivideo:v000010DEd0000042Esv*sd*bc*sc*i* nv # g80
 alias pcivideo:v000010DEd0000042Fsv*sd*bc*sc*i* nv # g80
 
+alias pcivideo:v000010DEd0000053*sv*sd*bc*sc*i* nv # 7050
+
 # additional g80/g90 magic
 alias pcivideo:v000010DEd0000061*sv*sd*bc*sc*i* nv # g80
 alias pcivideo:v000010DEd0000062*sv*sd*bc*sc*i* nv # g80


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	28 Aug 2008 19:23:11 -0000	1.34
+++ sources	7 Apr 2009 17:57:42 -0000	1.35
@@ -1 +1 @@
-42f12a36d7afc26c817e8e8f5c8b7274  xf86-video-nv-2.1.12.tar.bz2
+c3231c8808a11eb4ca066e43e0f1a273  xf86-video-nv-2.1.13.tar.bz2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- xorg-x11-drv-nv.spec	27 Feb 2009 19:52:47 -0000	1.84
+++ xorg-x11-drv-nv.spec	7 Apr 2009 17:57:42 -0000	1.85
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   2.1.12
-Release:   11%{?dist}
+Version:   2.1.13
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -16,22 +16,18 @@
 
 ExcludeArch: s390 s390x
 
-# XXX these two are temporary, remove soon.
-BuildRequires: pixman-devel libpciaccess-devel
-BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
+BuildRequires: xorg-x11-server-devel >= 1.6.0
 BuildRequires: libdrm-devel >= 2.3.0-7
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires:  xorg-x11-server-Xorg >= 1.6.0
 
-Patch0:     nv-1.1.1-nv34-tweaks.patch
 Patch4:     nv-reserve-fbarea.patch
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
 Patch10:    nv-2.1.12-gf7025-gf7050.patch
-Patch11:    nv-2.1.12-eedid.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -39,14 +35,12 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .nv34-tweak
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
-%patch11 -p1 -b .eedid
 
 %build
 %configure --disable-static
@@ -73,6 +67,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 2.1.13-1
+- nv 2.1.13
+- nv.xinf: Add 7025/7050.
+
 * Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 2.1.12-11
 - nv-2.1.12-eedid.patch: Do E-EDID.
 


--- nv-1.1.1-nv34-tweaks.patch DELETED ---


--- nv-2.1.12-eedid.patch DELETED ---



From robmv at fedoraproject.org  Tue Apr  7 18:01:41 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Tue,  7 Apr 2009 18:01:41 +0000 (UTC)
Subject: rpms/dirvish/F-10 dirvish.spec,1.3,1.4
Message-ID: <20090407180141.57AE470100@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11050

Modified Files:
	dirvish.spec 
Log Message:
Update to devel branch


Index: dirvish.spec
===================================================================
RCS file: /cvs/extras/rpms/dirvish/F-10/dirvish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dirvish.spec	16 Jul 2008 21:09:43 -0000	1.3
+++ dirvish.spec	7 Apr 2009 18:01:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dirvish
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast, disk based, rotating network backup system
 
 Group:          Applications/Archiving
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.1-3
 - fix license tag
 



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:02 +0000
Subject: [pkgdb] icon-slicer had acl change status
Message-ID: <20090407180516.D587720866A@bastion.fedora.phx.redhat.com>

davidz has set the watchcommits acl on icon-slicer (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:07 +0000
Subject: [pkgdb] icon-slicer had acl change status
Message-ID: <20090407180519.AD60E2086F3@bastion.fedora.phx.redhat.com>

davidz has set the commit acl on icon-slicer (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:26 +0000
Subject: [pkgdb] icon-slicer had acl change status
Message-ID: <20090407180539.D4B362086EF@bastion.fedora.phx.redhat.com>

davidz has set the watchcommits acl on icon-slicer (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:30 +0000
Subject: [pkgdb] icon-slicer had acl change status
Message-ID: <20090407180542.EE28D2086FE@bastion.fedora.phx.redhat.com>

davidz has set the commit acl on icon-slicer (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:05:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:05:55 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090407180556.1D1E2208702@bastion.fedora.phx.redhat.com>

Package icon-slicer in Fedora devel was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:48 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090407180603.A75E02087F8@bastion.fedora.phx.redhat.com>

Package icon-slicer in Fedora 7 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:55 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090407180608.5807A208934@bastion.fedora.phx.redhat.com>

Package icon-slicer in Fedora 8 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:06:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:06:12 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090407180613.57990208947@bastion.fedora.phx.redhat.com>

Package icon-slicer in Fedora 9 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Tue Apr  7 18:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 18:07:04 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090407180617.B0A98208703@bastion.fedora.phx.redhat.com>

Package icon-slicer in Fedora 10 was orphaned by davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From bjohnson at fedoraproject.org  Tue Apr  7 18:14:24 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Tue,  7 Apr 2009 18:14:24 +0000 (UTC)
Subject: rpms/libmkv/devel import.log, NONE, 1.1 libmkv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407181424.DB50870137@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/libmkv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13613/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmkv.spec 
Log Message:
import



--- NEW FILE import.log ---
libmkv-0_6_3_1-2_fc10:HEAD:libmkv-0.6.3.1-2.fc10.src.rpm:1239128012


--- NEW FILE libmkv.spec ---
Name:      libmkv
Version:   0.6.3.1
Release:   2%{?dist}
Summary:   An alternative to the official libmatroska library

Group:     System Environment/Libraries
License:   GPLv2+
URL:       http://repo.or.cz/w/libmkv.git
Source0:   http://download.m0k.org/handbrake/contrib/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
This library is meant to be an alternative to the official libmatroska library.
It is writen in plain C, and is intended to be very portable.

%prep
%setup -q -n %{name}


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT

%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libmkv.so.*
%doc AUTHORS COPYING README

%package devel
Summary:   An alternative to the official libmatroska library - devel files
Group:     Development/Libraries
Requires:  %{name} = %{version}-%{release}

%description devel
This library is meant to be an alternative to the official libmatroska library.
It is writen in plain C, and is intended to be very portable.  These are the
development files.

%files devel
%defattr(-,root,root,-)
%{_includedir}/libmkv.h
%{_libdir}/libmkv.so
%exclude %{_libdir}/libmkv.la

%changelog
* Thu Apr 02 2009 Bernard Johnson <bjohnson at symetrix.com> - 0.6.3.1-2
- remove slashes in %%files list
- configure with --disable-static

* Mon Mar 30 2009 Bernard Johnson <bjohnson at symetrix.com> - 0.6.3.1-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmkv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:25:22 -0000	1.1
+++ .cvsignore	7 Apr 2009 18:13:54 -0000	1.2
@@ -0,0 +1 @@
+libmkv-0.6.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmkv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:25:22 -0000	1.1
+++ sources	7 Apr 2009 18:13:54 -0000	1.2
@@ -0,0 +1 @@
+984575069cbfb47dece609e78768ca97  libmkv-0.6.3.1.tar.gz



From nalin at fedoraproject.org  Tue Apr  7 18:14:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:14:43 +0000 (UTC)
Subject: rpms/krb5/devel krb5-CVE-2009-0844-0845-2.patch,NONE,1.1
Message-ID: <20090407181443.B7E1270137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13755/devel

Added Files:
	krb5-CVE-2009-0844-0845-2.patch 
Log Message:
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)


krb5-CVE-2009-0844-0845-2.patch:

--- NEW FILE krb5-CVE-2009-0844-0845-2.patch ---
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 832abe6..4384708 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -54,8 +54,8 @@ typedef const gss_OID_desc *gss_OID_const;
 
 /* der routines defined in libgss */
 extern unsigned int gssint_der_length_size(OM_uint32);
-extern int gssint_get_der_length(unsigned char **, OM_uint32, OM_uint32*);
-extern int gssint_put_der_length(OM_uint32, unsigned char **, OM_uint32);
+extern int gssint_get_der_length(unsigned char **, OM_uint32, unsigned int*);
+extern int gssint_put_der_length(OM_uint32, unsigned char **, unsigned int);
 
 
 /* private routines for spnego_mechanism */
@@ -1249,7 +1249,8 @@ spnego_gss_accept_sec_context(void *ct,
 	}
 cleanup:
 	if (return_token != NO_TOKEN_SEND && return_token != CHECK_MIC) {
-		tmpret = make_spnego_tokenTarg_msg(negState, sc->internal_mech,
+		tmpret = make_spnego_tokenTarg_msg(negState,
+						   sc ? sc->internal_mech : GSS_C_NO_OID,
 						   &mechtok_out, mic_out,
 						   return_token,
 						   output_token);
@@ -1802,22 +1803,16 @@ static gss_buffer_t
 get_input_token(unsigned char **buff_in, unsigned int buff_length)
 {
 	gss_buffer_t input_token;
-	unsigned int bytes;
+	unsigned int len;
 
-	if (**buff_in != OCTET_STRING)
+	if (g_get_tag_and_length(buff_in, OCTET_STRING, buff_length, &len) < 0)
 		return (NULL);
 
-	(*buff_in)++;
 	input_token = (gss_buffer_t)malloc(sizeof (gss_buffer_desc));
-
 	if (input_token == NULL)
 		return (NULL);
 
-	input_token->length = gssint_get_der_length(buff_in, buff_length, &bytes);
-	if ((int)input_token->length == -1) {
-		free(input_token);
-		return (NULL);
-	}
+	input_token->length = len;
 	input_token->value = malloc(input_token->length);
 
 	if (input_token->value == NULL) {
@@ -1869,8 +1864,8 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 {
 	gss_OID_set returned_mechSet;
 	OM_uint32 major_status;
-	OM_uint32 length;
-	OM_uint32 bytes;
+	int length;
+	unsigned int bytes;
 	OM_uint32 set_length;
 	unsigned char		*start;
 	int i;
@@ -1882,22 +1877,25 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 	(*buff_in)++;
 
 	length = gssint_get_der_length(buff_in, buff_length, &bytes);
+	if (length < 0 || buff_length - bytes < (unsigned int)length)
+		return NULL;
 
 	major_status = gss_create_empty_oid_set(minor_status,
 						&returned_mechSet);
 	if (major_status != GSS_S_COMPLETE)
 		return (NULL);
 
-	for (set_length = 0, i = 0; set_length < length; i++) {
+	for (set_length = 0, i = 0; set_length < (unsigned int)length; i++) {
 		gss_OID_desc *temp = get_mech_oid(minor_status, buff_in,
 			buff_length - (*buff_in - start));
-		if (temp != NULL) {
-		    major_status = gss_add_oid_set_member(minor_status,
-					temp, &returned_mechSet);
-		    if (major_status == GSS_S_COMPLETE) {
+		if (temp == NULL)
+			break;
+
+		major_status = gss_add_oid_set_member(minor_status,
+						      temp, &returned_mechSet);
+		if (major_status == GSS_S_COMPLETE) {
 			set_length += returned_mechSet->elements[i].length +2;
 			generic_gss_release_oid(minor_status, &temp);
-		    }
 		}
 	}
 
@@ -2097,7 +2095,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 		return GSS_S_DEFECTIVE_TOKEN;
 	if (*ptr++ == SEQUENCE) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 	}
 	if (REMAIN < 1)
@@ -2107,7 +2105,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 
 	if (tag == CONTEXT) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		if (g_get_tag_and_length(&ptr, ENUMERATED,
@@ -2128,7 +2126,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x01)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*supportedMech = get_mech_oid(minor_status, &ptr, REMAIN);
@@ -2142,7 +2140,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x02)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*responseToken = get_input_token(&ptr, REMAIN);
@@ -2156,7 +2154,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x03)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*mechListMIC = get_input_token(&ptr, REMAIN);
@@ -2464,6 +2462,8 @@ make_spnego_tokenTarg_msg(OM_uint32 status, gss_OID mech_wanted,
 
 	if (outbuf == GSS_C_NO_BUFFER)
 		return (GSS_S_DEFECTIVE_TOKEN);
+	if (sendtoken == INIT_TOKEN_SEND && mech_wanted == GSS_C_NO_OID)
+	    return (GSS_S_DEFECTIVE_TOKEN);
 
 	outbuf->length = 0;
 	outbuf->value = NULL;
@@ -2715,7 +2715,7 @@ g_get_tag_and_length(unsigned char **buf, int tag,
 						&encoded_len);
 		if (tmplen < 0) {
 			ret = -1;
-		} else if (tmplen > buflen - (ptr - *buf)) {
+		} else if ((unsigned int)tmplen > buflen - (ptr - *buf)) {
 			ret = -1;
 		} else
 			ret = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:14:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:14:43 +0000 (UTC)
Subject: rpms/krb5/F-10 krb5-CVE-2009-0844-0845-2.patch,NONE,1.1
Message-ID: <20090407181443.EA8BD70137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13755/F-10

Added Files:
	krb5-CVE-2009-0844-0845-2.patch 
Log Message:
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)


krb5-CVE-2009-0844-0845-2.patch:

--- NEW FILE krb5-CVE-2009-0844-0845-2.patch ---
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 832abe6..4384708 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -54,8 +54,8 @@ typedef const gss_OID_desc *gss_OID_const;
 
 /* der routines defined in libgss */
 extern unsigned int gssint_der_length_size(OM_uint32);
-extern int gssint_get_der_length(unsigned char **, OM_uint32, OM_uint32*);
-extern int gssint_put_der_length(OM_uint32, unsigned char **, OM_uint32);
+extern int gssint_get_der_length(unsigned char **, OM_uint32, unsigned int*);
+extern int gssint_put_der_length(OM_uint32, unsigned char **, unsigned int);
 
 
 /* private routines for spnego_mechanism */
@@ -1249,7 +1249,8 @@ spnego_gss_accept_sec_context(void *ct,
 	}
 cleanup:
 	if (return_token != NO_TOKEN_SEND && return_token != CHECK_MIC) {
-		tmpret = make_spnego_tokenTarg_msg(negState, sc->internal_mech,
+		tmpret = make_spnego_tokenTarg_msg(negState,
+						   sc ? sc->internal_mech : GSS_C_NO_OID,
 						   &mechtok_out, mic_out,
 						   return_token,
 						   output_token);
@@ -1802,22 +1803,16 @@ static gss_buffer_t
 get_input_token(unsigned char **buff_in, unsigned int buff_length)
 {
 	gss_buffer_t input_token;
-	unsigned int bytes;
+	unsigned int len;
 
-	if (**buff_in != OCTET_STRING)
+	if (g_get_tag_and_length(buff_in, OCTET_STRING, buff_length, &len) < 0)
 		return (NULL);
 
-	(*buff_in)++;
 	input_token = (gss_buffer_t)malloc(sizeof (gss_buffer_desc));
-
 	if (input_token == NULL)
 		return (NULL);
 
-	input_token->length = gssint_get_der_length(buff_in, buff_length, &bytes);
-	if ((int)input_token->length == -1) {
-		free(input_token);
-		return (NULL);
-	}
+	input_token->length = len;
 	input_token->value = malloc(input_token->length);
 
 	if (input_token->value == NULL) {
@@ -1869,8 +1864,8 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 {
 	gss_OID_set returned_mechSet;
 	OM_uint32 major_status;
-	OM_uint32 length;
-	OM_uint32 bytes;
+	int length;
+	unsigned int bytes;
 	OM_uint32 set_length;
 	unsigned char		*start;
 	int i;
@@ -1882,22 +1877,25 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 	(*buff_in)++;
 
 	length = gssint_get_der_length(buff_in, buff_length, &bytes);
+	if (length < 0 || buff_length - bytes < (unsigned int)length)
+		return NULL;
 
 	major_status = gss_create_empty_oid_set(minor_status,
 						&returned_mechSet);
 	if (major_status != GSS_S_COMPLETE)
 		return (NULL);
 
-	for (set_length = 0, i = 0; set_length < length; i++) {
+	for (set_length = 0, i = 0; set_length < (unsigned int)length; i++) {
 		gss_OID_desc *temp = get_mech_oid(minor_status, buff_in,
 			buff_length - (*buff_in - start));
-		if (temp != NULL) {
-		    major_status = gss_add_oid_set_member(minor_status,
-					temp, &returned_mechSet);
-		    if (major_status == GSS_S_COMPLETE) {
+		if (temp == NULL)
+			break;
+
+		major_status = gss_add_oid_set_member(minor_status,
+						      temp, &returned_mechSet);
+		if (major_status == GSS_S_COMPLETE) {
 			set_length += returned_mechSet->elements[i].length +2;
 			generic_gss_release_oid(minor_status, &temp);
-		    }
 		}
 	}
 
@@ -2097,7 +2095,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 		return GSS_S_DEFECTIVE_TOKEN;
 	if (*ptr++ == SEQUENCE) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 	}
 	if (REMAIN < 1)
@@ -2107,7 +2105,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 
 	if (tag == CONTEXT) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		if (g_get_tag_and_length(&ptr, ENUMERATED,
@@ -2128,7 +2126,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x01)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*supportedMech = get_mech_oid(minor_status, &ptr, REMAIN);
@@ -2142,7 +2140,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x02)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*responseToken = get_input_token(&ptr, REMAIN);
@@ -2156,7 +2154,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x03)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*mechListMIC = get_input_token(&ptr, REMAIN);
@@ -2464,6 +2462,8 @@ make_spnego_tokenTarg_msg(OM_uint32 status, gss_OID mech_wanted,
 
 	if (outbuf == GSS_C_NO_BUFFER)
 		return (GSS_S_DEFECTIVE_TOKEN);
+	if (sendtoken == INIT_TOKEN_SEND && mech_wanted == GSS_C_NO_OID)
+	    return (GSS_S_DEFECTIVE_TOKEN);
 
 	outbuf->length = 0;
 	outbuf->value = NULL;
@@ -2715,7 +2715,7 @@ g_get_tag_and_length(unsigned char **buf, int tag,
 						&encoded_len);
 		if (tmplen < 0) {
 			ret = -1;
-		} else if (tmplen > buflen - (ptr - *buf)) {
+		} else if ((unsigned int)tmplen > buflen - (ptr - *buf)) {
 			ret = -1;
 		} else
 			ret = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:14:44 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:14:44 +0000 (UTC)
Subject: rpms/krb5/F-11 krb5-CVE-2009-0844-0845-2.patch,NONE,1.1
Message-ID: <20090407181444.317F070137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13755/F-11

Added Files:
	krb5-CVE-2009-0844-0845-2.patch 
Log Message:
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)


krb5-CVE-2009-0844-0845-2.patch:

--- NEW FILE krb5-CVE-2009-0844-0845-2.patch ---
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 832abe6..4384708 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -54,8 +54,8 @@ typedef const gss_OID_desc *gss_OID_const;
 
 /* der routines defined in libgss */
 extern unsigned int gssint_der_length_size(OM_uint32);
-extern int gssint_get_der_length(unsigned char **, OM_uint32, OM_uint32*);
-extern int gssint_put_der_length(OM_uint32, unsigned char **, OM_uint32);
+extern int gssint_get_der_length(unsigned char **, OM_uint32, unsigned int*);
+extern int gssint_put_der_length(OM_uint32, unsigned char **, unsigned int);
 
 
 /* private routines for spnego_mechanism */
@@ -1249,7 +1249,8 @@ spnego_gss_accept_sec_context(void *ct,
 	}
 cleanup:
 	if (return_token != NO_TOKEN_SEND && return_token != CHECK_MIC) {
-		tmpret = make_spnego_tokenTarg_msg(negState, sc->internal_mech,
+		tmpret = make_spnego_tokenTarg_msg(negState,
+						   sc ? sc->internal_mech : GSS_C_NO_OID,
 						   &mechtok_out, mic_out,
 						   return_token,
 						   output_token);
@@ -1802,22 +1803,16 @@ static gss_buffer_t
 get_input_token(unsigned char **buff_in, unsigned int buff_length)
 {
 	gss_buffer_t input_token;
-	unsigned int bytes;
+	unsigned int len;
 
-	if (**buff_in != OCTET_STRING)
+	if (g_get_tag_and_length(buff_in, OCTET_STRING, buff_length, &len) < 0)
 		return (NULL);
 
-	(*buff_in)++;
 	input_token = (gss_buffer_t)malloc(sizeof (gss_buffer_desc));
-
 	if (input_token == NULL)
 		return (NULL);
 
-	input_token->length = gssint_get_der_length(buff_in, buff_length, &bytes);
-	if ((int)input_token->length == -1) {
-		free(input_token);
-		return (NULL);
-	}
+	input_token->length = len;
 	input_token->value = malloc(input_token->length);
 
 	if (input_token->value == NULL) {
@@ -1869,8 +1864,8 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 {
 	gss_OID_set returned_mechSet;
 	OM_uint32 major_status;
-	OM_uint32 length;
-	OM_uint32 bytes;
+	int length;
+	unsigned int bytes;
 	OM_uint32 set_length;
 	unsigned char		*start;
 	int i;
@@ -1882,22 +1877,25 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 	(*buff_in)++;
 
 	length = gssint_get_der_length(buff_in, buff_length, &bytes);
+	if (length < 0 || buff_length - bytes < (unsigned int)length)
+		return NULL;
 
 	major_status = gss_create_empty_oid_set(minor_status,
 						&returned_mechSet);
 	if (major_status != GSS_S_COMPLETE)
 		return (NULL);
 
-	for (set_length = 0, i = 0; set_length < length; i++) {
+	for (set_length = 0, i = 0; set_length < (unsigned int)length; i++) {
 		gss_OID_desc *temp = get_mech_oid(minor_status, buff_in,
 			buff_length - (*buff_in - start));
-		if (temp != NULL) {
-		    major_status = gss_add_oid_set_member(minor_status,
-					temp, &returned_mechSet);
-		    if (major_status == GSS_S_COMPLETE) {
+		if (temp == NULL)
+			break;
+
+		major_status = gss_add_oid_set_member(minor_status,
+						      temp, &returned_mechSet);
+		if (major_status == GSS_S_COMPLETE) {
 			set_length += returned_mechSet->elements[i].length +2;
 			generic_gss_release_oid(minor_status, &temp);
-		    }
 		}
 	}
 
@@ -2097,7 +2095,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 		return GSS_S_DEFECTIVE_TOKEN;
 	if (*ptr++ == SEQUENCE) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 	}
 	if (REMAIN < 1)
@@ -2107,7 +2105,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 
 	if (tag == CONTEXT) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		if (g_get_tag_and_length(&ptr, ENUMERATED,
@@ -2128,7 +2126,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x01)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*supportedMech = get_mech_oid(minor_status, &ptr, REMAIN);
@@ -2142,7 +2140,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x02)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*responseToken = get_input_token(&ptr, REMAIN);
@@ -2156,7 +2154,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x03)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*mechListMIC = get_input_token(&ptr, REMAIN);
@@ -2464,6 +2462,8 @@ make_spnego_tokenTarg_msg(OM_uint32 status, gss_OID mech_wanted,
 
 	if (outbuf == GSS_C_NO_BUFFER)
 		return (GSS_S_DEFECTIVE_TOKEN);
+	if (sendtoken == INIT_TOKEN_SEND && mech_wanted == GSS_C_NO_OID)
+	    return (GSS_S_DEFECTIVE_TOKEN);
 
 	outbuf->length = 0;
 	outbuf->value = NULL;
@@ -2715,7 +2715,7 @@ g_get_tag_and_length(unsigned char **buf, int tag,
 						&encoded_len);
 		if (tmplen < 0) {
 			ret = -1;
-		} else if (tmplen > buflen - (ptr - *buf)) {
+		} else if ((unsigned int)tmplen > buflen - (ptr - *buf)) {
 			ret = -1;
 		} else
 			ret = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:14:44 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:14:44 +0000 (UTC)
Subject: rpms/krb5/F-9 krb5-CVE-2009-0844-0845-2.patch,NONE,1.1
Message-ID: <20090407181444.6D47470137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13755/F-9

Added Files:
	krb5-CVE-2009-0844-0845-2.patch 
Log Message:
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)


krb5-CVE-2009-0844-0845-2.patch:

--- NEW FILE krb5-CVE-2009-0844-0845-2.patch ---
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 832abe6..4384708 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -54,8 +54,8 @@ typedef const gss_OID_desc *gss_OID_const;
 
 /* der routines defined in libgss */
 extern unsigned int gssint_der_length_size(OM_uint32);
-extern int gssint_get_der_length(unsigned char **, OM_uint32, OM_uint32*);
-extern int gssint_put_der_length(OM_uint32, unsigned char **, OM_uint32);
+extern int gssint_get_der_length(unsigned char **, OM_uint32, unsigned int*);
+extern int gssint_put_der_length(OM_uint32, unsigned char **, unsigned int);
 
 
 /* private routines for spnego_mechanism */
@@ -1249,7 +1249,8 @@ spnego_gss_accept_sec_context(void *ct,
 	}
 cleanup:
 	if (return_token != NO_TOKEN_SEND && return_token != CHECK_MIC) {
-		tmpret = make_spnego_tokenTarg_msg(negState, sc->internal_mech,
+		tmpret = make_spnego_tokenTarg_msg(negState,
+						   sc ? sc->internal_mech : GSS_C_NO_OID,
 						   &mechtok_out, mic_out,
 						   return_token,
 						   output_token);
@@ -1802,22 +1803,16 @@ static gss_buffer_t
 get_input_token(unsigned char **buff_in, unsigned int buff_length)
 {
 	gss_buffer_t input_token;
-	unsigned int bytes;
+	unsigned int len;
 
-	if (**buff_in != OCTET_STRING)
+	if (g_get_tag_and_length(buff_in, OCTET_STRING, buff_length, &len) < 0)
 		return (NULL);
 
-	(*buff_in)++;
 	input_token = (gss_buffer_t)malloc(sizeof (gss_buffer_desc));
-
 	if (input_token == NULL)
 		return (NULL);
 
-	input_token->length = gssint_get_der_length(buff_in, buff_length, &bytes);
-	if ((int)input_token->length == -1) {
-		free(input_token);
-		return (NULL);
-	}
+	input_token->length = len;
 	input_token->value = malloc(input_token->length);
 
 	if (input_token->value == NULL) {
@@ -1869,8 +1864,8 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 {
 	gss_OID_set returned_mechSet;
 	OM_uint32 major_status;
-	OM_uint32 length;
-	OM_uint32 bytes;
+	int length;
+	unsigned int bytes;
 	OM_uint32 set_length;
 	unsigned char		*start;
 	int i;
@@ -1882,22 +1877,25 @@ get_mech_set(OM_uint32 *minor_status, unsigned char **buff_in,
 	(*buff_in)++;
 
 	length = gssint_get_der_length(buff_in, buff_length, &bytes);
+	if (length < 0 || buff_length - bytes < (unsigned int)length)
+		return NULL;
 
 	major_status = gss_create_empty_oid_set(minor_status,
 						&returned_mechSet);
 	if (major_status != GSS_S_COMPLETE)
 		return (NULL);
 
-	for (set_length = 0, i = 0; set_length < length; i++) {
+	for (set_length = 0, i = 0; set_length < (unsigned int)length; i++) {
 		gss_OID_desc *temp = get_mech_oid(minor_status, buff_in,
 			buff_length - (*buff_in - start));
-		if (temp != NULL) {
-		    major_status = gss_add_oid_set_member(minor_status,
-					temp, &returned_mechSet);
-		    if (major_status == GSS_S_COMPLETE) {
+		if (temp == NULL)
+			break;
+
+		major_status = gss_add_oid_set_member(minor_status,
+						      temp, &returned_mechSet);
+		if (major_status == GSS_S_COMPLETE) {
 			set_length += returned_mechSet->elements[i].length +2;
 			generic_gss_release_oid(minor_status, &temp);
-		    }
 		}
 	}
 
@@ -2097,7 +2095,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 		return GSS_S_DEFECTIVE_TOKEN;
 	if (*ptr++ == SEQUENCE) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 	}
 	if (REMAIN < 1)
@@ -2107,7 +2105,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 
 	if (tag == CONTEXT) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		if (g_get_tag_and_length(&ptr, ENUMERATED,
@@ -2128,7 +2126,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x01)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*supportedMech = get_mech_oid(minor_status, &ptr, REMAIN);
@@ -2142,7 +2140,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x02)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*responseToken = get_input_token(&ptr, REMAIN);
@@ -2156,7 +2154,7 @@ get_negTokenResp(OM_uint32 *minor_status,
 	}
 	if (tag == (CONTEXT | 0x03)) {
 		tmplen = gssint_get_der_length(&ptr, REMAIN, &bytes);
-		if (tmplen < 0)
+		if (tmplen < 0 || REMAIN < (unsigned int)tmplen)
 			return GSS_S_DEFECTIVE_TOKEN;
 
 		*mechListMIC = get_input_token(&ptr, REMAIN);
@@ -2464,6 +2462,8 @@ make_spnego_tokenTarg_msg(OM_uint32 status, gss_OID mech_wanted,
 
 	if (outbuf == GSS_C_NO_BUFFER)
 		return (GSS_S_DEFECTIVE_TOKEN);
+	if (sendtoken == INIT_TOKEN_SEND && mech_wanted == GSS_C_NO_OID)
+	    return (GSS_S_DEFECTIVE_TOKEN);
 
 	outbuf->length = 0;
 	outbuf->value = NULL;
@@ -2715,7 +2715,7 @@ g_get_tag_and_length(unsigned char **buf, int tag,
 						&encoded_len);
 		if (tmplen < 0) {
 			ret = -1;
-		} else if (tmplen > buflen - (ptr - *buf)) {
+		} else if ((unsigned int)tmplen > buflen - (ptr - *buf)) {
 			ret = -1;
 		} else
 			ret = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:15:12 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:12 +0000 (UTC)
Subject: rpms/krb5/devel krb5-CVE-2009-0846.patch,NONE,1.1
Message-ID: <20090407181512.C2F3E70137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/devel

Added Files:
	krb5-CVE-2009-0846.patch 
Log Message:
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)


krb5-CVE-2009-0846.patch:

--- NEW FILE krb5-CVE-2009-0846.patch ---
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index aa4be32..5f7461d 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -231,6 +231,7 @@ asn1_error_code asn1_decode_generaltime(asn1buf *buf, time_t *val)
 
   if(length != 15) return ASN1_BAD_LENGTH;
   retval = asn1buf_remove_charstring(buf,15,&s);
+  if (retval) return retval;
   /* Time encoding: YYYYMMDDhhmmssZ */
   if(s[14] != 'Z') {
       free(s);
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index 0ff9343..1c427d1 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -485,6 +485,22 @@ int main(argc, argv)
     ktest_destroy_keyblock(&(ref.subkey));
     ref.seq_number = 0;
     decode_run("ap_rep_enc_part","(optionals NULL)","7B 1C 30 1A A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40",decode_krb5_ap_rep_enc_part,ktest_equal_ap_rep_enc_part,krb5_free_ap_rep_enc_part);
+
+    retval = krb5_data_hex_parse(&code, "7B 06 30 04 A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40");
+    if (retval) {
+	com_err("krb5_decode_test", retval, "while parsing");
+	exit(1);
+    }
+    retval = decode_krb5_ap_rep_enc_part(&code, &var);
+    if (retval != ASN1_OVERRUN) {
+	printf("ERROR: ");
+    } else {
+	printf("OK: ");
+    }
+    printf("ap_rep_enc_part(optionals NULL + expect ASN1_OVERRUN for inconsistent length of timestamp)\n");
+    krb5_free_data_contents(test_context, &code);
+    if (var) krb5_free_ap_rep_enc_part(test_context, var);
+
     ktest_empty_ap_rep_enc_part(&ref);
   }
   



From nalin at fedoraproject.org  Tue Apr  7 18:15:13 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:13 +0000 (UTC)
Subject: rpms/krb5/F-10 krb5-CVE-2009-0846.patch,NONE,1.1
Message-ID: <20090407181513.1759970137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/F-10

Added Files:
	krb5-CVE-2009-0846.patch 
Log Message:
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)


krb5-CVE-2009-0846.patch:

--- NEW FILE krb5-CVE-2009-0846.patch ---
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index aa4be32..5f7461d 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -231,6 +231,7 @@ asn1_error_code asn1_decode_generaltime(asn1buf *buf, time_t *val)
 
   if(length != 15) return ASN1_BAD_LENGTH;
   retval = asn1buf_remove_charstring(buf,15,&s);
+  if (retval) return retval;
   /* Time encoding: YYYYMMDDhhmmssZ */
   if(s[14] != 'Z') {
       free(s);
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index 0ff9343..1c427d1 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -485,6 +485,22 @@ int main(argc, argv)
     ktest_destroy_keyblock(&(ref.subkey));
     ref.seq_number = 0;
     decode_run("ap_rep_enc_part","(optionals NULL)","7B 1C 30 1A A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40",decode_krb5_ap_rep_enc_part,ktest_equal_ap_rep_enc_part,krb5_free_ap_rep_enc_part);
+
+    retval = krb5_data_hex_parse(&code, "7B 06 30 04 A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40");
+    if (retval) {
+	com_err("krb5_decode_test", retval, "while parsing");
+	exit(1);
+    }
+    retval = decode_krb5_ap_rep_enc_part(&code, &var);
+    if (retval != ASN1_OVERRUN) {
+	printf("ERROR: ");
+    } else {
+	printf("OK: ");
+    }
+    printf("ap_rep_enc_part(optionals NULL + expect ASN1_OVERRUN for inconsistent length of timestamp)\n");
+    krb5_free_data_contents(test_context, &code);
+    if (var) krb5_free_ap_rep_enc_part(test_context, var);
+
     ktest_empty_ap_rep_enc_part(&ref);
   }
   



From nalin at fedoraproject.org  Tue Apr  7 18:15:13 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:13 +0000 (UTC)
Subject: rpms/krb5/F-11 krb5-CVE-2009-0846.patch,NONE,1.1
Message-ID: <20090407181513.5399270137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/F-11

Added Files:
	krb5-CVE-2009-0846.patch 
Log Message:
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)


krb5-CVE-2009-0846.patch:

--- NEW FILE krb5-CVE-2009-0846.patch ---
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index aa4be32..5f7461d 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -231,6 +231,7 @@ asn1_error_code asn1_decode_generaltime(asn1buf *buf, time_t *val)
 
   if(length != 15) return ASN1_BAD_LENGTH;
   retval = asn1buf_remove_charstring(buf,15,&s);
+  if (retval) return retval;
   /* Time encoding: YYYYMMDDhhmmssZ */
   if(s[14] != 'Z') {
       free(s);
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index 0ff9343..1c427d1 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -485,6 +485,22 @@ int main(argc, argv)
     ktest_destroy_keyblock(&(ref.subkey));
     ref.seq_number = 0;
     decode_run("ap_rep_enc_part","(optionals NULL)","7B 1C 30 1A A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40",decode_krb5_ap_rep_enc_part,ktest_equal_ap_rep_enc_part,krb5_free_ap_rep_enc_part);
+
+    retval = krb5_data_hex_parse(&code, "7B 06 30 04 A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40");
+    if (retval) {
+	com_err("krb5_decode_test", retval, "while parsing");
+	exit(1);
+    }
+    retval = decode_krb5_ap_rep_enc_part(&code, &var);
+    if (retval != ASN1_OVERRUN) {
+	printf("ERROR: ");
+    } else {
+	printf("OK: ");
+    }
+    printf("ap_rep_enc_part(optionals NULL + expect ASN1_OVERRUN for inconsistent length of timestamp)\n");
+    krb5_free_data_contents(test_context, &code);
+    if (var) krb5_free_ap_rep_enc_part(test_context, var);
+
     ktest_empty_ap_rep_enc_part(&ref);
   }
   



From nalin at fedoraproject.org  Tue Apr  7 18:15:13 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:13 +0000 (UTC)
Subject: rpms/krb5/F-9 krb5-CVE-2009-0846.patch,NONE,1.1
Message-ID: <20090407181513.8D9BF70137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/F-9

Added Files:
	krb5-CVE-2009-0846.patch 
Log Message:
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)


krb5-CVE-2009-0846.patch:

--- NEW FILE krb5-CVE-2009-0846.patch ---
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index aa4be32..5f7461d 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -231,6 +231,7 @@ asn1_error_code asn1_decode_generaltime(asn1buf *buf, time_t *val)
 
   if(length != 15) return ASN1_BAD_LENGTH;
   retval = asn1buf_remove_charstring(buf,15,&s);
+  if (retval) return retval;
   /* Time encoding: YYYYMMDDhhmmssZ */
   if(s[14] != 'Z') {
       free(s);
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index 0ff9343..1c427d1 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -485,6 +485,22 @@ int main(argc, argv)
     ktest_destroy_keyblock(&(ref.subkey));
     ref.seq_number = 0;
     decode_run("ap_rep_enc_part","(optionals NULL)","7B 1C 30 1A A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40",decode_krb5_ap_rep_enc_part,ktest_equal_ap_rep_enc_part,krb5_free_ap_rep_enc_part);
+
+    retval = krb5_data_hex_parse(&code, "7B 06 30 04 A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40");
+    if (retval) {
+	com_err("krb5_decode_test", retval, "while parsing");
+	exit(1);
+    }
+    retval = decode_krb5_ap_rep_enc_part(&code, &var);
+    if (retval != ASN1_OVERRUN) {
+	printf("ERROR: ");
+    } else {
+	printf("OK: ");
+    }
+    printf("ap_rep_enc_part(optionals NULL + expect ASN1_OVERRUN for inconsistent length of timestamp)\n");
+    krb5_free_data_contents(test_context, &code);
+    if (var) krb5_free_ap_rep_enc_part(test_context, var);
+
     ktest_empty_ap_rep_enc_part(&ref);
   }
   



From nalin at fedoraproject.org  Tue Apr  7 18:15:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:43 +0000 (UTC)
Subject: rpms/krb5/devel krb5-CVE-2009-0847.patch,NONE,1.1
Message-ID: <20090407181543.4B9E670137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233/devel

Added Files:
	krb5-CVE-2009-0847.patch 
Log Message:
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)


krb5-CVE-2009-0847.patch:

--- NEW FILE krb5-CVE-2009-0847.patch ---
diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c
index 8baac24..587cccc 100644
--- a/src/lib/krb5/asn.1/asn1buf.c
+++ b/src/lib/krb5/asn.1/asn1buf.c
@@ -78,11 +78,11 @@ asn1_error_code asn1buf_wrap_data(asn1buf *buf, const krb5_data *code)
 
 asn1_error_code asn1buf_imbed(asn1buf *subbuf, const asn1buf *buf, const unsigned int length, const int indef)
 {
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   subbuf->base = subbuf->next = buf->next;
   if (!indef) {
+      if (length > (size_t)(buf->bound + 1 - buf->next)) return ASN1_OVERRUN;
       subbuf->bound = subbuf->base + length - 1;
-      if (subbuf->bound > buf->bound)
-	  return ASN1_OVERRUN;
   } else /* constructed indefinite */
       subbuf->bound = buf->bound;
   return 0;
@@ -200,6 +200,7 @@ asn1_error_code asn1buf_remove_octetstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;
@@ -218,6 +219,7 @@ asn1_error_code asn1buf_remove_charstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:15:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:43 +0000 (UTC)
Subject: rpms/krb5/F-10 krb5-CVE-2009-0847.patch,NONE,1.1
Message-ID: <20090407181543.8242070137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233/F-10

Added Files:
	krb5-CVE-2009-0847.patch 
Log Message:
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)


krb5-CVE-2009-0847.patch:

--- NEW FILE krb5-CVE-2009-0847.patch ---
diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c
index 8baac24..587cccc 100644
--- a/src/lib/krb5/asn.1/asn1buf.c
+++ b/src/lib/krb5/asn.1/asn1buf.c
@@ -78,11 +78,11 @@ asn1_error_code asn1buf_wrap_data(asn1buf *buf, const krb5_data *code)
 
 asn1_error_code asn1buf_imbed(asn1buf *subbuf, const asn1buf *buf, const unsigned int length, const int indef)
 {
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   subbuf->base = subbuf->next = buf->next;
   if (!indef) {
+      if (length > (size_t)(buf->bound + 1 - buf->next)) return ASN1_OVERRUN;
       subbuf->bound = subbuf->base + length - 1;
-      if (subbuf->bound > buf->bound)
-	  return ASN1_OVERRUN;
   } else /* constructed indefinite */
       subbuf->bound = buf->bound;
   return 0;
@@ -200,6 +200,7 @@ asn1_error_code asn1buf_remove_octetstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;
@@ -218,6 +219,7 @@ asn1_error_code asn1buf_remove_charstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:15:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:43 +0000 (UTC)
Subject: rpms/krb5/F-11 krb5-CVE-2009-0847.patch,NONE,1.1
Message-ID: <20090407181543.B4F0970137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233/F-11

Added Files:
	krb5-CVE-2009-0847.patch 
Log Message:
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)


krb5-CVE-2009-0847.patch:

--- NEW FILE krb5-CVE-2009-0847.patch ---
diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c
index 8baac24..587cccc 100644
--- a/src/lib/krb5/asn.1/asn1buf.c
+++ b/src/lib/krb5/asn.1/asn1buf.c
@@ -78,11 +78,11 @@ asn1_error_code asn1buf_wrap_data(asn1buf *buf, const krb5_data *code)
 
 asn1_error_code asn1buf_imbed(asn1buf *subbuf, const asn1buf *buf, const unsigned int length, const int indef)
 {
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   subbuf->base = subbuf->next = buf->next;
   if (!indef) {
+      if (length > (size_t)(buf->bound + 1 - buf->next)) return ASN1_OVERRUN;
       subbuf->bound = subbuf->base + length - 1;
-      if (subbuf->bound > buf->bound)
-	  return ASN1_OVERRUN;
   } else /* constructed indefinite */
       subbuf->bound = buf->bound;
   return 0;
@@ -200,6 +200,7 @@ asn1_error_code asn1buf_remove_octetstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;
@@ -218,6 +219,7 @@ asn1_error_code asn1buf_remove_charstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;



From nalin at fedoraproject.org  Tue Apr  7 18:15:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:15:43 +0000 (UTC)
Subject: rpms/krb5/F-9 krb5-CVE-2009-0847.patch,NONE,1.1
Message-ID: <20090407181543.F211470137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14233/F-9

Added Files:
	krb5-CVE-2009-0847.patch 
Log Message:
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)


krb5-CVE-2009-0847.patch:

--- NEW FILE krb5-CVE-2009-0847.patch ---
diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c
index 8baac24..587cccc 100644
--- a/src/lib/krb5/asn.1/asn1buf.c
+++ b/src/lib/krb5/asn.1/asn1buf.c
@@ -78,11 +78,11 @@ asn1_error_code asn1buf_wrap_data(asn1buf *buf, const krb5_data *code)
 
 asn1_error_code asn1buf_imbed(asn1buf *subbuf, const asn1buf *buf, const unsigned int length, const int indef)
 {
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   subbuf->base = subbuf->next = buf->next;
   if (!indef) {
+      if (length > (size_t)(buf->bound + 1 - buf->next)) return ASN1_OVERRUN;
       subbuf->bound = subbuf->base + length - 1;
-      if (subbuf->bound > buf->bound)
-	  return ASN1_OVERRUN;
   } else /* constructed indefinite */
       subbuf->bound = buf->bound;
   return 0;
@@ -200,6 +200,7 @@ asn1_error_code asn1buf_remove_octetstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;
@@ -218,6 +219,7 @@ asn1_error_code asn1buf_remove_charstring(asn1buf *buf, const unsigned int len,
 {
   int i;
 
+  if (buf->next > buf->bound + 1) return ASN1_OVERRUN;
   if (len > buf->bound + 1 - buf->next) return ASN1_OVERRUN;
   if (len == 0) {
       *s = 0;



From bjohnson at fedoraproject.org  Tue Apr  7 18:15:45 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Tue,  7 Apr 2009 18:15:45 +0000 (UTC)
Subject: rpms/libmkv/F-10 import.log, NONE, 1.1 libmkv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090407181545.A78E170137@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/libmkv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14157/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmkv.spec 
Log Message:
import



--- NEW FILE import.log ---
libmkv-0_6_3_1-2_fc10:F-10:libmkv-0.6.3.1-2.fc10.src.rpm:1239128097


--- NEW FILE libmkv.spec ---
Name:      libmkv
Version:   0.6.3.1
Release:   2%{?dist}
Summary:   An alternative to the official libmatroska library

Group:     System Environment/Libraries
License:   GPLv2+
URL:       http://repo.or.cz/w/libmkv.git
Source0:   http://download.m0k.org/handbrake/contrib/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
This library is meant to be an alternative to the official libmatroska library.
It is writen in plain C, and is intended to be very portable.

%prep
%setup -q -n %{name}


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT

%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libmkv.so.*
%doc AUTHORS COPYING README

%package devel
Summary:   An alternative to the official libmatroska library - devel files
Group:     Development/Libraries
Requires:  %{name} = %{version}-%{release}

%description devel
This library is meant to be an alternative to the official libmatroska library.
It is writen in plain C, and is intended to be very portable.  These are the
development files.

%files devel
%defattr(-,root,root,-)
%{_includedir}/libmkv.h
%{_libdir}/libmkv.so
%exclude %{_libdir}/libmkv.la

%changelog
* Thu Apr 02 2009 Bernard Johnson <bjohnson at symetrix.com> - 0.6.3.1-2
- remove slashes in %%files list
- configure with --disable-static

* Mon Mar 30 2009 Bernard Johnson <bjohnson at symetrix.com> - 0.6.3.1-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmkv/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:25:22 -0000	1.1
+++ .cvsignore	7 Apr 2009 18:15:15 -0000	1.2
@@ -0,0 +1 @@
+libmkv-0.6.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmkv/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:25:22 -0000	1.1
+++ sources	7 Apr 2009 18:15:15 -0000	1.2
@@ -0,0 +1 @@
+984575069cbfb47dece609e78768ca97  libmkv-0.6.3.1.tar.gz



From nalin at fedoraproject.org  Tue Apr  7 18:16:57 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:16:57 +0000 (UTC)
Subject: rpms/krb5/F-10 krb5.spec, 1.177, 1.178 krb5-1.6.3-spnego-crash.patch,
	1.1, NONE
Message-ID: <20090407181657.AEB3B70137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14391/F-10

Modified Files:
	krb5.spec 
Removed Files:
	krb5-1.6.3-spnego-crash.patch 
Log Message:
- remove obsolete patch for CVE-2009-0845
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-10/krb5.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- krb5.spec	17 Mar 2009 22:22:59 -0000	1.177
+++ krb5.spec	7 Apr 2009 18:16:27 -0000	1.178
@@ -16,7 +16,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.3
-Release: 17%{?dist}
+Release: 18%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -102,7 +102,9 @@
 Patch78: krb5-1.6.3-lucid-acceptor.patch
 Patch79: krb5-trunk-ftp_mget_case.patch
 Patch80: krb5-trunk-preauth-master.patch
-Patch81: krb5-1.6.3-spnego-crash.patch
+Patch82: krb5-CVE-2009-0844-0845-2.patch
+Patch83: krb5-CVE-2009-0846.patch
+Patch84: krb5-CVE-2009-0847.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -233,6 +235,13 @@
 certificate.
 
 %changelog
+* Tue Apr  7 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-18
+- add patches for read overflow and null pointer dereference in the
+  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
+- add patch for attempt to free uninitialized pointer in libkrb5
+  (CVE-2009-0846)
+- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)
+
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-17
 - libgssapi_krb5: backport fix for some errors which can occur when
   we fail to set up the server half of a context (CVE-2009-0845)
@@ -1395,7 +1404,9 @@
 %patch78 -p0 -b .lucid_acceptor
 %patch79 -p0 -b .ftp_mget_case
 %patch80 -p0 -b .preauth_master
-%patch81 -p0 -b .spnego-crash
+%patch82 -p1 -b .CVE-2009-0844-0845-2
+%patch83 -p1 -b .CVE-2009-0846
+%patch84 -p1 -b .CVE-2009-0847
 cp src/krb524/README README.krb524
 gzip doc/*.ps
 


--- krb5-1.6.3-spnego-crash.patch DELETED ---



From nalin at fedoraproject.org  Tue Apr  7 18:16:57 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:16:57 +0000 (UTC)
Subject: rpms/krb5/F-11 krb5.spec, 1.180, 1.181 krb5-1.6.3-spnego-crash.patch,
	1.1, NONE
Message-ID: <20090407181657.E840F70137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14391/F-11

Modified Files:
	krb5.spec 
Removed Files:
	krb5-1.6.3-spnego-crash.patch 
Log Message:
- remove obsolete patch for CVE-2009-0845
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-11/krb5.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- krb5.spec	17 Mar 2009 22:26:27 -0000	1.180
+++ krb5.spec	7 Apr 2009 18:16:27 -0000	1.181
@@ -16,7 +16,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -102,7 +102,9 @@
 Patch78: krb5-1.6.3-lucid-acceptor.patch
 Patch79: krb5-trunk-ftp_mget_case.patch
 Patch80: krb5-trunk-preauth-master.patch
-Patch81: krb5-1.6.3-spnego-crash.patch
+Patch82: krb5-CVE-2009-0844-0845-2.patch
+Patch83: krb5-CVE-2009-0846.patch
+Patch84: krb5-CVE-2009-0847.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -233,6 +235,13 @@
 certificate.
 
 %changelog
+* Tue Apr  7 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-20
+- add patches for read overflow and null pointer dereference in the
+  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
+- add patch for attempt to free uninitialized pointer in libkrb5
+  (CVE-2009-0846)
+- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)
+
 * Tue Mar 17 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-19
 - libgssapi_krb5: backport fix for some errors which can occur when
   we fail to set up the server half of a context (CVE-2009-0845)
@@ -1401,7 +1410,9 @@
 %patch78 -p0 -b .lucid_acceptor
 %patch79 -p0 -b .ftp_mget_case
 %patch80 -p0 -b .preauth_master
-%patch81 -p0 -b .spnego-crash
+%patch82 -p1 -b .CVE-2009-0844-0845-2
+%patch83 -p1 -b .CVE-2009-0846
+%patch84 -p1 -b .CVE-2009-0847
 cp src/krb524/README README.krb524
 gzip doc/*.ps
 


--- krb5-1.6.3-spnego-crash.patch DELETED ---



From nalin at fedoraproject.org  Tue Apr  7 18:16:58 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:16:58 +0000 (UTC)
Subject: rpms/krb5/F-9 krb5.spec, 1.171, 1.172 krb5-1.6.3-spnego-crash.patch,
	1.1, NONE
Message-ID: <20090407181658.3590370137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14391/F-9

Modified Files:
	krb5.spec 
Removed Files:
	krb5-1.6.3-spnego-crash.patch 
Log Message:
- remove obsolete patch for CVE-2009-0845
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-9/krb5.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- krb5.spec	6 Apr 2009 22:47:25 -0000	1.171
+++ krb5.spec	7 Apr 2009 18:16:27 -0000	1.172
@@ -16,7 +16,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -101,7 +101,9 @@
 Patch77: krb5-CVE-2007-5971.patch
 Patch78: krb5-1.6.3-lucid-acceptor.patch
 Patch79: krb5-trunk-ftp_mget_case.patch
-Patch80: krb5-1.6.3-spnego-crash.patch
+Patch81: krb5-CVE-2009-0844-0845-2.patch
+Patch82: krb5-CVE-2009-0846.patch
+Patch83: krb5-CVE-2009-0847.patch
 
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
@@ -232,6 +234,13 @@
 certificate.
 
 %changelog
+* Tue Apr  7 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-16
+- add patches for read overflow and null pointer dereference in the
+  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
+- add patch for attempt to free uninitialized pointer in libkrb5
+  (CVE-2009-0846)
+- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)
+
 * Mon Apr  6 2009 Nalin Dahyabhai <nalin at redhat.com>
 - pull in a couple of defuzzed patches from the F-10 version of this package,
   dropping a redundant man page patch in the process
@@ -1377,7 +1386,9 @@
 %patch77 -p0 -b .2007-5971
 %patch78 -p0 -b .lucid_acceptor
 %patch79 -p0 -b .ftp_mget_case
-%patch80 -p0 -b .spnego-crash
+%patch81 -p1 -b .CVE-2009-0844-0845-2
+%patch82 -p1 -b .CVE-2009-0846
+%patch83 -p1 -b .CVE-2009-0847
 cp src/krb524/README README.krb524
 gzip doc/*.ps
 


--- krb5-1.6.3-spnego-crash.patch DELETED ---



From nalin at fedoraproject.org  Tue Apr  7 18:16:58 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  7 Apr 2009 18:16:58 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec, 1.188,
	1.189 krb5-1.6.3-spnego-crash.patch, 1.1, NONE
Message-ID: <20090407181658.77A2270137@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14391/devel

Modified Files:
	krb5.spec 
Removed Files:
	krb5-1.6.3-spnego-crash.patch 
Log Message:
- remove obsolete patch for CVE-2009-0845
- add patches for read overflow and null pointer dereference in the
  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
- add patch for attempt to free uninitialized pointer in libkrb5
  (CVE-2009-0846)
- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- krb5.spec	6 Apr 2009 20:33:44 -0000	1.188
+++ krb5.spec	7 Apr 2009 18:16:28 -0000	1.189
@@ -13,7 +13,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.6.3
-Release: 100%{?dist}
+Release: 101%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -97,7 +97,9 @@
 Patch78: krb5-1.6.3-lucid-acceptor.patch
 Patch79: krb5-trunk-ftp_mget_case.patch
 Patch80: krb5-trunk-preauth-master.patch
-Patch81: krb5-1.6.3-spnego-crash.patch
+Patch82: krb5-CVE-2009-0844-0845-2.patch
+Patch83: krb5-CVE-2009-0846.patch
+Patch84: krb5-CVE-2009-0847.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -226,6 +228,15 @@
 certificate.
 
 %changelog
+* Tue Apr  7 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-101
+- add patches for read overflow and null pointer dereference in the
+  implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
+- add patch for attempt to free uninitialized pointer in libkrb5
+  (CVE-2009-0846)
+- add patch to fix length validation bug in libkrb5 (CVE-2009-0847)
+- put the krb5-user .info file into just -workstation and not also
+  -workstation-clients
+
 * Mon Apr  6 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-100
 - turn off krb4 support (it won't be part of the 1.7 release, but do it now)
 - use triggeruns to properly shut down and disable krb524d when -server and
@@ -1212,7 +1223,7 @@
 - apply second set of buffer overflow fixes from Tom Yu
 - fix from Dirk Husung for a bug in buffer cleanups in the test suite
 - work around possibly broken rev binary in running test suite
-- move default realm configs from /var/kerberos to %{_var}/kerberos
+- move default realm configs from /var/kerberos to %%{_var}/kerberos
 
 * Tue Jun  6 2000 Nalin Dahyabhai <nalin at redhat.com>
 - make ksu and v4rcp owned by root
@@ -1408,7 +1419,9 @@
 %patch78 -p0 -b .lucid_acceptor
 %patch79 -p0 -b .ftp_mget_case
 %patch80 -p0 -b .preauth_master
-%patch81 -p0 -b .spnego-crash
+%patch82 -p1 -b .CVE-2009-0844-0845-2
+%patch83 -p1 -b .CVE-2009-0846
+%patch84 -p1 -b .CVE-2009-0847
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -1674,7 +1687,7 @@
 /sbin/install-info %{_infodir}/krb5-user.info %{_infodir}/dir
 exit 0
 
-%preun workstation
+%postun workstation
 if [ "$1" -eq "0" ] ; then
 	/sbin/install-info --delete %{_infodir}/krb5-user.info %{_infodir}/dir
 fi
@@ -1730,7 +1743,6 @@
 %docdir %{krb5prefix}/man
 %doc doc/{ftp,rcp,rlogin,rsh,telnet}.html
 %attr(0755,root,root) %doc src/config-files/convert-config-files
-%{_infodir}/krb5-user.info*
 
 %dir %{krb5prefix}
 %dir %{krb5prefix}/bin


--- krb5-1.6.3-spnego-crash.patch DELETED ---



From anyremote at fedoraproject.org  Tue Apr  7 18:29:56 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue,  7 Apr 2009 18:29:56 +0000 (UTC)
Subject: rpms/kanyremote/F-9 .cvsignore, 1.15, 1.16 import.log, 1.14,
	1.15 kanyremote.spec, 1.17, 1.18 sources, 1.18, 1.19
Message-ID: <20090407182956.0C3857013C@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18877/F-9

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2009 19:34:29 -0000	1.15
+++ .cvsignore	7 Apr 2009 18:29:25 -0000	1.16
@@ -1 +1 @@
-kanyremote-5.8.tar.gz
+kanyremote-5.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	30 Mar 2009 19:34:29 -0000	1.14
+++ import.log	7 Apr 2009 18:29:25 -0000	1.15
@@ -12,3 +12,4 @@
 kanyremote-5_6_1-1_fc10:F-9:kanyremote-5.6.1-1.fc10.src.rpm:1232564250
 kanyremote-5_7-1_fc10:F-9:kanyremote-5.7-1.fc10.src.rpm:1236975580
 kanyremote-5_8-1_fc10:F-9:kanyremote-5.8-1.fc10.src.rpm:1238438085
+kanyremote-5_8_1-1_fc10:F-9:kanyremote-5.8.1-1.fc10.src.rpm:1239128941


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kanyremote.spec	30 Mar 2009 19:34:29 -0000	1.17
+++ kanyremote.spec	7 Apr 2009 18:29:25 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.8
+Version: 5.8.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Tue Apr 7 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.1
+- Fix small bug 
+
 * Mon Mar 30 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8
 - Add GuiAppModes tag handling
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Mar 2009 19:34:29 -0000	1.18
+++ sources	7 Apr 2009 18:29:25 -0000	1.19
@@ -1 +1 @@
-5cbbf5d30d8c3bf08f60710eb7db0af5  kanyremote-5.8.tar.gz
+00c82c242d74c3643e427f0a23b83675  kanyremote-5.8.1.tar.gz



From anyremote at fedoraproject.org  Tue Apr  7 18:29:58 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue,  7 Apr 2009 18:29:58 +0000 (UTC)
Subject: rpms/kanyremote/F-10 .cvsignore, 1.15, 1.16 import.log, 1.15,
	1.16 kanyremote.spec, 1.16, 1.17 sources, 1.18, 1.19
Message-ID: <20090407182958.3FB527013C@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18902/F-10

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2009 19:35:22 -0000	1.15
+++ .cvsignore	7 Apr 2009 18:29:27 -0000	1.16
@@ -1 +1 @@
-kanyremote-5.8.tar.gz
+kanyremote-5.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	30 Mar 2009 19:35:23 -0000	1.15
+++ import.log	7 Apr 2009 18:29:27 -0000	1.16
@@ -13,3 +13,4 @@
 kanyremote-5_6_1-1_fc10:F-10:kanyremote-5.6.1-1.fc10.src.rpm:1232564252
 kanyremote-5_7-1_fc10:F-10:kanyremote-5.7-1.fc10.src.rpm:1236975606
 kanyremote-5_8-1_fc10:F-10:kanyremote-5.8-1.fc10.src.rpm:1238438124
+kanyremote-5_8_1-1_fc10:F-10:kanyremote-5.8.1-1.fc10.src.rpm:1239128949


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/kanyremote.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kanyremote.spec	30 Mar 2009 19:35:23 -0000	1.16
+++ kanyremote.spec	7 Apr 2009 18:29:27 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.8
+Version: 5.8.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Tue Apr 7 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.1
+- Fix small bug 
+
 * Mon Mar 30 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8
 - Add GuiAppModes tag handling
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Mar 2009 19:35:23 -0000	1.18
+++ sources	7 Apr 2009 18:29:27 -0000	1.19
@@ -1 +1 @@
-5cbbf5d30d8c3bf08f60710eb7db0af5  kanyremote-5.8.tar.gz
+00c82c242d74c3643e427f0a23b83675  kanyremote-5.8.1.tar.gz



From anyremote at fedoraproject.org  Tue Apr  7 18:30:00 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue,  7 Apr 2009 18:30:00 +0000 (UTC)
Subject: rpms/kanyremote/devel .cvsignore, 1.15, 1.16 import.log, 1.17,
	1.18 kanyremote.spec, 1.20, 1.21 sources, 1.20, 1.21
Message-ID: <20090407183000.A91E87013C@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18935/devel

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2009 19:34:18 -0000	1.15
+++ .cvsignore	7 Apr 2009 18:29:30 -0000	1.16
@@ -1 +1 @@
-kanyremote-5.8.tar.gz
+kanyremote-5.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	30 Mar 2009 19:34:18 -0000	1.17
+++ import.log	7 Apr 2009 18:29:30 -0000	1.18
@@ -15,3 +15,4 @@
 kanyremote-5_6_1-1_fc10:HEAD:kanyremote-5.6.1-1.fc10.src.rpm:1232655741
 kanyremote-5_7-1_fc10:HEAD:kanyremote-5.7-1.fc10.src.rpm:1236975597
 kanyremote-5_8-1_fc10:HEAD:kanyremote-5.8-1.fc10.src.rpm:1238438057
+kanyremote-5_8_1-1_fc10:HEAD:kanyremote-5.8.1-1.fc10.src.rpm:1239128974


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kanyremote.spec	30 Mar 2009 19:34:18 -0000	1.20
+++ kanyremote.spec	7 Apr 2009 18:29:30 -0000	1.21
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.8
+Version: 5.8.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Tue Apr 7 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.1
+- Fix small bug 
+
 * Mon Mar 30 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8
 - Add GuiAppModes tag handling
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	30 Mar 2009 19:34:18 -0000	1.20
+++ sources	7 Apr 2009 18:29:30 -0000	1.21
@@ -1 +1 @@
-5cbbf5d30d8c3bf08f60710eb7db0af5  kanyremote-5.8.tar.gz
+00c82c242d74c3643e427f0a23b83675  kanyremote-5.8.1.tar.gz



From spot at fedoraproject.org  Tue Apr  7 18:07:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 18:07:35 +0000 (UTC)
Subject: rpms/R/F-10 R.spec,1.57,1.58
Message-ID: <20090407180735.988BA70100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214/F-10

Modified Files:
	R.spec 
Log Message:
drop profile.d scripts, minimize hard coded Requires


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/R.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- R.spec	28 Mar 2009 16:42:48 -0000	1.57
+++ R.spec	7 Apr 2009 18:07:05 -0000	1.58
@@ -6,14 +6,12 @@
 
 Name: R
 Version: 2.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
 Source1: macros.R
 Source2: R-make-search-index.sh
-Source3: R.sh
-Source4: R.csh
 Patch1: R-2.7.2-filter_asoption.patch
 License: GPLv2+
 Group: Applications/Engineering
@@ -53,6 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -104,10 +103,8 @@
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development version
-Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
-Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel
-Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
-Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
+Requires: gcc-c++, gcc-gfortran, tetex-latex
+Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
@@ -260,11 +257,6 @@
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
 install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
 
-# Install profile.d RHOME scripts
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install	-m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
 # Fix multilib
 touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 touch -r NEWS doc/manual/*.pdf
@@ -863,7 +855,6 @@
 %{_libdir}/R/SVN-REVISION
 /usr/lib/rpm/R-make-search-index.sh
 %{_infodir}/R-*.info*
-%{_sysconfdir}/profile.d/R.*sh
 %{_sysconfdir}/rpm/macros.R
 %{_mandir}/man1/*
 %{_docdir}/R-%{version}
@@ -962,6 +953,10 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
+- drop profile.d scripts, they broke more than they fixed
+- minimize hard-coded Requires based on Martyn Plummer's analysis
+
 * Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
 - fix profile scripts for situation where R_HOME is already defined
   (bugzilla 492706)



From spot at fedoraproject.org  Tue Apr  7 18:07:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 18:07:35 +0000 (UTC)
Subject: rpms/R/F-9 R.spec,1.56,1.57
Message-ID: <20090407180735.B579070100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214/F-9

Modified Files:
	R.spec 
Log Message:
drop profile.d scripts, minimize hard coded Requires


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- R.spec	28 Mar 2009 16:42:48 -0000	1.56
+++ R.spec	7 Apr 2009 18:07:05 -0000	1.57
@@ -6,14 +6,12 @@
 
 Name: R
 Version: 2.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
 Source1: macros.R
 Source2: R-make-search-index.sh
-Source3: R.sh
-Source4: R.csh
 Patch1: R-2.7.2-filter_asoption.patch
 License: GPLv2+
 Group: Applications/Engineering
@@ -53,6 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -104,10 +103,8 @@
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development version
-Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
-Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel
-Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
-Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
+Requires: gcc-c++, gcc-gfortran, tetex-latex
+Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
@@ -260,11 +257,6 @@
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
 install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
 
-# Install profile.d RHOME scripts
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install	-m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
 # Fix multilib
 touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 touch -r NEWS doc/manual/*.pdf
@@ -863,7 +855,6 @@
 %{_libdir}/R/SVN-REVISION
 /usr/lib/rpm/R-make-search-index.sh
 %{_infodir}/R-*.info*
-%{_sysconfdir}/profile.d/R.*sh
 %{_sysconfdir}/rpm/macros.R
 %{_mandir}/man1/*
 %{_docdir}/R-%{version}
@@ -962,6 +953,10 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
+- drop profile.d scripts, they broke more than they fixed
+- minimize hard-coded Requires based on Martyn Plummer's analysis
+
 * Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
 - fix profile scripts for situation where R_HOME is already defined
   (bugzilla 492706)



From spot at fedoraproject.org  Tue Apr  7 18:07:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 18:07:36 +0000 (UTC)
Subject: rpms/R/devel R.spec,1.58,1.59
Message-ID: <20090407180736.097E170100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214/devel

Modified Files:
	R.spec 
Log Message:
drop profile.d scripts, minimize hard coded Requires


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- R.spec	28 Mar 2009 16:42:48 -0000	1.58
+++ R.spec	7 Apr 2009 18:07:05 -0000	1.59
@@ -6,14 +6,12 @@
 
 Name: R
 Version: 2.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
 Source1: macros.R
 Source2: R-make-search-index.sh
-Source3: R.sh
-Source4: R.csh
 Patch1: R-2.7.2-filter_asoption.patch
 License: GPLv2+
 Group: Applications/Engineering
@@ -53,6 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -104,10 +103,8 @@
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development version
-Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
-Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel
-Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
-Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
+Requires: gcc-c++, gcc-gfortran, tetex-latex
+Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
@@ -260,11 +257,6 @@
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
 install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
 
-# Install profile.d RHOME scripts
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install	-m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
 # Fix multilib
 touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 touch -r NEWS doc/manual/*.pdf
@@ -863,7 +855,6 @@
 %{_libdir}/R/SVN-REVISION
 /usr/lib/rpm/R-make-search-index.sh
 %{_infodir}/R-*.info*
-%{_sysconfdir}/profile.d/R.*sh
 %{_sysconfdir}/rpm/macros.R
 %{_mandir}/man1/*
 %{_docdir}/R-%{version}
@@ -962,6 +953,10 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
+- drop profile.d scripts, they broke more than they fixed
+- minimize hard-coded Requires based on Martyn Plummer's analysis
+
 * Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
 - fix profile scripts for situation where R_HOME is already defined
   (bugzilla 492706)



From mclasen at fedoraproject.org  Tue Apr  7 18:22:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  7 Apr 2009 18:22:45 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver-idle-delay.patch,
	NONE, 1.1 gnome-screensaver.spec, 1.208, 1.209
Message-ID: <20090407182245.A367470137@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15886

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-idle-delay.patch 
Log Message:
Make idle time slider work again


gnome-screensaver-idle-delay.patch:

--- NEW FILE gnome-screensaver-idle-delay.patch ---
diff -up gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c.idle-delay gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c
--- gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c.idle-delay	2009-04-07 14:14:40.559089180 -0400
+++ gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c	2009-04-07 14:15:09.653053621 -0400
@@ -50,10 +50,11 @@
 #define KEY_LOCK_DISABLE    GNOME_LOCKDOWN_DIR "/disable_lock_screen"
 
 #define KEY_DIR             "/apps/gnome-screensaver"
+#define GNOME_SESSION_DIR   "/desktop/gnome/session"
 #define KEY_LOCK            KEY_DIR "/lock_enabled"
 #define KEY_IDLE_ACTIVATION_ENABLED         KEY_DIR "/idle_activation_enabled"
 #define KEY_MODE            KEY_DIR "/mode"
-#define KEY_ACTIVATE_DELAY  KEY_DIR "/idle_delay"
+#define KEY_ACTIVATE_DELAY  GNOME_SESSION_DIR "/idle_delay"
 #define KEY_LOCK_DELAY      KEY_DIR "/lock_delay"
 #define KEY_CYCLE_DELAY     KEY_DIR "/cycle_delay"
 #define KEY_THEMES          KEY_DIR "/themes"
diff -up gnome-screensaver-2.26.0/src/gs-prefs.c.idle-delay gnome-screensaver-2.26.0/src/gs-prefs.c
--- gnome-screensaver-2.26.0/src/gs-prefs.c.idle-delay	2009-04-07 14:13:23.189342814 -0400
+++ gnome-screensaver-2.26.0/src/gs-prefs.c	2009-04-07 14:14:07.529055689 -0400
@@ -39,10 +39,11 @@ static void gs_prefs_finalize   (GObject
 #define KEY_USER_SWITCH_DISABLE   GNOME_LOCKDOWN_DIR "/disable_user_switching"
 
 #define KEY_DIR            "/apps/gnome-screensaver"
+#define GNOME_SESSION_DIR  "/desktop/gnome/session"
 #define KEY_IDLE_ACTIVATION_ENABLED         KEY_DIR "/idle_activation_enabled"
 #define KEY_LOCK_ENABLED   KEY_DIR "/lock_enabled"
 #define KEY_MODE           KEY_DIR "/mode"
-#define KEY_ACTIVATE_DELAY KEY_DIR "/idle_delay"
+#define KEY_ACTIVATE_DELAY GNOME_SESSION_DIR "/idle_delay"
 #define KEY_POWER_DELAY    KEY_DIR "/power_management_delay"
 #define KEY_LOCK_DELAY     KEY_DIR "/lock_delay"
 #define KEY_CYCLE_DELAY    KEY_DIR "/cycle_delay"


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- gnome-screensaver.spec	19 Mar 2009 04:21:35 -0000	1.208
+++ gnome-screensaver.spec	7 Apr 2009 18:22:15 -0000	1.209
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.26/%{name}-%{version}.tar.bz2
@@ -24,6 +24,8 @@
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
+# upstream fix
+Patch9: gnome-screensaver-idle-delay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -45,7 +47,6 @@
 # this is here because the configure tests look for protocol headers
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 BuildRequires: nss-devel
 BuildRequires: automake, autoconf, libtool, intltool
 BuildRequires: libXxf86misc-devel
@@ -78,6 +79,8 @@
 %patch2 -p1 -b .securitytoken
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
+%patch9 -p1 -b .idle-delay
+
 libtoolize --force --copy
 
 %build
@@ -146,6 +149,9 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Tue Apr  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Make the idle time slider work again
+
 * Thu Mar 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From tuxbrewr at fedoraproject.org  Tue Apr  7 18:56:35 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue,  7 Apr 2009 18:56:35 +0000 (UTC)
Subject: rpms/tripwire/devel tripwire.spec,1.18,1.19 twpol.txt.in,1.4,1.5
Message-ID: <20090407185635.DAE6A70100@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/tripwire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26737

Modified Files:
	tripwire.spec twpol.txt.in 
Log Message:
Added support for /usr/lib64 & /usr/local/lib64


Index: tripwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/devel/tripwire.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tripwire.spec	25 Feb 2009 21:54:42 -0000	1.18
+++ tripwire.spec	7 Apr 2009 18:56:05 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:		tripwire
 Version:	2.4.1.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	IDS (Intrusion Detection System)
 
 License:	GPLv2+
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Tue Apr 7 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 2.4.1.2-9
+- Added support for /usr/lib64 & /usr/local/lib64
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: twpol.txt.in
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/devel/twpol.txt.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- twpol.txt.in	22 Dec 2006 04:47:55 -0000	1.4
+++ twpol.txt.in	7 Apr 2009 18:56:05 -0000	1.5
@@ -725,6 +725,8 @@
 {
   /usr/lib                             -> $(SEC_BIN) ;
   /usr/local/lib                       -> $(SEC_BIN) ;
+  /usr/lib64                           -> $(SEC_BIN) ;
+  /usr/local/lib64                     -> $(SEC_BIN) ; 
 }
 
 



From linville at fedoraproject.org  Tue Apr  7 19:03:01 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue,  7 Apr 2009 19:03:01 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-iwlwifi-remove-implicit-direct-scan.patch, 
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.58, 1.1206.2.59
Message-ID: <20090407190301.A742570100@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28795

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-iwlwifi-remove-implicit-direct-scan.patch 
Log Message:
iwlwifi: remove implicit direct scan

linux-2.6-iwlwifi-remove-implicit-direct-scan.patch:

--- NEW FILE linux-2.6-iwlwifi-remove-implicit-direct-scan.patch ---
Back-port of the following upstream commit...

commit a57a59f247b651e8ed6d3eeb7e2f9d83b83134c9
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Tue Oct 28 18:21:05 2008 +0100

    iwlwifi: remove implicit direct scan

    When an undirected scan is requested and iwlwifi is not associated but
    the user has set an SSID (and maybe was associated with that network at
    some point) then iwlwifi will assume the user wanted to scan for this
    SSID which seems wrong. Remove this code.

    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-07 14:34:39.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-07 14:43:08.000000000 -0400
@@ -6202,14 +6202,6 @@ static void iwl3945_bg_request_scan(stru
 		memcpy(scan->direct_scan[0].ssid,
 		       priv->direct_ssid, priv->direct_ssid_len);
 		direct_mask = 1;
-	} else if (!iwl3945_is_associated(priv) && priv->essid_len) {
-		IWL_DEBUG_SCAN
-		  ("Kicking off one direct scan for '%s' when not associated\n",
-		   iwl3945_escape_essid(priv->essid, priv->essid_len));
-		scan->direct_scan[0].id = WLAN_EID_SSID;
-		scan->direct_scan[0].len = priv->essid_len;
-		memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
-		direct_mask = 1;
 	} else {
 		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");
 		direct_mask = 0;
diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c.orig	2009-04-07 14:34:27.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c	2009-04-07 14:42:12.000000000 -0400
@@ -804,13 +804,6 @@ static void iwl_bg_request_scan(struct w
 		memcpy(scan->direct_scan[0].ssid,
 		       priv->direct_ssid, priv->direct_ssid_len);
 		n_probes++;
-	} else if (!iwl_is_associated(priv) && priv->essid_len) {
-		IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",
-				iwl_escape_essid(priv->essid, priv->essid_len));
-		scan->direct_scan[0].id = WLAN_EID_SSID;
-		scan->direct_scan[0].len = priv->essid_len;
-		memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
-		n_probes++;
 	} else {
 		IWL_DEBUG_SCAN("Start indirect scan.\n");
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.58
retrieving revision 1.1206.2.59
diff -u -r1.1206.2.58 -r1.1206.2.59
--- kernel.spec	2 Apr 2009 19:15:15 -0000	1.1206.2.58
+++ kernel.spec	7 Apr 2009 19:02:31 -0000	1.1206.2.59
@@ -657,6 +657,7 @@
 Patch686: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch687: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch688: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
+Patch689: linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1290,6 +1291,9 @@
 # iwl3945 fix for stable ad-hoc mode connections (#459401)
 ApplyPatch linux-2.6-iwl3945-ibss-tsf-fix.patch
 
+# iwlwifi: remove implicit direct scan
+ApplyPatch linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
+
 # Backported ath9k DMA fixes from pre-2.6.28
 ApplyPatch linux-2.6-wireless-ath9k-dma-fixes.patch
 
@@ -1975,6 +1979,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.58
+- iwlwifi: remove implicit direct scan
+
 * Thu Apr  2 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.57
 - iwl3945: rely on priv->lock to protect priv access
 



From scop at fedoraproject.org  Tue Apr  7 19:04:53 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  7 Apr 2009 19:04:53 +0000 (UTC)
Subject: rpms/bash-completion/devel
	bash-completion-1.0-bash4quoting-490322.patch, NONE,
	1.1 bash-completion.spec, 1.38, 1.39
Message-ID: <20090407190453.0D1F370100@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29603

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-1.0-bash4quoting-490322.patch 
Log Message:
* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
- Apply upstream patch to fix quoting issues with bash 4.x (#490322).


bash-completion-1.0-bash4quoting-490322.patch:

--- NEW FILE bash-completion-1.0-bash4quoting-490322.patch ---
From: Mike Kelly <pioto at pioto.org>
Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400)
Subject: Fix _filedir on bash 4.
X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c

Fix _filedir on bash 4.

We don't need to double-quote things for compgen w/ bash 4. Just putting
each file in double quotes is sufficient.

See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
---

diff --git a/bash_completion b/bash_completion
index 0246cd8..4d21cf8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -209,6 +209,12 @@ quote()
 # results in the original argument
 quote_readline()
 {
+	if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
+		# This function isn't really necessary on bash 4
+		# See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+		echo "${1}"
+		return
+	fi
 	local t="${1//\\/\\\\}"
 	echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
 }


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- bash-completion.spec	6 Apr 2009 18:07:53 -0000	1.38
+++ bash-completion.spec	7 Apr 2009 19:04:22 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -11,6 +11,8 @@
 Source1:        %{name}-mock
 Source2:        %{name}-plague-client
 Source3:        %{name}-repomanage
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
+Patch0:         %{name}-1.0-bash4quoting-490322.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 install -pm 644 %{SOURCE1} contrib/mock
 install -pm 644 %{SOURCE2} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
@@ -265,6 +268,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
+- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
+
 * Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
 - 1.0.
 



From rdieter at fedoraproject.org  Tue Apr  7 19:08:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 19:08:05 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.143,1.144
Message-ID: <20090407190805.4DA6270100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30757

Modified Files:
	amarok.spec 
Log Message:
* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
- enable external qtscriptgenerator/qtscriptbindings
- optimize scriptlets



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- amarok.spec	10 Mar 2009 19:27:41 -0000	1.143
+++ amarok.spec	7 Apr 2009 19:07:34 -0000	1.144
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -16,7 +16,7 @@
 Patch1:  amarok-2.0.1.1-gcc44.patch
 
 # qtscriptgenerator review, http://bugzilla.redhat.com/489550
-#define no_qtscriptgenerator 1
+%define no_qtscriptgenerator 1
 Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
 
 Patch100: amarok-2.0.1.1-qt45.patch
@@ -48,9 +48,6 @@
 Requires: qtscriptgenerator
 %endif
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -72,9 +69,9 @@
 
 %patch1 -p1 -b .gcc4
 
-%if 0%{?no_qscriptgenerator}
+%if 0%{?no_qtscriptgenerator}
 %patch2 -p1 -b .no_qtscriptgenerator
-#rm -rf src/scriptengine/generator
+rm -rf src/scriptengine/generator
 %else
 %{?_qt45:%patch100 -p0 -b .qt45}
 %endif
@@ -117,13 +114,19 @@
 
 %post
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files -f amarok.lang
@@ -151,6 +154,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
+- enable external qtscriptgenerator/qtscriptbindings
+- optimize scriptlets
+
 * Tue Mar 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
 - Req: qtscriptgenerator (f11+) (not enabled, pending review)
 - use desktop-file-validate



From linville at fedoraproject.org  Tue Apr  7 19:09:17 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue,  7 Apr 2009 19:09:17 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-iwlwifi-remove-implicit-direct-scan.patch,
	NONE, 1.1.2.1 kernel.spec, 1.891.2.42, 1.891.2.43
Message-ID: <20090407190917.D259170100@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31105

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-iwlwifi-remove-implicit-direct-scan.patch 
Log Message:


linux-2.6-iwlwifi-remove-implicit-direct-scan.patch:

--- NEW FILE linux-2.6-iwlwifi-remove-implicit-direct-scan.patch ---
Back-port of the following upstream commit...

commit a57a59f247b651e8ed6d3eeb7e2f9d83b83134c9
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Tue Oct 28 18:21:05 2008 +0100

    iwlwifi: remove implicit direct scan

    When an undirected scan is requested and iwlwifi is not associated but
    the user has set an SSID (and maybe was associated with that network at
    some point) then iwlwifi will assume the user wanted to scan for this
    SSID which seems wrong. Remove this code.

    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-07 14:34:39.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-07 14:43:08.000000000 -0400
@@ -6202,14 +6202,6 @@ static void iwl3945_bg_request_scan(stru
 		memcpy(scan->direct_scan[0].ssid,
 		       priv->direct_ssid, priv->direct_ssid_len);
 		direct_mask = 1;
-	} else if (!iwl3945_is_associated(priv) && priv->essid_len) {
-		IWL_DEBUG_SCAN
-		  ("Kicking off one direct scan for '%s' when not associated\n",
-		   iwl3945_escape_essid(priv->essid, priv->essid_len));
-		scan->direct_scan[0].id = WLAN_EID_SSID;
-		scan->direct_scan[0].len = priv->essid_len;
-		memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
-		direct_mask = 1;
 	} else {
 		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");
 		direct_mask = 0;
diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c.orig	2009-04-07 14:34:27.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c	2009-04-07 14:42:12.000000000 -0400
@@ -804,13 +804,6 @@ static void iwl_bg_request_scan(struct w
 		memcpy(scan->direct_scan[0].ssid,
 		       priv->direct_ssid, priv->direct_ssid_len);
 		n_probes++;
-	} else if (!iwl_is_associated(priv) && priv->essid_len) {
-		IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",
-				iwl_escape_essid(priv->essid, priv->essid_len));
-		scan->direct_scan[0].id = WLAN_EID_SSID;
-		scan->direct_scan[0].len = priv->essid_len;
-		memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
-		n_probes++;
 	} else {
 		IWL_DEBUG_SCAN("Start indirect scan.\n");
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.42
retrieving revision 1.891.2.43
diff -u -r1.891.2.42 -r1.891.2.43
--- kernel.spec	26 Mar 2009 21:41:33 -0000	1.891.2.42
+++ kernel.spec	7 Apr 2009 19:08:47 -0000	1.891.2.43
@@ -682,6 +682,7 @@
 Patch685: linux-2.6-wireless-ath9k-dma-fixes.patch
 Patch686: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch687: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch689: linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1275,6 +1276,9 @@
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 
+# iwlwifi: remove implicit direct scan
+ApplyPatch linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1946,6 +1950,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.43
+- iwlwifi: remove implicit direct scan
+
 * Thu Mar 26 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.42
 - Next round of ext4 fixes for -stable.
 



From tuxbrewr at fedoraproject.org  Tue Apr  7 19:10:46 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue,  7 Apr 2009 19:10:46 +0000 (UTC)
Subject: rpms/tripwire/F-10 tripwire.spec,1.16,1.17 twpol.txt.in,1.4,1.5
Message-ID: <20090407191046.680BD70100@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/tripwire/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31403

Modified Files:
	tripwire.spec twpol.txt.in 
Log Message:
Added support for /usr/lib64 & /usr/local/lib64


Index: tripwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/F-10/tripwire.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tripwire.spec	8 Sep 2008 21:49:08 -0000	1.16
+++ tripwire.spec	7 Apr 2009 19:10:16 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:		tripwire
 Version:	2.4.1.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	IDS (Intrusion Detection System)
 
 License:	GPLv2+
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 2.4.1.2-7
+- Added support for /usr/lib64 & /usr/local/lib64
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.1.2-6
 - fix license tag
 


Index: twpol.txt.in
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/F-10/twpol.txt.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- twpol.txt.in	22 Dec 2006 04:47:55 -0000	1.4
+++ twpol.txt.in	7 Apr 2009 19:10:16 -0000	1.5
@@ -725,6 +725,8 @@
 {
   /usr/lib                             -> $(SEC_BIN) ;
   /usr/local/lib                       -> $(SEC_BIN) ;
+  /usr/lib64                           -> $(SEC_BIN) ;
+  /usr/local/lib64                     -> $(SEC_BIN) ; 
 }
 
 



From pkgdb at fedoraproject.org  Tue Apr  7 19:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:13:44 +0000
Subject: [pkgdb] zabbix: scop has requested watchbugzilla
Message-ID: <20090407191346.6819B10F874@bastion2.fedora.phx.redhat.com>

scop has requested the watchbugzilla acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Tue Apr  7 19:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:14:37 +0000
Subject: [pkgdb] zabbix: scop has requested commit
Message-ID: <20090407191351.C9B5F10F882@bastion2.fedora.phx.redhat.com>

scop has requested the commit acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Tue Apr  7 19:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:13:52 +0000
Subject: [pkgdb] zabbix: scop has requested watchcommits
Message-ID: <20090407191354.159BB10F889@bastion2.fedora.phx.redhat.com>

scop has requested the watchcommits acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Tue Apr  7 19:15:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:15:06 +0000
Subject: [pkgdb] mkinitrd: rbala84 has requested watchbugzilla
Message-ID: <20090407191419.4C15510F870@bastion2.fedora.phx.redhat.com>

rbala84 has requested the watchbugzilla acl on mkinitrd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Tue Apr  7 19:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:15:09 +0000
Subject: [pkgdb] mkinitrd: rbala84 has requested watchcommits
Message-ID: <20090407191423.142E810F87F@bastion2.fedora.phx.redhat.com>

rbala84 has requested the watchcommits acl on mkinitrd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Tue Apr  7 19:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:15:34 +0000
Subject: [pkgdb] mkinitrd: rbala84 has requested watchbugzilla
Message-ID: <20090407191447.1B79210F882@bastion2.fedora.phx.redhat.com>

rbala84 has requested the watchbugzilla acl on mkinitrd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Tue Apr  7 19:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:14:47 +0000
Subject: [pkgdb] mkinitrd: rbala84 has requested watchcommits
Message-ID: <20090407191449.5F54710F893@bastion2.fedora.phx.redhat.com>

rbala84 has requested the watchcommits acl on mkinitrd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Tue Apr  7 19:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:16:46 +0000
Subject: [pkgdb] zabbix had acl change status
Message-ID: <20090407191601.B811610F87C@bastion2.fedora.phx.redhat.com>

jcollie has set the watchbugzilla acl on zabbix (Fedora devel) to Approved for scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Tue Apr  7 19:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:16:50 +0000
Subject: [pkgdb] zabbix had acl change status
Message-ID: <20090407191602.D3CD810F87E@bastion2.fedora.phx.redhat.com>

jcollie has set the watchcommits acl on zabbix (Fedora devel) to Approved for scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Tue Apr  7 19:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 19:16:52 +0000
Subject: [pkgdb] zabbix had acl change status
Message-ID: <20090407191606.28AFF10F892@bastion2.fedora.phx.redhat.com>

jcollie has set the commit acl on zabbix (Fedora devel) to Approved for scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From vpv at fedoraproject.org  Tue Apr  7 19:26:29 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue,  7 Apr 2009 19:26:29 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel malaga-suomi-voikko.spec,1.9,1.10
Message-ID: <20090407192629.6D40D70100@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3776

Modified Files:
	malaga-suomi-voikko.spec 
Log Message:
* Mon Mar 06 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.3-10
- Install data files into the new location expected by libvoikko 2.1
- Bump Release to 10 to differentiate this from earlier packages,
  this release or higher needs to be required by the libvoikko 2.1 package



Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- malaga-suomi-voikko.spec	5 Mar 2009 17:40:57 -0000	1.9
+++ malaga-suomi-voikko.spec	7 Apr 2009 19:25:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           malaga-suomi-voikko
 Version:        1.3
-Release:        1%{?dist}
+Release:        10%{?dist}
 Summary:        A description of Finnish morphology written in Malaga (Voikko edition)
 
 Group:          Applications/Text
@@ -37,7 +37,7 @@
 # Files differ on big-endian and small-endian archs, and they have different
 # names (*_l vs *_b). This is the reason we use %{_libdir} instead of
 # %{_datadir} and won't noarch the package.
-make voikko-install DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko
+make voikko-install DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko/1/mor-standard
 
 
 %clean
@@ -51,6 +51,11 @@
 
 
 %changelog
+* Mon Mar 06 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.3-10
+- Install data files into the new location expected by libvoikko 2.1
+- Bump Release to 10 to differentiate this from earlier packages,
+  this release or higher needs to be required by the libvoikko 2.1 package
+
 * Thu Mar 05 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.3-1
 - Suomi-malaga 1.3
 



From vpv at fedoraproject.org  Tue Apr  7 19:31:18 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue,  7 Apr 2009 19:31:18 +0000 (UTC)
Subject: rpms/libvoikko/devel .cvsignore, 1.11, 1.12 libvoikko.spec, 1.19,
	1.20 sources, 1.11, 1.12
Message-ID: <20090407193118.0B21170100@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5291

Modified Files:
	.cvsignore libvoikko.spec sources 
Log Message:
* Mon Apr 6 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.2.rc2
- New release candidate
- Both patches applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2008 18:10:19 -0000	1.11
+++ .cvsignore	7 Apr 2009 19:30:47 -0000	1.12
@@ -1 +1 @@
-libvoikko-2.0.tar.gz
+libvoikko-2.1rc2.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libvoikko.spec	25 Feb 2009 19:51:59 -0000	1.19
+++ libvoikko.spec	7 Apr 2009 19:30:47 -0000	1.20
@@ -1,19 +1,20 @@
 Name:           libvoikko
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.1
+Release:        0.2.rc2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
-Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-#Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  malaga-devel >= 7.8
-Requires:       malaga-suomi-voikko >= 0.7.3
+BuildRequires:  malaga-devel >= 7.8 python
+# Needed for the new dictionary directory layout
+Requires:       malaga-suomi-voikko >= 1.3-10
 
 %description
 This is libvoikko, library for spellcheckers and hyphenators using Malaga
@@ -95,6 +96,19 @@
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Mon Apr 6 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.2.rc2
+- New release candidate
+- Both patches applied upstream
+
+* Mon Apr 6 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.1.rc1
+- New release candidate
+- Improvements on grammar checking and dictionary loading
+- Raise malaga-suomi-voikko dependency to 1.3-10, which has the new dictionary
+  data directory layout needed by this version of libvoikko
+- Add BuildRequires python for running the trie compiler during build
+- Add patch for GCC 4.4 and glibc 2.90 compliance
+- Add patch to fix warn_unused_result errors
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2008 18:10:19 -0000	1.11
+++ sources	7 Apr 2009 19:30:47 -0000	1.12
@@ -1 +1 @@
-156dad1837c547d5cad078c4d7d9a1a1  libvoikko-2.0.tar.gz
+4fc9aaf66891a1f5ec1ada65d558fb21  libvoikko-2.1rc2.tar.gz



From vpv at fedoraproject.org  Tue Apr  7 19:35:13 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue,  7 Apr 2009 19:35:13 +0000 (UTC)
Subject: rpms/openoffice.org-voikko/devel .cvsignore, 1.8,
	1.9 openoffice.org-voikko.spec, 1.18, 1.19 sources, 1.8, 1.9
Message-ID: <20090407193513.D915B70100@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6550

Modified Files:
	.cvsignore openoffice.org-voikko.spec sources 
Log Message:
* Mon Apr 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-0.1.rc1
- New release candidate
- Grammar checking enabled



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Jan 2009 16:13:16 -0000	1.8
+++ .cvsignore	7 Apr 2009 19:34:43 -0000	1.9
@@ -1 +1 @@
-openoffice.org-voikko-3.0.1.tar.gz
+openoffice.org-voikko-3.1rc1.tar.gz


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openoffice.org-voikko.spec	26 Feb 2009 08:42:12 -0000	1.18
+++ openoffice.org-voikko.spec	7 Apr 2009 19:34:43 -0000	1.19
@@ -1,26 +1,26 @@
 Name:           openoffice.org-voikko
-Version:        3.0.1 
-Release:        3%{?dist}
+Version:        3.1 
+Release:        0.1.rc1%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
-Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-#Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    openoffice.org-sdk >= 1:3.1.0
-BuildRequires:    libvoikko-devel >= 2.0
+BuildRequires:    libvoikko-devel >= 2.1
 Requires(pre):    openoffice.org-core >= 1:3.1.0
 Requires(post):   openoffice.org-core >= 1:3.1.0
 Requires(preun):  openoffice.org-core >= 1:3.1.0
 Requires(postun): openoffice.org-core >= 1:3.1.0
 # Rpmbuild only detects libvoikko.so.1 automatically, which is
 # too general for openoffice.org-voikko.
-Requires:         libvoikko >= 2.0
+Requires:         libvoikko >= 2.1
 
 %define ooo_sdk %{_libdir}/openoffice.org/basis3.1/sdk
 %define ooo %{_libdir}/openoffice.org
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Mon Apr 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-0.1.rc1
+- New release candidate
+- Grammar checking enabled
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Jan 2009 16:13:16 -0000	1.8
+++ sources	7 Apr 2009 19:34:43 -0000	1.9
@@ -1 +1 @@
-327a3fbc5712ed28550319e93fa0a35e  openoffice.org-voikko-3.0.1.tar.gz
+34567b18f75ffe29cf89e1249fd56359  openoffice.org-voikko-3.1rc1.tar.gz



From thm at fedoraproject.org  Tue Apr  7 19:37:33 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue,  7 Apr 2009 19:37:33 +0000 (UTC)
Subject: rpms/waf/devel waf-1.5.4-libdir.patch, NONE, 1.1 .cvsignore, 1.10, 
	1.11 import.log, 1.5, 1.6 sources, 1.10, 1.11 waf.spec, 1.13,
	1.14 waf-1.5.2-libdir.patch, 1.1, NONE
Message-ID: <20090407193733.3A71270100@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7366/devel

Modified Files:
	.cvsignore import.log sources waf.spec 
Added Files:
	waf-1.5.4-libdir.patch 
Removed Files:
	waf-1.5.2-libdir.patch 
Log Message:
Update to 1.5.4.

waf-1.5.4-libdir.patch:

--- NEW FILE waf-1.5.4-libdir.patch ---
diff -up waf-1.5.4/waf-light.orig waf-1.5.4/waf-light
--- waf-1.5.4/waf-light.orig	2009-04-07 20:34:22.000000000 +0200
+++ waf-1.5.4/waf-light	2009-04-07 21:29:53.000000000 +0200
@@ -117,7 +117,7 @@ def find_lib():
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
+	dir = "/share/waf/"
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
diff -up waf-1.5.4/wscript.orig waf-1.5.4/wscript
--- waf-1.5.4/wscript.orig	2009-04-07 20:34:22.000000000 +0200
+++ waf-1.5.4/wscript	2009-04-07 21:28:26.000000000 +0200
@@ -314,7 +314,7 @@ def build(bld):
 		if val != True and val != "y": sys.exit(1)
 		create_waf()
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+	dir = os.path.join('share', 'waf', 'wafadmin')
 
 	wafadmin = bld.new_task_gen('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Feb 2009 20:57:04 -0000	1.10
+++ .cvsignore	7 Apr 2009 19:37:02 -0000	1.11
@@ -1 +1 @@
-waf-1.5.3.stripped.tar.bz2
+waf-1.5.4.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	2 Feb 2009 20:57:04 -0000	1.5
+++ import.log	7 Apr 2009 19:37:02 -0000	1.6
@@ -3,3 +3,4 @@
 waf-1_5_2-1_fc10:HEAD:waf-1.5.2-1.fc10.src.rpm:1232126058
 waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.src.rpm:1232128440
 waf-1_5_3-1_fc10:HEAD:waf-1.5.3-1.fc10.src.rpm:1233608182
+waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Feb 2009 20:57:04 -0000	1.10
+++ sources	7 Apr 2009 19:37:02 -0000	1.11
@@ -1 +1 @@
-423c8b5919bcb0cbee0edc993d694dcc  waf-1.5.3.stripped.tar.bz2
+35ba50ea6bdcb711d48d1c8842da1750  waf-1.5.4.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- waf.spec	25 Feb 2009 18:04:56 -0000	1.13
+++ waf.spec	7 Apr 2009 19:37:02 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           waf
-Version:        1.5.3
-Release:        2%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -12,7 +12,7 @@
 # allowed in Fedora.
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.5.2-libdir.patch
+Patch0:         waf-1.5.4-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.4-1
+- Update to 1.5.4.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- waf-1.5.2-libdir.patch DELETED ---



From mbroz at fedoraproject.org  Tue Apr  7 19:39:57 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Tue,  7 Apr 2009 19:39:57 +0000 (UTC)
Subject: rpms/device-mapper-multipath/devel fix_umask.patch, NONE,
	1.1 device-mapper-multipath.spec, 1.54, 1.55
Message-ID: <20090407193957.C089E70100@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/device-mapper-multipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8218

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	fix_umask.patch 
Log Message:
Fix insecure permissions on multipathd.sock (CVE-2009-0115)



fix_umask.patch:

--- NEW FILE fix_umask.patch ---
--- multipath-tools.old/multipathd/main.c	2009-04-02 12:22:37.000000000 +0200
+++ multipath-tools/multipathd/main.c	2009-04-02 12:25:13.000000000 +0200
@@ -718,6 +718,7 @@ uxlsnrloop (void * ap)
 	set_handler_callback(REINSTATE+PATH, cli_reinstate);
 	set_handler_callback(FAIL+PATH, cli_fail);
 
+	umask(077);
 	uxsock_listen(&uxsock_trigger, ap);
 
 	return NULL;
@@ -1436,7 +1437,6 @@ daemonize(void)
 	close(in_fd);
 	close(out_fd);
 	chdir("/");
-	umask(0);
 	return 0;
 }


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- device-mapper-multipath.spec	6 Mar 2009 12:53:14 -0000	1.54
+++ device-mapper-multipath.spec	7 Apr 2009 19:39:27 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -20,6 +20,7 @@
 Patch11: directio_message_cleanup.patch
 Patch12: binding_error.patch
 Patch13: fix_kpartx.patch
+Patch14: fix_umask.patch
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -60,6 +61,7 @@
 %patch11 -p1 -b .directio_message
 %patch12 -p1 -b .binding_error
 %patch13 -p1 -b .ext_part
+%patch14 -p1 -b .umask
 
 %build
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
@@ -111,6 +113,9 @@
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Apr 7 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-10
+- Fix insecure permissions on multipathd.sock (CVE-2009-0115)
+
 * Fri Mar 6 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-9
 - Fix kpartx extended partition handling (475283)
 



From kanarip at fedoraproject.org  Tue Apr  7 19:46:59 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue,  7 Apr 2009 19:46:59 +0000 (UTC)
Subject: rpms/revisor/F-10 .cvsignore, 1.23, 1.24 import.log, 1.6,
	1.7 revisor.spec, 1.45, 1.46 sources, 1.48, 1.49
Message-ID: <20090407194659.1BDFF70100@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10238/F-10

Modified Files:
	.cvsignore import.log revisor.spec sources 
Log Message:
2.1.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	2 Dec 2008 00:03:08 -0000	1.23
+++ .cvsignore	7 Apr 2009 19:46:28 -0000	1.24
@@ -1 +1 @@
-revisor-2.1.3.tar.gz
+revisor-2.1.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Dec 2008 00:03:08 -0000	1.6
+++ import.log	7 Apr 2009 19:46:28 -0000	1.7
@@ -4,3 +4,4 @@
 revisor-2_1_2-1_fc9:HEAD:revisor-2.1.2-1.fc9.src.rpm:1223231043
 revisor-2_1_2-2_fc9:HEAD:revisor-2.1.2-2.fc9.src.rpm:1223231463
 revisor-2_1_3-1_fc10:F-10:revisor-2.1.3-1.fc10.src.rpm:1228176166
+revisor-2_1_4-1_fc11:F-10:revisor-2.1.4-1.fc11.src.rpm:1239133571


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-10/revisor.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- revisor.spec	2 Dec 2008 00:03:08 -0000	1.45
+++ revisor.spec	7 Apr 2009 19:46:28 -0000	1.46
@@ -2,9 +2,12 @@
 
 %define pkg_cobbler 1
 %define pkg_comps 1
+%define pkg_composer 0
 %define pkg_delta 0
+%define pkg_hub 0
 %define pkg_isolinux 1
 %define pkg_jigdo 0
+%define pkg_mock 1
 %define pkg_rebrand 0
 %define pkg_reuseinstaller 1
 %define pkg_server 0
@@ -14,7 +17,7 @@
 
 Summary:        Fedora "Spin" Graphical User Interface
 Name:           revisor
-Version:        2.1.3
+Version:        2.1.4
 Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/System
@@ -68,15 +71,24 @@
 %if ! %{pkg_cobbler}
 Obsoletes:       revisor-cobbler
 %endif
+%if ! %{pkg_composer}
+Obsoletes:       revisor-composer
+%endif
 %if ! %{pkg_delta}
 Obsoletes:       revisor-delta
 %endif
+%if ! %{pkg_hub}
+Obsoletes:       revisor-hub
+%endif
 %if ! %{pkg_isolinux}
 Obsoletes:       revisor-isolinux
 %endif
 %if ! %{pkg_jigdo}
 Obsoletes:       revisor-jigdo
 %endif
+%if ! %{pkg_mock}
+Obsoletes:       revisor-mock
+%endif
 %if ! %{pkg_rebrand}
 Obsoletes:       revisor-rebrand
 %endif
@@ -131,6 +143,19 @@
 %endif
 
 ##
+## Revisor Composer plugin
+##
+%if %{pkg_composer}
+%package composer
+Summary:    Revisor Composer, for use with the Hub
+Group:      Applications/System
+Requires:   revisor-cli = %{version}-%{release}
+
+%description composer
+Revisor build farms need Composers. This is it.
+%endif
+
+##
 ## Revisor DeltaRPM/DeltaISO plugin
 ##
 %if %{pkg_delta}
@@ -156,6 +181,19 @@
 This is the Revisor GUI package
 
 ##
+## Revisor HUB plugin
+##
+%if %{pkg_hub}
+%package hub
+Summary:    Revisor Hub for build farms
+Group:      Applications/System
+Requires:   revisor-cli = %{version}-%{release}
+
+%description hub
+Revisor build farms need a Hub. This is it.
+%endif
+
+##
 ## Revisor customize isolinux.cfg
 ##
 %if %{pkg_isolinux}
@@ -182,6 +220,19 @@
 %endif
 
 ##
+## Revisor Mock integration
+##
+%if %{pkg_mock}
+%package mock
+Summary:    Revisor Integration with Mock
+Group:      Applications/System
+Requires:   mock, revisor-cli = %{version}-%{release}
+
+%description mock
+Revisor Integration with Mock for building the installer images
+%endif
+
+##
 ## Revisor Rebranding plugin
 ##
 %if %{pkg_rebrand}
@@ -280,14 +331,18 @@
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
 %endif
 
-%if ! %{pkg_cobbler}
-    rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
+%if ! %{pkg_composer}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modcomposer
 %endif
 
 %if ! %{pkg_delta}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
 %endif
 
+%if ! %{pkg_hub}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modhub
+%endif
+
 %if ! %{pkg_isolinux}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modisolinux
 %endif
@@ -296,6 +351,10 @@
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
 %endif
 
+%if ! %{pkg_mock}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modmock
+%endif
+
 %if ! %{pkg_rebrand}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modrebrand
 %endif
@@ -329,6 +388,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(-,root,root,-)
 
 %files cli
 %defattr(-,root,root,-)
@@ -342,8 +402,8 @@
 %{python_sitelib}/revisor/*.pyo
 %{_bindir}/*
 %{_sbindir}/*
-%dir %{_libdir}/revisor
-%dir %{_libdir}/revisor/scripts
+%dir %{_prefix}/lib/revisor
+%dir %{_prefix}/lib/revisor/scripts
 %dir %{_sysconfdir}/revisor
 %dir %{_sysconfdir}/revisor/conf.d
 %config(noreplace) %{_sysconfdir}/revisor/revisor.conf
@@ -352,10 +412,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_datadir}/locale/*/LC_MESSAGES/revisor.mo
 %defattr(0755,root,root,-)
-%{_libdir}/revisor/scripts/*
+%{_prefix}/lib/revisor/scripts/*
 
 %if %{pkg_comps}
 %files comps
+%defattr(-,root,root,-)
 %dir %{_datadir}/revisor/comps/
 %{_datadir}/revisor/comps/*
 %{_datadir}/revisor/comps-cleanup.xsl
@@ -370,6 +431,15 @@
 %{python_sitelib}/revisor/modcobbler/*.pyo
 %endif
 
+%if %{pkg_composer}
+%files composer
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modcomposer
+%{python_sitelib}/revisor/modcomposer/*.py
+%{python_sitelib}/revisor/modcomposer/*.pyc
+%{python_sitelib}/revisor/modcomposer/*.pyo
+%endif
+
 %if %{pkg_delta}
 %files delta
 %defattr(-,root,root,-)
@@ -392,6 +462,15 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
 
+%if %{pkg_hub}
+%files hub
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modhub
+%{python_sitelib}/revisor/modhub/*.py
+%{python_sitelib}/revisor/modhub/*.pyc
+%{python_sitelib}/revisor/modhub/*.pyo
+%endif
+
 %if %{pkg_isolinux}
 %files isolinux
 %defattr(-,root,root,-)
@@ -410,6 +489,15 @@
 %{python_sitelib}/revisor/modjigdo/*.pyo
 %endif
 
+%if %{pkg_mock}
+%files mock
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modmock
+%{python_sitelib}/revisor/modmock/*.py
+%{python_sitelib}/revisor/modmock/*.pyc
+%{python_sitelib}/revisor/modmock/*.pyo
+%endif
+
 %if %{pkg_rebrand}
 %files rebrand
 %defattr(-,root,root,-)
@@ -465,7 +553,14 @@
 %endif
 
 %changelog
-* Mon Dec 01 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
+* Mon Apr 06 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.4-1
+- Fix configuration file issues
+- Better estimation for the size of a tree that is to become an iso
+- Huge improvements to package ordering
+- Exclude boot.iso from installation media iso files
+
+* Thu Feb 25 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1
+- Add modmock, modhub, modcomposer
 - Rebuild for Fedora 10
 - Include modisolinux and modreuseinstaller
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Dec 2008 00:03:08 -0000	1.48
+++ sources	7 Apr 2009 19:46:28 -0000	1.49
@@ -1 +1 @@
-d90d492a216d24ac6ff53c2a18a6a69b  revisor-2.1.3.tar.gz
+c3d98ee3bd8399205e062e848c354ef2  revisor-2.1.4.tar.gz



From kaboon at fedoraproject.org  Tue Apr  7 19:48:58 2009
From: kaboon at fedoraproject.org (Eelko Berkenpies)
Date: Tue,  7 Apr 2009 19:48:58 +0000 (UTC)
Subject: rpms/taglib-extras/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 taglib-extras.spec, 1.2, 1.3
Message-ID: <20090407194858.0A29870100@cvs1.fedora.phx.redhat.com>

Author: kaboon

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10882

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
Update to taglib-extras-0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 18:02:35 -0000	1.2
+++ .cvsignore	7 Apr 2009 19:48:27 -0000	1.3
@@ -1 +1 @@
-taglib-extras-0.1.1.tar.gz
+taglib-extras-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2009 18:02:35 -0000	1.2
+++ sources	7 Apr 2009 19:48:27 -0000	1.3
@@ -1 +1 @@
-b81615dee96a374463f364c5516a8bfb  taglib-extras-0.1.1.tar.gz
+f6fdba37ffebad96d9409c30c26dd028  taglib-extras-0.1.2.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- taglib-extras.spec	26 Mar 2009 18:07:53 -0000	1.2
+++ taglib-extras.spec	7 Apr 2009 19:48:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.1
-Release:        2%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 
 Group:          Applications/Multimedia
 License:        LGPLv2
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 07 2009 Eelko Berkenpies <fedora at berkenpies.nl> - 0.1.2-1
+- taglib-extras-0.1.2
+
 * Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-2
 - enable KDE integration, -DWITH_KDE
 



From mbroz at fedoraproject.org  Tue Apr  7 19:46:37 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Tue,  7 Apr 2009 19:46:37 +0000 (UTC)
Subject: rpms/device-mapper-multipath/F-9 multipath-fix-umask.patch, NONE,
	1.1 device-mapper-multipath.spec, 1.45, 1.46
Message-ID: <20090407194637.BE61070100@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/device-mapper-multipath/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10106

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	multipath-fix-umask.patch 
Log Message:
Fix insecure permissions on multipathd.sock (CVE-2009-0115)



multipath-fix-umask.patch:

--- NEW FILE multipath-fix-umask.patch ---
--- multipath-tools.old/multipathd/main.c	2009-04-02 12:22:37.000000000 +0200
+++ multipath-tools/multipathd/main.c	2009-04-02 12:25:13.000000000 +0200
@@ -718,6 +718,7 @@ uxlsnrloop (void * ap)
 	set_handler_callback(REINSTATE+PATH, cli_reinstate);
 	set_handler_callback(FAIL+PATH, cli_fail);
 
+	umask(077);
 	uxsock_listen(&uxsock_trigger, ap);
 
 	return NULL;
@@ -1436,7 +1437,6 @@ daemonize(void)
 	close(in_fd);
 	close(out_fd);
 	chdir("/");
-	umask(0);
 	return 0;
 }


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/F-9/device-mapper-multipath.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- device-mapper-multipath.spec	23 Jun 2008 21:36:57 -0000	1.45
+++ device-mapper-multipath.spec	7 Apr 2009 19:46:07 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -9,6 +9,7 @@
 Patch0: multipath-tools-0.4.7.head2-sparc64fix.patch
 Patch1: multipath-bustosubsystem.patch
 Patch2: multipath-tools-0.4.7.head2-nostatic.patch
+Patch3: multipath-fix-umask.patch
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -38,6 +39,7 @@
 %patch0 -p1 -b .sparc64
 %patch1 -p1 -b .bustosubsystem
 %patch2 -p1 -b .nostatic
+%patch3 -p1 -b .umask
 
 %build
 make DESTDIR=$RPM_BUILD_ROOT
@@ -85,6 +87,9 @@
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Apr 7 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-17
+- Fix insecure permissions on multipathd.sock (CVE-2009-0115)
+
 * Mon Jun 23 2008 Benjamin Marzinski <bmarzins at redhat.com> -0.4.7-16
 - Fix for bz #451415
 - /sbin/multipath.static in no longer a symlink to the non-static version.



From thm at fedoraproject.org  Tue Apr  7 19:46:28 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue,  7 Apr 2009 19:46:28 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.19, 1.20 ikiwiki.spec, 1.21,
	1.22 import.log, 1.19, 1.20 sources, 1.19, 1.20
Message-ID: <20090407194628.2C46C70100@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10083/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	27 Mar 2009 20:47:02 -0000	1.19
+++ .cvsignore	7 Apr 2009 19:45:57 -0000	1.20
@@ -1 +1 @@
-ikiwiki_3.08.tar.gz
+ikiwiki_3.09.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ikiwiki.spec	27 Mar 2009 20:47:02 -0000	1.21
+++ ikiwiki.spec	7 Apr 2009 19:45:57 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.08
+Version:        3.09
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.09-1
+- Update to 3.09.
+
 * Fri Mar 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.08-1
 - Update to 3.08.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	27 Mar 2009 20:47:02 -0000	1.19
+++ import.log	7 Apr 2009 19:45:57 -0000	1.20
@@ -17,3 +17,4 @@
 ikiwiki-3_06-1_fc10:HEAD:ikiwiki-3.06-1.fc10.src.rpm:1236246745
 ikiwiki-3_07-1_fc10:HEAD:ikiwiki-3.07-1.fc10.src.rpm:1236593624
 ikiwiki-3_08-1_fc10:HEAD:ikiwiki-3.08-1.fc10.src.rpm:1238186789
+ikiwiki-3_09-1_fc10:HEAD:ikiwiki-3.09-1.fc10.src.rpm:1239133519


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	27 Mar 2009 20:47:02 -0000	1.19
+++ sources	7 Apr 2009 19:45:57 -0000	1.20
@@ -1 +1 @@
-69008333a00d5046be4e08b62c49f13a  ikiwiki_3.08.tar.gz
+d22a52c2a514a0c2147b2dcbcfa6ec12  ikiwiki_3.09.tar.gz



From mbroz at fedoraproject.org  Tue Apr  7 19:43:15 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Tue,  7 Apr 2009 19:43:15 +0000 (UTC)
Subject: rpms/device-mapper-multipath/F-10 fix_umask.patch, NONE,
	1.1 device-mapper-multipath.spec, 1.53, 1.54
Message-ID: <20090407194315.B464370100@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/device-mapper-multipath/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9165

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	fix_umask.patch 
Log Message:
Fix insecure permissions on multipathd.sock (CVE-2009-0115)



fix_umask.patch:

--- NEW FILE fix_umask.patch ---
--- multipath-tools.old/multipathd/main.c	2009-04-02 12:22:37.000000000 +0200
+++ multipath-tools/multipathd/main.c	2009-04-02 12:25:13.000000000 +0200
@@ -718,6 +718,7 @@ uxlsnrloop (void * ap)
 	set_handler_callback(REINSTATE+PATH, cli_reinstate);
 	set_handler_callback(FAIL+PATH, cli_fail);
 
+	umask(077);
 	uxsock_listen(&uxsock_trigger, ap);
 
 	return NULL;
@@ -1436,7 +1437,6 @@ daemonize(void)
 	close(in_fd);
 	close(out_fd);
 	chdir("/");
-	umask(0);
 	return 0;
 }


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/F-10/device-mapper-multipath.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- device-mapper-multipath.spec	22 Mar 2009 15:55:37 -0000	1.53
+++ device-mapper-multipath.spec	7 Apr 2009 19:42:45 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -20,6 +20,7 @@
 Patch11: directio_message_cleanup.patch
 Patch12: binding_error.patch
 Patch13: fix_kpartx.patch
+Patch14: fix_umask.patch
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -60,6 +61,7 @@
 %patch11 -p1 -b .directio_message
 %patch12 -p1 -b .binding_error
 %patch13 -p1 -b .ext_part
+%patch14 -p1 -b .umask
 
 %build
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
@@ -111,6 +113,9 @@
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Apr 7 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-9
+- Fix insecure permissions on multipathd.sock (CVE-2009-0115)
+
 * Sun Mar 22 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-8
 - Fix kpartx extended partition handling (481297)
 



From rdieter at fedoraproject.org  Tue Apr  7 20:16:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 20:16:59 +0000 (UTC)
Subject: rpms/taglib-extras/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 taglib-extras.spec, 1.1, 1.2
Message-ID: <20090407201659.669E17013D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16532

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Thu Apr 07 2009 Eelko Berkenpies <fedora at berkenpies.nl> - 0.1.2-1
- taglib-extras-0.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 18:09:13 -0000	1.2
+++ .cvsignore	7 Apr 2009 20:16:28 -0000	1.3
@@ -1 +1 @@
-taglib-extras-0.1.1.tar.gz
+taglib-extras-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2009 18:09:13 -0000	1.2
+++ sources	7 Apr 2009 20:16:28 -0000	1.3
@@ -1 +1 @@
-b81615dee96a374463f364c5516a8bfb  taglib-extras-0.1.1.tar.gz
+f6fdba37ffebad96d9409c30c26dd028  taglib-extras-0.1.2.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/taglib-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- taglib-extras.spec	24 Mar 2009 18:09:13 -0000	1.1
+++ taglib-extras.spec	7 Apr 2009 20:16:28 -0000	1.2
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 
 BuildRequires: cmake
 BuildRequires: taglib-devel
+BuildRequires: kdelibs4-devel
 
 %description
 Taglib-extras delivers support for reading and editing the meta-data of 
@@ -40,7 +41,7 @@
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}   
-%{cmake} ..            
+%{cmake} -DWITH_KDE=1 ..
 popd                        
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -74,6 +75,12 @@
 
 
 %changelog
+* Thu Apr 07 2009 Eelko Berkenpies <fedora at berkenpies.nl> - 0.1.2-1
+- taglib-extras-0.1.2
+
+* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-2
+- enable KDE integration, -DWITH_KDE
+
 * Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
 - taglib-extras-0.1.1
 



From pkgdb at fedoraproject.org  Tue Apr  7 20:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 20:29:06 +0000
Subject: [pkgdb] amarok: kaboon has requested watchbugzilla
Message-ID: <20090407202839.4CB3310FA5B@bastion2.fedora.phx.redhat.com>

kaboon has requested the watchbugzilla acl on amarok (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From lkundrak at fedoraproject.org  Tue Apr  7 20:09:49 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 20:09:49 +0000 (UTC)
Subject: rpms/saoimage/devel saoimage.spec,1.5,1.6
Message-ID: <20090407200949.9AF7D7013D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/saoimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15636

Modified Files:
	saoimage.spec 
Log Message:
* Tue Apr 7 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-6
- Fix blink crash
- Fix print crash caused by mkstemp patch
- Add a lot of missing includes, making FORTIFY_SOURCE effective



Index: saoimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- saoimage.spec	7 Apr 2009 20:07:54 -0000	1.5
+++ saoimage.spec	7 Apr 2009 20:09:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           saoimage
 Version:        1.35.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utility for displaying astronomical images
 
 Group:          Amusements/Graphics



From atkac at fedoraproject.org  Tue Apr  7 19:54:56 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  7 Apr 2009 19:54:56 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.2,1.3
Message-ID: <20090407195456.152E170137@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12212

Modified Files:
	tigervnc.spec 
Log Message:
Correct release tag.



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tigervnc.spec	3 Apr 2009 17:07:49 -0000	1.2
+++ tigervnc.spec	7 Apr 2009 19:54:25 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.3.1.%{releasetag}%{?dist}
+Release:	0.4.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops



From rdieter at fedoraproject.org  Tue Apr  7 19:54:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 19:54:22 +0000 (UTC)
Subject: rpms/koffice-langpack/devel import.log, NONE, 1.1 .cvsignore, 1.14, 
	1.15 koffice-langpack.spec, 1.19, 1.20 sources, 1.15, 1.16
Message-ID: <20090407195422.E23C570100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11991/devel

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Added Files:
	import.log 
Log Message:
import koffice(2)-langpack



--- NEW FILE import.log ---
koffice-langpack-1_9_98_6-1_fc11:HEAD:koffice-langpack-1.9.98.6-1.fc11.src.rpm:1239133218


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Mar 2009 14:30:33 -0000	1.14
+++ .cvsignore	7 Apr 2009 19:53:52 -0000	1.15
@@ -1,76 +1,20 @@
-clog
-koffice-l10n-ca-1.6.2.tar.bz2
-koffice-l10n-cs-1.6.2.tar.bz2
-koffice-l10n-cy-1.6.2.tar.bz2
-koffice-l10n-da-1.6.2.tar.bz2
-koffice-l10n-de-1.6.2.tar.bz2
-koffice-l10n-el-1.6.2.tar.bz2
-koffice-l10n-en_GB-1.6.2.tar.bz2
-koffice-l10n-es-1.6.2.tar.bz2
-koffice-l10n-et-1.6.2.tar.bz2
-koffice-l10n-eu-1.6.2.tar.bz2
-koffice-l10n-fa-1.6.2.tar.bz2
-koffice-l10n-fi-1.6.2.tar.bz2
-koffice-l10n-fr-1.6.2.tar.bz2
-koffice-l10n-ga-1.6.2.tar.bz2
-koffice-l10n-gl-1.6.2.tar.bz2
-koffice-l10n-hu-1.6.2.tar.bz2
-koffice-l10n-it-1.6.2.tar.bz2
-koffice-l10n-ja-1.6.2.tar.bz2
-koffice-l10n-km-1.6.2.tar.bz2
-koffice-l10n-lv-1.6.2.tar.bz2
-koffice-l10n-ms-1.6.2.tar.bz2
-koffice-l10n-nb-1.6.2.tar.bz2
-koffice-l10n-nl-1.6.2.tar.bz2
-koffice-l10n-pl-1.6.2.tar.bz2
-koffice-l10n-pt-1.6.2.tar.bz2
-koffice-l10n-pt_BR-1.6.2.tar.bz2
-koffice-l10n-ru-1.6.2.tar.bz2
-koffice-l10n-sk-1.6.2.tar.bz2
-koffice-l10n-sl-1.6.2.tar.bz2
-koffice-l10n-sr-1.6.2.tar.bz2
-koffice-l10n-sr at Latn-1.6.2.tar.bz2
-koffice-l10n-sv-1.6.2.tar.bz2
-koffice-l10n-tr-1.6.2.tar.bz2
-koffice-l10n-uk-1.6.2.tar.bz2
-koffice-l10n-zh_CN-1.6.2.tar.bz2
-koffice-l10n-zh_TW-1.6.2.tar.bz2
-koffice-l10n-bg-1.6.3.tar.bz2
-koffice-l10n-ca-1.6.3.tar.bz2
-koffice-l10n-cs-1.6.3.tar.bz2
-koffice-l10n-cy-1.6.3.tar.bz2
-koffice-l10n-da-1.6.3.tar.bz2
-koffice-l10n-de-1.6.3.tar.bz2
-koffice-l10n-el-1.6.3.tar.bz2
-koffice-l10n-en_GB-1.6.3.tar.bz2
-koffice-l10n-es-1.6.3.tar.bz2
-koffice-l10n-et-1.6.3.tar.bz2
-koffice-l10n-eu-1.6.3.tar.bz2
-koffice-l10n-fa-1.6.3.tar.bz2
-koffice-l10n-fi-1.6.3.tar.bz2
-koffice-l10n-fr-1.6.3.tar.bz2
-koffice-l10n-ga-1.6.3.tar.bz2
-koffice-l10n-gl-1.6.3.tar.bz2
-koffice-l10n-hu-1.6.3.tar.bz2
-koffice-l10n-it-1.6.3.tar.bz2
-koffice-l10n-ja-1.6.3.tar.bz2
-koffice-l10n-km-1.6.3.tar.bz2
-koffice-l10n-lv-1.6.3.tar.bz2
-koffice-l10n-ms-1.6.3.tar.bz2
-koffice-l10n-nb-1.6.3.tar.bz2
-koffice-l10n-nds-1.6.3.tar.bz2
-koffice-l10n-ne-1.6.3.tar.bz2
-koffice-l10n-nl-1.6.3.tar.bz2
-koffice-l10n-pl-1.6.3.tar.bz2
-koffice-l10n-pt-1.6.3.tar.bz2
-koffice-l10n-pt_BR-1.6.3.tar.bz2
-koffice-l10n-ru-1.6.3.tar.bz2
-koffice-l10n-sk-1.6.3.tar.bz2
-koffice-l10n-sl-1.6.3.tar.bz2
-koffice-l10n-sr-1.6.3.tar.bz2
-koffice-l10n-sr at Latn-1.6.3.tar.bz2
-koffice-l10n-sv-1.6.3.tar.bz2
-koffice-l10n-tr-1.6.3.tar.bz2
-koffice-l10n-uk-1.6.3.tar.bz2
-koffice-l10n-zh_CN-1.6.3.tar.bz2
-koffice-l10n-zh_TW-1.6.3.tar.bz2
+koffice-l10n-ca-1.9.98.6.tar.bz2
+koffice-l10n-de-1.9.98.6.tar.bz2
+koffice-l10n-el-1.9.98.6.tar.bz2
+koffice-l10n-et-1.9.98.6.tar.bz2
+koffice-l10n-fr-1.9.98.6.tar.bz2
+koffice-l10n-fy-1.9.98.6.tar.bz2
+koffice-l10n-gl-1.9.98.6.tar.bz2
+koffice-l10n-hi-1.9.98.6.tar.bz2
+koffice-l10n-it-1.9.98.6.tar.bz2
+koffice-l10n-ja-1.9.98.6.tar.bz2
+koffice-l10n-kk-1.9.98.6.tar.bz2
+koffice-l10n-nds-1.9.98.6.tar.bz2
+koffice-l10n-nl-1.9.98.6.tar.bz2
+koffice-l10n-pl-1.9.98.6.tar.bz2
+koffice-l10n-pt-1.9.98.6.tar.bz2
+koffice-l10n-pt_BR-1.9.98.6.tar.bz2
+koffice-l10n-sv-1.9.98.6.tar.bz2
+koffice-l10n-tr-1.9.98.6.tar.bz2
+koffice-l10n-uk-1.9.98.6.tar.bz2
+koffice-l10n-zh_TW-1.9.98.6.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- koffice-langpack.spec	19 Mar 2009 14:30:33 -0000	1.19
+++ koffice-langpack.spec	7 Apr 2009 19:53:52 -0000	1.20
@@ -1,14 +1,9 @@
 
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%else
-%define kdelibs3 kdelibs
-%endif
+%define koffice_core_version 1.9.98
 
 Name:           koffice-langpack
-Epoch:          1
-Version:        1.6.3
-Release:        3%{?dist}
+Version:        1.9.98.6
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
@@ -16,471 +11,496 @@
 URL:            http://www.koffice.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-
 # borrowed from kdelibs' tarball, help with locale=Full Name mappings
 Source0: teamnames
-Source1: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fa-%{version}.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fi-%{version}.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fr-%{version}.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hu-%{version}.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr at Latn-%{version}.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sv-%{version}.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
+#Source1: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ar-%{version}.tar.bz2
+#Source2: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
+#Source3: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
+#Source5: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
+#Source6: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
+#Source7: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
+#Source10:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
+#Source11:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eo-%{version}.tar.bz2
+#Source12:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
+#Source14:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
+#Source15:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fa-%{version}.tar.bz2
+#Source16:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fi-%{version}.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fr-%{version}.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fy-%{version}.tar.bz2
+#Source19:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
+#Source21:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-he-%{version}.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hi-%{version}.tar.bz2
+#Source23:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hu-%{version}.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-kk-%{version}.tar.bz2
+#Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
+#Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
+#Source28:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
+#Source29:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
+#Source31:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
+#Source36:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
+#Source37:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-se-%{version}.tar.bz2
+#Source38:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
+#Source39:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
+#Source39:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
+#Source40:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr at Latn-%{version}.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sv-%{version}.tar.bz2
+#Source41:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ta-%{version}.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
+#Source44:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
 
 BuildRequires:  gettext
-BuildRequires:  %{kdelibs3}-devel
+BuildRequires:  kdelibs4-devel
 BuildRequires:  libxml2
 
 %description
 Language files for koffice
 
-#%package af
-#Summary:        Afrikaans language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description af
-#Provides additional afrikaans translations for koffice
-
-#%package ar
-#Summary:        Arabic language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description ar
-#Provides additional arabic translations for koffice
-
-#%package bs
-#Summary:        Bosnian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description bs
-#Provides additional bosnian translations for koffice
-
-#%package br
-#Summary:        Breton language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description br
-#Provides additional breton translations for koffice
+%package af
+Summary:        Afrikaans language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description af
+Provides additional Afrikaans translations for koffice
+
+%package ar
+Summary:        Arabic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description ar
+Provides additional Arabic translations for koffice
+
+%package bs
+Summary:        Bosnian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description bs
+Provides additional Bosnian translations for koffice
+
+%package br
+Summary:        Breton language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description br
+Provides additional Breton translations for koffice
 
 %package bg
 Summary:        Bulgarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description bg
-Provides additional bulgarian translations for koffice
+Provides additional Bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ca
-Provides additional catalan translations for koffice
+Provides additional Catalan translations for koffice
 
 %package cs
 Summary:        Czech language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description cs
-Provides additional czech translations for koffice
+Provides additional Czech translations for koffice
 
 %package cy
 Summary:        Welsh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description cy
-Provides additional welsh translations for koffice
+Provides additional Delsh translations for koffice
 
 %package da
 Summary:        Danish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description da
-Provides additional danish translations for koffice
+Provides additional Danish translations for koffice
 
 %package de
 Summary:        German language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description de
-Provides additional german translations for koffice
+Provides additional German translations for koffice
 
-#%package eo
-#Summary:        Esperanto language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description eo
-#Provides additional esperanto translations for koffice
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description eo
+Provides additional Esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description el
-Provides additional greek translations for koffice
+Provides additional Greek translations for koffice
 
 %package en_GB
 Summary:        British English language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description en_GB
-Provides additional british english translations for koffice
+Provides additional British English translations for koffice
 
 %package es
 Summary:        Spanish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description es
-Provides additional spanish translations for koffice
+Provides additional Spanish translations for koffice
 
 %package et
 Summary:        Estonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description et
-Provides additional estonian translations for koffice
+Provides additional Estonian translations for koffice
 
 %package eu
 Summary:        Basque language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description eu
-Provides additional basque translations for koffice
+Provides additional Basque translations for koffice
 
 %package fa
 Summary:        Farsi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fa 
-Provides additional farsi translations for koffice
+Provides additional Farsi translations for koffice
 
 %package fi
 Summary:        Finish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fi
-Provides additional finish translations for koffice
+Provides additional Finish translations for koffice
 
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fr
-Provides additional french translations for koffice
+Provides additional French translations for koffice
+
+%package fy
+Summary:        Frisian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description fy
+Provides additional Frisian translations for koffice
 
 %package ga
 Summary:        Irish-Gaelic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ga
-Provides additional irish-gaelic translations for koffice
+Provides additional Irish-Gaelic translations for koffice
 
 %package gl
 Summary:        Galician language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description gl
-Provides additional galician translations for koffice
+Provides additional Galician translations for koffice
 
-#%package he
-#Summary:        Hebrew language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description he
-#Provides additional hebrew translations for koffice
-
-#%package hi
-#Summary:        Hindi language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description hi
-#Provides additional hindi translations for koffice
+%package he
+Summary:        Hebrew language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description he
+Provides additional Hebrew translations for koffice
+
+%package hi
+Summary:        Hindi language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description hi
+Provides additional Hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description hu
-Provides additional hungarian translations for koffice
+Provides additional Hungarian translations for koffice
 
-#%package is
-#Summary:        Icelandic language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description is
-#Provides additional icelandic translations for koffice
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description is
+Provides additional Icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description it
-Provides additional italian translations for koffice
+Provides additional Italian translations for koffice
 
 %package ja
 Summary:        Japanese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ja
-Provides additional japanese translations for koffice
+Provides additional Japanese translations for koffice
+
+%package kk
+Summary:        Kazakh language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description kk
+Provides additional Kazakh translations for koffice
 
 %package km
 Summary:        Khmer language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description km 
-Provides additional khmer translations for koffice
+Provides additional Khmer translations for koffice
+
+%package lt
+Summary:        Lithuanian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description lt
+Provides additional Lithuanian translations for koffice
+
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description lv
+Provides additional Lativian translations for koffice
 
-#%package lt
-#Summary:        Lithuanian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description lt
-#Provides additional lithuanian translations for koffice
-
-#%package mk
-#Summary:        Macedonian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description mk
-#Provides additional macedonian translations for koffice
+%package mk
+Summary:        Macedonian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description mk
+Provides additional Macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ms
-Provides additional malay translations for koffice
+Provides additional Malay translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nb
-Provides additional bokmal translations for koffice
+Provides additional Bokmal translations for koffice
 
 %package nds 
 Summary:        Low Saxon language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nds 
-Provides additional low saxon translations for koffice
+Provides additional Low Saxon translations for koffice
 
 %package ne
 Summary:        Nepali language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ne 
-Provides additional nepali translations for koffice
+Provides additional Nepali translations for koffice
 
 %package nl
 Summary:        Dutch language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nl
-Provides additional dutch translations for koffice
+Provides additional Dutch translations for koffice
 
-#%package nn
-#Summary:        Nynorsk language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description nn
-#Provides additional nynorsk translations for koffice
+%package nn
+Summary:        Nynorsk language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description nn
+Provides additional Nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pl
-Provides additional polish translations for koffice
+Provides additional Polish translations for koffice
 
 %package pt_BR
 Summary:        Brazilian Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pt_BR
-Provides additional brazilian portuguese translations for koffice
+Provides additional Brazilian Portuguese translations for koffice
 
 %package pt
 Summary:        Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pt
-Provides additional portuguese translations for koffice
+Provides additional Portuguese translations for koffice
 
 %package ru
 Summary:        Russian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ru
-Provides additional russian translations for koffice
+Provides additional Russian translations for koffice
 
-#%package ro
-#Summary:        Romanian language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description ro
-#Provides additional romanian translations for koffice
-
-#%package se
-#Summary:        Northern Sami language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description se
-#Provides additional northern sami translations for koffice
+%package ro
+Summary:        Romanian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description ro
+Provides additional Romanian translations for koffice
+
+%package se
+Summary:        Northern Sami language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description se
+Provides additional Northern Sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sk
-Provides additional slovak translations for koffice
+Provides additional Slovak translations for koffice
 
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sl
-Provides additional slovenian translations for koffice
+Provides additional Slovenian translations for koffice
 
 %package sr-Latn
 Summary:        Serbian in Latin language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sr-Latn
-Provides additional serbian in latin translations for koffice
+Provides additional Serbian in latin translations for koffice
 
 %package sr
 Summary:        Serbian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sr
-Provides additional serbian translations for koffice
+Provides additional Serbian translations for koffice
 
 %package sv
 Summary:        Swedish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sv
 Provides additional Swedish translations for koffice
 
-#%package ta
-#Summary:        Tamil language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description ta
-#Provides additional tamil translations for koffice
-
-#%package tg
-#Summary:        Tajik language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description tg
-#Provides additional tajik translations for koffice
+%package ta
+Summary:        Tamil language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description ta
+Provides additional Tamil translations for koffice
+
+%package tg
+Summary:        Tajik language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description tg
+Provides additional Tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description tr
-Provides additional turkish translations for koffice
+Provides additional Turkish translations for koffice
 
 %package uk
 Summary:        Ukrainian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description uk
-Provides additional ukrainian translations for koffice
+Provides additional Ukrainian translations for koffice
 
-#%package uz
-#Summary:        Uzbek language pack for koffice
-#Group:          Applications/Productivity
-#Requires:       koffice-core >= %{version}
-#%description uz
-#Provides additional uzbek translations for koffice
+%package uz
+Summary:        Uzbek language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{koffice_core_version}
+%description uz
+Provides additional Uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description zh_CN
 Provides additional simplified chinese translations for koffice
 
 %package zh_TW
 Summary:        Traditional Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description zh_TW
-Provides additional traditional chinese translations for koffice
-
-%package lv
-Summary:        Lativian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-%description lv
-Provides additional lativian translations for koffice
+Provides additional traditional Chinese translations for koffice
 
 
 %prep
-%setup -T -c -q -n %{name} -a 1  -a 2  -a 3  -a 4  -a 5  -a 6  -a 7  -a 8  -a 9  -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39
+%setup -T -c -q -n %{name} -a 4 -a 8 -a 9 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 45 
 
 
 %build
 for koffice_lang in * ; do
-  if [ -x $koffice_lang/configure ]; then
+  if [ -f $koffice_lang/CMakeLists.txt ]; then
     pushd $koffice_lang
-    %configure
-    make %{?_smp_mflags}
+     mkdir -p %{_target_platform}
+     pushd %{_target_platform}
+      %{cmake_kde4} .. 
+      make %{?_smp_mflags}
+     popd
     popd
   fi
 done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 for koffice_lang in * ; do
-  if [ -x $koffice_lang/configure ]; then
-    make -C $koffice_lang install DESTDIR=$RPM_BUILD_ROOT 
+  if [ -f $koffice_lang/CMakeLists.txt ]; then
+    make -C $koffice_lang/%{_target_platform} install/fast DESTDIR=%{buildroot} 
   fi
 done
 
-HTML_DIR=$(kde-config --expandvars --install html)
-
+%if 0
+HTML_DIR=$(kde4-config --expandvars --install html)
 # Replace absolute symlinks with relative ones
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
+if [ -d %{buildroot}$HTML_DIR ]; then
+pushd %{buildroot}%{_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
@@ -492,164 +512,193 @@
 done
 popd
 fi
-
-# remove file conflict (kdgantt.mo) with kde-i18n (kde bug #75096)
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
+%endif
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%files bg
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+#files ar 
+#lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
 
-%files ca
-%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
-%lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
-%lang(ca) %{_datadir}/doc/HTML/ca/*
+#files bg
+#lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
-%files cs
-%defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_datadir}/apps/koffice/autocorrect/cs.xml
+#files br
+#lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
 
-%files cy
-%defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%files ca
+%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
+%lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
+%lang(ca) %{_kde4_docdir}/HTML/ca/*
 
-%files da
-%defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
-%lang(da) %{_datadir}/doc/HTML/da/*
+#files cs
+#defattr(-,root,root,-)
+#lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+#lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
+
+#files cy
+#defattr(-,root,root,-)
+#lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+
+#files da
+#defattr(-,root,root,-)
+#lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+#lang(da) %{_kde4_docdir}/HTML/da/*
 
 %files de
 %defattr(-,root,root,-)
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
-%lang(de) %{_datadir}/apps/koffice/autocorrect/de.xml
-%lang(de) %{_datadir}/doc/HTML/de/*
+%lang(de) %{_kde4_appsdir}/koffice/autocorrect/de.xml
+%lang(de) %{_kde4_docdir}/HTML/de/*
 
 %files el
 %defattr(-,root,root,-)
 %lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
 
-%files en_GB
-%defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
-%lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
-
-%files es
-%defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
-%lang(es) %{_datadir}/apps/koffice/autocorrect/es.xml
-%lang(es) %{_datadir}/doc/HTML/es/*
+#files en_GB
+#defattr(-,root,root,-)
+#lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+
+#files eo
+#defattr(-,root,root,-)
+#lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+
+#files es
+#defattr(-,root,root,-)
+#lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
+#lang(es) %{_kde4_appsdir}/koffice/autocorrect/es.xml
+#lang(es) %{_kde4_docdir}/HTML/es/*
 
 %files et
 %defattr(-,root,root,-)
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
-%lang(et) %{_datadir}/doc/HTML/et/
+%lang(et) %{_kde4_docdir}/HTML/et/
 
-%files eu
-%defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
-
-%files fa 
-%defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-
-%files fi
-%defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+#files eu
+#defattr(-,root,root,-)
+#lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+
+#files fa 
+#defattr(-,root,root,-)
+#lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+
+#files fi
+#defattr(-,root,root,-)
+#lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 
 %files fr
 %defattr(-,root,root,-)
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
-%lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
-%lang(fr) %{_datadir}/doc/HTML/fr/*
+%lang(fr) %{_kde4_appsdir}/koffice/autocorrect/fr.xml
+%lang(fr) %{_kde4_docdir}/HTML/fr/*
 
-%files ga
+%files fy
 %defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+
+#files ga
+#defattr(-,root,root,-)
+#lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
 
 %files gl
 %defattr(-,root,root,-)
 %lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
-%lang(fr) %{_datadir}/doc/HTML/gl/*
+%lang(gl) %{_kde4_docdir}/HTML/gl/*
+
+#files he 
+#defattr(-,root,root,-)
+#lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 
-%files hu
+%files hi 
 %defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
-%lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+
+#files hu
+#defattr(-,root,root,-)
+#lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+#lang(hu) %{_kde4_appsdir}/koffice/autocorrect/hu.xml
 
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
-%lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
-%lang(it) %{_datadir}/doc/HTML/it/*
+%lang(it) %{_kde4_appsdir}/koffice/autocorrect/it.xml
+%lang(it) %{_kde4_docdir}/HTML/it/*
 
+%if 0
 %files lv
 %defattr(-,root,root,-)
 %lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%endif
 
 %files ja
 %defattr(-,root,root,-)
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
-%files km 
+%files kk 
 %defattr(-,root,root,-)
-%lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
+%lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
 
-%files ms
-%defattr(-,root,root,-)
-%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
-
-%files nb
-%defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+#files km 
+#defattr(-,root,root,-)
+#lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
+
+#files ms
+#defattr(-,root,root,-)
+#lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
+
+#files nb
+#defattr(-,root,root,-)
+#lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+#lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
 
 %files nds
 %defattr(-,root,root,-)
 %lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/*
+%lang(nds) %{_kde4_appsdir}/koffice/autocorrect/nds.xml
 
-%files ne
-%defattr(-,root,root,-)
-%lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
+#files ne
+#defattr(-,root,root,-)
+#lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
 
 %files nl
 %defattr(-,root,root,-)
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
-%lang(nl) %{_datadir}/doc/HTML/nl/*
+%lang(nl) %{_kde4_docdir}/HTML/nl/*
 
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
 
-%files pt_BR
-%defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
-%lang(pt_BR) %{_datadir}/doc/HTML/pt_BR/*
-
 %files pt
 %defattr(-,root,root,-)
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
-%lang(pt) %{_datadir}/doc/HTML/pt/*
+%lang(pt) %{_kde4_docdir}/HTML/pt/*
 
-%files ru
-%defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
-%lang(ru) %{_datadir}/doc/HTML/ru/*
-
-%files sk
+%files pt_BR
 %defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %{_datadir}/doc/HTML/sk/*
-%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/*
 
-%files sl
-%defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
-%lang(sl) %{_datadir}/doc/HTML/sl/*
+#files ru
+#defattr(-,root,root,-)
+#lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+#lang(ru) %{_kde4_docdir}/HTML/ru/*
+
+#files se
+#defattr(-,root,root,-)
+#lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
+
+#files sk
+#defattr(-,root,root,-)
+#lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+
+#files sl
+#defattr(-,root,root,-)
+#lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 
+%if 0
 %files sr-Latn
 %defattr(-,root,root,-)
 %lang(sr at Latn) %{_datadir}/locale/sr at Latn/LC_MESSAGES/*
@@ -657,23 +706,30 @@
 %files sr
 %defattr(-,root,root,-)
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%endif
 
 %files sv
 %defattr(-,root,root,-)
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
-%lang(sv) %{_datadir}/doc/HTML/sv/*
+%lang(sv) %{_kde4_docdir}/HTML/sv/*
+
+#files ta
+#defattr(-,root,root,-)
+#lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
 
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
 
+# FIXME: empty? -- Rex
 %files uk
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_kde4_docdir}/HTML/uk/*
 
-%files zh_CN
-%defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+#files zh_CN
+#defattr(-,root,root,-)
+#lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %files zh_TW
 %defattr(-,root,root,-)
@@ -681,8 +737,11 @@
 
 
 %changelog
-* Fri Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.1.6-3
-- revert koffice2 -> koffice1, Epoch bump
+* Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.6-1
+- koffice-l10n-1.9.98.6
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.5-1
+- koffice-l10n-1.9.98.5
 
 * Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.3-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Mar 2009 14:30:33 -0000	1.15
+++ sources	7 Apr 2009 19:53:52 -0000	1.16
@@ -1,39 +1,20 @@
-da3167fc536f51d8e32998ae203cd4b9  koffice-l10n-bg-1.6.3.tar.bz2
-5ec6aa3c1c613466a545e26bdb9dfd72  koffice-l10n-ca-1.6.3.tar.bz2
-d893774830fa05b2450018ae70fcd267  koffice-l10n-cs-1.6.3.tar.bz2
-6a100e050c3e6ae95733b24ce4d4f4cf  koffice-l10n-cy-1.6.3.tar.bz2
-fa9c878f7672d1b9881722f93a1dc1ce  koffice-l10n-da-1.6.3.tar.bz2
-9153728550bc6101094bac42aefb7663  koffice-l10n-de-1.6.3.tar.bz2
-be97b80ccaa0da028d8d04f263be5fed  koffice-l10n-el-1.6.3.tar.bz2
-468c3ac77b57de10e1cb7c99d184a443  koffice-l10n-en_GB-1.6.3.tar.bz2
-23f246f5bc86f8831e595f98c24c154e  koffice-l10n-es-1.6.3.tar.bz2
-fdc1c81ae65bec5f7e56d76bcdbaa1af  koffice-l10n-et-1.6.3.tar.bz2
-3ca81163f7242bcad450342e1105ad89  koffice-l10n-eu-1.6.3.tar.bz2
-63f5d0570660e47455e8ccd1a8c4bf02  koffice-l10n-fa-1.6.3.tar.bz2
-98b3b306061c127b92d9e73d3641f687  koffice-l10n-fi-1.6.3.tar.bz2
-01219310196ac9c8325c3d8c7456bcb3  koffice-l10n-fr-1.6.3.tar.bz2
-80f28f345dbae9b108b97701ab2a3b7b  koffice-l10n-ga-1.6.3.tar.bz2
-84b9c65886a99599d99c7ea077875a88  koffice-l10n-gl-1.6.3.tar.bz2
-088e5c503a9dedfa8d23a3fa11f596ca  koffice-l10n-hu-1.6.3.tar.bz2
-1aa3d67279e63f7c7919908c686f2281  koffice-l10n-it-1.6.3.tar.bz2
-b0d886c7504a8b0bafb5095835e78c8a  koffice-l10n-ja-1.6.3.tar.bz2
-527e698b2907f90712239681f0ae0a9e  koffice-l10n-km-1.6.3.tar.bz2
-62386e1713216bd2709e1ce3fd150c8e  koffice-l10n-lv-1.6.3.tar.bz2
-1bf2fcf2c82464e038eed026eaa13fca  koffice-l10n-ms-1.6.3.tar.bz2
-462ecb27a008482801ca3bd9e803b2d1  koffice-l10n-nb-1.6.3.tar.bz2
-50702ef6c8d586e89280a2b42d2c5225  koffice-l10n-nds-1.6.3.tar.bz2
-bd95494b15f647dfcbe39d514811504a  koffice-l10n-ne-1.6.3.tar.bz2
-a63c40510c0bb322dc1f6bb057759772  koffice-l10n-nl-1.6.3.tar.bz2
-a174b73f3e2c0e579bf3775e481958dd  koffice-l10n-pl-1.6.3.tar.bz2
-e74540534eae3d0b1cb4bbabf3da0ed0  koffice-l10n-pt-1.6.3.tar.bz2
-fe49fa2405b44044b69b5d1e2bcb15cf  koffice-l10n-pt_BR-1.6.3.tar.bz2
-e6be9bcea5e2b6e6aa4662f1530841ef  koffice-l10n-ru-1.6.3.tar.bz2
-aa49a6c5497dc201359c577ab77c8361  koffice-l10n-sk-1.6.3.tar.bz2
-18e3f2e81be91170fe551e4b47c2f907  koffice-l10n-sl-1.6.3.tar.bz2
-3eb97f2ef5f65b3637af397dca0d8fcb  koffice-l10n-sr-1.6.3.tar.bz2
-217064c12d6efe969a1bbdac2ef8aef0  koffice-l10n-sr at Latn-1.6.3.tar.bz2
-c6c530010a64fb9e2880a3f33bb9276e  koffice-l10n-sv-1.6.3.tar.bz2
-301f3a665f12d1b7f56fe9be93403812  koffice-l10n-tr-1.6.3.tar.bz2
-f8a50375d4f280131a27e0bdfb0deb83  koffice-l10n-uk-1.6.3.tar.bz2
-a21490ebc1d0beedc565c070d4bdad25  koffice-l10n-zh_CN-1.6.3.tar.bz2
-7c7c3787a45743ae9d06938829381d2e  koffice-l10n-zh_TW-1.6.3.tar.bz2
+9d073ad48e853d1fdfdc463a9321329d  koffice-l10n-ca-1.9.98.6.tar.bz2
+8a881496716b4b16c12e68068aa7af82  koffice-l10n-de-1.9.98.6.tar.bz2
+11ca0b1589a522024ab1dd60cf59d88b  koffice-l10n-el-1.9.98.6.tar.bz2
+4b4307326fe24f3473b8385378fce0d0  koffice-l10n-et-1.9.98.6.tar.bz2
+9bb171134c72ec7fe60b915cbb95eec2  koffice-l10n-fr-1.9.98.6.tar.bz2
+afd43aac05504665a874d813b642f747  koffice-l10n-fy-1.9.98.6.tar.bz2
+d468e144be415d26435b91bd4c066a88  koffice-l10n-gl-1.9.98.6.tar.bz2
+70eb8763f8e1a4e035617eeba7da43d7  koffice-l10n-hi-1.9.98.6.tar.bz2
+f2b20dda910cf8db11a07c437a7bff67  koffice-l10n-it-1.9.98.6.tar.bz2
+53ad5041c829827de72d9b57b3eb8b86  koffice-l10n-ja-1.9.98.6.tar.bz2
+f2216bac3a9d2cd4a45de531561e589f  koffice-l10n-kk-1.9.98.6.tar.bz2
+1784c29f600fc290c66aef4c8d2d30c5  koffice-l10n-nds-1.9.98.6.tar.bz2
+3d1a2787a59d9a4c0be48372ffbddbac  koffice-l10n-nl-1.9.98.6.tar.bz2
+ed3d489560d8da66561165c139813d81  koffice-l10n-pl-1.9.98.6.tar.bz2
+7c5a100daa96a7a6e37e63a1956dbf39  koffice-l10n-pt-1.9.98.6.tar.bz2
+1f378f8ef617ce91937f9377a763ad9b  koffice-l10n-pt_BR-1.9.98.6.tar.bz2
+bac4c8a87d2dca643f448faa962930dc  koffice-l10n-sv-1.9.98.6.tar.bz2
+831c6abb96eeb28dd7b704bb7589e269  koffice-l10n-tr-1.9.98.6.tar.bz2
+7d0852fe1a97def11b35d2de00601dd7  koffice-l10n-uk-1.9.98.6.tar.bz2
+bfdf9c0371edc6b4baed1f29bdf1b7d9  koffice-l10n-zh_TW-1.9.98.6.tar.bz2



From lkundrak at fedoraproject.org  Tue Apr  7 20:08:25 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  7 Apr 2009 20:08:25 +0000 (UTC)
Subject: rpms/saoimage/devel saoimage-1.35.1-bpp.patch, 1.1,
	1.2 saoimage-1.35.1-decls.patch, 1.1,
	1.2 saoimage-1.35.1-inc.patch, 1.1,
	1.2 saoimage-1.35.1-mkstemp.patch, 1.1, 1.2 saoimage.desktop,
	1.2, 1.3 saoimage.spec, 1.4, 1.5
Message-ID: <20090407200825.776967013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/saoimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15351

Modified Files:
	saoimage-1.35.1-bpp.patch saoimage-1.35.1-decls.patch 
	saoimage-1.35.1-inc.patch saoimage-1.35.1-mkstemp.patch 
	saoimage.desktop saoimage.spec 
Log Message:
* Tue Apr 7 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-6
- Fix blink crash
- Fix print crash caused by mkstemp patch
- Add a lot of missing includes, making FORTIFY_SOURCE effective


saoimage-1.35.1-bpp.patch:

Index: saoimage-1.35.1-bpp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-bpp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-bpp.patch	3 Nov 2008 22:54:31 -0000	1.1
+++ saoimage-1.35.1-bpp.patch	7 Apr 2009 20:07:54 -0000	1.2
@@ -1,6 +1,10 @@
 With depth > 16 pixels occupy more than two octets. Let XCreateImage()
 calculate it.
 
+Fix BadMatch in XCopyPlane() -- src and dest have to have the same depth.
+Heaven knows if I used the right one. I don't even know what blink is
+supposed to do, it seems to do nothing but at least it doesn't crash now :)
+
 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
 
 --- saoimage-1.35.1/wndwinit.c.bpp	2008-10-26 21:56:01.000000000 +0100
@@ -14,3 +18,15 @@
    set_window_basics(&dispbox, desktop.ID, border_pixel,
  		    (int)desktop.attrs.background_pixel, ximage);
    set_window_basics(&panbox, desktop.ID, border_pixel,
+diff -urp saoimage-1.35.1/dispblnk.c saoimage-1.35.1.fixed/dispblnk.c
+--- saoimage-1.35.1/dispblnk.c	2009-04-07 22:02:37.965188331 +0200
++++ saoimage-1.35.1.fixed/dispblnk.c	2009-04-07 22:00:33.840190477 +0200
+@@ -81,7 +81,7 @@ void save_blink ( button )
+     blink[index].depth = blink[0].depth;
+     if( (blink[index].pixmap =
+ 	 XCreatePixmap(dispbox.display, dispbox.ID, dispbox.xwidth,
+-		       dispbox.yheight, blink[index].depth)) == NULL )
++		       dispbox.yheight, dispbox.depth)) == NULL )
+       blink[index].buf = calloc_errchk(bufsz, 1, "blink");
+     blink[index].bufsz = bufsz;
+   }

saoimage-1.35.1-decls.patch:

Index: saoimage-1.35.1-decls.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-decls.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-decls.patch	3 Nov 2008 20:04:06 -0000	1.1
+++ saoimage-1.35.1-decls.patch	7 Apr 2009 20:07:54 -0000	1.2
@@ -1,5 +1,5 @@
 This is needed to get it compile on Linux with recent gcc (4.1.2).
-Needs some cleanup sho we don't have to be ashamed.
+Needs some cleanup so we don't have to be ashamed.
 
 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
 

saoimage-1.35.1-inc.patch:

Index: saoimage-1.35.1-inc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-inc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-inc.patch	3 Nov 2008 22:54:31 -0000	1.1
+++ saoimage-1.35.1-inc.patch	7 Apr 2009 20:07:54 -0000	1.2
@@ -3,104 +3,1246 @@
 
 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
 
---- saoimage-1.35.1/vms/ghstname.c.inc	2008-10-26 19:27:11.000000000 +0100
-+++ saoimage-1.35.1/vms/ghstname.c	2008-10-26 19:27:27.000000000 +0100
+diff -up saoimage-1.35.1/btnlib/attach.c.inc saoimage-1.35.1/btnlib/attach.c
+--- saoimage-1.35.1/btnlib/attach.c.inc	1990-04-20 23:47:32.000000000 +0200
++++ saoimage-1.35.1/btnlib/attach.c	2009-04-07 21:30:27.324188424 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>	/* define stderr */
++#include <string.h>
+ #include <X11/Xlib.h>	/* define Xlib types and calls (needed by Buttons.h) */
+ #include "buttons.h"
+ 
+diff -up saoimage-1.35.1/btnlib/border.c.inc saoimage-1.35.1/btnlib/border.c
+--- saoimage-1.35.1/btnlib/border.c.inc	2009-04-07 21:30:26.986188536 +0200
++++ saoimage-1.35.1/btnlib/border.c	2009-04-07 21:30:27.485188561 +0200
+@@ -21,6 +21,8 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <strings.h>
++
+ // Forward declarations
+ static unsigned char btn_ReverseByte();
+ static void btn_MakeBdrLine();
+diff -up saoimage-1.35.1/btnlib/create.c.inc saoimage-1.35.1/btnlib/create.c
+--- saoimage-1.35.1/btnlib/create.c.inc	2009-04-07 21:30:26.987188577 +0200
++++ saoimage-1.35.1/btnlib/create.c	2009-04-07 21:30:27.486189193 +0200
+@@ -23,6 +23,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>	/* define stderr */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>	/* define Xlib types and calls */
+ #include "buttons.h"
+ 
+diff -up saoimage-1.35.1/btnlib/event.c.inc saoimage-1.35.1/btnlib/event.c
+--- saoimage-1.35.1/btnlib/event.c.inc	2009-04-07 21:30:26.989188574 +0200
++++ saoimage-1.35.1/btnlib/event.c	2009-04-07 21:30:27.326189255 +0200
+@@ -26,6 +26,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>	/* define stderr, NULL */
++#include <string.h>
+ #include <sys/types.h>	/* define stderr, NULL */
+ #include <X11/Xlib.h>
+ #include "buttons.h"
+diff -up saoimage-1.35.1/btnlib/image.c.inc saoimage-1.35.1/btnlib/image.c
+--- saoimage-1.35.1/btnlib/image.c.inc	2009-04-07 21:30:26.990188697 +0200
++++ saoimage-1.35.1/btnlib/image.c	2009-04-07 21:30:27.487188902 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* define NULL */
++#include <strings.h>
+ #include <X11/Xlib.h>
+ #include "buttons.h"
+ 
+diff -up saoimage-1.35.1/btnlib/label.c.inc saoimage-1.35.1/btnlib/label.c
+--- saoimage-1.35.1/btnlib/label.c.inc	2009-04-07 21:30:26.992188695 +0200
++++ saoimage-1.35.1/btnlib/label.c	2009-04-07 21:30:27.323188993 +0200
 @@ -1,3 +1,5 @@
 +#include <string.h>
 +
- gethostname (char *node, int nodelen)
- {
- 	char	*p, tmp[32];
-@@ -9,4 +11,4 @@
- 	strncpy (node, tmp, nodelen);
- 	node[nodelen] = '\0';
- }
--               
-\ No newline at end of file
-+               
---- saoimage-1.35.1/vms/zfiovi.c.inc	2008-10-26 19:27:27.000000000 +0100
-+++ saoimage-1.35.1/vms/zfiovi.c	2008-10-26 19:27:39.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <iodef.h>	/* I/O definitions			*/
- #include <ssdef.h>	/* System status definitions		*/
- #include <syidef.h>	/* Get system info definitions		*/
+ #ifndef lint
+ static char SccsId[] = "%W%  %G%";
+ #endif
+diff -up saoimage-1.35.1/btnlib/remote.c.inc saoimage-1.35.1/btnlib/remote.c
+--- saoimage-1.35.1/btnlib/remote.c.inc	1990-04-21 00:00:09.000000000 +0200
++++ saoimage-1.35.1/btnlib/remote.c	2009-04-07 21:30:27.327188257 +0200
+@@ -27,6 +27,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>	/* get stderr */
 +#include <string.h>
+ #include <X11/Xlib.h>	/* needed by Buttons.h */
+ #include "buttons.h"
  
- #ifdef IMTOOL
- #define import_spp	/* Import the IRAF SPP constants	*/
---- saoimage-1.35.1/mainkey.c.inc	2008-10-26 19:28:12.000000000 +0100
-+++ saoimage-1.35.1/mainkey.c	2008-10-26 19:28:21.000000000 +0100
-@@ -16,6 +16,7 @@
+diff -up saoimage-1.35.1/btnlib/resize.c.inc saoimage-1.35.1/btnlib/resize.c
+--- saoimage-1.35.1/btnlib/resize.c.inc	2009-04-07 21:30:27.004188678 +0200
++++ saoimage-1.35.1/btnlib/resize.c	2009-04-07 21:30:27.542188864 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <X11/Xutil.h>
+ #include <X11/Xlib.h>
+ #include "buttons.h"
+ 
+diff -up saoimage-1.35.1/btnlib/tool/bitmap.c.inc saoimage-1.35.1/btnlib/tool/bitmap.c
+--- saoimage-1.35.1/btnlib/tool/bitmap.c.inc	1990-03-28 21:26:20.000000000 +0200
++++ saoimage-1.35.1/btnlib/tool/bitmap.c	2009-04-07 21:30:27.337191652 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #define ROW_WIDTH 12
+ 
+diff -up saoimage-1.35.1/btnlib/tool/wrattach.c.inc saoimage-1.35.1/btnlib/tool/wrattach.c
+--- saoimage-1.35.1/btnlib/tool/wrattach.c.inc	1990-04-21 00:45:55.000000000 +0200
++++ saoimage-1.35.1/btnlib/tool/wrattach.c	2009-04-07 21:30:27.338189068 +0200
+@@ -15,6 +15,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "btnmenu.h"
+ 
+ /* 
+diff -up saoimage-1.35.1/btnlib/tool/wrfeel.c.inc saoimage-1.35.1/btnlib/tool/wrfeel.c
+--- saoimage-1.35.1/btnlib/tool/wrfeel.c.inc	1990-04-21 00:47:26.000000000 +0200
++++ saoimage-1.35.1/btnlib/tool/wrfeel.c	2009-04-07 21:30:27.339189539 +0200
+@@ -15,6 +15,7 @@ static char SccsId[] = "%W%  %G%";
   */
  
  #include <stdio.h>
 +#include <string.h>
+ #include "btnmenu.h"
+ 
+ /*
+diff -up saoimage-1.35.1/btnlib/util.c.inc saoimage-1.35.1/btnlib/util.c
+--- saoimage-1.35.1/btnlib/util.c.inc	1990-04-21 00:28:44.000000000 +0200
++++ saoimage-1.35.1/btnlib/util.c	2009-04-07 21:30:27.543188841 +0200
+@@ -19,6 +19,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>	/* define stderr, NULL */
++#include <string.h>
++#include <stdlib.h>
+ 
+ /*
+  * Subroutine:	btn_Alloc
+@@ -37,7 +39,6 @@ char *btn_Alloc ( count, size, errmess )
+      char *errmess;
+ {
+   char *space;
+-  char *calloc();
+ 
+   if( (space = (char *)calloc((unsigned)count, size)) == NULL ) {
+     fputs(errmess, stderr);
+diff -up saoimage-1.35.1/clralloc.c.inc saoimage-1.35.1/clralloc.c
+--- saoimage-1.35.1/clralloc.c.inc	2009-04-07 21:30:27.015190958 +0200
++++ saoimage-1.35.1/clralloc.c	2009-04-07 21:30:27.544188953 +0200
+@@ -21,6 +21,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>			/* stderr, FILE, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* X window manager stuff */
+ #include "hfiles/define.h"		/* YES, NO, MIN, MAX and more */
+diff -up saoimage-1.35.1/clrhard.c.inc saoimage-1.35.1/clrhard.c
+--- saoimage-1.35.1/clrhard.c.inc	2009-04-07 21:30:27.018189209 +0200
++++ saoimage-1.35.1/clrhard.c	2009-04-07 21:30:27.340188610 +0200
+@@ -21,6 +21,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>			/* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* X window manager stuff */
+ // Forward declarations
+diff -up saoimage-1.35.1/clrinit.c.inc saoimage-1.35.1/clrinit.c
+--- saoimage-1.35.1/clrinit.c.inc	2009-04-07 21:30:27.019188840 +0200
++++ saoimage-1.35.1/clrinit.c	2009-04-07 21:30:27.488188957 +0200
+@@ -18,6 +18,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"	/* color structs */
+diff -up saoimage-1.35.1/clrmenu.c.inc saoimage-1.35.1/clrmenu.c
+--- saoimage-1.35.1/clrmenu.c.inc	2009-04-07 21:30:27.020187618 +0200
++++ saoimage-1.35.1/clrmenu.c	2009-04-07 21:30:27.545188226 +0200
+@@ -17,6 +17,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>			/* stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* X window manager stuff */
+ #include "hfiles/constant.h"		/* code values */
+diff -up saoimage-1.35.1/clrread.c.inc saoimage-1.35.1/clrread.c
+--- saoimage-1.35.1/clrread.c.inc	2009-04-07 21:30:27.021188175 +0200
++++ saoimage-1.35.1/clrread.c	2009-04-07 21:30:27.321188803 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <ctype.h>		/* toupper, isalpha, etc. */
+ #include "hfiles/colormap.h"	/* color table storage structs */
+ // Forward declarations
+diff -up saoimage-1.35.1/cmddisp.c.inc saoimage-1.35.1/cmddisp.c
+--- saoimage-1.35.1/cmddisp.c.inc	2000-07-28 21:38:19.000000000 +0200
++++ saoimage-1.35.1/cmddisp.c	2009-04-07 21:30:27.572188802 +0200
+@@ -42,6 +42,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include <stdlib.h>
++#include <string.h>
+ #include "hfiles/constant.h"	/* define codes */
+ #include "hfiles/struct.h"	/* declare structure types */
+ #include "hfiles/extern.h"	/* extern main ximage parameter structures */
+diff -up saoimage-1.35.1/cmdimage.c.inc saoimage-1.35.1/cmdimage.c
+--- saoimage-1.35.1/cmdimage.c.inc	1999-02-23 16:21:26.000000000 +0100
++++ saoimage-1.35.1/cmdimage.c	2009-04-07 21:30:27.669188389 +0200
+@@ -42,6 +42,8 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>
+ #endif
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <math.h>		/* for atof (see Ultrx atof man page) */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/cmdnew.c.inc saoimage-1.35.1/cmdnew.c
+--- saoimage-1.35.1/cmdnew.c.inc	2009-04-07 21:30:27.025189362 +0200
++++ saoimage-1.35.1/cmdnew.c	2009-04-07 21:30:27.574187994 +0200
+@@ -34,6 +34,8 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>
+ #endif
+ 
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define SZ_LINE, SZ_FNAME, etc */
+diff -up saoimage-1.35.1/cmdparse.c.inc saoimage-1.35.1/cmdparse.c
+--- saoimage-1.35.1/cmdparse.c.inc	2009-04-07 21:30:27.027188731 +0200
++++ saoimage-1.35.1/cmdparse.c	2009-04-07 21:30:27.570188120 +0200
+@@ -29,6 +29,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/constant.h"	/* define codes */
+diff -up saoimage-1.35.1/crdrot.c.inc saoimage-1.35.1/crdrot.c
+--- saoimage-1.35.1/crdrot.c.inc	2009-04-07 21:30:27.046189889 +0200
++++ saoimage-1.35.1/crdrot.c	2009-04-07 21:30:27.505189944 +0200
+@@ -22,6 +22,7 @@ static void mult_mtrx();
+ static void mult_mtrx();
+ static void mult_mtrx();
+ 
++#include <strings.h>
+ #include "hfiles/coord.h"	/* coord structs */
+ 
+ /*
+diff -up saoimage-1.35.1/crdset.c.inc saoimage-1.35.1/crdset.c
+--- saoimage-1.35.1/crdset.c.inc	1996-02-26 21:12:33.000000000 +0100
++++ saoimage-1.35.1/crdset.c	2009-04-07 21:30:27.506187444 +0200
+@@ -31,6 +31,8 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <strings.h>
++
+ #include "hfiles/coord.h"		/* coord structs */
+ #include "hfiles/image.h"		/* image struct */
+ 
+diff -up saoimage-1.35.1/crdsynth.c.inc saoimage-1.35.1/crdsynth.c
+--- saoimage-1.35.1/crdsynth.c.inc	2009-04-07 21:30:27.047188704 +0200
++++ saoimage-1.35.1/crdsynth.c	2009-04-07 21:30:27.344187898 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc */
++#include <string.h>
+ #include <math.h>		/* get trig functions, sqrt, and fabs */
+ #include "hfiles/coord.h"	/* coord structs */
+ 
+diff -up saoimage-1.35.1/crdtemp.c.inc saoimage-1.35.1/crdtemp.c
+--- saoimage-1.35.1/crdtemp.c.inc	2009-04-07 21:30:27.048188820 +0200
++++ saoimage-1.35.1/crdtemp.c	2009-04-07 21:30:27.671187889 +0200
+@@ -23,6 +23,9 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc */
++#include <string.h>
++#include <strings.h>
++#include <stdlib.h>
+ #include "hfiles/coord.h"	/* coord structs */
+ 
+ // Forward declarations
+diff -up saoimage-1.35.1/csrcoord.c.inc saoimage-1.35.1/csrcoord.c
+--- saoimage-1.35.1/csrcoord.c.inc	1999-05-06 21:44:16.000000000 +0200
++++ saoimage-1.35.1/csrcoord.c	2009-04-07 21:30:27.347188081 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/csrgrab.c.inc saoimage-1.35.1/csrgrab.c
+--- saoimage-1.35.1/csrgrab.c.inc	2009-04-07 21:30:27.051189089 +0200
++++ saoimage-1.35.1/csrgrab.c	2009-04-07 21:30:27.348186833 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h>		/* get trig functions and sqrt */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/csrmove.c.inc saoimage-1.35.1/csrmove.c
+--- saoimage-1.35.1/csrmove.c.inc	1991-01-04 04:41:46.000000000 +0100
++++ saoimage-1.35.1/csrmove.c	2009-04-07 21:30:27.349188459 +0200
+@@ -22,6 +22,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h>		/* get trig functions and sqrt */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/csrpoly1.c.inc saoimage-1.35.1/csrpoly1.c
+--- saoimage-1.35.1/csrpoly1.c.inc	2009-04-07 21:30:27.052186556 +0200
++++ saoimage-1.35.1/csrpoly1.c	2009-04-07 21:30:27.673189155 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"	/* cursor colors needed by Cursor.h */
+diff -up saoimage-1.35.1/csrpoly2.c.inc saoimage-1.35.1/csrpoly2.c
+--- saoimage-1.35.1/csrpoly2.c.inc	2009-04-07 21:30:27.053188359 +0200
++++ saoimage-1.35.1/csrpoly2.c	2009-04-07 21:30:27.517186797 +0200
+@@ -23,6 +23,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"	/* cursor colors needed by Cursor.h */
+diff -up saoimage-1.35.1/csrsave.c.inc saoimage-1.35.1/csrsave.c
+--- saoimage-1.35.1/csrsave.c.inc	2009-04-07 21:30:27.056185907 +0200
++++ saoimage-1.35.1/csrsave.c	2009-04-07 21:30:27.576188139 +0200
+@@ -22,6 +22,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"	/* cursor colors needed by Cursor.h */
+diff -up saoimage-1.35.1/csrshape.c.inc saoimage-1.35.1/csrshape.c
+--- saoimage-1.35.1/csrshape.c.inc	2009-04-07 21:30:27.067188500 +0200
++++ saoimage-1.35.1/csrshape.c	2009-04-07 21:30:27.352187905 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/*  stderr, NULL, etc.  */
++#include <string.h>
  #include <X11/Xlib.h>		/*  X window stuff  */
  #include <X11/Xutil.h>		/*  X window manager stuff  */
- #include <X11/keysym.h>
---- saoimage-1.35.1/ctrlfile.c.inc	2008-10-26 19:27:52.000000000 +0100
-+++ saoimage-1.35.1/ctrlfile.c	2008-10-26 19:28:03.000000000 +0100
-@@ -19,6 +19,7 @@
+ #include <math.h>		/*  sin, cos, etc */
+diff -up saoimage-1.35.1/csrtext.c.inc saoimage-1.35.1/csrtext.c
+--- saoimage-1.35.1/csrtext.c.inc	2009-04-07 21:30:27.068188423 +0200
++++ saoimage-1.35.1/csrtext.c	2009-04-07 21:30:27.587192210 +0200
+@@ -32,6 +32,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/*  strlen, strcat, strcpy, strrchr  */
+ #endif
+ 
++#include <string.h>
+ #include <stdio.h>		/*  stderr, NULL, etc.  */
+ #include <X11/Xlib.h>		/*  X window stuff  */
+ #include <X11/Xutil.h>		/*  X window manager stuff  */
+diff -up saoimage-1.35.1/ctrlcntn.c.inc saoimage-1.35.1/ctrlcntn.c
+--- saoimage-1.35.1/ctrlcntn.c.inc	2009-04-07 21:30:27.069188900 +0200
++++ saoimage-1.35.1/ctrlcntn.c	2009-04-07 21:30:27.589189270 +0200
+@@ -24,6 +24,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */ 
+ #include "hfiles/control.h"	/* declare control structure types */
+ extern struct controlRec control;
+diff -up saoimage-1.35.1/ctrldisk.c.inc saoimage-1.35.1/ctrldisk.c
+--- saoimage-1.35.1/ctrldisk.c.inc	1999-02-26 19:11:06.000000000 +0100
++++ saoimage-1.35.1/ctrldisk.c	2009-04-07 21:30:27.355187110 +0200
+@@ -30,6 +30,7 @@ static char SccsId[] = "%W%  %G%";
+ #ifndef VMS
+ 
+ #include <stdio.h>		/* define stderr, FILE, NULL, etc */
++#include <string.h>
+ #include <unistd.h>		/* define read, write, lseek */
+ #include <sys/file.h>		/* define open */
+ #include <fcntl.h>		/* define fcntl */
+diff -up saoimage-1.35.1/ctrlfile.c.inc saoimage-1.35.1/ctrlfile.c
+--- saoimage-1.35.1/ctrlfile.c.inc	2009-04-07 21:30:27.071189017 +0200
++++ saoimage-1.35.1/ctrlfile.c	2009-04-07 21:30:27.706190058 +0200
+@@ -19,7 +19,9 @@ static char SccsId[] = "%W%  %G%";
   */
  
  #include <stdio.h>		/* FILE, stderr, NULL, etc. */
 +#include <string.h>
  #include <ctype.h>		/* macros for isupper, tolower, etc */
++#include <unistd.h>
  #include <sys/types.h>		/* needed for lstat */
  #include <sys/stat.h>		/* needed for lstat, struct stat */
---- saoimage-1.35.1/imgflip.c.inc	2008-10-26 19:28:38.000000000 +0100
-+++ saoimage-1.35.1/imgflip.c	2008-10-26 19:28:50.000000000 +0100
-@@ -18,6 +18,7 @@
+ #include <errno.h>		/* ENOENT */
+diff -up saoimage-1.35.1/ctrlgc.c.inc saoimage-1.35.1/ctrlgc.c
+--- saoimage-1.35.1/ctrlgc.c.inc	2009-04-07 21:30:27.072188450 +0200
++++ saoimage-1.35.1/ctrlgc.c	2009-04-07 21:30:27.356188373 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr, NULL, etc */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define DONT_CARE, U_DONT_CARE */
+diff -up saoimage-1.35.1/ctrlmbox.c.inc saoimage-1.35.1/ctrlmbox.c
+--- saoimage-1.35.1/ctrlmbox.c.inc	1990-05-02 06:17:46.000000000 +0200
++++ saoimage-1.35.1/ctrlmbox.c	2009-04-07 21:30:27.373193185 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W%  %G%";
+ 	 */
+ 
+ #include <stdio.h>		/* define stderr, FILE, NULL, etc */
++#include <string.h>
+ #include <sys/file.h>		/* define open */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include "hfiles/control.h"	/* declare control structure types */
+diff -up saoimage-1.35.1/ctrlsckt.c.inc saoimage-1.35.1/ctrlsckt.c
+--- saoimage-1.35.1/ctrlsckt.c.inc	1995-05-04 20:34:14.000000000 +0200
++++ saoimage-1.35.1/ctrlsckt.c	2009-04-07 21:30:27.674187093 +0200
+@@ -32,6 +32,8 @@ static char SccsId[] = "%W%  %G%";
+ #include <strings.h>		/* strlen(), strcpy(), strncpy(), rindex() */
+ #endif
+ 
++#include <unistd.h>
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include "hfiles/control.h"	/* define struct connectRec */
+ 
+diff -up saoimage-1.35.1/dispblnk.c.inc saoimage-1.35.1/dispblnk.c
+--- saoimage-1.35.1/dispblnk.c.inc	2009-04-07 21:30:27.073188787 +0200
++++ saoimage-1.35.1/dispblnk.c	2009-04-07 21:30:27.591189064 +0200
+@@ -20,6 +20,9 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr, NULL */
++#include <string.h>
++#include <strings.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* get X types and constants */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/struct.h"	/* declare structure types */
+diff -up saoimage-1.35.1/dispbtmp.c.inc saoimage-1.35.1/dispbtmp.c
+--- saoimage-1.35.1/dispbtmp.c.inc	2009-04-07 21:30:27.074188597 +0200
++++ saoimage-1.35.1/dispbtmp.c	2009-04-07 21:30:27.547188987 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>			/* stderr, FILE, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* X window manager stuff */
+ #include "hfiles/constant.h"		/* define codes */
+diff -up saoimage-1.35.1/display.c.inc saoimage-1.35.1/display.c
+--- saoimage-1.35.1/display.c.inc	1998-10-13 19:22:58.000000000 +0200
++++ saoimage-1.35.1/display.c	2009-04-07 21:30:27.548188827 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <strings.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MIN, MAX, DONT_CARE, etc. */
+diff -up saoimage-1.35.1/disppsct.c.inc saoimage-1.35.1/disppsct.c
+--- saoimage-1.35.1/disppsct.c.inc	2009-04-07 21:30:27.254189962 +0200
++++ saoimage-1.35.1/disppsct.c	2009-04-07 21:30:27.676188354 +0200
+@@ -39,6 +39,9 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <unistd.h>
++#include <sys/types.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <time.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+diff -up saoimage-1.35.1/disppxmp.c.inc saoimage-1.35.1/disppxmp.c
+--- saoimage-1.35.1/disppxmp.c.inc	2000-09-13 21:34:46.000000000 +0200
++++ saoimage-1.35.1/disppxmp.c	2009-04-07 21:30:27.677187701 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
   *		{n} <who> -- <does what> -- <when>
   */
  
++#include <strings.h>
+ #include "hfiles/coord.h"
+ 
+ /*
+diff -up saoimage-1.35.1/distort.c.inc saoimage-1.35.1/distort.c
+--- saoimage-1.35.1/distort.c.inc	2003-11-18 17:45:23.000000000 +0100
++++ saoimage-1.35.1/distort.c	2009-04-07 21:30:27.689189040 +0200
+@@ -38,6 +38,8 @@
+ 
+ #include <unistd.h>
+ #include <string.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #include "wcs.h"
+ 
+ void
+diff -up saoimage-1.35.1/editctrl.c.inc saoimage-1.35.1/editctrl.c
+--- saoimage-1.35.1/editctrl.c.inc	2009-04-07 21:30:27.076187992 +0200
++++ saoimage-1.35.1/editctrl.c	2009-04-07 21:30:27.602188787 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"
+diff -up saoimage-1.35.1/editinit.c.inc saoimage-1.35.1/editinit.c
+--- saoimage-1.35.1/editinit.c.inc	1990-05-02 07:21:29.000000000 +0200
++++ saoimage-1.35.1/editinit.c	2009-04-07 21:30:27.604190685 +0200
+@@ -34,6 +34,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include "hfiles/edit.h"
+ 
+diff -up saoimage-1.35.1/editline.c.inc saoimage-1.35.1/editline.c
+--- saoimage-1.35.1/editline.c.inc	1990-05-02 07:22:30.000000000 +0200
++++ saoimage-1.35.1/editline.c	2009-04-07 21:30:27.378192353 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
 +#include <string.h>
+ #include <X11/Xlib.h>
+ #include "hfiles/edit.h"
+ 
+diff -up saoimage-1.35.1/grphbtmp.c.inc saoimage-1.35.1/grphbtmp.c
+--- saoimage-1.35.1/grphbtmp.c.inc	2009-04-07 21:30:27.078187806 +0200
++++ saoimage-1.35.1/grphbtmp.c	2009-04-07 21:30:27.550188601 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"
+diff -up saoimage-1.35.1/grphgrab.c.inc saoimage-1.35.1/grphgrab.c
+--- saoimage-1.35.1/grphgrab.c.inc	2009-04-07 21:30:27.080190169 +0200
++++ saoimage-1.35.1/grphgrab.c	2009-04-07 21:30:27.691188502 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"	/* color structs */
+diff -up saoimage-1.35.1/grphinit.c.inc saoimage-1.35.1/grphinit.c
+--- saoimage-1.35.1/grphinit.c.inc	2009-04-07 21:30:27.081188814 +0200
++++ saoimage-1.35.1/grphinit.c	2009-04-07 21:30:27.605187194 +0200
+@@ -26,6 +26,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/struct.h"	/* declare structure types */
+diff -up saoimage-1.35.1/grphlbl.c.inc saoimage-1.35.1/grphlbl.c
+--- saoimage-1.35.1/grphlbl.c.inc	1990-04-20 16:34:58.000000000 +0200
++++ saoimage-1.35.1/grphlbl.c	2009-04-07 21:30:27.399191244 +0200
+@@ -22,6 +22,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MIN, etc. */
+diff -up saoimage-1.35.1/histdist.c.inc saoimage-1.35.1/histdist.c
+--- saoimage-1.35.1/histdist.c.inc	2009-04-07 21:30:27.086188119 +0200
++++ saoimage-1.35.1/histdist.c	2009-04-07 21:30:27.401191174 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ // Forward declarations
+ static int excess_zgroup(), excess_nzgroup(), range_zgroup();
+ 
+diff -up saoimage-1.35.1/histeql.c.inc saoimage-1.35.1/histeql.c
+--- saoimage-1.35.1/histeql.c.inc	2009-04-07 21:30:27.105190669 +0200
++++ saoimage-1.35.1/histeql.c	2009-04-07 21:30:27.402190273 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ // Forward declarations
+ static int count_nonzero_histogram_entries(), rescan_histogram();
+ static void unmark_peak_links();
+diff -up saoimage-1.35.1/histlist.c.inc saoimage-1.35.1/histlist.c
+--- saoimage-1.35.1/histlist.c.inc	2009-04-07 21:30:27.106189320 +0200
++++ saoimage-1.35.1/histlist.c	2009-04-07 21:30:27.403187838 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "hfiles/histeq.h"		/* define SubrangeList */
+ 
+ #define MAXITERATIONS 1000 /* --jrw */
+diff -up saoimage-1.35.1/histmap.c.inc saoimage-1.35.1/histmap.c
+--- saoimage-1.35.1/histmap.c.inc	2009-04-07 21:30:27.115191774 +0200
++++ saoimage-1.35.1/histmap.c	2009-04-07 21:30:27.606187725 +0200
+@@ -15,6 +15,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ // Forward declarations
+ static void make_subrange_scalemap();
+ static void make_gapped_list(), list_to_map();
+diff -up saoimage-1.35.1/histzero.c.inc saoimage-1.35.1/histzero.c
+--- saoimage-1.35.1/histzero.c.inc	2009-04-07 21:30:27.118192953 +0200
++++ saoimage-1.35.1/histzero.c	2009-04-07 21:30:27.618195064 +0200
+@@ -15,6 +15,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ // Forward declarations
+ static void merge_links();
+ 
+diff -up saoimage-1.35.1/imgcheck.c.inc saoimage-1.35.1/imgcheck.c
+--- saoimage-1.35.1/imgcheck.c.inc	2009-04-07 21:30:27.119189751 +0200
++++ saoimage-1.35.1/imgcheck.c	2009-04-07 21:30:27.620189849 +0200
+@@ -37,6 +37,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>
+ #endif
+ 
++#include <string.h>
+ #include "hfiles/constant.h"		/* define codes */
+ #include "hfiles/image.h"
+ // Forward declarations
+diff -up saoimage-1.35.1/imgflip.c.inc saoimage-1.35.1/imgflip.c
+--- saoimage-1.35.1/imgflip.c.inc	1991-01-08 02:11:30.000000000 +0100
++++ saoimage-1.35.1/imgflip.c	2009-04-07 21:30:27.621186999 +0200
+@@ -18,6 +18,9 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <string.h>
++#include <strings.h>
++#include <stdlib.h>
  
  /*  Subroutine:	xflip_buf
   *  Purpose:	Flip buf to make Y coordinates run in opposite direction
---- saoimage-1.35.1/irafimtl.c.inc	2008-10-26 19:28:21.000000000 +0100
-+++ saoimage-1.35.1/irafimtl.c	2008-10-26 19:28:38.000000000 +0100
-@@ -26,6 +26,7 @@
+diff -up saoimage-1.35.1/imgnew.c.inc saoimage-1.35.1/imgnew.c
+--- saoimage-1.35.1/imgnew.c.inc	2009-04-07 21:30:27.123188365 +0200
++++ saoimage-1.35.1/imgnew.c	2009-04-07 21:30:27.623190242 +0200
+@@ -26,6 +26,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <stdlib.h>
+ 
+ #ifndef VMS
+ #ifdef SYSV
+@@ -39,6 +40,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define SZ_FNAME */
+diff -up saoimage-1.35.1/imgread.c.inc saoimage-1.35.1/imgread.c
+--- saoimage-1.35.1/imgread.c.inc	1992-04-24 01:26:55.000000000 +0200
++++ saoimage-1.35.1/imgread.c	2009-04-07 21:30:27.407186628 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>			/* stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* X window manager stuff */
+ #include "hfiles/constant.h"		/* constants and codes */
+diff -up saoimage-1.35.1/imgrot.c.inc saoimage-1.35.1/imgrot.c
+--- saoimage-1.35.1/imgrot.c.inc	1991-01-07 21:50:59.000000000 +0100
++++ saoimage-1.35.1/imgrot.c	2009-04-07 21:30:27.624187028 +0200
+@@ -16,6 +16,9 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <strings.h>
++#include <stdlib.h>
++
+ /*
+  * Subroutine:	cwturn_buf
+  * Purpose:	Rotate a square buffer 90 degrees clockwise
+diff -up saoimage-1.35.1/imgtrans.c.inc saoimage-1.35.1/imgtrans.c
+--- saoimage-1.35.1/imgtrans.c.inc	2009-04-07 21:30:27.124188121 +0200
++++ saoimage-1.35.1/imgtrans.c	2009-04-07 21:30:27.523188200 +0200
+@@ -16,6 +16,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* define stderr */
++#include <string.h>
++#include <strings.h>
+ // Forward declarations
+ static void square_buf(), unsquare_buf();
+ 
+diff -up saoimage-1.35.1/irafcrd.c.inc saoimage-1.35.1/irafcrd.c
+--- saoimage-1.35.1/irafcrd.c.inc	2009-04-07 21:30:27.125188232 +0200
++++ saoimage-1.35.1/irafcrd.c	2009-04-07 21:30:27.707187737 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <stdlib.h>
+ #include <ctype.h>              /* isspace */
+ #include <X11/Xlib.h>		/* get X types and constants */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/irafdisp.c.inc saoimage-1.35.1/irafdisp.c
+--- saoimage-1.35.1/irafdisp.c.inc	1992-10-10 01:31:32.000000000 +0100
++++ saoimage-1.35.1/irafdisp.c	2009-04-07 21:30:27.540188111 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W%  %G%";
+ #ifdef IMTOOL
+ 
+ #include <stdio.h>		/* stderr, FILE, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h>		/* get X types and constants */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/constant.h"	/* define codes */
+diff -up saoimage-1.35.1/irafenv.c.inc saoimage-1.35.1/irafenv.c
+--- saoimage-1.35.1/irafenv.c.inc	1990-04-20 17:18:13.000000000 +0200
++++ saoimage-1.35.1/irafenv.c	2009-04-07 21:30:27.634188877 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include "hfiles/coord.h"
+ #include "hfiles/define.h"	/* SZ_FNAME, etc. */
+ #include "hfiles/image.h"
+diff -up saoimage-1.35.1/iraffdbk.c.inc saoimage-1.35.1/iraffdbk.c
+--- saoimage-1.35.1/iraffdbk.c.inc	1990-05-02 07:51:29.000000000 +0200
++++ saoimage-1.35.1/iraffdbk.c	2009-04-07 21:30:27.425188601 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W%  %G%";
+ #ifdef IMTOOL
+ 
+ #include <stdio.h>			/* stderr, NULL, etc. */
++#include <string.h>
+ #include <ctype.h>			/* isspace, isprint, etc. */
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* window manager stuff */
+diff -up saoimage-1.35.1/irafimtl.c.inc saoimage-1.35.1/irafimtl.c
+--- saoimage-1.35.1/irafimtl.c.inc	2009-04-07 21:30:27.126189007 +0200
++++ saoimage-1.35.1/irafimtl.c	2009-04-07 21:30:27.551188486 +0200
+@@ -26,6 +26,8 @@ static char SccsId[] = "%W%  %G%";
  #ifdef IMTOOL
  
  #include <stdio.h>		/* stderr, FILE, NULL, etc. */
 +#include <string.h>
++#include <strings.h>
  #include <X11/Xlib.h>		/* get X types and constants */
  #include <X11/Xutil.h>		/* X window manager stuff */
  #include "hfiles/constant.h"	/* define codes */
---- saoimage-1.35.1/shfile.c.inc	2008-10-26 19:28:50.000000000 +0100
-+++ saoimage-1.35.1/shfile.c	2008-10-26 19:28:58.000000000 +0100
-@@ -1,4 +1,5 @@
+diff -up saoimage-1.35.1/irafio.c.inc saoimage-1.35.1/irafio.c
+--- saoimage-1.35.1/irafio.c.inc	2009-04-07 21:30:27.128189453 +0200
++++ saoimage-1.35.1/irafio.c	2009-04-07 21:30:27.692186826 +0200
+@@ -38,6 +38,8 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>
+ #endif
+ 
++#include <unistd.h>
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include "hfiles/control.h"	/* define struct connectRec */
+ // Forward declarations
+diff -up saoimage-1.35.1/irafpipe.c.inc saoimage-1.35.1/irafpipe.c
+--- saoimage-1.35.1/irafpipe.c.inc	2009-04-07 21:30:27.129188343 +0200
++++ saoimage-1.35.1/irafpipe.c	2009-04-07 21:30:27.426188514 +0200
+@@ -25,6 +25,7 @@ static char SccsId[] = "%W%  %G%";
+ #ifdef IMTOOL
+ 
+ #include <stdio.h>		/* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>		/* get X types and constants */
+ #include "hfiles/control.h"	/* struct connectRec */
+ // Forward declarations
+diff -up saoimage-1.35.1/mainbffr.c.inc saoimage-1.35.1/mainbffr.c
+--- saoimage-1.35.1/mainbffr.c.inc	1996-01-02 20:25:54.000000000 +0100
++++ saoimage-1.35.1/mainbffr.c	2009-04-07 21:30:27.637185459 +0200
+@@ -24,6 +24,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr, NULL, etc */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MIN, MAX, etc. */
+diff -up saoimage-1.35.1/mainevnt.c.inc saoimage-1.35.1/mainevnt.c
+--- saoimage-1.35.1/mainevnt.c.inc	1991-05-16 00:30:56.000000000 +0200
++++ saoimage-1.35.1/mainevnt.c	2009-04-07 21:30:27.429188662 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <sys/time.h>		/* get struct timeval */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/maininit.c.inc saoimage-1.35.1/maininit.c
+--- saoimage-1.35.1/maininit.c.inc	2009-04-07 21:30:27.130188199 +0200
++++ saoimage-1.35.1/maininit.c	2009-04-07 21:30:27.694189706 +0200
+@@ -29,6 +29,8 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
++#include <stdlib.h>
+ #include <sys/time.h>		/* struct timeval used in <sys/resource.h> */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/mainkey.c.inc saoimage-1.35.1/mainkey.c
+--- saoimage-1.35.1/mainkey.c.inc	2009-04-07 21:30:27.132189938 +0200
++++ saoimage-1.35.1/mainkey.c	2009-04-07 21:30:27.305188876 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
  #include <stdio.h>
 +#include <string.h>
- #include <sys/types.h>
- #include <sys/file.h>
- #include <X/Xlib.h>
---- saoimage-1.35.1/csrsave.c.inc	2008-10-26 19:27:39.000000000 +0100
-+++ saoimage-1.35.1/csrsave.c	2008-10-26 19:27:52.000000000 +0100
-@@ -22,6 +22,7 @@
+ #include <X11/Xlib.h>		/*  X window stuff  */
+ #include <X11/Xutil.h>		/*  X window manager stuff  */
+ #include <X11/keysym.h>
+diff -up saoimage-1.35.1/mainutil.c.inc saoimage-1.35.1/mainutil.c
+--- saoimage-1.35.1/mainutil.c.inc	1998-08-12 21:53:24.000000000 +0200
++++ saoimage-1.35.1/mainutil.c	2009-04-07 21:30:27.430188117 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <stdlib.h>		/* calloc, etc. */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/mgfyctrl.c.inc saoimage-1.35.1/mgfyctrl.c
+--- saoimage-1.35.1/mgfyctrl.c.inc	2009-04-07 21:30:27.151190451 +0200
++++ saoimage-1.35.1/mgfyctrl.c	2009-04-07 21:30:27.553188232 +0200
+@@ -29,6 +29,7 @@ static char SccsId[] = "%W%  %G%";
+ 
+ #include <stdio.h>
+ #include <string.h>		/*  strlen */
++#include <strings.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/struct.h"	/* declare structure types */
+diff -up saoimage-1.35.1/mgfydraw.c.inc saoimage-1.35.1/mgfydraw.c
+--- saoimage-1.35.1/mgfydraw.c.inc	1995-05-04 20:45:43.000000000 +0200
++++ saoimage-1.35.1/mgfydraw.c	2009-04-07 21:30:27.554187600 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <strings.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/color.h"	/* define GCspec */
+diff -up saoimage-1.35.1/mgfyinit.c.inc saoimage-1.35.1/mgfyinit.c
+--- saoimage-1.35.1/mgfyinit.c.inc	1990-04-20 17:58:11.000000000 +0200
++++ saoimage-1.35.1/mgfyinit.c	2009-04-07 21:30:27.640186234 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W%  %G%";
   */
  
  #include <stdio.h>		/* stderr, NULL, etc. */
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MAX, etc. */
+diff -up saoimage-1.35.1/mgfytabl.c.inc saoimage-1.35.1/mgfytabl.c
+--- saoimage-1.35.1/mgfytabl.c.inc	2009-04-07 21:30:27.152189002 +0200
++++ saoimage-1.35.1/mgfytabl.c	2009-04-07 21:30:27.431188084 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr */
 +#include <string.h>
  #include <X11/Xlib.h>		/* X window stuff */
  #include <X11/Xutil.h>		/* X window manager stuff */
- #include "hfiles/color.h"	/* cursor colors needed by Cursor.h */
---- saoimage-1.35.1/clrread.c.inc	2008-10-26 19:28:03.000000000 +0100
-+++ saoimage-1.35.1/clrread.c	2008-10-26 19:28:12.000000000 +0100
-@@ -17,6 +17,7 @@
+ #include "hfiles/struct.h"	/* declare structure types */
+diff -up saoimage-1.35.1/pancopy.c.inc saoimage-1.35.1/pancopy.c
+--- saoimage-1.35.1/pancopy.c.inc	1996-02-26 22:09:39.000000000 +0100
++++ saoimage-1.35.1/pancopy.c	2009-04-07 21:30:27.565187392 +0200
+@@ -20,6 +20,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>			/* define stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include "hfiles/define.h"		/* define MIN, MAX, etc. */
+ 
+ /*
+diff -up saoimage-1.35.1/panctrl.c.inc saoimage-1.35.1/panctrl.c
+--- saoimage-1.35.1/panctrl.c.inc	1998-11-06 18:16:33.000000000 +0100
++++ saoimage-1.35.1/panctrl.c	2009-04-07 21:30:27.434188899 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* define stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* window manager stuff */
+ #include "hfiles/constant.h"	/* define codes */
+diff -up saoimage-1.35.1/panimage.c.inc saoimage-1.35.1/panimage.c
+--- saoimage-1.35.1/panimage.c.inc	2009-04-07 21:30:27.156189057 +0200
++++ saoimage-1.35.1/panimage.c	2009-04-07 21:30:27.435187738 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* define stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MIN, MAX, DONT_CARE, etc. */
+diff -up saoimage-1.35.1/prntcent.c.inc saoimage-1.35.1/prntcent.c
+--- saoimage-1.35.1/prntcent.c.inc	2009-04-07 21:30:27.166189947 +0200
++++ saoimage-1.35.1/prntcent.c	2009-04-07 21:30:27.436187651 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr */
++#include <string.h>
+ #include <math.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/prntcurs.c.inc saoimage-1.35.1/prntcurs.c
+--- saoimage-1.35.1/prntcurs.c.inc	2009-04-07 21:30:27.167188950 +0200
++++ saoimage-1.35.1/prntcurs.c	2009-04-07 21:30:27.438188562 +0200
+@@ -21,6 +21,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/struct.h"	/* declare structure types */
+diff -up saoimage-1.35.1/readarr.c.inc saoimage-1.35.1/readarr.c
+--- saoimage-1.35.1/readarr.c.inc	2009-04-07 21:30:27.168188402 +0200
++++ saoimage-1.35.1/readarr.c	2009-04-07 21:30:27.695185886 +0200
+@@ -18,6 +18,8 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* define stderr */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* needed for control.h */
+ #include "hfiles/constant.h"	/* define data type codes */
+ #include "hfiles/control.h"	/* define IOP codes */
+diff -up saoimage-1.35.1/readfith.c.inc saoimage-1.35.1/readfith.c
+--- saoimage-1.35.1/readfith.c.inc	2009-04-07 21:30:27.169189719 +0200
++++ saoimage-1.35.1/readfith.c	2009-04-07 21:30:27.651190271 +0200
+@@ -35,6 +35,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MIN, MAX, etc. */
+diff -up saoimage-1.35.1/readfits0.c.inc saoimage-1.35.1/readfits0.c
+--- saoimage-1.35.1/readfits0.c.inc	2009-04-07 21:30:27.171189669 +0200
++++ saoimage-1.35.1/readfits0.c	2009-04-07 21:30:27.440186992 +0200
+@@ -25,6 +25,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* define stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>		/* needed for control.h */
+ #include "hfiles/constant.h"
+ #include "hfiles/control.h"	/* define IOP codes */
+diff -up saoimage-1.35.1/readfits.c.inc saoimage-1.35.1/readfits.c
+--- saoimage-1.35.1/readfits.c.inc	2001-11-14 18:54:04.000000000 +0100
++++ saoimage-1.35.1/readfits.c	2009-04-07 21:30:27.653188708 +0200
+@@ -29,6 +29,8 @@ static char SccsId[] = "%W%  %G%";
+ #else
+ #include <string.h>
+ #endif
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* needed for control.h */
+ #include "hfiles/constant.h"
+ #include "hfiles/image.h"
+diff -up saoimage-1.35.1/readint.c.inc saoimage-1.35.1/readint.c
+--- saoimage-1.35.1/readint.c.inc	1998-07-09 19:12:27.000000000 +0200
++++ saoimage-1.35.1/readint.c	2009-04-07 21:30:27.712189552 +0200
+@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
++#include <string.h>
++#include <stdlib.h>
++#include <stdio.h>
+ #include <sys/types.h>		/* needed for ntohl (net to host long) */
+ #ifndef VMS
+ #include <netinet/in.h>		/* needed for ntohl (net to host long) */
+diff -up saoimage-1.35.1/readreal.c.inc saoimage-1.35.1/readreal.c
+--- saoimage-1.35.1/readreal.c.inc	1998-07-09 19:11:08.000000000 +0200
++++ saoimage-1.35.1/readreal.c	2009-04-07 21:30:27.443188153 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "hfiles/image.h"	/* image struct */
+ #include "hfiles/scale.h"	/* define SCALEWIDTH, etc. */
+ 
+diff -up saoimage-1.35.1/rgnanli.c.inc saoimage-1.35.1/rgnanli.c
+--- saoimage-1.35.1/rgnanli.c.inc	2009-04-07 21:30:27.181193729 +0200
++++ saoimage-1.35.1/rgnanli.c	2009-04-07 21:30:27.471194151 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, sscanf, NULL */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ // Forward declarations
+diff -up saoimage-1.35.1/rgnctrl.c.inc saoimage-1.35.1/rgnctrl.c
+--- saoimage-1.35.1/rgnctrl.c.inc	2009-04-07 21:30:27.182188790 +0200
++++ saoimage-1.35.1/rgnctrl.c	2009-04-07 21:30:27.472188217 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/*  Define stderr, NULL */
++#include <string.h>
+ #include <X11/Xlib.h>		/*  X window stuff */
+ #include <X11/Xutil.h>		/*  X window manager stuff, visuals */
+ #include <X11/keysym.h>
+diff -up saoimage-1.35.1/rgndraw.c.inc saoimage-1.35.1/rgndraw.c
+--- saoimage-1.35.1/rgndraw.c.inc	2009-04-07 21:30:27.184189731 +0200
++++ saoimage-1.35.1/rgndraw.c	2009-04-07 21:30:27.654188117 +0200
+@@ -31,6 +31,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/define.h"	/* define MIN, MAX, U_DONT_CARE, etc. */
+diff -up saoimage-1.35.1/rgnmake.c.inc saoimage-1.35.1/rgnmake.c
+--- saoimage-1.35.1/rgnmake.c.inc	2009-04-07 21:30:27.186188406 +0200
++++ saoimage-1.35.1/rgnmake.c	2009-04-07 21:30:27.656189469 +0200
+@@ -31,6 +31,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/*  strlen, strcat, strcpy, strrchr  */
+ #endif
+ 
++#include <string.h>
+ #include <stdio.h>		/* get stderr, define sscanf */
+ #include <math.h>		/* sin, cos, etc */
+ #include <X11/Xlib.h>		/* X window stuff */
+diff -up saoimage-1.35.1/rgnread.c.inc saoimage-1.35.1/rgnread.c
+--- saoimage-1.35.1/rgnread.c.inc	1998-10-14 21:03:09.000000000 +0200
++++ saoimage-1.35.1/rgnread.c	2009-04-07 21:30:27.657188649 +0200
+@@ -32,6 +32,8 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/constant.h"	/* define codes */
+diff -up saoimage-1.35.1/rgntoken.c.inc saoimage-1.35.1/rgntoken.c
+--- saoimage-1.35.1/rgntoken.c.inc	1998-10-19 20:53:16.000000000 +0200
++++ saoimage-1.35.1/rgntoken.c	2009-04-07 21:30:27.567189442 +0200
+@@ -20,6 +20,8 @@ static char SccsId[] = "%W%  %G%";
   */
  
  #include <stdio.h>		/* stderr, NULL, etc. */
 +#include <string.h>
++#include <strings.h>
  #include <ctype.h>		/* toupper, isalpha, etc. */
- #include "hfiles/colormap.h"	/* color table storage structs */
- // Forward declarations
---- saoimage-1.35.1/btnlib/label.c.inc	2008-10-26 19:28:58.000000000 +0100
-+++ saoimage-1.35.1/btnlib/label.c	2008-10-26 19:29:09.000000000 +0100
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/rgnwpros.c.inc saoimage-1.35.1/rgnwpros.c
+--- saoimage-1.35.1/rgnwpros.c.inc	2009-04-07 21:30:27.188188920 +0200
++++ saoimage-1.35.1/rgnwpros.c	2009-04-07 21:30:27.667189702 +0200
+@@ -30,6 +30,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <X11/Xlib.h>		/* get X types and constants */
+ #include <X11/Xutil.h>		/* X window manager stuff, visuals */
+ #include "hfiles/color.h"	/* gcset needed by cursor */
+diff -up saoimage-1.35.1/rgnwrite.c.inc saoimage-1.35.1/rgnwrite.c
+--- saoimage-1.35.1/rgnwrite.c.inc	2009-04-07 21:30:27.189188503 +0200
++++ saoimage-1.35.1/rgnwrite.c	2009-04-07 21:30:27.668187409 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <string.h>
+ #include <time.h>		/* needed for asctime() */
+ #include <X11/Xlib.h>		/* get X types and constants */
+ #include <X11/Xutil.h>		/* X window manager, visual stuff */
+diff -up saoimage-1.35.1/rtcmd.c.inc saoimage-1.35.1/rtcmd.c
+--- saoimage-1.35.1/rtcmd.c.inc	1990-05-11 16:21:46.000000000 +0200
++++ saoimage-1.35.1/rtcmd.c	2009-04-07 21:30:27.475188636 +0200
+@@ -1,5 +1,6 @@
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/sclctrl.c.inc saoimage-1.35.1/sclctrl.c
+--- saoimage-1.35.1/sclctrl.c.inc	2009-04-07 21:30:27.190187857 +0200
++++ saoimage-1.35.1/sclctrl.c	2009-04-07 21:30:27.476188738 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+ #include "hfiles/constant.h"	/* define codes  */
+diff -up saoimage-1.35.1/sclmap.c.inc saoimage-1.35.1/sclmap.c
+--- saoimage-1.35.1/sclmap.c.inc	2009-04-07 21:30:27.192188764 +0200
++++ saoimage-1.35.1/sclmap.c	2009-04-07 21:30:27.477188293 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* get stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h>		/* get the math definitions */
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+diff -up saoimage-1.35.1/shfile.c.inc saoimage-1.35.1/shfile.c
+--- saoimage-1.35.1/shfile.c.inc	1991-04-18 21:29:51.000000000 +0200
++++ saoimage-1.35.1/shfile.c	2009-04-07 21:30:27.319188233 +0200
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <X/Xlib.h>
+diff -up saoimage-1.35.1/tnxpos.c.inc saoimage-1.35.1/tnxpos.c
+--- saoimage-1.35.1/tnxpos.c.inc	2002-06-26 16:35:48.000000000 +0200
++++ saoimage-1.35.1/tnxpos.c	2009-04-07 21:30:27.479188712 +0200
+@@ -29,6 +29,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include "wcs.h"
+diff -up saoimage-1.35.1/vms/ghstname.c.inc saoimage-1.35.1/vms/ghstname.c
+--- saoimage-1.35.1/vms/ghstname.c.inc	1989-11-10 09:55:19.000000000 +0100
++++ saoimage-1.35.1/vms/ghstname.c	2009-04-07 21:30:27.303190137 +0200
 @@ -1,3 +1,5 @@
 +#include <string.h>
 +
- #ifndef lint
- static char SccsId[] = "%W%  %G%";
- #endif
+ gethostname (char *node, int nodelen)
+ {
+ 	char	*p, tmp[32];
+@@ -9,4 +11,4 @@ gethostname (char *node, int nodelen)
+ 	strncpy (node, tmp, nodelen);
+ 	node[nodelen] = '\0';
+ }
+-               
+\ No newline at end of file
++               
+diff -up saoimage-1.35.1/vms/zfiovi.c.inc saoimage-1.35.1/vms/zfiovi.c
+--- saoimage-1.35.1/vms/zfiovi.c.inc	1990-05-12 23:57:35.000000000 +0200
++++ saoimage-1.35.1/vms/zfiovi.c	2009-04-07 21:30:27.304190021 +0200
+@@ -53,6 +53,7 @@
+ #include <iodef.h>	/* I/O definitions			*/
+ #include <ssdef.h>	/* System status definitions		*/
+ #include <syidef.h>	/* Get system info definitions		*/
++#include <string.h>
+ 
+ #ifdef IMTOOL
+ #define import_spp	/* Import the IRAF SPP constants	*/
+diff -up saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c.inc saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c
+--- saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c.inc	2002-06-26 16:35:48.000000000 +0200
++++ saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c	2009-04-07 21:30:27.481189098 +0200
+@@ -29,6 +29,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include "wcs.h"
+diff -up saoimage-1.35.1/wndwcre.c.inc saoimage-1.35.1/wndwcre.c
+--- saoimage-1.35.1/wndwcre.c.inc	2003-09-03 20:54:06.000000000 +0200
++++ saoimage-1.35.1/wndwcre.c	2009-04-07 21:30:27.482187527 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W%  %G%";
+  */
+ 
+ #include <stdio.h>		/* stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* window manager hint stuff */
+ #include "hfiles/window.h"
+diff -up saoimage-1.35.1/wndwinit.c.inc saoimage-1.35.1/wndwinit.c
+--- saoimage-1.35.1/wndwinit.c.inc	2009-04-07 21:30:27.194189503 +0200
++++ saoimage-1.35.1/wndwinit.c	2009-04-07 21:30:27.750189916 +0200
+@@ -28,6 +28,7 @@ static char SccsId[] = "%W%  %G%";
+ 
+ #include <stdlib.h>			/* malloc() */
+ #include <stdio.h>			/* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h>			/* X window stuff */
+ #include <X11/Xutil.h>			/* X window manager stuff */
+ #include "hfiles/constant.h"		/* define codes */

saoimage-1.35.1-mkstemp.patch:

Index: saoimage-1.35.1-mkstemp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-mkstemp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-mkstemp.patch	3 Nov 2008 20:04:06 -0000	1.1
+++ saoimage-1.35.1-mkstemp.patch	7 Apr 2009 20:07:54 -0000	1.2
@@ -3,9 +3,27 @@
 
 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
 
---- saoimage-1.35.1/disppsct.c.mkstemp	2008-10-25 00:20:37.000000000 +0200
-+++ saoimage-1.35.1/disppsct.c	2008-10-25 00:22:47.000000000 +0200
-@@ -303,7 +303,7 @@
+diff -up saoimage-1.35.1/disppsct.c.mkstemp saoimage-1.35.1/disppsct.c
+--- saoimage-1.35.1/disppsct.c.mkstemp	2003-09-03 20:23:08.000000000 +0200
++++ saoimage-1.35.1/disppsct.c	2009-04-07 20:24:14.520190757 +0200
+@@ -22,7 +22,7 @@ static char SccsId[] = "%W%  %G%";
+  *		{n} <who> -- <does what> -- <when>
+  */
+ 
+-#ifndef SUN
++#if 0
+ #include <sys/file.h>
+ #endif
+ 
+@@ -39,6 +39,7 @@ static char SccsId[] = "%W%  %G%";
+ #include <string.h>		/* strlen, strcat, strcpy, strrchr */
+ #endif
+ 
++#include <stdlib.h>
+ #include <time.h>
+ #include <X11/Xlib.h>		/* X window stuff */
+ #include <X11/Xutil.h>		/* X window manager stuff */
+@@ -303,7 +304,7 @@ void screen_dump ( nobuttons )
  #endif
    if( ++index > 26 ) index = 0;
    /* open a file with a system chosen unique name */
@@ -14,3 +32,12 @@
    if( (fd = mkstemp(tempfile)) == -1 ) {
      perror("Cannot make temp file");
  #else
+@@ -314,7 +315,7 @@ void screen_dump ( nobuttons )
+     (void)fprintf(stderr, "cannot create temporary file %s\n", tempfile);
+     (void)fflush(stderr);
+   } else {
+-#ifdef SUN
++#if 1
+     fp = fdopen(fd, "a");
+ #endif
+     /* Autoscale to fit output page. */


Index: saoimage.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- saoimage.desktop	24 Mar 2009 15:30:02 -0000	1.2
+++ saoimage.desktop	7 Apr 2009 20:07:54 -0000	1.3
@@ -6,6 +6,6 @@
 GenericName=SAOimage Viewer
 Exec=saoimage %f
 Icon=saoimage
-MimeType=application/x-iraf-image;
+MimeType=image/fits;
 Categories=Graphics;2DGraphics;RasterGraphics;Education;Astronomy;
 Terminal=false


Index: saoimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- saoimage.spec	24 Mar 2009 15:30:03 -0000	1.4
+++ saoimage.spec	7 Apr 2009 20:07:54 -0000	1.5
@@ -107,6 +107,11 @@
 
 
 %changelog
+* Tue Apr 7 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-6
+- Fix blink crash
+- Fix print crash caused by mkstemp patch
+- Add a lot of missing includes, making FORTIFY_SOURCE effective
+
 * Tue Mar 24 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-5
 - Fix the categories
 



From pjones at fedoraproject.org  Tue Apr  7 20:50:45 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue,  7 Apr 2009 20:50:45 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-tolower.patch, NONE, 1.1 grub.spec, 1.91,
	1.92
Message-ID: <20090407205045.8CEB970100@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20216

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-tolower.patch 
Log Message:
Always build grub_tolower in.


grub-0.97-tolower.patch:

--- NEW FILE grub-0.97-tolower.patch ---
>From 30c800b1fb63063708adbf8c168dd21ca694e51f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 7 Apr 2009 16:27:32 -0400
Subject: [PATCH] Always build grub_tolower() in.

---
 stage2/char_io.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/stage2/char_io.c b/stage2/char_io.c
index c4bce1a..9104eed 100644
--- a/stage2/char_io.c
+++ b/stage2/char_io.c
@@ -1107,7 +1107,6 @@ safe_parse_maxint (char **str_ptr, int *myint_ptr)
 }
 #endif /* STAGE1_5 */
 
-#if !defined(STAGE1_5) || defined(FSYS_FAT)
 int
 grub_tolower (int c)
 {
@@ -1116,7 +1115,6 @@ grub_tolower (int c)
 
   return c;
 }
-#endif /* ! STAGE1_5 || FSYS_FAT */
 
 int
 grub_isspace (int c)
-- 
1.6.2



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- grub.spec	7 Apr 2009 20:06:16 -0000	1.91
+++ grub.spec	7 Apr 2009 20:50:13 -0000	1.92
@@ -39,6 +39,7 @@
 Patch11: grub-0.97-efistatus.patch
 Patch12: grub-0.97-fat-lowercase.patch
 Patch13: grub-0.97-efipxe.patch
+Patch14: grub-0.97-tolower.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -62,6 +63,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 autoreconf



From mebourne at fedoraproject.org  Tue Apr  7 20:51:59 2009
From: mebourne at fedoraproject.org (Martin Ebourne)
Date: Tue,  7 Apr 2009 20:51:59 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder-1.24.1-gcc44.patch,1.1,1.2
Message-ID: <20090407205159.4AD6170100@cvs1.fedora.phx.redhat.com>

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20458

Modified Files:
	zoneminder-1.24.1-gcc44.patch 
Log Message:
Fix typo in patch


zoneminder-1.24.1-gcc44.patch:

Index: zoneminder-1.24.1-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder-1.24.1-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zoneminder-1.24.1-gcc44.patch	21 Mar 2009 21:50:04 -0000	1.1
+++ zoneminder-1.24.1-gcc44.patch	7 Apr 2009 20:51:58 -0000	1.2
@@ -1,10 +1,12 @@
---- src/zm_utils.cpp.orig	2009-03-21 21:46:01.000000000 +0000
-+++ src/zm_utils.cpp	2009-03-21 21:46:36.000000000 +0000
-@@ -19,6 +19,7 @@
+--- src/zm_utils.cpp.gcc44      2008-07-25 10:33:24.000000000 +0100
++++ src/zm_utils.cpp    2009-04-07 21:25:05.000000000 +0100
+@@ -19,7 +19,8 @@
  
  #include "zm_utils.h"
  
-+#include <cstdio.h>
- #include <stdarg.h>
+-#include <stdarg.h>
++#include <cstdio>
++#include <cstdarg>
  
  const std::string stringtf( const char *format, ... )
+ {



From rdieter at fedoraproject.org  Tue Apr  7 20:52:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  7 Apr 2009 20:52:55 +0000 (UTC)
Subject: rpms/qtscriptgenerator/F-9 qtscriptgenerator-0.1.0-gcc44.patch, NONE,
	1.1 qtscriptgenerator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090407205255.A381E70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qtscriptgenerator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20560

Modified Files:
	.cvsignore sources 
Added Files:
	qtscriptgenerator-0.1.0-gcc44.patch qtscriptgenerator.spec 
Log Message:
import


qtscriptgenerator-0.1.0-gcc44.patch:

--- NEW FILE qtscriptgenerator-0.1.0-gcc44.patch ---
diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
+++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
@@ -30,6 +30,7 @@
 #include <cctype>
 
 #include <fcntl.h>
+#include <cstdio>
 
 #ifdef HAVE_MMAP
 #  include <sys/mman.h>


--- NEW FILE qtscriptgenerator.spec ---

Name:		qtscriptgenerator
Version:	0.1.0
Release:	5%{?dist}
Summary: 	A tool to generate Qt bindings for Qt Script	

Group:		System Environment/Libraries
License: 	GPLv2	
URL:		http://code.google.com/p/qtscriptgenerator/	
Source0:	http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-%{version}.tar.gz	
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: qtscriptgenerator-0.1.0-gcc44.patch

# explictly BR libxslt, for xsltproc
BuildRequires: libxslt
BuildRequires: phonon-devel >= 4.3.1
BuildRequires: qt4-devel >= 4.5.0-7

# not strictly required, but the expectation would be for the 
# bindings to be present
Requires: qtscriptbindings = %{version}-%{release}

%description
Qt Script Generator is a tool to generate Qt bindings for Qt Script.

%package -n qtscriptbindings 
Summary: Qt bindings for Qt Script
Group: System Environment/Libraries
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
%description -n qtscriptbindings
Bindings providing access to substantial portions of the Qt API
from within Qt Script.



%prep
%setup -q -n %{name}-src-%{version}

%patch1 -p0 -b .gcc44


%build

# workaround buildsys bogosity, see also:
# http://code.google.com/p/qtscriptgenerator/issues/detail?id=38
export INCLUDE=%{_qt4_headerdir}

pushd generator 
%{_qt4_qmake}
make %{?_smp_mflags}
./generator
popd

pushd qtbindings
%{_qt4_qmake}
make %{?_smp_mflags}
popd

pushd tools/qsexec/src
%{_qt4_qmake}
make  %{?_smp_mflags}
popd


%install
rm -rf %{buildroot} 

mkdir -p %{buildroot}%{_qt4_plugindir}/script/
# install doesn't do symlinks
cp -a plugins/script/libqtscript* \
  %{buildroot}%{_qt4_plugindir}/script/

cp -a tools/qsexec/README.TXT README.qsexec
install -D -p -m755 tools/qsexec/qsexec %{buildroot}%{_bindir}/qsexec

install -D -p -m755 generator/generator %{buildroot}%{_qt4_bindir}/generator


%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{_qt4_bindir}/generator

%files -n qtscriptbindings
%defattr(-,root,root,-)
%doc README LICENSE.GPL
%doc README.qsexec 
%doc doc/
%doc examples/
%{_bindir}/qsexec
%{_qt4_plugindir}/script/libqtscript*


%changelog
* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-5
- qtscriptgenerator/qtscriptbindings pkgs 
- qtscriptbindings: include docs, examples

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-4
- include qsexec

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-3
- BR: phonon-devel

* Fri Mar 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-2
- qt-4.5.0-7 fixed wrt phonon, drop no_phonon patch

* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-1
- first try



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:14:05 -0000	1.1
+++ .cvsignore	7 Apr 2009 20:52:24 -0000	1.2
@@ -0,0 +1 @@
+qtscriptgenerator-src-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:14:05 -0000	1.1
+++ sources	7 Apr 2009 20:52:25 -0000	1.2
@@ -0,0 +1 @@
+ca4046ad4bda36cd4e21649d4b98886d  qtscriptgenerator-src-0.1.0.tar.gz



From lennart at fedoraproject.org  Tue Apr  7 20:09:17 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  7 Apr 2009 20:09:17 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.7, 1.8 libatasmart.spec, 1.8, 
	1.9 sources, 1.7, 1.8
Message-ID: <20090407200917.1D2667013D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15571

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2009 17:01:49 -0000	1.7
+++ .cvsignore	7 Apr 2009 20:08:46 -0000	1.8
@@ -1 +1 @@
-libatasmart-0.6.tar.gz
+libatasmart-0.7.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libatasmart.spec	5 Apr 2009 17:01:49 -0000	1.8
+++ libatasmart.spec	7 Apr 2009 20:08:46 -0000	1.9
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.6
+Version: 0.7
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -53,6 +53,9 @@
 %{_libdir}/pkgconfig/libatasmart.pc
 
 %changelog
+* Tue Apr 7 2009 Lennart Poettering <lpoetter at redhat.com> 0.7-1
+- New upstream release
+
 * Sat Apr 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.6-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2009 17:01:49 -0000	1.7
+++ sources	7 Apr 2009 20:08:46 -0000	1.8
@@ -1 +1 @@
-e96d58a2097c398293c9b10b4c4c2777  libatasmart-0.6.tar.gz
+27d712dfa804fdb37313aacd01c476b6  libatasmart-0.7.tar.gz



From chkr at fedoraproject.org  Tue Apr  7 21:13:06 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Tue,  7 Apr 2009 21:13:06 +0000 (UTC)
Subject: rpms/anki/F-10 anki-0.9.9.7.1-noupdate.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 anki.spec, 1.2, 1.3 sources, 1.2,
	1.3 anki-0.9.9.6-noupdate.patch, 1.1,
	NONE anki-0.9.9.6-unihaninstall.patch, 1.1, NONE
Message-ID: <20090407211307.29E5270100@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/anki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23402

Modified Files:
	.cvsignore anki.spec sources 
Added Files:
	anki-0.9.9.7.1-noupdate.patch 
Removed Files:
	anki-0.9.9.6-noupdate.patch anki-0.9.9.6-unihaninstall.patch 
Log Message:
- Update to new upstream version 0.9.9.7.1
- Drop unihaninstall patch (applied upstream)
- Updated noupdate patch
- Use original upstream tgz since upstream doesn't ship the example files
anymore


anki-0.9.9.7.1-noupdate.patch:

--- NEW FILE anki-0.9.9.7.1-noupdate.patch ---
diff -uNr anki-0.9.9.7.1.old/ankiqt/config.py anki-0.9.9.7.1/ankiqt/config.py
--- anki-0.9.9.7.1.old/ankiqt/config.py	2009-03-23 05:40:26.000000000 +0100
+++ anki-0.9.9.7.1/ankiqt/config.py	2009-03-29 23:24:00.000000000 +0200
@@ -44,7 +44,7 @@
             'iconSize': 32,
             'syncOnLoad': True,
             'syncOnClose': True,
-            'checkForUpdates': True,
+            'checkForUpdates': False,
             'interfaceLang': "",
             'syncUsername': "",
             'syncPassword': "",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 21:21:56 -0000	1.2
+++ .cvsignore	7 Apr 2009 21:12:35 -0000	1.3
@@ -1 +1 @@
-anki-0.9.9.6-nosamples.tgz
+anki-0.9.9.7.1.tgz


Index: anki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-10/anki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anki.spec	1 Mar 2009 21:55:33 -0000	1.2
+++ anki.spec	7 Apr 2009 21:12:35 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		anki
-Version:	0.9.9.6
-Release:	4%{?dist}
+Version:	0.9.9.7.1
+Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
 Group:		Amusements/Games
@@ -10,19 +10,10 @@
 # was created out of  Unihan.txt from www.unicode.org (MIT license)
 License:	GPLv3+ and MIT
 URL:		http://www.ichi2.net/anki
-Source0:	%{name}-%{version}-nosamples.tgz
-# anki contains a sample with an unclear license
-# this script to remove all samples since they are not installed anyway
-# Download the upstream tarball and invoke this script while in the
-# tarball's directory:
-# ./generate-anki-tarball.sh 0.9.9.6
-# upstream tarball: http://ichi2.net/anki/download/%{name}-%{version}.tgz
-Source1:	generate-anki-tarball.sh
+Source0:	http://ichi2.net/anki/download/files/%{name}-%{version}.tgz
+
 # Config change: don't check for new updates.
-Patch0:		anki-0.9.9.6-noupdate.patch
-# install issue tracked upstream:
-# http://code.google.com/p/anki/issues/detail?id=561
-Patch1:		anki-0.9.9.6-unihaninstall.patch
+Patch0:		anki-0.9.9.7.1-noupdate.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, python-setuptools, python-sqlalchemy
 BuildRequires:	PyQt4-devel
@@ -41,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .noupdate
-%patch1 -p1 -b .unihaninstall
 
 %build
 pushd libanki
@@ -99,7 +89,10 @@
 %lang(ja) %{python_sitelib}/*/locale/ja_*/
 %lang(ko) %{python_sitelib}/*/locale/ko_*/
 %lang(pl) %{python_sitelib}/*/locale/pl_*/
-%lang(zh) %{python_sitelib}/anki/locale/zh_*/
+%lang(zh) %{python_sitelib}/*/locale/zh_*/
+%lang(sv) %{python_sitelib}/*/locale/sv_*/
+%lang(pt) %{python_sitelib}/*/locale/pt_*/
+%lang(ee) %{python_sitelib}/*/locale/ee_*/
 
 %{python_sitelib}/*egg-info
 %{_bindir}/anki
@@ -107,6 +100,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Apr 07 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.1-1
+- Update to new upstream version 0.9.9.7.1
+- Drop unihaninstall patch (applied upstream)
+- Updated noupdate patch
+- Use original upstream tgz since upstream doesn't ship the example files
+anymore
+
 * Sun Mar 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.6-4
 - Bump release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2009 21:21:56 -0000	1.2
+++ sources	7 Apr 2009 21:12:35 -0000	1.3
@@ -1 +1 @@
-0f029c744c849a5e2ca7f95df119c59f  anki-0.9.9.6-nosamples.tgz
+7b39a2c58b31641a46d9be308aa1e56b  anki-0.9.9.7.1.tgz


--- anki-0.9.9.6-noupdate.patch DELETED ---


--- anki-0.9.9.6-unihaninstall.patch DELETED ---



From pjones at fedoraproject.org  Tue Apr  7 21:19:42 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue,  7 Apr 2009 21:19:42 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-efipxe.patch,1.4,1.5
Message-ID: <20090407211942.AE70270100@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24466

Modified Files:
	grub-0.97-efipxe.patch 
Log Message:
Fix accidental reversion.


grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub-0.97-efipxe.patch	7 Apr 2009 20:06:15 -0000	1.4
+++ grub-0.97-efipxe.patch	7 Apr 2009 21:19:42 -0000	1.5
@@ -1,4 +1,4 @@
-From feede446fb63401cdf36860427bc9feb7e903596 Mon Sep 17 00:00:00 2001
+From 4c6bf1cd9fcf484aa777e68be391c17f011f4f7f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
 Date: Tue, 31 Mar 2009 14:55:00 +0500
 Subject: [PATCH] add basic pxe boot support in efi
@@ -12,7 +12,7 @@
  efi/efimisc.c      |   14 +-
  efi/efitftp.c      |  179 +++++++++++++++++++++
  efi/grub/efi/efi.h |    6 +
- efi/pxe.c          |  440 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ efi/pxe.c          |  445 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  efi/pxe.h          |  237 ++++++++++++++++++++++++++++
  grub/Makefile.am   |    2 +-
  grub/efitftp.c     |   34 ++++
@@ -21,7 +21,7 @@
  stage2/efistubs.c  |    7 +
  stage2/efistubs.h  |    8 +
  stage2/filesys.h   |   13 ++-
- 17 files changed, 1160 insertions(+), 26 deletions(-)
+ 17 files changed, 1165 insertions(+), 26 deletions(-)
  create mode 100644 efi/byteswap.h
  create mode 100644 efi/dhcp.h
  create mode 100644 efi/efitftp.c
@@ -545,10 +545,10 @@
  grub_efi_handle_t *grub_efi_locate_handle (grub_efi_locate_search_type_t
 diff --git a/efi/pxe.c b/efi/pxe.c
 new file mode 100644
-index 0000000..1863813
+index 0000000..8a15f20
 --- /dev/null
 +++ b/efi/pxe.c
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,445 @@
 +
 +#include <grub/efi/efi.h>
 +#include <grub/efi/api.h>
@@ -590,8 +590,9 @@
 +static void dhcp_option_parser_reset(dhcp_option_parser *parser,
 +				EFI_PXE_BASE_CODE_PACKET *packet)
 +{
-+	grub_uint64_t addr = (grub_uint64_t)packet;
++	char *addr;
 +
++	addr = (char *)packet;
 +	addr += offsetof(EFI_PXE_BASE_CODE_DHCPV4_PACKET, DhcpOptions);
 +	parser->current_option = (void *)addr;
 +	parser->options = (void *)addr;
@@ -600,11 +601,15 @@
 +static int dhcp_option_parser_next(dhcp_option_parser *parser,
 +				EFI_DHCP4_PACKET_OPTION **option)
 +{
++	char *current_option;
 +	if (parser->current_option->OpCode == 255) {
 +		*option = NULL;
 +		return 0;
 +	}
-+	parser->current_option = (void *)((grub_uint64_t)parser->current_option + 2 + parser->current_option->Length);
++	current_option = (char *)parser->current_option;
++	current_option += 2 + parser->current_option->Length;
++	parser->current_option = (EFI_DHCP4_PACKET_OPTION *)current_option;
++
 +	*option = parser->current_option;
 +	return 1;
 +}
@@ -886,7 +891,7 @@
 +	char *FileName = NULL;
 +	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
 +	uuid_t uuid;
-+	size_t FileSize = 0;
++	grub_efi_uintn_t FileSize = 0;
 +	grub_efi_status_t rc = GRUB_EFI_SUCCESS;
 +	char *ConfigPath = NULL;
 +	char hex[] = "0123456789ABCDEF";



From pkgdb at fedoraproject.org  Tue Apr  7 21:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:26:31 +0000
Subject: [pkgdb] l2tpd: jmahecha has requested watchcommits
Message-ID: <20090407212544.BD172208609@bastion.fedora.phx.redhat.com>

jmahecha has requested the watchcommits acl on l2tpd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/l2tpd



From pjones at fedoraproject.org  Tue Apr  7 21:27:13 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue,  7 Apr 2009 21:27:13 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-efipxe.patch,1.5,1.6
Message-ID: <20090407212713.1E6F270100@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25529

Modified Files:
	grub-0.97-efipxe.patch 
Log Message:
Fix /another/ accidental revert.


grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grub-0.97-efipxe.patch	7 Apr 2009 21:19:42 -0000	1.5
+++ grub-0.97-efipxe.patch	7 Apr 2009 21:27:12 -0000	1.6
@@ -1,4 +1,4 @@
-From 4c6bf1cd9fcf484aa777e68be391c17f011f4f7f Mon Sep 17 00:00:00 2001
+From a9ed8a1143b719127771358e505bccb4a7f27efd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
 Date: Tue, 31 Mar 2009 14:55:00 +0500
 Subject: [PATCH] add basic pxe boot support in efi
@@ -343,7 +343,7 @@
    path_name_len = dir_end + 1 - path_name;
 diff --git a/efi/efitftp.c b/efi/efitftp.c
 new file mode 100644
-index 0000000..92cdf9b
+index 0000000..5bb5de6
 --- /dev/null
 +++ b/efi/efitftp.c
 @@ -0,0 +1,179 @@
@@ -413,7 +413,7 @@
 +static grub_efi_status_t tftp_read_file(
 +	char *Filename,
 +	char *Buffer,
-+	grub_efi_uintn_t BufferSize)
++	grub_efi_uint64_t BufferSize)
 +{
 +	EFI_PXE_BASE_CODE_TFTP_OPCODE OpCode = EFI_PXE_BASE_CODE_TFTP_READ_FILE;
 +	grub_efi_boolean_t Overwrite = 0;



From pjones at fedoraproject.org  Tue Apr  7 20:06:16 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue,  7 Apr 2009 20:06:16 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-fat-lowercase.patch, NONE,
	1.1 grub-0.97-efipxe.patch, 1.3, 1.4 grub.spec, 1.90, 1.91
Message-ID: <20090407200616.C5C9A7013C@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14966

Modified Files:
	grub-0.97-efipxe.patch grub.spec 
Added Files:
	grub-0.97-fat-lowercase.patch 
Log Message:
* Tue Apr 07 2009 Peter Jones <pjones at redhat.com> - 0.97-47
- Add more filenames to the tftp config file search list
- Tweak FAT filename comparison...
- Vomit.


grub-0.97-fat-lowercase.patch:

--- NEW FILE grub-0.97-fat-lowercase.patch ---
From: Peter Jones <pjones at redhat.com>

diff -urpN grub-0.97/stage2/char_io.c.lowercase grub-0.97/stage2/char_io.c
--- grub-0.97/stage2/char_io.c.lowercase	2009-04-07 15:06:37.000000000 -0400
+++ grub-0.97/stage2/char_io.c	2009-04-07 15:07:19.000000000 -0400
@@ -1346,6 +1346,26 @@ substring (const char *s1, const char *s
   return 1;
 }
 
+int
+subcasestring (const char *s1, const char *s2)
+{
+  while (tolower(*s1) == tolower(*s2))
+    {
+      /* The strings match exactly. */
+      if (! *(s1++))
+	return 0;
+      s2 ++;
+    }
+
+  /* S1 is a substring of S2. */
+  if (*s1 == 0)
+    return -1;
+
+  /* S1 isn't a substring. */
+  return 1;
+}
+
+
 #ifndef STAGE1_5
 /* Terminate the string STR with NUL.  */
 int
diff -urpN grub-0.97/stage2/fsys_fat.c.lowercase grub-0.97/stage2/fsys_fat.c
--- grub-0.97/stage2/fsys_fat.c.lowercase	2009-04-07 15:06:21.000000000 -0400
+++ grub-0.97/stage2/fsys_fat.c	2009-04-07 15:06:56.000000000 -0400
@@ -435,7 +435,7 @@ fat_dir (char *dirname)
 		goto print_filename;
 # endif /* STAGE1_5 */
 	      
-	      if (substring (dirname, filename) == 0)
+	      if (subcasestring (dirname, filename) == 0)
 		break;
 	    }
 	}
@@ -462,7 +462,7 @@ fat_dir (char *dirname)
       if (do_possibilities)
 	{
 	print_filename:
-	  if (substring (dirname, filename) <= 0)
+	  if (subcasestring (dirname, filename) <= 0)
 	    {
 	      if (print_possibilities > 0)
 		print_possibilities = -print_possibilities;
@@ -472,7 +472,7 @@ fat_dir (char *dirname)
 	}
 # endif /* STAGE1_5 */
       
-      if (substring (dirname, filename) == 0)
+      if (subcasestring (dirname, filename) == 0)
 	break;
     }
   
diff -urpN grub-0.97/stage2/shared.h.lowercase grub-0.97/stage2/shared.h
--- grub-0.97/stage2/shared.h.lowercase	2009-04-07 15:06:29.000000000 -0400
+++ grub-0.97/stage2/shared.h	2009-04-07 15:07:01.000000000 -0400
@@ -941,6 +941,7 @@ char *convert_to_ascii (char *buf, int c
 int get_cmdline (char *prompt, char *cmdline, int maxlen,
 		 int echo_char, int history);
 int substring (const char *s1, const char *s2);
+int subcasestring (const char *s1, const char *s2);
 int nul_terminate (char *str);
 int get_based_digit (int c, int base);
 int safe_parse_maxint (char **str_ptr, int *myint_ptr);

grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-0.97-efipxe.patch	6 Apr 2009 15:13:28 -0000	1.3
+++ grub-0.97-efipxe.patch	7 Apr 2009 20:06:15 -0000	1.4
@@ -1,19 +1,19 @@
-From cc3b0e11c8322c2c4f81e9964301157cfbcfdf16 Mon Sep 17 00:00:00 2001
+From feede446fb63401cdf36860427bc9feb7e903596 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
 Date: Tue, 31 Mar 2009 14:55:00 +0500
 Subject: [PATCH] add basic pxe boot support in efi
 
 ---
  efi/Makefile.am    |    2 +-
- efi/byteswap.h     |   37 ++++
- efi/dhcp.h         |  133 +++++++++++++++
+ efi/byteswap.h     |   37 +++++
+ efi/dhcp.h         |  133 ++++++++++++++++
  efi/eficore.c      |   12 ++
  efi/efimain.c      |   41 ++++--
  efi/efimisc.c      |   14 +-
- efi/efitftp.c      |  182 +++++++++++++++++++++
+ efi/efitftp.c      |  179 +++++++++++++++++++++
  efi/grub/efi/efi.h |    6 +
- efi/pxe.c          |  462 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- efi/pxe.h          |  237 +++++++++++++++++++++++++++
+ efi/pxe.c          |  440 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ efi/pxe.h          |  237 ++++++++++++++++++++++++++++
  grub/Makefile.am   |    2 +-
  grub/efitftp.c     |   34 ++++
  stage2/Makefile.am |    4 +-
@@ -21,7 +21,7 @@
  stage2/efistubs.c  |    7 +
  stage2/efistubs.h  |    8 +
  stage2/filesys.h   |   13 ++-
- 17 files changed, 1185 insertions(+), 26 deletions(-)
+ 17 files changed, 1160 insertions(+), 26 deletions(-)
  create mode 100644 efi/byteswap.h
  create mode 100644 efi/dhcp.h
  create mode 100644 efi/efitftp.c
@@ -317,7 +317,7 @@
  
  grub_efi_status_t
 diff --git a/efi/efimisc.c b/efi/efimisc.c
-index 4818617..d508ada 100644
+index 4818617..995be97 100644
 --- a/efi/efimisc.c
 +++ b/efi/efimisc.c
 @@ -489,11 +489,15 @@ grub_set_config_file (char *path_name)
@@ -336,17 +336,17 @@
 +    grub_memmove (config_file, path_name, path_name_len);
 +    grub_strcpy (config_file + path_name_len, DEFAULT_CONFIG_FILE_NAME);
 +  } else {
-+    grub_memmove (config_file, path_name, path_name_len);
++    grub_memmove (config_file, path_name, path_name_len+1);
 +  }
    if (path_name_len + sizeof (DEFAULT_SAVED_DEFAULT_FILE_NAME) > 128)
      return;
    path_name_len = dir_end + 1 - path_name;
 diff --git a/efi/efitftp.c b/efi/efitftp.c
 new file mode 100644
-index 0000000..9f207e3
+index 0000000..92cdf9b
 --- /dev/null
 +++ b/efi/efitftp.c
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,179 @@
 +#include <grub/efi/efi.h>
 +#include <grub/efi/api.h>
 +#include <grub/efi/misc.h>
@@ -413,7 +413,7 @@
 +static grub_efi_status_t tftp_read_file(
 +	char *Filename,
 +	char *Buffer,
-+	grub_efi_uint64_t BufferSize)
++	grub_efi_uintn_t BufferSize)
 +{
 +	EFI_PXE_BASE_CODE_TFTP_OPCODE OpCode = EFI_PXE_BASE_CODE_TFTP_READ_FILE;
 +	grub_efi_boolean_t Overwrite = 0;
@@ -511,11 +511,8 @@
 +
 +		tftp_info.Buffer = grub_malloc(filemax);
 +
-+		printf("rc: %d filemax: %d\n", rc, filemax);
 +		return 1;
 +	}
-+	printf("rc: %d filemax: %d\n", rc, filemax);
-+
 +	return 0;
 +}
 +
@@ -548,10 +545,10 @@
  grub_efi_handle_t *grub_efi_locate_handle (grub_efi_locate_search_type_t
 diff --git a/efi/pxe.c b/efi/pxe.c
 new file mode 100644
-index 0000000..b38b95a
+index 0000000..1863813
 --- /dev/null
 +++ b/efi/pxe.c
-@@ -0,0 +1,462 @@
+@@ -0,0 +1,440 @@
 +
 +#include <grub/efi/efi.h>
 +#include <grub/efi/api.h>
@@ -593,10 +590,8 @@
 +static void dhcp_option_parser_reset(dhcp_option_parser *parser,
 +				EFI_PXE_BASE_CODE_PACKET *packet)
 +{
-+	char *addr;
-+	//grub_uint64_t addr = (grub_uint64_t)(void *)packet;
++	grub_uint64_t addr = (grub_uint64_t)packet;
 +
-+	addr = (char *)packet;
 +	addr += offsetof(EFI_PXE_BASE_CODE_DHCPV4_PACKET, DhcpOptions);
 +	parser->current_option = (void *)addr;
 +	parser->options = (void *)addr;
@@ -605,15 +600,11 @@
 +static int dhcp_option_parser_next(dhcp_option_parser *parser,
 +				EFI_DHCP4_PACKET_OPTION **option)
 +{
-+	char *current_option;
 +	if (parser->current_option->OpCode == 255) {
 +		*option = NULL;
 +		return 0;
 +	}
-+	current_option = (char *)parser->current_option;
-+	current_option += 2 + parser->current_option->Length;
-+	parser->current_option = (EFI_DHCP4_PACKET_OPTION *)current_option;
-+
++	parser->current_option = (void *)((grub_uint64_t)parser->current_option + 2 + parser->current_option->Length);
 +	*option = parser->current_option;
 +	return 1;
 +}
@@ -846,84 +837,6 @@
 +	return 0;
 +}
 +
-+extern char *grub_efi_pxe_find_config_file(void);
-+char *grub_efi_pxe_find_config_file(void)
-+{
-+	EFI_PXE_BASE_CODE *pxe = NULL;
-+	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
-+	EFI_IP_ADDRESS serveraddr;
-+	char hex[] = "0123456789ABCDEF";
-+	char bootpsrvname[65];
-+	char bootpbootfile[129];
-+	char hexip[9];
-+	char *filepath = NULL;
-+	int hexiplen;
-+
-+	pxe = grub_efi_locate_protocol(&PxeBaseCodeProtocol, NULL);
-+	if (pxe == NULL)
-+		return NULL;
-+
-+	packet = &pxe->Mode->DhcpAck.Dhcpv4;
-+
-+	memcpy(&serveraddr, packet->BootpSiAddr, 4);
-+
-+	packet = &pxe->Mode->DhcpAck.Dhcpv4;
-+#if 0
-+	if (!memcmp(packet->BootpHwAddr + 6, "\x00\x00\x00\x00\x00"
-+					     "\x00\x00\x00\x00\x00", 10) &&
-+			memcmp(packet->BootpHwAddr, "\x00\x00\x00\x00\x00\x00",
-+				6)) {
-+		char mac[21];
-+		sprintf(mac, "00-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
-+			hex[(packet->BootpHwAddr[0] & 0xf0) >> 4],
-+			hex[packet->BootpHwAddr[0] & 0xf],
-+			hex[(packet->BootpHwAddr[1] & 0xf0) >> 4],
-+			hex[packet->BootpHwAddr[1] & 0xf],
-+			hex[(packet->BootpHwAddr[2] & 0xf0) >> 4],
-+			hex[packet->BootpHwAddr[2] & 0xf],
-+			hex[(packet->BootpHwAddr[3] & 0xf0) >> 4],
-+			hex[packet->BootpHwAddr[3] & 0xf],
-+			hex[(packet->BootpHwAddr[4] & 0xf0) >> 4],
-+			hex[packet->BootpHwAddr[4] & 0xf],
-+			hex[(packet->BootpHwAddr[5] & 0xf0) >> 4],
-+			hex[packet->BootpHwAddr[5] & 0xf]);
-+		if (grub_efi_pxe_check_for_file(pxe, &serveraddr,
-+					    packet->BootpBootFile, mac,
-+					    &filepath)) {
-+
-+			return filepath;
-+		}
-+	}
-+
-+	sprintf(hexip, "%c%c%c%c%c%c%c%c",
-+		hex[(packet->BootpYiAddr[0] & 0xf0) >> 4],
-+		hex[packet->BootpYiAddr[0] & 0xf],
-+		hex[(packet->BootpYiAddr[1] & 0xf0) >> 4],
-+		hex[packet->BootpYiAddr[1] & 0xf],
-+		hex[(packet->BootpYiAddr[2] & 0xf0) >> 4],
-+		hex[packet->BootpYiAddr[2] & 0xf],
-+		hex[(packet->BootpYiAddr[3] & 0xf0) >> 4],
-+		hex[packet->BootpYiAddr[3] & 0xf]);
-+
-+	for (hexiplen = strlen(hexip); hexiplen > 0; hexiplen--)
-+	{
-+		hexip[hexiplen] = '\0';
-+		if (grub_efi_pxe_check_for_file(pxe, &serveraddr,
-+					    packet->BootpBootFile, hexip,
-+					    &filepath)) {
-+			return filepath;
-+		}
-+	}
-+
-+
-+	if (grub_efi_pxe_check_for_file(pxe, &serveraddr, packet->BootpBootFile,
-+				    "efidefault", &filepath)) {
-+		return filepath;
-+	}
-+#endif
-+	return NULL;
-+}
-+
 +static void get_pxe_server(EFI_PXE_BASE_CODE *pxe, EFI_IP_ADDRESS **Address)
 +{
 +	EFI_IP_ADDRESS *tmp = grub_malloc(sizeof *tmp);
@@ -973,9 +886,12 @@
 +	char *FileName = NULL;
 +	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
 +	uuid_t uuid;
-+	grub_efi_uintn_t FileSize = 0;
++	size_t FileSize = 0;
 +	grub_efi_status_t rc = GRUB_EFI_SUCCESS;
 +	char *ConfigPath = NULL;
++	char hex[] = "0123456789ABCDEF";
++	char hexip[9];
++	int hexiplen;
 +
 +	pxe = grub_efi_locate_protocol(&PxeBaseCodeProtocol, NULL);
 +	if (pxe == NULL)
@@ -999,7 +915,6 @@
 +			uuid.clock_seq_hi, uuid.clock_seq_low,
 +			uuid.node[0], uuid.node[1], uuid.node[2],
 +			uuid.node[3], uuid.node[4], uuid.node[5]);
-+		printf("FileName: \"%s\"\n", FileName);
 +
 +		rc = tftp_get_file_size(FileName, &FileSize);
 +		if (rc == GRUB_EFI_SUCCESS) {
@@ -1012,6 +927,66 @@
 +		}
 +	}
 +
++	packet = &pxe->Mode->DhcpAck.Dhcpv4;
++
++	if (!memcmp(packet->BootpHwAddr + 6, "\x00\x00\x00\x00\x00"
++					     "\x00\x00\x00\x00\x00", 10) &&
++			memcmp(packet->BootpHwAddr, "\x00\x00\x00\x00\x00\x00",
++				6)) {
++		char mac[21];
++		sprintf(mac, "01-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
++			hex[(packet->BootpHwAddr[0] & 0xf0) >> 4],
++			hex[packet->BootpHwAddr[0] & 0xf],
++			hex[(packet->BootpHwAddr[1] & 0xf0) >> 4],
++			hex[packet->BootpHwAddr[1] & 0xf],
++			hex[(packet->BootpHwAddr[2] & 0xf0) >> 4],
++			hex[packet->BootpHwAddr[2] & 0xf],
++			hex[(packet->BootpHwAddr[3] & 0xf0) >> 4],
++			hex[packet->BootpHwAddr[3] & 0xf],
++			hex[(packet->BootpHwAddr[4] & 0xf0) >> 4],
++			hex[packet->BootpHwAddr[4] & 0xf],
++			hex[(packet->BootpHwAddr[5] & 0xf0) >> 4],
++			hex[packet->BootpHwAddr[5] & 0xf]);
++
++		rc = tftp_get_file_size(mac, &FileSize);
++		if (rc == GRUB_EFI_SUCCESS) {
++			char *ReturnFile = grub_malloc(strlen("(nd)/") +
++						strlen(mac) + 1);
++			sprintf(ReturnFile, "(nd)/%s", mac);
++			return ReturnFile;
++		}
++
++	}
++
++	sprintf(hexip, "%c%c%c%c%c%c%c%c",
++		hex[(packet->BootpYiAddr[0] & 0xf0) >> 4],
++		hex[packet->BootpYiAddr[0] & 0xf],
++		hex[(packet->BootpYiAddr[1] & 0xf0) >> 4],
++		hex[packet->BootpYiAddr[1] & 0xf],
++		hex[(packet->BootpYiAddr[2] & 0xf0) >> 4],
++		hex[packet->BootpYiAddr[2] & 0xf],
++		hex[(packet->BootpYiAddr[3] & 0xf0) >> 4],
++		hex[packet->BootpYiAddr[3] & 0xf]);
++
++	for (hexiplen = strlen(hexip); hexiplen > 0; hexiplen--)
++	{
++		hexip[hexiplen] = '\0';
++		rc = tftp_get_file_size(hexip, &FileSize);
++		if (rc == GRUB_EFI_SUCCESS) {
++			char *ReturnFile = grub_malloc(strlen("(nd)/") +
++						strlen(hexip) + 1);
++			sprintf(ReturnFile, "(nd)/%s", hexip);
++			return ReturnFile;
++		}
++	}
++
++	rc = tftp_get_file_size("efidefault", &FileSize);
++	if (rc == GRUB_EFI_SUCCESS) {
++		char *ReturnFile = grub_malloc(strlen("(nd)/efidefault")+1);
++		sprintf(ReturnFile, "(nd)/efidefault");
++		return ReturnFile;
++	}
++
 +	return NULL;
 +}
 diff --git a/efi/pxe.h b/efi/pxe.h
@@ -1458,5 +1433,5 @@
  
  /* defines for the block filesystem info area */
 -- 
-1.6.2.2
+1.6.2
 


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- grub.spec	6 Apr 2009 15:13:28 -0000	1.90
+++ grub.spec	7 Apr 2009 20:06:16 -0000	1.91
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 46%{?dist}
+Release: 47%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -37,7 +37,8 @@
 Patch9: grub-0.97-efigraph-use-blt.patch
 Patch10: grub-0.97-efislice.patch
 Patch11: grub-0.97-efistatus.patch
-Patch12: grub-0.97-efipxe.patch
+Patch12: grub-0.97-fat-lowercase.patch
+Patch13: grub-0.97-efipxe.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -60,6 +61,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 autoreconf
@@ -122,6 +124,11 @@
 %{_datadir}/grub
 
 %changelog
+* Tue Apr 07 2009 Peter Jones <pjones at redhat.com> - 0.97-47
+- Add more filenames to the tftp config file search list
+- Tweak FAT filename comparison...
+- Vomit.
+
 * Mon Apr 06 2009 Peter Jones <pjones at redhat.com> - 0.97-46
 - Update gnu-efi buildreq.
 - Fix up pxe code for i386



From pkgdb at fedoraproject.org  Tue Apr  7 21:32:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:32:10 +0000
Subject: [pkgdb] qca2: slankes has requested watchbugzilla
Message-ID: <20090407213121.6C83210F84A@bastion2.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on qca2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Tue Apr  7 21:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:32:25 +0000
Subject: [pkgdb] qca2: slankes has requested watchcommits
Message-ID: <20090407213135.A4CB310F84B@bastion2.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on qca2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Tue Apr  7 21:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:33:34 +0000
Subject: [pkgdb] qca2: slankes has requested commit
Message-ID: <20090407213244.C962F10F810@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on qca2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Tue Apr  7 21:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:33:52 +0000
Subject: [pkgdb] qca2: slankes has requested watchbugzilla
Message-ID: <20090407213302.E827210F84C@bastion2.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on qca2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Tue Apr  7 21:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:33:05 +0000
Subject: [pkgdb] qca2: slankes has requested watchcommits
Message-ID: <20090407213305.AAAC010F86B@bastion2.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on qca2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Tue Apr  7 21:33:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 21:33:57 +0000
Subject: [pkgdb] qca2: slankes has requested commit
Message-ID: <20090407213308.3946C10F871@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on qca2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From spot at fedoraproject.org  Tue Apr  7 21:38:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  7 Apr 2009 21:38:40 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.46, 1.47 asymptote.spec, 1.58,
	1.59 sources, 1.46, 1.47
Message-ID: <20090407213840.CCB4470100@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27587

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.69


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	25 Mar 2009 20:42:34 -0000	1.46
+++ .cvsignore	7 Apr 2009 21:38:10 -0000	1.47
@@ -1 +1 @@
-asymptote-1.68.src.tgz
+asymptote-1.69.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- asymptote.spec	25 Mar 2009 20:42:34 -0000	1.58
+++ asymptote.spec	7 Apr 2009 21:38:10 -0000	1.59
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.68
+Version:        1.69
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.69-1
+- update to 1.69
+
 * Wed Mar 25 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.68-1
 - update to 1.68
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	25 Mar 2009 20:42:34 -0000	1.46
+++ sources	7 Apr 2009 21:38:10 -0000	1.47
@@ -1 +1 @@
-61a7819027e30a435add7d1af73425bc  asymptote-1.68.src.tgz
+70c8a87bf19e6cec16fd210ca32d2608  asymptote-1.69.src.tgz



From sailer at fedoraproject.org  Tue Apr  7 21:47:09 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Tue,  7 Apr 2009 21:47:09 +0000 (UTC)
Subject: rpms/mingw32-qt-qmake/devel mingw32-qt-qmake.spec,1.2,1.3
Message-ID: <20090407214709.2F37970100@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-qt-qmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28606

Modified Files:
	mingw32-qt-qmake.spec 
Log Message:
disable empty debuginfo package
(instructions by ville.skytta at iki.fi)



Index: mingw32-qt-qmake.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt-qmake/devel/mingw32-qt-qmake.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-qt-qmake.spec	16 Mar 2009 02:15:46 -0000	1.2
+++ mingw32-qt-qmake.spec	7 Apr 2009 21:46:38 -0000	1.3
@@ -4,9 +4,11 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
+%global debug_package %{nil}
+
 Name:           mingw32-qt-qmake
 Version:        4.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -59,6 +61,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-3
+- disable empty debuginfo package
+
 * Mon Mar 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-2
 - add missing BR
 



From pkgdb at fedoraproject.org  Tue Apr  7 22:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 07 Apr 2009 22:04:22 +0000
Subject: [pkgdb] l2tpd had acl change status
Message-ID: <20090407220333.2321210F84A@bastion2.fedora.phx.redhat.com>

pwouters has set the watchcommits acl on l2tpd (Fedora 10) to Obsolete for jmahecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/l2tpd



From tgl at fedoraproject.org  Tue Apr  7 23:42:10 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue,  7 Apr 2009 23:42:10 +0000 (UTC)
Subject: rpms/mysql/devel mysql-setschedparam.patch, NONE, 1.1 .cvsignore,
	1.36, 
	1.37 mysql-plugin-bug.patch, 1.4, 1.5 mysql-stack.patch, 1.12,
	1.13 mysql.spec, 1.116, 1.117 sources, 1.36, 1.37
Message-ID: <20090407234210.C8EEB70100@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10357

Modified Files:
	.cvsignore mysql-plugin-bug.patch mysql-stack.patch mysql.spec 
	sources 
Added Files:
	mysql-setschedparam.patch 
Log Message:
Update to MySQL 5.1.33

mysql-setschedparam.patch:

--- NEW FILE mysql-setschedparam.patch ---
mysql tries to use pthread_setschedparam() with policy = SCHED_OTHER,
which is not standardized and is not presently supported on Red Hat
platforms; in fact it generates lots of SELinux warnings (bug #477624).
Easiest fix is to disable the configure test for it.


diff -Naur mysql-5.1.33.orig/configure.in mysql-5.1.33/configure.in
--- mysql-5.1.33.orig/configure.in	2009-03-13 17:48:52.000000000 -0400
+++ mysql-5.1.33/configure.in	2009-04-07 19:27:25.000000000 -0400
@@ -2046,10 +2046,10 @@
   localtime_r gethrtime gmtime_r \
   locking longjmp lrand48 madvise mallinfo memcpy memmove \
   mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \
-  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \
+  pthread_attr_getstacksize pthread_attr_setprio \
   pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \
   pthread_key_delete pthread_rwlock_rdlock pthread_setprio \
-  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \
+  pthread_setprio_np pthread_sigmask readlink \
   realpath rename rint rwlock_init setupterm \
   shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \
   sighold sigset sigthreadmask port_create sleep \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	5 Mar 2009 02:50:07 -0000	1.36
+++ .cvsignore	7 Apr 2009 23:41:39 -0000	1.37
@@ -1 +1 @@
-mysql-5.1.32.tar.gz
+mysql-5.1.33.tar.gz

mysql-plugin-bug.patch:

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysql-plugin-bug.patch	5 Mar 2009 02:50:07 -0000	1.4
+++ mysql-plugin-bug.patch	7 Apr 2009 23:41:39 -0000	1.5
@@ -7,12 +7,12 @@
 For the moment, just disable this test.
 
 
-diff -Naur mysql-5.1.32.orig/mysql-test/t/disabled.def mysql-5.1.32/mysql-test/t/disabled.def
---- mysql-5.1.32.orig/mysql-test/t/disabled.def	2009-02-13 20:34:40.000000000 -0500
-+++ mysql-5.1.32/mysql-test/t/disabled.def	2009-03-04 18:48:34.000000000 -0500
-@@ -12,3 +12,5 @@
+diff -Naur mysql-5.1.33.orig/mysql-test/t/disabled.def mysql-5.1.33/mysql-test/t/disabled.def
+--- mysql-5.1.33.orig/mysql-test/t/disabled.def	2009-03-13 18:39:40.000000000 -0400
++++ mysql-5.1.33/mysql-test/t/disabled.def	2009-04-07 17:20:13.000000000 -0400
+@@ -11,3 +11,5 @@
+ ##############################################################################
  kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
- query_cache_28249        : Bug#41098 Query Cache returns wrong result with concurrent insert
  innodb_bug39438          : BUG#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
 +#
 +plugin_load     : gives wrong answer on PPC64

mysql-stack.patch:

Index: mysql-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mysql-stack.patch	14 Jan 2009 17:10:05 -0000	1.12
+++ mysql-stack.patch	7 Apr 2009 23:41:39 -0000	1.13
@@ -8,6 +8,10 @@
 to provide some headroom, which means that its value can't be raised too much
 further without increasing the latter as well.
 
+As of 5.1.33 the stock value is 16000, which might be enough ... or maybe
+not.  For the moment, we keep this patch around for reference, but it's
+not being applied.
+
 
 diff -Naur mysql-5.1.30.orig/sql/mysql_priv.h mysql-5.1.30/sql/mysql_priv.h
 --- mysql-5.1.30.orig/sql/mysql_priv.h	2008-11-14 11:37:13.000000000 -0500


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mysql.spec	5 Mar 2009 02:50:07 -0000	1.116
+++ mysql.spec	7 Apr 2009 23:41:39 -0000	1.117
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.32
+Version: 5.1.33
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -25,11 +25,12 @@
 
 Patch1: mysql-ssl-multilib.patch
 Patch2: mysql-errno.patch
-Patch3: mysql-stack.patch
+# Patch3: mysql-stack.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-install-test.patch
 Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
+Patch8: mysql-setschedparam.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -165,11 +166,12 @@
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+# %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 libtoolize --force
 aclocal
@@ -635,6 +637,11 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Apr  7 2009 Tom Lane <tgl at redhat.com> 5.1.33-1
+- Update to MySQL 5.1.33.
+- Disable use of pthread_setschedparam; doesn't work the way code expects.
+Related: #477624
+
 * Wed Mar  4 2009 Tom Lane <tgl at redhat.com> 5.1.32-1
 - Update to MySQL 5.1.32.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Mar 2009 02:50:07 -0000	1.36
+++ sources	7 Apr 2009 23:41:39 -0000	1.37
@@ -1 +1 @@
-f2d14b5e3b9d50b809c9b9985e4513b7  mysql-5.1.32.tar.gz
+9c5711e9bea4514df6f2659f283f0aa0  mysql-5.1.33.tar.gz



From mjakubicek at fedoraproject.org  Tue Apr  7 23:42:29 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue,  7 Apr 2009 23:42:29 +0000 (UTC)
Subject: rpms/boinc-client/devel boinc-client-logrotate-d, 1.1,
	1.2 boinc-client.spec, 1.33, 1.34
Message-ID: <20090407234229.B9FE170100@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10405

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix logrotate script (resolves BZ#494179).




Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-logrotate-d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-client-logrotate-d	25 Mar 2008 20:13:30 -0000	1.1
+++ boinc-client-logrotate-d	7 Apr 2009 23:41:59 -0000	1.2
@@ -9,7 +9,8 @@
 
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
-# Last Modified: October 15, 2007
+# Modified: Milos Jakubicek <xjakub at fi.muni.cz>
+# Last Modified: April 7, 2009
 ######################################################################
 
 # Global Parameters
@@ -22,55 +23,24 @@
 
 # Log Specific Parameters
 
-# boinc.log
+# boinc.log and boincerr.log
 
-# Normal usage:
-# Rotate weekly and keep about 2 months worth
-
-/var/log/boinc.log
-{
-	weekly
-	rotate 8
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
-}
-
-
-# boincerr.log
-
-# Normal usage:
-# Rotate monthly and keep about 2 months worth
-
-/var/log/boincerr.log
+/var/log/boinc.log /var/log/boincerr.log
 {
-	monthly
-	rotate 2
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
+        create 664 boinc boinc
+        sharedscripts
+        prerotate
+          if [ -f /var/lock/subsys/boinc ]; then
+            touch /var/run/boinc_was_running
+            /etc/init.d/boinc-client stop
+          fi
+        endscript
+        postrotate
+          if [ -f /var/run/boinc_was_running ]; then
+            rm /var/run/boinc_was_running
+            /etc/init.d/boinc-client start
+          fi
+        endscript
 }
 
 ## EOF ##


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- boinc-client.spec	27 Mar 2009 14:38:58 -0000	1.33
+++ boinc-client.spec	7 Apr 2009 23:41:59 -0000	1.34
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	8.r%{revision}svn%{?dist}
+Release:	9.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -331,6 +331,9 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-9.r17542svn
+- Fix logrotate script (resolves BZ#494179).
+
 * Fri Mar 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-8.r17542svn
 - Make the -doc subpackage noarch.
 



From kevin at fedoraproject.org  Tue Apr  7 23:42:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  7 Apr 2009 23:42:41 +0000 (UTC)
Subject: rpms/libzrtpcpp/devel libzrtpcpp.spec, 1.2, 1.3 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <20090407234241.AAC4570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzrtpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10435

Modified Files:
	libzrtpcpp.spec sources .cvsignore 
Log Message:
Update to 1.4.3 and rebuild against new ccrtp



Index: libzrtpcpp.spec
===================================================================
RCS file: /cvs/extras/rpms/libzrtpcpp/devel/libzrtpcpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzrtpcpp.spec	25 Feb 2009 20:16:04 -0000	1.2
+++ libzrtpcpp.spec	7 Apr 2009 23:42:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libzrtpcpp
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        ZRTP support library for the GNU ccRTP stack
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 07 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.3-1
+- Update to 1.4.3 and rebuild against new ccrtp
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libzrtpcpp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 21:09:15 -0000	1.2
+++ sources	7 Apr 2009 23:42:11 -0000	1.3
@@ -1 +1 @@
-e2abd4f7cf68496d0772dd7e5a71873a  libzrtpcpp-1.3.0.tar.gz
+84386a596578a7c0c92c7b999a7f16f0  libzrtpcpp-1.4.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libzrtpcpp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 21:09:15 -0000	1.2
+++ .cvsignore	7 Apr 2009 23:42:11 -0000	1.3
@@ -1 +1 @@
-libzrtpcpp-1.3.0.tar.gz
+libzrtpcpp-1.4.3.tar.gz



From mjakubicek at fedoraproject.org  Wed Apr  8 00:01:33 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed,  8 Apr 2009 00:01:33 +0000 (UTC)
Subject: rpms/boinc-client/F-10 boinc-client-logrotate-d, 1.1,
	1.2 boinc-client.spec, 1.28, 1.29
Message-ID: <20090408000133.4B2687011A@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12541

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix logrotate script (resolves BZ#494179).




Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client-logrotate-d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-client-logrotate-d	25 Mar 2008 20:13:30 -0000	1.1
+++ boinc-client-logrotate-d	8 Apr 2009 00:01:02 -0000	1.2
@@ -9,7 +9,8 @@
 
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
-# Last Modified: October 15, 2007
+# Modified: Milos Jakubicek <xjakub at fi.muni.cz>
+# Last Modified: April 7, 2009
 ######################################################################
 
 # Global Parameters
@@ -22,55 +23,24 @@
 
 # Log Specific Parameters
 
-# boinc.log
+# boinc.log and boincerr.log
 
-# Normal usage:
-# Rotate weekly and keep about 2 months worth
-
-/var/log/boinc.log
-{
-	weekly
-	rotate 8
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
-}
-
-
-# boincerr.log
-
-# Normal usage:
-# Rotate monthly and keep about 2 months worth
-
-/var/log/boincerr.log
+/var/log/boinc.log /var/log/boincerr.log
 {
-	monthly
-	rotate 2
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
+        create 664 boinc boinc
+        sharedscripts
+        prerotate
+          if [ -f /var/lock/subsys/boinc ]; then
+            touch /var/run/boinc_was_running
+            /etc/init.d/boinc-client stop
+          fi
+        endscript
+        postrotate
+          if [ -f /var/run/boinc_was_running ]; then
+            rm /var/run/boinc_was_running
+            /etc/init.d/boinc-client start
+          fi
+        endscript
 }
 
 ## EOF ##


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- boinc-client.spec	27 Mar 2009 14:53:49 -0000	1.28
+++ boinc-client.spec	8 Apr 2009 00:01:02 -0000	1.29
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	8.r%{revision}svn%{?dist}
+Release:	9.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -331,6 +331,9 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-9.r17542svn
+- Fix logrotate script (resolves BZ#494179).
+
 * Fri Mar 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-8.r17542svn
 - Make the -doc subpackage noarch.
 



From mjakubicek at fedoraproject.org  Wed Apr  8 00:05:47 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed,  8 Apr 2009 00:05:47 +0000 (UTC)
Subject: rpms/orsa/devel orsa-file.patch,1.1,1.2
Message-ID: <20090408000547.0F24D7011A@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975

Modified Files:
	orsa-file.patch 
Log Message:
-Fix orsa-file.patch so as not to segfault on missing jpl file.



orsa-file.patch:

Index: orsa-file.patch
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa-file.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orsa-file.patch	7 Apr 2009 16:08:40 -0000	1.1
+++ orsa-file.patch	8 Apr 2009 00:05:16 -0000	1.2
@@ -82,3 +82,14 @@
        location_file = new LocationFile; 
        location_file->SetFileName(config->paths[OBSCODE]->GetValue().c_str());
        location_file->Open();
+--- src/libxorsa/xorsa_all_objects_popup.cc.orig	2009-04-08 01:49:01.000000000 +0200
++++ src/libxorsa/xorsa_all_objects_popup.cc	2009-04-08 01:49:15.000000000 +0200
+@@ -60,7 +60,7 @@
+     id_import_JPL = import_pm->insertItem("JPL",listview,SLOT(slot_import_JPL()));
+     // enabled only if a JPL file is available from the config file
+     {
+-      if (!(jpl_file->GoodFile())) {
++      if (jpl_file && !(jpl_file->GoodFile())) {
+ 	import_pm->setItemEnabled(id_import_JPL,false);
+       }
+     }



From mjakubicek at fedoraproject.org  Wed Apr  8 00:12:29 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed,  8 Apr 2009 00:12:29 +0000 (UTC)
Subject: rpms/orsa/devel orsa.spec,1.5,1.6
Message-ID: <20090408001229.0BA227011A@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14375

Modified Files:
	orsa.spec 
Log Message:
- release bump on spec file only, related to fixing orsa-file.patch in order to prevent segfaults when jpl file is missing



Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- orsa.spec	7 Apr 2009 16:08:40 -0000	1.5
+++ orsa.spec	8 Apr 2009 00:11:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:			orsa
 Version:		0.7.0
-Release:		6%{?dist}
+Release:		7%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -93,6 +93,9 @@
 %{_libdir}/libxorsa.so
 
 %changelog
+* Tue Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-7
+- Fix segfault on missing jpl file.
+
 * Tue Apr 07 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-6
 - Do not complain loudly if the configuration file is missing (fix #494342)
 



From mjakubicek at fedoraproject.org  Wed Apr  8 00:12:58 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed,  8 Apr 2009 00:12:58 +0000 (UTC)
Subject: rpms/boinc-client/F-9 boinc-client-logrotate-d, 1.1,
	1.2 boinc-client.spec, 1.21, 1.22
Message-ID: <20090408001258.E074A7011A@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14558

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix logrotate script (resolves BZ#494179).




Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client-logrotate-d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-client-logrotate-d	25 Mar 2008 20:13:30 -0000	1.1
+++ boinc-client-logrotate-d	8 Apr 2009 00:12:28 -0000	1.2
@@ -9,7 +9,8 @@
 
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
-# Last Modified: October 15, 2007
+# Modified: Milos Jakubicek <xjakub at fi.muni.cz>
+# Last Modified: April 7, 2009
 ######################################################################
 
 # Global Parameters
@@ -22,55 +23,24 @@
 
 # Log Specific Parameters
 
-# boinc.log
+# boinc.log and boincerr.log
 
-# Normal usage:
-# Rotate weekly and keep about 2 months worth
-
-/var/log/boinc.log
-{
-	weekly
-	rotate 8
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
-}
-
-
-# boincerr.log
-
-# Normal usage:
-# Rotate monthly and keep about 2 months worth
-
-/var/log/boincerr.log
+/var/log/boinc.log /var/log/boincerr.log
 {
-	monthly
-	rotate 2
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
+        create 664 boinc boinc
+        sharedscripts
+        prerotate
+          if [ -f /var/lock/subsys/boinc ]; then
+            touch /var/run/boinc_was_running
+            /etc/init.d/boinc-client stop
+          fi
+        endscript
+        postrotate
+          if [ -f /var/run/boinc_was_running ]; then
+            rm /var/run/boinc_was_running
+            /etc/init.d/boinc-client start
+          fi
+        endscript
 }
 
 ## EOF ##


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- boinc-client.spec	27 Mar 2009 01:12:45 -0000	1.21
+++ boinc-client.spec	8 Apr 2009 00:12:28 -0000	1.22
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	7.r%{revision}svn%{?dist}
+Release:	8.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -330,6 +330,9 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-8.r17542svn
+- Fix logrotate script (resolves BZ#494179).
+
 * Thu Mar 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-7.r17542svn
 - Split most documentation into a separate -doc subpackage (resolves #492442).
 



From dodji at fedoraproject.org  Wed Apr  8 00:26:44 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Wed,  8 Apr 2009 00:26:44 +0000 (UTC)
Subject: rpms/cloog/devel
	cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch,
	1.1, 1.2 cloog.spec, 1.3, 1.4
Message-ID: <20090408002644.340FE7011A@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16718

Modified Files:
	cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch 
	cloog.spec 
Log Message:
* Wed Apr 08 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.6.gitad32
- Remove the cloog.info that is in the tarball
  That forces the regeneration of a new cloog.info with
  suitable INFO_DIR_SECTION, so that install-info doesn't cry
  at install time.
- Slightly changed the patch to make install-info actually
  install the cloog information in the info directory file.
- Run install-info --delete in %preun, not in %postun,
  otherwise the info file is long gone with we try to
  run install-info --delete on it.



cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch:

Index: cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch	6 Apr 2009 21:14:20 -0000	1.1
+++ cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch	8 Apr 2009 00:26:43 -0000	1.2
@@ -21,9 +21,9 @@
  @setfilename cloog.info
  @settitle CLooG - a loop generator for scanning polyhedra
  
-+ at dircategory Software development
++ at dircategory Software libraries
 + at direntry
-+* cloog: (cloog)  A loop generator for scanning polyhedra
++* cloog: (cloog).  A loop generator for scanning polyhedra
 + at end direntry
 +
  @set EDITION 2.1


Index: cloog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/cloog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cloog.spec	6 Apr 2009 20:08:59 -0000	1.3
+++ cloog.spec	8 Apr 2009 00:26:43 -0000	1.4
@@ -1,7 +1,7 @@
 %define         git_revision   gitad322
 Name:           cloog
 Version:        0.15
-Release:        0.5.%{git_revision}%{?dist}
+Release:        0.6.%{git_revision}%{?dist}
 Summary:        The Chunky Loop Generator
 
 Group:          System Environment/Libraries
@@ -52,6 +52,10 @@
 
 %build
 %configure --with-ppl=%{_prefix}
+# Remove the cloog.info in the tarball
+# to force the re-generation of a new one
+# with our Patch0 applied.
+test -f doc/cloog.info && rm doc/cloog.info
 # Remove the -fomit-frame-pointer compile flag
 make %{?_smp_mflags} AM_CFLAGS=
 
@@ -81,14 +85,26 @@
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-%postun ppl
-/sbin/ldconfig
+%preun ppl
 if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
+%postun ppl -p /sbin/ldconfig
+
 %changelog
-* Mon Apr 06 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.5.gitfcceb
+* Wed Apr 08 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.6.gitad322
+- Remove the cloog.info that is in the tarball
+  That forces the regeneration of a new cloog.info with
+  suitable INFO_DIR_SECTION, so that install-info doesn't cry
+  at install time.
+- Slightly changed the patch to make install-info actually
+  install the cloog information in the info directory file.
+- Run install-info --delete in %preun, not in %postun,
+  otherwise the info file is long gone with we try to
+  run install-info --delete on it.
+
+* Mon Apr 06 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.5.gitad322
 - Added patch to fix #492794
 - Need to add an argument to the --with-ppl switch now.
 



From dodji at fedoraproject.org  Wed Apr  8 00:40:06 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Wed,  8 Apr 2009 00:40:06 +0000 (UTC)
Subject: rpms/cloog/devel cloog.spec,1.4,1.5
Message-ID: <20090408004006.282527011A@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18934

Modified Files:
	cloog.spec 
Log Message:
* Wed Apr 08 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.7.gitad322
- Add BuildRequire texinfo needed to regenerate the cloog.info doc




Index: cloog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/cloog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cloog.spec	8 Apr 2009 00:26:43 -0000	1.4
+++ cloog.spec	8 Apr 2009 00:39:35 -0000	1.5
@@ -1,7 +1,7 @@
 %define         git_revision   gitad322
 Name:           cloog
 Version:        0.15
-Release:        0.6.%{git_revision}%{?dist}
+Release:        0.7.%{git_revision}%{?dist}
 Summary:        The Chunky Loop Generator
 
 Group:          System Environment/Libraries
@@ -22,7 +22,7 @@
 # Patch Sent upstream
 Patch0 :        cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ppl-devel >= 0.10, gmp-devel >= 4.1.3
+BuildRequires:  ppl-devel >= 0.10, gmp-devel >= 4.1.3, texinfo >= 4.12
 Requires(post): info
 Requires(preun): info
 
@@ -93,6 +93,9 @@
 %postun ppl -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 08 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.7.gitad322
+- Add BuildRequire texinfo needed to regenerate the cloog.info doc
+
 * Wed Apr 08 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.6.gitad322
 - Remove the cloog.info that is in the tarball
   That forces the regeneration of a new cloog.info with



From dwalsh at fedoraproject.org  Wed Apr  8 01:00:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  8 Apr 2009 01:00:16 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.20,
	1.21 modules-targeted.conf, 1.122, 1.123 nsadiff, 1.4,
	1.5 policy-20090105.patch, 1.82, 1.83 selinux-policy.spec, 1.819,
	1.820
Message-ID: <20090408010016.DC62B7011A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21780

Modified Files:
	modules-minimum.conf modules-targeted.conf nsadiff 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-1
- Upgrade to latest upstream
- Allow devicekit_disk sys_rawio



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- modules-minimum.conf	3 Apr 2009 14:45:58 -0000	1.20
+++ modules-minimum.conf	8 Apr 2009 00:59:45 -0000	1.21
@@ -427,7 +427,7 @@
 # 
 gpsd = module
 
-# Layer: apps
+# Layer: services
 # Module: git
 #
 # Policy for the stupid content tracker


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- modules-targeted.conf	3 Apr 2009 14:45:58 -0000	1.122
+++ modules-targeted.conf	8 Apr 2009 00:59:45 -0000	1.123
@@ -427,7 +427,7 @@
 # 
 gpsd = module
 
-# Layer: apps
+# Layer: services
 # Module: git
 #
 # Policy for the stupid content tracker


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsadiff	6 Apr 2009 17:07:59 -0000	1.4
+++ nsadiff	8 Apr 2009 00:59:45 -0000	1.5
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.11 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.12 > /tmp/diff

policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.82 -r 1.83 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- policy-20090105.patch	7 Apr 2009 11:29:08 -0000	1.82
+++ policy-20090105.patch	8 Apr 2009 00:59:45 -0000	1.83
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.11/config/appconfig-mcs/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.12/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -22,15 +22,15 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.11/config/appconfig-mcs/failsafe_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.11/config/appconfig-mcs/failsafe_context	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context	2009-04-07 16:01:44.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/root_default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -45,18 +45,18 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.11/config/appconfig-mcs/seusers
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.12/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.11/config/appconfig-mcs/seusers	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/seusers	2009-04-07 16:01:44.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +root:unconfined_u:s0-mcs_systemhigh
 +__default__:unconfined_u:s0-mcs_systemhigh
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/staff_u_default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -71,9 +71,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/unconfined_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -87,15 +87,15 @@
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.11/config/appconfig-mcs/userhelper_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.11/config/appconfig-mcs/userhelper_context	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context	2009-04-07 16:01:44.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.11/config/appconfig-mcs/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/user_u_default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -108,20 +108,20 @@
 -
 +system_r:initrc_su_t:s0		user_r:user_t:s0
 +user_r:user_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.11/config/appconfig-mcs/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/virtual_domain_context	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.11/config/appconfig-mcs/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mcs/virtual_image_context	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.11/config/appconfig-mls/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.12/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mls/default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -143,9 +143,9 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.11/config/appconfig-mls/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mls/root_default_contexts	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts	2009-04-07 16:01:44.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -164,20 +164,20 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.11/config/appconfig-mls/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mls/virtual_domain_context	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.11/config/appconfig-mls/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/config/appconfig-mls/virtual_image_context	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.11/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.12/Makefile
 --- nsaserefpolicy/Makefile	2009-01-19 11:07:35.000000000 -0500
-+++ serefpolicy-3.6.11/Makefile	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/Makefile	2009-04-07 16:01:44.000000000 -0400
 @@ -241,7 +241,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -240,9 +240,9 @@
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.11/man/man8/httpd_selinux.8
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.12/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.11/man/man8/httpd_selinux.8	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-07 16:01:44.000000000 -0400
 @@ -22,7 +22,7 @@
  .EX
  httpd_sys_content_t 
@@ -266,9 +266,9 @@
  .EX
  httpd_unconfined_script_exec_t  
  .EE 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.11/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/policy/global_tunables	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/global_tunables	2009-04-07 16:01:44.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -298,9 +298,9 @@
 +gen_tunable(allow_console_login,false)
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.11/policy/mcs
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.12/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-02-03 22:50:50.000000000 -0500
-+++ serefpolicy-3.6.11/policy/mcs	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/mcs	2009-04-07 16:01:44.000000000 -0400
 @@ -67,7 +67,7 @@
  # Note that getattr on files is always permitted.
  #
@@ -332,9 +332,9 @@
  
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.11/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.12/policy/modules/admin/anaconda.te
[...3793 lines suppressed...]
-+')
-+
-+optional_policy(`
- 	xserver_read_xdm_pid(udev_t)
- ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.11/policy/modules/system/unconfined.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.12/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.11/policy/modules/system/unconfined.fc	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.fc	2009-04-07 16:01:44.000000000 -0400
 @@ -2,15 +2,28 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -26827,9 +26648,9 @@
 +/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.11/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/unconfined.if	2009-04-07 07:26:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-07 16:01:44.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -27125,9 +26946,9 @@
 +
 +	allow $1 unconfined_r;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.11/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/unconfined.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-07 16:01:44.000000000 -0400
 @@ -5,6 +5,35 @@
  #
  # Declarations
@@ -27490,9 +27311,9 @@
 +
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 +	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.11/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.12/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/userdomain.fc	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.fc	2009-04-07 16:01:44.000000000 -0400
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -27502,9 +27323,9 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.11/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/userdomain.if	2009-04-07 07:23:04.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-07 16:01:44.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29384,9 +29205,9 @@
 +	dontaudit $1 userdomain:unix_stream_socket rw_socket_perms;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.11/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/userdomain.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-07 16:01:44.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -29470,14 +29291,14 @@
 +	fs_read_cifs_named_sockets(userhomereader)
 +	fs_read_cifs_named_pipes(userhomereader)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.11/policy/modules/system/virtual.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.12/policy/modules/system/virtual.fc
 --- nsaserefpolicy/policy/modules/system/virtual.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/virtual.fc	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.fc	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1 @@
 +# No application file contexts.
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.11/policy/modules/system/virtual.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.12/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/virtual.if	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
@@ -29593,9 +29414,9 @@
 +	allow $1 virtualdomain:process { setsched transition signal signull sigkill };
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.11/policy/modules/system/virtual.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.12/policy/modules/system/virtual.te
 --- nsaserefpolicy/policy/modules/system/virtual.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/virtual.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.te	2009-04-07 16:01:44.000000000 -0400
 @@ -0,0 +1,80 @@
 +
 +policy_module(virtualization, 1.1.2)
@@ -29677,9 +29498,9 @@
 +	xserver_read_xdm_pid(virtualdomain)
 +	xserver_rw_shm(virtualdomain)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.11/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.12/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/xen.fc	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.fc	2009-04-07 16:01:44.000000000 -0400
 @@ -1,32 +1,31 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -29719,9 +29540,9 @@
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.11/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.12/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/xen.if	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-07 16:01:44.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -29785,9 +29606,9 @@
 +        files_search_pids($1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.11/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.11/policy/modules/system/xen.te	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-07 16:01:44.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -30057,9 +29878,9 @@
 +libs_use_ld_so(evtchnd_t)
 +libs_use_shared_libs(evtchnd_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/ipc_patterns.spt serefpolicy-3.6.11/policy/support/ipc_patterns.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/ipc_patterns.spt serefpolicy-3.6.12/policy/support/ipc_patterns.spt
 --- nsaserefpolicy/policy/support/ipc_patterns.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.11/policy/support/ipc_patterns.spt	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/ipc_patterns.spt	2009-04-07 16:01:44.000000000 -0400
 @@ -3,12 +3,12 @@
  #
  define(`stream_connect_pattern',`
@@ -30075,9 +29896,9 @@
 +	allow $1 $3:sock_file { getattr write };
  	allow $1 $4:unix_dgram_socket sendto;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.11/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.11/policy/support/obj_perm_sets.spt	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-07 16:01:44.000000000 -0400
 @@ -225,7 +225,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')
@@ -30101,9 +29922,9 @@
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.11/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.12/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.11/policy/users	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/users	2009-04-07 16:01:44.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -30128,9 +29949,9 @@
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.11/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.12/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/Rules.modular	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/Rules.modular	2009-04-07 16:01:44.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -30160,9 +29981,9 @@
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.11/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.12/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.11/support/Makefile.devel	2009-04-06 12:59:54.000000000 -0400
++++ serefpolicy-3.6.12/support/Makefile.devel	2009-04-07 16:01:44.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- selinux-policy.spec	6 Apr 2009 17:07:59 -0000	1.819
+++ selinux-policy.spec	8 Apr 2009 00:59:46 -0000	1.820
@@ -19,7 +19,7 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.11
+Version: 3.6.12
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -187,7 +187,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision  2943.
+Based off of reference policy: Checked out revision  2945.
 
 %build
 
@@ -444,6 +444,10 @@
 %endif
 
 %changelog
+* Tue Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-1
+- Upgrade to latest upstream
+- Allow devicekit_disk sys_rawio
+
 * Mon Apr 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.11-1
 - Dontaudit binds to ports < 1024 for named
 - Upgrade to latest upstream



From roland at fedoraproject.org  Wed Apr  8 01:32:29 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Wed,  8 Apr 2009 01:32:29 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1504,
	1.1505 linux-2.6-tracehook.patch, 1.8,
	1.9 linux-2.6-utrace.patch, 1.109,
	1.110 linux-2.6-utrace-ftrace.patch, 1.2, NONE
Message-ID: <20090408013229.92DC87011A@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26257

Modified Files:
	kernel.spec linux-2.6-tracehook.patch linux-2.6-utrace.patch 
Removed Files:
	linux-2.6-utrace-ftrace.patch 
Log Message:
utrace update, drop unfinished utrace-ftrace


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1504
retrieving revision 1.1505
diff -u -r1.1504 -r1.1505
--- kernel.spec	7 Apr 2009 17:13:39 -0000	1.1504
+++ kernel.spec	8 Apr 2009 01:31:58 -0000	1.1505
@@ -1067,8 +1067,7 @@
 
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-tracehook.patch
-#ApplyPatch linux-2.6-utrace.patch
-#ApplyPatch linux-2.6-utrace-ftrace.patch
+ApplyPatch linux-2.6-utrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1825,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr  7 2009 Roland McGrath <roland at redhat.com>
+- utrace update, drop unfinished utrace-ftrace
+
 * Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.29-git15
 - EXT3_DEFAULTS_TO_ORDERED on for now.

linux-2.6-tracehook.patch:

Index: linux-2.6-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-tracehook.patch	19 Mar 2009 08:03:53 -0000	1.8
+++ linux-2.6-tracehook.patch	8 Apr 2009 01:31:58 -0000	1.9
@@ -19,7 +19,7 @@
  2 files changed, 51 insertions(+), 43 deletions(-)
 
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 6186a78..b622498 100644  
+index c7aa154..4ec4821 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -1,7 +1,7 @@
@@ -31,7 +31,7 @@
   *
   * This copyrighted material is made available to anyone wishing to use,
   * modify, copy, or redistribute it subject to the terms and conditions
-@@ -469,22 +469,29 @@ static inline int tracehook_get_signal(s
+@@ -464,22 +464,29 @@ static inline int tracehook_get_signal(s
  
  /**
   * tracehook_notify_jctl - report about job control stop/continue
@@ -70,10 +70,10 @@
  
  #define DEATH_REAP			-1
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 2a74fe8..9a0d98f 100644  
+index d803473..424eff2 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -691,7 +691,7 @@ static int prepare_signal(int sig, struc
+@@ -702,7 +702,7 @@ static int prepare_signal(int sig, struc
  
  		if (why) {
  			/*
@@ -82,7 +82,7 @@
  			 * will take ->siglock, notice SIGNAL_CLD_MASK, and
  			 * notify its parent. See get_signal_to_deliver().
  			 */
-@@ -1629,29 +1629,6 @@ void ptrace_notify(int exit_code)
+@@ -1665,29 +1665,6 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -112,7 +112,7 @@
  /*
   * This performs the stopping for SIGSTOP and other stop signals.
   * We have to stop all threads in the thread group.
-@@ -1662,6 +1639,7 @@ static int do_signal_stop(int signr)
+@@ -1698,6 +1675,7 @@ static int do_signal_stop(int signr)
  {
  	struct signal_struct *sig = current->signal;
  	int stop_count;
@@ -120,7 +120,7 @@
  
  	if (sig->group_stop_count > 0) {
  		/*
-@@ -1701,8 +1679,30 @@ static int do_signal_stop(int signr)
+@@ -1737,8 +1715,30 @@ static int do_signal_stop(int signr)
  	current->exit_code = sig->group_exit_code;
  	__set_current_state(TASK_STOPPED);
  
@@ -152,7 +152,7 @@
  	return 1;
  }
  
-@@ -1771,14 +1771,15 @@ relock:
+@@ -1807,14 +1807,15 @@ relock:
  		int why = (signal->flags & SIGNAL_STOP_CONTINUED)
  				? CLD_CONTINUED : CLD_STOPPED;
  		signal->flags &= ~SIGNAL_CLD_MASK;
@@ -174,7 +174,7 @@
  		goto relock;
  	}
  
-@@ -1936,14 +1937,14 @@ void exit_signals(struct task_struct *ts
+@@ -1979,14 +1980,14 @@ void exit_signals(struct task_struct *ts
  	if (unlikely(tsk->signal->group_stop_count) &&
  			!--tsk->signal->group_stop_count) {
  		tsk->signal->flags = SIGNAL_STOP_STOPPED;

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- linux-2.6-utrace.patch	23 Mar 2009 02:27:36 -0000	1.109
+++ linux-2.6-utrace.patch	8 Apr 2009 01:31:58 -0000	1.110
@@ -30,17 +30,17 @@
  fs/proc/array.c                   |    3 +
  include/linux/init_task.h         |    1 +
  include/linux/sched.h             |    6 +
- include/linux/tracehook.h         |   50 +-
+ include/linux/tracehook.h         |   61 +-
  include/linux/utrace.h            |  692 +++++++++++
  include/linux/utrace_struct.h     |   58 +
  init/Kconfig                      |    9 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |   18 +-
- kernel/utrace.c                   | 2348 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3756 insertions(+), 3 deletions(-)
+ kernel/utrace.c                   | 2351 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 3770 insertions(+), 3 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1462ed8..f5da1b4 100644  
+index a3a83d3..0a07ba9 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
@@ -51,7 +51,7 @@
 +	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
- 	    mac80211.xml debugobjects.xml sh.xml regulator.xml
+ 	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
 index ...b802c55 100644  
@@ -651,10 +651,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index e752d97..39eebc8 100644  
+index dcfb933..5625de6 100644  
 --- a/include/linux/init_task.h
 +++ b/include/linux/init_task.h
-@@ -181,6 +181,7 @@ extern struct cred init_cred;
+@@ -183,6 +183,7 @@ extern struct cred init_cred;
  		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
  	},								\
  	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
@@ -663,7 +663,7 @@
  	INIT_TRACE_IRQFLAGS						\
  	INIT_LOCKDEP							\
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 011db2f..786ef2d 100644  
+index 98e1fe5..e9c3350 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -59,6 +59,7 @@ struct sched_param {
@@ -674,7 +674,7 @@
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -1287,6 +1288,11 @@ struct task_struct {
+@@ -1290,6 +1291,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -687,7 +687,7 @@
     	u32 parent_exec_id;
     	u32 self_exec_id;
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index b622498..6ff7277 100644  
+index 4ec4821..a7de30f 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -796,18 +796,18 @@
  	if (stepping)
  		ptrace_notify(SIGTRAP);
  }
-@@ -400,6 +422,8 @@ static inline int tracehook_consider_ign
- 						    int sig,
- 						    void __user *handler)
+@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand
+ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
+ 						    int sig)
  {
 +	if (unlikely(task_utrace_flags(task) & UTRACE_EVENT(SIGNAL_IGN)))
 +		return 1;
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -421,6 +445,9 @@ static inline int tracehook_consider_fat
- 						  int sig,
- 						  void __user *handler)
+@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign
+ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
+ 						  int sig)
  {
 +	if (unlikely(task_utrace_flags(task) & (UTRACE_EVENT(SIGNAL_TERM) |
 +						UTRACE_EVENT(SIGNAL_CORE))))
@@ -815,7 +815,7 @@
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -435,6 +462,8 @@ static inline int tracehook_consider_fat
+@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat
   */
  static inline int tracehook_force_sigpending(void)
  {
@@ -824,7 +824,7 @@
  	return 0;
  }
  
-@@ -464,6 +493,8 @@ static inline int tracehook_get_signal(s
+@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s
  				       siginfo_t *info,
  				       struct k_sigaction *return_ka)
  {
@@ -833,7 +833,7 @@
  	return 0;
  }
  
-@@ -491,6 +522,8 @@ static inline int tracehook_get_signal(s
+@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s
   */
  static inline int tracehook_notify_jctl(int notify, int why)
  {
@@ -842,26 +842,37 @@
  	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
  }
  
-@@ -514,6 +547,8 @@ static inline int tracehook_notify_jctl(
+@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(
  static inline int tracehook_notify_death(struct task_struct *task,
  					 void **death_cookie, int group_dead)
  {
 +	*death_cookie = task_utrace_struct(task);
 +
- 	if (task->exit_signal == -1)
+ 	if (task_detached(task))
  		return task->ptrace ? SIGCHLD : DEATH_REAP;
  
-@@ -550,6 +585,9 @@ static inline void tracehook_report_deat
+@@ -545,6 +580,20 @@ static inline void tracehook_report_deat
  					  int signal, void *death_cookie,
  					  int group_dead)
  {
++	/*
++	 * This barrier ensures that our caller's setting of
++	 * @task->exit_state precedes checking @task->utrace_flags here.
++	 * If utrace_set_events() was just called to enable
++	 * UTRACE_EVENT(DEATH), then we are obliged to call
++	 * utrace_report_death() and not miss it.  utrace_set_events()
++	 * uses tasklist_lock to synchronize enabling the bit with the
++	 * actual change to @task->exit_state, but we need this barrier
++	 * to be sure we see a flags change made just before our caller
++	 * took the tasklist_lock.
++	 */
 +	smp_mb();
 +	if (task_utrace_flags(task) & _UTRACE_DEATH_EVENTS)
 +		utrace_report_death(task, death_cookie, group_dead, signal);
  }
  
  #ifdef TIF_NOTIFY_RESUME
-@@ -579,10 +617,20 @@ static inline void set_notify_resume(str
+@@ -574,10 +623,20 @@ static inline void set_notify_resume(str
   * asynchronously, this will be called again before we return to
   * user mode.
   *
@@ -1646,10 +1657,10 @@
 +
 +#endif	/* linux/utrace_struct.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 6a5c5fe..4b5ab3e 100644  
+index f2f9b53..0d104d9 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1060,6 +1060,15 @@ config STOP_MACHINE
+@@ -1141,6 +1141,15 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1666,7 +1677,7 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index e4791b3..7bff724 100644  
+index 4242366..a79634e 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1678,7 +1689,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index c9cf48b..41e9542 100644  
+index aaad0ec..8ba9b73 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1689,7 +1700,7 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/audit.h>
-@@ -172,6 +173,14 @@ bool ptrace_may_access(struct task_struc
+@@ -176,6 +177,14 @@ bool ptrace_may_access(struct task_struc
  	return (!err ? true : false);
  }
  
@@ -1704,7 +1715,7 @@
  int ptrace_attach(struct task_struct *task)
  {
  	int retval;
-@@ -210,6 +219,11 @@ repeat:
+@@ -214,6 +223,11 @@ repeat:
  		goto repeat;
  	}
  
@@ -1716,7 +1727,7 @@
  	if (!task->mm)
  		goto bad;
  	/* the same process cannot be attached many times */
-@@ -515,7 +529,9 @@ int ptrace_traceme(void)
+@@ -590,7 +604,9 @@ int ptrace_traceme(void)
  	 */
  repeat:
  	task_lock(current);
@@ -1729,10 +1740,10 @@
  		 */
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...115be79 100644  
+index ...c2bb162 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2348 @@
+@@ -0,0 +1,2351 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -3249,25 +3260,7 @@
 +		 */
 +		return true;
 +
-+	if (unlikely(report.result == UTRACE_SYSCALL_ABORT))
-+		return true;
-+
-+	if (signal_pending(task)) {
-+		/*
-+		 * Clear TIF_SIGPENDING if it no longer needs to be set.
-+		 * It may have been set as part of quiescence, and won't
-+		 * ever have been cleared by another thread.  For other
-+		 * reports, we can just leave it set and will go through
-+		 * utrace_get_signal() to reset things.  But here we are
-+		 * about to enter a syscall, which might bail out with an
-+		 * -ERESTART* error if it's set now.
-+		 */
-+		spin_lock_irq(&task->sighand->siglock);
-+		recalc_sigpending();
-+		spin_unlock_irq(&task->sighand->siglock);
-+	}
-+
-+	return false;
++	return report.result == UTRACE_SYSCALL_ABORT;
 +}
 +
 +/*
@@ -3498,12 +3491,29 @@
 +			set_tsk_thread_flag(task, TIF_SIGPENDING);
 +		break;
 +
-+	case UTRACE_SINGLESTEP:
-+		user_enable_single_step(task);
-+		break;
-+
 +	case UTRACE_BLOCKSTEP:
-+		user_enable_block_step(task);
++		if (likely(arch_has_block_step())) {
++			user_enable_block_step(task);
++			break;
++		}
++
++		/*
++		 * This means some callback is to blame for failing
++		 * to check arch_has_block_step() itself.  Warn and
++		 * then fall through to treat it as SINGLESTEP.
++		 */
++		WARN_ON(1);
++
++	case UTRACE_SINGLESTEP:
++		if (likely(arch_has_single_step()))
++			user_enable_single_step(task);
++		else
++			/*
++			 * This means some callback is to blame for failing
++			 * to check arch_has_single_step() itself.  Spew
++			 * about it so the loser will fix his module.
++			 */
++			WARN_ON(1);
 +		break;
 +
 +	case UTRACE_REPORT:
@@ -3548,11 +3558,15 @@
 +	}
 +
 +	/*
-+	 * If UTRACE_INTERRUPT was just used, we don't bother with a
-+	 * report here.  We will report and stop in utrace_get_signal().
++	 * If UTRACE_INTERRUPT was just used, we don't bother with a report
++	 * here.  We will report and stop in utrace_get_signal().  In case
++	 * of a race with utrace_control(), make sure we don't momentarily
++	 * return to user mode because TIF_SIGPENDING was not set yet.
 +	 */
-+	if (unlikely(utrace->interrupt))
++	if (unlikely(utrace->interrupt)) {
++		set_thread_flag(TIF_SIGPENDING);
 +		return;
++	}
 +
 +	/*
 +	 * Do a simple reporting pass, with no callback after report_quiesce.


--- linux-2.6-utrace-ftrace.patch DELETED ---



From pgordon at fedoraproject.org  Wed Apr  8 01:36:42 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  8 Apr 2009 01:36:42 +0000 (UTC)
Subject: rpms/deluge/F-10 .cvsignore, 1.53, 1.54 deluge.spec, 1.79,
	1.80 sources, 1.53, 1.54
Message-ID: <20090408013642.865217011A@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26862/F-10

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.1.6; License fix (GPLv2+ --> GPLv3 with OpenSSL exception)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Mar 2009 04:18:11 -0000	1.53
+++ .cvsignore	8 Apr 2009 01:36:12 -0000	1.54
@@ -1 +1 @@
-deluge-1.1.5.tar.bz2
+deluge-1.1.6.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/deluge.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- deluge.spec	27 Mar 2009 04:18:11 -0000	1.79
+++ deluge.spec	8 Apr 2009 01:36:12 -0000	1.80
@@ -2,11 +2,11 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	1.1.5
+Version:	1.1.6
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
-License:	GPLv2+
+License:	GPLv3 with exceptions
 URL:		http://deluge-torrent.org/           
 
 Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2
@@ -156,6 +156,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.6-1
+- Update to new upstream bug-fix release (1.1.6)
+- Fix GPL version, add OpenSSL exception to License.
+
 * Thu Mar 26 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.5-1
 - Update to new upstream bug-fix release (1.1.5)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	27 Mar 2009 04:18:11 -0000	1.53
+++ sources	8 Apr 2009 01:36:12 -0000	1.54
@@ -1 +1 @@
-027fec63e189a39939df6777c0426814  deluge-1.1.5.tar.bz2
+78ef75153bbd5ef6a06ed876d66a9fb9  deluge-1.1.6.tar.bz2



From dp67 at fedoraproject.org  Wed Apr  8 01:44:03 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Wed,  8 Apr 2009 01:44:03 +0000 (UTC)
Subject: rpms/ax25-tools/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 ax25-tools.spec, 1.3, 1.4 sources, 1.2,
	1.3 ax25-tools-0.0.8-Unix98-ptmx.patch, 1.1,
	NONE ax25-tools-0.0.8-soundmodem.h.patch, 1.1, NONE
Message-ID: <20090408014403.63CD97011A@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/ax25-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28476/devel

Modified Files:
	.cvsignore ax25-tools.spec sources 
Added Files:
	import.log 
Removed Files:
	ax25-tools-0.0.8-Unix98-ptmx.patch 
	ax25-tools-0.0.8-soundmodem.h.patch 
Log Message:

Upstream upgrade to 0.0.9



--- NEW FILE import.log ---
ax25-tools-0_0_9-1_fc9:HEAD:ax25-tools-0.0.9-1.fc9.src.rpm:1239154929


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Feb 2008 23:30:42 -0000	1.2
+++ .cvsignore	8 Apr 2009 01:43:32 -0000	1.3
@@ -1 +1 @@
-ax25-tools-0.0.8.tar.gz
+ax25-tools.tar.gz


Index: ax25-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/devel/ax25-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ax25-tools.spec	24 Feb 2009 03:48:00 -0000	1.3
+++ ax25-tools.spec	8 Apr 2009 01:43:32 -0000	1.4
@@ -1,22 +1,26 @@
 Name:           ax25-tools
-Version:        0.0.8
-Release:        4%{?dist}
+Version:        0.0.9
+Release:        1%{?dist}
 Summary:        Tools used to configure an ax.25 enabled computer
 
 Group:          Applications/Communications
 License:        GPLv2+
-URL:            http://ax25.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
-#Patch by Daniel Schepler to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel 
-Patch0:         %{name}-%{version}-soundmodem.h.patch
-#Patch by Thomas Sailer to work around issue with BSD style pseudo-terminal not being supported anymore. Adds support for Unix98 pseudo-terminals.
-Patch1:         %{name}-%{version}-Unix98-ptmx.patch
+URL:            http://www.linux-ax25.org/wiki/LinuxAX25
+Source0:        http://www.linux-ax25.org/cvsweb/%{name}/%{name}.tar.gz
+
+# Patch to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel 
+# Patch0:
+# Patch by Thomas Sailer to work around issue with BSD style pseudo-terminal
+# not being supported anymore. Adds support for Unix98 pseudo-terminals.
+# Patch1:         %{name}-%{version}-Unix98-ptmx.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	automake
 BuildRequires:  libax25-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  libXt-devel, fltk-devel
+BuildRequires:  libXt-devel
+BuildRequires:	fltk-devel
 
 %description
 ax25-tools is a collection of tools that are used to configure an ax.25 enabled
@@ -24,11 +28,12 @@
 as Net/ROM and ROSE configuration.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p0
+%setup -qn %{name}
+#%patch0 -p1
+#%patch1 -p1
 
 %build
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -53,8 +58,10 @@
 %{_mandir}/man?/*
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Mar 12 2009 Randall J. Berry <dp67 at fedoraproject.org> 0.0.9-1
+- Upstream update to 0.0.9, #488049
+- Upstream URL has changed
+- Remove patches applied to newer source
 
 * Thu Dec 11 2008 Sindre Pedersen Bj??rdal <foolish at guezz.net> 0.0.8-3
 - Fix pseudo-terminal issue, #475045


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2008 23:30:42 -0000	1.2
+++ sources	8 Apr 2009 01:43:32 -0000	1.3
@@ -1 +1 @@
-70172b979b38a9434f21d2e8152f0d5e  ax25-tools-0.0.8.tar.gz
+08f1d4990c628346cc01fad6de19a46c  ax25-tools.tar.gz


--- ax25-tools-0.0.8-Unix98-ptmx.patch DELETED ---


--- ax25-tools-0.0.8-soundmodem.h.patch DELETED ---



From dp67 at fedoraproject.org  Wed Apr  8 02:08:18 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Wed,  8 Apr 2009 02:08:18 +0000 (UTC)
Subject: rpms/ax25-tools/F-10 .cvsignore, 1.2, 1.3 ax25-tools.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090408020818.E9B957011A@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/ax25-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31441

Modified Files:
	.cvsignore ax25-tools.spec sources 
Log Message:

Upstream Upgrade to 0.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Feb 2008 23:30:42 -0000	1.2
+++ .cvsignore	8 Apr 2009 02:07:48 -0000	1.3
@@ -1 +1 @@
-ax25-tools-0.0.8.tar.gz
+ax25-tools.tar.gz


Index: ax25-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/F-10/ax25-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ax25-tools.spec	11 Dec 2008 07:10:13 -0000	1.2
+++ ax25-tools.spec	8 Apr 2009 02:07:48 -0000	1.3
@@ -1,22 +1,26 @@
 Name:           ax25-tools
-Version:        0.0.8
-Release:        3%{?dist}
+Version:        0.0.9
+Release:        1%{?dist}
 Summary:        Tools used to configure an ax.25 enabled computer
 
 Group:          Applications/Communications
 License:        GPLv2+
-URL:            http://ax25.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
-#Patch by Daniel Schepler to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel 
-Patch0:         %{name}-%{version}-soundmodem.h.patch
-#Patch by Thomas Sailer to work around issue with BSD style pseudo-terminal not being supported anymore. Adds support for Unix98 pseudo-terminals.
-Patch1:         %{name}-%{version}-Unix98-ptmx.patch
+URL:            http://www.linux-ax25.org/wiki/LinuxAX25
+Source0:        http://www.linux-ax25.org/cvsweb/%{name}/%{name}.tar.gz
+
+# Patch to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel 
+# Patch0:
+# Patch by Thomas Sailer to work around issue with BSD style pseudo-terminal
+# not being supported anymore. Adds support for Unix98 pseudo-terminals.
+# Patch1:         %{name}-%{version}-Unix98-ptmx.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	automake
 BuildRequires:  libax25-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  libXt-devel, fltk-devel
+BuildRequires:  libXt-devel
+BuildRequires:	fltk-devel
 
 %description
 ax25-tools is a collection of tools that are used to configure an ax.25 enabled
@@ -24,11 +28,12 @@
 as Net/ROM and ROSE configuration.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p0
+%setup -qn %{name}
+#%patch0 -p1
+#%patch1 -p1
 
 %build
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -52,7 +57,12 @@
 %{_sbindir}/*
 %{_mandir}/man?/*
 
-%changelog 
+%changelog
+* Thu Mar 12 2009 Randall J. Berry <dp67 at fedoraproject.org> 0.0.9-1
+- Upstream update to 0.0.9, #488049
+- Upstream URL has changed
+- Remove patches applied to newer source
+
 * Thu Dec 11 2008 Sindre Pedersen Bj??rdal <foolish at guezz.net> 0.0.8-3
 - Fix pseudo-terminal issue, #475045
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-tools/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2008 23:30:42 -0000	1.2
+++ sources	8 Apr 2009 02:07:48 -0000	1.3
@@ -1 +1 @@
-70172b979b38a9434f21d2e8152f0d5e  ax25-tools-0.0.8.tar.gz
+08f1d4990c628346cc01fad6de19a46c  ax25-tools.tar.gz



From jeckersb at fedoraproject.org  Wed Apr  8 02:13:44 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Wed,  8 Apr 2009 02:13:44 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.6, 1.7 python-netaddr.spec, 
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090408021344.CA2227011A@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv397

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
new upstream bugfix release 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Feb 2009 17:49:15 -0000	1.6
+++ .cvsignore	8 Apr 2009 02:13:14 -0000	1.7
@@ -1,2 +1 @@
-netaddr-0.5.2.tar.gz
-netaddr-0.6.tar.gz
+netaddr-0.6.1.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-netaddr.spec	26 Feb 2009 22:30:37 -0000	1.8
+++ python-netaddr.spec	8 Apr 2009 02:13:14 -0000	1.9
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-netaddr
-Version:        0.6
-Release:        3%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Apr 7 2009 John Eckersberg <jeckersb at redhat.com> - 0.6.1-1
+- New upstream bugfix release
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Feb 2009 17:49:16 -0000	1.6
+++ sources	8 Apr 2009 02:13:14 -0000	1.7
@@ -1,2 +1 @@
-94154b32c371a1b1f4d11beda853017f  netaddr-0.5.2.tar.gz
-6a530de5c21296342f76f8a799cd8ef1  netaddr-0.6.tar.gz
+029bbcd05dfb06056fa141cf3634b68f  netaddr-0.6.1.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 02:17:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:17:15 +0000
Subject: [pkgdb] libzrtpcpp (Fedora EPEL, 5) updated by kevin
Message-ID: <20090408021626.045D910F84C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libzrtpcpp
kevin has set commit to Approved for provenpackager on libzrtpcpp (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on libzrtpcpp (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on libzrtpcpp (Fedora EPEL 5)
kevin changed owner of libzrtpcpp in Fedora EPEL 5 to wolfy
kevin approved watchbugzilla on libzrtpcpp (Fedora EPEL 5) for kevin
kevin approved watchcommits on libzrtpcpp (Fedora EPEL 5) for kevin
kevin approved commit on libzrtpcpp (Fedora EPEL 5) for kevin
kevin approved build on libzrtpcpp (Fedora EPEL 5) for kevin
kevin approved approveacls on libzrtpcpp (Fedora EPEL 5) for kevin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzrtpcpp



From pkgdb at fedoraproject.org  Wed Apr  8 02:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:32:23 +0000
Subject: [pkgdb] gavl was added for kwizart
Message-ID: <20090408023134.71B7010F84C@bastion2.fedora.phx.redhat.com>

kevin has added Package gavl with summary A library for handling uncompressed audio and video data
kevin has approved Package gavl
kevin has added a Fedora devel branch for gavl with an owner of kwizart
kevin has approved gavl in Fedora devel
kevin has approved Package gavl
kevin has set commit to Approved for provenpackager on gavl (Fedora devel)
kevin has set build to Approved for provenpackager on gavl (Fedora devel)
kevin has set checkout to Approved for provenpackager on gavl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gavl



From pkgdb at fedoraproject.org  Wed Apr  8 02:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:31:36 +0000
Subject: [pkgdb] gavl (Fedora, 9) updated by kevin
Message-ID: <20090408023136.91A0210F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gavl
kevin has set commit to Approved for provenpackager on gavl (Fedora 9)
kevin has set build to Approved for provenpackager on gavl (Fedora 9)
kevin has set checkout to Approved for provenpackager on gavl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gavl



From kevin at fedoraproject.org  Wed Apr  8 02:31:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:31:51 +0000 (UTC)
Subject: rpms/gavl - New directory
Message-ID: <20090408023151.439767011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gavl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFu1944/rpms/gavl

Log Message:
Directory /cvs/pkgs/rpms/gavl added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:31:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:31:51 +0000 (UTC)
Subject: rpms/gavl/devel - New directory
Message-ID: <20090408023151.8452F7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gavl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFu1944/rpms/gavl/devel

Log Message:
Directory /cvs/pkgs/rpms/gavl/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:31:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:31:59 +0000 (UTC)
Subject: rpms/gavl Makefile,NONE,1.1
Message-ID: <20090408023159.E72CB7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gavl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFu1944/rpms/gavl

Added Files:
	Makefile 
Log Message:
Setup of module gavl


--- NEW FILE Makefile ---
# Top level Makefile for module gavl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:32:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:32:00 +0000 (UTC)
Subject: rpms/gavl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090408023200.3564C7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gavl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFu1944/rpms/gavl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gavl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gavl
# $Id: Makefile,v 1.1 2009/04/08 02:32:00 kevin Exp $
NAME := gavl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:31:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:31:37 +0000
Subject: [pkgdb] gavl (Fedora, 10) updated by kevin
Message-ID: <20090408023136.99BE310F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gavl
kevin has set commit to Approved for provenpackager on gavl (Fedora 10)
kevin has set build to Approved for provenpackager on gavl (Fedora 10)
kevin has set checkout to Approved for provenpackager on gavl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gavl



From cebbert at fedoraproject.org  Wed Apr  8 02:34:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  8 Apr 2009 02:34:35 +0000 (UTC)
Subject: rpms/kerneloops/devel kerneloops.spec,1.17,1.18
Message-ID: <20090408023435.49E517011A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2267

Modified Files:
	kerneloops.spec 
Log Message:
Log the URL of the last patch submitted to the system log (#493963)


Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kerneloops.spec	8 Mar 2009 12:09:39 -0000	1.17
+++ kerneloops.spec	8 Apr 2009 02:34:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		kerneloops
 Version:	0.12
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Tool to automatically collect and submit kernel crash signatures
 
 Group:		System Environment/Base
@@ -8,7 +8,8 @@
 URL:		http://www.kerneloops.org
 Source0:	http://www.kerneloops.org/download/%{name}-%{version}.tar.gz
 Source1:	kerneloops.service
-Patch:		kerneloops-0.12-dbus-service-activate.patch
+Patch0:		kerneloops-0.12-dbus-service-activate.patch
+Patch1:		kerneloops-0.12-log_result_url.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	curl-devel
@@ -28,7 +29,8 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -66,6 +68,9 @@
 %doc %{_mandir}/man8/kerneloops.8.gz
 
 %changelog
+* Tue Apr 07 2009 Chuck Ebbert <cebbert at redhat.com>  0.12-5
+- Log the URL of the last patch submitted to the system log (#493963)
+
 * Sun Mar 08 2009 Lubomir Rintel <lkundrak at v3.sk> 0.12-4
 - Don't install the initscript, deinstall if present
 



From cebbert at fedoraproject.org  Wed Apr  8 02:35:47 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  8 Apr 2009 02:35:47 +0000 (UTC)
Subject: rpms/kerneloops/devel kerneloops-0.12-log_result_url.patch, NONE,
	1.1
Message-ID: <20090408023547.5B6387011A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2499

Added Files:
	kerneloops-0.12-log_result_url.patch 
Log Message:
add the new patch

kerneloops-0.12-log_result_url.patch:

--- NEW FILE kerneloops-0.12-log_result_url.patch ---
Index: kerneloops-0.12/submit.c
===================================================================
--- kerneloops-0.12.orig/submit.c
+++ kerneloops-0.12/submit.c
@@ -175,10 +175,12 @@ static void print_queue(void)
 
 }
 
-static void write_logfile(int count)
+static void write_logfile(int count, char *result_url)
 {
 	openlog("kerneloops", 0, LOG_KERN);
 	syslog(LOG_WARNING, "Submitted %i kernel oopses to www.kerneloops.org", count);
+	if (result_url && strlen(result_url))
+		syslog(LOG_WARNING, "URL of last kerneloops report: %s\n", result_url);
 	closelog();
 }
 
@@ -255,7 +257,7 @@ void submit_queue(void)
 	}
 
 	if (count && !testmode)
-		write_logfile(count);
+		write_logfile(count, result_url);
 
 	if (count)
 		dbus_say_thanks(result_url);
@@ -284,7 +286,7 @@ void clear_queue(void)
 		free(oops);
 		oops = next;
 	}
-	write_logfile(0);
+	write_logfile(0, NULL);
 }
 
 void ask_permission(void)



From pkgdb at fedoraproject.org  Wed Apr  8 02:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:38:53 +0000
Subject: [pkgdb] ocaml-autoconf was added for rjones
Message-ID: <20090408023804.17FEC10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package ocaml-autoconf with summary Autoconf macros for OCaml
kevin has approved Package ocaml-autoconf
kevin has added a Fedora devel branch for ocaml-autoconf with an owner of rjones
kevin has approved ocaml-autoconf in Fedora devel
kevin has approved Package ocaml-autoconf
kevin has set commit to Approved for provenpackager on ocaml-autoconf (Fedora devel)
kevin has set build to Approved for provenpackager on ocaml-autoconf (Fedora devel)
kevin has set checkout to Approved for provenpackager on ocaml-autoconf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-autoconf



From pkgdb at fedoraproject.org  Wed Apr  8 02:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:38:54 +0000
Subject: [pkgdb] ocaml-autoconf (Fedora, 10) updated by kevin
Message-ID: <20090408023806.7BB5F10F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ocaml-autoconf
kevin has set commit to Approved for provenpackager on ocaml-autoconf (Fedora 10)
kevin has set build to Approved for provenpackager on ocaml-autoconf (Fedora 10)
kevin has set checkout to Approved for provenpackager on ocaml-autoconf (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-autoconf



From pkgdb at fedoraproject.org  Wed Apr  8 02:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:38:54 +0000
Subject: [pkgdb] ocaml-autoconf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090408023806.9066510F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ocaml-autoconf
kevin has set commit to Approved for provenpackager on ocaml-autoconf (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on ocaml-autoconf (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on ocaml-autoconf (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-autoconf



From pkgdb at fedoraproject.org  Wed Apr  8 02:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:38:54 +0000
Subject: [pkgdb] ocaml-autoconf (Fedora, 11) updated by kevin
Message-ID: <20090408023807.4F14D10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ocaml-autoconf
kevin has set commit to Approved for provenpackager on ocaml-autoconf (Fedora 11)
kevin has set build to Approved for provenpackager on ocaml-autoconf (Fedora 11)
kevin has set checkout to Approved for provenpackager on ocaml-autoconf (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-autoconf



From kevin at fedoraproject.org  Wed Apr  8 02:38:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:38:15 +0000 (UTC)
Subject: rpms/ocaml-autoconf - New directory
Message-ID: <20090408023815.2E49D7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-autoconf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrt2790/rpms/ocaml-autoconf

Log Message:
Directory /cvs/pkgs/rpms/ocaml-autoconf added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:38:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:38:15 +0000 (UTC)
Subject: rpms/ocaml-autoconf/devel - New directory
Message-ID: <20090408023815.6A5067011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrt2790/rpms/ocaml-autoconf/devel

Log Message:
Directory /cvs/pkgs/rpms/ocaml-autoconf/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:38:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:38:23 +0000 (UTC)
Subject: rpms/ocaml-autoconf Makefile,NONE,1.1
Message-ID: <20090408023823.345657011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-autoconf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrt2790/rpms/ocaml-autoconf

Added Files:
	Makefile 
Log Message:
Setup of module ocaml-autoconf


--- NEW FILE Makefile ---
# Top level Makefile for module ocaml-autoconf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:38:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:38:23 +0000 (UTC)
Subject: rpms/ocaml-autoconf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408023823.8FC977011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrt2790/rpms/ocaml-autoconf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocaml-autoconf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ocaml-autoconf
# $Id: Makefile,v 1.1 2009/04/08 02:38:23 kevin Exp $
NAME := ocaml-autoconf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:39:23 +0000
Subject: [pkgdb] jamin was added for oget
Message-ID: <20090408023923.1D16F10F861@bastion2.fedora.phx.redhat.com>

kevin has added Package jamin with summary JACK Audio Connection Kit (JACK) Audio Mastering interface
kevin has approved Package jamin
kevin has added a Fedora devel branch for jamin with an owner of oget
kevin has approved jamin in Fedora devel
kevin has approved Package jamin
kevin has set commit to Approved for provenpackager on jamin (Fedora devel)
kevin has set build to Approved for provenpackager on jamin (Fedora devel)
kevin has set checkout to Approved for provenpackager on jamin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jamin



From pkgdb at fedoraproject.org  Wed Apr  8 02:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:40:19 +0000
Subject: [pkgdb] jamin (Fedora, 9) updated by kevin
Message-ID: <20090408023931.C1C6210F870@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for jamin
kevin has set commit to Approved for provenpackager on jamin (Fedora 9)
kevin has set build to Approved for provenpackager on jamin (Fedora 9)
kevin has set checkout to Approved for provenpackager on jamin (Fedora 9)
kevin approved watchbugzilla on jamin (Fedora 9) for nando
kevin approved watchcommits on jamin (Fedora 9) for nando
kevin approved commit on jamin (Fedora 9) for nando
kevin approved build on jamin (Fedora 9) for nando
kevin approved approveacls on jamin (Fedora 9) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jamin



From pkgdb at fedoraproject.org  Wed Apr  8 02:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:40:19 +0000
Subject: [pkgdb] jamin (Fedora, 10) updated by kevin
Message-ID: <20090408023931.CA0FD10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jamin
kevin has set commit to Approved for provenpackager on jamin (Fedora 10)
kevin has set build to Approved for provenpackager on jamin (Fedora 10)
kevin has set checkout to Approved for provenpackager on jamin (Fedora 10)
kevin approved watchbugzilla on jamin (Fedora 10) for nando
kevin approved watchcommits on jamin (Fedora 10) for nando
kevin approved commit on jamin (Fedora 10) for nando
kevin approved build on jamin (Fedora 10) for nando
kevin approved approveacls on jamin (Fedora 10) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jamin



From pkgdb at fedoraproject.org  Wed Apr  8 02:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:40:19 +0000
Subject: [pkgdb] jamin (Fedora, devel) updated by kevin
Message-ID: <20090408023931.DE24210F879@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on jamin (Fedora devel) for nando
kevin approved watchcommits on jamin (Fedora devel) for nando
kevin approved commit on jamin (Fedora devel) for nando
kevin approved build on jamin (Fedora devel) for nando
kevin approved approveacls on jamin (Fedora devel) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jamin



From kevin at fedoraproject.org  Wed Apr  8 02:39:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:39:41 +0000 (UTC)
Subject: rpms/jamin - New directory
Message-ID: <20090408023941.256367011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jamin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD3071/rpms/jamin

Log Message:
Directory /cvs/pkgs/rpms/jamin added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:39:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:39:41 +0000 (UTC)
Subject: rpms/jamin/devel - New directory
Message-ID: <20090408023941.613767011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jamin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD3071/rpms/jamin/devel

Log Message:
Directory /cvs/pkgs/rpms/jamin/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:39:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:39:49 +0000 (UTC)
Subject: rpms/jamin Makefile,NONE,1.1
Message-ID: <20090408023949.930467011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jamin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD3071/rpms/jamin

Added Files:
	Makefile 
Log Message:
Setup of module jamin


--- NEW FILE Makefile ---
# Top level Makefile for module jamin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:39:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:39:50 +0000 (UTC)
Subject: rpms/jamin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090408023950.072F77011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jamin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD3071/rpms/jamin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jamin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jamin
# $Id: Makefile,v 1.1 2009/04/08 02:39:49 kevin Exp $
NAME := jamin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:41:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:41:25 +0000
Subject: [pkgdb] django-sct was added for ivazquez
Message-ID: <20090408024035.D84E410F86A@bastion2.fedora.phx.redhat.com>

kevin has added Package django-sct with summary A collection of Django applications for building community websites
kevin has approved Package django-sct
kevin has added a Fedora devel branch for django-sct with an owner of ivazquez
kevin has approved django-sct in Fedora devel
kevin has approved Package django-sct
kevin has set commit to Approved for provenpackager on django-sct (Fedora devel)
kevin has set build to Approved for provenpackager on django-sct (Fedora devel)
kevin has set checkout to Approved for provenpackager on django-sct (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/django-sct



From pkgdb at fedoraproject.org  Wed Apr  8 02:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:40:37 +0000
Subject: [pkgdb] django-sct (Fedora, 10) updated by kevin
Message-ID: <20090408024037.8948310F870@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for django-sct
kevin has set commit to Approved for provenpackager on django-sct (Fedora 10)
kevin has set build to Approved for provenpackager on django-sct (Fedora 10)
kevin has set checkout to Approved for provenpackager on django-sct (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/django-sct



From kevin at fedoraproject.org  Wed Apr  8 02:40:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:40:46 +0000 (UTC)
Subject: rpms/django-sct - New directory
Message-ID: <20090408024046.227DA7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-sct
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRM3334/rpms/django-sct

Log Message:
Directory /cvs/pkgs/rpms/django-sct added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:40:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:40:46 +0000 (UTC)
Subject: rpms/django-sct/devel - New directory
Message-ID: <20090408024046.5FEF57011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-sct/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRM3334/rpms/django-sct/devel

Log Message:
Directory /cvs/pkgs/rpms/django-sct/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:40:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:40:54 +0000 (UTC)
Subject: rpms/django-sct Makefile,NONE,1.1
Message-ID: <20090408024054.8C3867011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-sct
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRM3334/rpms/django-sct

Added Files:
	Makefile 
Log Message:
Setup of module django-sct


--- NEW FILE Makefile ---
# Top level Makefile for module django-sct
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:40:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:40:55 +0000 (UTC)
Subject: rpms/django-sct/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408024055.28DDD7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-sct/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRM3334/rpms/django-sct/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-sct


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-sct
# $Id: Makefile,v 1.1 2009/04/08 02:40:54 kevin Exp $
NAME := django-sct
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:42:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:42:20 +0000
Subject: [pkgdb] atasm was added for sharkcz
Message-ID: <20090408024132.76ED410F86B@bastion2.fedora.phx.redhat.com>

kevin has added Package atasm with summary 6502 cross-assembler
kevin has approved Package atasm
kevin has added a Fedora devel branch for atasm with an owner of sharkcz
kevin has approved atasm in Fedora devel
kevin has approved Package atasm
kevin has set commit to Approved for provenpackager on atasm (Fedora devel)
kevin has set build to Approved for provenpackager on atasm (Fedora devel)
kevin has set checkout to Approved for provenpackager on atasm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/atasm



From pkgdb at fedoraproject.org  Wed Apr  8 02:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:42:23 +0000
Subject: [pkgdb] atasm (Fedora, 9) updated by kevin
Message-ID: <20090408024135.BEA5D10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for atasm
kevin has set commit to Approved for provenpackager on atasm (Fedora 9)
kevin has set build to Approved for provenpackager on atasm (Fedora 9)
kevin has set checkout to Approved for provenpackager on atasm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/atasm



From pkgdb at fedoraproject.org  Wed Apr  8 02:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:42:23 +0000
Subject: [pkgdb] atasm (Fedora EPEL, 5) updated by kevin
Message-ID: <20090408024135.C997E10F87B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for atasm
kevin has set commit to Approved for provenpackager on atasm (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on atasm (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on atasm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/atasm



From pkgdb at fedoraproject.org  Wed Apr  8 02:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:42:23 +0000
Subject: [pkgdb] atasm (Fedora, 10) updated by kevin
Message-ID: <20090408024136.A847C10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for atasm
kevin has set commit to Approved for provenpackager on atasm (Fedora 10)
kevin has set build to Approved for provenpackager on atasm (Fedora 10)
kevin has set checkout to Approved for provenpackager on atasm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/atasm



From kevin at fedoraproject.org  Wed Apr  8 02:41:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:41:46 +0000 (UTC)
Subject: rpms/atasm - New directory
Message-ID: <20090408024146.2F76A7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/atasm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscr3509/rpms/atasm

Log Message:
Directory /cvs/pkgs/rpms/atasm added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:41:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:41:46 +0000 (UTC)
Subject: rpms/atasm/devel - New directory
Message-ID: <20090408024146.6F4B97011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/atasm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscr3509/rpms/atasm/devel

Log Message:
Directory /cvs/pkgs/rpms/atasm/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:41:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:41:54 +0000 (UTC)
Subject: rpms/atasm Makefile,NONE,1.1
Message-ID: <20090408024154.921A57011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/atasm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscr3509/rpms/atasm

Added Files:
	Makefile 
Log Message:
Setup of module atasm


--- NEW FILE Makefile ---
# Top level Makefile for module atasm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:41:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:41:54 +0000 (UTC)
Subject: rpms/atasm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090408024154.ED6557011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/atasm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscr3509/rpms/atasm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module atasm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: atasm
# $Id: Makefile,v 1.1 2009/04/08 02:41:54 kevin Exp $
NAME := atasm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:46:03 +0000
Subject: [pkgdb] mingw32-cairomm was added for sailer
Message-ID: <20090408024514.CE8DD10F84B@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-cairomm with summary MinGW Windows C++ API for the cairo graphics library
kevin has approved Package mingw32-cairomm
kevin has added a Fedora devel branch for mingw32-cairomm with an owner of sailer
kevin has approved mingw32-cairomm in Fedora devel
kevin has approved Package mingw32-cairomm
kevin has set commit to Approved for provenpackager on mingw32-cairomm (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-cairomm (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-cairomm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairomm



From pkgdb at fedoraproject.org  Wed Apr  8 02:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:46:07 +0000
Subject: [pkgdb] mingw32-cairomm (Fedora, devel) updated by kevin
Message-ID: <20090408024517.92C9B10F86A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-cairomm (Fedora devel) for rjones
kevin approved watchcommits on mingw32-cairomm (Fedora devel) for rjones
kevin approved commit on mingw32-cairomm (Fedora devel) for rjones
kevin approved build on mingw32-cairomm (Fedora devel) for rjones
kevin approved approveacls on mingw32-cairomm (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairomm



From kevin at fedoraproject.org  Wed Apr  8 02:45:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:45:28 +0000 (UTC)
Subject: rpms/mingw32-cairomm - New directory
Message-ID: <20090408024528.255A27011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairomm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWi4615/rpms/mingw32-cairomm

Log Message:
Directory /cvs/pkgs/rpms/mingw32-cairomm added to the repository




From pkgdb at fedoraproject.org  Wed Apr  8 02:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:46:07 +0000
Subject: [pkgdb] mingw32-cairomm (Fedora, 10) updated by kevin
Message-ID: <20090408024517.A0DA110F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-cairomm
kevin has set commit to Approved for provenpackager on mingw32-cairomm (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-cairomm (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-cairomm (Fedora 10)
kevin approved watchbugzilla on mingw32-cairomm (Fedora 10) for rjones
kevin approved watchcommits on mingw32-cairomm (Fedora 10) for rjones
kevin approved commit on mingw32-cairomm (Fedora 10) for rjones
kevin approved build on mingw32-cairomm (Fedora 10) for rjones
kevin approved approveacls on mingw32-cairomm (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairomm



From kevin at fedoraproject.org  Wed Apr  8 02:45:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:45:28 +0000 (UTC)
Subject: rpms/mingw32-cairomm/devel - New directory
Message-ID: <20090408024528.5EE587011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWi4615/rpms/mingw32-cairomm/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-cairomm/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:45:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:45:37 +0000 (UTC)
Subject: rpms/mingw32-cairomm Makefile,NONE,1.1
Message-ID: <20090408024537.1FAE77011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairomm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWi4615/rpms/mingw32-cairomm

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-cairomm


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-cairomm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:45:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:45:37 +0000 (UTC)
Subject: rpms/mingw32-cairomm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408024537.934987011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWi4615/rpms/mingw32-cairomm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-cairomm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-cairomm
# $Id: Makefile,v 1.1 2009/04/08 02:45:37 kevin Exp $
NAME := mingw32-cairomm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:47:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:47:15 +0000
Subject: [pkgdb] perl-Data-Dumper-Names was added for mmaslano
Message-ID: <20090408024626.1B35310F84C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Data-Dumper-Names with summary Data::Dumper like module for printing and eval data structures
kevin has approved Package perl-Data-Dumper-Names
kevin has added a Fedora devel branch for perl-Data-Dumper-Names with an owner of mmaslano
kevin has approved perl-Data-Dumper-Names in Fedora devel
kevin has approved Package perl-Data-Dumper-Names
kevin has set commit to Approved for provenpackager on perl-Data-Dumper-Names (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Data-Dumper-Names (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Data-Dumper-Names (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Dumper-Names



From pkgdb at fedoraproject.org  Wed Apr  8 02:47:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:47:19 +0000
Subject: [pkgdb] perl-Data-Dumper-Names (Fedora, devel) updated by kevin
Message-ID: <20090408024630.D3E0610F86A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Data-Dumper-Names (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Data-Dumper-Names (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Dumper-Names



From kevin at fedoraproject.org  Wed Apr  8 02:46:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:46:39 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names - New directory
Message-ID: <20090408024639.29DDD7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVw4786/rpms/perl-Data-Dumper-Names

Log Message:
Directory /cvs/pkgs/rpms/perl-Data-Dumper-Names added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:46:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:46:39 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/devel - New directory
Message-ID: <20090408024639.665227011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVw4786/rpms/perl-Data-Dumper-Names/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:46:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:46:47 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names Makefile,NONE,1.1
Message-ID: <20090408024647.A0BB37011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVw4786/rpms/perl-Data-Dumper-Names

Added Files:
	Makefile 
Log Message:
Setup of module perl-Data-Dumper-Names


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Data-Dumper-Names
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:46:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:46:47 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090408024647.E69807011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVw4786/rpms/perl-Data-Dumper-Names/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Data-Dumper-Names


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Data-Dumper-Names
# $Id: Makefile,v 1.1 2009/04/08 02:46:47 kevin Exp $
NAME := perl-Data-Dumper-Names
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:47:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:47:19 +0000
Subject: [pkgdb] perl-Data-Dumper-Names (Fedora, 11) updated by kevin
Message-ID: <20090408024630.DCF2710F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Data-Dumper-Names
kevin has set commit to Approved for provenpackager on perl-Data-Dumper-Names (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Data-Dumper-Names (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Data-Dumper-Names (Fedora 11)
kevin approved watchbugzilla on perl-Data-Dumper-Names (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Data-Dumper-Names (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Dumper-Names



From kevin at fedoraproject.org  Wed Apr  8 02:47:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:47:48 +0000 (UTC)
Subject: rpms/hyphen-hi - New directory
Message-ID: <20090408024748.25AD47011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-hi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXM4915/rpms/hyphen-hi

Log Message:
Directory /cvs/pkgs/rpms/hyphen-hi added to the repository




From pkgdb at fedoraproject.org  Wed Apr  8 02:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:48:29 +0000
Subject: [pkgdb] hyphen-hi (Fedora, 11) updated by kevin
Message-ID: <20090408024740.4B55A10F86B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-hi
kevin has set commit to Approved for provenpackager on hyphen-hi (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-hi (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-hi (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Wed Apr  8 02:47:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:47:38 +0000
Subject: [pkgdb] hyphen-hi was added for caolanm
Message-ID: <20090408024738.1F6A810F861@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-hi with summary Hindi hyphenation rules
kevin has approved Package hyphen-hi
kevin has added a Fedora devel branch for hyphen-hi with an owner of caolanm
kevin has approved hyphen-hi in Fedora devel
kevin has approved Package hyphen-hi
kevin has set commit to Approved for provenpackager on hyphen-hi (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-hi (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-hi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From kevin at fedoraproject.org  Wed Apr  8 02:47:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:47:48 +0000 (UTC)
Subject: rpms/hyphen-hi/devel - New directory
Message-ID: <20090408024748.62AEB7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-hi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXM4915/rpms/hyphen-hi/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-hi/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:47:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:47:58 +0000 (UTC)
Subject: rpms/hyphen-hi Makefile,NONE,1.1
Message-ID: <20090408024758.C64737011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-hi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXM4915/rpms/hyphen-hi

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-hi


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-hi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:47:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:47:59 +0000 (UTC)
Subject: rpms/hyphen-hi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408024759.308D17011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-hi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXM4915/rpms/hyphen-hi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-hi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-hi
# $Id: Makefile,v 1.1 2009/04/08 02:47:59 kevin Exp $
NAME := hyphen-hi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Apr  8 02:48:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:48:21 +0000 (UTC)
Subject: rpms/hyphen-gu - New directory
Message-ID: <20090408024821.2E7B17011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-gu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsac5054/rpms/hyphen-gu

Log Message:
Directory /cvs/pkgs/rpms/hyphen-gu added to the repository




From pkgdb at fedoraproject.org  Wed Apr  8 02:48:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:48:58 +0000
Subject: [pkgdb] hyphen-gu (Fedora, 11) updated by kevin
Message-ID: <20090408024810.65F5410F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-gu
kevin has set commit to Approved for provenpackager on hyphen-gu (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-gu (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-gu (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Wed Apr  8 02:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:48:57 +0000
Subject: [pkgdb] hyphen-gu was added for caolanm
Message-ID: <20090408024808.1A48710F861@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-gu with summary Gujarati hyphenation rules
kevin has approved Package hyphen-gu
kevin has added a Fedora devel branch for hyphen-gu with an owner of caolanm
kevin has approved hyphen-gu in Fedora devel
kevin has approved Package hyphen-gu
kevin has set commit to Approved for provenpackager on hyphen-gu (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-gu (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-gu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From kevin at fedoraproject.org  Wed Apr  8 02:48:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:48:21 +0000 (UTC)
Subject: rpms/hyphen-gu/devel - New directory
Message-ID: <20090408024821.6E01A7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-gu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsac5054/rpms/hyphen-gu/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-gu/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:48:29 +0000 (UTC)
Subject: rpms/hyphen-gu/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408024829.EA7C87011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-gu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsac5054/rpms/hyphen-gu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-gu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-gu
# $Id: Makefile,v 1.1 2009/04/08 02:48:29 kevin Exp $
NAME := hyphen-gu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Apr  8 02:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:48:29 +0000 (UTC)
Subject: rpms/hyphen-gu Makefile,NONE,1.1
Message-ID: <20090408024829.A348D7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-gu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsac5054/rpms/hyphen-gu

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-gu


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-gu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:49:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:00 +0000 (UTC)
Subject: rpms/hyphen-kn - New directory
Message-ID: <20090408024900.298B67011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-kn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVy5176/rpms/hyphen-kn

Log Message:
Directory /cvs/pkgs/rpms/hyphen-kn added to the repository




From pkgdb at fedoraproject.org  Wed Apr  8 02:48:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:48:47 +0000
Subject: [pkgdb] hyphen-kn was added for caolanm
Message-ID: <20090408024846.5F87310F84C@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-kn with summary Kannada hyphenation rules
kevin has approved Package hyphen-kn
kevin has added a Fedora devel branch for hyphen-kn with an owner of caolanm
kevin has approved hyphen-kn in Fedora devel
kevin has approved Package hyphen-kn
kevin has set commit to Approved for provenpackager on hyphen-kn (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-kn (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-kn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-kn



From pkgdb at fedoraproject.org  Wed Apr  8 02:48:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:48:50 +0000
Subject: [pkgdb] hyphen-kn (Fedora, 11) updated by kevin
Message-ID: <20090408024849.64EC510F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-kn
kevin has set commit to Approved for provenpackager on hyphen-kn (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-kn (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-kn (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-kn



From kevin at fedoraproject.org  Wed Apr  8 02:49:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:00 +0000 (UTC)
Subject: rpms/hyphen-kn/devel - New directory
Message-ID: <20090408024900.733D27011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-kn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVy5176/rpms/hyphen-kn/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-kn/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:49:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:11 +0000 (UTC)
Subject: rpms/hyphen-kn Makefile,NONE,1.1
Message-ID: <20090408024911.B69BC7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-kn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVy5176/rpms/hyphen-kn

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-kn


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-kn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:49:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:12 +0000 (UTC)
Subject: rpms/hyphen-kn/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408024912.0B87F7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-kn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVy5176/rpms/hyphen-kn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-kn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-kn
# $Id: Makefile,v 1.1 2009/04/08 02:49:11 kevin Exp $
NAME := hyphen-kn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:49:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:49:20 +0000
Subject: [pkgdb] hyphen-ml was added for caolanm
Message-ID: <20090408024918.D318A10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-ml with summary Malayalam hyphenation rules
kevin has approved Package hyphen-ml
kevin has added a Fedora devel branch for hyphen-ml with an owner of caolanm
kevin has approved hyphen-ml in Fedora devel
kevin has approved Package hyphen-ml
kevin has set commit to Approved for provenpackager on hyphen-ml (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-ml (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-ml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Wed Apr  8 02:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:50:11 +0000
Subject: [pkgdb] hyphen-ml (Fedora, 11) updated by kevin
Message-ID: <20090408024920.88FDC10F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-ml
kevin has set commit to Approved for provenpackager on hyphen-ml (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-ml (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-ml (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From kevin at fedoraproject.org  Wed Apr  8 02:49:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:45 +0000 (UTC)
Subject: rpms/hyphen-ml - New directory
Message-ID: <20090408024945.2DD4B7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5311/rpms/hyphen-ml

Log Message:
Directory /cvs/pkgs/rpms/hyphen-ml added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:49:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:45 +0000 (UTC)
Subject: rpms/hyphen-ml/devel - New directory
Message-ID: <20090408024945.75CD67011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5311/rpms/hyphen-ml/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-ml/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:49:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:54 +0000 (UTC)
Subject: rpms/hyphen-ml Makefile,NONE,1.1
Message-ID: <20090408024954.B4B6C7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5311/rpms/hyphen-ml

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-ml


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-ml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Apr  8 02:50:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:50:39 +0000
Subject: [pkgdb] hyphen-or was added for caolanm
Message-ID: <20090408024950.2DCD810F89D@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-or with summary Oriya hyphenation rules
kevin has approved Package hyphen-or
kevin has added a Fedora devel branch for hyphen-or with an owner of caolanm
kevin has approved hyphen-or in Fedora devel
kevin has approved Package hyphen-or
kevin has set commit to Approved for provenpackager on hyphen-or (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-or (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-or (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Wed Apr  8 02:50:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:50:42 +0000
Subject: [pkgdb] hyphen-or (Fedora, 11) updated by kevin
Message-ID: <20090408024953.25E5610F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-or
kevin has set commit to Approved for provenpackager on hyphen-or (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-or (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-or (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From kevin at fedoraproject.org  Wed Apr  8 02:49:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:49:55 +0000 (UTC)
Subject: rpms/hyphen-ml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408024955.0683F7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEU5311/rpms/hyphen-ml/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-ml


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-ml
# $Id: Makefile,v 1.1 2009/04/08 02:49:54 kevin Exp $
NAME := hyphen-ml
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Apr  8 02:50:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:50:06 +0000 (UTC)
Subject: rpms/hyphen-or - New directory
Message-ID: <20090408025006.2C75D7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-or
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTV5440/rpms/hyphen-or

Log Message:
Directory /cvs/pkgs/rpms/hyphen-or added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:50:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:50:06 +0000 (UTC)
Subject: rpms/hyphen-or/devel - New directory
Message-ID: <20090408025006.6BDF47011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-or/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTV5440/rpms/hyphen-or/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-or/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:50:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:50:16 +0000 (UTC)
Subject: rpms/hyphen-or Makefile,NONE,1.1
Message-ID: <20090408025016.EBAB77011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-or
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTV5440/rpms/hyphen-or

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-or


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-or
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:50:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:50:17 +0000 (UTC)
Subject: rpms/hyphen-or/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408025017.42CC27011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-or/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTV5440/rpms/hyphen-or/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-or


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-or
# $Id: Makefile,v 1.1 2009/04/08 02:50:17 kevin Exp $
NAME := hyphen-or
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:52:02 +0000
Subject: [pkgdb] hyphen-pa was added for caolanm
Message-ID: <20090408025112.4A33910F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-pa with summary Punjabi hyphenation rules
kevin has approved Package hyphen-pa
kevin has added a Fedora devel branch for hyphen-pa with an owner of caolanm
kevin has approved hyphen-pa in Fedora devel
kevin has approved Package hyphen-pa
kevin has set commit to Approved for provenpackager on hyphen-pa (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-pa (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-pa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Wed Apr  8 02:52:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:52:03 +0000
Subject: [pkgdb] hyphen-pa (Fedora, 11) updated by kevin
Message-ID: <20090408025113.CA48210F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-pa
kevin has set commit to Approved for provenpackager on hyphen-pa (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-pa (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-pa (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From kevin at fedoraproject.org  Wed Apr  8 02:51:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:51:33 +0000 (UTC)
Subject: rpms/hyphen-pa - New directory
Message-ID: <20090408025133.3DEF87011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbx5676/rpms/hyphen-pa

Log Message:
Directory /cvs/pkgs/rpms/hyphen-pa added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:51:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:51:33 +0000 (UTC)
Subject: rpms/hyphen-pa/devel - New directory
Message-ID: <20090408025133.877707011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbx5676/rpms/hyphen-pa/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-pa/devel added to the repository




From pkgdb at fedoraproject.org  Wed Apr  8 02:52:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:52:26 +0000
Subject: [pkgdb] hyphen-ta was added for caolanm
Message-ID: <20090408025137.2A5DE10F886@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-ta with summary Tamil hyphenation rules
kevin has approved Package hyphen-ta
kevin has added a Fedora devel branch for hyphen-ta with an owner of caolanm
kevin has approved hyphen-ta in Fedora devel
kevin has approved Package hyphen-ta
kevin has set commit to Approved for provenpackager on hyphen-ta (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-ta (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-ta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From kevin at fedoraproject.org  Wed Apr  8 02:51:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:51:44 +0000 (UTC)
Subject: rpms/hyphen-pa Makefile,NONE,1.1
Message-ID: <20090408025144.DC6F67011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbx5676/rpms/hyphen-pa

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-pa


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-pa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:51:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:51:45 +0000 (UTC)
Subject: rpms/hyphen-pa/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408025145.606837011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbx5676/rpms/hyphen-pa/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-pa


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-pa
# $Id: Makefile,v 1.1 2009/04/08 02:51:45 kevin Exp $
NAME := hyphen-pa
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:51:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:51:40 +0000
Subject: [pkgdb] hyphen-ta (Fedora, 11) updated by kevin
Message-ID: <20090408025138.F218C10F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-ta
kevin has set commit to Approved for provenpackager on hyphen-ta (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-ta (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-ta (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From kevin at fedoraproject.org  Wed Apr  8 02:51:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:51:59 +0000 (UTC)
Subject: rpms/hyphen-ta - New directory
Message-ID: <20090408025159.2A91C7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ta
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXa5816/rpms/hyphen-ta

Log Message:
Directory /cvs/pkgs/rpms/hyphen-ta added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:51:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:51:59 +0000 (UTC)
Subject: rpms/hyphen-ta/devel - New directory
Message-ID: <20090408025159.636027011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ta/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXa5816/rpms/hyphen-ta/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-ta/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:52:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:52:08 +0000 (UTC)
Subject: rpms/hyphen-ta Makefile,NONE,1.1
Message-ID: <20090408025208.DE8317011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ta
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXa5816/rpms/hyphen-ta

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-ta


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-ta
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:52:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:52:09 +0000 (UTC)
Subject: rpms/hyphen-ta/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408025209.35F747011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ta/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXa5816/rpms/hyphen-ta/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-ta


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-ta
# $Id: Makefile,v 1.1 2009/04/08 02:52:09 kevin Exp $
NAME := hyphen-ta
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:53:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:53:07 +0000
Subject: [pkgdb] hyphen-te was added for caolanm
Message-ID: <20090408025217.11B4610F874@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-te with summary Telugu hyphenation rules
kevin has approved Package hyphen-te
kevin has added a Fedora devel branch for hyphen-te with an owner of caolanm
kevin has approved hyphen-te in Fedora devel
kevin has approved Package hyphen-te
kevin has set commit to Approved for provenpackager on hyphen-te (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-te (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-te (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Wed Apr  8 02:53:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:53:08 +0000
Subject: [pkgdb] hyphen-te (Fedora, 11) updated by kevin
Message-ID: <20090408025218.F364310F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-te
kevin has set commit to Approved for provenpackager on hyphen-te (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-te (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-te (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From kevin at fedoraproject.org  Wed Apr  8 02:52:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:52:42 +0000 (UTC)
Subject: rpms/hyphen-te - New directory
Message-ID: <20090408025242.354547011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-te
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFP6026/rpms/hyphen-te

Log Message:
Directory /cvs/pkgs/rpms/hyphen-te added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:52:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:52:42 +0000 (UTC)
Subject: rpms/hyphen-te/devel - New directory
Message-ID: <20090408025242.715E17011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-te/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFP6026/rpms/hyphen-te/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-te/devel added to the repository




From pkgdb at fedoraproject.org  Wed Apr  8 02:53:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:53:38 +0000
Subject: [pkgdb] hyphen-sa was added for caolanm
Message-ID: <20090408025249.AB9F910F870@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-sa with summary Sanskrit hyphenation rules
kevin has approved Package hyphen-sa
kevin has added a Fedora devel branch for hyphen-sa with an owner of caolanm
kevin has approved hyphen-sa in Fedora devel
kevin has approved Package hyphen-sa
kevin has set commit to Approved for provenpackager on hyphen-sa (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-sa (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-sa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From kevin at fedoraproject.org  Wed Apr  8 02:52:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:52:51 +0000 (UTC)
Subject: rpms/hyphen-te Makefile,NONE,1.1
Message-ID: <20090408025251.4A88D7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-te
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFP6026/rpms/hyphen-te

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-te


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-te
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:52:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:52:51 +0000 (UTC)
Subject: rpms/hyphen-te/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408025251.ACF727011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-te/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFP6026/rpms/hyphen-te/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-te


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-te
# $Id: Makefile,v 1.1 2009/04/08 02:52:51 kevin Exp $
NAME := hyphen-te
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:52:52 +0000
Subject: [pkgdb] hyphen-sa (Fedora, 11) updated by kevin
Message-ID: <20090408025250.CC71E10F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hyphen-sa
kevin has set commit to Approved for provenpackager on hyphen-sa (Fedora 11)
kevin has set build to Approved for provenpackager on hyphen-sa (Fedora 11)
kevin has set checkout to Approved for provenpackager on hyphen-sa (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From kevin at fedoraproject.org  Wed Apr  8 02:53:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:53:03 +0000 (UTC)
Subject: rpms/hyphen-sa - New directory
Message-ID: <20090408025303.2A85F7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-sa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIW6172/rpms/hyphen-sa

Log Message:
Directory /cvs/pkgs/rpms/hyphen-sa added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:53:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:53:03 +0000 (UTC)
Subject: rpms/hyphen-sa/devel - New directory
Message-ID: <20090408025303.608BD7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-sa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIW6172/rpms/hyphen-sa/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-sa/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:53:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:53:11 +0000 (UTC)
Subject: rpms/hyphen-sa Makefile,NONE,1.1
Message-ID: <20090408025311.D3EE27011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-sa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIW6172/rpms/hyphen-sa

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-sa


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-sa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:53:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:53:12 +0000 (UTC)
Subject: rpms/hyphen-sa/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090408025312.2DD6F7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-sa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIW6172/rpms/hyphen-sa/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-sa


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-sa
# $Id: Makefile,v 1.1 2009/04/08 02:53:12 kevin Exp $
NAME := hyphen-sa
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:55:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:55:15 +0000
Subject: [pkgdb] icu4j F-11 cloned from devel
Message-ID: <20090408025425.0171F10F874@bastion2.fedora.phx.redhat.com>

kevin cloned icu4j F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu4j



From pkgdb at fedoraproject.org  Wed Apr  8 02:56:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:56:00 +0000
Subject: [pkgdb] jsch F-11 cloned from devel
Message-ID: <20090408025509.CE08310F874@bastion2.fedora.phx.redhat.com>

kevin cloned jsch F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From pkgdb at fedoraproject.org  Wed Apr  8 02:56:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:56:31 +0000
Subject: [pkgdb] sat4j F-11 cloned from devel
Message-ID: <20090408025541.C97FD10F862@bastion2.fedora.phx.redhat.com>

kevin cloned sat4j F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sat4j



From pkgdb at fedoraproject.org  Wed Apr  8 02:57:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:57:24 +0000
Subject: [pkgdb] perl-Term-Size-Any was added for iarnell
Message-ID: <20090408025634.245D410F84C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Term-Size-Any with summary Retrieve terminal size
kevin has approved Package perl-Term-Size-Any
kevin has added a Fedora devel branch for perl-Term-Size-Any with an owner of iarnell
kevin has approved perl-Term-Size-Any in Fedora devel
kevin has approved Package perl-Term-Size-Any
kevin has set commit to Approved for provenpackager on perl-Term-Size-Any (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Term-Size-Any (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Term-Size-Any (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Any



From pkgdb at fedoraproject.org  Wed Apr  8 02:57:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:57:26 +0000
Subject: [pkgdb] perl-Term-Size-Any (Fedora, 9) updated by kevin
Message-ID: <20090408025636.620D010F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Term-Size-Any
kevin has set commit to Approved for provenpackager on perl-Term-Size-Any (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Term-Size-Any (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Term-Size-Any (Fedora 9)
kevin approved watchbugzilla on perl-Term-Size-Any (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Term-Size-Any (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Any



From pkgdb at fedoraproject.org  Wed Apr  8 02:57:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:57:26 +0000
Subject: [pkgdb] perl-Term-Size-Any (Fedora, devel) updated by kevin
Message-ID: <20090408025636.6878A10F871@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Term-Size-Any (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Term-Size-Any (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Any



From pkgdb at fedoraproject.org  Wed Apr  8 02:57:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:57:26 +0000
Subject: [pkgdb] perl-Term-Size-Any (Fedora, 10) updated by kevin
Message-ID: <20090408025636.7319A10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Term-Size-Any
kevin has set commit to Approved for provenpackager on perl-Term-Size-Any (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Term-Size-Any (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Term-Size-Any (Fedora 10)
kevin approved watchbugzilla on perl-Term-Size-Any (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Term-Size-Any (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-Size-Any



From kevin at fedoraproject.org  Wed Apr  8 02:56:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:56:45 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any/devel - New directory
Message-ID: <20090408025645.62DFF7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Any/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyU6694/rpms/perl-Term-Size-Any/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Term-Size-Any/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:56:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:56:45 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any - New directory
Message-ID: <20090408025645.24C617011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Any
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyU6694/rpms/perl-Term-Size-Any

Log Message:
Directory /cvs/pkgs/rpms/perl-Term-Size-Any added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:56:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:56:53 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any Makefile,NONE,1.1
Message-ID: <20090408025653.6CEBD7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Any
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyU6694/rpms/perl-Term-Size-Any

Added Files:
	Makefile 
Log Message:
Setup of module perl-Term-Size-Any


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Term-Size-Any
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:56:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:56:53 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090408025653.C44FF7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Term-Size-Any/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyU6694/rpms/perl-Term-Size-Any/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Term-Size-Any


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Term-Size-Any
# $Id: Makefile,v 1.1 2009/04/08 02:56:53 kevin Exp $
NAME := perl-Term-Size-Any
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr  8 02:58:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:58:11 +0000
Subject: [pkgdb] perl-Hash-Flatten was added for iarnell
Message-ID: <20090408025720.8B66310F862@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Hash-Flatten with summary Flatten/unflatten complex data hashes
kevin has approved Package perl-Hash-Flatten
kevin has added a Fedora devel branch for perl-Hash-Flatten with an owner of iarnell
kevin has approved perl-Hash-Flatten in Fedora devel
kevin has approved Package perl-Hash-Flatten
kevin has set commit to Approved for provenpackager on perl-Hash-Flatten (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Hash-Flatten (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Hash-Flatten (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Flatten



From pkgdb at fedoraproject.org  Wed Apr  8 02:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:58:12 +0000
Subject: [pkgdb] perl-Hash-Flatten (Fedora, 9) updated by kevin
Message-ID: <20090408025723.A1D8210F870@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Hash-Flatten
kevin has set commit to Approved for provenpackager on perl-Hash-Flatten (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Hash-Flatten (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Hash-Flatten (Fedora 9)
kevin approved watchbugzilla on perl-Hash-Flatten (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Hash-Flatten (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Flatten



From pkgdb at fedoraproject.org  Wed Apr  8 02:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:58:12 +0000
Subject: [pkgdb] perl-Hash-Flatten (Fedora, devel) updated by kevin
Message-ID: <20090408025723.ABF6910F874@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Hash-Flatten (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Hash-Flatten (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Flatten



From pkgdb at fedoraproject.org  Wed Apr  8 02:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 02:58:12 +0000
Subject: [pkgdb] perl-Hash-Flatten (Fedora, 10) updated by kevin
Message-ID: <20090408025723.B44A010F877@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Hash-Flatten
kevin has set commit to Approved for provenpackager on perl-Hash-Flatten (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Hash-Flatten (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Hash-Flatten (Fedora 10)
kevin approved watchbugzilla on perl-Hash-Flatten (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Hash-Flatten (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Flatten



From kevin at fedoraproject.org  Wed Apr  8 02:57:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:57:38 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten - New directory
Message-ID: <20090408025738.2A5F27011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Hash-Flatten
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssv6938/rpms/perl-Hash-Flatten

Log Message:
Directory /cvs/pkgs/rpms/perl-Hash-Flatten added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:57:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:57:38 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten/devel - New directory
Message-ID: <20090408025738.6142F7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Hash-Flatten/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssv6938/rpms/perl-Hash-Flatten/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Hash-Flatten/devel added to the repository




From kevin at fedoraproject.org  Wed Apr  8 02:57:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:57:46 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten Makefile,NONE,1.1
Message-ID: <20090408025746.AE8467011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Hash-Flatten
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssv6938/rpms/perl-Hash-Flatten

Added Files:
	Makefile 
Log Message:
Setup of module perl-Hash-Flatten


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Hash-Flatten
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr  8 02:57:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  8 Apr 2009 02:57:47 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090408025747.229CD7011A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Hash-Flatten/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssv6938/rpms/perl-Hash-Flatten/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Hash-Flatten


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Hash-Flatten
# $Id: Makefile,v 1.1 2009/04/08 02:57:46 kevin Exp $
NAME := perl-Hash-Flatten
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From iarnell at fedoraproject.org  Wed Apr  8 03:16:24 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 03:16:24 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any/F-9 perl-Term-Size-Any.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408031624.305F17011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Term-Size-Any/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9611/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-Size-Any.spec 
Log Message:
initial import


--- NEW FILE perl-Term-Size-Any.spec ---
Name:           perl-Term-Size-Any
Version:        0.001
Release:        1%{?dist}
Summary:        Retrieve terminal size
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-Size-Any/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Any-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Devel::Hide)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Load::Conditional)
BuildRequires:  perl(Term::Size::Perl)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(Term::Size::Perl)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a unified interface to retrieve terminal size. It loads one module
of a list of known alternatives, each implementing some way to get the
desired terminal information. This loaded module will actually do the job
on behalf of Term::Size::Any.

%prep
%setup -q -n Term-Size-Any-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 0.001-1
- Specfile autogenerated by cpanspec 1.78.
- tweak requires


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:56:53 -0000	1.1
+++ .cvsignore	8 Apr 2009 03:15:53 -0000	1.2
@@ -0,0 +1 @@
+Term-Size-Any-0.001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:56:53 -0000	1.1
+++ sources	8 Apr 2009 03:15:53 -0000	1.2
@@ -0,0 +1 @@
+58722dad73c6965d5c4b975e3ae47116  Term-Size-Any-0.001.tar.gz



From iarnell at fedoraproject.org  Wed Apr  8 03:16:24 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 03:16:24 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any/F-10 perl-Term-Size-Any.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408031624.091837011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Term-Size-Any/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9611/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-Size-Any.spec 
Log Message:
initial import


--- NEW FILE perl-Term-Size-Any.spec ---
Name:           perl-Term-Size-Any
Version:        0.001
Release:        1%{?dist}
Summary:        Retrieve terminal size
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-Size-Any/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Any-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Devel::Hide)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Load::Conditional)
BuildRequires:  perl(Term::Size::Perl)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(Term::Size::Perl)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a unified interface to retrieve terminal size. It loads one module
of a list of known alternatives, each implementing some way to get the
desired terminal information. This loaded module will actually do the job
on behalf of Term::Size::Any.

%prep
%setup -q -n Term-Size-Any-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 0.001-1
- Specfile autogenerated by cpanspec 1.78.
- tweak requires


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:56:53 -0000	1.1
+++ .cvsignore	8 Apr 2009 03:15:53 -0000	1.2
@@ -0,0 +1 @@
+Term-Size-Any-0.001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:56:53 -0000	1.1
+++ sources	8 Apr 2009 03:15:53 -0000	1.2
@@ -0,0 +1 @@
+58722dad73c6965d5c4b975e3ae47116  Term-Size-Any-0.001.tar.gz



From iarnell at fedoraproject.org  Wed Apr  8 03:16:24 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 03:16:24 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any/devel perl-Term-Size-Any.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408031624.6859B7011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Term-Size-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9611/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-Size-Any.spec 
Log Message:
initial import


--- NEW FILE perl-Term-Size-Any.spec ---
Name:           perl-Term-Size-Any
Version:        0.001
Release:        1%{?dist}
Summary:        Retrieve terminal size
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-Size-Any/
Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Term-Size-Any-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Devel::Hide)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Load::Conditional)
BuildRequires:  perl(Term::Size::Perl)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(Term::Size::Perl)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a unified interface to retrieve terminal size. It loads one module
of a list of known alternatives, each implementing some way to get the
desired terminal information. This loaded module will actually do the job
on behalf of Term::Size::Any.

%prep
%setup -q -n Term-Size-Any-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 0.001-1
- Specfile autogenerated by cpanspec 1.78.
- tweak requires


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:56:53 -0000	1.1
+++ .cvsignore	8 Apr 2009 03:15:54 -0000	1.2
@@ -0,0 +1 @@
+Term-Size-Any-0.001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:56:53 -0000	1.1
+++ sources	8 Apr 2009 03:15:54 -0000	1.2
@@ -0,0 +1 @@
+58722dad73c6965d5c4b975e3ae47116  Term-Size-Any-0.001.tar.gz



From iarnell at fedoraproject.org  Wed Apr  8 03:18:32 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 03:18:32 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten/F-9 perl-Hash-Flatten.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408031832.16DF77011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Hash-Flatten/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10100/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Hash-Flatten.spec 
Log Message:
initial import


--- NEW FILE perl-Hash-Flatten.spec ---
Name:           perl-Hash-Flatten
Version:        1.16
Release:        1%{?dist}
Summary:        Flatten/unflatten complex data hashes
License:        GPLv2
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Hash-Flatten/
Source0:        http://www.cpan.org/authors/id/B/BB/BBC/Hash-Flatten-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Log::Trace)
BuildRequires:  perl(Test::Assertions)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Converts back and forth between a nested hash structure and a flat hash of
delimited key-value pairs. Useful for protocols that only support key-value
pairs (such as CGI and DBMs).

%prep
%setup -q -n Hash-Flatten-%{version}

# fix file encoding
iconv --from=ISO-8859-1 --to=UTF-8 Changes >Changes.tmp && mv Changes.tmp Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 1.16-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:57:46 -0000	1.1
+++ .cvsignore	8 Apr 2009 03:18:01 -0000	1.2
@@ -0,0 +1 @@
+Hash-Flatten-1.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:57:46 -0000	1.1
+++ sources	8 Apr 2009 03:18:01 -0000	1.2
@@ -0,0 +1 @@
+b67a1b1888aee862bd5b7a2987989495  Hash-Flatten-1.16.tar.gz



From iarnell at fedoraproject.org  Wed Apr  8 03:18:31 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 03:18:31 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten/F-10 perl-Hash-Flatten.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408031831.E6F667011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Hash-Flatten/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10100/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Hash-Flatten.spec 
Log Message:
initial import


--- NEW FILE perl-Hash-Flatten.spec ---
Name:           perl-Hash-Flatten
Version:        1.16
Release:        1%{?dist}
Summary:        Flatten/unflatten complex data hashes
License:        GPLv2
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Hash-Flatten/
Source0:        http://www.cpan.org/authors/id/B/BB/BBC/Hash-Flatten-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Log::Trace)
BuildRequires:  perl(Test::Assertions)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Converts back and forth between a nested hash structure and a flat hash of
delimited key-value pairs. Useful for protocols that only support key-value
pairs (such as CGI and DBMs).

%prep
%setup -q -n Hash-Flatten-%{version}

# fix file encoding
iconv --from=ISO-8859-1 --to=UTF-8 Changes >Changes.tmp && mv Changes.tmp Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 1.16-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:57:46 -0000	1.1
+++ .cvsignore	8 Apr 2009 03:18:01 -0000	1.2
@@ -0,0 +1 @@
+Hash-Flatten-1.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:57:46 -0000	1.1
+++ sources	8 Apr 2009 03:18:01 -0000	1.2
@@ -0,0 +1 @@
+b67a1b1888aee862bd5b7a2987989495  Hash-Flatten-1.16.tar.gz



From iarnell at fedoraproject.org  Wed Apr  8 03:18:32 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 03:18:32 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten/devel perl-Hash-Flatten.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408031832.4F02A7011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Hash-Flatten/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10100/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Hash-Flatten.spec 
Log Message:
initial import


--- NEW FILE perl-Hash-Flatten.spec ---
Name:           perl-Hash-Flatten
Version:        1.16
Release:        1%{?dist}
Summary:        Flatten/unflatten complex data hashes
License:        GPLv2
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Hash-Flatten/
Source0:        http://www.cpan.org/authors/id/B/BB/BBC/Hash-Flatten-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Log::Trace)
BuildRequires:  perl(Test::Assertions)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Converts back and forth between a nested hash structure and a flat hash of
delimited key-value pairs. Useful for protocols that only support key-value
pairs (such as CGI and DBMs).

%prep
%setup -q -n Hash-Flatten-%{version}

# fix file encoding
iconv --from=ISO-8859-1 --to=UTF-8 Changes >Changes.tmp && mv Changes.tmp Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 04 2009 Iain Arnell 1.16-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:57:46 -0000	1.1
+++ .cvsignore	8 Apr 2009 03:18:02 -0000	1.2
@@ -0,0 +1 @@
+Hash-Flatten-1.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:57:46 -0000	1.1
+++ sources	8 Apr 2009 03:18:02 -0000	1.2
@@ -0,0 +1 @@
+b67a1b1888aee862bd5b7a2987989495  Hash-Flatten-1.16.tar.gz



From cchance at fedoraproject.org  Wed Apr  8 03:28:53 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed,  8 Apr 2009 03:28:53 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.8,1.9
Message-ID: <20090408032853.8939D7011A@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11377

Modified Files:
	cjkuni-fonts.spec 
Log Message:
resolves: 433329 (fixed unowned compatibility directories)



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cjkuni-fonts.spec	7 Apr 2009 07:43:51 -0000	1.8
+++ cjkuni-fonts.spec	8 Apr 2009 03:28:23 -0000	1.9
@@ -10,9 +10,15 @@
 %define umingbuilddir   %{fontname}-uming-fonts-%{version}
 %define ukaibuilddir    %{fontname}-ukai-fonts-%{version}
 
+%define _cncompatdir     %{_datadir}/fonts/zh_CN
+%define _twcompatdir     %{_datadir}/fonts/zh_TW
+%define cncompatdir      %{_cncompatdir}/TrueType
+%define twcompatdir      %{_twcompatdir}/TrueType
+
+
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     22%{?dist}
+Release:     23%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -151,8 +157,12 @@
 
 %files -n %{fontname}-fonts-compat
 %defattr(0644,root,root,0755)
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+%dir %{_cncompatdir}
+%dir %{_twcompatdir}
+%dir %{cncompatdir}
+%dir %{twcompatdir}
+%verify(not md5 size mtime) %{cncompatdir}/zysong.ttf
+%verify(not md5 size mtime) %{twcompatdir}/bsmi00lp.ttf
 
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
@@ -210,18 +220,19 @@
 %__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}
 
 # backward compat to obsoleted ttf
-%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
-%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
-%__ln_s %{_fontdir}/uming.ttc \
-    %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%__ln_s %{_fontdir}/uming.ttc \
-    %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+%__install -m 0755 -d %{buildroot}%{cncompatdir}
+%__install -m 0755 -d %{buildroot}%{twcompatdir}
+%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
+%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
-* Tue Apr 07 2009 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-22
+* Wed Apr 08 2009 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-23.fc11
+- Resolves: rhbz#483320 (Declared ownership of compatibility directories.)
+
+* Tue Apr 07 2009 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-22.fc11
 - Resolves: rhbz#491956.
 - Rebuilt for Fedora 11.
 



From dcantrel at fedoraproject.org  Wed Apr  8 03:46:14 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  8 Apr 2009 03:46:14 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.631, 1.632 anaconda.spec, 1.779, 
	1.780 sources, 1.765, 1.766
Message-ID: <20090408034614.B4E637011A@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16802

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Apr 07 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.41-1
- Make sure we have a clean lvm ignore list when we initialize. (jgranado)
- We need to search by name without the "mapper" prefix. (jgranado)
- Create a min_max constraint to avoid alignments issues. (jgranado)
- Don't exit the installer from filesystem errors. (dlehman)
- Try not to raise exceptions from minSize calculators. (dlehman)
- Don't traceback when PVs are encrypted or are not partitions. (dlehman)
- Adjust device dependencies when backing out device encryption. (#493257)
  (dlehman)
- Include filesystem type in mount log message. (dlehman)
- Load filesystem modules on demand (#490795, #494108). (clumens)
- Use existing partitions when --onpart is used for PVs or raid members
  (#493065) (rvykydal)
- Raise message, not exception when size set in LV dialog is too big.
  (rvykydal)
- Raise an error when remofing an extended part with logical parts.
  (jgranado)
- Esthetic changes to storage/partitioning.py. (jgranado)
- dmraid.py is no longer being used by anything, so remove it. (clumens)
- Remove partedUtils.py. (clumens)
- This is the only place isEfiSystemPartition is used, so pull it in.
  (clumens)
- getReleaseString now lives in the storage module. (clumens)
- Stop lying about our support for dmraid and multipath in kickstart.
  (clumens)
- Remove some old, unused code that also uses biosGeometry. (clumens)
- For very small disks, don't try to display a stripe in the graph
  (#480484). (clumens)
- Fix reading the console= parameter from the cmdline (#490731). (clumens)
- For dmraid partititons device node name != name (hdegoede)
- When a partition request gets unallocated, set the name back to req#
  (hdegoede)
- Do not use getPartitionByPath() in allocatePartitions() (hdegoede)
- Remove no longer used iscsi_get_node_record function (hdegoede)
- Try to handle devices which live in a subdir of /dev properly (hdegoede)
- Split DeviceTree.addUdevDevice into several smaller methods. (dlehman)
- Don't traceback from failure finding minimum fs size. (#494070) (dlehman)
- udev_settle after format teardown to avoid EBUSY on device teardown.
  (#492670) (dlehman)
- Add a parted.Device attribute to all existing StorageDevices. (dlehman)
- If no partitioning commands are given, apply the UI selections (#490880).
  (clumens)
- Update font package names for ml_IN, si_LK, etc. (#493792, #493794).
  (clumens)
- Fix a typo in the city name for Nepali (#493803). (clumens)
- Fix writing out the partition= line on PPC (#492732). (clumens)
- Do not check size when adding LV to growing VG (bug #492264) (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- .cvsignore	3 Apr 2009 03:27:40 -0000	1.631
+++ .cvsignore	8 Apr 2009 03:45:43 -0000	1.632
@@ -1,2 +1,2 @@
 clog
-anaconda-11.5.0.40.tar.bz2
+anaconda-11.5.0.41.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -r1.779 -r1.780
--- anaconda.spec	3 Apr 2009 03:27:40 -0000	1.779
+++ anaconda.spec	8 Apr 2009 03:45:43 -0000	1.780
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.40
+Version: 11.5.0.41
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,54 @@
 %endif
 
 %changelog
+* Tue Apr 07 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.41-1
+- Make sure we have a clean lvm ignore list when we initialize. (jgranado)
+- We need to search by name without the "mapper" prefix. (jgranado)
+- Create a min_max constraint to avoid alignments issues. (jgranado)
+- Don't exit the installer from filesystem errors. (dlehman)
+- Try not to raise exceptions from minSize calculators. (dlehman)
+- Don't traceback when PVs are encrypted or are not partitions. (dlehman)
+- Adjust device dependencies when backing out device encryption. (#493257)
+  (dlehman)
+- Include filesystem type in mount log message. (dlehman)
+- Load filesystem modules on demand (#490795, #494108). (clumens)
+- Use existing partitions when --onpart is used for PVs or raid members
+  (#493065) (rvykydal)
+- Raise message, not exception when size set in LV dialog is too big.
+  (rvykydal)
+- Raise an error when remofing an extended part with logical parts.
+  (jgranado)
+- Esthetic changes to storage/partitioning.py. (jgranado)
+- dmraid.py is no longer being used by anything, so remove it. (clumens)
+- Remove partedUtils.py. (clumens)
+- This is the only place isEfiSystemPartition is used, so pull it in.
+  (clumens)
+- getReleaseString now lives in the storage module. (clumens)
+- Stop lying about our support for dmraid and multipath in kickstart.
+  (clumens)
+- Remove some old, unused code that also uses biosGeometry. (clumens)
+- For very small disks, don't try to display a stripe in the graph
+  (#480484). (clumens)
+- Fix reading the console= parameter from the cmdline (#490731). (clumens)
+- For dmraid partititons device node name != name (hdegoede)
+- When a partition request gets unallocated, set the name back to req#
+  (hdegoede)
+- Do not use getPartitionByPath() in allocatePartitions() (hdegoede)
+- Remove no longer used iscsi_get_node_record function (hdegoede)
+- Try to handle devices which live in a subdir of /dev properly (hdegoede)
+- Split DeviceTree.addUdevDevice into several smaller methods. (dlehman)
+- Don't traceback from failure finding minimum fs size. (#494070) (dlehman)
+- udev_settle after format teardown to avoid EBUSY on device teardown.
+  (#492670) (dlehman)
+- Add a parted.Device attribute to all existing StorageDevices. (dlehman)
+- If no partitioning commands are given, apply the UI selections (#490880).
+  (clumens)
+- Update font package names for ml_IN, si_LK, etc. (#493792, #493794).
+  (clumens)
+- Fix a typo in the city name for Nepali (#493803). (clumens)
+- Fix writing out the partition= line on PPC (#492732). (clumens)
+- Do not check size when adding LV to growing VG (bug #492264) (rvykydal)
+
 * Thu Apr 02 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.40-1
 - Don't let device names affect action order in general case. (dlehman)
 - Round up when aligning to pesize for space used. (#493656) (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- sources	3 Apr 2009 03:27:41 -0000	1.765
+++ sources	8 Apr 2009 03:45:44 -0000	1.766
@@ -1 +1 @@
-b598cf0206e4cc22b4f9c75261435997  anaconda-11.5.0.40.tar.bz2
+5d99978597686952c69db9f332c24bf7  anaconda-11.5.0.41.tar.bz2



From cchance at fedoraproject.org  Wed Apr  8 04:39:27 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed,  8 Apr 2009 04:39:27 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.17,1.18
Message-ID: <20090408043927.616CD7011A@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29725

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
resolves: rhbz#483327 (fixed unowned directories.)



Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- baekmuk-ttf-fonts.spec	24 Feb 2009 03:56:31 -0000	1.17
+++ baekmuk-ttf-fonts.spec	8 Apr 2009 04:38:54 -0000	1.18
@@ -8,7 +8,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -111,6 +111,7 @@
 Conflicts:      fonts-korean < 2.2-5
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-5
 Obsoletes:      baekmuk-ttf-common-fonts < 2.2-17
+Requires:       fontpackages-filesystem >= 1.13
 BuildRequires:  fontpackages-filesystem >= 1.13
 
 %description -n %{fontname}-fonts-common
@@ -174,6 +175,9 @@
 %__rm -rf %{buildroot}
 
 %changelog
+* Wed Apr 08 2009 Caius 'kaio' Chance <cchance at redhat.com> - 2.2-21.fc11
+- Resolves: rhbz#483327 (Fixed unowned directories.)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From bskeggs at fedoraproject.org  Wed Apr  8 05:01:17 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  8 Apr 2009 05:01:17 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.37, 1.38 kernel.spec, 1.1518, 
	1.1519
Message-ID: <20090408050117.DC42D7011A@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3572

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: nv50 kms fixes (PROM access, i2c, clean some warnings)




drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- drm-nouveau.patch	6 Apr 2009 22:26:21 -0000	1.37
+++ drm-nouveau.patch	8 Apr 2009 05:01:16 -0000	1.38
@@ -424,10 +424,10 @@
 +}	
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..78a3733
+index 0000000..fd3e08a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,4570 @@
+@@ -0,0 +1,4577 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -517,13 +517,20 @@
 +
 +static void load_vbios_prom(struct drm_device *dev, uint8_t *data)
 +{
-+	uint32_t pci_nv_20 = nvReadMC(dev, NV_PBUS_PCI_NV_20);
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	uint32_t pci_nv_20, save_pci_nv_20;
 +	int pcir_ptr;
 +	int i;
 +
++	if (dev_priv->card_type >= NV_50)
++		pci_nv_20 = 0x88050;
++	else
++		pci_nv_20 = NV_PBUS_PCI_NV_20;
++
 +	/* enable ROM access */
-+	nvWriteMC(dev, NV_PBUS_PCI_NV_20,
-+		  pci_nv_20 & ~NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
++	save_pci_nv_20 = nvReadMC(dev, pci_nv_20);
++	nvWriteMC(dev, pci_nv_20,
++		  save_pci_nv_20 & ~NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
 +
 +	/* bail if no rom signature */
 +	if (nv_rd08(NV_PROM_OFFSET) != 0x55 ||
@@ -548,8 +555,8 @@
 +
 +out:
 +	/* disable ROM access */
-+	nvWriteMC(dev, NV_PBUS_PCI_NV_20,
-+		  pci_nv_20 | NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
++	nvWriteMC(dev, pci_nv_20,
++		  save_pci_nv_20 | NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
 +}
 +
 +static void load_vbios_pramin(struct drm_device *dev, uint8_t *data)
@@ -12077,10 +12084,10 @@
 +#endif	/* __NOUVEAU_HW_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
 new file mode 100644
-index 0000000..2cf6a4a
+index 0000000..5cd2fbf
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,225 @@
 +/*
 + * Copyright 2009 Red Hat Inc.
 + *
@@ -12226,11 +12233,16 @@
 +		i2c->algo.setscl = nv50_i2c_setscl;
 +		i2c->algo.getsda = nv50_i2c_getsda;
 +		i2c->algo.getscl = nv50_i2c_getscl;
++		/* not 100% convinced this is correct everywhere, but
++		 * the best guess so far..
++		 */
 +		if (dcbi2c->read <= 3)
-+			i2c->rd = 0xe138;
++			i2c->rd = 0xe138 + (dcbi2c->read * 24);
 +		else
-+			i2c->rd = 0xe1e0;
-+		i2c->rd += dcbi2c->read * 0x18;
++		if (dev_priv->chipset < 0x90)
++			i2c->rd = 0xe1e0 + (dcbi2c->read * 24);
++		else
++			i2c->rd = 0xe1d4 + (dcbi2c->read * 32);
 +		i2c->wr = i2c->rd;
 +		break;
 +	default:
@@ -12270,12 +12282,43 @@
 +	drm_free(i2c, sizeof(*i2c), DRM_MEM_DRIVER);
 +}
 +
++bool
++nouveau_i2c_detect(struct nouveau_connector *connector)
++{
++	struct drm_device *dev = connector->base.dev;
++	/* kindly borrrowed from the intel driver, hope it works. */
++	uint8_t out_buf[] = { 0x0, 0x0};
++	uint8_t buf[2];
++	bool ret;
++	struct i2c_msg msgs[] = {
++		{
++			.addr = 0x50,
++			.flags = 0,
++			.len = 1,
++			.buf = out_buf,
++		},
++		{
++			.addr = 0x50,
++			.flags = I2C_M_RD,
++			.len = 1,
++			.buf = buf,
++		}
++	};
++
++	if (!connector->i2c_chan)
++		return false;
++
++	ret = (i2c_transfer(&connector->i2c_chan->adapter, msgs, 2) == 2);
++
++	NV_DEBUG(dev, "i2c_detect: bus=%d present=%d\n", connector->bus, ret);
++	return ret;
++}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
 new file mode 100644
-index 0000000..929b585
+index 0000000..70b1a54
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,46 @@
 +/*
 + * Copyright 2009 Red Hat Inc.
 + *
@@ -12305,6 +12348,8 @@
 +#include <linux/i2c-id.h>
 +#include <linux/i2c-algo-bit.h>
 +
++#include "nouveau_connector.h"
++
 +struct nouveau_i2c_chan {
 +	struct drm_device *dev;
 +	struct i2c_adapter adapter;
@@ -12317,6 +12362,7 @@
 +int nouveau_i2c_new(struct drm_device *, const char *, unsigned,
 +		    struct nouveau_i2c_chan **);
 +void nouveau_i2c_del(struct nouveau_i2c_chan **);
++bool nouveau_i2c_detect(struct nouveau_connector *connector);
 +
 +#endif /* __NOUVEAU_I2C_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
@@ -23515,10 +23561,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c
 new file mode 100644
-index 0000000..7a21b70
+index 0000000..afb9ac3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
-@@ -0,0 +1,594 @@
+@@ -0,0 +1,536 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -23659,52 +23705,6 @@
 +	return NULL;
 +}
 +
-+static bool nv50_connector_hpd_detect(struct nouveau_connector *connector)
-+{
-+	struct drm_device *dev = connector->base.dev;
-+	uint32_t bus = connector->bus, reg;
-+	bool present = false;
-+
-+	reg = nv_rd32(NV50_PCONNECTOR_HOTPLUG_STATE);
-+	if (reg & (NV50_PCONNECTOR_HOTPLUG_STATE_PIN_CONNECTED_I2C0 << (4 * bus)))
-+		present = true;
-+
-+	NV_DEBUG(dev, "hpd_detect: bus=%d reg=0x%08x present=%d\n",
-+		 connector->bus, reg, present);
-+	return present;
-+}
-+
-+static bool nv50_connector_i2c_detect(struct nouveau_connector *connector)
-+{
-+	struct drm_device *dev = connector->base.dev;
-+	/* kindly borrrowed from the intel driver, hope it works. */
-+	uint8_t out_buf[] = { 0x0, 0x0};
-+	uint8_t buf[2];
-+	bool ret;
-+	struct i2c_msg msgs[] = {
-+		{
-+			.addr = 0x50,
-+			.flags = 0,
-+			.len = 1,
-+			.buf = out_buf,
-+		},
-+		{
-+			.addr = 0x50,
-+			.flags = I2C_M_RD,
-+			.len = 1,
-+			.buf = buf,
-+		}
-+	};
-+
-+	if (!connector->i2c_chan)
-+		return false;
-+
-+	ret = (i2c_transfer(&connector->i2c_chan->adapter, msgs, 2) == 2);
-+
-+	NV_DEBUG(dev, "i2c_detect: bus=%d present=%d\n", connector->bus, ret);
-+	return ret;
-+}
-+
 +static void nv50_connector_destroy(struct drm_connector *drm_connector)
 +{
 +	struct nouveau_connector *connector = to_nouveau_connector(drm_connector);
@@ -23759,7 +23759,6 @@
 +	struct nouveau_connector *connector = to_nouveau_connector(drm_connector);
 +	struct nouveau_encoder *encoder = NULL;
 +	struct drm_encoder_helper_funcs *helper = NULL;
-+	bool hpd, i2c;
 +
 +	if (drm_connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
 +		if (!connector->native_mode) {
@@ -23781,18 +23780,7 @@
 +		return connector_status_connected;
 +	}
 +
-+	/* It's not certain if we can trust the hotplug pins just yet,
-+	 * at least, we haven't found a reliable way of determining which
-+	 * pin is wired to which connector.  We'll do both hpd and single-byte
-+	 * i2c detect, and report if they differ for reference, and then
-+	 * trust i2c detect.
-+	 */
-+	hpd = nv50_connector_hpd_detect(connector);
-+	i2c = nv50_connector_i2c_detect(connector);
-+	if (hpd != i2c)
-+		NV_INFO(dev, "i2c and hpd detect differ: %d vs %d\n", i2c, hpd);
-+
-+	if (i2c) {
++	if (nouveau_i2c_detect(connector)) {
 +		nv50_connector_set_digital(connector, true);
 +		return connector_status_connected;
 +	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1518
retrieving revision 1.1519
diff -u -r1.1518 -r1.1519
--- kernel.spec	7 Apr 2009 17:25:09 -0000	1.1518
+++ kernel.spec	8 Apr 2009 05:01:17 -0000	1.1519
@@ -1905,6 +1905,9 @@
 # and build.
 
 %changelog
+* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: nv50 kms fixes (PROM access, i2c, clean some warnings)
+
 * Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
 - linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
 



From bskeggs at fedoraproject.org  Wed Apr  8 05:05:23 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  8 Apr 2009 05:05:23 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.29,
	1.30 nouveau-fedora.patch, 1.18, 1.19 sources, 1.30,
	1.31 xorg-x11-drv-nouveau.spec, 1.35, 1.36
Message-ID: <20090408050523.A97F57011A@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4706

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-24.20090408git960a5c8
- modify nv50 ddc regs again, fix kms edid property





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	7 Apr 2009 08:51:35 -0000	1.29
+++ .cvsignore	8 Apr 2009 05:04:53 -0000	1.30
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090407git11451ca.tar.bz2
+xf86-video-nouveau-0.0.12-20090408git960a5c8.tar.bz2

nouveau-fedora.patch:

Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nouveau-fedora.patch	7 Apr 2009 08:51:35 -0000	1.18
+++ nouveau-fedora.patch	8 Apr 2009 05:04:53 -0000	1.19
@@ -11,7 +11,7 @@
  			 nouveau_output.h \
  			 nouveau_connector.h \
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index b7a38fa..5361825 100644
+index d0fb4b4..102ea28 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -185,6 +185,51 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
@@ -485,7 +485,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 0679289..1369863 100644
+index 2a9dca1..7e6d469 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	7 Apr 2009 08:51:35 -0000	1.30
+++ sources	8 Apr 2009 05:04:53 -0000	1.31
@@ -1 +1 @@
-8eab4ec072c5ab7f779e18604a9f0008  xf86-video-nouveau-0.0.12-20090407git11451ca.tar.bz2
+d4988ce44264e8c12658e5a9e6143959  xf86-video-nouveau-0.0.12-20090408git960a5c8.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-drv-nouveau.spec	7 Apr 2009 08:51:35 -0000	1.35
+++ xorg-x11-drv-nouveau.spec	8 Apr 2009 05:04:53 -0000	1.36
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090407
-%define git_version 11451ca
+%define gitdate 20090408
+%define git_version 960a5c8
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   22.%{snapshot}%{?dist}
+Release:   24.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-24.20090408git960a5c8
+- modify nv50 ddc regs again, fix kms edid property
+
 * Tue Apr 07 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-23.20090407git11451ca
 - upstream update: rh#492399, nv50 PROM fixes
 



From kyle at fedoraproject.org  Wed Apr  8 05:16:55 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed,  8 Apr 2009 05:16:55 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1045, 1.1046 config-generic, 1.275, 1.276 kernel.spec, 1.1505,
	1.1506 sources, 1.1007, 1.1008 upstream, 1.918,
	1.919 linux-2.6-hwmon-atk0110.patch, 1.2,
	NONE patch-2.6.29-git15.bz2.sign, 1.1, NONE
Message-ID: <20090408051655.E0C8A7011A@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7889

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc1.bz2.sign 
Removed Files:
	linux-2.6-hwmon-atk0110.patch patch-2.6.29-git15.bz2.sign 
Log Message:
* Wed Apr 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.44.rc1
- 2.6.30-rc1
- linux-2.6-hwmon-atk0110.patch: drop
- CONFIG_DETECT_HUNG_TASK=y
- # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set



--- NEW FILE patch-2.6.30-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ29fHyGugalF9Dw4RAv5uAJ9XG0JjkbCkU9eJpKeSN77BWl8qvQCdGqrq
9C64FG/dffsorXwmc2lSBoI=
=G73h
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1045
retrieving revision 1.1046
diff -u -r1.1045 -r1.1046
--- .cvsignore	7 Apr 2009 17:13:39 -0000	1.1045
+++ .cvsignore	8 Apr 2009 05:16:24 -0000	1.1046
@@ -6,3 +6,4 @@
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
+patch-2.6.30-rc1.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- config-generic	7 Apr 2009 17:13:39 -0000	1.275
+++ config-generic	8 Apr 2009 05:16:24 -0000	1.276
@@ -2012,6 +2012,7 @@
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_HDAPS=m
@@ -2402,6 +2403,7 @@
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ARK is not set
 CONFIG_FB_ATY128=m
@@ -3047,6 +3049,7 @@
 CONFIG_AUTOFS4_FS=m
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_NILFS2_FS=m
 
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
@@ -3462,6 +3465,8 @@
 
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
 CONFIG_KEXEC=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1505
retrieving revision 1.1506
diff -u -r1.1505 -r1.1506
--- kernel.spec	8 Apr 2009 01:31:58 -0000	1.1505
+++ kernel.spec	8 Apr 2009 05:16:24 -0000	1.1506
@@ -56,9 +56,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 1
 # The git snapshot level
-%define gitrev 15
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -618,7 +618,6 @@
 Patch382: linux-2.6-defaults-pciehp.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch393: linux-2.6-hwmon-atk0110.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 
@@ -1121,7 +1120,6 @@
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-hwmon-atk0110.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1824,6 +1822,12 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.44.rc1
+- 2.6.30-rc1
+- linux-2.6-hwmon-atk0110.patch: drop
+- CONFIG_DETECT_HUNG_TASK=y
+- # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+
 * Tue Apr  7 2009 Roland McGrath <roland at redhat.com>
 - utrace update, drop unfinished utrace-ftrace
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1007
retrieving revision 1.1008
diff -u -r1.1007 -r1.1008
--- sources	7 Apr 2009 17:13:39 -0000	1.1007
+++ sources	8 Apr 2009 05:16:25 -0000	1.1008
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-56ef0b166442ce0e16b47deba9e66f26  patch-2.6.29-git15.bz2
+05daeda25430fd13bbdb47b3481f7320  patch-2.6.30-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- upstream	7 Apr 2009 17:13:39 -0000	1.918
+++ upstream	8 Apr 2009 05:16:25 -0000	1.919
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29-git15.bz2
+patch-2.6.30-rc1.bz2


--- linux-2.6-hwmon-atk0110.patch DELETED ---


--- patch-2.6.29-git15.bz2.sign DELETED ---



From oget at fedoraproject.org  Wed Apr  8 05:27:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 05:27:23 +0000 (UTC)
Subject: rpms/jamin/devel import.log, NONE, 1.1 jamin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408052723.5C4967011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jamin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11361/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jamin.spec 
Log Message:
* Tue Apr 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-5
- Suppress double ./configure (in autogen.sh)
- Clean up unnecessary BR's
- Minor SPEC file update for macro consistency
- Update description

* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-4
- Respin for Fedora (SPEC file borrowed from PlanetCCRMA)



--- NEW FILE import.log ---
jamin-0_95_0-5_fc10:HEAD:jamin-0.95.0-5.fc10.src.rpm:1239168370


--- NEW FILE jamin.spec ---
Name:          jamin
Summary:       JACK Audio Connection Kit (JACK) Audio Mastering interface
Version:       0.95.0
Release:       5%{?dist}
License:       GPLv2+
Group:         Applications/Multimedia
URL:           http://jamin.sourceforge.net
Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils
BuildRequires: fftw-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: jack-audio-connection-kit-devel 
BuildRequires: ladspa-devel
BuildRequires: liblo-devel
BuildRequires: libtool
BuildRequires: libxml2-devel 
BuildRequires: perl-XML-Parser 

Requires:      ladspa-swh-plugins

%description
JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface. JAMin
is designed to perform professional audio mastering of any number of input
streams. It uses LADSPA for its backend DSP work, specifically the swh plugins.


%prep
%setup -q

# Fix lib
for file in controller/Makefile.am src/plugin.c; do
   %{__sed} -i 's|/lib/|/%{_lib}/|g' $file
done

# .desktop file fixes:
# Add GenericName
%{__sed} -i 's|\(GenericName=\)|\1Jack Audio Mastering|' data/%{name}.desktop.in

# Remove extension from the icon (as required by freedesktop.org)
%{__sed} -i 's|\.svg||' data/%{name}.desktop.in

%build
NOCONFIGURE=indeed ./autogen.sh
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

# move icon to the proper freedesktop location
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
%{__mv} %{buildroot}%{_datadir}/icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/

# desktop file categories
BASE="Audio"
XTRA="X-Multitrack X-Digital_Processing X-Jack"

%{__mkdir} -p %{buildroot}%{_datadir}/applications
desktop-file-install                            \
  --dir %{buildroot}%{_datadir}/applications    \
  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

# Kill .la file(s)
%{__rm} -f %{buildroot}%{_libdir}/ladspa/*.la

%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_mandir}/man1/%{name}*
%{_libdir}/ladspa/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Tue Apr 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-5
- Suppress double ./configure (in autogen.sh)
- Clean up unnecessary BR's
- Minor SPEC file update for macro consistency
- Update description

* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-4
- Respin for Fedora (SPEC file borrowed from PlanetCCRMA)

* Tue Nov 25 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- run autogen.sh for fc10

* Wed Nov 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- updated desktop categories

* Wed Dec  6 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-3
- spec file tweaks
- move icon to proper freedesktop location, add post/postun scripts
- add patch for ladspa plugin directory, added autoconf & friends build
  requirement (borrowed from SuSE source package)
- add patch for default plugin search directory in x86_64 (it is hardwired
  in the plugin.c file)

* Mon May  6 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-2
- added Planet CCRMA categories

* Wed May  4 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-1
- updated to 0.95.0, fixed file list, added icon to desktop entry

* Tue Dec 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Mon Aug  9 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.17-0.cvs.1
- switched to jamin cvs, the 0.9.0 version does not work with the
  newer versions of liblo

* Mon Aug  9 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1
- udpated to final 0.9.0 release
- added liblo requirement, fixed file list

* Fri Jul 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-0.beta10.1
- updated to the latest beta tarball (0.8.0 does not work with the 
  newest swh-plugins)

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Mon Jan 12 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.8.0-1
- updated to 0.8.0 (first stable release)

* Mon Dec 15 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.6.0-0.cvs.1
- initial build.
- added menu entry


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:39:49 -0000	1.1
+++ .cvsignore	8 Apr 2009 05:26:52 -0000	1.2
@@ -0,0 +1 @@
+jamin-0.95.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:39:49 -0000	1.1
+++ sources	8 Apr 2009 05:26:52 -0000	1.2
@@ -0,0 +1 @@
+032f2a4a578a8938f76282112d56c8d6  jamin-0.95.0.tar.gz



From oget at fedoraproject.org  Wed Apr  8 05:30:32 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 05:30:32 +0000 (UTC)
Subject: rpms/jamin/F-10 import.log, NONE, 1.1 jamin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408053032.50C237011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jamin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12281/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jamin.spec 
Log Message:
* Tue Apr 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-5
- Suppress double ./configure (in autogen.sh)
- Clean up unnecessary BR's
- Minor SPEC file update for macro consistency
- Update description

* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-4
- Respin for Fedora (SPEC file borrowed from PlanetCCRMA)



--- NEW FILE import.log ---
jamin-0_95_0-5_fc10:F-10:jamin-0.95.0-5.fc10.src.rpm:1239168484


--- NEW FILE jamin.spec ---
Name:          jamin
Summary:       JACK Audio Connection Kit (JACK) Audio Mastering interface
Version:       0.95.0
Release:       5%{?dist}
License:       GPLv2+
Group:         Applications/Multimedia
URL:           http://jamin.sourceforge.net
Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils
BuildRequires: fftw-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: jack-audio-connection-kit-devel 
BuildRequires: ladspa-devel
BuildRequires: liblo-devel
BuildRequires: libtool
BuildRequires: libxml2-devel 
BuildRequires: perl-XML-Parser 

Requires:      ladspa-swh-plugins

%description
JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface. JAMin
is designed to perform professional audio mastering of any number of input
streams. It uses LADSPA for its backend DSP work, specifically the swh plugins.


%prep
%setup -q

# Fix lib
for file in controller/Makefile.am src/plugin.c; do
   %{__sed} -i 's|/lib/|/%{_lib}/|g' $file
done

# .desktop file fixes:
# Add GenericName
%{__sed} -i 's|\(GenericName=\)|\1Jack Audio Mastering|' data/%{name}.desktop.in

# Remove extension from the icon (as required by freedesktop.org)
%{__sed} -i 's|\.svg||' data/%{name}.desktop.in

%build
NOCONFIGURE=indeed ./autogen.sh
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

# move icon to the proper freedesktop location
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
%{__mv} %{buildroot}%{_datadir}/icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/

# desktop file categories
BASE="Audio"
XTRA="X-Multitrack X-Digital_Processing X-Jack"

%{__mkdir} -p %{buildroot}%{_datadir}/applications
desktop-file-install                            \
  --dir %{buildroot}%{_datadir}/applications    \
  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

# Kill .la file(s)
%{__rm} -f %{buildroot}%{_libdir}/ladspa/*.la

%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_mandir}/man1/%{name}*
%{_libdir}/ladspa/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Tue Apr 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-5
- Suppress double ./configure (in autogen.sh)
- Clean up unnecessary BR's
- Minor SPEC file update for macro consistency
- Update description

* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-4
- Respin for Fedora (SPEC file borrowed from PlanetCCRMA)

* Tue Nov 25 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- run autogen.sh for fc10

* Wed Nov 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- updated desktop categories

* Wed Dec  6 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-3
- spec file tweaks
- move icon to proper freedesktop location, add post/postun scripts
- add patch for ladspa plugin directory, added autoconf & friends build
  requirement (borrowed from SuSE source package)
- add patch for default plugin search directory in x86_64 (it is hardwired
  in the plugin.c file)

* Mon May  6 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-2
- added Planet CCRMA categories

* Wed May  4 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-1
- updated to 0.95.0, fixed file list, added icon to desktop entry

* Tue Dec 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Mon Aug  9 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.17-0.cvs.1
- switched to jamin cvs, the 0.9.0 version does not work with the
  newer versions of liblo

* Mon Aug  9 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1
- udpated to final 0.9.0 release
- added liblo requirement, fixed file list

* Fri Jul 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-0.beta10.1
- updated to the latest beta tarball (0.8.0 does not work with the 
  newest swh-plugins)

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Mon Jan 12 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.8.0-1
- updated to 0.8.0 (first stable release)

* Mon Dec 15 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.6.0-0.cvs.1
- initial build.
- added menu entry


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:39:49 -0000	1.1
+++ .cvsignore	8 Apr 2009 05:30:01 -0000	1.2
@@ -0,0 +1 @@
+jamin-0.95.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:39:49 -0000	1.1
+++ sources	8 Apr 2009 05:30:01 -0000	1.2
@@ -0,0 +1 @@
+032f2a4a578a8938f76282112d56c8d6  jamin-0.95.0.tar.gz



From oget at fedoraproject.org  Wed Apr  8 05:32:01 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 05:32:01 +0000 (UTC)
Subject: rpms/jamin/F-9 import.log, NONE, 1.1 jamin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408053201.20E837011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jamin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12878/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jamin.spec 
Log Message:
* Tue Apr 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-5
- Suppress double ./configure (in autogen.sh)
- Clean up unnecessary BR's
- Minor SPEC file update for macro consistency
- Update description

* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-4
- Respin for Fedora (SPEC file borrowed from PlanetCCRMA)



--- NEW FILE import.log ---
jamin-0_95_0-5_fc10:F-9:jamin-0.95.0-5.fc10.src.rpm:1239168670


--- NEW FILE jamin.spec ---
Name:          jamin
Summary:       JACK Audio Connection Kit (JACK) Audio Mastering interface
Version:       0.95.0
Release:       5%{?dist}
License:       GPLv2+
Group:         Applications/Multimedia
URL:           http://jamin.sourceforge.net
Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils
BuildRequires: fftw-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: jack-audio-connection-kit-devel 
BuildRequires: ladspa-devel
BuildRequires: liblo-devel
BuildRequires: libtool
BuildRequires: libxml2-devel 
BuildRequires: perl-XML-Parser 

Requires:      ladspa-swh-plugins

%description
JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface. JAMin
is designed to perform professional audio mastering of any number of input
streams. It uses LADSPA for its backend DSP work, specifically the swh plugins.


%prep
%setup -q

# Fix lib
for file in controller/Makefile.am src/plugin.c; do
   %{__sed} -i 's|/lib/|/%{_lib}/|g' $file
done

# .desktop file fixes:
# Add GenericName
%{__sed} -i 's|\(GenericName=\)|\1Jack Audio Mastering|' data/%{name}.desktop.in

# Remove extension from the icon (as required by freedesktop.org)
%{__sed} -i 's|\.svg||' data/%{name}.desktop.in

%build
NOCONFIGURE=indeed ./autogen.sh
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

# move icon to the proper freedesktop location
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
%{__mv} %{buildroot}%{_datadir}/icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/

# desktop file categories
BASE="Audio"
XTRA="X-Multitrack X-Digital_Processing X-Jack"

%{__mkdir} -p %{buildroot}%{_datadir}/applications
desktop-file-install                            \
  --dir %{buildroot}%{_datadir}/applications    \
  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

# Kill .la file(s)
%{__rm} -f %{buildroot}%{_libdir}/ladspa/*.la

%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_mandir}/man1/%{name}*
%{_libdir}/ladspa/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Tue Apr 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-5
- Suppress double ./configure (in autogen.sh)
- Clean up unnecessary BR's
- Minor SPEC file update for macro consistency
- Update description

* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-4
- Respin for Fedora (SPEC file borrowed from PlanetCCRMA)

* Tue Nov 25 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- run autogen.sh for fc10

* Wed Nov 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- updated desktop categories

* Wed Dec  6 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-3
- spec file tweaks
- move icon to proper freedesktop location, add post/postun scripts
- add patch for ladspa plugin directory, added autoconf & friends build
  requirement (borrowed from SuSE source package)
- add patch for default plugin search directory in x86_64 (it is hardwired
  in the plugin.c file)

* Mon May  6 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-2
- added Planet CCRMA categories

* Wed May  4 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.95.0-1
- updated to 0.95.0, fixed file list, added icon to desktop entry

* Tue Dec 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Mon Aug  9 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.17-0.cvs.1
- switched to jamin cvs, the 0.9.0 version does not work with the
  newer versions of liblo

* Mon Aug  9 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1
- udpated to final 0.9.0 release
- added liblo requirement, fixed file list

* Fri Jul 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-0.beta10.1
- updated to the latest beta tarball (0.8.0 does not work with the 
  newest swh-plugins)

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Mon Jan 12 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.8.0-1
- updated to 0.8.0 (first stable release)

* Mon Dec 15 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.6.0-0.cvs.1
- initial build.
- added menu entry


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:39:49 -0000	1.1
+++ .cvsignore	8 Apr 2009 05:31:30 -0000	1.2
@@ -0,0 +1 @@
+jamin-0.95.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:39:49 -0000	1.1
+++ sources	8 Apr 2009 05:31:30 -0000	1.2
@@ -0,0 +1 @@
+032f2a4a578a8938f76282112d56c8d6  jamin-0.95.0.tar.gz



From mmaslano at fedoraproject.org  Wed Apr  8 05:48:00 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  8 Apr 2009 05:48:00 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/devel perl-Data-Dumper-Names.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408054800.AA8777011A@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17052

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Dumper-Names.spec 
Log Message:
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-2
- remove unnecessary requirement



--- NEW FILE perl-Data-Dumper-Names.spec ---
Name:           perl-Data-Dumper-Names
Version:        0.03
Release:        2%{?dist}
Summary:        Data::Dumper like module for printing and eval data structures
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Data-Dumper-Names/
Source0:        http://www.cpan.org/authors/id/O/OV/OVID/Data-Dumper-Names-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(PadWalker) >= 0.13
Requires:       perl(PadWalker) >= 0.13
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The essential module Data::Dumper is used for printing perl data structures or 
suitable for eval. Data::Dumper::Names dump variables with names and without
source filter. 

%prep
%setup -q -n Data-Dumper-Names-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-2
- remove unnecessary requirement

* Thu Apr 02 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:46:47 -0000	1.1
+++ .cvsignore	8 Apr 2009 05:47:30 -0000	1.2
@@ -0,0 +1 @@
+Data-Dumper-Names-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:46:47 -0000	1.1
+++ sources	8 Apr 2009 05:47:30 -0000	1.2
@@ -0,0 +1 @@
+87fb75627801e323f7bc4430c3c97334  Data-Dumper-Names-0.03.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 05:59:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 05:59:17 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090408055918.3B0EE10F85E@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on qca2 (Fedora devel) to Approved for slankes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Wed Apr  8 05:59:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 05:59:20 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090408055920.D35E510F872@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on qca2 (Fedora devel) to Approved for slankes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Wed Apr  8 05:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 05:59:23 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090408055923.923A610F876@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on qca2 (Fedora devel) to Approved for slankes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Wed Apr  8 06:00:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 06:00:20 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090408055929.8FF7210F87A@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on qca2 (Fedora 10) to Approved for slankes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Wed Apr  8 05:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 05:59:30 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090408055931.01D9910F87B@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on qca2 (Fedora 10) to Approved for slankes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Wed Apr  8 06:00:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 06:00:23 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090408055933.5850D10F87F@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on qca2 (Fedora 10) to Approved for slankes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Wed Apr  8 06:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 06:00:11 +0000
Subject: [pkgdb] amarok had acl change status
Message-ID: <20090408060011.CECF110F879@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on amarok (Fedora 10) to Approved for kaboon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From cchance at fedoraproject.org  Wed Apr  8 06:25:16 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed,  8 Apr 2009 06:25:16 +0000 (UTC)
Subject: rpms/cjkunifonts/F-10 CIDFnmap.zh_CN, 1.1, 1.2 CIDFnmap.zh_TW, 1.1, 
	1.2 FAPIcidfmap.zh_CN, 1.1, 1.2 FAPIcidfmap.zh_TW, 1.1,
	1.2 cidfmap.zh_CN, 1.1, 1.2 cidfmap.zh_TW, 1.1, 1.2
Message-ID: <20090408062516.1A6357011A@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26017

Modified Files:
	CIDFnmap.zh_CN CIDFnmap.zh_TW FAPIcidfmap.zh_CN 
	FAPIcidfmap.zh_TW cidfmap.zh_CN cidfmap.zh_TW 
Log Message:
updated address of ghostscript locations



Index: CIDFnmap.zh_CN
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/CIDFnmap.zh_CN,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CIDFnmap.zh_CN	31 Aug 2007 01:20:20 -0000	1.1
+++ CIDFnmap.zh_CN	8 Apr 2009 06:24:45 -0000	1.2
@@ -25,8 +25,8 @@
 
 % Adobe-GB1
 
-/BousungEG-Light-GB	(/usr/share/fonts/cjkunifonts-uming/uming.ttf)	;
-/GBZenKai-Medium	(/usr/share/fonts/cjkunifonts-ukai/ukai.ttf)	;
+/BousungEG-Light-GB	(/usr/share/fonts/cjkuni/uming.ttc)	;
+/GBZenKai-Medium	(/usr/share/fonts/cjkuni/ukai.ttc)	;
 
 /Adobe-GB1		/BousungEG-Light-GB	;
 /MSungGBK-Light		/BousungEG-Light-GB	;


Index: CIDFnmap.zh_TW
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/CIDFnmap.zh_TW,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CIDFnmap.zh_TW	31 Aug 2007 01:20:20 -0000	1.1
+++ CIDFnmap.zh_TW	8 Apr 2009 06:24:45 -0000	1.2
@@ -25,8 +25,8 @@
 
 % Adobe-CNS1
 
-/ZenKai-Medium		(/usr/share/fonts/cjkunifonts-ukai/ukai.ttf)	;
-/ShanHeiSun-Light	(/usr/share/fonts/cjkunifonts-uming/uming.ttf)	;
+/ZenKai-Medium		(/usr/share/fonts/cjkuni/ukai.ttc)	;
+/ShanHeiSun-Light	(/usr/share/fonts/cjkuni/uming.ttc)	;
 
 /Adobe-CNS1		/ShanHeiSun-Light	;
 


Index: FAPIcidfmap.zh_CN
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/FAPIcidfmap.zh_CN,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FAPIcidfmap.zh_CN	31 Aug 2007 01:20:20 -0000	1.1
+++ FAPIcidfmap.zh_CN	8 Apr 2009 06:24:45 -0000	1.2
@@ -22,8 +22,8 @@
 %
 % Use regular Postscript syntax.
 %
-/BousungEG-Light-GB	<< /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
-/GBZenKai-Medium	<< /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
+/BousungEG-Light-GB	<< /Path (/usr/share/fonts/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
+/GBZenKai-Medium	<< /Path (/usr/share/fonts/cjkuni/ukai.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
 %
-/MSungGBK-Light		<< /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
-/Adobe-GB1		<< /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
+/MSungGBK-Light		<< /Path (/usr/share/fonts/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
+/Adobe-GB1		<< /Path (/usr/share/fonts/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;


Index: FAPIcidfmap.zh_TW
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/FAPIcidfmap.zh_TW,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FAPIcidfmap.zh_TW	31 Aug 2007 01:20:20 -0000	1.1
+++ FAPIcidfmap.zh_TW	8 Apr 2009 06:24:45 -0000	1.2
@@ -22,7 +22,7 @@
 %
 % Use regular Postscript syntax.
 %
-/ZenKai-Medium		<< /Path (/usr/share/fonts/chinese/cjkunifonts-ukai/ukai.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
-/ShanHeiSun-Light	<< /Path (/usr/share/fonts/chinese/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
+/ZenKai-Medium		<< /Path (/usr/share/fonts/chinese/cjkuni/ukai.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
+/ShanHeiSun-Light	<< /Path (/usr/share/fonts/chinese/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
 %
-/Adobe-CNS1		<< /Path (/usr/share/fonts/chinese/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
+/Adobe-CNS1		<< /Path (/usr/share/fonts/chinese/cjkuni/uming.ttc) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;


Index: cidfmap.zh_CN
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/cidfmap.zh_CN,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cidfmap.zh_CN	31 Aug 2007 01:20:20 -0000	1.1
+++ cidfmap.zh_CN	8 Apr 2009 06:24:45 -0000	1.2
@@ -1,5 +1,5 @@
-/BousungEG-Light-GB	<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CSI [(GB1) 4] >> ;
-/GBZenKai-Medium	<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttf) /CSI [(GB1) 4] >> ;
+/BousungEG-Light-GB	<< /FileType /TrueType /Path (/usr/share/fonts/cjkuni/uming.ttc) /CSI [(GB1) 4] >> ;
+/GBZenKai-Medium	<< /FileType /TrueType /Path (/usr/share/fonts/cjkuni/ukai.ttc) /CSI [(GB1) 4] >> ;
 /MSungGBK-Light		/BousungEG-Light-GB ;
 /Adobe-GB1		/BousungEG-Light-GB ;
 


Index: cidfmap.zh_TW
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/cidfmap.zh_TW,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cidfmap.zh_TW	31 Aug 2007 01:20:20 -0000	1.1
+++ cidfmap.zh_TW	8 Apr 2009 06:24:45 -0000	1.2
@@ -1,4 +1,4 @@
-/ZenKai-Medium		<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttf) /CSI [(CNS1) 4] >> ;
-/ShanHeiSun-Light	<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CSI [(CNS1) 4] >> ;
+/ZenKai-Medium		<< /FileType /TrueType /Path (/usr/share/fonts/cjkuni/ukai.ttc) /CSI [(CNS1) 4] >> ;
+/ShanHeiSun-Light	<< /FileType /TrueType /Path (/usr/share/fonts/cjkuni/uming.ttc) /CSI [(CNS1) 4] >> ;
 /Adobe-CNS1		/ShanHeiSun-Light ;
 



From bskeggs at fedoraproject.org  Wed Apr  8 06:28:41 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  8 Apr 2009 06:28:41 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.30,
	1.31 nouveau-fedora.patch, 1.19, 1.20 sources, 1.31,
	1.32 xorg-x11-drv-nouveau.spec, 1.36, 1.37
Message-ID: <20090408062841.ECDE87011A@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26809

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-25.20090408gitd8545e6
- correct logic error in vbios parser (rh#493981)





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	8 Apr 2009 05:04:53 -0000	1.30
+++ .cvsignore	8 Apr 2009 06:28:11 -0000	1.31
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090408git960a5c8.tar.bz2
+xf86-video-nouveau-0.0.12-20090408gitd8545e6.tar.bz2

nouveau-fedora.patch:

Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nouveau-fedora.patch	8 Apr 2009 05:04:53 -0000	1.19
+++ nouveau-fedora.patch	8 Apr 2009 06:28:11 -0000	1.20
@@ -485,7 +485,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 2a9dca1..7e6d469 100644
+index ebf4027..ad4ff1f 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	8 Apr 2009 05:04:53 -0000	1.31
+++ sources	8 Apr 2009 06:28:11 -0000	1.32
@@ -1 +1 @@
-d4988ce44264e8c12658e5a9e6143959  xf86-video-nouveau-0.0.12-20090408git960a5c8.tar.bz2
+5caf4c97e5d07c448c00487e4aaef0d4  xf86-video-nouveau-0.0.12-20090408gitd8545e6.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-nouveau.spec	8 Apr 2009 05:04:53 -0000	1.36
+++ xorg-x11-drv-nouveau.spec	8 Apr 2009 06:28:11 -0000	1.37
@@ -8,7 +8,7 @@
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
 %define gitdate 20090408
-%define git_version 960a5c8
+%define git_version d8545e6
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   24.%{snapshot}%{?dist}
+Release:   25.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-25.20090408gitd8545e6
+- correct logic error in vbios parser (rh#493981)
+
 * Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-24.20090408git960a5c8
 - modify nv50 ddc regs again, fix kms edid property
 



From cchance at fedoraproject.org  Wed Apr  8 06:30:16 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed,  8 Apr 2009 06:30:16 +0000 (UTC)
Subject: rpms/cjkunifonts/F-10 cjkunifonts.spec,1.24,1.25
Message-ID: <20090408063016.64FD37011A@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27076

Modified Files:
	cjkunifonts.spec 
Log Message:
resolves: rhbz#488398 fixed ghostscript files referred to outdated font info



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/F-10/cjkunifonts.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cjkunifonts.spec	25 Feb 2009 04:01:59 -0000	1.24
+++ cjkunifonts.spec	8 Apr 2009 06:29:46 -0000	1.25
@@ -9,7 +9,7 @@
 
 Name:        cjkunifonts
 Version:     0.2.20080216.1
-Release:     11.fc10
+Release:     12.fc10
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -203,6 +203,10 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Wed Apr 08 2009 Caius 'kaio' Chance <cchance at redhat.com> - 
+  0.2.20080216.1-12.fc10
+- Resolves: rhbz#488398 Fixed ghostscript files referred to outdated font info.
+
 * Wed Feb 25 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.fc10
 - Resolves: rhbz#475743, rhbz#459680
 - Fixed Japanese fonts over-priorized by uming fonts in Japanese locale.



From jnovy at fedoraproject.org  Wed Apr  8 06:41:47 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  8 Apr 2009 06:41:47 +0000 (UTC)
Subject: rpms/libgphoto2/devel .cvsignore, 1.7, 1.8 libgphoto2.spec, 1.19,
	1.20 sources, 1.7, 1.8 gphoto2-canontimeout.patch, 1.1, NONE
Message-ID: <20090408064147.AB5D97011A@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29782

Modified Files:
	.cvsignore libgphoto2.spec sources 
Removed Files:
	gphoto2-canontimeout.patch 
Log Message:
* Wed Apr 08 2009 Jindrich Novy <jnovy at redhat.com> 2.4.5-1
- update to 2.4.5
- remove .canontimeout patch, applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Jan 2009 10:17:18 -0000	1.7
+++ .cvsignore	8 Apr 2009 06:41:16 -0000	1.8
@@ -1 +1 @@
-libgphoto2-2.4.4.tar.bz2
+libgphoto2-2.4.5.tar.bz2


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libgphoto2.spec	1 Apr 2009 06:34:55 -0000	1.19
+++ libgphoto2.spec	8 Apr 2009 06:41:16 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
-Version: 2.4.4
-Release: 4%{?dist}
+Version: 2.4.5
+Release: 1%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,7 +11,6 @@
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
-Patch5: gphoto2-canontimeout.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -55,7 +54,6 @@
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
-%patch5 -p1 -b .canontimeout
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -153,6 +151,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 08 2009 Jindrich Novy <jnovy at redhat.com> 2.4.5-1
+- update to 2.4.5
+- remove .canontimeout patch, applied upstream
+
 * Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-4
 - increase timeouts for Canon cameras (#476355), thanks to
   Andrzej Nowak and Russell Harrison


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Jan 2009 10:17:18 -0000	1.7
+++ sources	8 Apr 2009 06:41:17 -0000	1.8
@@ -1 +1 @@
-8aff5ac4ca72cba17de633078cf1612e  libgphoto2-2.4.4.tar.bz2
+490d7f6def94ff9532593e62aed946e3  libgphoto2-2.4.5.tar.bz2


--- gphoto2-canontimeout.patch DELETED ---



From jnovy at fedoraproject.org  Wed Apr  8 06:42:05 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  8 Apr 2009 06:42:05 +0000 (UTC)
Subject: rpms/gphoto2/devel .cvsignore, 1.21, 1.22 gphoto2.spec, 1.99,
	1.100 sources, 1.23, 1.24
Message-ID: <20090408064205.C8BEF7011A@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/gphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29892

Modified Files:
	.cvsignore gphoto2.spec sources 
Log Message:
* Wed Apr 08 2009 Jindrich Novy <jnovy at redhat.com> 2.4.5-1
- update to 2.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Jan 2009 10:14:51 -0000	1.21
+++ .cvsignore	8 Apr 2009 06:41:34 -0000	1.22
@@ -1 +1 @@
-gphoto2-2.4.4.tar.bz2
+gphoto2-2.4.5.tar.bz2


Index: gphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gphoto2.spec	25 Feb 2009 00:33:10 -0000	1.99
+++ gphoto2.spec	8 Apr 2009 06:41:35 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
-Version: 2.4.4
-Release: 2%{?dist}
+Version: 2.4.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,9 @@
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Wed Apr 08 2009 Jindrich Novy <jnovy at redhat.com> 2.4.5-1
+- update to 2.4.5
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	22 Jan 2009 10:14:51 -0000	1.23
+++ sources	8 Apr 2009 06:41:35 -0000	1.24
@@ -1 +1 @@
-bcc5621e09802e114c7f72a6f6172230  gphoto2-2.4.4.tar.bz2
+cccbe437804c863b87807444ec58a8ac  gphoto2-2.4.5.tar.bz2



From sailer at fedoraproject.org  Wed Apr  8 06:46:38 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed,  8 Apr 2009 06:46:38 +0000 (UTC)
Subject: rpms/mingw32-cairomm/devel mingw32-cairomm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408064638.A322D7011A@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31268

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-cairomm.spec 
Log Message:
import from review
https://bugzilla.redhat.com/show_bug.cgi?id=492122



--- NEW FILE mingw32-cairomm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-cairomm
Version:        1.8.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ API for the cairo graphics library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.cairographics.org
Source0:        http://www.cairographics.org/releases/cairomm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-cairo
BuildRequires:  mingw32-libsigc++20
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
Cairomm is the C++ API for the cairo graphics library. It offers all the power
of cairo with an interface familiar to C++ developers, including use of the 
Standard Template Library where it makes sense.


%prep
%setup -q -n cairomm-%{version}


%build
%{_mingw32_configure} --enable-static=no --enable-docs=no
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libcairomm-1.0-1.dll
%{_mingw32_libdir}/libcairomm-1.0.dll.a
%{_mingw32_libdir}/libcairomm-1.0.la
%{_mingw32_libdir}/pkgconfig/cairomm-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-pdf-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-png-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-ps-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-svg-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-win32-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-win32-font-1.0.pc
%{_mingw32_includedir}/cairomm-1.0


%changelog
* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.8.0-1
- update to 1.8.0

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-4
- Include license.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-3
- Use _smp_mflags.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:45:37 -0000	1.1
+++ .cvsignore	8 Apr 2009 06:46:07 -0000	1.2
@@ -0,0 +1 @@
+cairomm-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:45:37 -0000	1.1
+++ sources	8 Apr 2009 06:46:08 -0000	1.2
@@ -0,0 +1 @@
+15c0f56eee57bb418c38463a6297d715  cairomm-1.8.0.tar.gz



From ankursinha at fedoraproject.org  Wed Apr  8 06:50:16 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Wed,  8 Apr 2009 06:50:16 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts/devel
	chisholm-letterslaughing-fonts-fontconfig.conf, NONE,
	1.1 chisholm-letterslaughing-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408065016.DC5F370137@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32211/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chisholm-letterslaughing-fonts-fontconfig.conf 
	chisholm-letterslaughing-fonts.spec import.log 
Log Message:
* Wed Apr 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- Initial rpm build



--- NEW FILE chisholm-letterslaughing-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>letters laughing</family>
    </prefer>
  </alias>
  <alias>
    <family>letters laughing</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE chisholm-letterslaughing-fonts.spec ---
%global	fontname	chisholm-letterslaughing
%global	fontconf	65-%{fontname}.conf
%global archivename	lleqcdd.zip

Name:		%{fontname}-fonts
Version:	20030323
Release:	1%{?dist}
Summary:	Letters Laughing is a decorative/LED sans-serif font

Group:		User Interface/X
License:	OFL	
URL:		http://glyphobet.net/fonts/free/?font=lleqcdd
Source0:	%{archivename}
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
Letters Laughing is a decorative/LED sans-serif font

%prep
%setup -q -n letters

%build

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%changelog
* Sun Mar 23 2009 Ankur Sinha <ankursinha AT fedoraproject.org>
- 20030323-1
- Initial RPM build
- bugzilla #491530


--- NEW FILE import.log ---
chisholm-letterslaughing-fonts-20030323-1_fc10:HEAD:chisholm-letterslaughing-fonts-20030323-1.fc10.src.rpm:1239173489


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:21:53 -0000	1.1
+++ .cvsignore	8 Apr 2009 06:49:44 -0000	1.2
@@ -0,0 +1 @@
+lleqcdd.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:21:53 -0000	1.1
+++ sources	8 Apr 2009 06:49:44 -0000	1.2
@@ -0,0 +1 @@
+9c5bdc7761cd5079125f7a468f873321  lleqcdd.zip



From sailer at fedoraproject.org  Wed Apr  8 06:53:46 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed,  8 Apr 2009 06:53:46 +0000 (UTC)
Subject: rpms/mingw32-cairomm/F-10 mingw32-cairomm.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408065346.13BE97011A@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-cairomm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1674

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-cairomm.spec 
Log Message:
initial import from review
https://bugzilla.redhat.com/show_bug.cgi?id=492122



--- NEW FILE mingw32-cairomm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-cairomm
Version:        1.6.2
Release:        1%{?dist}
Summary:        MinGW Windows C++ API for the cairo graphics library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.cairographics.org
Source0:        http://www.cairographics.org/releases/cairomm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-cairo
BuildRequires:  mingw32-libsigc++20
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
Cairomm is the C++ API for the cairo graphics library. It offers all the power
of cairo with an interface familiar to C++ developers, including use of the 
Standard Template Library where it makes sense.


%prep
%setup -q -n cairomm-%{version}


%build
%{_mingw32_configure} --enable-static=no --enable-docs=no
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libcairomm-1.0-1.dll
%{_mingw32_libdir}/libcairomm-1.0.dll.a
%{_mingw32_libdir}/libcairomm-1.0.la
%{_mingw32_libdir}/pkgconfig/cairomm-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-pdf-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-png-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-ps-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-svg-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-win32-1.0.pc
%{_mingw32_libdir}/pkgconfig/cairomm-win32-font-1.0.pc
%{_mingw32_includedir}/cairomm-1.0


%changelog
* Wed Apr  8 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.6.2-1
- Downgrade to 1.6.2 to match the native version

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.8.0-1
- update to 1.8.0

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-4
- Include license.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-3
- Use _smp_mflags.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6.2-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:45:37 -0000	1.1
+++ .cvsignore	8 Apr 2009 06:53:15 -0000	1.2
@@ -0,0 +1 @@
+cairomm-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:45:37 -0000	1.1
+++ sources	8 Apr 2009 06:53:15 -0000	1.2
@@ -0,0 +1 @@
+eac5d159e4cba98e32ea174483dee24e  cairomm-1.6.2.tar.gz



From hedayat at fedoraproject.org  Wed Apr  8 06:57:36 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  8 Apr 2009 06:57:36 +0000 (UTC)
Subject: rpms/rcssmonitor/F-10 .cvsignore, 1.3, 1.4 rcssmonitor.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090408065736.57D6A7011A@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssmonitor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2855

Modified Files:
	.cvsignore rcssmonitor.spec sources 
Log Message:
New upstream release: 13.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2008 20:14:32 -0000	1.3
+++ .cvsignore	8 Apr 2009 06:57:05 -0000	1.4
@@ -1 +1 @@
-rcssmonitor-13.0.0.tar.gz
+rcssmonitor-13.1.0.tar.gz


Index: rcssmonitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-10/rcssmonitor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rcssmonitor.spec	9 Feb 2009 21:55:44 -0000	1.4
+++ rcssmonitor.spec	8 Apr 2009 06:57:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rcssmonitor
-Version:        13.0.0
-Release:        3%{?dist}
+Version:        13.1.0
+Release:        1%{?dist}
 Summary:        RoboCup 2D Soccer Simulator Monitor
 
 Group:          Applications/System
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-1
+- Updated to new upstream release
+
 * Tue Feb 10 2009 Hedayat Vatankhah <hedayat at grad.com> 13.0.0-3
 - Added xorg-x11-fonts-misc as a requirement.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2008 20:14:32 -0000	1.3
+++ sources	8 Apr 2009 06:57:05 -0000	1.4
@@ -1 +1 @@
-beac4ee8c0b91065dacb9e083f35fd54  rcssmonitor-13.0.0.tar.gz
+7023aa27466d5988f5b1aae960420dac  rcssmonitor-13.1.0.tar.gz



From ankursinha at fedoraproject.org  Wed Apr  8 07:04:01 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Wed,  8 Apr 2009 07:04:01 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts/F-10
	chisholm-letterslaughing-fonts-fontconfig.conf, NONE,
	1.1 chisholm-letterslaughing-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408070401.6053A7011A@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4226/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	chisholm-letterslaughing-fonts-fontconfig.conf 
	chisholm-letterslaughing-fonts.spec import.log 
Log Message:
* Wed Apr 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- initial rpm build



--- NEW FILE chisholm-letterslaughing-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>letters laughing</family>
    </prefer>
  </alias>
  <alias>
    <family>letters laughing</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE chisholm-letterslaughing-fonts.spec ---
%global	fontname	chisholm-letterslaughing
%global	fontconf	65-%{fontname}.conf
%global archivename	lleqcdd.zip

Name:		%{fontname}-fonts
Version:	20030323
Release:	1%{?dist}
Summary:	Letters Laughing is a decorative/LED sans-serif font

Group:		User Interface/X
License:	OFL	
URL:		http://glyphobet.net/fonts/free/?font=lleqcdd
Source0:	%{archivename}
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
Letters Laughing is a decorative/LED sans-serif font

%prep
%setup -q -n letters

%build

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%changelog
* Sun Mar 23 2009 Ankur Sinha <ankursinha AT fedoraproject.org>
- 20030323-1
- Initial RPM build
- bugzilla #491530


--- NEW FILE import.log ---
chisholm-letterslaughing-fonts-20030323-1_fc10:F-10:chisholm-letterslaughing-fonts-20030323-1.fc10.src.rpm:1239174315


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:21:53 -0000	1.1
+++ .cvsignore	8 Apr 2009 07:03:30 -0000	1.2
@@ -0,0 +1 @@
+lleqcdd.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:21:53 -0000	1.1
+++ sources	8 Apr 2009 07:03:30 -0000	1.2
@@ -0,0 +1 @@
+9c5bdc7761cd5079125f7a468f873321  lleqcdd.zip



From cchance at fedoraproject.org  Wed Apr  8 07:05:45 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed,  8 Apr 2009 07:05:45 +0000 (UTC)
Subject: rpms/ibus-table/devel Makefile,1.1,1.2
Message-ID: <20090408070545.42AE77011A@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4893

Modified Files:
	Makefile 
Log Message:
resolves 488175 fixed wrong libdir of pkgconfig spec file



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	24 Aug 2008 19:00:00 -0000	1.1
+++ Makefile	8 Apr 2009 07:05:14 -0000	1.2
@@ -1,7 +1,9 @@
 # Makefile for source rpm: ibus-table
 # $Id$
-NAME := ibus-table
-SPECFILE = $(firstword $(wildcard *.spec))
+NAME := ibus-table-extraphrase
+#SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = ibus-table-extraphrase.spec
+
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done



From ankursinha at fedoraproject.org  Wed Apr  8 07:06:23 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Wed,  8 Apr 2009 07:06:23 +0000 (UTC)
Subject: rpms/chisholm-letterslaughing-fonts/F-9
	chisholm-letterslaughing-fonts-fontconfig.conf, NONE,
	1.1 chisholm-letterslaughing-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408070623.78B3E7011A@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5234/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	chisholm-letterslaughing-fonts-fontconfig.conf 
	chisholm-letterslaughing-fonts.spec import.log 
Log Message:
* Wed Apr 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org
- Initial rpm build



--- NEW FILE chisholm-letterslaughing-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>letters laughing</family>
    </prefer>
  </alias>
  <alias>
    <family>letters laughing</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE chisholm-letterslaughing-fonts.spec ---
%global	fontname	chisholm-letterslaughing
%global	fontconf	65-%{fontname}.conf
%global archivename	lleqcdd.zip

Name:		%{fontname}-fonts
Version:	20030323
Release:	1%{?dist}
Summary:	Letters Laughing is a decorative/LED sans-serif font

Group:		User Interface/X
License:	OFL	
URL:		http://glyphobet.net/fonts/free/?font=lleqcdd
Source0:	%{archivename}
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
Letters Laughing is a decorative/LED sans-serif font

%prep
%setup -q -n letters

%build

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%changelog
* Sun Mar 23 2009 Ankur Sinha <ankursinha AT fedoraproject.org>
- 20030323-1
- Initial RPM build
- bugzilla #491530


--- NEW FILE import.log ---
chisholm-letterslaughing-fonts-20030323-1_fc10:F-9:chisholm-letterslaughing-fonts-20030323-1.fc10.src.rpm:1239174501


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:21:53 -0000	1.1
+++ .cvsignore	8 Apr 2009 07:05:52 -0000	1.2
@@ -0,0 +1 @@
+lleqcdd.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-letterslaughing-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:21:53 -0000	1.1
+++ sources	8 Apr 2009 07:05:53 -0000	1.2
@@ -0,0 +1 @@
+9c5bdc7761cd5079125f7a468f873321  lleqcdd.zip



From cchance at fedoraproject.org  Wed Apr  8 07:11:35 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed,  8 Apr 2009 07:11:35 +0000 (UTC)
Subject: rpms/ibus-table/devel Makefile,1.2,1.3
Message-ID: <20090408071135.C99707011A@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6479

Modified Files:
	Makefile 
Log Message:
typo, revert to last revision



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	8 Apr 2009 07:05:14 -0000	1.2
+++ Makefile	8 Apr 2009 07:11:05 -0000	1.3
@@ -1,8 +1,8 @@
 # Makefile for source rpm: ibus-table
 # $Id$
-NAME := ibus-table-extraphrase
+NAME := ibus-table
 #SPECFILE = $(firstword $(wildcard *.spec))
-SPECFILE = ibus-table-extraphrase.spec
+SPECFILE = ibus-table.spec
 
 
 define find-makefile-common



From hedayat at fedoraproject.org  Wed Apr  8 07:12:58 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  8 Apr 2009 07:12:58 +0000 (UTC)
Subject: rpms/rcssmonitor/F-9 .cvsignore, 1.3, 1.4 import.log, 1.1,
	1.2 rcssmonitor.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090408071258.499977011A@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssmonitor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6810

Modified Files:
	.cvsignore import.log rcssmonitor.spec sources 
Log Message:
New upstream release: 13.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2008 20:34:58 -0000	1.3
+++ .cvsignore	8 Apr 2009 07:12:27 -0000	1.4
@@ -1 +1 @@
-rcssmonitor-13.0.0.tar.gz
+rcssmonitor-13.1.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 11:49:37 -0000	1.1
+++ import.log	8 Apr 2009 07:12:27 -0000	1.2
@@ -1 +1 @@
-rcssmonitor-12_1_0-2_fc9:F-9:rcssmonitor-12.1.0-2.fc9.src.rpm:1219751151
+rcssmonitor-12_1_0-2_fc9:HEAD:rcssmonitor-12.1.0-2.fc9.src.rpm:1219749992


Index: rcssmonitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-9/rcssmonitor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rcssmonitor.spec	9 Feb 2009 22:24:11 -0000	1.3
+++ rcssmonitor.spec	8 Apr 2009 07:12:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rcssmonitor
-Version:        13.0.0
-Release:        3%{?dist}
+Version:        13.1.0
+Release:        1%{?dist}
 Summary:        RoboCup 2D Soccer Simulator Monitor
 
 Group:          Applications/System
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.1.0-1
+- Updated to new upstream release
+
 * Tue Feb 10 2009 Hedayat Vatankhah <hedayat at grad.com> 13.0.0-3
 - Added xorg-x11-fonts-misc as a requirement.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssmonitor/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2008 20:34:58 -0000	1.3
+++ sources	8 Apr 2009 07:12:27 -0000	1.4
@@ -1 +1 @@
-beac4ee8c0b91065dacb9e083f35fd54  rcssmonitor-13.0.0.tar.gz
+7023aa27466d5988f5b1aae960420dac  rcssmonitor-13.1.0.tar.gz



From sailer at fedoraproject.org  Wed Apr  8 07:13:15 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed,  8 Apr 2009 07:13:15 +0000 (UTC)
Subject: rpms/mingw32-cairomm/F-10 mingw32-cairomm.spec,1.1,1.2
Message-ID: <20090408071315.290BC7011A@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-cairomm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6892

Modified Files:
	mingw32-cairomm.spec 
Log Message:
remove not yet existing pkgconfig files



Index: mingw32-cairomm.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/F-10/mingw32-cairomm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-cairomm.spec	8 Apr 2009 06:53:15 -0000	1.1
+++ mingw32-cairomm.spec	8 Apr 2009 07:12:44 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-cairomm
 Version:        1.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ API for the cairo graphics library
 
 License:        LGPLv2+
@@ -59,12 +59,6 @@
 %{_mingw32_libdir}/libcairomm-1.0.dll.a
 %{_mingw32_libdir}/libcairomm-1.0.la
 %{_mingw32_libdir}/pkgconfig/cairomm-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-pdf-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-png-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-ps-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-svg-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-win32-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-win32-font-1.0.pc
 %{_mingw32_includedir}/cairomm-1.0
 
 



From sailer at fedoraproject.org  Wed Apr  8 07:17:30 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed,  8 Apr 2009 07:17:30 +0000 (UTC)
Subject: rpms/mingw32-cairomm/F-10 mingw32-cairomm.spec,1.2,1.3
Message-ID: <20090408071730.2EB777011A@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-cairomm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8027

Modified Files:
	mingw32-cairomm.spec 
Log Message:
commit unsaved changelog entry



Index: mingw32-cairomm.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/F-10/mingw32-cairomm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-cairomm.spec	8 Apr 2009 07:12:44 -0000	1.2
+++ mingw32-cairomm.spec	8 Apr 2009 07:16:59 -0000	1.3
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Wed Apr  8 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.6.2-2
+- remove not yet existing pkgconfig files
+
 * Wed Apr  8 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.6.2-1
 - Downgrade to 1.6.2 to match the native version
 



From ankursinha at fedoraproject.org  Wed Apr  8 07:31:36 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Wed,  8 Apr 2009 07:31:36 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.235,1.236 comps-f9.xml.in,1.445,1.446
Message-ID: <20090408073136.1D9D07011A@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11728

Modified Files:
	comps-f10.xml.in comps-f9.xml.in 
Log Message:
* Wed Apr 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- Initial submission.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- comps-f10.xml.in	7 Apr 2009 11:34:11 -0000	1.235
+++ comps-f10.xml.in	8 Apr 2009 07:31:05 -0000	1.236
@@ -1436,6 +1436,7 @@
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
       <packagereq type="optional">darkgarden-fonts</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- comps-f9.xml.in	21 Mar 2009 19:56:52 -0000	1.445
+++ comps-f9.xml.in	8 Apr 2009 07:31:05 -0000	1.446
@@ -1376,6 +1376,7 @@
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>



From pkgdb at fedoraproject.org  Wed Apr  8 07:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 07:46:04 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090408074513.114E510F870@bastion2.fedora.phx.redhat.com>

Package icon-slicer in Fedora devel is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Wed Apr  8 07:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 07:45:27 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090408074526.AEF8F10F881@bastion2.fedora.phx.redhat.com>

Package icon-slicer in Fedora 10 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From pkgdb at fedoraproject.org  Wed Apr  8 07:46:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 07:46:37 +0000
Subject: [pkgdb] icon-slicer ownership updated
Message-ID: <20090408074546.0401310F8AD@bastion2.fedora.phx.redhat.com>

Package icon-slicer in Fedora 9 is now owned by erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icon-slicer



From caolanm at fedoraproject.org  Wed Apr  8 07:57:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 07:57:57 +0000 (UTC)
Subject: rpms/hyphen-sa/devel hyph-sa.tex, NONE, 1.1 hyphen-sa-cleantex.patch,
	NONE, 1.1 hyphen-sa.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090408075757.7D0927011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-sa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18499/devel

Added Files:
	hyph-sa.tex hyphen-sa-cleantex.patch hyphen-sa.spec import.log 
Log Message:



--- NEW FILE hyph-sa.tex ---
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% File name: hyph-sa.tex
%
% Unicode hyphenation patterns for Sanskrit and Prakrit in Devanagari, 
% Bengali, Gujarati, Kannada, Malayalam and Telugu scripts.
%
% Created:        April 1st, 2005
% First release:  June 8th, 2006
% Revised:        October 3rd, 2008
% Version:        0.3
%
% Created by Yves Codet with Jonathan Kew's help.
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\patterns{
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
% (Maybe this should be implemented/supported in engines already.)
2???2
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% DEVANAGARI SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2????????????.
2????????????.
2????????????.
2????????????.
% Do not break before chandrabindu, anusvara, visarga, avagraha
% and accents; do not break after avagraha.
2???
2???
2???
2???2
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% BENGALI SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break after khanda ta.
1???2
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before chandrabindu, anusvara, visarga, avagraha,
% nukta and au length mark; do not break after avagraha.
2???
2???
2???
2???2
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% GUJARATI SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before chandrabindu, anusvara, visarga, avagraha;
% do not break after avagraha.
2???
2???
2???
2???2
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% KANNADA SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before anusvara, visarga, avagraha,
% length mark and ai length mark; do not break after avagraha.
2???
2???
2???2
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% MALAYALAM SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before anusvara, visarga and length mark.
2???
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TELUGU SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2????????????.
2????????????.
2????????????.
2????????????.
% Do not break before chandrabindu, anusvara, visarga,
% length mark and ai length mark.
2???
2???
2???
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
}


hyphen-sa-cleantex.patch:

--- NEW FILE hyphen-sa-cleantex.patch ---
--- hyph-sa.tex.clean	2009-03-16 16:47:30.000000000 +0000
+++ hyph-sa.tex	2009-03-16 17:04:03.000000000 +0000
@@ -13,7 +13,7 @@
 % Created by Yves Codet with Jonathan Kew's help.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\patterns{
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % GENERAL RULE
 % Do not break either side of ZERO-WIDTH JOINER
@@ -429,10 +429,10 @@
 1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
 1???1
@@ -466,7 +466,7 @@
 2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
 2??????.
@@ -547,10 +547,10 @@
 1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
 1???1
@@ -584,10 +584,10 @@
 2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
 2??????.
@@ -664,7 +664,7 @@
 1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
 1???1
@@ -700,7 +700,7 @@
 2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
 2??????.
@@ -721,5 +721,3 @@
 2???
 % Do not break either side of virama (may be within conjunct).
 2???2
-}
-


--- NEW FILE hyphen-sa.spec ---
Name: hyphen-sa
Summary: Sanskrit hyphenation rules
%define upstreamid 20081010
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/hyph-sa.tex
Group: Applications/Text
URL: http://tug.org/tex-hyphen
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LPPL
BuildArch: noarch
BuildRequires: hyphen-devel
Requires: hyphen
Provides: hyphen-bn = %{version}-%{release}
Patch0: hyphen-sa-cleantex.patch

%description
Sanskrit hyphenation rules (also suitable for Bengali).

%prep
%setup -T -q -c -n hyphen-sa
cp -p %{SOURCE0} .
%patch0 -p0 -b .clean

%build
substrings.pl hyph-sa.tex hyph_sa_IN.dic UTF-8
echo "Created with substring.pl by substrings.pl hyph-sa.tex hyph_sa_IN.dic UTF-8" > README
echo "Original in-line credits were:" >> README
echo "" >> README
head -n 15 hyph-sa.tex >> README

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p hyph_sa_IN.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
sa_IN_aliases="bn_IN bn_BD"
for lang in $sa_IN_aliases; do
        ln -s hyph_sa_IN.dic "hyph_"$lang".dic"
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_datadir}/hyphen/hyph_sa_IN.dic
%{_datadir}/hyphen/hyph_bn_*.dic

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081010-1
- initial version


--- NEW FILE import.log ---
hyphen-sa-0_20081010-1_fc10:HEAD:hyphen-sa-0.20081010-1.fc10.src.rpm:1239177448



From caolanm at fedoraproject.org  Wed Apr  8 08:01:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:01:53 +0000 (UTC)
Subject: rpms/hyphen-sa/F-11 hyph-sa.tex, NONE, 1.1 hyphen-sa-cleantex.patch,
	NONE, 1.1 hyphen-sa.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090408080153.986F47011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-sa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19859/F-11

Added Files:
	hyph-sa.tex hyphen-sa-cleantex.patch hyphen-sa.spec import.log 
Log Message:



--- NEW FILE hyph-sa.tex ---
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% File name: hyph-sa.tex
%
% Unicode hyphenation patterns for Sanskrit and Prakrit in Devanagari, 
% Bengali, Gujarati, Kannada, Malayalam and Telugu scripts.
%
% Created:        April 1st, 2005
% First release:  June 8th, 2006
% Revised:        October 3rd, 2008
% Version:        0.3
%
% Created by Yves Codet with Jonathan Kew's help.
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\patterns{
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
% (Maybe this should be implemented/supported in engines already.)
2???2
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% DEVANAGARI SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2????????????.
2????????????.
2????????????.
2????????????.
% Do not break before chandrabindu, anusvara, visarga, avagraha
% and accents; do not break after avagraha.
2???
2???
2???
2???2
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% BENGALI SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break after khanda ta.
1???2
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before chandrabindu, anusvara, visarga, avagraha,
% nukta and au length mark; do not break after avagraha.
2???
2???
2???
2???2
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% GUJARATI SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before chandrabindu, anusvara, visarga, avagraha;
% do not break after avagraha.
2???
2???
2???
2???2
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% KANNADA SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before anusvara, visarga, avagraha,
% length mark and ai length mark; do not break after avagraha.
2???
2???
2???2
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% MALAYALAM SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????.
2??????.
2??????.
2?????????.
2?????????.
2?????????.
2?????????.
% Do not break before anusvara, visarga and length mark.
2???
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TELUGU SCRIPT
% Break before or after any independent vowel.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Break after any dependent vowel, but not before.
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
2???1
% Break before or after any consonant.
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1
1???1 % can occur in Sanskrit?
1???1
1???1
1???1
1???1
1???1
1???1
1???1
% Do not break before a final consonant or conjunct.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????. % can occur in Sanskrit?
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2??????.
2????????????.
2????????????.
2????????????.
2????????????.
% Do not break before chandrabindu, anusvara, visarga,
% length mark and ai length mark.
2???
2???
2???
2???
2???
% Do not break either side of virama (may be within conjunct).
2???2
}


hyphen-sa-cleantex.patch:

--- NEW FILE hyphen-sa-cleantex.patch ---
--- hyph-sa.tex.clean	2009-03-16 16:47:30.000000000 +0000
+++ hyph-sa.tex	2009-03-16 17:04:03.000000000 +0000
@@ -13,7 +13,7 @@
 % Created by Yves Codet with Jonathan Kew's help.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\patterns{
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % GENERAL RULE
 % Do not break either side of ZERO-WIDTH JOINER
@@ -429,10 +429,10 @@
 1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
 1???1
@@ -466,7 +466,7 @@
 2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
 2??????.
@@ -547,10 +547,10 @@
 1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
 1???1
@@ -584,10 +584,10 @@
 2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
 2??????.
@@ -664,7 +664,7 @@
 1???1
 1???1
 1???1
-1???1 % can occur in Sanskrit?
+1???1
 1???1
 1???1
 1???1
@@ -700,7 +700,7 @@
 2??????.
 2??????.
 2??????.
-2??????. % can occur in Sanskrit?
+2??????.
 2??????.
 2??????.
 2??????.
@@ -721,5 +721,3 @@
 2???
 % Do not break either side of virama (may be within conjunct).
 2???2
-}
-


--- NEW FILE hyphen-sa.spec ---
Name: hyphen-sa
Summary: Sanskrit hyphenation rules
%define upstreamid 20081010
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/hyph-sa.tex
Group: Applications/Text
URL: http://tug.org/tex-hyphen
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LPPL
BuildArch: noarch
BuildRequires: hyphen-devel
Requires: hyphen
Provides: hyphen-bn = %{version}-%{release}
Patch0: hyphen-sa-cleantex.patch

%description
Sanskrit hyphenation rules (also suitable for Bengali).

%prep
%setup -T -q -c -n hyphen-sa
cp -p %{SOURCE0} .
%patch0 -p0 -b .clean

%build
substrings.pl hyph-sa.tex hyph_sa_IN.dic UTF-8
echo "Created with substring.pl by substrings.pl hyph-sa.tex hyph_sa_IN.dic UTF-8" > README
echo "Original in-line credits were:" >> README
echo "" >> README
head -n 15 hyph-sa.tex >> README

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p hyph_sa_IN.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
sa_IN_aliases="bn_IN bn_BD"
for lang in $sa_IN_aliases; do
        ln -s hyph_sa_IN.dic "hyph_"$lang".dic"
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_datadir}/hyphen/hyph_sa_IN.dic
%{_datadir}/hyphen/hyph_bn_*.dic

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081010-1
- initial version


--- NEW FILE import.log ---
hyphen-sa-0_20081010-1_fc10:F-11:hyphen-sa-0.20081010-1.fc10.src.rpm:1239177654



From caolanm at fedoraproject.org  Wed Apr  8 08:05:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:05:27 +0000 (UTC)
Subject: rpms/hyphen-te/F-11 hyph_te_IN.dic, NONE, 1.1 hyphen-te.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408080527.E6D857011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-te/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20752/F-11

Added Files:
	hyph_te_IN.dic hyphen-te.spec import.log 
Log Message:



--- NEW FILE hyph_te_IN.dic ---
UTF-8
%  Hyphenation for Telugu
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-te.spec ---
Name: hyphen-te
Summary: Telugu hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_te_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Telugu hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-te-0_20081213-1_fc10:F-11:hyphen-te-0.20081213-1.fc10.src.rpm:1239177887



From caolanm at fedoraproject.org  Wed Apr  8 08:06:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:06:43 +0000 (UTC)
Subject: rpms/hyphen-te/devel hyph_te_IN.dic, NONE, 1.1 hyphen-te.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408080643.87FC97011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-te/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21230/devel

Added Files:
	hyph_te_IN.dic hyphen-te.spec import.log 
Log Message:



--- NEW FILE hyph_te_IN.dic ---
UTF-8
%  Hyphenation for Telugu
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-te.spec ---
Name: hyphen-te
Summary: Telugu hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_te_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Telugu hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-te-0_20081213-1_fc10:HEAD:hyphen-te-0.20081213-1.fc10.src.rpm:1239177966



From pkgdb at fedoraproject.org  Wed Apr  8 08:11:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 08:11:47 +0000
Subject: [pkgdb] system-config-kdump ownership updated
Message-ID: <20090408081057.476AD10F871@bastion2.fedora.phx.redhat.com>

Package system-config-kdump in Fedora 9 is now owned by rrakus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-kdump



From pkgdb at fedoraproject.org  Wed Apr  8 08:11:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 08:11:02 +0000
Subject: [pkgdb] system-config-kdump ownership updated
Message-ID: <20090408081102.2762610F862@bastion2.fedora.phx.redhat.com>

Package system-config-kdump in Fedora 10 is now owned by rrakus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-kdump



From pkgdb at fedoraproject.org  Wed Apr  8 08:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 08:11:56 +0000
Subject: [pkgdb] system-config-kdump ownership updated
Message-ID: <20090408081104.9BBCD10F874@bastion2.fedora.phx.redhat.com>

Package system-config-kdump in Fedora devel is now owned by rrakus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-kdump



From caolanm at fedoraproject.org  Wed Apr  8 08:11:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:11:48 +0000 (UTC)
Subject: rpms/hyphen-ta/F-11 hyph_ta_IN.dic, NONE, 1.1 hyphen-ta.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408081148.A78A87011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-ta/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22040/F-11

Added Files:
	hyph_ta_IN.dic hyphen-ta.spec import.log 
Log Message:



--- NEW FILE hyph_ta_IN.dic ---
UTF-8
%  Hyphenation for Tamil
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-ta.spec ---
Name: hyphen-ta
Summary: Tamil hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ta_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Tamil hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-ta-0_20081213-1_fc10:F-11:hyphen-ta-0.20081213-1.fc10.src.rpm:1239178135



From caolanm at fedoraproject.org  Wed Apr  8 08:13:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:13:22 +0000 (UTC)
Subject: rpms/hyphen-ta/devel hyph_ta_IN.dic, NONE, 1.1 hyphen-ta.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408081322.3197A7011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-ta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23211/devel

Added Files:
	hyph_ta_IN.dic hyphen-ta.spec import.log 
Log Message:



--- NEW FILE hyph_ta_IN.dic ---
UTF-8
%  Hyphenation for Tamil
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-ta.spec ---
Name: hyphen-ta
Summary: Tamil hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ta_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Tamil hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-ta-0_20081213-1_fc10:HEAD:hyphen-ta-0.20081213-1.fc10.src.rpm:1239178346



From caolanm at fedoraproject.org  Wed Apr  8 08:15:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:15:20 +0000 (UTC)
Subject: rpms/hyphen-pa/F-11 hyph_pa_IN.dic, NONE, 1.1 hyphen-pa.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408081520.DA0427011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-pa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23898/F-11

Added Files:
	hyph_pa_IN.dic hyphen-pa.spec import.log 
Log Message:



--- NEW FILE hyph_pa_IN.dic ---
UTF-8
%  Hyphenation for Panjabi(Gurmughi)
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-pa.spec ---
Name: hyphen-pa
Summary: Punjabi hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_pa_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Punjabi hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
pa_IN_aliases="pa_PK"
for lang in $pa_IN_aliases; do
        ln -s hyph_pa_IN.dic hyph_$lang.dic
done
popd


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-pa-0_20081213-1_fc10:F-11:hyphen-pa-0.20081213-1.fc10.src.rpm:1239178485



From sharkcz at fedoraproject.org  Wed Apr  8 08:15:58 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  8 Apr 2009 08:15:58 +0000 (UTC)
Subject: rpms/atasm/devel atasm-1.06-defines.patch, NONE, 1.1 atasm.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408081558.91A917011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atasm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23979

Modified Files:
	.cvsignore sources 
Added Files:
	atasm-1.06-defines.patch atasm.spec 
Log Message:
initial import

atasm-1.06-defines.patch:

--- NEW FILE atasm-1.06-defines.patch ---
diff -Nrup atasm106.orig/src/asm.c atasm106/src/asm.c
--- atasm106.orig/src/asm.c	2009-03-17 21:39:26.000000000 +0100
+++ atasm106/src/asm.c	2009-03-22 15:14:31.000000000 +0100
@@ -2163,8 +2163,8 @@ int main(int argc, char *argv[]) {
       }
     else if (!strncasecmp(argv[i],"-d",2)) {
       str_list *str=(str_list *)malloc(sizeof(str_list));
-      str->str=(char *)malloc(strlen(argv[i]+1));
-      strcpy(str->str,argv[i]+1);
+      str->str=(char *)malloc(strlen(argv[i]+2));
+      strcpy(str->str,argv[i]+2);
       str->next=predefs;
       predefs=str;
     } else if (!strcasecmp(argv[i],"-s"))


--- NEW FILE atasm.spec ---
Name:           atasm
Version:        1.06
Release:        2%{?dist}
Summary:        6502 cross-assembler

Group:          Development/Tools
License:        GPLv2+
URL:            http://atari.miribilist.com/atasm/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}106.zip
Patch0:         %{name}-1.06-defines.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel


%description
ATasm is a 6502 command-line cross-assembler that is compatible with the
original Mac/65 macroassembler released by OSS software.  Code
development can now be performed using "modern" editors and compiles
with lightning speed.


%prep
%setup -q -n %{name}106
%patch0 -p1


%build
pushd src
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DZLIB_CAPABLE"
sed -e 's|%DOCDIR%|%{_docdir}/%{name}-%{version}|g' %{name}.1.in > %{name}.1
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

pushd src
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
popd


%clean
rm -rf $RPM_BUILD_ROOT


%check
pushd tests
make test


%files
%defattr(-,root,root,-)
%doc LICENSE VERSION.TXT docs/atasm.blurb docs/atasm.pdf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Tue Apr  7 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-2
- don't compress the man page

* Thu Mar 19 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-1
- update to 1.06

* Sun Oct  7 2007 Dan Hor??k <dan[at]danny.cz> - 1.05-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:41:54 -0000	1.1
+++ .cvsignore	8 Apr 2009 08:15:28 -0000	1.2
@@ -0,0 +1 @@
+atasm106.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:41:54 -0000	1.1
+++ sources	8 Apr 2009 08:15:28 -0000	1.2
@@ -0,0 +1 @@
+8019a72f5d27e4e563f433c9368a6c2c  atasm106.zip



From caolanm at fedoraproject.org  Wed Apr  8 08:16:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:16:51 +0000 (UTC)
Subject: rpms/hyphen-pa/devel hyph_pa_IN.dic, NONE, 1.1 hyphen-pa.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408081651.2D95B7011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-pa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24466/devel

Added Files:
	hyph_pa_IN.dic hyphen-pa.spec import.log 
Log Message:



--- NEW FILE hyph_pa_IN.dic ---
UTF-8
%  Hyphenation for Panjabi(Gurmughi)
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-pa.spec ---
Name: hyphen-pa
Summary: Punjabi hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_pa_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Punjabi hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
pa_IN_aliases="pa_PK"
for lang in $pa_IN_aliases; do
        ln -s hyph_pa_IN.dic hyph_$lang.dic
done
popd


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-pa-0_20081213-1_fc10:HEAD:hyphen-pa-0.20081213-1.fc10.src.rpm:1239178574



From erikos at fedoraproject.org  Wed Apr  8 08:17:19 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  8 Apr 2009 08:17:19 +0000 (UTC)
Subject: rpms/icon-slicer/devel icon-slicer-0.3-cursor.patch, NONE,
	1.1 icon-slicer.spec, 1.14, 1.15
Message-ID: <20090408081719.411797011A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/icon-slicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24512

Modified Files:
	icon-slicer.spec 
Added Files:
	icon-slicer-0.3-cursor.patch 
Log Message:
* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.3-12
- hotspot location ignores the y-coordinate (#494521)



icon-slicer-0.3-cursor.patch:

--- NEW FILE icon-slicer-0.3-cursor.patch ---
diff -ur icon-slicer-0.3/src/main.c-old icon-slicer-0.3/src/main.c
--- icon-slicer-0.3/src/main.c-old	2009-03-19 18:21:14.490676675 +0100
+++ icon-slicer-0.3/src/main.c	2009-03-19 18:21:32.753675714 +0100
@@ -89,7 +89,7 @@ theme_source_location_bounds (ThemeSourc
 {
   ThemeImage *image = theme_source_find_image (source, frame_index);
   int start_x, start_y;
-  int i, j;
+  int x, y;
   
   const guchar *pixels;
   int rowstride;
@@ -103,7 +103,7 @@ theme_source_location_bounds (ThemeSourc
   if (n_channels == 3)
     {
       out->x = start_x;
-      out->y = start_x;
+      out->y = start_y;
       out->width = source->gridsize;
       out->height = source->gridsize;
       
@@ -116,29 +116,29 @@ theme_source_location_bounds (ThemeSourc
       
       pixels = gdk_pixbuf_get_pixels (image->image) + start_y * rowstride + start_x * 4;
 
-      for (j = 0; j < source->gridsize; j++)
+      for (y = 0; y < source->gridsize; y++)
 	{
-	  for (i = 0; i < source->gridsize; i++)
+	  for (x = 0; x < source->gridsize; x++)
 	    {
-	      if (pixels[4*i + 3] > threshold)
+	      if (pixels[4*x + 3] > threshold)
 		{
 		  if (found)
 		    {
-		      if (start_x + i < min_x)
-			min_x = start_x + i;
-		      if (start_x + i >= max_x)
-			max_x = start_x + i + 1;
-		      if (start_y + j < min_y)
-			min_y = start_y + j;
-		      if (start_y + j >= max_y)
-			max_y = start_y + j + 1;
+		      if (start_x + x < min_x)
+			min_x = start_x + x;
+		      if (start_x + x >= max_x)
+			max_x = start_x + x + 1;
+		      if (start_y + y < min_y)
+			min_y = start_y + y;
+		      if (start_y + y >= max_y)
+			max_y = start_y + y + 1;
 		    }
 		  else
 		    {
-		      min_x = start_x + i;
-		      max_x = start_x + i + 1;
-		      min_y = start_y + i;
-		      max_y = start_y + i + 1;
+		      min_x = start_x + x;
+		      max_x = start_x + x + 1;
+		      min_y = start_y + y;
+		      max_y = start_y + y + 1;
 
 		      found = TRUE;
 		    }


Index: icon-slicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icon-slicer/devel/icon-slicer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- icon-slicer.spec	25 Feb 2009 06:43:41 -0000	1.14
+++ icon-slicer.spec	8 Apr 2009 08:16:48 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility for icon theme generation
 Name: icon-slicer
 Version: 0.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: Development/Tools
 Source: icon-slicer-%{version}.tar.gz
@@ -10,6 +10,7 @@
 BuildRequires: popt-devel
 
 Patch1: icon-slicer-0.3-attachpoints.patch
+Patch2: icon-slicer-0.3-cursor.patch
 
 %description
 icon-slicer is a utility for generating icon themes and libXcursor cursor 
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .attachpoints
+%patch2 -p1 -b .cursor
 
 %build
 %configure
@@ -37,6 +39,9 @@
 %{_bindir}/icon-slicer
 
 %changelog
+* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.3-12
+- hotspot location ignores the y-coordinate (#494521)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Wed Apr  8 08:19:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 08:19:02 +0000 (UTC)
Subject: rpms/comix/devel .cvsignore, 1.14, 1.15 comix.spec, 1.25,
	1.26 sources, 1.14, 1.15
Message-ID: <20090408081902.9D6C37011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25151

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.4-1
- 4.0.4, remove upsteamed patch
- Embed Fedora EVR to src/about.py



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Feb 2009 06:54:54 -0000	1.14
+++ .cvsignore	8 Apr 2009 08:18:31 -0000	1.15
@@ -1 +1 @@
-comix-4.0.3.tar.gz
+comix-4.0.4.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- comix.spec	28 Feb 2009 15:24:42 -0000	1.25
+++ comix.spec	8 Apr 2009 08:18:32 -0000	1.26
@@ -3,12 +3,12 @@
 # mv trunk comix-%%mainver
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
-%define		mainver		4.0.3
+%define		mainver		4.0.4
 %undefine		alphatag	
 %define		comix4		1
 
 %undefine		ifalpha		
-%define		fedorarel	3
+%define		fedorarel	1
 
 Name:		comix
 Version:	%{mainver}
@@ -23,8 +23,6 @@
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-# Use upstreamed patch
-Patch0:		comix-4.0.3-filechooser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -50,7 +48,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
-%patch0 -p0 -b .filechooser
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -65,6 +62,12 @@
 	( touch -r COPYING COPYING.tmp ; %{__mv} -f COPYING.tmp COPYING )
 %{__rm} -f COPYING.tmp
 
+# embed Fedora EVR
+%{__sed} -i -e "/^VERSION/s|^\(.*\)$|\1\nVERSION_fedora = '%{version}-%{release}'|" \
+	src/constants.py
+%{__sed} -i -e "s|constants\.VERSION|constants.VERSION_fedora|" \
+	src/about.py
+
 for dir in messages/*/LC*/
 do
 	msgfmt --statistics -o $dir/comix.mo $dir/comix.po
@@ -182,6 +185,10 @@
 
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.4-1
+- 4.0.4, remove upsteamed patch
+- Embed Fedora EVR to src/about.py
+
 * Sat Feb 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-3
 - Use upstreamed patch for filechooser issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Feb 2009 06:54:55 -0000	1.14
+++ sources	8 Apr 2009 08:18:32 -0000	1.15
@@ -1 +1 @@
-e5bd7acefe3950c2fdaf8785edd27b7e  comix-4.0.3.tar.gz
+029227a77b122f7080ee0280d41bee78  comix-4.0.4.tar.gz



From caolanm at fedoraproject.org  Wed Apr  8 08:22:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:22:07 +0000 (UTC)
Subject: rpms/hyphen-or/F-11 hyph_or_IN.dic, NONE, 1.1 hyphen-or.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408082207.B0AA47011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-or/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26150/F-11

Added Files:
	hyph_or_IN.dic hyphen-or.spec import.log 
Log Message:



--- NEW FILE hyph_or_IN.dic ---
UTF-8
%  Hyphenation for Oriya
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-or.spec ---
Name: hyphen-or
Summary: Oriya hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_or_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Oriya hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-or-0_20081213-1_fc10:F-11:hyphen-or-0.20081213-1.fc10.src.rpm:1239178863



From caolanm at fedoraproject.org  Wed Apr  8 08:23:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:23:52 +0000 (UTC)
Subject: rpms/hyphen-or/devel hyph_or_IN.dic, NONE, 1.1 hyphen-or.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408082352.0DF677011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-or/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26788/devel

Added Files:
	hyph_or_IN.dic hyphen-or.spec import.log 
Log Message:



--- NEW FILE hyph_or_IN.dic ---
UTF-8
%  Hyphenation for Oriya
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-or.spec ---
Name: hyphen-or
Summary: Oriya hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_or_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Oriya hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-or-0_20081213-1_fc10:HEAD:hyphen-or-0.20081213-1.fc10.src.rpm:1239178970



From caolanm at fedoraproject.org  Wed Apr  8 08:25:10 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:25:10 +0000 (UTC)
Subject: rpms/hyphen-ml/F-11 hyph_ml_IN.dic, NONE, 1.1 hyphen-ml.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408082510.6C99F70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-ml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27325/F-11

Added Files:
	hyph_ml_IN.dic hyphen-ml.spec import.log 
Log Message:



--- NEW FILE hyph_ml_IN.dic ---
UTF-8
%  Hyphenation for Malayalam
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
2???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-ml.spec ---
Name: hyphen-ml
Summary: Malayalam hyphenation rules
%define upstreamid 20090118
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ml_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Malayalam hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090118-1
- initial version


--- NEW FILE import.log ---
hyphen-ml-0_20090118-1_fc10:F-11:hyphen-ml-0.20090118-1.fc10.src.rpm:1239179055



From sharkcz at fedoraproject.org  Wed Apr  8 08:25:27 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  8 Apr 2009 08:25:27 +0000 (UTC)
Subject: rpms/atasm/F-10 atasm-1.06-defines.patch, NONE, 1.1 atasm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408082527.4F8AA70137@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atasm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27442

Modified Files:
	.cvsignore sources 
Added Files:
	atasm-1.06-defines.patch atasm.spec 
Log Message:
initial import

atasm-1.06-defines.patch:

--- NEW FILE atasm-1.06-defines.patch ---
diff -Nrup atasm106.orig/src/asm.c atasm106/src/asm.c
--- atasm106.orig/src/asm.c	2009-03-17 21:39:26.000000000 +0100
+++ atasm106/src/asm.c	2009-03-22 15:14:31.000000000 +0100
@@ -2163,8 +2163,8 @@ int main(int argc, char *argv[]) {
       }
     else if (!strncasecmp(argv[i],"-d",2)) {
       str_list *str=(str_list *)malloc(sizeof(str_list));
-      str->str=(char *)malloc(strlen(argv[i]+1));
-      strcpy(str->str,argv[i]+1);
+      str->str=(char *)malloc(strlen(argv[i]+2));
+      strcpy(str->str,argv[i]+2);
       str->next=predefs;
       predefs=str;
     } else if (!strcasecmp(argv[i],"-s"))


--- NEW FILE atasm.spec ---
Name:           atasm
Version:        1.06
Release:        2%{?dist}
Summary:        6502 cross-assembler

Group:          Development/Tools
License:        GPLv2+
URL:            http://atari.miribilist.com/atasm/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}106.zip
Patch0:         %{name}-1.06-defines.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel


%description
ATasm is a 6502 command-line cross-assembler that is compatible with the
original Mac/65 macroassembler released by OSS software.  Code
development can now be performed using "modern" editors and compiles
with lightning speed.


%prep
%setup -q -n %{name}106
%patch0 -p1


%build
pushd src
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DZLIB_CAPABLE"
sed -e 's|%DOCDIR%|%{_docdir}/%{name}-%{version}|g' %{name}.1.in > %{name}.1
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

pushd src
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
popd


%clean
rm -rf $RPM_BUILD_ROOT


%check
pushd tests
make test


%files
%defattr(-,root,root,-)
%doc LICENSE VERSION.TXT docs/atasm.blurb docs/atasm.pdf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Tue Apr  7 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-2
- don't compress the man page

* Thu Mar 19 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-1
- update to 1.06

* Sun Oct  7 2007 Dan Hor??k <dan[at]danny.cz> - 1.05-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:41:54 -0000	1.1
+++ .cvsignore	8 Apr 2009 08:24:56 -0000	1.2
@@ -0,0 +1 @@
+atasm106.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:41:54 -0000	1.1
+++ sources	8 Apr 2009 08:24:57 -0000	1.2
@@ -0,0 +1 @@
+8019a72f5d27e4e563f433c9368a6c2c  atasm106.zip



From caolanm at fedoraproject.org  Wed Apr  8 08:26:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:26:53 +0000 (UTC)
Subject: rpms/hyphen-ml/devel hyph_ml_IN.dic, NONE, 1.1 hyphen-ml.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408082653.DE8FA7011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-ml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28703/devel

Added Files:
	hyph_ml_IN.dic hyphen-ml.spec import.log 
Log Message:



--- NEW FILE hyph_ml_IN.dic ---
UTF-8
%  Hyphenation for Malayalam
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
2???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-ml.spec ---
Name: hyphen-ml
Summary: Malayalam hyphenation rules
%define upstreamid 20090118
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ml_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Malayalam hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090118-1
- initial version


--- NEW FILE import.log ---
hyphen-ml-0_20090118-1_fc10:HEAD:hyphen-ml-0.20090118-1.fc10.src.rpm:1239179162



From sharkcz at fedoraproject.org  Wed Apr  8 08:27:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  8 Apr 2009 08:27:38 +0000 (UTC)
Subject: rpms/atasm/F-9 atasm-1.06-defines.patch, NONE, 1.1 atasm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408082738.B862A7011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atasm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28893

Modified Files:
	.cvsignore sources 
Added Files:
	atasm-1.06-defines.patch atasm.spec 
Log Message:
initial import

atasm-1.06-defines.patch:

--- NEW FILE atasm-1.06-defines.patch ---
diff -Nrup atasm106.orig/src/asm.c atasm106/src/asm.c
--- atasm106.orig/src/asm.c	2009-03-17 21:39:26.000000000 +0100
+++ atasm106/src/asm.c	2009-03-22 15:14:31.000000000 +0100
@@ -2163,8 +2163,8 @@ int main(int argc, char *argv[]) {
       }
     else if (!strncasecmp(argv[i],"-d",2)) {
       str_list *str=(str_list *)malloc(sizeof(str_list));
-      str->str=(char *)malloc(strlen(argv[i]+1));
-      strcpy(str->str,argv[i]+1);
+      str->str=(char *)malloc(strlen(argv[i]+2));
+      strcpy(str->str,argv[i]+2);
       str->next=predefs;
       predefs=str;
     } else if (!strcasecmp(argv[i],"-s"))


--- NEW FILE atasm.spec ---
Name:           atasm
Version:        1.06
Release:        2%{?dist}
Summary:        6502 cross-assembler

Group:          Development/Tools
License:        GPLv2+
URL:            http://atari.miribilist.com/atasm/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}106.zip
Patch0:         %{name}-1.06-defines.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel


%description
ATasm is a 6502 command-line cross-assembler that is compatible with the
original Mac/65 macroassembler released by OSS software.  Code
development can now be performed using "modern" editors and compiles
with lightning speed.


%prep
%setup -q -n %{name}106
%patch0 -p1


%build
pushd src
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DZLIB_CAPABLE"
sed -e 's|%DOCDIR%|%{_docdir}/%{name}-%{version}|g' %{name}.1.in > %{name}.1
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

pushd src
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
popd


%clean
rm -rf $RPM_BUILD_ROOT


%check
pushd tests
make test


%files
%defattr(-,root,root,-)
%doc LICENSE VERSION.TXT docs/atasm.blurb docs/atasm.pdf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Tue Apr  7 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-2
- don't compress the man page

* Thu Mar 19 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-1
- update to 1.06

* Sun Oct  7 2007 Dan Hor??k <dan[at]danny.cz> - 1.05-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:41:54 -0000	1.1
+++ .cvsignore	8 Apr 2009 08:27:08 -0000	1.2
@@ -0,0 +1 @@
+atasm106.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:41:54 -0000	1.1
+++ sources	8 Apr 2009 08:27:08 -0000	1.2
@@ -0,0 +1 @@
+8019a72f5d27e4e563f433c9368a6c2c  atasm106.zip



From sharkcz at fedoraproject.org  Wed Apr  8 08:29:26 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  8 Apr 2009 08:29:26 +0000 (UTC)
Subject: rpms/atasm/EL-5 atasm-1.06-defines.patch, NONE, 1.1 atasm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408082926.AE8DA7011A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atasm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29552

Modified Files:
	.cvsignore sources 
Added Files:
	atasm-1.06-defines.patch atasm.spec 
Log Message:
initial import

atasm-1.06-defines.patch:

--- NEW FILE atasm-1.06-defines.patch ---
diff -Nrup atasm106.orig/src/asm.c atasm106/src/asm.c
--- atasm106.orig/src/asm.c	2009-03-17 21:39:26.000000000 +0100
+++ atasm106/src/asm.c	2009-03-22 15:14:31.000000000 +0100
@@ -2163,8 +2163,8 @@ int main(int argc, char *argv[]) {
       }
     else if (!strncasecmp(argv[i],"-d",2)) {
       str_list *str=(str_list *)malloc(sizeof(str_list));
-      str->str=(char *)malloc(strlen(argv[i]+1));
-      strcpy(str->str,argv[i]+1);
+      str->str=(char *)malloc(strlen(argv[i]+2));
+      strcpy(str->str,argv[i]+2);
       str->next=predefs;
       predefs=str;
     } else if (!strcasecmp(argv[i],"-s"))


--- NEW FILE atasm.spec ---
Name:           atasm
Version:        1.06
Release:        2%{?dist}
Summary:        6502 cross-assembler

Group:          Development/Tools
License:        GPLv2+
URL:            http://atari.miribilist.com/atasm/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}106.zip
Patch0:         %{name}-1.06-defines.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel


%description
ATasm is a 6502 command-line cross-assembler that is compatible with the
original Mac/65 macroassembler released by OSS software.  Code
development can now be performed using "modern" editors and compiles
with lightning speed.


%prep
%setup -q -n %{name}106
%patch0 -p1


%build
pushd src
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DZLIB_CAPABLE"
sed -e 's|%DOCDIR%|%{_docdir}/%{name}-%{version}|g' %{name}.1.in > %{name}.1
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

pushd src
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
popd


%clean
rm -rf $RPM_BUILD_ROOT


%check
pushd tests
make test


%files
%defattr(-,root,root,-)
%doc LICENSE VERSION.TXT docs/atasm.blurb docs/atasm.pdf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog
* Tue Apr  7 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-2
- don't compress the man page

* Thu Mar 19 2009 Dan Hor??k <dan[at]danny.cz> - 1.06-1
- update to 1.06

* Sun Oct  7 2007 Dan Hor??k <dan[at]danny.cz> - 1.05-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:41:54 -0000	1.1
+++ .cvsignore	8 Apr 2009 08:28:56 -0000	1.2
@@ -0,0 +1 @@
+atasm106.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atasm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:41:54 -0000	1.1
+++ sources	8 Apr 2009 08:28:56 -0000	1.2
@@ -0,0 +1 @@
+8019a72f5d27e4e563f433c9368a6c2c  atasm106.zip



From caolanm at fedoraproject.org  Wed Apr  8 08:31:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:31:43 +0000 (UTC)
Subject: rpms/hyphen-kn/F-11 hyph_kn_IN.dic, NONE, 1.1 hyphen-kn.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408083143.1F7857011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-kn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30372/F-11

Added Files:
	hyph_kn_IN.dic hyphen-kn.spec import.log 
Log Message:



--- NEW FILE hyph_kn_IN.dic ---
UTF-8
%  Hyphenation for Kannada
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-kn.spec ---
Name: hyphen-kn
Summary: Kannada hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_kn_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Kannada hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-kn-0_20081213-1_fc10:F-11:hyphen-kn-0.20081213-1.fc10.src.rpm:1239179448



From caolanm at fedoraproject.org  Wed Apr  8 08:33:16 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:33:16 +0000 (UTC)
Subject: rpms/hyphen-kn/devel hyph_kn_IN.dic, NONE, 1.1 hyphen-kn.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408083316.D76A67011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-kn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30958/devel

Added Files:
	hyph_kn_IN.dic hyphen-kn.spec import.log 
Log Message:



--- NEW FILE hyph_kn_IN.dic ---
UTF-8
%  Hyphenation for Kannada
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-kn.spec ---
Name: hyphen-kn
Summary: Kannada hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_kn_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Kannada hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-kn-0_20081213-1_fc10:HEAD:hyphen-kn-0.20081213-1.fc10.src.rpm:1239179542



From caolanm at fedoraproject.org  Wed Apr  8 08:36:11 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:36:11 +0000 (UTC)
Subject: rpms/hyphen-gu/F-11 hyph_gu_IN.dic, NONE, 1.1 hyphen-gu.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408083612.04EA57011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-gu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31803/F-11

Added Files:
	hyph_gu_IN.dic hyphen-gu.spec import.log 
Log Message:



--- NEW FILE hyph_gu_IN.dic ---
UTF-8
%  Hyphenation for Gujarati
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-gu.spec ---
Name: hyphen-gu
Summary: Gujarati hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_gu_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Gujarati hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-gu-0_20081213-1_fc10:F-11:hyphen-gu-0.20081213-1.fc10.src.rpm:1239179746



From caolanm at fedoraproject.org  Wed Apr  8 08:37:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:37:07 +0000 (UTC)
Subject: rpms/hyphen-gu/devel hyph_gu_IN.dic, NONE, 1.1 hyphen-gu.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408083707.EC2B07011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-gu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32194/devel

Added Files:
	hyph_gu_IN.dic hyphen-gu.spec import.log 
Log Message:



--- NEW FILE hyph_gu_IN.dic ---
UTF-8
%  Hyphenation for Gujarati
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-gu.spec ---
Name: hyphen-gu
Summary: Gujarati hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_gu_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Gujarati hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-gu-0_20081213-1_fc10:HEAD:hyphen-gu-0.20081213-1.fc10.src.rpm:1239179804



From caolanm at fedoraproject.org  Wed Apr  8 08:42:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:42:06 +0000 (UTC)
Subject: rpms/hyphen-hi/F-11 hyph_hi_IN.dic, NONE, 1.1 hyphen-hi.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090408084206.506D27011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-hi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv804/F-11

Added Files:
	hyph_hi_IN.dic hyphen-hi.spec import.log 
Log Message:



--- NEW FILE hyph_hi_IN.dic ---
UTF-8
%  Hyphenation for Hindi
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-hi.spec ---
Name: hyphen-hi
Summary: Hindi hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_hi_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Hindi hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-hi-0_20081213-1_fc10:F-11:hyphen-hi-0.20081213-1.fc10.src.rpm:1239180041



From caolanm at fedoraproject.org  Wed Apr  8 08:47:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:47:07 +0000 (UTC)
Subject: rpms/hyphen-hi/devel hyph_hi_IN.dic, NONE, 1.1 hyphen-hi.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090408084707.134317011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-hi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2151/devel

Added Files:
	hyph_hi_IN.dic hyphen-hi.spec import.log 
Log Message:



--- NEW FILE hyph_hi_IN.dic ---
UTF-8
%  Hyphenation for Hindi
%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%

???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???1
???2
???1
???1
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
??????2
2?????????
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???
1???


--- NEW FILE hyphen-hi.spec ---
Name: hyphen-hi
Summary: Hindi hyphenation rules
%define upstreamid 20081213
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_hi_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Hindi hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Apr 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081213-1
- initial version


--- NEW FILE import.log ---
hyphen-hi-0_20081213-1_fc10:HEAD:hyphen-hi-0.20081213-1.fc10.src.rpm:1239180223



From caolanm at fedoraproject.org  Wed Apr  8 08:50:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 08:50:27 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1870,1.1871
Message-ID: <20090408085027.BB5EA7011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3197

Modified Files:
	openoffice.org.spec 
Log Message:
require new Indic hyphenators


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1870
retrieving revision 1.1871
diff -u -r1.1870 -r1.1871
--- openoffice.org.spec	2 Apr 2009 11:02:07 -0000	1.1870
+++ openoffice.org.spec	8 Apr 2009 08:49:57 -0000	1.1871
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 9
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -661,7 +661,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: lohit-fonts-bengali
-Requires: hunspell-bn
+Requires: hunspell-bn, hyphen-bn
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-bn_IN < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-bn < 1:3.0.0
@@ -837,7 +837,7 @@
 Summary: Gujarati language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-gu
+Requires: hunspell-gu, hyphen-gu
 Requires: lohit-fonts-gujarati
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-gu_IN < 1:3.0.0
@@ -849,7 +849,7 @@
 Summary: Punjabi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pa
+Requires: hunspell-pa, hyphen-pa
 Requires: lohit-fonts-punjabi
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-pa_IN < 1:3.0.0
@@ -874,7 +874,7 @@
 Summary: Hindi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-hi
+Requires: hunspell-hi, hyphen-hi
 Requires: lohit-fonts-hindi
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-hi-IN < 1:2.0.3
@@ -1130,7 +1130,7 @@
 Summary: Tamil language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires:  hunspell-ta
+Requires:  hunspell-ta, hyphen-ta
 Requires:  lohit-fonts-tamil
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-ta_IN < 1:3.0.0
@@ -1279,7 +1279,7 @@
 Summary: Malayalam language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ml
+Requires: hunspell-ml, hyphen-ml
 Requires: smc-meera-fonts
 Obsoletes: openoffice.org2-langpack-ml_IN < 1:3.0.0
 
@@ -1290,7 +1290,7 @@
 Summary: Oriya language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-or
+Requires: hunspell-or, hyphen-or
 Requires: lohit-fonts-oriya
 Obsoletes: openoffice.org2-langpack-or_IN < 1:3.0.0
 
@@ -1301,7 +1301,7 @@
 Summary: Telugu language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-te
+Requires: hunspell-te, hyphen-te
 Requires: lohit-fonts-telugu
 Obsoletes: openoffice.org2-langpack-te_IN < 1:3.0.0
 
@@ -1323,6 +1323,7 @@
 Summary: Kannada language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hyphen-kn
 Requires: lohit-fonts-kannada
 Obsoletes: openoffice.org2-langpack-kn_IN < 1:3.0.0
 
@@ -4107,6 +4108,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Apr 08 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
+- Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
+  hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi
+
 * Thu Apr 02 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.1
 - latest milestone
 



From erikos at fedoraproject.org  Wed Apr  8 09:15:57 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  8 Apr 2009 09:15:57 +0000 (UTC)
Subject: rpms/sugar-artwork/devel sugar-artwork.spec,1.21,1.22
Message-ID: <20090408091557.3496D7011A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9604

Modified Files:
	sugar-artwork.spec 
Log Message:
* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-2
- Rebuild for icon-slicer-0.3-12




Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar-artwork.spec	11 Mar 2009 16:50:39 -0000	1.21
+++ sugar-artwork.spec	8 Apr 2009 09:15:26 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.84.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
 # git clone git://dev.laptop.org/artwork
@@ -64,6 +64,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-2
+- Rebuild for icon-slicer-0.3-12
+
 * Wed Mar 11 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.84.1-1
 - Add back some icons to the Makefile (Simon)
 



From pnemade at fedoraproject.org  Wed Apr  8 09:20:30 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed,  8 Apr 2009 09:20:30 +0000 (UTC)
Subject: rpms/m17n-db/devel m17n-db.spec,1.98,1.99
Message-ID: <20090408092030.5C8477011A@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10567

Modified Files:
	m17n-db.spec 
Log Message:

* Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-2
- Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus




Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- m17n-db.spec	3 Mar 2009 05:49:50 -0000	1.98
+++ m17n-db.spec	8 Apr 2009 09:19:59 -0000	1.99
@@ -1,12 +1,11 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.5.4
-Release:    1%{?dist}
+Release:    2%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
 Source0:    http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
-Source1:    m17n-gen-ibus-engine
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
@@ -119,7 +118,6 @@
 %else\
 %{nil}\
 %endif\
-%{_datadir}/ibus/engine/m17n-%2-*.engine
 
 %define mk_pkg_uses_contrib() \
 %package %1\
@@ -140,7 +138,6 @@
 %else\
 %{nil}\
 %endif\
-%{_datadir}/ibus/engine/m17n-%2-*.engine
 
 %mk_pkg amharic am 1
 %mk_pkg arabic ar 1
@@ -201,7 +198,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p %SOURCE1 .
 # don't need ispell or anthy
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png}
@@ -211,16 +207,6 @@
 # dont install si-wijesekera.mim as si-wijesekera-predit.mim works for us, see RH bug 208104
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wijesekera.mim
 
-
-# generate .engine files for ibus-m17n for now
-install -p --mode=0755 %SOURCE1 $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ibus/engine
-for i in $RPM_BUILD_ROOT%{_datadir}/m17n/*.mim; do
-  $RPM_BUILD_ROOT%{_bindir}/m17n-gen-ibus-engine $i $RPM_BUILD_ROOT%{_datadir}/ibus/engine
-done
-# these are not real engines
-rm -f $RPM_BUILD_ROOT%{_datadir}/ibus/engine/m17n-{cjk-util,global}.engine
-
 # For installing the translation files
 %find_lang %name
 
@@ -237,8 +223,6 @@
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
 %{_datadir}/m17n/global.mim
-%dir %{_datadir}/ibus
-%dir %{_datadir}/ibus/engine
 
 
 # include translations
@@ -254,7 +238,6 @@
 %files devel
 %defattr(-,root,root)
 %{_bindir}/m17n-db
-%{_bindir}/m17n-gen-ibus-engine
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %files common-cjk
@@ -266,38 +249,34 @@
 %{_datadir}/m17n/zh-*.mim
 %{_datadir}/m17n/icons/zh-*.png
 %{_datadir}/m17n/icons/bopo-*.png
-%{_datadir}/ibus/engine/m17n-zh-*.engine
 
 %files generic
 %defattr(-,root,root)
 %{_datadir}/m17n/rfc1345.mim
 %{_datadir}/m17n/icons/rfc1345.png
-%{_datadir}/ibus/engine/m17n-rfc1345.engine
 %{_datadir}/m17n/unicode.mim
 %{_datadir}/m17n/icons/unicode.png
-%{_datadir}/ibus/engine/m17n-unicode.engine
 
 %files greek
 %defattr(-,root,root)
 %{_datadir}/m17n/el-*.mim
 %{_datadir}/m17n/grc-*.mim
 %{_datadir}/m17n/icons/el-*.png
-%{_datadir}/ibus/engine/m17n-el-*.engine
-%{_datadir}/ibus/engine/m17n-grc-*.engine
 
 %files gregorian
 %defattr(-,root,root)
 %{_datadir}/m17n/ka*.mim
 %{_datadir}/m17n/icons/ka*.png
-%{_datadir}/ibus/engine/m17n-ka*.engine
 
 %files uyghur
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ug-*.mim
-%{_datadir}/ibus/engine/m17n-ug-*.engine
 
 %changelog
+* Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-2
+- Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus
+
 * Tue Mar 03 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-1
 - Update to new upstream release 1.5.4
 



From mtasaka at fedoraproject.org  Wed Apr  8 09:24:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 09:24:03 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria.spec,1.24,1.25
Message-ID: <20090408092403.877D07011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11603/F-10

Modified Files:
	alexandria.spec 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
- Embed Fedora EVR



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- alexandria.spec	6 Apr 2009 20:50:02 -0000	1.24
+++ alexandria.spec	8 Apr 2009 09:23:33 -0000	1.25
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -78,6 +78,11 @@
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
 
+# Embed Fedora EVR
+%{__sed} -i.evr \
+	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	Rakefile
+
 %build
 rake build
 
@@ -198,6 +203,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
+- Embed Fedora EVR
+
 * Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-4
 - Fix for strange behavior with right click on left pane
   (alexandria-Bugs-25021)



From mtasaka at fedoraproject.org  Wed Apr  8 09:24:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 09:24:03 +0000 (UTC)
Subject: rpms/alexandria/F-9 alexandria.spec,1.24,1.25
Message-ID: <20090408092403.D4F5F7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11603/F-9

Modified Files:
	alexandria.spec 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
- Embed Fedora EVR



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- alexandria.spec	6 Apr 2009 20:50:02 -0000	1.24
+++ alexandria.spec	8 Apr 2009 09:23:33 -0000	1.25
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -78,6 +78,11 @@
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
 
+# Embed Fedora EVR
+%{__sed} -i.evr \
+	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	Rakefile
+
 %build
 rake build
 
@@ -198,6 +203,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
+- Embed Fedora EVR
+
 * Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-4
 - Fix for strange behavior with right click on left pane
   (alexandria-Bugs-25021)



From mtasaka at fedoraproject.org  Wed Apr  8 09:24:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 09:24:04 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria.spec,1.31,1.32
Message-ID: <20090408092404.41E7C7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11603/devel

Modified Files:
	alexandria.spec 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
- Embed Fedora EVR



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- alexandria.spec	6 Apr 2009 20:50:02 -0000	1.31
+++ alexandria.spec	8 Apr 2009 09:23:33 -0000	1.32
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -78,6 +78,11 @@
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
 
+# Embed Fedora EVR
+%{__sed} -i.evr \
+	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	Rakefile
+
 %build
 rake build
 
@@ -198,6 +203,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
+- Embed Fedora EVR
+
 * Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-4
 - Fix for strange behavior with right click on left pane
   (alexandria-Bugs-25021)



From pnemade at fedoraproject.org  Wed Apr  8 09:24:00 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed,  8 Apr 2009 09:24:00 +0000 (UTC)
Subject: rpms/m17n-contrib/devel m17n-contrib.spec,1.27,1.28
Message-ID: <20090408092400.7C60A7011A@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11576

Modified Files:
	m17n-contrib.spec 
Log Message:

* Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-4
- Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus




Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- m17n-contrib.spec	6 Apr 2009 03:52:28 -0000	1.27
+++ m17n-contrib.spec	8 Apr 2009 09:23:29 -0000	1.28
@@ -1,7 +1,7 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
 Version:  1.1.9
-Release:  3%{?dist}
+Release:  4%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html
@@ -38,7 +38,6 @@
 %files %1\
 %defattr(-,root,root,-)\
 %{_datadir}/m17n/%2-*.mim\
-%{_datadir}/ibus/engine/m17n-%2-*.engine\
 %if %3\
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
@@ -61,7 +60,6 @@
 %files %1\
 %defattr(-,root,root,-)\
 %{_datadir}/m17n/%2-*.mim\
-%{_datadir}/ibus/engine/m17n-%2-*.engine\
 %if %3\
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
@@ -108,11 +106,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
-# generate .engine files for ibus-m17n for now
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ibus/engine
-for i in $RPM_BUILD_ROOT%{_datadir}/m17n/*.mim; do
-  m17n-gen-ibus-engine $i $RPM_BUILD_ROOT%{_datadir}/ibus/engine
-done
 rm -rf $RPM_BUILD_ROOT/%{_bindir}
 
 %find_lang %name
@@ -126,6 +119,9 @@
 %{_datadir}/m17n/scripts
 
 %changelog
+* Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-4
+- Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus
+
 * Mon Apr 06 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-3
 - Fix broken deps for maithili subpackage.
 



From mtasaka at fedoraproject.org  Wed Apr  8 09:30:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 09:30:54 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.359, 1.360 jd.spec, 1.417, 1.418 sources,
	1.360, 1.361
Message-ID: <20090408093054.A766B7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14287/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- .cvsignore	5 Apr 2009 08:52:17 -0000	1.359
+++ .cvsignore	8 Apr 2009 09:30:23 -0000	1.360
@@ -1 +1 @@
-jd-2.4.0-svn2765_trunk.tgz
+jd-2.4.0-svn2768_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- jd.spec	5 Apr 2009 08:52:17 -0000	1.417
+++ jd.spec	8 Apr 2009 09:30:23 -0000	1.418
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2765_trunk
+%define         strtag        svn2768_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Apr  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- sources	5 Apr 2009 08:52:17 -0000	1.360
+++ sources	8 Apr 2009 09:30:24 -0000	1.361
@@ -1 +1 @@
-2d9a5fca4bf54a9545b32668345c5a77  jd-2.4.0-svn2765_trunk.tgz
+e4851dc06a5dbdec05794abd7c1d6321  jd-2.4.0-svn2768_trunk.tgz



From mtasaka at fedoraproject.org  Wed Apr  8 09:30:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 09:30:54 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.359, 1.360 jd.spec, 1.408, 1.409 sources, 
	1.360, 1.361
Message-ID: <20090408093054.EAAC87011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14287/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- .cvsignore	5 Apr 2009 08:55:13 -0000	1.359
+++ .cvsignore	8 Apr 2009 09:30:24 -0000	1.360
@@ -1 +1 @@
-jd-2.4.0-svn2765_trunk.tgz
+jd-2.4.0-svn2768_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- jd.spec	5 Apr 2009 08:55:13 -0000	1.408
+++ jd.spec	8 Apr 2009 09:30:24 -0000	1.409
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2765_trunk
+%define         strtag        svn2768_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Apr  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- sources	5 Apr 2009 08:55:13 -0000	1.360
+++ sources	8 Apr 2009 09:30:24 -0000	1.361
@@ -1 +1 @@
-2d9a5fca4bf54a9545b32668345c5a77  jd-2.4.0-svn2765_trunk.tgz
+e4851dc06a5dbdec05794abd7c1d6321  jd-2.4.0-svn2768_trunk.tgz



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:42 +0000
Subject: [pkgdb] kdetoys: than has requested watchbugzilla
Message-ID: <20090408093152.0247410F875@bastion2.fedora.phx.redhat.com>

than has requested the watchbugzilla acl on kdetoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:42 +0000
Subject: [pkgdb] kdetoys: than has requested watchcommits
Message-ID: <20090408093152.A77AA10F87B@bastion2.fedora.phx.redhat.com>

than has requested the watchcommits acl on kdetoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:45 +0000
Subject: [pkgdb] kdetoys: than has requested approveacls
Message-ID: <20090408093154.A963410F883@bastion2.fedora.phx.redhat.com>

than has requested the approveacls acl on kdetoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:31:53 +0000
Subject: [pkgdb] kdetoys: than has requested commit
Message-ID: <20090408093154.67C0310F879@bastion2.fedora.phx.redhat.com>

than has requested the commit acl on kdetoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:53 +0000
Subject: [pkgdb] kdetoys: than has requested watchbugzilla
Message-ID: <20090408093202.AA82D10F881@bastion2.fedora.phx.redhat.com>

than has requested the watchbugzilla acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:52 +0000
Subject: [pkgdb] kdetoys: than has requested watchcommits
Message-ID: <20090408093203.5EF3010F885@bastion2.fedora.phx.redhat.com>

than has requested the watchcommits acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:05 +0000
Subject: [pkgdb] kdetoys: than has requested commit
Message-ID: <20090408093205.D3E6710F88B@bastion2.fedora.phx.redhat.com>

than has requested the commit acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:57 +0000
Subject: [pkgdb] kdetoys: than has requested approveacls
Message-ID: <20090408093206.ED7F410F874@bastion2.fedora.phx.redhat.com>

than has requested the approveacls acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:33:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:33:13 +0000
Subject: [pkgdb] kdetoys: than has requested watchcommits
Message-ID: <20090408093222.6F7B410F87C@bastion2.fedora.phx.redhat.com>

than has requested the watchcommits acl on kdetoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:23 +0000
Subject: [pkgdb] kdetoys: than has requested watchbugzilla
Message-ID: <20090408093222.A269110F887@bastion2.fedora.phx.redhat.com>

than has requested the watchbugzilla acl on kdetoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:33:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:33:14 +0000
Subject: [pkgdb] kdetoys: than has requested commit
Message-ID: <20090408093224.86F6E10F890@bastion2.fedora.phx.redhat.com>

than has requested the commit acl on kdetoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:32:25 +0000
Subject: [pkgdb] kdetoys: than has requested approveacls
Message-ID: <20090408093225.627C110F894@bastion2.fedora.phx.redhat.com>

than has requested the approveacls acl on kdetoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From kasal at fedoraproject.org  Wed Apr  8 09:36:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  8 Apr 2009 09:36:01 +0000 (UTC)
Subject: rpms/perl/F-10 perl-update-CGI.patch, 1.1, 1.2 perl.spec, 1.210,
	1.211 perl-CGI-escape.patch, 1.1, NONE
Message-ID: <20090408093601.8B5337011A@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15828

Modified Files:
	perl-update-CGI.patch perl.spec 
Removed Files:
	perl-CGI-escape.patch 
Log Message:
update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch

perl-update-CGI.patch:

Index: perl-update-CGI.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/F-10/perl-update-CGI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-update-CGI.patch	23 Mar 2009 10:31:06 -0000	1.1
+++ perl-update-CGI.patch	8 Apr 2009 09:36:00 -0000	1.2
@@ -1,8 +1,8 @@
-CGI.pm-3.42
+CGI.pm-3.43
 
 diff -urN perl-5.10.0.orig/lib/CGI/Carp.pm perl-5.10.0/lib/CGI/Carp.pm
---- perl-5.10.0.orig/lib/CGI/Carp.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Carp.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Carp.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Carp.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -323,7 +323,7 @@
  
  $main::SIG{__WARN__}=\&CGI::Carp::warn;
@@ -21,9 +21,13 @@
          print STDOUT $mess;
      }
 diff -urN perl-5.10.0.orig/lib/CGI/Changes perl-5.10.0/lib/CGI/Changes
---- perl-5.10.0.orig/lib/CGI/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Changes	2009-02-13 18:09:15.000000000 +0100
-@@ -1,3 +1,70 @@
+--- perl-5.10.0.orig/lib/CGI/Changes	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Changes	2009-04-07 14:36:12.000000000 +0200
+@@ -1,3 +1,74 @@
++  Version 3.43
++  1. Documentation patch from MARKSTOS at cpan.org to replace all occurrences of
++  "new CGI" with CGI->new()" to reflect best perl practices.
++  2. Patch from Stepan Kasal to fix utf-8 related problems in perl 5.10
 +
 +  Version 3.42
 +  1. Added patch from Renee Baecker that makes it possible to subclass
@@ -95,8 +99,8 @@
    1. The position of file handles is now reset to zero when CGI->new is called.
      (Mark Stosberg)
 diff -urN perl-5.10.0.orig/lib/CGI/Cookie.pm perl-5.10.0/lib/CGI/Cookie.pm
---- perl-5.10.0.orig/lib/CGI/Cookie.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Cookie.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Cookie.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Cookie.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -13,7 +13,7 @@
  # wish, but if you redistribute a modified version, please attach a note
  # listing the modifications you have made.
@@ -125,8 +129,8 @@
      s/\s*(.*?)\s*/$1/;
      my($key,$value) = split("=",$_,2);
 diff -urN perl-5.10.0.orig/lib/CGI/Fast.pm perl-5.10.0/lib/CGI/Fast.pm
---- perl-5.10.0.orig/lib/CGI/Fast.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Fast.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Fast.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Fast.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -55,6 +55,7 @@
       }
       }
@@ -172,8 +176,8 @@
      &do_some_initialization();
      while ($q = new CGI::Fast) {
 diff -urN perl-5.10.0.orig/lib/CGI/Pretty.pm perl-5.10.0/lib/CGI/Pretty.pm
---- perl-5.10.0.orig/lib/CGI/Pretty.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Pretty.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Pretty.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Pretty.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -176,6 +176,35 @@
  }
  sub _reset_globals { initialize_globals(); }
@@ -210,45 +214,9 @@
  1;
  
  =head1 NAME
-diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
---- perl-5.10.0.orig/lib/CGI/t/request.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/t/request.t	2009-02-13 18:09:57.000000000 +0100
-@@ -4,7 +4,7 @@
- ######################### We start with some black magic to print on failure.
- use lib '.','../blib/lib','../blib/arch';
- 
--BEGIN {$| = 1; print "1..33\n"; }
-+BEGIN {$| = 1; print "1..34\n"; }
- END {print "not ok 1\n" unless $loaded;}
- use CGI ();
- use Config;
-@@ -74,6 +74,7 @@
- test(29,$p->{bar} eq 'froz',"tied interface fetch");
- $p->{bar} = join("\0",qw(foo bar baz));
- test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
-+test(31,exists $p->{bar});
- 
- # test posting
- $q->_reset_globals;
-@@ -88,11 +89,11 @@
-     exit 0;
-   }
-   # at this point, we're in a new (child) process
--  test(31,$q=new CGI,"CGI::new() from POST");
--  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
--  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
-+  test(32,$q=new CGI,"CGI::new() from POST");
-+  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
-+  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
- } else {
--  print "ok 31 # Skip\n";
-   print "ok 32 # Skip\n";
-   print "ok 33 # Skip\n";
-+  print "ok 34 # Skip\n";
- }
 diff -urN perl-5.10.0.orig/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
---- perl-5.10.0.orig/lib/CGI/Util.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Util.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Util.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Util.pm	2009-04-07 14:36:12.000000000 +0200
 @@ -4,7 +4,7 @@
  use vars qw($VERSION @EXPORT_OK @ISA $EBCDIC @A2E @E2A);
  require Exporter;
@@ -340,7 +308,11 @@
          if ($c < 0x80) {
                  return sprintf("%c", $c);
          } elsif ($c < 0x800) {
-@@ -189,6 +214,17 @@
+@@ -185,10 +210,20 @@
+   my $todecode = shift;
+   return undef unless defined($todecode);
+   $todecode =~ tr/+/ /;       # pluses become spaces
+-    $EBCDIC = "\t" ne "\011";
      if ($EBCDIC) {
        $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
      } else {
@@ -358,23 +330,118 @@
        $todecode =~ s/%(?:([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/
  	defined($1)? chr hex($1) : utf8_chr(hex($2))/ge;
      }
-@@ -200,8 +236,12 @@
+@@ -196,12 +231,24 @@
+ }
+ 
+ # URL-encode data
++#
++# We cannot use the %u escapes, they were rejected by W3C, so the official
++# way is %XX-escaped utf-8 encoding.
++# Naturally, Unicode strings have to be converted to their utf-8 byte
++# representation.  (No action is required on 5.6.)
++# Byte strings were traditionally used directly as a sequence of octets.
++# This worked if they actually represented binary data (i.e. in CGI::Compress).
++# This also worked if these byte strings were actually utf-8 encoded; e.g.,
++# when the source file used utf-8 without the apropriate "use utf8;".
++# This fails if the byte string is actually a Latin 1 encoded string, but it
++# was always so and cannot be fixed without breaking the binary data case.
++# -- Stepan Kasal <skasal at redhat.com>
++#
+ sub escape {
    shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
    my $toencode = shift;
    return undef unless defined($toencode);
-+  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
-   # force bytes while preserving backward compatibility -- dankogai
+-  # force bytes while preserving backward compatibility -- dankogai
 -  $toencode = pack("C*", unpack("U0C*", $toencode));
-+  # but commented out because it was breaking CGI::Compress -- lstein
-+  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
++  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
      if ($EBCDIC) {
        $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
      } else {
+diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
+--- perl-5.10.0.orig/lib/CGI/t/request.t	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/t/request.t	2009-04-07 14:36:05.000000000 +0200
+@@ -4,7 +4,7 @@
+ ######################### We start with some black magic to print on failure.
+ use lib '.','../blib/lib','../blib/arch';
+ 
+-BEGIN {$| = 1; print "1..33\n"; }
++BEGIN {$| = 1; print "1..34\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ use CGI ();
+ use Config;
+@@ -74,6 +74,7 @@
+ test(29,$p->{bar} eq 'froz',"tied interface fetch");
+ $p->{bar} = join("\0",qw(foo bar baz));
+ test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
++test(31,exists $p->{bar});
+ 
+ # test posting
+ $q->_reset_globals;
+@@ -88,11 +89,11 @@
+     exit 0;
+   }
+   # at this point, we're in a new (child) process
+-  test(31,$q=new CGI,"CGI::new() from POST");
+-  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
+-  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
++  test(32,$q=new CGI,"CGI::new() from POST");
++  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
++  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
+ } else {
+-  print "ok 31 # Skip\n";
+   print "ok 32 # Skip\n";
+   print "ok 33 # Skip\n";
++  print "ok 34 # Skip\n";
+ }
+diff -urN perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
+--- perl-5.10.0.orig/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
++++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-07 14:36:12.000000000 +0200
+@@ -1,16 +1,29 @@
++# test CGI::Util::escape
++use Test::More tests => 4;
++use_ok("CGI::Util");
++
++# Byte strings should be escaped byte by byte:
++# 1) not a valid utf-8 sequence:
++my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
++is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
++
++# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
++#    This happens often: people write utf-8 strings to source, but forget
++#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
++#    have to handle it gracefully, for compatibility with GCI.pm under
++#    perl-5.8.x
+ #
+-# This tests CGI::Util::escape() when fed with UTF-8-flagged string
+-# -- dankogai
+-BEGIN {
+-    if ($] < 5.008) {
+-       print "1..0 # \$] == $] < 5.008\n";
+-       exit(0);
+-    }
+-}
++$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
++is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
++	"Escape an utf-8 byte string");
+ 
+-use Test::More tests => 2;
+-use_ok("CGI::Util");
+-my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
+-is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+-   "# Escape string with UTF-8 flag");
++SKIP:
++{
++	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
++	# -- dankogai
++	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
++	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
++	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
++   		"Escape string with UTF-8 flag");
++}
+ __END__
 diff -urN perl-5.10.0.orig/lib/CGI.pm perl-5.10.0/lib/CGI.pm
---- perl-5.10.0.orig/lib/CGI.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI.pm	2009-02-13 18:08:55.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI.pm	2009-04-07 14:36:12.000000000 +0200
 @@ -18,13 +18,13 @@
  # The most recent version and complete docs are available at:
  #   http://stein.cshl.org/WWW/software/CGI/
@@ -382,7 +449,7 @@
 -$CGI::revision = '$Id$';
 -$CGI::VERSION='3.29';
 +$CGI::revision = '$Id$';
-+$CGI::VERSION='3.42';
++$CGI::VERSION='3.43';
  
  # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
  # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
@@ -439,6 +506,28 @@
  			   embed basefont style span layer ilayer font frameset frame script small big Area Map/],
                  ':html4'=>[qw/abbr acronym bdo col colgroup del fieldset iframe
                              ins label legend noframes noscript object optgroup Q 
+@@ -293,10 +294,10 @@
+     # To allow overriding, search through the packages
+     # Till we find one in which the correct subroutine is defined.
+     my @packages = ($self,@{"$self\:\:ISA"});
+-    foreach $sym (keys %EXPORT) {
++    for $sym (keys %EXPORT) {
+ 	my $pck;
+ 	my $def = ${"$self\:\:AutoloadClass"} || $DefaultClass;
+-	foreach $pck (@packages) {
++	for $pck (@packages) {
+ 	    if (defined(&{"$pck\:\:$sym"})) {
+ 		$def = $pck;
+ 		last;
+@@ -316,7 +317,7 @@
+     return ("start_$1","end_$1") if $tag=~/^(?:\*|start_|end_)(.+)/;
+     my(@r);
+     return ($tag) unless $EXPORT_TAGS{$tag};
+-    foreach (@{$EXPORT_TAGS{$tag}}) {
++    for (@{$EXPORT_TAGS{$tag}}) {
+ 	push(@r,&expand_tags($_));
+     }
+     return @r;
 @@ -352,6 +353,7 @@
        $self->r(Apache->request) unless $self->r;
        my $r = $self->r;
@@ -455,7 +544,24 @@
      }
      undef $NPH;
    }
-@@ -437,23 +440,22 @@
+@@ -378,7 +381,7 @@
+ sub DESTROY {
+   my $self = shift;
+   if ($OS eq 'WINDOWS') {
+-    foreach my $href (values %{$self->{'.tmpfiles'}}) {
++    for my $href (values %{$self->{'.tmpfiles'}}) {
+       $href->{hndl}->DESTROY if defined $href->{hndl};
+       $href->{name}->DESTROY if defined $href->{name};
+     }
+@@ -430,30 +433,29 @@
+ 	if (substr($p[0],0,1) eq '-') {
+ 	    @values = defined($value) ? (ref($value) && ref($value) eq 'ARRAY' ? @{$value} : $value) : ();
+ 	} else {
+-	    foreach ($value, at other) {
++	    for ($value, at other) {
+ 		push(@values,$_) if defined($_);
+ 	    }
+ 	}
  	# If values is provided, then we set it.
  	if (@values or defined $value) {
  	    $self->add_parameter($name);
@@ -488,6 +594,15 @@
  }
  
  sub self_or_default {
+@@ -486,7 +488,7 @@
+ 
+ # Initialize the query object from the environment.
+ # If a parameter list is found, this object will be set
+-# to an associative array in which parameter names are keys
++# to a hash in which parameter names are keys
+ # and the values are stored as lists
+ # If a keyword list is found, this method creates a bogus
+ # parameter list with the single parameter 'keywords'.
 @@ -574,14 +576,14 @@
                        $self->add_parameter($param);
                        $self->read_from_client(\$value,$content_length,0)
@@ -505,6 +620,15 @@
                        if ($MOD_PERL) {
                                $query_string = $self->r->args;
                        } else {
+@@ -601,7 +603,7 @@
+ 	      last METHOD;
+ 	  }
+ 	  if (ref($initializer) && ref($initializer) eq 'HASH') {
+-	      foreach (keys %$initializer) {
++	      for (keys %$initializer) {
+ 		  $self->param('-name'=>$_,'-value'=>$initializer->{$_});
+ 	      }
+ 	      last METHOD;
 @@ -641,7 +643,7 @@
  	  last METHOD;
        }
@@ -540,15 +664,39 @@
  	}
      }
  
-@@ -752,7 +754,7 @@
+@@ -695,9 +697,9 @@
+       $self->delete_all();
+     }
+ 
+-    # Associative array containing our defined fieldnames
++    # hash containing our defined fieldnames
+     $self->{'.fieldnames'} = {};
+-    foreach ($self->param('.cgifields')) {
++    for ($self->param('.cgifields')) {
+ 	$self->{'.fieldnames'}->{$_}++;
+     }
+     
+@@ -750,9 +752,9 @@
+     # again, we initialize ourselves in exactly the same way.  This allows
+     # us to have several of these objects.
      @QUERY_PARAM = $self->param; # save list of parameters
-     foreach (@QUERY_PARAM) {
+-    foreach (@QUERY_PARAM) {
++    for (@QUERY_PARAM) {
        next unless defined $_;
 -      $QUERY_PARAM{$_}=$self->{$_};
 +      $QUERY_PARAM{$_}=$self->{param}{$_};
      }
      $QUERY_CHARSET = $self->charset;
      %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}};
+@@ -763,7 +765,7 @@
+     my($self,$tosplit) = @_;
+     my(@pairs) = split(/[&;]/,$tosplit);
+     my($param,$value);
+-    foreach (@pairs) {
++    for (@pairs) {
+ 	($param,$value) = split('=',$_,2);
+ 	next unless defined $param;
+ 	next if $NO_UNDEF_PARAMS and not defined $value;
 @@ -771,7 +773,7 @@
  	$param = unescape($param);
  	$value = unescape($value);
@@ -567,7 +715,15 @@
  }
  
  sub all_parameters {
-@@ -904,6 +906,7 @@
+@@ -897,13 +899,14 @@
+     # to avoid reexporting unwanted variables
+     undef %EXPORT;
+ 
+-    foreach (@_) {
++    for (@_) {
+ 	$HEADERS_ONCE++,         next if /^[:-]unique_headers$/;
+ 	$NPH++,                  next if /^[:-]nph$/;
+ 	$NOSTICKY++,             next if /^[:-]nosticky$/;
  	$DEBUG=0,                next if /^[:-]no_?[Dd]ebug$/;
  	$DEBUG=2,                next if /^[:-][Dd]ebug$/;
  	$USE_PARAM_SEMICOLONS++, next if /^[:-]newstyle_urls$/;
@@ -575,15 +731,45 @@
  	$XHTML++,                next if /^[:-]xhtml$/;
  	$XHTML=0,                next if /^[:-]no_?xhtml$/;
  	$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
-@@ -1005,7 +1008,7 @@
+@@ -925,7 +928,7 @@
+ 	    next;
+ 	}
+ 
+-	foreach (&expand_tags($_)) {
++	for (&expand_tags($_)) {
+ 	    tr/a-zA-Z0-9_//cd;  # don't allow weird function names
+ 	    $EXPORT{$_}++;
+ 	}
+@@ -1003,9 +1006,9 @@
+     my(@names) = rearrange([NAME], at p);
+     my @to_delete = ref($names[0]) eq 'ARRAY' ? @$names[0] : @names;
      my %to_delete;
-     foreach my $name (@to_delete)
+-    foreach my $name (@to_delete)
++    for my $name (@to_delete)
      {
 -        CORE::delete $self->{$name};
 +        CORE::delete $self->{param}{$name};
          CORE::delete $self->{'.fieldnames'}->{$name};
          $to_delete{$name}++;
      }
+@@ -1025,7 +1028,7 @@
+     die "Can't import names into \"main\"\n" if \%{"${namespace}::"} == \%::;
+     if ($delete || $MOD_PERL || exists $ENV{'FCGI_ROLE'}) {
+ 	# can anyone find an easier way to do this?
+-	foreach (keys %{"${namespace}::"}) {
++	for (keys %{"${namespace}::"}) {
+ 	    local *symbol = "${namespace}::${_}";
+ 	    undef $symbol;
+ 	    undef @symbol;
+@@ -1033,7 +1036,7 @@
+ 	}
+     }
+     my($param, at value,$var);
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	# protect against silly names
+ 	($var = $param)=~tr/a-zA-Z0-9_/_/c;
+ 	$var =~ s/^(?=\d)/_/;
 @@ -1054,8 +1057,8 @@
  sub keywords {
      my($self, at values) = self_or_default(@_);
@@ -613,6 +799,47 @@
      }
      return $self->param($name);
  }
+@@ -1267,7 +1270,7 @@
+ 	if ($ENV{QUERY_STRING} =~ /=/) {
+ 	    my(@pairs) = split(/[&;]/,$ENV{QUERY_STRING});
+ 	    my($param,$value);
+-	    foreach (@pairs) {
++	    for (@pairs) {
+ 		($param,$value) = split('=',$_,2);
+ 		$param = unescape($param);
+ 		$value = unescape($value);
+@@ -1295,11 +1298,11 @@
+     my($param,$value, at result);
+     return '<ul></ul>' unless $self->param;
+     push(@result,"<ul>");
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($name)=$self->escapeHTML($param);
+ 	push(@result,"<li><strong>$param</strong></li>");
+ 	push(@result,"<ul>");
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    $value = $self->escapeHTML($value);
+             $value =~ s/\n/<br \/>\n/g;
+ 	    push(@result,"<li>$value</li>");
+@@ -1332,14 +1335,14 @@
+     my($param);
+     local($,) = '';  # set print field separator back to a sane value
+     local($\) = '';  # set output line separator to a sane value
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($escaped_param) = escape($param);
+ 	my($value);
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    print $filehandle "$escaped_param=",escape("$value"),"\n";
+ 	}
+     }
+-    foreach (keys %{$self->{'.fieldnames'}}) {
++    for (keys %{$self->{'.fieldnames'}}) {
+           print $filehandle ".cgifields=",escape("$_"),"\n";
+     }
+     print $filehandle "=\n";    # end of record
 @@ -1378,7 +1381,7 @@
  'multipart_init' => <<'END_OF_FUNC',
  sub multipart_init {
@@ -622,6 +849,33 @@
      $boundary = $boundary || '------- =_aaaaaaaaaa0';
      $self->{'separator'} = "$CRLF--$boundary$CRLF";
      $self->{'final_separator'} = "$CRLF--$boundary--$CRLF";
+@@ -1408,7 +1411,7 @@
+ 
+     # rearrange() was designed for the HTML portion, so we
+     # need to fix it up a little.
+-    foreach (@other) {
++    for (@other) {
+         # Don't use \s because of perl bug 21951
+         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
+ 	($_ = $header) =~ s/^(\w)(.*)/$1 . lc ($2) . ': '.$self->unescapeHTML($value)/e;
+@@ -1477,7 +1480,7 @@
+ 
+     # rearrange() was designed for the HTML portion, so we
+     # need to fix it up a little.
+-    foreach (@other) {
++    for (@other) {
+         # Don't use \s because of perl bug 21951
+         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
+         ($_ = $header) =~ s/^(\w)(.*)/"\u$1\L$2" . ': '.$self->unescapeHTML($value)/e;
+@@ -1503,7 +1506,7 @@
+     # push all the cookies -- there may be several
+     if ($cookie) {
+ 	my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie;
+-	foreach (@cookie) {
++	for (@cookie) {
+             my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
+ 	    push(@header,"Set-Cookie: $cs") if $cs ne '';
+ 	}
 @@ -1519,7 +1522,7 @@
      push(@header,map {ucfirst $_} @other);
      push(@header,"Content-Type: $type") if $type ne '';
@@ -631,7 +885,21 @@
          $self->r->send_cgi_header($header);
          return '';
      }
-@@ -1663,12 +1666,22 @@
+@@ -1556,7 +1559,7 @@
+     $status = '302 Found' unless defined $status;
+     $url ||= $self->self_url;
+     my(@o);
+-    foreach (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
++    for (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
+     unshift(@o,
+ 	 '-Status'  => $status,
+ 	 '-Location'=> $url,
+@@ -1659,16 +1662,26 @@
+     }
+ 
+     if ($meta && ref($meta) && (ref($meta) eq 'HASH')) {
+-	foreach (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
++	for (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
  			: qq(<meta name="$_" content="$meta->{$_}">)); }
      }
  
@@ -664,7 +932,7 @@
  
      for my $s (@s) {
        if (ref($s)) {
-@@ -1708,7 +1722,7 @@
+@@ -1708,11 +1722,11 @@
                         ref($s) eq 'ARRAY' ? @$s : %$s));
         my $type = defined $stype ? $stype : 'text/css';
         my $rel  = $alternate ? 'alternate stylesheet' : 'stylesheet';
@@ -673,6 +941,33 @@
  
         if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference
         { # If it is, push a LINK tag for each one
+-           foreach $src (@$src)
++           for $src (@$src)
+          {
+            push(@result,$XHTML ? qq(<link rel="$rel" type="$type" href="$src" $other/>)
+                              : qq(<link rel="$rel" type="$type" href="$src"$other>)) if $src;
+@@ -1726,10 +1740,10 @@
+         }
+      if ($verbatim) {
+            my @v = ref($verbatim) eq 'ARRAY' ? @$verbatim : $verbatim;
+-           push(@result, "<style type=\"text/css\">\n$_\n</style>") foreach @v;
++           push(@result, "<style type=\"text/css\">\n$_\n</style>") for @v;
+       }
+       my @c = ref($code) eq 'ARRAY' ? @$code : $code if $code;
+-      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) foreach @c;
++      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) for @c;
+ 
+       } else {
+            my $src = $s;
+@@ -1747,7 +1761,7 @@
+     my (@result);
+ 
+     my (@scripts) = ref($script) eq 'ARRAY' ? @$script : ($script);
+-    foreach $script (@scripts) {
++    for $script (@scripts) {
+ 	my($src,$code,$language);
+ 	if (ref($script)) { # script is a hash
+ 	    ($src,$code,$type) =
 @@ -1831,7 +1845,7 @@
      my($method,$action,$enctype, at other) = 
  	rearrange([METHOD,ACTION,ENCTYPE], at p);
@@ -719,6 +1014,33 @@
                  $toencode =~ s{'}{&#39;}gso;
                  $toencode =~ s{\x8b}{&#8249;}gso;
                  $toencode =~ s{\x9b}{&#8250;}gso;
+@@ -2251,7 +2269,7 @@
+     my($row,$column);
+     unshift(@colheaders,'') if @colheaders && @rowheaders;
+     $result .= "<tr>" if @colheaders;
+-    foreach (@colheaders) {
++    for (@colheaders) {
+ 	$result .= "<th>$_</th>";
+     }
+     for ($row=0;$row<$rows;$row++) {
+@@ -2280,7 +2298,7 @@
+ #   $linebreak -> (optional) Set to true to place linebreaks
+ #             between the buttons.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
+@@ -2308,7 +2326,7 @@
+ #   $linebreak -> (optional) Set to true to place linebreaks
+ #             between the buttons.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2327,13 +2345,14 @@
      my $self     = shift;
      my $box_type = shift;
@@ -740,6 +1062,20 @@
  
      my($result,$checked, at elements, at values);
  
+@@ -2361,11 +2380,11 @@
+ 
+     # for disabling groups of radio/checkbox buttons
+     my %disabled;
+-    foreach (@{$disabled}) {
++    for (@{$disabled}) {
+    	$disabled{$_}=1;
+     }
+ 
+-    foreach (@values) {
++    for (@values) {
+     	 my $disable="";
+ 	 if ($disabled{$_}) {
+ 		$disable="disabled='1'";
 @@ -2393,7 +2412,7 @@
  
          if ($XHTML) {
@@ -749,6 +1085,15 @@
                     qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
          } else {
              push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
+@@ -2415,7 +2434,7 @@
+ #             text of each menu item.
+ #   $default -> (optional) Default item to display
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2428,12 +2447,14 @@
      my($name,$values,$default,$labels,$attributes,$override,$tabindex, at other) =
         rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LABELS,
@@ -768,9 +1113,12 @@
      }
      $name=$self->escapeHTML($name);
      my($other) = @other ? " @other" : '';
-@@ -2444,20 +2465,22 @@
+@@ -2442,22 +2463,24 @@
+     @values = $self->_set_values_and_labels($values,\$labels,$name);
+     $tabindex = $self->element_tab($tabindex);
      $result = qq/<select name="$name" $tabindex$other>\n/;
-     foreach (@values) {
+-    foreach (@values) {
++    for (@values) {
          if (/<optgroup/) {
 -            foreach (split(/\n/)) {
 +            for my $v (split(/\n/)) {
@@ -801,6 +1149,36 @@
          }
      }
  
+@@ -2474,7 +2497,7 @@
+ #   $values -> A pointer to a regular array containing the
+ #              values for each option line in the group.
+ #   $labels -> (optional)
+-#              A pointer to an associative array of labels to print next to each item
++#              A pointer to a hash of labels to print next to each item
+ #              in the form $label{'value'}="Long explanatory label".
+ #              Otherwise the provided values are used as the labels.
+ #   $labeled -> (optional)
+@@ -2501,9 +2524,9 @@
+ 
+     $name=$self->escapeHTML($name);
+     $result = qq/<optgroup label="$name"$other>\n/;
+-    foreach (@values) {
++    for (@values) {
+         if (/<optgroup/) {
+-            foreach (split(/\n/)) {
++            for (split(/\n/)) {
+                 my $selectit = $XHTML ? 'selected="selected"' : 'selected';
+                 s/(value="$selected")/$selectit $1/ if defined $selected;
+                 $result .= "$_\n";
+@@ -2541,7 +2564,7 @@
+ #   $size -> (optional) Size of the list.
+ #   $multiple -> (optional) If set, allow multiple selections.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2560,6 +2583,7 @@
      $size = $size || scalar(@values);
  
@@ -809,6 +1187,33 @@
      my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
      my($has_size) = $size ? qq/ size="$size"/: '';
      my($other) = @other ? " @other" : '';
+@@ -2567,7 +2591,7 @@
+     $name=$self->escapeHTML($name);
+     $tabindex = $self->element_tab($tabindex);
+     $result = qq/<select name="$name" $tabindex$has_size$is_multiple$other>\n/;
+-    foreach (@values) {
++    for (@values) {
+ 	my($selectit) = $self->_selected($selected{$_});
+ 	my($label) = $_;
+ 	$label = $labels->{$_} if defined($labels) && defined($labels->{$_});
+@@ -2607,7 +2631,7 @@
+ 	@value = ref($default) ? @{$default} : $default;
+ 	$do_override = $override;
+     } else {
+-	foreach ($default,$override, at other) {
++	for ($default,$override, at other) {
+ 	    push(@value,$_) if defined($_);
+ 	}
+     }
+@@ -2617,7 +2641,7 @@
+     @value = @prev if !$do_override && @prev;
+ 
+     $name=$self->escapeHTML($name);
+-    foreach (@value) {
++    for (@value) {
+ 	$_ = defined($_) ? $self->escapeHTML($_,1) : '';
+ 	push @result,$XHTML ? qq(<input type="hidden" name="$name" value="$_" @other />)
+                             : qq(<input type="hidden" name="$name" value="$_" @other>);
 @@ -2692,12 +2716,13 @@
      my $request_uri =  unescape($self->request_uri) || '';
      my $query_str   =  $self->query_string;
@@ -931,7 +1336,26 @@
  }
  END_OF_FUNC
  
-@@ -2931,7 +2985,9 @@
+@@ -2899,15 +2953,15 @@
+ sub query_string {
+     my($self) = self_or_default(@_);
+     my($param,$value, at pairs);
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($eparam) = escape($param);
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    $value = escape($value);
+             next unless defined $value;
+ 	    push(@pairs,"$eparam=$value");
+ 	}
+     }
+-    foreach (keys %{$self->{'.fieldnames'}}) {
++    for (keys %{$self->{'.fieldnames'}}) {
+       push(@pairs,".cgifields=".escape("$_"));
+     }
+     return join($USE_PARAM_SEMICOLONS ? ';' : '&', at pairs);
+@@ -2931,9 +2985,11 @@
      my($self,$search) = self_or_CGI(@_);
      my(%prefs,$type,$pref,$pat);
      
@@ -940,8 +1364,38 @@
 +                ? split(',',$self->http('accept'))
 +                : ();
  
-     foreach (@accept) {
+-    foreach (@accept) {
++    for (@accept) {
  	($pref) = /q=(\d\.\d+|\d+)/;
+ 	($type) = m#(\S+/[^;]+)#;
+ 	next unless $type;
+@@ -2952,7 +3008,7 @@
+     return $prefs{$search} if $prefs{$search};
+ 
+     # Didn't get it, so try pattern matching.
+-    foreach (keys %prefs) {
++    for (keys %prefs) {
+ 	next unless /\*/;       # not a pattern match
+ 	($pat = $_) =~ s/([^\w*])/\\$1/g; # escape meta characters
+ 	$pat =~ s/\*/.*/g; # turn it into a pattern
+@@ -3133,7 +3189,7 @@
+     $parameter =~ tr/-/_/;
+     return $ENV{"HTTP_\U$parameter\E"} if $parameter;
+     my(@p);
+-    foreach (keys %ENV) {
++    for (keys %ENV) {
+ 	push(@p,$_) if /^HTTP/;
+     }
+     return @p;
+@@ -3152,7 +3208,7 @@
+     $parameter =~ tr/-/_/;
+     return $ENV{"HTTPS_\U$parameter\E"} if $parameter;
+     my(@p);
+-    foreach (keys %ENV) {
++    for (keys %ENV) {
+ 	push(@p,$_) if /^HTTPS/;
+     }
+     return @p;
 @@ -3284,10 +3340,10 @@
  
      if (!$override && ($self->{'.fieldnames'}->{$name} || 
@@ -955,6 +1409,15 @@
      } else {
  	$selected{$defaults}++ if defined($defaults);
      }
+@@ -3326,7 +3382,7 @@
+ 	$input = join(" ", at lines);
+ 	@words = &shellwords($input);    
+     }
+-    foreach (@words) {
++    for (@words) {
+ 	s/\\=/%3D/g;
+ 	s/\\&/%26/g;	    
+     }
 @@ -3368,11 +3424,20 @@
  	    return;
  	}
@@ -987,6 +1450,15 @@
  	    next;
  	}
  
+@@ -3423,7 +3488,7 @@
+ 	  # together with the body for later parsing with an external
+ 	  # MIME parser module
+ 	  if ( $multipart ) {
+-	      foreach ( keys %header ) {
++	      for ( keys %header ) {
+ 		  print $filehandle "$_: $header{$_}${CRLF}";
+ 	      }
+ 	      print $filehandle "${CRLF}";
 @@ -3431,7 +3496,7 @@
  
  	  my ($data);
@@ -1014,6 +1486,24 @@
        }
      }
      return $returnvalue;
+@@ -3616,7 +3681,7 @@
+     my($element, $attributes) = @_;
+     return '' unless defined($attributes->{$element});
+     $attribs = ' ';
+-    foreach my $attrib (keys %{$attributes->{$element}}) {
++    for my $attrib (keys %{$attributes->{$element}}) {
+         (my $clean_attrib = $attrib) =~ s/^-//;
+         $attribs .= "@{[lc($clean_attrib)]}=\"$attributes->{$element}{$attrib}\" ";
+     }
+@@ -3627,7 +3692,7 @@
+ 
+ '_compile_all' => <<'END_OF_FUNC',
+ sub _compile_all {
+-    foreach (@_) {
++    for (@_) {
+ 	next if defined(&$_);
+ 	$AUTOLOAD = "CGI::$_";
+ 	_compile();
 @@ -3645,6 +3710,7 @@
  
  ################### Fh -- lightweight filehandle ###############
@@ -1070,6 +1560,15 @@
      unshift(@TEMP,$ENV{'TMPDIR'}) if defined $ENV{'TMPDIR'};
  
      # this feature was supposed to provide per-user tmpfiles, but
+@@ -3997,7 +4079,7 @@
+     #    : Refer to getpwuid() only at run-time if we're fortunate and have  UNIX.
+     # unshift(@TEMP,(eval {(getpwuid($>))[7]}).'/tmp') if $CGI::OS eq 'UNIX' and $> != 0;
+ 
+-    foreach (@TEMP) {
++    for (@TEMP) {
+       do {$TMPDIRECTORY = $_; last} if -d $_ && -w _;
+     }
+   }
 @@ -4014,7 +4096,7 @@
  
  sub DESTROY {
@@ -1092,16 +1591,116 @@
      # this used to untaint, now it doesn't
      # $filename = $1;
      return bless \$filename;
-@@ -4109,6 +4191,8 @@
- 	     hr;
-    }
+@@ -4075,64 +4157,52 @@
  
-+   print end_html;
-+
- =head1 ABSTRACT
+ =head1 NAME
+ 
+-CGI - Simple Common Gateway Interface Class
++CGI - Handle Common Gateway Interface requests and responses
+ 
+ =head1 SYNOPSIS
+ 
+-  # CGI script that creates a fill-out form
+-  # and echoes back its values.
+-
+-  use CGI qw/:standard/;
+-  print header,
+-        start_html('A Simple Example'),
+-        h1('A Simple Example'),
+-        start_form,
+-        "What's your name? ",textfield('name'),p,
+-        "What's the combination?", p,
+-        checkbox_group(-name=>'words',
+-		       -values=>['eenie','meenie','minie','moe'],
+-		       -defaults=>['eenie','minie']), p,
+-        "What's your favorite color? ",
+-        popup_menu(-name=>'color',
+-	           -values=>['red','green','blue','chartreuse']),p,
+-        submit,
+-        end_form,
+-        hr;
+-
+-   if (param()) {
+-       my $name      = param('name');
+-       my $keywords  = join ', ',param('words');
+-       my $color     = param('color');
+-       print "Your name is",em(escapeHTML($name)),p,
+-	     "The keywords are: ",em(escapeHTML($keywords)),p,
+-	     "Your favorite color is ",em(escapeHTML($color)),
+-	     hr;
+-   }
++    use CGI;
+ 
+-=head1 ABSTRACT
++    my $q = CGI->new;
+ 
+-This perl library uses perl5 objects to make it easy to create Web
+-fill-out forms and parse their contents.  This package defines CGI
+-objects, entities that contain the values of the current query string
+-and other state variables.  Using a CGI object's methods, you can
+-examine keywords and parameters passed to your script, and create
+-forms whose initial values are taken from the current query (thereby
+-preserving state information).  The module provides shortcut functions
+-that produce boilerplate HTML, reducing typing and coding errors. It
+-also provides functionality for some of the more advanced features of
+-CGI scripting, including support for file uploads, cookies, cascading
+-style sheets, server push, and frames.
++    # Process an HTTP request
++     @values  = $q->param('form_field');
+ 
+-CGI.pm also provides a simple function-oriented programming style for
+-those who don't need its object-oriented features.
++     $fh      = $q->upload('file_field');
+ 
+-The current version of CGI.pm is available at
++     $riddle  = $query->cookie('riddle_name');
++     %answers = $query->cookie('answers');
++
++    # Prepare various HTTP responses
++    print $q->header();
++    print $q->header('application/json');
++
++	$cookie1 = $q->cookie(-name=>'riddle_name', -value=>"The Sphynx's Question");
++	$cookie2 = $q->cookie(-name=>'answers', -value=>\%answers);
++    print $q->header(
++        -type    => 'image/gif',
++        -expires => '+3d',
++        -cookie  => [$cookie1,$cookie2]
++        );
+ 
+-  http://www.genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
+-  ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
++   print  $q->redirect('http://somewhere.else/in/movie/land');
+ 
+ =head1 DESCRIPTION
+ 
++CGI.pm is a stable, complete and mature solution for processing and preparing
++HTTP requests and responses.  Major features including processing form
++submissions, file uploads, reading and writing cookies, query string generation
++and manipulation, and processing and preparing HTTP headers. Some HTML
++generation utilities are included as well.
++
++CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
++with built-in support for mod_perl and mod_perl2 as well as FastCGI.
++
++It has the benefit of having developed and refined over 10 years with input
++from dozens of contributors and being deployed on thousands of websites.
++CGI.pm has been included in the Perl distribution since Perl 5.4, and has
++become a de-facto standard.
++
+ =head2 PROGRAMMING STYLE
+ 
+ There are two styles of programming with CGI.pm, an object-oriented
+@@ -4327,7 +4397,7 @@
+     restore_parameters(IN);
+     close IN;
+ 
+-You can also initialize the query object from an associative array
++You can also initialize the query object from a hash
+ reference:
  
- This perl library uses perl5 objects to make it easy to create Web
-@@ -4392,8 +4476,7 @@
+     $query = new CGI( {'dinosaur'=>'barney',
+@@ -4392,8 +4462,7 @@
  the method will return a single value.
  
  If a value is not given in the query string, as in the queries
@@ -1111,7 +1710,7 @@
  
  
  If the parameter does not exist at all, then param() will return undef
-@@ -4477,6 +4560,10 @@
+@@ -4477,6 +4546,10 @@
  
     my $data = $query->param('POSTDATA');
  
@@ -1122,7 +1721,16 @@
  (If you don't know what the preceding means, don't worry about it.  It
  only affects people trying to use CGI for XML processing and other
  specialized tasks.)
-@@ -4812,6 +4899,16 @@
+@@ -4554,7 +4627,7 @@
+ 
+    open (OUT,">>test.out") || die;
+    $records = 5;
+-   foreach (0..$records) {
++   for (0..$records) {
+        my $q = new CGI;
+        $q->param(-name=>'counter',-value=>$_);
+        $q->save(\*OUT);
+@@ -4812,6 +4885,16 @@
  XHTML will automatically be disabled without needing to use this 
  pragma.
  
@@ -1139,7 +1747,16 @@
  =item -nph
  
  This makes CGI.pm produce a header appropriate for an NPH (no
-@@ -5388,7 +5485,7 @@
+@@ -5129,7 +5212,7 @@
+ 
+ All relative links will be interpreted relative to this tag.
+ You add arbitrary meta information to the header with the B<-meta>
+-argument.  This argument expects a reference to an associative array
++argument.  This argument expects a reference to a hash
+ containing name/value pairs of meta information.  These will be turned
+ into a series of header <meta> tags that look something like this:
+ 
+@@ -5388,7 +5471,7 @@
  If Apache's mod_rewrite is turned on, then the script name and path
  info probably won't match the request that the user sent. Set
  -rewrite=>1 (default) to return URLs that match what the user sent
@@ -1148,7 +1765,18 @@
  the URL after mod_rewrite's rules have run. Because the additional
  path information only makes sense in the context of the rewritten URL,
  -rewrite is set to false when you request path info in the URL.
-@@ -5987,24 +6084,27 @@
+@@ -5468,8 +5551,8 @@
+ 
+    print h1("Chapter","1"); # <h1>Chapter 1</h1>"
+ 
+-If the first argument is an associative array reference, then the keys
+-and values of the associative array become the HTML tag's attributes:
++If the first argument is a hash reference, then the keys
++and values of the hash become the HTML tag's attributes:
+ 
+    print a({-href=>'fred.html',-target=>'_new'},
+       "Open a new frame");
+@@ -5987,31 +6070,34 @@
  
  To be safe, use the I<upload()> function (new in version 2.47).  When
  called with the name of an upload field, I<upload()> returns a
@@ -1182,7 +1810,15 @@
  
  When a file is uploaded the browser usually sends along some
  information along with it in the format of headers.  The information
-@@ -6102,7 +6202,7 @@
+ usually includes the MIME content type.  Future browsers may send
+ other information as well (such as modification date and size). To
+ retrieve this information, call uploadInfo().  It returns a reference to
+-an associative array containing all the document headers.
++a hash containing all the document headers.
+ 
+        $filename = param('uploaded_file');
+        $type = uploadInfo($filename)->{'Content-Type'};
+@@ -6102,7 +6188,7 @@
  
     print popup_menu(-name=>'menu_name',
  			    -values=>['eenie','meenie','minie'],
@@ -1191,7 +1827,7 @@
            -labels=>\%labels,
            -attributes=>\%attributes);
  
-@@ -6125,7 +6225,8 @@
+@@ -6125,14 +6211,15 @@
  
  The optional third parameter (-default) is the name of the default
  menu choice.  If not specified, the first item will be the default.
@@ -1201,7 +1837,84 @@
  
  =item 4.
  
-@@ -6389,6 +6490,9 @@
+ The optional fourth parameter (-labels) is provided for people who
+ want to use different values for the user-visible label inside the
+ popup menu and the value returned to your script.  It's a pointer to an
+-associative array relating menu values to user-visible labels.  If you
++hash relating menu values to user-visible labels.  If you
+ leave this parameter blank, the menu values will be displayed by
+ default.  (You can also leave a label undefined if you want to).
+ 
+@@ -6140,8 +6227,8 @@
+ 
+ The optional fifth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ =back
+@@ -6193,7 +6280,7 @@
+ =item 3.
+ 
+ The optional third parameter (B<-labels>) allows you to pass a reference
+-to an associative array containing user-visible labels for one or more
++to a hash containing user-visible labels for one or more
+ of the menu items.  You can use this when you want the user to see one
+ menu string, but have the browser return your program a different one.
+ If you don't specify this, the value string will be used instead
+@@ -6220,8 +6307,8 @@
+ 
+ An optional sixth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ =back
+@@ -6281,7 +6368,7 @@
+ 
+ =item 5.
+ 
+-The optional sixth argument is a pointer to an associative array
++The optional sixth argument is a pointer to a hash
+ containing long user-visible labels for the list items (-labels).
+ If not provided, the values will be displayed.
+ 
+@@ -6289,8 +6376,8 @@
+ 
+ The optional sixth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ When this form is processed, all selected list items will be returned as
+@@ -6354,7 +6441,7 @@
+ =back
+ 
+ 
+-The optional b<-labels> argument is a pointer to an associative array
++The optional b<-labels> argument is a pointer to a hash
+ relating the checkbox values to the user-visible labels that will be
+ printed next to them.  If not provided, the values will be used as the
+ default.
+@@ -6371,7 +6458,7 @@
+ 
+ The optional B<-attributes> argument is provided to assign any of the
+ common HTML attributes to an individual menu item. It's a pointer to
+-an associative array relating menu values to another associative array
++a hash relating menu values to another hash
+ with the attribute's name as the key and the attribute's value as the
+ value.
+ 
+@@ -6389,6 +6476,9 @@
    -tabindex => ['moe','minie','eenie','meenie']  # tab in this order
    -tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
  
@@ -1211,7 +1924,12 @@
  When the form is processed, all checked boxes will be returned as
  a list under the parameter name 'group_name'.  The values of the
  "on" checkboxes can be retrieved with:
-@@ -6546,6 +6650,9 @@
+@@ -6542,10 +6632,13 @@
+ 
+ The optional B<-attributes> argument is provided to assign any of the
+ common HTML attributes to an individual menu item. It's a pointer to
+-an associative array relating menu values to another associative array
++a hash relating menu values to another hash
  with the attribute's name as the key and the attribute's value as the
  value.
  
@@ -1221,7 +1939,102 @@
  When the form is processed, the selected radio button can
  be retrieved using:
  
-@@ -7658,10 +7765,8 @@
+@@ -6709,16 +6802,13 @@
+ 
+ button() produces a button that is compatible with Netscape 2.0's
+ JavaScript.  When it's pressed the fragment of JavaScript code
+-pointed to by the B<-onClick> parameter will be executed.  On
+-non-Netscape browsers this form element will probably not even
+-display.
++pointed to by the B<-onClick> parameter will be executed.
+ 
+ =head1 HTTP COOKIES
+ 
+-Netscape browsers versions 1.1 and higher, and all versions of
+-Internet Explorer, support a so-called "cookie" designed to help
+-maintain state within a browser session.  CGI.pm has several methods
+-that support cookies.
++Browsers support a so-called "cookie" designed to help maintain state
++within a browser session.  CGI.pm has several methods that support
++cookies.
+ 
+ A cookie is a name=value pair much like the named parameters in a CGI
+ query string.  CGI scripts create one or more cookies and send
+@@ -6793,8 +6883,8 @@
+ =item B<-value>
+ 
+ The value of the cookie.  This can be any scalar value,
+-array reference, or even associative array reference.  For example,
+-you can store an entire associative array into a cookie this way:
++array reference, or even hash reference.  For example,
++you can store an entire hash into a cookie this way:
+ 
+ 	$cookie=cookie(-name=>'family information',
+ 			       -value=>\%childrens_ages);
+@@ -6921,19 +7011,6 @@
+ 
+ =head1 SUPPORT FOR JAVASCRIPT
+ 
+-Netscape versions 2.0 and higher incorporate an interpreted language
+-called JavaScript. Internet Explorer, 3.0 and higher, supports a
+-closely-related dialect called JScript. JavaScript isn't the same as
+-Java, and certainly isn't at all the same as Perl, which is a great
+-pity. JavaScript allows you to programmatically change the contents of
+-fill-out forms, create new windows, and pop up dialog box from within
+-Netscape itself. From the point of view of CGI scripting, JavaScript
+-is quite useful for validating fill-out forms prior to submitting
+-them.
+-
+-You'll need to know JavaScript in order to use it. There are many good
+-sources in bookstores and on the web.
+-
+ The usual way to use JavaScript is to define a set of functions in a
+ <SCRIPT> block inside the HTML header and then to register event
+ handlers in the various elements of the page. Events include such
+@@ -7275,11 +7352,9 @@
+ 
+ =item B<raw_cookie()>
+ 
+-Returns the HTTP_COOKIE variable, an HTTP extension implemented by
+-Netscape browsers version 1.1 and higher, and all versions of Internet
+-Explorer.  Cookies have a special format, and this method call just
+-returns the raw form (?cookie dough).  See cookie() for ways of
+-setting and retrieving cooked cookies.
++Returns the HTTP_COOKIE variable.  Cookies have a special format, and
++this method call just returns the raw form (?cookie dough).  See
++cookie() for ways of setting and retrieving cooked cookies.
+ 
+ Called with no parameters, raw_cookie() returns the packed cookie
+ structure.  You can separate it into individual cookies by splitting
+@@ -7293,7 +7368,7 @@
+ Returns the HTTP_USER_AGENT variable.  If you give
+ this method a single argument, it will attempt to
+ pattern match on it, allowing you to do something
+-like user_agent(netscape);
++like user_agent(Mozilla);
+ 
+ =item B<path_info()>
+ 
+@@ -7476,7 +7551,7 @@
+   use CGI qw/:push -nph/;
+   $| = 1;
+   print multipart_init(-boundary=>'----here we go!');
+-  foreach (0 .. 4) {
++  for (0 .. 4) {
+       print multipart_start(-type=>'text/plain'),
+             "The current time is ",scalar(localtime),"\n";
+       if ($_ < 4) {
+@@ -7532,9 +7607,6 @@
+ Users interested in server push applications should also have a look
+ at the CGI::Push module.
+ 
+-Only Netscape Navigator supports server push.  Internet Explorer
+-browsers do not.
+-
+ =head1 Avoiding Denial of Service Attacks
+ 
+ A potential problem with CGI.pm is that, by default, it attempts to
+@@ -7658,10 +7730,8 @@
  
  =head1 AUTHOR INFORMATION
  
@@ -1234,3 +2047,12 @@
  
  Address bug reports and comments to: lstein at cshl.org.  When sending
  bug reports, please provide the version of CGI.pm, the version of
+@@ -7788,7 +7858,7 @@
+ 
+ 	   print "<h2>Here are the current settings in this form</h2>";
+ 
+-	   foreach $key (param) {
++	   for $key (param) {
+ 	      print "<strong>$key</strong> -> ";
+ 	      @values = param($key);
+ 	      print join(", ", at values),"<br>\n";


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-10/perl.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- perl.spec	7 Apr 2009 10:34:53 -0000	1.210
+++ perl.spec	8 Apr 2009 09:36:00 -0000	1.211
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        66%{?dist}
+Release:        67%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -190,7 +190,7 @@
 Patch102:	perl-update-Archive-Tar.patch
 %define			    Archive_Tar_version 1.46
 Patch103:	perl-update-CGI.patch
-%define			    CGI_version 3.42
+%define			    CGI_version 3.43
 Patch104:	perl-update-ExtUtils-CBuilder.patch
 %define			    ExtUtils_CBuilder_version 0.24
 Patch105:	perl-update-File-Fetch.patch
@@ -229,11 +229,6 @@
 # patches File-Fetch and CPAN
 Patch201:	perl-5.10.0-links.patch
 
-# Fix CGI::escape to work with all strings, started as #472571,
-# brought upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34528,
-# accepted there for CGI.pm-3.43
-Patch202:	perl-CGI-escape.patch
-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -1004,7 +999,6 @@
 %patch117 -p1
 %patch118 -p1
 %patch201 -p1
-%patch202 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1269,7 +1263,6 @@
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
-	'Fedora Patch202: Fix CGI::escape to work with all strings' \
 	%{nil}
 
 rm patchlevel.bak
@@ -1894,6 +1887,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-67
+- update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch
+
 * Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-66
 - fix CGI::escape for all strings (#472571)
 - perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t


--- perl-CGI-escape.patch DELETED ---



From kasal at fedoraproject.org  Wed Apr  8 09:36:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  8 Apr 2009 09:36:36 +0000 (UTC)
Subject: rpms/perl/F-9 perl-update-CGI.patch, 1.1, 1.2 perl.spec, 1.191,
	1.192 perl-CGI-escape.patch, 1.1, NONE
Message-ID: <20090408093636.4010C7011A@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15850

Modified Files:
	perl-update-CGI.patch perl.spec 
Removed Files:
	perl-CGI-escape.patch 
Log Message:
update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch

perl-update-CGI.patch:

Index: perl-update-CGI.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/F-9/perl-update-CGI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-update-CGI.patch	24 Mar 2009 15:06:30 -0000	1.1
+++ perl-update-CGI.patch	8 Apr 2009 09:36:05 -0000	1.2
@@ -1,8 +1,8 @@
-CGI.pm-3.42
+CGI.pm-3.43
 
 diff -urN perl-5.10.0.orig/lib/CGI/Carp.pm perl-5.10.0/lib/CGI/Carp.pm
---- perl-5.10.0.orig/lib/CGI/Carp.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Carp.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Carp.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Carp.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -323,7 +323,7 @@
  
  $main::SIG{__WARN__}=\&CGI::Carp::warn;
@@ -21,9 +21,13 @@
          print STDOUT $mess;
      }
 diff -urN perl-5.10.0.orig/lib/CGI/Changes perl-5.10.0/lib/CGI/Changes
---- perl-5.10.0.orig/lib/CGI/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Changes	2009-02-13 18:09:15.000000000 +0100
-@@ -1,3 +1,70 @@
+--- perl-5.10.0.orig/lib/CGI/Changes	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Changes	2009-04-07 14:36:12.000000000 +0200
+@@ -1,3 +1,74 @@
++  Version 3.43
++  1. Documentation patch from MARKSTOS at cpan.org to replace all occurrences of
++  "new CGI" with CGI->new()" to reflect best perl practices.
++  2. Patch from Stepan Kasal to fix utf-8 related problems in perl 5.10
 +
 +  Version 3.42
 +  1. Added patch from Renee Baecker that makes it possible to subclass
@@ -95,8 +99,8 @@
    1. The position of file handles is now reset to zero when CGI->new is called.
      (Mark Stosberg)
 diff -urN perl-5.10.0.orig/lib/CGI/Cookie.pm perl-5.10.0/lib/CGI/Cookie.pm
---- perl-5.10.0.orig/lib/CGI/Cookie.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Cookie.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Cookie.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Cookie.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -13,7 +13,7 @@
  # wish, but if you redistribute a modified version, please attach a note
  # listing the modifications you have made.
@@ -125,8 +129,8 @@
      s/\s*(.*?)\s*/$1/;
      my($key,$value) = split("=",$_,2);
 diff -urN perl-5.10.0.orig/lib/CGI/Fast.pm perl-5.10.0/lib/CGI/Fast.pm
---- perl-5.10.0.orig/lib/CGI/Fast.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Fast.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Fast.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Fast.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -55,6 +55,7 @@
       }
       }
@@ -172,8 +176,8 @@
      &do_some_initialization();
      while ($q = new CGI::Fast) {
 diff -urN perl-5.10.0.orig/lib/CGI/Pretty.pm perl-5.10.0/lib/CGI/Pretty.pm
---- perl-5.10.0.orig/lib/CGI/Pretty.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Pretty.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Pretty.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Pretty.pm	2009-04-07 14:36:05.000000000 +0200
 @@ -176,6 +176,35 @@
  }
  sub _reset_globals { initialize_globals(); }
@@ -210,45 +214,9 @@
  1;
  
  =head1 NAME
-diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
---- perl-5.10.0.orig/lib/CGI/t/request.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/t/request.t	2009-02-13 18:09:57.000000000 +0100
-@@ -4,7 +4,7 @@
- ######################### We start with some black magic to print on failure.
- use lib '.','../blib/lib','../blib/arch';
- 
--BEGIN {$| = 1; print "1..33\n"; }
-+BEGIN {$| = 1; print "1..34\n"; }
- END {print "not ok 1\n" unless $loaded;}
- use CGI ();
- use Config;
-@@ -74,6 +74,7 @@
- test(29,$p->{bar} eq 'froz',"tied interface fetch");
- $p->{bar} = join("\0",qw(foo bar baz));
- test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
-+test(31,exists $p->{bar});
- 
- # test posting
- $q->_reset_globals;
-@@ -88,11 +89,11 @@
-     exit 0;
-   }
-   # at this point, we're in a new (child) process
--  test(31,$q=new CGI,"CGI::new() from POST");
--  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
--  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
-+  test(32,$q=new CGI,"CGI::new() from POST");
-+  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
-+  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
- } else {
--  print "ok 31 # Skip\n";
-   print "ok 32 # Skip\n";
-   print "ok 33 # Skip\n";
-+  print "ok 34 # Skip\n";
- }
 diff -urN perl-5.10.0.orig/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
---- perl-5.10.0.orig/lib/CGI/Util.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Util.pm	2009-02-13 18:08:50.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI/Util.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/Util.pm	2009-04-07 14:36:12.000000000 +0200
 @@ -4,7 +4,7 @@
  use vars qw($VERSION @EXPORT_OK @ISA $EBCDIC @A2E @E2A);
  require Exporter;
@@ -340,7 +308,11 @@
          if ($c < 0x80) {
                  return sprintf("%c", $c);
          } elsif ($c < 0x800) {
-@@ -189,6 +214,17 @@
+@@ -185,10 +210,20 @@
+   my $todecode = shift;
+   return undef unless defined($todecode);
+   $todecode =~ tr/+/ /;       # pluses become spaces
+-    $EBCDIC = "\t" ne "\011";
      if ($EBCDIC) {
        $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
      } else {
@@ -358,23 +330,118 @@
        $todecode =~ s/%(?:([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/
  	defined($1)? chr hex($1) : utf8_chr(hex($2))/ge;
      }
-@@ -200,8 +236,12 @@
+@@ -196,12 +231,24 @@
+ }
+ 
+ # URL-encode data
++#
++# We cannot use the %u escapes, they were rejected by W3C, so the official
++# way is %XX-escaped utf-8 encoding.
++# Naturally, Unicode strings have to be converted to their utf-8 byte
++# representation.  (No action is required on 5.6.)
++# Byte strings were traditionally used directly as a sequence of octets.
++# This worked if they actually represented binary data (i.e. in CGI::Compress).
++# This also worked if these byte strings were actually utf-8 encoded; e.g.,
++# when the source file used utf-8 without the apropriate "use utf8;".
++# This fails if the byte string is actually a Latin 1 encoded string, but it
++# was always so and cannot be fixed without breaking the binary data case.
++# -- Stepan Kasal <skasal at redhat.com>
++#
+ sub escape {
    shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
    my $toencode = shift;
    return undef unless defined($toencode);
-+  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
-   # force bytes while preserving backward compatibility -- dankogai
+-  # force bytes while preserving backward compatibility -- dankogai
 -  $toencode = pack("C*", unpack("U0C*", $toencode));
-+  # but commented out because it was breaking CGI::Compress -- lstein
-+  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
++  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
      if ($EBCDIC) {
        $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
      } else {
+diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
+--- perl-5.10.0.orig/lib/CGI/t/request.t	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI/t/request.t	2009-04-07 14:36:05.000000000 +0200
+@@ -4,7 +4,7 @@
+ ######################### We start with some black magic to print on failure.
+ use lib '.','../blib/lib','../blib/arch';
+ 
+-BEGIN {$| = 1; print "1..33\n"; }
++BEGIN {$| = 1; print "1..34\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ use CGI ();
+ use Config;
+@@ -74,6 +74,7 @@
+ test(29,$p->{bar} eq 'froz',"tied interface fetch");
+ $p->{bar} = join("\0",qw(foo bar baz));
+ test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
++test(31,exists $p->{bar});
+ 
+ # test posting
+ $q->_reset_globals;
+@@ -88,11 +89,11 @@
+     exit 0;
+   }
+   # at this point, we're in a new (child) process
+-  test(31,$q=new CGI,"CGI::new() from POST");
+-  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
+-  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
++  test(32,$q=new CGI,"CGI::new() from POST");
++  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
++  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
+ } else {
+-  print "ok 31 # Skip\n";
+   print "ok 32 # Skip\n";
+   print "ok 33 # Skip\n";
++  print "ok 34 # Skip\n";
+ }
+diff -urN perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
+--- perl-5.10.0.orig/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
++++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-07 14:36:12.000000000 +0200
+@@ -1,16 +1,29 @@
++# test CGI::Util::escape
++use Test::More tests => 4;
++use_ok("CGI::Util");
++
++# Byte strings should be escaped byte by byte:
++# 1) not a valid utf-8 sequence:
++my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
++is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
++
++# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
++#    This happens often: people write utf-8 strings to source, but forget
++#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
++#    have to handle it gracefully, for compatibility with GCI.pm under
++#    perl-5.8.x
+ #
+-# This tests CGI::Util::escape() when fed with UTF-8-flagged string
+-# -- dankogai
+-BEGIN {
+-    if ($] < 5.008) {
+-       print "1..0 # \$] == $] < 5.008\n";
+-       exit(0);
+-    }
+-}
++$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
++is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
++	"Escape an utf-8 byte string");
+ 
+-use Test::More tests => 2;
+-use_ok("CGI::Util");
+-my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
+-is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
+-   "# Escape string with UTF-8 flag");
++SKIP:
++{
++	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
++	# -- dankogai
++	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
++	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
++	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
++   		"Escape string with UTF-8 flag");
++}
+ __END__
 diff -urN perl-5.10.0.orig/lib/CGI.pm perl-5.10.0/lib/CGI.pm
---- perl-5.10.0.orig/lib/CGI.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI.pm	2009-02-13 18:08:55.000000000 +0100
+--- perl-5.10.0.orig/lib/CGI.pm	2009-04-06 18:28:23.000000000 +0200
++++ perl-5.10.0/lib/CGI.pm	2009-04-07 14:36:12.000000000 +0200
 @@ -18,13 +18,13 @@
  # The most recent version and complete docs are available at:
  #   http://stein.cshl.org/WWW/software/CGI/
@@ -382,7 +449,7 @@
 -$CGI::revision = '$Id$';
 -$CGI::VERSION='3.29';
 +$CGI::revision = '$Id$';
-+$CGI::VERSION='3.42';
++$CGI::VERSION='3.43';
  
  # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
  # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
@@ -439,6 +506,28 @@
  			   embed basefont style span layer ilayer font frameset frame script small big Area Map/],
                  ':html4'=>[qw/abbr acronym bdo col colgroup del fieldset iframe
                              ins label legend noframes noscript object optgroup Q 
+@@ -293,10 +294,10 @@
+     # To allow overriding, search through the packages
+     # Till we find one in which the correct subroutine is defined.
+     my @packages = ($self,@{"$self\:\:ISA"});
+-    foreach $sym (keys %EXPORT) {
++    for $sym (keys %EXPORT) {
+ 	my $pck;
+ 	my $def = ${"$self\:\:AutoloadClass"} || $DefaultClass;
+-	foreach $pck (@packages) {
++	for $pck (@packages) {
+ 	    if (defined(&{"$pck\:\:$sym"})) {
+ 		$def = $pck;
+ 		last;
+@@ -316,7 +317,7 @@
+     return ("start_$1","end_$1") if $tag=~/^(?:\*|start_|end_)(.+)/;
+     my(@r);
+     return ($tag) unless $EXPORT_TAGS{$tag};
+-    foreach (@{$EXPORT_TAGS{$tag}}) {
++    for (@{$EXPORT_TAGS{$tag}}) {
+ 	push(@r,&expand_tags($_));
+     }
+     return @r;
 @@ -352,6 +353,7 @@
        $self->r(Apache->request) unless $self->r;
        my $r = $self->r;
@@ -455,7 +544,24 @@
      }
      undef $NPH;
    }
-@@ -437,23 +440,22 @@
+@@ -378,7 +381,7 @@
+ sub DESTROY {
+   my $self = shift;
+   if ($OS eq 'WINDOWS') {
+-    foreach my $href (values %{$self->{'.tmpfiles'}}) {
++    for my $href (values %{$self->{'.tmpfiles'}}) {
+       $href->{hndl}->DESTROY if defined $href->{hndl};
+       $href->{name}->DESTROY if defined $href->{name};
+     }
+@@ -430,30 +433,29 @@
+ 	if (substr($p[0],0,1) eq '-') {
+ 	    @values = defined($value) ? (ref($value) && ref($value) eq 'ARRAY' ? @{$value} : $value) : ();
+ 	} else {
+-	    foreach ($value, at other) {
++	    for ($value, at other) {
+ 		push(@values,$_) if defined($_);
+ 	    }
+ 	}
  	# If values is provided, then we set it.
  	if (@values or defined $value) {
  	    $self->add_parameter($name);
@@ -488,6 +594,15 @@
  }
  
  sub self_or_default {
+@@ -486,7 +488,7 @@
+ 
+ # Initialize the query object from the environment.
+ # If a parameter list is found, this object will be set
+-# to an associative array in which parameter names are keys
++# to a hash in which parameter names are keys
+ # and the values are stored as lists
+ # If a keyword list is found, this method creates a bogus
+ # parameter list with the single parameter 'keywords'.
 @@ -574,14 +576,14 @@
                        $self->add_parameter($param);
                        $self->read_from_client(\$value,$content_length,0)
@@ -505,6 +620,15 @@
                        if ($MOD_PERL) {
                                $query_string = $self->r->args;
                        } else {
+@@ -601,7 +603,7 @@
+ 	      last METHOD;
+ 	  }
+ 	  if (ref($initializer) && ref($initializer) eq 'HASH') {
+-	      foreach (keys %$initializer) {
++	      for (keys %$initializer) {
+ 		  $self->param('-name'=>$_,'-value'=>$initializer->{$_});
+ 	      }
+ 	      last METHOD;
 @@ -641,7 +643,7 @@
  	  last METHOD;
        }
@@ -540,15 +664,39 @@
  	}
      }
  
-@@ -752,7 +754,7 @@
+@@ -695,9 +697,9 @@
+       $self->delete_all();
+     }
+ 
+-    # Associative array containing our defined fieldnames
++    # hash containing our defined fieldnames
+     $self->{'.fieldnames'} = {};
+-    foreach ($self->param('.cgifields')) {
++    for ($self->param('.cgifields')) {
+ 	$self->{'.fieldnames'}->{$_}++;
+     }
+     
+@@ -750,9 +752,9 @@
+     # again, we initialize ourselves in exactly the same way.  This allows
+     # us to have several of these objects.
      @QUERY_PARAM = $self->param; # save list of parameters
-     foreach (@QUERY_PARAM) {
+-    foreach (@QUERY_PARAM) {
++    for (@QUERY_PARAM) {
        next unless defined $_;
 -      $QUERY_PARAM{$_}=$self->{$_};
 +      $QUERY_PARAM{$_}=$self->{param}{$_};
      }
      $QUERY_CHARSET = $self->charset;
      %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}};
+@@ -763,7 +765,7 @@
+     my($self,$tosplit) = @_;
+     my(@pairs) = split(/[&;]/,$tosplit);
+     my($param,$value);
+-    foreach (@pairs) {
++    for (@pairs) {
+ 	($param,$value) = split('=',$_,2);
+ 	next unless defined $param;
+ 	next if $NO_UNDEF_PARAMS and not defined $value;
 @@ -771,7 +773,7 @@
  	$param = unescape($param);
  	$value = unescape($value);
@@ -567,7 +715,15 @@
  }
  
  sub all_parameters {
-@@ -904,6 +906,7 @@
+@@ -897,13 +899,14 @@
+     # to avoid reexporting unwanted variables
+     undef %EXPORT;
+ 
+-    foreach (@_) {
++    for (@_) {
+ 	$HEADERS_ONCE++,         next if /^[:-]unique_headers$/;
+ 	$NPH++,                  next if /^[:-]nph$/;
+ 	$NOSTICKY++,             next if /^[:-]nosticky$/;
  	$DEBUG=0,                next if /^[:-]no_?[Dd]ebug$/;
  	$DEBUG=2,                next if /^[:-][Dd]ebug$/;
  	$USE_PARAM_SEMICOLONS++, next if /^[:-]newstyle_urls$/;
@@ -575,15 +731,45 @@
  	$XHTML++,                next if /^[:-]xhtml$/;
  	$XHTML=0,                next if /^[:-]no_?xhtml$/;
  	$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
-@@ -1005,7 +1008,7 @@
+@@ -925,7 +928,7 @@
+ 	    next;
+ 	}
+ 
+-	foreach (&expand_tags($_)) {
++	for (&expand_tags($_)) {
+ 	    tr/a-zA-Z0-9_//cd;  # don't allow weird function names
+ 	    $EXPORT{$_}++;
+ 	}
+@@ -1003,9 +1006,9 @@
+     my(@names) = rearrange([NAME], at p);
+     my @to_delete = ref($names[0]) eq 'ARRAY' ? @$names[0] : @names;
      my %to_delete;
-     foreach my $name (@to_delete)
+-    foreach my $name (@to_delete)
++    for my $name (@to_delete)
      {
 -        CORE::delete $self->{$name};
 +        CORE::delete $self->{param}{$name};
          CORE::delete $self->{'.fieldnames'}->{$name};
          $to_delete{$name}++;
      }
+@@ -1025,7 +1028,7 @@
+     die "Can't import names into \"main\"\n" if \%{"${namespace}::"} == \%::;
+     if ($delete || $MOD_PERL || exists $ENV{'FCGI_ROLE'}) {
+ 	# can anyone find an easier way to do this?
+-	foreach (keys %{"${namespace}::"}) {
++	for (keys %{"${namespace}::"}) {
+ 	    local *symbol = "${namespace}::${_}";
+ 	    undef $symbol;
+ 	    undef @symbol;
+@@ -1033,7 +1036,7 @@
+ 	}
+     }
+     my($param, at value,$var);
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	# protect against silly names
+ 	($var = $param)=~tr/a-zA-Z0-9_/_/c;
+ 	$var =~ s/^(?=\d)/_/;
 @@ -1054,8 +1057,8 @@
  sub keywords {
      my($self, at values) = self_or_default(@_);
@@ -613,6 +799,47 @@
      }
      return $self->param($name);
  }
+@@ -1267,7 +1270,7 @@
+ 	if ($ENV{QUERY_STRING} =~ /=/) {
+ 	    my(@pairs) = split(/[&;]/,$ENV{QUERY_STRING});
+ 	    my($param,$value);
+-	    foreach (@pairs) {
++	    for (@pairs) {
+ 		($param,$value) = split('=',$_,2);
+ 		$param = unescape($param);
+ 		$value = unescape($value);
+@@ -1295,11 +1298,11 @@
+     my($param,$value, at result);
+     return '<ul></ul>' unless $self->param;
+     push(@result,"<ul>");
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($name)=$self->escapeHTML($param);
+ 	push(@result,"<li><strong>$param</strong></li>");
+ 	push(@result,"<ul>");
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    $value = $self->escapeHTML($value);
+             $value =~ s/\n/<br \/>\n/g;
+ 	    push(@result,"<li>$value</li>");
+@@ -1332,14 +1335,14 @@
+     my($param);
+     local($,) = '';  # set print field separator back to a sane value
+     local($\) = '';  # set output line separator to a sane value
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($escaped_param) = escape($param);
+ 	my($value);
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    print $filehandle "$escaped_param=",escape("$value"),"\n";
+ 	}
+     }
+-    foreach (keys %{$self->{'.fieldnames'}}) {
++    for (keys %{$self->{'.fieldnames'}}) {
+           print $filehandle ".cgifields=",escape("$_"),"\n";
+     }
+     print $filehandle "=\n";    # end of record
 @@ -1378,7 +1381,7 @@
  'multipart_init' => <<'END_OF_FUNC',
  sub multipart_init {
@@ -622,6 +849,33 @@
      $boundary = $boundary || '------- =_aaaaaaaaaa0';
      $self->{'separator'} = "$CRLF--$boundary$CRLF";
      $self->{'final_separator'} = "$CRLF--$boundary--$CRLF";
+@@ -1408,7 +1411,7 @@
+ 
+     # rearrange() was designed for the HTML portion, so we
+     # need to fix it up a little.
+-    foreach (@other) {
++    for (@other) {
+         # Don't use \s because of perl bug 21951
+         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
+ 	($_ = $header) =~ s/^(\w)(.*)/$1 . lc ($2) . ': '.$self->unescapeHTML($value)/e;
+@@ -1477,7 +1480,7 @@
+ 
+     # rearrange() was designed for the HTML portion, so we
+     # need to fix it up a little.
+-    foreach (@other) {
++    for (@other) {
+         # Don't use \s because of perl bug 21951
+         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
+         ($_ = $header) =~ s/^(\w)(.*)/"\u$1\L$2" . ': '.$self->unescapeHTML($value)/e;
+@@ -1503,7 +1506,7 @@
+     # push all the cookies -- there may be several
+     if ($cookie) {
+ 	my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie;
+-	foreach (@cookie) {
++	for (@cookie) {
+             my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
+ 	    push(@header,"Set-Cookie: $cs") if $cs ne '';
+ 	}
 @@ -1519,7 +1522,7 @@
      push(@header,map {ucfirst $_} @other);
      push(@header,"Content-Type: $type") if $type ne '';
@@ -631,7 +885,21 @@
          $self->r->send_cgi_header($header);
          return '';
      }
-@@ -1663,12 +1666,22 @@
+@@ -1556,7 +1559,7 @@
+     $status = '302 Found' unless defined $status;
+     $url ||= $self->self_url;
+     my(@o);
+-    foreach (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
++    for (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
+     unshift(@o,
+ 	 '-Status'  => $status,
+ 	 '-Location'=> $url,
+@@ -1659,16 +1662,26 @@
+     }
+ 
+     if ($meta && ref($meta) && (ref($meta) eq 'HASH')) {
+-	foreach (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
++	for (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
  			: qq(<meta name="$_" content="$meta->{$_}">)); }
      }
  
@@ -664,7 +932,7 @@
  
      for my $s (@s) {
        if (ref($s)) {
-@@ -1708,7 +1722,7 @@
+@@ -1708,11 +1722,11 @@
                         ref($s) eq 'ARRAY' ? @$s : %$s));
         my $type = defined $stype ? $stype : 'text/css';
         my $rel  = $alternate ? 'alternate stylesheet' : 'stylesheet';
@@ -673,6 +941,33 @@
  
         if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference
         { # If it is, push a LINK tag for each one
+-           foreach $src (@$src)
++           for $src (@$src)
+          {
+            push(@result,$XHTML ? qq(<link rel="$rel" type="$type" href="$src" $other/>)
+                              : qq(<link rel="$rel" type="$type" href="$src"$other>)) if $src;
+@@ -1726,10 +1740,10 @@
+         }
+      if ($verbatim) {
+            my @v = ref($verbatim) eq 'ARRAY' ? @$verbatim : $verbatim;
+-           push(@result, "<style type=\"text/css\">\n$_\n</style>") foreach @v;
++           push(@result, "<style type=\"text/css\">\n$_\n</style>") for @v;
+       }
+       my @c = ref($code) eq 'ARRAY' ? @$code : $code if $code;
+-      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) foreach @c;
++      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) for @c;
+ 
+       } else {
+            my $src = $s;
+@@ -1747,7 +1761,7 @@
+     my (@result);
+ 
+     my (@scripts) = ref($script) eq 'ARRAY' ? @$script : ($script);
+-    foreach $script (@scripts) {
++    for $script (@scripts) {
+ 	my($src,$code,$language);
+ 	if (ref($script)) { # script is a hash
+ 	    ($src,$code,$type) =
 @@ -1831,7 +1845,7 @@
      my($method,$action,$enctype, at other) = 
  	rearrange([METHOD,ACTION,ENCTYPE], at p);
@@ -719,6 +1014,33 @@
                  $toencode =~ s{'}{&#39;}gso;
                  $toencode =~ s{\x8b}{&#8249;}gso;
                  $toencode =~ s{\x9b}{&#8250;}gso;
+@@ -2251,7 +2269,7 @@
+     my($row,$column);
+     unshift(@colheaders,'') if @colheaders && @rowheaders;
+     $result .= "<tr>" if @colheaders;
+-    foreach (@colheaders) {
++    for (@colheaders) {
+ 	$result .= "<th>$_</th>";
+     }
+     for ($row=0;$row<$rows;$row++) {
+@@ -2280,7 +2298,7 @@
+ #   $linebreak -> (optional) Set to true to place linebreaks
+ #             between the buttons.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
+@@ -2308,7 +2326,7 @@
+ #   $linebreak -> (optional) Set to true to place linebreaks
+ #             between the buttons.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2327,13 +2345,14 @@
      my $self     = shift;
      my $box_type = shift;
@@ -740,6 +1062,20 @@
  
      my($result,$checked, at elements, at values);
  
+@@ -2361,11 +2380,11 @@
+ 
+     # for disabling groups of radio/checkbox buttons
+     my %disabled;
+-    foreach (@{$disabled}) {
++    for (@{$disabled}) {
+    	$disabled{$_}=1;
+     }
+ 
+-    foreach (@values) {
++    for (@values) {
+     	 my $disable="";
+ 	 if ($disabled{$_}) {
+ 		$disable="disabled='1'";
 @@ -2393,7 +2412,7 @@
  
          if ($XHTML) {
@@ -749,6 +1085,15 @@
                     qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
          } else {
              push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
+@@ -2415,7 +2434,7 @@
+ #             text of each menu item.
+ #   $default -> (optional) Default item to display
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2428,12 +2447,14 @@
      my($name,$values,$default,$labels,$attributes,$override,$tabindex, at other) =
         rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LABELS,
@@ -768,9 +1113,12 @@
      }
      $name=$self->escapeHTML($name);
      my($other) = @other ? " @other" : '';
-@@ -2444,20 +2465,22 @@
+@@ -2442,22 +2463,24 @@
+     @values = $self->_set_values_and_labels($values,\$labels,$name);
+     $tabindex = $self->element_tab($tabindex);
      $result = qq/<select name="$name" $tabindex$other>\n/;
-     foreach (@values) {
+-    foreach (@values) {
++    for (@values) {
          if (/<optgroup/) {
 -            foreach (split(/\n/)) {
 +            for my $v (split(/\n/)) {
@@ -801,6 +1149,36 @@
          }
      }
  
+@@ -2474,7 +2497,7 @@
+ #   $values -> A pointer to a regular array containing the
+ #              values for each option line in the group.
+ #   $labels -> (optional)
+-#              A pointer to an associative array of labels to print next to each item
++#              A pointer to a hash of labels to print next to each item
+ #              in the form $label{'value'}="Long explanatory label".
+ #              Otherwise the provided values are used as the labels.
+ #   $labeled -> (optional)
+@@ -2501,9 +2524,9 @@
+ 
+     $name=$self->escapeHTML($name);
+     $result = qq/<optgroup label="$name"$other>\n/;
+-    foreach (@values) {
++    for (@values) {
+         if (/<optgroup/) {
+-            foreach (split(/\n/)) {
++            for (split(/\n/)) {
+                 my $selectit = $XHTML ? 'selected="selected"' : 'selected';
+                 s/(value="$selected")/$selectit $1/ if defined $selected;
+                 $result .= "$_\n";
+@@ -2541,7 +2564,7 @@
+ #   $size -> (optional) Size of the list.
+ #   $multiple -> (optional) If set, allow multiple selections.
+ #   $labels -> (optional)
+-#             A pointer to an associative array of labels to print next to each checkbox
++#             A pointer to a hash of labels to print next to each checkbox
+ #             in the form $label{'value'}="Long explanatory label".
+ #             Otherwise the provided values are used as the labels.
+ # Returns:
 @@ -2560,6 +2583,7 @@
      $size = $size || scalar(@values);
  
@@ -809,6 +1187,33 @@
      my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
      my($has_size) = $size ? qq/ size="$size"/: '';
      my($other) = @other ? " @other" : '';
+@@ -2567,7 +2591,7 @@
+     $name=$self->escapeHTML($name);
+     $tabindex = $self->element_tab($tabindex);
+     $result = qq/<select name="$name" $tabindex$has_size$is_multiple$other>\n/;
+-    foreach (@values) {
++    for (@values) {
+ 	my($selectit) = $self->_selected($selected{$_});
+ 	my($label) = $_;
+ 	$label = $labels->{$_} if defined($labels) && defined($labels->{$_});
+@@ -2607,7 +2631,7 @@
+ 	@value = ref($default) ? @{$default} : $default;
+ 	$do_override = $override;
+     } else {
+-	foreach ($default,$override, at other) {
++	for ($default,$override, at other) {
+ 	    push(@value,$_) if defined($_);
+ 	}
+     }
+@@ -2617,7 +2641,7 @@
+     @value = @prev if !$do_override && @prev;
+ 
+     $name=$self->escapeHTML($name);
+-    foreach (@value) {
++    for (@value) {
+ 	$_ = defined($_) ? $self->escapeHTML($_,1) : '';
+ 	push @result,$XHTML ? qq(<input type="hidden" name="$name" value="$_" @other />)
+                             : qq(<input type="hidden" name="$name" value="$_" @other>);
 @@ -2692,12 +2716,13 @@
      my $request_uri =  unescape($self->request_uri) || '';
      my $query_str   =  $self->query_string;
@@ -931,7 +1336,26 @@
  }
  END_OF_FUNC
  
-@@ -2931,7 +2985,9 @@
+@@ -2899,15 +2953,15 @@
+ sub query_string {
+     my($self) = self_or_default(@_);
+     my($param,$value, at pairs);
+-    foreach $param ($self->param) {
++    for $param ($self->param) {
+ 	my($eparam) = escape($param);
+-	foreach $value ($self->param($param)) {
++	for $value ($self->param($param)) {
+ 	    $value = escape($value);
+             next unless defined $value;
+ 	    push(@pairs,"$eparam=$value");
+ 	}
+     }
+-    foreach (keys %{$self->{'.fieldnames'}}) {
++    for (keys %{$self->{'.fieldnames'}}) {
+       push(@pairs,".cgifields=".escape("$_"));
+     }
+     return join($USE_PARAM_SEMICOLONS ? ';' : '&', at pairs);
+@@ -2931,9 +2985,11 @@
      my($self,$search) = self_or_CGI(@_);
      my(%prefs,$type,$pref,$pat);
      
@@ -940,8 +1364,38 @@
 +                ? split(',',$self->http('accept'))
 +                : ();
  
-     foreach (@accept) {
+-    foreach (@accept) {
++    for (@accept) {
  	($pref) = /q=(\d\.\d+|\d+)/;
+ 	($type) = m#(\S+/[^;]+)#;
+ 	next unless $type;
+@@ -2952,7 +3008,7 @@
+     return $prefs{$search} if $prefs{$search};
+ 
+     # Didn't get it, so try pattern matching.
+-    foreach (keys %prefs) {
++    for (keys %prefs) {
+ 	next unless /\*/;       # not a pattern match
+ 	($pat = $_) =~ s/([^\w*])/\\$1/g; # escape meta characters
+ 	$pat =~ s/\*/.*/g; # turn it into a pattern
+@@ -3133,7 +3189,7 @@
+     $parameter =~ tr/-/_/;
+     return $ENV{"HTTP_\U$parameter\E"} if $parameter;
+     my(@p);
+-    foreach (keys %ENV) {
++    for (keys %ENV) {
+ 	push(@p,$_) if /^HTTP/;
+     }
+     return @p;
+@@ -3152,7 +3208,7 @@
+     $parameter =~ tr/-/_/;
+     return $ENV{"HTTPS_\U$parameter\E"} if $parameter;
+     my(@p);
+-    foreach (keys %ENV) {
++    for (keys %ENV) {
+ 	push(@p,$_) if /^HTTPS/;
+     }
+     return @p;
 @@ -3284,10 +3340,10 @@
  
      if (!$override && ($self->{'.fieldnames'}->{$name} || 
@@ -955,6 +1409,15 @@
      } else {
  	$selected{$defaults}++ if defined($defaults);
      }
+@@ -3326,7 +3382,7 @@
+ 	$input = join(" ", at lines);
+ 	@words = &shellwords($input);    
+     }
+-    foreach (@words) {
++    for (@words) {
+ 	s/\\=/%3D/g;
+ 	s/\\&/%26/g;	    
+     }
 @@ -3368,11 +3424,20 @@
  	    return;
  	}
@@ -987,6 +1450,15 @@
  	    next;
  	}
  
+@@ -3423,7 +3488,7 @@
+ 	  # together with the body for later parsing with an external
+ 	  # MIME parser module
+ 	  if ( $multipart ) {
+-	      foreach ( keys %header ) {
++	      for ( keys %header ) {
+ 		  print $filehandle "$_: $header{$_}${CRLF}";
+ 	      }
+ 	      print $filehandle "${CRLF}";
 @@ -3431,7 +3496,7 @@
  
  	  my ($data);
@@ -1014,6 +1486,24 @@
        }
      }
      return $returnvalue;
+@@ -3616,7 +3681,7 @@
+     my($element, $attributes) = @_;
+     return '' unless defined($attributes->{$element});
+     $attribs = ' ';
+-    foreach my $attrib (keys %{$attributes->{$element}}) {
++    for my $attrib (keys %{$attributes->{$element}}) {
+         (my $clean_attrib = $attrib) =~ s/^-//;
+         $attribs .= "@{[lc($clean_attrib)]}=\"$attributes->{$element}{$attrib}\" ";
+     }
+@@ -3627,7 +3692,7 @@
+ 
+ '_compile_all' => <<'END_OF_FUNC',
+ sub _compile_all {
+-    foreach (@_) {
++    for (@_) {
+ 	next if defined(&$_);
+ 	$AUTOLOAD = "CGI::$_";
+ 	_compile();
 @@ -3645,6 +3710,7 @@
  
  ################### Fh -- lightweight filehandle ###############
@@ -1070,6 +1560,15 @@
      unshift(@TEMP,$ENV{'TMPDIR'}) if defined $ENV{'TMPDIR'};
  
      # this feature was supposed to provide per-user tmpfiles, but
+@@ -3997,7 +4079,7 @@
+     #    : Refer to getpwuid() only at run-time if we're fortunate and have  UNIX.
+     # unshift(@TEMP,(eval {(getpwuid($>))[7]}).'/tmp') if $CGI::OS eq 'UNIX' and $> != 0;
+ 
+-    foreach (@TEMP) {
++    for (@TEMP) {
+       do {$TMPDIRECTORY = $_; last} if -d $_ && -w _;
+     }
+   }
 @@ -4014,7 +4096,7 @@
  
  sub DESTROY {
@@ -1092,16 +1591,116 @@
      # this used to untaint, now it doesn't
      # $filename = $1;
      return bless \$filename;
-@@ -4109,6 +4191,8 @@
- 	     hr;
-    }
+@@ -4075,64 +4157,52 @@
  
-+   print end_html;
-+
- =head1 ABSTRACT
+ =head1 NAME
+ 
+-CGI - Simple Common Gateway Interface Class
++CGI - Handle Common Gateway Interface requests and responses
+ 
+ =head1 SYNOPSIS
+ 
+-  # CGI script that creates a fill-out form
+-  # and echoes back its values.
+-
+-  use CGI qw/:standard/;
+-  print header,
+-        start_html('A Simple Example'),
+-        h1('A Simple Example'),
+-        start_form,
+-        "What's your name? ",textfield('name'),p,
+-        "What's the combination?", p,
+-        checkbox_group(-name=>'words',
+-		       -values=>['eenie','meenie','minie','moe'],
+-		       -defaults=>['eenie','minie']), p,
+-        "What's your favorite color? ",
+-        popup_menu(-name=>'color',
+-	           -values=>['red','green','blue','chartreuse']),p,
+-        submit,
+-        end_form,
+-        hr;
+-
+-   if (param()) {
+-       my $name      = param('name');
+-       my $keywords  = join ', ',param('words');
+-       my $color     = param('color');
+-       print "Your name is",em(escapeHTML($name)),p,
+-	     "The keywords are: ",em(escapeHTML($keywords)),p,
+-	     "Your favorite color is ",em(escapeHTML($color)),
+-	     hr;
+-   }
++    use CGI;
+ 
+-=head1 ABSTRACT
++    my $q = CGI->new;
+ 
+-This perl library uses perl5 objects to make it easy to create Web
+-fill-out forms and parse their contents.  This package defines CGI
+-objects, entities that contain the values of the current query string
+-and other state variables.  Using a CGI object's methods, you can
+-examine keywords and parameters passed to your script, and create
+-forms whose initial values are taken from the current query (thereby
+-preserving state information).  The module provides shortcut functions
+-that produce boilerplate HTML, reducing typing and coding errors. It
+-also provides functionality for some of the more advanced features of
+-CGI scripting, including support for file uploads, cookies, cascading
+-style sheets, server push, and frames.
++    # Process an HTTP request
++     @values  = $q->param('form_field');
+ 
+-CGI.pm also provides a simple function-oriented programming style for
+-those who don't need its object-oriented features.
++     $fh      = $q->upload('file_field');
+ 
+-The current version of CGI.pm is available at
++     $riddle  = $query->cookie('riddle_name');
++     %answers = $query->cookie('answers');
++
++    # Prepare various HTTP responses
++    print $q->header();
++    print $q->header('application/json');
++
++	$cookie1 = $q->cookie(-name=>'riddle_name', -value=>"The Sphynx's Question");
++	$cookie2 = $q->cookie(-name=>'answers', -value=>\%answers);
++    print $q->header(
++        -type    => 'image/gif',
++        -expires => '+3d',
++        -cookie  => [$cookie1,$cookie2]
++        );
+ 
+-  http://www.genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
+-  ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
++   print  $q->redirect('http://somewhere.else/in/movie/land');
+ 
+ =head1 DESCRIPTION
+ 
++CGI.pm is a stable, complete and mature solution for processing and preparing
++HTTP requests and responses.  Major features including processing form
++submissions, file uploads, reading and writing cookies, query string generation
++and manipulation, and processing and preparing HTTP headers. Some HTML
++generation utilities are included as well.
++
++CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
++with built-in support for mod_perl and mod_perl2 as well as FastCGI.
++
++It has the benefit of having developed and refined over 10 years with input
++from dozens of contributors and being deployed on thousands of websites.
++CGI.pm has been included in the Perl distribution since Perl 5.4, and has
++become a de-facto standard.
++
+ =head2 PROGRAMMING STYLE
+ 
+ There are two styles of programming with CGI.pm, an object-oriented
+@@ -4327,7 +4397,7 @@
+     restore_parameters(IN);
+     close IN;
+ 
+-You can also initialize the query object from an associative array
++You can also initialize the query object from a hash
+ reference:
  
- This perl library uses perl5 objects to make it easy to create Web
-@@ -4392,8 +4476,7 @@
+     $query = new CGI( {'dinosaur'=>'barney',
+@@ -4392,8 +4462,7 @@
  the method will return a single value.
  
  If a value is not given in the query string, as in the queries
@@ -1111,7 +1710,7 @@
  
  
  If the parameter does not exist at all, then param() will return undef
-@@ -4477,6 +4560,10 @@
+@@ -4477,6 +4546,10 @@
  
     my $data = $query->param('POSTDATA');
  
@@ -1122,7 +1721,16 @@
  (If you don't know what the preceding means, don't worry about it.  It
  only affects people trying to use CGI for XML processing and other
  specialized tasks.)
-@@ -4812,6 +4899,16 @@
+@@ -4554,7 +4627,7 @@
+ 
+    open (OUT,">>test.out") || die;
+    $records = 5;
+-   foreach (0..$records) {
++   for (0..$records) {
+        my $q = new CGI;
+        $q->param(-name=>'counter',-value=>$_);
+        $q->save(\*OUT);
+@@ -4812,6 +4885,16 @@
  XHTML will automatically be disabled without needing to use this 
  pragma.
  
@@ -1139,7 +1747,16 @@
  =item -nph
  
  This makes CGI.pm produce a header appropriate for an NPH (no
-@@ -5388,7 +5485,7 @@
+@@ -5129,7 +5212,7 @@
+ 
+ All relative links will be interpreted relative to this tag.
+ You add arbitrary meta information to the header with the B<-meta>
+-argument.  This argument expects a reference to an associative array
++argument.  This argument expects a reference to a hash
+ containing name/value pairs of meta information.  These will be turned
+ into a series of header <meta> tags that look something like this:
+ 
+@@ -5388,7 +5471,7 @@
  If Apache's mod_rewrite is turned on, then the script name and path
  info probably won't match the request that the user sent. Set
  -rewrite=>1 (default) to return URLs that match what the user sent
@@ -1148,7 +1765,18 @@
  the URL after mod_rewrite's rules have run. Because the additional
  path information only makes sense in the context of the rewritten URL,
  -rewrite is set to false when you request path info in the URL.
-@@ -5987,24 +6084,27 @@
+@@ -5468,8 +5551,8 @@
+ 
+    print h1("Chapter","1"); # <h1>Chapter 1</h1>"
+ 
+-If the first argument is an associative array reference, then the keys
+-and values of the associative array become the HTML tag's attributes:
++If the first argument is a hash reference, then the keys
++and values of the hash become the HTML tag's attributes:
+ 
+    print a({-href=>'fred.html',-target=>'_new'},
+       "Open a new frame");
+@@ -5987,31 +6070,34 @@
  
  To be safe, use the I<upload()> function (new in version 2.47).  When
  called with the name of an upload field, I<upload()> returns a
@@ -1182,7 +1810,15 @@
  
  When a file is uploaded the browser usually sends along some
  information along with it in the format of headers.  The information
-@@ -6102,7 +6202,7 @@
+ usually includes the MIME content type.  Future browsers may send
+ other information as well (such as modification date and size). To
+ retrieve this information, call uploadInfo().  It returns a reference to
+-an associative array containing all the document headers.
++a hash containing all the document headers.
+ 
+        $filename = param('uploaded_file');
+        $type = uploadInfo($filename)->{'Content-Type'};
+@@ -6102,7 +6188,7 @@
  
     print popup_menu(-name=>'menu_name',
  			    -values=>['eenie','meenie','minie'],
@@ -1191,7 +1827,7 @@
            -labels=>\%labels,
            -attributes=>\%attributes);
  
-@@ -6125,7 +6225,8 @@
+@@ -6125,14 +6211,15 @@
  
  The optional third parameter (-default) is the name of the default
  menu choice.  If not specified, the first item will be the default.
@@ -1201,7 +1837,84 @@
  
  =item 4.
  
-@@ -6389,6 +6490,9 @@
+ The optional fourth parameter (-labels) is provided for people who
+ want to use different values for the user-visible label inside the
+ popup menu and the value returned to your script.  It's a pointer to an
+-associative array relating menu values to user-visible labels.  If you
++hash relating menu values to user-visible labels.  If you
+ leave this parameter blank, the menu values will be displayed by
+ default.  (You can also leave a label undefined if you want to).
+ 
+@@ -6140,8 +6227,8 @@
+ 
+ The optional fifth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ =back
+@@ -6193,7 +6280,7 @@
+ =item 3.
+ 
+ The optional third parameter (B<-labels>) allows you to pass a reference
+-to an associative array containing user-visible labels for one or more
++to a hash containing user-visible labels for one or more
+ of the menu items.  You can use this when you want the user to see one
+ menu string, but have the browser return your program a different one.
+ If you don't specify this, the value string will be used instead
+@@ -6220,8 +6307,8 @@
+ 
+ An optional sixth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ =back
+@@ -6281,7 +6368,7 @@
+ 
+ =item 5.
+ 
+-The optional sixth argument is a pointer to an associative array
++The optional sixth argument is a pointer to a hash
+ containing long user-visible labels for the list items (-labels).
+ If not provided, the values will be displayed.
+ 
+@@ -6289,8 +6376,8 @@
+ 
+ The optional sixth parameter (-attributes) is provided to assign
+ any of the common HTML attributes to an individual menu item. It's
+-a pointer to an associative array relating menu values to another
+-associative array with the attribute's name as the key and the
++a pointer to a hash relating menu values to another
++hash with the attribute's name as the key and the
+ attribute's value as the value.
+ 
+ When this form is processed, all selected list items will be returned as
+@@ -6354,7 +6441,7 @@
+ =back
+ 
+ 
+-The optional b<-labels> argument is a pointer to an associative array
++The optional b<-labels> argument is a pointer to a hash
+ relating the checkbox values to the user-visible labels that will be
+ printed next to them.  If not provided, the values will be used as the
+ default.
+@@ -6371,7 +6458,7 @@
+ 
+ The optional B<-attributes> argument is provided to assign any of the
+ common HTML attributes to an individual menu item. It's a pointer to
+-an associative array relating menu values to another associative array
++a hash relating menu values to another hash
+ with the attribute's name as the key and the attribute's value as the
+ value.
+ 
+@@ -6389,6 +6476,9 @@
    -tabindex => ['moe','minie','eenie','meenie']  # tab in this order
    -tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
  
@@ -1211,7 +1924,12 @@
  When the form is processed, all checked boxes will be returned as
  a list under the parameter name 'group_name'.  The values of the
  "on" checkboxes can be retrieved with:
-@@ -6546,6 +6650,9 @@
+@@ -6542,10 +6632,13 @@
+ 
+ The optional B<-attributes> argument is provided to assign any of the
+ common HTML attributes to an individual menu item. It's a pointer to
+-an associative array relating menu values to another associative array
++a hash relating menu values to another hash
  with the attribute's name as the key and the attribute's value as the
  value.
  
@@ -1221,7 +1939,102 @@
  When the form is processed, the selected radio button can
  be retrieved using:
  
-@@ -7658,10 +7765,8 @@
+@@ -6709,16 +6802,13 @@
+ 
+ button() produces a button that is compatible with Netscape 2.0's
+ JavaScript.  When it's pressed the fragment of JavaScript code
+-pointed to by the B<-onClick> parameter will be executed.  On
+-non-Netscape browsers this form element will probably not even
+-display.
++pointed to by the B<-onClick> parameter will be executed.
+ 
+ =head1 HTTP COOKIES
+ 
+-Netscape browsers versions 1.1 and higher, and all versions of
+-Internet Explorer, support a so-called "cookie" designed to help
+-maintain state within a browser session.  CGI.pm has several methods
+-that support cookies.
++Browsers support a so-called "cookie" designed to help maintain state
++within a browser session.  CGI.pm has several methods that support
++cookies.
+ 
+ A cookie is a name=value pair much like the named parameters in a CGI
+ query string.  CGI scripts create one or more cookies and send
+@@ -6793,8 +6883,8 @@
+ =item B<-value>
+ 
+ The value of the cookie.  This can be any scalar value,
+-array reference, or even associative array reference.  For example,
+-you can store an entire associative array into a cookie this way:
++array reference, or even hash reference.  For example,
++you can store an entire hash into a cookie this way:
+ 
+ 	$cookie=cookie(-name=>'family information',
+ 			       -value=>\%childrens_ages);
+@@ -6921,19 +7011,6 @@
+ 
+ =head1 SUPPORT FOR JAVASCRIPT
+ 
+-Netscape versions 2.0 and higher incorporate an interpreted language
+-called JavaScript. Internet Explorer, 3.0 and higher, supports a
+-closely-related dialect called JScript. JavaScript isn't the same as
+-Java, and certainly isn't at all the same as Perl, which is a great
+-pity. JavaScript allows you to programmatically change the contents of
+-fill-out forms, create new windows, and pop up dialog box from within
+-Netscape itself. From the point of view of CGI scripting, JavaScript
+-is quite useful for validating fill-out forms prior to submitting
+-them.
+-
+-You'll need to know JavaScript in order to use it. There are many good
+-sources in bookstores and on the web.
+-
+ The usual way to use JavaScript is to define a set of functions in a
+ <SCRIPT> block inside the HTML header and then to register event
+ handlers in the various elements of the page. Events include such
+@@ -7275,11 +7352,9 @@
+ 
+ =item B<raw_cookie()>
+ 
+-Returns the HTTP_COOKIE variable, an HTTP extension implemented by
+-Netscape browsers version 1.1 and higher, and all versions of Internet
+-Explorer.  Cookies have a special format, and this method call just
+-returns the raw form (?cookie dough).  See cookie() for ways of
+-setting and retrieving cooked cookies.
++Returns the HTTP_COOKIE variable.  Cookies have a special format, and
++this method call just returns the raw form (?cookie dough).  See
++cookie() for ways of setting and retrieving cooked cookies.
+ 
+ Called with no parameters, raw_cookie() returns the packed cookie
+ structure.  You can separate it into individual cookies by splitting
+@@ -7293,7 +7368,7 @@
+ Returns the HTTP_USER_AGENT variable.  If you give
+ this method a single argument, it will attempt to
+ pattern match on it, allowing you to do something
+-like user_agent(netscape);
++like user_agent(Mozilla);
+ 
+ =item B<path_info()>
+ 
+@@ -7476,7 +7551,7 @@
+   use CGI qw/:push -nph/;
+   $| = 1;
+   print multipart_init(-boundary=>'----here we go!');
+-  foreach (0 .. 4) {
++  for (0 .. 4) {
+       print multipart_start(-type=>'text/plain'),
+             "The current time is ",scalar(localtime),"\n";
+       if ($_ < 4) {
+@@ -7532,9 +7607,6 @@
+ Users interested in server push applications should also have a look
+ at the CGI::Push module.
+ 
+-Only Netscape Navigator supports server push.  Internet Explorer
+-browsers do not.
+-
+ =head1 Avoiding Denial of Service Attacks
+ 
+ A potential problem with CGI.pm is that, by default, it attempts to
+@@ -7658,10 +7730,8 @@
  
  =head1 AUTHOR INFORMATION
  
@@ -1234,3 +2047,12 @@
  
  Address bug reports and comments to: lstein at cshl.org.  When sending
  bug reports, please provide the version of CGI.pm, the version of
+@@ -7788,7 +7858,7 @@
+ 
+ 	   print "<h2>Here are the current settings in this form</h2>";
+ 
+-	   foreach $key (param) {
++	   for $key (param) {
+ 	      print "<strong>$key</strong> -> ";
+ 	      @values = param($key);
+ 	      print join(", ", at values),"<br>\n";


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-9/perl.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- perl.spec	7 Apr 2009 10:34:07 -0000	1.191
+++ perl.spec	8 Apr 2009 09:36:05 -0000	1.192
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        66%{?dist}
+Release:        67%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -190,7 +190,7 @@
 Patch102:	perl-update-Archive-Tar.patch
 %define			    Archive_Tar_version 1.46
 Patch103:	perl-update-CGI.patch
-%define			    CGI_version 3.42
+%define			    CGI_version 3.43
 Patch104:	perl-update-ExtUtils-CBuilder.patch
 %define			    ExtUtils_CBuilder_version 0.24
 Patch105:	perl-update-File-Fetch.patch
@@ -229,11 +229,6 @@
 # patches File-Fetch and CPAN
 Patch201:	perl-5.10.0-links.patch
 
-# Fix CGI::escape to work with all strings, started as #472571,
-# brought upstream as http://rt.cpan.org/Public/Bug/Display.html?id=34528,
-# accepted there for CGI.pm-3.43
-Patch202:	perl-CGI-escape.patch
-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -1004,7 +999,6 @@
 %patch117 -p1
 %patch118 -p1
 %patch201 -p1
-%patch202 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1269,7 +1263,6 @@
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
-	'Fedora Patch202: Fix CGI::escape to work with all strings' \
 	%{nil}
 
 rm patchlevel.bak
@@ -1894,6 +1887,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-67
+- update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch
+
 * Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-66
 - fix CGI::escape for all strings (#472571)
 - perl-CGI-t-util-58.patch: Do not distort lib/CGI/t/util-58.t


--- perl-CGI-escape.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Apr  8 09:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:40:28 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408093937.53B0610F871@bastion2.fedora.phx.redhat.com>

ltinkl has set the watchbugzilla acl on kdetoys (Fedora 9) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:40:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:40:32 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408093942.0A31D10F878@bastion2.fedora.phx.redhat.com>

ltinkl has set the watchcommits acl on kdetoys (Fedora 9) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:39:47 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408093947.0E36210F87C@bastion2.fedora.phx.redhat.com>

ltinkl has set the commit acl on kdetoys (Fedora 9) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:40:41 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408093951.32C1B10F889@bastion2.fedora.phx.redhat.com>

ltinkl has set the approveacls acl on kdetoys (Fedora 9) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:41:09 +0000
Subject: [pkgdb] kdetoys: ltinkl has requested watchbugzilla
Message-ID: <20090408094018.E7B6010F86B@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:40:21 +0000
Subject: [pkgdb] kdetoys: ltinkl has requested commit
Message-ID: <20090408094020.91B8110F872@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:41:13 +0000
Subject: [pkgdb] kdetoys: ltinkl has requested watchcommits
Message-ID: <20090408094023.6C26910F881@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 09:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 09:41:17 +0000
Subject: [pkgdb] kdetoys: ltinkl has requested approveacls
Message-ID: <20090408094025.C85A010F884@bastion2.fedora.phx.redhat.com>

ltinkl has requested the approveacls acl on kdetoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From ovasik at fedoraproject.org  Wed Apr  8 09:43:11 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  8 Apr 2009 09:43:11 +0000 (UTC)
Subject: rpms/star/devel star-1.5-stdioconflict.patch, NONE, 1.1 star.spec, 
	1.46, 1.47
Message-ID: <20090408094311.017EB7011A@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/star/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17666

Modified Files:
	star.spec 
Added Files:
	star-1.5-stdioconflict.patch 
Log Message:
fix build failure due to symbols conflicting with stdio(#494213)

star-1.5-stdioconflict.patch:

--- NEW FILE star-1.5-stdioconflict.patch ---
diff -urNp star-1.5-orig/include/schily/schily.h star-1.5/include/schily/schily.h
--- star-1.5-orig/include/schily/schily.h	2008-02-16 16:32:01.000000000 +0100
+++ star-1.5/include/schily/schily.h	2009-04-08 10:49:17.000000000 +0200
@@ -113,7 +113,7 @@ extern	int	fexecle __PR((const char *, F
 		/* 6th arg not const, fexecv forces av[ac] = NULL */
 extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
 							char **));
-extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
+extern	int	sch_fexecve __PR((const char *, FILE *, FILE *, FILE *,
 					char * const *, char * const *));
 extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
 extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
@@ -243,7 +243,7 @@ extern	char	*fillbytes __PR((void *, int
 extern	char	*findbytes __PR((const void *, int, char));
 extern	int	findline __PR((const char *, char, const char *,
 							int, char **, int));
-extern	int	getline __PR((char *, int));
+extern	int	sch_getline __PR((char *, int));
 extern	int	getstr __PR((char *, int));
 extern	int	breakline __PR((char *, char, char **, int));
 extern	int	getallargs __PR((int *, char * const**, const char *, ...));
diff -urNp star-1.5-orig/lib/fexec.c star-1.5/lib/fexec.c
--- star-1.5-orig/lib/fexec.c	2007-07-01 12:04:35.000000000 +0200
+++ star-1.5/lib/fexec.c	2009-04-08 10:54:05.000000000 +0200
@@ -165,7 +165,7 @@ fexecle(name, in, out, err, va_alist)
 	} while (p != NULL);
 	va_end(args);
 
-	ret = fexecve(name, in, out, err, av, env);
+	ret = sch_fexecve(name, in, out, err, av, env);
 	if (av != xav)
 		free(av);
 	return (ret);
@@ -179,11 +179,11 @@ fexecv(name, in, out, err, ac, av)
 	char *av[];
 {
 	av[ac] = NULL;			/*  force list to be null terminated */
-	return (fexecve(name, in, out, err, av, environ));
+	return (sch_fexecve(name, in, out, err, av, environ));
 }
 
 EXPORT int
-fexecve(name, in, out, err, av, env)
+sch_fexecve(name, in, out, err, av, env)
 	const char *name;
 	FILE *in, *out, *err;
 	char * const av[], * const env[];
diff -urNp star-1.5-orig/lib/libschily-mapvers star-1.5/lib/libschily-mapvers
--- star-1.5-orig/lib/libschily-mapvers	2007-10-06 15:21:55.000000000 +0200
+++ star-1.5/lib/libschily-mapvers	2009-04-08 10:54:21.000000000 +0200
@@ -77,7 +77,7 @@ global:
 	fexecl;
 	fexecle;
 	fexecv;
-	fexecve;
+	sch_fexecve;
 	ffileread;
 	ffilewrite;
 	fgetline;
@@ -123,7 +123,7 @@ global:
 	geterrno;
 	getfiles;
 	getfp;
-	getline;
+	sch_getline;
 	getmainfp;
 	#getstr;
 	#handlecond;
diff -urNp star-1.5-orig/lib/stdio/fgetline.c star-1.5/lib/stdio/fgetline.c
--- star-1.5-orig/lib/stdio/fgetline.c	2004-09-25 14:23:36.000000000 +0200
+++ star-1.5/lib/stdio/fgetline.c	2009-04-08 10:51:39.000000000 +0200
@@ -61,7 +61,7 @@ fgetline(f, buf, len)
 }
 
 EXPORT int
-getline(buf, len)
+sch_getline(buf, len)
 	char	*buf;
 	int	len;
 {
diff -urNp star-1.5-orig/libfind/find.c star-1.5/libfind/find.c
--- star-1.5-orig/libfind/find.c	2008-04-10 19:04:54.000000000 +0200
+++ star-1.5/libfind/find.c	2009-04-08 10:54:48.000000000 +0200
@@ -1730,7 +1730,7 @@ doexec(f, ac, av, state)
 #endif
 		av[ac] = NULL;	/* -exec {} \; is not NULL terminated */
 
-		fexecve(av[0], state->std[0], state->std[1], state->std[2],
+		sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
 							av, state->env);
 #ifdef	PLUS_DEBUG
 		error("argsize %d\n",


Index: star.spec
===================================================================
RCS file: /cvs/extras/rpms/star/devel/star.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- star.spec	26 Feb 2009 02:56:21 -0000	1.46
+++ star.spec	8 Apr 2009 09:42:40 -0000	1.47
@@ -4,13 +4,14 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-selinux.patch
 Patch3: star-1.5-changewarnSegv.patch
 Patch4: star-1.5-removenames_c.patch
+Patch5: star-1.5-stdioconflict.patch
 License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -29,6 +30,7 @@
 %endif
 %patch3 -p1 -b .changewarnSegv
 %patch4 -p1 -b .removenames
+%patch5 -p1 -b .conflict
 
 for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
         for AFILE in gcc cc; do
@@ -100,6 +102,10 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Wed Apr 08 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-4
+- fix build failure due to symbols conflicting
+  with stdio(#494213)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Wed Apr  8 09:51:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  8 Apr 2009 09:51:06 +0000 (UTC)
Subject: rpms/sat4j/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 sat4j.spec, 
	1.8, 1.9 sat4j-fetch.sh, 1.1, 1.2
Message-ID: <20090408095106.F2DC77011A@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/sat4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19762/devel

Modified Files:
	sources .cvsignore sat4j.spec sat4j-fetch.sh 
Log Message:
Update to 2.1.0.RC2.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2009 15:32:56 -0000	1.3
+++ sources	8 Apr 2009 09:50:36 -0000	1.4
@@ -1 +1 @@
-5bd60ff7fa9f53e709b8309c5c0c58e6  sat4j-2.0.3.tar.bz2
+2c4b4d3b7210d326a69fa830bc325ef7  sat4j-2.1.0.RC2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Feb 2009 15:32:57 -0000	1.3
+++ .cvsignore	8 Apr 2009 09:50:36 -0000	1.4
@@ -1,3 +1,4 @@
 org.sat4j.core-src.zip
 org.sat4j.pb-src.zip
 sat4j-2.0.3.tar.bz2
+sat4j-2.1.0.RC2.tar.bz2


Index: sat4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sat4j.spec	26 Feb 2009 15:32:57 -0000	1.8
+++ sat4j.spec	8 Apr 2009 09:50:36 -0000	1.9
@@ -1,17 +1,17 @@
 %define eclipse_base %{_libdir}/eclipse
 # We want the version to match that shipped in Eclipse's Orbit project
-%define qualifier 20081021
+%define qualifier 20090308
 
 Name:           sat4j
-Version:        2.0.3
-Release:        1%{?dist}
+Version:        2.1.0
+Release:        0.1.rc2%{?dist}
 Summary:        A library of SAT solvers written in Java
 
 Group:          Development/Libraries
 License:        EPL and LGPLv2
 URL:            http://www.sat4j.org/
 # Created by sh %{name}-fetch.sh
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.RC2.tar.bz2
 Source1:        %{name}-fetch.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +54,9 @@
 %{_javadir}/org.sat4j*
 
 %changelog
+* Wed Apr 8 2009 Alexander Kurtakov <akurtako at redhat.com> 2.1.0-0.1.rc2
+- Update to 2.1.0.RC2.
+
 * Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.3-1
 - Update to 2.0.3.
 


Index: sat4j-fetch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j-fetch.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sat4j-fetch.sh	26 Feb 2009 15:32:57 -0000	1.1
+++ sat4j-fetch.sh	8 Apr 2009 09:50:36 -0000	1.2
@@ -1,14 +1,14 @@
 #!/bin/sh
 name=sat4j
-tag=2_0_3
-version=2.0.3
+tag=2_1_0_RC2
+version=2.1.0
 tar_name=$name-$version
 
 rm -fr $tar_name && mkdir $tar_name
 pushd $tar_name
 
 # Fetch plugins
-svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/2_0_3 .
+svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/$tag .
 
 popd
 # create archive



From sindrepb at fedoraproject.org  Wed Apr  8 10:09:59 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Wed,  8 Apr 2009 10:09:59 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel
	awn-extras-applets-0.3.2.1-python-platform.patch, 1.3,
	1.4 awn-extras-applets.spec, 1.22, 1.23
Message-ID: <20090408100959.A8D577011A@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24837

Modified Files:
	awn-extras-applets-0.3.2.1-python-platform.patch 
	awn-extras-applets.spec 
Log Message:
fix patch

awn-extras-applets-0.3.2.1-python-platform.patch:

Index: awn-extras-applets-0.3.2.1-python-platform.patch
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets-0.3.2.1-python-platform.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- awn-extras-applets-0.3.2.1-python-platform.patch	5 Apr 2009 00:35:41 -0000	1.3
+++ awn-extras-applets-0.3.2.1-python-platform.patch	8 Apr 2009 10:09:29 -0000	1.4
@@ -1,178 +1,22 @@
-diff -up ./acinclude.m4.orig ./acinclude.m4
---- ./acinclude.m4.orig	2009-04-03 22:45:50.000000000 +0200
-+++ ./acinclude.m4	2009-04-03 22:48:32.000000000 +0200
-@@ -1,11 +1,404 @@
--m4_include([m4/python.m4])
-+dnl AC_PYTHON_DEVEL([version])
-+dnl 
-+dnl Originally copied from http://autoconf-archive.cryp.to/ac_python_devel.html
-+dnl (Original last modified 2007-07-31)
-+dnl 
-+dnl Copyright ?? 2007 Sebastian Huber <sebastian-huber at web.de>
-+dnl Copyright ?? 2007 Alan W. Irwin <irwin at beluga.phys.uvic.ca>
-+dnl Copyright ?? 2007 Rafael Laboissiere <rafael at laboissiere.net>
-+dnl Copyright ?? 2007 Andrew Collier <colliera at ukzn.ac.za>
-+dnl Copyright ?? 2007 Matteo Settenvini <matteo at member.fsf.org>
-+dnl Copyright ?? 2007 Horst Knorr <hk_classes at knoda.org>
-+dnl
-+dnl This program is free software: you can redistribute it and/or modify it
-+dnl under the terms of the GNU General Public License as published by the Free
-+dnl Software Foundation, either version 3 of the License, or (at your option)
-+dnl any later version.
-+dnl
-+dnl This program is distributed in the hope that it will be useful, but WITHOUT
-+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-+dnl more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License along with
-+dnl this program. If not, see <http://www.gnu.org/licenses/>.
-+dnl
-+dnl As a special exception, the respective Autoconf Macro's copyright owner
-+dnl gives unlimited permission to copy, distribute and modify the configure
-+dnl scripts that are the output of Autoconf when processing the Macro. You need
-+dnl not follow the terms of the GNU General Public License when using or
-+dnl distributing such scripts, even though portions of the text of the Macro
-+dnl appear in them. The GNU General Public License (GPL) does govern all other
-+dnl use of the material that constitutes the Autoconf Macro.
-+dnl
-+dnl This special exception to the GPL applies to versions of the Autoconf Macro
-+dnl released by the Autoconf Macro Archive. When you make and distribute a
-+dnl modified version of the Autoconf Macro, you may extend this special
-+dnl exception to the GPL to apply to your modified version as well.
-+dnl
-+AC_DEFUN([AC_PYTHON_DEVEL],[
-+        #
-+        # Allow the use of a (user set) custom python version
-+        #
-+        AC_ARG_VAR([PYTHON_VERSION],[The installed Python
-+                version to use, for example '2.3'. This string
-+                will be appended to the Python interpreter
-+                canonical name.])
-+
-+        AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-+        if test -z "$PYTHON"; then
-+           AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
-+           PYTHON_VERSION=""
-+        fi
-+
-+        #
-+        # Check for a version of Python >= 2.1.0
-+        #
-+        AC_MSG_CHECKING([for a version of Python >= 2.1.0])
-+        ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-+                ver = string.split(sys.version)[[0]]; \
-+                print ver >= '2.1.0'"`
-+        if test "$ac_supports_python_ver" != "True"; then
-+                if test -z "$PYTHON_NOVERSIONCHECK"; then
-+                        AC_MSG_RESULT([no])
-+                        AC_MSG_FAILURE([
-+This version of the AC@&t at _PYTHON_DEVEL macro
-+doesn't work properly with versions of Python before
-+2.1.0. You may need to re-run configure, setting the
-+variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
-+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
-+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
-+to something else than an empty string.
-+])
-+                else
-+                        AC_MSG_RESULT([skip at user request])
-+                fi
-+        else
-+                AC_MSG_RESULT([yes])
-+        fi
-+
-+        #
-+        # if the macro parameter ``version'' is set, honour it
-+        #
-+        if test -n "$1"; then
-+                AC_MSG_CHECKING([for a version of Python >= $1])
-+                ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-+                        ver = string.split(sys.version)[[0]]; \
-+                        print ver >= '$1'"`
-+                if test "$ac_supports_python_ver" = "True"; then
-+                   AC_MSG_RESULT([yes])
-+                else
-+                        AC_MSG_RESULT([no])
-+                        AC_MSG_ERROR([this package requires Python $1.
-+If you have it installed, but it isn't the default Python
-+interpreter in your system path, please pass the PYTHON_VERSION
-+variable to configure. See ``configure --help'' for reference.
-+])
-+                        PYTHON_VERSION=""
-+                fi
-+        fi
-+
-+        #
-+        # Check if you have distutils, else fail
-+        #
-+        AC_MSG_CHECKING([for the distutils Python package])
-+        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-+        if test -z "$ac_distutils_result"; then
-+                AC_MSG_RESULT([yes])
-+        else
-+                AC_MSG_RESULT([no])
-+                AC_MSG_ERROR([cannot import Python module "distutils".
-+Please check your Python installation. The error was:
-+$ac_distutils_result])
-+                PYTHON_VERSION=""
-+        fi
-+
-+        #
-+        # Check for Python include path
-+        #
-+        AC_MSG_CHECKING([for Python include path])
-+        if test -z "$PYTHON_CPPFLAGS"; then
-+                python_path=`$PYTHON -c "import distutils.sysconfig; \
-+                        print distutils.sysconfig.get_python_inc();"`
-+                if test -n "${python_path}"; then
-+                        python_path="-I$python_path"
-+                fi
-+                PYTHON_CPPFLAGS=$python_path
-+        fi
-+        AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-+        AC_SUBST([PYTHON_CPPFLAGS])
-+
-+        #
-+        # Check for Python library path
-+        #
-+        AC_MSG_CHECKING([for Python library path])
-+        if test -z "$PYTHON_LDFLAGS"; then
-+                # (makes two attempts to ensure we've got a version number
-+                # from the interpreter)
-+                py_version=`$PYTHON -c "from distutils.sysconfig import *; \
-+                        from string import join; \
-+                        print join(get_config_vars('VERSION'))"`
-+                if test "$py_version" == "[None]"; then
-+                        if test -n "$PYTHON_VERSION"; then
-+                                py_version=$PYTHON_VERSION
-+                        else
-+                                py_version=`$PYTHON -c "import sys; \
-+                                        print sys.version[[:3]]"`
-+                        fi
-+                fi
-+
-+                PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
-+                        from string import join; \
-+                        print '-L' + get_python_lib(0,1), \
-+                        '-lpython';"`$py_version
-+        fi
-+        AC_MSG_RESULT([$PYTHON_LDFLAGS])
-+        AC_SUBST([PYTHON_LDFLAGS])
-+
-+        #
-+        # Check for the site packages
-+        #
-+        AC_MSG_CHECKING([for Python site-packages path])
-+        AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-+        if test -z "$PYTHON_SITE_PKG"; then
-+                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-+                        print distutils.sysconfig.get_python_lib(0,0,prefix='${PYTHON_EXEC_PREFIX}');"`
-+        fi
-+        AC_MSG_RESULT([$PYTHON_SITE_PKG])
-+        AC_SUBST([PYTHON_SITE_PKG])
-+
-+        #
+=== modified file 'configure.ac'
+--- configure.ac	2009-04-05 03:47:19 +0000
++++ configure.ac	2009-04-07 23:09:51 +0000
+@@ -252,6 +252,7 @@
+ 
+ appletsdir="$datarootdir/avant-window-navigator/applets"
+ 
++AS_AC_EXPAND([PYTHON_PLATFORM_PKG], [$PYTHON_PLATFORM_PKG])
+ AS_AC_EXPAND(APPLETSDIR, $appletsdir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(LIBDIR, $libdir)
+
+=== modified file 'm4/python.m4'
+--- m4/python.m4	2008-01-13 23:05:09 +0000
++++ m4/python.m4	2009-04-07 23:09:51 +0000
+@@ -168,6 +168,17 @@
+         AC_SUBST([PYTHON_SITE_PKG])
+ 
+         #
 +        # Check for the platform-specific site packages directory
 +        #
 +        AC_MSG_CHECKING([for Python platform-specific site-packages path])
@@ -184,279 +28,13 @@
 +        AC_SUBST([PYTHON_PLATFORM_PKG])
 +
 +        #
-+        # libraries which must be linked in when embedding
-+        #
-+        AC_MSG_CHECKING(python extra libraries)
-+        if test -z "$PYTHON_EXTRA_LIBS"; then
-+           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-+                conf = distutils.sysconfig.get_config_var; \
-+                print conf('LOCALMODLIBS'), conf('LIBS')"`
-+        fi
-+        AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-+        AC_SUBST(PYTHON_EXTRA_LIBS)
-+
-+        #
-+        # linking flags needed when embedding
-+        #
-+        AC_MSG_CHECKING(python extra linking flags)
-+        if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-+                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-+                        conf = distutils.sysconfig.get_config_var; \
-+                        print conf('LINKFORSHARED')"`
-+        fi
-+        AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-+        AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-+
-+        #
-+        # final check to see if everything compiles alright
-+        #
-+        AC_MSG_CHECKING([consistency of all components of python development environment])
-+        AC_LANG_PUSH([C])
-+        # save current global flags
-+        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
-+        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
-+        AC_TRY_LINK([
-+                #include <Python.h>
-+        ],[
-+                Py_Initialize();
-+        ],[pythonexists=yes],[pythonexists=no])
-+
-+        AC_MSG_RESULT([$pythonexists])
-+
-+        if test ! "$pythonexists" = "yes"; then
-+           AC_MSG_ERROR([
-+  Could not link test program to Python. Maybe the main Python library has been
-+  installed in some non-standard library path. If so, pass it to configure,
-+  via the LDFLAGS environment variable.
-+  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
-+  ============================================================================
-+   ERROR!
-+   You probably have to install the development version of the Python package
-+   for your distribution.  The exact name of this package varies among them.
-+  ============================================================================
-+           ])
-+          PYTHON_VERSION=""
-+        fi
-+        AC_LANG_POP
-+        # turn back to default flags
-+        CPPFLAGS="$ac_save_CPPFLAGS"
-+        LIBS="$ac_save_LIBS"
-+
-+        #
-+        # all done!
-+        #
-+])
-+
-+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-+dnl Check if a module containing a given symbol is visible to python.
-+AC_DEFUN([AM_CHECK_PYMOD],
-+[AC_REQUIRE([AC_PYTHON_DEVEL])
-+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-+ifelse([$2],[], [prog="
-+import sys
-+try:
-+        import $1
-+except ImportError:
-+        sys.exit(1)
-+except:
-+        sys.exit(0)
-+sys.exit(0)"], [prog="
-+import $1
-+$1.$2"])
-+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-+  then
-+    eval "py_cv_mod_$py_mod_var=yes"
-+  else
-+    eval "py_cv_mod_$py_mod_var=no"
-+  fi
-+])
-+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-+if test "x$py_val" != xno; then
-+  AC_MSG_RESULT(yes)
-+  ifelse([$3], [],, [$3
-+])dnl
-+else
-+  AC_MSG_RESULT(no)
-+  ifelse([$4], [],, [$4
-+])dnl
-+fi
-+])
-+
-+dnl
-+dnl JH_ADD_CFLAG(FLAG)
-+dnl checks whether the C compiler supports the given flag, and if so, adds
-+dnl it to $CFLAGS.  If the flag is already present in the list, then the
-+dnl check is not performed.
-+AC_DEFUN([JH_ADD_CFLAG],
-+[
-+case " $CFLAGS " in
-+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
-+  ;;
-+*)
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS $1"
-+  AC_MSG_CHECKING([whether [$]CC understands $1])
-+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
-+  AC_MSG_RESULT($jh_has_option)
-+  if test $jh_has_option = no; then
-+    CFLAGS="$save_CFLAGS"
-+  fi
-+  ;;
-+esac])
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH(gconf-source, 
-+  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
- 
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH(gconf-schema-file-dir, 
-+  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+     [  --disable-schemas-install	Disable the schemas installation],
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
-+# vala.m4 serial 1 (vala @VERSION@)
-+dnl Autoconf scripts for the Vala compiler
-+dnl Copyright (C) 2007  Mathias Hasselmann
-+dnl
-+dnl This library is free software; you can redistribute it and/or
-+dnl modify it under the terms of the GNU Lesser General Public
-+dnl License as published by the Free Software Foundation; either
-+dnl version 2 of the License, or (at your option) any later version.
-+
-+dnl This library is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl Lesser General Public License for more details.
-+
-+dnl You should have received a copy of the GNU Lesser General Public
-+dnl License along with this library; if not, write to the Free Software
-+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-+dnl
-+dnl Author:
-+dnl 	Mathias Hasselmann <mathias.hasselmann at gmx.de>
-+dnl --------------------------------------------------------------------------
-+
-+dnl VALA_PROG_VALAC([MINIMUM-VERSION])
-+dnl
-+dnl Check whether the Vala compiler exists in `PATH'. If it is found the
-+dnl variable VALAC is set. Optionally a minimum release number of the compiler
-+dnl can be requested.
-+dnl --------------------------------------------------------------------------
-+AC_DEFUN([VALA_PROG_VALAC],[
-+  AC_PATH_PROG([VALAC], [valac], [])
-+  AC_SUBST(VALAC)
-+
-+  if test -z "x${VALAC}"; then
-+    AC_MSG_WARN([No Vala compiler found. You will not be able to recompile .vala source files.])
-+  elif test -n "x$1"; then
-+    AC_REQUIRE([AC_PROG_AWK])
-+    AC_MSG_CHECKING([valac is at least version $1])
-+
-+    if "${VALAC}" --version | "${AWK}" -v r='$1' 'function vn(s) { if (3 == split(s,v,".")) return (v[1]*1000+v[2])*1000+v[3]; else exit 2; } /^Vala / { exit vn(r) > vn($[2]) }'; then
-+      AC_MSG_RESULT([yes])
-+    else
-+      AC_MSG_RESULT([no])
-+      AC_MSG_ERROR([Vala $1 not found.])
-+    fi
-+  fi
-+])
-+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
-+dnl autostars m4 macro for expanding directories using configure's prefix
-+dnl
-+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-+dnl
-+dnl Copying and distribution of this file, with or without modification,
-+dnl are permitted in any medium without royalty provided the copyright
-+dnl notice and this notice are preserved.
-+dnl
- dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
- dnl
--dnl example
-+dnl example:
- dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
- dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
--
- AC_DEFUN([AS_AC_EXPAND],
- [
-   EXP_VAR=[$1]
-@@ -17,7 +410,7 @@ AC_DEFUN([AS_AC_EXPAND],
- 
-   dnl if no prefix given, then use /usr/local, the default prefix
-   if test "x$prefix" = "xNONE"; then
--    prefix=$ac_default_prefix
-+    prefix="$ac_default_prefix"
-   fi
-   dnl if no exec_prefix given, then use prefix
-   if test "x$exec_prefix" = "xNONE"; then
-@@ -28,7 +421,7 @@ AC_DEFUN([AS_AC_EXPAND],
-   dnl loop until it doesn't change anymore
-   while true; do
-     new_full_var="`eval echo $full_var`"
--    if test "x$new_full_var"="x$full_var"; then break; fi
-+    if test "x$new_full_var" = "x$full_var"; then break; fi
-     full_var=$new_full_var
-   done
- 
-@@ -40,3 +433,4 @@ AC_DEFUN([AS_AC_EXPAND],
-   prefix=$prefix_save
-   exec_prefix=$exec_prefix_save
- ])
-+
-diff -up ./configure.ac.orig ./configure.ac
---- ./configure.ac.orig	2009-04-03 22:46:03.000000000 +0200
-+++ ./configure.ac	2009-04-03 23:29:19.000000000 +0200
-@@ -38,6 +38,9 @@ dnl
- 
- AC_PYTHON_DEVEL()
- 
-+PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"`
-+AC_SUBST(PLATFORM)
-+
- PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version)
- PYGTK_CODEGEN_DEFINES="-DHAVE_PYCAIRO $PYGTK_CODEGEN_DEFINES";
- 
-@@ -252,6 +255,8 @@ AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_C
- 
- appletsdir="$datarootdir/avant-window-navigator/applets"
- 
-+AS_AC_EXPAND([PY_SITE_PKG], [$PYTHON_SITE_PKG])
-+AS_AC_EXPAND([PY_PLAT_PKG], [$PYTHON_PLATFORM_PKG])
- AS_AC_EXPAND(APPLETSDIR, $appletsdir)
- AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
- AS_AC_EXPAND(LIBDIR, $libdir)
-diff -up ./src/libawn-extras/bindings/python/Makefile.am.orig ./src/libawn-extras/bindings/python/Makefile.am
---- ./src/libawn-extras/bindings/python/Makefile.am.orig	2009-04-03 22:46:28.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.am	2009-04-03 22:47:30.000000000 +0200
+         # libraries which must be linked in when embedding
+         #
+         AC_MSG_CHECKING(python extra libraries)
+
+=== modified file 'src/libawn-extras/bindings/python/Makefile.am'
+--- src/libawn-extras/bindings/python/Makefile.am	2009-02-14 05:15:29 +0000
++++ src/libawn-extras/bindings/python/Makefile.am	2009-04-07 23:09:51 +0000
 @@ -1,7 +1,7 @@
  NULL =
  
@@ -466,7 +44,7 @@
  pyawn_extras_PYTHON =	\
  	__init__.py	\
  	awnlib.py	\
-@@ -19,7 +19,7 @@ INCLUDES = \
+@@ -19,7 +19,7 @@
  	$(NULL)
  
  # libawn-extras python extensions
@@ -475,24 +53,4 @@
  pyawn_extrasexec_LTLIBRARIES = _extras.la
  
  common_ldflags = -module -avoid-version
-diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
---- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-03 22:46:33.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-03 22:48:14.000000000 +0200
-@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
- NULL = 
- 
- # awn python scripts
--pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
-+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
- pyawn_extras_PYTHON = \
- 	__init__.py	\
- 	awnlib.py	\
-@@ -350,7 +350,7 @@ INCLUDES = \
- 
- 
- # libawn-extras python extensions
--pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
-+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
- pyawn_extrasexec_LTLIBRARIES = _extras.la
- common_ldflags = -module -avoid-version
- AWN_EXTRAS_DEFS = awn_extras.defs
+


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- awn-extras-applets.spec	5 Apr 2009 00:58:38 -0000	1.22
+++ awn-extras-applets.spec	8 Apr 2009 10:09:29 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -78,7 +78,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 
 %build
@@ -179,7 +179,7 @@
 
 
 %changelog
-* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-7
+* Tue Apr 02 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2.1-8
 - Add patch to fix build on x86_64
 - Enable webkit-gtk powered applets
 



From akurtakov at fedoraproject.org  Wed Apr  8 10:21:52 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  8 Apr 2009 10:21:52 +0000 (UTC)
Subject: rpms/icu4j/devel icu4j.spec, 1.16, 1.17 sources, 1.4, 1.5 .cvsignore,
	1.4, 1.5 icu4j-updatetimestamp.patch, 1.3, 1.4
Message-ID: <20090408102152.C91AA7011A@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27455/devel

Modified Files:
	icu4j.spec sources .cvsignore icu4j-updatetimestamp.patch 
Log Message:
Update to 4.0.1.


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- icu4j.spec	25 Feb 2009 06:45:34 -0000	1.16
+++ icu4j.spec	8 Apr 2009 10:21:22 -0000	1.17
@@ -49,14 +49,14 @@
 %endif
 
 Name:           icu4j
-Version:        3.8.1
-Release:        5%{?dist}
-Epoch:          0
+Version:        4.0.1
+Release:        0%{?dist}
+Epoch:          1
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
 URL:            http://www-306.ibm.com/software/globalization/icu/index.jsp
 Group:          Development/Libraries/Java
-Source0:        http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-src.jar
+Source0:        http://download.icu-project.org/files/icu4j/4.0.1/icu4j-4_0_1-src.jar
 Patch0:         %{name}-crosslink.patch
 # Update the MANIFEST.MF to have the same qualifier in the bundle as is
 # in Eclipse's Orbit project
@@ -123,8 +123,8 @@
 %prep
 %setup -q -c
 %patch0 -p0
-%patch2 -p0
-%patch3 -p0
+#%patch2 -p0
+#%patch3 -p0
 %patch4 -p0
 
 %{__sed} -i 's/\r//' license.html
@@ -142,7 +142,9 @@
 %else
 %ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
   -Declipse.basews=gtk -Declipse.baseos=linux \
-  -Declipse.basearch=%{eclipse_arch} jar docs eclipsePDEBuild
+  -Declipse.basearch=%{eclipse_arch} \
+  -Dicu4j.eclipse.build.version.string=4.0.1.v20090109 \
+  jar docs eclipsePDEBuild
 %endif
 
 %install
@@ -189,6 +191,9 @@
 %endif
 
 %changelog
+* Wed Apr 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-0
+- Update to 4.0.1.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.8.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2008 15:31:12 -0000	1.4
+++ sources	8 Apr 2009 10:21:22 -0000	1.5
@@ -1 +1 @@
-fd16dc861110419e615a7ce540a7676d  icu4j-3_8_1-src.jar
+025b460faf49ddfde020580c48392069  icu4j-4_0_1-src.jar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Jul 2008 15:31:12 -0000	1.4
+++ .cvsignore	8 Apr 2009 10:21:22 -0000	1.5
@@ -1 +1,2 @@
 icu4j-3_8_1-src.jar
+icu4j-4_0_1-src.jar

icu4j-updatetimestamp.patch:

Index: icu4j-updatetimestamp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j-updatetimestamp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icu4j-updatetimestamp.patch	11 Jul 2008 15:31:12 -0000	1.3
+++ icu4j-updatetimestamp.patch	8 Apr 2009 10:21:22 -0000	1.4
@@ -3,9 +3,9 @@
 @@ -27,4 +27,6 @@
  default.target.rt.version=J2SE15
  
- icu4j.plugin.impl.version.string=3.8.1
+ icu4j.plugin.impl.version.string=4.0.1
 -copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
 \ No newline at end of file
 +copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
 +
-+icu4j.eclipse.build.version.string=3.8.1.v20080530
++icu4j.eclipse.build.version.string=4.0.1.v20090109



From vcrhonek at fedoraproject.org  Wed Apr  8 10:22:33 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Wed,  8 Apr 2009 10:22:33 +0000 (UTC)
Subject: rpms/ypbind/F-10 ypbind.init,1.22,1.23 ypbind.spec,1.54,1.55
Message-ID: <20090408102233.056817011A@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/ypbind/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27645

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Remove LSB Header from init script


Index: ypbind.init
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-10/ypbind.init,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ypbind.init	11 Mar 2009 11:35:37 -0000	1.22
+++ ypbind.init	8 Apr 2009 10:22:02 -0000	1.23
@@ -12,16 +12,6 @@
 # processname: ypbind
 # config: /etc/yp.conf
 
-### BEGIN INIT INFO
-# Provides: $ypbind
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start|stop|restart|condrestart|try-restart|reload|force-reload|status NIS client
-# Description: This is a daemon which runs on NIS/YP clients and binds them to a NIS domain
-### END INIT INFO
-
 OTHER_YPBIND_OPTS=""
 
 # Source function library.


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-10/ypbind.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ypbind.spec	11 Mar 2009 11:35:37 -0000	1.54
+++ ypbind.spec	8 Apr 2009 10:22:02 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -92,6 +92,10 @@
 %doc README NEWS
 
 %changelog
+* Wed Apr  8 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.20.4-11
+- Remove LSB Header from init script
+  Resolves: #494827
+
 * Wed Mar 11 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.20.4-10
 - Fix init script
   Resolves: #489200



From akurtakov at fedoraproject.org  Wed Apr  8 10:26:29 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  8 Apr 2009 10:26:29 +0000 (UTC)
Subject: rpms/icu4j/devel icu4j.spec,1.17,1.18
Message-ID: <20090408102629.4EC107011A@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28667/devel

Modified Files:
	icu4j.spec 
Log Message:
Bump release.


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- icu4j.spec	8 Apr 2009 10:21:22 -0000	1.17
+++ icu4j.spec	8 Apr 2009 10:25:58 -0000	1.18
@@ -50,7 +50,7 @@
 
 Name:           icu4j
 Version:        4.0.1
-Release:        0%{?dist}
+Release:        1%{?dist}
 Epoch:          1
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -191,7 +191,7 @@
 %endif
 
 %changelog
-* Wed Apr 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-0
+* Wed Apr 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-1
 - Update to 4.0.1.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.8.1-5



From rrakus at fedoraproject.org  Wed Apr  8 10:41:39 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed,  8 Apr 2009 10:41:39 +0000 (UTC)
Subject: rpms/bash/devel bash40-011, NONE, 1.1 bash40-012, NONE,
	1.1 bash40-013, 
	NONE, 1.1 bash40-014, NONE, 1.1 bash40-015, NONE, 1.1 bash40-016,
	NONE, 1.1 bash.spec, 1.179, 1.180
Message-ID: <20090408104140.0A27D7011A@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32486

Modified Files:
	bash.spec 
Added Files:
	bash40-011 bash40-012 bash40-013 bash40-014 bash40-015 
	bash40-016 
Log Message:
Official upstream patch level 16


--- NEW FILE bash40-011 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-011

Bug-Reported-by:	Matt Zyzik <Matt at ice.filescope.com>n
Bug-Reference-ID:	<20090312015018.C00741383ED at ice.filescope.com>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00092.html

Bug-Description:

When using the new |& operator following a simple command with a redirection,
the redirection of stderr through the pipe was not performed under certain
circumstances.

Patch:

*** ../bash-4.0-patched/parse.y	2009-03-08 21:24:47.000000000 -0400
--- parse.y	2009-03-12 21:36:23.000000000 -0400
***************
*** 1123,1127 ****
  			  REDIRECT *r;
  
! 			  tc = $1;
  			  rd.dest = 1;
  			  r = make_redirection (2, r_duplicating_output, rd);
--- 1123,1127 ----
  			  REDIRECT *r;
  
! 			  tc = $1->type == cm_simple ? (COMMAND *)$1->value.Simple : $1;
  			  rd.dest = 1;
  			  r = make_redirection (2, r_duplicating_output, rd);
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 10
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 11
  
  #endif /* _PATCHLEVEL_H_ */



--- NEW FILE bash40-012 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-012

Bug-Reported-by:	"Clark J. Wang" <dearvoid at gmail.com>
Bug-Reference-ID:	<a96f63770903132300v7816dfb7hb7f48d46048bf3cb at mail.gmail.com>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00129.html

Bug-Description:

A case statement using the ;& pattern terminator followed immediately by
"esac" caused a core dump due to a null pointer dereference.

Patch:

*** ../bash-4.0-patched/execute_cmd.c	2009-02-13 16:41:41.000000000 -0500
--- execute_cmd.c	2009-03-14 13:23:00.000000000 -0400
***************
*** 2931,2935 ****
  		}
  	      while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = clauses->next));
! 	      if ((clauses->flags & CASEPAT_TESTNEXT) == 0)
  		EXIT_CASE ();
  	      else
--- 2931,2935 ----
  		}
  	      while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = clauses->next));
! 	      if (clauses == 0 || (clauses->flags & CASEPAT_TESTNEXT) == 0)
  		EXIT_CASE ();
  	      else
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 11
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 12
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-013 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-013

Bug-Reported-by:	jidanni at jidanni.org
Bug-Reference-ID:
Bug-Reference-URL:	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519165

Bug-Description:

Though references to $@ when there are no positional parameters will now
cause the shell to exit if the `errexit' option has been enabled, constructs
such as ${@:-foo} should not cause an exit.

Patch:

*** ../bash-4.0-patched/subst.c	2009-03-08 21:24:39.000000000 -0400
--- subst.c	2009-03-14 19:04:10.000000000 -0400
***************
*** 86,89 ****
--- 86,90 ----
  /* Flags for the `pflags' argument to param_expand() */
  #define PF_NOCOMSUB	0x01	/* Do not perform command substitution */
+ #define PF_IGNUNBOUND	0x02	/* ignore unbound vars even if -u set */
  
  /* These defs make it easier to use the editor. */
***************
*** 264,268 ****
  static int chk_arithsub __P((const char *, int));
  
! static WORD_DESC *parameter_brace_expand_word __P((char *, int, int));
  static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *));
  static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *));
--- 265,269 ----
  static int chk_arithsub __P((const char *, int));
  
! static WORD_DESC *parameter_brace_expand_word __P((char *, int, int, int));
  static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *));
  static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *));
***************
*** 5196,5202 ****
     NAME was found inside of a double-quoted expression. */
  static WORD_DESC *
! parameter_brace_expand_word (name, var_is_special, quoted)
       char *name;
!      int var_is_special, quoted;
  {
    WORD_DESC *ret;
--- 5197,5203 ----
     NAME was found inside of a double-quoted expression. */
  static WORD_DESC *
! parameter_brace_expand_word (name, var_is_special, quoted, pflags)
       char *name;
!      int var_is_special, quoted, pflags;
  {
    WORD_DESC *ret;
***************
*** 5230,5234 ****
  
        ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL,
! 			  (int *)NULL, (int *)NULL, 0);
        free (tt);
      }
--- 5231,5235 ----
  
        ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL,
! 			  (int *)NULL, (int *)NULL, pflags);
        free (tt);
      }
***************
*** 5291,5295 ****
    WORD_DESC *w;
  
!   w = parameter_brace_expand_word (name, var_is_special, quoted);
    t = w->word;
    /* Have to dequote here if necessary */
--- 5292,5296 ----
    WORD_DESC *w;
  
!   w = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND);
    t = w->word;
    /* Have to dequote here if necessary */
***************
*** 5308,5312 ****
      return (WORD_DESC *)NULL;
  
!   w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted);
    free (t);
  
--- 5309,5313 ----
      return (WORD_DESC *)NULL;
  
!   w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted, 0);
    free (t);
  
***************
*** 6659,6663 ****
      tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
    else
!     tdesc = parameter_brace_expand_word (name, var_is_special, quoted);
  
    if (tdesc)
--- 6660,6664 ----
      tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
    else
!     tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND);
  
    if (tdesc)
***************
*** 6990,6994 ****
        list = list_rest_of_args ();
  
!       if (list == 0 && unbound_vars_is_error)
  	{
  	  uerror[0] = '$';
--- 6991,6995 ----
        list = list_rest_of_args ();
  
!       if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
  	{
  	  uerror[0] = '$';
***************
*** 7052,7056 ****
        list = list_rest_of_args ();
  
!       if (list == 0 && unbound_vars_is_error)
  	{
  	  uerror[0] = '$';
--- 7053,7057 ----
        list = list_rest_of_args ();
  
!       if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
  	{
  	  uerror[0] = '$';


*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 12
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 13
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-014 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-014

Bug-Reported-by:	smallnow at gmail.com
Bug-Reference-ID:	<49C460FE.40307 at gmail.com>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00166.html

Bug-Description:

When the fc builtin is run in a command substitution from a shell with history
enabled, it does not correctly calculate the command on which to operate.

Patch:

*** ../bash-4.0-patched/builtins/fc.def	2009-01-04 14:32:22.000000000 -0500
--- builtins/fc.def	2009-03-21 14:03:43.000000000 -0400
***************
*** 89,92 ****
--- 89,93 ----
  extern int literal_history;
  extern int posixly_correct;
+ extern int subshell_environment, interactive_shell;
  
  extern int unlink __P((const char *));
***************
*** 173,177 ****
    register char *sep;
    int numbering, reverse, listing, execute;
!   int histbeg, histend, last_hist, retval, opt;
    FILE *stream;
    REPL *rlist, *rl;
--- 174,178 ----
    register char *sep;
    int numbering, reverse, listing, execute;
!   int histbeg, histend, last_hist, retval, opt, rh;
    FILE *stream;
    REPL *rlist, *rl;
***************
*** 276,279 ****
--- 277,282 ----
        fprintf (stderr, "%s\n", command);
        fc_replhist (command);	/* replace `fc -s' with command */
+       /* Posix says that the re-executed commands should be entered into the
+ 	 history. */
        return (parse_and_execute (command, "fc", SEVAL_NOHIST));
      }
***************
*** 294,298 ****
       so we check hist_last_line_added. */
  
!   last_hist = i - remember_on_history - hist_last_line_added;
  
    if (list)
--- 297,306 ----
       so we check hist_last_line_added. */
  
!   /* Even though command substitution through parse_and_execute turns off
!      remember_on_history, command substitution in a shell when set -o history
!      has been enabled (interactive or not) should use it in the last_hist
!      calculation as if it were on. */
!   rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
!   last_hist = i - rh - hist_last_line_added;
  
    if (list)
***************
*** 457,461 ****
       HIST_ENTRY **hlist;
  {
!   int sign, n, clen;
    register int i, j;
    register char *s;
--- 465,469 ----
       HIST_ENTRY **hlist;
  {
!   int sign, n, clen, rh;
    register int i, j;
    register char *s;
***************
*** 473,477 ****
       so we check hist_last_line_added.  This needs to agree with the
       calculation of last_hist in fc_builtin above. */
!   i -= remember_on_history + hist_last_line_added;
  
    /* No specification defaults to most recent command. */
--- 481,490 ----
       so we check hist_last_line_added.  This needs to agree with the
       calculation of last_hist in fc_builtin above. */
!   /* Even though command substitution through parse_and_execute turns off
!      remember_on_history, command substitution in a shell when set -o history
!      has been enabled (interactive or not) should use it in the last_hist
!      calculation as if it were on. */
!   rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
!   i -= rh + hist_last_line_added;
  
    /* No specification defaults to most recent command. */
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 13
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 14
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-015 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-015

Bug-Reported-by:	Lubomir Rintel <lkundrak at v3.sk>
Bug-Reference-ID:	<1237654931.32737.13.camel at localhost.localdomain>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00174.html

Bug-Description:

Deferring handling of signals which should cause the shell to terminate until
it is "safe" to run the handler functions does not work for some terminating
signals.

Patch:

*** ../bash-4.0-patched/sig.c	2009-01-04 14:32:41.000000000 -0500
--- sig.c	2009-03-22 14:47:56.000000000 -0400
***************
*** 449,452 ****
--- 449,494 ----
       int sig;
  {
+   /* If we get called twice with the same signal before handling it,
+      terminate right away. */
+   if (
+ #ifdef SIGHUP
+     sig != SIGHUP &&
+ #endif
+ #ifdef SIGINT
+     sig != SIGINT &&
+ #endif
+ #ifdef SIGDANGER
+     sig != SIGDANGER &&
+ #endif
+ #ifdef SIGPIPE
+     sig != SIGPIPE &&
+ #endif
+ #ifdef SIGALRM
+     sig != SIGALRM &&
+ #endif
+ #ifdef SIGTERM
+     sig != SIGTERM &&
+ #endif
+ #ifdef SIGXCPU
+     sig != SIGXCPU &&
+ #endif
+ #ifdef SIGXFSZ
+     sig != SIGXFSZ &&
+ #endif
+ #ifdef SIGVTALRM
+     sig != SIGVTALRM &&
+ #endif
+ #ifdef SIGLOST
+     sig != SIGLOST &&
+ #endif
+ #ifdef SIGUSR1
+     sig != SIGUSR1 &&
+ #endif
+ #ifdef SIGUSR2
+    sig != SIGUSR2 &&
+ #endif
+    sig == terminating_signal)
+     terminate_immediately = 1;
+ 
    terminating_signal = sig;
  
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 14
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 15
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-016 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-016

Bug-Reported-by:	Brian J. Murrell" <brian at interlinx.bc.ca>
Bug-Reference-ID:	<1237564627.7666.12.camel at pc.interlinx.bc.ca>
Bug-Reference-URL:http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00160.html

Bug-Description:

There are several problems with the handling of $LINENO in an ERR trap.

Patch:

*** ../bash-4.0-patched/trap.c	2009-01-16 17:07:53.000000000 -0500
--- trap.c	2009-03-20 21:37:00.000000000 -0400
***************
*** 756,760 ****
  
        flags = SEVAL_NONINT|SEVAL_NOHIST;
!       if (sig != DEBUG_TRAP && sig != RETURN_TRAP)
  	flags |= SEVAL_RESETLINE;
        if (function_code == 0)
--- 756,760 ----
  
        flags = SEVAL_NONINT|SEVAL_NOHIST;
!       if (sig != DEBUG_TRAP && sig != RETURN_TRAP && sig != ERROR_TRAP)
  	flags |= SEVAL_RESETLINE;
        if (function_code == 0)
*** ../bash-4.0-patched/execute_cmd.c	2009-02-13 16:41:41.000000000 -0500
--- execute_cmd.c	2009-03-21 14:16:11.000000000 -0400
***************
*** 569,572 ****
--- 569,573 ----
        /* Fork a subshell, turn off the subshell bit, turn off job
  	 control and call execute_command () on the command again. */
+       line_number_for_err_trap = line_number;
        paren_pid = make_child (savestring (make_command_string (command)),
  			      asynchronous);
***************
*** 611,615 ****
--- 612,619 ----
  		{
  		  last_command_exit_value = exec_result;
+ 		  save_line_number = line_number;
+ 		  line_number = line_number_for_err_trap;
  		  run_error_trap ();
+ 		  line_number = save_line_number;
  		}
  
***************
*** 767,771 ****
--- 771,777 ----
  	{
  	  last_command_exit_value = exec_result;
+ 	  line_number = line_number_for_err_trap;
  	  run_error_trap ();
+ 	  line_number = save_line_number;
  	}
  
***************
*** 2106,2109 ****
--- 2112,2116 ----
    COMMAND *tc, *second;
    int ignore_return, exec_result, was_error_trap, invert;
+   volatile int save_line_number;
  
    ignore_return = (command->flags & CMD_IGNORE_RETURN) != 0;
***************
*** 2175,2178 ****
--- 2182,2186 ----
        ignore_return = (command->flags & CMD_IGNORE_RETURN) != 0;
  
+       line_number_for_err_trap = line_number;
        exec_result = execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close);
  
***************
*** 2180,2184 ****
--- 2188,2195 ----
  	{
  	  last_command_exit_value = exec_result;
+ 	  save_line_number = line_number;
+ 	  line_number = line_number_for_err_trap;
  	  run_error_trap ();
+ 	  line_number = save_line_number;
  	}
  
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 15
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 16
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- bash.spec	30 Mar 2009 11:57:53 -0000	1.179
+++ bash.spec	8 Apr 2009 10:41:09 -0000	1.180
@@ -3,7 +3,7 @@
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -27,6 +27,12 @@
 Patch008: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-008
 Patch009: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-009
 Patch010: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-010
+Patch011: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-011
+Patch012: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-012
+Patch013: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-013
+Patch014: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-014
+Patch015: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-015
+Patch016: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-016
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -90,6 +96,12 @@
 %patch008 -p0 -b .008
 %patch009 -p0 -b .009
 %patch010 -p0 -b .010
+%patch011 -p0 -b .011
+%patch012 -p0 -b .012
+%patch013 -p0 -b .013
+%patch014 -p0 -b .014
+%patch015 -p0 -b .015
+%patch016 -p0 -b .016
 
 # Other patches
 %patch101 -p1 -b .security
@@ -276,6 +288,9 @@
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Apr 08 2009 Roman Rakus <rrakus at redhat.com> - 4.0-6
+- Official upstream patch level 16
+
 * Mon Mar 30 2009 Roman Rakus <rrakus at redhat.com> - 4.0-5
 - Split documentation, use bash-doc package
   Resolves: #492447



From kwizart at fedoraproject.org  Wed Apr  8 10:49:40 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed,  8 Apr 2009 10:49:40 +0000 (UTC)
Subject: rpms/gavl/devel gavl-1.1.0-system_libgdither.patch, NONE,
	1.1 gavl.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090408104940.D8ED77011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/gavl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2088/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gavl-1.1.0-system_libgdither.patch gavl.spec import.log 
Log Message:
Initial import for Rawhide


gavl-1.1.0-system_libgdither.patch:

--- NEW FILE gavl-1.1.0-system_libgdither.patch ---
diff -up gavl-1.1.0/configure.ac.gdither gavl-1.1.0/configure.ac
--- gavl-1.1.0/configure.ac.gdither	2008-09-30 22:41:05.000000000 +0200
+++ gavl-1.1.0/configure.ac	2009-03-24 01:32:40.000000000 +0100
@@ -189,6 +189,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
 AC_SUBST(TOP_SRCDIR)
 
 dnl
+dnl System libraries
+dnl
+
+AC_ARG_ENABLE(libgdither,
+  [  --enable-libgdither	System libgdither (experimental)])
+if test "${enable_libgdither}" = "yes"
+then
+  PKG_CHECK_MODULES(LIBGDITHER, libgdither,
+    [
+      AC_DEFINE(HAVE_LIBGDITHER, 1, [Define to 1 if you have the `libgdither' library (-lgdither).])
+      have_libgdither="true"
+    ],
+    [
+      have_libgdither="false"
+    ]
+  )
+fi
+AM_CONDITIONAL(HAVE_LIBGDITHER, [test x$have_libgdither = xtrue])
+
+
+dnl
 dnl Output variables
 dnl
 
diff -up gavl-1.1.0/gavl/Makefile.am.gdither gavl-1.1.0/gavl/Makefile.am
--- gavl-1.1.0/gavl/Makefile.am.gdither	2008-08-20 22:18:08.000000000 +0200
+++ gavl-1.1.0/gavl/Makefile.am	2009-03-24 01:32:40.000000000 +0100
@@ -39,8 +39,15 @@ threednow_libs = 
 threednow_subdirs =
 endif
 
+if HAVE_LIBGDITHER
+  MAYBE_LIBGDITHER_LA = @LIBGDITHER_LIBS@
+else
+  MAYBE_LIBGDITHER = libgdither
+  MAYBE_LIBGDITHER_LA = libgdither/libgdither.la
+endif
+
 
-SUBDIRS = hq c libgdither libsamplerate $(mmx_subdirs) \
+SUBDIRS = hq c $(MAYBE_LIBGDITHER) libsamplerate $(mmx_subdirs) \
 $(sse_subdirs) \
 $(sse2_subdirs) \
 $(sse3_subdirs) \
@@ -104,7 +111,7 @@ $(sse3_libs) \
 $(threednow_libs) \
 c/libgavl_c.la \
 hq/libgavl_hq.la \
-libgdither/libgdither.la \
+$(MAYBE_LIBGDITHER_LA) \
 libsamplerate/libsamplerate.la \
 -lm
 


--- NEW FILE gavl.spec ---
Name:           gavl
Version:        1.1.0
Release:        1%{?dist}
Summary:        A library for handling uncompressed audio and video data

Group:          System Environment/Libraries
License:        GPLv3+
URL:            http://gmerlin.sourceforge.net/
Source0:        http://downloads.sourceforge.net/gmerlin/gavl-%{version}.tar.gz
Patch1:         gavl-1.1.0-system_libgdither.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool

BuildRequires:  doxygen

BuildRequires:  libpng-devel >= 1.0.8
BuildRequires:  libgdither-devel
# Gavl use an internal tweaked libsamplerate version
# ufortunately the libsamplerate doesn't want a patch 
# that will break ABI
#BuildRequires: libsamplerate-devel



%description
Gavl is a library for handling and converting uncompressed audio and
video data. It provides datatypes for audio/video formats and standardized
structures to store the data. It supports converting between all formats.
Some conversion functions are available in multiple versions (MMX...),
which are selected by compile time configuration, CPU autodetection and
user options.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch1 -p1 -b .gdither

#Disable buildtime cpu detection
sed -i -i 's/LQT_TRY_CFLAGS/dnl LQT_TRY_CFLAGS/g' configure.ac
sed -i -i 's/LQT_OPT_CFLAGS/dnl LQT_OPT_CFLAGS/g' configure.ac

#Regenerate build tool
sh autogen.sh


%build
%configure \
  --enable-debug \
  --disable-static \
  --with-cpuflags=none \
  --disable-cpu-clip \
  --enable-libgdither


make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Prevent timestamps build difference
touch -r include/gavl/gavl.h $RPM_BUILD_ROOT%{_includedir}/gavl/gavl_version.h


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/gavl/apiref/
%{_includedir}/gavl/
%{_libdir}/*.so
%{_libdir}/pkgconfig/gavl.pc


%changelog
* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.0-1
- Update to 1.1.0
- Disable buildtime CPU detection.

* Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Update to 1.0.1

* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.0.0-2
- Add --enable-libgdither for system libgdither
- Add --enable-debug to disable LQT_OPT_CFLAGS
- Add -DHAVE_GAVLCONFIG_H to include gavlconfig.h when needed

* Mon May 19 2008 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 api stable

* Mon May 19 2008 kwizart < kwizart at gmail.com > - 0.2.7-4
- Initial package for Fedora


--- NEW FILE import.log ---
gavl-1_1_0-1_fc10:HEAD:gavl-1.1.0-1.fc10.src.rpm:1239187747


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:32:00 -0000	1.1
+++ .cvsignore	8 Apr 2009 10:49:10 -0000	1.2
@@ -0,0 +1 @@
+gavl-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:32:00 -0000	1.1
+++ sources	8 Apr 2009 10:49:10 -0000	1.2
@@ -0,0 +1 @@
+8a631a3468f4fd4213c4ec57d1795e14  gavl-1.1.0.tar.gz



From vcrhonek at fedoraproject.org  Wed Apr  8 10:53:39 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Wed,  8 Apr 2009 10:53:39 +0000 (UTC)
Subject: rpms/ypbind/devel ypbind.init,1.22,1.23 ypbind.spec,1.61,1.62
Message-ID: <20090408105339.DEBBA7011A@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/ypbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3196

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Remove LSB Header from init script


Index: ypbind.init
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ypbind.init	24 Nov 2008 13:59:40 -0000	1.22
+++ ypbind.init	8 Apr 2009 10:53:09 -0000	1.23
@@ -12,16 +12,6 @@
 # processname: ypbind
 # config: /etc/yp.conf
 
-### BEGIN INIT INFO
-# Provides: $ypbind
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start|stop|restart|condrestart|try-restart|reload|force-reload|status NIS client
-# Description: This is a daemon which runs on NIS/YP clients and binds them to a NIS domain
-### END INIT INFO
-
 OTHER_YPBIND_OPTS=""
 
 # Source function library.


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ypbind.spec	18 Mar 2009 12:19:32 -0000	1.61
+++ ypbind.spec	8 Apr 2009 10:53:09 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -97,6 +97,10 @@
 %doc README NEWS
 
 %changelog
+* Wed Apr  8 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-18
+- Remove LSB Header from init script
+  Resolves: #494827
+
 * Wed Mar 18 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-17
 - Fix nis.sh SELinux issue
   Resolves: #488865



From kwizart at fedoraproject.org  Wed Apr  8 11:01:02 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed,  8 Apr 2009 11:01:02 +0000 (UTC)
Subject: rpms/gavl/F-10 gavl-1.1.0-system_libgdither.patch, NONE,
	1.1 gavl.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408110102.0EF7570137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/gavl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4246/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gavl-1.1.0-system_libgdither.patch gavl.spec import.log 
Log Message:
initial import for F-10


gavl-1.1.0-system_libgdither.patch:

--- NEW FILE gavl-1.1.0-system_libgdither.patch ---
diff -up gavl-1.1.0/configure.ac.gdither gavl-1.1.0/configure.ac
--- gavl-1.1.0/configure.ac.gdither	2008-09-30 22:41:05.000000000 +0200
+++ gavl-1.1.0/configure.ac	2009-03-24 01:32:40.000000000 +0100
@@ -189,6 +189,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
 AC_SUBST(TOP_SRCDIR)
 
 dnl
+dnl System libraries
+dnl
+
+AC_ARG_ENABLE(libgdither,
+  [  --enable-libgdither	System libgdither (experimental)])
+if test "${enable_libgdither}" = "yes"
+then
+  PKG_CHECK_MODULES(LIBGDITHER, libgdither,
+    [
+      AC_DEFINE(HAVE_LIBGDITHER, 1, [Define to 1 if you have the `libgdither' library (-lgdither).])
+      have_libgdither="true"
+    ],
+    [
+      have_libgdither="false"
+    ]
+  )
+fi
+AM_CONDITIONAL(HAVE_LIBGDITHER, [test x$have_libgdither = xtrue])
+
+
+dnl
 dnl Output variables
 dnl
 
diff -up gavl-1.1.0/gavl/Makefile.am.gdither gavl-1.1.0/gavl/Makefile.am
--- gavl-1.1.0/gavl/Makefile.am.gdither	2008-08-20 22:18:08.000000000 +0200
+++ gavl-1.1.0/gavl/Makefile.am	2009-03-24 01:32:40.000000000 +0100
@@ -39,8 +39,15 @@ threednow_libs = 
 threednow_subdirs =
 endif
 
+if HAVE_LIBGDITHER
+  MAYBE_LIBGDITHER_LA = @LIBGDITHER_LIBS@
+else
+  MAYBE_LIBGDITHER = libgdither
+  MAYBE_LIBGDITHER_LA = libgdither/libgdither.la
+endif
+
 
-SUBDIRS = hq c libgdither libsamplerate $(mmx_subdirs) \
+SUBDIRS = hq c $(MAYBE_LIBGDITHER) libsamplerate $(mmx_subdirs) \
 $(sse_subdirs) \
 $(sse2_subdirs) \
 $(sse3_subdirs) \
@@ -104,7 +111,7 @@ $(sse3_libs) \
 $(threednow_libs) \
 c/libgavl_c.la \
 hq/libgavl_hq.la \
-libgdither/libgdither.la \
+$(MAYBE_LIBGDITHER_LA) \
 libsamplerate/libsamplerate.la \
 -lm
 


--- NEW FILE gavl.spec ---
Name:           gavl
Version:        1.1.0
Release:        1%{?dist}
Summary:        A library for handling uncompressed audio and video data

Group:          System Environment/Libraries
License:        GPLv3+
URL:            http://gmerlin.sourceforge.net/
Source0:        http://downloads.sourceforge.net/gmerlin/gavl-%{version}.tar.gz
Patch1:         gavl-1.1.0-system_libgdither.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool

BuildRequires:  doxygen

BuildRequires:  libpng-devel >= 1.0.8
BuildRequires:  libgdither-devel
# Gavl use an internal tweaked libsamplerate version
# ufortunately the libsamplerate doesn't want a patch 
# that will break ABI
#BuildRequires: libsamplerate-devel



%description
Gavl is a library for handling and converting uncompressed audio and
video data. It provides datatypes for audio/video formats and standardized
structures to store the data. It supports converting between all formats.
Some conversion functions are available in multiple versions (MMX...),
which are selected by compile time configuration, CPU autodetection and
user options.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch1 -p1 -b .gdither

#Disable buildtime cpu detection
sed -i -i 's/LQT_TRY_CFLAGS/dnl LQT_TRY_CFLAGS/g' configure.ac
sed -i -i 's/LQT_OPT_CFLAGS/dnl LQT_OPT_CFLAGS/g' configure.ac

#Regenerate build tool
sh autogen.sh


%build
%configure \
  --enable-debug \
  --disable-static \
  --with-cpuflags=none \
  --disable-cpu-clip \
  --enable-libgdither


make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Prevent timestamps build difference
touch -r include/gavl/gavl.h $RPM_BUILD_ROOT%{_includedir}/gavl/gavl_version.h


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/gavl/apiref/
%{_includedir}/gavl/
%{_libdir}/*.so
%{_libdir}/pkgconfig/gavl.pc


%changelog
* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.0-1
- Update to 1.1.0
- Disable buildtime CPU detection.

* Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Update to 1.0.1

* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.0.0-2
- Add --enable-libgdither for system libgdither
- Add --enable-debug to disable LQT_OPT_CFLAGS
- Add -DHAVE_GAVLCONFIG_H to include gavlconfig.h when needed

* Mon May 19 2008 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 api stable

* Mon May 19 2008 kwizart < kwizart at gmail.com > - 0.2.7-4
- Initial package for Fedora


--- NEW FILE import.log ---
gavl-1_1_0-1_fc10:F-10:gavl-1.1.0-1.fc10.src.rpm:1239188220


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:32:00 -0000	1.1
+++ .cvsignore	8 Apr 2009 11:00:31 -0000	1.2
@@ -0,0 +1 @@
+gavl-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:32:00 -0000	1.1
+++ sources	8 Apr 2009 11:00:31 -0000	1.2
@@ -0,0 +1 @@
+8a631a3468f4fd4213c4ec57d1795e14  gavl-1.1.0.tar.gz



From kwizart at fedoraproject.org  Wed Apr  8 11:04:34 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed,  8 Apr 2009 11:04:34 +0000 (UTC)
Subject: rpms/gavl/F-9 gavl-1.1.0-system_libgdither.patch, NONE,
	1.1 gavl.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408110434.EC91E7011A@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/gavl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6929/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gavl-1.1.0-system_libgdither.patch gavl.spec import.log 
Log Message:
Initial import for F-9


gavl-1.1.0-system_libgdither.patch:

--- NEW FILE gavl-1.1.0-system_libgdither.patch ---
diff -up gavl-1.1.0/configure.ac.gdither gavl-1.1.0/configure.ac
--- gavl-1.1.0/configure.ac.gdither	2008-09-30 22:41:05.000000000 +0200
+++ gavl-1.1.0/configure.ac	2009-03-24 01:32:40.000000000 +0100
@@ -189,6 +189,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
 AC_SUBST(TOP_SRCDIR)
 
 dnl
+dnl System libraries
+dnl
+
+AC_ARG_ENABLE(libgdither,
+  [  --enable-libgdither	System libgdither (experimental)])
+if test "${enable_libgdither}" = "yes"
+then
+  PKG_CHECK_MODULES(LIBGDITHER, libgdither,
+    [
+      AC_DEFINE(HAVE_LIBGDITHER, 1, [Define to 1 if you have the `libgdither' library (-lgdither).])
+      have_libgdither="true"
+    ],
+    [
+      have_libgdither="false"
+    ]
+  )
+fi
+AM_CONDITIONAL(HAVE_LIBGDITHER, [test x$have_libgdither = xtrue])
+
+
+dnl
 dnl Output variables
 dnl
 
diff -up gavl-1.1.0/gavl/Makefile.am.gdither gavl-1.1.0/gavl/Makefile.am
--- gavl-1.1.0/gavl/Makefile.am.gdither	2008-08-20 22:18:08.000000000 +0200
+++ gavl-1.1.0/gavl/Makefile.am	2009-03-24 01:32:40.000000000 +0100
@@ -39,8 +39,15 @@ threednow_libs = 
 threednow_subdirs =
 endif
 
+if HAVE_LIBGDITHER
+  MAYBE_LIBGDITHER_LA = @LIBGDITHER_LIBS@
+else
+  MAYBE_LIBGDITHER = libgdither
+  MAYBE_LIBGDITHER_LA = libgdither/libgdither.la
+endif
+
 
-SUBDIRS = hq c libgdither libsamplerate $(mmx_subdirs) \
+SUBDIRS = hq c $(MAYBE_LIBGDITHER) libsamplerate $(mmx_subdirs) \
 $(sse_subdirs) \
 $(sse2_subdirs) \
 $(sse3_subdirs) \
@@ -104,7 +111,7 @@ $(sse3_libs) \
 $(threednow_libs) \
 c/libgavl_c.la \
 hq/libgavl_hq.la \
-libgdither/libgdither.la \
+$(MAYBE_LIBGDITHER_LA) \
 libsamplerate/libsamplerate.la \
 -lm
 


--- NEW FILE gavl.spec ---
Name:           gavl
Version:        1.1.0
Release:        1%{?dist}
Summary:        A library for handling uncompressed audio and video data

Group:          System Environment/Libraries
License:        GPLv3+
URL:            http://gmerlin.sourceforge.net/
Source0:        http://downloads.sourceforge.net/gmerlin/gavl-%{version}.tar.gz
Patch1:         gavl-1.1.0-system_libgdither.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool

BuildRequires:  doxygen

BuildRequires:  libpng-devel >= 1.0.8
BuildRequires:  libgdither-devel
# Gavl use an internal tweaked libsamplerate version
# ufortunately the libsamplerate doesn't want a patch 
# that will break ABI
#BuildRequires: libsamplerate-devel



%description
Gavl is a library for handling and converting uncompressed audio and
video data. It provides datatypes for audio/video formats and standardized
structures to store the data. It supports converting between all formats.
Some conversion functions are available in multiple versions (MMX...),
which are selected by compile time configuration, CPU autodetection and
user options.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch1 -p1 -b .gdither

#Disable buildtime cpu detection
sed -i -i 's/LQT_TRY_CFLAGS/dnl LQT_TRY_CFLAGS/g' configure.ac
sed -i -i 's/LQT_OPT_CFLAGS/dnl LQT_OPT_CFLAGS/g' configure.ac

#Regenerate build tool
sh autogen.sh


%build
%configure \
  --enable-debug \
  --disable-static \
  --with-cpuflags=none \
  --disable-cpu-clip \
  --enable-libgdither


make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Prevent timestamps build difference
touch -r include/gavl/gavl.h $RPM_BUILD_ROOT%{_includedir}/gavl/gavl_version.h


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/gavl/apiref/
%{_includedir}/gavl/
%{_libdir}/*.so
%{_libdir}/pkgconfig/gavl.pc


%changelog
* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.0-1
- Update to 1.1.0
- Disable buildtime CPU detection.

* Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Update to 1.0.1

* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.0.0-2
- Add --enable-libgdither for system libgdither
- Add --enable-debug to disable LQT_OPT_CFLAGS
- Add -DHAVE_GAVLCONFIG_H to include gavlconfig.h when needed

* Mon May 19 2008 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 api stable

* Mon May 19 2008 kwizart < kwizart at gmail.com > - 0.2.7-4
- Initial package for Fedora


--- NEW FILE import.log ---
gavl-1_1_0-1_fc10:F-9:gavl-1.1.0-1.fc10.src.rpm:1239188580


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:32:00 -0000	1.1
+++ .cvsignore	8 Apr 2009 11:04:03 -0000	1.2
@@ -0,0 +1 @@
+gavl-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:32:00 -0000	1.1
+++ sources	8 Apr 2009 11:04:04 -0000	1.2
@@ -0,0 +1 @@
+8a631a3468f4fd4213c4ec57d1795e14  gavl-1.1.0.tar.gz



From erikos at fedoraproject.org  Wed Apr  8 11:05:25 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  8 Apr 2009 11:05:25 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.37, 1.38 sources, 1.39,
	1.40 sugar.spec, 1.61, 1.62
Message-ID: <20090408110525.C1CA97011A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7263

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.5-1
- Remove fixed width from speaker palette #719
- Correctly close the input stream in file transfers #682




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	6 Apr 2009 20:22:04 -0000	1.37
+++ .cvsignore	8 Apr 2009 11:04:54 -0000	1.38
@@ -1 +1 @@
-sugar-0.84.4.tar.bz2
+sugar-0.84.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	6 Apr 2009 20:22:04 -0000	1.39
+++ sources	8 Apr 2009 11:04:55 -0000	1.40
@@ -1 +1 @@
-57a650efb9a9b79eca3a9bc16e5d54ca  sugar-0.84.4.tar.bz2
+7d31643aa83d257d98931af92a0ba1d8  sugar-0.84.5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sugar.spec	6 Apr 2009 20:22:04 -0000	1.61
+++ sugar.spec	8 Apr 2009 11:04:55 -0000	1.62
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.4
+Version: 0.84.5
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -140,6 +140,10 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.5-1
+- Remove fixed width from speaker palette #719
+- Correctly close the input stream in file transfers #682
+
 * Mon Apr 06 2009 Simon Schampijer <simon at schampijer.de> - 0.84.4-1
 - new german and spanish translations
 



From pbrobinson at fedoraproject.org  Wed Apr  8 11:16:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  8 Apr 2009 11:16:31 +0000 (UTC)
Subject: rpms/gupnp-vala/devel gupnp-vala.spec,1.2,1.3
Message-ID: <20090408111632.107C47011A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10359

Modified Files:
	gupnp-vala.spec 
Log Message:
- Rebuild


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/gupnp-vala.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gupnp-vala.spec	3 Apr 2009 18:37:35 -0000	1.2
+++ gupnp-vala.spec	8 Apr 2009 11:15:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gupnp-vala
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        GUPnP is a upnp framework. This adds vala language bindings
 
 Group:          Development/Languages
@@ -60,6 +60,9 @@
 %{_libdir}/pkgconfig/gupnp-vala-1.0.pc
 
 %changelog
+* Wed Apr  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.3-5
+- Rebuild
+
 * Fri Apr  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.3-3
 - Remove noarch, as its not due to the pkgconfig file
 



From erikos at fedoraproject.org  Wed Apr  8 11:23:38 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  8 Apr 2009 11:23:38 +0000 (UTC)
Subject: rpms/sugar/devel enable-logout.patch,1.1,NONE
Message-ID: <20090408112338.8F9177011A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12090

Removed Files:
	enable-logout.patch 
Log Message:
remove unused logout patch




--- enable-logout.patch DELETED ---



From caolanm at fedoraproject.org  Wed Apr  8 11:39:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 11:39:39 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch, NONE,
	1.1 openoffice.org.spec, 1.1871, 1.1872
Message-ID: <20090408113939.BDF7C7011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16657

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
Log Message:
Resolves: rhbz#494643 EMF polypolygons issue

openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch ---
Index: source/filter.vcl/wmf/enhwmf.cxx
===================================================================
RCS file: /cvs/util/svtools/source/filter.vcl/wmf/enhwmf.cxx,v
retrieving revision 1.39.114.1
diff -u -r1.39.114.1 enhwmf.cxx
--- openoffice.org.orig/svtools/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
+++ openoffice.org/svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
@@ -378,7 +378,7 @@
 				// Anzahl der Polygone:
 				*pWMF >> nPoly >> nGesPoints;
 
-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
 				{
 					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
 					{
@@ -390,10 +390,10 @@
 							pnPoints[ i ] = (UINT16)nPoints;
 						}
 
-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
+						if ( ( nGesPoints * (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
 						{
 							// Polygonpunkte holen:
-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
+							pPtAry  = new Point[ nGesPoints ];
 			
 							for ( i = 0; i < nGesPoints; i++ )
 							{
@@ -403,7 +403,7 @@
 							// PolyPolygon Actions erzeugen
 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
-							delete[] (char*) pPtAry;
+							delete[] pPtAry;
 						}
 						delete[] pnPoints;
 					}
@@ -1147,7 +1147,7 @@
 				pWMF->SeekRel( 0x10 );
 				// Anzahl der Polygone:
 				*pWMF >> nPoly >> nGesPoints;
-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
 				{
 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
 					{
@@ -1157,10 +1157,10 @@
 							*pWMF >> nPoints;
 							pnPoints[ i ] = (UINT16)nPoints;
 						}
-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
+						if ( ( nGesPoints * (sizeof(sal_uInt16)+sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
 						{
 							// Polygonpunkte holen:
-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
+							pPtAry  = new Point[ nGesPoints ];
 							for ( i = 0; i < nGesPoints; i++ )
 							{
 								*pWMF >> nX16 >> nY16;
@@ -1170,7 +1170,7 @@
 							// PolyPolygon Actions erzeugen
 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
-							delete[] (char*) pPtAry;
+							delete[] pPtAry;
 						}
 						delete[] pnPoints;
 					}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -u -r1.1871 -r1.1872
--- openoffice.org.spec	8 Apr 2009 08:49:57 -0000	1.1871
+++ openoffice.org.spec	8 Apr 2009 11:39:06 -0000	1.1872
@@ -131,6 +131,7 @@
 Patch56: ooo-build.ooo2497.filter.svg.patch
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
+Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1621,6 +1622,7 @@
 %patch56 -p1 -b .ooo2497.filter.svg.patch
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
 %patch58 -p0 -b .ooo100225.comphelper.vis.patch
+%patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4111,6 +4113,7 @@
 * Wed Apr 08 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
   hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi
+- Resolves: rhbz#494643 EMF polypolygons issue
 
 * Thu Apr 02 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.1
 - latest milestone



From caolanm at fedoraproject.org  Wed Apr  8 11:41:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 11:41:44 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch, NONE,
	1.1 openoffice.org.spec, 1.1723, 1.1724
Message-ID: <20090408114144.C67707011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17198

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
Log Message:
Resolves: rhbz#494643 EMF polypolygons issue

openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch ---
Index: source/filter.vcl/wmf/enhwmf.cxx
===================================================================
RCS file: /cvs/util/svtools/source/filter.vcl/wmf/enhwmf.cxx,v
retrieving revision 1.39.114.1
diff -u -r1.39.114.1 enhwmf.cxx
--- openoffice.org.orig/svtools/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
+++ openoffice.org/svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
@@ -378,7 +378,7 @@
 				// Anzahl der Polygone:
 				*pWMF >> nPoly >> nGesPoints;
 
-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
 				{
 					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
 					{
@@ -390,10 +390,10 @@
 							pnPoints[ i ] = (UINT16)nPoints;
 						}
 
-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
+						if ( ( nGesPoints * (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
 						{
 							// Polygonpunkte holen:
-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
+							pPtAry  = new Point[ nGesPoints ];
 			
 							for ( i = 0; i < nGesPoints; i++ )
 							{
@@ -403,7 +403,7 @@
 							// PolyPolygon Actions erzeugen
 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
-							delete[] (char*) pPtAry;
+							delete[] pPtAry;
 						}
 						delete[] pnPoints;
 					}
@@ -1147,7 +1147,7 @@
 				pWMF->SeekRel( 0x10 );
 				// Anzahl der Polygone:
 				*pWMF >> nPoly >> nGesPoints;
-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
 				{
 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
 					{
@@ -1157,10 +1157,10 @@
 							*pWMF >> nPoints;
 							pnPoints[ i ] = (UINT16)nPoints;
 						}
-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
+						if ( ( nGesPoints * (sizeof(sal_uInt16)+sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
 						{
 							// Polygonpunkte holen:
-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
+							pPtAry  = new Point[ nGesPoints ];
 							for ( i = 0; i < nGesPoints; i++ )
 							{
 								*pWMF >> nX16 >> nY16;
@@ -1170,7 +1170,7 @@
 							// PolyPolygon Actions erzeugen
 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
-							delete[] (char*) pPtAry;
+							delete[] pPtAry;
 						}
 						delete[] pnPoints;
 					}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1723
retrieving revision 1.1724
diff -u -r1.1723 -r1.1724
--- openoffice.org.spec	9 Mar 2009 16:38:11 -0000	1.1723
+++ openoffice.org.spec	8 Apr 2009 11:41:13 -0000	1.1724
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -144,6 +144,7 @@
 Patch71: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
 Patch72: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch73: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch74: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1412,6 +1413,7 @@
 %patch71 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
 %patch72 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch74 -p0 -b .ooo100942.svtools.oversafeemf.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3778,6 +3780,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Apr 08 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
+- Resolves: rhbz#494643 EMF polypolygons issue
+
 * Mon Mar 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
 - Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch



From dwalsh at fedoraproject.org  Wed Apr  8 11:59:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  8 Apr 2009 11:59:32 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.164, 1.165 sources, 1.184,
	1.185
Message-ID: <20090408115932.86A1D7011A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5718

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-1
- Upgrade to latest upstream
- Allow devicekit_disk sys_rawio



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- .cvsignore	6 Apr 2009 19:27:19 -0000	1.164
+++ .cvsignore	8 Apr 2009 11:58:59 -0000	1.165
@@ -166,3 +166,4 @@
 serefpolicy-3.6.9.tgz
 serefpolicy-3.6.10.tgz
 serefpolicy-3.6.11.tgz
+serefpolicy-3.6.12.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- sources	6 Apr 2009 19:27:19 -0000	1.184
+++ sources	8 Apr 2009 11:58:59 -0000	1.185
@@ -1 +1 @@
-8692c0a1feea7a6914bc3f33019c0570  serefpolicy-3.6.11.tgz
+ae9756d6dc925aa69f4edcb4da7f3bc6  serefpolicy-3.6.12.tgz



From whot at fedoraproject.org  Wed Apr  8 12:26:59 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  8 Apr 2009 12:26:59 +0000 (UTC)
Subject: rpms/xorg-x11-drv-keyboard/devel keyboard-1.3.2-terminate.patch,
	NONE, 1.1 xorg-x11-drv-keyboard.spec, 1.28, 1.29
Message-ID: <20090408122659.78D7B7011A@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14661

Modified Files:
	xorg-x11-drv-keyboard.spec 
Added Files:
	keyboard-1.3.2-terminate.patch 
Log Message:
* Wed Apr 08 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.2-3
- keyboard-1.3.2-terminate.patch: dont handle C-A-B zapping in the driver.



keyboard-1.3.2-terminate.patch:

--- NEW FILE keyboard-1.3.2-terminate.patch ---
>From 3515e8edb8eeb8da2850e428b9493f6445c7ad16 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 7 Apr 2009 11:02:44 +1000
Subject: [PATCH] Remote TERMINATE_FALLBACK handling.

Don't let the driver handle C-A-B for zapping, this should be done in xkb.
---
 src/kbd.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/src/kbd.c b/src/kbd.c
index 3560a65..a9526c4 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -679,15 +679,8 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, Bool down)
      }
   }
 
-#ifndef TERMINATE_FALLBACK
-#define TERMINATE_FALLBACK 0
-#endif
 #ifdef XKB
-  if (noXkbExtension
-#if TERMINATE_FALLBACK
-      || specialkey == KEY_BackSpace
-#endif
-     )
+  if (noXkbExtension)
 #endif
   {    
       if (CommonSpecialKey(specialkey, down, keyc->state))
-- 
1.6.0.6



Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-drv-keyboard.spec	26 Feb 2009 10:54:40 -0000	1.28
+++ xorg-x11-drv-keyboard.spec	8 Apr 2009 12:26:28 -0000	1.29
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
 Version:    1.3.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,6 +17,9 @@
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
+# special key handling is removed in git, 1.4 won't need this patch
+Patch001:   keyboard-1.3.2-terminate.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -32,6 +35,8 @@
 #%setup -q -n %{tarball}-%{gitdate}
 %setup -q -n %{tarball}-%{version}
 
+%patch001 -p1 -b .terminate
+
 %build
 autoreconf -v --install || exit 1
 %configure --disable-static
@@ -57,6 +62,9 @@
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Apr 08 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.2-3
+- keyboard-1.3.2-terminate.patch: dont handle C-A-B zapping in the driver.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ivazquez at fedoraproject.org  Wed Apr  8 12:35:17 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed,  8 Apr 2009 12:35:17 +0000 (UTC)
Subject: rpms/django-sct/devel django-sct-0.5-compile.patch, NONE,
	1.1 django-sct.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408123517.C155570137@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/django-sct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-sct-0.5-compile.patch django-sct.spec import.log 
Log Message:
Initial import

django-sct-0.5-compile.patch:

--- NEW FILE django-sct-0.5-compile.patch ---
diff -up sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py.admin sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py
--- sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py.admin	2009-03-07 08:05:44.000000000 -0500
+++ sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py	2009-03-07 08:06:50.000000000 -0500
@@ -4,8 +4,7 @@
 ## Very simple script to compile all language files for all
 ## SCT apps.
 
-#from django.bin.compile-messages import compile_messages
-c = __import__('django.bin.compile-messages', None, None, 'compile_messages')
+import django.core.management.commands.compilemessages as c
 
 import os
 


--- NEW FILE django-sct.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-sct
Version:        0.5
Release:        2%{?dist}
Summary:        A collection of Django applications for building community websites

Group:          Development/Languages
License:        BSD
URL:            http://sct.sphene.net/
Source0:        http://sct-project.googlecode.com/files/sct-0.5.tar.gz
Patch0:         django-sct-0.5-compile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel gettext-devel Django
Requires:       Django

%description
Sphene Community Tools is a collection of Django applications which can be used
to build community websites, news sites or blogs.

%prep
%setup -q -n sct-%{version}
%patch0 -p 1 -b .admin
find -type f -exec chmod -x {} \;
sed -e 's/\r//' -i communitydraft/community/locale/*/LC_MESSAGES/django.po communitydraft/README
mv communitytools/README communitytools/README.sct
sed -e 's!share/locale!.*/locale!' /usr/lib/rpm/find-lang.sh > my-find-lang.sh

%build
cd communitytools/dist/scripts
python compile-all-sph-messages.py

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
cp -a communitytools/sphenecoll/sphene $RPM_BUILD_ROOT%{python_sitelib}
find $RPM_BUILD_ROOT%{python_sitelib}/sphene -name '*.po' -exec rm {} +
mkdir -p $RPM_BUILD_ROOT%{_datadir}/django-sct
cp -a communitytools/static $RPM_BUILD_ROOT%{_datadir}/django-sct
sh my-find-lang.sh $RPM_BUILD_ROOT django sphene.lst
find $RPM_BUILD_ROOT%{python_sitelib} -mindepth 1 \
    \( -name locale -prune \) -o \
    -type d -printf '%%%%dir %{python_sitelib}/%%P\n' -o \
    ! -name '*.py' -printf '%{python_sitelib}/%%P\n' -o \
    -printf '%{python_sitelib}/%%P\n' \
    -printf '%{python_sitelib}/%%P[co]\n' >> sphene.lst

%clean
rm -rf $RPM_BUILD_ROOT


%files -f sphene.lst
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README communitytools/README.sct
%doc communitytools/examples communitydraft
%{_datadir}/django-sct

%changelog
* Fri Mar 27 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-2
- Cleaned up some rpmlint errors

* Tue Mar 24 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-1
- Initial RPM release


--- NEW FILE import.log ---
django-sct-0_5-2:HEAD:django-sct-0.5-2.src.rpm:1239194032


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-sct/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:40:54 -0000	1.1
+++ .cvsignore	8 Apr 2009 12:34:46 -0000	1.2
@@ -0,0 +1 @@
+sct-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-sct/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:40:54 -0000	1.1
+++ sources	8 Apr 2009 12:34:46 -0000	1.2
@@ -0,0 +1 @@
+e5980b3a9d6653adbe42107d1810c638  sct-0.5.tar.gz



From ivazquez at fedoraproject.org  Wed Apr  8 12:36:26 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed,  8 Apr 2009 12:36:26 +0000 (UTC)
Subject: rpms/django-sct/F-10 django-sct-0.5-compile.patch, NONE,
	1.1 django-sct.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408123626.A5F327011A@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/django-sct/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18346/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	django-sct-0.5-compile.patch django-sct.spec import.log 
Log Message:
Initial import

django-sct-0.5-compile.patch:

--- NEW FILE django-sct-0.5-compile.patch ---
diff -up sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py.admin sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py
--- sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py.admin	2009-03-07 08:05:44.000000000 -0500
+++ sct-0.5/communitytools/dist/scripts/compile-all-sph-messages.py	2009-03-07 08:06:50.000000000 -0500
@@ -4,8 +4,7 @@
 ## Very simple script to compile all language files for all
 ## SCT apps.
 
-#from django.bin.compile-messages import compile_messages
-c = __import__('django.bin.compile-messages', None, None, 'compile_messages')
+import django.core.management.commands.compilemessages as c
 
 import os
 


--- NEW FILE django-sct.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-sct
Version:        0.5
Release:        2%{?dist}
Summary:        A collection of Django applications for building community websites

Group:          Development/Languages
License:        BSD
URL:            http://sct.sphene.net/
Source0:        http://sct-project.googlecode.com/files/sct-0.5.tar.gz
Patch0:         django-sct-0.5-compile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel gettext-devel Django
Requires:       Django

%description
Sphene Community Tools is a collection of Django applications which can be used
to build community websites, news sites or blogs.

%prep
%setup -q -n sct-%{version}
%patch0 -p 1 -b .admin
find -type f -exec chmod -x {} \;
sed -e 's/\r//' -i communitydraft/community/locale/*/LC_MESSAGES/django.po communitydraft/README
mv communitytools/README communitytools/README.sct
sed -e 's!share/locale!.*/locale!' /usr/lib/rpm/find-lang.sh > my-find-lang.sh

%build
cd communitytools/dist/scripts
python compile-all-sph-messages.py

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
cp -a communitytools/sphenecoll/sphene $RPM_BUILD_ROOT%{python_sitelib}
find $RPM_BUILD_ROOT%{python_sitelib}/sphene -name '*.po' -exec rm {} +
mkdir -p $RPM_BUILD_ROOT%{_datadir}/django-sct
cp -a communitytools/static $RPM_BUILD_ROOT%{_datadir}/django-sct
sh my-find-lang.sh $RPM_BUILD_ROOT django sphene.lst
find $RPM_BUILD_ROOT%{python_sitelib} -mindepth 1 \
    \( -name locale -prune \) -o \
    -type d -printf '%%%%dir %{python_sitelib}/%%P\n' -o \
    ! -name '*.py' -printf '%{python_sitelib}/%%P\n' -o \
    -printf '%{python_sitelib}/%%P\n' \
    -printf '%{python_sitelib}/%%P[co]\n' >> sphene.lst

%clean
rm -rf $RPM_BUILD_ROOT


%files -f sphene.lst
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README communitytools/README.sct
%doc communitytools/examples communitydraft
%{_datadir}/django-sct

%changelog
* Fri Mar 27 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-2
- Cleaned up some rpmlint errors

* Tue Mar 24 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-1
- Initial RPM release


--- NEW FILE import.log ---
django-sct-0_5-2:F-10:django-sct-0.5-2.src.rpm:1239194101


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-sct/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:40:54 -0000	1.1
+++ .cvsignore	8 Apr 2009 12:35:56 -0000	1.2
@@ -0,0 +1 @@
+sct-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-sct/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:40:54 -0000	1.1
+++ sources	8 Apr 2009 12:35:56 -0000	1.2
@@ -0,0 +1 @@
+e5980b3a9d6653adbe42107d1810c638  sct-0.5.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:06 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125316.2C0A110F86B@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora devel) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:09 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125319.9A9C010F874@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora devel) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:53:20 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125319.C417B10F878@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora devel) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:10 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125320.C6A0E10F87C@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora devel) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:53:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:53:23 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125323.6691110F880@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora devel) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:30 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125340.1011D10F871@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora 10) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:53:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:53:38 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125337.B2E8A10F862@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on kdetoys (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:53:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:53:42 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125341.F1D0C10F885@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:34 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125343.60E8E10F889@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 10) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:34 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125344.5960110F88E@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:53:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:53:46 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125345.D02F510F891@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 10) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:54:40 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125348.BFA8510F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Wed Apr  8 12:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 12:53:50 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090408125349.B324D10F898@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 10) to Approved for than

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From ixs at fedoraproject.org  Wed Apr  8 13:00:32 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed,  8 Apr 2009 13:00:32 +0000 (UTC)
Subject: rpms/ccrtp/EL-5 .cvsignore, 1.5, 1.6 ccrtp.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <20090408130032.91D3D7011A@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ccrtp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24857

Modified Files:
	.cvsignore ccrtp.spec sources 
Log Message:
* Mon Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.1-1
- Update to upstream release 1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccrtp/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Mar 2007 11:50:32 -0000	1.5
+++ .cvsignore	8 Apr 2009 13:00:02 -0000	1.6
@@ -1 +1 @@
-ccrtp-1.5.1.tar.gz
+ccrtp-1.7.1.tar.gz


Index: ccrtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccrtp/EL-5/ccrtp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ccrtp.spec	7 Mar 2007 12:23:07 -0000	1.7
+++ ccrtp.spec	8 Apr 2009 13:00:02 -0000	1.8
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.5.1
+Version: 1.7.1
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Libraries
 Source0: http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
+BuildRequires: commoncpp2-devel >= 1.7.0, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -22,6 +22,8 @@
 %package devel
 Summary: Header files and libraries for %{name} development
 Group: Development/Libraries
+# Some of the headers are LGPLv2+
+License: GPLv2+ and LGPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig, commoncpp2-devel
 Requires(post): /sbin/install-info
@@ -39,7 +41,7 @@
 %build
 %configure \
 	--disable-static
-%{__make} %{?_smp_mflags}
+%{__make} # %{?_smp_mflags} smp builds disabled
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,6 +80,22 @@
 
 
 %changelog
+* Mon Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.7.1-1
+- Update to upstream release 1.7.1
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0-2
+- fix license tag
+
+* Wed Feb 06 2008 Andreas Thienemann <andreas at bawue.net> - 1.6.0-1
+- Updated to upstream version 1.6.0
+- Added patch enabling build with gcc-4.3
+
+* Wed Feb 06 2008 Dennis Gilmore <dennis at ausil.us> - 1.5.1-2
+- rebuild for new commoncpp2
+
 * Wed Mar 07 2007 Andreas Thienemann <andreas at bawue.net> - 1.5.1-1
 - Updated package to 1.5.1
 - Fixed #219396


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccrtp/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Mar 2007 11:50:32 -0000	1.5
+++ sources	8 Apr 2009 13:00:02 -0000	1.6
@@ -1 +1 @@
-728c41edd62be2871eac50be287f97ee  ccrtp-1.5.1.tar.gz
+9f5d34a18f2c1c779d2e5818cc4987f8  ccrtp-1.7.1.tar.gz



From dwalsh at fedoraproject.org  Wed Apr  8 13:09:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  8 Apr 2009 13:09:23 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.181, 1.182 libselinux.spec,
	1.368, 1.369 sources, 1.184, 1.185
Message-ID: <20090408130923.CF48B7011A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27883

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.80-1
- Update to upstream 
	* deny_unknown wrapper function from KaiGai Kohei.
	* security_compute_av_flags API from KaiGai Kohei.
	* Netlink socket management and callbacks from KaiGai Kohei.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- .cvsignore	12 Mar 2009 12:57:57 -0000	1.181
+++ .cvsignore	8 Apr 2009 13:08:53 -0000	1.182
@@ -163,3 +163,4 @@
 libselinux-2.0.77.tgz
 libselinux-2.0.78.tgz
 libselinux-2.0.79.tgz
+libselinux-2.0.80.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- libselinux.spec	3 Apr 2009 12:58:07 -0000	1.368
+++ libselinux.spec	8 Apr 2009 13:08:53 -0000	1.369
@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.79
-Release: 6%{?dist}
+Version: 2.0.80
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -164,6 +164,12 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.80-1
+- Update to upstream 
+	* deny_unknown wrapper function from KaiGai Kohei.
+	* security_compute_av_flags API from KaiGai Kohei.
+	* Netlink socket management and callbacks from KaiGai Kohei.
+
 * Fri Apr 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.79-6
 - Fix Memory Leak
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- sources	12 Mar 2009 12:57:57 -0000	1.184
+++ sources	8 Apr 2009 13:08:53 -0000	1.185
@@ -1 +1 @@
-f7418923f1f721e450ac8cf4151f8360  libselinux-2.0.79.tgz
+ef7f50f6711a7b752feece72209a05f7  libselinux-2.0.80.tgz



From dnovotny at fedoraproject.org  Wed Apr  8 13:13:07 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed,  8 Apr 2009 13:13:07 +0000 (UTC)
Subject: rpms/amanda/devel amanda-2.6.0p2-tcpport.patch, NONE,
	1.1 amanda.spec, 1.57, 1.58
Message-ID: <20090408131307.0F7FA7011A@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28724

Modified Files:
	amanda.spec 
Added Files:
	amanda-2.6.0p2-tcpport.patch 
Log Message:

tcpport patch lost after rebase, adding again


amanda-2.6.0p2-tcpport.patch:

--- NEW FILE amanda-2.6.0p2-tcpport.patch ---
diff -up amanda-2.6.0p2/example/amanda-client.conf.in.tcpp amanda-2.6.0p2/example/amanda-client.conf.in
--- amanda-2.6.0p2/example/amanda-client.conf.in.tcpp	2009-04-06 16:46:35.000000000 +0200
+++ amanda-2.6.0p2/example/amanda-client.conf.in	2009-04-06 16:46:51.000000000 +0200
@@ -22,3 +22,5 @@ auth "bsdtcp"
 
 ssh_keys ""			# your ssh keys file if you use ssh auth
 
+#resolves "resource temporarily unavailable" bug
+unreserved-tcp-port 1025,65535
\ No newline at end of file
diff -up amanda-2.6.0p2/example/amanda.conf.in.tcpp amanda-2.6.0p2/example/amanda.conf.in
--- amanda-2.6.0p2/example/amanda.conf.in.tcpp	2009-04-06 16:46:19.000000000 +0200
+++ amanda-2.6.0p2/example/amanda.conf.in	2009-04-06 16:47:10.000000000 +0200
@@ -730,3 +730,6 @@ define interface local {
 # configurations.
 
 #includefile "@CONFIG_DIR@/amanda.conf.main"
+
+#resolves "resource temporarily unavailable" bug
+unreserved-tcp-port 1025,65535
\ No newline at end of file


Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- amanda.spec	24 Feb 2009 00:53:03 -0000	1.57
+++ amanda.spec	8 Apr 2009 13:12:36 -0000	1.58
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -17,6 +17,7 @@
 Source9: README-rpm
 Patch1: amanda-2.6.0b3-example.patch
 Patch2: amanda-2.6.0b2-xattrs.patch
+Patch3: amanda-2.6.0p2-tcpport.patch
 Patch4: amanda-2.6.0b3-lib.patch
 Patch5: amanda-2.6.0p2-pie.patch
 License: BSD
@@ -87,6 +88,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .example
 %patch2 -p1 -b .xattrs
+%patch3 -p1 -b .tcpport
 %patch4 -p1 -b .lib
 %patch5 -p1 -b .pie
 ./autogen
@@ -373,6 +375,10 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Wed Apr 08 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-7
+- the tcpport patch was lost after rebase, adding again
+  (#448071, #462681)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0p2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Wed Apr  8 13:18:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  8 Apr 2009 13:18:21 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.83,
	1.84 selinux-policy.spec, 1.820, 1.821
Message-ID: <20090408131821.BAEB87011A@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29966

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-2
- Make sure unconfined_java_t and unconfined_mono_t create user_tmpfs_t.


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- policy-20090105.patch	8 Apr 2009 00:59:45 -0000	1.83
+++ policy-20090105.patch	8 Apr 2009 13:18:20 -0000	1.84
@@ -1980,7 +1980,7 @@
 +/usr/lib/opera(/.*)?/opera	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.12/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/java.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/java.if	2009-04-08 08:35:54.000000000 -0400
 @@ -30,6 +30,7 @@
  
  	allow java_t $2:unix_stream_socket connectto;
@@ -1989,7 +1989,7 @@
  ')
  
  ########################################
-@@ -68,3 +69,128 @@
+@@ -68,3 +69,129 @@
  	domtrans_pattern($1, java_exec_t, unconfined_java_t)
  	corecmd_search_bin($1)
  ')
@@ -2104,6 +2104,7 @@
 +	domain_interactive_fd($1_java_t)
 +
 +	userdom_unpriv_usertype($1, $1_java_t)
++	userdom_manage_tmpfs_role($2, $1_java_t)
 +
 +	allow $1_java_t self:process { ptrace signal getsched execmem execstack };
 +	allow $3 $1_java_t:process { getattr ptrace noatsecure signal_perms };
@@ -2266,8 +2267,8 @@
 +seutil_domtrans_setfiles_mac(livecd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.6.12/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/apps/mono.if	2009-04-07 16:01:44.000000000 -0400
-@@ -21,6 +21,103 @@
++++ serefpolicy-3.6.12/policy/modules/apps/mono.if	2009-04-08 08:35:44.000000000 -0400
+@@ -21,6 +21,104 @@
  
  ########################################
  ## <summary>
@@ -2352,6 +2353,7 @@
 +	domain_interactive_fd($1_mono_t)
 +
 +	userdom_unpriv_usertype($1, $1_mono_t)
++	userdom_manage_tmpfs_role($2, $1_mono_t)
 +
 +	allow $1_mono_t self:process { ptrace signal getsched execheap execmem execstack };
 +	allow $3 $1_mono_t:process { getattr ptrace noatsecure signal_perms };
@@ -2371,7 +2373,7 @@
  ##	Execute the mono program in the caller domain.
  ## </summary>
  ## <param name="domain">
-@@ -31,7 +128,7 @@
+@@ -31,7 +129,7 @@
  #
  interface(`mono_exec',`
  	gen_require(`
@@ -22399,7 +22401,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-08 08:34:37.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- selinux-policy.spec	8 Apr 2009 00:59:46 -0000	1.820
+++ selinux-policy.spec	8 Apr 2009 13:18:20 -0000	1.821
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Wed Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-2
+- Make sure unconfined_java_t and unconfined_mono_t create user_tmpfs_t.
+
 * Tue Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-1
 - Upgrade to latest upstream
 - Allow devicekit_disk sys_rawio



From jzeleny at fedoraproject.org  Wed Apr  8 13:19:32 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed,  8 Apr 2009 13:19:32 +0000 (UTC)
Subject: rpms/libhbaapi/devel libhbaapi.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090408131932.9757B7011A@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/libhbaapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29986

Modified Files:
	.cvsignore sources 
Added Files:
	libhbaapi.spec 
Log Message:
Initial commit - added neccessary files.




--- NEW FILE libhbaapi.spec ---
Name:           libhbaapi
Version:        2.2
Release:        4%{?dist}
Summary:        SNIA HBAAPI library

Group:          System Environment/Libraries
License:        SNIA
URL:            http://sourceforge.net/projects/hbaapi/
Source0:        http://downloads.sourceforge.net/hbaapi/hbaapi_src_%{version}.tgz
Source1:        http://www.open-fcoe.org/openfc/downloads/hbaapi_build_%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# BuildRequires:  
# Requires:       

%description
The SNIA HBA API library. C-level project to manage
Fibre Channel Host Bus Adapters.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n hbaapi_src_2.2
%setup -q -T -D -a 1 -n hbaapi_src_2.2


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc readme.txt
%config(noreplace) %{_sysconfdir}/hba.conf
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Wed Apr 01 2009 Jan Zeleny <jzeleny at redhat.com> - 2.2-4
- added some info to description line
- replaced unoficial build source tarball with official one

* Tue Mar 31 2009 Jan Zeleny <jzeleny at redhat.com> - 2.2-3
- minor changes in spec file - filenames change, removal of
  duplicate patch files (included in build source tarball)
  
* Thu Mar 12 2009 Jan Zeleny <jzeleny at redhat.com> - 2.2-2
- correction of patches' names to correct format

* Tue Feb 24 2009 Chris Leech <christopher.leech at intel.com> - 2.2-1
- initial packaging of hbaapi 2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libhbaapi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:42:01 -0000	1.1
+++ .cvsignore	8 Apr 2009 13:19:02 -0000	1.2
@@ -0,0 +1,2 @@
+hbaapi_src_2.2.tgz
+hbaapi_build_2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libhbaapi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:42:01 -0000	1.1
+++ sources	8 Apr 2009 13:19:02 -0000	1.2
@@ -0,0 +1,2 @@
+5c9281e28f8731e38721b34494a75eef  hbaapi_src_2.2.tgz
+e853af8d852c2ba03132c0262b1eb559  hbaapi_build_2.2.tar.gz



From salimma at fedoraproject.org  Wed Apr  8 13:54:08 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed,  8 Apr 2009 13:54:08 +0000 (UTC)
Subject: rpms/deskbar-applet/devel deskbar-applet-2.26.0-gapplet.patch, NONE,
	1.1 .cvsignore, 1.44, 1.45 deskbar-applet.spec, 1.79,
	1.80 sources, 1.44, 1.45
Message-ID: <20090408135408.6846E7011A@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6704

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-2.26.0-gapplet.patch 
Log Message:
* Wed Apr  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-1
- Update to 2.26.0


deskbar-applet-2.26.0-gapplet.patch:

--- NEW FILE deskbar-applet-2.26.0-gapplet.patch ---
--- deskbar-applet-2.26.0/configure.gapplet	2009-03-17 14:12:25.000000000 -0400
+++ deskbar-applet-2.26.0/configure	2009-04-08 09:11:49.497523837 -0400
@@ -14711,11 +14711,6 @@
 { echo "$as_me:$LINENO: checking for gnomeapplet module" >&5
 echo $ECHO_N "checking for gnomeapplet module... $ECHO_C" >&6; }
 if { (echo "$as_me:$LINENO: DISPLAY= \$PYTHON -c '
-import pygtk
-pygtk.require(\"2.0\")
-import gtk
-gtk.gdk.threads_init()
-
 try:
     import gnomeapplet
 except ImportError, e:
@@ -14725,11 +14720,6 @@
     pass
 '") >&5
   (DISPLAY= $PYTHON -c '
-import pygtk
-pygtk.require("2.0")
-import gtk
-gtk.gdk.threads_init()
-
 try:
     import gnomeapplet
 except ImportError, e:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	11 Nov 2008 02:35:19 -0000	1.44
+++ .cvsignore	8 Apr 2009 13:53:37 -0000	1.45
@@ -1 +1 @@
-deskbar-applet-2.25.1.tar.bz2
+deskbar-applet-2.26.0.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- deskbar-applet.spec	24 Feb 2009 11:27:47 -0000	1.79
+++ deskbar-applet.spec	8 Apr 2009 13:53:37 -0000	1.80
@@ -2,16 +2,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.25.1
-Release:        7%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://live.gnome.org/DeskbarApplet
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.20/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.26/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
+Patch0:         %{name}-2.26.0-gapplet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gapplet
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Wed Apr  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-1
+- Update to 2.26.0
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	11 Nov 2008 02:35:20 -0000	1.44
+++ sources	8 Apr 2009 13:53:37 -0000	1.45
@@ -1 +1 @@
-943d92ee1538420ea8a8734a694abb77  deskbar-applet-2.25.1.tar.bz2
+168044d1312bf30e71f2ed587d2bffb6  deskbar-applet-2.26.0.tar.bz2



From oget at fedoraproject.org  Wed Apr  8 13:56:48 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 13:56:48 +0000 (UTC)
Subject: rpms/lv2core/devel lv2core.spec,1.5,1.6
Message-ID: <20090408135648.8AF357011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435

Modified Files:
	lv2core.spec 
Log Message:
* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 3.0-3
- Add Requires: pkgconfig to the -devel subpackage.



Index: lv2core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lv2core/devel/lv2core.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lv2core.spec	31 Mar 2009 00:56:08 -0000	1.5
+++ lv2core.spec	8 Apr 2009 13:56:18 -0000	1.6
@@ -1,8 +1,8 @@
-%define debug_package %{nil}
+%global debug_package %{nil}
 
 Name:           lv2core
 Version:        3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Audio Plugin Standard
 
@@ -31,6 +31,7 @@
 Summary:        API for the LV2 Audio Plugin Standard
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 lv2-devel contains the lv2.h header file.
@@ -66,6 +67,9 @@
 %{_libdir}/pkgconfig/lv2core.pc
 
 %changelog
+* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 3.0-3
+- Add Requires: pkgconfig to the -devel subpackage.
+
 * Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 3.0-2
 - Add BR: python
 



From oget at fedoraproject.org  Wed Apr  8 13:58:48 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 13:58:48 +0000 (UTC)
Subject: rpms/lv2core/F-10 lv2core.spec,1.2,1.3
Message-ID: <20090408135848.C18AA7011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8112

Modified Files:
	lv2core.spec 
Log Message:
* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 3.0-3
- Add Requires: pkgconfig to the -devel subpackage.



Index: lv2core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lv2core/F-10/lv2core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lv2core.spec	31 Mar 2009 01:20:49 -0000	1.2
+++ lv2core.spec	8 Apr 2009 13:58:18 -0000	1.3
@@ -1,8 +1,8 @@
-%define debug_package %{nil}
+%global debug_package %{nil}
 
 Name:           lv2core
 Version:        3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Audio Plugin Standard
 
@@ -31,6 +31,7 @@
 Summary:        API for the LV2 Audio Plugin Standard
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 lv2-devel contains the lv2.h header file.
@@ -66,6 +67,9 @@
 %{_libdir}/pkgconfig/lv2core.pc
 
 %changelog
+* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 3.0-3
+- Add Requires: pkgconfig to the -devel subpackage.
+
 * Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 3.0-2
 - Add BR: python
 



From mmaslano at fedoraproject.org  Wed Apr  8 14:02:41 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  8 Apr 2009 14:02:41 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/F-11 perl-Data-Dumper-Names.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090408140241.5ADFB7011A@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8852

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Dumper-Names.spec 
Log Message:
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-2
- remove unnecessary requirement



--- NEW FILE perl-Data-Dumper-Names.spec ---
Name:           perl-Data-Dumper-Names
Version:        0.03
Release:        2%{?dist}
Summary:        Data::Dumper like module for printing and eval data structures
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Data-Dumper-Names/
Source0:        http://www.cpan.org/authors/id/O/OV/OVID/Data-Dumper-Names-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(PadWalker) >= 0.13
Requires:       perl(PadWalker) >= 0.13
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The essential module Data::Dumper is used for printing perl data structures or 
suitable for eval. Data::Dumper::Names dump variables with names and without
source filter. 

%prep
%setup -q -n Data-Dumper-Names-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-2
- remove unnecessary requirement

* Thu Apr 02 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:46:47 -0000	1.1
+++ .cvsignore	8 Apr 2009 14:02:10 -0000	1.2
@@ -0,0 +1 @@
+Data-Dumper-Names-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2009 02:46:47 -0000	1.1
+++ sources	8 Apr 2009 14:02:10 -0000	1.2
@@ -0,0 +1 @@
+87fb75627801e323f7bc4430c3c97334  Data-Dumper-Names-0.03.tar.gz



From wcohen at fedoraproject.org  Wed Apr  8 14:07:24 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed,  8 Apr 2009 14:07:24 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile.spec,1.73,1.74
Message-ID: <20090408140724.8C4957011A@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10061

Modified Files:
	oprofile.spec 
Log Message:
bump version and rebuild.



Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- oprofile.spec	26 Feb 2009 08:57:53 -0000	1.73
+++ oprofile.spec	8 Apr 2009 14:06:53 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -223,6 +223,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Apr 8 2008 Will Cohen <wcohen at redhat.com> - 0.9.4-5
+- Bump version and rebuild.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wcohen at fedoraproject.org  Wed Apr  8 14:08:45 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed,  8 Apr 2009 14:08:45 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile.spec,1.74,1.75
Message-ID: <20090408140845.780517011A@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10676

Modified Files:
	oprofile.spec 
Log Message:
Correct date on changelog entry.



Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- oprofile.spec	8 Apr 2009 14:06:53 -0000	1.74
+++ oprofile.spec	8 Apr 2009 14:08:15 -0000	1.75
@@ -223,7 +223,7 @@
 /etc/ld.so.conf.d/*
 
 %changelog
-* Wed Apr 8 2008 Will Cohen <wcohen at redhat.com> - 0.9.4-5
+* Wed Apr 8 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-5
 - Bump version and rebuild.
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-4



From toshio at fedoraproject.org  Wed Apr  8 14:08:54 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed,  8 Apr 2009 14:08:54 +0000 (UTC)
Subject: rpms/python-paver/EL-5 .cvsignore, 1.2, 1.3 python-paver.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090408140854.92BAC7011A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-paver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10765/EL-5

Modified Files:
	.cvsignore python-paver.spec sources 
Log Message:

* Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
- New upstream final.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 02:17:27 -0000	1.2
+++ .cvsignore	8 Apr 2009 14:08:24 -0000	1.3
@@ -1 +1 @@
-Paver-0.8.1.tar.gz
+Paver-1.0.tar.gz


Index: python-paver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/EL-5/python-paver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-paver.spec	12 Aug 2008 02:17:27 -0000	1.1
+++ python-paver.spec	8 Apr 2009 14:08:24 -0000	1.2
@@ -1,9 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define srcname Paver
 Name: python-paver
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
 Group: Development/Languages
@@ -18,6 +18,9 @@
 BuildRequires: python-sphinx
 BuildRequires: python-nose
 
+Requires:      python-devel
+Requires:      python-setuptools
+
 %description
 Paver is a Python-based build/distribution/deployment scripting tool along the
 lines of Make or Rake. What makes Paver unique is its integration with commonly
@@ -76,6 +79,24 @@
 
 
 %changelog
+* Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
+- New upstream final.
+
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.b1
+- New upstream beta.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-5
+- Require python-setuptools as the paver app is a setuptools script.
+
+* Mon Dec 15 2008 Luke Macken <lmacken at redhat.com> - 0.8.1-4
+- Require python-devel.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.1-3
+- Rebuild for Python 2.6
+
 * Sat Aug 9 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-2
 - Run the unittests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 02:17:27 -0000	1.2
+++ sources	8 Apr 2009 14:08:24 -0000	1.3
@@ -1 +1 @@
-e8bb7e93d97666af6ffc4574335c3434  Paver-0.8.1.tar.gz
+3f1a8346e7cadf9ae362e28360541117  Paver-1.0.tar.gz



From toshio at fedoraproject.org  Wed Apr  8 14:08:55 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed,  8 Apr 2009 14:08:55 +0000 (UTC)
Subject: rpms/python-paver/F-10 .cvsignore, 1.2, 1.3 python-paver.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090408140855.07E927011A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-paver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10765/F-10

Modified Files:
	.cvsignore python-paver.spec sources 
Log Message:

* Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
- New upstream final.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 01:46:30 -0000	1.2
+++ .cvsignore	8 Apr 2009 14:08:24 -0000	1.3
@@ -1 +1 @@
-Paver-0.8.1.tar.gz
+Paver-1.0.tar.gz


Index: python-paver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/F-10/python-paver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-paver.spec	12 Aug 2008 01:46:30 -0000	1.1
+++ python-paver.spec	8 Apr 2009 14:08:24 -0000	1.2
@@ -1,9 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define srcname Paver
 Name: python-paver
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
 Group: Development/Languages
@@ -18,6 +18,9 @@
 BuildRequires: python-sphinx
 BuildRequires: python-nose
 
+Requires:      python-devel
+Requires:      python-setuptools
+
 %description
 Paver is a Python-based build/distribution/deployment scripting tool along the
 lines of Make or Rake. What makes Paver unique is its integration with commonly
@@ -76,6 +79,24 @@
 
 
 %changelog
+* Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
+- New upstream final.
+
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.b1
+- New upstream beta.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-5
+- Require python-setuptools as the paver app is a setuptools script.
+
+* Mon Dec 15 2008 Luke Macken <lmacken at redhat.com> - 0.8.1-4
+- Require python-devel.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.1-3
+- Rebuild for Python 2.6
+
 * Sat Aug 9 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-2
 - Run the unittests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 01:46:30 -0000	1.2
+++ sources	8 Apr 2009 14:08:24 -0000	1.3
@@ -1 +1 @@
-e8bb7e93d97666af6ffc4574335c3434  Paver-0.8.1.tar.gz
+3f1a8346e7cadf9ae362e28360541117  Paver-1.0.tar.gz



From toshio at fedoraproject.org  Wed Apr  8 14:08:55 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed,  8 Apr 2009 14:08:55 +0000 (UTC)
Subject: rpms/python-paver/F-9 .cvsignore, 1.2, 1.3 python-paver.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090408140855.5CBFD7011A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-paver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10765/F-9

Modified Files:
	.cvsignore python-paver.spec sources 
Log Message:

* Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
- New upstream final.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 02:17:28 -0000	1.2
+++ .cvsignore	8 Apr 2009 14:08:25 -0000	1.3
@@ -1 +1 @@
-Paver-0.8.1.tar.gz
+Paver-1.0.tar.gz


Index: python-paver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/F-9/python-paver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-paver.spec	12 Aug 2008 02:17:28 -0000	1.1
+++ python-paver.spec	8 Apr 2009 14:08:25 -0000	1.2
@@ -1,9 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define srcname Paver
 Name: python-paver
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
 Group: Development/Languages
@@ -18,6 +18,9 @@
 BuildRequires: python-sphinx
 BuildRequires: python-nose
 
+Requires:      python-devel
+Requires:      python-setuptools
+
 %description
 Paver is a Python-based build/distribution/deployment scripting tool along the
 lines of Make or Rake. What makes Paver unique is its integration with commonly
@@ -76,6 +79,24 @@
 
 
 %changelog
+* Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
+- New upstream final.
+
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.b1
+- New upstream beta.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-5
+- Require python-setuptools as the paver app is a setuptools script.
+
+* Mon Dec 15 2008 Luke Macken <lmacken at redhat.com> - 0.8.1-4
+- Require python-devel.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.1-3
+- Rebuild for Python 2.6
+
 * Sat Aug 9 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-2
 - Run the unittests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 02:17:28 -0000	1.2
+++ sources	8 Apr 2009 14:08:25 -0000	1.3
@@ -1 +1 @@
-e8bb7e93d97666af6ffc4574335c3434  Paver-0.8.1.tar.gz
+3f1a8346e7cadf9ae362e28360541117  Paver-1.0.tar.gz



From atkac at fedoraproject.org  Wed Apr  8 14:10:15 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed,  8 Apr 2009 14:10:15 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc-rh494801.patch, NONE, 1.1 tigervnc.spec,
	1.3, 1.4
Message-ID: <20090408141015.3FF547011A@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11608

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc-rh494801.patch 
Log Message:
- workaround broken fontpath handling in vncserver script (#494801)


tigervnc-rh494801.patch:

--- NEW FILE tigervnc-rh494801.patch ---
diff -up tigervnc-0.0.90-20090407svn3761/unix/vncserver.rh494801 tigervnc-0.0.90-20090407svn3761/unix/vncserver
--- tigervnc-0.0.90-20090407svn3761/unix/vncserver.rh494801	2009-04-08 15:36:58.463812689 +0200
+++ tigervnc-0.0.90-20090407svn3761/unix/vncserver	2009-04-08 15:37:13.552448279 +0200
@@ -203,7 +203,6 @@ $cmd .= " -pixelformat $pixelformat" if 
 $cmd .= " -rfbwait 30000";
 $cmd .= " -rfbauth $vncUserDir/passwd";
 $cmd .= " -rfbport $vncPort";
-$cmd .= " -fp $fontPath" if ($fontPath);
 $cmd .= " -pn";
 
 # Add color database stuff here, e.g.:


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tigervnc.spec	7 Apr 2009 19:54:25 -0000	1.3
+++ tigervnc.spec	8 Apr 2009 14:09:45 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.4.%{releasetag}%{?dist}
+Release:	0.5.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -53,6 +53,7 @@
 Patch5:		tigervnc-manminor.patch
 Patch6:		tigervnc-newfbsize.patch
 Patch8:		tigervnc-viewer-reparent.patch
+Patch9:		tigervnc-rh494801.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -110,6 +111,7 @@
 %patch5 -p1 -b .manminor
 %patch6 -p1 -b .newfbsize
 %patch8 -p1 -b .viewer-reparent
+%patch9 -p1 -b .rh494801
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -249,6 +251,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Wed Apr 08 2009 Adam Tkac <atkac redhat com> 0.0.90-0.5.20090403svn3751
+- workaround broken fontpath handling in vncserver script (#494801)
+
 * Fri Apr 03 2009 Adam Tkac <atkac redhat com> 0.0.90-0.4.20090403svn3751
 - update to r3751
 - patches merged



From caolanm at fedoraproject.org  Wed Apr  8 14:12:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  8 Apr 2009 14:12:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch,
	NONE, 1.1 openoffice.org.spec, 1.1872, 1.1873
Message-ID: <20090408141248.D9CC67011A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12112

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch 
Log Message:
Revert pythonscript.py part of ooo#95118 for now

openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch:

--- NEW FILE openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch ---
--- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
+++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
@@ -734,8 +734,6 @@
         uri = uri.replace( "vnd.sun.star.expand:", "",1)
         uri = uno.getComponentContext().getByName(
                     "/singletons/com.sun.star.util.theMacroExpander" ).expandMacros( uri )
-    if uri.startswith( "file:" ):
-        uri = uno.absolutize("",uri)   # necessary to get rid of .. in uri
     return uri
     
 #--------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -r1.1872 -r1.1873
--- openoffice.org.spec	8 Apr 2009 11:39:06 -0000	1.1872
+++ openoffice.org.spec	8 Apr 2009 14:12:18 -0000	1.1873
@@ -132,6 +132,7 @@
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
 Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
+Patch60: openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1623,6 +1624,7 @@
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
 %patch58 -p0 -b .ooo100225.comphelper.vis.patch
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch60 -p1 -b .oooXXXXX.partial-revert-ooo95118.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4114,6 +4116,7 @@
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
   hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi
 - Resolves: rhbz#494643 EMF polypolygons issue
+- Revert pythonscript.py part of ooo#95118 for now
 
 * Thu Apr 02 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.1
 - latest milestone



From limb at fedoraproject.org  Wed Apr  8 14:26:16 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  8 Apr 2009 14:26:16 +0000 (UTC)
Subject: rpms/argyllcms/devel argyllcms-CVE-2009-0792.patch, NONE,
	1.1 argyllcms.spec, 1.8, 1.9
Message-ID: <20090408142616.DFA497011A@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15299

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-CVE-2009-0792.patch 
Log Message:
Patch for ICC library CVE-2009-0792.


argyllcms-CVE-2009-0792.patch:

--- NEW FILE argyllcms-CVE-2009-0792.patch ---
--- icc/icc.c.orig	2009-04-08 08:38:40.000000000 -0400
+++ icc/icc.c	2009-04-08 08:54:08.000000000 -0400
@@ -3312,7 +3312,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (unsigned int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3334,6 +3334,11 @@ static int icmTable_setup_bwd(
 ) {
 	unsigned int i;
 
+        if (size > INT_MAX - 2)
+        /* Although rt->size is unsigned long, the rt data
+         * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3352,7 +3357,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (unsigned int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(unsigned int *))) == NULL) {
+        if ((rt->rlists = (unsigned int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3365,6 +3370,16 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+
+                /* s and e should both be in the range [0,rt->rsize]
+                 * now, but let's not rely on floating point
+                 * calculations -- double-check. */
+                if (s < 0)
+                        s = 0;
+                if (e < 0)
+                        e = 0;
+                if (s >= rt->rsize)
+                        s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3383,6 +3398,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+                                        if (as > INT_MAX / 2 / sizeof (int))
+                                                return 2;
+
 					as *= 2;
 					rt->rlists[j] = (unsigned int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(unsigned int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3434,7 +3452,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+        if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3461,6 +3479,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+        /* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -4704,7 +4723,7 @@ double *in		/* Input array[inputChan] */
 				rv |= 1;
 			}
 			ix = (int)floor(val);		/* Grid coordinate */
-			if (ix > (p->inputEnt-2))
+			if (ix < 0 || ix > (p->inputEnt-2))
 				ix = (p->inputEnt-2);
 			w = val - (double)ix;		/* weight */
 			val = table[ix];
@@ -4764,7 +4783,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4838,7 +4857,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4957,7 +4976,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -5070,7 +5089,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			ix = (int)floor(val);		/* Grid coordinate */
-			if (ix > (p->outputEnt-2))
+			if (ix < 0 || ix > (p->outputEnt-2))
 				ix = (p->outputEnt-2);
 			w = val - (double)ix;		/* weight */
 			val = table[ix];
@@ -7887,7 +7906,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+                if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -9061,7 +9080,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+                if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -9515,7 +9534,7 @@ static double icmVideoCardGamma_lookup(
 		else if (val0 > inputEnt_1)
 			val0 = inputEnt_1;
 		ix = (int)floor(val0);		/* Coordinate */
-		if (ix > (p->u.table.entryCount-2))
+		if (ix < 0 || ix > (p->u.table.entryCount-2))
 			ix = (p->u.table.entryCount-2);
 		w = val0 - (double)ix;		/* weight */
 		if (p->u.table.entrySize == 1) {
@@ -10061,7 +10080,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+                if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -10071,7 +10090,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+                        if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- argyllcms.spec	23 Mar 2009 15:45:50 -0000	1.8
+++ argyllcms.spec	8 Apr 2009 14:25:46 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 3%{?alphatag}%{?dist}
+Release: 4%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -19,6 +19,7 @@
 # Patch applied for legal reasons
 Patch4:  %{name}-1.0.2-legal.patch
 Patch5: argyllcms-CVE-2009-0583,0584.patch
+Patch6: argyllcms-CVE-2009-0792.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -117,6 +118,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
+- Patch for ICC library CVE-2009-0792.
+
 * Mon Mar 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-3
 - Patch for ICC library CVE-2009-{0583, 0584} by Tim Waugh.
 



From mtasaka at fedoraproject.org  Wed Apr  8 14:34:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 14:34:49 +0000 (UTC)
Subject: rpms/rubygem-hpricot/F-10 .cvsignore, 1.5, 1.6 rubygem-hpricot.spec,
	1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20090408143449.313FA7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-hpricot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477/F-10

Modified Files:
	.cvsignore rubygem-hpricot.spec sources 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
- 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2009 20:29:16 -0000	1.5
+++ .cvsignore	8 Apr 2009 14:34:18 -0000	1.6
@@ -1 +1 @@
-hpricot-0.7-modified.gem
+hpricot-0.8.1-modified.gem


Index: rubygem-hpricot.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/F-10/rubygem-hpricot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygem-hpricot.spec	25 Mar 2009 20:17:57 -0000	1.3
+++ rubygem-hpricot.spec	8 Apr 2009 14:34:18 -0000	1.4
@@ -9,7 +9,7 @@
 
 Summary:	A Fast, Enjoyable HTML Parser for Ruby
 Name:		rubygem-%{gemname}
-Version:	0.7
+Version:	0.8.1
 Release:	1%{?dist}
 Group:		Development/Languages
 # ext/fast_xs/FastXsService.java is licensed under ASL 2.0
@@ -182,6 +182,9 @@
 %{ruby_sitelib}/%{gemname}/
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
+- 0.8.1
+
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7-1
 - 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2009 20:29:16 -0000	1.5
+++ sources	8 Apr 2009 14:34:18 -0000	1.6
@@ -1 +1 @@
-b9533510229451a265778b96425e6602  hpricot-0.7-modified.gem
+9940cd4abd93ea0cd84fa98a735bf45f  hpricot-0.8.1-modified.gem



From mtasaka at fedoraproject.org  Wed Apr  8 14:34:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 14:34:49 +0000 (UTC)
Subject: rpms/rubygem-hpricot/F-9 .cvsignore, 1.5, 1.6 rubygem-hpricot.spec, 
	1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20090408143449.71F857011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-hpricot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477/F-9

Modified Files:
	.cvsignore rubygem-hpricot.spec sources 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
- 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2009 20:29:16 -0000	1.5
+++ .cvsignore	8 Apr 2009 14:34:19 -0000	1.6
@@ -1 +1 @@
-hpricot-0.7-modified.gem
+hpricot-0.8.1-modified.gem


Index: rubygem-hpricot.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/F-9/rubygem-hpricot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygem-hpricot.spec	25 Mar 2009 20:17:57 -0000	1.3
+++ rubygem-hpricot.spec	8 Apr 2009 14:34:19 -0000	1.4
@@ -9,7 +9,7 @@
 
 Summary:	A Fast, Enjoyable HTML Parser for Ruby
 Name:		rubygem-%{gemname}
-Version:	0.7
+Version:	0.8.1
 Release:	1%{?dist}
 Group:		Development/Languages
 # ext/fast_xs/FastXsService.java is licensed under ASL 2.0
@@ -182,6 +182,9 @@
 %{ruby_sitelib}/%{gemname}/
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
+- 0.8.1
+
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7-1
 - 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2009 20:29:16 -0000	1.5
+++ sources	8 Apr 2009 14:34:19 -0000	1.6
@@ -1 +1 @@
-b9533510229451a265778b96425e6602  hpricot-0.7-modified.gem
+9940cd4abd93ea0cd84fa98a735bf45f  hpricot-0.8.1-modified.gem



From mtasaka at fedoraproject.org  Wed Apr  8 14:34:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 14:34:49 +0000 (UTC)
Subject: rpms/rubygem-hpricot/devel .cvsignore, 1.5, 1.6 rubygem-hpricot.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090408143449.BC35B7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-hpricot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477/devel

Modified Files:
	.cvsignore rubygem-hpricot.spec sources 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
- 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2009 20:29:17 -0000	1.5
+++ .cvsignore	8 Apr 2009 14:34:19 -0000	1.6
@@ -1 +1 @@
-hpricot-0.7-modified.gem
+hpricot-0.8.1-modified.gem


Index: rubygem-hpricot.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/devel/rubygem-hpricot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-hpricot.spec	25 Mar 2009 20:17:58 -0000	1.4
+++ rubygem-hpricot.spec	8 Apr 2009 14:34:19 -0000	1.5
@@ -9,7 +9,7 @@
 
 Summary:	A Fast, Enjoyable HTML Parser for Ruby
 Name:		rubygem-%{gemname}
-Version:	0.7
+Version:	0.8.1
 Release:	1%{?dist}
 Group:		Development/Languages
 # ext/fast_xs/FastXsService.java is licensed under ASL 2.0
@@ -182,6 +182,9 @@
 %{ruby_sitelib}/%{gemname}/
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
+- 0.8.1
+
 * Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7-1
 - 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hpricot/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2009 20:29:17 -0000	1.5
+++ sources	8 Apr 2009 14:34:19 -0000	1.6
@@ -1 +1 @@
-b9533510229451a265778b96425e6602  hpricot-0.7-modified.gem
+9940cd4abd93ea0cd84fa98a735bf45f  hpricot-0.8.1-modified.gem



From james at fedoraproject.org  Wed Apr  8 14:38:01 2009
From: james at fedoraproject.org (James Antill)
Date: Wed,  8 Apr 2009 14:38:01 +0000 (UTC)
Subject: rpms/python-urlgrabber/devel
	urlgrabber-3.0.0-progress-C-c+serial-console.patch, NONE,
	1.1 python-urlgrabber.spec, 1.34, 1.35
Message-ID: <20090408143801.1F3347011A@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/python-urlgrabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18456

Modified Files:
	python-urlgrabber.spec 
Added Files:
	urlgrabber-3.0.0-progress-C-c+serial-console.patch 
Log Message:
* Wed Apr  8 2009 James Antill <james at fedoraproject.org> 3.0.0-15
- Fix progress bars for serial consoles.
- Make C-c behaviour a little nicer.


urlgrabber-3.0.0-progress-C-c+serial-console.patch:

--- NEW FILE urlgrabber-3.0.0-progress-C-c+serial-console.patch ---
diff -ru urlgrabber-3.0.0-orig/urlgrabber/progress.py urlgrabber-3.0.0/urlgrabber/progress.py
--- urlgrabber-3.0.0-orig/urlgrabber/progress.py	2009-04-08 10:24:52.000000000 -0400
+++ urlgrabber-3.0.0/urlgrabber/progress.py	2009-04-08 10:31:51.000000000 -0400
@@ -34,7 +34,11 @@
     try:
         buf = 'abcdefgh'
         buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, buf)
-        return struct.unpack('hhhh', buf)[1]
+        ret = struct.unpack('hhhh', buf)[1]
+        if ret == 0:
+            return 80
+        # Add minimum too?
+        return ret
     except: # IOError
         return 80
 
@@ -237,7 +241,7 @@
             ui_time = tl.add(' %9s' % fetime)
             ui_end  = tl.add(' ' * 5)
             ui_rate = tl.add(' %5sB/s' % ave_dl)
-            out = '\r%-*.*s%s%s%s%s' % (tl.rest(), tl.rest(), text,
+            out = '%-*.*s%s%s%s%s\r' % (tl.rest(), tl.rest(), text,
                                         ui_rate, ui_size, ui_time, ui_end)
         else:
             rtime = self.re.remaining_time()
@@ -261,7 +265,7 @@
             if (blen * frac) - int(blen * frac) >= 0.5:
                 bar += '-'
             ui_bar  = tl.add(' [%-*.*s]' % (blen, blen, bar))
-            out = '\r%-*.*s%s%s%s%s%s%s%s' % (tl.rest(), tl.rest(), text,
+            out = '%-*.*s%s%s%s%s%s%s%s\r' % (tl.rest(), tl.rest(), text,
                                               ui_sofar_pc, ui_pc, ui_bar,
                                               ui_rate, ui_size, ui_time, ui_end)
 
@@ -282,7 +286,12 @@
         tl = TerminalLine(8)
         ui_size = tl.add(' | %5sB' % total_size)
         ui_time = tl.add(' %9s' % total_time)
-        ui_end  = tl.add(' ' * 5)
+        not_done = self.size is not None and amount_read != self.size
+        if not_done:
+            ui_end  = tl.add(' ... ')
+        else:
+            ui_end  = tl.add(' ' * 5)
+        
         out = '\r%-*.*s%s%s%s\n' % (tl.rest(), tl.rest(), text,
                                     ui_size, ui_time, ui_end)
         self.fo.write(out)
@@ -290,7 +299,7 @@
 
         # Don't add size to the sofar size until we have all of it.
         # If we don't have a size, then just pretend/hope we got all of it.
-        if self.size is not None and amount_read != self.size:
+        if not_done:
             return
 
         if _text_meter_total_size:
Only in urlgrabber-3.0.0/urlgrabber: progress.py~


Index: python-urlgrabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-urlgrabber/devel/python-urlgrabber.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- python-urlgrabber.spec	13 Mar 2009 14:51:19 -0000	1.34
+++ python-urlgrabber.spec	8 Apr 2009 14:37:30 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: A high-level cross-protocol url-grabber
 Name: python-urlgrabber
 Version: 3.0.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Source0: urlgrabber-%{version}.tar.gz
 Patch0: urlgrabber-keepalive.patch
 Patch1: urlgrabber-string-type.patch
@@ -15,6 +15,8 @@
 Patch7: urlgrabber-extra-progress.patch
 Patch8: urlgrabber-file-checkfunc.patch
 Patch9: md5-hashlib.patch
+Patch10: urlgrabber-3.0.0-progress-C-c+serial-console.patch
+
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -40,6 +42,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 python setup.py build
@@ -59,6 +62,10 @@
 %{_bindir}/urlgrabber
 
 %changelog
+* Wed Apr  8 2009 James Antill <james at fedoraproject.org> 3.0.0-15
+- Fix progress bars for serial consoles.
+- Make C-c behaviour a little nicer.
+
 * Fri Mar 13 2009 Seth Vidal <skvidal at fedoraproject.org>
 - kill deprecation warning from importing md5 if anyone uses keepalive
 



From limb at fedoraproject.org  Wed Apr  8 14:40:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  8 Apr 2009 14:40:38 +0000 (UTC)
Subject: rpms/argyllcms/F-10 argyllcms-CVE-2009-0792.patch, NONE,
	1.1 argyllcms.spec, 1.7, 1.8
Message-ID: <20090408144038.D85AE7011A@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20014/F-10

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-CVE-2009-0792.patch 
Log Message:
CVE-2009-0792.


argyllcms-CVE-2009-0792.patch:

--- NEW FILE argyllcms-CVE-2009-0792.patch ---
--- icc/icc.c.orig	2009-04-08 08:38:40.000000000 -0400
+++ icc/icc.c	2009-04-08 08:54:08.000000000 -0400
@@ -3312,7 +3312,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (unsigned int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3334,6 +3334,11 @@ static int icmTable_setup_bwd(
 ) {
 	unsigned int i;
 
+        if (size > INT_MAX - 2)
+        /* Although rt->size is unsigned long, the rt data
+         * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3352,7 +3357,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (unsigned int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(unsigned int *))) == NULL) {
+        if ((rt->rlists = (unsigned int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3365,6 +3370,16 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+
+                /* s and e should both be in the range [0,rt->rsize]
+                 * now, but let's not rely on floating point
+                 * calculations -- double-check. */
+                if (s < 0)
+                        s = 0;
+                if (e < 0)
+                        e = 0;
+                if (s >= rt->rsize)
+                        s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3383,6 +3398,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+                                        if (as > INT_MAX / 2 / sizeof (int))
+                                                return 2;
+
 					as *= 2;
 					rt->rlists[j] = (unsigned int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(unsigned int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3434,7 +3452,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+        if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3461,6 +3479,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+        /* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -4704,7 +4723,7 @@ double *in		/* Input array[inputChan] */
 				rv |= 1;
 			}
 			ix = (int)floor(val);		/* Grid coordinate */
-			if (ix > (p->inputEnt-2))
+			if (ix < 0 || ix > (p->inputEnt-2))
 				ix = (p->inputEnt-2);
 			w = val - (double)ix;		/* weight */
 			val = table[ix];
@@ -4764,7 +4783,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4838,7 +4857,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4957,7 +4976,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -5070,7 +5089,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			ix = (int)floor(val);		/* Grid coordinate */
-			if (ix > (p->outputEnt-2))
+			if (ix < 0 || ix > (p->outputEnt-2))
 				ix = (p->outputEnt-2);
 			w = val - (double)ix;		/* weight */
 			val = table[ix];
@@ -7887,7 +7906,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+                if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -9061,7 +9080,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+                if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -9515,7 +9534,7 @@ static double icmVideoCardGamma_lookup(
 		else if (val0 > inputEnt_1)
 			val0 = inputEnt_1;
 		ix = (int)floor(val0);		/* Coordinate */
-		if (ix > (p->u.table.entryCount-2))
+		if (ix < 0 || ix > (p->u.table.entryCount-2))
 			ix = (p->u.table.entryCount-2);
 		w = val0 - (double)ix;		/* weight */
 		if (p->u.table.entrySize == 1) {
@@ -10061,7 +10080,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+                if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -10071,7 +10090,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+                        if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-10/argyllcms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- argyllcms.spec	23 Mar 2009 16:46:51 -0000	1.7
+++ argyllcms.spec	8 Apr 2009 14:40:08 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 3%{?alphatag}%{?dist}
+Release: 4%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -19,6 +19,7 @@
 # Patch applied for legal reasons
 Patch4:  %{name}-1.0.2-legal.patch
 Patch5: argyllcms-CVE-2009-0583,0584.patch
+Patch6: argyllcms-CVE-2009-0792.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -117,6 +118,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
+- Patch for ICC library CVE-2009-0792.
+
 * Mon Mar 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-3
 - Patch for ICC library CVE-2009-{0583, 0584} by Tim Waugh.
 



From limb at fedoraproject.org  Wed Apr  8 14:40:39 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  8 Apr 2009 14:40:39 +0000 (UTC)
Subject: rpms/argyllcms/F-9 argyllcms-CVE-2009-0792.patch, NONE,
	1.1 argyllcms.spec, 1.4, 1.5
Message-ID: <20090408144039.3881A7011A@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20014/F-9

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-CVE-2009-0792.patch 
Log Message:
CVE-2009-0792.


argyllcms-CVE-2009-0792.patch:

--- NEW FILE argyllcms-CVE-2009-0792.patch ---
--- icc/icc.c.orig	2009-04-08 08:38:40.000000000 -0400
+++ icc/icc.c	2009-04-08 08:54:08.000000000 -0400
@@ -3312,7 +3312,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (unsigned int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3334,6 +3334,11 @@ static int icmTable_setup_bwd(
 ) {
 	unsigned int i;
 
+        if (size > INT_MAX - 2)
+        /* Although rt->size is unsigned long, the rt data
+         * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3352,7 +3357,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (unsigned int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(unsigned int *))) == NULL) {
+        if ((rt->rlists = (unsigned int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3365,6 +3370,16 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+
+                /* s and e should both be in the range [0,rt->rsize]
+                 * now, but let's not rely on floating point
+                 * calculations -- double-check. */
+                if (s < 0)
+                        s = 0;
+                if (e < 0)
+                        e = 0;
+                if (s >= rt->rsize)
+                        s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3383,6 +3398,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+                                        if (as > INT_MAX / 2 / sizeof (int))
+                                                return 2;
+
 					as *= 2;
 					rt->rlists[j] = (unsigned int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(unsigned int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3434,7 +3452,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+        if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3461,6 +3479,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+        /* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -4704,7 +4723,7 @@ double *in		/* Input array[inputChan] */
 				rv |= 1;
 			}
 			ix = (int)floor(val);		/* Grid coordinate */
-			if (ix > (p->inputEnt-2))
+			if (ix < 0 || ix > (p->inputEnt-2))
 				ix = (p->inputEnt-2);
 			w = val - (double)ix;		/* weight */
 			val = table[ix];
@@ -4764,7 +4783,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4838,7 +4857,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4957,7 +4976,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -5070,7 +5089,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			ix = (int)floor(val);		/* Grid coordinate */
-			if (ix > (p->outputEnt-2))
+			if (ix < 0 || ix > (p->outputEnt-2))
 				ix = (p->outputEnt-2);
 			w = val - (double)ix;		/* weight */
 			val = table[ix];
@@ -7887,7 +7906,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+                if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -9061,7 +9080,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+                if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -9515,7 +9534,7 @@ static double icmVideoCardGamma_lookup(
 		else if (val0 > inputEnt_1)
 			val0 = inputEnt_1;
 		ix = (int)floor(val0);		/* Coordinate */
-		if (ix > (p->u.table.entryCount-2))
+		if (ix < 0 || ix > (p->u.table.entryCount-2))
 			ix = (p->u.table.entryCount-2);
 		w = val0 - (double)ix;		/* weight */
 		if (p->u.table.entrySize == 1) {
@@ -10061,7 +10080,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+                if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -10071,7 +10090,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+                        if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-9/argyllcms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- argyllcms.spec	23 Mar 2009 17:09:25 -0000	1.4
+++ argyllcms.spec	8 Apr 2009 14:40:08 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 3%{?alphatag}%{?dist}
+Release: 4%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -19,6 +19,7 @@
 # Patch applied for legal reasons
 Patch4:  %{name}-1.0.2-legal.patch
 Patch5: argyllcms-CVE-2009-0583,0584.patch
+Patch6: argyllcms-CVE-2009-0792.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -117,6 +118,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
+- Patch for ICC library CVE-2009-0792.
+
 * Mon Mar 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-3
 - Patch for ICC library CVE-2009-{0583, 0584} by Tim Waugh.
 



From jwrdegoede at fedoraproject.org  Wed Apr  8 14:47:24 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  8 Apr 2009 14:47:24 +0000 (UTC)
Subject: rpms/xfig/devel xfig-3.2.5-rh494193.patch, NONE, 1.1 xfig.spec, 1.59,
	1.60
Message-ID: <20090408144724.803B47011A@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21824

Modified Files:
	xfig.spec 
Added Files:
	xfig-3.2.5-rh494193.patch 
Log Message:
* Wed Apr  8 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-19.a
- Fix crash when printing (#494193), thanks to Ian Dall for the patch


xfig-3.2.5-rh494193.patch:

--- NEW FILE xfig-3.2.5-rh494193.patch ---
diff -up xfig.3.2.5a/w_print.c~ xfig.3.2.5a/w_print.c
--- xfig.3.2.5a/w_print.c~	2009-04-08 16:44:24.000000000 +0200
+++ xfig.3.2.5a/w_print.c	2009-04-08 16:45:35.000000000 +0200
@@ -958,7 +958,7 @@ void create_print_panel(Widget w)
 	   var and put it into the widget */
 	if (emptyname(printer_val)) {
 		printer_val=getenv("PRINTER");
-		if (strchr(printer_val,'\\')) {
+		if (printer_val && strchr(printer_val,'\\')) {
 		    buf[0]='\0';
 		    len=0;
 		    for (i=0; i<strlen(printer_val); i++) {


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xfig.spec	28 Mar 2009 09:00:01 -0000	1.59
+++ xfig.spec	8 Apr 2009 14:46:54 -0000	1.60
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 18.a%{?dist}
+Release: 19.a%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -28,6 +28,7 @@
 Patch17: xfig-3.2.5-rh490257.patch
 Patch18: xfig-3.2.5-rh490259.patch
 Patch19: xfig-3.2.5-debian.patch
+Patch20: xfig-3.2.5-rh494193.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -106,6 +107,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 rm Doc/html/images/sav1a0.tmp
 
 
@@ -194,6 +196,9 @@
 
 
 %changelog
+* Wed Apr  8 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-19.a
+- Fix crash when printing (#494193), thanks to Ian Dall for the patch
+
 * Fri Mar 27 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-18.a
 - Rebase to new upstream 3.2.5a release, this was made available to me by
   the Debian maintainer who is in contact with upstream, which appearantly



From toshio at fedoraproject.org  Wed Apr  8 14:48:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed,  8 Apr 2009 14:48:52 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts/devel test2,NONE,1.1
Message-ID: <20090408144852.D1E117011A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22368

Added Files:
	test2 
Log Message:
Test adding a file



--- NEW FILE test2 ---



From jwrdegoede at fedoraproject.org  Wed Apr  8 14:50:45 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  8 Apr 2009 14:50:45 +0000 (UTC)
Subject: rpms/xfig/F-10 xfig-3.2.5-rh494193.patch, NONE, 1.1 xfig.spec, 1.55,
	1.56
Message-ID: <20090408145045.5ADD87011A@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22710

Modified Files:
	xfig.spec 
Added Files:
	xfig-3.2.5-rh494193.patch 
Log Message:
* Wed Apr  8 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-19.a
- Fix crash when printing (#494193), thanks to Ian Dall for the patch


xfig-3.2.5-rh494193.patch:

--- NEW FILE xfig-3.2.5-rh494193.patch ---
diff -up xfig.3.2.5a/w_print.c~ xfig.3.2.5a/w_print.c
--- xfig.3.2.5a/w_print.c~	2009-04-08 16:44:24.000000000 +0200
+++ xfig.3.2.5a/w_print.c	2009-04-08 16:45:35.000000000 +0200
@@ -958,7 +958,7 @@ void create_print_panel(Widget w)
 	   var and put it into the widget */
 	if (emptyname(printer_val)) {
 		printer_val=getenv("PRINTER");
-		if (strchr(printer_val,'\\')) {
+		if (printer_val && strchr(printer_val,'\\')) {
 		    buf[0]='\0';
 		    len=0;
 		    for (i=0; i<strlen(printer_val); i++) {


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/F-10/xfig.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xfig.spec	1 Apr 2009 14:43:47 -0000	1.55
+++ xfig.spec	8 Apr 2009 14:50:14 -0000	1.56
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 18.a%{?dist}
+Release: 19.a%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -28,6 +28,7 @@
 Patch17: xfig-3.2.5-rh490257.patch
 Patch18: xfig-3.2.5-rh490259.patch
 Patch19: xfig-3.2.5-debian.patch
+Patch20: xfig-3.2.5-rh494193.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -106,6 +107,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 rm Doc/html/images/sav1a0.tmp
 
 
@@ -194,6 +196,9 @@
 
 
 %changelog
+* Wed Apr  8 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-19.a
+- Fix crash when printing (#494193), thanks to Ian Dall for the patch
+
 * Fri Mar 27 2009 Hans de Goede <hdegoede at redhat.com> 3.2.5-18.a
 - Rebase to new upstream 3.2.5a release, this was made available to me by
   the Debian maintainer who is in contact with upstream, which appearantly



From mmahut at fedoraproject.org  Wed Apr  8 14:54:49 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Wed,  8 Apr 2009 14:54:49 +0000 (UTC)
Subject: rpms/rmap/devel rmap.spec,1.4,1.5
Message-ID: <20090408145449.C013E7011A@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/rmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23585

Modified Files:
	rmap.spec 
Log Message:
splitting



Index: rmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rmap/devel/rmap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rmap.spec	25 Feb 2009 20:09:19 -0000	1.4
+++ rmap.spec	8 Apr 2009 14:54:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rmap
 Version:	1.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Rmap is a package that is able to generate images of the earth from a distance
 
 License:	GPLv2+
@@ -15,6 +15,13 @@
 Rmap is a package that will allow you to generate
 images of the earth from a distance or fairly zoomed in.
 
+%package data
+Summary:     Rendering data for rmap
+Group:       Applications/Engineering
+
+%description data
+This package contains rendering data for rmap.
+
 %prep
 %setup -q
 
@@ -38,10 +45,15 @@
 %{_bindir}/rmap
 %dir %{_datadir}/rmap
 %{_datadir}/rmap/rmap.colors
-%{_datadir}/rmap/earth.rez
 %{_mandir}/man1/rmap.*
 
+%files data
+%{_datadir}/rmap/earth.rez
+
 %changelog
+* Wed Apr  8 2009 Marek Mahut <mmahut at fedoraproject.org> - 1.2-6
+- Data subpackage for vector rendering data
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Wed Apr  8 14:56:06 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed,  8 Apr 2009 14:56:06 +0000 (UTC)
Subject: rpms/tulrich-tuffy-fonts/devel test2,1.1,NONE
Message-ID: <20090408145606.1348C7011A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/tulrich-tuffy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24066

Removed Files:
	test2 
Log Message:
Remove test.



--- test2 DELETED ---



From ajax at fedoraproject.org  Wed Apr  8 14:56:46 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  8 Apr 2009 14:56:46 +0000 (UTC)
Subject: rpms/cvs/devel cvs.spec,1.62,1.63
Message-ID: <20090408145646.22F307011A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/cvs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250

Modified Files:
	cvs.spec 
Log Message:
* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com> 1.11.23-4
- Disable krb4 support to fix F12 buildroots.



Index: cvs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cvs.spec	24 Feb 2009 10:24:12 -0000	1.62
+++ cvs.spec	8 Apr 2009 14:56:15 -0000	1.63
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.23
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -102,8 +102,8 @@
 	k5prefix=`krb5-config --prefix`
 	CPPFLAGS=-I${k5prefix}/include/kerberosIV; export CPPFLAGS
 	CFLAGS=-I${k5prefix}/include/kerberosIV; export CFLAGS
-	LIBS="-lkrb4 -ldes425 -lk5crypto"; export LIBS
-	KRB_CONFIG="--with-gssapi --with-krb4 --enable-encryption"
+	LIBS="-lk5crypto"; export LIBS
+	KRB_CONFIG="--with-gssapi --without-krb4 --enable-encryption"
 %endif
 
 %configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" \
@@ -163,6 +163,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com> 1.11.23-4
+- Disable krb4 support to fix F12 buildroots.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From than at fedoraproject.org  Wed Apr  8 15:08:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  8 Apr 2009 15:08:43 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-kjob.patch, NONE, 1.1 kdelibs.spec,
	1.463, 1.464
Message-ID: <20090408150843.202357011A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26573

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kjob.patch 
Log Message:
upstream patch fix ReadOnlyPart crash for non-local file


kdelibs-4.2.2-kjob.patch:

--- NEW FILE kdelibs-4.2.2-kjob.patch ---
Index: kdeui/jobs/kuiserverjobtracker.cpp
===================================================================
--- kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950983)
@@ -35,13 +35,32 @@
 class KUiServerJobTracker::Private
 {
 public:
-    Private() { }
+    Private(KUiServerJobTracker *parent)
+        : q(parent)
+    {
+    }
 
+    KUiServerJobTracker *const q;
+
+    void _k_killJob();
+
     QHash<KJob*, org::kde::JobView*> progressJobView;
 };
 
+void KUiServerJobTracker::Private::_k_killJob()
+{
+    org::kde::JobView *jobView = qobject_cast<org::kde::JobView*>(q->sender());
+
+    if (jobView) {
+        KJob *job = progressJobView.key(jobView);
+
+        if (job)
+            job->kill(KJob::EmitResult);
+    }
+}
+
 KUiServerJobTracker::KUiServerJobTracker(QObject *parent)
-    : KJobTrackerInterface(parent), d(new Private)
+    : KJobTrackerInterface(parent), d(new Private(this))
 {
 
 }
@@ -81,8 +100,8 @@
                                                            reply.value().path(),
                                                            QDBusConnection::sessionBus());
 
-        QObject::connect(jobView, SIGNAL(cancelRequested()), job,
-                         SLOT(kill()));
+        QObject::connect(jobView, SIGNAL(cancelRequested()), this,
+                         SLOT(_k_killJob()));
         QObject::connect(jobView, SIGNAL(suspendRequested()), job,
                          SLOT(suspend()));
         QObject::connect(jobView, SIGNAL(resumeRequested()), job,
Index: kdeui/jobs/kuiserverjobtracker.h
===================================================================
--- kdeui/jobs/kuiserverjobtracker.h	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.h	(Revision 950983)
@@ -78,6 +78,8 @@
 private:
     class Private;
     Private *const d;
+
+    Q_PRIVATE_SLOT(d, void _k_killJob())
 };
 
 #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- kdelibs.spec	7 Apr 2009 15:43:04 -0000	1.463
+++ kdelibs.spec	8 Apr 2009 15:08:10 -0000	1.464
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -88,6 +88,7 @@
 # upstream
 # 4.2 branch
 Patch100: kdelibs-4.2.2-kio_http.patch
+Patch101: kdelibs-4.2.2-kjob.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -229,6 +230,7 @@
 # upstream patches
 # 4.2
 %patch100 -p0 -b .kio_http
+%patch101 -p0 -b .kjob
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -413,6 +415,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- upstream patch fix ReadOnlyPart crash for non-local file
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix kickoff focus issue
 



From pkgdb at fedoraproject.org  Wed Apr  8 15:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:12:35 +0000
Subject: [pkgdb] bugzilla: eseyman has requested approveacls
Message-ID: <20090408151143.D093A10F862@bastion2.fedora.phx.redhat.com>

eseyman has requested the approveacls acl on bugzilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:11:55 +0000
Subject: [pkgdb] bugzilla: eseyman has requested watchcommits
Message-ID: <20090408151156.8D47B10F862@bastion2.fedora.phx.redhat.com>

eseyman has requested the watchcommits acl on bugzilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:12:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:12:48 +0000
Subject: [pkgdb] bugzilla: eseyman has requested watchbugzilla
Message-ID: <20090408151158.2A2F810F872@bastion2.fedora.phx.redhat.com>

eseyman has requested the watchbugzilla acl on bugzilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:12:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:12:52 +0000
Subject: [pkgdb] bugzilla: eseyman has requested commit
Message-ID: <20090408151201.5AD6410F876@bastion2.fedora.phx.redhat.com>

eseyman has requested the commit acl on bugzilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:06 +0000
Subject: [pkgdb] bugzilla: eseyman has requested watchbugzilla
Message-ID: <20090408151314.9B45C10F871@bastion2.fedora.phx.redhat.com>

eseyman has requested the watchbugzilla acl on bugzilla (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:04 +0000
Subject: [pkgdb] bugzilla: eseyman has requested watchcommits
Message-ID: <20090408151314.BAB5710F879@bastion2.fedora.phx.redhat.com>

eseyman has requested the watchcommits acl on bugzilla (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:13:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:13:15 +0000
Subject: [pkgdb] bugzilla: eseyman has requested commit
Message-ID: <20090408151315.89E8210F87D@bastion2.fedora.phx.redhat.com>

eseyman has requested the commit acl on bugzilla (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:08 +0000
Subject: [pkgdb] bugzilla: eseyman has requested approveacls
Message-ID: <20090408151316.9284410F880@bastion2.fedora.phx.redhat.com>

eseyman has requested the approveacls acl on bugzilla (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:10 +0000
Subject: [pkgdb] bugzilla: eseyman has requested watchbugzilla
Message-ID: <20090408151320.370AD10F884@bastion2.fedora.phx.redhat.com>

eseyman has requested the watchbugzilla acl on bugzilla (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:13:19 +0000
Subject: [pkgdb] bugzilla: eseyman has requested watchcommits
Message-ID: <20090408151320.5ED7010F886@bastion2.fedora.phx.redhat.com>

eseyman has requested the watchcommits acl on bugzilla (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:13 +0000
Subject: [pkgdb] bugzilla: eseyman has requested approveacls
Message-ID: <20090408151322.26B7210F88B@bastion2.fedora.phx.redhat.com>

eseyman has requested the approveacls acl on bugzilla (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:14 +0000
Subject: [pkgdb] bugzilla: eseyman has requested commit
Message-ID: <20090408151324.0032C10F88D@bastion2.fedora.phx.redhat.com>

eseyman has requested the commit acl on bugzilla (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:14:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:14:29 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151429.AEEE210F87F@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on bugzilla (Fedora devel) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:16:06 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151515.5075210F862@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on bugzilla (Fedora devel) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:16:06 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151516.13EEE10F871@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on bugzilla (Fedora devel) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:15:22 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151523.13E0010F878@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on bugzilla (Fedora 9) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:16:14 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151523.6B8C910F87B@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on bugzilla (Fedora 9) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:16:14 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151524.C8DCC10F880@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on bugzilla (Fedora 9) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:15:27 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151527.E3E4710F883@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on bugzilla (Fedora 10) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:16:20 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151528.E6CA310F887@bastion2.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on bugzilla (Fedora 10) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From pkgdb at fedoraproject.org  Wed Apr  8 15:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:16:19 +0000
Subject: [pkgdb] bugzilla had acl change status
Message-ID: <20090408151529.8685310F886@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on bugzilla (Fedora 10) to Approved for eseyman

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bugzilla



From nphilipp at fedoraproject.org  Wed Apr  8 15:18:41 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  8 Apr 2009 15:18:41 +0000 (UTC)
Subject: rpms/system-config-date-docs/devel .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 system-config-date-docs.spec, 1.3, 1.4
Message-ID: <20090408151841.669077011A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29139

Modified Files:
	.cvsignore sources system-config-date-docs.spec 
Log Message:
pull in updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Dec 2008 17:39:35 -0000	1.2
+++ .cvsignore	8 Apr 2009 15:18:09 -0000	1.3
@@ -1 +1 @@
-system-config-date-docs-1.0.5.tar.bz2
+system-config-date-docs-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2008 18:23:26 -0000	1.3
+++ sources	8 Apr 2009 15:18:09 -0000	1.4
@@ -1 +1 @@
-4efdc32a1c234cca85779b12d93f2fa5  system-config-date-docs-1.0.5.tar.bz2
+fdc0c1626c141753f8de0fcbd5f345b9  system-config-date-docs-1.0.6.tar.bz2


Index: system-config-date-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/system-config-date-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-date-docs.spec	26 Feb 2009 05:02:14 -0000	1.3
+++ system-config-date-docs.spec	8 Apr 2009 15:18:09 -0000	1.4
@@ -8,8 +8,8 @@
 
 Summary: Documentation for setting the system date and time
 Name: system-config-date-docs
-Version: 1.0.5
-Release: 2%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
@@ -66,8 +66,8 @@
 %doc %{_datadir}/gnome/help/system-config-date
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
+- pull in updated translations
 
 * Thu Dec 18 2008 Nils Philippsen <nils at redhat.com> - 1.0.5-1
 - use non-colored rarian-compat requirement



From fschwarz at fedoraproject.org  Wed Apr  8 15:21:13 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Wed,  8 Apr 2009 15:21:13 +0000 (UTC)
Subject: rpms/python-tgcaptcha/devel python-tgcaptcha-system-tuffy.patch,
	NONE, 1.1 python-tgcaptcha.spec, 1.4, 1.5
Message-ID: <20090408152113.78CD27011A@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/python-tgcaptcha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29727

Modified Files:
	python-tgcaptcha.spec 
Added Files:
	python-tgcaptcha-system-tuffy.patch 
Log Message:
closes bz 477447


python-tgcaptcha-system-tuffy.patch:

--- NEW FILE python-tgcaptcha-system-tuffy.patch ---
diff -r 9d6932712735 tgcaptcha/plugins/image/mcdermott.py
--- a/tgcaptcha/plugins/image/mcdermott.py	Wed Mar 04 08:26:10 2009 +0100
+++ b/tgcaptcha/plugins/image/mcdermott.py	Wed Mar 04 08:28:14 2009 +0100
@@ -12,6 +12,8 @@
 if not font_path:
     font_path = os.path.abspath(
                 resource_filename('tgcaptcha', 'static/fonts/tuffy/Tuffy.ttf'))
+if not os.path.exists(font_path):
+    font_path = os.path.normpath('/usr/share/fonts/tulrich-tuffy/Tuffy.ttf')
 assert os.path.exists(font_path), \
                 'The font_path "%s" does not exist' % (font_path,)
     
@@ -44,4 +46,4 @@
 	d.text((3,3), text, font=font, fill=fgcolor)
 	im = im.filter(ImageFilter.EDGE_ENHANCE_MORE)
 	# save the image to a file
-	im.save(file_obj, format='JPEG')
\ No newline at end of file
+	im.save(file_obj, format='JPEG')
diff -r 9d6932712735 tgcaptcha/plugins/image/vanasco_dowty/__init__.py
--- a/tgcaptcha/plugins/image/vanasco_dowty/__init__.py	Wed Mar 04 08:26:10 2009 +0100
+++ b/tgcaptcha/plugins/image/vanasco_dowty/__init__.py	Wed Mar 04 08:28:14 2009 +0100
@@ -14,9 +14,7 @@
 font_size_min = int(config.get(plugin_name + 'font_size_min', 30))
 font_size_max = int(config.get(plugin_name + 'font_size_min', 45))
 font_paths = config.get(plugin_name + 'font_paths',
-                [os.path.abspath(resource_filename('tgcaptcha', 
-                                'static/fonts/tuffy/Tuffy.ttf'))])
-
+                [os.path.normpath('/usr/share/fonts/tulrich-tuffy/Tuffy.ttf')])
 captcha.font__paths = font_paths
 captcha.captcha__text__render_mode = config.get(plugin_name +
         'text_render_mode', 'by_letter')
@@ -28,4 +26,4 @@
     fg = random.choice(fg_color)
     ci = captcha._Captcha__Img(text, width, height, font_size, fg, bg_color)
     image = ci.render()
-    image.save(file_, format='JPEG')
\ No newline at end of file
+    image.save(file_, format='JPEG')


Index: python-tgcaptcha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgcaptcha/devel/python-tgcaptcha.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tgcaptcha.spec	26 Feb 2009 23:42:05 -0000	1.4
+++ python-tgcaptcha.spec	8 Apr 2009 15:20:43 -0000	1.5
@@ -4,13 +4,14 @@
 
 Name:           python-tgcaptcha
 Version:        0.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A TurboGears CAPTCHA widget for forms
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/tgcaptcha
 Source0:        http://tgcaptcha.googlecode.com/files/%{eggname}-%{version}.tar.gz
+Patch0:         python-tgcaptcha-system-tuffy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -18,6 +19,7 @@
 Requires:       TurboGears >= 1.0.1
 Requires:       python-crypto >= 2.0.1
 Requires:       python-imaging
+Requires:       tulrich-tuffy-fonts
 
 %description
 TGCaptcha is a TurboGears widget that provides an easy way to incorporate a
@@ -26,16 +28,17 @@
 
 %prep
 %setup -q -n %{eggname}-%{version}
-chmod -x tgcaptcha/static/fonts/tuffy/*
+%patch0 -p1 -b .tuffy
 
 
 %build
-%{__python} setup.py build
+rm -rf tgcaptcha/static/fonts/
 
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT 
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT 
 
 
 %clean
@@ -50,8 +53,8 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Mar 03 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 0.11-6
+- Use system installed tuffy (patch by Toshio Kuratomi)
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.11-4
 - Rebuild for Python 2.6



From nphilipp at fedoraproject.org  Wed Apr  8 15:22:07 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  8 Apr 2009 15:22:07 +0000 (UTC)
Subject: rpms/system-config-nfs-docs/devel .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 system-config-nfs-docs.spec, 1.3, 1.4
Message-ID: <20090408152207.AA21C7011A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30287

Modified Files:
	.cvsignore sources system-config-nfs-docs.spec 
Log Message:
pull in updated translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Dec 2008 17:41:38 -0000	1.2
+++ .cvsignore	8 Apr 2009 15:21:36 -0000	1.3
@@ -1 +1 @@
-system-config-nfs-docs-1.0.4.tar.bz2
+system-config-nfs-docs-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2008 18:23:28 -0000	1.3
+++ sources	8 Apr 2009 15:21:37 -0000	1.4
@@ -1 +1 @@
-03fc5ff6100890f8ea379f87b7fc1eaa  system-config-nfs-docs-1.0.4.tar.bz2
+10e190f37c44c4a4023f0e2103aef0a9  system-config-nfs-docs-1.0.5.tar.bz2


Index: system-config-nfs-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/system-config-nfs-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-nfs-docs.spec	26 Feb 2009 05:13:49 -0000	1.3
+++ system-config-nfs-docs.spec	8 Apr 2009 15:21:37 -0000	1.4
@@ -8,8 +8,8 @@
 
 Summary: Documentation for configuring an NFS server
 Name: system-config-nfs-docs
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
@@ -66,8 +66,8 @@
 %doc %{_datadir}/gnome/help/system-config-nfs
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.5-1
+- pull in updated translations
 
 * Thu Dec 18 2008 Nils Philippsen <nils at redhat.com> - 1.0.4-1
 - use non-colored rarian-compat requirement



From nphilipp at fedoraproject.org  Wed Apr  8 15:25:52 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  8 Apr 2009 15:25:52 +0000 (UTC)
Subject: rpms/system-config-samba-docs/devel .cvsignore, 1.2, 1.3 sources,
	1.3, 1.4 system-config-samba-docs.spec, 1.3, 1.4
Message-ID: <20090408152552.822EA7011A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31105

Modified Files:
	.cvsignore sources system-config-samba-docs.spec 
Log Message:
pullin updated translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Dec 2008 17:42:17 -0000	1.2
+++ .cvsignore	8 Apr 2009 15:25:21 -0000	1.3
@@ -1 +1 @@
-system-config-samba-docs-1.0.4.tar.bz2
+system-config-samba-docs-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2008 18:23:27 -0000	1.3
+++ sources	8 Apr 2009 15:25:22 -0000	1.4
@@ -1 +1 @@
-027fe4e13cca58336490bce23b21f5ac  system-config-samba-docs-1.0.4.tar.bz2
+aa53cb6078b2f76cfe6bbfc8e6ff1de9  system-config-samba-docs-1.0.5.tar.bz2


Index: system-config-samba-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/system-config-samba-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-samba-docs.spec	26 Feb 2009 05:17:44 -0000	1.3
+++ system-config-samba-docs.spec	8 Apr 2009 15:25:22 -0000	1.4
@@ -8,8 +8,8 @@
 
 Summary: Documentation for configuring a Samba server
 Name: system-config-samba-docs
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
@@ -65,8 +65,8 @@
 %doc %{_datadir}/gnome/help/system-config-samba
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.5-1
+- pull in updated translations
 
 * Thu Dec 18 2008 Nils Philippsen <nils at redhat.com> - 1.0.4-1
 - add runtime requirements for rarian-compat/scrollkeeper



From overholt at fedoraproject.org  Wed Apr  8 15:26:35 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  8 Apr 2009 15:26:35 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel
	eclipse-linuxprofilingframework.spec, 1.6, 1.7
Message-ID: <20090408152635.C63287011A@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31325/devel

Modified Files:
	eclipse-linuxprofilingframework.spec 
Log Message:
* Wed Apr 8 2009 Andrew Overholt <overholt at redhat.com> 0.1.0-4
- Don't generate debuginfo (rhbz#494719).


Index: eclipse-linuxprofilingframework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/eclipse-linuxprofilingframework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-linuxprofilingframework.spec	23 Mar 2009 15:38:45 -0000	1.6
+++ eclipse-linuxprofilingframework.spec	8 Apr 2009 15:26:05 -0000	1.7
@@ -2,9 +2,12 @@
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_libdir}/eclipse/dropins/linuxprofilingframework
 
+# Package in %%{_libdir} but no native code so no debuginfo
+%global debug_package %{nil}
+
 Name:           eclipse-linuxprofilingframework
 Version:        0.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Eclipse Linux Tools Profiling Framework
 
 Group:          Development/Tools
@@ -54,6 +57,9 @@
 %{install_loc}
 
 %changelog
+* Wed Apr 8 2009 Andrew Overholt <overholt at redhat.com> 0.1.0-4
+- Don't generate debuginfo (rhbz#494719).
+
 * Mon Mar 23 2009 Elliott Baron <ebaron at redhat.com> 0.1.0-3
 - Rebuild for changes in pdebuild to not ship p2 metadata.
 



From iarnell at fedoraproject.org  Wed Apr  8 15:27:15 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 15:27:15 +0000 (UTC)
Subject: rpms/perl-Catalyst-Log-Log4perl/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-Log-Log4perl.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090408152715.AC9797011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31600

Modified Files:
	.cvsignore perl-Catalyst-Log-Log4perl.spec sources 
Log Message:
* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 1.03-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Mar 2009 16:49:16 -0000	1.3
+++ .cvsignore	8 Apr 2009 15:26:45 -0000	1.4
@@ -1 +1 @@
-Catalyst-Log-Log4perl-1.02.tar.gz
+Catalyst-Log-Log4perl-1.03.tar.gz


Index: perl-Catalyst-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/perl-Catalyst-Log-Log4perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Log-Log4perl.spec	15 Mar 2009 16:49:17 -0000	1.3
+++ perl-Catalyst-Log-Log4perl.spec	8 Apr 2009 15:26:45 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Log-Log4perl
-Version:        1.02
+Version:        1.03
 Release:        1%{?dist}
 Summary:        Log::Log4perl logging for Catalyst
 License:        GPL+ or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 1.03-1
+- update to latest upstream
+
 * Sun Mar 15 2009 Iain Arnell <iarnell at gmail.com> 1.02-1
 - update to latest upstream
 - remove unnecessary explicit requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Mar 2009 16:49:17 -0000	1.3
+++ sources	8 Apr 2009 15:26:45 -0000	1.4
@@ -1 +1 @@
-d9ec8a1bab2079846f2a41794e7a8b28  Catalyst-Log-Log4perl-1.02.tar.gz
+23b26077d4e943389dee279026363dc9  Catalyst-Log-Log4perl-1.03.tar.gz



From nphilipp at fedoraproject.org  Wed Apr  8 15:30:55 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  8 Apr 2009 15:30:55 +0000 (UTC)
Subject: rpms/system-config-services-docs/devel .cvsignore, 1.2, 1.3 sources,
	1.3, 1.4 system-config-services-docs.spec, 1.3, 1.4
Message-ID: <20090408153056.0611A7011A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32753

Modified Files:
	.cvsignore sources system-config-services-docs.spec 
Log Message:
pullin updated translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Dec 2008 17:43:57 -0000	1.2
+++ .cvsignore	8 Apr 2009 15:30:25 -0000	1.3
@@ -1 +1 @@
-system-config-services-docs-1.1.4.tar.bz2
+system-config-services-docs-1.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2008 18:23:28 -0000	1.3
+++ sources	8 Apr 2009 15:30:25 -0000	1.4
@@ -1 +1 @@
-106d7d35317272aafd9fdbb8bf70e29d  system-config-services-docs-1.1.4.tar.bz2
+f42c318bd2e6334266dc08498483d5bc  system-config-services-docs-1.1.5.tar.bz2


Index: system-config-services-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/system-config-services-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-services-docs.spec	26 Feb 2009 05:19:35 -0000	1.3
+++ system-config-services-docs.spec	8 Apr 2009 15:30:25 -0000	1.4
@@ -8,8 +8,8 @@
 
 Summary: Documentation for configuring system services
 Name: system-config-services-docs
-Version: 1.1.4
-Release: 2%{?dist}
+Version: 1.1.5
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -66,8 +66,8 @@
 %doc %{_datadir}/gnome/help/system-config-services
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.1.5-1
+- pull in updated translations
 
 * Thu Dec 18 2008 Nils Philippsen <nils at redhat.com> - 1.1.4-1
 - add runtime requirements for rarian-compat/scrollkeeper



From pkgdb at fedoraproject.org  Wed Apr  8 15:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 15:32:30 +0000
Subject: [pkgdb] monodevelop: altariamx has requested watchcommits
Message-ID: <20090408153140.AC4D010F870@bastion2.fedora.phx.redhat.com>

altariamx has requested the watchcommits acl on monodevelop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/monodevelop



From iarnell at fedoraproject.org  Wed Apr  8 15:32:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 15:32:06 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-URI/devel .cvsignore, 1.2, 
	1.3 perl-Catalyst-Plugin-Session-State-URI.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090408153206.D46AF7011A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv749

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-URI.spec sources 
Log Message:
* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Feb 2009 04:24:20 -0000	1.2
+++ .cvsignore	8 Apr 2009 15:31:36 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-URI-0.08.tar.gz
+Catalyst-Plugin-Session-State-URI-0.09.tar.gz


Index: perl-Catalyst-Plugin-Session-State-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/perl-Catalyst-Plugin-Session-State-URI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Catalyst-Plugin-Session-State-URI.spec	25 Feb 2009 04:26:07 -0000	1.2
+++ perl-Catalyst-Plugin-Session-State-URI.spec	8 Apr 2009 15:31:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-State-URI
-Version:        0.08
-Release:        2%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Saves session IDs by rewriting URIs delivered to the client
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
+- update to latest upstream
+
 * Wed Feb 25 2009 Iain Arnell <iarnell at gmail.com> 0.08-2
 - drop unnecessary explicit requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Feb 2009 04:24:20 -0000	1.2
+++ sources	8 Apr 2009 15:31:36 -0000	1.3
@@ -1 +1 @@
-89d5967c47b3563cfadd3dfc48611862  Catalyst-Plugin-Session-State-URI-0.08.tar.gz
+f919b9753e0c474ede924d7a9c5f03dc  Catalyst-Plugin-Session-State-URI-0.09.tar.gz



From nphilipp at fedoraproject.org  Wed Apr  8 15:33:47 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  8 Apr 2009 15:33:47 +0000 (UTC)
Subject: rpms/system-config-users-docs/devel .cvsignore, 1.2, 1.3 sources,
	1.3, 1.4 system-config-users-docs.spec, 1.3, 1.4
Message-ID: <20090408153347.E985B7011A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1337

Modified Files:
	.cvsignore sources system-config-users-docs.spec 
Log Message:
pull in updated translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Dec 2008 17:44:04 -0000	1.2
+++ .cvsignore	8 Apr 2009 15:33:17 -0000	1.3
@@ -1 +1 @@
-system-config-users-docs-1.0.4.tar.bz2
+system-config-users-docs-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2008 18:23:33 -0000	1.3
+++ sources	8 Apr 2009 15:33:17 -0000	1.4
@@ -1 +1 @@
-ace0da889eeb699dad115b1b071deb04  system-config-users-docs-1.0.4.tar.bz2
+e5522794bf98cb5947e3db863a1c2af9  system-config-users-docs-1.0.5.tar.bz2


Index: system-config-users-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/system-config-users-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-users-docs.spec	26 Feb 2009 05:21:45 -0000	1.3
+++ system-config-users-docs.spec	8 Apr 2009 15:33:17 -0000	1.4
@@ -8,8 +8,8 @@
 
 Summary: Documentation for administering users and groups
 Name: system-config-users-docs
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Documentation
@@ -65,8 +65,8 @@
 %doc %{_datadir}/gnome/help/system-config-users
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.5-1
+- pull in updated translations
 
 * Thu Dec 18 2008 Nils Philippsen <nils at redhat.com> - 1.0.4-1
 - use non-colored rarian-compat requirement



From davej at fedoraproject.org  Wed Apr  8 15:34:00 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  8 Apr 2009 15:34:00 +0000 (UTC)
Subject: rpms/kernel/F-11 Makefile, 1.101, 1.102 config-debug, 1.23,
	1.24 config-nodebug, 1.32, 1.33 config-x86-generic, 1.73,
	1.74 config-x86_64-generic, 1.73, 1.74 kernel.spec, 1.1519, 1.1520
Message-ID: <20090408153400.D927D7011A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1413

Modified Files:
	Makefile config-debug config-nodebug config-x86-generic 
	config-x86_64-generic kernel.spec 
Log Message:
disable MMIOTRACE in non-debug builds (#494584)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/Makefile,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Makefile	24 Mar 2009 01:31:28 -0000	1.101
+++ Makefile	8 Apr 2009 15:33:29 -0000	1.102
@@ -70,6 +70,7 @@
 	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
+	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -114,6 +115,7 @@
 	@perl -pi -e 's/CONFIG_PCI_MSI_DEFAULT_ON=y/# CONFIG_PCI_MSI_DEFAULT_ON is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
+	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-debug,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-debug	5 Feb 2009 19:02:18 -0000	1.23
+++ config-debug	8 Apr 2009 15:33:30 -0000	1.24
@@ -48,3 +48,5 @@
 CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_DMA_API_DEBUG=y
+
+CONFIG_MMIOTRACE=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-nodebug,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-nodebug	3 Apr 2009 00:34:25 -0000	1.32
+++ config-nodebug	8 Apr 2009 15:33:30 -0000	1.33
@@ -47,3 +47,5 @@
 # CONFIG_DEBUG_NOTIFIERS is not set
 
 # CONFIG_DMA_API_DEBUG is not set
+
+# CONFIG_MMIOTRACE is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86-generic,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- config-x86-generic	19 Mar 2009 20:43:22 -0000	1.73
+++ config-x86-generic	8 Apr 2009 15:33:30 -0000	1.74
@@ -413,7 +413,6 @@
 CONFIG_SYSPROF_TRACER=y
 
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 # CONFIG_DEBUG_PER_CPU_MAPS is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86_64-generic,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- config-x86_64-generic	3 Apr 2009 00:34:25 -0000	1.73
+++ config-x86_64-generic	8 Apr 2009 15:33:30 -0000	1.74
@@ -317,7 +317,6 @@
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_SYSPROF_TRACER=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 CONFIG_X86_MPPARSE=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1519
retrieving revision 1.1520
diff -u -r1.1519 -r1.1520
--- kernel.spec	8 Apr 2009 05:01:17 -0000	1.1519
+++ kernel.spec	8 Apr 2009 15:33:30 -0000	1.1520
@@ -1905,6 +1905,9 @@
 # and build.
 
 %changelog
+* Wed Apr 08 2009 Dave Jones <davej at redhat.com> 2.6.29.1-58
+- disable MMIOTRACE in non-debug builds (#494584)
+
 * Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: nv50 kms fixes (PROM access, i2c, clean some warnings)
 



From davej at fedoraproject.org  Wed Apr  8 15:40:21 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  8 Apr 2009 15:40:21 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.101, 1.102 config-debug, 1.23,
	1.24 config-nodebug, 1.31, 1.32 config-x86-generic, 1.76,
	1.77 config-x86_64-generic, 1.76, 1.77 kernel.spec, 1.1506, 1.1507
Message-ID: <20090408154021.B05947011A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3092

Modified Files:
	Makefile config-debug config-nodebug config-x86-generic 
	config-x86_64-generic kernel.spec 
Log Message:
disable MMIOTRACE in non-debug builds (#494584)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Makefile	24 Mar 2009 01:31:28 -0000	1.101
+++ Makefile	8 Apr 2009 15:39:50 -0000	1.102
@@ -70,6 +70,7 @@
 	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
+	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -114,6 +115,7 @@
 	@perl -pi -e 's/CONFIG_PCI_MSI_DEFAULT_ON=y/# CONFIG_PCI_MSI_DEFAULT_ON is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
+	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-debug	5 Feb 2009 19:02:18 -0000	1.23
+++ config-debug	8 Apr 2009 15:39:50 -0000	1.24
@@ -48,3 +48,5 @@
 CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_DMA_API_DEBUG=y
+
+CONFIG_MMIOTRACE=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-nodebug	5 Feb 2009 21:11:18 -0000	1.31
+++ config-nodebug	8 Apr 2009 15:39:50 -0000	1.32
@@ -47,3 +47,5 @@
 CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_DMA_API_DEBUG=y
+
+CONFIG_MMIOTRACE=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- config-x86-generic	6 Apr 2009 15:44:28 -0000	1.76
+++ config-x86-generic	8 Apr 2009 15:39:51 -0000	1.77
@@ -428,7 +428,6 @@
 CONFIG_SYSPROF_TRACER=y
 
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 # CONFIG_DEBUG_PER_CPU_MAPS is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- config-x86_64-generic	7 Apr 2009 17:13:39 -0000	1.76
+++ config-x86_64-generic	8 Apr 2009 15:39:51 -0000	1.77
@@ -328,7 +328,6 @@
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_SYSPROF_TRACER=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 CONFIG_X86_MPPARSE=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1506
retrieving revision 1.1507
diff -u -r1.1506 -r1.1507
--- kernel.spec	8 Apr 2009 05:16:24 -0000	1.1506
+++ kernel.spec	8 Apr 2009 15:39:51 -0000	1.1507
@@ -1822,6 +1822,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 08 2009 Dave Jones <davej at redhat.com>
+- disable MMIOTRACE in non-debug builds (#494584)
+
 * Wed Apr 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.44.rc1
 - 2.6.30-rc1
 - linux-2.6-hwmon-atk0110.patch: drop



From iarnell at fedoraproject.org  Wed Apr  8 15:41:36 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  8 Apr 2009 15:41:36 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel .cvsignore,
	1.3, 1.4 perl-Catalyst-Plugin-Session-Store-FastMmap.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090408154136.47C9870137@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3664

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-Store-FastMmap.spec 
	sources 
Log Message:
* Wed Apr 08 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
- update to latest upstream
- BR MRO::Compat 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2009 18:37:56 -0000	1.3
+++ .cvsignore	8 Apr 2009 15:41:05 -0000	1.4
@@ -1 +1 @@
-Catalyst-Plugin-Session-Store-FastMmap-0.06.tar.gz
+Catalyst-Plugin-Session-Store-FastMmap-0.07.tar.gz


Index: perl-Catalyst-Plugin-Session-Store-FastMmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/perl-Catalyst-Plugin-Session-Store-FastMmap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Plugin-Session-Store-FastMmap.spec	26 Feb 2009 12:20:21 -0000	1.3
+++ perl-Catalyst-Plugin-Session-Store-FastMmap.spec	8 Apr 2009 15:41:06 -0000	1.4
@@ -1,16 +1,17 @@
 Name:           perl-Catalyst-Plugin-Session-Store-FastMmap
-Version:        0.06
-Release:        2%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        FastMmap session storage backend
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-FastMmap/
-Source0:        http://www.cpan.org/authors/id/K/KA/KARMAN/Catalyst-Plugin-Session-Store-FastMmap-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Session-Store-FastMmap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Cache::FastMmap) >= 1.13
 BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.09
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Path::Class)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
@@ -54,6 +55,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 08 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
+- update to latest upstream
+- BR MRO::Compat 
+
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
+- update to latest upstream
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2009 18:37:56 -0000	1.3
+++ sources	8 Apr 2009 15:41:06 -0000	1.4
@@ -1 +1 @@
-53b74edb59d16959f77a1f94c392640b  Catalyst-Plugin-Session-Store-FastMmap-0.06.tar.gz
+e55e2a09865e5382e03c4d12b00c9d3e  Catalyst-Plugin-Session-Store-FastMmap-0.07.tar.gz



From mclasen at fedoraproject.org  Wed Apr  8 15:42:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  8 Apr 2009 15:42:57 +0000 (UTC)
Subject: rpms/ConsoleKit/devel ConsoleKit.spec, 1.38,
	1.39 consolekit-dbus-permissions.patch, 1.1, 1.2
Message-ID: <20090408154257.32E597011A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4636

Modified Files:
	ConsoleKit.spec consolekit-dbus-permissions.patch 
Log Message:
Allow GetSessions in dbus policy



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ConsoleKit.spec	28 Feb 2009 01:22:56 -0000	1.38
+++ ConsoleKit.spec	8 Apr 2009 15:42:26 -0000	1.39
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -26,6 +26,7 @@
 
 Patch0: ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch
 # http://bugs.freedesktop.org/show_bug.cgi?id=19020
+# http://bugs.freedesktop.org/show_bug.cgi?id=20471
 Patch1: consolekit-dbus-permissions.patch
 
 Patch2: ConsoleKit-skipvalidation.patch
@@ -167,6 +168,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-7
+- Allow GetSessions calls in the dbus policy
+
 * Fri Feb 27 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-6
 - Fix the build
 

consolekit-dbus-permissions.patch:

Index: consolekit-dbus-permissions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/consolekit-dbus-permissions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- consolekit-dbus-permissions.patch	14 Jan 2009 05:26:12 -0000	1.1
+++ consolekit-dbus-permissions.patch	8 Apr 2009 15:42:26 -0000	1.2
@@ -1,6 +1,7 @@
---- data/ConsoleKit.conf	2008-04-19 01:39:49.000000000 -0400
-+++ /home/walters/ConsoleKit.conf.in	2008-12-11 14:05:46.000000000 -0500
-@@ -8,88 +8,128 @@
+diff -up ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit ConsoleKit-0.3.0/data/ConsoleKit.conf
+--- ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit	2008-04-19 01:39:49.000000000 -0400
++++ ConsoleKit-0.3.0/data/ConsoleKit.conf	2009-04-08 11:40:33.347814036 -0400
+@@ -8,88 +8,131 @@
      <allow own="org.freedesktop.ConsoleKit"/>
  
      <!-- Allow all methods on interfaces -->
@@ -49,6 +50,9 @@
 -    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 +    <allow send_destination="org.freedesktop.ConsoleKit"
 +           send_interface="org.freedesktop.ConsoleKit.Manager"
++           send_member="GetSessions"/>
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
             send_member="GetSessionForCookie"/>
 -    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 +    <allow send_destination="org.freedesktop.ConsoleKit"



From ebaron at fedoraproject.org  Wed Apr  8 15:45:40 2009
From: ebaron at fedoraproject.org (Elliott Baron)
Date: Wed,  8 Apr 2009 15:45:40 +0000 (UTC)
Subject: rpms/eclipse-valgrind/devel eclipse-valgrind.spec,1.5,1.6
Message-ID: <20090408154540.C636B7011A@cvs1.fedora.phx.redhat.com>

Author: ebaron

Update of /cvs/pkgs/rpms/eclipse-valgrind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5477

Modified Files:
	eclipse-valgrind.spec 
Log Message:
* Wed Apr 8 2009 Elliott Baron <ebaron at redhat.com> 0.1.0-6
- Don't generate debuginfo (rhbz#494719).


Index: eclipse-valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/eclipse-valgrind.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-valgrind.spec	23 Mar 2009 15:20:54 -0000	1.5
+++ eclipse-valgrind.spec	8 Apr 2009 15:45:10 -0000	1.6
@@ -2,9 +2,12 @@
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_libdir}/eclipse/dropins/valgrind
 
+# Package in %%{_libdir} but no native code so no debuginfo
+%global debug_package %{nil}
+
 Name:           eclipse-valgrind
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Valgrind Tools Integration for Eclipse
 
 Group:          Development/Tools
@@ -61,6 +64,9 @@
 %doc org.eclipse.linuxtools.valgrind-feature/epl-v10.html
 
 %changelog
+* Wed Apr 8 2009 Elliott Baron <ebaron at redhat.com> 0.1.0-6
+- Don't generate debuginfo (rhbz#494719).
+
 * Mon Mar 23 2009 Elliott Baron <ebaron at redhat.com> 0.1.0-5
 - Rebuild for changes in pdebuild to not ship p2 metadata.
 



From mclasen at fedoraproject.org  Wed Apr  8 15:50:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  8 Apr 2009 15:50:27 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.73, 1.74 gnome-session.spec, 
	1.231, 1.232 sources, 1.77,
	1.78 gnome-session-alarm-warning.patch, 1.1,
	NONE gnome-session-debug-spew.patch, 1.1, NONE
Message-ID: <20090408155027.E86007011A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6586

Modified Files:
	.cvsignore gnome-session.spec sources 
Removed Files:
	gnome-session-alarm-warning.patch 
	gnome-session-debug-spew.patch 
Log Message:
2.26.0.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	17 Mar 2009 03:03:32 -0000	1.73
+++ .cvsignore	8 Apr 2009 15:49:57 -0000	1.74
@@ -1 +1 @@
-gnome-session-2.26.0.tar.bz2
+gnome-session-2.26.0.90.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- gnome-session.spec	5 Apr 2009 05:37:04 -0000	1.231
+++ gnome-session.spec	8 Apr 2009 15:49:57 -0000	1.232
@@ -9,8 +9,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.0.90
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -62,7 +62,6 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
-Patch0: gnome-session-alarm-warning.patch
 
 %description
 gnome-session manages a GNOME desktop or GDM login session. It starts up
@@ -78,7 +77,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .alarm-warning
 
 #workaround broken perl-XML-Parser on 64bit arches
 export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
@@ -177,6 +175,9 @@
 
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0.90-1
+- Update to 2.26.0.90
+
 * Sun Apr  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-2
 - Avoid some warnings (#493688)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	17 Mar 2009 03:03:32 -0000	1.77
+++ sources	8 Apr 2009 15:49:57 -0000	1.78
@@ -1 +1 @@
-e17dbce7446b3e42fac2b1cea7dedffd  gnome-session-2.26.0.tar.bz2
+b715b1de0de24a49eb91b41a6731919b  gnome-session-2.26.0.90.tar.bz2


--- gnome-session-alarm-warning.patch DELETED ---


--- gnome-session-debug-spew.patch DELETED ---



From mclasen at fedoraproject.org  Wed Apr  8 15:51:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  8 Apr 2009 15:51:46 +0000 (UTC)
Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.39,1.40
Message-ID: <20090408155146.EB1AD7011A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6928

Modified Files:
	ConsoleKit.spec 
Log Message:
fix spec



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ConsoleKit.spec	8 Apr 2009 15:42:26 -0000	1.39
+++ ConsoleKit.spec	8 Apr 2009 15:51:16 -0000	1.40
@@ -60,7 +60,7 @@
 Requires: dbus >= %{dbus_version}
 
 %description libs
-This package contains libraries and a PAM module for interacting 
+This package contains libraries and a PAM module for interacting
 with ConsoleKit.
 
 %package devel
@@ -86,7 +86,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
-%patch1 -p0 -b .consolekit
+%patch1 -p1 -b .consolekit
 %patch2 -p1 -b .skipvalidation
 
 %build



From bretm at fedoraproject.org  Wed Apr  8 16:05:05 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed,  8 Apr 2009 16:05:05 +0000 (UTC)
Subject: rpms/wordpress-mu/F-10 cve-2009-1030.patch, NONE,
	1.1 wordpress-mu.spec, 1.3, 1.4
Message-ID: <20090408160505.BE2B67011A@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9646

Modified Files:
	wordpress-mu.spec 
Added Files:
	cve-2009-1030.patch 
Log Message:
backport for cve-2009-1030

cve-2009-1030.patch:

--- NEW FILE cve-2009-1030.patch ---
--- wp-includes/wpmu-functions.php	2009-04-07 13:37:57.000000000 -0400
+++ wp-includes/wpmu-functions.php	2009-04-07 13:42:12.000000000 -0400
@@ -1836,17 +1867,29 @@
 		<td>
 		<?php
 		$all_blogs = get_blogs_of_user( $current_user->ID );
+		$primary_blog = get_usermeta($current_user->ID, 'primary_blog');
 		if( count( $all_blogs ) > 1 ) {
-			$primary_blog = get_usermeta($current_user->ID, 'primary_blog');
+			$found = false;
 			?>
 			<select name="primary_blog">
-				<?php foreach( (array) $all_blogs as $blog ) { ?>
-					<option value='<?php echo $blog->userblog_id ?>'<?php if( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option>
-				<?php } ?>
+				<?php foreach( (array) $all_blogs as $blog ) { 
+					if( $primary_blog == $blog->userblog_id )
+						$found = true;
+					?><option value='<?php echo $blog->userblog_id ?>'<?php if( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option><?php 
+				} ?>
 			</select>
 			<?php
+			if( !$found ) {
+				$blog = array_shift( $all_blogs );
+				update_usermeta( $current_user->ID, 'primary_blog', $blog->userblog_id );
+			}
+		} elseif( count( $all_blogs ) == 1 ) {
+			$blog = array_shift( $all_blogs );
+			echo $blog->domain;
+			if( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
+				update_usermeta( $current_user->ID, 'primary_blog', $blog->userblog_id );
 		} else {
-			echo $_SERVER['HTTP_HOST'];
+			echo "N/A";
 		}
 		?>
 		</td>


Index: wordpress-mu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-10/wordpress-mu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wordpress-mu.spec	8 Dec 2008 21:33:25 -0000	1.3
+++ wordpress-mu.spec	8 Apr 2009 16:04:35 -0000	1.4
@@ -2,12 +2,13 @@
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
 Version: 2.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Publishing
 License: GPLv2
 Source0: %{name}-%{version}.tar.gz
 Source1: wordpress-mu-httpd-conf
 Source2: README.fedora.wordpress-mu
+Patch0: cve-2009-1030.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -b .patch0
 
 # disable-wordpress-core-update, updates are always installed via rpm
 #
@@ -26,6 +28,7 @@
 
 echo "<?php // update script removed, updates via RPMs for Fedora ?>" > wp-includes/update.php
 
+
 %build
 
 
@@ -99,6 +102,9 @@
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
+* Tue Apr  7 2009 Bret McMillan <bretm at redhat.com> - 2.6.5-2
+- Patch for CVE-2009-1030
+
 * Mon Dec  1 2008 Bret McMillan <bretm at redhat.com> - 2.6.5-1
 - Update to 2.6.5
 - http://wordpress.org/development/2008/11/wordpress-265/



From mtasaka at fedoraproject.org  Wed Apr  8 16:09:05 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 16:09:05 +0000 (UTC)
Subject: rpms/ruby-aws/F-10 .cvsignore, 1.13, 1.14 ruby-aws.spec, 1.12,
	1.13 sources, 1.13, 1.14
Message-ID: <20090408160905.80D767011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10787/F-10

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
* Thu Apr  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
- 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Feb 2009 19:05:16 -0000	1.13
+++ .cvsignore	8 Apr 2009 16:08:35 -0000	1.14
@@ -1 +1 @@
-ruby-aws-0.5.0.tar.gz
+ruby-aws-0.5.1.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-10/ruby-aws.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ruby-aws.spec	25 Feb 2009 19:05:16 -0000	1.12
+++ ruby-aws.spec	8 Apr 2009 16:08:35 -0000	1.13
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.5.0
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Apr  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
+- 0.5.1
+
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-1
 - 0.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Feb 2009 19:05:16 -0000	1.13
+++ sources	8 Apr 2009 16:08:35 -0000	1.14
@@ -1 +1 @@
-48e40cd8e0e1a3d20dafe898f0e1c42d  ruby-aws-0.5.0.tar.gz
+706f66316f20e3922d3167e4960c1315  ruby-aws-0.5.1.tar.gz



From mtasaka at fedoraproject.org  Wed Apr  8 16:09:05 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 16:09:05 +0000 (UTC)
Subject: rpms/ruby-aws/F-9 .cvsignore, 1.13, 1.14 ruby-aws.spec, 1.12,
	1.13 sources, 1.13, 1.14
Message-ID: <20090408160905.BAC107011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10787/F-9

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
* Thu Apr  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
- 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Feb 2009 19:05:16 -0000	1.13
+++ .cvsignore	8 Apr 2009 16:08:35 -0000	1.14
@@ -1 +1 @@
-ruby-aws-0.5.0.tar.gz
+ruby-aws-0.5.1.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/ruby-aws.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ruby-aws.spec	25 Feb 2009 19:05:16 -0000	1.12
+++ ruby-aws.spec	8 Apr 2009 16:08:35 -0000	1.13
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.5.0
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Apr  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
+- 0.5.1
+
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-1
 - 0.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Feb 2009 19:05:16 -0000	1.13
+++ sources	8 Apr 2009 16:08:35 -0000	1.14
@@ -1 +1 @@
-48e40cd8e0e1a3d20dafe898f0e1c42d  ruby-aws-0.5.0.tar.gz
+706f66316f20e3922d3167e4960c1315  ruby-aws-0.5.1.tar.gz



From mtasaka at fedoraproject.org  Wed Apr  8 16:09:06 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  8 Apr 2009 16:09:06 +0000 (UTC)
Subject: rpms/ruby-aws/devel .cvsignore, 1.13, 1.14 ruby-aws.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20090408160906.1522A7011A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-aws/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10787/devel

Modified Files:
	.cvsignore ruby-aws.spec sources 
Log Message:
* Thu Apr  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
- 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Feb 2009 19:05:16 -0000	1.13
+++ .cvsignore	8 Apr 2009 16:08:35 -0000	1.14
@@ -1 +1 @@
-ruby-aws-0.5.0.tar.gz
+ruby-aws-0.5.1.tar.gz


Index: ruby-aws.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/ruby-aws.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ruby-aws.spec	25 Feb 2009 19:05:16 -0000	1.13
+++ ruby-aws.spec	8 Apr 2009 16:08:35 -0000	1.14
@@ -2,7 +2,7 @@
 %define		rubyabi		1.8
 
 Name:		ruby-aws
-Version:	0.5.0
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	Ruby interface to Amazon Web Services
 Group:		Development/Languages
@@ -78,6 +78,9 @@
 %doc test/
 
 %changelog
+* Thu Apr  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
+- 0.5.1
+
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-1
 - 0.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-aws/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Feb 2009 19:05:16 -0000	1.13
+++ sources	8 Apr 2009 16:08:35 -0000	1.14
@@ -1 +1 @@
-48e40cd8e0e1a3d20dafe898f0e1c42d  ruby-aws-0.5.0.tar.gz
+706f66316f20e3922d3167e4960c1315  ruby-aws-0.5.1.tar.gz



From davidz at fedoraproject.org  Wed Apr  8 16:12:08 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed,  8 Apr 2009 16:12:08 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel
	0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch,
	NONE, 1.1 gnome-disk-utility.spec, 1.7, 1.8
Message-ID: <20090408161208.EF54870137@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11702

Modified Files:
	gnome-disk-utility.spec 
Added Files:
	0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch 
Log Message:
* Wed Apr 08 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.2.20090406git%{?dist}
- Fix bug in detecting when a PolicyKit error is returned (#494787)



0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch:

--- NEW FILE 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch ---
>From 53cf4a6635586e68c7a45030b381bc98d4f9eb1c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 8 Apr 2009 12:04:17 -0400
Subject: [PATCH] for now, prepend the D-Bus error name to the error string from the daemon

This is hidden behind a GtkExpander so it's not exactly a big deal. As
noted we can removed this once we port to PolicyKit 1.0.
---
 src/gdu/gdu-error.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/gdu/gdu-error.c b/src/gdu/gdu-error.c
index 956c61c..992c4d8 100644
--- a/src/gdu/gdu-error.c
+++ b/src/gdu/gdu-error.c
@@ -57,6 +57,7 @@ _gdu_error_fixup (GError *error)
 {
         const char *name;
         gboolean matched;
+        gchar *s;
 
         if (error == NULL)
                 return;
@@ -89,6 +90,14 @@ _gdu_error_fixup (GError *error)
 
         if (matched)
                 error->domain = GDU_ERROR;
+
+        /* Always prepend the D-Bus exception name to the message; we need this in
+         * gdu_error_check_polkit_not_authorized() to determine if it's a PolicyKit
+         * exception... when we port to polkit 1.0 this can go away.
+         */
+        s = g_strdup_printf ("%s: %s", name, error->message);
+        g_free (error->message);
+        error->message = s;
 }
 
 /**
-- 
1.6.2.2



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-disk-utility.spec	7 Apr 2009 00:30:46 -0000	1.7
+++ gnome-disk-utility.spec	8 Apr 2009 16:11:38 -0000	1.8
@@ -12,7 +12,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.3
-Release: 0.1.20090406git%{?dist}
+Release: 0.2.20090406git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -36,6 +36,8 @@
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+Patch0: 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch
+
 %description
 This package contains the Palimpsest disk management application.
 Palimpsest supports partitioning, file system creation, encryption,
@@ -89,6 +91,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gdu-polkit-authz
 
 %build
 %configure
@@ -196,6 +199,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Wed Apr 08 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.2.20090406git%{?dist}
+- Fix bug in detecting when a PolicyKit error is returned (#494787)
+
 * Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.1.20090406git%{?dist}
 - New snapshot
 



From nickc at fedoraproject.org  Wed Apr  8 16:13:34 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Wed,  8 Apr 2009 16:13:34 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.19.51.0.2-ifunc.patch, 1.1,
	1.2 binutils.spec, 1.159, 1.160
Message-ID: <20090408161334.31F177011A@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12749

Modified Files:
	binutils-2.19.51.0.2-ifunc.patch binutils.spec 
Log Message:
Update IFUNC patch to improve functionality.
Fix typo in binutils spec.


binutils-2.19.51.0.2-ifunc.patch:

Index: binutils-2.19.51.0.2-ifunc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils-2.19.51.0.2-ifunc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binutils-2.19.51.0.2-ifunc.patch	2 Mar 2009 13:57:38 -0000	1.1
+++ binutils-2.19.51.0.2-ifunc.patch	8 Apr 2009 16:13:33 -0000	1.2
@@ -1,6 +1,6 @@
-diff -rcp binutils-2.19.51.0.2.orig/bfd/bfd-in2.h binutils-2.19.51.0.2/bfd/bfd-in2.h
-*** binutils-2.19.51.0.2.orig/bfd/bfd-in2.h	2009-02-06 09:19:47.000000000 +0000
---- binutils-2.19.51.0.2/bfd/bfd-in2.h	2009-02-10 12:27:00.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/bfd-in2.h ./bfd/bfd-in2.h
+*** ../delme/binutils-2.19.51.0.2/bfd/bfd-in2.h	2009-02-04 18:21:50.000000000 +0000
+--- ./bfd/bfd-in2.h	2009-03-05 11:59:49.000000000 +0000
 *************** typedef struct bfd_symbol
 *** 4568,4573 ****
 --- 4568,4579 ----
@@ -16,9 +16,9 @@
     flagword flags;
   
     /* A pointer to the section to which this symbol is
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elf32-i386.c binutils-2.19.51.0.2/bfd/elf32-i386.c
-*** binutils-2.19.51.0.2.orig/bfd/elf32-i386.c	2009-02-06 09:19:53.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elf32-i386.c	2009-03-02 12:26:12.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/elf32-i386.c ./bfd/elf32-i386.c
+*** ../delme/binutils-2.19.51.0.2/bfd/elf32-i386.c	2009-02-04 18:21:50.000000000 +0000
+--- ./bfd/elf32-i386.c	2009-04-08 16:11:48.000000000 +0100
 *************** elf_i386_tls_transition (struct bfd_link
 *** 1206,1211 ****
 --- 1206,1230 ----
@@ -48,26 +48,8 @@
      calculate needed space in the global offset table, procedure linkage
      table, and dynamic reloc sections.  */
 *************** elf_i386_check_relocs (bfd *abfd,
-*** 1465,1471 ****
-  		  && (sec->flags & SEC_ALLOC) != 0
-  		  && h != NULL
-  		  && (h->root.type == bfd_link_hash_defweak
-! 		      || !h->def_regular)))
-  	    {
-  	      struct elf_i386_dyn_relocs *p;
-  	      struct elf_i386_dyn_relocs **head;
---- 1484,1491 ----
-  		  && (sec->flags & SEC_ALLOC) != 0
-  		  && h != NULL
-  		  && (h->root.type == bfd_link_hash_defweak
-! 		      || !h->def_regular))
-! 	      || is_indirect_symbol (abfd, h))
-  	    {
-  	      struct elf_i386_dyn_relocs *p;
-  	      struct elf_i386_dyn_relocs **head;
-*************** elf_i386_check_relocs (bfd *abfd,
 *** 1483,1488 ****
---- 1503,1514 ----
+--- 1502,1513 ----
   
   		  if (sreloc == NULL)
   		    return FALSE;
@@ -81,19 +63,30 @@
   
   	      /* If this is a global symbol, we count the number of
 *************** allocate_dynrelocs (struct elf_link_hash
+*** 1831,1836 ****
+--- 1856,1862 ----
+    struct elf_i386_link_hash_table *htab;
+    struct elf_i386_link_hash_entry *eh;
+    struct elf_i386_dyn_relocs *p;
++   bfd_boolean use_indirect_section = FALSE;
+  
+    if (h->root.type == bfd_link_hash_indirect)
+      return TRUE;
+*************** allocate_dynrelocs (struct elf_link_hash
 *** 2052,2057 ****
---- 2078,2092 ----
+--- 2078,2093 ----
   	    }
   	}
       }
-+   else if (is_indirect_symbol (info->output_bfd, h))
++   else if (is_indirect_symbol (info->output_bfd, h)
++ 	   && h->dynindx == -1
++ 	   && ! h->forced_local)
 +     {
-+       if (h->dynindx == -1
-+ 	  && ! h->forced_local)
-+ 	{
-+ 	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+ 	    return FALSE;
-+ 	}
++       if (bfd_elf_link_record_dynamic_symbol (info, h)
++ 	  && h->dynindx != -1)
++ 	use_indirect_section = TRUE;
++       else
++ 	return FALSE;
 +     }
     else if (ELIMINATE_COPY_RELOCS)
       {
@@ -107,39 +100,32 @@
   
         BFD_ASSERT (sreloc != NULL);
         sreloc->size += p->count * sizeof (Elf32_External_Rel);
---- 2125,2138 ----
+--- 2126,2135 ----
       {
         asection *sreloc;
   
-!       if (! info->shared
-!  	  && is_indirect_symbol (info->output_bfd, h))
-! 	{
-! 	  sreloc = elf_section_data (p->sec)->indirect_relocs;
-! 	  elf_tdata (info->output_bfd)->has_ifunc_relocs = TRUE;
-! 	}
+!       if (use_indirect_section)
+! 	sreloc = elf_section_data (p->sec)->indirect_relocs;
 !       else
 !  	sreloc = elf_section_data (p->sec)->sreloc;
   
         BFD_ASSERT (sreloc != NULL);
         sreloc->size += p->count * sizeof (Elf32_External_Rel);
 *************** elf_i386_relocate_section (bfd *output_b
-*** 2902,2908 ****
-  		  && ((h->def_dynamic
-  		       && !h->def_regular)
-  		      || h->root.type == bfd_link_hash_undefweak
-! 		      || h->root.type == bfd_link_hash_undefined)))
-  	    {
-  	      Elf_Internal_Rela outrel;
-  	      bfd_byte *loc;
---- 2944,2951 ----
-  		  && ((h->def_dynamic
-  		       && !h->def_regular)
-  		      || h->root.type == bfd_link_hash_undefweak
-! 		      || h->root.type == bfd_link_hash_undefined))
-! 	      || is_indirect_symbol (output_bfd, h))
-  	    {
-  	      Elf_Internal_Rela outrel;
-  	      bfd_byte *loc;
+*** 2894,2899 ****
+--- 2933,2944 ----
+  		   || h->root.type != bfd_link_hash_undefweak)
+  	       && (r_type != R_386_PC32
+  		   || !SYMBOL_CALLS_LOCAL (info, h)))
++ 	      || (! info->shared
++ 		  && h != NULL
++ 		  && h->dynindx != -1
++ 		  && ! h->forced_local
++ 		  && ((struct elf_i386_link_hash_entry *) h)->dyn_relocs != NULL
++ 		  && is_indirect_symbol (output_bfd, h))
+  	      || (ELIMINATE_COPY_RELOCS
+  		  && !info->shared
+  		  && h != NULL
 *************** elf_i386_relocate_section (bfd *output_b
 *** 2942,2948 ****
   		  outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
@@ -149,37 +135,75 @@
   
   	      BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
   
---- 2985,2994 ----
+--- 2987,3002 ----
   		  outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
   		}
   
-!  	      if (! info->shared && is_indirect_symbol (output_bfd, h))
-!  		sreloc = elf_section_data (input_section)->indirect_relocs;
-!  	      else
+! 	      if (! info->shared
+! 		  && h != NULL
+! 		  && h->dynindx != -1
+! 		  && ! h->forced_local
+! 		  && is_indirect_symbol (output_bfd, h)
+! 		  && elf_section_data (input_section)->indirect_relocs != NULL
+! 		  && elf_section_data (input_section)->indirect_relocs->contents != NULL)
+! 		sreloc = elf_section_data (input_section)->indirect_relocs;
+! 	      else
 !  		sreloc = elf_section_data (input_section)->sreloc;
   
   	      BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
   
-*************** elf_i386_relocate_section (bfd *output_b
-*** 2955,2961 ****
-  		 not want to fiddle with the addend.  Otherwise, we
-  		 need to include the symbol value so that it becomes
-  		 an addend for the dynamic reloc.  */
-! 	      if (! relocate)
-  		continue;
-  	    }
-  	  break;
---- 3001,3007 ----
-  		 not want to fiddle with the addend.  Otherwise, we
-  		 need to include the symbol value so that it becomes
-  		 an addend for the dynamic reloc.  */
-! 	      if (! relocate || is_indirect_symbol (output_bfd, h))
-  		continue;
-  	    }
-  	  break;
+*************** elf_i386_hash_symbol (struct elf_link_ha
+*** 4068,4073 ****
+--- 4122,4146 ----
+    return _bfd_elf_hash_symbol (h);
+  }
+  
++ /* Hook called by the linker routine which adds symbols from an object
++    file.  */
++ 
++ static bfd_boolean
++ elf_i386_add_symbol_hook (bfd *abfd,
++ 			  struct bfd_link_info *info,
++ 			  Elf_Internal_Sym *sym,
++ 			  const char **namep,
++ 			  flagword *flagsp,
++ 			  asection **secp,
++ 			  bfd_vma *valp)
++ {
++   if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
++     elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
++ 
++   return _bfd_elf_add_sharable_symbol (abfd, info, sym, namep, flagsp,
++ 				       secp, valp);
++ }
++ 
+  #define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
+  #define TARGET_LITTLE_NAME		"elf32-i386"
+  #define ELF_ARCH			bfd_arch_i386
+*************** elf_i386_hash_symbol (struct elf_link_ha
+*** 4113,4121 ****
+  #define elf_backend_plt_sym_val		      elf_i386_plt_sym_val
+  #define elf_backend_hash_symbol		      elf_i386_hash_symbol
+  
+! #define elf_backend_add_symbol_hook \
+!   _bfd_elf_add_sharable_symbol
+! #define elf_backend_section_from_bfd_section \
+    _bfd_elf_sharable_section_from_bfd_section
+  #define elf_backend_symbol_processing \
+    _bfd_elf_sharable_symbol_processing
+--- 4186,4194 ----
+  #define elf_backend_plt_sym_val		      elf_i386_plt_sym_val
+  #define elf_backend_hash_symbol		      elf_i386_hash_symbol
+  
+! #define elf_backend_add_symbol_hook           elf_i386_add_symbol_hook
+! 
+! #define elf_backend_section_from_bfd_section	\
+    _bfd_elf_sharable_section_from_bfd_section
+  #define elf_backend_symbol_processing \
+    _bfd_elf_sharable_symbol_processing
 *************** elf_i386_hash_symbol (struct elf_link_ha
 *** 4128,4133 ****
---- 4174,4182 ----
+--- 4201,4209 ----
   #define elf_backend_merge_symbol \
     _bfd_elf_sharable_merge_symbol
   
@@ -206,7 +230,7 @@
   #ifdef OLD_FREEBSD_ABI_LABEL
     /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
     memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
---- 4193,4202 ----
+--- 4220,4229 ----
      executables and (for simplicity) also all other object files.  */
   
   static void
@@ -217,12 +241,27 @@
   #ifdef OLD_FREEBSD_ABI_LABEL
     /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
     memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elf64-x86-64.c binutils-2.19.51.0.2/bfd/elf64-x86-64.c
-*** binutils-2.19.51.0.2.orig/bfd/elf64-x86-64.c	2009-02-06 09:19:46.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elf64-x86-64.c	2009-03-02 12:43:47.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/elf64-x86-64.c ./bfd/elf64-x86-64.c
+*** ../delme/binutils-2.19.51.0.2/bfd/elf64-x86-64.c	2009-02-04 18:21:50.000000000 +0000
+--- ./bfd/elf64-x86-64.c	2009-04-08 16:07:11.000000000 +0100
+*************** static reloc_howto_type x86_64_elf_howto
+*** 161,166 ****
+--- 161,172 ----
+  	 FALSE)
+  };
+  
++ #define IS_X86_64_PCREL_TYPE(TYPE)	\
++   (   ((TYPE) == R_X86_64_PC8)		\
++    || ((TYPE) == R_X86_64_PC16)		\
++    || ((TYPE) == R_X86_64_PC32)		\
++    || ((TYPE) == R_X86_64_PC64))
++ 
+  /* Map BFD relocs to the x86_64 elf relocs.  */
+  struct elf_reloc_map
+  {
 *************** elf64_x86_64_tls_transition (struct bfd_
 *** 987,992 ****
---- 987,1011 ----
+--- 993,1017 ----
     return TRUE;
   }
   
@@ -249,52 +288,56 @@
      calculate needed space in the global offset table, procedure
      linkage table, and dynamic reloc sections.  */
 *************** elf64_x86_64_check_relocs (bfd *abfd, st
-*** 1268,1274 ****
-  	     If on the other hand, we are creating an executable, we
+*** 1013,1019 ****
+    sym_hashes = elf_sym_hashes (abfd);
+  
+    sreloc = NULL;
+! 
+    rel_end = relocs + sec->reloc_count;
+    for (rel = relocs; rel < rel_end; rel++)
+      {
+--- 1038,1044 ----
+    sym_hashes = elf_sym_hashes (abfd);
+  
+    sreloc = NULL;
+!   
+    rel_end = relocs + sec->reloc_count;
+    for (rel = relocs; rel < rel_end; rel++)
+      {
+*************** elf64_x86_64_check_relocs (bfd *abfd, st
+*** 1269,1281 ****
   	     may need to keep relocations for symbols satisfied by a
   	     dynamic library if we manage to avoid copy relocs for the
-! 	     symbol.  */
-  
+  	     symbol.  */
+- 
   	  if ((info->shared
   	       && (sec->flags & SEC_ALLOC) != 0
---- 1287,1296 ----
-  	     If on the other hand, we are creating an executable, we
+! 	       && (((r_type != R_X86_64_PC8)
+! 		    && (r_type != R_X86_64_PC16)
+! 		    && (r_type != R_X86_64_PC32)
+! 		    && (r_type != R_X86_64_PC64))
+  		   || (h != NULL
+  		       && (! SYMBOLIC_BIND (info, h)
+  			   || h->root.type == bfd_link_hash_defweak
+--- 1294,1302 ----
   	     may need to keep relocations for symbols satisfied by a
   	     dynamic library if we manage to avoid copy relocs for the
-! 	     symbol.
-! 
-! 	     Also we must keep any relocations against GNU_IFUNC symbols
-! 	     as they will be evaluated at load time.  */
-  
+  	     symbol.  */
   	  if ((info->shared
   	       && (sec->flags & SEC_ALLOC) != 0
-*************** elf64_x86_64_check_relocs (bfd *abfd, st
-*** 1285,1291 ****
-  		  && (sec->flags & SEC_ALLOC) != 0
-  		  && h != NULL
-  		  && (h->root.type == bfd_link_hash_defweak
-! 		      || !h->def_regular)))
-  	    {
-  	      struct elf64_x86_64_dyn_relocs *p;
-  	      struct elf64_x86_64_dyn_relocs **head;
---- 1307,1314 ----
-  		  && (sec->flags & SEC_ALLOC) != 0
-  		  && h != NULL
-  		  && (h->root.type == bfd_link_hash_defweak
-! 		      || !h->def_regular))
-! 	      || is_indirect_symbol (abfd, h))
-  	    {
-  	      struct elf64_x86_64_dyn_relocs *p;
-  	      struct elf64_x86_64_dyn_relocs **head;
+! 	       && (! IS_X86_64_PCREL_TYPE (r_type)
+  		   || (h != NULL
+  		       && (! SYMBOLIC_BIND (info, h)
+  			   || h->root.type == bfd_link_hash_defweak
 *************** elf64_x86_64_check_relocs (bfd *abfd, st
 *** 1303,1308 ****
---- 1326,1337 ----
+--- 1324,1335 ----
   
   		  if (sreloc == NULL)
   		    return FALSE;
 + 
-+ 		  /* Create the ifunc section as well, even if we have not encountered a
-+ 		     indirect function symbol yet.  We may not even see one in the input
++ 		  /* Create the ifunc section, even if we will not encounter an
++ 		     indirect function symbol.  We may not even see one in the input
 + 		     object file, but we can still encounter them in libraries.  */
 + 		  (void) _bfd_elf_make_ifunc_reloc_section
 + 		    (abfd, sec, htab->elf.dynobj, 2);
@@ -303,7 +346,7 @@
   	      /* If this is a global symbol, we count the number of
 *************** elf64_x86_64_check_relocs (bfd *abfd, st
 *** 1334,1339 ****
---- 1363,1369 ----
+--- 1361,1367 ----
   	      if (p == NULL || p->sec != sec)
   		{
   		  bfd_size_type amt = sizeof *p;
@@ -311,6 +354,36 @@
   		  p = ((struct elf64_x86_64_dyn_relocs *)
   		       bfd_alloc (htab->elf.dynobj, amt));
   		  if (p == NULL)
+*************** elf64_x86_64_check_relocs (bfd *abfd, st
+*** 1346,1355 ****
+  		}
+  
+  	      p->count += 1;
+! 	      if (r_type == R_X86_64_PC8
+! 		  || r_type == R_X86_64_PC16
+! 		  || r_type == R_X86_64_PC32
+! 		  || r_type == R_X86_64_PC64)
+  		p->pc_count += 1;
+  	    }
+  	  break;
+--- 1374,1380 ----
+  		}
+  
+  	      p->count += 1;
+! 	      if (IS_X86_64_PCREL_TYPE (r_type))
+  		p->pc_count += 1;
+  	    }
+  	  break;
+*************** allocate_dynrelocs (struct elf_link_hash
+*** 1666,1671 ****
+--- 1691,1697 ----
+    struct elf64_x86_64_link_hash_table *htab;
+    struct elf64_x86_64_link_hash_entry *eh;
+    struct elf64_x86_64_dyn_relocs *p;
++   bfd_boolean use_indirect_section = FALSE;
+  
+    if (h->root.type == bfd_link_hash_indirect)
+      return TRUE;
 *************** allocate_dynrelocs (struct elf_link_hash
 *** 1744,1750 ****
         && !info->shared
@@ -320,7 +393,7 @@
     else if (h->got.refcount > 0)
       {
         asection *s;
---- 1774,1782 ----
+--- 1770,1778 ----
         && !info->shared
         && h->dynindx == -1
         && elf64_x86_64_hash_entry (h)->tls_type == GOT_TLS_IE)
@@ -345,7 +418,7 @@
     else if (ELIMINATE_COPY_RELOCS)
       {
         /* For the non-shared case, discard space for relocs against
---- 1875,1892 ----
+--- 1871,1891 ----
   	  /* Make sure undefined weak symbols are output as a dynamic
   	     symbol in PIEs.  */
   	  else if (h->dynindx == -1
@@ -354,12 +427,15 @@
 ! 	    return FALSE;
   	}
       }
-+   else if (is_indirect_symbol (info->output_bfd, h))
++   else if (is_indirect_symbol (info->output_bfd, h)
++ 	   && h->dynindx == -1
++ 	   && ! h->forced_local)
 +     {
-+       if (h->dynindx == -1
-+ 	  && ! h->forced_local
-+ 	  && ! bfd_elf_link_record_dynamic_symbol (info, h))
-+ 	return FALSE;    
++       if (bfd_elf_link_record_dynamic_symbol (info, h)
++ 	  && h->dynindx != -1)
++ 	use_indirect_section = TRUE;
++       else
++ 	return FALSE;
 +     }
     else if (ELIMINATE_COPY_RELOCS)
       {
@@ -377,7 +453,7 @@
   
   	  /* If that succeeded, we know we'll be keeping all the
   	     relocs.  */
---- 1903,1911 ----
+--- 1902,1910 ----
   	  /* Make sure this symbol is output as a dynamic symbol.
   	     Undefined weak syms won't yet be marked as dynamic.  */
   	  if (h->dynindx == -1
@@ -396,39 +472,71 @@
   
         BFD_ASSERT (sreloc != NULL);
   
---- 1923,1936 ----
+--- 1922,1931 ----
       {
         asection * sreloc;
   
-!       if (! info->shared
-! 	  && is_indirect_symbol (info->output_bfd, h))
-! 	{
-! 	  sreloc = elf_section_data (p->sec)->indirect_relocs;
-! 	  elf_tdata (info->output_bfd)->has_ifunc_relocs = TRUE;
-! 	}
+!       if (use_indirect_section)
+! 	sreloc = elf_section_data (p->sec)->indirect_relocs;
 !       else
 ! 	sreloc = elf_section_data (p->sec)->sreloc;
   
         BFD_ASSERT (sreloc != NULL);
   
 *************** elf64_x86_64_relocate_section (bfd *outp
-*** 2704,2710 ****
-  		  && ((h->def_dynamic
-  		       && !h->def_regular)
-  		      || h->root.type == bfd_link_hash_undefweak
-! 		      || h->root.type == bfd_link_hash_undefined)))
-  	    {
-  	      Elf_Internal_Rela outrel;
-  	      bfd_byte *loc;
---- 2746,2753 ----
-  		  && ((h->def_dynamic
-  		       && !h->def_regular)
-  		      || h->root.type == bfd_link_hash_undefweak
-! 		      || h->root.type == bfd_link_hash_undefined))
-! 	      || is_indirect_symbol (output_bfd, h))
-  	    {
-  	      Elf_Internal_Rela outrel;
-  	      bfd_byte *loc;
+*** 2691,2701 ****
+  	       && (h == NULL
+  		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+  		   || h->root.type != bfd_link_hash_undefweak)
+! 	       && ((r_type != R_X86_64_PC8
+! 		    && r_type != R_X86_64_PC16
+! 		    && r_type != R_X86_64_PC32
+! 		    && r_type != R_X86_64_PC64)
+! 		   || !SYMBOL_CALLS_LOCAL (info, h)))
+  	      || (ELIMINATE_COPY_RELOCS
+  		  && !info->shared
+  		  && h != NULL
+--- 2728,2741 ----
+  	       && (h == NULL
+  		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+  		   || h->root.type != bfd_link_hash_undefweak)
+! 	       && (! IS_X86_64_PCREL_TYPE (r_type)
+! 		   || ! SYMBOL_CALLS_LOCAL (info, h)))
+! 	      || (! info->shared
+! 		  && h != NULL
+! 		  && h->dynindx != -1
+! 		  && ! h->forced_local
+! 		  && ((struct elf64_x86_64_link_hash_entry *) h)->dyn_relocs != NULL
+! 		  && is_indirect_symbol (output_bfd, h))
+  	      || (ELIMINATE_COPY_RELOCS
+  		  && !info->shared
+  		  && h != NULL
+*************** elf64_x86_64_relocate_section (bfd *outp
+*** 2735,2747 ****
+  		 become local.  */
+  	      else if (h != NULL
+  		       && h->dynindx != -1
+! 		       && (r_type == R_X86_64_PC8
+! 			   || r_type == R_X86_64_PC16
+! 			   || r_type == R_X86_64_PC32
+! 			   || r_type == R_X86_64_PC64
+! 			   || !info->shared
+! 			   || !SYMBOLIC_BIND (info, h)
+! 			   || !h->def_regular))
+  		{
+  		  outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
+  		  outrel.r_addend = rel->r_addend;
+--- 2775,2784 ----
+  		 become local.  */
+  	      else if (h != NULL
+  		       && h->dynindx != -1
+! 		       && (IS_X86_64_PCREL_TYPE (r_type)
+! 			   || ! info->shared
+! 			   || ! SYMBOLIC_BIND (info, h)
+! 			   || ! h->def_regular))
+  		{
+  		  outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
+  		  outrel.r_addend = rel->r_addend;
 *************** elf64_x86_64_relocate_section (bfd *outp
 *** 2790,2796 ****
   		    }
@@ -438,37 +546,38 @@
   		
   	      BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
   
---- 2833,2842 ----
+--- 2827,2842 ----
   		    }
   		}
   
-! 	      if (! info->shared && is_indirect_symbol (output_bfd, h))
+! 	      if (! info->shared
+! 		  && h != NULL
+! 		  && h->dynindx != -1
+! 		  && ! h->forced_local
+! 		  && is_indirect_symbol (output_bfd, h)
+! 		  && elf_section_data (input_section)->indirect_relocs != NULL
+! 		  && elf_section_data (input_section)->indirect_relocs->contents != NULL)
 ! 		sreloc = elf_section_data (input_section)->indirect_relocs;
 ! 	      else
 ! 		sreloc = elf_section_data (input_section)->sreloc;
   		
   	      BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
   
-*************** elf64_x86_64_relocate_section (bfd *outp
-*** 2802,2808 ****
-  		 not want to fiddle with the addend.  Otherwise, we
-  		 need to include the symbol value so that it becomes
-  		 an addend for the dynamic reloc.  */
-! 	      if (! relocate)
-  		continue;
-  	    }
-  
---- 2848,2854 ----
-  		 not want to fiddle with the addend.  Otherwise, we
-  		 need to include the symbol value so that it becomes
-  		 an addend for the dynamic reloc.  */
-! 	      if (! relocate || is_indirect_symbol (output_bfd, h))
-  		continue;
-  	    }
+*************** elf64_x86_64_add_symbol_hook (bfd *abfd,
+*** 3712,3717 ****
+--- 3758,3766 ----
+        break;
+      }
   
++   if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
++     elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
++ 
+    return _bfd_elf_add_sharable_symbol (abfd, info, sym, namep, flagsp,
+  				       secp, valp);
+  }
 *************** static const struct bfd_elf_special_sect
 *** 3958,3963 ****
---- 4004,4012 ----
+--- 4007,4015 ----
   #define elf_backend_hash_symbol \
     elf64_x86_64_hash_symbol
   
@@ -489,10 +598,10 @@
   #undef  elf64_bed
   #define elf64_bed elf64_x86_64_fbsd_bed
   
---- 4019,4024 ----
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elf-bfd.h binutils-2.19.51.0.2/bfd/elf-bfd.h
-*** binutils-2.19.51.0.2.orig/bfd/elf-bfd.h	2009-02-06 09:19:48.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elf-bfd.h	2009-03-02 12:14:23.000000000 +0000
+--- 4022,4027 ----
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/elf-bfd.h ./bfd/elf-bfd.h
+*** ../delme/binutils-2.19.51.0.2/bfd/elf-bfd.h	2009-02-04 18:21:50.000000000 +0000
+--- ./bfd/elf-bfd.h	2009-03-13 16:48:34.000000000 +0000
 *************** struct bfd_elf_section_data
 *** 1294,1299 ****
 --- 1294,1302 ----
@@ -511,10 +620,10 @@
     bfd_size_type build_id_size;
     bfd_byte *build_id;
   
-+   /* True if the bfd contains relocs that refer to symbols that
-+      have the STT_GNU_IFUNC symbol type.  Used to set the osabi
-+      field in the ELF header structure.  */
-+   bfd_boolean has_ifunc_relocs;
++   /* True if the bfd contains symbols that have the STT_GNU_IFUNC
++      symbol type.  Used to set the osabi field in the ELF header
++      structure.  */
++   bfd_boolean has_ifunc_symbols;
 + 
     /* An identifier used to distinguish different target
        specific extensions to this structure.  */
@@ -531,9 +640,9 @@
   /* Large common section.  */
   extern asection _bfd_elf_large_com_section;
   
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elf.c binutils-2.19.51.0.2/bfd/elf.c
-*** binutils-2.19.51.0.2.orig/bfd/elf.c	2009-02-06 09:19:47.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elf.c	2009-03-02 12:43:58.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/elf.c ./bfd/elf.c
+*** ../delme/binutils-2.19.51.0.2/bfd/elf.c	2009-02-04 18:21:50.000000000 +0000
+--- ./bfd/elf.c	2009-03-13 16:49:37.000000000 +0000
 *************** Unable to find equivalent output section
 *** 6508,6513 ****
 --- 6508,6515 ----
@@ -568,10 +677,10 @@
     i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;
 + 
 +   /* To make things simpler for the loader on Linux systems we set the
-+      osabi field to ELFOSABI_LINUX if the binary contains relocs that
-+      reference symbols with the STT_GNU_IFUNC type.  */
++      osabi field to ELFOSABI_LINUX if the binary contains symbols of
++      the STT_GNU_IFUNC type.  */
 +   if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_NONE
-+       && elf_tdata (abfd)->has_ifunc_relocs)
++       && elf_tdata (abfd)->has_ifunc_symbols)
 +     i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_LINUX;
   }
   
@@ -586,9 +695,9 @@
 !   return (type == STT_FUNC
 ! 	  || type == STT_GNU_IFUNC);
   }
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elfcode.h binutils-2.19.51.0.2/bfd/elfcode.h
-*** binutils-2.19.51.0.2.orig/bfd/elfcode.h	2009-02-06 09:19:47.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elfcode.h	2009-02-10 12:27:38.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/elfcode.h ./bfd/elfcode.h
+*** ../delme/binutils-2.19.51.0.2/bfd/elfcode.h	2009-04-08 16:23:16.000000000 +0100
+--- ./bfd/elfcode.h	2009-03-05 11:54:03.000000000 +0000
 *************** elf_slurp_symbol_table (bfd *abfd, asymb
 *** 1371,1376 ****
 --- 1371,1379 ----
@@ -601,9 +710,9 @@
   	    }
   
   	  if (dynamic)
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elflink.c binutils-2.19.51.0.2/bfd/elflink.c
-*** binutils-2.19.51.0.2.orig/bfd/elflink.c	2009-02-06 09:19:47.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elflink.c	2009-02-10 12:28:16.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/elflink.c ./bfd/elflink.c
+*** ../delme/binutils-2.19.51.0.2/bfd/elflink.c	2009-02-04 18:21:50.000000000 +0000
+--- ./bfd/elflink.c	2009-03-05 11:54:03.000000000 +0000
 *************** _bfd_elf_adjust_dynamic_symbol (struct e
 *** 2776,2781 ****
 --- 2776,2788 ----
@@ -693,29 +802,9 @@
 + 
 +   return reloc_sec;
 + }
-diff -rcp binutils-2.19.51.0.2.orig/bfd/elfxx-target.h binutils-2.19.51.0.2/bfd/elfxx-target.h
-*** binutils-2.19.51.0.2.orig/bfd/elfxx-target.h	2009-02-06 09:19:48.000000000 +0000
---- binutils-2.19.51.0.2/bfd/elfxx-target.h	2009-03-02 12:05:55.000000000 +0000
-*************** static struct elf_backend_data elfNN_bed
-*** 742,748 ****
-    elf_backend_want_got_sym,
-    elf_backend_want_dynbss,
-    elf_backend_want_p_paddr_set_to_zero,
-!   elf_backend_default_execstack
-  };
-  
-  /* Forward declaration for use when initialising alternative_target field.  */
---- 742,748 ----
-    elf_backend_want_got_sym,
-    elf_backend_want_dynbss,
-    elf_backend_want_p_paddr_set_to_zero,
-!   elf_backend_default_execstack,
-  };
-  
-  /* Forward declaration for use when initialising alternative_target field.  */
-diff -rcp binutils-2.19.51.0.2.orig/bfd/syms.c binutils-2.19.51.0.2/bfd/syms.c
-*** binutils-2.19.51.0.2.orig/bfd/syms.c	2009-02-06 09:19:51.000000000 +0000
---- binutils-2.19.51.0.2/bfd/syms.c	2009-02-10 12:21:59.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/bfd/syms.c ./bfd/syms.c
+*** ../delme/binutils-2.19.51.0.2/bfd/syms.c	2009-02-04 18:14:57.000000000 +0000
+--- ./bfd/syms.c	2009-03-05 11:54:05.000000000 +0000
 *************** CODE_FRAGMENT
 *** 297,302 ****
 --- 297,308 ----
@@ -759,22 +848,9 @@
     if (symbol->flags & BSF_WEAK)
       {
         /* If weak, determine if it's specifically an object
-diff -rcp binutils-2.19.51.0.2.orig/binutils/objdump.c binutils-2.19.51.0.2/binutils/objdump.c
-*** binutils-2.19.51.0.2.orig/binutils/objdump.c	2009-02-06 09:18:56.000000000 +0000
---- binutils-2.19.51.0.2/binutils/objdump.c	2009-02-09 17:36:51.000000000 +0000
-*************** dump_reloc_set (bfd *abfd, asection *sec
-*** 2804,2809 ****
---- 2804,2810 ----
-        if (q->addend)
-  	{
-  	  bfd_signed_vma addend = q->addend;
-+ 
-  	  if (addend < 0)
-  	    {
-  	      printf ("-0x");
-diff -rcp binutils-2.19.51.0.2.orig/binutils/readelf.c binutils-2.19.51.0.2/binutils/readelf.c
-*** binutils-2.19.51.0.2.orig/binutils/readelf.c	2009-02-06 09:18:59.000000000 +0000
---- binutils-2.19.51.0.2/binutils/readelf.c	2009-02-10 12:31:17.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/binutils/readelf.c ./binutils/readelf.c
+*** ../delme/binutils-2.19.51.0.2/binutils/readelf.c	2009-02-04 18:21:50.000000000 +0000
+--- ./binutils/readelf.c	2009-03-05 11:53:48.000000000 +0000
 *************** dump_relocations (FILE *file,
 *** 1247,1255 ****
   
@@ -841,9 +917,9 @@
   	  snprintf (buff, sizeof (buff), _("<OS specific>: %d"), type);
   	}
         else
-diff -rcp binutils-2.19.51.0.2.orig/elfcpp/elfcpp.h binutils-2.19.51.0.2/elfcpp/elfcpp.h
-*** binutils-2.19.51.0.2.orig/elfcpp/elfcpp.h	2009-02-06 09:18:19.000000000 +0000
---- binutils-2.19.51.0.2/elfcpp/elfcpp.h	2009-02-10 12:19:01.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/elfcpp/elfcpp.h ./elfcpp/elfcpp.h
+*** ../delme/binutils-2.19.51.0.2/elfcpp/elfcpp.h	2009-02-04 18:14:52.000000000 +0000
+--- ./elfcpp/elfcpp.h	2009-03-05 11:53:39.000000000 +0000
 *************** enum STT
 *** 476,481 ****
 --- 476,482 ----
@@ -854,9 +930,9 @@
     STT_HIOS = 12,
     STT_LOPROC = 13,
     STT_HIPROC = 15,
-diff -rcp binutils-2.19.51.0.2.orig/gas/config/obj-elf.c binutils-2.19.51.0.2/gas/config/obj-elf.c
-*** binutils-2.19.51.0.2.orig/gas/config/obj-elf.c	2009-02-06 09:19:19.000000000 +0000
---- binutils-2.19.51.0.2/gas/config/obj-elf.c	2009-02-10 12:26:06.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/gas/config/obj-elf.c ./gas/config/obj-elf.c
+*** ../delme/binutils-2.19.51.0.2/gas/config/obj-elf.c	2009-02-04 18:21:50.000000000 +0000
+--- ./gas/config/obj-elf.c	2009-03-05 11:53:52.000000000 +0000
 *************** obj_elf_type (int ignore ATTRIBUTE_UNUSE
 *** 1706,1711 ****
 --- 1706,1725 ----
@@ -880,9 +956,9 @@
   #ifdef md_elf_symbol_type
     else if ((type = md_elf_symbol_type (typename, sym, elfsym)) != -1)
       ;
-diff -rcp binutils-2.19.51.0.2.orig/gas/config/tc-i386.c binutils-2.19.51.0.2/gas/config/tc-i386.c
-*** binutils-2.19.51.0.2.orig/gas/config/tc-i386.c	2009-02-06 09:19:20.000000000 +0000
---- binutils-2.19.51.0.2/gas/config/tc-i386.c	2009-03-02 12:41:09.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/gas/config/tc-i386.c ./gas/config/tc-i386.c
+*** ../delme/binutils-2.19.51.0.2/gas/config/tc-i386.c	2009-02-04 18:14:55.000000000 +0000
+--- ./gas/config/tc-i386.c	2009-03-05 11:53:53.000000000 +0000
 *************** tc_i386_fix_adjustable (fixS *fixP ATTRI
 *** 2499,2504 ****
 --- 2499,2508 ----
@@ -896,9 +972,9 @@
   #endif
     return 1;
   }
-diff -rcp binutils-2.19.51.0.2.orig/gas/doc/as.texinfo binutils-2.19.51.0.2/gas/doc/as.texinfo
-*** binutils-2.19.51.0.2.orig/gas/doc/as.texinfo	2009-02-06 09:19:18.000000000 +0000
---- binutils-2.19.51.0.2/gas/doc/as.texinfo	2009-02-10 12:25:39.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/gas/doc/as.texinfo ./gas/doc/as.texinfo
+*** ../delme/binutils-2.19.51.0.2/gas/doc/as.texinfo	2009-01-06 17:48:21.000000000 +0000
+--- ./gas/doc/as.texinfo	2009-03-05 11:53:52.000000000 +0000
 *************** The types supported are:
 *** 6277,6282 ****
 --- 6277,6287 ----
@@ -913,9 +989,9 @@
   @item STT_OBJECT
   @itemx object
   Mark the symbol as being a data object.
-diff -rcp binutils-2.19.51.0.2.orig/gas/NEWS binutils-2.19.51.0.2/gas/NEWS
-*** binutils-2.19.51.0.2.orig/gas/NEWS	2009-02-06 09:19:44.000000000 +0000
---- binutils-2.19.51.0.2/gas/NEWS	2009-02-09 18:10:40.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/gas/NEWS ./gas/NEWS
+*** ../delme/binutils-2.19.51.0.2/gas/NEWS	2009-01-06 17:48:20.000000000 +0000
+--- ./gas/NEWS	2009-03-05 11:54:03.000000000 +0000
 ***************
 *** 1,5 ****
 --- 1,10 ----
@@ -929,9 +1005,9 @@
   * Add support for Lattice Mico32 (lm32) architecture.
   
   Changes in 2.19:
-diff -rcp binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.e binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.e
-*** binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.e	2009-02-06 09:19:32.000000000 +0000
---- binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.e	2009-02-10 12:31:27.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.e ./gas/testsuite/gas/elf/type.e
+*** ../delme/binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.e	2007-11-03 20:40:37.000000000 +0000
+--- ./gas/testsuite/gas/elf/type.e	2009-03-05 11:53:56.000000000 +0000
 ***************
 *** 1,5 ****
        .: 0+0     1 FUNC    LOCAL  DEFAULT    . function
@@ -946,9 +1022,9 @@
        .: 0+1     1 TLS     LOCAL  DEFAULT    . tls_object
 !     ..: 0+2     1 NOTYPE  LOCAL  DEFAULT    . notype
       ..: 0+1     1 (COMMON|OBJECT)  GLOBAL DEFAULT  COM common
-diff -rcp binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.s binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.s
-*** binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.s	2009-02-06 09:19:32.000000000 +0000
---- binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.s	2009-02-10 12:26:29.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.s ./gas/testsuite/gas/elf/type.s
+*** ../delme/binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.s	2007-11-03 20:40:37.000000000 +0000
+--- ./gas/testsuite/gas/elf/type.s	2009-03-05 11:53:56.000000000 +0000
 ***************
 *** 3,8 ****
 --- 3,12 ----
@@ -962,9 +1038,9 @@
           .data
           .type   object,%object
           .size   object,1
-diff -rcp binutils-2.19.51.0.2.orig/include/elf/common.h binutils-2.19.51.0.2/include/elf/common.h
-*** binutils-2.19.51.0.2.orig/include/elf/common.h	2009-02-06 09:18:19.000000000 +0000
---- binutils-2.19.51.0.2/include/elf/common.h	2009-02-10 12:18:39.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/include/elf/common.h ./include/elf/common.h
+*** ../delme/binutils-2.19.51.0.2/include/elf/common.h	2009-02-04 18:21:50.000000000 +0000
+--- ./include/elf/common.h	2009-03-05 11:53:39.000000000 +0000
 ***************
 *** 549,554 ****
 --- 549,555 ----
@@ -975,9 +1051,9 @@
   #define STT_HIOS	12		/* OS-specific semantics */
   #define STT_LOPROC	13		/* Application-specific semantics */
   #define STT_HIPROC	15		/* Application-specific semantics */
-diff -rcp binutils-2.19.51.0.2.orig/ld/NEWS binutils-2.19.51.0.2/ld/NEWS
-*** binutils-2.19.51.0.2.orig/ld/NEWS	2009-02-06 09:18:41.000000000 +0000
---- binutils-2.19.51.0.2/ld/NEWS	2009-02-09 18:11:13.000000000 +0000
+diff -rcp ../delme/binutils-2.19.51.0.2/ld/NEWS ./ld/NEWS
+*** ../delme/binutils-2.19.51.0.2/ld/NEWS	2009-04-08 16:22:56.000000000 +0100
+--- ./ld/NEWS	2009-03-05 11:53:45.000000000 +0000
 ***************
 *** 1,5 ****
 --- 1,9 ----


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- binutils.spec	17 Mar 2009 12:01:12 -0000	1.159
+++ binutils.spec	8 Apr 2009 16:13:33 -0000	1.160
@@ -48,7 +48,7 @@
 # Required for: ld-bootstrap/bootstrap.exp bootstrap with --static
 # It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array
 %if %{run_testsuite}
-BuildRequires: dejagnu, zlib-static glibc-static
+BuildRequires: dejagnu, zlib-static, glibc-static
 %endif
 Conflicts: gcc-c++ < 4.0.0
 Requires(post): /sbin/install-info



From rdieter at fedoraproject.org  Wed Apr  8 16:20:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 16:20:45 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.191,1.192
Message-ID: <20090408162045.39BE57011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13960

Modified Files:
	kdebindings.spec 
Log Message:
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- enable csharp only on archs supported by mono (ie, drop ppc)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- kdebindings.spec	1 Apr 2009 22:51:56 -0000	1.191
+++ kdebindings.spec	8 Apr 2009 16:20:14 -0000	1.192
@@ -1,5 +1,6 @@
 # define to enable these optional bits
-%ifnarch ppc64
+## arch'es matching mono's ExclusiveArch set
+%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x
 %define csharp 1
 %endif
 %define falcon 1
@@ -23,7 +24,7 @@
 
 Name: kdebindings
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -474,6 +475,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- enable csharp only on archs supported by mono (ie, drop ppc)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - relax dep on kdepimlibs-akonadi
 



From mclasen at fedoraproject.org  Wed Apr  8 16:23:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  8 Apr 2009 16:23:39 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.176,1.177
Message-ID: <20090408162339.ED26A7011A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14581

Modified Files:
	comps-f11.xml.in 
Log Message:
Add brasero-nautilus to default gnome desktop



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- comps-f11.xml.in	7 Apr 2009 11:34:11 -0000	1.176
+++ comps-f11.xml.in	8 Apr 2009 16:23:09 -0000	1.177
@@ -2149,6 +2149,7 @@
       <packagereq type="conditional" requires="scim">scim-bridge-gtk</packagereq>
       <packagereq type="default">alacarte</packagereq>
       <packagereq type="default">at-spi</packagereq>
+      <packagereq type="default">brasero-nautilus</packagereq>
       <packagereq type="default">bug-buddy</packagereq>
       <packagereq type="default">compiz-gnome</packagereq>
       <packagereq type="default">dasher</packagereq>



From erikos at fedoraproject.org  Wed Apr  8 16:27:13 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Wed,  8 Apr 2009 16:27:13 +0000 (UTC)
Subject: rpms/sugar-artwork/devel sugar-artwork.spec,1.22,1.23
Message-ID: <20090408162713.0A4367011A@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15227

Modified Files:
	sugar-artwork.spec 
Log Message:
* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-3
- Another rebuild for icon-slicer-0.3-12




Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-artwork.spec	8 Apr 2009 09:15:26 -0000	1.22
+++ sugar-artwork.spec	8 Apr 2009 16:26:42 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.84.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
 # git clone git://dev.laptop.org/artwork
@@ -64,6 +64,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-3
+- Another rebuild for icon-slicer-0.3-12
+
 * Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.1-2
 - Rebuild for icon-slicer-0.3-12
 



From jcollie at fedoraproject.org  Wed Apr  8 16:35:14 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  8 Apr 2009 16:35:14 +0000 (UTC)
Subject: rpms/asterisk-sounds-core/devel .cvsignore, 1.2,
	1.3 asterisk-sounds-core.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090408163514.914BA7011A@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk-sounds-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16968

Modified Files:
	.cvsignore asterisk-sounds-core.spec sources 
Log Message:
* Wed Apr  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.15-1
- Update to new release of sounds.
- Add sounds encoded with siren7 and siren14.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Feb 2009 13:57:22 -0000	1.2
+++ .cvsignore	8 Apr 2009 16:34:44 -0000	1.3
@@ -1,21 +1,27 @@
-asterisk-core-sounds-en-alaw-1.4.14.tar.gz
-asterisk-core-sounds-en-g722-1.4.14.tar.gz
-asterisk-core-sounds-en-g729-1.4.14.tar.gz
-asterisk-core-sounds-en-gsm-1.4.14.tar.gz
-asterisk-core-sounds-en-sln16-1.4.14.tar.gz
-asterisk-core-sounds-en-ulaw-1.4.14.tar.gz
-asterisk-core-sounds-en-wav-1.4.14.tar.gz
-asterisk-core-sounds-es-alaw-1.4.14.tar.gz
-asterisk-core-sounds-es-g722-1.4.14.tar.gz
-asterisk-core-sounds-es-g729-1.4.14.tar.gz
-asterisk-core-sounds-es-gsm-1.4.14.tar.gz
-asterisk-core-sounds-es-sln16-1.4.14.tar.gz
-asterisk-core-sounds-es-ulaw-1.4.14.tar.gz
-asterisk-core-sounds-es-wav-1.4.14.tar.gz
-asterisk-core-sounds-fr-alaw-1.4.14.tar.gz
-asterisk-core-sounds-fr-g722-1.4.14.tar.gz
-asterisk-core-sounds-fr-g729-1.4.14.tar.gz
-asterisk-core-sounds-fr-gsm-1.4.14.tar.gz
-asterisk-core-sounds-fr-sln16-1.4.14.tar.gz
-asterisk-core-sounds-fr-ulaw-1.4.14.tar.gz
-asterisk-core-sounds-fr-wav-1.4.14.tar.gz
+asterisk-core-sounds-en-alaw-1.4.15.tar.gz
+asterisk-core-sounds-en-g722-1.4.15.tar.gz
+asterisk-core-sounds-en-g729-1.4.15.tar.gz
+asterisk-core-sounds-en-gsm-1.4.15.tar.gz
+asterisk-core-sounds-en-siren14-1.4.15.tar.gz
+asterisk-core-sounds-en-siren7-1.4.15.tar.gz
+asterisk-core-sounds-en-sln16-1.4.15.tar.gz
+asterisk-core-sounds-en-ulaw-1.4.15.tar.gz
+asterisk-core-sounds-en-wav-1.4.15.tar.gz
+asterisk-core-sounds-es-alaw-1.4.15.tar.gz
+asterisk-core-sounds-es-g722-1.4.15.tar.gz
+asterisk-core-sounds-es-g729-1.4.15.tar.gz
+asterisk-core-sounds-es-gsm-1.4.15.tar.gz
+asterisk-core-sounds-es-siren14-1.4.15.tar.gz
+asterisk-core-sounds-es-siren7-1.4.15.tar.gz
+asterisk-core-sounds-es-sln16-1.4.15.tar.gz
+asterisk-core-sounds-es-ulaw-1.4.15.tar.gz
+asterisk-core-sounds-es-wav-1.4.15.tar.gz
+asterisk-core-sounds-fr-alaw-1.4.15.tar.gz
+asterisk-core-sounds-fr-g722-1.4.15.tar.gz
+asterisk-core-sounds-fr-g729-1.4.15.tar.gz
+asterisk-core-sounds-fr-gsm-1.4.15.tar.gz
+asterisk-core-sounds-fr-siren14-1.4.15.tar.gz
+asterisk-core-sounds-fr-siren7-1.4.15.tar.gz
+asterisk-core-sounds-fr-sln16-1.4.15.tar.gz
+asterisk-core-sounds-fr-ulaw-1.4.15.tar.gz
+asterisk-core-sounds-fr-wav-1.4.15.tar.gz


Index: asterisk-sounds-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/asterisk-sounds-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asterisk-sounds-core.spec	24 Feb 2009 02:43:46 -0000	1.2
+++ asterisk-sounds-core.spec	8 Apr 2009 16:34:44 -0000	1.3
@@ -1,8 +1,8 @@
 %define sounds_dir %{_datadir}/asterisk/sounds
 
 Name:           asterisk-sounds-core
-Version:        1.4.14
-Release:        2%{?dist}
+Version:        1.4.15
+Release:        1%{?dist}
 Summary:        Core sounds for Asterisk
 
 Group:          Applications/Internet
@@ -14,25 +14,31 @@
 Source1:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-%{version}.tar.gz
 Source2:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-%{version}.tar.gz
 Source3:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{version}.tar.gz
-Source4:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{version}.tar.gz
-Source5:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{version}.tar.gz
-Source6:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-%{version}.tar.gz
+Source4:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-%{version}.tar.gz
+Source5:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-%{version}.tar.gz
+Source6:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{version}.tar.gz
+Source7:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{version}.tar.gz
+Source8:        http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-%{version}.tar.gz
 
 Source10:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-%{version}.tar.gz
 Source11:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-%{version}.tar.gz
 Source12:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-%{version}.tar.gz
 Source13:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-%{version}.tar.gz
-Source14:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{version}.tar.gz
-Source15:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{version}.tar.gz
-Source16:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-%{version}.tar.gz
+Source14:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-%{version}.tar.gz
+Source15:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-%{version}.tar.gz
+Source16:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{version}.tar.gz
+Source17:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{version}.tar.gz
+Source18:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-%{version}.tar.gz
 
 Source20:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-%{version}.tar.gz
 Source21:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-%{version}.tar.gz
 Source22:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-%{version}.tar.gz
 Source23:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-%{version}.tar.gz
-Source24:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{version}.tar.gz
-Source25:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{version}.tar.gz
-Source26:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-%{version}.tar.gz
+Source24:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-%{version}.tar.gz
+Source25:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-%{version}.tar.gz
+Source26:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{version}.tar.gz
+Source27:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{version}.tar.gz
+Source28:       http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -88,6 +94,26 @@
 %description en-gsm
 Core English GSM sound files for Asterisk.
 
+%package en-siren7
+Summary: Core English Siren7 sound files for Asterisk
+Group: Applications/Internet
+Requires: asterisk >= 1.4.0
+Requires: asterisk-sounds-core-en = %{version}-%{release}
+Provides: asterisk-sounds-core = %{version}-%{release}
+
+%description en-siren7
+Core English Siren7 sound files for Asterisk.
+
+%package en-siren14
+Summary: Core English GSM sound files for Asterisk
+Group: Applications/Internet
+Requires: asterisk >= 1.4.0
+Requires: asterisk-sounds-core-en = %{version}-%{release}
+Provides: asterisk-sounds-core = %{version}-%{release}
+
+%description en-siren14
+Core English Siren14 sound files for Asterisk.
+
 %package en-sln16
 Summary: Core English SLN16 sound files for Asterisk
 Group: Applications/Internet
@@ -166,6 +192,26 @@
 %description es-gsm
 Core Spanish GSM sound files for Asterisk.
 
+%package es-siren7
+Summary: Core Spanish Siren7 sound files for Asterisk
+Group: Applications/Internet
+Requires: asterisk >= 1.4.0
+Requires: asterisk-sounds-core-es = %{version}-%{release}
+Provides: asterisk-sounds-core = %{version}-%{release}
+
+%description es-siren7
+Core Spanish Siren7 sound files for Asterisk.
+
+%package es-siren14
+Summary: Core Spanish Siren14 sound files for Asterisk
+Group: Applications/Internet
+Requires: asterisk >= 1.4.0
+Requires: asterisk-sounds-core-es = %{version}-%{release}
+Provides: asterisk-sounds-core = %{version}-%{release}
+
+%description es-siren14
+Core Spanish Siren14 sound files for Asterisk.
+
 %package es-sln16
 Summary: Core Spanish SLN16 sound files for Asterisk
 Group: Applications/Internet
@@ -244,6 +290,26 @@
 %description fr-gsm
 Core French GSM sound files for Asterisk.
 
+%package fr-siren7
+Summary: Core French Siren7 sound files for Asterisk
+Group: Applications/Internet
+Requires: asterisk >= 1.4.0
+Requires: asterisk-sounds-core-fr = %{version}-%{release}
+Provides: asterisk-sounds-core = %{version}-%{release}
+
+%description fr-siren7
+Core French Siren7 sound files for Asterisk.
+
+%package fr-siren14
+Summary: Core French Siren14 sound files for Asterisk
+Group: Applications/Internet
+Requires: asterisk >= 1.4.0
+Requires: asterisk-sounds-core-fr = %{version}-%{release}
+Provides: asterisk-sounds-core = %{version}-%{release}
+
+%description fr-siren14
+Core French Siren14 sound files for Asterisk.
+
 %package fr-sln16
 Summary: Core French SLN16 sound files for Asterisk
 Group: Applications/Internet
@@ -280,25 +346,25 @@
 
 %build
 
-for file in %{S:0} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6}
+for file in %{S:0} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8}
 do
-  tar --list --file $file | grep -E '.(alaw|g722|g729|gsm|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/!' > `basename $file .tar.gz`.list
+  tar --list --file $file | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/!' > `basename $file .tar.gz`.list
   tar --extract --directory . --file $file
 done
 
 mkdir es
 
-for file in %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16}
+for file in %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18}
 do
-  tar --list --file $file | grep -E '.(alaw|g722|g729|gsm|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/es/!' > `basename $file .tar.gz`.list
+  tar --list --file $file | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/es/!' > `basename $file .tar.gz`.list
   tar --extract --directory ./es/ --file $file
 done
 
 mkdir fr
 
-for file in %{S:20} %{S:21} %{S:22} %{S:23} %{S:24} %{S:25} %{S:26}
+for file in %{S:20} %{S:21} %{S:22} %{S:23} %{S:24} %{S:25} %{S:26} %{S:27} %{S:28}
 do
-  tar tf $file | grep -E '.(alaw|g722|g729|gsm|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list
+  tar tf $file | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list
   tar --extract --directory ./fr/  --file $file
 done
 
@@ -350,6 +416,14 @@
 %defattr(-,root,root,-)
 %doc asterisk-core-sounds-en-gsm-%{version}.list
 
+%files en-siren7 -f asterisk-core-sounds-en-siren7-%{version}.list
+%defattr(-,root,root,-)
+%doc asterisk-core-sounds-en-siren7-%{version}.list
+
+%files en-siren14 -f asterisk-core-sounds-en-siren14-%{version}.list
+%defattr(-,root,root,-)
+%doc asterisk-core-sounds-en-gsm-%{version}.list
+
 %files en-sln16 -f asterisk-core-sounds-en-sln16-%{version}.list
 %defattr(-,root,root,-)
 %doc asterisk-core-sounds-en-sln16-%{version}.list
@@ -377,31 +451,39 @@
 
 %files es-alaw -f asterisk-core-sounds-es-alaw-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-alaw-%{version}.list
+%doc asterisk-core-sounds-es-alaw-%{version}.list
 
 %files es-g722 -f asterisk-core-sounds-es-g722-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-g722-%{version}.list
+%doc asterisk-core-sounds-es-g722-%{version}.list
 
 %files es-g729 -f asterisk-core-sounds-es-g729-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-g729-%{version}.list
+%doc asterisk-core-sounds-es-g729-%{version}.list
 
 %files es-gsm -f asterisk-core-sounds-es-gsm-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-gsm-%{version}.list
+%doc asterisk-core-sounds-es-gsm-%{version}.list
+
+%files es-siren7 -f asterisk-core-sounds-es-siren7-%{version}.list
+%defattr(-,root,root,-)
+%doc asterisk-core-sounds-es-siren7-%{version}.list
+
+%files es-siren14 -f asterisk-core-sounds-es-siren14-%{version}.list
+%defattr(-,root,root,-)
+%doc asterisk-core-sounds-es-siren14-%{version}.list
 
 %files es-sln16 -f asterisk-core-sounds-es-sln16-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-sln16-%{version}.list
+%doc asterisk-core-sounds-es-sln16-%{version}.list
 
 %files es-ulaw -f asterisk-core-sounds-es-ulaw-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-ulaw-%{version}.list
+%doc asterisk-core-sounds-es-ulaw-%{version}.list
 
 %files es-wav -f asterisk-core-sounds-es-wav-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-wav-%{version}.list
+%doc asterisk-core-sounds-es-wav-%{version}.list
 
 %files fr
 %defattr(-,root,root,-)
@@ -418,33 +500,45 @@
 
 %files fr-alaw -f asterisk-core-sounds-fr-alaw-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-alaw-%{version}.list
+%doc asterisk-core-sounds-fr-alaw-%{version}.list
 
 %files fr-g722 -f asterisk-core-sounds-fr-g722-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-g722-%{version}.list
+%doc asterisk-core-sounds-fr-g722-%{version}.list
 
 %files fr-g729 -f asterisk-core-sounds-fr-g729-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-g729-%{version}.list
+%doc asterisk-core-sounds-fr-g729-%{version}.list
 
 %files fr-gsm -f asterisk-core-sounds-fr-gsm-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-gsm-%{version}.list
+%doc asterisk-core-sounds-fr-gsm-%{version}.list
+
+%files fr-siren7 -f asterisk-core-sounds-fr-siren7-%{version}.list
+%defattr(-,root,root,-)
+%doc asterisk-core-sounds-fr-siren7-%{version}.list
+
+%files fr-siren14 -f asterisk-core-sounds-fr-siren14-%{version}.list
+%defattr(-,root,root,-)
+%doc asterisk-core-sounds-fr-siren14-%{version}.list
 
 %files fr-sln16 -f asterisk-core-sounds-fr-sln16-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-sln16-%{version}.list
+%doc asterisk-core-sounds-fr-sln16-%{version}.list
 
 %files fr-ulaw -f asterisk-core-sounds-fr-ulaw-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-ulaw-%{version}.list
+%doc asterisk-core-sounds-fr-ulaw-%{version}.list
 
 %files fr-wav -f asterisk-core-sounds-fr-wav-%{version}.list
 %defattr(-,root,root,-)
-%doc asterisk-core-sounds-en-wav-%{version}.list
+%doc asterisk-core-sounds-fr-wav-%{version}.list
 
 %changelog
+* Wed Apr  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.15-1
+- Update to new release of sounds.
+- Add sounds encoded with siren7 and siren14.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2009 13:57:22 -0000	1.2
+++ sources	8 Apr 2009 16:34:44 -0000	1.3
@@ -1,21 +1,27 @@
-f0ba812e55c0a9349ee67d853233e901  asterisk-core-sounds-en-alaw-1.4.14.tar.gz
-1f59b13e378efa4f6015293da1126a46  asterisk-core-sounds-en-g722-1.4.14.tar.gz
-ec82b97257ec6dc0cdd8be28dda40457  asterisk-core-sounds-en-g729-1.4.14.tar.gz
-0bf2d347a8aeb6d844c007a9f0e8cbde  asterisk-core-sounds-en-gsm-1.4.14.tar.gz
-54d8c3dc687c767d2a5dc5f0d009a9f7  asterisk-core-sounds-en-sln16-1.4.14.tar.gz
-d8f4bd67b49c98839167d0008baf0287  asterisk-core-sounds-en-ulaw-1.4.14.tar.gz
-057df66e3f3fb0fb055fd25e8f6185a9  asterisk-core-sounds-en-wav-1.4.14.tar.gz
-913e5fe5549c106325528b2b7224a5c3  asterisk-core-sounds-es-alaw-1.4.14.tar.gz
-14f6cb0d330ee2435e75340ba6ae5090  asterisk-core-sounds-es-g722-1.4.14.tar.gz
-bb80fe9a1b8bd8399d1e6c036360d1b2  asterisk-core-sounds-es-g729-1.4.14.tar.gz
-cf6863643cf407188a4e16c9cacbe6f6  asterisk-core-sounds-es-gsm-1.4.14.tar.gz
-09089309b0020fb0b2f73c819c04f6d1  asterisk-core-sounds-es-sln16-1.4.14.tar.gz
-02a93ae16032c654cb96f2a369a22542  asterisk-core-sounds-es-ulaw-1.4.14.tar.gz
-b109375f26d7d63a574709bc4bf0e696  asterisk-core-sounds-es-wav-1.4.14.tar.gz
-0c89ba88f15d97545390f4f7834a2fcd  asterisk-core-sounds-fr-alaw-1.4.14.tar.gz
-28ad61c6c08657cbe2b092e8cf4eaff6  asterisk-core-sounds-fr-g722-1.4.14.tar.gz
-25e9cb00a1bc15ed2b4ec38cbbf9705c  asterisk-core-sounds-fr-g729-1.4.14.tar.gz
-69a59957abe0f383114a64d67413d620  asterisk-core-sounds-fr-gsm-1.4.14.tar.gz
-208fd48b8f23e893b008c4754af0e66a  asterisk-core-sounds-fr-sln16-1.4.14.tar.gz
-752b2b9e809b6d6d88174b17ed35bed8  asterisk-core-sounds-fr-ulaw-1.4.14.tar.gz
-f70b9efcec24bc0298fcf32d2641ffb9  asterisk-core-sounds-fr-wav-1.4.14.tar.gz
+e9531e871d5b24e7b83d3ef946390d40  asterisk-core-sounds-en-alaw-1.4.15.tar.gz
+54532b85f56cc91de6e7a85b50cf9800  asterisk-core-sounds-en-g722-1.4.15.tar.gz
+b489cb2cac74734b22d834406132048e  asterisk-core-sounds-en-g729-1.4.15.tar.gz
+8c6f13636ada5b3371ab57121f7afd8e  asterisk-core-sounds-en-gsm-1.4.15.tar.gz
+4e37aebb361f58033fd0812b75aa5a23  asterisk-core-sounds-en-siren14-1.4.15.tar.gz
+a3d69737799888c6fa5c938d4190d532  asterisk-core-sounds-en-siren7-1.4.15.tar.gz
+49fd91087da17417ddfd23a2d450741d  asterisk-core-sounds-en-sln16-1.4.15.tar.gz
+fd97a409e12c9e19d1af3fc381a9f8ad  asterisk-core-sounds-en-ulaw-1.4.15.tar.gz
+eaf43394b94681c31bdf56f1df653790  asterisk-core-sounds-en-wav-1.4.15.tar.gz
+b2d3aa168f9661c6e39d288d06789fc7  asterisk-core-sounds-es-alaw-1.4.15.tar.gz
+d1c7612659bd2280b3e4402167a6cc8c  asterisk-core-sounds-es-g722-1.4.15.tar.gz
+aa9828d6fbff14fc02f07a7b2b918b71  asterisk-core-sounds-es-g729-1.4.15.tar.gz
+c45fff747cadad68a7c20f64b0ae3075  asterisk-core-sounds-es-gsm-1.4.15.tar.gz
+81fe0abfd4f7248a4bf5ba8cbec98aa7  asterisk-core-sounds-es-siren14-1.4.15.tar.gz
+6c94ab98ecd60c9acc273ada07382c40  asterisk-core-sounds-es-siren7-1.4.15.tar.gz
+d9458dd770fde192ea433fce0b271501  asterisk-core-sounds-es-sln16-1.4.15.tar.gz
+fd1f5eefbb03f07a27391dd332b2fb78  asterisk-core-sounds-es-ulaw-1.4.15.tar.gz
+89dadc24f420c83614ed6286112b765a  asterisk-core-sounds-es-wav-1.4.15.tar.gz
+4752b5dbd543188c050d8baf77a34e9e  asterisk-core-sounds-fr-alaw-1.4.15.tar.gz
+7d6578b73b68b41fa7ac53ffae927ae8  asterisk-core-sounds-fr-g722-1.4.15.tar.gz
+fbfff0b1d52e37eefb2bcf8554623e1a  asterisk-core-sounds-fr-g729-1.4.15.tar.gz
+1208be19c83123e6240982cfe97ff91c  asterisk-core-sounds-fr-gsm-1.4.15.tar.gz
+ead24df2276e3ca9ab50a8babd850fc1  asterisk-core-sounds-fr-siren14-1.4.15.tar.gz
+a29bb61f9b5df1659f8b944ee50499bc  asterisk-core-sounds-fr-siren7-1.4.15.tar.gz
+a2b677b23edcb990b43b1179518f87c7  asterisk-core-sounds-fr-sln16-1.4.15.tar.gz
+491d3bdf569a9cb9c2beda7b10c0c869  asterisk-core-sounds-fr-ulaw-1.4.15.tar.gz
+0f762ebf09719e375408565b60a3f432  asterisk-core-sounds-fr-wav-1.4.15.tar.gz



From jakub at fedoraproject.org  Wed Apr  8 16:47:00 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  8 Apr 2009 16:47:00 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.267, 1.268 glibc-fedora.patch, 1.300,
	1.301 glibc.spec, 1.389, 1.390 import.log, 1.11, 1.12 sources,
	1.292, 1.293
Message-ID: <20090408164700.27D847011A@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19951/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- .cvsignore	7 Apr 2009 07:39:09 -0000	1.267
+++ .cvsignore	8 Apr 2009 16:46:29 -0000	1.268
@@ -1,2 +1,2 @@
-glibc-20090407T0657.tar.bz2
-glibc-fedora-20090407T0657.tar.bz2
+glibc-20090408T1602.tar.bz2
+glibc-fedora-20090408T1602.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- glibc-fedora.patch	7 Apr 2009 07:39:09 -0000	1.300
+++ glibc-fedora.patch	8 Apr 2009 16:46:29 -0000	1.301
@@ -1,6 +1,6 @@
---- glibc-20090407T0657/ChangeLog	7 Apr 2009 06:51:59 -0000	1.11569
-+++ glibc-20090407T0657-fedora/ChangeLog	7 Apr 2009 07:04:22 -0000	1.8782.2.325
-@@ -7124,6 +7124,13 @@
+--- glibc-20090408T1602/ChangeLog	7 Apr 2009 23:21:15 -0000	1.11575
++++ glibc-20090408T1602-fedora/ChangeLog	8 Apr 2009 16:24:12 -0000	1.8782.2.326
+@@ -7143,6 +7143,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7419,6 +7426,10 @@
+@@ -7438,6 +7445,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8676,6 +8687,15 @@
+@@ -8695,6 +8706,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090407T0657/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090407T0657-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090408T1602/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090408T1602-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090407T0657/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090407T0657-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090408T1602/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090408T1602-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090407T0657/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090407T0657-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090408T1602/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090408T1602-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090407T0657/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090407T0657-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090408T1602/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090408T1602-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090407T0657/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090407T0657-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090408T1602/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090408T1602-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090407T0657/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090407T0657-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090408T1602/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090408T1602-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090407T0657/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090407T0657-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090408T1602/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090408T1602-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090407T0657/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090407T0657-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090408T1602/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090408T1602-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090407T0657/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090408T1602/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090407T0657/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090408T1602/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090407T0657/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090407T0657-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090408T1602/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090408T1602-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090407T0657/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090407T0657-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090408T1602/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090408T1602-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090407T0657/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090407T0657-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090408T1602/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090408T1602-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090407T0657/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090407T0657-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090408T1602/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090408T1602-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090407T0657/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090407T0657-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090408T1602/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090408T1602-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090407T0657/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090407T0657-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090408T1602/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090408T1602-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090407T0657/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090407T0657-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090408T1602/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090408T1602-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090407T0657/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090407T0657-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090408T1602/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090408T1602-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090407T0657/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090408T1602/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090407T0657/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090407T0657-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090408T1602/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090408T1602-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090407T0657/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090407T0657-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090408T1602/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090408T1602-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090407T0657/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090407T0657-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090408T1602/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090408T1602-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090407T0657/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090407T0657-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090408T1602/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090408T1602-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090407T0657/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090407T0657-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090408T1602/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090408T1602-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090407T0657/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090407T0657-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090408T1602/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090408T1602-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090407T0657/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090407T0657-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090408T1602/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090408T1602-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090407T0657/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090407T0657-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090408T1602/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090408T1602-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090407T0657/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090408T1602/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090407T0657/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090407T0657-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090408T1602/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090408T1602-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090407T0657/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090407T0657-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090408T1602/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090408T1602-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090407T0657/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090407T0657-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090408T1602/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090408T1602-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090407T0657/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090407T0657-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090408T1602/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090408T1602-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090407T0657/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090408T1602/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,19 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090407T0657/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
-+++ glibc-20090407T0657-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
-@@ -102,7 +102,7 @@ libnss_dns {
-     _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
-     _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
-     _nss_dns_gethostbyaddr2_r;
--    _nss_dns_gethostbyname4_r;
-+    # _nss_dns_gethostbyname4_r;
-   }
- }
- 
---- glibc-20090407T0657/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090407T0657-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090408T1602/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090408T1602-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1236,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090407T0657/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090407T0657-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090408T1602/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090408T1602-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1253,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090407T0657/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090407T0657-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090408T1602/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090408T1602-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1270,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090407T0657/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090407T0657-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090408T1602/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090408T1602-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1283,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090407T0657/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090407T0657-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090408T1602/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090408T1602-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1636,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090407T0657/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090408T1602/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1723,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090407T0657/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090407T0657-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090408T1602/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090408T1602-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1733,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090407T0657/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090407T0657-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090408T1602/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090408T1602-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1749,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1766,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1815,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1859,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1886,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1897,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1944,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1964,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2026,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2060,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090407T0657/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090407T0657-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090408T1602/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- glibc.spec	7 Apr 2009 13:39:49 -0000	1.389
+++ glibc.spec	8 Apr 2009 16:46:29 -0000	1.390
@@ -1,6 +1,6 @@
-%define glibcdate 20090407T0657
+%define glibcdate 20090408T1602
 %define glibcname glibc
-%define glibcsrcdir glibc-20090407T0657
+%define glibcsrcdir glibc-20090408T1602
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 13
+Release: 14
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -244,8 +244,6 @@
 rm -f sysdeps/powerpc/powerpc32/power4/hp-timing.[ch]
 %endif
 
-rm -rf sysdeps/x86_64/memchr.S
-
 find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
 cat > find_provides.sh <<EOF
 #!/bin/sh
@@ -326,7 +324,7 @@
 	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
-	--disable-profile --enable-experimental-malloc --enable-nss-crypt
+	--disable-profile --enable-nss-crypt
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1015,6 +1013,10 @@
 %endif
 
 %changelog
+* Wed Apr  8 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-14
+- update from trunk
+- temporarily disable experimental malloc
+
 * Tue Apr  7 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-13
 - update from trunk
   - fix strverscmp (#494457)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	7 Apr 2009 07:39:09 -0000	1.11
+++ import.log	8 Apr 2009 16:46:29 -0000	1.12
@@ -9,3 +9,4 @@
 glibc-2_9_90-11:HEAD:glibc-2.9.90-11.src.rpm:1237580739
 glibc-2_9_90-12:HEAD:glibc-2.9.90-12.src.rpm:1238582344
 glibc-2_9_90-13:HEAD:glibc-2.9.90-13.src.rpm:1239089921
+glibc-2_9_90-14:HEAD:glibc-2.9.90-14.src.rpm:1239208984


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- sources	7 Apr 2009 07:39:09 -0000	1.292
+++ sources	8 Apr 2009 16:46:29 -0000	1.293
@@ -1,2 +1,2 @@
-3a63115d0bee85fe85f9fb1e8fdd1257  glibc-20090407T0657.tar.bz2
-8578b66b3d0571f1a7152e1c92bd595a  glibc-fedora-20090407T0657.tar.bz2
+fe12ad86f88488bb23967ef0916a6e0e  glibc-20090408T1602.tar.bz2
+b01897b3107a0903c8391c86a37e7329  glibc-fedora-20090408T1602.tar.bz2



From pkgdb at fedoraproject.org  Wed Apr  8 17:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:00:06 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170007.9BA6E10F86B@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora devel was orphaned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:01:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:01:05 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170015.C0B1510F884@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 8 was orphaned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:01:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:01:11 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170020.4D04510F895@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 8 is now owned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:00:22 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170023.7E6F010F8A8@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 9 was orphaned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:01:18 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170027.6E40F10F8BA@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 10 was orphaned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:00:50 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170051.7EE5A10F874@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 10 is now owned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:00:57 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170057.A05C310F87C@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 10 was orphaned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From chitlesh at fedoraproject.org  Wed Apr  8 17:03:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  8 Apr 2009 17:03:40 +0000 (UTC)
Subject: rpms/perl-Verilog/F-9 Verilog-Perl-3.120-gcc44.diff, NONE,
	1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 perl-Verilog.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090408170340.1F7257011A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23900/F-9

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Added Files:
	Verilog-Perl-3.120-gcc44.diff 
Log Message:
v3.121

Verilog-Perl-3.120-gcc44.diff:

--- NEW FILE Verilog-Perl-3.120-gcc44.diff ---
diff -Naur Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp Verilog-Perl-3.120/Preproc/VPreproc.cpp
--- Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp	2009-01-23 01:05:42.000000000 +0100
+++ Verilog-Perl-3.120/Preproc/VPreproc.cpp	2009-03-05 06:02:17.000000000 +0100
@@ -813,7 +813,7 @@
     // Get a single line from the parse stream.  Buffer unreturned text until the newline.
     if (isEof()) return "";
     while (1) {
-	char* rtnp;
+	const char* rtnp;
 	bool gotEof = false;
 	while (NULL==(rtnp=strchr(m_lineChars.c_str(),'\n')) && !gotEof) {
 	    int tok = getToken();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2009 20:01:01 -0000	1.4
+++ .cvsignore	8 Apr 2009 17:03:09 -0000	1.5
@@ -1 +1 @@
-Verilog-Perl-3.120.tar.gz
+Verilog-Perl-3.121.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Mar 2009 20:01:01 -0000	1.3
+++ import.log	8 Apr 2009 17:03:09 -0000	1.4
@@ -1,3 +1,4 @@
 perl-Verilog-3_100-1_fc10:F-9:perl-Verilog-3.100-1.fc10.src.rpm:1231351418
 perl-Verilog-3_110-1_fc10:F-9:perl-Verilog-3.110-1.fc10.src.rpm:1233177799
 perl-Verilog-3_120-1_fc10:F-9:perl-Verilog-3.120-1.fc10.src.rpm:1236196667
+perl-Verilog-3_121-1_fc10:F-9:perl-Verilog-3.121-1.fc10.src.rpm:1239210033


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/perl-Verilog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Verilog.spec	4 Mar 2009 20:01:01 -0000	1.3
+++ perl-Verilog.spec	8 Apr 2009 17:03:09 -0000	1.4
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.120
+Version:       3.121
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -8,6 +8,7 @@
 
 Url:           http://www.veripool.org/wiki/verilog-perl
 Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz
+Patch0:        Verilog-Perl-3.120-gcc44.diff
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,12 +26,24 @@
 
 %prep
 %setup -q -n Verilog-Perl-%{version}
+%patch0 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor \
-     PREFIX=%{_prefix}
 
-%{__make} %{?_smp_mflags}
+# Filter out bogus Provides
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(mypackage)$/d'
+EOF
+%global __perl_provides %{_builddir}/Verilog-Perl-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+
+# as from 3.121, parallel build fails, upstream was notified
+%{__make}
+#%{?_smp_mflags}
 
 
 %install
@@ -65,6 +78,16 @@
 
 
 %changelog
+* Wed Apr 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.121-1
+- upstream v3.121
+
+* Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-3
+- Filter out bogus provides: perl(mypackage).
+- Pass OPTIMIZE, remove PREFIX when setting up Makefile.
+
+* Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-2
+- Fix rebuild breakdown (Add Verilog-Perl-3.120-gcc44.diff).
+
 * Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.120-1
 - upstream v3.120
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2009 20:01:01 -0000	1.4
+++ sources	8 Apr 2009 17:03:09 -0000	1.5
@@ -1 +1 @@
-eb97995bd610f9c2fce40e9c7056b547  Verilog-Perl-3.120.tar.gz
+c4659710d776f33f0a127194cfb677f6  Verilog-Perl-3.121.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 17:05:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:05:00 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170500.C375410F87A@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora 8 was orphaned by notting

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From hadess at fedoraproject.org  Wed Apr  8 17:06:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  8 Apr 2009 17:06:30 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.11,
	1.12 gnome-bluetooth.spec, 
	1.65, 1.66 sources, 1.12, 1.13 sendto-connect-fix.patch, 1.1, NONE
Message-ID: <20090408170630.A68AF7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24284

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Removed Files:
	sendto-connect-fix.patch 
Log Message:
* Wed Apr 08 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.2-1
- Upgrade to 2.27.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Mar 2009 23:11:19 -0000	1.11
+++ .cvsignore	8 Apr 2009 17:06:00 -0000	1.12
@@ -1 +1 @@
-gnome-bluetooth-2.27.1.tar.bz2
+gnome-bluetooth-2.27.2.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-bluetooth.spec	10 Mar 2009 11:39:22 -0000	1.65
+++ gnome-bluetooth.spec	8 Apr 2009 17:06:00 -0000	1.66
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.27.1
-Release:	4%{?dist}
+Version:	2.27.2
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -31,8 +31,6 @@
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
-Patch0:	sendto-connect-fix.patch
-
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -62,7 +60,6 @@
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
-%patch0 -p1
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -160,6 +157,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Wed Apr 08 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.2-1
+- Upgrade to 2.27.2
+
 * Tue Mar 10 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.1-4
 - Make the -libs-devel obsolete and provide the -devel package, so
   we can actually upgrade...


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Mar 2009 23:11:19 -0000	1.12
+++ sources	8 Apr 2009 17:06:00 -0000	1.13
@@ -1 +1 @@
-4a7c977086af47fe43ea08b29ab93503  gnome-bluetooth-2.27.1.tar.bz2
+cbcc67dcf2205dd187dc368952c7edd2  gnome-bluetooth-2.27.2.tar.bz2


--- sendto-connect-fix.patch DELETED ---



From chitlesh at fedoraproject.org  Wed Apr  8 17:05:57 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  8 Apr 2009 17:05:57 +0000 (UTC)
Subject: rpms/perl-Verilog/F-10 Verilog-Perl-3.120-gcc44.diff, NONE,
	1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 perl-Verilog.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090408170557.9FA187011A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24343/F-10

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Added Files:
	Verilog-Perl-3.120-gcc44.diff 
Log Message:
v3.121

Verilog-Perl-3.120-gcc44.diff:

--- NEW FILE Verilog-Perl-3.120-gcc44.diff ---
diff -Naur Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp Verilog-Perl-3.120/Preproc/VPreproc.cpp
--- Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp	2009-01-23 01:05:42.000000000 +0100
+++ Verilog-Perl-3.120/Preproc/VPreproc.cpp	2009-03-05 06:02:17.000000000 +0100
@@ -813,7 +813,7 @@
     // Get a single line from the parse stream.  Buffer unreturned text until the newline.
     if (isEof()) return "";
     while (1) {
-	char* rtnp;
+	const char* rtnp;
 	bool gotEof = false;
 	while (NULL==(rtnp=strchr(m_lineChars.c_str(),'\n')) && !gotEof) {
 	    int tok = getToken();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2009 20:07:24 -0000	1.4
+++ .cvsignore	8 Apr 2009 17:05:27 -0000	1.5
@@ -1 +1 @@
-Verilog-Perl-3.120.tar.gz
+Verilog-Perl-3.121.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Mar 2009 20:07:24 -0000	1.3
+++ import.log	8 Apr 2009 17:05:27 -0000	1.4
@@ -1,3 +1,4 @@
 perl-Verilog-3_100-1_fc10:F-10:perl-Verilog-3.100-1.fc10.src.rpm:1231351547
 perl-Verilog-3_110-1_fc10:F-10:perl-Verilog-3.110-1.fc10.src.rpm:1233177883
 perl-Verilog-3_120-1_fc10:F-10:perl-Verilog-3.120-1.fc10.src.rpm:1236197127
+perl-Verilog-3_121-1_fc10:F-10:perl-Verilog-3.121-1.fc10.src.rpm:1239210143


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/perl-Verilog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Verilog.spec	4 Mar 2009 20:07:24 -0000	1.3
+++ perl-Verilog.spec	8 Apr 2009 17:05:27 -0000	1.4
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.120
+Version:       3.121
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -8,6 +8,7 @@
 
 Url:           http://www.veripool.org/wiki/verilog-perl
 Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz
+Patch0:        Verilog-Perl-3.120-gcc44.diff
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,12 +26,24 @@
 
 %prep
 %setup -q -n Verilog-Perl-%{version}
+%patch0 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor \
-     PREFIX=%{_prefix}
 
-%{__make} %{?_smp_mflags}
+# Filter out bogus Provides
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(mypackage)$/d'
+EOF
+%global __perl_provides %{_builddir}/Verilog-Perl-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+
+# as from 3.121, parallel build fails, upstream was notified
+%{__make}
+#%{?_smp_mflags}
 
 
 %install
@@ -65,6 +78,16 @@
 
 
 %changelog
+* Wed Apr 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.121-1
+- upstream v3.121
+
+* Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-3
+- Filter out bogus provides: perl(mypackage).
+- Pass OPTIMIZE, remove PREFIX when setting up Makefile.
+
+* Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-2
+- Fix rebuild breakdown (Add Verilog-Perl-3.120-gcc44.diff).
+
 * Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.120-1
 - upstream v3.120
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2009 20:07:24 -0000	1.4
+++ sources	8 Apr 2009 17:05:27 -0000	1.5
@@ -1 +1 @@
-eb97995bd610f9c2fce40e9c7056b547  Verilog-Perl-3.120.tar.gz
+c4659710d776f33f0a127194cfb677f6  Verilog-Perl-3.121.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 17:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:08:59 +0000
Subject: [pkgdb] ConsoleKit ownership updated
Message-ID: <20090408170859.F3CB410F86B@bastion2.fedora.phx.redhat.com>

Package ConsoleKit in Fedora devel is now owned by mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From maynardj at fedoraproject.org  Wed Apr  8 17:09:21 2009
From: maynardj at fedoraproject.org (Maynard Johnson)
Date: Wed,  8 Apr 2009 17:09:21 +0000 (UTC)
Subject: rpms/stapitrace/devel itrace-bfd-config.patch, NONE,
	1.1 itrace-f11-fixes_for-upstream.patch, NONE,
	1.1 stapitrace-build-fixes.patch, NONE,
	1.1 stapitrace-insn-update.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.4, 1.5 stapitrace.spec, 1.25, 1.26
Message-ID: <20090408170921.94C1F7011A@cvs1.fedora.phx.redhat.com>

Author: maynardj

Update of /cvs/pkgs/rpms/stapitrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25156

Modified Files:
	.cvsignore sources stapitrace.spec 
Added Files:
	itrace-bfd-config.patch itrace-f11-fixes_for-upstream.patch 
	stapitrace-build-fixes.patch stapitrace-insn-update.patch 
Log Message:
Fix ppc64 build failure and revert to older source snapshot

itrace-bfd-config.patch:

--- NEW FILE itrace-bfd-config.patch ---
diff -paur Dpiperf-orig/configure.in Dpiperf-update/configure.in
--- Dpiperf-orig/configure.in	2009-04-03 10:18:44.000000000 -0400
+++ Dpiperf-update/configure.in	2009-04-03 15:46:53.000000000 -0400
@@ -19,7 +19,16 @@ AC_PROG_RANLIB
 AC_CHECK_LIB([c], [atoi], [], [AC_MSG_ERROR([[Please install libc.]])])
 AC_CHECK_LIB([dl], [dlsym], [], [AC_MSG_ERROR([[Please install libdl.]])])
 AC_CHECK_LIB([iberty], [cplus_demangle], [], [AC_MSG_ERROR([[Please install libiberty (binutils package).]])])
-#AC_CHECK_LIB([bfd], [bfd_get_elf_phdrs], [], [AC_MSG_ERROR([[Please install libbfd (binutils package).]])])
+AC_CHECK_LIB(bfd, bfd_openr,[LIBS="-lbfd $LIBS"; BINUTILS_LIBS="-liberty -lbfd"],
+        [AC_CHECK_LIB(z, compress,
+dnl Use a different bfd function here so as not to use cached result from above
+                [AC_CHECK_LIB(bfd, bfd_fdopenr, [LIBS="-lbfd -lz $LIBS"; BINUTILS_LIBS="-liberty -lbfd -lz"],
+                        [AC_MSG_ERROR([bfd library not found])], -lz)
+                ],
+                [AC_MSG_ERROR([libz library not found; required by libbfd])])
+        ]
+)
+AC_SUBST(BINUTILS_LIBS)
 
 # Checks for header files.
 AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([[Please make sure you have bfd.h header - please install binutils-devel package]])])
diff -paur Dpiperf-orig/src/a2n/genmsi/Makefile.am Dpiperf-update/src/a2n/genmsi/Makefile.am
--- Dpiperf-orig/src/a2n/genmsi/Makefile.am	2009-04-03 10:18:44.000000000 -0400
+++ Dpiperf-update/src/a2n/genmsi/Makefile.am	2009-04-03 12:37:29.000000000 -0400
@@ -13,11 +13,11 @@ BUILT_SOURCES = bdate.h
 
 if two_a2n
 
-AM_LDFLAGS = -L${prefix}/src/a2n/ -la2n2 -liberty
+AM_LDFLAGS = -L${prefix}/src/a2n/ -la2n2 $BINUTILS_LIBS 
 
 else
 
-AM_LDFLAGS = -L${prefix}/src/a2n/ -la2n -liberty
+AM_LDFLAGS = -L${prefix}/src/a2n/ -la2n $BINUTILS_LIBS
 
 endif
 
diff -paur Dpiperf-orig/src/a2n/Makefile.am Dpiperf-update/src/a2n/Makefile.am
--- Dpiperf-orig/src/a2n/Makefile.am	2009-04-03 10:18:44.000000000 -0400
+++ Dpiperf-update/src/a2n/Makefile.am	2009-04-03 12:36:30.000000000 -0400
@@ -53,10 +53,10 @@ liba2n2_so_SOURCES = \
 	util.c
 
 liba2n2_so_LDADD = \
-	-liberty -ldl -lc ${bfd_dir}/${bfd_name}
+	$BINUTILS_LIBS -ldl -lc ${bfd_dir}/${bfd_name}
 
 liba2n_so_LDADD = \
-	-liberty -ldl -lc
+	$BINUTILS_LIBS -ldl -lc
 
 liba2n2_so_CFLAGS = -I ${top_srcdir}/INCLUDE \
             -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
@@ -100,12 +100,12 @@ liba2n_so_SOURCES = ${liba2n_SOURCES}
 if static_bfd
 
 liba2n_so_LDADD = \
-        -ldl -lc ${bfd_dir}/libbfd.a -liberty
+        -ldl -lc ${bfd_dir}/libbfd.a $BINUTILS_LIBS
 
 else
 
 liba2n_so_LDADD = \
-	-liberty -ldl -lc ${bfd_dir}/${bfd_name}
+	$BINUTILS_LIBS -ldl -lc ${bfd_dir}/${bfd_name}
 
 endif
 
diff -paur Dpiperf-orig/src/post/Makefile.am Dpiperf-update/src/post/Makefile.am
--- Dpiperf-orig/src/post/Makefile.am	2009-04-03 10:18:44.000000000 -0400
+++ Dpiperf-update/src/post/Makefile.am	2009-04-03 14:36:34.000000000 -0400
@@ -24,7 +24,7 @@ if two_a2n
 
 EXTRA_LDADD = \
     ${bfd_dir}/${opcodes_name} \
-    -L${prefix}/src/a2n -la2n2 -liberty -ldl -lc
+    -L${prefix}/src/a2n -la2n2 ${BINUTILS_LIBS} -ldl -lc
 
 else
 
@@ -41,11 +41,11 @@ EXTRA_LDADD = \
     ${prefix}/src/a2n/liba2n_a-linuxval.o \
     ${prefix}/src/a2n/liba2n_a-saveres.o \
     ${prefix}/src/a2n/liba2n_a-util.o \
-    -liberty
+    ${BINUTILS_LIBS}
 else
 EXTRA_LDADD = \
     ${bfd_dir}/${opcodes_name} \
-    -L${prefix}/src/a2n -la2n -liberty -ldl -lc
+    -L${prefix}/src/a2n -la2n ${BINUTILS_LIBS} -ldl -lc
 
 endif
 endif

itrace-f11-fixes_for-upstream.patch:

--- NEW FILE itrace-f11-fixes_for-upstream.patch ---
diff -paur Dpiperf/src/driver/pi_btrace.c Dpiperf-fixes/src/driver/pi_btrace.c
--- Dpiperf/src/driver/pi_btrace.c	2009-03-12 17:36:07.000000000 -0400
+++ Dpiperf-fixes/src/driver/pi_btrace.c	2009-03-13 19:18:08.000000000 -0400
@@ -367,6 +367,7 @@ int SoftTraceOn(void)
 	// PPC64 info
 	addr.cval = *(unsigned long *)ppc_tb_freq_location;
 #ifndef STAP_ITRACE
+	addr.cval = 0ULL;
 	PerfTraceHookSimple2(driver_info.mte_type, SYS_INFO_MAJOR,
 	                    SFT_HOOK_SYSINFO_TIME_BASE_MINOR,
 	                    (uint32_t)addr.sval.low,
@@ -895,8 +896,11 @@ char * set_segment_name(MTE_HOOK * hook,
 		else
 			hook->NT_ts = 0;
 	} else {
+#endif // STAP_ITRACE
+
 		// Anonymous, check whether we want to trace it
 		if (MappedData->TraceAnonMTE) {
+#ifndef STAP_ITRACE
 			seg_name = name_buffer;
 #if !defined(CONFIG_64BIT)
 			sprintf(seg_name, "anon-%s-%08lX-%08lX", tp->comm, vma->vm_start, vma->vm_end);
@@ -904,9 +908,11 @@ char * set_segment_name(MTE_HOOK * hook,
 			sprintf(seg_name, "anon-%s-%016lX-%016lX", tp->comm, vma->vm_start, vma->vm_end);
 #endif
 			hook->NT_ts = 0xFFFFFFF1;
+#endif // STAP_ITRACE
 		} else {
 			seg_name = NULL;
 		}			
+#ifndef STAP_ITRACE
 	}
 	return(seg_name);
 }
diff -paur Dpiperf/src/driver/pi_inspector.c Dpiperf-fixes/src/driver/pi_inspector.c
--- Dpiperf/src/driver/pi_inspector.c	2009-01-19 11:57:20.000000000 -0500
+++ Dpiperf-fixes/src/driver/pi_inspector.c	2009-03-12 14:37:38.000000000 -0400
@@ -70,11 +70,11 @@ int  pi_file_error     = 0;             
 #ifndef STAP_ITRACE // DEFS
 PIDriverInfo   driver_info = {
   .num_cpus                 = 1,
+  .mte_type                 = TRACE_TYPE,             // Buffer type for MTE hooks
 #endif // STAP_ITRACE DEFS
   .mec_table                = {0},
   .trace_buff_size          = 0,
   .mte_buff_size            = 0,
-  .mte_type                 = TRACE_TYPE,             // Buffer type for MTE hooks
 #ifndef _ST_ITRACE_ONLY
   .ptt_user_list            = {0},                    // PIDs who've done PttInit()
   .tprof_mode               = TPROF_MODE_TIME,   
diff -paur Dpiperf/src/driver/pi_inspector.h Dpiperf-fixes/src/driver/pi_inspector.h
--- Dpiperf/src/driver/pi_inspector.h	2009-01-19 11:57:20.000000000 -0500
+++ Dpiperf-fixes/src/driver/pi_inspector.h	2009-03-12 14:36:56.000000000 -0400
@@ -86,11 +86,11 @@ typedef struct _PIDriver_Info
    uint32_t   cpu_model;
    uint32_t   cpu_architecture;
    uint32_t   num_cpus;
+   uint32_t   mte_type;                        // Buffer type for MTE hooks
 #endif // STAP_ITRACE DEFS
    uint8_t    mec_table[NUM_MAJORS];
    uint32_t   trace_buff_size;
    uint32_t   mte_buff_size;
-   uint32_t   mte_type;                        // Buffer type for MTE hooks
    uint32_t   num_perf_ctrs;
    uint8_t    hyper_threading_enabled;   
 #ifndef _ST_ITRACE_ONLY
diff -paur Dpiperf/src/driver/ppc64/pi_cpuinit.c Dpiperf-fixes/src/driver/ppc64/pi_cpuinit.c
--- Dpiperf/src/driver/ppc64/pi_cpuinit.c	2008-10-02 10:42:57.000000000 -0400
+++ Dpiperf-fixes/src/driver/ppc64/pi_cpuinit.c	2009-03-12 15:11:34.000000000 -0400
@@ -58,9 +58,9 @@ int pitrace_cpu_init(void)
 	unsigned long        pvr;
 	struct device_node * cpu_node;
 	unsigned int       * fp;
+#ifndef STAP_ITRACE // CPU_INIT
         unsigned long        cpu_freq = 0; 
 
-#ifndef STAP_ITRACE // CPU_INIT
 	cpu_node = of_find_node_by_type(NULL, "cpu");
 	if ( cpu_node ) {
 		fp = (unsigned int *)of_get_property(cpu_node, "ibm,extended-clock-frequency", NULL);
diff -paur Dpiperf/src/driver/ppc64/pi_itrace.c Dpiperf-fixes/src/driver/ppc64/pi_itrace.c
--- Dpiperf/src/driver/ppc64/pi_itrace.c	2009-03-03 17:46:50.000000000 -0500
+++ Dpiperf-fixes/src/driver/ppc64/pi_itrace.c	2009-03-12 17:34:10.000000000 -0400
@@ -551,7 +551,7 @@ int ITrace_branch_hook_ss(struct pt_regs
 	return 1;
 }
 
-
+#ifndef STAP_ITRACE // BODY
 //
 // write_load_store_trace()
 // ***********************
@@ -671,6 +671,7 @@ void write_load_store_trace(struct pt_re
 			  per_cpu_data[cpu].prev_sdar      = sdar;
 	}
 }
+#endif // STAP_ITRACE BODY
 
 //
 // scan_for_new_pids()
diff -paur Dpiperf/src/stap/itrace.1 Dpiperf-fixes/src/stap/itrace.1
--- Dpiperf/src/stap/itrace.1	2009-03-03 17:44:06.000000000 -0500
+++ Dpiperf-fixes/src/stap/itrace.1	2009-03-12 18:19:12.000000000 -0400
@@ -114,7 +114,7 @@ If using with --pid option:
 - check dmesg to wait for SystemTap informational message
 - continue program to be traced (if necessary)
 - hit ^C to terminate systemtap session when done tracing
-       (^C is not necessary if using --debuginfo option
+       (^C is not necessary if using --debuginfo option)
 
 temp file directory= /tmp/itraceFJDu2O
 
diff -paur Dpiperf/src/stap/itrace.c Dpiperf-fixes/src/stap/itrace.c
--- Dpiperf/src/stap/itrace.c	2009-03-03 17:44:06.000000000 -0500
+++ Dpiperf-fixes/src/stap/itrace.c	2009-03-12 18:18:48.000000000 -0400
@@ -266,7 +266,7 @@ void run_stap(void)
 		else
 			snprintf(argument, PATH_MAX + 3, "-c %s", prog);
 
-		printf("stap -g %s %s -o %s\n",
+		printf("stap -g %s %s -o %s",
 		       argument, generated_stap_file, output_name);
 		argv[arg_number++] = "stap";
 		argv[arg_number++] = "-g";
@@ -282,11 +282,11 @@ void run_stap(void)
 		argv[arg_number++] = output_name;
 		for (i=0; i < num_stap_args; i++) {
 			argv[arg_number + i] = stap_args[i];
-			printf("%s ", stap_args[i]);
+			printf(" %s", stap_args[i]);
 			arg_number++;
 		}
 		putchar('\n');
-		argv[arg_number + num_stap_args] = 0;
+		argv[arg_number] = NULL;
 		unlink(output_name);
 
 		signal(SIGINT, SIG_DFL);
@@ -295,7 +295,7 @@ void run_stap(void)
 		printf("- check dmesg to wait for SystemTap informational message");
 		printf("- continue program to be traced (if necessary)\n");
 		printf("- hit ^C to terminate systemtap session when done tracing\n");
-		printf("\t(^C is not necessary if using --debuginfo option\n");
+		printf("\t(^C is not necessary if using --debuginfo option)\n");
 		fflush(stdout);
 		if (execvp("stap", argv) < 0) {
 			perror("stap");
diff -paur Dpiperf/src/stap/pi_itrace.template Dpiperf-fixes/src/stap/pi_itrace.template
--- Dpiperf/src/stap/pi_itrace.template	2009-03-03 17:44:06.000000000 -0500
+++ Dpiperf-fixes/src/stap/pi_itrace.template	2009-03-13 19:08:08.000000000 -0400
@@ -143,14 +143,17 @@ int printk_binary (int cpu, uint8_t * ra
 	return 1;
 }
 
+struct write_buf {
+	uint8_t Buffer[PAGE_SIZE];
+};
+struct write_buf pi_write_buf[PI_NR_CPUS];
 int SoftTraceRawWrite (uint8_t * rawData, uint16_t rawDataLen, int trace_type)
 {
 	PERFHEADER *PerfHeader = 0;
-	uint8_t     Buffer[PAGE_SIZE];
-	uint8_t     *pBuffer = Buffer;
 	unsigned long   flags;
 	union rdval temps;
 	int cpu = smp_processor_id();
+	uint8_t     *pBuffer = pi_write_buf[cpu].Buffer;
 
     
 	local_irq_save(flags);
@@ -192,8 +195,7 @@ void pi_itrace_cleanup(void)
 	int i;
 	unsigned char tempBuf[BUFFER_WRITE_CHUNK_SIZE];
 
-	on_each_cpu(btrace_get_end_time, 0, 1, 1);
-
+	PI_ON_EACH_CPU(btrace_get_end_time, 0, 1);
 	for (i = 0; i < driver_info.num_cpus; i++) {
 		unsigned char tempBuf[BUFFER_WRITE_CHUNK_SIZE];
 		PERFHEADER *PerfBuf = (PERFHEADER *)ptr_btrace_buffers[i];
diff -paur Dpiperf/src/stap/ppc_pi_itrace.template Dpiperf-fixes/src/stap/ppc_pi_itrace.template
--- Dpiperf/src/stap/ppc_pi_itrace.template	2009-03-03 17:44:06.000000000 -0500
+++ Dpiperf-fixes/src/stap/ppc_pi_itrace.template	2009-03-12 15:45:01.000000000 -0400
@@ -26,6 +26,8 @@
 
 [DEFS]
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
+#undef PDEBUG
+#define PDEBUG(fmt, args...) do {} while (0)
 #define GET_VSID(addr) (REGION_ID(addr) >= KERNEL_REGION_ID) ? \
    get_kernel_vsid(addr, MMU_SEGSIZE_256M) : \
 	get_vsid(current->mm->context.id, addr, MMU_SEGSIZE_256M)

stapitrace-build-fixes.patch:

--- NEW FILE stapitrace-build-fixes.patch ---
diff -paur Dpiperf-orig/src/Makefile.am Dpiperf-update/src/Makefile.am
--- Dpiperf-orig/src/Makefile.am	2009-04-03 15:59:52.000000000 -0400
+++ Dpiperf-update/src/Makefile.am	2009-04-03 16:00:17.000000000 -0400
@@ -26,6 +26,14 @@ SUBDIRS =        \
 endif
 else
 
+if build_stap
+
+SUBDIRS =        \
+	a2n      \
+	post     \
+	stap
+else
+
 SUBDIRS =        \
 	perfutil \
 	wbirlog  \
@@ -45,3 +53,4 @@ SUBDIRS =        \
 	wrappers
 endif
 endif
+endif
diff -paur Dpiperf-orig/src/stap/Makefile.am Dpiperf-update/src/stap/Makefile.am
--- Dpiperf-orig/src/stap/Makefile.am	2009-04-03 10:18:44.000000000 -0400
+++ Dpiperf-update/src/stap/Makefile.am	2009-04-03 16:03:29.000000000 -0400
@@ -4,11 +4,13 @@ if pi_ppc64
 
 AM_CFLAGS = -D__USE_GNU
 
-noinst_PROGRAMS = stap_filter itrace
+noinst_PROGRAMS = stap_filter
 
 stap_filter_SOURCES = \
 	stap_filter.c
 
+bin_PROGRAMS = itrace
+
 itrace_SOURCES = \
 	itrace.c
 
@@ -17,10 +19,6 @@ BUILT_SOURCES = \
 	pi_itrace.stp \
 	ppc_pi_itrace.stp
 
-itrace: itrace.c
-	$(CC) itrace.c -o itrace
-	
-
 CLEANFILES = ${BUILT_SOURCES}
 
 pi_itrace.stp: stap_filter pi_itrace.template pi_itrace.order

stapitrace-insn-update.patch:

--- NEW FILE stapitrace-insn-update.patch ---
diff -paur Dpiperf/src/stap/itrace.c Dpiperf-update/src/stap/itrace.c
--- Dpiperf/src/stap/itrace.c	2009-03-24 18:30:15.000000000 -0400
+++ Dpiperf-update/src/stap/itrace.c	2009-03-29 11:38:03.000000000 -0400
@@ -403,7 +403,7 @@ FPF("\n");
 FPF("\n");
 
 		for (i=0; i < num_funcs; i++) {
-FPF1("probe process(\"%s\").itrace if (itrace_on) ", prog);
+FPF1("probe process(\"%s\").insn if (itrace_on) ", prog);
 FPF("{\n");
 FPF("    pi_trace_it()\n");
 FPF("}\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Apr 2009 17:56:26 -0000	1.3
+++ .cvsignore	8 Apr 2009 17:08:51 -0000	1.4
@@ -1 +1 @@
-stapitrace-2.0.1.20090402cvs_alpha.tar.gz
+stapitrace-2.0.0.20090304cvs_alpha.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Apr 2009 17:56:26 -0000	1.4
+++ sources	8 Apr 2009 17:08:51 -0000	1.5
@@ -1 +1 @@
-a5302e521d56b148b766acf48e5f6206  stapitrace-2.0.1.20090402cvs_alpha.tar.gz
+ade85ba660fbeee565f458ee5bc1be68  stapitrace-2.0.0.20090304cvs_alpha.tar.gz


Index: stapitrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- stapitrace.spec	2 Apr 2009 17:56:26 -0000	1.25
+++ stapitrace.spec	8 Apr 2009 17:08:51 -0000	1.26
@@ -2,29 +2,33 @@
 # spec file for package itrace 
 #
 
-%define alphatag 20090402cvs_alpha
+%define alphatag 20090304cvs_alpha
 Name:		stapitrace
 Summary:	Instruction Tracing Tool
-Version:	2.0.1
+Version:	2.0.0
 Release:	0.%{alphatag}%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://sourceforge.net/projects/perfinsp
 Source0:	%{name}-%{version}.%{alphatag}.tar.gz
 Patch0:         itrace-f11-fixes-private.patch
+Patch1:         itrace-f11-fixes_for-upstream.patch
+Patch2:         stapitrace-insn-update.patch
+Patch3:         itrace-bfd-config.patch
+Patch4:         stapitrace-build-fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	systemtap systemtap-runtime binutils binutils-devel
 BuildRequires:	binutils binutils-devel autoconf automake zlib-devel
 ExclusiveArch:	ppc ppc64
 
 %description
-ITrace is a software tracing mechanism that runs on Linux. ITrace traces
+stapitrace is a software tracing mechanism that runs on Linux. ITrace traces
 through user application code using the SystemTap user instruction tracing
 support and can produce human-readable ASCII output or qtrace output suitable
 for analysis by packages, such as the IBM Performance Simulator for Linux
 on POWER (simppc).
 
-It is based on and shares code from PerformanceInspector's ITRACE tool.
+It is based on and shares code from PerformanceInspector's ITrace tool.
 
 %define systap %{_datadir}/systemtap
 %define tap %{systap}/tapset
@@ -36,14 +40,22 @@
 %prep
 %setup -q -n Dpiperf
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -i --force
-# override -m64
 export CFLAGS="%{__global_cflags} -mminimal-toc"	
 export CXXFLAGS="%{__global_cflags} -mminimal-toc"
 
-%configure --enable-build_stap=yes --enable-lib32on64 --disable-dependency-tracking
+%ifarch ppc
+%configure --enable-build_stap=yes --enable-lib32on64
+%else
+%configure --enable-build_stap=yes
+%endif
+
 %{__make} DESTDIR=""
 
 %install
@@ -77,6 +89,10 @@
 %{_bindir}/itrace
 
 %changelog -n itrace
+* Wed Apr 08 2009 Maynard Johnson <maynardj at us.ibm.com>
+- Fix build problems; rebase on earlier Performance Inspector
+  CVS snapshot to align with RHEL upstream code deadline
+
 * Wed Mar 11 2009 Maynard Johnson <maynardj at us.ibm.com>
 - Change to using Systemtap's built-in itrace probe point
 



From rdieter at fedoraproject.org  Wed Apr  8 17:09:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 17:09:43 +0000 (UTC)
Subject: rpms/amarok/devel amarok-2.0.2-fix_lastfm_auth.patch, NONE,
	1.1 amarok.spec, 1.144, 1.145
Message-ID: <20090408170943.D8A727011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25331

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.2-fix_lastfm_auth.patch 
Log Message:
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
- fix lastfm (kdebug#188678, rhbz#494871)
- fix qtscriptgenerator/qtscriptbindings deps


amarok-2.0.2-fix_lastfm_auth.patch:

--- NEW FILE amarok-2.0.2-fix_lastfm_auth.patch ---
--- src/services/lastfm/LastFmServiceSettings.cpp
+++ src/services/lastfm/LastFmServiceSettings.cpp
@@ -94,14 +94,12 @@
     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
 
     QString authToken =  md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
     
     // now authenticate w/ last.fm and get our session key
     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
     .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
     .add( "authToken", authToken )
     .add( "api_key", Ws::ApiKey )
-    .add( "api_sig", sign_key )
     .get();
     
     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
--- src/services/lastfm/LastFmService.cpp
+++ src/services/lastfm/LastFmService.cpp
@@ -115,14 +115,12 @@
     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
 
     QString authToken =  md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
     
     // now authenticate w/ last.fm and get our session key
     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
     .add( "username", m_userName )
     .add( "authToken", authToken )
     .add( "api_key", Ws::ApiKey )
-    .add( "api_sig", sign_key )
     .get();
     
     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- amarok.spec	7 Apr 2009 19:07:34 -0000	1.144
+++ amarok.spec	8 Apr 2009 17:09:13 -0000	1.145
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -20,6 +20,8 @@
 Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
 
 Patch100: amarok-2.0.1.1-qt45.patch
+# https://bugs.kde.org/188678
+Patch101: amarok-2.0.2-fix_lastfm_auth.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -39,13 +41,13 @@
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 
-# 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 
 %if 0%{?no_qtscriptgenerator}
-Requires: qtscriptgenerator
+BuildRequires: qtscriptgenerator
+Requires: qtscriptbindings
 %endif
 
 Obsoletes: amarok-devel < 1.4.9 
@@ -60,6 +62,7 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+
 %prep
 %setup -q
 
@@ -75,6 +78,7 @@
 %else
 %{?_qt45:%patch100 -p0 -b .qt45}
 %endif
+%patch101 -p0 -b .fix_lastfm_auth
 
 
 %build
@@ -83,13 +87,6 @@
 %{cmake_kde4} ..
 popd
 
-%if 0
-# hack around qt45 patch-induced(?) smp borkage
-pushd src/scriptengine/generator/generator
-./generate.sh
-popd
-%endif
-
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -154,6 +151,10 @@
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
+- fix lastfm (kdebug#188678, rhbz#494871)
+- fix qtscriptgenerator/qtscriptbindings deps
+
 * Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
 - enable external qtscriptgenerator/qtscriptbindings
 - optimize scriptlets



From chitlesh at fedoraproject.org  Wed Apr  8 17:09:50 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  8 Apr 2009 17:09:50 +0000 (UTC)
Subject: rpms/perl-Verilog/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 perl-Verilog.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090408170950.761787011A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25400/devel

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
v3.121


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2009 20:10:41 -0000	1.4
+++ .cvsignore	8 Apr 2009 17:09:20 -0000	1.5
@@ -1 +1 @@
-Verilog-Perl-3.120.tar.gz
+Verilog-Perl-3.121.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Mar 2009 20:10:41 -0000	1.3
+++ import.log	8 Apr 2009 17:09:20 -0000	1.4
@@ -1,3 +1,4 @@
 perl-Verilog-3_100-1_fc10:HEAD:perl-Verilog-3.100-1.fc10.src.rpm:1231351758
 perl-Verilog-3_110-1_fc10:HEAD:perl-Verilog-3.110-1.fc10.src.rpm:1233177966
 perl-Verilog-3_120-1_fc10:HEAD:perl-Verilog-3.120-1.fc10.src.rpm:1236197317
+perl-Verilog-3_121-1_fc10:HEAD:perl-Verilog-3.121-1.fc10.src.rpm:1239210304


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Verilog.spec	5 Mar 2009 06:10:01 -0000	1.6
+++ perl-Verilog.spec	8 Apr 2009 17:09:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          perl-Verilog
-Version:       3.120
-Release:       3%{?dist}
+Version:       3.121
+Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
 License:       LGPL+ or Artistic
@@ -8,7 +8,7 @@
 
 Url:           http://www.veripool.org/wiki/verilog-perl
 Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz
-Patch0:        Verilog-Perl-%{version}-gcc44.diff
+Patch0:        Verilog-Perl-3.120-gcc44.diff
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,7 +41,9 @@
 
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 
-%{__make} %{?_smp_mflags}
+# as from 3.121, parallel build fails, upstream was notified
+%{__make}
+#%{?_smp_mflags}
 
 
 %install
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.121-1
+- upstream v3.121
+
 * Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-3
 - Filter out bogus provides: perl(mypackage).
 - Pass OPTIMIZE, remove PREFIX when setting up Makefile.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2009 20:10:41 -0000	1.4
+++ sources	8 Apr 2009 17:09:20 -0000	1.5
@@ -1 +1 @@
-eb97995bd610f9c2fce40e9c7056b547  Verilog-Perl-3.120.tar.gz
+c4659710d776f33f0a127194cfb677f6  Verilog-Perl-3.121.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 17:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:10:00 +0000
Subject: [pkgdb] ConsoleKit had acl change status
Message-ID: <20090408171001.1D71910F86B@bastion2.fedora.phx.redhat.com>

mccann has set the watchbugzilla acl on ConsoleKit (Fedora devel) to Denied for jmccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:10:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:10:57 +0000
Subject: [pkgdb] ConsoleKit had acl change status
Message-ID: <20090408171005.AD02110F875@bastion2.fedora.phx.redhat.com>

mccann has set the watchcommits acl on ConsoleKit (Fedora devel) to Denied for jmccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:10:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:10:57 +0000
Subject: [pkgdb] ConsoleKit had acl change status
Message-ID: <20090408171007.4042B10F877@bastion2.fedora.phx.redhat.com>

mccann has set the commit acl on ConsoleKit (Fedora devel) to Denied for jmccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Wed Apr  8 17:10:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 17:10:08 +0000
Subject: [pkgdb] ConsoleKit had acl change status
Message-ID: <20090408171009.3B57D10F85E@bastion2.fedora.phx.redhat.com>

mccann has set the approveacls acl on ConsoleKit (Fedora devel) to Denied for jmccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From chitlesh at fedoraproject.org  Wed Apr  8 17:11:30 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  8 Apr 2009 17:11:30 +0000 (UTC)
Subject: rpms/perl-Verilog/EL-5 Verilog-Perl-3.120-gcc44.diff, NONE,
	1.1 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 perl-Verilog.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090408171130.3D4E17011A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26147/EL-5

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Added Files:
	Verilog-Perl-3.120-gcc44.diff 
Log Message:
v3.121

Verilog-Perl-3.120-gcc44.diff:

--- NEW FILE Verilog-Perl-3.120-gcc44.diff ---
diff -Naur Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp Verilog-Perl-3.120/Preproc/VPreproc.cpp
--- Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp	2009-01-23 01:05:42.000000000 +0100
+++ Verilog-Perl-3.120/Preproc/VPreproc.cpp	2009-03-05 06:02:17.000000000 +0100
@@ -813,7 +813,7 @@
     // Get a single line from the parse stream.  Buffer unreturned text until the newline.
     if (isEof()) return "";
     while (1) {
-	char* rtnp;
+	const char* rtnp;
 	bool gotEof = false;
 	while (NULL==(rtnp=strchr(m_lineChars.c_str(),'\n')) && !gotEof) {
 	    int tok = getToken();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Mar 2009 20:09:00 -0000	1.3
+++ .cvsignore	8 Apr 2009 17:10:59 -0000	1.4
@@ -1 +1 @@
-Verilog-Perl-3.120.tar.gz
+Verilog-Perl-3.121.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Mar 2009 20:09:00 -0000	1.2
+++ import.log	8 Apr 2009 17:10:59 -0000	1.3
@@ -1,2 +1,3 @@
 perl-Verilog-3_100-1_fc10:EL-5:perl-Verilog-3.100-1.fc10.src.rpm:1231351639
 perl-Verilog-3_120-1_fc10:EL-5:perl-Verilog-3.120-1.fc10.src.rpm:1236197224
+perl-Verilog-3_121-1_fc10:EL-5:perl-Verilog-3.121-1.fc10.src.rpm:1239210507


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/perl-Verilog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Verilog.spec	4 Mar 2009 20:09:01 -0000	1.2
+++ perl-Verilog.spec	8 Apr 2009 17:10:59 -0000	1.3
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.120
+Version:       3.121
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -8,6 +8,7 @@
 
 Url:           http://www.veripool.org/wiki/verilog-perl
 Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz
+Patch0:        Verilog-Perl-3.120-gcc44.diff
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,12 +26,24 @@
 
 %prep
 %setup -q -n Verilog-Perl-%{version}
+%patch0 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor \
-     PREFIX=%{_prefix}
 
-%{__make} %{?_smp_mflags}
+# Filter out bogus Provides
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(mypackage)$/d'
+EOF
+%global __perl_provides %{_builddir}/Verilog-Perl-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+
+# as from 3.121, parallel build fails, upstream was notified
+%{__make}
+#%{?_smp_mflags}
 
 
 %install
@@ -65,6 +78,16 @@
 
 
 %changelog
+* Wed Apr 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.121-1
+- upstream v3.121
+
+* Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-3
+- Filter out bogus provides: perl(mypackage).
+- Pass OPTIMIZE, remove PREFIX when setting up Makefile.
+
+* Thu Mar 05 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.120-2
+- Fix rebuild breakdown (Add Verilog-Perl-3.120-gcc44.diff).
+
 * Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.120-1
 - upstream v3.120
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Mar 2009 20:09:01 -0000	1.3
+++ sources	8 Apr 2009 17:10:59 -0000	1.4
@@ -1 +1 @@
-eb97995bd610f9c2fce40e9c7056b547  Verilog-Perl-3.120.tar.gz
+c4659710d776f33f0a127194cfb677f6  Verilog-Perl-3.121.tar.gz



From hadess at fedoraproject.org  Wed Apr  8 17:21:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  8 Apr 2009 17:21:59 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.66,1.67
Message-ID: <20090408172159.C457D7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29381

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Fix filelist for new icons



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-bluetooth.spec	8 Apr 2009 17:06:00 -0000	1.66
+++ gnome-bluetooth.spec	8 Apr 2009 17:21:29 -0000	1.67
@@ -141,7 +141,7 @@
 %{_bindir}/bluetooth-*
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-bluetooth/
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/{apps,status}/*
 %{_mandir}/man1/*
 
 %files libs



From rdieter at fedoraproject.org  Wed Apr  8 17:29:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 17:29:44 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.28, 1.29 koffice.spec, 1.102,
	1.103 sources, 1.28, 1.29 exiv2-0.18-attempt1.diff, 1.3, NONE
Message-ID: <20090408172944.8B3517011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31395

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	exiv2-0.18-attempt1.diff 
Log Message:
* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:1.0.99.0-1
- koffice-1.0.99.0, koffice2 RC1
- optimize/fix scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	7 Apr 2009 16:09:29 -0000	1.28
+++ .cvsignore	8 Apr 2009 17:29:13 -0000	1.29
@@ -1 +1 @@
-koffice-1.9.98.7.tar.bz2
+koffice-1.9.99.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- koffice.spec	7 Apr 2009 16:09:29 -0000	1.102
+++ koffice.spec	8 Apr 2009 17:29:14 -0000	1.103
@@ -6,8 +6,8 @@
 #define kugar 1
 
 Name:           koffice
-Epoch:          1 
-Version:        1.9.98.7
+Epoch:          2 
+Version:        1.9.99.0
 Release:        1%{?dist}
 Summary:        An integrated office suite
 
@@ -105,8 +105,6 @@
 Summary:        Core support files for koffice
 Group:          Applications/Productivity
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %if ! 0%{?kchart}
 Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
 %endif
@@ -265,9 +263,9 @@
 %prep
 %setup -q
 
-pushd krita/ui/kisexiv2
+#pushd krita/ui/kisexiv2
 #patch1 -p0 -b .exiv2-0.18
-popd
+#popd
 
 
 %build
@@ -329,8 +327,9 @@
 
 
 %check
+## FIXME: fix validation errors
 for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
-desktop-file-validate ${desktop_file}
+desktop-file-validate ${desktop_file} ||:
 done
 
 
@@ -339,30 +338,63 @@
 
 
 %post core
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun core
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kword -p /sbin/ldconfig
-%postun kword -p /sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%post kpresenter -p /sbin/ldconfig
-%postun kpresenter -p /sbin/ldconfig
+%posttrans core
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
-%post kugar -p /sbin/ldconfig
-%postun kugar -p /sbin/ldconfig
-
-%post kexi -p /sbin/ldconfig
-%postun kexi -p /sbin/ldconfig
+%postun core
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
+
+%post kword
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%postun kword
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%post kpresenter
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%postun kpresenter
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%post kugar
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%postun kugar
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%post kexi
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%postun kexi
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
 
 %if 0%{?kchart}
-%post kchart -p /sbin/ldconfig
-%postun kchart -p /sbin/ldconfig
+%post kchart
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
+
+%postun kchart
+/sbin/ldconfig
+update-desktop-database -q &> /dev/null ||:
 %endif
 
 %post filters -p /sbin/ldconfig
@@ -400,8 +432,8 @@
 %{_kde4_docdir}/HTML/en/koffice/
 %{_kde4_docdir}/HTML/en/thesaurus/
 %{_kde4_datadir}/applications/kde4/KThesaurus.desktop
-%{_kde4_datadir}/icons/hicolor/*/*/*
-%{_kde4_datadir}/icons/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/autocorrect.desktop
 %{_kde4_datadir}/kde4/services/changecase.desktop
 %{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
@@ -526,30 +558,32 @@
 %files karbon
 %defattr(-,root,root,-)
 %{_kde4_bindir}/karbon
+%{_kde4_configdir}/karbonrc
 %{_kde4_libdir}/libkdeinit4_karbon.so
 %{_kde4_libdir}/libkarboncommon.so.*
 %{_kde4_libdir}/libkarbonui.so.*
 %{_kde4_libdir}/kde4/*karbon*.*
-#{_kde4_libdir}/kde4/libwmfexport.*
-#{_kde4_libdir}/kde4/libwmfimport.*
+%{_kde4_libdir}/kde4/libwmfexport.*
+%{_kde4_libdir}/kde4/libwmfimport.*
 %{_kde4_appsdir}/karbon/
 %{_kde4_datadir}/kde4/services/karbon*
 %{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop
 %{_kde4_datadir}/templates/Illustration.desktop
 %{_kde4_datadir}/templates/.source/Illustration.karbon
 %{_kde4_datadir}/applications/kde4/*karbon.desktop
-#{_kde4_docdir}/HTML/en/karbon/
+%{_kde4_docdir}/HTML/en/karbon/
 %{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
 
 %files krita
 %defattr(-,root,root,-)
 %{_kde4_bindir}/krita
+%{_kde4_configdir}/kritarc
 %{_kde4_libdir}/libkdeinit4_krita.so
 %{_kde4_libdir}/libkrita*.so.*
 %{_kde4_libdir}/libKrita*.so
 %{_kde4_libdir}/libKritaRulerAssistantCommon.so.*
 %{_kde4_libdir}/kde4/*krita*.*
-%{_kde4_libdir}/libkrossmodulekrita.so.*
+#{_kde4_libdir}/libkrossmodulekrita.so.*
 %{_kde4_appsdir}/krita/
 %{_kde4_datadir}/kde4/services/krita*.desktop
 %{_kde4_datadir}/kde4/servicetypes/krita*.desktop
@@ -708,6 +742,7 @@
 %files kword
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kword
+%{_kde4_configdir}/kwordrc
 %{_kde4_libdir}/libkdeinit4_kword.so
 %{_kde4_libdir}/libkwordprivate.so.*
 %{_kde4_libdir}/kde4/krossmodulekword.so
@@ -722,6 +757,10 @@
 
 
 %changelog
+* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:1.0.99.0-1
+- koffice-1.0.99.0, koffice2 RC1
+- optimize/fix scriptlets
+
 * Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.7-1
 - koffice-1.9.98.7, koffice2 beta 7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	7 Apr 2009 16:09:29 -0000	1.28
+++ sources	8 Apr 2009 17:29:14 -0000	1.29
@@ -1 +1 @@
-1b44eb284f35d148ea6aacb0f2408277  koffice-1.9.98.7.tar.bz2
+46dcbdda79c6a9aa645d1d473c8d2046  koffice-1.9.99.0.tar.bz2


--- exiv2-0.18-attempt1.diff DELETED ---



From rdieter at fedoraproject.org  Wed Apr  8 17:32:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 17:32:15 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.103,1.104
Message-ID: <20090408173215.98E347011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32123

Modified Files:
	koffice.spec 
Log Message:
rub out remaining references to old patch



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- koffice.spec	8 Apr 2009 17:29:14 -0000	1.103
+++ koffice.spec	8 Apr 2009 17:31:45 -0000	1.104
@@ -18,8 +18,6 @@
 Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: exiv2-0.18-attempt1.diff
-
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
 #+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
@@ -263,10 +261,6 @@
 %prep
 %setup -q
 
-#pushd krita/ui/kisexiv2
-#patch1 -p0 -b .exiv2-0.18
-#popd
-
 
 %build
 



From hadess at fedoraproject.org  Wed Apr  8 17:37:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  8 Apr 2009 17:37:24 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.67,1.68
Message-ID: <20090408173724.7BF1B7011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv764

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Another try



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-bluetooth.spec	8 Apr 2009 17:21:29 -0000	1.67
+++ gnome-bluetooth.spec	8 Apr 2009 17:36:54 -0000	1.68
@@ -141,7 +141,8 @@
 %{_bindir}/bluetooth-*
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-bluetooth/
-%{_datadir}/icons/hicolor/*/{apps,status}/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/status/*
 %{_mandir}/man1/*
 
 %files libs



From rdieter at fedoraproject.org  Wed Apr  8 17:52:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 17:52:28 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.15,
	1.16 koffice-langpack.spec, 1.20, 1.21 sources, 1.16, 1.17
Message-ID: <20090408175228.554557011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4906

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.99.0-1
- koffice-l10n-1.9.99.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Apr 2009 19:53:52 -0000	1.15
+++ .cvsignore	8 Apr 2009 17:51:57 -0000	1.16
@@ -1,20 +1,24 @@
-koffice-l10n-ca-1.9.98.6.tar.bz2
-koffice-l10n-de-1.9.98.6.tar.bz2
-koffice-l10n-el-1.9.98.6.tar.bz2
-koffice-l10n-et-1.9.98.6.tar.bz2
-koffice-l10n-fr-1.9.98.6.tar.bz2
-koffice-l10n-fy-1.9.98.6.tar.bz2
-koffice-l10n-gl-1.9.98.6.tar.bz2
-koffice-l10n-hi-1.9.98.6.tar.bz2
-koffice-l10n-it-1.9.98.6.tar.bz2
-koffice-l10n-ja-1.9.98.6.tar.bz2
-koffice-l10n-kk-1.9.98.6.tar.bz2
-koffice-l10n-nds-1.9.98.6.tar.bz2
-koffice-l10n-nl-1.9.98.6.tar.bz2
-koffice-l10n-pl-1.9.98.6.tar.bz2
-koffice-l10n-pt-1.9.98.6.tar.bz2
-koffice-l10n-pt_BR-1.9.98.6.tar.bz2
-koffice-l10n-sv-1.9.98.6.tar.bz2
-koffice-l10n-tr-1.9.98.6.tar.bz2
-koffice-l10n-uk-1.9.98.6.tar.bz2
-koffice-l10n-zh_TW-1.9.98.6.tar.bz2
+koffice-l10n-ca-1.9.99.0.tar.bz2
+koffice-l10n-da-1.9.99.0.tar.bz2
+koffice-l10n-de-1.9.99.0.tar.bz2
+koffice-l10n-el-1.9.99.0.tar.bz2
+koffice-l10n-en_GB-1.9.99.0.tar.bz2
+koffice-l10n-et-1.9.99.0.tar.bz2
+koffice-l10n-fr-1.9.99.0.tar.bz2
+koffice-l10n-fy-1.9.99.0.tar.bz2
+koffice-l10n-gl-1.9.99.0.tar.bz2
+koffice-l10n-hi-1.9.99.0.tar.bz2
+koffice-l10n-it-1.9.99.0.tar.bz2
+koffice-l10n-ja-1.9.99.0.tar.bz2
+koffice-l10n-kk-1.9.99.0.tar.bz2
+koffice-l10n-nb-1.9.99.0.tar.bz2
+koffice-l10n-nds-1.9.99.0.tar.bz2
+koffice-l10n-nl-1.9.99.0.tar.bz2
+koffice-l10n-pl-1.9.99.0.tar.bz2
+koffice-l10n-pt-1.9.99.0.tar.bz2
+koffice-l10n-pt_BR-1.9.99.0.tar.bz2
+koffice-l10n-sv-1.9.99.0.tar.bz2
+koffice-l10n-tr-1.9.99.0.tar.bz2
+koffice-l10n-uk-1.9.99.0.tar.bz2
+koffice-l10n-zh_CN-1.9.99.0.tar.bz2
+koffice-l10n-zh_TW-1.9.99.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- koffice-langpack.spec	7 Apr 2009 19:53:52 -0000	1.20
+++ koffice-langpack.spec	8 Apr 2009 17:51:57 -0000	1.21
@@ -1,8 +1,9 @@
 
-%define koffice_core_version 1.9.98
+%define koffice_core_version 1.9.99
 
 Name:           koffice-langpack
-Version:        1.9.98.6
+Epoch:          1
+Version:        1.9.99.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
@@ -19,10 +20,10 @@
 Source4: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
 #Source5: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
 #Source6: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
-#Source7: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
 Source9: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
-#Source10:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
 #Source11:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eo-%{version}.tar.bz2
 #Source12:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
 Source13:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
@@ -42,7 +43,7 @@
 #Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
 #Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
 #Source28:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
-#Source29:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
 Source30:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
 #Source31:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
 Source32:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
@@ -59,7 +60,7 @@
 #Source41:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ta-%{version}.tar.bz2
 Source42:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
 Source43:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
-#Source44:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
 Source45:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
 
 BuildRequires:  gettext
@@ -470,7 +471,7 @@
 
 
 %prep
-%setup -T -c -q -n %{name} -a 4 -a 8 -a 9 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 45 
+%setup -T -c -q -n %{name} -a 4 -a 7 -a 8 -a 9 -a 10 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 
 
 
 %build
@@ -542,10 +543,10 @@
 #defattr(-,root,root,-)
 #lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
 
-#files da
-#defattr(-,root,root,-)
-#lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
-#lang(da) %{_kde4_docdir}/HTML/da/*
+%files da
+%defattr(-,root,root,-)
+%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+%lang(da) %{_kde4_docdir}/HTML/da/*
 
 %files de
 %defattr(-,root,root,-)
@@ -557,9 +558,9 @@
 %defattr(-,root,root,-)
 %lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
 
-#files en_GB
-#defattr(-,root,root,-)
-#lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+%files en_GB
+%defattr(-,root,root,-)
+%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 
 #files eo
 #defattr(-,root,root,-)
@@ -648,10 +649,10 @@
 #defattr(-,root,root,-)
 #lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
 
-#files nb
-#defattr(-,root,root,-)
-#lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
-#lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
+%files nb
+%defattr(-,root,root,-)
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
 
 %files nds
 %defattr(-,root,root,-)
@@ -721,15 +722,14 @@
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
 
-# FIXME: empty? -- Rex
 %files uk
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 %lang(uk) %{_kde4_docdir}/HTML/uk/*
 
-#files zh_CN
-#defattr(-,root,root,-)
-#lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+%files zh_CN
+%defattr(-,root,root,-)
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %files zh_TW
 %defattr(-,root,root,-)
@@ -737,6 +737,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.99.0-1
+- koffice-l10n-1.9.99.0
+
 * Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.6-1
 - koffice-l10n-1.9.98.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Apr 2009 19:53:52 -0000	1.16
+++ sources	8 Apr 2009 17:51:57 -0000	1.17
@@ -1,20 +1,24 @@
-9d073ad48e853d1fdfdc463a9321329d  koffice-l10n-ca-1.9.98.6.tar.bz2
-8a881496716b4b16c12e68068aa7af82  koffice-l10n-de-1.9.98.6.tar.bz2
-11ca0b1589a522024ab1dd60cf59d88b  koffice-l10n-el-1.9.98.6.tar.bz2
-4b4307326fe24f3473b8385378fce0d0  koffice-l10n-et-1.9.98.6.tar.bz2
-9bb171134c72ec7fe60b915cbb95eec2  koffice-l10n-fr-1.9.98.6.tar.bz2
-afd43aac05504665a874d813b642f747  koffice-l10n-fy-1.9.98.6.tar.bz2
-d468e144be415d26435b91bd4c066a88  koffice-l10n-gl-1.9.98.6.tar.bz2
-70eb8763f8e1a4e035617eeba7da43d7  koffice-l10n-hi-1.9.98.6.tar.bz2
-f2b20dda910cf8db11a07c437a7bff67  koffice-l10n-it-1.9.98.6.tar.bz2
-53ad5041c829827de72d9b57b3eb8b86  koffice-l10n-ja-1.9.98.6.tar.bz2
-f2216bac3a9d2cd4a45de531561e589f  koffice-l10n-kk-1.9.98.6.tar.bz2
-1784c29f600fc290c66aef4c8d2d30c5  koffice-l10n-nds-1.9.98.6.tar.bz2
-3d1a2787a59d9a4c0be48372ffbddbac  koffice-l10n-nl-1.9.98.6.tar.bz2
-ed3d489560d8da66561165c139813d81  koffice-l10n-pl-1.9.98.6.tar.bz2
-7c5a100daa96a7a6e37e63a1956dbf39  koffice-l10n-pt-1.9.98.6.tar.bz2
-1f378f8ef617ce91937f9377a763ad9b  koffice-l10n-pt_BR-1.9.98.6.tar.bz2
-bac4c8a87d2dca643f448faa962930dc  koffice-l10n-sv-1.9.98.6.tar.bz2
-831c6abb96eeb28dd7b704bb7589e269  koffice-l10n-tr-1.9.98.6.tar.bz2
-7d0852fe1a97def11b35d2de00601dd7  koffice-l10n-uk-1.9.98.6.tar.bz2
-bfdf9c0371edc6b4baed1f29bdf1b7d9  koffice-l10n-zh_TW-1.9.98.6.tar.bz2
+7876e8ea78fd81da56c0d0e0429cb708  koffice-l10n-ca-1.9.99.0.tar.bz2
+80d987a58d9452b79b6bf96db6c5054b  koffice-l10n-da-1.9.99.0.tar.bz2
+63d7a8c64cef20114b63bcab4935ec95  koffice-l10n-de-1.9.99.0.tar.bz2
+9fd9f2a904769842138df909b1a206cd  koffice-l10n-el-1.9.99.0.tar.bz2
+0d0de1e340c7673bc04002db6612e734  koffice-l10n-en_GB-1.9.99.0.tar.bz2
+bbfd103b08986821618f6e7ecf1d9c2c  koffice-l10n-et-1.9.99.0.tar.bz2
+8313831ba98ab70eeb4f6e0f2b72b834  koffice-l10n-fr-1.9.99.0.tar.bz2
+b84f25910167a435212449d13f33355c  koffice-l10n-fy-1.9.99.0.tar.bz2
+af2de88d4007aebaebe592828968791b  koffice-l10n-gl-1.9.99.0.tar.bz2
+0ea47c570af54515c57c856b7de50a14  koffice-l10n-hi-1.9.99.0.tar.bz2
+8690148e70fb0bb7687a17b7f2ca2f1a  koffice-l10n-it-1.9.99.0.tar.bz2
+467b12e466da001b38944aafa44cab6f  koffice-l10n-ja-1.9.99.0.tar.bz2
+f7fc13f4899222dacf084d36043ebea2  koffice-l10n-kk-1.9.99.0.tar.bz2
+ba5bff4af0109706e644c2b3615bbf93  koffice-l10n-nb-1.9.99.0.tar.bz2
+d5a0431eeeae4d919815e680c191f96d  koffice-l10n-nds-1.9.99.0.tar.bz2
+b61dae5bdd6ddb2fd32a3ae382218626  koffice-l10n-nl-1.9.99.0.tar.bz2
+449954514f9a3d0f1acd5396b14669ca  koffice-l10n-pl-1.9.99.0.tar.bz2
+a79d909ca5cff66ad14eac3f01053f19  koffice-l10n-pt-1.9.99.0.tar.bz2
+be31d104ccc5673242b225c90db40d30  koffice-l10n-pt_BR-1.9.99.0.tar.bz2
+b6a6a2327d7054e249f2a0f4ddd26142  koffice-l10n-sv-1.9.99.0.tar.bz2
+b78ccb20465c1e7307b9f236cc586041  koffice-l10n-tr-1.9.99.0.tar.bz2
+bc3f4a6c7f14dd70bf24be8fa26329ca  koffice-l10n-uk-1.9.99.0.tar.bz2
+26d0367bc39437d36546ee91aeef5c32  koffice-l10n-zh_CN-1.9.99.0.tar.bz2
+005e91159c8169c7b47c8e7133ea1467  koffice-l10n-zh_TW-1.9.99.0.tar.bz2



From mclasen at fedoraproject.org  Wed Apr  8 17:57:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  8 Apr 2009 17:57:55 +0000 (UTC)
Subject: rpms/gnome-terminal/devel gnome-terminal-session.patch, NONE,
	1.1 gnome-terminal.spec, 1.119, 1.120
Message-ID: <20090408175755.773637011A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6046

Modified Files:
	gnome-terminal.spec 
Added Files:
	gnome-terminal-session.patch 
Log Message:
make session saving work better


gnome-terminal-session.patch:

--- NEW FILE gnome-terminal-session.patch ---
Index: src/terminal-app.h
===================================================================
--- src/terminal-app.h	(revision 3380)
+++ src/terminal-app.h	(working copy)
@@ -93,6 +93,7 @@
 
 gboolean terminal_app_handle_options (TerminalApp *app,
                                       TerminalOptions *options,
+                                      gboolean allow_resume,
                                       GError **error);
 
 void terminal_app_edit_profile (TerminalApp     *app,
Index: src/terminal-options.c
===================================================================
--- src/terminal-options.c	(revision 3380)
+++ src/terminal-options.c	(working copy)
@@ -636,10 +636,6 @@
   TerminalOptions *options = data;
   InitialTab    *it;
 
-  /* make sure we have some window in case no options were given */
-  if (options->initial_windows == NULL)
-    it = ensure_top_tab (options);
-
   if (options->execute)
     {
       if (options->exec_argv == NULL)
@@ -662,6 +658,25 @@
   return TRUE;
 }
 
+/**
+ * terminal_options_parse:
+ * @working_directory: the default working directory
+ * @display_name: the default X display name
+ * @startup_id: the startup notification ID
+ * @env: the environment as variable=value pairs
+ * @ignore_unknown_options: whether to ignore unknown options when parsing
+ *   the arguments
+ * @argcp: (inout) address of the argument count. Changed if any arguments were handled
+ * @argvp: (inout) address of the argument vector. Any parameters understood by
+ *   the terminal #GOptionContext are removed
+ * @error: a #GError to fill in
+ * @...: a %NULL terminated list of extra #GOptionGroup<!-- -->s
+ *
+ * Parses the argument vector *@argvp.
+ *
+ * Returns: a new #TerminalOptions containing the windows and tabs to open,
+ *   or %NULL on error.
+ */
 TerminalOptions *
 terminal_options_parse (const char *working_directory,
                         const char *display_name,
@@ -758,6 +773,17 @@
   return NULL;
 }
 
+/**
+ * terminal_options_merge_config:
+ * @options:
+ * @key_file: a #GKeyFile containing to merge the options from
+ * @error: a #GError to fill in
+ *
+ * Merges the saved options from @key_file into @options.
+ *
+ * Returns: %TRUE if @key_file was a valid key file containing a stored
+ *   terminal configuration, or %FALSE on error
+ */
 gboolean
 terminal_options_merge_config (TerminalOptions *options,
                                GKeyFile *key_file,
@@ -864,7 +890,25 @@
   return TRUE;
 }
 
+/**
+ * terminal_options_ensure_window:
+ * @options:
+ *
+ * Ensure that @options will contain at least one window to open.
+ */
 void
+terminal_options_ensure_window (TerminalOptions *options)
+{
+  ensure_top_window (options);
+}
+
+/**
+ * terminal_options_free:
+ * @options:
+ *
+ * Frees @options.
+ */
+void
 terminal_options_free (TerminalOptions *options)
 {
   g_list_foreach (options->initial_windows, (GFunc) initial_window_free, NULL);
Index: src/terminal-options.h
===================================================================
--- src/terminal-options.h	(revision 3380)
+++ src/terminal-options.h	(working copy)
@@ -97,12 +97,14 @@
                                          int *argcp,
                                          char ***argvp,
                                          GError **error,
-                                         ...);
+                                         ...) G_GNUC_NULL_TERMINATED;
 
 gboolean terminal_options_merge_config (TerminalOptions *options,
                                         GKeyFile *key_file,
                                         GError **error);
 
+void terminal_options_ensure_window (TerminalOptions *options);
+
 void terminal_options_free (TerminalOptions *options);
 
 G_END_DECLS
Index: src/terminal.c
===================================================================
--- src/terminal.c	(revision 3380)
+++ src/terminal.c	(working copy)
@@ -475,7 +475,7 @@
   terminal_app_initialize (options->use_factory);
   g_signal_connect (terminal_app_get (), "quit", G_CALLBACK (gtk_main_quit), NULL);
 
-  terminal_app_handle_options (terminal_app_get (), options, NULL);
+  terminal_app_handle_options (terminal_app_get (), options, TRUE /* allow resume */, NULL);
   terminal_options_free (options);
 
   /* Now change directory to $HOME so we don't prevent unmounting, e.g. if the
@@ -499,7 +499,7 @@
 static gboolean
 handle_new_terminal_event (TerminalOptions *options)
 {
-  terminal_app_handle_options (terminal_app_get (), options, NULL);
+  terminal_app_handle_options (terminal_app_get (), options, FALSE /* no resume */, NULL);
 
   return FALSE;
 }
Index: src/terminal-app.c
===================================================================
--- src/terminal-app.c	(revision 3380)
+++ src/terminal-app.c	(working copy)
@@ -1643,9 +1643,24 @@
   return global_app;
 }
 
+/**
+ * terminal_app_handle_options:
+ * @app:
+ * @options: a #TerminalOptions
+ * @allow_resume: whether to merge the terminal configuration from the
+ *   saved session on resume
+ * @error: a #GError to fill in
+ *
+ * Processes @options. It loads or saves the terminal configuration, or
+ * opens the specified windows and tabs.
+ *
+ * Returns: %TRUE if @options could be successfully handled, or %FALSE on
+ *   error
+ */
 gboolean
 terminal_app_handle_options (TerminalApp *app,
                              TerminalOptions *options,
+                             gboolean allow_resume,
                              GError **error)
 {
   GList *lw;
@@ -1673,6 +1688,27 @@
       /* fall-through on success */
     }
 
+#ifdef WITH_SMCLIENT
+{
+  EggSMClient *sm_client;
+
+  sm_client = egg_sm_client_get ();
+
+  if (allow_resume && egg_sm_client_is_resumed (sm_client))
+    {
+      GKeyFile *key_file;
+
+      key_file = egg_sm_client_get_state_file (sm_client);
+      if (key_file != NULL &&
+          !terminal_options_merge_config (options, key_file, error))
+        return FALSE;
+    }
+}
+#endif
+
+  /* Make sure we option at least one window */
+  terminal_options_ensure_window (options);
+
   for (lw = options->initial_windows;  lw != NULL; lw = lw->next)
     {
       InitialWindow *iw = lw->data;


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-terminal.spec	16 Mar 2009 16:43:02 -0000	1.119
+++ gnome-terminal.spec	8 Apr 2009 17:57:25 -0000	1.120
@@ -11,15 +11,17 @@
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
+License: GPLv2+ and GFDL
+Group: User Interface/Desktops
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/2.25/gnome-terminal-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-terminal/2.26/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 # From upstream trunk
 Patch3: tab-switching.patch
-License: GPLv2+ and GFDL
-Group: User Interface/Desktops
+# from upstream
+Patch4: gnome-terminal-session.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +56,7 @@
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
 %patch3 -p1 -b .tab-switching
+%patch4 -p0 -b .session
 
 %build
 
@@ -132,6 +135,9 @@
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Incorporate upstream patch to make session saving work better
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From rdieter at fedoraproject.org  Wed Apr  8 18:10:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 18:10:40 +0000 (UTC)
Subject: rpms/koffice/devel koffice-1.9.99.0-gcc44_exceptions.patch, NONE,
	1.1 koffice.spec, 1.104, 1.105
Message-ID: <20090408181040.8E9C37011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8800

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.9.99.0-gcc44_exceptions.patch 
Log Message:
fix build (enable exceptions prudently)


koffice-1.9.99.0-gcc44_exceptions.patch:

--- NEW FILE koffice-1.9.99.0-gcc44_exceptions.patch ---
diff -up koffice-1.9.99.0/krita/plugins/filters/imageenhancement/CMakeLists.txt.exceptions koffice-1.9.99.0/krita/plugins/filters/imageenhancement/CMakeLists.txt
--- koffice-1.9.99.0/krita/plugins/filters/imageenhancement/CMakeLists.txt.exceptions	2009-04-01 04:04:55.000000000 -0500
+++ koffice-1.9.99.0/krita/plugins/filters/imageenhancement/CMakeLists.txt	2009-04-08 13:08:38.000000000 -0500
@@ -1,4 +1,5 @@
 
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
 set(kritaimageenhancement_PART_SRCS
     imageenhancement.cpp


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- koffice.spec	8 Apr 2009 17:31:45 -0000	1.104
+++ koffice.spec	8 Apr 2009 18:10:10 -0000	1.105
@@ -18,6 +18,8 @@
 Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch50: koffice-1.9.99.0-gcc44_exceptions.patch
+
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
 #+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
@@ -261,6 +263,8 @@
 %prep
 %setup -q
 
+%patch50 -p1 -b .gcc44_exceptions
+
 
 %build
 



From kkofler at fedoraproject.org  Wed Apr  8 18:42:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  8 Apr 2009 18:42:34 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.2.2-ksirk-rh#486380.patch, NONE,
	1.1 kdegames.spec, 1.124, 1.125
Message-ID: <20090408184234.E23F77011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14968/devel

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-rh#486380.patch 
Log Message:
* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)

kdegames-4.2.2-ksirk-rh#486380.patch:

--- NEW FILE kdegames-4.2.2-ksirk-rh#486380.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
--- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
@@ -2676,6 +2676,8 @@
 void GameAutomaton::removeAllPlayers()
 {
   kDebug();
+  // reset all countries or they will refer to nonexistent players => crash
+  m_game->theWorld()->reset();
   m_currentPlayer = "";
   foreach (KPlayer*p, *playerList())
   {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdegames.spec	4 Apr 2009 16:01:11 -0000	1.124
+++ kdegames.spec	8 Apr 2009 18:42:04 -0000	1.125
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -11,6 +11,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 # Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
 Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
+# Fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+Patch1:  kdegames-4.2.2-ksirk-rh#486380.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -92,6 +94,7 @@
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .ksirk-kde#187235
+%patch1 -p1 -b .ksirk-rh#486380
 
 %build
 
@@ -196,6 +199,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
 - fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
 



From lkundrak at fedoraproject.org  Wed Apr  8 18:48:01 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  8 Apr 2009 18:48:01 +0000 (UTC)
Subject: rpms/skychart/devel skychart.spec,1.11,1.12
Message-ID: <20090408184801.75C707011A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16735

Modified Files:
	skychart.spec 
Log Message:
* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-6.20081026svn
- Enable GTK2 UI



Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- skychart.spec	27 Mar 2009 07:18:13 -0000	1.11
+++ skychart.spec	8 Apr 2009 18:47:30 -0000	1.12
@@ -23,6 +23,7 @@
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  dos2unix
+BuildRequires:  gtk2-devel
 Requires:       xdg-utils
 Requires:       tzdata
 
@@ -51,8 +52,8 @@
 
 
 %build
-lazbuild --primary-config-path=$PWD/.lazarus skychart/component/cdccomponents.lpk
-lazbuild --primary-config-path=$PWD/.lazarus skychart/cdc.lpi
+lazbuild --widgetset=gtk2 --primary-config-path=$PWD/.lazarus skychart/component/cdccomponents.lpk
+lazbuild --widgetset=gtk2 --primary-config-path=$PWD/.lazarus skychart/cdc.lpi
 
 # TODO: more libraries. Only 404 seems essential though.
 make %{_smp_mflags} CFLAGS="%{optflags} -fPIC" -C skychart/library/plan404
@@ -147,6 +148,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-6.20081026svn
+- Enable GTK2 UI
+
 * Fri Mar 27 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-5.20081026svn
 - Fix desktop entry categories
 



From hadess at fedoraproject.org  Wed Apr  8 18:51:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  8 Apr 2009 18:51:51 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.68,1.69
Message-ID: <20090408185151.18C707011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17531

Modified Files:
	gnome-bluetooth.spec 
Log Message:
* Wed Apr 08 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.2-2
- Fix schema installation



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnome-bluetooth.spec	8 Apr 2009 17:36:54 -0000	1.68
+++ gnome-bluetooth.spec	8 Apr 2009 18:51:20 -0000	1.69
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -61,6 +61,9 @@
 %prep
 %setup -q -n gnome-bluetooth-%{version}
 
+# http://svn.gnome.org/viewvc/gnome-bluetooth?view=revision&revision=587
+sed -i -e "s/boolean/bool/" */schemas.in
+
 %build
 %configure --disable-desktop-update --disable-icon-update
 make %{?_smp_mflags}
@@ -158,6 +161,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Wed Apr 08 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.2-2
+- Fix schema installation
+
 * Wed Apr 08 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.2-1
 - Upgrade to 2.27.2
 



From lkundrak at fedoraproject.org  Wed Apr  8 18:52:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  8 Apr 2009 18:52:29 +0000 (UTC)
Subject: rpms/skychart/devel skychart.spec,1.12,1.13
Message-ID: <20090408185229.8A71C7011A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17774

Modified Files:
	skychart.spec 
Log Message:
* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-6.20081026svn
- Enable GTK2 UI



Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- skychart.spec	8 Apr 2009 18:47:30 -0000	1.12
+++ skychart.spec	8 Apr 2009 18:51:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           skychart
 Version:        3.0.1.5
-Release:        5.20081026svn%{?dist}
+Release:        6.20081026svn%{?dist}
 Summary:        Planetarium software for the advanced amateur astronomer
 
 # svn export -r1050 https://skychart.svn.sourceforge.net/svnroot/skychart/trunk at 1050 skychart-3.0.1.5



From slankes at fedoraproject.org  Wed Apr  8 18:53:13 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  8 Apr 2009 18:53:13 +0000 (UTC)
Subject: rpms/qca2/devel .cvsignore, 1.3, 1.4 qca2.spec, 1.9, 1.10 sources,
	1.3, 1.4 qca2-2.0.0-64bits.patch, 1.1, NONE
Message-ID: <20090408185313.3365A7011A@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/qca2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18139

Modified Files:
	.cvsignore qca2.spec sources 
Removed Files:
	qca2-2.0.0-64bits.patch 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qca2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2007 21:16:56 -0000	1.3
+++ .cvsignore	8 Apr 2009 18:52:42 -0000	1.4
@@ -1 +1 @@
-qca-2.0.0.tar.bz2
+qca-2.0.1.tar.bz2


Index: qca2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca2/devel/qca2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qca2.spec	25 Feb 2009 17:19:42 -0000	1.9
+++ qca2.spec	8 Apr 2009 18:52:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           qca2
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -8,8 +8,6 @@
 License:        LGPLv2+
 URL:            http://delta.affinix.com/qca
 Source0:        http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.bz2
-# Fix build on x86_64
-Patch0:         qca2-2.0.0-64bits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -37,8 +35,6 @@
 
 %prep
 %setup -q -n qca-%{version}
-%patch0 -p0 -b .64bits
-
 
 %build
 unset QTDIR
@@ -84,6 +80,10 @@
 
 
 %changelog
+* Wed Apr 08 2009 Sven Lankes <sven at lank.es> - 2.0.1-1
+- new upstream release
+- removed 64bit patch - now upstream
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qca2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2007 21:16:56 -0000	1.3
+++ sources	8 Apr 2009 18:52:42 -0000	1.4
@@ -1 +1 @@
-07d54358ef4880d05b3c6f56b629aa55  qca-2.0.0.tar.bz2
+a0a87d0b3210e23f8c1713562282b7d6  qca-2.0.1.tar.bz2


--- qca2-2.0.0-64bits.patch DELETED ---



From kkofler at fedoraproject.org  Wed Apr  8 18:56:39 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  8 Apr 2009 18:56:39 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.2.2-ksirk-rh#486380.patch, NONE,
	1.1 kdegames.spec, 1.112, 1.113
Message-ID: <20090408185639.854B17011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19142/F-10

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-rh#486380.patch 
Log Message:
Sync from devel:

* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)

kdegames-4.2.2-ksirk-rh#486380.patch:

--- NEW FILE kdegames-4.2.2-ksirk-rh#486380.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
--- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
@@ -2676,6 +2676,8 @@
 void GameAutomaton::removeAllPlayers()
 {
   kDebug();
+  // reset all countries or they will refer to nonexistent players => crash
+  m_game->theWorld()->reset();
   m_currentPlayer = "";
   foreach (KPlayer*p, *playerList())
   {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- kdegames.spec	4 Apr 2009 16:10:37 -0000	1.112
+++ kdegames.spec	8 Apr 2009 18:56:09 -0000	1.113
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -11,6 +11,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 # Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
 Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
+# Fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+Patch1:  kdegames-4.2.2-ksirk-rh#486380.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -92,6 +94,7 @@
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .ksirk-kde#187235
+%patch1 -p1 -b .ksirk-rh#486380
 
 %build
 
@@ -196,6 +199,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
 - fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
 



From kkofler at fedoraproject.org  Wed Apr  8 18:56:39 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  8 Apr 2009 18:56:39 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames-4.2.2-ksirk-rh#486380.patch, NONE,
	1.1 kdegames.spec, 1.102, 1.103
Message-ID: <20090408185639.B0F787011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19142/F-9

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-rh#486380.patch 
Log Message:
Sync from devel:

* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)

kdegames-4.2.2-ksirk-rh#486380.patch:

--- NEW FILE kdegames-4.2.2-ksirk-rh#486380.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
--- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
@@ -2676,6 +2676,8 @@
 void GameAutomaton::removeAllPlayers()
 {
   kDebug();
+  // reset all countries or they will refer to nonexistent players => crash
+  m_game->theWorld()->reset();
   m_currentPlayer = "";
   foreach (KPlayer*p, *playerList())
   {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdegames.spec	4 Apr 2009 16:10:37 -0000	1.102
+++ kdegames.spec	8 Apr 2009 18:56:09 -0000	1.103
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -11,6 +11,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 # Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
 Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
+# Fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+Patch1:  kdegames-4.2.2-ksirk-rh#486380.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -92,6 +94,7 @@
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .ksirk-kde#187235
+%patch1 -p1 -b .ksirk-rh#486380
 
 %build
 
@@ -196,6 +199,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
 - fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
 



From hadess at fedoraproject.org  Wed Apr  8 19:00:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  8 Apr 2009 19:00:48 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.69,1.70
Message-ID: <20090408190049.054437011A@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20570

Modified Files:
	gnome-bluetooth.spec 
Log Message:
And try again



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-bluetooth.spec	8 Apr 2009 18:51:20 -0000	1.69
+++ gnome-bluetooth.spec	8 Apr 2009 19:00:18 -0000	1.70
@@ -62,7 +62,7 @@
 %setup -q -n gnome-bluetooth-%{version}
 
 # http://svn.gnome.org/viewvc/gnome-bluetooth?view=revision&revision=587
-sed -i -e "s/boolean/bool/" */schemas.in
+sed -i -e "s/boolean/bool/" */*.schemas.in
 
 %build
 %configure --disable-desktop-update --disable-icon-update



From lucilanga at fedoraproject.org  Wed Apr  8 19:02:45 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed,  8 Apr 2009 19:02:45 +0000 (UTC)
Subject: rpms/drascula/devel drascula.spec,1.3,1.4
Message-ID: <20090408190245.D171F7011A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/drascula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21207

Modified Files:
	drascula.spec 
Log Message:
* Wed Apr 08 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0-5
- fix summary
- remove engine data drascula.dat
- remove audio tracks for smaller package (bug #494195)


Index: drascula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drascula/devel/drascula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drascula.spec	24 Feb 2009 12:37:23 -0000	1.3
+++ drascula.spec	8 Apr 2009 19:02:15 -0000	1.4
@@ -1,16 +1,16 @@
 Name:		drascula
 Version:	1.0
-Release:	4%{?dist}
-Summary:	Drascula: The Vampire Strikes Back
+Release:	5%{?dist}
+Summary:	The Vampire Strikes Back
 Group:		Amusements/Games
 # For further discussion on distribution rights see:
 # http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
 License:	Freely redistributable without restriction
 URL:		http://www.scummvm.org/downloads.php
 Source0:	http://downloads.sourceforge.net/scummvm/%{name}-%{version}.zip
-Source1:	http://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-12-0/dists/engine-data/drascula.dat
-Source2:	http://downloads.sourceforge.net/scummvm/%{name}-audio-%{version}.zip
-Source3: 	%{name}.desktop
+#Source1:	http://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-12-0/dists/engine-data/drascula.dat
+#Source2:	http://downloads.sourceforge.net/scummvm/%{name}-audio-%{version}.zip
+Source3:	%{name}.desktop
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	desktop-file-utils
 BuildArch:	noarch
@@ -24,13 +24,14 @@
 terrible vampire with just one idea on his mind: DOMINATING the World
 demonstrating that he is even more evil than his brother Vlad.
 
+Notice that music for the game is available as an addon in the separate
+drascula-music package. As are Spanish, German, French and Italian subtitles
+in the drascula-international package.
+
 
 
 %prep
 %setup -q -n %{name} -c %{name}
-#audio package also contain this file
-rm readme.txt
-%setup -q -T -D -a 2 -n %{name} -c %{name}
 
 
 %build
@@ -40,8 +41,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 644 Packet.001 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 644 audio/track*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 Packet.001 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -62,6 +62,11 @@
 
 
 %changelog
+* Wed Apr 08 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0-5
+- fix summary
+- remove engine data drascula.dat
+- remove audio tracks for smaller package (bug #494195)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Apr  8 19:08:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 19:08:47 +0000 (UTC)
Subject: rpms/xdg-utils/devel xdg-utils.spec,1.18,1.19
Message-ID: <20090408190847.0B0B57011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22711

Modified Files:
	xdg-utils.spec 
Log Message:
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-7.20081121cvs
- xdg-open: s/kfmclient exec/kfmclient openURL/ (CVE-2009-0068, rh#472010, fdo#19377)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xdg-utils.spec	26 Feb 2009 08:17:17 -0000	1.18
+++ xdg-utils.spec	8 Apr 2009 19:08:16 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 6.%{cvs}%{?dist}
+Release: 7.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -20,6 +20,9 @@
 
 Patch1: xdg-utils-1.0.2-htmlview.patch
 
+## upstreamable patches
+Patch50: xdg-utils-1.0.2-CVE-2009-0068-1.patch 
+
 ## upstream patches
 Patch101: xdg-utils-1.0.2-mimeopen.patch
 Patch102: xdg-utils-1.0.1-typo.patch
@@ -69,6 +72,7 @@
 %setup -q -n %{name}
 
 %patch1 -p1 -b .htmlview
+%patch50 -p1 -b .CVE-2009-0068-1
 
 %if ! 0%{?cvs:1}
 %patch101 -p1 -b .mimeopen
@@ -102,6 +106,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-7.20081121cvs
+- xdg-open: s/kfmclient exec/kfmclient openURL/ (CVE-2009-0068, rh#472010, fdo#19377)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6.20081121cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Apr  8 19:13:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  8 Apr 2009 19:13:24 +0000 (UTC)
Subject: rpms/xdg-utils/devel xdg-utils-1.0.2-CVE-2009-0068-1.patch, NONE,
	1.1
Message-ID: <20090408191324.D8CFE7011A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24060

Added Files:
	xdg-utils-1.0.2-CVE-2009-0068-1.patch 
Log Message:
include patch this time


xdg-utils-1.0.2-CVE-2009-0068-1.patch:

--- NEW FILE xdg-utils-1.0.2-CVE-2009-0068-1.patch ---
diff -up xdg-utils/scripts/xdg-open.in.CVE-2009-0068 xdg-utils/scripts/xdg-open.in
--- xdg-utils/scripts/xdg-open.in.CVE-2009-0068	2009-04-08 14:04:02.000000000 -0500
+++ xdg-utils/scripts/xdg-open.in	2009-04-08 14:05:05.000000000 -0500
@@ -29,7 +29,7 @@ _USAGE
 
 open_kde()
 {
-    kfmclient exec "$1"
+    kfmclient openURL "$1"
     kfmclient_fix_exit_code $?
 
     if [ $? -eq 0 ]; then



From lucilanga at fedoraproject.org  Wed Apr  8 19:17:30 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed,  8 Apr 2009 19:17:30 +0000 (UTC)
Subject: rpms/drascula/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090408191730.A39BF70137@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/drascula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24888

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Apr 08 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0-5
- fix summary
- remove engine data drascula.dat
- remove audio tracks for smaller package (bug #494195)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drascula/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Oct 2008 17:46:09 -0000	1.2
+++ .cvsignore	8 Apr 2009 19:17:00 -0000	1.3
@@ -1,2 +1 @@
 drascula-1.0.zip
-drascula-audio-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drascula/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Oct 2008 17:46:09 -0000	1.2
+++ sources	8 Apr 2009 19:17:00 -0000	1.3
@@ -1,2 +1 @@
 fe2ee0948159c3acb923c89a1af7cc84  drascula-1.0.zip
-cde1c1509cd8af5b1dcbdcf6289b3a99  drascula-audio-1.0.zip



From pkgdb at fedoraproject.org  Wed Apr  8 19:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 19:18:49 +0000
Subject: [pkgdb] pulseaudio: wtogami has requested watchcommits
Message-ID: <20090408191756.8E34F10F86B@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchcommits acl on pulseaudio (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pulseaudio



From pkgdb at fedoraproject.org  Wed Apr  8 19:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 19:17:59 +0000
Subject: [pkgdb] pulseaudio: wtogami has requested watchbugzilla
Message-ID: <20090408191759.3E88510F874@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchbugzilla acl on pulseaudio (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pulseaudio



From pkgdb at fedoraproject.org  Wed Apr  8 19:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 19:27:55 +0000
Subject: [pkgdb] pulseaudio had acl change status
Message-ID: <20090408192755.12E6610F86B@bastion2.fedora.phx.redhat.com>

lennart has set the watchcommits acl on pulseaudio (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pulseaudio



From pkgdb at fedoraproject.org  Wed Apr  8 19:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 19:28:47 +0000
Subject: [pkgdb] pulseaudio had acl change status
Message-ID: <20090408192755.7CA8710F874@bastion2.fedora.phx.redhat.com>

lennart has set the watchbugzilla acl on pulseaudio (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pulseaudio



From pkgdb at fedoraproject.org  Wed Apr  8 19:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 19:28:51 +0000
Subject: [pkgdb] pulseaudio had acl change status
Message-ID: <20090408192759.5EACA10F876@bastion2.fedora.phx.redhat.com>

lennart has set the commit acl on pulseaudio (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pulseaudio



From lkundrak at fedoraproject.org  Wed Apr  8 19:28:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  8 Apr 2009 19:28:03 +0000 (UTC)
Subject: rpms/skychart/devel skychart-3.0.1.6-wl.patch, NONE,
	1.1 skychart.spec, 1.13, 1.14 skychart-3.0.1.5-config.patch, 1.1,
	NONE skychart-3.0.1.5-paths.patch, 1.1,
	NONE skychart-3.0.1.5-wl.patch, 1.1, NONE
Message-ID: <20090408192803.1D8F57011A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27439

Modified Files:
	skychart.spec 
Added Files:
	skychart-3.0.1.6-wl.patch 
Removed Files:
	skychart-3.0.1.5-config.patch skychart-3.0.1.5-paths.patch 
	skychart-3.0.1.5-wl.patch 
Log Message:
* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.6-1.20090408svn
- Update to post latest beta
- Drop the unzip patch
- Upstream did the datadir and xdg-open chage as well, drop patches


skychart-3.0.1.6-wl.patch:

--- NEW FILE skychart-3.0.1.6-wl.patch ---
Case matters here.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

[?25l[?12l[?25h[?1049h[?1h=[?12;25h[?12l[?25h[?25lW10: Warning: Changing a readonly file~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                             
                                                  ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                  
                                                                                                             ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                           
                    ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                              
                                                                                 ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~ 
                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                                                                              ~                                                                                          
                                                     ~                                                                                                                                              [?12l[?25h[?25l:[?12l[?25hq[?25l[?12l[?25h![?25l[?12l[?25h^Z[?25l[?12l[?25h^Z[?25l[?12l[?25h
[?25lE488: Trailing characters[?12l[?25h[?25lType  :quit<Enter>  to exit Vim[?12l[?25hdiff -up skychart-3.0.1.6/skychart/library/plan404/Makefile.wl skychart-3.0.1.6/skychart/library/plan404/Makefile
--- skychart-3.0.1.6/skychart/library/plan404/Makefile.wl	2009-04-08 21:15:05.027791300 +0200
+++ skychart-3.0.1.6/skychart/library/plan404/Makefile	2009-04-08 21:15:28.892791702 +0200
@@ -8,7 +8,7 @@ SO_Name       = libplan404.dylib
 LIBFLAGS      = -Wl,-single_module -dynamiclib  -lc -lm
 else
 SO_Name       = libplan404.so
-LIBFLAGS      = -shared -WL,-soname,$(SO_Name) -lc -lm
+LIBFLAGS      = -shared -Wl,-soname,$(SO_Name) -lc -lm
 endif
 ifneq ($(findstring W32,$(OSTYPE)),)
 SO_Name       = libplan404.dll
[?25l[?12l[?25h[?1l>[?1049lVim: Error reading input, exiting...
Vim: preserving files...
Vim: Finished.


Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- skychart.spec	8 Apr 2009 18:51:59 -0000	1.13
+++ skychart.spec	8 Apr 2009 19:27:32 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           skychart
-Version:        3.0.1.5
-Release:        6.20081026svn%{?dist}
+Version:        3.0.1.6
+Release:        1.20090408svn%{?dist}
 Summary:        Planetarium software for the advanced amateur astronomer
 
 # svn export -r1050 https://skychart.svn.sourceforge.net/svnroot/skychart/trunk at 1050 skychart-3.0.1.5
@@ -9,11 +9,9 @@
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            https://sourceforge.net/projects/skychart/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.lzma
 Source1:        skychart.desktop
-Patch0:         skychart-3.0.1.5-config.patch
-Patch1:         skychart-3.0.1.5-wl.patch
-Patch2:         skychart-3.0.1.5-paths.patch
+Patch1:         skychart-3.0.1.6-wl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
@@ -45,9 +43,7 @@
 %setup -q
 %{__unzip} -q tools/doc/wiki_doc.zip -d tools/doc
 
-%patch0 -p1 -b .config
 %patch1 -p1 -b .wl
-%patch2 -p1 -b .paths
 find . -type f -print0 |xargs -0 chmod 644
 
 
@@ -99,7 +95,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/skychart
 
 # Binary
-install -pm 0755 skychart/units/skychart \
+install -pm 0755 skychart/units/*/skychart \
         $RPM_BUILD_ROOT%{_bindir}
 
 # Libraries
@@ -148,6 +144,11 @@
 
 
 %changelog
+* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.6-1.20090408svn
+- Update to post latest beta
+- Drop the unzip patch
+- Upstream did the datadir and xdg-open chage as well, drop patches
+
 * Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-6.20081026svn
 - Enable GTK2 UI
 


--- skychart-3.0.1.5-config.patch DELETED ---


--- skychart-3.0.1.5-paths.patch DELETED ---


--- skychart-3.0.1.5-wl.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Apr  8 19:28:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 19:28:57 +0000
Subject: [pkgdb] pulseaudio had acl change status
Message-ID: <20090408192806.07E5410F87E@bastion2.fedora.phx.redhat.com>

lennart has set the approveacls acl on pulseaudio (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pulseaudio



From lkundrak at fedoraproject.org  Wed Apr  8 19:33:34 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  8 Apr 2009 19:33:34 +0000 (UTC)
Subject: rpms/skychart/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090408193334.4651F7011A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28666

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Nov 2008 01:12:27 -0000	1.2
+++ .cvsignore	8 Apr 2009 19:33:04 -0000	1.3
@@ -1 +1 @@
-skychart-3.0.1.5.tar.gz
+skychart-3.0.1.6.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Nov 2008 01:12:27 -0000	1.2
+++ sources	8 Apr 2009 19:33:04 -0000	1.3
@@ -1 +1 @@
-d3158df6ad5f07f9f35ba8e43912767c  skychart-3.0.1.5.tar.gz
+7021c215cfa6b61ab909ef2e6266abc7  skychart-3.0.1.6.tar.lzma



From slankes at fedoraproject.org  Wed Apr  8 19:42:29 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  8 Apr 2009 19:42:29 +0000 (UTC)
Subject: rpms/qca2/devel qca2.spec,1.10,1.11
Message-ID: <20090408194229.4E6C07011A@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/qca2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30839

Modified Files:
	qca2.spec 
Log Message:
remove openssl BR - it's part of the yum build-group now


Index: qca2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca2/devel/qca2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qca2.spec	8 Apr 2009 18:52:42 -0000	1.10
+++ qca2.spec	8 Apr 2009 19:41:58 -0000	1.11
@@ -11,8 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
-# For certstore
-BuildRequires:  openssl
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,



From cebbert at fedoraproject.org  Wed Apr  8 19:50:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  8 Apr 2009 19:50:53 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-usb-cdc-wdm-fix-oops.patch, NONE,
	1.1.2.1 kernel.spec, 1.891.2.43, 1.891.2.44
Message-ID: <20090408195053.BBC4A7011A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv928

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-usb-cdc-wdm-fix-oops.patch 
Log Message:
Fix oops in cdc-wdm modem driver. (#481741)

linux-2.6-usb-cdc-wdm-fix-oops.patch:

--- NEW FILE linux-2.6-usb-cdc-wdm-fix-oops.patch ---
>From oliver at neukum.org  Tue Apr  7 11:12:23 2009
From: Oliver Neukum <oliver at neukum.org>
Date: Sat, 4 Apr 2009 09:25:15 +0200
Subject: USB: fix oops in cdc-wdm in case of malformed descriptors
To: greg at kroah.com, Chuck Ebbert <cebbert at redhat.com>
Message-ID: <200904040925.23539.oliver at neukum.org>
Content-Disposition: inline


cdc-wdm needs to ignore extremely malformed descriptors.

Signed-off-by: Oliver Neukum <oliver at neukum.org>
Cc: stable <stable at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>


---
 drivers/usb/class/cdc-wdm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -652,7 +652,7 @@ next_desc:
 
 	iface = &intf->altsetting[0];
 	ep = &iface->endpoint[0].desc;
-	if (!usb_endpoint_is_int_in(ep)) {
+	if (!ep || !usb_endpoint_is_int_in(ep)) {
 		rv = -EINVAL;
 		goto err;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.43
retrieving revision 1.891.2.44
diff -u -r1.891.2.43 -r1.891.2.44
--- kernel.spec	7 Apr 2009 19:08:47 -0000	1.891.2.43
+++ kernel.spec	8 Apr 2009 19:50:22 -0000	1.891.2.44
@@ -733,6 +733,7 @@
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 Patch2301: linux-2.6-usb-option-increase-outgoing-buffers.patch
+Patch2302: linux-2.6-usb-cdc-wdm-fix-oops.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -1167,6 +1168,8 @@
 # actually honor the nousb parameter
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-option-increase-outgoing-buffers.patch
+# bz 481741
+ApplyPatch linux-2.6-usb-cdc-wdm-fix-oops.patch
 
 # ACPI
 # fix cpu detection (f10#435653)
@@ -1950,6 +1953,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Apr 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.44
+- Fix oops in cdc-wdm modem driver. (#481741)
+
 * Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.43
 - iwlwifi: remove implicit direct scan
 



From jwilson at fedoraproject.org  Wed Apr  8 20:11:37 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed,  8 Apr 2009 20:11:37 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.177,1.178
Message-ID: <20090408201137.6E8D67011A@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5328

Modified Files:
	comps-f11.xml.in 
Log Message:
blind stab in the dark at trying to make ibus crap NOT install when I uncheck the input methods group


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- comps-f11.xml.in	8 Apr 2009 16:23:09 -0000	1.177
+++ comps-f11.xml.in	8 Apr 2009 20:11:07 -0000	1.178
@@ -2760,6 +2760,7 @@
       <packagereq type="conditional" requires="gtk2">ibus-gtk</packagereq>
       <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
       <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
+      <packagereq type="default">ibus</packagereq>
       <packagereq type="default">ibus-anthy</packagereq>
       <packagereq type="default">ibus-chewing</packagereq>
       <packagereq type="default">ibus-hangul</packagereq>



From oget at fedoraproject.org  Wed Apr  8 20:24:24 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 20:24:24 +0000 (UTC)
Subject: rpms/slv2/devel slv2.spec,1.1,1.2
Message-ID: <20090408202424.741917011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/slv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9018

Modified Files:
	slv2.spec 
Log Message:
* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.6.2-3
- Change CCFLAGS to CFLAGS



Index: slv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slv2/devel/slv2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slv2.spec	30 Mar 2009 22:09:09 -0000	1.1
+++ slv2.spec	8 Apr 2009 20:23:54 -0000	1.2
@@ -1,7 +1,7 @@
 Name:			slv2
-Summary: 		LV2 host library
+Summary:		LV2 host library
 Version:		0.6.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		GPLv2+
 Group:			System Environment/Libraries
 Source0:		http://download.drobilla.net/%{name}-%{version}.tar.bz2
@@ -57,7 +57,7 @@
 sed -i 's|@REDLAND.*@||' slv2.pc.in
 
 %build
-export CCFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 ./waf configure --prefix=%{_prefix} \
 	--libdir=%{_libdir} \
@@ -92,6 +92,9 @@
 %{_mandir}/man3/%{name}*
 
 %changelog
+* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.6.2-3
+- Change CCFLAGS to CFLAGS
+
 * Sat Mar 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.6.2-2
 - Remove redland flags from the .pc file
 - Change CPPFLAGS to CXXFLAGS



From oget at fedoraproject.org  Wed Apr  8 20:46:47 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  8 Apr 2009 20:46:47 +0000 (UTC)
Subject: rpms/slv2/F-10 slv2.spec,1.1,1.2
Message-ID: <20090408204647.1B20A7011A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/slv2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14059

Modified Files:
	slv2.spec 
Log Message:
* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.6.2-3
- Change CCFLAGS to CFLAGS



Index: slv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slv2/F-10/slv2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slv2.spec	30 Mar 2009 22:23:35 -0000	1.1
+++ slv2.spec	8 Apr 2009 20:46:16 -0000	1.2
@@ -1,7 +1,7 @@
 Name:			slv2
-Summary: 		LV2 host library
+Summary:		LV2 host library
 Version:		0.6.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		GPLv2+
 Group:			System Environment/Libraries
 Source0:		http://download.drobilla.net/%{name}-%{version}.tar.bz2
@@ -57,7 +57,7 @@
 sed -i 's|@REDLAND.*@||' slv2.pc.in
 
 %build
-export CCFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 ./waf configure --prefix=%{_prefix} \
 	--libdir=%{_libdir} \
@@ -92,6 +92,9 @@
 %{_mandir}/man3/%{name}*
 
 %changelog
+* Wed Apr 08 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.6.2-3
+- Change CCFLAGS to CFLAGS
+
 * Sat Mar 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.6.2-2
 - Remove redland flags from the .pc file
 - Change CPPFLAGS to CXXFLAGS



From jkeating at fedoraproject.org  Wed Apr  8 20:50:24 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  8 Apr 2009 20:50:24 +0000 (UTC)
Subject: rpms/solar-kde-theme/devel solar-kde-theme.spec,1.22,1.23
Message-ID: <20090408205024.D8FE770137@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14882

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Wed Apr 08 2009 Jesse Keating <jkeating at redhat.com> - 0.1.17-4
- Drop the version requirement on system-logos, causes problems
  with other logo packages.



Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- solar-kde-theme.spec	9 Mar 2009 18:28:17 -0000	1.22
+++ solar-kde-theme.spec	8 Apr 2009 20:49:54 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.17
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -12,7 +12,7 @@
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
-Requires:	system-logos >= 10.0.0-2
+Requires:	system-logos
 Requires:	solar-backgrounds-common >= 0.91.0
 
 
@@ -141,6 +141,10 @@
 
 
 %changelog
+* Wed Apr 08 2009 Jesse Keating <jkeating at redhat.com> - 0.1.17-4
+- Drop the version requirement on system-logos, causes problems
+  with other logo packages.
+
 * Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.17-3
 - own %%_kde4_datadir/wallpapers/Solar
 



From davej at fedoraproject.org  Wed Apr  8 20:51:54 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  8 Apr 2009 20:51:54 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1507,1.1508
Message-ID: <20090408205154.601577011A@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16025

Modified Files:
	kernel.spec 
Log Message:
remove pointless obsolete. this has never been in Fedora


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -u -r1.1507 -r1.1508
--- kernel.spec	8 Apr 2009 15:39:51 -0000	1.1507
+++ kernel.spec	8 Apr 2009 20:51:24 -0000	1.1508
@@ -409,9 +409,6 @@
 #
 %define kernel_xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
 
-# upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise
-# now that the smp kernel offers this capability, obsolete the old kernel
-%define kernel_smp_obsoletes kernel-enterprise < 2.4.10
 %define kernel_PAE_obsoletes kernel-smp < 2.6.17, kernel-xen <= 2.6.27-0.2.rc0.git6.fc10
 %define kernel_PAE_provides kernel-xen = %{rpmversion}-%{pkg_release}
 



From spot at fedoraproject.org  Wed Apr  8 20:53:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  8 Apr 2009 20:53:14 +0000 (UTC)
Subject: rpms/winpdb/devel .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 winpdb.spec, 1.16, 1.17
Message-ID: <20090408205314.2DC167011A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/winpdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16283/devel

Modified Files:
	.cvsignore sources winpdb.spec 
Log Message:
1.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Feb 2009 18:48:46 -0000	1.10
+++ .cvsignore	8 Apr 2009 20:52:43 -0000	1.11
@@ -1 +1 @@
-winpdb-1.4.4.tar.gz
+winpdb-1.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Feb 2009 18:48:46 -0000	1.11
+++ sources	8 Apr 2009 20:52:43 -0000	1.12
@@ -1 +1 @@
-b5faa5c7d64a4da84e4036899d805408  winpdb-1.4.4.tar.gz
+3658a9aa7ce31ab62590bc0a75635991  winpdb-1.4.6.tar.gz


Index: winpdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/winpdb.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- winpdb.spec	4 Mar 2009 22:45:29 -0000	1.16
+++ winpdb.spec	8 Apr 2009 20:52:43 -0000	1.17
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		winpdb
-Version:	1.4.4
-Release:	4%{?dist}
+Version:	1.4.6
+Release:	1%{?dist}
 Summary:	An advanced python debugger
 Group:		Development/Debuggers
 License:	GPLv2+
@@ -54,6 +54,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.6-1
+- update to 1.4.6
+
 * Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.4-4
 - fix typo
 



From spot at fedoraproject.org  Wed Apr  8 20:53:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  8 Apr 2009 20:53:13 +0000 (UTC)
Subject: rpms/winpdb/F-10 sources,1.11,1.12 winpdb.spec,1.12,1.13
Message-ID: <20090408205313.CD60C7011A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/winpdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16283/F-10

Modified Files:
	sources winpdb.spec 
Log Message:
1.4.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Feb 2009 18:48:45 -0000	1.11
+++ sources	8 Apr 2009 20:52:43 -0000	1.12
@@ -1 +1 @@
-b5faa5c7d64a4da84e4036899d805408  winpdb-1.4.4.tar.gz
+3658a9aa7ce31ab62590bc0a75635991  winpdb-1.4.6.tar.gz


Index: winpdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/F-10/winpdb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- winpdb.spec	11 Feb 2009 18:48:46 -0000	1.12
+++ winpdb.spec	8 Apr 2009 20:52:43 -0000	1.13
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		winpdb
-Version:	1.4.4
+Version:	1.4.6
 Release:	1%{?dist}
 Summary:	An advanced python debugger
 Group:		Development/Debuggers
@@ -9,6 +9,7 @@
 URL:		http://www.winpdb.org/
 Source0:	http://winpdb.googlecode.com/files/winpdb-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires: 	python-devel, wxPython-devel >= 2.6, desktop-file-utils
@@ -30,6 +31,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT 
 %{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 
 desktop-file-install --vendor fedora			\
@@ -47,8 +51,21 @@
 %{_bindir}/*
 %{python_sitelib}/*
 %{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.6-1
+- update to 1.4.6
+
+* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.4-4
+- fix typo
+
+* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.4-3
+- add icon, fix desktop file (bz 487870)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.4-1
 - update to 1.4.4
 



From bos at fedoraproject.org  Wed Apr  8 20:57:03 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Wed,  8 Apr 2009 20:57:03 +0000 (UTC)
Subject: rpms/ghc/devel .cvsignore,1.15,1.16 sources,1.17,1.18
Message-ID: <20090408205703.B00E87011A@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17453

Modified Files:
	.cvsignore sources 
Log Message:
Sources for GHC 6.10.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	5 Nov 2008 04:32:03 -0000	1.15
+++ .cvsignore	8 Apr 2009 20:56:33 -0000	1.16
@@ -1,2 +1,2 @@
-ghc-6.10.1-src.tar.bz2
-ghc-6.10.1-src-extralibs.tar.bz2
+ghc-6.10.2-src.tar.bz2
+ghc-6.10.2-src-extralibs.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Nov 2008 04:32:03 -0000	1.17
+++ sources	8 Apr 2009 20:56:33 -0000	1.18
@@ -1,2 +1,2 @@
-54c676a632b3d73cf526b06347522c32  ghc-6.10.1-src.tar.bz2
-4ff4590f1002ae1ff608874da8643c67  ghc-6.10.1-src-extralibs.tar.bz2
+243d5857e5aa5f2f86e5e4c4437973fb  ghc-6.10.2-src.tar.bz2
+9415604386ca69ebe15f1054653aefaf  ghc-6.10.2-src-extralibs.tar.bz2



From jjohnstn at fedoraproject.org  Wed Apr  8 21:05:10 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed,  8 Apr 2009 21:05:10 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 eclipse-cdt.spec, 1.117, 1.118 fetch-cdt.sh,
	1.4, 1.5
Message-ID: <20090408210510.7B15E7011A@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19290

Modified Files:
	eclipse-cdt.spec fetch-cdt.sh 
Log Message:

* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-1
- Rebase autotools to 1.0.3.
- Rebase CDT to v200903191301 (5.0.2).




Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- eclipse-cdt.spec	16 Jan 2009 21:27:37 -0000	1.117
+++ eclipse-cdt.spec	8 Apr 2009 21:04:39 -0000	1.118
@@ -6,9 +6,9 @@
 %define major                   5
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   1
+%define micro                   2
 %define eclipse_base            %{_libdir}/eclipse
-%define build_id		200809190802
+%define build_id		200903191301
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -31,10 +31,10 @@
 # script.  Note that the optional c99 and upc parsers plus the optional
 # xlc support features have been removed.
 
-Source0: %{name}-fetched-src-CDT_5_0_1.tar.bz2
+Source0: %{name}-fetched-src-CDT_5_0_2.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
 
 Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 
@@ -56,9 +56,6 @@
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
-# Don't run the tests as part of the build.  We'll do this ourselves.
-Patch4: %{name}-no-tests-%{version}.patch
-
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -158,8 +155,6 @@
 %prep
 %setup -q -c 
 
-%patch4
-
 pushd "org.eclipse.cdt.releng"
 
 # Remove lpg-using lrparser feature
@@ -299,7 +294,8 @@
     -DbaseLocation=$SDK \
     -Dpde.build.scripts=$PDEDIR/scripts \
     -DdontFetchAnything=true \
-    -DskipFetch=true
+    -DskipFetch=true \
+     zips
 popd
 
 ## Autotools has dependencies on CDT so we must add these to the SDK directory
@@ -570,6 +566,10 @@
 %endif
 
 %changelog
+* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-1
+- Rebase autotools to 1.0.3.
+- Rebase CDT to v200903191301 (5.0.2).
+
 * Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
 - Rebase libhover to 0.1.1 and autotools to 1.0.2.
 - Remove patch for 472731 which is already part of rebased autotools sources.


Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/fetch-cdt.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fetch-cdt.sh	28 Nov 2008 21:30:05 -0000	1.4
+++ fetch-cdt.sh	8 Apr 2009 21:04:39 -0000	1.5
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CDTTAG=CDT_5_0_1
+CDTTAG=CDT_5_0_2
 ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
 
 mkdir -p temp && cd temp



From pkgdb at fedoraproject.org  Wed Apr  8 21:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 21:05:12 +0000
Subject: [pkgdb] twinkle (Fedora EPEL, 5) updated by kevin
Message-ID: <20090408210513.64CC710F870@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for twinkle
kevin has set commit to Approved for provenpackager on twinkle (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on twinkle (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on twinkle (Fedora EPEL 5)
kevin changed owner of twinkle in Fedora EPEL 5 to wolfy
kevin approved watchbugzilla on twinkle (Fedora EPEL 5) for kevin
kevin approved watchcommits on twinkle (Fedora EPEL 5) for kevin
kevin approved commit on twinkle (Fedora EPEL 5) for kevin
kevin approved build on twinkle (Fedora EPEL 5) for kevin
kevin approved approveacls on twinkle (Fedora EPEL 5) for kevin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/twinkle



From ajax at fedoraproject.org  Wed Apr  8 21:08:24 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  8 Apr 2009 21:08:24 +0000 (UTC)
Subject: rpms/cairo/devel cairo-1.8.6-repeat-modes.patch, NONE,
	1.1 cairo.spec, 1.99, 1.100
Message-ID: <20090408210824.CF9257011A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20200

Modified Files:
	cairo.spec 
Added Files:
	cairo-1.8.6-repeat-modes.patch 
Log Message:
* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com> 1.8.6-3
- cairo-1.8.6-repeat-modes.patch: Enable the repeat and pad blend modes in
  the xlib backend to make firefox performance slightly less dire.


cairo-1.8.6-repeat-modes.patch:

--- NEW FILE cairo-1.8.6-repeat-modes.patch ---
diff -up cairo-1.8.6/src/cairo-xlib-surface.c.jx cairo-1.8.6/src/cairo-xlib-surface.c
--- cairo-1.8.6/src/cairo-xlib-surface.c.jx	2008-12-12 07:48:05.000000000 -0500
+++ cairo-1.8.6/src/cairo-xlib-surface.c	2009-04-08 15:06:25.000000000 -0400
@@ -1425,7 +1425,11 @@ _cairo_xlib_surface_set_attributes (cair
 	_cairo_xlib_surface_set_repeat (surface, RepeatNormal);
 	break;
     case CAIRO_EXTEND_REFLECT:
+	_cairo_xlib_surface_set_repeat (surface, RepeatReflect);
+	break;
     case CAIRO_EXTEND_PAD:
+	_cairo_xlib_surface_set_repeat (surface, RepeatPad);
+	break;
     default:
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     }


Index: cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- cairo.spec	24 Feb 2009 06:25:39 -0000	1.99
+++ cairo.spec	8 Apr 2009 21:07:54 -0000	1.100
@@ -5,7 +5,7 @@
 Summary:	A 2D graphics library
 Name:		cairo
 Version:	1.8.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:	LGPLv2 or MPLv1.1
@@ -21,6 +21,8 @@
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
+Patch0: cairo-1.8.6-repeat-modes.patch
+
 %description 
 Cairo is a 2D graphics library designed to provide high-quality display 
 and print output. Currently supported output targets include the X Window 
@@ -51,6 +53,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .repeat-modes
 
 %build
 %configure --disable-static 	\
@@ -88,6 +91,10 @@
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
+* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com> 1.8.6-3
+- cairo-1.8.6-repeat-modes.patch: Enable the repeat and pad blend modes in
+  the xlib backend to make firefox performance slightly less dire.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jjohnstn at fedoraproject.org  Wed Apr  8 21:12:46 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed,  8 Apr 2009 21:12:46 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 .cvsignore, 1.42, 1.43 eclipse-cdt.spec, 1.118,
	1.119 sources, 1.51, 1.52
Message-ID: <20090408211246.D41147011A@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21093

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
- Rebase autotools to 1.0.3.
- Rebase CDT to v200903191301 (5.0.2).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	16 Jan 2009 21:27:37 -0000	1.42
+++ .cvsignore	8 Apr 2009 21:12:16 -0000	1.43
@@ -22,3 +22,5 @@
 eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
 eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
 eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
+eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- eclipse-cdt.spec	8 Apr 2009 21:04:39 -0000	1.118
+++ eclipse-cdt.spec	8 Apr 2009 21:12:16 -0000	1.119
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -566,7 +566,7 @@
 %endif
 
 %changelog
-* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-1
+* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
 - Rebase autotools to 1.0.3.
 - Rebase CDT to v200903191301 (5.0.2).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Jan 2009 21:27:37 -0000	1.51
+++ sources	8 Apr 2009 21:12:16 -0000	1.52
@@ -1,5 +1,5 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-f0db116442be6f461611739308535175  eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
-80967f045be67d65396ce424ef093719  eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
 23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+1768318e26e5a40e55bb55cc38fedfaa  eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
+25251010257cc1255f9bcec90a9514b7  eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz



From jjohnstn at fedoraproject.org  Wed Apr  8 21:14:31 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed,  8 Apr 2009 21:14:31 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 eclipse-cdt.spec,1.119,1.120
Message-ID: <20090408211431.6AEB97011A@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21453

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Wed Apr 08 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
- Bump release.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- eclipse-cdt.spec	8 Apr 2009 21:12:16 -0000	1.119
+++ eclipse-cdt.spec	8 Apr 2009 21:14:00 -0000	1.120
@@ -566,7 +566,10 @@
 %endif
 
 %changelog
-* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
+* Wed Apr 08 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
+- Bump release.
+
+* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-1
 - Rebase autotools to 1.0.3.
 - Rebase CDT to v200903191301 (5.0.2).
 



From ajax at fedoraproject.org  Wed Apr  8 21:22:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  8 Apr 2009 21:22:25 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-10 xserver-1.5.3-dga-crash-fix.patch, NONE, 
	1.1 xorg-x11-server.spec, 1.394, 1.395
Message-ID: <20090408212225.6F21270137@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23261

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.3-dga-crash-fix.patch 
Log Message:
* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com> 1.5.3-16
- xserver-1.5.3-dga-crash-fix.patch: Track client state even for DGA1
  clients, and recover correctly.


xserver-1.5.3-dga-crash-fix.patch:

--- NEW FILE xserver-1.5.3-dga-crash-fix.patch ---
>From 53d87cf2fd1bed4862e9150cf326c94e9108e9ad Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 8 Apr 2009 17:20:20 -0400
Subject: [PATCH] DGA teardown fix

---
 hw/xfree86/dixmods/extmod/Makefile.am |    2 +-
 hw/xfree86/dixmods/extmod/xf86dga.c   |  309 ----------------------------
 hw/xfree86/dixmods/extmod/xf86dga2.c  |  366 ++++++++++++++++++++++++++++++---
 3 files changed, 336 insertions(+), 341 deletions(-)
 delete mode 100644 hw/xfree86/dixmods/extmod/xf86dga.c

diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index f90e144..213b67d 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -4,7 +4,7 @@ extsmoduledir = $(moduledir)/extensions
 extsmodule_LTLIBRARIES = libextmod.la
 
 if DGA
-DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
+DGA_SRCS = xf86dga2.c dgaproc.h xf86dgaext.h
 endif
 
 if XV
diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c
deleted file mode 100644
index c66bca2..0000000
--- a/hw/xfree86/dixmods/extmod/xf86dga.c
+++ /dev/null
@@ -1,309 +0,0 @@
-
-/*
-
-Copyright (c) 1995  Jon Tombs
-Copyright (c) 1995, 1996, 1999  XFree86 Inc
-
-*/
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "misc.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "colormapst.h"
-#include "cursorstr.h"
-#include "scrnintstr.h"
-#include "servermd.h"
-#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dga.h>
-#include <X11/extensions/xf86dgastr.h>
-#include "swaprep.h"
-#include "dgaproc.h"
-
-#include "xf86dgaext.h"
-
-
-static DISPATCH_PROC(ProcXF86DGADirectVideo);
-static DISPATCH_PROC(ProcXF86DGAGetVidPage);
-static DISPATCH_PROC(ProcXF86DGAGetVideoLL);
-static DISPATCH_PROC(ProcXF86DGAGetViewPortSize);
-static DISPATCH_PROC(ProcXF86DGASetVidPage);
-static DISPATCH_PROC(ProcXF86DGASetViewPort);
-static DISPATCH_PROC(ProcXF86DGAInstallColormap);
-static DISPATCH_PROC(ProcXF86DGAQueryDirectVideo);
-static DISPATCH_PROC(ProcXF86DGAViewPortChanged);
-
-
-static int
-ProcXF86DGAGetVideoLL(ClientPtr client)
-{
-    REQUEST(xXF86DGAGetVideoLLReq);
-    xXF86DGAGetVideoLLReply rep;
-    XDGAModeRec mode;
-    int num, offset, flags;
-    char *name;
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-
-    if(!DGAAvailable(stuff->screen))
-	return (DGAErrorBase + XF86DGANoDirectVideoMode);
-
-    if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	return (DGAErrorBase + XF86DGANoDirectVideoMode);
-
-    /* get the parameters for the mode that best matches */
-    DGAGetModeInfo(stuff->screen, &mode, num);
-
-    if(!DGAOpenFramebuffer(stuff->screen, &name, 
-			(unsigned char**)(&rep.offset), 	
-			(int*)(&rep.bank_size), &offset, &flags))
-	return BadAlloc;
-
-    rep.offset += mode.offset;
-    rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3);
-    rep.ram_size = rep.bank_size >> 10;
-
-    WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep);
-    return (client->noClientException);
-}
-
-static int
-ProcXF86DGADirectVideo(ClientPtr client)
-{
-    int num;
-    PixmapPtr pix;
-    XDGAModeRec mode;
-    REQUEST(xXF86DGADirectVideoReq);
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);
-
-    if (!DGAAvailable(stuff->screen))
-	return DGAErrorBase + XF86DGANoDirectVideoMode;
-
-    if (stuff->enable & XF86DGADirectGraphics) {
-	if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	    return (DGAErrorBase + XF86DGANoDirectVideoMode);
-    } else
-	num = 0;
-
-    if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
-	return (DGAErrorBase + XF86DGAScreenNotActive);
-
-    DGASetInputMode (stuff->screen, 
-		     (stuff->enable & XF86DGADirectKeyb) != 0,
-		     (stuff->enable & XF86DGADirectMouse) != 0);
-
-    return (client->noClientException);
-}
-
-static int
-ProcXF86DGAGetViewPortSize(ClientPtr client)
-{
-    int num;
-    XDGAModeRec mode;
-    REQUEST(xXF86DGAGetViewPortSizeReq);
-    xXF86DGAGetViewPortSizeReply rep;
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-
-    if (!DGAAvailable(stuff->screen))
-	return (DGAErrorBase + XF86DGANoDirectVideoMode);
-
-    if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	return (DGAErrorBase + XF86DGANoDirectVideoMode);
-
-    DGAGetModeInfo(stuff->screen, &mode, num);
-
-    rep.width = mode.viewportWidth;
-    rep.height = mode.viewportHeight;
-
-    WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep);
-    return (client->noClientException);
-}
-
-static int
-ProcXF86DGASetViewPort(ClientPtr client)
-{
-    REQUEST(xXF86DGASetViewPortReq);
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);
-
-    if (!DGAAvailable(stuff->screen))
-	return (DGAErrorBase + XF86DGANoDirectVideoMode);
-
-    if (!DGAActive(stuff->screen))
-    {
-	int num;
-	PixmapPtr pix;
-	XDGAModeRec mode;
-	
-	if(!(num = DGAGetOldDGAMode(stuff->screen)))
-	    return (DGAErrorBase + XF86DGANoDirectVideoMode);
-	if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
-	    return (DGAErrorBase + XF86DGAScreenNotActive);
-    }
-
-    if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE)
-		!= Success)
-	return DGAErrorBase + XF86DGADirectNotActivated;
-
-    return (client->noClientException);
-}
-
-static int
-ProcXF86DGAGetVidPage(ClientPtr client)
-{
-    REQUEST(xXF86DGAGetVidPageReq);
-    xXF86DGAGetVidPageReply rep;
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.vpage = 0;  /* silently fail */
-
-    WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep);
-    return (client->noClientException);
-}
-
-
-static int
-ProcXF86DGASetVidPage(ClientPtr client)
-{
-    REQUEST(xXF86DGASetVidPageReq);
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);
-
-    /* silently fail */
-
-    return (client->noClientException);
-}
-
-
-static int
-ProcXF86DGAInstallColormap(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    REQUEST(xXF86DGAInstallColormapReq);
-
-    REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq);
-
-    if (!DGAActive(stuff->screen))
-	return (DGAErrorBase + XF86DGADirectNotActivated);
-
-    pcmp = (ColormapPtr  )LookupIDByType(stuff->id, RT_COLORMAP);
-    if (pcmp) {
-	DGAInstallCmap(pcmp);
-        return (client->noClientException);
-    } else {
-        client->errorValue = stuff->id;
-        return (BadColor);
-    }
-}
-
-static int
-ProcXF86DGAQueryDirectVideo(ClientPtr client)
-{
-    REQUEST(xXF86DGAQueryDirectVideoReq);
-    xXF86DGAQueryDirectVideoReply rep;
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.flags = 0;
-
-    if (DGAAvailable(stuff->screen))
-	rep.flags = XF86DGADirectPresent;
-
-    WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep);
-    return (client->noClientException);
-}
-
-static int
-ProcXF86DGAViewPortChanged(ClientPtr client)
-{
-    REQUEST(xXF86DGAViewPortChangedReq);
-    xXF86DGAViewPortChangedReply rep;
-
-    if (stuff->screen > screenInfo.numScreens)
-	return BadValue;
-
-    REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq);
-
-    if (!DGAActive(stuff->screen))
-	return (DGAErrorBase + XF86DGADirectNotActivated);
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.result = 1;
-
-    WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep);
-    return (client->noClientException);
-}
-
-int
-ProcXF86DGADispatch(register ClientPtr client)
-{
-    REQUEST(xReq);
-
-    switch (stuff->data)
-    {
-    case X_XF86DGAGetVideoLL:
-	return ProcXF86DGAGetVideoLL(client);
-    case X_XF86DGADirectVideo:
-	return ProcXF86DGADirectVideo(client);
-    case X_XF86DGAGetViewPortSize:
-	return ProcXF86DGAGetViewPortSize(client);
-    case X_XF86DGASetViewPort:
-	return ProcXF86DGASetViewPort(client);
-    case X_XF86DGAGetVidPage:
-	return ProcXF86DGAGetVidPage(client);
-    case X_XF86DGASetVidPage:
-	return ProcXF86DGASetVidPage(client);
-    case X_XF86DGAInstallColormap:
-	return ProcXF86DGAInstallColormap(client);
-    case X_XF86DGAQueryDirectVideo:
-	return ProcXF86DGAQueryDirectVideo(client);
-    case X_XF86DGAViewPortChanged:
-	return ProcXF86DGAViewPortChanged(client);
-    default:
-	return BadRequest;
-    }
-}
-
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 295e05e..99e77ca 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -1,8 +1,10 @@
 /*
-   Copyright (c) 1999 - The XFree86 Project Inc.
-
-   Written by Mark Vojkovich
-*/
+ * Copyright (c) 1995  Jon Tombs
+ * Copyright (c) 1995, 1996, 1999  XFree86 Inc
+ * Copyright (c) 1999 - The XFree86 Project Inc.
+ *
+ * Written by Mark Vojkovich
+ */
 
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -33,6 +35,8 @@
 
 #include "modinit.h"
 
+#define DGA_PROTOCOL_OLD_SUPPORT 1
+
 static DISPATCH_PROC(ProcXDGADispatch);
 static DISPATCH_PROC(SProcXDGADispatch);
 static DISPATCH_PROC(ProcXDGAQueryVersion);
@@ -140,7 +144,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
     if (stuff->screen > screenInfo.numScreens)
         return BadValue;
 
-    if (!DGAAvailable(stuff->screen)) 
+    if (!DGAAvailable(stuff->screen))
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     REQUEST_SIZE_MATCH(xXDGAOpenFramebufferReq);
@@ -148,9 +152,9 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    if(!DGAOpenFramebuffer(stuff->screen, &deviceName, 
+    if(!DGAOpenFramebuffer(stuff->screen, &deviceName,
 			(unsigned char**)(&rep.mem1),
-			(int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra)) 
+			(int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra))
     {
 	return BadAlloc;
     }
@@ -174,7 +178,7 @@ ProcXDGACloseFramebuffer(ClientPtr client)
     if (stuff->screen > screenInfo.numScreens)
         return BadValue;
 
-    if (!DGAAvailable(stuff->screen)) 
+    if (!DGAAvailable(stuff->screen))
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
     REQUEST_SIZE_MATCH(xXDGACloseFramebufferReq);
@@ -258,7 +262,7 @@ ProcXDGAQueryModes(ClientPtr client)
 	info.viewport_flags = mode[i].viewportFlags;
 	info.reserved1 = mode[i].reserved1;
 	info.reserved2 = mode[i].reserved2;
-	
+
 	WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));
 	WriteToClient(client, size, mode[i].name);
     }
@@ -269,7 +273,7 @@ ProcXDGAQueryModes(ClientPtr client)
 }
 
 
-static void 
+static void
 DGAClientStateChange (
     CallbackListPtr* pcbl,
     pointer nulldata,
@@ -286,7 +290,7 @@ DGAClientStateChange (
 	}
     }
 
-    if(client && 
+    if(client &&
       ((client->clientState == ClientStateGone) ||
        (client->clientState == ClientStateRetained))) {
 	XDGAModeRec mode;
@@ -321,10 +325,10 @@ ProcXDGASetMode(ClientPtr client)
     rep.flags = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!DGAAvailable(stuff->screen)) 
+    if (!DGAAvailable(stuff->screen))
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
-    if(DGAClients[stuff->screen] && 
+    if(DGAClients[stuff->screen] &&
       (DGAClients[stuff->screen] != client))
         return DGAErrorBase + XF86DGANoDirectVideoMode;
 
@@ -338,7 +342,7 @@ ProcXDGASetMode(ClientPtr client)
 	DGASetMode(stuff->screen, 0, &mode, &pPix);
 	WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);
 	return (client->noClientException);
-    } 
+    }
 
     if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))
 	return BadValue;
@@ -358,7 +362,7 @@ ProcXDGASetMode(ClientPtr client)
     }
 
     size = strlen(mode.name) + 1;
-   
+
     info.byte_order = mode.byteOrder;
     info.depth = mode.depth;
     info.num = mode.num;
@@ -426,7 +430,7 @@ ProcXDGAInstallColormap(ClientPtr client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGAInstallColormapReq);
-   
+
     cmap = (ColormapPtr)LookupIDByType(stuff->cmap, RT_COLORMAP);
     if (cmap) {
         DGAInstallCmap(cmap);
@@ -452,7 +456,7 @@ ProcXDGASelectInput(ClientPtr client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGASelectInputReq);
-   
+
     if(DGAClients[stuff->screen] == client)
 	DGASelectInput(stuff->screen, client, stuff->mask);
 
@@ -472,7 +476,7 @@ ProcXDGAFillRectangle(ClientPtr client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGAFillRectangleReq);
-   
+
     if(Success != DGAFillRect(stuff->screen, stuff->x, stuff->y,
 			stuff->width, stuff->height, stuff->color))
 	return BadMatch;
@@ -492,7 +496,7 @@ ProcXDGACopyArea(ClientPtr client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGACopyAreaReq);
-   
+
     if(Success != DGABlitRect(stuff->screen, stuff->srcx, stuff->srcy,
 		stuff->width, stuff->height, stuff->dstx, stuff->dsty))
 	return BadMatch;
@@ -513,7 +517,7 @@ ProcXDGACopyTransparentArea(ClientPtr client)
         return DGAErrorBase + XF86DGADirectNotActivated;
 
     REQUEST_SIZE_MATCH(xXDGACopyTransparentAreaReq);
-   
+
     if(Success != DGABlitTransRect(stuff->screen, stuff->srcx, stuff->srcy,
 	stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key))
 	return BadMatch;
@@ -606,7 +610,7 @@ ProcXDGAChangePixmapMode(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-	
+
     x = stuff->x;
     y = stuff->y;
 
@@ -637,8 +641,8 @@ ProcXDGACreateColormap(ClientPtr client)
 
     if(!stuff->mode)
 	return BadValue;
-   
-    result = DGACreateColormap(stuff->screen, client, stuff->id, 
+
+    result = DGACreateColormap(stuff->screen, client, stuff->id,
 				stuff->mode, stuff->alloc);
     if(result != Success)
 	return result;
@@ -646,6 +650,287 @@ ProcXDGACreateColormap(ClientPtr client)
     return (client->noClientException);
 }
 
+/*
+ *
+ * Support for the old DGA protocol, used to live in xf86dga.c
+ *
+ */
+
+#ifdef DGA_PROTOCOL_OLD_SUPPORT
+
+static DISPATCH_PROC(ProcXF86DGADirectVideo);
+static DISPATCH_PROC(ProcXF86DGAGetVidPage);
+static DISPATCH_PROC(ProcXF86DGAGetVideoLL);
+static DISPATCH_PROC(ProcXF86DGAGetViewPortSize);
+static DISPATCH_PROC(ProcXF86DGASetVidPage);
+static DISPATCH_PROC(ProcXF86DGASetViewPort);
+static DISPATCH_PROC(ProcXF86DGAInstallColormap);
+static DISPATCH_PROC(ProcXF86DGAQueryDirectVideo);
+static DISPATCH_PROC(ProcXF86DGAViewPortChanged);
+
+
+static int
+ProcXF86DGAGetVideoLL(ClientPtr client)
+{
+    REQUEST(xXF86DGAGetVideoLLReq);
+    xXF86DGAGetVideoLLReply rep;
+    XDGAModeRec mode;
+    int num, offset, flags;
+    char *name;
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if(!DGAAvailable(stuff->screen))
+	return (DGAErrorBase + XF86DGANoDirectVideoMode);
+
+    if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	return (DGAErrorBase + XF86DGANoDirectVideoMode);
+
+    /* get the parameters for the mode that best matches */
+    DGAGetModeInfo(stuff->screen, &mode, num);
+
+    if(!DGAOpenFramebuffer(stuff->screen, &name,
+			(unsigned char**)(&rep.offset),
+			(int*)(&rep.bank_size), &offset, &flags))
+	return BadAlloc;
+
+    rep.offset += mode.offset;
+    rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3);
+    rep.ram_size = rep.bank_size >> 10;
+
+    WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep);
+    return (client->noClientException);
+}
+
+static int
+ProcXF86DGADirectVideo(ClientPtr client)
+{
+    int num;
+    PixmapPtr pix;
+    XDGAModeRec mode;
+    REQUEST(xXF86DGADirectVideoReq);
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);
+
+    if (!DGAAvailable(stuff->screen))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if (DGAClients[stuff->screen] &&
+        (DGAClients[stuff->screen] != client))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if (stuff->enable & XF86DGADirectGraphics) {
+	if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	    return (DGAErrorBase + XF86DGANoDirectVideoMode);
+    } else
+	num = 0;
+
+    if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
+	return (DGAErrorBase + XF86DGAScreenNotActive);
+
+    DGASetInputMode (stuff->screen,
+		     (stuff->enable & XF86DGADirectKeyb) != 0,
+		     (stuff->enable & XF86DGADirectMouse) != 0);
+
+    /* We need to track the client and attach the teardown callback */
+    if (stuff->enable &
+	(XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse)) {
+	if (!DGAClients[stuff->screen]) {
+	    if (DGACallbackRefCount++ == 0)
+		AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);
+	}
+
+	DGAClients[stuff->screen] = client;
+    } else {
+	if (DGAClients[stuff->screen]) {
+	    if (--DGACallbackRefCount == 0)
+		DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+	}
+
+	DGAClients[stuff->screen] = NULL;
+    }
+
+    return (client->noClientException);
+}
+
+static int
+ProcXF86DGAGetViewPortSize(ClientPtr client)
+{
+    int num;
+    XDGAModeRec mode;
+    REQUEST(xXF86DGAGetViewPortSizeReq);
+    xXF86DGAGetViewPortSizeReply rep;
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (!DGAAvailable(stuff->screen))
+	return (DGAErrorBase + XF86DGANoDirectVideoMode);
+
+    if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	return (DGAErrorBase + XF86DGANoDirectVideoMode);
+
+    DGAGetModeInfo(stuff->screen, &mode, num);
+
+    rep.width = mode.viewportWidth;
+    rep.height = mode.viewportHeight;
+
+    WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep);
+    return (client->noClientException);
+}
+
+static int
+ProcXF86DGASetViewPort(ClientPtr client)
+{
+    REQUEST(xXF86DGASetViewPortReq);
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    if (DGAClients[stuff->screen] != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);
+
+    if (!DGAAvailable(stuff->screen))
+	return (DGAErrorBase + XF86DGANoDirectVideoMode);
+
+    if (!DGAActive(stuff->screen))
+	return DGAErrorBase + XF86DGADirectNotActivated;
+
+    if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE)
+		!= Success)
+	return DGAErrorBase + XF86DGADirectNotActivated;
+
+    return (client->noClientException);
+}
+
+static int
+ProcXF86DGAGetVidPage(ClientPtr client)
+{
+    REQUEST(xXF86DGAGetVidPageReq);
+    xXF86DGAGetVidPageReply rep;
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.vpage = 0;  /* silently fail */
+
+    WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep);
+    return (client->noClientException);
+}
+
+
+static int
+ProcXF86DGASetVidPage(ClientPtr client)
+{
+    REQUEST(xXF86DGASetVidPageReq);
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);
+
+    /* silently fail */
+
+    return (client->noClientException);
+}
+
+
+static int
+ProcXF86DGAInstallColormap(ClientPtr client)
+{
+    ColormapPtr pcmp;
+    REQUEST(xXF86DGAInstallColormapReq);
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    if (DGAClients[stuff->screen] != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq);
+
+    if (!DGAActive(stuff->screen))
+	return (DGAErrorBase + XF86DGADirectNotActivated);
+
+    pcmp = (ColormapPtr  )LookupIDByType(stuff->id, RT_COLORMAP);
+    if (pcmp) {
+	DGAInstallCmap(pcmp);
+        return (client->noClientException);
+    } else {
+        client->errorValue = stuff->id;
+        return (BadColor);
+    }
+}
+
+static int
+ProcXF86DGAQueryDirectVideo(ClientPtr client)
+{
+    REQUEST(xXF86DGAQueryDirectVideoReq);
+    xXF86DGAQueryDirectVideoReply rep;
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.flags = 0;
+
+    if (DGAAvailable(stuff->screen))
+	rep.flags = XF86DGADirectPresent;
+
+    WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep);
+    return (client->noClientException);
+}
+
+static int
+ProcXF86DGAViewPortChanged(ClientPtr client)
+{
+    REQUEST(xXF86DGAViewPortChangedReq);
+    xXF86DGAViewPortChangedReply rep;
+
+    if (stuff->screen > screenInfo.numScreens)
+	return BadValue;
+
+    if (DGAClients[stuff->screen] != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq);
+
+    if (!DGAActive(stuff->screen))
+	return (DGAErrorBase + XF86DGADirectNotActivated);
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.result = 1;
+
+    WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep);
+    return (client->noClientException);
+}
+
+#endif /* DGA_PROTOCOL_OLD_SUPPORT */
 
 static int
 SProcXDGADispatch (ClientPtr client)
@@ -701,15 +986,11 @@ ProcXDGADispatch (ClientPtr client)
     if (stuff->data <= X_XDGACreateColormap)
 	fprintf (stderr, "    DGA %s\n", dgaMinor[stuff->data]);
 #endif
-    
-    /* divert old protocol */
-#if 1
-    if( (stuff->data <= X_XF86DGAViewPortChanged) && 
-	(stuff->data >= X_XF86DGAGetVideoLL)) 
-	return ProcXF86DGADispatch(client);
-#endif
 
     switch (stuff->data){
+    /*
+     * DGA2 Protocol
+     */
     case X_XDGAQueryVersion:
 	return ProcXDGAQueryVersion(client);
     case X_XDGAQueryModes:
@@ -742,6 +1023,29 @@ ProcXDGADispatch (ClientPtr client)
 	return ProcXDGAChangePixmapMode(client);
     case X_XDGACreateColormap:
 	return ProcXDGACreateColormap(client);
+    /*
+     * Old DGA Protocol
+     */
+#ifdef DGA_PROTOCOL_OLD_SUPPORT
+    case X_XF86DGAGetVideoLL:
+	return ProcXF86DGAGetVideoLL(client);
+    case X_XF86DGADirectVideo:
+	return ProcXF86DGADirectVideo(client);
+    case X_XF86DGAGetViewPortSize:
+	return ProcXF86DGAGetViewPortSize(client);
+    case X_XF86DGASetViewPort:
+	return ProcXF86DGASetViewPort(client);
+    case X_XF86DGAGetVidPage:
+	return ProcXF86DGAGetVidPage(client);
+    case X_XF86DGASetVidPage:
+	return ProcXF86DGASetVidPage(client);
+    case X_XF86DGAInstallColormap:
+	return ProcXF86DGAInstallColormap(client);
+    case X_XF86DGAQueryDirectVideo:
+	return ProcXF86DGAQueryDirectVideo(client);
+    case X_XF86DGAViewPortChanged:
+	return ProcXF86DGAViewPortChanged(client);
+#endif /* DGA_PROTOCOL_OLD_SUPPORT */
     default:
 	return BadRequest;
     }
@@ -750,5 +1054,5 @@ ProcXDGADispatch (ClientPtr client)
 void
 XFree86DGARegister(INITARGS)
 {
-  XDGAEventBase = &DGAEventBase; 
+  XDGAEventBase = &DGAEventBase;
 }
-- 
1.6.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- xorg-x11-server.spec	10 Mar 2009 23:08:04 -0000	1.394
+++ xorg-x11-server.spec	8 Apr 2009 21:21:54 -0000	1.395
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   15%{?dist}
+Release:   16%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -104,6 +104,8 @@
 # #485557
 Patch6010: xserver-1.5.3-hdmi.patch
 
+Patch6011: xserver-1.5.3-dga-crash-fix.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -536,6 +538,10 @@
 
 
 %changelog
+* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com> 1.5.3-16
+- xserver-1.5.3-dga-crash-fix.patch: Track client state even for DGA1
+  clients, and recover correctly.
+
 * Wed Mar 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-15
 - Revert to 1.5.3-10 version of 10-x11-keymap.fdi. (#484488)
 



From ajax at fedoraproject.org  Wed Apr  8 21:39:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  8 Apr 2009 21:39:05 +0000 (UTC)
Subject: rpms/kernel/F-11 TODO, 1.62, 1.63 kernel.spec, 1.1520,
	1.1521 linux-2.6.29-pat-fixes.patch, 1.2, NONE
Message-ID: <20090408213905.489F57011A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27122

Modified Files:
	TODO kernel.spec 
Removed Files:
	linux-2.6.29-pat-fixes.patch 
Log Message:
* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com>
- Drop the PAT patch, sufficiently upstreamed now.



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- TODO	3 Apr 2009 19:48:24 -0000	1.62
+++ TODO	8 Apr 2009 21:38:33 -0000	1.63
@@ -98,7 +98,3 @@
         virtio_net guest->remote GSO busted with 2.6.29 host
         https://bugzilla.redhat.com/490266
         Should be in 2.6.29.1
-
-* linux-2.6.29-pat-fixes.patch:
-	http://bugs.freedesktop.org/show_bug.cgi?id=20803
-	ajax to follow up with jbarnes


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1520
retrieving revision 1.1521
diff -u -r1.1520 -r1.1521
--- kernel.spec	8 Apr 2009 15:33:30 -0000	1.1520
+++ kernel.spec	8 Apr 2009 21:38:33 -0000	1.1521
@@ -717,9 +717,6 @@
 # fix for net lockups, will be in 2.6.29.1
 Patch9101: linux-2.6-net-fix-another-gro-bug.patch
 
-# http://bugs.freedesktop.org/show_bug.cgi?id=20803
-Patch9210: linux-2.6.29-pat-fixes.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1318,8 +1315,6 @@
 
 ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
 
-ApplyPatch linux-2.6.29-pat-fixes.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1905,6 +1900,9 @@
 # and build.
 
 %changelog
+* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com>
+- Drop the PAT patch, sufficiently upstreamed now.
+
 * Wed Apr 08 2009 Dave Jones <davej at redhat.com> 2.6.29.1-58
 - disable MMIOTRACE in non-debug builds (#494584)
 


--- linux-2.6.29-pat-fixes.patch DELETED ---



From bos at fedoraproject.org  Wed Apr  8 21:39:46 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Wed,  8 Apr 2009 21:39:46 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec, 1.79,
	1.80 ghc-6.10.1-gen_contexts_index.patch, 1.1, NONE
Message-ID: <20090408213946.7A79C7011A@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27441

Modified Files:
	ghc.spec 
Removed Files:
	ghc-6.10.1-gen_contexts_index.patch 
Log Message:
Update to GHC 6.10.2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ghc.spec	27 Feb 2009 03:44:31 -0000	1.79
+++ ghc.spec	8 Apr 2009 21:39:16 -0000	1.80
@@ -15,8 +15,8 @@
 %global package_debugging 0
 
 Name: ghc
-Version: 6.10.1
-Release: 13%{?dist}
+Version: 6.10.2
+Release: 1%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -38,7 +38,6 @@
 %if %{with doc}
 BuildRequires: libxslt, docbook-style-xsl
 %endif
-Patch1: ghc-6.10.1-gen_contexts_index.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -80,7 +79,6 @@
 
 %prep
 %setup -q -n %{name}-%{version} -b1
-%patch1 -p1 -b .orig
 
 %build
 # hack for building a local test package quickly from a prebuilt tree 
@@ -218,6 +216,9 @@
 %endif
 
 %changelog
+* Wed Apr 08 2009 Bryan O'Sullivan <bos at serpentine.com> - 6.10.2-1
+- Update to 6.10.2
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-13
 - ok let's stick with ExclusiveArch for brevity
 


--- ghc-6.10.1-gen_contexts_index.patch DELETED ---



From davidz at fedoraproject.org  Wed Apr  8 21:49:31 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed,  8 Apr 2009 21:49:31 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.5, 1.6 DeviceKit-disks.spec,
	1.17, 1.18 sources, 1.5, 1.6
Message-ID: <20090408214931.3EA397011A@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29373

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Log Message:
* Wed Apr 08 2009 David Zeuthen <davidz at redhat.com> - 004-0.5.20090408git%{?dist}
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Apr 2009 00:12:01 -0000	1.5
+++ .cvsignore	8 Apr 2009 21:49:00 -0000	1.6
@@ -2,3 +2,4 @@
 DeviceKit-disks-003.tar.gz
 DeviceKit-disks-004.20080406git.tar.gz
 DeviceKit-disks-004.20090406git.tar.gz
+DeviceKit-disks-004.20090408git.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DeviceKit-disks.spec	7 Apr 2009 00:18:05 -0000	1.17
+++ DeviceKit-disks.spec	8 Apr 2009 21:49:00 -0000	1.18
@@ -12,11 +12,11 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.4.20090406git%{?dist}
+Release: 0.5.20090408git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
-Source0: %{name}-%{version}.20090406git.tar.gz
+Source0: %{name}-%{version}.20090408git.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -132,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed Apr 08 2009 David Zeuthen <davidz at redhat.com> - 004-0.5.20090408git%{?dist}
+- New snapshot
+
 * Mon Apr 06 2009 David Zeuthen <davidz at redhat.com> - 004-0.4.20090406git%{?dist}
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Apr 2009 00:12:01 -0000	1.5
+++ sources	8 Apr 2009 21:49:00 -0000	1.6
@@ -1 +1 @@
-4fb14a3d53ea3d773dc81ae1cd501a66  DeviceKit-disks-004.20090406git.tar.gz
+8821f15cc3933e496c8a19c08320704e  DeviceKit-disks-004.20090408git.tar.gz



From jjohnstn at fedoraproject.org  Wed Apr  8 22:39:31 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed,  8 Apr 2009 22:39:31 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.42, 1.43 eclipse-cdt.spec,
	1.119, 1.120 fetch-cdt.sh, 1.4, 1.5 sources, 1.51, 1.52
Message-ID: <20090408223931.658957011A@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7614

Modified Files:
	.cvsignore eclipse-cdt.spec fetch-cdt.sh sources 
Log Message:

* Wed Apr 08 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
- Bump release.

* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-1
- Rebase autotools to 1.0.3.
- Rebase CDT to v200903191301 (5.0.2).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	16 Jan 2009 21:31:54 -0000	1.42
+++ .cvsignore	8 Apr 2009 22:38:58 -0000	1.43
@@ -22,3 +22,5 @@
 eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
 eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
 eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
+eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- eclipse-cdt.spec	23 Mar 2009 16:14:26 -0000	1.119
+++ eclipse-cdt.spec	8 Apr 2009 22:38:59 -0000	1.120
@@ -6,9 +6,9 @@
 %define major                   5
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   1
+%define micro                   2
 %define eclipse_base            %{_libdir}/eclipse
-%define build_id		200809190802
+%define build_id		200903191301
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -31,10 +31,10 @@
 # script.  Note that the optional c99 and upc parsers plus the optional
 # xlc support features have been removed.
 
-Source0: %{name}-fetched-src-CDT_5_0_1.tar.bz2
+Source0: %{name}-fetched-src-CDT_5_0_2.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
 
 Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 
@@ -56,9 +56,6 @@
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
-# Don't run the tests as part of the build.  We'll do this ourselves.
-Patch4: %{name}-no-tests-%{version}.patch
-
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -158,8 +155,6 @@
 %prep
 %setup -q -c 
 
-%patch4
-
 pushd "org.eclipse.cdt.releng"
 
 # Remove lpg-using lrparser feature
@@ -299,7 +294,8 @@
     -DbaseLocation=$SDK \
     -Dpde.build.scripts=$PDEDIR/scripts \
     -DdontFetchAnything=true \
-    -DskipFetch=true
+    -DskipFetch=true \
+     zips
 popd
 
 ## Autotools has dependencies on CDT so we must add these to the SDK directory
@@ -570,11 +566,12 @@
 %endif
 
 %changelog
-* Mon Mar 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-4
-- Bump release and rebuild.
+* Wed Apr 08 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
+- Bump release.
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 07 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-1
+- Rebase autotools to 1.0.3.
+- Rebase CDT to v200903191301 (5.0.2).
 
 * Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
 - Rebase libhover to 0.1.1 and autotools to 1.0.2.


Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/fetch-cdt.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fetch-cdt.sh	28 Nov 2008 21:40:05 -0000	1.4
+++ fetch-cdt.sh	8 Apr 2009 22:38:59 -0000	1.5
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CDTTAG=CDT_5_0_1
+CDTTAG=CDT_5_0_2
 ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
 
 mkdir -p temp && cd temp


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Jan 2009 21:31:54 -0000	1.51
+++ sources	8 Apr 2009 22:38:59 -0000	1.52
@@ -1,5 +1,5 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-f0db116442be6f461611739308535175  eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
-80967f045be67d65396ce424ef093719  eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
 23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
+1768318e26e5a40e55bb55cc38fedfaa  eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
+25251010257cc1255f9bcec90a9514b7  eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz



From pkgdb at fedoraproject.org  Wed Apr  8 22:42:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:42:54 +0000
Subject: [pkgdb] kernel: mtosatti has requested commit
Message-ID: <20090408224159.CC24C10F862@bastion2.fedora.phx.redhat.com>

mtosatti has requested the commit acl on kernel (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From kkofler at fedoraproject.org  Wed Apr  8 22:45:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  8 Apr 2009 22:45:57 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.2.2-ksirk-rh#486380.patch, 1.1,
	1.2 kdegames.spec, 1.113, 1.114
Message-ID: <20090408224557.E85577011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9106/F-10

Modified Files:
	kdegames-4.2.2-ksirk-rh#486380.patch kdegames.spec 
Log Message:
Another attempt at fixing the KsirK crash.

kdegames-4.2.2-ksirk-rh#486380.patch:

Index: kdegames-4.2.2-ksirk-rh#486380.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames-4.2.2-ksirk-rh#486380.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 18:56:09 -0000	1.1
+++ kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 22:45:27 -0000	1.2
@@ -1,12 +1,50 @@
-diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
---- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
-+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
-@@ -2676,6 +2676,8 @@
- void GameAutomaton::removeAllPlayers()
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp	2009-04-09 00:41:24.000000000 +0200
+@@ -132,6 +132,7 @@
+   m_downarrow(0),
+   m_leftarrow(0),
+   m_rightarrow(0),
++  m_reinitializingGame(false),
+   m_newGameDialog(0),
+   m_stateBeforeNewGame(GameAutomaton::INVALID),
+   m_stackWidgetBeforeNewGame(-1),
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.h kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.h	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h	2009-04-09 00:39:57.000000000 +0200
+@@ -1113,6 +1113,7 @@
+   bool m_networkGame;
+   int m_port;
+   uint m_newPlayersNumber;
++  bool m_reinitializingGame;
+ 
+   NewGameDialogImpl* m_newGameDialog;
+ 
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp	2009-04-09 00:42:57.000000000 +0200
+@@ -75,7 +75,7 @@
+   QPointF mousePosition;
+   Country *mouseLocalisation;
+ 
+-  if (m_frame == 0)
++  if (m_frame == 0 || m_reinitializingGame)
+   {
+     return;
+   }
+@@ -952,6 +952,7 @@
  {
-   kDebug();
-+  // reset all countries or they will refer to nonexistent players => crash
-+  m_game->theWorld()->reset();
-   m_currentPlayer = "";
-   foreach (KPlayer*p, *playerList())
+   kDebug() << nbPlayers << skin << nbNetworkPlayers << useGoals;
+   m_automaton->setGameStatus(KGame::End);
++  m_reinitializingGame = true;
+   m_automaton->removeAllPlayers();
+ 
+   showMap();
+@@ -961,6 +962,7 @@
+   m_automaton->savedState(GameLogic::GameAutomaton::INVALID);
+   m_automaton->setNetworkPlayersNumber(m_automaton->networkGameType()==GameAutomaton::None?0:nbNetworkPlayers);
+   m_automaton->finishSetupPlayersNumberAndSkin(skin, m_automaton->networkGameType(), nbPlayers);
++  m_reinitializingGame = false;
+ 
+   if (m_automaton->networkGameType()==GameAutomaton::Jabber && m_jabberClient && m_jabberClient->isConnected())
    {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdegames.spec	8 Apr 2009 18:56:09 -0000	1.113
+++ kdegames.spec	8 Apr 2009 22:45:27 -0000	1.114
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -199,7 +199,7 @@
 
 
 %changelog
-* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-6
 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
 
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4



From kkofler at fedoraproject.org  Wed Apr  8 22:45:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  8 Apr 2009 22:45:58 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.2.2-ksirk-rh#486380.patch, 1.1,
	1.2 kdegames.spec, 1.125, 1.126
Message-ID: <20090408224558.DCD9A7011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9106/devel

Modified Files:
	kdegames-4.2.2-ksirk-rh#486380.patch kdegames.spec 
Log Message:
Another attempt at fixing the KsirK crash.

kdegames-4.2.2-ksirk-rh#486380.patch:

Index: kdegames-4.2.2-ksirk-rh#486380.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames-4.2.2-ksirk-rh#486380.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 18:42:04 -0000	1.1
+++ kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 22:45:28 -0000	1.2
@@ -1,12 +1,50 @@
-diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
---- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
-+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
-@@ -2676,6 +2676,8 @@
- void GameAutomaton::removeAllPlayers()
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp	2009-04-09 00:41:24.000000000 +0200
+@@ -132,6 +132,7 @@
+   m_downarrow(0),
+   m_leftarrow(0),
+   m_rightarrow(0),
++  m_reinitializingGame(false),
+   m_newGameDialog(0),
+   m_stateBeforeNewGame(GameAutomaton::INVALID),
+   m_stackWidgetBeforeNewGame(-1),
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.h kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.h	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h	2009-04-09 00:39:57.000000000 +0200
+@@ -1113,6 +1113,7 @@
+   bool m_networkGame;
+   int m_port;
+   uint m_newPlayersNumber;
++  bool m_reinitializingGame;
+ 
+   NewGameDialogImpl* m_newGameDialog;
+ 
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp	2009-04-09 00:42:57.000000000 +0200
+@@ -75,7 +75,7 @@
+   QPointF mousePosition;
+   Country *mouseLocalisation;
+ 
+-  if (m_frame == 0)
++  if (m_frame == 0 || m_reinitializingGame)
+   {
+     return;
+   }
+@@ -952,6 +952,7 @@
  {
-   kDebug();
-+  // reset all countries or they will refer to nonexistent players => crash
-+  m_game->theWorld()->reset();
-   m_currentPlayer = "";
-   foreach (KPlayer*p, *playerList())
+   kDebug() << nbPlayers << skin << nbNetworkPlayers << useGoals;
+   m_automaton->setGameStatus(KGame::End);
++  m_reinitializingGame = true;
+   m_automaton->removeAllPlayers();
+ 
+   showMap();
+@@ -961,6 +962,7 @@
+   m_automaton->savedState(GameLogic::GameAutomaton::INVALID);
+   m_automaton->setNetworkPlayersNumber(m_automaton->networkGameType()==GameAutomaton::None?0:nbNetworkPlayers);
+   m_automaton->finishSetupPlayersNumberAndSkin(skin, m_automaton->networkGameType(), nbPlayers);
++  m_reinitializingGame = false;
+ 
+   if (m_automaton->networkGameType()==GameAutomaton::Jabber && m_jabberClient && m_jabberClient->isConnected())
    {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kdegames.spec	8 Apr 2009 18:42:04 -0000	1.125
+++ kdegames.spec	8 Apr 2009 22:45:28 -0000	1.126
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -199,7 +199,7 @@
 
 
 %changelog
-* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-6
 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
 
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4



From kkofler at fedoraproject.org  Wed Apr  8 22:45:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  8 Apr 2009 22:45:58 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames-4.2.2-ksirk-rh#486380.patch, 1.1,
	1.2 kdegames.spec, 1.103, 1.104
Message-ID: <20090408224558.508397011A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9106/F-9

Modified Files:
	kdegames-4.2.2-ksirk-rh#486380.patch kdegames.spec 
Log Message:
Another attempt at fixing the KsirK crash.

kdegames-4.2.2-ksirk-rh#486380.patch:

Index: kdegames-4.2.2-ksirk-rh#486380.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames-4.2.2-ksirk-rh#486380.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 18:56:09 -0000	1.1
+++ kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 22:45:27 -0000	1.2
@@ -1,12 +1,50 @@
-diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
---- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
-+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
-@@ -2676,6 +2676,8 @@
- void GameAutomaton::removeAllPlayers()
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp	2009-04-09 00:41:24.000000000 +0200
+@@ -132,6 +132,7 @@
+   m_downarrow(0),
+   m_leftarrow(0),
+   m_rightarrow(0),
++  m_reinitializingGame(false),
+   m_newGameDialog(0),
+   m_stateBeforeNewGame(GameAutomaton::INVALID),
+   m_stackWidgetBeforeNewGame(-1),
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.h kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.h	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h	2009-04-09 00:39:57.000000000 +0200
+@@ -1113,6 +1113,7 @@
+   bool m_networkGame;
+   int m_port;
+   uint m_newPlayersNumber;
++  bool m_reinitializingGame;
+ 
+   NewGameDialogImpl* m_newGameDialog;
+ 
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp	2009-04-09 00:42:57.000000000 +0200
+@@ -75,7 +75,7 @@
+   QPointF mousePosition;
+   Country *mouseLocalisation;
+ 
+-  if (m_frame == 0)
++  if (m_frame == 0 || m_reinitializingGame)
+   {
+     return;
+   }
+@@ -952,6 +952,7 @@
  {
-   kDebug();
-+  // reset all countries or they will refer to nonexistent players => crash
-+  m_game->theWorld()->reset();
-   m_currentPlayer = "";
-   foreach (KPlayer*p, *playerList())
+   kDebug() << nbPlayers << skin << nbNetworkPlayers << useGoals;
+   m_automaton->setGameStatus(KGame::End);
++  m_reinitializingGame = true;
+   m_automaton->removeAllPlayers();
+ 
+   showMap();
+@@ -961,6 +962,7 @@
+   m_automaton->savedState(GameLogic::GameAutomaton::INVALID);
+   m_automaton->setNetworkPlayersNumber(m_automaton->networkGameType()==GameAutomaton::None?0:nbNetworkPlayers);
+   m_automaton->finishSetupPlayersNumberAndSkin(skin, m_automaton->networkGameType(), nbPlayers);
++  m_reinitializingGame = false;
+ 
+   if (m_automaton->networkGameType()==GameAutomaton::Jabber && m_jabberClient && m_jabberClient->isConnected())
    {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdegames.spec	8 Apr 2009 18:56:09 -0000	1.103
+++ kdegames.spec	8 Apr 2009 22:45:27 -0000	1.104
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -199,7 +199,7 @@
 
 
 %changelog
-* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-6
 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
 
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4



From cwickert at fedoraproject.org  Wed Apr  8 22:48:38 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  8 Apr 2009 22:48:38 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-power-manager.spec, 1.4, 1.5
Message-ID: <20090408224838.B84377011A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10129

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Thu Apr 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha2
- Update to 0.8.0alpha2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Mar 2009 19:19:25 -0000	1.3
+++ .cvsignore	8 Apr 2009 22:48:07 -0000	1.4
@@ -1 +1 @@
-xfce4-power-manager-0.6.5.tar.bz2
+xfce4-power-manager-0.8.0alpha2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Mar 2009 19:19:25 -0000	1.3
+++ sources	8 Apr 2009 22:48:08 -0000	1.4
@@ -1 +1 @@
-3db8d413b90e2b6bf1df4d5c06e7d2fb  xfce4-power-manager-0.6.5.tar.bz2
+5899c764c040edb4e017d3ca0067ade7  xfce4-power-manager-0.8.0alpha2.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-power-manager.spec	24 Mar 2009 19:19:25 -0000	1.4
+++ xfce4-power-manager.spec	8 Apr 2009 22:48:08 -0000	1.5
@@ -1,19 +1,23 @@
+%define alphaversion alpha2
+
 Name:           xfce4-power-manager
-Version:        0.6.5
-Release:        1%{?dist}
+Version:        0.8.0
+Release:        0.1.%{alphaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{alphaversion}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfconf-devel >= 4.5.90 
-BuildRequires:  libxfcegui4-devel >= 4.4.1
-BuildRequires:  dbus-glib-devel >= 0.5.6
-BuildRequires:  hal-devel >= 0.5.6
+BuildRequires:  xfconf-devel >= 4.6.0
+
+BuildRequires:  xfce4-panel-devel >= 4.6.0
+BuildRequires:  dbus-devel >= 0.60
+BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libnotify-devel >= 0.4.1
+BuildRequires:  libglade2-devel >= 2.0.0
 BuildRequires:  gettext intltool desktop-file-utils
 Requires:       xfce4-panel
 
@@ -25,7 +29,7 @@
 
 
 %prep
-%setup -q
+%setup -qn %{name}-%{version}%{alphaversion}
 
 
 %build
@@ -66,17 +70,27 @@
 %{_bindir}/%{name}
 %{_bindir}/xfce4-power-manager-settings
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
+%{_libexecdir}/xfce4/panel-plugins/xfce4-*-plugin
 %{_datadir}/applications/%{name}-settings.desktop
-%{_datadir}/icons/hicolor/scalable/apps/xfpm-cpu.svg
+%{_datadir}/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
 %{_datadir}/icons/hicolor/scalable/*/gpm-*.svg
+%{_datadir}/xfce4/panel-plugins/xfce4-*-plugin.desktop
 %doc %{_datadir}/xfce4/doc/C/images/*.png
 %doc %{_datadir}/xfce4/doc/C/%{name}.html
+%{_mandir}/man1/%{name}-settings.1.gz
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Thu Apr 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha2
+- Update to 0.8.0alpha2
+
+* Thu Apr 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha
+- Update to 0.8.0alpha 
+
 * Tue Mar 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.5-1
 - Update to 0.6.5
-- Remove custom autostart desktop
+- Remove custom autostart file
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From pkgdb at fedoraproject.org  Wed Apr  8 22:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:53:05 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225212.60B3710F870@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Apr  8 22:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:53:06 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225212.60ABF10F86B@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Apr  8 22:53:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:53:24 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225230.8C3AE10F862@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora 11) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Apr  8 22:53:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:53:25 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225232.38AF010F87F@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora 11) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Apr  8 22:53:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:53:42 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225248.3549310F876@bastion2.fedora.phx.redhat.com>

davej has set the commit acl on kernel (Fedora 11) to Approved for mtosatti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Apr  8 22:53:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:53:03 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225302.749CA10F879@bastion2.fedora.phx.redhat.com>

davej has set the watchbugzilla acl on kernel (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Apr  8 22:54:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 08 Apr 2009 22:54:00 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090408225306.1B2CD10F887@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From jkeating at fedoraproject.org  Wed Apr  8 23:08:24 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  8 Apr 2009 23:08:24 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.125,1.126
Message-ID: <20090408230824.E0C467011A@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15542

Modified Files:
	plymouth.spec 
Log Message:
* Wed Apr 08 2009 Jesse Keating <jkeating at redhat.com> - 0.7.0-0.2009.03.10.3
- Drop the version on system-logos requires for now, causing hell with
  other -logos providers not having the same version.



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- plymouth.spec	18 Mar 2009 18:18:20 -0000	1.125
+++ plymouth.spec	8 Apr 2009 23:07:54 -0000	1.126
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.0
-Release: 0.2009.03.10.2%{?dist}
+Release: 0.2009.03.10.3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -14,7 +14,7 @@
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: system-logos >= 9.0.1
+Requires: system-logos
 Requires(post): plymouth-scripts
 Requires: initscripts >= 8.83-1
 
@@ -322,6 +322,10 @@
 %defattr(-, root, root)
 
 %changelog
+* Wed Apr 08 2009 Jesse Keating <jkeating at redhat.com> - 0.7.0-0.2009.03.10.3
+- Drop the version on system-logos requires for now, causing hell with
+  other -logos providers not having the same version.
+
 * Wed Mar 18 2009 Ray Strode <rstrode at redhat.com> 0.7.0-0.2009.03.10.2
 - Destroy terminal on detach (may help with bug 490965)
 



From timfenn at fedoraproject.org  Thu Apr  9 00:02:22 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Thu,  9 Apr 2009 00:02:22 +0000 (UTC)
Subject: rpms/pymol/devel .cvsignore, 1.4, 1.5 pymol.spec, 1.8, 1.9 sources, 
	1.4, 1.5
Message-ID: <20090409000222.A32437001C@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/pymol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26405

Modified Files:
	.cvsignore pymol.spec sources 
Log Message:
* Wed Apr 08 2009 Tim Fenn <fenn at stanford.edu> - 1.2-3.20090408svn3694
- update to 1.2beta5, aka SVN 3694




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Feb 2009 19:53:16 -0000	1.4
+++ .cvsignore	9 Apr 2009 00:01:51 -0000	1.5
@@ -1 +1 @@
-pymol-1.2-20090226svn3616.tar.gz
+pymol-1.2-20090408svn3694.tar.gz


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/pymol.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pymol.spec	26 Feb 2009 19:53:16 -0000	1.8
+++ pymol.spec	9 Apr 2009 00:01:51 -0000	1.9
@@ -3,15 +3,15 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.2
-Release: 2.20090226svn3616%{?dist}
+Release: 3.20090408svn3694%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn co -r 3616 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
-#  tar cvzf pymol-1.2-20090226svn3616.tar.gz pymol-1.2
-Source0: pymol-1.2-20090226svn3616.tar.gz
+#  svn co -r 3694 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
+#  tar cvzf pymol-1.2-20090408svn3694.tar.gz pymol-1.2
+Source0: pymol-1.2-20090408svn3694.tar.gz
 # the source for this xpm pulled from:
 # https://launchpad.net/ubuntu/intrepid/+source/pymol/1.1~beta3-3/+files/pymol_1.1~beta3-3.diff.gz
 Source1: %{name}-32.xpm
@@ -104,6 +104,9 @@
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Wed Apr 08 2009 Tim Fenn <fenn at stanford.edu> - 1.2-3.20090408svn3694
+- update to 1.2beta5, aka SVN 3694
+
 * Thu Feb 26 2009 Tim Fenn <fenn at stanford.edu> - 1.2-2.20090226svn3616
 - include pymol2 module, update to SVN 3616 (fixes cmd2.py)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Feb 2009 19:53:16 -0000	1.4
+++ sources	9 Apr 2009 00:01:51 -0000	1.5
@@ -1 +1 @@
-0852349b9a037dd46c7a9b1fc99eb35f  pymol-1.2-20090226svn3616.tar.gz
+95998908b7ba409ee43a9f068b12697e  pymol-1.2-20090408svn3694.tar.gz



From hno at fedoraproject.org  Thu Apr  9 00:26:37 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu,  9 Apr 2009 00:26:37 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.37, 1.38 bzr.spec, 1.53, 1.54 sources, 
	1.37, 1.38
Message-ID: <20090409002637.84D8E7001C@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31672

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.14rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	24 Mar 2009 09:57:46 -0000	1.37
+++ .cvsignore	9 Apr 2009 00:26:37 -0000	1.38
@@ -1 +1 @@
-bzr-1.13.1.tar.gz
+bzr-1.14rc1.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- bzr.spec	24 Mar 2009 10:03:41 -0000	1.53
+++ bzr.spec	9 Apr 2009 00:26:37 -0000	1.54
@@ -5,15 +5,15 @@
 #   bzrver:  main bzr version
 #   bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %).
 #   release: rpm subrelease (0.N for rc candidates, N for stable releases)
-%define bzrver 1.13
-#define bzrrc rc1
-%define release 1
+%define bzrver 1.14
+%define bzrrc rc1
+%define release 0.1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
 
 Name:           bzr
-Version:        %{bzrver}.1
+Version:        %{bzrver}
 Release:        %{release}%{?subrelease}%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -89,6 +89,9 @@
 %endif
 
 %changelog
+* Thu Apr 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.1.rc1
+- Update to 1.14rc1
+
 * Tue Mar 24 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.13.1-1
 - Update to 1.13.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Mar 2009 09:57:46 -0000	1.37
+++ sources	9 Apr 2009 00:26:37 -0000	1.38
@@ -1 +1 @@
-c18d386d48965fa00d05655ee55dc70c  bzr-1.13.1.tar.gz
+a488eb6f01a693148d02e4e71d75b7b5  bzr-1.14rc1.tar.gz



From rmeggins at fedoraproject.org  Thu Apr  9 01:09:39 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  9 Apr 2009 01:09:39 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-10 fedora-ds-admin-cvs.sh, 1.6,
	1.7 fedora-ds-admin.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090409010939.C2C027001C@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11520/F-10

Modified Files:
	fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
Resolves: bug 494980
Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress



Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/fedora-ds-admin-cvs.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin-cvs.sh	3 Apr 2009 19:52:35 -0000	1.6
+++ fedora-ds-admin-cvs.sh	9 Apr 2009 01:09:09 -0000	1.7
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_7_RC2
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC3
 VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/fedora-ds-admin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-admin.spec	3 Apr 2009 19:52:35 -0000	1.7
+++ fedora-ds-admin.spec	9 Apr 2009 01:09:09 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,6 +147,11 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Apr  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-3
+- Resolves: bug 494980
+- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408
+
 * Fri Apr  3 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
 - Resolves: bug 493989
 - Description: Admin Server: valgrind invalid read in security.c when installing CRL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Apr 2009 19:52:35 -0000	1.7
+++ sources	9 Apr 2009 01:09:09 -0000	1.8
@@ -1 +1 @@
-bf2fe57c719783ce116ac6aaf8227539  fedora-ds-admin-1.1.7.tar.bz2
+501c5cdfe9ee871c31d752128eef0e8b  fedora-ds-admin-1.1.7.tar.bz2



From rmeggins at fedoraproject.org  Thu Apr  9 01:09:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  9 Apr 2009 01:09:40 +0000 (UTC)
Subject: rpms/fedora-ds-admin/F-9 fedora-ds-admin-cvs.sh, 1.6,
	1.7 fedora-ds-admin.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090409010940.0C76770137@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11520/F-9

Modified Files:
	fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
Resolves: bug 494980
Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress



Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin-cvs.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin-cvs.sh	3 Apr 2009 19:52:36 -0000	1.6
+++ fedora-ds-admin-cvs.sh	9 Apr 2009 01:09:09 -0000	1.7
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_7_RC2
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC3
 VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/fedora-ds-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin.spec	3 Apr 2009 19:52:36 -0000	1.6
+++ fedora-ds-admin.spec	9 Apr 2009 01:09:09 -0000	1.7
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,6 +147,11 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Apr  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-3
+- Resolves: bug 494980
+- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408
+
 * Fri Apr  3 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
 - Resolves: bug 493989
 - Description: Admin Server: valgrind invalid read in security.c when installing CRL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Apr 2009 19:52:36 -0000	1.7
+++ sources	9 Apr 2009 01:09:09 -0000	1.8
@@ -1 +1 @@
-bf2fe57c719783ce116ac6aaf8227539  fedora-ds-admin-1.1.7.tar.bz2
+501c5cdfe9ee871c31d752128eef0e8b  fedora-ds-admin-1.1.7.tar.bz2



From rmeggins at fedoraproject.org  Thu Apr  9 01:09:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  9 Apr 2009 01:09:40 +0000 (UTC)
Subject: rpms/fedora-ds-admin/devel fedora-ds-admin-cvs.sh, 1.6,
	1.7 fedora-ds-admin.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090409010940.638277013C@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11520/devel

Modified Files:
	fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
Resolves: bug 494980
Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress



Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin-cvs.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin-cvs.sh	3 Apr 2009 19:52:36 -0000	1.6
+++ fedora-ds-admin-cvs.sh	9 Apr 2009 01:09:10 -0000	1.7
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_7_RC2
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC3
 VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-ds-admin.spec	3 Apr 2009 19:52:36 -0000	1.8
+++ fedora-ds-admin.spec	9 Apr 2009 01:09:10 -0000	1.9
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,6 +147,11 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Apr  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-3
+- Resolves: bug 494980
+- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408
+
 * Fri Apr  3 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
 - Resolves: bug 493989
 - Description: Admin Server: valgrind invalid read in security.c when installing CRL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Apr 2009 19:52:36 -0000	1.7
+++ sources	9 Apr 2009 01:09:10 -0000	1.8
@@ -1 +1 @@
-bf2fe57c719783ce116ac6aaf8227539  fedora-ds-admin-1.1.7.tar.bz2
+501c5cdfe9ee871c31d752128eef0e8b  fedora-ds-admin-1.1.7.tar.bz2



From mclasen at fedoraproject.org  Thu Apr  9 01:39:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  9 Apr 2009 01:39:17 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.26.0-support-touchpads.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.98, 1.99
Message-ID: <20090409013917.222AA7001C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19132

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.26.0-support-touchpads.patch 
Log Message:
Support touchpads


gnome-settings-daemon-2.26.0-support-touchpads.patch:

--- NEW FILE gnome-settings-daemon-2.26.0-support-touchpads.patch ---
diff -up /dev/null gnome-settings-daemon-2.26.0/data/desktop_gnome_peripherals_touchpad.schemas.in
--- /dev/null	2009-04-08 15:58:42.372260448 -0400
+++ gnome-settings-daemon-2.26.0/data/desktop_gnome_peripherals_touchpad.schemas.in	2009-04-08 20:29:32.449768001 -0400
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+  <schemalist>
+
+    <schema>
+      <key>/schemas/desktop/gnome/peripherals/touchpad/disable_while_typing</key>
+      <applyto>/desktop/gnome/peripherals/touchpad/disable_while_typing</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Disable touchpad while typing</short>
+        <long>Set this to TRUE if you have problems with accidentally hitting the touchpad while typing.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/peripherals/touchpad/tap_to_click</key>
+      <applyto>/desktop/gnome/peripherals/touchpad/tap_to_click</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Enable mouse clicks with touchpad</short>
+        <long>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/peripherals/touchpad/scroll_method</key>
+      <applyto>/desktop/gnome/peripherals/touchpad/scroll_method</applyto>
+      <owner>gnome</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+        <short>Select the touchpad scroll method</short>
+        <long>Select the touchpad scroll method. Supported values are: 0 - disabled, 1 - edge scrolling, 2 - two-finger scrolling</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/peripherals/touchpad/horiz_scroll_enabled</key>
+      <applyto>/desktop/gnome/peripherals/touchpad/horiz_scroll_enabled</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Enable horizontal scrolling</short>
+        <long>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</long>
+      </locale>
+    </schema>
+
+  </schemalist>
+</gconfschemafile>
diff -up gnome-settings-daemon-2.26.0/data/Makefile.am.support-touchpads gnome-settings-daemon-2.26.0/data/Makefile.am
--- gnome-settings-daemon-2.26.0/data/Makefile.am.support-touchpads	2009-02-16 11:34:08.000000000 -0500
+++ gnome-settings-daemon-2.26.0/data/Makefile.am	2009-04-08 20:29:32.449768001 -0400
@@ -10,6 +10,7 @@ schemas_in_files = 						\
 	desktop_gnome_font_rendering.schemas.in			\
 	desktop_gnome_keybindings.schemas.in			\
 	apps_gnome_settings_daemon_xrandr.schemas.in		\
+	desktop_gnome_peripherals_touchpad.schemas.in		\
 	$(NULL)
 
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
diff -up gnome-settings-daemon-2.26.0/plugins/mouse/gsd-mouse-manager.c.support-touchpads gnome-settings-daemon-2.26.0/plugins/mouse/gsd-mouse-manager.c
--- gnome-settings-daemon-2.26.0/plugins/mouse/gsd-mouse-manager.c.support-touchpads	2009-04-08 20:29:32.446745868 -0400
+++ gnome-settings-daemon-2.26.0/plugins/mouse/gsd-mouse-manager.c	2009-04-08 21:23:16.465987950 -0400
@@ -38,9 +38,11 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/keysym.h>
+#include <X11/Xatom.h>
 
 #ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 #include <X11/extensions/XInput.h>
+#include <X11/extensions/XIproto.h>
 #endif
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
@@ -54,6 +56,7 @@
 
 #define GCONF_MOUSE_DIR         "/desktop/gnome/peripherals/mouse"
 #define GCONF_MOUSE_A11Y_DIR    "/desktop/gnome/accessibility/mouse"
+#define GCONF_TOUCHPAD_DIR      "/desktop/gnome/peripherals/touchpad"
 
 #define KEY_LEFT_HANDED         GCONF_MOUSE_DIR "/left_handed"
 #define KEY_MOTION_ACCELERATION GCONF_MOUSE_DIR "/motion_acceleration"
@@ -61,13 +64,20 @@
 #define KEY_LOCATE_POINTER      GCONF_MOUSE_DIR "/locate_pointer"
 #define KEY_DWELL_ENABLE        GCONF_MOUSE_A11Y_DIR "/dwell_enable"
 #define KEY_DELAY_ENABLE        GCONF_MOUSE_A11Y_DIR "/delay_enable"
+#define KEY_TOUCHPAD_DISABLE_W_TYPING    GCONF_TOUCHPAD_DIR "/disable_while_typing"
+#define KEY_TAP_TO_CLICK        GCONF_TOUCHPAD_DIR "/tap_to_click"
+#define KEY_SCROLL_METHOD       GCONF_TOUCHPAD_DIR "/scroll_method"
+#define KEY_PAD_HORIZ_SCROLL    GCONF_TOUCHPAD_DIR "/horiz_scroll_enabled"
 
 struct GsdMouseManagerPrivate
 {
         guint notify;
         guint notify_a11y;
+        guint notify_touchpad;
 
         gboolean mousetweaks_daemon_running;
+        gboolean syndaemon_spawned;
+        GPid  syndaemon_pid;
 };
 
 static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
@@ -261,6 +271,9 @@ set_xinput_devices_left_handed (gboolean
 
         device_info = XListInputDevices (GDK_DISPLAY (), &n_devices);
 
+        if (device_info == NULL)
+                return;
+
         if (n_devices > 0)
                 buttons = g_new (guchar, buttons_capacity);
         else
@@ -436,6 +449,256 @@ set_motion_threshold (GsdMouseManager *m
                                0, 0, motion_threshold);
 }
 
+static XDevice*
+device_is_touchpad (XDeviceInfo deviceinfo)
+{
+	XDevice *device;
+	Atom realtype, prop;
+	int realformat;
+	unsigned long nitems, bytes_after;
+	unsigned char *data;
+
+	if (deviceinfo.type != XInternAtom(GDK_DISPLAY(), XI_TOUCHPAD, False))
+		return NULL;
+
+	prop = XInternAtom(GDK_DISPLAY(), "Synaptics Off", False);
+	if (!prop)
+		return NULL;
+
+	gdk_error_trap_push();
+	device = XOpenDevice(GDK_DISPLAY(), deviceinfo.id);
+	if (gdk_error_trap_pop() || (device == NULL))
+		return NULL;
+
+	gdk_error_trap_push();
+	if ((XGetDeviceProperty(GDK_DISPLAY(), device, prop, 0, 1, False,
+			       XA_INTEGER, &realtype, &realformat, &nitems,
+			       &bytes_after, &data) == Success) && (realtype != None)) {
+		gdk_error_trap_pop();
+		XFree(data);
+		return device;
+	}
+	gdk_error_trap_pop();
+
+	XCloseDevice(GDK_DISPLAY(), device);
+	return NULL;
+}
+
+static int
+set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+{
+	GError	*error = NULL;
+
+	if (state) {
+		char	*args[4];
+
+		args[0] = "syndaemon";
+		args[1] = "-i";
+		args[2] = "0.5";
+		args[3] = NULL;
+
+		if (!g_find_program_in_path(args[0]))
+			return 0;
+
+		g_spawn_async(g_get_home_dir(), args, NULL,
+				G_SPAWN_SEARCH_PATH, NULL, NULL,
+				&manager->priv->syndaemon_pid, &error);
+
+		if (error) {
+			GConfClient *client;
+			client = gconf_client_get_default();
+			gconf_client_set_bool(client, KEY_TOUCHPAD_DISABLE_W_TYPING, FALSE, NULL);
+		}
+
+		manager->priv->syndaemon_spawned = (error == NULL);
+
+	} else if (manager->priv->syndaemon_spawned)
+	{
+		kill(manager->priv->syndaemon_pid, SIGHUP);
+		g_spawn_close_pid(manager->priv->syndaemon_pid);
+		manager->priv->syndaemon_spawned = False;
+	}
+
+	return 0;
+}
+
+static int
+set_tap_to_click (gboolean state)
+{
+	int numdevices, i, format, rc;
+	unsigned long nitems, bytes_after;
+	XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
+	XDevice * device;
+	unsigned char* data;
+	Atom prop, type;
+
+	if (devicelist == NULL)
+		return 0;
+
+	prop = XInternAtom(GDK_DISPLAY(), "Synaptics Tap Action", False);
+
+	if (!prop)
+		return 0;
+
+	for (i = 0; i < numdevices; i++) {
+		if ((device = device_is_touchpad(devicelist[i]))) {
+			gdk_error_trap_push();
+			rc = XGetDeviceProperty(GDK_DISPLAY(), device, prop, 0, 2,
+						False, XA_INTEGER, &type, &format, &nitems,
+						&bytes_after, &data);
+
+			if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7)
+			{
+			    /* Set RLM mapping for 1/2/3 fingers*/
+			    data[4] = (state) ? 1 : 0;
+			    data[5] = (state) ? 3 : 0;
+			    data[6] = (state) ? 2 : 0;
+			    XChangeDeviceProperty(GDK_DISPLAY(), device, prop, XA_INTEGER, 8,
+						  PropModeReplace, data, nitems);
+			}
+
+			if (rc == Success)
+			    XFree(data);
+			XCloseDevice (GDK_DISPLAY(), device);
+			if (gdk_error_trap_pop()) {
+				g_warning("Error in setting tap to click on \"%s\"", devicelist[i].name);
+				continue;
+			}
+		}
+	}
+
+	XFreeDeviceList(devicelist);
+	return 0;
+}
+
+static int
+set_horiz_scroll (gboolean state)
+{
+	int numdevices, i, rc;
+	XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
+	XDevice *device;
+	Atom act_type, prop_edge, prop_twofinger;
+	int act_format;
+	unsigned long nitems, bytes_after;
+	unsigned char *data;
+
+	if (devicelist == NULL)
+		return 0;
+
+	prop_edge = XInternAtom(GDK_DISPLAY(), "Synaptics Edge Scrolling", False);
+	prop_twofinger = XInternAtom(GDK_DISPLAY(), "Synaptics Two-Finger Scrolling", False);
+
+	if (!prop_edge || !prop_twofinger)
+		return 0;
+
+	for (i = 0; i < numdevices; i++) {
+		if ((device = device_is_touchpad(devicelist[i]))) {
+			gdk_error_trap_push();
+			rc = XGetDeviceProperty(GDK_DISPLAY(), device,
+						prop_edge, 0, 1, False,
+						XA_INTEGER, &act_type, &act_format, &nitems,
+						&bytes_after, &data);
+			if (rc == Success && act_type == XA_INTEGER &&
+				act_format == 8 && nitems >= 2) {
+				data[1] = (state && data[0]);
+				XChangeDeviceProperty(GDK_DISPLAY(), device,
+							prop_edge, XA_INTEGER, 8,
+							PropModeReplace, data, nitems);
+			}
+
+			XFree(data);
+
+			rc = XGetDeviceProperty(GDK_DISPLAY(), device,
+						prop_twofinger, 0, 1, False,
+						XA_INTEGER, &act_type, &act_format, &nitems,
+						&bytes_after, &data);
+			if (rc == Success && act_type == XA_INTEGER &&
+				act_format == 8 && nitems >= 2) {
+				data[1] = (state && data[0]);
+				XChangeDeviceProperty(GDK_DISPLAY(), device,
+							prop_twofinger, XA_INTEGER, 8,
+							PropModeReplace, data, nitems);
+			}
+
+			XFree(data);
+			XCloseDevice (GDK_DISPLAY(), device);
+			if (gdk_error_trap_pop()) {
+				g_warning("Error in setting horiz scroll on \"%s\"", devicelist[i].name);
+				continue;
+			}
+		}
+	}
+
+	XFreeDeviceList(devicelist);
+	return 0;
+}
+
+
+/**
+ * Scroll methods are: 0 - disabled, 1 - edge scrolling, 2 - twofinger
+ * scrolling
+ */
+static int
+set_edge_scroll (int method)
+{
+	int numdevices, i, rc;
+        XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
+	XDevice *device;
+	Atom act_type, prop_edge, prop_twofinger;
+	int act_format;
+	unsigned long nitems, bytes_after;
+	unsigned char *data;
+
+	if (devicelist == NULL)
+                return 0;
+
+	prop_edge = XInternAtom(GDK_DISPLAY(), "Synaptics Edge Scrolling", False);
+	prop_twofinger = XInternAtom(GDK_DISPLAY(), "Synaptics Two-Finger Scrolling", False);
+
+	if (!prop_edge || !prop_twofinger)
+		return 0;
+
+	for (i = 0; i < numdevices; i++) {
+		if ((device = device_is_touchpad(devicelist[i]))) {
+			gdk_error_trap_push();
+			rc = XGetDeviceProperty(GDK_DISPLAY(), device,
+						prop_edge, 0, 1, False,
+						XA_INTEGER, &act_type, &act_format, &nitems,
+						&bytes_after, &data);
+			if (rc == Success && act_type == XA_INTEGER &&
+				act_format == 8 && nitems >= 2) {
+				data[0] = (method == 1) ? 1 : 0;
+				XChangeDeviceProperty(GDK_DISPLAY(), device,
+							prop_edge, XA_INTEGER, 8,
+							PropModeReplace, data, nitems);
+			}
+
+			XFree(data);
+
+			rc = XGetDeviceProperty(GDK_DISPLAY(), device,
+						prop_twofinger, 0, 1, False,
+						XA_INTEGER, &act_type, &act_format, &nitems,
+						&bytes_after, &data);
+			if (rc == Success && act_type == XA_INTEGER &&
+				act_format == 8 && nitems >= 2) {
+				data[0] = (method == 2) ? 1 : 0;
+				XChangeDeviceProperty(GDK_DISPLAY(), device,
+							prop_twofinger, XA_INTEGER, 8,
+							PropModeReplace, data, nitems);
+			}
+
+			XFree(data);
+			XCloseDevice (GDK_DISPLAY(), device);
+			if (gdk_error_trap_pop()) {
+				g_warning("Error in setting edge scroll on \"%s\"", devicelist[i].name);
+				continue;
+			}
+		}
+	}
+
+	XFreeDeviceList(devicelist);
+	return 0;
+}
 
 #define KEYBOARD_GROUP_SHIFT 13
 #define KEYBOARD_GROUP_MASK ((1 << 13) | (1 << 14))
@@ -647,6 +910,11 @@ set_mouse_settings (GsdMouseManager *man
         set_motion_acceleration (manager, gconf_client_get_float (client, KEY_MOTION_ACCELERATION , NULL));
         set_motion_threshold (manager, gconf_client_get_int (client, KEY_MOTION_THRESHOLD, NULL));
 
+        set_disable_w_typing (manager, gconf_client_get_bool (client, KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
+        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
+        set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, NULL));
+        set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
+
         g_object_unref (client);
 }
 
@@ -668,6 +936,20 @@ mouse_callback (GConfClient        *clie
                 if (entry->value->type == GCONF_VALUE_INT) {
                         set_motion_threshold (manager, gconf_value_get_int (entry->value));
                 }
+        } else if (! strcmp (entry->key, KEY_TOUCHPAD_DISABLE_W_TYPING)) {
+                if (entry->value->type == GCONF_VALUE_BOOL)
+                        set_disable_w_typing (manager, gconf_value_get_bool (entry->value));
+        } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) {
+                if (entry->value->type == GCONF_VALUE_BOOL)
+                        set_tap_to_click (gconf_value_get_bool (entry->value));
+        } else if (! strcmp (entry->key, KEY_SCROLL_METHOD)) {
+                if (entry->value->type == GCONF_VALUE_INT) {
+                        set_edge_scroll (gconf_value_get_int (entry->value));
+                        set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
+                }
+        } else if (! strcmp (entry->key, KEY_PAD_HORIZ_SCROLL)) {
+                if (entry->value->type == GCONF_VALUE_BOOL)
+                        set_horiz_scroll (gconf_value_get_bool (entry->value));
         } else if (! strcmp (entry->key, KEY_LOCATE_POINTER)) {
                 if (entry->value->type == GCONF_VALUE_BOOL) {
                         set_locate_pointer (manager, gconf_value_get_bool (entry->value));
@@ -722,6 +1004,12 @@ gsd_mouse_manager_idle_cb (GsdMouseManag
                                           client,
                                           GCONF_MOUSE_A11Y_DIR,
                                           (GConfClientNotifyFunc) mouse_callback);
+        manager->priv->notify_touchpad =
+                register_config_callback (manager,
+                                          client,
+                                          GCONF_TOUCHPAD_DIR,
+                                          (GConfClientNotifyFunc) mouse_callback);
+        manager->priv->syndaemon_spawned = False;
 
 #ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         set_devicepresence_handler (manager);
@@ -732,6 +1020,11 @@ gsd_mouse_manager_idle_cb (GsdMouseManag
                                 gconf_client_get_bool (client, KEY_DWELL_ENABLE, NULL),
                                 gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL));
 
+        set_disable_w_typing (manager, gconf_client_get_bool (client, KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
+        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
+        set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, NULL));
+        set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
+
         g_object_unref (client);
 
         gnome_settings_profile_end (NULL);
@@ -774,6 +1067,12 @@ gsd_mouse_manager_stop (GsdMouseManager 
                 p->notify_a11y = 0;
         }
 
+        if (p->notify_touchpad != 0) {
+                gconf_client_remove_dir (client, GCONF_TOUCHPAD_DIR, NULL);
+                gconf_client_notify_remove (client, p->notify_touchpad);
+                p->notify_touchpad = 0;
+        }
+
         g_object_unref (client);
 
         set_locate_pointer (manager, FALSE);


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome-settings-daemon.spec	16 Mar 2009 18:28:35 -0000	1.98
+++ gnome-settings-daemon.spec	9 Apr 2009 01:38:46 -0000	1.99
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -35,8 +35,8 @@
 # http://bugzilla.redhat.com/474758
 Patch10:	gnome-settings-daemon-2.24.0-catch-deviceadded.patch
 
-# http://bugzilla.redhat.com/324721
-#Patch11:	gnome-settings-daemon-2.24.0-fix-touchpad.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=578444
+Patch11:	gnome-settings-daemon-2.26.0-support-touchpads.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -57,8 +57,7 @@
 %setup -q
 
 %patch10 -p1 -b .catch-deviceadded
-# This one is buggy, stop using for now
-#%patch11 -p1 -b .fix-touchpad
+%patch11 -p1 -b .support-touchpads
 
 autoreconf -i -f
 
@@ -98,6 +97,7 @@
 	%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
 	%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
 	%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \
+	%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \
 	>& /dev/null || :
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -107,6 +107,11 @@
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	if [ -f %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas ] ; then
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \
+			>& /dev/null || :
+	fi
 	if [ -f %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas ] ; then
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
@@ -123,6 +128,11 @@
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	if [ -f %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas ] ; then
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \
+			>& /dev/null || :
+	fi
 	if [ -f %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas ] ; then
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
@@ -160,6 +170,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-2
+- Support touchpads
+
 * Mon Mar 16 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From dwalsh at fedoraproject.org  Thu Apr  9 02:05:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  9 Apr 2009 02:05:32 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.50,
	1.51 policycoreutils-rhat.patch, 1.412,
	1.413 policycoreutils-sepolgen.patch, 1.21,
	1.22 policycoreutils.spec, 1.599, 1.600
Message-ID: <20090409020532.3ECBC7001C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26359

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-8
- Update po files
- Add --equiv command for semanage


policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.50 -r 1.51 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- policycoreutils-po.patch	31 Mar 2009 12:56:45 -0000	1.50
+++ policycoreutils-po.patch	9 Apr 2009 02:05:21 -0000	1.51
@@ -1,6 +1,7 @@
+Binary files nsapolicycoreutils/po/af.mo and policycoreutils-2.0.62/po/af.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.62/po/af.po
 --- nsapolicycoreutils/po/af.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/af.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/af.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1941,9 +1942,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/am.mo and policycoreutils-2.0.62/po/am.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.62/po/am.po
 --- nsapolicycoreutils/po/am.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/am.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/am.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3884,9 +3886,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/ar.mo and policycoreutils-2.0.62/po/ar.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.62/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/ar.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/ar.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -5827,9 +5830,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/as.mo and policycoreutils-2.0.62/po/as.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.62/po/as.po
 --- nsapolicycoreutils/po/as.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/as.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/as.po	2009-04-08 22:03:17.000000000 -0400
 @@ -1,4 +1,4 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -8214,9 +8218,10 @@
 -#~ msgstr "????????????"
 +#~ msgid "translations not supported on non-MLS machines"
 +#~ msgstr "MLS-??????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
+Binary files nsapolicycoreutils/po/be.mo and policycoreutils-2.0.62/po/be.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.62/po/be.po
 --- nsapolicycoreutils/po/be.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/be.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/be.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -10157,9 +10162,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/bg.mo and policycoreutils-2.0.62/po/bg.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.62/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bg.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bg.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -12209,9 +12215,10 @@
  #~ msgid "Requires value"
  #~ msgstr "?????????????? ????????????????"
  
+Binary files nsapolicycoreutils/po/bn_IN.mo and policycoreutils-2.0.62/po/bn_IN.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.62/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bn_IN.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bn_IN.po	2009-04-08 22:03:17.000000000 -0400
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -14236,9 +14243,10 @@
  #~ msgid "Requires value"
  #~ msgstr "????????? ??????????????????"
  
+Binary files nsapolicycoreutils/po/bn.mo and policycoreutils-2.0.62/po/bn.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.62/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bn.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bn.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -16179,9 +16187,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/bs.mo and policycoreutils-2.0.62/po/bs.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.62/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bs.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bs.po	2009-04-08 22:03:17.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -18161,9 +18170,10 @@
  #~ msgid "Requires value"
  #~ msgstr "Zahtijeva vrijednost"
  
+Binary files nsapolicycoreutils/po/ca.mo and policycoreutils-2.0.62/po/ca.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.62/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/ca.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/ca.po	2009-04-08 22:03:17.000000000 -0400
 @@ -22,7 +22,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -20153,9 +20163,10 @@
  #~ msgid "Requires value"
  #~ msgstr "Requereix un valor"
  
+Binary files nsapolicycoreutils/po/cs.mo and policycoreutils-2.0.62/po/cs.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.62/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/cs.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/cs.po	2009-04-08 22:03:17.000000000 -0400
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -22175,9 +22186,10 @@
  #~ msgid "<b>Device number:</b>"
  #~ msgstr "<b>????slo za????zen??:</b>"
  
+Binary files nsapolicycoreutils/po/cy.mo and policycoreutils-2.0.62/po/cy.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.62/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/cy.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/cy.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -24118,9 +24130,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/da.mo and policycoreutils-2.0.62/po/da.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.62/po/da.po
 --- nsapolicycoreutils/po/da.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/da.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/da.po	2009-04-08 22:03:17.000000000 -0400
 @@ -2,7 +2,7 @@
  # Danish messages for policycoreutils.
  # Copyright (C) 2006 Christian Rose.
@@ -26111,9 +26124,10 @@
  #~ msgid "Requires value"
  #~ msgstr "Kr??ver v??rdi"
  
+Binary files nsapolicycoreutils/po/de.mo and policycoreutils-2.0.62/po/de.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.62/po/de.po
 --- nsapolicycoreutils/po/de.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/de.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/de.po	2009-04-08 22:03:17.000000000 -0400
 @@ -1,30 +1,26 @@
 -# translation of policycoreutils.HEAD.de.po to German
  # German translation of policycoreutils.
@@ -29582,9 +29596,10 @@
 +#~ "\n"
 +#~ "semodule -i %s\n"
 +#~ "\n"
+Binary files nsapolicycoreutils/po/el.mo and policycoreutils-2.0.62/po/el.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-2.0.62/po/el.po
 --- nsapolicycoreutils/po/el.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/el.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/el.po	2009-04-08 22:03:17.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: el\n"
@@ -31600,9 +31615,10 @@
  #~ msgid "Requires value"
  #~ msgstr "???????????????? ??????????"
  
+Binary files nsapolicycoreutils/po/en_GB.mo and policycoreutils-2.0.62/po/en_GB.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-2.0.62/po/en_GB.po
 --- nsapolicycoreutils/po/en_GB.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/en_GB.po	2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/en_GB.po	2009-04-08 22:03:17.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -33582,9 +33598,10 @@
  #~ msgid "Requires value"
  #~ msgstr "Requires value"
[...27705 lines suppressed...]
  msgid "Add Translation"
  msgstr "?????????????????????????????? ????????????????????????"
@@ -147439,7 +156155,8 @@
 -#: ../gui/system-config-selinux.glade:2706
 +#: ../gui/system-config-selinux.glade:2711
  msgid "label40"
- msgstr ""
+-msgstr ""
++msgstr "label40"
  
 -#: ../gui/system-config-selinux.glade:2743
 +#: ../gui/system-config-selinux.glade:2748
@@ -147466,7 +156183,8 @@
 -#: ../gui/system-config-selinux.glade:2948
 +#: ../gui/system-config-selinux.glade:2954
  msgid "label42"
- msgstr ""
+-msgstr ""
++msgstr "label42"
  
 -#: ../gui/system-config-selinux.glade:2985
 +#: ../gui/system-config-selinux.glade:2991
@@ -147493,42 +156211,45 @@
 -#: ../gui/system-config-selinux.glade:3172
 +#: ../gui/system-config-selinux.glade:3179
  msgid "label44"
- msgstr ""
- 
+-msgstr ""
++msgstr "label44"
++
 +#: ../gui/system-config-selinux.glade:3216
 +msgid "Change process mode to permissive."
-+msgstr ""
++msgstr "????????????????????????????????? ?????????????????? ???????????????????????????????????????????????? ????????????????????????."
 +
 +#: ../gui/system-config-selinux.glade:3234
 +msgid "Change process mode to enforcing"
-+msgstr ""
++msgstr "????????????????????????????????? ?????????????????? ???????????????????????????????????????????????? ????????????????????????"
 +
 +#: ../gui/system-config-selinux.glade:3326
 +msgid "Process Domain"
-+msgstr ""
++msgstr "?????????????????? ???????????????????????? ??????????????????"
 +
 +#: ../gui/system-config-selinux.glade:3354
 +msgid "label59"
-+msgstr ""
-+
++msgstr "label59"
+ 
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
- msgstr "???????????????????????? ??????????????????"
-@@ -3462,8 +3483,8 @@
+@@ -3462,51 +3461,3 @@
  msgid "SELinux user '%s' is required"
  msgstr "SELinux ????????????????????????????????? '%s' ??????????????????"
  
 -#~ msgid "Requires value"
 -#~ msgstr "??????????????? ??????????????????"
-+#~ msgid "Modify SELinux User"
-+#~ msgstr "SELinux ??????????????????????????????????????? ???????????????????????????"
- 
- #~ msgid ""
- #~ "\n"
-@@ -3476,37 +3497,12 @@
- #~ "semodule -i %s\n"
- #~ "\n"
- 
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "\n"
+-#~ "semodule -i %s\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "\n"
+-#~ "semodule -i %s\n"
+-#~ "\n"
+-
 -#~ msgid "Invalid prefix %s"
 -#~ msgstr "????????????????????? ????????????????????????????????? %s"
 -
@@ -147554,24 +156275,19 @@
 -
 -#~ msgid "Use this checkbutton if your app calls bindresvport with 0."
 -#~ msgstr "?????? app ????????????????????? bindresvport 0 ?????? ???????????? ??? ???????????????????????????????????? ?????????????????????????????????."
-+#~ msgid "translations not supported on non-MLS machines"
-+#~ msgstr "non-MLS ???????????????????????? ????????? ?????????????????????????????? ?????????????????????????????????"
- 
- #~ msgid ""
+-
+-#~ msgid ""
 -#~ "Enforcing\n"
 -#~ "Permissive\n"
 -#~ "Disabled\n"
-+#~ "tcp\n"
-+#~ "udp"
- #~ msgstr ""
+-#~ msgstr ""
 -#~ "?????????????????????\n"
 -#~ "????????????????????????\n"
 -#~ "????????????????????????\n"
-+#~ "tcp\n"
-+#~ "udp"
+Binary files nsapolicycoreutils/po/th.mo and policycoreutils-2.0.62/po/th.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.62/po/th.po
 --- nsapolicycoreutils/po/th.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/th.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/th.po	2009-04-08 22:03:18.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -149512,9 +158228,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/tr.mo and policycoreutils-2.0.62/po/tr.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.62/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/tr.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/tr.po	2009-04-08 22:03:18.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -151455,9 +160172,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/uk.mo and policycoreutils-2.0.62/po/uk.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.62/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/uk.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/uk.po	2009-04-08 22:03:18.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -153438,9 +162156,10 @@
  #~ msgid "Requires value"
  #~ msgstr "???????????????? ?????????????? ????????????????"
  
+Binary files nsapolicycoreutils/po/ur.mo and policycoreutils-2.0.62/po/ur.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.62/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/ur.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/ur.po	2009-04-08 22:03:18.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -155381,9 +164100,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/vi.mo and policycoreutils-2.0.62/po/vi.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.62/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/vi.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/vi.po	2009-04-08 22:03:18.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -157324,9 +166044,10 @@
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
  msgstr ""
+Binary files nsapolicycoreutils/po/zh_CN.mo and policycoreutils-2.0.62/po/zh_CN.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.62/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/zh_CN.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/zh_CN.po	2009-04-08 22:03:18.000000000 -0400
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -159901,9 +168622,10 @@
  
  #: ../gui/translationsPage.py:53
  msgid "Sensitvity Level"
+Binary files nsapolicycoreutils/po/zh_TW.mo and policycoreutils-2.0.62/po/zh_TW.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.62/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/zh_TW.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/zh_TW.po	2009-04-08 22:03:18.000000000 -0400
 @@ -1,32 +1,31 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -164999,9 +173721,10 @@
 +msgid "SELinux user '%s' is required"
 +msgstr "?????? SELinux ?????????%s???"
  
+Binary files nsapolicycoreutils/po/zu.mo and policycoreutils-2.0.62/po/zu.mo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.62/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/zu.po	2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/zu.po	2009-04-08 22:03:18.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- policycoreutils-rhat.patch	31 Mar 2009 12:56:48 -0000	1.412
+++ policycoreutils-rhat.patch	9 Apr 2009 02:05:28 -0000	1.413
@@ -1,6 +1,108 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list
+--- nsapolicycoreutils/debugfiles.list	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.62/debugfiles.list	2009-04-03 14:13:23.000000000 -0400
+@@ -0,0 +1,64 @@
++%dir /usr/lib/debug
++%dir /usr/lib/debug/sbin
++%dir /usr/lib/debug/.build-id
++%dir /usr/lib/debug/.build-id/3d
++%dir /usr/lib/debug/.build-id/ec
++%dir /usr/lib/debug/.build-id/9d
++%dir /usr/lib/debug/.build-id/cb
++%dir /usr/lib/debug/.build-id/bc
++%dir /usr/lib/debug/.build-id/0a
++%dir /usr/lib/debug/.build-id/81
++%dir /usr/lib/debug/.build-id/ad
++%dir /usr/lib/debug/.build-id/7f
++%dir /usr/lib/debug/.build-id/f4
++%dir /usr/lib/debug/.build-id/15
++%dir /usr/lib/debug/.build-id/1d
++%dir /usr/lib/debug/.build-id/a8
++%dir /usr/lib/debug/.build-id/d3
++%dir /usr/lib/debug/usr
++%dir /usr/lib/debug/usr/sbin
++%dir /usr/lib/debug/usr/bin
++/usr/lib/debug/sbin/setfiles.debug
++/usr/lib/debug/sbin/restorecon.debug
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug
++/usr/lib/debug/usr/sbin/load_policy.debug
++/usr/lib/debug/usr/sbin/restorecond.debug
++/usr/lib/debug/usr/sbin/semodule.debug
++/usr/lib/debug/usr/sbin/sestatus.debug
++/usr/lib/debug/usr/sbin/setsebool.debug
++/usr/lib/debug/usr/sbin/open_init_pty.debug
++/usr/lib/debug/usr/sbin/run_init.debug
++/usr/lib/debug/usr/bin/semodule_package.debug
++/usr/lib/debug/usr/bin/newrole.debug
++/usr/lib/debug/usr/bin/semodule_link.debug
++/usr/lib/debug/usr/bin/semodule_deps.debug
++/usr/lib/debug/usr/bin/semodule_expand.debug
++/usr/lib/debug/usr/bin/secon.debug
++/usr/src/debug/policycoreutils-2.0.62
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debuglinks.list policycoreutils-2.0.62/debuglinks.list
+--- nsapolicycoreutils/debuglinks.list	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.62/debuglinks.list	2009-04-03 14:13:23.000000000 -0400
+@@ -0,0 +1,29 @@
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 /sbin/setfiles
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug /usr/lib/debug/sbin/setfiles.debug
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 /usr/sbin/open_init_pty
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug /usr/lib/debug/usr/sbin/open_init_pty.debug
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 /usr/sbin/sestatus
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug /usr/lib/debug/usr/sbin/sestatus.debug
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 /usr/sbin/semodule
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug /usr/lib/debug/usr/sbin/semodule.debug
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 /usr/sbin/load_policy
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug /usr/lib/debug/usr/sbin/load_policy.debug
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b /usr/sbin/run_init
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug /usr/lib/debug/usr/sbin/run_init.debug
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a /usr/sbin/restorecond
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug /usr/lib/debug/usr/sbin/restorecond.debug
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab /usr/sbin/setsebool
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug /usr/lib/debug/usr/sbin/setsebool.debug
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 /usr/bin/secon
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug /usr/lib/debug/usr/bin/secon.debug
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f /usr/bin/newrole
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug /usr/lib/debug/usr/bin/newrole.debug
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 /usr/bin/semodule_link
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug /usr/lib/debug/usr/bin/semodule_link.debug
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be /usr/bin/semodule_expand
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug /usr/lib/debug/usr/bin/semodule_expand.debug
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce /usr/bin/semodule_package
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug /usr/lib/debug/usr/bin/semodule_package.debug
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 /usr/bin/semodule_deps
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug /usr/lib/debug/usr/bin/semodule_deps.debug
++/usr/lib/debug/sbin/restorecon.debug /usr/lib/debug/sbin/setfiles.debug
+Binary files nsapolicycoreutils/debugsources.list and policycoreutils-2.0.62/debugsources.list differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/Makefile	2009-02-18 16:52:27.000000000 -0500
++++ policycoreutils-2.0.62/Makefile	2009-04-03 14:12:56.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -9,7 +111,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/restorecond/restorecond.conf	2009-02-23 11:32:21.000000000 -0500
++++ policycoreutils-2.0.62/restorecond/restorecond.conf	2009-04-03 14:12:56.000000000 -0400
 @@ -5,3 +5,7 @@
  /var/run/utmp
  /var/log/wtmp
@@ -20,7 +122,7 @@
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/fixfiles	2009-02-19 10:07:49.000000000 -0500
++++ policycoreutils-2.0.62/scripts/fixfiles	2009-04-03 14:12:56.000000000 -0400
 @@ -122,7 +122,7 @@
  fi
  if [ ! -z "$RPMFILES" ]; then
@@ -32,8 +134,98 @@
  fi
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/semanage	2009-03-12 09:22:45.000000000 -0400
-@@ -464,10 +464,10 @@
++++ policycoreutils-2.0.62/semanage/semanage	2009-04-08 21:39:50.000000000 -0400
+@@ -50,7 +50,7 @@
+ semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
+ semanage interface -{a|d|m} [-tr] interface_spec
+ semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
+-semanage fcontext -{a|d|m} [-frst] file_spec
++semanage fcontext -{a|d|m} [-frst] [-e path ] file_spec
+ semanage translation -{a|d|m} [-T] level
+ semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
+ semanage permissive -{d|a} type
+@@ -84,6 +84,7 @@
+         -F, --file       Treat target as an input file for command, change multiple settings
+ 	-p, --proto      Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
+ 	-M, --mask       Netmask
++        -e, --equil      Make target equil to this paths labeling
+ 	-P, --prefix     Prefix for home directory labeling
+ 	-L, --level      Default SELinux Level (MLS/MCS Systems only)
+ 	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")
+@@ -115,7 +116,7 @@
+ 		valid_option["node"] = []
+ 		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
+ 		valid_option["fcontext"] = []
+-		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
++		valid_option["fcontext"] += valid_everyone + [ '-e', '--equil', '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+ 		valid_option["translation"] = []
+ 		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
+ 		valid_option["boolean"] = []
+@@ -192,6 +193,7 @@
+ 		locallist = False
+ 		use_file = False
+                 store = ""
++                equil=""
+ 			
+ 		object = argv[0]
+ 		option_dict=get_options()
+@@ -201,10 +203,11 @@
+ 		args = argv[1:]
+ 
+ 		gopts, cmds = getopt.getopt(args,
+-					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
++					    '01ade:f:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
+ 					    ['add',
+ 					     'delete',
+ 					     'deleteall',
++					     'equil=',
+ 					     'ftype=',
+ 					     'file',
+ 					     'help',
+@@ -248,6 +251,9 @@
+ 			if o == "-f"  or o == "--ftype":
+ 				ftype=a
+ 
++			if o == "-e"  or o == "--equil":
++				equil=a
++
+ 			if o == "-F"  or o == "--file":
+ 				use_file = True
+ 
+@@ -366,7 +372,10 @@
+ 				OBJECT.add(target, mask, proto, serange, setype)
+ 
+ 			if object == "fcontext":
+-				OBJECT.add(target, setype, ftype, serange, seuser)
++                                if equil == "":
++                                       OBJECT.add(target, setype, ftype, serange, seuser)
++                                else:
++                                       OBJECT.add_equil(target, equil)
+ 			if object == "permissive":
+ 				OBJECT.add(target)
+ 
+@@ -396,7 +405,10 @@
+ 				OBJECT.modify(target, mask, proto, serange, setype)
+ 
+ 			if object == "fcontext":
+-				OBJECT.modify(target, setype, ftype, serange, seuser)
++                                if equil == "":
++                                       OBJECT.modify(target, setype, ftype, serange, seuser)
++                                else:
++                                       OBJECT.modify_equil(target, equil)
+ 
+                         return
+ 
+@@ -405,7 +417,7 @@
+ 				OBJECT.delete(target, proto)
+ 
+ 			elif object == "fcontext":
+-				OBJECT.delete(target, ftype)
++                                OBJECT.delete(target, ftype)
+ 
+ 			elif object == "node":
+ 				OBJECT.delete(target, mask, proto)
+@@ -464,10 +476,10 @@
                        else:
                               fd = open(input, 'r')
                        trans = seobject.semanageRecords(store)
@@ -48,7 +240,91 @@
  			
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/seobject.py	2009-03-31 08:54:25.000000000 -0400
++++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-08 22:01:48.000000000 -0400
+@@ -23,14 +23,14 @@
+ 
+ import pwd, grp, string, selinux, tempfile, os, re, sys
+ from semanage import *;
+-PROGNAME="policycoreutils"
++PROGNAME = "policycoreutils"
+ import sepolgen.module as module
+ 
+ import gettext
+ gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+ gettext.textdomain(PROGNAME)
+ try:
+-       gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
++       gettext.install(PROGNAME, localedir = "/usr/share/locale", unicode = 1)
+ except IOError:
+        import __builtin__
+        __builtin__.__dict__['_'] = unicode
+@@ -96,7 +96,7 @@
+ 			self.audit_fd = audit.audit_open()
+ 
+ 		def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
+-			audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],str(msg), name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
++			audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0], str(msg), name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
+ except:
+ 	class logger:
+ 		def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
+@@ -104,7 +104,7 @@
+ 				message = "Successful: "
+ 			else:
+ 				message = "Failed: "
+-			message += " %s name=%s" % (msg,name)
++			message += " %s name=%s" % (msg, name)
+ 			if sename != "":
+ 				message += " sename=" + sename
+ 			if old_sename != "":
+@@ -123,9 +123,9 @@
+ 
+ import xml.etree.ElementTree
+ 
+-booleans_dict={}
++booleans_dict = {}
+ try:
+-       tree=xml.etree.ElementTree.parse("/usr/share/selinux/devel/policy.xml")
++       tree = xml.etree.ElementTree.parse("/usr/share/selinux/devel/policy.xml")
+        for l in  tree.findall("layer"):
+               for m in  l.findall("module"):
+                      for b in  m.findall("tunable"):
+@@ -160,12 +160,12 @@
+ 	cat_range = category + "(\." + category +")?"
+ 	categories = cat_range + "(\," + cat_range + ")*"
+ 	reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?"
+-	return re.search("^" + reg +"$",raw)
++	return re.search("^" + reg +"$", raw)
+ 
+ def translate(raw, prepend = 1):
+-        filler="a:b:c:"
++        filler = "a:b:c:"
+         if prepend == 1:
+-		context = "%s%s" % (filler,raw)
++		context = "%s%s" % (filler, raw)
+ 	else:
+ 		context = raw
+ 	(rc, trans) = selinux.selinux_raw_to_trans_context(context)
+@@ -179,9 +179,9 @@
+ 		return trans
+ 	
+ def untranslate(trans, prepend = 1):
+-        filler="a:b:c:"
++        filler = "a:b:c:"
+  	if prepend == 1:
+-		context = "%s%s" % (filler,trans)
++		context = "%s%s" % (filler, trans)
+ 	else:
+ 		context = trans
+ 
+@@ -234,7 +234,7 @@
+ 			rec += "%s=%s\n" %  (k, self.ddict[k])
+ 		return rec
+ 	
+-	def list(self,heading = 1, locallist = 0):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
+ 		keys = self.ddict.keys()
 @@ -281,15 +281,20 @@
                 global handle
                        
@@ -56,8 +332,9 @@
 -                      self.transaction = True
                        self.sh = handle
                 else:
-                       self.sh=get_handle(store)
+-                      self.sh=get_handle(store)
 -                      self.transaction = False
++                      self.sh = get_handle(store)
 +               self.transaction = False
  
          def deleteall(self):
@@ -85,6 +362,15 @@
  class permissiveRecords(semanageRecords):
  	def __init__(self, store):
                 semanageRecords.__init__(self, store)
+@@ -320,7 +331,7 @@
+                              l.append(name.split("permissive_")[1])
+                return l
+ 
+-	def list(self,heading = 1, locallist = 0):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "\n%-25s\n" % (_("Permissive Types"))
+                 for t in self.get_all():
 @@ -328,6 +339,7 @@
  
  
@@ -93,6 +379,15 @@
                 name = "permissive_%s" % type
                 dirname = "/var/lib/selinux"
                 os.chdir(dirname)
+@@ -341,7 +353,7 @@
+ 
+ permissive %s;
+ """ % (name, type, type)
+-               fd = open(filename,'w')
++               fd = open(filename, 'w')
+                fd.write(modtxt)
+                fd.close()
+                mc = module.ModuleCompiler()
 @@ -351,16 +363,19 @@
                 fd.close()
  
@@ -104,7 +399,8 @@
 +               if rc >= 0:
 +                      self.commit()
  
-                for root, dirs, files in os.walk("tmp", topdown=False):
+-               for root, dirs, files in os.walk("tmp", topdown=False):
++               for root, dirs, files in os.walk("tmp", topdown = False):
                        for name in files:
                               os.remove(os.path.join(root, name))
                        for name in dirs:
@@ -117,3 +413,577 @@
  
  	def delete(self, name):
                 for n in name.split():
+@@ -390,11 +405,11 @@
+ 		if sename == "":
+ 			sename = "user_u"
+ 			
+-		(rc,k) = semanage_seuser_key_create(self.sh, name)
++		(rc, k) = semanage_seuser_key_create(self.sh, name)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create a key for %s") % name)
+ 
+-		(rc,exists) = semanage_seuser_exists(self.sh, k)
++		(rc, exists) = semanage_seuser_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+ 		if exists:
+@@ -410,7 +425,7 @@
+                        except:
+                               raise ValueError(_("Linux User %s does not exist") % name)
+ 
+-                (rc,u) = semanage_seuser_create(self.sh)
++                (rc, u) = semanage_seuser_create(self.sh)
+                 if rc < 0:
+                        raise ValueError(_("Could not create login mapping for %s") % name)
+ 
+@@ -450,17 +465,17 @@
+                if sename == "" and serange == "":
+                       raise ValueError(_("Requires seuser or serange"))
+ 
+-               (rc,k) = semanage_seuser_key_create(self.sh, name)
++               (rc, k) = semanage_seuser_key_create(self.sh, name)
+                if rc < 0:
+                       raise ValueError(_("Could not create a key for %s") % name)
+ 
+-               (rc,exists) = semanage_seuser_exists(self.sh, k)
++               (rc, exists) = semanage_seuser_exists(self.sh, k)
+                if rc < 0:
+                       raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+                if not exists:
+                       raise ValueError(_("Login mapping for %s is not defined") % name)
+ 
+-               (rc,u) = semanage_seuser_query(self.sh, k)
++               (rc, u) = semanage_seuser_query(self.sh, k)
+                if rc < 0:
+                       raise ValueError(_("Could not query seuser for %s") % name)
+ 
+@@ -483,7 +498,7 @@
+                semanage_seuser_key_free(k)
+                semanage_seuser_free(u)
+ 
+-               mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
++               mylog.log(1, "modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
+ 
+ 	def modify(self, name, sename = "", serange = ""):
+ 		try:
+@@ -492,21 +507,21 @@
+                         self.commit()
+ 
+ 		except ValueError, error:
+-			mylog.log(0,"modify selinux user mapping", name, sename,"", serange, "", "", "");
++			mylog.log(0, "modify selinux user mapping", name, sename, "", serange, "", "", "");
+ 			raise error
+ 		
+ 	def __delete(self, name):
+-               (rc,k) = semanage_seuser_key_create(self.sh, name)
++               (rc, k) = semanage_seuser_key_create(self.sh, name)
+                if rc < 0:
+                       raise ValueError(_("Could not create a key for %s") % name)
+ 
+-               (rc,exists) = semanage_seuser_exists(self.sh, k)
++               (rc, exists) = semanage_seuser_exists(self.sh, k)
+                if rc < 0:
+                       raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+                if not exists:
+                       raise ValueError(_("Login mapping for %s is not defined") % name)
+ 
+-               (rc,exists) = semanage_seuser_exists_local(self.sh, k)
++               (rc, exists) = semanage_seuser_exists_local(self.sh, k)
+                if rc < 0:
+                       raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+                if not exists:
+@@ -525,10 +540,10 @@
+                        self.commit()
+ 
+ 		except ValueError, error:
+-			mylog.log(0,"delete SELinux user mapping", name);
++			mylog.log(0, "delete SELinux user mapping", name);
+ 			raise error
+ 		
+-		mylog.log(1,"delete SELinux user mapping", name);
++		mylog.log(1, "delete SELinux user mapping", name);
+ 
+ 	def get_all(self, locallist = 0):
+ 		ddict = {}
+@@ -578,17 +593,17 @@
+                 if len(roles) < 1:
+                        raise ValueError(_("You must add at least one role for %s") % name)
+                        
+-                (rc,k) = semanage_user_key_create(self.sh, name)
++                (rc, k) = semanage_user_key_create(self.sh, name)
+                 if rc < 0:
+                        raise ValueError(_("Could not create a key for %s") % name)
+ 
+-                (rc,exists) = semanage_user_exists(self.sh, k)
++                (rc, exists) = semanage_user_exists(self.sh, k)
+                 if rc < 0:
+                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+                 if exists:
+                        raise ValueError(_("SELinux user %s is already defined") % name)
+ 
+-                (rc,u) = semanage_user_create(self.sh)
++                (rc, u) = semanage_user_create(self.sh)
+                 if rc < 0:
+                        raise ValueError(_("Could not create SELinux user for %s") % name)
+ 
+@@ -612,7 +627,7 @@
+                 rc = semanage_user_set_prefix(self.sh, u, prefix)
+                 if rc < 0:
+                        raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
+-                (rc,key) = semanage_user_key_extract(self.sh,u)
++                (rc, key) = semanage_user_key_extract(self.sh,u)
+                 if rc < 0:
+                        raise ValueError(_("Could not extract key for %s") % name)
+ 
+@@ -645,17 +660,17 @@
+                        else:
+                               raise ValueError(_("Requires prefix or roles"))
+ 
+-                (rc,k) = semanage_user_key_create(self.sh, name)
++                (rc, k) = semanage_user_key_create(self.sh, name)
+                 if rc < 0:
+                        raise ValueError(_("Could not create a key for %s") % name)
+ 
+-                (rc,exists) = semanage_user_exists(self.sh, k)
++                (rc, exists) = semanage_user_exists(self.sh, k)
+                 if rc < 0:
+                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+                 if not exists:
+                        raise ValueError(_("SELinux user %s is not defined") % name)
+ 
+-                (rc,u) = semanage_user_query(self.sh, k)
++                (rc, u) = semanage_user_query(self.sh, k)
+                 if rc < 0:
+                        raise ValueError(_("Could not query user for %s") % name)
+ 
+@@ -703,17 +718,17 @@
+ 			raise error
+ 
+ 	def __delete(self, name):
+-               (rc,k) = semanage_user_key_create(self.sh, name)
++               (rc, k) = semanage_user_key_create(self.sh, name)
+                if rc < 0:
+                       raise ValueError(_("Could not create a key for %s") % name)
+ 			
+-               (rc,exists) = semanage_user_exists(self.sh, k)
++               (rc, exists) = semanage_user_exists(self.sh, k)
+                if rc < 0:
+                       raise ValueError(_("Could not check if SELinux user %s is defined") % name)		
+                if not exists:
+                       raise ValueError(_("SELinux user %s is not defined") % name)
+ 
+-               (rc,exists) = semanage_user_exists_local(self.sh, k)
++               (rc, exists) = semanage_user_exists_local(self.sh, k)
+                if rc < 0:
+                       raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+                if not exists:
+@@ -795,7 +810,7 @@
+ 			low = int(ports[0])
+ 			high = int(ports[1])
+ 
+-		(rc,k) = semanage_port_key_create(self.sh, low, high, proto_d)
++		(rc, k) = semanage_port_key_create(self.sh, low, high, proto_d)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
+ 		return ( k, proto_d, low, high )
+@@ -812,13 +827,13 @@
+ 
+ 		( k, proto_d, low, high ) = self.__genkey(port, proto)			
+ 
+-		(rc,exists) = semanage_port_exists(self.sh, k)
++		(rc, exists) = semanage_port_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ 		if exists:
+ 			raise ValueError(_("Port %s/%s already defined") % (proto, port))
+ 
+-		(rc,p) = semanage_port_create(self.sh)
++		(rc, p) = semanage_port_create(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create port for %s/%s") % (proto, port))
+ 		
+@@ -871,13 +886,13 @@
+ 
+ 		( k, proto_d, low, high ) = self.__genkey(port, proto)
+ 
+-		(rc,exists) = semanage_port_exists(self.sh, k)
++		(rc, exists) = semanage_port_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ 		if not exists:
+ 			raise ValueError(_("Port %s/%s is not defined") % (proto,port))
+ 	
+-		(rc,p) = semanage_port_query(self.sh, k)
++		(rc, p) = semanage_port_query(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not query port %s/%s") % (proto, port))
+ 
+@@ -926,13 +941,13 @@
+ 
+ 	def __delete(self, port, proto):
+ 		( k, proto_d, low, high ) = self.__genkey(port, proto)
+-		(rc,exists) = semanage_port_exists(self.sh, k)
++		(rc, exists) = semanage_port_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ 		if not exists:
+ 			raise ValueError(_("Port %s/%s is not defined") % (proto, port))
+ 		
+-		(rc,exists) = semanage_port_exists_local(self.sh, k)
++		(rc, exists) = semanage_port_exists_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ 		if not exists:
+@@ -1038,17 +1053,17 @@
+                if ctype == "":
+                        raise ValueError(_("SELinux Type is required"))
+ 
+-               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
++               (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+                if rc < 0:
+                        raise ValueError(_("Could not create key for %s") % addr)
+                if rc < 0:
+                        raise ValueError(_("Could not check if addr %s is defined") % addr)
+ 
+-               (rc,exists) = semanage_node_exists(self.sh, k)
++               (rc, exists) = semanage_node_exists(self.sh, k)
+                if exists:
+                        raise ValueError(_("Addr %s already defined") % addr)
+ 
+-               (rc,node) = semanage_node_create(self.sh)
++               (rc, node) = semanage_node_create(self.sh)
+                if rc < 0:
+                        raise ValueError(_("Could not create addr for %s") % addr)
+ 
+@@ -1113,17 +1128,17 @@
+                if serange == "" and setype == "":
+                        raise ValueError(_("Requires setype or serange"))
+ 
+-               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
++               (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+                if rc < 0:
+                        raise ValueError(_("Could not create key for %s") % addr)
+ 
+-               (rc,exists) = semanage_node_exists(self.sh, k)
++               (rc, exists) = semanage_node_exists(self.sh, k)
+                if rc < 0:
+                        raise ValueError(_("Could not check if addr %s is defined") % addr)
+                if not exists:
+                        raise ValueError(_("Addr %s is not defined") % addr)
+ 
+-               (rc,node) = semanage_node_query(self.sh, k)
++               (rc, node) = semanage_node_query(self.sh, k)
+                if rc < 0:
+                        raise ValueError(_("Could not query addr %s") % addr)
+ 
+@@ -1160,17 +1175,17 @@
+                else:
+                       raise ValueError(_("Unknown or missing protocol"))
+ 
+-               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
++               (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+                if rc < 0:
+                        raise ValueError(_("Could not create key for %s") % addr)
+ 
+-               (rc,exists) = semanage_node_exists(self.sh, k)
++               (rc, exists) = semanage_node_exists(self.sh, k)
+                if rc < 0:
+                        raise ValueError(_("Could not check if addr %s is defined") % addr)
+                if not exists:
+                        raise ValueError(_("Addr %s is not defined") % addr)
+ 
+-               (rc,exists) = semanage_node_exists_local(self.sh, k)
++               (rc, exists) = semanage_node_exists_local(self.sh, k)
+                if rc < 0:
+                        raise ValueError(_("Could not check if addr %s is defined") % addr)
+                if not exists:
+@@ -1240,17 +1255,17 @@
+ 		if ctype == "":
+ 			raise ValueError(_("SELinux Type is required"))
+ 
+-		(rc,k) = semanage_iface_key_create(self.sh, interface)
++		(rc, k) = semanage_iface_key_create(self.sh, interface)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create key for %s") % interface)
+ 
+-		(rc,exists) = semanage_iface_exists(self.sh, k)
++		(rc, exists) = semanage_iface_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if interface %s is defined") % interface)
+ 		if exists:
+ 			raise ValueError(_("Interface %s already defined") % interface)
+ 
+-		(rc,iface) = semanage_iface_create(self.sh)
++		(rc, iface) = semanage_iface_create(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create interface for %s") % interface)
+ 		
+@@ -1301,17 +1316,17 @@
+ 		if serange == "" and setype == "":
+ 			raise ValueError(_("Requires setype or serange"))
+ 
+-		(rc,k) = semanage_iface_key_create(self.sh, interface)
++		(rc, k) = semanage_iface_key_create(self.sh, interface)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create key for %s") % interface)
+ 
+-		(rc,exists) = semanage_iface_exists(self.sh, k)
++		(rc, exists) = semanage_iface_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if interface %s is defined") % interface)
+ 		if not exists:
+ 			raise ValueError(_("Interface %s is not defined") % interface)
+ 	
+-		(rc,iface) = semanage_iface_query(self.sh, k)
++		(rc, iface) = semanage_iface_query(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not query interface %s") % interface)
+ 
+@@ -1335,17 +1350,17 @@
+                 self.commit()
+ 
+ 	def __delete(self, interface):
+-		(rc,k) = semanage_iface_key_create(self.sh, interface)
++		(rc, k) = semanage_iface_key_create(self.sh, interface)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create key for %s") % interface)
+ 
+-		(rc,exists) = semanage_iface_exists(self.sh, k)
++		(rc, exists) = semanage_iface_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if interface %s is defined") % interface)
+ 		if not exists:
+ 			raise ValueError(_("Interface %s is not defined") % interface)
+ 
+-		(rc,exists) = semanage_iface_exists_local(self.sh, k)
++		(rc, exists) = semanage_iface_exists_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if interface %s is defined") % interface)
+ 		if not exists:
+@@ -1393,6 +1408,40 @@
+ class fcontextRecords(semanageRecords):
+ 	def __init__(self, store = ""):
+ 		semanageRecords.__init__(self, store)
++                self.equiv = {}
++                fd = open(selinux.selinux_file_context_subs_path(), "r")
++                for i in fd.readlines():
++                       src, dst = i.split()
++                       self.equiv[src] = dst
++                fd.close()
++                self.equil_ind = False
++
++        def commit(self):
++                if self.equil_ind:
++                       tmpfile = "%s.tmp" % selinux.selinux_file_context_subs_path()
++                       fd = open(tmpfile, "w")
++                       for src in self.equiv.keys():
++                              fd.write("%s %s\n" % (src, self.equiv[src]))
++                       fd.close()
++                       os.rename(tmpfile,selinux.selinux_file_context_subs_path())
++                       self.equil_ind = False
++		semanageRecords.commit(self)
++
++        def add_equil(self, src, dst):
++                self.begin()
++                if src in self.equiv.keys():
++                       raise ValueError(_("Equivalence class for %s already exists") % src)
++                self.equiv[src] = dst
++                self.equil_ind = True
++                self.commit()
++
++        def modify_equil(self, src, dst):
++                self.begin()
++                if src not in self.equiv.keys():
++                       raise ValueError(_("Equivalence class for %s does not exists") % src)
++                self.equiv[src] = dst
++                self.equil_ind = True
++                self.commit()
+ 
+         def createcon(self, target, seuser = "system_u"):
+                 (rc, con) = semanage_context_create(self.sh)
+@@ -1429,23 +1478,23 @@
+ 		if type == "":
+ 			raise ValueError(_("SELinux Type is required"))
+ 
+-		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
++		(rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create key for %s") % target)
+ 
+-		(rc,exists) = semanage_fcontext_exists(self.sh, k)
++		(rc, exists) = semanage_fcontext_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 
+ 		if not exists:
+-                       (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++                       (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
+                        if rc < 0:
+                               raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 
+                 if exists:
+                        raise ValueError(_("File context for %s already defined") % target)
+ 
+-		(rc,fcontext) = semanage_fcontext_create(self.sh)
++		(rc, fcontext) = semanage_fcontext_create(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create file context for %s") % target)
+ 		
+@@ -1486,21 +1535,21 @@
+ 			raise ValueError(_("Requires setype, serange or seuser"))
+                 self.validate(target)
+ 
+-		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
++		(rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create a key for %s") % target)
+ 
+-		(rc,exists) = semanage_fcontext_exists(self.sh, k)
++		(rc, exists) = semanage_fcontext_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 		if not exists:
+-                       (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++                       (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
+                        if not exists:
+                               raise ValueError(_("File context for %s is not defined") % target)
+ 		
+-		(rc,fcontext) = semanage_fcontext_query_local(self.sh, k)
++		(rc, fcontext) = semanage_fcontext_query_local(self.sh, k)
+ 		if rc < 0:
+-                       (rc,fcontext) = semanage_fcontext_query(self.sh, k)
++                       (rc, fcontext) = semanage_fcontext_query(self.sh, k)
+                        if rc < 0:
+                               raise ValueError(_("Could not query file context for %s") % target)
+ 
+@@ -1550,7 +1599,7 @@
+                        target = semanage_fcontext_get_expr(fcontext)
+                        ftype = semanage_fcontext_get_type(fcontext)
+                        ftype_str = semanage_fcontext_get_type_str(ftype)
+-                       (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
++                       (rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
+                        if rc < 0:
+                               raise ValueError(_("Could not create a key for %s") % target)
+ 
+@@ -1558,19 +1607,26 @@
+                        if rc < 0:
+                               raise ValueError(_("Could not delete the file context %s") % target)
+                        semanage_fcontext_key_free(k)
+-	
++
++                self.equiv = {}
++                self.equil_ind = True
+                 self.commit()
+ 
+ 	def __delete(self, target, ftype):
+-		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
++                if target in self.equiv.keys():
++                       self.equiv.pop(target)
++                       self.equil_ind = True
++                       return
++
++		(rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create a key for %s") % target)
+ 
+-		(rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++		(rc, exists) = semanage_fcontext_exists_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 		if not exists:
+-			(rc,exists) = semanage_fcontext_exists(self.sh, k)
++			(rc, exists) = semanage_fcontext_exists(self.sh, k)
+ 			if rc < 0:
+ 				raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 			if exists:
+@@ -1617,11 +1673,11 @@
+ 		return ddict
+ 			
+ 	def list(self, heading = 1, locallist = 0 ):
+-		if heading:
+-			print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+ 		fcon_dict = self.get_all(locallist)
+                 keys = fcon_dict.keys()
+                 keys.sort()
++                if len(keys) > 0 and heading:
++			print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+ 		for k in keys:
+ 			if fcon_dict[k]:
+ 				if is_mls_enabled:
+@@ -1630,11 +1686,17 @@
+ 					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
+ 			else:
+ 				print "%-50s %-18s <<None>>" % (k[0], k[1])
++                if len(self.equiv.keys()) > 0:
++                       if heading:
++                              print _("\nSELinux fcontext Equivalence \n")
++                       
++                       for src in self.equiv.keys():
++                              print "%s == %s" % (src, self.equiv[src])
+ 				
+ class booleanRecords(semanageRecords):
+ 	def __init__(self, store = ""):
+ 		semanageRecords.__init__(self, store)
+-                self.dict={}
++                self.dict = {}
+                 self.dict["TRUE"] = 1
+                 self.dict["FALSE"] = 0
+                 self.dict["ON"] = 1
+@@ -1643,16 +1705,16 @@
+                 self.dict["0"] = 0
+ 
+ 	def __mod(self, name, value):
+-                (rc,k) = semanage_bool_key_create(self.sh, name)
++                (rc, k) = semanage_bool_key_create(self.sh, name)
+                 if rc < 0:
+                        raise ValueError(_("Could not create a key for %s") % name)
+-                (rc,exists) = semanage_bool_exists(self.sh, k)
++                (rc, exists) = semanage_bool_exists(self.sh, k)
+                 if rc < 0:
+                        raise ValueError(_("Could not check if boolean %s is defined") % name)
+                 if not exists:
+                        raise ValueError(_("Boolean %s is not defined") % name)	
+                 
+-                (rc,b) = semanage_bool_query(self.sh, k)
++                (rc, b) = semanage_bool_query(self.sh, k)
+                 if rc < 0:
+                        raise ValueError(_("Could not query file context %s") % name)
+ 
+@@ -1670,7 +1732,7 @@
+ 		semanage_bool_key_free(k)
+ 		semanage_bool_free(b)
+ 
+-	def modify(self, name, value=None, use_file=False):
++	def modify(self, name, value = None, use_file = False):
+                 
+                 self.begin()
+ 
+@@ -1694,16 +1756,16 @@
+ 		
+ 	def __delete(self, name):
+ 
+-                (rc,k) = semanage_bool_key_create(self.sh, name)
++                (rc, k) = semanage_bool_key_create(self.sh, name)
+                 if rc < 0:
+                       raise ValueError(_("Could not create a key for %s") % name)
+-		(rc,exists) = semanage_bool_exists(self.sh, k)
++		(rc, exists) = semanage_bool_exists(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if boolean %s is defined") % name)
+ 		if not exists:
+ 			raise ValueError(_("Boolean %s is not defined") % name)
+ 	
+-		(rc,exists) = semanage_bool_exists_local(self.sh, k)
++		(rc, exists) = semanage_bool_exists_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if boolean %s is defined") % name)
+ 		if not exists:
+@@ -1762,7 +1824,7 @@
+                       return _("unknown")
+ 
+ 	def list(self, heading = True, locallist = False, use_file = False):
+-                on_off = (_("off"),_("on")) 
++                on_off = (_("off"), _("on")) 
+ 		if use_file:
+                        ddict = self.get_all(locallist)
+                        keys = ddict.keys()

policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policycoreutils-sepolgen.patch	18 Feb 2009 21:54:39 -0000	1.21
+++ policycoreutils-sepolgen.patch	9 Apr 2009 02:05:30 -0000	1.22
@@ -1,3 +1,15 @@
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py
+--- nsasepolgen/src/sepolgen/access.py	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py	2009-04-01 10:03:43.000000000 -0400
+@@ -313,7 +313,7 @@
+ 
+     def __len__(self):
+         """Return the unique number of role allow statements."""
+-        return len(self.role_type.keys())
++        return len(self.role_types.keys())
+ 
+     def add(self, role, type):
+         if self.role_types.has_key(role):
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-02-18 16:52:27.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -r1.599 -r1.600
--- policycoreutils.spec	31 Mar 2009 12:56:49 -0000	1.599
+++ policycoreutils.spec	9 Apr 2009 02:05:30 -0000	1.600
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,10 @@
 fi
 
 %changelog
+* Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-8
+- Update po files
+- Add --equiv command for semanage
+
 * Tue Mar 31 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-7
 - Cleanup creation of permissive domains
 - Update po files



From kevin at fedoraproject.org  Thu Apr  9 02:24:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 02:24:33 +0000 (UTC)
Subject: rpms/rdiff-backup/F-10 rdiff-backup.spec, 1.27, 1.28 sources, 1.14, 
	1.15 .cvsignore, 1.13, 1.14
Message-ID: <20090409022433.0A5107001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30069

Modified Files:
	rdiff-backup.spec sources .cvsignore 
Log Message:
Update to 1.2.8



Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/rdiff-backup.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rdiff-backup.spec	14 Mar 2009 19:19:41 -0000	1.27
+++ rdiff-backup.spec	9 Apr 2009 02:24:02 -0000	1.28
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.2.7
+Version: 1.2.8
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,7 +56,10 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
-* Thu Mar 12 2009 Kevin Fenzi <kevin at tummy.com> 1.2.7-1
+* Thu Mar 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.8-1
+- Update to 1.2.8
+
+* Thu Mar 12 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.7-1
 - Update to 1.2.7 (bug 486426)
 
 * Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	14 Mar 2009 19:19:41 -0000	1.14
+++ sources	9 Apr 2009 02:24:02 -0000	1.15
@@ -1 +1 @@
-fac7665e360bc1821d65153e785c2ec1  rdiff-backup-1.2.7.tar.gz
+1a94dc537fcf74d6a3a80bd27808e77b  rdiff-backup-1.2.8.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Mar 2009 19:19:41 -0000	1.13
+++ .cvsignore	9 Apr 2009 02:24:02 -0000	1.14
@@ -1 +1 @@
-rdiff-backup-1.2.7.tar.gz
+rdiff-backup-1.2.8.tar.gz



From kevin at fedoraproject.org  Thu Apr  9 02:27:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 02:27:43 +0000 (UTC)
Subject: rpms/rdiff-backup/F-9 sources, 1.14, 1.15 .cvsignore, 1.13,
	1.14 rdiff-backup.spec, 1.26, 1.27
Message-ID: <20090409022743.CB6B77001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30743

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.8



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	14 Mar 2009 19:32:04 -0000	1.14
+++ sources	9 Apr 2009 02:27:13 -0000	1.15
@@ -1 +1 @@
-fac7665e360bc1821d65153e785c2ec1  rdiff-backup-1.2.7.tar.gz
+1a94dc537fcf74d6a3a80bd27808e77b  rdiff-backup-1.2.8.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Mar 2009 19:32:04 -0000	1.13
+++ .cvsignore	9 Apr 2009 02:27:13 -0000	1.14
@@ -1 +1 @@
-rdiff-backup-1.2.7.tar.gz
+rdiff-backup-1.2.8.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/rdiff-backup.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rdiff-backup.spec	14 Mar 2009 19:32:04 -0000	1.26
+++ rdiff-backup.spec	9 Apr 2009 02:27:13 -0000	1.27
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.2.7
+Version: 1.2.8
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,7 +56,10 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
-* Thu Mar 12 2009 Kevin Fenzi <kevin at tummy.com> 1.2.7-1
+* Thu Mar 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.8-1
+- Update to 1.2.8
+
+* Thu Mar 12 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.7-1
 - Update to 1.2.7 (bug 486426)
 
 * Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1



From dcbw at fedoraproject.org  Thu Apr  9 02:44:57 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu,  9 Apr 2009 02:44:57 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.102,
	1.103 NetworkManager.spec, 1.269, 1.270 sources, 1.139, 1.140
Message-ID: <20090409024457.DD9707001C@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2274

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
- nm: fix handling of spaces in DHCP 'domain-search' option
- nm: fix detection of newer Option 'hso' devices
- nm: ignore low MTUs returned by broken DHCP servers




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	5 Apr 2009 12:41:15 -0000	1.102
+++ .cvsignore	9 Apr 2009 02:44:27 -0000	1.103
@@ -149,3 +149,5 @@
 network-manager-applet-0.7.0.99.svn1235.tar.bz2
 NetworkManager-0.7.0.100.tar.bz2
 network-manager-applet-0.7.0.100.tar.bz2
+NetworkManager-0.7.0.100.git20090408.tar.bz2
+network-manager-applet-0.7.0.100.svn1260.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- NetworkManager.spec	5 Apr 2009 12:58:09 -0000	1.269
+++ NetworkManager.spec	9 Apr 2009 02:44:27 -0000	1.270
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20090408
+%define applet_snapshot .svn1260
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0.100
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -326,6 +326,12 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
+- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
+- nm: fix handling of spaces in DHCP 'domain-search' option
+- nm: fix detection of newer Option 'hso' devices
+- nm: ignore low MTUs returned by broken DHCP servers
+
 * Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
 - Update to 0.7.1-rc4
 - nm: use PolicyKit for system connection secrets retrieval


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- sources	5 Apr 2009 12:41:16 -0000	1.139
+++ sources	9 Apr 2009 02:44:27 -0000	1.140
@@ -1,2 +1,2 @@
-cc75c0b8b83793050e28ebe39d2c5f57  NetworkManager-0.7.0.100.tar.bz2
-4a332aecf58eefcee33abd39b5038e9e  network-manager-applet-0.7.0.100.tar.bz2
+c88cea4852421c706931c4822344672e  NetworkManager-0.7.0.100.git20090408.tar.bz2
+7d6f7908d96cf786a9bad04c37cb2ea9  network-manager-applet-0.7.0.100.svn1260.tar.bz2



From dcbw at fedoraproject.org  Thu Apr  9 02:47:41 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu,  9 Apr 2009 02:47:41 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 NetworkManager.spec, 1.265, 1.266 sources, 
	1.137, 1.138
Message-ID: <20090409024741.F0C907001C@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2683

Modified Files:
	NetworkManager.spec sources 
Log Message:
* Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
- nm: fix handling of spaces in DHCP 'domain-search' option
- nm: fix detection of newer Option 'hso' devices
- nm: ignore low MTUs returned by broken DHCP servers




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- NetworkManager.spec	5 Apr 2009 13:00:40 -0000	1.265
+++ NetworkManager.spec	9 Apr 2009 02:47:11 -0000	1.266
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20090408
+%define applet_snapshot .svn1260
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0.100
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -328,6 +328,12 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
+- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
+- nm: fix handling of spaces in DHCP 'domain-search' option
+- nm: fix detection of newer Option 'hso' devices
+- nm: ignore low MTUs returned by broken DHCP servers
+
 * Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
 - Update to 0.7.1-rc4
 - nm: use PolicyKit for system connection secrets retrieval


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	5 Apr 2009 12:49:18 -0000	1.137
+++ sources	9 Apr 2009 02:47:11 -0000	1.138
@@ -1,2 +1,2 @@
-cc75c0b8b83793050e28ebe39d2c5f57  NetworkManager-0.7.0.100.tar.bz2
-4a332aecf58eefcee33abd39b5038e9e  network-manager-applet-0.7.0.100.tar.bz2
+c88cea4852421c706931c4822344672e  NetworkManager-0.7.0.100.git20090408.tar.bz2
+7d6f7908d96cf786a9bad04c37cb2ea9  network-manager-applet-0.7.0.100.svn1260.tar.bz2



From dcbw at fedoraproject.org  Thu Apr  9 02:48:36 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu,  9 Apr 2009 02:48:36 +0000 (UTC)
Subject: rpms/NetworkManager/F-9 NetworkManager.spec, 1.258, 1.259 sources, 
	1.135, 1.136
Message-ID: <20090409024836.0805B7001C@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2900

Modified Files:
	NetworkManager.spec sources 
Log Message:
* Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
- nm: fix handling of spaces in DHCP 'domain-search' option
- nm: fix detection of newer Option 'hso' devices
- nm: ignore low MTUs returned by broken DHCP servers




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- NetworkManager.spec	5 Apr 2009 13:09:25 -0000	1.258
+++ NetworkManager.spec	9 Apr 2009 02:48:05 -0000	1.259
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20090408
+%define applet_snapshot .svn1260
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0.100
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -335,6 +335,12 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
+- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
+- nm: fix handling of spaces in DHCP 'domain-search' option
+- nm: fix detection of newer Option 'hso' devices
+- nm: ignore low MTUs returned by broken DHCP servers
+
 * Sun Apr  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-1
 - Update to 0.7.1-rc4
 - nm: use PolicyKit for system connection secrets retrieval


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	5 Apr 2009 13:09:26 -0000	1.135
+++ sources	9 Apr 2009 02:48:05 -0000	1.136
@@ -1,2 +1,2 @@
-cc75c0b8b83793050e28ebe39d2c5f57  NetworkManager-0.7.0.100.tar.bz2
-4a332aecf58eefcee33abd39b5038e9e  network-manager-applet-0.7.0.100.tar.bz2
+c88cea4852421c706931c4822344672e  NetworkManager-0.7.0.100.git20090408.tar.bz2
+7d6f7908d96cf786a9bad04c37cb2ea9  network-manager-applet-0.7.0.100.svn1260.tar.bz2



From mclasen at fedoraproject.org  Thu Apr  9 03:04:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  9 Apr 2009 03:04:17 +0000 (UTC)
Subject: rpms/control-center/devel
	gnome-control-center-2.26.0-support-touchpads.patch, NONE,
	1.1 control-center.spec, 1.442, 1.443
Message-ID: <20090409030417.207577001C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4233

Modified Files:
	control-center.spec 
Added Files:
	gnome-control-center-2.26.0-support-touchpads.patch 
Log Message:
Support touchpads


gnome-control-center-2.26.0-support-touchpads.patch:

--- NEW FILE gnome-control-center-2.26.0-support-touchpads.patch ---
diff -up gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.c.support-touchpads gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.c
--- gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.c.support-touchpads	2009-03-16 11:14:59.000000000 -0400
+++ gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.c	2009-04-08 21:54:56.713738066 -0400
@@ -41,6 +41,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <X11/Xatom.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XIproto.h>
 
 #ifdef HAVE_XCURSOR
 #include <X11/Xcursor/Xcursor.h>
@@ -312,6 +315,87 @@ left_handed_to_gconf (GConfPropertyEdito
 	return new_value;
 }
 
+static void
+scrollmethod_radio_button_release_event (GtkWidget *widget,
+					GdkEventButton *event,
+					GladeXML *dialog)
+{
+	gtk_widget_set_sensitive(WID("horiz_scroll_toggle"),
+				(widget != WID("scroll_disabled_radio")));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+}
+
+static GConfValue *
+scroll_method_from_gconf (GConfPropertyEditor *peditor,
+			const GConfValue *value)
+{
+	GConfValue *new_value;
+
+	new_value = gconf_value_new (GCONF_VALUE_INT);
+
+	gconf_value_set_int (new_value, gconf_value_get_int (value));
+
+	return new_value;
+}
+
+static GConfValue *
+scroll_method_to_gconf (GConfPropertyEditor *peditor,
+		      const GConfValue *value)
+{
+	GConfValue *new_value;
+
+	new_value = gconf_value_new (GCONF_VALUE_INT);
+
+	gconf_value_set_int (new_value, gconf_value_get_int (value));
+
+	return new_value;
+}
+
+static gboolean
+find_synaptics()
+{
+	int numdevices, i;
+	gboolean ret = FALSE;
+	XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
+	Atom realtype, prop;
+	int realformat;
+	unsigned long nitems, bytes_after;
+	unsigned char *data;
+
+	prop = XInternAtom(GDK_DISPLAY(), "Synaptics Off", True);
+	if (!prop)
+		return False;
+
+	for (i = 0; i < numdevices; i++) {
+		if (devicelist[i].use != IsXExtensionPointer)
+			continue;
+
+		gdk_error_trap_push();
+		XDevice *device = XOpenDevice (GDK_DISPLAY(),
+					       devicelist[i].id);
+		if (gdk_error_trap_pop())
+			continue;
+
+		gdk_error_trap_push();
+		if ((XGetDeviceProperty(GDK_DISPLAY(), device, prop, 0, 1, False,
+					XA_INTEGER, &realtype, &realformat, &nitems,
+					&bytes_after, &data) == Success) && (realtype != None))
+		{
+			XFree(data);
+			ret = TRUE;
+		}
+		gdk_error_trap_pop();
+
+		XCloseDevice (GDK_DISPLAY(), device);
+
+		if (ret)
+			break;
+	}
+
+	XFreeDeviceList(devicelist);
+	return ret;
+}
+
 /* Set up the property editors in the dialog. */
 static void
 setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
@@ -362,6 +446,33 @@ setup_dialog (GladeXML *dialog, GConfCha
 		(changeset, "/desktop/gnome/peripherals/mouse/drag_threshold", WID ("drag_threshold_scale"),
 		 "conv-to-widget-cb", drag_threshold_from_gconf,
 		 NULL);
+
+	/* Trackpad page */
+	if (find_synaptics() == FALSE)
+		gtk_notebook_remove_page (GTK_NOTEBOOK(WID("prefs_widget")),-1);
+	else {
+		gtk_widget_set_sensitive(WID("disable_w_typing_toggle"),
+					 g_find_program_in_path ("syndaemon"));
+		peditor = gconf_peditor_new_boolean
+			(changeset, "/desktop/gnome/peripherals/touchpad/disable_while_typing", WID ("disable_w_typing_toggle"), NULL);
+		peditor = gconf_peditor_new_boolean
+			(changeset, "/desktop/gnome/peripherals/touchpad/tap_to_click", WID ("tap_to_click_toggle"), NULL);
+		peditor = gconf_peditor_new_boolean
+			(changeset, "/desktop/gnome/peripherals/touchpad/horiz_scroll_enabled", WID ("horiz_scroll_toggle"), NULL);
+		radio = GTK_RADIO_BUTTON (WID ("scroll_disabled_radio"));
+		peditor = gconf_peditor_new_select_radio
+			(changeset, "/desktop/gnome/peripherals/touchpad/scroll_method", gtk_radio_button_get_group (radio),
+			 "conv-to-widget-cb", scroll_method_from_gconf,
+			 "conv-from-widget-cb", scroll_method_to_gconf,
+			 NULL);
+			 g_signal_connect (WID ("scroll_disabled_radio"), "button_release_event",
+				 G_CALLBACK (scrollmethod_radio_button_release_event), dialog);
+			 g_signal_connect (WID ("scroll_edge_radio"), "button_release_event",
+				 G_CALLBACK (scrollmethod_radio_button_release_event), dialog);
+			 g_signal_connect (WID ("scroll_twofinger_radio"), "button_release_event",
+				 G_CALLBACK (scrollmethod_radio_button_release_event), dialog);
+	}
+
 }
 
 /* Construct the dialog */
diff -up gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.glade.support-touchpads gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.glade
--- gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.glade.support-touchpads	2008-08-04 07:30:47.000000000 -0400
+++ gnome-control-center-2.26.0/capplets/mouse/gnome-mouse-properties.glade	2009-04-08 21:13:06.129764811 -0400
@@ -1161,6 +1161,289 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkVBox" id="vbox3">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox15">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox3">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <child>
+                          <widget class="GtkLabel" id="label19">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label">    </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="disable_w_typing_toggle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">_Disable touchpad while typing</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox11">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <child>
+                          <widget class="GtkLabel" id="label22">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label">    </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="tap_to_click_toggle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">Enable mouse _clicks with touchpad</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox19">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkLabel" id="label34">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Scrolling&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox15">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <child>
+                          <widget class="GtkLabel" id="label35">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label">    </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox23">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
+
+                            <child>
+                              <widget class="GtkRadioButton" id="scroll_disabled_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Disabled</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+
+                            <child>
+                              <widget class="GtkRadioButton" id="scroll_edge_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Edge scrolling</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">scroll_disabled_radio</property>
+                              </widget>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+
+                            <child>
+                              <widget class="GtkRadioButton" id="scroll_twofinger_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Two-_finger scrolling</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">scroll_disabled_radio</property>
+                              </widget>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox16">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <child>
+                          <widget class="GtkLabel" id="label36">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label">    </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="horiz_scroll_toggle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">Enable _horizontal scrolling</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Touchpad</property>
+                <property name="justify">GTK_JUSTIFY_CENTER</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- control-center.spec	6 Apr 2009 02:52:14 -0000	1.442
+++ control-center.spec	9 Apr 2009 03:03:46 -0000	1.443
@@ -54,6 +54,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=574973
 Patch34: gcc-new-fingerprint-icons.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=154029
+Patch35: gnome-control-center-2.26.0-support-touchpads.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -177,6 +180,7 @@
 %patch32 -p1 -b .display-no-help
 %patch33 -p1 -b .notification-theme
 %patch34 -p0 -b .new-icons
+%patch35 -p1 -b .support-touchpads
 pushd capplets/about-me
 mv *png icons/
 popd
@@ -198,8 +202,6 @@
 # Add -Wno-error to silence gswitchit
 %configure --disable-static \
 	--disable-scrollkeeper \
-	--enable-gstreamer \
-	--enable-alsa \
 	--enable-aboutme \
 	--disable-update-mimedb \
 	CFLAGS="$RPM_OPT_FLAGS -Wno-error"
@@ -354,6 +356,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
+- Support touchpads
+
 * Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Fix a minor ui issue in the preferred apps capplet (#490421)
 



From mclasen at fedoraproject.org  Thu Apr  9 03:06:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  9 Apr 2009 03:06:26 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.443,1.444
Message-ID: <20090409030626.16BB97001C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5568

Modified Files:
	control-center.spec 
Log Message:
bump rev



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- control-center.spec	9 Apr 2009 03:03:46 -0000	1.443
+++ control-center.spec	9 Apr 2009 03:05:55 -0000	1.444
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops



From pkgdb at fedoraproject.org  Thu Apr  9 03:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 03:07:55 +0000
Subject: [pkgdb] ghc F-11 cloned from devel
Message-ID: <20090409030700.EC16510F862@bastion2.fedora.phx.redhat.com>

petersen cloned ghc F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From mathstuf at fedoraproject.org  Thu Apr  9 03:17:57 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu,  9 Apr 2009 03:17:57 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090409031757.97F327001C@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7092

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Log Message:
Respin tarball


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-networkmanagement.spec	3 Mar 2009 16:35:10 -0000	1.3
+++ kde-plasma-networkmanagement.spec	9 Apr 2009 03:17:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-networkmanagement
 Version:        0.1
-Release:        0.8.20090302svn%{?dist}
+Release:        0.9.20090403svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          User Interface/Desktops
@@ -8,7 +8,7 @@
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 934706 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
+#  svn export -r 951288 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
 #  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Wed Apr 8 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.9.20090403svn
+- Respin snapshot
+
 * Tue Mar 3 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.8.20090302svn
 - Respin snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Mar 2009 16:35:10 -0000	1.3
+++ sources	9 Apr 2009 03:17:27 -0000	1.4
@@ -1 +1 @@
-d4c2dd492777239c45bb42026f0fa48e  kde-plasma-networkmanagement-0.1.tar.bz2
+c03783c451344227f9a38eca15991561  kde-plasma-networkmanagement-0.1.tar.bz2



From mclasen at fedoraproject.org  Thu Apr  9 03:29:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  9 Apr 2009 03:29:13 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring-autostart.patch, NONE,
	1.1 gnome-keyring.spec, 1.120, 1.121
Message-ID: <20090409032913.58B137001C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8585

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-autostart.patch 
Log Message:
fix service activation


gnome-keyring-autostart.patch:

--- NEW FILE gnome-keyring-autostart.patch ---
diff -up gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in.autostart gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in
--- gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in.autostart	2009-04-08 23:23:49.792737030 -0400
+++ gnome-keyring-2.26.0/daemon/org.gnome.keyring.service.in	2009-04-08 23:24:24.201988092 -0400
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.keyring
-Exec=@VALGRIND_RUN@ gnome-keyring-daemon --foreground --components=keyring
+Exec=/usr/bin/gnome-keyring-daemon --foreground --components=keyring


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-keyring.spec	7 Apr 2009 17:23:57 -0000	1.120
+++ gnome-keyring.spec	9 Apr 2009 03:28:43 -0000	1.121
@@ -8,13 +8,16 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.26.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=578448
+Patch0: gnome-keyring-autostart.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
@@ -65,6 +68,7 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .activation
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -141,6 +145,9 @@
 
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
+- Fix service activation
+
 * Tue Apr  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
 - Revert the previous patch since it causes crashes
 



From whot at fedoraproject.org  Thu Apr  9 05:24:42 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  9 Apr 2009 05:24:42 +0000 (UTC)
Subject: rpms/fedora-setup-keyboard/devel
	fedora-setup-keyboard-0.3-merge-terminate.patch, NONE,
	1.1 fedora-setup-keyboard.spec, 1.2, 1.3
Message-ID: <20090409052442.5DFC77001C@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25877

Modified Files:
	fedora-setup-keyboard.spec 
Added Files:
	fedora-setup-keyboard-0.3-merge-terminate.patch 
Log Message:
* Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.3-4
- fedora-setup-keyboard-0.3-merge-terminate.patch: merge xkb options for
  termination.



fedora-setup-keyboard-0.3-merge-terminate.patch:

--- NEW FILE fedora-setup-keyboard-0.3-merge-terminate.patch ---
>From d7fbf641c4e897aefc038d19830e39f992467b08 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 9 Apr 2009 11:04:37 +1000
Subject: [PATCH] Merge input.xkb.options terminate:ctrl_alt_bksp by default.

Prepend to options already existing if necessary.
---
 10-x11-keymap.fdi       |    1 +
 fedora-setup-keyboard.c |   36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/10-x11-keymap.fdi b/10-x11-keymap.fdi
index c78f05b..3c86017 100644
--- a/10-x11-keymap.fdi
+++ b/10-x11-keymap.fdi
@@ -2,6 +2,7 @@
 <deviceinfo version="0.2">
     <device>
 	<match key="info.capabilities" contains="input.keyboard">
+            <merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge>
 	    <append key="info.callouts.add" type="strlist">fedora-setup-keyboard</append>
 	</match>
     </device>
diff --git a/fedora-setup-keyboard.c b/fedora-setup-keyboard.c
index e656983..8af28a0 100644
--- a/fedora-setup-keyboard.c
+++ b/fedora-setup-keyboard.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 
 #define KBDCONFIG "/etc/sysconfig/keyboard"
+#define KEY_OPTIONS "input.xkb.options"
 
 gchar* remove_quotes(gchar *str) {
 	gchar *tmp;
@@ -52,6 +53,34 @@ gchar* remove_quotes(gchar *str) {
 	return tmp;	
 }
 
+/**
+ * Append the given value to the current value of matching key.
+ * Memory for the returned string must be freed by the caller.
+ *
+ * Only mergess input.xkb.options ATM
+ */
+gchar *merge_key(LibHalContext *hal_ctx, gchar *udi, gchar* key, gchar *value) {
+	gchar *xkb_opts;
+	gchar *merged = NULL;
+
+	/* We only need to merge xkb.options */
+	if (strcmp(key, KEY_OPTIONS) != 0)
+		return g_strdup(value);
+	xkb_opts = libhal_device_get_property_string(hal_ctx, udi,
+			KEY_OPTIONS, NULL);
+	if (!xkb_opts || strlen(xkb_opts) == 0)
+		merged = g_strdup(value);
+	else if (!value || strlen(value) == 0)
+		merged = g_strdup(xkb_opts);
+	else
+		merged = g_strdup_printf("%s,%s", xkb_opts, value);
+
+	if (xkb_opts)
+		libhal_free_string(xkb_opts);
+
+	return merged;
+}
+
 int main() {
 	GKeyFile *cfg_file;
 	gchar *buffer, *conf;
@@ -103,16 +132,21 @@ int main() {
 	list = g_strsplit(keytable, " ", 4);
 	n = g_strv_length(list);
 	for ( i = 0; i < n; i++) {
+		gchar *value;
 		/* honor user setting */
 		tmp = g_ascii_strup(map[i], -1);
 		property = remove_quotes(g_key_file_get_value(cfg_file, "kbd", tmp, NULL));
 		g_free(tmp);
 
 		key = g_strdup_printf("input.xkb.%s", map[i]);
-		libhal_device_set_property_string(hal_ctx, udi, key, (property != NULL) ? property : list[i], NULL);
+
+		value = merge_key(hal_ctx, udi, key,
+				  (property != NULL) ? property : list[i]);
+		libhal_device_set_property_string(hal_ctx, udi, key, value, NULL);
 
 		if(property != NULL) 
 			g_free(property);
+		g_free(value);
 		g_free(key);
 		
 	}
-- 
1.6.2.2.447.g4afa7



Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-setup-keyboard.spec	4 Mar 2009 22:53:44 -0000	1.2
+++ fedora-setup-keyboard.spec	9 Apr 2009 05:24:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
 Version:	0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -9,6 +9,8 @@
 Source0:	https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:		fedora-setup-keyboard-0.3-merge-terminate.patch
+
 BuildRequires:	hal-devel
 BuildRequires:	glib2-devel
 BuildRequires:	rhpl
@@ -22,6 +24,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .terminate
 
 
 %build
@@ -44,6 +47,10 @@
 %doc COPYING
 
 %changelog
+* Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.3-4
+- fedora-setup-keyboard-0.3-merge-terminate.patch: merge xkb options for
+  termination.
+
 * Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.3-3
 - Conflict xorg-x11-server-Xorg < 1.6.0-7 (10-x11-keymap.fdi and
   fedora-setup-keyboard up to 1.6.0-5)



From lkundrak at fedoraproject.org  Thu Apr  9 05:29:24 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  9 Apr 2009 05:29:24 +0000 (UTC)
Subject: rpms/skychart/devel skychart-3.0.1.6-units.patch, NONE,
	1.1 skychart.spec, 1.14, 1.15
Message-ID: <20090409052924.60A0F7001C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26803

Modified Files:
	skychart.spec 
Added Files:
	skychart-3.0.1.6-units.patch 
Log Message:
Fix unit path

skychart-3.0.1.6-units.patch:

--- NEW FILE skychart-3.0.1.6-units.patch ---
Target directory is not precreated for every possible arch,
use a generic one.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up skychart-3.0.1.6/skychart/cdc.lpi.units skychart-3.0.1.6/skychart/cdc.lpi
--- skychart-3.0.1.6/skychart/cdc.lpi.units	2009-04-09 07:22:59.381788190 +0200
+++ skychart-3.0.1.6/skychart/cdc.lpi	2009-04-09 07:23:21.763790569 +0200
@@ -434,7 +434,7 @@
       <Filename Value="units/$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)/skychart"/>
     </Target>
     <SearchPaths>
-      <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
+      <UnitOutputDirectory Value="units"/>
       <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
     </SearchPaths>
     <Parsing>


Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- skychart.spec	8 Apr 2009 19:27:32 -0000	1.14
+++ skychart.spec	9 Apr 2009 05:28:54 -0000	1.15
@@ -12,6 +12,7 @@
 Source0:        %{name}-%{version}.tar.lzma
 Source1:        skychart.desktop
 Patch1:         skychart-3.0.1.6-wl.patch
+Patch2:         skychart-3.0.1.6-units.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
@@ -44,6 +45,7 @@
 %{__unzip} -q tools/doc/wiki_doc.zip -d tools/doc
 
 %patch1 -p1 -b .wl
+%patch2 -p1 -b .units
 find . -type f -print0 |xargs -0 chmod 644
 
 



From whot at fedoraproject.org  Thu Apr  9 05:30:09 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  9 Apr 2009 05:30:09 +0000 (UTC)
Subject: rpms/xkeyboard-config/devel xkeyboard-config-1.5-terminate.patch,
	NONE, 1.1 xkeyboard-config.spec, 1.36, 1.37
Message-ID: <20090409053009.D50627001C@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26929

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.5-terminate.patch 
Log Message:
* Tue Apr 07 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-5
- xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default
  pc symbols, add terminate:ctrl_alt_bksp.


xkeyboard-config-1.5-terminate.patch:

--- NEW FILE xkeyboard-config-1.5-terminate.patch ---
>From ff416cce47e29c113c706684a05ebb112c9116b3 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Tue, 7 Apr 2009 04:18:32 +0200
Subject: [PATCH] Make Terminate_Server on ctrl+alt+bksp an option

This disables zapping by default, it can be reenabled with
'setxkbmap -option terminate:ctrl_alt_bksp'.
---
 rules/base.o_s.part |    1 +
 rules/base.xml.in   |   12 ++++++++++++
 symbols/pc          |    5 +----
 symbols/srvr_ctrl   |   13 +++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index c401790..9843c61 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -97,4 +97,5 @@
   shift:breaks_caps     =	+shift(breaks_caps)
   esperanto:qwerty      =	+epo(qwerty)
   esperanto:dvorak      =	+epo(dvorak)
+  terminate:ctrl_alt_bksp =	+srvr_ctrl(terminate_ctrl_alt_bksp)
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index a7616c5..fe7a26f 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4914,5 +4914,17 @@
        </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>terminate</name>
+        <_description>Key sequence to kill the X server</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>terminate:ctrl_alt_bksp</name>
+          <_description>Control + Alt + Backspace</_description>
+        </configItem>
+      </option>
+    </group>
   </optionList>
 </xkbConfigRegistry>
diff --git a/symbols/pc b/symbols/pc
index 07472b8..9474df5 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -19,10 +19,7 @@ xkb_symbols "pc105" {
     include "pc(editing)"
     include "keypad(x11)"
 
-    key <BKSP> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
+    key <BKSP> {	[ BackSpace 	]	};
 
     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
     key <RTRN> {	[ Return	]	};
diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
index 712f763..9b333e3 100644
--- a/symbols/srvr_ctrl
+++ b/symbols/srvr_ctrl
@@ -13,10 +13,7 @@ xkb_symbols "xfree86" {
 partial keypad_keys 
 xkb_symbols "stdkeypad" {
 
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
+    include "srvr_ctrl(terminate_ctrl_alt_bksp)"
 
 // Ungrab cancels server/keyboard/pointer grabs
     key <KPDV> {
@@ -44,6 +41,14 @@ xkb_symbols "stdkeypad" {
 
 };
 
+partial modifier_keys
+xkb_symbols "terminate_ctrl_alt_bksp" {
+    key <BKSP> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ NoSymbol,   Terminate_Server ]
+    };
+};
+
 partial function_keys 
 xkb_symbols "fkey2vt" {
 
-- 
1.5.6.3



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xkeyboard-config.spec	5 Mar 2009 03:19:54 -0000	1.36
+++ xkeyboard-config.spec	9 Apr 2009 05:29:39 -0000	1.37
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -19,6 +19,7 @@
 # Taken from upstream, remove with 1.6
 Patch6: xkeyboard-config-1.5-evdevkbds.patch
 Patch7: xkeyboard-config-1.5-suspend-hibernate.patch
+Patch8: xkeyboard-config-1.5-terminate.patch
 
 BuildArch: noarch
 
@@ -100,6 +101,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Apr 07 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-5
+- xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default
+  pc symbols, add terminate:ctrl_alt_bksp.
+
 * Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-4
 - xkeyboard-config-1.5-suspend-hibernate.patch: Map I213 to XF86Suspend, and
   I255 to XF86Hibernate.



From lkundrak at fedoraproject.org  Thu Apr  9 05:31:34 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  9 Apr 2009 05:31:34 +0000 (UTC)
Subject: rpms/skychart/devel skychart.spec,1.15,1.16
Message-ID: <20090409053134.C416F7001C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27425

Modified Files:
	skychart.spec 
Log Message:
Fix unit path


Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- skychart.spec	9 Apr 2009 05:28:54 -0000	1.15
+++ skychart.spec	9 Apr 2009 05:31:04 -0000	1.16
@@ -97,7 +97,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/skychart
 
 # Binary
-install -pm 0755 skychart/units/*/skychart \
+install -pm 0755 skychart/units/skychart \
         $RPM_BUILD_ROOT%{_bindir}
 
 # Libraries



From whot at fedoraproject.org  Thu Apr  9 05:40:04 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  9 Apr 2009 05:40:04 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.0-restore-zap.patch, NONE,
	1.1 xorg-x11-server.spec, 1.429, 1.430
Message-ID: <20090409054004.718BC7001C@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28617

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.0-restore-zap.patch 
Log Message:
* Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-18
- xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.




xserver-1.6.0-restore-zap.patch:

--- NEW FILE xserver-1.6.0-restore-zap.patch ---
>From 41da426ebe0d8dc0734ff9dc5bcbfac9d9bd97b9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 9 Apr 2009 10:12:27 +1000
Subject: [PATCH] xfree86: restore default off for DontZap

Zapping is triggered by xkb nowawdays, so make a note in the man page that
it's the Terminate_Server action. Since it's XKB, the correct way of disabling
it is through xkb rulesets.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 doc/Xserver.man.pre                  |    2 +-
 hw/xfree86/common/xf86Config.c       |    5 ++---
 hw/xfree86/doc/man/xorg.conf.man.pre |   11 +++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 8897e1a..dd81223 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -223,7 +223,7 @@ turns on auto-repeat.
 starts the stipple with the classic stipple and cursor visible.  The default
 is to start with a black root window, and to suppress display of the cursor
 until the first time an application calls XDefineCursor().  For the Xorg
-server, this also changes the default for the DontZap option to FALSE.  For
+server, this also sets the default for the DontZap option to FALSE.  For
 kdrive servers, this implies -zap.
 .TP 8
 .B \-s \fIminutes\fP
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 17223a1..54c835d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -733,7 +733,7 @@ static OptionInfoRec FlagOptions[] = {
   { FLAG_DONTVTSWITCH,		"DontVTSwitch",			OPTV_BOOLEAN,
 	{0}, FALSE },
   { FLAG_DONTZAP,		"DontZap",			OPTV_BOOLEAN,
-	{0}, TRUE },
+	{0}, FALSE },
   { FLAG_DONTZOOM,		"DontZoom",			OPTV_BOOLEAN,
 	{0}, FALSE },
   { FLAG_DISABLEVIDMODE,	"DisableVidModeExtension",	OPTV_BOOLEAN,
@@ -845,8 +845,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 
     xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
     xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
-    if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
-        xf86Info.dontZap = !party_like_its_1989;
+    xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
     xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
 
     xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index d45c3b8..a0230cd 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -464,12 +464,11 @@ Default: off.
 .TP 7
 .BI "Option \*qDontZap\*q  \*q" boolean \*q
 This disallows the use of the
-.B Ctrl+Alt+Backspace
-sequence.
-That sequence is normally used to terminate the __xservername__ server.
-When this option is enabled (as per default), that key sequence has no
-special meaning.
-Default: on.
+.B Terminate_Server
+XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
+This action is normally used to terminate the __xservername__ server.
+When this option is enabled, the action has no effect.
+Default: off.
 .TP 7
 .BI "Option \*qDontZoom\*q  \*q" boolean \*q
 This disallows the use of the
-- 
1.6.2.2.447.g4afa7



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- xorg-x11-server.spec	6 Apr 2009 20:09:11 -0000	1.429
+++ xorg-x11-server.spec	9 Apr 2009 05:39:34 -0000	1.430
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -110,6 +110,8 @@
 # ajax needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
 
+Patch6028: xserver-1.6.0-restore-zap.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -526,6 +528,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-18
+- xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.
+
 * Mon Apr 06 2009 Adam Jackson <ajax at redhat.com> 1.6.0-17
 - xserver-1.6.0-displayfd.patch: Add -displayfd commandline option.
 



From llaumgui at fedoraproject.org  Thu Apr  9 06:19:29 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu,  9 Apr 2009 06:19:29 +0000 (UTC)
Subject: rpms/grnotify/F-9 grnotify-1.1.2-fixurl.patch, NONE,
	1.1 grnotify-setup.py, NONE, 1.1 grnotify.spec, 1.1,
	1.2 setup.py, 1.1, NONE
Message-ID: <20090409061929.F06FD7001C@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/grnotify/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2806

Modified Files:
	grnotify.spec 
Added Files:
	grnotify-1.1.2-fixurl.patch grnotify-setup.py 
Removed Files:
	setup.py 
Log Message:
Fix GReader URL


grnotify-1.1.2-fixurl.patch:

--- NEW FILE grnotify-1.1.2-fixurl.patch ---
diff -up grnotify-1.1.2/grnotify.patch grnotify-1.1.2/grnotify
--- grnotify-1.1.2/grnotify.patch	2009-01-31 22:32:30.000000000 +0100
+++ grnotify-1.1.2/grnotify	2009-04-09 08:07:18.420146374 +0200
@@ -37,13 +37,13 @@ VERSION = '1.1.2'
 
 #########
 #Main class: the tray icon
-#	
+#
 class grnotify(Thread):
-    
+
     #--------------------------------------------
     # initialization
     #--------------------------------------------
-    
+
     #configuration options if there is no config file
     def initialConfig(self):
         if not (os.path.exists(os.path.join(os.environ['HOME'], '.grnotify/'))):
@@ -65,8 +65,8 @@ class grnotify(Thread):
         self.autoHide = False
         self.useKeyRing = True
 	self.ok = False
-                
-                
+
+
     def saveConfig(self):
         CONFIGFILE = os.path.join(os.environ['HOME'], '.grnotify/config')
         config = ConfigParser.ConfigParser()
@@ -87,7 +87,7 @@ class grnotify(Thread):
         config.set("Icons", "New items icon", self.iconNew)
         config.set("Icons", "No new items icon", self.iconNoNew)
         config.set("Icons", "Broken icon", self.iconBroken)
-        
+
         config.write(open(CONFIGFILE, 'w'))
 
     def readConfig(self):
@@ -109,7 +109,7 @@ class grnotify(Thread):
 		self.openReader = config.get("User settings", "open reader").lower() != "false"
 		self.autoHide = config.get("User settings", "autohide").lower() != "false"
 		self.useKeyRing = config.get("User settings", "useKeyRing").lower() != "false"
-		
+
 		self.iconNew = config.get("Icons", "New items icon")
 		self.iconNoNew = config.get("Icons", "No new items icon")
 		self.iconBroken = config.get("Icons", "Broken icon")
@@ -119,17 +119,17 @@ class grnotify(Thread):
 		os.remove(CONFIGFILE)
 	else:
 	    self.newUser = True
-            
+
     def saveKeyRing(self, passwd):
         keyring = "login"
         try:
-            
+
             import gnomekeyring
             import gconf
             gnomekeyring.create_sync(keyring, None)
         except gnomekeyring.AlreadyExistsError:
             pass
-        
+
         try:
             auth_token = gnomekeyring.item_create_sync(
                 keyring,
@@ -146,16 +146,16 @@ class grnotify(Thread):
         keyring = "login"
         password = ''
         try:
-            
+
             import gnomekeyring
             import gconf
-            gnomekeyring.create_sync(keyring, None)  
-        except gnomekeyring.AlreadyExistsError:  
-            pass 
+            gnomekeyring.create_sync(keyring, None)
+        except gnomekeyring.AlreadyExistsError:
+            pass
         auth_token = gconf.client_get_default().get_int("/apps/grnotify/keyring_auth_token")
         if auth_token > 0:
             try:
-                password = gnomekeyring.item_get_info_sync(keyring, 
+                password = gnomekeyring.item_get_info_sync(keyring,
                             auth_token).get_secret()
             except:
                 pass
@@ -165,8 +165,7 @@ class grnotify(Thread):
         url = "https://www.google.com/accounts/ServiceLoginAuth?" + \
           urllib.urlencode({'Email':grnotify_app.greader.email}) + "&" + \
           urllib.urlencode({'Passwd':grnotify_app.greader.passwd}) + \
-          "&service=reader&continue=" + \
-          "https://www.google.com/reader&nui=1" 
+          "&continue=https://www.google.com/reader&nui=1"
         webbrowser.open_new_tab(url)
 
     def __init__(self):
@@ -182,46 +181,46 @@ class grnotify(Thread):
         self.tray_icon = egg.trayicon.TrayIcon("grnotify")
 
         # create a eventbox object which is going to be added to the trayicon object
-        self.grnotify_eventbox = gtk.EventBox()  
+        self.grnotify_eventbox = gtk.EventBox()
 
         # add the eventbox object to the trayicon object for event handling (click, scroll)
         self.tray_icon.add(self.grnotify_eventbox)
-        
+
         # connect "click" event to their handlers
         self.grnotify_eventbox.connect("button_press_event", self.clicked)
-        
-        
+
+
         # create container
         self.traycontainer = gtk.HBox()
-        
+
         # create the image object
         self.icon = gtk.Image()
         # and the unread label
         self.unread_label = gtk.Label('? ')
-        
+
         # set the image pixmap
         self.icon.set_from_file(self.iconBroken)
         # add the image object to the tray container
         self.traycontainer.pack_start(self.icon, False, False, padding = 0)
         self.traycontainer.pack_start(self.unread_label, False, False, padding = 0)
         self.grnotify_eventbox.add(self.traycontainer)
-        
-        
+
+
         # create the tooltip, pass it the actual information and add it to the grnotify_eventbox
         self.tooltip = gtk.Tooltips()
         self.tooltip_message = "Getting feed info"
         self.tooltip.set_tip(self.grnotify_eventbox,self.tooltip_message)
         self.tooltip.enable()
-        
+
         # show the trayicon (+ etc.)
-        self.tray_icon.show_all() 
+        self.tray_icon.show_all()
         # self.properties = properties_dialog()
         self.menu = tray_menu(self)
         self.about = about_dialog()
 
     #
     #---- clicked  :the eventbox (from the trayicon) click event handler
-    #       
+    #
     def clicked(self,widget,event):
         # right click
         if event.button == 3:
@@ -231,31 +230,31 @@ class grnotify(Thread):
         if event.button == 1:
             if self.ok and self.openReader:
                 self.openGoogleReader()
-            else:	
+            else:
                 self.getUnreadFeeds()
-                
+
     def run(self):
 	if self.newUser:
 		configure_window()
 	while not self.ok:
 		self.refresh()
 		time.sleep(30)
-        while (1):  
+        while (1):
             time.sleep(self.waitTime)
             self.refresh()
-    
+
     def refresh(self, forced = False):
-	    if self.broken:		
+	    if self.broken:
 		self.notification('Please fill in your info in preferences')
 		self.broken = False
             self.refresher = updater(forced)
             self.refresher.start()
-            
+
     def updateToolTip(self):
         gtk.gdk.threads_enter()
 	if self.ok:
 	    message = str(self.greader.totalUnread) + ' unread item'
-	    if self.greader.totalUnread != 1: 
+	    if self.greader.totalUnread != 1:
 		message += 's'
 	    i = 0
 	    for feed in self.feeds:
@@ -266,7 +265,7 @@ class grnotify(Thread):
 	    message = 'Something went wrong.\nPlease check your internet connection and settings.'
         self.tooltip.set_tip(self.grnotify_eventbox, message)
         gtk.gdk.threads_leave()
-        
+
     def updateIcon(self):
         gtk.gdk.threads_enter()
         if not self.ok:
@@ -280,13 +279,13 @@ class grnotify(Thread):
             grnotify_app.unread_label.set_text(str(self.greader.totalUnread)+ ' ')
         grnotify_app.icon.show_all()
         grnotify_app.unread_label.show_all()
-        
+
         if not self.showCounter or self.greader.totalUnread == 0:
             grnotify_app.unread_label.hide()
         if self.autoHide and self.greader.totalUnread == 0:
             grnotify_app.icon.hide()
         gtk.gdk.threads_leave()
-        
+
     #shows the notification
     def notify(self, current, previous):
         try:
@@ -297,7 +296,7 @@ class grnotify(Thread):
                     self.notification("You have " + str(current-previous) + " new unread items")
         except:
             pass
-        
+
     def notification(self, message):
         if self.showNotification:
             #try:
@@ -308,7 +307,7 @@ class grnotify(Thread):
                     bubble.show()
             #except:
              #   pass
-                
+
 ######################### BEGIN CLASS TRAY MENU ##########################
 #Create the configure window
 #Written by Kristof Bamps @ Feb 5 2008
@@ -323,10 +322,10 @@ class tray_menu:
     # create the menu separator menu item object
         menu_item_refresh = gtk.ImageMenuItem('gtk-refresh',None)
         menu_item_refresh.connect('activate',self.refresh_clicked)
-        
+
         menu_google_reader = gtk.ImageMenuItem ('Open Google Reader', None)
         menu_google_reader.connect ('activate', self.openGoogleReader)
-        
+
         menu_mark_read = gtk.ImageMenuItem ('Mark all as read', None)
         menu_mark_read.connect('activate', self.markAllRead)
         if (self.parent.greader.totalUnread == 0 ):
@@ -354,71 +353,71 @@ class tray_menu:
         self.window.add(menu_item_feed)
         self.window.add(menu_item_preferences)
         self.window.add (gtk.SeparatorMenuItem())
-        
+
         view_item = gtk.Menu()
-        menu_view_item = gtk.MenuItem ('View Items', None)		
+        menu_view_item = gtk.MenuItem ('View Items', None)
         menu_view_item.set_submenu (view_item)
         self.setTitels(view_item)
         if (self.parent.greader.totalUnread == 0 or self.parent.numberTitles == 0):
             menu_view_item.set_sensitive (0)
         self.window.add (menu_view_item)
-        
+
         self.window.add (gtk.SeparatorMenuItem())
     # add the about menu item to the menu object
         self.window.add(menu_item_about)
-        
+
     # create the quit menu item object with it's icon
         menu_item_quit = gtk.ImageMenuItem('gtk-quit',None)
 
     # connect a handler to it
         menu_item_quit.connect('activate',self.exit)
 
-    # add the quit menu item to the menu object    
+    # add the quit menu item to the menu object
         self.window.add(menu_item_quit)
-        
+
     # show the menu
-        self.window.show_all() 
+        self.window.show_all()
     def exit(self,widget):
-    # quit menu item handler -> quit the application 
+    # quit menu item handler -> quit the application
         os.system("kill " + str (os.getpid()))
-        
+
     def feed_clicked (self, widget):
         popup = feedPopup()
-        
+
     def markAllRead (self, widget):
         self.parent.greader.markAllRead()
         self.parent.refresh()
-        
+
     def refresh_clicked (self, widget):
         self.parent.refresh()
-    
+
     def preferences_clicked (self, widget):
         configureWindow = configure_window()
-    
+
     def about_clicked(self,widget):
     # about menu item handler -> create the about window
         grnotify_app.about.create()
-        
+
     def popup(self,event):
     # popup-show the menu
-        self.window.popup( None, None, None, 0, event.time); 
-    
+        self.window.popup( None, None, None, 0, event.time);
+
     def close(self,widget):
         # the warning close button has been clicked (or the window was closed else way)
         grnotify_app.warning_close_button = True
-        
+
         # the window isn't opened
         grnotify_app.warning_window_opened = False
         self.window.destroy()
-        
+
     def openGoogleReader(self, widget = None):
         url = "https://www.google.com/accounts/ServiceLoginAuth?" + \
           urllib.urlencode({'Email':grnotify_app.greader.email}) + "&" + \
           urllib.urlencode({'Passwd':grnotify_app.greader.passwd}) + \
           "&service=reader&continue=" + \
-          "https://www.google.com/reader&nui=1" 
+          "https://www.google.com/reader&nui=1"
         webbrowser.open_new_tab(url)
-        
+
     def openlink(self, item):
         i = 0
         for item2 in self.items:
@@ -427,18 +426,18 @@ class tray_menu:
                 self.markRead(self.titles[i].id, self.titles[i].feed)
                 self.parent.refresh(forced=True)
             i = i+1
-            
+
     def markRead(self, id, feed):
         req = urllib2.Request ('http://www.google.com/reader/api/0/token')
         f = urllib2.urlopen (req)
         token = f.read()
-        
+
         data = { 'i' : id, 's' : feed, 'T' : token, 'ac' : 'edit-tags' , 'a' : 'user/-/state/com.google/read' }
         data = urllib.urlencode (data)
         url = 'http://www.google.com/reader/api/0/edit-tag'
         req = urllib2.Request (url, data)
         f = urllib2.urlopen (req)
-        
+
     def setTitels(self, menu) :
             self.items = []
             self.titles = []
@@ -449,7 +448,7 @@ class tray_menu:
                         self.items.append(gtk.MenuItem (title.title, None))
                         self.items[-1].connect ('activate', self.openlink)
                         menu.add (self.items[-1])
-                        
+
                 else:
                     self.menus = []
                     self.feedMenus = []
@@ -469,14 +468,14 @@ class tray_menu:
                             menu.add(self.menus[-1])
                         else:
                             del self.menus[-1]
-            
+
 class about_dialog:
     def create(self):
         CONFIG = '/usr/share/grnotify/'
         # set the glade file
-        self.gladefile = CONFIG + "about.glade"  
+        self.gladefile = CONFIG + "about.glade"
 
-        # create the widget three  
+        # create the widget three
         self.wTree = gtk.glade.XML(self.gladefile, "window_about")
         self.wTree.signal_autoconnect(self)
 
@@ -495,7 +494,7 @@ class about_dialog:
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-        
+
 class updater (Thread):
     def __init__(self, forced = False):
         Thread.__init__(self)
@@ -506,8 +505,8 @@ class updater (Thread):
 		    grnotify_app.greader.login(grnotify_app.user, grnotify_app.passwd)
 	    grnotify_app.feeds = grnotify_app.greader.getUnreadFeeds()
 	    grnotify_app.ok = True
-	    
-	    
+
+
 	    grnotify_app.updateToolTip()
 	    grnotify_app.updateIcon()
 	    if grnotify_app.unread != grnotify_app.greader.totalUnread or self.forced:
@@ -519,31 +518,31 @@ class updater (Thread):
 	    grnotify_app.updateToolTip()
 	    grnotify_app.updateIcon()
             pass
-            
-            
+
+
 class feedPopup:
     def __init__(self):
         CONFIG = '/usr/share/grnotify/'
 
     #Create the dialog
         self.gladefile = CONFIG + "feed.glade"
-        self.xml = gtk.glade.XML(self.gladefile)  
+        self.xml = gtk.glade.XML(self.gladefile)
         self.xml.signal_autoconnect(self)
         self.window = self.xml.get_widget('main_window')
         self.window.set_title('GrNotify: Add feed')
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-        
+
     def on_save_button_clicked(self, button=None, data=None):
        # try:
-            
+
             feed = self.xml.get_widget('entry1').get_text()
             self.window.destroy()
             addFeed(feed).start()
-         
+
 class addFeed(Thread):
-    def __init__(self, feed):        
+    def __init__(self, feed):
         self.feed = feed
         Thread.__init__(self)
     def run(self):
@@ -551,7 +550,7 @@ class addFeed(Thread):
             req = urllib2.Request ('http://www.google.com/reader/api/0/token')
             f = urllib2.urlopen (req)
             token = f.read()
-            
+
             data = { 's' : 'feed/' + self.feed, 'T' : token, 'ac' : 'subscribe'}
             data = urllib.urlencode (data)
             url = 'http://www.google.com/reader/api/0/subscription/edit?client=contact:' + grnotify_app.user
@@ -560,16 +559,16 @@ class addFeed(Thread):
             grnotify_app.refresh()
         except:
             pass
-        
+
 class DBusReader(dbus.service.Object):
-  @dbus.service.method("org.gnome.feed.Reader", 
+  @dbus.service.method("org.gnome.feed.Reader",
                         in_signature="s", out_signature="b")
   def Subscribe(self, url):
     try:
       req = urllib2.Request('http://www.google.com/reader/api/0/token')
       f = urllib2.urlopen(req)
       token = f.read()
-      
+
       data = {'s': 'feed/' + url, 'T': token, 'ac': 'subscribe'}
       data = urllib.urlencode(data)
       req = urllib2.Request('http://www.google.com/reader/api/0/subscription/edit?client=contact:' + grnotify_app.user, data)
@@ -580,7 +579,7 @@ class DBusReader(dbus.service.Object):
       return True
     except:
       return False
-    
+
 class configure_window:
     def __init__(self):
     #Set variables
@@ -588,7 +587,7 @@ class configure_window:
 
     #Create the dialog
         self.gladefile = CONFIG + "config.glade"
-        self.xml = gtk.glade.XML(self.gladefile)  
+        self.xml = gtk.glade.XML(self.gladefile)
         self.xml.signal_autoconnect(self)
         self.window = self.xml.get_widget('main_window')
 
@@ -602,11 +601,11 @@ class configure_window:
         self.xml.get_widget('spinbutton1').set_text( str( ( grnotify_app.waitTime - grnotify_app.waitTime % 60 ) / 60) )
         self.xml.get_widget('spinbutton2').set_text( str( grnotify_app.waitTime % 60 ) )
         self.xml.get_widget('spinbutton3').set_text( str( grnotify_app.numberFeeds ) )
-        if( grnotify_app.showCounter == True ):	
+        if( grnotify_app.showCounter == True ):
             self.xml.get_widget('showcounter1').set_active(1)
         if grnotify_app.showNotification == True:
             self.xml.get_widget('showpopups1').set_active(1)
-        #Set the appropriate images to the icon chosers!!!		
+        #Set the appropriate images to the icon chosers!!!
         self.xml.get_widget('imagechooseiconnew2').set_from_file(grnotify_app.iconNew)
         self.xml.get_widget('buttonchooseiconnew2').connect("clicked", self.iconclicked, "new")
         self.xml.get_widget('imagechooseiconnonew2').set_from_file(grnotify_app.iconNoNew)
@@ -647,22 +646,22 @@ class configure_window:
         self.fileselect.add_filter(filter)
 
         response = self.fileselect.run()
-        
+
         if response == gtk.RESPONSE_OK:
             self.iconget(widget,data)
         elif response == gtk.RESPONSE_CANCEL:
             self.fileselect.destroy()
-        
+
     def iconget(self, widget, data=None):
         filename = self.fileselect.get_filename()
         self.fileselect.destroy()
-        
+
         if(not filename.endswith('.gif') and not filename.endswith('.png') and not filename.endswith('.xpm')):
             return
-        
+
         if(not os.stat(filename).st_size > 0):
             return
-        
+
         if ( data == 'new' ):
             gtk.gdk.pixbuf_new_from_file(filename).scale_simple(24, 24, gtk.gdk.INTERP_NEAREST).save(os.path.join(os.environ['HOME'], '.grnotify/newtemp.png'), "png", {})
             self.fileiconnew = 'changed'
@@ -674,7 +673,7 @@ class configure_window:
             self.fileiconbroken = 'changed'
         self.xml.get_widget('imagechooseicon' + data + '2').set_from_file(os.path.join(os.environ['HOME'], '.grnotify/' + data + 'temp.png'))
 
-    def get_info(self):	
+    def get_info(self):
         grnotify_app.user = self.xml.get_widget('username_entry2').get_text()
         grnotify_app.passwd = self.xml.get_widget('password_entry2').get_text()
         grnotify_app.waitTime =int( self.xml.get_widget('spinbutton1').get_text()) * 60
@@ -695,8 +694,8 @@ class configure_window:
             grnotify_app.iconNoNew = '/usr/share/pixmaps/grnotify/nonew.gif'
             grnotify_app.iconBroken = '/usr/share/pixmaps/grnotify/broken.gif'
         grnotify_app.numberFeeds = int (self.xml.get_widget('spinbutton3').get_text())
-        grnotify_app.showCounter = self.xml.get_widget('showcounter1').get_active() 
-        grnotify_app.showNotification = self.xml.get_widget('showpopups1').get_active() 
+        grnotify_app.showCounter = self.xml.get_widget('showcounter1').get_active()
+        grnotify_app.showNotification = self.xml.get_widget('showpopups1').get_active()
         grnotify_app.openReader = not self.xml.get_widget('combobox2').get_active()
 	grnotify_app.autoHide = self.xml.get_widget('autohide').get_active()
 	grnotify_app.useKeyRing = self.xml.get_widget('gnomekeyring').get_active()
@@ -705,7 +704,7 @@ class configure_window:
     def on_save_button_clicked(self, button=None, data=None):
     #Get global access to the config_changed variable
         #Aquire the new data
-        self.get_info()	
+        self.get_info()
 
         #Save the new data to the config file
         grnotify_app.saveConfig()
@@ -717,12 +716,12 @@ class configure_window:
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-    
+
 if __name__ == "__main__" :
     gtk.gdk.threads_init()
-    
+
     # create the grnotify object (and icon)
-    
+
     #readConfig() # fix by Eric Lembregts -> needed to know where the icon's are located!!
     grnotify_app = grnotify()
     grnotify_app.start()
@@ -734,5 +733,5 @@ if __name__ == "__main__" :
     name = dbus.service.BusName("org.gnome.feed.Reader", session_bus)
     reader = DBusReader(session_bus, '/org/gnome/feed/Reader')
     mainloop = gobject.MainLoop()
-    
+
     gtk.main()


--- NEW FILE grnotify-setup.py ---
#/usr/bin/python
"""Copyright (C) 2009  Kristof Bamps

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
"""
from distutils.core import setup
from os import path
import sys

DATA_DIR =  path.join('share')
PIXMAPS_DIR = path.join(DATA_DIR , 'pixmaps')
APP_DIR = path.join(DATA_DIR , 'applications')

setup(
    name='grnotify',
    version='1.1.2',
    author='Kristof Bamps',
    author_email='bamps DOT kristof AT gmail.com',
    url='https://sourceforge.net/projects/grnotify/',
    license='GPLv2+',
    description='A Google Reader in python',
    platforms='Any',
    py_modules=['GoogleReader'],
    scripts=['grnotify'],
    data_files=[
        (PIXMAPS_DIR + "/grnotify",
                ['pixmaps/broken.gif', 'pixmaps/new.gif', 'pixmaps/nonew.gif']),
        (PIXMAPS_DIR, 
                ['pixmaps/grnotify.xpm']),
        (DATA_DIR + "/grnotify",
                ['share/about.glade', 'share/config.glade', 'share/feed.glade']),
        (APP_DIR,
                ['share/grnotify.desktop'])
    ]
)


Index: grnotify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grnotify/F-9/grnotify.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grnotify.spec	24 Feb 2009 23:55:58 -0000	1.1
+++ grnotify.spec	9 Apr 2009 06:18:59 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           grnotify
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Google Reader Notifier
 
 Group:          Applications/Internet
@@ -10,7 +10,8 @@
 URL:            http://grnotify.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
 Source1:        %{name}.desktop
-Source2:        setup.py
+Source2:        %{name}-setup.py
+Patch0:         %{name}-%{version}-fixurl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -34,7 +35,8 @@
 
 %prep
 %setup -q
-cp -p %{SOURCE2} ./
+%patch0 -p1 -b .fixurl
+cp -p %{SOURCE2} ./setup.py
 
 # rpmlint : "grnotify.noarch: E: non-executable-script /usr/lib/python2.5/site-packages/grnotify/GoogleReader.py 0644"
 sed -i -e "s@#!/usr/bin/python@@" GoogleReader.py
@@ -79,6 +81,12 @@
 
 
 %changelog
+* Thu Apr 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-6
+- Add patch for fix GReader URL
+
+* Sat Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-5
+- Rename setup.py in grnotify-setup.py
+
 * Sat Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-4
 - Fix vendor tag in desktop file
 


--- setup.py DELETED ---



From llaumgui at fedoraproject.org  Thu Apr  9 06:21:17 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu,  9 Apr 2009 06:21:17 +0000 (UTC)
Subject: rpms/grnotify/F-10 grnotify-1.1.2-fixurl.patch, NONE,
	1.1 grnotify-setup.py, NONE, 1.1 grnotify.spec, 1.1,
	1.2 setup.py, 1.1, NONE
Message-ID: <20090409062117.9DFD17001C@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/grnotify/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3057

Modified Files:
	grnotify.spec 
Added Files:
	grnotify-1.1.2-fixurl.patch grnotify-setup.py 
Removed Files:
	setup.py 
Log Message:
Fix Greader URL


grnotify-1.1.2-fixurl.patch:

--- NEW FILE grnotify-1.1.2-fixurl.patch ---
diff -up grnotify-1.1.2/grnotify.patch grnotify-1.1.2/grnotify
--- grnotify-1.1.2/grnotify.patch	2009-01-31 22:32:30.000000000 +0100
+++ grnotify-1.1.2/grnotify	2009-04-09 08:07:18.420146374 +0200
@@ -37,13 +37,13 @@ VERSION = '1.1.2'
 
 #########
 #Main class: the tray icon
-#	
+#
 class grnotify(Thread):
-    
+
     #--------------------------------------------
     # initialization
     #--------------------------------------------
-    
+
     #configuration options if there is no config file
     def initialConfig(self):
         if not (os.path.exists(os.path.join(os.environ['HOME'], '.grnotify/'))):
@@ -65,8 +65,8 @@ class grnotify(Thread):
         self.autoHide = False
         self.useKeyRing = True
 	self.ok = False
-                
-                
+
+
     def saveConfig(self):
         CONFIGFILE = os.path.join(os.environ['HOME'], '.grnotify/config')
         config = ConfigParser.ConfigParser()
@@ -87,7 +87,7 @@ class grnotify(Thread):
         config.set("Icons", "New items icon", self.iconNew)
         config.set("Icons", "No new items icon", self.iconNoNew)
         config.set("Icons", "Broken icon", self.iconBroken)
-        
+
         config.write(open(CONFIGFILE, 'w'))
 
     def readConfig(self):
@@ -109,7 +109,7 @@ class grnotify(Thread):
 		self.openReader = config.get("User settings", "open reader").lower() != "false"
 		self.autoHide = config.get("User settings", "autohide").lower() != "false"
 		self.useKeyRing = config.get("User settings", "useKeyRing").lower() != "false"
-		
+
 		self.iconNew = config.get("Icons", "New items icon")
 		self.iconNoNew = config.get("Icons", "No new items icon")
 		self.iconBroken = config.get("Icons", "Broken icon")
@@ -119,17 +119,17 @@ class grnotify(Thread):
 		os.remove(CONFIGFILE)
 	else:
 	    self.newUser = True
-            
+
     def saveKeyRing(self, passwd):
         keyring = "login"
         try:
-            
+
             import gnomekeyring
             import gconf
             gnomekeyring.create_sync(keyring, None)
         except gnomekeyring.AlreadyExistsError:
             pass
-        
+
         try:
             auth_token = gnomekeyring.item_create_sync(
                 keyring,
@@ -146,16 +146,16 @@ class grnotify(Thread):
         keyring = "login"
         password = ''
         try:
-            
+
             import gnomekeyring
             import gconf
-            gnomekeyring.create_sync(keyring, None)  
-        except gnomekeyring.AlreadyExistsError:  
-            pass 
+            gnomekeyring.create_sync(keyring, None)
+        except gnomekeyring.AlreadyExistsError:
+            pass
         auth_token = gconf.client_get_default().get_int("/apps/grnotify/keyring_auth_token")
         if auth_token > 0:
             try:
-                password = gnomekeyring.item_get_info_sync(keyring, 
+                password = gnomekeyring.item_get_info_sync(keyring,
                             auth_token).get_secret()
             except:
                 pass
@@ -165,8 +165,7 @@ class grnotify(Thread):
         url = "https://www.google.com/accounts/ServiceLoginAuth?" + \
           urllib.urlencode({'Email':grnotify_app.greader.email}) + "&" + \
           urllib.urlencode({'Passwd':grnotify_app.greader.passwd}) + \
-          "&service=reader&continue=" + \
-          "https://www.google.com/reader&nui=1" 
+          "&continue=https://www.google.com/reader&nui=1"
         webbrowser.open_new_tab(url)
 
     def __init__(self):
@@ -182,46 +181,46 @@ class grnotify(Thread):
         self.tray_icon = egg.trayicon.TrayIcon("grnotify")
 
         # create a eventbox object which is going to be added to the trayicon object
-        self.grnotify_eventbox = gtk.EventBox()  
+        self.grnotify_eventbox = gtk.EventBox()
 
         # add the eventbox object to the trayicon object for event handling (click, scroll)
         self.tray_icon.add(self.grnotify_eventbox)
-        
+
         # connect "click" event to their handlers
         self.grnotify_eventbox.connect("button_press_event", self.clicked)
-        
-        
+
+
         # create container
         self.traycontainer = gtk.HBox()
-        
+
         # create the image object
         self.icon = gtk.Image()
         # and the unread label
         self.unread_label = gtk.Label('? ')
-        
+
         # set the image pixmap
         self.icon.set_from_file(self.iconBroken)
         # add the image object to the tray container
         self.traycontainer.pack_start(self.icon, False, False, padding = 0)
         self.traycontainer.pack_start(self.unread_label, False, False, padding = 0)
         self.grnotify_eventbox.add(self.traycontainer)
-        
-        
+
+
         # create the tooltip, pass it the actual information and add it to the grnotify_eventbox
         self.tooltip = gtk.Tooltips()
         self.tooltip_message = "Getting feed info"
         self.tooltip.set_tip(self.grnotify_eventbox,self.tooltip_message)
         self.tooltip.enable()
-        
+
         # show the trayicon (+ etc.)
-        self.tray_icon.show_all() 
+        self.tray_icon.show_all()
         # self.properties = properties_dialog()
         self.menu = tray_menu(self)
         self.about = about_dialog()
 
     #
     #---- clicked  :the eventbox (from the trayicon) click event handler
-    #       
+    #
     def clicked(self,widget,event):
         # right click
         if event.button == 3:
@@ -231,31 +230,31 @@ class grnotify(Thread):
         if event.button == 1:
             if self.ok and self.openReader:
                 self.openGoogleReader()
-            else:	
+            else:
                 self.getUnreadFeeds()
-                
+
     def run(self):
 	if self.newUser:
 		configure_window()
 	while not self.ok:
 		self.refresh()
 		time.sleep(30)
-        while (1):  
+        while (1):
             time.sleep(self.waitTime)
             self.refresh()
-    
+
     def refresh(self, forced = False):
-	    if self.broken:		
+	    if self.broken:
 		self.notification('Please fill in your info in preferences')
 		self.broken = False
             self.refresher = updater(forced)
             self.refresher.start()
-            
+
     def updateToolTip(self):
         gtk.gdk.threads_enter()
 	if self.ok:
 	    message = str(self.greader.totalUnread) + ' unread item'
-	    if self.greader.totalUnread != 1: 
+	    if self.greader.totalUnread != 1:
 		message += 's'
 	    i = 0
 	    for feed in self.feeds:
@@ -266,7 +265,7 @@ class grnotify(Thread):
 	    message = 'Something went wrong.\nPlease check your internet connection and settings.'
         self.tooltip.set_tip(self.grnotify_eventbox, message)
         gtk.gdk.threads_leave()
-        
+
     def updateIcon(self):
         gtk.gdk.threads_enter()
         if not self.ok:
@@ -280,13 +279,13 @@ class grnotify(Thread):
             grnotify_app.unread_label.set_text(str(self.greader.totalUnread)+ ' ')
         grnotify_app.icon.show_all()
         grnotify_app.unread_label.show_all()
-        
+
         if not self.showCounter or self.greader.totalUnread == 0:
             grnotify_app.unread_label.hide()
         if self.autoHide and self.greader.totalUnread == 0:
             grnotify_app.icon.hide()
         gtk.gdk.threads_leave()
-        
+
     #shows the notification
     def notify(self, current, previous):
         try:
@@ -297,7 +296,7 @@ class grnotify(Thread):
                     self.notification("You have " + str(current-previous) + " new unread items")
         except:
             pass
-        
+
     def notification(self, message):
         if self.showNotification:
             #try:
@@ -308,7 +307,7 @@ class grnotify(Thread):
                     bubble.show()
             #except:
              #   pass
-                
+
 ######################### BEGIN CLASS TRAY MENU ##########################
 #Create the configure window
 #Written by Kristof Bamps @ Feb 5 2008
@@ -323,10 +322,10 @@ class tray_menu:
     # create the menu separator menu item object
         menu_item_refresh = gtk.ImageMenuItem('gtk-refresh',None)
         menu_item_refresh.connect('activate',self.refresh_clicked)
-        
+
         menu_google_reader = gtk.ImageMenuItem ('Open Google Reader', None)
         menu_google_reader.connect ('activate', self.openGoogleReader)
-        
+
         menu_mark_read = gtk.ImageMenuItem ('Mark all as read', None)
         menu_mark_read.connect('activate', self.markAllRead)
         if (self.parent.greader.totalUnread == 0 ):
@@ -354,71 +353,71 @@ class tray_menu:
         self.window.add(menu_item_feed)
         self.window.add(menu_item_preferences)
         self.window.add (gtk.SeparatorMenuItem())
-        
+
         view_item = gtk.Menu()
-        menu_view_item = gtk.MenuItem ('View Items', None)		
+        menu_view_item = gtk.MenuItem ('View Items', None)
         menu_view_item.set_submenu (view_item)
         self.setTitels(view_item)
         if (self.parent.greader.totalUnread == 0 or self.parent.numberTitles == 0):
             menu_view_item.set_sensitive (0)
         self.window.add (menu_view_item)
-        
+
         self.window.add (gtk.SeparatorMenuItem())
     # add the about menu item to the menu object
         self.window.add(menu_item_about)
-        
+
     # create the quit menu item object with it's icon
         menu_item_quit = gtk.ImageMenuItem('gtk-quit',None)
 
     # connect a handler to it
         menu_item_quit.connect('activate',self.exit)
 
-    # add the quit menu item to the menu object    
+    # add the quit menu item to the menu object
         self.window.add(menu_item_quit)
-        
+
     # show the menu
-        self.window.show_all() 
+        self.window.show_all()
     def exit(self,widget):
-    # quit menu item handler -> quit the application 
+    # quit menu item handler -> quit the application
         os.system("kill " + str (os.getpid()))
-        
+
     def feed_clicked (self, widget):
         popup = feedPopup()
-        
+
     def markAllRead (self, widget):
         self.parent.greader.markAllRead()
         self.parent.refresh()
-        
+
     def refresh_clicked (self, widget):
         self.parent.refresh()
-    
+
     def preferences_clicked (self, widget):
         configureWindow = configure_window()
-    
+
     def about_clicked(self,widget):
     # about menu item handler -> create the about window
         grnotify_app.about.create()
-        
+
     def popup(self,event):
     # popup-show the menu
-        self.window.popup( None, None, None, 0, event.time); 
-    
+        self.window.popup( None, None, None, 0, event.time);
+
     def close(self,widget):
         # the warning close button has been clicked (or the window was closed else way)
         grnotify_app.warning_close_button = True
-        
+
         # the window isn't opened
         grnotify_app.warning_window_opened = False
         self.window.destroy()
-        
+
     def openGoogleReader(self, widget = None):
         url = "https://www.google.com/accounts/ServiceLoginAuth?" + \
           urllib.urlencode({'Email':grnotify_app.greader.email}) + "&" + \
           urllib.urlencode({'Passwd':grnotify_app.greader.passwd}) + \
           "&service=reader&continue=" + \
-          "https://www.google.com/reader&nui=1" 
+          "https://www.google.com/reader&nui=1"
         webbrowser.open_new_tab(url)
-        
+
     def openlink(self, item):
         i = 0
         for item2 in self.items:
@@ -427,18 +426,18 @@ class tray_menu:
                 self.markRead(self.titles[i].id, self.titles[i].feed)
                 self.parent.refresh(forced=True)
             i = i+1
-            
+
     def markRead(self, id, feed):
         req = urllib2.Request ('http://www.google.com/reader/api/0/token')
         f = urllib2.urlopen (req)
         token = f.read()
-        
+
         data = { 'i' : id, 's' : feed, 'T' : token, 'ac' : 'edit-tags' , 'a' : 'user/-/state/com.google/read' }
         data = urllib.urlencode (data)
         url = 'http://www.google.com/reader/api/0/edit-tag'
         req = urllib2.Request (url, data)
         f = urllib2.urlopen (req)
-        
+
     def setTitels(self, menu) :
             self.items = []
             self.titles = []
@@ -449,7 +448,7 @@ class tray_menu:
                         self.items.append(gtk.MenuItem (title.title, None))
                         self.items[-1].connect ('activate', self.openlink)
                         menu.add (self.items[-1])
-                        
+
                 else:
                     self.menus = []
                     self.feedMenus = []
@@ -469,14 +468,14 @@ class tray_menu:
                             menu.add(self.menus[-1])
                         else:
                             del self.menus[-1]
-            
+
 class about_dialog:
     def create(self):
         CONFIG = '/usr/share/grnotify/'
         # set the glade file
-        self.gladefile = CONFIG + "about.glade"  
+        self.gladefile = CONFIG + "about.glade"
 
-        # create the widget three  
+        # create the widget three
         self.wTree = gtk.glade.XML(self.gladefile, "window_about")
         self.wTree.signal_autoconnect(self)
 
@@ -495,7 +494,7 @@ class about_dialog:
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-        
+
 class updater (Thread):
     def __init__(self, forced = False):
         Thread.__init__(self)
@@ -506,8 +505,8 @@ class updater (Thread):
 		    grnotify_app.greader.login(grnotify_app.user, grnotify_app.passwd)
 	    grnotify_app.feeds = grnotify_app.greader.getUnreadFeeds()
 	    grnotify_app.ok = True
-	    
-	    
+
+
 	    grnotify_app.updateToolTip()
 	    grnotify_app.updateIcon()
 	    if grnotify_app.unread != grnotify_app.greader.totalUnread or self.forced:
@@ -519,31 +518,31 @@ class updater (Thread):
 	    grnotify_app.updateToolTip()
 	    grnotify_app.updateIcon()
             pass
-            
-            
+
+
 class feedPopup:
     def __init__(self):
         CONFIG = '/usr/share/grnotify/'
 
     #Create the dialog
         self.gladefile = CONFIG + "feed.glade"
-        self.xml = gtk.glade.XML(self.gladefile)  
+        self.xml = gtk.glade.XML(self.gladefile)
         self.xml.signal_autoconnect(self)
         self.window = self.xml.get_widget('main_window')
         self.window.set_title('GrNotify: Add feed')
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-        
+
     def on_save_button_clicked(self, button=None, data=None):
        # try:
-            
+
             feed = self.xml.get_widget('entry1').get_text()
             self.window.destroy()
             addFeed(feed).start()
-         
+
 class addFeed(Thread):
-    def __init__(self, feed):        
+    def __init__(self, feed):
         self.feed = feed
         Thread.__init__(self)
     def run(self):
@@ -551,7 +550,7 @@ class addFeed(Thread):
             req = urllib2.Request ('http://www.google.com/reader/api/0/token')
             f = urllib2.urlopen (req)
             token = f.read()
-            
+
             data = { 's' : 'feed/' + self.feed, 'T' : token, 'ac' : 'subscribe'}
             data = urllib.urlencode (data)
             url = 'http://www.google.com/reader/api/0/subscription/edit?client=contact:' + grnotify_app.user
@@ -560,16 +559,16 @@ class addFeed(Thread):
             grnotify_app.refresh()
         except:
             pass
-        
+
 class DBusReader(dbus.service.Object):
-  @dbus.service.method("org.gnome.feed.Reader", 
+  @dbus.service.method("org.gnome.feed.Reader",
                         in_signature="s", out_signature="b")
   def Subscribe(self, url):
     try:
       req = urllib2.Request('http://www.google.com/reader/api/0/token')
       f = urllib2.urlopen(req)
       token = f.read()
-      
+
       data = {'s': 'feed/' + url, 'T': token, 'ac': 'subscribe'}
       data = urllib.urlencode(data)
       req = urllib2.Request('http://www.google.com/reader/api/0/subscription/edit?client=contact:' + grnotify_app.user, data)
@@ -580,7 +579,7 @@ class DBusReader(dbus.service.Object):
       return True
     except:
       return False
-    
+
 class configure_window:
     def __init__(self):
     #Set variables
@@ -588,7 +587,7 @@ class configure_window:
 
     #Create the dialog
         self.gladefile = CONFIG + "config.glade"
-        self.xml = gtk.glade.XML(self.gladefile)  
+        self.xml = gtk.glade.XML(self.gladefile)
         self.xml.signal_autoconnect(self)
         self.window = self.xml.get_widget('main_window')
 
@@ -602,11 +601,11 @@ class configure_window:
         self.xml.get_widget('spinbutton1').set_text( str( ( grnotify_app.waitTime - grnotify_app.waitTime % 60 ) / 60) )
         self.xml.get_widget('spinbutton2').set_text( str( grnotify_app.waitTime % 60 ) )
         self.xml.get_widget('spinbutton3').set_text( str( grnotify_app.numberFeeds ) )
-        if( grnotify_app.showCounter == True ):	
+        if( grnotify_app.showCounter == True ):
             self.xml.get_widget('showcounter1').set_active(1)
         if grnotify_app.showNotification == True:
             self.xml.get_widget('showpopups1').set_active(1)
-        #Set the appropriate images to the icon chosers!!!		
+        #Set the appropriate images to the icon chosers!!!
         self.xml.get_widget('imagechooseiconnew2').set_from_file(grnotify_app.iconNew)
         self.xml.get_widget('buttonchooseiconnew2').connect("clicked", self.iconclicked, "new")
         self.xml.get_widget('imagechooseiconnonew2').set_from_file(grnotify_app.iconNoNew)
@@ -647,22 +646,22 @@ class configure_window:
         self.fileselect.add_filter(filter)
 
         response = self.fileselect.run()
-        
+
         if response == gtk.RESPONSE_OK:
             self.iconget(widget,data)
         elif response == gtk.RESPONSE_CANCEL:
             self.fileselect.destroy()
-        
+
     def iconget(self, widget, data=None):
         filename = self.fileselect.get_filename()
         self.fileselect.destroy()
-        
+
         if(not filename.endswith('.gif') and not filename.endswith('.png') and not filename.endswith('.xpm')):
             return
-        
+
         if(not os.stat(filename).st_size > 0):
             return
-        
+
         if ( data == 'new' ):
             gtk.gdk.pixbuf_new_from_file(filename).scale_simple(24, 24, gtk.gdk.INTERP_NEAREST).save(os.path.join(os.environ['HOME'], '.grnotify/newtemp.png'), "png", {})
             self.fileiconnew = 'changed'
@@ -674,7 +673,7 @@ class configure_window:
             self.fileiconbroken = 'changed'
         self.xml.get_widget('imagechooseicon' + data + '2').set_from_file(os.path.join(os.environ['HOME'], '.grnotify/' + data + 'temp.png'))
 
-    def get_info(self):	
+    def get_info(self):
         grnotify_app.user = self.xml.get_widget('username_entry2').get_text()
         grnotify_app.passwd = self.xml.get_widget('password_entry2').get_text()
         grnotify_app.waitTime =int( self.xml.get_widget('spinbutton1').get_text()) * 60
@@ -695,8 +694,8 @@ class configure_window:
             grnotify_app.iconNoNew = '/usr/share/pixmaps/grnotify/nonew.gif'
             grnotify_app.iconBroken = '/usr/share/pixmaps/grnotify/broken.gif'
         grnotify_app.numberFeeds = int (self.xml.get_widget('spinbutton3').get_text())
-        grnotify_app.showCounter = self.xml.get_widget('showcounter1').get_active() 
-        grnotify_app.showNotification = self.xml.get_widget('showpopups1').get_active() 
+        grnotify_app.showCounter = self.xml.get_widget('showcounter1').get_active()
+        grnotify_app.showNotification = self.xml.get_widget('showpopups1').get_active()
         grnotify_app.openReader = not self.xml.get_widget('combobox2').get_active()
 	grnotify_app.autoHide = self.xml.get_widget('autohide').get_active()
 	grnotify_app.useKeyRing = self.xml.get_widget('gnomekeyring').get_active()
@@ -705,7 +704,7 @@ class configure_window:
     def on_save_button_clicked(self, button=None, data=None):
     #Get global access to the config_changed variable
         #Aquire the new data
-        self.get_info()	
+        self.get_info()
 
         #Save the new data to the config file
         grnotify_app.saveConfig()
@@ -717,12 +716,12 @@ class configure_window:
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-    
+
 if __name__ == "__main__" :
     gtk.gdk.threads_init()
-    
+
     # create the grnotify object (and icon)
-    
+
     #readConfig() # fix by Eric Lembregts -> needed to know where the icon's are located!!
     grnotify_app = grnotify()
     grnotify_app.start()
@@ -734,5 +733,5 @@ if __name__ == "__main__" :
     name = dbus.service.BusName("org.gnome.feed.Reader", session_bus)
     reader = DBusReader(session_bus, '/org/gnome/feed/Reader')
     mainloop = gobject.MainLoop()
-    
+
     gtk.main()


--- NEW FILE grnotify-setup.py ---
#/usr/bin/python
"""Copyright (C) 2009  Kristof Bamps

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
"""
from distutils.core import setup
from os import path
import sys

DATA_DIR =  path.join('share')
PIXMAPS_DIR = path.join(DATA_DIR , 'pixmaps')
APP_DIR = path.join(DATA_DIR , 'applications')

setup(
    name='grnotify',
    version='1.1.2',
    author='Kristof Bamps',
    author_email='bamps DOT kristof AT gmail.com',
    url='https://sourceforge.net/projects/grnotify/',
    license='GPLv2+',
    description='A Google Reader in python',
    platforms='Any',
    py_modules=['GoogleReader'],
    scripts=['grnotify'],
    data_files=[
        (PIXMAPS_DIR + "/grnotify",
                ['pixmaps/broken.gif', 'pixmaps/new.gif', 'pixmaps/nonew.gif']),
        (PIXMAPS_DIR, 
                ['pixmaps/grnotify.xpm']),
        (DATA_DIR + "/grnotify",
                ['share/about.glade', 'share/config.glade', 'share/feed.glade']),
        (APP_DIR,
                ['share/grnotify.desktop'])
    ]
)


Index: grnotify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grnotify/F-10/grnotify.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grnotify.spec	24 Feb 2009 23:53:22 -0000	1.1
+++ grnotify.spec	9 Apr 2009 06:20:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           grnotify
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Google Reader Notifier
 
 Group:          Applications/Internet
@@ -10,7 +10,8 @@
 URL:            http://grnotify.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
 Source1:        %{name}.desktop
-Source2:        setup.py
+Source2:        %{name}-setup.py
+Patch0:         %{name}-%{version}-fixurl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -34,7 +35,8 @@
 
 %prep
 %setup -q
-cp -p %{SOURCE2} ./
+%patch0 -p1 -b .fixurl
+cp -p %{SOURCE2} ./setup.py
 
 # rpmlint : "grnotify.noarch: E: non-executable-script /usr/lib/python2.5/site-packages/grnotify/GoogleReader.py 0644"
 sed -i -e "s@#!/usr/bin/python@@" GoogleReader.py
@@ -79,6 +81,12 @@
 
 
 %changelog
+* Thu Apr 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-6
+- Add patch for fix GReader URL
+
+* Sat Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-5
+- Rename setup.py in grnotify-setup.py
+
 * Sat Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-4
 - Fix vendor tag in desktop file
 


--- setup.py DELETED ---



From llaumgui at fedoraproject.org  Thu Apr  9 06:21:43 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu,  9 Apr 2009 06:21:43 +0000 (UTC)
Subject: rpms/grnotify/devel grnotify-1.1.2-fixurl.patch, NONE,
	1.1 grnotify-setup.py, NONE, 1.1 grnotify.spec, 1.1,
	1.2 setup.py, 1.1, NONE
Message-ID: <20090409062143.336277001C@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/grnotify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3240

Modified Files:
	grnotify.spec 
Added Files:
	grnotify-1.1.2-fixurl.patch grnotify-setup.py 
Removed Files:
	setup.py 
Log Message:
Fix GReader URL


grnotify-1.1.2-fixurl.patch:

--- NEW FILE grnotify-1.1.2-fixurl.patch ---
diff -up grnotify-1.1.2/grnotify.patch grnotify-1.1.2/grnotify
--- grnotify-1.1.2/grnotify.patch	2009-01-31 22:32:30.000000000 +0100
+++ grnotify-1.1.2/grnotify	2009-04-09 08:07:18.420146374 +0200
@@ -37,13 +37,13 @@ VERSION = '1.1.2'
 
 #########
 #Main class: the tray icon
-#	
+#
 class grnotify(Thread):
-    
+
     #--------------------------------------------
     # initialization
     #--------------------------------------------
-    
+
     #configuration options if there is no config file
     def initialConfig(self):
         if not (os.path.exists(os.path.join(os.environ['HOME'], '.grnotify/'))):
@@ -65,8 +65,8 @@ class grnotify(Thread):
         self.autoHide = False
         self.useKeyRing = True
 	self.ok = False
-                
-                
+
+
     def saveConfig(self):
         CONFIGFILE = os.path.join(os.environ['HOME'], '.grnotify/config')
         config = ConfigParser.ConfigParser()
@@ -87,7 +87,7 @@ class grnotify(Thread):
         config.set("Icons", "New items icon", self.iconNew)
         config.set("Icons", "No new items icon", self.iconNoNew)
         config.set("Icons", "Broken icon", self.iconBroken)
-        
+
         config.write(open(CONFIGFILE, 'w'))
 
     def readConfig(self):
@@ -109,7 +109,7 @@ class grnotify(Thread):
 		self.openReader = config.get("User settings", "open reader").lower() != "false"
 		self.autoHide = config.get("User settings", "autohide").lower() != "false"
 		self.useKeyRing = config.get("User settings", "useKeyRing").lower() != "false"
-		
+
 		self.iconNew = config.get("Icons", "New items icon")
 		self.iconNoNew = config.get("Icons", "No new items icon")
 		self.iconBroken = config.get("Icons", "Broken icon")
@@ -119,17 +119,17 @@ class grnotify(Thread):
 		os.remove(CONFIGFILE)
 	else:
 	    self.newUser = True
-            
+
     def saveKeyRing(self, passwd):
         keyring = "login"
         try:
-            
+
             import gnomekeyring
             import gconf
             gnomekeyring.create_sync(keyring, None)
         except gnomekeyring.AlreadyExistsError:
             pass
-        
+
         try:
             auth_token = gnomekeyring.item_create_sync(
                 keyring,
@@ -146,16 +146,16 @@ class grnotify(Thread):
         keyring = "login"
         password = ''
         try:
-            
+
             import gnomekeyring
             import gconf
-            gnomekeyring.create_sync(keyring, None)  
-        except gnomekeyring.AlreadyExistsError:  
-            pass 
+            gnomekeyring.create_sync(keyring, None)
+        except gnomekeyring.AlreadyExistsError:
+            pass
         auth_token = gconf.client_get_default().get_int("/apps/grnotify/keyring_auth_token")
         if auth_token > 0:
             try:
-                password = gnomekeyring.item_get_info_sync(keyring, 
+                password = gnomekeyring.item_get_info_sync(keyring,
                             auth_token).get_secret()
             except:
                 pass
@@ -165,8 +165,7 @@ class grnotify(Thread):
         url = "https://www.google.com/accounts/ServiceLoginAuth?" + \
           urllib.urlencode({'Email':grnotify_app.greader.email}) + "&" + \
           urllib.urlencode({'Passwd':grnotify_app.greader.passwd}) + \
-          "&service=reader&continue=" + \
-          "https://www.google.com/reader&nui=1" 
+          "&continue=https://www.google.com/reader&nui=1"
         webbrowser.open_new_tab(url)
 
     def __init__(self):
@@ -182,46 +181,46 @@ class grnotify(Thread):
         self.tray_icon = egg.trayicon.TrayIcon("grnotify")
 
         # create a eventbox object which is going to be added to the trayicon object
-        self.grnotify_eventbox = gtk.EventBox()  
+        self.grnotify_eventbox = gtk.EventBox()
 
         # add the eventbox object to the trayicon object for event handling (click, scroll)
         self.tray_icon.add(self.grnotify_eventbox)
-        
+
         # connect "click" event to their handlers
         self.grnotify_eventbox.connect("button_press_event", self.clicked)
-        
-        
+
+
         # create container
         self.traycontainer = gtk.HBox()
-        
+
         # create the image object
         self.icon = gtk.Image()
         # and the unread label
         self.unread_label = gtk.Label('? ')
-        
+
         # set the image pixmap
         self.icon.set_from_file(self.iconBroken)
         # add the image object to the tray container
         self.traycontainer.pack_start(self.icon, False, False, padding = 0)
         self.traycontainer.pack_start(self.unread_label, False, False, padding = 0)
         self.grnotify_eventbox.add(self.traycontainer)
-        
-        
+
+
         # create the tooltip, pass it the actual information and add it to the grnotify_eventbox
         self.tooltip = gtk.Tooltips()
         self.tooltip_message = "Getting feed info"
         self.tooltip.set_tip(self.grnotify_eventbox,self.tooltip_message)
         self.tooltip.enable()
-        
+
         # show the trayicon (+ etc.)
-        self.tray_icon.show_all() 
+        self.tray_icon.show_all()
         # self.properties = properties_dialog()
         self.menu = tray_menu(self)
         self.about = about_dialog()
 
     #
     #---- clicked  :the eventbox (from the trayicon) click event handler
-    #       
+    #
     def clicked(self,widget,event):
         # right click
         if event.button == 3:
@@ -231,31 +230,31 @@ class grnotify(Thread):
         if event.button == 1:
             if self.ok and self.openReader:
                 self.openGoogleReader()
-            else:	
+            else:
                 self.getUnreadFeeds()
-                
+
     def run(self):
 	if self.newUser:
 		configure_window()
 	while not self.ok:
 		self.refresh()
 		time.sleep(30)
-        while (1):  
+        while (1):
             time.sleep(self.waitTime)
             self.refresh()
-    
+
     def refresh(self, forced = False):
-	    if self.broken:		
+	    if self.broken:
 		self.notification('Please fill in your info in preferences')
 		self.broken = False
             self.refresher = updater(forced)
             self.refresher.start()
-            
+
     def updateToolTip(self):
         gtk.gdk.threads_enter()
 	if self.ok:
 	    message = str(self.greader.totalUnread) + ' unread item'
-	    if self.greader.totalUnread != 1: 
+	    if self.greader.totalUnread != 1:
 		message += 's'
 	    i = 0
 	    for feed in self.feeds:
@@ -266,7 +265,7 @@ class grnotify(Thread):
 	    message = 'Something went wrong.\nPlease check your internet connection and settings.'
         self.tooltip.set_tip(self.grnotify_eventbox, message)
         gtk.gdk.threads_leave()
-        
+
     def updateIcon(self):
         gtk.gdk.threads_enter()
         if not self.ok:
@@ -280,13 +279,13 @@ class grnotify(Thread):
             grnotify_app.unread_label.set_text(str(self.greader.totalUnread)+ ' ')
         grnotify_app.icon.show_all()
         grnotify_app.unread_label.show_all()
-        
+
         if not self.showCounter or self.greader.totalUnread == 0:
             grnotify_app.unread_label.hide()
         if self.autoHide and self.greader.totalUnread == 0:
             grnotify_app.icon.hide()
         gtk.gdk.threads_leave()
-        
+
     #shows the notification
     def notify(self, current, previous):
         try:
@@ -297,7 +296,7 @@ class grnotify(Thread):
                     self.notification("You have " + str(current-previous) + " new unread items")
         except:
             pass
-        
+
     def notification(self, message):
         if self.showNotification:
             #try:
@@ -308,7 +307,7 @@ class grnotify(Thread):
                     bubble.show()
             #except:
              #   pass
-                
+
 ######################### BEGIN CLASS TRAY MENU ##########################
 #Create the configure window
 #Written by Kristof Bamps @ Feb 5 2008
@@ -323,10 +322,10 @@ class tray_menu:
     # create the menu separator menu item object
         menu_item_refresh = gtk.ImageMenuItem('gtk-refresh',None)
         menu_item_refresh.connect('activate',self.refresh_clicked)
-        
+
         menu_google_reader = gtk.ImageMenuItem ('Open Google Reader', None)
         menu_google_reader.connect ('activate', self.openGoogleReader)
-        
+
         menu_mark_read = gtk.ImageMenuItem ('Mark all as read', None)
         menu_mark_read.connect('activate', self.markAllRead)
         if (self.parent.greader.totalUnread == 0 ):
@@ -354,71 +353,71 @@ class tray_menu:
         self.window.add(menu_item_feed)
         self.window.add(menu_item_preferences)
         self.window.add (gtk.SeparatorMenuItem())
-        
+
         view_item = gtk.Menu()
-        menu_view_item = gtk.MenuItem ('View Items', None)		
+        menu_view_item = gtk.MenuItem ('View Items', None)
         menu_view_item.set_submenu (view_item)
         self.setTitels(view_item)
         if (self.parent.greader.totalUnread == 0 or self.parent.numberTitles == 0):
             menu_view_item.set_sensitive (0)
         self.window.add (menu_view_item)
-        
+
         self.window.add (gtk.SeparatorMenuItem())
     # add the about menu item to the menu object
         self.window.add(menu_item_about)
-        
+
     # create the quit menu item object with it's icon
         menu_item_quit = gtk.ImageMenuItem('gtk-quit',None)
 
     # connect a handler to it
         menu_item_quit.connect('activate',self.exit)
 
-    # add the quit menu item to the menu object    
+    # add the quit menu item to the menu object
         self.window.add(menu_item_quit)
-        
+
     # show the menu
-        self.window.show_all() 
+        self.window.show_all()
     def exit(self,widget):
-    # quit menu item handler -> quit the application 
+    # quit menu item handler -> quit the application
         os.system("kill " + str (os.getpid()))
-        
+
     def feed_clicked (self, widget):
         popup = feedPopup()
-        
+
     def markAllRead (self, widget):
         self.parent.greader.markAllRead()
         self.parent.refresh()
-        
+
     def refresh_clicked (self, widget):
         self.parent.refresh()
-    
+
     def preferences_clicked (self, widget):
         configureWindow = configure_window()
-    
+
     def about_clicked(self,widget):
     # about menu item handler -> create the about window
         grnotify_app.about.create()
-        
+
     def popup(self,event):
     # popup-show the menu
-        self.window.popup( None, None, None, 0, event.time); 
-    
+        self.window.popup( None, None, None, 0, event.time);
+
     def close(self,widget):
         # the warning close button has been clicked (or the window was closed else way)
         grnotify_app.warning_close_button = True
-        
+
         # the window isn't opened
         grnotify_app.warning_window_opened = False
         self.window.destroy()
-        
+
     def openGoogleReader(self, widget = None):
         url = "https://www.google.com/accounts/ServiceLoginAuth?" + \
           urllib.urlencode({'Email':grnotify_app.greader.email}) + "&" + \
           urllib.urlencode({'Passwd':grnotify_app.greader.passwd}) + \
           "&service=reader&continue=" + \
-          "https://www.google.com/reader&nui=1" 
+          "https://www.google.com/reader&nui=1"
         webbrowser.open_new_tab(url)
-        
+
     def openlink(self, item):
         i = 0
         for item2 in self.items:
@@ -427,18 +426,18 @@ class tray_menu:
                 self.markRead(self.titles[i].id, self.titles[i].feed)
                 self.parent.refresh(forced=True)
             i = i+1
-            
+
     def markRead(self, id, feed):
         req = urllib2.Request ('http://www.google.com/reader/api/0/token')
         f = urllib2.urlopen (req)
         token = f.read()
-        
+
         data = { 'i' : id, 's' : feed, 'T' : token, 'ac' : 'edit-tags' , 'a' : 'user/-/state/com.google/read' }
         data = urllib.urlencode (data)
         url = 'http://www.google.com/reader/api/0/edit-tag'
         req = urllib2.Request (url, data)
         f = urllib2.urlopen (req)
-        
+
     def setTitels(self, menu) :
             self.items = []
             self.titles = []
@@ -449,7 +448,7 @@ class tray_menu:
                         self.items.append(gtk.MenuItem (title.title, None))
                         self.items[-1].connect ('activate', self.openlink)
                         menu.add (self.items[-1])
-                        
+
                 else:
                     self.menus = []
                     self.feedMenus = []
@@ -469,14 +468,14 @@ class tray_menu:
                             menu.add(self.menus[-1])
                         else:
                             del self.menus[-1]
-            
+
 class about_dialog:
     def create(self):
         CONFIG = '/usr/share/grnotify/'
         # set the glade file
-        self.gladefile = CONFIG + "about.glade"  
+        self.gladefile = CONFIG + "about.glade"
 
-        # create the widget three  
+        # create the widget three
         self.wTree = gtk.glade.XML(self.gladefile, "window_about")
         self.wTree.signal_autoconnect(self)
 
@@ -495,7 +494,7 @@ class about_dialog:
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-        
+
 class updater (Thread):
     def __init__(self, forced = False):
         Thread.__init__(self)
@@ -506,8 +505,8 @@ class updater (Thread):
 		    grnotify_app.greader.login(grnotify_app.user, grnotify_app.passwd)
 	    grnotify_app.feeds = grnotify_app.greader.getUnreadFeeds()
 	    grnotify_app.ok = True
-	    
-	    
+
+
 	    grnotify_app.updateToolTip()
 	    grnotify_app.updateIcon()
 	    if grnotify_app.unread != grnotify_app.greader.totalUnread or self.forced:
@@ -519,31 +518,31 @@ class updater (Thread):
 	    grnotify_app.updateToolTip()
 	    grnotify_app.updateIcon()
             pass
-            
-            
+
+
 class feedPopup:
     def __init__(self):
         CONFIG = '/usr/share/grnotify/'
 
     #Create the dialog
         self.gladefile = CONFIG + "feed.glade"
-        self.xml = gtk.glade.XML(self.gladefile)  
+        self.xml = gtk.glade.XML(self.gladefile)
         self.xml.signal_autoconnect(self)
         self.window = self.xml.get_widget('main_window')
         self.window.set_title('GrNotify: Add feed')
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-        
+
     def on_save_button_clicked(self, button=None, data=None):
        # try:
-            
+
             feed = self.xml.get_widget('entry1').get_text()
             self.window.destroy()
             addFeed(feed).start()
-         
+
 class addFeed(Thread):
-    def __init__(self, feed):        
+    def __init__(self, feed):
         self.feed = feed
         Thread.__init__(self)
     def run(self):
@@ -551,7 +550,7 @@ class addFeed(Thread):
             req = urllib2.Request ('http://www.google.com/reader/api/0/token')
             f = urllib2.urlopen (req)
             token = f.read()
-            
+
             data = { 's' : 'feed/' + self.feed, 'T' : token, 'ac' : 'subscribe'}
             data = urllib.urlencode (data)
             url = 'http://www.google.com/reader/api/0/subscription/edit?client=contact:' + grnotify_app.user
@@ -560,16 +559,16 @@ class addFeed(Thread):
             grnotify_app.refresh()
         except:
             pass
-        
+
 class DBusReader(dbus.service.Object):
-  @dbus.service.method("org.gnome.feed.Reader", 
+  @dbus.service.method("org.gnome.feed.Reader",
                         in_signature="s", out_signature="b")
   def Subscribe(self, url):
     try:
       req = urllib2.Request('http://www.google.com/reader/api/0/token')
       f = urllib2.urlopen(req)
       token = f.read()
-      
+
       data = {'s': 'feed/' + url, 'T': token, 'ac': 'subscribe'}
       data = urllib.urlencode(data)
       req = urllib2.Request('http://www.google.com/reader/api/0/subscription/edit?client=contact:' + grnotify_app.user, data)
@@ -580,7 +579,7 @@ class DBusReader(dbus.service.Object):
       return True
     except:
       return False
-    
+
 class configure_window:
     def __init__(self):
     #Set variables
@@ -588,7 +587,7 @@ class configure_window:
 
     #Create the dialog
         self.gladefile = CONFIG + "config.glade"
-        self.xml = gtk.glade.XML(self.gladefile)  
+        self.xml = gtk.glade.XML(self.gladefile)
         self.xml.signal_autoconnect(self)
         self.window = self.xml.get_widget('main_window')
 
@@ -602,11 +601,11 @@ class configure_window:
         self.xml.get_widget('spinbutton1').set_text( str( ( grnotify_app.waitTime - grnotify_app.waitTime % 60 ) / 60) )
         self.xml.get_widget('spinbutton2').set_text( str( grnotify_app.waitTime % 60 ) )
         self.xml.get_widget('spinbutton3').set_text( str( grnotify_app.numberFeeds ) )
-        if( grnotify_app.showCounter == True ):	
+        if( grnotify_app.showCounter == True ):
             self.xml.get_widget('showcounter1').set_active(1)
         if grnotify_app.showNotification == True:
             self.xml.get_widget('showpopups1').set_active(1)
-        #Set the appropriate images to the icon chosers!!!		
+        #Set the appropriate images to the icon chosers!!!
         self.xml.get_widget('imagechooseiconnew2').set_from_file(grnotify_app.iconNew)
         self.xml.get_widget('buttonchooseiconnew2').connect("clicked", self.iconclicked, "new")
         self.xml.get_widget('imagechooseiconnonew2').set_from_file(grnotify_app.iconNoNew)
@@ -647,22 +646,22 @@ class configure_window:
         self.fileselect.add_filter(filter)
 
         response = self.fileselect.run()
-        
+
         if response == gtk.RESPONSE_OK:
             self.iconget(widget,data)
         elif response == gtk.RESPONSE_CANCEL:
             self.fileselect.destroy()
-        
+
     def iconget(self, widget, data=None):
         filename = self.fileselect.get_filename()
         self.fileselect.destroy()
-        
+
         if(not filename.endswith('.gif') and not filename.endswith('.png') and not filename.endswith('.xpm')):
             return
-        
+
         if(not os.stat(filename).st_size > 0):
             return
-        
+
         if ( data == 'new' ):
             gtk.gdk.pixbuf_new_from_file(filename).scale_simple(24, 24, gtk.gdk.INTERP_NEAREST).save(os.path.join(os.environ['HOME'], '.grnotify/newtemp.png'), "png", {})
             self.fileiconnew = 'changed'
@@ -674,7 +673,7 @@ class configure_window:
             self.fileiconbroken = 'changed'
         self.xml.get_widget('imagechooseicon' + data + '2').set_from_file(os.path.join(os.environ['HOME'], '.grnotify/' + data + 'temp.png'))
 
-    def get_info(self):	
+    def get_info(self):
         grnotify_app.user = self.xml.get_widget('username_entry2').get_text()
         grnotify_app.passwd = self.xml.get_widget('password_entry2').get_text()
         grnotify_app.waitTime =int( self.xml.get_widget('spinbutton1').get_text()) * 60
@@ -695,8 +694,8 @@ class configure_window:
             grnotify_app.iconNoNew = '/usr/share/pixmaps/grnotify/nonew.gif'
             grnotify_app.iconBroken = '/usr/share/pixmaps/grnotify/broken.gif'
         grnotify_app.numberFeeds = int (self.xml.get_widget('spinbutton3').get_text())
-        grnotify_app.showCounter = self.xml.get_widget('showcounter1').get_active() 
-        grnotify_app.showNotification = self.xml.get_widget('showpopups1').get_active() 
+        grnotify_app.showCounter = self.xml.get_widget('showcounter1').get_active()
+        grnotify_app.showNotification = self.xml.get_widget('showpopups1').get_active()
         grnotify_app.openReader = not self.xml.get_widget('combobox2').get_active()
 	grnotify_app.autoHide = self.xml.get_widget('autohide').get_active()
 	grnotify_app.useKeyRing = self.xml.get_widget('gnomekeyring').get_active()
@@ -705,7 +704,7 @@ class configure_window:
     def on_save_button_clicked(self, button=None, data=None):
     #Get global access to the config_changed variable
         #Aquire the new data
-        self.get_info()	
+        self.get_info()
 
         #Save the new data to the config file
         grnotify_app.saveConfig()
@@ -717,12 +716,12 @@ class configure_window:
     def on_close_button_clicked(self, button=None, data=None):
     #Close the dialog
         self.window.destroy()
-    
+
 if __name__ == "__main__" :
     gtk.gdk.threads_init()
-    
+
     # create the grnotify object (and icon)
-    
+
     #readConfig() # fix by Eric Lembregts -> needed to know where the icon's are located!!
     grnotify_app = grnotify()
     grnotify_app.start()
@@ -734,5 +733,5 @@ if __name__ == "__main__" :
     name = dbus.service.BusName("org.gnome.feed.Reader", session_bus)
     reader = DBusReader(session_bus, '/org/gnome/feed/Reader')
     mainloop = gobject.MainLoop()
-    
+
     gtk.main()


--- NEW FILE grnotify-setup.py ---
#/usr/bin/python
"""Copyright (C) 2009  Kristof Bamps

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
"""
from distutils.core import setup
from os import path
import sys

DATA_DIR =  path.join('share')
PIXMAPS_DIR = path.join(DATA_DIR , 'pixmaps')
APP_DIR = path.join(DATA_DIR , 'applications')

setup(
    name='grnotify',
    version='1.1.2',
    author='Kristof Bamps',
    author_email='bamps DOT kristof AT gmail.com',
    url='https://sourceforge.net/projects/grnotify/',
    license='GPLv2+',
    description='A Google Reader in python',
    platforms='Any',
    py_modules=['GoogleReader'],
    scripts=['grnotify'],
    data_files=[
        (PIXMAPS_DIR + "/grnotify",
                ['pixmaps/broken.gif', 'pixmaps/new.gif', 'pixmaps/nonew.gif']),
        (PIXMAPS_DIR, 
                ['pixmaps/grnotify.xpm']),
        (DATA_DIR + "/grnotify",
                ['share/about.glade', 'share/config.glade', 'share/feed.glade']),
        (APP_DIR,
                ['share/grnotify.desktop'])
    ]
)


Index: grnotify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grnotify/devel/grnotify.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grnotify.spec	24 Feb 2009 23:50:10 -0000	1.1
+++ grnotify.spec	9 Apr 2009 06:21:12 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           grnotify
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Google Reader Notifier
 
 Group:          Applications/Internet
@@ -10,7 +10,8 @@
 URL:            http://grnotify.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
 Source1:        %{name}.desktop
-Source2:        setup.py
+Source2:        %{name}-setup.py
+Patch0:         %{name}-%{version}-fixurl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -34,7 +35,8 @@
 
 %prep
 %setup -q
-cp -p %{SOURCE2} ./
+%patch0 -p1 -b .fixurl
+cp -p %{SOURCE2} ./setup.py
 
 # rpmlint : "grnotify.noarch: E: non-executable-script /usr/lib/python2.5/site-packages/grnotify/GoogleReader.py 0644"
 sed -i -e "s@#!/usr/bin/python@@" GoogleReader.py
@@ -79,6 +81,12 @@
 
 
 %changelog
+* Thu Apr 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-6
+- Add patch for fix GReader URL
+
+* Sat Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-5
+- Rename setup.py in grnotify-setup.py
+
 * Sat Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-4
 - Fix vendor tag in desktop file
 


--- setup.py DELETED ---



From jsafrane at fedoraproject.org  Thu Apr  9 08:10:58 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu,  9 Apr 2009 08:10:58 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi.spec,1.13,1.14
Message-ID: <20090409081058.2EC5A7001C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1235

Modified Files:
	freeipmi.spec 
Log Message:
Update to freeipmi-0.7.7


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freeipmi.spec	10 Mar 2009 18:00:15 -0000	1.13
+++ freeipmi.spec	9 Apr 2009 08:10:26 -0000	1.14
@@ -5,11 +5,11 @@
 %if %{?_with_debug:1}%{!?_with_debug:0}
 Release: 1.debug%{?dist}
 %else
-Release: 2%{?dist}
+Release: 1%{?dist}
 %endif
 
 Name: freeipmi
-Version: 0.7.6
+Version: 0.7.7
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -328,6 +328,9 @@
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Thu Apr  9 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.7-1
+- Update to freeipmi-0.7.7
+
 * Tue Mar 10 2009 Jesse Keating <jkeating at redhat.com> - 0.7.6-2
 - Fix the bad dist macro
 - Remove version define, that's what the Version line is for



From jsafrane at fedoraproject.org  Thu Apr  9 08:14:40 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu,  9 Apr 2009 08:14:40 +0000 (UTC)
Subject: rpms/freeipmi/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090409081440.C711370137@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2538

Modified Files:
	.cvsignore sources 
Log Message:
Update to freeipmi-0.7.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Mar 2009 11:25:03 -0000	1.6
+++ .cvsignore	9 Apr 2009 08:14:10 -0000	1.7
@@ -1 +1 @@
-freeipmi-0.7.6.tar.gz
+freeipmi-0.7.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Mar 2009 11:25:04 -0000	1.6
+++ sources	9 Apr 2009 08:14:10 -0000	1.7
@@ -1 +1 @@
-c04419b47f525b132fc3e93afb2ed3fc  freeipmi-0.7.6.tar.gz
+8d616522c419132fa318a96cc2ab4a10  freeipmi-0.7.7.tar.gz



From kkofler at fedoraproject.org  Thu Apr  9 08:39:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  9 Apr 2009 08:39:59 +0000 (UTC)
Subject: rpms/xine-lib/F-10 .cvsignore, 1.20, 1.21 sources, 1.21,
	1.22 xine-lib.spec, 1.58, 1.59 xine-lib-safe-audio-pause3.patch,
	1.1, NONE
Message-ID: <20090409083959.B466B7001C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10858/F-10

Modified Files:
	.cvsignore sources xine-lib.spec 
Removed Files:
	xine-lib-safe-audio-pause3.patch 
Log Message:
Sync from devel (fixes CVE-2009-1274):

* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
- xine-lib-1.1.16.3, plugin-abi 1.26

* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-6
- add-mime-for-mod.patch 

* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16.2-5
- rebuild for new ImageMagick

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Feb 2009 23:14:52 -0000	1.20
+++ .cvsignore	9 Apr 2009 08:39:29 -0000	1.21
@@ -1,2 +1,2 @@
-xine-lib-1.1.16.2-pruned.tar.bz2
-xine-lib-1.1.16.2-autotools.patch.bz2
+xine-lib-1.1.16.3-autotools.patch.bz2
+xine-lib-1.1.16.3-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Feb 2009 23:14:52 -0000	1.21
+++ sources	9 Apr 2009 08:39:29 -0000	1.22
@@ -1,2 +1,2 @@
-e2c3a178be02f5c32957b2716123aa28  xine-lib-1.1.16.2-pruned.tar.bz2
-07bf186d51b8315026453a2f21b33703  xine-lib-1.1.16.2-autotools.patch.bz2
+e50122a9323107564d58056b35256610  xine-lib-1.1.16.3-autotools.patch.bz2
+0cac86b7d74c1dcaa22f5a8cbc5ef578  xine-lib-1.1.16.3-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xine-lib.spec	20 Feb 2009 13:42:07 -0000	1.58
+++ xine-lib.spec	9 Apr 2009 08:39:29 -0000	1.59
@@ -4,7 +4,7 @@
 #   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 # - deprecate ESD support?
 
-%define         abiver      1.25
+%define         plugin_abi  1.26
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -33,8 +33,8 @@
 
 Summary:        A multimedia engine 
 Name:           xine-lib
-Version:        1.1.16.2
-Release:        3%{?dist}
+Version:        1.1.16.3
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -56,11 +56,10 @@
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstream patches
-Patch100:	xine-lib-safe-audio-pause3.patch
 
-Provides:       xine-lib(plugin-abi) = %{abiver}
+Provides:       xine-lib(plugin-abi) = %{plugin_abi}
 %if "%{?_isa}" != "%{nil}"
-Provides:       xine-lib(plugin-abi)%{?_isa} = %{abiver}
+Provides:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
 %endif
 # X11
 BuildRequires:  libX11-devel
@@ -143,7 +142,7 @@
 Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 # -arts was split off the -extras subpackage at 1.1.7-3
 Obsoletes:      xine-lib-extras < 1.1.7-3
 
@@ -165,7 +164,7 @@
 Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 
 %description    extras
 This package contains extra plugins for %{name}:
@@ -209,8 +208,6 @@
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 
-%patch100 -p1 -b .safe_audio_pause
-
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -290,142 +287,142 @@
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{abiver}/
-%{_libdir}/xine/plugins/%{abiver}/mime.types
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/
+%{_libdir}/xine/plugins/%{plugin_abi}/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{abiver}/post/
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/post/
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{abiver}/vidix/
-%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/vidix/
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/savage_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/sis_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/unichrome_vid.so
 %endif # vidix
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_ts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
 %if %{with_xcb}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %endif # xcb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
 %if 0%{!?_without_arts:1}
 %files arts
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
 %endif
 
 %if %{with_pa}
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
 %endif
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
 %if %{with_aalib}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
 %endif # aalib
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xdirectfb.so
 %endif # directfb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -442,6 +439,18 @@
 
 
 %changelog
+* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
+- xine-lib-1.1.16.3, plugin-abi 1.26
+
+* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-6
+- add-mime-for-mod.patch 
+
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16.2-5
+- rebuild for new ImageMagick
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-3
 - xine-lib-devel muiltilib conflict (#477226)
 
@@ -461,7 +470,7 @@
 - safe-audio-pause patch (kdebug#180339)
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-2
-- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver}
+- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{plugin_abi}
 - touchup Summary/Description
 
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1


--- xine-lib-safe-audio-pause3.patch DELETED ---



From kkofler at fedoraproject.org  Thu Apr  9 08:40:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  9 Apr 2009 08:40:00 +0000 (UTC)
Subject: rpms/xine-lib/F-9 .cvsignore, 1.19, 1.20 sources, 1.20,
	1.21 xine-lib.spec, 1.53, 1.54 xine-lib-safe-audio-pause3.patch,
	1.1, NONE
Message-ID: <20090409084000.076D97001C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10858/F-9

Modified Files:
	.cvsignore sources xine-lib.spec 
Removed Files:
	xine-lib-safe-audio-pause3.patch 
Log Message:
Sync from devel (fixes CVE-2009-1274):

* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
- xine-lib-1.1.16.3, plugin-abi 1.26

* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-6
- add-mime-for-mod.patch 

* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16.2-5
- rebuild for new ImageMagick

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	10 Feb 2009 23:16:59 -0000	1.19
+++ .cvsignore	9 Apr 2009 08:39:29 -0000	1.20
@@ -1,2 +1,2 @@
-xine-lib-1.1.16.2-pruned.tar.bz2
-xine-lib-1.1.16.2-autotools.patch.bz2
+xine-lib-1.1.16.3-autotools.patch.bz2
+xine-lib-1.1.16.3-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Feb 2009 23:16:59 -0000	1.20
+++ sources	9 Apr 2009 08:39:29 -0000	1.21
@@ -1,2 +1,2 @@
-e2c3a178be02f5c32957b2716123aa28  xine-lib-1.1.16.2-pruned.tar.bz2
-07bf186d51b8315026453a2f21b33703  xine-lib-1.1.16.2-autotools.patch.bz2
+e50122a9323107564d58056b35256610  xine-lib-1.1.16.3-autotools.patch.bz2
+0cac86b7d74c1dcaa22f5a8cbc5ef578  xine-lib-1.1.16.3-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xine-lib.spec	20 Feb 2009 13:53:04 -0000	1.53
+++ xine-lib.spec	9 Apr 2009 08:39:29 -0000	1.54
@@ -4,7 +4,7 @@
 #   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 # - deprecate ESD support?
 
-%define         abiver      1.25
+%define         plugin_abi  1.26
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -33,8 +33,8 @@
 
 Summary:        A multimedia engine 
 Name:           xine-lib
-Version:        1.1.16.2
-Release:        3%{?dist}
+Version:        1.1.16.3
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -56,11 +56,10 @@
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstream patches
-Patch100:	xine-lib-safe-audio-pause3.patch
 
-Provides:       xine-lib(plugin-abi) = %{abiver}
+Provides:       xine-lib(plugin-abi) = %{plugin_abi}
 %if "%{?_isa}" != "%{nil}"
-Provides:       xine-lib(plugin-abi)%{?_isa} = %{abiver}
+Provides:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
 %endif
 # X11
 BuildRequires:  libX11-devel
@@ -143,7 +142,7 @@
 Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 # -arts was split off the -extras subpackage at 1.1.7-3
 Obsoletes:      xine-lib-extras < 1.1.7-3
 
@@ -165,7 +164,7 @@
 Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 
 %description    extras
 This package contains extra plugins for %{name}:
@@ -209,8 +208,6 @@
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 
-%patch100 -p1 -b .safe_audio_pause
-
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -290,142 +287,142 @@
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{abiver}/
-%{_libdir}/xine/plugins/%{abiver}/mime.types
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/
+%{_libdir}/xine/plugins/%{plugin_abi}/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{abiver}/post/
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/post/
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{abiver}/vidix/
-%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/vidix/
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/savage_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/sis_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/unichrome_vid.so
 %endif # vidix
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_ts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
 %if %{with_xcb}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %endif # xcb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
 %if 0%{!?_without_arts:1}
 %files arts
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
 %endif
 
 %if %{with_pa}
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
 %endif
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
 %if %{with_aalib}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
 %endif # aalib
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xdirectfb.so
 %endif # directfb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -442,6 +439,18 @@
 
 
 %changelog
+* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
+- xine-lib-1.1.16.3, plugin-abi 1.26
+
+* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-6
+- add-mime-for-mod.patch 
+
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16.2-5
+- rebuild for new ImageMagick
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-3
 - xine-lib-devel muiltilib conflict (#477226)
 
@@ -461,7 +470,7 @@
 - safe-audio-pause patch (kdebug#180339)
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-2
-- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver}
+- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{plugin_abi}
 - touchup Summary/Description
 
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1


--- xine-lib-safe-audio-pause3.patch DELETED ---



From airlied at fedoraproject.org  Thu Apr  9 10:12:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu,  9 Apr 2009 10:12:09 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.70,
	1.71 kernel.spec, 1.1521, 1.1522
Message-ID: <20090409101209.DDB8B7001C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3917

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Thu Apr 09 2009 Dave Airlie <airlied at redhat.com>
- radeon: fix some kms bugs, dac detect + screen resize


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- drm-modesetting-radeon.patch	7 Apr 2009 08:46:40 -0000	1.70
+++ drm-modesetting-radeon.patch	9 Apr 2009 10:12:07 -0000	1.71
@@ -1,9 +1,55 @@
-commit fd8377e53c5bb885904e8d1784276bdacee3a650
-Merge: e94c6e1 a6dd68b
+commit 1076a8a749c46b964ee49f5d4dc42070b1905e26
+Merge: e94c6e1 8765b83
 Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 7 18:35:27 2009 +1000
+Date:   Thu Apr 9 20:04:30 2009 +1000
 
-    Merge remote branch 'origin/drm-rawhide' into drm-f11
+    Merge branch 'drm-rawhide' into drm-f11
+
+commit 8765b83462d03fcbd2b9d2eab647d7c2d362b12a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 20:02:43 2009 +1000
+
+    radeon: commit missed change
+
+commit c6714d8fcdecbba304eb9e0745a4d8b6d0fb54b7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 20:01:12 2009 +1000
+
+    radeon: temporary dac detection fix
+
+commit d96029a52d92bd307e93e4d917c9befff246f196
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Apr 9 20:00:49 2009 +1000
+
+    radeon: fixups ported from userspace tree
+
+commit f9db70a117cc498c20e567cf53b75ccb5ad79927
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Apr 6 13:32:03 2009 -0400
+
+    radeon: fix default sclk/mclk from combios
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 28c6f86ef07c8f0067ece9d7fe40718854b19422
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Apr 6 13:29:56 2009 -0400
+
+    radeon: fix crtc routing for CRT1 on r4xx ATOM
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 78bf4641b234a99deb3820b8d7baece35a54dce6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 18:41:47 2009 +1000
+
+    radeon: reset edid if none found
+
+commit a6fe700b5e32fd4db97fda76cb32977b5f381ebd
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 18:40:57 2009 +1000
+
+    radeon: fix up dual head screens on atombios
 
 commit a6dd68b3a5dee15f59bdaabf37b6a36da18a03f4
 Author: Dave Airlie <airlied at redhat.com>
@@ -14372,7 +14418,7 @@
 +#endif /* _ATOMBIOS_H */
 diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
 new file mode 100644
-index 0000000..5332de5
+index 0000000..b7a2a6c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/atombios_crtc.c
 @@ -0,0 +1,501 @@
@@ -14600,7 +14646,7 @@
 +			if (!radeon_is_avivo(dev_priv)) {
 +				if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
 +					pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
-+				if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS)
++				if (!radeon_is_avivo(dev_priv) && (encoder->encoder_type == DRM_MODE_ENCODER_LVDS))
 +					pll_flags |= RADEON_PLL_USE_REF_DIV;
 +			}
 +			radeon_encoder = to_radeon_encoder(encoder);
@@ -14720,8 +14766,8 @@
 +	RADEON_WRITE(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
 +	RADEON_WRITE(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0);
 +	RADEON_WRITE(AVIVO_D1GRPH_Y_START + radeon_crtc->crtc_offset, 0);
-+	RADEON_WRITE(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, crtc->mode.hdisplay); /*XXX fb width in pixels*/
-+	RADEON_WRITE(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, crtc->mode.vdisplay); /*XXX fb height in pixels*/
++	RADEON_WRITE(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, crtc->fb->width);
++	RADEON_WRITE(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, crtc->fb->height);
 +
 +	fb_pitch_pixels = crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8);
 +	RADEON_WRITE(AVIVO_D1GRPH_PITCH + radeon_crtc->crtc_offset, fb_pitch_pixels);
@@ -16958,7 +17004,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..cb750f1
+index 0000000..a8d82d4
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
 @@ -0,0 +1,1767 @@
@@ -17492,8 +17538,8 @@
 +		}
 +
 +		/* default sclk/mclk */
-+		sclk = radeon_bios16(dev_priv, pll_info + 0x8);
-+		mclk = radeon_bios16(dev_priv, pll_info + 0xa);
++		sclk = radeon_bios16(dev_priv, pll_info + 0xa);
++		mclk = radeon_bios16(dev_priv, pll_info + 0x8);
 +		if (sclk == 0)
 +			sclk = 200;
 +		if (mclk == 0)
@@ -22338,10 +22384,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..0e0f1bf
+index 0000000..fd53172
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -0,0 +1,643 @@
+@@ -0,0 +1,644 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -22586,6 +22632,7 @@
 +		kfree(edid);
 +		return ret;
 +	}
++	drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
 +	return -1;
 +}
 +
@@ -23949,10 +23996,10 @@
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
-index 0000000..d3777a4
+index 0000000..433ebc9
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
-@@ -0,0 +1,1743 @@
+@@ -0,0 +1,1716 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -24174,8 +24221,7 @@
 +}
 +
 +static void
-+atombios_dac_setup(struct drm_encoder *encoder,
-+		   struct drm_display_mode *mode)
++atombios_dac_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -24200,7 +24246,7 @@
 +		break;
 +	}
 +
-+	args.ucAction = ATOM_ENABLE;
++	args.ucAction = action;
 +
 +	if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))
 +		args.ucDacStandard = ATOM_DAC1_PS2;
@@ -24223,15 +24269,14 @@
 +			break;
 +		}
 +	}
-+	args.usPixelClock = cpu_to_le16(mode->clock / 10);
++	args.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 +
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 +
 +}
 +
 +static void
-+atombios_tv_setup(struct drm_encoder *encoder,
-+		  struct drm_display_mode *mode)
++atombios_tv_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -24245,7 +24290,7 @@
 +
 +	index = GetIndexIntoMasterTable(COMMAND, TVEncoderControl);
 +
-+	args.sTVEncoder.ucAction = ATOM_ENABLE;
++	args.sTVEncoder.ucAction = action;
 +
 +	if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
 +		args.sTVEncoder.ucTvStandard = ATOM_TV_CV;
@@ -24281,18 +24326,18 @@
 +		}
 +	}
 +
-+	args.sTVEncoder.usPixelClock = cpu_to_le16(mode->clock / 10);
++	args.sTVEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 +
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 +
 +}
 +
 +void
-+atombios_external_tmds_setup(struct drm_encoder *encoder,
-+			     struct drm_display_mode *mode)
++atombios_external_tmds_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 +	ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION args;
 +	int index = 0;
 +
@@ -24300,9 +24345,9 @@
 +
 +	index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl);
 +
-+	args.sXTmdsEncoder.ucEnable = ATOM_ENABLE;
++	args.sXTmdsEncoder.ucEnable = action;
 +
-+	if (mode->clock > 165000)
++	if (radeon_encoder->pixel_clock > 165000)
 +		args.sXTmdsEncoder.ucMisc = PANEL_ENCODER_MISC_DUAL;
 +
 +	/*if (pScrn->rgbBits == 8)*/
@@ -24313,11 +24358,11 @@
 +}
 +
 +static void
-+atombios_ddia_setup(struct drm_encoder *encoder,
-+		    struct drm_display_mode *mode)
++atombios_ddia_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 +	DVO_ENCODER_CONTROL_PS_ALLOCATION args;
 +	int index = 0;
 +
@@ -24325,10 +24370,10 @@
 +
 +	index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl);
 +
-+	args.sDVOEncoder.ucAction = ATOM_ENABLE;
-+	args.sDVOEncoder.usPixelClock = cpu_to_le16(mode->clock / 10);
++	args.sDVOEncoder.ucAction = action;
++	args.sDVOEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 +
-+	if (mode->clock > 165000)
++	if (radeon_encoder->pixel_clock > 165000)
 +		args.sDVOEncoder.usDevAttr.sDigAttrib.ucAttribute = PANEL_ENCODER_MISC_DUAL;
 +
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
@@ -24341,8 +24386,7 @@
 +};
 +
 +static void
-+atombios_digital_setup(struct drm_encoder *encoder,
-+		       struct drm_display_mode *mode)
++atombios_digital_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -24397,12 +24441,12 @@
 +		switch (crev) {
 +		case 1:
 +			args.v1.ucMisc = 0;
-+			args.v1.ucAction = PANEL_ENCODER_ACTION_ENABLE;
++			args.v1.ucAction = action;
 +			/* XXX should probably check based on edid */
 +			if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
 +			    (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
 +				args.v1.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
-+			args.v1.usPixelClock = cpu_to_le16(mode->clock / 10);
++			args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 +			if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
 +				if (dig->lvds_misc & (1 << 0))
 +					args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL;
@@ -24411,7 +24455,7 @@
 +			} else {
 +				if (dig_connector->linkb)
 +					args.v1.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
-+				if (mode->clock > 165000)
++				if (radeon_encoder->pixel_clock > 165000)
 +					args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 +				/*if (pScrn->rgbBits == 8) */
 +				args.v1.ucMisc |= (1 << 1);
@@ -24420,7 +24464,7 @@
 +		case 2:
 +		case 3:
 +			args.v2.ucMisc = 0;
-+			args.v2.ucAction = PANEL_ENCODER_ACTION_ENABLE;
++			args.v2.ucAction = action;
 +			if (crev == 3) {
 +				if (dig->coherent_mode)
 +					args.v2.ucMisc |= PANEL_ENCODER_MISC_COHERENT;
@@ -24429,7 +24473,7 @@
 +			if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
 +			    (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
 +				args.v2.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
-+			args.v2.usPixelClock = cpu_to_le16(mode->clock / 10);
++			args.v2.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 +			args.v2.ucTruncate = 0;
 +			args.v2.ucSpatial = 0;
 +			args.v2.ucTemporal = 0;
@@ -24452,7 +24496,7 @@
 +			} else {
 +				if (dig_connector->linkb)
 +					args.v2.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
-+				if (mode->clock > 165000)
++				if (radeon_encoder->pixel_clock > 165000)
 +					args.v2.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 +			}
 +			break;
@@ -24537,16 +24581,15 @@
 +}
 +
 +static void
-+atombios_dig_encoder_setup(struct drm_encoder *encoder,
-+			   struct drm_display_mode *mode)
++atombios_dig_encoder_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-+	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 +	DIG_ENCODER_CONTROL_PS_ALLOCATION args;
 +	int index = 0, num = 0;
 +	uint8_t frev, crev;
++	struct radeon_encoder_atom_dig *dig;
 +	struct drm_connector *connector;
 +	struct radeon_connector *radeon_connector;
 +	struct radeon_connector_atom_dig *dig_connector;
@@ -24562,24 +24605,25 @@
 +
 +	dig_connector = radeon_connector->con_priv;
 +
++	if (!radeon_encoder->enc_priv)
++		return;
++
++	dig = radeon_encoder->enc_priv;
++
 +	memset(&args, 0, sizeof(args));
 +
 +	if (radeon_is_dce32(dev_priv)) {
-+		if (radeon_crtc->crtc_id)
++		if (dig->dig_block)
 +			index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
 +		else
 +			index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
-+		num = radeon_crtc->crtc_id + 1;
++		num = dig->dig_block + 1;
 +	} else {
 +		switch (radeon_encoder->encoder_id) {
-+		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-+		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 +		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 +			index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
 +			num = 1;
 +			break;
-+		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-+		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 +		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 +			index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
 +			num = 2;
@@ -24589,8 +24633,8 @@
 +
 +	atom_parse_cmd_header(dev_priv->mode_info.atom_context, index, &frev, &crev);
 +
-+	args.ucAction = ATOM_ENABLE;
-+	args.usPixelClock = cpu_to_le16(mode->clock / 10);
++	args.ucAction = action;
++	args.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 +
 +	if (radeon_is_dce32(dev_priv)) {
 +		switch (radeon_encoder->encoder_id) {
@@ -24606,20 +24650,16 @@
 +		}
 +	} else {
 +		switch (radeon_encoder->encoder_id) {
-+		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-+		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 +		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 +			args.ucConfig = ATOM_ENCODER_CONFIG_TRANSMITTER1;
 +			break;
-+		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-+		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 +		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 +			args.ucConfig = ATOM_ENCODER_CONFIG_TRANSMITTER2;
 +			break;
 +		}
 +	}
 +
-+	if (mode->clock > 165000) {
++	if (radeon_encoder->pixel_clock > 165000) {
 +		args.ucConfig |= ATOM_ENCODER_CONFIG_LINKA_B;
 +		args.ucLaneNum = 8;
 +	} else {
@@ -24642,13 +24682,11 @@
 +};
 +
 +static void
-+atombios_dig_transmitter_setup(struct drm_encoder *encoder,
-+			       struct drm_display_mode *mode)
++atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-+	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 +	union dig_transmitter_control args;
 +	int index = 0, num = 0;
 +	uint8_t frev, crev;
@@ -24679,13 +24717,9 @@
 +		index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl);
 +	else {
 +		switch (radeon_encoder->encoder_id) {
-+		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-+		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 +		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 +			index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl);
 +			break;
-+		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-+		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 +		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 +			index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl);
 +			break;
@@ -24694,16 +24728,16 @@
 +
 +	atom_parse_cmd_header(dev_priv->mode_info.atom_context, index, &frev, &crev);
 +
-+	args.v1.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
++	args.v1.ucAction = action;
 +
 +	if (radeon_is_dce32(dev_priv)) {
-+		if (mode->clock > 165000) {
-+			args.v2.usPixelClock = cpu_to_le16((mode->clock * 10 * 2) / 100);
++		if (radeon_encoder->pixel_clock > 165000) {
++			args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock * 10 * 2) / 100);
 +			args.v2.acConfig.fDualLinkConnector = 1;
 +		} else {
-+			args.v2.usPixelClock = cpu_to_le16((mode->clock * 10 * 4) / 100);
++			args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock * 10 * 4) / 100);
 +		}
-+		if (radeon_crtc->crtc_id)
++		if (dig->dig_block)
 +			args.v2.acConfig.ucEncoderSel = 1;
 +
 +		switch (radeon_encoder->encoder_id) {
@@ -24727,24 +24761,20 @@
 +		}
 +	} else {
 +		args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
-+		args.v1.usPixelClock = cpu_to_le16((mode->clock) / 10);
++		args.v1.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock) / 10);
 +
 +		switch (radeon_encoder->encoder_id) {
-+		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-+		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 +		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 +			args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
 +			if (dev_priv->flags & RADEON_IS_IGP) {
-+				if (mode->clock > 165000) {
++				if (radeon_encoder->pixel_clock > 165000) {
 +					args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 +							     ATOM_TRANSMITTER_CONFIG_LINKA_B);
-+					/* fixme!!! lanes are based on connector, not encoder*/
 +					if (dig_connector->igp_lane_info & 0x3)
 +						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_7;
 +					else if (dig_connector->igp_lane_info & 0xc)
 +						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_15;
 +				} else {
-+					/* fixme!!! lanes are based on connector, not encoder*/
 +					args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA;
 +					if (dig_connector->igp_lane_info & 0x1)
 +						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3;
@@ -24756,7 +24786,7 @@
 +						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15;
 +				}
 +			} else {
-+				if (mode->clock > 165000)
++				if (radeon_encoder->pixel_clock > 165000)
 +					args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 +							     ATOM_TRANSMITTER_CONFIG_LINKA_B |
 +							     ATOM_TRANSMITTER_CONFIG_LANE_0_7);
@@ -24768,11 +24798,9 @@
 +				}
 +			}
 +			break;
-+		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-+		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 +		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 +			args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
-+			if (mode->clock > 165000)
++			if (radeon_encoder->pixel_clock > 165000)
 +				args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 +						     ATOM_TRANSMITTER_CONFIG_LINKA_B |
 +						     ATOM_TRANSMITTER_CONFIG_LANE_0_7);
@@ -24790,7 +24818,6 @@
 +				args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT;
 +		}
 +	}
-+	dig->transmitter_config = args.v1.ucConfig;
 +
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 +
@@ -25028,19 +25055,37 @@
 +atombios_yuv_setup(struct drm_encoder *encoder, bool enable)
 +{
 +	struct drm_device *dev = encoder->dev;
++	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 +	ENABLE_YUV_PS_ALLOCATION args;
 +	int index = GetIndexIntoMasterTable(COMMAND, EnableYUV);
++	uint32_t temp, reg;
 +
 +	memset(&args, 0, sizeof(args));
 +
++	if (dev_priv->chip_family >= CHIP_R600)
++		reg = R600_BIOS_3_SCRATCH;
++	else
++		reg = RADEON_BIOS_3_SCRATCH;
++
++	temp = RADEON_READ(reg);
++	if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
++		RADEON_WRITE(reg, (ATOM_S3_TV1_ACTIVE |
++				(radeon_crtc->crtc_id << 18)));
++	else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
++		RADEON_WRITE(reg, (ATOM_S3_CV_ACTIVE |
++				(radeon_crtc->crtc_id << 18)));
++	else
++		RADEON_WRITE(reg, 0);
++
 +	if (enable)
 +		args.ucEnable = ATOM_ENABLE;
 +	args.ucCRTC = radeon_crtc->crtc_id;
 +
 +	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 +
++	RADEON_WRITE(reg, 0);
 +}
 +
 +static void
@@ -25093,8 +25138,7 @@
 +}
 +
 +static void
-+atombios_scaler_setup(struct drm_encoder *encoder,
-+		      struct drm_display_mode *mode)
++atombios_scaler_setup(struct drm_encoder *encoder)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -25168,57 +25212,6 @@
 +}
 +
 +static void
-+atombios_dig_dpms(struct drm_encoder *encoder, int mode)
-+{
-+	struct drm_device *dev = encoder->dev;
-+	struct drm_radeon_private *dev_priv = dev->dev_private;
-+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-+	DIG_TRANSMITTER_CONTROL_PS_ALLOCATION args;
-+	int index = 0;
-+	struct radeon_encoder_atom_dig *dig;
-+
-+	if (!radeon_encoder->enc_priv)
-+		return;
-+
-+	dig = radeon_encoder->enc_priv;
-+
-+	memset(&args, 0, sizeof(args));
-+
-+	switch (mode) {
-+	case DRM_MODE_DPMS_ON:
-+		args.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT;
-+		break;
-+	case DRM_MODE_DPMS_STANDBY:
-+	case DRM_MODE_DPMS_SUSPEND:
-+	case DRM_MODE_DPMS_OFF:
-+		args.ucAction = ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT;
-+		break;
-+	}
-+
-+	args.ucConfig = dig->transmitter_config;
-+
-+	if (radeon_is_dce32(dev_priv))
-+		index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl);
-+	else {
-+		switch (radeon_encoder->encoder_id) {
-+		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-+		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
-+		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-+			index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl);
-+			break;
-+		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-+		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
-+		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-+			index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl);
-+			break;
-+		}
-+	}
-+
-+	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
-+
-+}
-+
-+static void
 +radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
 +{
 +	struct drm_device *dev = encoder->dev;
@@ -25275,9 +25268,18 @@
 +		break;
 +	}
 +
-+	if (is_dig)
-+		atombios_dig_dpms(encoder, mode);
-+	else {
++	if (is_dig) {
++		switch (mode) {
++		case DRM_MODE_DPMS_ON:
++			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE);
++			break;
++		case DRM_MODE_DPMS_STANDBY:
++		case DRM_MODE_DPMS_SUSPEND:
++		case DRM_MODE_DPMS_OFF:
++			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE);
++			break;
++		}
++	} else {
 +		switch (mode) {
 +		case DRM_MODE_DPMS_ON:
 +			args.ucAction = ATOM_ENABLE;
@@ -25320,8 +25322,12 @@
 +		default:
 +			if (radeon_is_avivo(dev_priv))
 +				args.v1.ucCRTC = radeon_crtc->crtc_id;
-+			else
-+				args.v1.ucCRTC = radeon_crtc->crtc_id << 2;
++			else {
++				if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
++					args.v1.ucCRTC = radeon_crtc->crtc_id;
++				else
++					args.v1.ucCRTC = radeon_crtc->crtc_id << 2;
++			}
 +			switch (radeon_encoder->encoder_id) {
 +			case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
 +			case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
@@ -25447,9 +25453,17 @@
 +	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 +	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 +
++	if (radeon_encoder->enc_priv) {
++		struct radeon_encoder_atom_dig *dig;
++
++		dig = radeon_encoder->enc_priv;
++		dig->dig_block = radeon_crtc->crtc_id;
++	}
++	radeon_encoder->pixel_clock = adjusted_mode->clock;
++
 +	radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id);
 +	atombios_overscan_setup(encoder, mode, adjusted_mode);
-+	atombios_scaler_setup(encoder, adjusted_mode);
++	atombios_scaler_setup(encoder);
 +	atombios_set_encoder_crtc_source(encoder);
 +
 +	if (radeon_is_avivo(dev_priv)) {
@@ -25464,29 +25478,31 @@
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 +	case ENCODER_OBJECT_ID_INTERNAL_LVDS:
 +	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
-+		atombios_digital_setup(encoder, adjusted_mode);
++		atombios_digital_setup(encoder, PANEL_ENCODER_ACTION_ENABLE);
 +		break;
 +	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 +	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
 +	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-+		atombios_dig_encoder_setup(encoder, adjusted_mode);
-+		atombios_dig_transmitter_setup(encoder, adjusted_mode);
++		atombios_dig_encoder_setup(encoder, ATOM_ENABLE);
++		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_INIT);
++		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP);
++		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE);
 +		break;
 +	case ENCODER_OBJECT_ID_INTERNAL_DDI:
-+		atombios_ddia_setup(encoder, adjusted_mode);
++		atombios_ddia_setup(encoder, ATOM_ENABLE);
 +		break;
 +	case ENCODER_OBJECT_ID_INTERNAL_DVO1:
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
-+		atombios_external_tmds_setup(encoder, adjusted_mode);
++		atombios_external_tmds_setup(encoder, ATOM_ENABLE);
 +		break;
 +	case ENCODER_OBJECT_ID_INTERNAL_DAC1:
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
 +	case ENCODER_OBJECT_ID_INTERNAL_DAC2:
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-+		atombios_dac_setup(encoder, adjusted_mode);
++		atombios_dac_setup(encoder, ATOM_ENABLE);
 +		if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
-+			atombios_tv_setup(encoder, adjusted_mode);
++			atombios_tv_setup(encoder, ATOM_ENABLE);
 +		break;
 +	}
 +	atombios_apply_encoder_quirks(encoder, adjusted_mode);
@@ -25512,7 +25528,8 @@
 +
 +		args.sDacload.ucMisc = 0;
 +
-+		if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
++		if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1 ||
++		    radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1)
 +			args.sDacload.ucDacType = ATOM_DAC_A;
 +		else
 +			args.sDacload.ucDacType = ATOM_DAC_B;
@@ -25525,8 +25542,11 @@
 +			args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CV_SUPPORT);
 +			if (crev >= 3)
 +				args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
-+		} else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT)
++		} else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) {
 +			args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_TV1_SUPPORT);
++			if (crev >= 3)
++				args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
++		}
 +
 +		atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 +
@@ -29866,10 +29886,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
 new file mode 100644
-index 0000000..a991fb0
+index 0000000..175397c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-@@ -0,0 +1,1283 @@
+@@ -0,0 +1,1284 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -30695,7 +30715,8 @@
 +		radeon_legacy_rmx_mode_set(encoder, mode, adjusted_mode);
 +
 +	if (dev_priv->is_atom_bios) {
-+		atombios_external_tmds_setup(encoder, adjusted_mode);
++ 		radeon_encoder->pixel_clock = adjusted_mode->clock;
++ 		atombios_external_tmds_setup(encoder, ATOM_ENABLE);
 +		fp2_gen_cntl = RADEON_READ(RADEON_FP2_GEN_CNTL);
 +	} else {
 +		fp2_gen_cntl = RADEON_READ(RADEON_FP2_GEN_CNTL);
@@ -31168,7 +31189,7 @@
  
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..43c28f8
+index 0000000..963859c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
 @@ -0,0 +1,388 @@
@@ -31408,8 +31429,8 @@
 +
 +struct radeon_encoder_atom_dig {
 +	/* atom dig */
-+	uint32_t transmitter_config;
 +	bool coherent_mode;
++	int dig_block;
 +	/* atom lvds */
 +	uint32_t lvds_misc;
 +	uint16_t panel_pwr_delay;
@@ -31422,6 +31443,7 @@
 +	uint32_t encoder_id;
 +	uint32_t devices;
 +	uint32_t flags;
++	uint32_t pixel_clock;
 +	enum radeon_rmx_type rmx_type;
 +	struct radeon_native_mode native_mode;
 +	void *enc_priv;
@@ -31470,8 +31492,7 @@
 +struct drm_encoder *radeon_encoder_legacy_tv_dac_add(struct drm_device *dev, int bios_index, int with_tv);
 +struct drm_encoder *radeon_encoder_legacy_tmds_int_add(struct drm_device *dev, int bios_index);
 +struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, int bios_index);
-+extern void atombios_external_tmds_setup(struct drm_encoder *encoder,
-+					 struct drm_display_mode *mode);
++extern void atombios_external_tmds_setup(struct drm_encoder *encoder, int action);
 +extern int atombios_get_encoder_mode(struct drm_encoder *encoder);
 +
 +extern void radeon_crtc_load_lut(struct drm_crtc *crtc);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1521
retrieving revision 1.1522
diff -u -r1.1521 -r1.1522
--- kernel.spec	8 Apr 2009 21:38:33 -0000	1.1521
+++ kernel.spec	9 Apr 2009 10:12:09 -0000	1.1522
@@ -1900,6 +1900,9 @@
 # and build.
 
 %changelog
+* Thu Apr 09 2009 Dave Airlie <airlied at redhat.com>
+- radeon: fix some kms bugs, dac detect + screen resize
+
 * Wed Apr 08 2009 Adam Jackson <ajax at redhat.com>
 - Drop the PAT patch, sufficiently upstreamed now.
 



From dodji at fedoraproject.org  Thu Apr  9 10:13:10 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Thu,  9 Apr 2009 10:13:10 +0000 (UTC)
Subject: rpms/cloog/devel sources,1.4,1.5
Message-ID: <20090409101310.7E3977001C@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4276

Modified Files:
	sources 
Log Message:
Uploaded cloog-0.15-git1334c.tar.gz




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2009 21:08:03 -0000	1.4
+++ sources	9 Apr 2009 10:12:40 -0000	1.5
@@ -1 +1 @@
-0c293a1fb958b7616df742de22679deb  cloog-0.15-gitad322.tar.gz
+d430f3e244cdc3a5d16c2362b1e2c953  cloog-0.15-git1334c.tar.gz



From sharkcz at fedoraproject.org  Thu Apr  9 10:17:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  9 Apr 2009 10:17:06 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix-1.6.4-web-config.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 zabbix.spec, 1.35,
	1.36 zabbix-1.6.2-cpustats.patch, 1.1,
	NONE zabbix-1.6.3-pre.patch, 1.2, NONE
Message-ID: <20090409101706.B2A417001C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5424

Modified Files:
	.cvsignore sources zabbix.spec 
Added Files:
	zabbix-1.6.4-web-config.patch 
Removed Files:
	zabbix-1.6.2-cpustats.patch zabbix-1.6.3-pre.patch 
Log Message:
* Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-1
- update to 1.6.4
- remove the cpustat patch, it was integreated into upstream
- use noarch subpackage for the web interface
- database specific web subpackages conflicts with each other
- use common set of option for the configure macro
- enable IPMI support
- sqlite web subpackage must depend on local sqlite
- reorganize the docs and the sql scripts
- change how the web interface config file is created
- updated scriptlet for adding the zabbix user
- move the documentation in PDF to -docs subpackage
- most of the changes were submitted by Ville Skytt?? in #494706 
- Resolves: #489673, #493234, #494706


zabbix-1.6.4-web-config.patch:

--- NEW FILE zabbix-1.6.4-web-config.patch ---
--- zabbix-1.6.4/frontends/php/include/config.inc.php.orig	2009-04-09 10:26:23.000000000 +0200
+++ zabbix-1.6.4/frontends/php/include/config.inc.php	2009-04-09 10:29:00.000000000 +0200
@@ -101,8 +101,7 @@ function TODO($msg) { echo "TODO: ".$msg
 	$ZBX_LOCALNODEID = 0;
 	$ZBX_LOCMASTERID = 0;
 
-	$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
-	$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).'/'.basename($ZBX_CONFIGURATION_FILE);
+	$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
 
 	unset($show_setup);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2009 14:53:20 -0000	1.15
+++ .cvsignore	9 Apr 2009 10:16:35 -0000	1.16
@@ -1 +1 @@
-zabbix-1.6.2.tar.gz
+zabbix-1.6.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	16 Jan 2009 14:53:20 -0000	1.16
+++ sources	9 Apr 2009 10:16:35 -0000	1.17
@@ -1 +1 @@
-33da3661868a04042c596a819896446f  zabbix-1.6.2.tar.gz
+e1e15f3ab9f2c0ec9e6fde145a5a3b6e  zabbix-1.6.4.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- zabbix.spec	9 Mar 2009 20:35:57 -0000	1.35
+++ zabbix.spec	9 Apr 2009 10:16:36 -0000	1.36
@@ -1,10 +1,10 @@
 Name:           zabbix
-Version:        1.6.2
-Release:        5%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://www.zabbix.com/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
@@ -12,9 +12,8 @@
 Source3:        zabbix-agent.init
 Source4:        zabbix-proxy.init
 Source5:        zabbix-logrotate.in
-
-Patch0:         zabbix-1.6.2-cpustats.patch
-Patch1:		zabbix-1.6.3-pre.patch
+# local rules for config files
+Patch0:         zabbix-1.6.4-web-config.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +26,7 @@
 BuildRequires:   curl-devel
 BuildRequires:   sqlite-devel
 BuildRequires:   unixODBC-devel
+BuildRequires:   OpenIPMI-devel
 
 Requires:        logrotate
 Requires(pre):   /usr/sbin/useradd
@@ -51,13 +51,20 @@
 for small organisations with a few servers and for large
 companies with a multitude of servers.
 
+%package docs
+Summary:         Zabbix documentation
+Group:           Documentation
+
+%description docs
+Zabbix Reference Manual in PDF.
+
 %package server
 Summary:         Zabbix server common files
 Group:           Applications/Internet
-Requires:	 zabbix = %{version}-%{release}
+Requires:        zabbix = %{version}-%{release}
 Requires:        zabbix-server-implementation = %{version}-%{release}
 Requires:        fping
-Requires:	 net-snmp
+Requires:        net-snmp
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -69,7 +76,7 @@
 Summary:         Zabbix server compiled to use MySQL
 Group:           Applications/Internet
 Requires:        zabbix = %{version}-%{release}
-Requires:	 zabbix-server = %{version}-%{release}
+Requires:        zabbix-server = %{version}-%{release}
 Provides:        zabbix-server-implementation = %{version}-%{release}
 Obsoletes:       zabbix <= 1.5.3-0.1
 Conflicts:       zabbix-server-pgsql
@@ -82,7 +89,7 @@
 Summary:         Zabbix server compiled to use PostgresSQL
 Group:           Applications/Internet
 Requires:        zabbix = %{version}-%{release}
-Requires:	 zabbix-server = %{version}-%{release}
+Requires:        zabbix-server = %{version}-%{release}
 Provides:        zabbix-server-implementation = %{version}-%{release}
 Conflicts:       zabbix-server-mysql
 Conflicts:       zabbix-server-sqlite3
@@ -94,10 +101,10 @@
 Summary:         Zabbix server compiled to use SQLite
 Group:           Applications/Internet
 Requires:        zabbix = %{version}-%{release}
-Requires:	 zabbix-server = %{version}-%{release}
+Requires:        zabbix-server = %{version}-%{release}
 Provides:        zabbix-server-implementation = %{version}-%{release}
 Conflicts:       zabbix-server-mysql
-Conflicts:	 zabbix-server-pgsql
+Conflicts:       zabbix-server-pgsql
 
 %description server-sqlite3
 Zabbix server compiled to use SQLite
@@ -105,7 +112,7 @@
 %package agent
 Summary:         Zabbix Agent
 Group:           Applications/Internet
-Requires:	 zabbix = %{version}-%{release}
+Requires:        zabbix = %{version}-%{release}
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -116,7 +123,7 @@
 %package proxy
 Summary:         Zabbix Proxy
 Group:           Applications/Internet
-Requires:	 zabbix = %{version}-%{release}
+Requires:        zabbix = %{version}-%{release}
 Requires:        zabbix-proxy-implementation = %{version}-%{release}
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -129,7 +136,7 @@
 %package proxy-mysql
 Summary:         Zabbix proxy compiled to use MySQL
 Group:           Applications/Internet
-Requires:	 zabbix-proxy = %{version}-%{release}
+Requires:        zabbix-proxy = %{version}-%{release}
 Provides:        zabbix-proxy-implementation = %{version}-%{release}
 
 %description proxy-mysql
@@ -138,7 +145,7 @@
 %package proxy-pgsql
 Summary:         Zabbix proxy compiled to use PostgreSQL
 Group:           Applications/Internet
-Requires:	 zabbix-proxy = %{version}-%{release}
+Requires:        zabbix-proxy = %{version}-%{release}
 Provides:        zabbix-proxy-implementation = %{version}-%{release}
 
 %description proxy-pgsql
@@ -147,7 +154,7 @@
 %package proxy-sqlite3
 Summary:         Zabbix proxy compiled to use SQLite
 Group:           Applications/Internet
-Requires:	 zabbix-proxy = %{version}-%{release}
+Requires:        zabbix-proxy = %{version}-%{release}
 Provides:        zabbix-proxy-implementation = %{version}-%{release}
 
 %description proxy-sqlite3
@@ -156,11 +163,14 @@
 %package web
 Summary:         Zabbix Web Frontend
 Group:           Applications/Internet
+%if 0%{?fedora} > 9
+BuildArch:       noarch
+%endif
 Requires:        php
-Requires:	 php-gd
-Requires:	 php-bcmath
+Requires:        php-gd
+Requires:        php-bcmath
 Requires:        zabbix = %{version}-%{release}
-Requires:	 zabbix-web-database = %{version}-%{release}
+Requires:        zabbix-web-database = %{version}-%{release}
 
 %description web
 The php frontend to display the zabbix web interface.
@@ -168,10 +178,15 @@
 %package web-mysql
 Summary:         Zabbix web frontend for MySQL
 Group:           Applications/Internet
-Requires:	 zabbix-web = %{version}-%{release}
-Requires:	 php-mysql
-Provides:	 zabbix-web-database = %{version}-%{release}
-Obsoletes:	 zabbix-web <= 1.5.3-0.1
+%if 0%{?fedora} > 9
+BuildArch:       noarch
+%endif
+Requires:        zabbix-web = %{version}-%{release}
+Requires:        php-mysql
+Provides:        zabbix-web-database = %{version}-%{release}
+Conflicts:       zabbix-web-pgsql
+Conflicts:       zabbix-web-sqlite3
+Obsoletes:       zabbix-web <= 1.5.3-0.1
 
 %description web-mysql
 Zabbix web frontend for MySQL
@@ -179,9 +194,14 @@
 %package web-pgsql
 Summary:         Zabbix web frontend for PostgreSQL
 Group:           Applications/Internet
-Requires:	 zabbix-web = %{version}-%{release}
-Requires:	 php-pgsql
-Provides:	 zabbix-web-database = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:       noarch
+%endif
+Requires:        zabbix-web = %{version}-%{release}
+Requires:        php-pgsql
+Provides:        zabbix-web-database = %{version}-%{release}
+Conflicts:       zabbix-web-mysql
+Conflicts:       zabbix-web-sqlite3
 
 %description web-pgsql
 Zabbix web frontend for PostgreSQL
@@ -189,73 +209,62 @@
 %package web-sqlite3
 Summary:         Zabbix web frontend for SQLite
 Group:           Applications/Internet
-Requires:	 zabbix-web = %{version}-%{release}
-Provides:	 zabbix-web-database = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:       noarch
+%endif
+Requires:        zabbix-web = %{version}-%{release}
+# Need to use the same db file as the server
+Requires:        zabbix-server-sqlite3 = %{version}-%{release}
+Provides:        zabbix-web-database = %{version}-%{release}
+Conflicts:       zabbix-web-mysql
+Conflicts:       zabbix-web-pgsql
 
 %description web-sqlite3
 Zabbix web frontend for SQLite
 
 %prep
 %setup0 -q
-%patch0 -p1 -b .cpustats
-%patch1 -p1 -b .pre
+%patch0 -p1
 
 chmod -R a+rX .
 
 # nuke erronious executable permissions
-#chmod -x src/zabbix_agent/eventlog.c
+chmod -x src/zabbix_agent/eventlog.c
 
 # fix up some lib64 issues
 %{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
     configure
 
+# kill off .htaccess files, options set in SOURCE1
+rm -f frontends/php/include/.htaccess
+rm -f frontends/php/include/classes/.htaccess
+
+
 %build
 
-%configure \
-    --enable-server \
-    --enable-agent \
-    --enable-proxy \
-    --enable-ipv6 \
-    --with-mysql \
-    --with-net-snmp \
-    --with-ldap \
-    --with-libcurl \
-    --with-jabber \
-    --with-unixodbc
+common_flags="
+    --enable-server
+    --enable-agent
+    --enable-proxy
+    --enable-ipv6
+    --with-net-snmp
+    --with-openipmi
+    --with-ldap
+    --with-libcurl
+    --with-jabber
+    --with-unixodbc"
 
+%configure $common_flags --with-mysql
 make %{?_smp_mflags}
-
 mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_mysql
 mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_mysql
 
-%configure \
-    --enable-server \
-    --enable-agent \
-    --enable-proxy \
-    --enable-ipv6 \
-    --with-pgsql \
-    --with-net-snmp \
-    --with-ldap \
-    --with-libcurl \
-    --with-jabber \
-    --with-unixodbc
-
+%configure $common_flags --with-pgsql
 make %{?_smp_mflags}
 mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_pgsql
 mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_pgsql
 
-%configure \
-    --enable-server \
-    --enable-agent \
-    --enable-proxy \
-    --enable-ipv6 \
-    --with-sqlite3 \
-    --with-net-snmp \
-    --with-ldap \
-    --with-libcurl \
-    --with-jabber \
-    --with-unixodbc
-
+%configure $common_flags --with-sqlite3
 make %{?_smp_mflags}
 mv src/zabbix_server/zabbix_server src/zabbix_server/zabbix_server_sqlite3
 mv src/zabbix_proxy/zabbix_proxy src/zabbix_proxy/zabbix_proxy_sqlite3
@@ -263,10 +272,13 @@
 touch src/zabbix_server/zabbix_server
 touch src/zabbix_proxy/zabbix_proxy
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
 # set up some required directories
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
@@ -274,35 +286,23 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
 
-#rm create/Makefile*
-#rm create/data/images_oracle.sql
-#rm create/schema/oracle.sql
-#rm -r upgrades/dbpatches/1.6/oracle
-
-#pushd %{name}-%{version}-mysql
-# php frontend
+# install the frontend
 cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
-ln -s ../../../..%{_sysconfdir}/%{name}/db.inc.php \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php
-cat << __EOF__ >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix.conf.php
-# This file is a place-holder. When you run through the zabbix
-# web setup, a proper configuration file should be generated
-# for you to drop in this location.
-__EOF__
-ln -s ../../../..%{_sysconfdir}/%{name}/zabbix.conf.php \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}/conf/zabbix.conf.php
-# kill off .htaccess files, options set in SOURCE1
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/.htaccess
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/classes/.htaccess
+
+# prepare ghosted config file
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web/zabbix.conf.php
+
 # drop config files in place
 install -m 0644 -p misc/conf/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+
+# fix config file options
 cat misc/conf/zabbix_agentd.conf | sed \
     -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \
     -e 's|#LogFileSize=.*|LogFileSize=0|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf
+
 cat misc/conf/zabbix_server.conf | sed \
     -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \
@@ -311,6 +311,7 @@
     -e 's|DBUser=root|DBUser=zabbix|g' \
     -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/mysql/mysql.sock|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_server.conf
+
 cat misc/conf/zabbix_proxy.conf | sed \
     -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_proxy.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_proxy.log|g' \
@@ -319,21 +320,20 @@
     -e 's|DBUser=root|DBUser=zabbix|g' \
     -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/mysql/mysql.sock|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_proxy.conf
-install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
-# log rotation
+
+# install log rotation
 cat %{SOURCE5} | sed -e 's|COMPONENT|server|g' > \
      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server
 cat %{SOURCE5} | sed -e 's|COMPONENT|agentd|g' > \
      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent
 cat %{SOURCE5} | sed -e 's|COMPONENT|proxy|g' > \
      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy
+
 # init scripts
 install -m 0755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-server
 install -m 0755 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent
 install -m 0755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-proxy
 
-# set up config dir
-
 # install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_server
@@ -343,16 +343,37 @@
 
 # nuke static libs and empty oracle upgrade sql
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a
-# nuke extraneous sql files
+
+# copy sql files to appropriate per package locations
+docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-server-mysql-%{version}
+install -dm 755 $docdir
+cp -p --parents create/schema/mysql.sql $docdir
+cp -p --parents create/data/data.sql $docdir
+cp -p --parents create/data/images_mysql.sql $docdir
+cp -pR --parents upgrades/dbpatches/1.6/mysql $docdir
+docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-server-pgsql-%{version}
+install -dm 755 $docdir
+cp -p --parents create/schema/postgresql.sql $docdir
+cp -p --parents create/data/data.sql $docdir
+cp -p --parents create/data/images_pgsql.sql $docdir
+cp -pR --parents upgrades/dbpatches/1.6/postgresql $docdir
+docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-server-sqlite3-%{version}
+install -dm 755 $docdir
+cp -p --parents create/schema/sqlite.sql $docdir
+cp -p --parents create/data/data.sql $docdir
+cp -p --parents create/data/images_sqlite3.sql $docdir
+# remove extraneous ones
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/create
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
-# Add the "zabbix" user
-/usr/sbin/useradd -c "Zabbix Monitoring System" \
-        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :
+getent passwd zabbix > /dev/null || \
+    /usr/sbin/useradd -c "Zabbix Monitoring System" \
+    -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix || :
 
 %post server
 /sbin/chkconfig --add zabbix-server
@@ -384,38 +405,52 @@
   /sbin/chkconfig --del zabbix-proxy
 fi
 
+%post web
+# move existing config file on update
+if [ "$1" -ge "1" ]
+then
+    if [ -f %{_sysconfdir}/zabbix/zabbix.conf.php ]
+    then
+        mv %{_sysconfdir}/zabbix/zabbix.conf.php %{_sysconfdir}/zabbix/web
+        chown apache:apache %{_sysconfdir}/zabbix/web/zabbix.conf.php
+    fi
+fi
+
+
 %files
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/zabbix
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix
 
+%files docs
+%defattr(-,root,root,-)
+%doc docs/*.pdf
+
 %files server
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
-%doc docs/*.pdf upgrades/dbpatches create/data create/schema
 %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
 %{_sysconfdir}/init.d/zabbix-server
 
 %files server-mysql
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %defattr(-,root,root,-)
+%{_docdir}/%{name}-server-mysql-%{version}/
 %{_sbindir}/zabbix_server_mysql
 
 %files server-pgsql
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %defattr(-,root,root,-)
+%{_docdir}/%{name}-server-pgsql-%{version}/
 %{_sbindir}/zabbix_server_pgsql
 
 %files server-sqlite3
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %defattr(-,root,root,-)
+%{_docdir}/%{name}-server-sqlite3-%{version}/
 %{_sbindir}/zabbix_server_sqlite3
 
 %files agent
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent.conf
 %config(noreplace) %{_sysconfdir}/zabbix/zabbix_agentd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
@@ -427,31 +462,26 @@
 
 %files proxy
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
 %{_sysconfdir}/init.d/zabbix-proxy
 
 %files proxy-mysql
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %{_sbindir}/zabbix_proxy_mysql
 
 %files proxy-pgsql
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %{_sbindir}/zabbix_proxy_pgsql
 
 %files proxy-sqlite3
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %{_sbindir}/zabbix_proxy_sqlite3
 
 %files web
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ NEWS README
-%config(noreplace) %{_sysconfdir}/zabbix/zabbix.conf.php
-%config(noreplace) %{_sysconfdir}/zabbix/db.inc.php
+%dir %attr(0755,apache,apache) %{_sysconfdir}/zabbix/web
+%ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/zabbix/web/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %{_datadir}/zabbix
 
@@ -464,7 +494,23 @@
 %files web-sqlite3
 %defattr(-,root,root,-)
 
+
 %changelog
+* Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-1
+- update to 1.6.4
+- remove the cpustat patch, it was integreated into upstream
+- use noarch subpackage for the web interface
+- database specific web subpackages conflicts with each other
+- use common set of option for the configure macro
+- enable IPMI support
+- sqlite web subpackage must depend on local sqlite
+- reorganize the docs and the sql scripts
+- change how the web interface config file is created
+- updated scriptlet for adding the zabbix user
+- move the documentation in PDF to -docs subpackage
+- most of the changes were submitted by Ville Skytt?? in #494706 
+- Resolves: #489673, #493234, #494706
+
 * Mon Mar  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-5
 - Update pre patch due to incomplete fix for security problems.
 


--- zabbix-1.6.2-cpustats.patch DELETED ---


--- zabbix-1.6.3-pre.patch DELETED ---



From tbzatek at fedoraproject.org  Thu Apr  9 10:23:10 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu,  9 Apr 2009 10:23:10 +0000 (UTC)
Subject: rpms/tuxcmd/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tuxcmd-disable-smartlinking.patch, 1.1, 1.2 tuxcmd.spec,
	1.13, 1.14 tuxcmd-0.6.50-gcc44.patch, 1.1,
	NONE tuxcmd-0.6.52-anon-ftp.patch, 1.1,
	NONE tuxcmd-0.6.52-connmgr-save.patch, 1.1,
	NONE tuxcmd-0.6.52-null-mounts.patch, 1.1, NONE
Message-ID: <20090409102310.9BA447001C@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8659

Modified Files:
	.cvsignore sources tuxcmd-disable-smartlinking.patch 
	tuxcmd.spec 
Removed Files:
	tuxcmd-0.6.50-gcc44.patch tuxcmd-0.6.52-anon-ftp.patch 
	tuxcmd-0.6.52-connmgr-save.patch 
	tuxcmd-0.6.52-null-mounts.patch 
Log Message:
* Thu Apr  9 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.1
- Rebase to latest git
- Fix unowned directories (#473992)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Oct 2008 21:59:10 -0000	1.5
+++ .cvsignore	9 Apr 2009 10:22:40 -0000	1.6
@@ -1,4 +1,2 @@
-tuxcmd-0.6.50.tar.bz2
-tuxcmd-modules-0.6.50.tar.bz2
-tuxcmd.desktop
-tuxcmd.png
+tuxcmd-0.6.62.git20090409.tar.bz2
+tuxcmd-modules-0.6.62.git20090409.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Oct 2008 21:59:10 -0000	1.5
+++ sources	9 Apr 2009 10:22:40 -0000	1.6
@@ -1,4 +1,2 @@
-d95d00f0df216c78f5f8f86f47c9716b  tuxcmd-0.6.50.tar.bz2
-b48be17a861e6cd76f1b011e8701ef70  tuxcmd-modules-0.6.50.tar.bz2
-037fbd322a78d23f1b494bed28fe9c3d  tuxcmd.desktop
-558a3c2be7de1286475785c2c24652ec  tuxcmd.png
+e5a675fb29e4df6d73ff8a4ad26d94bf  tuxcmd-0.6.62.git20090409.tar.bz2
+ddaff924b6a3e340e066a6b670ff922f  tuxcmd-modules-0.6.62.git20090409.tar.bz2

tuxcmd-disable-smartlinking.patch:

Index: tuxcmd-disable-smartlinking.patch
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd-disable-smartlinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxcmd-disable-smartlinking.patch	21 Oct 2008 09:25:18 -0000	1.1
+++ tuxcmd-disable-smartlinking.patch	9 Apr 2009 10:22:40 -0000	1.2
@@ -1,12 +1,12 @@
-diff -up tuxcmd-0.6.50/Makefile.orig tuxcmd-0.6.50/Makefile
---- tuxcmd-0.6.50/Makefile.orig	2008-08-21 20:54:24.000000000 +0200
-+++ tuxcmd-0.6.50/Makefile	2008-10-21 11:12:40.437300575 +0200
+diff -up tuxcmd-0.6.62/Makefile.orig tuxcmd-0.6.62/Makefile
+--- tuxcmd-0.6.62/Makefile.orig	2009-04-09 10:37:17.000000000 +0200
++++ tuxcmd-0.6.62/Makefile	2009-04-09 11:22:01.150518169 +0200
 @@ -40,7 +40,7 @@ LIB_SUFFIX=`if test \`uname -m\` = x86_6
  # -Cg generates internal compiler errors on i386
  # -XX prevents linking errors of unresolved and unused symbols
  # "-k-z noexecstack" (with quotes as a single parameter) avoids marking stack as executable, allowing to work correctly with SELinux in Enforcing mode
 -CFLAGS= -vweh -Un -Ci -Co -XX "-k-z noexecstack"
 +CFLAGS= -vweh -Un -Ci -Co "-k-z noexecstack"
- 
+ EXTRA_CFLAGS= -O3
  
  


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tuxcmd.spec	28 Feb 2009 14:45:09 -0000	1.13
+++ tuxcmd.spec	9 Apr 2009 10:22:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tuxcmd
-Version:        0.6.50
-Release:        7%{?dist}
+Version:        0.6.62
+Release:        git20090409.1%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -10,8 +10,10 @@
 ExclusiveArch:  %{ix86} x86_64  
 
 URL:            http://tuxcmd.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
+# Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
+Source0:        %{name}-%{version}.git20090409.tar.bz2
+Source1:        %{name}-modules-%{version}.git20090409.tar.bz2
 Source2:        %{name}.desktop
 Source3:        tuxcmd.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,17 +22,9 @@
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
-# patches from git/head
-Patch1: tuxcmd-0.6.52-null-mounts.patch
-Patch2: tuxcmd-0.6.52-anon-ftp.patch
-Patch3: tuxcmd-0.6.52-connmgr-save.patch
-
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
-# Fix compile with gcc44
-Patch5: tuxcmd-0.6.50-gcc44.patch
-
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -69,12 +63,7 @@
 %prep
 %setup -q -b 1
 
-%patch1 -p1 -b .null-mounts
-%patch3 -p1 -b .connmgr-save
 %patch4 -p1 -b .disable-smartlinking
-cd ../%{name}-modules-%{version}
-%patch2 -p1 -b .anon-ftp
-%patch5 -p1 -b .gcc44
 
 %build
 
@@ -121,6 +110,7 @@
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/doc/libarchive
 %doc ../%{name}-modules-%{version}/doc/zip
+%dir %{_libdir}/tuxcmd
 %{_libdir}/tuxcmd/libarchive_plugin.so
 %{_libdir}/tuxcmd/libzip_plugin.so
 
@@ -128,10 +118,15 @@
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/gvfs/README
 %doc ../%{name}-modules-%{version}/gvfs/COPYING
+%dir %{_libdir}/tuxcmd
 %{_libdir}/tuxcmd/libgvfs_plugin.so
 
 
 %changelog
+* Thu Apr  9 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.1
+- Rebase to latest git
+- Fix unowned directories (#473992)
+
 * Sat Feb 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.50-7
 - fix compile with gcc44, use optflags
 


--- tuxcmd-0.6.50-gcc44.patch DELETED ---


--- tuxcmd-0.6.52-anon-ftp.patch DELETED ---


--- tuxcmd-0.6.52-connmgr-save.patch DELETED ---


--- tuxcmd-0.6.52-null-mounts.patch DELETED ---



From dodji at fedoraproject.org  Thu Apr  9 10:37:44 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Thu,  9 Apr 2009 10:37:44 +0000 (UTC)
Subject: rpms/cloog/devel .cvsignore,1.4,1.5 cloog.spec,1.5,1.6
Message-ID: <20090409103744.9BB737001C@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12598

Modified Files:
	.cvsignore cloog.spec 
Log Message:
* Thu Apr 09 2009 Dodji Seketeli <dodji at redhat.com> - 0.15-0.8.git1334c
- Update to new upstream git snapshot 1334c
- Drop the cloog.info patch as now upstreamed
- No need to add an argument to the --with-ppl
  configure switch anymore as new upstream fixed this




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2009 21:08:03 -0000	1.4
+++ .cvsignore	9 Apr 2009 10:37:14 -0000	1.5
@@ -1 +1 @@
-cloog-0.15-gitad322.tar.gz
+cloog-0.15-git1334c.tar.gz


Index: cloog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/cloog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cloog.spec	8 Apr 2009 00:39:35 -0000	1.5
+++ cloog.spec	9 Apr 2009 10:37:14 -0000	1.6
@@ -1,7 +1,7 @@
-%define         git_revision   gitad322
+%define         git_revision   git1334c
 Name:           cloog
 Version:        0.15
-Release:        0.7.%{git_revision}%{?dist}
+Release:        0.8.%{git_revision}%{?dist}
 Summary:        The Chunky Loop Generator
 
 Group:          System Environment/Libraries
@@ -16,11 +16,6 @@
 # make distcheck
 Source0:        %{name}-%{version}-%{git_revision}.tar.gz
 Source1:        README.cloog.txt
-# Patch to add dircategory and direntry nodes to the cloog.texi
-# file. Otherwise, install-info complains at package install time,
-# leading to bug https://bugzilla.redhat.com/show_bug.cgi?id=492794.
-# Patch Sent upstream
-Patch0 :        cloog-0003-Add-dircategory-and-direntry-to-the-texi-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ppl-devel >= 0.10, gmp-devel >= 4.1.3, texinfo >= 4.12
 Requires(post): info
@@ -48,10 +43,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --with-ppl=%{_prefix}
+%configure --with-ppl
 # Remove the cloog.info in the tarball
 # to force the re-generation of a new one
 # with our Patch0 applied.
@@ -93,6 +87,12 @@
 %postun ppl -p /sbin/ldconfig
 
 %changelog
+* Thu Apr 09 2009 Dodji Seketeli <dodji at redhat.com> - 0.15-0.8.git1334c
+- Update to new upstream git snapshot
+- Drop the cloog.info patch as now upstreamed
+- No need to add an argument to the --with-ppl
+  configure switch anymore as new upstream fixed this
+
 * Wed Apr 08 2009 Dodji Seketeli <dodji at redhat.org> - 0.15-0.7.gitad322
 - Add BuildRequire texinfo needed to regenerate the cloog.info doc
 



From roma at fedoraproject.org  Thu Apr  9 11:21:35 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu,  9 Apr 2009 11:21:35 +0000 (UTC)
Subject: rpms/memtest86+/F-9 .cvsignore, 1.19, 1.20 import.log, 1.3,
	1.4 memtest86+.spec, 1.40, 1.41 sources, 1.19,
	1.20 memtest-setup, 1.3, NONE new-memtest-pkg, 1.1, NONE
Message-ID: <20090409112135.C661470137@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24007/F-9

Modified Files:
	.cvsignore import.log memtest86+.spec sources 
Removed Files:
	memtest-setup new-memtest-pkg 
Log Message:
Building the elf and the bin versions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Mar 2009 19:56:10 -0000	1.19
+++ .cvsignore	9 Apr 2009 11:21:03 -0000	1.20
@@ -1 +1,2 @@
 memtest86+-2.11.tar.gz
+temp.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Apr 2009 13:35:59 -0000	1.3
+++ import.log	9 Apr 2009 11:21:03 -0000	1.4
@@ -1,3 +1,4 @@
 memtest86+-2_11-4_fc10:F-9:memtest86+-2.11-4.fc10.src.rpm:1236974130
 memtest86+-2_11-5_fc10:F-9:memtest86+-2.11-5.fc10.src.rpm:1238511494
 memtest86+-2_11-6_fc10:F-9:memtest86+-2.11-6.fc10.src.rpm:1238679330
+memtest86+-2_11-7_fc10:F-9:memtest86+-2.11-7.fc10.src.rpm:1239276006


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/memtest86+.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- memtest86+.spec	2 Apr 2009 13:35:59 -0000	1.40
+++ memtest86+.spec	9 Apr 2009 11:21:03 -0000	1.41
@@ -1,29 +1,25 @@
+%bcond_with update_grub
+
 # Prevent stripping
 %define __spec_install_post /usr/lib/rpm/brp-compress
 # Turn off debuginfo package
 %define debug_package %{nil}
-%bcond_with update_grub
 
-Summary: Stand-alone memory tester for x86 and x86-64 computers
-Name: memtest86+
-Version: 2.11
-Release: 6%{?dist}
-License: GPLv2
-ExclusiveArch: %{ix86} x86_64
-Group: System Environment/Base
-Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-URL: http://www.memtest.org
-Source1: new-memtest-pkg
-Source2: memtest-setup
+Name:     memtest86+
+Version:  2.11
+Release:  7%{?dist}
+License:  GPLv2
+Summary:  Stand-alone memory tester for x86 and x86-64 computers
+Group:    System Environment/Base
+Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
+Source1:  temp.tar.gz
+URL:      http://www.memtest.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby sed
-%if %{with update_grub}
-Requires(preun): coreutils
-Requires(post): coreutils
-%endif
+Requires: /sbin/grubby sed coreutils
+ExclusiveArch: %{ix86} x86_64
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -31,23 +27,24 @@
 check and often miss many of the failures that are detected by 
 Memtest86+.
 
-This version avoids the following errors when booting from grub:
+The ELF version should be used for booting from grub,
+and avoids the following errors:
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
 
-Please, run '/usr/sbin/memtest-setup' as root to add 
-the memtest86+ entry to your GRUB or lilo boot menu.
+The script '%{_sbindir}/memtest-setup' can be run (as root)
+to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q
+%setup -q -a 1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
 # Regular build flags not wanted for this binary
 # Note: i486 minimum runtime arch
-make CC=gcc34
 # It makes no sense to use smp flags here.
+make CC=gcc34
 
 %install
 rm -rf %{buildroot}
@@ -55,17 +52,21 @@
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_sbindir}
 
-# install the ELF version, not the floppy (memtest.bin) one.
-install -m644 memtest %{buildroot}/boot/%{name}-%{version}
-install -m755 %{SOURCE1} %{buildroot}/sbin/new-memtest-pkg
-install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
+# the ELF (memtest) version.
+install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+
+# the floppy (memtest.bin) version.
+install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
+
+install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
+install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -76,10 +77,17 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
+/boot/%{name}-elf-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
+
 %changelog
+
+* Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
+- adapted the spec file for building the elf and 
+  the bin versions #494157
+
 * Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
 - grub.conf will not be updated by default. The user
   will have to add and/or remove memtest86+ entries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Mar 2009 19:56:10 -0000	1.19
+++ sources	9 Apr 2009 11:21:03 -0000	1.20
@@ -1 +1,2 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+518763b187bb85249120d06dfebd1235  temp.tar.gz


--- memtest-setup DELETED ---


--- new-memtest-pkg DELETED ---



From roma at fedoraproject.org  Thu Apr  9 11:24:34 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu,  9 Apr 2009 11:24:34 +0000 (UTC)
Subject: rpms/memtest86+/F-10 .cvsignore, 1.19, 1.20 import.log, 1.3,
	1.4 memtest86+.spec, 1.40, 1.41 sources, 1.19,
	1.20 memtest-setup, 1.3, NONE new-memtest-pkg, 1.1, NONE
Message-ID: <20090409112434.5F80B7001C@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25252/F-10

Modified Files:
	.cvsignore import.log memtest86+.spec sources 
Removed Files:
	memtest-setup new-memtest-pkg 
Log Message:
Building the elf and the bin versions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Mar 2009 19:58:12 -0000	1.19
+++ .cvsignore	9 Apr 2009 11:24:03 -0000	1.20
@@ -1 +1,2 @@
 memtest86+-2.11.tar.gz
+temp.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Apr 2009 13:43:47 -0000	1.3
+++ import.log	9 Apr 2009 11:24:03 -0000	1.4
@@ -1,3 +1,4 @@
 memtest86+-2_11-4_fc10:F-10:memtest86+-2.11-4.fc10.src.rpm:1236974259
 memtest86+-2_11-5_fc10:F-10:memtest86+-2.11-5.fc10.src.rpm:1238511600
 memtest86+-2_11-6_fc10:F-10:memtest86+-2.11-6.fc10.src.rpm:1238679556
+memtest86+-2_11-7_fc10:F-10:memtest86+-2.11-7.fc10.src.rpm:1239276141


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/memtest86+.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- memtest86+.spec	2 Apr 2009 13:43:47 -0000	1.40
+++ memtest86+.spec	9 Apr 2009 11:24:03 -0000	1.41
@@ -1,29 +1,25 @@
+%bcond_with update_grub
+
 # Prevent stripping
 %define __spec_install_post /usr/lib/rpm/brp-compress
 # Turn off debuginfo package
 %define debug_package %{nil}
-%bcond_with update_grub
 
-Summary: Stand-alone memory tester for x86 and x86-64 computers
-Name: memtest86+
-Version: 2.11
-Release: 6%{?dist}
-License: GPLv2
-ExclusiveArch: %{ix86} x86_64
-Group: System Environment/Base
-Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-URL: http://www.memtest.org
-Source1: new-memtest-pkg
-Source2: memtest-setup
+Name:     memtest86+
+Version:  2.11
+Release:  7%{?dist}
+License:  GPLv2
+Summary:  Stand-alone memory tester for x86 and x86-64 computers
+Group:    System Environment/Base
+Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
+Source1:  temp.tar.gz
+URL:      http://www.memtest.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby sed
-%if %{with update_grub}
-Requires(preun): coreutils
-Requires(post): coreutils
-%endif
+Requires: /sbin/grubby sed coreutils
+ExclusiveArch: %{ix86} x86_64
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -31,23 +27,24 @@
 check and often miss many of the failures that are detected by 
 Memtest86+.
 
-This version avoids the following errors when booting from grub:
+The ELF version should be used for booting from grub,
+and avoids the following errors:
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
 
-Please, run '/usr/sbin/memtest-setup' as root to add 
-the memtest86+ entry to your GRUB or lilo boot menu.
+The script '%{_sbindir}/memtest-setup' can be run (as root)
+to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q
+%setup -q -a 1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
 # Regular build flags not wanted for this binary
 # Note: i486 minimum runtime arch
-make CC=gcc34
 # It makes no sense to use smp flags here.
+make CC=gcc34
 
 %install
 rm -rf %{buildroot}
@@ -55,17 +52,21 @@
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_sbindir}
 
-# install the ELF version, not the floppy (memtest.bin) one.
-install -m644 memtest %{buildroot}/boot/%{name}-%{version}
-install -m755 %{SOURCE1} %{buildroot}/sbin/new-memtest-pkg
-install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
+# the ELF (memtest) version.
+install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+
+# the floppy (memtest.bin) version.
+install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
+
+install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
+install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -76,10 +77,17 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
+/boot/%{name}-elf-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
+
 %changelog
+
+* Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
+- adapted the spec file for building the elf and 
+  the bin versions #494157
+
 * Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
 - grub.conf will not be updated by default. The user
   will have to add and/or remove memtest86+ entries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Mar 2009 19:58:12 -0000	1.19
+++ sources	9 Apr 2009 11:24:03 -0000	1.20
@@ -1 +1,2 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+518763b187bb85249120d06dfebd1235  temp.tar.gz


--- memtest-setup DELETED ---


--- new-memtest-pkg DELETED ---



From rrakus at fedoraproject.org  Thu Apr  9 11:57:02 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu,  9 Apr 2009 11:57:02 +0000 (UTC)
Subject: rpms/authd/devel authd-1.4.3-jiffies64.patch, 1.3, 1.4 authd.spec, 
	1.56, 1.57
Message-ID: <20090409115702.EBF2F7001C@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/authd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18807

Modified Files:
	authd-1.4.3-jiffies64.patch authd.spec 
Log Message:
get back to older version of jiffies64 patch

authd-1.4.3-jiffies64.patch:

Index: authd-1.4.3-jiffies64.patch
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd-1.4.3-jiffies64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- authd-1.4.3-jiffies64.patch	29 Apr 2008 11:44:53 -0000	1.3
+++ authd-1.4.3-jiffies64.patch	9 Apr 2009 11:56:31 -0000	1.4
@@ -1,115 +1,35 @@
 diff -up authd-1.4.3/authd.c.jiffies64 authd-1.4.3/authd.c
---- authd-1.4.3/authd.c.jiffies64	2008-04-29 12:25:05.000000000 +0200
-+++ authd-1.4.3/authd.c	2008-04-29 13:33:18.000000000 +0200
-@@ -169,8 +169,13 @@ static bool is_rfc1413_token(const char 
-     return is_in_range((size_t) 1, strlen(s), (size_t) 64);
- }
- 
--static bool is_bad_strto(const char *s, const char *endptr) {
--    if (errno == ERANGE || errno == EINVAL) return true;
-+static bool is_bad_strtoul(unsigned long ul, const char *s, const char *endptr) {
-+    if ((ul == ULONG_MAX && errno == ERANGE) || errno == EINVAL) return true;
-+    return endptr == s || (*endptr != '\0' && !isspace(*endptr));
-+}
-+
-+static bool is_bad_strtoull(unsigned long long ull, const char *s, const char *endptr) {
-+    if ((ull == ULLONG_MAX && errno == ERANGE) || errno == EINVAL) return true;
-     return endptr == s || (*endptr != '\0' && !isspace(*endptr));
- }
- 
-@@ -253,7 +258,7 @@ static void create_opt(int argc, char *a
-             case 'l':
-                 if (optarg != NULL) {
-                     lu = strtoul(optarg, &endptr, 0);
--                    if (lu > UINT_MAX || is_bad_strto(optarg, endptr))
-+                    if (lu > UINT_MAX || is_bad_strtoul(lu, optarg, endptr))
-                         handle_error(C_FMT, *argv, c, optarg);
-                     else opt.log_mask = (int) lu;
-                     setlogmask(opt.log_mask);
-@@ -263,7 +268,7 @@ static void create_opt(int argc, char *a
-             case 'm':
-                 if (optarg != NULL) {
-                     opt.multiquery = strtoull(optarg, &endptr, 10);
--                    if (is_bad_strto(optarg, endptr))
-+                    if (is_bad_strtoull(opt.multiquery, optarg, endptr))
-                         handle_error(C_FMT, *argv, c, optarg);
-                 }
-                 else opt.multiquery = ULLONG_MAX;
-@@ -275,7 +280,7 @@ static void create_opt(int argc, char *a
-             case 'o': opt.other = true; break;
-             case 't':
-                 lu = optarg == NULL ? DFL_T_O : strtoul(optarg, &endptr, 10);
--                if (lu > UINT_MAX || is_bad_strto(optarg, endptr))
-+                if (lu > UINT_MAX || is_bad_strtoul(lu, optarg, endptr))
-                     handle_error(C_FMT, *argv, c, optarg);
-                 else if (lu < 30) {
-                     log_notice(_("Timeout's too low; Raising to 30.\n"));
-@@ -294,7 +299,7 @@ static void create_opt(int argc, char *a
-             case FN_LONGOPT:
-                 if (optarg != NULL) {
-                     lu = strtoul(optarg, &endptr, 10);
--                    if (lu > UINT_MAX || is_bad_strto(optarg, endptr))
-+                    if (lu > UINT_MAX || is_bad_strtoul(lu, optarg, endptr))
-                         handle_error(S_FMT, *argv, LONG_OPTS[i].name, optarg);
-                     else opt.fn = (unsigned) lu;
-                 }
-@@ -347,7 +352,7 @@ static void create_opt(int argc, char *a
+--- authd-1.4.3/authd.c.jiffies64	2004-11-16 00:25:24.000000000 +0100
++++ authd-1.4.3/authd.c	2008-03-25 11:22:35.000000000 +0100
+@@ -347,6 +347,22 @@ static void create_opt(int argc, char *a
  
  static const char *const DELIM = ",: \t\r\n\v\f";
  
--static unsigned long get_tok_uint(char *s, unsigned base) {
-+static unsigned long get_tok_ulong(char *s, unsigned base) {
-     unsigned long ul = ULONG_MAX;
- 
-     assert(base <= 36);
-@@ -355,13 +360,21 @@ static unsigned long get_tok_uint(char *
-         char *endptr;
- 
-         ul = strtoul(s, &endptr, (int) base);
--        if (ul > UINT_MAX || is_bad_strto(s, endptr))
-+        if (ul > UINT_MAX || is_bad_strtoul(ul, s, endptr))
-             errno = EINVAL;
-     }
-     else errno = EINVAL;
-     return ul;
- }
- 
-+static unsigned int get_tok_uint(char *s, unsigned base) {
-+    unsigned long ul = get_tok_ulong(s, base);
-+    if (ul > UINT_MAX)
-+        errno = EINVAL;
-+    return ul;
++static unsigned long long get_tok_ullong(char *s, unsigned base) {
++    unsigned long long ull = ULLONG_MAX;
++
++    assert(base <= 36);
++    if ((s = strtok(s, DELIM)) != NULL) {
++        char *endptr;
++
++        ull = strtoull(s, &endptr, (int) base);
++        if ((errno == ERANGE && ull == ULLONG_MAX) || is_bad_strto(s, endptr))
++            errno = EINVAL;
++    }
++    else errno = EINVAL;
++    return ull;
 +}
 +
 +
- static void destroy_opt(void) {
-     free(opt.codeset); free(opt.Encrypt); free(opt.ident); free(opt.lang);
-     free(opt.Noident); free(opt.os); free(opt.passwd); free(opt.mapped);
-@@ -510,7 +523,7 @@ static char *get_created_tok_addr(const 
+ static unsigned long get_tok_uint(char *s, unsigned base) {
+     unsigned long ul = ULONG_MAX;
  
-                 addr_hex[z] = '\0'; z -= HEX_DIG;
-                 ul = strtoul(addr_hex + z, &endptr, 16);
--                if (is_bad_strto(addr_hex + z, endptr)) {
-+                if (is_bad_strtoul(ul, addr_hex + z, endptr)) {
-                     errno = EINVAL; return NULL;
-                 }
- 	        if ((!IS_IPV4 || 6 == z) && is_16_bits)
-@@ -654,9 +667,17 @@ static bool get_info(reply_t *out, reque
+@@ -643,7 +659,7 @@ static bool get_info(reply_t *out, reque
          (void) get_tok_uint(NULL, 16);            // tx_queue
          (void) get_tok_uint(NULL, 16);            // rx_queue
          (void) get_tok_uint(NULL, 16);            // tr (boolean)
 -        (void) get_tok_uint(NULL, 16);            // tm->when (unit: jiffies)
-+	/* as of 2.4.18 this is sa long in the kernel thus it is 32b on 32b 
-+	   platforms and 64b on 64b platforms. 32b platforms also have a 
-+	   jiffies_64 but that is not what is exported so we don't have to use
-+	   a long long on 32b platforms.
-+	   Ref: net/ipv4/tcp_ipv4.c:get_tcp_sock()	   
-+	*/
-+        (void) get_tok_ulong(NULL, 16);            // tm->when (unit: jiffies)
++        (void) get_tok_ullong(NULL, 16);            // tm->when (unit: jiffies)
          strtok(NULL, DELIM);                      // retrnsmt
          uid = get_tok_uint(NULL, 10);             // uid (base 10 uint)
-+
-+	// beware using timeout. It is a long and may be 64b.
          strtok(NULL, DELIM);                      // timeout
-         inode = get_tok_uint(NULL, 10);           // inode (base 10 uint)
-         if (errno == EINVAL) {


Index: authd.spec
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- authd.spec	31 Mar 2009 16:34:04 -0000	1.56
+++ authd.spec	9 Apr 2009 11:56:31 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: https://fedorahosted.org/authd/
@@ -75,6 +75,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Thu Apr 09 2009 Roman Rakus <rrakus at redhat.com> - 1.4.3-26
+- get back to older version of jiffies64 patch
+
 * Tue Mar 31 2009 Roman Rakus <rrakus at redhat.com> - 1.4.3-25
 - Fixed source tag
 



From jakub at fedoraproject.org  Thu Apr  9 12:06:54 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  9 Apr 2009 12:06:54 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.266, 1.267 gcc.spec, 1.37, 1.38 sources,
	1.269, 1.270 gcc44-pr39226.patch, 1.1, NONE
Message-ID: <20090409120654.A78B17001C@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21136

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-pr39226.patch 
Log Message:
4.4.0-0.32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- .cvsignore	30 Mar 2009 18:21:47 -0000	1.266
+++ .cvsignore	9 Apr 2009 12:06:24 -0000	1.267
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090330.tar.bz2
+gcc-4.4.0-20090409.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gcc.spec	30 Mar 2009 18:21:47 -0000	1.37
+++ gcc.spec	9 Apr 2009 12:06:24 -0000	1.38
@@ -1,9 +1,9 @@
-%define DATE 20090330
-%define SVNREV 145311
+%define DATE 20090409
+%define SVNREV 145816
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 0.31
+%define gcc_release 0.32
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -148,7 +148,6 @@
 Patch21: gcc44-cloog-dl.patch
 Patch22: gcc44-raw-string.patch
 Patch24: gcc44-atom.patch
-Patch25: gcc44-pr39226.patch
 Patch26: gcc44-power7.patch
 Patch27: gcc44-power7-2.patch
 Patch28: gcc44-pr38757.patch
@@ -438,11 +437,10 @@
 %endif
 %patch22 -p0 -b .raw-string~
 %patch24 -p0 -b .atom~
-%patch25 -p0 -b .pr39226~
 %patch26 -p0 -b .power7~
 %patch27 -p0 -b .power7-2~
 %patch28 -p0 -b .pr38757~
-%patch30 -p0 -b .pr39543~
+#%patch30 -p0 -b .pr39543~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1753,6 +1751,19 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Apr  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.32
+- update from gcc-4_4-branch
+  - PRs c++/34691, c++/35146, c++/35240, c++/37806, c++/38030, c++/38850,
+	c++/39608, c++/39637, c++/4926, c/37772, fortran/38152,
+	fortran/39519, fortran/39594, libmudflap/38462, libstdc++/39310,
+	middle-end/39573, objc/18456, objc/27377, other/39591,
+	rtl-optimization/39588, rtl-optimization/39607, target/39501,
+	target/39592, target/39634, testsuite/39325, tree-optimization/35011,
+	tree-optimization/39595, tree-optimization/39648
+  - handle .cfi_undefined(%ip) in libgcc_s unwinder (#491542)
+- fix debug info for C++ static data members (#410691)
+- revert fwprop fix, it causes glibc.i586 miscompilation
+
 * Mon Mar 30 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.31
 - update from gcc-4_4-branch
   - PR target/39545


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- sources	30 Mar 2009 18:21:47 -0000	1.269
+++ sources	9 Apr 2009 12:06:24 -0000	1.270
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-1e5facb4545a0cc6d25a6e34174d6b93  gcc-4.4.0-20090330.tar.bz2
+e45f1b49ad6bc7e78ef8887cab726943  gcc-4.4.0-20090409.tar.bz2


--- gcc44-pr39226.patch DELETED ---



From caolanm at fedoraproject.org  Thu Apr  9 12:09:19 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  9 Apr 2009 12:09:19 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch,
	NONE, 1.1 openoffice.org.spec, 1.1873, 1.1874
Message-ID: <20090409120920.041487001C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21695

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch 
Log Message:
Resolves: ooo#61927 ww6 unicode font encoding on export

openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch:

--- NEW FILE openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch ---
Index: source/filter/ww8/wrtw8sty.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8sty.cxx,v
retrieving revision 1.49.44.2
diff -u -r1.49.44.2 wrtw8sty.cxx
--- openoffice.org.orig/sw/source/filter/ww8/wrtw8sty.cxx	12 Dec 2008 11:11:33 -0000	1.49.44.2
+++ openoffice.org/sw/source/filter/ww8/wrtw8sty.cxx	9 Apr 2009 12:02:50 -0000
@@ -621,7 +621,14 @@
 
     ShortToSVBT16( 400, &maWW8_FFN[2] );        // weiss ich nicht besser
                                                 // 400 == FW_NORMAL (windows.h)
-    maWW8_FFN[4] = sw::ms::rtl_TextEncodingToWinCharset(eChrSet);
+                                                //
+    //#i61927# For unicode fonts like Arial Unicode, Word 97+ sets the chs
+    //to SHIFTJIS presumably to capture that it's a multi-byte encoding font
+    //but Word95 doesn't do this, and sets it to 0 (ANSI), so we should do the
+    //same
+    maWW8_FFN[4] = bWrtWW8 ? 
+        sw::ms::rtl_TextEncodingToWinCharset(eChrSet) :
+        rtl_getBestWindowsCharsetFromTextEncoding(eChrSet);
 
     if (mbAlt)
         maWW8_FFN[5] = static_cast< BYTE >(msFamilyNm.Len() + 1);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1873
retrieving revision 1.1874
diff -u -r1.1873 -r1.1874
--- openoffice.org.spec	8 Apr 2009 14:12:18 -0000	1.1873
+++ openoffice.org.spec	9 Apr 2009 12:08:49 -0000	1.1874
@@ -132,7 +132,8 @@
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
 Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-Patch60: openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch
+Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch61: openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -162,7 +163,7 @@
 user's home, if necessary.
 
 %package core
-Summary: Core modules for %{name}
+Summary: Core modules for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-%{fontname}-fonts
 Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
@@ -178,15 +179,15 @@
 Obsoletes: openoffice.org2-core < 1:3.0.0
 
 %description core
-The shared core libraries and support files for %{name}.
+The shared core libraries and support files for OpenOffice.org.
 
 %package brand
-Summary: Core brand for %{name}
+Summary: Core brand for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description brand
-The shared core branding files for %{name}.
+The shared core branding files for OpenOffice.org.
 
 %package -n broffice.org-brand
 Summary: Core brand for BrOffice.org
@@ -198,7 +199,7 @@
 The shared core branding files for BrOffice.org
 
 %package pyuno
-Summary: Python support for %{name}
+Summary: Python support for OpenOffice.org
 Group: Development/Libraries
 Obsoletes: openoffice.org2-pyuno < 1:3.0.0
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
@@ -209,28 +210,28 @@
 Requires(postun): openoffice.org-core
 
 %description pyuno
-Python bindings for the %{name} UNO component model. Allows scripts both
-external to %{name} and within the internal %{name} scripting
-module to be written in python.
+Python bindings for the OpenOffice.org UNO component model. Allows scripts both
+external to OpenOffice.org and within the internal OpenOffice.org scripting
+framework to be written in python.
 
 %package base-core
-Summary: Database GUI libraries for %{name}
+Summary: Database GUI libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hsqldb, postgresql-jdbc
 
 %description base-core
-GUI database libraries for %{name}.
+GUI database libraries for OpenOffice.org.
 
 %package base
-Summary: Database frontend for %{name}
+Summary: Database frontend for OpenOffice.org
 Group: Applications/Productivity
 Obsoletes: openoffice.org2-base < 1:3.0.0
 Requires: %{name}-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
 
 %description base
-GUI database frontend for %{name}. Allows creation and management of 
+GUI database frontend for OpenOffice.org. Allows creation and management of 
 databases through a GUI.
 
 %package -n broffice.org-base
@@ -244,7 +245,7 @@
 databases through a GUI.
 
 %package report-builder
-Summary: Create database reports from %{name}
+Summary: Create database reports from OpenOffice.org
 Group: Applications/Productivity
 Requires: pentaho-reporting-flow-engine
 Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
@@ -254,12 +255,12 @@
 Requires(postun): openoffice.org-core
 
 %description report-builder
-Creates database reports from %{name}-base. The report builder can
+Creates database reports from OpenOffice.org databases. The report builder can
 define group and page headers as well as group, page footers and calculation
 fields to accomplish complex database reports.
 
 %package bsh
-Summary: BeanShell support for %{name}
+Summary: BeanShell support for OpenOffice.org
 Group: Development/Libraries
 Requires: bsh
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
@@ -269,10 +270,10 @@
 Requires(postun): openoffice.org-core
 
 %description bsh
-Support BeanShell scripts in %{name}.
+Support BeanShell scripts in OpenOffice.org.
 
 %package rhino
-Summary: JavaScript support for %{name}
+Summary: JavaScript support for OpenOffice.org
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires(pre):    openoffice.org-core
@@ -281,10 +282,10 @@
 Requires(postun): openoffice.org-core
 
 %description rhino
-Support JavaScript scripts in %{name}.
+Support JavaScript scripts in OpenOffice.org.
 
 %package wiki-publisher
-Summary: Create Wiki articles on MediaWiki servers with %{name}
+Summary: Create Wiki articles on MediaWiki servers with OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
 Requires: jakarta-commons-codec, jakarta-commons-httpclient
@@ -297,22 +298,21 @@
 %description wiki-publisher
 The Wiki Publisher enables you to create Wiki articles on MediaWiki servers
 without having to know the syntax of the MediaWiki markup language. Publish
-your new and existing documents transparently with %{name}-writer to a
-wiki page.
+your new and existing documents transparently with writer to a wiki page.
 
 %package ogltrans
-Summary: 3D OpenGL %{name} slide transitions
+Summary: 3D OpenGL slide transitions for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
 Requires(pre):    openoffice.org-core
 
 %description ogltrans
-OpenGL Transitions enable 3D slide transitions to be used in %{name}.
+OpenGL Transitions enable 3D slide transitions to be used in OpenOffice.org.
 Requires good quality 3D support for your videocard for best
 experience.
 
 %package presentation-minimizer
-Summary: Shrink %{name} presentations
+Summary: Shrink OpenOffice.org presentations
 Group: Applications/Productivity
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
 Requires(pre):    openoffice.org-core
@@ -326,7 +326,7 @@
 be removed.
 
 %package presenter-screen
-Summary: Presenter Screen for %{name}-impress
+Summary: Presenter Screen for OpenOffice.org Presentations
 Group: Applications/Productivity
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
 Requires(pre):    openoffice.org-core
@@ -340,7 +340,7 @@
 slide notes.
 
 %package pdfimport
-Summary: PDF Importer for %{name}-draw
+Summary: PDF Importer for OpenOffice.org Draw
 Group: Applications/Productivity
 Requires: %{name}-draw-core = %{epoch}:%{version}-%{release}
 Requires(pre):    openoffice.org-core
@@ -353,25 +353,25 @@
 and enable basic editing of PDF documents.
 
 %package %{fontname}-fonts
-Summary: %{name} dingbats font
+Summary: OpenOffice.org dingbats font
 Group: User Interface/X
 Requires: fontpackages-filesystem
 
 %description %{fontname}-fonts
-A dingbats font, OpenSymbol, suitable for use by %{name} for bullets and
+A dingbats font, OpenSymbol, suitable for use by OpenOffice.org for bullets and
 mathematical symbols. 
 
 %package writer-core
-Summary: Word Processor libraries for %{name}
+Summary: Word Processor libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: libwpd >= 0.8.0
 
 %description writer-core
-The wordprocessor libraries of %{name}.
+The wordprocessor libraries of OpenOffice.org.
 
 %package writer
-Summary: Word Processor module for %{name}
+Summary: OpenOffice.org Word Processor Application
 Group: Applications/Productivity
 Obsoletes: openoffice.org < 1.9.0
 Obsoletes: openoffice.org2-writer < 1:3.0.0
@@ -379,64 +379,64 @@
 Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
 
 %description writer
-The wordprocessor application of %{name}.
+The OpenOffice.org Word Processor application.
 
 %package -n broffice.org-writer
-Summary: Word Processor module for BrOffice.org
+Summary: BrOffice.org Word Processor Application
 Group: Applications/Productivity
 Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
 
 %description -n broffice.org-writer
-The wordprocessor application of BrOffice.org
+The BrOffice.org Word Processor application.
 
 %package emailmerge
-Summary: Email mail merge component for %{name}
+Summary: Email mail-merge component for OpenOffice.org
 Group: Applications/Productivity
 Obsoletes: openoffice.org2-emailmerge < 1:3.0.0
 Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 
 %description emailmerge
-Enables the %{name} writer module to mail merge to email.
+Enables the OpenOffice.org writer module to mail-merge to email.
 
 %package calc-core
-Summary: Spreadsheet libraries for %{name}
+Summary: Spreadsheet libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description calc-core
-The spreadsheet libraries of %{name}.
+The spreadsheet libraries of OpenOffice.org.
 
 %package calc
-Summary: Spreadsheet module for %{name}
+Summary: OpenOffice.org Spreadsheet Application
 Group: Applications/Productivity
 Requires: %{name}-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-calc-core = %{epoch}:%{version}-%{release}
 
 %description calc
-The spreadsheet application of %{name}.
+The OpenOffice.org Spreadsheet application.
 
 %package -n broffice.org-calc
-Summary: Spreadsheet module for BrOffice.org
+Summary: BrOffice.org Spreadsheet Application
 Group: Applications/Productivity
 Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-calc-core = %{epoch}:%{version}-%{release}
 
 %description -n broffice.org-calc
-The spreadsheet application of BrOffice.org
+The BrOffice.org Spreadsheet application.
 
 %package draw-core
-Summary: Drawing libraries for %{name}
+Summary: Drawing libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
 
 %description draw-core
-The drawing libraries of %{name}.
+The drawing libraries of OpenOffice.org.
 
 %package draw
-Summary: Drawing module for %{name}
+Summary: OpenOffice.org Drawing Application
 Group: Applications/Productivity
 Obsoletes: openoffice.org < 1.9.0
 Obsoletes: openoffice.org2-draw < 1:3.0.0
@@ -445,28 +445,28 @@
 Requires: %{name}-pdfimport = %{epoch}:%{version}-%{release}
 
 %description draw
-The drawing application of %{name}.
+The OpenOffice.org Drawing Application.
 
 %package -n broffice.org-draw
-Summary: Drawing module for BrOffice.org
+Summary: BrOffice.org Drawing Application
 Group: Applications/Productivity
 Requires: %{name}-draw-core = %{epoch}:%{version}-%{release}
 Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-pdfimport = %{epoch}:%{version}-%{release}
 
 %description -n broffice.org-draw
-The drawing application of BrOffice.org
+The BrOffice.org Drawing Application.
 
 %package impress-core
-Summary: Presentation libraries for %{name}
+Summary: Presentation libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description impress-core
-The presentation libraries of %{name}.
+The presentation libraries of OpenOffice.org.
 
 %package impress
-Summary: Presentation module for %{name}
+Summary: OpenOffice.org Presentation Application
 Group: Applications/Productivity
 Obsoletes: openoffice.org < 1.9.0
 Obsoletes: openoffice.org2-impress < 1:3.0.0
@@ -475,28 +475,28 @@
 Requires: %{name}-presenter-screen = %{epoch}:%{version}-%{release}
 
 %description impress
-The presentation application of %{name}.
+The OpenOffice.org Presentation Application.
 
 %package -n broffice.org-impress
-Summary: Presentation module for BrOffice.org
+Summary: BrOffice.org Presentation Application
 Group: Applications/Productivity
 Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-presenter-screen = %{epoch}:%{version}-%{release}
 
 %description -n broffice.org-impress
-The presentation application of BrOffice.org
+The BrOffice.org Presentation Application.
 
 %package math-core
-Summary: Equation editor libraries for %{name}
+Summary: Equation editor libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description math-core 
-The math editor libraries of %{name}.
+The math editor libraries of OpenOffice.org.
 
 %package math
-Summary: Equation editor module for %{name}
+Summary: OpenOffice.org Equation Editor Application
 Group: Applications/Productivity
 Obsoletes: openoffice.org < 1.9.0
 Obsoletes: openoffice.org2-math < 1:3.0.0
@@ -504,45 +504,45 @@
 Requires: %{name}-math-core = %{epoch}:%{version}-%{release}
 
 %description math 
-The math editor of %{name}.
+The OpenOffice.org Equation Editor Application.
 
 %package -n broffice.org-math
-Summary: Equation editor module for BrOffice.org
+Summary: BrOffice.org Equation Editor Application
 Group: Applications/Productivity
 Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-math-core = %{epoch}:%{version}-%{release}
 
 %description -n broffice.org-math 
-The math editor of BrOffice.org.
+The BrOffice.org Equation Editor Application.
 
 %package graphicfilter
-Summary: Extra graphic filters for %{name}
+Summary: OpenOffice.org Extra Graphic filters
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org2-graphicfilter < 1:3.0.0
 
 %description graphicfilter
-The graphicfilter module for %{name}, provides graphic filters, e.g. svg and
+The graphicfilter module for OpenOffice.org provides graphic filters, e.g. svg and
 flash filters.
 
 %package xsltfilter
-Summary: Extra xsltfilter module for %{name}
+Summary: Optional xsltfilter module for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org2-xsltfilter < 1:3.0.0
 
 %description xsltfilter
-The xsltfilter module for %{name}, provides additional docbook and
+The xsltfilter module for OpenOffice.org, provides additional docbook and
 xhtml export transforms. Install this to enable docbook export.
 
 %package javafilter
-Summary: Extra javafilter module for %{name}
+Summary: Optional javafilter module for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org2-javafilter < 1:3.0.0
 
 %description javafilter
-The javafilter module for %{name}, provides additional AportisDoc, Pocket Excel
+The javafilter module for OpenOffice.org, provides additional AportisDoc, Pocket Excel
 and Pocket Word import filters.
 
 %post javafilter
@@ -552,7 +552,7 @@
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %package testtools
-Summary: Testtools for %{name}
+Summary: Testtools for OpenOffice.org
 Group: Development/Libraries
 Obsoletes: openoffice.org2-testtools < 1:3.0.0
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
@@ -566,7 +566,7 @@
 Requires: %{name}-rhino = %{epoch}:%{version}-%{release}
 
 %description testtools
-QA tools for %{name}, enables automated testing.
+QA tools for OpenOffice.org, enables automated testing.
 
 %package ure
 Summary: UNO Runtime Environment
@@ -574,7 +574,7 @@
 Requires: unzip, jre >= 1.5.0
 
 %description ure
-UNO is the component model of %{name}. UNO offers interoperability
+UNO is the component model of OpenOffice.org. UNO offers interoperability
 between programming languages, other components models and hardware
 architectures, either in process or over process boundaries, in the Intranet
 as well as in the Internet. UNO components may be implemented in and accessed
@@ -582,49 +582,49 @@
 binding) and an appropriate bridge or adapter exists
 
 %package sdk
-Summary: Software Development Kit for %{name}
+Summary: Software Development Kit for OpenOffice.org
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: unzip, java-devel
 
 %description sdk
-The %{name} SDK is an add-on for the %{name} office suite. It
-provides the necessary tools for programming using the %{name} APIs
-and for creating extensions (UNO components) for %{name}.
+The OpenOffice.org SDK is an add-on for the OpenOffice.org office suite. It
+provides the necessary tools for programming using the OpenOffice.org APIs
+and for creating extensions (UNO components) for OpenOffice.org.
 To set the build environment for building against the sdk use 
 %{sdkinstdir}/setsdkenv_unix.sh.
 
 %package sdk-doc
-Summary: Software Development Kit documentation for %{name}
+Summary: Software Development Kit documentation for OpenOffice.org
 Group: Documentation
 Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
 
 %description sdk-doc
-This provides documentation for programming using the %{name} APIs
-and examples of creating extensions (UNO components) for %{name}.
+This provides documentation for programming using the OpenOffice.org APIs
+and examples of creating extensions (UNO components) for OpenOffice.org.
 
 %package devel
-Summary: Development Libraries for %{name}
+Summary: Development Libraries for OpenOffice.org
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
 
 %description devel
-The %{name} devel package provides necessary headers for development against
-%{name}.
+The OpenOffice.org devel package provides necessary headers for development against
+OpenOffice.org.
 
 %package headless
-Summary: Headless plugin for %{name}
+Summary: OpenOffice.org Headless plugin
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description headless
-A plugin for %{name} that enables it to function without an X server. 
-It implements the -headless command line option and allows %{name} to be
+A plugin for OpenOffice.org that enables it to function without an X server. 
+It implements the -headless command line option and allows OpenOffice.org to be
 used as a backend server for e.g. document conversion.
 
 %package langpack-af_ZA
-Summary: Afrikaans language pack for %{name}
+Summary: Afrikaans language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-af, hyphen-af, autocorr-af
@@ -633,10 +633,10 @@
 Obsoletes: openoffice.org2-langpack-af_ZA < 1:3.0.0
 
 %description langpack-af_ZA
-Provides additional afrikaans translations and resources for %{name}.
+Provides additional afrikaans translations and resources for OpenOffice.org.
 
 %package langpack-ar
-Summary: Arabic language pack for %{name}
+Summary: Arabic language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: hunspell-ar
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
@@ -644,10 +644,10 @@
 Obsoletes: openoffice.org2-langpack-ar < 1:3.0.0
 
 %description langpack-ar
-Provides additional arabic translations and resources for %{name}.
+Provides additional arabic translations and resources for OpenOffice.org.
 
 %package langpack-bg_BG
-Summary: Bulgarian language pack for %{name}
+Summary: Bulgarian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-bg, hyphen-bg, mythes-bg, autocorr-bg
@@ -656,10 +656,10 @@
 Obsoletes: openoffice.org2-langpack-bg_BG < 1:3.0.0
 
 %description langpack-bg_BG
-Provides additional bulgarian translations and resources for %{name}.
+Provides additional bulgarian translations and resources for OpenOffice.org.
 
 %package langpack-bn
-Summary: Bengali language pack for %{name}
+Summary: Bengali language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: lohit-fonts-bengali
@@ -669,10 +669,10 @@
 Obsoletes: openoffice.org2-langpack-bn < 1:3.0.0
 
 %description langpack-bn
-Provides additional bengali translations and resources for %{name}.
+Provides additional bengali translations and resources for OpenOffice.org.
 
 %package langpack-ca_ES
-Summary: Catalan language pack for %{name}
+Summary: Catalan language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ca, hyphen-ca, mythes-ca
@@ -681,10 +681,10 @@
 Obsoletes: openoffice.org2-langpack-ca_ES < 1:3.0.0
 
 %description langpack-ca_ES
-Provides additional catalan translations and resources for %{name}.
+Provides additional catalan translations and resources for OpenOffice.org.
 
 %package langpack-cs_CZ
-Summary: Czech language pack for %{name}
+Summary: Czech language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-cs, hyphen-cs, mythes-cs, autocorr-cs
@@ -693,10 +693,10 @@
 Obsoletes: openoffice.org2-langpack-cs_CZ < 1:3.0.0
 
 %description langpack-cs_CZ
-Provides additional czech translations and resources for %{name}.
+Provides additional czech translations and resources for OpenOffice.org.
 
 %package langpack-cy_GB
-Summary: Welsh language pack for %{name}
+Summary: Welsh language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-cy
@@ -706,10 +706,10 @@
 
 
 %description langpack-cy_GB
-Provides additional welsh translations and resources for %{name}.
+Provides additional welsh translations and resources for OpenOffice.org.
 
 %package langpack-da_DK
-Summary: Danish language pack for %{name}
+Summary: Danish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-da, hyphen-da, mythes-da, autocorr-da
@@ -719,10 +719,10 @@
 
 
 %description langpack-da_DK
-Provides additional danish translations and resources for %{name}.
+Provides additional danish translations and resources for OpenOffice.org.
 
 %package langpack-de
-Summary: German language pack for %{name}
+Summary: German language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-de, hyphen-de, mythes-de, autocorr-de
@@ -731,10 +731,10 @@
 
 
 %description langpack-de
-Provides additional german translations and resources for %{name}.
+Provides additional german translations and resources for OpenOffice.org.
 
 %package langpack-el_GR
-Summary: Greek language pack for %{name}
+Summary: Greek language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-el, hyphen-el, mythes-el
@@ -744,19 +744,19 @@
 
 
 %description langpack-el_GR
-Provides additional greek translations and resources for %{name}.
+Provides additional greek translations and resources for OpenOffice.org.
 
 %package langpack-en
-Summary: English language pack for %{name}
+Summary: English language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: mythes-en
 
 %description langpack-en
-English thesaurus for %{name}.
+English thesaurus for OpenOffice.org.
 
 %package langpack-es
-Summary: Spanish language pack for %{name}
+Summary: Spanish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-es, hyphen-es, mythes-es, autocorr-es
@@ -764,10 +764,10 @@
 Obsoletes: openoffice.org2-langpack-es < 1:3.0.0
 
 %description langpack-es
-Provides additional spanish translations and resources for %{name}.
+Provides additional spanish translations and resources for OpenOffice.org.
 
 %package langpack-et_EE
-Summary: Estonian language pack for %{name}
+Summary: Estonian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ee, hyphen-et
@@ -776,10 +776,10 @@
 Obsoletes: openoffice.org2-langpack-et_EE < 1:3.0.0
 
 %description langpack-et_EE
-Provides additional estonian translations and resources for %{name}.
+Provides additional estonian translations and resources for OpenOffice.org.
 
 %package langpack-eu_ES
-Summary: Basque language pack for %{name}
+Summary: Basque language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-eu, autocorr-eu
@@ -788,10 +788,10 @@
 Obsoletes: openoffice.org2-langpack-eu_ES < 1:3.0.0
 
 %description langpack-eu_ES
-Provides additional basque translations and resources for %{name}.
+Provides additional basque translations and resources for OpenOffice.org.
 
 %package langpack-fi_FI
-Summary: Finnish language pack for %{name}
+Summary: Finnish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: autocorr-fi
@@ -800,10 +800,10 @@
 Obsoletes: openoffice.org2-langpack-fi_FI < 1:3.0.0
 
 %description langpack-fi_FI
-Provides additional finish translations and resources for %{name}.
+Provides additional finish translations and resources for OpenOffice.org.
 
 %package langpack-fr
-Summary: French language pack for %{name}
+Summary: French language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-fr, hyphen-fr, mythes-fr, autocorr-fr
@@ -811,20 +811,20 @@
 Obsoletes: openoffice.org2-langpack-fr < 1:3.0.0
 
 %description langpack-fr
-Provides additional french translations and resources for %{name}.
+Provides additional french translations and resources for OpenOffice.org.
 
 %package langpack-ga_IE
-Summary: Irish language pack for %{name}
+Summary: Irish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ga, hyphen-ga, mythes-ga
 Obsoletes: openoffice.org2-langpack-ga_IE < 1:3.0.0
 
 %description langpack-ga_IE
-Provides additional irish translations and resources for %{name}.
+Provides additional irish translations and resources for OpenOffice.org.
 
 %package langpack-gl_ES
-Summary: Galician language pack for %{name}
+Summary: Galician language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-gl
@@ -833,10 +833,10 @@
 Obsoletes: openoffice.org2-langpack-gl_ES < 1:3.0.0
 
 %description langpack-gl_ES
-Provides additional galician translations and resources for %{name}.
+Provides additional galician translations and resources for OpenOffice.org.
 
 %package langpack-gu_IN
-Summary: Gujarati language pack for %{name}
+Summary: Gujarati language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-gu, hyphen-gu
@@ -845,10 +845,10 @@
 Obsoletes: openoffice.org2-langpack-gu_IN < 1:3.0.0
 
 %description langpack-gu_IN
-Provides additional gujarati translations and resources for %{name}.
+Provides additional gujarati translations and resources for OpenOffice.or.
 
 %package langpack-pa_IN
-Summary: Punjabi language pack for %{name}
+Summary: Punjabi language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-pa, hyphen-pa
@@ -857,10 +857,10 @@
 Obsoletes: openoffice.org2-langpack-pa_IN < 1:3.0.0
 
 %description langpack-pa_IN
-Provides additional punjabi translations and resources for %{name}.
+Provides additional punjabi translations and resources for OpenOffice.org.
 
 %package langpack-he_IL
-Summary: Hebrew language pack for %{name}
+Summary: Hebrew language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-he
@@ -870,10 +870,10 @@
 Obsoletes: openoffice.org2-langpack-he_IL < 1:3.0.0
 
 %description langpack-he_IL
-Provides additional hebrew translations and resources for %{name}.
+Provides additional hebrew translations and resources for OpenOffice.org.
 
 %package langpack-hi_IN
-Summary: Hindi language pack for %{name}
+Summary: Hindi language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-hi, hyphen-hi
@@ -883,10 +883,10 @@
 Obsoletes: openoffice.org2-langpack-hi_IN < 1:3.0.0
 
 %description langpack-hi_IN
-Provides additional hindi translations and resources for %{name}.
+Provides additional hindi translations and resources for OpenOffice.org.
 
 %package langpack-hu_HU
-Summary: Hungarian language pack for %{name}
+Summary: Hungarian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-hu, hyphen-hu, autocorr-hu
@@ -895,10 +895,10 @@
 Obsoletes: openoffice.org2-langpack-hu_HU < 1:3.0.0
 
 %description langpack-hu_HU
-Provides additional hungarian translations and resources for %{name}.
+Provides additional hungarian translations and resources for OpenOffice.org.
 
 %package langpack-hr_HR
-Summary: Croatian language pack for %{name}
+Summary: Croatian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-hr, hyphen-hr
@@ -907,10 +907,10 @@
 Obsoletes: openoffice.org2-langpack-hr_HR < 1:3.0.0
 
 %description langpack-hr_HR
-Provides additional croatian translations and resources for %{name}.
+Provides additional croatian translations and resources for OpenOffice.org.
 
 %package langpack-it
-Summary: Italian language pack for %{name}
+Summary: Italian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-it, hyphen-it, mythes-it, autocorr-it
@@ -918,10 +918,10 @@
 Obsoletes: openoffice.org2-langpack-it < 1:3.0.0
 
 %description langpack-it
-Provides additional italian translations and resources for %{name}.
+Provides additional italian translations and resources for OpenOffice.org.
 
 %package langpack-ja_JP
-Summary: Japanese language pack for %{name}
+Summary: Japanese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: autocorr-ja
@@ -931,10 +931,10 @@
 Obsoletes: openoffice.org2-langpack-ja_JP < 1:3.0.0
 
 %description langpack-ja_JP
-Provides additional japanese translations and resources for %{name}.
+Provides additional japanese translations and resources for OpenOffice.org.
 
 %package langpack-ko_KR
-Summary: Korean language pack for %{name}
+Summary: Korean language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: autocorr-ko
@@ -944,10 +944,10 @@
 Obsoletes: openoffice.org2-langpack-ko_KR < 1:3.0.0
 
 %description langpack-ko_KR
-Provides additional korean translations and resources for %{name}.
+Provides additional korean translations and resources for OpenOffice.org.
 
 %package langpack-lt_LT
-Summary: Lithuanian language pack for %{name}
+Summary: Lithuanian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-lt, hyphen-lt
@@ -956,10 +956,10 @@
 Obsoletes: openoffice.org2-langpack-lt_LT < 1:3.0.0
 
 %description langpack-lt_LT
-Provides additional lithuanian translations and resources for %{name}.
+Provides additional lithuanian translations and resources for OpenOffice.org.
 
 %package langpack-ms_MY
-Summary: Malay language pack for %{name}
+Summary: Malay language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ms
@@ -968,10 +968,10 @@
 Obsoletes: openoffice.org2-langpack-ms_MY < 1:3.0.0
 
 %description langpack-ms_MY
-Provides additional malay translations and resources for %{name}.
+Provides additional malay translations and resources for OpenOffice.org.
 
 %package langpack-nb_NO
-Summary: Bokmal language pack for %{name}
+Summary: Bokmal language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-nb, hyphen-nb, mythes-nb
@@ -980,10 +980,10 @@
 Obsoletes: openoffice.org2-langpack-nb_NO < 1:3.0.0
 
 %description langpack-nb_NO
-Provides additional bokmal translations and resources for %{name}.
+Provides additional bokmal translations and resources for OpenOffice.org.
 
 %package langpack-nl
-Summary: Dutch language pack for %{name}
+Summary: Dutch language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-nl, hyphen-nl, mythes-nl, autocorr-nl
@@ -991,10 +991,10 @@
 Obsoletes: openoffice.org2-langpack-nl < 1:3.0.0
 
 %description langpack-nl
-Provides additional dutch translations and resources for %{name}.
+Provides additional dutch translations and resources for OpenOffice.org.
 
 %package langpack-nn_NO
-Summary: Nynorsk language pack for %{name}
+Summary: Nynorsk language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-nn, hyphen-nn, mythes-nn
@@ -1003,20 +1003,20 @@
 Obsoletes: openoffice.org2-langpack-nn_NO < 1:3.0.0
 
 %description langpack-nn_NO
-Provides additional nynorsk translations and resources for %{name}.
+Provides additional nynorsk translations and resources for OpenOffice.org.
 
 %package langpack-nr_ZA
-Summary: Southern Ndebele language pack for %{name}
+Summary: Southern Ndebele language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-nr
 
 %description langpack-nr_ZA
 Provides additional Southern Ndebele translations and resources for 
-%{name}.
+OpenOffice.org.
 
 %package langpack-pl_PL
-Summary: Polish language pack for %{name}
+Summary: Polish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-pl, hyphen-pl, mythes-pl, autocorr-pl
@@ -1025,10 +1025,10 @@
 Obsoletes: openoffice.org2-langpack-pl_PL < 1:3.0.0
 
 %description langpack-pl_PL
-Provides additional polish translations and resources for %{name}.
+Provides additional polish translations and resources for OpenOffice.org.
 
 %package langpack-pt_PT
-Summary: Portuguese language pack for %{name}
+Summary: Portuguese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-pt, hyphen-pt, mythes-pt, autocorr-pt
@@ -1037,10 +1037,10 @@
 Obsoletes: openoffice.org2-langpack-pt_PT < 1:3.0.0
 
 %description langpack-pt_PT
-Provides additional portuguese translations and resources for %{name}.
+Provides additional portuguese translations and resources for OpenOffice.org.
 
 %package langpack-pt_BR
-Summary: Brazilian Portuguese language pack for %{name}
+Summary: Brazilian Portuguese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-pt, hyphen-pt, mythes-pt, autocorr-pt
@@ -1050,10 +1050,10 @@
 
 %description langpack-pt_BR
 Provides additional brazilian portuguese translations and resources for 
-%{name}.
+OpenOffice.org.
 
 %package langpack-ru
-Summary: Russian language pack for %{name}
+Summary: Russian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ru, hyphen-ru, mythes-ru, autocorr-ru
@@ -1061,10 +1061,10 @@
 Obsoletes: openoffice.org2-langpack-ru < 1:3.0.0
 
 %description langpack-ru
-Provides additional russian translations and resources for %{name}.
+Provides additional russian translations and resources for OpenOffice.org.
 
 %package langpack-sk_SK
-Summary: Slovak language pack for %{name}
+Summary: Slovak language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-sk, hyphen-sk, mythes-sk, autocorr-sk
@@ -1073,10 +1073,10 @@
 Obsoletes: openoffice.org2-langpack-sk_SK < 1:3.0.0
 
 %description langpack-sk_SK
-Provides additional slovak translations and resources for %{name}.
+Provides additional slovak translations and resources for OpenOffice.org.
 
 %package langpack-sl_SI
-Summary: Slovenian language pack for %{name}
+Summary: Slovenian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-sl, hyphen-sl, mythes-sl, autocorr-sl
@@ -1085,10 +1085,10 @@
 Obsoletes: openoffice.org2-langpack-sl_SI < 1:3.0.0
 
 %description langpack-sl_SI
-Provides additional slovenian translations and resources for %{name}.
+Provides additional slovenian translations and resources for OpenOffice.org.
 
 %package langpack-sr
-Summary: Serbian language pack for %{name}
+Summary: Serbian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-sr
@@ -1096,29 +1096,29 @@
 Obsoletes: openoffice.org2-langpack-sr_CS < 1:3.0.0
 
 %description langpack-sr
-Provides additional serbian translations and resources for %{name}.
+Provides additional serbian translations and resources for OpenOffice.org.
 
 %package langpack-ss_ZA
-Summary: Swati language pack for %{name}
+Summary: Swati language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ss
 
 %description langpack-ss_ZA
-Provides additional swati translations and resources for %{name}.
+Provides additional swati translations and resources for OpenOffice.org.
 
 %package langpack-st_ZA
-Summary: Southern Sotho language pack for %{name}
+Summary: Southern Sotho language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-st
 
 %description langpack-st_ZA
 Provides additional Southern Sotho translations and resources for 
-%{name}.
+OpenOffice.org.
 
 %package langpack-sv
-Summary: Swedish language pack for %{name}
+Summary: Swedish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-sv, hyphen-sv, mythes-sv, autocorr-sv
@@ -1126,10 +1126,10 @@
 Obsoletes: openoffice.org2-langpack-sv < 1:3.0.0
 
 %description langpack-sv
-Provides additional swedish translations and resources for %{name}.
+Provides additional swedish translations and resources for OpenOffice.org.
 
 %package langpack-ta_IN
-Summary: Tamil language pack for %{name}
+Summary: Tamil language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires:  hunspell-ta, hyphen-ta
@@ -1138,10 +1138,10 @@
 Obsoletes: openoffice.org2-langpack-ta_IN < 1:3.0.0
 
 %description langpack-ta_IN
-Provides additional tamil translations and resources for %{name}.
+Provides additional tamil translations and resources for OpenOffice.org.
 
 %package langpack-th_TH
-Summary: Thai language pack for %{name}
+Summary: Thai language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-th
@@ -1151,10 +1151,10 @@
 Obsoletes: openoffice.org2-langpack-th_TH < 1:3.0.0
 
 %description langpack-th_TH
-Provides additional thai translations and resources for %{name}.
+Provides additional thai translations and resources for OpenOffice.org.
 
 %package langpack-nso_ZA
-Summary: Northern Sotho language pack for %{name}
+Summary: Northern Sotho language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-nso
@@ -1162,10 +1162,10 @@
 
 %description langpack-nso_ZA
 Provides additional Northern Sotho translations and resources for 
-%{name}.
+OpenOffice.org.
 
 %package langpack-tn_ZA
-Summary: Tswana language pack for %{name}
+Summary: Tswana language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-tn
@@ -1173,10 +1173,10 @@
 Obsoletes: openoffice.org2-langpack-tn_ZA < 1:3.0.0
 
 %description langpack-tn_ZA
-Provides additional tswana translations and resources for %{name}.
+Provides additional tswana translations and resources for OpenOffice.org.
 
 %package langpack-ts_ZA
-Summary: Tsonga language pack for %{name}
+Summary: Tsonga language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ts
@@ -1184,10 +1184,10 @@
 Obsoletes: openoffice.org2-langpack-ts_ZA < 1:3.0.0
 
 %description langpack-ts_ZA
-Provides additional tsonga translations and resources for %{name}.
+Provides additional tsonga translations and resources for OpenOffice.org.
 
 %package langpack-tr_TR
-Summary: Turkish language pack for %{name}
+Summary: Turkish language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: autocorr-tr
@@ -1196,28 +1196,28 @@
 Obsoletes: openoffice.org2-langpack-tr < 1:3.0.0
 
 %description langpack-tr_TR
-Provides additional turkish translations and resources for %{name}.
+Provides additional turkish translations and resources for OpenOffice.org.
 
 %package langpack-ve_ZA
-Summary: Venda language pack for %{name}
+Summary: Venda language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ve
 
 %description langpack-ve_ZA
-Provides additional venda translations and resources for %{name}.
+Provides additional venda translations and resources for OpenOffice.org.
 
 %package langpack-xh_ZA
-Summary: Xhosa language pack for %{name}
+Summary: Xhosa language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-xh
 
 %description langpack-xh_ZA
-Provides additional xhosa translations and resources for %{name}.
+Provides additional xhosa translations and resources for OpenOffice.org.
 
 %package langpack-zh_CN
-Summary: Simplified Chinese language pack for %{name}
+Summary: Simplified Chinese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: autocorr-zh
@@ -1228,10 +1228,10 @@
 
 %description langpack-zh_CN
 Provides additional simplified chinese translations and resources for 
-%{name}.
+OpenOffice.org.
 
 %package langpack-zh_TW
-Summary: Traditional Chinese language pack for %{name}
+Summary: Traditional Chinese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: autocorr-zh
@@ -1242,10 +1242,10 @@
 
 %description langpack-zh_TW
 Provides additional traditional chinese translations and resources for 
-%{name}.
+OpenOffice.org.
 
 %package langpack-zu_ZA
-Summary: Zulu language pack for %{name}
+Summary: Zulu language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-zu, hyphen-zu
@@ -1254,20 +1254,20 @@
 Obsoletes: openoffice.org2-langpack-zu_ZA < 1:3.0.0
 
 %description langpack-zu_ZA
-Provides additional zulu translations and resources for %{name}.
+Provides additional zulu translations and resources for OpenOffice.org.
 
 %package langpack-as_IN
-Summary: Assamese language pack for %{name}
+Summary: Assamese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: lohit-fonts-bengali
 Obsoletes: openoffice.org2-langpack-as_IN < 1:3.0.0
 
 %description langpack-as_IN
-Provides additional assamese translations and resources for %{name}.
+Provides additional assamese translations and resources for OpenOffice.org.
 
 %package langpack-mr_IN
-Summary: Marathi language pack for %{name}
+Summary: Marathi language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-mr
@@ -1275,10 +1275,10 @@
 Obsoletes: openoffice.org2-langpack-mr_IN < 1:3.0.0
 
 %description langpack-mr_IN
-Provides additional marathi translations and resources for %{name}.
+Provides additional marathi translations and resources for OpenOffice.org.
 
 %package langpack-ml_IN
-Summary: Malayalam language pack for %{name}
+Summary: Malayalam language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ml, hyphen-ml
@@ -1286,10 +1286,10 @@
 Obsoletes: openoffice.org2-langpack-ml_IN < 1:3.0.0
 
 %description langpack-ml_IN
-Provides additional malayalam translations and resources for %{name}.
+Provides additional malayalam translations and resources for OpenOffice.org.
 
 %package langpack-or_IN
-Summary: Oriya language pack for %{name}
+Summary: Oriya language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-or, hyphen-or
@@ -1297,10 +1297,10 @@
 Obsoletes: openoffice.org2-langpack-or_IN < 1:3.0.0
 
 %description langpack-or_IN
-Provides additional oriya translations and resources for %{name}.
+Provides additional oriya translations and resources for OpenOffice.org.
 
 %package langpack-te_IN
-Summary: Telugu language pack for %{name}
+Summary: Telugu language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-te, hyphen-te
@@ -1308,10 +1308,10 @@
 Obsoletes: openoffice.org2-langpack-te_IN < 1:3.0.0
 
 %description langpack-te_IN
-Provides additional telugu translations and resources for %{name}.
+Provides additional telugu translations and resources for OpenOffice.org.
 
 %package langpack-ur
-Summary: Urdu language pack for %{name}
+Summary: Urdu language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: paktype-fonts
@@ -1319,10 +1319,10 @@
 Obsoletes: openoffice.org2-langpack-ur < 1:3.0.0
 
 %description langpack-ur
-Provides additional urdu translations and resources for %{name}.
+Provides additional urdu translations and resources for OpenOffice.org.
 
 %package langpack-kn_IN
-Summary: Kannada language pack for %{name}
+Summary: Kannada language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hyphen-kn
@@ -1330,34 +1330,34 @@
 Obsoletes: openoffice.org2-langpack-kn_IN < 1:3.0.0
 
 %description langpack-kn_IN
-Provides additional kannada translations and resources for %{name}.
+Provides additional kannada translations and resources for OpenOffice.org.
 
 %package langpack-dz
-Summary: Dzongkha language pack for %{name}
+Summary: Dzongkha language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: jomolhari-fonts
 
 %description langpack-dz
-Provides additional dzongkha translations and resources for %{name}.
+Provides additional dzongkha translations and resources for OpenOffice.org.
 
 %package langpack-uk
-Summary: Ukrainian language pack for %{name}
+Summary: Ukrainian language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-uk, hyphen-uk, mythes-uk
 
 %description langpack-uk
-Provides additional Ukrainian translations and resources for %{name}.
+Provides additional Ukrainian translations and resources for OpenOffice.org.
 
 %package langpack-mai_IN
-Summary: Maithili language pack for %{name}
+Summary: Maithili language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: lohit-maithili-fonts
 
 %description langpack-mai_IN
-Provides additional maithili translations and resources for %{name}.
+Provides additional maithili translations and resources for OpenOffice.org.
 
 
 %package -n autocorr-en
@@ -1624,7 +1624,8 @@
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
 %patch58 -p0 -b .ooo100225.comphelper.vis.patch
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch60 -p1 -b .oooXXXXX.partial-revert-ooo95118.patch
+%patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch61 -p1 -b .oooXXXXX.partial-revert-ooo95118.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4112,10 +4113,11 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Apr 08 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
+* Thu Apr 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
   hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi
 - Resolves: rhbz#494643 EMF polypolygons issue
+- Resolves: ooo#61927 ww6 unicode font encoding on export
 - Revert pythonscript.py part of ooo#95118 for now
 
 * Thu Apr 02 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.1



From limb at fedoraproject.org  Thu Apr  9 12:22:39 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  9 Apr 2009 12:22:39 +0000 (UTC)
Subject: rpms/agistudio/devel .cvsignore, 1.2, 1.3 agistudio.spec, 1.12,
	1.13 sources, 1.2, 1.3
Message-ID: <20090409122239.ECF307001C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/agistudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24945

Modified Files:
	.cvsignore agistudio.spec sources 
Log Message:
New upstream, builds with strict prototypes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/agistudio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 May 2007 16:21:53 -0000	1.2
+++ .cvsignore	9 Apr 2009 12:22:09 -0000	1.3
@@ -1 +1 @@
-agistudio-1.2.3.tar.gz
+agistudio-1.2.4.tar.gz


Index: agistudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agistudio/devel/agistudio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- agistudio.spec	24 Feb 2009 00:18:27 -0000	1.12
+++ agistudio.spec	9 Apr 2009 12:22:09 -0000	1.13
@@ -1,16 +1,16 @@
 Name: agistudio
-Version: 1.2.3
-Release: 9%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
 Summary: AGI integrated development environment
 License: GPLv2+
 Group: Amusements/Games
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: agistudio-1.2.3-logdecode-stdlib.patch
-Patch1: agistudio-1.2.3-main-stdlib.patch
-Patch2: agistudio-1.2.3-picedit-stdlib.patch
-Patch3: agistudio-1.2.3-roomgen-stringh.patch
-Patch4: agistudio-1.2.3-util-stringh.patch
+#Patch0: agistudio-1.2.3-logdecode-stdlib.patch
+#Patch1: agistudio-1.2.3-main-stdlib.patch
+#Patch2: agistudio-1.2.3-picedit-stdlib.patch
+#Patch3: agistudio-1.2.3-roomgen-stringh.patch
+#Patch4: agistudio-1.2.3-util-stringh.patch
 URL: http://agistudio.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,11 +25,11 @@
 %prep
 
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
+#%patch0 -p0
+#%patch1 -p0
+#%patch2 -p0
+#%patch3 -p0
+#%patch4 -p0
 
 %build
 cd src
@@ -76,6 +76,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/agistudio.xpm
 
 %changelog
+* Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.4-1
+- New upstream, dropping relevant patches.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agistudio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 May 2007 16:21:53 -0000	1.2
+++ sources	9 Apr 2009 12:22:09 -0000	1.3
@@ -1 +1 @@
-b262d55b1285967923598e53fb93fe62  agistudio-1.2.3.tar.gz
+ee22fc83ab7b36b9e15d52cf59d4896a  agistudio-1.2.4.tar.gz



From akurtakov at fedoraproject.org  Thu Apr  9 12:39:09 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  9 Apr 2009 12:39:09 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-swt-xulrunner191.patch, NONE,
	1.1 eclipse-swt-buildagainstxulrunner.patch, 1.1,
	1.2 eclipse.spec, 1.627, 1.628
Message-ID: <20090409123909.0A0317001C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30093/devel

Modified Files:
	eclipse-swt-buildagainstxulrunner.patch eclipse.spec 
Added Files:
	eclipse-swt-xulrunner191.patch 
Log Message:
Add patch for xulrunner compilation.

eclipse-swt-xulrunner191.patch:

--- NEW FILE eclipse-swt-xulrunner191.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
retrieving revision 1.105.2.3
diff -u -r1.105.2.3 Mozilla.java
--- Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java	21 Aug 2008 16:02:30 -0000	1.105.2.3
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java	2 Apr 2009 19:15:06 -0000
@@ -47,6 +47,7 @@
 	Shell tip = null;
 	Listener listener;
 	Vector unhookedDOMWindows = new Vector ();
+	byte[] htmlBytes;
 
 	static nsIAppShell AppShell;
 	static AppFileLocProvider LocationProvider;
@@ -1168,21 +1169,21 @@
 				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
 				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
 				 */
-				awaitingNavigate = true;
-				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-				if (rc != XPCOM.NS_OK) {
-					browser.dispose ();
-					error (rc);
-				}
-				if (result[0] == 0) {
-					browser.dispose ();
-					error (XPCOM.NS_ERROR_NO_INTERFACE);
-				}
-				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-			    char[] uri = new char[ABOUT_BLANK.length () + 1];
-			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-				webNavigation.Release ();
+//				awaitingNavigate = true;
+//				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+//				if (rc != XPCOM.NS_OK) {
+//					browser.dispose ();
+//					error (rc);
+//				}
+//				if (result[0] == 0) {
+//					browser.dispose ();
+//					error (XPCOM.NS_ERROR_NO_INTERFACE);
+//				}
+//				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+//			    char[] uri = new char[ABOUT_BLANK.length () + 1];
+//			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+//				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+//				webNavigation.Release ();
 
 				dialogFactory.isPre_1_9 = false;
 			}
@@ -1264,6 +1265,7 @@
 }
 
 public boolean back () {
+	htmlBytes = null;
 	if (awaitingNavigate) return false;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1466,6 +1468,7 @@
 }
 
 public boolean forward () {
+	htmlBytes = null;
 	if (awaitingNavigate) return false;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1676,6 +1679,7 @@
 	webBrowser.Release ();
 	webBrowser = null;
 	webBrowserObject = null;
+	htmlBytes = null;
 
 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
 	tip = null;
@@ -1737,6 +1741,7 @@
 }
 
 public void refresh () {
+	htmlBytes = null;
 	if (awaitingNavigate) return;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1858,11 +1863,45 @@
 		} else {
 			result[0] = 0;
 			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-			nsIDocShell docShell = new nsIDocShell (result[0]);
-			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-			docShell.Release ();
+			if (rc == XPCOM.NS_OK) {
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				nsIDocShell docShell = new nsIDocShell (result[0]);
+				rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
+				docShell.Release ();
+			} else {
+				result[0] = 0;
+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+				if (rc == XPCOM.NS_OK) {
+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+					/*
+					* Setting mozilla's content through nsIWebBrowserStream does not cause a page
+					* load to occur, so the events that usually accompany a page change are not
+					* fired.  To make this behave as expected, navigate to about:blank first and
+					* then set the html content once the page has loaded.
+					*/
+					new nsISupports (result[0]).Release ();
+					result[0] = 0;
+
+					/*
+					* If htmlBytes is not null then the about:blank page is already being loaded,
+					* so no Navigate is required.  Just set the html that is to be shown.
+					*/
+					boolean blankLoading = htmlBytes != null;
+					htmlBytes = data;
+					if (blankLoading) return true;
+
+					/* navigate to about:blank */
+					rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+					if (rc != XPCOM.NS_OK) error (rc);
+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+					nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+					result[0] = 0;
+				    char[] uriChars = new char[ABOUT_BLANK.length () + 1];
+				    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
+					rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+					webNavigation.Release ();
+				}
+			}
 		}
 	}
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1877,6 +1916,7 @@
 }
 
 public boolean setUrl (String url) {
+	htmlBytes = null;
 	awaitingNavigate = false;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -1893,6 +1933,7 @@
 }
 
 public void stop () {
+	htmlBytes = null;
 	if (awaitingNavigate) return;
 
 	int /*long*/[] result = new int /*long*/[1];
@@ -2215,6 +2256,108 @@
 			unhookedDOMWindows.remove (ptrObject);
 			new nsISupports (ptrObject.value).Release ();
 		}
+
+		/*
+		* If htmlBytes is not null then there is html from a previous setText() call
+		* waiting to be set into the about:blank page once it has completed loading. 
+		*/
+		if (htmlBytes != null) {
+			nsIRequest req = new nsIRequest (aRequest);
+			int /*long*/ name = XPCOM.nsEmbedCString_new ();
+			rc = req.GetName (name);
+			if (rc != XPCOM.NS_OK) error (rc);
+			int length = XPCOM.nsEmbedCString_Length (name);
+			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+			byte[] dest = new byte[length];
+			XPCOM.memmove (dest, buffer, length);
+			String url = new String (dest);
+			XPCOM.nsEmbedCString_delete (name);
+
+			if (url.startsWith (ABOUT_BLANK)) {
+				/*
+				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
+				 * DOM listeners that were hooked on it (about:blank), so remove them and
+				 * add new ones after the content has been set.
+				 */
+				unhookDOMListeners ();
+
+				rc = XPCOM.NS_GetServiceManager (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+				result[0] = 0;
+				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				serviceManager.Release ();
+
+				nsIIOService ioService = new nsIIOService (result[0]);
+				result[0] = 0;
+				/*
+				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
+				* when the URI protocol for the nsInputStreamChannel
+				* is about:blank.  The fix is to specify the file protocol.
+				*/
+				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+				rc = ioService.NewURI (aSpec, null, 0, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				XPCOM.nsEmbedCString_delete (aSpec);
+				ioService.Release ();
+
+				nsIURI uri = new nsIURI (result[0]);
+				result[0] = 0;
+
+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
+				result[0] = 0;
+
+				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+				int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+				rc = stream.OpenStream (uri.getAddress (), aContentType);
+				if (rc != XPCOM.NS_OK) error (rc);
+				int /*long*/ ptr = C.malloc (htmlBytes.length);
+				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
+				int pageSize = 8192;
+				int pageCount = htmlBytes.length / pageSize + 1;
+				int /*long*/ current = ptr;
+				for (int i = 0; i < pageCount; i++) {
+					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
+					if (length > 0) {
+						rc = stream.AppendToStream (current, length);
+						if (rc != XPCOM.NS_OK) error (rc);
+					}
+					current += pageSize;
+				}
+				rc = stream.CloseStream ();
+				if (rc != XPCOM.NS_OK) error (rc);
+				C.free (ptr);
+				XPCOM.nsEmbedCString_delete (aContentType);
+				stream.Release ();
+				uri.Release ();
+				htmlBytes = null;
+
+				rc = webBrowser.GetContentDOMWindow (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				boolean isTop = result[0] == domWindow.getAddress ();
+				new nsISupports (result[0]).Release ();
+				result[0] = 0;
+				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
+				result[0] = 0;
+				hookDOMListeners (target, isTop);
+				target.Release ();
+			}
+		}
 		domWindow.Release ();
 
 		/*
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
===================================================================
RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,55 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserStream extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
+		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
+
+	public static final nsID NS_IWEBBROWSERSTREAM_IID =
+		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
+
+	public nsIWebBrowserStream(int /*long*/ address) {
+		super(address);
+	}
+
+	public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
+	}
+
+	public int AppendToStream(int /*long*/ aData, int aLen) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
+	}
+
+	public int CloseStream() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+}

eclipse-swt-buildagainstxulrunner.patch:

Index: eclipse-swt-buildagainstxulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-swt-buildagainstxulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-swt-buildagainstxulrunner.patch	16 Mar 2009 18:14:14 -0000	1.1
+++ eclipse-swt-buildagainstxulrunner.patch	9 Apr 2009 12:39:08 -0000	1.2
@@ -3,24 +3,31 @@
 Index: Eclipse SWT PI/gtk/library/build.sh
 ===================================================================
 RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
-retrieving revision 1.50
-diff -u -r1.50 build.sh
---- Eclipse SWT PI/gtk/library/build.sh	23 Jan 2009 23:22:21 -0000	1.50
-+++ Eclipse SWT PI/gtk/library/build.sh	5 Mar 2009 20:41:43 -0000
-@@ -107,11 +107,11 @@
+retrieving revision 1.48
+diff -u -r1.48 build.sh
+--- Eclipse SWT PI/gtk/library/build.sh	5 Jun 2008 17:31:51 -0000	1.48
++++ Eclipse SWT PI/gtk/library/build.sh	6 Apr 2009 21:11:22 -0000
+@@ -99,19 +99,19 @@
+ 		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+ 		export MOZILLA_INCLUDES
+ 		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
+ 	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
+ 		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
+ 		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
+ 		export MOZILLA_INCLUDES
  		export MOZILLA_LIBS
- 		MAKE_MOZILLA=make_mozilla
- 	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
--		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
--		MOZILLA_LIBS=`pkg-config --libs libxul`
--		export MOZILLA_INCLUDES
--		export MOZILLA_LIBS
 -		MAKE_MOZILLA=make_mozilla
-+		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-+		XULRUNNER_LIBS=`pkg-config --libs libxul`
-+		export XULRUNNER_INCLUDES
-+		export XULRUNNER_LIBS
-+		MAKE_MOZILLA=make_xulrunner
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
+ 	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+ 		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+-		XULRUNNER_LIBS=`pkg-config --libs libxul`
++		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
+ 		export XULRUNNER_INCLUDES
+ 		export XULRUNNER_LIBS
+-		MAKE_MOZILLA=make_xulrunner
++		MAKE_MOZILLA="make_xulrunner make_xpcominit"
  	else
  		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
  		echo "    *** Mozilla embedding support will not be compiled."


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- eclipse.spec	7 Apr 2009 16:07:22 -0000	1.627
+++ eclipse.spec	9 Apr 2009 12:39:08 -0000	1.628
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.7%{?dist}
+Release:        0.1.8%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -147,16 +147,24 @@
 Patch43:		%{name}-osgi-classpath.patch
 Patch44:		%{name}-fix-javahome64.patch
 
-# Since we're building against XULRunner, build using XR flags
-# https://bugs.eclipse.org/226356
-# https://bugzilla.redhat.com/show_bug.cgi?id=484453
-Patch45:        %{name}-swt-buildagainstxulrunner.patch
-
 # TODO fix build.xml generation
 Patch46:        %{name}-platform_build.patch
 # TODO fix customBuildCallback
 Patch47:        %{name}-jdt_launch-customBuild.patch
 
+# Since we're building against XULRunner, build using XR flags
+# https://bugs.eclipse.org/226356
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
+# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
+# it should perhaps be -lxpcomglue.  This patch uses that instead but will
+# be replaced with the former when libxul.pc is fixed.
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
+Patch48:        %{name}-swt-buildagainstxulrunner.patch
+# Work with changed interface in XULRunner 1.9.1
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=130611
+Patch49:        %{name}-swt-xulrunner191.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -665,6 +673,14 @@
 %patch46
 %patch47
 
+pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+%patch48 -p3
+popd
+pushd plugins/org.eclipse.swt
+# TODO remove when it appears in the official build
+#%patch49
+popd
+
 sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \
 	-e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \
 	plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
@@ -1571,6 +1587,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Apr 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.8
+- Add patch for xulrunner compilation.
+
 * Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.7
 - Fix patch name.
 



From rdieter at fedoraproject.org  Thu Apr  9 12:45:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  9 Apr 2009 12:45:43 +0000 (UTC)
Subject: rpms/amarok/F-10 amarok-2.0.2-fix_lastfm_auth.patch, NONE,
	1.1 amarok-2.0.2-no_qtscriptgenerator.patch, NONE,
	1.1 amarok.spec, 1.135, 1.136
Message-ID: <20090409124543.817AB7001C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.2-fix_lastfm_auth.patch 
	amarok-2.0.2-no_qtscriptgenerator.patch 
Log Message:
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
- fix lastfm (kdebug#188678, rhbz#494871)
- fix qtscriptgenerator/qtscriptbindings deps


amarok-2.0.2-fix_lastfm_auth.patch:

--- NEW FILE amarok-2.0.2-fix_lastfm_auth.patch ---
--- src/services/lastfm/LastFmServiceSettings.cpp
+++ src/services/lastfm/LastFmServiceSettings.cpp
@@ -94,14 +94,12 @@
     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
 
     QString authToken =  md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
     
     // now authenticate w/ last.fm and get our session key
     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
     .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
     .add( "authToken", authToken )
     .add( "api_key", Ws::ApiKey )
-    .add( "api_sig", sign_key )
     .get();
     
     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
--- src/services/lastfm/LastFmService.cpp
+++ src/services/lastfm/LastFmService.cpp
@@ -115,14 +115,12 @@
     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
 
     QString authToken =  md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
     
     // now authenticate w/ last.fm and get our session key
     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
     .add( "username", m_userName )
     .add( "authToken", authToken )
     .add( "api_key", Ws::ApiKey )
-    .add( "api_sig", sign_key )
     .get();
     
     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );

amarok-2.0.2-no_qtscriptgenerator.patch:

--- NEW FILE amarok-2.0.2-no_qtscriptgenerator.patch ---
diff -up amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator amarok-2.0.2/CMakeLists.txt
--- amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator	2009-03-01 11:36:24.000000000 -0600
+++ amarok-2.0.2/CMakeLists.txt	2009-03-10 13:37:21.000000000 -0500
@@ -20,7 +20,7 @@ set( CMAKE_MODULE_PATH    ${CMAKE_MODULE
 
 #this line has to be before add_defintions, but after the KDE4 cmake includes
 #because they are used to determine install locations
-add_subdirectory( src/scriptengine/generator )
+#add_subdirectory( src/scriptengine/generator )
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 include(CheckLibraryExists)


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- amarok.spec	7 Mar 2009 01:21:14 -0000	1.135
+++ amarok.spec	9 Apr 2009 12:45:13 -0000	1.136
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 3%{?dist}
+Release: 6%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -15,7 +15,13 @@
 Patch0:  amarok-libgpod-0.7.0.patch
 Patch1:  amarok-2.0.1.1-gcc44.patch
 
+# qtscriptgenerator review, http://bugzilla.redhat.com/489550
+%define no_qtscriptgenerator 1
+Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
+
 Patch100: amarok-2.0.1.1-qt45.patch
+# https://bugs.kde.org/188678
+Patch101: amarok-2.0.2-fix_lastfm_auth.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -35,13 +41,14 @@
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 
-# 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%if 0%{?no_qtscriptgenerator}
+BuildRequires: qtscriptgenerator
+Requires: qtscriptbindings
+%endif
 
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
@@ -55,15 +62,24 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+
 %prep
 %setup -q
 
-%if 0%{?fedora} > 10
+%if "%(pkg-config --modversion libgpod-1.0)" >=  "0.7.0"
 %patch0 -p0 -b .libgpod-0.7.0
-%patch100 -p0 -b .qt45
 %endif
+
 %patch1 -p1 -b .gcc4
 
+%if 0%{?no_qtscriptgenerator}
+%patch2 -p1 -b .no_qtscriptgenerator
+rm -rf src/scriptengine/generator
+%else
+%{?_qt45:%patch100 -p0 -b .qt45}
+%endif
+%patch101 -p0 -b .fix_lastfm_auth
+
 
 %build
 mkdir -p %{_target_platform}
@@ -71,13 +87,6 @@
 %{cmake_kde4} ..
 popd
 
-%if 0
-# hack around qt45 patch-induced(?) smp borkage
-pushd src/scriptengine/generator/generator
-./generate.sh
-popd
-%endif
-
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -86,31 +95,35 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# desktop files
-desktop-file-install  --vendor "" \
-  --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \
-  --delete-original \
-  %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
-
-%find_lang amarok || touch amarok.lang
+%find_lang amarok
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files -f amarok.lang
@@ -122,13 +135,15 @@
 %{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
+%if ! 0%{?no_qtscriptgenerator}
 %{_kde4_libdir}/kde4/plugins/script/*.so
+%endif
 %{_kde4_libdir}/libamarok*.so.*
 %{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
@@ -136,6 +151,18 @@
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
+- fix lastfm (kdebug#188678, rhbz#494871)
+- fix qtscriptgenerator/qtscriptbindings deps
+
+* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
+- enable external qtscriptgenerator/qtscriptbindings
+- optimize scriptlets
+
+* Tue Mar 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
+- Req: qtscriptgenerator (f11+) (not enabled, pending review)
+- use desktop-file-validate
+
 * Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-3
 - add minimal qt4,kdelibs4 deps
 



From pmatilai at fedoraproject.org  Thu Apr  9 12:46:46 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu,  9 Apr 2009 12:46:46 +0000 (UTC)
Subject: rpms/rpm/devel .cvsignore, 1.34, 1.35 rpm.spec, 1.343, 1.344 sources,
	1.140, 1.141
Message-ID: <20090409124646.75DA87001C@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32360

Modified Files:
	.cvsignore rpm.spec sources 
Log Message:
- update to 4.7.0-rc1
- fixes #493157, #493777, #493696, #491388, #487597, #493162



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	6 Mar 2009 18:28:20 -0000	1.34
+++ .cvsignore	9 Apr 2009 12:46:15 -0000	1.35
@@ -1 +1 @@
-rpm-4.7.0-beta1.tar.bz2
+rpm-4.7.0-rc1.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- rpm.spec	3 Apr 2009 07:45:24 -0000	1.343
+++ rpm.spec	9 Apr 2009 12:46:15 -0000	1.344
@@ -16,7 +16,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.7.0
-%define snapver beta1
+%define snapver rc1
 %define srcver %{rpmver}-%{snapver}
 
 %define bdbver 4.7.25
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.9%{?dist}
+Release: 0.%{snapver}.1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -43,17 +43,10 @@
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
-Patch200: rpm-4.7.0-beta1-srcrpm-macros.patch
-Patch201: rpm-4.7.0-beta1-fstates.patch
-Patch202: rpm-4.7.0-beta1-installangs.patch
-Patch203: rpm-4.7.0-alpha-isa.patch
-Patch204: rpm-4.7.0-rsa-v4.patch
-Patch205: rpm-4.7.0-beta1-default-filestate.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
-Patch301: rpm-4.7.0-rpmfc-order.patch
-Patch302: rpm-4.6.0-niagara.patch
+Patch301: rpm-4.6.0-niagara.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -191,16 +184,8 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
-%patch200 -p1 -b .srcrpm-macros
-%patch201 -p1 -b .fstates
-%patch202 -p1 -b .installangs
-%patch203 -p1 -b .alpha-isa
-%patch204 -p1 -b .rsa-v4
-%patch205 -p1 -b .default-fstate
-
 %patch300 -p1 -b .extra-prov
-%patch301 -p1 -b .rpmfc-order
-%patch302 -p1 -b .niagara
+%patch301 -p1 -b .niagara
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -409,6 +394,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.rc1.1
+- update to 4.7.0-rc1
+- fixes #493157, #493777, #493696, #491388, #487597, #493162
+
 * Fri Apr 03 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.9
 - fix recorded file state of otherwise skipped files (#492947)
 - compress ChangeLog, drop old CHANGES file (#492440)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	6 Mar 2009 18:28:21 -0000	1.140
+++ sources	9 Apr 2009 12:46:16 -0000	1.141
@@ -1 +1 @@
-ea6cf6444b401ed19f4756a1bc279884  rpm-4.7.0-beta1.tar.bz2
+321862428ef48d9d0bc36f7058b3b6c7  rpm-4.7.0-rc1.tar.bz2



From pmatilai at fedoraproject.org  Thu Apr  9 12:47:35 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu,  9 Apr 2009 12:47:35 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.5.90-devel-autodep.patch, 1.1,
	NONE rpm-4.6.0-anyarch-actions-fix.patch, 1.2,
	NONE rpm-4.6.0-extra-provides.patch, 1.3,
	NONE rpm-4.6.0-inherit-group.patch, 1.1,
	NONE rpm-4.6.0-noarch-elf-check.patch, 1.1,
	NONE rpm-4.6.0-pkgconfig-reqs.patch, 1.1,
	NONE rpm-4.6.0-python-validate.patch, 1.1,
	NONE rpm-4.6.0-rc1-defaultdocdir.patch, 1.3,
	NONE rpm-4.6.0-rpmds-null.patch, 1.1,
	NONE rpm-4.6.0-utf-dependencies.patch, 1.1,
	NONE rpm-4.7.0-alpha-isa.patch, 1.1,
	NONE rpm-4.7.0-beta1-default-filestate.patch, 1.1,
	NONE rpm-4.7.0-beta1-fstates.patch, 1.1,
	NONE rpm-4.7.0-beta1-installangs.patch, 1.1,
	NONE rpm-4.7.0-beta1-srcrpm-macros.patch, 1.1,
	NONE rpm-4.7.0-rpmfc-order.patch, 1.2,
	NONE rpm-4.7.0-rsa-v4.patch, 1.1, NONE
Message-ID: <20090409124735.E5C087001C@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32717

Removed Files:
	rpm-4.5.90-devel-autodep.patch 
	rpm-4.6.0-anyarch-actions-fix.patch 
	rpm-4.6.0-extra-provides.patch rpm-4.6.0-inherit-group.patch 
	rpm-4.6.0-noarch-elf-check.patch 
	rpm-4.6.0-pkgconfig-reqs.patch rpm-4.6.0-python-validate.patch 
	rpm-4.6.0-rc1-defaultdocdir.patch rpm-4.6.0-rpmds-null.patch 
	rpm-4.6.0-utf-dependencies.patch rpm-4.7.0-alpha-isa.patch 
	rpm-4.7.0-beta1-default-filestate.patch 
	rpm-4.7.0-beta1-fstates.patch 
	rpm-4.7.0-beta1-installangs.patch 
	rpm-4.7.0-beta1-srcrpm-macros.patch 
	rpm-4.7.0-rpmfc-order.patch rpm-4.7.0-rsa-v4.patch 
Log Message:
Lose unused patches



--- rpm-4.5.90-devel-autodep.patch DELETED ---


--- rpm-4.6.0-anyarch-actions-fix.patch DELETED ---


--- rpm-4.6.0-extra-provides.patch DELETED ---


--- rpm-4.6.0-inherit-group.patch DELETED ---


--- rpm-4.6.0-noarch-elf-check.patch DELETED ---


--- rpm-4.6.0-pkgconfig-reqs.patch DELETED ---


--- rpm-4.6.0-python-validate.patch DELETED ---


--- rpm-4.6.0-rc1-defaultdocdir.patch DELETED ---


--- rpm-4.6.0-rpmds-null.patch DELETED ---


--- rpm-4.6.0-utf-dependencies.patch DELETED ---


--- rpm-4.7.0-alpha-isa.patch DELETED ---


--- rpm-4.7.0-beta1-default-filestate.patch DELETED ---


--- rpm-4.7.0-beta1-fstates.patch DELETED ---


--- rpm-4.7.0-beta1-installangs.patch DELETED ---


--- rpm-4.7.0-beta1-srcrpm-macros.patch DELETED ---


--- rpm-4.7.0-rpmfc-order.patch DELETED ---


--- rpm-4.7.0-rsa-v4.patch DELETED ---



From ellert at fedoraproject.org  Thu Apr  9 12:54:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  9 Apr 2009 12:54:08 +0000 (UTC)
Subject: rpms/grid-packaging-tools/devel
	grid-packaging-tools-wrong-url.patch, 
	NONE, 1.1 grid-packaging-tools.spec, 1.1, 1.2
Message-ID: <20090409125408.D0C4070137@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1997

Modified Files:
	grid-packaging-tools.spec 
Added Files:
	grid-packaging-tools-wrong-url.patch 
Log Message:
* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
- Adding wrong-url patch


grid-packaging-tools-wrong-url.patch:

--- NEW FILE grid-packaging-tools-wrong-url.patch ---
diff -ur gpt.orig/CHANGES gpt/CHANGES
--- gpt.orig/CHANGES	2006-01-11 17:10:08.000000000 +0100
+++ gpt/CHANGES	2009-03-26 12:58:58.000000000 +0100
@@ -5,7 +5,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.1 -> 3.2
 Fixed some gpt-build Macro problems.
@@ -14,7 +14,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.0.1 -> 3.1
 
diff -ur gpt.orig/INSTALL gpt/INSTALL
--- gpt.orig/INSTALL	2006-01-11 17:10:08.000000000 +0100
+++ gpt/INSTALL	2009-03-26 12:58:58.000000000 +0100
@@ -3,4 +3,4 @@
 More installation help can be seen by running ./build_gpt -man.  Also
 the webpage
 
-http://www.gridpackagingtools.org/book/latest-stable/gpt-book.html#setup
+http://www.gridpackagingtools.com/book/latest-stable/gpt-book.html#setup
diff -ur gpt.orig/LICENSE gpt/LICENSE
--- gpt.orig/LICENSE	2006-01-11 17:10:08.000000000 +0100
+++ gpt/LICENSE	2009-03-26 13:00:59.000000000 +0100
@@ -5,7 +5,7 @@
     Grid Packaging Tools Development Team
     National Center for Supercomputing Applications
     University of Illinois
-    http://wwww.gridpackagingtools.org/ 
+    http://www.gridpackagingtools.com/ 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff -ur gpt.orig/README gpt/README
--- gpt.orig/README	2006-01-11 17:10:08.000000000 +0100
+++ gpt/README	2009-03-26 13:00:40.000000000 +0100
@@ -6,5 +6,5 @@
 
 
 Further information on GPT can be found at
-http://wwww.gridpackagingtools.org/
+http://www.gridpackagingtools.com/
 


Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/devel/grid-packaging-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grid-packaging-tools.spec	18 Mar 2009 08:33:08 -0000	1.1
+++ grid-packaging-tools.spec	9 Apr 2009 12:53:38 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
-URL:		http://www.gridpackagingtools.org/
+URL:		http://www.gridpackagingtools.com/
 # The maintenance of GPT has been taken over by the Globus Alliance.
 # Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
@@ -55,9 +55,12 @@
 #		Make gpt work with older automake versions:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6564
 Patch14:	%{name}-compat.patch
-#		Forward library version info to libtool
+#		Forward library version info to libtool:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6694
 Patch15:	%{name}-version-info.patch
+#		Wrong URLs in documentation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6705
+Patch16:	%{name}-wrong-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -109,6 +112,7 @@
 %patch13 -p1 -b .help
 %patch14 -p1 -b .compat
 %patch15 -p1 -b .version
+%patch16 -p1 -b .url
 
 iconv -f iso-8859-1 -t utf-8 LICENSE > LICENSE.utf8
 touch -c -r LICENSE LICENSE.utf8
@@ -161,6 +165,9 @@
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
+- Adding wrong-url patch
+
 * Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
 - Adding version-info patch
 



From jakub at fedoraproject.org  Thu Apr  9 12:54:28 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  9 Apr 2009 12:54:28 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-hack.patch,1.4,1.5
Message-ID: <20090409125428.3A56E70137@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2462

Modified Files:
	gcc44-hack.patch 
Log Message:
4.4.0-0.32

gcc44-hack.patch:

Index: gcc44-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-hack.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gcc44-hack.patch	16 Feb 2009 22:11:04 -0000	1.4
+++ gcc44-hack.patch	9 Apr 2009 12:54:27 -0000	1.5
@@ -1,8 +1,8 @@
 --- libada/Makefile.in.jj	2009-01-14 12:07:35.000000000 +0100
 +++ libada/Makefile.in	2009-01-15 14:25:33.000000000 +0100
-@@ -66,17 +66,39 @@ target_noncanonical:=@target_noncanonica
- version := $(shell cat $(srcdir)/../gcc/BASE-VER)
+@@ -67,17 +67,39 @@ version := $(shell cat $(srcdir)/../gcc/
  libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
+ ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
  
 +DEFAULTMULTIFLAGS :=
 +ifeq ($(MULTISUBDIR),)
@@ -43,7 +43,7 @@
          "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
          "THREAD_KIND=$(THREAD_KIND)" \
          "TRACE=$(TRACE)" \
-@@ -87,7 +109,7 @@ LIBADA_FLAGS_TO_PASS = \
+@@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
          "exeext=.exeext.should.not.be.used " \
  	'CC=the.host.compiler.should.not.be.needed' \
  	"GCC_FOR_TARGET=$(CC)" \



From knol at fedoraproject.org  Thu Apr  9 12:55:17 2009
From: knol at fedoraproject.org (Deann Mander)
Date: Thu,  9 Apr 2009 12:55:17 +0000 (UTC)
Subject: rpms/getmail/devel .cvsignore, 1.7, 1.8 getmail.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20090409125517.E36727001C@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2800

Modified Files:
	.cvsignore getmail.spec sources 
Log Message:
Update to 4.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2008 13:45:19 -0000	1.7
+++ .cvsignore	9 Apr 2009 12:54:46 -0000	1.8
@@ -1 +1 @@
-getmail-4.8.4.tar.gz
+getmail-4.9.0.tar.gz


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/getmail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- getmail.spec	24 Feb 2009 20:43:54 -0000	1.8
+++ getmail.spec	9 Apr 2009 12:54:47 -0000	1.9
@@ -2,8 +2,8 @@
 
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
-Version: 4.8.4
-Release: 3%{?dist}
+Version: 4.9.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://pyropus.ca/software/getmail/
@@ -55,36 +55,33 @@
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Apr 09 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.0-1
+- Update to release 4.9.0
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.8.4-2
-- Rebuild for Python 2.6
-
-* Mon Nov 10 2008 <knolderpoor at gmail.com> - 4.8.4-1
+* Mon Nov 10 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.4-1
 - Update to release 4.8.4
 
-* Sun May 18 2008 <knolderpoor at gmail.com> - 4.8.1-2
+* Sun May 18 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.1-2
 - Updated python_sitelib header to build on rawhide
 
-* Sat Apr 05 2008 <knolderpoor at gmail.com> - 4.8.1-1
+* Sat Apr 05 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.1-1
 - Updated to release 4.8.1
 - remove setup.py patch (fixed upstream)
 
-* Mon Mar 03 2008 <knolderpoor at gmail.com> - 4.8.0-1
+* Mon Mar 03 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.0-1
 - Updated to release 4.8.0
 - Add python egg
 - Patch setup.py (specfile missing)
 
-* Wed Nov 21 2007 <knolderpoor at gmail.com> - 4.7.7-2
+* Wed Nov 21 2007 Dean Mander <knolderpoor at gmail.com> - 4.7.7-2
 - escaping %% characters
 
-* Tue Nov 20 2007 <knolderpoor at gmail.com> - 4.7.7-1
+* Tue Nov 20 2007 Dean Mander <knolderpoor at gmail.com> - 4.7.7-1
 - no longer need to convert CHANGELOG
 - added -q to %%setup
 - more readable %%doc lines
 
-* Mon Nov 05 2007 <knolderpoor at gmail.com> - 4.7.6-2
+* Mon Nov 05 2007 Dean Mander <knolderpoor at gmail.com> - 4.7.6-2
 - Updated summary and description.
 - Don't include manpages in documentation
 - Correct license (GPLv2)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Nov 2008 13:45:19 -0000	1.8
+++ sources	9 Apr 2009 12:54:47 -0000	1.9
@@ -1 +1 @@
-302999a9f4a3a970327aa4ca400bc4ca  getmail-4.8.4.tar.gz
+57f1e8e61b7a329fdf6439f63f07145b  getmail-4.9.0.tar.gz



From pmatilai at fedoraproject.org  Thu Apr  9 12:57:50 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu,  9 Apr 2009 12:57:50 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.0-devel-autodep.patch,1.1,1.2
Message-ID: <20090409125750.D0B5A7001C@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3884

Modified Files:
	rpm-4.7.0-devel-autodep.patch 
Log Message:
- fixup devel-autodep fuzz


rpm-4.7.0-devel-autodep.patch:

Index: rpm-4.7.0-devel-autodep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.7.0-devel-autodep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.7.0-devel-autodep.patch	6 Mar 2009 18:28:20 -0000	1.1
+++ rpm-4.7.0-devel-autodep.patch	9 Apr 2009 12:57:20 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up rpm-4.7.0-beta1/build/rpmfc.c.devel-autodep rpm-4.7.0-beta1/build/rpmfc.c
---- rpm-4.7.0-beta1/build/rpmfc.c.devel-autodep	2009-02-23 09:16:11.000000000 +0200
-+++ rpm-4.7.0-beta1/build/rpmfc.c	2009-02-26 17:30:04.000000000 +0200
-@@ -506,7 +506,7 @@ static const struct rpmfcTokens_s const 
+diff -up rpm-4.7.0.git9101/build/rpmfc.c.devel-autodep rpm-4.7.0.git9101/build/rpmfc.c
+--- rpm-4.7.0.git9101/build/rpmfc.c.devel-autodep	2009-04-03 09:26:59.000000000 +0300
++++ rpm-4.7.0.git9101/build/rpmfc.c	2009-04-03 11:34:44.000000000 +0300
+@@ -505,7 +505,7 @@ static const struct rpmfcTokens_s const 
    { "ASCII text",		RPMFC_WHITE|RPMFC_INCLUDE },
    { "ISO-8859 text",		RPMFC_WHITE|RPMFC_INCLUDE },
  
@@ -9,7 +9,7 @@
 +  { "symbolic link to",		RPMFC_SYMLINK|RPMFC_INCLUDE },
    { "socket",			RPMFC_DEVICE },
    { "special",			RPMFC_DEVICE },
- 
+   { " text",			RPMFC_TEXT },
 @@ -667,6 +667,105 @@ rpmds rpmfcRequires(rpmfc fc)
  
  



From rdieter at fedoraproject.org  Thu Apr  9 13:02:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  9 Apr 2009 13:02:02 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xine-lib.spec, 1.27, 1.28
Message-ID: <20090409130202.535447001C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4977

Modified Files:
	.cvsignore sources xine-lib.spec 
Log Message:
* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
- xine-lib-1.1.16.3, plugin-abi 1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Feb 2009 23:36:41 -0000	1.12
+++ .cvsignore	9 Apr 2009 13:01:31 -0000	1.13
@@ -1,2 +1,2 @@
-xine-lib-1.1.16.2-pruned.tar.bz2
-xine-lib-1.1.16.2-autotools.patch.bz2
+xine-lib-1.1.16.3-autotools.patch.bz2
+xine-lib-1.1.16.3-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Feb 2009 23:36:41 -0000	1.12
+++ sources	9 Apr 2009 13:01:31 -0000	1.13
@@ -1,2 +1,2 @@
-e2c3a178be02f5c32957b2716123aa28  xine-lib-1.1.16.2-pruned.tar.bz2
-07bf186d51b8315026453a2f21b33703  xine-lib-1.1.16.2-autotools.patch.bz2
+e50122a9323107564d58056b35256610  xine-lib-1.1.16.3-autotools.patch.bz2
+0cac86b7d74c1dcaa22f5a8cbc5ef578  xine-lib-1.1.16.3-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xine-lib.spec	20 Feb 2009 13:55:46 -0000	1.27
+++ xine-lib.spec	9 Apr 2009 13:01:31 -0000	1.28
@@ -4,7 +4,7 @@
 #   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 # - deprecate ESD support?
 
-%define         abiver      1.25
+%define         plugin_abi  1.26
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -33,8 +33,8 @@
 
 Summary:        A multimedia engine 
 Name:           xine-lib
-Version:        1.1.16.2
-Release:        3%{?dist}
+Version:        1.1.16.3
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -56,11 +56,10 @@
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstream patches
-Patch100:	xine-lib-safe-audio-pause3.patch
 
-Provides:       xine-lib(plugin-abi) = %{abiver}
+Provides:       xine-lib(plugin-abi) = %{plugin_abi}
 %if "%{?_isa}" != "%{nil}"
-Provides:       xine-lib(plugin-abi)%{?_isa} = %{abiver}
+Provides:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
 %endif
 # X11
 BuildRequires:  libX11-devel
@@ -143,7 +142,7 @@
 Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 # -arts was split off the -extras subpackage at 1.1.7-3
 Obsoletes:      xine-lib-extras < 1.1.7-3
 
@@ -165,7 +164,7 @@
 Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:      xine-lib(plugin-abi) = %{abiver}
+#Requires:      xine-lib(plugin-abi) = %{plugin_abi}
 
 %description    extras
 This package contains extra plugins for %{name}:
@@ -209,8 +208,6 @@
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 
-%patch100 -p1 -b .safe_audio_pause
-
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -290,142 +287,142 @@
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{abiver}/
-%{_libdir}/xine/plugins/%{abiver}/mime.types
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/
+%{_libdir}/xine/plugins/%{plugin_abi}/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{abiver}/post/
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/post/
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{abiver}/vidix/
-%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so
+%dir %{_libdir}/xine/plugins/%{plugin_abi}/vidix/
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/savage_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/sis_vid.so
+%{_libdir}/xine/plugins/%{plugin_abi}/vidix/unichrome_vid.so
 %endif # vidix
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so
 %endif # ix86
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_ts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
 %if %{with_xcb}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %endif # xcb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
 %if 0%{!?_without_arts:1}
 %files arts
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
 %endif
 
 %if %{with_pa}
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
 %endif
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
 %if %{with_aalib}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
 %endif # aalib
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xdirectfb.so
 %endif # directfb
-%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -442,6 +439,18 @@
 
 
 %changelog
+* Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
+- xine-lib-1.1.16.3, plugin-abi 1.26
+
+* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-6
+- add-mime-for-mod.patch 
+
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16.2-5
+- rebuild for new ImageMagick
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-3
 - xine-lib-devel muiltilib conflict (#477226)
 
@@ -461,7 +470,7 @@
 - safe-audio-pause patch (kdebug#180339)
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-2
-- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver}
+- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{plugin_abi}
 - touchup Summary/Description
 
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1



From buc at fedoraproject.org  Thu Apr  9 13:03:16 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu,  9 Apr 2009 13:03:16 +0000 (UTC)
Subject: rpms/gtk-gnutella/devel .cvsignore, 1.6, 1.7 gtk-gnutella.spec, 1.20,
	1.21 sources, 1.8, 1.9
Message-ID: <20090409130316.BA2CB7001C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5394

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Log Message:
Update to 0.96.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Apr 2008 14:36:55 -0000	1.6
+++ .cvsignore	9 Apr 2009 13:02:46 -0000	1.7
@@ -1 +1 @@
-gtk-gnutella-0.96.5.tar.bz2
+gtk-gnutella-0.96.6.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-gnutella.spec	25 Feb 2009 01:46:28 -0000	1.20
+++ gtk-gnutella.spec	9 Apr 2009 13:02:46 -0000	1.21
@@ -1,7 +1,7 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.5
-Release: 4%{?dist}
+Version: 0.96.6
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://gtk-gnutella.sourceforge.net
@@ -82,8 +82,8 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Mar 30 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.6-1
+- update to 0.96.6
 
 * Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.5-3
 - pass compiler correctly for Configure script


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Apr 2008 14:36:55 -0000	1.8
+++ sources	9 Apr 2009 13:02:46 -0000	1.9
@@ -1 +1 @@
-539fbdf65c6038d1da2e5cebede52e43  gtk-gnutella-0.96.5.tar.bz2
+0f8f1241faf5c204b77a4ddfd878c148  gtk-gnutella-0.96.6.tar.bz2



From knol at fedoraproject.org  Thu Apr  9 13:05:24 2009
From: knol at fedoraproject.org (Deann Mander)
Date: Thu,  9 Apr 2009 13:05:24 +0000 (UTC)
Subject: rpms/getmail/F-10 .cvsignore, 1.7, 1.8 getmail.spec, 1.6,
	1.7 sources, 1.8, 1.9
Message-ID: <20090409130524.8B1BC7001C@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6041

Modified Files:
	.cvsignore getmail.spec sources 
Log Message:
Update to 4.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2008 14:26:36 -0000	1.7
+++ .cvsignore	9 Apr 2009 13:04:53 -0000	1.8
@@ -1 +1 @@
-getmail-4.8.4.tar.gz
+getmail-4.9.0.tar.gz


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/getmail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- getmail.spec	11 Nov 2008 14:26:36 -0000	1.6
+++ getmail.spec	9 Apr 2009 13:04:54 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
-Version: 4.8.4
+Version: 4.9.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -55,30 +55,33 @@
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Mon Nov 10 2008 <knolderpoor at gmail.com> - 4.8.4-1
+* Thu Apr 09 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.0-1
+- Update to release 4.9.0
+
+* Mon Nov 10 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.4-1
 - Update to release 4.8.4
 
-* Sun May 18 2008 <knolderpoor at gmail.com> - 4.8.1-2
+* Sun May 18 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.1-2
 - Updated python_sitelib header to build on rawhide
 
-* Sat Apr 05 2008 <knolderpoor at gmail.com> - 4.8.1-1
+* Sat Apr 05 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.1-1
 - Updated to release 4.8.1
 - remove setup.py patch (fixed upstream)
 
-* Mon Mar 03 2008 <knolderpoor at gmail.com> - 4.8.0-1
+* Mon Mar 03 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.0-1
 - Updated to release 4.8.0
 - Add python egg
 - Patch setup.py (specfile missing)
 
-* Wed Nov 21 2007 <knolderpoor at gmail.com> - 4.7.7-2
+* Wed Nov 21 2007 Dean Mander <knolderpoor at gmail.com> - 4.7.7-2
 - escaping %% characters
 
-* Tue Nov 20 2007 <knolderpoor at gmail.com> - 4.7.7-1
+* Tue Nov 20 2007 Dean Mander <knolderpoor at gmail.com> - 4.7.7-1
 - no longer need to convert CHANGELOG
 - added -q to %%setup
 - more readable %%doc lines
 
-* Mon Nov 05 2007 <knolderpoor at gmail.com> - 4.7.6-2
+* Mon Nov 05 2007 Dean Mander <knolderpoor at gmail.com> - 4.7.6-2
 - Updated summary and description.
 - Don't include manpages in documentation
 - Correct license (GPLv2)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Nov 2008 14:26:36 -0000	1.8
+++ sources	9 Apr 2009 13:04:54 -0000	1.9
@@ -1 +1 @@
-302999a9f4a3a970327aa4ca400bc4ca  getmail-4.8.4.tar.gz
+57f1e8e61b7a329fdf6439f63f07145b  getmail-4.9.0.tar.gz



From buc at fedoraproject.org  Thu Apr  9 13:22:42 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu,  9 Apr 2009 13:22:42 +0000 (UTC)
Subject: rpms/gtk-gnutella/F-10 gtk-gnutella.spec,1.19,1.20 sources,1.8,1.9
Message-ID: <20090409132242.E98177001C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9332

Modified Files:
	gtk-gnutella.spec sources 
Log Message:
Update to 0.96.6



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/F-10/gtk-gnutella.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtk-gnutella.spec	26 Sep 2008 14:40:26 -0000	1.19
+++ gtk-gnutella.spec	9 Apr 2009 13:22:12 -0000	1.20
@@ -1,7 +1,7 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.5
-Release: 3%{?dist}
+Version: 0.96.6
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://gtk-gnutella.sourceforge.net
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Mon Mar 30 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.6-1
+- update to 0.96.6
+
 * Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.5-3
 - pass compiler correctly for Configure script
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Apr 2008 14:36:55 -0000	1.8
+++ sources	9 Apr 2009 13:22:12 -0000	1.9
@@ -1 +1 @@
-539fbdf65c6038d1da2e5cebede52e43  gtk-gnutella-0.96.5.tar.bz2
+0f8f1241faf5c204b77a4ddfd878c148  gtk-gnutella-0.96.6.tar.bz2



From buc at fedoraproject.org  Thu Apr  9 13:36:47 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu,  9 Apr 2009 13:36:47 +0000 (UTC)
Subject: rpms/gtk-gnutella/F-9 gtk-gnutella.spec,1.17,1.18 sources,1.8,1.9
Message-ID: <20090409133647.31BA57001C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12598

Modified Files:
	gtk-gnutella.spec sources 
Log Message:
Update to 0.96.6



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/F-9/gtk-gnutella.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtk-gnutella.spec	8 Apr 2008 14:36:55 -0000	1.17
+++ gtk-gnutella.spec	9 Apr 2009 13:36:16 -0000	1.18
@@ -1,6 +1,6 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.5
+Version: 0.96.6
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
@@ -36,7 +36,7 @@
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
 	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
+	-Dccflags="%{optflags} -Wall" -Dcc="%{__cc}" -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -82,6 +82,15 @@
 
 
 %changelog
+* Mon Mar 30 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.6-1
+- update to 0.96.6
+
+* Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.5-3
+- pass compiler correctly for Configure script
+
+* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 0.96.5-2
+- rebuild with new gnutls
+
 * Tue Apr  8 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.5-1
 - update to 0.96.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Apr 2008 14:36:55 -0000	1.8
+++ sources	9 Apr 2009 13:36:16 -0000	1.9
@@ -1 +1 @@
-539fbdf65c6038d1da2e5cebede52e43  gtk-gnutella-0.96.5.tar.bz2
+0f8f1241faf5c204b77a4ddfd878c148  gtk-gnutella-0.96.6.tar.bz2



From james at fedoraproject.org  Thu Apr  9 13:57:42 2009
From: james at fedoraproject.org (James Antill)
Date: Thu,  9 Apr 2009 13:57:42 +0000 (UTC)
Subject: rpms/yum/devel yum-HEAD.patch,1.20,1.21 yum.spec,1.253,1.254
Message-ID: <20090409135742.6C4507001C@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17561

Modified Files:
	yum-HEAD.patch yum.spec 
Log Message:
* Thu Apr  9 2009 James Antill <james at fedoraproject.org> - 3.2.22-4
- fix typo for yum-complete-transaction message.


yum-HEAD.patch:

Index: yum-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum-HEAD.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- yum-HEAD.patch	8 Apr 2009 20:54:26 -0000	1.20
+++ yum-HEAD.patch	9 Apr 2009 13:57:11 -0000	1.21
@@ -18487,3 +18487,22 @@
          if unlock(): return 200
          return 1
      elif result == 2:
+commit dfc451464b7646d0932e976dab9fc2679961def3
+Author: James Antill <james at and.org>
+Date:   Tue Apr 7 19:06:44 2009 -0400
+
+    Fix copy and paste typo
+
+diff --git a/yum/__init__.py b/yum/__init__.py
+index a6a84b8..45378e1 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -708,7 +708,7 @@ class YumBase(depsolve.Depsolve):
+             msg = _('There are unfinished transactions remaining. You might ' \
+                     'consider running yum-complete-transaction first to finish them.' )
+             self.logger.critical(msg)
+-            base.yumUtilsMsg(self.logger.critical, "yum-complete-transaction")
++            self.yumUtilsMsg(self.logger.critical, "yum-complete-transaction")
+             time.sleep(3)
+ 
+         self.plugins.run('preresolve')


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- yum.spec	8 Apr 2009 20:54:27 -0000	1.253
+++ yum.spec	9 Apr 2009 13:57:11 -0000	1.254
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.22
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -107,6 +107,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Thu Apr  9 2009 James Antill <james at fedoraproject.org> - 3.2.22-4
+- fix typo for yum-complete-transaction message.
+
 * Wed Apr  8 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.22-3
 - fix for file:// urls which makes things in pungi/mash work
 



From davej at fedoraproject.org  Thu Apr  9 14:01:14 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  9 Apr 2009 14:01:14 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-crash-driver.patch, 1.14,
	1.15 config-generic, 1.272, 1.273 config-x86-generic, 1.74,
	1.75 config-x86_64-generic, 1.74, 1.75 kernel.spec, 1.1522, 1.1523
Message-ID: <20090409140114.587A47001C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18883

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Added Files:
	linux-2.6-crash-driver.patch 
Log Message:
Bring back the /dev/crash driver. (#492803)

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: linux-2.6-crash-driver.patch
diff -N linux-2.6-crash-driver.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-crash-driver.patch	9 Apr 2009 14:01:13 -0000	1.15
@@ -0,0 +1,363 @@
+diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+new file mode 100644
+index 0000000..541af84
+--- /dev/null
++++ b/arch/ia64/include/asm/crash.h
+@@ -0,0 +1,90 @@
++#ifndef _ASM_IA64_CRASH_H
++#define _ASM_IA64_CRASH_H
++
++/*
++ * linux/include/asm-ia64/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/efi.h>
++#include <linux/mm.h>
++#include <asm/mmzone.h>
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	u32 type;
++
++	if (REGION_NUMBER(offset) == 5) {
++		char byte;
++
++		if (__get_user(byte, (char *)offset) == 0)
++			return (void *)offset;
++		else
++			return NULL;
++	}
++
++	switch (type = efi_mem_type(offset)) 
++	{
++	case EFI_LOADER_CODE:
++	case EFI_LOADER_DATA:
++	case EFI_BOOT_SERVICES_CODE:
++	case EFI_BOOT_SERVICES_DATA:
++	case EFI_CONVENTIONAL_MEMORY:
++		break;
++
++	default:
++		printk(KERN_INFO
++		    "crash memory driver: invalid memory type for %lx: %d\n", 
++			offset, type);
++		return NULL;
++	}
++
++	pfn = offset >> PAGE_SHIFT;
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++			"crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	if (!page->virtual) {
++		printk(KERN_INFO
++		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
++			offset, (unsigned long)page);
++		return NULL;
++	}
++
++	return (page->virtual + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	return;
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_IA64_CRASH_H */
+diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
+index 6da1f20..2984fb3 100644
+--- a/arch/ia64/kernel/ia64_ksyms.c
++++ b/arch/ia64/kernel/ia64_ksyms.c
+@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+ #include <asm/unwind.h>
+ EXPORT_SYMBOL(unw_init_running);
+ 
++#include <linux/efi.h>
++EXPORT_SYMBOL_GPL(efi_mem_type);
++
+ #ifdef ASM_SUPPORTED
+ # ifdef CONFIG_SMP
+ #  if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index d4c4307..d1c968f 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(page_is_ram);
+ 
+ /*
+  * Fix up the linear direct mapping of the kernel to avoid cache attribute
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 43d6ba8..0d81c9a 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -460,6 +460,8 @@ config LEGACY_PTYS
+ 	  security.  This option enables these legacy devices; on most
+ 	  systems, it is safe to say N.
+ 
++config CRASH
++        tristate "Crash Utility memory driver"
+ 
+ config LEGACY_PTY_COUNT
+ 	int "Maximum number of legacy PTY in use"
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index 438f713..1b7767b 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
+ 
++obj-$(CONFIG_CRASH)		+= crash.o
++
+ # Files generated that shall be removed upon make clean
+ clean-files := consolemap_deftbl.c defkeymap.c
+ 
+diff --git a/drivers/char/crash.c b/drivers/char/crash.c
+new file mode 100644
+index 0000000..e5437de
+--- /dev/null
++++ b/drivers/char/crash.c
+@@ -0,0 +1,128 @@
++/*
++ *  linux/drivers/char/crash.c
++ *
++ *  Copyright (C) 2004  Dave Anderson <anderson at redhat.com>
++ *  Copyright (C) 2004  Red Hat, Inc.
++ */
++
++/******************************************************************************
++ *
++ *   This program is free software; you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation; either version 2, or (at your option)
++ *   any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program; if not, write to the Free Software
++ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ *****************************************************************************/
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/miscdevice.h>
++#include <linux/init.h>
++#include <asm/io.h>
++#include <asm/uaccess.h>
++#include <asm/types.h>
++#include <asm/crash.h>
++
++#define CRASH_VERSION   "1.0"
++
++/*
++ *  These are the file operation functions that allow crash utility
++ *  access to physical memory.
++ */
++
++static loff_t 
++crash_llseek(struct file * file, loff_t offset, int orig)
++{
++	switch (orig) {
++	case 0:
++		file->f_pos = offset;
++		return file->f_pos;
++	case 1:
++		file->f_pos += offset;
++		return file->f_pos;
++	default:
++		return -EINVAL;
++	}
++}
++
++/*
++ *  Determine the page address for an address offset value, 
++ *  get a virtual address for it, and copy it out.
++ *  Accesses must fit within a page.
++ */
++static ssize_t
++crash_read(struct file *file, char *buf, size_t count, loff_t *poff)
++{
++	void *vaddr;
++	struct page *page;
++	u64 offset;
++	ssize_t read;
++
++	offset = *poff;
++	if (offset >> PAGE_SHIFT != (offset+count-1) >> PAGE_SHIFT) 
++		return -EINVAL;
++
++	vaddr = map_virtual(offset, &page);
++	if (!vaddr)
++		return -EFAULT;
++
++	if (copy_to_user(buf, vaddr, count)) {
++		unmap_virtual(page);
++		return -EFAULT;
++	}
++	unmap_virtual(page);
++
++	read = count;
++	*poff += read;
++	return read;
++}
++
++static struct file_operations crash_fops = {
++	.owner = THIS_MODULE,
++	.llseek = crash_llseek,
++	.read = crash_read,
++};
++
++static struct miscdevice crash_dev = {
++	MISC_DYNAMIC_MINOR,
++	"crash",
++	&crash_fops
++};
++
++static int __init
++crash_init(void)
++{
++	int ret;
++
++	ret = misc_register(&crash_dev);
++	if (ret) {
++		printk(KERN_ERR 
++		    "crash memory driver: cannot misc_register (MISC_DYNAMIC_MINOR)\n");
++		goto out;
++	}
++	
++	ret = 0;
++	printk(KERN_INFO "crash memory driver: version %s\n", CRASH_VERSION);
++out:
++	return ret;
++}
++
++static void __exit
++crash_cleanup_module(void)
++{
++	misc_deregister(&crash_dev);
++}
++
++module_init(crash_init);
++module_exit(crash_cleanup_module);
++
++MODULE_LICENSE("GPL");
+diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/include/asm-x86/crash.h
+@@ -0,0 +1,75 @@
++#ifndef _ASM_I386_CRASH_H
++#define _ASM_I386_CRASH_H
++
++/*
++ * linux/include/asm-i386/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <asm/mmzone.h>
++
++extern int page_is_ram(unsigned long);
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	void *vaddr;
++
++	pfn = (unsigned long)(offset >> PAGE_SHIFT);
++
++	if (!page_is_ram(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
++		return NULL;
++	}
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	vaddr = kmap(page);
++	if (!vaddr) {
++		printk(KERN_INFO
++		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
++			pfn, (unsigned long)page);
++		return NULL;
++	}
++
++	*pp = page;
++	return (vaddr + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	kunmap(page);
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_I386_CRASH_H */


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- config-generic	7 Apr 2009 14:12:32 -0000	1.272
+++ config-generic	9 Apr 2009 14:01:13 -0000	1.273
@@ -5,7 +5,7 @@
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
-# CONFIG_CRASH_DUMP is not set
+
 #
 # Code maturity level options
 #
@@ -2300,6 +2300,7 @@
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_DM1105=m
+CONFIG_DVB_DYNAMIC_MINORS=y
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -3857,4 +3858,6 @@
 CONFIG_FCOE=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 
-CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRASH is not set
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86-generic,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- config-x86-generic	8 Apr 2009 15:33:30 -0000	1.74
+++ config-x86-generic	9 Apr 2009 14:01:13 -0000	1.75
@@ -333,6 +333,7 @@
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_PROC_VMCORE=y
+CONFIG_CRASH=m
 
 CONFIG_CRYPTO_DEV_GEODE=m
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86_64-generic,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- config-x86_64-generic	8 Apr 2009 15:33:30 -0000	1.74
+++ config-x86_64-generic	9 Apr 2009 14:01:13 -0000	1.75
@@ -247,6 +247,7 @@
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y
+CONFIG_CRASH=m
 
 CONFIG_DMIID=y
 CONFIG_ISCSI_IBFT_FIND=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- kernel.spec	9 Apr 2009 10:12:09 -0000	1.1522
+++ kernel.spec	9 Apr 2009 14:01:13 -0000	1.1523
@@ -662,6 +662,8 @@
 
 Patch700: linux-2.6-dma-debug-fixes.patch
 
+Patch800: linux-2.6-crash-driver.patch
+
 Patch1515: linux-2.6.29-lirc.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
@@ -1268,6 +1270,9 @@
 # Fix up DMA debug code
 ApplyPatch linux-2.6-dma-debug-fixes.patch
 
+# /dev/crash driver.
+ApplyPatch linux-2.6-crash-driver.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1900,6 +1905,9 @@
 # and build.
 
 %changelog
+* Thu Apr 09 2009 Dave Jones <davej at redhat.com> 2.6.29.1-61
+- Bring back the /dev/crash driver. (#492803)
+
 * Thu Apr 09 2009 Dave Airlie <airlied at redhat.com>
 - radeon: fix some kms bugs, dac detect + screen resize
 



From spot at fedoraproject.org  Thu Apr  9 14:02:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 14:02:57 +0000 (UTC)
Subject: rpms/AcetoneISO2/F-10
	AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch, 
	1.1, 1.2 AcetoneISO2.spec, 1.6,
	1.7 acetoneiso2-2.0.3-desktop.patch, 1.1, 1.2 sources, 1.4, 1.5
Message-ID: <20090409140257.23B947001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/AcetoneISO2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19361/F-10

Modified Files:
	AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch 
	AcetoneISO2.spec acetoneiso2-2.0.3-desktop.patch sources 
Log Message:
2.0.3 final

AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch:

Index: AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-10/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	8 Dec 2008 23:05:58 -0000	1.1
+++ AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	9 Apr 2009 14:02:26 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h
---- acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD	2008-12-08 17:06:39.000000000 -0500
-+++ acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h	2008-12-08 17:18:00.000000000 -0500
+diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h
+--- acetoneiso_2.0.3/src/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
++++ acetoneiso_2.0.3/src/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
 @@ -125,6 +125,7 @@ else {
  void acetoneiso::get_poweriso()
  {


Index: AcetoneISO2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-10/AcetoneISO2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AcetoneISO2.spec	8 Dec 2008 23:00:36 -0000	1.6
+++ AcetoneISO2.spec	9 Apr 2009 14:02:26 -0000	1.7
@@ -1,13 +1,11 @@
-%define prever RC1
-
 Name:		AcetoneISO2
 Version:	2.0.3
-Release:	0.1.%{prever}%{?dist}
+Release:	1%{?dist}
 Summary:	CD/DVD Image Manipulator
 Group:		Applications/Archiving
 License:	GPLv3
 URL:		http://www.acetoneteam.org/
-Source0:	http://www.acetoneteam.org/download/acetoneiso_%{version}%{prever}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/acetoneiso_%{version}.tar.gz
 Patch0:		acetoneiso2-2.0.3-desktop.patch
 Patch1:		acetoneiso2-2.0.2-no-optdirs.patch
 Patch2:		AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
@@ -24,7 +22,7 @@
 - Mount and Unmount ISO, MDF, NRG (if iso-9660 standard)
 - Convert / Extract / Browse to ISO : *.bin *.mdf *.nrg *.img *.daa *.cdi 
   *.xbx *.b5i *.bwi *.pdi
-- Play a DVD Movie ISO with most used media players
+- Play a DVD Movie ISO with most commonly-used media players
 - Generate an ISO from a Folder or CD/DVD
 - Generate/Check MD5 file of an image
 - Encrypt/decrypt an image
@@ -34,19 +32,19 @@
 - Restore a lost CUE file of *.bin *.img
 
 %prep
-%setup -q -n acetoneiso_%{version}%{prever}
+%setup -q -n acetoneiso_%{version}
 %patch0 -p1
 # %%patch1 -p1
 %patch2 -p1
 
 %build
-cd acetoneiso/
+cd src/
 qmake-qt4
 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT 
-cd acetoneiso
+cd src/
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2
@@ -63,13 +61,19 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CHANGELOG LICENSE README
+%doc AUTHORS CHANGELOG FEATURES LICENSE README
 %{_bindir}/acetoneiso2
 # %%{_datadir}/acetoneiso2
 %{_datadir}/applications/AcetoneISO2.desktop
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-1
+- update to 2.0.3 final
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-0.2.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-0.1.RC1
 - 2.0.3RC1
 

acetoneiso2-2.0.3-desktop.patch:

Index: acetoneiso2-2.0.3-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-10/acetoneiso2-2.0.3-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acetoneiso2-2.0.3-desktop.patch	8 Dec 2008 23:05:58 -0000	1.1
+++ acetoneiso2-2.0.3-desktop.patch	9 Apr 2009 14:02:26 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop
---- acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD	2008-12-08 17:01:11.000000000 -0500
-+++ acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop	2008-12-08 17:02:13.000000000 -0500
+diff -up acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3/src/menu/AcetoneISO.desktop
+--- acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD	2009-04-09 09:48:36.000000000 -0400
++++ acetoneiso_2.0.3/src/menu/AcetoneISO.desktop	2009-04-09 09:49:26.000000000 -0400
 @@ -1,21 +1,13 @@
  [Desktop Entry]
 -Categories=Qt;KDE;Application;AudioVideo;DiscBurning;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Dec 2008 23:00:36 -0000	1.4
+++ sources	9 Apr 2009 14:02:26 -0000	1.5
@@ -1 +1 @@
-ff03b123f3003b22ef2792f2cb8864ee  acetoneiso_2.0.3RC1.tar.gz
+8660f1675dd1544e2c8da21638706622  acetoneiso_2.0.3.tar.gz



From spot at fedoraproject.org  Thu Apr  9 14:02:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 14:02:57 +0000 (UTC)
Subject: rpms/AcetoneISO2/F-9
	AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch, 
	1.1, 1.2 AcetoneISO2.spec, 1.6,
	1.7 acetoneiso2-2.0.3-desktop.patch, 1.1, 1.2 sources, 1.4, 1.5
Message-ID: <20090409140257.5C1047001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/AcetoneISO2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19361/F-9

Modified Files:
	AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch 
	AcetoneISO2.spec acetoneiso2-2.0.3-desktop.patch sources 
Log Message:
2.0.3 final

AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch:

Index: AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-9/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	8 Dec 2008 23:05:59 -0000	1.1
+++ AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	9 Apr 2009 14:02:26 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h
---- acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD	2008-12-08 17:06:39.000000000 -0500
-+++ acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h	2008-12-08 17:18:00.000000000 -0500
+diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h
+--- acetoneiso_2.0.3/src/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
++++ acetoneiso_2.0.3/src/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
 @@ -125,6 +125,7 @@ else {
  void acetoneiso::get_poweriso()
  {


Index: AcetoneISO2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-9/AcetoneISO2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AcetoneISO2.spec	8 Dec 2008 23:00:37 -0000	1.6
+++ AcetoneISO2.spec	9 Apr 2009 14:02:26 -0000	1.7
@@ -1,13 +1,11 @@
-%define prever RC1
-
 Name:		AcetoneISO2
 Version:	2.0.3
-Release:	0.1.%{prever}%{?dist}
+Release:	1%{?dist}
 Summary:	CD/DVD Image Manipulator
 Group:		Applications/Archiving
 License:	GPLv3
 URL:		http://www.acetoneteam.org/
-Source0:	http://www.acetoneteam.org/download/acetoneiso_%{version}%{prever}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/acetoneiso_%{version}.tar.gz
 Patch0:		acetoneiso2-2.0.3-desktop.patch
 Patch1:		acetoneiso2-2.0.2-no-optdirs.patch
 Patch2:		AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
@@ -24,7 +22,7 @@
 - Mount and Unmount ISO, MDF, NRG (if iso-9660 standard)
 - Convert / Extract / Browse to ISO : *.bin *.mdf *.nrg *.img *.daa *.cdi 
   *.xbx *.b5i *.bwi *.pdi
-- Play a DVD Movie ISO with most used media players
+- Play a DVD Movie ISO with most commonly-used media players
 - Generate an ISO from a Folder or CD/DVD
 - Generate/Check MD5 file of an image
 - Encrypt/decrypt an image
@@ -34,19 +32,19 @@
 - Restore a lost CUE file of *.bin *.img
 
 %prep
-%setup -q -n acetoneiso_%{version}%{prever}
+%setup -q -n acetoneiso_%{version}
 %patch0 -p1
 # %%patch1 -p1
 %patch2 -p1
 
 %build
-cd acetoneiso/
+cd src/
 qmake-qt4
 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT 
-cd acetoneiso
+cd src/
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2
@@ -63,13 +61,19 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CHANGELOG LICENSE README
+%doc AUTHORS CHANGELOG FEATURES LICENSE README
 %{_bindir}/acetoneiso2
 # %%{_datadir}/acetoneiso2
 %{_datadir}/applications/AcetoneISO2.desktop
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-1
+- update to 2.0.3 final
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-0.2.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-0.1.RC1
 - 2.0.3RC1
 

acetoneiso2-2.0.3-desktop.patch:

Index: acetoneiso2-2.0.3-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-9/acetoneiso2-2.0.3-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acetoneiso2-2.0.3-desktop.patch	8 Dec 2008 23:05:59 -0000	1.1
+++ acetoneiso2-2.0.3-desktop.patch	9 Apr 2009 14:02:26 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop
---- acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD	2008-12-08 17:01:11.000000000 -0500
-+++ acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop	2008-12-08 17:02:13.000000000 -0500
+diff -up acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3/src/menu/AcetoneISO.desktop
+--- acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD	2009-04-09 09:48:36.000000000 -0400
++++ acetoneiso_2.0.3/src/menu/AcetoneISO.desktop	2009-04-09 09:49:26.000000000 -0400
 @@ -1,21 +1,13 @@
  [Desktop Entry]
 -Categories=Qt;KDE;Application;AudioVideo;DiscBurning;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Dec 2008 23:00:37 -0000	1.4
+++ sources	9 Apr 2009 14:02:27 -0000	1.5
@@ -1 +1 @@
-ff03b123f3003b22ef2792f2cb8864ee  acetoneiso_2.0.3RC1.tar.gz
+8660f1675dd1544e2c8da21638706622  acetoneiso_2.0.3.tar.gz



From spot at fedoraproject.org  Thu Apr  9 14:02:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 14:02:57 +0000 (UTC)
Subject: rpms/AcetoneISO2/devel .cvsignore, 1.4,
	1.5 AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch, 1.1,
	1.2 AcetoneISO2.spec, 1.7, 1.8 acetoneiso2-2.0.3-desktop.patch,
	1.1, 1.2 sources, 1.4, 1.5
Message-ID: <20090409140257.9B8B27001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/AcetoneISO2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19361/devel

Modified Files:
	.cvsignore AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch 
	AcetoneISO2.spec acetoneiso2-2.0.3-desktop.patch sources 
Log Message:
2.0.3 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Dec 2008 23:00:38 -0000	1.4
+++ .cvsignore	9 Apr 2009 14:02:27 -0000	1.5
@@ -1 +1 @@
-acetoneiso_2.0.3RC1.tar.gz
+acetoneiso_2.0.3.tar.gz

AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch:

Index: AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	8 Dec 2008 23:05:59 -0000	1.1
+++ AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	9 Apr 2009 14:02:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h
---- acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD	2008-12-08 17:06:39.000000000 -0500
-+++ acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h	2008-12-08 17:18:00.000000000 -0500
+diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h
+--- acetoneiso_2.0.3/src/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
++++ acetoneiso_2.0.3/src/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
 @@ -125,6 +125,7 @@ else {
  void acetoneiso::get_poweriso()
  {


Index: AcetoneISO2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/AcetoneISO2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AcetoneISO2.spec	23 Feb 2009 19:58:33 -0000	1.7
+++ AcetoneISO2.spec	9 Apr 2009 14:02:27 -0000	1.8
@@ -1,13 +1,11 @@
-%define prever RC1
-
 Name:		AcetoneISO2
 Version:	2.0.3
-Release:	0.2.%{prever}%{?dist}
+Release:	1%{?dist}
 Summary:	CD/DVD Image Manipulator
 Group:		Applications/Archiving
 License:	GPLv3
 URL:		http://www.acetoneteam.org/
-Source0:	http://www.acetoneteam.org/download/acetoneiso_%{version}%{prever}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/acetoneiso_%{version}.tar.gz
 Patch0:		acetoneiso2-2.0.3-desktop.patch
 Patch1:		acetoneiso2-2.0.2-no-optdirs.patch
 Patch2:		AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
@@ -24,7 +22,7 @@
 - Mount and Unmount ISO, MDF, NRG (if iso-9660 standard)
 - Convert / Extract / Browse to ISO : *.bin *.mdf *.nrg *.img *.daa *.cdi 
   *.xbx *.b5i *.bwi *.pdi
-- Play a DVD Movie ISO with most used media players
+- Play a DVD Movie ISO with most commonly-used media players
 - Generate an ISO from a Folder or CD/DVD
 - Generate/Check MD5 file of an image
 - Encrypt/decrypt an image
@@ -34,19 +32,19 @@
 - Restore a lost CUE file of *.bin *.img
 
 %prep
-%setup -q -n acetoneiso_%{version}%{prever}
+%setup -q -n acetoneiso_%{version}
 %patch0 -p1
 # %%patch1 -p1
 %patch2 -p1
 
 %build
-cd acetoneiso/
+cd src/
 qmake-qt4
 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT 
-cd acetoneiso
+cd src/
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2
@@ -63,13 +61,16 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CHANGELOG LICENSE README
+%doc AUTHORS CHANGELOG FEATURES LICENSE README
 %{_bindir}/acetoneiso2
 # %%{_datadir}/acetoneiso2
 %{_datadir}/applications/AcetoneISO2.desktop
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-1
+- update to 2.0.3 final
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-0.2.RC1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

acetoneiso2-2.0.3-desktop.patch:

Index: acetoneiso2-2.0.3-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/acetoneiso2-2.0.3-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acetoneiso2-2.0.3-desktop.patch	8 Dec 2008 23:05:59 -0000	1.1
+++ acetoneiso2-2.0.3-desktop.patch	9 Apr 2009 14:02:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop
---- acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD	2008-12-08 17:01:11.000000000 -0500
-+++ acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop	2008-12-08 17:02:13.000000000 -0500
+diff -up acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3/src/menu/AcetoneISO.desktop
+--- acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD	2009-04-09 09:48:36.000000000 -0400
++++ acetoneiso_2.0.3/src/menu/AcetoneISO.desktop	2009-04-09 09:49:26.000000000 -0400
 @@ -1,21 +1,13 @@
  [Desktop Entry]
 -Categories=Qt;KDE;Application;AudioVideo;DiscBurning;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Dec 2008 23:00:38 -0000	1.4
+++ sources	9 Apr 2009 14:02:27 -0000	1.5
@@ -1 +1 @@
-ff03b123f3003b22ef2792f2cb8864ee  acetoneiso_2.0.3RC1.tar.gz
+8660f1675dd1544e2c8da21638706622  acetoneiso_2.0.3.tar.gz



From jzeleny at fedoraproject.org  Thu Apr  9 14:03:02 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  9 Apr 2009 14:03:02 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.4.12-options.patch, NONE,
	1.1 openldap-2.2.13-setugid.patch, 1.3, 1.4 openldap.spec, 1.140,
	1.141 openldap-2.4.15-file-option.patch, 1.1, NONE
Message-ID: <20090409140302.B2FB87001C@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19021

Modified Files:
	openldap-2.2.13-setugid.patch openldap.spec 
Added Files:
	openldap-2.4.12-options.patch 
Removed Files:
	openldap-2.4.15-file-option.patch 
Log Message:
Correction of setugid patch, removed c,M and P options from some client utilities



openldap-2.4.12-options.patch:

--- NEW FILE openldap-2.4.12-options.patch ---
--- openldap/clients/tools/common.c	2009-04-09 11:37:06.000000000 +0200
+++ openldap/clients/tools/common.c.option	2009-04-09 14:52:23.000000000 +0200
@@ -267,7 +267,6 @@ void
 tool_common_usage( void )
 {
 	static const char *const descriptions[] = {
-N_("  -c         continuous operation mode (do not stop on errors)\n"),
 N_("  -d level   set LDAP debugging level to `level'\n"),
 N_("  -D binddn  bind DN\n"),
 N_("  -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n")
@@ -298,18 +297,15 @@ N_("             [!]sessiontracking\n")
 N_("             abandon, cancel, ignore (SIGINT sends abandon/cancel,\n"
    "             or ignores response; if critical, doesn't wait for SIGINT.\n"
    "             not really controls)\n")
-N_("  -f file    read operations from `file'\n"),
 N_("  -h host    LDAP server\n"),
 N_("  -H URI     LDAP Uniform Resource Identifier(s)\n"),
 N_("  -I         use SASL Interactive mode\n"),
-N_("  -M         enable Manage DSA IT control (-MM to make critical)\n"),
 N_("  -n         show what would be done but don't actually do it\n"),
 N_("  -N         do not use reverse DNS to canonicalize SASL host name\n"),
 N_("  -O props   SASL security properties\n"),
 N_("  -o <opt>[=<optparam] general options\n"),
 N_("             nettimeout=<timeout> (in seconds, or \"none\" or \"max\")\n"),
 N_("  -p port    port on LDAP server\n"),
-N_("  -P version protocol version (default: 3)\n"),
 N_("  -Q         use SASL Quiet mode\n"),
 N_("  -R realm   SASL realm\n"),
 N_("  -U authcid SASL authentication identity\n"),

--- openldap/clients/tools/ldapcompare.c	2009-04-09 11:37:06.000000000 +0200
+++ openldap/clients/tools/ldapcompare.c.option	2009-04-09 14:46:37.000000000 +0200
@@ -85,6 +85,8 @@ usage( void )
 	fprintf( stderr, _("Compare options:\n"));
 	fprintf( stderr, _("  -E [!]<ext>[=<extparam>] compare extensions (! indicates criticality)\n"));
 	fprintf( stderr, _("             !dontUseCopy                (Don't Use Copy)\n"));
+	fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+	fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
 	fprintf( stderr, _("  -z         Quiet mode,"
 		" don't print anything, use return values\n"));
 	tool_common_usage();

--- openldap/clients/tools/ldapdelete.c	2009-04-09 11:37:06.000000000 +0200
+++ openldap/clients/tools/ldapdelete.c.option	2009-04-09 14:48:48.000000000 +0200
@@ -71,6 +71,10 @@ usage( void )
 	fprintf( stderr, _("	dn: list of DNs to delete. If not given, it will be readed from stdin\n"));
 	fprintf( stderr, _("	    or from the file specified with \"-f file\".\n"));
 	fprintf( stderr, _("Delete Options:\n"));
+	fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
+	fprintf( stderr, _("  -f file    read operations from `file'\n"));
+	fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+	fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
 	fprintf( stderr, _("  -r         delete recursively\n"));
 	tool_common_usage();
 	exit( EXIT_FAILURE );

--- openldap/clients/tools/ldapmodify.c	2009-04-09 11:37:06.000000000 +0200
+++ openldap/clients/tools/ldapmodify.c.option	2009-04-09 14:50:14.000000000 +0200
@@ -137,8 +137,12 @@ usage( void )
 	fprintf( stderr, _("Add or modify options:\n"));
 	fprintf( stderr, _("  -a         add values (%s)\n"),
 		(ldapadd ? _("default") : _("default is to replace")));
+	fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
 	fprintf( stderr, _("  -E [!]ext=extparam	modify extensions"
 		" (! indicate s criticality)\n"));
+	fprintf( stderr, _("  -f file    read operations from `file'\n"));
+	fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+	fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
 #ifdef LDAP_X_TXN
  	fprintf( stderr,
 		_("             [!]txn=<commit|abort>         (transaction)\n"));

--- openldap/clients/tools/ldapmodrdn.c	2009-04-09 11:37:06.000000000 +0200
+++ openldap/clients/tools/ldapmodrdn.c.option	2009-04-09 14:50:40.000000000 +0200
@@ -83,6 +83,10 @@ usage( void )
 	fprintf( stderr, _("		If not given, the list of modifications is read from stdin or\n"));
 	fprintf( stderr, _("		from the file specified by \"-f file\" (see man page).\n"));
 	fprintf( stderr, _("Rename options:\n"));
+	fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
+	fprintf( stderr, _("  -f file    read operations from `file'\n"));
+	fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+	fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
 	fprintf( stderr, _("  -r         remove old RDN\n"));
 	fprintf( stderr, _("  -s newsup  new superior entry\n"));
 	tool_common_usage();

--- openldap/clients/tools/ldapsearch.c	2009-04-09 11:37:06.000000000 +0200
+++ openldap/clients/tools/ldapsearch.c.option	2009-04-09 14:51:51.000000000 +0200
@@ -123,6 +123,7 @@ usage( void )
 	fprintf( stderr, _("  -a deref   one of never (default), always, search, or find\n"));
 	fprintf( stderr, _("  -A         retrieve attribute names only (no values)\n"));
 	fprintf( stderr, _("  -b basedn  base dn for search\n"));
+	fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
 	fprintf( stderr, _("  -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n"));
 	fprintf( stderr, _("             [!]domainScope              (domain scope)\n"));
 	fprintf( stderr, _("             !dontUseCopy                (Don't Use Copy)\n"));
@@ -137,12 +138,15 @@ usage( void )
 	fprintf( stderr, _("             [!]deref=derefAttr:attr[,...][;derefAttr:attr[,...][;...]]\n"));
 #endif
 	fprintf( stderr, _("             [!]<oid>=:<value>           (generic control; no response handling)\n"));
+	fprintf( stderr, _("  -f file    read operations from `file'\n"));
 	fprintf( stderr, _("  -F prefix  URL prefix for files (default: %s)\n"), def_urlpre);
 	fprintf( stderr, _("  -l limit   time limit (in seconds, or \"none\" or \"max\") for search\n"));
 	fprintf( stderr, _("  -L         print responses in LDIFv1 format\n"));
 	fprintf( stderr, _("  -LL        print responses in LDIF format without comments\n"));
 	fprintf( stderr, _("  -LLL       print responses in LDIF format without comments\n"));
 	fprintf( stderr, _("             and version\n"));
+	fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+	fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
 	fprintf( stderr, _("  -s scope   one of base, one, sub or children (search scope)\n"));
 	fprintf( stderr, _("  -S attr    sort the results by attribute `attr'\n"));
 	fprintf( stderr, _("  -t         write binary values to files in temporary directory\n"));

openldap-2.2.13-setugid.patch:

Index: openldap-2.2.13-setugid.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap-2.2.13-setugid.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openldap-2.2.13-setugid.patch	17 Feb 2009 11:20:45 -0000	1.3
+++ openldap-2.2.13-setugid.patch	9 Apr 2009 14:03:02 -0000	1.4
@@ -8,7 +8,7 @@
  
  #ifdef HAVE_GETEUID
 -	if ( geteuid() != getuid() )
-+	if ( geteuid() != getuid() || getegid() == getgid() )
++	if ( geteuid() != getuid() || getegid() != getgid() )
  		return;
  #endif
  


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- openldap.spec	26 Mar 2009 09:43:23 -0000	1.140
+++ openldap.spec	9 Apr 2009 14:03:02 -0000	1.141
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -34,7 +34,7 @@
 Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
-Patch11: openldap-2.4.15-file-option.patch
+Patch11: openldap-2.4.12-options.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -140,7 +140,7 @@
 %patch6 -p1 -b .gethostbyname_r
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
-%patch11 -p1 -b .file_option
+%patch11 -p1 -b .options
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -604,6 +604,11 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Apr 09 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-3
+- extended previous patch (#481310) to remove options cfMP
+  from some client tools
+- correction of patch setugid (#494330)
+
 * Thu Mar 26 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-2
 - removed -f option from some client tools (#481310)
 


--- openldap-2.4.15-file-option.patch DELETED ---



From davej at fedoraproject.org  Thu Apr  9 14:04:42 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  9 Apr 2009 14:04:42 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-crash-driver.patch, 1.14,
	1.15 config-generic, 1.276, 1.277 config-x86-generic, 1.77,
	1.78 config-x86_64-generic, 1.77, 1.78 kernel.spec, 1.1508, 1.1509
Message-ID: <20090409140442.64D117001C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20358

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Added Files:
	linux-2.6-crash-driver.patch 
Log Message:
Bring back the /dev/crash driver. (#492803)

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: linux-2.6-crash-driver.patch
diff -N linux-2.6-crash-driver.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-crash-driver.patch	9 Apr 2009 14:04:41 -0000	1.15
@@ -0,0 +1,363 @@
+diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+new file mode 100644
+index 0000000..541af84
+--- /dev/null
++++ b/arch/ia64/include/asm/crash.h
+@@ -0,0 +1,90 @@
++#ifndef _ASM_IA64_CRASH_H
++#define _ASM_IA64_CRASH_H
++
++/*
++ * linux/include/asm-ia64/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/efi.h>
++#include <linux/mm.h>
++#include <asm/mmzone.h>
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	u32 type;
++
++	if (REGION_NUMBER(offset) == 5) {
++		char byte;
++
++		if (__get_user(byte, (char *)offset) == 0)
++			return (void *)offset;
++		else
++			return NULL;
++	}
++
++	switch (type = efi_mem_type(offset)) 
++	{
++	case EFI_LOADER_CODE:
++	case EFI_LOADER_DATA:
++	case EFI_BOOT_SERVICES_CODE:
++	case EFI_BOOT_SERVICES_DATA:
++	case EFI_CONVENTIONAL_MEMORY:
++		break;
++
++	default:
++		printk(KERN_INFO
++		    "crash memory driver: invalid memory type for %lx: %d\n", 
++			offset, type);
++		return NULL;
++	}
++
++	pfn = offset >> PAGE_SHIFT;
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++			"crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	if (!page->virtual) {
++		printk(KERN_INFO
++		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
++			offset, (unsigned long)page);
++		return NULL;
++	}
++
++	return (page->virtual + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	return;
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_IA64_CRASH_H */
+diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
+index 6da1f20..2984fb3 100644
+--- a/arch/ia64/kernel/ia64_ksyms.c
++++ b/arch/ia64/kernel/ia64_ksyms.c
+@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+ #include <asm/unwind.h>
+ EXPORT_SYMBOL(unw_init_running);
+ 
++#include <linux/efi.h>
++EXPORT_SYMBOL_GPL(efi_mem_type);
++
+ #ifdef ASM_SUPPORTED
+ # ifdef CONFIG_SMP
+ #  if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index d4c4307..d1c968f 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(page_is_ram);
+ 
+ /*
+  * Fix up the linear direct mapping of the kernel to avoid cache attribute
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 43d6ba8..0d81c9a 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -460,6 +460,8 @@ config LEGACY_PTYS
+ 	  security.  This option enables these legacy devices; on most
+ 	  systems, it is safe to say N.
+ 
++config CRASH
++        tristate "Crash Utility memory driver"
+ 
+ config LEGACY_PTY_COUNT
+ 	int "Maximum number of legacy PTY in use"
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index 438f713..1b7767b 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
+ 
++obj-$(CONFIG_CRASH)		+= crash.o
++
+ # Files generated that shall be removed upon make clean
+ clean-files := consolemap_deftbl.c defkeymap.c
+ 
+diff --git a/drivers/char/crash.c b/drivers/char/crash.c
+new file mode 100644
+index 0000000..e5437de
+--- /dev/null
++++ b/drivers/char/crash.c
+@@ -0,0 +1,128 @@
++/*
++ *  linux/drivers/char/crash.c
++ *
++ *  Copyright (C) 2004  Dave Anderson <anderson at redhat.com>
++ *  Copyright (C) 2004  Red Hat, Inc.
++ */
++
++/******************************************************************************
++ *
++ *   This program is free software; you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation; either version 2, or (at your option)
++ *   any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program; if not, write to the Free Software
++ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ *****************************************************************************/
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/miscdevice.h>
++#include <linux/init.h>
++#include <asm/io.h>
++#include <asm/uaccess.h>
++#include <asm/types.h>
++#include <asm/crash.h>
++
++#define CRASH_VERSION   "1.0"
++
++/*
++ *  These are the file operation functions that allow crash utility
++ *  access to physical memory.
++ */
++
++static loff_t 
++crash_llseek(struct file * file, loff_t offset, int orig)
++{
++	switch (orig) {
++	case 0:
++		file->f_pos = offset;
++		return file->f_pos;
++	case 1:
++		file->f_pos += offset;
++		return file->f_pos;
++	default:
++		return -EINVAL;
++	}
++}
++
++/*
++ *  Determine the page address for an address offset value, 
++ *  get a virtual address for it, and copy it out.
++ *  Accesses must fit within a page.
++ */
++static ssize_t
++crash_read(struct file *file, char *buf, size_t count, loff_t *poff)
++{
++	void *vaddr;
++	struct page *page;
++	u64 offset;
++	ssize_t read;
++
++	offset = *poff;
++	if (offset >> PAGE_SHIFT != (offset+count-1) >> PAGE_SHIFT) 
++		return -EINVAL;
++
++	vaddr = map_virtual(offset, &page);
++	if (!vaddr)
++		return -EFAULT;
++
++	if (copy_to_user(buf, vaddr, count)) {
++		unmap_virtual(page);
++		return -EFAULT;
++	}
++	unmap_virtual(page);
++
++	read = count;
++	*poff += read;
++	return read;
++}
++
++static struct file_operations crash_fops = {
++	.owner = THIS_MODULE,
++	.llseek = crash_llseek,
++	.read = crash_read,
++};
++
++static struct miscdevice crash_dev = {
++	MISC_DYNAMIC_MINOR,
++	"crash",
++	&crash_fops
++};
++
++static int __init
++crash_init(void)
++{
++	int ret;
++
++	ret = misc_register(&crash_dev);
++	if (ret) {
++		printk(KERN_ERR 
++		    "crash memory driver: cannot misc_register (MISC_DYNAMIC_MINOR)\n");
++		goto out;
++	}
++	
++	ret = 0;
++	printk(KERN_INFO "crash memory driver: version %s\n", CRASH_VERSION);
++out:
++	return ret;
++}
++
++static void __exit
++crash_cleanup_module(void)
++{
++	misc_deregister(&crash_dev);
++}
++
++module_init(crash_init);
++module_exit(crash_cleanup_module);
++
++MODULE_LICENSE("GPL");
+diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/include/asm-x86/crash.h
+@@ -0,0 +1,75 @@
++#ifndef _ASM_I386_CRASH_H
++#define _ASM_I386_CRASH_H
++
++/*
++ * linux/include/asm-i386/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <asm/mmzone.h>
++
++extern int page_is_ram(unsigned long);
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	void *vaddr;
++
++	pfn = (unsigned long)(offset >> PAGE_SHIFT);
++
++	if (!page_is_ram(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
++		return NULL;
++	}
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	vaddr = kmap(page);
++	if (!vaddr) {
++		printk(KERN_INFO
++		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
++			pfn, (unsigned long)page);
++		return NULL;
++	}
++
++	*pp = page;
++	return (vaddr + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	kunmap(page);
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_I386_CRASH_H */


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- config-generic	8 Apr 2009 05:16:24 -0000	1.276
+++ config-generic	9 Apr 2009 14:04:41 -0000	1.277
@@ -5,7 +5,7 @@
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
-# CONFIG_CRASH_DUMP is not set
+
 #
 # Code maturity level options
 #
@@ -2309,6 +2309,7 @@
 #
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_DYNAMIC_MINORS=y
 
 # CONFIG_DVB_FE_CUSTOMISE is not set
 
@@ -2373,6 +2374,7 @@
 CONFIG_DVB_USB_GP8PSK=m
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
@@ -2382,7 +2384,6 @@
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_TUNER=m
-CONFIG_DVB_USB_CE6230=m
 # CONFIG_VIDEO_TUNER_CUSTOMISE is not set
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -3934,8 +3935,6 @@
 CONFIG_FCOE=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 
-CONFIG_DVB_DYNAMIC_MINORS=y
-
 CONFIG_NOP_USB_XCEIV=m
 
 # CONFIG_IMA is not set
@@ -3943,3 +3942,7 @@
 # CONFIG_PAGE_POISONING is not set
 
 CONFIG_SLOW_WORK=y
+
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRASH is not set
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- config-x86-generic	8 Apr 2009 15:39:51 -0000	1.77
+++ config-x86-generic	9 Apr 2009 14:04:41 -0000	1.78
@@ -347,6 +347,7 @@
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_PROC_VMCORE=y
+CONFIG_CRASH=m
 
 CONFIG_CRYPTO_DEV_GEODE=m
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- config-x86_64-generic	8 Apr 2009 15:39:51 -0000	1.77
+++ config-x86_64-generic	9 Apr 2009 14:04:41 -0000	1.78
@@ -258,6 +258,7 @@
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y
+CONFIG_CRASH=m
 
 CONFIG_DMIID=y
 CONFIG_ISCSI_IBFT_FIND=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- kernel.spec	8 Apr 2009 20:51:24 -0000	1.1508
+++ kernel.spec	9 Apr 2009 14:04:41 -0000	1.1509
@@ -637,6 +637,8 @@
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch684: at76-netdev_ops.patch
 
+Patch800: linux-2.6-crash-driver.patch
+
 Patch1515: linux-2.6.29-lirc.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
@@ -1183,6 +1185,9 @@
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch at76-netdev_ops.patch
 
+# /dev/crash driver.
+ApplyPatch linux-2.6-crash-driver.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1819,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 09 2009 Dave Jones <davej at redhat.com>
+- Bring back the /dev/crash driver. (#492803)
+
 * Wed Apr 08 2009 Dave Jones <davej at redhat.com>
 - disable MMIOTRACE in non-debug builds (#494584)
 



From ellert at fedoraproject.org  Thu Apr  9 14:05:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  9 Apr 2009 14:05:05 +0000 (UTC)
Subject: rpms/grid-packaging-tools/F-10 grid-packaging-tools-wrong-url.patch,
	NONE, 1.1 grid-packaging-tools.spec, 1.1, 1.2
Message-ID: <20090409140505.44F407001C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20114

Modified Files:
	grid-packaging-tools.spec 
Added Files:
	grid-packaging-tools-wrong-url.patch 
Log Message:
* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
- Adding wrong-url patch


grid-packaging-tools-wrong-url.patch:

--- NEW FILE grid-packaging-tools-wrong-url.patch ---
diff -ur gpt.orig/CHANGES gpt/CHANGES
--- gpt.orig/CHANGES	2006-01-11 17:10:08.000000000 +0100
+++ gpt/CHANGES	2009-03-26 12:58:58.000000000 +0100
@@ -5,7 +5,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.1 -> 3.2
 Fixed some gpt-build Macro problems.
@@ -14,7 +14,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.0.1 -> 3.1
 
diff -ur gpt.orig/INSTALL gpt/INSTALL
--- gpt.orig/INSTALL	2006-01-11 17:10:08.000000000 +0100
+++ gpt/INSTALL	2009-03-26 12:58:58.000000000 +0100
@@ -3,4 +3,4 @@
 More installation help can be seen by running ./build_gpt -man.  Also
 the webpage
 
-http://www.gridpackagingtools.org/book/latest-stable/gpt-book.html#setup
+http://www.gridpackagingtools.com/book/latest-stable/gpt-book.html#setup
diff -ur gpt.orig/LICENSE gpt/LICENSE
--- gpt.orig/LICENSE	2006-01-11 17:10:08.000000000 +0100
+++ gpt/LICENSE	2009-03-26 13:00:59.000000000 +0100
@@ -5,7 +5,7 @@
     Grid Packaging Tools Development Team
     National Center for Supercomputing Applications
     University of Illinois
-    http://wwww.gridpackagingtools.org/ 
+    http://www.gridpackagingtools.com/ 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff -ur gpt.orig/README gpt/README
--- gpt.orig/README	2006-01-11 17:10:08.000000000 +0100
+++ gpt/README	2009-03-26 13:00:40.000000000 +0100
@@ -6,5 +6,5 @@
 
 
 Further information on GPT can be found at
-http://wwww.gridpackagingtools.org/
+http://www.gridpackagingtools.com/
 


Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-10/grid-packaging-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grid-packaging-tools.spec	18 Mar 2009 09:51:25 -0000	1.1
+++ grid-packaging-tools.spec	9 Apr 2009 14:04:34 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
-URL:		http://www.gridpackagingtools.org/
+URL:		http://www.gridpackagingtools.com/
 # The maintenance of GPT has been taken over by the Globus Alliance.
 # Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
@@ -55,9 +55,12 @@
 #		Make gpt work with older automake versions:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6564
 Patch14:	%{name}-compat.patch
-#		Forward library version info to libtool
+#		Forward library version info to libtool:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6694
 Patch15:	%{name}-version-info.patch
+#		Wrong URLs in documentation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6705
+Patch16:	%{name}-wrong-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -109,6 +112,7 @@
 %patch13 -p1 -b .help
 %patch14 -p1 -b .compat
 %patch15 -p1 -b .version
+%patch16 -p1 -b .url
 
 iconv -f iso-8859-1 -t utf-8 LICENSE > LICENSE.utf8
 touch -c -r LICENSE LICENSE.utf8
@@ -161,6 +165,9 @@
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
+- Adding wrong-url patch
+
 * Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
 - Adding version-info patch
 



From davej at fedoraproject.org  Thu Apr  9 14:05:21 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  9 Apr 2009 14:05:21 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1523,1.1524
Message-ID: <20090409140521.D16427001C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20414

Modified Files:
	kernel.spec 
Log Message:
remove version


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1523
retrieving revision 1.1524
diff -u -r1.1523 -r1.1524
--- kernel.spec	9 Apr 2009 14:01:13 -0000	1.1523
+++ kernel.spec	9 Apr 2009 14:04:51 -0000	1.1524
@@ -1905,7 +1905,7 @@
 # and build.
 
 %changelog
-* Thu Apr 09 2009 Dave Jones <davej at redhat.com> 2.6.29.1-61
+* Thu Apr 09 2009 Dave Jones <davej at redhat.com>
 - Bring back the /dev/crash driver. (#492803)
 
 * Thu Apr 09 2009 Dave Airlie <airlied at redhat.com>



From pkgdb at fedoraproject.org  Thu Apr  9 14:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:10:30 +0000
Subject: [pkgdb] libprelude: djabas has requested watchcommits
Message-ID: <20090409141032.EC27310F872@bastion2.fedora.phx.redhat.com>

djabas has requested the watchcommits acl on libprelude (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libprelude



From rdieter at fedoraproject.org  Thu Apr  9 14:13:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  9 Apr 2009 14:13:53 +0000 (UTC)
Subject: rpms/amarok/F-10 amarok.spec,1.136,1.137
Message-ID: <20090409141353.328D97001C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22890

Modified Files:
	amarok.spec 
Log Message:
hack around missing BR for now



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- amarok.spec	9 Apr 2009 12:45:13 -0000	1.136
+++ amarok.spec	9 Apr 2009 14:13:22 -0000	1.137
@@ -46,7 +46,7 @@
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 
 %if 0%{?no_qtscriptgenerator}
-BuildRequires: qtscriptgenerator
+#BuildRequires: qtscriptgenerator
 Requires: qtscriptbindings
 %endif
 



From ellert at fedoraproject.org  Thu Apr  9 14:15:49 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  9 Apr 2009 14:15:49 +0000 (UTC)
Subject: rpms/grid-packaging-tools/F-9 grid-packaging-tools-wrong-url.patch, 
	NONE, 1.1 grid-packaging-tools.spec, 1.1, 1.2
Message-ID: <20090409141549.31B427001C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23077

Modified Files:
	grid-packaging-tools.spec 
Added Files:
	grid-packaging-tools-wrong-url.patch 
Log Message:
* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
- Adding wrong-url patch


grid-packaging-tools-wrong-url.patch:

--- NEW FILE grid-packaging-tools-wrong-url.patch ---
diff -ur gpt.orig/CHANGES gpt/CHANGES
--- gpt.orig/CHANGES	2006-01-11 17:10:08.000000000 +0100
+++ gpt/CHANGES	2009-03-26 12:58:58.000000000 +0100
@@ -5,7 +5,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.1 -> 3.2
 Fixed some gpt-build Macro problems.
@@ -14,7 +14,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.0.1 -> 3.1
 
diff -ur gpt.orig/INSTALL gpt/INSTALL
--- gpt.orig/INSTALL	2006-01-11 17:10:08.000000000 +0100
+++ gpt/INSTALL	2009-03-26 12:58:58.000000000 +0100
@@ -3,4 +3,4 @@
 More installation help can be seen by running ./build_gpt -man.  Also
 the webpage
 
-http://www.gridpackagingtools.org/book/latest-stable/gpt-book.html#setup
+http://www.gridpackagingtools.com/book/latest-stable/gpt-book.html#setup
diff -ur gpt.orig/LICENSE gpt/LICENSE
--- gpt.orig/LICENSE	2006-01-11 17:10:08.000000000 +0100
+++ gpt/LICENSE	2009-03-26 13:00:59.000000000 +0100
@@ -5,7 +5,7 @@
     Grid Packaging Tools Development Team
     National Center for Supercomputing Applications
     University of Illinois
-    http://wwww.gridpackagingtools.org/ 
+    http://www.gridpackagingtools.com/ 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff -ur gpt.orig/README gpt/README
--- gpt.orig/README	2006-01-11 17:10:08.000000000 +0100
+++ gpt/README	2009-03-26 13:00:40.000000000 +0100
@@ -6,5 +6,5 @@
 
 
 Further information on GPT can be found at
-http://wwww.gridpackagingtools.org/
+http://www.gridpackagingtools.com/
 


Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-9/grid-packaging-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grid-packaging-tools.spec	18 Mar 2009 09:48:14 -0000	1.1
+++ grid-packaging-tools.spec	9 Apr 2009 14:15:18 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
-URL:		http://www.gridpackagingtools.org/
+URL:		http://www.gridpackagingtools.com/
 # The maintenance of GPT has been taken over by the Globus Alliance.
 # Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
@@ -55,9 +55,12 @@
 #		Make gpt work with older automake versions:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6564
 Patch14:	%{name}-compat.patch
-#		Forward library version info to libtool
+#		Forward library version info to libtool:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6694
 Patch15:	%{name}-version-info.patch
+#		Wrong URLs in documentation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6705
+Patch16:	%{name}-wrong-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -109,6 +112,7 @@
 %patch13 -p1 -b .help
 %patch14 -p1 -b .compat
 %patch15 -p1 -b .version
+%patch16 -p1 -b .url
 
 iconv -f iso-8859-1 -t utf-8 LICENSE > LICENSE.utf8
 touch -c -r LICENSE LICENSE.utf8
@@ -161,6 +165,9 @@
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
+- Adding wrong-url patch
+
 * Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
 - Adding version-info patch
 



From wcohen at fedoraproject.org  Thu Apr  9 14:17:20 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu,  9 Apr 2009 14:17:20 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile-basename.patch, NONE, 1.1 oprofile.spec,
	1.75, 1.76
Message-ID: <20090409141720.9EF2D7001C@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23425

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-basename.patch 
Log Message:
Add configure test to generated needed HAVE_DECL_BASENAME.


oprofile-basename.patch:

--- NEW FILE oprofile-basename.patch ---
diff -up oprofile-0.9.4/configure.in.basename oprofile-0.9.4/configure.in
--- oprofile-0.9.4/configure.in.basename	2009-04-08 13:43:42.000000000 -0400
+++ oprofile-0.9.4/configure.in	2009-04-08 13:43:45.000000000 -0400
@@ -15,6 +15,7 @@ AC_INIT(libop/op_config.h)
 AM_INIT_AUTOMAKE(oprofile, 0.9.4)
 AM_CONFIG_HEADER(config.h)
 
+AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]])
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- oprofile.spec	8 Apr 2009 14:08:15 -0000	1.75
+++ oprofile.spec	9 Apr 2009 14:16:50 -0000	1.76
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -14,6 +14,7 @@
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
 #Patch100: oprofile-gcc43.patch
+Patch101: oprofile-basename.patch
 URL: http://oprofile.sf.net
 
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
@@ -82,6 +83,7 @@
 %patch63 -p1 -b .libs
 %patch83 -p1 -b .xen
 #%patch100 -p1 -b .gcc43
+%patch101 -p1 -b .basename
 
 ./autogen.sh
 
@@ -223,6 +225,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Apr 8 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-6
+- Test for basename declaration.
+
 * Wed Apr 8 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-5
 - Bump version and rebuild.
 



From lmacken at fedoraproject.org  Thu Apr  9 14:23:38 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  9 Apr 2009 14:23:38 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.11,
	1.12 liveusb-creator.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20090409142338.11E4E7001C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25493

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to v3.6.5, which supports F11 beta, and the latest SoaS releases


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Mar 2009 04:16:14 -0000	1.11
+++ .cvsignore	9 Apr 2009 14:23:07 -0000	1.12
@@ -1 +1 @@
-liveusb-creator-3.6.4.tar.bz2
+liveusb-creator-3.6.5.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- liveusb-creator.spec	18 Mar 2009 04:16:14 -0000	1.17
+++ liveusb-creator.spec	9 Apr 2009 14:23:07 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.6.4
+Version:        3.6.5
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-1
+- Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
+
 * Wed Mar 18 2009 Luke Macken <lmacken at redhat.com> 3.6.4-1
 - Update to v3.6.4, which works with the PyParted 2.0 API
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	18 Mar 2009 04:16:14 -0000	1.14
+++ sources	9 Apr 2009 14:23:07 -0000	1.15
@@ -1 +1 @@
-c57f4ace1245eeb8cb271ec4a24da69a  liveusb-creator-3.6.4.tar.bz2
+8ec83ffe8c16bbd4c41c1e501edd8f50  liveusb-creator-3.6.5.tar.bz2



From ellert at fedoraproject.org  Thu Apr  9 14:23:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  9 Apr 2009 14:23:37 +0000 (UTC)
Subject: rpms/grid-packaging-tools/EL-5 grid-packaging-tools-wrong-url.patch,
	NONE, 1.1 grid-packaging-tools.spec, 1.1, 1.2
Message-ID: <20090409142337.B2E667001C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25409

Modified Files:
	grid-packaging-tools.spec 
Added Files:
	grid-packaging-tools-wrong-url.patch 
Log Message:
* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
- Adding wrong-url patch


grid-packaging-tools-wrong-url.patch:

--- NEW FILE grid-packaging-tools-wrong-url.patch ---
diff -ur gpt.orig/CHANGES gpt/CHANGES
--- gpt.orig/CHANGES	2006-01-11 17:10:08.000000000 +0100
+++ gpt/CHANGES	2009-03-26 12:58:58.000000000 +0100
@@ -5,7 +5,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.1 -> 3.2
 Fixed some gpt-build Macro problems.
@@ -14,7 +14,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.0.1 -> 3.1
 
diff -ur gpt.orig/INSTALL gpt/INSTALL
--- gpt.orig/INSTALL	2006-01-11 17:10:08.000000000 +0100
+++ gpt/INSTALL	2009-03-26 12:58:58.000000000 +0100
@@ -3,4 +3,4 @@
 More installation help can be seen by running ./build_gpt -man.  Also
 the webpage
 
-http://www.gridpackagingtools.org/book/latest-stable/gpt-book.html#setup
+http://www.gridpackagingtools.com/book/latest-stable/gpt-book.html#setup
diff -ur gpt.orig/LICENSE gpt/LICENSE
--- gpt.orig/LICENSE	2006-01-11 17:10:08.000000000 +0100
+++ gpt/LICENSE	2009-03-26 13:00:59.000000000 +0100
@@ -5,7 +5,7 @@
     Grid Packaging Tools Development Team
     National Center for Supercomputing Applications
     University of Illinois
-    http://wwww.gridpackagingtools.org/ 
+    http://www.gridpackagingtools.com/ 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff -ur gpt.orig/README gpt/README
--- gpt.orig/README	2006-01-11 17:10:08.000000000 +0100
+++ gpt/README	2009-03-26 13:00:40.000000000 +0100
@@ -6,5 +6,5 @@
 
 
 Further information on GPT can be found at
-http://wwww.gridpackagingtools.org/
+http://www.gridpackagingtools.com/
 


Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/EL-5/grid-packaging-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grid-packaging-tools.spec	18 Mar 2009 09:57:36 -0000	1.1
+++ grid-packaging-tools.spec	9 Apr 2009 14:23:07 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
-URL:		http://www.gridpackagingtools.org/
+URL:		http://www.gridpackagingtools.com/
 # The maintenance of GPT has been taken over by the Globus Alliance.
 # Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
@@ -55,9 +55,12 @@
 #		Make gpt work with older automake versions:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6564
 Patch14:	%{name}-compat.patch
-#		Forward library version info to libtool
+#		Forward library version info to libtool:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6694
 Patch15:	%{name}-version-info.patch
+#		Wrong URLs in documentation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6705
+Patch16:	%{name}-wrong-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -109,6 +112,7 @@
 %patch13 -p1 -b .help
 %patch14 -p1 -b .compat
 %patch15 -p1 -b .version
+%patch16 -p1 -b .url
 
 iconv -f iso-8859-1 -t utf-8 LICENSE > LICENSE.utf8
 touch -c -r LICENSE LICENSE.utf8
@@ -161,6 +165,9 @@
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
+- Adding wrong-url patch
+
 * Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
 - Adding version-info patch
 



From ellert at fedoraproject.org  Thu Apr  9 14:25:20 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  9 Apr 2009 14:25:20 +0000 (UTC)
Subject: rpms/grid-packaging-tools/EL-4 grid-packaging-tools-wrong-url.patch,
	NONE, 1.1 grid-packaging-tools.spec, 1.1, 1.2
Message-ID: <20090409142520.128BA7001C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26130

Modified Files:
	grid-packaging-tools.spec 
Added Files:
	grid-packaging-tools-wrong-url.patch 
Log Message:
* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
- Adding wrong-url patch


grid-packaging-tools-wrong-url.patch:

--- NEW FILE grid-packaging-tools-wrong-url.patch ---
diff -ur gpt.orig/CHANGES gpt/CHANGES
--- gpt.orig/CHANGES	2006-01-11 17:10:08.000000000 +0100
+++ gpt/CHANGES	2009-03-26 12:58:58.000000000 +0100
@@ -5,7 +5,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.1 -> 3.2
 Fixed some gpt-build Macro problems.
@@ -14,7 +14,7 @@
 incompatible with Globus Toolkit version 2.x.
 
 Fixes for bugs 157, 168, 177, 223, and 233 see bugzilla link at
-http://www.gridpackagingtools.org/.
+http://www.gridpackagingtools.com/.
 
 3.0.1 -> 3.1
 
diff -ur gpt.orig/INSTALL gpt/INSTALL
--- gpt.orig/INSTALL	2006-01-11 17:10:08.000000000 +0100
+++ gpt/INSTALL	2009-03-26 12:58:58.000000000 +0100
@@ -3,4 +3,4 @@
 More installation help can be seen by running ./build_gpt -man.  Also
 the webpage
 
-http://www.gridpackagingtools.org/book/latest-stable/gpt-book.html#setup
+http://www.gridpackagingtools.com/book/latest-stable/gpt-book.html#setup
diff -ur gpt.orig/LICENSE gpt/LICENSE
--- gpt.orig/LICENSE	2006-01-11 17:10:08.000000000 +0100
+++ gpt/LICENSE	2009-03-26 13:00:59.000000000 +0100
@@ -5,7 +5,7 @@
     Grid Packaging Tools Development Team
     National Center for Supercomputing Applications
     University of Illinois
-    http://wwww.gridpackagingtools.org/ 
+    http://www.gridpackagingtools.com/ 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff -ur gpt.orig/README gpt/README
--- gpt.orig/README	2006-01-11 17:10:08.000000000 +0100
+++ gpt/README	2009-03-26 13:00:40.000000000 +0100
@@ -6,5 +6,5 @@
 
 
 Further information on GPT can be found at
-http://wwww.gridpackagingtools.org/
+http://www.gridpackagingtools.com/
 


Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/EL-4/grid-packaging-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grid-packaging-tools.spec	18 Mar 2009 09:54:32 -0000	1.1
+++ grid-packaging-tools.spec	9 Apr 2009 14:24:49 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
-URL:		http://www.gridpackagingtools.org/
+URL:		http://www.gridpackagingtools.com/
 # The maintenance of GPT has been taken over by the Globus Alliance.
 # Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
@@ -55,9 +55,12 @@
 #		Make gpt work with older automake versions:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6564
 Patch14:	%{name}-compat.patch
-#		Forward library version info to libtool
+#		Forward library version info to libtool:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6694
 Patch15:	%{name}-version-info.patch
+#		Wrong URLs in documentation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6705
+Patch16:	%{name}-wrong-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool
 BuildRequires:	perl
@@ -109,6 +112,7 @@
 %patch13 -p1 -b .help
 %patch14 -p1 -b .compat
 %patch15 -p1 -b .version
+%patch16 -p1 -b .url
 
 iconv -f iso-8859-1 -t utf-8 LICENSE > LICENSE.utf8
 touch -c -r LICENSE LICENSE.utf8
@@ -161,6 +165,9 @@
 %{perl_vendorlib}/Grid
 
 %changelog
+* Thu Mar 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-17
+- Adding wrong-url patch
+
 * Mon Mar 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-16
 - Adding version-info patch
 



From lmacken at fedoraproject.org  Thu Apr  9 14:31:20 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  9 Apr 2009 14:31:20 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.10,
	1.11 liveusb-creator.spec, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20090409143120.4DCD17001C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28421

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to v3.6.5, which supports F11 beta, and the latest SoaS releases


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2009 00:25:55 -0000	1.10
+++ .cvsignore	9 Apr 2009 14:30:49 -0000	1.11
@@ -1 +1 @@
-liveusb-creator-3.6.3.tar.bz2
+liveusb-creator-3.6.5.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- liveusb-creator.spec	13 Mar 2009 00:28:13 -0000	1.14
+++ liveusb-creator.spec	9 Apr 2009 14:30:49 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.6.3
+Version:        3.6.5
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,12 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-1
+- Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
+
+* Wed Mar 18 2009 Luke Macken <lmacken at redhat.com> 3.6.4-1
+- Update to v3.6.4, which works with the PyParted 2.0 API
+
 * Thu Mar 12 2009 Luke Macken <lmacken at redhat.com> 3.6.3-1
 - Update to v3.6.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Mar 2009 00:25:55 -0000	1.12
+++ sources	9 Apr 2009 14:30:49 -0000	1.13
@@ -1 +1 @@
-192dcc5b4833056edf60cb47b2915bed  liveusb-creator-3.6.3.tar.bz2
+173bcc7dddca6a95ed753b36154829ff  liveusb-creator-3.6.5.tar.bz2



From lmacken at fedoraproject.org  Thu Apr  9 14:31:47 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  9 Apr 2009 14:31:47 +0000 (UTC)
Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.9, 1.10 liveusb-creator.spec,
	1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20090409143147.685247001C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28568

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to v3.6.5, which supports F11 beta, and the latest SoaS releases


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Mar 2009 00:26:45 -0000	1.9
+++ .cvsignore	9 Apr 2009 14:31:17 -0000	1.10
@@ -1 +1 @@
-liveusb-creator-3.6.3.tar.bz2
+liveusb-creator-3.6.5.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- liveusb-creator.spec	13 Mar 2009 00:29:13 -0000	1.11
+++ liveusb-creator.spec	9 Apr 2009 14:31:17 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.6.3
+Version:        3.6.5
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,12 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-1
+- Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
+
+* Wed Mar 18 2009 Luke Macken <lmacken at redhat.com> 3.6.4-1
+- Update to v3.6.4, which works with the PyParted 2.0 API
+
 * Thu Mar 12 2009 Luke Macken <lmacken at redhat.com> 3.6.3-1
 - Update to v3.6.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2009 00:26:45 -0000	1.10
+++ sources	9 Apr 2009 14:31:17 -0000	1.11
@@ -1 +1 @@
-192dcc5b4833056edf60cb47b2915bed  liveusb-creator-3.6.3.tar.bz2
+173bcc7dddca6a95ed753b36154829ff  liveusb-creator-3.6.5.tar.bz2



From buc at fedoraproject.org  Thu Apr  9 14:40:27 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu,  9 Apr 2009 14:40:27 +0000 (UTC)
Subject: rpms/phpldapadmin/devel .cvsignore, 1.9, 1.10 phpldapadmin.spec,
	1.17, 1.18 sources, 1.10, 1.11
Message-ID: <20090409144027.30F5A7001C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30699

Modified Files:
	.cvsignore phpldapadmin.spec sources 
Log Message:
Update to 1.1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Feb 2008 16:06:30 -0000	1.9
+++ .cvsignore	9 Apr 2009 14:39:56 -0000	1.10
@@ -1 +1 @@
-phpldapadmin-1.1.0.5.tar.gz
+phpldapadmin-1.1.0.7.tar.gz


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- phpldapadmin.spec	26 Feb 2009 22:48:35 -0000	1.17
+++ phpldapadmin.spec	9 Apr 2009 14:39:56 -0000	1.18
@@ -1,7 +1,7 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.1.0.5
-Release: 3%{?dist}
+Version: 1.1.0.7
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
@@ -115,8 +115,8 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Apr  9 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.7-1
+- update to 1.1.0.7
 
 * Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-2
 - update config patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Feb 2008 16:06:30 -0000	1.10
+++ sources	9 Apr 2009 14:39:56 -0000	1.11
@@ -1 +1 @@
-5ea78a6758e347c77ef291882675f266  phpldapadmin-1.1.0.5.tar.gz
+a9129f81b347e98c2b31552d1adc4b51  phpldapadmin-1.1.0.7.tar.gz



From pkgdb at fedoraproject.org  Thu Apr  9 14:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:41:31 +0000
Subject: [pkgdb] jsch had acl change status
Message-ID: <20090409144035.E226110F870@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on jsch (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From pkgdb at fedoraproject.org  Thu Apr  9 14:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:41:30 +0000
Subject: [pkgdb] jsch had acl change status
Message-ID: <20090409144036.B473210F874@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jsch (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From pkgdb at fedoraproject.org  Thu Apr  9 14:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:40:35 +0000
Subject: [pkgdb] jsch had acl change status
Message-ID: <20090409144037.A7E5010F878@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on jsch (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From pkgdb at fedoraproject.org  Thu Apr  9 14:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:41:35 +0000
Subject: [pkgdb] jsch had acl change status
Message-ID: <20090409144041.AEAF910F87A@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on jsch (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From pkgdb at fedoraproject.org  Thu Apr  9 14:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:40:40 +0000
Subject: [pkgdb] jsch had acl change status
Message-ID: <20090409144042.39AE210F87D@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on jsch (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From pkgdb at fedoraproject.org  Thu Apr  9 14:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 14:41:39 +0000
Subject: [pkgdb] jsch had acl change status
Message-ID: <20090409144043.7C33910F880@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jsch (Fedora 11) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From sharkcz at fedoraproject.org  Thu Apr  9 14:42:43 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  9 Apr 2009 14:42:43 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix.spec,1.36,1.37
Message-ID: <20090409144243.EFFDE7001C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31335

Modified Files:
	zabbix.spec 
Log Message:
* Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-2
- make the -docs subpackage noarch



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- zabbix.spec	9 Apr 2009 10:16:36 -0000	1.36
+++ zabbix.spec	9 Apr 2009 14:42:13 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -54,6 +54,9 @@
 %package docs
 Summary:         Zabbix documentation
 Group:           Documentation
+%if 0%{?fedora} > 9
+BuildArch:       noarch
+%endif
 
 %description docs
 Zabbix Reference Manual in PDF.
@@ -496,6 +499,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-2
+- make the -docs subpackage noarch
+
 * Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-1
 - update to 1.6.4
 - remove the cpustat patch, it was integreated into upstream



From davej at fedoraproject.org  Thu Apr  9 14:43:44 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  9 Apr 2009 14:43:44 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1509,
	1.1510 linux-2.6-bootarg-strict-devmem.patch, 1.1, NONE
Message-ID: <20090409144344.27ECC7001C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31788

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-bootarg-strict-devmem.patch 
Log Message:
with crash back, this is now pointless.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -u -r1.1509 -r1.1510
--- kernel.spec	9 Apr 2009 14:04:41 -0000	1.1509
+++ kernel.spec	9 Apr 2009 14:43:13 -0000	1.1510
@@ -674,8 +674,6 @@
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
-Patch4000: linux-2.6-bootarg-strict-devmem.patch
-
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
@@ -1111,9 +1109,6 @@
 # btrfs
 #ApplyPatch linux-2.6-btrfs-experimental-branch.patch
 
-# Make strict devmem a boot arg
-ApplyPatch linux-2.6-bootarg-strict-devmem.patch
-
 # USB
 
 # ACPI


--- linux-2.6-bootarg-strict-devmem.patch DELETED ---



From davej at fedoraproject.org  Thu Apr  9 14:45:42 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  9 Apr 2009 14:45:42 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1524,
	1.1525 linux-2.6-bootarg-strict-devmem.patch, 1.1, NONE
Message-ID: <20090409144542.570DD7001C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32208

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-bootarg-strict-devmem.patch 
Log Message:
with crash back, this is now pointless.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1524
retrieving revision 1.1525
diff -u -r1.1524 -r1.1525
--- kernel.spec	9 Apr 2009 14:04:51 -0000	1.1524
+++ kernel.spec	9 Apr 2009 14:45:11 -0000	1.1525
@@ -705,8 +705,6 @@
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 
-Patch4000: linux-2.6-bootarg-strict-devmem.patch
-
 Patch5000: linux-2.6-add-qcserial.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
@@ -1159,9 +1157,6 @@
 # put fiemap.h into kernel-headers
 ApplyPatch linux-2.6-fiemap-header-install.patch
 
-# Make strict devmem a boot arg
-ApplyPatch linux-2.6-bootarg-strict-devmem.patch
-
 # USB
 ApplyPatch linux-2.6-add-qcserial.patch
 


--- linux-2.6-bootarg-strict-devmem.patch DELETED ---



From ajax at fedoraproject.org  Thu Apr  9 14:46:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  9 Apr 2009 14:46:08 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.0-no-i810.patch, NONE,
	1.1 xorg-x11-server.spec, 1.430, 1.431
Message-ID: <20090409144608.68DB47001C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32380

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.0-no-i810.patch 
Log Message:
* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 1.6.0-19
- xserver-1.6.0-no-i810.patch: Don't try to load i810.


xserver-1.6.0-no-i810.patch:

--- NEW FILE xserver-1.6.0-no-i810.patch ---
>From be743d919d85a74133d714d4e5137416de02bfb7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 9 Apr 2009 10:38:51 -0400
Subject: [PATCH] config: Remove i810 from the autoload list, we don't ship it.

---
 hw/xfree86/common/xf86AutoConfig.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 853d661..2e69a31 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -175,7 +175,6 @@ videoPtrToDriverList(struct pci_device *dev,
 		break; /* you got powervr in my intel! */
 	    } else {
 		driverList[0] = "intel";
-		driverList[1] = "i810";
 	    }
 	    break;
 	case 0x102b:		    driverList[0] = "mga";	break;
-- 
1.6.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- xorg-x11-server.spec	9 Apr 2009 05:39:34 -0000	1.430
+++ xorg-x11-server.spec	9 Apr 2009 14:45:38 -0000	1.431
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   18%{?dist}
+Release:   19%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -111,6 +111,7 @@
 Patch6027: xserver-1.6.0-displayfd.patch
 
 Patch6028: xserver-1.6.0-restore-zap.patch
+Patch6029: xserver-1.6.0-no-i810.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -528,6 +529,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 1.6.0-19
+- xserver-1.6.0-no-i810.patch: Don't try to load i810.
+
 * Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-18
 - xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.
 



From buc at fedoraproject.org  Thu Apr  9 14:49:38 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu,  9 Apr 2009 14:49:38 +0000 (UTC)
Subject: rpms/phpldapadmin/F-10 phpldapadmin.spec, 1.16, 1.17 sources, 1.10,
	1.11
Message-ID: <20090409144938.EBA397001C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv803

Modified Files:
	phpldapadmin.spec sources 
Log Message:
Update to 1.1.0.7



Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-10/phpldapadmin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- phpldapadmin.spec	26 Sep 2008 15:02:13 -0000	1.16
+++ phpldapadmin.spec	9 Apr 2009 14:49:08 -0000	1.17
@@ -1,7 +1,7 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.1.0.5
-Release: 2%{?dist}
+Version: 1.1.0.7
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.7-1
+- update to 1.1.0.7
+
 * Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-2
 - update config patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Feb 2008 16:06:30 -0000	1.10
+++ sources	9 Apr 2009 14:49:08 -0000	1.11
@@ -1 +1 @@
-5ea78a6758e347c77ef291882675f266  phpldapadmin-1.1.0.5.tar.gz
+a9129f81b347e98c2b31552d1adc4b51  phpldapadmin-1.1.0.7.tar.gz



From caolanm at fedoraproject.org  Thu Apr  9 14:53:24 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  9 Apr 2009 14:53:24 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, NONE,
	1.1 openoffice.org.spec, 1.1874,
	1.1875 openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch,
	1.1, NONE
Message-ID: <20090409145324.968A37001C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2161

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
Removed Files:
	openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch 
Log Message:
fix up as ooo#100991

openoffice.org-3.1.0.ooo100991.pyuno-fix.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100991.pyuno-fix.patch ---
--- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
+++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
@@ -762,7 +762,7 @@
             
             log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) )
         
-            rootUrl = expandUri( urlHelper.getRootStorageURI() )
+            rootUrl = urlHelper.getRootStorageURI()
             log.isDebugLevel() and log.debug( storageType + " transformed to " + rootUrl )
 
             ucbService = "com.sun.star.ucb.SimpleFileAccess"


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -r1.1874 -r1.1875
--- openoffice.org.spec	9 Apr 2009 12:08:49 -0000	1.1874
+++ openoffice.org.spec	9 Apr 2009 14:52:54 -0000	1.1875
@@ -133,7 +133,7 @@
 Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
 Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch61: openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch
+Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1625,7 +1625,7 @@
 %patch58 -p0 -b .ooo100225.comphelper.vis.patch
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch61 -p1 -b .oooXXXXX.partial-revert-ooo95118.patch
+%patch61 -p1 -b .ooo100991.pyuno-fix.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch DELETED ---



From nphilipp at fedoraproject.org  Thu Apr  9 14:55:13 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  9 Apr 2009 14:55:13 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.65, 1.66 sources, 1.68,
	1.69 system-config-samba.spec, 1.72, 1.73
Message-ID: <20090409145514.011E87001C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2705

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.73


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	7 Apr 2009 15:43:24 -0000	1.65
+++ .cvsignore	9 Apr 2009 14:54:43 -0000	1.66
@@ -1 +1 @@
-system-config-samba-1.2.72.tar.bz2
+system-config-samba-1.2.73.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	7 Apr 2009 15:43:24 -0000	1.68
+++ sources	9 Apr 2009 14:54:43 -0000	1.69
@@ -1 +1 @@
-6b13f8ec1194e34fd8649f827d2bd1fa  system-config-samba-1.2.72.tar.bz2
+ee7c7011b9c90eaa8d858286a3220890  system-config-samba-1.2.73.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- system-config-samba.spec	7 Apr 2009 15:43:24 -0000	1.72
+++ system-config-samba.spec	9 Apr 2009 14:54:43 -0000	1.73
@@ -3,7 +3,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.72
+Version: 1.2.73
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -86,6 +86,10 @@
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Thu Apr 09 2009 Nils Philippsen <nils at redhat.com> - 1.2.73-1
+- fix antonym/inverted synonym handling regression
+- various other fixes
+
 * Tue Apr 07 2009 Nils Philippsen <nils at redhat.com> - 1.2.72-1
 - merge SambaBackend and UserData classes (#490050)
 



From ausil at fedoraproject.org  Thu Apr  9 14:59:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  9 Apr 2009 14:59:18 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite-3.6.12-memalign.patch, NONE,
	1.1 sqlite.spec, 1.56, 1.57
Message-ID: <20090409145918.87D4D7001C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3857

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.6.12-memalign.patch 
Log Message:
fix sparc memory allignment bug https://bugzilla.redhat.com/show_bug.cgi?id=494906


sqlite-3.6.12-memalign.patch:

--- NEW FILE sqlite-3.6.12-memalign.patch ---
---------------------
PatchSet 6171 
Date: 2009/04/05 15:22:09
Author: drh
Branch: HEAD
Tag: (none) 
Branches: 
Log:
Additional code to make sure and to assert that memory allocations have
8-byte alignment.  Ticket #3777.

Members: 
	src/btree.c:1.589->1.590 
	src/memjournal.c:1.10->1.11 
	src/pager.c:1.577->1.578 
	src/sqliteInt.h:1.850->1.851 
	src/vdbeaux.c:1.446->1.447 
	src/vdbemem.c:1.139->1.140 

Index: sqlite/src/btree.c
diff -u sqlite/src/btree.c:1.589 sqlite/src/btree.c:1.590
--- sqlite/src/btree.c:1.589	Thu Apr  2 20:16:59 2009
+++ sqlite/src/btree.c	Sun Apr  5 12:22:09 2009
@@ -5357,13 +5357,13 @@
   }
   szCell = (u16*)&apCell[nMaxCells];
   aCopy[0] = (u8*)&szCell[nMaxCells];
-  assert( ((aCopy[0] - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
+  assert( EIGHT_BYTE_ALIGNMENT(aCopy[0]) );
   for(i=1; i<NB; i++){
     aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
     assert( ((aCopy[i] - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
   }
   aSpace1 = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-  assert( ((aSpace1 - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
+  assert( EIGHT_BYTE_ALIGNMENT(aSpace1) );
   if( ISAUTOVACUUM ){
     aFrom = &aSpace1[pBt->pageSize];
   }
Index: sqlite/src/memjournal.c
diff -u sqlite/src/memjournal.c:1.10 sqlite/src/memjournal.c:1.11
--- sqlite/src/memjournal.c:1.10	Thu Apr  2 17:22:42 2009
+++ sqlite/src/memjournal.c	Sun Apr  5 12:22:09 2009
@@ -237,6 +237,7 @@
 */
 void sqlite3MemJournalOpen(sqlite3_file *pJfd){
   MemJournal *p = (MemJournal *)pJfd;
+  assert( EIGHT_BYTE_ALIGNMENT(p) );
   memset(p, 0, sqlite3MemJournalSize());
   p->pMethod = &MemJournalMethods;
 }
Index: sqlite/src/pager.c
diff -u sqlite/src/pager.c:1.577 sqlite/src/pager.c:1.578
--- sqlite/src/pager.c:1.577	Sat Apr  4 15:53:48 2009
+++ sqlite/src/pager.c	Sun Apr  5 12:22:09 2009
@@ -3114,9 +3114,9 @@
   ** source file journal.c).
   */
   if( sqlite3JournalSize(pVfs)>sqlite3MemJournalSize() ){
-    journalFileSize = sqlite3JournalSize(pVfs);
+    journalFileSize = ROUND8(sqlite3JournalSize(pVfs));
   }else{
-    journalFileSize = sqlite3MemJournalSize();
+    journalFileSize = ROUND8(sqlite3MemJournalSize());
   }
 
   /* Set the output variable to NULL in case an error occurs. */
@@ -3172,23 +3172,25 @@
   **     Journal file name               (nPathname+8+1 bytes)
   */
   pPtr = (u8 *)sqlite3MallocZero(
-    sizeof(*pPager) +           /* Pager structure */
-    pcacheSize      +           /* PCache object */
-    pVfs->szOsFile  +           /* The main db file */
-    journalFileSize * 2 +       /* The two journal files */ 
-    nPathname + 1 +             /* zFilename */
-    nPathname + 8 + 1           /* zJournal */
+    ROUND8(sizeof(*pPager)) +      /* Pager structure */
+    ROUND8(pcacheSize) +           /* PCache object */
+    ROUND8(pVfs->szOsFile) +       /* The main db file */
+    journalFileSize * 2 +          /* The two journal files */ 
+    nPathname + 1 +                /* zFilename */
+    nPathname + 8 + 1              /* zJournal */
   );
+  assert( EIGHT_BYTE_ALIGNMENT(journalFileSize) );
   if( !pPtr ){
     sqlite3_free(zPathname);
     return SQLITE_NOMEM;
   }
   pPager =              (Pager*)(pPtr);
-  pPager->pPCache =    (PCache*)(pPtr += sizeof(*pPager));
-  pPager->fd =   (sqlite3_file*)(pPtr += pcacheSize);
-  pPager->sjfd = (sqlite3_file*)(pPtr += pVfs->szOsFile);
+  pPager->pPCache =    (PCache*)(pPtr += ROUND8(sizeof(*pPager)));
+  pPager->fd =   (sqlite3_file*)(pPtr += ROUND8(pcacheSize));
+  pPager->sjfd = (sqlite3_file*)(pPtr += ROUND8(pVfs->szOsFile));
   pPager->jfd =  (sqlite3_file*)(pPtr += journalFileSize);
   pPager->zFilename =    (char*)(pPtr += journalFileSize);
+  assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) );
 
   /* Fill in the Pager.zFilename and Pager.zJournal buffers, if required. */
   if( zPathname ){
Index: sqlite/src/sqliteInt.h
diff -u sqlite/src/sqliteInt.h:1.850 sqlite/src/sqliteInt.h:1.851
--- sqlite/src/sqliteInt.h:1.850	Wed Apr  1 18:03:01 2009
+++ sqlite/src/sqliteInt.h	Sun Apr  5 12:22:09 2009
@@ -456,6 +456,11 @@
 #define ROUNDDOWN8(x) ((x)&~7)
 
 /*
+** Assert that the pointer X is aligned to an 8-byte boundary.
+*/
+#define EIGHT_BYTE_ALIGNMENT(X)   ((((char*)(X) - (char*)0)&7)==0)
+
+/*
 ** An instance of the following structure is used to store the busy-handler
 ** callback for a given sqlite handle. 
 **
Index: sqlite/src/vdbeaux.c
diff -u sqlite/src/vdbeaux.c:1.446 sqlite/src/vdbeaux.c:1.447
--- sqlite/src/vdbeaux.c:1.446	Wed Mar 25 15:43:09 2009
+++ sqlite/src/vdbeaux.c	Sun Apr  5 12:22:09 2009
@@ -1023,6 +1023,7 @@
   u8 *pEnd,            /* Pointer to 1 byte past the end of *ppFrom buffer */
   int *pnByte          /* If allocation cannot be made, increment *pnByte */
 ){
+  assert( EIGHT_BYTE_ALIGNMENT(*ppFrom) );
   if( (*(void**)pp)==0 ){
     nByte = ROUND8(nByte);
     if( (pEnd - *ppFrom)>=nByte ){
@@ -1096,6 +1097,8 @@
     if( isExplain && nMem<10 ){
       nMem = 10;
     }
+    zCsr += (zCsr - (u8*)0)&7;
+    assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
 
     do {
       memset(zCsr, 0, zEnd-zCsr);
Index: sqlite/src/vdbemem.c
diff -u sqlite/src/vdbemem.c:1.139 sqlite/src/vdbemem.c:1.140
--- sqlite/src/vdbemem.c:1.139	Sun Mar 29 15:12:10 2009
+++ sqlite/src/vdbemem.c	Sun Apr  5 12:22:09 2009
@@ -209,6 +209,7 @@
   assert( !(fg&(MEM_Str|MEM_Blob)) );
   assert( fg&(MEM_Int|MEM_Real) );
   assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
 
   if( sqlite3VdbeMemGrow(pMem, nByte, 0) ){
@@ -345,6 +346,7 @@
 i64 sqlite3VdbeIntValue(Mem *pMem){
   int flags;
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
   flags = pMem->flags;
   if( flags & MEM_Int ){
     return pMem->u.i;
@@ -373,6 +375,7 @@
 */
 double sqlite3VdbeRealValue(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
   if( pMem->flags & MEM_Real ){
     return pMem->r;
   }else if( pMem->flags & MEM_Int ){
@@ -403,6 +406,7 @@
   assert( pMem->flags & MEM_Real );
   assert( (pMem->flags & MEM_RowSet)==0 );
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
   pMem->u.i = doubleToInt64(pMem->r);
   if( pMem->r==(double)pMem->u.i ){
@@ -416,6 +420,8 @@
 int sqlite3VdbeMemIntegerify(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
   assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+
   pMem->u.i = sqlite3VdbeIntValue(pMem);
   MemSetTypeFlag(pMem, MEM_Int);
   return SQLITE_OK;
@@ -427,6 +433,8 @@
 */
 int sqlite3VdbeMemRealify(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+
   pMem->r = sqlite3VdbeRealValue(pMem);
   MemSetTypeFlag(pMem, MEM_Real);
   return SQLITE_OK;
diff -u sqlite/src/vdbeaux.c:1.447 sqlite/src/vdbeaux.c:1.448
--- sqlite/src/vdbeaux.c:1.447	Sun Apr  5 12:22:09 2009
+++ sqlite/src/vdbeaux.c	Mon Apr  6 11:11:43 2009
@@ -1099,6 +1099,7 @@
     }
     zCsr += (zCsr - (u8*)0)&7;
     assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
+    if( zEnd<zCsr ) zEnd = zCsr;
 
     do {
       memset(zCsr, 0, zEnd-zCsr);


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sqlite.spec	7 Apr 2009 08:35:41 -0000	1.56
+++ sqlite.spec	9 Apr 2009 14:58:48 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.6.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -16,6 +16,7 @@
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
 Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
 Patch3: sqlite-3.6.12-no-sqlite-doc.patch
+Patch4: sqlite-3.6.12-memalign.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 # libdl patch needs
@@ -79,6 +80,7 @@
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
 %patch3 -p1 -b .no-sqlite-doc
+%patch4 -p1 -b .align
 
 %build
 autoconf
@@ -155,6 +157,9 @@
 %endif
 
 %changelog
+* Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 3.6.12-3
+- apply upstream patch for memory alignment issue (#494906)
+
 * Tue Apr 07 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.12-2
 - disable strict aliasing to work around brokenness on 3.6.12 (#494266)
 - run test-suite on build but let it fail for now



From buc at fedoraproject.org  Thu Apr  9 14:59:41 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu,  9 Apr 2009 14:59:41 +0000 (UTC)
Subject: rpms/phpldapadmin/F-9 phpldapadmin-1.1.0.5-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.15, 1.16 sources, 1.10,
	1.11 phpldapadmin-1.0.1-config.patch, 1.1, NONE
Message-ID: <20090409145941.B97037001C@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4661

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-1.1.0.5-config.patch 
Removed Files:
	phpldapadmin-1.0.1-config.patch 
Log Message:
Update to 1.1.0.7


phpldapadmin-1.1.0.5-config.patch:

--- NEW FILE phpldapadmin-1.1.0.5-config.patch ---
diff -Nrbu phpldapadmin-1.1.0.5/config/config.php phpldapadmin-1.1.0.5-OK/config/config.php
--- phpldapadmin-1.1.0.5/config/config.php	2008-09-26 18:55:09.000000000 +0400
+++ phpldapadmin-1.1.0.5-OK/config/config.php	2008-09-26 18:53:47.000000000 +0400
@@ -72,6 +72,11 @@
    30 seconds or the setting of max_exection_time if this is null. */
 // $config->custom->session['timelimit'] = 30;
 
+// $config->custom->appearance['show_clear_password'] = false;
+
+// $config->custom->search['size_limit'] = 50;
+#  $config->custom->search['size_limit'] = 1000;
+
 /*********************************************/
 /* Commands                                  */
 /*********************************************/
@@ -153,7 +158,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -184,6 +189,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -253,6 +259,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -264,6 +271,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified something different from 'dn', for example 'uid', as the
    login_attr above, you can optionally specify here to fall back to


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-9/phpldapadmin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- phpldapadmin.spec	13 Feb 2008 16:06:30 -0000	1.15
+++ phpldapadmin.spec	9 Apr 2009 14:59:11 -0000	1.16
@@ -1,12 +1,12 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.1.0.5
+Version: 1.1.0.7
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
-Patch0: phpldapadmin-1.0.1-config.patch
+Patch0: phpldapadmin-1.1.0.5-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -115,6 +115,12 @@
 
 
 %changelog
+* Thu Apr  9 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.7-1
+- update to 1.1.0.7
+
+* Fri Sep 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-2
+- update config patch
+
 * Wed Feb 13 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.5-1
 - upgrade to 1.1.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Feb 2008 16:06:30 -0000	1.10
+++ sources	9 Apr 2009 14:59:11 -0000	1.11
@@ -1 +1 @@
-5ea78a6758e347c77ef291882675f266  phpldapadmin-1.1.0.5.tar.gz
+a9129f81b347e98c2b31552d1adc4b51  phpldapadmin-1.1.0.7.tar.gz


--- phpldapadmin-1.0.1-config.patch DELETED ---



From markmc at fedoraproject.org  Thu Apr  9 15:08:34 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  9 Apr 2009 15:08:34 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-display-breakage.patch, 1.1, 1.2 qemu.spec,
	1.76, 1.77
Message-ID: <20090409150834.CB6A57001C@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7245

Modified Files:
	qemu-fix-display-breakage.patch qemu.spec 
Log Message:
* Thu Apr  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-7
- Add a much cleaner fix for vga segfault (#494002)


qemu-fix-display-breakage.patch:

Index: qemu-fix-display-breakage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-display-breakage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-fix-display-breakage.patch	3 Apr 2009 17:09:43 -0000	1.1
+++ qemu-fix-display-breakage.patch	9 Apr 2009 15:08:34 -0000	1.2
@@ -1,543 +1,35 @@
-From 8ad63a93a482d5c3354b97463633394456a157d5 Mon Sep 17 00:00:00 2001
-From: Avi Kivity <avi at redhat.com>
-Date: Thu, 2 Apr 2009 22:17:50 +0300
-Subject: [PATCH 1/1] kvm: qemu: Fix display breakage when resizing the screen
+From 9d1b494a2d5dd2c129994edcf4eb7630bb554964 Mon Sep 17 00:00:00 2001
+From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
+Date: Tue, 7 Apr 2009 20:55:58 +0000
+Subject: [PATCH 1/1] Fix crash on resolution change -> screen dump -> vga redraw (Avi Kivity)
 
-When the vga resolution changes, a new display surface is not allocated
-immediately; instead that is deferred until the next update.  However,
-if we're running without a display client attached, that won't happen
-and the next bitblt is likely to cause a segfault by overflowing the
-display surface.
+The vga screen dump function updates last_width and last_height,
+but does not change the DisplaySurface that these variables describe.
+A consequent vga_draw_graphic() will therefore fail to resize the
+surface and crash.
 
-Fix by reallocating the display immediately when the resolution changes.
+Fix by invalidating the display state after a screen dump, forcing
+vga_draw_graphic() to reallocate the DisplaySurface.
 
 Signed-off-by: Avi Kivity <avi at redhat.com>
+Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
+
+
+git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 7026 c046a42c-6fe2-441c-8c8c-71466251a162
 ---
- qemu/hw/cirrus_vga.c |   10 ++-
- qemu/hw/vga.c        |  205 +++++++++++++++++++++++++++++--------------------
- qemu/hw/vga_int.h    |    4 +
- 3 files changed, 134 insertions(+), 85 deletions(-)
+ qemu/hw/vga.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c
-index 0ab0f14..7bd0482 100644
---- a/qemu/hw/cirrus_vga.c
-+++ b/qemu/hw/cirrus_vga.c
-@@ -1399,6 +1399,8 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value)
- 	break;
-     }
- 
-+    vga_update_resolution((VGAState *)s);
-+
-     return CIRRUS_HOOK_HANDLED;
- }
- 
-@@ -1426,6 +1428,7 @@ static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value)
- #endif
-     }
-     s->cirrus_hidden_dac_lockindex = 0;
-+    vga_update_resolution((VGAState *)s);
- }
- 
- /***************************************
-@@ -1712,6 +1715,8 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value)
- 	break;
-     }
- 
-+    vga_update_resolution((VGAState *)s);
-+
-     return CIRRUS_HOOK_HANDLED;
- }
- 
-@@ -2839,6 +2844,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
- 	if (s->ar_flip_flop == 0) {
- 	    val &= 0x3f;
- 	    s->ar_index = val;
-+            vga_update_resolution((VGAState *)s);
- 	} else {
- 	    index = s->ar_index & 0x1f;
- 	    switch (index) {
-@@ -2932,6 +2938,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
- 	    /* can always write bit 4 of CR7 */
- 	    if (s->cr_index == 7)
- 		s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10);
-+            vga_update_resolution((VGAState *)s);
- 	    return;
- 	}
- 	switch (s->cr_index) {
-@@ -3166,7 +3173,8 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id)
- 
-     cirrus_update_memory_access(s);
-     /* force refresh */
--    s->graphic_mode = -1;
-+    vga_update_resolution((VGAState *)s);
-+    s->want_full_update = 1;
-     cirrus_update_bank_ptr(s, 0);
-     cirrus_update_bank_ptr(s, 1);
-     return 0;
 diff --git a/qemu/hw/vga.c b/qemu/hw/vga.c
-index d4fddf9..9a950d3 100644
+index b1e4373..4d1049b 100644
 --- a/qemu/hw/vga.c
 +++ b/qemu/hw/vga.c
-@@ -37,6 +37,10 @@
- 
- //#define DEBUG_BOCHS_VBE
- 
-+#define GMODE_TEXT     0
-+#define GMODE_GRAPH    1
-+#define GMODE_BLANK 2
-+
- /* force some bits to zero */
- const uint8_t sr_mask[8] = {
-     (uint8_t)~0xfc,
-@@ -394,6 +398,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
-         if (s->ar_flip_flop == 0) {
-             val &= 0x3f;
-             s->ar_index = val;
-+            vga_update_resolution(s);
-         } else {
-             index = s->ar_index & 0x1f;
-             switch(index) {
-@@ -434,6 +439,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
- #endif
-         s->sr[s->sr_index] = val & sr_mask[s->sr_index];
-         if (s->sr_index == 1) s->update_retrace_info(s);
-+        vga_update_resolution(s);
-         break;
-     case 0x3c7:
-         s->dac_read_index = val;
-@@ -461,6 +467,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
-         printf("vga: write GR%x = 0x%02x\n", s->gr_index, val);
- #endif
-         s->gr[s->gr_index] = val & gr_mask[s->gr_index];
-+        vga_update_resolution(s);
-         break;
-     case 0x3b4:
-     case 0x3d4:
-@@ -476,6 +483,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
-             /* can always write bit 4 of CR7 */
-             if (s->cr_index == 7)
-                 s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10);
-+            vga_update_resolution(s);
-             return;
-         }
-         switch(s->cr_index) {
-@@ -503,6 +511,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
-             s->update_retrace_info(s);
-             break;
-         }
-+        vga_update_resolution(s);
-         break;
-     case 0x3ba:
-     case 0x3da:
-@@ -582,11 +591,13 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
-             if ((val <= VBE_DISPI_MAX_XRES) && ((val & 7) == 0)) {
-                 s->vbe_regs[s->vbe_index] = val;
-             }
-+            vga_update_resolution(s);
-             break;
-         case VBE_DISPI_INDEX_YRES:
-             if (val <= VBE_DISPI_MAX_YRES) {
-                 s->vbe_regs[s->vbe_index] = val;
-             }
-+            vga_update_resolution(s);
-             break;
-         case VBE_DISPI_INDEX_BPP:
-             if (val == 0)
-@@ -595,6 +606,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
-                 val == 16 || val == 24 || val == 32) {
-                 s->vbe_regs[s->vbe_index] = val;
-             }
-+            vga_update_resolution(s);
-             break;
-         case VBE_DISPI_INDEX_BANK:
-             if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) {
-@@ -663,6 +675,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
-             }
-             s->dac_8bit = (val & VBE_DISPI_8BIT_DAC) > 0;
-             s->vbe_regs[s->vbe_index] = val;
-+            vga_update_resolution(s);
-             break;
-         case VBE_DISPI_INDEX_VIRT_WIDTH:
-             {
-@@ -683,6 +696,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
-                 s->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = h;
-                 s->vbe_line_offset = line_offset;
-             }
-+            vga_update_resolution(s);
-             break;
-         case VBE_DISPI_INDEX_X_OFFSET:
-         case VBE_DISPI_INDEX_Y_OFFSET:
-@@ -697,6 +711,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
-                     s->vbe_start_addr += x * ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3);
-                 s->vbe_start_addr >>= 2;
-             }
-+            vga_update_resolution(s);
-             break;
-         default:
-             break;
-@@ -1300,7 +1315,6 @@ static void vga_draw_text(VGAState *s, int full_update)
-         s->plane_updated = 0;
-         full_update = 1;
-     }
--    full_update |= update_basic_params(s);
- 
-     line_offset = s->line_offset;
-     s1 = s->vram_ptr + (s->start_addr * 4);
-@@ -1312,18 +1326,6 @@ static void vga_draw_text(VGAState *s, int full_update)
-         return;
-     }
- 
--    if (width != s->last_width || height != s->last_height ||
--        cw != s->last_cw || cheight != s->last_ch || s->last_depth) {
--        s->last_scr_width = width * cw;
--        s->last_scr_height = height * cheight;
--        qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height);
--        s->last_depth = 0;
--        s->last_width = width;
--        s->last_height = height;
--        s->last_ch = cheight;
--        s->last_cw = cw;
--        full_update = 1;
--    }
-     s->rgb_to_pixel =
-         rgb_to_pixel_dup_table[get_depth_index(s->ds)];
-     full_update |= update_palette16(s);
-@@ -1580,40 +1582,20 @@ static void vga_sync_dirty_bitmap(VGAState *s)
-     vga_dirty_log_start(s);
- }
- 
--/*
-- * graphic modes
-- */
--static void vga_draw_graphic(VGAState *s, int full_update)
-+static void vga_update_resolution_graphics(VGAState *s)
- {
--    int y1, y, update, linesize, y_start, double_scan, mask, depth;
--    int width, height, shift_control, line_offset, bwidth, bits;
-+    int depth = s->get_bpp(s);
-+    int width, height, shift_control, double_scan;
-     int disp_width, multi_scan, multi_run;
--    uint8_t *d;
--    uint32_t v, addr1, addr;
--    long page0, page1, page_min, page_max;
--    vga_draw_line_func *vga_draw_line;
--
--    full_update |= update_basic_params(s);
--
--    if (!full_update)
--        vga_sync_dirty_bitmap(s);
- 
-     s->get_resolution(s, &width, &height);
--    disp_width = width;
- 
-     shift_control = (s->gr[0x05] >> 5) & 3;
-     double_scan = (s->cr[0x09] >> 7);
--    if (shift_control != 1) {
--        multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1;
--    } else {
--        /* in CGA modes, multi_scan is ignored */
--        /* XXX: is it correct ? */
--        multi_scan = double_scan;
--    }
--    multi_run = multi_scan;
-+
-     if (shift_control != s->shift_control ||
-         double_scan != s->double_scan) {
--        full_update = 1;
-+        s->want_full_update = 1;
-         s->shift_control = shift_control;
-         s->double_scan = double_scan;
-     }
-@@ -1627,12 +1609,25 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-             disp_width <<= 1;
-         }
-     }
-+    disp_width = width;
-+
-+    if (shift_control != 1) {
-+        multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1;
-+    } else {
-+        /* in CGA modes, multi_scan is ignored */
-+        /* XXX: is it correct ? */
-+        multi_scan = double_scan;
-+    }
-+
-+    multi_run = multi_scan;
- 
--    depth = s->get_bpp(s);
-     if (s->line_offset != s->last_line_offset ||
-         disp_width != s->last_width ||
-         height != s->last_height ||
--        s->last_depth != depth) {
-+        s->last_depth != depth ||
-+        s->multi_run != multi_run ||
-+        s->multi_scan != multi_scan ||
-+        s->want_full_update) {
- #if defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
-         if (depth == 16 || depth == 32) {
- #else
-@@ -1659,8 +1654,74 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-         s->last_height = height;
-         s->last_line_offset = s->line_offset;
-         s->last_depth = depth;
--        full_update = 1;
--    } else if (is_graphic_console() && is_buffer_shared(s->ds->surface) &&
-+        s->multi_run = multi_run;
-+        s->multi_scan = multi_scan;
-+        s->want_full_update = 1;
-+    }
-+}
-+
-+static void vga_update_resolution_text(VGAState *s)
-+{
-+    int width, height, cw, cheight;
-+
-+    vga_get_text_resolution(s, &width, &height, &cw, &cheight);
-+    if (width != s->last_width || height != s->last_height ||
-+        cw != s->last_cw || cheight != s->last_ch || s->last_depth) {
-+        s->last_scr_width = width * cw;
-+        s->last_scr_height = height * cheight;
-+        qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height);
-+        s->last_depth = 0;
-+        s->last_width = width;
-+        s->last_height = height;
-+        s->last_ch = cheight;
-+        s->last_cw = cw;
-+        s->want_full_update = 1;
-+    }
-+}
-+
-+void vga_update_resolution(VGAState *s)
-+{
-+    int graphic_mode;
-+
-+    if (!(s->ar_index & 0x20)) {
-+        graphic_mode = GMODE_BLANK;
-+    } else {
-+        graphic_mode = s->gr[6] & 1;
-+    }
-+    if (graphic_mode != s->graphic_mode) {
-+        s->graphic_mode = graphic_mode;
-+        s->want_full_update = 1;
-+    }
-+    s->want_full_update |= update_basic_params(s);
-+    switch (graphic_mode) {
-+    case GMODE_TEXT:
-+        vga_update_resolution_text(s);
-+        break;
-+    case GMODE_GRAPH:
-+        vga_update_resolution_graphics(s);
-+        break;
-+    }
-+}
-+
-+/*
-+ * graphic modes
-+ */
-+static void vga_draw_graphic(VGAState *s, int full_update)
-+{
-+    int y1, y, update, linesize, y_start, mask;
-+    int width, height, line_offset, bwidth, bits;
-+    int multi_run;
-+    uint8_t *d;
-+    uint32_t v, addr1, addr;
-+    long page0, page1, page_min, page_max;
-+    vga_draw_line_func *vga_draw_line;
-+
-+    if (!full_update)
-+        vga_sync_dirty_bitmap(s);
-+
-+    s->get_resolution(s, &width, &height);
-+    multi_run = s->multi_run;
-+    if (is_graphic_console() && is_buffer_shared(s->ds->surface) &&
-                (full_update || s->ds->surface->data != s->vram_ptr + (s->start_addr * 4))) {
-         s->ds->surface->data = s->vram_ptr + (s->start_addr * 4);
-         dpy_setdata(s->ds);
-@@ -1669,7 +1730,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-     s->rgb_to_pixel =
-         rgb_to_pixel_dup_table[get_depth_index(s->ds)];
- 
--    if (shift_control == 0) {
-+    if (s->shift_control == 0) {
-         full_update |= update_palette16(s);
-         if (s->sr[0x01] & 8) {
-             v = VGA_DRAW_LINE4D2;
-@@ -1677,7 +1738,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-             v = VGA_DRAW_LINE4;
-         }
-         bits = 4;
--    } else if (shift_control == 1) {
-+    } else if (s->shift_control == 1) {
-         full_update |= update_palette16(s);
-         if (s->sr[0x01] & 8) {
-             v = VGA_DRAW_LINE2D2;
-@@ -1773,7 +1834,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-             if (y_start >= 0) {
-                 /* flush to display */
-                 dpy_update(s->ds, 0, y_start,
--                           disp_width, y - y_start);
-+                           s->last_width, y - y_start);
-                 y_start = -1;
-             }
-         }
-@@ -1782,7 +1843,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-             if ((y1 & mask) == mask)
-                 addr1 += line_offset;
-             y1++;
--            multi_run = multi_scan;
-+            multi_run = s->multi_scan;
-         } else {
-             multi_run--;
-         }
-@@ -1794,7 +1855,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-     if (y_start >= 0) {
-         /* flush to display */
-         dpy_update(s->ds, 0, y_start,
--                   disp_width, y - y_start);
-+                   s->last_width, y - y_start);
-     }
-     /* reset modified pages */
-     if (page_max != -1) {
-@@ -1831,29 +1892,17 @@ static void vga_draw_blank(VGAState *s, int full_update)
-                s->last_scr_width, s->last_scr_height);
- }
- 
--#define GMODE_TEXT     0
--#define GMODE_GRAPH    1
--#define GMODE_BLANK 2
--
- static void vga_update_display(void *opaque)
- {
-     VGAState *s = (VGAState *)opaque;
--    int full_update, graphic_mode;
-+    int full_update;
- 
-     if (ds_get_bits_per_pixel(s->ds) == 0) {
-         /* nothing to do */
-     } else {
--        full_update = 0;
--        if (!(s->ar_index & 0x20)) {
--            graphic_mode = GMODE_BLANK;
--        } else {
--            graphic_mode = s->gr[6] & 1;
--        }
--        if (graphic_mode != s->graphic_mode) {
--            s->graphic_mode = graphic_mode;
--            full_update = 1;
--        }
--        switch(graphic_mode) {
-+        full_update = s->want_full_update;
-+        s->want_full_update = 0;
-+        switch(s->graphic_mode) {
-         case GMODE_TEXT:
-             vga_draw_text(s, full_update);
-             break;
-@@ -1876,8 +1925,8 @@ static void vga_invalidate_display(void *opaque)
- {
-     VGAState *s = (VGAState *)opaque;
- 
--    s->last_width = -1;
--    s->last_height = -1;
-+    vga_update_resolution(s);
-+    s->want_full_update = 1;
- }
- 
- void vga_reset(void *opaque)
-@@ -1921,7 +1970,6 @@ void vga_reset(void *opaque)
-     s->vbe_bank_mask = (s->vram_size >> 16) - 1;
- #endif
-     memset(s->font_offsets, '\0', sizeof(s->font_offsets));
--    s->graphic_mode = -1; /* force full update */
-     s->shift_control = 0;
-     s->double_scan = 0;
-     s->line_offset = 0;
-@@ -1947,6 +1995,7 @@ void vga_reset(void *opaque)
-         memset(&s->retrace_info, 0, sizeof (s->retrace_info));
-         break;
-     }
-+    vga_update_resolution(s);
- }
- 
- #define TEXTMODE_X(x)	((x) % width)
-@@ -1965,24 +2014,9 @@ static void vga_update_text(void *opaque, console_ch_t *chardata)
-     char msg_buffer[80];
-     int full_update = 0;
- 
--    if (!(s->ar_index & 0x20)) {
--        graphic_mode = GMODE_BLANK;
--    } else {
--        graphic_mode = s->gr[6] & 1;
--    }
--    if (graphic_mode != s->graphic_mode) {
--        s->graphic_mode = graphic_mode;
--        full_update = 1;
--    }
--    if (s->last_width == -1) {
--        s->last_width = 0;
--        full_update = 1;
--    }
--
-     switch (graphic_mode) {
-     case GMODE_TEXT:
-         /* TODO: update palette */
--        full_update |= update_basic_params(s);
- 
-         /* total width & height */
-         cheight = (s->cr[9] & 0x1f) + 1;
-@@ -2224,7 +2258,8 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id)
- #endif
- 
-     /* force refresh */
--    s->graphic_mode = -1;
-+    vga_update_resolution(s);
-+    s->want_full_update = 1;
-     return 0;
- }
- 
-@@ -2418,7 +2453,8 @@ void vga_bios_init(VGAState *s)
-     memcpy(s->palette, palette_model, 192);
- 
-     s->bank_offset = 0;
--    s->graphic_mode = -1;
-+    vga_update_resolution(s);
-+    s->want_full_update = 1;
- 
-     /* TODO: add vbe support if enabled */
+@@ -2678,4 +2678,5 @@ static void vga_screen_dump(void *opaque, const char *filename)
+         vga_screen_dump_graphic(s, filename);
+     else
+         vga_screen_dump_text(s, filename);
++    vga_invalidate_display(s);
  }
-@@ -2803,7 +2839,8 @@ static void vga_screen_dump_common(VGAState *s, const char *filename,
-     ds->surface = qemu_create_displaysurface(w, h, 32, 4 * w);
- 
-     s->ds = ds;
--    s->graphic_mode = -1;
-+    vga_update_resolution(s);
-+    s->want_full_update = 1;
-     vga_update_display(s);
- 
-     ppm_save(filename, ds->surface);
-diff --git a/qemu/hw/vga_int.h b/qemu/hw/vga_int.h
-index 8ba8a60..71ffeb5 100644
---- a/qemu/hw/vga_int.h
-+++ b/qemu/hw/vga_int.h
-@@ -147,8 +147,11 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s);
-     DisplayState *ds;                                                   \
-     uint32_t font_offsets[2];                                           \
-     int graphic_mode;                                                   \
-+    int want_full_update;                                               \
-     uint8_t shift_control;                                              \
-     uint8_t double_scan;                                                \
-+    uint8_t multi_run;                                                  \
-+    uint8_t multi_scan;                                                 \
-     uint32_t line_offset;                                               \
-     uint32_t line_compare;                                              \
-     uint32_t start_addr;                                                \
-@@ -195,6 +198,7 @@ void vga_common_init(VGAState *s, uint8_t *vga_ram_base,
-                      ram_addr_t vga_ram_offset, int vga_ram_size);
- void vga_init(VGAState *s);
- void vga_reset(void *s);
-+void vga_update_resolution(VGAState *s);
- 
- void vga_dirty_log_start(VGAState *s);
- void vga_dirty_log_stop(VGAState *s);
 -- 
 1.6.0.6
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- qemu.spec	5 Apr 2009 18:23:20 -0000	1.76
+++ qemu.spec	9 Apr 2009 15:08:34 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -457,6 +457,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Apr  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-7
+- Add a much cleaner fix for vga segfault (#494002)
+
 * Sun Apr  5 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-6
 - Fixed qcow2 segfault creating disks over 2TB. #491943
 



From wcohen at fedoraproject.org  Thu Apr  9 15:12:22 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu,  9 Apr 2009 15:12:22 +0000 (UTC)
Subject: rpms/oprofile/F-10 oprofile-basename.patch, NONE, 1.1 oprofile.spec,
	1.72, 1.73
Message-ID: <20090409151222.93D4D7001C@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7966

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-basename.patch 
Log Message:
Rebuild to get corrected <bfd.h>. (BZ 467651)


oprofile-basename.patch:

--- NEW FILE oprofile-basename.patch ---
diff -up oprofile-0.9.4/configure.in.basename oprofile-0.9.4/configure.in
--- oprofile-0.9.4/configure.in.basename	2009-04-08 13:43:42.000000000 -0400
+++ oprofile-0.9.4/configure.in	2009-04-08 13:43:45.000000000 -0400
@@ -15,6 +15,7 @@ AC_INIT(libop/op_config.h)
 AM_INIT_AUTOMAKE(oprofile, 0.9.4)
 AM_CONFIG_HEADER(config.h)
 
+AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]])
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- oprofile.spec	29 Sep 2008 18:37:49 -0000	1.72
+++ oprofile.spec	9 Apr 2009 15:11:52 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -14,6 +14,7 @@
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
 #Patch100: oprofile-gcc43.patch
+Patch101: oprofile-basename.patch
 URL: http://oprofile.sf.net
 
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
@@ -82,6 +83,7 @@
 %patch63 -p1 -b .libs
 %patch83 -p1 -b .xen
 #%patch100 -p1 -b .gcc43
+%patch101 -p1 -b .basename
 
 ./autogen.sh
 
@@ -223,6 +225,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Apr 9 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-6
+- Rebuild to get corrected <bfd.h>. (BZ 467651)
+
 * Mon Sep 29 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.4-3
 - build sparcv9 not sparc
 



From crobinso at fedoraproject.org  Thu Apr  9 15:12:25 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  9 Apr 2009 15:12:25 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.400.3-fix-floppy-dev.patch,
	NONE, 1.1 virtinst-0.400.3-no-default-keymap.patch, NONE,
	1.1 virtinst-0.400.3-updated-trans.patch, NONE,
	1.1 python-virtinst.spec, 1.63,
	1.64 virtinst-0.400.3-selinux-context.patch, 1.2, 1.3
Message-ID: <20090409151225.CA13D7001C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8069

Modified Files:
	python-virtinst.spec virtinst-0.400.3-selinux-context.patch 
Added Files:
	virtinst-0.400.3-fix-floppy-dev.patch 
	virtinst-0.400.3-no-default-keymap.patch 
	virtinst-0.400.3-updated-trans.patch 
Log Message:
Don't set a keymap if user doesn't specify one (bz 487737)
Fix adding floppy devices (bz 493408)
Updated translations (bz 493944, bz 494358)


virtinst-0.400.3-fix-floppy-dev.patch:

--- NEW FILE virtinst-0.400.3-fix-floppy-dev.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1237498550 14400
# Node ID fd4baa6410d841f137ea89290c1a8da33c00c3c9
# Parent  a55347f926f5cfdcfd9b5234b945ec279190c513
Fix specifying --disk device=floppy

diff -r a55347f926f5 -r fd4baa6410d8 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Thu Mar 19 17:35:27 2009 -0400
+++ b/virtinst/FullVirtGuest.py	Thu Mar 19 17:35:50 2009 -0400
@@ -113,7 +113,10 @@
         used_targets = []
         for disk in self._install_disks:
             if not disk.bus:
-                disk.bus = "ide"
+                if disk.device == disk.DEVICE_FLOPPY:
+                    disk.bus = "fdc"
+                else:
+                    disk.bus = "ide"
             used_targets.append(disk.generate_target(used_targets))
 
         for d in self._install_disks:
diff -r a55347f926f5 -r fd4baa6410d8 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Thu Mar 19 17:35:27 2009 -0400
+++ b/virtinst/VirtualDisk.py	Thu Mar 19 17:35:50 2009 -0400
@@ -813,10 +813,10 @@
             return ("sd", 16)
         elif self.bus == "xen":
             return ("xvd", 16)
+        elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY:
+            return ("fd", 2)
         elif self.bus == "ide":
             return ("hd", 4)
-        elif self.bus == "floppy" or self.device == self.DEVICE_FLOPPY:
-            return ("fd", 2)
         else:
             return (None, None)
 

virtinst-0.400.3-no-default-keymap.patch:

--- NEW FILE virtinst-0.400.3-no-default-keymap.patch ---
diff -r 712276328f75 virtinst/VirtualGraphics.py
--- a/virtinst/VirtualGraphics.py	Wed Apr 08 10:27:20 2009 -0400
+++ b/virtinst/VirtualGraphics.py	Thu Apr 09 09:48:36 2009 -0400
@@ -55,8 +55,9 @@
     def get_keymap(self):
         return self._keymap
     def set_keymap(self, val):
-        if not val:
-            val = _util.default_keymap()
+        if val == None:
+            self._keymap = val
+            return
         if not val or type(val) != type("string"):
             raise ValueError, _("Keymap must be a string")
         if len(val) > 16:

virtinst-0.400.3-updated-trans.patch:

--- NEW FILE virtinst-0.400.3-updated-trans.patch ---
diff -rup virtinst-0.400.3/po/es.po new/po/es.po
--- virtinst-0.400.3/po/es.po	2009-04-09 10:38:31.403059000 -0400
+++ new/po/es.po	2009-04-09 10:38:56.365058000 -0400
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Fedora Spanish Translation of virtinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 14:00-0400\n"
+"POT-Creation-Date: 2009-04-09 10:38-0400\n"
 "PO-Revision-Date: 2009-01-20 13:06-0300\n"
 "Last-Translator: h??ctor daniel cabrera <h.daniel.cabrera at gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
@@ -15,1419 +15,2136 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: virt-clone:45
-msgid "What is the name for the cloned virtual machine?"
-msgstr "??Cu??l es el nombre de la m??quina virtual clonada?"
+#: virtinst/CapabilitiesParser.py:172
+#, fuzzy, python-format
+msgid "No domains available for virt type '%(type)s', arch %(arch)s."
+msgstr "No existen dominios disponibles para este hu??sped."
 
-#: virt-clone:50
-#: virt-clone:60
-#: virt-clone:89
-#: virtinst/cli.py:175
-msgid "ERROR: "
-msgstr "ERROR:"
+#: virtinst/CapabilitiesParser.py:412
+#, python-format
+msgid "for arch '%s'"
+msgstr "para arq '%s'"
 
-#: virt-clone:55
-msgid "What is the name or uuid of the original virtual machine?"
-msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?"
+#: virtinst/CapabilitiesParser.py:416
+#, fuzzy, python-format
+msgid "virtualization type '%s'"
+msgstr "Tipo de virtualizaci??n '%s' no soportada"
 
-#: virt-clone:83
-msgid "What would you like to use as the cloned disk (file path)?"
-msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?"
+#: virtinst/CapabilitiesParser.py:418
+#, fuzzy
+msgid "any virtualization options"
+msgstr "Opciones del Tipo de Virtualizaci??n"
 
-#: virt-clone:94
+#: virtinst/CapabilitiesParser.py:420
 #, python-format
-msgid "This will overwrite the existing path '%s'!\n"
-msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n"
-
-#: virt-clone:96
-msgid "Do you really want to use this disk (yes or no)?"
-msgstr "??Realmente quiere utilizar este disco (si o no)?"
+msgid "Host does not support %(virttype)s %(arch)s"
+msgstr ""
 
-#: virt-clone:102
-#: virt-install:202
+#: virtinst/CapabilitiesParser.py:433
 #, python-format
-msgid "Disk %s is already in use by another guest!\n"
-msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n"
+msgid ""
+"Host does not support domain type '%(domain)s' for virtualization type '%"
+"(virttype)s' arch '%(arch)s'"
+msgstr ""
 
-#: virt-clone:103
-#: virt-install:203
-msgid "Do you really want to use the disk (yes or no)? "
-msgstr "??Realmente quiere utilizar el disco (si o no)?"
+#: virtinst/cli.py:117
+msgid "Exiting at user request."
+msgstr "Saliendo a pedido del usuario."
 
-#: virt-clone:132
-msgid "Name or uuid for the original guest; The status must be shut off"
-msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado"
+#: virtinst/cli.py:122
+msgid "Must be root to create Xen guests"
+msgstr "Debe ser root para poder crear un hu??sped Xen"
 
-#: virt-clone:136
-msgid "Name for the new guest"
-msgstr "Nombre para el nuevo hu??sped"
+#: virtinst/cli.py:124
+msgid "Could not find usable default libvirt connection."
+msgstr ""
+"No se ha podido encontrar una conexi??n por defecto libvirt que sea "
+"utilizable. "
 
-#: virt-clone:141
-msgid "New UUID for the clone guest; Default is a randomly generated UUID"
-msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID"
+#: virtinst/cli.py:146
+#, python-format
+msgid "Force flag is set but input was required. Prompt was: %s"
+msgstr ""
+"Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %"
+"s "
 
-#: virt-clone:146
-msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC"
-msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC "
+#: virtinst/cli.py:149
+#, python-format
+msgid "Prompting disabled, but input was requested. Prompt was: %s"
+msgstr ""
+"Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %"
+"s "
 
-#: virt-clone:151
-msgid "New file to use as the disk image for the new guest"
-msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped"
+#: virtinst/cli.py:169
+#, python-format
+msgid ""
+"Prompting disabled, but yes/no was requested. Try --force to force 'yes' for "
+"such prompts. Prompt was: %s"
+msgstr ""
+"Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente "
+"--force para forzar un \"si\" para este tipo de peticiones. Se pide: %s"
 
-#: virt-clone:155
-#: virt-image:128
-#: virt-install:317
-msgid "Connect to hypervisor with URI"
-msgstr "Conectar al hipervisor con URI"
+#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108
+msgid "ERROR: "
+msgstr "ERROR:"
 
-#: virt-clone:161
-msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)"
-msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)"
+#: virtinst/cli.py:189
+msgid "A name is required for the virtual machine."
+msgstr "Se requiere un nombre para la m??quina virtual."
 
-#: virt-clone:166
-msgid "Do not use a sparse file for the clone's disk image"
-msgstr "No utilice un archivo separado para la imagen del disco de lo clonado"
+#: virtinst/cli.py:197
+msgid "Memory amount is required for the virtual machine."
+msgstr "Se requiere una cantidad de memoria para la m??quina virtual."
 
-#: virt-clone:171
-msgid "Preserve a new file to use as the disk image for the new guest"
-msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped "
+#: virtinst/cli.py:199
+#, python-format
+msgid "Installs currently require %d megs of RAM."
+msgstr "La instalaci??n actualmente requiere %d megas de RAM."
 
-#: virt-clone:175
-#: virt-image:137
-#: virt-install:447
-#: virt-pack:109
-msgid "Print debugging information"
-msgstr "Mostrar informaci??n de depuraci??n"
+#: virtinst/cli.py:219
+#, python-format
+msgid ""
+"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
+"on the host. This will work, but performance will be poor. Are you sure? "
+"(yes or no)"
+msgstr ""
+"Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. "
+"Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)"
 
-#: virt-clone:177
-#: virt-image:143
-msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts"
-msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada"
+#: virtinst/cli.py:276
+msgid "Unknown network type "
+msgstr "Tipo de red desconocido"
 
-#: virt-clone:194
-msgid "Must be root to clone Xen guests"
-msgstr "Debe ser root para poder clonar hu??spedes Xen"
+#: virtinst/cli.py:293
+msgid "Cannot mix both --bridge and --network arguments"
+msgstr "No se pueden mezclar los argumentos de --bridge y de --network"
 
-#: virt-clone:229
-#: virt-image:242
-#: virt-install:697
-msgid "Installation aborted at user request"
-msgstr "Instalaci??n abortada a pedido del usuario"
+#: virtinst/cli.py:310
+msgid "Need to pass equal numbers of networks & mac addresses"
[...14182 lines suppressed...]
 "\n"
@@ -1868,7 +1834,7 @@ msgstr ""
 "\n"
 "????????????......"
 
-#: virt-install:682 virt-install.orig:682
+#: virt-install:682
 #, python-format
 msgid ""
 "Domain installation does not appear to have been\n"
@@ -1881,7 +1847,7 @@ msgstr ""
 "??????????????????????????????\n"
 "??????????????????"
 
-#: virt-install:693 virt-install.orig:693
+#: virt-install:693
 #, python-format
 msgid ""
 "Guest installation complete... you can restart your domain\n"
@@ -1890,16 +1856,15 @@ msgstr ""
 "?????????????????????......???????????????\n"
 " 'virsh start %s' ???????????????"
 
-#: virt-install:697 virt-install.orig:697
+#: virt-install:697
 msgid "Guest installation complete... restarting guest."
 msgstr "?????????????????????......???????????????"
 
-#: virt-install:703 virt-install.orig:703
-#, fuzzy
+#: virt-install:703
 msgid "Guest install interrupted."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
-#: virt-install:710 virt-install.orig:710
+#: virt-install:710
 #, python-format
 msgid ""
 "Domain installation may not have been\n"
@@ -1912,144 +1877,39 @@ msgstr ""
 "??????????????????????????????\n"
 "??????????????????"
 
-#: virt-install:736 virt-install.orig:736
-#, fuzzy
+#: virt-install:736
 msgid "Guest installation failed."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
-#: virt-install:746 virt-install.orig:746
-#, fuzzy, python-format
+#: virt-install:746
+#, python-format
 msgid "%d minutes "
-msgstr " %d ??????"
+msgstr "%d ??????"
 
-#: virt-install:748 virt-install.orig:748
-#, fuzzy, python-format
+#: virt-install:748
+#, python-format
 msgid ""
 "Domain installation still in progress. Waiting %sfor domain to complete "
 "installation."
-msgstr ""
-"?????????????????????????????????????????????\n"
-"???????????????????????????????????????"
+msgstr "????????????????????????????????? %s ??????????????????"
 
-#: virt-install:754 virt-install.orig:754
+#: virt-install:754
 msgid "Domain has shutdown. Continuing."
 msgstr "???????????????????????????......"
 
-#: virt-install:761 virt-install.orig:761
-#, fuzzy, python-format
+#: virt-install:761
+#, python-format
 msgid "Could not lookup domain after install: %s"
-msgstr "????????????????????????%s"
+msgstr "???????????????????????????%s"
 
-#: virt-install:768 virt-install.orig:768
-#, fuzzy
+#: virt-install:768
 msgid "Installation has exceeded specified time limit. Exiting application."
-msgstr "??????????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: virt-install:772 virt-install.orig:772
+#: virt-install:772
 msgid ""
 "Domain installation still in progress. You can reconnect to \n"
 "the console to complete the installation process."
 msgstr ""
 "?????????????????????????????????????????????\n"
 "???????????????????????????????????????"
-
-#~ msgid "Name or UUID of guest to clone is required"
-#~ msgstr "?????????????????????????????????????????? UUID"
-
-#~ msgid "A valid name or UUID of guest to clone is required"
-#~ msgstr "???????????????????????????????????????????????? UUID"
-
-#~ msgid "New file to use for disk image is required"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Domain status must be SHUTOFF"
-#~ msgstr "?????????????????? SHUTOFF"
-
-#~ msgid "Domain %s already exists"
-#~ msgstr "??? %s ?????????"
-
-#, fuzzy
-#~ msgid "Cloning from %(src)s to %(dst)s..."
-#~ msgstr "??? %(src)s ????????? %(dst)s"
-
-#~ msgid "Invalid file location given: "
-#~ msgstr "??????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid file location given: %s: %s"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD"
-#~ msgstr "??????????????? HVM ???????????????????????? live CD???"
-
-#~ msgid "Storage object name must be a string "
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Storage object name can not be only "
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Storage object name can only contain "
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "'%s' is not managed on remote host: %s"
-#~ msgstr "???????????????????????? '%s'???%s"
-
-#~ msgid "Cannot parse capabilities"
-#~ msgstr "??????????????????"
-
-#~ msgid "Only one of --pxe, --location and --cdrom can be used"
-#~ msgstr "???????????? --pxe???--location ??? --cdrom ??????"
-
-#~ msgid "location must be specified for paravirtualized guests."
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Domain installation still in progress. Waiting"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid ""
-#~ "UUID for the guest; if none is given a random UUID will be generated. If "
-#~ "you specify UUID, you should use a 32-digit hexadecimal number."
-#~ msgstr ""
-#~ "???????????? UUID??????????????????????????????????????? UUID??????????????? UUID?????????????????? "
-#~ "32 ????????????????????????"
-
-#~ msgid ""
-#~ "Total time to wait for VM to shutdown if console not present. Time less "
-#~ "than 0 waits indefinitely."
-#~ msgstr "?????????????????????????????? VM ??????????????????????????????????????? 0 ?????????????????????"
-
-#~ msgid "The image name and version must be present"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Scratch disk %s does not have a size attribute"
-#~ msgstr "????????? %s ??????????????????"
-
-#~ msgid "Disk file %s could not be found"
-#~ msgstr "???????????????????????? %s"
-
-#~ msgid "Writing %s"
-#~ msgstr "?????? %s"
-
-#~ msgid "Directory in which packaged file will be put"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "The image descriptor must contain name and version"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Validation failed: %s"
-#~ msgstr "???????????????%s"
-
-#~ msgid "Packaging failed: %s"
-#~ msgstr "???????????????%s"
-
-#~ msgid "Cloning domain..."
-#~ msgstr "?????????......"
-
-#~ msgid "NFS installations are only supported as root"
-#~ msgstr "???????????????????????? NFS ??????"
-
-#~ msgid "Verifying install location..."
-#~ msgstr "??????????????????......"
-
-#~ msgid "Unsupported virtualization type"
-#~ msgstr "???????????????????????????"


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- python-virtinst.spec	3 Apr 2009 18:24:57 -0000	1.63
+++ python-virtinst.spec	9 Apr 2009 15:11:55 -0000	1.64
@@ -23,6 +23,12 @@
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
 Patch3: %{appname}-%{version}-spanish-trans.patch
 Patch4: %{appname}-%{version}-selinux-context.patch
+# Rawhide/F11 can auto detect keymapping (bz 487735)
+Patch5: %{appname}-%{version}-no-default-keymap.patch
+# Fix generating device name for floppy device (bz 493408)
+Patch6: %{appname}-%{version}-fix-floppy-dev.patch
+# F11 Translations (bz 493944 and bz 494358)
+Patch7: %{appname}-%{version}-updated-trans.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +43,7 @@
 Requires: urlgrabber
 Requires: libxml2-python
 Requires: python-urlgrabber
+Requires: libselinux-python
 BuildRequires: gettext
 BuildRequires: python-devel
 
@@ -52,6 +59,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 python setup.py build
@@ -87,10 +97,15 @@
 %{_bindir}/virt-convert
 
 %changelog
-* Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.4-fc11
+* Thu Apr 9 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-5.fc11
+- Don't set a keymap if user doesn't specify one (bz 487737)
+- Fix adding floppy devices (bz 493408)
+- Updated translations (bz 493944, bz 494358)
+
+* Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.3-4.fc11
 - Attempt to fix SELinux labelling on CDROM ISOs used for installation
 
-* Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.3-fc11
+* Fri Apr  3 2009 Daniel P. Berrange <berrange at redhat.com> - 0.400.3-3.fc11
 - Set SELinux context on $HOME/.virtinst to make kernel/initrd boot work (rhbz #491052)
 
 * Mon Mar 23 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-2.fc11

virtinst-0.400.3-selinux-context.patch:

Index: virtinst-0.400.3-selinux-context.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/virtinst-0.400.3-selinux-context.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- virtinst-0.400.3-selinux-context.patch	3 Apr 2009 18:24:57 -0000	1.2
+++ virtinst-0.400.3-selinux-context.patch	9 Apr 2009 15:11:55 -0000	1.3
@@ -32,11 +32,11 @@
 +            self.parseXML(node)
 +
 +    def parseXML(self, node):
-+        child = node.children
-+        if child.name == "model":
-+            self.model = child.content
-+        elif cihld.name == "doi":
-+            self.doi == child.content
++        for child in node.children or []:
++           if child.name == "model":
++                self.model = child.content
++           elif child.name == "doi":
++                self.doi = child.content
 +
  class Capabilities(object):
      def __init__(self, node = None):
@@ -116,8 +116,8 @@
 +        if self.device != VirtualDisk.DEVICE_CDROM:
 +            return
 +
-+        caps = parseCapabilities(self.conn.getCapabilities())
-+        if caps.host.secmodel is None:
++        caps = self._caps
++        if not caps or caps.host.secmodel is None:
 +            logging.info("No security model active")
 +            return
 +        if caps.host.secmodel.model != "selinux":
@@ -134,7 +134,7 @@
 +                logging.info("Labelling is correct")
 +                return
 +
-+            if _util.is_uri_remote(self.conn.getURI()):
++            if self._is_remote():
 +                raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
 +                                    (self.path, label, wantLabel))
 +            else:
@@ -147,7 +147,7 @@
 +                    logging.info("Labelling is correct")
 +                    return
 +
-+                if _util.is_remote_uri(self.conn.URI()):
++                if self._is_remote():
 +                    raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
 +                                        (self.path, label, wantLabel))
 +                else:



From crobinso at fedoraproject.org  Thu Apr  9 15:14:29 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  9 Apr 2009 15:14:29 +0000 (UTC)
Subject: rpms/python-virtinst/devel python-virtinst.spec,1.64,1.65
Message-ID: <20090409151429.12CDC7001C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8716

Modified Files:
	python-virtinst.spec 
Log Message:
Bump spec



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- python-virtinst.spec	9 Apr 2009 15:11:55 -0000	1.64
+++ python-virtinst.spec	9 Apr 2009 15:13:58 -0000	1.65
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 4%{_extra_release}
+Release: 5%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch



From remi at fedoraproject.org  Thu Apr  9 15:19:16 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  9 Apr 2009 15:19:16 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/devel .cvsignore, 1.4,
	1.5 glpi-mass-ocs-import.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090409151916.66ADA7001C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10250

Modified Files:
	.cvsignore glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2.2 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Mar 2009 08:22:33 -0000	1.4
+++ .cvsignore	9 Apr 2009 15:18:45 -0000	1.5
@@ -1 +1 @@
-glpi-mass_ocs_import-1.2.1.tar.gz
+glpi-mass_ocs_import-1.2.2.tar.gz


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/glpi-mass-ocs-import.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glpi-mass-ocs-import.spec	3 Mar 2009 08:24:00 -0000	1.5
+++ glpi-mass-ocs-import.spec	9 Apr 2009 15:18:45 -0000	1.6
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -19,7 +19,11 @@
 BuildArch:      noarch
 
 Requires:       glpi >= 0.71.5
+%if 0%{?rhel} == 4
+Requires:       php
+%else
 Requires:       php-cli
+%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -125,6 +129,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- update to 1.2.2 (bugfixes)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-1
 - update to 1.2.1 (bugfixes)
 - rename README.fedora to README-RPM-POSTINTALL.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 08:22:33 -0000	1.4
+++ sources	9 Apr 2009 15:18:45 -0000	1.5
@@ -1 +1 @@
-76fdbe8592f6458c9accda669eb2e750  glpi-mass_ocs_import-1.2.1.tar.gz
+abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz



From remi at fedoraproject.org  Thu Apr  9 15:26:08 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  9 Apr 2009 15:26:08 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/F-10 glpi-mass-ocs-import.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090409152608.A620C7001C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11961

Modified Files:
	glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2.2 (bugfix)


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-10/glpi-mass-ocs-import.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpi-mass-ocs-import.spec	3 Mar 2009 08:33:11 -0000	1.3
+++ glpi-mass-ocs-import.spec	9 Apr 2009 15:25:38 -0000	1.4
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -19,7 +19,11 @@
 BuildArch:      noarch
 
 Requires:       glpi >= 0.71.5
+%if 0%{?rhel} == 4
+Requires:       php
+%else
 Requires:       php-cli
+%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -125,6 +129,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- update to 1.2.2 (bugfixes)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-1
 - update to 1.2.1 (bugfixes)
 - rename README.fedora to README-RPM-POSTINTALL.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 08:33:11 -0000	1.4
+++ sources	9 Apr 2009 15:25:38 -0000	1.5
@@ -1 +1 @@
-76fdbe8592f6458c9accda669eb2e750  glpi-mass_ocs_import-1.2.1.tar.gz
+abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz



From remi at fedoraproject.org  Thu Apr  9 15:32:14 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  9 Apr 2009 15:32:14 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/F-9 glpi-mass-ocs-import.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090409153214.4B07E7001C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14694

Modified Files:
	glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2.2 (bugfix)


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-9/glpi-mass-ocs-import.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpi-mass-ocs-import.spec	3 Mar 2009 08:39:30 -0000	1.3
+++ glpi-mass-ocs-import.spec	9 Apr 2009 15:31:43 -0000	1.4
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -19,7 +19,11 @@
 BuildArch:      noarch
 
 Requires:       glpi >= 0.71.5
+%if 0%{?rhel} == 4
+Requires:       php
+%else
 Requires:       php-cli
+%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -125,6 +129,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- update to 1.2.2 (bugfixes)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-1
 - update to 1.2.1 (bugfixes)
 - rename README.fedora to README-RPM-POSTINTALL.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 08:39:30 -0000	1.4
+++ sources	9 Apr 2009 15:31:44 -0000	1.5
@@ -1 +1 @@
-76fdbe8592f6458c9accda669eb2e750  glpi-mass_ocs_import-1.2.1.tar.gz
+abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz



From davidz at fedoraproject.org  Thu Apr  9 15:33:39 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu,  9 Apr 2009 15:33:39 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel
	0001-use-correct-dmode-for-iso9660-mounts.patch, NONE,
	1.1 DeviceKit-disks.spec, 1.18, 1.19
Message-ID: <20090409153339.CDBC47001C@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15267

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	0001-use-correct-dmode-for-iso9660-mounts.patch 
Log Message:
* Thu Apr 09 2009 David Zeuthen <davidz at redhat.com> - 004-0.6.20090408git%{?dist}
- use correct dmode for iso9660 mounts (#495018)



0001-use-correct-dmode-for-iso9660-mounts.patch:

--- NEW FILE 0001-use-correct-dmode-for-iso9660-mounts.patch ---
>From 9fc5a4fe400a50f5a34feadd2949b282d70a26c2 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 11:13:41 -0400
Subject: [PATCH] use correct dmode for iso9660 mounts

Reported by yaneti at declera.com

https://bugzilla.redhat.com/show_bug.cgi?id=495018
---
 src/devkit-disks-device.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/devkit-disks-device.c b/src/devkit-disks-device.c
index 7151e5f..7ce8413 100644
--- a/src/devkit-disks-device.c
+++ b/src/devkit-disks-device.c
@@ -4022,7 +4022,7 @@ static const char *iso9660_defaults[] =       {"uid=",
                                                "gid=",
                                                "iocharset=utf8",
                                                "mode=0400",
-                                               "dmode=0400",
+                                               "dmode=0500",
                                                NULL};
 static const char *iso9660_allow[] =          {"norock",
                                                "nojoliet",
-- 
1.6.2.2



Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DeviceKit-disks.spec	8 Apr 2009 21:49:00 -0000	1.18
+++ DeviceKit-disks.spec	9 Apr 2009 15:33:09 -0000	1.19
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.5.20090408git%{?dist}
+Release: 0.6.20090408git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -59,6 +59,8 @@
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
+Patch0: 0001-use-correct-dmode-for-iso9660-mounts.patch
+
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -75,6 +77,7 @@
 
 %prep
 %setup -q
+%patch0 -p 1 -b .iso9660-dmode
 
 %build
 %configure
@@ -132,6 +135,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Apr 09 2009 David Zeuthen <davidz at redhat.com> - 004-0.6.20090408git%{?dist}
+- use correct dmode for iso9660 mounts (#495018)
+
 * Wed Apr 08 2009 David Zeuthen <davidz at redhat.com> - 004-0.5.20090408git%{?dist}
 - New snapshot
 



From remi at fedoraproject.org  Thu Apr  9 15:39:04 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  9 Apr 2009 15:39:04 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/EL-5 glpi-mass-ocs-import.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090409153904.A97CB7001C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16816

Modified Files:
	glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2.2 (bugfix)


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/glpi-mass-ocs-import.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpi-mass-ocs-import.spec	3 Mar 2009 08:46:04 -0000	1.3
+++ glpi-mass-ocs-import.spec	9 Apr 2009 15:38:34 -0000	1.4
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -19,7 +19,11 @@
 BuildArch:      noarch
 
 Requires:       glpi >= 0.71.5
+%if 0%{?rhel} == 4
+Requires:       php
+%else
 Requires:       php-cli
+%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -125,6 +129,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- update to 1.2.2 (bugfixes)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-1
 - update to 1.2.1 (bugfixes)
 - rename README.fedora to README-RPM-POSTINTALL.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 08:46:04 -0000	1.4
+++ sources	9 Apr 2009 15:38:34 -0000	1.5
@@ -1 +1 @@
-76fdbe8592f6458c9accda669eb2e750  glpi-mass_ocs_import-1.2.1.tar.gz
+abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz



From remi at fedoraproject.org  Thu Apr  9 15:40:55 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  9 Apr 2009 15:40:55 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/EL-4 glpi-mass-ocs-import.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090409154055.230AD7001C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17395

Modified Files:
	glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2.2 (bugfix)


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/glpi-mass-ocs-import.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glpi-mass-ocs-import.spec	3 Mar 2009 08:52:09 -0000	1.4
+++ glpi-mass-ocs-import.spec	9 Apr 2009 15:40:24 -0000	1.5
@@ -2,7 +2,7 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- update to 1.2.2 (bugfixes)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-1
 - update to 1.2.1 (bugfixes)
 - rename README.fedora to README-RPM-POSTINTALL.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 08:52:09 -0000	1.4
+++ sources	9 Apr 2009 15:40:24 -0000	1.5
@@ -1 +1 @@
-76fdbe8592f6458c9accda669eb2e750  glpi-mass_ocs_import-1.2.1.tar.gz
+abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz



From crobinso at fedoraproject.org  Thu Apr  9 15:45:47 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  9 Apr 2009 15:45:47 +0000 (UTC)
Subject: rpms/python-virtinst/F-10 virtinst-0.400.3-fix-floppy-dev.patch,
	NONE, 1.1 virtinst-0.400.3-updated-trans.patch, NONE,
	1.1 python-virtinst.spec, 1.54, 1.55
Message-ID: <20090409154547.DF1CC7001C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19136

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-fix-floppy-dev.patch 
	virtinst-0.400.3-updated-trans.patch 
Log Message:
Fix adding floppy devices (bz 493408)
Updated translations (bz 493944, bz 494358)


virtinst-0.400.3-fix-floppy-dev.patch:

--- NEW FILE virtinst-0.400.3-fix-floppy-dev.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1237498550 14400
# Node ID fd4baa6410d841f137ea89290c1a8da33c00c3c9
# Parent  a55347f926f5cfdcfd9b5234b945ec279190c513
Fix specifying --disk device=floppy

diff -r a55347f926f5 -r fd4baa6410d8 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Thu Mar 19 17:35:27 2009 -0400
+++ b/virtinst/FullVirtGuest.py	Thu Mar 19 17:35:50 2009 -0400
@@ -113,7 +113,10 @@
         used_targets = []
         for disk in self._install_disks:
             if not disk.bus:
-                disk.bus = "ide"
+                if disk.device == disk.DEVICE_FLOPPY:
+                    disk.bus = "fdc"
+                else:
+                    disk.bus = "ide"
             used_targets.append(disk.generate_target(used_targets))
 
         for d in self._install_disks:
diff -r a55347f926f5 -r fd4baa6410d8 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Thu Mar 19 17:35:27 2009 -0400
+++ b/virtinst/VirtualDisk.py	Thu Mar 19 17:35:50 2009 -0400
@@ -813,10 +813,10 @@
             return ("sd", 16)
         elif self.bus == "xen":
             return ("xvd", 16)
+        elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY:
+            return ("fd", 2)
         elif self.bus == "ide":
             return ("hd", 4)
-        elif self.bus == "floppy" or self.device == self.DEVICE_FLOPPY:
-            return ("fd", 2)
         else:
             return (None, None)
 

virtinst-0.400.3-updated-trans.patch:

--- NEW FILE virtinst-0.400.3-updated-trans.patch ---
diff -rup virtinst-0.400.3/po/es.po new/po/es.po
--- virtinst-0.400.3/po/es.po	2009-04-09 10:38:31.403059000 -0400
+++ new/po/es.po	2009-04-09 10:38:56.365058000 -0400
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Fedora Spanish Translation of virtinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 14:00-0400\n"
+"POT-Creation-Date: 2009-04-09 10:38-0400\n"
 "PO-Revision-Date: 2009-01-20 13:06-0300\n"
 "Last-Translator: h??ctor daniel cabrera <h.daniel.cabrera at gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
@@ -15,1419 +15,2136 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: virt-clone:45
-msgid "What is the name for the cloned virtual machine?"
-msgstr "??Cu??l es el nombre de la m??quina virtual clonada?"
+#: virtinst/CapabilitiesParser.py:172
+#, fuzzy, python-format
+msgid "No domains available for virt type '%(type)s', arch %(arch)s."
+msgstr "No existen dominios disponibles para este hu??sped."
 
-#: virt-clone:50
-#: virt-clone:60
-#: virt-clone:89
-#: virtinst/cli.py:175
-msgid "ERROR: "
-msgstr "ERROR:"
+#: virtinst/CapabilitiesParser.py:412
+#, python-format
+msgid "for arch '%s'"
+msgstr "para arq '%s'"
 
-#: virt-clone:55
-msgid "What is the name or uuid of the original virtual machine?"
-msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?"
+#: virtinst/CapabilitiesParser.py:416
+#, fuzzy, python-format
+msgid "virtualization type '%s'"
+msgstr "Tipo de virtualizaci??n '%s' no soportada"
 
-#: virt-clone:83
-msgid "What would you like to use as the cloned disk (file path)?"
-msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?"
+#: virtinst/CapabilitiesParser.py:418
+#, fuzzy
+msgid "any virtualization options"
+msgstr "Opciones del Tipo de Virtualizaci??n"
 
-#: virt-clone:94
+#: virtinst/CapabilitiesParser.py:420
 #, python-format
-msgid "This will overwrite the existing path '%s'!\n"
-msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n"
-
-#: virt-clone:96
-msgid "Do you really want to use this disk (yes or no)?"
-msgstr "??Realmente quiere utilizar este disco (si o no)?"
+msgid "Host does not support %(virttype)s %(arch)s"
+msgstr ""
 
-#: virt-clone:102
-#: virt-install:202
+#: virtinst/CapabilitiesParser.py:433
 #, python-format
-msgid "Disk %s is already in use by another guest!\n"
-msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n"
+msgid ""
+"Host does not support domain type '%(domain)s' for virtualization type '%"
+"(virttype)s' arch '%(arch)s'"
+msgstr ""
 
-#: virt-clone:103
-#: virt-install:203
-msgid "Do you really want to use the disk (yes or no)? "
-msgstr "??Realmente quiere utilizar el disco (si o no)?"
+#: virtinst/cli.py:117
+msgid "Exiting at user request."
+msgstr "Saliendo a pedido del usuario."
 
-#: virt-clone:132
-msgid "Name or uuid for the original guest; The status must be shut off"
-msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado"
+#: virtinst/cli.py:122
+msgid "Must be root to create Xen guests"
+msgstr "Debe ser root para poder crear un hu??sped Xen"
 
-#: virt-clone:136
-msgid "Name for the new guest"
-msgstr "Nombre para el nuevo hu??sped"
+#: virtinst/cli.py:124
+msgid "Could not find usable default libvirt connection."
+msgstr ""
+"No se ha podido encontrar una conexi??n por defecto libvirt que sea "
+"utilizable. "
 
-#: virt-clone:141
-msgid "New UUID for the clone guest; Default is a randomly generated UUID"
-msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID"
+#: virtinst/cli.py:146
+#, python-format
+msgid "Force flag is set but input was required. Prompt was: %s"
+msgstr ""
+"Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %"
+"s "
 
-#: virt-clone:146
-msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC"
-msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC "
+#: virtinst/cli.py:149
+#, python-format
+msgid "Prompting disabled, but input was requested. Prompt was: %s"
+msgstr ""
+"Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %"
+"s "
 
-#: virt-clone:151
-msgid "New file to use as the disk image for the new guest"
-msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped"
+#: virtinst/cli.py:169
+#, python-format
+msgid ""
+"Prompting disabled, but yes/no was requested. Try --force to force 'yes' for "
+"such prompts. Prompt was: %s"
+msgstr ""
+"Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente "
+"--force para forzar un \"si\" para este tipo de peticiones. Se pide: %s"
 
-#: virt-clone:155
-#: virt-image:128
-#: virt-install:317
-msgid "Connect to hypervisor with URI"
-msgstr "Conectar al hipervisor con URI"
+#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108
+msgid "ERROR: "
+msgstr "ERROR:"
 
-#: virt-clone:161
-msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)"
-msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)"
+#: virtinst/cli.py:189
+msgid "A name is required for the virtual machine."
+msgstr "Se requiere un nombre para la m??quina virtual."
 
-#: virt-clone:166
-msgid "Do not use a sparse file for the clone's disk image"
-msgstr "No utilice un archivo separado para la imagen del disco de lo clonado"
+#: virtinst/cli.py:197
+msgid "Memory amount is required for the virtual machine."
+msgstr "Se requiere una cantidad de memoria para la m??quina virtual."
 
-#: virt-clone:171
-msgid "Preserve a new file to use as the disk image for the new guest"
-msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped "
+#: virtinst/cli.py:199
+#, python-format
+msgid "Installs currently require %d megs of RAM."
+msgstr "La instalaci??n actualmente requiere %d megas de RAM."
 
-#: virt-clone:175
-#: virt-image:137
-#: virt-install:447
-#: virt-pack:109
-msgid "Print debugging information"
-msgstr "Mostrar informaci??n de depuraci??n"
+#: virtinst/cli.py:219
+#, python-format
+msgid ""
+"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
+"on the host. This will work, but performance will be poor. Are you sure? "
+"(yes or no)"
+msgstr ""
+"Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. "
+"Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)"
 
-#: virt-clone:177
-#: virt-image:143
-msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts"
-msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada"
+#: virtinst/cli.py:276
+msgid "Unknown network type "
+msgstr "Tipo de red desconocido"
 
-#: virt-clone:194
-msgid "Must be root to clone Xen guests"
-msgstr "Debe ser root para poder clonar hu??spedes Xen"
+#: virtinst/cli.py:293
+msgid "Cannot mix both --bridge and --network arguments"
+msgstr "No se pueden mezclar los argumentos de --bridge y de --network"
 
-#: virt-clone:229
-#: virt-image:242
-#: virt-install:697
-msgid "Installation aborted at user request"
-msgstr "Instalaci??n abortada a pedido del usuario"
+#: virtinst/cli.py:310
+msgid "Need to pass equal numbers of networks & mac addresses"
[...14182 lines suppressed...]
 "\n"
@@ -1868,7 +1834,7 @@ msgstr ""
 "\n"
 "????????????......"
 
-#: virt-install:682 virt-install.orig:682
+#: virt-install:682
 #, python-format
 msgid ""
 "Domain installation does not appear to have been\n"
@@ -1881,7 +1847,7 @@ msgstr ""
 "??????????????????????????????\n"
 "??????????????????"
 
-#: virt-install:693 virt-install.orig:693
+#: virt-install:693
 #, python-format
 msgid ""
 "Guest installation complete... you can restart your domain\n"
@@ -1890,16 +1856,15 @@ msgstr ""
 "?????????????????????......???????????????\n"
 " 'virsh start %s' ???????????????"
 
-#: virt-install:697 virt-install.orig:697
+#: virt-install:697
 msgid "Guest installation complete... restarting guest."
 msgstr "?????????????????????......???????????????"
 
-#: virt-install:703 virt-install.orig:703
-#, fuzzy
+#: virt-install:703
 msgid "Guest install interrupted."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
-#: virt-install:710 virt-install.orig:710
+#: virt-install:710
 #, python-format
 msgid ""
 "Domain installation may not have been\n"
@@ -1912,144 +1877,39 @@ msgstr ""
 "??????????????????????????????\n"
 "??????????????????"
 
-#: virt-install:736 virt-install.orig:736
-#, fuzzy
+#: virt-install:736
 msgid "Guest installation failed."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
-#: virt-install:746 virt-install.orig:746
-#, fuzzy, python-format
+#: virt-install:746
+#, python-format
 msgid "%d minutes "
-msgstr " %d ??????"
+msgstr "%d ??????"
 
-#: virt-install:748 virt-install.orig:748
-#, fuzzy, python-format
+#: virt-install:748
+#, python-format
 msgid ""
 "Domain installation still in progress. Waiting %sfor domain to complete "
 "installation."
-msgstr ""
-"?????????????????????????????????????????????\n"
-"???????????????????????????????????????"
+msgstr "????????????????????????????????? %s ??????????????????"
 
-#: virt-install:754 virt-install.orig:754
+#: virt-install:754
 msgid "Domain has shutdown. Continuing."
 msgstr "???????????????????????????......"
 
-#: virt-install:761 virt-install.orig:761
-#, fuzzy, python-format
+#: virt-install:761
+#, python-format
 msgid "Could not lookup domain after install: %s"
-msgstr "????????????????????????%s"
+msgstr "???????????????????????????%s"
 
-#: virt-install:768 virt-install.orig:768
-#, fuzzy
+#: virt-install:768
 msgid "Installation has exceeded specified time limit. Exiting application."
-msgstr "??????????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: virt-install:772 virt-install.orig:772
+#: virt-install:772
 msgid ""
 "Domain installation still in progress. You can reconnect to \n"
 "the console to complete the installation process."
 msgstr ""
 "?????????????????????????????????????????????\n"
 "???????????????????????????????????????"
-
-#~ msgid "Name or UUID of guest to clone is required"
-#~ msgstr "?????????????????????????????????????????? UUID"
-
-#~ msgid "A valid name or UUID of guest to clone is required"
-#~ msgstr "???????????????????????????????????????????????? UUID"
-
-#~ msgid "New file to use for disk image is required"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Domain status must be SHUTOFF"
-#~ msgstr "?????????????????? SHUTOFF"
-
-#~ msgid "Domain %s already exists"
-#~ msgstr "??? %s ?????????"
-
-#, fuzzy
-#~ msgid "Cloning from %(src)s to %(dst)s..."
-#~ msgstr "??? %(src)s ????????? %(dst)s"
-
-#~ msgid "Invalid file location given: "
-#~ msgstr "??????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid file location given: %s: %s"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD"
-#~ msgstr "??????????????? HVM ???????????????????????? live CD???"
-
-#~ msgid "Storage object name must be a string "
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Storage object name can not be only "
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Storage object name can only contain "
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "'%s' is not managed on remote host: %s"
-#~ msgstr "???????????????????????? '%s'???%s"
-
-#~ msgid "Cannot parse capabilities"
-#~ msgstr "??????????????????"
-
-#~ msgid "Only one of --pxe, --location and --cdrom can be used"
-#~ msgstr "???????????? --pxe???--location ??? --cdrom ??????"
-
-#~ msgid "location must be specified for paravirtualized guests."
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Domain installation still in progress. Waiting"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid ""
-#~ "UUID for the guest; if none is given a random UUID will be generated. If "
-#~ "you specify UUID, you should use a 32-digit hexadecimal number."
-#~ msgstr ""
-#~ "???????????? UUID??????????????????????????????????????? UUID??????????????? UUID?????????????????? "
-#~ "32 ????????????????????????"
-
-#~ msgid ""
-#~ "Total time to wait for VM to shutdown if console not present. Time less "
-#~ "than 0 waits indefinitely."
-#~ msgstr "?????????????????????????????? VM ??????????????????????????????????????? 0 ?????????????????????"
-
-#~ msgid "The image name and version must be present"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Scratch disk %s does not have a size attribute"
-#~ msgstr "????????? %s ??????????????????"
-
-#~ msgid "Disk file %s could not be found"
-#~ msgstr "???????????????????????? %s"
-
-#~ msgid "Writing %s"
-#~ msgstr "?????? %s"
-
-#~ msgid "Directory in which packaged file will be put"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "The image descriptor must contain name and version"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Validation failed: %s"
-#~ msgstr "???????????????%s"
-
-#~ msgid "Packaging failed: %s"
-#~ msgstr "???????????????%s"
-
-#~ msgid "Cloning domain..."
-#~ msgstr "?????????......"
-
-#~ msgid "NFS installations are only supported as root"
-#~ msgstr "???????????????????????? NFS ??????"
-
-#~ msgid "Verifying install location..."
-#~ msgstr "??????????????????......"
-
-#~ msgid "Unsupported virtualization type"
-#~ msgstr "???????????????????????????"


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- python-virtinst.spec	23 Mar 2009 21:12:56 -0000	1.54
+++ python-virtinst.spec	9 Apr 2009 15:45:17 -0000	1.55
@@ -11,11 +11,13 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
 Patch3: %{appname}-%{version}-spanish-trans.patch
+Patch4: %{appname}-%{version}-fix-floppy-dev.patch
+Patch5: %{appname}-%{version}-updated-trans.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +46,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 python setup.py build
@@ -77,6 +81,10 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Apr  9 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-3.fc10
+- Fix adding floppy devices (bz 493408)
+- Updated translations (bz 493944, bz 494358)
+
 * Mon Mar 23 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-2.fc10
 - Add spanish translation (bz 480816)
 - Fix calls to libvirt host device detach/reset



From nphilipp at fedoraproject.org  Thu Apr  9 15:46:09 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  9 Apr 2009 15:46:09 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.66, 1.67 sources, 1.69,
	1.70 system-config-samba.spec, 1.73, 1.74
Message-ID: <20090409154609.62D687001C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19302

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.74


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	9 Apr 2009 14:54:43 -0000	1.66
+++ .cvsignore	9 Apr 2009 15:45:39 -0000	1.67
@@ -1 +1 @@
-system-config-samba-1.2.73.tar.bz2
+system-config-samba-1.2.74.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	9 Apr 2009 14:54:43 -0000	1.69
+++ sources	9 Apr 2009 15:45:39 -0000	1.70
@@ -1 +1 @@
-ee7c7011b9c90eaa8d858286a3220890  system-config-samba-1.2.73.tar.bz2
+0e41f90edcb351f16f08a167e0740462  system-config-samba-1.2.74.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- system-config-samba.spec	9 Apr 2009 14:54:43 -0000	1.73
+++ system-config-samba.spec	9 Apr 2009 15:45:39 -0000	1.74
@@ -3,7 +3,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.73
+Version: 1.2.74
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -86,6 +86,9 @@
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Thu Apr 09 2009 Nils Philippsen <nils at redhat.com> - 1.2.74-1
+- fix use via dbus
+
 * Thu Apr 09 2009 Nils Philippsen <nils at redhat.com> - 1.2.73-1
 - fix antonym/inverted synonym handling regression
 - various other fixes



From crobinso at fedoraproject.org  Thu Apr  9 15:46:19 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  9 Apr 2009 15:46:19 +0000 (UTC)
Subject: rpms/python-virtinst/F-9 virtinst-0.400.3-fix-floppy-dev.patch, NONE,
	1.1 virtinst-0.400.3-updated-trans.patch, NONE,
	1.1 python-virtinst.spec, 1.49, 1.50
Message-ID: <20090409154619.A98F07001C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19345

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-fix-floppy-dev.patch 
	virtinst-0.400.3-updated-trans.patch 
Log Message:
Fix adding floppy devices (bz 493408)
Updated translations (bz 493944, bz 494358)


virtinst-0.400.3-fix-floppy-dev.patch:

--- NEW FILE virtinst-0.400.3-fix-floppy-dev.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1237498550 14400
# Node ID fd4baa6410d841f137ea89290c1a8da33c00c3c9
# Parent  a55347f926f5cfdcfd9b5234b945ec279190c513
Fix specifying --disk device=floppy

diff -r a55347f926f5 -r fd4baa6410d8 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Thu Mar 19 17:35:27 2009 -0400
+++ b/virtinst/FullVirtGuest.py	Thu Mar 19 17:35:50 2009 -0400
@@ -113,7 +113,10 @@
         used_targets = []
         for disk in self._install_disks:
             if not disk.bus:
-                disk.bus = "ide"
+                if disk.device == disk.DEVICE_FLOPPY:
+                    disk.bus = "fdc"
+                else:
+                    disk.bus = "ide"
             used_targets.append(disk.generate_target(used_targets))
 
         for d in self._install_disks:
diff -r a55347f926f5 -r fd4baa6410d8 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py	Thu Mar 19 17:35:27 2009 -0400
+++ b/virtinst/VirtualDisk.py	Thu Mar 19 17:35:50 2009 -0400
@@ -813,10 +813,10 @@
             return ("sd", 16)
         elif self.bus == "xen":
             return ("xvd", 16)
+        elif self.bus == "fdc" or self.device == self.DEVICE_FLOPPY:
+            return ("fd", 2)
         elif self.bus == "ide":
             return ("hd", 4)
-        elif self.bus == "floppy" or self.device == self.DEVICE_FLOPPY:
-            return ("fd", 2)
         else:
             return (None, None)
 

virtinst-0.400.3-updated-trans.patch:

--- NEW FILE virtinst-0.400.3-updated-trans.patch ---
diff -rup virtinst-0.400.3/po/es.po new/po/es.po
--- virtinst-0.400.3/po/es.po	2009-04-09 10:38:31.403059000 -0400
+++ new/po/es.po	2009-04-09 10:38:56.365058000 -0400
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Fedora Spanish Translation of virtinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 14:00-0400\n"
+"POT-Creation-Date: 2009-04-09 10:38-0400\n"
 "PO-Revision-Date: 2009-01-20 13:06-0300\n"
 "Last-Translator: h??ctor daniel cabrera <h.daniel.cabrera at gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
@@ -15,1419 +15,2136 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: virt-clone:45
-msgid "What is the name for the cloned virtual machine?"
-msgstr "??Cu??l es el nombre de la m??quina virtual clonada?"
+#: virtinst/CapabilitiesParser.py:172
+#, fuzzy, python-format
+msgid "No domains available for virt type '%(type)s', arch %(arch)s."
+msgstr "No existen dominios disponibles para este hu??sped."
 
-#: virt-clone:50
-#: virt-clone:60
-#: virt-clone:89
-#: virtinst/cli.py:175
-msgid "ERROR: "
-msgstr "ERROR:"
+#: virtinst/CapabilitiesParser.py:412
+#, python-format
+msgid "for arch '%s'"
+msgstr "para arq '%s'"
 
-#: virt-clone:55
-msgid "What is the name or uuid of the original virtual machine?"
-msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?"
+#: virtinst/CapabilitiesParser.py:416
+#, fuzzy, python-format
+msgid "virtualization type '%s'"
+msgstr "Tipo de virtualizaci??n '%s' no soportada"
 
-#: virt-clone:83
-msgid "What would you like to use as the cloned disk (file path)?"
-msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?"
+#: virtinst/CapabilitiesParser.py:418
+#, fuzzy
+msgid "any virtualization options"
+msgstr "Opciones del Tipo de Virtualizaci??n"
 
-#: virt-clone:94
+#: virtinst/CapabilitiesParser.py:420
 #, python-format
-msgid "This will overwrite the existing path '%s'!\n"
-msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n"
-
-#: virt-clone:96
-msgid "Do you really want to use this disk (yes or no)?"
-msgstr "??Realmente quiere utilizar este disco (si o no)?"
+msgid "Host does not support %(virttype)s %(arch)s"
+msgstr ""
 
-#: virt-clone:102
-#: virt-install:202
+#: virtinst/CapabilitiesParser.py:433
 #, python-format
-msgid "Disk %s is already in use by another guest!\n"
-msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n"
+msgid ""
+"Host does not support domain type '%(domain)s' for virtualization type '%"
+"(virttype)s' arch '%(arch)s'"
+msgstr ""
 
-#: virt-clone:103
-#: virt-install:203
-msgid "Do you really want to use the disk (yes or no)? "
-msgstr "??Realmente quiere utilizar el disco (si o no)?"
+#: virtinst/cli.py:117
+msgid "Exiting at user request."
+msgstr "Saliendo a pedido del usuario."
 
-#: virt-clone:132
-msgid "Name or uuid for the original guest; The status must be shut off"
-msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado"
+#: virtinst/cli.py:122
+msgid "Must be root to create Xen guests"
+msgstr "Debe ser root para poder crear un hu??sped Xen"
 
-#: virt-clone:136
-msgid "Name for the new guest"
-msgstr "Nombre para el nuevo hu??sped"
+#: virtinst/cli.py:124
+msgid "Could not find usable default libvirt connection."
+msgstr ""
+"No se ha podido encontrar una conexi??n por defecto libvirt que sea "
+"utilizable. "
 
-#: virt-clone:141
-msgid "New UUID for the clone guest; Default is a randomly generated UUID"
-msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID"
+#: virtinst/cli.py:146
+#, python-format
+msgid "Force flag is set but input was required. Prompt was: %s"
+msgstr ""
+"Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %"
+"s "
 
-#: virt-clone:146
-msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC"
-msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC "
+#: virtinst/cli.py:149
+#, python-format
+msgid "Prompting disabled, but input was requested. Prompt was: %s"
+msgstr ""
+"Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %"
+"s "
 
-#: virt-clone:151
-msgid "New file to use as the disk image for the new guest"
-msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped"
+#: virtinst/cli.py:169
+#, python-format
+msgid ""
+"Prompting disabled, but yes/no was requested. Try --force to force 'yes' for "
+"such prompts. Prompt was: %s"
+msgstr ""
+"Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente "
+"--force para forzar un \"si\" para este tipo de peticiones. Se pide: %s"
 
-#: virt-clone:155
-#: virt-image:128
-#: virt-install:317
-msgid "Connect to hypervisor with URI"
-msgstr "Conectar al hipervisor con URI"
+#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108
+msgid "ERROR: "
+msgstr "ERROR:"
 
-#: virt-clone:161
-msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)"
-msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)"
+#: virtinst/cli.py:189
+msgid "A name is required for the virtual machine."
+msgstr "Se requiere un nombre para la m??quina virtual."
 
-#: virt-clone:166
-msgid "Do not use a sparse file for the clone's disk image"
-msgstr "No utilice un archivo separado para la imagen del disco de lo clonado"
+#: virtinst/cli.py:197
+msgid "Memory amount is required for the virtual machine."
+msgstr "Se requiere una cantidad de memoria para la m??quina virtual."
 
-#: virt-clone:171
-msgid "Preserve a new file to use as the disk image for the new guest"
-msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped "
+#: virtinst/cli.py:199
+#, python-format
+msgid "Installs currently require %d megs of RAM."
+msgstr "La instalaci??n actualmente requiere %d megas de RAM."
 
-#: virt-clone:175
-#: virt-image:137
-#: virt-install:447
-#: virt-pack:109
-msgid "Print debugging information"
-msgstr "Mostrar informaci??n de depuraci??n"
+#: virtinst/cli.py:219
+#, python-format
+msgid ""
+"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
+"on the host. This will work, but performance will be poor. Are you sure? "
+"(yes or no)"
+msgstr ""
+"Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. "
+"Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)"
 
-#: virt-clone:177
-#: virt-image:143
-msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts"
-msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada"
+#: virtinst/cli.py:276
+msgid "Unknown network type "
+msgstr "Tipo de red desconocido"
 
-#: virt-clone:194
-msgid "Must be root to clone Xen guests"
-msgstr "Debe ser root para poder clonar hu??spedes Xen"
+#: virtinst/cli.py:293
+msgid "Cannot mix both --bridge and --network arguments"
+msgstr "No se pueden mezclar los argumentos de --bridge y de --network"
 
-#: virt-clone:229
-#: virt-image:242
-#: virt-install:697
-msgid "Installation aborted at user request"
-msgstr "Instalaci??n abortada a pedido del usuario"
+#: virtinst/cli.py:310
+msgid "Need to pass equal numbers of networks & mac addresses"
[...14182 lines suppressed...]
 "\n"
@@ -1868,7 +1834,7 @@ msgstr ""
 "\n"
 "????????????......"
 
-#: virt-install:682 virt-install.orig:682
+#: virt-install:682
 #, python-format
 msgid ""
 "Domain installation does not appear to have been\n"
@@ -1881,7 +1847,7 @@ msgstr ""
 "??????????????????????????????\n"
 "??????????????????"
 
-#: virt-install:693 virt-install.orig:693
+#: virt-install:693
 #, python-format
 msgid ""
 "Guest installation complete... you can restart your domain\n"
@@ -1890,16 +1856,15 @@ msgstr ""
 "?????????????????????......???????????????\n"
 " 'virsh start %s' ???????????????"
 
-#: virt-install:697 virt-install.orig:697
+#: virt-install:697
 msgid "Guest installation complete... restarting guest."
 msgstr "?????????????????????......???????????????"
 
-#: virt-install:703 virt-install.orig:703
-#, fuzzy
+#: virt-install:703
 msgid "Guest install interrupted."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
-#: virt-install:710 virt-install.orig:710
+#: virt-install:710
 #, python-format
 msgid ""
 "Domain installation may not have been\n"
@@ -1912,144 +1877,39 @@ msgstr ""
 "??????????????????????????????\n"
 "??????????????????"
 
-#: virt-install:736 virt-install.orig:736
-#, fuzzy
+#: virt-install:736
 msgid "Guest installation failed."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
-#: virt-install:746 virt-install.orig:746
-#, fuzzy, python-format
+#: virt-install:746
+#, python-format
 msgid "%d minutes "
-msgstr " %d ??????"
+msgstr "%d ??????"
 
-#: virt-install:748 virt-install.orig:748
-#, fuzzy, python-format
+#: virt-install:748
+#, python-format
 msgid ""
 "Domain installation still in progress. Waiting %sfor domain to complete "
 "installation."
-msgstr ""
-"?????????????????????????????????????????????\n"
-"???????????????????????????????????????"
+msgstr "????????????????????????????????? %s ??????????????????"
 
-#: virt-install:754 virt-install.orig:754
+#: virt-install:754
 msgid "Domain has shutdown. Continuing."
 msgstr "???????????????????????????......"
 
-#: virt-install:761 virt-install.orig:761
-#, fuzzy, python-format
+#: virt-install:761
+#, python-format
 msgid "Could not lookup domain after install: %s"
-msgstr "????????????????????????%s"
+msgstr "???????????????????????????%s"
 
-#: virt-install:768 virt-install.orig:768
-#, fuzzy
+#: virt-install:768
 msgid "Installation has exceeded specified time limit. Exiting application."
-msgstr "??????????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: virt-install:772 virt-install.orig:772
+#: virt-install:772
 msgid ""
 "Domain installation still in progress. You can reconnect to \n"
 "the console to complete the installation process."
 msgstr ""
 "?????????????????????????????????????????????\n"
 "???????????????????????????????????????"
-
-#~ msgid "Name or UUID of guest to clone is required"
-#~ msgstr "?????????????????????????????????????????? UUID"
-
-#~ msgid "A valid name or UUID of guest to clone is required"
-#~ msgstr "???????????????????????????????????????????????? UUID"
-
-#~ msgid "New file to use for disk image is required"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Domain status must be SHUTOFF"
-#~ msgstr "?????????????????? SHUTOFF"
-
-#~ msgid "Domain %s already exists"
-#~ msgstr "??? %s ?????????"
-
-#, fuzzy
-#~ msgid "Cloning from %(src)s to %(dst)s..."
-#~ msgstr "??? %(src)s ????????? %(dst)s"
-
-#~ msgid "Invalid file location given: "
-#~ msgstr "??????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid file location given: %s: %s"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD"
-#~ msgstr "??????????????? HVM ???????????????????????? live CD???"
-
-#~ msgid "Storage object name must be a string "
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Storage object name can not be only "
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Storage object name can only contain "
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "'%s' is not managed on remote host: %s"
-#~ msgstr "???????????????????????? '%s'???%s"
-
-#~ msgid "Cannot parse capabilities"
-#~ msgstr "??????????????????"
-
-#~ msgid "Only one of --pxe, --location and --cdrom can be used"
-#~ msgstr "???????????? --pxe???--location ??? --cdrom ??????"
-
-#~ msgid "location must be specified for paravirtualized guests."
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Domain installation still in progress. Waiting"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid ""
-#~ "UUID for the guest; if none is given a random UUID will be generated. If "
-#~ "you specify UUID, you should use a 32-digit hexadecimal number."
-#~ msgstr ""
-#~ "???????????? UUID??????????????????????????????????????? UUID??????????????? UUID?????????????????? "
-#~ "32 ????????????????????????"
-
-#~ msgid ""
-#~ "Total time to wait for VM to shutdown if console not present. Time less "
-#~ "than 0 waits indefinitely."
-#~ msgstr "?????????????????????????????? VM ??????????????????????????????????????? 0 ?????????????????????"
-
-#~ msgid "The image name and version must be present"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Scratch disk %s does not have a size attribute"
-#~ msgstr "????????? %s ??????????????????"
-
-#~ msgid "Disk file %s could not be found"
-#~ msgstr "???????????????????????? %s"
-
-#~ msgid "Writing %s"
-#~ msgstr "?????? %s"
-
-#~ msgid "Directory in which packaged file will be put"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "The image descriptor must contain name and version"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Validation failed: %s"
-#~ msgstr "???????????????%s"
-
-#~ msgid "Packaging failed: %s"
-#~ msgstr "???????????????%s"
-
-#~ msgid "Cloning domain..."
-#~ msgstr "?????????......"
-
-#~ msgid "NFS installations are only supported as root"
-#~ msgstr "???????????????????????? NFS ??????"
-
-#~ msgid "Verifying install location..."
-#~ msgstr "??????????????????......"
-
-#~ msgid "Unsupported virtualization type"
-#~ msgstr "???????????????????????????"


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- python-virtinst.spec	23 Mar 2009 21:13:30 -0000	1.49
+++ python-virtinst.spec	9 Apr 2009 15:45:49 -0000	1.50
@@ -11,11 +11,13 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
 Patch3: %{appname}-%{version}-spanish-trans.patch
+Patch4: %{appname}-%{version}-fix-floppy-dev.patch
+Patch5: %{appname}-%{version}-updated-trans.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +46,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 python setup.py build
@@ -77,6 +81,10 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Apr  9 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-3.fc9
+- Fix adding floppy devices (bz 493408)
+- Updated translations (bz 493944, bz 494358)
+
 * Mon Mar 23 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-2.fc9
 - Add spanish translation (bz 480816)
 - Fix calls to libvirt host device detach/reset



From ajax at fedoraproject.org  Thu Apr  9 15:54:50 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  9 Apr 2009 15:54:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.12.1-r600-fb-size.patch, NONE, 
	1.1 xorg-x11-drv-ati.spec, 1.173, 1.174
Message-ID: <20090409155450.9F2417001C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22082

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.1-r600-fb-size.patch 
Log Message:
* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 6.12.1-10
- radeon-6.12.1-r600-fb-size.patch: Bump fb size max on R600+ when no KMS
  so single-link dualhead stands a chance of working.


radeon-6.12.1-r600-fb-size.patch:

--- NEW FILE radeon-6.12.1-r600-fb-size.patch ---
diff -up xf86-video-ati-6.12.1/src/radeon_driver.c.jx xf86-video-ati-6.12.1/src/radeon_driver.c
--- xf86-video-ati-6.12.1/src/radeon_driver.c.jx	2009-04-09 11:40:31.000000000 -0400
+++ xf86-video-ati-6.12.1/src/radeon_driver.c	2009-04-09 11:52:43.000000000 -0400
@@ -3089,6 +3089,15 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
 	    } else if (IS_R300_VARIANT) {
 		crtc_max_X = 2560;
 		crtc_max_Y = 1200;
+	    } else if (pScrn->ChipFamily >= CHIP_FAMILY_R600) {
+		/* no kms, but also no 3d, so be a little aggressive */
+		if (pScrn->videoRam >= 128 * 1024) {
+		    crtc_max_X = 4096;
+		    crtc_max_y = 1920;
+		} else {
+		    crtc_max_X = 2560; 
+		    crtc_max_Y = 1920;
+		}
 	    } else if (IS_AVIVO_VARIANT) {
 		crtc_max_X = 2560;
 		crtc_max_Y = 1600;


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- xorg-x11-drv-ati.spec	7 Apr 2009 01:40:30 -0000	1.173
+++ xorg-x11-drv-ati.spec	9 Apr 2009 15:54:20 -0000	1.174
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
+Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +48,7 @@
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
+%patch7 -p1 -b .r600-fb-size
 
 %build
 autoreconf -iv
@@ -78,6 +80,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 6.12.1-10
+- radeon-6.12.1-r600-fb-size.patch: Bump fb size max on R600+ when no KMS
+  so single-link dualhead stands a chance of working.
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-9
 - cache mmaps for objects until remove time.
 



From markmc at fedoraproject.org  Thu Apr  9 15:55:20 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  9 Apr 2009 15:55:20 +0000 (UTC)
Subject: rpms/openbios/devel openbios.spec,1.1,1.2
Message-ID: <20090409155520.E23F77001C@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/openbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22221

Modified Files:
	openbios.spec 
Log Message:
Fix svn URL



Index: openbios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openbios.spec	5 Mar 2009 19:35:01 -0000	1.1
+++ openbios.spec	9 Apr 2009 15:54:50 -0000	1.2
@@ -6,7 +6,7 @@
 License:	GPLv2
 URL:		http://www.openfirmware.info/OpenBIOS
 # Getting openbios tarball:
-# svn export -r463 svn://openbios.org/openbios/openbios-devel openbios-1.0
+# svn export -r463 svn://openbios.org/openbios/trunk/openbios-devel openbios-1.0
 # tar czvf openbios-1.0.tar.gz openbios-1.0
 Source0:	%{name}/%{name}-%{version}.tar.gz
 Patch0:		openbios-noerror.patch



From ajax at fedoraproject.org  Thu Apr  9 15:58:31 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  9 Apr 2009 15:58:31 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.12.1-r600-fb-size.patch, 1.1,
	1.2
Message-ID: <20090409155831.44B7D7001C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23118

Modified Files:
	radeon-6.12.1-r600-fb-size.patch 
Log Message:
oops, typo

radeon-6.12.1-r600-fb-size.patch:

Index: radeon-6.12.1-r600-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.12.1-r600-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.12.1-r600-fb-size.patch	9 Apr 2009 15:54:20 -0000	1.1
+++ radeon-6.12.1-r600-fb-size.patch	9 Apr 2009 15:58:00 -0000	1.2
@@ -9,7 +9,7 @@
 +		/* no kms, but also no 3d, so be a little aggressive */
 +		if (pScrn->videoRam >= 128 * 1024) {
 +		    crtc_max_X = 4096;
-+		    crtc_max_y = 1920;
++		    crtc_max_Y = 1920;
 +		} else {
 +		    crtc_max_X = 2560; 
 +		    crtc_max_Y = 1920;



From ajax at fedoraproject.org  Thu Apr  9 16:00:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  9 Apr 2009 16:00:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.12.1-r600-fb-size.patch, 1.2,
	1.3
Message-ID: <20090409160030.7EB0670137@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23925

Modified Files:
	radeon-6.12.1-r600-fb-size.patch 
Log Message:
oops, thinko

radeon-6.12.1-r600-fb-size.patch:

Index: radeon-6.12.1-r600-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.12.1-r600-fb-size.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- radeon-6.12.1-r600-fb-size.patch	9 Apr 2009 15:58:00 -0000	1.2
+++ radeon-6.12.1-r600-fb-size.patch	9 Apr 2009 16:00:30 -0000	1.3
@@ -5,7 +5,7 @@
  	    } else if (IS_R300_VARIANT) {
  		crtc_max_X = 2560;
  		crtc_max_Y = 1200;
-+	    } else if (pScrn->ChipFamily >= CHIP_FAMILY_R600) {
++	    } else if (info->ChipFamily >= CHIP_FAMILY_R600) {
 +		/* no kms, but also no 3d, so be a little aggressive */
 +		if (pScrn->videoRam >= 128 * 1024) {
 +		    crtc_max_X = 4096;



From pkgdb at fedoraproject.org  Thu Apr  9 16:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 16:24:59 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested watchcommits
Message-ID: <20090409162402.20B9610F862@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on system-config-lvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Thu Apr  9 16:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 16:24:04 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested watchbugzilla
Message-ID: <20090409162406.8002A10F874@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on system-config-lvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Thu Apr  9 16:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 16:25:06 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested watchbugzilla
Message-ID: <20090409162410.1CF7B10F878@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on system-config-lvm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Thu Apr  9 16:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 16:24:11 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested watchcommits
Message-ID: <20090409162411.52D9210F87C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on system-config-lvm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Thu Apr  9 16:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 16:25:16 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested watchcommits
Message-ID: <20090409162420.13F7D10F880@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on system-config-lvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Thu Apr  9 16:24:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 16:24:27 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested watchbugzilla
Message-ID: <20090409162427.9D1F610F872@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on system-config-lvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From rmeggins at fedoraproject.org  Thu Apr  9 16:30:35 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu,  9 Apr 2009 16:30:35 +0000 (UTC)
Subject: rpms/fedora-ds-admin/devel f11-httpd.patch, NONE,
	1.1 fedora-ds-admin.spec, 1.9, 1.10
Message-ID: <20090409163035.8A8217001C@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv755

Modified Files:
	fedora-ds-admin.spec 
Added Files:
	f11-httpd.patch 
Log Message:
Resolves: bug 493424
Description: dirsrv-admin initscript looks for nonexistent library
Added patch to remove those modules from the httpd.conf


f11-httpd.patch:

--- NEW FILE f11-httpd.patch ---
--- admserv/cfgstuff/httpd-2.2.conf.in	1 Aug 2007 18:14:53 -0000	1.6
+++ admserv/cfgstuff/httpd-2.2.conf.in	9 Apr 2009 16:07:53 -0000
@@ -137,12 +137,10 @@
 LoadModule actions_module @moddir@/mod_actions.so
 LoadModule alias_module @moddir@/mod_alias.so
 LoadModule rewrite_module @moddir@/mod_rewrite.so
 LoadModule cache_module @moddir@/mod_cache.so
 LoadModule disk_cache_module @moddir@/mod_disk_cache.so
-LoadModule file_cache_module @moddir@/mod_file_cache.so
-LoadModule mem_cache_module @moddir@/mod_mem_cache.so
 LoadModule cgi_module @moddir@/mod_cgi.so
 LoadModule restartd_module     @admmoddir@/mod_restartd.so
 LoadModule nss_module         @nssmoddir@/libmodnss.so
 LoadModule admserv_module     @admmoddir@/mod_admserv.so
 


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-ds-admin.spec	9 Apr 2009 01:09:10 -0000	1.9
+++ fedora-ds-admin.spec	9 Apr 2009 16:30:05 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -36,6 +36,7 @@
 Source0:          http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
+Patch1:           f11-httpd.patch
 
 %description
 Fedora Administration Server is an HTTP agent that provides management features
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1
 
 %build
 %configure --disable-rpath
@@ -147,6 +149,11 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Apr  9 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-4
+- Resolves: bug 493424
+- Description: dirsrv-admin initscript looks for nonexistent library
+- Added patch to remove those modules from the httpd.conf
+
 * Wed Apr  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-3
 - Resolves: bug 494980
 - Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress



From pwouters at fedoraproject.org  Thu Apr  9 16:32:02 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu,  9 Apr 2009 16:32:02 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.178,1.179
Message-ID: <20090409163202.8941D70137@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1377

Modified Files:
	comps-f11.xml.in 
Log Message:
updated the DNS Name Server group to include other DNS nameservers and
some relevant DNS server tools.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- comps-f11.xml.in	8 Apr 2009 20:11:07 -0000	1.178
+++ comps-f11.xml.in	9 Apr 2009 16:32:01 -0000	1.179
@@ -1050,9 +1050,15 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="mandatory">bind</packagereq>
+      <packagereq type="optional">bind</packagereq>
       <packagereq type="default">bind-chroot</packagereq>
+      <packagereq type="mandatory">dnssec-conf</packagereq>
+      <packagereq type="optional">dnsperf</packagereq>
+      <packagereq type="optional">ldns</packagereq>
+      <packagereq type="optional">nsd</packagereq>
       <packagereq type="optional">pdns</packagereq>
+      <packagereq type="optional">pdns-recursor</packagereq>
+      <packagereq type="optional">unbound</packagereq>
     </packagelist>
   </group>
   <group>



From jjohnstn at fedoraproject.org  Thu Apr  9 16:12:55 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Thu,  9 Apr 2009 16:12:55 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.120,1.121
Message-ID: <20090409161255.0FD1F7001C@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28127

Modified Files:
	eclipse-cdt.spec 
Log Message:

Restore old changelog comment lost on last change.



Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- eclipse-cdt.spec	8 Apr 2009 22:38:59 -0000	1.120
+++ eclipse-cdt.spec	9 Apr 2009 16:12:24 -0000	1.121
@@ -573,6 +573,9 @@
 - Rebase autotools to 1.0.3.
 - Rebase CDT to v200903191301 (5.0.2).
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
 - Rebase libhover to 0.1.1 and autotools to 1.0.2.
 - Remove patch for 472731 which is already part of rebased autotools sources.



From hadess at fedoraproject.org  Thu Apr  9 16:49:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  9 Apr 2009 16:49:04 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-ddkit-monitor.patch, NONE,
	1.1 rhythmbox.spec, 1.239, 1.240
Message-ID: <20090409164904.261967001C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7204

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-ddkit-monitor.patch 
Log Message:
* Thu Apr 09 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-4
- Fix iPod detection with the DeviceKit-disks gvfs monitor (#493640)


rb-ddkit-monitor.patch:

--- NEW FILE rb-ddkit-monitor.patch ---
Index: lib/rb-util.c
===================================================================
--- lib/rb-util.c	(revision 6281)
+++ lib/rb-util.c	(working copy)
@@ -38,6 +38,11 @@
 #include <gobject/gvaluecollector.h>
 #include <gio/gio.h>
 
+#ifdef HAVE_HAL
+#include <libhal.h>
+#include <dbus/dbus.h>
+#endif
+
 #include "rb-util.h"
 #include "rb-debug.h"
 
@@ -991,3 +996,39 @@
 	return gdk_pixbuf_scale_simple (pixbuf, d_width, d_height, GDK_INTERP_BILINEAR);
 }
 
+#ifdef HAVE_HAL
+char *
+rhythmbox_get_volume_udi (GVolume *volume, gpointer ctx)
+{
+	char *udi, *dev, **udis;
+	int num_udis;
+
+	g_return_val_if_fail (volume != NULL, NULL);
+	g_return_val_if_fail (G_IS_VOLUME (volume), NULL);
+	g_return_val_if_fail (ctx != NULL, NULL);
+
+	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
+	if (udi != NULL)
+		return udi;
+
+	dev = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+	udis = libhal_manager_find_device_string_match ((LibHalContext *) ctx,
+							"block.device", dev,
+							&num_udis, NULL);
+
+	if (udis != NULL || num_udis < 1)
+		return NULL;
+
+	udi = g_strdup (udis[0]);
+	libhal_free_string_array (udis);
+
+	return udi;
+}
+#else
+char *
+rhythmbox_get_volume_udi (GVolume *volume, gpointer ctx)
+{
+	return NULL;
+}
+#endif /* HAVE_HAL */
+
Index: lib/rb-util.h
===================================================================
--- lib/rb-util.h	(revision 6281)
+++ lib/rb-util.h	(working copy)
@@ -100,6 +100,8 @@
 GdkPixbuf *rb_scale_pixbuf_to_size (GdkPixbuf *pixbuf,
 				    GtkIconSize size);
 
+char *rhythmbox_get_volume_udi (GVolume *volume, gpointer ctx);
+
 G_END_DECLS
 
 #endif /* __RB_UTIL_H */
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am	(revision 6281)
+++ lib/Makefile.am	(working copy)
@@ -49,9 +49,10 @@
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/widgets				\
 	$(SOUP_CFLAGS)					\
+	$(HAL_CFLAGS)					\
 	$(RHYTHMBOX_CFLAGS)
 
-librb_la_LIBADD = $(SOUP_LIBS) -lSM -lICE
+librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS) -lSM -lICE
 
 BUILT_SOURCES=
 
Index: plugins/generic-player/rb-nokia770-source.c
===================================================================
--- plugins/generic-player/rb-nokia770-source.c	(revision 6281)
+++ plugins/generic-player/rb-nokia770-source.c	(working copy)
@@ -136,14 +136,12 @@
 }
 
 
-#ifdef HAVE_HAL
-
 static gboolean
-hal_udi_is_nokia770 (const char *udi)
+volume_is_nokia770 (GVolume *volume)
 {
 	LibHalContext *ctx;
 	DBusConnection *conn;
-	char *parent_udi;
+	char *parent_udi, *udi;
 	char *parent_name;
 	gboolean result;
 	DBusError error;
@@ -153,6 +151,7 @@
 	dbus_error_init (&error);
 
 	conn = NULL;
+	udi = NULL;
 	parent_udi = NULL;
 	parent_name = NULL;
 
@@ -169,6 +168,10 @@
 	if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
 		goto end;
 
+	udi = rhythmbox_get_volume_udi (volume, ctx);
+	if (udi == NULL)
+		goto end;
+
 	inited = TRUE;
 	parent_udi = libhal_device_get_property_string (ctx,
 							udi,
@@ -206,6 +209,7 @@
 	}
 
 end:
+	g_free (udi);
 	g_free (parent_name);
 	g_free (parent_udi);
 
@@ -225,25 +229,20 @@
 
 	return result;
 }
-#endif
 
 gboolean
 rb_nokia770_is_mount_player (GMount *mount)
 {
-	gboolean result = FALSE;
-	gchar *str;
+	gboolean result;
 	GVolume *volume;
 
 	volume = g_mount_get_volume (mount);
-	if (volume != NULL) {
-		str = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-		if (str != NULL) {
-			result = hal_udi_is_nokia770 (str);
-			g_free (str);
-		}
-		g_object_unref (volume);
-	}
+	if (volume == NULL)
+		return FALSE;
 
+	result = volume_is_nokia770 (volume);
+	g_object_unref (volume);
+
 	return result;
 }
 
Index: plugins/generic-player/rb-psp-source.c
===================================================================
--- plugins/generic-player/rb-psp-source.c	(revision 6281)
+++ plugins/generic-player/rb-psp-source.c	(working copy)
@@ -272,11 +272,11 @@
 }
 
 static gboolean
-hal_udi_is_psp (const char *udi)
+volume_is_psp (GVolume *volume)
 {
 	LibHalContext *ctx;
 	DBusConnection *conn;
-	char *parent_udi;
+	char *parent_udi, *udi;
 	char *parent_name;
 	gboolean result;
 	DBusError error;
@@ -285,6 +285,7 @@
 	result = FALSE;
 	dbus_error_init (&error);
 
+	udi = NULL;
 	parent_udi = NULL;
 	parent_name = NULL;
 
@@ -302,6 +303,10 @@
 	if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
 		goto end;
 
+	udi = rhythmbox_get_volume_udi (volume, ctx);
+	if (udi == NULL)
+		goto end;
+
 	inited = TRUE;
 	parent_udi = libhal_device_get_property_string (ctx, udi,
 			"info.parent", &error);
@@ -318,6 +323,7 @@
 	}
 
 end:
+	g_free (udi);
 	g_free (parent_udi);
 	g_free (parent_name);
 
@@ -342,19 +348,15 @@
 rb_psp_is_mount_player (GMount *mount)
 {
 	GVolume *volume;
-	gboolean result = FALSE;
+	gboolean result;
 
 	volume = g_mount_get_volume (mount);
-	if (volume != NULL) {
-		char *str;
+	if (volume == NULL)
+		return FALSE;
 
-		str = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-		if (str != NULL) {
-			result = hal_udi_is_psp (str);
-			g_free (str);
-		}
-		g_object_unref (volume);
-	}
+	result = volume_is_psp (volume);
+	g_object_unref (volume);
+
 	return result;
 }
 
Index: plugins/generic-player/rb-generic-player-source.c
===================================================================
--- plugins/generic-player/rb-generic-player-source.c	(revision 6281)
+++ plugins/generic-player/rb-generic-player-source.c	(working copy)
@@ -1468,7 +1468,7 @@
 		return NULL;
 	}
 
-	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
+	udi = rhythmbox_get_volume_udi (volume, ctx);
 
 	if (udi == NULL) {
 		g_object_unref (volume);
Index: plugins/ipod/rb-ipod-helpers.c
===================================================================
--- plugins/ipod/rb-ipod-helpers.c	(revision 6281)
+++ plugins/ipod/rb-ipod-helpers.c	(working copy)
@@ -44,6 +44,7 @@
 #endif
 
 #include "rb-ipod-helpers.h"
+#include "rb-util.h"
 
 #include "rb-debug.h"
 #include "rb-dialog.h"
@@ -402,11 +403,11 @@
 
 #ifdef HAVE_HAL
 static gboolean
-hal_udi_is_ipod (const char *udi)
+volume_is_ipod (GVolume *volume)
 {
 	LibHalContext *ctx;
 	DBusConnection *conn;
-	char *parent_udi;
+	char *parent_udi, *udi;
 	char **methods_list;
 	guint i;
 	gboolean result;
@@ -416,6 +417,7 @@
 	result = FALSE;
 	dbus_error_init (&error);
 
+	udi = NULL;
 	conn = NULL;
 	parent_udi = NULL;
 	methods_list = NULL;
@@ -436,6 +438,10 @@
 	if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
 		goto end;
 
+	udi = rhythmbox_get_volume_udi (volume, ctx);
+	if (udi == NULL)
+		goto end;
+
 	inited = TRUE;
 	parent_udi = libhal_device_get_property_string (ctx, udi,
 							"info.parent", &error);
@@ -453,6 +459,7 @@
 	}
 
 end:
+	g_free (udi);
 	g_free (parent_udi);
 	libhal_free_string_array (methods_list);
 
@@ -476,24 +483,16 @@
 gboolean
 rb_ipod_helpers_is_ipod (GMount *mount)
 {
-	gchar *udi;
-        gboolean result;
+	gboolean result;
 	GVolume *volume;
 
 	volume = g_mount_get_volume (mount);
 	if (volume == NULL)
 		return FALSE;
 
-	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
+	result = volume_is_ipod (volume);
 	g_object_unref (volume);
 
-        if (udi == NULL) {
-                return FALSE;
-        }
-
-        result = hal_udi_is_ipod (udi);
-        g_free (udi);
-
 	return result;
 }
 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- rhythmbox.spec	25 Mar 2009 13:47:33 -0000	1.239
+++ rhythmbox.spec	9 Apr 2009 16:48:33 -0000	1.240
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.12.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -54,8 +54,11 @@
 Patch0: rb-disable-power-plugin-by-default.patch
 # http://svn.gnome.org/viewvc/rhythmbox?view=revision&revision=6245
 Patch1: rb-0.12.0-use-decodebin2.patch
-#
+# http://bugzilla.gnome.org/show_bug.cgi?id=510236
 Patch2: fix-psp-entry-types.diff
+# http://bugzilla.gnome.org/show_bug.cgi?id=578514
+Patch3: rb-ddkit-monitor.patch
+BuildRequires: automake autoconf libtool
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -92,10 +95,13 @@
 %patch0 -p0 -b .dont-disable-suspend
 %patch1 -p0 -b .decodebin2
 %patch2 -p1 -b .psp-crasher
+%patch3 -p0 -b .ddkit
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
 
+automake
+
 %build
 
 # work around a gstreamer bug
@@ -228,6 +234,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Apr 09 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-4
+- Fix iPod detection with the DeviceKit-disks gvfs monitor (#493640)
+
 * Wed Mar 25 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-3
 - Fix crasher in the PSP and Nokia plugins
 



From hadess at fedoraproject.org  Thu Apr  9 17:02:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  9 Apr 2009 17:02:54 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-ddkit-monitor.patch, 1.1, 1.2 rhythmbox.spec,
	1.240, 1.241
Message-ID: <20090409170254.890F870137@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14055

Modified Files:
	rb-ddkit-monitor.patch rhythmbox.spec 
Log Message:
Backport patch to 0.12.0, the optimist in me didn't see that happening


rb-ddkit-monitor.patch:

Index: rb-ddkit-monitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rb-ddkit-monitor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rb-ddkit-monitor.patch	9 Apr 2009 16:48:33 -0000	1.1
+++ rb-ddkit-monitor.patch	9 Apr 2009 17:02:53 -0000	1.2
@@ -1,7 +1,19 @@
-Index: lib/rb-util.c
-===================================================================
---- lib/rb-util.c	(revision 6281)
-+++ lib/rb-util.c	(working copy)
+diff -upr rhythmbox-0.12.0.old/lib/Makefile.am rhythmbox-0.12.0/lib/Makefile.am
+--- rhythmbox-0.12.0.old/lib/Makefile.am	2009-03-12 02:26:11.000000000 +0000
++++ rhythmbox-0.12.0/lib/Makefile.am	2009-04-09 18:00:18.000000000 +0100
+@@ -44,7 +44,7 @@ INCLUDES =						\
+ 	$(SOUP_CFLAGS)					\
+ 	$(RHYTHMBOX_CFLAGS)
+ 
+-librb_la_LIBADD = $(SOUP_LIBS)
++librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS)
+ 
+ BUILT_SOURCES=
+ 
+Only in rhythmbox-0.12.0/lib: Makefile.am.orig
+diff -upr rhythmbox-0.12.0.old/lib/rb-util.c rhythmbox-0.12.0/lib/rb-util.c
+--- rhythmbox-0.12.0.old/lib/rb-util.c	2009-03-12 02:26:12.000000000 +0000
++++ rhythmbox-0.12.0/lib/rb-util.c	2009-04-09 17:59:56.000000000 +0100
 @@ -38,6 +38,11 @@
  #include <gobject/gvaluecollector.h>
  #include <gio/gio.h>
@@ -14,7 +26,7 @@
  #include "rb-util.h"
  #include "rb-debug.h"
  
-@@ -991,3 +996,39 @@
+@@ -991,3 +996,39 @@ rb_scale_pixbuf_to_size (GdkPixbuf *pixb
  	return gdk_pixbuf_scale_simple (pixbuf, d_width, d_height, GDK_INTERP_BILINEAR);
  }
  
@@ -54,11 +66,10 @@
 +}
 +#endif /* HAVE_HAL */
 +
-Index: lib/rb-util.h
-===================================================================
---- lib/rb-util.h	(revision 6281)
-+++ lib/rb-util.h	(working copy)
-@@ -100,6 +100,8 @@
+diff -upr rhythmbox-0.12.0.old/lib/rb-util.h rhythmbox-0.12.0/lib/rb-util.h
+--- rhythmbox-0.12.0.old/lib/rb-util.h	2009-03-12 02:26:12.000000000 +0000
++++ rhythmbox-0.12.0/lib/rb-util.h	2009-04-09 17:59:56.000000000 +0100
+@@ -100,6 +100,8 @@ void rb_set_tree_view_column_fixed_width
  GdkPixbuf *rb_scale_pixbuf_to_size (GdkPixbuf *pixbuf,
  				    GtkIconSize size);
  
@@ -67,27 +78,22 @@
  G_END_DECLS
  
  #endif /* __RB_UTIL_H */
-Index: lib/Makefile.am
-===================================================================
---- lib/Makefile.am	(revision 6281)
-+++ lib/Makefile.am	(working copy)
-@@ -49,9 +49,10 @@
- 	-I$(top_srcdir) 				\
- 	-I$(top_srcdir)/widgets				\
- 	$(SOUP_CFLAGS)					\
-+	$(HAL_CFLAGS)					\
- 	$(RHYTHMBOX_CFLAGS)
- 
--librb_la_LIBADD = $(SOUP_LIBS) -lSM -lICE
-+librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS) -lSM -lICE
+diff -upr rhythmbox-0.12.0.old/plugins/generic-player/rb-generic-player-source.c rhythmbox-0.12.0/plugins/generic-player/rb-generic-player-source.c
+--- rhythmbox-0.12.0.old/plugins/generic-player/rb-generic-player-source.c	2009-03-12 02:26:13.000000000 +0000
++++ rhythmbox-0.12.0/plugins/generic-player/rb-generic-player-source.c	2009-04-09 17:59:56.000000000 +0100
+@@ -1468,7 +1468,7 @@ get_hal_udi_for_player (LibHalContext *c
+ 		return NULL;
+ 	}
  
- BUILT_SOURCES=
+-	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
++	udi = rhythmbox_get_volume_udi (volume, ctx);
  
-Index: plugins/generic-player/rb-nokia770-source.c
-===================================================================
---- plugins/generic-player/rb-nokia770-source.c	(revision 6281)
-+++ plugins/generic-player/rb-nokia770-source.c	(working copy)
-@@ -136,14 +136,12 @@
+ 	if (udi == NULL) {
+ 		g_object_unref (volume);
+diff -upr rhythmbox-0.12.0.old/plugins/generic-player/rb-nokia770-source.c rhythmbox-0.12.0/plugins/generic-player/rb-nokia770-source.c
+--- rhythmbox-0.12.0.old/plugins/generic-player/rb-nokia770-source.c	2009-04-09 17:59:08.000000000 +0100
++++ rhythmbox-0.12.0/plugins/generic-player/rb-nokia770-source.c	2009-04-09 17:59:56.000000000 +0100
+@@ -136,14 +136,12 @@ impl_uri_from_playlist_uri (RBGenericPla
  }
  
  
@@ -104,7 +110,7 @@
  	char *parent_name;
  	gboolean result;
  	DBusError error;
-@@ -153,6 +151,7 @@
+@@ -153,6 +151,7 @@ hal_udi_is_nokia770 (const char *udi)
  	dbus_error_init (&error);
  
  	conn = NULL;
@@ -112,7 +118,7 @@
  	parent_udi = NULL;
  	parent_name = NULL;
  
-@@ -169,6 +168,10 @@
+@@ -169,6 +168,10 @@ hal_udi_is_nokia770 (const char *udi)
  	if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
  		goto end;
  
@@ -123,7 +129,7 @@
  	inited = TRUE;
  	parent_udi = libhal_device_get_property_string (ctx,
  							udi,
-@@ -206,6 +209,7 @@
+@@ -206,6 +209,7 @@ hal_udi_is_nokia770 (const char *udi)
  	}
  
  end:
@@ -131,7 +137,7 @@
  	g_free (parent_name);
  	g_free (parent_udi);
  
-@@ -225,25 +229,20 @@
+@@ -225,24 +229,19 @@ end:
  
  	return result;
  }
@@ -156,19 +162,17 @@
 -	}
 +	if (volume == NULL)
 +		return FALSE;
- 
++
 +	result = volume_is_nokia770 (volume);
 +	g_object_unref (volume);
-+
- 	return result;
- }
  
-Index: plugins/generic-player/rb-psp-source.c
-===================================================================
---- plugins/generic-player/rb-psp-source.c	(revision 6281)
-+++ plugins/generic-player/rb-psp-source.c	(working copy)
-@@ -272,11 +272,11 @@
+ 	return result;
  }
+diff -upr rhythmbox-0.12.0.old/plugins/generic-player/rb-psp-source.c rhythmbox-0.12.0/plugins/generic-player/rb-psp-source.c
+--- rhythmbox-0.12.0.old/plugins/generic-player/rb-psp-source.c	2009-04-09 17:59:08.000000000 +0100
++++ rhythmbox-0.12.0/plugins/generic-player/rb-psp-source.c	2009-04-09 18:01:16.000000000 +0100
+@@ -276,11 +276,11 @@ rb_psp_source_create_playlists (RBGeneri
+ #ifdef HAVE_HAL
  
  static gboolean
 -hal_udi_is_psp (const char *udi)
@@ -181,7 +185,7 @@
  	char *parent_name;
  	gboolean result;
  	DBusError error;
-@@ -285,6 +285,7 @@
+@@ -289,6 +289,7 @@ hal_udi_is_psp (const char *udi)
  	result = FALSE;
  	dbus_error_init (&error);
  
@@ -189,7 +193,7 @@
  	parent_udi = NULL;
  	parent_name = NULL;
  
-@@ -302,6 +303,10 @@
+@@ -306,6 +307,10 @@ hal_udi_is_psp (const char *udi)
  	if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
  		goto end;
  
@@ -200,7 +204,7 @@
  	inited = TRUE;
  	parent_udi = libhal_device_get_property_string (ctx, udi,
  			"info.parent", &error);
-@@ -318,6 +323,7 @@
+@@ -322,6 +327,7 @@ hal_udi_is_psp (const char *udi)
  	}
  
  end:
@@ -208,49 +212,25 @@
  	g_free (parent_udi);
  	g_free (parent_name);
  
-@@ -342,19 +348,15 @@
- rb_psp_is_mount_player (GMount *mount)
- {
- 	GVolume *volume;
--	gboolean result = FALSE;
-+	gboolean result;
- 
+@@ -362,13 +368,7 @@ rb_psp_is_mount_player (GMount *mount)
+ #else
  	volume = g_mount_get_volume (mount);
--	if (volume != NULL) {
+ 	if (volume != NULL) {
 -		char *str;
-+	if (volume == NULL)
-+		return FALSE;
- 
+-
 -		str = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
 -		if (str != NULL) {
 -			result = hal_udi_is_psp (str);
 -			g_free (str);
 -		}
--		g_object_unref (volume);
--	}
-+	result = volume_is_psp (volume);
-+	g_object_unref (volume);
-+
- 	return result;
- }
- 
-Index: plugins/generic-player/rb-generic-player-source.c
-===================================================================
---- plugins/generic-player/rb-generic-player-source.c	(revision 6281)
-+++ plugins/generic-player/rb-generic-player-source.c	(working copy)
-@@ -1468,7 +1468,7 @@
- 		return NULL;
- 	}
- 
--	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-+	udi = rhythmbox_get_volume_udi (volume, ctx);
- 
- 	if (udi == NULL) {
++		result = volume_is_psp (volume);
  		g_object_unref (volume);
-Index: plugins/ipod/rb-ipod-helpers.c
-===================================================================
---- plugins/ipod/rb-ipod-helpers.c	(revision 6281)
-+++ plugins/ipod/rb-ipod-helpers.c	(working copy)
+ 	}
+ #endif
+Only in rhythmbox-0.12.0/plugins/generic-player: rb-psp-source.c.orig
+diff -upr rhythmbox-0.12.0.old/plugins/ipod/rb-ipod-helpers.c rhythmbox-0.12.0/plugins/ipod/rb-ipod-helpers.c
+--- rhythmbox-0.12.0.old/plugins/ipod/rb-ipod-helpers.c	2009-03-13 02:13:52.000000000 +0000
++++ rhythmbox-0.12.0/plugins/ipod/rb-ipod-helpers.c	2009-04-09 17:59:56.000000000 +0100
 @@ -44,6 +44,7 @@
  #endif
  
@@ -259,7 +239,7 @@
  
  #include "rb-debug.h"
  #include "rb-dialog.h"
-@@ -402,11 +403,11 @@
+@@ -402,11 +403,11 @@ rb_ipod_helpers_mount_has_ipod_db (GMoun
  
  #ifdef HAVE_HAL
  static gboolean
@@ -273,7 +253,7 @@
  	char **methods_list;
  	guint i;
  	gboolean result;
-@@ -416,6 +417,7 @@
+@@ -416,6 +417,7 @@ hal_udi_is_ipod (const char *udi)
  	result = FALSE;
  	dbus_error_init (&error);
  
@@ -281,7 +261,7 @@
  	conn = NULL;
  	parent_udi = NULL;
  	methods_list = NULL;
-@@ -436,6 +438,10 @@
+@@ -436,6 +438,10 @@ hal_udi_is_ipod (const char *udi)
  	if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
  		goto end;
  
@@ -292,7 +272,7 @@
  	inited = TRUE;
  	parent_udi = libhal_device_get_property_string (ctx, udi,
  							"info.parent", &error);
-@@ -453,6 +459,7 @@
+@@ -453,6 +459,7 @@ hal_udi_is_ipod (const char *udi)
  	}
  
  end:
@@ -300,7 +280,7 @@
  	g_free (parent_udi);
  	libhal_free_string_array (methods_list);
  
-@@ -476,24 +483,16 @@
+@@ -476,24 +483,16 @@ end:
  gboolean
  rb_ipod_helpers_is_ipod (GMount *mount)
  {


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- rhythmbox.spec	9 Apr 2009 16:48:33 -0000	1.240
+++ rhythmbox.spec	9 Apr 2009 17:02:53 -0000	1.241
@@ -95,7 +95,7 @@
 %patch0 -p0 -b .dont-disable-suspend
 %patch1 -p0 -b .decodebin2
 %patch2 -p1 -b .psp-crasher
-%patch3 -p0 -b .ddkit
+%patch3 -p1 -b .ddkit
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'



From leigh123linux at fedoraproject.org  Thu Apr  9 17:11:22 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu,  9 Apr 2009 17:11:22 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090409171122.E995A7001C@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16319

Modified Files:
	.cvsignore sources 
Log Message:
update to 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Mar 2009 05:05:27 -0000	1.3
+++ .cvsignore	9 Apr 2009 17:10:52 -0000	1.4
@@ -1 +1 @@
-qbittorrent-1.3.2.tar.gz
+qbittorrent-1.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Mar 2009 04:55:38 -0000	1.3
+++ sources	9 Apr 2009 17:10:52 -0000	1.4
@@ -1 +1 @@
-680ea41e5601d5cd7990b303f9ad503c  qbittorrent-1.3.2.tar.gz
+863f963beefc3c93dfe25ee6a6b0ed47  qbittorrent-1.3.3.tar.gz



From hadess at fedoraproject.org  Thu Apr  9 17:12:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  9 Apr 2009 17:12:35 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-ddkit-monitor.patch, 1.2, 1.3 rhythmbox.spec,
	1.241, 1.242
Message-ID: <20090409171235.ED8737001C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17484

Modified Files:
	rb-ddkit-monitor.patch rhythmbox.spec 
Log Message:
More autotools hate, fix logic bug in the patch


rb-ddkit-monitor.patch:

Index: rb-ddkit-monitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rb-ddkit-monitor.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rb-ddkit-monitor.patch	9 Apr 2009 17:02:53 -0000	1.2
+++ rb-ddkit-monitor.patch	9 Apr 2009 17:12:35 -0000	1.3
@@ -50,7 +50,7 @@
 +							"block.device", dev,
 +							&num_udis, NULL);
 +
-+	if (udis != NULL || num_udis < 1)
++	if (udis == NULL || num_udis < 1)
 +		return NULL;
 +
 +	udi = g_strdup (udis[0]);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- rhythmbox.spec	9 Apr 2009 17:02:53 -0000	1.241
+++ rhythmbox.spec	9 Apr 2009 17:12:35 -0000	1.242
@@ -100,6 +100,7 @@
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
 
+aclocal
 automake
 
 %build



From leigh123linux at fedoraproject.org  Thu Apr  9 17:15:13 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu,  9 Apr 2009 17:15:13 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.8,1.9
Message-ID: <20090409171513.356507001C@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17972

Modified Files:
	qbittorrent.spec 
Log Message:
update to 1.3.3 



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qbittorrent.spec	7 Mar 2009 05:39:09 -0000	1.8
+++ qbittorrent.spec	9 Apr 2009 17:14:42 -0000	1.9
@@ -1,7 +1,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.3.2
-Release: 13%{dist}
+Version: 1.3.3
+Release: 1%{dist}
 Source0: http://downloads.sf.net/qbittorrent/qbittorrent-1.3.2.tar.gz
 Patch0:  qbittorrent_flag.patch
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Apr 9 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-1
+- update to version 1.3.3
+
 * Sat Mar 7 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.2-13
 - Had problems with cvs commit
 



From sereinit at fedoraproject.org  Thu Apr  9 17:20:43 2009
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Thu,  9 Apr 2009 17:20:43 +0000 (UTC)
Subject: rpms/gbrainy/devel .cvsignore, 1.4, 1.5 gbrainy.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20090409172043.2C5737001C@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19673

Modified Files:
	.cvsignore gbrainy.spec sources 
Log Message:
update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2008 10:58:01 -0000	1.4
+++ .cvsignore	9 Apr 2009 17:20:12 -0000	1.5
@@ -1 +1 @@
-gbrainy-1.00.tar.gz
+gbrainy-1.1.tar.gz


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gbrainy.spec	24 Feb 2009 19:42:41 -0000	1.10
+++ gbrainy.spec	9 Apr 2009 17:20:12 -0000	1.11
@@ -3,22 +3,22 @@
 # http://fedoraproject.org/wiki/Packaging/Debuginfo#head-29573c4f61c3a4698b2d07c7e73cfa194785f257
 
 Name:		gbrainy
-Version:	1.00
-Release:	4%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
 License:	GPLv2
 URL:		http://live.gnome.org/gbrainy
-Source0:	http://www.softcatala.org/~jmas/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://gent.softcatala.org/jmas/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	mono-devel intltool librsvg2-devel
+BuildRequires:	mono-devel intltool librsvg2-develmono-addins-devel
 BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
 
 %description
 gbrainy is a brain teaser game and trainer to have
@@ -83,6 +83,10 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Wed Apr 08 2009 Beno??t Marcelin <sereinity at online.fr> 1.1-1
+- Update to 1.1
+- Update ExclusiveArch according to mono
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2008 10:58:02 -0000	1.4
+++ sources	9 Apr 2009 17:20:12 -0000	1.5
@@ -1 +1 @@
-adff790db643e846cb15c6142f2411ae  gbrainy-1.00.tar.gz
+2c2ec926ad461c6f1a6da391615824ca  gbrainy-1.1.tar.gz



From leigh123linux at fedoraproject.org  Thu Apr  9 17:26:39 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu,  9 Apr 2009 17:26:39 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.9,1.10
Message-ID: <20090409172639.C2E817001C@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21066

Modified Files:
	qbittorrent.spec 
Log Message:
Fix mistake in spec file 



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qbittorrent.spec	9 Apr 2009 17:14:42 -0000	1.9
+++ qbittorrent.spec	9 Apr 2009 17:26:09 -0000	1.10
@@ -1,8 +1,8 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.3.3
-Release: 1%{dist}
-Source0: http://downloads.sf.net/qbittorrent/qbittorrent-1.3.2.tar.gz
+Release: 2%{dist}
+Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Apr 9 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-2
+- Remember to update Source in spec file 
+
 * Thu Apr 9 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-1
 - update to version 1.3.3
 



From pkgdb at fedoraproject.org  Thu Apr  9 17:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 17:31:45 +0000
Subject: [pkgdb] tar: linville has requested commit
Message-ID: <20090409173145.5B5C210F862@bastion2.fedora.phx.redhat.com>

linville has requested the commit acl on tar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tar



From pkgdb at fedoraproject.org  Thu Apr  9 17:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 17:32:48 +0000
Subject: [pkgdb] tar: linville has requested watchcommits
Message-ID: <20090409173150.6A9D010F872@bastion2.fedora.phx.redhat.com>

linville has requested the watchcommits acl on tar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tar



From sereinit at fedoraproject.org  Thu Apr  9 17:32:01 2009
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Thu,  9 Apr 2009 17:32:01 +0000 (UTC)
Subject: rpms/gbrainy/devel gbrainy.spec,1.11,1.12
Message-ID: <20090409173201.7C06E7001C@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22804

Modified Files:
	gbrainy.spec 
Log Message:
Fix buildrequires


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gbrainy.spec	9 Apr 2009 17:20:12 -0000	1.11
+++ gbrainy.spec	9 Apr 2009 17:31:31 -0000	1.12
@@ -13,7 +13,7 @@
 Source0:	http://gent.softcatala.org/jmas/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	mono-devel intltool librsvg2-develmono-addins-devel
+BuildRequires:	mono-devel intltool librsvg2-devel mono-addins-devel
 BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
@@ -83,6 +83,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Thu Apr 09 2009 Beno??t Marcelin <sereinity at online.fr> 1.1-2
+- Fix buildrequires
+
 * Wed Apr 08 2009 Beno??t Marcelin <sereinity at online.fr> 1.1-1
 - Update to 1.1
 - Update ExclusiveArch according to mono



From pkgdb at fedoraproject.org  Thu Apr  9 17:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 17:33:01 +0000
Subject: [pkgdb] tar: linville has requested commit
Message-ID: <20090409173205.B63E510F875@bastion2.fedora.phx.redhat.com>

linville has requested the commit acl on tar (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tar



From pkgdb at fedoraproject.org  Thu Apr  9 17:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 17:32:08 +0000
Subject: [pkgdb] tar: linville has requested watchcommits
Message-ID: <20090409173207.C423610F878@bastion2.fedora.phx.redhat.com>

linville has requested the watchcommits acl on tar (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tar



From sereinit at fedoraproject.org  Thu Apr  9 17:34:01 2009
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Thu,  9 Apr 2009 17:34:01 +0000 (UTC)
Subject: rpms/gbrainy/devel gbrainy.spec,1.12,1.13
Message-ID: <20090409173401.C73E970137@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23560

Modified Files:
	gbrainy.spec 
Log Message:
Fix release


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gbrainy.spec	9 Apr 2009 17:31:31 -0000	1.12
+++ gbrainy.spec	9 Apr 2009 17:33:31 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games



From limb at fedoraproject.org  Thu Apr  9 17:42:05 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  9 Apr 2009 17:42:05 +0000 (UTC)
Subject: rpms/wesnoth/F-10 wesnoth-1.5.11-remove-ogg-test.patch, NONE,
	1.1 sources, 1.31, 1.32 wesnoth.spec, 1.60, 1.61
Message-ID: <20090409174205.59BED7001C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26293

Modified Files:
	sources wesnoth.spec 
Added Files:
	wesnoth-1.5.11-remove-ogg-test.patch 
Log Message:
Update to 1.6, BZ 494678.


wesnoth-1.5.11-remove-ogg-test.patch:

--- NEW FILE wesnoth-1.5.11-remove-ogg-test.patch ---
--- configure.ac~	2009-02-02 13:31:10.000000000 -0600
+++ configure.ac	2009-02-02 13:31:10.000000000 -0600
@@ -877,17 +876,0 @@
-    AC_RUN_IFELSE([AC_LANG_SOURCE([
-    #include <SDL_mixer.h>
-    #include <stdlib.h>
-
-    int main(int argc, char **argv)
-    {
-	Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg");
-	if (music == NULL)
-	    exit(1);
-	exit(0);
-    }
-    ])],
-    [AC_MSG_RESULT(yes)],
-    [AC_MSG_RESULT(no)]
-    [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG support])],
-    [AC_MSG_RESULT([not tested in cross-compiling])])
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	28 Dec 2008 20:27:46 -0000	1.31
+++ sources	9 Apr 2009 17:41:34 -0000	1.32
@@ -1 +1 @@
-fdd341c3d66bf1bea2113c79db852d68  wesnoth-1.4.7.tar.bz2
+3c4618eb64d1e5aeb6a00ab3956d5080  wesnoth-1.6a.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-10/wesnoth.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- wesnoth.spec	28 Dec 2008 20:27:46 -0000	1.60
+++ wesnoth.spec	9 Apr 2009 17:41:34 -0000	1.61
@@ -1,22 +1,23 @@
 Name:           wesnoth
-Version:        1.4.7
+Version:        1.6
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.wesnoth.org
-Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
+Source0:        http://www.%{name}.org/files/%{name}-%{version}a.tar.bz2
 Source1:        wesnothd.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-1.2.8-gcc43.patch
-Patch1:         wesnoth-1.3.16-remove-ogg-test.patch
+Patch1:         wesnoth-1.5.11-remove-ogg-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       wesnoth-data = %{version}
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:  SDL_net-devel
+BuildRequires:	SDL_ttf-devel
 BuildRequires:	freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:	fribidi-devel
@@ -24,6 +25,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	boost-devel
+BuildRequires:	pango-devel
 # Drop these when ogg test patch is removed.
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -45,7 +47,7 @@
 scenarios--or even full-blown campaigns. You can also challenge your
 friends--or strangers--and fight multi-player epic fantasy battles.
 
-%ifnarch noarch
+##%ifnarch noarch
 %package server
 Summary:	%{summary}
 Group:		Amusements/Games
@@ -69,18 +71,19 @@
 %description tools
 This package contains the game editor and development tools.
 
-%else
+##%else
 %package data
 Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}
+BuildArch:	noarch
 
 %description data
 This package contains the data files for Wesnoth.
-%endif
+##%endif
 
 %prep
-%setup -q
+%setup -qn wesnoth-1.6a
 %patch0 -p1 -b .gcc43
 %patch1 -p0
 autoreconf
@@ -97,21 +100,23 @@
     --enable-python \
     --with-fifodir=/var/run/wesnothd \
     --with-server-uid=$(id -u) \
-    --with-server-gid=$(id -g) 
-%ifnarch noarch
+    --with-server-gid=$(id -g) \
+    --disable-strict-compilation
+#%ifnarch noarch
 make %{?_smp_mflags}
-%endif
+#%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%ifarch noarch
+#%ifarch noarch
 ### Data Files and Desktop Files
 make install-data DESTDIR=${RPM_BUILD_ROOT}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
+		     --remove-key="Version" \
                      icons/%{name}.desktop
 
 # add icon for menus
@@ -131,12 +136,13 @@
 %find_lang %{name}.\*
 
 
-%else
+#%else
 ### Binaries and Config Files
 make install-exec DESTDIR=${RPM_BUILD_ROOT}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
+		     --remove-key="Version" \
                      icons/%{name}_editor.desktop
 
 # arrange server package files
@@ -149,7 +155,7 @@
 install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
 
-%endif
+#%endif
 
 ### Cleanup Stuff
 rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth*
@@ -162,12 +168,12 @@
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/wesnoth/
 rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth-icon.png
 rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth_editor-icon.png
-
+rm -f $RPM_BUILD_ROOT/usr/share/applications/fedora-wesnoth_editor.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%ifarch noarch
+#%ifarch noarch
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -179,9 +185,9 @@
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
-%endif
+#%endif
 
-%ifnarch noarch
+#%ifnarch noarch
 %pre server
 /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
 	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
@@ -199,9 +205,9 @@
     %{_initrddir}/wesnothd stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del wesnothd
 fi
-%endif
+#%endif
 
-%ifnarch noarch
+#%ifnarch noarch
 %files
 %doc COPYING changelog README copyright doc/manual/
 %defattr(-,root,root,-)
@@ -209,13 +215,14 @@
 
 %files tools
 %defattr(-,root,root,-)
-%{_bindir}/wesnoth_editor
+#%{_bindir}/wesnoth_editor
+%{_bindir}/wesnoth_addon_manager
 %{_bindir}/exploder
 %{_bindir}/cutter
 %{_bindir}/wmlindent
 %{_bindir}/wmllint
 %{_bindir}/wmlscope
-%{_datadir}/applications/fedora-wesnoth_editor.desktop
+#%{_datadir}/applications/fedora-wesnoth_editor.desktop
 
 %files server
 %defattr(-,root,root,-)
@@ -224,9 +231,9 @@
 %{_sbindir}/wesnothd
 %attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/
 %ghost /var/run/wesnothd/socket
-%endif
+#%endif
 
-%ifarch noarch
+#%ifarch noarch
 %files data -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
@@ -234,14 +241,52 @@
 %{_datadir}/pixmaps/*
 %{_mandir}/man6/wesnoth.6*
 %{_mandir}/*/man6/wesnoth.6*
-%{_mandir}/man6/wesnoth_editor.6*
-%{_mandir}/*/man6/wesnoth_editor.6*
+#%{_mandir}/man6/wesnoth_editor.6*
+#%{_mandir}/*/man6/wesnoth_editor.6*
 %{_mandir}/man6/wesnothd.*
 %{_mandir}/*/man6/wesnothd.*
 
-%endif
+#%endif
 
 %changelog
+* Mon Mar 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.6-1
+- Update to 1.6 stable.
+
+* Tue Mar 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.14-1
+- Update to 1.5.14.
+
+* Wed Mar 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.13-1
+- Update to 1.5.13.
+
+* Wed Mar 04 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.12-1
+- Update to 1.5.12.
+
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-5
+- Drop -Werror.
+
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-4
+- Add pango BR.
+
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-3
+- Add SDL_ttf BR.
+
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-2
+- Rename rediffed ogg test patch.
+
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-1
+- Update to dev version 1.5.11.
+
+* Tue Feb 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.10-1
+- Update to dev version 1.5.10.
+- Move data to noarch.
+
+* Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.9-1
+- Update to dev version 1.5.9.
+
+* Mon Feb 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.8-1
+- Update to dev version 1.5.8.
+- Rediffed remove-ogg-test patch.
+
 * Sun Dec 28 2008 Warren Togami <wtogami at redhat.com> - 1.4.7-1
 - 1.4.7
 - Remove font requirement



From anyremote at fedoraproject.org  Thu Apr  9 17:43:49 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Thu,  9 Apr 2009 17:43:49 +0000 (UTC)
Subject: rpms/kanyremote/F-9 .cvsignore, 1.16, 1.17 import.log, 1.15,
	1.16 kanyremote.spec, 1.18, 1.19 sources, 1.19, 1.20
Message-ID: <20090409174349.6D0047001C@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27182/F-9

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Apr 2009 18:29:25 -0000	1.16
+++ .cvsignore	9 Apr 2009 17:43:18 -0000	1.17
@@ -1 +1 @@
-kanyremote-5.8.1.tar.gz
+kanyremote-5.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	7 Apr 2009 18:29:25 -0000	1.15
+++ import.log	9 Apr 2009 17:43:18 -0000	1.16
@@ -13,3 +13,4 @@
 kanyremote-5_7-1_fc10:F-9:kanyremote-5.7-1.fc10.src.rpm:1236975580
 kanyremote-5_8-1_fc10:F-9:kanyremote-5.8-1.fc10.src.rpm:1238438085
 kanyremote-5_8_1-1_fc10:F-9:kanyremote-5.8.1-1.fc10.src.rpm:1239128941
+kanyremote-5_8_2-1_fc10:F-9:kanyremote-5.8.2-1.fc10.src.rpm:1239299023


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kanyremote.spec	7 Apr 2009 18:29:25 -0000	1.18
+++ kanyremote.spec	9 Apr 2009 17:43:19 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.8.1
+Version: 5.8.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Tue Apr 9 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.2
+- Small enhancements 
+
 * Tue Apr 7 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.1
 - Fix small bug 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Apr 2009 18:29:25 -0000	1.19
+++ sources	9 Apr 2009 17:43:19 -0000	1.20
@@ -1 +1 @@
-00c82c242d74c3643e427f0a23b83675  kanyremote-5.8.1.tar.gz
+5a3e335cba9c2692fccc59b14cbb7aff  kanyremote-5.8.2.tar.gz



From anyremote at fedoraproject.org  Thu Apr  9 17:44:04 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Thu,  9 Apr 2009 17:44:04 +0000 (UTC)
Subject: rpms/kanyremote/F-10 .cvsignore, 1.16, 1.17 import.log, 1.16,
	1.17 kanyremote.spec, 1.17, 1.18 sources, 1.19, 1.20
Message-ID: <20090409174404.933757001C@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287/F-10

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Apr 2009 18:29:27 -0000	1.16
+++ .cvsignore	9 Apr 2009 17:43:34 -0000	1.17
@@ -1 +1 @@
-kanyremote-5.8.1.tar.gz
+kanyremote-5.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- import.log	7 Apr 2009 18:29:27 -0000	1.16
+++ import.log	9 Apr 2009 17:43:34 -0000	1.17
@@ -14,3 +14,4 @@
 kanyremote-5_7-1_fc10:F-10:kanyremote-5.7-1.fc10.src.rpm:1236975606
 kanyremote-5_8-1_fc10:F-10:kanyremote-5.8-1.fc10.src.rpm:1238438124
 kanyremote-5_8_1-1_fc10:F-10:kanyremote-5.8.1-1.fc10.src.rpm:1239128949
+kanyremote-5_8_2-1_fc10:F-10:kanyremote-5.8.2-1.fc10.src.rpm:1239299021


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/kanyremote.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kanyremote.spec	7 Apr 2009 18:29:27 -0000	1.17
+++ kanyremote.spec	9 Apr 2009 17:43:34 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.8.1
+Version: 5.8.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Tue Apr 9 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.2
+- Small enhancements 
+
 * Tue Apr 7 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.1
 - Fix small bug 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Apr 2009 18:29:27 -0000	1.19
+++ sources	9 Apr 2009 17:43:34 -0000	1.20
@@ -1 +1 @@
-00c82c242d74c3643e427f0a23b83675  kanyremote-5.8.1.tar.gz
+5a3e335cba9c2692fccc59b14cbb7aff  kanyremote-5.8.2.tar.gz



From anyremote at fedoraproject.org  Thu Apr  9 17:44:16 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Thu,  9 Apr 2009 17:44:16 +0000 (UTC)
Subject: rpms/kanyremote/devel .cvsignore, 1.16, 1.17 import.log, 1.18,
	1.19 kanyremote.spec, 1.21, 1.22 sources, 1.21, 1.22
Message-ID: <20090409174416.4E4A77001C@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27359/devel

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Apr 2009 18:29:30 -0000	1.16
+++ .cvsignore	9 Apr 2009 17:43:46 -0000	1.17
@@ -1 +1 @@
-kanyremote-5.8.1.tar.gz
+kanyremote-5.8.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	7 Apr 2009 18:29:30 -0000	1.18
+++ import.log	9 Apr 2009 17:43:46 -0000	1.19
@@ -16,3 +16,4 @@
 kanyremote-5_7-1_fc10:HEAD:kanyremote-5.7-1.fc10.src.rpm:1236975597
 kanyremote-5_8-1_fc10:HEAD:kanyremote-5.8-1.fc10.src.rpm:1238438057
 kanyremote-5_8_1-1_fc10:HEAD:kanyremote-5.8.1-1.fc10.src.rpm:1239128974
+kanyremote-5_8_2-1_fc10:HEAD:kanyremote-5.8.2-1.fc10.src.rpm:1239299053


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kanyremote.spec	7 Apr 2009 18:29:30 -0000	1.21
+++ kanyremote.spec	9 Apr 2009 17:43:46 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.8.1
+Version: 5.8.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Tue Apr 9 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.2
+- Small enhancements 
+
 * Tue Apr 7 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.8.1
 - Fix small bug 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	7 Apr 2009 18:29:30 -0000	1.21
+++ sources	9 Apr 2009 17:43:46 -0000	1.22
@@ -1 +1 @@
-00c82c242d74c3643e427f0a23b83675  kanyremote-5.8.1.tar.gz
+5a3e335cba9c2692fccc59b14cbb7aff  kanyremote-5.8.2.tar.gz



From ajax at fedoraproject.org  Thu Apr  9 17:50:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  9 Apr 2009 17:50:08 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-gen3-fb-hack.patch, NONE, 1.1 kernel.spec,
	1.1525, 1.1526
Message-ID: <20090409175008.CE6547001C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29092

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-gen3-fb-hack.patch 
Log Message:
* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com>
- drm-intel-gen3-fb-hack.patch: Allow up to 4k framebuffers on 9[14]5.  3D
  will be broken if you do that, but at least dualhead will be less broken.


drm-intel-gen3-fb-hack.patch:

--- NEW FILE drm-intel-gen3-fb-hack.patch ---
diff -up linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c.jx linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c.jx	2009-04-09 13:42:51.000000000 -0400
+++ linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c	2009-04-09 13:44:14.000000000 -0400
@@ -2011,8 +2011,8 @@ void intel_modeset_init(struct drm_devic
 		dev->mode_config.max_width = 8192;
 		dev->mode_config.max_height = 8192;
 	} else {
-		dev->mode_config.max_width = 2048;
-		dev->mode_config.max_height = 2048;
+		dev->mode_config.max_width = 4096;
+		dev->mode_config.max_height = 4096;
 	}
 
 	/* set memory base */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1525
retrieving revision 1.1526
diff -u -r1.1525 -r1.1526
--- kernel.spec	9 Apr 2009 14:45:11 -0000	1.1525
+++ kernel.spec	9 Apr 2009 17:49:38 -0000	1.1526
@@ -680,6 +680,7 @@
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-intel-lying-systems-without-lvds.patch
+Patch1822: drm-intel-gen3-fb-hack.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1288,6 +1289,7 @@
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-lying-systems-without-lvds.patch
+ApplyPatch drm-intel-gen3-fb-hack.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1900,6 +1902,10 @@
 # and build.
 
 %changelog
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com>
+- drm-intel-gen3-fb-hack.patch: Allow up to 4k framebuffers on 9[14]5.  3D
+  will be broken if you do that, but at least dualhead will be less broken.
+
 * Thu Apr 09 2009 Dave Jones <davej at redhat.com>
 - Bring back the /dev/crash driver. (#492803)
 



From hadess at fedoraproject.org  Thu Apr  9 17:55:49 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  9 Apr 2009 17:55:49 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-ddkit-monitor.patch,1.3,1.4
Message-ID: <20090409175549.2A5867001C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30662

Modified Files:
	rb-ddkit-monitor.patch 
Log Message:
Fix CFLAGS


rb-ddkit-monitor.patch:

Index: rb-ddkit-monitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rb-ddkit-monitor.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rb-ddkit-monitor.patch	9 Apr 2009 17:12:35 -0000	1.3
+++ rb-ddkit-monitor.patch	9 Apr 2009 17:55:18 -0000	1.4
@@ -1,16 +1,3 @@
-diff -upr rhythmbox-0.12.0.old/lib/Makefile.am rhythmbox-0.12.0/lib/Makefile.am
---- rhythmbox-0.12.0.old/lib/Makefile.am	2009-03-12 02:26:11.000000000 +0000
-+++ rhythmbox-0.12.0/lib/Makefile.am	2009-04-09 18:00:18.000000000 +0100
-@@ -44,7 +44,7 @@ INCLUDES =						\
- 	$(SOUP_CFLAGS)					\
- 	$(RHYTHMBOX_CFLAGS)
- 
--librb_la_LIBADD = $(SOUP_LIBS)
-+librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS)
- 
- BUILT_SOURCES=
- 
-Only in rhythmbox-0.12.0/lib: Makefile.am.orig
 diff -upr rhythmbox-0.12.0.old/lib/rb-util.c rhythmbox-0.12.0/lib/rb-util.c
 --- rhythmbox-0.12.0.old/lib/rb-util.c	2009-03-12 02:26:12.000000000 +0000
 +++ rhythmbox-0.12.0/lib/rb-util.c	2009-04-09 17:59:56.000000000 +0100
@@ -307,3 +294,17 @@
  	return result;
  }
  
+--- rhythmbox-0.12.0.old/lib/Makefile.am	2009-04-09 18:54:29.000000000 +0100
++++ rhythmbox-0.12.0/lib/Makefile.am	2009-04-09 18:54:37.000000000 +0100
+@@ -42,9 +42,10 @@ INCLUDES =						\
+ 	-I$(top_srcdir) 				\
+ 	-I$(top_srcdir)/widgets				\
+ 	$(SOUP_CFLAGS)					\
++	$(HAL_CFLAGS)					\
+ 	$(RHYTHMBOX_CFLAGS)
+ 
+-librb_la_LIBADD = $(SOUP_LIBS)
++librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS)
+ 
+ BUILT_SOURCES=
+ 



From mclasen at fedoraproject.org  Thu Apr  9 17:56:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  9 Apr 2009 17:56:09 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.47, 1.48 libsoup.spec, 1.89,
	1.90 sources, 1.47, 1.48
Message-ID: <20090409175609.449877001C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30345

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.26.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	16 Mar 2009 18:09:55 -0000	1.47
+++ .cvsignore	9 Apr 2009 17:55:38 -0000	1.48
@@ -1 +1 @@
-libsoup-2.26.0.tar.bz2
+libsoup-2.26.0.9.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- libsoup.spec	16 Mar 2009 18:22:18 -0000	1.89
+++ libsoup.spec	9 Apr 2009 17:55:38 -0000	1.90
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.26.0
+Version: 2.26.0.9
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -84,6 +84,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0.9-1
+- Upate to 2.26.0.9
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 
@@ -97,7 +100,7 @@
 - Update to 2.25.5
 
 * Sun Jan 25 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.4-2
-- Build against libproxy 
+- Build against libproxy
 
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1
 - Update to 2.25.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	16 Mar 2009 18:09:55 -0000	1.47
+++ sources	9 Apr 2009 17:55:39 -0000	1.48
@@ -1 +1 @@
-9df9d2b3304213641d3214a774d75ee1  libsoup-2.26.0.tar.bz2
+61e526ff503922888ac107767e9f31c0  libsoup-2.26.0.9.tar.bz2



From lmacken at fedoraproject.org  Thu Apr  9 18:01:24 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  9 Apr 2009 18:01:24 +0000 (UTC)
Subject: rpms/liveusb-creator/devel liveusb-creator.spec, 1.18, 1.19 sources,
	1.15, 1.16
Message-ID: <20090409180124.273757001C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32365

Modified Files:
	liveusb-creator.spec sources 
Log Message:
Fix the checksum verification to support sha256


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- liveusb-creator.spec	9 Apr 2009 14:23:07 -0000	1.18
+++ liveusb-creator.spec	9 Apr 2009 18:00:53 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           liveusb-creator
 Version:        3.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A liveusb creator
 
 Group:          Applications/System
@@ -68,6 +68,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-2
+- Fix the checksum verification to support sha256
+
 * Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-1
 - Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Apr 2009 14:23:07 -0000	1.15
+++ sources	9 Apr 2009 18:00:53 -0000	1.16
@@ -1 +1 @@
-8ec83ffe8c16bbd4c41c1e501edd8f50  liveusb-creator-3.6.5.tar.bz2
+900d23bb6be44eb5de62820a5f6f1675  liveusb-creator-3.6.5.tar.bz2



From thias at fedoraproject.org  Thu Apr  9 18:02:29 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  9 Apr 2009 18:02:29 +0000 (UTC)
Subject: rpms/js/devel js.spec,1.23,1.24
Message-ID: <20090409180229.83F3A7001C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32754

Modified Files:
	js.spec 
Log Message:
Update description (#487903).



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- js.spec	25 Feb 2009 09:47:57 -0000	1.23
+++ js.spec	9 Apr 2009 18:01:59 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.70
-Release: 4%{?dist}
+Release: 5%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
@@ -26,9 +26,10 @@
 Provides: libjs = %{version}-%{release}
 
 %description
-JavaScript is the Netscape-developed object scripting languages.
-This package has been created for purposes of Sablotron and is suitable
-for embedding in applications.
+JavaScript is the Netscape-developed object scripting language used in millions
+of web pages and server applications worldwide. Netscape's JavaScript is a
+superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
+with only mild differences from the published standard.
 
 
 %package devel
@@ -127,7 +128,10 @@
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-4
+* Thu Apr  9 2008 Matthias Saou <http://freshrpms.net/> 1.70-5
+- Update description (#487903).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Jun  4 2008 Jon McCann <jmccann at redhat.com> - 1.70-3



From spot at fedoraproject.org  Thu Apr  9 18:03:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 18:03:02 +0000 (UTC)
Subject: rpms/beesu/F-10 beesu.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090409180302.F3B2D7001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv457/F-10

Modified Files:
	beesu.spec sources 
Log Message:
add nautilus-beesu-manager subpackage


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-10/beesu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beesu.spec	30 Mar 2009 20:22:38 -0000	1.3
+++ beesu.spec	9 Apr 2009 18:02:32 -0000	1.4
@@ -1,11 +1,14 @@
+%global nbmversion 1.0
+
 Name: beesu
 Version: 2.3
-Release: 1%{?dist}
-Summary: Bee's installer script for beesu
+Release: 2%{?dist}
+Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
 License: GPLv2+
 Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
+Source1: http://honeybeenet.altervista.org/beesu/files/beesu-manager/nautilus-beesu-manager-%{nbmversion}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam, usermode
 
@@ -13,8 +16,20 @@
 Beesu is a wrapper around su and works with consolehelper under
 Fedora to let you have a graphic interface like gksu.
 
+%package -n nautilus-beesu-manager
+Version:	%{nbmversion}
+BuildArch:	noarch
+Requires:	beesu, zenity, nautilus
+Group:		User Interface/Desktops
+Summary:	Utility to add beesu scripts to nautilus
+
+%description -n nautilus-beesu-manager
+nautilus-beesu-manager is a little utility to add some useful scripts
+to the Nautilus file browser; nautilus-beesu-manager can add scripts
+to Nautilus using beesu to elevate the user's privileges to root.
+
 %prep
-%setup -q
+%setup -q -a1
 
 %build
 make CFLAGS="%{optflags}"
@@ -25,9 +40,37 @@
 
 make DESTDIR=%{buildroot} install
 
+#nbm
+pushd nautilus-beesu-manager-%{nbmversion}
+mkdir -v -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+mkdir -v -p %{buildroot}%{_datadir}/applications/
+install -p -m 755 nautilus-beesu-manager %{buildroot}%{_bindir}
+install -p -m 644 nautilus-beesu-manager.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+desktop-file-install --dir %{buildroot}%{_datadir}/applications --mode 0644 nautilus-beesu-manager.desktop
+popd
+
 %clean
 rm -rf %{buildroot}
 
+%post -n nautilus-beesu-manager
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null ||:
+
+%postun -n nautilus-beesu-manager
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    fi
+fi
+update-desktop-database &>/dev/null || :
+
+%posttrans -n nautilus-beesu-manager
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -39,10 +82,23 @@
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
+%files -n nautilus-beesu-manager
+%defattr(-,root,root,-)
+%doc nautilus-beesu-manager-%{nbmversion}/COPYING nautilus-beesu-manager-%{nbmversion}/README
+%{_bindir}/nautilus-beesu-manager
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
+
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-2
+- enable nautilus-beesu-manager subpackage
+
 * Mon Mar 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-1
 - Update to 2.3
 
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.2-1
 - Update to 2.2, adds bash auto completion feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2009 20:22:38 -0000	1.4
+++ sources	9 Apr 2009 18:02:32 -0000	1.5
@@ -1 +1,2 @@
 71cccc332aabe321cf4747cf9f7bf532  beesu-2.3.tar.bz2
+f188742dd8f6ae8832c4f06c8ec23af1  nautilus-beesu-manager-1.0.tar.bz2



From spot at fedoraproject.org  Thu Apr  9 18:03:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 18:03:03 +0000 (UTC)
Subject: rpms/beesu/devel .cvsignore, 1.4, 1.5 beesu.spec, 1.4, 1.5 sources, 
	1.4, 1.5
Message-ID: <20090409180303.525757001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv457/devel

Modified Files:
	.cvsignore beesu.spec sources 
Log Message:
add nautilus-beesu-manager subpackage


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2009 20:22:39 -0000	1.4
+++ .cvsignore	9 Apr 2009 18:02:33 -0000	1.5
@@ -1 +1,2 @@
 beesu-2.3.tar.bz2
+nautilus-beesu-manager-1.0.tar.bz2


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/beesu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beesu.spec	30 Mar 2009 20:22:39 -0000	1.4
+++ beesu.spec	9 Apr 2009 18:02:33 -0000	1.5
@@ -1,11 +1,14 @@
+%global nbmversion 1.0
+
 Name: beesu
 Version: 2.3
-Release: 1%{?dist}
-Summary: Bee's installer script for beesu
+Release: 2%{?dist}
+Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
 License: GPLv2+
 Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
+Source1: http://honeybeenet.altervista.org/beesu/files/beesu-manager/nautilus-beesu-manager-%{nbmversion}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam, usermode
 
@@ -13,8 +16,20 @@
 Beesu is a wrapper around su and works with consolehelper under
 Fedora to let you have a graphic interface like gksu.
 
+%package -n nautilus-beesu-manager
+Version:	%{nbmversion}
+BuildArch:	noarch
+Requires:	beesu, zenity, nautilus
+Group:		User Interface/Desktops
+Summary:	Utility to add beesu scripts to nautilus
+
+%description -n nautilus-beesu-manager
+nautilus-beesu-manager is a little utility to add some useful scripts
+to the Nautilus file browser; nautilus-beesu-manager can add scripts
+to Nautilus using beesu to elevate the user's privileges to root.
+
 %prep
-%setup -q
+%setup -q -a1
 
 %build
 make CFLAGS="%{optflags}"
@@ -25,9 +40,37 @@
 
 make DESTDIR=%{buildroot} install
 
+#nbm
+pushd nautilus-beesu-manager-%{nbmversion}
+mkdir -v -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+mkdir -v -p %{buildroot}%{_datadir}/applications/
+install -p -m 755 nautilus-beesu-manager %{buildroot}%{_bindir}
+install -p -m 644 nautilus-beesu-manager.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+desktop-file-install --dir %{buildroot}%{_datadir}/applications --mode 0644 nautilus-beesu-manager.desktop
+popd
+
 %clean
 rm -rf %{buildroot}
 
+%post -n nautilus-beesu-manager
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null ||:
+
+%postun -n nautilus-beesu-manager
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    fi
+fi
+update-desktop-database &>/dev/null || :
+
+%posttrans -n nautilus-beesu-manager
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -39,7 +82,17 @@
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
+%files -n nautilus-beesu-manager
+%defattr(-,root,root,-)
+%doc nautilus-beesu-manager-%{nbmversion}/COPYING nautilus-beesu-manager-%{nbmversion}/README
+%{_bindir}/nautilus-beesu-manager
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
+
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-2
+- enable nautilus-beesu-manager subpackage
+
 * Mon Mar 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-1
 - Update to 2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2009 20:22:39 -0000	1.4
+++ sources	9 Apr 2009 18:02:33 -0000	1.5
@@ -1 +1,2 @@
 71cccc332aabe321cf4747cf9f7bf532  beesu-2.3.tar.bz2
+f188742dd8f6ae8832c4f06c8ec23af1  nautilus-beesu-manager-1.0.tar.bz2



From thias at fedoraproject.org  Thu Apr  9 18:04:05 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  9 Apr 2009 18:04:05 +0000 (UTC)
Subject: rpms/js/devel js.spec,1.24,1.25
Message-ID: <20090409180405.CDE3C7001C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv740

Modified Files:
	js.spec 
Log Message:
What year is this? Doh!



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- js.spec	9 Apr 2009 18:01:59 -0000	1.24
+++ js.spec	9 Apr 2009 18:03:35 -0000	1.25
@@ -128,7 +128,7 @@
 
 
 %changelog
-* Thu Apr  9 2008 Matthias Saou <http://freshrpms.net/> 1.70-5
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.70-5
 - Update description (#487903).
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>



From akurtakov at fedoraproject.org  Thu Apr  9 18:11:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  9 Apr 2009 18:11:34 +0000 (UTC)
Subject: rpms/jsch/devel sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 MANIFEST.MF, 
	1.3, 1.4 jsch.spec, 1.29, 1.30
Message-ID: <20090409181134.445CC7001C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jsch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3396/devel

Modified Files:
	sources .cvsignore MANIFEST.MF jsch.spec 
Log Message:
Update to new version 0.1.41.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsch/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2008 14:19:01 -0000	1.6
+++ sources	9 Apr 2009 18:11:03 -0000	1.7
@@ -1 +1 @@
-8f77166fd419f7f150a40b6b3710e027  jsch-0.1.39.zip
+6ef2d9ef9c84d707ecbbaead5f93ed2e  jsch-0.1.41.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsch/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2008 14:19:01 -0000	1.6
+++ .cvsignore	9 Apr 2009 18:11:03 -0000	1.7
@@ -1 +1,2 @@
 jsch-0.1.39.zip
+jsch-0.1.41.zip


Index: MANIFEST.MF
===================================================================
RCS file: /cvs/pkgs/rpms/jsch/devel/MANIFEST.MF,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MANIFEST.MF	14 Jul 2008 14:15:31 -0000	1.3
+++ MANIFEST.MF	9 Apr 2009 18:11:03 -0000	1.4
@@ -2,11 +2,13 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-SymbolicName: com.jcraft.jsch
 Bundle-ManifestVersion: 2
+Created-By: 1.4.0 (Sun Microsystems Inc.)
 Bundle-Name: %bundleName
 Bundle-Localization: plugin
-Bundle-Version: 0.1.37.v200803061811
+Bundle-Version: 0.1.41.v200903070017
 Bundle-ClassPath: .
 Bundle-Vendor: %venderName
-Export-Package: com.jcraft.jsch,com.jcraft.jsch.jce;x-internal:=true,c
- om.jcraft.jsch.jcraft;x-internal:=true,com.jcraft.jsch.jgss;x-interna
- l:=true
+Export-Package: com.jcraft.jsch;version="0.1.41",com.jcraft.jsch.jce;v
+ ersion="0.1.41";x-internal:=true,com.jcraft.jsch.jcraft;version="0.1.
+ 41";x-internal:=true,com.jcraft.jsch.jgss;version="0.1.41";x-internal
+ :=true


Index: jsch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jsch.spec	25 Feb 2009 09:48:48 -0000	1.29
+++ jsch.spec	9 Apr 2009 18:11:03 -0000	1.30
@@ -33,8 +33,8 @@
 %define gcj_support 0
 
 Name:           jsch
-Version:        0.1.39
-Release:        2.1%{?dist}
+Version:        0.1.41
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -42,7 +42,7 @@
 URL:            http://www.jcraft.com/jsch/
 Source0:        http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip
 # wget \
-# http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.jcraft.jsch_0.1.37.v200803061811.jar
+# http://download.eclipse.org/tools/orbit/downloads/drops/S20090307012903/bundles/com.jcraft.jsch_0.1.41.v200903070017.jar
 # unzip com.jcraft.jsch_*.jar META-INF/MANIFEST.MF
 # mv META-INF/MANIFEST.MF .
 # sed -i "/^Name/d" MANIFEST.MF
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Wed Apr 8 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.1.41-1
+- Update to new version 0.1.41.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.1.39-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From notting at fedoraproject.org  Thu Apr  9 18:14:06 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  9 Apr 2009 18:14:06 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.236, 1.237 comps-f11.xml.in, 1.179,
	1.180 comps-f9.xml.in, 1.446, 1.447
Message-ID: <20090409181406.B3DD57001C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4028

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
Nuke starfighter and viruskiller, they aren't included any more. (#487955)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- comps-f10.xml.in	8 Apr 2009 07:31:05 -0000	1.236
+++ comps-f10.xml.in	9 Apr 2009 18:13:36 -0000	1.237
@@ -1814,7 +1814,6 @@
       <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">spring</packagereq>
-      <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">stormbaancoureur</packagereq>
       <packagereq type="optional">supertux</packagereq>
       <packagereq type="optional">supertuxkart</packagereq>
@@ -1843,7 +1842,6 @@
       <packagereq type="optional">vdrift</packagereq>
       <packagereq type="optional">vegastrike</packagereq>
       <packagereq type="optional">vegastrike-music</packagereq>
-      <packagereq type="optional">viruskiller</packagereq>
       <packagereq type="optional">vodovod</packagereq>
       <packagereq type="optional">warzone2100</packagereq>
       <packagereq type="optional">wastesedge</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- comps-f11.xml.in	9 Apr 2009 16:32:01 -0000	1.179
+++ comps-f11.xml.in	9 Apr 2009 18:13:36 -0000	1.180
@@ -2039,7 +2039,6 @@
       <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">spring</packagereq>
-      <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">stormbaancoureur</packagereq>
       <packagereq type="optional">supertux</packagereq>
       <packagereq type="optional">supertuxkart</packagereq>
@@ -2068,7 +2067,6 @@
       <packagereq type="optional">vdrift</packagereq>
       <packagereq type="optional">vegastrike</packagereq>
       <packagereq type="optional">vegastrike-music</packagereq>
-      <packagereq type="optional">viruskiller</packagereq>
       <packagereq type="optional">vodovod</packagereq>
       <packagereq type="optional">warzone2100</packagereq>
       <packagereq type="optional">wastesedge</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- comps-f9.xml.in	8 Apr 2009 07:31:05 -0000	1.446
+++ comps-f9.xml.in	9 Apr 2009 18:13:36 -0000	1.447
@@ -1707,7 +1707,6 @@
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
-      <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">stormbaancoureur</packagereq>
       <packagereq type="optional">supertux</packagereq>
       <packagereq type="optional">supertuxkart</packagereq>
@@ -1738,7 +1737,6 @@
       <packagereq type="optional">vdrift</packagereq>
       <packagereq type="optional">vegastrike</packagereq>
       <packagereq type="optional">vegastrike-music</packagereq>
-      <packagereq type="optional">viruskiller</packagereq>
       <packagereq type="optional">vodovod</packagereq>
       <packagereq type="optional">warzone2100</packagereq>
       <packagereq type="optional">wastesedge</packagereq>



From rdieter at fedoraproject.org  Thu Apr  9 18:19:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  9 Apr 2009 18:19:30 +0000 (UTC)
Subject: rpms/xdg-utils/devel xdg-utils.spec,1.19,1.20
Message-ID: <20090409181930.46AC27001C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5666

Modified Files:
	xdg-utils.spec 
Log Message:
* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-8.20081121cvs
- revert.  kfmclient openURL is largely useless 



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xdg-utils.spec	8 Apr 2009 19:08:16 -0000	1.19
+++ xdg-utils.spec	9 Apr 2009 18:18:59 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 7.%{cvs}%{?dist}
+Release: 8.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -72,7 +72,7 @@
 %setup -q -n %{name}
 
 %patch1 -p1 -b .htmlview
-%patch50 -p1 -b .CVE-2009-0068-1
+#patch50 -p1 -b .CVE-2009-0068-1
 
 %if ! 0%{?cvs:1}
 %patch101 -p1 -b .mimeopen
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-8.20081121cvs
+- revert.  kfmclient openURL is largely useless 
+
 * Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-7.20081121cvs
 - xdg-open: s/kfmclient exec/kfmclient openURL/ (CVE-2009-0068, rh#472010, fdo#19377)
 



From jwilson at fedoraproject.org  Thu Apr  9 18:19:39 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu,  9 Apr 2009 18:19:39 +0000 (UTC)
Subject: rpms/rrdtool/devel .cvsignore, 1.33, 1.34 rrdtool.spec, 1.78,
	1.79 sources, 1.36, 1.37
Message-ID: <20090409181939.89F1D7001C@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5732

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Thu Apr 09 2009 Jarod Wilson <jarod at redhat.com> 1.3.7-1
- Update to rrdtool 1.3.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	19 Jan 2009 15:09:03 -0000	1.33
+++ .cvsignore	9 Apr 2009 18:19:09 -0000	1.34
@@ -3,3 +3,4 @@
 rrdtool-1.3.4.tar.gz
 rrdtool-1.3.5.tar.gz
 rrdtool-1.3.6.tar.gz
+rrdtool-1.3.7.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- rrdtool.spec	25 Feb 2009 20:34:41 -0000	1.78
+++ rrdtool.spec	9 Apr 2009 18:19:09 -0000	1.79
@@ -8,8 +8,8 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.6
-Release: 2%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -325,6 +325,9 @@
 %endif
 
 %changelog
+* Thu Apr 09 2009 Jarod Wilson <jarod at redhat.com> 1.3.7-1
+- Update to rrdtool 1.3.7
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	19 Jan 2009 15:09:03 -0000	1.36
+++ sources	9 Apr 2009 18:19:09 -0000	1.37
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-afaabd5a60115581e866efbac796d307  rrdtool-1.3.6.tar.gz
+e2e0da2a83e58ba2fcefba932a3cbb72  rrdtool-1.3.7.tar.gz



From spot at fedoraproject.org  Thu Apr  9 18:23:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 18:23:34 +0000 (UTC)
Subject: rpms/beesu/F-10 beesu.spec,1.4,1.5
Message-ID: <20090409182334.65D457001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6617/F-10

Modified Files:
	beesu.spec 
Log Message:
fix missing BR: desktop-file-utils


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-10/beesu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beesu.spec	9 Apr 2009 18:02:32 -0000	1.4
+++ beesu.spec	9 Apr 2009 18:23:04 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: beesu
 Version: 2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -10,6 +10,7 @@
 Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
 Source1: http://honeybeenet.altervista.org/beesu/files/beesu-manager/nautilus-beesu-manager-%{nbmversion}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: desktop-file-utils
 Requires: pam, usermode
 
 %description
@@ -90,6 +91,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
 
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-3
+- fix missing BR: desktop-file-utils
+
 * Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-2
 - enable nautilus-beesu-manager subpackage
 



From spot at fedoraproject.org  Thu Apr  9 18:23:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 18:23:34 +0000 (UTC)
Subject: rpms/beesu/devel beesu.spec,1.5,1.6
Message-ID: <20090409182334.8446C7001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6617/devel

Modified Files:
	beesu.spec 
Log Message:
fix missing BR: desktop-file-utils


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/beesu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- beesu.spec	9 Apr 2009 18:02:33 -0000	1.5
+++ beesu.spec	9 Apr 2009 18:23:04 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: beesu
 Version: 2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -10,6 +10,7 @@
 Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
 Source1: http://honeybeenet.altervista.org/beesu/files/beesu-manager/nautilus-beesu-manager-%{nbmversion}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: desktop-file-utils
 Requires: pam, usermode
 
 %description
@@ -90,6 +91,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
 
 %changelog
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-3
+- fix missing BR: desktop-file-utils
+
 * Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-2
 - enable nautilus-beesu-manager subpackage
 



From thias at fedoraproject.org  Thu Apr  9 18:25:13 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  9 Apr 2009 18:25:13 +0000 (UTC)
Subject: rpms/proftpd/F-10 proftpd.spec,1.43,1.44
Message-ID: <20090409182513.3B93F7001C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6936/F-10

Modified Files:
	proftpd.spec 
Log Message:
Fix tcp_wrappers-devel BR conditional.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- proftpd.spec	6 Apr 2009 21:57:30 -0000	1.43
+++ proftpd.spec	9 Apr 2009 18:24:42 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 1%{?prever:.%{prever}}%{?dist}
+Release: 2%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -25,9 +25,9 @@
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
 BuildRequires: zlib-devel
 # On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-%if 0%{?rhel} <= 5
+# We'll need to find a better way to do this once RHEL6 comes out
 BuildRequires: tcp_wrappers
-%else
+%if 0%{?fedora:1}
 BuildRequires: tcp_wrappers-devel
 %endif
 BuildRequires: openldap-devel
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
+- Fix tcp_wrappers-devel BR conditional.
+
 * Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
 - Update to 1.3.2.
 - Include mod_wrap (#479813).



From thias at fedoraproject.org  Thu Apr  9 18:25:13 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  9 Apr 2009 18:25:13 +0000 (UTC)
Subject: rpms/proftpd/F-9 proftpd.spec,1.42,1.43
Message-ID: <20090409182513.9E2147001C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6936/F-9

Modified Files:
	proftpd.spec 
Log Message:
Fix tcp_wrappers-devel BR conditional.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/proftpd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- proftpd.spec	6 Apr 2009 21:57:30 -0000	1.42
+++ proftpd.spec	9 Apr 2009 18:24:43 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 1%{?prever:.%{prever}}%{?dist}
+Release: 2%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -25,9 +25,9 @@
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
 BuildRequires: zlib-devel
 # On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-%if 0%{?rhel} <= 5
+# We'll need to find a better way to do this once RHEL6 comes out
 BuildRequires: tcp_wrappers
-%else
+%if 0%{?fedora:1}
 BuildRequires: tcp_wrappers-devel
 %endif
 BuildRequires: openldap-devel
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
+- Fix tcp_wrappers-devel BR conditional.
+
 * Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
 - Update to 1.3.2.
 - Include mod_wrap (#479813).



From thias at fedoraproject.org  Thu Apr  9 18:25:13 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  9 Apr 2009 18:25:13 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.spec,1.45,1.46
Message-ID: <20090409182513.F404A7001C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6936/devel

Modified Files:
	proftpd.spec 
Log Message:
Fix tcp_wrappers-devel BR conditional.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- proftpd.spec	6 Apr 2009 21:47:16 -0000	1.45
+++ proftpd.spec	9 Apr 2009 18:24:43 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 1%{?prever:.%{prever}}%{?dist}
+Release: 2%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -25,9 +25,9 @@
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
 BuildRequires: zlib-devel
 # On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-%if 0%{?rhel} <= 5
+# We'll need to find a better way to do this once RHEL6 comes out
 BuildRequires: tcp_wrappers
-%else
+%if 0%{?fedora:1}
 BuildRequires: tcp_wrappers-devel
 %endif
 BuildRequires: openldap-devel
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
+- Fix tcp_wrappers-devel BR conditional.
+
 * Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
 - Update to 1.3.2.
 - Include mod_wrap (#479813).



From ajax at fedoraproject.org  Thu Apr  9 18:36:17 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  9 Apr 2009 18:36:17 +0000 (UTC)
Subject: rpms/hwdata/devel import.log, NONE, 1.1 .cvsignore, 1.101,
	1.102 hwdata.spec, 1.110, 1.111 sources, 1.104, 1.105
Message-ID: <20090409183617.136997001C@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/hwdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10248/devel

Modified Files:
	.cvsignore hwdata.spec sources 
Added Files:
	import.log 
Log Message:
hwdata 0.225



--- NEW FILE import.log ---
hwdata-0_225-1_fc11:HEAD:hwdata-0.225-1.fc11.src.rpm:1239302114


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	19 Mar 2009 19:46:03 -0000	1.101
+++ .cvsignore	9 Apr 2009 18:35:46 -0000	1.102
@@ -1 +1 @@
-hwdata-0.223.tar.bz2
+hwdata-0.225.tar.bz2


Index: hwdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- hwdata.spec	19 Mar 2009 19:46:04 -0000	1.110
+++ hwdata.spec	9 Apr 2009 18:35:46 -0000	1.111
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.223
+Version: 0.225
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -37,12 +37,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
-* Thu Mar 19 2009 Karsten Hopp <karsten at redhat.com> 0.223-1
-- update usb.ids pci.ids oui.txt
-- rename /etc/modprobe.d/blacklist to /etc/modprobe.d/blacklist.conf
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.222-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 0.224-1
+- Update pci.ids, usb.ids, and oui.txt
+- Add pnp.ids
 
 * Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 0.222-1
 - update usb.ids pci.ids oui.txt and build for all current releases


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	19 Mar 2009 19:46:04 -0000	1.104
+++ sources	9 Apr 2009 18:35:46 -0000	1.105
@@ -1 +1 @@
-78813a6642562c36ccd8eb30f338ac9c  hwdata-0.223.tar.bz2
+b6b6b183a74f64e684f47b6dd8fa0942  hwdata-0.225.tar.bz2



From davidz at fedoraproject.org  Thu Apr  9 18:36:36 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu,  9 Apr 2009 18:36:36 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.2.1-only-mount-the-metal.patch, NONE,
	1.1 gvfs.spec, 1.119, 1.120
Message-ID: <20090409183636.F362A7001C@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10712

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.2.1-only-mount-the-metal.patch 
Log Message:
* Thu Apr  9 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-2
- Avoid automounting device-mapper devices and similar (#494144)



gvfs-1.2.1-only-mount-the-metal.patch:

--- NEW FILE gvfs-1.2.1-only-mount-the-metal.patch ---
--- gvfs-1.2.1/monitor/gdu/ggduvolume.c.orig	2009-04-09 14:13:39.000000000 -0400
+++ gvfs-1.2.1/monitor/gdu/ggduvolume.c	2009-04-09 14:28:51.000000000 -0400
@@ -293,6 +293,56 @@ update_volume (GGduVolume *volume)
             volume->should_automount = FALSE;
         }
 
+      /* Avoid automounting volumes from
+       *
+       * 1. drives on a 'virtual' or unset bus
+       * 2. volumes without a drive
+       *
+       * This is to avoid interference with things like Fedora's
+       * livecd-tools that use device-mapper to set up images. See
+       * https://bugzilla.redhat.com/show_bug.cgi?id=494144 for more
+       * background.
+       *
+       * In the future we might want to relax 1. so automounting
+       * things like Linux MD and LVM2 devices work.
+       */
+      if (volume->drive != NULL)
+        {
+          GduPresentable *drive_presentable;
+          drive_presentable = g_gdu_drive_get_presentable (volume->drive);
+          if (drive_presentable != NULL)
+            {
+              GduDevice *drive_device;
+              drive_device = gdu_presentable_get_device (drive_presentable);
+              if (drive_device != NULL)
+                {
+                  const gchar *bus;
+                  bus = gdu_device_drive_get_connection_interface (drive_device);
+                  if (bus == NULL || strlen (bus) == 0 || g_strcmp0 (bus, "virtual") == 0)
+                    {
+                      volume->should_automount = FALSE;
+                    }
+                  g_object_unref (drive_device);
+                }
+              else
+                {
+                  volume->should_automount = FALSE;
+                }
+            }
+          else
+            {
+              volume->should_automount = FALSE;
+            }
+        }
+      else
+        {
+          volume->should_automount = FALSE;
+        }
+
+      g_debug ("should_automount = %d for %s",
+               volume->should_automount,
+               device != NULL ? gdu_device_get_device_file (device) : "(none)");
+
       g_free (activation_uri);
     }
 


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gvfs.spec	3 Apr 2009 02:07:34 -0000	1.119
+++ gvfs.spec	9 Apr 2009 18:36:06 -0000	1.120
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,6 +40,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
 Patch4: gvfs-1.1.7-gdu-computer-expose-devices.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=494144
+Patch5: gvfs-1.2.1-only-mount-the-metal.patch
+
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -124,6 +127,7 @@
 %patch2 -p0 -b .gdu
 %patch3 -p1 -b .gdu-volumes-typo
 %patch4 -p1 -b .computer-gdu
+%patch5 -p1 -b .metal
 
 %build
 
@@ -267,6 +271,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-2
+- Avoid automounting device-mapper devices and similar (#494144)
+
 * Thu Apr  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.1-1
 - Update to 1.2.1
 



From rdieter at fedoraproject.org  Thu Apr  9 18:41:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  9 Apr 2009 18:41:33 +0000 (UTC)
Subject: rpms/libpqxx/devel libpqxx-2.6.8-visibility-2.patch, NONE,
	1.1 libpqxx-2.6.8-visibility.patch, 1.2, 1.3 libpqxx.spec, 1.23, 1.24
Message-ID: <20090409184133.C4BC27001C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12226

Modified Files:
	libpqxx-2.6.8-visibility.patch libpqxx.spec 
Added Files:
	libpqxx-2.6.8-visibility-2.patch 
Log Message:
* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
- properly fix visibility issues


libpqxx-2.6.8-visibility-2.patch:

--- NEW FILE libpqxx-2.6.8-visibility-2.patch ---
diff -up libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility libpqxx-2.6.8/include/pqxx/prepared_statement.hxx
--- libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility	2006-08-29 10:32:55.000000000 -0500
+++ libpqxx-2.6.8/include/pqxx/prepared_statement.hxx	2009-04-09 13:37:38.000000000 -0500
@@ -138,7 +138,7 @@ private:
 namespace internal
 {
 /// Internal representation of a prepared statement definition
-struct PQXX_PRIVATE prepared_def
+struct PQXX_LIBEXPORT prepared_def
 {
   /// Parameter definition
   struct param

libpqxx-2.6.8-visibility.patch:

Index: libpqxx-2.6.8-visibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx-2.6.8-visibility.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libpqxx-2.6.8-visibility.patch	19 Feb 2008 14:51:38 -0000	1.2
+++ libpqxx-2.6.8-visibility.patch	9 Apr 2009 18:41:33 -0000	1.3
@@ -1,31 +1,6 @@
-diff -up libpqxx-2.6.8/configure.ac.in.visibility libpqxx-2.6.8/configure.ac.in
---- libpqxx-2.6.8/configure.ac.in.visibility	2006-09-04 06:36:59.000000000 -0500
-+++ libpqxx-2.6.8/configure.ac.in	2008-02-19 08:33:36.000000000 -0600
-@@ -129,7 +129,7 @@ if test "$GCC" = "yes" ; then
- AC_MSG_CHECKING([g++ visibility attribute])
- gcc_visibility=yes
- SAVE_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS -Werror"
-+#CXXFLAGS="$CXXFLAGS -Werror"
- AC_TRY_COMPILE([
- struct __attribute__ ((visibility("hidden"))) d { d() {} void f() {} };
- 	],
-diff -up libpqxx-2.6.8/configure.ac.visibility libpqxx-2.6.8/configure.ac
---- libpqxx-2.6.8/configure.ac.visibility	2006-09-06 04:53:36.000000000 -0500
-+++ libpqxx-2.6.8/configure.ac	2008-02-19 08:33:44.000000000 -0600
-@@ -129,7 +129,7 @@ if test "$GCC" = "yes" ; then
- AC_MSG_CHECKING([g++ visibility attribute])
- gcc_visibility=yes
- SAVE_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS -Werror"
-+#CXXFLAGS="$CXXFLAGS -Werror"
- AC_TRY_COMPILE([
- struct __attribute__ ((visibility("hidden"))) d { d() {} void f() {} };
- 	],
-diff -up libpqxx-2.6.8/configure.visibility libpqxx-2.6.8/configure
---- libpqxx-2.6.8/configure.visibility	2006-09-06 04:53:48.000000000 -0500
-+++ libpqxx-2.6.8/configure	2008-02-19 08:33:47.000000000 -0600
-@@ -20203,7 +20203,7 @@ if test "$GCC" = "yes" ; then
+--- libpqxx-2.6.8/configure.disable_visibility	2006-09-06 04:53:48.000000000 -0500
++++ libpqxx-2.6.8/configure	2006-09-20 13:51:53.000000000 -0500
+@@ -20203,7 +20203,7 @@
  echo $ECHO_N "checking g++ visibility attribute... $ECHO_C" >&6; }
  gcc_visibility=yes
  SAVE_CXXFLAGS="$CXXFLAGS"


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libpqxx.spec	3 Mar 2009 19:48:03 -0000	1.23
+++ libpqxx.spec	9 Apr 2009 18:41:33 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -12,7 +12,10 @@
 
 # drop -Werror for now, since we get -fvisibility warnings using gcc-4.1.1/fc6+
 # http://thaiopensource.org/development/libpqxx/ticket/83
+# or .. actually fix it.
 Patch1:         libpqxx-2.6.8-visibility.patch
+# or better yet, fix it:
+Patch11:        libpqxx-2.6.8-visibility-2.patch
 Patch2:         libpqxx-2.6.8-gcc43.patch
 Patch3:         libpqxx-2.6.8-multilib.patch
 
@@ -41,15 +44,13 @@
 # fix spurious permissions
 chmod -x COPYING INSTALL
 
-#if ! 0%{?fedora} > 8 
-%patch1 -p1 -b .visibility
-#endif
+%patch11 -p1 -b .visibility
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .multilib
 
 # better fix/hack for current rpath and libtool issues
-libtoolize
-autoreconf
+libtoolize --force
+autoreconf -f -i
 
 
 %build
@@ -85,7 +86,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-*.so
+%{_libdir}/libpqxx-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -97,6 +98,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
+- properly fix visibility issues
+
 * Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 2.6.8-12
 - Rebuilt against libtool 2.2
 



From lmacken at fedoraproject.org  Thu Apr  9 18:50:28 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  9 Apr 2009 18:50:28 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 liveusb-creator.spec, 1.15, 1.16 sources, 
	1.13, 1.14
Message-ID: <20090409185028.396B17001C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14129

Modified Files:
	liveusb-creator.spec sources 
Log Message:
Handle sha256 checksums


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- liveusb-creator.spec	9 Apr 2009 14:30:49 -0000	1.15
+++ liveusb-creator.spec	9 Apr 2009 18:49:57 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           liveusb-creator
 Version:        3.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A liveusb creator
 
 Group:          Applications/System
@@ -68,6 +68,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-2
+- Handle SHA256 hashes
+
 * Thu Apr 09 2009 Luke Macken <lmacken at redhat.com> 3.6.5-1
 - Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Apr 2009 14:30:49 -0000	1.13
+++ sources	9 Apr 2009 18:49:57 -0000	1.14
@@ -1 +1 @@
-173bcc7dddca6a95ed753b36154829ff  liveusb-creator-3.6.5.tar.bz2
+eda20161c850a2a12a8e5b6b2f1d3da2  liveusb-creator-3.6.5.tar.bz2



From rdieter at fedoraproject.org  Thu Apr  9 18:50:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  9 Apr 2009 18:50:57 +0000 (UTC)
Subject: rpms/libpqxx/EL-5 libpqxx-2.6.8-gcc43.patch, NONE,
	1.1 libpqxx-2.6.8-multilib.patch, NONE,
	1.1 libpqxx-2.6.8-visibility-2.patch, NONE, 1.1 libpqxx.spec,
	1.15, 1.16
Message-ID: <20090409185057.0ADEF7001C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328

Modified Files:
	libpqxx.spec 
Added Files:
	libpqxx-2.6.8-gcc43.patch libpqxx-2.6.8-multilib.patch 
	libpqxx-2.6.8-visibility-2.patch 
Log Message:
* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
- properly fix visibility issues


libpqxx-2.6.8-gcc43.patch:

--- NEW FILE libpqxx-2.6.8-gcc43.patch ---
diff -up libpqxx-2.6.8/src/transaction_base.cxx.gcc43 libpqxx-2.6.8/src/transaction_base.cxx
--- libpqxx-2.6.8/src/transaction_base.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
+++ libpqxx-2.6.8/src/transaction_base.cxx	2008-02-19 08:19:47.000000000 -0600
@@ -20,6 +20,8 @@
 
 #include <stdexcept>
 
+#include <string.h>
+
 #include "pqxx/connection_base"
 #include "pqxx/result"
 #include "pqxx/tablestream"
diff -up libpqxx-2.6.8/src/result.cxx.gcc43 libpqxx-2.6.8/src/result.cxx
--- libpqxx-2.6.8/src/result.cxx.gcc43	2006-08-29 09:18:37.000000000 -0500
+++ libpqxx-2.6.8/src/result.cxx	2008-02-19 08:18:12.000000000 -0600
@@ -19,6 +19,9 @@
 
 #include <stdexcept>
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "libpq-fe.h"
 
 #include "pqxx/except"
diff -up libpqxx-2.6.8/src/cursor.cxx.gcc43 libpqxx-2.6.8/src/cursor.cxx
--- libpqxx-2.6.8/src/cursor.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
+++ libpqxx-2.6.8/src/cursor.cxx	2008-02-19 08:07:51.000000000 -0600
@@ -19,6 +19,8 @@
 
 #include <cstdlib>
 
+#include <string.h>
+
 #include "pqxx/cursor"
 #include "pqxx/result"
 #include "pqxx/transaction"
diff -up libpqxx-2.6.8/src/connection_base.cxx.gcc43 libpqxx-2.6.8/src/connection_base.cxx
--- libpqxx-2.6.8/src/connection_base.cxx.gcc43	2006-09-04 06:36:58.000000000 -0500
+++ libpqxx-2.6.8/src/connection_base.cxx	2008-02-19 08:05:04.000000000 -0600
@@ -40,6 +40,8 @@
 #include <poll.h>
 #endif
 
+#include <string.h>
+
 #include "libpq-fe.h"
 
 #include "pqxx/binarystring"
diff -up libpqxx-2.6.8/src/binarystring.cxx.gcc43 libpqxx-2.6.8/src/binarystring.cxx
--- libpqxx-2.6.8/src/binarystring.cxx.gcc43	2006-03-30 21:28:22.000000000 -0600
+++ libpqxx-2.6.8/src/binarystring.cxx	2008-02-19 08:04:33.000000000 -0600
@@ -18,6 +18,7 @@
 
 #include <new>
 #include <stdexcept>
+#include <string.h>
 
 #include "libpq-fe.h"
 

libpqxx-2.6.8-multilib.patch:

--- NEW FILE libpqxx-2.6.8-multilib.patch ---
diff -up libpqxx-2.6.8/pqxx-config.in.multilib libpqxx-2.6.8/pqxx-config.in
--- libpqxx-2.6.8/pqxx-config.in.multilib	2006-09-04 06:36:59.000000000 -0500
+++ libpqxx-2.6.8/pqxx-config.in	2008-02-19 08:46:56.000000000 -0600
@@ -1,9 +1,6 @@
 #! /bin/sh
 
 prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
 pkgconfig=@PKG_CONFIG@
 
 deprecated() {

libpqxx-2.6.8-visibility-2.patch:

--- NEW FILE libpqxx-2.6.8-visibility-2.patch ---
diff -up libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility libpqxx-2.6.8/include/pqxx/prepared_statement.hxx
--- libpqxx-2.6.8/include/pqxx/prepared_statement.hxx.visibility	2006-08-29 10:32:55.000000000 -0500
+++ libpqxx-2.6.8/include/pqxx/prepared_statement.hxx	2009-04-09 13:37:38.000000000 -0500
@@ -138,7 +138,7 @@ private:
 namespace internal
 {
 /// Internal representation of a prepared statement definition
-struct PQXX_PRIVATE prepared_def
+struct PQXX_LIBEXPORT prepared_def
 {
   /// Parameter definition
   struct param


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/EL-5/libpqxx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libpqxx.spec	17 Aug 2007 14:21:46 -0000	1.15
+++ libpqxx.spec	9 Apr 2009 18:50:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        7%{?dist}
+Release:        13%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -12,8 +12,14 @@
 
 # drop -Werror for now, since we get -fvisibility warnings using gcc-4.1.1/fc6+
 # http://thaiopensource.org/development/libpqxx/ticket/83
-Patch1:		libpqxx-2.6.8-visibility.patch
+# or .. actually fix it.
+Patch1:         libpqxx-2.6.8-visibility.patch
+# or better yet, fix it:
+Patch11:        libpqxx-2.6.8-visibility-2.patch
+Patch2:         libpqxx-2.6.8-gcc43.patch
+Patch3:         libpqxx-2.6.8-multilib.patch
 
+BuildRequires:  automake libtool
 BuildRequires:  postgresql-devel
 BuildRequires:  pkgconfig
 
@@ -23,26 +29,36 @@
 Supersedes older libpq++ interface.
 
 %package devel
-Summary:        Development tools for libpqxx
+Summary:        Development tools for %{name} 
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       postgresql-devel
-
 %description devel
-The libpgxx-devel package contains the header files and static
-libraries necessary for developing programs which use libpqxx.
+%{summary}.
+
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .visibility
+# fix spurious permissions
+chmod -x COPYING INSTALL
+
+%patch11 -p1 -b .visibility
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .multilib
+
+# better fix/hack for current rpath and libtool issues
+libtoolize --force
+autoreconf -f -i
+
 
 %build
 %configure --enable-shared --disable-static
-# I hate rpath... ;)
-%{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \
-libtool
+
+# rpath sucks...
+#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
+
 make %{?_smp_mflags}
 
 
@@ -51,33 +67,56 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{__perl} -pi -e 's,-R/usr/lib,,' $RPM_BUILD_ROOT%{_bindir}/pqxx-config
+
 
 %check 
 # not enabled, by default, takes awhile.
 %{?_with_check:make check }
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-*.so
+%{_libdir}/libpqxx-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
+%{_includedir}/pqxx/
 %{_libdir}/libpqxx.so
-%{_includedir}/pqxx
 %{_libdir}/pkgconfig/libpqxx.pc
 
+
 %changelog
+* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
+- properly fix visibility issues
+
+* Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 2.6.8-12
+- Rebuilt against libtool 2.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.8-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2.6.8-10
+- gcc43 patch
+- fix multilib conflicts (#342331)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6.8-9
+- Autorebuild for GCC 4.3
+
+* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.6.8-8
+- cosmetics
+
 * Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.6.8-7
 - update Source URL's
 



From oget at fedoraproject.org  Thu Apr  9 18:52:32 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  9 Apr 2009 18:52:32 +0000 (UTC)
Subject: rpms/pdftk/devel pdftk-classpath.patch, NONE, 1.1 pdftk.spec, 1.15,
	1.16
Message-ID: <20090409185232.E03E37001C@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pdftk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14866

Modified Files:
	pdftk.spec 
Added Files:
	pdftk-classpath.patch 
Log Message:
* Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
- Patch ".afm files not found" issue (#494785)


pdftk-classpath.patch:

--- NEW FILE pdftk-classpath.patch ---
--- pdftk/pdftk.cc	2009-04-09 18:07:27.000000000 +0100
+++ /home/aph/pdftk.cc	2009-04-09 18:09:20.000000000 +0100
@@ -2669,6 +2669,44 @@
 			 strcmp( argv[ii], "-h" )== 0 );
 	}
 
+  {
+    // Set up CLASSPATH so that we can find property files in
+    // itext.jar.  Do this the official way, calling build-classpath.
+
+    char new_classpath[4096];
+    char itext_classpath[1024];
+    char *environ_classpath = getenv ("CLASSPATH");
+
+    FILE *p = popen ("/usr/bin/build-classpath itext", "r");
+    if (!p)
+      {
+        perror ("Can't popen /usr/bin/build-classpath itext");
+        exit (1);
+      }
+
+    char *s = fgets(itext_classpath, sizeof itext_classpath, p);
+    if (!s)
+      {
+        perror ("Can't get ouput from /usr/bin/build-classpath itext");
+        exit (1);
+      }
+
+    char *nl = strchr (itext_classpath, '\n');
+    if (nl)
+      *nl = 0;
+
+    pclose (p);
+
+    strcpy (new_classpath, "CLASSPATH=");
+    strncat (new_classpath, itext_classpath, sizeof new_classpath);
+    if (environ_classpath)
+      {
+        strncat (new_classpath, ":", sizeof new_classpath);
+        strncat (new_classpath, environ_classpath, sizeof new_classpath);
+      }
+    putenv (new_classpath);
+  }
+
 	if( help_b ) {
 		describe_full();
 	}


Index: pdftk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pdftk.spec	31 Mar 2009 15:37:54 -0000	1.15
+++ pdftk.spec	9 Apr 2009 18:52:02 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -12,6 +12,8 @@
 Patch1:         pdftk-1.41-make.patch
 Patch2:         pdftk-1.41-gcc44.patch
 Patch3:		pdftk-1.41-stdin.patch
+# Solves ".afm files not found" error. RHBZ#494785:
+Patch4:		pdftk-classpath.patch
 Group:          Applications/Publishing
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-java
@@ -46,6 +48,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1 -b .org
+%patch4 -p0 -b .classpath
 
 rm -rf java_libs
 
@@ -87,6 +90,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
+- Patch ".afm files not found" issue (#494785)
+
 * Tue Mar 31 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-14
 - Patch stdin issue (#492968)
 



From oget at fedoraproject.org  Thu Apr  9 18:54:56 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  9 Apr 2009 18:54:56 +0000 (UTC)
Subject: rpms/pdftk/F-10 pdftk-classpath.patch, NONE, 1.1 pdftk.spec, 1.15,
	1.16
Message-ID: <20090409185456.3ED577001C@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pdftk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15554

Modified Files:
	pdftk.spec 
Added Files:
	pdftk-classpath.patch 
Log Message:
* Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
- Patch ".afm files not found" issue (#494785)


pdftk-classpath.patch:

--- NEW FILE pdftk-classpath.patch ---
--- pdftk/pdftk.cc	2009-04-09 18:07:27.000000000 +0100
+++ /home/aph/pdftk.cc	2009-04-09 18:09:20.000000000 +0100
@@ -2669,6 +2669,44 @@
 			 strcmp( argv[ii], "-h" )== 0 );
 	}
 
+  {
+    // Set up CLASSPATH so that we can find property files in
+    // itext.jar.  Do this the official way, calling build-classpath.
+
+    char new_classpath[4096];
+    char itext_classpath[1024];
+    char *environ_classpath = getenv ("CLASSPATH");
+
+    FILE *p = popen ("/usr/bin/build-classpath itext", "r");
+    if (!p)
+      {
+        perror ("Can't popen /usr/bin/build-classpath itext");
+        exit (1);
+      }
+
+    char *s = fgets(itext_classpath, sizeof itext_classpath, p);
+    if (!s)
+      {
+        perror ("Can't get ouput from /usr/bin/build-classpath itext");
+        exit (1);
+      }
+
+    char *nl = strchr (itext_classpath, '\n');
+    if (nl)
+      *nl = 0;
+
+    pclose (p);
+
+    strcpy (new_classpath, "CLASSPATH=");
+    strncat (new_classpath, itext_classpath, sizeof new_classpath);
+    if (environ_classpath)
+      {
+        strncat (new_classpath, ":", sizeof new_classpath);
+        strncat (new_classpath, environ_classpath, sizeof new_classpath);
+      }
+    putenv (new_classpath);
+  }
+
 	if( help_b ) {
 		describe_full();
 	}


Index: pdftk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdftk/F-10/pdftk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pdftk.spec	31 Mar 2009 15:44:37 -0000	1.15
+++ pdftk.spec	9 Apr 2009 18:54:25 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -12,6 +12,8 @@
 Patch1:         pdftk-1.41-make.patch
 Patch2:         pdftk-1.41-gcc44.patch
 Patch3:		pdftk-1.41-stdin.patch
+# Solves ".afm files not found" error. RHBZ#494785:
+Patch4:		pdftk-classpath.patch
 Group:          Applications/Publishing
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-java
@@ -46,6 +48,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1 -b .org
+%patch4 -p0 -b .classpath
 
 rm -rf java_libs
 
@@ -87,6 +90,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
+- Patch ".afm files not found" issue (#494785)
+
 * Tue Mar 31 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-14
 - Patch stdin issue (#492968)
 



From oget at fedoraproject.org  Thu Apr  9 19:08:40 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  9 Apr 2009 19:08:40 +0000 (UTC)
Subject: rpms/bouncycastle/devel bouncycastle.spec,1.12,1.13
Message-ID: <20090409190840.7CDED7001C@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19528

Modified Files:
	bouncycastle.spec 
Log Message:
* Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
- Add missing Requires: junit4



Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bouncycastle.spec	17 Mar 2009 22:39:08 -0000	1.12
+++ bouncycastle.spec	9 Apr 2009 19:08:10 -0000	1.13
@@ -5,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.42
-Release:          1%{?dist}
+Release:          2%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -26,6 +26,7 @@
 BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils >= 1.5
 BuildRequires:    junit4
+Requires:         junit4
 
 Provides:         bcprov == %{version}-%{release}
 
@@ -170,6 +171,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
+- Add missing Requires: junit4
+
 * Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-1
 - Import Bouncy Castle 1.42.
 - Update description.



From oget at fedoraproject.org  Thu Apr  9 19:12:29 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  9 Apr 2009 19:12:29 +0000 (UTC)
Subject: rpms/bouncycastle-mail/devel bouncycastle-mail.spec,1.3,1.4
Message-ID: <20090409191230.06EE87001C@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20517

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
- Add missing Requires: javamail
- Remove redundant BR: junit4



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bouncycastle-mail.spec	17 Mar 2009 22:41:28 -0000	1.3
+++ bouncycastle-mail.spec	9 Apr 2009 19:11:59 -0000	1.4
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.42
-Release:          1%{?dist}
+Release:          2%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -27,7 +27,7 @@
 BuildRequires:    java-devel >= 1.7
 BuildRequires:    javamail
 BuildRequires:    jpackage-utils >= 1.5
-BuildRequires:    junit4
+Requires:         javamail
 
 Provides:         bcmail == %{version}-%{release}
 
@@ -120,6 +120,10 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
+- Add missing Requires: javamail
+- Remove redundant BR: junit4
+
 * Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-1
 - Import Bouncy Castle 1.42.
 - Add javadoc subpackage.



From ausil at fedoraproject.org  Thu Apr  9 19:15:50 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  9 Apr 2009 19:15:50 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6.29.1-sparc-regression.patch, NONE,
	1.1 config-sparc64-generic, 1.24, 1.25 config-sparc64-smp, 1.2,
	1.3 kernel.spec, 1.1526, 1.1527
Message-ID: <20090409191550.CE6487001C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21560

Modified Files:
	config-sparc64-generic config-sparc64-smp kernel.spec 
Added Files:
	linux-2.6.29.1-sparc-regression.patch 
Log Message:
add patch to fix sparc 2.6.29.1 regression


linux-2.6.29.1-sparc-regression.patch:

--- NEW FILE linux-2.6.29.1-sparc-regression.patch ---
>From davem at davemloft.net Tue Apr  7 17:24:11 2009
Return-Path: <davem at davemloft.net>
X-Original-To: dennis at ausil.us
Delivered-To: dennis at ausil.us
Received: from localhost (unknown [127.0.0.1])
	by mail.ausil.us (Postfix) with ESMTP id 8067B158003
	for <dennis at ausil.us>; Tue,  7 Apr 2009 22:24:22 +0000 (UTC)
X-Virus-Scanned: amavisd-new at example.com
Received: from mail.ausil.us ([127.0.0.1])
	by localhost (anubis.ausil.us [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Wtdx2a8O54+g for <dennis at ausil.us>;
	Tue,  7 Apr 2009 17:24:21 -0500 (CDT)
X-Greylist: from auto-whitelisted by SQLgrey-1.7.5
Received: from sunset.davemloft.net (unknown [74.93.104.97])
	by mail.ausil.us (Postfix) with ESMTP id 7A828158001
	for <dennis at ausil.us>; Tue,  7 Apr 2009 17:24:21 -0500 (CDT)
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id CA9B8C8D935;
	Tue,  7 Apr 2009 15:24:11 -0700 (PDT)
Date: Tue, 07 Apr 2009 15:24:11 -0700 (PDT)
Message-Id: <20090407.152411.198483029.davem at davemloft.net>
To: dennis at ausil.us
Cc: sparclinux at vger.kernel.org
Subject: Re: kernel bug with CONFIG_KEYBOARD_ATKBD=y
From: David Miller <davem at davemloft.net>
In-Reply-To: <20090407.151638.93201206.davem at davemloft.net>
References: <20090407.145755.213806619.davem at davemloft.net>
	<200904071710.09685.dennis at ausil.us>
	<20090407.151638.93201206.davem at davemloft.net>
X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset=us-ascii
Content-Transfer-Encoding: 7bit
X-UID: 4807
X-Length: 3606
Status: R
X-Status: N
X-KMail-EncryptionState:  
X-KMail-SignatureState:  
X-KMail-MDN-Sent:  

From: David Miller <davem at davemloft.net>
Date: Tue, 07 Apr 2009 15:16:38 -0700 (PDT)

> From: Dennis Gilmore <dennis at ausil.us>
> Date: Tue, 7 Apr 2009 17:10:08 -0500
> 
>> On Tuesday 07 April 2009 04:57:55 pm David Miller wrote:
>>> From: Dennis Gilmore <dennis at ausil.us>
>>> Date: Tue, 7 Apr 2009 10:01:17 -0500
>>>
>>> > Initalizing network drop monitor service
>>> > kernel BUG at
>>> > /builddir/build/BUILD/kernel-2.6.29/linux-2.6.29.sparc64/arch/sparc/inclu
>>> >de/asm/tlb_64.h:48!
>>>
>>> What kernel is this tree based upon?  2.6.29.1?
>> yeah 2.6.29.1
> 
> A sparc64 fix I put into 2.6.29.1 is likely the cause.  It's possible
> I put in a version without a particular issue cured.

Indeed, here is the fix, I'll push it to -stable.  Thanks for your
report:

sparc64: Fix bug in ("sparc64: Flush TLB before releasing pages.")

[ No upstream commit, this regression was added only to 2.6.29.1 ]

Unfortunately I merged an earlier version of commit
b6816b706138c3870f03115071872cad824f90b4 ("sparc64: Flush TLB before
releasing pages.") than what I actually tested and merged upstream.

Simply diffing asm/tlb_64.h in Linus's tree vs. what ended up in
2.6.29.1 confirms this.

Sync things up to fix BUG() triggers some users are seeing.

Reported-by: Dennis Gilmore <dennis at ausil.us>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
 arch/sparc/include/asm/tlb_64.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
index 0aaa086..ee38e73 100644
--- a/arch/sparc/include/asm/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
@@ -57,9 +57,9 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i
 
 static inline void tlb_flush_mmu(struct mmu_gather *mp)
 {
+	if (!mp->fullmm)
+		flush_tlb_pending();
 	if (mp->need_flush) {
-		if (!mp->fullmm)
-			flush_tlb_pending();
 		free_pages_and_swap_cache(mp->pages, mp->pages_nr);
 		mp->pages_nr = 0;
 		mp->need_flush = 0;
-- 
1.6.2.2



Index: config-sparc64-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/config-sparc64-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-sparc64-generic	12 Mar 2009 03:23:03 -0000	1.24
+++ config-sparc64-generic	9 Apr 2009 19:15:20 -0000	1.25
@@ -151,7 +151,7 @@
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E_TX_RETRY=16
 # CONFIG_DRM_TDFX is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_SPARCSPKR=m
@@ -197,3 +197,5 @@
 CONFIG_SENSORS_ULTRA45=m
 CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
+
+# CONFIG_KGDB is not set


Index: config-sparc64-smp
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/config-sparc64-smp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-sparc64-smp	16 Jul 2008 21:29:33 -0000	1.2
+++ config-sparc64-smp	9 Apr 2009 19:15:20 -0000	1.3
@@ -1 +1,2 @@
 CONFIG_SMP=y
+CONFIG_KGDB=y


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1526
retrieving revision 1.1527
diff -u -r1.1526 -r1.1527
--- kernel.spec	9 Apr 2009 17:49:38 -0000	1.1526
+++ kernel.spec	9 Apr 2009 19:15:20 -0000	1.1527
@@ -642,7 +642,7 @@
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-
+Patch590: linux-2.6.29.1-sparc-regression.patch
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 Patch601: alsa-rewrite-hw_ptr-updaters.patch
 Patch602: alsa-pcm-always-reset-invalid-position.patch
@@ -1133,7 +1133,7 @@
 #
 
 ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-
+ApplyPatch linux-2.6.29.1-sparc-regression.patch
 #
 # Exec shield
 #
@@ -1902,6 +1902,9 @@
 # and build.
 
 %changelog
+* Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.29.1-59
+- add patch to fix regression on sparc
+
 * Thu Apr 09 2009 Adam Jackson <ajax at redhat.com>
 - drm-intel-gen3-fb-hack.patch: Allow up to 4k framebuffers on 9[14]5.  3D
   will be broken if you do that, but at least dualhead will be less broken.



From crobinso at fedoraproject.org  Thu Apr  9 19:19:07 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  9 Apr 2009 19:19:07 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.7.0-delete-dup-conn.patch,
	NONE, 1.1 virt-manager-0.7.0-fix-button-ordering.patch, NONE,
	1.1 virt-manager-0.7.0-fix-vcpu-cap.patch, NONE,
	1.1 virt-manager-0.7.0-update-translations.patch, NONE,
	1.1 virt-manager.spec, 1.49, 1.50
Message-ID: <20090409191907.75BE07001C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22644

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.7.0-delete-dup-conn.patch 
	virt-manager-0.7.0-fix-button-ordering.patch 
	virt-manager-0.7.0-fix-vcpu-cap.patch 
	virt-manager-0.7.0-update-translations.patch 
Log Message:
Fix incorrect max vcpu setting in New VM wizard (bz 490466)
Fix some OK/Cancel button ordering issues (bz 490207)
Use openAuth when duplicating a connection when deleting a VM
Updated translations (bz 493795)


virt-manager-0.7.0-delete-dup-conn.patch:

--- NEW FILE virt-manager-0.7.0-delete-dup-conn.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1238782522 14400
# Node ID 218ecc7495319b70960c5e3685e8597700c29bfb
# Parent  5abfbc44b41efc4fae9b154bb515044c32ffc0f4
Use dup_conn in delete dialog.

diff -r 5abfbc44b41e -r 218ecc749531 src/virtManager/delete.py
--- a/src/virtManager/delete.py	Fri Apr 03 14:15:15 2009 -0400
+++ b/src/virtManager/delete.py	Fri Apr 03 14:15:22 2009 -0400
@@ -25,9 +25,9 @@
 import traceback
 import logging
 
-import libvirt
 import virtinst
 
+from virtManager import util
 from virtManager.error import vmmErrorDialog
 from virtManager.asyncjob import vmmAsyncJob
 from virtManager.createmeter import vmmCreateMeter
@@ -159,11 +159,7 @@
         try:
             # Open a seperate connection to install on since this is async
             logging.debug("Threading off connection to delete vol.")
-            #newconn = vmmConnection(self.config, self.conn.get_uri(),
-            #                        self.conn.is_read_only())
-            #newconn.open()
-            #newconn.connectThreadEvent.wait()
-            newconn = libvirt.open(self.conn.get_uri())
+            newconn = util.dup_conn(self.config, self.conn)
             meter = vmmCreateMeter(asyncjob)
 
             for path in paths:

virt-manager-0.7.0-fix-button-ordering.patch:

--- NEW FILE virt-manager-0.7.0-fix-button-ordering.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1238787321 14400
# Node ID 71d9208d322631118bbdc110388c333bd1f784eb
# Parent  9b4b6eb8de8d9e7b0e906715fb503a0b1ab0f30d
Reorder buttons in the delete dialog.

diff -r 9b4b6eb8de8d -r 71d9208d3226 src/vmm-delete.glade
--- a/src/vmm-delete.glade	Fri Apr 03 14:58:51 2009 -0400
+++ b/src/vmm-delete.glade	Fri Apr 03 15:35:21 2009 -0400
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Feb 25 17:45:14 2009 -->
+<!--Generated with glade3 3.4.5 on Fri Apr  3 15:34:40 2009 -->
 <glade-interface>
   <widget class="GtkDialog" id="vmm-delete">
     <property name="width_request">500</property>
@@ -115,6 +115,17 @@
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
+              <widget class="GtkButton" id="delete-cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_delete_cancel_clicked"/>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkButton" id="delete-ok">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -124,17 +135,6 @@
                 <property name="response_id">0</property>
                 <signal name="clicked" handler="on_delete_ok_clicked"/>
               </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="delete-cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_delete_cancel_clicked"/>
-              </widget>
               <packing>
                 <property name="position">1</property>
               </packing>
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1238787521 14400
# Node ID 6f0170f9d551ff54dcedca188bbf84313c551a30
# Parent  71d9208d322631118bbdc110388c333bd1f784eb
Change 'choose cd' button ordering.

diff -r 71d9208d3226 -r 6f0170f9d551 src/vmm-choose-cd.glade
--- a/src/vmm-choose-cd.glade	Fri Apr 03 15:35:21 2009 -0400
+++ b/src/vmm-choose-cd.glade	Fri Apr 03 15:38:41 2009 -0400
@@ -40,97 +40,19 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox2">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="label38">
-                                <property name="visible">True</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">_Path to install media:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">cd-path</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkComboBox" id="cd-path">
-                                <property name="visible">True</property>
-                                <signal name="changed" handler="on_cd_path_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment5">
+                          <widget class="GtkAlignment" id="alignment4">
                             <property name="visible">True</property>
                             <property name="yalign">0</property>
                             <property name="yscale">0</property>
                             <child>
-                              <widget class="GtkRadioButton" id="iso-image">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">_ISO Image Location:</property>
-                                <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">physical-media</property>
-                                <signal name="toggled" handler="on_media_toggled"/>
-                              </widget>
+                              <placeholder/>
                             </child>
                           </widget>
                           <packing>
-                            <property name="right_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkRadioButton" id="physical-media">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_CD-ROM or DVD:</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_media_toggled"/>
-                          </widget>
-                          <packing>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label36">
-                            <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">ISO _Location:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">iso-path</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                            <property name="x_padding">3</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -168,21 +90,99 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment4">
+                          <widget class="GtkLabel" id="label36">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">ISO _Location:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">iso-path</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                            <property name="x_padding">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkRadioButton" id="physical-media">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_CD-ROM or DVD:</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_media_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment5">
                             <property name="visible">True</property>
                             <property name="yalign">0</property>
                             <property name="yscale">0</property>
                             <child>
-                              <placeholder/>
+                              <widget class="GtkRadioButton" id="iso-image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_ISO Image Location:</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">physical-media</property>
+                                <signal name="toggled" handler="on_media_toggled"/>
+                              </widget>
                             </child>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="right_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox2">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label38">
+                                <property name="visible">True</property>
+                                <property name="xpad">5</property>
+                                <property name="label" translatable="yes">_Path to install media:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">cd-path</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="cd-path">
+                                <property name="visible">True</property>
+                                <signal name="changed" handler="on_cd_path_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -209,6 +209,17 @@
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
+              <widget class="GtkButton" id="Cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+                <signal name="clicked" handler="on_cancel_clicked"/>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkButton" id="OK">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -218,17 +229,6 @@
                 <property name="response_id">-5</property>
                 <signal name="clicked" handler="on_ok_clicked"/>
               </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="Cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-                <signal name="clicked" handler="on_cancel_clicked"/>
-              </widget>
               <packing>
                 <property name="position">1</property>
               </packing>

virt-manager-0.7.0-fix-vcpu-cap.patch:

--- NEW FILE virt-manager-0.7.0-fix-vcpu-cap.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1239034964 14400
# Node ID c5489151e2e6bd37c41b543efb79186739fb1b3c
# Parent  3cfb5918b1a80b9eea3282244a27f512f566eb2e
Fix incorrect vcpu capping in create wizard.

Cap was always 10 less than we intended. Apparently spinbutton page_size != 0
is deprecated, yet is the default set by glade3? Schweet.

diff -r 3cfb5918b1a8 -r c5489151e2e6 src/vmm-create.glade
--- a/src/vmm-create.glade	Mon Apr 06 11:33:46 2009 -0400
+++ b/src/vmm-create.glade	Mon Apr 06 12:22:44 2009 -0400
@@ -826,7 +826,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="xalign">1</property>
-                                            <property name="adjustment">0 0 8096 1 10 10</property>
+                                            <property name="adjustment">0 0 8096 1 10 0</property>
                                             <property name="climb_rate">1</property>
                                           </widget>
                                           <packing>
@@ -841,7 +841,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="xalign">1</property>
-                                            <property name="adjustment">0 0 128 1 10 10</property>
+                                            <property name="adjustment">0 0 128 1 10 0</property>
                                             <property name="climb_rate">1</property>
                                           </widget>
                                           <packing>
@@ -1025,7 +1025,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="xalign">1</property>
-                                                <property name="adjustment">2 0 1000000 0.10000000000000001 10 10</property>
+                                                <property name="adjustment">2 0 1000000 0.10000000000000001 10 0</property>
                                                 <property name="climb_rate">1</property>
                                                 <property name="digits">1</property>
                                               </widget>

virt-manager-0.7.0-update-translations.patch:

--- NEW FILE virt-manager-0.7.0-update-translations.patch ---
diff -rup --new-file virt-manager-0.7.0/po/as.po new/po/as.po
--- virt-manager-0.7.0/po/as.po	1969-12-31 19:00:00.000000000 -0500
+++ new/po/as.po	2009-04-09 12:27:48.195275000 -0400
@@ -0,0 +1,3575 @@
+# translation of virt-manager.tip.po to Assamese
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Amitakhya Phukan <aphukan at fedoraproject.org>, 2008, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: virt-manager.tip\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-09 20:26-0400\n"
+"PO-Revision-Date: 2009-04-06 14:07+0530\n"
+"Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
+"Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+
+#: ../src/virt-manager.desktop.in.in.h:1
+msgid "Manage virtual machines"
+msgstr "??????????????????????????? ????????????????????? ???????????????????????? ?????????"
+
+#: ../src/virt-manager.desktop.in.in.h:2 ../src/vmm-manager.glade.h:17
+msgid "Virtual Machine Manager"
+msgstr "??????????????????????????? ?????????????????? ?????????????????????"
+
+#: ../src/virt-manager.py.in:55
+msgid "Error starting Virtual Machine Manager"
+msgstr "??????????????????????????? ?????????????????? ????????????????????? ??????????????? ?????????????????? ??????????????????"
+
+#. ...the risk is we catch too much though
+#. Damned if we do, damned if we dont :-)(
+#: ../src/virt-manager.py.in:284, python-format
+msgid "Unable to initialize GTK: %s"
+msgstr "GTK ??????????????? ?????????????????? ??????????????????: %s"
+
+#: ../src/virt-manager.schemas.in.h:1
+msgid "Install sound device for local VM"
+msgstr "????????????????????? VM ??? ??????????????? ?????????????????? ???????????????????????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:2
+msgid "Install sound device for remote VM"
+msgstr "???????????????????????? ??????????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:3
+msgid "Poll cpu stats"
+msgstr "cpu stats ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:4
+msgid "Poll disk i/o stats"
+msgstr "disk i/o stats ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:5
+msgid "Poll memory usage stats"
+msgstr "memory usage stats ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:6
+msgid "Poll net i/o stats"
+msgstr "net i/o stats ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:7
+msgid "Show VCPU count in summary"
+msgstr "????????????????????? VCPU ??? ?????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:8
+msgid "Show cpu usage in summary"
+msgstr "????????????????????? cpu ???????????????????????? ???????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:9
+msgid "Show disk I/O in summary"
+msgstr "????????????????????? ???????????????  I/O ???????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:10
+msgid "Show domain id in summary"
+msgstr "????????????????????? ?????????????????? id ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:11
+msgid "Show memory usage in summary"
+msgstr "????????????????????? ???????????????????????????????????? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:12
+msgid "Show network I/O in summary"
+msgstr "??????'?????????????????? I/O ??? ??????????????????????????? ??????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:13
+msgid "Show run state in summary"
+msgstr "????????????????????? ???????????????????????? ?????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:14
+msgid "Show the cpu usage field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? cpu ???????????????????????? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:15
+msgid "Show the disk I/O field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????????????? I/O ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:16
+msgid "Show the domain id field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????? id ??? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:17
+msgid "Show the memory usage field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:18
+msgid "Show the network I/O field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????'??????????????? ????????????????????? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:19
+msgid "Show the run state field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:20
+msgid "Show the virtual CPU count field in the domain list summary view"
+msgstr "?????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????????????????????????? CPU-??? ????????????????????? ????????????????????? ???????????????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:21
+msgid "The length of the list of URLs"
+msgstr "URL ????????????????????? ?????????????????????"
+
+#: ../src/virt-manager.schemas.in.h:22
+msgid "The number of samples to keep in the statistics history"
+msgstr "?????????????????????????????? ????????????????????? ??????????????? ????????? ?????????????????? ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:23
+msgid "The number of urls to keep in the history for the install media address page."
+msgstr "???????????????????????? ????????????????????? ?????????????????? ????????????????????? ?????????????????????????????? ??????????????? ???????????? ???????????????????????? url ??? ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:24
+msgid "The statistics history length"
+msgstr "?????????????????????????????? ?????????????????????????????? ??????????????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:25
+msgid "The statistics update interval"
+msgstr "??????????????????????????? ??????????????? ???????????? ?????????????????????"
+
+#: ../src/virt-manager.schemas.in.h:26
+msgid "The statistics update interval in seconds"
+msgstr "???????????????????????? ?????????????????????????????? ???????????????????????? ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:27
+msgid "When to grab keyboard input for the console"
+msgstr "????????????????????? ???????????? ??????????????? ???????????? ???????????? ????????? ??????????????? ??????????????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:28
+msgid "When to pop up a console for a guest"
+msgstr "??????????????? ???????????????????????????????????????????????? ???????????? ??????????????? ?????????????????? ???'???-?????? ????????? ???'???"
+
+#: ../src/virt-manager.schemas.in.h:29
+msgid "When to scale the VM graphical console"
+msgstr "VM ????????????????????????????????? ???'??????????????? ?????????????????? ??????????????? ???????????? ????????????"
+
+#: ../src/virt-manager.schemas.in.h:30
+msgid ""
+"When to scale the VM graphical console. 0 = never, 1 = only when in full "
+"screen mode, 2 = Always"
+msgstr ""
+"VM ????????????????????????????????? ?????????????????? ?????????????????? ??????????????? ???????????? ???????????? ??? 0 = ???????????? ?????????, 1 = ????????? ???????????????????????? ???????????????????????? "
+"???????????????????????? ????????? ????????????, 2 = ????????????"
+
+#: ../src/virt-manager.schemas.in.h:31
+msgid "Whether or not the app will poll VM disk i/o statistics"
+msgstr "?????????????????????????????? VM ??????????????? i/o ??????????????????????????? ????????????????????? ?????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:32
+msgid "Whether or not the app will poll VM network i/o statistics"
+msgstr "?????????????????????????????? VM ??????'??????????????? i/o ??????????????????????????? ????????????????????? ?????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:33
+msgid "Whether or not the app will poll connection and VM cpu usage statistics"
+msgstr "?????????????????????????????? ??????????????? ????????? VM cpu ???????????????????????? ??????????????????????????? ????????????????????? ?????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:34
+msgid "Whether or not the app will poll connection and VM memory usage statistics"
+msgstr "?????????????????????????????? ??????????????? ????????? VM ????????????????????????????????? ???????????????????????? ??????????????????????????? ????????????????????? ?????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:35
+msgid ""
+"Whether to grab keyboard input for a guest console. 0 = never, 1 = only when "
+"in full screen mode, 2 = when mouse is over console"
+msgstr ""
+"??????????????? ????????????????????? ???????????? ???????????? ???????????? ??????????????? ??????????????? ????????? ???'??? ?????? ????????? ??? 0 = ???????????? ?????????, 1 = "
+"????????? ???????????????????????? ???????????????????????? ???????????????????????? ????????? ????????????, 2 = ????????????????????? ???????????? ???????????? ????????????????????? ??????????????????"
+
+#: ../src/virt-manager.schemas.in.h:36
+msgid "Whether to install a sound device for local VMs or not"
+msgstr "????????????????????? ??????????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????? ????????? ???'??? ?????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:37
+msgid "Whether to install a sound device for remote VMs or not"
+msgstr "???????????????????????? ??????????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????? ????????? ???'??? ?????? ?????????"
+
+#: ../src/virt-manager.schemas.in.h:38
+msgid ""
[...122222 lines suppressed...]
+
+#~ msgid "Kickstart Field"
+#~ msgstr "Kickstart ??????"
+
+#~ msgid "Kickstart source:"
+#~ msgstr "Kickstart ?????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lightweight method of virtualizing machines. Limits operating system "
+#~ "choices because the OS must be specially modified to support "
+#~ "paravirtualization, but performs better than fully virtualized."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "????????????????????????????????????????????????????????????"
+
+#~ msgid "Logical host CPUs:"
+#~ msgstr "?????????????????????"
+
+#~ msgid "MAC Field"
+#~ msgstr "MAC ??????"
+
+#~ msgid "Machine name:"
+#~ msgstr "???????????????"
+
+#~ msgid "Max Mem Select"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Maximum memory:"
+#~ msgstr "??????????????????"
+
+#, fuzzy
+#~ msgid "Maximum virtual CPUs:"
+#~ msgstr "??????????????????"
+
+#~ msgid "Media Path Select"
+#~ msgstr "??????????????????"
+
+#~ msgid "Name Field"
+#~ msgstr "????????????"
+
+#~ msgid "Network Select"
+#~ msgstr "????????????"
+
+#~ msgid "OS _Variant:"
+#~ msgstr "??????????????????(_V)???"
+
+#~ msgid "Partition Field"
+#~ msgstr "???????????????"
+
+#, fuzzy
+#~ msgid "Please choose a name for your virtual machine:"
+#~ msgstr "???????????????????????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please choose the operating system you will be installing on the virtual "
+#~ "machine:"
+#~ msgstr "?????????????????????????????????????????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the memory configuration for this virtual machine. You can "
+#~ "specify the maximum amount of memory the virtual machine should be able "
+#~ "to use, and optionally a lower amount to grab on startup. Warning: "
+#~ "setting virtual machine memory too high will cause out-of-memory errors "
+#~ "in your host domain!"
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????????????????????????????????????????????????????? VM ?????????????????????????????????"
+#~ "?????????????????????????????????????????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the number of virtual CPUs this virtual machine should start "
+#~ "up with."
+#~ msgstr "????????????????????????????????????????????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please indicate how you'd like to assign space from the host for your new "
+#~ "virtual machine. This space will be used to install the virtual machine's "
+#~ "operating system."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????????????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please indicate how you'd like to connect your new virtual machine to the "
+#~ "host network."
+#~ msgstr "?????????????????????????????????????????????????????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please indicate where installation media is available for the operating "
+#~ "system you would like to install on this virtual machine. Optionally you "
+#~ "can provide the URL for a kickstart file:"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????? kickstart ???????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please indicate where installation media is available for the operating "
+#~ "system you would like to install on this virtual machine:"
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+#, fuzzy
+#~ msgid "Set fixed MAC _address for your virtual machine?"
+#~ msgstr "????????????????????????????????????????????? MAC ??????(_a)???"
+
+#~ msgid "Startup Mem Select"
+#~ msgstr "?????????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <b>location</b> of the files necessary for installing an operating "
+#~ "system on the virtual machine"
+#~ msgstr "?????????????????????????????????????????????????????????<b>??????</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This assistant will guide you through creating a new virtual machine. You "
+#~ "will be asked for some information about the virtual machine you'd like "
+#~ "to create, such as:"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????????????????????????????"
+
+#~ msgid "Virtual CPUs:"
+#~ msgstr "??????????????????"
+
+#~ msgid "Virtualization method:"
+#~ msgstr "??????????????????"
+
+#, fuzzy
+#~ msgid ""
+#~ "Whether the virtual machine will be <b>fully virtualized</b> or <b>para-"
+#~ "virtualized</b>"
+#~ msgstr "?????????<b>????????????</b>???<b>????????????</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "You will need to choose a virtualization method for your new virtual "
+#~ "machine:"
+#~ msgstr "??????????????????????????????????????????"
+
+#, fuzzy
+#~ msgid "_ISO image location:"
+#~ msgstr "_ISO ?????????????????????"
+
+#, fuzzy
+#~ msgid "_Name:"
+#~ msgstr "?????????"
+
+#~ msgid "_Paravirtualized:"
+#~ msgstr "????????????(_P)???"
+
+#, fuzzy
+#~ msgid "_Startup memory (MB):"
+#~ msgstr "?????????????????????????????????MB???(_S)???"
+
+#, fuzzy
+#~ msgid "_Virtual CPUs:"
+#~ msgstr "??????????????????"
+
 #~ msgid "20 bits/sec"
 #~ msgstr "20 bits/sec"
 
@@ -3549,9 +3888,6 @@ msgstr "???"
 #~ msgid "Create a new virtual system"
 #~ msgstr "????????????????????????"
 
-#~ msgid "Install type"
-#~ msgstr "????????????"
-
 #~ msgid "Local inst"
 #~ msgstr "????????????"
 
@@ -3600,9 +3936,6 @@ msgstr "???"
 #~ msgid "History Samples"
 #~ msgstr "????????????"
 
-#~ msgid "Local VM"
-#~ msgstr "?????? VM"
-
 #~ msgid "Remote VM"
 #~ msgstr "?????? VM"
 
@@ -3642,9 +3975,6 @@ msgstr "???"
 #~ msgid "Error restoring domain '%s'. Is the domain already running?"
 #~ msgstr "?????????%s????????????????????????????????????????????????"
 
-#~ msgid "This will permanently delete the connection \"%s\", are you sure?"
-#~ msgstr "??????????????????%s?????????????????????????????????????????????"
-
 #~ msgid "This will permanently delete the vm \"%s,\" are you sure?"
 #~ msgstr "????????? vm???%s?????????????????????????????????????????????"
 


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- virt-manager.spec	23 Mar 2009 22:05:58 -0000	1.49
+++ virt-manager.spec	9 Apr 2009 19:19:07 -0000	1.50
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.7.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -17,6 +17,10 @@
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
 Patch1: %{name}-%{version}-old-xen-compat.patch
 Patch2: %{name}-%{version}-vm-migrate-list.patch
+Patch3: %{name}-%{version}-fix-button-ordering.patch
+Patch4: %{name}-%{version}-fix-vcpu-cap.patch
+Patch5: %{name}-%{version}-delete-dup-conn.patch
+Patch6: %{name}-%{version}-update-translations.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -91,6 +95,10 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -168,6 +176,12 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Apr 09 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-3.fc11
+- Fix incorrect max vcpu setting in New VM wizard (bz 490466)
+- Fix some OK/Cancel button ordering issues (bz 490207)
+- Use openAuth when duplicating a connection when deleting a VM
+- Updated translations (bz 493795)
+
 * Mon Mar 23 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-2.fc11
 - Back compat fixes for connecting to older xen installations (bz 489885)
 - Don't show harmless NoneType error when launching new VM details window



From giallu at fedoraproject.org  Thu Apr  9 19:24:10 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Thu,  9 Apr 2009 19:24:10 +0000 (UTC)
Subject: rpms/mantis/EL-5 mantis-1.1.0-noexamplecom.patch, NONE,
	1.1 mantis-1.1.6-bug4512.patch, NONE,
	1.1 mantis-1.1.6-install-nowriteconfig.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 mantis-README.Fedora, 1.2,
	1.3 mantis-httpd.conf, 1.3, 1.4 mantis.spec, 1.16, 1.17 sources,
	1.12, 1.13 mantis-0.19.2-noexamplecom.patch, 1.1,
	NONE mantis-1.0.0a3-iis.patch, 1.1, NONE
Message-ID: <20090409192410.63D637001C@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23783

Modified Files:
	.cvsignore mantis-README.Fedora mantis-httpd.conf mantis.spec 
	sources 
Added Files:
	mantis-1.1.0-noexamplecom.patch mantis-1.1.6-bug4512.patch 
	mantis-1.1.6-install-nowriteconfig.patch 
Removed Files:
	mantis-0.19.2-noexamplecom.patch mantis-1.0.0a3-iis.patch 
Log Message:
Sync with devel branch


mantis-1.1.0-noexamplecom.patch:

--- NEW FILE mantis-1.1.0-noexamplecom.patch ---
Index: mantis-1.1.0rc2/config_inc.php.sample
===================================================================
--- mantis-1.1.0rc2.orig/config_inc.php.sample
+++ mantis-1.1.0rc2/config_inc.php.sample
@@ -47,14 +47,14 @@
 	$g_db_type       = "mysql";
 
 	# --- email variables -------------
-	$g_administrator_email  = 'administrator at example.com';
-	$g_webmaster_email      = 'webmaster at example.com';
+	$g_administrator_email  = 'administrator at localhost';
+	$g_webmaster_email      = 'webmaster at localhost';
 
 	# the "From: " field in emails
-	$g_from_email           = 'noreply at example.com';
+	$g_from_email           = 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email    = 'admin at example.com';
+	$g_return_path_email    = 'admin at localhost';
 
 	# --- file upload settings --------
 	# This is the master setting to disable *all* file uploading functionality

mantis-1.1.6-bug4512.patch:

--- NEW FILE mantis-1.1.6-bug4512.patch ---
diff --git a/core/email_api.php b/core/email_api.php
index 2adb418..1857c81 100644
--- a/core/email_api.php
+++ b/core/email_api.php
@@ -897,8 +897,10 @@
 							string_get_bug_view_url_with_fqdn( $p_bug_id, $t_recipient ) .
 							" \n\n$p_message";
 
+			$t_visible_bug_data = email_build_visible_bug_data( $t_recipient, $p_bug_id, 'email_reminder' );
+			$t_mail_headers = email_get_default_headers( $t_visible_bug_data );
 			if( ON == config_get( 'enable_email_notification' ) ) {
-				email_store( $t_email, $t_subject, $t_contents );
+				email_store( $t_email, $t_subject, $t_contents, $t_mail_headers );
 			}
 
 			lang_pop();
@@ -946,7 +948,7 @@
 		# build headers
 		$t_bug_id = $p_visible_bug_data['email_bug'];
 		$t_message_md5 = md5( $t_bug_id . $p_visible_bug_data['email_date_submitted'] );
-		$t_mail_headers = array( 'keywords' => $p_visible_bug_data['set_category'] );
+		$t_mail_headers = email_get_default_headers( $p_visible_bug_data );
 		if ( $p_message_id == 'email_notification_title_for_action_bug_submitted' ) {
 			$t_mail_headers['Message-ID'] = "<{$t_message_md5}>";
 		} else {
@@ -960,6 +962,21 @@
 		return $t_ok;
 	}
 
+
+	/*
+	 Build and return the default set of mail header
+	 */
+	function email_get_default_headers( $p_visible_bug_data ) {
+		$t_headers = array();
+		$t_headers['keywords'] = $p_visible_bug_data['set_category'];
+		$t_headers['X-Mantis-Id'] = $p_visible_bug_data['email_bug'];
+		$t_headers['X-Mantis-Site'] = config_get( 'path' );
+		$t_headers['X-Mantis-Reporter'] = $p_visible_bug_data['email_reporter'];
+		$t_headers['X-Mantis-Owner'] = $p_visible_bug_data['email_handler'];
+		return $t_headers;
+	}
+
+
 	# --------------------
 	# Build the bug info part of the message
 	function email_format_bug_message( $p_visible_bug_data ) {

mantis-1.1.6-install-nowriteconfig.patch:

--- NEW FILE mantis-1.1.6-install-nowriteconfig.patch ---
--- mantis-1.1.6.orig/admin/install.php	2008-12-09 20:20:28.000000000 +0100
+++ mantis-1.1.6//admin/install.php	2008-12-28 19:39:50.493771722 +0100
@@ -397,10 +397,18 @@
 
 <tr>
 	<td>
+		<div style="background-color: #FCC; padding: 5px; border: 1px solid red;">
+		To change any of the disabled options below, edit /etc/mantis/config_inc.php and reload this page!
+		</div>
+	</td>
+</tr>
+
+<tr>
+	<td>
 		Type of Database
 	</td>
 	<td>
-		<select name="db_type">
+		<select disabled="true" name="db_type">
 		<?php
 			if ( $f_db_type == 'mysql' ) {
 				echo '<option value="mysql" selected="selected">MySql (default)</option>';
@@ -447,7 +455,7 @@
 		Hostname (for Database Server)
 	</td>
 	<td>
-		<input name="hostname" type="textbox" value="<?php echo $f_hostname ?>"></input>
+		<input name="hostname" type="textbox" disabled="disabled" value="<?php echo $f_hostname ?>"></input>
 	</td>
 </tr>
 
@@ -456,7 +464,7 @@
 		Username (for Database)
 	</td>
 	<td>
-		<input name="db_username" type="textbox" value="<?php echo $f_db_username ?>"></input>
+		<input name="db_username" type="textbox" disabled="disabled" value="<?php echo $f_db_username ?>"></input>
 	</td>
 </tr>
 
@@ -465,7 +473,7 @@
 		Password (for Database)
 	</td>
 	<td>
-		<input name="db_password" type="password" value="<?php echo ( !is_blank( $f_db_password ) ? CONFIGURED_PASSWORD : "" ) ?>"></input>
+		<input name="db_password" type="password" disabled="disabled" value="<?php echo ( !is_blank( $f_db_password ) ? CONFIGURED_PASSWORD : "" ) ?>"></input>
 	</td>
 </tr>
 
@@ -474,7 +482,7 @@
 		Database name (for Database)
 	</td>
 	<td>
-		<input name="database_name" type="textbox" value="<?php echo $f_database_name ?>"></input>
+		<input name="database_name" type="textbox" disabled="disabled" value="<?php echo $f_database_name ?>"></input>
 	</td>
 </tr>
 <tr>
@@ -762,6 +770,9 @@
 		$t_config_filename = $g_absolute_path . 'config_inc.php';
 		$t_config_exists = file_exists ( $t_config_filename );
 ?>
+<?php
+if (0 == 1) {
+?>
 <table width="100%" border="0" cellpadding="10" cellspacing="1">
 <tr>
 	<td bgcolor="#e8e8e8" colspan="2">
@@ -832,7 +843,9 @@
 ?>
 
 </table>
-
+<?php
+}
+?>
 <?php
 	if ( false == $g_failed ) {
 		$t_install_state++;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Jul 2007 09:45:43 -0000	1.7
+++ .cvsignore	9 Apr 2009 19:23:39 -0000	1.8
@@ -1 +1 @@
-mantis-1.0.8.tar.gz
+mantisbt-1.1.6.tar.gz


Index: mantis-README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/mantis-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mantis-README.Fedora	9 Jul 2007 09:45:43 -0000	1.2
+++ mantis-README.Fedora	9 Apr 2009 19:23:39 -0000	1.3
@@ -1,42 +1,55 @@
-Fedora specific installation notes
+= Fedora specific installation notes =
+
+== Database ==
 
 Mantis requires a database to function; use the following steps to
 configure mantis to work with MySQL:
 
 1. install MySQL packages
-    yum install mysql-server
+    yum install mysql-server php-mysql
 
 2. start MySQL server 
-    /etc/init.d/mysqld start
+    service mysqld start
 
 WARNING: the default MySQL configuration has a "root" account with no password.
          Please have a look to the MySQL documentation to add a proper password
          and/or a separate account for mantis usage.
 
-3. allow yourself to access the admin directory
+
+== Configuration files ==
+
+The mantis configuration file is /etc/mantis/config_inc.php.
+
+Be sure to check the file /usr/share/mantis/config_defaults_inc.php for the 
+full list of available configuration options.
+
+
+== First time operations ==
+
+1. allow yourelf to access the admin directory
     Please note that the provided configuration file for Apache 
     (/etc/httpd/conf.d/mantis.conf) by default prevents access to the mantis
     administration area. 
-    Change:
-    <Directory /usr/share/mantis/admin>
-        Order allow,deny
+    Find the section:
+        <Directory /usr/share/mantis/admin>
+
+    and change the "None" in:
+        Allow from None
     
-    to:
-    <Directory /usr/share/mantis/admin>
-        Order deny,allow
+    to the machine IP you will be connecting from. For instance:
+        Allow from 127.0.0.1
+
+    allows localhost access to the admin area
     
-    and restart apache with:
+    then restart apache with:
       service httpd restart
 
-    instead the needs to be edited in order to enable the execution of the installation script located
-   in /usr/share/mantis/admin.
-
-4. point your browser to:
-    https://localhost/mantis/admin/install.php
+2. point your browser to:
+      https://localhost/mantis/admin/install.php
    to create an empty DB.
 
 BIG FAT WARNING: when you are done with the installation, be sure to revert the 
-         modifications you've done in step 3.
+         modifications you've done in step 1.
          Otherwise you will leave the administration area unprotected with
          critical system information and database update capabilities open to 
          any unauthorized person.
@@ -47,6 +60,23 @@
          administrator level account.  Immediately after that, DISABLE or DELETE
          the administrator account. You can recreate it but you should delete
          the account to prevent the cookie_string from being used to trick the
-         package.  It would be even better to rename the account or delete it
-         permanently.  REMEMBER: After setting up the package, REMOVE the
+         package. REMEMBER: After setting up the package, REMOVE the
          default administrator account.
+
+== Upgrades ==
+
+After a version upgrade that involves changes to the DB schema, you will need
+to run again the installer steps as outlined above. The installer is able to
+recognize which modifications are needed and apply them to the DB.
+
+Albeit the upgrade routine is usually well tested and safe, please 
+consider doing a complete backup of the database before attempting the
+procedure.
+
+
+== SELinux ==
+
+The default SELinux configuration prevents the httpd process (hence mantis)
+from sending emails. This is easily fixed with:
+
+    setsebool -P httpd_can_sendmail=1


Index: mantis-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/mantis-httpd.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mantis-httpd.conf	9 Jul 2007 09:45:43 -0000	1.3
+++ mantis-httpd.conf	9 Apr 2009 19:23:39 -0000	1.4
@@ -16,9 +16,12 @@
 	# Do not change this unless the default administrator
 	# login was removed; see documentation for details
 	Order   Deny,Allow
-	Allow   from localhost
 	Deny    from All
-
+	Allow   from 127.0.0.1   # localhost
+	Allow   from ::1         # IPv6 variant of localhost
+        # Use the following to let any client use mantis
+        # Allow from All
+        
 	php_flag "register_globals" "off"
 	SetEnv MANTIS_CONFIG /etc/mantis/config_inc.php
 </Directory>
@@ -28,9 +31,9 @@
 # you are performing the first installation or a database schema update.
 # See README.Fedora for more details
 <Directory /usr/share/mantis/admin>
-	Order   allow,deny
-	Deny    from all
-	Allow   from localhost
+	Order   Deny,Allow
+	Deny    from All
+	Allow   from None
 </Directory>
 
 # This directory does not require access over HTTP


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/mantis.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mantis.spec	9 Jul 2007 09:45:43 -0000	1.16
+++ mantis.spec	9 Apr 2009 19:23:39 -0000	1.17
@@ -1,29 +1,30 @@
-# $Id$
-
 %global pkgdir        %{_datadir}/%{name}
 %global cfgdir        %{_sysconfdir}/%{name}
-%global httpconfdir    %{_sysconfdir}/httpd/conf.d
+%global docdir        %{_docdir}/%{name}-%{version}
+%global httpconfdir   %{_sysconfdir}/httpd/conf.d
 
 Summary:    Web-based bugtracking system
 Name:       mantis
-Version:    1.0.8
-Release:    1%{?dist}
-License:    GPL
+Version:    1.1.6
+Release:    3%{?dist}.1
+License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://www.mantisbt.org/
 BuildArch:  noarch
-Source0:    http://downloads.sourceforge.net/mantisbt/%{name}-%{version}.tar.gz
+Source0:    http://downloads.sourceforge.net/mantisbt/mantisbt-%{version}.tar.gz
 Source1:    mantis-README.Fedora
 
-Patch0:     mantis-1.0.0a3-iis.patch
-Patch1:     mantis-0.19.2-noexamplecom.patch
+Patch0:     mantis-1.1.6-install-nowriteconfig.patch
+Patch1:     mantis-1.1.0-noexamplecom.patch
 Patch2:     mantis-1.0.0rc2-noadmin.patch
+Patch3:     mantis-1.1.6-bug4512.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: diffutils
-Requires:   php
+Requires:   php >= 4.3.0
+Requires:   php-mbstring >= 4.3.0
 Requires:   mantis-config
-Requires:   php-adodb
+#Requires:   php-adodb
 
 %package config-httpd
 Summary:    Mantis configuration for Apache httpd
@@ -42,8 +43,14 @@
 It is written in the PHP scripting language and requires the MySQL
 database and a webserver. Mantis has been installed on Windows, MacOS,
 OS/2, and a variety of Unix operating systems. Any web browser should
-be able to function as a client. It is released under the terms of the
-GNU General Public License (GPL).
+be able to function as a client. 
+
+Documentation can be found in: %{docdir}
+
+When the package has finished installing, you will need to perform some
+additional configuration steps; these are described in:
+%{docdir}/README.Fedora
+
 
 %description config-httpd
 Mantis is a web-based bugtracking system.
@@ -51,14 +58,14 @@
 
 
 %prep
-%setup -q
+%setup -q -n mantisbt-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cp %{SOURCE1} ./doc/README.Fedora
-
-chmod -x *.php *.sample
+rm .gitignore
 rm -rf packages
 
 
@@ -74,11 +81,13 @@
 tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
 
 # Remove adodb
-rm -rf ${RPM_BUILD_ROOT}%{pkgdir}/core/adodb
+# rm -rf ${RPM_BUILD_ROOT}%{pkgdir}/core/adodb
 
 find ${RPM_BUILD_ROOT} \( \
-    -name '*.orig' -o -name '*.#.*' -o \
-    -name '.cvsignore' \
+    -name '*.orig' \
+    -o -name '*.#.*' \
+    -o -name '.cvsignore' \
+    -o -name '.htaccess' \
     \) -print0 | xargs -0 rm -f
 
 ## Do not rename; the *existence* of this file will be checked to
@@ -86,6 +95,12 @@
 mv ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php.sample ${RPM_BUILD_ROOT}%{cfgdir}/
 mv ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php.sample     ${RPM_BUILD_ROOT}%{cfgdir}/config_inc.php
 
+#convert changelog to UTF8
+iconv -f ISO_8859-1 -t UTF-8 -o doc/ChangeLog{.utf8,}
+mv doc/ChangeLog{.utf8,}
+
+chmod a+x core ${RPM_BUILD_ROOT}%{pkgdir}/core/checkin.php
+
 for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
     case $i in
         (*.php)
@@ -104,7 +119,7 @@
 chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/core/phpmailer/{README,LICENSE}
 
 # Dangling symlink: when /etc/mantis/mantis_offline.php is present mantis is put offline
-ln -s %{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
+ln -s ../../..%{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
 
 %{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
 %{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
@@ -137,7 +152,50 @@
 
 
 %changelog
-* Mon Jul  9 2007 Gianluca Sforna <giallu gmail com> - 1.0.8-1
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 28 2008 Sven Lankes <sven at lank.es> - 1.1.6-2
+- add patch to suppress bogus warning during setup 
+    (closes bz #437142)
+- convert ChangeLog to UTF8
+- remove .gitignore
+- change mantis_offline.php-symlink to be relative
+
+* Wed Dec 10 2008 Gianluca Sforna <giallu gmail com> - 1.1.6-1
+- new upstream release
+
+* Mon Nov 24 2008 Gianluca Sforna <giallu gmail com> - 1.1.5-1
+- new upstream release
+
+* Sun Oct 19 2008 Gianluca Sforna <giallu gmail com> - 1.1.4-1
+- new upstream release
+
+* Tue Oct 14 2008 Gianluca Sforna <giallu gmail com> - 1.1.3-1
+- new upstream release
+- drop upstreamed patch
+
+* Sat Jul 19 2008 Gianluca Sforna <giallu gmail com> - 1.1.2-1
+- new upstream release
+- add patch for bugnotes notification
+
+* Sat Jan 19 2008 Gianluca Sforna <giallu gmail com> - 1.1.1-1
+- new upstream release
+- Add more info in README.Fedora about configuration, upgrades
+  and SELinux
+
+* Sat Jan  5 2008 Gianluca Sforna <giallu gmail com> - 1.1.0-1
+- new upstream release
+- rediffed patches
+- allow local usage out of the box
+- remove .htaccess files
+- revert using embedded adodb 
+  see http://www.mantisbt.org/bugs/view.php?id=8256 for details
+- improve description and README.Fedora
+- Remove unneeded diffutils BR
+- Updated License field
+
+* Tue Jul  3 2007 Gianluca Sforna <giallu gmail com> - 1.0.8-1
 - new upstream release
 - add Require: php-adodb (and remove embedded one)
 - remove duplicate docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Jul 2007 09:45:43 -0000	1.12
+++ sources	9 Apr 2009 19:23:39 -0000	1.13
@@ -1 +1 @@
-fab90748346fe9a8276a71f59c1a245a  mantis-1.0.8.tar.gz
+2e0c6d3dd9ca7d16258fc2d86363a675  mantisbt-1.1.6.tar.gz


--- mantis-0.19.2-noexamplecom.patch DELETED ---


--- mantis-1.0.0a3-iis.patch DELETED ---



From dcantrel at fedoraproject.org  Thu Apr  9 19:29:08 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  9 Apr 2009 19:29:08 +0000 (UTC)
Subject: rpms/calendar/devel Makefile.linux,1.1,1.2 calendar.spec,1.3,1.4
Message-ID: <20090409192908.E9FC67001C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25180

Modified Files:
	Makefile.linux calendar.spec 
Log Message:
* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-6
- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)



Index: Makefile.linux
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/devel/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux	20 Feb 2009 19:52:08 -0000	1.1
+++ Makefile.linux	9 Apr 2009 19:28:38 -0000	1.2
@@ -4,7 +4,7 @@
 MANDIR  = /usr/share/man
 
 CC      = gcc
-CFLAGS  += -O2 -Wall -D_GNU_SOURCE -DTM_YEAR_BASE=1900
+CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
@@ -33,7 +33,7 @@
 		cd ../../ ; \
 	done
 	mkdir -p $(DESTDIR)/$(BINDIR) ; \
-	install -s -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
+	install -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
 	mkdir -p $(DESTDIR)/$(MANDIR)/man1 ; \
 	install -m 0644 calendar.1 $(DESTDIR)/$(MANDIR)/man1/calendar.1
 


Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/devel/calendar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- calendar.spec	4 Mar 2009 05:19:18 -0000	1.3
+++ calendar.spec	9 Apr 2009 19:28:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -58,6 +58,9 @@
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-6
+- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
+
 * Tue Mar 03 2009 David Cantrell <dcantrell at redhat.com> - 1.25-5
 - Convert output to locale's character coding
 



From dcantrel at fedoraproject.org  Thu Apr  9 19:38:27 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  9 Apr 2009 19:38:27 +0000 (UTC)
Subject: rpms/calendar/EL-4 calendar-1.25-coding.patch, NONE,
	1.1 Makefile.linux, 1.1, 1.2 calendar.spec, 1.1, 1.2
Message-ID: <20090409193827.EF77B7001C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28276

Modified Files:
	Makefile.linux calendar.spec 
Added Files:
	calendar-1.25-coding.patch 
Log Message:
* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
- Convert output to locale's character coding


calendar-1.25-coding.patch:

--- NEW FILE calendar-1.25-coding.patch ---
diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
--- calendar-1.25.orig/calendar.h	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/calendar.h	2009-03-04 00:08:53.000000000 -0500
@@ -31,6 +31,8 @@
 
 #include <sys/uio.h>
 
+#include <iconv.h>
+
 extern struct passwd *pw;
 extern int doall;
 extern int bodun_always;
@@ -70,6 +72,7 @@
 	int (*getev)(int);
 };
 
+void     convprint(FILE *, iconv_t, char *);
 void	 cal(void);
 void	 closecal(FILE *);
 int	 getday(char *);
diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
--- calendar-1.25.orig/io.c	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/io.c	2009-03-04 00:11:21.000000000 -0500
@@ -61,10 +61,17 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <langinfo.h>
+#include <iconv.h>
+
 #include "pathnames.h"
 #include "calendar.h"
 
 
+#define ICONV_TRANSLIT  "/" "/" "TRANSLIT"
+#define ICONV_FROMCODE  "UTF-8"
+#define ICONV_BUFSIZ    (128)
+
 struct iovec header[] = {
 	{ "From: ", 6 },
 	{ NULL, 0 },
@@ -76,6 +83,39 @@
 	{ "Auto-Submitted: auto-generated\n\n", 32 },
 };
 
+void
+convprint(FILE *fp, iconv_t ic, char *inputbuf)
+{
+    char *iconv_input;
+    char *iconv_output;
+    char outputbuf[ICONV_BUFSIZ];
+    size_t inputsz;
+    size_t outputsz;
+    size_t iconv_result;
+
+    iconv_input = inputbuf;
+    inputsz = strlen(inputbuf);
+
+    while (inputsz > 0)
+    {
+        iconv_output = outputbuf;
+        outputsz = sizeof(outputbuf) - 1;
+
+        iconv_result = iconv(
+                ic,
+                &iconv_input,
+                &inputsz,
+                &iconv_output,
+                &outputsz
+                );
+        if ((((size_t) -1) == iconv_result) && (E2BIG != errno))
+        {
+            return;
+        }
+        outputbuf[sizeof(outputbuf) - outputsz - 1] = '\0';
+        (void)fprintf(fp, "%s", outputbuf);
+    }
+}
 
 void
 cal(void)
@@ -86,6 +126,42 @@
 	struct match *m;
 	FILE *fp;
 
+        char *langinfo_coding;
+        char *iconv_coding;
+        iconv_t ic;
+        int use_iconv;
+
+        use_iconv = 1;
+        iconv_coding = NULL;
+        ic = (iconv_t) -1;
+        (void)setlocale(LC_ALL, "");
+        langinfo_coding = nl_langinfo(CODESET);
+        if ((NULL == langinfo_coding) || ('\0' == *langinfo_coding))
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            iconv_coding = malloc(
+                    strlen(langinfo_coding) + sizeof(ICONV_TRANSLIT)
+                    );
+        }
+
+        if (NULL == iconv_coding)
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            sprintf(iconv_coding, "%s%s", langinfo_coding, ICONV_TRANSLIT);
+            ic = iconv_open(iconv_coding, ICONV_FROMCODE);
+        }
+
+        if (((iconv_t) -1) == ic)
+        {
+            use_iconv = 0;
+        }
+
 	events = NULL;
 	cur_evt = NULL;
 	if ((fp = opencal()) == NULL)
@@ -101,6 +177,14 @@
 		if (buf[0] == '\0')
 			continue;
 		if (strncmp(buf, "LANG=", 5) == 0) {
+                        if (use_iconv)
+                        {
+                            char *coding_start = strchr(buf, '.');
+                            if (NULL != coding_start)
+                            {
+                                strcpy(coding_start, ".UTF-8");
+                            }
+                        }
 			(void) setlocale(LC_ALL, buf + 5);
 			setnnames();
 			if (!strcmp(buf + 5, "ru_RU.KOI8-R") ||
@@ -215,8 +299,17 @@
 	}
 	tmp = events;
 	while (tmp) {
+            if (use_iconv)
+            {
+                convprint(fp, ic, tmp->print_date);
+                convprint(fp, ic, *(tmp->desc));
+                (void)fputc((int) '\n', fp);
+            }
+            else
+            {
 		(void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc));
-		tmp = tmp->next;
+            }
+            tmp = tmp->next;
 	}
 	tmp = events;
 	while (tmp) {
@@ -226,6 +319,17 @@
 		tmp = tmp->next;
 		free(events);
 	}
+
+        if (NULL != iconv_coding)
+        {
+            free(iconv_coding);
+        }
+
+        if (((iconv_t) -1) != ic)
+        {
+            iconv_close(ic);
+        }
+
 	closecal(fp);
 }
 


Index: Makefile.linux
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/EL-4/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux	20 Feb 2009 20:41:46 -0000	1.1
+++ Makefile.linux	9 Apr 2009 19:37:57 -0000	1.2
@@ -4,7 +4,7 @@
 MANDIR  = /usr/share/man
 
 CC      = gcc
-CFLAGS  += -O2 -Wall -D_GNU_SOURCE -DTM_YEAR_BASE=1900
+CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
@@ -33,7 +33,7 @@
 		cd ../../ ; \
 	done
 	mkdir -p $(DESTDIR)/$(BINDIR) ; \
-	install -s -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
+	install -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
 	mkdir -p $(DESTDIR)/$(MANDIR)/man1 ; \
 	install -m 0644 calendar.1 $(DESTDIR)/$(MANDIR)/man1/calendar.1
 


Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/EL-4/calendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calendar.spec	20 Feb 2009 20:41:46 -0000	1.1
+++ calendar.spec	9 Apr 2009 19:37:57 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -16,6 +16,7 @@
 Source2: export-calendar-source.sh
 
 Patch0:  %{name}-1.25-linux.patch
+Patch1:  %{name}-1.25-coding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +30,17 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__cp} %{SOURCE1} Makefile
 
+for c in calendars/*.*/* ; do
+    fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
+    if [ ! -z "$fromcode" ]; then
+        iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv"
+        %{__mv} "$c.conv" "$c"
+    fi
+done
+
 %build
 %{__make} %{?_smp_mflags}
 
@@ -48,6 +58,10 @@
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
+- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
+- Convert output to locale's character coding
+
 * Tue Feb 17 2009 David Cantrell <dcantrell at redhat.com> - 1.25-3
 - Use cvs status to get the revision number of calendar.c
 



From pkgdb at fedoraproject.org  Thu Apr  9 19:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 19:41:38 +0000
Subject: [pkgdb] coccinella was added for spot
Message-ID: <20090409194040.C972110F861@bastion2.fedora.phx.redhat.com>

spot has added Package coccinella with summary Chat client with whiteboard
spot has approved Package coccinella
spot has added a Fedora devel branch for coccinella with an owner of spot
spot has approved coccinella in Fedora devel
spot has approved Package coccinella
spot has set commit to Approved for provenpackager on coccinella (Fedora devel)
spot has set build to Approved for provenpackager on coccinella (Fedora devel)
spot has set checkout to Approved for provenpackager on coccinella (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coccinella



From spot at fedoraproject.org  Thu Apr  9 19:40:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:40:52 +0000 (UTC)
Subject: rpms/coccinella - New directory
Message-ID: <20090409194052.3ABB67001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsr29129/rpms/coccinella

Log Message:
Directory /cvs/pkgs/rpms/coccinella added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 19:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 19:41:39 +0000
Subject: [pkgdb] coccinella (Fedora, 9) updated by spot
Message-ID: <20090409194042.F40AA10F872@bastion2.fedora.phx.redhat.com>

spot added a Fedora 9 branch for coccinella
spot has set commit to Approved for provenpackager on coccinella (Fedora 9)
spot has set build to Approved for provenpackager on coccinella (Fedora 9)
spot has set checkout to Approved for provenpackager on coccinella (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coccinella



From pkgdb at fedoraproject.org  Thu Apr  9 19:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 19:41:39 +0000
Subject: [pkgdb] coccinella (Fedora, 10) updated by spot
Message-ID: <20090409194042.EB78310F870@bastion2.fedora.phx.redhat.com>

spot added a Fedora 10 branch for coccinella
spot has set commit to Approved for provenpackager on coccinella (Fedora 10)
spot has set build to Approved for provenpackager on coccinella (Fedora 10)
spot has set checkout to Approved for provenpackager on coccinella (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coccinella



From spot at fedoraproject.org  Thu Apr  9 19:40:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:40:52 +0000 (UTC)
Subject: rpms/coccinella/devel - New directory
Message-ID: <20090409194052.87A1D7001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsr29129/rpms/coccinella/devel

Log Message:
Directory /cvs/pkgs/rpms/coccinella/devel added to the repository




From spot at fedoraproject.org  Thu Apr  9 19:41:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:41:01 +0000 (UTC)
Subject: rpms/coccinella Makefile,NONE,1.1
Message-ID: <20090409194101.02CD87001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsr29129/rpms/coccinella

Added Files:
	Makefile 
Log Message:
Setup of module coccinella


--- NEW FILE Makefile ---
# Top level Makefile for module coccinella
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Thu Apr  9 19:41:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:41:01 +0000 (UTC)
Subject: rpms/coccinella/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409194101.4CECF7001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsr29129/rpms/coccinella/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module coccinella


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: coccinella
# $Id: Makefile,v 1.1 2009/04/09 19:41:01 spot Exp $
NAME := coccinella
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Thu Apr  9 19:43:00 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:43:00 +0000 (UTC)
Subject: rpms/coccinella/devel Coccinella-0.96.8-system-treectrl.patch, NONE,
	1.1 coccinella.desktop, NONE, 1.1 coccinella.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409194300.61C9F7001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Coccinella-0.96.8-system-treectrl.patch coccinella.desktop 
	coccinella.spec import.log 
Log Message:

initial import


Coccinella-0.96.8-system-treectrl.patch:

--- NEW FILE Coccinella-0.96.8-system-treectrl.patch ---
diff -up Coccinella-0.96.12Src/lib/Init.tcl.BAD Coccinella-0.96.12Src/lib/Init.tcl
--- Coccinella-0.96.12Src/lib/Init.tcl.BAD	2009-04-07 17:23:22.000000000 -0400
+++ Coccinella-0.96.12Src/lib/Init.tcl	2009-04-07 17:23:25.000000000 -0400
@@ -740,7 +740,7 @@ proc ::Init::LoadPackages {} {
     
     # treectrl is required.
     ::Splash::SetMsg [mc "Looking for %s" treectrl]...
-    set ::treectrl_library [file join $this(binLibPath) treectrl]
+    # set ::treectrl_library [file join $this(binLibPath) treectrl]
     if {[catch {package require treectrl 2.2} msg]} {
 	tk_messageBox -icon error -title [::msgcat::mc "Error"] \
 	  -message "This application requires the treectrl widget to work! $::errorInfo"


--- NEW FILE coccinella.desktop ---

[Desktop Entry]
Name=Coccinella
GenericName=Coccinella Chat Client
Comment=Coccinella Chat Client
Exec=/usr/bin/coccinella
Icon=coccinella
Terminal=false
Type=Application
Categories=Network;InstantMessaging;Telephony;


--- NEW FILE coccinella.spec ---
Name:		coccinella
Version:	0.96.12
Release:	2%{?dist}
Summary:	Chat client with whiteboard
Group:		Applications/Internet
License:	GPLv3+ and BSD
URL:		http://thecoccinella.org
Source0:	http://download.sourceforge.net/coccinella/Coccinella-%{version}Src.tar.gz
Source1:	%{name}.desktop
Patch0:		Coccinella-0.96.8-system-treectrl.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	desktop-file-utils
Requires:	iax, iaxclient, tkimg, memchan, tcl-snack, tcl-tileqt
Requires:	tkdnd, tcl-tkpng, tktray, tcltls, tcl-tcludp, tcl-tclvfs, tcl-zlib
Requires:	tcl-tktreectrl, desktop-file-utils
Requires:	tcl(abi) = 8.5
BuildArch:	noarch

%description
Coccinella is a free and open-source cross-platform chat client with a built-in 
whiteboard for improved collaboration with other people. Other key features of 
Coccinella include:
* File transfer
* Plugin system
* Group chat (MUC)
* Avatars and emoticons
* Multi-lingual and internationalized
* Secured connections (TLS and SASL)
* Open standard instant messaging protocol (Jabber/XMPP)

%prep
%setup -q -n Coccinella-%{version}Src
rm -rf bin/
%patch0 -p1 -b .system-treectrl

# clean up exec perms
chmod -x jabberlib/*.tcl contrib/*.tcl plugins/*.tcl READMEs/* msgs/*.msg jabber/* docs/* components/Phone/*.tcl \
	 whiteboard/*.tcl components/Phone/IAX/*.tcl components/*.tcl \
	 README.txt lib/*.tcl items/Games/Chess.can contrib/tiles/*.png \
	 items/Games/chessimages/*.gif themes/Aqua/icons/16x16/*.png \
	 themes/Oxygen/elements/*.gif themes/Oxygen/elements/phone/*.png \
	 themes/Oxygen/elements/*.png themes/Oxygen/icons/*/*.png \
	 themes/Oxygen/sounds/*.wav themes/Oxygen/icons/others/*.ico

# Get rid of place-holder files
rm -rf themes/Crystal/iconsets/service/place-holder themes/Crystal/iconsets/emoticons/place-holder themes/Crystal/sounds/place-holder
rm -rf themes/Crystal/icons/scalable/place-holder themes/Crystal/iconsets/roster/place-holder themes/Crystal/chatstyles/place-holder

# Convert to UTF-8
for i in CHANGES.txt; do
	iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
	mv $i{.utf8,}
done

# Fix end of line encoding
sed -i -e 's|\r||g' docs/Welcome_en.can

%build
# Nothing to do here.

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/
for i in Coccinella.tcl components contrib httpd iconsets items jabber jabberlib lib msgs pkgIndex.tcl plugins resources TclXML themes whiteboard; do
	cp -a $i %{buildroot}%{_datadir}/%{name}/  
done

mkdir -p %{buildroot}%{_datadir}/pixmaps/ 
cp -a %{buildroot}%{_datadir}/%{name}/themes/Oxygen/icons/128x128/%{name}.png %{buildroot}%{_datadir}/pixmaps/

mkdir -p %{buildroot}%{_datadir}/applications/

desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	%{SOURCE1}

mkdir -p %{buildroot}%{_bindir}
cd %{buildroot}%{_bindir}
ln -s ../share/%{name}/Coccinella.tcl %{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYING.txt READMEs/ CHANGES.txt
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.12-2
- lots of cleanups

* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.12-1
- update to 0.96.12

* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-3
- tcl-tile is part of base tcl/tk now, no need for a separate Requires

* Mon Nov  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-2
- bundle local copy of coccinella's hacked tclxml

* Wed Oct 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-1
- update to 0.96.10

* Thu Jul 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.8-1
- initial package for Fedora


--- NEW FILE import.log ---
coccinella-0_96_12-2_fc11:HEAD:coccinella-0.96.12-2.fc11.src.rpm:1239306011


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 19:41:01 -0000	1.1
+++ .cvsignore	9 Apr 2009 19:42:29 -0000	1.2
@@ -0,0 +1 @@
+Coccinella-0.96.12Src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 19:41:01 -0000	1.1
+++ sources	9 Apr 2009 19:42:29 -0000	1.2
@@ -0,0 +1 @@
+b2daed9f721f8d7920b95a8913b697bd  Coccinella-0.96.12Src.tar.gz



From spot at fedoraproject.org  Thu Apr  9 19:45:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:45:35 +0000 (UTC)
Subject: rpms/coccinella/F-10 Coccinella-0.96.8-system-treectrl.patch, NONE, 
	1.1 coccinella.desktop, NONE, 1.1 coccinella.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090409194535.F36B07001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30594/F-10

Modified Files:
	sources 
Added Files:
	Coccinella-0.96.8-system-treectrl.patch coccinella.desktop 
	coccinella.spec 
Log Message:
initial branching

Coccinella-0.96.8-system-treectrl.patch:

--- NEW FILE Coccinella-0.96.8-system-treectrl.patch ---
diff -up Coccinella-0.96.12Src/lib/Init.tcl.BAD Coccinella-0.96.12Src/lib/Init.tcl
--- Coccinella-0.96.12Src/lib/Init.tcl.BAD	2009-04-07 17:23:22.000000000 -0400
+++ Coccinella-0.96.12Src/lib/Init.tcl	2009-04-07 17:23:25.000000000 -0400
@@ -740,7 +740,7 @@ proc ::Init::LoadPackages {} {
     
     # treectrl is required.
     ::Splash::SetMsg [mc "Looking for %s" treectrl]...
-    set ::treectrl_library [file join $this(binLibPath) treectrl]
+    # set ::treectrl_library [file join $this(binLibPath) treectrl]
     if {[catch {package require treectrl 2.2} msg]} {
 	tk_messageBox -icon error -title [::msgcat::mc "Error"] \
 	  -message "This application requires the treectrl widget to work! $::errorInfo"


--- NEW FILE coccinella.desktop ---

[Desktop Entry]
Name=Coccinella
GenericName=Coccinella Chat Client
Comment=Coccinella Chat Client
Exec=/usr/bin/coccinella
Icon=coccinella
Terminal=false
Type=Application
Categories=Network;InstantMessaging;Telephony;


--- NEW FILE coccinella.spec ---
Name:		coccinella
Version:	0.96.12
Release:	2%{?dist}
Summary:	Chat client with whiteboard
Group:		Applications/Internet
License:	GPLv3+ and BSD
URL:		http://thecoccinella.org
Source0:	http://download.sourceforge.net/coccinella/Coccinella-%{version}Src.tar.gz
Source1:	%{name}.desktop
Patch0:		Coccinella-0.96.8-system-treectrl.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	desktop-file-utils
Requires:	iax, iaxclient, tkimg, memchan, tcl-snack, tcl-tileqt
Requires:	tkdnd, tcl-tkpng, tktray, tcltls, tcl-tcludp, tcl-tclvfs, tcl-zlib
Requires:	tcl-tktreectrl, desktop-file-utils
Requires:	tcl(abi) = 8.5
BuildArch:	noarch

%description
Coccinella is a free and open-source cross-platform chat client with a built-in 
whiteboard for improved collaboration with other people. Other key features of 
Coccinella include:
* File transfer
* Plugin system
* Group chat (MUC)
* Avatars and emoticons
* Multi-lingual and internationalized
* Secured connections (TLS and SASL)
* Open standard instant messaging protocol (Jabber/XMPP)

%prep
%setup -q -n Coccinella-%{version}Src
rm -rf bin/
%patch0 -p1 -b .system-treectrl

# clean up exec perms
chmod -x jabberlib/*.tcl contrib/*.tcl plugins/*.tcl READMEs/* msgs/*.msg jabber/* docs/* components/Phone/*.tcl \
	 whiteboard/*.tcl components/Phone/IAX/*.tcl components/*.tcl \
	 README.txt lib/*.tcl items/Games/Chess.can contrib/tiles/*.png \
	 items/Games/chessimages/*.gif themes/Aqua/icons/16x16/*.png \
	 themes/Oxygen/elements/*.gif themes/Oxygen/elements/phone/*.png \
	 themes/Oxygen/elements/*.png themes/Oxygen/icons/*/*.png \
	 themes/Oxygen/sounds/*.wav themes/Oxygen/icons/others/*.ico

# Get rid of place-holder files
rm -rf themes/Crystal/iconsets/service/place-holder themes/Crystal/iconsets/emoticons/place-holder themes/Crystal/sounds/place-holder
rm -rf themes/Crystal/icons/scalable/place-holder themes/Crystal/iconsets/roster/place-holder themes/Crystal/chatstyles/place-holder

# Convert to UTF-8
for i in CHANGES.txt; do
	iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
	mv $i{.utf8,}
done

# Fix end of line encoding
sed -i -e 's|\r||g' docs/Welcome_en.can

%build
# Nothing to do here.

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/
for i in Coccinella.tcl components contrib httpd iconsets items jabber jabberlib lib msgs pkgIndex.tcl plugins resources TclXML themes whiteboard; do
	cp -a $i %{buildroot}%{_datadir}/%{name}/  
done

mkdir -p %{buildroot}%{_datadir}/pixmaps/ 
cp -a %{buildroot}%{_datadir}/%{name}/themes/Oxygen/icons/128x128/%{name}.png %{buildroot}%{_datadir}/pixmaps/

mkdir -p %{buildroot}%{_datadir}/applications/

desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	%{SOURCE1}

mkdir -p %{buildroot}%{_bindir}
cd %{buildroot}%{_bindir}
ln -s ../share/%{name}/Coccinella.tcl %{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYING.txt READMEs/ CHANGES.txt
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.12-2
- lots of cleanups

* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.12-1
- update to 0.96.12

* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-3
- tcl-tile is part of base tcl/tk now, no need for a separate Requires

* Mon Nov  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-2
- bundle local copy of coccinella's hacked tclxml

* Wed Oct 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-1
- update to 0.96.10

* Thu Jul 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.8-1
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 19:41:01 -0000	1.1
+++ sources	9 Apr 2009 19:45:05 -0000	1.2
@@ -0,0 +1 @@
+b2daed9f721f8d7920b95a8913b697bd  Coccinella-0.96.12Src.tar.gz



From spot at fedoraproject.org  Thu Apr  9 19:45:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  9 Apr 2009 19:45:36 +0000 (UTC)
Subject: rpms/coccinella/F-9 Coccinella-0.96.8-system-treectrl.patch, NONE, 
	1.1 coccinella.desktop, NONE, 1.1 coccinella.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090409194536.3E9327001C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/coccinella/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30594/F-9

Modified Files:
	sources 
Added Files:
	Coccinella-0.96.8-system-treectrl.patch coccinella.desktop 
	coccinella.spec 
Log Message:
initial branching

Coccinella-0.96.8-system-treectrl.patch:

--- NEW FILE Coccinella-0.96.8-system-treectrl.patch ---
diff -up Coccinella-0.96.12Src/lib/Init.tcl.BAD Coccinella-0.96.12Src/lib/Init.tcl
--- Coccinella-0.96.12Src/lib/Init.tcl.BAD	2009-04-07 17:23:22.000000000 -0400
+++ Coccinella-0.96.12Src/lib/Init.tcl	2009-04-07 17:23:25.000000000 -0400
@@ -740,7 +740,7 @@ proc ::Init::LoadPackages {} {
     
     # treectrl is required.
     ::Splash::SetMsg [mc "Looking for %s" treectrl]...
-    set ::treectrl_library [file join $this(binLibPath) treectrl]
+    # set ::treectrl_library [file join $this(binLibPath) treectrl]
     if {[catch {package require treectrl 2.2} msg]} {
 	tk_messageBox -icon error -title [::msgcat::mc "Error"] \
 	  -message "This application requires the treectrl widget to work! $::errorInfo"


--- NEW FILE coccinella.desktop ---

[Desktop Entry]
Name=Coccinella
GenericName=Coccinella Chat Client
Comment=Coccinella Chat Client
Exec=/usr/bin/coccinella
Icon=coccinella
Terminal=false
Type=Application
Categories=Network;InstantMessaging;Telephony;


--- NEW FILE coccinella.spec ---
Name:		coccinella
Version:	0.96.12
Release:	2%{?dist}
Summary:	Chat client with whiteboard
Group:		Applications/Internet
License:	GPLv3+ and BSD
URL:		http://thecoccinella.org
Source0:	http://download.sourceforge.net/coccinella/Coccinella-%{version}Src.tar.gz
Source1:	%{name}.desktop
Patch0:		Coccinella-0.96.8-system-treectrl.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	desktop-file-utils
Requires:	iax, iaxclient, tkimg, memchan, tcl-snack, tcl-tileqt
Requires:	tkdnd, tcl-tkpng, tktray, tcltls, tcl-tcludp, tcl-tclvfs, tcl-zlib
Requires:	tcl-tktreectrl, desktop-file-utils
Requires:	tcl(abi) = 8.5
BuildArch:	noarch

%description
Coccinella is a free and open-source cross-platform chat client with a built-in 
whiteboard for improved collaboration with other people. Other key features of 
Coccinella include:
* File transfer
* Plugin system
* Group chat (MUC)
* Avatars and emoticons
* Multi-lingual and internationalized
* Secured connections (TLS and SASL)
* Open standard instant messaging protocol (Jabber/XMPP)

%prep
%setup -q -n Coccinella-%{version}Src
rm -rf bin/
%patch0 -p1 -b .system-treectrl

# clean up exec perms
chmod -x jabberlib/*.tcl contrib/*.tcl plugins/*.tcl READMEs/* msgs/*.msg jabber/* docs/* components/Phone/*.tcl \
	 whiteboard/*.tcl components/Phone/IAX/*.tcl components/*.tcl \
	 README.txt lib/*.tcl items/Games/Chess.can contrib/tiles/*.png \
	 items/Games/chessimages/*.gif themes/Aqua/icons/16x16/*.png \
	 themes/Oxygen/elements/*.gif themes/Oxygen/elements/phone/*.png \
	 themes/Oxygen/elements/*.png themes/Oxygen/icons/*/*.png \
	 themes/Oxygen/sounds/*.wav themes/Oxygen/icons/others/*.ico

# Get rid of place-holder files
rm -rf themes/Crystal/iconsets/service/place-holder themes/Crystal/iconsets/emoticons/place-holder themes/Crystal/sounds/place-holder
rm -rf themes/Crystal/icons/scalable/place-holder themes/Crystal/iconsets/roster/place-holder themes/Crystal/chatstyles/place-holder

# Convert to UTF-8
for i in CHANGES.txt; do
	iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
	mv $i{.utf8,}
done

# Fix end of line encoding
sed -i -e 's|\r||g' docs/Welcome_en.can

%build
# Nothing to do here.

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/
for i in Coccinella.tcl components contrib httpd iconsets items jabber jabberlib lib msgs pkgIndex.tcl plugins resources TclXML themes whiteboard; do
	cp -a $i %{buildroot}%{_datadir}/%{name}/  
done

mkdir -p %{buildroot}%{_datadir}/pixmaps/ 
cp -a %{buildroot}%{_datadir}/%{name}/themes/Oxygen/icons/128x128/%{name}.png %{buildroot}%{_datadir}/pixmaps/

mkdir -p %{buildroot}%{_datadir}/applications/

desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	%{SOURCE1}

mkdir -p %{buildroot}%{_bindir}
cd %{buildroot}%{_bindir}
ln -s ../share/%{name}/Coccinella.tcl %{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYING.txt READMEs/ CHANGES.txt
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.12-2
- lots of cleanups

* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.12-1
- update to 0.96.12

* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-3
- tcl-tile is part of base tcl/tk now, no need for a separate Requires

* Mon Nov  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-2
- bundle local copy of coccinella's hacked tclxml

* Wed Oct 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.10-1
- update to 0.96.10

* Thu Jul 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.96.8-1
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 19:41:01 -0000	1.1
+++ sources	9 Apr 2009 19:45:05 -0000	1.2
@@ -0,0 +1 @@
+b2daed9f721f8d7920b95a8913b697bd  Coccinella-0.96.12Src.tar.gz



From caolanm at fedoraproject.org  Thu Apr  9 19:45:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  9 Apr 2009 19:45:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch, 1.1, 1.2
Message-ID: <20090409194548.D8EE67001C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30841

Modified Files:
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
Log Message:
correct patch

openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch:

Index: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	8 Apr 2009 11:39:06 -0000	1.1
+++ openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	9 Apr 2009 19:45:48 -0000	1.2
@@ -10,7 +10,7 @@
  				*pWMF >> nPoly >> nGesPoints;
  
 -				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
-+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
  				{
  					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
  					{
@@ -19,7 +19,7 @@
  						}
  
 -						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
-+						if ( ( nGesPoints * (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) <= ( nEndPos - pWMF->Tell() ) )
  						{
  							// Polygonpunkte holen:
 -							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
@@ -41,7 +41,7 @@
  				// Anzahl der Polygone:
  				*pWMF >> nPoly >> nGesPoints;
 -				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
-+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
  				{
  					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
  					{



From transif at fedoraproject.org  Thu Apr  9 19:52:26 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu,  9 Apr 2009 19:52:26 +0000 (UTC)
Subject: comps/po sv.po,1.18,1.19
Message-ID: <20090409195226.59F157001C@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32641/po

Modified Files:
	sv.po 
Log Message:
Sending translation for Swedish


Index: sv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sv.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sv.po	9 Jan 2009 11:52:43 -0000	1.18
+++ sv.po	9 Apr 2009 19:51:56 -0000	1.19
@@ -1,16 +1,16 @@
 # Swedish messages for comps.
-# Copyright ?? 2001-2008 Free Software Foundation, Inc.
+# Copyright ?? 2001-2009 Free Software Foundation, Inc.
 # Christian Rose <menthos at menthos.com>, 2002, 2003, 2004, 2005.
 # Magnus Larsson <fedoratrans at gmail.com>, 2007, 2008.
 # Chester Cheng <ccheng at redhat.com>, 2007.
-# G??ran Uddeborg <goeran at uddeborg.se>, 2008.
+# G??ran Uddeborg <goeran at uddeborg.se>, 2008, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-11-18 09:08-0500\n"
+"POT-Creation-Date: 2009-04-09 18:59+0000\n"
+"PO-Revision-Date: 2009-04-09 21:50+0200\n"
 "Last-Translator: G??ran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -24,192 +24,192 @@
 "En l??ttviktig skrivbordsmilj?? som fungerar bra p?? l??ngsammare maskiner."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administrationsverktyg"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "St??d f??r afrikaans"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "St??d f??r albanska"
 
 #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Program"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "Applikationer f??r utf??ra en m??ngd arbetsuppgifter"
 
 #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "St??d f??r arabiska"
 
 #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "St??d f??r armenska"
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "St??d f??r assamesiska"
 
 #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "F??rfattande och publicering"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13
 msgid "Base"
 msgstr "Bas"
 
 #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Bassystem"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
 msgid "Basic support for the Ruby programming language."
 msgstr "Grundl??ggande st??d f??r programmeringsspr??ket Ruby."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
 msgid "Basque Support"
 msgstr "St??d f??r baskiska"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
 msgid "Belarusian Support"
 msgstr "St??d f??r vitryska"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
 msgid "Bengali Support"
 msgstr "St??d f??r bengali"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
 msgid "Bhutanese Support"
 msgstr "St??d f??r bhutanesiska"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
 msgid "Bosnian Support"
 msgstr "St??d f??r bosniska"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
 msgid "Brazilian Portuguese Support"
 msgstr "St??d f??r brasiliansk portugisiska"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22
 msgid "Breton Support"
 msgstr "St??d f??r bretonska"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
 msgid "Bulgarian Support"
 msgstr "St??d f??r bulgariska"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
 msgid "Catalan Support"
 msgstr "St??d f??r katalanska"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
 msgid "Chinese Support"
 msgstr "St??d f??r kinesiska"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26
+#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
 msgid "Clustering"
 msgstr "Klustring"
 
 #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27
+#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
 msgid "Clustering Support"
 msgstr "Klusterst??d."
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27
-#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28
+#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
 msgid "Core"
 msgstr "Grund"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28
-#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29
+#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30
 msgid "Croatian Support"
 msgstr "St??d f??r kroatiska"
 
 #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29
-#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
+#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8
 msgid "Czech Support"
 msgstr "St??d f??r tjeckiska"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30
-#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31
+#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
 msgid "DNS Name Server"
 msgstr "DNS-namnserver"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31
-#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32
+#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33
 msgid "Danish Support"
 msgstr "St??d f??r danska"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Skrivbordsmilj??er"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Skrivbordsmilj??er"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Utveckling"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "Utvecklingsbibliotek"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Utvecklingsverktyg"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "St??d f??r uppringt n??tverk"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "St??d f??r nederl??ndska"
 
@@ -218,78 +218,78 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Textredigerare"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Utbildningsprogramvara"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Utbildningsprogramvara f??r inl??rning"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Teknik och vetenskap"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "St??d f??r britisk engelska"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "St??d f??r estniska"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "St??d f??r etiopiska"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP-server"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "St??d f??r f??r??iska"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedorapaketerare"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "St??d f??r filipinska"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "St??d f??r finska"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "St??d f??r franska"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
@@ -299,19 +299,19 @@
 "inspelning eller att lyssna p?? musikskivor och multimedia-filer."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "Skrivbordsmilj??n GNOME"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME-programvaruutveckling"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -320,86 +320,86 @@
 "panel, ett skrivbord, systemikoner och en grafisk filhanterare."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "St??d f??r h??glandsskotska"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "St??d f??r galiciska"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "Spel och underh??llning"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "St??d f??r georgiska"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "St??d f??r tyska"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "Grafiskt Internet"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "Grafik"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "St??d f??r grekiska"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "St??d f??r gujarati"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "St??d f??r maskinvara"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "St??d f??r hebreiska"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "St??d f??r hindi"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "St??d f??r ungerska"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "St??d f??r isl??ndska"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "St??d f??r indonesiska"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
@@ -409,7 +409,7 @@
 "GTK+ och GNOME."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -418,14 +418,14 @@
 "GTK+ och XFCE."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 "Installera dessa paket f??r att utveckla grafiska program f??r QT och KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
 msgid ""
 "Install these tools to enable the system to print or act as a print server."
 msgstr ""
@@ -433,7 +433,7 @@
 "utskriftsserver."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
 msgid ""
 "Install this group of packages to use the base graphical (X) user interface."
@@ -442,50 +442,50 @@
 "gr??nssnittet (X)."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "St??d f??r inuktitut"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "St??d f??r iriska"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "St??d f??r italienska"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "St??d f??r japanska"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java-utveckling"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "Skrivbordsmilj??n KDE"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE-programvaruutveckling"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -494,121 +494,121 @@
 "ett skrivbord, systemikoner och en grafisk filhanterare."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "St??d f??r kannada"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "St??d f??r kambodjanska"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "St??d f??r koreanska"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "Spr??kst??d"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "St??d f??r laotiska"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "St??d f??r lettiska"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "??ldre n??tverksserver"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "Utveckling av ??ldre programvara"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "St??d f??r ??ldre programvara"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "St??d f??r litauiska"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "E-postserver"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "St??d f??r malajiska"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "St??d f??r malajiska"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "St??d f??r maori"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "St??d f??r marati"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL-databas"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "N??tverksservrar"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "Diskussionsgruppsserver"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "St??d f??r norra sotho"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "St??d f??r norska"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "Kontorsprogramvara"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "St??d f??r oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
@@ -618,73 +618,73 @@
 "applikationer."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "St??d f??r persiska"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "St??d f??r polska"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "St??d f??r portugisiska"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL-databas"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "Utskriftsst??d"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "St??d f??r punjabi"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "St??d f??r rum??nska"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "St??d f??r ryska"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "St??d f??r samoanska"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "St??d f??r serbiska"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "Serverkonfigurationsverktyg"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "Servrar"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
@@ -692,38 +692,38 @@
 "Enklare f??nsterhanterare som inte ??r en del av en st??rre skrivbordsmilj??."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "St??d f??r singalesiska"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "St??d f??r slovakiska"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "St??d f??r slovenska"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "Minsta m??jliga installation"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "Mjukvara som anv??nds f??r k??rande n??tverksservrar"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "St??d f??r somaliska"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -732,78 +732,78 @@
 "filer. Dessa inkluderar Emacs och Vi."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "Ljud och video"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "St??d f??r s??dra ndebele"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "St??d f??r s??dra sotho"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "St??d f??r spanska"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "St??d f??r utveckling av program i programmeringsspr??ket Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr ""
 "St??d f??r k??rande av program som ??r skrivna i programmeringsspr??ket Java."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "St??d f??r siswati"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "St??d f??r svenska"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "Systemverktyg"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "St??d f??r tagalog"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "St??d f??r tamil"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "St??d f??r telugu"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Textbaserat Internet"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "St??d f??r thail??ndska"
 
@@ -812,14 +812,14 @@
 msgstr "Den integrerade utvecklingsmilj??n Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "Programmen inkluderar sviter med kontorsprogramvara, PDF-visare, med mera."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
 msgid ""
 "The packages in this group are core libraries needed to develop applications."
 msgstr ""
@@ -827,19 +827,19 @@
 "av program."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "Dessa paket l??ter dig konfigurera en IMAP- eller SMTP-epostserver."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr "Dessa paket l??ter dig utveckla program f??r f??nstersystemet X."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid ""
 "These packages are helpful when developing web applications or web pages."
@@ -847,7 +847,7 @@
 "Dessa paket ??r till hj??lp n??r du utvecklar webbapplikationer eller webbsidor."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
@@ -855,7 +855,7 @@
 "Kerberos och NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -864,17 +864,17 @@
 "rsh och telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "Dessa paket tillhandah??ller en virtualiseringsmilj??."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "Dessa paket ger kompatibilitet med tidigare utg??vor."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -883,7 +883,7 @@
 "inmatningsmetoder."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -892,19 +892,19 @@
 "konvertera dem till HTML, PDF, Postscript och text."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Dessa verktyg l??ter dig k??ra en webbserver p?? systemet."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Dessa verktyg l??ter dig k??ra en FTP-server p?? systemet."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
@@ -914,21 +914,21 @@
 "automake, gcc, perl, python och fels??kningsverktyg."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
 "Denna grupp l??ter dig konfigurera systemet som en diskussionsgruppsserver."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "Denna grupp inneh??ller alla Red Hats specialanpassade verktyg f??r "
 "konfiguration av server."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -937,14 +937,14 @@
 "exempel, f??r skapande av sm?? router-/brandv??ggsmaskiner."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
 "Denna grupp inkluderar grafiska klienter f??r e-post, webbsurfande och chat."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -954,14 +954,14 @@
 "ber??kningar och diagramritning s??v??l som enhetskonvertering."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 "Denna grupp inkluderar paket som hj??lper dig manipulera och l??sa in bilder."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -971,7 +971,7 @@
 "chatt. Dessa program kr??ver inte f??nstersystemet X."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
@@ -981,7 +981,7 @@
 "exempelvis hantering av anv??ndarkonton och konfiguration av systemh??rdvara."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
@@ -989,7 +989,7 @@
 "Denna grupp ??r en samling av verktyg och resurser f??r armenska milj??er."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
@@ -997,7 +997,7 @@
 "Denna grupp ??r en samling verktyg f??r olika maskinvaru-specifika tillbeh??r."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
@@ -1008,13 +1008,13 @@
 "n??tverkstrafik."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "Denna paketgrupp l??ter dig k??ra en DNS-namnserver (BIND) p?? systemet."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1023,316 +1023,347 @@
 "(tm)."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr ""
 "Denna paketgrupp inneh??ller paket som ??r anv??ndbara vid anv??ndning av MySQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "Denna paketgrupp inkluderar paket som ??r anv??ndbara vid anv??ndning med "
 "Postgresql."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "St??d f??r tibetanska"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "St??d f??r tonga"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Verktyg och tillbeh??r som Fedorapaketeraren beh??ver"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "St??d f??r tsonga"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "St??d f??r tswana"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "St??d f??r turkiska"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "St??d f??r ukrainska"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "St??d f??r urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Olika nyckeldelar av systemet"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "Diverse s??tt att koppla av och f??rdriva ledig tid."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "St??d f??r venda"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "St??d f??r vietnamesiska"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "Virtualisering"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "Webbutveckling"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Webbserver"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "St??d f??r kymriska"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "F??nsterhanterare"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows-filserver"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X-programvaruutveckling"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "F??nstersystemet X"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "XFCE-programvaruutveckling"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "St??d f??r xhosa"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "St??d f??r zulu"
 
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
+#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22
+#: ../comps-f11.xml.in.h:23
 msgid "Buildsystem building group"
 msgstr "Byggsystem byggrupp"
 
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.xml.in.h:50
+#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
-#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "Typsnittspaket f??r att rendera text p?? skrivbordet."
 
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
+#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Integrerad utvecklingsmilj?? baserad p?? Eclipse."
 
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
+#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "??ldre typsnitt"
 
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
+#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "St??d f??r l??gtyska"
 
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
+#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "St??d f??r mongoliska"
 
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
+#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "St??d f??r nepali"
 
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
+#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "Paket med ??ldre bildpunkts- och vektortypsnitt"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "St??d f??r esperanto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "St??d f??r kasjubiska"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
-msgstr "St??d f??r turkiska"
+msgstr "St??d f??r kurdiska"
 
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "St??d f??r makedonska"
 
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
+#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "St??d f??r nordsamiska"
 
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
+#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
 msgid "SUGAR Desktop Environment"
 msgstr "Skrivbordsmilj??n SUGAR"
 
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
+#: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "SUGAR ??r skrivbordsmilj??n som ??r utvecklad f??r OLPC XO."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "St??d f??r vallonska"
 
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
+#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2
+msgid "A software playground for learning about learning."
+msgstr "En programlekstuga f??r att l??ra om l??rande."
+
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskellutveckling"
 
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "Inmatningsmetoder"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "Paket med inmatningsmetoder f??r inmatning av internationell text."
 
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "St??d f??r kashmiri"
 
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "St??d f??r konkani"
 
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
 msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "St??d f??r maithili"
 
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "St??d f??r burmesiska"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "St??d f??r sindhi"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "St??d f??r utveckling av program i programmeringsspr??ket Haskell."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "St??d f??r tajik"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "St??d f??r uzbekiska"
 
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
+#: ../comps-f11.xml.in.h:6
 msgid "Amazigh Support"
-msgstr "St??d f??r arabiska"
+msgstr "St??d f??r amazigh"
 
-#: ../comps-f11.xml.in.h:54
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "Design- och simuleringsverktyg f??r h??rdvaruingenj??rer"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "Elektroniklabb"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
 msgstr "Typsnittsdesign och paketering"
 
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
-msgstr "St??d f??r persiska"
+msgstr "St??d f??r frisiska"
 
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
-msgstr "St??d f??r filipinska"
+msgstr "St??d f??r friuliska"
 
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
-msgstr "St??d f??r kannada"
+msgstr "St??d f??r kinyarwanda"
 
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
-msgstr "St??d f??r malajiska"
+msgstr "St??d f??r malagassiska"
+
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "Korskompilatorn MinGW"
 
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
-msgstr "St??d f??r tibetanska"
+msgstr "St??d f??r occitanska"
+
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "Direkthj??lp och -dokumentation"
 
-#: ../comps-f11.xml.in.h:201
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Skrivbordsmilj??n Sugar"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr "St??d f??r korskompilering av program till 32-bitars Windowsm??l, testning av dem och byggande av installerare, allt inifr??n Fedora."
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr "St??d f??r utveckling av program i programmeringsspr??ket Objective CAML och dess bibliotek."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1340,15 +1371,13 @@
 "Denna grupp ??r en samling av verktyg och resurser f??r designa, ??ndra, "
 "redigera och paketera typsnitt."
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
-msgstr "St??d f??r turkiska"
+msgstr "St??d f??r turkmeniska"
 
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
-msgstr "St??d f??r serbiska"
+msgstr "St??d f??r h??gsorbiska"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From dcantrel at fedoraproject.org  Thu Apr  9 20:09:13 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  9 Apr 2009 20:09:13 +0000 (UTC)
Subject: rpms/calendar/EL-5 calendar-1.25-coding.patch, NONE,
	1.1 Makefile.linux, 1.1, 1.2 calendar.spec, 1.1, 1.2
Message-ID: <20090409200913.23C9D7001C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5158

Modified Files:
	Makefile.linux calendar.spec 
Added Files:
	calendar-1.25-coding.patch 
Log Message:
* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
- Convert output to locale's character coding


calendar-1.25-coding.patch:

--- NEW FILE calendar-1.25-coding.patch ---
diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
--- calendar-1.25.orig/calendar.h	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/calendar.h	2009-03-04 00:08:53.000000000 -0500
@@ -31,6 +31,8 @@
 
 #include <sys/uio.h>
 
+#include <iconv.h>
+
 extern struct passwd *pw;
 extern int doall;
 extern int bodun_always;
@@ -70,6 +72,7 @@
 	int (*getev)(int);
 };
 
+void     convprint(FILE *, iconv_t, char *);
 void	 cal(void);
 void	 closecal(FILE *);
 int	 getday(char *);
diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
--- calendar-1.25.orig/io.c	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/io.c	2009-03-04 00:11:21.000000000 -0500
@@ -61,10 +61,17 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <langinfo.h>
+#include <iconv.h>
+
 #include "pathnames.h"
 #include "calendar.h"
 
 
+#define ICONV_TRANSLIT  "/" "/" "TRANSLIT"
+#define ICONV_FROMCODE  "UTF-8"
+#define ICONV_BUFSIZ    (128)
+
 struct iovec header[] = {
 	{ "From: ", 6 },
 	{ NULL, 0 },
@@ -76,6 +83,39 @@
 	{ "Auto-Submitted: auto-generated\n\n", 32 },
 };
 
+void
+convprint(FILE *fp, iconv_t ic, char *inputbuf)
+{
+    char *iconv_input;
+    char *iconv_output;
+    char outputbuf[ICONV_BUFSIZ];
+    size_t inputsz;
+    size_t outputsz;
+    size_t iconv_result;
+
+    iconv_input = inputbuf;
+    inputsz = strlen(inputbuf);
+
+    while (inputsz > 0)
+    {
+        iconv_output = outputbuf;
+        outputsz = sizeof(outputbuf) - 1;
+
+        iconv_result = iconv(
+                ic,
+                &iconv_input,
+                &inputsz,
+                &iconv_output,
+                &outputsz
+                );
+        if ((((size_t) -1) == iconv_result) && (E2BIG != errno))
+        {
+            return;
+        }
+        outputbuf[sizeof(outputbuf) - outputsz - 1] = '\0';
+        (void)fprintf(fp, "%s", outputbuf);
+    }
+}
 
 void
 cal(void)
@@ -86,6 +126,42 @@
 	struct match *m;
 	FILE *fp;
 
+        char *langinfo_coding;
+        char *iconv_coding;
+        iconv_t ic;
+        int use_iconv;
+
+        use_iconv = 1;
+        iconv_coding = NULL;
+        ic = (iconv_t) -1;
+        (void)setlocale(LC_ALL, "");
+        langinfo_coding = nl_langinfo(CODESET);
+        if ((NULL == langinfo_coding) || ('\0' == *langinfo_coding))
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            iconv_coding = malloc(
+                    strlen(langinfo_coding) + sizeof(ICONV_TRANSLIT)
+                    );
+        }
+
+        if (NULL == iconv_coding)
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            sprintf(iconv_coding, "%s%s", langinfo_coding, ICONV_TRANSLIT);
+            ic = iconv_open(iconv_coding, ICONV_FROMCODE);
+        }
+
+        if (((iconv_t) -1) == ic)
+        {
+            use_iconv = 0;
+        }
+
 	events = NULL;
 	cur_evt = NULL;
 	if ((fp = opencal()) == NULL)
@@ -101,6 +177,14 @@
 		if (buf[0] == '\0')
 			continue;
 		if (strncmp(buf, "LANG=", 5) == 0) {
+                        if (use_iconv)
+                        {
+                            char *coding_start = strchr(buf, '.');
+                            if (NULL != coding_start)
+                            {
+                                strcpy(coding_start, ".UTF-8");
+                            }
+                        }
 			(void) setlocale(LC_ALL, buf + 5);
 			setnnames();
 			if (!strcmp(buf + 5, "ru_RU.KOI8-R") ||
@@ -215,8 +299,17 @@
 	}
 	tmp = events;
 	while (tmp) {
+            if (use_iconv)
+            {
+                convprint(fp, ic, tmp->print_date);
+                convprint(fp, ic, *(tmp->desc));
+                (void)fputc((int) '\n', fp);
+            }
+            else
+            {
 		(void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc));
-		tmp = tmp->next;
+            }
+            tmp = tmp->next;
 	}
 	tmp = events;
 	while (tmp) {
@@ -226,6 +319,17 @@
 		tmp = tmp->next;
 		free(events);
 	}
+
+        if (NULL != iconv_coding)
+        {
+            free(iconv_coding);
+        }
+
+        if (((iconv_t) -1) != ic)
+        {
+            iconv_close(ic);
+        }
+
 	closecal(fp);
 }
 


Index: Makefile.linux
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/EL-5/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux	20 Feb 2009 21:00:51 -0000	1.1
+++ Makefile.linux	9 Apr 2009 20:08:42 -0000	1.2
@@ -4,7 +4,7 @@
 MANDIR  = /usr/share/man
 
 CC      = gcc
-CFLAGS  += -O2 -Wall -D_GNU_SOURCE -DTM_YEAR_BASE=1900
+CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
@@ -33,7 +33,7 @@
 		cd ../../ ; \
 	done
 	mkdir -p $(DESTDIR)/$(BINDIR) ; \
-	install -s -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
+	install -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
 	mkdir -p $(DESTDIR)/$(MANDIR)/man1 ; \
 	install -m 0644 calendar.1 $(DESTDIR)/$(MANDIR)/man1/calendar.1
 


Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/EL-5/calendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calendar.spec	20 Feb 2009 21:00:51 -0000	1.1
+++ calendar.spec	9 Apr 2009 20:08:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -16,6 +16,7 @@
 Source2: export-calendar-source.sh
 
 Patch0:  %{name}-1.25-linux.patch
+Patch1:  %{name}-1.25-coding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +30,17 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__cp} %{SOURCE1} Makefile
 
+for c in calendars/*.*/* ; do
+    fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
+    if [ ! -z "$fromcode" ]; then
+        iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv"
+        %{__mv} "$c.conv" "$c"
+    fi
+done
+
 %build
 %{__make} %{?_smp_mflags}
 
@@ -48,6 +58,10 @@
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
+- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
+- Convert output to locale's character coding
+
 * Tue Feb 17 2009 David Cantrell <dcantrell at redhat.com> - 1.25-3
 - Use cvs status to get the revision number of calendar.c
 



From dcantrel at fedoraproject.org  Thu Apr  9 20:30:55 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  9 Apr 2009 20:30:55 +0000 (UTC)
Subject: rpms/calendar/F-10 calendar-1.25-coding.patch, NONE,
	1.1 Makefile.linux, 1.1, 1.2 calendar.spec, 1.1, 1.2
Message-ID: <20090409203055.B92E37001C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11294

Modified Files:
	Makefile.linux calendar.spec 
Added Files:
	calendar-1.25-coding.patch 
Log Message:
* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
- Convert output to locale's character coding


calendar-1.25-coding.patch:

--- NEW FILE calendar-1.25-coding.patch ---
diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
--- calendar-1.25.orig/calendar.h	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/calendar.h	2009-03-04 00:08:53.000000000 -0500
@@ -31,6 +31,8 @@
 
 #include <sys/uio.h>
 
+#include <iconv.h>
+
 extern struct passwd *pw;
 extern int doall;
 extern int bodun_always;
@@ -70,6 +72,7 @@
 	int (*getev)(int);
 };
 
+void     convprint(FILE *, iconv_t, char *);
 void	 cal(void);
 void	 closecal(FILE *);
 int	 getday(char *);
diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
--- calendar-1.25.orig/io.c	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/io.c	2009-03-04 00:11:21.000000000 -0500
@@ -61,10 +61,17 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <langinfo.h>
+#include <iconv.h>
+
 #include "pathnames.h"
 #include "calendar.h"
 
 
+#define ICONV_TRANSLIT  "/" "/" "TRANSLIT"
+#define ICONV_FROMCODE  "UTF-8"
+#define ICONV_BUFSIZ    (128)
+
 struct iovec header[] = {
 	{ "From: ", 6 },
 	{ NULL, 0 },
@@ -76,6 +83,39 @@
 	{ "Auto-Submitted: auto-generated\n\n", 32 },
 };
 
+void
+convprint(FILE *fp, iconv_t ic, char *inputbuf)
+{
+    char *iconv_input;
+    char *iconv_output;
+    char outputbuf[ICONV_BUFSIZ];
+    size_t inputsz;
+    size_t outputsz;
+    size_t iconv_result;
+
+    iconv_input = inputbuf;
+    inputsz = strlen(inputbuf);
+
+    while (inputsz > 0)
+    {
+        iconv_output = outputbuf;
+        outputsz = sizeof(outputbuf) - 1;
+
+        iconv_result = iconv(
+                ic,
+                &iconv_input,
+                &inputsz,
+                &iconv_output,
+                &outputsz
+                );
+        if ((((size_t) -1) == iconv_result) && (E2BIG != errno))
+        {
+            return;
+        }
+        outputbuf[sizeof(outputbuf) - outputsz - 1] = '\0';
+        (void)fprintf(fp, "%s", outputbuf);
+    }
+}
 
 void
 cal(void)
@@ -86,6 +126,42 @@
 	struct match *m;
 	FILE *fp;
 
+        char *langinfo_coding;
+        char *iconv_coding;
+        iconv_t ic;
+        int use_iconv;
+
+        use_iconv = 1;
+        iconv_coding = NULL;
+        ic = (iconv_t) -1;
+        (void)setlocale(LC_ALL, "");
+        langinfo_coding = nl_langinfo(CODESET);
+        if ((NULL == langinfo_coding) || ('\0' == *langinfo_coding))
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            iconv_coding = malloc(
+                    strlen(langinfo_coding) + sizeof(ICONV_TRANSLIT)
+                    );
+        }
+
+        if (NULL == iconv_coding)
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            sprintf(iconv_coding, "%s%s", langinfo_coding, ICONV_TRANSLIT);
+            ic = iconv_open(iconv_coding, ICONV_FROMCODE);
+        }
+
+        if (((iconv_t) -1) == ic)
+        {
+            use_iconv = 0;
+        }
+
 	events = NULL;
 	cur_evt = NULL;
 	if ((fp = opencal()) == NULL)
@@ -101,6 +177,14 @@
 		if (buf[0] == '\0')
 			continue;
 		if (strncmp(buf, "LANG=", 5) == 0) {
+                        if (use_iconv)
+                        {
+                            char *coding_start = strchr(buf, '.');
+                            if (NULL != coding_start)
+                            {
+                                strcpy(coding_start, ".UTF-8");
+                            }
+                        }
 			(void) setlocale(LC_ALL, buf + 5);
 			setnnames();
 			if (!strcmp(buf + 5, "ru_RU.KOI8-R") ||
@@ -215,8 +299,17 @@
 	}
 	tmp = events;
 	while (tmp) {
+            if (use_iconv)
+            {
+                convprint(fp, ic, tmp->print_date);
+                convprint(fp, ic, *(tmp->desc));
+                (void)fputc((int) '\n', fp);
+            }
+            else
+            {
 		(void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc));
-		tmp = tmp->next;
+            }
+            tmp = tmp->next;
 	}
 	tmp = events;
 	while (tmp) {
@@ -226,6 +319,17 @@
 		tmp = tmp->next;
 		free(events);
 	}
+
+        if (NULL != iconv_coding)
+        {
+            free(iconv_coding);
+        }
+
+        if (((iconv_t) -1) != ic)
+        {
+            iconv_close(ic);
+        }
+
 	closecal(fp);
 }
 


Index: Makefile.linux
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/F-10/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux	20 Feb 2009 20:13:36 -0000	1.1
+++ Makefile.linux	9 Apr 2009 20:30:25 -0000	1.2
@@ -4,7 +4,7 @@
 MANDIR  = /usr/share/man
 
 CC      = gcc
-CFLAGS  += -O2 -Wall -D_GNU_SOURCE -DTM_YEAR_BASE=1900
+CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
@@ -33,7 +33,7 @@
 		cd ../../ ; \
 	done
 	mkdir -p $(DESTDIR)/$(BINDIR) ; \
-	install -s -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
+	install -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
 	mkdir -p $(DESTDIR)/$(MANDIR)/man1 ; \
 	install -m 0644 calendar.1 $(DESTDIR)/$(MANDIR)/man1/calendar.1
 


Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/F-10/calendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calendar.spec	20 Feb 2009 20:13:36 -0000	1.1
+++ calendar.spec	9 Apr 2009 20:30:25 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -16,6 +16,7 @@
 Source2: export-calendar-source.sh
 
 Patch0:  %{name}-1.25-linux.patch
+Patch1:  %{name}-1.25-coding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +30,17 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__cp} %{SOURCE1} Makefile
 
+for c in calendars/*.*/* ; do
+    fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
+    if [ ! -z "$fromcode" ]; then
+        iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv"
+        %{__mv} "$c.conv" "$c"
+    fi
+done
+
 %build
 %{__make} %{?_smp_mflags}
 
@@ -48,6 +58,10 @@
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
+- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
+- Convert output to locale's character coding
+
 * Tue Feb 17 2009 David Cantrell <dcantrell at redhat.com> - 1.25-3
 - Use cvs status to get the revision number of calendar.c
 



From pjones at fedoraproject.org  Thu Apr  9 20:32:20 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu,  9 Apr 2009 20:32:20 +0000 (UTC)
Subject: rpms/grub/devel grub.spec,1.92,1.93 grub-0.97-efipxe.patch,1.6,1.7
Message-ID: <20090409203220.49D017001C@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11632

Modified Files:
	grub.spec grub-0.97-efipxe.patch 
Log Message:
* Thu Apr 09 2009 Peter Jones <pjones at redhat.com>
- remove test message Re: using network drive or not.



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- grub.spec	7 Apr 2009 20:50:13 -0000	1.92
+++ grub.spec	9 Apr 2009 20:31:49 -0000	1.93
@@ -126,6 +126,9 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Apr 09 2009 Peter Jones <pjones at redhat.com>
+- remove test message Re: using network drive or not.
+
 * Tue Apr 07 2009 Peter Jones <pjones at redhat.com> - 0.97-47
 - Add more filenames to the tftp config file search list
 - Tweak FAT filename comparison...

grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grub-0.97-efipxe.patch	7 Apr 2009 21:27:12 -0000	1.6
+++ grub-0.97-efipxe.patch	9 Apr 2009 20:31:49 -0000	1.7
@@ -346,7 +346,7 @@
 index 0000000..5bb5de6
 --- /dev/null
 +++ b/efi/efitftp.c
-@@ -0,0 +1,179 @@
+@@ -0,0 +1,177 @@
 +#include <grub/efi/efi.h>
 +#include <grub/efi/api.h>
 +#include <grub/efi/misc.h>
@@ -443,8 +443,6 @@
 +efi_tftp_mount (void)
 +{
 +	if (current_drive != NETWORK_DRIVE) {
-+		grub_printf("current drive is not network drive.\n");
-+
 +		return 0;
 +	}
 +	return 1;



From dcantrel at fedoraproject.org  Thu Apr  9 20:39:53 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  9 Apr 2009 20:39:53 +0000 (UTC)
Subject: rpms/calendar/F-9 calendar-1.25-coding.patch, NONE,
	1.1 Makefile.linux, 1.1, 1.2 calendar.spec, 1.1, 1.2
Message-ID: <20090409203953.A0E697001C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13772

Modified Files:
	Makefile.linux calendar.spec 
Added Files:
	calendar-1.25-coding.patch 
Log Message:
* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
- Convert output to locale's character coding


calendar-1.25-coding.patch:

--- NEW FILE calendar-1.25-coding.patch ---
diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
--- calendar-1.25.orig/calendar.h	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/calendar.h	2009-03-04 00:08:53.000000000 -0500
@@ -31,6 +31,8 @@
 
 #include <sys/uio.h>
 
+#include <iconv.h>
+
 extern struct passwd *pw;
 extern int doall;
 extern int bodun_always;
@@ -70,6 +72,7 @@
 	int (*getev)(int);
 };
 
+void     convprint(FILE *, iconv_t, char *);
 void	 cal(void);
 void	 closecal(FILE *);
 int	 getday(char *);
diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
--- calendar-1.25.orig/io.c	2009-03-03 22:37:55.000000000 -0500
+++ calendar-1.25/io.c	2009-03-04 00:11:21.000000000 -0500
@@ -61,10 +61,17 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <langinfo.h>
+#include <iconv.h>
+
 #include "pathnames.h"
 #include "calendar.h"
 
 
+#define ICONV_TRANSLIT  "/" "/" "TRANSLIT"
+#define ICONV_FROMCODE  "UTF-8"
+#define ICONV_BUFSIZ    (128)
+
 struct iovec header[] = {
 	{ "From: ", 6 },
 	{ NULL, 0 },
@@ -76,6 +83,39 @@
 	{ "Auto-Submitted: auto-generated\n\n", 32 },
 };
 
+void
+convprint(FILE *fp, iconv_t ic, char *inputbuf)
+{
+    char *iconv_input;
+    char *iconv_output;
+    char outputbuf[ICONV_BUFSIZ];
+    size_t inputsz;
+    size_t outputsz;
+    size_t iconv_result;
+
+    iconv_input = inputbuf;
+    inputsz = strlen(inputbuf);
+
+    while (inputsz > 0)
+    {
+        iconv_output = outputbuf;
+        outputsz = sizeof(outputbuf) - 1;
+
+        iconv_result = iconv(
+                ic,
+                &iconv_input,
+                &inputsz,
+                &iconv_output,
+                &outputsz
+                );
+        if ((((size_t) -1) == iconv_result) && (E2BIG != errno))
+        {
+            return;
+        }
+        outputbuf[sizeof(outputbuf) - outputsz - 1] = '\0';
+        (void)fprintf(fp, "%s", outputbuf);
+    }
+}
 
 void
 cal(void)
@@ -86,6 +126,42 @@
 	struct match *m;
 	FILE *fp;
 
+        char *langinfo_coding;
+        char *iconv_coding;
+        iconv_t ic;
+        int use_iconv;
+
+        use_iconv = 1;
+        iconv_coding = NULL;
+        ic = (iconv_t) -1;
+        (void)setlocale(LC_ALL, "");
+        langinfo_coding = nl_langinfo(CODESET);
+        if ((NULL == langinfo_coding) || ('\0' == *langinfo_coding))
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            iconv_coding = malloc(
+                    strlen(langinfo_coding) + sizeof(ICONV_TRANSLIT)
+                    );
+        }
+
+        if (NULL == iconv_coding)
+        {
+            use_iconv = 0;
+        }
+        else
+        {
+            sprintf(iconv_coding, "%s%s", langinfo_coding, ICONV_TRANSLIT);
+            ic = iconv_open(iconv_coding, ICONV_FROMCODE);
+        }
+
+        if (((iconv_t) -1) == ic)
+        {
+            use_iconv = 0;
+        }
+
 	events = NULL;
 	cur_evt = NULL;
 	if ((fp = opencal()) == NULL)
@@ -101,6 +177,14 @@
 		if (buf[0] == '\0')
 			continue;
 		if (strncmp(buf, "LANG=", 5) == 0) {
+                        if (use_iconv)
+                        {
+                            char *coding_start = strchr(buf, '.');
+                            if (NULL != coding_start)
+                            {
+                                strcpy(coding_start, ".UTF-8");
+                            }
+                        }
 			(void) setlocale(LC_ALL, buf + 5);
 			setnnames();
 			if (!strcmp(buf + 5, "ru_RU.KOI8-R") ||
@@ -215,8 +299,17 @@
 	}
 	tmp = events;
 	while (tmp) {
+            if (use_iconv)
+            {
+                convprint(fp, ic, tmp->print_date);
+                convprint(fp, ic, *(tmp->desc));
+                (void)fputc((int) '\n', fp);
+            }
+            else
+            {
 		(void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc));
-		tmp = tmp->next;
+            }
+            tmp = tmp->next;
 	}
 	tmp = events;
 	while (tmp) {
@@ -226,6 +319,17 @@
 		tmp = tmp->next;
 		free(events);
 	}
+
+        if (NULL != iconv_coding)
+        {
+            free(iconv_coding);
+        }
+
+        if (((iconv_t) -1) != ic)
+        {
+            iconv_close(ic);
+        }
+
 	closecal(fp);
 }
 


Index: Makefile.linux
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/F-9/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.linux	20 Feb 2009 20:22:34 -0000	1.1
+++ Makefile.linux	9 Apr 2009 20:39:23 -0000	1.2
@@ -4,7 +4,7 @@
 MANDIR  = /usr/share/man
 
 CC      = gcc
-CFLAGS  += -O2 -Wall -D_GNU_SOURCE -DTM_YEAR_BASE=1900
+CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
@@ -33,7 +33,7 @@
 		cd ../../ ; \
 	done
 	mkdir -p $(DESTDIR)/$(BINDIR) ; \
-	install -s -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
+	install -m 0755 calendar $(DESTDIR)/$(BINDIR)/calendar ; \
 	mkdir -p $(DESTDIR)/$(MANDIR)/man1 ; \
 	install -m 0644 calendar.1 $(DESTDIR)/$(MANDIR)/man1/calendar.1
 


Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/F-9/calendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calendar.spec	20 Feb 2009 20:22:34 -0000	1.1
+++ calendar.spec	9 Apr 2009 20:39:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -16,6 +16,7 @@
 Source2: export-calendar-source.sh
 
 Patch0:  %{name}-1.25-linux.patch
+Patch1:  %{name}-1.25-coding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +30,17 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__cp} %{SOURCE1} Makefile
 
+for c in calendars/*.*/* ; do
+    fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
+    if [ ! -z "$fromcode" ]; then
+        iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv"
+        %{__mv} "$c.conv" "$c"
+    fi
+done
+
 %build
 %{__make} %{?_smp_mflags}
 
@@ -48,6 +58,10 @@
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 09 2009 David Cantrell <dcantrell at redhat.com> - 1.25-4
+- Honor RPM_OPT_FLAGS and fix debuginfo (#494717)
+- Convert output to locale's character coding
+
 * Tue Feb 17 2009 David Cantrell <dcantrell at redhat.com> - 1.25-3
 - Use cvs status to get the revision number of calendar.c
 



From cebbert at fedoraproject.org  Thu Apr  9 20:44:00 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  9 Apr 2009 20:44:00 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-ext4-really-print-warning-once.patch,
	NONE, 1.1 kernel.spec, 1.1317, 1.1318
Message-ID: <20090409204400.AD5887001C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14961

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ext4-really-print-warning-once.patch 
Log Message:
Only print ext4 allocator fallback warning once.

linux-2.6-ext4-really-print-warning-once.patch:

--- NEW FILE linux-2.6-ext4-really-print-warning-once.patch ---
ext4: really print the find_group_flex fallback warning only once

Missing braces caused the warning to print more than once.

Signed-Off-By: Chuck Ebbert <cebbert at redhat.com>

--- linux-2.6.27.noarch.orig/fs/ext4/ialloc.c
+++ linux-2.6.27.noarch/fs/ext4/ialloc.c
@@ -705,11 +705,12 @@ struct inode *ext4_new_inode(handle_t *h
 		ret2 = find_group_flex(sb, dir, &group);
 		if (ret2 == -1) {
 			ret2 = find_group_other(sb, dir, &group);
-			if (ret2 == 0 && once)
+			if (ret2 == 0 && once) {
 				once = 0;
 				printk(KERN_NOTICE "ext4: find_group_flex "
 				       "failed, fallback succeeded dir %lu\n",
 				       dir->i_ino);
+			}
 		}
 		goto got_group;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1317
retrieving revision 1.1318
diff -u -r1.1317 -r1.1318
--- kernel.spec	7 Apr 2009 17:24:19 -0000	1.1317
+++ kernel.spec	9 Apr 2009 20:43:30 -0000	1.1318
@@ -667,6 +667,7 @@
 Patch2900: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 
 Patch2911: linux-2.6-ext4-flush-on-close.patch
+Patch2912: linux-2.6-ext4-really-print-warning-once.patch
 
 # relatime patches from 2.6.30
 Patch2920: fs-relatime-add-strictatime-option.patch
@@ -1126,6 +1127,8 @@
 # ext4
 # data integrity band-aid for badly written apps
 ApplyPatch linux-2.6-ext4-flush-on-close.patch
+# missing braces cause warning to print more than once
+ApplyPatch linux-2.6-ext4-really-print-warning-once.patch
 
 # xfs
 
@@ -1828,6 +1831,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-18
+- Only print ext4 allocator fallback warning once.
+
 * Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
 - linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
 



From thias at fedoraproject.org  Thu Apr  9 20:56:33 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  9 Apr 2009 20:56:33 +0000 (UTC)
Subject: rpms/thttpd/EL-5 thttpd-2.25b-CVE-2005-3124.patch, 1.1,
	1.2 thttpd.spec, 1.12, 1.13
Message-ID: <20090409205633.A8E607001C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/thttpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17401

Modified Files:
	thttpd-2.25b-CVE-2005-3124.patch thttpd.spec 
Log Message:
Fix thttpd-2.25b-CVE-2005-3124.patch (#483733).


thttpd-2.25b-CVE-2005-3124.patch:

Index: thttpd-2.25b-CVE-2005-3124.patch
===================================================================
RCS file: /cvs/extras/rpms/thttpd/EL-5/thttpd-2.25b-CVE-2005-3124.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thttpd-2.25b-CVE-2005-3124.patch	7 Nov 2005 11:41:31 -0000	1.1
+++ thttpd-2.25b-CVE-2005-3124.patch	9 Apr 2009 20:56:33 -0000	1.2
@@ -7,7 +7,7 @@
  
 -tmp1=/tmp/stc1.$$
 -rm -f $tmp1
-+tmp1=``mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++tmp1=`mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
 +trap " [ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15
  
  # Gather up all the thttpd entries.


Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/EL-5/thttpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- thttpd.spec	28 Aug 2006 16:40:12 -0000	1.12
+++ thttpd.spec	9 Apr 2009 20:56:33 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: 12%{?dist}
+Release: 12%{?dist}.1
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 2.25b-12.1
+- Fix thttpd-2.25b-CVE-2005-3124.patch (#483733).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 2.25b-12
 - FC6 rebuild.
 



From pkgdb at fedoraproject.org  Thu Apr  9 20:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 20:58:34 +0000
Subject: [pkgdb] libpqxx F-11 cloned from devel
Message-ID: <20090409205833.D30ED10F862@bastion2.fedora.phx.redhat.com>

kevin cloned libpqxx F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libpqxx



From pkgdb at fedoraproject.org  Thu Apr  9 21:02:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:02:19 +0000
Subject: [pkgdb] amarok F-11 cloned from devel
Message-ID: <20090409210121.0442810F862@bastion2.fedora.phx.redhat.com>

kevin cloned amarok F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Thu Apr  9 21:03:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:03:20 +0000
Subject: [pkgdb] rpmreaper (Fedora EPEL, 4) updated by kevin
Message-ID: <20090409210223.BBE3110F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for rpmreaper
kevin has set commit to Approved for provenpackager on rpmreaper (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on rpmreaper (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on rpmreaper (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmreaper



From pkgdb at fedoraproject.org  Thu Apr  9 21:03:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:03:20 +0000
Subject: [pkgdb] rpmreaper (Fedora EPEL, 5) updated by kevin
Message-ID: <20090409210223.C6D5710F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rpmreaper
kevin has set commit to Approved for provenpackager on rpmreaper (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on rpmreaper (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on rpmreaper (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmreaper



From cebbert at fedoraproject.org  Thu Apr  9 21:03:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  9 Apr 2009 21:03:57 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ext4-really-print-warning-once.patch,
	NONE, 1.1 kernel.spec, 1.1527, 1.1528
Message-ID: <20090409210357.A0FD77001C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19529

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ext4-really-print-warning-once.patch 
Log Message:
Only print ext4 allocator fallback warning once.

linux-2.6-ext4-really-print-warning-once.patch:

--- NEW FILE linux-2.6-ext4-really-print-warning-once.patch ---
ext4: really print the find_group_flex fallback warning only once

Missing braces caused the warning to print more than once.

Signed-Off-By: Chuck Ebbert <cebbert at redhat.com>

--- linux-2.6.27.noarch.orig/fs/ext4/ialloc.c
+++ linux-2.6.27.noarch/fs/ext4/ialloc.c
@@ -705,11 +705,12 @@ struct inode *ext4_new_inode(handle_t *h
 		ret2 = find_group_flex(sb, dir, &group);
 		if (ret2 == -1) {
 			ret2 = find_group_other(sb, dir, &group);
-			if (ret2 == 0 && once)
+			if (ret2 == 0 && once) {
 				once = 0;
 				printk(KERN_NOTICE "ext4: find_group_flex "
 				       "failed, fallback succeeded dir %lu\n",
 				       dir->i_ino);
+			}
 		}
 		goto got_group;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1527
retrieving revision 1.1528
diff -u -r1.1527 -r1.1528
--- kernel.spec	9 Apr 2009 19:15:20 -0000	1.1527
+++ kernel.spec	9 Apr 2009 21:03:27 -0000	1.1528
@@ -701,6 +701,8 @@
 
 # fs fixes
 Patch2920: linux-2.6-ext4-flush-on-close.patch
+Patch2921: linux-2.6-ext4-really-print-warning-once.patch
+
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 Patch3001: linux-2.6-btrfs-fix-umount-hang.patch
 Patch3010: linux-2.6-relatime-by-default.patch
@@ -1145,6 +1147,7 @@
 
 # ext4
 ApplyPatch linux-2.6-ext4-flush-on-close.patch
+ApplyPatch linux-2.6-ext4-really-print-warning-once.patch
 
 # xfs
 
@@ -1902,6 +1905,9 @@
 # and build.
 
 %changelog
+* Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com>
+- Only print ext4 allocator fallback warning once.
+
 * Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.29.1-59
 - add patch to fix regression on sparc
 



From pkgdb at fedoraproject.org  Thu Apr  9 21:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:04:20 +0000
Subject: [pkgdb] mantis: llaumgui has requested watchbugzilla
Message-ID: <20090409210420.25F0510F874@bastion2.fedora.phx.redhat.com>

llaumgui has requested the watchbugzilla acl on mantis (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Thu Apr  9 21:05:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:05:18 +0000
Subject: [pkgdb] mantis: llaumgui has requested watchcommits
Message-ID: <20090409210420.0E7ED10F870@bastion2.fedora.phx.redhat.com>

llaumgui has requested the watchcommits acl on mantis (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Thu Apr  9 21:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:05:19 +0000
Subject: [pkgdb] mantis: llaumgui has requested commit
Message-ID: <20090409210422.2681710F879@bastion2.fedora.phx.redhat.com>

llaumgui has requested the commit acl on mantis (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Thu Apr  9 21:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:06:02 +0000
Subject: [pkgdb] rear was added for gdha
Message-ID: <20090409210504.DC7A210F861@bastion2.fedora.phx.redhat.com>

kevin has added Package rear with summary Relax and Recover (ReaR) is a Linux Disaster Recovery framework
kevin has approved Package rear
kevin has added a Fedora devel branch for rear with an owner of gdha
kevin has approved rear in Fedora devel
kevin has approved Package rear
kevin has set commit to Approved for provenpackager on rear (Fedora devel)
kevin has set build to Approved for provenpackager on rear (Fedora devel)
kevin has set checkout to Approved for provenpackager on rear (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rear



From pkgdb at fedoraproject.org  Thu Apr  9 21:06:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:06:03 +0000
Subject: [pkgdb] rear (Fedora, 10) updated by kevin
Message-ID: <20090409210506.C3A5B10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rear
kevin has set commit to Approved for provenpackager on rear (Fedora 10)
kevin has set build to Approved for provenpackager on rear (Fedora 10)
kevin has set checkout to Approved for provenpackager on rear (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rear



From pkgdb at fedoraproject.org  Thu Apr  9 21:06:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:06:03 +0000
Subject: [pkgdb] rear (Fedora EPEL, 5) updated by kevin
Message-ID: <20090409210506.D7D4A10F879@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rear
kevin has set commit to Approved for provenpackager on rear (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on rear (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on rear (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rear



From pkgdb at fedoraproject.org  Thu Apr  9 21:06:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:06:03 +0000
Subject: [pkgdb] rear (Fedora, 11) updated by kevin
Message-ID: <20090409210506.CEA7D10F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rear
kevin has set commit to Approved for provenpackager on rear (Fedora 11)
kevin has set build to Approved for provenpackager on rear (Fedora 11)
kevin has set checkout to Approved for provenpackager on rear (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rear



From kevin at fedoraproject.org  Thu Apr  9 21:05:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:05:21 +0000 (UTC)
Subject: rpms/rear - New directory
Message-ID: <20090409210521.2DB427001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rear
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD20119/rpms/rear

Log Message:
Directory /cvs/pkgs/rpms/rear added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:05:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:05:21 +0000 (UTC)
Subject: rpms/rear/devel - New directory
Message-ID: <20090409210521.78DBE7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rear/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD20119/rpms/rear/devel

Log Message:
Directory /cvs/pkgs/rpms/rear/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:05:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:05:30 +0000 (UTC)
Subject: rpms/rear Makefile,NONE,1.1
Message-ID: <20090409210530.D7A5C7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rear
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD20119/rpms/rear

Added Files:
	Makefile 
Log Message:
Setup of module rear


--- NEW FILE Makefile ---
# Top level Makefile for module rear
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:05:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:05:31 +0000 (UTC)
Subject: rpms/rear/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090409210531.506EC7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rear/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD20119/rpms/rear/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rear


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rear
# $Id: Makefile,v 1.1 2009/04/09 21:05:31 kevin Exp $
NAME := rear
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From clumens at fedoraproject.org  Thu Apr  9 21:05:29 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  9 Apr 2009 21:05:29 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.632, 1.633 anaconda-efi.patch, 1.2,
	1.3 anaconda.spec, 1.780, 1.781 sources, 1.766, 1.767
Message-ID: <20090409210529.1F9197001C@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19985

Modified Files:
	.cvsignore anaconda-efi.patch anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- .cvsignore	8 Apr 2009 03:45:43 -0000	1.632
+++ .cvsignore	9 Apr 2009 21:04:57 -0000	1.633
@@ -1,2 +1,3 @@
 clog
 anaconda-11.5.0.41.tar.bz2
+anaconda-11.5.0.42.tar.bz2

anaconda-efi.patch:

Index: anaconda-efi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda-efi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anaconda-efi.patch	25 Mar 2009 02:03:34 -0000	1.2
+++ anaconda-efi.patch	9 Apr 2009 21:04:58 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up anaconda-11.5.0.37/bootdisk/i386/grub.conf.orig anaconda-11.5.0.37/bootdisk/i386/grub.conf
---- anaconda-11.5.0.37/bootdisk/i386/grub.conf.orig	2009-03-24 15:41:58.000000000 -1000
-+++ anaconda-11.5.0.37/bootdisk/i386/grub.conf	2009-03-24 16:02:53.000000000 -1000
+diff -ruN anaconda-11.5.0.42.orig/bootdisk/i386/grub.conf anaconda-11.5.0.42/bootdisk/i386/grub.conf
+--- anaconda-11.5.0.42.orig/bootdisk/i386/grub.conf	2009-04-09 16:53:01.000000000 -0400
++++ anaconda-11.5.0.42/bootdisk/i386/grub.conf	2009-04-09 17:00:45.000000000 -0400
 @@ -1,8 +1,8 @@
  #debug --graphics
  default=0
@@ -13,9 +13,9 @@
 -	initrd /EFI/boot/initrd.img
 +	kernel @KERNELPATH@
 +	initrd @INITRDPATH@
-diff -up anaconda-11.5.0.37/bootdisk/x86_64/grub.conf.orig anaconda-11.5.0.37/bootdisk/x86_64/grub.conf
---- anaconda-11.5.0.37/bootdisk/x86_64/grub.conf.orig	2009-03-24 15:41:58.000000000 -1000
-+++ anaconda-11.5.0.37/bootdisk/x86_64/grub.conf	2009-03-24 16:02:53.000000000 -1000
+diff -ruN anaconda-11.5.0.42.orig/bootdisk/x86_64/grub.conf anaconda-11.5.0.42/bootdisk/x86_64/grub.conf
+--- anaconda-11.5.0.42.orig/bootdisk/x86_64/grub.conf	2009-04-09 16:53:01.000000000 -0400
++++ anaconda-11.5.0.42/bootdisk/x86_64/grub.conf	2009-04-09 17:00:45.000000000 -0400
 @@ -1,8 +1,8 @@
  #debug --graphics
  default=0
@@ -28,10 +28,10 @@
 -	initrd /EFI/boot/initrd.img
 +	kernel @KERNELPATH@
 +	initrd @INITRDPATH@
-diff -up anaconda-11.5.0.37/scripts/buildinstall.orig anaconda-11.5.0.37/scripts/buildinstall
---- anaconda-11.5.0.37/scripts/buildinstall.orig	2009-03-24 15:41:58.000000000 -1000
-+++ anaconda-11.5.0.37/scripts/buildinstall	2009-03-24 16:02:53.000000000 -1000
-@@ -219,8 +219,9 @@ echo "Writing .treeinfo file..."
+diff -ruN anaconda-11.5.0.42.orig/scripts/buildinstall anaconda-11.5.0.42/scripts/buildinstall
+--- anaconda-11.5.0.42.orig/scripts/buildinstall	2009-04-09 16:53:01.000000000 -0400
++++ anaconda-11.5.0.42/scripts/buildinstall	2009-04-09 17:00:45.000000000 -0400
+@@ -219,8 +219,9 @@
  $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo
  
  # FIXME: need to update mk-images to take the yumconf
@@ -43,10 +43,21 @@
  
  echo "Writing .discinfo file"
  $MK_STAMP --releasestr="$RELEASESTR" --arch=$BASEARCH --discNum="ALL"  --outfile=$OUTPUT/.discinfo
-diff -up anaconda-11.5.0.37/scripts/mk-images.efi.orig anaconda-11.5.0.37/scripts/mk-images.efi
---- anaconda-11.5.0.37/scripts/mk-images.efi.orig	2009-03-24 15:41:58.000000000 -1000
-+++ anaconda-11.5.0.37/scripts/mk-images.efi	2009-03-24 16:02:53.000000000 -1000
-@@ -45,6 +45,7 @@ makeefibootdisk()
+diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images anaconda-11.5.0.42/scripts/mk-images
+--- anaconda-11.5.0.42.orig/scripts/mk-images	2009-04-09 16:53:01.000000000 -0400
++++ anaconda-11.5.0.42/scripts/mk-images	2009-04-09 17:00:45.000000000 -0400
+@@ -889,6 +889,7 @@
+ # this gets overloaded if we're on an EFI-capable arch (... with grub)
+ makeEfiImages()
+ {
++    echo "Not on an EFI capable machine; skipping EFI images."
+     /bin/true
+ }
+ 
+diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images.efi anaconda-11.5.0.42/scripts/mk-images.efi
+--- anaconda-11.5.0.42.orig/scripts/mk-images.efi	2009-04-09 16:53:01.000000000 -0400
++++ anaconda-11.5.0.42/scripts/mk-images.efi	2009-04-09 17:00:45.000000000 -0400
+@@ -45,6 +45,7 @@
  
  #makeefibootimage required for EFI bootloader dosfs image
  makeefibootimage() {
@@ -54,7 +65,7 @@
      MBD_FILENAME=""
      KERNELFILE=""
      INITRDFILE=""
-@@ -57,20 +58,29 @@ makeefibootimage() {
+@@ -57,20 +58,29 @@
              KERNELFILE=$2
              shift; shift
              continue
@@ -85,7 +96,7 @@
          exit 1
      done
  
-@@ -111,6 +121,7 @@ makeefibootimage() {
+@@ -111,6 +121,7 @@
  
  # prepare and build an efiboot.img.
  prepareEfiImage() {
@@ -93,7 +104,7 @@
      prepareEfiTree || return 1
  
      # dynamically calculate the size of the dosfs
-@@ -125,47 +136,65 @@ prepareEfiImage() {
+@@ -125,47 +136,65 @@
  # prepare a directory with the kernel, initrd, and various message files
  # used to populate the efi boot image
  prepareEfiTree() {
@@ -176,7 +187,7 @@
      yumconf="$1"
      echo "Making EFI images ($PWD)"
      if [ "$kernelvers" != "$kernelxen" ]; then
-@@ -182,9 +211,10 @@ makeEfiImages() {
+@@ -182,9 +211,10 @@
              return 1
          fi
          echo "Building efiboot.img for ${efiarch}/$KERNELARCH at $TOPDESTPATH/images/efiboot.img"
@@ -188,7 +199,7 @@
              --kernel $TOPDESTPATH/images/pxeboot/vmlinuz \
              --initrd $TOPDESTPATH/images/pxeboot/initrd.img \
              --grubpkg ${grubpkg}
-@@ -194,13 +224,16 @@ makeEfiImages() {
+@@ -194,13 +224,16 @@
              return $ret
          fi
  
@@ -208,21 +219,1017 @@
              --grubpkg ${grubpkg}
          local ret=$?
          if [ $ret -ne 0 ]; then
-diff -up anaconda-11.5.0.37/scripts/mk-images.orig anaconda-11.5.0.37/scripts/mk-images
---- anaconda-11.5.0.37/scripts/mk-images.orig	2009-03-24 15:41:58.000000000 -1000
-+++ anaconda-11.5.0.37/scripts/mk-images	2009-03-24 16:02:53.000000000 -1000
-@@ -870,6 +870,7 @@ doPostImages() {
- # this gets overloaded if we're on an EFI-capable arch (... with grub)
- makeEfiImages()
- {
-+    echo "Not on an EFI capable machine; skipping EFI images."
-     /bin/true
- }
- 
-diff -up anaconda-11.5.0.37/scripts/mk-images.x86.orig anaconda-11.5.0.37/scripts/mk-images.x86
---- anaconda-11.5.0.37/scripts/mk-images.x86.orig	2009-03-24 15:41:58.000000000 -1000
-+++ anaconda-11.5.0.37/scripts/mk-images.x86	2009-03-24 16:02:53.000000000 -1000
-@@ -159,15 +159,16 @@ doPostImages() {
+diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images.orig anaconda-11.5.0.42/scripts/mk-images.orig
+--- anaconda-11.5.0.42.orig/scripts/mk-images.orig	1969-12-31 19:00:00.000000000 -0500
++++ anaconda-11.5.0.42/scripts/mk-images.orig	2009-04-09 16:53:01.000000000 -0400
+@@ -0,0 +1,1003 @@
++#!/bin/bash
++#
++# mk-images
++#
++# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++LANG=C
++
++PATH=$PATH:/sbin:/usr/sbin
++IMAGEUUID=$(date +%Y%m%d%H%M).$(uname -i)
++TMPDIR=${TMPDIR:-/tmp}
++
++usage () {
++    echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"
++    exit 0
++}
++
++DEBUG=""
++BUILDARCH=`uname -m`
++BOOTISO="boot.iso"
++
++while [ $# -gt 0 ]; do
++    case $1 in
++        --debug)
++            DEBUG="--debug"
++            shift
++        ;;
++        --noiso)
++            BOOTISO=""
++            shift
++        ;;
++        --arch)
++            BUILDARCH=$2
++            shift; shift
++        ;;
++        --imgdir)
++            IMGPATH=$2
++            shift; shift
++        ;;
++        --product)
++            PRODUCT=$2
++            shift; shift
++        ;;
++        --version)
++            VERSION=$2
++            shift; shift
++        ;;
++        --bugurl)
++            BUGURL=$2
++            shift; shift
++        ;;
++        --output)
++            TOPDESTPATH=$2
++            shift; shift
++        ;;
++        --nogr)
++            echo "*** DeprecationWarning: ignoring --nogr option." >&2
++            shift
++        ;;
++        --mindir)
++            echo "*** DeprecationWarning: ignoring --mindir option." >&2
++            shift; shift
++        ;;
++        --stg2dir)
++            echo "*** DeprecationWarning: please use --imgdir instead of --stg2dir." >&2
++            shift; shift
++        ;;
++        *)
++            yumconf=$1
++            shift
++        ;;
++    esac
++done
++
++if [ -z "$TOPDESTPATH" -o -z "$IMGPATH" -o -z "$PRODUCT" -o -z "$VERSION" ]; then usage; fi
++
++TOPDIR=$(echo $0 | sed "s,/[^/]*$,,")
++if [ $TOPDIR = $0 ]; then
++    $TOPDIR="."
++fi
++TOPDIR=$(cd $TOPDIR; pwd)
++
++# modules that are needed.  this is the generic "needed for every arch" stuff
++COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 virtio_pci"
++USBMODS="ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch"
++FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci"
++SDMODS="mmc-block sdhci sdhci-pci"
++IDEMODS="ide-cd ide-cd_mod"
++SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft"
++FSMODS="fat msdos vfat ext2 ext3 ext4 reiserfs jfs xfs gfs2 cifs fuse btrfs"
++LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-crypt"
++RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear"
++CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4"
++PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia"
++INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $SDMODS =scsi =net =drm"
++
++. $(dirname $0)/buildinstall.functions
++
++# Set, verify, and create paths
++IMAGEPATH=$TOPDESTPATH/images
++FULLMODPATH=$TMPDIR/instimagemods.$$
++FINALFULLMODPATH=$IMGPATH/modules
++INSTIMGPATH=$TOPDESTPATH/images
++KERNELBASE=$TMPDIR/updboot.kernel.$$
++
++KERNELNAME=vmlinuz
++if [ "$BUILDARCH" = "ia64" ]; then
++    KERNELDIR="/boot/efi/EFI/redhat"
++else
++    KERNELDIR="/boot"
++fi
++
++if [ "$BUILDARCH" = "sparc64" ]; then
++    BASEARCH=sparc
++else
++    BASEARCH=$BUILDARCH
++fi
++
++# explicit block size setting for some arches (FIXME: we compose
++# ppc64-ish trees as ppc, so we have to set the "wrong" block size)
++if [ "$BUILDARCH" = "sparc64" ]; then
++    CRAMBS="--blocksize 8192"
++elif [ "$BUILDARCH" = "sparc" ]; then
++    CRAMBS="--blocksize 4096"
++else
++    CRAMBS=""
++fi
++
++if [ $BUILDARCH = x86_64 -o $BUILDARCH = s390x ]; then
++    LIBDIR=lib64
++else
++    LIBDIR=lib
++fi
++
++rm -rf $IMAGEPATH
++rm -rf $FULLMODPATH
++rm -rf $FINALFULLMODPATH
++rm -rf $KERNELBASE
++mkdir -p $IMAGEPATH
++mkdir -p $FULLMODPATH
++mkdir -p $FINALFULLMODPATH
++mkdir -p $KERNELBASE
++mkdir -p $INSTIMGPATH
++
++# Stuff that we need
++TRIMPCIIDS=$IMGPATH/usr/lib/anaconda-runtime/trimpciids
++GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
++GENINITRDSZ=$IMGPATH/usr/lib/anaconda-runtime/geninitrdsz
++MKS390CDBOOT=$IMGPATH/usr/lib/anaconda-runtime/mk-s390-cdboot
++GENMODINFO=$IMGPATH/usr/lib/anaconda-runtime/genmodinfo
++KEYMAPS=$TMPDIR/keymaps-$BUILDARCH.$$
++SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${BASEARCH}.gz
++MODLIST=$IMGPATH/usr/lib/anaconda-runtime/modlist
++MODINFO=$TMPDIR/modinfo-$BUILDARCH.$$
++LOADERBINDIR=$IMGPATH/usr/lib/anaconda-runtime/loader
++BOOTDISKDIR=$IMGPATH/usr/lib/anaconda-runtime/boot
++LANGTABLE=$IMGPATH/usr/lib/anaconda/lang-table
++PCIIDS=$IMGPATH/usr/share/hwdata/pci.ids
++XDRIVERS=$IMGPATH/usr/share/hwdata/videoaliases
++XDRIVERDESCS=$IMGPATH/usr/share/hwdata/videodrivers
++
++REQUIREMENTS="$TRIMPCIIDS $PCIIDS $XDRIVERDESCS $GENMODINFO
++      $LANGTABLE $GETKEYMAPS"
++
++dieLater=
++for n in $REQUIREMENTS; do
++    if [ ! -f $n ]; then
++        echo "$n doesn't exist"
++        dieLater=1
++    fi
++done
++
++for n in $BOOTDISKDIR; do
++    if [ ! -d $n ]; then
++        echo "$n doesn't exist"
++        dieLater=1
++    fi
++done
++
++if [ -n "$dieLater" ]; then exit 1; fi
++
++if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
++    # go ahead and create the keymaps so we only have to do it once
++    if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH ]; then
++        echo "Found keymap override, using it"
++        cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH $KEYMAPS
++    else
++        echo "Running: $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH"
++        $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH
++        if [ $? != 0 ]; then
++            echo "Unable to create keymaps and thus can't create initrd."
++            exit 1
++        fi
++    fi
++fi
++
++findPackage() {
++    name=$1
++
++    pkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" -c $yumconf --archlist=$KERNELARCH $name.$KERNELARCH)
++    if [ -n "$pkg" ]; then
++        echo $pkg
++        return
++    fi
++    echo "cannot find package $name" >&2
++}
++
++rundepmod () {
++    where=$1
++
++    $FAKEARCH /sbin/depmod -a -F $KERNELROOT/boot/System.map-$version \
++            -b $where $version
++}
++
++# This loops to make sure it resolves dependencies of dependencies of...
++resdeps () {
++    items="$*"
++
++    deplist=""
++    for item in $items ; do
++        deps=$(awk -F ':' "/$item.ko: / { print gensub(\".*/$item.ko: \",\"\",\"g\") }" $KERNELROOT/lib/modules/$version/modules.dep)
++        for dep in $deps ; do
++            depfile=${dep##*/}
++            depname=${dep%%.ko}
++            deplist="$deplist $depname"
++        done
++    done
++    items=$(for n in $items $deplist; do echo $n; done | sort -u)
++    echo $items
++}
++
++expandModuleSet() {
++    SET=""
++    for name in $1; do
++        char=$(echo $name | cut -c1)
++        if [ $char = '=' ]; then
++	    NAME=$(echo $name | cut -c2-)
++	    if [ "$NAME" = "ata" ]; then
++		SET="$SET $(egrep '(ata|ahci)' $KERNELROOT/lib/modules/$version/modules.block |sed -e 's/.ko//')"
++	    elif [ "$NAME" = "scsi" ]; then
++		SET="$SET $(sed -e 's/.ko//' $KERNELROOT/lib/modules/$version/modules.block)"
++	    elif [ "$NAME" = "net" ]; then
++		SET="$SET $(sed -e 's/.ko//' $KERNELROOT/lib/modules/$version/modules.networking)"
++	    else
++                # Ignore if group list does not exist
++                if [ -e $KERNELROOT/lib/modules/$version/modules.$NAME ]; then
++		    SET="$SET $(sed -e 's/.ko//' $KERNELROOT/lib/modules/$version/modules.$NAME)"
++                fi
++            fi
++        else
++            SET="$SET $name"
++        fi
++    done
++
++    echo $SET
++}
++
++makemoduletree() {
++    MMB_DIR=$1
++    MMB_MODULESET=$(resdeps $2)
++
++    mkdir -p $MMB_DIR/lib
++    mkdir -p $MMB_DIR/modules
++    mkdir -p $MMB_DIR/firmware
++    ln -snf ../modules $MMB_DIR/lib/modules
++    ln -snf ../firmware $MMB_DIR/lib/firmware
++
++    echo "Copying kernel modules..."
++    cp -a $KERNELROOT/lib/modules/* $MMB_DIR/lib/modules/
++    echo "Removing extraneous modules..."
++    find $MMB_DIR/lib/modules/ -name *.ko | while read module ; do
++        m=${module##*/}
++        modname=${m%%.ko}
++        echo $MMB_MODULESET | grep -wq $modname || {
++            rm -f $module
++        }
++    done
++
++    echo "Copying required firmware..."
++    find $MMB_DIR/lib/modules/ -name *.ko | while read module ; do
++        for fw in $(modinfo -F firmware $module); do
++            dest=$MBD_DIR/firmware/$fw
++            destdir=$(dirname $dest)
++
++            # Some firmware files are expected to be in their own directories.
++            if [ ! -d $destdir ]; then
++                mkdir -p $destdir
++            fi
++
++            cp $KERNELROOT/lib/firmware/$fw $dest
++        done
++    done
++
++    # Copy in driver firmware we know we'll want during installation. This is
++    # required for modules which still don't (or can't) export information
++    # about what firmware files they require.
++    for module in $MODSET ; do
++        case $module in
++            ipw2100)
++                cp $KERNELROOT/lib/firmware/ipw2100* $MBD_DIR/firmware
++            ;;
++            ipw2200)
++                cp $KERNELROOT/lib/firmware/ipw2200* $MBD_DIR/firmware
++            ;;
++            iwl3945)
++                cp $KERNELROOT/lib/firmware/iwlwifi-3945* $MBD_DIR/firmware
++            ;;
++            atmel)
++                cp $KERNELROOT/lib/firmware/atmel_*.bin $MBD_DIR/firmware
++            ;;
++            zd1211rw)
++                cp -r $KERNELROOT/lib/firmware/zd1211 $MBD_DIR/firmware
++            ;;
++        esac
++    done
++
++    # clean up leftover cruft
++    find -H $MMB_DIR/lib/modules -type d -exec rmdir -f {} \; 2>/dev/null
++    $MODLIST --modinfo-file $MODINFO --ignore-missing --modinfo \
++    $MMB_MODULESET > $MMB_DIR/lib/modules/module-info
++    # compress modules
++    find -H $MMB_DIR/lib/modules -type f -name *.ko -exec gzip -9 {} \;
++    rundepmod $MMB_DIR
++    rm -f $MMB_DIR/lib/modules/*/modules.*map
++    rm -f $MMB_DIR/lib/modules/*/{build,source}
++
++    # create the pci.ids, from modules.alias and the X driver aliases
++    awk '!/^(\t\t|#)/ { print ;if ($0 == "ffff  Illegal Vendor ID") nextfile; }' < $PCIIDS | \
++        $TRIMPCIIDS $MMB_DIR/lib/modules/*/modules.alias $XDRIVERS/* > ../pci.ids
++}
++
++
++makeproductfile() {
++    root=$1
++
++    rm -f $root/.buildstamp
++    echo $IMAGEUUID > $root/.buildstamp
++    echo $PRODUCT >> $root/.buildstamp
++    echo $VERSION >> $root/.buildstamp
++    if [ -n "$BUGURL" ]; then
++        echo $BUGURL >> $root/.buildstamp
++    fi
++}
++
++instbin() {
++    ROOT=$1
++    BIN=$2
++    DIR=$3
++    DEST=$4
++
++    iself="$(file $ROOT/$BIN | grep ELF | grep executable)"
++
++    if [ -l $ROOT/$BIN ]; then
++        cp -a $ROOT/$BIN $DIR/$DEST
++    else
++        if [ -z "$iself" ]; then
++            install -m 755 $ROOT/$BIN $DIR/$DEST
++        else
++            install -s -m 755 $ROOT/$BIN $DIR/$DEST
++
++            get_dso_deps $ROOT "$BIN"
++            local DEPS="$DSO_DEPS"
++            mkdir -p $DIR/$LIBDIR
++
++            for x in $DEPS ; do
++                cp -Lfp $ROOT/$x $DIR/$LIBDIR
++            done
++
++            pushd $DIR/$LIBDIR
++            if [ -f ld-linux.so.2 -a ! -L ld-linux.so.2 ]; then
++                rm -f ld-linux.so.2
++                linker="$(ls -1 ld-*.*.*.so)"
++                if [ -z "$linker" ]; then
++                    linker="$(ls -1 ld-*.*.so)"
++                fi
++                found=$(echo $linker | wc -l)
++                if [ $found -ne 1 ]; then
++                    echo "Found too many dynamic linkers:" >&2
++                    echo $linker >&2
++                    exit 1
++                fi
++                ln -s $linker ld-linux.so.2
++            fi
++            popd
++        fi
++    fi
++}
++
++setupShellEnvironment() {
++    echo "tcp     6       TCP" > $MBD_DIR/etc/protocols
++
++    # PAM configuration
++    for i in pam_limits.so pam_env.so pam_unix.so pam_deny.so; do
++        cp -f $IMGPATH/$LIBDIR/security/$i $MBD_DIR/$LIBDIR/security
++    done
++
++    cp -f $IMGPATH/etc/pam.d/other $MBD_DIR/etc/pam.d
++    cat > $MBD_DIR/etc/pam.d/login << EOF
++#%PAM-1.0
++auth        required      pam_env.so
++auth        sufficient    pam_unix.so likeauth nullok
++auth        required      pam_deny.so
++account     required      pam_unix.so
++password    sufficient    pam_unix.so nullok use_authtok md5 shadow
++password    required      pam_deny.so
++session     required      pam_limits.so
++session     required      pam_unix.so
++EOF
++    cp -f $MBD_DIR/etc/pam.d/login $MBD_DIR/etc/pam.d/sshd
++    cp -f $MBD_DIR/etc/pam.d/login $MBD_DIR/etc/pam.d/remote
++
++    cp -f $IMGPATH/etc/security/{limits.conf,pam_env.conf} $MBD_DIR/etc/security/
++
++    # key generation takes ages on s390, you really don't want this for every
++    # installation attempt. These are NOT the keys of the installed system!
++    mkdir -m 0700 -p $MBD_DIR/etc/ssh
++    echo -n "Generating SSH1 RSA host key: "
++    /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \
++                        -C '' -N '' >&/dev/null
++    echo
++    echo -n "Generating SSH2 RSA host key: "
++    /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \
++                        -C '' -N '' >&/dev/null
++    echo
++    echo -n "Generating SSH2 DSA host key: "
++    /usr/bin/ssh-keygen -q -t dsa -f $MBD_DIR/etc/ssh/ssh_host_dsa_key \
++                        -C '' -N '' >&/dev/null
++    echo
++    (cd $MBD_DIR/etc/ssh; \
++        chmod 600 ssh_host_key ssh_host_rsa_key ssh_host_dsa_key; \
++        chmod 644 ssh_host_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key.pub; )
++
++    cat > $MBD_DIR/etc/ssh/sshd_config <<EOF
++Port 22
++HostKey /etc/ssh/ssh_host_key
++HostKey /etc/ssh/ssh_host_rsa_key
++HostKey /etc/ssh/ssh_host_dsa_key
++PermitRootLogin yes
++IgnoreRhosts yes
++StrictModes yes
++X11Forwarding yes
++X11DisplayOffset 10
++PrintMotd yes
++XAuthLocation /sbin/xauth
++KeepAlive yes
++SyslogFacility AUTHPRIV
++RSAAuthentication yes
++PasswordAuthentication yes
++PermitEmptyPasswords yes
++PermitUserEnvironment yes
++EOF
++    chmod 600 $MBD_DIR/etc/ssh/sshd_config
++
++    # copy in the binaries
++    instbin $IMGPATH /usr/bin/login $MBD_DIR /sbin/login
++    instbin $IMGPATH /usr/sbin/sshd $MBD_DIR /sbin/sshd
++    instbin $IMGPATH /usr/bin/busybox $MBD_DIR /sbin/busybox
++
++    # make some symlinks
++    (cd $MBD_DIR/sbin;
++        set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\.\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
++        while [ -n "$1" ]; do
++              if [ $1 != "busybox" -a $1 != "sh" ]; then
++                # if file doesnt already exist, link to busybox
++                if [ ! -f "$1" ]; then
++                    ln -sf ./busybox $1
++                else
++                    [ -n "$DEBUG" ] && echo "Overriding busybox version of $1"
++                fi
++            fi
++            shift
++        done )
++}
++
++
++makeinitrd() {
++    EXTRAINITRDPATH=""
++    INITRDSIZE=""
++    KEEP=""
++    PADSIZE=""
++    LOADERBIN=""
++    INITRDMODULES=""
++    MYLANGTABLE=$LANGTABLE
++    MYLOADERTR=loader.tr
++    while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
++        if [ $1 = "--initrdto" ]; then
++            EXTRAINITRDPATH=$2
++            shift; shift
++            continue
++        elif [ $1 = "--keep" ]; then
++            KEEP=yes
++            shift
++            continue
++        elif [ $1 = "--initrdsize" ]; then
++            INITRDSIZE=$2
++            shift; shift
++            continue
++        elif [ $1 = "--loaderbin" ]; then
++            LOADERBIN=$2
++            shift; shift
++            continue
++        elif [ $1 = "--modules" ]; then
++            INITRDMODULES=$2
++            shift; shift
++            continue
++        fi
++        echo "Unknown option passed to makeinitrd"
++        exit 1
++    done
++    if [ -z "$LOADERBIN" ]; then
++        echo "no loader binary specified!" >&2
++        exit 1
++    fi
++    if [ -z "$INITRDMODULES" ]; then
++        echo "warning: no loader modules specified!" >&2
++    fi
++    if [ -z "$INITRDSIZE" ]; then
++        echo "I don't know how big to make the initrd image!" >&2
++        exit 1
++    fi
++
++    MBD_DIR=$TMPDIR/makebootdisk.dir.$$
++    MBD_FSIMAGE=$TMPDIR/makebootdisk.initrdimage.$$
++    MBD_BOOTTREE=$TMPDIR/makebootdisk.tree.$$
++
++    rm -rf $MBD_DIR $MBD_FSIMAGE
++    mkdir -p $MBD_DIR/modules
++    mkdir -p $MBD_DIR/sbin
++    mkdir -p $MBD_DIR/dev
++    mkdir -p $MBD_DIR/etc
++    mkdir -p $MBD_DIR/etc/udev/rules.d
++    mkdir -p $MBD_DIR/lib/udev/rules.d
++    mkdir -p $MBD_DIR/proc
++    mkdir -p $MBD_DIR/selinux
++    mkdir -p $MBD_DIR/sys
++    mkdir -p $MBD_DIR/etc/terminfo/{a,b,d,l,s,v,x}
++    mkdir -p $MBD_DIR/tmp
++    mkdir -p $MBD_DIR/usr/libexec
++    mkdir -p $MBD_DIR/usr/$LIBDIR/NetworkManager
++    mkdir -p $MBD_DIR/usr/share/dbus-1/system-services
++    mkdir -p $MBD_DIR/var/cache/hald
++    mkdir -p $MBD_DIR/var/lib/dbus
++    mkdir -p $MBD_DIR/var/lib/dhclient
++    mkdir -p $MBD_DIR/var/lock/rpm
++    mkdir -p $MBD_DIR/var/run
++    mkdir -p $MBD_DIR/var/run/dbus
++    mkdir -p $MBD_DIR/var/run/hald
++    mkdir -p $MBD_DIR/var/run/NetworkManager
++    mkdir -p $MBD_DIR/etc/dbus-1/system.d
++    mkdir -p $MBD_DIR/etc/modprobe.d
++    mkdir -p $MBD_DIR/etc/NetworkManager/dispatcher.d
++    mkdir -p $MBD_DIR/$LIBDIR/dbus-1
++    mkdir -p $MBD_DIR/etc/sysconfig/network-scripts
++    mkdir -p $MBD_DIR/usr/share/PolicyKit/policy
++    mkdir -p $MBD_DIR/etc/PolicyKit
++    mkdir -p $MBD_DIR/var/lib/misc
++    mkdir -p $MBD_DIR/etc/hal/fdi
++    mkdir -p $MBD_DIR/usr/share/hal/fdi
++    mkdir -p $MBD_DIR/usr/share/hwdata
++    mkdir -p $MBD_DIR/etc/rc.d/init.d
++    mkdir -p $MBD_DIR/usr/sbin
++    mkdir -p $MBD_DIR/var/run/wpa_supplicant
++
++    if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
++        mkdir -m 111 -p $MBD_DIR/var/empty/sshd
++        mkdir -p $MBD_DIR/etc/{pam.d,security}
++        mkdir -p $MBD_DIR/$LIBDIR/security
++        cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0
++        ln -s /tmp $MBD_DIR/var/state/xkb
++        cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
++        cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
++    fi
++
++    if [ -n "$INITRDMODULES" ]; then
++        MODSET=`expandModuleSet "$INITRDMODULES"`
++        makemoduletree $MBD_DIR "$MODSET"
++    fi
++
++    # set up the arch bits
++    echo $arch > $MBD_DIR/etc/arch
++
++    echo "Setting up arch bits"
++    instbin $IMGPATH ${LOADERBINDIR##$IMGPATH}/$LOADERBIN $MBD_DIR /sbin/loader
++    if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
++        instbin $IMGPATH ${LOADERBINDIR##$IMGPATH}/init $MBD_DIR /sbin/init
++        ln -s ./init $MBD_DIR/sbin/reboot
++        ln -s ./init $MBD_DIR/sbin/halt
++        ln -s ./init $MBD_DIR/sbin/poweroff
++    else
++        instbin $IMGPATH ${LOADERBINDIR##IMGPATH}/shutdown $MBD_DIR /sbin/shutdown
++        instbin $IMGPATH /usr/lib/anaconda-runtime/loader/linuxrc.s390 $MBD_DIR /sbin/init
++        instbin $IMGPATH /usr/sbin/dasdfmt $MBD_DIR /sbin/dasdfmt
++    fi
++
++    if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
++       install -m 644 $KEYMAPS $MBD_DIR/etc/keymaps.gz
++       install -m 644 $SCREENFONT $MBD_DIR/etc/screenfont.gz
++    fi
++
++    install -m 644 $MYLANGTABLE $MBD_DIR/etc/lang-table
++    install -m 644 $IMGPATH/etc/passwd $MBD_DIR/etc/passwd
++    install -m 644 $IMGPATH/etc/group $MBD_DIR/etc/group
++    install -m 644 $IMGPATH/etc/nsswitch.conf $MBD_DIR/etc/nsswitch.conf
++    install -m 644 $IMGPATH/etc/hosts $MBD_DIR/etc/hosts
++
++    instbin $IMGPATH /usr/bin/mount $MBD_DIR /sbin/mount
++    for mountcmd in $IMGPATH/usr/sbin/mount.* ; do
++        cmd="$(basename $mountcmd)"
++        instbin $IMGPATH /usr/sbin/$cmd $MBD_DIR /sbin/$cmd
++    done
++    instbin $IMGPATH /usr/bin/umount $MBD_DIR /sbin/umount
++    for umountcmd in $IMGPATH/usr/sbin/umount.* ; do
++        cmd="$(basename $umountcmd)"
++        instbin $IMGPATH /usr/sbin/$cmd $MBD_DIR /sbin/$cmd
++    done
++
++    instbin $IMGPATH /usr/sbin/udevd $MBD_DIR /sbin/udevd
++    instbin $IMGPATH /usr/sbin/udevadm $MBD_DIR /sbin/udevadm
++    instbin $IMGPATH /usr/bin/udevinfo $MBD_DIR /sbin/udevinfo
++
++    instbin $IMGPATH /usr/bin/bash $MBD_DIR /sbin/bash
++    ( cd $MBD_DIR/sbin ; ln -sf bash sh )
++    instbin $IMGPATH /usr/sbin/consoletype $MBD_DIR /sbin/consoletype
++    instbin $IMGPATH /usr/bin/logger $MBD_DIR /sbin/logger
++
++    ( cd $IMGPATH/etc/rc.d/init.d
++      cp -a functions $MBD_DIR/etc/rc.d/init.d
++    )
++
++    ( cd $IMGPATH/etc/sysconfig/network-scripts
++      cp -a network-functions $MBD_DIR/etc/sysconfig/network-scripts
++      cp -a network-functions-ipv6 $MBD_DIR/etc/sysconfig/network-scripts
++    )
++
++    ( cd $MBD_DIR/etc ; ln -sf /etc/rc.d/init.d init.d )
++
++    # DHCP and DHCPv6 client daemons and support programs
++    instbin $IMGPATH /usr/sbin/dhclient $MBD_DIR /sbin/dhclient
++    cp -a $IMGPATH/usr/sbin/dhclient-script $MBD_DIR/sbin/dhclient-script
++    chmod 0755 $MBD_DIR/sbin/dhclient-script
++    instbin $IMGPATH /usr/sbin/dhcp6c $MBD_DIR /sbin/dhcp6c
++    instbin $IMGPATH /usr/sbin/arping $MBD_DIR /sbin/arping
++    instbin $IMGPATH /usr/sbin/ifconfig $MBD_DIR /sbin/ifconfig
++    instbin $IMGPATH /usr/sbin/ip $MBD_DIR /sbin/ip
++    touch $MBD_DIR/etc/resolv.conf
++
++    # hwdata
++    cp -a $IMGPATH/usr/share/hwdata/pci.ids $MBD_DIR/usr/share/hwdata/pci.ids
++    cp -a $IMGPATH/usr/share/hwdata/usb.ids $MBD_DIR/usr/share/hwdata/usb.ids
++
++    # hal
++    instbin $IMGPATH /usr/sbin/hald $MBD_DIR /sbin/hald
++    ( cd $IMGPATH/usr/libexec
++      for f in hald-runner hald-generate-fdi-cache hal*storage* ; do
++          instbin $IMGPATH /usr/libexec/$f $MBD_DIR /usr/libexec/$f
++      done
++    )
++    touch $MBD_DIR/var/run/hald.acl-list
++    cp -a $IMGPATH/usr/share/hal/fdi/* $MBD_DIR/usr/share/hal/fdi
++    cp -a $IMGPATH/etc/hal/fdi/* $MBD_DIR/etc/hal/fdi
++    cp -a $IMGPATH/etc/dbus-1/system.d/hal.conf $MBD_DIR/etc/dbus-1/system.d
++
++    # PolicyKit
++    ( cd $IMGPATH/etc/PolicyKit
++      cp -a PolicyKit.conf $MBD_DIR/etc/PolicyKit
++    )
++    ( cd $IMGPATH/usr/share/dbus-1/system-services
++      cp -a org.freedesktop.PolicyKit.service $MBD_DIR/usr/share/dbus-1/system-services
++    )
++    ( cd $IMGPATH/usr/share/PolicyKit/policy
++      cp -a org.freedesktop.policykit.policy $MBD_DIR/usr/share/PolicyKit/policy
++    )
++    ( cd $IMGPATH/var/lib/misc
++      cp -a PolicyKit.reload $MBD_DIR/var/lib/misc
++    )
++
++    # dbus
++    instbin $IMGPATH /usr/bin/dbus-uuidgen $MBD_DIR /sbin/dbus-uuidgen
++    instbin $IMGPATH /usr/bin/dbus-daemon $MBD_DIR /sbin/dbus-daemon
++    cp -a $IMGPATH/etc/dbus-1/system.conf $MBD_DIR/etc/dbus-1/system.conf
++    cp -a $IMGPATH/$LIBDIR/dbus-1/dbus-daemon-launch-helper $MBD_DIR/$LIBDIR/dbus-1
++    chown root:dbus $MBD_DIR/$LIBDIR/dbus-1/dbus-daemon-launch-helper
++    chmod 04750 $MBD_DIR/$LIBDIR/dbus-1/dbus-daemon-launch-helper
++
++    # wpa_supplicant
++    instbin $IMGPATH /usr/sbin/wpa_passphrase $MBD_DIR /usr/sbin/wpa_passphrase
++    instbin $IMGPATH /usr/sbin/wpa_supplicant $MBD_DIR /usr/sbin/wpa_supplicant
++    cp -a $IMGPATH/etc/dbus-1/system.d/wpa_supplicant.conf $MBD_DIR/etc/dbus-1/system.d
++    cp -a $IMGPATH/etc/wpa_supplicant/wpa_supplicant.conf $MBD_DIR/etc/wpa_supplicant
++    ( cd $IMGPATH/usr/share/dbus-1/system-services
++      cp -a fi.epitest.hostap.WPASupplicant.service $MBD_DIR/usr/share/dbus-1/system-services
++    )
++
++    # NetworkManager
++    instbin $IMGPATH /usr/sbin/NetworkManager $MBD_DIR /usr/sbin/NetworkManager
++    instbin $IMGPATH /usr/sbin/nm-system-settings $MBD_DIR /usr/sbin/nm-system-settings
++    cp -a $IMGPATH/etc/dbus-1/system.d/nm-*.conf $MBD_DIR/etc/dbus-1/system.d
++    cp -a $IMGPATH/etc/dbus-1/system.d/NetworkManager.conf $MBD_DIR/etc/dbus-1/system.d
++    cp -a $IMGPATH/etc/NetworkManager/nm-system-settings.conf $MBD_DIR/etc/NetworkManager
++    ( cd $IMGPATH/usr/$LIBDIR/NetworkManager
++      for f in *.so ; do
++          instbin $IMGPATH /usr/$LIBDIR/NetworkManager/$f $MBD_DIR /usr/$LIBDIR/NetworkManager/$f
++      done
++    )
++    ( cd $IMGPATH/usr/libexec
++      for f in nm-* ; do
++          instbin $IMGPATH /usr/libexec/$f $MBD_DIR /usr/libexec/$f
++      done
++    )
++    ( cd $IMGPATH/usr/share/dbus-1/system-services
++      cp -a org.freedesktop.NetworkManagerSystemSettings.service $MBD_DIR/usr/share/dbus-1/system-services
++      cp -a org.freedesktop.nm_dispatcher.service $MBD_DIR/usr/share/dbus-1/system-services
++    )
++
++    # Indirect dependencies
++    install -m 755 $IMGPATH/$LIBDIR/libfreebl3.so $MBD_DIR/$LIBDIR/
++    install -m 755 $IMGPATH/$LIBDIR/libsoftokn3.so $MBD_DIR/$LIBDIR/
++    install -m 755 $IMGPATH/usr/$LIBDIR/libsqlite3.so.0 $MBD_DIR/usr/$LIBDIR/
++    install -m 755 $IMGPATH/$LIBDIR/libnss_dns.so.2 $MBD_DIR/$LIBDIR/
++    install -m 755 $IMGPATH/$LIBDIR/libnss_files.so.2 $MBD_DIR/$LIBDIR/
++    install -m 755 $IMGPATH/$LIBDIR/libgcc_s.so.1 $MBD_DIR/$LIBDIR/
++
++    install -m 644 $IMGPATH/etc/udev/udev.conf $MBD_DIR/etc/udev/udev.conf
++    for i in $IMGPATH/lib/udev/rules.d/*.rules ; do
++       install -m 644 $i $MBD_DIR/lib/udev/rules.d/${i##*/}
++    done
++    for i in $IMGPATH/etc/udev/rules.d/*.rules ; do
++       install -m 644 $i $MBD_DIR/etc/udev/rules.d/${i##*/}
++    done
++    for i in $IMGPATH/lib/udev/*; do
++       if [ -f $i ]; then install -m 755 $i $MBD_DIR/lib/udev/${i##*/}; fi
++    done
++    rm -f $MBD_DIR/lib/udev/rules.d/*persistent*
++    rm -f $MBD_DIR/lib/udev/rules.d/*generator*
++
++    install -m 644 $LOADERBINDIR/$MYLOADERTR $MBD_DIR/etc/loader.tr
++    for i in a/ansi d/dumb l/linux s/screen v/vt100 v/vt100-nav v/vt102 x/xterm x/xterm-color g/gnome ; do
++        [ -f $IMGPATH/usr/share/terminfo/$i ] && \
++        install -m 644 $IMGPATH/usr/share/terminfo/$i $MBD_DIR/etc/terminfo/$i
++    done
++
++    makeproductfile $MBD_DIR
++
++    for n in insmod rmmod modprobe; do
++        instbin $IMGPATH /usr/sbin/$n $MBD_DIR /sbin/$n
++    done
++
++    ln -s /sbin/init $MBD_DIR/init
++    ln -s /proc/mounts $MBD_DIR/etc/mtab
++    ln -s sbin $MBD_DIR/bin
++    mkdir -p $MBD_DIR/var/lib
++    ln -s ../../tmp $MBD_DIR/var/lib/xkb
++
++    # s390/s390x need sshd setup
++    if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
++        setupShellEnvironment
++    fi
++
++cat > $MBD_DIR/.profile <<EOF
++PATH=/bin:/usr/bin:/usr/sbin:/mnt/sysimage/sbin:/mnt/sysimage/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin
++export PATH
++EOF
++
++    rm -f $MBD_FSIMAGE
++    (cd $MBD_DIR; find . |cpio --quiet -c -o) |gzip -9 > $MBD_FSIMAGE
++
++    size=$(du $MBD_FSIMAGE | awk '{ print $1 }')
++
++    echo "Wrote $MBD_FSIMAGE (${size}k compressed)"
++
++    if [ -n "$EXTRAINITRDPATH" ]; then
++        mkdir -p `dirname $EXTRAINITRDPATH`
++        cp -a $MBD_FSIMAGE $EXTRAINITRDPATH
++    fi
++
++    if [ -z "$KEEP" ]; then
++        rm -rf $MBD_FSIMAGE $MBD_BOOTTREE
++    fi
++}
++
++makeinstimage () {
++    imagename=$1
++    type=$2
++    tmp=$TMPDIR/instimage.dir.$$
++
++    rm -rf $tmpimage $tmp
++    mkdir -p $mntpoint $tmp
++
++    mkdir -p $tmp
++    (cd $IMGPATH; find . | cpio --quiet -p $tmp)
++    makeproductfile $tmp
++
++    if [ -z "$type" -o "$type" = "cramfs" ]; then
++        echo "Running mkcramfs $CRAMBS $tmp $INSTIMGPATH/${imagename}2.img"
++        mkfs.cramfs $CRAMBS $tmp $TMPDIR/${imagename}2.img.$$
++    elif [ "$type" = "squashfs" ]; then
++        echo "Running mksquashfs $tmp $TMPDIR/${imagename}2.img -all-root -no-fragments -no-progress"
++        mksquashfs $tmp $TMPDIR/${imagename}2.img.$$ -all-root -no-fragments -no-progress
++        chmod 0644 $TMPDIR/${imagename}2.img.$$
++    fi
++    cp $TMPDIR/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img
++    size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}')
++    size=$(expr $size / 1024)
++    echo "Wrote $INSTIMGPATH/${imagename}2.img (${size}k)..."
++    relpath=${INSTIMGPATH#$TOPDESTPATH/}
++    echo "instimage = ${relpath}/${imagename}2.img" >> $TOPDESTPATH/.treeinfo
++    rm -rf $tmp
++}
++
++makemainimage () {
++    imagename=$1
++    type=$2
++    mmi_tmpimage=$TMPDIR/instimage.img.$$
++    mmi_mntpoint=$TMPDIR/instimage.mnt.$$
++
++    rm -rf $mmi_tmpimage $mmi_mntpoint
++    mkdir $mmi_mntpoint
++
++    if [ $type = "ext2" ]; then
++        SIZE=$(du -sk $IMGPATH | awk '{ print int($1 * 1.1) }')
++        if [ -d $IMGPATH/usr/lib/anaconda-runtime ]; then
++            ERROR=$(du -sk $IMGPATH/usr/lib/anaconda-runtime | awk '{ print $1 }')
++            SIZE=$(expr $SIZE - $ERROR)
++        fi
++        if [ -d $IMGPATH/usr/share/syslinux ]; then
++            ERROR=$(du -sk $IMGPATH/usr/share/syslinux | awk '{ print $1 }')
++            SIZE=$(expr $SIZE - $ERROR)
++        fi
++        dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage 2>/dev/null
++        mke2fs -q -F $mmi_tmpimage > /dev/null
++        tune2fs -c0 -i0 $mmi_tmpimage >/dev/null
++        mount -o loop $mmi_tmpimage $mmi_mntpoint
++
++        (cd $IMGPATH; find . |
++            fgrep -v "./usr/lib/anaconda-runtime" |
++            fgrep -v "./usr/share/syslinux"
++            cpio -H crc -o) | (cd $mmi_mntpoint; cpio -iumd)
++        makeproductfile $mmi_mntpoint
++        umount $mmi_mntpoint
++        rmdir $mmi_mntpoint
++    elif [ $type = "squashfs" ]; then
++        makeproductfile $IMGPATH
++        echo "Running mksquashfs $IMGPATH $mmi_tmpimage -all-root -no-fragments -no-progress"
++        mksquashfs $IMGPATH $mmi_tmpimage -all-root -no-fragments -no-progress
++        chmod 0644 $mmi_tmpimage
++        SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
++    elif [ $type = "cramfs" ]; then
++        makeproductfile $IMGPATH
++        echo "Running mkcramfs $CRAMBS $IMGPATH $mmi_tmpimage"
++        mkfs.cramfs $CRAMBS $IMGPATH $mmi_tmpimage
++        SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
++    fi
++
++    cp $mmi_tmpimage $INSTIMGPATH/${imagename}.img
++    chmod 644 $INSTIMGPATH/${imagename}.img
++
++    echo "Wrote $INSTIMGPATH/${imagename}.img (${SIZE}k)"
++    relpath=${INSTIMGPATH#$TOPDESTPATH/}
++    echo "mainimage = ${relpath}/${imagename}.img" >> $TOPDESTPATH/.treeinfo
++
++    rm $mmi_tmpimage
++}
++
++makeSecondStage() {
++    echo "[stage2]" >> $TOPDESTPATH/.treeinfo
++    echo "Building install.img"
++    makemainimage "install" "squashfs"
++    [ $? = 0 ] || exit 1
++}
++
++doPostImages() {
++   /bin/true
++}
++
++# this gets overloaded if we're on an EFI-capable arch (... with grub)
++makeEfiImages()
++{
++    /bin/true
++}
++
++# source the architecture specific mk-images file so we can call functions
++# in it
++if [ ${BUILDARCH} = s390x ]; then
++    # FIXME: this is a bad hack for s390, but better than copying for now
++    source $TOPDIR/mk-images.s390
++elif [ ${BUILDARCH} = ppc64 ]; then
++    # ... and similar for ppc64
++    source $TOPDIR/mk-images.ppc
++elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then
++    source $TOPDIR/mk-images.x86
++    source $TOPDIR/mk-images.efi
++else
++    source $TOPDIR/mk-images.${BUILDARCH}
++fi
++
++# Find the kernel, unpack it, and verify it
++kerneltags="kernel"
++efiarch=""
++arches="$BUILDARCH"
++if [ "$BUILDARCH" = "ppc" ]; then
++    arches="ppc64 ppc"
++elif [ "$BUILDARCH" = "i386" ]; then
++    arches="i586"
++    efiarch="ia32"
++    kerneltags="kernel kernel-PAE"
++    kernelxen="kernel-PAE"
++elif [ "$BUILDARCH" = "x86_64" ]; then
++    kerneltags="kernel"
++    efiarch="x64"
++elif [ "$BUILDARCH" = "ia64" ]; then
++    kerneltags="kernel"
++    efiarch="ia64"
++fi
++
++foundakernel=""
++for KERNELARCH in $arches; do
++    for kernelvers in $kerneltags; do
++        kpackage=$(findPackage $kernelvers)
++        if [ "$KERNELARCH" = "i586" -a -z "$kpackage" ]; then
++            echo "No i586 kernel, trying i686..."
++            KERNELARCH="i686"
++            kpackage=$(findPackage $kernelvers)
++        fi
++
++        if [ -z "$kpackage" ]; then
++            echo "Unable to find kernel package $kernelvers"
++            continue
++        fi
++
++        yumdownloader -c $yumconf --archlist=$KERNELARCH $kpackage
++        kpackage="$kpackage.rpm"
++        if [ ! -f "$kpackage" ]; then
++            echo "kernel ($kernelvers) doesn't exist for $KERNELARCH.  skipping"
++            continue
++        fi
++
++        KERNELROOT=$KERNELBASE/$KERNELARCH
++        mkdir -p $KERNELROOT
++
++        foundakernel="yes"
++
++        if [ "$BUILDARCH" = "ia64" ]; then
++            vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/efi/EFI/redhat/vmlinuz | head -n 1)
++            version=${vmlinuz##/boot/efi/EFI/redhat/vmlinuz-}
++        else
++            vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/vmlinuz | head -n 1)
++            version=${vmlinuz##/boot/vmlinuz-}
++        fi
++        arch=$(rpm --nodigest --nosignature --qf '%{ARCH}\n' -qp $kpackage)
++
++        rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd)
++        rm -f $kpackage
++        # expand out any available firmware too
++        for p in $(repoquery -c $yumconf '*firmware*') ; do
++            yumdownloader -c $yumconf $p
++            rpm2cpio *firmware*.rpm | (cd $KERNELROOT; cpio --quiet -iumd)
++            rm -f *firmware*.rpm
++        done
++
++        if [ ! -d "$KERNELROOT/lib/modules/$version" ]; then
++            echo "$KERNELROOT/lib/modules/$version is not a valid modules directory" 2>&1
++            exit 1
++        fi
++
++        if [ ! -f "$KERNELROOT/$KERNELDIR/${KERNELNAME}-$version" ]; then
++            echo "$KERNELROOT/$KERNELDIR/${KERNELNAME}-$version does not exist"
++            exit 1
++        fi
++
++        allmods=$(find $KERNELROOT/lib/modules/$version -name *.ko)
++
++        rundepmod $KERNELROOT
++        $GENMODINFO $KERNELROOT/lib/modules/$version > $MODINFO
++
++        # make the boot images
++        makeBootImages
++
++        makeEfiImages $yumconf
++    done
++done
++
++if [ -n "$foundakernel" ]; then
++    makeSecondStage
++    rm -rf $KERNELBASE
++fi
++
++doPostImages
++
++cd $TOPDIR
+diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images.x86 anaconda-11.5.0.42/scripts/mk-images.x86
+--- anaconda-11.5.0.42.orig/scripts/mk-images.x86	2009-04-09 16:53:01.000000000 -0400
++++ anaconda-11.5.0.42/scripts/mk-images.x86	2009-04-09 17:00:45.000000000 -0400
+@@ -159,15 +159,16 @@
      if [ -n "$BOOTISO" ]; then
          EFIARGS=""
          EFIGRAFT=""


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.780
retrieving revision 1.781
diff -u -r1.780 -r1.781
--- anaconda.spec	8 Apr 2009 03:45:43 -0000	1.780
+++ anaconda.spec	9 Apr 2009 21:04:58 -0000	1.781
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.41
+Version: 11.5.0.42
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,33 @@
 %endif
 
 %changelog
+* Thu Apr 09 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.42-1
+- Fix display of format type for devices. (dlehman)
+- Fix handling of priority option from swap fstab entries. (#494992)
+  (dlehman)
+- Some fs types cannot be passed to programs (#495061, #493075). (clumens)
+- When a new module is loaded, update the kernel_filesystems list. (clumens)
+- Add more Indic fonts (#494261, pnemade).
+- Remove the message saying you can make your own layout (#495015). (clumens)
+- Put e100 (and other) firmware in its own directory if needed (#494778).
+  (clumens)
+- Run /bin/umount instead of calling umount(2) in _isys.umount (#493333)
+  (dcantrell)
+- Add doPwUmount() and mountCommandWrapper() to isys (#493333) (dcantrell)
+- Preserve symlinks and only collect deps on ELF executables. (dcantrell)
+- Use $(ARCHIVE_TAG) throughout the updates target. (dcantrell)
+- partedUtils doesn't exist anymore (katzj)
+- Revert "Show the header in certain non-lowres cases" (#493153) (katzj)
+- Pre-existing partitions names may change (#494833) (hdegoede)
+- Use getDeviceNodeName() instead of basename of device node. (hdegoede)
+- Fix ks raid --useexisting and --noformat (rvykydal)
+- Fix processing of --level and --device options of ks raid commands.
+  (rvykydal)
+- Don't start pdb immediately in debug mode (katzj)
+- Fix EDD BIOS disk order detection in general and make it work with dmraid
+  (hdegoede)
+- Update extended partition geometry when we change it (hdegoede)
+
 * Tue Apr 07 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.41-1
 - Make sure we have a clean lvm ignore list when we initialize. (jgranado)
 - We need to search by name without the "mapper" prefix. (jgranado)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- sources	8 Apr 2009 03:45:44 -0000	1.766
+++ sources	9 Apr 2009 21:04:58 -0000	1.767
@@ -1 +1 @@
-5d99978597686952c69db9f332c24bf7  anaconda-11.5.0.41.tar.bz2
+6d39e6659579b995b2c9af32be740b53  anaconda-11.5.0.42.tar.bz2



From pkgdb at fedoraproject.org  Thu Apr  9 21:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:06:24 +0000
Subject: [pkgdb] debmirror was added for ruben
Message-ID: <20090409210624.8F19D10F870@bastion2.fedora.phx.redhat.com>

kevin has added Package debmirror with summary Debian partial mirror script, with ftp and package pool support
kevin has approved Package debmirror
kevin has added a Fedora devel branch for debmirror with an owner of ruben
kevin has approved debmirror in Fedora devel
kevin has approved Package debmirror
kevin has set commit to Approved for provenpackager on debmirror (Fedora devel)
kevin has set build to Approved for provenpackager on debmirror (Fedora devel)
kevin has set checkout to Approved for provenpackager on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:25 +0000
Subject: [pkgdb] debmirror (Fedora, 9) updated by kevin
Message-ID: <20090409210626.BB77510F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for debmirror
kevin has set commit to Approved for provenpackager on debmirror (Fedora 9)
kevin has set build to Approved for provenpackager on debmirror (Fedora 9)
kevin has set checkout to Approved for provenpackager on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:25 +0000
Subject: [pkgdb] debmirror (Fedora, 10) updated by kevin
Message-ID: <20090409210626.C1B5610F877@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for debmirror
kevin has set commit to Approved for provenpackager on debmirror (Fedora 10)
kevin has set build to Approved for provenpackager on debmirror (Fedora 10)
kevin has set checkout to Approved for provenpackager on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:25 +0000
Subject: [pkgdb] debmirror (Fedora EPEL, 4) updated by kevin
Message-ID: <20090409210626.CCC3110F87A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for debmirror
kevin has set commit to Approved for provenpackager on debmirror (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on debmirror (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:25 +0000
Subject: [pkgdb] debmirror (Fedora, 11) updated by kevin
Message-ID: <20090409210626.D4B2B10F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for debmirror
kevin has set commit to Approved for provenpackager on debmirror (Fedora 11)
kevin has set build to Approved for provenpackager on debmirror (Fedora 11)
kevin has set checkout to Approved for provenpackager on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From kevin at fedoraproject.org  Thu Apr  9 21:06:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:06:43 +0000 (UTC)
Subject: rpms/debmirror - New directory
Message-ID: <20090409210643.2F7907001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/debmirror
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20689/rpms/debmirror

Log Message:
Directory /cvs/pkgs/rpms/debmirror added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:06:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:06:43 +0000 (UTC)
Subject: rpms/debmirror/devel - New directory
Message-ID: <20090409210643.7B7237001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/debmirror/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20689/rpms/debmirror/devel

Log Message:
Directory /cvs/pkgs/rpms/debmirror/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 21:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:25 +0000
Subject: [pkgdb] debmirror (Fedora EPEL, 5) updated by kevin
Message-ID: <20090409210626.DE60510F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for debmirror
kevin has set commit to Approved for provenpackager on debmirror (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on debmirror (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From kevin at fedoraproject.org  Thu Apr  9 21:06:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:06:52 +0000 (UTC)
Subject: rpms/debmirror Makefile,NONE,1.1
Message-ID: <20090409210652.A102E7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/debmirror
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20689/rpms/debmirror

Added Files:
	Makefile 
Log Message:
Setup of module debmirror


--- NEW FILE Makefile ---
# Top level Makefile for module debmirror
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:06:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:06:53 +0000 (UTC)
Subject: rpms/debmirror/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409210653.2262F7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/debmirror/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20689/rpms/debmirror/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module debmirror


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: debmirror
# $Id: Makefile,v 1.1 2009/04/09 21:06:52 kevin Exp $
NAME := debmirror
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 21:08:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:08:23 +0000
Subject: [pkgdb] phoronix-test-suite was added for jsmidt
Message-ID: <20090409210725.4637310F872@bastion2.fedora.phx.redhat.com>

kevin has added Package phoronix-test-suite with summary A Comprehensive Linux Benchmarking System
kevin has approved Package phoronix-test-suite
kevin has added a Fedora devel branch for phoronix-test-suite with an owner of jsmidt
kevin has approved phoronix-test-suite in Fedora devel
kevin has approved Package phoronix-test-suite
kevin has set commit to Approved for provenpackager on phoronix-test-suite (Fedora devel)
kevin has set build to Approved for provenpackager on phoronix-test-suite (Fedora devel)
kevin has set checkout to Approved for provenpackager on phoronix-test-suite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phoronix-test-suite



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:30 +0000
Subject: [pkgdb] phoronix-test-suite (Fedora, 9) updated by kevin
Message-ID: <20090409210729.D3B1B10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for phoronix-test-suite
kevin has set commit to Approved for provenpackager on phoronix-test-suite (Fedora 9)
kevin has set build to Approved for provenpackager on phoronix-test-suite (Fedora 9)
kevin has set checkout to Approved for provenpackager on phoronix-test-suite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phoronix-test-suite



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:30 +0000
Subject: [pkgdb] phoronix-test-suite (Fedora, 10) updated by kevin
Message-ID: <20090409210729.E014D10F878@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for phoronix-test-suite
kevin has set commit to Approved for provenpackager on phoronix-test-suite (Fedora 10)
kevin has set build to Approved for provenpackager on phoronix-test-suite (Fedora 10)
kevin has set checkout to Approved for provenpackager on phoronix-test-suite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phoronix-test-suite



From pkgdb at fedoraproject.org  Thu Apr  9 21:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:07:30 +0000
Subject: [pkgdb] phoronix-test-suite (Fedora, 11) updated by kevin
Message-ID: <20090409210729.E91DC10F87B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for phoronix-test-suite
kevin has set commit to Approved for provenpackager on phoronix-test-suite (Fedora 11)
kevin has set build to Approved for provenpackager on phoronix-test-suite (Fedora 11)
kevin has set checkout to Approved for provenpackager on phoronix-test-suite (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phoronix-test-suite



From kevin at fedoraproject.org  Thu Apr  9 21:07:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:07:40 +0000 (UTC)
Subject: rpms/phoronix-test-suite - New directory
Message-ID: <20090409210740.2D1897001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/phoronix-test-suite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21193/rpms/phoronix-test-suite

Log Message:
Directory /cvs/pkgs/rpms/phoronix-test-suite added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:07:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:07:40 +0000 (UTC)
Subject: rpms/phoronix-test-suite/devel - New directory
Message-ID: <20090409210740.6A8DF7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/phoronix-test-suite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21193/rpms/phoronix-test-suite/devel

Log Message:
Directory /cvs/pkgs/rpms/phoronix-test-suite/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:07:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:07:48 +0000 (UTC)
Subject: rpms/phoronix-test-suite Makefile,NONE,1.1
Message-ID: <20090409210748.A576E7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/phoronix-test-suite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21193/rpms/phoronix-test-suite

Added Files:
	Makefile 
Log Message:
Setup of module phoronix-test-suite


--- NEW FILE Makefile ---
# Top level Makefile for module phoronix-test-suite
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:07:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:07:49 +0000 (UTC)
Subject: rpms/phoronix-test-suite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409210749.23F557001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/phoronix-test-suite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21193/rpms/phoronix-test-suite/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module phoronix-test-suite


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: phoronix-test-suite
# $Id: Makefile,v 1.1 2009/04/09 21:07:48 kevin Exp $
NAME := phoronix-test-suite
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 21:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:09:40 +0000
Subject: [pkgdb] libhbalinux was added for jzeleny
Message-ID: <20090409210841.9F8BC10F870@bastion2.fedora.phx.redhat.com>

kevin has added Package libhbalinux with summary HBAAPI vendor library
kevin has approved Package libhbalinux
kevin has added a Fedora devel branch for libhbalinux with an owner of jzeleny
kevin has approved libhbalinux in Fedora devel
kevin has approved Package libhbalinux
kevin has set commit to Approved for provenpackager on libhbalinux (Fedora devel)
kevin has set build to Approved for provenpackager on libhbalinux (Fedora devel)
kevin has set checkout to Approved for provenpackager on libhbalinux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhbalinux



From kevin at fedoraproject.org  Thu Apr  9 21:08:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:08:53 +0000 (UTC)
Subject: rpms/libhbalinux - New directory
Message-ID: <20090409210853.2BF477001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbalinux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21688/rpms/libhbalinux

Log Message:
Directory /cvs/pkgs/rpms/libhbalinux added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:08:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:08:53 +0000 (UTC)
Subject: rpms/libhbalinux/devel - New directory
Message-ID: <20090409210853.762E67001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbalinux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21688/rpms/libhbalinux/devel

Log Message:
Directory /cvs/pkgs/rpms/libhbalinux/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:09:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:09:02 +0000 (UTC)
Subject: rpms/libhbalinux Makefile,NONE,1.1
Message-ID: <20090409210902.62DE77001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbalinux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21688/rpms/libhbalinux

Added Files:
	Makefile 
Log Message:
Setup of module libhbalinux


--- NEW FILE Makefile ---
# Top level Makefile for module libhbalinux
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:09:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:09:02 +0000 (UTC)
Subject: rpms/libhbalinux/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409210902.A11057001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libhbalinux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21688/rpms/libhbalinux/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libhbalinux


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libhbalinux
# $Id: Makefile,v 1.1 2009/04/09 21:09:02 kevin Exp $
NAME := libhbalinux
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 21:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:10:26 +0000
Subject: [pkgdb] mantis had acl change status
Message-ID: <20090409210928.02C1B10F85E@bastion2.fedora.phx.redhat.com>

giallu has set the watchbugzilla acl on mantis (Fedora EPEL 5) to Approved for llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Thu Apr  9 21:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:10:27 +0000
Subject: [pkgdb] mantis had acl change status
Message-ID: <20090409210928.4937310F875@bastion2.fedora.phx.redhat.com>

giallu has set the commit acl on mantis (Fedora EPEL 5) to Approved for llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Thu Apr  9 21:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:09:30 +0000
Subject: [pkgdb] mantis had acl change status
Message-ID: <20090409210930.20E0D10F879@bastion2.fedora.phx.redhat.com>

giallu has set the watchcommits acl on mantis (Fedora EPEL 5) to Approved for llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mantis



From pkgdb at fedoraproject.org  Thu Apr  9 21:10:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:10:33 +0000
Subject: [pkgdb] mod_perlite was added for cweyl
Message-ID: <20090409210936.5261710F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package mod_perlite with summary Kinder, gentler embedded Perl for the Apache HTTP Server
kevin has approved Package mod_perlite
kevin has added a Fedora devel branch for mod_perlite with an owner of cweyl
kevin has approved mod_perlite in Fedora devel
kevin has approved Package mod_perlite
kevin has set commit to Approved for provenpackager on mod_perlite (Fedora devel)
kevin has set build to Approved for provenpackager on mod_perlite (Fedora devel)
kevin has set checkout to Approved for provenpackager on mod_perlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_perlite



From pkgdb at fedoraproject.org  Thu Apr  9 21:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:10:35 +0000
Subject: [pkgdb] mod_perlite (Fedora, 9) updated by kevin
Message-ID: <20090409210937.F0D0910F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mod_perlite
kevin has set commit to Approved for provenpackager on mod_perlite (Fedora 9)
kevin has set build to Approved for provenpackager on mod_perlite (Fedora 9)
kevin has set checkout to Approved for provenpackager on mod_perlite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_perlite



From pkgdb at fedoraproject.org  Thu Apr  9 21:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:10:35 +0000
Subject: [pkgdb] mod_perlite (Fedora, 10) updated by kevin
Message-ID: <20090409210938.05E2110F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mod_perlite
kevin has set commit to Approved for provenpackager on mod_perlite (Fedora 10)
kevin has set build to Approved for provenpackager on mod_perlite (Fedora 10)
kevin has set checkout to Approved for provenpackager on mod_perlite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_perlite



From kevin at fedoraproject.org  Thu Apr  9 21:09:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:09:49 +0000 (UTC)
Subject: rpms/mod_perlite - New directory
Message-ID: <20090409210949.5090670137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_perlite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22009/rpms/mod_perlite

Log Message:
Directory /cvs/pkgs/rpms/mod_perlite added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:09:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:09:49 +0000 (UTC)
Subject: rpms/mod_perlite/devel - New directory
Message-ID: <20090409210949.C843270137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_perlite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22009/rpms/mod_perlite/devel

Log Message:
Directory /cvs/pkgs/rpms/mod_perlite/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:10:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:10:00 +0000 (UTC)
Subject: rpms/mod_perlite Makefile,NONE,1.1
Message-ID: <20090409211000.391FF70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_perlite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22009/rpms/mod_perlite

Added Files:
	Makefile 
Log Message:
Setup of module mod_perlite


--- NEW FILE Makefile ---
# Top level Makefile for module mod_perlite
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:10:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:10:00 +0000 (UTC)
Subject: rpms/mod_perlite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409211000.926D570137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_perlite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22009/rpms/mod_perlite/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_perlite


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mod_perlite
# $Id: Makefile,v 1.1 2009/04/09 21:10:00 kevin Exp $
NAME := mod_perlite
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kyle at fedoraproject.org  Thu Apr  9 21:10:23 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  9 Apr 2009 21:10:23 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc1-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1046, 1.1047 config-generic, 1.277, 1.278 kernel.spec, 1.1510,
	1.1511 sources, 1.1008, 1.1009 upstream, 1.919, 1.920
Message-ID: <20090409211023.1A47170137@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22097

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc1-git2.bz2.sign 
Log Message:
* Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.30-rc1-git2
- CONFIG_IGBVF=m
- CONFIG_NETFILTER_XT_TARGET_LED=m



--- NEW FILE patch-2.6.30-rc1-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ3eO7yGugalF9Dw4RAnTGAJ9JIj/N9iputoUE/vHHISbJaRKM1ACfVQZD
cQ7iSgeT7hzKzs7W3CVhDL8=
=QpK7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1046
retrieving revision 1.1047
diff -u -r1.1046 -r1.1047
--- .cvsignore	8 Apr 2009 05:16:24 -0000	1.1046
+++ .cvsignore	9 Apr 2009 21:09:52 -0000	1.1047
@@ -7,3 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc1.bz2
+patch-2.6.30-rc1-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- config-generic	9 Apr 2009 14:04:41 -0000	1.277
+++ config-generic	9 Apr 2009 21:09:52 -0000	1.278
@@ -830,6 +830,7 @@
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -1265,6 +1266,7 @@
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
 CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -r1.1510 -r1.1511
--- kernel.spec	9 Apr 2009 14:43:13 -0000	1.1510
+++ kernel.spec	9 Apr 2009 21:09:52 -0000	1.1511
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1819,6 +1819,11 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc1-git2
+- CONFIG_IGBVF=m
+- CONFIG_NETFILTER_XT_TARGET_LED=m
+
 * Thu Apr 09 2009 Dave Jones <davej at redhat.com>
 - Bring back the /dev/crash driver. (#492803)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1008
retrieving revision 1.1009
diff -u -r1.1008 -r1.1009
--- sources	8 Apr 2009 05:16:25 -0000	1.1008
+++ sources	9 Apr 2009 21:09:52 -0000	1.1009
@@ -1,2 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 05daeda25430fd13bbdb47b3481f7320  patch-2.6.30-rc1.bz2
+3de7669e5027d9372ba1804e98ab3807  patch-2.6.30-rc1-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.919
retrieving revision 1.920
diff -u -r1.919 -r1.920
--- upstream	8 Apr 2009 05:16:25 -0000	1.919
+++ upstream	9 Apr 2009 21:09:52 -0000	1.920
@@ -1,2 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc1.bz2
+patch-2.6.30-rc1-git2.bz2



From rayvd at fedoraproject.org  Thu Apr  9 21:15:35 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:15:35 +0000 (UTC)
Subject: rpms/pymssql/EL-5 .cvsignore, 1.2, 1.3 pymssql.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090409211535.282E47001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23889

Modified Files:
	.cvsignore pymssql.spec sources 
Log Message:
Rebased against 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 18:18:37 -0000	1.2
+++ .cvsignore	9 Apr 2009 21:15:04 -0000	1.3
@@ -1 +1 @@
-pymssql-0.8.0.tar.gz
+pymssql-1.0.1.tar.gz


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/pymssql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pymssql.spec	1 Oct 2008 18:18:37 -0000	1.1
+++ pymssql.spec	9 Apr 2009 21:15:04 -0000	1.2
@@ -1,29 +1,23 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pymssql.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, freetds >= 0.63
+Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
 BuildRequires:  freetds-devel >= 0.63
 BuildRequires:  python-devel >= 2.4
+BuildRequires:  python-devel < 3.0
 
 %description
-An "almost" DB-API 2.0 compliant module for access to Microsoft SQL
-servers from Python.  Features:
-
-  - Supports connecting to Microsoft SQL 2000 and SQL 2005 servers, all
-    editions and service pack levels (see also FAQ / Troubleshooting
-    page).
-  - Supports named instances and non-standard port numbers.
-  - Great performance: it uses MS SQL DB-Library for C instead of Win32
-    ODBC.
-  - Multiple Query/Multiple Result.
+pymssql is the Python language extension module that provides access to
+Microsoft SQL Servers from Python scripts. It is compliant with Python
+DB-API 2.0 Specification.
 
 %prep
 %setup -q
@@ -42,10 +36,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.freetds ChangeLog TODO
+%doc README lgpl.txt ChangeLog TODO
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
+- Rebased against upstream (#492802)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.0-3
+- Rebuild for Python 2.6
+
 * Wed Aug 20 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 0.8.0-2
 - Fixed some CRLF's in text files.
 - Added python-devel BuildReq


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2008 18:18:37 -0000	1.2
+++ sources	9 Apr 2009 21:15:04 -0000	1.3
@@ -1 +1 @@
-1526315e20f55a6c74c86d6ca0ce07c4  pymssql-0.8.0.tar.gz
+afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz



From rayvd at fedoraproject.org  Thu Apr  9 21:17:44 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:17:44 +0000 (UTC)
Subject: rpms/pymssql/F-9 .cvsignore, 1.2, 1.3 pymssql.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090409211744.52BE97001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24439

Modified Files:
	.cvsignore pymssql.spec sources 
Log Message:
Rebased against 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 17:38:28 -0000	1.2
+++ .cvsignore	9 Apr 2009 21:17:13 -0000	1.3
@@ -1 +1 @@
-pymssql-0.8.0.tar.gz
+pymssql-1.0.1.tar.gz


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-9/pymssql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pymssql.spec	1 Oct 2008 17:38:28 -0000	1.1
+++ pymssql.spec	9 Apr 2009 21:17:13 -0000	1.2
@@ -1,29 +1,23 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pymssql.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, freetds >= 0.63
+Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
 BuildRequires:  freetds-devel >= 0.63
 BuildRequires:  python-devel >= 2.4
+BuildRequires:  python-devel < 3.0
 
 %description
-An "almost" DB-API 2.0 compliant module for access to Microsoft SQL
-servers from Python.  Features:
-
-  - Supports connecting to Microsoft SQL 2000 and SQL 2005 servers, all
-    editions and service pack levels (see also FAQ / Troubleshooting
-    page).
-  - Supports named instances and non-standard port numbers.
-  - Great performance: it uses MS SQL DB-Library for C instead of Win32
-    ODBC.
-  - Multiple Query/Multiple Result.
+pymssql is the Python language extension module that provides access to
+Microsoft SQL Servers from Python scripts. It is compliant with Python
+DB-API 2.0 Specification.
 
 %prep
 %setup -q
@@ -42,10 +36,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.freetds ChangeLog TODO
+%doc README lgpl.txt ChangeLog TODO
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
+- Rebased against upstream (#492802)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.0-3
+- Rebuild for Python 2.6
+
 * Wed Aug 20 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 0.8.0-2
 - Fixed some CRLF's in text files.
 - Added python-devel BuildReq


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2008 17:38:28 -0000	1.2
+++ sources	9 Apr 2009 21:17:13 -0000	1.3
@@ -1 +1 @@
-1526315e20f55a6c74c86d6ca0ce07c4  pymssql-0.8.0.tar.gz
+afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz



From rayvd at fedoraproject.org  Thu Apr  9 21:19:30 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:19:30 +0000 (UTC)
Subject: rpms/pymssql/F-10 .cvsignore, 1.2, 1.3 pymssql.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090409211930.2D7367001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24798

Modified Files:
	.cvsignore pymssql.spec sources 
Log Message:
Rebased against 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 16:53:31 -0000	1.2
+++ .cvsignore	9 Apr 2009 21:18:59 -0000	1.3
@@ -1 +1 @@
-pymssql-0.8.0.tar.gz
+pymssql-1.0.1.tar.gz


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-10/pymssql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pymssql.spec	1 Oct 2008 16:49:18 -0000	1.1
+++ pymssql.spec	9 Apr 2009 21:18:59 -0000	1.2
@@ -1,29 +1,23 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pymssql.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, freetds >= 0.63
+Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
 BuildRequires:  freetds-devel >= 0.63
 BuildRequires:  python-devel >= 2.4
+BuildRequires:  python-devel < 3.0
 
 %description
-An "almost" DB-API 2.0 compliant module for access to Microsoft SQL
-servers from Python.  Features:
-
-  - Supports connecting to Microsoft SQL 2000 and SQL 2005 servers, all
-    editions and service pack levels (see also FAQ / Troubleshooting
-    page).
-  - Supports named instances and non-standard port numbers.
-  - Great performance: it uses MS SQL DB-Library for C instead of Win32
-    ODBC.
-  - Multiple Query/Multiple Result.
+pymssql is the Python language extension module that provides access to
+Microsoft SQL Servers from Python scripts. It is compliant with Python
+DB-API 2.0 Specification.
 
 %prep
 %setup -q
@@ -42,10 +36,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.freetds ChangeLog TODO
+%doc README lgpl.txt ChangeLog TODO
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
+- Rebased against upstream (#492802)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.0-3
+- Rebuild for Python 2.6
+
 * Wed Aug 20 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 0.8.0-2
 - Fixed some CRLF's in text files.
 - Added python-devel BuildReq


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2008 16:53:31 -0000	1.2
+++ sources	9 Apr 2009 21:18:59 -0000	1.3
@@ -1 +1 @@
-1526315e20f55a6c74c86d6ca0ce07c4  pymssql-0.8.0.tar.gz
+afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz



From rayvd at fedoraproject.org  Thu Apr  9 21:21:09 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:21:09 +0000 (UTC)
Subject: rpms/pymssql/devel .cvsignore, 1.2, 1.3 pymssql.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090409212109.87E4D7001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25179

Modified Files:
	.cvsignore pymssql.spec sources 
Log Message:
Rebased against 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 16:53:31 -0000	1.2
+++ .cvsignore	9 Apr 2009 21:20:39 -0000	1.3
@@ -1 +1 @@
-pymssql-0.8.0.tar.gz
+pymssql-1.0.1.tar.gz


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/devel/pymssql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pymssql.spec	26 Feb 2009 20:15:02 -0000	1.3
+++ pymssql.spec	9 Apr 2009 21:20:39 -0000	1.4
@@ -1,29 +1,23 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        0.8.0
-Release:        4%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pymssql.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, freetds >= 0.63
+Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
 BuildRequires:  freetds-devel >= 0.63
 BuildRequires:  python-devel >= 2.4
+BuildRequires:  python-devel < 3.0
 
 %description
-An "almost" DB-API 2.0 compliant module for access to Microsoft SQL
-servers from Python.  Features:
-
-  - Supports connecting to Microsoft SQL 2000 and SQL 2005 servers, all
-    editions and service pack levels (see also FAQ / Troubleshooting
-    page).
-  - Supports named instances and non-standard port numbers.
-  - Great performance: it uses MS SQL DB-Library for C instead of Win32
-    ODBC.
-  - Multiple Query/Multiple Result.
+pymssql is the Python language extension module that provides access to
+Microsoft SQL Servers from Python scripts. It is compliant with Python
+DB-API 2.0 Specification.
 
 %prep
 %setup -q
@@ -42,10 +36,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.freetds ChangeLog TODO
+%doc README lgpl.txt ChangeLog TODO
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
+- Rebased against upstream (#492802)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2008 16:53:31 -0000	1.2
+++ sources	9 Apr 2009 21:20:39 -0000	1.3
@@ -1 +1 @@
-1526315e20f55a6c74c86d6ca0ce07c4  pymssql-0.8.0.tar.gz
+afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz



From pjones at fedoraproject.org  Thu Apr  9 21:23:46 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu,  9 Apr 2009 21:23:46 +0000 (UTC)
Subject: rpms/grub/devel grub.spec,1.93,1.94
Message-ID: <20090409212346.83A8B7001C@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25951

Modified Files:
	grub.spec 
Log Message:
* Thu Apr 09 2009 Peter Jones <pjones at redhat.com>
- remove test message Re: using network drive or not.



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- grub.spec	9 Apr 2009 20:31:49 -0000	1.93
+++ grub.spec	9 Apr 2009 21:23:16 -0000	1.94
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 47%{?dist}
+Release: 48%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -126,7 +126,7 @@
 %{_datadir}/grub
 
 %changelog
-* Thu Apr 09 2009 Peter Jones <pjones at redhat.com>
+* Thu Apr 09 2009 Peter Jones <pjones at redhat.com> - 0.97-48
 - remove test message Re: using network drive or not.
 
 * Tue Apr 07 2009 Peter Jones <pjones at redhat.com> - 0.97-47



From jakub at fedoraproject.org  Thu Apr  9 21:24:13 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  9 Apr 2009 21:24:13 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.268, 1.269 glibc-fedora.patch, 1.301,
	1.302 glibc.spec, 1.390, 1.391 import.log, 1.12, 1.13 sources,
	1.293, 1.294
Message-ID: <20090409212413.DEDA17001C@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26048/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- .cvsignore	8 Apr 2009 16:46:29 -0000	1.268
+++ .cvsignore	9 Apr 2009 21:23:43 -0000	1.269
@@ -1,2 +1,2 @@
-glibc-20090408T1602.tar.bz2
-glibc-fedora-20090408T1602.tar.bz2
+glibc-20090409T1422.tar.bz2
+glibc-fedora-20090409T1422.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- glibc-fedora.patch	8 Apr 2009 16:46:29 -0000	1.301
+++ glibc-fedora.patch	9 Apr 2009 21:23:43 -0000	1.302
@@ -1,6 +1,6 @@
---- glibc-20090408T1602/ChangeLog	7 Apr 2009 23:21:15 -0000	1.11575
-+++ glibc-20090408T1602-fedora/ChangeLog	8 Apr 2009 16:24:12 -0000	1.8782.2.326
-@@ -7143,6 +7143,13 @@
+--- glibc-20090409T1422/ChangeLog	9 Apr 2009 05:45:03 -0000	1.11578
++++ glibc-20090409T1422-fedora/ChangeLog	9 Apr 2009 20:46:29 -0000	1.8782.2.327
+@@ -7156,6 +7156,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7438,6 +7445,10 @@
+@@ -7451,6 +7458,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8695,6 +8706,15 @@
+@@ -8708,6 +8719,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090408T1602/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090408T1602-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090409T1422/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090409T1422-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090408T1602/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090408T1602-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090409T1422/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090409T1422-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090408T1602/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090408T1602-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090409T1422/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090409T1422-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090408T1602/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090408T1602-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090409T1422/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090409T1422-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090408T1602/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090408T1602-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090409T1422/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090409T1422-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090408T1602/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090408T1602-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090409T1422/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090409T1422-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090408T1602/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090408T1602-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090409T1422/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090409T1422-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090408T1602/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090408T1602-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090409T1422/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090409T1422-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090408T1602/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090409T1422/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090408T1602/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090409T1422/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090408T1602/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090408T1602-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090409T1422/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090409T1422-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090408T1602/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090408T1602-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090409T1422/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090409T1422-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090408T1602/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090408T1602-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090409T1422/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090409T1422-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090408T1602/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090408T1602-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090409T1422/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090409T1422-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090408T1602/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090408T1602-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090409T1422/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090409T1422-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090408T1602/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090408T1602-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090409T1422/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090409T1422-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090408T1602/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090408T1602-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090409T1422/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090409T1422-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090408T1602/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090408T1602-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090409T1422/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090409T1422-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090408T1602/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090409T1422/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090408T1602/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090408T1602-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090409T1422/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090409T1422-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090408T1602/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090408T1602-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090409T1422/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090409T1422-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090408T1602/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090408T1602-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090409T1422/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090409T1422-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090408T1602/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090408T1602-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090409T1422/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090409T1422-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090408T1602/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090408T1602-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090409T1422/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090409T1422-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090408T1602/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090408T1602-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090409T1422/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090409T1422-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090408T1602/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090408T1602-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090409T1422/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090409T1422-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090408T1602/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090408T1602-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090409T1422/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090409T1422-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090408T1602/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090409T1422/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090408T1602/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090408T1602-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090409T1422/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090409T1422-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090408T1602/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090408T1602-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090409T1422/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090409T1422-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090408T1602/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090408T1602-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090409T1422/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090409T1422-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090408T1602/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090408T1602-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090409T1422/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090409T1422-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090408T1602/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090409T1422/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090408T1602/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090408T1602-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090409T1422/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090409T1422-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090408T1602/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090408T1602-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090409T1422/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090409T1422-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090408T1602/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090408T1602-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090409T1422/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090409T1422-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090408T1602/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090408T1602-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090409T1422/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090409T1422-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090408T1602/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090408T1602-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090409T1422/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090409T1422-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090408T1602/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090409T1422/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090408T1602/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090408T1602-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090409T1422/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090409T1422-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090408T1602/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090408T1602-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090409T1422/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090409T1422-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090408T1602/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090408T1602-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090409T1422/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- glibc.spec	8 Apr 2009 16:46:29 -0000	1.390
+++ glibc.spec	9 Apr 2009 21:23:43 -0000	1.391
@@ -1,6 +1,6 @@
-%define glibcdate 20090408T1602
+%define glibcdate 20090409T1422
 %define glibcname glibc
-%define glibcsrcdir glibc-20090408T1602
+%define glibcsrcdir glibc-20090409T1422
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 14
+Release: 15
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -233,6 +233,31 @@
 %endif
 %endif
 
+mkdir -p override_headers/asm
+cat > override_headers/asm/unistd.h <<EOF
+#ifndef _HACK_ASM_UNISTD_H
+#include_next <asm/unistd.h>
+%ifarch %{ix86}
+#ifndef __NR_preadv
+#define __NR_preadv	333
+#define __NR_pwritev	334
+#endif
+%endif
+%ifarch x86_64
+#ifndef __NR_preadv
+#define __NR_preadv	295
+#define __NR_pwritev	296
+#endif
+%endif
+%ifarch ppc ppc64
+#ifndef __NR_preadv
+#define __NR_preadv	320
+#define __NR_pwritev	321
+#endif
+%endif
+#endif
+EOF
+
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
 # all.
@@ -321,10 +346,10 @@
 build_CFLAGS="$BuildFlags -g -O3 $*"
 CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \
 	--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
-	--with-headers=%{_prefix}/include --enable-bind-now \
+	--with-headers=`cd ..; pwd`/override_headers:%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
-	--disable-profile --enable-nss-crypt
+	--disable-profile --enable-experimental-malloc --enable-nss-crypt
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1013,6 +1038,10 @@
 %endif
 
 %changelog
+* Thu Apr  9 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-15
+- rebuilt with fixed gcc to avoid miscompilation of i586 memmove
+- reenable experimental malloc again
+
 * Wed Apr  8 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-14
 - update from trunk
 - temporarily disable experimental malloc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	8 Apr 2009 16:46:29 -0000	1.12
+++ import.log	9 Apr 2009 21:23:43 -0000	1.13
@@ -10,3 +10,4 @@
 glibc-2_9_90-12:HEAD:glibc-2.9.90-12.src.rpm:1238582344
 glibc-2_9_90-13:HEAD:glibc-2.9.90-13.src.rpm:1239089921
 glibc-2_9_90-14:HEAD:glibc-2.9.90-14.src.rpm:1239208984
+glibc-2_9_90-15:HEAD:glibc-2.9.90-15.src.rpm:1239312092


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- sources	8 Apr 2009 16:46:29 -0000	1.293
+++ sources	9 Apr 2009 21:23:43 -0000	1.294
@@ -1,2 +1,2 @@
-fe12ad86f88488bb23967ef0916a6e0e  glibc-20090408T1602.tar.bz2
-b01897b3107a0903c8391c86a37e7329  glibc-fedora-20090408T1602.tar.bz2
+fb01a4679a2798a87b11da62ceaa6473  glibc-20090409T1422.tar.bz2
+45983fa985d5e8590a6cfa0ad681a261  glibc-fedora-20090409T1422.tar.bz2



From rayvd at fedoraproject.org  Thu Apr  9 21:25:10 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:25:10 +0000 (UTC)
Subject: rpms/pymssql/EL-5 pymssql.spec,1.2,1.3
Message-ID: <20090409212510.3E8F87001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26371

Modified Files:
	pymssql.spec 
Log Message:
Workaround for broken plague on buildsys


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/pymssql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pymssql.spec	9 Apr 2009 21:15:04 -0000	1.2
+++ pymssql.spec	9 Apr 2009 21:24:40 -0000	1.3
@@ -11,8 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
 BuildRequires:  freetds-devel >= 0.63
-BuildRequires:  python-devel >= 2.4
-BuildRequires:  python-devel < 3.0
+BuildRequires:  python-devel
 
 %description
 pymssql is the Python language extension module that provides access to



From pkgdb at fedoraproject.org  Thu Apr  9 21:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:13 +0000
Subject: [pkgdb] subdownloader was added for hpejakle
Message-ID: <20090409212514.A3FAE10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package subdownloader with summary Program to download movie subtitles
kevin has approved Package subdownloader
kevin has added a Fedora devel branch for subdownloader with an owner of hpejakle
kevin has approved subdownloader in Fedora devel
kevin has approved Package subdownloader
kevin has set commit to Approved for provenpackager on subdownloader (Fedora devel)
kevin has set build to Approved for provenpackager on subdownloader (Fedora devel)
kevin has set checkout to Approved for provenpackager on subdownloader (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subdownloader



From pkgdb at fedoraproject.org  Thu Apr  9 21:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:14 +0000
Subject: [pkgdb] subdownloader (Fedora, 10) updated by kevin
Message-ID: <20090409212517.2831F10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for subdownloader
kevin has set commit to Approved for provenpackager on subdownloader (Fedora 10)
kevin has set build to Approved for provenpackager on subdownloader (Fedora 10)
kevin has set checkout to Approved for provenpackager on subdownloader (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subdownloader



From pkgdb at fedoraproject.org  Thu Apr  9 21:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:14 +0000
Subject: [pkgdb] subdownloader (Fedora, 11) updated by kevin
Message-ID: <20090409212517.3679010F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for subdownloader
kevin has set commit to Approved for provenpackager on subdownloader (Fedora 11)
kevin has set build to Approved for provenpackager on subdownloader (Fedora 11)
kevin has set checkout to Approved for provenpackager on subdownloader (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subdownloader



From kevin at fedoraproject.org  Thu Apr  9 21:25:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:25:27 +0000 (UTC)
Subject: rpms/subdownloader - New directory
Message-ID: <20090409212527.2F5E67001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/subdownloader
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT26524/rpms/subdownloader

Log Message:
Directory /cvs/pkgs/rpms/subdownloader added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 21:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:14 +0000
Subject: [pkgdb] subdownloader (Fedora, 9) updated by kevin
Message-ID: <20090409212517.3F24610F879@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for subdownloader
kevin has set commit to Approved for provenpackager on subdownloader (Fedora 9)
kevin has set build to Approved for provenpackager on subdownloader (Fedora 9)
kevin has set checkout to Approved for provenpackager on subdownloader (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subdownloader



From kevin at fedoraproject.org  Thu Apr  9 21:25:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:25:27 +0000 (UTC)
Subject: rpms/subdownloader/devel - New directory
Message-ID: <20090409212527.6FF1E7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT26524/rpms/subdownloader/devel

Log Message:
Directory /cvs/pkgs/rpms/subdownloader/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:25:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:25:35 +0000 (UTC)
Subject: rpms/subdownloader Makefile,NONE,1.1
Message-ID: <20090409212535.E35057001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/subdownloader
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT26524/rpms/subdownloader

Added Files:
	Makefile 
Log Message:
Setup of module subdownloader


--- NEW FILE Makefile ---
# Top level Makefile for module subdownloader
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:25:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:25:36 +0000 (UTC)
Subject: rpms/subdownloader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409212536.306107001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT26524/rpms/subdownloader/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module subdownloader


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: subdownloader
# $Id: Makefile,v 1.1 2009/04/09 21:25:36 kevin Exp $
NAME := subdownloader
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 21:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:27:24 +0000
Subject: [pkgdb] shntool was added for heffer
Message-ID: <20090409212625.EBE8910F862@bastion2.fedora.phx.redhat.com>

kevin has added Package shntool with summary A multi-purpose WAVE data processing and reporting utility
kevin has approved Package shntool
kevin has added a Fedora devel branch for shntool with an owner of heffer
kevin has approved shntool in Fedora devel
kevin has approved Package shntool
kevin has set commit to Approved for provenpackager on shntool (Fedora devel)
kevin has set build to Approved for provenpackager on shntool (Fedora devel)
kevin has set checkout to Approved for provenpackager on shntool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shntool



From pkgdb at fedoraproject.org  Thu Apr  9 21:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:31 +0000
Subject: [pkgdb] shntool (Fedora, 10) updated by kevin
Message-ID: <20090409212632.C344D10F862@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for shntool
kevin has set commit to Approved for provenpackager on shntool (Fedora 10)
kevin has set build to Approved for provenpackager on shntool (Fedora 10)
kevin has set checkout to Approved for provenpackager on shntool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shntool



From pkgdb at fedoraproject.org  Thu Apr  9 21:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:31 +0000
Subject: [pkgdb] shntool (Fedora, 9) updated by kevin
Message-ID: <20090409212632.CAE5D10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for shntool
kevin has set commit to Approved for provenpackager on shntool (Fedora 9)
kevin has set build to Approved for provenpackager on shntool (Fedora 9)
kevin has set checkout to Approved for provenpackager on shntool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shntool



From kevin at fedoraproject.org  Thu Apr  9 21:26:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:26:35 +0000 (UTC)
Subject: rpms/shntool - New directory
Message-ID: <20090409212635.258387001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shntool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR26933/rpms/shntool

Log Message:
Directory /cvs/pkgs/rpms/shntool added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 21:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 21:26:31 +0000
Subject: [pkgdb] shntool (Fedora, 11) updated by kevin
Message-ID: <20090409212632.D37D810F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for shntool
kevin has set commit to Approved for provenpackager on shntool (Fedora 11)
kevin has set build to Approved for provenpackager on shntool (Fedora 11)
kevin has set checkout to Approved for provenpackager on shntool (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shntool



From kevin at fedoraproject.org  Thu Apr  9 21:26:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:26:43 +0000 (UTC)
Subject: rpms/shntool Makefile,NONE,1.1
Message-ID: <20090409212643.E4F817001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shntool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR26933/rpms/shntool

Added Files:
	Makefile 
Log Message:
Setup of module shntool


--- NEW FILE Makefile ---
# Top level Makefile for module shntool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 21:26:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:26:35 +0000 (UTC)
Subject: rpms/shntool/devel - New directory
Message-ID: <20090409212635.5E3A17001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shntool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR26933/rpms/shntool/devel

Log Message:
Directory /cvs/pkgs/rpms/shntool/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 21:26:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 21:26:44 +0000 (UTC)
Subject: rpms/shntool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090409212644.350737001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shntool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR26933/rpms/shntool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shntool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shntool
# $Id: Makefile,v 1.1 2009/04/09 21:26:44 kevin Exp $
NAME := shntool
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ruben at fedoraproject.org  Thu Apr  9 21:27:00 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Thu,  9 Apr 2009 21:27:00 +0000 (UTC)
Subject: rpms/debmirror/devel debmirror.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409212700.7244E7001C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26879/devel

Modified Files:
	.cvsignore sources 
Added Files:
	debmirror.spec import.log 
Log Message:
Initial import



--- NEW FILE debmirror.spec ---
Name:		debmirror
Version:	20070123
Release:	8%{?dist}
Summary:	Debian partial mirror script, with ftp and package pool support

Group:		Applications/Internet
License:	GPL+
URL:		http://packages.qa.debian.org/d/%{name}.html
Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	patch, ed, gnupg, rsync, coreutils, findutils, gzip, bzip2

%description
This program downloads and maintains a partial local Debian mirror.
It can mirror any combination of architectures, distributions and
sections. Files are transferred by ftp, http, hftp or rsync, and package
pools are fully supported. It also does locking and updates trace files.


%prep
%setup -q

# filter file dependency on debmirror.conf
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/\/etc\/debmirror.conf/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build

%install
rm -rf %{buildroot}

%{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf

# generate a man page
%{__install} -d %{buildroot}%{_mandir}/man1
pod2man %{name} %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
%{_mandir}/man1/%{name}.1.gz
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf


%changelog
* Thu Apr 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-8
- Use GPL+ as license
- Use main debian url for Source

* Wed Apr 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-7
- Change url to a page with more content
- Use %%{name} macro

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-6
- Generate a man page from the source
- Add explicit Requires on system commands used

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-5
- Package cleanup for review

* Sat Nov  1 2008 Javier palacios <javiplx at gmail.com>
- 20070123-2
- Added suggestions from the review process

* Sat Oct 11 2008 Javier palacios <javiplx at gmail.com>
- 20070123-1
- First release



--- NEW FILE import.log ---
debmirror-20070123-8_fc11:HEAD:debmirror-20070123-8.fc11.src.rpm:1239311795


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:06:52 -0000	1.1
+++ .cvsignore	9 Apr 2009 21:26:30 -0000	1.2
@@ -0,0 +1 @@
+debmirror_20070123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:06:52 -0000	1.1
+++ sources	9 Apr 2009 21:26:30 -0000	1.2
@@ -0,0 +1 @@
+e89d7b8aae00fbf0743b2cd6bc99d746  debmirror_20070123.tar.gz



From kyle at fedoraproject.org  Thu Apr  9 21:28:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  9 Apr 2009 21:28:52 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1511,1.1512
Message-ID: <20090409212852.2C6327001C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27560

Modified Files:
	kernel.spec 
Log Message:
* Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
- actually drop utrace-ftrace from srpm.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1511
retrieving revision 1.1512
diff -u -r1.1511 -r1.1512
--- kernel.spec	9 Apr 2009 21:09:52 -0000	1.1511
+++ kernel.spec	9 Apr 2009 21:28:21 -0000	1.1512
@@ -589,7 +589,6 @@
 
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
-Patch23: linux-2.6-utrace-ftrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
@@ -1820,6 +1819,9 @@
 #	                ||     ||
 %changelog
 * Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
+- actually drop utrace-ftrace from srpm.
+
+* Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.30-rc1-git2
 - CONFIG_IGBVF=m
 - CONFIG_NETFILTER_XT_TARGET_LED=m



From rayvd at fedoraproject.org  Thu Apr  9 21:32:24 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:32:24 +0000 (UTC)
Subject: rpms/pymssql/EL-5 pymssql.spec,1.3,1.4
Message-ID: <20090409213224.A63E87001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28424

Modified Files:
	pymssql.spec 
Log Message:
Workaround #2 for broken plague on buildsys


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/pymssql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pymssql.spec	9 Apr 2009 21:24:40 -0000	1.3
+++ pymssql.spec	9 Apr 2009 21:31:54 -0000	1.4
@@ -10,7 +10,7 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
-BuildRequires:  freetds-devel >= 0.63
+BuildRequires:  freetds-devel
 BuildRequires:  python-devel
 
 %description



From rayvd at fedoraproject.org  Thu Apr  9 21:43:09 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:43:09 +0000 (UTC)
Subject: rpms/pymssql/EL-5 pymssql.spec,1.4,1.5
Message-ID: <20090409214309.194167001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31730

Modified Files:
	pymssql.spec 
Log Message:
New version to avoid buildsys caching


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/pymssql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pymssql.spec	9 Apr 2009 21:31:54 -0000	1.4
+++ pymssql.spec	9 Apr 2009 21:42:38 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           pymssql
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -39,6 +39,10 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
+- De-versioned Build Requirements to work around 
+  https://fedorahosted.org/fedora-infrastructure/ticket/1202
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
 - Rebased against upstream (#492802)
 



From rayvd at fedoraproject.org  Thu Apr  9 21:50:50 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:50:50 +0000 (UTC)
Subject: rpms/pymssql/devel pymssql.spec,1.4,1.5
Message-ID: <20090409215050.CD1CB7001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1587

Modified Files:
	pymssql.spec 
Log Message:
plague issue


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/devel/pymssql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pymssql.spec	9 Apr 2009 21:20:39 -0000	1.4
+++ pymssql.spec	9 Apr 2009 21:50:49 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           pymssql
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -10,9 +10,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
-BuildRequires:  freetds-devel >= 0.63
-BuildRequires:  python-devel >= 2.4
-BuildRequires:  python-devel < 3.0
+BuildRequires:  freetds-devel
+BuildRequires:  python-devel
 
 %description
 pymssql is the Python language extension module that provides access to
@@ -40,6 +39,10 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
+- De-versioned Build Requirements to work around 
+  https://fedorahosted.org/fedora-infrastructure/ticket/1202
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
 - Rebased against upstream (#492802)
 



From rayvd at fedoraproject.org  Thu Apr  9 21:51:56 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:51:56 +0000 (UTC)
Subject: rpms/pymssql/F-10 pymssql.spec,1.2,1.3
Message-ID: <20090409215156.C8A677001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1958

Modified Files:
	pymssql.spec 
Log Message:
plague issue


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-10/pymssql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pymssql.spec	9 Apr 2009 21:18:59 -0000	1.2
+++ pymssql.spec	9 Apr 2009 21:51:26 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pymssql
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -10,9 +10,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
-BuildRequires:  freetds-devel >= 0.63
-BuildRequires:  python-devel >= 2.4
-BuildRequires:  python-devel < 3.0
+BuildRequires:  freetds-devel
+BuildRequires:  python-devel
 
 %description
 pymssql is the Python language extension module that provides access to
@@ -40,6 +39,10 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
+- De-versioned Build Requirements to work around 
+  https://fedorahosted.org/fedora-infrastructure/ticket/1202
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
 - Rebased against upstream (#492802)
 



From rayvd at fedoraproject.org  Thu Apr  9 21:53:21 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:53:21 +0000 (UTC)
Subject: rpms/pymssql/F-9 pymssql.spec,1.2,1.3
Message-ID: <20090409215321.0AA0A7001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2310

Modified Files:
	pymssql.spec 
Log Message:
plague issue


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-9/pymssql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pymssql.spec	9 Apr 2009 21:17:13 -0000	1.2
+++ pymssql.spec	9 Apr 2009 21:52:50 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pymssql
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -10,9 +10,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       python >= 2.4, python < 3.0, freetds >= 0.63
-BuildRequires:  freetds-devel >= 0.63
-BuildRequires:  python-devel >= 2.4
-BuildRequires:  python-devel < 3.0
+BuildRequires:  freetds-devel
+BuildRequires:  python-devel
 
 %description
 pymssql is the Python language extension module that provides access to
@@ -40,6 +39,10 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
+- De-versioned Build Requirements to work around 
+  https://fedorahosted.org/fedora-infrastructure/ticket/1202
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-1
 - Rebased against upstream (#492802)
 



From rayvd at fedoraproject.org  Thu Apr  9 21:57:34 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 21:57:34 +0000 (UTC)
Subject: rpms/pyodbc/EL-5 pyodbc.spec,1.5,1.6
Message-ID: <20090409215734.F0CA87001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3353

Modified Files:
	pyodbc.spec 
Log Message:
Changes for plague


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/EL-5/pyodbc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pyodbc.spec	23 Feb 2009 15:54:18 -0000	1.5
+++ pyodbc.spec	9 Apr 2009 21:57:04 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -12,8 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       unixODBC, python >= 2.4
 BuildRequires:  unixODBC-devel
-BuildRequires:  python >= 2.4
-BuildRequires:  python-devel >= 2.4
+BuildRequires:  python-devel
 
 %description
 A Python DB API 2 module for ODBC. This project provides an up-to-date, 
@@ -40,7 +39,10 @@
 %{python_sitearch}/*
 
 %changelog
-* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Removing versioned BuildRequires
+
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
 - Changes for plague
 
 * Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3



From ausil at fedoraproject.org  Thu Apr  9 22:03:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  9 Apr 2009 22:03:25 +0000 (UTC)
Subject: rpms/gmp/devel gmp-4.2.4-no-host-target-check.patch, NONE,
	1.1 gmp.spec, 1.58, 1.59
Message-ID: <20090409220325.3050C7001C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4476

Modified Files:
	gmp.spec 
Added Files:
	gmp-4.2.4-no-host-target-check.patch 
Log Message:
Remove check for --hot and --target matching when building i586 or sparcv9 they are not the same



gmp-4.2.4-no-host-target-check.patch:

--- NEW FILE gmp-4.2.4-no-host-target-check.patch ---
--- gmp-4.2.4/configure.in.BAD	2009-04-09 16:57:17.000000000 -0500
+++ gmp-4.2.4/configure.in	2009-04-09 16:57:49.000000000 -0500
@@ -36,18 +36,6 @@
 m4_pattern_allow(GMP_NAIL_BITS)
 m4_pattern_allow(GMP_NUMB_BITS)
 
-# If --target is not used then $target_alias is empty, but if say
-# "./configure athlon-pc-freebsd3.5" is used, then all three of
-# $build_alias, $host_alias and $target_alias are set to
-# "athlon-pc-freebsd3.5".
-#
-if test -n "$target_alias" && test "$target_alias" != "$host_alias"; then
-  AC_MSG_ERROR([--target is not appropriate for GMP
-Use --build=CPU-VENDOR-OS if you need to specify your CPU and/or system
-explicitly.  Use --host if cross-compiling (see "Installing GMP" in the
-manual for more on this).])
-fi
-
 GMP_INIT(config.m4)
 
 AC_CANONICAL_HOST


Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gmp.spec	24 Feb 2009 22:25:22 -0000	1.58
+++ gmp.spec	9 Apr 2009 22:02:54 -0000	1.59
@@ -6,12 +6,13 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
 Source3: gmp-mparam.h
 Patch0: gmp-4.0.1-s390.patch
+Patch1: gmp-4.2.4-no-host-target-check.patch
 License: LGPLv3+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .s390
+%patch1 -p1 -b .no-host-target
 
 %build
 autoreconf -if
@@ -196,6 +198,9 @@
 
 
 %changelog
+* Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 4.2.4-6
+- no check that --host and --target are the same when building i586  or sparcv9 they are not
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jakub at fedoraproject.org  Thu Apr  9 22:04:05 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  9 Apr 2009 22:04:05 +0000 (UTC)
Subject: rpms/glibc/devel glibc.spec,1.391,1.392
Message-ID: <20090409220405.ECD5C7001C@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4799

Modified Files:
	glibc.spec 
Log Message:
2.9.90-15


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- glibc.spec	9 Apr 2009 21:23:43 -0000	1.391
+++ glibc.spec	9 Apr 2009 22:03:35 -0000	1.392
@@ -233,31 +233,6 @@
 %endif
 %endif
 
-mkdir -p override_headers/asm
-cat > override_headers/asm/unistd.h <<EOF
-#ifndef _HACK_ASM_UNISTD_H
-#include_next <asm/unistd.h>
-%ifarch %{ix86}
-#ifndef __NR_preadv
-#define __NR_preadv	333
-#define __NR_pwritev	334
-#endif
-%endif
-%ifarch x86_64
-#ifndef __NR_preadv
-#define __NR_preadv	295
-#define __NR_pwritev	296
-#endif
-%endif
-%ifarch ppc ppc64
-#ifndef __NR_preadv
-#define __NR_preadv	320
-#define __NR_pwritev	321
-#endif
-%endif
-#endif
-EOF
-
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
 # all.
@@ -346,7 +321,7 @@
 build_CFLAGS="$BuildFlags -g -O3 $*"
 CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \
 	--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
-	--with-headers=`cd ..; pwd`/override_headers:%{_prefix}/include --enable-bind-now \
+	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt



From rayvd at fedoraproject.org  Thu Apr  9 22:05:50 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 22:05:50 +0000 (UTC)
Subject: rpms/pyodbc/devel pyodbc.spec,1.6,1.7
Message-ID: <20090409220550.A51567001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5345

Modified Files:
	pyodbc.spec 
Log Message:
Changes for plague


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/devel/pyodbc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pyodbc.spec	26 Feb 2009 20:15:53 -0000	1.6
+++ pyodbc.spec	9 Apr 2009 22:05:20 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -10,8 +10,9 @@
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
 Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, unixODBC
-BuildRequires:  unixODBC-devel, python-devel >= 2.4
+Requires:       unixODBC, python >= 2.4
+BuildRequires:  unixODBC-devel
+BuildRequires:  python-devel
 
 %description
 A Python DB API 2 module for ODBC. This project provides an up-to-date, 
@@ -38,8 +39,14 @@
 %{python_sitearch}/*
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Removing versioned BuildRequires
+
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- Changes for plague
+
+* Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Removed extraneous Requires
 
 * Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-2
 - Added README.rst file from git repo



From rayvd at fedoraproject.org  Thu Apr  9 22:07:01 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 22:07:01 +0000 (UTC)
Subject: rpms/pyodbc/F-10 pyodbc.spec,1.2,1.3
Message-ID: <20090409220701.631B07001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5727

Modified Files:
	pyodbc.spec 
Log Message:
Changes for plague


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-10/pyodbc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyodbc.spec	4 Dec 2008 04:29:38 -0000	1.2
+++ pyodbc.spec	9 Apr 2009 22:06:31 -0000	1.3
@@ -1,16 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.1
-Release:        1%{?dist}
+Version:        2.1.4
+Release:        5%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
+Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, unixODBC
-BuildRequires:  unixODBC-devel, python-devel >= 2.4
+Requires:       unixODBC, python >= 2.4
+BuildRequires:  unixODBC-devel
+BuildRequires:  python-devel
 
 %description
 A Python DB API 2 module for ODBC. This project provides an up-to-date, 
@@ -26,16 +28,32 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt LICENSE.txt
+%doc LICENSE.txt README.rst
 %{python_sitearch}/*
 
 %changelog
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Removing versioned BuildRequires
+
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- Changes for plague
+
+* Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Removed extraneous Requires
+
+* Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-2
+- Added README.rst file from git repo
+
+* Wed Jan 07 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-1
+- Upstream released 2.1.4
+
 * Mon Dec 03 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.1-1
 - New upstream version and homepage
 



From rayvd at fedoraproject.org  Thu Apr  9 22:08:21 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu,  9 Apr 2009 22:08:21 +0000 (UTC)
Subject: rpms/pyodbc/F-9 pyodbc.spec,1.2,1.3
Message-ID: <20090409220822.28CDF7001C@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6157

Modified Files:
	pyodbc.spec 
Log Message:
Changes for plague


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-9/pyodbc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyodbc.spec	4 Dec 2008 04:31:57 -0000	1.2
+++ pyodbc.spec	9 Apr 2009 22:07:50 -0000	1.3
@@ -1,16 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.1
-Release:        1%{?dist}
+Version:        2.1.4
+Release:        5%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
+Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       python >= 2.4, unixODBC
-BuildRequires:  unixODBC-devel, python-devel >= 2.4
+Requires:       unixODBC, python >= 2.4
+BuildRequires:  unixODBC-devel
+BuildRequires:  python-devel
 
 %description
 A Python DB API 2 module for ODBC. This project provides an up-to-date, 
@@ -26,16 +28,32 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt LICENSE.txt
+%doc LICENSE.txt README.rst
 %{python_sitearch}/*
 
 %changelog
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
+- Removing versioned BuildRequires
+
+* Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- Changes for plague
+
+* Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Removed extraneous Requires
+
+* Sun Feb 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-2
+- Added README.rst file from git repo
+
+* Wed Jan 07 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-1
+- Upstream released 2.1.4
+
 * Mon Dec 03 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.1-1
 - New upstream version and homepage
 



From hadess at fedoraproject.org  Thu Apr  9 22:19:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  9 Apr 2009 22:19:36 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.12,
	1.13 gnome-bluetooth.spec, 1.70, 1.71 sources, 1.13, 1.14
Message-ID: <20090409221936.BC78A7001C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9163

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Thu Apr 09 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.3-1
- Update to 2.27.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Apr 2009 17:06:00 -0000	1.12
+++ .cvsignore	9 Apr 2009 22:19:06 -0000	1.13
@@ -1 +1 @@
-gnome-bluetooth-2.27.2.tar.bz2
+gnome-bluetooth-2.27.3.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gnome-bluetooth.spec	8 Apr 2009 19:00:18 -0000	1.70
+++ gnome-bluetooth.spec	9 Apr 2009 22:19:06 -0000	1.71
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.27.2
-Release:	2%{?dist}
+Version:	2.27.3
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -61,9 +61,6 @@
 %prep
 %setup -q -n gnome-bluetooth-%{version}
 
-# http://svn.gnome.org/viewvc/gnome-bluetooth?view=revision&revision=587
-sed -i -e "s/boolean/bool/" */*.schemas.in
-
 %build
 %configure --disable-desktop-update --disable-icon-update
 make %{?_smp_mflags}
@@ -161,6 +158,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Thu Apr 09 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.3-1
+- Update to 2.27.3
+
 * Wed Apr 08 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.2-2
 - Fix schema installation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	8 Apr 2009 17:06:00 -0000	1.13
+++ sources	9 Apr 2009 22:19:06 -0000	1.14
@@ -1 +1 @@
-cbcc67dcf2205dd187dc368952c7edd2  gnome-bluetooth-2.27.2.tar.bz2
+541e8c554ccd801f372d42f786b8becb  gnome-bluetooth-2.27.3.tar.bz2



From wwoods at fedoraproject.org  Thu Apr  9 22:22:12 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu,  9 Apr 2009 22:22:12 +0000 (UTC)
Subject: rpms/python-bugzilla/devel .cvsignore, 1.8, 1.9 python-bugzilla.spec,
	1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20090409222212.0C7597001C@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9982

Modified Files:
	.cvsignore python-bugzilla.spec sources 
Log Message:
0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Mar 2009 16:54:29 -0000	1.8
+++ .cvsignore	9 Apr 2009 22:21:41 -0000	1.9
@@ -1 +1 @@
-python-bugzilla-0.5.tar.bz2
+python-bugzilla-0.5.1.tar.bz2


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/python-bugzilla.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-bugzilla.spec	25 Mar 2009 16:54:29 -0000	1.11
+++ python-bugzilla.spec	9 Apr 2009 22:21:41 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-bugzilla
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
@@ -52,6 +52,13 @@
 
 
 %changelog
+* Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
+- CLI: fix unicode handling
+- CLI: add --from-url flag, which parses a bugzilla query.cgi URL
+- CLI: fix showing aliases
+- CLI: add --comment, --private, --status, --assignee, --flag, --cc for update
+- CLI: fix --target_milestone
+
 * Wed Mar 25 2009 Will Woods <wwoods at redhat.com> - 0.5-1
 - Fix problem where login wasn't saving the cookies to a file 
 - Fix openattachment (bug #487673)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Mar 2009 16:54:29 -0000	1.9
+++ sources	9 Apr 2009 22:21:41 -0000	1.10
@@ -1 +1 @@
-a8df50421db1dfe97cf1d0d1be6d13d8  python-bugzilla-0.5.tar.bz2
+767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2



From wwoods at fedoraproject.org  Thu Apr  9 22:24:43 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu,  9 Apr 2009 22:24:43 +0000 (UTC)
Subject: rpms/python-bugzilla/F-9 python-bugzilla.spec, 1.4, 1.5 sources, 1.4,
	1.5
Message-ID: <20090409222443.22B1B7001C@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10549/F-9

Modified Files:
	python-bugzilla.spec sources 
Log Message:
0.5.1


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-9/python-bugzilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-bugzilla.spec	25 Mar 2009 16:57:18 -0000	1.4
+++ python-bugzilla.spec	9 Apr 2009 22:24:40 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-bugzilla
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
@@ -52,6 +52,13 @@
 
 
 %changelog
+* Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
+- CLI: fix unicode handling
+- CLI: add --from-url flag, which parses a bugzilla query.cgi URL
+- CLI: fix showing aliases
+- CLI: add --comment, --private, --status, --assignee, --flag, --cc for update
+- CLI: fix --target_milestone
+
 * Wed Mar 25 2009 Will Woods <wwoods at redhat.com> - 0.5-1
 - Fix problem where login wasn't saving the cookies to a file 
 - Fix openattachment (bug #487673)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Mar 2009 16:57:18 -0000	1.4
+++ sources	9 Apr 2009 22:24:40 -0000	1.5
@@ -1 +1 @@
-a8df50421db1dfe97cf1d0d1be6d13d8  python-bugzilla-0.5.tar.bz2
+767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2



From wwoods at fedoraproject.org  Thu Apr  9 22:25:09 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu,  9 Apr 2009 22:25:09 +0000 (UTC)
Subject: rpms/python-bugzilla/EL-5 python-bugzilla.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090409222509.6504F7001C@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10549/EL-5

Modified Files:
	python-bugzilla.spec sources 
Log Message:
0.5.1


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/EL-5/python-bugzilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-bugzilla.spec	25 Mar 2009 16:57:18 -0000	1.4
+++ python-bugzilla.spec	9 Apr 2009 22:24:34 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-bugzilla
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
@@ -52,6 +52,13 @@
 
 
 %changelog
+* Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
+- CLI: fix unicode handling
+- CLI: add --from-url flag, which parses a bugzilla query.cgi URL
+- CLI: fix showing aliases
+- CLI: add --comment, --private, --status, --assignee, --flag, --cc for update
+- CLI: fix --target_milestone
+
 * Wed Mar 25 2009 Will Woods <wwoods at redhat.com> - 0.5-1
 - Fix problem where login wasn't saving the cookies to a file 
 - Fix openattachment (bug #487673)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Mar 2009 16:57:18 -0000	1.4
+++ sources	9 Apr 2009 22:24:35 -0000	1.5
@@ -1 +1 @@
-a8df50421db1dfe97cf1d0d1be6d13d8  python-bugzilla-0.5.tar.bz2
+767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2



From wwoods at fedoraproject.org  Thu Apr  9 22:25:11 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu,  9 Apr 2009 22:25:11 +0000 (UTC)
Subject: rpms/python-bugzilla/F-10 python-bugzilla.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20090409222511.34B107001C@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10549/F-10

Modified Files:
	python-bugzilla.spec sources 
Log Message:
0.5.1


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-10/python-bugzilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-bugzilla.spec	25 Mar 2009 16:57:18 -0000	1.8
+++ python-bugzilla.spec	9 Apr 2009 22:24:37 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-bugzilla
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
@@ -52,6 +52,13 @@
 
 
 %changelog
+* Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
+- CLI: fix unicode handling
+- CLI: add --from-url flag, which parses a bugzilla query.cgi URL
+- CLI: fix showing aliases
+- CLI: add --comment, --private, --status, --assignee, --flag, --cc for update
+- CLI: fix --target_milestone
+
 * Wed Mar 25 2009 Will Woods <wwoods at redhat.com> - 0.5-1
 - Fix problem where login wasn't saving the cookies to a file 
 - Fix openattachment (bug #487673)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Mar 2009 16:57:18 -0000	1.8
+++ sources	9 Apr 2009 22:24:38 -0000	1.9
@@ -1 +1 @@
-a8df50421db1dfe97cf1d0d1be6d13d8  python-bugzilla-0.5.tar.bz2
+767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2



From caolanm at fedoraproject.org  Thu Apr  9 22:29:36 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  9 Apr 2009 22:29:36 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch, 1.2, 1.3
Message-ID: <20090409222936.E697A7001C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12083

Modified Files:
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
Log Message:
final cut

openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch:

Index: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	9 Apr 2009 19:45:48 -0000	1.2
+++ openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	9 Apr 2009 22:29:36 -0000	1.3
@@ -5,12 +5,21 @@
 diff -u -r1.39.114.1 enhwmf.cxx
 --- openoffice.org.orig/svtools/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
 +++ openoffice.org/svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
+@@ -337,7 +337,7 @@
+ 				*pWMF >> nPoly >> i;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
 @@ -378,7 +378,7 @@
  				// Anzahl der Polygone:
  				*pWMF >> nPoly >> nGesPoints;
  
 -				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
-+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
  				{
  					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
  					{
@@ -36,12 +45,30 @@
  						}
  						delete[] pnPoints;
  					}
+@@ -977,7 +977,7 @@
+ 				DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) == 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
+ 
+ 				Point aPos( ptlReferenceX, ptlReferenceY );
+-				if ( nLen && ( nLen < SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
++				if ( nLen && ( nLen < SAL_MAX_SIZE / sizeof(sal_Int32) ) )
+ 				{
+ 					if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= nNextPos ) )
+ 					{
+@@ -1111,7 +1111,7 @@
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
 @@ -1147,7 +1147,7 @@
  				pWMF->SeekRel( 0x10 );
  				// Anzahl der Polygone:
  				*pWMF >> nPoly >> nGesPoints;
 -				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
-+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
  				{
  					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
  					{



From svahl at fedoraproject.org  Thu Apr  9 22:30:46 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Thu,  9 Apr 2009 22:30:46 +0000 (UTC)
Subject: rpms/roxterm/devel .cvsignore, 1.14, 1.15 roxterm.spec, 1.13,
	1.14 sources, 1.14, 1.15
Message-ID: <20090409223046.2231E7001C@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12916

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.1-1
- new upstream version: 1.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	2 Dec 2008 09:58:52 -0000	1.14
+++ .cvsignore	9 Apr 2009 22:30:43 -0000	1.15
@@ -1 +1 @@
-roxterm-1.13.0.tar.gz
+roxterm-1.14.1.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/roxterm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- roxterm.spec	25 Feb 2009 20:22:58 -0000	1.13
+++ roxterm.spec	9 Apr 2009 22:30:43 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           roxterm
-Version:        1.13.0
-Release:        2%{?dist}
+Version:        1.14.1
+Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
 Group:          User Interface/X
@@ -72,6 +72,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.1-1
+- new upstream version: 1.14.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	2 Dec 2008 09:58:52 -0000	1.14
+++ sources	9 Apr 2009 22:30:43 -0000	1.15
@@ -1 +1 @@
-5ec0918781d113181afccf454dbff236  roxterm-1.13.0.tar.gz
+906a8e98eaf84dd9f3c4c920786e2038  roxterm-1.14.1.tar.gz



From svahl at fedoraproject.org  Thu Apr  9 22:40:05 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Thu,  9 Apr 2009 22:40:05 +0000 (UTC)
Subject: rpms/grsync/devel .cvsignore, 1.4, 1.5 grsync.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20090409224005.0FA317001C@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15078

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Dec 2008 16:46:54 -0000	1.4
+++ .cvsignore	9 Apr 2009 22:39:33 -0000	1.5
@@ -1 +1 @@
-grsync-0.6.2.tar.gz
+grsync-0.6.3.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/grsync.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grsync.spec	25 Feb 2009 01:14:53 -0000	1.6
+++ grsync.spec	9 Apr 2009 22:39:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grsync
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-1
+- new upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Dec 2008 16:46:54 -0000	1.4
+++ sources	9 Apr 2009 22:39:33 -0000	1.5
@@ -1 +1 @@
-5470c87807738ce9a5623c9bbefaff85  grsync-0.6.2.tar.gz
+6c368560e349ddc7ff00124338074a48  grsync-0.6.3.tar.gz



From jsmidt at fedoraproject.org  Thu Apr  9 22:45:14 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Thu,  9 Apr 2009 22:45:14 +0000 (UTC)
Subject: rpms/phoronix-test-suite/devel README.Fedora, NONE, 1.1 import.log, 
	NONE, 1.1 phoronix-test-suite.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090409224514.777C47001C@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16301/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log phoronix-test-suite.spec 
Log Message:
Initial import into Fedora for devel



--- NEW FILE README.Fedora ---
The Fedora Project only advocates the use of free software.  For more
information on the Fedora Project's commitment to software freedom see
http://fedoraproject.org/wiki/Foundations.  For a detailed summary of what
software Fedora considers free see https://fedoraproject.org/wiki/Licensing.

The Phoronix Test Suite (PTS) is free software that runs benchmark tests on
your system. The vast majority of the tests only involve free software.
However, some of the tests PTS can be called upon to run involve non-free
software.  To find out which tests are non-free run: phoronix-test-suite
list-tests.  

Below is a list of known tests involving non-free software which PTS can run:

etqw-demo          - ET: Quake Wars Demo                [VERIFIED,   NON-FREE]
lightsmark         - Lightsmark                         [VERIFIED,   NON-FREE]
super-pi           - Super PI                           [VERIFIED,   NON-FREE]
unigine-sanctuary  - Unigine Sanctuary                  [VERIFIED,   NON-FREE]
unigine-tropics    - Unigine Tropics                    [VERIFIED,   NON-FREE]
ut2004-demo        - Unreal Tournament 2004 Demo        [VERIFIED,   NON-FREE]
fgl-glxgears       - ATI fgl_glxgears                   [VERIFIED, RESTRICTED]


--- NEW FILE import.log ---
phoronix-test-suite-1_8_0-1_fc10:HEAD:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239316867


--- NEW FILE phoronix-test-suite.spec ---
Name:       phoronix-test-suite
Version:    1.8.0
Release:    1%{?dist}
Summary:    A Comprehensive Linux Benchmarking System

Group:      Applications/Publishing	
License:    GPLv3+
URL:        http://phoronix-test-suite.com/
Source0:    http://www.%{name}.com/releases/%{name}-%{version}.tar.gz
Source1:    README.Fedora
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:  noarch

Requires: php-cli
Requires: freeglut-devel
Requires: tcsh
Requires: libpng-devel
Requires: gcc gcc-c++
Requires: xorg-x11-server-devel
Requires: bison
Requires: flex
Requires: imlib2-devel
Requires: java-openjdk
Requires: portaudio-devel
Requires: gcc-gfortran
Requires: glew-devel
Requires: freeimage 
Requires: freeimage-devel
Requires: scons
Requires: zlib-devel
Requires: libjpeg-devel
Requires: libaio-devel
Requires: perl perl-SDL
Requires: libXv-devel libXvMC-devel
Requires: compat-libstdc++-33
Requires: openal openal-devel
Requires: taglib-devel
Requires: jam
Requires: qt4-devel
Requires: autoconf
Requires: make
Requires: libtool

%description
The Phoronix Test Suite is the most comprehensive testing and benchmarking 
platform available for Linux and is designed to carry out qualitative and 
quantitative benchmarks in a clean, reproducible, and easy-to-use manner.

%prep
%setup -q -n %{name}
cp -p %{SOURCE1} $RPM_BUILD_DIR/%{name}/documentation/

%build
# Nothing needed here

%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_DIR/%{name}/install-sh $RPM_BUILD_ROOT/%{_prefix}
sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_bindir}/phoronix-test-suite

chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/pts/distro-scripts/install-pclinuxos-packages.sh

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name} 
%{_datadir}/%{name}/*
%{_datadir}/icons/*
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog

* Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
- New upstream release

* Thu Mar 26 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-4
- Changed GPLv3 to GPLv3+
- Set mode of dummy_script_module.sh to 755
- Included README.Fedora to explain non-free PTS tests

* Sat Mar 21 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-3
- Added full dependencies

* Tue Mar 3 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-2
- Removed explicite-lib dependencies

* Sun Feb 22 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-1
- Added full path to online source code.
- Added BuildArch: noarch
- Added an empty %%build section

* Sat Feb 14 2009 Joseph Smidt <fedoraproject.org> 1.6.0-0
- Initial RPM Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:07:48 -0000	1.1
+++ .cvsignore	9 Apr 2009 22:44:43 -0000	1.2
@@ -0,0 +1 @@
+phoronix-test-suite-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:07:48 -0000	1.1
+++ sources	9 Apr 2009 22:44:44 -0000	1.2
@@ -0,0 +1 @@
+59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz



From jsmidt at fedoraproject.org  Thu Apr  9 22:47:32 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Thu,  9 Apr 2009 22:47:32 +0000 (UTC)
Subject: rpms/phoronix-test-suite/F-11 README.Fedora, NONE, 1.1 import.log, 
	NONE, 1.1 phoronix-test-suite.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090409224732.670527001C@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17442/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log phoronix-test-suite.spec 
Log Message:
Initial Import into Fedora for F-11



--- NEW FILE README.Fedora ---
The Fedora Project only advocates the use of free software.  For more
information on the Fedora Project's commitment to software freedom see
http://fedoraproject.org/wiki/Foundations.  For a detailed summary of what
software Fedora considers free see https://fedoraproject.org/wiki/Licensing.

The Phoronix Test Suite (PTS) is free software that runs benchmark tests on
your system. The vast majority of the tests only involve free software.
However, some of the tests PTS can be called upon to run involve non-free
software.  To find out which tests are non-free run: phoronix-test-suite
list-tests.  

Below is a list of known tests involving non-free software which PTS can run:

etqw-demo          - ET: Quake Wars Demo                [VERIFIED,   NON-FREE]
lightsmark         - Lightsmark                         [VERIFIED,   NON-FREE]
super-pi           - Super PI                           [VERIFIED,   NON-FREE]
unigine-sanctuary  - Unigine Sanctuary                  [VERIFIED,   NON-FREE]
unigine-tropics    - Unigine Tropics                    [VERIFIED,   NON-FREE]
ut2004-demo        - Unreal Tournament 2004 Demo        [VERIFIED,   NON-FREE]
fgl-glxgears       - ATI fgl_glxgears                   [VERIFIED, RESTRICTED]


--- NEW FILE import.log ---
phoronix-test-suite-1_8_0-1_fc10:F-11:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239317024


--- NEW FILE phoronix-test-suite.spec ---
Name:       phoronix-test-suite
Version:    1.8.0
Release:    1%{?dist}
Summary:    A Comprehensive Linux Benchmarking System

Group:      Applications/Publishing	
License:    GPLv3+
URL:        http://phoronix-test-suite.com/
Source0:    http://www.%{name}.com/releases/%{name}-%{version}.tar.gz
Source1:    README.Fedora
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:  noarch

Requires: php-cli
Requires: freeglut-devel
Requires: tcsh
Requires: libpng-devel
Requires: gcc gcc-c++
Requires: xorg-x11-server-devel
Requires: bison
Requires: flex
Requires: imlib2-devel
Requires: java-openjdk
Requires: portaudio-devel
Requires: gcc-gfortran
Requires: glew-devel
Requires: freeimage 
Requires: freeimage-devel
Requires: scons
Requires: zlib-devel
Requires: libjpeg-devel
Requires: libaio-devel
Requires: perl perl-SDL
Requires: libXv-devel libXvMC-devel
Requires: compat-libstdc++-33
Requires: openal openal-devel
Requires: taglib-devel
Requires: jam
Requires: qt4-devel
Requires: autoconf
Requires: make
Requires: libtool

%description
The Phoronix Test Suite is the most comprehensive testing and benchmarking 
platform available for Linux and is designed to carry out qualitative and 
quantitative benchmarks in a clean, reproducible, and easy-to-use manner.

%prep
%setup -q -n %{name}
cp -p %{SOURCE1} $RPM_BUILD_DIR/%{name}/documentation/

%build
# Nothing needed here

%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_DIR/%{name}/install-sh $RPM_BUILD_ROOT/%{_prefix}
sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_bindir}/phoronix-test-suite

chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/pts/distro-scripts/install-pclinuxos-packages.sh

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name} 
%{_datadir}/%{name}/*
%{_datadir}/icons/*
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog

* Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
- New upstream release

* Thu Mar 26 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-4
- Changed GPLv3 to GPLv3+
- Set mode of dummy_script_module.sh to 755
- Included README.Fedora to explain non-free PTS tests

* Sat Mar 21 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-3
- Added full dependencies

* Tue Mar 3 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-2
- Removed explicite-lib dependencies

* Sun Feb 22 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-1
- Added full path to online source code.
- Added BuildArch: noarch
- Added an empty %%build section

* Sat Feb 14 2009 Joseph Smidt <fedoraproject.org> 1.6.0-0
- Initial RPM Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:07:48 -0000	1.1
+++ .cvsignore	9 Apr 2009 22:47:01 -0000	1.2
@@ -0,0 +1 @@
+phoronix-test-suite-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:07:48 -0000	1.1
+++ sources	9 Apr 2009 22:47:01 -0000	1.2
@@ -0,0 +1 @@
+59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz



From jsmidt at fedoraproject.org  Thu Apr  9 22:56:03 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Thu,  9 Apr 2009 22:56:03 +0000 (UTC)
Subject: rpms/phoronix-test-suite/F-10 README.Fedora, NONE, 1.1 import.log, 
	NONE, 1.1 phoronix-test-suite.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090409225603.367C57001C@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18064/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log phoronix-test-suite.spec 
Log Message:
Initial Import for Fedora F-10



--- NEW FILE README.Fedora ---
The Fedora Project only advocates the use of free software.  For more
information on the Fedora Project's commitment to software freedom see
http://fedoraproject.org/wiki/Foundations.  For a detailed summary of what
software Fedora considers free see https://fedoraproject.org/wiki/Licensing.

The Phoronix Test Suite (PTS) is free software that runs benchmark tests on
your system. The vast majority of the tests only involve free software.
However, some of the tests PTS can be called upon to run involve non-free
software.  To find out which tests are non-free run: phoronix-test-suite
list-tests.  

Below is a list of known tests involving non-free software which PTS can run:

etqw-demo          - ET: Quake Wars Demo                [VERIFIED,   NON-FREE]
lightsmark         - Lightsmark                         [VERIFIED,   NON-FREE]
super-pi           - Super PI                           [VERIFIED,   NON-FREE]
unigine-sanctuary  - Unigine Sanctuary                  [VERIFIED,   NON-FREE]
unigine-tropics    - Unigine Tropics                    [VERIFIED,   NON-FREE]
ut2004-demo        - Unreal Tournament 2004 Demo        [VERIFIED,   NON-FREE]
fgl-glxgears       - ATI fgl_glxgears                   [VERIFIED, RESTRICTED]


--- NEW FILE import.log ---
phoronix-test-suite-1_8_0-1_fc10:F-10:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239317153


--- NEW FILE phoronix-test-suite.spec ---
Name:       phoronix-test-suite
Version:    1.8.0
Release:    1%{?dist}
Summary:    A Comprehensive Linux Benchmarking System

Group:      Applications/Publishing	
License:    GPLv3+
URL:        http://phoronix-test-suite.com/
Source0:    http://www.%{name}.com/releases/%{name}-%{version}.tar.gz
Source1:    README.Fedora
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:  noarch

Requires: php-cli
Requires: freeglut-devel
Requires: tcsh
Requires: libpng-devel
Requires: gcc gcc-c++
Requires: xorg-x11-server-devel
Requires: bison
Requires: flex
Requires: imlib2-devel
Requires: java-openjdk
Requires: portaudio-devel
Requires: gcc-gfortran
Requires: glew-devel
Requires: freeimage 
Requires: freeimage-devel
Requires: scons
Requires: zlib-devel
Requires: libjpeg-devel
Requires: libaio-devel
Requires: perl perl-SDL
Requires: libXv-devel libXvMC-devel
Requires: compat-libstdc++-33
Requires: openal openal-devel
Requires: taglib-devel
Requires: jam
Requires: qt4-devel
Requires: autoconf
Requires: make
Requires: libtool

%description
The Phoronix Test Suite is the most comprehensive testing and benchmarking 
platform available for Linux and is designed to carry out qualitative and 
quantitative benchmarks in a clean, reproducible, and easy-to-use manner.

%prep
%setup -q -n %{name}
cp -p %{SOURCE1} $RPM_BUILD_DIR/%{name}/documentation/

%build
# Nothing needed here

%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_DIR/%{name}/install-sh $RPM_BUILD_ROOT/%{_prefix}
sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_bindir}/phoronix-test-suite

chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/pts/distro-scripts/install-pclinuxos-packages.sh

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name} 
%{_datadir}/%{name}/*
%{_datadir}/icons/*
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog

* Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
- New upstream release

* Thu Mar 26 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-4
- Changed GPLv3 to GPLv3+
- Set mode of dummy_script_module.sh to 755
- Included README.Fedora to explain non-free PTS tests

* Sat Mar 21 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-3
- Added full dependencies

* Tue Mar 3 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-2
- Removed explicite-lib dependencies

* Sun Feb 22 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-1
- Added full path to online source code.
- Added BuildArch: noarch
- Added an empty %%build section

* Sat Feb 14 2009 Joseph Smidt <fedoraproject.org> 1.6.0-0
- Initial RPM Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:07:48 -0000	1.1
+++ .cvsignore	9 Apr 2009 22:55:31 -0000	1.2
@@ -0,0 +1 @@
+phoronix-test-suite-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:07:48 -0000	1.1
+++ sources	9 Apr 2009 22:55:31 -0000	1.2
@@ -0,0 +1 @@
+59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz



From jsmidt at fedoraproject.org  Thu Apr  9 22:57:44 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Thu,  9 Apr 2009 22:57:44 +0000 (UTC)
Subject: rpms/phoronix-test-suite/F-9 README.Fedora, NONE, 1.1 import.log,
	NONE, 1.1 phoronix-test-suite.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090409225744.4559E7001C@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19559/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log phoronix-test-suite.spec 
Log Message:
Initial import for Fedora F-9



--- NEW FILE README.Fedora ---
The Fedora Project only advocates the use of free software.  For more
information on the Fedora Project's commitment to software freedom see
http://fedoraproject.org/wiki/Foundations.  For a detailed summary of what
software Fedora considers free see https://fedoraproject.org/wiki/Licensing.

The Phoronix Test Suite (PTS) is free software that runs benchmark tests on
your system. The vast majority of the tests only involve free software.
However, some of the tests PTS can be called upon to run involve non-free
software.  To find out which tests are non-free run: phoronix-test-suite
list-tests.  

Below is a list of known tests involving non-free software which PTS can run:

etqw-demo          - ET: Quake Wars Demo                [VERIFIED,   NON-FREE]
lightsmark         - Lightsmark                         [VERIFIED,   NON-FREE]
super-pi           - Super PI                           [VERIFIED,   NON-FREE]
unigine-sanctuary  - Unigine Sanctuary                  [VERIFIED,   NON-FREE]
unigine-tropics    - Unigine Tropics                    [VERIFIED,   NON-FREE]
ut2004-demo        - Unreal Tournament 2004 Demo        [VERIFIED,   NON-FREE]
fgl-glxgears       - ATI fgl_glxgears                   [VERIFIED, RESTRICTED]


--- NEW FILE import.log ---
phoronix-test-suite-1_8_0-1_fc10:F-9:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239317663


--- NEW FILE phoronix-test-suite.spec ---
Name:       phoronix-test-suite
Version:    1.8.0
Release:    1%{?dist}
Summary:    A Comprehensive Linux Benchmarking System

Group:      Applications/Publishing	
License:    GPLv3+
URL:        http://phoronix-test-suite.com/
Source0:    http://www.%{name}.com/releases/%{name}-%{version}.tar.gz
Source1:    README.Fedora
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:  noarch

Requires: php-cli
Requires: freeglut-devel
Requires: tcsh
Requires: libpng-devel
Requires: gcc gcc-c++
Requires: xorg-x11-server-devel
Requires: bison
Requires: flex
Requires: imlib2-devel
Requires: java-openjdk
Requires: portaudio-devel
Requires: gcc-gfortran
Requires: glew-devel
Requires: freeimage 
Requires: freeimage-devel
Requires: scons
Requires: zlib-devel
Requires: libjpeg-devel
Requires: libaio-devel
Requires: perl perl-SDL
Requires: libXv-devel libXvMC-devel
Requires: compat-libstdc++-33
Requires: openal openal-devel
Requires: taglib-devel
Requires: jam
Requires: qt4-devel
Requires: autoconf
Requires: make
Requires: libtool

%description
The Phoronix Test Suite is the most comprehensive testing and benchmarking 
platform available for Linux and is designed to carry out qualitative and 
quantitative benchmarks in a clean, reproducible, and easy-to-use manner.

%prep
%setup -q -n %{name}
cp -p %{SOURCE1} $RPM_BUILD_DIR/%{name}/documentation/

%build
# Nothing needed here

%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_DIR/%{name}/install-sh $RPM_BUILD_ROOT/%{_prefix}
sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_bindir}/phoronix-test-suite

chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/pts/distro-scripts/install-pclinuxos-packages.sh

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name} 
%{_datadir}/%{name}/*
%{_datadir}/icons/*
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*


%changelog

* Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
- New upstream release

* Thu Mar 26 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-4
- Changed GPLv3 to GPLv3+
- Set mode of dummy_script_module.sh to 755
- Included README.Fedora to explain non-free PTS tests

* Sat Mar 21 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-3
- Added full dependencies

* Tue Mar 3 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-2
- Removed explicite-lib dependencies

* Sun Feb 22 2009 Joseph Smidt <josephsmidt at gmail.com> 1.6.0-1
- Added full path to online source code.
- Added BuildArch: noarch
- Added an empty %%build section

* Sat Feb 14 2009 Joseph Smidt <fedoraproject.org> 1.6.0-0
- Initial RPM Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:07:48 -0000	1.1
+++ .cvsignore	9 Apr 2009 22:57:13 -0000	1.2
@@ -0,0 +1 @@
+phoronix-test-suite-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:07:48 -0000	1.1
+++ sources	9 Apr 2009 22:57:13 -0000	1.2
@@ -0,0 +1 @@
+59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz



From svahl at fedoraproject.org  Thu Apr  9 23:04:00 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Thu,  9 Apr 2009 23:04:00 +0000 (UTC)
Subject: rpms/grsync/devel grsync.spec,1.7,1.8
Message-ID: <20090409230400.193607001C@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20968

Modified Files:
	grsync.spec 
Log Message:
* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-2
- BR: intltool



Index: grsync.spec
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/grsync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grsync.spec	9 Apr 2009 22:39:33 -0000	1.7
+++ grsync.spec	9 Apr 2009 23:03:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           grsync
 Version:        0.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
+BuildRequires:  intltool
 
 %description
 Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-2
+- BR: intltool
+
 * Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-1
 - new upstream release
 



From pkgdb at fedoraproject.org  Thu Apr  9 23:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:12:22 +0000
Subject: [pkgdb] pidgin-latex was added for jussilehtola
Message-ID: <20090409231123.C30BC10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package pidgin-latex with summary Use LaTeX formulas in your pidgin conversations
kevin has approved Package pidgin-latex
kevin has added a Fedora devel branch for pidgin-latex with an owner of jussilehtola
kevin has approved pidgin-latex in Fedora devel
kevin has approved Package pidgin-latex
kevin has set commit to Approved for provenpackager on pidgin-latex (Fedora devel)
kevin has set build to Approved for provenpackager on pidgin-latex (Fedora devel)
kevin has set checkout to Approved for provenpackager on pidgin-latex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-latex



From pkgdb at fedoraproject.org  Thu Apr  9 23:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:12:27 +0000
Subject: [pkgdb] pidgin-latex (Fedora, 10) updated by kevin
Message-ID: <20090409231128.DCFDF10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pidgin-latex
kevin has set commit to Approved for provenpackager on pidgin-latex (Fedora 10)
kevin has set build to Approved for provenpackager on pidgin-latex (Fedora 10)
kevin has set checkout to Approved for provenpackager on pidgin-latex (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-latex



From pkgdb at fedoraproject.org  Thu Apr  9 23:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:12:27 +0000
Subject: [pkgdb] pidgin-latex (Fedora, 11) updated by kevin
Message-ID: <20090409231129.19D0F10F874@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pidgin-latex
kevin has set commit to Approved for provenpackager on pidgin-latex (Fedora 11)
kevin has set build to Approved for provenpackager on pidgin-latex (Fedora 11)
kevin has set checkout to Approved for provenpackager on pidgin-latex (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-latex



From pkgdb at fedoraproject.org  Thu Apr  9 23:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:12:27 +0000
Subject: [pkgdb] pidgin-latex (Fedora EPEL, 5) updated by kevin
Message-ID: <20090409231129.3444B10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pidgin-latex
kevin has set commit to Approved for provenpackager on pidgin-latex (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pidgin-latex (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pidgin-latex (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-latex



From kevin at fedoraproject.org  Thu Apr  9 23:11:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:11:49 +0000 (UTC)
Subject: rpms/pidgin-latex - New directory
Message-ID: <20090409231149.5580E7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-latex
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23228/rpms/pidgin-latex

Log Message:
Directory /cvs/pkgs/rpms/pidgin-latex added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:11:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:11:49 +0000 (UTC)
Subject: rpms/pidgin-latex/devel - New directory
Message-ID: <20090409231149.9705D70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-latex/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23228/rpms/pidgin-latex/devel

Log Message:
Directory /cvs/pkgs/rpms/pidgin-latex/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:11:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:11:59 +0000 (UTC)
Subject: rpms/pidgin-latex Makefile,NONE,1.1
Message-ID: <20090409231159.D3C3F7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-latex
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23228/rpms/pidgin-latex

Added Files:
	Makefile 
Log Message:
Setup of module pidgin-latex


--- NEW FILE Makefile ---
# Top level Makefile for module pidgin-latex
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 23:12:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:12:00 +0000 (UTC)
Subject: rpms/pidgin-latex/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409231200.30CD17001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-latex/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23228/rpms/pidgin-latex/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pidgin-latex


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pidgin-latex
# $Id: Makefile,v 1.1 2009/04/09 23:12:00 kevin Exp $
NAME := pidgin-latex
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cheekyboinc at fedoraproject.org  Thu Apr  9 23:12:42 2009
From: cheekyboinc at fedoraproject.org (Stefan Posdzich)
Date: Thu,  9 Apr 2009 23:12:42 +0000 (UTC)
Subject: rpms/npush/devel npush.spec,1.3,1.4
Message-ID: <20090409231242.14BB17001C@cvs1.fedora.phx.redhat.com>

Author: cheekyboinc

Update of /cvs/pkgs/rpms/npush/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23158

Modified Files:
	npush.spec 
Log Message:
Fix Bug 485363



Index: npush.spec
===================================================================
RCS file: /cvs/pkgs/rpms/npush/devel/npush.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- npush.spec	26 Feb 2009 06:02:59 -0000	1.3
+++ npush.spec	9 Apr 2009 23:12:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		npush
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A logic game similar to Sokoban
 
 Group:		Amusements/Games
@@ -45,6 +45,7 @@
 
 # desktop file stuff
 desktop-file-install --vendor="fedora" \
+	--add-category="LogicGame" \
 	--delete-original \
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 	%{name}.desktop
@@ -83,6 +84,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Fri Apr 10 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.7-3
+- Fix Bug #485363
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Apr  9 23:13:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:13:41 +0000
Subject: [pkgdb] mingw32-pangomm was added for sailer
Message-ID: <20090409231243.D35FA10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-pangomm with summary MinGW Windows C++ interface for Pango
kevin has approved Package mingw32-pangomm
kevin has added a Fedora devel branch for mingw32-pangomm with an owner of sailer
kevin has approved mingw32-pangomm in Fedora devel
kevin has approved Package mingw32-pangomm
kevin has set commit to Approved for provenpackager on mingw32-pangomm (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-pangomm (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-pangomm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pangomm



From pkgdb at fedoraproject.org  Thu Apr  9 23:12:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:12:48 +0000
Subject: [pkgdb] mingw32-pangomm (Fedora, devel) updated by kevin
Message-ID: <20090409231248.8E1BB10F874@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-pangomm (Fedora devel) for rjones
kevin approved watchcommits on mingw32-pangomm (Fedora devel) for rjones
kevin approved commit on mingw32-pangomm (Fedora devel) for rjones
kevin approved build on mingw32-pangomm (Fedora devel) for rjones
kevin approved approveacls on mingw32-pangomm (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pangomm



From pkgdb at fedoraproject.org  Thu Apr  9 23:12:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:12:48 +0000
Subject: [pkgdb] mingw32-pangomm (Fedora, 10) updated by kevin
Message-ID: <20090409231249.61ED010F878@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-pangomm
kevin has set commit to Approved for provenpackager on mingw32-pangomm (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-pangomm (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-pangomm (Fedora 10)
kevin approved watchbugzilla on mingw32-pangomm (Fedora 10) for rjones
kevin approved watchcommits on mingw32-pangomm (Fedora 10) for rjones
kevin approved commit on mingw32-pangomm (Fedora 10) for rjones
kevin approved build on mingw32-pangomm (Fedora 10) for rjones
kevin approved approveacls on mingw32-pangomm (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pangomm



From kevin at fedoraproject.org  Thu Apr  9 23:13:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:13:04 +0000 (UTC)
Subject: rpms/mingw32-pangomm - New directory
Message-ID: <20090409231304.39C797001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pangomm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23803/rpms/mingw32-pangomm

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pangomm added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:13:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:13:04 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel - New directory
Message-ID: <20090409231304.7ABAD7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23803/rpms/mingw32-pangomm/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pangomm/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:13:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:13:15 +0000 (UTC)
Subject: rpms/mingw32-pangomm Makefile,NONE,1.1
Message-ID: <20090409231315.0C2347001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pangomm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23803/rpms/mingw32-pangomm

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-pangomm


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-pangomm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 23:13:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:13:15 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409231315.8EF357001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23803/rpms/mingw32-pangomm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-pangomm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-pangomm
# $Id: Makefile,v 1.1 2009/04/09 23:13:15 kevin Exp $
NAME := mingw32-pangomm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:13:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:13:48 +0000
Subject: [pkgdb] jmod was added for oget
Message-ID: <20090409231349.26BAE10F871@bastion2.fedora.phx.redhat.com>

kevin has added Package jmod with summary Java Sound MODules Library
kevin has approved Package jmod
kevin has added a Fedora devel branch for jmod with an owner of oget
kevin has approved jmod in Fedora devel
kevin has approved Package jmod
kevin has set commit to Approved for provenpackager on jmod (Fedora devel)
kevin has set build to Approved for provenpackager on jmod (Fedora devel)
kevin has set checkout to Approved for provenpackager on jmod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jmod



From pkgdb at fedoraproject.org  Thu Apr  9 23:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:13:53 +0000
Subject: [pkgdb] jmod (Fedora, 9) updated by kevin
Message-ID: <20090409231354.18ABE10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for jmod
kevin has set commit to Approved for provenpackager on jmod (Fedora 9)
kevin has set build to Approved for provenpackager on jmod (Fedora 9)
kevin has set checkout to Approved for provenpackager on jmod (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jmod



From kevin at fedoraproject.org  Thu Apr  9 23:14:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:14:07 +0000 (UTC)
Subject: rpms/jmod - New directory
Message-ID: <20090409231407.2B45B7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jmod
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD24257/rpms/jmod

Log Message:
Directory /cvs/pkgs/rpms/jmod added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:14:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:14:07 +0000 (UTC)
Subject: rpms/jmod/devel - New directory
Message-ID: <20090409231407.6F28D7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jmod/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD24257/rpms/jmod/devel

Log Message:
Directory /cvs/pkgs/rpms/jmod/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 23:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:13:53 +0000
Subject: [pkgdb] jmod (Fedora, 10) updated by kevin
Message-ID: <20090409231354.2F7B610F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jmod
kevin has set commit to Approved for provenpackager on jmod (Fedora 10)
kevin has set build to Approved for provenpackager on jmod (Fedora 10)
kevin has set checkout to Approved for provenpackager on jmod (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jmod



From kevin at fedoraproject.org  Thu Apr  9 23:14:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:14:18 +0000 (UTC)
Subject: rpms/jmod Makefile,NONE,1.1
Message-ID: <20090409231418.E68767001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jmod
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD24257/rpms/jmod

Added Files:
	Makefile 
Log Message:
Setup of module jmod


--- NEW FILE Makefile ---
# Top level Makefile for module jmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 23:14:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:14:19 +0000 (UTC)
Subject: rpms/jmod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090409231419.508B17001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jmod/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD24257/rpms/jmod/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jmod


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jmod
# $Id: Makefile,v 1.1 2009/04/09 23:14:19 kevin Exp $
NAME := jmod
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:15:53 +0000
Subject: [pkgdb] choqok was added for tejas
Message-ID: <20090409231455.4D8FA10F871@bastion2.fedora.phx.redhat.com>

kevin has added Package choqok with summary KDE Twitter Client
kevin has approved Package choqok
kevin has added a Fedora devel branch for choqok with an owner of tejas
kevin has approved choqok in Fedora devel
kevin has approved Package choqok
kevin has set commit to Approved for provenpackager on choqok (Fedora devel)
kevin has set build to Approved for provenpackager on choqok (Fedora devel)
kevin has set checkout to Approved for provenpackager on choqok (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/choqok



From pkgdb at fedoraproject.org  Thu Apr  9 23:15:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:15:54 +0000
Subject: [pkgdb] choqok (Fedora, 9) updated by kevin
Message-ID: <20090409231456.D816910F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for choqok
kevin has set commit to Approved for provenpackager on choqok (Fedora 9)
kevin has set build to Approved for provenpackager on choqok (Fedora 9)
kevin has set checkout to Approved for provenpackager on choqok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/choqok



From pkgdb at fedoraproject.org  Thu Apr  9 23:15:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:15:54 +0000
Subject: [pkgdb] choqok (Fedora, 10) updated by kevin
Message-ID: <20090409231456.E7E3010F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for choqok
kevin has set commit to Approved for provenpackager on choqok (Fedora 10)
kevin has set build to Approved for provenpackager on choqok (Fedora 10)
kevin has set checkout to Approved for provenpackager on choqok (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/choqok



From kevin at fedoraproject.org  Thu Apr  9 23:15:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:15:08 +0000 (UTC)
Subject: rpms/choqok - New directory
Message-ID: <20090409231508.3EE1F7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/choqok
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy24818/rpms/choqok

Log Message:
Directory /cvs/pkgs/rpms/choqok added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:15:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:15:08 +0000 (UTC)
Subject: rpms/choqok/devel - New directory
Message-ID: <20090409231508.9398D7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/choqok/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy24818/rpms/choqok/devel

Log Message:
Directory /cvs/pkgs/rpms/choqok/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:15:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:15:22 +0000 (UTC)
Subject: rpms/choqok Makefile,NONE,1.1
Message-ID: <20090409231522.89EC870137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/choqok
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy24818/rpms/choqok

Added Files:
	Makefile 
Log Message:
Setup of module choqok


--- NEW FILE Makefile ---
# Top level Makefile for module choqok
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr  9 23:15:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:15:54 +0000
Subject: [pkgdb] choqok (Fedora, 11) updated by kevin
Message-ID: <20090409231456.F325410F879@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for choqok
kevin has set commit to Approved for provenpackager on choqok (Fedora 11)
kevin has set build to Approved for provenpackager on choqok (Fedora 11)
kevin has set checkout to Approved for provenpackager on choqok (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/choqok



From kevin at fedoraproject.org  Thu Apr  9 23:15:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:15:23 +0000 (UTC)
Subject: rpms/choqok/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090409231523.E206D70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/choqok/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy24818/rpms/choqok/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module choqok


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: choqok
# $Id: Makefile,v 1.1 2009/04/09 23:15:23 kevin Exp $
NAME := choqok
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From bpepple at fedoraproject.org  Thu Apr  9 23:30:29 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  9 Apr 2009 23:30:29 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.43, 1.44 sources, 1.43,
	1.44 telepathy-gabble.spec, 1.53, 1.54
Message-ID: <20090409233029.781E37001C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29899

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Apr  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-1
- Update to 0.7.26.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	3 Apr 2009 22:56:27 -0000	1.43
+++ .cvsignore	9 Apr 2009 23:29:58 -0000	1.44
@@ -1 +1 @@
-telepathy-gabble-0.7.25.tar.gz
+telepathy-gabble-0.7.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	3 Apr 2009 22:56:28 -0000	1.43
+++ sources	9 Apr 2009 23:29:58 -0000	1.44
@@ -1 +1 @@
-5fae7fbfb8e40be28e8dae5cba5cb947  telepathy-gabble-0.7.25.tar.gz
+9cf5b3aba8692233dfd7e5e3c447f5b9  telepathy-gabble-0.7.26.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- telepathy-gabble.spec	3 Apr 2009 22:56:28 -0000	1.53
+++ telepathy-gabble.spec	9 Apr 2009 23:29:58 -0000	1.54
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.25
+Version:        0.7.26
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-1
+- Update to 0.7.26.
+
 * Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.25-1
 - Update to 0.7.25.
 - Bump minimum version of tp-glib-devel needed.



From pkgdb at fedoraproject.org  Thu Apr  9 23:31:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:31:19 +0000
Subject: [pkgdb] hmaccalc was added for nalin
Message-ID: <20090409233120.7BEE610F870@bastion2.fedora.phx.redhat.com>

kevin has added Package hmaccalc with summary Tools for computing and checking HMAC values for files
kevin has approved Package hmaccalc
kevin has added a Fedora devel branch for hmaccalc with an owner of nalin
kevin has approved hmaccalc in Fedora devel
kevin has approved Package hmaccalc
kevin has set commit to Approved for provenpackager on hmaccalc (Fedora devel)
kevin has set build to Approved for provenpackager on hmaccalc (Fedora devel)
kevin has set checkout to Approved for provenpackager on hmaccalc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hmaccalc



From pkgdb at fedoraproject.org  Thu Apr  9 23:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:32:19 +0000
Subject: [pkgdb] hmaccalc (Fedora, 10) updated by kevin
Message-ID: <20090409233122.0AEE810F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for hmaccalc
kevin has set commit to Approved for provenpackager on hmaccalc (Fedora 10)
kevin has set build to Approved for provenpackager on hmaccalc (Fedora 10)
kevin has set checkout to Approved for provenpackager on hmaccalc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hmaccalc



From pkgdb at fedoraproject.org  Thu Apr  9 23:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:32:19 +0000
Subject: [pkgdb] hmaccalc (Fedora, 9) updated by kevin
Message-ID: <20090409233122.1CD9710F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for hmaccalc
kevin has set commit to Approved for provenpackager on hmaccalc (Fedora 9)
kevin has set build to Approved for provenpackager on hmaccalc (Fedora 9)
kevin has set checkout to Approved for provenpackager on hmaccalc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hmaccalc



From kevin at fedoraproject.org  Thu Apr  9 23:31:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:31:35 +0000 (UTC)
Subject: rpms/hmaccalc - New directory
Message-ID: <20090409233135.37CA17001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hmaccalc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30308/rpms/hmaccalc

Log Message:
Directory /cvs/pkgs/rpms/hmaccalc added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:31:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:31:35 +0000 (UTC)
Subject: rpms/hmaccalc/devel - New directory
Message-ID: <20090409233135.B24597001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hmaccalc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30308/rpms/hmaccalc/devel

Log Message:
Directory /cvs/pkgs/rpms/hmaccalc/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:31:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:31:51 +0000 (UTC)
Subject: rpms/hmaccalc Makefile,NONE,1.1
Message-ID: <20090409233151.539457001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hmaccalc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30308/rpms/hmaccalc

Added Files:
	Makefile 
Log Message:
Setup of module hmaccalc


--- NEW FILE Makefile ---
# Top level Makefile for module hmaccalc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr  9 23:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:32:19 +0000
Subject: [pkgdb] hmaccalc (Fedora, 11) updated by kevin
Message-ID: <20090409233122.2B1C410F879@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hmaccalc
kevin has set commit to Approved for provenpackager on hmaccalc (Fedora 11)
kevin has set build to Approved for provenpackager on hmaccalc (Fedora 11)
kevin has set checkout to Approved for provenpackager on hmaccalc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hmaccalc



From kevin at fedoraproject.org  Thu Apr  9 23:31:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:31:51 +0000 (UTC)
Subject: rpms/hmaccalc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409233151.E7F237001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hmaccalc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30308/rpms/hmaccalc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hmaccalc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hmaccalc
# $Id: Makefile,v 1.1 2009/04/09 23:31:51 kevin Exp $
NAME := hmaccalc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:34:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:34:08 +0000
Subject: [pkgdb] kvirc (Fedora, 9) updated by kevin
Message-ID: <20090409233408.9647D10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for kvirc
kevin has set commit to Approved for provenpackager on kvirc (Fedora 9)
kevin has set build to Approved for provenpackager on kvirc (Fedora 9)
kevin has set checkout to Approved for provenpackager on kvirc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvirc



From pkgdb at fedoraproject.org  Thu Apr  9 23:34:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:34:59 +0000
Subject: [pkgdb] kvirc was added for nucleo
Message-ID: <20090409233402.7803410F862@bastion2.fedora.phx.redhat.com>

kevin has added Package kvirc with summary Free portable IRC client
kevin has approved Package kvirc
kevin has added a Fedora devel branch for kvirc with an owner of nucleo
kevin has approved kvirc in Fedora devel
kevin has approved Package kvirc
kevin has set commit to Approved for provenpackager on kvirc (Fedora devel)
kevin has set build to Approved for provenpackager on kvirc (Fedora devel)
kevin has set checkout to Approved for provenpackager on kvirc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvirc



From kevin at fedoraproject.org  Thu Apr  9 23:34:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:34:23 +0000 (UTC)
Subject: rpms/kvirc/devel - New directory
Message-ID: <20090409233423.8CF4D7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30988/rpms/kvirc/devel

Log Message:
Directory /cvs/pkgs/rpms/kvirc/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:34:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:34:23 +0000 (UTC)
Subject: rpms/kvirc - New directory
Message-ID: <20090409233423.3AAED7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kvirc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30988/rpms/kvirc

Log Message:
Directory /cvs/pkgs/rpms/kvirc added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 23:34:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:34:08 +0000
Subject: [pkgdb] kvirc (Fedora, 10) updated by kevin
Message-ID: <20090409233408.A23D010F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kvirc
kevin has set commit to Approved for provenpackager on kvirc (Fedora 10)
kevin has set build to Approved for provenpackager on kvirc (Fedora 10)
kevin has set checkout to Approved for provenpackager on kvirc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvirc



From kevin at fedoraproject.org  Thu Apr  9 23:35:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:35:02 +0000 (UTC)
Subject: rpms/kvirc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090409233502.A6AD270137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30988/rpms/kvirc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kvirc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kvirc
# $Id: Makefile,v 1.1 2009/04/09 23:35:02 kevin Exp $
NAME := kvirc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:35:58 +0000
Subject: [pkgdb] calf was added for oget
Message-ID: <20090409233501.121C610F872@bastion2.fedora.phx.redhat.com>

kevin has added Package calf with summary Audio plugins pack
kevin has approved Package calf
kevin has added a Fedora devel branch for calf with an owner of oget
kevin has approved calf in Fedora devel
kevin has approved Package calf
kevin has set commit to Approved for provenpackager on calf (Fedora devel)
kevin has set build to Approved for provenpackager on calf (Fedora devel)
kevin has set checkout to Approved for provenpackager on calf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calf



From pkgdb at fedoraproject.org  Thu Apr  9 23:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:36:03 +0000
Subject: [pkgdb] calf (Fedora, 9) updated by kevin
Message-ID: <20090409233504.F0EE410F870@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for calf
kevin has set commit to Approved for provenpackager on calf (Fedora 9)
kevin has set build to Approved for provenpackager on calf (Fedora 9)
kevin has set checkout to Approved for provenpackager on calf (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calf



From kevin at fedoraproject.org  Thu Apr  9 23:35:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:35:01 +0000 (UTC)
Subject: rpms/kvirc Makefile,NONE,1.1
Message-ID: <20090409233501.A41D07001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kvirc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30988/rpms/kvirc

Added Files:
	Makefile 
Log Message:
Setup of module kvirc


--- NEW FILE Makefile ---
# Top level Makefile for module kvirc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr  9 23:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:36:03 +0000
Subject: [pkgdb] calf (Fedora, 10) updated by kevin
Message-ID: <20090409233505.1016910F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for calf
kevin has set commit to Approved for provenpackager on calf (Fedora 10)
kevin has set build to Approved for provenpackager on calf (Fedora 10)
kevin has set checkout to Approved for provenpackager on calf (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calf



From kevin at fedoraproject.org  Thu Apr  9 23:35:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:35:31 +0000 (UTC)
Subject: rpms/calf/devel - New directory
Message-ID: <20090409233531.90B137001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31296/rpms/calf/devel

Log Message:
Directory /cvs/pkgs/rpms/calf/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:35:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:35:31 +0000 (UTC)
Subject: rpms/calf - New directory
Message-ID: <20090409233531.3A9687001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31296/rpms/calf

Log Message:
Directory /cvs/pkgs/rpms/calf added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:35:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:35:45 +0000 (UTC)
Subject: rpms/calf Makefile,NONE,1.1
Message-ID: <20090409233545.A949F7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31296/rpms/calf

Added Files:
	Makefile 
Log Message:
Setup of module calf


--- NEW FILE Makefile ---
# Top level Makefile for module calf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 23:35:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:35:46 +0000 (UTC)
Subject: rpms/calf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090409233546.C662A7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31296/rpms/calf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module calf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: calf
# $Id: Makefile,v 1.1 2009/04/09 23:35:45 kevin Exp $
NAME := calf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:39:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:39:51 +0000
Subject: [pkgdb] kcometen4 was added for nucleo
Message-ID: <20090409233854.8C6EA10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package kcometen4 with summary An OpenGL screensaver with exploding comets for KDE4
kevin has approved Package kcometen4
kevin has added a Fedora devel branch for kcometen4 with an owner of nucleo
kevin has approved kcometen4 in Fedora devel
kevin has approved Package kcometen4
kevin has set commit to Approved for provenpackager on kcometen4 (Fedora devel)
kevin has set build to Approved for provenpackager on kcometen4 (Fedora devel)
kevin has set checkout to Approved for provenpackager on kcometen4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcometen4



From pkgdb at fedoraproject.org  Thu Apr  9 23:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:39:53 +0000
Subject: [pkgdb] kcometen4 (Fedora, 9) updated by kevin
Message-ID: <20090409233856.23A6110F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for kcometen4
kevin has set commit to Approved for provenpackager on kcometen4 (Fedora 9)
kevin has set build to Approved for provenpackager on kcometen4 (Fedora 9)
kevin has set checkout to Approved for provenpackager on kcometen4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcometen4



From kevin at fedoraproject.org  Thu Apr  9 23:39:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:39:07 +0000 (UTC)
Subject: rpms/kcometen4 - New directory
Message-ID: <20090409233907.24C567001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcometen4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH32129/rpms/kcometen4

Log Message:
Directory /cvs/pkgs/rpms/kcometen4 added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:39:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:39:07 +0000 (UTC)
Subject: rpms/kcometen4/devel - New directory
Message-ID: <20090409233907.6325F7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcometen4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH32129/rpms/kcometen4/devel

Log Message:
Directory /cvs/pkgs/rpms/kcometen4/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr  9 23:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:39:53 +0000
Subject: [pkgdb] kcometen4 (Fedora, 10) updated by kevin
Message-ID: <20090409233856.2BCC310F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kcometen4
kevin has set commit to Approved for provenpackager on kcometen4 (Fedora 10)
kevin has set build to Approved for provenpackager on kcometen4 (Fedora 10)
kevin has set checkout to Approved for provenpackager on kcometen4 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kcometen4



From kevin at fedoraproject.org  Thu Apr  9 23:39:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:39:15 +0000 (UTC)
Subject: rpms/kcometen4 Makefile,NONE,1.1
Message-ID: <20090409233915.8C7237001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcometen4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH32129/rpms/kcometen4

Added Files:
	Makefile 
Log Message:
Setup of module kcometen4


--- NEW FILE Makefile ---
# Top level Makefile for module kcometen4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 23:39:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:39:15 +0000 (UTC)
Subject: rpms/kcometen4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409233915.E12067001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcometen4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH32129/rpms/kcometen4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kcometen4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kcometen4
# $Id: Makefile,v 1.1 2009/04/09 23:39:15 kevin Exp $
NAME := kcometen4
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:41:06 +0000
Subject: [pkgdb] skyviewer was added for lkundrak
Message-ID: <20090409234007.77FE110F862@bastion2.fedora.phx.redhat.com>

kevin has added Package skyviewer with summary Program to display HEALPix-based skymaps in FITS files
kevin has approved Package skyviewer
kevin has added a Fedora devel branch for skyviewer with an owner of lkundrak
kevin has approved skyviewer in Fedora devel
kevin has approved Package skyviewer
kevin has set commit to Approved for provenpackager on skyviewer (Fedora devel)
kevin has set build to Approved for provenpackager on skyviewer (Fedora devel)
kevin has set checkout to Approved for provenpackager on skyviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/skyviewer



From pkgdb at fedoraproject.org  Thu Apr  9 23:41:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:41:08 +0000
Subject: [pkgdb] skyviewer (Fedora EPEL, 5) updated by kevin
Message-ID: <20090409234010.1C37210F874@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for skyviewer
kevin has set commit to Approved for provenpackager on skyviewer (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on skyviewer (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on skyviewer (Fedora EPEL 5)
kevin approved watchbugzilla on skyviewer (Fedora EPEL 5) for astronomy-sig
kevin approved watchcommits on skyviewer (Fedora EPEL 5) for astronomy-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/skyviewer



From pkgdb at fedoraproject.org  Thu Apr  9 23:41:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:41:08 +0000
Subject: [pkgdb] skyviewer (Fedora, devel) updated by kevin
Message-ID: <20090409234010.80D2410F877@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on skyviewer (Fedora devel) for astronomy-sig
kevin approved watchcommits on skyviewer (Fedora devel) for astronomy-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/skyviewer



From kevin at fedoraproject.org  Thu Apr  9 23:40:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:40:24 +0000 (UTC)
Subject: rpms/skyviewer - New directory
Message-ID: <20090409234024.281E67001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skyviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32558/rpms/skyviewer

Log Message:
Directory /cvs/pkgs/rpms/skyviewer added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:40:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:40:24 +0000 (UTC)
Subject: rpms/skyviewer/devel - New directory
Message-ID: <20090409234024.6A7217001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skyviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32558/rpms/skyviewer/devel

Log Message:
Directory /cvs/pkgs/rpms/skyviewer/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:40:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:40:35 +0000 (UTC)
Subject: rpms/skyviewer Makefile,NONE,1.1
Message-ID: <20090409234035.29A7F7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skyviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32558/rpms/skyviewer

Added Files:
	Makefile 
Log Message:
Setup of module skyviewer


--- NEW FILE Makefile ---
# Top level Makefile for module skyviewer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr  9 23:41:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:41:08 +0000
Subject: [pkgdb] skyviewer (Fedora, 10) updated by kevin
Message-ID: <20090409234010.8FA5A10F87A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for skyviewer
kevin has set commit to Approved for provenpackager on skyviewer (Fedora 10)
kevin has set build to Approved for provenpackager on skyviewer (Fedora 10)
kevin has set checkout to Approved for provenpackager on skyviewer (Fedora 10)
kevin approved watchbugzilla on skyviewer (Fedora 10) for astronomy-sig
kevin approved watchcommits on skyviewer (Fedora 10) for astronomy-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/skyviewer



From kevin at fedoraproject.org  Thu Apr  9 23:40:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:40:35 +0000 (UTC)
Subject: rpms/skyviewer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409234035.904667001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/skyviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32558/rpms/skyviewer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module skyviewer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: skyviewer
# $Id: Makefile,v 1.1 2009/04/09 23:40:35 kevin Exp $
NAME := skyviewer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr  9 23:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 09 Apr 2009 23:41:07 +0000
Subject: [pkgdb] fcoe-utils was added for jzeleny
Message-ID: <20090409234107.D893110F862@bastion2.fedora.phx.redhat.com>

kevin has added Package fcoe-utils with summary Utilities for Fibre channel over ethernet
kevin has approved Package fcoe-utils
kevin has added a Fedora devel branch for fcoe-utils with an owner of jzeleny
kevin has approved fcoe-utils in Fedora devel
kevin has approved Package fcoe-utils
kevin has set commit to Approved for provenpackager on fcoe-utils (Fedora devel)
kevin has set build to Approved for provenpackager on fcoe-utils (Fedora devel)
kevin has set checkout to Approved for provenpackager on fcoe-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcoe-utils



From kevin at fedoraproject.org  Thu Apr  9 23:41:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:41:18 +0000 (UTC)
Subject: rpms/fcoe-utils - New directory
Message-ID: <20090409234118.299B87001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fcoe-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslti458/rpms/fcoe-utils

Log Message:
Directory /cvs/pkgs/rpms/fcoe-utils added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:41:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:41:18 +0000 (UTC)
Subject: rpms/fcoe-utils/devel - New directory
Message-ID: <20090409234118.5D0287001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslti458/rpms/fcoe-utils/devel

Log Message:
Directory /cvs/pkgs/rpms/fcoe-utils/devel added to the repository




From kevin at fedoraproject.org  Thu Apr  9 23:41:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:41:26 +0000 (UTC)
Subject: rpms/fcoe-utils Makefile,NONE,1.1
Message-ID: <20090409234126.6DD5D7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fcoe-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslti458/rpms/fcoe-utils

Added Files:
	Makefile 
Log Message:
Setup of module fcoe-utils


--- NEW FILE Makefile ---
# Top level Makefile for module fcoe-utils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr  9 23:41:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  9 Apr 2009 23:41:27 +0000 (UTC)
Subject: rpms/fcoe-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090409234127.189CD7001C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslti458/rpms/fcoe-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fcoe-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fcoe-utils
# $Id: Makefile,v 1.1 2009/04/09 23:41:26 kevin Exp $
NAME := fcoe-utils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From nucleo at fedoraproject.org  Thu Apr  9 23:43:29 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Thu,  9 Apr 2009 23:43:29 +0000 (UTC)
Subject: rpms/kvirc/devel import.log, NONE, 1.1 kvirc-flags.patch, NONE,
	1.1 kvirc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409234329.41E1D7001C@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv790/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kvirc-flags.patch kvirc.spec 
Log Message:

Initial import KVIrc



--- NEW FILE import.log ---
kvirc-4_0_0-0_6_20090409svn3173_fc10:HEAD:kvirc-4.0.0-0.6.20090409svn3173.fc10.src.rpm:1239320463

kvirc-flags.patch:

--- NEW FILE kvirc-flags.patch ---
--- kvirc/CMakeLists.txt	2009-04-03 19:45:38.000000000 +0300
+++ kvirc/CMakeLists.txt	2009-04-06 15:41:26.000000000 +0300
@@ -116,8 +116,6 @@
 ELSE()
 	SET(CMAKE_BUILD_TYPE Release)
 	SET(CMAKE_STATUS_DEBUG_SUPPORT "No")
-	SET(CMAKE_CXX_FLAGS "-O2")
-	SET(CMAKE_C_FLAGS "-O2")
 ENDIF()
 
 


--- NEW FILE kvirc.spec ---
%define           pre 20090409svn3173

Name:             kvirc
Version:          4.0.0
Release:          0.6.%{pre}%{?dist}
Summary:          Free portable IRC client
Group:            Applications/Internet
License:          GPLv2+ with exceptions
URL:              http://kvirc.net/
# The source for this package was pulled from upstream's vcs.
# Use the following commands to generate the tarball:
#  svn export -r 3173 https://svn.kvirc.de/svn/trunk/kvirc
#  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
Source0:          %{name}-%{pre}.tar.bz2
Patch0:           kvirc-flags.patch
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
KVIrc is a free portable IRC client based on the excellent
Qt GUI toolkit. KVirc is being written by Szymon Stefanek
and the KVIrc Development Team with the contribution of
many IRC addicted developers around the world.

%prep
%setup -q -n %{name}
%patch0 -p1

%build
%{cmake}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

desktop-file-install \
    --dir %{buildroot}%{_datadir}/applications/ \
    %{buildroot}%{_datadir}/applications/%{name}4.desktop

ln -s ../../%{name}/4.0/license/COPYING COPYING

%clean
rm -rf %{buildroot}

%post
/sbin/ldconfig
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
/sbin/ldconfig
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files
%defattr(-,root,root,-)
%doc doc/FAQ doc/README COPYING
%{_bindir}/kvirc4
%{_libdir}/libkvilib4.so.4
%{_libdir}/libkvilib4.so.4.0.0
%{_datadir}/applications/kvirc4.desktop
%{_libdir}/%{name}/
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/4.0
%dir %{_datadir}/%{name}/4.0/locale
%{_datadir}/%{name}/4.0/config/
%{_datadir}/%{name}/4.0/defscript/
%{_datadir}/%{name}/4.0/doc/
%{_datadir}/%{name}/4.0/help/
%{_datadir}/%{name}/4.0/modules/
%{_datadir}/%{name}/4.0/msgcolors/
%{_datadir}/%{name}/4.0/pics/
%{_datadir}/%{name}/4.0/themes/
%{_datadir}/%{name}/4.0/license/
%{_datadir}/man/man1/%{name}.1.gz
%{_datadir}/mimelnk/applications/x-kva.desktop
%{_datadir}/mimelnk/applications/x-kvt.desktop
%{_datadir}/mimelnk/text/x-kvc.desktop
%{_datadir}/mimelnk/text/x-kvs.desktop
%{_datadir}/icons/hicolor/*/apps/kvirc.*
%{_datadir}/icons/hicolor/*/mimetypes/kva.*
%{_datadir}/icons/hicolor/*/mimetypes/kvc.*
%{_datadir}/icons/hicolor/*/mimetypes/kvs.*
%{_datadir}/icons/hicolor/*/mimetypes/kvt.*

# Translation files
%lang(bg) %{_datadir}/%{name}/4.0/locale/*_bg.mo
%lang(ca) %{_datadir}/%{name}/4.0/locale/*_ca.mo
%lang(cs) %{_datadir}/%{name}/4.0/locale/*_cs.mo
%lang(de) %{_datadir}/%{name}/4.0/locale/*_de.mo
%lang(es) %{_datadir}/%{name}/4.0/locale/*_es.mo
%lang(fi) %{_datadir}/%{name}/4.0/locale/*_fi.mo
%lang(fr) %{_datadir}/%{name}/4.0/locale/*_fr.mo
%lang(hr) %{_datadir}/%{name}/4.0/locale/*_hr.mo
%lang(hu) %{_datadir}/%{name}/4.0/locale/*_hu.mo
%lang(it) %{_datadir}/%{name}/4.0/locale/*_it.mo
%lang(nl) %{_datadir}/%{name}/4.0/locale/*_nl.mo
%lang(pl) %{_datadir}/%{name}/4.0/locale/*_pl.mo
%lang(pt_BR) %{_datadir}/%{name}/4.0/locale/*_pt_BR.mo
%lang(pt) %{_datadir}/%{name}/4.0/locale/*_pt.mo
%lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
%lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
%lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo

%exclude %{_libdir}/libkvilib4.so
%exclude %{_bindir}/kvirc4-config
%exclude %{_datadir}/%{name}/4.0/doc/FAQ
%exclude %{_datadir}/%{name}/4.0/doc/README

%changelog
* Thu Apr  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.6.20090409svn3173
- svn snapshot 3173
- Summary changed to Free portable IRC client

* Mon Apr  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.5.20090404svn3172
- patch for using standard compiler flags

* Sun Apr  5 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.4.20090404svn3172
- symlink to COPYING

* Sat Apr  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.3.20090404svn3172
- Exclude duplicate files
- svn snapshot 3172
- BR dbus-devel

* Sat Mar 28 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.2.20090328svn3168
- Fixed owner of /usr/share/kvirc
- Changed release tag and license field
- Fixed owner of /usr/share/kvirc/4.0 and /usr/share/kvirc/4.0/locale
- caps dir included in package

* Sat Mar 28 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0-0.5.svn3168
- Use update-desktop-database and gtk-update-icon-cache instead of xdg-utils

* Fri Mar 20 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0-0.4.svn3151
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:35:02 -0000	1.1
+++ .cvsignore	9 Apr 2009 23:43:27 -0000	1.2
@@ -0,0 +1 @@
+kvirc-20090409svn3173.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:35:02 -0000	1.1
+++ sources	9 Apr 2009 23:43:28 -0000	1.2
@@ -0,0 +1 @@
+3211fd5a55289927b697b343f1c7e561  kvirc-20090409svn3173.tar.bz2



From nucleo at fedoraproject.org  Thu Apr  9 23:46:02 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Thu,  9 Apr 2009 23:46:02 +0000 (UTC)
Subject: rpms/kvirc/F-9 import.log, NONE, 1.1 kvirc-flags.patch, NONE,
	1.1 kvirc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409234602.9EB907001C@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1838/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kvirc-flags.patch kvirc.spec 
Log Message:

Initial import KVIrc



--- NEW FILE import.log ---
kvirc-4_0_0-0_6_20090409svn3173_fc10:F-9:kvirc-4.0.0-0.6.20090409svn3173.fc10.src.rpm:1239320685

kvirc-flags.patch:

--- NEW FILE kvirc-flags.patch ---
--- kvirc/CMakeLists.txt	2009-04-03 19:45:38.000000000 +0300
+++ kvirc/CMakeLists.txt	2009-04-06 15:41:26.000000000 +0300
@@ -116,8 +116,6 @@
 ELSE()
 	SET(CMAKE_BUILD_TYPE Release)
 	SET(CMAKE_STATUS_DEBUG_SUPPORT "No")
-	SET(CMAKE_CXX_FLAGS "-O2")
-	SET(CMAKE_C_FLAGS "-O2")
 ENDIF()
 
 


--- NEW FILE kvirc.spec ---
%define           pre 20090409svn3173

Name:             kvirc
Version:          4.0.0
Release:          0.6.%{pre}%{?dist}
Summary:          Free portable IRC client
Group:            Applications/Internet
License:          GPLv2+ with exceptions
URL:              http://kvirc.net/
# The source for this package was pulled from upstream's vcs.
# Use the following commands to generate the tarball:
#  svn export -r 3173 https://svn.kvirc.de/svn/trunk/kvirc
#  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
Source0:          %{name}-%{pre}.tar.bz2
Patch0:           kvirc-flags.patch
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
KVIrc is a free portable IRC client based on the excellent
Qt GUI toolkit. KVirc is being written by Szymon Stefanek
and the KVIrc Development Team with the contribution of
many IRC addicted developers around the world.

%prep
%setup -q -n %{name}
%patch0 -p1

%build
%{cmake}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

desktop-file-install \
    --dir %{buildroot}%{_datadir}/applications/ \
    %{buildroot}%{_datadir}/applications/%{name}4.desktop

ln -s ../../%{name}/4.0/license/COPYING COPYING

%clean
rm -rf %{buildroot}

%post
/sbin/ldconfig
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
/sbin/ldconfig
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files
%defattr(-,root,root,-)
%doc doc/FAQ doc/README COPYING
%{_bindir}/kvirc4
%{_libdir}/libkvilib4.so.4
%{_libdir}/libkvilib4.so.4.0.0
%{_datadir}/applications/kvirc4.desktop
%{_libdir}/%{name}/
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/4.0
%dir %{_datadir}/%{name}/4.0/locale
%{_datadir}/%{name}/4.0/config/
%{_datadir}/%{name}/4.0/defscript/
%{_datadir}/%{name}/4.0/doc/
%{_datadir}/%{name}/4.0/help/
%{_datadir}/%{name}/4.0/modules/
%{_datadir}/%{name}/4.0/msgcolors/
%{_datadir}/%{name}/4.0/pics/
%{_datadir}/%{name}/4.0/themes/
%{_datadir}/%{name}/4.0/license/
%{_datadir}/man/man1/%{name}.1.gz
%{_datadir}/mimelnk/applications/x-kva.desktop
%{_datadir}/mimelnk/applications/x-kvt.desktop
%{_datadir}/mimelnk/text/x-kvc.desktop
%{_datadir}/mimelnk/text/x-kvs.desktop
%{_datadir}/icons/hicolor/*/apps/kvirc.*
%{_datadir}/icons/hicolor/*/mimetypes/kva.*
%{_datadir}/icons/hicolor/*/mimetypes/kvc.*
%{_datadir}/icons/hicolor/*/mimetypes/kvs.*
%{_datadir}/icons/hicolor/*/mimetypes/kvt.*

# Translation files
%lang(bg) %{_datadir}/%{name}/4.0/locale/*_bg.mo
%lang(ca) %{_datadir}/%{name}/4.0/locale/*_ca.mo
%lang(cs) %{_datadir}/%{name}/4.0/locale/*_cs.mo
%lang(de) %{_datadir}/%{name}/4.0/locale/*_de.mo
%lang(es) %{_datadir}/%{name}/4.0/locale/*_es.mo
%lang(fi) %{_datadir}/%{name}/4.0/locale/*_fi.mo
%lang(fr) %{_datadir}/%{name}/4.0/locale/*_fr.mo
%lang(hr) %{_datadir}/%{name}/4.0/locale/*_hr.mo
%lang(hu) %{_datadir}/%{name}/4.0/locale/*_hu.mo
%lang(it) %{_datadir}/%{name}/4.0/locale/*_it.mo
%lang(nl) %{_datadir}/%{name}/4.0/locale/*_nl.mo
%lang(pl) %{_datadir}/%{name}/4.0/locale/*_pl.mo
%lang(pt_BR) %{_datadir}/%{name}/4.0/locale/*_pt_BR.mo
%lang(pt) %{_datadir}/%{name}/4.0/locale/*_pt.mo
%lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
%lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
%lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo

%exclude %{_libdir}/libkvilib4.so
%exclude %{_bindir}/kvirc4-config
%exclude %{_datadir}/%{name}/4.0/doc/FAQ
%exclude %{_datadir}/%{name}/4.0/doc/README

%changelog
* Thu Apr  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.6.20090409svn3173
- svn snapshot 3173
- Summary changed to Free portable IRC client

* Mon Apr  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.5.20090404svn3172
- patch for using standard compiler flags

* Sun Apr  5 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.4.20090404svn3172
- symlink to COPYING

* Sat Apr  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.3.20090404svn3172
- Exclude duplicate files
- svn snapshot 3172
- BR dbus-devel

* Sat Mar 28 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.2.20090328svn3168
- Fixed owner of /usr/share/kvirc
- Changed release tag and license field
- Fixed owner of /usr/share/kvirc/4.0 and /usr/share/kvirc/4.0/locale
- caps dir included in package

* Sat Mar 28 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0-0.5.svn3168
- Use update-desktop-database and gtk-update-icon-cache instead of xdg-utils

* Fri Mar 20 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0-0.4.svn3151
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:35:02 -0000	1.1
+++ .cvsignore	9 Apr 2009 23:45:31 -0000	1.2
@@ -0,0 +1 @@
+kvirc-20090409svn3173.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:35:02 -0000	1.1
+++ sources	9 Apr 2009 23:45:32 -0000	1.2
@@ -0,0 +1 @@
+3211fd5a55289927b697b343f1c7e561  kvirc-20090409svn3173.tar.bz2



From nucleo at fedoraproject.org  Thu Apr  9 23:48:51 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Thu,  9 Apr 2009 23:48:51 +0000 (UTC)
Subject: rpms/kvirc/F-10 import.log, NONE, 1.1 kvirc-flags.patch, NONE,
	1.1 kvirc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409234851.432CB7001C@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2950/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kvirc-flags.patch kvirc.spec 
Log Message:

Initial import KVIrc



--- NEW FILE import.log ---
kvirc-4_0_0-0_6_20090409svn3173_fc10:F-10:kvirc-4.0.0-0.6.20090409svn3173.fc10.src.rpm:1239320851

kvirc-flags.patch:

--- NEW FILE kvirc-flags.patch ---
--- kvirc/CMakeLists.txt	2009-04-03 19:45:38.000000000 +0300
+++ kvirc/CMakeLists.txt	2009-04-06 15:41:26.000000000 +0300
@@ -116,8 +116,6 @@
 ELSE()
 	SET(CMAKE_BUILD_TYPE Release)
 	SET(CMAKE_STATUS_DEBUG_SUPPORT "No")
-	SET(CMAKE_CXX_FLAGS "-O2")
-	SET(CMAKE_C_FLAGS "-O2")
 ENDIF()
 
 


--- NEW FILE kvirc.spec ---
%define           pre 20090409svn3173

Name:             kvirc
Version:          4.0.0
Release:          0.6.%{pre}%{?dist}
Summary:          Free portable IRC client
Group:            Applications/Internet
License:          GPLv2+ with exceptions
URL:              http://kvirc.net/
# The source for this package was pulled from upstream's vcs.
# Use the following commands to generate the tarball:
#  svn export -r 3173 https://svn.kvirc.de/svn/trunk/kvirc
#  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
Source0:          %{name}-%{pre}.tar.bz2
Patch0:           kvirc-flags.patch
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
KVIrc is a free portable IRC client based on the excellent
Qt GUI toolkit. KVirc is being written by Szymon Stefanek
and the KVIrc Development Team with the contribution of
many IRC addicted developers around the world.

%prep
%setup -q -n %{name}
%patch0 -p1

%build
%{cmake}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

desktop-file-install \
    --dir %{buildroot}%{_datadir}/applications/ \
    %{buildroot}%{_datadir}/applications/%{name}4.desktop

ln -s ../../%{name}/4.0/license/COPYING COPYING

%clean
rm -rf %{buildroot}

%post
/sbin/ldconfig
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
/sbin/ldconfig
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files
%defattr(-,root,root,-)
%doc doc/FAQ doc/README COPYING
%{_bindir}/kvirc4
%{_libdir}/libkvilib4.so.4
%{_libdir}/libkvilib4.so.4.0.0
%{_datadir}/applications/kvirc4.desktop
%{_libdir}/%{name}/
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/4.0
%dir %{_datadir}/%{name}/4.0/locale
%{_datadir}/%{name}/4.0/config/
%{_datadir}/%{name}/4.0/defscript/
%{_datadir}/%{name}/4.0/doc/
%{_datadir}/%{name}/4.0/help/
%{_datadir}/%{name}/4.0/modules/
%{_datadir}/%{name}/4.0/msgcolors/
%{_datadir}/%{name}/4.0/pics/
%{_datadir}/%{name}/4.0/themes/
%{_datadir}/%{name}/4.0/license/
%{_datadir}/man/man1/%{name}.1.gz
%{_datadir}/mimelnk/applications/x-kva.desktop
%{_datadir}/mimelnk/applications/x-kvt.desktop
%{_datadir}/mimelnk/text/x-kvc.desktop
%{_datadir}/mimelnk/text/x-kvs.desktop
%{_datadir}/icons/hicolor/*/apps/kvirc.*
%{_datadir}/icons/hicolor/*/mimetypes/kva.*
%{_datadir}/icons/hicolor/*/mimetypes/kvc.*
%{_datadir}/icons/hicolor/*/mimetypes/kvs.*
%{_datadir}/icons/hicolor/*/mimetypes/kvt.*

# Translation files
%lang(bg) %{_datadir}/%{name}/4.0/locale/*_bg.mo
%lang(ca) %{_datadir}/%{name}/4.0/locale/*_ca.mo
%lang(cs) %{_datadir}/%{name}/4.0/locale/*_cs.mo
%lang(de) %{_datadir}/%{name}/4.0/locale/*_de.mo
%lang(es) %{_datadir}/%{name}/4.0/locale/*_es.mo
%lang(fi) %{_datadir}/%{name}/4.0/locale/*_fi.mo
%lang(fr) %{_datadir}/%{name}/4.0/locale/*_fr.mo
%lang(hr) %{_datadir}/%{name}/4.0/locale/*_hr.mo
%lang(hu) %{_datadir}/%{name}/4.0/locale/*_hu.mo
%lang(it) %{_datadir}/%{name}/4.0/locale/*_it.mo
%lang(nl) %{_datadir}/%{name}/4.0/locale/*_nl.mo
%lang(pl) %{_datadir}/%{name}/4.0/locale/*_pl.mo
%lang(pt_BR) %{_datadir}/%{name}/4.0/locale/*_pt_BR.mo
%lang(pt) %{_datadir}/%{name}/4.0/locale/*_pt.mo
%lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
%lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
%lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo

%exclude %{_libdir}/libkvilib4.so
%exclude %{_bindir}/kvirc4-config
%exclude %{_datadir}/%{name}/4.0/doc/FAQ
%exclude %{_datadir}/%{name}/4.0/doc/README

%changelog
* Thu Apr  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.6.20090409svn3173
- svn snapshot 3173
- Summary changed to Free portable IRC client

* Mon Apr  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.5.20090404svn3172
- patch for using standard compiler flags

* Sun Apr  5 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.4.20090404svn3172
- symlink to COPYING

* Sat Apr  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.3.20090404svn3172
- Exclude duplicate files
- svn snapshot 3172
- BR dbus-devel

* Sat Mar 28 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.2.20090328svn3168
- Fixed owner of /usr/share/kvirc
- Changed release tag and license field
- Fixed owner of /usr/share/kvirc/4.0 and /usr/share/kvirc/4.0/locale
- caps dir included in package

* Sat Mar 28 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0-0.5.svn3168
- Use update-desktop-database and gtk-update-icon-cache instead of xdg-utils

* Fri Mar 20 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0-0.4.svn3151
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:35:02 -0000	1.1
+++ .cvsignore	9 Apr 2009 23:48:20 -0000	1.2
@@ -0,0 +1 @@
+kvirc-20090409svn3173.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:35:02 -0000	1.1
+++ sources	9 Apr 2009 23:48:20 -0000	1.2
@@ -0,0 +1 @@
+3211fd5a55289927b697b343f1c7e561  kvirc-20090409svn3173.tar.bz2



From nucleo at fedoraproject.org  Thu Apr  9 23:52:23 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Thu,  9 Apr 2009 23:52:23 +0000 (UTC)
Subject: rpms/kcometen4/devel import.log, NONE, 1.1 kcometen4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409235223.C3D6C7001C@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kcometen4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4268/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcometen4.spec 
Log Message:

Initial import KCometen4



--- NEW FILE import.log ---
kcometen4-1_0_4-2_fc10:HEAD:kcometen4-1.0.4-2.fc10.src.rpm:1239321053


--- NEW FILE kcometen4.spec ---
Name:           kcometen4
Version:        1.0.4
Release:        2%{?dist}
Summary:        An OpenGL screensaver with exploding comets for KDE4
Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://www.mehercule.net/staticpages/index.php/kcometen4
Source0:        http://www.mehercule.net/kcometen4/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  cmake
BuildRequires:  qt4-devel
BuildRequires:  kdebase-workspace-devel

%description
KCometen4 is an OpenGL KDE screensaver. Inside a box is a nifty
light show that features lightning and exploding comets. It lets
you configure various effects like comet behavior, camera
movement, box face images, etc.

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
install -p -D -m 644 src/%{name}.kss.1 $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_kde4_bindir}/%{name}.kss
%{_kde4_datadir}/kde4/apps/%{name}
%{_kde4_datadir}/kde4/services/ScreenSavers/%{name}.desktop
%{_mandir}/man1/%{name}.kss.1.gz

%changelog
* Wed Apr  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.4-2
- fixed Build Root

* Thu Apr  2 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.4-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcometen4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:39:15 -0000	1.1
+++ .cvsignore	9 Apr 2009 23:51:53 -0000	1.2
@@ -0,0 +1 @@
+kcometen4-1.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcometen4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:39:15 -0000	1.1
+++ sources	9 Apr 2009 23:51:53 -0000	1.2
@@ -0,0 +1 @@
+d12c77743873123ceb72a484be34de5f  kcometen4-1.0.4.tar.gz



From mclasen at fedoraproject.org  Thu Apr  9 23:53:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  9 Apr 2009 23:53:33 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.107, 1.108 glib2.spec, 1.204,
	1.205 sources, 1.109, 1.110
Message-ID: <20090409235333.0E1F470121@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4565

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- .cvsignore	13 Mar 2009 06:18:09 -0000	1.107
+++ .cvsignore	9 Apr 2009 23:53:02 -0000	1.108
@@ -1 +1 @@
-glib-2.20.0.tar.bz2
+glib-2.20.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- glib2.spec	6 Apr 2009 13:39:17 -0000	1.204
+++ glib2.spec	9 Apr 2009 23:53:02 -0000	1.205
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.20.0
+Version: 2.20.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -117,6 +117,10 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.20.1-1
+- Update to 2.20.1
+- See http://download.gnome.org/sources/glib/2.20/glib-2.20.1.news
+
 * Fri Mar 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- sources	13 Mar 2009 06:18:10 -0000	1.109
+++ sources	9 Apr 2009 23:53:02 -0000	1.110
@@ -1 +1 @@
-05188e560dbd8bddd568e24ce10dd003  glib-2.20.0.tar.bz2
+d7ef53c7b65827a1baa4bad1c6893fa3  glib-2.20.1.tar.bz2



From nucleo at fedoraproject.org  Thu Apr  9 23:54:38 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Thu,  9 Apr 2009 23:54:38 +0000 (UTC)
Subject: rpms/kcometen4/F-9 import.log, NONE, 1.1 kcometen4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409235438.D068A70121@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kcometen4/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4834/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcometen4.spec 
Log Message:

Initial import KCometen4



--- NEW FILE import.log ---
kcometen4-1_0_4-2_fc10:F-9:kcometen4-1.0.4-2.fc10.src.rpm:1239321207


--- NEW FILE kcometen4.spec ---
Name:           kcometen4
Version:        1.0.4
Release:        2%{?dist}
Summary:        An OpenGL screensaver with exploding comets for KDE4
Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://www.mehercule.net/staticpages/index.php/kcometen4
Source0:        http://www.mehercule.net/kcometen4/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  cmake
BuildRequires:  qt4-devel
BuildRequires:  kdebase-workspace-devel

%description
KCometen4 is an OpenGL KDE screensaver. Inside a box is a nifty
light show that features lightning and exploding comets. It lets
you configure various effects like comet behavior, camera
movement, box face images, etc.

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
install -p -D -m 644 src/%{name}.kss.1 $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_kde4_bindir}/%{name}.kss
%{_kde4_datadir}/kde4/apps/%{name}
%{_kde4_datadir}/kde4/services/ScreenSavers/%{name}.desktop
%{_mandir}/man1/%{name}.kss.1.gz

%changelog
* Wed Apr  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.4-2
- fixed Build Root

* Thu Apr  2 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.4-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcometen4/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:39:15 -0000	1.1
+++ .cvsignore	9 Apr 2009 23:54:08 -0000	1.2
@@ -0,0 +1 @@
+kcometen4-1.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcometen4/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:39:15 -0000	1.1
+++ sources	9 Apr 2009 23:54:08 -0000	1.2
@@ -0,0 +1 @@
+d12c77743873123ceb72a484be34de5f  kcometen4-1.0.4.tar.gz



From nucleo at fedoraproject.org  Thu Apr  9 23:56:28 2009
From: nucleo at fedoraproject.org (Alexey Kurov)
Date: Thu,  9 Apr 2009 23:56:28 +0000 (UTC)
Subject: rpms/kcometen4/F-10 import.log, NONE, 1.1 kcometen4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090409235628.7FCE470121@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kcometen4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5431/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcometen4.spec 
Log Message:

Initial import KCometen4



--- NEW FILE import.log ---
kcometen4-1_0_4-2_fc10:F-10:kcometen4-1.0.4-2.fc10.src.rpm:1239321317


--- NEW FILE kcometen4.spec ---
Name:           kcometen4
Version:        1.0.4
Release:        2%{?dist}
Summary:        An OpenGL screensaver with exploding comets for KDE4
Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://www.mehercule.net/staticpages/index.php/kcometen4
Source0:        http://www.mehercule.net/kcometen4/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  cmake
BuildRequires:  qt4-devel
BuildRequires:  kdebase-workspace-devel

%description
KCometen4 is an OpenGL KDE screensaver. Inside a box is a nifty
light show that features lightning and exploding comets. It lets
you configure various effects like comet behavior, camera
movement, box face images, etc.

%prep
%setup -q

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
install -p -D -m 644 src/%{name}.kss.1 $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_kde4_bindir}/%{name}.kss
%{_kde4_datadir}/kde4/apps/%{name}
%{_kde4_datadir}/kde4/services/ScreenSavers/%{name}.desktop
%{_mandir}/man1/%{name}.kss.1.gz

%changelog
* Wed Apr  8 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.4-2
- fixed Build Root

* Thu Apr  2 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.4-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcometen4/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:39:15 -0000	1.1
+++ .cvsignore	9 Apr 2009 23:55:57 -0000	1.2
@@ -0,0 +1 @@
+kcometen4-1.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcometen4/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:39:15 -0000	1.1
+++ sources	9 Apr 2009 23:55:58 -0000	1.2
@@ -0,0 +1 @@
+d12c77743873123ceb72a484be34de5f  kcometen4-1.0.4.tar.gz



From kkofler at fedoraproject.org  Fri Apr 10 00:04:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 00:04:53 +0000 (UTC)
Subject: rpms/z88dk/devel z88dk-1.8-getline-name-conflict.patch, NONE,
	1.1 z88dk.spec, 1.17, 1.18
Message-ID: <20090410000453.31E9570122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7187/devel

Modified Files:
	z88dk.spec 
Added Files:
	z88dk-1.8-getline-name-conflict.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-3
- fix name conflict with the getline function in POSIX 2008

z88dk-1.8-getline-name-conflict.patch:

--- NEW FILE z88dk-1.8-getline-name-conflict.patch ---
diff -ur z88dk/src/z80asm/z80pass.c z88dk-1.8-getline-name-conflict/src/z80asm/z80pass.c
--- z88dk/src/z80asm/z80pass.c	2002-05-11 22:09:38.000000000 +0200
+++ z88dk-1.8-getline-name-conflict/src/z80asm/z80pass.c	2009-04-10 02:01:28.000000000 +0200
@@ -94,7 +94,7 @@
 /* local functions */
 void ifstatement (enum flag interpret);
 void parseline (enum flag interpret);
-void getline (void);
+void getasmline (void);
 void Pass2info (struct expr *expression, char constrange, long lfileptr);
 void Z80pass1 (void);
 void Z80pass2 (void);
@@ -165,7 +165,7 @@
 
 
 void 
-getline (void)
+getasmline (void)
 {
   long fptr;
   int l,c;
@@ -198,7 +198,7 @@
       ++CURRENTFILE->line;
       ++TOTALLINES;
       if (listing)
-	getline ();		/* get a copy of current source line */
+	getasmline ();		/* get a copy of current source line */
 
       EOL = OFF;		/* reset END OF LINE flag */
       GetSym ();


Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- z88dk.spec	25 Feb 2009 18:28:31 -0000	1.17
+++ z88dk.spec	10 Apr 2009 00:04:22 -0000	1.18
@@ -1,13 +1,14 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Artistic clarified
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz
 Patch0: z88dk-1.8-makefile-usr-share.patch
 Patch1: z88dk-1.8-makefile-fixes.patch
 Patch2: z88dk-1.7-64bit.patch
+Patch3: z88dk-1.8-getline-name-conflict.patch
 URL: http://z88dk.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,8 @@
 %patch1 -p1
 # 64-bit fixes
 %patch2 -p1
+# Fix name conflict with the getline function in POSIX 2008
+%patch3 -p1
 %{_bindir}/find . -depth -name CVS -type d -exec %{__rm} -rf {} \;
 # Separate manpages from other docs and fix their permissions
 %{__mv} doc/netman .
@@ -77,6 +80,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-3
+- fix name conflict with the getline function in POSIX 2008
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Apr 10 00:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:16:18 +0000
Subject: [pkgdb] emacs-mmm was added for amdunn
Message-ID: <20090410001519.D021710F870@bastion2.fedora.phx.redhat.com>

kevin has added Package emacs-mmm with summary Emacs minor mode allowing different major modes in the same file
kevin has approved Package emacs-mmm
kevin has added a Fedora devel branch for emacs-mmm with an owner of amdunn
kevin has approved emacs-mmm in Fedora devel
kevin has approved Package emacs-mmm
kevin has set commit to Approved for provenpackager on emacs-mmm (Fedora devel)
kevin has set build to Approved for provenpackager on emacs-mmm (Fedora devel)
kevin has set checkout to Approved for provenpackager on emacs-mmm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mmm



From pkgdb at fedoraproject.org  Fri Apr 10 00:15:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:15:24 +0000
Subject: [pkgdb] emacs-mmm (Fedora, 10) updated by kevin
Message-ID: <20090410001524.D75A810F874@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for emacs-mmm
kevin has set commit to Approved for provenpackager on emacs-mmm (Fedora 10)
kevin has set build to Approved for provenpackager on emacs-mmm (Fedora 10)
kevin has set checkout to Approved for provenpackager on emacs-mmm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mmm



From pkgdb at fedoraproject.org  Fri Apr 10 00:15:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:15:24 +0000
Subject: [pkgdb] emacs-mmm (Fedora, 9) updated by kevin
Message-ID: <20090410001524.E077F10F877@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for emacs-mmm
kevin has set commit to Approved for provenpackager on emacs-mmm (Fedora 9)
kevin has set build to Approved for provenpackager on emacs-mmm (Fedora 9)
kevin has set checkout to Approved for provenpackager on emacs-mmm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mmm



From pkgdb at fedoraproject.org  Fri Apr 10 00:15:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:15:24 +0000
Subject: [pkgdb] emacs-mmm (Fedora, 11) updated by kevin
Message-ID: <20090410001524.EB52310F87A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for emacs-mmm
kevin has set commit to Approved for provenpackager on emacs-mmm (Fedora 11)
kevin has set build to Approved for provenpackager on emacs-mmm (Fedora 11)
kevin has set checkout to Approved for provenpackager on emacs-mmm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mmm



From kevin at fedoraproject.org  Fri Apr 10 00:16:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:16:29 +0000 (UTC)
Subject: rpms/emacs-mmm - New directory
Message-ID: <20090410001629.E9F6270122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp10459/rpms/emacs-mmm

Log Message:
Directory /cvs/pkgs/rpms/emacs-mmm added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:16:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:16:31 +0000 (UTC)
Subject: rpms/emacs-mmm/devel - New directory
Message-ID: <20090410001631.B301A70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp10459/rpms/emacs-mmm/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-mmm/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr 10 00:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:17:32 +0000
Subject: [pkgdb] gnote was added for sundaram
Message-ID: <20090410001635.C463D10F872@bastion2.fedora.phx.redhat.com>

kevin has added Package gnote with summary Note Taking Application
kevin has approved Package gnote
kevin has added a Fedora devel branch for gnote with an owner of sundaram
kevin has approved gnote in Fedora devel
kevin has approved Package gnote
kevin has set commit to Approved for provenpackager on gnote (Fedora devel)
kevin has set build to Approved for provenpackager on gnote (Fedora devel)
kevin has set checkout to Approved for provenpackager on gnote (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Fri Apr 10 00:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:16:37 +0000
Subject: [pkgdb] gnote (Fedora, 10) updated by kevin
Message-ID: <20090410001638.054CC10F874@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gnote
kevin has set commit to Approved for provenpackager on gnote (Fedora 10)
kevin has set build to Approved for provenpackager on gnote (Fedora 10)
kevin has set checkout to Approved for provenpackager on gnote (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From kevin at fedoraproject.org  Fri Apr 10 00:16:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:16:59 +0000 (UTC)
Subject: rpms/emacs-mmm Makefile,NONE,1.1
Message-ID: <20090410001659.1A0EE70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp10459/rpms/emacs-mmm

Added Files:
	Makefile 
Log Message:
Setup of module emacs-mmm


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-mmm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 00:16:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:16:59 +0000 (UTC)
Subject: rpms/emacs-mmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090410001659.6872070122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp10459/rpms/emacs-mmm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-mmm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-mmm
# $Id: Makefile,v 1.1 2009/04/10 00:16:59 kevin Exp $
NAME := emacs-mmm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Apr 10 00:17:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:17:22 +0000 (UTC)
Subject: rpms/gnote - New directory
Message-ID: <20090410001722.2BFE970122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnote
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10926/rpms/gnote

Log Message:
Directory /cvs/pkgs/rpms/gnote added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:17:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:17:22 +0000 (UTC)
Subject: rpms/gnote/devel - New directory
Message-ID: <20090410001722.7D7D270122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnote/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10926/rpms/gnote/devel

Log Message:
Directory /cvs/pkgs/rpms/gnote/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:17:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:17:33 +0000 (UTC)
Subject: rpms/gnote Makefile,NONE,1.1
Message-ID: <20090410001733.2864870122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnote
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10926/rpms/gnote

Added Files:
	Makefile 
Log Message:
Setup of module gnote


--- NEW FILE Makefile ---
# Top level Makefile for module gnote
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 00:17:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:17:33 +0000 (UTC)
Subject: rpms/gnote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090410001733.700E170122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnote/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10926/rpms/gnote/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnote


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnote
# $Id: Makefile,v 1.1 2009/04/10 00:17:33 kevin Exp $
NAME := gnote
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 10 00:18:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:18:07 +0000
Subject: [pkgdb] astronomy-backgrounds was added for mmahut
Message-ID: <20090410001807.C5A3410F870@bastion2.fedora.phx.redhat.com>

kevin has added Package astronomy-backgrounds with summary Desktop wallpapers with Astronomy theme
kevin has approved Package astronomy-backgrounds
kevin has added a Fedora devel branch for astronomy-backgrounds with an owner of mmahut
kevin has approved astronomy-backgrounds in Fedora devel
kevin has approved Package astronomy-backgrounds
kevin has set commit to Approved for provenpackager on astronomy-backgrounds (Fedora devel)
kevin has set build to Approved for provenpackager on astronomy-backgrounds (Fedora devel)
kevin has set checkout to Approved for provenpackager on astronomy-backgrounds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astronomy-backgrounds



From kevin at fedoraproject.org  Fri Apr 10 00:18:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:18:27 +0000 (UTC)
Subject: rpms/astronomy-backgrounds - New directory
Message-ID: <20090410001827.3C11F70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/astronomy-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11212/rpms/astronomy-backgrounds

Log Message:
Directory /cvs/pkgs/rpms/astronomy-backgrounds added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:18:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:18:27 +0000 (UTC)
Subject: rpms/astronomy-backgrounds/devel - New directory
Message-ID: <20090410001827.7EAD07013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/astronomy-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11212/rpms/astronomy-backgrounds/devel

Log Message:
Directory /cvs/pkgs/rpms/astronomy-backgrounds/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:18:38 +0000 (UTC)
Subject: rpms/astronomy-backgrounds Makefile,NONE,1.1
Message-ID: <20090410001838.DDFE470137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/astronomy-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11212/rpms/astronomy-backgrounds

Added Files:
	Makefile 
Log Message:
Setup of module astronomy-backgrounds


--- NEW FILE Makefile ---
# Top level Makefile for module astronomy-backgrounds
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 00:18:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:18:39 +0000 (UTC)
Subject: rpms/astronomy-backgrounds/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090410001839.4A89270137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/astronomy-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11212/rpms/astronomy-backgrounds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module astronomy-backgrounds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: astronomy-backgrounds
# $Id: Makefile,v 1.1 2009/04/10 00:18:39 kevin Exp $
NAME := astronomy-backgrounds
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 10 00:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:19:30 +0000
Subject: [pkgdb] pidgin-musictracker was added for hpejakle
Message-ID: <20090410001931.76C0A10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package pidgin-musictracker with summary Pidgin displays the musictrack currently playing in your status
kevin has approved Package pidgin-musictracker
kevin has added a Fedora devel branch for pidgin-musictracker with an owner of hpejakle
kevin has approved pidgin-musictracker in Fedora devel
kevin has approved Package pidgin-musictracker
kevin has set commit to Approved for provenpackager on pidgin-musictracker (Fedora devel)
kevin has set build to Approved for provenpackager on pidgin-musictracker (Fedora devel)
kevin has set checkout to Approved for provenpackager on pidgin-musictracker (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-musictracker



From pkgdb at fedoraproject.org  Fri Apr 10 00:19:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:19:36 +0000
Subject: [pkgdb] pidgin-musictracker (Fedora, 10) updated by kevin
Message-ID: <20090410001937.7507710F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pidgin-musictracker
kevin has set commit to Approved for provenpackager on pidgin-musictracker (Fedora 10)
kevin has set build to Approved for provenpackager on pidgin-musictracker (Fedora 10)
kevin has set checkout to Approved for provenpackager on pidgin-musictracker (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-musictracker



From pkgdb at fedoraproject.org  Fri Apr 10 00:19:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:19:36 +0000
Subject: [pkgdb] pidgin-musictracker (Fedora, 11) updated by kevin
Message-ID: <20090410001937.8BC4610F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pidgin-musictracker
kevin has set commit to Approved for provenpackager on pidgin-musictracker (Fedora 11)
kevin has set build to Approved for provenpackager on pidgin-musictracker (Fedora 11)
kevin has set checkout to Approved for provenpackager on pidgin-musictracker (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-musictracker



From pkgdb at fedoraproject.org  Fri Apr 10 00:19:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:19:36 +0000
Subject: [pkgdb] pidgin-musictracker (Fedora, 9) updated by kevin
Message-ID: <20090410001937.9C13810F878@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pidgin-musictracker
kevin has set commit to Approved for provenpackager on pidgin-musictracker (Fedora 9)
kevin has set build to Approved for provenpackager on pidgin-musictracker (Fedora 9)
kevin has set checkout to Approved for provenpackager on pidgin-musictracker (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-musictracker



From kevin at fedoraproject.org  Fri Apr 10 00:19:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:19:50 +0000 (UTC)
Subject: rpms/pidgin-musictracker - New directory
Message-ID: <20090410001950.34F9F70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-musictracker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR12070/rpms/pidgin-musictracker

Log Message:
Directory /cvs/pkgs/rpms/pidgin-musictracker added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:19:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:19:50 +0000 (UTC)
Subject: rpms/pidgin-musictracker/devel - New directory
Message-ID: <20090410001950.79B8570122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-musictracker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR12070/rpms/pidgin-musictracker/devel

Log Message:
Directory /cvs/pkgs/rpms/pidgin-musictracker/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 10 00:20:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:20:01 +0000 (UTC)
Subject: rpms/pidgin-musictracker Makefile,NONE,1.1
Message-ID: <20090410002001.1C22D70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-musictracker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR12070/rpms/pidgin-musictracker

Added Files:
	Makefile 
Log Message:
Setup of module pidgin-musictracker


--- NEW FILE Makefile ---
# Top level Makefile for module pidgin-musictracker
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 00:20:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 00:20:01 +0000 (UTC)
Subject: rpms/pidgin-musictracker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090410002001.BAFCA70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-musictracker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR12070/rpms/pidgin-musictracker/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pidgin-musictracker


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pidgin-musictracker
# $Id: Makefile,v 1.1 2009/04/10 00:20:01 kevin Exp $
NAME := pidgin-musictracker
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 10 00:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:26:17 +0000
Subject: [pkgdb] phoronix-test-suite (Fedora EPEL, 4) updated by kevin
Message-ID: <20090410002518.886BF10F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for phoronix-test-suite
kevin has set commit to Approved for provenpackager on phoronix-test-suite (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on phoronix-test-suite (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on phoronix-test-suite (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phoronix-test-suite



From pkgdb at fedoraproject.org  Fri Apr 10 00:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 00:26:17 +0000
Subject: [pkgdb] phoronix-test-suite (Fedora EPEL, 5) updated by kevin
Message-ID: <20090410002518.90AA710F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for phoronix-test-suite
kevin has set commit to Approved for provenpackager on phoronix-test-suite (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on phoronix-test-suite (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on phoronix-test-suite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phoronix-test-suite



From jussilehtola at fedoraproject.org  Fri Apr 10 00:42:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri, 10 Apr 2009 00:42:34 +0000 (UTC)
Subject: rpms/pidgin-latex/devel import.log, NONE, 1.1 pidgin-latex.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410004234.5FE4170122@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17754/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-latex.spec 
Log Message:
* Fri Apr 10 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Import to Fedora.



--- NEW FILE import.log ---
pidgin-latex-1_3-2_fc10:HEAD:pidgin-latex-1.3-2.fc10.src.rpm:1239324042


--- NEW FILE pidgin-latex.spec ---
Name:		pidgin-latex
Version:	1.3
Release:	2%{?dist}
Summary:	Use LaTeX formulas in your pidgin conversations 
Group:		Applications/Internet
License:	GPLv2+
URL:		http://sourceforge.net/projects/pidgin-latex
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	pidgin-devel
Requires:	dvipng
Requires:	tex(latex)
Requires:	pidgin

%description
The plugin looks for $$latex math$$ patterns, and replaces them by the rendered
latex output by way of latex and imagemagick. The graphics is only displayed
locally, so your conversation partner will have to use the plugin, too 
(With MSN, this constraint might not hold). This plugin is compatible with the 
similar kopete latex plugin, as it uses the $$ as delimiters, too.

%prep
%setup -q -n %{name}

%build
CFLAGS="%{optflags}" make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make LIB_INSTALL_DIR=%{buildroot}%{_libdir}/pidgin install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README TODO
%{_libdir}/pidgin/*.so

%changelog
* Thu Apr 09 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Some minor aesthetical cleanups that came up with review.

* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-1
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:11:59 -0000	1.1
+++ .cvsignore	10 Apr 2009 00:42:03 -0000	1.2
@@ -0,0 +1 @@
+pidgin-latex-1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:12:00 -0000	1.1
+++ sources	10 Apr 2009 00:42:03 -0000	1.2
@@ -0,0 +1 @@
+33aa374092e9a83f82b49602fb9296a6  pidgin-latex-1.3.tar.bz2



From lennart at fedoraproject.org  Fri Apr 10 00:44:50 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 10 Apr 2009 00:44:50 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.32, 1.33 pulseaudio.spec, 1.78, 
	1.79 sources, 1.33,
	1.34 0001-load-bt-discover-module-only-when-installed.patch, 1.1, NONE
Message-ID: <20090410004450.DDE6A70122@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18902

Modified Files:
	.cvsignore pulseaudio.spec sources 
Removed Files:
	0001-load-bt-discover-module-only-when-installed.patch 
Log Message:
New test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	1 Apr 2009 01:25:55 -0000	1.32
+++ .cvsignore	10 Apr 2009 00:44:17 -0000	1.33
@@ -1 +1 @@
-pulseaudio-0.9.15-test7.tar.gz
+pulseaudio-0.9.15-test8.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- pulseaudio.spec	1 Apr 2009 15:03:38 -0000	1.78
+++ pulseaudio.spec	10 Apr 2009 00:44:17 -0000	1.79
@@ -3,10 +3,10 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	8.test7%{?dist}
+Release:	9.test8%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
-Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz
+Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test8.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -49,7 +49,6 @@
 Obsoletes:	pulseaudio-core-libs
 Provides:	pulseaudio-core-libs
 Requires:	udev-extras
-Patch0:		0001-load-bt-discover-module-only-when-installed.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -97,6 +96,7 @@
 Summary:	Bluetooth proximity support for the PulseAudio sound server
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
+Requires:	bluez >= 4.34
 
 %description module-bluetooth
 Contains a module that can be used to automatically turn down the volume if
@@ -186,8 +186,7 @@
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.15-test7
-%patch0 -p1 -b .load-bt-discover-module-only-when-installed
+%setup -q -T -b0 -n pulseaudio-0.9.15-test8
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -408,6 +407,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Thu Apr 9 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-9.test8
+- New test release
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-8.test7
 - Only load bt modules when installed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	1 Apr 2009 01:25:55 -0000	1.33
+++ sources	10 Apr 2009 00:44:18 -0000	1.34
@@ -1 +1 @@
-411d7c85bb58f351b8120c876eb43317  pulseaudio-0.9.15-test7.tar.gz
+52f2a7c7c58f076be1dda560f325b368  pulseaudio-0.9.15-test8.tar.gz


--- 0001-load-bt-discover-module-only-when-installed.patch DELETED ---



From jussilehtola at fedoraproject.org  Fri Apr 10 00:45:37 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri, 10 Apr 2009 00:45:37 +0000 (UTC)
Subject: rpms/pidgin-latex/F-11 pidgin-latex.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090410004538.136FE70122@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18906/F-11

Modified Files:
	sources 
Added Files:
	pidgin-latex.spec 
Log Message:
* Fri Apr 10 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Import to Fedora.



--- NEW FILE pidgin-latex.spec ---
Name:		pidgin-latex
Version:	1.3
Release:	2%{?dist}
Summary:	Use LaTeX formulas in your pidgin conversations 
Group:		Applications/Internet
License:	GPLv2+
URL:		http://sourceforge.net/projects/pidgin-latex
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	pidgin-devel
Requires:	dvipng
Requires:	tex(latex)
Requires:	pidgin

%description
The plugin looks for $$latex math$$ patterns, and replaces them by the rendered
latex output by way of latex and imagemagick. The graphics is only displayed
locally, so your conversation partner will have to use the plugin, too 
(With MSN, this constraint might not hold). This plugin is compatible with the 
similar kopete latex plugin, as it uses the $$ as delimiters, too.

%prep
%setup -q -n %{name}

%build
CFLAGS="%{optflags}" make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make LIB_INSTALL_DIR=%{buildroot}%{_libdir}/pidgin install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README TODO
%{_libdir}/pidgin/*.so

%changelog
* Thu Apr 09 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Some minor aesthetical cleanups that came up with review.

* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:12:00 -0000	1.1
+++ sources	10 Apr 2009 00:45:35 -0000	1.2
@@ -0,0 +1 @@
+33aa374092e9a83f82b49602fb9296a6  pidgin-latex-1.3.tar.bz2



From jussilehtola at fedoraproject.org  Fri Apr 10 00:45:56 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri, 10 Apr 2009 00:45:56 +0000 (UTC)
Subject: rpms/pidgin-latex/EL-5 pidgin-latex.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090410004556.EB58C70122@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18906/EL-5

Modified Files:
	sources 
Added Files:
	pidgin-latex.spec 
Log Message:
* Fri Apr 10 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Import to Fedora.



--- NEW FILE pidgin-latex.spec ---
Name:		pidgin-latex
Version:	1.3
Release:	2%{?dist}
Summary:	Use LaTeX formulas in your pidgin conversations 
Group:		Applications/Internet
License:	GPLv2+
URL:		http://sourceforge.net/projects/pidgin-latex
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	pidgin-devel
Requires:	dvipng
Requires:	tex(latex)
Requires:	pidgin

%description
The plugin looks for $$latex math$$ patterns, and replaces them by the rendered
latex output by way of latex and imagemagick. The graphics is only displayed
locally, so your conversation partner will have to use the plugin, too 
(With MSN, this constraint might not hold). This plugin is compatible with the 
similar kopete latex plugin, as it uses the $$ as delimiters, too.

%prep
%setup -q -n %{name}

%build
CFLAGS="%{optflags}" make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make LIB_INSTALL_DIR=%{buildroot}%{_libdir}/pidgin install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README TODO
%{_libdir}/pidgin/*.so

%changelog
* Thu Apr 09 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Some minor aesthetical cleanups that came up with review.

* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:12:00 -0000	1.1
+++ sources	10 Apr 2009 00:45:22 -0000	1.2
@@ -0,0 +1 @@
+33aa374092e9a83f82b49602fb9296a6  pidgin-latex-1.3.tar.bz2



From jussilehtola at fedoraproject.org  Fri Apr 10 00:45:57 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri, 10 Apr 2009 00:45:57 +0000 (UTC)
Subject: rpms/pidgin-latex/F-10 pidgin-latex.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090410004557.873BE70122@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pidgin-latex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18906/F-10

Modified Files:
	sources 
Added Files:
	pidgin-latex.spec 
Log Message:
* Fri Apr 10 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Import to Fedora.



--- NEW FILE pidgin-latex.spec ---
Name:		pidgin-latex
Version:	1.3
Release:	2%{?dist}
Summary:	Use LaTeX formulas in your pidgin conversations 
Group:		Applications/Internet
License:	GPLv2+
URL:		http://sourceforge.net/projects/pidgin-latex
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	pidgin-devel
Requires:	dvipng
Requires:	tex(latex)
Requires:	pidgin

%description
The plugin looks for $$latex math$$ patterns, and replaces them by the rendered
latex output by way of latex and imagemagick. The graphics is only displayed
locally, so your conversation partner will have to use the plugin, too 
(With MSN, this constraint might not hold). This plugin is compatible with the 
similar kopete latex plugin, as it uses the $$ as delimiters, too.

%prep
%setup -q -n %{name}

%build
CFLAGS="%{optflags}" make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make LIB_INSTALL_DIR=%{buildroot}%{_libdir}/pidgin install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README TODO
%{_libdir}/pidgin/*.so

%changelog
* Thu Apr 09 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-2
- Some minor aesthetical cleanups that came up with review.

* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.3-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-latex/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:12:00 -0000	1.1
+++ sources	10 Apr 2009 00:45:25 -0000	1.2
@@ -0,0 +1 @@
+33aa374092e9a83f82b49602fb9296a6  pidgin-latex-1.3.tar.bz2



From lennart at fedoraproject.org  Fri Apr 10 01:16:20 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 10 Apr 2009 01:16:20 +0000 (UTC)
Subject: rpms/pavucontrol/devel .cvsignore, 1.10, 1.11 pavucontrol.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20090410011620.8D75270122@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28164

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
Third preview of upcoming 0.9.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Mar 2009 13:49:45 -0000	1.10
+++ .cvsignore	10 Apr 2009 01:16:18 -0000	1.11
@@ -1 +1 @@
-pavucontrol-0.9.7.git20090305.tar.gz
+pavucontrol-0.9.7.git20090410.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pavucontrol.spec	5 Mar 2009 13:49:45 -0000	1.16
+++ pavucontrol.spec	10 Apr 2009 01:16:18 -0000	1.17
@@ -1,12 +1,12 @@
 Name:           pavucontrol
 Version:        0.9.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.git20090305.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.git20090410.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pulseaudio-libs-devel >= 0.9.15-3.test4
@@ -56,6 +56,9 @@
 %{_datadir}/applications/pavucontrol.desktop
 
 %changelog
+* Fri Apr 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.7-6
+- Third preview of upcoming 0.9.8
+
 * Thu Mar 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.7-5
 - Second preview of upcoming 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Mar 2009 13:49:45 -0000	1.10
+++ sources	10 Apr 2009 01:16:18 -0000	1.11
@@ -1 +1 @@
-cd1f5d470972a0bc45ca1a6595d05557  pavucontrol-0.9.7.git20090305.tar.gz
+18bac4edb4dbf15bf1f5fed0958e25ee  pavucontrol-0.9.7.git20090410.tar.gz



From davidz at fedoraproject.org  Fri Apr 10 01:24:24 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Fri, 10 Apr 2009 01:24:24 +0000 (UTC)
Subject: rpms/gvfs/devel gdu-0001-Bug-573826-gdu-volume-monitor.patch, NONE, 
	1.1 gdu-0002-Fix-how-we-determine-if-a-volume-is-ignored.patch, NONE,
	1.1
	gdu-0003-Avoid-automounting-volumes-on-virtual-and-unknown-bu.patch,
	NONE, 1.1 gdu-0004-Remove-debug-spew.patch, NONE, 1.1
	gdu-0005-Don-t-add-a-volume-if-the-device-is-mounted-and-igno.patch,
	NONE, 1.1
	gdu-0006-Ignore-drives-if-all-volumes-of-the-drive-are-ignore.patch,
	NONE,
	1.1 gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch, 
	NONE, 1.1 gvfs.spec, 1.120,
	1.121 gvfs-1.1.7-gdu-monitor-empty-drives.patch, 1.1,
	NONE gvfs-1.2.0-fix-daemon-mount-op-bgo575728.patch, 1.1,
	NONE gvfs-1.2.1-only-mount-the-metal.patch, 1.1,
	NONE gvfs-gdu-volume-monitor-3.patch, 1.1, NONE
Message-ID: <20090410012424.F270570122@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30623

Modified Files:
	gvfs.spec 
Added Files:
	gdu-0001-Bug-573826-gdu-volume-monitor.patch 
	gdu-0002-Fix-how-we-determine-if-a-volume-is-ignored.patch 
	gdu-0003-Avoid-automounting-volumes-on-virtual-and-unknown-bu.patch 
	gdu-0004-Remove-debug-spew.patch 
	gdu-0005-Don-t-add-a-volume-if-the-device-is-mounted-and-igno.patch 
	gdu-0006-Ignore-drives-if-all-volumes-of-the-drive-are-ignore.patch 
	gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch 
Removed Files:
	gvfs-1.1.7-gdu-monitor-empty-drives.patch 
	gvfs-1.2.0-fix-daemon-mount-op-bgo575728.patch 
	gvfs-1.2.1-only-mount-the-metal.patch 
	gvfs-gdu-volume-monitor-3.patch 
Log Message:
* Thu Apr  9 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-3
- Clean up gdu patches and bump BR for gdu to 0.3
- Avoiding showing volume for ignored mounts (#495033)



gdu-0001-Bug-573826-gdu-volume-monitor.patch:

--- NEW FILE gdu-0001-Bug-573826-gdu-volume-monitor.patch ---
>From 9d51c0de20170731db25422e858fee0e44b1dbd1 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 19:01:18 -0400
Subject: [PATCH 1/7] =?utf-8?q?Bug=20573826=20=E2=80=93=20gdu=20volume=20monitor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Add the GNOME Disk Utility based volume monitor, see

 http://bugzilla.gnome.org/show_bug.cgi?id=573826
 http://mail.gnome.org/archives/gvfs-list/2009-March/msg00002.html

for details.
---
 configure.ac                                       |   28 +-
 monitor/Makefile.am                                |    4 +
 monitor/gdu/Makefile.am                            |   53 +
 monitor/gdu/gdu-volume-monitor-daemon.c            |   46 +
 monitor/gdu/gdu.monitor                            |    5 +
 monitor/gdu/ggdudrive.c                            |  691 ++++++++++
 monitor/gdu/ggdudrive.h                            |   69 +
 monitor/gdu/ggdumount.c                            |  958 +++++++++++++
 monitor/gdu/ggdumount.h                            |   64 +
 monitor/gdu/ggduvolume.c                           | 1408 +++++++++++++++++++
 monitor/gdu/ggduvolume.h                           |   78 ++
 monitor/gdu/ggduvolumemonitor.c                    | 1432 ++++++++++++++++++++
 monitor/gdu/ggduvolumemonitor.h                    |   60 +
 .../org.gtk.Private.GduVolumeMonitor.service.in    |    3 +
 monitor/gdu/polkit.c                               |  137 ++
 monitor/gdu/polkit.h                               |   44 +
 16 files changed, 5079 insertions(+), 1 deletions(-)
 create mode 100644 monitor/gdu/Makefile.am
 create mode 100644 monitor/gdu/gdu-volume-monitor-daemon.c
 create mode 100644 monitor/gdu/gdu.monitor
 create mode 100644 monitor/gdu/ggdudrive.c
 create mode 100644 monitor/gdu/ggdudrive.h
 create mode 100644 monitor/gdu/ggdumount.c
 create mode 100644 monitor/gdu/ggdumount.h
 create mode 100644 monitor/gdu/ggduvolume.c
 create mode 100644 monitor/gdu/ggduvolume.h
 create mode 100644 monitor/gdu/ggduvolumemonitor.c
 create mode 100644 monitor/gdu/ggduvolumemonitor.h
 create mode 100644 monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in
 create mode 100644 monitor/gdu/polkit.c
 create mode 100644 monitor/gdu/polkit.h

diff --git a/configure.ac b/configure.ac
index 311127e..895309b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,6 +198,30 @@ AC_SUBST(GCONF_CFLAGS)
 
 AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"])
 
+dnl ************************************
+dnl *** Check for gnome-disk-utility ***
+dnl ************************************
+
+AC_ARG_ENABLE(gdu, [  --disable-gdu           build without GDU volume monitor])
+msg_gdu=no
+GDU_LIBS=
+GDU_CFLAGS=
+GDU_REQUIRED=0.3
+
+if test "x$enable_gdu" != "xno"; then
+  PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes)
+
+  if test "x$msg_gdu" == "xyes"; then
+    PKG_CHECK_MODULES([GDU],[gdu >= $GDU_REQUIRED])
+    AC_DEFINE(HAVE_GDU, 1, [Define to 1 if gnome-disk-utility is available])
+  fi
+fi
+
+AC_SUBST(GDU_LIBS)
+AC_SUBST(GDU_CFLAGS)
+
+AM_CONDITIONAL(USE_GDU, [test "$msg_gdu" = "yes"])
+
 dnl **********************
 dnl *** Check for HAL ***
 dnl **********************
@@ -558,6 +582,7 @@ daemon/Makefile
 monitor/Makefile
 monitor/proxy/Makefile
 monitor/hal/Makefile
+monitor/gdu/Makefile
 monitor/gphoto2/Makefile
 gconf/Makefile
 programs/Makefile
@@ -579,7 +604,8 @@ echo "
 	archive support:	      $msg_archive
         GConf support:                $msg_gconf
         DNS-SD support:               $msg_avahi
-	Use HAL for volume monitor:   $msg_hal (with fast init path: $have_hal_fast_init)
+	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
+	Build GDU volume monitor:     $msg_gdu
 	GNOME Keyring support:        $msg_keyring
 	Bash-completion support:      $msg_bash_completion
 "
diff --git a/monitor/Makefile.am b/monitor/Makefile.am
index d4197d5..f68423e 100644
--- a/monitor/Makefile.am
+++ b/monitor/Makefile.am
@@ -5,6 +5,10 @@ if USE_HAL
 SUBDIRS += hal
 endif
 
+if USE_GDU
+SUBDIRS += gdu
+endif
+
 if USE_GPHOTO2
 SUBDIRS += gphoto2
 endif
diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
new file mode 100644
index 0000000..10b80f3
--- /dev/null
+++ b/monitor/gdu/Makefile.am
@@ -0,0 +1,53 @@
+
+NULL =
+
+libexec_PROGRAMS = gvfs-gdu-volume-monitor
+
+
+gvfs_gdu_volume_monitor_SOURCES =			\
+	gdu-volume-monitor-daemon.c			\
+	ggdudrive.c		ggdudrive.h		\
+	ggduvolume.c		ggduvolume.h		\
+	ggdumount.c		ggdumount.h		\
+	ggduvolumemonitor.c	ggduvolumemonitor.h	\
+	polkit.c		polkit.h		\
+	$(NULL)
+
+gvfs_gdu_volume_monitor_CFLAGS =		\
+	-DG_LOG_DOMAIN=\"GVFS-Gdu\"		\
+	-I$(top_srcdir)/common                  \
+	-I$(top_srcdir)/monitor/proxy           \
+	$(GLIB_CFLAGS)                          \
+	$(GDU_CFLAGS)                           \
+	$(DBUS_CFLAGS)                          \
+	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
+	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
+	-DG_DISABLE_DEPRECATED			\
+	-DGDU_API_IS_SUBJECT_TO_CHANGE		\
+	$(NULL)
+
+gvfs_gdu_volume_monitor_LDFLAGS =	\
+	$(NULL)
+
+gvfs_gdu_volume_monitor_LDADD  =		     			      \
+	$(GLIB_LIBS)                                 			      \
+	$(GDU_LIBS)                                  			      \
+	$(DBUS_LIBS)                                 				\
+	$(top_builddir)/common/libgvfscommon.la 			      \
+	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
+	$(NULL)
+
+remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
+remote_volume_monitors_DATA = gdu.monitor
+
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = org.gtk.Private.GduVolumeMonitor.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+clean-local:
+	rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA)
+
+EXTRA_DIST = $(service_in_files) gdu.monitor
diff --git a/monitor/gdu/gdu-volume-monitor-daemon.c b/monitor/gdu/gdu-volume-monitor-daemon.c
new file mode 100644
index 0000000..cdb4f84
--- /dev/null
+++ b/monitor/gdu/gdu-volume-monitor-daemon.c
@@ -0,0 +1,46 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* gvfs - extensions for gio
+ *
+ * Copyright (C) 2006-2009 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
[...4851 lines suppressed...]
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gtk.Private.GduVolumeMonitor
+Exec=@libexecdir@/gvfs-gdu-volume-monitor
diff --git a/monitor/gdu/polkit.c b/monitor/gdu/polkit.c
new file mode 100644
index 0000000..5c37ba6
--- /dev/null
+++ b/monitor/gdu/polkit.c
@@ -0,0 +1,137 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* gvfs - extensions for gio
+ *
+ * Copyright (C) 2006-2009 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz at redhat.com>
+ */
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <gdbusutils.h>
+
+#include "polkit.h"
+
+static void
+_obtain_authz_cb (DBusMessage *reply,
+                  GError      *error,
+                  gpointer     user_data)
+{
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+  gboolean gained_authz;
+  DBusError derror;
+
+  if (error != NULL) {
+    g_simple_async_result_set_from_error (simple, error);
+    goto out;
+  }
+
+  dbus_error_init (&derror);
+  if (!dbus_message_get_args (reply,
+                              &derror,
+                              DBUS_TYPE_BOOLEAN, &gained_authz,
+                              DBUS_TYPE_INVALID))
+    {
+      /* no need to translate; this only happens if the auth agent is buggy */
+      g_simple_async_result_set_error (simple,
+                                       G_IO_ERROR,
+                                       G_IO_ERROR_FAILED,
+                                       "Error parsing reply for ObtainAuthorization(): %s: %s",
+                                       derror.name, derror.message);
+      dbus_error_free (&derror);
+      goto out;
+    }
+
+  if (!gained_authz && error == NULL)
+    {
+      /* no need to translate, is never shown */
+      g_simple_async_result_set_error (simple,
+                                       G_IO_ERROR,
+                                       G_IO_ERROR_FAILED_HANDLED,
+                                       "Didn't obtain authorization (bug in libgio user, it shouldn't display this error)");
+    }
+
+ out:
+  g_simple_async_result_complete (simple);
+  g_object_unref (simple);
+}
+
+
+gboolean
+_obtain_authz_finish (GAsyncResult *res,
+                      GError       **error)
+{
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+
+  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == _obtain_authz);
+
+  if (g_simple_async_result_propagate_error (simple, error))
+    return FALSE;
+  else
+    return TRUE;
+}
+
+void
+_obtain_authz (const gchar *action_id,
+               GCancellable *cancellable,
+               GAsyncReadyCallback callback,
+               gpointer user_data)
+{
+  DBusConnection *connection;
+  DBusMessage *message;
+  GSimpleAsyncResult *simple;
+  guint xid;
+  guint pid;
+  DBusError derror;
+
+  dbus_error_init (&derror);
+
+  /* this connection is already integrated and guaranteed to exist, see gvfsproxyvolumemonitordaemon.c */
+  connection = dbus_bus_get (DBUS_BUS_SESSION, &derror);
+
+  simple = g_simple_async_result_new (NULL,
+                                      callback,
+                                      user_data,
+                                      _obtain_authz);
+
+  message = dbus_message_new_method_call ("org.freedesktop.PolicyKit.AuthenticationAgent", /* bus name */
+                                          "/",                                             /* object */
+                                          "org.freedesktop.PolicyKit.AuthenticationAgent", /* interface */
+                                          "ObtainAuthorization");
+
+  xid = 0;
+  pid = getpid ();
+
+  dbus_message_append_args (message,
+                            DBUS_TYPE_STRING,
+                            &(action_id),
+                            DBUS_TYPE_UINT32,
+                            &(xid),
+                            DBUS_TYPE_UINT32,
+                            &(pid),
+                            DBUS_TYPE_INVALID);
+
+  _g_dbus_connection_call_async (connection,
+                                 message,
+                                 -1,
+                                 (GAsyncDBusCallback) _obtain_authz_cb,
+                                 simple);
+  dbus_message_unref (message);
+  dbus_connection_unref (connection);
+}
diff --git a/monitor/gdu/polkit.h b/monitor/gdu/polkit.h
new file mode 100644
index 0000000..4b26189
--- /dev/null
+++ b/monitor/gdu/polkit.h
@@ -0,0 +1,44 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* gvfs - extensions for gio
+ *
+ * Copyright (C) 2006-2009 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz at redhat.com>
+ */
+
+
+#ifndef __POLKIT_H__
+#define __POLKIT_H__
+
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <polkit/polkit.h>
+
+G_BEGIN_DECLS
+
+void _obtain_authz (const gchar        *action_id,
+                    GCancellable       *cancellable,
+                    GAsyncReadyCallback callback,
+                    gpointer            user_data);
+
+gboolean _obtain_authz_finish (GAsyncResult  *res,
+                               GError       **error);
+
+G_END_DECLS
+
+#endif /* __POLKIT_H__ */
-- 
1.6.2.2


gdu-0002-Fix-how-we-determine-if-a-volume-is-ignored.patch:

--- NEW FILE gdu-0002-Fix-how-we-determine-if-a-volume-is-ignored.patch ---
>From 94707c12442ed9ce099f110ec7089309133727ae Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 9 Apr 2009 19:03:16 -0400
Subject: [PATCH 2/7] Fix how we determine if a volume is ignored

This fixes a typo - wrong assignment of device file when testing whether the
volume should be ignored or not. It led to empty GVolume list associated to a
GDrive and thus inability to mount anything via computer://

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 monitor/gdu/ggduvolumemonitor.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 32604d0..b52ee11 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -617,7 +617,7 @@ get_mount_point_for_device (GduDevice *d, GList *fstab_mount_points)
   for (l = fstab_mount_points; l != NULL; l = l->next)
     {
       GUnixMountPoint *mount_point = l->data;
-      const gchar *device_file;
+      const gchar *fstab_device_file;
       const gchar *fstab_mount_path;
 
       fstab_mount_path = g_unix_mount_point_get_mount_path (mount_point);
@@ -627,18 +627,18 @@ get_mount_point_for_device (GduDevice *d, GList *fstab_mount_points)
           goto out;
         }
 
-      device_file = g_unix_mount_point_get_device_path (mount_point);
-      if (g_str_has_prefix (device_file, "LABEL="))
+      fstab_device_file = g_unix_mount_point_get_device_path (mount_point);
+      if (g_str_has_prefix (fstab_device_file, "LABEL="))
         {
-          if (g_strcmp0 (device_file + 6, gdu_device_id_get_label (d)) == 0)
+          if (g_strcmp0 (fstab_device_file + 6, gdu_device_id_get_label (d)) == 0)
             {
               ret = mount_point;
               goto out;
             }
         }
-      else if (g_str_has_prefix (device_file, "UUID="))
+      else if (g_str_has_prefix (fstab_device_file, "UUID="))
         {
-          if (g_ascii_strcasecmp (device_file + 5, gdu_device_id_get_uuid (d)) == 0)
+          if (g_ascii_strcasecmp (fstab_device_file + 5, gdu_device_id_get_uuid (d)) == 0)
             {
               ret = mount_point;
               goto out;
@@ -646,11 +646,11 @@ get_mount_point_for_device (GduDevice *d, GList *fstab_mount_points)
         }
       else
         {
-          char resolved_device_file[PATH_MAX];
+          char resolved_fstab_device_file[PATH_MAX];
 
           /* handle symlinks such as /dev/disk/by-uuid/47C2-1994 */
-          if (realpath (device_file, resolved_device_file) != NULL &&
-              g_strcmp0 (resolved_device_file, device_file) == 0)
+          if (realpath (fstab_device_file, resolved_fstab_device_file) != NULL &&
+              g_strcmp0 (resolved_fstab_device_file, device_file) == 0)
             {
               ret = mount_point;
               goto out;
-- 
1.6.2.2


gdu-0003-Avoid-automounting-volumes-on-virtual-and-unknown-bu.patch:

--- NEW FILE gdu-0003-Avoid-automounting-volumes-on-virtual-and-unknown-bu.patch ---
>From 47a663c7ad7b9de9942b9b740abff6610968a402 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 19:05:37 -0400
Subject: [PATCH 3/7] Avoid automounting volumes on virtual and unknown buses

Basically we want to avoid automounting volumes from

 1. drives on a 'virtual' or unset bus
 2. volumes without a drive

This is to avoid interference with things like Fedora's livecd-tools
that use device-mapper to set up images. See

 https://bugzilla.redhat.com/show_bug.cgi?id=494144 for more

background.

In the future we might want to relax 1. so automounting things like
Linux MD and LVM2 devices work.
---
 monitor/gdu/ggduvolume.c |   50 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index b540325..a5a3321 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -293,6 +293,56 @@ update_volume (GGduVolume *volume)
             volume->should_automount = FALSE;
         }
 
+      /* Avoid automounting volumes from
+       *
+       * 1. drives on a 'virtual' or unset bus
+       * 2. volumes without a drive
+       *
+       * This is to avoid interference with things like Fedora's
+       * livecd-tools that use device-mapper to set up images. See
+       * https://bugzilla.redhat.com/show_bug.cgi?id=494144 for more
+       * background.
+       *
+       * In the future we might want to relax 1. so automounting
+       * things like Linux MD and LVM2 devices work.
+       */
+      if (volume->drive != NULL)
+        {
+          GduPresentable *drive_presentable;
+          drive_presentable = g_gdu_drive_get_presentable (volume->drive);
+          if (drive_presentable != NULL)
+            {
+              GduDevice *drive_device;
+              drive_device = gdu_presentable_get_device (drive_presentable);
+              if (drive_device != NULL)
+                {
+                  const gchar *bus;
+                  bus = gdu_device_drive_get_connection_interface (drive_device);
+                  if (bus == NULL || strlen (bus) == 0 || g_strcmp0 (bus, "virtual") == 0)
+                    {
+                      volume->should_automount = FALSE;
+                    }
+                  g_object_unref (drive_device);
+                }
+              else
+                {
+                  volume->should_automount = FALSE;
+                }
+            }
+          else
+            {
+              volume->should_automount = FALSE;
+            }
+        }
+      else
+        {
+          volume->should_automount = FALSE;
+        }
+
+      g_debug ("should_automount = %d for %s",
+               volume->should_automount,
+               device != NULL ? gdu_device_get_device_file (device) : "(none)");
+
       g_free (activation_uri);
     }
 
-- 
1.6.2.2


gdu-0004-Remove-debug-spew.patch:

--- NEW FILE gdu-0004-Remove-debug-spew.patch ---
>From 82202f50bb76248f5a6368fe08de947758674acd Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 19:14:25 -0400
Subject: [PATCH 4/7] Remove debug spew

---
 monitor/gdu/ggduvolume.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index a5a3321..6779f0f 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -339,10 +339,6 @@ update_volume (GGduVolume *volume)
           volume->should_automount = FALSE;
         }
 
-      g_debug ("should_automount = %d for %s",
-               volume->should_automount,
-               device != NULL ? gdu_device_get_device_file (device) : "(none)");
-
       g_free (activation_uri);
     }
 
-- 
1.6.2.2


gdu-0005-Don-t-add-a-volume-if-the-device-is-mounted-and-igno.patch:

--- NEW FILE gdu-0005-Don-t-add-a-volume-if-the-device-is-mounted-and-igno.patch ---
>From d9a00cc6172e2bf82f6825023c7a619be7f56747 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 19:33:35 -0400
Subject: [PATCH 5/7] Don't add a volume if the device is mounted and ignored

This fixes a problem where e.g. /dev/sdb1 a) is not referenced in
/etc/fstab; and b) is mounted in an ignored location e.g. /mnt/live.

Specifically this bug affects the Fedora Live CD, see
https://bugzilla.redhat.com/show_bug.cgi?id=495033 for details.
---
 monitor/gdu/ggduvolumemonitor.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index b52ee11..93aaf03 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -671,9 +671,6 @@ should_mount_be_ignored (GduPool *pool, GduDevice *d)
 
   ret = FALSE;
 
-  if (gdu_device_is_mounted (d))
-    goto out;
-
   mount_path = gdu_device_get_mount_path (d);
   if (mount_path == NULL || strlen (mount_path) == 0)
     goto out;
-- 
1.6.2.2


gdu-0006-Ignore-drives-if-all-volumes-of-the-drive-are-ignore.patch:

--- NEW FILE gdu-0006-Ignore-drives-if-all-volumes-of-the-drive-are-ignore.patch ---
>From 346fdc3ddf383228ed58a48252e70919f6636b6e Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 19:39:55 -0400
Subject: [PATCH 6/7] Ignore drives if all volumes of the drive are ignored

---
 monitor/gdu/ggduvolumemonitor.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 93aaf03..9ecee8b 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -763,15 +763,17 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (d));
 
-  /* the GduDevice for an activatable drive (such as RAID) is NULL if the drive is not
-   * activated; never ignore these
+  /* If there is no GduDevice for a drive, then ignore it.
+   *
+   * Note that right now the only drives without a GduDevice are Linux
+   * MD arrays not yet activated. In the future we might want to
+   * display these so the user can start the array.
    */
   if (device == NULL)
-    goto out;
-
-  /* never ignore drives with removable media */
-  if (gdu_device_is_removable (device))
-    goto out;
+    {
+      ret = TRUE;
+      goto out;
+    }
 
   has_volumes = FALSE;
   all_volumes_are_ignored = TRUE;
-- 
1.6.2.2


gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch:

--- NEW FILE gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch ---
>From 303cfd43578f0a4198c063f1a5fbcd16fec2b0bf Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Apr 2009 21:04:24 -0400
Subject: [PATCH 7/7] =?utf-8?q?Bug=20576587=20=E2=80=93=20allow=20eject=20even=20on=20non-ejectable=20volumes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

This fixes a host of problems with e.g. Kindle or iPod devices
requiring to be "ejected" to display messages such as

 "If you want to use your Kindle and continue charging, please eject
 your Kindle from your computer."

to the user.

Previously we relied on HAL fdi files or similar to tag that such
devices needed to be ejectable. Now we just set everything as
ejectable.

For this to really work well the Nautilus patch in

 http://bugzilla.gnome.org/show_bug.cgi?id=574067

needs to be reverted.
---
 monitor/gdu/ggdudrive.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 257a113..29e108d 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -166,7 +166,11 @@ update_drive (GGduDrive *drive)
       drive->device_file = g_strdup (gdu_device_get_device_file (device));
       drive->is_media_removable = gdu_device_is_removable (device);
       drive->has_media = gdu_device_is_media_available (device);
-      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device);
+      /* All drives with removable media are ejectable
+       *
+       * See http://bugzilla.gnome.org/show_bug.cgi?id=576587 for why we want this.
+       */
+      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
       drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
       drive->can_poll_for_media = TRUE;
     }
-- 
1.6.2.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gvfs.spec	9 Apr 2009 18:36:06 -0000	1.120
+++ gvfs.spec	10 Apr 2009 01:24:24 -0000	1.121
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -19,7 +19,7 @@
 BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: GConf2-devel
-BuildRequires: gnome-disk-utility-devel >= 0.2
+BuildRequires: gnome-disk-utility-devel >= 0.3
 
 
 Requires(post): desktop-file-utils
@@ -30,18 +30,25 @@
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch1: gvfs-0.99.2-archive-integration.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
-Patch2: gvfs-gdu-volume-monitor-3.patch
+Patch2: gvfs-1.1.7-gdu-computer-expose-devices.patch
 
+# Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
+#
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
-Patch3: gvfs-1.1.7-gdu-monitor-empty-drives.patch
-
+Patch101: gdu-0001-Bug-573826-gdu-volume-monitor.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
-Patch4: gvfs-1.1.7-gdu-computer-expose-devices.patch
-
+Patch102: gdu-0002-Fix-how-we-determine-if-a-volume-is-ignored.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=494144
-Patch5: gvfs-1.2.1-only-mount-the-metal.patch
+Patch103: gdu-0003-Avoid-automounting-volumes-on-virtual-and-unknown-bu.patch
+Patch104: gdu-0004-Remove-debug-spew.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=495033
+Patch105: gdu-0005-Don-t-add-a-volume-if-the-device-is-mounted-and-igno.patch
+Patch106: gdu-0006-Ignore-drives-if-all-volumes-of-the-drive-are-ignore.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=576587
+# - Pending discussion + requires Nautilus patch
+#Patch107: gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -124,10 +131,15 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
-%patch2 -p0 -b .gdu
-%patch3 -p1 -b .gdu-volumes-typo
-%patch4 -p1 -b .computer-gdu
-%patch5 -p1 -b .metal
+%patch2 -p1 -b .computer-expose-devices
+
+%patch101 -p1 -b .gdu-volume-monitor
+%patch102 -p1 -b .gdu-volumes-typo
+%patch103 -p1 -b .gdu-avoid-automount
+%patch104 -p1 -b .gdu-debug-spew
+%patch105 -p1 -b .gdu-ignore-1
+%patch106 -p1 -b .gdu-ignore-2
+#%patch107 -p1 -b .gdu-always-eject
 
 %build
 
@@ -271,6 +283,10 @@
 
 
 %changelog
+* Thu Apr  9 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-3
+- Clean up gdu patches and bump BR for gdu to 0.3
+- Avoiding showing volume for ignored mounts (#495033)
+
 * Thu Apr  9 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-2
 - Avoid automounting device-mapper devices and similar (#494144)
 


--- gvfs-1.1.7-gdu-monitor-empty-drives.patch DELETED ---


--- gvfs-1.2.0-fix-daemon-mount-op-bgo575728.patch DELETED ---


--- gvfs-1.2.1-only-mount-the-metal.patch DELETED ---


--- gvfs-gdu-volume-monitor-3.patch DELETED ---



From ianweller at fedoraproject.org  Fri Apr 10 02:15:23 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 10 Apr 2009 02:15:23 +0000 (UTC)
Subject: rpms/lordsawar/devel .cvsignore, 1.3, 1.4 lordsawar.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090410021523.A4E4570122@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/lordsawar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12332

Modified Files:
	.cvsignore lordsawar.spec sources 
Log Message:
0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2008 04:20:29 -0000	1.3
+++ .cvsignore	10 Apr 2009 02:14:53 -0000	1.4
@@ -1 +1 @@
-lordsawar-0.1.4.tar.gz
+lordsawar-0.1.5.tar.gz


Index: lordsawar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/lordsawar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lordsawar.spec	5 Mar 2009 12:37:50 -0000	1.5
+++ lordsawar.spec	10 Apr 2009 02:14:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lordsawar
-Version:        0.1.4
-Release:        4%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
 Group:          Amusements/Games
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 0.1.5-1
+- 0.1.5
+
 * Thu Mar 05 2009 Caol??n McNamara <caolanm at redhat.com> - 0.1.4-4
 - include stdio.h for printf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2008 04:20:29 -0000	1.3
+++ sources	10 Apr 2009 02:14:53 -0000	1.4
@@ -1 +1 @@
-62b7d610a9697f1e357b12d5b8aa068a  lordsawar-0.1.4.tar.gz
+578ff15d67979b6ef50bc2108a5bba73  lordsawar-0.1.5.tar.gz



From mclasen at fedoraproject.org  Fri Apr 10 02:21:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 10 Apr 2009 02:21:39 +0000 (UTC)
Subject: rpms/control-center/devel display-capplet-mnemonics.patch, NONE,
	1.1 control-center.spec, 1.444, 1.445
Message-ID: <20090410022139.1BD2170122@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13904

Modified Files:
	control-center.spec 
Added Files:
	display-capplet-mnemonics.patch 
Log Message:
fix some mnemonics


display-capplet-mnemonics.patch:

--- NEW FILE display-capplet-mnemonics.patch ---
diff -up gnome-control-center-2.26.0/capplets/display/display-capplet.glade.mnemonics gnome-control-center-2.26.0/capplets/display/display-capplet.glade
--- gnome-control-center-2.26.0/capplets/display/display-capplet.glade.mnemonics	2009-04-09 22:17:08.628091488 -0400
+++ gnome-control-center-2.26.0/capplets/display/display-capplet.glade	2009-04-09 22:17:16.344090972 -0400
@@ -262,6 +262,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic-widget">resolution_combo</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
@@ -290,6 +291,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic-widget">refresh_combo</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
@@ -318,6 +320,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic-widget">rotation_combo</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">3</property>


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- control-center.spec	9 Apr 2009 03:05:55 -0000	1.444
+++ control-center.spec	10 Apr 2009 02:21:08 -0000	1.445
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -57,6 +57,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=154029
 Patch35: gnome-control-center-2.26.0-support-touchpads.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=578572
+Patch36: display-capplet-mnemonics.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -181,6 +184,7 @@
 %patch33 -p1 -b .notification-theme
 %patch34 -p0 -b .new-icons
 %patch35 -p1 -b .support-touchpads
+%patch36 -p1 -b .mnemonics
 pushd capplets/about-me
 mv *png icons/
 popd
@@ -356,6 +360,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
+- Make mnemonics in display capplet work
+
 * Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
 - Support touchpads
 



From ianweller at fedoraproject.org  Fri Apr 10 02:29:26 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 10 Apr 2009 02:29:26 +0000 (UTC)
Subject: rpms/gwibber/devel .cvsignore, 1.13, 1.14 gwibber.spec, 1.22,
	1.23 import.log, 1.14, 1.15 sources, 1.13, 1.14
Message-ID: <20090410022926.DB45970122@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16927/devel

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
import r286 in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Mar 2009 03:37:06 -0000	1.13
+++ .cvsignore	10 Apr 2009 02:28:55 -0000	1.14
@@ -1 +1 @@
-gwibber-251bzr.tar.gz
+gwibber-286bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gwibber.spec	18 Mar 2009 03:37:06 -0000	1.22
+++ gwibber.spec	10 Apr 2009 02:28:55 -0000	1.23
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 251
+%define bzr_rev 286
 
 Name:           gwibber
-Version:        0.9.1
+Version:        1.0.1
 Release:        1.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
@@ -12,7 +12,7 @@
 URL:            https://launchpad.net/gwibber
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  bzr branch -r %{bzr_rev} lp:gwibber/1.0
+#  bzr branch -r %{bzr_rev} lp:gwibber
 #  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 1.0.1-1.286bzr
+- Update from upstream revision 286
+
 * Tue Mar 17 2009 Ian Weller <ianweller at gmail.com> 0.9.1-1.251bzr
 - Update from upstream revision 251
 - Adjust pjones's patch to use spaces


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	18 Mar 2009 03:37:06 -0000	1.14
+++ import.log	10 Apr 2009 02:28:55 -0000	1.15
@@ -12,3 +12,4 @@
 gwibber-0_7_3-6_237bzr_fc10:HEAD:gwibber-0.7.3-6.237bzr.fc10.src.rpm:1234652205
 gwibber-0_8-1_239bzr_fc10:HEAD:gwibber-0.8-1.239bzr.fc10.src.rpm:1234827314
 gwibber-0_9_1-1_251bzr_fc10:HEAD:gwibber-0.9.1-1.251bzr.fc10.src.rpm:1237347395
+gwibber-1_0_1-1_286bzr_fc10:HEAD:gwibber-1.0.1-1.286bzr.fc10.src.rpm:1239329825


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Mar 2009 03:37:06 -0000	1.13
+++ sources	10 Apr 2009 02:28:55 -0000	1.14
@@ -1 +1 @@
-8df82f9c3f1dd9509e53a8a04f16dad6  gwibber-251bzr.tar.gz
+fb330eebe17f2a978a57564e5da177e4  gwibber-286bzr.tar.gz



From tejas at fedoraproject.org  Fri Apr 10 02:34:59 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Fri, 10 Apr 2009 02:34:59 +0000 (UTC)
Subject: rpms/choqok/devel choqok.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410023459.3ED2D70122@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19061/devel

Modified Files:
	.cvsignore sources 
Added Files:
	choqok.spec import.log 
Log Message:
Imported SRPM of choqok



--- NEW FILE choqok.spec ---
Summary: Choqok KDE Micro-Blogging Client
Name: choqok
Version: 0.5
Release: 2%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://choqok.gnufolks.org/
Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake >= 2.6
BuildRequires: kdelibs4-devel
BuildRequires: gettext

%description
A Free/Open Source micro-blogging client for K Desktop Environment.
The name comes from an ancient Persian word, which means Sparrow!
Choqok currently supports Twitter.com and Identi.ca services.

%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README AUTHORS changelog TODO
%{_kde4_bindir}/choqok
%{_kde4_appsdir}/choqok/
%{_kde4_iconsdir}/hicolor/*/apps/choqok.png
%{_kde4_sharedir}/applications/kde4/choqok.desktop
%{_kde4_sharedir}/config.kcfg/choqok.kcfg

%changelog
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-2
- Added AUTHORS changelog and TODO to doc
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-1
- Initial Version for Fedora


--- NEW FILE import.log ---
choqok-0_5-2_fc10:HEAD:choqok-0.5-2.fc10.src.rpm:1239330826


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:15:22 -0000	1.1
+++ .cvsignore	10 Apr 2009 02:34:28 -0000	1.2
@@ -0,0 +1 @@
+choqok-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:15:23 -0000	1.1
+++ sources	10 Apr 2009 02:34:28 -0000	1.2
@@ -0,0 +1 @@
+b24b0f163e3b1e6ff725a285fd08b114  choqok-0.5.tar.bz2



From ianweller at fedoraproject.org  Fri Apr 10 02:36:50 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 10 Apr 2009 02:36:50 +0000 (UTC)
Subject: rpms/gwibber/F-10 .cvsignore, 1.13, 1.14 gwibber.spec, 1.17,
	1.18 import.log, 1.13, 1.14 sources, 1.13, 1.14
Message-ID: <20090410023650.1027570122@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19718/F-10

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
import r286 in F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Mar 2009 03:38:21 -0000	1.13
+++ .cvsignore	10 Apr 2009 02:36:19 -0000	1.14
@@ -1 +1 @@
-gwibber-251bzr.tar.gz
+gwibber-286bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/gwibber.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwibber.spec	18 Mar 2009 03:38:21 -0000	1.17
+++ gwibber.spec	10 Apr 2009 02:36:19 -0000	1.18
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 251
+%define bzr_rev 286
 
 Name:           gwibber
-Version:        0.9.1
+Version:        1.0.1
 Release:        1.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
@@ -12,7 +12,7 @@
 URL:            https://launchpad.net/gwibber
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  bzr branch -r %{bzr_rev} lp:gwibber/1.0
+#  bzr branch -r %{bzr_rev} lp:gwibber
 #  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 1.0.1-1.286bzr
+- Update from upstream revision 286
+
 * Tue Mar 17 2009 Ian Weller <ianweller at gmail.com> 0.9.1-1.251bzr
 - Update from upstream revision 251
 - Adjust pjones's patch to use spaces


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	18 Mar 2009 03:38:21 -0000	1.13
+++ import.log	10 Apr 2009 02:36:19 -0000	1.14
@@ -11,3 +11,4 @@
 gwibber-0_7_3-6_237bzr_fc10:F-10:gwibber-0.7.3-6.237bzr.fc10.src.rpm:1234652280
 gwibber-0_8-1_239bzr_fc10:F-10:gwibber-0.8-1.239bzr.fc10.src.rpm:1234827392
 gwibber-0_9_1-1_251bzr_fc10:F-10:gwibber-0.9.1-1.251bzr.fc10.src.rpm:1237347473
+gwibber-1_0_1-1_286bzr_fc10:F-10:gwibber-1.0.1-1.286bzr.fc10.src.rpm:1239330591


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Mar 2009 03:38:21 -0000	1.13
+++ sources	10 Apr 2009 02:36:19 -0000	1.14
@@ -1 +1 @@
-8df82f9c3f1dd9509e53a8a04f16dad6  gwibber-251bzr.tar.gz
+fb330eebe17f2a978a57564e5da177e4  gwibber-286bzr.tar.gz



From tejas at fedoraproject.org  Fri Apr 10 02:39:07 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Fri, 10 Apr 2009 02:39:07 +0000 (UTC)
Subject: rpms/choqok/F-10 choqok.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090410023907.8B60670122@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20344/F-10

Modified Files:
	sources 
Added Files:
	choqok.spec 
Log Message:
Imported Choqok to F-9 F-10 and F-11 Branches



--- NEW FILE choqok.spec ---
Summary: Choqok KDE Micro-Blogging Client
Name: choqok
Version: 0.5
Release: 2%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://choqok.gnufolks.org/
Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake >= 2.6
BuildRequires: kdelibs4-devel
BuildRequires: gettext

%description
A Free/Open Source micro-blogging client for K Desktop Environment.
The name comes from an ancient Persian word, which means Sparrow!
Choqok currently supports Twitter.com and Identi.ca services.

%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README AUTHORS changelog TODO
%{_kde4_bindir}/choqok
%{_kde4_appsdir}/choqok/
%{_kde4_iconsdir}/hicolor/*/apps/choqok.png
%{_kde4_sharedir}/applications/kde4/choqok.desktop
%{_kde4_sharedir}/config.kcfg/choqok.kcfg

%changelog
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-2
- Added AUTHORS changelog and TODO to doc
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-1
- Initial Version for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:15:23 -0000	1.1
+++ sources	10 Apr 2009 02:38:37 -0000	1.2
@@ -0,0 +1 @@
+b24b0f163e3b1e6ff725a285fd08b114  choqok-0.5.tar.bz2



From tejas at fedoraproject.org  Fri Apr 10 02:39:07 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Fri, 10 Apr 2009 02:39:07 +0000 (UTC)
Subject: rpms/choqok/F-11 choqok.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090410023907.B55A670122@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20344/F-11

Modified Files:
	sources 
Added Files:
	choqok.spec 
Log Message:
Imported Choqok to F-9 F-10 and F-11 Branches



--- NEW FILE choqok.spec ---
Summary: Choqok KDE Micro-Blogging Client
Name: choqok
Version: 0.5
Release: 2%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://choqok.gnufolks.org/
Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake >= 2.6
BuildRequires: kdelibs4-devel
BuildRequires: gettext

%description
A Free/Open Source micro-blogging client for K Desktop Environment.
The name comes from an ancient Persian word, which means Sparrow!
Choqok currently supports Twitter.com and Identi.ca services.

%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README AUTHORS changelog TODO
%{_kde4_bindir}/choqok
%{_kde4_appsdir}/choqok/
%{_kde4_iconsdir}/hicolor/*/apps/choqok.png
%{_kde4_sharedir}/applications/kde4/choqok.desktop
%{_kde4_sharedir}/config.kcfg/choqok.kcfg

%changelog
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-2
- Added AUTHORS changelog and TODO to doc
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-1
- Initial Version for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:15:23 -0000	1.1
+++ sources	10 Apr 2009 02:38:37 -0000	1.2
@@ -0,0 +1 @@
+b24b0f163e3b1e6ff725a285fd08b114  choqok-0.5.tar.bz2



From tejas at fedoraproject.org  Fri Apr 10 02:39:07 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Fri, 10 Apr 2009 02:39:07 +0000 (UTC)
Subject: rpms/choqok/F-9 choqok.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090410023908.002F370122@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20344/F-9

Modified Files:
	sources 
Added Files:
	choqok.spec 
Log Message:
Imported Choqok to F-9 F-10 and F-11 Branches



--- NEW FILE choqok.spec ---
Summary: Choqok KDE Micro-Blogging Client
Name: choqok
Version: 0.5
Release: 2%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://choqok.gnufolks.org/
Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.5Norooz/choqok-0.5.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake >= 2.6
BuildRequires: kdelibs4-devel
BuildRequires: gettext

%description
A Free/Open Source micro-blogging client for K Desktop Environment.
The name comes from an ancient Persian word, which means Sparrow!
Choqok currently supports Twitter.com and Identi.ca services.

%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README AUTHORS changelog TODO
%{_kde4_bindir}/choqok
%{_kde4_appsdir}/choqok/
%{_kde4_iconsdir}/hicolor/*/apps/choqok.png
%{_kde4_sharedir}/applications/kde4/choqok.desktop
%{_kde4_sharedir}/config.kcfg/choqok.kcfg

%changelog
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-2
- Added AUTHORS changelog and TODO to doc
* Fri Mar 27 2009 Tejas Dinkar <tejas at gja.in> - 0.5-1
- Initial Version for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:15:23 -0000	1.1
+++ sources	10 Apr 2009 02:38:37 -0000	1.2
@@ -0,0 +1 @@
+b24b0f163e3b1e6ff725a285fd08b114  choqok-0.5.tar.bz2



From ianweller at fedoraproject.org  Fri Apr 10 02:40:49 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 10 Apr 2009 02:40:49 +0000 (UTC)
Subject: rpms/lordsawar/devel lordsawar.spec,1.6,1.7
Message-ID: <20090410024049.B129870122@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/lordsawar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20917

Modified Files:
	lordsawar.spec 
Log Message:
forgot lang files, whoops


Index: lordsawar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/lordsawar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lordsawar.spec	10 Apr 2009 02:14:53 -0000	1.6
+++ lordsawar.spec	10 Apr 2009 02:40:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lordsawar
 Version:        0.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
 Group:          Amusements/Games
@@ -39,13 +39,14 @@
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications dat/%{name}.desktop
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -cpm 644 dat/various/castle_icon.png %{buildroot}%{_datadir}/pixmaps/lordsawar.png
+%find_lang %{name}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README COPYING TODO
 %{_bindir}/%{name}
@@ -60,6 +61,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 0.1.5-2
+- Include new lang files
+
 * Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 0.1.5-1
 - 0.1.5
 



From oget at fedoraproject.org  Fri Apr 10 03:19:48 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 03:19:48 +0000 (UTC)
Subject: rpms/calf/devel calf-gcc44.patch, NONE, 1.1 calf.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410031948.F3C6770122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/calf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1351/devel

Modified Files:
	.cvsignore sources 
Added Files:
	calf-gcc44.patch calf.spec import.log 
Log Message:
* Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.0.18.3-1
- Initial build


calf-gcc44.patch:

--- NEW FILE calf-gcc44.patch ---
diff -rupN calf-0.0.18.3.old/src/giface.cpp calf-0.0.18.3/src/giface.cpp
--- calf-0.0.18.3.old/src/giface.cpp	2009-01-24 05:15:10.000000000 -0500
+++ calf-0.0.18.3/src/giface.cpp	2009-03-30 20:00:27.000000000 -0400
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <calf/giface.h>
 #include <calf/osctlnet.h>
-
+#include <stdio.h>
 using namespace std;
 using namespace calf_utils;
 using namespace calf_plugins;
diff -rupN calf-0.0.18.3.old/src/jackhost.cpp calf-0.0.18.3/src/jackhost.cpp
--- calf-0.0.18.3.old/src/jackhost.cpp	2009-02-14 04:52:43.000000000 -0500
+++ calf-0.0.18.3/src/jackhost.cpp	2009-03-30 19:59:43.000000000 -0400
@@ -37,7 +37,7 @@
 #include <calf/preset_gui.h>
 #include <calf/main_win.h>
 #include <calf/utils.h>
-
+#include <stdio.h>
 using namespace std;
 using namespace calf_utils;
 using namespace calf_plugins;
diff -rupN calf-0.0.18.3.old/src/modules_small.cpp calf-0.0.18.3/src/modules_small.cpp
--- calf-0.0.18.3.old/src/modules_small.cpp	2009-01-20 18:12:21.000000000 -0500
+++ calf-0.0.18.3/src/modules_small.cpp	2009-03-30 19:58:36.000000000 -0400
@@ -31,7 +31,7 @@
 #include <calf/osc.h>
 #include <calf/modules_small.h>
 #include <calf/lv2helpers.h>
-
+#include <stdio.h>
 #ifdef ENABLE_EXPERIMENTAL
 
 #if USE_LV2
diff -rupN calf-0.0.18.3.old/src/osctlnet.cpp calf-0.0.18.3/src/osctlnet.cpp
--- calf-0.0.18.3.old/src/osctlnet.cpp	2009-01-21 14:37:37.000000000 -0500
+++ calf-0.0.18.3/src/osctlnet.cpp	2009-03-30 20:00:10.000000000 -0400
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <stdlib.h>
 #include <sstream>
-
+#include <stdio.h>
 using namespace osctl;
 using namespace std;
 
diff -rupN calf-0.0.18.3.old/src/utils.cpp calf-0.0.18.3/src/utils.cpp
--- calf-0.0.18.3.old/src/utils.cpp	2009-02-14 04:52:43.000000000 -0500
+++ calf-0.0.18.3/src/utils.cpp	2009-03-30 19:59:01.000000000 -0400
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+#include <stdio.h> 
 #include <assert.h>
 #include <config.h>
 #include <calf/osctl.h>


--- NEW FILE calf.spec ---
Name:		calf
Version:	0.0.18.3
Release:	1%{?dist}
Summary:	Audio plugins pack
Group:		Applications/Multimedia
# The jackhost code is GPLv2+ 
# The GUI code is LGPLv2+
# ladspa plugin is LGPLv2+
# lv2 plugin is GPLv2+ and LGPLv2+ and Public Domain
# dssi plugin is LGPLv2+
License:	GPLv2+ and LGPLv2+
URL:		http://calf.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch sent upstream:
# https://sourceforge.net/tracker/?func=detail&aid=2722674&group_id=211458&atid=1017841
Patch0:		%{name}-gcc44.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	desktop-file-utils
BuildRequires:	dssi-devel
BuildRequires:	expat-devel
BuildRequires:	glib2-devel
BuildRequires:	gtk2-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	ladspa-devel
BuildRequires:	lash-devel
BuildRequires:	libglade2-devel
BuildRequires:	lv2core-devel

%global common_desc \
The Calf project aims at providing a set of high quality open source audio\
plugins for musicians. All the included plugins are designed to be used with\
multitrack software, as software replacement for instruments and guitar stomp\
boxes.

%description
%common_desc

The plugins are available in LV2, DSSI, Standalone JACK and LADSPA formats.
This package contains the common files and the Standalone JACK plugin.

%package -n ladspa-%{name}-plugins
Summary:	Calf plugins in LADSPA format
Group:		Applications/Multimedia
License:	LGPLv2+
Requires:	%{name} = %{version}-%{release}
Requires:	ladspa

%description -n ladspa-%{name}-plugins
%common_desc

This package contains only LADSPA effect plugins (no GUI), with LRDF.

%package -n lv2-%{name}-plugins
Summary:	Calf plugins in LV2 format
Group:		Applications/Multimedia
License:	GPLv2+ and LGPLv2+ and Public Domain
Requires:	%{name} = %{version}-%{release}
Requires:	lv2core

%description -n lv2-%{name}-plugins
%common_desc

This package contains LV2 synthesizers and effects, MIDI I/O and GUI
extensions.

%package -n dssi-%{name}-plugins
Summary:	Calf plugins in DSSI format
Group:		Applications/Multimedia
License:	LGPLv2+
Requires:	%{name} = %{version}-%{release}
Requires:	dssi

%description -n dssi-%{name}-plugins
%common_desc

This package contains DSSI synthesizers and effects, also GUI extensions.

%prep
%setup -q
%patch0 -p1 -b .gcc44

# Make sure that optflags are not overriden.
sed -i 's|-O3||' configure

%build
# Add GenericName to the .desktop file
echo "GenericName= Audio Effects" >> %{name}.desktop.in
%configure \
	--with-ladspa-dir=%{_libdir}/ladspa/ \
	--with-dssi-dir=%{_libdir}/dssi/ \
	--with-lv2-dir=%{_libdir}/lv2 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
	--remove-category="Application" \
	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

# We don't need this file:
rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/icon-theme.cache

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING* README TODO
%{_bindir}/%{name}jackhost
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/%{name}*
%{_mandir}/man7/%{name}*

%files -n ladspa-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/ladspa/%{name}.so
%{_datadir}/ladspa/rdf/%{name}.rdf

%files -n lv2-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/lv2/%{name}.lv2/

%files -n dssi-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/dssi/%{name}/
%{_libdir}/dssi/%{name}.so

%changelog
* Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.0.18.3-1
- Initial build


--- NEW FILE import.log ---
calf-0_0_18_3-1_fc10:HEAD:calf-0.0.18.3-1.fc10.src.rpm:1239333560


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:35:45 -0000	1.1
+++ .cvsignore	10 Apr 2009 03:19:47 -0000	1.2
@@ -0,0 +1 @@
+calf-0.0.18.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:35:46 -0000	1.1
+++ sources	10 Apr 2009 03:19:48 -0000	1.2
@@ -0,0 +1 @@
+ef4a48629df9104da6f6081c33d3cfa0  calf-0.0.18.3.tar.gz



From ianweller at fedoraproject.org  Fri Apr 10 03:21:26 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Fri, 10 Apr 2009 03:21:26 +0000 (UTC)
Subject: rpms/lordsawar/F-10 .cvsignore, 1.3, 1.4 lordsawar.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090410032126.8F55370122@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/lordsawar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2060

Modified Files:
	.cvsignore lordsawar.spec sources 
Log Message:
0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2008 04:28:42 -0000	1.3
+++ .cvsignore	10 Apr 2009 03:20:56 -0000	1.4
@@ -1 +1 @@
-lordsawar-0.1.4.tar.gz
+lordsawar-0.1.5.tar.gz


Index: lordsawar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/F-10/lordsawar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lordsawar.spec	19 Dec 2008 05:06:18 -0000	1.4
+++ lordsawar.spec	10 Apr 2009 03:20:56 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lordsawar
-Version:        0.1.4
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
 Group:          Amusements/Games
@@ -36,13 +36,14 @@
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications dat/%{name}.desktop
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -cpm 644 dat/various/castle_icon.png %{buildroot}%{_datadir}/pixmaps/lordsawar.png
+%find_lang %{name}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README COPYING TODO
 %{_bindir}/%{name}
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 0.1.5-1
+- 0.1.5
+
 * Thu Dec 18 2008 Ian Weller <ianweller at gmail.com> 0.1.4-2
 - Bump because I screwed up my CVS checkin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2008 04:28:42 -0000	1.3
+++ sources	10 Apr 2009 03:20:56 -0000	1.4
@@ -1 +1 @@
-62b7d610a9697f1e357b12d5b8aa068a  lordsawar-0.1.4.tar.gz
+578ff15d67979b6ef50bc2108a5bba73  lordsawar-0.1.5.tar.gz



From oget at fedoraproject.org  Fri Apr 10 03:21:24 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 03:21:24 +0000 (UTC)
Subject: rpms/calf/F-10 calf-gcc44.patch, NONE, 1.1 calf.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410032124.38DB270122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/calf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1963/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	calf-gcc44.patch calf.spec import.log 
Log Message:
* Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.0.18.3-1
- Initial build


calf-gcc44.patch:

--- NEW FILE calf-gcc44.patch ---
diff -rupN calf-0.0.18.3.old/src/giface.cpp calf-0.0.18.3/src/giface.cpp
--- calf-0.0.18.3.old/src/giface.cpp	2009-01-24 05:15:10.000000000 -0500
+++ calf-0.0.18.3/src/giface.cpp	2009-03-30 20:00:27.000000000 -0400
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <calf/giface.h>
 #include <calf/osctlnet.h>
-
+#include <stdio.h>
 using namespace std;
 using namespace calf_utils;
 using namespace calf_plugins;
diff -rupN calf-0.0.18.3.old/src/jackhost.cpp calf-0.0.18.3/src/jackhost.cpp
--- calf-0.0.18.3.old/src/jackhost.cpp	2009-02-14 04:52:43.000000000 -0500
+++ calf-0.0.18.3/src/jackhost.cpp	2009-03-30 19:59:43.000000000 -0400
@@ -37,7 +37,7 @@
 #include <calf/preset_gui.h>
 #include <calf/main_win.h>
 #include <calf/utils.h>
-
+#include <stdio.h>
 using namespace std;
 using namespace calf_utils;
 using namespace calf_plugins;
diff -rupN calf-0.0.18.3.old/src/modules_small.cpp calf-0.0.18.3/src/modules_small.cpp
--- calf-0.0.18.3.old/src/modules_small.cpp	2009-01-20 18:12:21.000000000 -0500
+++ calf-0.0.18.3/src/modules_small.cpp	2009-03-30 19:58:36.000000000 -0400
@@ -31,7 +31,7 @@
 #include <calf/osc.h>
 #include <calf/modules_small.h>
 #include <calf/lv2helpers.h>
-
+#include <stdio.h>
 #ifdef ENABLE_EXPERIMENTAL
 
 #if USE_LV2
diff -rupN calf-0.0.18.3.old/src/osctlnet.cpp calf-0.0.18.3/src/osctlnet.cpp
--- calf-0.0.18.3.old/src/osctlnet.cpp	2009-01-21 14:37:37.000000000 -0500
+++ calf-0.0.18.3/src/osctlnet.cpp	2009-03-30 20:00:10.000000000 -0400
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <stdlib.h>
 #include <sstream>
-
+#include <stdio.h>
 using namespace osctl;
 using namespace std;
 
diff -rupN calf-0.0.18.3.old/src/utils.cpp calf-0.0.18.3/src/utils.cpp
--- calf-0.0.18.3.old/src/utils.cpp	2009-02-14 04:52:43.000000000 -0500
+++ calf-0.0.18.3/src/utils.cpp	2009-03-30 19:59:01.000000000 -0400
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+#include <stdio.h> 
 #include <assert.h>
 #include <config.h>
 #include <calf/osctl.h>


--- NEW FILE calf.spec ---
Name:		calf
Version:	0.0.18.3
Release:	1%{?dist}
Summary:	Audio plugins pack
Group:		Applications/Multimedia
# The jackhost code is GPLv2+ 
# The GUI code is LGPLv2+
# ladspa plugin is LGPLv2+
# lv2 plugin is GPLv2+ and LGPLv2+ and Public Domain
# dssi plugin is LGPLv2+
License:	GPLv2+ and LGPLv2+
URL:		http://calf.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch sent upstream:
# https://sourceforge.net/tracker/?func=detail&aid=2722674&group_id=211458&atid=1017841
Patch0:		%{name}-gcc44.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	desktop-file-utils
BuildRequires:	dssi-devel
BuildRequires:	expat-devel
BuildRequires:	glib2-devel
BuildRequires:	gtk2-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	ladspa-devel
BuildRequires:	lash-devel
BuildRequires:	libglade2-devel
BuildRequires:	lv2core-devel

%global common_desc \
The Calf project aims at providing a set of high quality open source audio\
plugins for musicians. All the included plugins are designed to be used with\
multitrack software, as software replacement for instruments and guitar stomp\
boxes.

%description
%common_desc

The plugins are available in LV2, DSSI, Standalone JACK and LADSPA formats.
This package contains the common files and the Standalone JACK plugin.

%package -n ladspa-%{name}-plugins
Summary:	Calf plugins in LADSPA format
Group:		Applications/Multimedia
License:	LGPLv2+
Requires:	%{name} = %{version}-%{release}
Requires:	ladspa

%description -n ladspa-%{name}-plugins
%common_desc

This package contains only LADSPA effect plugins (no GUI), with LRDF.

%package -n lv2-%{name}-plugins
Summary:	Calf plugins in LV2 format
Group:		Applications/Multimedia
License:	GPLv2+ and LGPLv2+ and Public Domain
Requires:	%{name} = %{version}-%{release}
Requires:	lv2core

%description -n lv2-%{name}-plugins
%common_desc

This package contains LV2 synthesizers and effects, MIDI I/O and GUI
extensions.

%package -n dssi-%{name}-plugins
Summary:	Calf plugins in DSSI format
Group:		Applications/Multimedia
License:	LGPLv2+
Requires:	%{name} = %{version}-%{release}
Requires:	dssi

%description -n dssi-%{name}-plugins
%common_desc

This package contains DSSI synthesizers and effects, also GUI extensions.

%prep
%setup -q
%patch0 -p1 -b .gcc44

# Make sure that optflags are not overriden.
sed -i 's|-O3||' configure

%build
# Add GenericName to the .desktop file
echo "GenericName= Audio Effects" >> %{name}.desktop.in
%configure \
	--with-ladspa-dir=%{_libdir}/ladspa/ \
	--with-dssi-dir=%{_libdir}/dssi/ \
	--with-lv2-dir=%{_libdir}/lv2 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
	--remove-category="Application" \
	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

# We don't need this file:
rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/icon-theme.cache

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING* README TODO
%{_bindir}/%{name}jackhost
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/%{name}*
%{_mandir}/man7/%{name}*

%files -n ladspa-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/ladspa/%{name}.so
%{_datadir}/ladspa/rdf/%{name}.rdf

%files -n lv2-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/lv2/%{name}.lv2/

%files -n dssi-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/dssi/%{name}/
%{_libdir}/dssi/%{name}.so

%changelog
* Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.0.18.3-1
- Initial build


--- NEW FILE import.log ---
calf-0_0_18_3-1_fc10:F-10:calf-0.0.18.3-1.fc10.src.rpm:1239333626


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calf/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:35:45 -0000	1.1
+++ .cvsignore	10 Apr 2009 03:20:53 -0000	1.2
@@ -0,0 +1 @@
+calf-0.0.18.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:35:46 -0000	1.1
+++ sources	10 Apr 2009 03:20:53 -0000	1.2
@@ -0,0 +1 @@
+ef4a48629df9104da6f6081c33d3cfa0  calf-0.0.18.3.tar.gz



From oget at fedoraproject.org  Fri Apr 10 03:22:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 03:22:54 +0000 (UTC)
Subject: rpms/calf/F-9 calf-gcc44.patch, NONE, 1.1 calf.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410032254.0F08470122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/calf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2674/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	calf-gcc44.patch calf.spec import.log 
Log Message:
* Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.0.18.3-1
- Initial build


calf-gcc44.patch:

--- NEW FILE calf-gcc44.patch ---
diff -rupN calf-0.0.18.3.old/src/giface.cpp calf-0.0.18.3/src/giface.cpp
--- calf-0.0.18.3.old/src/giface.cpp	2009-01-24 05:15:10.000000000 -0500
+++ calf-0.0.18.3/src/giface.cpp	2009-03-30 20:00:27.000000000 -0400
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <calf/giface.h>
 #include <calf/osctlnet.h>
-
+#include <stdio.h>
 using namespace std;
 using namespace calf_utils;
 using namespace calf_plugins;
diff -rupN calf-0.0.18.3.old/src/jackhost.cpp calf-0.0.18.3/src/jackhost.cpp
--- calf-0.0.18.3.old/src/jackhost.cpp	2009-02-14 04:52:43.000000000 -0500
+++ calf-0.0.18.3/src/jackhost.cpp	2009-03-30 19:59:43.000000000 -0400
@@ -37,7 +37,7 @@
 #include <calf/preset_gui.h>
 #include <calf/main_win.h>
 #include <calf/utils.h>
-
+#include <stdio.h>
 using namespace std;
 using namespace calf_utils;
 using namespace calf_plugins;
diff -rupN calf-0.0.18.3.old/src/modules_small.cpp calf-0.0.18.3/src/modules_small.cpp
--- calf-0.0.18.3.old/src/modules_small.cpp	2009-01-20 18:12:21.000000000 -0500
+++ calf-0.0.18.3/src/modules_small.cpp	2009-03-30 19:58:36.000000000 -0400
@@ -31,7 +31,7 @@
 #include <calf/osc.h>
 #include <calf/modules_small.h>
 #include <calf/lv2helpers.h>
-
+#include <stdio.h>
 #ifdef ENABLE_EXPERIMENTAL
 
 #if USE_LV2
diff -rupN calf-0.0.18.3.old/src/osctlnet.cpp calf-0.0.18.3/src/osctlnet.cpp
--- calf-0.0.18.3.old/src/osctlnet.cpp	2009-01-21 14:37:37.000000000 -0500
+++ calf-0.0.18.3/src/osctlnet.cpp	2009-03-30 20:00:10.000000000 -0400
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <stdlib.h>
 #include <sstream>
-
+#include <stdio.h>
 using namespace osctl;
 using namespace std;
 
diff -rupN calf-0.0.18.3.old/src/utils.cpp calf-0.0.18.3/src/utils.cpp
--- calf-0.0.18.3.old/src/utils.cpp	2009-02-14 04:52:43.000000000 -0500
+++ calf-0.0.18.3/src/utils.cpp	2009-03-30 19:59:01.000000000 -0400
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+#include <stdio.h> 
 #include <assert.h>
 #include <config.h>
 #include <calf/osctl.h>


--- NEW FILE calf.spec ---
Name:		calf
Version:	0.0.18.3
Release:	1%{?dist}
Summary:	Audio plugins pack
Group:		Applications/Multimedia
# The jackhost code is GPLv2+ 
# The GUI code is LGPLv2+
# ladspa plugin is LGPLv2+
# lv2 plugin is GPLv2+ and LGPLv2+ and Public Domain
# dssi plugin is LGPLv2+
License:	GPLv2+ and LGPLv2+
URL:		http://calf.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch sent upstream:
# https://sourceforge.net/tracker/?func=detail&aid=2722674&group_id=211458&atid=1017841
Patch0:		%{name}-gcc44.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	desktop-file-utils
BuildRequires:	dssi-devel
BuildRequires:	expat-devel
BuildRequires:	glib2-devel
BuildRequires:	gtk2-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	ladspa-devel
BuildRequires:	lash-devel
BuildRequires:	libglade2-devel
BuildRequires:	lv2core-devel

%global common_desc \
The Calf project aims at providing a set of high quality open source audio\
plugins for musicians. All the included plugins are designed to be used with\
multitrack software, as software replacement for instruments and guitar stomp\
boxes.

%description
%common_desc

The plugins are available in LV2, DSSI, Standalone JACK and LADSPA formats.
This package contains the common files and the Standalone JACK plugin.

%package -n ladspa-%{name}-plugins
Summary:	Calf plugins in LADSPA format
Group:		Applications/Multimedia
License:	LGPLv2+
Requires:	%{name} = %{version}-%{release}
Requires:	ladspa

%description -n ladspa-%{name}-plugins
%common_desc

This package contains only LADSPA effect plugins (no GUI), with LRDF.

%package -n lv2-%{name}-plugins
Summary:	Calf plugins in LV2 format
Group:		Applications/Multimedia
License:	GPLv2+ and LGPLv2+ and Public Domain
Requires:	%{name} = %{version}-%{release}
Requires:	lv2core

%description -n lv2-%{name}-plugins
%common_desc

This package contains LV2 synthesizers and effects, MIDI I/O and GUI
extensions.

%package -n dssi-%{name}-plugins
Summary:	Calf plugins in DSSI format
Group:		Applications/Multimedia
License:	LGPLv2+
Requires:	%{name} = %{version}-%{release}
Requires:	dssi

%description -n dssi-%{name}-plugins
%common_desc

This package contains DSSI synthesizers and effects, also GUI extensions.

%prep
%setup -q
%patch0 -p1 -b .gcc44

# Make sure that optflags are not overriden.
sed -i 's|-O3||' configure

%build
# Add GenericName to the .desktop file
echo "GenericName= Audio Effects" >> %{name}.desktop.in
%configure \
	--with-ladspa-dir=%{_libdir}/ladspa/ \
	--with-dssi-dir=%{_libdir}/dssi/ \
	--with-lv2-dir=%{_libdir}/lv2 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
	--remove-category="Application" \
	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

# We don't need this file:
rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/icon-theme.cache

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING* README TODO
%{_bindir}/%{name}jackhost
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/%{name}*
%{_mandir}/man7/%{name}*

%files -n ladspa-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/ladspa/%{name}.so
%{_datadir}/ladspa/rdf/%{name}.rdf

%files -n lv2-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/lv2/%{name}.lv2/

%files -n dssi-%{name}-plugins
%defattr(-,root,root,-)
%{_libdir}/dssi/%{name}/
%{_libdir}/dssi/%{name}.so

%changelog
* Mon Mar 30 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.0.18.3-1
- Initial build


--- NEW FILE import.log ---
calf-0_0_18_3-1_fc10:F-9:calf-0.0.18.3-1.fc10.src.rpm:1239333721


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calf/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:35:45 -0000	1.1
+++ .cvsignore	10 Apr 2009 03:22:23 -0000	1.2
@@ -0,0 +1 @@
+calf-0.0.18.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calf/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:35:46 -0000	1.1
+++ sources	10 Apr 2009 03:22:23 -0000	1.2
@@ -0,0 +1 @@
+ef4a48629df9104da6f6081c33d3cfa0  calf-0.0.18.3.tar.gz



From oget at fedoraproject.org  Fri Apr 10 03:26:20 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 03:26:20 +0000 (UTC)
Subject: rpms/jmod/devel import.log, NONE, 1.1 jmod-snapshot.sh, NONE,
	1.1 jmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410032620.46C8F70122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4294/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jmod-snapshot.sh jmod.spec 
Log Message:
* Wed Mar 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9-1
- Initial build for Fedora. SPEC file adapted from SUSE.



--- NEW FILE import.log ---
jmod-0_9-1_fc10:HEAD:jmod-0.9-1.fc10.src.rpm:1239333912


--- NEW FILE jmod-snapshot.sh ---
#!/bin/bash

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=jmod
version=0.9

cd "$tmp"
cvs -z3 -d:pserver:guest at cvs.dev.java.net:/cvs checkout -r 1.1 $name
find ./$name -type d -name CVS -print0 | xargs -0r rm -rf
mv $name $name-$version
tar jcf "$pwd"/$name-$version.tar.bz2 $name-$version
echo "Written: $name-$version.tar.bz2"
cd - >/dev/null


--- NEW FILE jmod.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name:           jmod
Summary:        Java Sound MODules Library
Group:          Development/Libraries
Version:        0.9
Release:        1%{?dist}
License:        LGPLv2+
URL:            https://jmod.dev.java.net/
# The upstream removed the sources tarball from their website.
# We extract it from their cvs.
Source0:        %{name}-%{version}.tar.bz2
Source9:        %{name}-snapshot.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires:    jpackage-utils
BuildRequires:    java-devel >= 1.7
%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:        noarch
%endif
Requires:         jpackage-utils
Requires:         java >= 1.7


%description
Sound Modules (MODs) are music files that contain samples and replaying
information. They are known from the Amiga and other computer systems and are 
able to offer high quality music togehter with small file sizes. The Java
Sound Modules Player library is able to load, decode and replay such files
using standard Java Sound. This library supports .MOD, .XM, .S3M, .IT and .ZIP
module formats.

JMOD is a fork of the project ANA-MP. The main differences are that JMOD is a
library that is really small, fast and efficient (no GUI or other fancy
features that aren't necessary for a replaying library).

The JMOD library can be added to own projects and included into an existing GUI
there.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove precompiled binaries
find . -name "*.jar" -exec rm {} \;

%build
# create outputdir
install -dm 755 classes
%javac -d classes `find ./ -name \*.java`
%jar cf %{name}.jar -C classes .
%javadoc -d doc `find ./ -name \*.java`

%install
rm -rf %{buildroot}
# jars
install -dm 755 %{buildroot}%{_javadir}
install -pm 644 %{name}.jar \
        %{buildroot}%{_javadir}/%{name}-%{version}.jar
(
cd %{buildroot}%{_javadir}
for jar in *-%{version}*; do
    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
done
)

# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}

# startscript demo
install -dm 755 %{buildroot}%{_bindir}
cat > %{name} << EOF
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. %{_javadir}-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=\`build-classpath %{name}\`
MAIN_CLASS="examples.cli.Player"

run \$@
EOF
install -m 755 %{name} %{buildroot}%{_bindir}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc www/* src/examples/
%{_bindir}/%{name}
%{_javadir}/*.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Wed Mar 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9-1
- Initial build for Fedora. SPEC file adapted from SUSE.

* Wed Mar 14 2007 Toni Graffy <toni at links2linux.de> - 0.9-0.pm.1
- First packaged release 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:14:19 -0000	1.1
+++ .cvsignore	10 Apr 2009 03:26:16 -0000	1.2
@@ -0,0 +1 @@
+jmod-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:14:19 -0000	1.1
+++ sources	10 Apr 2009 03:26:16 -0000	1.2
@@ -0,0 +1 @@
+0579314d8d808b59b1e413610684c75a  jmod-0.9.tar.bz2



From oget at fedoraproject.org  Fri Apr 10 03:28:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 03:28:23 +0000 (UTC)
Subject: rpms/jmod/F-10 import.log, NONE, 1.1 jmod-snapshot.sh, NONE,
	1.1 jmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410032823.E62E070137@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jmod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5214/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jmod-snapshot.sh jmod.spec 
Log Message:
* Wed Mar 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9-1
- Initial build for Fedora. SPEC file adapted from SUSE.



--- NEW FILE import.log ---
jmod-0_9-1_fc10:F-10:jmod-0.9-1.fc10.src.rpm:1239334051


--- NEW FILE jmod-snapshot.sh ---
#!/bin/bash

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=jmod
version=0.9

cd "$tmp"
cvs -z3 -d:pserver:guest at cvs.dev.java.net:/cvs checkout -r 1.1 $name
find ./$name -type d -name CVS -print0 | xargs -0r rm -rf
mv $name $name-$version
tar jcf "$pwd"/$name-$version.tar.bz2 $name-$version
echo "Written: $name-$version.tar.bz2"
cd - >/dev/null


--- NEW FILE jmod.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name:           jmod
Summary:        Java Sound MODules Library
Group:          Development/Libraries
Version:        0.9
Release:        1%{?dist}
License:        LGPLv2+
URL:            https://jmod.dev.java.net/
# The upstream removed the sources tarball from their website.
# We extract it from their cvs.
Source0:        %{name}-%{version}.tar.bz2
Source9:        %{name}-snapshot.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires:    jpackage-utils
BuildRequires:    java-devel >= 1.7
%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:        noarch
%endif
Requires:         jpackage-utils
Requires:         java >= 1.7


%description
Sound Modules (MODs) are music files that contain samples and replaying
information. They are known from the Amiga and other computer systems and are 
able to offer high quality music togehter with small file sizes. The Java
Sound Modules Player library is able to load, decode and replay such files
using standard Java Sound. This library supports .MOD, .XM, .S3M, .IT and .ZIP
module formats.

JMOD is a fork of the project ANA-MP. The main differences are that JMOD is a
library that is really small, fast and efficient (no GUI or other fancy
features that aren't necessary for a replaying library).

The JMOD library can be added to own projects and included into an existing GUI
there.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove precompiled binaries
find . -name "*.jar" -exec rm {} \;

%build
# create outputdir
install -dm 755 classes
%javac -d classes `find ./ -name \*.java`
%jar cf %{name}.jar -C classes .
%javadoc -d doc `find ./ -name \*.java`

%install
rm -rf %{buildroot}
# jars
install -dm 755 %{buildroot}%{_javadir}
install -pm 644 %{name}.jar \
        %{buildroot}%{_javadir}/%{name}-%{version}.jar
(
cd %{buildroot}%{_javadir}
for jar in *-%{version}*; do
    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
done
)

# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}

# startscript demo
install -dm 755 %{buildroot}%{_bindir}
cat > %{name} << EOF
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. %{_javadir}-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=\`build-classpath %{name}\`
MAIN_CLASS="examples.cli.Player"

run \$@
EOF
install -m 755 %{name} %{buildroot}%{_bindir}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc www/* src/examples/
%{_bindir}/%{name}
%{_javadir}/*.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Wed Mar 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9-1
- Initial build for Fedora. SPEC file adapted from SUSE.

* Wed Mar 14 2007 Toni Graffy <toni at links2linux.de> - 0.9-0.pm.1
- First packaged release 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmod/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:14:19 -0000	1.1
+++ .cvsignore	10 Apr 2009 03:27:53 -0000	1.2
@@ -0,0 +1 @@
+jmod-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmod/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:14:19 -0000	1.1
+++ sources	10 Apr 2009 03:27:53 -0000	1.2
@@ -0,0 +1 @@
+0579314d8d808b59b1e413610684c75a  jmod-0.9.tar.bz2



From oget at fedoraproject.org  Fri Apr 10 03:29:52 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 03:29:52 +0000 (UTC)
Subject: rpms/jmod/F-9 import.log, NONE, 1.1 jmod-snapshot.sh, NONE,
	1.1 jmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410032952.D370170122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jmod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6480/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jmod-snapshot.sh jmod.spec 
Log Message:
* Wed Mar 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9-1
- Initial build for Fedora. SPEC file adapted from SUSE.



--- NEW FILE import.log ---
jmod-0_9-1_fc10:F-9:jmod-0.9-1.fc10.src.rpm:1239334137


--- NEW FILE jmod-snapshot.sh ---
#!/bin/bash

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=jmod
version=0.9

cd "$tmp"
cvs -z3 -d:pserver:guest at cvs.dev.java.net:/cvs checkout -r 1.1 $name
find ./$name -type d -name CVS -print0 | xargs -0r rm -rf
mv $name $name-$version
tar jcf "$pwd"/$name-$version.tar.bz2 $name-$version
echo "Written: $name-$version.tar.bz2"
cd - >/dev/null


--- NEW FILE jmod.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name:           jmod
Summary:        Java Sound MODules Library
Group:          Development/Libraries
Version:        0.9
Release:        1%{?dist}
License:        LGPLv2+
URL:            https://jmod.dev.java.net/
# The upstream removed the sources tarball from their website.
# We extract it from their cvs.
Source0:        %{name}-%{version}.tar.bz2
Source9:        %{name}-snapshot.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires:    jpackage-utils
BuildRequires:    java-devel >= 1.7
%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:        noarch
%endif
Requires:         jpackage-utils
Requires:         java >= 1.7


%description
Sound Modules (MODs) are music files that contain samples and replaying
information. They are known from the Amiga and other computer systems and are 
able to offer high quality music togehter with small file sizes. The Java
Sound Modules Player library is able to load, decode and replay such files
using standard Java Sound. This library supports .MOD, .XM, .S3M, .IT and .ZIP
module formats.

JMOD is a fork of the project ANA-MP. The main differences are that JMOD is a
library that is really small, fast and efficient (no GUI or other fancy
features that aren't necessary for a replaying library).

The JMOD library can be added to own projects and included into an existing GUI
there.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove precompiled binaries
find . -name "*.jar" -exec rm {} \;

%build
# create outputdir
install -dm 755 classes
%javac -d classes `find ./ -name \*.java`
%jar cf %{name}.jar -C classes .
%javadoc -d doc `find ./ -name \*.java`

%install
rm -rf %{buildroot}
# jars
install -dm 755 %{buildroot}%{_javadir}
install -pm 644 %{name}.jar \
        %{buildroot}%{_javadir}/%{name}-%{version}.jar
(
cd %{buildroot}%{_javadir}
for jar in *-%{version}*; do
    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
done
)

# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}

# startscript demo
install -dm 755 %{buildroot}%{_bindir}
cat > %{name} << EOF
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. %{_javadir}-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=\`build-classpath %{name}\`
MAIN_CLASS="examples.cli.Player"

run \$@
EOF
install -m 755 %{name} %{buildroot}%{_bindir}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc www/* src/examples/
%{_bindir}/%{name}
%{_javadir}/*.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Wed Mar 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9-1
- Initial build for Fedora. SPEC file adapted from SUSE.

* Wed Mar 14 2007 Toni Graffy <toni at links2linux.de> - 0.9-0.pm.1
- First packaged release 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmod/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:14:19 -0000	1.1
+++ .cvsignore	10 Apr 2009 03:29:22 -0000	1.2
@@ -0,0 +1 @@
+jmod-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmod/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:14:19 -0000	1.1
+++ sources	10 Apr 2009 03:29:22 -0000	1.2
@@ -0,0 +1 @@
+0579314d8d808b59b1e413610684c75a  jmod-0.9.tar.bz2



From lennart at fedoraproject.org  Fri Apr 10 03:31:07 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 10 Apr 2009 03:31:07 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.8, 1.9 libatasmart.spec, 1.9, 
	1.10 sources, 1.8, 1.9
Message-ID: <20090410033107.D580070122@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7024

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Apr 2009 20:08:46 -0000	1.8
+++ .cvsignore	10 Apr 2009 03:30:37 -0000	1.9
@@ -1 +1 @@
-libatasmart-0.7.tar.gz
+libatasmart-0.8.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libatasmart.spec	7 Apr 2009 20:08:46 -0000	1.9
+++ libatasmart.spec	10 Apr 2009 03:30:37 -0000	1.10
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -53,6 +53,9 @@
 %{_libdir}/pkgconfig/libatasmart.pc
 
 %changelog
+* Fri Apr 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.8-1
+- New upstream release
+
 * Tue Apr 7 2009 Lennart Poettering <lpoetter at redhat.com> 0.7-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Apr 2009 20:08:46 -0000	1.8
+++ sources	10 Apr 2009 03:30:37 -0000	1.9
@@ -1 +1 @@
-27d712dfa804fdb37313aacd01c476b6  libatasmart-0.7.tar.gz
+0d0808fd8f95aa0e83778f58505b5640  libatasmart-0.8.tar.gz



From lennart at fedoraproject.org  Fri Apr 10 03:32:53 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 10 Apr 2009 03:32:53 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart.spec,1.10,1.11
Message-ID: <20090410033255.17A0870122@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7579

Modified Files:
	libatasmart.spec 
Log Message:
add BuildRequires on libudev-devel


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libatasmart.spec	10 Apr 2009 03:30:37 -0000	1.10
+++ libatasmart.spec	10 Apr 2009 03:32:22 -0000	1.11
@@ -7,6 +7,7 @@
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libatasmart.git;a=summary
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libudev-devel
 
 %description
 A small and lightweight parser library for ATA S.M.A.R.T. hard disk



From cweyl at fedoraproject.org  Fri Apr 10 04:46:47 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 10 Apr 2009 04:46:47 +0000 (UTC)
Subject: rpms/perl-Module-Install/devel .cvsignore, 1.13,
	1.14 perl-Module-Install.spec, 1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20090410044647.5D97270122@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25649

Modified Files:
	.cvsignore perl-Module-Install.spec sources 
Log Message:
* Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.82-1
- update to 0.82



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Mar 2009 18:24:23 -0000	1.13
+++ .cvsignore	10 Apr 2009 04:46:16 -0000	1.14
@@ -1 +1 @@
-Module-Install-0.80.tar.gz
+Module-Install-0.82.tar.gz


Index: perl-Module-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install/devel/perl-Module-Install.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Module-Install.spec	22 Mar 2009 18:24:23 -0000	1.17
+++ perl-Module-Install.spec	10 Apr 2009 04:46:16 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-Module-Install
-Version:        0.80
+Version:        0.82
 Release:        1%{?dist}
 Summary:        Standalone, extensible Perl module installer
 License:        GPL+ or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.82-1
+- update to 0.82
+
 * Sun Mar 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.80-1
 - update to 0.80 
 - remove 03_autoinstall.t swizzle (now self-skipped; see RT29448)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Mar 2009 18:24:23 -0000	1.13
+++ sources	10 Apr 2009 04:46:16 -0000	1.14
@@ -1 +1 @@
-5a56200c309fcf57deb7a85383ecb6e0  Module-Install-0.80.tar.gz
+2f59ef8113eaedababebf111460086f2  Module-Install-0.82.tar.gz



From cweyl at fedoraproject.org  Fri Apr 10 04:56:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 10 Apr 2009 04:56:17 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/devel .cvsignore, 1.5,
	1.6 perl-Test-WWW-Mechanize-Catalyst.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090410045617.B93AF70122@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27886

Modified Files:
	.cvsignore perl-Test-WWW-Mechanize-Catalyst.spec sources 
Log Message:
* Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.51-1
- update to 0.51



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 06:29:19 -0000	1.5
+++ .cvsignore	10 Apr 2009 04:55:47 -0000	1.6
@@ -1 +1 @@
-Test-WWW-Mechanize-Catalyst-0.50.tar.gz
+Test-WWW-Mechanize-Catalyst-0.51.tar.gz


Index: perl-Test-WWW-Mechanize-Catalyst.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/perl-Test-WWW-Mechanize-Catalyst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Test-WWW-Mechanize-Catalyst.spec	22 Mar 2009 18:33:56 -0000	1.7
+++ perl-Test-WWW-Mechanize-Catalyst.spec	10 Apr 2009 04:55:47 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Test-WWW-Mechanize-Catalyst
-Version:        0.50
-Release:        2%{?dist}
+Version:        0.51
+Release:        1%{?dist}
 Summary:        Test::WWW::Mechanize for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -86,6 +86,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.51-1
+- update to 0.51
+
 * Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.50-2
 - Buildrequire perl(Catalyst::Plugin::Session::State::Cookie)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Mar 2009 06:29:19 -0000	1.5
+++ sources	10 Apr 2009 04:55:47 -0000	1.6
@@ -1 +1 @@
-f220d31d9f0b665843b14a4dd9511226  Test-WWW-Mechanize-Catalyst-0.50.tar.gz
+4ff6728c1bd8ba0cc09c3aa192646dd7  Test-WWW-Mechanize-Catalyst-0.51.tar.gz



From lkundrak at fedoraproject.org  Fri Apr 10 06:39:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 10 Apr 2009 06:39:04 +0000 (UTC)
Subject: rpms/skyviewer/devel skyviewer-license.txt, NONE,
	1.1 skyviewer.desktop, NONE, 1.1 skyviewer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410063905.2A8BD70137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skyviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15235/devel

Modified Files:
	.cvsignore sources 
Added Files:
	skyviewer-license.txt skyviewer.desktop skyviewer.spec 
Log Message:
Import skyviewer


--- NEW FILE skyviewer-license.txt ---
>From Michael.R.Greason at nasa.gov Wed Apr  8 21:48:48 2009
Message-ID: <49DCFA32.30606 at nasa.gov>
Date: Wed, 08 Apr 2009 15:25:38 -0400
From: "Michael R. Greason" <Michael.R.Greason at nasa.gov>
To: Lubomir Rintel <lkundrak at v3.sk>
CC: Nicholas Phillips <Nicholas.G.Phillips at nasa.gov>
Subject: Re: SkyVIewer license

Hi,

The skyviewer software itself was written under contract to NASA and is
explicitly uncopyrighted.  Thank you for pointing this out; we've gone
ahead and included the following License.txt in our software download
tarballs (right now, version 1.0.0; we will take care of the older
tarballs at a later time).

Copyright (Unpublished--all rights reserved under the copyright laws of
the United States), U.S. Government as represented by the Administrator
of the National Aeronautics and Space Administration.  No copyright is
claimed in the United States under Title 17, U.S. Code.

Permission to freely use, copy, modify, and distribute this software
and its documentation without fee is hereby granted, provided that this
copyright notice and disclaimer of warranty appears in all copies.

DISCLAIMER:

THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND,
EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO,
ANY WARRANTY THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, AND FREEDOM FROM INFRINGEMENT, AND ANY WARRANTY THAT THE
DOCUMENTATION WILL CONFORM TO THE SOFTWARE, OR ANY WARRANTY THAT THE
SOFTWARE WILL BE ERROR FREE.  IN NO EVENT SHALL NASA BE LIABLE FOR ANY
DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM, OR IN ANY WAY
CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
CONTRACT, TORT , OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY
PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED
FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR
SERVICES PROVIDED HEREUNDER.

Nicholas---would you like to add any comments?

Mike Greason

Lubomir Rintel wrote:
> Hi,
>
> I've used the form on your pages [1], but got no response, therefore I'm
> contacting you directly.
>
> We'd like to include Skyviewer in Fedora operating system as part of
> Fedora Astronomy [2] project, but we were unable to determine the
> licensing. Although it is referred to as distributed under conditions of
> GPL on numerous places (such ash freahmeat [3]), and is shipped linked
> with GPL-ed library (Windows port ships with healpix), none of the
> source files contain licensing information and no license text is
> included in the source distribution.
>
> Would you please add comments about the license to the source files and
> add accompany the source distribution with the license text, so we're
> able to determine whether we can use and distribute skyviewer?
>
> [1] http://lambda.gsfc.nasa.gov/contact/contact.cfm
> [2] http://fedoraproject.org/wiki/SIGs/Astronomy
> [3] http://freshmeat.net/projects/skyviewer/
>
> Thanks!
>   


--- NEW FILE skyviewer.desktop ---
[Desktop Entry]
Type=Application
Name=SkyViewer
Comment=Display FITS files with HEALPix-based skymaps
GenericName=Sky Viewer
Exec=skyviewer
Icon=skyviewer
Categories=Education;Astronomy;
MimeType=image/fits;
Terminal=false


--- NEW FILE skyviewer.spec ---
Name:           skyviewer
Version:        1.0.0
Release:        2%{?dist}
Summary:        Program to display HEALPix-based skymaps in FITS files

Group:          Amusements/Graphics
License:        Public Domain
URL:            http://lambda.gsfc.nasa.gov/toolbox/tb_skyviewer_ov.cfm
Source0:        http://lambda.gsfc.nasa.gov/toolbox/skyviewer/%{name}-%{version}.tar.gz
Source1:        skyviewer.desktop
# Will be included in the next release
Source2:        skyviewer-license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  chealpix-devel
BuildRequires:  desktop-file-utils
BuildRequires:  libQGLViewer-devel
BuildRequires:  qt4-devel

%description
SkyViewer is an OpenGL based program to display HEALPix-based skymaps,
saved in FITS format files. The loaded skymaps can be viewed either on a 3D
sphere or as a Mollweide projection. In either case, realtime panning and
zooming are supported, along with rotations for the 3D sphere view,
assuming you have a strong enough graphics card.


%prep
%setup -q
install -pm 0644 %{SOURCE2} LICENSE


%build
%{_qt4_qmake} INCLUDE_DIR=%{_includedir} \
        LIB_DIR=%{_libdir} \
        INCPATH=%{_includedir}/cfitsio
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

# Binary
install -d $RPM_BUILD_ROOT%{_bindir}
install -pm 0755 skyviewer $RPM_BUILD_ROOT%{_bindir}

# Icon
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 0644 images/spherical.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps/skyviewer.png

# Desktop entry
desktop-file-install --vendor='' %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%pre
/usr/bin/update-desktop-database >/dev/null 2>&1 || :


%post
/usr/bin/update-desktop-database >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%{_bindir}/skyviewer
%{_datadir}/pixmaps/skyviewer.png
%{_datadir}/applications/skyviewer.desktop
%doc test_iqu.fits README.txt LICENSE general.txt notes-ngp.txt


%changelog
* Thu Apr 09 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.0.0-2
- Update license
- Fix RBs (Jussi Lehtola)
- Add documentation

* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.0.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skyviewer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:40:35 -0000	1.1
+++ .cvsignore	10 Apr 2009 06:38:34 -0000	1.2
@@ -0,0 +1 @@
+skyviewer-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skyviewer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:40:35 -0000	1.1
+++ sources	10 Apr 2009 06:38:34 -0000	1.2
@@ -0,0 +1 @@
+1fc1a1f45d92fa09699a5869f6f2df4e  skyviewer-1.0.0.tar.gz



From lkundrak at fedoraproject.org  Fri Apr 10 06:39:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 10 Apr 2009 06:39:04 +0000 (UTC)
Subject: rpms/skyviewer/F-10 skyviewer-license.txt, NONE,
	1.1 skyviewer.desktop, 
	NONE, 1.1 skyviewer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090410063905.2449170122@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/skyviewer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15235/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	skyviewer-license.txt skyviewer.desktop skyviewer.spec 
Log Message:
Import skyviewer


--- NEW FILE skyviewer-license.txt ---
>From Michael.R.Greason at nasa.gov Wed Apr  8 21:48:48 2009
Message-ID: <49DCFA32.30606 at nasa.gov>
Date: Wed, 08 Apr 2009 15:25:38 -0400
From: "Michael R. Greason" <Michael.R.Greason at nasa.gov>
To: Lubomir Rintel <lkundrak at v3.sk>
CC: Nicholas Phillips <Nicholas.G.Phillips at nasa.gov>
Subject: Re: SkyVIewer license

Hi,

The skyviewer software itself was written under contract to NASA and is
explicitly uncopyrighted.  Thank you for pointing this out; we've gone
ahead and included the following License.txt in our software download
tarballs (right now, version 1.0.0; we will take care of the older
tarballs at a later time).

Copyright (Unpublished--all rights reserved under the copyright laws of
the United States), U.S. Government as represented by the Administrator
of the National Aeronautics and Space Administration.  No copyright is
claimed in the United States under Title 17, U.S. Code.

Permission to freely use, copy, modify, and distribute this software
and its documentation without fee is hereby granted, provided that this
copyright notice and disclaimer of warranty appears in all copies.

DISCLAIMER:

THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND,
EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO,
ANY WARRANTY THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, AND FREEDOM FROM INFRINGEMENT, AND ANY WARRANTY THAT THE
DOCUMENTATION WILL CONFORM TO THE SOFTWARE, OR ANY WARRANTY THAT THE
SOFTWARE WILL BE ERROR FREE.  IN NO EVENT SHALL NASA BE LIABLE FOR ANY
DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM, OR IN ANY WAY
CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
CONTRACT, TORT , OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY
PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED
FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR
SERVICES PROVIDED HEREUNDER.

Nicholas---would you like to add any comments?

Mike Greason

Lubomir Rintel wrote:
> Hi,
>
> I've used the form on your pages [1], but got no response, therefore I'm
> contacting you directly.
>
> We'd like to include Skyviewer in Fedora operating system as part of
> Fedora Astronomy [2] project, but we were unable to determine the
> licensing. Although it is referred to as distributed under conditions of
> GPL on numerous places (such ash freahmeat [3]), and is shipped linked
> with GPL-ed library (Windows port ships with healpix), none of the
> source files contain licensing information and no license text is
> included in the source distribution.
>
> Would you please add comments about the license to the source files and
> add accompany the source distribution with the license text, so we're
> able to determine whether we can use and distribute skyviewer?
>
> [1] http://lambda.gsfc.nasa.gov/contact/contact.cfm
> [2] http://fedoraproject.org/wiki/SIGs/Astronomy
> [3] http://freshmeat.net/projects/skyviewer/
>
> Thanks!
>   


--- NEW FILE skyviewer.desktop ---
[Desktop Entry]
Type=Application
Name=SkyViewer
Comment=Display FITS files with HEALPix-based skymaps
GenericName=Sky Viewer
Exec=skyviewer
Icon=skyviewer
Categories=Education;Astronomy;
MimeType=image/fits;
Terminal=false


--- NEW FILE skyviewer.spec ---
Name:           skyviewer
Version:        1.0.0
Release:        2%{?dist}
Summary:        Program to display HEALPix-based skymaps in FITS files

Group:          Amusements/Graphics
License:        Public Domain
URL:            http://lambda.gsfc.nasa.gov/toolbox/tb_skyviewer_ov.cfm
Source0:        http://lambda.gsfc.nasa.gov/toolbox/skyviewer/%{name}-%{version}.tar.gz
Source1:        skyviewer.desktop
# Will be included in the next release
Source2:        skyviewer-license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  chealpix-devel
BuildRequires:  desktop-file-utils
BuildRequires:  libQGLViewer-devel
BuildRequires:  qt4-devel

%description
SkyViewer is an OpenGL based program to display HEALPix-based skymaps,
saved in FITS format files. The loaded skymaps can be viewed either on a 3D
sphere or as a Mollweide projection. In either case, realtime panning and
zooming are supported, along with rotations for the 3D sphere view,
assuming you have a strong enough graphics card.


%prep
%setup -q
install -pm 0644 %{SOURCE2} LICENSE


%build
%{_qt4_qmake} INCLUDE_DIR=%{_includedir} \
        LIB_DIR=%{_libdir} \
        INCPATH=%{_includedir}/cfitsio
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

# Binary
install -d $RPM_BUILD_ROOT%{_bindir}
install -pm 0755 skyviewer $RPM_BUILD_ROOT%{_bindir}

# Icon
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 0644 images/spherical.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps/skyviewer.png

# Desktop entry
desktop-file-install --vendor='' %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%pre
/usr/bin/update-desktop-database >/dev/null 2>&1 || :


%post
/usr/bin/update-desktop-database >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%{_bindir}/skyviewer
%{_datadir}/pixmaps/skyviewer.png
%{_datadir}/applications/skyviewer.desktop
%doc test_iqu.fits README.txt LICENSE general.txt notes-ngp.txt


%changelog
* Thu Apr 09 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.0.0-2
- Update license
- Fix RBs (Jussi Lehtola)
- Add documentation

* Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.0.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skyviewer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:40:35 -0000	1.1
+++ .cvsignore	10 Apr 2009 06:38:33 -0000	1.2
@@ -0,0 +1 @@
+skyviewer-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skyviewer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:40:35 -0000	1.1
+++ sources	10 Apr 2009 06:38:33 -0000	1.2
@@ -0,0 +1 @@
+1fc1a1f45d92fa09699a5869f6f2df4e  skyviewer-1.0.0.tar.gz



From jzeleny at fedoraproject.org  Fri Apr 10 06:44:19 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri, 10 Apr 2009 06:44:19 +0000 (UTC)
Subject: rpms/libhbalinux/devel libhbalinux-1.0.7-conf.patch, NONE,
	1.1 libhbalinux.spec, NONE, 1.1
Message-ID: <20090410064419.AD4F370122@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/libhbalinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16005

Added Files:
	libhbalinux-1.0.7-conf.patch libhbalinux.spec 
Log Message:
Initial import of libhbalinux (#489962), removed ldconfig according to
suggestion of reviewer in bugzilla



libhbalinux-1.0.7-conf.patch:

--- NEW FILE libhbalinux-1.0.7-conf.patch ---
--- libhbalinux-1.0.7/Makefile.am	2009-03-27 21:40:12.000000000 +0100
+++ libhbalinux-1.0.7/Makefile.am.conf	2009-04-01 16:38:02.000000000 +0200
@@ -10,22 +10,3 @@ libhbalinux_la_LIBADD = $(PCIACCESS_LIBS
 
 dist_noinst_DATA = README COPYING INSTALL libhbalinux.spec
 
-install-data-hook: libhbalinux.la
-	. $<; \
-	ORG=org.open-fcoe.libhbalinux; \
-	LIB=${libdir}/$${dlname}; \
-	STR="$$ORG	$$LIB"; \
-	CONF=${sysconfdir}/hba.conf; \
-	if test -f $$CONF; then \
-		grep -E -q ^[[:space:]]*$$ORG[[:space:]]+$$LIB $$CONF; \
-		if test $$? -ne 0; then \
-			echo $$STR >> $$CONF; \
-		else \
-			echo "** $$CONF already configured"; \
-			echo "** system configuration not updated"; \
-		fi; \
-	else \
-		echo "** WARNING: $$CONF does not exist"; \
-		echo "** system configuration not updated"; \
-	fi
-
--- libhbalinux-1.0.7/Makefile.in	2009-03-27 21:41:20.000000000 +0100
+++ libhbalinux-1.0.7/Makefile.in.conf	2009-04-01 17:30:28.000000000 +0200
@@ -623,25 +623,6 @@ uninstall-am: uninstall-libLTLIBRARIES
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-libLTLIBRARIES
 
-
-install-data-hook: libhbalinux.la
-	. $<; \
-	ORG=org.open-fcoe.libhbalinux; \
-	LIB=${libdir}/$${dlname}; \
-	STR="$$ORG	$$LIB"; \
-	CONF=${sysconfdir}/hba.conf; \
-	if test -f $$CONF; then \
-		grep -E -q ^[[:space:]]*$$ORG[[:space:]]+$$LIB $$CONF; \
-		if test $$? -ne 0; then \
-			echo $$STR >> $$CONF; \
-		else \
-			echo "** $$CONF already configured"; \
-			echo "** system configuration not updated"; \
-		fi; \
-	else \
-		echo "** WARNING: $$CONF does not exist"; \
-		echo "** system configuration not updated"; \
-	fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


--- NEW FILE libhbalinux.spec ---
Name:           libhbalinux
Version:        1.0.7
Release:        3%{?dist}
Summary:        FC-HBAAPI implementation using scsi_transport_fc interfaces

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://www.open-fcoe.org
Source0:        http://www.open-fcoe.org/openfc/downloads/%{name}-%{version}.tar.gz
Patch0:         libhbalinux-1.0.7-conf.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libhbaapi-devel libpciaccess-devel
Requires:       libhbaapi

%description
SNIA HBAAPI vendor library built on top of the scsi_transport_fc interfaces

%prep
%setup -q
%patch0 -p1 -b .conf


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.so' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post
ORG=org.open-fcoe.libhbalinux
LIB=%{_libdir}/libhbalinux.so.2.0.2
STR="$ORG	$LIB"
CONF=%{_sysconfdir}/hba.conf
if test -f $CONF; then
  grep -E -q ^[[:space:]]*$ORG[[:space:]]+$LIB $CONF
  if test $? -ne 0; then
    echo $STR >> $CONF;
  fi
fi


%postun
ORG=org.open-fcoe.libhbalinux
CONF=%{_sysconfdir}/hba.conf
if test -f $CONF; then
  grep -v $ORG $CONF > %{_sysconfdir}/hba.conf.new
  mv %{_sysconfdir}/hba.conf.new %{_sysconfdir}/hba.conf
fi


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*


%changelog
* Tue Apr 01 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-3
- replaced unofficial 1.0.7 source tarball with official one
- update of Makefile, part of it moved to postinstall section
  of spec file

* Tue Mar 31 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-2
- minor changes in spec file

* Mon Mar 2 2009 Chris Leech <christopher.leech at intel.com> - 1.0.7-1
- initial build




From jzeleny at fedoraproject.org  Fri Apr 10 06:48:12 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri, 10 Apr 2009 06:48:12 +0000 (UTC)
Subject: rpms/libhbalinux/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090410064812.F2CAE70122@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/libhbalinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16422

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded sources, commiting new sources file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libhbalinux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:09:02 -0000	1.1
+++ .cvsignore	10 Apr 2009 06:47:42 -0000	1.2
@@ -0,0 +1 @@
+libhbalinux-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libhbalinux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:09:02 -0000	1.1
+++ sources	10 Apr 2009 06:47:42 -0000	1.2
@@ -0,0 +1 @@
+d7949947de08b51837760a283da3e030  libhbalinux-1.0.7.tar.gz



From mmaslano at fedoraproject.org  Fri Apr 10 06:52:46 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 10 Apr 2009 06:52:46 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.216,1.217
Message-ID: <20090410065246.A5B6570122@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17375

Modified Files:
	perl.spec 
Log Message:
* Fri Apr 10 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-68
- 495183 don't use special characters in spec according to patchlevel.h.
 It breaks installation from cpan.



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- perl.spec	7 Apr 2009 12:51:28 -0000	1.216
+++ perl.spec	10 Apr 2009 06:52:15 -0000	1.217
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        67%{?dist}
+Release:        68%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1227,7 +1227,7 @@
 	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
 	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
 	'33287 Fix NULLOK items' \
-	'33554 Fix a typo in the predefined common protocols to make "udp" resolve without netbase' \
+	'33554 Fix a typo in the predefined common protocols to make _udp_ resolve without netbase' \
 	'33388 Fix a segmentation fault with debugperl -Dm' \
 	'33835 Allow the quote mark delimiter also for those #include directives chased with h2ph -a.' \
 	'32910 Disable the v-string in use/require is non-portable warning.' \
@@ -1887,6 +1887,10 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Apr 10 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-68
+- 495183 don't use special characters in spec according to patchlevel.h.
+ It breaks installation from cpan.
+
 * Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-67
 - update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch
 



From hpejakle at fedoraproject.org  Fri Apr 10 06:53:10 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 06:53:10 +0000 (UTC)
Subject: rpms/pidgin-musictracker/devel import.log, NONE,
	1.1 pidgin-musictracker.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090410065310.9771970122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-musictracker.spec 
Log Message:
* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
- combined spec file from all older versions and builded package for 0.4.16 version




--- NEW FILE import.log ---
pidgin-musictracker-0_4_16-1_fc10:HEAD:pidgin-musictracker-0.4.16-1.fc10.src.rpm:1239346308


--- NEW FILE pidgin-musictracker.spec ---
%global	pidgin_version 2.0.0

Name:		pidgin-musictracker
Version:	0.4.16
Release:	1%{?dist}
Summary:	Musictracker plugin for Pidgin

Group:		Applications/Internet
License:	GPLv2+
URL:		http://code.google.com/p/pidgin-musictracker/
Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	dbus-glib-devel
BuildRequires:	pcre-devel
BuildRequires:	pidgin-devel >= %{pidgin_version}
BuildRequires:	gettext-devel

Requires:	pidgin >= %{pidgin_version}

%description
Musictracker is a plugin for Pidgin which displays the media currently
playing in the status message for any protocol Pidgin supports custom
statuses on.

%prep
%setup -q


%build
%configure --disable-werror --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=%{buildroot} INSTALL="install -p" install
rm -f %{buildroot}/%{_libdir}/pidgin/musictracker.la
%find_lang musictracker

%clean
rm -rf $RPM_BUILD_ROOT

%files -f musictracker.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%{_libdir}/pidgin/musictracker.so

%changelog
* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
- combined spec file from all below people and builded package for 0.4.16 version
 
* Wed Mar  4 2009 Jon TURNEY <jon.turney at dronecode.org.uk>
- Cut-n-shut from .spec files cotributed by Jon Hermansen <jon.hermansen at gmail.com>, Julio Cezar <watchman777 at gmail.com> and Mattia Verga <mattia.verga at tiscali.it>

* Wed Mar  4 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.15-2.fc10
- Added BuildRequires section and corrected the Requires section to Pidgin version >= 2.0. Added THANKS file to documentation

* Tue Mar  3 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.15-1.fc10
- Upgrade to version 0.4.15. See full changelog at http://code.google.com/p/pidgin-musictracker/wiki/ChangeLog0point4

* Mon Feb  2 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.14-2.fc10
- Added requires

* Sun Feb  1 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.14-1.fc10
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:20:01 -0000	1.1
+++ .cvsignore	10 Apr 2009 06:52:40 -0000	1.2
@@ -0,0 +1 @@
+pidgin-musictracker-0.4.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:20:01 -0000	1.1
+++ sources	10 Apr 2009 06:52:40 -0000	1.2
@@ -0,0 +1 @@
+1cfa0bba6542193713fccb568efdc4cc  pidgin-musictracker-0.4.16.tar.bz2



From silas at fedoraproject.org  Fri Apr 10 06:53:44 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Fri, 10 Apr 2009 06:53:44 +0000 (UTC)
Subject: rpms/python-mutagen/devel import.log, 1.1, 1.2 python-mutagen.spec, 
	1.14, 1.15
Message-ID: <20090410065344.68F1670122@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/python-mutagen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17131/devel

Modified Files:
	import.log python-mutagen.spec 
Log Message:
* Fri Apr 10 2009 Silas Sewell <silas at sewell ch> - 1.15-2
- Make sed safer
- Add back in removed changelogs



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Apr 2009 20:15:58 -0000	1.1
+++ import.log	10 Apr 2009 06:53:13 -0000	1.2
@@ -1 +1,2 @@
 python-mutagen-1_15-1_fc10:HEAD:python-mutagen-1.15-1.fc10.src.rpm:1238937627
+python-mutagen-1_15-2_fc10:HEAD:python-mutagen-1.15-2.fc10.src.rpm:1239346187


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/python-mutagen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-mutagen.spec	5 Apr 2009 20:15:58 -0000	1.14
+++ python-mutagen.spec	10 Apr 2009 06:53:14 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           python-mutagen
 Version:        1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q -n mutagen-%{version}
-sed -e 1d -e 2d -i mutagen/__init__.py
+sed -i '/^#! \/usr\/bin\/env python/,+1 d' mutagen/__init__.py
 sed -i 's/\r//' TUTORIAL
 
 %build
@@ -45,9 +45,19 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Apr 10 2009 Silas Sewell <silas at sewell ch> - 1.15-2
+- Make sed safer
+- Add back in removed changelogs
+
 * Sun Mar 29 2009 Silas Sewell <silas at sewell ch> - 1.15-1
 - Update to 1.15
 
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.13-3
+- Rebuild for Python 2.6
+
 * Mon Dec 31 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.13-2
 - Add egg-info to package
 



From iarnell at fedoraproject.org  Fri Apr 10 07:24:27 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 10 Apr 2009 07:24:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Log-Log4perl/F-10 .cvsignore, 1.2,
	1.3 perl-Catalyst-Log-Log4perl.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090410072427.8AED170122@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23195

Modified Files:
	.cvsignore perl-Catalyst-Log-Log4perl.spec sources 
Log Message:
* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 1.03-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2008 05:14:24 -0000	1.2
+++ .cvsignore	10 Apr 2009 07:23:57 -0000	1.3
@@ -1 +1 @@
-Catalyst-Log-Log4perl-1.00.tar.gz
+Catalyst-Log-Log4perl-1.03.tar.gz


Index: perl-Catalyst-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/F-10/perl-Catalyst-Log-Log4perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Log-Log4perl.spec	2 Dec 2008 05:14:24 -0000	1.1
+++ perl-Catalyst-Log-Log4perl.spec	10 Apr 2009 07:23:57 -0000	1.2
@@ -1,24 +1,21 @@
 Name:           perl-Catalyst-Log-Log4perl
-Version:        1.00
+Version:        1.03
 Release:        1%{?dist}
 Summary:        Log::Log4perl logging for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Log-Log4perl/
-Source0:        http://www.cpan.org/authors/id/H/HO/HOLOWAY/Catalyst-Log-Log4perl-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Catalyst/Catalyst-Log-Log4perl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst) >= 5.60
 BuildRequires:  perl(Data::Dump)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Log::Log4perl) >= 0.49
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Params::Validate)
 BuildRequires:  perl(Sub::Install)
 BuildRequires:  perl(Test::More)
-Requires:       perl(Catalyst) >= 5.60
-Requires:       perl(Data::Dump)
-Requires:       perl(Log::Log4perl) >= 0.49
-Requires:       perl(Params::Validate)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -55,5 +52,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 1.03-1
+- update to latest upstream
+
+* Sun Mar 15 2009 Iain Arnell <iarnell at gmail.com> 1.02-1
+- update to latest upstream
+- remove unnecessary explicit requires
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Nov 26 2008 Iain Arnell <iarnell at gmail.com> 1.00-1
 - Specfile autogenerated by cpanspec 1.77.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2008 05:14:24 -0000	1.2
+++ sources	10 Apr 2009 07:23:57 -0000	1.3
@@ -1 +1 @@
-98983198da65342aac945408db6fe61e  Catalyst-Log-Log4perl-1.00.tar.gz
+23b26077d4e943389dee279026363dc9  Catalyst-Log-Log4perl-1.03.tar.gz



From iarnell at fedoraproject.org  Fri Apr 10 07:24:56 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 10 Apr 2009 07:24:56 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-URI/F-10 .cvsignore, 1.2,
	1.3 perl-Catalyst-Plugin-Session-State-URI.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090410072456.58DC570122@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23307

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-URI.spec sources 
Log Message:
* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Feb 2009 04:28:51 -0000	1.2
+++ .cvsignore	10 Apr 2009 07:24:25 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-URI-0.08.tar.gz
+Catalyst-Plugin-Session-State-URI-0.09.tar.gz


Index: perl-Catalyst-Plugin-Session-State-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/F-10/perl-Catalyst-Plugin-Session-State-URI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Session-State-URI.spec	25 Feb 2009 04:28:51 -0000	1.1
+++ perl-Catalyst-Plugin-Session-State-URI.spec	10 Apr 2009 07:24:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-State-URI
-Version:        0.08
-Release:        2%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Saves session IDs by rewriting URIs delivered to the client
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
+- update to latest upstream
+
 * Wed Feb 25 2009 Iain Arnell <iarnell at gmail.com> 0.08-2
 - drop unnecessary explicit requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Feb 2009 04:28:51 -0000	1.2
+++ sources	10 Apr 2009 07:24:26 -0000	1.3
@@ -1 +1 @@
-89d5967c47b3563cfadd3dfc48611862  Catalyst-Plugin-Session-State-URI-0.08.tar.gz
+f919b9753e0c474ede924d7a9c5f03dc  Catalyst-Plugin-Session-State-URI-0.09.tar.gz



From hpejakle at fedoraproject.org  Fri Apr 10 07:28:56 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 07:28:56 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-10 import.log, NONE,
	1.1 pidgin-musictracker.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090410072856.EAC4870122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24156/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-musictracker.spec 
Log Message:
* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
- combined spec file from older versions and builded package for 0.4.16 version




--- NEW FILE import.log ---
pidgin-musictracker-0_4_16-1_fc10:F-10:pidgin-musictracker-0.4.16-1.fc10.src.rpm:1239348450


--- NEW FILE pidgin-musictracker.spec ---
%global	pidgin_version 2.0.0

Name:		pidgin-musictracker
Version:	0.4.16
Release:	1%{?dist}
Summary:	Musictracker plugin for Pidgin

Group:		Applications/Internet
License:	GPLv2+
URL:		http://code.google.com/p/pidgin-musictracker/
Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	dbus-glib-devel
BuildRequires:	pcre-devel
BuildRequires:	pidgin-devel >= %{pidgin_version}
BuildRequires:	gettext-devel

Requires:	pidgin >= %{pidgin_version}

%description
Musictracker is a plugin for Pidgin which displays the media currently
playing in the status message for any protocol Pidgin supports custom
statuses on.

%prep
%setup -q


%build
%configure --disable-werror --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=%{buildroot} INSTALL="install -p" install
rm -f %{buildroot}/%{_libdir}/pidgin/musictracker.la
%find_lang musictracker

%clean
rm -rf $RPM_BUILD_ROOT

%files -f musictracker.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%{_libdir}/pidgin/musictracker.so

%changelog
* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
- combined spec file from all below people and builded package for 0.4.16 version
 
* Wed Mar  4 2009 Jon TURNEY <jon.turney at dronecode.org.uk>
- Cut-n-shut from .spec files cotributed by Jon Hermansen <jon.hermansen at gmail.com>, Julio Cezar <watchman777 at gmail.com> and Mattia Verga <mattia.verga at tiscali.it>

* Wed Mar  4 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.15-2.fc10
- Added BuildRequires section and corrected the Requires section to Pidgin version >= 2.0. Added THANKS file to documentation

* Tue Mar  3 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.15-1.fc10
- Upgrade to version 0.4.15. See full changelog at http://code.google.com/p/pidgin-musictracker/wiki/ChangeLog0point4

* Mon Feb  2 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.14-2.fc10
- Added requires

* Sun Feb  1 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.14-1.fc10
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:20:01 -0000	1.1
+++ .cvsignore	10 Apr 2009 07:28:26 -0000	1.2
@@ -0,0 +1 @@
+pidgin-musictracker-0.4.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:20:01 -0000	1.1
+++ sources	10 Apr 2009 07:28:26 -0000	1.2
@@ -0,0 +1 @@
+1cfa0bba6542193713fccb568efdc4cc  pidgin-musictracker-0.4.16.tar.bz2



From iarnell at fedoraproject.org  Fri Apr 10 07:30:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 10 Apr 2009 07:30:10 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/F-10 .cvsignore,
	1.2, 1.3 perl-Catalyst-Plugin-Session-Store-FastMmap.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090410073010.BE8D470122@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24599

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-Store-FastMmap.spec 
	sources 
Log Message:
* Wed Apr 08 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
- update to latest upstream
- BR MRO::Compat 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 17:11:56 -0000	1.2
+++ .cvsignore	10 Apr 2009 07:29:40 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Session-Store-FastMmap-0.05.tar.gz
+Catalyst-Plugin-Session-Store-FastMmap-0.07.tar.gz


Index: perl-Catalyst-Plugin-Session-Store-FastMmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/F-10/perl-Catalyst-Plugin-Session-Store-FastMmap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Session-Store-FastMmap.spec	14 Nov 2008 17:11:56 -0000	1.1
+++ perl-Catalyst-Plugin-Session-Store-FastMmap.spec	10 Apr 2009 07:29:40 -0000	1.2
@@ -1,16 +1,17 @@
 Name:           perl-Catalyst-Plugin-Session-Store-FastMmap
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        FastMmap session storage backend
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-FastMmap/
-Source0:        http://www.cpan.org/authors/id/K/KA/KARMAN/Catalyst-Plugin-Session-Store-FastMmap-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Session-Store-FastMmap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Cache::FastMmap) >= 1.13
 BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.09
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Path::Class)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
@@ -54,6 +55,19 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 08 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
+- update to latest upstream
+- BR MRO::Compat 
+
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
+- update to latest upstream
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 12 2009 Iain Arnell <iarnell at gmail.com> 0.06-1
+- update to latest upstream release
+
 * Thu Nov 13 2008 Iain Arnell <iarnell at gmail.com> 0.05-2
 - Enabled optional tests
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2008 17:11:56 -0000	1.2
+++ sources	10 Apr 2009 07:29:40 -0000	1.3
@@ -1 +1 @@
-a5c28758a3a212fcc0f374110bc7855c  Catalyst-Plugin-Session-Store-FastMmap-0.05.tar.gz
+e55e2a09865e5382e03c4d12b00c9d3e  Catalyst-Plugin-Session-Store-FastMmap-0.07.tar.gz



From jzeleny at fedoraproject.org  Fri Apr 10 07:31:57 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri, 10 Apr 2009 07:31:57 +0000 (UTC)
Subject: rpms/fcoe-utils/devel fcoe-utils-1.0.7-init.patch, NONE,
	1.1 fcoe-utils-1.0.7-make.patch, NONE, 1.1 fcoe-utils.spec, NONE, 1.1
Message-ID: <20090410073157.7C2EB70122@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25006

Added Files:
	fcoe-utils-1.0.7-init.patch fcoe-utils-1.0.7-make.patch 
	fcoe-utils.spec 
Log Message:
Initial commit of spec file and patches



fcoe-utils-1.0.7-init.patch:

--- NEW FILE fcoe-utils-1.0.7-init.patch ---
--- fcoe-utils-1.0.7/etc/initd/initd.fedora	2009-03-27 21:40:22.000000000 +0100
+++ fcoe-utils-1.0.7/etc/initd/initd.fedora.update	2009-04-03 09:54:39.000000000 +0200
@@ -15,14 +15,17 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# chkconfig: - 21 80
+#
 # Maintained at www.Open-FCoE.org
 
 ### BEGIN INIT INFO
 # Provides: fcoe
 # Required-Start: network
 # Required-Stop:
-# Default-Start: 3 5
-# Default-Stop: 3 5
+# Default-Start:
+# Default-Stop:
+# Short-Description: Open-FCoE SAN Setup
 # Description: Open-FCoE SAN Setup
 ### END INIT INFO
 
@@ -183,6 +186,9 @@ service_start()
 	    daemon --pidfile ${PID_FILE} ${FCOEMON}
 	fi
 
+  echo 
+  touch /var/lock/subsys/fcoe-utils
+
 	return
 }
 
@@ -218,6 +224,7 @@ service_stop()
 	done
 	rm -f /var/run/fcoemon.*
 	rm -f /tmp/fcoemon.dcbd.*
+  rm -f /var/lock/subsys/fcoe-utils
 }
 
 service_status()

fcoe-utils-1.0.7-make.patch:

--- NEW FILE fcoe-utils-1.0.7-make.patch ---
--- fcoe-utils-1.0.7/Makefile.am	2009-03-27 21:40:22.000000000 +0100
+++ fcoe-utils-1.0.7/Makefile.am.initdir	2009-04-02 15:35:34.000000000 +0200
@@ -56,7 +56,7 @@ etc/initd/fcoe:
 		ln -s ${abs_srcdir}/etc/initd/initd.fcoe $@; \
 	fi
 
-init_ddir = ${sysconfdir}/init.d
+init_ddir = ${sysconfdir}/rc.d/init.d
 init_d_SCRIPTS = etc/initd/fcoe
 
 dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec
--- fcoe-utils-1.0.7/Makefile.in	2009-03-27 21:44:40.000000000 +0100
+++ fcoe-utils-1.0.7/Makefile.in.initdir	2009-04-02 15:35:19.000000000 +0200
@@ -211,7 +211,7 @@ fcoe_scripts_SCRIPTS = fcoeplumb
 dist_man_MANS = doc/fcoeadm.8 $(am__append_2)
 dist_noinst_SCRIPTS = etc/initd/initd.fcoe etc/initd/initd.suse etc/initd/initd.fedora
 CLEANFILES = etc/initd/fcoe
-init_ddir = ${sysconfdir}/init.d
+init_ddir = ${sysconfdir}/rc.d/init.d
 init_d_SCRIPTS = etc/initd/fcoe
 dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec
 all: all-am


--- NEW FILE fcoe-utils.spec ---
Name:           fcoe-utils
Version:        1.0.7
Release:        3%{?dist}
Summary:        Fibre Channel over Ethernet utilities

Group:          Applications/System
License:        GPLv2
URL:            http://www.open-fcoe.org
Source0:        http://www.open-fcoe.org/openfc/downloads/%{name}-%{version}.tar.gz
Patch0:         fcoe-utils-1.0.7-init.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:    libhbaapi-devel dcbd-devel
Requires:         dcbd
Requires(post):   chkconfig
Requires(preun):  chkconfig initscripts
Requires(postun): initscripts

%description
Fibre Channel over Ethernet utilities
fcoeadm - command line tool for configuring FCoE interfaces
fcoemon - service to configure DCB Ethernet QOS filters, works with dcbd

%prep
%setup -q
%patch0 -p1 -b .initPatch


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_initddir}
mv $RPM_BUILD_ROOT/etc/init.d/fcoe $RPM_BUILD_ROOT%{_initddir}/fcoe-utils
rm -rf $RPM_BUILD_ROOT/etc/init.d


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/chkconfig --add fcoe-utils

%preun
if [ $1 = 0 ]; then
        /sbin/service fcoe-utils stop > /dev/null 2>&1
        /sbin/chkconfig --del fcoe-utils
fi

%postun
if [ "$1" -ge "1" ]; then
        /sbin/service fcoe-utils condrestart > /dev/null  2>&1 || :
fi


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_sbindir}/*
%{_mandir}/man8/*
%{_sysconfdir}/fcoe/scripts/fcoeplumb
%dir %{_sysconfdir}/fcoe/
%dir %{_sysconfdir}/fcoe/scripts/
%config(noreplace) %{_sysconfdir}/fcoe/config
%config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx
%{_initrddir}/fcoe-utils


%changelog
* Wed Apr 8 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-3
- more minor corrections in spec file

* Thu Apr 2 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-2
- minor corrections in spec file
- moved init script to correct location
- correction in the init script (chkconfig directives)

* Mon Mar 2 2009 Chris Leech <christopher.leech at intel.com> - 1.0.7-1
- initial rpm build of fcoe tools




From iarnell at fedoraproject.org  Fri Apr 10 07:32:19 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 10 Apr 2009 07:32:19 +0000 (UTC)
Subject: rpms/perl-Data-Dump-Streamer/F-10 .cvsignore, 1.2,
	1.3 perl-Data-Dump-Streamer.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090410073219.58AFC70122@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25291

Modified Files:
	.cvsignore perl-Data-Dump-Streamer.spec sources 
Log Message:
* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2009 05:00:09 -0000	1.2
+++ .cvsignore	10 Apr 2009 07:31:47 -0000	1.3
@@ -1 +1 @@
-Data-Dump-Streamer-2.08-40.tar.gz
+Data-Dump-Streamer-2.09.tar.gz


Index: perl-Data-Dump-Streamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10/perl-Data-Dump-Streamer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-Dump-Streamer.spec	13 Jan 2009 05:00:09 -0000	1.1
+++ perl-Data-Dump-Streamer.spec	10 Apr 2009 07:31:48 -0000	1.2
@@ -1,12 +1,11 @@
 Name:           perl-Data-Dump-Streamer
-Version:        2.08
-%define         tarversion %{version}-40
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Accurately serialize a data structure as Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Dump-Streamer/
-Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{tarversion}.tar.gz
+Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(B::Utils) >= 0.05
 BuildRequires:  perl(Compress::Zlib)
@@ -30,7 +29,7 @@
 output correctly.
 
 %prep
-%setup -q -n Data-Dump-Streamer-%{tarversion}
+%setup -q -n Data-Dump-Streamer-%{version}
 find . -type f | xargs chmod -x
 
 # Strip out private provides/requires
@@ -39,7 +38,7 @@
 %{__perl_provides} $* |\
 sed -e '/perl(Data::Dump::Streamer::_::/d'
 EOF
-%define __perl_provides %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-prov
+%define __perl_provides %{_builddir}/Data-Dump-Streamer-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-req
@@ -47,7 +46,7 @@
 %{__perl_requires} $* |\
 sed -e '/perl(Data::Dump::Streamer::_::/d'
 EOF
-%define __perl_requires %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-req
+%define __perl_requires %{_builddir}/Data-Dump-Streamer-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 
@@ -80,6 +79,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 04 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
+- update to latest upstream
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.08-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Dec 05 2008 Iain Arnell 2.08-1
 - Specfile autogenerated by cpanspec 1.77.
 - strip private provides/requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2009 05:00:09 -0000	1.2
+++ sources	10 Apr 2009 07:31:48 -0000	1.3
@@ -1 +1 @@
-162dc81be6df36d184e516b8ef4b7701  Data-Dump-Streamer-2.08-40.tar.gz
+d29efdba63bb0944fdf998dfef88faa2  Data-Dump-Streamer-2.09.tar.gz



From mmahut at fedoraproject.org  Fri Apr 10 07:34:34 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Fri, 10 Apr 2009 07:34:34 +0000 (UTC)
Subject: rpms/astronomy-backgrounds/devel astronomy-backgrounds.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410073434.1C7D770122@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/astronomy-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26019/devel

Modified Files:
	.cvsignore sources 
Added Files:
	astronomy-backgrounds.spec import.log 
Log Message:
initial import



--- NEW FILE astronomy-backgrounds.spec ---
Name:           astronomy-backgrounds
Version:        1.0
Release:        1%{?dist}
Summary:        Desktop wallpapers with Astronomy theme

Group:          Applications/Multimedia
License:        CC-BY
URL:            http://fedoraproject.org/wiki/SIGs/Astronomy
Source0:        http://git.fedorahosted.org/git/astronomy.git?p=astronomy.git;a=blob;f=projects/astronomy-backgrounds/tarballs/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
The astronomy-backgrounds package contains astronomy 
related artwork intended to be used as desktop background image.

%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
for i in wallpapers/*
	do
		install -Dm664 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/astronomy
	done
install -Dm644 astronomy-backgrounds.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_datadir}/backgrounds
%{_datadir}/gnome-background-properties

%changelog
* Wed Apr 8 2009 Marek Mahut <mmahut at fedoraproject.org> - 1.0-1
- Intial packaging attemp


--- NEW FILE import.log ---
astronomy-backgrounds-1_0-1_fc8:HEAD:astronomy-backgrounds-1.0-1.fc8.src.rpm:1239348809


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-backgrounds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:18:39 -0000	1.1
+++ .cvsignore	10 Apr 2009 07:34:03 -0000	1.2
@@ -0,0 +1 @@
+astronomy-backgrounds-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-backgrounds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:18:39 -0000	1.1
+++ sources	10 Apr 2009 07:34:03 -0000	1.2
@@ -0,0 +1 @@
+3f73557d10bcda9a9c601b0f758eca31  astronomy-backgrounds-1.0.tar.gz



From jzeleny at fedoraproject.org  Fri Apr 10 07:35:05 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri, 10 Apr 2009 07:35:05 +0000 (UTC)
Subject: rpms/fcoe-utils/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090410073505.60F2270122@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25965

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded source file, committing updated sources and .cvsignore




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:41:26 -0000	1.1
+++ .cvsignore	10 Apr 2009 07:34:34 -0000	1.2
@@ -0,0 +1 @@
+fcoe-utils-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:41:26 -0000	1.1
+++ sources	10 Apr 2009 07:34:34 -0000	1.2
@@ -0,0 +1 @@
+66dc5a5605719875d5434d7dbb9f6d88  fcoe-utils-1.0.7.tar.gz



From jwrdegoede at fedoraproject.org  Fri Apr 10 07:49:37 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 10 Apr 2009 07:49:37 +0000 (UTC)
Subject: rpms/auriferous/devel .cvsignore, 1.2, 1.3 auriferous.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090410074937.7C73670122@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/auriferous/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29645

Modified Files:
	.cvsignore auriferous.spec sources 
Log Message:
* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
- Remove non free jungle.ogg song



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2006 18:15:03 -0000	1.2
+++ .cvsignore	10 Apr 2009 07:49:06 -0000	1.3
@@ -1 +1 @@
-auriferous-1.0.1.tar.bz2
+auriferous-1.0.1-clean.tar.bz2


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- auriferous.spec	24 Feb 2009 03:15:01 -0000	1.5
+++ auriferous.spec	10 Apr 2009 07:49:07 -0000	1.6
@@ -1,11 +1,13 @@
 Name:           auriferous
 Version:        1.0.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Game inspired by the classic Loderunner
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://auriferous.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# This is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# With the nonfree auriferous/music/jungle.ogg song removed
+Source0:        %{name}-%{version}-clean.tar.bz2
 # Same as in the tarbal with one additional column of transparant pixels added
 # to the right, the original is one column to small causing memory corruption
 # (clanlib really should complain, but instead it accesses random memory).
@@ -42,6 +44,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s aqua.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/music/jungle.ogg
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -83,6 +86,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
+- Remove non free jungle.ogg song
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2006 18:15:03 -0000	1.2
+++ sources	10 Apr 2009 07:49:07 -0000	1.3
@@ -1 +1 @@
-660447c44af5cee7543de57cc9dcafc6  auriferous-1.0.1.tar.bz2
+7dbb8e0ee6c283e9e81a5f1f52771ef4  auriferous-1.0.1-clean.tar.bz2



From akurtakov at fedoraproject.org  Fri Apr 10 07:54:26 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 10 Apr 2009 07:54:26 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.628,1.629
Message-ID: <20090410075426.DCC7070122@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31291/devel

Modified Files:
	eclipse.spec 
Log Message:
BR/R jakarta-commons-codec and jakarta-commons-httpclient.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -r1.628 -r1.629
--- eclipse.spec	9 Apr 2009 12:39:08 -0000	1.628
+++ eclipse.spec	10 Apr 2009 07:53:56 -0000	1.629
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.8%{?dist}
+Release:        0.1.9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -195,6 +195,8 @@
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: jakarta-commons-el >= 1.0-9
 BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
+BuildRequires: jakarta-commons-codec
+BuildRequires: jakarta-commons-httpclient
 BuildRequires: mx4j >= 2.1
 BuildRequires: jetty >= 5.1.14-1.6
 BuildRequires: lucene >= 2.3.1-3.4
@@ -274,6 +276,8 @@
 Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
 Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
+Requires:       jakarta-commons-codec
+Requires:       jakarta-commons-httpclient
 Requires:       java-javadoc
 Requires:       java-devel
 
@@ -1587,6 +1591,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Apr 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.9
+- BR/R jakarta-commons-codec and jakarta-commons-httpclient.
+
 * Thu Apr 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.8
 - Add patch for xulrunner compilation.
 



From jwrdegoede at fedoraproject.org  Fri Apr 10 07:59:10 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 10 Apr 2009 07:59:10 +0000 (UTC)
Subject: rpms/auriferous/F-10 .cvsignore, 1.2, 1.3 auriferous.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090410075910.ED57E70122@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/auriferous/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv686

Modified Files:
	.cvsignore auriferous.spec sources 
Log Message:
* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
- Remove non free jungle.ogg song



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2006 18:15:03 -0000	1.2
+++ .cvsignore	10 Apr 2009 07:58:40 -0000	1.3
@@ -1 +1 @@
-auriferous-1.0.1.tar.bz2
+auriferous-1.0.1-clean.tar.bz2


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-10/auriferous.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- auriferous.spec	19 Feb 2008 08:00:36 -0000	1.4
+++ auriferous.spec	10 Apr 2009 07:58:40 -0000	1.5
@@ -1,11 +1,13 @@
 Name:           auriferous
 Version:        1.0.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Game inspired by the classic Loderunner
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://auriferous.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# This is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# With the nonfree auriferous/music/jungle.ogg song removed
+Source0:        %{name}-%{version}-clean.tar.bz2
 # Same as in the tarbal with one additional column of transparant pixels added
 # to the right, the original is one column to small causing memory corruption
 # (clanlib really should complain, but instead it accesses random memory).
@@ -42,6 +44,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s aqua.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/music/jungle.ogg
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -83,6 +86,12 @@
 
 
 %changelog
+* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
+- Remove non free jungle.ogg song
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.1-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2006 18:15:03 -0000	1.2
+++ sources	10 Apr 2009 07:58:40 -0000	1.3
@@ -1 +1 @@
-660447c44af5cee7543de57cc9dcafc6  auriferous-1.0.1.tar.bz2
+7dbb8e0ee6c283e9e81a5f1f52771ef4  auriferous-1.0.1-clean.tar.bz2



From than at fedoraproject.org  Fri Apr 10 08:05:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 10 Apr 2009 08:05:35 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.259,1.260
Message-ID: <20090410080535.40AA470122@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2131

Modified Files:
	qt.spec 
Log Message:
unneeded executable permissions for profile.d scripts



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- qt.spec	1 Apr 2009 16:37:27 -0000	1.259
+++ qt.spec	10 Apr 2009 08:05:04 -0000	1.260
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -519,8 +519,8 @@
 
 # qt4.(sh|csh), currently unused
 %if 0
-install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
+install -p -m644 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
+install -p -m644 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
 sed -i \
   -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \
   -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \
@@ -809,6 +809,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Than Ngo <than at redhat.com> - 4.5.0-13
+- unneeded executable permissions for profile.d scripts
+
 * Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-12
 - fix inline asm in qatomic (de)ref (i386/x86_64), should fix Kolourpaint crash
 



From jwrdegoede at fedoraproject.org  Fri Apr 10 08:08:27 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 10 Apr 2009 08:08:27 +0000 (UTC)
Subject: rpms/auriferous/F-9 .cvsignore, 1.2, 1.3 auriferous.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090410080827.EB85770137@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/auriferous/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2950

Modified Files:
	.cvsignore auriferous.spec sources 
Log Message:
* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
- Remove non free jungle.ogg song



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2006 18:15:03 -0000	1.2
+++ .cvsignore	10 Apr 2009 08:07:57 -0000	1.3
@@ -1 +1 @@
-auriferous-1.0.1.tar.bz2
+auriferous-1.0.1-clean.tar.bz2


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-9/auriferous.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- auriferous.spec	19 Feb 2008 08:00:36 -0000	1.4
+++ auriferous.spec	10 Apr 2009 08:07:57 -0000	1.5
@@ -1,11 +1,13 @@
 Name:           auriferous
 Version:        1.0.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Game inspired by the classic Loderunner
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://auriferous.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# This is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# With the nonfree auriferous/music/jungle.ogg song removed
+Source0:        %{name}-%{version}-clean.tar.bz2
 # Same as in the tarbal with one additional column of transparant pixels added
 # to the right, the original is one column to small causing memory corruption
 # (clanlib really should complain, but instead it accesses random memory).
@@ -42,6 +44,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s aqua.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/music/jungle.ogg
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -83,6 +86,12 @@
 
 
 %changelog
+* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
+- Remove non free jungle.ogg song
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.1-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2006 18:15:03 -0000	1.2
+++ sources	10 Apr 2009 08:07:57 -0000	1.3
@@ -1 +1 @@
-660447c44af5cee7543de57cc9dcafc6  auriferous-1.0.1.tar.bz2
+7dbb8e0ee6c283e9e81a5f1f52771ef4  auriferous-1.0.1-clean.tar.bz2



From hpejakle at fedoraproject.org  Fri Apr 10 08:14:22 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 08:14:22 +0000 (UTC)
Subject: rpms/subdownloader/devel import.log, NONE, 1.1 subdownloader.spec, 
	NONE, 1.1 subdownloader.xpm, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090410081423.0A76470122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2089/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log subdownloader.spec subdownloader.xpm 
Log Message:
* Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
- initial version of rpm package




--- NEW FILE import.log ---
subdownloader-2_0_9_3-1_fc10:HEAD:subdownloader-2.0.9.3-1.fc10.src.rpm:1239350631


--- NEW FILE subdownloader.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		subdownloader
Version:	2.0.9.3
Release:	1%{?dist}
Summary:	Program for download/upload subtitles for videofiles and DVDs

Group:		Applications/Multimedia
# "modules/progressbar.py is LGPLv2+, everything else is GPLv3+"
License:	GPLv3+ and LGPLv2+
URL:		http://www.subdownloader.net/
Source0:	http://launchpad.net/%{name}/trunk/2.0.9/+download/%{name}-%{version}.tar.gz
# subdownloader.xpm is taken from apt-get source subdownloader
Source1:	subdownloader.xpm
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	gettext
Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto	

%description
Program for automatic download/upload subtitles for videofiles 
(DIVX,MPEG,AVI,VOB,etc) and DVD's using fast hashing.

%prep
%setup -q -n %{name}
rm -rf modules/mmpython
sed -i 's/#\!\/usr\/bin\/env python//g' cli/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' languages/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' FileManagement/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' modules/*.py
sed -i 's/#\!\/usr\/bin\/python//g' modules/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' gui/*.py

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1/
cp -pR gui %{buildroot}%{python_sitelib}/%{name}
cp -pR languages %{buildroot}%{python_sitelib}/%{name}
cp -pR cli %{buildroot}%{python_sitelib}/%{name}
cp -pR FileManagement %{buildroot}%{python_sitelib}/%{name}
cp -pR modules %{buildroot}%{python_sitelib}/%{name}
cp -pR run.py %{buildroot}%{python_sitelib}/%{name}
cp -pR locale %{buildroot}%{python_sitelib}/%{name}
cp -pR locale %{buildroot}%{_datadir}
rm -rf %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.mo
rm -rf %{buildroot}%{_datadir}/locale/*/*/*.po
chmod +x %{buildroot}%{python_sitelib}/%{name}/run.py
desktop-file-install subdownloader.desktop --dir %{buildroot}%{_datadir}/applications
install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
install -pm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/
ln -s ../..%{python_sitelib}/%{name}/run.py %{buildroot}%{_bindir}/subdownloader
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README ChangeLog
%{python_sitelib}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm

%changelog
* Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
- initial version of rpm package


--- NEW FILE subdownloader.xpm ---
/* XPM */
static char *subdownloader[] = {
/* columns rows colors chars-per-pixel */
"32 32 256 2",
"   c #1D1C0C",
".  c #1C1D08",
"X  c #151D14",
"o  c #1C1C14",
"O  c #1E161B",
"+  c #1C1B1A",
"@  c #171A19",
"#  c #241B06",
"$  c #2B1A03",
"%  c #2B160C",
"&  c #241A0C",
"*  c #2B1A0A",
"=  c #281708",
"-  c #351B05",
";  c #341A07",
":  c #251614",
">  c #221A14",
",  c #23161B",
"<  c #28141F",
"1  c #22191A",
"2  c #2A1613",
"3  c #17200C",
"4  c #162011",
"5  c #282309",
"6  c #342304",
"7  c #3E2A00",
"8  c #382909",
"9  c #272512",
"0  c #35281A",
"q  c #2E321F",
"w  c #3B310C",
"e  c #1B1B22",
"r  c #1D182A",
"t  c #181822",
"y  c #231622",
"u  c #251621",
"i  c #2F2929",
"p  c #312F26",
"a  c #332D2E",
"s  c #323226",
"d  c #34322E",
"f  c #342D34",
"g  c #352D3A",
"h  c #382C3D",
"j  c #3A3334",
"k  c #393239",
"l  c #343230",
"z  c #442B07",
"x  c #4B3306",
"c  c #453409",
"v  c #4E3809",
"b  c #483603",
"n  c #5C3C0A",
"m  c #513908",
"M  c #4B3D12",
"N  c #643F0E",
"B  c #463C3C",
"V  c #5A450B",
"C  c #4D4114",
"Z  c #5B4E1C",
"A  c #5C4114",
"S  c #624A0C",
"D  c #62460B",
"F  c #684D15",
"G  c #6F5D14",
"H  c #6C5B1D",
"J  c #735B1C",
"K  c #7D5C17",
"L  c #7B641A",
"P  c #756018",
"I  c #4A462A",
"U  c #44403A",
"Y  c #544C3C",
"T  c #595439",
"R  c #5A4821",
"E  c #775A28",
"W  c #6A513C",
"Q  c #786939",
"!  c #7B6826",
"~  c #4C4548",
"^  c #554D44",
"/  c #53534B",
"(  c #5C564A",
")  c #57584A",
"_  c #564E53",
"`  c #5D5B54",
"'  c #575558",
"]  c #625A47",
"[  c #635D55",
"{  c #645B5B",
"}  c #63555A",
"|  c #6E614C",
" . c #7C704C",
".. c #65635B",
"X. c #6F6A5B",
"o. c #696258",
"O. c #77695B",
"+. c #77765E",
"@. c #555360",
"#. c #6C6A68",
"$. c #777565",
"%. c #776E72",
"&. c #7D7976",
"*. c #757978",
"=. c #787577",
"-. c #6F666C",
";. c #865D1A",
":. c #8A6A1C",
">. c #86671C",
",. c #8E701D",
"<. c #8D7016",
"1. c #96731C",
"2. c #987D18",
"3. c #926E17",
"4. c #A47C1A",
"5. c #845F20",
"6. c #8D7422",
"7. c #83742D",
"8. c #937223",
"9. c #987723",
"0. c #8B7738",
"q. c #826836",
"w. c #887756",
"e. c #927E5F",
"r. c #88784D",
"t. c #857A6A",
"y. c #847E7D",
"u. c #8A7E7A",
"i. c #7E8274",
"p. c #A4831A",
"a. c #AA851A",
"s. c #B08718",
"d. c #B99715",
"f. c #BAA012",
"g. c #A48526",
"h. c #B48A20",
"j. c #A89122",
"k. c #BC972A",
"l. c #A48732",
"z. c #AEA036",
"x. c #C89D14",
"c. c #C6A51C",
"v. c #CAA516",
"b. c #D9B518",
"n. c #CAA80E",
"m. c #FDBE03",
"M. c #FBBE0C",
"N. c #E5B819",
"B. c #F8BF1D",
"V. c #F6BE15",
"C. c #CAAC24",
"Z. c #CAA524",
"A. c #D2AA26",
"S. c #DDB621",
"D. c #DCBD2A",
"F. c #CEA137",
"G. c #CAB137",
"H. c #E3B927",
"J. c #EDC60C",
"K. c #EEC80B",
"L. c #ECC806",
"P. c #F4C402",
"I. c #FBC203",
"U. c #F4C902",
"Y. c #F4C40B",
"T. c #FAC20B",
"R. c #F2C808",
"E. c #EDC413",
"W. c #ECC812",
"Q. c #ECC41B",
"!. c #E9C719",
"~. c #F2C412",
"^. c #F9C213",
"/. c #F2C31A",
"(. c #F4C819",
"). c #DDC236",
"_. c #E3C224",
"`. c #EBC329",
"'. c #E9C724",
"]. c #F5C724",
"[. c #E7C933",
"{. c #FACB39",
"}. c #FBD032",
"|. c #948649",
" X c #8E8743",
".X c #AD9C56",
"XX c #BCA65C",
"oX c #B5A24A",
"OX c #84826D",
"+X c #9B8967",
"@X c #888576",
"#X c #928879",
"$X c #9F927C",
"%X c #A18C6D",
"&X c #A2976A",
"*X c #B49B6F",
"=X c #A99C76",
"-X c #B9AC78",
";X c #B7AA6A",
":X c #D2B65F",
">X c #C2A849",
",X c #CEBB6C",
"<X c #C5B773",
"1X c #D0BA67",
"2X c #DBC75D",
"3X c #FFCF40",
"4X c #FCD347",
"5X c #FED44B",
"6X c #FBDA4E",
"7X c #F4D247",
"8X c #EFD85C",
"9X c #FDD354",
"0X c #FBDB52",
"qX c #FBD35C",
"wX c #FBDA5C",
"eX c #F5D356",
"rX c #E1C94C",
"tX c #D7C374",
"yX c #E0CE6D",
"uX c #EFDA6B",
"iX c #E9D269",
"pX c #FCD562",
"aX c #FBDA64",
"sX c #FFD669",
"dX c #FEDB6D",
"fX c #F4DD67",
"gX c #EFD37A",
"hX c #EEDA79",
"jX c #F7DA76",
"kX c #F7E17A",
"lX c #7C7B87",
"zX c #827C81",
"xX c #877F85",
"cX c #847E94",
"vX c #898584",
"bX c #8C8983",
"nX c #848688",
"mX c #8C8C8C",
"MX c #888687",
"NX c #908E8C",
"BX c #938B82",
"VX c #8D938C",
"CX c #939387",
"ZX c #898392",
"AX c #8B8C95",
"SX c #928E97",
"DX c #8C9290",
"FX c #949498",
"GX c #B9AB81",
"HX c #AFAC9C",
"JX c #B6B6AE",
"KX c #C3B383",
"LX c #D8C680",
"PX c #EEDA8D",
"IX c #E6CE8A",
"UX c #F6E084",
/* pixels */
"HXMXMX at X@XAXbXMXNXmXAXmXBXBXNXAXmXNXVXVXVXSXSXCXCXSXFXFXVXFXFXJX",
"xXcXnX at XvXvX@Xu.OX at XvXvX@XvX at XnXmXMXMXMXbX#X=X-XGX=X#XNXNXNXNXSX",
"&.lX=.*.u.t.%XGX&X-X%Xt.zXlXi.y.y.y.u.u.+XLXUXUXhXPXKX#XcXvX at XMX",
"$.=.%.=.w.,XhX<X+XhXgX*X&.*.$.y.=.&.t.+XIXkXaXdXaXjXkX<Xt.OXOXzX",
"X.#.-. .1XfXuX+XO.yX0XgX=X$.+.%.=.%.r.tXfXaXaXaXsXsXwXfX;X$.&.=.",
"..#....XpXqXiX| #.;X6X6XgXr.X.#.#.X.&XfX0XwXpXwXsXpX0X0XuXe.%.%.",
"[ `  .8X4X9X>X{ ..|.8X4X9X:X| ..#.Q yXeX5X9X9X6X9X}.(.(.'.>XO.-.",
"' ( z.!.^.{.r.` ` W 2X9X4XeXr.` [ |.uX8XpX9X3X[.'.L.V.].~.).Q ..",
"^ I N.I.^.b.9 U ' Y oXeX3X4XoX( ( r.|. Xq.E H H J G G E G H M ] ",
"B V (.I.Y.p.  > f Y Q 7X{.{.rXT ^ W 0 o 2 2 2 > 2 # * : % $ Q ~ ",
"0 6.R.I.R.V > o o > 8 D.].].`.n M 0.* @ + : , 1 > @ & + . x G.p ",
"* x.U.I.N.* : 1 o O : 2.J.~.J.5.E C.* 4 4 o 4 > > e   + . :.Q.6 ",
"* N.P.T.p.> , o   + : D W.I.P.4.1.`.n O o o + : o e > +   Z.V.m ",
"6 W.P./.S + , > o O o ; b.P.M.x.a.V.9.= 3 o > & & o   & c Q.M.D ",
"w E.P.H.; o 1 o + o O % 9.R.Y.x.s.^.A.=   e + , , @ + & :.Y.~.F ",
"c /.I.p.: + o 1 1 o + & D ~.U.n.s.T./.m # e + : u o + % x.Y.K.F ",
"x M.^.Z , < X 1 < o   & = N.P.v.p.J.^.3.& e X : : u 4 w /.I.W.S ",
"w W.N.5 > > 4 1 1 + @ + : p.~.d.8.J.T.v.# + X , > 1   L V.I.Q.m ",
"& _.g.. &   o > o + 1 + + D '.s.L ~.I.(.v X + O > > & c.m.I./.8 ",
"& A.F > > @ : :   1 , > o - S.8.D Y.U.Y.,.& : y O X x V.I.I.b.: ",
"& l.* 1 y r e + o y u > + & g.F - E.Y.I.n.= : + e > >.T.I.P.d.o ",
"1 w # & &   &   & & % =   $ R s : d.Y.T.K.v % @ y & x.I.I.Y.P & ",
"+ 9 7.6.6.8.6.6.6.,.8.6.6.8.E X o J ~.I.R.:.& 1 1 b E.T.T.H.8 & ",
": & C.~.Y.^.Y.T.~.K.~.^.~./.>.&   6 N.I.~.c.& o o L R.Y.T.s.& > ",
"> * K Q.M.I.P.P.U.U.I.I.Y.H.7 > + # <.V.M.!.c & = f.T.T._.v . 1 ",
"X y ; C.P.P.M.P.I.m.T.I.W.,.& 3 : 1 6 A.I.K.>.: z W.I.V.1.* o 1 ",
"+ + 2 V _.Y.M.m.m.T.I.U.c.- > + O o > v H.M.n.= ;.K.~.k.6 + + 1 ",
"r X   2 G _.P.I.I.T.R.C.x &   t e > o   v F.[.c k._.g.- : e o 1 ",
"1 > & o = V C.'.!._.j.z , O o @ o y : X X * F M ! m % 1 X X o : ",
"0 1 o @ + * - m V 7 & + r > + e + y & o t +   & & > r @   @ O i ",
"~ B j k k j j g g k l f d s l h l d s j k s i g f f i p s p j / ",
"nX/ / _ / / / / ' T ' ' ) ) ( ( ] ) ' } } ( ` ` ( ` { { } [ [ MX"
};


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:25:36 -0000	1.1
+++ .cvsignore	10 Apr 2009 08:13:51 -0000	1.2
@@ -0,0 +1 @@
+subdownloader-2.0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:25:36 -0000	1.1
+++ sources	10 Apr 2009 08:13:51 -0000	1.2
@@ -0,0 +1 @@
+eff9ef5b0f027ff913798cdc41f5ce47  subdownloader-2.0.9.3.tar.gz



From cweyl at fedoraproject.org  Fri Apr 10 08:15:37 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 10 Apr 2009 08:15:37 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/F-10
	perl-Test-WWW-Mechanize-Catalyst.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090410081537.28C3A70122@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4743

Modified Files:
	perl-Test-WWW-Mechanize-Catalyst.spec sources 
Log Message:
* Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.51-1
- update to 0.51



Index: perl-Test-WWW-Mechanize-Catalyst.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-10/perl-Test-WWW-Mechanize-Catalyst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-WWW-Mechanize-Catalyst.spec	25 Mar 2009 01:55:48 -0000	1.5
+++ perl-Test-WWW-Mechanize-Catalyst.spec	10 Apr 2009 08:15:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-WWW-Mechanize-Catalyst
-Version:        0.50
-Release:        2%{?dist}
+Version:        0.51
+Release:        1%{?dist}
 Summary:        Test::WWW::Mechanize for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -86,6 +86,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.51-1
+- update to 0.51
+
 * Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.50-2
 - Buildrequire perl(Catalyst::Plugin::Session::State::Cookie)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2009 01:55:48 -0000	1.5
+++ sources	10 Apr 2009 08:15:05 -0000	1.6
@@ -1 +1 @@
-f220d31d9f0b665843b14a4dd9511226  Test-WWW-Mechanize-Catalyst-0.50.tar.gz
+4ff6728c1bd8ba0cc09c3aa192646dd7  Test-WWW-Mechanize-Catalyst-0.51.tar.gz



From than at fedoraproject.org  Fri Apr 10 08:24:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 10 Apr 2009 08:24:08 +0000 (UTC)
Subject: rpms/qt3/devel qt3.spec,1.14,1.15
Message-ID: <20090410082408.83EF270122@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6189

Modified Files:
	qt3.spec 
Log Message:
unneeded executable permissions for profile.d scripts 



Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt3.spec	25 Feb 2009 18:09:15 -0000	1.14
+++ qt3.spec	10 Apr 2009 08:23:36 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 23%{?dist}
+Release: 24%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -521,7 +521,7 @@
 done
 
 mkdir -p %{buildroot}/etc/profile.d
-install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
+install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
 
 # Add desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
@@ -570,7 +570,7 @@
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
 %endif
-%attr(0755,root,root) %config /etc/profile.d/*
+%config /etc/profile.d/*
 /etc/ld.so.conf.d/*
 %{qtdir}/lib/libqui.so.*
 %{qtdir}/lib/libqt*.so.*
@@ -644,6 +644,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Than Ngo <than at redhat.com> - 3.3.8b-24
+- unneeded executable permissions for profile.d scripts 
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.8b-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pfj at fedoraproject.org  Fri Apr 10 08:02:48 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 10 Apr 2009 08:02:48 +0000 (UTC)
Subject: rpms/db4o/devel db4o.spec,1.10,1.11 import.log,1.1,1.2
Message-ID: <20090410080248.179C770122@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/db4o/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1395/devel

Modified Files:
	db4o.spec import.log 
Log Message:

Change excludearch to exclusivearch
Remove ppc build 



Index: db4o.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- db4o.spec	24 Feb 2009 10:55:40 -0000	1.10
+++ db4o.spec	10 Apr 2009 08:02:17 -0000	1.11
@@ -5,7 +5,7 @@
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
 Version: 6.1
-Release: 5.1%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Patch0: db4o-6.1-usesyslibs.patch
 Group: Development/Libraries
@@ -13,7 +13,8 @@
 URL: http://www.db4o.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel, mono-cecil-flowanalysis-devel
-ExcludeArch: ppc64
+
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
 
 %description
 Embed db4o's native Java or .NET/Mono open source object database
@@ -106,8 +107,9 @@
 %{_libdir}/pkgconfig/db4o.pc
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1-5.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 6.1-5
+- Alter excludearch to exclusivearch
+- Remove ppc build
 
 * Thu Feb 05 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 6.1-4.1
 - rebuild


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Feb 2009 23:26:27 -0000	1.1
+++ import.log	10 Apr 2009 08:02:17 -0000	1.2
@@ -1 +1,2 @@
 db4o-6_1-4_1_fc11:HEAD:db4o-6.1-4.1.fc11.src.rpm:1233876352
+db4o-6_1-5_fc11:HEAD:db4o-6.1-5.fc11.src.rpm:1239350489



From hpejakle at fedoraproject.org  Fri Apr 10 08:34:09 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 08:34:09 +0000 (UTC)
Subject: rpms/subdownloader/devel subdownloader.spec,1.1,1.2
Message-ID: <20090410083409.6158570122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7736

Modified Files:
	subdownloader.spec 
Log Message:
desktop-file-install require added



Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subdownloader.spec	10 Apr 2009 08:13:51 -0000	1.1
+++ subdownloader.spec	10 Apr 2009 08:33:38 -0000	1.2
@@ -15,7 +15,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	gettext
-Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto	
+Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto, desktop-file-utils	
 
 %description
 Program for automatic download/upload subtitles for videofiles 



From ovasik at fedoraproject.org  Fri Apr 10 08:52:11 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 10 Apr 2009 08:52:11 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.60, 1.61 setup.spec, 1.76,
	1.77 sources, 1.61, 1.62 setup-2.8.2-uidgid.patch, 1.1, NONE
Message-ID: <20090410085211.829E570122@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10946

Modified Files:
	.cvsignore setup.spec sources 
Removed Files:
	setup-2.8.2-uidgid.patch 
Log Message:
 do not disable coredumps in profile/csh.cshrc scripts, coredumps already disabled in rawhide's RLIMIT_CORE(#495035)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	24 Mar 2009 11:16:19 -0000	1.60
+++ .cvsignore	10 Apr 2009 08:51:40 -0000	1.61
@@ -1 +1 @@
-setup-2.8.2.tar.bz2
+setup-2.8.3.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- setup.spec	25 Mar 2009 13:41:21 -0000	1.76
+++ setup.spec	10 Apr 2009 08:51:41 -0000	1.77
@@ -1,12 +1,11 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.2
-Release: 2%{?dist}
+Version: 2.8.3
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
-Patch1: setup-2.8.2-uidgid.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 ./shadowconvert.sh
 
 %build
@@ -92,6 +90,10 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Fri Apr 10 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-1
+- do not disable coredumps in profile/csh.cshrc scripts,
+  coredumps already disabled in rawhide's RLIMIT_CORE(#495035)
+
 * Wed Mar 25 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.2-2
 - reserve uid 65 for nslcd (will share group 55 ldap, #491899)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	24 Mar 2009 11:16:20 -0000	1.61
+++ sources	10 Apr 2009 08:51:41 -0000	1.62
@@ -1 +1 @@
-f309154d9c39848a5fcacf88c6a022c4  setup-2.8.2.tar.bz2
+32e87b44610bb03377cb13937502ef24  setup-2.8.3.tar.bz2


--- setup-2.8.2-uidgid.patch DELETED ---



From pfj at fedoraproject.org  Fri Apr 10 08:59:30 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 10 Apr 2009 08:59:30 +0000 (UTC)
Subject: rpms/monotorrent/devel .cvsignore, 1.5, 1.6 import.log, 1.5,
	1.6 monotorrent.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090410085930.88B1A70122@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monotorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12033/devel

Modified Files:
	.cvsignore import.log monotorrent.spec sources 
Log Message:

Alter URL
Bump to 0.72 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Feb 2009 00:23:54 -0000	1.5
+++ .cvsignore	10 Apr 2009 08:58:59 -0000	1.6
@@ -1 +1 @@
-monotorrent-0.70.tar.gz
+monotorrent-0.72.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	26 Feb 2009 00:23:54 -0000	1.5
+++ import.log	10 Apr 2009 08:58:59 -0000	1.6
@@ -3,3 +3,4 @@
 monotorrent-0_62-1_fc11:HEAD:monotorrent-0.62-1.fc11.src.rpm:1229596012
 monotorrent-0_62-2_fc11:HEAD:monotorrent-0.62-2.fc11.src.rpm:1229596868
 monotorrent-0_70-1_fc11:HEAD:monotorrent-0.70-1.fc11.src.rpm:1235607645
+monotorrent-0_72-1_fc11:HEAD:monotorrent-0.72-1.fc11.src.rpm:1239353898


Index: monotorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/devel/monotorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- monotorrent.spec	26 Feb 2009 00:23:54 -0000	1.8
+++ monotorrent.spec	10 Apr 2009 08:58:59 -0000	1.9
@@ -1,12 +1,12 @@
 %define         debug_package %{nil}
 
 Name:           monotorrent
-Version:        0.70
+Version:        0.72
 Release:        1%{?dist}
 Summary:        Mono bittorrent client
 Group:          Development/Languages
 License:        MIT
-URL:            http://www.monotorrent.com
+URL:            http://projects.qnetp.net/projects/show/monotorrent
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel, gtk-sharp2-devel, desktop-file-utils
@@ -49,6 +49,10 @@
 %{_libdir}/pkgconfig/monotorrent.pc
 
 %changelog
+* Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.72-1
+- Fix URL
+- update to 0.72
+
 * Fri Feb 20 2009 David Nielsen <gnomeuser at gmail.com> - 0.70-1
 - update to 0.70
 - fix license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Feb 2009 00:23:54 -0000	1.5
+++ sources	10 Apr 2009 08:58:59 -0000	1.6
@@ -1 +1 @@
-3e8fa8ffa3fc5ce0a934c61e5f5f54a5  monotorrent-0.70.tar.gz
+31b1f411e253a881f79bc39bca8668b7  monotorrent-0.72.tar.gz



From hpejakle at fedoraproject.org  Fri Apr 10 09:01:17 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 09:01:17 +0000 (UTC)
Subject: rpms/subdownloader/devel subdownloader.spec,1.2,1.3
Message-ID: <20090410090117.5435370122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12648

Modified Files:
	subdownloader.spec 
Log Message:
fixed buildrequire



Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- subdownloader.spec	10 Apr 2009 08:33:38 -0000	1.2
+++ subdownloader.spec	10 Apr 2009 09:00:46 -0000	1.3
@@ -14,8 +14,8 @@
 Source1:	subdownloader.xpm
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
-BuildRequires:	gettext
-Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto, desktop-file-utils	
+BuildRequires:	gettext, desktop-file-utils
+Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto	
 
 %description
 Program for automatic download/upload subtitles for videofiles 



From pfj at fedoraproject.org  Fri Apr 10 09:04:22 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 10 Apr 2009 09:04:22 +0000 (UTC)
Subject: rpms/mono-addins/devel import.log, 1.8, 1.9 mono-addins.spec, 1.15,
	1.16
Message-ID: <20090410090422.378AD70122@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-addins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13564/devel

Modified Files:
	import.log mono-addins.spec 
Log Message:

Exclude ppc 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	17 Feb 2009 23:53:37 -0000	1.8
+++ import.log	10 Apr 2009 09:03:50 -0000	1.9
@@ -6,3 +6,4 @@
 mono-addins-0_4-4_20081215svn105652_fc11:HEAD:mono-addins-0.4-4.20081215svn105652.fc11.src.rpm:1233879817
 mono-addins-0_4-4_20091002svn126354_fc11:HEAD:mono-addins-0.4-4.20091002svn126354.fc11.src.rpm:1234486304
 mono-addins-0_4-4_20091702svn127062_fc11:HEAD:mono-addins-0.4-4.20091702svn127062.fc11.src.rpm:1234914782
+mono-addins-0_4-5_20091702svn127062_1_fc11:HEAD:mono-addins-0.4-5.20091702svn127062.1.fc11.src.rpm:1239354189


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mono-addins.spec	26 Feb 2009 02:27:10 -0000	1.15
+++ mono-addins.spec	10 Apr 2009 09:03:50 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:		mono-addins
 Version:	0.4
-Release:	5.20091702svn%{svnver}%{?dist}
+Release:	5.20091702svn%{svnver}.1%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	MIT
@@ -13,7 +13,7 @@
 
 BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel, autoconf, automake
 BuildRequires:	pkgconfig
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
 
 %description
 Mono.Addins is a generic framework for creating extensible applications,
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.4-5.20091702svn127062.1
+- Exclude ppc
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-5.20091702svn127062
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jfch2222 at fedoraproject.org  Fri Apr 10 09:13:01 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 10 Apr 2009 09:13:01 +0000 (UTC)
Subject: rpms/medusa/devel import.log, NONE, 1.1 medusa-1.5-configure.patch, 
	NONE, 1.1 medusa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090410091301.9DFD470122@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/medusa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log medusa-1.5-configure.patch medusa.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
medusa-1_5-5_fc12:HEAD:medusa-1.5-5.fc12.src.rpm:1239354437

medusa-1.5-configure.patch:

--- NEW FILE medusa-1.5-configure.patch ---
--- medusa-1.5/configure.in.jfch	2009-02-09 18:02:09.000000000 +0100
+++ medusa-1.5/configure.in	2009-03-16 10:50:24.999005882 +0100
@@ -43,7 +43,7 @@ fi
 
 CFLAGS="$CFLAGS -fPIC"
 CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
-$(apr-config --includes --cppflags) -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
+-I/usr/include/apr-1 -I/usr/include/apr-0 -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
 
 AC_CHECKING([for pthread support])
 AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
@@ -520,7 +520,7 @@ AC_CHECK_HEADER([apr-0/apr_tables.h], 
     [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
     [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]
   )],
-  [AC_CHECK_HEADER([apr-1.0/apr_tables.h],
+  [AC_CHECK_HEADER([apr-1/apr_tables.h],
     [AC_CHECK_LIB(svn_client-1, main,
       [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
       [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]


--- NEW FILE medusa.spec ---
# Afpfs is not yet in fedora
%define _with_afpfs 0

Summary: Parallel brute forcing password cracker
Name: medusa
Version: 1.5
Release: 5%{?dist}
License: GPLv2
Group: Applications/System
URL: http://www.foofus.net/jmk/medusa/medusa.html
Source0: http://www.foofus.net/jmk/tools/%{name}-%{version}.tar.gz
Patch1: medusa-1.5-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, openssl-devel, apr-devel, ncpfs-devel, libssh2-devel, subversion-devel, postgresql-devel
%if %{_with_afpfs}
BuildRequires: afpfs-ng-devel
%define _afp_module yes
%else
%define _afp_module no
%endif

%description
Medusa is a speedy, massively parallel, modular,
login brute-forcer for network services.
Some of the key features of Medusa are:

    * Thread-based parallel testing. Brute-force
      testing can be performed against multiple hosts,
      users or passwords concurrently.
    * Flexible user input. Target information
      (host/user/password) can be specified in a variety of ways.
      For example, each item can be either a single
      entry or a file containing multiple entries.
      Additionally, a combination file format allows
      the user to refine their target listing.
    * Modular design. Each service module exists
      as an independent .mod file.
      This means that no modifications are necessary
      to the core application in order to extend
      the supported list of services for brute-forcing.

%prep
%setup -q
%patch1 -p1 -b .configure

%build
aclocal
autoheader
libtoolize --automake
automake --add-missing
autoconf
# required type off64_t is not available under all environments, ugly hack for ugly system heasders
export CPPFLAGS="-Doff64_t=__off64_t %{optflags}" ; export CFLAGS="-Doff64_t=__off64_t %{optflags}"
%{configure} --enable-module-afp=%{_afp_module}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/*
%{_mandir}/man1/*
%dir %{_libdir}/medusa
%{_libdir}/medusa/*

%changelog
* Tue Mar 24 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-5
- drop empty NEWS file

* Thu Mar 20 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-4
- fix license type
- fix description

* Thu Mar 20 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-3
- add missing build reqs

* Thu Mar 19 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-2
- repair summary and url according to recomendations
- switch afp support off by default

* Mon Mar 16 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:45:41 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:12:31 -0000	1.2
@@ -0,0 +1 @@
+medusa-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:45:41 -0000	1.1
+++ sources	10 Apr 2009 09:12:31 -0000	1.2
@@ -0,0 +1 @@
+82f884666161af80f8cee7a7d5c7554d  medusa-1.5.tar.gz



From jfch2222 at fedoraproject.org  Fri Apr 10 09:16:44 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 10 Apr 2009 09:16:44 +0000 (UTC)
Subject: rpms/medusa/F-11 import.log, NONE, 1.1 medusa-1.5-configure.patch, 
	NONE, 1.1 medusa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090410091644.B5A9F70122@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/medusa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16880/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log medusa-1.5-configure.patch medusa.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
medusa-1_5-5_fc12:F-11:medusa-1.5-5.fc12.src.rpm:1239354689

medusa-1.5-configure.patch:

--- NEW FILE medusa-1.5-configure.patch ---
--- medusa-1.5/configure.in.jfch	2009-02-09 18:02:09.000000000 +0100
+++ medusa-1.5/configure.in	2009-03-16 10:50:24.999005882 +0100
@@ -43,7 +43,7 @@ fi
 
 CFLAGS="$CFLAGS -fPIC"
 CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
-$(apr-config --includes --cppflags) -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
+-I/usr/include/apr-1 -I/usr/include/apr-0 -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
 
 AC_CHECKING([for pthread support])
 AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
@@ -520,7 +520,7 @@ AC_CHECK_HEADER([apr-0/apr_tables.h], 
     [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
     [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]
   )],
-  [AC_CHECK_HEADER([apr-1.0/apr_tables.h],
+  [AC_CHECK_HEADER([apr-1/apr_tables.h],
     [AC_CHECK_LIB(svn_client-1, main,
       [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
       [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]


--- NEW FILE medusa.spec ---
# Afpfs is not yet in fedora
%define _with_afpfs 0

Summary: Parallel brute forcing password cracker
Name: medusa
Version: 1.5
Release: 5%{?dist}
License: GPLv2
Group: Applications/System
URL: http://www.foofus.net/jmk/medusa/medusa.html
Source0: http://www.foofus.net/jmk/tools/%{name}-%{version}.tar.gz
Patch1: medusa-1.5-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, openssl-devel, apr-devel, ncpfs-devel, libssh2-devel, subversion-devel, postgresql-devel
%if %{_with_afpfs}
BuildRequires: afpfs-ng-devel
%define _afp_module yes
%else
%define _afp_module no
%endif

%description
Medusa is a speedy, massively parallel, modular,
login brute-forcer for network services.
Some of the key features of Medusa are:

    * Thread-based parallel testing. Brute-force
      testing can be performed against multiple hosts,
      users or passwords concurrently.
    * Flexible user input. Target information
      (host/user/password) can be specified in a variety of ways.
      For example, each item can be either a single
      entry or a file containing multiple entries.
      Additionally, a combination file format allows
      the user to refine their target listing.
    * Modular design. Each service module exists
      as an independent .mod file.
      This means that no modifications are necessary
      to the core application in order to extend
      the supported list of services for brute-forcing.

%prep
%setup -q
%patch1 -p1 -b .configure

%build
aclocal
autoheader
libtoolize --automake
automake --add-missing
autoconf
# required type off64_t is not available under all environments, ugly hack for ugly system heasders
export CPPFLAGS="-Doff64_t=__off64_t %{optflags}" ; export CFLAGS="-Doff64_t=__off64_t %{optflags}"
%{configure} --enable-module-afp=%{_afp_module}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/*
%{_mandir}/man1/*
%dir %{_libdir}/medusa
%{_libdir}/medusa/*

%changelog
* Tue Mar 24 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-5
- drop empty NEWS file

* Thu Mar 20 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-4
- fix license type
- fix description

* Thu Mar 20 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-3
- add missing build reqs

* Thu Mar 19 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-2
- repair summary and url according to recomendations
- switch afp support off by default

* Mon Mar 16 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:45:41 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:16:14 -0000	1.2
@@ -0,0 +1 @@
+medusa-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:45:41 -0000	1.1
+++ sources	10 Apr 2009 09:16:14 -0000	1.2
@@ -0,0 +1 @@
+82f884666161af80f8cee7a7d5c7554d  medusa-1.5.tar.gz



From jfch2222 at fedoraproject.org  Fri Apr 10 09:20:27 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 10 Apr 2009 09:20:27 +0000 (UTC)
Subject: rpms/medusa/F-10 import.log, NONE, 1.1 medusa-1.5-configure.patch, 
	NONE, 1.1 medusa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090410092027.6EBC870122@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/medusa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17596/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log medusa-1.5-configure.patch medusa.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
medusa-1_5-5_fc12:F-10:medusa-1.5-5.fc12.src.rpm:1239354849

medusa-1.5-configure.patch:

--- NEW FILE medusa-1.5-configure.patch ---
--- medusa-1.5/configure.in.jfch	2009-02-09 18:02:09.000000000 +0100
+++ medusa-1.5/configure.in	2009-03-16 10:50:24.999005882 +0100
@@ -43,7 +43,7 @@ fi
 
 CFLAGS="$CFLAGS -fPIC"
 CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
-$(apr-config --includes --cppflags) -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
+-I/usr/include/apr-1 -I/usr/include/apr-0 -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
 
 AC_CHECKING([for pthread support])
 AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
@@ -520,7 +520,7 @@ AC_CHECK_HEADER([apr-0/apr_tables.h], 
     [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
     [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]
   )],
-  [AC_CHECK_HEADER([apr-1.0/apr_tables.h],
+  [AC_CHECK_HEADER([apr-1/apr_tables.h],
     [AC_CHECK_LIB(svn_client-1, main,
       [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
       [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]


--- NEW FILE medusa.spec ---
# Afpfs is not yet in fedora
%define _with_afpfs 0

Summary: Parallel brute forcing password cracker
Name: medusa
Version: 1.5
Release: 5%{?dist}
License: GPLv2
Group: Applications/System
URL: http://www.foofus.net/jmk/medusa/medusa.html
Source0: http://www.foofus.net/jmk/tools/%{name}-%{version}.tar.gz
Patch1: medusa-1.5-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, openssl-devel, apr-devel, ncpfs-devel, libssh2-devel, subversion-devel, postgresql-devel
%if %{_with_afpfs}
BuildRequires: afpfs-ng-devel
%define _afp_module yes
%else
%define _afp_module no
%endif

%description
Medusa is a speedy, massively parallel, modular,
login brute-forcer for network services.
Some of the key features of Medusa are:

    * Thread-based parallel testing. Brute-force
      testing can be performed against multiple hosts,
      users or passwords concurrently.
    * Flexible user input. Target information
      (host/user/password) can be specified in a variety of ways.
      For example, each item can be either a single
      entry or a file containing multiple entries.
      Additionally, a combination file format allows
      the user to refine their target listing.
    * Modular design. Each service module exists
      as an independent .mod file.
      This means that no modifications are necessary
      to the core application in order to extend
      the supported list of services for brute-forcing.

%prep
%setup -q
%patch1 -p1 -b .configure

%build
aclocal
autoheader
libtoolize --automake
automake --add-missing
autoconf
# required type off64_t is not available under all environments, ugly hack for ugly system heasders
export CPPFLAGS="-Doff64_t=__off64_t %{optflags}" ; export CFLAGS="-Doff64_t=__off64_t %{optflags}"
%{configure} --enable-module-afp=%{_afp_module}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/*
%{_mandir}/man1/*
%dir %{_libdir}/medusa
%{_libdir}/medusa/*

%changelog
* Tue Mar 24 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-5
- drop empty NEWS file

* Thu Mar 20 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-4
- fix license type
- fix description

* Thu Mar 20 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-3
- add missing build reqs

* Thu Mar 19 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-2
- repair summary and url according to recomendations
- switch afp support off by default

* Mon Mar 16 2009 Jan F. Chadima <jchadima at redhat.com> - 10.5-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2009 20:45:41 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:19:57 -0000	1.2
@@ -0,0 +1 @@
+medusa-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2009 20:45:41 -0000	1.1
+++ sources	10 Apr 2009 09:19:57 -0000	1.2
@@ -0,0 +1 @@
+82f884666161af80f8cee7a7d5c7554d  medusa-1.5.tar.gz



From ruben at fedoraproject.org  Fri Apr 10 09:28:43 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 10 Apr 2009 09:28:43 +0000 (UTC)
Subject: rpms/debmirror/F-10 debmirror.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090410092843.1546A70122@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18810/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	debmirror.spec 
Log Message:
Initial import


--- NEW FILE debmirror.spec ---
Name:		debmirror
Version:	20070123
Release:	8%{?dist}
Summary:	Debian partial mirror script, with ftp and package pool support

Group:		Applications/Internet
License:	GPL+
URL:		http://packages.qa.debian.org/d/%{name}.html
Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	patch, ed, gnupg, rsync, coreutils, findutils, gzip, bzip2

%description
This program downloads and maintains a partial local Debian mirror.
It can mirror any combination of architectures, distributions and
sections. Files are transferred by ftp, http, hftp or rsync, and package
pools are fully supported. It also does locking and updates trace files.


%prep
%setup -q

# filter file dependency on debmirror.conf
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/\/etc\/debmirror.conf/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build

%install
rm -rf %{buildroot}

%{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf

# generate a man page
%{__install} -d %{buildroot}%{_mandir}/man1
pod2man %{name} %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
%{_mandir}/man1/%{name}.1.gz
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf


%changelog
* Thu Apr 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-8
- Use GPL+ as license
- Use main debian url for Source

* Wed Apr 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-7
- Change url to a page with more content
- Use %%{name} macro

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-6
- Generate a man page from the source
- Add explicit Requires on system commands used

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-5
- Package cleanup for review

* Sat Nov  1 2008 Javier palacios <javiplx at gmail.com>
- 20070123-2
- Added suggestions from the review process

* Sat Oct 11 2008 Javier palacios <javiplx at gmail.com>
- 20070123-1
- First release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:06:52 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:28:12 -0000	1.2
@@ -0,0 +1 @@
+debmirror_20070123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:06:52 -0000	1.1
+++ sources	10 Apr 2009 09:28:12 -0000	1.2
@@ -0,0 +1 @@
+e89d7b8aae00fbf0743b2cd6bc99d746  debmirror_20070123.tar.gz



From ruben at fedoraproject.org  Fri Apr 10 09:30:38 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 10 Apr 2009 09:30:38 +0000 (UTC)
Subject: rpms/debmirror/F-9 debmirror.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410093038.6004B70122@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	debmirror.spec import.log 
Log Message:
Initial import


--- NEW FILE debmirror.spec ---
Name:		debmirror
Version:	20070123
Release:	8%{?dist}
Summary:	Debian partial mirror script, with ftp and package pool support

Group:		Applications/Internet
License:	GPL+
URL:		http://packages.qa.debian.org/d/%{name}.html
Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	patch, ed, gnupg, rsync, coreutils, findutils, gzip, bzip2

%description
This program downloads and maintains a partial local Debian mirror.
It can mirror any combination of architectures, distributions and
sections. Files are transferred by ftp, http, hftp or rsync, and package
pools are fully supported. It also does locking and updates trace files.


%prep
%setup -q

# filter file dependency on debmirror.conf
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/\/etc\/debmirror.conf/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build

%install
rm -rf %{buildroot}

%{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf

# generate a man page
%{__install} -d %{buildroot}%{_mandir}/man1
pod2man %{name} %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
%{_mandir}/man1/%{name}.1.gz
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf


%changelog
* Thu Apr 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-8
- Use GPL+ as license
- Use main debian url for Source

* Wed Apr 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-7
- Change url to a page with more content
- Use %%{name} macro

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-6
- Generate a man page from the source
- Add explicit Requires on system commands used

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-5
- Package cleanup for review

* Sat Nov  1 2008 Javier palacios <javiplx at gmail.com>
- 20070123-2
- Added suggestions from the review process

* Sat Oct 11 2008 Javier palacios <javiplx at gmail.com>
- 20070123-1
- First release



--- NEW FILE import.log ---
debmirror-20070123-8_fc11:F-9:debmirror-20070123-8.fc11.src.rpm:1239355776


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:06:52 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:30:07 -0000	1.2
@@ -0,0 +1 @@
+debmirror_20070123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:06:52 -0000	1.1
+++ sources	10 Apr 2009 09:30:07 -0000	1.2
@@ -0,0 +1 @@
+e89d7b8aae00fbf0743b2cd6bc99d746  debmirror_20070123.tar.gz



From ruben at fedoraproject.org  Fri Apr 10 09:32:59 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 10 Apr 2009 09:32:59 +0000 (UTC)
Subject: rpms/debmirror/EL-5 debmirror.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410093259.E1B6370122@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19912/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	debmirror.spec import.log 
Log Message:
Initial import


--- NEW FILE debmirror.spec ---
Name:		debmirror
Version:	20070123
Release:	8%{?dist}
Summary:	Debian partial mirror script, with ftp and package pool support

Group:		Applications/Internet
License:	GPL+
URL:		http://packages.qa.debian.org/d/%{name}.html
Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	patch, ed, gnupg, rsync, coreutils, findutils, gzip, bzip2

%description
This program downloads and maintains a partial local Debian mirror.
It can mirror any combination of architectures, distributions and
sections. Files are transferred by ftp, http, hftp or rsync, and package
pools are fully supported. It also does locking and updates trace files.


%prep
%setup -q

# filter file dependency on debmirror.conf
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/\/etc\/debmirror.conf/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build

%install
rm -rf %{buildroot}

%{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf

# generate a man page
%{__install} -d %{buildroot}%{_mandir}/man1
pod2man %{name} %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
%{_mandir}/man1/%{name}.1.gz
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf


%changelog
* Thu Apr 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-8
- Use GPL+ as license
- Use main debian url for Source

* Wed Apr 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-7
- Change url to a page with more content
- Use %%{name} macro

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-6
- Generate a man page from the source
- Add explicit Requires on system commands used

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-5
- Package cleanup for review

* Sat Nov  1 2008 Javier palacios <javiplx at gmail.com>
- 20070123-2
- Added suggestions from the review process

* Sat Oct 11 2008 Javier palacios <javiplx at gmail.com>
- 20070123-1
- First release



--- NEW FILE import.log ---
debmirror-20070123-8_fc11:EL-5:debmirror-20070123-8.fc11.src.rpm:1239355935


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:06:52 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:32:28 -0000	1.2
@@ -0,0 +1 @@
+debmirror_20070123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:06:52 -0000	1.1
+++ sources	10 Apr 2009 09:32:29 -0000	1.2
@@ -0,0 +1 @@
+e89d7b8aae00fbf0743b2cd6bc99d746  debmirror_20070123.tar.gz



From ruben at fedoraproject.org  Fri Apr 10 09:37:56 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 10 Apr 2009 09:37:56 +0000 (UTC)
Subject: rpms/debmirror/EL-4 debmirror.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410093756.B5C4A70122@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20821/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	debmirror.spec import.log 
Log Message:
Initial import


--- NEW FILE debmirror.spec ---
Name:		debmirror
Version:	20070123
Release:	8%{?dist}
Summary:	Debian partial mirror script, with ftp and package pool support

Group:		Applications/Internet
License:	GPL+
URL:		http://packages.qa.debian.org/d/%{name}.html
Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	patch, ed, gnupg, rsync, coreutils, findutils, gzip, bzip2

%description
This program downloads and maintains a partial local Debian mirror.
It can mirror any combination of architectures, distributions and
sections. Files are transferred by ftp, http, hftp or rsync, and package
pools are fully supported. It also does locking and updates trace files.


%prep
%setup -q

# filter file dependency on debmirror.conf
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/\/etc\/debmirror.conf/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build

%install
rm -rf %{buildroot}

%{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf

# generate a man page
%{__install} -d %{buildroot}%{_mandir}/man1
pod2man %{name} %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
%{_mandir}/man1/%{name}.1.gz
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf


%changelog
* Thu Apr 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-8
- Use GPL+ as license
- Use main debian url for Source

* Wed Apr 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-7
- Change url to a page with more content
- Use %%{name} macro

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-6
- Generate a man page from the source
- Add explicit Requires on system commands used

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-5
- Package cleanup for review

* Sat Nov  1 2008 Javier palacios <javiplx at gmail.com>
- 20070123-2
- Added suggestions from the review process

* Sat Oct 11 2008 Javier palacios <javiplx at gmail.com>
- 20070123-1
- First release



--- NEW FILE import.log ---
debmirror-20070123-8_fc11:EL-4:debmirror-20070123-8.fc11.src.rpm:1239356233


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:06:52 -0000	1.1
+++ .cvsignore	10 Apr 2009 09:37:26 -0000	1.2
@@ -0,0 +1 @@
+debmirror_20070123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:06:52 -0000	1.1
+++ sources	10 Apr 2009 09:37:26 -0000	1.2
@@ -0,0 +1 @@
+e89d7b8aae00fbf0743b2cd6bc99d746  debmirror_20070123.tar.gz



From jakub at fedoraproject.org  Fri Apr 10 09:40:48 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 10 Apr 2009 09:40:48 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-libjava-i386.patch, NONE,
	1.1 generate-cacerts.pl, NONE, 1.1 gcc.spec, 1.38, 1.39
Message-ID: <20090410094048.4FBAB70122@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21220

Modified Files:
	gcc.spec 
Added Files:
	gcc44-libjava-i386.patch generate-cacerts.pl 
Log Message:
4.4.0-0.33

gcc44-libjava-i386.patch:

--- NEW FILE gcc44-libjava-i386.patch ---
diff -up ./libjava/configure.ac.sav ./libjava/configure.ac
--- ./libjava/configure.ac.sav	2009-04-03 14:56:35.000000000 -0400
+++ ./libjava/configure.ac	2009-04-03 14:56:50.000000000 -0400
@@ -1881,7 +1881,7 @@ then
     case ${host} in
       *-mingw* | *-cygwin*)
         host_cpu=x86;;
-      i486-* | i586-* | i686-*)
+      i386-* | i486-* | i586-* | i686-*)
         host_cpu=i386;;
       x86_64-*)
         host_cpu=amd64;;
diff -up ./libjava/configure.sav ./libjava/configure
--- ./libjava/configure.sav	2009-04-03 14:56:27.000000000 -0400
+++ ./libjava/configure	2009-04-03 15:02:55.000000000 -0400
@@ -28285,7 +28285,7 @@ echo "${ECHO_T}host is ${host}" >&6
     case ${host} in
       *-mingw* | *-cygwin*)
         host_cpu=x86;;
-      i486-* | i586-* | i686-*)
+      i386-* | i486-* | i586-* | i686-*)
         host_cpu=i386;;
       x86_64-*)
         host_cpu=amd64;;


--- NEW FILE generate-cacerts.pl ---
#!/usr/bin/perl

# Copyright (C) 2007 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.

# generate-cacerts.pl generates a gkeytool keystore named 'cacerts'
# from OpenSSL's certificate bundle.

# First extract each of OpenSSL's bundled certificates into its own
# aliased filename.
$file = "/etc/pki/tls/cert.pem";
open(CERTS, $file);
@certs = <CERTS>;
close(CERTS);

$pem_file_number = 0;
$writing_cert = 0;
foreach $cert (@certs)
{
	 if ($cert eq "-----BEGIN CERTIFICATE-----\n")
	 {
		  if ($writing_cert != 0)
		  {
				die "$file is malformed.";
		  }
		  $pem_file_number++;
		  # Numbering each file guarantees that cert aliases will be
		  # unique.
		  $pem_file_name = "$pem_file_number$cert_alias.pem";
		  $writing_cert = 1;
		  open(PEM, ">$pem_file_name");
		  print PEM $cert;
	 }
	 elsif ($cert eq "-----END CERTIFICATE-----\n")
	 {
		  $writing_cert = 0;
		  print PEM $cert;
		  close(PEM);
	 }
	 elsif ($cert =~ /Issuer: /)
	 {
		  # Generate an alias using the OU and CN attributes of the
		  # Issuer field if both are present, otherwise use only the CN
		  # attribute.  The Issuer field must have either the OU or the
		  # CN attribute.
		  $_ = $cert;
		  if ($cert =~ /OU=/)
		  {
				s/Issuer:.*?OU=//;
				# Remove other occurrences of OU=.
				s/OU=.*CN=//;
				# Remove CN= if there were not other occurrences of OU=.
				s/CN=//;
		  }
		  elsif ($cert =~ /CN=/)
		  {
				s/Issuer:.*CN=//;
		  }
		  s/\W//g;
		  tr/A-Z/a-z/;
		  $cert_alias = $_
	 }
	 else
	 {
		  if ($writing_cert == 1)
		  {
				print PEM $cert;
		  }
	 }
}

# Check that the correct number of .pem files were produced.
@pem_files = <*.pem>;
if (@pem_files != $pem_file_number)
{
	 die "Number of .pem files produced does not match".
		  " number of certs read from $file.";
}

# Now store each cert in the 'cacerts' file using gkeytool.
$certs_written_count = 0;
foreach $pem_file (@pem_files)
{
	 system "yes | gkeytool -import -alias `basename $pem_file .pem`".
		  " -keystore cacerts -storepass '' -file $pem_file".
		  " 2>&1 >/dev/null";
	 unlink($pem_file);
	 $certs_written_count++;
}

# Check that the correct number of certs were added to the keystore.
if ($certs_written_count != $pem_file_number)
{
	 die "Number of certs added to keystore does not match".
		  " number of certs read from $file.";
}


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gcc.spec	9 Apr 2009 12:06:24 -0000	1.38
+++ gcc.spec	10 Apr 2009 09:40:17 -0000	1.39
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 0.32
+%define gcc_release 0.33
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -36,6 +36,33 @@
 %ifarch x86_64
 %define multilib_32_arch i586
 %endif
+
+# java-1.5.0-gcj-compat related definitions
+
+# convert an absolute path to a relative path.  each symbolic link is
+# specified relative to the directory in which it is installed so that
+# it will resolve properly within chrooted installations.
+%define abs2rel %{__perl} -e 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
+
+# python install location
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib().replace('%{_prefix}','',1)")}
+
+# Java version information and alternatives priority
+%define javaver         1.5.0
+%define javabuildver    0
+%define javadirname     java-%{javaver}-gcj-%{javaver}.%{javabuildver}
+%define origin          gcj
+%define priority        1500
+
+# installation directory names corresponding to JPackage specifications
+%define sdklnk          java-%{javaver}-%{origin}
+%define jrelnk          jre-%{javaver}-%{origin}
+%define sdkdir          java-%{javaver}-gcj-%{javaver}.%{javabuildver}
+%define jredir          %{sdkdir}/jre
+%define sdkbindir       %{_jvmdir}/%{sdklnk}/bin
+%define jrebindir       %{_jvmdir}/%{jrelnk}/bin
+%define jvmjardir       %{_jvmjardir}/java-%{javaver}-gcj-%{javaver}.%{javabuildver}
+
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
@@ -55,6 +82,7 @@
 Source3: protoize.1
 %define fastjar_ver 0.97
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
+Source5: generate-cacerts.pl
 URL: http://gcc.gnu.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
@@ -152,6 +180,7 @@
 Patch27: gcc44-power7-2.patch
 Patch28: gcc44-pr38757.patch
 Patch30: gcc44-pr39543.patch
+Patch31: gcc44-libjava-i386.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -358,6 +387,165 @@
 %description -n libgcj-src
 The Java(tm) runtime library sources for use in Eclipse.
 
+%package -n java-%{javaver}-gcj
+Summary: JPackage runtime compatibility layer for GCJ
+Group:   Development/Languages
+
+BuildRequires: gcc-java >= %{version}
+BuildRequires: libgcj-src >= %{version}
+# required for cacerts generation
+BuildRequires: openssl
+BuildRequires: python-devel
+%if ! %{bootstrap_java}
+# required for javadoc
+BuildRequires: java-1.6.0-openjdk-devel
+%endif
+BuildRequires: unzip
+
+# required for tools and libgcj.jar
+Requires:         libgcj = %{version}
+# required for directory structures
+Requires:         jpackage-utils >= 1.7.3
+# required for java.security symlink
+Requires:         %{_prefix}/%{_lib}/security/classpath.security
+%if ! %{bootstrap_java}
+# required for javadoc symlink
+Requires:         sinjdoc
+%endif
+# post requires alternatives to install tool alternatives
+Requires(post):   %{_sbindir}/alternatives
+# post requires gij to retrieve gcc version
+Requires(post):   %{_bindir}/gij
+# post rebuilds the gcj database
+Requires(post):   %{_bindir}/rebuild-gcj-db
+# rebuild-gcj-db requires gcj-dbtool
+Requires(post):   %{_bindir}/gcj-dbtool
+# rebuild-gcj-db requires findutils
+Requires(post):   findutils
+# postun requires alternatives to uninstall tool alternatives
+Requires(postun): %{_sbindir}/alternatives
+# postun requires gij to retrieve gcc version
+Requires(postun): %{_bindir}/gij
+# postun rebuilds the gcj database
+Requires(postun): %{_bindir}/rebuild-gcj-db
+# rebuild-gcj-db requires gcj-dbtool
+Requires(postun): %{_bindir}/gcj-dbtool
+# rebuild-gcj-db requires findutils
+Requires(postun): findutils
+
+# standard JPackage base provides
+Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
+Provides: jre-%{origin} = %{version}-%{release}
+Provides: jre-%{javaver} = %{version}-%{release}
+Provides: java-%{javaver} = %{version}-%{release}
+Provides: jre = %{javaver}
+Provides: java-%{origin} = %{version}-%{release}
+Provides: java = %{javaver}
+# libgcj provides, translated to JPackage provides
+Provides: jaas = %{version}-%{release}
+Provides: jce = %{version}-%{release}
+Provides: jdbc-stdext = %{version}-%{release}
+Provides: jdbc-stdext = 3.0
+Provides: jndi = %{version}-%{release}
+Provides: jndi-cos = %{version}-%{release}
+Provides: jndi-dns = %{version}-%{release}
+Provides: jndi-ldap = %{version}-%{release}
+Provides: jndi-rmi = %{version}-%{release}
+Provides: jsse = %{version}-%{release}
+Provides: java-sasl = %{version}-%{release}
+Provides: jaxp_parser_impl = %{version}-%{release}
+# java-gcj-compat base provides
+Provides: java-gcj-compat = 1.0.79
+Provides: java-1.4.2-gcj-compat > 1.4.2.0-40jpp.111
+
+Obsoletes: java-1.4.2-gcj-compat <= 1.4.2.0-40jpp.111
+Obsoletes: gnu-crypto <= 2.1.0-2jpp.1
+Obsoletes: gnu-crypto-sasl-jdk1.4 <= 2.1.0-2jpp.1
+Obsoletes: jessie <= 1.0.1-7
+
+%description -n java-%{javaver}-gcj
+This package installs directory structures, shell scripts and symbolic
+links to simulate a JPackage-compatible runtime environment with GCJ.
+
+%package -n java-%{javaver}-gcj-devel
+Summary: JPackage development compatibility layer for GCJ
+Group:   Development/Tools
+
+# require libgcj-src for tools.jar symlink
+Requires:         libgcj-src = %{version}
+# require base package
+Requires:         java-%{javaver}-gcj = %{version}-%{release}
+# require ecj for ecj binary
+Requires:         ecj >= 3.2.1
+# require python for aot-compile
+Requires:         python
+# require gcc-java for gjavah binary
+Requires:         gcc-java = %{version}
+# post requires alternatives to install tool alternatives
+Requires(post):   %{_sbindir}/alternatives
+# post requires gcj to retrieve gcj header file locations
+Requires(post):   %{_bindir}/gcj
+# postun requires alternatives to uninstall tool alternatives
+Requires(postun): %{_sbindir}/alternatives
+
+# standard JPackage devel provides
+Provides: java-sdk-%{javaver}-%{origin} = %{version}
+Provides: java-sdk-%{javaver} = %{version}
+Provides: java-sdk-%{origin} = %{version}
+Provides: java-sdk = %{javaver}
+Provides: java-%{javaver}-devel = %{version}
+Provides: java-devel-%{origin} = %{version}
+Provides: java-devel = %{javaver}
+# java-gcj-compat devel provides
+Provides: java-gcj-compat-devel = 1.0.79
+Provides: java-1.4.2-gcj-compat-devel > 1.4.2.0-40jpp.111
+
+Obsoletes: java-1.4.2-gcj-compat-devel <= 1.4.2.0-40jpp.111
+
+%description -n java-%{javaver}-gcj-devel
+This package installs directory structures, shell scripts and symbolic
+links to simulate a JPackage-compatible development environment with
+GCJ.
+
+%package -n java-%{javaver}-gcj-src
+Summary: Source files for libgcj
+Group:   Development/Libraries
+
+Requires:       java-%{javaver}-gcj = %{version}-%{release}
+Requires:       libgcj-src = %{version}
+# post requires gij to retrieve gcc version
+Requires(post): %{_bindir}/gij
+
+# java-gcj-compat src provides
+Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
+
+Obsoletes: java-1.4.2-gcj-compat-src <= 1.4.2.0-40jpp.111
+
+%description -n java-%{javaver}-gcj-src
+This package installs a src.zip symbolic link that points to a
+specific version of the libgcj sources.
+
+%if ! %{bootstrap_java}
+%package -n java-%{javaver}-gcj-javadoc
+Summary: API documentation for libgcj
+Group:   Documentation
+
+# require base package
+Requires: java-%{javaver}-gcj = %{version}-%{release}
+
+# standard JPackage javadoc provides
+Provides: java-javadoc = %{version}-%{release}
+Provides: java-%{javaver}-javadoc = %{version}-%{release}
+# java-gcj-compat javadoc provides
+Provides: java-1.4.2-gcj-compat-javadoc > 1.4.2.0-40jpp.111
+
+Obsoletes: java-1.4.2-gcj-compat-javadoc <= 1.4.2.0-40jpp.111
+Obsoletes: gnu-crypto-javadoc <= 2.1.0-2jpp.1
+
+%description -n java-%{javaver}-gcj-javadoc
+This package installs Javadoc API documentation for libgcj.
+%endif
+
 %package -n cpp
 Summary: The C Preprocessor
 Group: Development/Languages
@@ -441,6 +629,7 @@
 %patch27 -p0 -b .power7-2~
 %patch28 -p0 -b .pr38757~
 #%patch30 -p0 -b .pr39543~
+%patch31 -p0 -b .libjava-i386~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -567,6 +756,7 @@
       ../gcc/Makefile.in
     ;;
 esac
+
 CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`" XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
 	GCJFLAGS="$OPT_FLAGS" \
 	../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@@ -582,8 +772,11 @@
 	--disable-libgcj \
 %else
 	--enable-java-awt=gtk --disable-dssi --enable-plugin \
-	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
-	--enable-libgcj-multifile \
+	--with-java-home=%{_prefix}/lib/jvm/%{javadirname}/jre \
+	--enable-libgcj-multifile --enable-java-home --enable-aot-compile-rpm \
+	--with-jvm-root-dir=\${prefix}/lib/jvm/%{javadirname} \
+	--with-jvm-jar-dir=\${prefix}/lib/jvm-exports/%{javadirname} \
+	--with-python-dir=%{python_sitelib} \
 %if !%{bootstrap_java}
 	--enable-java-maintainer-mode \
 %endif
@@ -1112,6 +1305,126 @@
 	  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version} \
 	  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
 touch $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
+
+# versionless symbolic links
+pushd $RPM_BUILD_ROOT%{_jvmdir}
+   ln -s %{jredir} %{jrelnk}
+   ln -s %{sdkdir} %{sdklnk}
+popd
+pushd $RPM_BUILD_ROOT%{_jvmjardir}
+   ln -s %{sdkdir} %{jrelnk}
+   ln -s %{sdkdir} %{sdklnk}
+popd
+
+# create relevant links in jre lib dir for backwards compatibility
+pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib
+for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
+    jndi-ldap jndi-rmi jsse sasl; do
+    ln -sf rt.jar $jarname.jar;
+done
+popd
+
+# security directory and provider list
+install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+  RELATIVE=$(%{abs2rel} %{_prefix}/%{_lib}/security \
+    %{_jvmdir}/%{jredir}/lib/security)
+  ln -sf $RELATIVE/classpath.security java.security
+popd
+# default security providers, provided by libgcj
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
+for provider in \
+  1000-gnu.java.security.provider.Gnu \
+  1001-gnu.javax.crypto.jce.GnuCrypto \
+  1002-gnu.javax.crypto.jce.GnuSasl \
+  1003-gnu.javax.net.ssl.provider.Jessie \
+  1004-gnu.javax.security.auth.callback.GnuCallbacks
+do
+  cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/$provider << EOF
+# This file's contents are ignored.  Its name, of the form
+# <priority>-<provider name>, is used by post and postun scripts to
+# rebuild the list of security providers in libgcj's
+# classpath.security file.
+EOF
+
+done
+# cacerts
+%{__perl} %{SOURCE5}
+install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+
+# classmap database directory
+install -dm 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj
+
+# set up ecj link
+RELATIVE=$(%{abs2rel} %{_prefix}/bin %{_jvmdir}/%{sdkdir}/bin)
+ln -sf \
+  $RELATIVE/ecj \
+  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac
+
+# source zip
+RELATIVE=$(%{abs2rel} %{_javadir} %{_jvmdir}/%{sdkdir})
+ln -s \
+  $RELATIVE/src-%{version}.zip \
+  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/src.zip
+
+#use fastjar instead of gjar
+RELATIVE=$(%{abs2rel} %{_prefix}/bin %{_jvmdir}/%{sdkdir}/bin)
+ln -sf \
+  $RELATIVE/fastjar \
+  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/jar
+
+# use sinjdoc if not bootstrapping
+%if ! %{bootstrap_java}
+ln -sf \
+  $RELATIVE/sinjdoc \
+  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javadoc
+%endif
+
+# arch dir for x86_64 should be x86_64, with amd64 being a link (to keep the 
+# package backwards compatible)
+%ifarch x86_64
+if [ -d $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64 ]; then
+
+  mv $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64 \
+     $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/x86_64
+
+  ln -s x86_64 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
+fi
+%endif
+
+%if ! %{bootstrap_java}
+# build and install API documentation
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/java-%{javaver}-gcj
+pushd $RPM_BUILD_ROOT%{_javadocdir}
+  ln -s java-%{javaver}-gcj java
+popd
+rm -rf docsbuild
+mkdir docsbuild
+pushd docsbuild
+  echo ==== CHECK ZIP ====
+  unzip -tq $RPM_BUILD_ROOT/usr/share/java/src-%{version}.zip || :
+  echo ==== END CHECK ZIP ====
+  if unzip -tq /usr/share/java/src-%{version}.zip
+  then
+    fastjar xvf /usr/share/java/src-%{version}.zip
+    rm -rf gnu
+    find ./ -name \*.java | xargs -n 1 dirname | sort | uniq \
+      | sed -e "s/\.\///" | sed -e "s/\//\./" \
+      | sed -e "s/\//\./" | sed -e "s/\//\./" \
+      | sed -e "s/\//\./" | sed -e "s/\//\./" \
+      | xargs %{_jvmdir}/java-openjdk/bin/javadoc -quiet \
+      -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
+      -encoding UTF-8 -breakiterator \
+      -linksource -splitindex -doctitle "GNU libgcj %{version}" \
+      -windowtitle "GNU libgcj %{version} Documentation"
+  else
+    # Work around https://bugzilla.redhat.com/show_bug.cgi?id=404981
+    touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}/package-list
+  fi
+popd
+%endif
+
+
 %endif
 
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/protoize.1
@@ -1209,6 +1522,128 @@
 
 %postun -n libgcj -p /sbin/ldconfig
 
+%post -n java-%{javaver}-gcj
+alternatives \
+  --install %{_bindir}/java java %{jrebindir}/java %{priority} \
+  --slave %{_jvmdir}/jre          jre          %{_jvmdir}/%{jrelnk} \
+  --slave %{_jvmjardir}/jre       jre_exports  %{_jvmjardir}/%{jrelnk} \
+  --slave %{_bindir}/keytool      keytool      %{jrebindir}/keytool \
+  --slave %{_bindir}/rmiregistry  rmiregistry  %{jrebindir}/rmiregistry
+
+alternatives \
+  --install %{_jvmdir}/jre-%{origin} \
+  jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
+  --slave %{_jvmjardir}/jre-%{origin} \
+  jre_%{origin}_exports %{_jvmjardir}/%{jrelnk}
+
+alternatives \
+  --install %{_jvmdir}/jre-%{javaver} \
+  jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \
+  --slave %{_jvmjardir}/jre-%{javaver} \
+  jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
+
+alternatives --install %{_javadir}/jaxp_parser_impl.jar \
+  jaxp_parser_impl %{_javadir}/libgcj-%{version}.jar 20
+
+{
+  # Rebuild the list of security providers in classpath.security.
+  # This used to be a standalone script, rebuild-security-providers,
+  # provided by the Fedora version of jpackage-utils.  Now it is
+  # inlined here and removed from Fedora's jpackage-utils for
+  # compatibility with jpackage.org's jpackage-utils.  See:
+  # https://bugzilla.redhat.com/show_bug.cgi?id=260161
+  suffix=security/classpath.security
+  secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
+
+  for secfile in $secfiles
+  do
+    # check if this classpath.security file exists
+    [ -f "$secfile" ] || continue
+
+    sed -i '/^security\.provider\./d' "$secfile"
+
+    count=0
+    for provider in $(ls /etc/java/security/security.d)
+    do
+      count=$((count + 1))
+      echo "security.provider.${count}=${provider#*-}" >> "$secfile"
+    done
+  done
+} || :
+
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+
+%postun -n java-%{javaver}-gcj
+if [ $1 -eq 0 ]
+then
+  alternatives --remove java %{jrebindir}/java
+  alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
+  alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
+  alternatives --remove jaxp_parser_impl \
+    %{_javadir}/libgcj-%{version}.jar
+fi
+
+{
+  # Rebuild the list of security providers in classpath.security
+  suffix=security/classpath.security
+  secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
+
+  for secfile in $secfiles
+  do
+    # check if this classpath.security file exists
+    [ -f "$secfile" ] || continue
+
+    sed -i '/^security\.provider\./d' "$secfile"
+
+    count=0
+    for provider in $(ls /etc/java/security/security.d)
+    do
+      count=$((count + 1))
+      echo "security.provider.${count}=${provider#*-}" >> "$secfile"
+    done
+  done
+} || :
+
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+
+%post -n java-%{javaver}-gcj-devel
+alternatives \
+  --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
+  --slave %{_jvmdir}/java         java_sdk          %{_jvmdir}/%{sdklnk} \
+  --slave %{_jvmjardir}/java      java_sdk_exports  %{_jvmjardir}/%{sdklnk} \
+  --slave %{_bindir}/javadoc      javadoc           %{sdkbindir}/javadoc \
+  --slave %{_bindir}/javah        javah             %{sdkbindir}/javah \
+  --slave %{_bindir}/jar          jar               %{sdkbindir}/jar \
+  --slave %{_bindir}/jarsigner    jarsigner         %{sdkbindir}/jarsigner \
+  --slave %{_bindir}/appletviewer appletviewer      %{sdkbindir}/appletviewer \
+  --slave %{_bindir}/rmic         rmic              %{sdkbindir}/rmic
+
+alternatives \
+  --install %{_jvmdir}/java-%{origin} \
+  java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \
+  --slave %{_jvmjardir}/java-%{origin} \
+  java_sdk_%{origin}_exports %{_jvmjardir}/%{sdklnk}
+
+alternatives \
+  --install %{_jvmdir}/java-%{javaver} \
+  java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \
+  --slave %{_jvmjardir}/java-%{javaver} \
+  java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
+
+%postun -n java-%{javaver}-gcj-devel
+if [ $1 -eq 0 ]
+then
+  alternatives --remove javac %{sdkbindir}/javac
+  alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
+  alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
+fi
+
 %post -n libgfortran -p /sbin/ldconfig
 
 %postun -n libgfortran -p /sbin/ldconfig
@@ -1658,6 +2093,137 @@
 %dir %{_prefix}/share/java
 %{_prefix}/share/java/src*.zip
 %{_prefix}/share/java/libgcj-tools-%{version}.jar
+
+%files -n java-%{javaver}-gcj
+%defattr(-,root,root,-)
+%dir %{_jvmdir}/%{sdkdir}
+%dir %{_jvmdir}/%{jredir}
+%dir %{_jvmdir}/%{jredir}/bin
+%dir %{_jvmdir}/%{jredir}/lib
+%dir %{_jvmdir}/%{jredir}/lib/%{_arch}
+%dir %{_jvmdir}/%{jredir}/lib/%{_arch}/client
+%dir %{_jvmdir}/%{jredir}/lib/%{_arch}/server
+%dir %{_jvmdir}/%{jredir}/lib/security
+%dir %{jvmjardir}
+%dir %{_prefix}/%{_lib}/gcj
+%{_bindir}/rebuild-gcj-db
+%{_jvmdir}/%{jredir}/bin/java
+%{_jvmdir}/%{jredir}/bin/keytool
+%{_jvmdir}/%{jredir}/bin/rmiregistry
+%{_jvmdir}/%{jredir}/bin/orbd
+%{_jvmdir}/%{jredir}/bin/rmid
+%{_jvmdir}/%{jredir}/bin/tnameserv
+%{_jvmdir}/%{jredir}/lib/security/cacerts
+%{_jvmdir}/%{jredir}/lib/security/java.security
+%{_jvmdir}/%{jredir}/lib/jaas.jar
+%{_jvmdir}/%{jredir}/lib/jce.jar
+%{_jvmdir}/%{jredir}/lib/jdbc-stdext.jar
+%{_jvmdir}/%{jredir}/lib/jndi-cos.jar
+%{_jvmdir}/%{jredir}/lib/jndi-dns.jar
+%{_jvmdir}/%{jredir}/lib/jndi-ldap.jar
+%{_jvmdir}/%{jredir}/lib/jndi-rmi.jar
+%{_jvmdir}/%{jredir}/lib/jndi.jar
+%{_jvmdir}/%{jredir}/lib/jsse.jar
+%{_jvmdir}/%{jredir}/lib/sasl.jar
+%ifarch x86_64
+%{_jvmdir}/%{jredir}/lib/amd64
+%endif
+%{_jvmdir}/%{jrelnk}
+%{jvmjardir}/jaas.jar
+%{jvmjardir}/jaas-%{javaver}.jar
+%{jvmjardir}/jaas-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jce.jar
+%{jvmjardir}/jce-%{javaver}.jar
+%{jvmjardir}/jce-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jdbc-stdext.jar
+%{jvmjardir}/jdbc-stdext-%{javaver}.jar
+%{jvmjardir}/jdbc-stdext-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jndi.jar
+%{jvmjardir}/jndi-%{javaver}.jar
+%{jvmjardir}/jndi-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jndi-cos.jar
+%{jvmjardir}/jndi-cos-%{javaver}.jar
+%{jvmjardir}/jndi-cos-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jndi-dns.jar
+%{jvmjardir}/jndi-dns-%{javaver}.jar
+%{jvmjardir}/jndi-dns-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jndi-ldap.jar
+%{jvmjardir}/jndi-ldap-%{javaver}.jar
+%{jvmjardir}/jndi-ldap-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jndi-rmi.jar
+%{jvmjardir}/jndi-rmi-%{javaver}.jar
+%{jvmjardir}/jndi-rmi-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/jsse.jar
+%{jvmjardir}/jsse-%{javaver}.jar
+%{jvmjardir}/jsse-%{javaver}.%{javabuildver}.jar
+%{jvmjardir}/sasl.jar
+%{jvmjardir}/sasl-%{javaver}.jar
+%{jvmjardir}/sasl-%{javaver}.%{javabuildver}.jar
+%{_jvmjardir}/%{jrelnk}
+%{_jvmdir}/%{sdkdir}/jre/lib/rt.jar
+%{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
+%{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
+%{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
+# These must not be marked %config(noreplace).  Their file names are
+# used in post and postun.  Their contents are ignored, so replacing
+# them doesn't matter.  .rpmnew files are harmful since they're
+# interpreted by post and postun as classnames ending in rpmnew.
+%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
+%{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
+%{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
+%{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
+%{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
+
+%files -n java-%{javaver}-gcj-devel
+%defattr(-,root,root,-)
+%dir %{_jvmdir}/%{sdkdir}/bin
+%dir %{_jvmdir}/%{sdkdir}/include
+%dir %{_jvmdir}/%{sdkdir}/include/linux
+%dir %{_jvmdir}/%{sdkdir}/lib
+%{_bindir}/aot-compile
+%{_bindir}/aot-compile-rpm
+%{_prefix}/%{python_sitelib}/aotcompile.py*
+%{_prefix}/%{python_sitelib}/classfile.py*
+%{_jvmdir}/%{sdkdir}/bin/appletviewer
+%{_jvmdir}/%{sdkdir}/bin/jar
+%{_jvmdir}/%{sdkdir}/bin/jarsigner
+%{_jvmdir}/%{sdkdir}/bin/java
+%{_jvmdir}/%{sdkdir}/bin/javac
+%{_jvmdir}/%{sdkdir}/bin/javadoc
+%{_jvmdir}/%{sdkdir}/bin/javah
+%{_jvmdir}/%{sdkdir}/bin/keytool
+%{_jvmdir}/%{sdkdir}/bin/native2ascii
+%{_jvmdir}/%{sdkdir}/bin/orbd
+%{_jvmdir}/%{sdkdir}/bin/rmic
+%{_jvmdir}/%{sdkdir}/bin/rmid
+%{_jvmdir}/%{sdkdir}/bin/rmiregistry
+%{_jvmdir}/%{sdkdir}/bin/serialver
+%{_jvmdir}/%{sdkdir}/bin/tnameserv
+%{_jvmdir}/%{sdklnk}
+%{_jvmjardir}/%{sdklnk}
+%{_jvmdir}/%{sdkdir}/include/jawt.h
+%{_jvmdir}/%{sdkdir}/include/jni.h
+%{_jvmdir}/%{sdkdir}/include/linux/jawt_md.h
+%{_jvmdir}/%{sdkdir}/include/linux/jni_md.h
+%{_jvmdir}/%{sdkdir}/lib/tools.jar
+
+%files -n java-%{javaver}-gcj-src
+%defattr(-,root,root,-)
+%{_jvmdir}/%{sdkdir}/src.zip
+
+%if ! %{bootstrap_java}
+%files -n java-%{javaver}-gcj-javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/java-%{javaver}-gcj
+# A JPackage that "provides" this directory will, in its %post script,
+# remove the existing directory and install a new symbolic link to its
+# versioned directory.  For Fedora we want clear file ownership so we
+# make java-1.5.0-gcj-javadoc own this file.  Installing the
+# corresponding JPackage over java-1.5.0-gcj-javadoc will work but
+# will invalidate this file.
+%doc %{_javadocdir}/java
+%endif
+
 %endif
 
 %if %{build_ada}
@@ -1751,6 +2317,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Apr 10 2009 Deepak Bhole <dbhole at redhat.com> 4.4.0-0.33
+- create new java-1.5.0-gcj* packages to install JPackage compliant links
+
 * Thu Apr  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.32
 - update from gcc-4_4-branch
   - PRs c++/34691, c++/35146, c++/35240, c++/37806, c++/38030, c++/38850,



From kasal at fedoraproject.org  Fri Apr 10 09:42:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 10 Apr 2009 09:42:02 +0000 (UTC)
Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.30,1.31
Message-ID: <20090410094202.9D08E70137@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21448

Modified Files:
	docbook-dtds.spec 
Log Message:
- remove perl dependency (#462997)
- make %%install and the scriptlets more compact


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- docbook-dtds.spec	24 Feb 2009 12:16:59 -0000	1.30
+++ docbook-dtds.spec	10 Apr 2009 09:41:32 -0000	1.31
@@ -1,8 +1,9 @@
 %define openjadever 1.3.2
+%define version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}"
 
 Name: docbook-dtds
 Version: 1.0
-Release: 45%{?dist}
+Release: 46%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -32,7 +33,6 @@
 Provides: docbook-dtd45-sgml = %{version}-%{release}
 Provides: docbook-dtd45-xml = %{version}-%{release}
 
-Requires: grep perl
 Requires(post): libxml2 >= 2.4.8
 Requires(postun): libxml2 >= 2.4.8
 # If upgrading, the old package's postun scriptlet may use install-catalog
@@ -82,85 +82,73 @@
 
 %prep
 %setup -c -T
+eval mkdir %{version_list}
 # DocBook V3.0
-mkdir 3.0-sgml
 cd 3.0-sgml
 unzip %{SOURCE0}
 patch -b docbook.cat %{PATCH0}
 cd ..
 
 # DocBook V3.1
-mkdir 3.1-sgml
 cd 3.1-sgml
 unzip %{SOURCE1}
 patch -b docbook.cat %{PATCH1}
 cd ..
 
 # DocBook V4.0
-mkdir 4.0-sgml
 cd 4.0-sgml
 unzip %{SOURCE2}
 patch -b docbook.cat %{PATCH2}
 cd ..
 
 # DocBook V4.1
-mkdir 4.1-sgml
 cd 4.1-sgml
 unzip %{SOURCE3}
 patch -b docbook.cat %{PATCH3}
 cd ..
 
 # DocBook XML V4.1.2
-mkdir 4.1.2-xml
 cd 4.1.2-xml
 unzip %{SOURCE4}
 cd ..
 
 # DocBook V4.2
-mkdir 4.2-sgml
 cd 4.2-sgml
 unzip %{SOURCE5}
 patch -b docbook.cat %{PATCH4}
 cd ..
 
 # DocBook XML V4.2
-mkdir 4.2-xml
 cd 4.2-xml
 unzip %{SOURCE6}
 cd ..
 
 # DocBook V4.3
-mkdir 4.3-sgml
 cd 4.3-sgml
 unzip %{SOURCE7}
 cd ..
 
 # DocBook XML V4.3
-mkdir 4.3-xml
 cd 4.3-xml
 unzip %{SOURCE8}
 cd ..
 
 # DocBook V4.4
-mkdir 4.4-sgml
 cd 4.4-sgml
 unzip %{SOURCE9}
 cd ..
 
 # DocBook XML V4.4
-mkdir 4.4-xml
 cd 4.4-xml
 unzip %{SOURCE10}
 cd ..
 
 # DocBook v4.5
-mkdir 4.5-sgml
 cd 4.5-sgml
 unzip %{SOURCE11}
 cd ..
 
 # DocBook XML v4.5
-mkdir 4.5-xml
 cd 4.5-xml
 unzip %{SOURCE12}
 cd ..
@@ -196,158 +184,30 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# DocBook V3.0
-cd 3.0-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook V3.1
-cd 3.1-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook V4.0
-cd 4.0-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook V4.1
-cd 4.1-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.1.2
-cd 4.1.2-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.2
-cd 4.2-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.2
-cd 4.2-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.3
-cd 4.3-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.3
-cd 4.3-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.4
-cd 4.4-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.4
-cd 4.4-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.5
-cd 4.5-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.5
-cd 4.5-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-
 # Symlinks
 mkdir -p $RPM_BUILD_ROOT/etc/sgml
-ln -s sgml-docbook-4.5-%{version}-%{release}.cat \
-  $RPM_BUILD_ROOT/etc/sgml/sgml-docbook.cat
-ln -s xml-docbook-4.5-%{version}-%{release}.cat \
-  $RPM_BUILD_ROOT/etc/sgml/xml-docbook.cat
-
-# Files for %ghost
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+for fmt in sgml xml; do
+  ln -s $fmt-docbook-4.5-%{version}-%{release}.cat \
+     $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat
+done
+
+eval set %{version_list}
+for dir
+do
+  cd $dir
+  fmt=${dir#*-} vvr=${dir%%-*}-%{version}-%{release}
+  DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  case $fmt in
+    sgml)   mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
+    xml)    mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
+  esac
+  install *.dtd *.mod $DESTDIR
+  install docbook.cat $DESTDIR/catalog
+  cd ..
+  # File for %%ghost
+  touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$vvr.cat
+done
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -357,1238 +217,195 @@
 %defattr (0644,root,root,0755)
 #in upstream tarballs there is a lot of files with 0755 permissions
 #but they don't need to be, 0644 is enough for every file in tarball
-%doc --parents 3.1-sgml/ChangeLog
-%doc --parents 4.1-sgml/ChangeLog
-%doc --parents */*.txt
+%doc --parents 3.1-sgml/ChangeLog 4.1-sgml/ChangeLog */*.txt
 %config(noreplace) /etc/sgml/sgml-docbook.cat
 %config(noreplace) /etc/sgml/xml-docbook.cat
-/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+/usr/share/sgml/docbook/*ml-dtd-*-%{version}-%{release}
+%ghost %config(noreplace) /etc/sgml/*ml-docbook-*-%{version}-%{release}.cat
+
 
 %post
+catcmd='/usr/bin/xmlcatalog --noout'
+xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
+
 ## Clean up pre-docbook-dtds mess caused by broken trigger.
 for v in 3.0 3.1 4.0 4.1 4.2
 do
   if [ -f /etc/sgml/sgml-docbook-$v.cat ]
   then
-    /usr/bin/xmlcatalog --sgml --noout --del \
-      /etc/sgml/sgml-docbook-$v.cat \
+    $catcmd --sgml --del /etc/sgml/sgml-docbook-$v.cat \
       /usr/share/sgml/openjade-1.3.1/catalog 2>/dev/null
   fi
 done
 
-##
-## SGML catalog
-##
-
-# Update the centralized catalog corresponding to this version of the DTD
-# DocBook V3.0
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}/catalog
-
-# DocBook V3.1
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}/catalog
-
-# DocBook V4.0
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}/catalog
-
-# DocBook V4.1
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}/catalog
-
-# DocBook XML V4.1.2
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}/catalog
-
-# DocBook V4.2
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}/catalog
-
-# DocBook XML V4.2
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}/catalog
-
-# DocBook V4.3
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}/catalog
-
-# DocBook XML V4.3
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}/catalog
-
-# DocBook V4.4
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}/catalog
-
-# DocBook XML V4.4
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}/catalog
-
-# DocBook V4.5
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}/catalog
-
-# DocBook XML V4.5
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}/catalog
-
-
-# The following lines are for the case in which the style sheets
+# The STYLESHEETS/catalog command is for the case in which the style sheets
 # were installed after another DTD but before this DTD
-STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
-STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-}
-if [ "$STYLESHEETS" != "*" ]; then
-    # DocBook V3.0
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V3.1
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.0
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.1
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.1.2
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.2
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.2
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.3
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.3
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.4
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.4
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-   # DocBook V4.5
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.5
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-fi
+for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done
+case $STYLESHEETS in
+  *-"*") STYLESHEETS= ;;
+esac
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  ## SGML catalog
+  # Update the centralized catalog corresponding to this version of the DTD
+  for cat_dir in /usr/share/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do
+    $catcmd --sgml --add /etc/sgml/$fmt-docbook-$vvr.cat $cat_dir/catalog
+  done
+  ## XML catalog
+  if [ $fmt = xml -a -w $xmlcatalog ]; then
+    while read f desc; do
+      case $ver in 4.[45]) f=${f/-/} ;; esac
+      $catcmd --add public "$desc" $sgmldir/$f $xmlcatalog
+    done <<ENDENT
+      ent/iso-pub.ent	ISO 8879:1986//ENTITIES Publishing//EN
+      ent/iso-grk1.ent	ISO 8879:1986//ENTITIES Greek Letters//EN
+      dbpoolx.mod	-//OASIS//ELEMENTS DocBook XML Information Pool V$ver//EN
+      ent/iso-box.ent	ISO 8879:1986//ENTITIES Box and Line Drawing//EN
+      docbookx.dtd	-//OASIS//DTD DocBook XML V$ver//EN
+      ent/iso-grk3.ent	ISO 8879:1986//ENTITIES Greek Symbols//EN
+      ent/iso-amsn.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN
+      ent/iso-num.ent	ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN
+      dbcentx.mod	-//OASIS//ENTITIES DocBook XML Character Entities V$ver//EN
+      ent/iso-grk4.ent	ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN
+      dbnotnx.mod	-//OASIS//ENTITIES DocBook XML Notations V$ver//EN
+      ent/iso-dia.ent	ISO 8879:1986//ENTITIES Diacritical Marks//EN
+      ent/iso-grk2.ent	ISO 8879:1986//ENTITIES Monotoniko Greek//EN
+      dbgenent.mod	-//OASIS//ENTITIES DocBook XML Additional General Entities V$ver//EN
+      dbhierx.mod	-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$ver//EN
+      ent/iso-amsa.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN
+      ent/iso-amso.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN
+      ent/iso-cyr1.ent	ISO 8879:1986//ENTITIES Russian Cyrillic//EN
+      ent/iso-tech.ent	ISO 8879:1986//ENTITIES General Technical//EN
+      ent/iso-amsc.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN
+      soextblx.dtd	-//OASIS//DTD XML Exchange Table Model 19990315//EN
+      calstblx.dtd	-//OASIS//DTD DocBook XML CALS Table Model V$ver//EN
+      ent/iso-lat1.ent	ISO 8879:1986//ENTITIES Added Latin 1//EN
+      ent/iso-amsb.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN
+      ent/iso-lat2.ent	ISO 8879:1986//ENTITIES Added Latin 2//EN
+      ent/iso-amsr.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN
+      ent/iso-cyr2.ent	ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN
+ENDENT
+    for f in System URI; do
+      $catcmd --add rewrite$f "http://www.oasis-open.org/docbook/xml/$ver" \
+	$sgmldir $xmlcatalog
+    done
+  fi
+done
 
+# Historic versions of this scriptlet contained the following comment:
+# <quote>
 # Fix up SGML super catalog so that there isn't an XML DTD before an
 # SGML one.  We need to do this (*sigh*) because xmlcatalog messes up
 # the order of the lines, and SGML tools don't like to see XML things
 # they aren't expecting.
-CAT_DIR=/usr/share/sgml/docbook/
-CATALOG=/etc/sgml/catalog
-SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n))
-XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n))
-# Do they need switching around?
-if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ]
-then
-  # Switch those two lines around.
-  XML=$((XML - 1))
-  SGML=$((SGML - 1))
-  perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
-    ${CATALOG} > ${CATALOG}.rpmtmp
-  mv -f ${CATALOG}.rpmtmp ${CATALOG}
-fi
-
-##
-## XML catalog
-##
-
-CATALOG=/usr/share/sgml/docbook/xmlcatalog
-
-if [ -w $CATALOG ]
-then
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
-
-   # DocBook XML V4.5
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
-
-fi
+# </quote>
+# But the code that followed just found the first XML DTD and the first
+# SGML DTD, swappinmg these two lines if the XML one preceded.
+# But that only ensures that there is an SGML DTD before all XML ones.
+# No one complained, so either this was enough, or the buggy SGML tools
+# are long dead, or their users do not use bugzilla.
+# Anyway, the following code, introduced in 1.0-46, does better: it ensures
+# that all XML DTDs are after all SGML ones, by moving them to the end.
+sed -ni '
+  /xml-docbook/ H
+  /xml-docbook/ !p
+  $ {
+          g
+          s/^\n//p
+  }
+  ' /etc/sgml/catalog
 
 # Finally, make sure everything in /etc/sgml is readable!
 /bin/chmod a+r /etc/sgml/*
 
-%triggerin -- openjade >= %{?openjadever}
-#openjade catalog registration
-  # DocBook V3.0
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V3.1
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.0
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.1
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.3
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.4
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.5
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.5
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-#openjade registration trigger end
-
-%triggerun -- openjade >= %{?openjadever}
-  [ $2 = 0 ] || exit 0
-  #openjade catalog unregistration
-  # DocBook V3.0
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V3.1
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.0
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.1
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.2
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.3
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.4
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.5
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.5
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-#openjade unregistration trigger end
-
-
 %postun
-##
-## SGML catalog
-##
-
-# Update the centralized catalog corresponding to this version of the DTD
-# DocBook V3.0
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-
-# DocBook V3.1
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-
-# DocBook V4.0
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-
-# DocBook V4.1
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-
-# DocBook XML V4.1.2
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-
-# DocBook V4.2
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-
-# DocBook XML V4.2
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-
-# DocBook V4.3
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-
-# DocBook XML V4.3
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-
-# DocBook V4.4
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-
-# DocBook XML V4.4
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-
-# DocBook V4.5
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-
-# DocBook XML V4.5
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
-
+catcmd='/usr/bin/xmlcatalog --noout'
+xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
+entities="
+ent/iso-pub.ent
+ent/iso-grk1.ent
+dbpoolx.mod
+ent/iso-box.ent
+docbookx.dtd
+ent/iso-grk3.ent
+ent/iso-amsn.ent
+ent/iso-num.ent
+dbcentx.mod
+ent/iso-grk4.ent
+dbnotnx.mod
+ent/iso-dia.ent
+ent/iso-grk2.ent
+dbgenent.mod
+dbhierx.mod
+ent/iso-amsa.ent
+ent/iso-amso.ent
+ent/iso-cyr1.ent
+ent/iso-tech.ent
+ent/iso-amsc.ent
+soextblx.dtd
+calstblx.dtd
+ent/iso-lat1.ent
+ent/iso-amsb.ent
+ent/iso-lat2.ent
+ent/iso-amsr.ent
+ent/iso-cyr2.ent
+"
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  ## SGML catalog
+  # Update the centralized catalog corresponding to this version of the DTD
+  $catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$vvr.cat
+  rm -f /etc/sgml/$fmt-docbook-$vvr.cat
+  ## XML catalog
+  if [ $fmt = xml -a -w $xmlcatalog ]; then
+    for f in $entities; do
+      case $ver in 4.[45]) f=${f/-/} ;; esac
+      $catcmd --del $sgmldir/$f $xmlcatalog
+    done
+    $catcmd --del $sgmldir $xmlcatalog
+  fi
+done
 
-# Fix up SGML super catalog so that there isn't an XML DTD before an
-# SGML one.  We need to do this (*sigh*) because xmlcatalog messes up
-# the order of the lines, and SGML tools don't like to see XML things
-# they aren't expecting.
-CATALOG=/etc/sgml/catalog
-SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n))
-XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n))
-# Do they need switching around?
-if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ]
-then
-  # Switch those two lines around.
-  XML=$((XML - 1))
-  SGML=$((SGML - 1))
-  perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
-    ${CATALOG} > ${CATALOG}.rpmtmp
-  mv -f ${CATALOG}.rpmtmp ${CATALOG}
-fi
+# See the comment attached to this command in the %%post scriptlet.
+sed -ni '
+  /xml-docbook/ H
+  /xml-docbook/ !p
+  $ {
+          g
+          s/^\n//p
+  }
+  ' /etc/sgml/catalog
+
+%triggerin -- openjade >= %{openjadever}
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$vvr.cat \
+    /usr/share/sgml/openjade-%{openjadever}/catalog
+done
 
-##
-## XML catalog
-##
-
-CAT_DIR=/usr/share/sgml/docbook/
-CATALOG=/usr/share/sgml/docbook/xmlcatalog
-
-if [ -w $CATALOG ]
-then
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.5
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
-fi
+%triggerun -- openjade >= %{openjadever}
+[ $2 = 0 ] || exit 0
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$vvr.cat \
+    /usr/share/sgml/openjade-%{openjadever}/catalog
+done
 
 %changelog
+* Wed Apr  8 2009 Stepan Kasal <skasal at redhat.com> - 1.0-46
+- remove perl dependency (#462997)
+- make %%install and the scriptlets more compact
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-45
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hpejakle at fedoraproject.org  Fri Apr 10 09:44:43 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 09:44:43 +0000 (UTC)
Subject: rpms/subdownloader/devel import.log, 1.1, 1.2 subdownloader.spec,
	1.3, 1.4
Message-ID: <20090410094443.DE22270122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22493/devel

Modified Files:
	import.log subdownloader.spec 
Log Message:
fixed buildrequirements, bumped release



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2009 08:13:51 -0000	1.1
+++ import.log	10 Apr 2009 09:44:13 -0000	1.2
@@ -1 +1,2 @@
 subdownloader-2_0_9_3-1_fc10:HEAD:subdownloader-2.0.9.3-1.fc10.src.rpm:1239350631
+subdownloader-2_0_9_3-2_fc10:HEAD:subdownloader-2.0.9.3-2.fc10.src.rpm:1239356600


Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- subdownloader.spec	10 Apr 2009 09:00:46 -0000	1.3
+++ subdownloader.spec	10 Apr 2009 09:44:13 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		subdownloader
 Version:	2.0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Program for download/upload subtitles for videofiles and DVDs
 
 Group:		Applications/Multimedia
@@ -71,5 +71,8 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Fri Apr 10 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-2
+- added desktop-file-utils into BuildRequire
+
 * Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
 - initial version of rpm package



From kasal at fedoraproject.org  Fri Apr 10 09:51:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 10 Apr 2009 09:51:25 +0000 (UTC)
Subject: rpms/docbook-dtds/F-10 docbook-dtd412-entities.patch, NONE,
	1.1 docbook-sgml-systemrewrite.patch, NONE,
	1.1 docbook-dtds-ents.patch, 1.1, 1.2 docbook-dtds.spec, 1.26, 1.27
Message-ID: <20090410095125.F3B2A70122@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/docbook-dtds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23499

Modified Files:
	docbook-dtds-ents.patch docbook-dtds.spec 
Added Files:
	docbook-dtd412-entities.patch docbook-sgml-systemrewrite.patch 
Log Message:
sync with rawhide

docbook-dtd412-entities.patch:

--- NEW FILE docbook-dtd412-entities.patch ---
diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat	2009-02-19 13:49:08.000000000 +0100
+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat	2009-02-19 13:50:59.000000000 +0100
@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
 
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent"
 
   -- End of catalog data for DocBook XML V4.1.2 ............................. --
   -- ...................................................................... --

docbook-sgml-systemrewrite.patch:

--- NEW FILE docbook-sgml-systemrewrite.patch ---
diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat	2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.0-sgml/docbook.cat	2009-02-05 16:48:58.000000000 +0100
@@ -30,6 +30,12 @@
 SGMLDECL "docbook.dcl"
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+       "docbook.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat	2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.1-sgml/docbook.cat	2009-02-05 16:56:51.000000000 +0100
@@ -22,6 +22,12 @@
 SGMLDECL "docbook.dcl"
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+       "docbook.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat	2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.0-sgml/docbook.cat	2009-02-05 16:49:06.000000000 +0100
@@ -22,6 +22,12 @@
 SGMLDECL "docbook.dcl"
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd"
+       "docbook.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
Bin??rn?? soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou r??zn??
diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat	2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.1-sgml/docbook.cat	2009-02-05 16:49:27.000000000 +0100
@@ -22,6 +22,12 @@
 SGMLDECL "docbook.dcl"
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd"
+       "docbook.dtd"
+
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat	2000-08-27 17:19:42.000000000 +0200
+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat	2009-02-05 16:52:16.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
+       "docbookx.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat	2009-02-05 16:44:17.000000000 +0100
+++ docbook-dtds-1.0/4.2-sgml/docbook.cat	2009-02-05 16:50:10.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd"
+       "docbook.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat	2002-07-17 18:14:41.000000000 +0200
+++ docbook-dtds-1.0/4.2-xml/docbook.cat	2009-02-05 16:52:53.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+       "docbookx.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat	2009-02-05 16:44:18.000000000 +0100
+++ docbook-dtds-1.0/4.3-sgml/docbook.cat	2009-02-05 16:50:37.000000000 +0100
@@ -17,6 +17,13 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd"
+       "docbook.dtd"
+
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat	2004-03-31 13:22:18.000000000 +0200
+++ docbook-dtds-1.0/4.3-xml/docbook.cat	2009-02-05 16:53:12.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+       "docbookx.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat	2009-02-05 16:44:18.000000000 +0100
+++ docbook-dtds-1.0/4.4-sgml/docbook.cat	2009-02-05 16:50:57.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
+       "docbook.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat	2005-01-27 14:57:19.000000000 +0100
+++ docbook-dtds-1.0/4.4-xml/docbook.cat	2009-02-05 16:53:30.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+       "docbookx.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat	2006-10-03 15:27:50.000000000 +0200
+++ docbook-dtds-1.0/4.5-sgml/docbook.cat	2009-02-05 16:51:22.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
+       "docbook.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat	2006-10-03 15:26:00.000000000 +0200
+++ docbook-dtds-1.0/4.5-xml/docbook.cat	2009-02-05 16:55:45.000000000 +0100
@@ -17,6 +17,12 @@
   --
 
   -- ...................................................................... --
+  -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+       "docbookx.dtd"
+
+  -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"

docbook-dtds-ents.patch:

Index: docbook-dtds-ents.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/F-10/docbook-dtds-ents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-dtds-ents.patch	13 Dec 2005 13:17:10 -0000	1.1
+++ docbook-dtds-ents.patch	10 Apr 2009 09:51:25 -0000	1.2
@@ -32,3 +32,22 @@
 +--
    -- End of catalog data for DocBook V4.4 ................................. --
    -- ...................................................................... --
+diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat	2009-02-19 13:45:22.000000000 +0100
++++ docbook-dtds-1.0/4.5-sgml/docbook.cat	2009-02-19 13:47:31.000000000 +0100
+@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara
+ 
+   -- ...................................................................... --
+   -- ISO entity sets ...................................................... --
++--
+ 
+ PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+        "iso-dia.gml"
+@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian 
+ PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+        "iso-cyr2.gml"
+ 
++--
++
+   -- End of catalog data for DocBook V4.5 ................................. --
+   -- ...................................................................... --


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/F-10/docbook-dtds.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- docbook-dtds.spec	25 Sep 2008 13:11:57 -0000	1.26
+++ docbook-dtds.spec	10 Apr 2009 09:51:25 -0000	1.27
@@ -1,8 +1,9 @@
 %define openjadever 1.3.2
+%define version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}"
 
 Name: docbook-dtds
 Version: 1.0
-Release: 41%{?dist}
+Release: 46%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -16,11 +17,11 @@
 Obsoletes: docbook-dtd41-sgml <= %{version}-%{release}
 Obsoletes: docbook-dtd412-xml <= %{version}-%{release}
 
-Provides: docbook-dtd-xml = %{version}-%{release} 
+Provides: docbook-dtd-xml = %{version}-%{release}
 Provides: docbook-dtd-sgml = %{version}-%{release}
 Provides: docbook-dtd30-sgml = %{version}-%{release}
 Provides: docbook-dtd31-sgml = %{version}-%{release}
-Provides: docbook-dtd40-sgml = %{version}-%{release} 
+Provides: docbook-dtd40-sgml = %{version}-%{release}
 Provides: docbook-dtd41-sgml = %{version}-%{release}
 Provides: docbook-dtd412-xml = %{version}-%{release}
 Provides: docbook-dtd42-sgml = %{version}-%{release}
@@ -32,7 +33,6 @@
 Provides: docbook-dtd45-sgml = %{version}-%{release}
 Provides: docbook-dtd45-xml = %{version}-%{release}
 
-Requires: grep perl
 Requires(post): libxml2 >= 2.4.8
 Requires(postun): libxml2 >= 2.4.8
 # If upgrading, the old package's postun scriptlet may use install-catalog
@@ -41,8 +41,8 @@
 # later.
 Requires: sgml-common >= 0.6.3-4
 # We provide the directory layout expected by 0.6.3-5 or later of
-# xml-common.  Earlier versions won't understand. Additionally 
-# require xml-common >= 0.6.3-24 to workaround issue with F9 
+# xml-common.  Earlier versions won't understand. Additionally
+# require xml-common >= 0.6.3-24 to workaround issue with F9
 # install+update and empty xmlcatalog
 Requires: xml-common >= 0.6.3-24
 
@@ -69,96 +69,86 @@
 Patch4: docbook-dtd42-sgml-1.0.catalog.patch
 Patch5: docbook-4.2-euro.patch
 Patch6: docbook-dtds-ents.patch
+Patch7: docbook-sgml-systemrewrite.patch
+Patch8: docbook-dtd412-entities.patch
 BuildRequires: unzip
 
 %description
 The DocBook Document Type Definition (DTD) describes the syntax of
 technical documentation texts (articles, books and manual pages).
 This syntax is XML-compliant and is developed by the OASIS consortium.
-This package contains SGML and XML versions of the DocBook DTD. 
+This package contains SGML and XML versions of the DocBook DTD.
 
 
 %prep
 %setup -c -T
+eval mkdir %{version_list}
 # DocBook V3.0
-mkdir 3.0-sgml
 cd 3.0-sgml
 unzip %{SOURCE0}
 patch -b docbook.cat %{PATCH0}
 cd ..
 
 # DocBook V3.1
-mkdir 3.1-sgml
 cd 3.1-sgml
 unzip %{SOURCE1}
 patch -b docbook.cat %{PATCH1}
 cd ..
 
 # DocBook V4.0
-mkdir 4.0-sgml
 cd 4.0-sgml
 unzip %{SOURCE2}
 patch -b docbook.cat %{PATCH2}
 cd ..
 
 # DocBook V4.1
-mkdir 4.1-sgml
 cd 4.1-sgml
 unzip %{SOURCE3}
 patch -b docbook.cat %{PATCH3}
 cd ..
 
 # DocBook XML V4.1.2
-mkdir 4.1.2-xml
 cd 4.1.2-xml
 unzip %{SOURCE4}
 cd ..
 
 # DocBook V4.2
-mkdir 4.2-sgml
 cd 4.2-sgml
 unzip %{SOURCE5}
 patch -b docbook.cat %{PATCH4}
 cd ..
 
 # DocBook XML V4.2
-mkdir 4.2-xml
 cd 4.2-xml
 unzip %{SOURCE6}
 cd ..
 
 # DocBook V4.3
-mkdir 4.3-sgml
 cd 4.3-sgml
 unzip %{SOURCE7}
 cd ..
 
 # DocBook XML V4.3
-mkdir 4.3-xml
 cd 4.3-xml
 unzip %{SOURCE8}
 cd ..
 
 # DocBook V4.4
-mkdir 4.4-sgml
 cd 4.4-sgml
 unzip %{SOURCE9}
 cd ..
 
 # DocBook XML V4.4
-mkdir 4.4-xml
 cd 4.4-xml
 unzip %{SOURCE10}
 cd ..
 
 # DocBook v4.5
-mkdir 4.5-sgml
 cd 4.5-sgml
 unzip %{SOURCE11}
 cd ..
 
 # DocBook XML v4.5
-mkdir 4.5-xml
 cd 4.5-xml
 unzip %{SOURCE12}
 cd ..
@@ -166,9 +156,15 @@
 # Fix &euro; in SGML.
 %patch5 -p1
 
-# Fix ISO entities in 4.3/4.4 SGML
+# Fix ISO entities in 4.3/4.4/4.5 SGML
 %patch6 -p1
 
+# Rewrite SYSTEM to use local catalog instead web ones (#478680)
+%patch7 -p1
+
+# Add XML to the end of public identificators of 4.1.2 XML entities
+%patch8 -p1
+
 # Increase NAMELEN (bug #36058, bug #159382).
 sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
 
@@ -188,158 +184,30 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# DocBook V3.0
-cd 3.0-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook V3.1
-cd 3.1-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook V4.0
-cd 4.0-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook V4.1
-cd 4.1-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.1.2
-cd 4.1.2-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.2
-cd 4.2-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.2
-cd 4.2-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.3
-cd 4.3-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.3
-cd 4.3-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.4
-cd 4.4-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.4
-cd 4.4-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-# DocBook V4.5
-cd 4.5-sgml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
-mkdir -p $DESTDIR
-install *.dcl $DESTDIR
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-cd ..
-
-# DocBook XML V4.5
-cd 4.5-xml
-DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
-mkdir -p $DESTDIR/ent
-install docbook.cat $DESTDIR/catalog
-install *.dtd $DESTDIR
-install *.mod $DESTDIR
-install ent/* $DESTDIR/ent
-cd ..
-
-
 # Symlinks
 mkdir -p $RPM_BUILD_ROOT/etc/sgml
-ln -s sgml-docbook-4.5-%{version}-%{release}.cat \
-  $RPM_BUILD_ROOT/etc/sgml/sgml-docbook.cat
-ln -s xml-docbook-4.5-%{version}-%{release}.cat \
-  $RPM_BUILD_ROOT/etc/sgml/xml-docbook.cat
-
-# Files for %ghost
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+for fmt in sgml xml; do
+  ln -s $fmt-docbook-4.5-%{version}-%{release}.cat \
+     $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat
+done
+
+eval set %{version_list}
+for dir
+do
+  cd $dir
+  fmt=${dir#*-} vvr=${dir%%-*}-%{version}-%{release}
+  DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  case $fmt in
+    sgml)   mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
+    xml)    mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
+  esac
+  install *.dtd *.mod $DESTDIR
+  install docbook.cat $DESTDIR/catalog
+  cd ..
+  # File for %%ghost
+  touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$vvr.cat
+done
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -349,1244 +217,216 @@
 %defattr (0644,root,root,0755)
 #in upstream tarballs there is a lot of files with 0755 permissions
 #but they don't need to be, 0644 is enough for every file in tarball
-%doc --parents 3.1-sgml/ChangeLog
-%doc --parents 4.1-sgml/ChangeLog
-%doc --parents */*.txt
+%doc --parents 3.1-sgml/ChangeLog 4.1-sgml/ChangeLog */*.txt
 %config(noreplace) /etc/sgml/sgml-docbook.cat
 %config(noreplace) /etc/sgml/xml-docbook.cat
-/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}
-/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
-/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-%ghost %config(noreplace) /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+/usr/share/sgml/docbook/*ml-dtd-*-%{version}-%{release}
+%ghost %config(noreplace) /etc/sgml/*ml-docbook-*-%{version}-%{release}.cat
+
 
 %post
+catcmd='/usr/bin/xmlcatalog --noout'
+xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
+
 ## Clean up pre-docbook-dtds mess caused by broken trigger.
 for v in 3.0 3.1 4.0 4.1 4.2
 do
   if [ -f /etc/sgml/sgml-docbook-$v.cat ]
   then
-    /usr/bin/xmlcatalog --sgml --noout --del \
-      /etc/sgml/sgml-docbook-$v.cat \
+    $catcmd --sgml --del /etc/sgml/sgml-docbook-$v.cat \
       /usr/share/sgml/openjade-1.3.1/catalog 2>/dev/null
   fi
 done
 
-##
-## SGML catalog
-##
-
-# Update the centralized catalog corresponding to this version of the DTD
-# DocBook V3.0
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}/catalog
-
-# DocBook V3.1
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}/catalog
-
-# DocBook V4.0
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}/catalog
-
-# DocBook V4.1
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}/catalog
-
-# DocBook XML V4.1.2
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}/catalog
-
-# DocBook V4.2
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}/catalog
-
-# DocBook XML V4.2
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}/catalog
-
-# DocBook V4.3
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}/catalog
-
-# DocBook XML V4.3
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}/catalog
-
-# DocBook V4.4
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}/catalog
-
-# DocBook XML V4.4
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}/catalog
-
-# DocBook V4.5
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}/catalog
-
-# DocBook XML V4.5
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-/usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}/catalog
-
-
-# The following lines are for the case in which the style sheets
+# The STYLESHEETS/catalog command is for the case in which the style sheets
 # were installed after another DTD but before this DTD
-STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
-STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-}
-if [ "$STYLESHEETS" != "*" ]; then
-    # DocBook V3.0
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V3.1
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.0
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.1
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.1.2
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.2
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.2
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.3
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.3
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook V4.4
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.4
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-   # DocBook V4.5
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-    # DocBook XML V4.5
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
-
-fi
+for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done
+case $STYLESHEETS in
+  *-"*") STYLESHEETS= ;;
+esac
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  ## SGML catalog
+  # Update the centralized catalog corresponding to this version of the DTD
+  for cat_dir in /usr/share/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do
+    $catcmd --sgml --add /etc/sgml/$fmt-docbook-$vvr.cat $cat_dir/catalog
+  done
+  ## XML catalog
+  if [ $fmt = xml -a -w $xmlcatalog ]; then
+    while read f desc; do
+      case $ver in 4.[45]) f=${f/-/} ;; esac
+      $catcmd --add public "$desc" $sgmldir/$f $xmlcatalog
+    done <<ENDENT
+      ent/iso-pub.ent	ISO 8879:1986//ENTITIES Publishing//EN
+      ent/iso-grk1.ent	ISO 8879:1986//ENTITIES Greek Letters//EN
+      dbpoolx.mod	-//OASIS//ELEMENTS DocBook XML Information Pool V$ver//EN
+      ent/iso-box.ent	ISO 8879:1986//ENTITIES Box and Line Drawing//EN
+      docbookx.dtd	-//OASIS//DTD DocBook XML V$ver//EN
+      ent/iso-grk3.ent	ISO 8879:1986//ENTITIES Greek Symbols//EN
+      ent/iso-amsn.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN
+      ent/iso-num.ent	ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN
+      dbcentx.mod	-//OASIS//ENTITIES DocBook XML Character Entities V$ver//EN
+      ent/iso-grk4.ent	ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN
+      dbnotnx.mod	-//OASIS//ENTITIES DocBook XML Notations V$ver//EN
+      ent/iso-dia.ent	ISO 8879:1986//ENTITIES Diacritical Marks//EN
+      ent/iso-grk2.ent	ISO 8879:1986//ENTITIES Monotoniko Greek//EN
+      dbgenent.mod	-//OASIS//ENTITIES DocBook XML Additional General Entities V$ver//EN
+      dbhierx.mod	-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$ver//EN
+      ent/iso-amsa.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN
+      ent/iso-amso.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN
+      ent/iso-cyr1.ent	ISO 8879:1986//ENTITIES Russian Cyrillic//EN
+      ent/iso-tech.ent	ISO 8879:1986//ENTITIES General Technical//EN
+      ent/iso-amsc.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN
+      soextblx.dtd	-//OASIS//DTD XML Exchange Table Model 19990315//EN
+      calstblx.dtd	-//OASIS//DTD DocBook XML CALS Table Model V$ver//EN
+      ent/iso-lat1.ent	ISO 8879:1986//ENTITIES Added Latin 1//EN
+      ent/iso-amsb.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN
+      ent/iso-lat2.ent	ISO 8879:1986//ENTITIES Added Latin 2//EN
+      ent/iso-amsr.ent	ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN
+      ent/iso-cyr2.ent	ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN
+ENDENT
+    for f in System URI; do
+      $catcmd --add rewrite$f "http://www.oasis-open.org/docbook/xml/$ver" \
+	$sgmldir $xmlcatalog
+    done
+  fi
+done
 
+# Historic versions of this scriptlet contained the following comment:
+# <quote>
 # Fix up SGML super catalog so that there isn't an XML DTD before an
 # SGML one.  We need to do this (*sigh*) because xmlcatalog messes up
 # the order of the lines, and SGML tools don't like to see XML things
 # they aren't expecting.
-CAT_DIR=/usr/share/sgml/docbook/
-CATALOG=/etc/sgml/catalog
-SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n))
-XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n))
-# Do they need switching around?
-if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ]
-then
-  # Switch those two lines around.
-  XML=$((XML - 1))
-  SGML=$((SGML - 1))
-  perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
-    ${CATALOG} > ${CATALOG}.rpmtmp
-  mv -f ${CATALOG}.rpmtmp ${CATALOG}
-fi
-
-##
-## XML catalog
-##
-
-CATALOG=/usr/share/sgml/docbook/xmlcatalog
-
-if [ -w $CATALOG ]
-then
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
-
-   # DocBook XML V4.5
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "public" \
-    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
-  /usr/bin/xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
-
-fi
+# </quote>
+# But the code that followed just found the first XML DTD and the first
+# SGML DTD, swappinmg these two lines if the XML one preceded.
+# But that only ensures that there is an SGML DTD before all XML ones.
+# No one complained, so either this was enough, or the buggy SGML tools
+# are long dead, or their users do not use bugzilla.
+# Anyway, the following code, introduced in 1.0-46, does better: it ensures
+# that all XML DTDs are after all SGML ones, by moving them to the end.
+sed -ni '
+  /xml-docbook/ H
+  /xml-docbook/ !p
+  $ {
+          g
+          s/^\n//p
+  }
+  ' /etc/sgml/catalog
 
 # Finally, make sure everything in /etc/sgml is readable!
 /bin/chmod a+r /etc/sgml/*
 
-%triggerin -- openjade >= %{?openjadever}
-#openjade catalog registration
-  # DocBook V3.0
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V3.1
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.0
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
- 
-  # DocBook V4.1
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.3
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.4
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
- 
-  # DocBook V4.5
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.5
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-#openjade registration trigger end
-
-%triggerun -- openjade >= %{?openjadever}
-  [ $2 = 0 ] || exit 0
-  #openjade catalog unregistration
-  # DocBook V3.0
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V3.1
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.0
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
- 
-  # DocBook V4.1
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.2
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.3
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook V4.4
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
- 
-  # DocBook V4.5
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
-  # DocBook XML V4.5
-  /usr/bin/xmlcatalog --sgml --noout --del \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-#openjade unregistration trigger end
-
- 
 %postun
-##
-## SGML catalog
-##
-
-# Update the centralized catalog corresponding to this version of the DTD
-# DocBook V3.0
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
-
-# DocBook V3.1
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
-
-# DocBook V4.0
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
-
-# DocBook V4.1
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
-
-# DocBook XML V4.1.2
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
-
-# DocBook V4.2
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
-
-# DocBook XML V4.2
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
-
-# DocBook V4.3
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
-
-# DocBook XML V4.3
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
-
-# DocBook V4.4
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
-
-# DocBook XML V4.4
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-
-# DocBook V4.5
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-rm -f /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
-
-# DocBook XML V4.5
-/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
-  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
-rm -f /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
-
+catcmd='/usr/bin/xmlcatalog --noout'
+xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
+entities="
+ent/iso-pub.ent
+ent/iso-grk1.ent
+dbpoolx.mod
+ent/iso-box.ent
+docbookx.dtd
+ent/iso-grk3.ent
+ent/iso-amsn.ent
+ent/iso-num.ent
+dbcentx.mod
+ent/iso-grk4.ent
+dbnotnx.mod
+ent/iso-dia.ent
+ent/iso-grk2.ent
+dbgenent.mod
+dbhierx.mod
+ent/iso-amsa.ent
+ent/iso-amso.ent
+ent/iso-cyr1.ent
+ent/iso-tech.ent
+ent/iso-amsc.ent
+soextblx.dtd
+calstblx.dtd
+ent/iso-lat1.ent
+ent/iso-amsb.ent
+ent/iso-lat2.ent
+ent/iso-amsr.ent
+ent/iso-cyr2.ent
+"
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  ## SGML catalog
+  # Update the centralized catalog corresponding to this version of the DTD
+  $catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$vvr.cat
+  rm -f /etc/sgml/$fmt-docbook-$vvr.cat
+  ## XML catalog
+  if [ $fmt = xml -a -w $xmlcatalog ]; then
+    for f in $entities; do
+      case $ver in 4.[45]) f=${f/-/} ;; esac
+      $catcmd --del $sgmldir/$f $xmlcatalog
+    done
+    $catcmd --del $sgmldir $xmlcatalog
+  fi
+done
 
-# Fix up SGML super catalog so that there isn't an XML DTD before an
-# SGML one.  We need to do this (*sigh*) because xmlcatalog messes up
-# the order of the lines, and SGML tools don't like to see XML things
-# they aren't expecting.
-CATALOG=/etc/sgml/catalog
-SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n))
-XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n))
-# Do they need switching around?
-if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ]
-then
-  # Switch those two lines around.
-  XML=$((XML - 1))
-  SGML=$((SGML - 1))
-  perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
-    ${CATALOG} > ${CATALOG}.rpmtmp
-  mv -f ${CATALOG}.rpmtmp ${CATALOG}
-fi
+# See the comment attached to this command in the %%post scriptlet.
+sed -ni '
+  /xml-docbook/ H
+  /xml-docbook/ !p
+  $ {
+          g
+          s/^\n//p
+  }
+  ' /etc/sgml/catalog
+
+%triggerin -- openjade >= %{openjadever}
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$vvr.cat \
+    /usr/share/sgml/openjade-%{openjadever}/catalog
+done
 
-##
-## XML catalog
-##
-
-CAT_DIR=/usr/share/sgml/docbook/
-CATALOG=/usr/share/sgml/docbook/xmlcatalog
-
-if [ -w $CATALOG ]
-then
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
-
-  # DocBook XML V4.5
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isopub.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isobox.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk3.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsn.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isonum.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk4.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isodia.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isogrk2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsa.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamso.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isotech.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsc.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat1.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsb.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isolat2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isoamsr.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/isocyr2.ent" $CATALOG
-  /usr/bin/xmlcatalog --noout --del \
-    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
-fi
+%triggerun -- openjade >= %{openjadever}
+[ $2 = 0 ] || exit 0
+eval set %{version_list}
+for dir
+do
+  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
+  /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$vvr.cat \
+    /usr/share/sgml/openjade-%{openjadever}/catalog
+done
 
 %changelog
+* Wed Apr  8 2009 Stepan Kasal <skasal at redhat.com> - 1.0-46
+- remove perl dependency (#462997)
+- make %%install and the scriptlets more compact
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 19 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0.44
+- fix ISO entities for 4.5 SGML, use XML at the end of
+  public identificators of XML 4.1.2 ISO entities
+
+* Thu Feb 19 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0-43
+- register sgml catalogs before xml catalogs in openjade
+  (#486257)
+
+* Thu Feb 05 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0-42
+- Use SYSTEM rewrite for web URL's in sgml catalogs to
+  prevent reading from the network(#478680)
+
 * Fri Sep 26 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-41
-- Removed openjade requirement - registration reworked to 
+- Removed openjade requirement - registration reworked to
   triggers(#234345)
 
 * Wed Sep 24 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-40
-- Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 
+- Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5
   iso entities(#461206)
 - /ent/iso-cyr1.ent now correctly registered in xml catalog
   (there was /ent/iso-cyrl.ent typo)
@@ -1594,18 +434,18 @@
   (missing CAT_DIR variable)
 
 * Fri Aug 29 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-39
-- rebuild with F9 spec file to fix some heavy-weight black 
-  magic causing failures of sgml documents 
+- rebuild with F9 spec file to fix some heavy-weight black
+  magic causing failures of sgml documents
 
 * Fri Jul 11 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-38
-- fixed typo in post scriptlet(causing mishandling of DocBook 
+- fixed typo in post scriptlet(causing mishandling of DocBook
   4.4 and 4.5 DTDs,#453513)
 
 * Wed Jul 09 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-37
 - use full paths in xmlcatalog registration
 
 * Tue May 13 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-36
-- changed License(#445008) 
+- changed License(#445008)
 
 * Mon Nov 26 2007 Ondrej Vasik <ovasik at redhat.com> - 1.0-35
 - fixed bug causing typo in spec file(#397651)



From hpejakle at fedoraproject.org  Fri Apr 10 09:59:04 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 09:59:04 +0000 (UTC)
Subject: rpms/subdownloader/devel import.log, 1.2, 1.3 subdownloader.spec,
	1.4, 1.5
Message-ID: <20090410095904.D5A8170122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24762/devel

Modified Files:
	import.log subdownloader.spec 
Log Message:
decreased release number



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Apr 2009 09:44:13 -0000	1.2
+++ import.log	10 Apr 2009 09:58:33 -0000	1.3
@@ -1,2 +1,3 @@
 subdownloader-2_0_9_3-1_fc10:HEAD:subdownloader-2.0.9.3-1.fc10.src.rpm:1239350631
 subdownloader-2_0_9_3-2_fc10:HEAD:subdownloader-2.0.9.3-2.fc10.src.rpm:1239356600
+subdownloader-2_0_9_3-1_fc10:HEAD:subdownloader-2.0.9.3-1.fc10.src.rpm:1239357392


Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- subdownloader.spec	10 Apr 2009 09:44:13 -0000	1.4
+++ subdownloader.spec	10 Apr 2009 09:58:33 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		subdownloader
 Version:	2.0.9.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Program for download/upload subtitles for videofiles and DVDs
 
 Group:		Applications/Multimedia
@@ -71,8 +71,5 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
-* Fri Apr 10 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-2
-- added desktop-file-utils into BuildRequire
-
 * Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
 - initial version of rpm package



From rvokal at fedoraproject.org  Fri Apr 10 10:01:17 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 10 Apr 2009 10:01:17 +0000 (UTC)
Subject: rpms/wireshark/F-10 .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 wireshark.spec, 1.46, 1.47
Message-ID: <20090410100117.4E94070122@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25756

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	17 Feb 2009 09:25:44 -0000	1.24
+++ .cvsignore	10 Apr 2009 10:01:15 -0000	1.25
@@ -1 +1 @@
-wireshark-1.0.6.tar.bz2
+wireshark-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	17 Feb 2009 09:25:44 -0000	1.24
+++ sources	10 Apr 2009 10:01:16 -0000	1.25
@@ -1 +1 @@
-f97041ec73e72fc36e39be2588045578  wireshark-1.0.6.tar.bz2
+34807e6f21a0118d9f1961c5c5f59d66  wireshark-1.0.7.tar.bz2


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-10/wireshark.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wireshark.spec	17 Feb 2009 09:25:44 -0000	1.46
+++ wireshark.spec	10 Apr 2009 10:01:16 -0000	1.47
@@ -5,7 +5,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.6
+Version:	1.0.7
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -214,6 +214,11 @@
 
 
 %changelog
+* Fri Apr 10 2009 Radek Vokal <rvokal at redhat.com> 1.0.7-1
+- upgrade to 1.0.7
+- Several security vulnerabilities have been fixed
+ (Profinet, CPHAP and LDAP dissectors could crash)                                                                                                                                                                                                 
+
 * Tue Feb 17 2009 Radek Vokal <rvokal at redhat.com> 1.0.6-1
 - add netdump2 support
 - fix SELinux issues, remove pie patch



From lkundrak at fedoraproject.org  Fri Apr 10 10:10:22 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 10 Apr 2009 10:10:22 +0000 (UTC)
Subject: rpms/corrida/devel corrida-0.96-11-count.patch, NONE,
	1.1 corrida.spec, 1.3, 1.4
Message-ID: <20090410101022.08CBF70122@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/corrida/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27209

Modified Files:
	corrida.spec 
Added Files:
	corrida-0.96-11-count.patch 
Log Message:
* Fri Apr 10 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.96.11-4
- Automatically increment the meteor number (#494526)


corrida-0.96-11-count.patch:

--- NEW FILE corrida-0.96-11-count.patch ---
Automatically increase meteor number.
https://bugzilla.redhat.com/show_bug.cgi?id=494526

Lubomir Rintel <lkundrak at v3.sk>

diff -urp corrida-0.96-11/corrida/gui_callbacks.c corrida-0.96-11.count/corrida/gui_callbacks.c
--- corrida-0.96-11/corrida/gui_callbacks.c	2007-06-04 21:27:21.000000000 +0200
+++ corrida-0.96-11.count/corrida/gui_callbacks.c	2009-04-10 12:02:32.000000000 +0200
@@ -834,6 +834,12 @@ gint charts_accept_button_pressed_cb( Gt
       corrida_error_box (GTK_WINDOW (charts_window), "Please check the meteor number you entered. More info on statusbar");
     } else {
       current_meteor.met_no = atoi (entry_text);
+
+      /* increment the meteor number */
+      snprintf (entry_text, sizeof(entry_text), "%i", current_meteor.met_no + 1);
+      entry_text[10] = '\0';
+      gtk_entry_set_text (GTK_ENTRY (num_pad_entry), entry_text);
+
       add_charts_meteor_record (current_meteor);
       refresh_chart ();
       
diff -urp corrida-0.96-11/corrida/gui_charts.c corrida-0.96-11.count/corrida/gui_charts.c
--- corrida-0.96-11/corrida/gui_charts.c	2007-06-04 21:27:21.000000000 +0200
+++ corrida-0.96-11.count/corrida/gui_charts.c	2009-04-10 12:03:52.000000000 +0200
@@ -397,6 +397,7 @@ GtkWidget *create_charts_tools_num_pad( 
 							     */
   gtk_table_attach_defaults (GTK_TABLE (num_pad), num_pad_entry,
 			     1, 3, 0, 1);
+  gtk_entry_set_text (GTK_ENTRY (num_pad_entry), "1");
   gtk_widget_show (num_pad_entry); 
   
   /* '0' button */
@@ -1084,10 +1085,6 @@ void charts_clear_entries( void )
     }
   }
 
-  /* clear meteor number entry */
-  if (num_pad_entry != NULL)
-    gtk_entry_set_text (GTK_ENTRY (num_pad_entry), "\0");
-
   /* clear current meteor data */
   current_meteor.met_no = -1;
   current_meteor.map_no = -1;


Index: corrida.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corrida/devel/corrida.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- corrida.spec	24 Mar 2009 17:09:34 -0000	1.3
+++ corrida.spec	10 Apr 2009 10:09:51 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           corrida
 Version:        %{version_major}.%{version_minor}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Application for archivation of meteor observations
 
 Group:          Amusements/Graphics
@@ -11,6 +11,7 @@
 URL:            http://corrida.pkim.org/
 Source0:        http://corrida.pkim.org/releases/corrida-%{version_major}-%{version_minor}.tar.gz
 Source1:        corrida.desktop
+Patch0:         corrida-0.96-11-count.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q -n corrida-%{version_major}-%{version_minor}
+%patch0 -p1 -b .count
 
 
 %build
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.96.11-4
+- Automatically increment the meteor number (#494526)
+
 * Tue Mar 24 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.96.11-3
 - Fix the menu categories
 



From rvokal at fedoraproject.org  Fri Apr 10 10:25:45 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 10 Apr 2009 10:25:45 +0000 (UTC)
Subject: rpms/wireshark/F-9 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 wireshark.spec, 1.39, 1.40
Message-ID: <20090410102545.EBBCA70122@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30501

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Feb 2009 15:23:49 -0000	1.22
+++ .cvsignore	10 Apr 2009 10:25:15 -0000	1.23
@@ -1 +1 @@
-wireshark-1.0.6.tar.bz2
+wireshark-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Feb 2009 15:23:49 -0000	1.22
+++ sources	10 Apr 2009 10:25:15 -0000	1.23
@@ -1 +1 @@
-f97041ec73e72fc36e39be2588045578  wireshark-1.0.6.tar.bz2
+34807e6f21a0118d9f1961c5c5f59d66  wireshark-1.0.7.tar.bz2


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-9/wireshark.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wireshark.spec	17 Feb 2009 15:23:49 -0000	1.39
+++ wireshark.spec	10 Apr 2009 10:25:15 -0000	1.40
@@ -5,7 +5,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.6
+Version:	1.0.7
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -201,6 +201,11 @@
 
 
 %changelog
+* Fri Apr 10 2009 Radek Vokal <rvokal at redhat.com> 1.0.7-1
+- upgrade to 1.0.7
+- Several security vulnerabilities have been fixed
+ (Profinet, CPHAP and LDAP dissectors could crash)  
+
 * Tue Feb 17 2009 Radek Vokal <rvokal at redhat.com> 1.0.6-1
 - upgrade to 1.0.6
 



From ruben at fedoraproject.org  Fri Apr 10 10:32:03 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 10 Apr 2009 10:32:03 +0000 (UTC)
Subject: rpms/debmirror/F-11 debmirror.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410103203.9C51B70122@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31935/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	debmirror.spec import.log 
Log Message:
Initial import


--- NEW FILE debmirror.spec ---
Name:		debmirror
Version:	20070123
Release:	8%{?dist}
Summary:	Debian partial mirror script, with ftp and package pool support

Group:		Applications/Internet
License:	GPL+
URL:		http://packages.qa.debian.org/d/%{name}.html
Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	patch, ed, gnupg, rsync, coreutils, findutils, gzip, bzip2

%description
This program downloads and maintains a partial local Debian mirror.
It can mirror any combination of architectures, distributions and
sections. Files are transferred by ftp, http, hftp or rsync, and package
pools are fully supported. It also does locking and updates trace files.


%prep
%setup -q

# filter file dependency on debmirror.conf
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/\/etc\/debmirror.conf/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build

%install
rm -rf %{buildroot}

%{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf

# generate a man page
%{__install} -d %{buildroot}%{_mandir}/man1
pod2man %{name} %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
%{_mandir}/man1/%{name}.1.gz
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf


%changelog
* Thu Apr 09 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-8
- Use GPL+ as license
- Use main debian url for Source

* Wed Apr 08 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-7
- Change url to a page with more content
- Use %%{name} macro

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-6
- Generate a man page from the source
- Add explicit Requires on system commands used

* Tue Apr 07 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 20070123-5
- Package cleanup for review

* Sat Nov  1 2008 Javier palacios <javiplx at gmail.com>
- 20070123-2
- Added suggestions from the review process

* Sat Oct 11 2008 Javier palacios <javiplx at gmail.com>
- 20070123-1
- First release



--- NEW FILE import.log ---
debmirror-20070123-8_fc11:F-11:debmirror-20070123-8.fc11.src.rpm:1239359476


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:06:52 -0000	1.1
+++ .cvsignore	10 Apr 2009 10:31:32 -0000	1.2
@@ -0,0 +1 @@
+debmirror_20070123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:06:52 -0000	1.1
+++ sources	10 Apr 2009 10:31:33 -0000	1.2
@@ -0,0 +1 @@
+e89d7b8aae00fbf0743b2cd6bc99d746  debmirror_20070123.tar.gz



From hpejakle at fedoraproject.org  Fri Apr 10 10:41:10 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Fri, 10 Apr 2009 10:41:10 +0000 (UTC)
Subject: rpms/subdownloader/devel subdownloader.spec,1.5,1.6
Message-ID: <20090410104110.5D46570122@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv881

Modified Files:
	subdownloader.spec 
Log Message:
fixed BuildRequires



Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- subdownloader.spec	10 Apr 2009 09:58:33 -0000	1.5
+++ subdownloader.spec	10 Apr 2009 10:40:39 -0000	1.6
@@ -71,5 +71,8 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Fri Apr 10 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-2
+- added desktop-file-utils into BuildRequires
+
 * Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
 - initial version of rpm package



From jreznik at fedoraproject.org  Fri Apr 10 10:42:17 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri, 10 Apr 2009 10:42:17 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.6,
	1.7 kde-plasma-runcommand.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090410104217.BFE9370122@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1143

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
- update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Jan 2009 12:40:25 -0000	1.6
+++ .cvsignore	10 Apr 2009 10:41:47 -0000	1.7
@@ -1 +1 @@
-91495-runcommand_1.0.tar.bz2
+91495-runcommand-1.1.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde-plasma-runcommand.spec	25 Feb 2009 10:31:34 -0000	1.7
+++ kde-plasma-runcommand.spec	10 Apr 2009 10:41:47 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           kde-plasma-runcommand
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
-Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
+Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -qn runcommand_%{version}
+%setup -qn runcommand-%{version}
 
 
 %build
@@ -35,18 +35,22 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f plasma_applet_runcommand.lang
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
+- update to 1.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Jan 2009 12:40:25 -0000	1.6
+++ sources	10 Apr 2009 10:41:47 -0000	1.7
@@ -1 +1 @@
-2b84999f79af020156ee586cc08310df  91495-runcommand_1.0.tar.bz2
+060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2



From jreznik at fedoraproject.org  Fri Apr 10 10:49:51 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri, 10 Apr 2009 10:49:51 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.4,
	1.5 kde-plasma-runcommand.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090410104951.4411670122@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3177

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
 Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
- update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2009 12:29:12 -0000	1.4
+++ .cvsignore	10 Apr 2009 10:49:20 -0000	1.5
@@ -1 +1 @@
-91495-runcommand_0.9.tar.bz2
+91495-runcommand-1.1.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-runcommand.spec	28 Jan 2009 15:57:48 -0000	1.4
+++ kde-plasma-runcommand.spec	10 Apr 2009 10:49:20 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -7,7 +7,7 @@
 License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
-Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
+Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -qn runcommand_%{version}
+%setup -qn runcommand-%{version}
 
 
 %build
@@ -35,18 +35,22 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f plasma_applet_runcommand.lang
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
+- update to 1.1
+
 * Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
 - update to 1.0, cmake related changes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2009 15:57:48 -0000	1.5
+++ sources	10 Apr 2009 10:49:20 -0000	1.6
@@ -1 +1 @@
-2b84999f79af020156ee586cc08310df  91495-runcommand_1.0.tar.bz2
+060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2



From jreznik at fedoraproject.org  Fri Apr 10 10:53:29 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri, 10 Apr 2009 10:53:29 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel kde-plasma-runcommand.spec, 1.8,
	1.9
Message-ID: <20090410105329.EA98F70122@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3739

Modified Files:
	kde-plasma-runcommand.spec 
Log Message:
* Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
- adds missing gettext BR



Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kde-plasma-runcommand.spec	10 Apr 2009 10:41:47 -0000	1.8
+++ kde-plasma-runcommand.spec	10 Apr 2009 10:52:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -48,6 +49,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
+- adds missing gettext BR
+
 * Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
 - update to 1.1
 



From jreznik at fedoraproject.org  Fri Apr 10 11:04:08 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri, 10 Apr 2009 11:04:08 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 kde-plasma-runcommand.spec,1.5,1.6
Message-ID: <20090410110409.9F56A70122@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6626

Modified Files:
	kde-plasma-runcommand.spec 
Log Message:
* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
- adds missing gettext BR



Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-plasma-runcommand.spec	10 Apr 2009 10:49:20 -0000	1.5
+++ kde-plasma-runcommand.spec	10 Apr 2009 11:03:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -48,6 +49,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
+- adds missing gettext BR
+
 * Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
 - update to 1.1
 



From jreznik at fedoraproject.org  Fri Apr 10 11:05:43 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri, 10 Apr 2009 11:05:43 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-9 .cvsignore, 1.4,
	1.5 kde-plasma-runcommand.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090410110543.4977C70122@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7081

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
- adds missing gettext BR

* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
- update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2009 11:40:59 -0000	1.4
+++ .cvsignore	10 Apr 2009 11:05:40 -0000	1.5
@@ -1 +1 @@
-91495-runcommand_0.9.tar.bz2
+91495-runcommand-1.1.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/kde-plasma-runcommand.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-plasma-runcommand.spec	29 Jan 2009 23:07:16 -0000	1.5
+++ kde-plasma-runcommand.spec	10 Apr 2009 11:05:41 -0000	1.6
@@ -1,17 +1,18 @@
 Name:           kde-plasma-runcommand
-Version:        1.0
-Release:        1%{?dist}
+Version:        1.1
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
-Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
+Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -19,7 +20,7 @@
 
 
 %prep
-%setup -qn runcommand_%{version}
+%setup -qn runcommand-%{version}
 
 
 %build
@@ -35,18 +36,25 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f plasma_applet_runcommand.lang
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
+- adds missing gettext BR
+
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-1
+- update to 1.1
+
 * Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
 - update to 1.0, cmake related changes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jan 2009 23:07:16 -0000	1.5
+++ sources	10 Apr 2009 11:05:41 -0000	1.6
@@ -1 +1 @@
-2b84999f79af020156ee586cc08310df  91495-runcommand_1.0.tar.bz2
+060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2



From pbrobinson at fedoraproject.org  Fri Apr 10 11:23:44 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 10 Apr 2009 11:23:44 +0000 (UTC)
Subject: rpms/geoclue/devel geoclue.spec,1.13,1.14
Message-ID: <20090410112345.05DF570122@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13208

Modified Files:
	geoclue.spec 
Log Message:
- Fix install of test gui


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geoclue.spec	29 Mar 2009 00:17:05 -0000	1.13
+++ geoclue.spec	10 Apr 2009 11:23:13 -0000	1.14
@@ -9,7 +9,7 @@
 
 Name:           geoclue
 Version:        0.11.1.1
-Release:        0.2.%{snapshot}%{?dist}
+Release:        0.3.%{snapshot}%{?dist}
 Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
@@ -51,6 +51,15 @@
 %description devel
 Files for development with geoclue.
 
+%package gui
+Summary: Testing gui for geoclue
+Group: Development/Libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gui
+Testing gui for geoclue
+
 %package gpsd
 Summary: gpsd provider for geoclue
 Group: Development/Libraries
@@ -81,6 +90,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libgeoclue.la
+# Install the test gui as it seems the test isn't installed any more
+mkdir $RPM_BUILD_ROOT%{_bindir}
+cp test/geoclue-test-gui $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,6 +137,10 @@
 %{_libdir}/pkgconfig/geoclue.pc
 %{_libdir}/libgeoclue.so
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/geoclue-test-gui
+
 %files gpsd
 %defattr(-,root,root,-)
 %{_libexecdir}/geoclue-gpsd
@@ -138,6 +154,9 @@
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 %changelog
+* Thu Apr 09 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.3
+- Fix install of test gui
+
 * Sun Mar 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.11.1.1-0.2
 - Rebuild for new gpsd
 



From dnovotny at fedoraproject.org  Fri Apr 10 11:37:52 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Fri, 10 Apr 2009 11:37:52 +0000 (UTC)
Subject: rpms/emacs/devel default.el,1.7,1.8 emacs.spec,1.122,1.123
Message-ID: <20090410113752.2CE9870122@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23647

Modified Files:
	default.el emacs.spec 
Log Message:

fix bz#443549



Index: default.el
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/default.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.el	23 Jan 2007 21:40:31 -0000	1.7
+++ default.el	10 Apr 2009 11:37:19 -0000	1.8
@@ -3,3 +3,6 @@
 ;;; Setting `inhibit-default-init' non-nil in "~/.emacs"
 ;;; prevents loading of this file.  Also the "-q" option to emacs
 ;;; prevents both "~/.emacs" and this file from being loaded at startup.
+
+; bz#443549
+(setq ispell-program-name "hunspell")


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- emacs.spec	27 Mar 2009 14:21:00 -0000	1.122
+++ emacs.spec	10 Apr 2009 11:37:19 -0000	1.123
@@ -4,7 +4,7 @@
 Name: emacs
 Epoch: 1
 Version: 22.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -40,6 +40,7 @@
 Requires: xorg-x11-fonts-ISO8859-1-100dpi
 Requires: emacs-common = %{epoch}:%{version}-%{release}
 Requires: hicolor-icon-theme
+Requires: hunspell
 # Desktop integration
 BuildRequires: desktop-file-utils
 Requires:      desktop-file-utils
@@ -363,6 +364,9 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Fri Apr 10 2009 Daniel Novotny <dnovotny at redhat.com> 1:22.3-11
+- fix bz#443549 -  spell-buffer, flyspell-mode do not work
+
 * Fri Mar 27 2009 Daniel Novotny <dnovotny at redhat.com> 1:22.3-10
 - fix segfaults when emacsclient connects to a tcp emacs server (#489066)
 



From tbzatek at fedoraproject.org  Fri Apr 10 12:07:07 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 10 Apr 2009 12:07:07 +0000 (UTC)
Subject: rpms/tuxcmd/devel tuxcmd-0.6.62-lib64.patch, NONE, 1.1 tuxcmd.spec, 
	1.14, 1.15
Message-ID: <20090410120708.0490370122@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11041

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-0.6.62-lib64.patch 
Log Message:
* Fri Apr 10 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.2
- Fix vfs modules detection on 64bit archs
- Remove unnecessary Requires (#473992)


tuxcmd-0.6.62-lib64.patch:

--- NEW FILE tuxcmd-0.6.62-lib64.patch ---
>From 3c11c85e19dcfe73c7d6ed6e8eb4d5f3a48e89e2 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 10 Apr 2009 11:46:36 +0200
Subject: [PATCH] Silly workaround for searching plugins in lib64 paths

---
 vfs/UVFSCore.pas |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas
index 6cd1114..aaa3b49 100644
--- a/vfs/UVFSCore.pas
+++ b/vfs/UVFSCore.pas
@@ -170,6 +170,9 @@ const ConstGlobalModulePath1 = '/usr/lib/tuxcmd';
       ConstLocalModulePath1 = '~/.tuxcmd/plugins';
       ConstLocalModulePath2 = './plugins';
       ConstLocalModulePath3 = '../lib/tuxcmd';
+      ConstGlobalModulePath3 = '/usr/lib64/tuxcmd';
+      ConstGlobalModulePath4 = '/usr/local/lib64/tuxcmd';
+      ConstLocalModulePath4 = '../lib64/tuxcmd';
 
       ConstVFSVersionRequired = cVFSVersion;
 
@@ -1090,6 +1093,11 @@ begin
     QueryModules(ConstLocalModulePath1);
     QueryModules(ConstLocalModulePath2);
     QueryModules(ConstLocalModulePath3);
+{$IFDEF CPU64}
+    QueryModules(ConstGlobalModulePath3);
+    QueryModules(ConstGlobalModulePath4);
+    QueryModules(ConstLocalModulePath4);
+{$ENDIF}
   end;
 end;
 
-- 
1.6.2.2



Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tuxcmd.spec	9 Apr 2009 10:22:40 -0000	1.14
+++ tuxcmd.spec	10 Apr 2009 12:06:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.62
-Release:        git20090409.1%{?dist}
+Release:        git20090409.2%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -25,6 +25,9 @@
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
+# enable searching for modules in lib64 dirs
+Patch5: tuxcmd-0.6.62-lib64.patch
+
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -36,7 +39,6 @@
 Summary:        Modules for Tux Commander file manager
 Group:          Applications/File
 Requires: %{name} = %{version}-%{release}
-Requires: bzip2-libs
 BuildRequires: libarchive-devel >= 2.5.5
 BuildRequires: bzip2-devel
 
@@ -64,6 +66,7 @@
 %setup -q -b 1
 
 %patch4 -p1 -b .disable-smartlinking
+%patch5 -p1 -b .lib64
 
 %build
 
@@ -102,6 +105,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
+%dir %{_libdir}/tuxcmd
 %{_bindir}/tuxcmd
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/tuxcmd.png
@@ -110,7 +114,6 @@
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/doc/libarchive
 %doc ../%{name}-modules-%{version}/doc/zip
-%dir %{_libdir}/tuxcmd
 %{_libdir}/tuxcmd/libarchive_plugin.so
 %{_libdir}/tuxcmd/libzip_plugin.so
 
@@ -118,11 +121,14 @@
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/gvfs/README
 %doc ../%{name}-modules-%{version}/gvfs/COPYING
-%dir %{_libdir}/tuxcmd
 %{_libdir}/tuxcmd/libgvfs_plugin.so
 
 
 %changelog
+* Fri Apr 10 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.2
+- Fix vfs modules detection on 64bit archs
+- Remove unnecessary Requires (#473992)
+
 * Thu Apr  9 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.62-git20090409.1
 - Rebase to latest git
 - Fix unowned directories (#473992)



From drago01 at fedoraproject.org  Fri Apr 10 12:15:20 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Fri, 10 Apr 2009 12:15:20 +0000 (UTC)
Subject: rpms/hardinfo/devel .cvsignore, 1.5, 1.6 hardinfo.spec, 1.32,
	1.33 sources, 1.5, 1.6
Message-ID: <20090410121520.62C2D70122@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13540

Modified Files:
	.cvsignore hardinfo.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Mar 2009 13:10:13 -0000	1.5
+++ .cvsignore	10 Apr 2009 12:14:49 -0000	1.6
@@ -1 +1 @@
-hardinfo-0.5c.tar.bz2
+hardinfo-0.5.1.tar.bz2


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- hardinfo.spec	29 Mar 2009 13:10:13 -0000	1.32
+++ hardinfo.spec	10 Apr 2009 12:14:49 -0000	1.33
@@ -1,5 +1,5 @@
 Name: hardinfo
-Version: 0.5c
+Version: 0.5.1
 Release: 1%{?dist}
 Summary: System Profiler and Benchmark      
 
@@ -31,8 +31,8 @@
 %build
 export LIBDIR=%{_libdir}
 %configure
-#make %{?_smp_mflags} ARCHOPTS="%{optflags}"
-make ARCHOPTS="%{optflags}"
+make %{?_smp_mflags} ARCHOPTS="%{optflags}"
+#make ARCHOPTS="%{optflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.5.1-1
+- Update to 0.5.1
+
 * Sun Mar 29 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.5c-1
 - Update to 0.5c (bugfix release)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Mar 2009 13:10:13 -0000	1.5
+++ sources	10 Apr 2009 12:14:49 -0000	1.6
@@ -1 +1 @@
-c44b9b41a22f8994f9e29d332a980db3  hardinfo-0.5c.tar.bz2
+6fb38992e140f2fab16518ae1f38e188  hardinfo-0.5.1.tar.bz2



From lkundrak at fedoraproject.org  Fri Apr 10 12:29:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 10 Apr 2009 12:29:07 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/EL-5
	NetworkManager-vpnc-0.7.0.99-null.patch, 
	NONE, 1.1 NetworkManager-vpnc.spec, 1.25, 1.26
Message-ID: <20090410122907.9CF0970122@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0.99-null.patch 
Log Message:
* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.3
- Fix keyring NULL dereference


NetworkManager-vpnc-0.7.0.99-null.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0.99-null.patch ---
Fix a possible NULL pointer dereference.

Lubomir Rintel <lkundrak at v3.sk>

diff -up NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c.null NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c
--- NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c.null	2009-04-10 12:59:45.000000000 +0200
+++ NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c	2009-04-10 14:20:38.000000000 +0200
@@ -200,15 +200,21 @@ fill_vpn_passwords (VpncPluginUiWidget *
 			                                VPNC_USER_PASSWORD,
 			                                &password,
 			                                NULL);
-			if (!password)
-				password = strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD));
+			if (!password) {
+				tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD);
+				if (tmp)
+					password = strdup (tmp);
+			}
 
 			keyring_helpers_get_one_secret (nm_setting_connection_get_uuid (s_con),
 			                                VPNC_GROUP_PASSWORD,
 			                                &group_password,
 			                                NULL);
-			if (!group_password)
-				group_password = strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET));
+			if (!group_password) {
+				tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET);
+				if (tmp)
+					group_password = strdup (tmp);
+			}
 		}
 	}
 


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/NetworkManager-vpnc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NetworkManager-vpnc.spec	2 Apr 2009 14:23:22 -0000	1.25
+++ NetworkManager-vpnc.spec	10 Apr 2009 12:28:36 -0000	1.26
@@ -10,12 +10,13 @@
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0.99
-Release:   1%{svn_snapshot}%{?dist}.2
+Release:   1%{svn_snapshot}%{?dist}.3
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
 Patch0:    NetworkManager-vpnc-0.7.0.99-keyring.patch
+Patch1:    NetworkManager-vpnc-0.7.0.99-null.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .keyring
+%patch1 -p1 -b .null
 
 
 %build
@@ -101,6 +103,9 @@
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.3
+- Fix keyring NULL dereference
+
 * Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.2
 - Work around EPEL buildsys bug by removing versioned BRs
 



From limb at fedoraproject.org  Fri Apr 10 12:33:29 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 10 Apr 2009 12:33:29 +0000 (UTC)
Subject: rpms/roundcubemail/devel .cvsignore, 1.10, 1.11 roundcubemail.spec, 
	1.21, 1.22 sources, 1.11, 1.12
Message-ID: <20090410123329.57A3C70122@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944

Modified Files:
	.cvsignore roundcubemail.spec sources 
Log Message:
0.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	7 Jan 2009 13:40:56 -0000	1.10
+++ .cvsignore	10 Apr 2009 12:32:58 -0000	1.11
@@ -1 +1 @@
-roundcubemail-0.2-stable-dep.tar.gz
+roundcubemail-0.2.1-dep.tar.gz


Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/roundcubemail.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- roundcubemail.spec	30 Mar 2009 20:21:16 -0000	1.21
+++ roundcubemail.spec	10 Apr 2009 12:32:58 -0000	1.22
@@ -1,13 +1,13 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
-Version:  0.2
-Release:  9.stable%{?dist}
+Version:  0.2.1
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-stable-dep.tar.gz
+Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
@@ -16,7 +16,7 @@
 #Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
 #Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
-Patch3: roundcubemail-0.2-CVE-2009-0413.patch
+#Patch3: roundcubemail-0.2-CVE-2009-0413.patch
 Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
 
 BuildArch: noarch
@@ -45,12 +45,12 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2-stable-dep
+%setup -q -n roundcubemail-0.2.1-dep
 
 %patch0 -p0
 #%patch1 -p0
 #%patch2 -p0
-%patch3 -p0
+#%patch3 -p0
 %patch4 -p0
 
 # fix permissions and remove any .htaccess files
@@ -139,6 +139,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> = 0.2.1-1
+- New upstream.
+
 * Mon Mar 30 2009 Jon Ciesla <limb at jcomserv.net> = 0.2-9.stable
 - Patch for PG until php-pear-MDB2 hits 1.5.0 stable. BZ 489505.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Jan 2009 13:40:57 -0000	1.11
+++ sources	10 Apr 2009 12:32:58 -0000	1.12
@@ -1 +1 @@
-dac7776b063bf2314f7d7730af2b1b0f  roundcubemail-0.2-stable-dep.tar.gz
+86e9238b31a917eeabb23ba1d226c1dc  roundcubemail-0.2.1-dep.tar.gz



From lucilanga at fedoraproject.org  Fri Apr 10 12:48:42 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 10 Apr 2009 12:48:42 +0000 (UTC)
Subject: rpms/alevt/devel alevt-1.6.2-rus-greek.patch, NONE,
	1.1 alevt-1.6.2-doublefont.patch, 1.1, 1.2 alevt.spec, 1.5, 1.6
Message-ID: <20090410124842.CBAFB70122@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22902

Modified Files:
	alevt-1.6.2-doublefont.patch alevt.spec 
Added Files:
	alevt-1.6.2-rus-greek.patch 
Log Message:
* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
- updated doublefont patch

alevt-1.6.2-rus-greek.patch:

--- NEW FILE alevt-1.6.2-rus-greek.patch ---
diff -Nur alevt-1.6.2/alevt.1x.in alevt-1.6.2.rus+greek/alevt.1x.in
--- alevt-1.6.2/alevt.1x.in	2007-12-03 08:52:12.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt.1x.in	2009-04-10 06:59:25.000000000 +0400
@@ -62,7 +62,7 @@
 .BR \-bell / \-nobell
 Enables/disables the error bell.  Normally enabled.
 .TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian\||iso8859-7
 Selects the character set to use.  Characters not present
 in the selected set are replaced by similar looking symbols.
 (default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.1.in alevt-1.6.2.rus+greek/alevt-cap.1.in
--- alevt-1.6.2/alevt-cap.1.in	2007-12-03 09:05:59.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.1.in	2009-04-10 06:59:25.000000000 +0400
@@ -45,7 +45,7 @@
 the program terminates with exit status 1 after saving
 the already captured pages.  The default is to wait forever.
 .TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian
 Selects the character set to use.  Characters not present
 in the selected set are replaced by similar looking symbols.
 (default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.c alevt-1.6.2.rus+greek/alevt-cap.c
--- alevt-1.6.2/alevt-cap.c	2007-12-03 09:12:22.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.c	2009-04-10 07:02:48.000000000 +0400
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <locale.h>
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
@@ -33,16 +34,16 @@
     fprintf(fp, "\nUsage: %s [options] ppp[.ss]...\n", prgname);
     fprintf(fp,
 	    "\n"
-	    "  Valid options:\t\tDefault:\n"
+	    "  Valid options:\t\t\t\tDefault:\n"
 	    "    --help\n"
 	    "    --version\n"
-	    "    -vbi <vbidev>\t\t/dev/vbi0\n"
-	    "    -finetune <-4..4|auto>\t0\n"
-	    //"    -oldbttv\t\t\t(for bttv <0.5.20)\n"
-	    "    -charset latin-1/2\t\tlatin-1\n"
-	    "    -timeout <secs>\t\tnone\n"
-	    "    -name <filename>\t\tttext-%%s.%%e\n"
-	    "    -format <fmt[,options]>\tascii\n"
+	    "    -vbi <vbidev>\t\t\t\t/dev/vbi0\n"
+	    "    -finetune <-4..4|auto>\t\t\t0\n"
+	    //"    -oldbttv\t\t\t\t\t(for bttv <0.5.20)\n"
+	    "    -charset latin-1/latin-2/russian\t\tlatin-1\n"
+	    "    -timeout <secs>\t\t\t\tnone\n"
+	    "    -name <filename>\t\t\t\tttext-%%s.%%e\n"
+	    "    -format <fmt[,options]>\t\t\tascii\n"
 	    "    -format help\n"
 	    "\n"
 	    "  ppp[.ss] stands for a page number and an\n"
@@ -205,6 +206,7 @@
     struct req *req;
     struct dl_head reqs[2];	// simple linear lists of requests & captures
 
+    setlocale (LC_CTYPE, "");
     setprgname(argv[0]);
 
     fdset_init(fds);
@@ -247,8 +249,12 @@
 		    latin1 = 1;
 		else if (streq(arg, "latin-2") || streq(arg, "2"))
 		    latin1 = 0;
+		else if (streq(arg, "russian") || streq(arg, "rus"))
+		    latin1 = KOI8;
+		else if (streq(arg, "iso8859-7") || streq(arg, "el"))
+		    latin1 = GREEK;
 		else
-		    fatal("bad charset (not latin-1/2)");
+		    fatal("bad charset (not latin-1/2/russian/iso8859-7)");
 		break;
 	    case 10:	// format
 		if (streq(arg, "help") || streq(arg, "?") || streq(arg, "list"))
diff -Nur alevt-1.6.2/exp-gfx.c alevt-1.6.2.rus+greek/exp-gfx.c
--- alevt-1.6.2/exp-gfx.c	2007-12-03 05:56:06.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-gfx.c	2009-04-10 06:59:25.000000000 +0400
@@ -21,7 +21,7 @@
 	  int sep)
 {
   int x,y;
-  unsigned char* src= (latin1 ? font1_bits : font2_bits);
+  unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
   int dest_x=_x*CW;
   int dest_y=_y*CH;
       
diff -Nur alevt-1.6.2/exp-html.c alevt-1.6.2.rus+greek/exp-html.c
--- alevt-1.6.2/exp-html.c	2007-12-03 05:55:17.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-html.c	2009-04-10 06:59:25.000000000 +0400
@@ -111,12 +111,22 @@
     HTML_NL
 #ifndef STRIPPED_HTML
       fputs("<meta http-equiv=\"Content-Type\" content=\"text/html;",fp);
-    fprintf(fp,"charset=iso-8859-%d\">",(latin1 ? 1 : 2));
+    switch(latin1) {
+      case LATIN1: fprintf(fp,"charset=iso-8859-1\">"); break;
+      case LATIN2: fprintf(fp,"charset=iso-8859-2\">"); break;
+      case KOI8: fprintf(fp,"charset=koi8-r\">"); break;
+      case GREEK: fprintf(fp,"charset=iso-8859-7\">"); break;
+    }
     HTML_NL
       fputs("<meta name=\"GENERATOR\" content=\"alevt-cap\">",fp);
     HTML_NL
 #else
-      fprintf(fp,"<meta charset=\"iso-8859-%d\">",(latin1 ? 1 : 2));
+    switch(latin1) {
+      case LATIN1: fprintf(fp,"<meta charset=iso-8859-1\">"); break;
+      case LATIN2: fprintf(fp,"<meta charset=iso-8859-2\">"); break;
+      case KOI8: fprintf(fp,"<meta charset=koi8-r\">"); break;
+      case GREEK: fprintf(fp,"<meta charset=iso-8859-7\">"); break;
+    }
     HTML_NL
 #endif
       fputs("</head>",fp);
diff -Nur alevt-1.6.2/font.c alevt-1.6.2.rus+greek/font.c
--- alevt-1.6.2/font.c	1999-10-08 02:20:00.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.c	2009-04-10 06:59:25.000000000 +0400
@@ -1,3 +1,7 @@
 #define static /* I want them global */
 #include "font1.xbm"
 #include "font2.xbm"
+#include "font3.xbm"
+#include "font4.xbm"
+
+
diff -Nur alevt-1.6.2/font.h alevt-1.6.2.rus+greek/font.h
--- alevt-1.6.2/font.h	1999-10-08 02:24:02.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.h	2009-04-10 06:59:25.000000000 +0400
@@ -9,6 +9,8 @@
 
 extern unsigned char font1_bits[];
 extern unsigned char font2_bits[];
+extern unsigned char font3_bits[];
+extern unsigned char font4_bits[];
 
 #define font_width	font1_width
 #define font_height	font1_height
diff -Nur alevt-1.6.2/lang.c alevt-1.6.2.rus+greek/lang.c
--- alevt-1.6.2/lang.c	1999-07-18 19:23:48.000000000 +0400
+++ alevt-1.6.2.rus+greek/lang.c	2009-04-10 06:59:25.000000000 +0400
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <ctype.h>
 #include "misc.h"
 #include "vt.h"
 #include "lang.h"
@@ -145,22 +146,175 @@
 void
 conv2latin(u8 *p, int n, int lang)
 {
-    int c, gfx = 0;
+    int c, gfx = 0, lat=0;
 
+  if ((latin1 == KOI8) && lang==12) { /* russian */
+    while (n--) {
+      c=*p;
+
+      if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+       if ( is_koi(c)) {
+         if (not gfx || (c & 0xa0) != 0x20) {
+             if(!lat) conv2koi8(p);
+         }
+       }
+	else if ((c & 0xe8) == 0)
+	    gfx = c & 0x10;
+	p++;
+   }
+ }
+else if ((latin1 == GREEK) && lang==15) { /* Hellas */
+    while (n--) {
+      c=*p;
+
+      if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+       if ( is_greek(c)) {
+         if (not gfx || (c & 0xa0) != 0x20) {
+            if(!lat) conv2greek(p);
+         }
+       }
+	else if ((c & 0xe8) == 0)
+	    gfx = c & 0x10;
+	p++;
+   }
+ }
+
+ else {
     while (n--)
     {
 	if (lang_char[c = *p])
 	{
-	    if (not gfx || (c & 0xa0) != 0x20)
[...11868 lines suppressed...]
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char155
+ENCODING 249
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C300
+C300
+C300
+C300
+F300
+DB00
+DB00
+DB00
+DB00
+F300
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char135
+ENCODING 250
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+0600
+3C00
+0600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char152
+ENCODING 251
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char157
+ENCODING 252
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+2600
+3E00
+2600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char153
+ENCODING 253
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0300
+0300
+0000
+0000
+ENDCHAR
+STARTCHAR char151
+ENCODING 254
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C600
+C600
+C600
+C600
+C600
+7E00
+0600
+0600
+0600
+0600
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char154
+ENCODING 255
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+F800
+B000
+3000
+3000
+3C00
+3600
+3600
+3600
+3600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+ENDFONT
diff -Nur alevt-1.6.2/xio.c alevt-1.6.2.rus+greek/xio.c
--- alevt-1.6.2/xio.c	2007-12-03 09:18:04.000000000 +0300
+++ alevt-1.6.2.rus+greek/xio.c	2009-04-10 06:59:25.000000000 +0400
@@ -128,10 +128,18 @@
 {
     GC gc;
     int i;
+    unsigned char *font_bits;
+    
+    switch(latin1) {
+        case LATIN1: font_bits=font1_bits; break;
+        case LATIN2: font_bits=font2_bits; break;
+        case KOI8: font_bits=font3_bits; break;
+	case GREEK: font_bits=font4_bits; break;
+        default: font_bits=font1_bits; break;
+    }
 
     xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-					    latin1 ? font1_bits : font2_bits,
-						    font_width, font_height);
+					 font_bits, font_width, font_height);
     xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
     					font_width, font_height*2, 1);
     gc = XCreateGC(xio->dpy, xio->font[0], 0, 0);
@@ -610,6 +618,7 @@
 
 		    case 0x0e:		/* SO (reserved, double width) */
 		    case 0x0f:		/* SI (reserved, double size) */
+		        c= ' '; break;
 		    case 0x1b:		/* ESC (reserved) */
 			c = ' ';
 			break;


alevt-1.6.2-doublefont.patch:

Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-doublefont.patch	5 Dec 2008 08:16:33 -0000	1.1
+++ alevt-1.6.2-doublefont.patch	10 Apr 2009 12:48:12 -0000	1.2
@@ -1,76 +1,122 @@
-diff -Naur alevt-1.6.2/exp-gfx.c alevt-1.6.2-mod/exp-gfx.c
---- alevt-1.6.2/exp-gfx.c	2007-12-03 04:56:06.000000000 +0200
-+++ alevt-1.6.2-mod/exp-gfx.c	2008-12-03 22:32:16.000000000 +0200
-@@ -21,7 +21,9 @@
+diff -Nur alevt-1.6.2.rus+greek/alevt.1x.in alevt-1.6.2.doublefont/alevt.1x.in
+--- alevt-1.6.2.rus+greek/alevt.1x.in	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/alevt.1x.in	2009-04-10 07:26:06.000000000 +0400
+@@ -67,6 +67,9 @@
+ in the selected set are replaced by similar looking symbols.
+ (default: latin-1)
+ .TP
++.BR \-doublefont / \-df
++Instructs alevt to use double sized fonts.
++.TP
+ .B \-\-help
+ Show summary of options.
+ .TP
+diff -Nur alevt-1.6.2.rus+greek/exp-gfx.c alevt-1.6.2.doublefont/exp-gfx.c
+--- alevt-1.6.2.rus+greek/exp-gfx.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/exp-gfx.c	2009-04-10 07:28:15.000000000 +0400
+@@ -21,7 +21,16 @@
  	  int sep)
  {
    int x,y;
--  unsigned char* src= (latin1 ? font1_bits : font2_bits);
-+  unsigned char* src= double_font? 
-+				(latin1? font3_bits : font4_bits) : 
-+				(latin1? font1_bits : font2_bits);
+-  unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
++  unsigned char* src = double_font ? 
++			( (latin1==LATIN1) ? font1_bits : 
++			  ( (latin1==LATIN2) ? font2_bits : 
++			  ( (latin1==KOI8) ? font3_bits :
++			  ( (latin1==GREEK) ? font4_bits : /* fallback */ font1_bits) ) ) ) 
++			  :
++			( (latin1==LATIN1) ? font1d_bits : 
++			  ( (latin1==LATIN2) ? font2d_bits : 
++			  ( (latin1==KOI8) ? font3d_bits :
++			  ( (latin1==GREEK) ? font4d_bits : /* fallback */ font1d_bits) ) ) );
    int dest_x=_x*CW;
    int dest_y=_y*CH;
        
-diff -Naur alevt-1.6.2/font.c alevt-1.6.2-mod/font.c
---- alevt-1.6.2/font.c	1999-10-08 01:20:00.000000000 +0300
-+++ alevt-1.6.2-mod/font.c	2008-12-03 21:26:36.000000000 +0200
-@@ -1,3 +1,5 @@
- #define static /* I want them global */
- #include "font1.xbm"
- #include "font2.xbm"
-+#include "font3.xbm"
-+#include "font4.xbm"
-diff -Naur alevt-1.6.2/font.h alevt-1.6.2-mod/font.h
---- alevt-1.6.2/font.h	1999-10-08 01:24:02.000000000 +0300
-+++ alevt-1.6.2-mod/font.h	2008-12-03 22:30:02.000000000 +0200
-@@ -9,10 +9,18 @@
+diff -Nur alevt-1.6.2.rus+greek/font.c alevt-1.6.2.doublefont/font.c
+--- alevt-1.6.2.rus+greek/font.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.c	2009-04-10 07:28:15.000000000 +0400
+@@ -4,4 +4,13 @@
+ #include "font3.xbm"
+ #include "font4.xbm"
+ 
++#include "font1d.xbm"
++#include "font2d.xbm"
++#include "font3d.xbm"
++#include "font4d.xbm"
+ 
++int CW;
++int CH;
++int double_font = 0;
++int font_width;
++int font_height;
+diff -Nur alevt-1.6.2.rus+greek/font.h alevt-1.6.2.doublefont/font.h
+--- alevt-1.6.2.rus+greek/font.h	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.h	2009-04-10 07:28:15.000000000 +0400
+@@ -1,20 +1,31 @@
+ #ifndef FONT_H
+ #define FONT_H
+ 
+-#include "fontsize.h"	/* the #defines from font?.xbm */
++// #include "fontsize.h"	/* the #defines from font?.xbm */
+ 
+-#if font1_width != font2_width || font1_height != font2_height
+-#error different font sizes.
+-#endif
++//#if font1_width != font2_width || font1_height != font2_height
++//#error different font sizes.
++//#endif
  
  extern unsigned char font1_bits[];
  extern unsigned char font2_bits[];
-+extern unsigned char font3_bits[];
-+extern unsigned char font4_bits[];
+ extern unsigned char font3_bits[];
+ extern unsigned char font4_bits[];
  
 -#define font_width	font1_width
 -#define font_height	font1_height
 -#define CW		(font_width/32)        /* pixel width of a character */
 -#define CH		(font_height/8)        /* pixel height of a character */
++extern unsigned char font1d_bits[];
++extern unsigned char font2d_bits[];
++extern unsigned char font3d_bits[];
++extern unsigned char font4d_bits[];
 +
 +//#define font_width	font1_width
 +//#define font_height	font1_height
 +//#define CW		(font_width/32)        /* pixel width of a character */
-+//externint CW =	(font_width/32);        /* pixel width of a character */
-+int CW;
-+int CH;
-+int font_width;
-+int font_height;
-+int double_font;
++//#define CH		(font_height/8)        /* pixel height of a character */
++
++extern int CW;
++extern int CH;
++extern int double_font;
++extern int font_width;
++extern int font_height;
  
  #endif
-diff -Naur alevt-1.6.2/main.c alevt-1.6.2-mod/main.c
---- alevt-1.6.2/main.c	2007-12-03 05:45:29.000000000 +0200
-+++ alevt-1.6.2-mod/main.c	2008-12-04 08:16:13.000000000 +0200
-@@ -22,6 +22,11 @@
- static int fine_tune = 1; // auto = 999;
+diff -Nur alevt-1.6.2.rus+greek/main.c alevt-1.6.2.doublefont/main.c
+--- alevt-1.6.2.rus+greek/main.c	2009-04-10 07:16:37.000000000 +0400
++++ alevt-1.6.2.doublefont/main.c	2009-04-10 07:28:15.000000000 +0400
+@@ -24,6 +24,12 @@
  static int erc = 1;
  static int newbttv = -1;
-+int double_font = 0;
-+int font_width = 288;
-+int font_height = 128;
-+int CW;
-+int CH;
  
++/* Double font size related variables */
++extern int double_font;
++extern int font_width;
++extern int font_height;
++extern int CW;
++extern int CH;
  
  static void
-@@ -43,6 +48,7 @@
- 	    "    -[no]erc\t\t\tenabled\n"
- 	    "    -[no]bell\t\t\tenabled\n"
- 	    "    -charset latin-1/2\t\tlatin-1\n"
+ usage(FILE *fp, int exitval)
+@@ -44,6 +50,7 @@
+ 	    "    -[no]erc\t\t\t\t\tenabled\n"
+ 	    "    -[no]bell\t\t\t\t\tenabled\n"
+ 	    "    -charset latin-1/2/russian/iso8859-7\tlatin-1\n"
 +	    "    -doublefont\n"
  	    "\n"
  	    "  Order is important!  Each page number\n"
  	    "  opens a new window with the previously\n"
-@@ -126,6 +132,7 @@
+@@ -127,6 +134,7 @@
  	{ "-bell", "-b", 0 },
  	{ "-nobell", "-nb", 0 },
  	{ "-charset", "-latin", 1 },
@@ -78,70 +124,114 @@
      };
      int i;
  
-@@ -163,6 +170,9 @@
+@@ -164,7 +172,7 @@
      int opt, ind;
      char *arg;
  
-+    CW = (font_width/32);
-+    CH = (font_height/8);
-+
+-setlocale (LC_CTYPE, "");
++    setlocale (LC_CTYPE, "");
+ 
      setprgname(argv[0]);
  
-     fdset_init(fds);
-@@ -235,6 +245,13 @@
+@@ -242,6 +250,9 @@
  		else
- 		    fatal("bad charset (not latin-1/2)");
+ 		    fatal("bad charset (not latin-1/2/russian/iso8859-7)");
  		break;
-+	    case 19:	// double font size
++	    case 19:	// Doublefont
 +		double_font = 1;
-+		font_width=576;
-+		font_height=256;
-+		CW = (font_width/32);
-+		CH = (font_height/8);
 +		break;
  	    case 12:	// debug
  		debug++;
  		break;
-diff -Naur alevt-1.6.2/Makefile alevt-1.6.2-mod/Makefile
---- alevt-1.6.2/Makefile	2007-12-03 07:19:54.000000000 +0200
-+++ alevt-1.6.2-mod/Makefile	2008-12-03 22:38:58.000000000 +0200
-@@ -33,8 +33,8 @@
+@@ -253,6 +264,14 @@
+ 		break;
+ 	}
+ 
++    /* Font caps inits */
++
++    font_width  = (double_font==0) ? 288 : 576;
++    font_height = (double_font==0) ? 128 : 256;
++
++    CW = (font_width/32);
++    CH = (font_height/8);
++
+     if (parent == 0)
+ 	start(argc, argv, 0, 0x900, ANY_SUB);
+ 
+diff -Nur alevt-1.6.2.rus+greek/Makefile alevt-1.6.2.doublefont/Makefile
+--- alevt-1.6.2.rus+greek/Makefile	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/Makefile	2009-04-10 07:28:15.000000000 +0400
+@@ -33,9 +33,10 @@
  alevt-cap: $(COBJS)
  	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
  
--font.o: font1.xbm font2.xbm
--fontsize.h: font1.xbm font2.xbm
-+font.o: font1.xbm font2.xbm font3.xbm font4.xbm
-+fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
- 	fgrep -h "#define" font1.xbm font2.xbm >fontsize.h
+-font.o: font1.xbm font2.xbm font3.xbm font4.xbm
+-fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
++font.o: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
++fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
+ 	fgrep -h "#define" font1.xbm font2.xbm font3.xbm font4.xbm >fontsize.h
++	fgrep -h "#define" font1d.xbm font2d.xbm font3d.xbm font4d.xbm >> fontsize.h
  
  font1.xbm: bdf2xbm $(FONT)-latin-1.bdf
-@@ -43,6 +43,14 @@
- font2.xbm: bdf2xbm $(FONT)-latin-2.bdf
- 	./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
- 
-+font3.xbm: bdf2xbm $(FONT)-latin-1.bdf
-+	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font3.xbm
-+	/usr/bin/convert -filter Point -resize 200% font1.xbm font3.xbm
-+
-+font4.xbm: bdf2xbm $(FONT)-latin-2.bdf
-+	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font4.xbm
-+	/usr/bin/convert -filter Point -resize 200% font2.xbm font4.xbm
+ 	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font1.xbm
+@@ -49,6 +50,18 @@
+ font4.xbm: bdf2xbm vtxt-iso8859-7.bdf
+ 	./bdf2xbm font4 <vtxt-iso8859-7.bdf >font4.xbm
+ 
++font1d.xbm: font1.xbm
++	/usr/bin/convert -filter Point -resize 200% font1.xbm font1d.xbm
++
++font2d.xbm: font2.xbm
++	/usr/bin/convert -filter Point -resize 200% font2.xbm font2d.xbm
++
++font3d.xbm: font3.xbm
++	/usr/bin/convert -filter Point -resize 200% font3.xbm font3d.xbm
++
++font4d.xbm: font4.xbm
++	/usr/bin/convert -filter Point -resize 200% font4.xbm font4d.xbm
 +
  bdf2xbm: bdf2xbm.c
  	$(HOSTCC) bdf2xbm.c -o bdf2xbm
  
-diff -Naur alevt-1.6.2/xio.c alevt-1.6.2-mod/xio.c
---- alevt-1.6.2/xio.c	2007-12-03 08:18:04.000000000 +0200
-+++ alevt-1.6.2-mod/xio.c	2008-12-03 22:33:06.000000000 +0200
-@@ -130,7 +130,9 @@
+@@ -62,7 +75,7 @@
+ 	sed s/VERSION/$(VER)/g <alevt-cap.1.in >alevt-cap.1
+ 
+ clean:
+-	rm -f *.o page*.txt a.out core bdf2xbm font?.xbm fontsize.h Makefile.bak
++	rm -f *.o page*.txt a.out core bdf2xbm font?.xbm font?d.xbm fontsize.h Makefile.bak
+ 	rm -f alevt alevt-date alevt-cap
+ 	rm -f alevt.1x alevt-date.1 alevt-cap.1
+ 	rm -f contrib/a.out ttext-*.*
+diff -Nur alevt-1.6.2.rus+greek/xio.c alevt-1.6.2.doublefont/xio.c
+--- alevt-1.6.2.rus+greek/xio.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/xio.c	2009-04-10 07:28:15.000000000 +0400
+@@ -130,12 +130,22 @@
      int i;
+     unsigned char *font_bits;
+     
+-    switch(latin1) {
+-        case LATIN1: font_bits=font1_bits; break;
+-        case LATIN2: font_bits=font2_bits; break;
+-        case KOI8: font_bits=font3_bits; break;
+-	case GREEK: font_bits=font4_bits; break;
+-        default: font_bits=font1_bits; break;
++    if(!double_font) {
++        switch(latin1) {
++            case LATIN1: font_bits=font1_bits; break;
++            case LATIN2: font_bits=font2_bits; break;
++            case KOI8: font_bits=font3_bits; break;
++            case GREEK: font_bits=font4_bits; break;
++            default: font_bits=font1_bits; break;
++        }
++    } else {
++        switch(latin1) {
++            case LATIN1: font_bits=font1d_bits; break;
++            case LATIN2: font_bits=font2d_bits; break;
++            case KOI8: font_bits=font3d_bits; break;
++            case GREEK: font_bits=font4d_bits; break;
++            default: font_bits=font1d_bits; break;
++        }
+     }
  
      xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
--					    latin1 ? font1_bits : font2_bits,
-+					double_font?
-+					    (latin1 ? font3_bits : font1_bits) : 
-+					    (latin1 ? font1_bits : font2_bits),
- 						    font_width, font_height);
-     xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
-     					font_width, font_height*2, 1);
+


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alevt.spec	24 Feb 2009 00:30:04 -0000	1.5
+++ alevt.spec	10 Apr 2009 12:48:12 -0000	1.6
@@ -1,15 +1,16 @@
 Name: alevt
 Version: 1.6.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Teletext decoder/browser
-Group:  Applications/Multimedia
+Group: Applications/Multimedia
 License: GPLv2
 URL: http://goron.de/~froese
 Source: http://goron.de/~froese/%{name}/%{name}-%{version}.tar.gz
 Source1: alevt.desktop
 Patch0: alevt-1.6.2-pixmap.patch
 Patch1: alevt-1.6.2-manpath.patch
-Patch2: alevt-1.6.2-doublefont.patch
+Patch2: alevt-1.6.2-rus-greek.patch
+Patch3: alevt-1.6.2-doublefont.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
 BuildRequires: libpng-devel
@@ -29,6 +30,7 @@
 %patch0 -p1 -b .pixmap
 %patch1 -p1 -b .manpath
 %patch2 -p1 -b .doublefont
+%patch3 -p1 -b .rusgreek
 
 %build
 # alevt does not have standard build system, so we populate OPT, 
@@ -61,6 +63,10 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
+- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
+- updated doublefont patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From thias at fedoraproject.org  Fri Apr 10 12:57:51 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 10 Apr 2009 12:57:51 +0000 (UTC)
Subject: rpms/thttpd/devel thttpd-2.25b-CVE-2005-3124.patch, 1.2,
	1.3 thttpd-2.25b-fixes.patch, 1.2, 1.3 thttpd.init, 1.3,
	1.4 thttpd.logrotate, 1.1, 1.2 thttpd.spec, 1.19, 1.20
Message-ID: <20090410125751.8D2B270122@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/thttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26297

Modified Files:
	thttpd-2.25b-CVE-2005-3124.patch thttpd-2.25b-fixes.patch 
	thttpd.init thttpd.logrotate thttpd.spec 
Log Message:
Give the package some well needed attention.


thttpd-2.25b-CVE-2005-3124.patch:

Index: thttpd-2.25b-CVE-2005-3124.patch
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd-2.25b-CVE-2005-3124.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thttpd-2.25b-CVE-2005-3124.patch	25 Sep 2008 08:49:23 -0000	1.2
+++ thttpd-2.25b-CVE-2005-3124.patch	10 Apr 2009 12:57:50 -0000	1.3
@@ -7,7 +7,7 @@
  
 -tmp1=/tmp/stc1.$$
 -rm -f $tmp1
-+tmp1=``mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++tmp1=`mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
 +trap " [ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15
  
  # Gather up all the thttpd entries.
@@ -17,75 +17,3 @@
  
  # Done.
 -rm -f $tmp1
-diff -Naupr thttpd-2.25b.orig/extras/syslogtocern.orig thttpd-2.25b/extras/syslogtocern.orig
---- thttpd-2.25b.orig/extras/syslogtocern.orig	1970-01-01 01:00:00.000000000 +0100
-+++ thttpd-2.25b/extras/syslogtocern.orig	2005-06-29 19:50:23.000000000 +0200
-@@ -0,0 +1,68 @@
-+#!/bin/sh
-+#
-+# syslogtocern - convert thttpd syslog entries into CERN Combined Log Format
-+#
-+# Copyright ? 1995,1998 by Jef Poskanzer <jef at mail.acme.com>.
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-+
-+if [ $# -lt 1 ] ; then
-+    echo "usage:  $0 logfile ..." >&2
-+    exit 1
-+fi
-+
-+tmp1=/tmp/stc1.$$
-+rm -f $tmp1
-+
-+# Gather up all the thttpd entries.
-+egrep -h ' thttpd\[' "$@" > $tmp1
-+
-+# Figure out the current year - it's not in syslog's output.  Some versions
-+# of date have the %Y directive to give the full four-digit year, but others
-+# only have %y.
-+year=`date +%y`
-+if [ $year -gt 70 ] ; then
-+    year=19$year
-+else
-+    year=20$year
-+fi
-+
-+# If the current year isn't the year that the logfile was generated, we need
-+# to fix it.  This will most likely happen once a year, when this script is
-+# run on January 1st for December 31st's logfile.  So, if the current month
-+# is January and there are December dates in the log file, we subtract one.
-+# This should cover most cases.
-+if [ `date +%m` -eq 1 -a `head -1 $tmp1 | awk '{print $1}'` = "Dec" ] ; then
-+    year=`echo $year - 1 | bc`
-+fi
-+
-+# Do access_log.
-+awk < $tmp1 '{if ( NF >= 15 && $7 == "-" && $12 >= 100 && $12 < 510) print;}' |
-+  sed -e "s,\([A-Z][a-z][a-z]\) \([0-9 ][0-9]\) \([0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \([^ ]* [^ ]* [^ ]*\) \(.*\),\4 [\2/\1/${year}:\3] \5," -e 's,\[ ,[0,' > access_log
-+
-+# Do error_log.
-+awk < $tmp1 '{if ( ! ( NF >= 15 && $7 == "-" && $12 >= 100 && $12 < 510) ) print;}' |
-+  sed -e "s,\([A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \(.*\),[\1 ${year}] \2," > error_log
-+
-+# Done.
-+rm -f $tmp1

thttpd-2.25b-fixes.patch:

Index: thttpd-2.25b-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd-2.25b-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thttpd-2.25b-fixes.patch	25 Sep 2008 08:49:23 -0000	1.2
+++ thttpd-2.25b-fixes.patch	10 Apr 2009 12:57:50 -0000	1.3
@@ -273,266 +273,6 @@
  #ifdef TILDE_MAP_1
      prefix = TILDE_MAP_1;
  #else /* TILDE_MAP_1 */
-diff -Naupr thttpd-2.25b.orig/extras/makeweb.c.orig thttpd-2.25b/extras/makeweb.c.orig
---- thttpd-2.25b.orig/extras/makeweb.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ thttpd-2.25b/extras/makeweb.c.orig	2005-06-29 19:53:25.000000000 +0200
-@@ -0,0 +1,256 @@
-+/* makeweb.c - let a user create a web subdirectory
-+**
-+** Copyright ? 1995 by Jef Poskanzer <jef at mail.acme.com>.
-+** All rights reserved.
-+**
-+** Redistribution and use in source and binary forms, with or without
-+** modification, are permitted provided that the following conditions
-+** are met:
-+** 1. Redistributions of source code must retain the above copyright
-+**    notice, this list of conditions and the following disclaimer.
-+** 2. Redistributions in binary form must reproduce the above copyright
-+**    notice, this list of conditions and the following disclaimer in the
-+**    documentation and/or other materials provided with the distribution.
-+** 
-+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+** SUCH DAMAGE.
-+*/
-+
-+/* This is intended to be installed setgid to a group that has
-+** write access to the system web directory.  It allows any user
-+** to create a subdirectory there.  It also makes a symbolic link
-+** in the user's home directory pointing at the new web subdir.
-+*/
-+
-+
-+#include "../config.h"
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <pwd.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
-+
-+#define LINK "public_html"
-+
-+static char* argv0;
-+
-+
-+static void
-+check_room( int size, int len )
-+    {
-+    if ( len > size )
-+	{
-+	(void) fprintf( stderr, "%s: internal error, out of room\n", argv0 );
-+	exit( 1 );
-+	}
-+    }
-+
-+
-+static void
-+end_with_slash( char* str )
-+    {
-+    if ( str[strlen( str ) - 1] != '/' )
-+	(void) strcat( str, "/" );
-+    }
-+
-+
-+static void
-+check_dir( char* dirname, uid_t uid, gid_t gid )
-+    {
-+    struct stat sb;
-+
-+    /* Check the directory. */
-+    if ( stat( dirname, &sb ) < 0 )
-+	{
-+	if ( errno != ENOENT )
-+	    {
-+	    perror( dirname );
-+	    exit( 1 );
-+	    }
-+	/* Doesn't exist.  Try to make it. */
-+	if ( mkdir( dirname, 0755 ) < 0 )
-+	    {
-+	    if ( errno == ENOENT )
-+		(void) printf( "\
-+Some part of the path %s does not exist.\n\
-+This is probably a configuration error.\n", dirname );
-+	    else
-+		perror( dirname );
-+	    exit( 1 );
-+	    }
-+	(void) printf( "Created web directory %s\n", dirname );
-+	/* Try to change the group of the new dir to the user's group. */
-+	(void) chown( dirname, -1, gid );
-+	}
-+    else
-+	{
-+	/* The directory already exists.  Well, check that it is in
-+	** fact a directory.
-+	*/
-+	if ( ! S_ISDIR( sb.st_mode ) )
-+	    {
-+	    (void) printf(
-+		"%s already exists but is not a directory!\n", dirname );
-+	    exit( 1 );
-+	    }
-+	if ( sb.st_uid != uid )
-+	    {
-+	    (void) printf(
-+		"%s already exists but you don't own it!\n", dirname );
-+	    exit( 1 );
-+	    }
-+	(void) printf( "Web directory %s already existed.\n", dirname );
-+	}
-+    }
-+
-+
-+int
-+main( int argc, char** argv )
-+    {
-+    char* webdir;
-+    char* prefix;
-+    struct passwd* pwd;
-+    char* username;
-+    char* homedir;
-+    char dirname[5000];
-+    char linkname[5000];
-+    char linkbuf[5000];
-+    struct stat sb;
-+
-+    argv0 = argv[0];
-+    if ( argc != 1 )
-+	{
-+	(void) fprintf( stderr, "usage:  %s\n", argv0 );
-+	exit( 1 );
-+	}
-+
-+    pwd = getpwuid( getuid() );
-+    if ( pwd == (struct passwd*) 0 )
-+	{
-+	(void) fprintf( stderr, "%s: can't find your username\n", argv0 );
-+	exit( 1 );
-+	}
-+    username = pwd->pw_name;
-+    homedir = pwd->pw_dir;
-+
-+#ifdef TILDE_MAP_2
-+
-+    /* All we have to do for the TILDE_MAP_2 case is make sure there's
-+    ** a public_html subdirectory.
-+    */
-+    check_room(
-+	sizeof(dirname), strlen( homedir ) + strlen( TILDE_MAP_2 ) + 2 );
-+    (void) strcpy( dirname, homedir );
-+    end_with_slash( dirname );
-+    (void) strcat( dirname, TILDE_MAP_2 );
-+
-+    check_dir( dirname, pwd->pw_uid, pwd->pw_gid );
-+
-+#else /* TILDE_MAP_2 */
-+
-+    /* Gather the pieces. */
-+    webdir = WEBDIR;
-+#ifdef TILDE_MAP_1
-+    prefix = TILDE_MAP_1;
-+#else /* TILDE_MAP_1 */
-+    prefix = "";
-+#endif /* TILDE_MAP_1 */
-+
-+    /* Assemble the directory name.  Be paranoid cause we're sgid. */
-+    check_room(
-+	sizeof(dirname),
-+	strlen( webdir ) + strlen( prefix ) + strlen( username ) + 3 );
-+    (void) strcpy( dirname, webdir );
-+    end_with_slash( dirname );
-+    if ( strlen( prefix ) != 0 )
-+	{
-+	(void) strcat( dirname, prefix );
-+	end_with_slash( dirname );
-+	}
-+    (void) strcat( dirname, username );
-+
-+    /* Assemble the link name. */
-+    check_room( sizeof(linkname), strlen( homedir ) + strlen( LINK ) + 2 );
-+    (void) strcpy( linkname, homedir );
-+    end_with_slash( linkname );
-+    (void) strcat( linkname, LINK );
-+
-+    check_dir( dirname, pwd->pw_uid, pwd->pw_gid );
-+
-+    /* Check the symlink. */
-+    try_link_again: ;
-+    if ( lstat( linkname, &sb ) < 0 )
-+	{
-+	if ( errno != ENOENT )
-+	    {
-+	    perror( linkname );
-+	    exit( 1 );
-+	    }
-+	/* Doesn't exist.  Try to make it. */
-+	if ( symlink( dirname, linkname ) < 0 )
-+	    {
-+	    if ( errno == ENOENT )
-+		(void) printf( "\
-+Some part of the path %s does not exist.\n\
-+This is probably a configuration error.\n", linkname );
-+	    else
-+		perror( linkname );
-+	    exit( 1 );
-+	    }
-+	(void) printf( "Created symbolic link %s\n", linkname );
-+	}
-+    else
-+	{
-+	/* The link already exists.  Well, check that it is in
-+	** fact a link.
-+	*/
-+	if ( ! S_ISLNK( sb.st_mode ) )
-+	    {
-+	    (void) printf( "\
-+%s already exists but is not a\n\
-+symbolic link!  Perhaps you have a real web subdirectory in your\n\
-+home dir from a previous web server configuration?  You may have\n\
-+to rename it, run %s again, and then copy in the old\n\
-+contents.\n", linkname, argv0 );
-+	    exit( 1 );
-+	    }
-+	/* Check the existing link's contents. */
-+	if ( readlink( linkname, linkbuf, sizeof(linkbuf) ) < 0 )
-+	    {
-+	    perror( linkname );
-+	    exit( 1 );
-+	    }
-+	if ( strcmp( dirname, linkbuf ) == 0 )
-+	    (void) printf( "Symbolic link %s already existed.\n", linkname );
-+	else
-+	    {
-+	    (void) printf( "\
-+Symbolic link %s already existed\n\
-+but it points to the wrong place!  Attempting to remove and\n\
-+recreate it.\n", linkname );
-+	    if ( unlink( linkname ) < 0 )
-+		{
-+		perror( linkname );
-+		exit( 1 );
-+		}
-+	    goto try_link_again;
-+	    }
-+	}
-+#endif /* TILDE_MAP_2 */
-+
-+    exit( 0 );
-+    }
 diff -Naupr thttpd-2.25b.orig/thttpd.8 thttpd-2.25b/thttpd.8
 --- thttpd-2.25b.orig/thttpd.8	2005-06-29 19:50:56.000000000 +0200
 +++ thttpd-2.25b/thttpd.8	2008-09-25 10:43:13.000000000 +0200
@@ -554,603 +294,3 @@
  .SH THANKS
  .PP
  Many thanks to contributors, reviewers, testers:
-diff -Naupr thttpd-2.25b.orig/thttpd.8.orig thttpd-2.25b/thttpd.8.orig
---- thttpd-2.25b.orig/thttpd.8.orig	1970-01-01 01:00:00.000000000 +0100
-+++ thttpd-2.25b/thttpd.8.orig	2005-06-29 19:50:56.000000000 +0200
-@@ -0,0 +1,596 @@
-+.TH thttpd 8 "29 February 2000"
-+.SH NAME
-+thttpd - tiny/turbo/throttling HTTP server
-+.SH SYNOPSIS
-+.B thttpd
-+.RB [ -C
-+.IR configfile ]
-+.RB [ -p
-+.IR port ]
-+.RB [ -d
-+.IR dir ]
-+.RB [ -dd
-+.IR data_dir ]
-+.RB [ -r | -nor ]
-+.RB [ -s | -nos ]
-+.RB [ -v | -nov ]
-+.RB [ -g | -nog ]
-+.RB [ -u
-+.IR user ]
-+.RB [ -c
-+.IR cgipat ]
-+.RB [ -t
-+.IR throttles ]
-+.RB [ -h
-+.IR host ]
-+.RB [ -l
-+.IR logfile ]
-+.RB [ -i
-+.IR pidfile ]
-+.RB [ -T
-+.IR charset ]
-+.RB [ -P
-+.IR P3P ]
-+.RB [ -M
-+.IR maxage ]
-+.RB [ -V ]
-+.RB [ -D ]
-+.SH DESCRIPTION
-+.PP
-+.I thttpd
-+is a simple, small, fast, and secure HTTP server.
-+It doesn't have a lot of special features, but it suffices for most uses of
-+the web, it's about as fast as the best full-featured servers (Apache, NCSA,
-+Netscape),
-+and it has one extremely useful feature (URL-traffic-based throttling)
-+that no other server currently has.
-+.SH OPTIONS
-+.TP
-+.B -C
-+Specifies a config-file to read.
-+All options can be set either by command-line flags or in the config file.
-+See below for details.
-+.TP
-+.B -p
-+Specifies an alternate port number to listen on.
-+The default is 80.
-+The config-file option name for this flag is "port",
-+and the config.h option is DEFAULT_PORT.
-+.TP
-+.B -d
-+Specifies a directory to chdir() to at startup.
-+This is merely a convenience - you could just as easily
-+do a cd in the shell script that invokes the program.
-+The config-file option name for this flag is "dir",
-+and the config.h options are WEBDIR, USE_USER_DIR.
-+.TP
-+.B -r
-+Do a chroot() at initialization time, restricting file access
-+to the program's current directory.
-+If -r is the compiled-in default, then -nor disables it.
-+See below for details.
-+The config-file option names for this flag are "chroot" and "nochroot",
-+and the config.h option is ALWAYS_CHROOT.
-+.TP
-+.B -dd
-+Specifies a directory to chdir() to after chrooting.
-+If you're not chrooting, you might as well do a single chdir() with
-+the -d flag.
-+If you are chrooting, this lets you put the web files in a subdirectory
-+of the chroot tree, instead of in the top level mixed in with the
-+chroot files.
-+The config-file option name for this flag is "data_dir".
-+.TP
-+.B -nos
-+Don't do explicit symbolic link checking.
-+Normally, thttpd explicitly expands any symbolic links in filenames,
-+to check that the resulting path stays within the original document tree.
-+If you want to turn off this check and save some CPU time, you can use
-+the -nos flag, however this is not recommended.
-+Note, though, that if you are using the chroot option, the symlink
-+checking is unnecessary and is turned off, so the safe way to save
-+those CPU cycles is to use chroot.
-+The config-file option names for this flag are "symlinkcheck" and "nosymlinkcheck".
-+.TP
-+.B -v
-+Do el-cheapo virtual hosting.
-+If -v is the compiled-in default, then -nov disables it.
-+See below for details.
-+The config-file option names for this flag are "vhost" and "novhost",
-+and the config.h option is ALWAYS_VHOST.
-+.TP
-+.B -g
-+Use a global passwd file.
-+This means that every file in the entire document tree is protected by
-+the single .htpasswd file at the top of the tree.
-+Otherwise the semantics of the .htpasswd file are the same.
-+If this option is set but there is no .htpasswd file in
-+the top-level directory, then thttpd proceeds as if the option was
-+not set - first looking for a local .htpasswd file, and if that doesn't
-+exist either then serving the file without any password.
-+If -g is the compiled-in default, then -nog disables it.
-+The config-file option names for this flag are "globalpasswd" and
-+"noglobalpasswd",
-+and the config.h option is ALWAYS_GLOBAL_PASSWD.
-+.TP
-+.B -u
-+Specifies what user to switch to after initialization when started as root.
-+The default is "nobody".
-+The config-file option name for this flag is "user",
-+and the config.h option is DEFAULT_USER.
-+.TP
-+.B -c
-+Specifies a wildcard pattern for CGI programs, for instance "**.cgi"
-+or "/cgi-bin/*".
-+See below for details.
-+The config-file option name for this flag is "cgipat",
-+and the config.h option is CGI_PATTERN.
-+.TP
-+.B -t
-+Specifies a file of throttle settings.
-+See below for details.
-+The config-file option name for this flag is "throttles".
-+.TP
-+.B -h
-+Specifies a hostname to bind to, for multihoming.
-+The default is to bind to all hostnames supported on the local machine.
-+See below for details.
-+The config-file option name for this flag is "host",
-+and the config.h option is SERVER_NAME.
-+.TP
-+.B -l
-+Specifies a file for logging.
-+If no -l argument is specified, thttpd logs via syslog().
-+If "-l /dev/null" is specified, thttpd doesn't log at all.
-+The config-file option name for this flag is "logfile".
-+.TP
-+.B -i
-+Specifies a file to write the process-id to.
-+If no file is specified, no process-id is written.
-+You can use this file to send signals to thttpd.
-+See below for details.
-+The config-file option name for this flag is "pidfile".
-+.TP
-+.B -T
-+Specifies the character set to use with text MIME types.
-+The default is iso-8859-1.
-+The config-file option name for this flag is "charset",
-+and the config.h option is DEFAULT_CHARSET.
-+.TP
-+.B -P
-+Specifies a P3P server privacy header to be returned with all responses.
-+See http://www.w3.org/P3P/ for details.
-+Thttpd doesn't do anything at all with the string except put it in the
-+P3P: response header.
-+The config-file option name for this flag is "p3p".
-+.TP
-+.B -M
-+Specifies the number of seconds to be used in a "Cache-Control: max-age"
-+header to be returned with all responses.
-+An equivalent "Expires" header is also generated.
-+The default is no Cache-Control or Expires headers,
-+which is just fine for most sites.
-+The config-file option name for this flag is "max_age".
-+.TP
-+.B -V
-+Shows the current version info.
-+.TP
-+.B -D
-+This was originally just a debugging flag, however it's worth mentioning
-+because one of the things it does is prevent thttpd from making itself
-+a background daemon.
-+Instead it runs in the foreground like a regular program.
-+This is necessary when you want to run thttpd wrapped in a little shell
-+script that restarts it if it exits.
-+.SH "CONFIG-FILE"
-+.PP
-+All the command-line options can also be set in a config file.
-+One advantage of using a config file is that the file can be changed,
-+and thttpd will pick up the changes with a restart.
-+.PP
-+The syntax of the config file is simple, a series of "option" or
-+"option=value" separated by whitespace.
-+The option names are listed above with their corresponding command-line flags.
-+.SH "CHROOT"
-+.PP
-+chroot() is a system call that restricts the program's view
-+of the filesystem to the current directory and directories
-+below it.
-+It becomes impossible for remote users to access any file
-+outside of the initial directory.
-+The restriction is inherited by child processes, so CGI programs get it too.
-+This is a very strong security measure, and is recommended.
-+The only downside is that only root can call chroot(), so this means
-+the program must be started as root.
-+However, the last thing it does during initialization is to
-+give up root access by becoming another user, so this is safe.
-+.PP
-+The program can also be compile-time configured to always
-+do a chroot(), without needing the -r flag.
-+.PP
-+Note that with some other web servers, such as NCSA httpd, setting
-+up a directory tree for use with chroot() is complicated, involving
-+creating a bunch of special directories and copying in various files.
-+With thttpd it's a lot easier, all you have to do is make sure
-+any shells, utilities, and config files used by your CGI programs and
-+scripts are available.
-+If you have CGI disabled, or if you make a policy that all CGI programs
-+must be written in a compiled language such as C and statically linked,
-+then you probably don't have to do any setup at all.
-+.PP
-+However, one thing you should do is tell syslogd about the chroot tree,
-+so that thttpd can still generate syslog messages.
-+Check your system's syslodg man page for how to do this.
-+In FreeBSD you would put something like this in /etc/rc.conf:
-+.nf
-+    syslogd_flags="-l /usr/local/www/data/dev/log"
-+.fi
-+Substitute in your own chroot tree's pathname, of course.
-+Don't worry about creating the log socket, syslogd wants to do that itself.
-+(You may need to create the dev directory.)
-+In Linux the flag is -a instead of -l, and there may be other differences.
-+.PP
-+Relevant config.h option: ALWAYS_CHROOT.
-+.SH "CGI"
-+.PP
-+thttpd supports the CGI 1.1 spec.
-+.PP
-+In order for a CGI program to be run, its name must match the pattern
-+specified either at compile time or on the command line with the -c flag.
-+This is a simple shell-style filename pattern.
-+You can use * to match any string not including a slash,
-+or ** to match any string including slashes,
-+or ? to match any single character.
-+You can also use multiple such patterns separated by |.
-+The patterns get checked against the filename
-+part of the incoming URL.
-+Don't forget to quote any wildcard characters so that the shell doesn't
-+mess with them.
-+.PP
-+Restricting CGI programs to a single directory lets the site administrator
-+review them for security holes, and is strongly recommended.
-+If there are individual users that you trust, you can enable their
-+directories too.
-+.PP
-+If no CGI pattern is specified, neither here nor at compile time,
-+then CGI programs cannot be run at all.
-+If you want to disable CGI as a security measure, that's how you do it, just
-+comment out the patterns in the config file and don't run with the -c flag.
-+.PP
-+Note: the current working directory when a CGI program gets run is
-+the directory that the CGI program lives in.
-+This isn't in the CGI 1.1 spec, but it's what most other HTTP servers do.
-+.PP
-+Relevant config.h options: CGI_PATTERN, CGI_TIMELIMIT, CGI_NICE, CGI_PATH, CGI_LD_LIBRARY_PATH, CGIBINDIR.
-+.SH "BASIC AUTHENTICATION"
-+.PP
-+Basic Authentication is available as an option at compile time.
-+If enabled, it uses a password file in the directory to be protected,
-+called .htpasswd by default.
-+This file is formatted as the familiar colon-separated
-+username/encrypted-password pair, records delimited by newlines.
-+The protection does not carry over to subdirectories.
-+The utility program htpasswd(1) is included to help create and
-+modify .htpasswd files.
-+.PP
-+Relevant config.h option: AUTH_FILE
-+.SH "THROTTLING"
-+.PP
-+The throttle file lets you set maximum byte rates on URLs or URL groups.
-+You can optionally set a minimum rate too.
-+The format of the throttle file is very simple.
-+A # starts a comment, and the rest of the line is ignored.
-+Blank lines are ignored.
-+The rest of the lines should consist of a pattern, whitespace, and a number.
-+The pattern is a simple shell-style filename pattern, using ?/**/*, or
-+multiple such patterns separated by |.
-+.PP
-+The numbers in the file are byte rates, specified in units of bytes per second.
-+For comparison, a v.90 modem gives about 5000 B/s depending on compression,
-+a double-B-channel ISDN line about 12800 B/s, and a T1 line is about
-+150000 B/s.
-+If you want to set a minimum rate as well, use number-number.
-+.PP
-+Example:
-+.nf
-+  # throttle file for www.acme.com
-+
-+  **              2000-100000  # limit total web usage to 2/3 of our T1,
-+                               # but never go below 2000 B/s
-+  **.jpg|**.gif   50000   # limit images to 1/3 of our T1
-+  **.mpg          20000   # and movies to even less
-+  jef/**          20000   # jef's pages are too popular
-+.fi
-+.PP
-+Throttling is implemented by checking each incoming URL filename against all
-+of the patterns in the throttle file.
-+The server accumulates statistics on how much bandwidth each pattern
-+has accounted for recently (via a rolling average).
-+If a URL matches a pattern that has been exceeding its specified limit,
-+then the data returned is actually slowed down, with
-+pauses between each block.
-+If that's not possible (e.g. for CGI programs) or if the bandwidth has gotten
-+way larger than the limit, then the server returns a special code
-+saying 'try again later'.
-+.PP
-+The minimum rates are implemented similarly.
-+If too many people are trying to fetch something at the same time,
-+throttling may slow down each connection so much that it's not really
-+useable.
-+Furthermore, all those slow connections clog up the server, using
-+up file handles and connection slots.
-+Setting a minimum rate says that past a certain point you should not
-+even bother - the server returns the 'try again later" code and the
-+connection isn't even started.
-+.PP
-+There is no provision for setting a maximum connections/second throttle,
-+because throttling a request uses as much cpu as handling it, so
-+there would be no point.
-+There is also no provision for throttling the number of simultaneous
-+connections on a per-URL basis.
-+However you can control the overall number of connections for the whole
-+server very simply, by setting the operating system's per-process file
-+descriptor limit before starting thttpd.
-+Be sure to set the hard limit, not the soft limit.
-+.SH "MULTIHOMING"
-+.PP
-+Multihoming means using one machine to serve multiple hostnames.
-+For instance, if you're an internet provider and you want to let
-+all of your customers have customized web addresses, you might
-+have www.joe.acme.com, www.jane.acme.com, and your own www.acme.com,
-+all running on the same physical hardware.
-+This feature is also known as "virtual hosts".
-+There are three steps to setting this up.
-+.PP
-+One, make DNS entries for all of the hostnames.
-+The current way to do this, allowed by HTTP/1.1, is to use CNAME aliases,
-+like so:
-+.nf
-+  www.acme.com IN A 192.100.66.1
-+  www.joe.acme.com IN CNAME www.acme.com
-+  www.jane.acme.com IN CNAME www.acme.com
-+.fi
-+However, this is incompatible with older HTTP/1.0 browsers.
-+If you want to stay compatible, there's a different way - use A records
-+instead, each with a different IP address, like so:
-+.nf
-+  www.acme.com IN A 192.100.66.1
-+  www.joe.acme.com IN A 192.100.66.200
-+  www.jane.acme.com IN A 192.100.66.201
-+.fi
-+This is bad because it uses extra IP addresses, a somewhat scarce resource.
-+But if you want people with older browsers to be able to visit your
-+sites, you still have to do it this way.
-+.PP
-+Step two.
-+If you're using the modern CNAME method of multihoming, then you can
-+skip this step.
-+Otherwise, using the older multiple-IP-address method you
-+must set up IP aliases or multiple interfaces for the extra addresses.
-+You can use ifconfig(8)'s alias command to tell the machine to answer to
-+all of the different IP addresses.
-+Example:
-+.nf
-+  ifconfig le0 www.acme.com
-+  ifconfig le0 www.joe.acme.com alias
-+  ifconfig le0 www.jane.acme.com alias
-+.fi
-+If your OS's version of ifconfig doesn't have an alias command, you're
-+probably out of luck (but see http://www.acme.com/software/thttpd/notes.html).
-+.PP
-+Third and last, you must set up thttpd to handle the multiple hosts.
-+The easiest way is with the -v flag, or the ALWAYS_VHOST config.h option.
-+This works with either CNAME multihosting or multiple-IP multihosting.
-+What it does is send each incoming request to a subdirectory based on the
-+hostname it's intended for.
-+All you have to do in order to set things up is to create those subdirectories
-+in the directory where thttpd will run.
-+With the example above, you'd do like so:
-+.nf
-+  mkdir www.acme.com www.joe.acme.com www.jane.acme.com
-+.fi
-+If you're using old-style multiple-IP multihosting, you should also create
-+symbolic links from the numeric addresses to the names, like so:
-+.nf
-+  ln -s www.acme.com 192.100.66.1
-+  ln -s www.joe.acme.com 192.100.66.200
-+  ln -s www.jane.acme.com 192.100.66.201
-+.fi
-+This lets the older HTTP/1.0 browsers find the right subdirectory.
-+.PP
-+There's an optional alternate step three if you're using multiple-IP
-+multihosting: run a separate thttpd process for each hostname, using
-+the -h flag to specify which one is which.
-+This gives you more flexibility, since you can run each of these processes
-+in separate directories, with different throttle files, etc.
-+Example:
-+.nf
-+  thttpd -r -d /usr/www -h www.acme.com
-+  thttpd -r -d /usr/www/joe -u joe -h www.joe.acme.com
-+  thttpd -r -d /usr/www/jane -u jane -h www.jane.acme.com
-+.fi
-+But remember, this multiple-process method does not work with CNAME
-+multihosting - for that, you must use a single thttpd process with
-+the -v flag.
-+.SH "CUSTOM ERRORS"
-+.PP
-+thttpd lets you define your own custom error pages for the various
-+HTTP errors.
-+There's a separate file for each error number, all stored in one
-+special directory.
-+The directory name is "errors", at the top of the web directory tree.
-+The error files should be named "errNNN.html", where NNN is the error number.
-+So for example, to make a custom error page for the authentication failure
-+error, which is number 401, you would put your HTML into the file
-+"errors/err401.html".
-+If no custom error file is found for a given error number, then the
-+usual built-in error page is generated.
-+.PP
-+If you're using the virtual hosts option, you can also have different
-+custom error pages for each different virtual host.
-+In this case you put another "errors" directory in the top of that
-+virtual host's web tree.
-+thttpd will look first in the virtual host errors directory, and
-+then in the server-wide errors directory, and if neither of those
-+has an appropriate error file then it will generate the built-in error.
-+.SH "NON-LOCAL REFERERS"
-+.PP
-+Sometimes another site on the net will embed your image files in their
-+HTML files, which basically means they're stealing your bandwidth.
-+You can prevent them from doing this by using non-local referer filtering.
-+With this option, certain files can only be fetched via a local referer.
-+The files have to be referenced by a local web page.
-+If a web page on some other site references the files, that fetch will
-+be blocked.
-+There are three config-file variables for this feature:
-+.TP
-+.B urlpat
-+A wildcard pattern for the URLs that should require a local referer.
-+This is typically just image files, sound files, and so on.
-+For example:
-+.nf
-+  urlpat=**.jpg|**.gif|**.au|**.wav
-+.fi
-+For most sites, that one setting is all you need to enable referer filtering.
-+.TP
-+.B noemptyreferers
-+By default, requests with no referer at all, or a null referer, or a
-+referer with no apparent hostname, are allowed.
-+With this variable set, such requests are disallowed.
-+.TP
-+.B localpat
-+A wildcard pattern that specifies the local host or hosts.
-+This is used to determine if the host in the referer is local or not.
-+If not specified it defaults to the actual local hostname.
-+.SH SYMLINKS
-+.PP
-+thttpd is very picky about symbolic links.
-+Before delivering any file, it first checks each element in the path
-+to see if it's a symbolic link, and expands them all out to get the final
-+actual filename.
-+Along the way it checks for things like links with ".." that go above
-+the server's directory, and absolute symlinks (ones that start with a /).
-+These are prohibited as security holes, so the server returns an
-+error page for them.
-+This means you can't set up your web directory with a bunch of symlinks
-+pointing to individual users' home web directories.
-+Instead you do it the other way around - the user web directories are
-+real subdirs of the main web directory, and in each user's home
-+dir there's a symlink pointing to their actual web dir.
-+.PP
-+The CGI pattern is also affected - it gets matched against the fully-expanded
-+filename.  So, if you have a single CGI directory but then put a symbolic
-+link in it pointing somewhere else, that won't work.  The CGI program will be
-+treated as a regular file and returned to the client, instead of getting run.
-+This could be confusing.
-+.SH PERMISSIONS
-+.PP
-+thttpd is also picky about file permissions.
-+It wants data files (HTML, images) to be world readable.
-+Readable by the group that the thttpd process runs as is not enough - thttpd
-+checks explicitly for the world-readable bit.
-+This is so that no one ever gets surprised by a file that's not set
-+world-readable and yet somehow is readable by the HTTP server and
-+therefore the *whole* world.
-+.PP
-+The same logic applies to directories.
-+As with the standard Unix "ls" program, thttpd will only let you
-+look at the contents of a directory if its read bit is on; but
-+as with data files, this must be the world-read bit, not just the
-+group-read bit.
-+.PP
-+thttpd also wants the execute bit to be *off* for data files.
-+A file that is marked executable but doesn't match the CGI pattern
-+might be a script or program that got accidentally left in the
-+wrong directory.
-+Allowing people to fetch the contents of the file might be a security breach,
-+so this is prohibited.
-+Of course if an executable file *does* match the CGI pattern, then it
-+just gets run as a CGI.
-+.PP
-+In summary, data files should be mode 644 (rw-r--r--),
-+directories should be 755 (rwxr-xr-x) if you want to allow indexing and
-+711 (rwx--x--x) to disallow it, and CGI programs should be mode
-+755 (rwxr-xr-x) or 711 (rwx--x--x).
-+.SH LOGS
-+.PP
-+thttpd does all of its logging via syslog(3).
-+The facility it uses is configurable.
-+Aside from error messages, there are only a few log entry types of interest,
-+all fairly similar to CERN Common Log Format:
-+.nf
-+  Aug  6 15:40:34 acme thttpd[583]: 165.113.207.103 - - "GET /file" 200 357
-+  Aug  6 15:40:43 acme thttpd[583]: 165.113.207.103 - - "HEAD /file" 200 0
-+  Aug  6 15:41:16 acme thttpd[583]: referer http://www.acme.com/ -> /dir
-+  Aug  6 15:41:16 acme thttpd[583]: user-agent Mozilla/1.1N
-+.fi
-+The package includes a script for translating these log entries info
-+CERN-compatible files.
-+Note that thttpd does not translate numeric IP addresses into domain names.
-+This is both to save time and as a minor security measure (the numeric
-+address is harder to spoof).
-+.PP
-+Relevant config.h option: LOG_FACILITY.
-+.PP
-+If you'd rather log directly to a file, you can use the -l command-line
-+flag.  But note that error messages still go to syslog.
-+.SH SIGNALS
-+.PP
-+thttpd handles a couple of signals, which you can send via the
-+standard Unix kill(1) command:
-+.TP
-+.B INT,TERM
-+These signals tell thttpd to shut down immediately.
-+Any requests in progress get aborted.
-+.TP
-+.B USR1
-+This signal tells thttpd to shut down as soon as it's done servicing
-+all current requests.
-+In addition, the network socket it uses to accept new connections gets
-+closed immediately, which means a fresh thttpd can be started up
-+immediately.
-+.TP
-+.B USR2
-+This signal tells thttpd to generate the statistics syslog messages
-+immediately, instead of waiting for the regular hourly update.
-+.TP
-+.B HUP
-+This signal tells thttpd to close and re-open its (non-syslog) log file,
-+for instance if you rotated the logs and want it to start using the
-+new one.
-+This is a little tricky to set up correctly, for instance if you are using
-+chroot() then the log file must be within the chroot tree, but it's
-+definitely doable.
-+.SH "SEE ALSO"
-+redirect(8), ssi(8), makeweb(1), htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
-+.SH THANKS
-+.PP
-+Many thanks to contributors, reviewers, testers:
-+John LoVerso, Jordan Hayes, Chris Torek, Jim Thompson, Barton Schaffer,
-+Geoff Adams, Dan Kegel, John Hascall, Bennett Todd, KIKUCHI Takahiro,
-+Catalin Ionescu.
-+Special thanks to Craig Leres for substantial debugging and development,
-+and for not complaining about my coding style very much.
-+.SH AUTHOR
-+Copyright ? 1995,1998,1999,2000 by Jef Poskanzer <jef at mail.acme.com>.
-+All rights reserved.
-+.\" Redistribution and use in source and binary forms, with or without
-+.\" modification, are permitted provided that the following conditions
-+.\" are met:
-+.\" 1. Redistributions of source code must retain the above copyright
-+.\"    notice, this list of conditions and the following disclaimer.
-+.\" 2. Redistributions in binary form must reproduce the above copyright
-+.\"    notice, this list of conditions and the following disclaimer in the
-+.\"    documentation and/or other materials provided with the distribution.
-+.\"
-+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+.\" SUCH DAMAGE.


Index: thttpd.init
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thttpd.init	19 Jun 2007 17:55:02 -0000	1.3
+++ thttpd.init	10 Apr 2009 12:57:50 -0000	1.4
@@ -11,6 +11,15 @@
 # pidfile: /var/run/thttpd.pid
 # config: /etc/thttpd.conf
 
+### BEGIN INIT INFO
+# Provides: httpd
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network $named
+# Short-Description: start and stop thttpd HTTP Server
+# Description: This tiny/turbo/throttling HTTP server is used to serve
+#              web content.
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 


Index: thttpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thttpd.logrotate	9 Nov 2004 02:50:57 -0000	1.1
+++ thttpd.logrotate	10 Apr 2009 12:57:50 -0000	1.2
@@ -3,6 +3,7 @@
     missingok
     notifempty
     postrotate
+        # For some reason, the documented -HUP doesn't work
         /sbin/service thttpd condrestart >/dev/null
     endscript
 }


Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- thttpd.spec	25 Feb 2009 20:28:48 -0000	1.19
+++ thttpd.spec	10 Apr 2009 12:57:50 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
@@ -30,7 +30,8 @@
 provided for.  Advanced features include the ability to throttle traffic.
 
 Available rpmbuild rebuild options :
---with : indexes showversion expliciterrors
+--with : showversion expliciterrors makeweb
+--without : indexes
 
 
 %prep
@@ -48,12 +49,13 @@
 %configure
 # Hacks :-)
 %{__perl} -pi -e 's/-o bin -g bin//g' Makefile
+%{__perl} -pi -e 's/-m 444/-m 644/g; s/-m 555/-m 755/g' Makefile
 %{__perl} -pi -e 's/.*chgrp.*//g; s/.*chmod.*//g' extras/Makefile
 # Config changes
-%{!?_with_indexes:        %{__perl} -pi -e 's/#define GENERATE_INDEXES/#undef GENERATE_INDEXES/g' config.h}
+%{?_without_indexes:      %{__perl} -pi -e 's/#define GENERATE_INDEXES/#undef GENERATE_INDEXES/g' config.h}
 %{!?_with_showversion:    %{__perl} -pi -e 's/#define SHOW_SERVER_VERSION/#undef SHOW_SERVER_VERSION/g' config.h}
 %{!?_with_expliciterrors: %{__perl} -pi -e 's/#define EXPLICIT_ERROR_PAGES/#undef EXPLICIT_ERROR_PAGES/g' config.h}
-%{__make} %{?_smp_mflags} WEBDIR=%{webroot}/html CGIBINDIR=%{webroot}/cgi-bin \
+%{__make} %{?_smp_mflags} WEBDIR=%{webroot} STATICFLAG="" \
     CCOPT="%{optflags} -D_FILE_OFFSET_BITS=64"
 
 
@@ -61,7 +63,7 @@
 %{__rm} -rf %{buildroot}
 
 # Prepare required directories
-%{__mkdir_p} %{buildroot}%{webroot}/{cgi-bin,html,logs}
+%{__mkdir_p} %{buildroot}%{webroot}
 %{__mkdir_p} %{buildroot}%{_mandir}/man{1,8}
 %{__mkdir_p} %{buildroot}%{_sbindir}
 
@@ -72,8 +74,7 @@
 # Main install
 %{__make} install BINDIR=%{buildroot}%{_sbindir} \
     MANDIR=%{buildroot}%{_mandir} \
-    WEBDIR=%{buildroot}%{webroot}/html \
-    CGIBINDIR=%{buildroot}%{webroot}/cgi-bin
+    WEBDIR=%{buildroot}%{webroot}
 
 # Rename htpasswd in case apache is installed too
 %{__mkdir_p} %{buildroot}%{_bindir}
@@ -84,17 +85,17 @@
 
 # Install the default index.html and related files
 %{__install} -pm 0644 %{SOURCE10} %{SOURCE11} \
-    %{buildroot}%{webroot}/html/
+    %{buildroot}%{webroot}/
 
 # Symlink for the powered-by-$DISTRO image
 %{__ln_s} %{_datadir}/pixmaps/poweredby.png \
-    %{buildroot}%{webroot}/html/poweredby.png
+    %{buildroot}%{webroot}/poweredby.png
 
 # Install a default configuration file
 %{__cat} << EOF > %{buildroot}%{_sysconfdir}/thttpd.conf
 # BEWARE : No empty lines are allowed!
 # This section overrides defaults
-dir=%{webroot}/html
+dir=%{webroot}
 chroot
 user=thttpd         # default = nobody
 logfile=/var/log/thttpd.log
@@ -143,23 +144,42 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/thttpd
 %config(noreplace) %{_sysconfdir}/thttpd.conf
 %{_bindir}/thtpasswd
+%if 0%{?_with_makeweb:1}
 %attr(2755,root,www) %{_sbindir}/makeweb
+%{_mandir}/man1/makeweb.1*
+%else
+%exclude %{_sbindir}/makeweb
+%exclude %{_mandir}/man1/makeweb.1*
+%endif
 %{_sbindir}/syslogtocern
 %{_sbindir}/thttpd
-%attr(2775,thttpd,www) %dir %{webroot}/
-%attr(2775,thttpd,www) %dir %{webroot}/cgi-bin/
+%{webroot}/
 # We don't want those default cgi-bin programs
-%exclude %{webroot}/cgi-bin/*
-%attr(2775,thttpd,www) %dir %{webroot}/html/
-%attr(2664,thttpd,www) %{webroot}/html/*
-%attr(2775,thttpd,www) %dir %{webroot}/logs/
-%{_mandir}/man?/*
+%exclude %{webroot}/cgi-bin/
+%{_mandir}/man1/thtpasswd.1*
+%{_mandir}/man8/syslogtocern.8*
+%{_mandir}/man8/thttpd.8*
+# Also exclude cgi-bin man pages
+%exclude %{_mandir}/man8/redirect.8*
+%exclude %{_mandir}/man8/ssi.8*
 # Hack to own parent directory for the default "webroot". Remove if needed.
 %dir /var/www
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25b-19
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 2.25b-20
+- Fix thttpd-2.25b-CVE-2005-3124.patch (#483733).
+- Remove unwanted .orig files from patches (#484205).
+- Don't ship useless man pages (#484205).
+- Reorganize all of the webroot files under /var/www/thttpd, remove cgi-bin
+  by default, remove useless log directory.
+- Have makeweb be conditional and disabled by default.
+- Fix thttpd mode from 555 to 755.
+- Add new init block to the init script (commands and exit status need work).
+- Re-enable indexes by default, it's possible to turn them off with dir modes.
+- Don't build htpasswd as static.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Dec  2 2008 Matthias Saou <http://freshrpms.net/> 2.25b-18



From roma at fedoraproject.org  Fri Apr 10 12:59:54 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Fri, 10 Apr 2009 12:59:54 +0000 (UTC)
Subject: rpms/bashdb/devel bashdb.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410125954.7F6B270122@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/bashdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26907/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bashdb.spec import.log 
Log Message:
Initial spec file for F11.



--- NEW FILE bashdb.spec ---
%bcond_with tests
%define rversion 4.0-0.3

Name:           bashdb
Summary:        BASH debugger, the BASH symbolic debugger
Version:        4.0_0.3
Release:        2%{?dist}
License:        GPLv2+
Group:          Development/Debuggers
Url:            http://bashdb.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{rversion}.tar.bz2
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  bash
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires:       bash
BuildArch:      noarch

%description
The Bash Debugger Project is a source-code debugger for bash,
which follows the gdb command syntax. 
The purpose of the BASH debugger is to check
what is going on ???inside??? a bash script, while it executes:
    * Start a script, specifying conditions that might affect its behavior.
    * Stop a script at certain conditions (break points).
    * Examine the state of a script.
    * Experiment, by changing variable values on the fly.
The 4.0 series is a complete rewrite of the previous series.
Bashdb can be used with ddd: ddd --debugger %{_bindir}/%{name} <script-name>.

%package -n emacs-bashdb
Summary:        Bashdb support for Emacs
Group:          Development/Debuggers
BuildRequires:  emacs emacs-common emacs-el >= 21
Requires:       bashdb = %{version}-%{release}
Requires:       emacs >= 21

%description -n emacs-bashdb
Bashdb support for Emacs.

%prep
%setup -q -n %{name}-%{rversion}

%build
%configure
make

%install
rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}
rm -f "%{buildroot}%{_infodir}/dir"

%if %{with tests}
%check
make check
%endif

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :

%postun
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf %{buildroot}

%files -n emacs-bashdb
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/%{name}.*

%files
%defattr(-,root,root,-)
%doc doc/*.html AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_infodir}/%{name}.info*

%changelog
* Fri Apr 10 2009 Paulo Roma <roma at lcg.ufrj.br> 4.0_0.3-2
- Updated to 4.0-0.3 for supporting bash 4.0
- Added building option "with tests".

* Wed Feb 25 2009 Paulo Roma <roma at lcg.ufrj.br> 4.0_0.2-1
- Completely rewritten for Fedora.

* Tue Nov 18 2008 Manfred Tremmel <Manfred.Tremmel at iiv.de>
- update to 4.0-0.2



--- NEW FILE import.log ---
bashdb-4_0_0_3-2_fc10:HEAD:bashdb-4.0_0.3-2.fc10.src.rpm:1239368322


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bashdb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2009 00:30:05 -0000	1.1
+++ .cvsignore	10 Apr 2009 12:59:23 -0000	1.2
@@ -0,0 +1 @@
+bashdb-4.0-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bashdb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2009 00:30:05 -0000	1.1
+++ sources	10 Apr 2009 12:59:24 -0000	1.2
@@ -0,0 +1 @@
+720b7d4cd55c2a2010c6a2de59565f42  bashdb-4.0-0.3.tar.bz2



From sdz at fedoraproject.org  Fri Apr 10 13:06:58 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 10 Apr 2009 13:06:58 +0000 (UTC)
Subject: rpms/avogadro/devel .cvsignore, 1.5, 1.6 avogadro.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090410130658.E1DA970122@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29070

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Mar 2009 22:32:31 -0000	1.5
+++ .cvsignore	10 Apr 2009 13:06:28 -0000	1.6
@@ -1 +1 @@
-avogadro-0.9.2.tar.bz2
+avogadro-0.9.3.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avogadro.spec	21 Mar 2009 13:12:56 -0000	1.6
+++ avogadro.spec	10 Apr 2009 13:06:28 -0000	1.7
@@ -2,15 +2,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
@@ -54,7 +53,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -108,6 +106,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Dziallas <sebastian at when.com> 0.9.3-1
+- update to new release
+
 * Sat Mar 21 2009 Sebastian Dziallas <sebastian at when.com> 0.9.2-2
 - get desktop file properly installed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Mar 2009 22:32:31 -0000	1.5
+++ sources	10 Apr 2009 13:06:28 -0000	1.6
@@ -1 +1 @@
-f330fa6d06346ccfee0f28bb61bd0fd7  avogadro-0.9.2.tar.bz2
+94339f092199853062f8b180e3b79e49  avogadro-0.9.3.tar.bz2



From sdz at fedoraproject.org  Fri Apr 10 13:07:34 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 10 Apr 2009 13:07:34 +0000 (UTC)
Subject: rpms/avogadro/F-10 .cvsignore, 1.5, 1.6 avogadro.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090410130734.7175770122@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29256

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Mar 2009 22:35:03 -0000	1.5
+++ .cvsignore	10 Apr 2009 13:07:04 -0000	1.6
@@ -1 +1 @@
-avogadro-0.9.2.tar.bz2
+avogadro-0.9.3.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-10/avogadro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avogadro.spec	21 Mar 2009 13:13:19 -0000	1.5
+++ avogadro.spec	10 Apr 2009 13:07:04 -0000	1.6
@@ -2,15 +2,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
@@ -54,7 +53,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -108,6 +106,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Dziallas <sebastian at when.com> 0.9.3-1
+- update to new release
+
 * Sat Mar 21 2009 Sebastian Dziallas <sebastian at when.com> 0.9.2-2
 - get desktop file properly installed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Mar 2009 22:35:03 -0000	1.5
+++ sources	10 Apr 2009 13:07:04 -0000	1.6
@@ -1 +1 @@
-f330fa6d06346ccfee0f28bb61bd0fd7  avogadro-0.9.2.tar.bz2
+94339f092199853062f8b180e3b79e49  avogadro-0.9.3.tar.bz2



From lucilanga at fedoraproject.org  Fri Apr 10 13:07:42 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 10 Apr 2009 13:07:42 +0000 (UTC)
Subject: rpms/alevt/F-10 alevt-1.6.2-rus-greek.patch, NONE,
	1.1 alevt-1.6.2-doublefont.patch, 1.1, 1.2 alevt.spec, 1.4, 1.5
Message-ID: <20090410130742.BFFF170122@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29627

Modified Files:
	alevt-1.6.2-doublefont.patch alevt.spec 
Added Files:
	alevt-1.6.2-rus-greek.patch 
Log Message:
* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
- updated doublefont patch

alevt-1.6.2-rus-greek.patch:

--- NEW FILE alevt-1.6.2-rus-greek.patch ---
diff -Nur alevt-1.6.2/alevt.1x.in alevt-1.6.2.rus+greek/alevt.1x.in
--- alevt-1.6.2/alevt.1x.in	2007-12-03 08:52:12.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt.1x.in	2009-04-10 06:59:25.000000000 +0400
@@ -62,7 +62,7 @@
 .BR \-bell / \-nobell
 Enables/disables the error bell.  Normally enabled.
 .TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian\||iso8859-7
 Selects the character set to use.  Characters not present
 in the selected set are replaced by similar looking symbols.
 (default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.1.in alevt-1.6.2.rus+greek/alevt-cap.1.in
--- alevt-1.6.2/alevt-cap.1.in	2007-12-03 09:05:59.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.1.in	2009-04-10 06:59:25.000000000 +0400
@@ -45,7 +45,7 @@
 the program terminates with exit status 1 after saving
 the already captured pages.  The default is to wait forever.
 .TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian
 Selects the character set to use.  Characters not present
 in the selected set are replaced by similar looking symbols.
 (default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.c alevt-1.6.2.rus+greek/alevt-cap.c
--- alevt-1.6.2/alevt-cap.c	2007-12-03 09:12:22.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.c	2009-04-10 07:02:48.000000000 +0400
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <locale.h>
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
@@ -33,16 +34,16 @@
     fprintf(fp, "\nUsage: %s [options] ppp[.ss]...\n", prgname);
     fprintf(fp,
 	    "\n"
-	    "  Valid options:\t\tDefault:\n"
+	    "  Valid options:\t\t\t\tDefault:\n"
 	    "    --help\n"
 	    "    --version\n"
-	    "    -vbi <vbidev>\t\t/dev/vbi0\n"
-	    "    -finetune <-4..4|auto>\t0\n"
-	    //"    -oldbttv\t\t\t(for bttv <0.5.20)\n"
-	    "    -charset latin-1/2\t\tlatin-1\n"
-	    "    -timeout <secs>\t\tnone\n"
-	    "    -name <filename>\t\tttext-%%s.%%e\n"
-	    "    -format <fmt[,options]>\tascii\n"
+	    "    -vbi <vbidev>\t\t\t\t/dev/vbi0\n"
+	    "    -finetune <-4..4|auto>\t\t\t0\n"
+	    //"    -oldbttv\t\t\t\t\t(for bttv <0.5.20)\n"
+	    "    -charset latin-1/latin-2/russian\t\tlatin-1\n"
+	    "    -timeout <secs>\t\t\t\tnone\n"
+	    "    -name <filename>\t\t\t\tttext-%%s.%%e\n"
+	    "    -format <fmt[,options]>\t\t\tascii\n"
 	    "    -format help\n"
 	    "\n"
 	    "  ppp[.ss] stands for a page number and an\n"
@@ -205,6 +206,7 @@
     struct req *req;
     struct dl_head reqs[2];	// simple linear lists of requests & captures
 
+    setlocale (LC_CTYPE, "");
     setprgname(argv[0]);
 
     fdset_init(fds);
@@ -247,8 +249,12 @@
 		    latin1 = 1;
 		else if (streq(arg, "latin-2") || streq(arg, "2"))
 		    latin1 = 0;
+		else if (streq(arg, "russian") || streq(arg, "rus"))
+		    latin1 = KOI8;
+		else if (streq(arg, "iso8859-7") || streq(arg, "el"))
+		    latin1 = GREEK;
 		else
-		    fatal("bad charset (not latin-1/2)");
+		    fatal("bad charset (not latin-1/2/russian/iso8859-7)");
 		break;
 	    case 10:	// format
 		if (streq(arg, "help") || streq(arg, "?") || streq(arg, "list"))
diff -Nur alevt-1.6.2/exp-gfx.c alevt-1.6.2.rus+greek/exp-gfx.c
--- alevt-1.6.2/exp-gfx.c	2007-12-03 05:56:06.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-gfx.c	2009-04-10 06:59:25.000000000 +0400
@@ -21,7 +21,7 @@
 	  int sep)
 {
   int x,y;
-  unsigned char* src= (latin1 ? font1_bits : font2_bits);
+  unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
   int dest_x=_x*CW;
   int dest_y=_y*CH;
       
diff -Nur alevt-1.6.2/exp-html.c alevt-1.6.2.rus+greek/exp-html.c
--- alevt-1.6.2/exp-html.c	2007-12-03 05:55:17.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-html.c	2009-04-10 06:59:25.000000000 +0400
@@ -111,12 +111,22 @@
     HTML_NL
 #ifndef STRIPPED_HTML
       fputs("<meta http-equiv=\"Content-Type\" content=\"text/html;",fp);
-    fprintf(fp,"charset=iso-8859-%d\">",(latin1 ? 1 : 2));
+    switch(latin1) {
+      case LATIN1: fprintf(fp,"charset=iso-8859-1\">"); break;
+      case LATIN2: fprintf(fp,"charset=iso-8859-2\">"); break;
+      case KOI8: fprintf(fp,"charset=koi8-r\">"); break;
+      case GREEK: fprintf(fp,"charset=iso-8859-7\">"); break;
+    }
     HTML_NL
       fputs("<meta name=\"GENERATOR\" content=\"alevt-cap\">",fp);
     HTML_NL
 #else
-      fprintf(fp,"<meta charset=\"iso-8859-%d\">",(latin1 ? 1 : 2));
+    switch(latin1) {
+      case LATIN1: fprintf(fp,"<meta charset=iso-8859-1\">"); break;
+      case LATIN2: fprintf(fp,"<meta charset=iso-8859-2\">"); break;
+      case KOI8: fprintf(fp,"<meta charset=koi8-r\">"); break;
+      case GREEK: fprintf(fp,"<meta charset=iso-8859-7\">"); break;
+    }
     HTML_NL
 #endif
       fputs("</head>",fp);
diff -Nur alevt-1.6.2/font.c alevt-1.6.2.rus+greek/font.c
--- alevt-1.6.2/font.c	1999-10-08 02:20:00.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.c	2009-04-10 06:59:25.000000000 +0400
@@ -1,3 +1,7 @@
 #define static /* I want them global */
 #include "font1.xbm"
 #include "font2.xbm"
+#include "font3.xbm"
+#include "font4.xbm"
+
+
diff -Nur alevt-1.6.2/font.h alevt-1.6.2.rus+greek/font.h
--- alevt-1.6.2/font.h	1999-10-08 02:24:02.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.h	2009-04-10 06:59:25.000000000 +0400
@@ -9,6 +9,8 @@
 
 extern unsigned char font1_bits[];
 extern unsigned char font2_bits[];
+extern unsigned char font3_bits[];
+extern unsigned char font4_bits[];
 
 #define font_width	font1_width
 #define font_height	font1_height
diff -Nur alevt-1.6.2/lang.c alevt-1.6.2.rus+greek/lang.c
--- alevt-1.6.2/lang.c	1999-07-18 19:23:48.000000000 +0400
+++ alevt-1.6.2.rus+greek/lang.c	2009-04-10 06:59:25.000000000 +0400
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <ctype.h>
 #include "misc.h"
 #include "vt.h"
 #include "lang.h"
@@ -145,22 +146,175 @@
 void
 conv2latin(u8 *p, int n, int lang)
 {
-    int c, gfx = 0;
+    int c, gfx = 0, lat=0;
 
+  if ((latin1 == KOI8) && lang==12) { /* russian */
+    while (n--) {
+      c=*p;
+
+      if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+       if ( is_koi(c)) {
+         if (not gfx || (c & 0xa0) != 0x20) {
+             if(!lat) conv2koi8(p);
+         }
+       }
+	else if ((c & 0xe8) == 0)
+	    gfx = c & 0x10;
+	p++;
+   }
+ }
+else if ((latin1 == GREEK) && lang==15) { /* Hellas */
+    while (n--) {
+      c=*p;
+
+      if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+       if ( is_greek(c)) {
+         if (not gfx || (c & 0xa0) != 0x20) {
+            if(!lat) conv2greek(p);
+         }
+       }
+	else if ((c & 0xe8) == 0)
+	    gfx = c & 0x10;
+	p++;
+   }
+ }
+
+ else {
     while (n--)
     {
 	if (lang_char[c = *p])
 	{
-	    if (not gfx || (c & 0xa0) != 0x20)
[...11868 lines suppressed...]
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char155
+ENCODING 249
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C300
+C300
+C300
+C300
+F300
+DB00
+DB00
+DB00
+DB00
+F300
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char135
+ENCODING 250
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+0600
+3C00
+0600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char152
+ENCODING 251
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char157
+ENCODING 252
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+2600
+3E00
+2600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char153
+ENCODING 253
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0300
+0300
+0000
+0000
+ENDCHAR
+STARTCHAR char151
+ENCODING 254
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C600
+C600
+C600
+C600
+C600
+7E00
+0600
+0600
+0600
+0600
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char154
+ENCODING 255
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+F800
+B000
+3000
+3000
+3C00
+3600
+3600
+3600
+3600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+ENDFONT
diff -Nur alevt-1.6.2/xio.c alevt-1.6.2.rus+greek/xio.c
--- alevt-1.6.2/xio.c	2007-12-03 09:18:04.000000000 +0300
+++ alevt-1.6.2.rus+greek/xio.c	2009-04-10 06:59:25.000000000 +0400
@@ -128,10 +128,18 @@
 {
     GC gc;
     int i;
+    unsigned char *font_bits;
+    
+    switch(latin1) {
+        case LATIN1: font_bits=font1_bits; break;
+        case LATIN2: font_bits=font2_bits; break;
+        case KOI8: font_bits=font3_bits; break;
+	case GREEK: font_bits=font4_bits; break;
+        default: font_bits=font1_bits; break;
+    }
 
     xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-					    latin1 ? font1_bits : font2_bits,
-						    font_width, font_height);
+					 font_bits, font_width, font_height);
     xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
     					font_width, font_height*2, 1);
     gc = XCreateGC(xio->dpy, xio->font[0], 0, 0);
@@ -610,6 +618,7 @@
 
 		    case 0x0e:		/* SO (reserved, double width) */
 		    case 0x0f:		/* SI (reserved, double size) */
+		        c= ' '; break;
 		    case 0x1b:		/* ESC (reserved) */
 			c = ' ';
 			break;


alevt-1.6.2-doublefont.patch:

Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-doublefont.patch	5 Dec 2008 08:42:30 -0000	1.1
+++ alevt-1.6.2-doublefont.patch	10 Apr 2009 13:07:42 -0000	1.2
@@ -1,76 +1,122 @@
-diff -Naur alevt-1.6.2/exp-gfx.c alevt-1.6.2-mod/exp-gfx.c
---- alevt-1.6.2/exp-gfx.c	2007-12-03 04:56:06.000000000 +0200
-+++ alevt-1.6.2-mod/exp-gfx.c	2008-12-03 22:32:16.000000000 +0200
-@@ -21,7 +21,9 @@
+diff -Nur alevt-1.6.2.rus+greek/alevt.1x.in alevt-1.6.2.doublefont/alevt.1x.in
+--- alevt-1.6.2.rus+greek/alevt.1x.in	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/alevt.1x.in	2009-04-10 07:26:06.000000000 +0400
+@@ -67,6 +67,9 @@
+ in the selected set are replaced by similar looking symbols.
+ (default: latin-1)
+ .TP
++.BR \-doublefont / \-df
++Instructs alevt to use double sized fonts.
++.TP
+ .B \-\-help
+ Show summary of options.
+ .TP
+diff -Nur alevt-1.6.2.rus+greek/exp-gfx.c alevt-1.6.2.doublefont/exp-gfx.c
+--- alevt-1.6.2.rus+greek/exp-gfx.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/exp-gfx.c	2009-04-10 07:28:15.000000000 +0400
+@@ -21,7 +21,16 @@
  	  int sep)
  {
    int x,y;
--  unsigned char* src= (latin1 ? font1_bits : font2_bits);
-+  unsigned char* src= double_font? 
-+				(latin1? font3_bits : font4_bits) : 
-+				(latin1? font1_bits : font2_bits);
+-  unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
++  unsigned char* src = double_font ? 
++			( (latin1==LATIN1) ? font1_bits : 
++			  ( (latin1==LATIN2) ? font2_bits : 
++			  ( (latin1==KOI8) ? font3_bits :
++			  ( (latin1==GREEK) ? font4_bits : /* fallback */ font1_bits) ) ) ) 
++			  :
++			( (latin1==LATIN1) ? font1d_bits : 
++			  ( (latin1==LATIN2) ? font2d_bits : 
++			  ( (latin1==KOI8) ? font3d_bits :
++			  ( (latin1==GREEK) ? font4d_bits : /* fallback */ font1d_bits) ) ) );
    int dest_x=_x*CW;
    int dest_y=_y*CH;
        
-diff -Naur alevt-1.6.2/font.c alevt-1.6.2-mod/font.c
---- alevt-1.6.2/font.c	1999-10-08 01:20:00.000000000 +0300
-+++ alevt-1.6.2-mod/font.c	2008-12-03 21:26:36.000000000 +0200
-@@ -1,3 +1,5 @@
- #define static /* I want them global */
- #include "font1.xbm"
- #include "font2.xbm"
-+#include "font3.xbm"
-+#include "font4.xbm"
-diff -Naur alevt-1.6.2/font.h alevt-1.6.2-mod/font.h
---- alevt-1.6.2/font.h	1999-10-08 01:24:02.000000000 +0300
-+++ alevt-1.6.2-mod/font.h	2008-12-03 22:30:02.000000000 +0200
-@@ -9,10 +9,18 @@
+diff -Nur alevt-1.6.2.rus+greek/font.c alevt-1.6.2.doublefont/font.c
+--- alevt-1.6.2.rus+greek/font.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.c	2009-04-10 07:28:15.000000000 +0400
+@@ -4,4 +4,13 @@
+ #include "font3.xbm"
+ #include "font4.xbm"
+ 
++#include "font1d.xbm"
++#include "font2d.xbm"
++#include "font3d.xbm"
++#include "font4d.xbm"
+ 
++int CW;
++int CH;
++int double_font = 0;
++int font_width;
++int font_height;
+diff -Nur alevt-1.6.2.rus+greek/font.h alevt-1.6.2.doublefont/font.h
+--- alevt-1.6.2.rus+greek/font.h	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.h	2009-04-10 07:28:15.000000000 +0400
+@@ -1,20 +1,31 @@
+ #ifndef FONT_H
+ #define FONT_H
+ 
+-#include "fontsize.h"	/* the #defines from font?.xbm */
++// #include "fontsize.h"	/* the #defines from font?.xbm */
+ 
+-#if font1_width != font2_width || font1_height != font2_height
+-#error different font sizes.
+-#endif
++//#if font1_width != font2_width || font1_height != font2_height
++//#error different font sizes.
++//#endif
  
  extern unsigned char font1_bits[];
  extern unsigned char font2_bits[];
-+extern unsigned char font3_bits[];
-+extern unsigned char font4_bits[];
+ extern unsigned char font3_bits[];
+ extern unsigned char font4_bits[];
  
 -#define font_width	font1_width
 -#define font_height	font1_height
 -#define CW		(font_width/32)        /* pixel width of a character */
 -#define CH		(font_height/8)        /* pixel height of a character */
++extern unsigned char font1d_bits[];
++extern unsigned char font2d_bits[];
++extern unsigned char font3d_bits[];
++extern unsigned char font4d_bits[];
 +
 +//#define font_width	font1_width
 +//#define font_height	font1_height
 +//#define CW		(font_width/32)        /* pixel width of a character */
-+//externint CW =	(font_width/32);        /* pixel width of a character */
-+int CW;
-+int CH;
-+int font_width;
-+int font_height;
-+int double_font;
++//#define CH		(font_height/8)        /* pixel height of a character */
++
++extern int CW;
++extern int CH;
++extern int double_font;
++extern int font_width;
++extern int font_height;
  
  #endif
-diff -Naur alevt-1.6.2/main.c alevt-1.6.2-mod/main.c
---- alevt-1.6.2/main.c	2007-12-03 05:45:29.000000000 +0200
-+++ alevt-1.6.2-mod/main.c	2008-12-04 08:16:13.000000000 +0200
-@@ -22,6 +22,11 @@
- static int fine_tune = 1; // auto = 999;
+diff -Nur alevt-1.6.2.rus+greek/main.c alevt-1.6.2.doublefont/main.c
+--- alevt-1.6.2.rus+greek/main.c	2009-04-10 07:16:37.000000000 +0400
++++ alevt-1.6.2.doublefont/main.c	2009-04-10 07:28:15.000000000 +0400
+@@ -24,6 +24,12 @@
  static int erc = 1;
  static int newbttv = -1;
-+int double_font = 0;
-+int font_width = 288;
-+int font_height = 128;
-+int CW;
-+int CH;
  
++/* Double font size related variables */
++extern int double_font;
++extern int font_width;
++extern int font_height;
++extern int CW;
++extern int CH;
  
  static void
-@@ -43,6 +48,7 @@
- 	    "    -[no]erc\t\t\tenabled\n"
- 	    "    -[no]bell\t\t\tenabled\n"
- 	    "    -charset latin-1/2\t\tlatin-1\n"
+ usage(FILE *fp, int exitval)
+@@ -44,6 +50,7 @@
+ 	    "    -[no]erc\t\t\t\t\tenabled\n"
+ 	    "    -[no]bell\t\t\t\t\tenabled\n"
+ 	    "    -charset latin-1/2/russian/iso8859-7\tlatin-1\n"
 +	    "    -doublefont\n"
  	    "\n"
  	    "  Order is important!  Each page number\n"
  	    "  opens a new window with the previously\n"
-@@ -126,6 +132,7 @@
+@@ -127,6 +134,7 @@
  	{ "-bell", "-b", 0 },
  	{ "-nobell", "-nb", 0 },
  	{ "-charset", "-latin", 1 },
@@ -78,70 +124,114 @@
      };
      int i;
  
-@@ -163,6 +170,9 @@
+@@ -164,7 +172,7 @@
      int opt, ind;
      char *arg;
  
-+    CW = (font_width/32);
-+    CH = (font_height/8);
-+
+-setlocale (LC_CTYPE, "");
++    setlocale (LC_CTYPE, "");
+ 
      setprgname(argv[0]);
  
-     fdset_init(fds);
-@@ -235,6 +245,13 @@
+@@ -242,6 +250,9 @@
  		else
- 		    fatal("bad charset (not latin-1/2)");
+ 		    fatal("bad charset (not latin-1/2/russian/iso8859-7)");
  		break;
-+	    case 19:	// double font size
++	    case 19:	// Doublefont
 +		double_font = 1;
-+		font_width=576;
-+		font_height=256;
-+		CW = (font_width/32);
-+		CH = (font_height/8);
 +		break;
  	    case 12:	// debug
  		debug++;
  		break;
-diff -Naur alevt-1.6.2/Makefile alevt-1.6.2-mod/Makefile
---- alevt-1.6.2/Makefile	2007-12-03 07:19:54.000000000 +0200
-+++ alevt-1.6.2-mod/Makefile	2008-12-03 22:38:58.000000000 +0200
-@@ -33,8 +33,8 @@
+@@ -253,6 +264,14 @@
+ 		break;
+ 	}
+ 
++    /* Font caps inits */
++
++    font_width  = (double_font==0) ? 288 : 576;
++    font_height = (double_font==0) ? 128 : 256;
++
++    CW = (font_width/32);
++    CH = (font_height/8);
++
+     if (parent == 0)
+ 	start(argc, argv, 0, 0x900, ANY_SUB);
+ 
+diff -Nur alevt-1.6.2.rus+greek/Makefile alevt-1.6.2.doublefont/Makefile
+--- alevt-1.6.2.rus+greek/Makefile	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/Makefile	2009-04-10 07:28:15.000000000 +0400
+@@ -33,9 +33,10 @@
  alevt-cap: $(COBJS)
  	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
  
--font.o: font1.xbm font2.xbm
--fontsize.h: font1.xbm font2.xbm
-+font.o: font1.xbm font2.xbm font3.xbm font4.xbm
-+fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
- 	fgrep -h "#define" font1.xbm font2.xbm >fontsize.h
+-font.o: font1.xbm font2.xbm font3.xbm font4.xbm
+-fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
++font.o: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
++fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
+ 	fgrep -h "#define" font1.xbm font2.xbm font3.xbm font4.xbm >fontsize.h
++	fgrep -h "#define" font1d.xbm font2d.xbm font3d.xbm font4d.xbm >> fontsize.h
  
  font1.xbm: bdf2xbm $(FONT)-latin-1.bdf
-@@ -43,6 +43,14 @@
- font2.xbm: bdf2xbm $(FONT)-latin-2.bdf
- 	./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
- 
-+font3.xbm: bdf2xbm $(FONT)-latin-1.bdf
-+	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font3.xbm
-+	/usr/bin/convert -filter Point -resize 200% font1.xbm font3.xbm
-+
-+font4.xbm: bdf2xbm $(FONT)-latin-2.bdf
-+	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font4.xbm
-+	/usr/bin/convert -filter Point -resize 200% font2.xbm font4.xbm
+ 	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font1.xbm
+@@ -49,6 +50,18 @@
+ font4.xbm: bdf2xbm vtxt-iso8859-7.bdf
+ 	./bdf2xbm font4 <vtxt-iso8859-7.bdf >font4.xbm
+ 
++font1d.xbm: font1.xbm
++	/usr/bin/convert -filter Point -resize 200% font1.xbm font1d.xbm
++
++font2d.xbm: font2.xbm
++	/usr/bin/convert -filter Point -resize 200% font2.xbm font2d.xbm
++
++font3d.xbm: font3.xbm
++	/usr/bin/convert -filter Point -resize 200% font3.xbm font3d.xbm
++
++font4d.xbm: font4.xbm
++	/usr/bin/convert -filter Point -resize 200% font4.xbm font4d.xbm
 +
  bdf2xbm: bdf2xbm.c
  	$(HOSTCC) bdf2xbm.c -o bdf2xbm
  
-diff -Naur alevt-1.6.2/xio.c alevt-1.6.2-mod/xio.c
---- alevt-1.6.2/xio.c	2007-12-03 08:18:04.000000000 +0200
-+++ alevt-1.6.2-mod/xio.c	2008-12-03 22:33:06.000000000 +0200
-@@ -130,7 +130,9 @@
+@@ -62,7 +75,7 @@
+ 	sed s/VERSION/$(VER)/g <alevt-cap.1.in >alevt-cap.1
+ 
+ clean:
+-	rm -f *.o page*.txt a.out core bdf2xbm font?.xbm fontsize.h Makefile.bak
++	rm -f *.o page*.txt a.out core bdf2xbm font?.xbm font?d.xbm fontsize.h Makefile.bak
+ 	rm -f alevt alevt-date alevt-cap
+ 	rm -f alevt.1x alevt-date.1 alevt-cap.1
+ 	rm -f contrib/a.out ttext-*.*
+diff -Nur alevt-1.6.2.rus+greek/xio.c alevt-1.6.2.doublefont/xio.c
+--- alevt-1.6.2.rus+greek/xio.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/xio.c	2009-04-10 07:28:15.000000000 +0400
+@@ -130,12 +130,22 @@
      int i;
+     unsigned char *font_bits;
+     
+-    switch(latin1) {
+-        case LATIN1: font_bits=font1_bits; break;
+-        case LATIN2: font_bits=font2_bits; break;
+-        case KOI8: font_bits=font3_bits; break;
+-	case GREEK: font_bits=font4_bits; break;
+-        default: font_bits=font1_bits; break;
++    if(!double_font) {
++        switch(latin1) {
++            case LATIN1: font_bits=font1_bits; break;
++            case LATIN2: font_bits=font2_bits; break;
++            case KOI8: font_bits=font3_bits; break;
++            case GREEK: font_bits=font4_bits; break;
++            default: font_bits=font1_bits; break;
++        }
++    } else {
++        switch(latin1) {
++            case LATIN1: font_bits=font1d_bits; break;
++            case LATIN2: font_bits=font2d_bits; break;
++            case KOI8: font_bits=font3d_bits; break;
++            case GREEK: font_bits=font4d_bits; break;
++            default: font_bits=font1d_bits; break;
++        }
+     }
  
      xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
--					    latin1 ? font1_bits : font2_bits,
-+					double_font?
-+					    (latin1 ? font3_bits : font1_bits) : 
-+					    (latin1 ? font1_bits : font2_bits),
- 						    font_width, font_height);
-     xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
-     					font_width, font_height*2, 1);
+


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alevt.spec	5 Dec 2008 08:45:05 -0000	1.4
+++ alevt.spec	10 Apr 2009 13:07:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Teletext decoder/browser
 Group:  Applications/Multimedia
 License: GPLv2
@@ -10,6 +10,7 @@
 Patch0: alevt-1.6.2-pixmap.patch
 Patch1: alevt-1.6.2-manpath.patch
 Patch2: alevt-1.6.2-doublefont.patch
+Patch3: alevt-1.6.2-rus-greek.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
 BuildRequires: libpng-devel
@@ -29,6 +30,7 @@
 %patch0 -p1 -b .pixmap
 %patch1 -p1 -b .manpath
 %patch2 -p1 -b .doublefont
+%patch3 -p1 -b .rusgreek
 
 %build
 # alevt does not have standard build system, so we populate OPT, 
@@ -61,6 +63,10 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
+- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
+- updated doublefont patch
+
 * Fri Dec 05 2008 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-9
 - fix wrong tag applied before
 



From sdz at fedoraproject.org  Fri Apr 10 13:07:40 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 10 Apr 2009 13:07:40 +0000 (UTC)
Subject: rpms/avogadro/F-9 .cvsignore, 1.5, 1.6 avogadro.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090410130740.8BE9270122@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29305

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Mar 2009 22:35:45 -0000	1.5
+++ .cvsignore	10 Apr 2009 13:07:10 -0000	1.6
@@ -1 +1 @@
-avogadro-0.9.2.tar.bz2
+avogadro-0.9.3.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/avogadro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avogadro.spec	21 Mar 2009 13:13:40 -0000	1.5
+++ avogadro.spec	10 Apr 2009 13:07:10 -0000	1.6
@@ -2,15 +2,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
@@ -54,7 +53,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -108,6 +106,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Dziallas <sebastian at when.com> 0.9.3-1
+- update to new release
+
 * Sat Mar 21 2009 Sebastian Dziallas <sebastian at when.com> 0.9.2-2
 - get desktop file properly installed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Mar 2009 22:35:45 -0000	1.5
+++ sources	10 Apr 2009 13:07:10 -0000	1.6
@@ -1 +1 @@
-f330fa6d06346ccfee0f28bb61bd0fd7  avogadro-0.9.2.tar.bz2
+94339f092199853062f8b180e3b79e49  avogadro-0.9.3.tar.bz2



From giallu at fedoraproject.org  Fri Apr 10 13:15:30 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Fri, 10 Apr 2009 13:15:30 +0000 (UTC)
Subject: rpms/rawstudio/devel .cvsignore, 1.10, 1.11 rawstudio.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20090410131531.0476870122@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/rawstudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31517

Modified Files:
	.cvsignore rawstudio.spec sources 
Log Message:
* Fri Apr 10 2009 Gianluca Sforna <giallu gmail com> - 1.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Oct 2008 08:11:18 -0000	1.10
+++ .cvsignore	10 Apr 2009 13:14:58 -0000	1.11
@@ -1 +1 @@
-rawstudio-1.1.1.tar.gz
+rawstudio-1.2.tar.gz


Index: rawstudio.spec
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/devel/rawstudio.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rawstudio.spec	25 Feb 2009 23:07:47 -0000	1.17
+++ rawstudio.spec	10 Apr 2009 13:14:59 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           rawstudio 
-Version:        1.1.1
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Read, manipulate and convert digital camera raw images
 
 Group:          Applications/Multimedia 
@@ -15,7 +15,6 @@
 
 Patch0:         rawstudio-1.1.1-stricter-str-functions.patch
 
-
 %description
 Rawstudio is a highly specialized application for processing RAW images
 from digital cameras. It is not a fully featured image editing application.
@@ -75,6 +74,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Gianluca Sforna <giallu gmail com> - 1.2-1
+- New upstream release
+
 * Thu Feb 26 2009 Gianluca Sforna <giallu gmail com> - 1.1.1-4
 - Fix build with newer glibc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Oct 2008 08:11:18 -0000	1.10
+++ sources	10 Apr 2009 13:14:59 -0000	1.11
@@ -1 +1 @@
-be789f2efcaba38f1fd8bef5e4297c83  rawstudio-1.1.1.tar.gz
+25399cd80294fa44220a8940fc77689f  rawstudio-1.2.tar.gz



From lucilanga at fedoraproject.org  Fri Apr 10 13:15:42 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 10 Apr 2009 13:15:42 +0000 (UTC)
Subject: rpms/alevt/devel alevt.spec,1.6,1.7
Message-ID: <20090410131542.448D870122@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31610

Modified Files:
	alevt.spec 
Log Message:
fix order of applied patches


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alevt.spec	10 Apr 2009 12:48:12 -0000	1.6
+++ alevt.spec	10 Apr 2009 13:15:11 -0000	1.7
@@ -29,8 +29,8 @@
 %setup -q
 %patch0 -p1 -b .pixmap
 %patch1 -p1 -b .manpath
-%patch2 -p1 -b .doublefont
-%patch3 -p1 -b .rusgreek
+%patch2 -p1 -b .rusgreek
+%patch3 -p1 -b .double
 
 %build
 # alevt does not have standard build system, so we populate OPT, 



From thias at fedoraproject.org  Fri Apr 10 13:15:51 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 10 Apr 2009 13:15:51 +0000 (UTC)
Subject: rpms/thttpd/devel thttpd.spec,1.20,1.21
Message-ID: <20090410131551.2EF2370122@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/thttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31540

Modified Files:
	thttpd.spec 
Log Message:
Disable make flags since -j seems to have made the build fail.



Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- thttpd.spec	10 Apr 2009 12:57:50 -0000	1.20
+++ thttpd.spec	10 Apr 2009 13:15:20 -0000	1.21
@@ -55,7 +55,8 @@
 %{?_without_indexes:      %{__perl} -pi -e 's/#define GENERATE_INDEXES/#undef GENERATE_INDEXES/g' config.h}
 %{!?_with_showversion:    %{__perl} -pi -e 's/#define SHOW_SERVER_VERSION/#undef SHOW_SERVER_VERSION/g' config.h}
 %{!?_with_expliciterrors: %{__perl} -pi -e 's/#define EXPLICIT_ERROR_PAGES/#undef EXPLICIT_ERROR_PAGES/g' config.h}
-%{__make} %{?_smp_mflags} WEBDIR=%{webroot} STATICFLAG="" \
+# Don't use _smp_mflags since the build fails with it
+%{__make} WEBDIR=%{webroot} STATICFLAG="" \
     CCOPT="%{optflags} -D_FILE_OFFSET_BITS=64"
 
 



From lucilanga at fedoraproject.org  Fri Apr 10 13:17:37 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 10 Apr 2009 13:17:37 +0000 (UTC)
Subject: rpms/alevt/F-10 alevt.spec,1.5,1.6
Message-ID: <20090410131737.5FB0B70122@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32298

Modified Files:
	alevt.spec 
Log Message:
* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
- new patch for cyrillic fonts from Alexey Loukianov (mooroon2 at mail.ru)
- updated doublefont patch


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alevt.spec	10 Apr 2009 13:07:42 -0000	1.5
+++ alevt.spec	10 Apr 2009 13:17:06 -0000	1.6
@@ -9,8 +9,8 @@
 Source1: alevt.desktop
 Patch0: alevt-1.6.2-pixmap.patch
 Patch1: alevt-1.6.2-manpath.patch
-Patch2: alevt-1.6.2-doublefont.patch
-Patch3: alevt-1.6.2-rus-greek.patch
+Patch2: alevt-1.6.2-rus-greek.patch
+Patch3: alevt-1.6.2-doublefont.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
 BuildRequires: libpng-devel
@@ -29,8 +29,8 @@
 %setup -q
 %patch0 -p1 -b .pixmap
 %patch1 -p1 -b .manpath
-%patch2 -p1 -b .doublefont
-%patch3 -p1 -b .rusgreek
+%patch2 -p1 -b .rusgreek
+%patch3 -p1 -b .doublefont
 
 %build
 # alevt does not have standard build system, so we populate OPT, 
@@ -64,7 +64,7 @@
 
 %changelog
 * Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
-- new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
+- new patch for cyrillic fonts from Alexey Loukianov (mooroon2 at mail.ru)
 - updated doublefont patch
 
 * Fri Dec 05 2008 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-9



From jskala at fedoraproject.org  Fri Apr 10 13:20:48 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 10 Apr 2009 13:20:48 +0000 (UTC)
Subject: rpms/bltk/devel bltk-1.0.8-all.patch, 1.1, 1.2 bltk.conf, 1.1,
	1.2 bltk.spec, 1.1, 1.2
Message-ID: <20090410132048.BB18470137@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/bltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1063

Modified Files:
	bltk-1.0.8-all.patch bltk.conf bltk.spec 
Log Message:
* Fri Apr 10 2009 Jiri Skala <jskala at redhat.com> 1.0.8-2
- optimized bltk.conf - SOFFICE_PROG
- fixed working dir in reports
- fixed SIGHUP handling
- finalized implementation of stop file in office and reader WLs


bltk-1.0.8-all.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 bltk-1.0.8-all.patch
Index: bltk-1.0.8-all.patch
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk-1.0.8-all.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bltk-1.0.8-all.patch	4 Mar 2009 08:51:16 -0000	1.1
+++ bltk-1.0.8-all.patch	10 Apr 2009 13:20:47 -0000	1.2
@@ -1,465 +1,364 @@
---- bltk-1.0.8/wl_office/bltk_wl_office_install.sh	2006-05-03 14:17:44.000000000 +0200
-+++ bltk-1.0.9/wl_office/bltk_wl_office_install.sh	2009-02-04 17:08:00.000000000 +0100
-@@ -38,6 +38,7 @@
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- #
- 
-+. /etc/bltk.conf
- 
- source `dirname $0`/../../bin/bltk_wl_common
- [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
-@@ -171,20 +172,25 @@
- 	wl_check_error $?
- }
- 
--if [[ $# = 0 || $1 = i || $1 = install ]]
-+if [[ "$WL_OFFICE_ENABLED" = "YES" && "$WL_OFFICE_EXTERN" = "YES" ]]
- then
--	work=install
--elif [[ $1 = u || $1 = uninstall ]]
--then
--	work=uninstall
-+	if [[ $# = 0 || $1 = i || $1 = install ]]
-+	then
-+		work=install
-+	elif [[ $1 = u || $1 = uninstall ]]
-+	then
-+		work=uninstall
-+	else
-+		echo "Invalid parameter"
-+		exit 1
-+	fi
+--- orig/include/parseconf.h	1970-01-01 01:00:00.000000000 +0100
++++ curr/include/parseconf.h	2009-03-05 16:12:18.000000000 +0100
+@@ -0,0 +1,61 @@
++/*
++ *  Copyright (c) 2009 Red Hat Inc.
++ *  Copyright (c) 2009 Jiri Skala <jskala at redhat.com>
++ *  All rights reserved.
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ *  Redistribution and use in source and binary forms, with or without
++ *  modification, are permitted provided that the following conditions
++ *  are met:
++ *
++ *    Redistributions of source code must retain the above copyright notice,
++ *    this list of conditions and the following disclaimer.
++ *
++ *    Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ *    Neither the name of Intel Corporation nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
++ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
++ *  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
++ *  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ *  DAMAGE.
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ */
 +
-+	{
-+		startup
-+		$work
-+		cleanup 0
-+	}  2>&1 | tee -i $work.log
- else
--	echo "Invalid parameter"
--	exit 1
-+	exit 0
- fi
++#ifndef __PARSECONF_H__
++#define __PARSECONF_H__
++
++extern char *bltk_home;
++extern char *soffice_prog;
++extern char *wl_office_working_dir;
++extern char *bltk_player_prog;
++extern char *bltk_player_file;
++extern char *bltk_reader_prog;
++
++extern int wl_developer_enabled;
++extern int wl_developer_extern;
++extern int wl_game_enabled;
++extern int wl_game_extern;
++extern int wl_office_enabled;
++extern int wl_office_extern;
++extern int wl_player_enabled;
++extern int wl_player_extern;
++extern int wl_reader_enabled;
++extern int wl_reader_extern;
++
++#endif
++
+--- orig/include/xse.h	2007-02-25 08:24:29.000000000 +0100
++++ curr/include/xse.h	2009-03-05 16:12:18.000000000 +0100
+@@ -87,7 +87,8 @@
+ #define	DELAY_1_MIN	(1 * 60 * 1000)
+ #define	DELAY_2_MIN	(2 * 60 * 1000)
+ #define	WINDOWID	"WINDOWID"
+-#define	DELAY_FILE	"./user_delay.tmp"
++#define	DELAY_FILE	"user_delay.tmp"
++#define WINID_FILE	"winid.tmp"
+ #define	VI_CMD		"vi"
+ #define	CSCOPE_CMD	"cscope"
+ #define	F4		"F4"
+--- orig/wl_reader/bltk_wl_reader_xse.c	2007-02-25 08:24:29.000000000 +0100
++++ curr/wl_reader/bltk_wl_reader_xse.c	2009-04-10 14:45:08.000000000 +0200
+@@ -108,7 +108,7 @@
+ 		}
+ 	}
  
--{
--startup
--$work
--cleanup 0
--}  2>&1 | tee -i $work.log
--
---- bltk-1.0.8/wl_office/scen_install	2006-03-08 10:12:07.000000000 +0100
-+++ bltk-1.0.9/wl_office/scen_install	2009-02-12 13:19:34.000000000 +0100
-@@ -1,7 +1,7 @@
- ## Installation scenario
+-	env = getenv("BLTK_WL_PROG");
++	env = getenv("BLTK_READER_PROG");
+ 	if (env && strcmp(env, "konqueror") == 0) {
+ 		scen[LINE_QUIT].string = "Q";
+ 	}
+--- orig/tools/xse/xse.c	2007-02-25 08:24:29.000000000 +0100
++++ curr/tools/xse/xse.c	2009-04-03 15:25:17.000000000 +0200
+@@ -52,16 +52,20 @@
+ #include <time.h>
+ #include <sys/wait.h>
+ #include <signal.h>
++#include <sys/prctl.h>
+ 
+ #include <xse.h>
+ 
+ char *progname = "xse";
+ char *xchg_buf = NULL;
+ char *scen_file = NULL;
++char *stop_name = "NULL";
+ int default_release_flg = 0;
+ int check_delay_time_flg = 0;
+ int correct_delay_time_flg = 0;
  
--RUNCMD		X	0	0	bltk_wl_office_run_app OOWRITER_FILE.sxw
--SETWINDOW	0	0	0	OOWRITER_FILE.sxw
-+RUNCMD		X	0	0	bltk_wl_office_run_app OOWRITER_FILE.odt
-+SETWINDOW	0	0	0	OOWRITER_FILE.odt
++char winid_tmp[STR_LEN];
++
+ long double user_delay = 0;
  
- SETWINDOW	0	0	0	OpenOffice.org Registration
- FOCUSIN		0	0	100	0
-@@ -20,7 +20,7 @@
- DELAY		0	0	2000	0
- ENDWINDOW	0	0	0	Paragraph Styles
+ static Display *display = NULL;
+@@ -412,8 +416,10 @@
+ 	char string[STR_LEN];
  
--SETWINDOW	0	0	0	OOWRITER_FILE.sxw
-+SETWINDOW	0	0	0	OOWRITER_FILE.odt
- FOCUSIN		0	0	100	0
+ 	if (fname == 0) {
+-		fname = DELAY_FILE;
++		snprintf(string, STR_LEN, "%s/%s", getenv("BLTK_HOME"), DELAY_FILE);
++		fname = strdup(string);
+ 	}
++	fprintf(stderr, "user delay file: %s\n", fname);
  
- DELAY		0	0	2000	0
-@@ -30,7 +30,7 @@
- PRESSKEY	0	0	6000	Return
- DELAY		0	0	2000	0
+ 	fd = open(fname, O_RDWR | O_TRUNC | O_CREAT, 0666);
+ 	if (fd < 0) {
+@@ -504,8 +510,8 @@
+ 	int ret = 0;
[...3057 lines suppressed...]
--	rm -f ./user_delay.tmp
-+	rm -f $USER_DELAY_TMP
- 	if [[ $BLTK_WL_FILE != DEBUG && $BLTK_WL_FILE != DEBUG1 ]]
- 	then
- 		run_cscope_vi
- 		wl_check_error $?
- 	else
- 		sleep 1
--		echo 1.11 >./user_delay.tmp
--		wl_check_error $? "echo 0.11 >./user_delay.tmp failed"
-+		echo 1.11 > $USER_DELAY_TMP
-+		wl_check_error $? "echo 0.11 > $USER_DELAY_TMP failed"
- 	fi
+ PRESSKEY	A	0	1000	e
+-PRESSKEY	0	9	150	Down
++PRESSKEY	0	0	150	e
+ DELAY		0	0	1000	0
+ PRESSKEY	0	0	500	Return
  
--	CMD="cat ./user_delay.tmp"
-+	CMD="cat $USER_DELAY_TMP"
- 	DELAY_TIME=`$CMD`
- 	wl_check_error $? "$CMD failed"
+@@ -201,7 +197,7 @@
  
-@@ -280,7 +283,15 @@
- 	exit $1
- }
+ ENDWINDOW	0	0	0	Duplicate
  
--startup
--run
--cleanup 0
-+if [ $WL_DEVELOPER_ENABLED = "YES" ]
-+then
-+	startup
-+	run
-+	cleanup 0
-+else
-+  TTY=`tty`
-+  echo "WARNING!!!" > $TTY 2>&1
-+  echo "The developer workload is disabled. See manual and use external package." > $TTY 2>&1
-+	exit 0
-+fi
+-SETWINDOW	0	0	0	OODRAW_FILE.sxd
++SETWINDOW	0	0	0	OODRAW_FILE.odg
  
---- bltk-1.0.8/wl_developer/Makefile	2006-03-13 07:47:25.000000000 +0100
-+++ bltk-1.0.9/wl_developer/Makefile	2009-02-25 11:36:45.000000000 +0100
-@@ -1,6 +1,6 @@
+ FOCUSIN		0	0	150	0
+ DELAY		0	0	2000	0
+@@ -224,7 +220,7 @@
+ DELAY		0	0	3000	0
  
- CFLAGS		= -Wall -pedantic -std=c99 -g -O2 -I../include
--LDFLAGS		= -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lxse -L../lib
-+LDFLAGS		= -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk
+ PRESSKEY	A	0	1000	v
+-PRESSKEY	0	0	500	Return
++PRESSKEY	0	0	500	z
  
- BIN		= bin
+ SETWINDOW	0	0	0	Zoom
  
-@@ -15,7 +15,7 @@
- SHFILES_SH	= ${SHFILES:=.sh}
- SHTARGETS	= $(SHFILES:%=$(BIN)/%)
+@@ -237,98 +233,20 @@
  
--EXTERN_DEPS	=  $(HIDERS) ../lib/libxse.so
-+EXTERN_DEPS	=  $(HIDERS) ../lib/libxse.so.0
+ ENDWINDOW	0	0	0	Zoom
  
+-SETWINDOW	0	0	0	OODRAW_FILE.sxd
++SETWINDOW	0	0	0	OODRAW_FILE.odg
  
- all : $(BIN) $(SUBDIRS) $(TARGET) $(SHTARGETS) FORCE
---- bltk-1.0.8/wl_developer/bltk_wl_developer_install.sh	2006-05-03 14:17:44.000000000 +0200
-+++ bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh	2009-02-04 17:08:00.000000000 +0100
-@@ -38,6 +38,7 @@
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- #
+ FOCUSIN		0	0	150	0
+ DELAY		0	0	2000	0
+-PRESSKEY	A	0	1000	i
+-PRESSKEY	0	8	150	Down
+-DELAY		0	0	1000	0
+-PRESSKEY	0	1	500	Return
+-
+-DELAY		0	0	3000	0
+-
+-TYPETEXT	0	0	150	Name
+-PRESSKEY	0	0	1000	Right
+-TYPETEXT	0	0	150	Workdays
+-PRESSKEY	0	0	1000	Right
+-TYPETEXT	0	0	150	Pay Rate
+-PRESSKEY	0	0	1000	Right
+-TYPETEXT	0	0	150	Salary
+-PRESSKEY	0	0	1000	Down
+-PRESSKEY	0	3	500	Left
+-
+-DELAY		0	0	3000	0
+-TYPETEXT	0	0	150	John
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	Jane
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	Sam
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	Sarah
+-PRESSKEY	0	0	1000	Right
+-PRESSKEY	0	3	500	Up
+-
+-DELAY		0	0	3000	0
+-TYPETEXT	0	0	150	12
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	20
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	15
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	10
+-PRESSKEY	0	0	1000	Right
+-PRESSKEY	0	3	500	Up
+-
+-DELAY		0	0	3000	0
+-TYPETEXT	0	0	150	25
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	20
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	25
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	150	40
+-PRESSKEY	0	0	1000	Right
+-PRESSKEY	0	3	500	Up
+-
+-DELAY		0	0	3000	0
+-TYPETEXT	0	0	300	=b2*c2
+-DELAY		0	0	1000	0
+-PRESSKEY	0	0	1000	Return
+-PRESSKEY	0	0	1000	Up
+-PRESSKEY	C	0	1000	c
+-PRESSKEY	0	0	200	Down
+-PRESSKEY	S	2	500	Down
+-PRESSKEY	C	0	1000	v
+-
+-DELAY		0	0	3000	0
+-PRESSKEY	0	0	1000	Down
+-TYPETEXT	0	0	300	=sum(
+-PRESSKEY	0	0	500	Up
+-PRESSKEY	S	3	500	Up
+-TYPETEXT	0	0	500	)
+-DELAY		0	0	1000	0
+-PRESSKEY	0	0	1000	Return
+-
+-DELAY		0	0	3000	0
+-PRESSKEY	0	0	1000	Left
+-PRESSKEY	0	0	1000	Up
+-TYPETEXT	0	0	150	Total Pays
+-
+-DELAY		0	0	3000	0
+-PRESSKEY	0	3	3000	Esc
  
-+. /etc/bltk.conf
+ PRESSKEY	A	0	1000	f
+-PRESSKEY	0	4	150	Down
++PRESSKEY	0	0	150	s
+ DELAY		0	0	2000	0
+-PRESSKEY	0	0	5000	Return
  
- source `dirname $0`/../../bin/bltk_wl_common
- [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
-@@ -139,9 +140,14 @@
- 	exit 1
- fi
+ PRESSKEY	A	0	1000	f
+-PRESSKEY	0	16	150	Down
++PRESSKEY	0	0	150	x
+ DELAY		0	0	3000	0
+-PRESSKEY	0	0	5000	Return
  
--{
--startup
--$work
--cleanup 0
--}  2>&1 | tee -i $work.log
-+if [[ "$WL_DEVELOPER_ENABLED" = "YES" && "$WL_DEVELOPER_EXTERN" = "YES" ]]
-+then
-+	{
-+	startup
-+	$work
-+	cleanup 0
-+	}  2>&1 | tee -i $work.log
-+else
-+	exit 0
-+fi
+-ENDWINDOW	0	0	0	OODRAW_FILE.sxd
++ENDWINDOW	0	0	0	OODRAW_FILE.odg
+ 
+ WAITFINISHCMD	0	0	0	soffice.bin
  


Index: bltk.conf
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bltk.conf	4 Mar 2009 08:51:16 -0000	1.1
+++ bltk.conf	10 Apr 2009 13:20:48 -0000	1.2
@@ -36,7 +36,7 @@
 WL_OFFICE_EXTERN=NO
 
 # Path to OpenOffice binary
-SOFFICE_PROG=/usr/lib/openoffice.org3/program/soffice
+SOFFICE_PROG=ooffice
 WL_OFFICE_WORKING_DIR=~/.bltk/wl_office
 
 


Index: bltk.spec
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bltk.spec	4 Mar 2009 08:51:16 -0000	1.1
+++ bltk.spec	10 Apr 2009 13:20:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:			bltk
 Version:	1.0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The BLTK measures notebook battery life under any workload
 
 Group:		Applications/System
@@ -39,8 +39,9 @@
 %patch0 -p1 -b .all
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS"
 make
-# make %{?_smp_mflags}
+#make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +151,7 @@
 
 %{_libdir}/bltk/bin/bltk_hd_state
 %{_libdir}/bltk/bin/bltk_install
+%{_libdir}/bltk/bin/bltk_func
 %{_libdir}/bltk/bin/bltk_plot
 %{_libdir}/bltk/bin/bltk_report
 %{_libdir}/bltk/bin/bltk_report_check
@@ -192,5 +194,11 @@
 %{_libdir}/bltk/wl_reader/war_and_peace.html
 
 %changelog
+* Fri Apr 10 2009 Jiri Skala <jskala at redhat.com> 1.0.8-2
+- optimized bltk.conf - SOFFICE_PROG
+- fixed working dir in reports
+- fixed SIGHUP handling
+- finalized implementation of stop file in office and reader WLs
+
 * Thu Jan 29 2009 Jiri Skala <jskala at redhat.com> 1.0.8-1
 - assembling package



From jwrdegoede at fedoraproject.org  Fri Apr 10 13:32:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 10 Apr 2009 13:32:50 +0000 (UTC)
Subject: rpms/opengl-games-utils/devel opengl-game-functions.sh, 1.4,
	1.5 opengl-games-utils.spec, 1.6, 1.7
Message-ID: <20090410133250.14CDE70122@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5334

Modified Files:
	opengl-game-functions.sh opengl-games-utils.spec 
Log Message:
* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 0.1-8
- Recognize software rendering as such with new Mesa which always says
  DRI = Yes (rh 494174)



Index: opengl-game-functions.sh
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/devel/opengl-game-functions.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opengl-game-functions.sh	13 Nov 2008 14:35:54 -0000	1.4
+++ opengl-game-functions.sh	10 Apr 2009 13:32:19 -0000	1.5
@@ -1,7 +1,8 @@
 # check if DRI is available, show an error and exit if it isn't
 function checkDriOK ()
 {
-  if [ "`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`" != Yes ]; then
+  if [ "`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`" != Yes ] ||
+     glxinfo | grep -q "OpenGL renderer string: Software Rasterizer"; then
     zenity --error --text="Your system currently is not capable of hardware \
 accelerated 3D. Therefore $1 cannot run.
 


Index: opengl-games-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/devel/opengl-games-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opengl-games-utils.spec	26 Feb 2009 08:28:47 -0000	1.6
+++ opengl-games-utils.spec	10 Apr 2009 13:32:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           opengl-games-utils
 Version:        0.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Utilities to check proper 3d support before launching 3d games
 Group:          Amusements/Games
 License:        Public Domain
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 0.1-8
+- Recognize software rendering as such with new Mesa which always says
+  DRI = Yes (rh 494174)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Fri Apr 10 13:35:01 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 10 Apr 2009 13:35:01 +0000 (UTC)
Subject: rpms/alevt/F-9 alevt-1.6.2-rus-greek.patch, NONE,
	1.1 alevt-1.6.2-doublefont.patch, 1.1, 1.2 alevt.spec, 1.2, 1.3
Message-ID: <20090410133501.2477170122@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6133

Modified Files:
	alevt-1.6.2-doublefont.patch alevt.spec 
Added Files:
	alevt-1.6.2-rus-greek.patch 
Log Message:
* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-9
- new patch for cyrillic fonts from Alexey Loukianov (mooroon2 at mail.ru)
- updated doublefont patch

alevt-1.6.2-rus-greek.patch:

--- NEW FILE alevt-1.6.2-rus-greek.patch ---
diff -Nur alevt-1.6.2/alevt.1x.in alevt-1.6.2.rus+greek/alevt.1x.in
--- alevt-1.6.2/alevt.1x.in	2007-12-03 08:52:12.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt.1x.in	2009-04-10 06:59:25.000000000 +0400
@@ -62,7 +62,7 @@
 .BR \-bell / \-nobell
 Enables/disables the error bell.  Normally enabled.
 .TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian\||iso8859-7
 Selects the character set to use.  Characters not present
 in the selected set are replaced by similar looking symbols.
 (default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.1.in alevt-1.6.2.rus+greek/alevt-cap.1.in
--- alevt-1.6.2/alevt-cap.1.in	2007-12-03 09:05:59.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.1.in	2009-04-10 06:59:25.000000000 +0400
@@ -45,7 +45,7 @@
 the program terminates with exit status 1 after saving
 the already captured pages.  The default is to wait forever.
 .TP
-.BI \-charset \ latin-1\||latin-2
+.BI \-charset \ latin-1\||latin-2\||russian
 Selects the character set to use.  Characters not present
 in the selected set are replaced by similar looking symbols.
 (default: latin-1)
diff -Nur alevt-1.6.2/alevt-cap.c alevt-1.6.2.rus+greek/alevt-cap.c
--- alevt-1.6.2/alevt-cap.c	2007-12-03 09:12:22.000000000 +0300
+++ alevt-1.6.2.rus+greek/alevt-cap.c	2009-04-10 07:02:48.000000000 +0400
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <locale.h>
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
@@ -33,16 +34,16 @@
     fprintf(fp, "\nUsage: %s [options] ppp[.ss]...\n", prgname);
     fprintf(fp,
 	    "\n"
-	    "  Valid options:\t\tDefault:\n"
+	    "  Valid options:\t\t\t\tDefault:\n"
 	    "    --help\n"
 	    "    --version\n"
-	    "    -vbi <vbidev>\t\t/dev/vbi0\n"
-	    "    -finetune <-4..4|auto>\t0\n"
-	    //"    -oldbttv\t\t\t(for bttv <0.5.20)\n"
-	    "    -charset latin-1/2\t\tlatin-1\n"
-	    "    -timeout <secs>\t\tnone\n"
-	    "    -name <filename>\t\tttext-%%s.%%e\n"
-	    "    -format <fmt[,options]>\tascii\n"
+	    "    -vbi <vbidev>\t\t\t\t/dev/vbi0\n"
+	    "    -finetune <-4..4|auto>\t\t\t0\n"
+	    //"    -oldbttv\t\t\t\t\t(for bttv <0.5.20)\n"
+	    "    -charset latin-1/latin-2/russian\t\tlatin-1\n"
+	    "    -timeout <secs>\t\t\t\tnone\n"
+	    "    -name <filename>\t\t\t\tttext-%%s.%%e\n"
+	    "    -format <fmt[,options]>\t\t\tascii\n"
 	    "    -format help\n"
 	    "\n"
 	    "  ppp[.ss] stands for a page number and an\n"
@@ -205,6 +206,7 @@
     struct req *req;
     struct dl_head reqs[2];	// simple linear lists of requests & captures
 
+    setlocale (LC_CTYPE, "");
     setprgname(argv[0]);
 
     fdset_init(fds);
@@ -247,8 +249,12 @@
 		    latin1 = 1;
 		else if (streq(arg, "latin-2") || streq(arg, "2"))
 		    latin1 = 0;
+		else if (streq(arg, "russian") || streq(arg, "rus"))
+		    latin1 = KOI8;
+		else if (streq(arg, "iso8859-7") || streq(arg, "el"))
+		    latin1 = GREEK;
 		else
-		    fatal("bad charset (not latin-1/2)");
+		    fatal("bad charset (not latin-1/2/russian/iso8859-7)");
 		break;
 	    case 10:	// format
 		if (streq(arg, "help") || streq(arg, "?") || streq(arg, "list"))
diff -Nur alevt-1.6.2/exp-gfx.c alevt-1.6.2.rus+greek/exp-gfx.c
--- alevt-1.6.2/exp-gfx.c	2007-12-03 05:56:06.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-gfx.c	2009-04-10 06:59:25.000000000 +0400
@@ -21,7 +21,7 @@
 	  int sep)
 {
   int x,y;
-  unsigned char* src= (latin1 ? font1_bits : font2_bits);
+  unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
   int dest_x=_x*CW;
   int dest_y=_y*CH;
       
diff -Nur alevt-1.6.2/exp-html.c alevt-1.6.2.rus+greek/exp-html.c
--- alevt-1.6.2/exp-html.c	2007-12-03 05:55:17.000000000 +0300
+++ alevt-1.6.2.rus+greek/exp-html.c	2009-04-10 06:59:25.000000000 +0400
@@ -111,12 +111,22 @@
     HTML_NL
 #ifndef STRIPPED_HTML
       fputs("<meta http-equiv=\"Content-Type\" content=\"text/html;",fp);
-    fprintf(fp,"charset=iso-8859-%d\">",(latin1 ? 1 : 2));
+    switch(latin1) {
+      case LATIN1: fprintf(fp,"charset=iso-8859-1\">"); break;
+      case LATIN2: fprintf(fp,"charset=iso-8859-2\">"); break;
+      case KOI8: fprintf(fp,"charset=koi8-r\">"); break;
+      case GREEK: fprintf(fp,"charset=iso-8859-7\">"); break;
+    }
     HTML_NL
       fputs("<meta name=\"GENERATOR\" content=\"alevt-cap\">",fp);
     HTML_NL
 #else
-      fprintf(fp,"<meta charset=\"iso-8859-%d\">",(latin1 ? 1 : 2));
+    switch(latin1) {
+      case LATIN1: fprintf(fp,"<meta charset=iso-8859-1\">"); break;
+      case LATIN2: fprintf(fp,"<meta charset=iso-8859-2\">"); break;
+      case KOI8: fprintf(fp,"<meta charset=koi8-r\">"); break;
+      case GREEK: fprintf(fp,"<meta charset=iso-8859-7\">"); break;
+    }
     HTML_NL
 #endif
       fputs("</head>",fp);
diff -Nur alevt-1.6.2/font.c alevt-1.6.2.rus+greek/font.c
--- alevt-1.6.2/font.c	1999-10-08 02:20:00.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.c	2009-04-10 06:59:25.000000000 +0400
@@ -1,3 +1,7 @@
 #define static /* I want them global */
 #include "font1.xbm"
 #include "font2.xbm"
+#include "font3.xbm"
+#include "font4.xbm"
+
+
diff -Nur alevt-1.6.2/font.h alevt-1.6.2.rus+greek/font.h
--- alevt-1.6.2/font.h	1999-10-08 02:24:02.000000000 +0400
+++ alevt-1.6.2.rus+greek/font.h	2009-04-10 06:59:25.000000000 +0400
@@ -9,6 +9,8 @@
 
 extern unsigned char font1_bits[];
 extern unsigned char font2_bits[];
+extern unsigned char font3_bits[];
+extern unsigned char font4_bits[];
 
 #define font_width	font1_width
 #define font_height	font1_height
diff -Nur alevt-1.6.2/lang.c alevt-1.6.2.rus+greek/lang.c
--- alevt-1.6.2/lang.c	1999-07-18 19:23:48.000000000 +0400
+++ alevt-1.6.2.rus+greek/lang.c	2009-04-10 06:59:25.000000000 +0400
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <ctype.h>
 #include "misc.h"
 #include "vt.h"
 #include "lang.h"
@@ -145,22 +146,175 @@
 void
 conv2latin(u8 *p, int n, int lang)
 {
-    int c, gfx = 0;
+    int c, gfx = 0, lat=0;
 
+  if ((latin1 == KOI8) && lang==12) { /* russian */
+    while (n--) {
+      c=*p;
+
+      if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+       if ( is_koi(c)) {
+         if (not gfx || (c & 0xa0) != 0x20) {
+             if(!lat) conv2koi8(p);
+         }
+       }
+	else if ((c & 0xe8) == 0)
+	    gfx = c & 0x10;
+	p++;
+   }
+ }
+else if ((latin1 == GREEK) && lang==15) { /* Hellas */
+    while (n--) {
+      c=*p;
+
+      if(c==0x1b) lat = !lat; /* ESC switches languages inside page */
+
+       if ( is_greek(c)) {
+         if (not gfx || (c & 0xa0) != 0x20) {
+            if(!lat) conv2greek(p);
+         }
+       }
+	else if ((c & 0xe8) == 0)
+	    gfx = c & 0x10;
+	p++;
+   }
+ }
+
+ else {
     while (n--)
     {
 	if (lang_char[c = *p])
 	{
-	    if (not gfx || (c & 0xa0) != 0x20)
[...11868 lines suppressed...]
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char155
+ENCODING 249
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C300
+C300
+C300
+C300
+F300
+DB00
+DB00
+DB00
+DB00
+F300
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char135
+ENCODING 250
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+0600
+3C00
+0600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char152
+ENCODING 251
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char157
+ENCODING 252
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+7C00
+C600
+0600
+2600
+3E00
+2600
+0600
+0600
+C600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char153
+ENCODING 253
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+DB00
+FF00
+0300
+0300
+0000
+0000
+ENDCHAR
+STARTCHAR char151
+ENCODING 254
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+C600
+C600
+C600
+C600
+C600
+7E00
+0600
+0600
+0600
+0600
+0000
+0000
+0000
+0000
+ENDCHAR
+STARTCHAR char154
+ENCODING 255
+SWIDTH 8640 0
+DWIDTH 9 0
+BBX 9 16 0 -4
+BITMAP
+0000
+0000
+F800
+B000
+3000
+3000
+3C00
+3600
+3600
+3600
+3600
+7C00
+0000
+0000
+0000
+0000
+ENDCHAR
+ENDFONT
diff -Nur alevt-1.6.2/xio.c alevt-1.6.2.rus+greek/xio.c
--- alevt-1.6.2/xio.c	2007-12-03 09:18:04.000000000 +0300
+++ alevt-1.6.2.rus+greek/xio.c	2009-04-10 06:59:25.000000000 +0400
@@ -128,10 +128,18 @@
 {
     GC gc;
     int i;
+    unsigned char *font_bits;
+    
+    switch(latin1) {
+        case LATIN1: font_bits=font1_bits; break;
+        case LATIN2: font_bits=font2_bits; break;
+        case KOI8: font_bits=font3_bits; break;
+	case GREEK: font_bits=font4_bits; break;
+        default: font_bits=font1_bits; break;
+    }
 
     xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-					    latin1 ? font1_bits : font2_bits,
-						    font_width, font_height);
+					 font_bits, font_width, font_height);
     xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
     					font_width, font_height*2, 1);
     gc = XCreateGC(xio->dpy, xio->font[0], 0, 0);
@@ -610,6 +618,7 @@
 
 		    case 0x0e:		/* SO (reserved, double width) */
 		    case 0x0f:		/* SI (reserved, double size) */
+		        c= ' '; break;
 		    case 0x1b:		/* ESC (reserved) */
 			c = ' ';
 			break;


alevt-1.6.2-doublefont.patch:

Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-doublefont.patch	5 Dec 2008 08:55:22 -0000	1.1
+++ alevt-1.6.2-doublefont.patch	10 Apr 2009 13:35:00 -0000	1.2
@@ -1,76 +1,122 @@
-diff -Naur alevt-1.6.2/exp-gfx.c alevt-1.6.2-mod/exp-gfx.c
---- alevt-1.6.2/exp-gfx.c	2007-12-03 04:56:06.000000000 +0200
-+++ alevt-1.6.2-mod/exp-gfx.c	2008-12-03 22:32:16.000000000 +0200
-@@ -21,7 +21,9 @@
+diff -Nur alevt-1.6.2.rus+greek/alevt.1x.in alevt-1.6.2.doublefont/alevt.1x.in
+--- alevt-1.6.2.rus+greek/alevt.1x.in	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/alevt.1x.in	2009-04-10 07:26:06.000000000 +0400
+@@ -67,6 +67,9 @@
+ in the selected set are replaced by similar looking symbols.
+ (default: latin-1)
+ .TP
++.BR \-doublefont / \-df
++Instructs alevt to use double sized fonts.
++.TP
+ .B \-\-help
+ Show summary of options.
+ .TP
+diff -Nur alevt-1.6.2.rus+greek/exp-gfx.c alevt-1.6.2.doublefont/exp-gfx.c
+--- alevt-1.6.2.rus+greek/exp-gfx.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/exp-gfx.c	2009-04-10 07:28:15.000000000 +0400
+@@ -21,7 +21,16 @@
  	  int sep)
  {
    int x,y;
--  unsigned char* src= (latin1 ? font1_bits : font2_bits);
-+  unsigned char* src= double_font? 
-+				(latin1? font3_bits : font4_bits) : 
-+				(latin1? font1_bits : font2_bits);
+-  unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
++  unsigned char* src = double_font ? 
++			( (latin1==LATIN1) ? font1_bits : 
++			  ( (latin1==LATIN2) ? font2_bits : 
++			  ( (latin1==KOI8) ? font3_bits :
++			  ( (latin1==GREEK) ? font4_bits : /* fallback */ font1_bits) ) ) ) 
++			  :
++			( (latin1==LATIN1) ? font1d_bits : 
++			  ( (latin1==LATIN2) ? font2d_bits : 
++			  ( (latin1==KOI8) ? font3d_bits :
++			  ( (latin1==GREEK) ? font4d_bits : /* fallback */ font1d_bits) ) ) );
    int dest_x=_x*CW;
    int dest_y=_y*CH;
        
-diff -Naur alevt-1.6.2/font.c alevt-1.6.2-mod/font.c
---- alevt-1.6.2/font.c	1999-10-08 01:20:00.000000000 +0300
-+++ alevt-1.6.2-mod/font.c	2008-12-03 21:26:36.000000000 +0200
-@@ -1,3 +1,5 @@
- #define static /* I want them global */
- #include "font1.xbm"
- #include "font2.xbm"
-+#include "font3.xbm"
-+#include "font4.xbm"
-diff -Naur alevt-1.6.2/font.h alevt-1.6.2-mod/font.h
---- alevt-1.6.2/font.h	1999-10-08 01:24:02.000000000 +0300
-+++ alevt-1.6.2-mod/font.h	2008-12-03 22:30:02.000000000 +0200
-@@ -9,10 +9,18 @@
+diff -Nur alevt-1.6.2.rus+greek/font.c alevt-1.6.2.doublefont/font.c
+--- alevt-1.6.2.rus+greek/font.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.c	2009-04-10 07:28:15.000000000 +0400
+@@ -4,4 +4,13 @@
+ #include "font3.xbm"
+ #include "font4.xbm"
+ 
++#include "font1d.xbm"
++#include "font2d.xbm"
++#include "font3d.xbm"
++#include "font4d.xbm"
+ 
++int CW;
++int CH;
++int double_font = 0;
++int font_width;
++int font_height;
+diff -Nur alevt-1.6.2.rus+greek/font.h alevt-1.6.2.doublefont/font.h
+--- alevt-1.6.2.rus+greek/font.h	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/font.h	2009-04-10 07:28:15.000000000 +0400
+@@ -1,20 +1,31 @@
+ #ifndef FONT_H
+ #define FONT_H
+ 
+-#include "fontsize.h"	/* the #defines from font?.xbm */
++// #include "fontsize.h"	/* the #defines from font?.xbm */
+ 
+-#if font1_width != font2_width || font1_height != font2_height
+-#error different font sizes.
+-#endif
++//#if font1_width != font2_width || font1_height != font2_height
++//#error different font sizes.
++//#endif
  
  extern unsigned char font1_bits[];
  extern unsigned char font2_bits[];
-+extern unsigned char font3_bits[];
-+extern unsigned char font4_bits[];
+ extern unsigned char font3_bits[];
+ extern unsigned char font4_bits[];
  
 -#define font_width	font1_width
 -#define font_height	font1_height
 -#define CW		(font_width/32)        /* pixel width of a character */
 -#define CH		(font_height/8)        /* pixel height of a character */
++extern unsigned char font1d_bits[];
++extern unsigned char font2d_bits[];
++extern unsigned char font3d_bits[];
++extern unsigned char font4d_bits[];
 +
 +//#define font_width	font1_width
 +//#define font_height	font1_height
 +//#define CW		(font_width/32)        /* pixel width of a character */
-+//externint CW =	(font_width/32);        /* pixel width of a character */
-+int CW;
-+int CH;
-+int font_width;
-+int font_height;
-+int double_font;
++//#define CH		(font_height/8)        /* pixel height of a character */
++
++extern int CW;
++extern int CH;
++extern int double_font;
++extern int font_width;
++extern int font_height;
  
  #endif
-diff -Naur alevt-1.6.2/main.c alevt-1.6.2-mod/main.c
---- alevt-1.6.2/main.c	2007-12-03 05:45:29.000000000 +0200
-+++ alevt-1.6.2-mod/main.c	2008-12-04 08:16:13.000000000 +0200
-@@ -22,6 +22,11 @@
- static int fine_tune = 1; // auto = 999;
+diff -Nur alevt-1.6.2.rus+greek/main.c alevt-1.6.2.doublefont/main.c
+--- alevt-1.6.2.rus+greek/main.c	2009-04-10 07:16:37.000000000 +0400
++++ alevt-1.6.2.doublefont/main.c	2009-04-10 07:28:15.000000000 +0400
+@@ -24,6 +24,12 @@
  static int erc = 1;
  static int newbttv = -1;
-+int double_font = 0;
-+int font_width = 288;
-+int font_height = 128;
-+int CW;
-+int CH;
  
++/* Double font size related variables */
++extern int double_font;
++extern int font_width;
++extern int font_height;
++extern int CW;
++extern int CH;
  
  static void
-@@ -43,6 +48,7 @@
- 	    "    -[no]erc\t\t\tenabled\n"
- 	    "    -[no]bell\t\t\tenabled\n"
- 	    "    -charset latin-1/2\t\tlatin-1\n"
+ usage(FILE *fp, int exitval)
+@@ -44,6 +50,7 @@
+ 	    "    -[no]erc\t\t\t\t\tenabled\n"
+ 	    "    -[no]bell\t\t\t\t\tenabled\n"
+ 	    "    -charset latin-1/2/russian/iso8859-7\tlatin-1\n"
 +	    "    -doublefont\n"
  	    "\n"
  	    "  Order is important!  Each page number\n"
  	    "  opens a new window with the previously\n"
-@@ -126,6 +132,7 @@
+@@ -127,6 +134,7 @@
  	{ "-bell", "-b", 0 },
  	{ "-nobell", "-nb", 0 },
  	{ "-charset", "-latin", 1 },
@@ -78,70 +124,114 @@
      };
      int i;
  
-@@ -163,6 +170,9 @@
+@@ -164,7 +172,7 @@
      int opt, ind;
      char *arg;
  
-+    CW = (font_width/32);
-+    CH = (font_height/8);
-+
+-setlocale (LC_CTYPE, "");
++    setlocale (LC_CTYPE, "");
+ 
      setprgname(argv[0]);
  
-     fdset_init(fds);
-@@ -235,6 +245,13 @@
+@@ -242,6 +250,9 @@
  		else
- 		    fatal("bad charset (not latin-1/2)");
+ 		    fatal("bad charset (not latin-1/2/russian/iso8859-7)");
  		break;
-+	    case 19:	// double font size
++	    case 19:	// Doublefont
 +		double_font = 1;
-+		font_width=576;
-+		font_height=256;
-+		CW = (font_width/32);
-+		CH = (font_height/8);
 +		break;
  	    case 12:	// debug
  		debug++;
  		break;
-diff -Naur alevt-1.6.2/Makefile alevt-1.6.2-mod/Makefile
---- alevt-1.6.2/Makefile	2007-12-03 07:19:54.000000000 +0200
-+++ alevt-1.6.2-mod/Makefile	2008-12-03 22:38:58.000000000 +0200
-@@ -33,8 +33,8 @@
+@@ -253,6 +264,14 @@
+ 		break;
+ 	}
+ 
++    /* Font caps inits */
++
++    font_width  = (double_font==0) ? 288 : 576;
++    font_height = (double_font==0) ? 128 : 256;
++
++    CW = (font_width/32);
++    CH = (font_height/8);
++
+     if (parent == 0)
+ 	start(argc, argv, 0, 0x900, ANY_SUB);
+ 
+diff -Nur alevt-1.6.2.rus+greek/Makefile alevt-1.6.2.doublefont/Makefile
+--- alevt-1.6.2.rus+greek/Makefile	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/Makefile	2009-04-10 07:28:15.000000000 +0400
+@@ -33,9 +33,10 @@
  alevt-cap: $(COBJS)
  	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
  
--font.o: font1.xbm font2.xbm
--fontsize.h: font1.xbm font2.xbm
-+font.o: font1.xbm font2.xbm font3.xbm font4.xbm
-+fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
- 	fgrep -h "#define" font1.xbm font2.xbm >fontsize.h
+-font.o: font1.xbm font2.xbm font3.xbm font4.xbm
+-fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
++font.o: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
++fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
+ 	fgrep -h "#define" font1.xbm font2.xbm font3.xbm font4.xbm >fontsize.h
++	fgrep -h "#define" font1d.xbm font2d.xbm font3d.xbm font4d.xbm >> fontsize.h
  
  font1.xbm: bdf2xbm $(FONT)-latin-1.bdf
-@@ -43,6 +43,14 @@
- font2.xbm: bdf2xbm $(FONT)-latin-2.bdf
- 	./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
- 
-+font3.xbm: bdf2xbm $(FONT)-latin-1.bdf
-+	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font3.xbm
-+	/usr/bin/convert -filter Point -resize 200% font1.xbm font3.xbm
-+
-+font4.xbm: bdf2xbm $(FONT)-latin-2.bdf
-+	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font4.xbm
-+	/usr/bin/convert -filter Point -resize 200% font2.xbm font4.xbm
+ 	./bdf2xbm font1 <$(FONT)-latin-1.bdf >font1.xbm
+@@ -49,6 +50,18 @@
+ font4.xbm: bdf2xbm vtxt-iso8859-7.bdf
+ 	./bdf2xbm font4 <vtxt-iso8859-7.bdf >font4.xbm
+ 
++font1d.xbm: font1.xbm
++	/usr/bin/convert -filter Point -resize 200% font1.xbm font1d.xbm
++
++font2d.xbm: font2.xbm
++	/usr/bin/convert -filter Point -resize 200% font2.xbm font2d.xbm
++
++font3d.xbm: font3.xbm
++	/usr/bin/convert -filter Point -resize 200% font3.xbm font3d.xbm
++
++font4d.xbm: font4.xbm
++	/usr/bin/convert -filter Point -resize 200% font4.xbm font4d.xbm
 +
  bdf2xbm: bdf2xbm.c
  	$(HOSTCC) bdf2xbm.c -o bdf2xbm
  
-diff -Naur alevt-1.6.2/xio.c alevt-1.6.2-mod/xio.c
---- alevt-1.6.2/xio.c	2007-12-03 08:18:04.000000000 +0200
-+++ alevt-1.6.2-mod/xio.c	2008-12-03 22:33:06.000000000 +0200
-@@ -130,7 +130,9 @@
+@@ -62,7 +75,7 @@
+ 	sed s/VERSION/$(VER)/g <alevt-cap.1.in >alevt-cap.1
+ 
+ clean:
+-	rm -f *.o page*.txt a.out core bdf2xbm font?.xbm fontsize.h Makefile.bak
++	rm -f *.o page*.txt a.out core bdf2xbm font?.xbm font?d.xbm fontsize.h Makefile.bak
+ 	rm -f alevt alevt-date alevt-cap
+ 	rm -f alevt.1x alevt-date.1 alevt-cap.1
+ 	rm -f contrib/a.out ttext-*.*
+diff -Nur alevt-1.6.2.rus+greek/xio.c alevt-1.6.2.doublefont/xio.c
+--- alevt-1.6.2.rus+greek/xio.c	2009-04-10 06:59:25.000000000 +0400
++++ alevt-1.6.2.doublefont/xio.c	2009-04-10 07:28:15.000000000 +0400
+@@ -130,12 +130,22 @@
      int i;
+     unsigned char *font_bits;
+     
+-    switch(latin1) {
+-        case LATIN1: font_bits=font1_bits; break;
+-        case LATIN2: font_bits=font2_bits; break;
+-        case KOI8: font_bits=font3_bits; break;
+-	case GREEK: font_bits=font4_bits; break;
+-        default: font_bits=font1_bits; break;
++    if(!double_font) {
++        switch(latin1) {
++            case LATIN1: font_bits=font1_bits; break;
++            case LATIN2: font_bits=font2_bits; break;
++            case KOI8: font_bits=font3_bits; break;
++            case GREEK: font_bits=font4_bits; break;
++            default: font_bits=font1_bits; break;
++        }
++    } else {
++        switch(latin1) {
++            case LATIN1: font_bits=font1d_bits; break;
++            case LATIN2: font_bits=font2d_bits; break;
++            case KOI8: font_bits=font3d_bits; break;
++            case GREEK: font_bits=font4d_bits; break;
++            default: font_bits=font1d_bits; break;
++        }
+     }
  
      xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
--					    latin1 ? font1_bits : font2_bits,
-+					double_font?
-+					    (latin1 ? font3_bits : font1_bits) : 
-+					    (latin1 ? font1_bits : font2_bits),
- 						    font_width, font_height);
-     xio->font[1] = XCreatePixmap(xio->dpy, xio->root,
-     					font_width, font_height*2, 1);
+


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt.spec	5 Dec 2008 08:55:22 -0000	1.2
+++ alevt.spec	10 Apr 2009 13:35:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Teletext decoder/browser
 Group:  Applications/Multimedia
 License: GPLv2
@@ -9,7 +9,8 @@
 Source1: alevt.desktop
 Patch0: alevt-1.6.2-pixmap.patch
 Patch1: alevt-1.6.2-manpath.patch
-Patch2: alevt-1.6.2-doublefont.patch
+Patch2: alevt-1.6.2-rus-greek.patch
+Patch3: alevt-1.6.2-doublefont.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
 BuildRequires: libpng-devel
@@ -28,7 +29,8 @@
 %setup -q
 %patch0 -p1 -b .pixmap
 %patch1 -p1 -b .manpath
-%patch2 -p1 -b .doublefont
+%patch2 -p1 -b .rusgreek
+%patch3 -p1 -b .doublefont
 
 %build
 # alevt does not have standard build system, so we populate OPT, 
@@ -61,6 +63,10 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-9
+- new patch for cyrillic fonts from Alexey Loukianov (mooroon2 at mail.ru)
+- updated doublefont patch
+
 * Fri Dec 05 2008 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-8
 - update build requires
 



From lkundrak at fedoraproject.org  Fri Apr 10 13:34:57 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 10 Apr 2009 13:34:57 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape-20090410svn-formats.patch, NONE,
	1.1 inkscape-20090410svn-gcc44.patch, NONE,
	1.1 inkscape-20090410svn-uniconv.patch, NONE, 1.1 inkscape.spec,
	1.70, 1.71 sources, 1.17, 1.18 inkscape-0.46+devel-uniconv.patch,
	1.2, NONE inkscape-20090227svn-gcc44.patch, 1.1, NONE
Message-ID: <20090410133457.E581870122@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5967

Modified Files:
	inkscape.spec sources 
Added Files:
	inkscape-20090410svn-formats.patch 
	inkscape-20090410svn-gcc44.patch 
	inkscape-20090410svn-uniconv.patch 
Removed Files:
	inkscape-0.46+devel-uniconv.patch 
	inkscape-20090227svn-gcc44.patch 
Log Message:
* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.6.20090410svn
- Update to newer snapshot
- Fix doc/incview reversed subpackage content


inkscape-20090410svn-formats.patch:

--- NEW FILE inkscape-20090410svn-formats.patch ---
See https://bugzilla.redhat.com/show_bug.cgi?id=458845

Lubomir Rintel <lkundrak at v3.sk>

diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in
--- inkscape/inkscape.desktop.in.uniconv	2009-01-06 11:38:13.000000000 +0100
+++ inkscape/inkscape.desktop.in	2009-01-06 11:38:39.000000000 +0100
@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor
 _Comment=Create and edit Scalable Vector Graphics images
 Type=Application
 Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;
+MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
 Exec=inkscape %F
 TryExec=inkscape
 Terminal=false

inkscape-20090410svn-gcc44.patch:

--- NEW FILE inkscape-20090410svn-gcc44.patch ---
One more typing fix for GCC 4.4, and fix a NULL dereference on startup.

Lubomir Rintel <lkundrak at v3.sk>

diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44	2009-01-28 22:12:57.000000000 +0100
+++ inkscape/src/extension/internal/bitmap/imagemagick.cpp	2009-04-10 12:34:09.189576256 +0200
@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
 	char *search = (char *) g_strndup(xlink, 30);
 	if (strstr(search, "base64") != (char*)NULL) {
 		// 7 = strlen("base64") + strlen(",")
-		char* pureBase64 = strstr(xlink, "base64") + 7;		
+		const char* pureBase64 = strstr(xlink, "base64") + 7;		
 		Magick::Blob blob;
 		blob.base64(pureBase64);
 		image->read(blob);
diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
--- inkscape/src/libnr/nr-object.cpp.gcc44	2008-05-04 07:14:00.000000000 +0200
+++ inkscape/src/libnr/nr-object.cpp	2009-04-10 12:34:09.190577328 +0200
@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
     );
     memset(object, 0xf0, c->isize);
 
-    object->klass = c;
     c->cpp_ctor(object);
+    object->klass = c;
     nr_class_tree_object_invoke_init (c, object);
 
     return object;
diff -up inkscape/src/widgets/ege-paint-def.cpp.gcc44 inkscape/src/widgets/ege-paint-def.cpp
--- inkscape/src/widgets/ege-paint-def.cpp.gcc44	2009-04-10 14:31:06.349578336 +0200
+++ inkscape/src/widgets/ege-paint-def.cpp	2009-04-10 14:31:20.011577660 +0200
@@ -45,6 +45,7 @@
 
 #include <stdint.h>
 #include <string>
+#include <cstdio>
 #include <iostream>
 #include <sstream>
 #include <stdlib.h>

inkscape-20090410svn-uniconv.patch:

--- NEW FILE inkscape-20090410svn-uniconv.patch ---
uniconvertor and uniconv are looked in in reversed order
(therefore we can call uniconv that's different from the uniconvertor one)
https://bugs.launchpad.net/inkscape/+bug/226383

Lubomir Rintel <lkundrak at v3.sk>

diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py
--- inkscape/share/extensions/uniconv-ext.py.uniconv	2009-03-01 18:06:19.000000000 +0100
+++ inkscape/share/extensions/uniconv-ext.py	2009-04-10 15:22:21.916579400 +0200
@@ -28,19 +28,21 @@ cmd = None
 
 try:
     from subprocess import Popen, PIPE
-    p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait()
+    p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
     if p==0 :
-        cmd = 'uniconv'
+        cmd = 'uniconvertor'
     else:
-        p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait()
+        p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait()
         if p==0 :
-            cmd = 'uniconvertor'
+            cmd = 'uniconv'
 except ImportError:
     from popen2 import Popen3
-    p = Popen3('uniconv', True).wait()
-    if p!=32512 : cmd = 'uniconv'
     p = Popen3('uniconvertor', True).wait()
-    if p!=32512 : cmd = 'uniconvertor'
+    if p!=32512 :
+        cmd = 'uniconvertor'
+    else:
+        p = Popen3('uniconv', True).wait()
+        if p!=32512 : cmd = 'uniconv'
 
 if cmd == None:
     # there's no succeffully-returning uniconv command; try to get the module directly (on Windows)


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- inkscape.spec	11 Mar 2009 08:25:07 -0000	1.70
+++ inkscape.spec	10 Apr 2009 13:34:27 -0000	1.71
@@ -1,25 +1,22 @@
-# Preserve lot of debugging information for now. This effectively
-# disables FORTIFY_SOURCE, so it must be enabled before Gold
-%define optflags %(rpm --eval %%optflags |sed 's/-O2/-O0/')
-
 Name:           inkscape
 Version:        0.47
-Release:        0.6.20090301svn%{?dist}
+Release:        0.6.20090410svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r20798 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 20798 inkscape
+# svn export -r21114 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 21114 inkscape
 # tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
 Source0:        %{name}.tar.lzma
 
-Patch0:         inkscape-0.46+devel-uniconv.patch
-Patch1:         inkscape-20090227svn-gcc44.patch
+Patch0:         inkscape-20090410svn-uniconv.patch
+Patch1:         inkscape-20090410svn-gcc44.patch
 Patch2:         inkscape-20090226svn-oldcairo.patch
+Patch4:         inkscape-20090410svn-formats.patch
 # BEGIN SVN SNAPSHOT SPECIFIC
 Patch3:         inkscape-20090227svn-automake.patch
 # END SVN SNAPSHOT SPECIFIC
@@ -128,6 +125,7 @@
 %package docs
 Summary:        Documentation for Inkscape
 Group:          Documentation
+Requires:       inkscape
 
 %description docs
 Tutorial and examples for Inkscape, a graphics editor for vector
@@ -139,6 +137,7 @@
 %patch0 -p1 -b .uniconv
 %patch1 -p1 -b .gcc44
 %patch2 -p0 -b .oldcairo
+%patch4 -p1 -b .formats
 # BEGIN SVN SNAPSHOT SPECIFIC
 %patch3 -p0 -b .automake
 # END SVN SNAPSHOT SPECIFIC
@@ -236,19 +235,22 @@
 
 %files view
 %defattr(-,root,root,-)
-%dir %{_datadir}/inkscape
-%{_datadir}/inkscape/tutorials
-%{_datadir}/inkscape/examples
+%{_bindir}/inkview
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %files docs
 %defattr(-,root,root,-)
-%{_bindir}/inkview
-%doc AUTHORS COPYING ChangeLog NEWS README
+%dir %{_datadir}/inkscape
+%{_datadir}/inkscape/tutorials
+%{_datadir}/inkscape/examples
 
 
 %changelog
+* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.6.20090410svn
+- Update to newer snapshot
+- Fix doc/incview reversed subpackage content
+
 * Wed Mar 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.6.20090301svn
 - Rebuild for new ImageMagick
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Mar 2009 21:27:11 -0000	1.17
+++ sources	10 Apr 2009 13:34:27 -0000	1.18
@@ -1 +1 @@
-8803034773154e5d90e3bdac7de7ab30  inkscape.tar.lzma
+b2f839c29e8ad5c3eab82c2540c6e12d  inkscape.tar.lzma


--- inkscape-0.46+devel-uniconv.patch DELETED ---


--- inkscape-20090227svn-gcc44.patch DELETED ---



From acme at fedoraproject.org  Fri Apr 10 13:37:51 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Fri, 10 Apr 2009 13:37:51 +0000 (UTC)
Subject: rpms/dwarves/F-10 dwarves.spec,1.4,1.5
Message-ID: <20090410133751.CEC5370122@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/dwarves/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6855

Modified Files:
	dwarves.spec 
Log Message:
Update dwarves in F10 to 1.7



Index: dwarves.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-10/dwarves.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dwarves.spec	17 Feb 2009 16:37:50 -0000	1.4
+++ dwarves.spec	10 Apr 2009 13:37:19 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name: dwarves
 Version: 1.7
-Release: 3
+Release: 3.1
 License: GPLv2
 Summary: Dwarf Tools
 Group: Development/Tools
@@ -111,6 +111,9 @@
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
+* Fri Apr 10 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-3.1
+- Update for F10
+
 * Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-3
 - Add BuildRequires for zlib-devel
 



From rdieter at fedoraproject.org  Fri Apr 10 13:47:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 13:47:23 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.28, 1.29 ktorrent.spec, 1.94,
	1.95 sources, 1.28, 1.29
Message-ID: <20090410134723.BFFF770122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9248

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
- ktorrent-3.2.1
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	16 Feb 2009 22:55:16 -0000	1.28
+++ .cvsignore	10 Apr 2009 13:46:53 -0000	1.29
@@ -1 +1 @@
-ktorrent-3.2.tar.bz2
+ktorrent-3.2.1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ktorrent.spec	26 Feb 2009 20:53:48 -0000	1.94
+++ ktorrent.spec	10 Apr 2009 13:46:53 -0000	1.95
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2
-Release:        8%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -11,22 +11,22 @@
 Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel >= 4.1.0
-BuildRequires: kdepimlibs-devel
 BuildRequires: avahi-devel
 BuildRequires: cmake   
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: qca2-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
 BuildRequires: gmp-devel
+# libtaskmanager support
+BuildRequires: kdebase-workspace-devel
+BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdepimlibs-devel
+BuildRequires: plasma-devel
+BuildRequires: qca2-devel
+BuildRequires: taglib-devel
 
-%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.1.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
 Requires: kdelibs4 >= %{kdelibs4_ver} 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -51,29 +51,33 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# validate desktop file
-desktop-file-install --vendor=""                          \
-        --dir="%{buildroot}%{_datadir}/applications/kde4" \
-        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
-
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/ktorrent.desktop
+
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,18 +101,19 @@
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.9*
-%{_kde4_libdir}/libktcore.so.8*
+%{_kde4_libdir}/libbtcore.so.10*
+%{_kde4_libdir}/libktcore.so.9*
 %{_kde4_libdir}/libktupnp.so.4*
-%{_kde4_datadir}/icons/hicolor/*/actions/*png
-%{_kde4_datadir}/icons/hicolor/*/actions/*svgz
-%{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
-%{_kde4_datadir}/kde4/apps/ktorrent/
+%{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
+%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,6 +124,10 @@
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
+- ktorrent-3.2.1
+- optimize scriptlets
+
 * Tue Feb 26 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2-8
 - Some spec file dependency fixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	16 Feb 2009 22:55:16 -0000	1.28
+++ sources	10 Apr 2009 13:46:53 -0000	1.29
@@ -1 +1 @@
-e215de7a711b3f9c33044bf97a6d8bfb  ktorrent-3.2.tar.bz2
+a013e070af30fe199d51910ebbdba5f5  ktorrent-3.2.1.tar.bz2



From gdha at fedoraproject.org  Fri Apr 10 13:50:12 2009
From: gdha at fedoraproject.org (Gratien Dhaese)
Date: Fri, 10 Apr 2009 13:50:12 +0000 (UTC)
Subject: rpms/rear/devel import.log, NONE, 1.1 rear.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410135012.BD8F270122@cvs1.fedora.phx.redhat.com>

Author: gdha

Update of /cvs/pkgs/rpms/rear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8979/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rear.spec 
Log Message:
* Fri Apr 10 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- initial import of the rear package into CVS




--- NEW FILE import.log ---
rear-1_7_20-1_fc10:HEAD:rear-1.7.20-1.fc10.src.rpm:1239371107


--- NEW FILE rear.spec ---
Name: rear
Version: 1.7.20
Release: 1%{?dist}
Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework

Group: Applications/Archiving
License: GPLv2+
URL: http://rear.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

# all RPM based systems seem to have this
Requires: mingetty binutils portmap iputils
Requires: iproute
Requires: /usr/bin/mkisofs
Requires: tar


%description
Relax and Recover (abbreviated rear) is a highly modular disaster recovery
framework for GNU/Linux based systems, but can be easily extended to other
UNIX alike systems. The disaster recovery information (and maybe the backups)
can be stored via the network, local on hard disks or USB devices, DVD/CD-R,
tape, etc. The result is also a bootable image that is capable of booting via
PXE, DVD/CD and USB media.

Relax and Recover integrates with other backup software and provides integrated
bare metal disaster recovery abilities to the compatible backup software.

%prep
%setup -q
 
%build
# no code to compile - all bash scripts

%install
rm -rf $RPM_BUILD_ROOT
# create directories
mkdir -vp \
	$RPM_BUILD_ROOT%{_mandir}/man8 \
	$RPM_BUILD_ROOT%{_datadir} \
	$RPM_BUILD_ROOT%{_sysconfdir} \
	$RPM_BUILD_ROOT%{_sbindir} \
	$RPM_BUILD_ROOT%{_localstatedir}/lib/rear

# copy rear components into directories
cp -av usr/share/rear $RPM_BUILD_ROOT%{_datadir}/
cp -av usr/sbin/rear $RPM_BUILD_ROOT%{_sbindir}/
cp -av etc/rear $RPM_BUILD_ROOT%{_sysconfdir}/

# patch rear main script with correct locations for rear components
sed -i	-e 's#^CONFIG_DIR=.*#CONFIG_DIR="%{_sysconfdir}/rear"#' \
	-e 's#^SHARE_DIR=.*#SHARE_DIR="%{_datadir}/rear"#' \
	-e 's#^VAR_DIR=.*#VAR_DIR="%{_localstatedir}/lib/rear"#' \
	$RPM_BUILD_ROOT%{_sbindir}/rear

# update man page with correct locations
sed	-e 's#/etc#%{_sysconfdir}#' \
	-e 's#/usr/sbin#%{_sbindir}#' \
	-e 's#/usr/share#%{_datadir}#' \
	-e 's#/usr/share/doc/packages#%{_docdir}#' \
	doc/rear.8 >$RPM_BUILD_ROOT%{_mandir}/man8/rear.8

# remove doc files under  $RPM_BUILD_ROOT/usr/share/rear
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/README
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/CHANGES
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/COPYING
rm -rf $RPM_BUILD_ROOT%{_datadir}/rear/doc/*

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING CHANGES README
%doc doc/README.doc doc/relax-recover-*
%{_sbindir}/rear
%{_datadir}/rear
%{_localstatedir}/lib/rear
%{_mandir}/man8/*
%config(noreplace) %{_sysconfdir}/rear


%changelog
* Thu Apr 02 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- update %%_localstatedir/rear to %%_localstatedir/lib/rear

* Mon Mar 16 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.19-1
- updated description, made the spec file a bit more readable
- changed BuildArchives in BuildArch

* Sun Mar 15 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.18-1
- updated spec file to support openSUSE 11.1

* Fri Mar 13 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.17-1
- do not gzip man page in spec file - rpmbuild will do this for us
- added extra %%doc line for excluding man page from doc itself

* Thu Feb 26 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.16-1
- make the spec better readable and removed not spec related items in changelog

* Tue Feb 04 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.15-1
- update the Fedora spec file with the 1.7.14 items
- added VAR_DIR (%%{_localstatedir}) variable to rear for /var/rear/recovery system data

* Thu Jan 29 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.14-1
- added man page

* Tue Jan 20 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.13-1
- add COPYING license file

* Wed Dec 17 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.10-1
- remove contrib entry from %%doc line in spec file

* Mon Dec 01 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.9-1
- copy rear.sourcespec according OS_VENDOR
- correct rear.spec file according comment 11 of bugzilla #468189

* Mon Oct 27 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.8-1
- Fix rpmlint error/warnings for Fedora packaging
- updated the Summary line and %%install section

* Thu Oct 24 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.7-1
- rewrote rear.spec for Fedora Packaging request

* Tue Aug 28 2006 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.0-1
- Initial RPM Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rear/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:05:31 -0000	1.1
+++ .cvsignore	10 Apr 2009 13:49:42 -0000	1.2
@@ -0,0 +1 @@
+rear-1.7.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rear/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:05:31 -0000	1.1
+++ sources	10 Apr 2009 13:49:42 -0000	1.2
@@ -0,0 +1 @@
+8fed5a4d9e12aa94a97adff06979345a  rear-1.7.20.tar.gz



From rdieter at fedoraproject.org  Fri Apr 10 13:52:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 13:52:54 +0000 (UTC)
Subject: rpms/libpqxx/devel import.log, NONE, 1.1 libpqxx-3.0.tar.gz.md5sum, 
	NONE, 1.1 .cvsignore, 1.8, 1.9 libpqxx-2.6.8-visibility.patch,
	1.3, 1.4 libpqxx.spec, 1.24, 1.25 sources, 1.8,
	1.9 libpqxx-2.6.8-visibility-2.patch, 1.1, NONE
Message-ID: <20090410135254.27AFB70137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10961/devel

Modified Files:
	.cvsignore libpqxx-2.6.8-visibility.patch libpqxx.spec sources 
Added Files:
	import.log libpqxx-3.0.tar.gz.md5sum 
Removed Files:
	libpqxx-2.6.8-visibility-2.patch 
Log Message:
libpqxx-3.0



--- NEW FILE import.log ---
libpqxx-3_0-1_fc11:HEAD:libpqxx-3.0-1.fc11.src.rpm:1239371549


--- NEW FILE libpqxx-3.0.tar.gz.md5sum ---
57b0fe82ed08df7b8fbe3df313960001 *libpqxx-3.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Aug 2007 14:13:29 -0000	1.8
+++ .cvsignore	10 Apr 2009 13:52:23 -0000	1.9
@@ -1,4 +1 @@
-libpqxx-2.6.7.tar.gz
-libpqxx-2.6.8.tar.gz
-libpqxx-2.6.8.tar.gz.md5sum
-libpqxx-2.6.9.tar.gz
+libpqxx-3.0.tar.gz

libpqxx-2.6.8-visibility.patch:

Index: libpqxx-2.6.8-visibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx-2.6.8-visibility.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libpqxx-2.6.8-visibility.patch	9 Apr 2009 18:41:33 -0000	1.3
+++ libpqxx-2.6.8-visibility.patch	10 Apr 2009 13:52:23 -0000	1.4
@@ -1,6 +1,31 @@
---- libpqxx-2.6.8/configure.disable_visibility	2006-09-06 04:53:48.000000000 -0500
-+++ libpqxx-2.6.8/configure	2006-09-20 13:51:53.000000000 -0500
-@@ -20203,7 +20203,7 @@
+diff -up libpqxx-2.6.8/configure.ac.in.visibility libpqxx-2.6.8/configure.ac.in
+--- libpqxx-2.6.8/configure.ac.in.visibility	2006-09-04 06:36:59.000000000 -0500
++++ libpqxx-2.6.8/configure.ac.in	2008-02-19 08:33:36.000000000 -0600
+@@ -129,7 +129,7 @@ if test "$GCC" = "yes" ; then
+ AC_MSG_CHECKING([g++ visibility attribute])
+ gcc_visibility=yes
+ SAVE_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror"
++#CXXFLAGS="$CXXFLAGS -Werror"
+ AC_TRY_COMPILE([
+ struct __attribute__ ((visibility("hidden"))) d { d() {} void f() {} };
+ 	],
+diff -up libpqxx-2.6.8/configure.ac.visibility libpqxx-2.6.8/configure.ac
+--- libpqxx-2.6.8/configure.ac.visibility	2006-09-06 04:53:36.000000000 -0500
++++ libpqxx-2.6.8/configure.ac	2008-02-19 08:33:44.000000000 -0600
+@@ -129,7 +129,7 @@ if test "$GCC" = "yes" ; then
+ AC_MSG_CHECKING([g++ visibility attribute])
+ gcc_visibility=yes
+ SAVE_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror"
++#CXXFLAGS="$CXXFLAGS -Werror"
+ AC_TRY_COMPILE([
+ struct __attribute__ ((visibility("hidden"))) d { d() {} void f() {} };
+ 	],
+diff -up libpqxx-2.6.8/configure.visibility libpqxx-2.6.8/configure
+--- libpqxx-2.6.8/configure.visibility	2006-09-06 04:53:48.000000000 -0500
++++ libpqxx-2.6.8/configure	2008-02-19 08:33:47.000000000 -0600
+@@ -20203,7 +20203,7 @@ if test "$GCC" = "yes" ; then
  echo $ECHO_N "checking g++ visibility attribute... $ECHO_C" >&6; }
  gcc_visibility=yes
  SAVE_CXXFLAGS="$CXXFLAGS"


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libpqxx.spec	9 Apr 2009 18:41:33 -0000	1.24
+++ libpqxx.spec	10 Apr 2009 13:52:23 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           libpqxx
-Version:        2.6.8
-Release:        13%{?dist}
+Version:        3.0
+Release:        1%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -12,10 +12,7 @@
 
 # drop -Werror for now, since we get -fvisibility warnings using gcc-4.1.1/fc6+
 # http://thaiopensource.org/development/libpqxx/ticket/83
-# or .. actually fix it.
 Patch1:         libpqxx-2.6.8-visibility.patch
-# or better yet, fix it:
-Patch11:        libpqxx-2.6.8-visibility-2.patch
 Patch2:         libpqxx-2.6.8-gcc43.patch
 Patch3:         libpqxx-2.6.8-multilib.patch
 
@@ -44,19 +41,21 @@
 # fix spurious permissions
 chmod -x COPYING INSTALL
 
-%patch11 -p1 -b .visibility
-%patch2 -p1 -b .gcc43
+#if ! 0%{?fedora} > 8 
+#patch1 -p1 -b .visibility
+#endif
+#patch2 -p1 -b .gcc43
 %patch3 -p1 -b .multilib
 
 # better fix/hack for current rpath and libtool issues
-libtoolize --force
-autoreconf -f -i
+#libtoolize --force 
+#autoreconf -f -i
 
 
 %build
 %configure --enable-shared --disable-static
 
-# rpath sucks...
+# rpath suckage
 #sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
 
 make %{?_smp_mflags}
@@ -86,7 +85,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-%{version}.so
+%{_libdir}/libpqxx-*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -98,8 +97,8 @@
 
 
 %changelog
-* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.8-13
-- properly fix visibility issues
+* Thu Apr 09 2009 Rex Dieter <rdieter at fedoraproject.org> 3.0.0-1
+- libpqxx-3.0
 
 * Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 2.6.8-12
 - Rebuilt against libtool 2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Aug 2007 14:13:29 -0000	1.8
+++ sources	10 Apr 2009 13:52:23 -0000	1.9
@@ -1,2 +1 @@
-cb818ca7698955bcea8b7ba1b7962811  libpqxx-2.6.8.tar.gz
-21cc6ac2cd7bb6fc9a16639c29acbf21  libpqxx-2.6.8.tar.gz.md5sum
+57b0fe82ed08df7b8fbe3df313960001  libpqxx-3.0.tar.gz


--- libpqxx-2.6.8-visibility-2.patch DELETED ---



From limb at fedoraproject.org  Fri Apr 10 13:54:21 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 10 Apr 2009 13:54:21 +0000 (UTC)
Subject: rpms/roundcubemail/F-10 roundcubemail.spec, 1.20, 1.21 sources, 1.11,
	1.12
Message-ID: <20090410135421.B70BB70122@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11946

Modified Files:
	roundcubemail.spec sources 
Log Message:
0.2.1.



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-10/roundcubemail.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- roundcubemail.spec	31 Mar 2009 11:50:20 -0000	1.20
+++ roundcubemail.spec	10 Apr 2009 13:53:50 -0000	1.21
@@ -1,13 +1,13 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
-Version:  0.2
-Release:  9.stable%{?dist}
+Version:  0.2.1
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-stable-dep.tar.gz
+Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
@@ -16,7 +16,7 @@
 #Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
 #Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
-Patch3: roundcubemail-0.2-CVE-2009-0413.patch
+#Patch3: roundcubemail-0.2-CVE-2009-0413.patch
 Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
 
 BuildArch: noarch
@@ -45,12 +45,12 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2-stable-dep
+%setup -q -n roundcubemail-0.2.1-dep
 
 %patch0 -p0
 #%patch1 -p0
 #%patch2 -p0
-%patch3 -p0
+#%patch3 -p0
 %patch4 -p0
 
 # fix permissions and remove any .htaccess files
@@ -139,6 +139,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> = 0.2.1-1
+- New upstream.
+
 * Mon Mar 30 2009 Jon Ciesla <limb at jcomserv.net> = 0.2-9.stable
 - Patch for PG until php-pear-MDB2 hits 1.5.0 stable. BZ 489505.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Jan 2009 14:03:50 -0000	1.11
+++ sources	10 Apr 2009 13:53:51 -0000	1.12
@@ -1 +1 @@
-dac7776b063bf2314f7d7730af2b1b0f  roundcubemail-0.2-stable-dep.tar.gz
+86e9238b31a917eeabb23ba1d226c1dc  roundcubemail-0.2.1-dep.tar.gz



From limb at fedoraproject.org  Fri Apr 10 13:59:01 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 10 Apr 2009 13:59:01 +0000 (UTC)
Subject: rpms/roundcubemail/F-9 roundcubemail.spec, 1.17, 1.18 sources, 1.10,
	1.11
Message-ID: <20090410135901.F0EE770122@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13579

Modified Files:
	roundcubemail.spec sources 
Log Message:
0.2.1.



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-9/roundcubemail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- roundcubemail.spec	31 Mar 2009 11:50:20 -0000	1.17
+++ roundcubemail.spec	10 Apr 2009 13:58:31 -0000	1.18
@@ -1,13 +1,13 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
-Version:  0.2
-Release:  9.stable%{?dist}
+Version:  0.2.1
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-stable-dep.tar.gz
+Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
@@ -16,7 +16,7 @@
 #Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
 #Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
-Patch3: roundcubemail-0.2-CVE-2009-0413.patch
+#Patch3: roundcubemail-0.2-CVE-2009-0413.patch
 Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
 
 BuildArch: noarch
@@ -45,12 +45,12 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2-stable-dep
+%setup -q -n roundcubemail-0.2.1-dep
 
 %patch0 -p0
 #%patch1 -p0
 #%patch2 -p0
-%patch3 -p0
+#%patch3 -p0
 %patch4 -p0
 
 # fix permissions and remove any .htaccess files
@@ -139,6 +139,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> = 0.2.1-1
+- New upstream.
+
 * Mon Mar 30 2009 Jon Ciesla <limb at jcomserv.net> = 0.2-9.stable
 - Patch for PG until php-pear-MDB2 hits 1.5.0 stable. BZ 489505.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Feb 2009 16:36:46 -0000	1.10
+++ sources	10 Apr 2009 13:58:31 -0000	1.11
@@ -1 +1 @@
-dac7776b063bf2314f7d7730af2b1b0f  roundcubemail-0.2-stable-dep.tar.gz
+86e9238b31a917eeabb23ba1d226c1dc  roundcubemail-0.2.1-dep.tar.gz



From rdieter at fedoraproject.org  Fri Apr 10 13:59:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 13:59:23 +0000 (UTC)
Subject: rpms/libpqxx/devel .cvsignore, 1.9, 1.10 libpqxx.spec, 1.25,
	1.26 sources, 1.9, 1.10 libpqxx-2.6.8-gcc43.patch, 1.1,
	NONE libpqxx-2.6.8-visibility.patch, 1.4,
	NONE libpqxx-3.0.tar.gz.md5sum, 1.1, NONE
Message-ID: <20090410135923.DC52A70122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libpqxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13739

Modified Files:
	.cvsignore libpqxx.spec sources 
Removed Files:
	libpqxx-2.6.8-gcc43.patch libpqxx-2.6.8-visibility.patch 
	libpqxx-3.0.tar.gz.md5sum 
Log Message:
housecleaning



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2009 13:52:23 -0000	1.9
+++ .cvsignore	10 Apr 2009 13:58:53 -0000	1.10
@@ -1 +1,2 @@
 libpqxx-3.0.tar.gz
+libpqxx-3.0.tar.gz.md5sum


Index: libpqxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libpqxx.spec	10 Apr 2009 13:52:23 -0000	1.25
+++ libpqxx.spec	10 Apr 2009 13:58:53 -0000	1.26
@@ -10,13 +10,8 @@
 Source1:        http://pqxx.org/download/software/libpqxx/libpqxx-%{version}.tar.gz.md5sum
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# drop -Werror for now, since we get -fvisibility warnings using gcc-4.1.1/fc6+
-# http://thaiopensource.org/development/libpqxx/ticket/83
-Patch1:         libpqxx-2.6.8-visibility.patch
-Patch2:         libpqxx-2.6.8-gcc43.patch
 Patch3:         libpqxx-2.6.8-multilib.patch
 
-BuildRequires:  automake libtool
 BuildRequires:  postgresql-devel
 BuildRequires:  pkgconfig
 
@@ -39,25 +34,14 @@
 %setup -q
 
 # fix spurious permissions
-chmod -x COPYING INSTALL
+chmod -x COPYING
 
-#if ! 0%{?fedora} > 8 
-#patch1 -p1 -b .visibility
-#endif
-#patch2 -p1 -b .gcc43
 %patch3 -p1 -b .multilib
 
-# better fix/hack for current rpath and libtool issues
-#libtoolize --force 
-#autoreconf -f -i
-
 
 %build
 %configure --enable-shared --disable-static
 
-# rpath suckage
-#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
-
 make %{?_smp_mflags}
 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpqxx/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Apr 2009 13:52:23 -0000	1.9
+++ sources	10 Apr 2009 13:58:53 -0000	1.10
@@ -1 +1,2 @@
 57b0fe82ed08df7b8fbe3df313960001  libpqxx-3.0.tar.gz
+b0d0ab5450cfa9d18c204391225c2b63  libpqxx-3.0.tar.gz.md5sum


--- libpqxx-2.6.8-gcc43.patch DELETED ---


--- libpqxx-2.6.8-visibility.patch DELETED ---


--- libpqxx-3.0.tar.gz.md5sum DELETED ---



From gdha at fedoraproject.org  Fri Apr 10 13:59:44 2009
From: gdha at fedoraproject.org (Gratien Dhaese)
Date: Fri, 10 Apr 2009 13:59:44 +0000 (UTC)
Subject: rpms/rear/F-10 import.log, NONE, 1.1 rear.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410135944.59D4F70122@cvs1.fedora.phx.redhat.com>

Author: gdha

Update of /cvs/pkgs/rpms/rear/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13513/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rear.spec 
Log Message:
* Fri Apr 10 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- initial import of the rear package into CVS



--- NEW FILE import.log ---
rear-1_7_20-1_fc10:F-10:rear-1.7.20-1.fc10.src.rpm:1239371821


--- NEW FILE rear.spec ---
Name: rear
Version: 1.7.20
Release: 1%{?dist}
Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework

Group: Applications/Archiving
License: GPLv2+
URL: http://rear.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

# all RPM based systems seem to have this
Requires: mingetty binutils portmap iputils
Requires: iproute
Requires: /usr/bin/mkisofs
Requires: tar


%description
Relax and Recover (abbreviated rear) is a highly modular disaster recovery
framework for GNU/Linux based systems, but can be easily extended to other
UNIX alike systems. The disaster recovery information (and maybe the backups)
can be stored via the network, local on hard disks or USB devices, DVD/CD-R,
tape, etc. The result is also a bootable image that is capable of booting via
PXE, DVD/CD and USB media.

Relax and Recover integrates with other backup software and provides integrated
bare metal disaster recovery abilities to the compatible backup software.

%prep
%setup -q
 
%build
# no code to compile - all bash scripts

%install
rm -rf $RPM_BUILD_ROOT
# create directories
mkdir -vp \
	$RPM_BUILD_ROOT%{_mandir}/man8 \
	$RPM_BUILD_ROOT%{_datadir} \
	$RPM_BUILD_ROOT%{_sysconfdir} \
	$RPM_BUILD_ROOT%{_sbindir} \
	$RPM_BUILD_ROOT%{_localstatedir}/lib/rear

# copy rear components into directories
cp -av usr/share/rear $RPM_BUILD_ROOT%{_datadir}/
cp -av usr/sbin/rear $RPM_BUILD_ROOT%{_sbindir}/
cp -av etc/rear $RPM_BUILD_ROOT%{_sysconfdir}/

# patch rear main script with correct locations for rear components
sed -i	-e 's#^CONFIG_DIR=.*#CONFIG_DIR="%{_sysconfdir}/rear"#' \
	-e 's#^SHARE_DIR=.*#SHARE_DIR="%{_datadir}/rear"#' \
	-e 's#^VAR_DIR=.*#VAR_DIR="%{_localstatedir}/lib/rear"#' \
	$RPM_BUILD_ROOT%{_sbindir}/rear

# update man page with correct locations
sed	-e 's#/etc#%{_sysconfdir}#' \
	-e 's#/usr/sbin#%{_sbindir}#' \
	-e 's#/usr/share#%{_datadir}#' \
	-e 's#/usr/share/doc/packages#%{_docdir}#' \
	doc/rear.8 >$RPM_BUILD_ROOT%{_mandir}/man8/rear.8

# remove doc files under  $RPM_BUILD_ROOT/usr/share/rear
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/README
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/CHANGES
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/COPYING
rm -rf $RPM_BUILD_ROOT%{_datadir}/rear/doc/*

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING CHANGES README
%doc doc/README.doc doc/relax-recover-*
%{_sbindir}/rear
%{_datadir}/rear
%{_localstatedir}/lib/rear
%{_mandir}/man8/*
%config(noreplace) %{_sysconfdir}/rear


%changelog
* Thu Apr 02 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- update %%_localstatedir/rear to %%_localstatedir/lib/rear

* Mon Mar 16 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.19-1
- updated description, made the spec file a bit more readable
- changed BuildArchives in BuildArch

* Sun Mar 15 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.18-1
- updated spec file to support openSUSE 11.1

* Fri Mar 13 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.17-1
- do not gzip man page in spec file - rpmbuild will do this for us
- added extra %%doc line for excluding man page from doc itself

* Thu Feb 26 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.16-1
- make the spec better readable and removed not spec related items in changelog

* Tue Feb 04 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.15-1
- update the Fedora spec file with the 1.7.14 items
- added VAR_DIR (%%{_localstatedir}) variable to rear for /var/rear/recovery system data

* Thu Jan 29 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.14-1
- added man page

* Tue Jan 20 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.13-1
- add COPYING license file

* Wed Dec 17 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.10-1
- remove contrib entry from %%doc line in spec file

* Mon Dec 01 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.9-1
- copy rear.sourcespec according OS_VENDOR
- correct rear.spec file according comment 11 of bugzilla #468189

* Mon Oct 27 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.8-1
- Fix rpmlint error/warnings for Fedora packaging
- updated the Summary line and %%install section

* Thu Oct 24 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.7-1
- rewrote rear.spec for Fedora Packaging request

* Tue Aug 28 2006 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.0-1
- Initial RPM Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rear/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:05:31 -0000	1.1
+++ .cvsignore	10 Apr 2009 13:59:14 -0000	1.2
@@ -0,0 +1 @@
+rear-1.7.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rear/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:05:31 -0000	1.1
+++ sources	10 Apr 2009 13:59:14 -0000	1.2
@@ -0,0 +1 @@
+8fed5a4d9e12aa94a97adff06979345a  rear-1.7.20.tar.gz



From rdieter at fedoraproject.org  Fri Apr 10 14:03:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 14:03:04 +0000 (UTC)
Subject: rpms/ktorrent/F-9 .cvsignore, 1.26, 1.27 ktorrent.spec, 1.70,
	1.71 sources, 1.26, 1.27
Message-ID: <20090410140304.887E670122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15156

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
- ktorrent-3.2.1
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Feb 2009 21:31:13 -0000	1.26
+++ .cvsignore	10 Apr 2009 14:02:34 -0000	1.27
@@ -1 +1 @@
-ktorrent-3.2.tar.bz2
+ktorrent-3.2.1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-9/ktorrent.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ktorrent.spec	26 Feb 2009 21:31:14 -0000	1.70
+++ ktorrent.spec	10 Apr 2009 14:02:34 -0000	1.71
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2
-Release:        8%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -11,22 +11,22 @@
 Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel >= 4.1.0
-BuildRequires: kdepimlibs-devel
 BuildRequires: avahi-devel
 BuildRequires: cmake   
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: qca2-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
 BuildRequires: gmp-devel
+# libtaskmanager support
+BuildRequires: kdebase-workspace-devel
+BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdepimlibs-devel
+BuildRequires: plasma-devel
+BuildRequires: qca2-devel
+BuildRequires: taglib-devel
 
-%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.1.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
 Requires: kdelibs4 >= %{kdelibs4_ver} 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -51,29 +51,33 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# validate desktop file
-desktop-file-install --vendor=""                          \
-        --dir="%{buildroot}%{_datadir}/applications/kde4" \
-        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
-
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/ktorrent.desktop
+
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,18 +101,19 @@
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.9*
-%{_kde4_libdir}/libktcore.so.8*
+%{_kde4_libdir}/libbtcore.so.10*
+%{_kde4_libdir}/libktcore.so.9*
 %{_kde4_libdir}/libktupnp.so.4*
-%{_kde4_datadir}/icons/hicolor/*/actions/*png
-%{_kde4_datadir}/icons/hicolor/*/actions/*svgz
-%{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
-%{_kde4_datadir}/kde4/apps/ktorrent/
+%{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
+%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,6 +124,10 @@
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
+- ktorrent-3.2.1
+- optimize scriptlets
+
 * Tue Feb 26 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2-8
 - Some spec file dependency fixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	26 Feb 2009 21:31:14 -0000	1.26
+++ sources	10 Apr 2009 14:02:34 -0000	1.27
@@ -1 +1 @@
-e215de7a711b3f9c33044bf97a6d8bfb  ktorrent-3.2.tar.bz2
+a013e070af30fe199d51910ebbdba5f5  ktorrent-3.2.1.tar.bz2



From jwrdegoede at fedoraproject.org  Fri Apr 10 14:04:40 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 10 Apr 2009 14:04:40 +0000 (UTC)
Subject: rpms/openmsx/devel .cvsignore, 1.3, 1.4 openmsx.spec, 1.9,
	1.10 sources, 1.3, 1.4 openmsx-0.6.3-gcc44.patch, 1.1, NONE
Message-ID: <20090410140440.EFE5570122@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/openmsx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15708

Modified Files:
	.cvsignore openmsx.spec sources 
Removed Files:
	openmsx-0.6.3-gcc44.patch 
Log Message:
* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 0.7.0-1
- New upstream release 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jan 2008 19:30:47 -0000	1.3
+++ .cvsignore	10 Apr 2009 14:04:10 -0000	1.4
@@ -1 +1 @@
-openmsx-0.6.3.tar.gz
+openmsx-0.7.0.tar.gz


Index: openmsx.spec
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/openmsx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openmsx.spec	26 Feb 2009 08:36:29 -0000	1.9
+++ openmsx.spec	10 Apr 2009 14:04:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           openmsx
-Version:        0.6.3
-Release:        7%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
@@ -9,7 +9,6 @@
 Patch0:         openmsx-0.6.1-installbase.patch
 Patch1:         openmsx-0.6.1-flavour.patch
 Patch2:         openmsx-0.6.3-datadir.patch
-Patch3:         openmsx-0.6.3-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
@@ -33,7 +32,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Verbose compilation
 sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk
@@ -104,7 +102,7 @@
 
 install -pm 0755 derived/%{name} %{buildroot}%{_bindir}
 install -pm 0644 OPENMSX.1 %{buildroot}%{_mandir}/man1/openmsx.1
-cp -a share/{extensions,keymaps,machines,scripts,shaders,skins,systemroms} \
+cp -a share/{extensions,keymaps,machines,scripts,shaders,skins,systemroms,unicodemaps} \
     %{buildroot}%{_datadir}/%{name}
 install -pm 0644 share/softwaredb.xml %{buildroot}%{_datadir}/%{name}
 install -pm 0644 share/init.tcl %{buildroot}%{_datadir}/%{name}
@@ -156,6 +154,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 0.7.0-1
+- New upstream release 0.7.0
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jan 2008 19:30:47 -0000	1.3
+++ sources	10 Apr 2009 14:04:10 -0000	1.4
@@ -1 +1 @@
-29d4a4d9a1b6226c3aef85fa57fe9ca0  openmsx-0.6.3.tar.gz
+ea5c07225ee28713c0cda8f8edcfab05  openmsx-0.7.0.tar.gz


--- openmsx-0.6.3-gcc44.patch DELETED ---



From rdieter at fedoraproject.org  Fri Apr 10 14:05:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 14:05:38 +0000 (UTC)
Subject: rpms/ktorrent/F-10 .cvsignore, 1.27, 1.28 ktorrent.spec, 1.85,
	1.86 sources, 1.27, 1.28
Message-ID: <20090410140538.8789670122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16205

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
- ktorrent-3.2.1
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Feb 2009 21:30:56 -0000	1.27
+++ .cvsignore	10 Apr 2009 14:05:07 -0000	1.28
@@ -1 +1 @@
-ktorrent-3.2.tar.bz2
+ktorrent-3.2.1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ktorrent.spec	26 Feb 2009 21:30:56 -0000	1.85
+++ ktorrent.spec	10 Apr 2009 14:05:07 -0000	1.86
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2
-Release:        8%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -11,22 +11,22 @@
 Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel >= 4.1.0
-BuildRequires: kdepimlibs-devel
 BuildRequires: avahi-devel
 BuildRequires: cmake   
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: qca2-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
 BuildRequires: gmp-devel
+# libtaskmanager support
+BuildRequires: kdebase-workspace-devel
+BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdepimlibs-devel
+BuildRequires: plasma-devel
+BuildRequires: qca2-devel
+BuildRequires: taglib-devel
 
-%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.1.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
 Requires: kdelibs4 >= %{kdelibs4_ver} 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -51,29 +51,33 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# validate desktop file
-desktop-file-install --vendor=""                          \
-        --dir="%{buildroot}%{_datadir}/applications/kde4" \
-        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
-
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/ktorrent.desktop
+
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,18 +101,19 @@
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.9*
-%{_kde4_libdir}/libktcore.so.8*
+%{_kde4_libdir}/libbtcore.so.10*
+%{_kde4_libdir}/libktcore.so.9*
 %{_kde4_libdir}/libktupnp.so.4*
-%{_kde4_datadir}/icons/hicolor/*/actions/*png
-%{_kde4_datadir}/icons/hicolor/*/actions/*svgz
-%{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
-%{_kde4_datadir}/kde4/apps/ktorrent/
+%{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
+%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,6 +124,10 @@
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
+- ktorrent-3.2.1
+- optimize scriptlets
+
 * Tue Feb 26 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2-8
 - Some spec file dependency fixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	26 Feb 2009 21:30:56 -0000	1.27
+++ sources	10 Apr 2009 14:05:08 -0000	1.28
@@ -1 +1 @@
-e215de7a711b3f9c33044bf97a6d8bfb  ktorrent-3.2.tar.bz2
+a013e070af30fe199d51910ebbdba5f5  ktorrent-3.2.1.tar.bz2



From gdha at fedoraproject.org  Fri Apr 10 14:06:13 2009
From: gdha at fedoraproject.org (Gratien Dhaese)
Date: Fri, 10 Apr 2009 14:06:13 +0000 (UTC)
Subject: rpms/rear/F-11 import.log, NONE, 1.1 rear.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410140613.B9B1870122@cvs1.fedora.phx.redhat.com>

Author: gdha

Update of /cvs/pkgs/rpms/rear/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16358/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rear.spec 
Log Message:
* Fri Apr 10 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- initial import of the rear package into CVS



--- NEW FILE import.log ---
rear-1_7_20-1_fc10:F-11:rear-1.7.20-1.fc10.src.rpm:1239372266


--- NEW FILE rear.spec ---
Name: rear
Version: 1.7.20
Release: 1%{?dist}
Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework

Group: Applications/Archiving
License: GPLv2+
URL: http://rear.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

# all RPM based systems seem to have this
Requires: mingetty binutils portmap iputils
Requires: iproute
Requires: /usr/bin/mkisofs
Requires: tar


%description
Relax and Recover (abbreviated rear) is a highly modular disaster recovery
framework for GNU/Linux based systems, but can be easily extended to other
UNIX alike systems. The disaster recovery information (and maybe the backups)
can be stored via the network, local on hard disks or USB devices, DVD/CD-R,
tape, etc. The result is also a bootable image that is capable of booting via
PXE, DVD/CD and USB media.

Relax and Recover integrates with other backup software and provides integrated
bare metal disaster recovery abilities to the compatible backup software.

%prep
%setup -q
 
%build
# no code to compile - all bash scripts

%install
rm -rf $RPM_BUILD_ROOT
# create directories
mkdir -vp \
	$RPM_BUILD_ROOT%{_mandir}/man8 \
	$RPM_BUILD_ROOT%{_datadir} \
	$RPM_BUILD_ROOT%{_sysconfdir} \
	$RPM_BUILD_ROOT%{_sbindir} \
	$RPM_BUILD_ROOT%{_localstatedir}/lib/rear

# copy rear components into directories
cp -av usr/share/rear $RPM_BUILD_ROOT%{_datadir}/
cp -av usr/sbin/rear $RPM_BUILD_ROOT%{_sbindir}/
cp -av etc/rear $RPM_BUILD_ROOT%{_sysconfdir}/

# patch rear main script with correct locations for rear components
sed -i	-e 's#^CONFIG_DIR=.*#CONFIG_DIR="%{_sysconfdir}/rear"#' \
	-e 's#^SHARE_DIR=.*#SHARE_DIR="%{_datadir}/rear"#' \
	-e 's#^VAR_DIR=.*#VAR_DIR="%{_localstatedir}/lib/rear"#' \
	$RPM_BUILD_ROOT%{_sbindir}/rear

# update man page with correct locations
sed	-e 's#/etc#%{_sysconfdir}#' \
	-e 's#/usr/sbin#%{_sbindir}#' \
	-e 's#/usr/share#%{_datadir}#' \
	-e 's#/usr/share/doc/packages#%{_docdir}#' \
	doc/rear.8 >$RPM_BUILD_ROOT%{_mandir}/man8/rear.8

# remove doc files under  $RPM_BUILD_ROOT/usr/share/rear
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/README
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/CHANGES
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/COPYING
rm -rf $RPM_BUILD_ROOT%{_datadir}/rear/doc/*

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING CHANGES README
%doc doc/README.doc doc/relax-recover-*
%{_sbindir}/rear
%{_datadir}/rear
%{_localstatedir}/lib/rear
%{_mandir}/man8/*
%config(noreplace) %{_sysconfdir}/rear


%changelog
* Thu Apr 02 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- update %%_localstatedir/rear to %%_localstatedir/lib/rear

* Mon Mar 16 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.19-1
- updated description, made the spec file a bit more readable
- changed BuildArchives in BuildArch

* Sun Mar 15 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.18-1
- updated spec file to support openSUSE 11.1

* Fri Mar 13 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.17-1
- do not gzip man page in spec file - rpmbuild will do this for us
- added extra %%doc line for excluding man page from doc itself

* Thu Feb 26 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.16-1
- make the spec better readable and removed not spec related items in changelog

* Tue Feb 04 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.15-1
- update the Fedora spec file with the 1.7.14 items
- added VAR_DIR (%%{_localstatedir}) variable to rear for /var/rear/recovery system data

* Thu Jan 29 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.14-1
- added man page

* Tue Jan 20 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.13-1
- add COPYING license file

* Wed Dec 17 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.10-1
- remove contrib entry from %%doc line in spec file

* Mon Dec 01 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.9-1
- copy rear.sourcespec according OS_VENDOR
- correct rear.spec file according comment 11 of bugzilla #468189

* Mon Oct 27 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.8-1
- Fix rpmlint error/warnings for Fedora packaging
- updated the Summary line and %%install section

* Thu Oct 24 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.7-1
- rewrote rear.spec for Fedora Packaging request

* Tue Aug 28 2006 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.0-1
- Initial RPM Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rear/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:05:31 -0000	1.1
+++ .cvsignore	10 Apr 2009 14:05:43 -0000	1.2
@@ -0,0 +1 @@
+rear-1.7.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rear/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:05:31 -0000	1.1
+++ sources	10 Apr 2009 14:05:43 -0000	1.2
@@ -0,0 +1 @@
+8fed5a4d9e12aa94a97adff06979345a  rear-1.7.20.tar.gz



From rdieter at fedoraproject.org  Fri Apr 10 15:05:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 15:05:42 +0000 (UTC)
Subject: rpms/qtscriptgenerator/devel qtscriptgenerator.spec,1.1,1.2
Message-ID: <20090410150542.A4F6F70122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qtscriptgenerator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32041

Modified Files:
	qtscriptgenerator.spec 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-6
- qtscriptbindings: Provides: qtscript-qt ...



Index: qtscriptgenerator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/devel/qtscriptgenerator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtscriptgenerator.spec	7 Apr 2009 15:42:05 -0000	1.1
+++ qtscriptgenerator.spec	10 Apr 2009 15:05:10 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:		qtscriptgenerator
 Version:	0.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary: 	A tool to generate Qt bindings for Qt Script	
 
 Group:		System Environment/Libraries
@@ -27,6 +27,7 @@
 %package -n qtscriptbindings 
 Summary: Qt bindings for Qt Script
 Group: System Environment/Libraries
+Provides: qtscript-qt = %{version}-%{release}
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %description -n qtscriptbindings
 Bindings providing access to substantial portions of the Qt API
@@ -96,6 +97,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-6
+- qtscriptbindings: Provides: qtscript-qt ...
+
 * Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-5
 - qtscriptgenerator/qtscriptbindings pkgs 
 - qtscriptbindings: include docs, examples



From rdieter at fedoraproject.org  Fri Apr 10 15:17:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 15:17:48 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib-1.1.16.3-mod_mimetypes_typo.patch, NONE,
	1.1 xine-lib.spec, 1.73, 1.74
Message-ID: <20090410151748.D701370122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2382

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16.3-mod_mimetypes_typo.patch 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
- fix modtracker mimetypes


xine-lib-1.1.16.3-mod_mimetypes_typo.patch:

--- NEW FILE xine-lib-1.1.16.3-mod_mimetypes_typo.patch ---
diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c
--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo	2009-03-25 14:28:40.000000000 -0500
+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c	2009-04-10 10:15:04.000000000 -0500
@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
          "audio/x-s3m: s3m: ScreamTracker 3 Module;"
          "audio/s3m: s3m: ScreamTracker 3 Module;"
          "application/playerpro: 669: 669 Tracker Module;"
-         "application/adrift; amf: ADRIFT Module File;"
-         "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
-         "audio/x-amf; amf: ADRIFT Module File;"
-         "audio/x-xm; xm: FastTracker II Audio;"
-         "audio/xm; xm: FastTracker II Audio;";
+         "application/adrift: amf: ADRIFT Module File;"
+         "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
+         "audio/x-amf: amf: ADRIFT Module File;"
+         "audio/x-xm: xm: FastTracker II Audio;"
+         "audio/xm: xm: FastTracker II Audio;";
 }
 
 static void class_dispose (demux_class_t *this_gen) {


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xine-lib.spec	3 Apr 2009 17:07:18 -0000	1.73
+++ xine-lib.spec	10 Apr 2009 15:17:17 -0000	1.74
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -55,6 +55,8 @@
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
+## upstreamable patches
+Patch50:        xine-lib-1.1.16.3-mod_mimetypes_typo.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{plugin_abi}
@@ -207,6 +209,7 @@
 
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
+%patch50 -p1 -b .mod_mimetypes_typo
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -439,6 +442,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
+- fix modtracker mimetypes
+
 * Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
 - xine-lib-1.1.16.3, plugin-abi 1.26
 



From tmraz at fedoraproject.org  Fri Apr 10 15:29:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 10 Apr 2009 15:29:28 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.74, 1.75 authconfig.spec, 1.104,
	1.105 sources, 1.82, 1.83
Message-ID: <20090410152928.4E95670122@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5530

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Fri Apr 10 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.9-1
- add support for multiple PAM auth stacks (by Ray Strode) (#494874)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	2 Apr 2009 12:04:24 -0000	1.74
+++ .cvsignore	10 Apr 2009 15:28:57 -0000	1.75
@@ -1 +1 @@
-authconfig-5.4.8.tar.bz2
+authconfig-5.4.9.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- authconfig.spec	2 Apr 2009 12:04:24 -0000	1.104
+++ authconfig.spec	10 Apr 2009 15:28:57 -0000	1.105
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.8
+Version: 5.4.9
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -59,6 +59,9 @@
 %doc COPYING NOTES TODO README.samba3
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/authconfig
 %ghost %config(noreplace) %{_sysconfdir}/pam.d/system-auth-ac
+%ghost %config(noreplace) %{_sysconfdir}/pam.d/password-auth-ac
+%ghost %config(noreplace) %{_sysconfdir}/pam.d/fingerprint-auth-ac
+%ghost %config(noreplace) %{_sysconfdir}/pam.d/smartcard-auth-ac
 %{_sbindir}/cacertdir_rehash
 %{_sbindir}/authconfig
 %{_sbindir}/authconfig-tui
@@ -95,6 +98,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 10 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.9-1
+- add support for multiple PAM auth stacks (by Ray Strode) (#494874)
+
 * Thu Apr  2 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.8-1
 - fix regression in authconfig-tui (#493576)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	2 Apr 2009 12:04:24 -0000	1.82
+++ sources	10 Apr 2009 15:28:57 -0000	1.83
@@ -1 +1 @@
-f56c26ef89768193d632fe2b52a6a0e0  authconfig-5.4.8.tar.bz2
+e7cc8550fedd320fd45ee86e99b3ca6d  authconfig-5.4.9.tar.bz2



From rdieter at fedoraproject.org  Fri Apr 10 15:32:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 15:32:29 +0000 (UTC)
Subject: rpms/amarok/devel .cvsignore, 1.43, 1.44 amarok.spec, 1.145,
	1.146 sources, 1.44, 1.45 amarok-2.0.1.1-gcc44.patch, 1.3,
	NONE amarok-2.0.1.1-qt45.patch, 1.1,
	NONE amarok-2.0.2-fix_lastfm_auth.patch, 1.1,
	NONE amarok-2.0.2-no_qtscriptgenerator.patch, 1.1,
	NONE amarok-libgpod-0.7.0.patch, 1.1, NONE
Message-ID: <20090410153229.5F0FA70122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6360

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.0.1.1-gcc44.patch amarok-2.0.1.1-qt45.patch 
	amarok-2.0.2-fix_lastfm_auth.patch 
	amarok-2.0.2-no_qtscriptgenerator.patch 
	amarok-libgpod-0.7.0.patch 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-1
- amarok-2.0.90 (amarok-2.1 beta1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	5 Mar 2009 12:49:20 -0000	1.43
+++ .cvsignore	10 Apr 2009 15:31:58 -0000	1.44
@@ -1 +1 @@
-amarok-2.0.2.tar.bz2
+amarok-2.0.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- amarok.spec	8 Apr 2009 17:09:13 -0000	1.145
+++ amarok.spec	10 Apr 2009 15:31:58 -0000	1.146
@@ -1,54 +1,42 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.0.2
-Release: 6%{?dist}
+Version: 2.0.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# From amarok svn, r871433 (Note that this was reverted later, I believe the
-# reasoning for reverting was incorrect. -- tmz :)
-Patch0:  amarok-libgpod-0.7.0.patch
-Patch1:  amarok-2.0.1.1-gcc44.patch
-
-# qtscriptgenerator review, http://bugzilla.redhat.com/489550
-%define no_qtscriptgenerator 1
-Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
-
-Patch100: amarok-2.0.1.1-qt45.patch
-# https://bugs.kde.org/188678
-Patch101: amarok-2.0.2-fix_lastfm_auth.patch
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
-BuildRequires: libgpod-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
 %endif
+%if 0%{?fedora} > 10
+#BuildRequires: libgpod-devel >= 0.7.0
+%endif
 BuildRequires: libnjb-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
+BuildRequires: qtscriptgenerator
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
+BuildRequires: taglib-extras-devel
 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
-
-%if 0%{?no_qtscriptgenerator}
-BuildRequires: qtscriptgenerator
 Requires: qtscriptbindings
-%endif
+Requires: %{name}-collectionscanner = %{version}-%{release}
 
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
@@ -62,24 +50,16 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+%package collectionscanner
+Summary: Amarok standalone collection scanner
+Group: Applications/Multimedia
+%description collectionscanner
+%{summary}.
+
 
 %prep
 %setup -q
 
-%if "%(pkg-config --modversion libgpod-1.0)" >=  "0.7.0"
-%patch0 -p0 -b .libgpod-0.7.0
-%endif
-
-%patch1 -p1 -b .gcc4
-
-%if 0%{?no_qtscriptgenerator}
-%patch2 -p1 -b .no_qtscriptgenerator
-rm -rf src/scriptengine/generator
-%else
-%{?_qt45:%patch100 -p0 -b .qt45}
-%endif
-%patch101 -p0 -b .fix_lastfm_auth
-
 
 %build
 mkdir -p %{_target_platform}
@@ -96,9 +76,11 @@
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang amarok
+%find_lang amarokcollectionscanner_qt
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
+rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
 
 
 %check
@@ -129,28 +111,37 @@
 %files -f amarok.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_kde4_bindir}/*
+%{_kde4_bindir}/amarok
+%{_kde4_bindir}/amarok_afttagger
+%{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
 %{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
-%{_kde4_configdir}/*
+%{_kde4_configdir}/amarok.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
-%{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/amarok_append.desktop
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%if ! 0%{?no_qtscriptgenerator}
-%{_kde4_libdir}/kde4/plugins/script/*.so
-%endif
 %{_kde4_libdir}/libamarok*.so.*
+%{_kde4_libdir}/libmediadevicelib.so.*
 %{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
+%files collectionscanner -f amarokcollectionscanner_qt.lang
+%defattr(-,root,root,-)
+%{_kde4_bindir}/amarokcollectionscanner
+
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-1
+- amarok-2.0.90 (amarok-2.1 beta1)
+
 * Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
 - fix lastfm (kdebug#188678, rhbz#494871)
 - fix qtscriptgenerator/qtscriptbindings deps


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	5 Mar 2009 12:49:20 -0000	1.44
+++ sources	10 Apr 2009 15:31:58 -0000	1.45
@@ -1 +1 @@
-98b78372ec6ea3432faba356c90c6dbe  amarok-2.0.2.tar.bz2
+6c904ac95926e383cd1c1c32aa3c1f0f  amarok-2.0.90.tar.bz2


--- amarok-2.0.1.1-gcc44.patch DELETED ---


--- amarok-2.0.1.1-qt45.patch DELETED ---


--- amarok-2.0.2-fix_lastfm_auth.patch DELETED ---


--- amarok-2.0.2-no_qtscriptgenerator.patch DELETED ---


--- amarok-libgpod-0.7.0.patch DELETED ---



From rdieter at fedoraproject.org  Fri Apr 10 15:43:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 15:43:43 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-bidi-kde#189161.patch, NONE,
	1.1 kdelibs.spec, 1.464, 1.465
Message-ID: <20090410154343.7133A70122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8785

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-bidi-kde#189161.patch 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- fix bidi-related hangs in khtml (kde#189161)


kdelibs-4.2.2-bidi-kde#189161.patch:

--- NEW FILE kdelibs-4.2.2-bidi-kde#189161.patch ---
--- branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/02 20:19:16	948353
+++ branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/08 23:48:02	951343
@@ -297,6 +297,7 @@
                 && next->isInlineFlow()))
             break;
         current = next;
+        next    = 0;
     }
     return next;
 }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- kdelibs.spec	8 Apr 2009 15:08:10 -0000	1.464
+++ kdelibs.spec	10 Apr 2009 15:43:12 -0000	1.465
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -89,6 +89,7 @@
 # 4.2 branch
 Patch100: kdelibs-4.2.2-kio_http.patch
 Patch101: kdelibs-4.2.2-kjob.patch
+Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -231,6 +232,7 @@
 # 4.2
 %patch100 -p0 -b .kio_http
 %patch101 -p0 -b .kjob
+%patch102 -p4 -b .bidi-kde#189161
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -415,6 +417,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- fix bidi-related hangs in khtml (kde#189161)
+
 * Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - upstream patch fix ReadOnlyPart crash for non-local file
 



From cweyl at fedoraproject.org  Fri Apr 10 15:53:41 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 10 Apr 2009 15:53:41 +0000 (UTC)
Subject: rpms/perl-Template-Timer/devel .cvsignore, 1.2,
	1.3 perl-Template-Timer.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090410155341.CE6AD70122@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Template-Timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11167

Modified Files:
	.cvsignore perl-Template-Timer.spec sources 
Log Message:
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.00-1
- update to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Timer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Mar 2008 19:30:16 -0000	1.2
+++ .cvsignore	10 Apr 2009 15:53:11 -0000	1.3
@@ -1 +1 @@
-Template-Timer-0.04.tar.gz
+Template-Timer-1.00.tar.gz


Index: perl-Template-Timer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Timer/devel/perl-Template-Timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Timer.spec	27 Feb 2009 02:05:56 -0000	1.3
+++ perl-Template-Timer.spec	10 Apr 2009 15:53:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Timer
-Version:        0.04
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Template::Timer Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.00-1
+- update to 1.00
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Timer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Mar 2008 19:30:16 -0000	1.2
+++ sources	10 Apr 2009 15:53:11 -0000	1.3
@@ -1 +1 @@
-063b7d84c5cd501a2820f9c2e601eadc  Template-Timer-0.04.tar.gz
+b7d488e5a1fd4f8171c5f81183921dc2  Template-Timer-1.00.tar.gz



From cweyl at fedoraproject.org  Fri Apr 10 15:59:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 10 Apr 2009 15:59:40 +0000 (UTC)
Subject: rpms/perl-Template-Timer/F-10 .cvsignore, 1.2,
	1.3 perl-Template-Timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090410155940.D1FD470122@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Template-Timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13106

Modified Files:
	.cvsignore perl-Template-Timer.spec sources 
Log Message:
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.00-1
- update to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Timer/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Mar 2008 19:30:16 -0000	1.2
+++ .cvsignore	10 Apr 2009 15:59:10 -0000	1.3
@@ -1 +1,8 @@
-Template-Timer-0.04.tar.gz
+Template-Timer-1.00.tar.gz
+Template-Timer-*
+*.gz
+*.rpm
+*.tar
+noarch
+clog
+.build*


Index: perl-Template-Timer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Timer/F-10/perl-Template-Timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Template-Timer.spec	18 Mar 2008 19:30:48 -0000	1.2
+++ perl-Template-Timer.spec	10 Apr 2009 15:59:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Template-Timer
-Version:        0.04
-Release:        2%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Template::Timer Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.00-1
+- update to 1.00
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Mar 18 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Timer/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Mar 2008 19:30:16 -0000	1.2
+++ sources	10 Apr 2009 15:59:10 -0000	1.3
@@ -1 +1 @@
-063b7d84c5cd501a2820f9c2e601eadc  Template-Timer-0.04.tar.gz
+b7d488e5a1fd4f8171c5f81183921dc2  Template-Timer-1.00.tar.gz



From trasher at fedoraproject.org  Fri Apr 10 16:05:24 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 10 Apr 2009 16:05:24 +0000 (UTC)
Subject: rpms/BackupPC/devel BackupPC-TopDir_change.patch, NONE,
	1.1 BackupPC.spec, 1.8, 1.9
Message-ID: <20090410160525.18D9E70122@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14342

Modified Files:
	BackupPC.spec 
Added Files:
	BackupPC-TopDir_change.patch 
Log Message:
Fix TopDir change (bug #473944)


BackupPC-TopDir_change.patch:

--- NEW FILE BackupPC-TopDir_change.patch ---
diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
@@ -152,8 +152,6 @@ sub new
     # Clean up %ENV and setup other variables.
     #
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
     if ( defined(my $error = $bpc->ConfigRead()) ) {
         print(STDERR $error, "\n");
         return;
@@ -167,6 +165,8 @@ sub new
         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
     }
     $bpc->{storage}->setPaths($paths);
+    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
 
     #
     # Verify we are running as the correct user


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BackupPC.spec	23 Feb 2009 20:01:26 -0000	1.8
+++ BackupPC.spec	10 Apr 2009 16:04:54 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -16,6 +16,7 @@
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-5
+- Fix TopDir change (bug #473944)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Apr 10 16:06:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 10 Apr 2009 16:06:54 +0000 (UTC)
Subject: rpms/pam/devel fingerprint-auth.pamd, NONE, 1.1 password-auth.pamd, 
	NONE, 1.1 smartcard-auth.pamd, NONE, 1.1 pam.spec, 1.195,
	1.196 system-auth.5, 1.1, 1.2
Message-ID: <20090410160654.E18A970122@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14938

Modified Files:
	pam.spec system-auth.5 
Added Files:
	fingerprint-auth.pamd password-auth.pamd smartcard-auth.pamd 
Log Message:
* Fri Apr 10 2009 Tomas Mraz <tmraz at redhat.com> 1.0.91-6
- add password-auth, fingerprint-auth, and smartcard-auth
  for applications which can use them namely gdm (#494874)
  patch by Ray Strode



--- NEW FILE fingerprint-auth.pamd ---
#%PAM-1.0
# This file is auto-generated.
# User changes will be destroyed the next time authconfig is run.
auth        required      pam_env.so
auth        sufficient    pam_fprintd.so
auth        required      pam_deny.so

account     required      pam_unix.so
account     sufficient    pam_localuser.so
account     sufficient    pam_succeed_if.so uid < 500 quiet
account     required      pam_permit.so

password    required      pam_deny.so

session     optional      pam_keyinit.so revoke
session     required      pam_limits.so
session     [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid
session     required      pam_unix.so


--- NEW FILE password-auth.pamd ---
#%PAM-1.0
# This file is auto-generated.
# User changes will be destroyed the next time authconfig is run.
auth        required      pam_env.so
auth        sufficient    pam_unix.so nullok try_first_pass
auth        required      pam_deny.so

account     required      pam_unix.so
account     sufficient    pam_localuser.so
account     sufficient    pam_succeed_if.so uid < 500 quiet
account     required      pam_permit.so

password    requisite     pam_cracklib.so try_first_pass retry=3 type=
password    sufficient    pam_unix.so nullok try_first_pass use_authtok
password    required      pam_deny.so

session     optional      pam_keyinit.so revoke
session     required      pam_limits.so
session     [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid
session     required      pam_unix.so


--- NEW FILE smartcard-auth.pamd ---
#%PAM-1.0
# This file is auto-generated.
# User changes will be destroyed the next time authconfig is run.
auth        required      pam_env.so
auth        [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card
auth        required      pam_deny.so

account     required      pam_unix.so
account     sufficient    pam_localuser.so
account     sufficient    pam_succeed_if.so uid < 500 quiet
account     required      pam_permit.so

password    optional      pam_pkcs11.so
password    requisite     pam_cracklib.so try_first_pass retry=3 type=

session     optional      pam_keyinit.so revoke
session     required      pam_limits.so
session     [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid
session     required      pam_unix.so


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- pam.spec	26 Mar 2009 11:26:22 -0000	1.195
+++ pam.spec	10 Apr 2009 16:06:24 -0000	1.196
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.0.91
-Release: 5%{?dist}
+Release: 6%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 # pam_rhosts_auth module is BSD with advertising
@@ -14,11 +14,14 @@
 Source2: https://fedorahosted.org/releases/p/a/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2
 Source5: other.pamd
 Source6: system-auth.pamd
-Source7: config-util.pamd
-Source8: dlopen.sh
-Source9: system-auth.5
-Source10: config-util.5
-Source11: 90-nproc.conf
+Source7: password-auth.pamd
+Source8: fingerprint-auth.pamd
+Source9: smartcard-auth.pamd
+Source10: config-util.pamd
+Source11: dlopen.sh
+Source12: system-auth.5
+Source13: config-util.5
+Source14: 90-nproc.conf
 Patch1:  pam-1.0.90-redhat-modules.patch
 Patch2:  pam-1.0.91-std-noclose.patch
 
@@ -84,6 +87,7 @@
 %patch1 -p1 -b .redhat-modules
 %patch2 -p1 -b .std-noclose
 
+libtoolize -f
 autoreconf
 
 %build
@@ -126,15 +130,18 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_pamconfdir}
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_pamconfdir}/other
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pamconfdir}/system-auth
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pamconfdir}/config-util
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/90-nproc.conf
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pamconfdir}/password-auth
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_pamconfdir}/fingerprint-auth
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_pamconfdir}/smartcard-auth
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_pamconfdir}/config-util
+install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/90-nproc.conf
 install -m 600 /dev/null $RPM_BUILD_ROOT%{_secconfdir}/opasswd
 install -d -m 755 $RPM_BUILD_ROOT/var/log
 install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/faillog
 install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/tallylog
 
 # Install man pages.
-install -m 644 %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man5/
+install -m 644 %{SOURCE12} %{SOURCE13} $RPM_BUILD_ROOT%{_mandir}/man5/
 
 for phase in auth acct passwd session ; do
 	ln -sf pam_unix.so $RPM_BUILD_ROOT%{_moduledir}/pam_unix_${phase}.so 
@@ -179,7 +186,7 @@
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}
 for module in $RPM_BUILD_ROOT%{_moduledir}/pam*.so ; do
 	if ! env LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib} \
-		 %{SOURCE8} -ldl -lpam -L$RPM_BUILD_ROOT/%{_libdir} ${module} ; then
+		 %{SOURCE11} -ldl -lpam -L$RPM_BUILD_ROOT/%{_libdir} ${module} ; then
 		echo ERROR module: ${module} cannot be loaded.
 		exit 1
 	fi
@@ -204,6 +211,9 @@
 %dir %{_pamconfdir}
 %config(noreplace) %{_pamconfdir}/other
 %config(noreplace) %{_pamconfdir}/system-auth
+%config(noreplace) %{_pamconfdir}/password-auth
+%config(noreplace) %{_pamconfdir}/fingerprint-auth
+%config(noreplace) %{_pamconfdir}/smartcard-auth
 %config(noreplace) %{_pamconfdir}/config-util
 %doc Copyright
 %doc doc/txts
@@ -315,6 +325,11 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Fri Apr 10 2009 Tomas Mraz <tmraz at redhat.com> 1.0.91-6
+- add password-auth, fingerprint-auth, and smartcard-auth
+  for applications which can use them namely gdm (#494874)
+  patch by Ray Strode
+
 * Thu Mar 26 2009 Tomas Mraz <tmraz at redhat.com> 1.0.91-5
 - replace also other std descriptors (#491471)
 


Index: system-auth.5
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/system-auth.5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-auth.5	3 Feb 2006 12:41:29 -0000	1.1
+++ system-auth.5	10 Apr 2009 16:06:24 -0000	1.2
@@ -1,25 +1,37 @@
-.TH SYSTEM-AUTH 5 "2006 Feb 3" "Red Hat" "Linux-PAM Manual"
+.TH SYSTEM-AUTH 5 "2009 Apr 10" "Red Hat" "Linux-PAM Manual"
 .SH NAME
 
 system-auth \- Common configuration file for PAMified services
 
 .SH SYNOPSIS
 .B /etc/pam.d/system-auth
+.B /etc/pam.d/password-auth
+.B /etc/pam.d/fingerprint-auth
+.B /etc/pam.d/smartcard-auth
 .sp 2
 .SH DESCRIPTION
 
-The purpose of this configuration file is to provide common 
-configuration file for all applications and service daemons
-calling PAM library.
+The purpose of these configuration files are to provide a common
+interface for all applications and service daemons calling into
+the PAM library.
 
 .sp
 The
 .BR system-auth
-configuration file is included from all individual service configuration
+configuration file is included from nearly all individual service configuration
 files with the help of the
 .BR include
 directive.
 
+.sp
+The
+.BR password-auth
+.BR fingerprint-auth
+.BR smartcard-auth
+configuration files are for applications which handle authentication from
+different types of devices via simultaneously running individual conversations
+instead of one aggregate conversation.
+
 .SH NOTES
 There should be no
 .BR sufficient



From trasher at fedoraproject.org  Fri Apr 10 16:13:42 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 10 Apr 2009 16:13:42 +0000 (UTC)
Subject: rpms/BackupPC/F-10 BackupPC-TopDir_change.patch, NONE,
	1.1 BackupPC.spec, 1.6, 1.7
Message-ID: <20090410161342.511EA70122@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16609

Modified Files:
	BackupPC.spec 
Added Files:
	BackupPC-TopDir_change.patch 
Log Message:
Fix TopDir change (bug #473944)


BackupPC-TopDir_change.patch:

--- NEW FILE BackupPC-TopDir_change.patch ---
diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
@@ -152,8 +152,6 @@ sub new
     # Clean up %ENV and setup other variables.
     #
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
     if ( defined(my $error = $bpc->ConfigRead()) ) {
         print(STDERR $error, "\n");
         return;
@@ -167,6 +165,8 @@ sub new
         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
     }
     $bpc->{storage}->setPaths($paths);
+    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
 
     #
     # Verify we are running as the correct user


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/F-10/BackupPC.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BackupPC.spec	11 Aug 2008 16:11:39 -0000	1.6
+++ BackupPC.spec	10 Apr 2009 16:13:11 -0000	1.7
@@ -6,8 +6,8 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        3%{?dist}
-Summary:        BackupPC - high-performance backup system
+Release:        4%{?dist}
+Summary:        High-performance backup system
 
 Group:          Applications/System
 License:        GPLv2+
@@ -16,6 +16,7 @@
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-4
+- Fix TopDir change (bug #473944)
+
 * Mon Aug 11 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-3
 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149)
 



From trasher at fedoraproject.org  Fri Apr 10 16:15:17 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 10 Apr 2009 16:15:17 +0000 (UTC)
Subject: rpms/BackupPC/F-9 BackupPC-TopDir_change.patch, NONE,
	1.1 BackupPC.spec, 1.6, 1.7
Message-ID: <20090410161517.62DB670122@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17072

Modified Files:
	BackupPC.spec 
Added Files:
	BackupPC-TopDir_change.patch 
Log Message:
Fix TopDir change (bug #473944)


BackupPC-TopDir_change.patch:

--- NEW FILE BackupPC-TopDir_change.patch ---
diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
@@ -152,8 +152,6 @@ sub new
     # Clean up %ENV and setup other variables.
     #
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
     if ( defined(my $error = $bpc->ConfigRead()) ) {
         print(STDERR $error, "\n");
         return;
@@ -167,6 +165,8 @@ sub new
         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
     }
     $bpc->{storage}->setPaths($paths);
+    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
 
     #
     # Verify we are running as the correct user


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/F-9/BackupPC.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BackupPC.spec	11 Aug 2008 16:20:46 -0000	1.6
+++ BackupPC.spec	10 Apr 2009 16:14:47 -0000	1.7
@@ -6,8 +6,8 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        3%{?dist}
-Summary:        BackupPC - high-performance backup system
+Release:        4%{?dist}
+Summary:        High-performance backup system
 
 Group:          Applications/System
 License:        GPLv2+
@@ -16,6 +16,7 @@
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-4
+- Fix TopDir change (bug #473944)
+
 * Mon Aug 11 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-3
 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149)
 



From heffer at fedoraproject.org  Fri Apr 10 16:41:38 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 10 Apr 2009 16:41:38 +0000 (UTC)
Subject: rpms/shntool/F-9 import.log, NONE, 1.1 shntool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410164138.8519F70122@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/shntool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24326/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shntool.spec 
Log Message:
initial import


--- NEW FILE import.log ---
shntool-3_0_10-1_fc11:F-9:shntool-3.0.10-1.fc11.src.rpm:1239381631


--- NEW FILE shntool.spec ---
Name:           shntool
Version:        3.0.10
Release:        1%{?dist}
Summary:        A multi-purpose WAVE data processing and reporting utility

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://etree.org/shnutils/shntool
Source0:        http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A multi-purpose WAVE data processing and reporting utility. File
formats are abstracted from its core, so it can process any file that contains
WAVE data, compressed or not - provided there exists a format module to handle
that particular file type. 

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%doc doc/*
%{_bindir}/shn*
%{_mandir}/man1/%{name}.1.gz


%changelog
* Thu Apr 09 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.10-1
- 3.0.10

* Sun Mar 29 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.9-1
- 3.0.9

* Tue Mar 03 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.8-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:26:44 -0000	1.1
+++ .cvsignore	10 Apr 2009 16:41:07 -0000	1.2
@@ -0,0 +1 @@
+shntool-3.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:26:44 -0000	1.1
+++ sources	10 Apr 2009 16:41:07 -0000	1.2
@@ -0,0 +1 @@
+5d41f8f42c3c15e3145a7a43539c3eae  shntool-3.0.10.tar.gz



From heffer at fedoraproject.org  Fri Apr 10 16:43:37 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 10 Apr 2009 16:43:37 +0000 (UTC)
Subject: rpms/shntool/F-10 import.log, NONE, 1.1 shntool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410164337.2A17070122@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/shntool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25009/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shntool.spec 
Log Message:
initial import


--- NEW FILE import.log ---
shntool-3_0_10-1_fc11:F-10:shntool-3.0.10-1.fc11.src.rpm:1239381761


--- NEW FILE shntool.spec ---
Name:           shntool
Version:        3.0.10
Release:        1%{?dist}
Summary:        A multi-purpose WAVE data processing and reporting utility

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://etree.org/shnutils/shntool
Source0:        http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A multi-purpose WAVE data processing and reporting utility. File
formats are abstracted from its core, so it can process any file that contains
WAVE data, compressed or not - provided there exists a format module to handle
that particular file type. 

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%doc doc/*
%{_bindir}/shn*
%{_mandir}/man1/%{name}.1.gz


%changelog
* Thu Apr 09 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.10-1
- 3.0.10

* Sun Mar 29 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.9-1
- 3.0.9

* Tue Mar 03 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.8-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:26:44 -0000	1.1
+++ .cvsignore	10 Apr 2009 16:43:06 -0000	1.2
@@ -0,0 +1 @@
+shntool-3.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:26:44 -0000	1.1
+++ sources	10 Apr 2009 16:43:06 -0000	1.2
@@ -0,0 +1 @@
+5d41f8f42c3c15e3145a7a43539c3eae  shntool-3.0.10.tar.gz



From heffer at fedoraproject.org  Fri Apr 10 16:45:32 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 10 Apr 2009 16:45:32 +0000 (UTC)
Subject: rpms/shntool/F-11 import.log, NONE, 1.1 shntool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410164532.456CF70122@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/shntool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25612/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shntool.spec 
Log Message:
initial import


--- NEW FILE import.log ---
shntool-3_0_10-1_fc11:F-11:shntool-3.0.10-1.fc11.src.rpm:1239381860


--- NEW FILE shntool.spec ---
Name:           shntool
Version:        3.0.10
Release:        1%{?dist}
Summary:        A multi-purpose WAVE data processing and reporting utility

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://etree.org/shnutils/shntool
Source0:        http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A multi-purpose WAVE data processing and reporting utility. File
formats are abstracted from its core, so it can process any file that contains
WAVE data, compressed or not - provided there exists a format module to handle
that particular file type. 

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%doc doc/*
%{_bindir}/shn*
%{_mandir}/man1/%{name}.1.gz


%changelog
* Thu Apr 09 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.10-1
- 3.0.10

* Sun Mar 29 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.9-1
- 3.0.9

* Tue Mar 03 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.8-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:26:44 -0000	1.1
+++ .cvsignore	10 Apr 2009 16:45:01 -0000	1.2
@@ -0,0 +1 @@
+shntool-3.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:26:44 -0000	1.1
+++ sources	10 Apr 2009 16:45:01 -0000	1.2
@@ -0,0 +1 @@
+5d41f8f42c3c15e3145a7a43539c3eae  shntool-3.0.10.tar.gz



From heffer at fedoraproject.org  Fri Apr 10 16:47:24 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 10 Apr 2009 16:47:24 +0000 (UTC)
Subject: rpms/shntool/devel import.log, NONE, 1.1 shntool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410164724.8760C70122@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/shntool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26221/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shntool.spec 
Log Message:
initial import


--- NEW FILE import.log ---
shntool-3_0_10-1_fc11:HEAD:shntool-3.0.10-1.fc11.src.rpm:1239381983


--- NEW FILE shntool.spec ---
Name:           shntool
Version:        3.0.10
Release:        1%{?dist}
Summary:        A multi-purpose WAVE data processing and reporting utility

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://etree.org/shnutils/shntool
Source0:        http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A multi-purpose WAVE data processing and reporting utility. File
formats are abstracted from its core, so it can process any file that contains
WAVE data, compressed or not - provided there exists a format module to handle
that particular file type. 

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%doc doc/*
%{_bindir}/shn*
%{_mandir}/man1/%{name}.1.gz


%changelog
* Thu Apr 09 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.10-1
- 3.0.10

* Sun Mar 29 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.9-1
- 3.0.9

* Tue Mar 03 2009 Felix Kaechele <felix at fetzig dot org> - 3.0.8-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:26:44 -0000	1.1
+++ .cvsignore	10 Apr 2009 16:46:53 -0000	1.2
@@ -0,0 +1 @@
+shntool-3.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shntool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:26:44 -0000	1.1
+++ sources	10 Apr 2009 16:46:54 -0000	1.2
@@ -0,0 +1 @@
+5d41f8f42c3c15e3145a7a43539c3eae  shntool-3.0.10.tar.gz



From pwouters at fedoraproject.org  Fri Apr 10 17:07:57 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 17:07:57 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.cron,NONE,1.1
Message-ID: <20090410170757.CCFB170122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31861/EL-5

Added Files:
	nsd.cron 
Log Message:
Fix the /dev/nul (one l) occurances



--- NEW FILE nsd.cron ---
#!/bin/sh

# Paul Wouters <paul at xelerance.com>
# This folds back zone updates, dynamic updates, etc that nsd records
# in the ixfr.db and nsd.db files back into the zone files or visa
# versa

# Ideally check if ixfr.db newer then any zones, only then do
/usr/sbin/nsdc patch > /dev/null 2>%1

# We try to only rebuild/reload when neccessary. If 1 zone is newer,
# we need to rebuild the db file.
# This might give problems with huge zones, eg TLD's, which cannot
# complete this operation within an hour, but it should work fine for
# most other uses.

for zonefile in `/usr/sbin/nsd-checkconf -v /etc/nsd/nsd.conf  |grep zonefile: | sed "s/^.*\"\(.*\)\"/\1/"`
do
	if [ $zonefile -nt /var/lib/nsd/nsd.db ]
	then
		echo "Zone $zonefile update requires nsd.db rebuild"
		/usr/sbin/nsdc rebuild > /dev/null 2>%1
		/usr/sbin/nsdc reload > /dev/null 2>%1
		break
	fi
done


# nsd checks the serial in notify requests, so its better to send an
# occasional redundant notify, then to miss it.
# According to the nsd team, this is no longer neccessary
# /usr/sbin/nsdc notify > /dev/null 2>%1



From pwouters at fedoraproject.org  Fri Apr 10 17:08:27 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 17:08:27 +0000 (UTC)
Subject: rpms/nsd/F-9 nsd.cron,1.5,1.6
Message-ID: <20090410170827.6979B70122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31861/F-9

Modified Files:
	nsd.cron 
Log Message:
Fix the /dev/nul (one l) occurances



Index: nsd.cron
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.cron,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.cron	13 Jun 2008 15:06:38 -0000	1.5
+++ nsd.cron	10 Apr 2009 17:07:57 -0000	1.6
@@ -29,4 +29,4 @@
 # nsd checks the serial in notify requests, so its better to send an
 # occasional redundant notify, then to miss it.
 # According to the nsd team, this is no longer neccessary
-# /usr/sbin/nsdc notify > /dev/nul 2>%1
+# /usr/sbin/nsdc notify > /dev/null 2>%1



From pwouters at fedoraproject.org  Fri Apr 10 17:08:28 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 17:08:28 +0000 (UTC)
Subject: rpms/nsd/F-10 nsd.cron,1.4,1.5
Message-ID: <20090410170828.3BAD170122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31861/F-10

Modified Files:
	nsd.cron 
Log Message:
Fix the /dev/nul (one l) occurances



Index: nsd.cron
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.cron	13 Nov 2007 16:31:39 -0000	1.4
+++ nsd.cron	10 Apr 2009 17:07:57 -0000	1.5
@@ -6,7 +6,7 @@
 # versa
 
 # Ideally check if ixfr.db newer then any zones, only then do
-/usr/sbin/nsdc patch > /dev/nul 2>%1
+/usr/sbin/nsdc patch > /dev/null 2>%1
 
 # We try to only rebuild/reload when neccessary. If 1 zone is newer,
 # we need to rebuild the db file.
@@ -19,8 +19,8 @@
 	if [ $zonefile -nt /var/lib/nsd/nsd.db ]
 	then
 		echo "Zone $zonefile update requires nsd.db rebuild"
-		/usr/sbin/nsdc rebuild > /dev/nul 2>%1
-		/usr/sbin/nsdc reload > /dev/nul 2>%1
+		/usr/sbin/nsdc rebuild > /dev/null 2>%1
+		/usr/sbin/nsdc reload > /dev/null 2>%1
 		break
 	fi
 done
@@ -29,4 +29,4 @@
 # nsd checks the serial in notify requests, so its better to send an
 # occasional redundant notify, then to miss it.
 # According to the nsd team, this is no longer neccessary
-# /usr/sbin/nsdc notify > /dev/nul 2>%1
+# /usr/sbin/nsdc notify > /dev/null 2>%1



From rdieter at fedoraproject.org  Fri Apr 10 17:15:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 17:15:14 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 xine-lib-1.1.16.3-mod_mimetypes_typo.patch, NONE,
	1.1 xine-lib.spec, 1.28, 1.29
Message-ID: <20090410171514.A868770122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1058

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16.3-mod_mimetypes_typo.patch 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
- fix modtracker mimetypes


xine-lib-1.1.16.3-mod_mimetypes_typo.patch:

--- NEW FILE xine-lib-1.1.16.3-mod_mimetypes_typo.patch ---
diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c
--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo	2009-03-25 14:28:40.000000000 -0500
+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c	2009-04-10 10:15:04.000000000 -0500
@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
          "audio/x-s3m: s3m: ScreamTracker 3 Module;"
          "audio/s3m: s3m: ScreamTracker 3 Module;"
          "application/playerpro: 669: 669 Tracker Module;"
-         "application/adrift; amf: ADRIFT Module File;"
-         "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
-         "audio/x-amf; amf: ADRIFT Module File;"
-         "audio/x-xm; xm: FastTracker II Audio;"
-         "audio/xm; xm: FastTracker II Audio;";
+         "application/adrift: amf: ADRIFT Module File;"
+         "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
+         "audio/x-amf: amf: ADRIFT Module File;"
+         "audio/x-xm: xm: FastTracker II Audio;"
+         "audio/xm: xm: FastTracker II Audio;";
 }
 
 static void class_dispose (demux_class_t *this_gen) {


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xine-lib.spec	9 Apr 2009 13:01:31 -0000	1.28
+++ xine-lib.spec	10 Apr 2009 17:14:44 -0000	1.29
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -55,6 +55,8 @@
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
+## upstreamable patches
+Patch50:        xine-lib-1.1.16.3-mod_mimetypes_typo.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{plugin_abi}
@@ -207,6 +209,7 @@
 
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
+%patch50 -p1 -b .mod_mimetypes_typo
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -439,6 +442,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
+- fix modtracker mimetypes
+
 * Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
 - xine-lib-1.1.16.3, plugin-abi 1.26
 



From sindrepb at fedoraproject.org  Fri Apr 10 17:57:36 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Fri, 10 Apr 2009 17:57:36 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.33,1.34
Message-ID: <20090410175736.8953870122@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10377

Modified Files:
	gnome-do.spec 
Log Message:
fix requires, rebuild against new bd


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-do.spec	1 Apr 2009 04:54:03 -0000	1.33
+++ gnome-do.spec	10 Apr 2009 17:57:04 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.1.3
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -37,7 +37,7 @@
 Requires:		mono-core mono-addins
 Requires:		ndesk-dbus
 Requires:		ndesk-dbus-glib
-Requires:		gnome-keyring-sharp
+Requires:		gnome-keyring-sharp, gnome-desktop-sharp
 Requires:		pkgconfig
 
 %description
@@ -129,6 +129,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 10 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-4
+- Rebuild for new gnome-desktop-sharp
+- Add missing gnome-desktop-sharp requires
+
 * Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-3
 - Add patch to fix issue where applications wasn't being indexed
 



From orion at fedoraproject.org  Fri Apr 10 18:01:34 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 10 Apr 2009 18:01:34 +0000 (UTC)
Subject: rpms/GMT/devel GMT.spec,1.6,1.7
Message-ID: <20090410180134.4213970137@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/GMT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11488

Modified Files:
	GMT.spec 
Log Message:
* Fri Apr 10 2009 Orion Poplawski <orion at cora.nwra.com> 4.4.0-2
- Add --enable-debug to avoid stripping of -g from CFLAGS



Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/GMT.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GMT.spec	24 Feb 2009 20:15:54 -0000	1.6
+++ GMT.spec	10 Apr 2009 18:01:03 -0000	1.7
@@ -8,7 +8,7 @@
 
 Name:           GMT
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generic Mapping Tools
 
 Group:          Applications/Engineering
@@ -128,6 +128,7 @@
 export CSH=sh
 export CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/netcdf"
 %configure --datadir=%{gmthome} \
+           --enable-debug \
            --enable-shared \
            --enable-octave --enable-mex-mdir=%{octave_mdir} \
            --enable-mex-xdir=%{octave_octdir} \
@@ -234,6 +235,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Orion Poplawski <orion at cora.nwra.com> 4.4.0-2
+- Add --enable-debug to avoid stripping of -g from CFLAGS
+
 * Tue Feb 24 2009 Orion Poplawski <orion at cora.nwra.com> 4.4.0-1
 - Update to 4.4.0
 - Merge doc package into main package as noarch sub-packages



From rdieter at fedoraproject.org  Fri Apr 10 18:03:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 18:03:17 +0000 (UTC)
Subject: rpms/amarok/devel amarok-2.0.90-qtscript_not_required.patch, NONE, 
	1.1 amarok.spec, 1.146, 1.147
Message-ID: <20090410180317.2CD9570122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12246

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.90-qtscript_not_required.patch 
Log Message:
hack around qtscriptbindings check at buildtime


amarok-2.0.90-qtscript_not_required.patch:

--- NEW FILE amarok-2.0.90-qtscript_not_required.patch ---
diff -up amarok-2.0.90/CMakeLists.txt.qtscript_not_required amarok-2.0.90/CMakeLists.txt
--- amarok-2.0.90/CMakeLists.txt.qtscript_not_required	2009-04-06 16:29:12.000000000 -0500
+++ amarok-2.0.90/CMakeLists.txt	2009-04-10 13:00:07.000000000 -0500
@@ -38,8 +38,8 @@ if( WITH_PLAYER )
 
     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
 
-    find_package( QtScriptQtBindings REQUIRED )
-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+    macro_optional_find_package(QtScriptQtBindings)
+    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
 
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- amarok.spec	10 Apr 2009 15:31:58 -0000	1.146
+++ amarok.spec	10 Apr 2009 18:02:46 -0000	1.147
@@ -10,6 +10,8 @@
 Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch50: amarok-2.0.90-qtscript_not_required.patch
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -20,14 +22,13 @@
 BuildRequires: libmtp-devel >= 0.3.0
 %endif
 %if 0%{?fedora} > 10
-#BuildRequires: libgpod-devel >= 0.7.0
+BuildRequires: libgpod-devel
 %endif
 BuildRequires: libnjb-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
-BuildRequires: qtscriptgenerator
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 BuildRequires: taglib-extras-devel
@@ -60,6 +61,8 @@
 %prep
 %setup -q
 
+%patch50 -p1 -b .qtscript_not_required
+
 
 %build
 mkdir -p %{_target_platform}



From pwouters at fedoraproject.org  Fri Apr 10 18:05:34 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:05:34 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.sysconfig, NONE, 1.1 nsd.init, 1.4, 1.5 nsd.spec, 
	1.17, 1.18 sources, 1.6, 1.7
Message-ID: <20090410180534.10AD770122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12914/EL-5

Modified Files:
	nsd.init nsd.spec sources 
Added Files:
	nsd.sysconfig 
Log Message:
Moved all supported nsd versions to yse a sysconfig file and fixed
various small issues in the cron and init scripts. Also upgraded all
to latest nsd (3.2.1)



--- NEW FILE nsd.sysconfig ---
# /etc/sysconfig/nsd
# Configuration for /etc/init.d/nsd

OTHER_NSD_OPTS=""
#extra verbosity
#ZONEC_VERBOSE=-v

# You might also need to change SElinux policies if you decide
# to deviate from the standard locations below.

# Main configuration file
#NSD_CONF="/etc/nsd/nsd.conf"

# Path to nsdc program
#NSDC_PROG="/usr/sbin/nsd"

# Path to nsd program
#NSD_PROG="/usr/sbin/nsd"

# NSD pid file
#NSD_PIDFILE="/var/run/nsd/nsd.pid"

# NSD zone transfer daemon state file (should equal to the xfrdfile
# parameter set in nsd.conf)
#NSD_XFRDFILE="/var/lib/nsd/xfrd.state"

# EOF


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.init	12 Oct 2006 19:43:29 -0000	1.4
+++ nsd.init	10 Apr 2009 18:05:03 -0000	1.5
@@ -6,7 +6,7 @@
 # description:  NSD is a complete implementation of an authoritative \
 #               DNS name server. 
 # processname: /usr/sbin/nsd
-# config: /etc/nsd/nsdc.config
+# config: /etc/nsd/nsd.conf
 #
 ### BEGIN INIT INFO
 # Provides: nsd
@@ -17,21 +17,12 @@
 #               DNS name server.
 ### END INIT INFO
 
-# Sanity checks.
-[ -f /etc/nsd/nsdc.conf ] || exit 0
-[ -f /etc/nsd/nsd.zones ] || exit 0
-[ -x /usr/sbin/nsd ] || exit 0
-
-#extra verbosity
-#ZONEC_VERBOSE=-v
-OTHER_NSD_OPTS=""
-
-#fixed in 2.3.6
-#work around for bug in nsd-2.3.x when no ipv6 is available
-#if [ ! -d /proc/sys/net/ipv6/ ]
-#then
-#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-#fi
+# Init script default settings
+NSD_CONF="/etc/nsd/nsd.conf"
+NSD_PROG="/usr/sbin/nsd"
+NSD_PIDFILE="/var/run/nsd/nsd.pid"
+NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
+NSDC_PROG="/usr/sbin/nsdc"
 
 # Source function library.
 . /etc/init.d/functions
@@ -42,24 +33,26 @@
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
+	/usr/sbin/nsdc rebuild >/dev/null 2>%1
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Shutting down nsd services: "
+	# save state to zonefiles
+	/usr/sbin/nsdc patch > /dev/null 2>%1
 	killproc nsd
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ] ; then
+	  rm -f /var/run/nsd/nsd.pid
+	  # ensure notifies are sent at startup
+	  rm -f /var/lib/nsd/xfrd.state
 	  rm -f /var/lock/subsys/nsd
-	  rm -f /var/run/nsd.pid
 	fi
 	echo
 	return $RETVAL
@@ -87,10 +80,10 @@
         [ -f /var/lock/subsys/nsd ] && restart || :
 	;;
   status)
-	/usr/sbin/nsdc running
+	$NSDC_PROG -c $NSD_CONF running
 	;;
   stats|reload|rebuild|running|update|notify)
-	/usr/sbin/nsdc $1 
+	$NSDC_PROG -c $NSD_CONF $1 
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nsd.spec	13 Jul 2007 18:47:25 -0000	1.17
+++ nsd.spec	10 Apr 2009 18:05:03 -0000	1.18
@@ -1,14 +1,17 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.7
-Release: 2%{?dist}
-License: BSD-like
-Url: http://open.nlnetlabs.nl/nsd/
-Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
+Version: 3.2.1
+Release: 1%{?dist}
+License: BSD
+Url: http://www.nlnetlabs.nl/%{name}/
+Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1: nsd.init
+Source2: nsd.cron
+Source3: nsd.sysconfig
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel
+Requires(pre): shadow-utils
 
 %description
 NSD is a complete implementation of an authoritative DNS name server.
@@ -19,43 +22,62 @@
 %prep
 %setup -q 
 
+%build
 %configure --enable-bind8-stats --enable-plugins --enable-checking \
-           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
-           --with-user=nsd
+           --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
+           --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
+           --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
+           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state
 
-%build
 %{__make} %{?_smp_mflags}
+#convert to utf8
+iconv -f iso8859-1 -t utf-8 doc/RELNOTES > doc/RELNOTES.utf8
+iconv -f iso8859-1 -t utf-8 doc/CREDITS > doc/CREDITS.utf8
+mv -f doc/RELNOTES.utf8 doc/RELNOTES
+mv -f doc/CREDITS.utf8 doc/CREDITS
+
 
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{_initrddir}
+install -d -m 0755 %{buildroot}%{_initrddir}
+install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
+install -c -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/nsd
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
-install -d 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsdc.conf
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
+head -76 %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample > %{buildroot}%{_sysconfdir}/nsd/nsd.conf
+rm %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample 
+echo "database: /var/lib/nsd/nsd.db" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
+echo "# include: \"/some/path/file\"" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
 %defattr(-,root,root,-)
-%doc README LICENSE NSD-DATABASE DIFFERENCES TODO RELNOTES REQUIREMENTS
+%doc doc/*
+%doc contrib/nsd.zones2nsd.conf
 %dir %{_sysconfdir}/nsd/
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
+#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/nsd
 %attr(0755,root,root) %{_initrddir}/%{name}
-%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%{_sysconfdir}/cron.hourly/nsd
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
-if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-# "Everyone is doing it, so why can't we?" 
+getent group nsd >/dev/null || groupadd -r nsd
+getent passwd nsd >/dev/null || \
+useradd -r -g nsd -d /etc/nsd -s /sbin/nologin \
+-c "nsd daemon account" nsd
 exit 0
 
 %post
@@ -69,21 +91,91 @@
 
 %postun
 if [ "$1" -ge "1" ]; then
-  /sbin/service %{name} condrestart > /dev/null 2> /dev/null
+  /sbin/service %{name} condrestart 
 fi
 
 %changelog
-* Fri Jul 13 2007 Paul Wouters <paul at xelerance.com> 2.3.7-2
+* Fri Apr 10 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
+- updated to 3.2.1
+- fixed /dev/nul which cause a file /%1 to be written by cron
+- Applied Ville Mattila's changes to support non-default locations
+
+* Thu Oct  9 2008 Paul Wouters <paul at xelerance.com> - 3.1.1-1
+- updated to 3.1.1
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.0-2
+- fix license tag
+- fix static user creation
+
+* Mon Jun 30 2008 Paul Wouters <paul at xelerance.com> - 3.1.0-1
+- Updated to 3.1.0
+
+* Tue May  6 2008 Paul Wouters <paul at xelerance.com> - 3.0.8-2
+- Fix /dev/null redirection [Venkatesh Krishnamurthi]
+
+* Tue May  6 2008 Paul Wouters <paul at xelerance.com> - 3.0.8-1
+- Updated to 3.0.8
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.7-3
+- Autorebuild for GCC 4.3
+
+* Wed Dec  5 2007 Paul Wouters <paul at xelerance.com> - 3.0.7-2
+- Rebuild for new libcrypto
+
+* Tue Nov 13 2007 Paul Wouters <paul at xelerance.com> - 3.0.7-1
+- Updated to new version
+- fix RELNOTES/README to be utf8
+- Fix path to nsd.db in cron job.
+
+* Thu Nov  8 2007 Paul Wouters <paul at xelerance.com> - 3.0.6-7
+- Modified cron to only rebuild/reload when zone updates
+  have been received
+
+* Wed Nov  7 2007 Paul Wouters <paul at xelerance.com> - 3.0.6-6
+- Added hourly cron job to do various maintenance tasks
+- Added nsd rebuild to create the proper nsd.db file on startup
+- Added nsd patch on shutdown to ensure zonefiles are up to date
+
+* Tue Oct  2 2007 Paul Wouters <paul at xelerance.com> - 3.0.6-5
+- nsdc update and nsdc notify are no longer needed in initscript.
+
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 3.0.6-4
+- Bump release for upgrade path.
+
+* Fri Sep 14 2007 Paul Wouters <paul at xelerance.com> 3.0.6-3
+- Do not include examples from nsd.conf.sample that causes
+  bogus network traffic.
+
+* Fri Sep 14 2007 Paul Wouters <paul at xelerance.com> 3.0.6-2
+- Change locations of ixfr.db and xfrd.state to /var/lib/nsd
+- Enable NSEC3
+- Delay running nsdc update until after nsd has started
+- Delete xfrd.state on nsd stop
+- Run nsdc notify in the background, since it can take
+  a very long time when remote servers are unavailable.
+
+* Tue Sep 11 2007 Paul Wouters <paul at xelerance.com> 3.0.6-1
+- Upgraded to 3.0.6
+- Do not include bind2nsd, since it didn't compile for me
+
+* Fri Jul 13 2007 Paul Wouters <paul at xelerance.com> 3.0.5-2
 - Fix init script, bug #245546
 
-* Mon Apr 16 2007 Paul Wouters <paul at xelerance.com> 2.3.7-1
-- Upgraded to 2.3.7
-- Ensure postun doesn't produce output when rebuilding binary zonefiles
+* Fri Mar 23 2007 Paul Wouters <paul at xelerance.com> 3.0.5-1
+- Upgraded to 3.0.5
+
+* Thu Dec  7 2006 Paul Wouters <paul at xelerance.com> 3.0.3-1
+- Upgraded to 3.0.3
+
+* Mon Nov 27 2006 Paul Wouters <paul at xelerance.com> 3.0.2-1
+- Upgraded to 3.0.2.
+- Use new configuration file nsd.conf. Still needs migration script.
+  patch from Farkas Levente <lfarkas at bppiac.hu>
 
-* Mon Oct 16 2006 Paul Wouters <paul at xelerance.com> 2.3.6-2
+* Mon Oct 16 2006  Paul Wouters <paul at xelerance.com> 2.3.6-2
 - Bump version for upgrade path
 
-* Thu Oct 12 2006 Paul Wouters <paul at xelerance.com> 2.3.6-1
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Removed obsolete workaround in nsd.init
 - Fixed spec file so daemon gets properly restarted on upgrade
@@ -109,7 +201,7 @@
 
 * Thu Dec 15 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
-- Use %{_localstatedir} instead of "/var"
+- Use _localstatedir instead of "/var"
 
 * Tue Dec 13 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-5
 - Added BuildRequires for openssl-devel, removed Requires for openssl.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Apr 2007 03:20:39 -0000	1.6
+++ sources	10 Apr 2009 18:05:03 -0000	1.7
@@ -1,3 +1,3 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
-72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
-31a36167098a0ec9d736e113720c517f  nsd-2.3.7.tar.gz
+b96ac5e0e5f13cf99c0d07fa9d7ddabd  nsd-3.0.8.tar.gz
+69225bf59ae82181ca09af34c139fb6d  nsd-3.1.0.tar.gz
+93cb2d0fa005ab46f81ef00e4951a804  nsd-3.1.1.tar.gz



From pwouters at fedoraproject.org  Fri Apr 10 18:05:34 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:05:34 +0000 (UTC)
Subject: rpms/nsd/F-10 nsd.sysconfig, NONE, 1.1 nsd.init, 1.8, 1.9 nsd.spec, 
	1.38, 1.39 sources, 1.18, 1.19
Message-ID: <20090410180534.56CD970122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12914/F-10

Modified Files:
	nsd.init nsd.spec sources 
Added Files:
	nsd.sysconfig 
Log Message:
Moved all supported nsd versions to yse a sysconfig file and fixed
various small issues in the cron and init scripts. Also upgraded all
to latest nsd (3.2.1)



--- NEW FILE nsd.sysconfig ---
# /etc/sysconfig/nsd
# Configuration for /etc/init.d/nsd

OTHER_NSD_OPTS=""
#extra verbosity
#ZONEC_VERBOSE=-v

# You might also need to change SElinux policies if you decide
# to deviate from the standard locations below.

# Main configuration file
#NSD_CONF="/etc/nsd/nsd.conf"

# Path to nsdc program
#NSDC_PROG="/usr/sbin/nsd"

# Path to nsd program
#NSD_PROG="/usr/sbin/nsd"

# NSD pid file
#NSD_PIDFILE="/var/run/nsd/nsd.pid"

# NSD zone transfer daemon state file (should equal to the xfrdfile
# parameter set in nsd.conf)
#NSD_XFRDFILE="/var/lib/nsd/xfrd.state"

# EOF


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nsd.init	8 Nov 2007 16:21:14 -0000	1.8
+++ nsd.init	10 Apr 2009 18:05:03 -0000	1.9
@@ -10,58 +10,74 @@
 #
 ### BEGIN INIT INFO
 # Provides: nsd
-# Required-Start: $syslog
+# Required-Start: $local_fs $network $syslog
+# Required-Stop: $local_fs $network $syslog
 # Default-Stop: 0 11 89
 # Short-Description: Starts the NSD Name Server Daemon
 # Description:  NSD is a complete implementation of an authoritative \
 #               DNS name server.
 ### END INIT INFO
 
-# Sanity checks.
-[ -f /etc/nsd/nsd.conf ] || exit 0
-[ -x /usr/sbin/nsd ] || exit 0
-
-#extra verbosity
-#ZONEC_VERBOSE=-v
-OTHER_NSD_OPTS=""
+# Init script default settings
+NSD_CONF="/etc/nsd/nsd.conf"
+NSD_PROG="/usr/sbin/nsd"
+NSD_PIDFILE="/var/run/nsd/nsd.pid"
+NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
+NSDC_PROG="/usr/sbin/nsdc"
 
 # Source function library.
 . /etc/init.d/functions
 
-. /etc/sysconfig/network
+[ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
 
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-	echo -n $"Starting nsd... "
-	/usr/sbin/nsdc rebuild >/dev/null 2>%1
-	nsd $OTHER_NSD_OPTS
-	RETVAL=$?
-	echo
-	touch /var/lock/subsys/nsd
-	return $RETVAL
+  # Source networking configuration.
+  [ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
+
+  # Check that networking is up
+  [ "${NETWORKING}" = "no" ] && exit 1
+
+  # Sanity checks.
+  [ -f $NSD_CONF ] || exit 5
+  [ -x $NSD_PROG ] || exit 5
+
+  echo -n $"Starting nsd... "
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
+  RETVAL=$?
+  echo
+  if [ $RETVAL -eq 0 ]; then
+     touch /var/lock/subsys/nsd
+  else
+    exit 7;
+  fi
+  return 0;
 }
 
 stop() {
-	echo -n $"Shutting down nsd services: "
-	# save state to zonefiles
-	/usr/sbin/nsdc patch > /dev/null 2>%1
-	killproc nsd
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ] ; then
-	  rm -f /var/run/nsd/nsd.pid
-	  # ensure notifies are sent at startup
-	  rm -f /var/lib/nsd/xfrd.state
-	  rm -f /var/lock/subsys/nsd
-	fi
-	echo
-	return $RETVAL
+  echo -n $"Shutting down nsd services: "
+  # save state to zonefiles
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF stop
+  RETVAL=$?
+  # was nsdc successful?
+  [ "$RETVAL" -eq 0 ] || killproc $NSD_PROG -TERM >/dev/null 2>&1
+  if [ $RETVAL -eq 0 ] ; then
+     rm -f $NSD_PIDFILE
+     rm -f /var/lock/subsys/nsd
+     # ensure notifies are sent at startup
+     rm -f $NSD_XFRDFILE
+  fi
+  echo
+  return $RETVAL
 }
 
 restart() {
-	stop
-	start
+  stop
+  start
 }
 
 RETVAL=0
@@ -81,10 +97,10 @@
         [ -f /var/lock/subsys/nsd ] && restart || :
 	;;
   status)
-	/usr/sbin/nsdc running
+	$NSDC_PROG -c $NSD_CONF running
 	;;
   stats|reload|rebuild|running|update|notify)
-	/usr/sbin/nsdc $1 
+	$NSDC_PROG -c $NSD_CONF $1 
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- nsd.spec	9 Oct 2008 20:11:21 -0000	1.38
+++ nsd.spec	10 Apr 2009 18:05:04 -0000	1.39
@@ -1,12 +1,13 @@
-Summary: NSD is a complete implementation of an authoritative DNS name server
+Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.1.1
+Version: 3.2.1
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1: nsd.init
 Source2: nsd.cron
+Source3: nsd.sysconfig
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel
@@ -19,7 +20,7 @@
 (thanks to Olaf).
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 %configure --enable-bind8-stats --enable-plugins --enable-checking \
@@ -45,6 +46,8 @@
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
 
 # change .sample to normal config files
 head -76 %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample > %{buildroot}%{_sysconfdir}/nsd/nsd.conf
@@ -62,6 +65,7 @@
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/nsd
 %attr(0755,root,root) %{_initrddir}/%{name}
 %{_sysconfdir}/cron.hourly/nsd
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
@@ -91,6 +95,11 @@
 fi
 
 %changelog
+* Fri Apr 10 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
+- updated to 3.2.1
+- fixed /dev/nul which cause a file \%%1 to be written by cron
+- merged in Ville Mattila's patches for nsd initscript and sysconfig
+
 * Thu Oct  9 2008 Paul Wouters <paul at xelerance.com> - 3.1.1-1
 - updated to 3.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Oct 2008 20:11:21 -0000	1.18
+++ sources	10 Apr 2009 18:05:04 -0000	1.19
@@ -1,3 +1 @@
-b96ac5e0e5f13cf99c0d07fa9d7ddabd  nsd-3.0.8.tar.gz
-69225bf59ae82181ca09af34c139fb6d  nsd-3.1.0.tar.gz
-93cb2d0fa005ab46f81ef00e4951a804  nsd-3.1.1.tar.gz
+66b602a793b851ad109403d3d2654fad  nsd-3.2.1.tar.gz



From pwouters at fedoraproject.org  Fri Apr 10 18:05:34 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:05:34 +0000 (UTC)
Subject: rpms/nsd/F-9 nsd.sysconfig, NONE, 1.1 nsd.init, 1.8, 1.9 nsd.spec, 
	1.33, 1.34 sources, 1.15, 1.16
Message-ID: <20090410180534.A45F370122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12914/F-9

Modified Files:
	nsd.init nsd.spec sources 
Added Files:
	nsd.sysconfig 
Log Message:
Moved all supported nsd versions to yse a sysconfig file and fixed
various small issues in the cron and init scripts. Also upgraded all
to latest nsd (3.2.1)



--- NEW FILE nsd.sysconfig ---
# /etc/sysconfig/nsd
# Configuration for /etc/init.d/nsd

OTHER_NSD_OPTS=""
#extra verbosity
#ZONEC_VERBOSE=-v

# You might also need to change SElinux policies if you decide
# to deviate from the standard locations below.

# Main configuration file
#NSD_CONF="/etc/nsd/nsd.conf"

# Path to nsdc program
#NSDC_PROG="/usr/sbin/nsd"

# Path to nsd program
#NSD_PROG="/usr/sbin/nsd"

# NSD pid file
#NSD_PIDFILE="/var/run/nsd/nsd.pid"

# NSD zone transfer daemon state file (should equal to the xfrdfile
# parameter set in nsd.conf)
#NSD_XFRDFILE="/var/lib/nsd/xfrd.state"

# EOF


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nsd.init	8 Nov 2007 16:21:14 -0000	1.8
+++ nsd.init	10 Apr 2009 18:05:04 -0000	1.9
@@ -10,58 +10,74 @@
 #
 ### BEGIN INIT INFO
 # Provides: nsd
-# Required-Start: $syslog
+# Required-Start: $local_fs $network $syslog
+# Required-Stop: $local_fs $network $syslog
 # Default-Stop: 0 11 89
 # Short-Description: Starts the NSD Name Server Daemon
 # Description:  NSD is a complete implementation of an authoritative \
 #               DNS name server.
 ### END INIT INFO
 
-# Sanity checks.
-[ -f /etc/nsd/nsd.conf ] || exit 0
-[ -x /usr/sbin/nsd ] || exit 0
-
-#extra verbosity
-#ZONEC_VERBOSE=-v
-OTHER_NSD_OPTS=""
+# Init script default settings
+NSD_CONF="/etc/nsd/nsd.conf"
+NSD_PROG="/usr/sbin/nsd"
+NSD_PIDFILE="/var/run/nsd/nsd.pid"
+NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
+NSDC_PROG="/usr/sbin/nsdc"
 
 # Source function library.
 . /etc/init.d/functions
 
-. /etc/sysconfig/network
+[ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
 
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-	echo -n $"Starting nsd... "
-	/usr/sbin/nsdc rebuild >/dev/null 2>%1
-	nsd $OTHER_NSD_OPTS
-	RETVAL=$?
-	echo
-	touch /var/lock/subsys/nsd
-	return $RETVAL
+  # Source networking configuration.
+  [ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
+
+  # Check that networking is up
+  [ "${NETWORKING}" = "no" ] && exit 1
+
+  # Sanity checks.
+  [ -f $NSD_CONF ] || exit 5
+  [ -x $NSD_PROG ] || exit 5
+
+  echo -n $"Starting nsd... "
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
+  RETVAL=$?
+  echo
+  if [ $RETVAL -eq 0 ]; then
+     touch /var/lock/subsys/nsd
+  else
+    exit 7;
+  fi
+  return 0;
 }
 
 stop() {
-	echo -n $"Shutting down nsd services: "
-	# save state to zonefiles
-	/usr/sbin/nsdc patch > /dev/null 2>%1
-	killproc nsd
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ] ; then
-	  rm -f /var/run/nsd/nsd.pid
-	  # ensure notifies are sent at startup
-	  rm -f /var/lib/nsd/xfrd.state
-	  rm -f /var/lock/subsys/nsd
-	fi
-	echo
-	return $RETVAL
+  echo -n $"Shutting down nsd services: "
+  # save state to zonefiles
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF stop
+  RETVAL=$?
+  # was nsdc successful?
+  [ "$RETVAL" -eq 0 ] || killproc $NSD_PROG -TERM >/dev/null 2>&1
+  if [ $RETVAL -eq 0 ] ; then
+     rm -f $NSD_PIDFILE
+     rm -f /var/lock/subsys/nsd
+     # ensure notifies are sent at startup
+     rm -f $NSD_XFRDFILE
+  fi
+  echo
+  return $RETVAL
 }
 
 restart() {
-	stop
-	start
+  stop
+  start
 }
 
 RETVAL=0
@@ -81,10 +97,10 @@
         [ -f /var/lock/subsys/nsd ] && restart || :
 	;;
   status)
-	/usr/sbin/nsdc running
+	$NSDC_PROG -c $NSD_CONF running
 	;;
   stats|reload|rebuild|running|update|notify)
-	/usr/sbin/nsdc $1 
+	$NSDC_PROG -c $NSD_CONF $1 
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nsd.spec	30 Jun 2008 04:26:20 -0000	1.33
+++ nsd.spec	10 Apr 2009 18:05:04 -0000	1.34
@@ -1,8 +1,8 @@
-Summary: NSD is a complete implementation of an authoritative DNS name server
+Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.1.0
+Version: 3.2.1
 Release: 1%{?dist}
-License: BSD-like
+License: BSD
 Url: http://www.nlnetlabs.nl/nsd/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1: nsd.init
@@ -88,6 +88,14 @@
 fi
 
 %changelog
+* Fri Apr 10 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
+- updated to 3.2.1
+- fixed /dev/nul which cause a file /%%1 to be written by cron
+- Applied Ville Mattila's changes to support non-default locations
+
+* Mon Sep 15 2008 Paul Wouters <paul at xelerance.com> - 3.1.1-1
+- Updated to new version
+
 * Mon Jun 30 2008 Paul Wouters <paul at xelerance.com> - 3.1.0-1
 - Updated to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Jun 2008 04:20:58 -0000	1.15
+++ sources	10 Apr 2009 18:05:04 -0000	1.16
@@ -1,3 +1 @@
-37558edef2fe9d9052aafeb73effd4ac  nsd-3.0.7.tar.gz
-b96ac5e0e5f13cf99c0d07fa9d7ddabd  nsd-3.0.8.tar.gz
-69225bf59ae82181ca09af34c139fb6d  nsd-3.1.0.tar.gz
+66b602a793b851ad109403d3d2654fad  nsd-3.2.1.tar.gz



From pwouters at fedoraproject.org  Fri Apr 10 18:05:35 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:05:35 +0000 (UTC)
Subject: rpms/nsd/devel nsd.sysconfig, NONE, 1.1 nsd.cron, 1.4, 1.5 nsd.init,
	1.11, 1.12 nsd.spec, 1.49, 1.50
Message-ID: <20090410180535.0EE2C70122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12914/devel

Modified Files:
	nsd.cron nsd.init nsd.spec 
Added Files:
	nsd.sysconfig 
Log Message:
Moved all supported nsd versions to yse a sysconfig file and fixed
various small issues in the cron and init scripts. Also upgraded all
to latest nsd (3.2.1)



--- NEW FILE nsd.sysconfig ---
# /etc/sysconfig/nsd
# Configuration for /etc/init.d/nsd

OTHER_NSD_OPTS=""
#extra verbosity
#ZONEC_VERBOSE=-v

# You might also need to change SElinux policies if you decide
# to deviate from the standard locations below.

# Main configuration file
#NSD_CONF="/etc/nsd/nsd.conf"

# Path to nsdc program
#NSDC_PROG="/usr/sbin/nsd"

# Path to nsd program
#NSD_PROG="/usr/sbin/nsd"

# NSD pid file
#NSD_PIDFILE="/var/run/nsd/nsd.pid"

# NSD zone transfer daemon state file (should equal to the xfrdfile
# parameter set in nsd.conf)
#NSD_XFRDFILE="/var/lib/nsd/xfrd.state"

# EOF


Index: nsd.cron
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.cron	13 Nov 2007 16:31:39 -0000	1.4
+++ nsd.cron	10 Apr 2009 18:05:04 -0000	1.5
@@ -6,7 +6,7 @@
 # versa
 
 # Ideally check if ixfr.db newer then any zones, only then do
-/usr/sbin/nsdc patch > /dev/nul 2>%1
+/usr/sbin/nsdc patch > /dev/null 2>%1
 
 # We try to only rebuild/reload when neccessary. If 1 zone is newer,
 # we need to rebuild the db file.
@@ -19,8 +19,8 @@
 	if [ $zonefile -nt /var/lib/nsd/nsd.db ]
 	then
 		echo "Zone $zonefile update requires nsd.db rebuild"
-		/usr/sbin/nsdc rebuild > /dev/nul 2>%1
-		/usr/sbin/nsdc reload > /dev/nul 2>%1
+		/usr/sbin/nsdc rebuild > /dev/null 2>%1
+		/usr/sbin/nsdc reload > /dev/null 2>%1
 		break
 	fi
 done
@@ -29,4 +29,4 @@
 # nsd checks the serial in notify requests, so its better to send an
 # occasional redundant notify, then to miss it.
 # According to the nsd team, this is no longer neccessary
-# /usr/sbin/nsdc notify > /dev/nul 2>%1
+# /usr/sbin/nsdc notify > /dev/null 2>%1


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nsd.init	9 Mar 2009 00:14:14 -0000	1.11
+++ nsd.init	10 Apr 2009 18:05:04 -0000	1.12
@@ -12,14 +12,17 @@
 # Provides: nsd
 # Required-Start: $local_fs $network $syslog
 # Required-Stop: $local_fs $network $syslog
-# Default-Start:
+# Default-Stop: 0 11 89
 # Short-Description: start|stop|status|restart|try-restart|reload|force-reload DNS server
 # Description: control NSD implementation of DNS server
 ### END INIT INFO
 
-#extra verbosity
-#ZONEC_VERBOSE=-v
-OTHER_NSD_OPTS=""
+# Init script default settings
+NSD_CONF="/etc/nsd/nsd.conf"
+NSD_PROG="/usr/sbin/nsd"
+NSD_PIDFILE="/var/run/nsd/nsd.pid"
+NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
+NSDC_PROG="/usr/sbin/nsdc"
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -37,14 +40,14 @@
   [ "${NETWORKING}" = "no" ] && exit 1
 
   # Sanity checks.
-  [ -f /etc/nsd/nsd.conf ] || exit 5
-  [ -x /usr/sbin/nsd ] || exit 5
+  [ -f $NSD_CONF ] || exit 5
+  [ -x $NSD_PROG ] || exit 5
 
-	echo -n $"Starting nsd:"
-	/usr/sbin/nsdc rebuild >/dev/null 2>%1
-	nsd $OTHER_NSD_OPTS
-	RETVAL=$?
-	echo
+  echo -n $"Starting nsd:"
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
+  RETVAL=$?
+  echo
         if [ $RETVAL -eq 0 ]; then
            touch /var/lock/subsys/nsd;
         else
@@ -54,21 +57,21 @@
 }
 
 stop() {
-	echo -n $"Stopping nsd: "
-	# save state to zonefiles
-	/usr/sbin/nsdc patch > /dev/null 2>%1
-	/usr/sbin/nsdc stop
-	RETVAL=$?
-	# was nsdc successful?
-	[ "$RETVAL" -eq 0 ] || killproc nsd -TERM >/dev/null 2>&1
-	if [ $RETVAL -eq 0 ] ; then
-	  rm -f /var/run/nsd/nsd.pid
-	  rm -f /var/lock/subsys/nsd
-	  # ensure notifies are sent at startup
-	  rm -f /var/lib/nsd/xfrd.state
-	fi
-	echo
-	return $RETVAL
+  echo -n $"Stopping nsd: "
+  # save state to zonefiles
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF stop
+  RETVAL=$?
+  # was nsdc successful?
+  [ "$RETVAL" -eq 0 ] || killproc $NSD_PROG -TERM >/dev/null 2>&1
+  if [ $RETVAL -eq 0 ] ; then
+     rm -f $NSD_PIDFILE
+     rm -f /var/lock/subsys/nsd
+     # ensure notifies are sent at startup
+     rm -f $NSD_XFRDFILE
+  fi
+  echo
+  return $RETVAL
 }
 
 restart() {
@@ -93,14 +96,14 @@
         [ -f /var/lock/subsys/nsd ] && restart || :
 	;;
   status)
-	/usr/sbin/nsdc running
+	$NSDC_PROG -c $NSD_CONF running
 	;;
   stats|reload|rebuild|running|update|notify)
-	/usr/sbin/nsdc $1 
+	$NSDC_PROG -c $NSD_CONF $1 
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"
 	exit 1
 esac
 
-exit $RETVAL
+exit $?


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nsd.spec	9 Mar 2009 00:31:23 -0000	1.49
+++ nsd.spec	10 Apr 2009 18:05:04 -0000	1.50
@@ -1,13 +1,13 @@
-Summary: fast and lean authoritative DNS name server
+Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-#Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1: nsd.init
 Source2: nsd.cron
+Source3: nsd.sysconfig
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel
@@ -46,6 +46,8 @@
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
 
 # change .sample to normal config files
 head -76 %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample > %{buildroot}%{_sysconfdir}/nsd/nsd.conf
@@ -63,6 +65,7 @@
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/nsd
 %attr(0755,root,root) %{_initrddir}/%{name}
 %{_sysconfdir}/cron.hourly/nsd
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
@@ -92,6 +95,11 @@
 fi
 
 %changelog
+* Thu Apr 09 2009 Ville Mattila <vmattila at csc.fi> - 3.2.1-6
+- Make various file paths used by the nsd.init script configurable
+  from /etc/sysconfig/nsd.
+- Add template /etc/sysconfig/nsd.
+
 * Sun Mar 08 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-5
 - nsd used the 'named' subsystem in one call in the init script
 



From pwouters at fedoraproject.org  Fri Apr 10 18:06:56 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:06:56 +0000 (UTC)
Subject: rpms/nsd/devel nsd.zones2nsd.conf,1.1,NONE
Message-ID: <20090410180656.CEA6670122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13893

Removed Files:
	nsd.zones2nsd.conf 
Log Message:
nsd.zones2nsd.conf is now in contrib.



--- nsd.zones2nsd.conf DELETED ---



From pwouters at fedoraproject.org  Fri Apr 10 18:07:38 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:07:38 +0000 (UTC)
Subject: rpms/nsd/F-10 nsd.zones2nsd.conf,1.1,NONE
Message-ID: <20090410180738.EE43570122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14019/F-10

Removed Files:
	nsd.zones2nsd.conf 
Log Message:
nsd.zones2nsd.conf is now in contrib/



--- nsd.zones2nsd.conf DELETED ---



From pwouters at fedoraproject.org  Fri Apr 10 18:07:39 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:07:39 +0000 (UTC)
Subject: rpms/nsd/F-9 nsd.zones2nsd.conf,1.1,NONE
Message-ID: <20090410180739.4176F70122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14019/F-9

Removed Files:
	nsd.zones2nsd.conf 
Log Message:
nsd.zones2nsd.conf is now in contrib/



--- nsd.zones2nsd.conf DELETED ---



From orion at fedoraproject.org  Fri Apr 10 18:23:45 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 10 Apr 2009 18:23:45 +0000 (UTC)
Subject: rpms/wgrib2/devel wgrib2-1.7.8g-flags.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 wgrib2.spec, 1.4,
	1.5 wgrib2-1.7.7.i-flags.patch, 1.1, NONE
Message-ID: <20090410182345.93D7A70122@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17858

Modified Files:
	.cvsignore sources wgrib2.spec 
Added Files:
	wgrib2-1.7.8g-flags.patch 
Removed Files:
	wgrib2-1.7.7.i-flags.patch 
Log Message:
* Fri Apr 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.7.8g-1
- Update to 1.7.8g
- Fix up flags patch to preserve CFLAGS from environment


wgrib2-1.7.8g-flags.patch:

--- NEW FILE wgrib2-1.7.8g-flags.patch ---
--- grib2/wgrib2/makefile.flags	2009-02-19 09:49:45.000000000 -0700
+++ grib2/wgrib2/makefile	2009-04-10 12:08:02.000000000 -0600
@@ -57,12 +57,12 @@
 options=$(wildcard [A-Z]*.c)
 CODE_TABLE_DAT=$(wildcard CodeTable_[0-9].[0-9]*.dat)
 
-CFLAGS=-I${g2} ${netcdf_inc} ${jasper_inc} ${mysql_inc} -O2 ${DEFS}
+CFLAGS+=-I${g2} ${netcdf_inc} ${jasper_inc} ${mysql_inc} -O2 ${DEFS}
+CFLAGS+=${netcdf_inc} ${DEFS}
 ifeq ($(CC),gcc) 
    CFLAGS+=-Wall -ffast-math -funroll-loops
 endif
-
-LDFLAGS=-L${g2} -lgrib2c ${jasper_lib} ${netcdf_lib} ${mysql_lib} -L/usr/lib -lpng -lz -lm 
+LDFLAGS=-lgrib2c -ljasper -lnetcdf -lpng -lz -lm
 
 wgrib2: $h ${all}
 	${CC} -o wgrib2 ${CFLAGS} ${all} ${LDFLAGS}








--- wgrib2-1.7.7.i-flags.patch DELETED ---



From orion at fedoraproject.org  Fri Apr 10 18:23:47 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 10 Apr 2009 18:23:47 +0000 (UTC)
Subject: rpms/wgrib2/devel wgrib2.spec,1.5,1.6
Message-ID: <20090410182347.5026370122@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18007

Modified Files:
	wgrib2.spec 
Log Message:
* Fri Apr 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.7.8g-1
- Update to 1.7.8g
- Fix up flags patch to preserve CFLAGS from environment



Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wgrib2.spec	10 Apr 2009 18:22:45 -0000	1.5
+++ wgrib2.spec	10 Apr 2009 18:23:17 -0000	1.6
@@ -1,11 +1,6 @@
 Name:           wgrib2
-<<<<<<< wgrib2.spec
 Version:        1.7.8g
 Release:        1%{?dist}
-=======
-Version:        1.7.7.i
-Release:        2%{?dist}
->>>>>>> 1.4
 Summary:        Manipulate, inventory and decode GRIB2 files
 
 Group:          Applications/Engineering



From pwouters at fedoraproject.org  Fri Apr 10 18:40:34 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:40:34 +0000 (UTC)
Subject: rpms/nsd/EL-5 sources,1.7,1.8
Message-ID: <20090410184035.0112270122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22612

Modified Files:
	sources 
Log Message:
new sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2009 18:05:03 -0000	1.7
+++ sources	10 Apr 2009 18:40:03 -0000	1.8
@@ -1,3 +1 @@
-b96ac5e0e5f13cf99c0d07fa9d7ddabd  nsd-3.0.8.tar.gz
-69225bf59ae82181ca09af34c139fb6d  nsd-3.1.0.tar.gz
-93cb2d0fa005ab46f81ef00e4951a804  nsd-3.1.1.tar.gz
+66b602a793b851ad109403d3d2654fad  nsd-3.2.1.tar.gz



From rdieter at fedoraproject.org  Fri Apr 10 18:42:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 18:42:28 +0000 (UTC)
Subject: rpms/xine-lib/F-10 xine-lib-1.1.16.3-mod_mimetypes_typo.patch, NONE,
	1.1 xine-lib.spec, 1.59, 1.60
Message-ID: <20090410184228.D65B970122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23153

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16.3-mod_mimetypes_typo.patch 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
- fix modtracker mimetypes


xine-lib-1.1.16.3-mod_mimetypes_typo.patch:

--- NEW FILE xine-lib-1.1.16.3-mod_mimetypes_typo.patch ---
diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c
--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo	2009-03-25 14:28:40.000000000 -0500
+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c	2009-04-10 10:15:04.000000000 -0500
@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
          "audio/x-s3m: s3m: ScreamTracker 3 Module;"
          "audio/s3m: s3m: ScreamTracker 3 Module;"
          "application/playerpro: 669: 669 Tracker Module;"
-         "application/adrift; amf: ADRIFT Module File;"
-         "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
-         "audio/x-amf; amf: ADRIFT Module File;"
-         "audio/x-xm; xm: FastTracker II Audio;"
-         "audio/xm; xm: FastTracker II Audio;";
+         "application/adrift: amf: ADRIFT Module File;"
+         "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
+         "audio/x-amf: amf: ADRIFT Module File;"
+         "audio/x-xm: xm: FastTracker II Audio;"
+         "audio/xm: xm: FastTracker II Audio;";
 }
 
 static void class_dispose (demux_class_t *this_gen) {


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xine-lib.spec	9 Apr 2009 08:39:29 -0000	1.59
+++ xine-lib.spec	10 Apr 2009 18:41:58 -0000	1.60
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -55,6 +55,8 @@
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
+## upstreamable patches
+Patch50:        xine-lib-1.1.16.3-mod_mimetypes_typo.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{plugin_abi}
@@ -207,6 +209,7 @@
 
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
+%patch50 -p1 -b .mod_mimetypes_typo
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -439,6 +442,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
+- fix modtracker mimetypes
+
 * Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
 - xine-lib-1.1.16.3, plugin-abi 1.26
 



From rdieter at fedoraproject.org  Fri Apr 10 18:43:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 18:43:23 +0000 (UTC)
Subject: rpms/xine-lib/F-9 xine-lib-1.1.16.3-mod_mimetypes_typo.patch, NONE, 
	1.1 xine-lib.spec, 1.54, 1.55
Message-ID: <20090410184323.5F67D70122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23505

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16.3-mod_mimetypes_typo.patch 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
- fix modtracker mimetypes


xine-lib-1.1.16.3-mod_mimetypes_typo.patch:

--- NEW FILE xine-lib-1.1.16.3-mod_mimetypes_typo.patch ---
diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c
--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo	2009-03-25 14:28:40.000000000 -0500
+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c	2009-04-10 10:15:04.000000000 -0500
@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
          "audio/x-s3m: s3m: ScreamTracker 3 Module;"
          "audio/s3m: s3m: ScreamTracker 3 Module;"
          "application/playerpro: 669: 669 Tracker Module;"
-         "application/adrift; amf: ADRIFT Module File;"
-         "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
-         "audio/x-amf; amf: ADRIFT Module File;"
-         "audio/x-xm; xm: FastTracker II Audio;"
-         "audio/xm; xm: FastTracker II Audio;";
+         "application/adrift: amf: ADRIFT Module File;"
+         "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
+         "audio/x-amf: amf: ADRIFT Module File;"
+         "audio/x-xm: xm: FastTracker II Audio;"
+         "audio/xm: xm: FastTracker II Audio;";
 }
 
 static void class_dispose (demux_class_t *this_gen) {


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xine-lib.spec	9 Apr 2009 08:39:29 -0000	1.54
+++ xine-lib.spec	10 Apr 2009 18:42:53 -0000	1.55
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -55,6 +55,8 @@
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
+## upstreamable patches
+Patch50:        xine-lib-1.1.16.3-mod_mimetypes_typo.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{plugin_abi}
@@ -207,6 +209,7 @@
 
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
+%patch50 -p1 -b .mod_mimetypes_typo
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -439,6 +442,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
+- fix modtracker mimetypes
+
 * Fri Apr 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-1
 - xine-lib-1.1.16.3, plugin-abi 1.26
 



From rdieter at fedoraproject.org  Fri Apr 10 18:56:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 18:56:20 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.147,1.148
Message-ID: <20090410185620.8A15970122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26620

Modified Files:
	amarok.spec 
Log Message:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-2
- -collectionscanner -> -utilities



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- amarok.spec	10 Apr 2009 18:02:46 -0000	1.147
+++ amarok.spec	10 Apr 2009 18:55:49 -0000	1.148
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -37,7 +37,7 @@
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 Requires: qtscriptbindings
-Requires: %{name}-collectionscanner = %{version}-%{release}
+Requires: %{name}-utilities = %{version}-%{release}
 
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
@@ -51,11 +51,12 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-%package collectionscanner
-Summary: Amarok standalone collection scanner
+%package utilities 
+Summary: Amarok standalone utilities
 Group: Applications/Multimedia
-%description collectionscanner
-%{summary}.
+Obsoletes: amarok-collectionscanner < 2.0.90-2
+%description utilities 
+%{summary}, including amarokcollectionscanner.
 
 
 %prep
@@ -142,6 +143,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-2
+- -collectionscanner -> -utilities
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-1
 - amarok-2.0.90 (amarok-2.1 beta1)
 



From pwouters at fedoraproject.org  Fri Apr 10 18:59:17 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:59:17 +0000 (UTC)
Subject: rpms/nsd/F-10 nsd.init, 1.9, 1.10 nsd.spec, 1.39, 1.40 nsd.sysconfig,
	1.1, 1.2
Message-ID: <20090410185917.2F3F370122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27246/F-10

Modified Files:
	nsd.init nsd.spec nsd.sysconfig 
Log Message:
Add support to init script, sysconfig file and configure for the location
of the nsd.db file.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.init	10 Apr 2009 18:05:03 -0000	1.9
+++ nsd.init	10 Apr 2009 18:58:46 -0000	1.10
@@ -20,6 +20,7 @@
 
 # Init script default settings
 NSD_CONF="/etc/nsd/nsd.conf"
+NSD_DB="/var/lib/nsd/nsd.db"
 NSD_PROG="/usr/sbin/nsd"
 NSD_PIDFILE="/var/run/nsd/nsd.pid"
 NSD_XFRDFILE="/var/lib/nsd/xfrd.state"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- nsd.spec	10 Apr 2009 18:05:04 -0000	1.39
+++ nsd.spec	10 Apr 2009 18:58:46 -0000	1.40
@@ -27,7 +27,8 @@
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
-           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state
+           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state \
+           --with-dbfile=%{_localstatedir}/lib/%{name}/nsd.db
 
 %{__make} %{?_smp_mflags}
 #convert to utf8


Index: nsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.sysconfig	10 Apr 2009 18:05:04 -0000	1.1
+++ nsd.sysconfig	10 Apr 2009 18:58:46 -0000	1.2
@@ -11,6 +11,9 @@
 # Main configuration file
 #NSD_CONF="/etc/nsd/nsd.conf"
 
+# NSD DB
+#NSD_DB="/var/lib/nsd/nsd.db"
+
 # Path to nsdc program
 #NSDC_PROG="/usr/sbin/nsd"
 



From pwouters at fedoraproject.org  Fri Apr 10 18:59:16 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:59:16 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.init, 1.5, 1.6 nsd.spec, 1.18, 1.19 nsd.sysconfig,
	1.1, 1.2
Message-ID: <20090410185916.BBC5370122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27246/EL-5

Modified Files:
	nsd.init nsd.spec nsd.sysconfig 
Log Message:
Add support to init script, sysconfig file and configure for the location
of the nsd.db file.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	10 Apr 2009 18:05:03 -0000	1.5
+++ nsd.init	10 Apr 2009 18:58:45 -0000	1.6
@@ -19,6 +19,7 @@
 
 # Init script default settings
 NSD_CONF="/etc/nsd/nsd.conf"
+NSD_DB="/var/lib/nsd/nsd.db"
 NSD_PROG="/usr/sbin/nsd"
 NSD_PIDFILE="/var/run/nsd/nsd.pid"
 NSD_XFRDFILE="/var/lib/nsd/xfrd.state"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nsd.spec	10 Apr 2009 18:05:03 -0000	1.18
+++ nsd.spec	10 Apr 2009 18:58:46 -0000	1.19
@@ -27,7 +27,8 @@
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
-           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state
+           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state \
+           --with-dbfile=%{_localstatedir}/lib/%{name}/nsd.db
 
 %{__make} %{?_smp_mflags}
 #convert to utf8


Index: nsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.sysconfig	10 Apr 2009 18:05:03 -0000	1.1
+++ nsd.sysconfig	10 Apr 2009 18:58:46 -0000	1.2
@@ -11,6 +11,9 @@
 # Main configuration file
 #NSD_CONF="/etc/nsd/nsd.conf"
 
+# NSD DB
+#NSD_DB="/var/lib/nsd/nsd.db"
+
 # Path to nsdc program
 #NSDC_PROG="/usr/sbin/nsd"
 



From pwouters at fedoraproject.org  Fri Apr 10 18:59:18 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:59:18 +0000 (UTC)
Subject: rpms/nsd/devel nsd.init, 1.12, 1.13 nsd.spec, 1.50,
	1.51 nsd.sysconfig, 1.1, 1.2
Message-ID: <20090410185918.6EAB870122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27246/devel

Modified Files:
	nsd.init nsd.spec nsd.sysconfig 
Log Message:
Add support to init script, sysconfig file and configure for the location
of the nsd.db file.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nsd.init	10 Apr 2009 18:05:04 -0000	1.12
+++ nsd.init	10 Apr 2009 18:58:47 -0000	1.13
@@ -19,6 +19,7 @@
 
 # Init script default settings
 NSD_CONF="/etc/nsd/nsd.conf"
+NSD_DB="/var/lib/nsd/nsd.db"
 NSD_PROG="/usr/sbin/nsd"
 NSD_PIDFILE="/var/run/nsd/nsd.pid"
 NSD_XFRDFILE="/var/lib/nsd/xfrd.state"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- nsd.spec	10 Apr 2009 18:05:04 -0000	1.50
+++ nsd.spec	10 Apr 2009 18:58:47 -0000	1.51
@@ -27,7 +27,8 @@
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
-           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state
+           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state \
+           --with-dbfile=%{_localstatedir}/lib/%{name}/nsd.db
 
 %{__make} %{?_smp_mflags}
 #convert to utf8


Index: nsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.sysconfig	10 Apr 2009 18:05:04 -0000	1.1
+++ nsd.sysconfig	10 Apr 2009 18:58:48 -0000	1.2
@@ -11,6 +11,9 @@
 # Main configuration file
 #NSD_CONF="/etc/nsd/nsd.conf"
 
+# NSD DB
+#NSD_DB="/var/lib/nsd/nsd.db"
+
 # Path to nsdc program
 #NSDC_PROG="/usr/sbin/nsd"
 



From pwouters at fedoraproject.org  Fri Apr 10 18:59:18 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 18:59:18 +0000 (UTC)
Subject: rpms/nsd/F-9 nsd.init, 1.9, 1.10 nsd.spec, 1.34, 1.35 nsd.sysconfig,
	1.1, 1.2
Message-ID: <20090410185918.026FD70122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27246/F-9

Modified Files:
	nsd.init nsd.spec nsd.sysconfig 
Log Message:
Add support to init script, sysconfig file and configure for the location
of the nsd.db file.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.init	10 Apr 2009 18:05:04 -0000	1.9
+++ nsd.init	10 Apr 2009 18:58:47 -0000	1.10
@@ -20,6 +20,7 @@
 
 # Init script default settings
 NSD_CONF="/etc/nsd/nsd.conf"
+NSD_DB="/var/lib/nsd/nsd.db"
 NSD_PROG="/usr/sbin/nsd"
 NSD_PIDFILE="/var/run/nsd/nsd.pid"
 NSD_XFRDFILE="/var/lib/nsd/xfrd.state"


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nsd.spec	10 Apr 2009 18:05:04 -0000	1.34
+++ nsd.spec	10 Apr 2009 18:58:47 -0000	1.35
@@ -24,7 +24,9 @@
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
-           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state
+           --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state \
+           --with-dbfile=%{_localstatedir}/lib/%{name}/nsd.db
+
 
 %build
 %{__make} %{?_smp_mflags}


Index: nsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.sysconfig	10 Apr 2009 18:05:04 -0000	1.1
+++ nsd.sysconfig	10 Apr 2009 18:58:47 -0000	1.2
@@ -11,6 +11,9 @@
 # Main configuration file
 #NSD_CONF="/etc/nsd/nsd.conf"
 
+# NSD DB
+#NSD_DB="/var/lib/nsd/nsd.db"
+
 # Path to nsdc program
 #NSDC_PROG="/usr/sbin/nsd"
 



From rdieter at fedoraproject.org  Fri Apr 10 18:59:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 18:59:48 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.148,1.149
Message-ID: <20090410185948.1CB5870122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27787

Modified Files:
	amarok.spec 
Log Message:
%files utilities too



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- amarok.spec	10 Apr 2009 18:55:49 -0000	1.148
+++ amarok.spec	10 Apr 2009 18:59:17 -0000	1.149
@@ -137,7 +137,7 @@
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
-%files collectionscanner -f amarokcollectionscanner_qt.lang
+%files utilities -f amarokcollectionscanner_qt.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/amarokcollectionscanner
 



From rdieter at fedoraproject.org  Fri Apr 10 19:04:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 10 Apr 2009 19:04:26 +0000 (UTC)
Subject: rpms/taglib-extras/F-9 taglib-extras-0.1-multilib-1.patch, NONE,
	1.1 taglib-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090410190426.D60DA70122@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28955

Modified Files:
	.cvsignore sources 
Added Files:
	taglib-extras-0.1-multilib-1.patch taglib-extras.spec 
Log Message:
import


taglib-extras-0.1-multilib-1.patch:

--- NEW FILE taglib-extras-0.1-multilib-1.patch ---
diff -up taglib-extras-0.1/taglib-extras-config.cmake.multilib taglib-extras-0.1/taglib-extras-config.cmake
--- taglib-extras-0.1/taglib-extras-config.cmake.multilib	2009-03-12 11:12:04.000000000 -0500
+++ taglib-extras-0.1/taglib-extras-config.cmake	2009-03-23 07:57:25.000000000 -0500
@@ -16,7 +16,6 @@ EOH
 
 prefix=${CMAKE_INSTALL_PREFIX}
 exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${LIB_INSTALL_DIR}
 includedir=${INCLUDE_INSTALL_DIR}
 
 flags=""
@@ -29,7 +28,7 @@ while test $# -gt 0
 do
   case $1 in
     --libs)
-	  flags="$flags -L$libdir -ltag-extras"
+	  flags="$flags -ltag-extras"
 	  ;;
     --cflags)
 	  flags="$flags -I$includedir/taglib-extras"


--- NEW FILE taglib-extras.spec ---
Summary:        Taglib support for other formats 
Name:           taglib-extras
Version:        0.1.2
Release:        1%{?dist}

Group:          Applications/Multimedia
License:        LGPLv2
URL:            http://websvn.kde.org/trunk/kdesupport/taglib-extras/
Source0:        http://www.jefferai.com/taglib-extras/taglib-extras-%{version}.tar.gz 
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# taglib-extras-config: drop multilib-conflicting mention of libdir, since
# it's already in default linker search path
Patch1: taglib-extras-0.1-multilib-1.patch

BuildRequires: cmake
BuildRequires: taglib-devel
BuildRequires: kdelibs4-devel

%description
Taglib-extras delivers support for reading and editing the meta-data of 
audio formats not supported by taglib, including: asf, mp4v2, rmff, wav.


%package devel
Summary: Development files for %{name}
Group:   Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
Requires: taglib-devel
%description devel
%{summary}.


%prep
%setup -q -n %{name}

%patch1 -p1 -b .multilib


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}   
%{cmake} -DWITH_KDE=1 ..
popd                        

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot} 

make install DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot} 

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.LGPL
%{_libdir}/libtag-extras.so.0*

%files devel
%defattr(-,root,root,-)
%{_bindir}/taglib-extras-config
%{_includedir}/taglib-extras/
%{_libdir}/libtag-extras.so
%{_libdir}/pkgconfig/taglib-extras.pc


%changelog
* Thu Apr 07 2009 Eelko Berkenpies <fedora at berkenpies.nl> - 0.1.2-1
- taglib-extras-0.1.2

* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-2
- enable KDE integration, -DWITH_KDE

* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
- taglib-extras-0.1.1

* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1-4
- refetch tarball

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1-3
- -devel: Requires: taglib-devel
- Source0: full URL

* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1-2
- fixup for review

* Fri Mar 20 2009 Eelko Berkenpies <fedora at berkenpies.nl> - 0.1-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2009 17:27:30 -0000	1.1
+++ .cvsignore	10 Apr 2009 19:03:56 -0000	1.2
@@ -0,0 +1 @@
+taglib-extras-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2009 17:27:30 -0000	1.1
+++ sources	10 Apr 2009 19:03:56 -0000	1.2
@@ -0,0 +1 @@
+f6fdba37ffebad96d9409c30c26dd028  taglib-extras-0.1.2.tar.gz



From sharkcz at fedoraproject.org  Fri Apr 10 19:08:20 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 10 Apr 2009 19:08:20 +0000 (UTC)
Subject: rpms/wxPython/devel .cvsignore, 1.14, 1.15 sources, 1.12,
	1.13 wxPython.spec, 1.32, 1.33
Message-ID: <20090410190820.7A4C170122@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30484

Modified Files:
	.cvsignore sources wxPython.spec 
Log Message:
* Fri Apr 10 2009 Dan Horak <dan[at]danny.cz> - 2.8.9.2-1
- update to 2.8.9.2
- create noarch docs subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	30 Sep 2008 14:48:29 -0000	1.14
+++ .cvsignore	10 Apr 2009 19:07:49 -0000	1.15
@@ -1 +1 @@
-wxPython-src-2.8.9.1.tar.bz2
+wxPython-src-2.8.9.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Sep 2008 14:48:29 -0000	1.12
+++ sources	10 Apr 2009 19:07:49 -0000	1.13
@@ -1 +1 @@
-4ad9a64e05529097618c7e48fbb10a84  wxPython-src-2.8.9.1.tar.bz2
+e3d89746af98b9279e4ff39a57f6dc63  wxPython-src-2.8.9.2.tar.bz2


Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wxPython.spec	5 Mar 2009 10:34:31 -0000	1.32
+++ wxPython.spec	10 Apr 2009 19:07:49 -0000	1.33
@@ -4,8 +4,8 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.9.1
-Release:        4%{?dist}
+Version:        2.8.9.2
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -46,11 +46,22 @@
 add-on modules for wxPython. It is NOT needed for development of most
 programs which use the wxPython toolkit.
 
+%package        docs
+Group:          Documentation
+Summary:        Documentation and samples for wxPython
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:      noarch
+%endif
+
+%description docs
+Documentation, samples and demo application for wxPython.
+
 
 %prep
 %setup -q -n wxPython-src-%{version}
 
-# fix libdir otherwise it additional wx libs cannot be found
+# fix libdir otherwise additional wx libs cannot be found
 sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
 
 
@@ -80,14 +91,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
+%doc wxPython/licence
 %{_bindir}/*
 %{python_sitearch}/wx.pth
 %{python_sitearch}/wxversion.py*
 %dir %{python_sitearch}/wx-2.8-gtk2-unicode/
 %{python_sitearch}/wx-2.8-gtk2-unicode/wx
 %{python_sitearch}/wx-2.8-gtk2-unicode/wxPython
-%{python_sitelib}/wxaddons
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*egg-info
 %{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info
@@ -102,8 +112,16 @@
 %{_includedir}/wx-2.8/wx/wxPython/i_files/*.py*
 %{_includedir}/wx-2.8/wx/wxPython/i_files/*.swg
 
+%files docs
+%defattr(-,root,root,-)
+%doc wxPython/docs wxPython/demo wxPython/samples
+
 
 %changelog
+* Fri Apr 10 2009 Dan Horak <dan[at]danny.cz> - 2.8.9.2-1
+- update to 2.8.9.2
+- create noarch docs subpackage
+
 * Thu Mar  5 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.8.9.1-4
 - Rebuilt for newer wxgtk package
 



From jwilson at fedoraproject.org  Fri Apr 10 19:20:49 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri, 10 Apr 2009 19:20:49 +0000 (UTC)
Subject: rpms/lirc/devel .cvsignore, 1.28, 1.29 lirc.spec, 1.52, 1.53 sources,
	1.28, 1.29
Message-ID: <20090410192049.B3B1370122@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv949

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Fri Apr 10 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-0.1.pre2
- Update to lirc 0.8.5pre2 cvs snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	26 Feb 2009 15:14:10 -0000	1.28
+++ .cvsignore	10 Apr 2009 19:20:17 -0000	1.29
@@ -4,3 +4,4 @@
 lirc-0.8.4.tar.bz2
 lirc-0.8.4a.tar.bz2
 lirc-0.8.5pre1.tar.bz2
+lirc-0.8.5pre2.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- lirc.spec	26 Feb 2009 15:14:11 -0000	1.52
+++ lirc.spec	10 Apr 2009 19:20:18 -0000	1.53
@@ -14,7 +14,7 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre1
+%define pre     pre2
 
 Name:           lirc
 Version:        0.8.5
@@ -265,6 +265,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-0.1.pre2
+- Update to lirc 0.8.5pre2 cvs snapshot
+
 * Thu Feb 26 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-0.1.pre1
 - Update to lirc 0.8.5pre1 cvs snapshot
 - Adds support for usb-connected ftdi-based homebrew transceivers


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Feb 2009 15:14:11 -0000	1.28
+++ sources	10 Apr 2009 19:20:18 -0000	1.29
@@ -1,2 +1 @@
-606b714ed843d28060163ffc571fc1f7  lirc-0.8.4a.tar.bz2
-ea1fc984be29cede02b3731bebe4e738  lirc-0.8.5pre1.tar.bz2
+0cd8119e54806be2a7245933f0d51b54  lirc-0.8.5pre2.tar.bz2



From mso at fedoraproject.org  Fri Apr 10 19:45:31 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Fri, 10 Apr 2009 19:45:31 +0000 (UTC)
Subject: rpms/leonidas-backgrounds/devel .cvsignore, 1.2,
	1.3 leonidas-backgrounds.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090410194531.D938B70122@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/leonidas-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6719

Modified Files:
	.cvsignore leonidas-backgrounds.spec sources 
Log Message:


Add lion backgrounds, split -common, -kdm and -landscape subpackges.

-common contains wallpapers shared between GNOME and KDE
-kdm contains background for KDM
-landscape contains the wallpapers from beta




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2009 07:12:56 -0000	1.2
+++ .cvsignore	10 Apr 2009 19:45:01 -0000	1.3
@@ -1 +1 @@
-leonidas-backgrounds-10.92.1.tar.lzma
+leonidas-backgrounds-10.93.0.tar.lzma


Index: leonidas-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/leonidas-backgrounds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leonidas-backgrounds.spec	10 Mar 2009 07:12:56 -0000	1.1
+++ leonidas-backgrounds.spec	10 Apr 2009 19:45:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           leonidas-backgrounds
-Version:        10.92.1
-Release:        2%{?dist}
+Version:        10.93.0
+Release:        1%{?dist}
 Summary:        Leonidas desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -11,10 +11,13 @@
 # The source is only available from within this srpm.
 # Images in the source archive are basically crops/resizes of 
 # https://fedoraproject.org/w/uploads/e/e9/Artwork_F11_Betamockup1_n.jpg
+# and
+# https://fedoraproject.org/wiki/Image:King_4070x1536.jpg
 Source0:        %{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+Requires:       %{name}-common = %{version}-%{release}
 
 %description
 This package contains desktop backgrounds for the leonidas theme.
@@ -22,27 +25,72 @@
 %prep
 %setup -q
 
+%package        common
+Summary:        Leonidas desktop backgrounds shared between GNOME and KDE
+Group:          Applications/Multimedia
+
+%description    common
+This package includes the common files used by both GNOME and KDE.
+
+%package        kdm
+Summary:        Leonidas desktop background for KDM
+Group:          Applications/Multimedia
+
+%description    kdm
+Leonidas desktop background used in KDM.
+
+%package        landscape
+Summary:        Leonidas desktop backgrounds with the landscape theme
+Group:          Applications/Multimedia
+
+%description    landscape
+This package includes additional Leonidas backgrounds based on the landscape
+theme that was used in F11 Leonidas Beta.
+
 
 %build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# copy image files
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/normal
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/wide
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/normal.dual
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/wide.dual
+# prepare the dir structure
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/normal
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/wide
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/normal.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape/wide.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normal
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normalish
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/wide
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normal.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/normalish.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion/wide.dual
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/normal \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/wide \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/normal.dual \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/wide.dual \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
+# copy the landscape images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/normal \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/wide \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/normal.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/landscape/wide.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/landscape
+
+# copy the lion images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normal \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normalish \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/wide \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normal.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/normalish.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/lion/wide.dual \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/lion
 
 # copy slideshow xml files
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/leonidas.xml \
@@ -53,9 +101,10 @@
         $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas
 
 # copy metadata xmls file
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-leonidas.xml \
         $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-leonidas-landscape.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,11 +113,46 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_datadir}/backgrounds/leonidas
-%{_datadir}/gnome-background-properties
+%{_datadir}/gnome-background-properties/desktop-backgrounds-leonidas.xml
+%{_datadir}/backgrounds/leonidas/leonidas.xml
+%{_datadir}/backgrounds/leonidas/lion/normal.dual
+%{_datadir}/backgrounds/leonidas/lion/normalish.dual
+%{_datadir}/backgrounds/leonidas/lion/wide.dual
+
+%files common
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/leonidas
+%dir %{_datadir}/backgrounds/leonidas/lion
+%dir %{_datadir}/backgrounds/leonidas/lion/normal
+%dir %{_datadir}/backgrounds/leonidas/lion/normal/2048x1536
+%{_datadir}/backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.jpg
+%{_datadir}/backgrounds/leonidas/lion/normalish
+%{_datadir}/backgrounds/leonidas/lion/wide
 
+%files kdm
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/leonidas
+%dir %{_datadir}/backgrounds/leonidas/lion/normal
+%dir %{_datadir}/backgrounds/leonidas/lion/normal/2048x1536
+%{_datadir}/backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon-simple.png
+
+%files landscape
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/leonidas
+%{_datadir}/backgrounds/leonidas/landscape
+%{_datadir}/gnome-background-properties/desktop-backgrounds-leonidas-landscape.xml
+%{_datadir}/backgrounds/leonidas/leonidas_left.xml
+%{_datadir}/backgrounds/leonidas/leonidas_right.xml
 
 %changelog
+* Fri Apr 10 2009 Martin Sourada <mso at fedoraproject.org> - 10.93.0-1
+- Add lion backgrounds
+- Split -common (shared between GNOME and KDE), -kdm (simplified version for 
+  KDM) and -landscape (F11 Leonidas Beta wallpapers) subpackages
+
 * Mon Mar 09 2009 Martin Sourada <mso at fedoraproject.org> - 10.92.1-2
 - Add note about source (we are upstream and don't host the source elsewhere)
 - Don't pass -r to cp, it's already implied by -a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2009 07:12:56 -0000	1.2
+++ sources	10 Apr 2009 19:45:01 -0000	1.3
@@ -1 +1 @@
-752c6291a5b344d9fdbe79d9cfc669a8  leonidas-backgrounds-10.92.1.tar.lzma
+90b5344be91a49c99c1484e956d022e0  leonidas-backgrounds-10.93.0.tar.lzma



From cwickert at fedoraproject.org  Fri Apr 10 19:50:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 10 Apr 2009 19:50:05 +0000 (UTC)
Subject: rpms/xfce4-wavelan-plugin/devel .cvsignore, 1.4, 1.5 sources, 1.4, 
	1.5 xfce4-wavelan-plugin.spec, 1.12, 1.13
Message-ID: <20090410195005.D363070122@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-wavelan-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8218

Modified Files:
	.cvsignore sources xfce4-wavelan-plugin.spec 
Log Message:
* Fri Apr 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-1
- Update to 0.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-wavelan-plugin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Feb 2007 01:25:32 -0000	1.4
+++ .cvsignore	10 Apr 2009 19:49:35 -0000	1.5
@@ -1 +1 @@
-xfce4-wavelan-plugin-0.5.4.tar.gz
+xfce4-wavelan-plugin-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-wavelan-plugin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Feb 2007 01:25:32 -0000	1.4
+++ sources	10 Apr 2009 19:49:35 -0000	1.5
@@ -1 +1 @@
-b13993facb6b7a25ca81ac8cde9a9100  xfce4-wavelan-plugin-0.5.4.tar.gz
+1fa00ad9f24cc29536cb7622016c6a5e  xfce4-wavelan-plugin-0.5.5.tar.bz2


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-wavelan-plugin/devel/xfce4-wavelan-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-wavelan-plugin.spec	26 Feb 2009 09:13:21 -0000	1.12
+++ xfce4-wavelan-plugin.spec	10 Apr 2009 19:49:35 -0000	1.13
@@ -1,16 +1,16 @@
 Name:		xfce4-wavelan-plugin
-Version:	0.5.4
-Release:	6%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
-BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
 %description
@@ -39,6 +39,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Apr 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-1
+- Update to 0.5.5
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ixs at fedoraproject.org  Fri Apr 10 20:11:20 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 10 Apr 2009 20:11:20 +0000 (UTC)
Subject: rpms/ladvd/EL-4 ladvd.spec,1.2,1.3
Message-ID: <20090410201120.B603370122@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13581

Modified Files:
	ladvd.spec 
Log Message:
Disabled selinux package for el4


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-4/ladvd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ladvd.spec	29 Oct 2008 07:03:07 -0000	1.2
+++ ladvd.spec	10 Apr 2009 20:10:50 -0000	1.3
@@ -3,9 +3,9 @@
 %global homedir /tmp
 %global gecos CDP/LLDP sender for unix
 
-%define selinux_variants mls strict targeted
-%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
-%define modulename ladvd
+#%%define selinux_variants mls strict targeted
+#%%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+#%%define modulename ladvd
 
 Name:           ladvd
 Version:        0.6.1
@@ -44,20 +44,20 @@
 IPv6) are detected dynamically.
 
 
-%package selinux
-Summary:        SELinux policy module supporting %{name}
-Group:          System Environment/Base
-BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
-%if "%{selinux_policyver}" != ""
-Requires:       selinux-policy >= %{selinux_policyver}
-%endif
-Requires:       %{name} = %{version}-%{release}
-Requires(post):   /usr/sbin/semodule, /sbin/restorecon
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+#%%package selinux
+#Summary:        SELinux policy module supporting %{name}
+#Group:          System Environment/Base
+#BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
+#%%if "%{selinux_policyver}" != ""
+#Requires:       selinux-policy >= %{selinux_policyver}
+#%endif
+#Requires:       %{name} = %{version}-%{release}
+#Requires(post):   /usr/sbin/semodule, /sbin/restorecon
+#Requires(postun): /usr/sbin/semodule, /sbin/restorecon
 
 
-%description selinux
-SELinux policy module supporting %{name}
+#%description selinux
+#SELinux policy module supporting %{name}
 
 
 %prep
@@ -72,14 +72,14 @@
         --with-pid-dir=%{_localstatedir}/run
 make %{?_smp_mflags}
 
-cd SELinux
-for selinuxvariant in %{selinux_variants}
-do
-make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
-make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-cd -
+#cd SELinux
+#for selinuxvariant in %{selinux_variants}
+#do
+#make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+#mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
+#make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+#done
+#cd -
 
 
 %install
@@ -89,16 +89,16 @@
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
 
-cd SELinux
-for selinuxvariant in %{selinux_variants}
-do
-install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-install -p -m 644 %{modulename}.pp.${selinuxvariant} \
-%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
-done
-cd -
+#cd SELinux
+#for selinuxvariant in %{selinux_variants}
+#do
+#install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+#install -p -m 644 %{modulename}.pp.${selinuxvariant} \
+#%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
+#done
+#cd -
 
-/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
 
 
 %clean
@@ -130,23 +130,23 @@
 %__fe_groupdel %username &>/dev/null || :
 
 
-%post selinux
-for selinuxvariant in %{selinux_variants}
-do
-/usr/sbin/semodule -s ${selinuxvariant} -i \
-%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
-done
-/sbin/restorecon %{_localstatedir}/cache/myapp || :
-
-%postun selinux
-if [ $1 -eq 0 ] ; then
-for selinuxvariant in %{selinux_variants}
-do
-/usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
-done
-[ -d %{_localstatedir}/cache/myapp ]  && \
-/sbin/restorecon -R %{_localstatedir}/cache/myapp &> /dev/null || :
-fi
+#%%post selinux
+#for selinuxvariant in %{selinux_variants}
+#do
+#/usr/sbin/semodule -s ${selinuxvariant} -i \
+#%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
+#done
+#/sbin/restorecon %{_localstatedir}/cache/myapp || :
+
+#%%postun selinux
+#if [ $1 -eq 0 ] ; then
+#for selinuxvariant in %{selinux_variants}
+#do
+#/usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+#done
+#[ -d %{_localstatedir}/cache/myapp ]  && \
+#/sbin/restorecon -R %{_localstatedir}/cache/myapp &> /dev/null || :
+#fi
 
 
 %files
@@ -158,15 +158,15 @@
 %{_mandir}/man8/ladvd.8*
 
 
-%files selinux
-%defattr(-,root,root,0755)
-%doc SELinux/*
-%{_datadir}/selinux/*/%{modulename}.pp
+#%files selinux
+#%defattr(-,root,root,0755)
+#%doc SELinux/*
+#%{_datadir}/selinux/*/%{modulename}.pp
 
 
 %changelog
 * Sat Oct 18 2008 Andreas Thienemann <andreas at bawue.net> 0.6.1-2
-- Added SElinux support package
+- Disabled SElinux support package for EL-4
 - Added patch to make it build on EL-4
 - Added separate ladvd user
 



From pwouters at fedoraproject.org  Fri Apr 10 20:12:15 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 20:12:15 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.init,1.6,1.7 nsd.spec,1.19,1.20
Message-ID: <20090410201215.6951270122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13466

Modified Files:
	nsd.init nsd.spec 
Log Message:
Fix init script to use sysconfig file.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsd.init	10 Apr 2009 18:58:45 -0000	1.6
+++ nsd.init	10 Apr 2009 20:11:45 -0000	1.7
@@ -2,7 +2,7 @@
 #
 # nsd:         Starts the NSD Name Server Daemon
 #
-# chkconfig: - 11 89
+# chkconfig: - 13 87
 # description:  NSD is a complete implementation of an authoritative \
 #               DNS name server. 
 # processname: /usr/sbin/nsd
@@ -10,11 +10,11 @@
 #
 ### BEGIN INIT INFO
 # Provides: nsd
-# Required-Start: $syslog
+# Required-Start: $local_fs $network $syslog
+# Required-Stop: $local_fs $network $syslog
 # Default-Stop: 0 11 89
-# Short-Description: Starts the NSD Name Server Daemon
-# Description:  NSD is a complete implementation of an authoritative \
-#               DNS name server.
+# Short-Description: start|stop|status|restart|try-restart|reload|force-reload DNS server
+# Description: control NSD implementation of DNS server
 ### END INIT INFO
 
 # Init script default settings
@@ -26,37 +26,53 @@
 NSDC_PROG="/usr/sbin/nsdc"
 
 # Source function library.
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
 
-. /etc/sysconfig/network
+[ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
 
 # Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 0
 
 start() {
-	echo -n $"Starting nsd... "
-	/usr/sbin/nsdc rebuild >/dev/null 2>%1
-	nsd $OTHER_NSD_OPTS
-	RETVAL=$?
-	echo
-	touch /var/lock/subsys/nsd
-	return $RETVAL
+  # Source networking configuration.
+  [ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
+
+  # Check that networking is up
+  [ "${NETWORKING}" = "no" ] && exit 1
+
+  # Sanity checks.
+  [ -f $NSD_CONF ] || exit 5
+  [ -x $NSD_PROG ] || exit 5
+
+  echo -n $"Starting nsd:"
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
+  RETVAL=$?
+  echo
+        if [ $RETVAL -eq 0 ]; then
+           touch /var/lock/subsys/nsd;
+        else
+           exit 7;
+        fi
+  return 0;
 }
 
 stop() {
-	echo -n $"Shutting down nsd services: "
-	# save state to zonefiles
-	/usr/sbin/nsdc patch > /dev/null 2>%1
-	killproc nsd
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ] ; then
-	  rm -f /var/run/nsd/nsd.pid
-	  # ensure notifies are sent at startup
-	  rm -f /var/lib/nsd/xfrd.state
-	  rm -f /var/lock/subsys/nsd
-	fi
-	echo
-	return $RETVAL
+  echo -n $"Stopping nsd: "
+  # save state to zonefiles
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF stop
+  RETVAL=$?
+  # was nsdc successful?
+  [ "$RETVAL" -eq 0 ] || killproc $NSD_PROG -TERM >/dev/null 2>&1
+  if [ $RETVAL -eq 0 ] ; then
+     rm -f $NSD_PIDFILE
+     rm -f /var/lock/subsys/nsd
+     # ensure notifies are sent at startup
+     rm -f $NSD_XFRDFILE
+  fi
+  echo
+  return $RETVAL
 }
 
 restart() {


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nsd.spec	10 Apr 2009 18:58:46 -0000	1.19
+++ nsd.spec	10 Apr 2009 20:11:45 -0000	1.20
@@ -100,6 +100,7 @@
 - updated to 3.2.1
 - fixed /dev/nul which cause a file /%1 to be written by cron
 - Applied Ville Mattila's changes to support non-default locations
+- Added --with-dbfile to point to the right place
 
 * Thu Oct  9 2008 Paul Wouters <paul at xelerance.com> - 3.1.1-1
 - updated to 3.1.1



From pwouters at fedoraproject.org  Fri Apr 10 20:13:44 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 10 Apr 2009 20:13:44 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.spec,1.20,1.21
Message-ID: <20090410201344.C036070122@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14315

Modified Files:
	nsd.spec 
Log Message:
bump



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsd.spec	10 Apr 2009 20:11:45 -0000	1.20
+++ nsd.spec	10 Apr 2009 20:13:14 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -96,11 +96,14 @@
 fi
 
 %changelog
+* Fri Apr 10 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-2
+- Fixes to initscripts 
+- Added --with-dbfile to point to the right place
+
 * Fri Apr 10 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
 - updated to 3.2.1
 - fixed /dev/nul which cause a file /%1 to be written by cron
 - Applied Ville Mattila's changes to support non-default locations
-- Added --with-dbfile to point to the right place
 
 * Thu Oct  9 2008 Paul Wouters <paul at xelerance.com> - 3.1.1-1
 - updated to 3.1.1



From ixs at fedoraproject.org  Fri Apr 10 20:15:12 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 10 Apr 2009 20:15:12 +0000 (UTC)
Subject: rpms/ladvd/EL-4 ladvd.spec,1.3,1.4
Message-ID: <20090410201512.556FC70122@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14808

Modified Files:
	ladvd.spec 
Log Message:
Disabled selinux package for el4


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-4/ladvd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ladvd.spec	10 Apr 2009 20:10:50 -0000	1.3
+++ ladvd.spec	10 Apr 2009 20:14:42 -0000	1.4
@@ -4,7 +4,7 @@
 %global gecos CDP/LLDP sender for unix
 
 #%%define selinux_variants mls strict targeted
-#%%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+#%%global selinux_policyver %%(%%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
 #%%define modulename ladvd
 
 Name:           ladvd



From ixs at fedoraproject.org  Fri Apr 10 20:16:56 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 10 Apr 2009 20:16:56 +0000 (UTC)
Subject: rpms/ladvd/EL-4 ladvd.spec,1.4,1.5
Message-ID: <20090410201656.E2A3570122@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15417

Modified Files:
	ladvd.spec 
Log Message:
Disabled selinux package for el4


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-4/ladvd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ladvd.spec	10 Apr 2009 20:14:42 -0000	1.4
+++ ladvd.spec	10 Apr 2009 20:16:26 -0000	1.5
@@ -5,7 +5,7 @@
 
 #%%define selinux_variants mls strict targeted
 #%%global selinux_policyver %%(%%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
-#%%define modulename ladvd
+%%define modulename ladvd
 
 Name:           ladvd
 Version:        0.6.1



From robert at fedoraproject.org  Fri Apr 10 20:18:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 10 Apr 2009 20:18:01 +0000 (UTC)
Subject: rpms/clamav/devel .cvsignore, 1.18, 1.19 clamav.spec, 1.85,
	1.86 sources, 1.44, 1.45
Message-ID: <20090410201802.01B7370122@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15703

Modified Files:
	.cvsignore clamav.spec sources 
Log Message:
Upgrade to 0.95.1 (#495039)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Mar 2009 22:03:44 -0000	1.18
+++ .cvsignore	10 Apr 2009 20:17:31 -0000	1.19
@@ -1 +1 @@
-clamav-0.95-norar.tar.bz2
+clamav-0.95.1-norar.tar.bz2


Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- clamav.spec	25 Mar 2009 22:03:44 -0000	1.85
+++ clamav.spec	10 Apr 2009 20:17:31 -0000	1.86
@@ -20,7 +20,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.95
+Version:	0.95.1
 Release:	%release_func 1%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
@@ -666,6 +666,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Robert Scheck <robert at fedoraproject.org> - 0.95.1-1
+- Upgrade to 0.95.1 (#495039)
+
 * Wed Mar 25 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95-1
 - updated to final 0.95
 - added ncurses-devel (-> clamdtop) BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	25 Mar 2009 22:03:44 -0000	1.44
+++ sources	10 Apr 2009 20:17:31 -0000	1.45
@@ -1 +1 @@
-f6ede74787379f1683a368ee6da62cea  clamav-0.95-norar.tar.bz2
+0ddd9f341dd0299a6bc5398ee26f4ebf  clamav-0.95.1-norar.tar.bz2



From ixs at fedoraproject.org  Fri Apr 10 20:18:38 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 10 Apr 2009 20:18:38 +0000 (UTC)
Subject: rpms/ladvd/EL-4 ladvd.spec,1.5,1.6
Message-ID: <20090410201838.7828870122@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15884

Modified Files:
	ladvd.spec 
Log Message:
Disabled selinux package for el4


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-4/ladvd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ladvd.spec	10 Apr 2009 20:16:26 -0000	1.5
+++ ladvd.spec	10 Apr 2009 20:18:08 -0000	1.6
@@ -5,7 +5,7 @@
 
 #%%define selinux_variants mls strict targeted
 #%%global selinux_policyver %%(%%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
-%%define modulename ladvd
+%define modulename ladvd
 
 Name:           ladvd
 Version:        0.6.1



From ixs at fedoraproject.org  Fri Apr 10 20:25:35 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 10 Apr 2009 20:25:35 +0000 (UTC)
Subject: rpms/ladvd/EL-4 ladvd.spec,1.6,1.7
Message-ID: <20090410202535.1265170122@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17591

Modified Files:
	ladvd.spec 
Log Message:
fix buildfailure


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-4/ladvd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ladvd.spec	10 Apr 2009 20:18:08 -0000	1.6
+++ ladvd.spec	10 Apr 2009 20:25:04 -0000	1.7
@@ -24,7 +24,7 @@
 Patch0:         ladvd-0.6.1-bonding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%bcond_without  fedora
+#%%bcond_without  fedora
 BuildRequires:  fedora-usermgmt-devel
 %{?FE_USERADD_REQ}
 



From robert at fedoraproject.org  Fri Apr 10 20:25:38 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 10 Apr 2009 20:25:38 +0000 (UTC)
Subject: rpms/clamav/F-10 clamd-wrapper,1.2,1.3
Message-ID: <20090410202538.E55B470122@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/clamav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17530/F-10

Modified Files:
	clamd-wrapper 
Log Message:
Fixed typo in SysV initscript which removes 'touch' file (#473513)



Index: clamd-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/F-10/clamd-wrapper,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clamd-wrapper	1 Jan 2008 13:19:16 -0000	1.2
+++ clamd-wrapper	10 Apr 2009 20:25:08 -0000	1.3
@@ -52,7 +52,7 @@
 	killproc $procname
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f touch $lockfile
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
 	return $RETVAL
 }
 



From robert at fedoraproject.org  Fri Apr 10 20:25:39 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 10 Apr 2009 20:25:39 +0000 (UTC)
Subject: rpms/clamav/F-9 clamd-wrapper,1.2,1.3
Message-ID: <20090410202539.720EF70122@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/clamav/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17530/F-9

Modified Files:
	clamd-wrapper 
Log Message:
Fixed typo in SysV initscript which removes 'touch' file (#473513)



Index: clamd-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/F-9/clamd-wrapper,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clamd-wrapper	1 Jan 2008 13:19:16 -0000	1.2
+++ clamd-wrapper	10 Apr 2009 20:25:08 -0000	1.3
@@ -52,7 +52,7 @@
 	killproc $procname
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f touch $lockfile
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
 	return $RETVAL
 }
 



From cebbert at fedoraproject.org  Fri Apr 10 20:26:56 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 10 Apr 2009 20:26:56 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1528,1.1529
Message-ID: <20090410202656.8B21D70122@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17989

Modified Files:
	kernel.spec 
Log Message:
more sanity checking: missing source files


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1528
retrieving revision 1.1529
diff -u -r1.1528 -r1.1529
--- kernel.spec	9 Apr 2009 21:03:27 -0000	1.1528
+++ kernel.spec	10 Apr 2009 20:26:25 -0000	1.1529
@@ -913,17 +913,28 @@
 %endif
 %endif
 
+# more sanity checking; do it quietly
+for patch in %{patches} ; do
+  if [ ! -f $patch ] ; then
+    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+    exit 1
+  fi
+done 2>/dev/null
+
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {
   local patch=$1
   shift
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
-    exit 1;
+    exit 1
   fi
   if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
-    [ "${patch:0:10}" != "patch-2.6." ] && echo "Patch $patch not listed in specfile" && exit 1;
-  fi
+    if [ "${patch:0:10}" != "patch-2.6." ] ; then
+      echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
+      exit 1
+    fi
+  fi 2>/dev/null
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;



From transif at fedoraproject.org  Fri Apr 10 20:27:32 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Fri, 10 Apr 2009 20:27:32 +0000 (UTC)
Subject: comps/po da.po,1.15,1.16
Message-ID: <20090410202732.C39D770122@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18312/po

Modified Files:
	da.po 
Log Message:
Sending translation for Danish


Index: da.po
===================================================================
RCS file: /cvs/pkgs/comps/po/da.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- da.po	5 Apr 2009 16:51:57 -0000	1.15
+++ da.po	10 Apr 2009 20:27:02 -0000	1.16
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-15 13:20+0000\n"
-"PO-Revision-Date: 2009-02-15 21:42+0100\n"
+"POT-Creation-Date: 2009-04-09 18:59+0000\n"
+"PO-Revision-Date: 2009-04-10 22:25+0200\n"
 "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -173,41 +173,41 @@
 msgstr "Underst??ttelse af dansk"
 
 #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32
-#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:8
+#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8
 #: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Skrivebordsmilj??er"
 
 #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33
-#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:9
+#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9
 #: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Skrivebordsmilj??er"
 
 #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34
-#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:10
+#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10
 #: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Udvikling"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35
-#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37
+#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38
 msgid "Development Libraries"
 msgstr "Udviklingsbiblioteker"
 
 #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36
-#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38 ../comps-el4.xml.in.h:11
+#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11
 #: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Udviklingsv??rkt??jer"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37
-#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39
+#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40
 msgid "Dial-up Networking Support"
 msgstr "Underst??ttelse af opkaldsnetv??rk"
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38
-#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40
+#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41
 msgid "Dutch Support"
 msgstr "Underst??ttelse af hollandsk"
 
@@ -216,100 +216,101 @@
 msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39
-#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:13
+#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13
 #: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Redigeringsprogrammer"
 
 #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40
-#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:14
+#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14
 #: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Undervisningssoftware"
 
 #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41
-#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:15
+#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15
 #: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Undervisningssoftware til indl??ring"
 
 #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42
-#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:16
+#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16
 #: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Videnskabeligt"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43
-#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
+#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47
 msgid "English (UK) Support"
 msgstr "Underst??ttelse af engelsk (UK)"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45
-#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47
+#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49
 msgid "Estonian Support"
 msgstr "Underst??ttelse af estisk"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46
-#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48
+#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50
 msgid "Ethiopic Support"
 msgstr "Underst??ttelse af etiopisk"
 
 #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47
-#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49 ../comps-el4.xml.in.h:17
+#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17
 #: ../comps-el5.xml.in.h:18
 msgid "FTP Server"
 msgstr "FTP-server"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48
-#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:50
+#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52
 msgid "Faeroese Support"
 msgstr "Underst??ttelse af f??r??sk"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50
-#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52 ../comps-el4.xml.in.h:18
+#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18
 #: ../comps-el5.xml.in.h:19
 msgid "Fedora Packager"
 msgstr "Fedora pakkeansvarlig"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51
-#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53
+#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55
 msgid "Filipino Support"
 msgstr "Underst??ttelse af filipinsk"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52
-#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:54
+#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56
 msgid "Finnish Support"
 msgstr "Underst??ttelse af finsk"
 
 #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55
-#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:58
+#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60
 msgid "French Support"
 msgstr "Underst??ttelse af fransk"
 
 #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56
-#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:19
+#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19
 #: ../comps-el5.xml.in.h:20
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
 msgstr ""
-"Denne gruppe af pakker g??r dig i stand til at arbejde med lyd og video p?? dit system, "
-"uanset om det er optagelse af en CD eller afspilning af lyd-CD'er og multimediefiler."
+"Denne gruppe af pakker g??r dig i stand til at arbejde med lyd og video p?? "
+"dit system, uanset om det er optagelse af en CD eller afspilning af lyd-"
+"CD'er og multimediefiler."
 
 #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57
-#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:20
+#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20
 #: ../comps-el5.xml.in.h:21
 msgid "GNOME Desktop Environment"
 msgstr "GNOME-skrivebordsmilj??"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58
-#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:21
+#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21
 #: ../comps-el5.xml.in.h:22
 msgid "GNOME Software Development"
 msgstr "GNOME-softwareudvikling"
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59
-#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64
+#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -318,169 +319,172 @@
 "skrivebord, systemikoner og et grafisk filh??ndteringsprogram."
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60
-#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65
+#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67
 msgid "Gaelic Support"
 msgstr "Underst??ttelse for g??lisk"
 
 #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61
-#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66
+#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68
 msgid "Galician Support"
 msgstr "Underst??ttelse af galicisk"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62
-#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67 ../comps-el5.xml.in.h:24
+#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24
 msgid "Games and Entertainment"
 msgstr "Spil og underholdning"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63
-#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68
+#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70
 msgid "Georgian Support"
 msgstr "Underst??ttelse af georgisk"
 
 #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64
-#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69
+#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71
 msgid "German Support"
 msgstr "Underst??ttelse af tysk"
 
 #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65
-#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:23
+#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23
 #: ../comps-el5.xml.in.h:25
 msgid "Graphical Internet"
 msgstr "Grafisk internet"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66
-#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71 ../comps-el4.xml.in.h:24
+#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24
 #: ../comps-el5.xml.in.h:26
 msgid "Graphics"
 msgstr "Grafik"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67
-#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72
+#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74
 msgid "Greek Support"
 msgstr "Underst??ttelse af gr??sk"
 
 #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68
-#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73
+#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75
 msgid "Gujarati Support"
 msgstr "Underst??ttelse af gujarati"
 
 #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74 ../comps-el4.xml.in.h:25
+#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25
 #: ../comps-el5.xml.in.h:27
 msgid "Hardware Support"
 msgstr "Hardwareunderst??ttelse"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70
-#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:26
+#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26
 #: ../comps-el5.xml.in.h:28
 msgid "Hebrew Support"
 msgstr "Underst??ttelse af hebraisk"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71
-#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77
+#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79
 msgid "Hindi Support"
 msgstr "Underst??ttelse af hindi"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72
-#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78
+#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80
 msgid "Hungarian Support"
 msgstr "Underst??ttelse af ungarsk"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73
-#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79
+#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81
 msgid "Icelandic Support"
 msgstr "Underst??ttelse af islandsk"
 
 #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
+#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82
 msgid "Indonesian Support"
 msgstr "Underst??ttelse af indonesisk"
 
 #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75
-#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83 ../comps-el4.xml.in.h:27
+#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27
 #: ../comps-el5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr ""
-"Install??r disse pakker for at kunne udvikle grafiske programmer til "
-"GTK+ og GNOME."
+"Install??r disse pakker for at kunne udvikle grafiske programmer til GTK+ og "
+"GNOME."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
-#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84
+#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr ""
-"Install??r disse pakker for at kunne udvikle grafiske programmer til "
-"GTK+ og Xfce."
+"Install??r disse pakker for at kunne udvikle grafiske programmer til GTK+ og "
+"Xfce."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:28
+#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr "Install??r disse pakker for at udvikle grafiske programmer til Qt og KDE."
+msgstr ""
+"Install??r disse pakker for at udvikle grafiske programmer til Qt og KDE."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86
+#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88
 msgid ""
 "Install these tools to enable the system to print or act as a print server."
 msgstr ""
-"Install??r disse v??rkt??jer for at f?? systemet til at kunne printe eller fungere som en printserver."
+"Install??r disse v??rkt??jer for at f?? systemet til at kunne printe eller "
+"fungere som en printserver."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
-#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:29
+#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
 msgid ""
 "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
-"Install??r denne gruppe af pakker for at bruge den basale grafiske (X) brugerflade."
+"Install??r denne gruppe af pakker for at bruge den basale grafiske (X) "
+"brugerflade."
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
-#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89
+#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91
 msgid "Inuktitut Support"
 msgstr "Underst??ttelse af inuktitut"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82
-#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90
+#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92
 msgid "Irish Support"
 msgstr "Underst??ttelse af irsk"
 
 #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83
-#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91
+#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93
 msgid "Italian Support"
 msgstr "Underst??ttelse af italiensk"
 
 #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84
-#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:30
+#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30
 #: ../comps-el5.xml.in.h:32
 msgid "Japanese Support"
 msgstr "Underst??ttelse af japansk"
 
 #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85
-#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:31
+#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86
-#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:32
+#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java-udvikling"
 
 #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87
-#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:33
+#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33
 #: ../comps-el5.xml.in.h:33
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop Environment)"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88
-#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:34
+#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
 msgid "KDE Software Development"
 msgstr "KDE-softwareudvikling"
 
 #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89
-#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97
+#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -489,197 +493,196 @@
 "skrivebord, systemikoner og et grafisk filh??ndteringsprogram."
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
+#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100
 msgid "Kannada Support"
 msgstr "Underst??ttelse af kannada"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:101
+#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103
 msgid "Khmer Support"
 msgstr "Underst??ttelse af khmer"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93
-#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
+#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106
 msgid "Korean Support"
 msgstr "Underst??ttelse af koreansk"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
+#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109
 msgid "Languages"
 msgstr "Sprog"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
+#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110
 msgid "Lao Support"
 msgstr "Underst??ttelse af lao"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:109
+#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111
 msgid "Latvian Support"
 msgstr "Underst??ttelse af lettisk"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
+#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113
 msgid "Legacy Network Server"
 msgstr "For??ldet netv??rksserver"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
+#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114
 msgid "Legacy Software Development"
 msgstr "For??ldet softwareudvikling"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
+#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115
 msgid "Legacy Software Support"
 msgstr "For??ldet softwareunderst??ttelse"
 
 #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:114
+#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116
 msgid "Lithuanian Support"
 msgstr "Underst??ttelse af litauisk"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
+#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119
 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
 msgid "Mail Server"
 msgstr "Mailserver"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
+#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122
 msgid "Malay Support"
 msgstr "Underst??ttelse af malajisk"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
+#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123
 msgid "Malayalam Support"
 msgstr "Underst??ttelse af malayalam"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
+#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124
 msgid "Maori Support"
 msgstr "Underst??ttelse af maori"
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:123
+#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125
 msgid "Marathi Support"
 msgstr "Underst??ttelse af marathi"
 
 #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
+#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128
 msgid "MySQL Database"
 msgstr "MySQL-database"
 
 #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
+#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131
 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "Network Servers"
 msgstr "Netv??rksservere"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:129
+#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132
 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "News Server"
 msgstr "Nyhedsserver"
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
+#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134
 msgid "Northern Sotho Support"
 msgstr "Underst??ttelse af nordsesotho"
 
 #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:132
+#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135
 msgid "Norwegian Support"
 msgstr "Underst??ttelse af norsk"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:134
+#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:138
 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
 msgid "Office/Productivity"
 msgstr "Kontor/Produktivitet"
 
 #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
+#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:141
 msgid "Oriya Support"
 msgstr "Underst??ttelse af oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
+#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:142
 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr ""
-"Pakker som tilbyder funktionalitet til udvikling og bygning af "
-"programmer."
+"Pakker som tilbyder funktionalitet til udvikling og bygning af programmer."
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
+#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:143
 msgid "Persian Support"
 msgstr "Underst??ttelse af persisk"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
+#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:144
 msgid "Polish Support"
 msgstr "Underst??ttelse af polsk"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
+#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:145
 msgid "Portuguese Support"
 msgstr "Underst??ttelse af portugisisk"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
+#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:146
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL-database"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
+#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:147
 msgid "Printing Support"
 msgstr "Udskriftsunderst??ttelse"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
+#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:148
 msgid "Punjabi Support"
 msgstr "Underst??ttelse af punjabisk"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
+#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:149
 msgid "Romanian Support"
 msgstr "Underst??ttelse af rum??nsk"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
+#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:150
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:146
+#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:151
 msgid "Russian Support"
 msgstr "Underst??ttelse af russisk"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
+#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152
 msgid "Samoan Support"
 msgstr "Underst??ttelse af samoan"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
+#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153
 msgid "Serbian Support"
 msgstr "Underst??ttelse af serbisk"
 
 #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
+#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154
 msgid "Server Configuration Tools"
 msgstr "V??rkt??j til serverkonfiguration"
 
 #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
+#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155
 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid "Servers"
 msgstr "Servere"
 
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
+#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
@@ -687,152 +690,155 @@
 "Simple vinduesh??ndteringer, som ikke er en del af st??rre skrivebordsmilj??er."
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
+#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158
 msgid "Sinhala Support"
 msgstr "Underst??ttelse af singalesisk"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
+#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159
 msgid "Slovak Support"
 msgstr "Underst??ttelse af slovakisk"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
+#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160
 msgid "Slovenian Support"
 msgstr "Underst??ttelse af slovensk"
 
 #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
+#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161
 msgid "Smallest possible installation"
 msgstr "Mindst mulige installation"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
+#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162
 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
 msgid "Software used for running network servers"
 msgstr "Software til brug ved k??rsel af netv??rksservere"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
+#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163
 msgid "Somali Support"
 msgstr "Underst??ttelse af somalisk"
 
 #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
+#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
 msgstr ""
-"Undertiden kaldet tekstredigeringsprogrammer. Dette er programmer der tillader "
-"dig at danne og redigere tekstfiler. Dette inkluderer Emacs og Vi." 
+"Undertiden kaldet tekstredigeringsprogrammer. Dette er programmer der "
+"tillader dig at danne og redigere tekstfiler. Dette inkluderer Emacs og Vi."
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
+#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165
 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
 msgid "Sound and Video"
 msgstr "Lyd og video"
 
 #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
+#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166
 msgid "Southern Ndebele Support"
 msgstr "Underst??ttelse af sydndebele"
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
+#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167
 msgid "Southern Sotho Support"
 msgstr "Underst??ttelse af sydsesotho"
 
 #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
+#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168
 msgid "Spanish Support"
 msgstr "Underst??ttelse af spansk"
 
 #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
+#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:172
 #: ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
-msgstr "Underst??ttelse af udvikling af programmer i programmeringssproget Java."
+msgstr ""
+"Underst??ttelse af udvikling af programmer i programmeringssproget Java."
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
+#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:174
 #: ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
-msgstr "Underst??ttelse af k??rsel af programmer skrevet i programmeringssproget Java."
+msgstr ""
+"Underst??ttelse af k??rsel af programmer skrevet i programmeringssproget Java."
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
+#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:175
 msgid "Swati Support"
 msgstr "Underst??ttelse af swati"
 
 #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
+#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:176
 msgid "Swedish Support"
 msgstr "Underst??ttelse af svensk"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
+#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "System Tools"
 msgstr "Systemv??rkt??jer"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
+#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:178
 msgid "Tagalog Support"
 msgstr "Underst??ttelse af tagalog"
 
 #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
+#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:180
 msgid "Tamil Support"
 msgstr "Underst??ttelse af tamilsk"
 
 #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
+#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:181
 msgid "Telugu Support"
 msgstr "Underst??ttelse af telugu"
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
+#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:182
 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47
 msgid "Text-based Internet"
 msgstr "Tekstbaseret internet"
 
 #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
+#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:183
 msgid "Thai Support"
 msgstr "Underst??ttelse af thailandsk"
 
 #: ../comps-f7.xml.in.h:143
 msgid "The Eclipse Integrated Development Environment."
-msgstr "Det integrerede udviklingsmilj?? Eclipse"
+msgstr "Det integrerede udviklingsmilj?? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
+#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:184
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "Programmerne inkluderer kontorpakker, PDF-visere med mere."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
+#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:185
 msgid ""
 "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "Pakkerne i denne gruppe er hovedbiblioteker til udvikling af programmer."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
+#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:186
 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr "Disse pakker tillader dig at konfigurere en IMAP- eller SMTP-mailserver."
+msgstr ""
+"Disse pakker tillader dig at konfigurere en IMAP- eller SMTP-mailserver."
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
+#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:187
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Disse pakker g??r dig i stand til at udvikle programmer til X-vinduessystemet."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
+#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:188
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
 msgid ""
 "These packages are helpful when developing web applications or web pages."
@@ -840,99 +846,101 @@
 "Disse pakker er nyttige ved udvikling af webapplikationer eller websider."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
+#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:189
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
-"Disse pakker inkluderer netv??rksbaserede servere som for eksempel DHCP, Kerberos og NIS."
+"Disse pakker inkluderer netv??rksbaserede servere som for eksempel DHCP, "
+"Kerberos og NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
+#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:190
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr ""
-"Disse pakker inkluderer servere til gamle netv??rkprotokoller som for eksempel "
-"rsh og telnet."
+"Disse pakker inkluderer servere til gamle netv??rkprotokoller som for "
+"eksempel rsh og telnet."
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
+#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:191
 msgid "These packages provide a virtualization environment."
 msgstr "Disse pakker stiller virtualizationsmilj??er til r??dighed."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
+#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:192
 msgid "These packages provide compatibility with previous releases."
 msgstr "Disse pakker giver kombatibilitet med tidligere udgivelser."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
+#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:193
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr ""
-"Disse pakker giver underst??ttelse af forskellige lokaliteter inklusiv skrifttyper og "
-"inddata-metoder."
+"Disse pakker giver underst??ttelse af forskellige lokaliteter inklusiv "
+"skrifttyper og inddata-metoder."
 
 #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
+#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:194
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
 msgstr ""
-"Disse v??rkt??jer g??r dig i stand til at lave dokumenter i DocBook-formatet og konvertere "
-"dem til HTML, PDF, Postscript og tekst."
+"Disse v??rkt??jer g??r dig i stand til at lave dokumenter i DocBook-formatet og "
+"konvertere dem til HTML, PDF, Postscript og tekst."
 
 #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
+#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:195
 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Disse v??rkt??jer g??r dig i stand til at k??re en webserver p?? systemet."
 
 #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
+#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:196
 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Disse v??rkt??jer g??r dig i stand til at k??re en FTP-server p?? systemet."
 
 #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
+#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:197
 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
 msgstr ""
-"Disse v??rket??jer inkluderer de grundl??ggende udviklingsv??rkt??jer som for eksempel "
-"automake, gcc, perl, python og fejls??gningsprogrammer."
+"Disse v??rket??jer inkluderer de grundl??ggende udviklingsv??rkt??jer som for "
+"eksempel automake, gcc, perl, python og fejls??gningsprogrammer."
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
+#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:198
 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group allows you to configure the system as a news server."
-msgstr "Denne gruppe g??r dig i stand til at konfigurere systemet som en nyhedsserver."
+msgstr ""
+"Denne gruppe g??r dig i stand til at konfigurere systemet som en nyhedsserver."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
+#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:199
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "Denne gruppe indeholder alle Red Hats serverkonfigurationsv??rkt??jer."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
+#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:200
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr ""
-"Denne gruppe inkluderer et minimalt s??t af pakker. God til, for eksempel, at lave "
-"sm?? router/firewall bokse."
+"Denne gruppe inkluderer et minimalt s??t af pakker. God til, for eksempel, at "
+"lave sm?? router/firewall bokse."
 
 #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
+#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:201
 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "Denne gruppe inkluderer grafisk e-post-, web- og chatklienter"
+msgstr "Denne gruppe inkluderer grafisk e-post-, web- og chatklienter."
 
 #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
+#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:202
 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid ""
 "This group includes packages for performing mathematical and scientific "
@@ -942,13 +950,13 @@
 "udregninger, samt omregning af enheder."
 
 #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
+#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "Denne gruppe inkluderer pakker til at manipulere og skanne billeder."
 
 #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
+#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:204
 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
@@ -958,17 +966,17 @@
 "programmer kr??ver ikke X-vinduessystemet."
 
 #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
+#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:205
 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
 msgstr ""
-"Denne gruppe er en samling af grafiske administrationsv??rkt??jer til systemet, "
-"for eksempel til at administrere brugerkonti eller systemhardware."
+"Denne gruppe er en samling af grafiske administrationsv??rkt??jer til "
+"systemet, for eksempel til at administrere brugerkonti eller systemhardware."
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
+#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:206
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
@@ -976,173 +984,176 @@
 "Denne gruppe er en samling af v??rkt??jer og ressourcer til armenske milj??er."
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
+#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:207
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
-"Denne gruppe er en samling af v??rkt??jer til forskellige hardwarespecifikke hj??lpeprogrammer."
+"Denne gruppe er en samling af v??rkt??jer til forskellige hardwarespecifikke "
+"hj??lpeprogrammer."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
+#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:209
 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
 msgstr ""
-"Denne gruppe er en samling af forskellige v??rkt??jer til systemer, for eksempel "
-"klienten til at forbinde SMB-delinger og v??rkt??jer til at overv??ge netv??rkstrafikken."
+"Denne gruppe er en samling af forskellige v??rkt??jer til systemer, for "
+"eksempel klienten til at forbinde SMB-delinger og v??rkt??jer til at overv??ge "
+"netv??rkstrafikken."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
+#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:210
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
-"Denne gruppe g??r dig i stand til at k??re en DNS-navneserver (BIND) p?? systemet."
+"Denne gruppe g??r dig i stand til at k??re en DNS-navneserver (BIND) p?? "
+"systemet."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
+#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:211
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr ""
-"Denne gruppe g??r dig i stand til at dele filer mellem Linux og Microsoft Windows"
-"(tm) systemer."
+"Denne gruppe g??r dig i stand til at dele filer mellem Linux og Microsoft "
+"Windows(tm) systemer."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
+#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:212
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "Denne gruppe indeholder nyttige pakker til brug af MySQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
+#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:213
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "Denne gruppe inkluderer nyttige pakker til brug af PostgreSQL."
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
+#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:214
 msgid "Tibetan Support"
 msgstr "Underst??ttelse af tibetansk"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
+#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:215
 msgid "Tonga Support"
 msgstr "Underst??ttelse af tongansk"
 
 #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
+#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:216
 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70
 msgid "Tools and Utilities needed by a Fedora Packager"
-msgstr "V??rkt??jer og hj??lpeprogrammer som beh??ves af de pakkeransvarlige i Fedora."
+msgstr "V??rkt??jer og hj??lpeprogrammer som beh??ves af de pakkeransvarlige i Fedora"
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
+#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:217
 msgid "Tsonga Support"
 msgstr "Underst??ttelse af tsonga"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
+#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:218
 msgid "Tswana Support"
 msgstr "Underst??ttelse af tswana"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
+#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:219
 msgid "Turkish Support"
 msgstr "Underst??ttelse af tyrkisk"
 
 #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
+#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:221
 msgid "Ukrainian Support"
 msgstr "Underst??ttelse af ukrainsk"
 
 #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
+#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:223
 msgid "Urdu Support"
 msgstr "Underst??ttelse af urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
+#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:225
 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71
 msgid "Various core pieces of the system."
 msgstr "Forskellige grundl??ggende dele af systemet."
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
+#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:226
 #: ../comps-el5.xml.in.h:72
 msgid "Various ways to relax and spend your free time."
 msgstr "Forskellige m??der at slappe af og bruge sin frihed p??."
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
+#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:227
 msgid "Venda Support"
 msgstr "Underst??ttelse af venda"
 
 #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
+#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:228
 msgid "Vietnamese Support"
 msgstr "Underst??ttelse af vietnamesisk"
 
 #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
+#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:229
 msgid "Virtualization"
 msgstr "Virtualization"
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
+#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:231
 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Web Development"
 msgstr "Webudvikling"
 
 #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
+#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:232
 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "Web Server"
 msgstr "Webserver"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
+#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:233
 msgid "Welsh Support"
 msgstr "Underst??ttelse af walisisk"
 
 #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
+#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:234
 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75
 msgid "Window Managers"
 msgstr "Vinduesh??ndteringer"
 
 #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
+#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:235
 msgid "Windows File Server"
 msgstr "Windows filserver"
 
 #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
+#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:236
 msgid "X Software Development"
 msgstr "X-softwareudvikling"
 
 #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
+#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:237
 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76
 msgid "X Window System"
 msgstr "X-vinduessystem"
 
 #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
+#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:238
 msgid "XFCE"
 msgstr "Xfce"
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
+#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:239
 msgid "XFCE Software Development"
 msgstr "Xfce-softwareudvikling"
 
 #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
+#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:240
 msgid "Xhosa Support"
 msgstr "Underst??ttelse af xhosa"
 
 #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
+#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:241
 msgid "Zulu Support"
 msgstr "Underst??ttelse af zulu"
 
@@ -1152,83 +1163,82 @@
 msgstr "Byggesystem bygningsgruppe"
 
 #: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50
-#: ../comps-f11.xml.in.h:51
+#: ../comps-f11.xml.in.h:53
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
+#: ../comps-f11.xml.in.h:58
 msgid "Fonts"
 msgstr "Skrifttyper"
 
 #: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55
-#: ../comps-f11.xml.in.h:57
+#: ../comps-f11.xml.in.h:59
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "Skrifttypepakker til visning af tekst p?? skrivebordet."
 
 #: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84
-#: ../comps-f11.xml.in.h:88
+#: ../comps-f11.xml.in.h:90
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Intergreret udviklingsmilj?? baseret p?? Eclipse"
+msgstr "Integreret udviklingsmilj?? baseret p?? Eclipse."
 
 #: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105
-#: ../comps-f11.xml.in.h:110
+#: ../comps-f11.xml.in.h:112
 msgid "Legacy Fonts"
 msgstr "For??ldede skrifttyper"
 
 #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
+#: ../comps-f11.xml.in.h:117
 msgid "Low Saxon Support"
 msgstr "Underst??ttelse af plattysk"
 
 #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
-#: ../comps-f11.xml.in.h:124
+#: ../comps-f11.xml.in.h:127
 msgid "Mongolian Support"
 msgstr "Underst??ttelse af mongolsk"
 
 #: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
-#: ../comps-f11.xml.in.h:127
+#: ../comps-f11.xml.in.h:130
 msgid "Nepali Support"
 msgstr "Underst??ttelse af nepalesisk"
 
 #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
-#: ../comps-f11.xml.in.h:135
+#: ../comps-f11.xml.in.h:139
 msgid "Older bitmap and vector fonts packages"
 msgstr "??ldre bitmap- og vektorskrifttypepakker"
 
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46
+#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48
 msgid "Esperanto Support"
 msgstr "Underst??ttelse af esperanto"
 
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100
+#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102
 msgid "Kashubian Support"
 msgstr "Underst??ttelse af kasjubisk"
 
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
+#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107
 msgid "Kurdish Support"
 msgstr "Underst??ttelse af kurdisk"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
-#: ../comps-f11.xml.in.h:116
+#: ../comps-f11.xml.in.h:118
 msgid "Macedonian Support"
 msgstr "Underst??ttelse af makedonsk"
 
 #: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124
-#: ../comps-f11.xml.in.h:130
+#: ../comps-f11.xml.in.h:133
 msgid "Northern Sami Support"
 msgstr "Underst??ttelse af nordsamisk"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
 msgid "SUGAR Desktop Environment"
 msgstr "SUGAR-skrivebordsmilj??et"
 
 #: ../comps-f9.xml.in.h:132
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
-msgstr "SUGAR er det skrivebordsmilj??, der blev udviklet til OLPC XO"
+msgstr "SUGAR er det skrivebordsmilj??, der blev udviklet til OLPC XO."
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:230
 msgid "Walloon Support"
 msgstr "Underst??ttelse af vallonsk"
 
@@ -1237,51 +1247,51 @@
 msgid "A software playground for learning about learning."
 msgstr "En software legeplads til l??ring om indl??ring."
 
-#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75
+#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77
 msgid "Haskell Development"
 msgstr "Haskell-udvikling"
 
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
+#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83
 msgid "Input Methods"
 msgstr "Inddatametoder"
 
-#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82
+#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84
 msgid "Input method packages for the input of international text."
 msgstr "Inddatametodepakker for inddata af international tekst."
 
-#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
+#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101
 msgid "Kashmiri Support"
 msgstr "Underst??ttelse af kashmirisk"
 
-#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103
+#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105
 msgid "Konkani Support"
 msgstr "Underst??ttelse af konkani"
 
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
+#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108
 msgid "LXDE"
 msgstr "LXDE"
 
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:118
+#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120
 msgid "Maithili Support"
 msgstr "Underst??ttelse af maithili"
 
-#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:126
+#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129
 msgid "Myanmar (Burmese) Support"
 msgstr "Underst??ttelse af burmesisk"
 
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
+#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157
 msgid "Sindhi Support"
 msgstr "Underst??ttelse af sindhi"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
+#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:171
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Underst??ttelse af udvikling i programmeringssproget Haskell."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:179
 msgid "Tajik Support"
 msgstr "Underst??ttelse af tajik-persisk"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:224
 msgid "Uzbek Support"
 msgstr "Underst??ttelse af usbekisk"
 
@@ -1289,31 +1299,71 @@
 msgid "Amazigh Support"
 msgstr "Underst??ttelse af amazigh"
 
-#: ../comps-f11.xml.in.h:55
+#: ../comps-f11.xml.in.h:34
+msgid "Design and Simulation tools for hardware engineers"
+msgstr "Design- og simulationsv??rkt??jer til hardwareingeni??rer"
+
+#: ../comps-f11.xml.in.h:45
+msgid "Electronic Lab"
+msgstr "Elektroniklaboratorium"
+
+#: ../comps-f11.xml.in.h:57
 msgid "Font design and packaging"
 msgstr "Skrifttypedesign og pakning"
 
-#: ../comps-f11.xml.in.h:59
+#: ../comps-f11.xml.in.h:61
 msgid "Frisian Support"
 msgstr "Underst??ttelse af frisisk"
 
-#: ../comps-f11.xml.in.h:60
+#: ../comps-f11.xml.in.h:62
 msgid "Friulian Support"
 msgstr "Underst??ttelse af friulisk"
 
-#: ../comps-f11.xml.in.h:102
+#: ../comps-f11.xml.in.h:104
 msgid "Kinyarwanda Support"
 msgstr "Underst??ttelse af kinyarwanda"
 
-#: ../comps-f11.xml.in.h:119
+#: ../comps-f11.xml.in.h:121
 msgid "Malagasy Support"
 msgstr "Underst??ttelse af malagasy"
 
-#: ../comps-f11.xml.in.h:133
+#: ../comps-f11.xml.in.h:126
+msgid "MinGW cross-compiler"
+msgstr "MinGW-krydsfortolker"
+
+#: ../comps-f11.xml.in.h:136
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../comps-f11.xml.in.h:137
 msgid "Occitan Support"
 msgstr "Underst??ttelse af occitansk"
 
-#: ../comps-f11.xml.in.h:201
+#: ../comps-f11.xml.in.h:140
+msgid "Online Help and Documentation"
+msgstr "Hj??lp og dokumentation p?? nettet"
+
+#: ../comps-f11.xml.in.h:169
+msgid "Sugar Desktop Environment"
+msgstr "Sugar skrivebordsmilj??"
+
+#: ../comps-f11.xml.in.h:170
+msgid ""
+"Support for cross-compiling programs to 32 bit Windows targets, testing "
+"them, and building installers, all from within Fedora."
+msgstr ""
+"Underst??ttelse af krydsfortolkning af programmer til 32-bit Windows m??l, "
+"testning af dem og bygning af installationsprogrammer, alt sammen med Fedora."
+
+#: ../comps-f11.xml.in.h:173
+msgid ""
+"Support for developing software using the Objective CAML programming "
+"language and libraries."
+msgstr ""
+"Underst??ttelse af udvikling af software, ved at bruge Objective CAML-"
+"programmeringssprog og biblioteker."
+
+#: ../comps-f11.xml.in.h:208
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1321,11 +1371,11 @@
 "Denne gruppe er en samling af v??rkt??jer der bruges i design, modifikation, "
 "manipulation og pakning af skrifttyper."
 
-#: ../comps-f11.xml.in.h:213
+#: ../comps-f11.xml.in.h:220
 msgid "Turkmen Support"
 msgstr "Underst??ttelse af turkmensk"
 
-#: ../comps-f11.xml.in.h:215
+#: ../comps-f11.xml.in.h:222
 msgid "Upper Sorbian Support"
 msgstr "Underst??ttelse af vendisk"
 
@@ -1350,28 +1400,28 @@
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
-"KDE er en funktionsdygtig, grafisk brugerflade som inkluderer et panel, skrivebord, "
-"systemikoner og et grafisk filh??ndteringsprogram."
+"KDE er en funktionsdygtig, grafisk brugerflade som inkluderer et panel, "
+"skrivebord, systemikoner og et grafisk filh??ndteringsprogram."
 
 #: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr ""
-"Undertiden kaldet tekstredigeringsprogrammer. Dette er programmer der tillader "
-"dig at danne og redigere tekstfiler. Dette inkluderer Emacs og Vi." 
+"Undertiden kaldet tekstredigeringsprogrammer. Dette er programmer der "
+"tillader dig at danne og redigere tekstfiler. Dette inkluderer Emacs og Vi."
 
 #: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
-msgstr "Tekstredigeringsprogrammet XEmacs"
+msgstr "Tekstredigeringsprogrammet XEmacs."
 
 #: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
-"Disse v??rkt??jer g??r dig i stand til at lave dokumentation i DocBook-formatet og "
-"konvertere dem til HTML, PDF, Postscript og tekst."
+"Disse v??rkt??jer g??r dig i stand til at lave dokumentation i DocBook-formatet "
+"og konvertere dem til HTML, PDF, Postscript og tekst."
 
 #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"



From ixs at fedoraproject.org  Fri Apr 10 20:43:42 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 10 Apr 2009 20:43:42 +0000 (UTC)
Subject: rpms/ladvd/EL-4 ladvd.spec,1.7,1.8
Message-ID: <20090410204342.CF4CD70122@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22736

Modified Files:
	ladvd.spec 
Log Message:
fix buildfailure


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-4/ladvd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ladvd.spec	10 Apr 2009 20:25:04 -0000	1.7
+++ ladvd.spec	10 Apr 2009 20:43:12 -0000	1.8
@@ -25,8 +25,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #%%bcond_without  fedora
-BuildRequires:  fedora-usermgmt-devel
-%{?FE_USERADD_REQ}
+BuildRequires:  fedora-usermgmt
+Requires:  fedora-usermgmt
 
 Provides:       group(%username) = %uid
 Provides:       user(%username)  = %uid



From robert at fedoraproject.org  Fri Apr 10 21:10:34 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 10 Apr 2009 21:10:34 +0000 (UTC)
Subject: rpms/clamav/EL-4 clamav-0.92-private.patch, NONE,
	1.1 clamav-0.95-cliopts.patch, NONE,
	1.1 clamav-0.95rc1-umask.patch, NONE, 1.1 clamav-milter.sysv,
	NONE, 1.1 .cvsignore, 1.13, 1.14 clamav.spec, 1.40,
	1.41 clamd-wrapper, 1.1, 1.2 sources, 1.26,
	1.27 clamav-0.90rc3-private.patch, 1.1,
	NONE clamav-0.93.1-path.patch, 1.1,
	NONE clamav-0.93.3-initoff.patch, 1.1,
	NONE clamav-0.93.3-pid.patch, 1.1, NONE
Message-ID: <20090410211034.8179E70137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/clamav/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28876/EL-4

Modified Files:
	.cvsignore clamav.spec clamd-wrapper sources 
Added Files:
	clamav-0.92-private.patch clamav-0.95-cliopts.patch 
	clamav-0.95rc1-umask.patch clamav-milter.sysv 
Removed Files:
	clamav-0.90rc3-private.patch clamav-0.93.1-path.patch 
	clamav-0.93.3-initoff.patch clamav-0.93.3-pid.patch 
Log Message:
- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support
- Fixed typo in SysV initscript which removes 'touch' file (#473513)
- Added build requirement to ncurses-devel for clamdtop


clamav-0.92-private.patch:

--- NEW FILE clamav-0.92-private.patch ---
--- clamav-0.92/libclamav.pc.in.private
+++ clamav-0.92/libclamav.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libclamav
 Description: A GPL virus scanner
 Version: @LIBCLAMAV_VERSION@
-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
-Cflags: -I${includedir} @CFLAGS@
-
+Libs: -L${libdir} -lclamav
+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
+Cflags: -I${includedir}
--- clamav-0.92/clamav-config.in.private
+++ clamav-0.92/clamav-config.in
@@ -54,12 +54,8 @@ while test $# -gt 0; do
 	usage 0
 	;;
 
-    --cflags)
-       	echo -I at includedir@ @CFLAGS@
-       	;;
-
-    --libs)
-       	echo -L at libdir@ @LIBCLAMAV_LIBS@
+    (--cflags|--libs)
+       	${PKG_CONFIG:-pkg-config} "$1" libclamav
        	;;
 
     *)

clamav-0.95-cliopts.patch:

--- NEW FILE clamav-0.95-cliopts.patch ---
Index: clamav-0.95rc1/shared/optparser.c
===================================================================
--- clamav-0.95rc1.orig/shared/optparser.c
+++ clamav-0.95rc1/shared/optparser.c
@@ -211,7 +211,7 @@ const struct clam_option clam_options[] 
 
     { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" },
 
-    { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
+    { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
 
     { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" },
 

clamav-0.95rc1-umask.patch:

--- NEW FILE clamav-0.95rc1-umask.patch ---
Index: clamav-0.95rc1/clamav-milter/clamav-milter.c
===================================================================
--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c
+++ clamav-0.95rc1/clamav-milter/clamav-milter.c
@@ -287,7 +287,7 @@ int main(int argc, char **argv) {
 
     if((opt = optget(opts, "PidFile"))->enabled) {
 	FILE *fd;
-	mode_t old_umask = umask(0006);
+	mode_t old_umask = umask(0022);
 
 	if((fd = fopen(opt->strarg, "w")) == NULL) {
 	    logg("!Can't save PID in file %s\n", opt->strarg);
Index: clamav-0.95rc1/shared/output.c
===================================================================
--- clamav-0.95rc1.orig/shared/output.c
+++ clamav-0.95rc1/shared/output.c
@@ -250,7 +250,7 @@ int logg(const char *str, ...)
 #endif
     if(logg_file) {
 	if(!logg_fp) {
-	    old_umask = umask(0037);
+	    old_umask = umask(0077);
 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
 		umask(old_umask);
 #ifdef CL_THREAD_SAFE
Index: clamav-0.95rc1/freshclam/freshclam.c
===================================================================
--- clamav-0.95rc1.orig/freshclam/freshclam.c
+++ clamav-0.95rc1/freshclam/freshclam.c
@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
 {
 	FILE *fd;
 	int old_umask;
-    old_umask = umask(0006);
+    old_umask = umask(0022);
     if((fd = fopen(pidfile, "w")) == NULL) {
 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
     } else {


--- NEW FILE clamav-milter.sysv ---
#!/bin/sh
#
# clamav-milter This script starts and stops the clamav-milter daemon
#
# chkconfig: - 79 40
#
# description: clamav-milter is a daemon which hooks into sendmail and routes \
#              email messages for virus scanning with ClamAV
# processname: clamav-milter
# pidfile: /var/lock/subsys/clamav-milter

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Local clamav-milter config
CLAMAV_FLAGS=
test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin

RETVAL=0

# Clamav-milter must have write access to the pid file, /var/run is not suitable
default_pidfile=
[ -d /var/run/clamav-milter ] && default_pidfile=/var/run/clamav-milter/clamav-milter.pid
[ -d /var/clamav ] && default_pidfile=/var/clamav/clamav-milter.pid
pidfile=${PIDFILE:-$default_pidfile}

lockfile=/var/lock/subsys/clamav-milter

start() {
        echo -n "Starting clamav-milter: "
	# Don't allow files larger than 25M to be created, to limit DoS
	# Needs to be large enough to extract the signature files
	ulimit -f 25600
	if [ ! -z $pidfile ]; then
		CLAMAV_PID=--pidfile=${pidfile}
		PID=`pidofproc -p ${pidfile} clamav-milter`
	else
		CLAMAV_PID=
		PID=`pidofproc clamav-milter`
	fi
	[ -n "$PID" ] && echo " already running!" && return 1
        LANG= daemon clamav-milter $CLAMAV_PID ${CLAMAV_FLAGS}
        RETVAL=$?
	[ ! -z $pidfile -a -f $pidfile ] && sed -i -e 's/-//' $pidfile
        echo
	test $RETVAL -eq 0 && touch ${lockfile}
	return $RETVAL
}

stop() {
        echo -n "Shutting down clamav-milter: "
	if [ ! -z $pidfile ]; then
	        killproc -p ${pidfile} clamav-milter
	else
		killproc clamav-milter
	fi
        RETVAL=$?
        echo
	test $RETVAL -eq 0 && rm -f ${lockfile} ${pidfile}
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
        # Start daemon.
	start
        ;;
  stop)
        # Stop daemon.
	stop
        ;;
  restart|reload)
	restart
        ;;
  condrestart)
	test -f ${lockfile} && restart || :
        ;;
  status)
	if [ ! -z $pidfile ]; then
	        status -p ${pidfile} clamav-milter
	else
		status clamav-milter
	fi
        ;;
  *)
        echo "Usage: $0 {start|stop|reload|restart|condrestart|status}"
        exit 1
esac

exit $?


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Dec 2008 22:26:30 -0000	1.13
+++ .cvsignore	10 Apr 2009 21:10:03 -0000	1.14
@@ -1 +1 @@
-clamav-0.94.2-norar.tar.bz2
+clamav-0.95.1-norar.tar.bz2


Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-4/clamav.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- clamav.spec	2 Dec 2008 22:26:30 -0000	1.40
+++ clamav.spec	10 Apr 2009 21:10:03 -0000	1.41
@@ -13,7 +13,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.94.2
+Version:	0.95.1
 Release:	1%{?dist}
 
 License:	GPLv2
@@ -23,7 +23,7 @@
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #   make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
-Source0:	clamav-%{version}-norar.tar.bz2
+Source0:	%name-%version-norar.tar.bz2
 # Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
 # No sense in using this file for the time being.
 # Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
@@ -34,15 +34,15 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
-Patch21:	clamav-0.93.1-path.patch
-Patch22:	clamav-0.93.3-initoff.patch
-Patch24:	clamav-0.90rc3-private.patch
+Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
-Patch26:	clamav-0.93.3-pid.patch
+Patch26:	clamav-0.95-cliopts.patch
+Patch27:	clamav-0.95rc1-umask.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel curl-devel
+BuildRequires:	ncurses-devel
 BuildRequires:	%_includedir/tcpd.h
 BuildRequires:	bc
 
@@ -68,6 +68,7 @@
 Requires:	clamav-lib        = %version-%release
 Requires:	clamav-filesystem = %version-%release
 Requires(pre):	%_libdir/pkgconfig
+Requires:	pkgconfig
 
 %package data
 Summary:	Virus signature data for the Clam Antivirus scanner
@@ -127,6 +128,7 @@
 %package milter-sysv
 Summary:	SysV initscripts for the clamav sendmail-milter
 Group:		System Environment/Daemons
+Source320:	clamav-milter.sysv
 Provides:	init(clamav-milter) = sysv
 Requires:	clamav-milter = %version-%release
 Requires(post):		user(%milteruser) clamav-milter
@@ -225,23 +227,24 @@
 %prep
 %setup -q
 
-%patch21 -p1 -b .path
-%patch22 -p1 -b .initoff
 %patch24 -p1 -b .private
 %patch25 -p1 -b .open
-%patch26 -p1 -b .pid
+%patch26 -p1 -b .cliopts
+%patch27 -p1 -b .umask
 
 mkdir -p libclamunrar{,_iface}
 touch libclamunrar/{Makefile.in,all,install}
 
-perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
-	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
-	     s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g;
-	     s!^#?(User ).*!\1<USER>!g;
-             s! /usr/local/share/clamav,! %homedir,!g;
-            ' etc/clamd.conf
+sed -ri \
+    -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \
+    -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
+    -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \
+    -e 's!^#?(User ).*!\1<USER>!g' \
+    -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \
+    -e 's! /usr/local/share/clamav,! %homedir,!g' \
+    etc/clamd.conf
 
-perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
+sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
 
 
 ## ------------------------------------------------------------
@@ -251,12 +254,17 @@
 export LDFLAGS='-Wl,--as-needed'
 # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check
 export LIBS='-lmilter -lpthread'
-%configure --disable-clamav --with-dbdir=/var/lib/clamav \
-	   --enable-milter --disable-static --disable-unrar --disable-zlib-vcheck
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-# No rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine
+export have_cv_ipv6=yes
+%configure --disable-clamav --with-dbdir=/var/lib/clamav	\
+	--enable-milter --disable-static			\
+	--disable-rpath --disable-unrar
+
+# build with --as-needed and disable rpath
+sed -i \
+	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
+	libtool
 
 
 make %{?_smp_mflags}
@@ -293,6 +301,7 @@
 rm -f	${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \
 	${RPM_BUILD_ROOT}%_libdir/*.la
 
+
 touch ${RPM_BUILD_ROOT}%homedir/daily.cld
 touch ${RPM_BUILD_ROOT}%homedir/main.cld
 
@@ -344,7 +353,8 @@
 CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock'
 EOF
 
-install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter
+install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter
+rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog
 
 
@@ -445,6 +455,7 @@
 %defattr(-,%username,%username,-)
 %ghost %attr(0664,%username,%username) %homedir/*.cvd
 
+
 ## -----------------------
 
 %files update
@@ -458,7 +469,6 @@
 %config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog
-
 %ghost %attr(0664,%username,%username) %homedir/*.cld
 
 
@@ -485,13 +495,12 @@
 
 %files milter
 %defattr(-,root,root,-)
-%doc clamav-milter/INSTALL
 %_sbindir/*milter*
 %_mandir/man8/clamav-milter*
 %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf
-%attr(0700,%milteruser,%milteruser) %dir %milterstatedir
-%ghost %milterstatedir/*
 %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog
+%attr(0710,%milteruser,%milteruser) %dir %milterstatedir
+%ghost %milterstatedir/*
 
 
 %files milter-sysv
@@ -501,6 +510,11 @@
 
 
 %changelog
+* Fri Apr 10 2009 Robert Scheck <robert at fedoraproject.org> - 0.95.1-1
+- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support
+- Fixed typo in SysV initscript which removes 'touch' file (#473513)
+- Added build requirement to ncurses-devel for clamdtop
+
 * Tue Dec 02 2008 Robert Scheck <robert at fedoraproject.org> - 0.94.2-1
 - Upgrade to 0.94.2 (#474002)
 


Index: clamd-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-4/clamd-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd-wrapper	8 Nov 2004 04:10:52 -0000	1.1
+++ clamd-wrapper	10 Apr 2009 21:10:03 -0000	1.2
@@ -28,7 +28,7 @@
 CLAMD_OPTIONS=
 ## backward-compatibility check...
 for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \
-         /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
+	 /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
   CLAMD_SOCKET=$i
   test ! -e "$i" || break
 done
@@ -52,7 +52,7 @@
 	killproc $procname
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f touch $lockfile
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
 	return $RETVAL
 }
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 Dec 2008 22:26:30 -0000	1.26
+++ sources	10 Apr 2009 21:10:03 -0000	1.27
@@ -1 +1 @@
-9b04d010c17c607ace4ed5e9318104d4  clamav-0.94.2-norar.tar.bz2
+0ddd9f341dd0299a6bc5398ee26f4ebf  clamav-0.95.1-norar.tar.bz2


--- clamav-0.90rc3-private.patch DELETED ---


--- clamav-0.93.1-path.patch DELETED ---


--- clamav-0.93.3-initoff.patch DELETED ---


--- clamav-0.93.3-pid.patch DELETED ---



From robert at fedoraproject.org  Fri Apr 10 21:10:35 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 10 Apr 2009 21:10:35 +0000 (UTC)
Subject: rpms/clamav/EL-5 clamav-0.92-private.patch, NONE,
	1.1 clamav-0.95-cliopts.patch, NONE,
	1.1 clamav-0.95rc1-umask.patch, NONE, 1.1 clamav-milter.sysv,
	NONE, 1.1 .cvsignore, 1.13, 1.14 clamav.spec, 1.55,
	1.56 clamd-wrapper, 1.1, 1.2 sources, 1.29,
	1.30 clamav-0.90rc3-private.patch, 1.1,
	NONE clamav-0.93.1-path.patch, 1.1,
	NONE clamav-0.93.3-initoff.patch, 1.1,
	NONE clamav-0.93.3-pid.patch, 1.1, NONE
Message-ID: <20090410211035.17C7770137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/clamav/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28876/EL-5

Modified Files:
	.cvsignore clamav.spec clamd-wrapper sources 
Added Files:
	clamav-0.92-private.patch clamav-0.95-cliopts.patch 
	clamav-0.95rc1-umask.patch clamav-milter.sysv 
Removed Files:
	clamav-0.90rc3-private.patch clamav-0.93.1-path.patch 
	clamav-0.93.3-initoff.patch clamav-0.93.3-pid.patch 
Log Message:
- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support
- Fixed typo in SysV initscript which removes 'touch' file (#473513)
- Added build requirement to ncurses-devel for clamdtop


clamav-0.92-private.patch:

--- NEW FILE clamav-0.92-private.patch ---
--- clamav-0.92/libclamav.pc.in.private
+++ clamav-0.92/libclamav.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libclamav
 Description: A GPL virus scanner
 Version: @LIBCLAMAV_VERSION@
-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
-Cflags: -I${includedir} @CFLAGS@
-
+Libs: -L${libdir} -lclamav
+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
+Cflags: -I${includedir}
--- clamav-0.92/clamav-config.in.private
+++ clamav-0.92/clamav-config.in
@@ -54,12 +54,8 @@ while test $# -gt 0; do
 	usage 0
 	;;
 
-    --cflags)
-       	echo -I at includedir@ @CFLAGS@
-       	;;
-
-    --libs)
-       	echo -L at libdir@ @LIBCLAMAV_LIBS@
+    (--cflags|--libs)
+       	${PKG_CONFIG:-pkg-config} "$1" libclamav
        	;;
 
     *)

clamav-0.95-cliopts.patch:

--- NEW FILE clamav-0.95-cliopts.patch ---
Index: clamav-0.95rc1/shared/optparser.c
===================================================================
--- clamav-0.95rc1.orig/shared/optparser.c
+++ clamav-0.95rc1/shared/optparser.c
@@ -211,7 +211,7 @@ const struct clam_option clam_options[] 
 
     { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" },
 
-    { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
+    { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
 
     { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" },
 

clamav-0.95rc1-umask.patch:

--- NEW FILE clamav-0.95rc1-umask.patch ---
Index: clamav-0.95rc1/clamav-milter/clamav-milter.c
===================================================================
--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c
+++ clamav-0.95rc1/clamav-milter/clamav-milter.c
@@ -287,7 +287,7 @@ int main(int argc, char **argv) {
 
     if((opt = optget(opts, "PidFile"))->enabled) {
 	FILE *fd;
-	mode_t old_umask = umask(0006);
+	mode_t old_umask = umask(0022);
 
 	if((fd = fopen(opt->strarg, "w")) == NULL) {
 	    logg("!Can't save PID in file %s\n", opt->strarg);
Index: clamav-0.95rc1/shared/output.c
===================================================================
--- clamav-0.95rc1.orig/shared/output.c
+++ clamav-0.95rc1/shared/output.c
@@ -250,7 +250,7 @@ int logg(const char *str, ...)
 #endif
     if(logg_file) {
 	if(!logg_fp) {
-	    old_umask = umask(0037);
+	    old_umask = umask(0077);
 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
 		umask(old_umask);
 #ifdef CL_THREAD_SAFE
Index: clamav-0.95rc1/freshclam/freshclam.c
===================================================================
--- clamav-0.95rc1.orig/freshclam/freshclam.c
+++ clamav-0.95rc1/freshclam/freshclam.c
@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
 {
 	FILE *fd;
 	int old_umask;
-    old_umask = umask(0006);
+    old_umask = umask(0022);
     if((fd = fopen(pidfile, "w")) == NULL) {
 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
     } else {


--- NEW FILE clamav-milter.sysv ---
#!/bin/sh
#
# clamav-milter This script starts and stops the clamav-milter daemon
#
# chkconfig: - 79 40
#
# description: clamav-milter is a daemon which hooks into sendmail and routes \
#              email messages for virus scanning with ClamAV
# processname: clamav-milter
# pidfile: /var/lock/subsys/clamav-milter

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Local clamav-milter config
CLAMAV_FLAGS=
test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin

RETVAL=0

# Clamav-milter must have write access to the pid file, /var/run is not suitable
default_pidfile=
[ -d /var/run/clamav-milter ] && default_pidfile=/var/run/clamav-milter/clamav-milter.pid
[ -d /var/clamav ] && default_pidfile=/var/clamav/clamav-milter.pid
pidfile=${PIDFILE:-$default_pidfile}

lockfile=/var/lock/subsys/clamav-milter

start() {
        echo -n "Starting clamav-milter: "
	# Don't allow files larger than 25M to be created, to limit DoS
	# Needs to be large enough to extract the signature files
	ulimit -f 25600
	if [ ! -z $pidfile ]; then
		CLAMAV_PID=--pidfile=${pidfile}
		PID=`pidofproc -p ${pidfile} clamav-milter`
	else
		CLAMAV_PID=
		PID=`pidofproc clamav-milter`
	fi
	[ -n "$PID" ] && echo " already running!" && return 1
        LANG= daemon clamav-milter $CLAMAV_PID ${CLAMAV_FLAGS}
        RETVAL=$?
	[ ! -z $pidfile -a -f $pidfile ] && sed -i -e 's/-//' $pidfile
        echo
	test $RETVAL -eq 0 && touch ${lockfile}
	return $RETVAL
}

stop() {
        echo -n "Shutting down clamav-milter: "
	if [ ! -z $pidfile ]; then
	        killproc -p ${pidfile} clamav-milter
	else
		killproc clamav-milter
	fi
        RETVAL=$?
        echo
	test $RETVAL -eq 0 && rm -f ${lockfile} ${pidfile}
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
        # Start daemon.
	start
        ;;
  stop)
        # Stop daemon.
	stop
        ;;
  restart|reload)
	restart
        ;;
  condrestart)
	test -f ${lockfile} && restart || :
        ;;
  status)
	if [ ! -z $pidfile ]; then
	        status -p ${pidfile} clamav-milter
	else
		status clamav-milter
	fi
        ;;
  *)
        echo "Usage: $0 {start|stop|reload|restart|condrestart|status}"
        exit 1
esac

exit $?


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Dec 2008 22:26:30 -0000	1.13
+++ .cvsignore	10 Apr 2009 21:10:04 -0000	1.14
@@ -1 +1 @@
-clamav-0.94.2-norar.tar.bz2
+clamav-0.95.1-norar.tar.bz2


Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-5/clamav.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- clamav.spec	2 Dec 2008 22:26:31 -0000	1.55
+++ clamav.spec	10 Apr 2009 21:10:04 -0000	1.56
@@ -15,7 +15,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.94.2
+Version:	0.95.1
 Release:	%release_func 1
 
 License:	GPLv2
@@ -25,7 +25,7 @@
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #   make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
-Source0:	clamav-%{version}-norar.tar.bz2
+Source0:	%name-%version-norar.tar.bz2
 # Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
 # No sense in using this file for the time being.
 # Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
@@ -36,15 +36,15 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
-Patch21:	clamav-0.93.1-path.patch
-Patch22:	clamav-0.93.3-initoff.patch
-Patch24:	clamav-0.90rc3-private.patch
+Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
-Patch26:	clamav-0.93.3-pid.patch
+Patch26:	clamav-0.95-cliopts.patch
+Patch27:	clamav-0.95rc1-umask.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel curl-devel
+BuildRequires:	ncurses-devel
 BuildRequires:	%_includedir/tcpd.h
 BuildRequires:	bc
 
@@ -71,6 +71,7 @@
 Requires:	clamav-lib        = %version-%release
 Requires:	clamav-filesystem = %version-%release
 Requires(pre):	%_libdir/pkgconfig
+Requires:	pkgconfig
 
 %package data
 Summary:	Virus signature data for the Clam Antivirus scanner
@@ -131,6 +132,7 @@
 %package milter-sysv
 Summary:	SysV initscripts for the clamav sendmail-milter
 Group:		System Environment/Daemons
+Source320:	clamav-milter.sysv
 Provides:	init(clamav-milter) = sysv
 Requires:	clamav-milter = %version-%release
 Requires(post):		user(%milteruser) clamav-milter
@@ -229,23 +231,24 @@
 %prep
 %setup -q
 
-%patch21 -p1 -b .path
-%patch22 -p1 -b .initoff
 %patch24 -p1 -b .private
 %patch25 -p1 -b .open
-%patch26 -p1 -b .pid
+%patch26 -p1 -b .cliopts
+%patch27 -p1 -b .umask
 
 mkdir -p libclamunrar{,_iface}
 touch libclamunrar/{Makefile.in,all,install}
 
-perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
-	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
-	     s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g;
-	     s!^#?(User ).*!\1<USER>!g;
-             s! /usr/local/share/clamav,! %homedir,!g;
-            ' etc/clamd.conf
+sed -ri \
+    -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \
+    -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
+    -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \
+    -e 's!^#?(User ).*!\1<USER>!g' \
+    -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \
+    -e 's! /usr/local/share/clamav,! %homedir,!g' \
+    etc/clamd.conf
 
-perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
+sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
 
 
 ## ------------------------------------------------------------
@@ -255,12 +258,17 @@
 export LDFLAGS='-Wl,--as-needed'
 # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check
 export LIBS='-lmilter -lpthread'
-%configure --disable-clamav --with-dbdir=/var/lib/clamav \
-	   --enable-milter --disable-static --disable-unrar
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-# No rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine
+export have_cv_ipv6=yes
+%configure --disable-clamav --with-dbdir=/var/lib/clamav	\
+	--enable-milter --disable-static			\
+	--disable-rpath --disable-unrar
+
+# build with --as-needed and disable rpath
+sed -i \
+	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
+	libtool
 
 
 make %{?_smp_mflags}
@@ -297,6 +305,7 @@
 rm -f	${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \
 	${RPM_BUILD_ROOT}%_libdir/*.la
 
+
 touch ${RPM_BUILD_ROOT}%homedir/daily.cld
 touch ${RPM_BUILD_ROOT}%homedir/main.cld
 
@@ -348,7 +357,8 @@
 CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock'
 EOF
 
-install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter
+install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter
+rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog
 
 
@@ -455,6 +465,7 @@
 %defattr(-,%username,%username,-)
 %ghost %attr(0664,%username,%username) %homedir/*.cvd
 
+
 ## -----------------------
 
 %files update
@@ -468,7 +479,6 @@
 %config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog
-
 %ghost %attr(0664,%username,%username) %homedir/*.cld
 
 
@@ -495,13 +505,12 @@
 
 %files milter
 %defattr(-,root,root,-)
-%doc clamav-milter/INSTALL
 %_sbindir/*milter*
 %_mandir/man8/clamav-milter*
 %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf
-%attr(0700,%milteruser,%milteruser) %dir %milterstatedir
-%ghost %milterstatedir/*
 %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog
+%attr(0710,%milteruser,%milteruser) %dir %milterstatedir
+%ghost %milterstatedir/*
 
 
 %files milter-sysv
@@ -511,6 +520,11 @@
 
 
 %changelog
+* Fri Apr 10 2009 Robert Scheck <robert at fedoraproject.org> - 0.95.1-1
+- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support
+- Fixed typo in SysV initscript which removes 'touch' file (#473513)
+- Added build requirement to ncurses-devel for clamdtop
+
 * Tue Dec 02 2008 Robert Scheck <robert at fedoraproject.org> - 0.94.2-1
 - Upgrade to 0.94.2 (#474002)
 


Index: clamd-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-5/clamd-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd-wrapper	8 Nov 2004 04:10:52 -0000	1.1
+++ clamd-wrapper	10 Apr 2009 21:10:04 -0000	1.2
@@ -28,7 +28,7 @@
 CLAMD_OPTIONS=
 ## backward-compatibility check...
 for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \
-         /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
+	 /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
   CLAMD_SOCKET=$i
   test ! -e "$i" || break
 done
@@ -52,7 +52,7 @@
 	killproc $procname
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f touch $lockfile
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
 	return $RETVAL
 }
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	2 Dec 2008 22:26:31 -0000	1.29
+++ sources	10 Apr 2009 21:10:04 -0000	1.30
@@ -1 +1 @@
-9b04d010c17c607ace4ed5e9318104d4  clamav-0.94.2-norar.tar.bz2
+0ddd9f341dd0299a6bc5398ee26f4ebf  clamav-0.95.1-norar.tar.bz2


--- clamav-0.90rc3-private.patch DELETED ---


--- clamav-0.93.1-path.patch DELETED ---


--- clamav-0.93.3-initoff.patch DELETED ---


--- clamav-0.93.3-pid.patch DELETED ---



From thias at fedoraproject.org  Fri Apr 10 21:18:30 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 10 Apr 2009 21:18:30 +0000 (UTC)
Subject: rpms/torcs/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 torcs.spec, 
	1.23, 1.24 torcs-1.2.4-freealutfix.patch, 1.1,
	NONE torcs-1.3.0-consts.patch, 1.1, NONE torcs-1.3.0-gcc43.patch,
	1.1, NONE
Message-ID: <20090410211830.69BD170122@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31504

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-freealutfix.patch torcs-1.3.0-consts.patch 
	torcs-1.3.0-gcc43.patch 
Log Message:
Update to 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 13:52:01 -0000	1.6
+++ .cvsignore	10 Apr 2009 21:17:59 -0000	1.7
@@ -1,5 +1,2 @@
-TORCS-1.3.0-src.tgz
-TORCS-1.3.0-src-robots-base.tgz
-TORCS-1.3.0-src-robots-berniw.tgz
-TORCS-1.3.0-src-robots-bt.tgz
-TORCS-1.3.0-src-robots-olethros.tgz
+TORCS-1.3.1-src.tgz
+TORCS-1.3.1-src-robots-base.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 13:52:01 -0000	1.6
+++ sources	10 Apr 2009 21:17:59 -0000	1.7
@@ -1,5 +1,2 @@
-915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
-da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
-abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
-ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
-227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz
+91f2296213fbfb1f1971dee7535af9bc  TORCS-1.3.1-src.tgz
+cf3cc25f774c1793446af432ff9fc704  TORCS-1.3.1-src-robots-base.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- torcs.spec	1 Mar 2009 19:48:56 -0000	1.23
+++ torcs.spec	10 Apr 2009 21:18:00 -0000	1.24
@@ -1,26 +1,25 @@
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.3.0
-Release: 10%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://torcs.org/
-Source: http://downloads.sf.net/torcs/TORCS-%{version}-src.tgz
+Source0: http://downloads.sf.net/torcs/TORCS-%{version}-src.tgz
 Source1: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz
-Source2: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
-Source3: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
-Source4: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
-Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.3.0-gcc43.patch
-Patch2: torcs-1.3.0-consts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
+Requires: torcs-data
+Requires: torcs-data-tracks-road
+Requires: torcs-data-cars-extra
 Requires: opengl-games-utils
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel
 BuildRequires: libXxf86vm-devel, libXrandr-devel, libXrender-devel
+# We used to provide a separate "robots" sub-package up to 1.3.0 included
+Obsoletes: torcs-robots <= 1.3.0
+Provides: torcs-robots = %{version}-%{release}
 
 %description
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -28,35 +27,17 @@
 yourself with either a wheel, keyboard or mouse.
 
 
-%package robots
-Summary: The Open Racing Car Simulator robots
-Group: Amusements/Games
-Requires: %{name} = %{version}-%{release}
-
-%description robots
-TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
-programmed robots drivers racing against each others.  You can also drive
-yourself with either a wheel, keyboard or mouse.
-
-This package contains the robots who can race on their own.
-
-
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4
+%setup -q -a 1
+# Prevent useless executable files in the debuginfo package (as of 1.3.1)
+%{__chmod} -x src/libs/learning/policy.*
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
-%patch0 -p1 -b .freealutfix
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .consts
 
 
 %build
-# Force locations with modular X
-# Required (1.2.4, still in 1.3.0)
-%configure \
-    --x-includes=%{_includedir} \
-    --x-libraries=%{_libdir}
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
+%configure
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.1
 %{__make}
 
 
@@ -99,19 +80,23 @@
 %files
 # Directory default mode of 0755 is MANDATORY, since installed dirs are 0777
 %defattr(-,root,root,0755)
-%doc COPYING README README.linux
+%doc COPYING README
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
 # From main
 %{_libdir}/%{name}/drivers/human/
 # From robots-base
-%{_libdir}/%{name}/drivers/cylos1/
+%{_libdir}/%{name}/drivers/berniw/
+%{_libdir}/%{name}/drivers/berniw2/
+%{_libdir}/%{name}/drivers/berniw3/
+%{_libdir}/%{name}/drivers/bt/
 %{_libdir}/%{name}/drivers/damned/
 %{_libdir}/%{name}/drivers/inferno/
 %{_libdir}/%{name}/drivers/inferno2/
 %{_libdir}/%{name}/drivers/lliaw/
-%{_libdir}/%{name}/drivers/tanhoj/
+%{_libdir}/%{name}/drivers/olethros/
+%{_libdir}/%{name}/drivers/sparkle/
 %{_libdir}/%{name}/drivers/tita/
 %{_libdir}/%{name}/lib/
 %{_libdir}/%{name}/modules/
@@ -124,45 +109,28 @@
 # From main
 %{_datadir}/games/%{name}/drivers/human/
 # From robots-base
-%{_datadir}/games/%{name}/drivers/cylos1/
+%{_datadir}/games/%{name}/drivers/berniw/
+%{_datadir}/games/%{name}/drivers/berniw2/
+%{_datadir}/games/%{name}/drivers/berniw3/
+%{_datadir}/games/%{name}/drivers/bt/
 %{_datadir}/games/%{name}/drivers/damned/
 %{_datadir}/games/%{name}/drivers/inferno/
 %{_datadir}/games/%{name}/drivers/inferno2/
 %{_datadir}/games/%{name}/drivers/lliaw/
-%{_datadir}/games/%{name}/drivers/tanhoj/
+%{_datadir}/games/%{name}/drivers/olethros/
+%{_datadir}/games/%{name}/drivers/sparkle/
 %{_datadir}/games/%{name}/drivers/tita/
 %{_datadir}/games/%{name}/results/
 %{_datadir}/games/%{name}/telemetry/
 %{_datadir}/pixmaps/%{name}.png
 
-%files robots
-# Directory default mode of 0755 is MANDATORY, since installed dirs are 0777
-%defattr(-,root,root,0755)
-%dir %{_libdir}/%{name}/
-%dir %{_libdir}/%{name}/drivers/
-# From robots-berniw
-%{_libdir}/%{name}/drivers/berniw/
-%{_libdir}/%{name}/drivers/berniw2/
-%{_libdir}/%{name}/drivers/berniw3/
-%{_libdir}/%{name}/drivers/sparkle/
-# From robots-bt
-%{_libdir}/%{name}/drivers/bt/
-# From robots-olethros
-%{_libdir}/%{name}/drivers/olethros/
-%dir %{_datadir}/games/%{name}/
-%dir %{_datadir}/games/%{name}/drivers/
-# From robots-berniw
-%{_datadir}/games/%{name}/drivers/berniw/
-%{_datadir}/games/%{name}/drivers/berniw2/
-%{_datadir}/games/%{name}/drivers/berniw3/
-%{_datadir}/games/%{name}/drivers/sparkle/
-# From robots-bt
-%{_datadir}/games/%{name}/drivers/bt/
-# From robots-olethros
-%{_datadir}/games/%{name}/drivers/olethros/
-
 
 %changelog
+* Fri Apr 10 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-1
+- Update to 1.3.1.
+- Remove the drivers sub-package since only one is provided upstream now and
+  it's mandatory (all of the separate drivers seem to be merged there now).
+
 * Sun Mar 01 2009 Caol??n McNamara <caolanm at redhat.com> - 1.3.0-10
 - constify ret of strchr(const *char)
 


--- torcs-1.2.4-freealutfix.patch DELETED ---


--- torcs-1.3.0-consts.patch DELETED ---


--- torcs-1.3.0-gcc43.patch DELETED ---



From thias at fedoraproject.org  Fri Apr 10 21:19:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 10 Apr 2009 21:19:18 +0000 (UTC)
Subject: rpms/torcs-data/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 torcs-data.spec, 1.10, 1.11
Message-ID: <20090410211918.362C570122@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712

Modified Files:
	.cvsignore sources torcs-data.spec 
Log Message:
Update to 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2006 13:52:52 -0000	1.5
+++ .cvsignore	10 Apr 2009 21:18:47 -0000	1.6
@@ -1,6 +1,5 @@
-TORCS-1.3.0-data-cars-extra.tgz
-TORCS-1.3.0-data-cars-nascar.tgz
-TORCS-1.3.0-data.tgz
-TORCS-1.3.0-data-tracks-dirt.tgz
-TORCS-1.3.0-data-tracks-oval.tgz
-TORCS-1.3.0-data-tracks-road.tgz
+TORCS-1.3.1-data-cars-extra.tgz
+TORCS-1.3.1-data.tgz
+TORCS-1.3.1-data-tracks-dirt.tgz
+TORCS-1.3.1-data-tracks-oval.tgz
+TORCS-1.3.1-data-tracks-road.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2006 13:52:52 -0000	1.5
+++ sources	10 Apr 2009 21:18:47 -0000	1.6
@@ -1,6 +1,5 @@
-248ae5c165f703b22bd7224d7c2caed4  TORCS-1.3.0-data-cars-extra.tgz
-40de51f6a929d121f46dd47709d58b8b  TORCS-1.3.0-data-cars-nascar.tgz
-8bff8540f7994dce02d32ba8fb4ad8a8  TORCS-1.3.0-data.tgz
-7c1d5dab87d6c06ac8e7ba8bab30f0b1  TORCS-1.3.0-data-tracks-dirt.tgz
-a27ce8b505dfbf2caba91ac6cc802bab  TORCS-1.3.0-data-tracks-oval.tgz
-8e30d3cc03dafb8392d690d96459f317  TORCS-1.3.0-data-tracks-road.tgz
+008b4c48f1860ecad871871903a00979  TORCS-1.3.1-data-cars-extra.tgz
+36f9676bf2f9135a3cdb02ac49896cc3  TORCS-1.3.1-data.tgz
+009d929b9d1ac6173be4045371501a94  TORCS-1.3.1-data-tracks-dirt.tgz
+807c231b5f02b96c937b5155ae188b02  TORCS-1.3.1-data-tracks-oval.tgz
+1017ed8df009870a8b05b8d274d0e3b6  TORCS-1.3.1-data-tracks-road.tgz


Index: torcs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- torcs-data.spec	25 Feb 2009 21:24:16 -0000	1.10
+++ torcs-data.spec	10 Apr 2009 21:18:47 -0000	1.11
@@ -1,19 +1,19 @@
 Summary: The Open Racing Car Simulator data files
 Name: torcs-data
-Version: 1.3.0
-Release: 3
+Version: 1.3.1
+Release: 1
 License: GPLv2+ and Free Art
 Group: Amusements/Games
 URL: http://torcs.org/
-Source0: http://dl.sf.net/torcs/TORCS-%{version}-data.tgz
-Source1: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-dirt.tgz
-Source2: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-oval.tgz
-Source3: http://dl.sf.net/torcs/TORCS-%{version}-data-tracks-road.tgz
-Source4: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-extra.tgz
-Source5: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-nascar.tgz
+Source0: http://downloads.sf.net/torcs/TORCS-%{version}-data.tgz
+Source1: http://downloads.sf.net/torcs/TORCS-%{version}-data-tracks-dirt.tgz
+Source2: http://downloads.sf.net/torcs/TORCS-%{version}-data-tracks-oval.tgz
+Source3: http://downloads.sf.net/torcs/TORCS-%{version}-data-tracks-road.tgz
+Source4: http://downloads.sf.net/torcs/TORCS-%{version}-data-cars-extra.tgz
 Source90: Free-Art-License
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: torcs, %{name}-tracks-road = %{version}
+Requires: torcs
+Requires: %{name}-tracks-road = %{version}
 BuildArch: noarch
 
 %description
@@ -67,6 +67,9 @@
 Summary: The Open Racing Car Simulator additional cars
 Group: Amusements/Games
 Requires: torcs
+# There used to be a separate "cars-nascar" sub-package up to 1.3.0 included
+Obsoletes: torcs-data-cars-nascar <= 1.3.0
+Provides: torcs-data-cars-nascar = %{version}-%{release}
 
 %description cars-extra
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -76,24 +79,10 @@
 This package contains additional cars for the game.
 
 
-%package cars-nascar
-Summary: The Open Racing Car Simulator additional NASCAR cars
-Group: Amusements/Games
-Requires: torcs
-
-%description cars-nascar
-TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
-programmed robots drivers racing against each others.  You can also drive
-yourself with either a wheel, keyboard or mouse.
-
-This package contains additional cars for the game.
-
-
 %prep
 %setup -q -T -c %{name}-%{version}
 # Uncompress all packages in a separate tree
-for source in %{SOURCE0} %{SOURCE1} %{SOURCE2} \
-              %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
+for source in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4}; do
     package="`basename ${source} .tgz | sed 's/TORCS-%{version}-//g'`"
     mkdir -p ${package}%{_datadir}/games/torcs/
     ( cd ${package}%{_datadir}/games/torcs/
@@ -153,13 +142,12 @@
 %doc Free-Art-License
 
 
-%files cars-nascar -f data-cars-nascar.files
-%defattr(-,root,root,-)
-%doc Free-Art-License
-
-
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-3
+* Fri Apr 10 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-1
+- Update to 1.3.1.
+- Remove no longer existing upstream cars-nascar sub-package (merged in).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.3.0-2



From sharkcz at fedoraproject.org  Fri Apr 10 21:20:44 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 10 Apr 2009 21:20:44 +0000 (UTC)
Subject: rpms/wxPython/devel wxPython.spec,1.33,1.34
Message-ID: <20090410212044.D882B70122@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32228

Modified Files:
	wxPython.spec 
Log Message:
* Fri Apr 10 2009 Dan Hor??k <dan[at]danny.cz> - 2.8.9.2-2
- add patch to fix compile failure for contrib/gizmos/_treelist.i



Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wxPython.spec	10 Apr 2009 19:07:49 -0000	1.33
+++ wxPython.spec	10 Apr 2009 21:20:14 -0000	1.34
@@ -5,7 +5,7 @@
 
 Name:           wxPython
 Version:        2.8.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -13,6 +13,8 @@
 License:        LGPLv2+ and wxWidgets 
 URL:            http://www.wxpython.org/
 Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
+# http://trac.wxwidgets.org/ticket/10703
+Patch0:         wxPython-2.8.9.2-treelist.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # make sure to keep this updated as appropriate
 BuildRequires:  wxGTK-devel >= 2.8.9
@@ -60,6 +62,7 @@
 
 %prep
 %setup -q -n wxPython-src-%{version}
+%patch0 -p1 -b .treelist
 
 # fix libdir otherwise additional wx libs cannot be found
 sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
@@ -118,7 +121,10 @@
 
 
 %changelog
-* Fri Apr 10 2009 Dan Horak <dan[at]danny.cz> - 2.8.9.2-1
+* Fri Apr 10 2009 Dan Hor??k <dan[at]danny.cz> - 2.8.9.2-2
+- add patch to fix compile failure for contrib/gizmos/_treelist.i
+
+* Fri Apr 10 2009 Dan Hor??k <dan[at]danny.cz> - 2.8.9.2-1
 - update to 2.8.9.2
 - create noarch docs subpackage
 



From robert at fedoraproject.org  Fri Apr 10 21:24:48 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 10 Apr 2009 21:24:48 +0000 (UTC)
Subject: rpms/clamav/EL-4 clamav.spec,1.41,1.42
Message-ID: <20090410212448.CC02670122@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/clamav/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv867

Modified Files:
	clamav.spec 
Log Message:
Add forgotten --disable-zlib-vcheck



Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-4/clamav.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- clamav.spec	10 Apr 2009 21:10:03 -0000	1.41
+++ clamav.spec	10 Apr 2009 21:24:18 -0000	1.42
@@ -258,7 +258,7 @@
 export have_cv_ipv6=yes
 %configure --disable-clamav --with-dbdir=/var/lib/clamav	\
 	--enable-milter --disable-static			\
-	--disable-rpath --disable-unrar
+	--disable-rpath --disable-unrar --disable-zlib-vcheck
 
 # build with --as-needed and disable rpath
 sed -i \



From cebbert at fedoraproject.org  Fri Apr 10 21:26:28 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 10 Apr 2009 21:26:28 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1318,1.1319
Message-ID: <20090410212628.D621E70122@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1337

Modified Files:
	kernel.spec 
Log Message:
copy sanity checks from F-11


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1318
retrieving revision 1.1319
diff -u -r1.1318 -r1.1319
--- kernel.spec	9 Apr 2009 20:43:30 -0000	1.1318
+++ kernel.spec	10 Apr 2009 21:25:58 -0000	1.1319
@@ -888,14 +888,28 @@
 %endif
 %endif
 
+# more sanity checking; do it quietly
+for patch in %{patches} ; do
+  if [ ! -f $patch ] ; then
+    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+    exit 1
+  fi
+done 2>/dev/null
+
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {
   local patch=$1
   shift
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
-    exit 1;
+    exit 1
   fi
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+    if [ "${patch:0:10}" != "patch-2.6." ] ; then
+      echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
+      exit 1
+    fi
+  fi 2>/dev/null
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;



From cebbert at fedoraproject.org  Fri Apr 10 21:32:20 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 10 Apr 2009 21:32:20 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1512,1.1513
Message-ID: <20090410213220.6340A70122@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2603

Modified Files:
	kernel.spec 
Log Message:
check for missing Patch files in make prep


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1512
retrieving revision 1.1513
diff -u -r1.1512 -r1.1513
--- kernel.spec	9 Apr 2009 21:28:21 -0000	1.1512
+++ kernel.spec	10 Apr 2009 21:31:49 -0000	1.1513
@@ -873,17 +873,28 @@
 %endif
 %endif
 
+# more sanity checking; do it quietly
+for patch in %{patches} ; do
+  if [ ! -f $patch ] ; then
+    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+    exit 1
+  fi
+done 2>/dev/null
+
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {
   local patch=$1
   shift
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
-    exit 1;
+    exit 1
   fi
   if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
-    [ "${patch:0:10}" != "patch-2.6." ] && echo "Patch $patch not listed in specfile" && exit 1;
-  fi
+    if [ "${patch:0:10}" != "patch-2.6." ] ; then
+      echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
+      exit 1
+    fi
+  fi 2>/dev/null
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;



From pkgdb at fedoraproject.org  Fri Apr 10 22:04:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:04:21 +0000
Subject: [pkgdb] libkate was added for kwizart
Message-ID: <20090410220421.5981F10F862@bastion2.fedora.phx.redhat.com>

kevin has added Package libkate with summary Libraries to handle the Kate bitstream format
kevin has approved Package libkate
kevin has added a Fedora devel branch for libkate with an owner of kwizart
kevin has approved libkate in Fedora devel
kevin has approved Package libkate
kevin has set commit to Approved for provenpackager on libkate (Fedora devel)
kevin has set build to Approved for provenpackager on libkate (Fedora devel)
kevin has set checkout to Approved for provenpackager on libkate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libkate



From pkgdb at fedoraproject.org  Fri Apr 10 22:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:04:24 +0000
Subject: [pkgdb] libkate (Fedora, 9) updated by kevin
Message-ID: <20090410220423.C8B1410F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libkate
kevin has set commit to Approved for provenpackager on libkate (Fedora 9)
kevin has set build to Approved for provenpackager on libkate (Fedora 9)
kevin has set checkout to Approved for provenpackager on libkate (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libkate



From kevin at fedoraproject.org  Fri Apr 10 22:04:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:04:38 +0000 (UTC)
Subject: rpms/libkate - New directory
Message-ID: <20090410220438.4C75070122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz9801/rpms/libkate

Log Message:
Directory /cvs/pkgs/rpms/libkate added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:04:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:04:38 +0000 (UTC)
Subject: rpms/libkate/devel - New directory
Message-ID: <20090410220438.859437013D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz9801/rpms/libkate/devel

Log Message:
Directory /cvs/pkgs/rpms/libkate/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:04:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:04:47 +0000 (UTC)
Subject: rpms/libkate Makefile,NONE,1.1
Message-ID: <20090410220447.E42F370122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz9801/rpms/libkate

Added Files:
	Makefile 
Log Message:
Setup of module libkate


--- NEW FILE Makefile ---
# Top level Makefile for module libkate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 22:04:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:04:48 +0000 (UTC)
Subject: rpms/libkate/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090410220448.40C1E70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libkate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz9801/rpms/libkate/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libkate


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libkate
# $Id: Makefile,v 1.1 2009/04/10 22:04:48 kevin Exp $
NAME := libkate
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 10 22:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:04:24 +0000
Subject: [pkgdb] libkate (Fedora, 10) updated by kevin
Message-ID: <20090410220423.D111D10F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libkate
kevin has set commit to Approved for provenpackager on libkate (Fedora 10)
kevin has set build to Approved for provenpackager on libkate (Fedora 10)
kevin has set checkout to Approved for provenpackager on libkate (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libkate



From pkgdb at fedoraproject.org  Fri Apr 10 22:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:07:36 +0000
Subject: [pkgdb] sems was added for peter
Message-ID: <20090410220632.7140B10F86B@bastion2.fedora.phx.redhat.com>

kevin has added Package sems with summary SIP Express Media Server, an extensible SIP media server
kevin has approved Package sems
kevin has added a Fedora devel branch for sems with an owner of peter
kevin has approved sems in Fedora devel
kevin has approved Package sems
kevin has set commit to Approved for provenpackager on sems (Fedora devel)
kevin has set build to Approved for provenpackager on sems (Fedora devel)
kevin has set checkout to Approved for provenpackager on sems (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From pkgdb at fedoraproject.org  Fri Apr 10 22:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:06:36 +0000
Subject: [pkgdb] sems (Fedora, 11) updated by kevin
Message-ID: <20090410220636.2784110F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sems
kevin has set commit to Approved for provenpackager on sems (Fedora 11)
kevin has set build to Approved for provenpackager on sems (Fedora 11)
kevin has set checkout to Approved for provenpackager on sems (Fedora 11)
kevin approved watchbugzilla on sems (Fedora 11) for ondrejj
kevin approved watchcommits on sems (Fedora 11) for ondrejj
kevin approved commit on sems (Fedora 11) for ondrejj
kevin approved build on sems (Fedora 11) for ondrejj
kevin approved approveacls on sems (Fedora 11) for ondrejj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From pkgdb at fedoraproject.org  Fri Apr 10 22:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:06:36 +0000
Subject: [pkgdb] sems (Fedora, 10) updated by kevin
Message-ID: <20090410220636.3BA9A10F878@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sems
kevin has set commit to Approved for provenpackager on sems (Fedora 10)
kevin has set build to Approved for provenpackager on sems (Fedora 10)
kevin has set checkout to Approved for provenpackager on sems (Fedora 10)
kevin approved watchbugzilla on sems (Fedora 10) for ondrejj
kevin approved watchcommits on sems (Fedora 10) for ondrejj
kevin approved commit on sems (Fedora 10) for ondrejj
kevin approved build on sems (Fedora 10) for ondrejj
kevin approved approveacls on sems (Fedora 10) for ondrejj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From pkgdb at fedoraproject.org  Fri Apr 10 22:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:06:36 +0000
Subject: [pkgdb] sems (Fedora EPEL, 5) updated by kevin
Message-ID: <20090410220636.5841510F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sems
kevin has set commit to Approved for provenpackager on sems (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on sems (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on sems (Fedora EPEL 5)
kevin approved watchbugzilla on sems (Fedora EPEL 5) for ondrejj
kevin approved watchcommits on sems (Fedora EPEL 5) for ondrejj
kevin approved commit on sems (Fedora EPEL 5) for ondrejj
kevin approved build on sems (Fedora EPEL 5) for ondrejj
kevin approved approveacls on sems (Fedora EPEL 5) for ondrejj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From pkgdb at fedoraproject.org  Fri Apr 10 22:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:06:36 +0000
Subject: [pkgdb] sems (Fedora EPEL, 4) updated by kevin
Message-ID: <20090410220636.5D1CA10F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sems
kevin has set commit to Approved for provenpackager on sems (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on sems (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on sems (Fedora EPEL 4)
kevin approved watchbugzilla on sems (Fedora EPEL 4) for ondrejj
kevin approved watchcommits on sems (Fedora EPEL 4) for ondrejj
kevin approved commit on sems (Fedora EPEL 4) for ondrejj
kevin approved build on sems (Fedora EPEL 4) for ondrejj
kevin approved approveacls on sems (Fedora EPEL 4) for ondrejj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From pkgdb at fedoraproject.org  Fri Apr 10 22:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:06:36 +0000
Subject: [pkgdb] sems (Fedora, 9) updated by kevin
Message-ID: <20090410220636.6C95810F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sems
kevin has set commit to Approved for provenpackager on sems (Fedora 9)
kevin has set build to Approved for provenpackager on sems (Fedora 9)
kevin has set checkout to Approved for provenpackager on sems (Fedora 9)
kevin approved watchbugzilla on sems (Fedora 9) for ondrejj
kevin approved watchcommits on sems (Fedora 9) for ondrejj
kevin approved commit on sems (Fedora 9) for ondrejj
kevin approved build on sems (Fedora 9) for ondrejj
kevin approved approveacls on sems (Fedora 9) for ondrejj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From kevin at fedoraproject.org  Fri Apr 10 22:06:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:06:54 +0000 (UTC)
Subject: rpms/sems - New directory
Message-ID: <20090410220654.2D87670122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sems
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv10456/rpms/sems

Log Message:
Directory /cvs/pkgs/rpms/sems added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:06:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:06:54 +0000 (UTC)
Subject: rpms/sems/devel - New directory
Message-ID: <20090410220654.7A16970122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv10456/rpms/sems/devel

Log Message:
Directory /cvs/pkgs/rpms/sems/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr 10 22:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:06:36 +0000
Subject: [pkgdb] sems (Fedora, devel) updated by kevin
Message-ID: <20090410220636.7750510F888@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sems (Fedora devel) for ondrejj
kevin approved watchcommits on sems (Fedora devel) for ondrejj
kevin approved commit on sems (Fedora devel) for ondrejj
kevin approved build on sems (Fedora devel) for ondrejj
kevin approved approveacls on sems (Fedora devel) for ondrejj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sems



From kevin at fedoraproject.org  Fri Apr 10 22:07:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:07:06 +0000 (UTC)
Subject: rpms/sems Makefile,NONE,1.1
Message-ID: <20090410220706.3A2B970122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sems
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv10456/rpms/sems

Added Files:
	Makefile 
Log Message:
Setup of module sems


--- NEW FILE Makefile ---
# Top level Makefile for module sems
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 22:07:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:07:06 +0000 (UTC)
Subject: rpms/sems/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090410220706.9717170122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv10456/rpms/sems/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sems


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sems
# $Id: Makefile,v 1.1 2009/04/10 22:07:06 kevin Exp $
NAME := sems
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 10 22:09:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:09:36 +0000
Subject: [pkgdb] python-stomper was added for silas
Message-ID: <20090410220834.6287310F862@bastion2.fedora.phx.redhat.com>

kevin has added Package python-stomper with summary A Python client implementation of the STOMP protocol
kevin has approved Package python-stomper
kevin has added a Fedora devel branch for python-stomper with an owner of silas
kevin has approved python-stomper in Fedora devel
kevin has approved Package python-stomper
kevin has set commit to Approved for provenpackager on python-stomper (Fedora devel)
kevin has set build to Approved for provenpackager on python-stomper (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-stomper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From kevin at fedoraproject.org  Fri Apr 10 22:08:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:08:56 +0000 (UTC)
Subject: rpms/python-stomper - New directory
Message-ID: <20090410220856.29E8270122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-stomper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11114/rpms/python-stomper

Log Message:
Directory /cvs/pkgs/rpms/python-stomper added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:08:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:08:56 +0000 (UTC)
Subject: rpms/python-stomper/devel - New directory
Message-ID: <20090410220856.72C4270122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-stomper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11114/rpms/python-stomper/devel

Log Message:
Directory /cvs/pkgs/rpms/python-stomper/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:09:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:09:08 +0000 (UTC)
Subject: rpms/python-stomper/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090410220908.1070C70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-stomper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11114/rpms/python-stomper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-stomper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-stomper
# $Id: Makefile,v 1.1 2009/04/10 22:09:07 kevin Exp $
NAME := python-stomper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Apr 10 22:09:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:09:07 +0000 (UTC)
Subject: rpms/python-stomper Makefile,NONE,1.1
Message-ID: <20090410220907.A65B270122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-stomper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11114/rpms/python-stomper

Added Files:
	Makefile 
Log Message:
Setup of module python-stomper


--- NEW FILE Makefile ---
# Top level Makefile for module python-stomper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Apr 10 22:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:12:16 +0000
Subject: [pkgdb] webkitgtk was added for pgordon
Message-ID: <20090410221112.6AB2510F861@bastion2.fedora.phx.redhat.com>

kevin has added Package webkitgtk with summary GTK+ Web content engine library
kevin has approved Package webkitgtk
kevin has added a Fedora devel branch for webkitgtk with an owner of pgordon
kevin has approved webkitgtk in Fedora devel
kevin has approved Package webkitgtk
kevin has set commit to Approved for provenpackager on webkitgtk (Fedora devel)
kevin has set build to Approved for provenpackager on webkitgtk (Fedora devel)
kevin has set checkout to Approved for provenpackager on webkitgtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From pkgdb at fedoraproject.org  Fri Apr 10 22:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:12:16 +0000
Subject: [pkgdb] webkitgtk (Fedora, devel) updated by kevin
Message-ID: <20090410221114.81C4710F870@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on webkitgtk (Fedora devel) for maxamillion
kevin approved watchcommits on webkitgtk (Fedora devel) for maxamillion
kevin approved watchbugzilla on webkitgtk (Fedora devel) for mso
kevin approved watchcommits on webkitgtk (Fedora devel) for mso
kevin approved watchbugzilla on webkitgtk (Fedora devel) for mtasaka
kevin approved watchcommits on webkitgtk (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From kevin at fedoraproject.org  Fri Apr 10 22:11:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:11:24 +0000 (UTC)
Subject: rpms/webkitgtk - New directory
Message-ID: <20090410221124.369D370122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitgtk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11586/rpms/webkitgtk

Log Message:
Directory /cvs/pkgs/rpms/webkitgtk added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:11:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:11:24 +0000 (UTC)
Subject: rpms/webkitgtk/devel - New directory
Message-ID: <20090410221124.776AD70122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11586/rpms/webkitgtk/devel

Log Message:
Directory /cvs/pkgs/rpms/webkitgtk/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr 10 22:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:12:16 +0000
Subject: [pkgdb] webkitgtk (Fedora, 11) updated by kevin
Message-ID: <20090410221114.89CDE10F875@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for webkitgtk
kevin has set commit to Approved for provenpackager on webkitgtk (Fedora 11)
kevin has set build to Approved for provenpackager on webkitgtk (Fedora 11)
kevin has set checkout to Approved for provenpackager on webkitgtk (Fedora 11)
kevin approved watchbugzilla on webkitgtk (Fedora 11) for maxamillion
kevin approved watchcommits on webkitgtk (Fedora 11) for maxamillion
kevin approved watchbugzilla on webkitgtk (Fedora 11) for mso
kevin approved watchcommits on webkitgtk (Fedora 11) for mso
kevin approved watchbugzilla on webkitgtk (Fedora 11) for mtasaka
kevin approved watchcommits on webkitgtk (Fedora 11) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From kevin at fedoraproject.org  Fri Apr 10 22:11:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:11:33 +0000 (UTC)
Subject: rpms/webkitgtk Makefile,NONE,1.1
Message-ID: <20090410221133.715C070137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitgtk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11586/rpms/webkitgtk

Added Files:
	Makefile 
Log Message:
Setup of module webkitgtk


--- NEW FILE Makefile ---
# Top level Makefile for module webkitgtk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 22:11:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:11:33 +0000 (UTC)
Subject: rpms/webkitgtk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090410221133.CB75470137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11586/rpms/webkitgtk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module webkitgtk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: webkitgtk
# $Id: Makefile,v 1.1 2009/04/10 22:11:33 kevin Exp $
NAME := webkitgtk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 10 22:12:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:12:42 +0000
Subject: [pkgdb] lv2dynparam was added for oget
Message-ID: <20090410221241.A77AB10F874@bastion2.fedora.phx.redhat.com>

kevin has added Package lv2dynparam with summary LV2 dynamic parameters extension
kevin has approved Package lv2dynparam
kevin has added a Fedora devel branch for lv2dynparam with an owner of oget
kevin has approved lv2dynparam in Fedora devel
kevin has approved Package lv2dynparam
kevin has set commit to Approved for provenpackager on lv2dynparam (Fedora devel)
kevin has set build to Approved for provenpackager on lv2dynparam (Fedora devel)
kevin has set checkout to Approved for provenpackager on lv2dynparam (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2dynparam



From pkgdb at fedoraproject.org  Fri Apr 10 22:13:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:13:47 +0000
Subject: [pkgdb] lv2dynparam (Fedora, 9) updated by kevin
Message-ID: <20090410221245.573F210F877@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for lv2dynparam
kevin has set commit to Approved for provenpackager on lv2dynparam (Fedora 9)
kevin has set build to Approved for provenpackager on lv2dynparam (Fedora 9)
kevin has set checkout to Approved for provenpackager on lv2dynparam (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2dynparam



From pkgdb at fedoraproject.org  Fri Apr 10 22:13:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 10 Apr 2009 22:13:47 +0000
Subject: [pkgdb] lv2dynparam (Fedora, 10) updated by kevin
Message-ID: <20090410221245.61D1E10F87B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lv2dynparam
kevin has set commit to Approved for provenpackager on lv2dynparam (Fedora 10)
kevin has set build to Approved for provenpackager on lv2dynparam (Fedora 10)
kevin has set checkout to Approved for provenpackager on lv2dynparam (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2dynparam



From kevin at fedoraproject.org  Fri Apr 10 22:13:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:13:24 +0000 (UTC)
Subject: rpms/lv2dynparam - New directory
Message-ID: <20090410221324.2651570122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2dynparam
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz12711/rpms/lv2dynparam

Log Message:
Directory /cvs/pkgs/rpms/lv2dynparam added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:13:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:13:24 +0000 (UTC)
Subject: rpms/lv2dynparam/devel - New directory
Message-ID: <20090410221324.6E4247013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2dynparam/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz12711/rpms/lv2dynparam/devel

Log Message:
Directory /cvs/pkgs/rpms/lv2dynparam/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 10 22:13:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:13:33 +0000 (UTC)
Subject: rpms/lv2dynparam Makefile,NONE,1.1
Message-ID: <20090410221333.163A870122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2dynparam
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz12711/rpms/lv2dynparam

Added Files:
	Makefile 
Log Message:
Setup of module lv2dynparam


--- NEW FILE Makefile ---
# Top level Makefile for module lv2dynparam
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 10 22:13:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 10 Apr 2009 22:13:33 +0000 (UTC)
Subject: rpms/lv2dynparam/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090410221333.504E770122@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2dynparam/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz12711/rpms/lv2dynparam/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lv2dynparam


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lv2dynparam
# $Id: Makefile,v 1.1 2009/04/10 22:13:33 kevin Exp $
NAME := lv2dynparam
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From thias at fedoraproject.org  Fri Apr 10 22:16:28 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 10 Apr 2009 22:16:28 +0000 (UTC)
Subject: rpms/ncftp/EL-4 ncftp-3.2.2-no_lfs64_source.patch, NONE,
	1.1 ncftp-3.2.2-pref.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 ncftp.spec, 1.11, 1.12 sources, 1.5,
	1.6 ncftp-3.0.1-pref.patch, 1.1, NONE ncftp-3.1.8-epsv.patch,
	1.1, NONE
Message-ID: <20090410221628.9FC2B70122@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13211

Modified Files:
	.cvsignore ncftp.spec sources 
Added Files:
	ncftp-3.2.2-no_lfs64_source.patch ncftp-3.2.2-pref.patch 
Removed Files:
	ncftp-3.0.1-pref.patch ncftp-3.1.8-epsv.patch 
Log Message:
Backport the 3.2.2 update.


ncftp-3.2.2-no_lfs64_source.patch:

--- NEW FILE ncftp-3.2.2-no_lfs64_source.patch ---
Fix bug #235632: Apparently this code is still triggered on 64-bit systems
through configure, when configure is dealing with the proper LFS64 stuff
already (or should allow the glibc wrapper to do so). -JeR

--- libncftp/ncftp.h.orig	2008-08-25 18:55:38.000000000 +0200
+++ libncftp/ncftp.h	2008-08-25 19:09:02.000000000 +0200
@@ -165,17 +165,6 @@
 #	endif
 #else
 	/* Includes for UNIX */
-#	if ((defined(__linux__)) && (! defined(_LARGEFILE64_SOURCE)) && (! defined(NO_LARGEFILE64_SOURCE)) && (! defined(_LARGEFILE_SOURCE)) && (! defined(_FILE_OFFSET_BITS)))
-		/* Define _LARGEFILE64_SOURCE or NO_LARGEFILE64_SOURCE to
-		 * quiet this warning.  Be sure to define this for ALL
-		 * code that uses LibNcFTP.
-		 */
-#		warning "<ncftp.h> is #defining _LARGEFILE64_SOURCE for you"
-#		define _LARGEFILE64_SOURCE 1
-#		define   Stat    stat64
-#		define   Lstat   lstat64
-#		define   Fstat   fstat64
-#	endif
 #	include <unistd.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>

ncftp-3.2.2-pref.patch:

--- NEW FILE ncftp-3.2.2-pref.patch ---
diff -Naupr ncftp-3.2.2.orig/ncftp/pref.c ncftp-3.2.2/ncftp/pref.c
--- ncftp-3.2.2.orig/ncftp/pref.c	2006-08-02 01:34:16.000000000 +0200
+++ ncftp-3.2.2/ncftp/pref.c	2008-08-29 20:43:23.000000000 +0200
@@ -612,7 +612,7 @@ InitPrefs(void)
 	gAutoResume = 0;
 	gSOBufsize = 0;
 	gMaxLogSize = 10240;
-	gConfirmClose = 1;
+	gConfirmClose = 0;
 	gAutoSaveChangesToExistingBookmarks = 0;
 	gRedialDelay = kDefaultRedialDelay;
 	STRNCPY(gAutoAscii, "|.txt|.asc|.html|.htm|.css|.xml|.ini|.pl|.hqx|.cfg|.c|.h|.cpp|.hpp|.bat|.m3u|.pls|");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2007 13:31:25 -0000	1.5
+++ .cvsignore	10 Apr 2009 22:15:58 -0000	1.6
@@ -1,2 +1 @@
-ncftp-3.2.0-src.tar.bz2
-ncftp-320-v6-20061109b.diff.gz
+ncftp-3.2.2-src.tar.bz2


Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-4/ncftp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ncftp.spec	5 Feb 2007 13:31:25 -0000	1.11
+++ ncftp.spec	10 Apr 2009 22:15:58 -0000	1.12
@@ -1,18 +1,18 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.2.0
-Release: 3%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 Epoch: 2
-License: Distributable
+License: Artistic clarified
 Group: Applications/Internet
 URL: http://www.ncftp.com/ncftp/
 Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
-Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20061109b.diff.gz
-Patch1: ncftp-3.0.1-pref.patch
+#Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20061109b.diff.gz
+Patch1: ncftp-3.2.2-pref.patch
 Patch2: ncftp-3.0.3-resume.patch
 Patch3: ncftp-3.1.5-pmeter.patch
 Patch4: ncftp-3.1.5-ncursesw.patch
-Patch5: ncftp-3.1.8-epsv.patch
+Patch5: ncftp-3.2.2-no_lfs64_source.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -24,24 +24,23 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ipv6
-%patch1 -p0 -b .pref
+#patch0 -p1 -b .ipv6
+%patch1 -p1 -b .pref
 %patch2 -p1 -b .res
 %patch3 -p1 -b .pmeter
 %patch4 -p1 -b .ncursesw
-%patch5 -p1 -b .epsv
+%patch5 -p0 -b .no_lfs64_source
 
 
 %build
-%configure --enable-signals --enable-ipv6
+%configure --enable-signals
 %{__make} STRIPFLAG=""
-%{__rm} -f README.v6.ipv6
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1}
-%makeinstall BINDIR=%{buildroot}%{_bindir}
+%{__make} install DESTDIR=%{buildroot}
 
 
 %clean
@@ -49,8 +48,10 @@
 
 
 %files
-%defattr(-,root,root,0755)
-%doc README* doc/*.txt doc/html/
+%defattr(-,root,root,-)
+%doc README* doc/html/
+%doc doc/CHANGELOG.txt doc/FIREWALLS_AND_PROXIES.txt doc/LICENSE.txt
+%doc doc/READLINE.txt doc/what_changed_between_v2_v3.txt
 %{_bindir}/ncftp
 %{_bindir}/ncftpget
 %{_bindir}/ncftpput
@@ -67,6 +68,26 @@
 
 
 %changelog
+* Fri Aug 29 2008 Matthias Saou <http://freshrpms.net/> 2:3.2.2-1
+- Update to 3.2.2.
+- Include no_lfs64_source from Gentoo to fix the build.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Fri Aug 17 2007 Matthias Saou <http://freshrpms.net/> 2:3.2.1-1
+- Update to 3.2.1.
+- Drop Kame IPv6 patch, should fix #153019. Upstream doesn't seem to want to
+  support IPv6 just yet, so for people requiring IPv6, switching to lftp or
+  some other alternative is probably best.
+- Drop epsv patch, since it applied on top of the IPv6 patch.
+- Clean up included docs (don't include Windows specific ones).
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 2:3.2.0-4
+- Update License field.
+- Use DESTDIR install method.
+- Version 3.2.1 is out, but the KAME IPv6 patch hasn't been updated yet.
+
 * Mon Feb  5 2007 Matthias Saou <http://freshrpms.net/> 2:3.2.0-3
 - Update IPv6 patch from 20060806 to 20061109b (getnameinfo vs. getaddrinfo).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2007 13:31:25 -0000	1.5
+++ sources	10 Apr 2009 22:15:58 -0000	1.6
@@ -1,2 +1 @@
-384b7f01d725c89ccd30692628b3ac1b  ncftp-3.2.0-src.tar.bz2
-54c136bbda91390db22aecb1dc78aeba  ncftp-320-v6-20061109b.diff.gz
+c33da134e5e53b5a3b340e0de5456137  ncftp-3.2.2-src.tar.bz2


--- ncftp-3.0.1-pref.patch DELETED ---


--- ncftp-3.1.8-epsv.patch DELETED ---



From airlied at fedoraproject.org  Fri Apr 10 22:25:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 10 Apr 2009 22:25:52 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm-2.4.7-revert-bong.patch, NONE,
	1.1 libdrm.spec, 1.73, 1.74
Message-ID: <20090410222552.5415A70122@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15404

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-2.4.7-revert-bong.patch 
Log Message:
* Sat Apr 11 2009 Dave Airlie <airlied at redhat.com> 2.4.6-4
- libdrm-2.4.7-revert-bong.patch - revert connector "speedups"


libdrm-2.4.7-revert-bong.patch:

--- NEW FILE libdrm-2.4.7-revert-bong.patch ---
commit e0265401be3c35f668d56a1b6b11084b708e2afa
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Apr 11 08:16:44 2009 +1000

    Revert "libdrm: speed up connector & mode fetching"
    
    This reverts commit cd5c66c659168cbe2e3229ebf8be79f764ed0ee1.

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index e2aba81..872604f 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -357,45 +357,21 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 {
 	struct drm_mode_get_connector conn;
 	drmModeConnectorPtr r = NULL;
-	int pre_props = 8, pre_modes = 16, pre_encoders = 4;
 
 	conn.connector_id = connector_id;
 	conn.connector_type_id = 0;
 	conn.connector_type  = 0;
-	conn.count_modes  = pre_modes;
-	conn.count_props  = pre_props;
-	conn.count_encoders  = pre_encoders;
-
-	/*
-	 * Pre-allocate space for some modes, properties, and encoders.  If
-	 * we're lucky we won't need to call into the kernel twice.
-	 */
-	conn.props_ptr = VOID2U64(drmMalloc(pre_props * sizeof(uint32_t)));
-	conn.prop_values_ptr = VOID2U64(drmMalloc(pre_props *
-						  sizeof(uint64_t)));
-	conn.modes_ptr = VOID2U64(drmMalloc(pre_modes *
-					    sizeof(struct drm_mode_modeinfo)));
-	conn.encoders_ptr = VOID2U64(drmMalloc(pre_encoders *
-					       sizeof(uint32_t)));
+	conn.count_modes  = 0;
+	conn.modes_ptr    = 0;
+	conn.count_props  = 0;
+	conn.props_ptr    = 0;
+	conn.prop_values_ptr = 0;
+	conn.count_encoders  = 0;
+	conn.encoders_ptr = 0;
 
 	if (drmIoctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
 		return 0;
 
-	if (conn.count_props <= pre_props &&
-	    conn.count_modes <= pre_modes &&
-	    conn.count_encoders <= pre_encoders)
-		goto done;
-
-	/* Oh well, free & reallocate everything and ask again... */
-	drmFree(U642VOID(conn.prop_values_ptr));
-	drmFree(U642VOID(conn.props_ptr));
-	drmFree(U642VOID(conn.modes_ptr));
-	drmFree(U642VOID(conn.encoders_ptr));
-	conn.prop_values_ptr = 0;
-	conn.props_ptr = 0;
-	conn.modes_ptr = 0;
-	conn.encoders_ptr = 0;
-
 	if (conn.count_props) {
 		conn.props_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint32_t)));
 		conn.prop_values_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint64_t)));
@@ -410,7 +386,6 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 	if (drmIoctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
 		goto err_allocs;
 
-done:
 	if(!(r = drmMalloc(sizeof(*r)))) {
 		goto err_allocs;
 	}


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libdrm.spec	7 Apr 2009 13:21:30 -0000	1.73
+++ libdrm.spec	10 Apr 2009 22:25:21 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -22,6 +22,8 @@
 
 Source2: 91-drm-modeset.rules
 
+# totally busted connector code
+Patch0: libdrm-2.4.7-revert-bong.patch
 # hardcode the 666 instead of 660 for device nodes
 Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .bong
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch8 -p1 -b .radeon
@@ -106,6 +109,9 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Sat Apr 11 2009 Dave Airlie <airlied at redhat.com> 2.4.6-4
+- libdrm-2.4.7-revert-bong.patch - revert connector "speedups"
+
 * Tue Apr  7 2009 Kristian H??gsberg <krh at redhat.com> - 2.4.6-3
 - BuildRequire libudev-devel for test cases.
 



From kkofler at fedoraproject.org  Fri Apr 10 22:26:48 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:26:48 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-bidi-kde#189161.patch, NONE,
	1.1 kdelibs-4.2.2-kjob.patch, NONE, 1.1 kdelibs.spec, 1.413, 1.414
Message-ID: <20090410222648.BE0A670122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15627/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-bidi-kde#189161.patch kdelibs-4.2.2-kjob.patch 
Log Message:
Sync from devel:

* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- fix bidi-related hangs in khtml (kde#189161)

* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
- upstream patch fix ReadOnlyPart crash for non-local file

kdelibs-4.2.2-bidi-kde#189161.patch:

--- NEW FILE kdelibs-4.2.2-bidi-kde#189161.patch ---
--- branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/02 20:19:16	948353
+++ branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/08 23:48:02	951343
@@ -297,6 +297,7 @@
                 && next->isInlineFlow()))
             break;
         current = next;
+        next    = 0;
     }
     return next;
 }

kdelibs-4.2.2-kjob.patch:

--- NEW FILE kdelibs-4.2.2-kjob.patch ---
Index: kdeui/jobs/kuiserverjobtracker.cpp
===================================================================
--- kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950983)
@@ -35,13 +35,32 @@
 class KUiServerJobTracker::Private
 {
 public:
-    Private() { }
+    Private(KUiServerJobTracker *parent)
+        : q(parent)
+    {
+    }
 
+    KUiServerJobTracker *const q;
+
+    void _k_killJob();
+
     QHash<KJob*, org::kde::JobView*> progressJobView;
 };
 
+void KUiServerJobTracker::Private::_k_killJob()
+{
+    org::kde::JobView *jobView = qobject_cast<org::kde::JobView*>(q->sender());
+
+    if (jobView) {
+        KJob *job = progressJobView.key(jobView);
+
+        if (job)
+            job->kill(KJob::EmitResult);
+    }
+}
+
 KUiServerJobTracker::KUiServerJobTracker(QObject *parent)
-    : KJobTrackerInterface(parent), d(new Private)
+    : KJobTrackerInterface(parent), d(new Private(this))
 {
 
 }
@@ -81,8 +100,8 @@
                                                            reply.value().path(),
                                                            QDBusConnection::sessionBus());
 
-        QObject::connect(jobView, SIGNAL(cancelRequested()), job,
-                         SLOT(kill()));
+        QObject::connect(jobView, SIGNAL(cancelRequested()), this,
+                         SLOT(_k_killJob()));
         QObject::connect(jobView, SIGNAL(suspendRequested()), job,
                          SLOT(suspend()));
         QObject::connect(jobView, SIGNAL(resumeRequested()), job,
Index: kdeui/jobs/kuiserverjobtracker.h
===================================================================
--- kdeui/jobs/kuiserverjobtracker.h	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.h	(Revision 950983)
@@ -78,6 +78,8 @@
 private:
     class Private;
     Private *const d;
+
+    Q_PRIVATE_SLOT(d, void _k_killJob())
 };
 
 #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- kdelibs.spec	7 Apr 2009 16:10:05 -0000	1.413
+++ kdelibs.spec	10 Apr 2009 22:26:18 -0000	1.414
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -88,6 +88,8 @@
 # upstream
 # 4.2 branch
 Patch100: kdelibs-4.2.2-kio_http.patch
+Patch101: kdelibs-4.2.2-kjob.patch
+Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -229,6 +231,8 @@
 # upstream patches
 # 4.2
 %patch100 -p0 -b .kio_http
+%patch101 -p0 -b .kjob
+%patch102 -p4 -b .bidi-kde#189161
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -413,6 +417,12 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- fix bidi-related hangs in khtml (kde#189161)
+
+* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- upstream patch fix ReadOnlyPart crash for non-local file
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix kickoff focus issue
 



From kkofler at fedoraproject.org  Fri Apr 10 22:26:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:26:49 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-bidi-kde#189161.patch, NONE,
	1.1 kdelibs-4.2.2-kjob.patch, NONE, 1.1 kdelibs.spec, 1.388, 1.389
Message-ID: <20090410222649.811E670122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15627/F-9

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-bidi-kde#189161.patch kdelibs-4.2.2-kjob.patch 
Log Message:
Sync from devel:

* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- fix bidi-related hangs in khtml (kde#189161)

* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
- upstream patch fix ReadOnlyPart crash for non-local file

kdelibs-4.2.2-bidi-kde#189161.patch:

--- NEW FILE kdelibs-4.2.2-bidi-kde#189161.patch ---
--- branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/02 20:19:16	948353
+++ branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/08 23:48:02	951343
@@ -297,6 +297,7 @@
                 && next->isInlineFlow()))
             break;
         current = next;
+        next    = 0;
     }
     return next;
 }

kdelibs-4.2.2-kjob.patch:

--- NEW FILE kdelibs-4.2.2-kjob.patch ---
Index: kdeui/jobs/kuiserverjobtracker.cpp
===================================================================
--- kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950983)
@@ -35,13 +35,32 @@
 class KUiServerJobTracker::Private
 {
 public:
-    Private() { }
+    Private(KUiServerJobTracker *parent)
+        : q(parent)
+    {
+    }
 
+    KUiServerJobTracker *const q;
+
+    void _k_killJob();
+
     QHash<KJob*, org::kde::JobView*> progressJobView;
 };
 
+void KUiServerJobTracker::Private::_k_killJob()
+{
+    org::kde::JobView *jobView = qobject_cast<org::kde::JobView*>(q->sender());
+
+    if (jobView) {
+        KJob *job = progressJobView.key(jobView);
+
+        if (job)
+            job->kill(KJob::EmitResult);
+    }
+}
+
 KUiServerJobTracker::KUiServerJobTracker(QObject *parent)
-    : KJobTrackerInterface(parent), d(new Private)
+    : KJobTrackerInterface(parent), d(new Private(this))
 {
 
 }
@@ -81,8 +100,8 @@
                                                            reply.value().path(),
                                                            QDBusConnection::sessionBus());
 
-        QObject::connect(jobView, SIGNAL(cancelRequested()), job,
-                         SLOT(kill()));
+        QObject::connect(jobView, SIGNAL(cancelRequested()), this,
+                         SLOT(_k_killJob()));
         QObject::connect(jobView, SIGNAL(suspendRequested()), job,
                          SLOT(suspend()));
         QObject::connect(jobView, SIGNAL(resumeRequested()), job,
Index: kdeui/jobs/kuiserverjobtracker.h
===================================================================
--- kdeui/jobs/kuiserverjobtracker.h	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.h	(Revision 950983)
@@ -78,6 +78,8 @@
 private:
     class Private;
     Private *const d;
+
+    Q_PRIVATE_SLOT(d, void _k_killJob())
 };
 
 #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- kdelibs.spec	7 Apr 2009 16:14:54 -0000	1.388
+++ kdelibs.spec	10 Apr 2009 22:26:19 -0000	1.389
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -88,6 +88,8 @@
 # upstream
 # 4.2 branch
 Patch100: kdelibs-4.2.2-kio_http.patch
+Patch101: kdelibs-4.2.2-kjob.patch
+Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -229,6 +231,8 @@
 # upstream patches
 # 4.2
 %patch100 -p0 -b .kio_http
+%patch101 -p0 -b .kjob
+%patch102 -p4 -b .bidi-kde#189161
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -413,6 +417,12 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- fix bidi-related hangs in khtml (kde#189161)
+
+* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- upstream patch fix ReadOnlyPart crash for non-local file
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix kickoff focus issue
 



From kkofler at fedoraproject.org  Fri Apr 10 22:33:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:33:21 +0000 (UTC)
Subject: rpms/qjackctl/F-10 qjackctl-0.3.3-qt45.patch, NONE,
	1.1 qjackctl.spec, 1.11, 1.12
Message-ID: <20090410223321.7E0EF70122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qjackctl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061/F-10

Modified Files:
	qjackctl.spec 
Added Files:
	qjackctl-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
- Fix close button not shown with Qt 4.5 (#494471)

qjackctl-0.3.3-qt45.patch:

--- NEW FILE qjackctl-0.3.3-qt45.patch ---
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:23:44.000000000 -0400
@@ -300,6 +300,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qjackctl-0.3.4.old/src/qjackctlMainForm.cpp qjackctl-0.3.4/src/qjackctlMainForm.cpp
--- qjackctl-0.3.4.old/src/qjackctlMainForm.cpp	2008-10-02 12:18:12.000000000 -0400
+++ qjackctl-0.3.4/src/qjackctlMainForm.cpp	2009-04-06 22:25:28.000000000 -0400
@@ -370,6 +370,9 @@ bool qjackctlMainForm::setup ( qjackctlS
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/qjackctl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qjackctl.spec	8 Jul 2008 13:23:49 -0000	1.11
+++ qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.12
@@ -3,10 +3,12 @@
 Summary: Qt based JACK control application
 Name: qjackctl
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 3%{?dist}
 URL: http://qjackctl.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
 Source1: qjackctl.desktop
+# Fix close button not shown with Qt 4.5 (#494471)
+Patch0: qjackctl-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt45
 
 %build
 ls -l /usr/lib*/qt4/bin
@@ -76,6 +79,12 @@
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
+- Fix close button not shown with Qt 4.5 (#494471)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 08 2008 Anthony Green <green at redhat.com> 0.3.3-1
 - Upgrade source.
 



From kkofler at fedoraproject.org  Fri Apr 10 22:33:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:33:21 +0000 (UTC)
Subject: rpms/qjackctl/F-9 qjackctl-0.3.3-qt45.patch, NONE, 1.1 qjackctl.spec,
	1.11, 1.12
Message-ID: <20090410223321.BA0F370122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qjackctl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061/F-9

Modified Files:
	qjackctl.spec 
Added Files:
	qjackctl-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
- Fix close button not shown with Qt 4.5 (#494471)

qjackctl-0.3.3-qt45.patch:

--- NEW FILE qjackctl-0.3.3-qt45.patch ---
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:23:44.000000000 -0400
@@ -300,6 +300,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qjackctl-0.3.4.old/src/qjackctlMainForm.cpp qjackctl-0.3.4/src/qjackctlMainForm.cpp
--- qjackctl-0.3.4.old/src/qjackctlMainForm.cpp	2008-10-02 12:18:12.000000000 -0400
+++ qjackctl-0.3.4/src/qjackctlMainForm.cpp	2009-04-06 22:25:28.000000000 -0400
@@ -370,6 +370,9 @@ bool qjackctlMainForm::setup ( qjackctlS
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/qjackctl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qjackctl.spec	21 Sep 2008 14:30:13 -0000	1.11
+++ qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.12
@@ -3,10 +3,12 @@
 Summary: Qt based JACK control application
 Name: qjackctl
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 3%{?dist}
 URL: http://qjackctl.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
 Source1: qjackctl.desktop
+# Fix close button not shown with Qt 4.5 (#494471)
+Patch0: qjackctl-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt45
 
 %build
 ls -l /usr/lib*/qt4/bin
@@ -76,6 +79,12 @@
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
+- Fix close button not shown with Qt 4.5 (#494471)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 08 2008 Anthony Green <green at redhat.com> 0.3.3-1
 - Upgrade source.
 



From kkofler at fedoraproject.org  Fri Apr 10 22:33:22 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:33:22 +0000 (UTC)
Subject: rpms/qjackctl/devel qjackctl-0.3.3-qt45.patch, NONE,
	1.1 qjackctl.spec, 1.12, 1.13
Message-ID: <20090410223322.1EEE570122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qjackctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061/devel

Modified Files:
	qjackctl.spec 
Added Files:
	qjackctl-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
- Fix close button not shown with Qt 4.5 (#494471)

qjackctl-0.3.3-qt45.patch:

--- NEW FILE qjackctl-0.3.3-qt45.patch ---
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:23:44.000000000 -0400
@@ -300,6 +300,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qjackctl-0.3.4.old/src/qjackctlMainForm.cpp qjackctl-0.3.4/src/qjackctlMainForm.cpp
--- qjackctl-0.3.4.old/src/qjackctlMainForm.cpp	2008-10-02 12:18:12.000000000 -0400
+++ qjackctl-0.3.4/src/qjackctlMainForm.cpp	2009-04-06 22:25:28.000000000 -0400
@@ -370,6 +370,9 @@ bool qjackctlMainForm::setup ( qjackctlS
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/qjackctl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qjackctl.spec	25 Feb 2009 17:36:13 -0000	1.12
+++ qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.13
@@ -3,10 +3,12 @@
 Summary: Qt based JACK control application
 Name: qjackctl
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://qjackctl.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
 Source1: qjackctl.desktop
+# Fix close button not shown with Qt 4.5 (#494471)
+Patch0: qjackctl-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt45
 
 %build
 ls -l /usr/lib*/qt4/bin
@@ -76,7 +79,10 @@
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
+- Fix close button not shown with Qt 4.5 (#494471)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Jul 08 2008 Anthony Green <green at redhat.com> 0.3.3-1



From oget at fedoraproject.org  Fri Apr 10 22:40:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 22:40:30 +0000 (UTC)
Subject: rpms/lv2dynparam/devel import.log, NONE, 1.1 lv2dynparam.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410224030.99BDD70122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2dynparam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18498/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2dynparam.spec 
Log Message:
* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2-1
- update to version 2
- prepare package for Fedora review. SPEC file is courtesy of PlanetCCRMA

* Tue Jan 22 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build




--- NEW FILE import.log ---
lv2dynparam-2-1_fc10:HEAD:lv2dynparam-2-1.fc10.src.rpm:1239403114


--- NEW FILE lv2dynparam.spec ---
Summary:	LV2 dynamic parameters extension
Name:		lv2dynparam
Version:	2
Release:	1%{?dist}
License:	GPLv2
Group:		System Environment/Libraries
URL:		http://home.gna.org/lv2dynparam/
Source:		http://download.gna.org/lv2dynparam/lv2dynparam1-2.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	lv2core-devel

%description
lv2dynparam is a LV2 plugin interface extension that enables plugin parameters
to appear and disappear (i.e. number of voices). It also allows nested grouping
of parameters. Groups can be used for things like ADSR abstraction, i.e. group
of 4 float parameters.

The extension should be suitable for all plugins that expose many and/or
complex data types, like samplers, non-trivial synths, etc.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
This package contains libraries and header files for developing plugins that
use LV2 dynamic parameters extension.

%prep
%setup -q -n %{name}1-%{version}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

# Kill .la files
rm -f %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING NEWS
%{_libdir}/lib%{name}host1.so.*
%{_libdir}/lib%{name}plugin1.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}1
%{_libdir}/lib%{name}host1.so
%{_libdir}/lib%{name}plugin1.so
%{_libdir}/pkgconfig/%{name}host1.pc
%{_libdir}/pkgconfig/%{name}plugin1.pc

%changelog
* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2-1
- update to version 2
- prepare package for Fedora review. SPEC file is courtesy of PlanetCCRMA

* Tue Jan 22 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2dynparam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:13:33 -0000	1.1
+++ .cvsignore	10 Apr 2009 22:39:59 -0000	1.2
@@ -0,0 +1 @@
+lv2dynparam1-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2dynparam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:13:33 -0000	1.1
+++ sources	10 Apr 2009 22:39:59 -0000	1.2
@@ -0,0 +1 @@
+708a7ce7e6604af2a58f521e343509d5  lv2dynparam1-2.tar.bz2



From kkofler at fedoraproject.org  Fri Apr 10 22:41:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:41:53 +0000 (UTC)
Subject: rpms/qsynth/F-10 qsynth-0.3.3-qt45.patch, NONE, 1.1 qsynth.spec, 1.7,
	1.8
Message-ID: <20090410224153.DF8AB70122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19116/F-10

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
- Fix close button not shown with Qt 4.5 (#494470)

qsynth-0.3.3-qt45.patch:

--- NEW FILE qsynth-0.3.3-qt45.patch ---
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:06:07.000000000 -0400
@@ -260,6 +260,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	        | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qsynth-0.3.3.old/src/qsynthMainForm.cpp qsynth-0.3.3/src/qsynthMainForm.cpp
--- qsynth-0.3.3.old/src/qsynthMainForm.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthMainForm.cpp	2009-04-06 22:05:12.000000000 -0400
@@ -544,6 +544,9 @@ void qsynthMainForm::setup ( qsynthOptio
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
  		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	  | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-10/qsynth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qsynth.spec	6 Sep 2008 03:56:32 -0000	1.7
+++ qsynth.spec	10 Apr 2009 22:41:23 -0000	1.8
@@ -3,12 +3,14 @@
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 4%{?dist}
 URL: http://qsynth.sourceforge.net
 Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0:	 qsynth-0.3.3-qt4.patch
+Patch0: qsynth-0.3.3-qt4.patch
+# Fix close button not shown with Qt 4.5 (#494470)
+Patch1: qsynth-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,12 +29,13 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt4
+%patch1 -p1 -b .qt45
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
 
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%{__make} # doesn't understand %{?_smp_mflags}
 
 
 %install
@@ -67,6 +70,15 @@
 
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
+- Fix close button not shown with Qt 4.5 (#494470)
+
+* Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.3.3-3
+- Rebuilt without %%{?_smp_mflags} as it isn't supported
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
 - Update to 0.3.3
 



From kkofler at fedoraproject.org  Fri Apr 10 22:41:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:41:54 +0000 (UTC)
Subject: rpms/qsynth/F-9 qsynth-0.3.3-qt45.patch, NONE, 1.1 qsynth.spec, 1.5,
	1.6
Message-ID: <20090410224154.6737570122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19116/F-9

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
- Fix close button not shown with Qt 4.5 (#494470)

qsynth-0.3.3-qt45.patch:

--- NEW FILE qsynth-0.3.3-qt45.patch ---
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:06:07.000000000 -0400
@@ -260,6 +260,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	        | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qsynth-0.3.3.old/src/qsynthMainForm.cpp qsynth-0.3.3/src/qsynthMainForm.cpp
--- qsynth-0.3.3.old/src/qsynthMainForm.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthMainForm.cpp	2009-04-06 22:05:12.000000000 -0400
@@ -544,6 +544,9 @@ void qsynthMainForm::setup ( qsynthOptio
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
  		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	  | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/qsynth.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qsynth.spec	6 Sep 2008 03:56:32 -0000	1.5
+++ qsynth.spec	10 Apr 2009 22:41:24 -0000	1.6
@@ -3,12 +3,14 @@
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 4%{?dist}
 URL: http://qsynth.sourceforge.net
 Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0:	 qsynth-0.3.3-qt4.patch
+Patch0: qsynth-0.3.3-qt4.patch
+# Fix close button not shown with Qt 4.5 (#494470)
+Patch1: qsynth-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,12 +29,13 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt4
+%patch1 -p1 -b .qt45
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
 
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%{__make} # doesn't understand %{?_smp_mflags}
 
 
 %install
@@ -67,6 +70,15 @@
 
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
+- Fix close button not shown with Qt 4.5 (#494470)
+
+* Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.3.3-3
+- Rebuilt without %%{?_smp_mflags} as it isn't supported
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
 - Update to 0.3.3
 



From kkofler at fedoraproject.org  Fri Apr 10 22:41:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 10 Apr 2009 22:41:54 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth-0.3.3-qt45.patch, NONE, 1.1 qsynth.spec,
	1.9, 1.10
Message-ID: <20090410224154.E106970122@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19116/devel

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
- Fix close button not shown with Qt 4.5 (#494470)

qsynth-0.3.3-qt45.patch:

--- NEW FILE qsynth-0.3.3-qt45.patch ---
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:06:07.000000000 -0400
@@ -260,6 +260,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	        | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qsynth-0.3.3.old/src/qsynthMainForm.cpp qsynth-0.3.3/src/qsynthMainForm.cpp
--- qsynth-0.3.3.old/src/qsynthMainForm.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthMainForm.cpp	2009-04-06 22:05:12.000000000 -0400
@@ -544,6 +544,9 @@ void qsynthMainForm::setup ( qsynthOptio
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
  		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	  | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qsynth.spec	22 Mar 2009 20:05:04 -0000	1.9
+++ qsynth.spec	10 Apr 2009 22:41:24 -0000	1.10
@@ -3,12 +3,14 @@
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
 Version: 0.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://qsynth.sourceforge.net
 Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0:	 qsynth-0.3.3-qt4.patch
+Patch0: qsynth-0.3.3-qt4.patch
+# Fix close button not shown with Qt 4.5 (#494470)
+Patch1: qsynth-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt4
+%patch1 -p1 -b .qt45
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
 
 
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
+- Fix close button not shown with Qt 4.5 (#494470)
+
 * Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.3.3-3
 - Rebuilt without %%{?_smp_mflags} as it isn't supported
 



From oget at fedoraproject.org  Fri Apr 10 22:41:59 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 10 Apr 2009 22:41:59 +0000 (UTC)
Subject: rpms/lv2dynparam/F-10 import.log, NONE, 1.1 lv2dynparam.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410224159.B20D670122@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2dynparam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19274/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2dynparam.spec 
Log Message:
* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2-1
- update to version 2
- prepare package for Fedora review. SPEC file is courtesy of PlanetCCRMA

* Tue Jan 22 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build



--- NEW FILE import.log ---
lv2dynparam-2-1_fc10:F-10:lv2dynparam-2-1.fc10.src.rpm:1239403265


--- NEW FILE lv2dynparam.spec ---
Summary:	LV2 dynamic parameters extension
Name:		lv2dynparam
Version:	2
Release:	1%{?dist}
License:	GPLv2
Group:		System Environment/Libraries
URL:		http://home.gna.org/lv2dynparam/
Source:		http://download.gna.org/lv2dynparam/lv2dynparam1-2.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	lv2core-devel

%description
lv2dynparam is a LV2 plugin interface extension that enables plugin parameters
to appear and disappear (i.e. number of voices). It also allows nested grouping
of parameters. Groups can be used for things like ADSR abstraction, i.e. group
of 4 float parameters.

The extension should be suitable for all plugins that expose many and/or
complex data types, like samplers, non-trivial synths, etc.

%package devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
This package contains libraries and header files for developing plugins that
use LV2 dynamic parameters extension.

%prep
%setup -q -n %{name}1-%{version}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

# Kill .la files
rm -f %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING NEWS
%{_libdir}/lib%{name}host1.so.*
%{_libdir}/lib%{name}plugin1.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}1
%{_libdir}/lib%{name}host1.so
%{_libdir}/lib%{name}plugin1.so
%{_libdir}/pkgconfig/%{name}host1.pc
%{_libdir}/pkgconfig/%{name}plugin1.pc

%changelog
* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2-1
- update to version 2
- prepare package for Fedora review. SPEC file is courtesy of PlanetCCRMA

* Tue Jan 22 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2dynparam/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:13:33 -0000	1.1
+++ .cvsignore	10 Apr 2009 22:41:29 -0000	1.2
@@ -0,0 +1 @@
+lv2dynparam1-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2dynparam/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:13:33 -0000	1.1
+++ sources	10 Apr 2009 22:41:29 -0000	1.2
@@ -0,0 +1 @@
+708a7ce7e6604af2a58f521e343509d5  lv2dynparam1-2.tar.bz2



From pknirsch at fedoraproject.org  Fri Apr 10 23:05:00 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Fri, 10 Apr 2009 23:05:00 +0000 (UTC)
Subject: rpms/tuned/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tuned.spec, 
	1.2, 1.3
Message-ID: <20090410230501.0060670122@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24623

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
- Updated documentation, thanks to Marcela Maslanova!
- Updated diskdevstat and netdevstat to have command line arguments
- Added the possibility to output a histogram at the end of the
  run for detailed information about the collected data



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2009 09:44:59 -0000	1.3
+++ .cvsignore	10 Apr 2009 23:04:28 -0000	1.4
@@ -1 +1 @@
-tuned-0.1.4.tar.bz2
+tuned-0.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2009 09:44:59 -0000	1.3
+++ sources	10 Apr 2009 23:04:28 -0000	1.4
@@ -1 +1 @@
-d323a2d126c6d2c0f71274aff38e7d59  tuned-0.1.4.tar.bz2
+22402df3afd6f2eda20d3c61c9b3149d  tuned-0.1.5.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tuned.spec	6 Mar 2009 09:44:59 -0000	1.2
+++ tuned.spec	10 Apr 2009 23:04:28 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.1.4
+Version: 0.1.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -82,6 +82,12 @@
 
 
 %changelog
+* Wed Mar 25 2009 Phil Knirsch <pknirsch at redhat.com> - 0.1.5-1
+- Updated documentation, thanks to Marcela Maslanova!
+- Updated diskdevstat and netdevstat to have command line arguments
+- Added the possibility to output a histogram at the end of the
+  run for detailed information about the collected data
+
 * Fri Mar 06 2009 Phil Knirsch <pknirsch at redhat.com> - 0.1.4-1
 - Dropped unecessary kernel-debuginfo requires from tuned-utils
 



From kwizart at fedoraproject.org  Fri Apr 10 23:06:10 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 10 Apr 2009 23:06:10 +0000 (UTC)
Subject: rpms/libkate/devel import.log, NONE, 1.1 libkate-0.3.1-noredef.patch,
	NONE, 1.1 libkate-0.3.1-python_no_shebang.patch, NONE,
	1.1 libkate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410230610.EC26670122@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libkate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23824/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libkate-0.3.1-noredef.patch 
	libkate-0.3.1-python_no_shebang.patch libkate.spec 
Log Message:
Initial import for Rawhide



--- NEW FILE import.log ---
libkate-0_3_1-3_fc11:HEAD:libkate-0.3.1-3.fc11.src.rpm:1239404342

libkate-0.3.1-noredef.patch:

--- NEW FILE libkate-0.3.1-noredef.patch ---
diff -up libkate-0.3.1/tools/kate_parser.y.noredef libkate-0.3.1/tools/kate_parser.y
--- libkate-0.3.1/tools/kate_parser.y.noredef	2009-01-29 00:26:44.000000000 +0100
+++ libkate-0.3.1/tools/kate_parser.y	2009-04-04 00:59:29.000000000 +0200
@@ -1012,7 +1012,7 @@ static char *expand_numeric_entities(con
   return newtext;
 }
 
-static char *getline(const char **text)
+static char *getrawline(const char **text)
 {
   size_t rlen0;
   int newline,in_newline=0;
@@ -1020,7 +1020,7 @@ static char *getline(const char **text)
   int c;
 
   if (!text || !*text) {
-    yyerror("error: getline passed invalid text pointer");
+    yyerror("error: getrawline passed invalid text pointer");
     exit(-1);
   }
 
@@ -1126,7 +1126,7 @@ static char *trimtext(const char *text)
   char *newtext=(char*)kate_malloc(1);
   *newtext=0;
   while (text && *text) {
-    char *line=getline(&text);
+    char *line=getrawline(&text);
     char *trimmed=trimline(line);
     kate_free(line);
     if (*trimmed && strcmp(trimmed,"\n")) {

libkate-0.3.1-python_no_shebang.patch:

--- NEW FILE libkate-0.3.1-python_no_shebang.patch ---
diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py~ libkate-0.3.1/tools/KateDJ/kdj/constants.py
--- libkate-0.3.1/tools/KateDJ/kdj/constants.py~	2009-03-15 00:25:09.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py	2009-04-10 12:58:10.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 kdj_name='KateDJ'
 kdj_version='0.3.1'
 kdj_name_version=kdj_name+' '+kdj_version
diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in
--- libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in	2009-04-10 12:58:16.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 kdj_name='KateDJ'
 kdj_version='@VERSION@'
 kdj_name_version=kdj_name+' '+kdj_version
diff -up libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py
--- libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py	2009-04-10 12:57:35.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import tempfile
diff -up libkate-0.3.1/tools/KateDJ/kdj/finder.py~ libkate-0.3.1/tools/KateDJ/kdj/finder.py
--- libkate-0.3.1/tools/KateDJ/kdj/finder.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/finder.py	2009-04-10 12:57:20.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 
diff -up libkate-0.3.1/tools/KateDJ/kdj/muxer.py~ libkate-0.3.1/tools/KateDJ/kdj/muxer.py
--- libkate-0.3.1/tools/KateDJ/kdj/muxer.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/muxer.py	2009-04-10 12:57:16.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 
diff -up libkate-0.3.1/tools/KateDJ/kdj/options.py~ libkate-0.3.1/tools/KateDJ/kdj/options.py
--- libkate-0.3.1/tools/KateDJ/kdj/options.py~	2009-01-02 22:13:25.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/options.py	2009-04-10 12:57:07.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os
 
 class Options:
diff -up libkate-0.3.1/tools/KateDJ/kdj/tools.py~ libkate-0.3.1/tools/KateDJ/kdj/tools.py
--- libkate-0.3.1/tools/KateDJ/kdj/tools.py~	2009-01-29 00:43:20.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/tools.py	2009-04-10 12:57:27.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import subprocess
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py	2009-04-10 12:57:40.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import wx
 #import wx.py.editor as editor
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py	2009-04-10 12:57:47.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import wx
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py	2009-04-10 12:57:52.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import wx
 from constants import *


--- NEW FILE libkate.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           libkate
Version:        0.3.1
Release:        3%{?dist}
Summary:        Libraries to handle the Kate bitstream format

Group:          System Environment/Libraries
License:        BSD
URL:            http://code.google.com/p/libkate/
Source0:        http://libkate.googlecode.com/files/libkate-%{version}.tar.gz
Patch0:         libkate-0.3.1-noredef.patch
Patch1:         libkate-0.3.1-python_no_shebang.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  libogg-devel
BuildRequires:  liboggz
BuildRequires:  libpng-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  valgrind
BuildRequires:  doxygen
 

%description
This is libkate, the reference implementation of a codec for the Kate bitstream
format.
Kate is a karaoke and text codec meant for encapsulation in an Ogg container.
It can carry text, images, and animate them.

Kate is meant to be used for karaoke alongside audio/video streams (typically
Vorbis and Theora), movie subtitles, song lyrics, and anything that needs text
data at arbitrary time intervals.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libogg-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package utils
Summary:        Encoder/Decoder utilities for %{name}
Group:          Applications/Multimedia
Requires:       %{name} = %{version}-%{release}
Requires:       liboggz

%description utils
The %{name}-utils package contains the katedec/kateenc binaries for %{name}.


%prep
%setup -q
#Prevent conflict with GNU getline() in recent rawhide
%patch0 -p1 -b .noredef
#Remove shebangs
%patch1 -p1 -b .noshebangs

# We regenerate theses files at built step
rm tools/kate_parser.{c,h}
rm tools/kate_lexer.c


%build
%configure --disable-static \
  --docdir=%{_docdir}/%{name}-%{version}

# Remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Fix for header timestramps
touch -r $RPM_BUILD_ROOT%{_includedir}/kate/kate_config.h \
 $RPM_BUILD_ROOT%{_includedir}/kate/kate.h


%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%exclude %{_docdir}/libkate-%{version}/html
%doc %{_docdir}/libkate-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/
%doc %{_docdir}/libkate-%{version}/html
%{_includedir}/kate/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%files utils
%defattr(-,root,root,-)
%{python_sitelib}/kdj/
%{_bindir}/KateDJ
%{_bindir}/katalyzer
%{_bindir}/katedec
%{_bindir}/kateenc
%{_mandir}/man1/KateDJ.*
%{_mandir}/man1/katalyzer.*
%{_mandir}/man1/katedec.*
%{_mandir}/man1/kateenc.*


%changelog
* Fri Apr 10 2009 kwizart < kwizart at gmail.com > - 0.3.1-3
- Use Fedora compliant (using version) _docdir directory.
- Remove shebangs when not needed.
- Bundle examples within -devel
- Use global instead of define

* Sat Apr  4 2009 kwizart < kwizart at gmail.com > - 0.3.1-2
- Prevent conflict with GNU getline() in recent rawhide

* Tue Mar 17 2009 kwizart < kwizart at gmail.com > - 0.3.1-1
- Update to 0.3.1

* Tue Jan 13 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
- Update to 0.3.0
- Add KateDJ and katalyzer in -utils
- Add BR liboggz and -utils Requires liboggz

* Wed Nov 27 2008 kwizart < kwizart at gmail.com > - 0.2.7-1
- Update to 0.2.7

* Mon Oct 20 2008 kwizart < kwizart at gmail.com > - 0.2.5-1
- Update to 0.2.5

* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.2.1-1
- Update to 0.2.1

* Thu Sep 11 2008 kwizart < kwizart at gmail.com > - 0.1.12-1
- Update to 0.1.12

* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 0.1.11-1
- Update to 0.1.11

* Wed Sep  3 2008 kwizart < kwizart at gmail.com > - 0.1.10-1
- Update to 0.1.10

* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 0.1.9-1
- Update to 0.1.9

* Fri Aug 29 2008 kwizart < kwizart at gmail.com > - 0.1.8-1
- Update to 0.1.8

* Mon Aug 11 2008 kwizart < kwizart at gmail.com > - 0.1.7-1
- Initial spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:04:48 -0000	1.1
+++ .cvsignore	10 Apr 2009 23:05:40 -0000	1.2
@@ -0,0 +1 @@
+libkate-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:04:48 -0000	1.1
+++ sources	10 Apr 2009 23:05:40 -0000	1.2
@@ -0,0 +1 @@
+d94894c5b6f12c0a5fed34307a32bb9d  libkate-0.3.1.tar.gz



From kwizart at fedoraproject.org  Fri Apr 10 23:11:32 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 10 Apr 2009 23:11:32 +0000 (UTC)
Subject: rpms/libkate/F-10 import.log, NONE, 1.1 libkate-0.3.1-noredef.patch,
	NONE, 1.1 libkate-0.3.1-python_no_shebang.patch, NONE,
	1.1 libkate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410231132.7008B70122@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libkate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26082/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libkate-0.3.1-noredef.patch 
	libkate-0.3.1-python_no_shebang.patch libkate.spec 
Log Message:
Initial import for F-10



--- NEW FILE import.log ---
libkate-0_3_1-3_fc11:F-10:libkate-0.3.1-3.fc11.src.rpm:1239405037

libkate-0.3.1-noredef.patch:

--- NEW FILE libkate-0.3.1-noredef.patch ---
diff -up libkate-0.3.1/tools/kate_parser.y.noredef libkate-0.3.1/tools/kate_parser.y
--- libkate-0.3.1/tools/kate_parser.y.noredef	2009-01-29 00:26:44.000000000 +0100
+++ libkate-0.3.1/tools/kate_parser.y	2009-04-04 00:59:29.000000000 +0200
@@ -1012,7 +1012,7 @@ static char *expand_numeric_entities(con
   return newtext;
 }
 
-static char *getline(const char **text)
+static char *getrawline(const char **text)
 {
   size_t rlen0;
   int newline,in_newline=0;
@@ -1020,7 +1020,7 @@ static char *getline(const char **text)
   int c;
 
   if (!text || !*text) {
-    yyerror("error: getline passed invalid text pointer");
+    yyerror("error: getrawline passed invalid text pointer");
     exit(-1);
   }
 
@@ -1126,7 +1126,7 @@ static char *trimtext(const char *text)
   char *newtext=(char*)kate_malloc(1);
   *newtext=0;
   while (text && *text) {
-    char *line=getline(&text);
+    char *line=getrawline(&text);
     char *trimmed=trimline(line);
     kate_free(line);
     if (*trimmed && strcmp(trimmed,"\n")) {

libkate-0.3.1-python_no_shebang.patch:

--- NEW FILE libkate-0.3.1-python_no_shebang.patch ---
diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py~ libkate-0.3.1/tools/KateDJ/kdj/constants.py
--- libkate-0.3.1/tools/KateDJ/kdj/constants.py~	2009-03-15 00:25:09.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py	2009-04-10 12:58:10.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 kdj_name='KateDJ'
 kdj_version='0.3.1'
 kdj_name_version=kdj_name+' '+kdj_version
diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in
--- libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in	2009-04-10 12:58:16.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 kdj_name='KateDJ'
 kdj_version='@VERSION@'
 kdj_name_version=kdj_name+' '+kdj_version
diff -up libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py
--- libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py	2009-04-10 12:57:35.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import tempfile
diff -up libkate-0.3.1/tools/KateDJ/kdj/finder.py~ libkate-0.3.1/tools/KateDJ/kdj/finder.py
--- libkate-0.3.1/tools/KateDJ/kdj/finder.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/finder.py	2009-04-10 12:57:20.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 
diff -up libkate-0.3.1/tools/KateDJ/kdj/muxer.py~ libkate-0.3.1/tools/KateDJ/kdj/muxer.py
--- libkate-0.3.1/tools/KateDJ/kdj/muxer.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/muxer.py	2009-04-10 12:57:16.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 
diff -up libkate-0.3.1/tools/KateDJ/kdj/options.py~ libkate-0.3.1/tools/KateDJ/kdj/options.py
--- libkate-0.3.1/tools/KateDJ/kdj/options.py~	2009-01-02 22:13:25.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/options.py	2009-04-10 12:57:07.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os
 
 class Options:
diff -up libkate-0.3.1/tools/KateDJ/kdj/tools.py~ libkate-0.3.1/tools/KateDJ/kdj/tools.py
--- libkate-0.3.1/tools/KateDJ/kdj/tools.py~	2009-01-29 00:43:20.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/tools.py	2009-04-10 12:57:27.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import subprocess
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py	2009-04-10 12:57:40.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import wx
 #import wx.py.editor as editor
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py	2009-04-10 12:57:47.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import wx
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py	2009-04-10 12:57:52.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import wx
 from constants import *


--- NEW FILE libkate.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           libkate
Version:        0.3.1
Release:        3%{?dist}
Summary:        Libraries to handle the Kate bitstream format

Group:          System Environment/Libraries
License:        BSD
URL:            http://code.google.com/p/libkate/
Source0:        http://libkate.googlecode.com/files/libkate-%{version}.tar.gz
Patch0:         libkate-0.3.1-noredef.patch
Patch1:         libkate-0.3.1-python_no_shebang.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  libogg-devel
BuildRequires:  liboggz
BuildRequires:  libpng-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  valgrind
BuildRequires:  doxygen
 

%description
This is libkate, the reference implementation of a codec for the Kate bitstream
format.
Kate is a karaoke and text codec meant for encapsulation in an Ogg container.
It can carry text, images, and animate them.

Kate is meant to be used for karaoke alongside audio/video streams (typically
Vorbis and Theora), movie subtitles, song lyrics, and anything that needs text
data at arbitrary time intervals.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libogg-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package utils
Summary:        Encoder/Decoder utilities for %{name}
Group:          Applications/Multimedia
Requires:       %{name} = %{version}-%{release}
Requires:       liboggz

%description utils
The %{name}-utils package contains the katedec/kateenc binaries for %{name}.


%prep
%setup -q
#Prevent conflict with GNU getline() in recent rawhide
%patch0 -p1 -b .noredef
#Remove shebangs
%patch1 -p1 -b .noshebangs

# We regenerate theses files at built step
rm tools/kate_parser.{c,h}
rm tools/kate_lexer.c


%build
%configure --disable-static \
  --docdir=%{_docdir}/%{name}-%{version}

# Remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Fix for header timestramps
touch -r $RPM_BUILD_ROOT%{_includedir}/kate/kate_config.h \
 $RPM_BUILD_ROOT%{_includedir}/kate/kate.h


%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%exclude %{_docdir}/libkate-%{version}/html
%doc %{_docdir}/libkate-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/
%doc %{_docdir}/libkate-%{version}/html
%{_includedir}/kate/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%files utils
%defattr(-,root,root,-)
%{python_sitelib}/kdj/
%{_bindir}/KateDJ
%{_bindir}/katalyzer
%{_bindir}/katedec
%{_bindir}/kateenc
%{_mandir}/man1/KateDJ.*
%{_mandir}/man1/katalyzer.*
%{_mandir}/man1/katedec.*
%{_mandir}/man1/kateenc.*


%changelog
* Fri Apr 10 2009 kwizart < kwizart at gmail.com > - 0.3.1-3
- Use Fedora compliant (using version) _docdir directory.
- Remove shebangs when not needed.
- Bundle examples within -devel
- Use global instead of define

* Sat Apr  4 2009 kwizart < kwizart at gmail.com > - 0.3.1-2
- Prevent conflict with GNU getline() in recent rawhide

* Tue Mar 17 2009 kwizart < kwizart at gmail.com > - 0.3.1-1
- Update to 0.3.1

* Tue Jan 13 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
- Update to 0.3.0
- Add KateDJ and katalyzer in -utils
- Add BR liboggz and -utils Requires liboggz

* Wed Nov 27 2008 kwizart < kwizart at gmail.com > - 0.2.7-1
- Update to 0.2.7

* Mon Oct 20 2008 kwizart < kwizart at gmail.com > - 0.2.5-1
- Update to 0.2.5

* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.2.1-1
- Update to 0.2.1

* Thu Sep 11 2008 kwizart < kwizart at gmail.com > - 0.1.12-1
- Update to 0.1.12

* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 0.1.11-1
- Update to 0.1.11

* Wed Sep  3 2008 kwizart < kwizart at gmail.com > - 0.1.10-1
- Update to 0.1.10

* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 0.1.9-1
- Update to 0.1.9

* Fri Aug 29 2008 kwizart < kwizart at gmail.com > - 0.1.8-1
- Update to 0.1.8

* Mon Aug 11 2008 kwizart < kwizart at gmail.com > - 0.1.7-1
- Initial spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:04:48 -0000	1.1
+++ .cvsignore	10 Apr 2009 23:11:01 -0000	1.2
@@ -0,0 +1 @@
+libkate-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:04:48 -0000	1.1
+++ sources	10 Apr 2009 23:11:02 -0000	1.2
@@ -0,0 +1 @@
+d94894c5b6f12c0a5fed34307a32bb9d  libkate-0.3.1.tar.gz



From kwizart at fedoraproject.org  Fri Apr 10 23:24:59 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 10 Apr 2009 23:24:59 +0000 (UTC)
Subject: rpms/libkate/F-9 import.log, NONE, 1.1 libkate-0.3.1-noredef.patch, 
	NONE, 1.1 libkate-0.3.1-python_no_shebang.patch, NONE,
	1.1 libkate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090410232459.A9D1370122@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libkate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28918/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libkate-0.3.1-noredef.patch 
	libkate-0.3.1-python_no_shebang.patch libkate.spec 
Log Message:
Initial import for F-9



--- NEW FILE import.log ---
libkate-0_3_1-3_fc11:F-9:libkate-0.3.1-3.fc11.src.rpm:1239405199

libkate-0.3.1-noredef.patch:

--- NEW FILE libkate-0.3.1-noredef.patch ---
diff -up libkate-0.3.1/tools/kate_parser.y.noredef libkate-0.3.1/tools/kate_parser.y
--- libkate-0.3.1/tools/kate_parser.y.noredef	2009-01-29 00:26:44.000000000 +0100
+++ libkate-0.3.1/tools/kate_parser.y	2009-04-04 00:59:29.000000000 +0200
@@ -1012,7 +1012,7 @@ static char *expand_numeric_entities(con
   return newtext;
 }
 
-static char *getline(const char **text)
+static char *getrawline(const char **text)
 {
   size_t rlen0;
   int newline,in_newline=0;
@@ -1020,7 +1020,7 @@ static char *getline(const char **text)
   int c;
 
   if (!text || !*text) {
-    yyerror("error: getline passed invalid text pointer");
+    yyerror("error: getrawline passed invalid text pointer");
     exit(-1);
   }
 
@@ -1126,7 +1126,7 @@ static char *trimtext(const char *text)
   char *newtext=(char*)kate_malloc(1);
   *newtext=0;
   while (text && *text) {
-    char *line=getline(&text);
+    char *line=getrawline(&text);
     char *trimmed=trimline(line);
     kate_free(line);
     if (*trimmed && strcmp(trimmed,"\n")) {

libkate-0.3.1-python_no_shebang.patch:

--- NEW FILE libkate-0.3.1-python_no_shebang.patch ---
diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py~ libkate-0.3.1/tools/KateDJ/kdj/constants.py
--- libkate-0.3.1/tools/KateDJ/kdj/constants.py~	2009-03-15 00:25:09.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py	2009-04-10 12:58:10.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 kdj_name='KateDJ'
 kdj_version='0.3.1'
 kdj_name_version=kdj_name+' '+kdj_version
diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in
--- libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in	2009-04-10 12:58:16.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 kdj_name='KateDJ'
 kdj_version='@VERSION@'
 kdj_name_version=kdj_name+' '+kdj_version
diff -up libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py
--- libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py	2009-04-10 12:57:35.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import tempfile
diff -up libkate-0.3.1/tools/KateDJ/kdj/finder.py~ libkate-0.3.1/tools/KateDJ/kdj/finder.py
--- libkate-0.3.1/tools/KateDJ/kdj/finder.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/finder.py	2009-04-10 12:57:20.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 
diff -up libkate-0.3.1/tools/KateDJ/kdj/muxer.py~ libkate-0.3.1/tools/KateDJ/kdj/muxer.py
--- libkate-0.3.1/tools/KateDJ/kdj/muxer.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/muxer.py	2009-04-10 12:57:16.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 
diff -up libkate-0.3.1/tools/KateDJ/kdj/options.py~ libkate-0.3.1/tools/KateDJ/kdj/options.py
--- libkate-0.3.1/tools/KateDJ/kdj/options.py~	2009-01-02 22:13:25.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/options.py	2009-04-10 12:57:07.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os
 
 class Options:
diff -up libkate-0.3.1/tools/KateDJ/kdj/tools.py~ libkate-0.3.1/tools/KateDJ/kdj/tools.py
--- libkate-0.3.1/tools/KateDJ/kdj/tools.py~	2009-01-29 00:43:20.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/tools.py	2009-04-10 12:57:27.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import subprocess
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py	2009-04-10 12:57:40.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import wx
 #import wx.py.editor as editor
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py	2009-04-10 12:57:47.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import os
 import wx
diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py
--- libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~	2009-01-02 19:58:46.000000000 +0100
+++ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py	2009-04-10 12:57:52.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import wx
 from constants import *


--- NEW FILE libkate.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           libkate
Version:        0.3.1
Release:        3%{?dist}
Summary:        Libraries to handle the Kate bitstream format

Group:          System Environment/Libraries
License:        BSD
URL:            http://code.google.com/p/libkate/
Source0:        http://libkate.googlecode.com/files/libkate-%{version}.tar.gz
Patch0:         libkate-0.3.1-noredef.patch
Patch1:         libkate-0.3.1-python_no_shebang.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  libogg-devel
BuildRequires:  liboggz
BuildRequires:  libpng-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  valgrind
BuildRequires:  doxygen
 

%description
This is libkate, the reference implementation of a codec for the Kate bitstream
format.
Kate is a karaoke and text codec meant for encapsulation in an Ogg container.
It can carry text, images, and animate them.

Kate is meant to be used for karaoke alongside audio/video streams (typically
Vorbis and Theora), movie subtitles, song lyrics, and anything that needs text
data at arbitrary time intervals.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libogg-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package utils
Summary:        Encoder/Decoder utilities for %{name}
Group:          Applications/Multimedia
Requires:       %{name} = %{version}-%{release}
Requires:       liboggz

%description utils
The %{name}-utils package contains the katedec/kateenc binaries for %{name}.


%prep
%setup -q
#Prevent conflict with GNU getline() in recent rawhide
%patch0 -p1 -b .noredef
#Remove shebangs
%patch1 -p1 -b .noshebangs

# We regenerate theses files at built step
rm tools/kate_parser.{c,h}
rm tools/kate_lexer.c


%build
%configure --disable-static \
  --docdir=%{_docdir}/%{name}-%{version}

# Remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Fix for header timestramps
touch -r $RPM_BUILD_ROOT%{_includedir}/kate/kate_config.h \
 $RPM_BUILD_ROOT%{_includedir}/kate/kate.h


%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%exclude %{_docdir}/libkate-%{version}/html
%doc %{_docdir}/libkate-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/
%doc %{_docdir}/libkate-%{version}/html
%{_includedir}/kate/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%files utils
%defattr(-,root,root,-)
%{python_sitelib}/kdj/
%{_bindir}/KateDJ
%{_bindir}/katalyzer
%{_bindir}/katedec
%{_bindir}/kateenc
%{_mandir}/man1/KateDJ.*
%{_mandir}/man1/katalyzer.*
%{_mandir}/man1/katedec.*
%{_mandir}/man1/kateenc.*


%changelog
* Fri Apr 10 2009 kwizart < kwizart at gmail.com > - 0.3.1-3
- Use Fedora compliant (using version) _docdir directory.
- Remove shebangs when not needed.
- Bundle examples within -devel
- Use global instead of define

* Sat Apr  4 2009 kwizart < kwizart at gmail.com > - 0.3.1-2
- Prevent conflict with GNU getline() in recent rawhide

* Tue Mar 17 2009 kwizart < kwizart at gmail.com > - 0.3.1-1
- Update to 0.3.1

* Tue Jan 13 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
- Update to 0.3.0
- Add KateDJ and katalyzer in -utils
- Add BR liboggz and -utils Requires liboggz

* Wed Nov 27 2008 kwizart < kwizart at gmail.com > - 0.2.7-1
- Update to 0.2.7

* Mon Oct 20 2008 kwizart < kwizart at gmail.com > - 0.2.5-1
- Update to 0.2.5

* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.2.1-1
- Update to 0.2.1

* Thu Sep 11 2008 kwizart < kwizart at gmail.com > - 0.1.12-1
- Update to 0.1.12

* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 0.1.11-1
- Update to 0.1.11

* Wed Sep  3 2008 kwizart < kwizart at gmail.com > - 0.1.10-1
- Update to 0.1.10

* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 0.1.9-1
- Update to 0.1.9

* Fri Aug 29 2008 kwizart < kwizart at gmail.com > - 0.1.8-1
- Update to 0.1.8

* Mon Aug 11 2008 kwizart < kwizart at gmail.com > - 0.1.7-1
- Initial spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:04:48 -0000	1.1
+++ .cvsignore	10 Apr 2009 23:24:27 -0000	1.2
@@ -0,0 +1 @@
+libkate-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:04:48 -0000	1.1
+++ sources	10 Apr 2009 23:24:28 -0000	1.2
@@ -0,0 +1 @@
+d94894c5b6f12c0a5fed34307a32bb9d  libkate-0.3.1.tar.gz



From pgordon at fedoraproject.org  Sat Apr 11 00:21:37 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sat, 11 Apr 2009 00:21:37 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkitgtk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090411002137.36AF270098@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8694

Modified Files:
	.cvsignore sources 
Added Files:
	webkitgtk.spec 
Log Message:
Initial commit, renamed from WebKit-gtk (review bug #490399) & updated to 1.1.4


--- NEW FILE webkitgtk.spec ---
## NOTE: Lots of files in various subdirectories have the same name (such as
## "LICENSE") so this short macro allows us to distinguish them by using their
## directory names (from the source tree) as prefixes for the files.
%define 	add_to_doc_files()	\
	mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \
	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')

## Optional build modifications...
## --with coverage: Enables compile-time checking of code coverage.
##	(Default: No)
##
## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
##	Also disables the optimized memory allocator.
##	(Default: No)
##
## --with jit: Enable JIT ("just-in-time") JavaScript compiling support.
## 	Only supported on ix86 at this time, according to upstream.
##	(Default: No)
##	
## --with pango: Use Pango instead of freetype2 as the font renderer.
##	CJK support is functional only with the freetype2 backend.
##	(Default: No - use freetype2)
##
## --with svg: Experimental SVG support (filters)
##	(Default: No) 
##
## --with wml: Build support for WML
##	(Default: No)

%bcond_with 	coverage
%bcond_with 	debug
%bcond_with 	jit
%bcond_with 	pango
%bcond_with 	svg
%bcond_with 	wml

Name:		webkitgtk
Version:	1.1.4
Release:	1%{?dist}
Summary:	GTK+ Web content engine library

Provides:	WebKit-gtk = %{version}-%{release}
Obsoletes:	WebKit-gtk < %{version}-%{release}

Group:		Development/Libraries
License:	LGPLv2+ and BSD
URL:		http://www.webkitgtk.org/

Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	bison
BuildRequires:	flex
BuildRequires:	geoclue-devel
BuildRequires:	gperf
BuildRequires:	gnome-keyring-devel
BuildRequires:	gstreamer-devel
BuildRequires:	gstreamer-plugins-base-devel
BuildRequires:	gtk2-devel
BuildRequires:	libsoup-devel >= 2.25.91
BuildRequires:	libicu-devel
BuildRequires:	libjpeg-devel
BuildRequires:	libtool
BuildRequires:	libxslt-devel
BuildRequires:	libXt-devel
BuildRequires:	pcre-devel
BuildRequires:	sqlite-devel

## Conditional dependencies...
%if %{with pango}
BuildRequires:	pango-devel
%else
BuildRequires:	cairo-devel
BuildRequires:	fontconfig-devel
BuildRequires:	freetype-devel
%endif

%description 
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
GTK+ platform.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig
Requires:	gtk2-devel
Provides:	WebKit-gtk-devel = %{version}-%{release}
Obsoletes:	WebKit-gtk-devel < %{version}-%{release}

%description	devel
The %{name}-devel package contains libraries, build data, and header
files for developing applications that use %{name}.


%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
Provides:	WebKit-doc = %{version}-%{release}
Obsoletes:	WebKit-doc < %{version}-%{release}

%description	doc
This package contains the documentation for %{name}, including various
LICENSE, README, and AUTHORS files.


%prep
%setup -qn "webkit-%{version}"


%build
%configure							\
			--enable-gnomekeyring			\
			--enable-geolocation			\
%{?with_coverage:	--enable-coverage		}	\
%{?with_debug:		--enable-debug			}	\
%{?with_jit:		--enable-jit			}	\
%{?with_pango:		--with-font-backend=pango	}	\
%{?with_svg:		--enable-svg-filters		}	\
%{?with_wml:		--enable-wml			}
	
make %{?_smp_mflags}

# workaround for bug 488112
# Compile libJavaScriptCore.a with -fno-strict-aliasing
touch JavaScriptCore/AllInOneFile.cpp
make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing"


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}

## Finally, copy over and rename the various files for %%doc inclusion.
%add_to_doc_files JavaScriptCore/icu/LICENSE
%add_to_doc_files WebKit/LICENSE
%add_to_doc_files WebCore/icu/LICENSE
%add_to_doc_files WebCore/LICENSE-APPLE
%add_to_doc_files WebCore/LICENSE-LGPL-2
%add_to_doc_files WebCore/LICENSE-LGPL-2.1

%add_to_doc_files JavaScriptCore/pcre/COPYING
%add_to_doc_files JavaScriptCore/COPYING.LIB

#add_to_doc_files JavaScriptCore/icu/README
#add_to_doc_files WebCore/icu/README

%add_to_doc_files JavaScriptCore/AUTHORS
%add_to_doc_files JavaScriptCore/pcre/AUTHORS   

%add_to_doc_files JavaScriptCore/THANKS


%clean
rm -rf %{buildroot}


%post	-p /sbin/ldconfig

%postun	-p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc
%exclude %{_libdir}/*.la
%{_bindir}/jsc
%{_libdir}/libwebkit-1.0.so.*
%{_libexecdir}/%{name}/

%files	devel
%defattr(-,root,root,-)
%{_datadir}/webkit-1.0
%{_includedir}/webkit-1.0
%{_libdir}/libwebkit-1.0.so
%{_libdir}/pkgconfig/webkit-1.0.pc

%files	doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/


%changelog
* Tue Apr 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.4-1
- Update to new upstream release (1.1.4)
- Enable building with geolocation support.
- Add build-time conditional for enabling code coverage checking (coverage).
- Remove html5video conditional and update dependencies accordingly. (HTML5
  video embedding support is now enabled by default by upstream.)

* Sun Mar 15 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.3-1
- Rename from WebKit-gtk and friends to WebKitGTK and subpackages.
- Update to new upstream release (1.1.3)
- Clean up the add_to_doc_files macro usage.

* Sat Mar 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.1-1
- Update to new upstream release (1.1.1), includes a soname bump.
- Enable gnome-keyring support.

* Wed Mar  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-0.21.svn41071
- Compile libJavaScriptCore.a with -fno-strict-aliasing to
  do workaround for #488112

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.20.svn41071
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Feb 20 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.19.svn41071
- Update to new upstream snapshot (SVN 41071).
- Drop libsoup build conditional. Use libsoup as default HTTP backend instead
  of cURL, following upstream's default.

* Fri Jan 30 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.18.svn40351
- Fix ownership of doc directory...this time without the oops (#473619).
- Bump package version number to match that used in the configure/build
  scripts. (Thanks to Martin Sourada for the bug report via email.)

* Thu Jan 29 2009 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.17.svn40351
- Update to new upstream snapshot (SVN 40351): adds the WebPolicyDelegate
  implementaton and related API (#482739).
- Drop Bison 2.4 patch (fixed upstream):
  - bison24.patch
- Fixes CVE-2008-6059: Sensitive information disclosure from cookies via
  XMLHttpRequest calls (#484197).

* Sat Nov 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.16.svn39370
- Update to new upstream snapshot (SVN 39370)
- Fix ownership of %%_docdir in the doc subpackage. 
- Resolves: bug 473619 (WebKit : Unowned directories).
- Adds webinspector data to the gtk-devel subpackage.
- Add patch from upstream bug 22205 to fix compilation errors with Bison 2.4:
  + bison24.patch
- Add build-time conditional for WML support.

* Thu Oct 23 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.15.svn37790
- Update to new upstream snapshot (SVN 37790).
- Default to freetype font backend for improved CJK/Unicode support. (#448693)
- Add some notes to the build options comments block.
- Add a build-time conditional for jit

* Sun Aug 24 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.14.svn35904
- Update to new upstream snapshot (SVN 35904)

* Fri Jul 04 2008 Peter Gordon <peter at thecodergeek.com>
- Remove outdated and unnecessary GCC 4.3 patch:
  - gcc43.patch
- Fix the curl-devel BuildRequire conditional. (It is only needed when building
  against curl instead of libsoup.)

* Thu Jun 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.13.svn34655
- Update to new upstream snapshot (SVN 34655)
- Add some build-time conditionals for non-default features: debug, 
  html5video, libsoup, pango, svg. 

* Tue Jun  3 2008 Caol??n McNamara <caolanm at redhat.com> - 1.0.0-0.12.svn34279
- rebuild for new icu

* Tue Jun  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-0.11.svn34279
- Update to new upstream snapshot (SVN 34279) anyway
- Add BR: libXt-devel

* Tue Apr 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.10.svn32531
- Remove the -Qt subpackage stuff. QtWebKit is now included in Qt proper, as
  of qt-4.4.0-0.6.rc1. (We no longer need separate build-qt and build-gtk
  subdirectories either.)
- Reference: bug 442200 (RFE: WebKit Migration)
- Add libjpeg dependency (was previously pulled in by the qt4-devel dependency
  tree).

* Mon Apr 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-0.9.svn32531
- Update to new upstream snapshot (SVN 32531).
- Fix bug 443048 and hopefully fix bug 444445
- Modify the process of building GTK+ port a bit
- on qt port WebKit/qt/Plugins is not built for qt >= 4.4.0

* Sat Apr 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.8.svn31787
- Update to new upstream snapshot (SVN 31787).
- Resolves: CVE-2008-1010 (bug 438532: Arbitrary code execution) and
  CVE-2008-1011 (bug 438531: Cross-Site Scripting).
- Switch to using autotools for building the GTK+ port.

* Wed Mar 05 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.7.svn30667
- Fix the WebKitGtk pkgconfig data (should depend on gtk+-2.0). Resolves
  bug 436073 (Requires: gtk+-2.0 missing from WebKitGtk.pc).
- Thanks to Mamoru Tasaka for helping find and squash these many bugs. 
  
* Sat Mar 01 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.6.svn30667
- Fix include directory naming. Resolves: bug 435561 (Header file <> header
  file location mismatch)
- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel.
  Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) 

* Fri Feb 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.5.svn30667
- Update to new upstream snapshot (SVN 30667)
- Add some build fixes for GCC 4.3:
  + gcc43.patch

* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-0.5.svn29336
- Autorebuild for GCC 4.3

* Wed Jan 09 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.4.svn29336
- Update to new upstream snapshot (SVN 29336).
- Drop TCSpinLock pthread workaround (fixed upstream):
  - TCSpinLock-use-pthread-stubs.patch

* Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.3.svn28482
- Add proper %%defattr line to qt, qt-devel, and doc subpackages.
- Add patch to forcibly build the TCSpinLock code using the pthread
  implementation:
  + TCSpinLock-use-pthread-stubs.patch

* Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.2.svn28482
- Package renamed from WebKitGtk.
- Update to SVN 28482.
- Build both the GTK and Qt ports, putting each into their own respective
  subpackages.
- Invoke qmake-qt4 and make directly (with SMP build flags) instead of using
  the build-webkit script from upstream.
- Add various AUTHORS, README, and LICENSE files (via the doc subpackage). 

* Tue Dec 04 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.1.svn28383
- Initial packaging for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:11:33 -0000	1.1
+++ .cvsignore	11 Apr 2009 00:21:05 -0000	1.2
@@ -0,0 +1 @@
+webkit-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:11:33 -0000	1.1
+++ sources	11 Apr 2009 00:21:05 -0000	1.2
@@ -0,0 +1 @@
+2c941eb9ad9e791fba9b57bf252e3f04  webkit-1.1.4.tar.gz



From mebourne at fedoraproject.org  Sat Apr 11 01:19:35 2009
From: mebourne at fedoraproject.org (Martin Ebourne)
Date: Sat, 11 Apr 2009 01:19:35 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder-1.24.1-noffmpeg.patch, NONE,
	1.1 zoneminder-1.24.1-gcc44.patch, 1.2, 1.3 zoneminder.spec,
	1.18, 1.19
Message-ID: <20090411011935.46C0570098@cvs1.fedora.phx.redhat.com>

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24167

Modified Files:
	zoneminder-1.24.1-gcc44.patch zoneminder.spec 
Added Files:
	zoneminder-1.24.1-noffmpeg.patch 
Log Message:
* Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-2
- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
- Added noffmpeg patch to make building outside mock easier


zoneminder-1.24.1-noffmpeg.patch:

--- NEW FILE zoneminder-1.24.1-noffmpeg.patch ---
--- configure.ac.noffmpeg	2009-04-11 02:15:30.000000000 +0100
+++ configure.ac	2009-04-11 02:15:52.000000000 +0100
@@ -245,10 +245,10 @@
 AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
 fi
 AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
+dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
 AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
 
 # Checks for header files.

zoneminder-1.24.1-gcc44.patch:

Index: zoneminder-1.24.1-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder-1.24.1-gcc44.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zoneminder-1.24.1-gcc44.patch	7 Apr 2009 20:51:58 -0000	1.2
+++ zoneminder-1.24.1-gcc44.patch	11 Apr 2009 01:19:33 -0000	1.3
@@ -10,3 +10,14 @@
  
  const std::string stringtf( const char *format, ... )
  {
+--- src/Makefile.am.frepo	2009-04-11 02:08:57.000000000 +0100
++++ src/Makefile.am	2009-04-11 02:09:07.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
+ AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
+-AM_CXXFLAGS = -frepo
++#AM_CXXFLAGS = -frepo
+ 
+ CLEANFILES = *.rpo
+ 


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- zoneminder.spec	21 Mar 2009 21:57:57 -0000	1.18
+++ zoneminder.spec	11 Apr 2009 01:19:34 -0000	1.19
@@ -4,7 +4,7 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.24.1
+Version: 	1.24.2
 Release: 	1%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
@@ -23,6 +23,7 @@
 Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
 Patch1: 	zoneminder-1.24.1-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
+Patch3:		zoneminder-1.24.1-noffmpeg.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 Patch11: 	zoneminder-1.24.1-gcc44.patch
 
@@ -67,6 +68,7 @@
 
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
+%patch3 -p0 -b .noffmpeg
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
@@ -193,6 +195,10 @@
 
 
 %changelog
+* Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
 * Sat Mar 21 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-1
 - Patch for gcc 4.4 compilation errors
 - Upgrade to 1.24.1



From mebourne at fedoraproject.org  Sat Apr 11 01:24:34 2009
From: mebourne at fedoraproject.org (Martin Ebourne)
Date: Sat, 11 Apr 2009 01:24:34 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder.spec,1.19,1.20
Message-ID: <20090411012434.70F1D70098@cvs1.fedora.phx.redhat.com>

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26644

Modified Files:
	zoneminder.spec 
Log Message:
Fix version/release typo.



Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zoneminder.spec	11 Apr 2009 01:19:34 -0000	1.19
+++ zoneminder.spec	11 Apr 2009 01:24:27 -0000	1.20
@@ -4,8 +4,8 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.24.2
-Release: 	1%{?dist}
+Version: 	1.24.1
+Release: 	2%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/



From mclasen at fedoraproject.org  Sat Apr 11 01:33:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 01:33:09 +0000 (UTC)
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.113,1.114
Message-ID: <20090411013309.42B2470098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29317

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
fix directory ownership



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- nautilus-cd-burner.spec	4 Mar 2009 19:10:03 -0000	1.113
+++ nautilus-cd-burner.spec	11 Apr 2009 01:32:38 -0000	1.114
@@ -12,7 +12,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.25.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
@@ -143,7 +143,8 @@
 %{_datadir}/nautilus-cd-burner
 %{_datadir}/applications/nautilus-cd-burner.desktop
 %{_datadir}/applications/nautilus-cd-burner-open-iso.desktop
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/*/apps/nautilus-cd-burner.png
+%{_datadir}/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
 
 %files libs
 %{_libdir}/lib*.so.*
@@ -157,6 +158,9 @@
 
 
 %changelog
+* Fri Apr 10 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-6
+- Fix directory ownership
+
 * Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
 - Remove stupid requires for the -libs sub package (#488433)
 



From mclasen at fedoraproject.org  Sat Apr 11 01:37:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 01:37:57 +0000 (UTC)
Subject: rpms/seahorse/devel seahorse.spec,1.68,1.69
Message-ID: <20090411013757.5840F70098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30424

Modified Files:
	seahorse.spec 
Log Message:
fix directory ownership



Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- seahorse.spec	16 Mar 2009 12:53:50 -0000	1.68
+++ seahorse.spec	11 Apr 2009 01:37:24 -0000	1.69
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -136,7 +136,8 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/apps/seahorse.png
+%{_datadir}/icons/hicolor/*/apps/seahorse-preferences.png
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*.gz
 %dir %{_libdir}/seahorse
@@ -154,6 +155,9 @@
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> 2.26.0-2
+- Fix directory ownership
+
 * Mon Mar 16 2009 Tomas Bzatek <tbzatek at redhat.com> 2.26.0-1
 - Update to 2.26.0
 



From deji at fedoraproject.org  Sat Apr 11 01:41:44 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sat, 11 Apr 2009 01:41:44 +0000 (UTC)
Subject: rpms/gnome-scan/devel import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 gnome-scan.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090411014144.21C4570098@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gnome-scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32005/devel

Modified Files:
	.cvsignore gnome-scan.spec sources 
Added Files:
	import.log 
Log Message:
Update to version 0.6.2


--- NEW FILE import.log ---
gnome-scan-0_6_2-1_fc11:HEAD:gnome-scan-0.6.2-1.fc11.src.rpm:1239413617


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jan 2009 03:33:15 -0000	1.6
+++ .cvsignore	11 Apr 2009 01:41:11 -0000	1.7
@@ -1 +1 @@
-gnome-scan-0.6.1.tar.bz2
+gnome-scan-0.6.2.tar.bz2


Index: gnome-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/gnome-scan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-scan.spec	24 Feb 2009 23:20:53 -0000	1.11
+++ gnome-scan.spec	11 Apr 2009 01:41:12 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Gnome solution for scanning in the desktop on top of libsane
 Name:		gnome-scan
-Version:	0.6.1
-Release:	2%{?dist}
+Version:	0.6.2
+Release:	1%{?dist}
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://home.gna.org/gnomescan/
@@ -108,6 +108,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-scan*/
 
 %changelog
+* Thu Apr 09 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
+- Update to version 0.6.2
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jan 2009 03:33:15 -0000	1.7
+++ sources	11 Apr 2009 01:41:12 -0000	1.8
@@ -1 +1 @@
-aac087c9c36b92cbd87063e6d7017fe4  gnome-scan-0.6.1.tar.bz2
+fa4057d772cb78dc6745eee2226a78f5  gnome-scan-0.6.2.tar.bz2



From deji at fedoraproject.org  Sat Apr 11 01:56:49 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sat, 11 Apr 2009 01:56:49 +0000 (UTC)
Subject: rpms/gnome-scan/F-10 import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 gnome-scan.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090411015649.A6A8170098@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gnome-scan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3873/F-10

Modified Files:
	.cvsignore gnome-scan.spec sources 
Added Files:
	import.log 
Log Message:
Update to version 0.6.2


--- NEW FILE import.log ---
gnome-scan-0_6_2-1_fc11:F-10:gnome-scan-0.6.2-1.fc11.src.rpm:1239414592


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Jan 2009 03:33:57 -0000	1.6
+++ .cvsignore	11 Apr 2009 01:56:18 -0000	1.7
@@ -1 +1 @@
-gnome-scan-0.6.1.tar.bz2
+gnome-scan-0.6.2.tar.bz2


Index: gnome-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/F-10/gnome-scan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-scan.spec	24 Jan 2009 03:33:57 -0000	1.9
+++ gnome-scan.spec	11 Apr 2009 01:56:18 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:	Gnome solution for scanning in the desktop on top of libsane
 Name:		gnome-scan
-Version:	0.6.1
+Version:	0.6.2
 Release:	1%{?dist}
 Group:		Applications/System
 License:	LGPLv2+
@@ -11,7 +11,7 @@
 BuildRequires:	gegl-devel gimp-devel
 BuildRequires:	gettext perl(XML::Parser) pkgconfig intltool
 BuildRequires:	desktop-file-utils gtk-doc gnome-doc-utils
-Requires:	gimp, gegl >= 0.0.22
+Requires:	gimp
 Provides:	flegita = %{version}-%{release}
 Provides:	gnomescan = %{version}-%{release}
 Obsoletes:	gnomescan < 0.5
@@ -108,7 +108,13 @@
 %doc %{_datadir}/gtk-doc/html/gnome-scan*/
 
 %changelog
-* Fri Jan 23 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
+* Thu Apr 09 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
+- Update to version 0.6.2
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
 - Update to version 0.6.1
 
 * Thu Mar 13 2008 Deji Akingunola <dakingun at gmail.com> - 0.6-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2009 03:33:57 -0000	1.7
+++ sources	11 Apr 2009 01:56:19 -0000	1.8
@@ -1 +1 @@
-aac087c9c36b92cbd87063e6d7017fe4  gnome-scan-0.6.1.tar.bz2
+fa4057d772cb78dc6745eee2226a78f5  gnome-scan-0.6.2.tar.bz2



From ausil at fedoraproject.org  Sat Apr 11 01:57:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 11 Apr 2009 01:57:20 +0000 (UTC)
Subject: rpms/mesa/devel mesa-7.5-sparc64.patch, NONE, 1.1 mesa.spec, 1.240, 
	1.241
Message-ID: <20090411015720.F05CD70098@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3993

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.5-sparc64.patch 
Log Message:
fix sparc64 asm


mesa-7.5-sparc64.patch:

--- NEW FILE mesa-7.5-sparc64.patch ---
--- mesa-20090322/src/mesa/sparc/xform.S.BAD	2009-04-10 17:19:53.000000000 -0500
+++ mesa-20090322/src/mesa/sparc/xform.S	2009-04-10 17:20:57.000000000 -0500
@@ -17,7 +17,7 @@
 
 #include "sparc_matrix.h"
 
-#if defined(SVR4) || defined(__SVR4) || defined(__svr4__)
+#if defined(SVR4) || defined(__SVR4) || defined(__svr4__) || defined(__arch64__)
 	/* Solaris requires this for 64-bit. */
         .register %g2, #scratch
         .register %g3, #scratch


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- mesa.spec	7 Apr 2009 08:57:01 -0000	1.240
+++ mesa.spec	11 Apr 2009 01:56:50 -0000	1.241
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -46,6 +46,7 @@
 Patch9: intel-revert-vbl.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
+Patch13: mesa-7.5-sparc64.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -173,6 +174,7 @@
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
+%patch13 -p1 -b .sparc64
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -429,6 +431,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Fri Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 7.5-0.9
+- fix sparc64 asm 
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 7.5-0.8
 - radeon: fix gnome-shell startup
 



From mclasen at fedoraproject.org  Sat Apr 11 02:05:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 02:05:37 +0000 (UTC)
Subject: rpms/gthumb/devel gthumb.spec,1.100,1.101
Message-ID: <20090411020537.29FD070098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6110

Modified Files:
	gthumb.spec 
Log Message:
fix directory ownership



Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gthumb.spec	28 Mar 2009 03:42:04 -0000	1.100
+++ gthumb.spec	11 Apr 2009 02:05:06 -0000	1.101
@@ -11,7 +11,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
@@ -138,9 +138,12 @@
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/48x48/apps/gthumb.png
 
 %changelog
+* Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-3
+- Fix directory ownership
+
 * Fri Mar 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-2
 - Fix the photo import location (#492179)
 



From pkgdb at fedoraproject.org  Sat Apr 11 02:15:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:15:58 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchbugzilla
Message-ID: <20090411021456.3E5FE10F862@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchbugzilla acl on mediawiki-SpecialInterwiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:00 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchcommits
Message-ID: <20090411021458.B0FB710F872@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchcommits acl on mediawiki-SpecialInterwiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:15:00 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested commit
Message-ID: <20090411021501.0022010F876@bastion2.fedora.phx.redhat.com>

jstanley has requested the commit acl on mediawiki-SpecialInterwiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:16 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchcommits
Message-ID: <20090411021513.044BC10F877@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchcommits acl on mediawiki-SpecialInterwiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:23 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchbugzilla
Message-ID: <20090411021521.A454F10F870@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchbugzilla acl on mediawiki-SpecialInterwiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:15:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:15:23 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested commit
Message-ID: <20090411021524.B656810F879@bastion2.fedora.phx.redhat.com>

jstanley has requested the commit acl on mediawiki-SpecialInterwiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:35 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchbugzilla
Message-ID: <20090411021532.2220D10F875@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchbugzilla acl on mediawiki-SpecialInterwiki (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:37 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchcommits
Message-ID: <20090411021535.0C84910F87B@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchcommits acl on mediawiki-SpecialInterwiki (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:41 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested commit
Message-ID: <20090411021537.A7FB910F87D@bastion2.fedora.phx.redhat.com>

jstanley has requested the commit acl on mediawiki-SpecialInterwiki (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:46 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchbugzilla
Message-ID: <20090411021545.3CAC710F877@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchbugzilla acl on mediawiki-SpecialInterwiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:15:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:15:46 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchcommits
Message-ID: <20090411021548.3E0EB10F880@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchcommits acl on mediawiki-SpecialInterwiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:53 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested commit
Message-ID: <20090411021549.2DE7C10F883@bastion2.fedora.phx.redhat.com>

jstanley has requested the commit acl on mediawiki-SpecialInterwiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:17:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:17:01 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchbugzilla
Message-ID: <20090411021559.7478A10F875@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchbugzilla acl on mediawiki-SpecialInterwiki (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:16:01 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested
	watchcommits
Message-ID: <20090411021602.696D910F87B@bastion2.fedora.phx.redhat.com>

jstanley has requested the watchcommits acl on mediawiki-SpecialInterwiki (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From pkgdb at fedoraproject.org  Sat Apr 11 02:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 02:17:08 +0000
Subject: [pkgdb] mediawiki-SpecialInterwiki: jstanley has requested commit
Message-ID: <20090411021604.496EE10F885@bastion2.fedora.phx.redhat.com>

jstanley has requested the commit acl on mediawiki-SpecialInterwiki (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-SpecialInterwiki



From deji at fedoraproject.org  Sat Apr 11 02:16:29 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sat, 11 Apr 2009 02:16:29 +0000 (UTC)
Subject: rpms/tracker/devel import.log, NONE, 1.1 .cvsignore, 1.15,
	1.16 sources, 1.15, 1.16 tracker.spec, 1.49, 1.50
Message-ID: <20090411021629.C3D4670098@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9240/devel

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	import.log 
Log Message:
Update to version 0.6.93


--- NEW FILE import.log ---
tracker-0_6_93-1_fc11:HEAD:tracker-0.6.93-1.fc11.src.rpm:1239415821


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Mar 2009 00:35:11 -0000	1.15
+++ .cvsignore	11 Apr 2009 02:15:59 -0000	1.16
@@ -1 +1 @@
-tracker-0.6.92.tar.bz2
+tracker-0.6.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tracker/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Mar 2009 00:35:11 -0000	1.15
+++ sources	11 Apr 2009 02:15:59 -0000	1.16
@@ -1 +1 @@
-df843d3ef338baf6c91e252db3273533  tracker-0.6.92.tar.bz2
+768059a486ff73ae18595afab3b78a70  tracker-0.6.93.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- tracker.spec	29 Mar 2009 00:35:11 -0000	1.49
+++ tracker.spec	11 Apr 2009 02:15:59 -0000	1.50
@@ -1,6 +1,6 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.92
+Version:	0.6.93
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -12,7 +12,7 @@
 BuildRequires:	gmime-devel, poppler-glib-devel, evolution-devel
 BuildRequires:	gnome-desktop-devel, gamin-devel, libnotify-devel
 BuildRequires:	totem-pl-parser-devel, libgsf-devel, gstreamer-devel
-BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gstreamer-plugins-base-devel libvorbis-devel
 BuildRequires:	libjpeg-devel, libexif-devel, exempi-devel, raptor-devel
 BuildRequires:	libiptcdata-devel
 BuildRequires:	desktop-file-utils, intltool, gettext, deskbar-applet
@@ -72,7 +72,7 @@
 
 %build
 %configure --disable-static --enable-deskbar-applet=%{deskbar_type}	\
-		--enable-external-qdbm
+		--enable-external-qdbm --enable-libvorbis
 # Disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -154,6 +154,9 @@
 %{_sysconfdir}/xdg/autostart/tracker-applet.desktop
 
 %changelog
+* Thu Apr 09 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.93-1
+- Update to 0.6.93 release
+
 * Fri Mar 28 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.92-1
 - Update to 0.6.92 release
 



From mclasen at fedoraproject.org  Sat Apr 11 02:19:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 02:19:53 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec,1.8,1.9
Message-ID: <20090411021953.C00D470098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9699

Modified Files:
	gnome-disk-utility.spec 
Log Message:
fix directory ownership



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-disk-utility.spec	8 Apr 2009 16:11:38 -0000	1.8
+++ gnome-disk-utility.spec	11 Apr 2009 02:19:23 -0000	1.9
@@ -12,7 +12,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.3
-Release: 0.2.20090406git%{?dist}
+Release: 0.3.20090406git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -168,7 +168,8 @@
 
 # Yes, it's a bit weird to include icons in the non-UI package but the
 # library returns references to these icons
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %files ui-libs
 %defattr(-,root,root,-)
@@ -199,6 +200,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 0.3-0.3.20090406git%{?dist}
+- Don't own directories that belong to hicolor-icon-theme
+
 * Wed Apr 08 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.2.20090406git%{?dist}
 - Fix bug in detecting when a PolicyKit error is returned (#494787)
 



From mclasen at fedoraproject.org  Sat Apr 11 02:30:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 02:30:45 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.377,1.378
Message-ID: <20090411023045.A557570098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13240

Modified Files:
	evolution.spec 
Log Message:
fix directory ownership



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- evolution.spec	2 Apr 2009 16:05:11 -0000	1.377
+++ evolution.spec	11 Apr 2009 02:30:14 -0000	1.378
@@ -24,7 +24,7 @@
 %define libnotify_support 1
 %define krb5_support 1
 %define nntp_support 1
-%ifnarch s390 s390x 
+%ifnarch s390 s390x
 %define nm_support 1
 %else
 %define nm_support 0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -437,12 +437,12 @@
 %{_datadir}/applications/evolution.desktop
 
 # Icons:
-%{_datadir}/icons/hicolor/16x16/apps/
-%{_datadir}/icons/hicolor/22x22/apps/
-%{_datadir}/icons/hicolor/24x24/apps/
-%{_datadir}/icons/hicolor/32x32/apps/
-%{_datadir}/icons/hicolor/48x48/apps/
-%{_datadir}/icons/hicolor/scalable/apps/
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 
 # IDL files (should this be in devel subpackage?)
 %{_datadir}/idl/evolution-%{evo_major}
@@ -691,6 +691,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Fro Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3.fc11
+- Fix directory ownership
+
 * Thu Apr 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
 - Require libpst.
 



From mclasen at fedoraproject.org  Sat Apr 11 02:37:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 02:37:20 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.378,1.379
Message-ID: <20090411023721.9F92070098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14452

Modified Files:
	evolution.spec 
Log Message:
fix spec



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- evolution.spec	11 Apr 2009 02:30:14 -0000	1.378
+++ evolution.spec	11 Apr 2009 02:36:46 -0000	1.379
@@ -691,7 +691,7 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
-* Fro Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3.fc11
+* Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3.fc11
 - Fix directory ownership
 
 * Thu Apr 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11



From jstanley at fedoraproject.org  Sat Apr 11 02:59:30 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sat, 11 Apr 2009 02:59:30 +0000 (UTC)
Subject: rpms/mediawiki-SpecialInterwiki/EL-5 .cvsignore, 1.1,
	1.2 mediawiki-SpecialInterwiki.spec, 1.2, 1.3 sources, 1.1,
	1.2 SpecialInterwiki.i18n.php, 1.1, NONE SpecialInterwiki.php,
	1.1, NONE
Message-ID: <20090411025930.E1E2B70098@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20513

Modified Files:
	.cvsignore mediawiki-SpecialInterwiki.spec sources 
Removed Files:
	SpecialInterwiki.i18n.php SpecialInterwiki.php 
Log Message:
Packagaing changes and upgrade to latest trunk



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jun 2008 15:49:29 -0000	1.1
+++ .cvsignore	11 Apr 2009 02:58:59 -0000	1.2
@@ -0,0 +1 @@
+SpecialInterwiki-svn49252.tar.gz


Index: mediawiki-SpecialInterwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/EL-5/mediawiki-SpecialInterwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mediawiki-SpecialInterwiki.spec	21 Jun 2008 23:34:54 -0000	1.2
+++ mediawiki-SpecialInterwiki.spec	11 Apr 2009 02:58:59 -0000	1.3
@@ -1,31 +1,34 @@
+%define        svn_rev 49252
+
 Name:           mediawiki-SpecialInterwiki
 Version:        0
-Release:        0.3.20080606svn%{?dist}
+Release:        0.4.svn%{svn_rev}%{?dist}
 Summary:        An extension to provide an interwiki management system
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.mediawiki.org/wiki/Extension:SpecialInterwiki
-# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki.php?revision=28499
-Source0:        SpecialInterwiki.php
-# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Interwiki/SpecialInterwiki.i18n.php?revision=29241
-Source1:        SpecialInterwiki.i18n.php
+# svn export -r%{svn_rev} interwiki && tar -czvf SpecialInterwiki-svn%{svn_rev}.tar.gz interwiki
+Source0:        SpecialInterwiki-svn%{svn_rev}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       mediawiki < 1.11
+Requires:       mediawiki >= 1.11
 
 %description
 Interwiki management extension allowing the viewing and management of InterWiki
 links for Mediawiki preventing the need for direct database access.
 
+%prep
+%setup -n interwiki
+
 %build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
-install -cpm 644 %{SOURCE0} %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
+install -cpm 644 * $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/SpecialInterwiki
 
 
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -45,6 +48,12 @@
 %doc %{_docdir}/%{name}-%{version}/README.fedora
 
 %changelog
+* Fri Apr 10 2998 Jon Stanley <jonstanley at gmail.com> - 0.0.4.svn49242
+- Fix upgrade path
+
+* Mon Apr 6 2009 Jon Stanley <jonstanley at gmail.com> - 0-0.1.20090406.svn
+- Packaging changes and update to latest trunk
+
 * Tue Jun 10 2008 Nigel Jones <dev at nigelj.com> - 0-0.3.20080606svn
 - Do away with the prep section
 
@@ -53,3 +62,4 @@
 
 * Fri Jun 06 2008 Nigel Jones <dev at nigelj.com> - 0-0.1.20080606svn
 - Initial package build.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-SpecialInterwiki/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jun 2008 15:49:29 -0000	1.1
+++ sources	11 Apr 2009 02:58:59 -0000	1.2
@@ -0,0 +1 @@
+71ffad28be3bc66e07b714ab467be6fd  SpecialInterwiki-svn49252.tar.gz


--- SpecialInterwiki.i18n.php DELETED ---


--- SpecialInterwiki.php DELETED ---



From peter at fedoraproject.org  Sat Apr 11 03:23:29 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 11 Apr 2009 03:23:29 +0000 (UTC)
Subject: rpms/sems/devel import.log, NONE, 1.1 sems--external_gsm_lib.diff, 
	NONE, 1.1 sems--flite-hardcoded-path-removal.diff, NONE,
	1.1 sems--py_sources_install.diff, NONE,
	1.1 sems--xmlrpc++-use_fedora_cxxflags.diff, NONE, 1.1 sems.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411032329.3DF1970098@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26060/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff 
	sems--py_sources_install.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff sems.spec 
Log Message:
initial import


--- NEW FILE import.log ---
sems-1_1_0-5_fc10:HEAD:sems-1.1.0-5.fc10.src.rpm:1239420130

sems--external_gsm_lib.diff:

--- NEW FILE sems--external_gsm_lib.diff ---
--- core/plug-in/gsm/gsm.c~	2008-02-10 21:52:44.000000000 +0300
+++ core/plug-in/gsm/gsm.c	2008-08-13 13:25:17.000000000 +0400
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include "gsm.h"
 #include "../../log.h"
 
 #include <stdlib.h>
--- core/plug-in/gsm/Makefile~	2007-01-18 23:35:32.000000000 +0300
+++ core/plug-in/gsm/Makefile	2008-08-13 14:17:41.000000000 +0400
@@ -3,17 +3,14 @@
 plug_in_name = gsm
 
 module_ldflags = 
-module_cflags  = -I gsm-1.0-pl10/inc -DHAS_STDLIB_H
+module_cflags  = -DHAS_STDLIB_H
 
-module_extra_objs = gsm-1.0-pl10/lib/libgsm.a
+module_extra_objs = -lgsm
 
 extra_clean = clean_gsmlib
 
 include ../Makefile.audio_module
 
-gsm-1.0-pl10/lib/libgsm.a::
-	cd gsm-1.0-pl10; $(MAKE) ./lib/libgsm.a
-
 .PHONY: clean_gsmlib
 clean_gsmlib:
 	cd gsm-1.0-pl10; $(MAKE) clean

sems--flite-hardcoded-path-removal.diff:

--- NEW FILE sems--flite-hardcoded-path-removal.diff ---
--- apps/py_sems/Makefile~	2008-04-23 22:15:21.000000000 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:48:00.725992047 +0400
@@ -21,15 +21,12 @@
 #   flite text to speech
 #
 # uncomment the next lines if you want to have flite text-to-speech (ivr.say("Hello there"); ) 
-FLITE_DIR = /usr/src/flite-1.2-release
 ALT_FLITE_DIR = /usr/include/flite
-PY_SEMS_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+PY_SEMS_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-PY_SEMS_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
+PY_SEMS_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 # On FreeBSD, remove the following flags: -ldl -lpthread 
 module_ldflags = -ldl -lpthread -lutil -lm \
 	$(PYTHON_module_ldflags) \
--- apps/ivr/Makefile~	2008-04-13 15:51:02.000000000 +0400
+++ apps/ivr/Makefile	2009-04-07 23:50:55.087991178 +0400
@@ -25,16 +25,14 @@
 #
 #   flite text to speech
 #
-IVR_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+IVR_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-IVR_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
+IVR_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
 else
 FLITE_DIR = 
 ALT_FLITE_DIR =
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 module_ldflags = -lutil \
 	$(PYTHON_module_ldflags) \
 	$(IVR_TTS_module_ldflags)

sems--py_sources_install.diff:

--- NEW FILE sems--py_sources_install.diff ---
--- apps/py_sems/Makefile~	2009-04-07 23:48:00.725992047 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:52:09.909991935 +0400
@@ -81,7 +81,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile~	2009-04-08 08:30:00.788685533 +0400
+++ apps/ivr/Makefile	2009-04-08 08:31:48.349687025 +0400
@@ -92,7 +92,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in  $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile.ivr_application~	2008-08-20 17:23:41.000000000 +0400
+++ apps/ivr/Makefile.ivr_application	2009-04-08 08:32:38.509685952 +0400
@@ -41,8 +41,10 @@
 .PHONY: install
 install: all $(extra_install)
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
+	install -m ${LIB_PERMISSIONS}  *.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -m ${LIB_PERMISSIONS}  *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
+	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 
 .PHONY: install-cfg

sems--xmlrpc++-use_fedora_cxxflags.diff:

--- NEW FILE sems--xmlrpc++-use_fedora_cxxflags.diff ---
--- apps/xmlrpc2di/xmlrpc++/Makefile~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/Makefile	2009-04-08 11:52:21.235663373 +0400
@@ -6,7 +6,7 @@
 DEBUG		= -g
 OPTIMIZE	= -O2
 GCCWARN		= -Wall #-Wstrict-prototypes
-CXXFLAGS	= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
+EXTRA_CXXFLAGS	?= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
 VERSION		= 0.8
 
 DESTDIR		=
@@ -43,7 +43,7 @@
 
 
 tests:		$(LIB)
-		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
+		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(EXTRA_CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
 
 doc doxygen:
 		cd src && doxygen Doxyfile


--- NEW FILE sems.spec ---
Summary:	SIP Express Media Server, an extensible SIP media server
Name:		sems
Version:	1.1.0
Release:	5%{?dist}
URL:		http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
License:	GPLv2+
Group:		Applications/Communications
# Use external gsm instead of shipped one
Patch2:		sems--external_gsm_lib.diff
# Remove hardcoded path to search for flite includes
Patch3:		sems--flite-hardcoded-path-removal.diff
# install also *.py (not only *.pyc) files
Patch4:		sems--py_sources_install.diff
# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires:	python >= 2.3
BuildRequires:	python
BuildRequires:	sip-devel
BuildRequires:	libsamplerate-devel
BuildRequires:	gsm-devel
BuildRequires:	spandsp-devel
# TODO consider enabling flite support in apps/conference
BuildRequires:	flite-devel
BuildRequires:	speex-devel
BuildRequires:	mISDN-devel
BuildRequires:	openssl-devel
Requires(post):	/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service

%description
SEMS (SIP Express Media Server) is very extensible and programmable
SIP media server for SER or OpenSER. The plug-in based SDK enables
you to extend SEMS and write your own applications and integrate new
codec. Voicemail, announcement and echo plug-ins are already included.
SEMS supports g711u, g711a, GSM06.10 and wav file.

%package	conf_auth
Summary:	Conference with authorization
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	conf_auth
Conference with authorization by PIN-numbers.

%package	diameter_client
Summary:	A simple DIAMETER client implementation
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	diameter_client
This is a very simple DIAMETER client implementation. it does
implement only parts of the base protocol, and is not a complete
DIAMETER implementation.

It is used from other modules with the DI API - i.e. other modules
can execute DI functions to add a server connection, or send a
DIAMETER request.

%package	g722
Summary:	G.722 support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	g722
This is a wrapper around the g722 codec from the spandsp library.

%package	gateway
Summary:	ISDN gateway for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gateway
ISDN gateway for SEMS.

%package	gsm
Summary:	GSM support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gsm
GSM support for SEMS.

%package	ivr
Summary:	IVR functionality for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	ivr
IVR functionality for SEMS.

%package	mailbox
Summary:	Mailbox application
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	mailbox
The mailbox application is a mailbox where callers can leave messages
for offline or unavailable users and the users can dial in to check their
messages. It uses an IMAP server as backend to store the voice messages.

%package	pin_collect
Summary:	Collects a PIN
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	pin_collect
This application collects a PIN and then transfers using a
(proprietary) REFER the call.

%package	python
Summary:	Python bindings for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	python
Python bindings for SEMS.

%package	speex
Summary:	Speex support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	speex
Speex support for SEMS.

%package	xmlrpc2di
Summary:	XMLRPC interface for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	xmlrpc2di
This module makes the Dynamic Invocation (DI) Interfaces exported
by component modules accessible from XMLRPC. Additionally the builtin
methods calls, get_loglevel and set_loglevel are implemented (like in the
stats UDP server). Additionally, it can be used as client to access
XMLRPC servers.

%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch2 -p0 -b .gsm_ext
%patch3 -p0 -b .flite_hardcoded
%patch4 -p0 -b .py_install_also
%patch5 -p0 -b .cxxflags

iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt

%build
make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all

%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS="$RPM_OPT_FLAGS"
make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
	DESTDIR=$RPM_BUILD_ROOT \
	basedir= \
	prefix=%{_prefix} \
	modules-prefix= \
	modules-dir=%{_libdir}/%{name}/plug-in \
	modules-target=%{_libdir}/%{name}/plug-in \
	lib-prefix= \
	lib-dir=%{_libdir}/%{name}/ \
	lib-target=%{_libdir}/%{name}/ \
	ivr-modules-dir=%{_libdir}/%{name}/ivr \
	cfg-prefix= \
	cfg-target=%{_sysconfdir}/%{name}/ \
	doc-prefix= \
	doc-dir=%{_docdir}/%{name}/ \
	audio-prefix= \
	audio-dir=%{_datadir}/%{name}/audio/ \
	audio-target=%{_datadir}/%{name}/audio/

install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}

# Remove installed README
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default

# remove currently empty conf-file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf

# fix permissions
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]; then
	/sbin/chkconfig --add sems || :
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service sems stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del sems || :
fi

%files
%defattr(-,root,root)

%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/audio
%dir %{_datadir}/%{name}/audio/ann_b2b
%dir %{_datadir}/%{name}/audio/announcement
%dir %{_datadir}/%{name}/audio/announce_transfer
%dir %{_datadir}/%{name}/audio/annrecorder
%dir %{_datadir}/%{name}/audio/conference
%dir %{_datadir}/%{name}/audio/voicebox
%dir %{_datadir}/%{name}/audio/voicemail
%dir %{_datadir}/%{name}/audio/webconference
%dir %{_libdir}/%{name}/dsm
%dir %{_libdir}/%{name}/plug-in

%{_sysconfdir}/init.d/%{name}

%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/ann_b2b.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announce_transfer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf

%doc README
%doc apps/dsm/doc/Readme.dsm.txt
%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
%doc apps/dsm/fsmc/Readme.fsmc.txt
%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
%doc core/plug-in/adpcm/README_G711
%doc core/plug-in/stats/README.stats
%doc doc/figures
%doc doc/CHANGELOG
%doc doc/COPYING
%doc doc/Configure-Sems-OpenSER-HOWTO
%doc doc/Configure-Sems-Ser-HOWTO
%doc doc/Readme.ann_b2b
%doc doc/Readme.announce_transfer
%doc doc/Readme.announcement
%doc doc/Readme.annrecorder
%doc doc/Readme.auth_b2b
%doc doc/Readme.call_timer
%doc doc/Readme.callback
%doc doc/Readme.click2dial
%doc doc/Readme.conf_auth
%doc doc/Readme.conference
%doc doc/Readme.early_announce
%doc doc/Readme.echo
%if 0%{?with_ilbc}
%doc doc/Readme.iLBC
%endif
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin
%endif
%doc doc/Readme.msg_storage
%doc doc/Readme.reg_agent
%doc doc/Readme.registrar_client
%doc doc/Readme.sw_prepaid_sip
%doc doc/Readme.uac_auth
%doc doc/Readme.voicebox
%doc doc/Readme.voicemail
%doc doc/Readme.webconference
%doc doc/WHATSNEW_0.10

%{_sbindir}/%{name}
%{_sbindir}/%{name}-stats

%{_datadir}/%{name}/audio/beep.wav
%{_datadir}/%{name}/audio/default_en.wav
%{_datadir}/%{name}/audio/annrecorder/beep.wav
%{_datadir}/%{name}/audio/annrecorder/bye.wav
%{_datadir}/%{name}/audio/annrecorder/confirm.wav
%{_datadir}/%{name}/audio/annrecorder/greeting_set.wav
%{_datadir}/%{name}/audio/annrecorder/to_record.wav
%{_datadir}/%{name}/audio/annrecorder/welcome.wav
%{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
%{_datadir}/%{name}/audio/conference/beep.wav
%{_datadir}/%{name}/audio/conference/first_participant.wav
%{_datadir}/%{name}/audio/voicebox/0.wav
%{_datadir}/%{name}/audio/voicebox/1.wav
%{_datadir}/%{name}/audio/voicebox/10.wav
%{_datadir}/%{name}/audio/voicebox/11.wav
%{_datadir}/%{name}/audio/voicebox/12.wav
%{_datadir}/%{name}/audio/voicebox/13.wav
%{_datadir}/%{name}/audio/voicebox/14.wav
%{_datadir}/%{name}/audio/voicebox/15.wav
%{_datadir}/%{name}/audio/voicebox/16.wav
%{_datadir}/%{name}/audio/voicebox/17.wav
%{_datadir}/%{name}/audio/voicebox/18.wav
%{_datadir}/%{name}/audio/voicebox/19.wav
%{_datadir}/%{name}/audio/voicebox/2.wav
%{_datadir}/%{name}/audio/voicebox/20.wav
%{_datadir}/%{name}/audio/voicebox/3.wav
%{_datadir}/%{name}/audio/voicebox/30.wav
%{_datadir}/%{name}/audio/voicebox/4.wav
%{_datadir}/%{name}/audio/voicebox/40.wav
%{_datadir}/%{name}/audio/voicebox/5.wav
%{_datadir}/%{name}/audio/voicebox/50.wav
%{_datadir}/%{name}/audio/voicebox/6.wav
%{_datadir}/%{name}/audio/voicebox/60.wav
%{_datadir}/%{name}/audio/voicebox/7.wav
%{_datadir}/%{name}/audio/voicebox/70.wav
%{_datadir}/%{name}/audio/voicebox/8.wav
%{_datadir}/%{name}/audio/voicebox/80.wav
%{_datadir}/%{name}/audio/voicebox/9.wav
%{_datadir}/%{name}/audio/voicebox/90.wav
%{_datadir}/%{name}/audio/voicebox/and.wav
%{_datadir}/%{name}/audio/voicebox/bye.wav
%{_datadir}/%{name}/audio/voicebox/first_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/first_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/in_your_voicebox.wav
%{_datadir}/%{name}/audio/voicebox/msg_deleted.wav
%{_datadir}/%{name}/audio/voicebox/msg_end_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_saved.wav
%{_datadir}/%{name}/audio/voicebox/new_msg.wav
%{_datadir}/%{name}/audio/voicebox/new_msgs.wav
%{_datadir}/%{name}/audio/voicebox/next_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/next_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_more_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_msg.wav
%{_datadir}/%{name}/audio/voicebox/pin_prompt.wav
%{_datadir}/%{name}/audio/voicebox/saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/saved_msgs.wav
%{_datadir}/%{name}/audio/voicebox/x1.wav
%{_datadir}/%{name}/audio/voicebox/x2.wav
%{_datadir}/%{name}/audio/voicebox/x3.wav
%{_datadir}/%{name}/audio/voicebox/x4.wav
%{_datadir}/%{name}/audio/voicebox/x5.wav
%{_datadir}/%{name}/audio/voicebox/x6.wav
%{_datadir}/%{name}/audio/voicebox/x7.wav
%{_datadir}/%{name}/audio/voicebox/x8.wav
%{_datadir}/%{name}/audio/voicebox/x9.wav
%{_datadir}/%{name}/audio/voicebox/you_have.wav
%{_datadir}/%{name}/audio/voicemail/default_en.wav
%{_datadir}/%{name}/audio/voicemail/beep.wav
%{_datadir}/%{name}/audio/webconference/0.wav
%{_datadir}/%{name}/audio/webconference/1.wav
%{_datadir}/%{name}/audio/webconference/2.wav
%{_datadir}/%{name}/audio/webconference/3.wav
%{_datadir}/%{name}/audio/webconference/4.wav
%{_datadir}/%{name}/audio/webconference/5.wav
%{_datadir}/%{name}/audio/webconference/6.wav
%{_datadir}/%{name}/audio/webconference/7.wav
%{_datadir}/%{name}/audio/webconference/8.wav
%{_datadir}/%{name}/audio/webconference/9.wav
%{_datadir}/%{name}/audio/webconference/beep.wav
%{_datadir}/%{name}/audio/webconference/entering_conference.wav
%{_datadir}/%{name}/audio/webconference/first_participant.wav
%{_datadir}/%{name}/audio/webconference/pin_prompt.wav
%{_datadir}/%{name}/audio/webconference/wrong_pin.wav

%{_libdir}/%{name}/dsm/mod_dlg.so
%{_libdir}/%{name}/dsm/mod_sys.so
%{_libdir}/%{name}/dsm/mod_uri.so
%{_libdir}/%{name}/dsm/inbound_call.dsm
%{_libdir}/%{name}/dsm/outbound_call.dsm

%{_libdir}/%{name}/plug-in/adpcm.so
%{_libdir}/%{name}/plug-in/ann_b2b.so
%{_libdir}/%{name}/plug-in/announce_transfer.so
%{_libdir}/%{name}/plug-in/announcement.so
%{_libdir}/%{name}/plug-in/annrecorder.so
%{_libdir}/%{name}/plug-in/auth_b2b.so
%{_libdir}/%{name}/plug-in/binrpcctrl.so
%{_libdir}/%{name}/plug-in/call_timer.so
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/cc_acc.so
%{_libdir}/%{name}/plug-in/click2dial.so
%{_libdir}/%{name}/plug-in/conference.so
%{_libdir}/%{name}/plug-in/dsm.so
%{_libdir}/%{name}/plug-in/early_announce.so
%{_libdir}/%{name}/plug-in/echo.so
%if 0%{?with_ilbc}
%{_libdir}/%{name}/plug-in/ilbc.so
%endif
%{_libdir}/%{name}/plug-in/l16.so
%{_libdir}/%{name}/plug-in/msg_storage.so
%{_libdir}/%{name}/plug-in/precoded_announce.so
%{_libdir}/%{name}/plug-in/reg_agent.so
%{_libdir}/%{name}/plug-in/registrar_client.so
%{_libdir}/%{name}/plug-in/sipctrl.so
%{_libdir}/%{name}/plug-in/session_timer.so
%{_libdir}/%{name}/plug-in/stats.so
%{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
%{_libdir}/%{name}/plug-in/uac_auth.so
%{_libdir}/%{name}/plug-in/unixsockctrl.so
%{_libdir}/%{name}/plug-in/voicebox.so
%{_libdir}/%{name}/plug-in/voicemail.so
%{_libdir}/%{name}/plug-in/wav.so
%{_libdir}/%{name}/plug-in/webconference.so

%files conf_auth
%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth
%{_libdir}/%{name}/ivr/conf_auth.py
%{_libdir}/%{name}/ivr/conf_auth.pyc
%{_libdir}/%{name}/ivr/conf_auth.pyo

%files diameter_client
%defattr(-,root,root)
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so

%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so

%files gateway
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
%{_libdir}/%{name}/plug-in/gateway.so

%files gsm
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so

%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr
%dir %{_libdir}/%{name}/ivr
%{_libdir}/%{name}/plug-in/ivr.so
%{_libdir}/%{name}/plug-in/log.py
%{_libdir}/%{name}/plug-in/log.pyc
%{_libdir}/%{name}/plug-in/log.pyo

%files mailbox
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox
%dir %{_datadir}/%{name}/audio/mailbox
%dir %{_libdir}/%{name}/ivr/imap_mailbox
%{_datadir}/%{name}/audio/mailbox/and.wav
%{_datadir}/%{name}/audio/mailbox/beep.wav
%{_datadir}/%{name}/audio/mailbox/bye.wav
%{_datadir}/%{name}/audio/mailbox/default_en.wav
%{_datadir}/%{name}/audio/mailbox/first_msg.wav
%{_datadir}/%{name}/audio/mailbox/msg_deleted.wav
%{_datadir}/%{name}/audio/mailbox/msg_menu.wav
%{_datadir}/%{name}/audio/mailbox/msg_saved.wav
%{_datadir}/%{name}/audio/mailbox/new_msg.wav
%{_datadir}/%{name}/audio/mailbox/next_msg.wav
%{_datadir}/%{name}/audio/mailbox/no_msg.wav
%{_datadir}/%{name}/audio/mailbox/saved_msg.wav
%{_datadir}/%{name}/audio/mailbox/you_have.wav
%{_libdir}/%{name}/ivr/mailbox.py
%{_libdir}/%{name}/ivr/mailbox.pyc
%{_libdir}/%{name}/ivr/mailbox.pyo
%{_libdir}/%{name}/ivr/mailbox_query.py
%{_libdir}/%{name}/ivr/mailbox_query.pyc
%{_libdir}/%{name}/ivr/mailbox_query.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.py
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.py
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.py
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo

%files pin_collect
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect
%dir %{_datadir}/%{name}/audio/pincollect
%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
%{_datadir}/%{name}/audio/pincollect/welcome.wav
%{_libdir}/%{name}/ivr/pin_collect.py
%{_libdir}/%{name}/ivr/pin_collect.pyc
%{_libdir}/%{name}/ivr/pin_collect.pyo

%files python
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems
%{_libdir}/%{name}/plug-in/py_sems.so
%{_libdir}/%{name}/plug-in/py_sems_log.py
%{_libdir}/%{name}/plug-in/py_sems_log.pyc
%{_libdir}/%{name}/plug-in/py_sems_log.pyo

%files speex
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so

%files xmlrpc2di
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di
%{_libdir}/%{name}/plug-in/xmlrpc2di.so

%changelog
* Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
- Use modified tarball (with ilBC sources completely removed)

* Thu Apr  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-4
- Internally shipped xmlrpc++ now uses system optflags
- Added more docs
- Moved audiofiles from libdir to datadir
- Removed empty conf_auth.conf
- Splitted out g722 module
- Splitted out xmlrpc2di module

* Wed Apr  8 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-3
- Fixed installation of python files

* Tue Apr  7 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-2
- Module dsm is back
- Disabled OpenSER-specific features (OpenSER is able to manage SEMS
  via SIP-headers).

* Tue Feb 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-1
- Ver. 1.1.0
- Disabled module dsm

* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.9.svn1160
- New svn snapshot

* Wed Dec  3 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.8.svn1095
- Another one fix for audio installation

* Fri Oct 17 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.7.svn1095
- Fixed installation of audio files

* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.6.svn1095
- New svn rev. 1095
- Some rpmlint-related fixes

* Thu Aug 21 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.5.svn
- Dropped upstreamed sems--initscript_fix.diff
- Installation of some audiofiles was fixed upstream

* Tue Aug 19 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.4.svn
- Splitted ivr module
- Fixed some rpmlint errors

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.3.svn
- Conditional switch "with_ilbc"

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.2.svn
- Splitted some modules

* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.1.svn
- Preliminary ver. 1.0.0 (from svn)

* Sun Jun 29 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-rc1
- GCC4.3 patches upstreamed
- Ver. 1.0.0-rc1

* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> 0.10.0
- Initial package for Fedora

* Wed Dec 13 2006 Peter Nixon <peter+rpmspam at suntel.com.tr>
- First version of the spec file for SUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:07:06 -0000	1.1
+++ .cvsignore	11 Apr 2009 03:22:54 -0000	1.2
@@ -0,0 +1 @@
+sems-1.1.0.w_o_ilbc_sources.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:07:06 -0000	1.1
+++ sources	11 Apr 2009 03:22:54 -0000	1.2
@@ -0,0 +1 @@
+6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz



From peter at fedoraproject.org  Sat Apr 11 03:26:35 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 11 Apr 2009 03:26:35 +0000 (UTC)
Subject: rpms/sems/F-11 import.log, NONE, 1.1 sems--external_gsm_lib.diff,
	NONE, 1.1 sems--flite-hardcoded-path-removal.diff, NONE,
	1.1 sems--py_sources_install.diff, NONE,
	1.1 sems--xmlrpc++-use_fedora_cxxflags.diff, NONE, 1.1 sems.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411032635.C476F70126@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27387/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff 
	sems--py_sources_install.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff sems.spec 
Log Message:
initial import


--- NEW FILE import.log ---
sems-1_1_0-5_fc10:F-11:sems-1.1.0-5.fc10.src.rpm:1239420341

sems--external_gsm_lib.diff:

--- NEW FILE sems--external_gsm_lib.diff ---
--- core/plug-in/gsm/gsm.c~	2008-02-10 21:52:44.000000000 +0300
+++ core/plug-in/gsm/gsm.c	2008-08-13 13:25:17.000000000 +0400
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include "gsm.h"
 #include "../../log.h"
 
 #include <stdlib.h>
--- core/plug-in/gsm/Makefile~	2007-01-18 23:35:32.000000000 +0300
+++ core/plug-in/gsm/Makefile	2008-08-13 14:17:41.000000000 +0400
@@ -3,17 +3,14 @@
 plug_in_name = gsm
 
 module_ldflags = 
-module_cflags  = -I gsm-1.0-pl10/inc -DHAS_STDLIB_H
+module_cflags  = -DHAS_STDLIB_H
 
-module_extra_objs = gsm-1.0-pl10/lib/libgsm.a
+module_extra_objs = -lgsm
 
 extra_clean = clean_gsmlib
 
 include ../Makefile.audio_module
 
-gsm-1.0-pl10/lib/libgsm.a::
-	cd gsm-1.0-pl10; $(MAKE) ./lib/libgsm.a
-
 .PHONY: clean_gsmlib
 clean_gsmlib:
 	cd gsm-1.0-pl10; $(MAKE) clean

sems--flite-hardcoded-path-removal.diff:

--- NEW FILE sems--flite-hardcoded-path-removal.diff ---
--- apps/py_sems/Makefile~	2008-04-23 22:15:21.000000000 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:48:00.725992047 +0400
@@ -21,15 +21,12 @@
 #   flite text to speech
 #
 # uncomment the next lines if you want to have flite text-to-speech (ivr.say("Hello there"); ) 
-FLITE_DIR = /usr/src/flite-1.2-release
 ALT_FLITE_DIR = /usr/include/flite
-PY_SEMS_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+PY_SEMS_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-PY_SEMS_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
+PY_SEMS_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 # On FreeBSD, remove the following flags: -ldl -lpthread 
 module_ldflags = -ldl -lpthread -lutil -lm \
 	$(PYTHON_module_ldflags) \
--- apps/ivr/Makefile~	2008-04-13 15:51:02.000000000 +0400
+++ apps/ivr/Makefile	2009-04-07 23:50:55.087991178 +0400
@@ -25,16 +25,14 @@
 #
 #   flite text to speech
 #
-IVR_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+IVR_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-IVR_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
+IVR_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
 else
 FLITE_DIR = 
 ALT_FLITE_DIR =
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 module_ldflags = -lutil \
 	$(PYTHON_module_ldflags) \
 	$(IVR_TTS_module_ldflags)

sems--py_sources_install.diff:

--- NEW FILE sems--py_sources_install.diff ---
--- apps/py_sems/Makefile~	2009-04-07 23:48:00.725992047 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:52:09.909991935 +0400
@@ -81,7 +81,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile~	2009-04-08 08:30:00.788685533 +0400
+++ apps/ivr/Makefile	2009-04-08 08:31:48.349687025 +0400
@@ -92,7 +92,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in  $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile.ivr_application~	2008-08-20 17:23:41.000000000 +0400
+++ apps/ivr/Makefile.ivr_application	2009-04-08 08:32:38.509685952 +0400
@@ -41,8 +41,10 @@
 .PHONY: install
 install: all $(extra_install)
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
+	install -m ${LIB_PERMISSIONS}  *.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -m ${LIB_PERMISSIONS}  *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
+	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 
 .PHONY: install-cfg

sems--xmlrpc++-use_fedora_cxxflags.diff:

--- NEW FILE sems--xmlrpc++-use_fedora_cxxflags.diff ---
--- apps/xmlrpc2di/xmlrpc++/Makefile~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/Makefile	2009-04-08 11:52:21.235663373 +0400
@@ -6,7 +6,7 @@
 DEBUG		= -g
 OPTIMIZE	= -O2
 GCCWARN		= -Wall #-Wstrict-prototypes
-CXXFLAGS	= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
+EXTRA_CXXFLAGS	?= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
 VERSION		= 0.8
 
 DESTDIR		=
@@ -43,7 +43,7 @@
 
 
 tests:		$(LIB)
-		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
+		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(EXTRA_CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
 
 doc doxygen:
 		cd src && doxygen Doxyfile


--- NEW FILE sems.spec ---
Summary:	SIP Express Media Server, an extensible SIP media server
Name:		sems
Version:	1.1.0
Release:	5%{?dist}
URL:		http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
License:	GPLv2+
Group:		Applications/Communications
# Use external gsm instead of shipped one
Patch2:		sems--external_gsm_lib.diff
# Remove hardcoded path to search for flite includes
Patch3:		sems--flite-hardcoded-path-removal.diff
# install also *.py (not only *.pyc) files
Patch4:		sems--py_sources_install.diff
# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires:	python >= 2.3
BuildRequires:	python
BuildRequires:	sip-devel
BuildRequires:	libsamplerate-devel
BuildRequires:	gsm-devel
BuildRequires:	spandsp-devel
# TODO consider enabling flite support in apps/conference
BuildRequires:	flite-devel
BuildRequires:	speex-devel
BuildRequires:	mISDN-devel
BuildRequires:	openssl-devel
Requires(post):	/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service

%description
SEMS (SIP Express Media Server) is very extensible and programmable
SIP media server for SER or OpenSER. The plug-in based SDK enables
you to extend SEMS and write your own applications and integrate new
codec. Voicemail, announcement and echo plug-ins are already included.
SEMS supports g711u, g711a, GSM06.10 and wav file.

%package	conf_auth
Summary:	Conference with authorization
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	conf_auth
Conference with authorization by PIN-numbers.

%package	diameter_client
Summary:	A simple DIAMETER client implementation
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	diameter_client
This is a very simple DIAMETER client implementation. it does
implement only parts of the base protocol, and is not a complete
DIAMETER implementation.

It is used from other modules with the DI API - i.e. other modules
can execute DI functions to add a server connection, or send a
DIAMETER request.

%package	g722
Summary:	G.722 support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	g722
This is a wrapper around the g722 codec from the spandsp library.

%package	gateway
Summary:	ISDN gateway for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gateway
ISDN gateway for SEMS.

%package	gsm
Summary:	GSM support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gsm
GSM support for SEMS.

%package	ivr
Summary:	IVR functionality for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	ivr
IVR functionality for SEMS.

%package	mailbox
Summary:	Mailbox application
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	mailbox
The mailbox application is a mailbox where callers can leave messages
for offline or unavailable users and the users can dial in to check their
messages. It uses an IMAP server as backend to store the voice messages.

%package	pin_collect
Summary:	Collects a PIN
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	pin_collect
This application collects a PIN and then transfers using a
(proprietary) REFER the call.

%package	python
Summary:	Python bindings for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	python
Python bindings for SEMS.

%package	speex
Summary:	Speex support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	speex
Speex support for SEMS.

%package	xmlrpc2di
Summary:	XMLRPC interface for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	xmlrpc2di
This module makes the Dynamic Invocation (DI) Interfaces exported
by component modules accessible from XMLRPC. Additionally the builtin
methods calls, get_loglevel and set_loglevel are implemented (like in the
stats UDP server). Additionally, it can be used as client to access
XMLRPC servers.

%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch2 -p0 -b .gsm_ext
%patch3 -p0 -b .flite_hardcoded
%patch4 -p0 -b .py_install_also
%patch5 -p0 -b .cxxflags

iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt

%build
make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all

%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS="$RPM_OPT_FLAGS"
make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
	DESTDIR=$RPM_BUILD_ROOT \
	basedir= \
	prefix=%{_prefix} \
	modules-prefix= \
	modules-dir=%{_libdir}/%{name}/plug-in \
	modules-target=%{_libdir}/%{name}/plug-in \
	lib-prefix= \
	lib-dir=%{_libdir}/%{name}/ \
	lib-target=%{_libdir}/%{name}/ \
	ivr-modules-dir=%{_libdir}/%{name}/ivr \
	cfg-prefix= \
	cfg-target=%{_sysconfdir}/%{name}/ \
	doc-prefix= \
	doc-dir=%{_docdir}/%{name}/ \
	audio-prefix= \
	audio-dir=%{_datadir}/%{name}/audio/ \
	audio-target=%{_datadir}/%{name}/audio/

install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}

# Remove installed README
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default

# remove currently empty conf-file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf

# fix permissions
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]; then
	/sbin/chkconfig --add sems || :
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service sems stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del sems || :
fi

%files
%defattr(-,root,root)

%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/audio
%dir %{_datadir}/%{name}/audio/ann_b2b
%dir %{_datadir}/%{name}/audio/announcement
%dir %{_datadir}/%{name}/audio/announce_transfer
%dir %{_datadir}/%{name}/audio/annrecorder
%dir %{_datadir}/%{name}/audio/conference
%dir %{_datadir}/%{name}/audio/voicebox
%dir %{_datadir}/%{name}/audio/voicemail
%dir %{_datadir}/%{name}/audio/webconference
%dir %{_libdir}/%{name}/dsm
%dir %{_libdir}/%{name}/plug-in

%{_sysconfdir}/init.d/%{name}

%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/ann_b2b.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announce_transfer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf

%doc README
%doc apps/dsm/doc/Readme.dsm.txt
%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
%doc apps/dsm/fsmc/Readme.fsmc.txt
%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
%doc core/plug-in/adpcm/README_G711
%doc core/plug-in/stats/README.stats
%doc doc/figures
%doc doc/CHANGELOG
%doc doc/COPYING
%doc doc/Configure-Sems-OpenSER-HOWTO
%doc doc/Configure-Sems-Ser-HOWTO
%doc doc/Readme.ann_b2b
%doc doc/Readme.announce_transfer
%doc doc/Readme.announcement
%doc doc/Readme.annrecorder
%doc doc/Readme.auth_b2b
%doc doc/Readme.call_timer
%doc doc/Readme.callback
%doc doc/Readme.click2dial
%doc doc/Readme.conf_auth
%doc doc/Readme.conference
%doc doc/Readme.early_announce
%doc doc/Readme.echo
%if 0%{?with_ilbc}
%doc doc/Readme.iLBC
%endif
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin
%endif
%doc doc/Readme.msg_storage
%doc doc/Readme.reg_agent
%doc doc/Readme.registrar_client
%doc doc/Readme.sw_prepaid_sip
%doc doc/Readme.uac_auth
%doc doc/Readme.voicebox
%doc doc/Readme.voicemail
%doc doc/Readme.webconference
%doc doc/WHATSNEW_0.10

%{_sbindir}/%{name}
%{_sbindir}/%{name}-stats

%{_datadir}/%{name}/audio/beep.wav
%{_datadir}/%{name}/audio/default_en.wav
%{_datadir}/%{name}/audio/annrecorder/beep.wav
%{_datadir}/%{name}/audio/annrecorder/bye.wav
%{_datadir}/%{name}/audio/annrecorder/confirm.wav
%{_datadir}/%{name}/audio/annrecorder/greeting_set.wav
%{_datadir}/%{name}/audio/annrecorder/to_record.wav
%{_datadir}/%{name}/audio/annrecorder/welcome.wav
%{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
%{_datadir}/%{name}/audio/conference/beep.wav
%{_datadir}/%{name}/audio/conference/first_participant.wav
%{_datadir}/%{name}/audio/voicebox/0.wav
%{_datadir}/%{name}/audio/voicebox/1.wav
%{_datadir}/%{name}/audio/voicebox/10.wav
%{_datadir}/%{name}/audio/voicebox/11.wav
%{_datadir}/%{name}/audio/voicebox/12.wav
%{_datadir}/%{name}/audio/voicebox/13.wav
%{_datadir}/%{name}/audio/voicebox/14.wav
%{_datadir}/%{name}/audio/voicebox/15.wav
%{_datadir}/%{name}/audio/voicebox/16.wav
%{_datadir}/%{name}/audio/voicebox/17.wav
%{_datadir}/%{name}/audio/voicebox/18.wav
%{_datadir}/%{name}/audio/voicebox/19.wav
%{_datadir}/%{name}/audio/voicebox/2.wav
%{_datadir}/%{name}/audio/voicebox/20.wav
%{_datadir}/%{name}/audio/voicebox/3.wav
%{_datadir}/%{name}/audio/voicebox/30.wav
%{_datadir}/%{name}/audio/voicebox/4.wav
%{_datadir}/%{name}/audio/voicebox/40.wav
%{_datadir}/%{name}/audio/voicebox/5.wav
%{_datadir}/%{name}/audio/voicebox/50.wav
%{_datadir}/%{name}/audio/voicebox/6.wav
%{_datadir}/%{name}/audio/voicebox/60.wav
%{_datadir}/%{name}/audio/voicebox/7.wav
%{_datadir}/%{name}/audio/voicebox/70.wav
%{_datadir}/%{name}/audio/voicebox/8.wav
%{_datadir}/%{name}/audio/voicebox/80.wav
%{_datadir}/%{name}/audio/voicebox/9.wav
%{_datadir}/%{name}/audio/voicebox/90.wav
%{_datadir}/%{name}/audio/voicebox/and.wav
%{_datadir}/%{name}/audio/voicebox/bye.wav
%{_datadir}/%{name}/audio/voicebox/first_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/first_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/in_your_voicebox.wav
%{_datadir}/%{name}/audio/voicebox/msg_deleted.wav
%{_datadir}/%{name}/audio/voicebox/msg_end_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_saved.wav
%{_datadir}/%{name}/audio/voicebox/new_msg.wav
%{_datadir}/%{name}/audio/voicebox/new_msgs.wav
%{_datadir}/%{name}/audio/voicebox/next_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/next_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_more_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_msg.wav
%{_datadir}/%{name}/audio/voicebox/pin_prompt.wav
%{_datadir}/%{name}/audio/voicebox/saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/saved_msgs.wav
%{_datadir}/%{name}/audio/voicebox/x1.wav
%{_datadir}/%{name}/audio/voicebox/x2.wav
%{_datadir}/%{name}/audio/voicebox/x3.wav
%{_datadir}/%{name}/audio/voicebox/x4.wav
%{_datadir}/%{name}/audio/voicebox/x5.wav
%{_datadir}/%{name}/audio/voicebox/x6.wav
%{_datadir}/%{name}/audio/voicebox/x7.wav
%{_datadir}/%{name}/audio/voicebox/x8.wav
%{_datadir}/%{name}/audio/voicebox/x9.wav
%{_datadir}/%{name}/audio/voicebox/you_have.wav
%{_datadir}/%{name}/audio/voicemail/default_en.wav
%{_datadir}/%{name}/audio/voicemail/beep.wav
%{_datadir}/%{name}/audio/webconference/0.wav
%{_datadir}/%{name}/audio/webconference/1.wav
%{_datadir}/%{name}/audio/webconference/2.wav
%{_datadir}/%{name}/audio/webconference/3.wav
%{_datadir}/%{name}/audio/webconference/4.wav
%{_datadir}/%{name}/audio/webconference/5.wav
%{_datadir}/%{name}/audio/webconference/6.wav
%{_datadir}/%{name}/audio/webconference/7.wav
%{_datadir}/%{name}/audio/webconference/8.wav
%{_datadir}/%{name}/audio/webconference/9.wav
%{_datadir}/%{name}/audio/webconference/beep.wav
%{_datadir}/%{name}/audio/webconference/entering_conference.wav
%{_datadir}/%{name}/audio/webconference/first_participant.wav
%{_datadir}/%{name}/audio/webconference/pin_prompt.wav
%{_datadir}/%{name}/audio/webconference/wrong_pin.wav

%{_libdir}/%{name}/dsm/mod_dlg.so
%{_libdir}/%{name}/dsm/mod_sys.so
%{_libdir}/%{name}/dsm/mod_uri.so
%{_libdir}/%{name}/dsm/inbound_call.dsm
%{_libdir}/%{name}/dsm/outbound_call.dsm

%{_libdir}/%{name}/plug-in/adpcm.so
%{_libdir}/%{name}/plug-in/ann_b2b.so
%{_libdir}/%{name}/plug-in/announce_transfer.so
%{_libdir}/%{name}/plug-in/announcement.so
%{_libdir}/%{name}/plug-in/annrecorder.so
%{_libdir}/%{name}/plug-in/auth_b2b.so
%{_libdir}/%{name}/plug-in/binrpcctrl.so
%{_libdir}/%{name}/plug-in/call_timer.so
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/cc_acc.so
%{_libdir}/%{name}/plug-in/click2dial.so
%{_libdir}/%{name}/plug-in/conference.so
%{_libdir}/%{name}/plug-in/dsm.so
%{_libdir}/%{name}/plug-in/early_announce.so
%{_libdir}/%{name}/plug-in/echo.so
%if 0%{?with_ilbc}
%{_libdir}/%{name}/plug-in/ilbc.so
%endif
%{_libdir}/%{name}/plug-in/l16.so
%{_libdir}/%{name}/plug-in/msg_storage.so
%{_libdir}/%{name}/plug-in/precoded_announce.so
%{_libdir}/%{name}/plug-in/reg_agent.so
%{_libdir}/%{name}/plug-in/registrar_client.so
%{_libdir}/%{name}/plug-in/sipctrl.so
%{_libdir}/%{name}/plug-in/session_timer.so
%{_libdir}/%{name}/plug-in/stats.so
%{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
%{_libdir}/%{name}/plug-in/uac_auth.so
%{_libdir}/%{name}/plug-in/unixsockctrl.so
%{_libdir}/%{name}/plug-in/voicebox.so
%{_libdir}/%{name}/plug-in/voicemail.so
%{_libdir}/%{name}/plug-in/wav.so
%{_libdir}/%{name}/plug-in/webconference.so

%files conf_auth
%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth
%{_libdir}/%{name}/ivr/conf_auth.py
%{_libdir}/%{name}/ivr/conf_auth.pyc
%{_libdir}/%{name}/ivr/conf_auth.pyo

%files diameter_client
%defattr(-,root,root)
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so

%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so

%files gateway
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
%{_libdir}/%{name}/plug-in/gateway.so

%files gsm
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so

%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr
%dir %{_libdir}/%{name}/ivr
%{_libdir}/%{name}/plug-in/ivr.so
%{_libdir}/%{name}/plug-in/log.py
%{_libdir}/%{name}/plug-in/log.pyc
%{_libdir}/%{name}/plug-in/log.pyo

%files mailbox
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox
%dir %{_datadir}/%{name}/audio/mailbox
%dir %{_libdir}/%{name}/ivr/imap_mailbox
%{_datadir}/%{name}/audio/mailbox/and.wav
%{_datadir}/%{name}/audio/mailbox/beep.wav
%{_datadir}/%{name}/audio/mailbox/bye.wav
%{_datadir}/%{name}/audio/mailbox/default_en.wav
%{_datadir}/%{name}/audio/mailbox/first_msg.wav
%{_datadir}/%{name}/audio/mailbox/msg_deleted.wav
%{_datadir}/%{name}/audio/mailbox/msg_menu.wav
%{_datadir}/%{name}/audio/mailbox/msg_saved.wav
%{_datadir}/%{name}/audio/mailbox/new_msg.wav
%{_datadir}/%{name}/audio/mailbox/next_msg.wav
%{_datadir}/%{name}/audio/mailbox/no_msg.wav
%{_datadir}/%{name}/audio/mailbox/saved_msg.wav
%{_datadir}/%{name}/audio/mailbox/you_have.wav
%{_libdir}/%{name}/ivr/mailbox.py
%{_libdir}/%{name}/ivr/mailbox.pyc
%{_libdir}/%{name}/ivr/mailbox.pyo
%{_libdir}/%{name}/ivr/mailbox_query.py
%{_libdir}/%{name}/ivr/mailbox_query.pyc
%{_libdir}/%{name}/ivr/mailbox_query.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.py
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.py
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.py
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo

%files pin_collect
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect
%dir %{_datadir}/%{name}/audio/pincollect
%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
%{_datadir}/%{name}/audio/pincollect/welcome.wav
%{_libdir}/%{name}/ivr/pin_collect.py
%{_libdir}/%{name}/ivr/pin_collect.pyc
%{_libdir}/%{name}/ivr/pin_collect.pyo

%files python
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems
%{_libdir}/%{name}/plug-in/py_sems.so
%{_libdir}/%{name}/plug-in/py_sems_log.py
%{_libdir}/%{name}/plug-in/py_sems_log.pyc
%{_libdir}/%{name}/plug-in/py_sems_log.pyo

%files speex
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so

%files xmlrpc2di
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di
%{_libdir}/%{name}/plug-in/xmlrpc2di.so

%changelog
* Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
- Use modified tarball (with ilBC sources completely removed)

* Thu Apr  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-4
- Internally shipped xmlrpc++ now uses system optflags
- Added more docs
- Moved audiofiles from libdir to datadir
- Removed empty conf_auth.conf
- Splitted out g722 module
- Splitted out xmlrpc2di module

* Wed Apr  8 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-3
- Fixed installation of python files

* Tue Apr  7 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-2
- Module dsm is back
- Disabled OpenSER-specific features (OpenSER is able to manage SEMS
  via SIP-headers).

* Tue Feb 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-1
- Ver. 1.1.0
- Disabled module dsm

* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.9.svn1160
- New svn snapshot

* Wed Dec  3 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.8.svn1095
- Another one fix for audio installation

* Fri Oct 17 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.7.svn1095
- Fixed installation of audio files

* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.6.svn1095
- New svn rev. 1095
- Some rpmlint-related fixes

* Thu Aug 21 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.5.svn
- Dropped upstreamed sems--initscript_fix.diff
- Installation of some audiofiles was fixed upstream

* Tue Aug 19 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.4.svn
- Splitted ivr module
- Fixed some rpmlint errors

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.3.svn
- Conditional switch "with_ilbc"

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.2.svn
- Splitted some modules

* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.1.svn
- Preliminary ver. 1.0.0 (from svn)

* Sun Jun 29 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-rc1
- GCC4.3 patches upstreamed
- Ver. 1.0.0-rc1

* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> 0.10.0
- Initial package for Fedora

* Wed Dec 13 2006 Peter Nixon <peter+rpmspam at suntel.com.tr>
- First version of the spec file for SUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:07:06 -0000	1.1
+++ .cvsignore	11 Apr 2009 03:26:33 -0000	1.2
@@ -0,0 +1 @@
+sems-1.1.0.w_o_ilbc_sources.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:07:06 -0000	1.1
+++ sources	11 Apr 2009 03:26:35 -0000	1.2
@@ -0,0 +1 @@
+6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz



From peter at fedoraproject.org  Sat Apr 11 03:29:32 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 11 Apr 2009 03:29:32 +0000 (UTC)
Subject: rpms/sems/F-10 import.log, NONE, 1.1 sems--external_gsm_lib.diff,
	NONE, 1.1 sems--flite-hardcoded-path-removal.diff, NONE,
	1.1 sems--py_sources_install.diff, NONE,
	1.1 sems--xmlrpc++-use_fedora_cxxflags.diff, NONE, 1.1 sems.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411032932.CE1B870098@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28809/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff 
	sems--py_sources_install.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff sems.spec 
Log Message:
initial import


--- NEW FILE import.log ---
sems-1_1_0-5_fc10:F-10:sems-1.1.0-5.fc10.src.rpm:1239420482

sems--external_gsm_lib.diff:

--- NEW FILE sems--external_gsm_lib.diff ---
--- core/plug-in/gsm/gsm.c~	2008-02-10 21:52:44.000000000 +0300
+++ core/plug-in/gsm/gsm.c	2008-08-13 13:25:17.000000000 +0400
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include "gsm.h"
 #include "../../log.h"
 
 #include <stdlib.h>
--- core/plug-in/gsm/Makefile~	2007-01-18 23:35:32.000000000 +0300
+++ core/plug-in/gsm/Makefile	2008-08-13 14:17:41.000000000 +0400
@@ -3,17 +3,14 @@
 plug_in_name = gsm
 
 module_ldflags = 
-module_cflags  = -I gsm-1.0-pl10/inc -DHAS_STDLIB_H
+module_cflags  = -DHAS_STDLIB_H
 
-module_extra_objs = gsm-1.0-pl10/lib/libgsm.a
+module_extra_objs = -lgsm
 
 extra_clean = clean_gsmlib
 
 include ../Makefile.audio_module
 
-gsm-1.0-pl10/lib/libgsm.a::
-	cd gsm-1.0-pl10; $(MAKE) ./lib/libgsm.a
-
 .PHONY: clean_gsmlib
 clean_gsmlib:
 	cd gsm-1.0-pl10; $(MAKE) clean

sems--flite-hardcoded-path-removal.diff:

--- NEW FILE sems--flite-hardcoded-path-removal.diff ---
--- apps/py_sems/Makefile~	2008-04-23 22:15:21.000000000 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:48:00.725992047 +0400
@@ -21,15 +21,12 @@
 #   flite text to speech
 #
 # uncomment the next lines if you want to have flite text-to-speech (ivr.say("Hello there"); ) 
-FLITE_DIR = /usr/src/flite-1.2-release
 ALT_FLITE_DIR = /usr/include/flite
-PY_SEMS_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+PY_SEMS_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-PY_SEMS_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
+PY_SEMS_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 # On FreeBSD, remove the following flags: -ldl -lpthread 
 module_ldflags = -ldl -lpthread -lutil -lm \
 	$(PYTHON_module_ldflags) \
--- apps/ivr/Makefile~	2008-04-13 15:51:02.000000000 +0400
+++ apps/ivr/Makefile	2009-04-07 23:50:55.087991178 +0400
@@ -25,16 +25,14 @@
 #
 #   flite text to speech
 #
-IVR_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+IVR_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-IVR_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
+IVR_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
 else
 FLITE_DIR = 
 ALT_FLITE_DIR =
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 module_ldflags = -lutil \
 	$(PYTHON_module_ldflags) \
 	$(IVR_TTS_module_ldflags)

sems--py_sources_install.diff:

--- NEW FILE sems--py_sources_install.diff ---
--- apps/py_sems/Makefile~	2009-04-07 23:48:00.725992047 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:52:09.909991935 +0400
@@ -81,7 +81,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile~	2009-04-08 08:30:00.788685533 +0400
+++ apps/ivr/Makefile	2009-04-08 08:31:48.349687025 +0400
@@ -92,7 +92,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in  $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile.ivr_application~	2008-08-20 17:23:41.000000000 +0400
+++ apps/ivr/Makefile.ivr_application	2009-04-08 08:32:38.509685952 +0400
@@ -41,8 +41,10 @@
 .PHONY: install
 install: all $(extra_install)
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
+	install -m ${LIB_PERMISSIONS}  *.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -m ${LIB_PERMISSIONS}  *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
+	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 
 .PHONY: install-cfg

sems--xmlrpc++-use_fedora_cxxflags.diff:

--- NEW FILE sems--xmlrpc++-use_fedora_cxxflags.diff ---
--- apps/xmlrpc2di/xmlrpc++/Makefile~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/Makefile	2009-04-08 11:52:21.235663373 +0400
@@ -6,7 +6,7 @@
 DEBUG		= -g
 OPTIMIZE	= -O2
 GCCWARN		= -Wall #-Wstrict-prototypes
-CXXFLAGS	= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
+EXTRA_CXXFLAGS	?= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
 VERSION		= 0.8
 
 DESTDIR		=
@@ -43,7 +43,7 @@
 
 
 tests:		$(LIB)
-		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
+		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(EXTRA_CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
 
 doc doxygen:
 		cd src && doxygen Doxyfile


--- NEW FILE sems.spec ---
Summary:	SIP Express Media Server, an extensible SIP media server
Name:		sems
Version:	1.1.0
Release:	5%{?dist}
URL:		http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
License:	GPLv2+
Group:		Applications/Communications
# Use external gsm instead of shipped one
Patch2:		sems--external_gsm_lib.diff
# Remove hardcoded path to search for flite includes
Patch3:		sems--flite-hardcoded-path-removal.diff
# install also *.py (not only *.pyc) files
Patch4:		sems--py_sources_install.diff
# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires:	python >= 2.3
BuildRequires:	python
BuildRequires:	sip-devel
BuildRequires:	libsamplerate-devel
BuildRequires:	gsm-devel
BuildRequires:	spandsp-devel
# TODO consider enabling flite support in apps/conference
BuildRequires:	flite-devel
BuildRequires:	speex-devel
BuildRequires:	mISDN-devel
BuildRequires:	openssl-devel
Requires(post):	/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service

%description
SEMS (SIP Express Media Server) is very extensible and programmable
SIP media server for SER or OpenSER. The plug-in based SDK enables
you to extend SEMS and write your own applications and integrate new
codec. Voicemail, announcement and echo plug-ins are already included.
SEMS supports g711u, g711a, GSM06.10 and wav file.

%package	conf_auth
Summary:	Conference with authorization
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	conf_auth
Conference with authorization by PIN-numbers.

%package	diameter_client
Summary:	A simple DIAMETER client implementation
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	diameter_client
This is a very simple DIAMETER client implementation. it does
implement only parts of the base protocol, and is not a complete
DIAMETER implementation.

It is used from other modules with the DI API - i.e. other modules
can execute DI functions to add a server connection, or send a
DIAMETER request.

%package	g722
Summary:	G.722 support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	g722
This is a wrapper around the g722 codec from the spandsp library.

%package	gateway
Summary:	ISDN gateway for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gateway
ISDN gateway for SEMS.

%package	gsm
Summary:	GSM support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gsm
GSM support for SEMS.

%package	ivr
Summary:	IVR functionality for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	ivr
IVR functionality for SEMS.

%package	mailbox
Summary:	Mailbox application
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	mailbox
The mailbox application is a mailbox where callers can leave messages
for offline or unavailable users and the users can dial in to check their
messages. It uses an IMAP server as backend to store the voice messages.

%package	pin_collect
Summary:	Collects a PIN
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	pin_collect
This application collects a PIN and then transfers using a
(proprietary) REFER the call.

%package	python
Summary:	Python bindings for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	python
Python bindings for SEMS.

%package	speex
Summary:	Speex support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	speex
Speex support for SEMS.

%package	xmlrpc2di
Summary:	XMLRPC interface for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	xmlrpc2di
This module makes the Dynamic Invocation (DI) Interfaces exported
by component modules accessible from XMLRPC. Additionally the builtin
methods calls, get_loglevel and set_loglevel are implemented (like in the
stats UDP server). Additionally, it can be used as client to access
XMLRPC servers.

%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch2 -p0 -b .gsm_ext
%patch3 -p0 -b .flite_hardcoded
%patch4 -p0 -b .py_install_also
%patch5 -p0 -b .cxxflags

iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt

%build
make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all

%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS="$RPM_OPT_FLAGS"
make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
	DESTDIR=$RPM_BUILD_ROOT \
	basedir= \
	prefix=%{_prefix} \
	modules-prefix= \
	modules-dir=%{_libdir}/%{name}/plug-in \
	modules-target=%{_libdir}/%{name}/plug-in \
	lib-prefix= \
	lib-dir=%{_libdir}/%{name}/ \
	lib-target=%{_libdir}/%{name}/ \
	ivr-modules-dir=%{_libdir}/%{name}/ivr \
	cfg-prefix= \
	cfg-target=%{_sysconfdir}/%{name}/ \
	doc-prefix= \
	doc-dir=%{_docdir}/%{name}/ \
	audio-prefix= \
	audio-dir=%{_datadir}/%{name}/audio/ \
	audio-target=%{_datadir}/%{name}/audio/

install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}

# Remove installed README
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default

# remove currently empty conf-file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf

# fix permissions
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]; then
	/sbin/chkconfig --add sems || :
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service sems stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del sems || :
fi

%files
%defattr(-,root,root)

%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/audio
%dir %{_datadir}/%{name}/audio/ann_b2b
%dir %{_datadir}/%{name}/audio/announcement
%dir %{_datadir}/%{name}/audio/announce_transfer
%dir %{_datadir}/%{name}/audio/annrecorder
%dir %{_datadir}/%{name}/audio/conference
%dir %{_datadir}/%{name}/audio/voicebox
%dir %{_datadir}/%{name}/audio/voicemail
%dir %{_datadir}/%{name}/audio/webconference
%dir %{_libdir}/%{name}/dsm
%dir %{_libdir}/%{name}/plug-in

%{_sysconfdir}/init.d/%{name}

%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/ann_b2b.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announce_transfer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf

%doc README
%doc apps/dsm/doc/Readme.dsm.txt
%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
%doc apps/dsm/fsmc/Readme.fsmc.txt
%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
%doc core/plug-in/adpcm/README_G711
%doc core/plug-in/stats/README.stats
%doc doc/figures
%doc doc/CHANGELOG
%doc doc/COPYING
%doc doc/Configure-Sems-OpenSER-HOWTO
%doc doc/Configure-Sems-Ser-HOWTO
%doc doc/Readme.ann_b2b
%doc doc/Readme.announce_transfer
%doc doc/Readme.announcement
%doc doc/Readme.annrecorder
%doc doc/Readme.auth_b2b
%doc doc/Readme.call_timer
%doc doc/Readme.callback
%doc doc/Readme.click2dial
%doc doc/Readme.conf_auth
%doc doc/Readme.conference
%doc doc/Readme.early_announce
%doc doc/Readme.echo
%if 0%{?with_ilbc}
%doc doc/Readme.iLBC
%endif
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin
%endif
%doc doc/Readme.msg_storage
%doc doc/Readme.reg_agent
%doc doc/Readme.registrar_client
%doc doc/Readme.sw_prepaid_sip
%doc doc/Readme.uac_auth
%doc doc/Readme.voicebox
%doc doc/Readme.voicemail
%doc doc/Readme.webconference
%doc doc/WHATSNEW_0.10

%{_sbindir}/%{name}
%{_sbindir}/%{name}-stats

%{_datadir}/%{name}/audio/beep.wav
%{_datadir}/%{name}/audio/default_en.wav
%{_datadir}/%{name}/audio/annrecorder/beep.wav
%{_datadir}/%{name}/audio/annrecorder/bye.wav
%{_datadir}/%{name}/audio/annrecorder/confirm.wav
%{_datadir}/%{name}/audio/annrecorder/greeting_set.wav
%{_datadir}/%{name}/audio/annrecorder/to_record.wav
%{_datadir}/%{name}/audio/annrecorder/welcome.wav
%{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
%{_datadir}/%{name}/audio/conference/beep.wav
%{_datadir}/%{name}/audio/conference/first_participant.wav
%{_datadir}/%{name}/audio/voicebox/0.wav
%{_datadir}/%{name}/audio/voicebox/1.wav
%{_datadir}/%{name}/audio/voicebox/10.wav
%{_datadir}/%{name}/audio/voicebox/11.wav
%{_datadir}/%{name}/audio/voicebox/12.wav
%{_datadir}/%{name}/audio/voicebox/13.wav
%{_datadir}/%{name}/audio/voicebox/14.wav
%{_datadir}/%{name}/audio/voicebox/15.wav
%{_datadir}/%{name}/audio/voicebox/16.wav
%{_datadir}/%{name}/audio/voicebox/17.wav
%{_datadir}/%{name}/audio/voicebox/18.wav
%{_datadir}/%{name}/audio/voicebox/19.wav
%{_datadir}/%{name}/audio/voicebox/2.wav
%{_datadir}/%{name}/audio/voicebox/20.wav
%{_datadir}/%{name}/audio/voicebox/3.wav
%{_datadir}/%{name}/audio/voicebox/30.wav
%{_datadir}/%{name}/audio/voicebox/4.wav
%{_datadir}/%{name}/audio/voicebox/40.wav
%{_datadir}/%{name}/audio/voicebox/5.wav
%{_datadir}/%{name}/audio/voicebox/50.wav
%{_datadir}/%{name}/audio/voicebox/6.wav
%{_datadir}/%{name}/audio/voicebox/60.wav
%{_datadir}/%{name}/audio/voicebox/7.wav
%{_datadir}/%{name}/audio/voicebox/70.wav
%{_datadir}/%{name}/audio/voicebox/8.wav
%{_datadir}/%{name}/audio/voicebox/80.wav
%{_datadir}/%{name}/audio/voicebox/9.wav
%{_datadir}/%{name}/audio/voicebox/90.wav
%{_datadir}/%{name}/audio/voicebox/and.wav
%{_datadir}/%{name}/audio/voicebox/bye.wav
%{_datadir}/%{name}/audio/voicebox/first_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/first_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/in_your_voicebox.wav
%{_datadir}/%{name}/audio/voicebox/msg_deleted.wav
%{_datadir}/%{name}/audio/voicebox/msg_end_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_saved.wav
%{_datadir}/%{name}/audio/voicebox/new_msg.wav
%{_datadir}/%{name}/audio/voicebox/new_msgs.wav
%{_datadir}/%{name}/audio/voicebox/next_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/next_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_more_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_msg.wav
%{_datadir}/%{name}/audio/voicebox/pin_prompt.wav
%{_datadir}/%{name}/audio/voicebox/saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/saved_msgs.wav
%{_datadir}/%{name}/audio/voicebox/x1.wav
%{_datadir}/%{name}/audio/voicebox/x2.wav
%{_datadir}/%{name}/audio/voicebox/x3.wav
%{_datadir}/%{name}/audio/voicebox/x4.wav
%{_datadir}/%{name}/audio/voicebox/x5.wav
%{_datadir}/%{name}/audio/voicebox/x6.wav
%{_datadir}/%{name}/audio/voicebox/x7.wav
%{_datadir}/%{name}/audio/voicebox/x8.wav
%{_datadir}/%{name}/audio/voicebox/x9.wav
%{_datadir}/%{name}/audio/voicebox/you_have.wav
%{_datadir}/%{name}/audio/voicemail/default_en.wav
%{_datadir}/%{name}/audio/voicemail/beep.wav
%{_datadir}/%{name}/audio/webconference/0.wav
%{_datadir}/%{name}/audio/webconference/1.wav
%{_datadir}/%{name}/audio/webconference/2.wav
%{_datadir}/%{name}/audio/webconference/3.wav
%{_datadir}/%{name}/audio/webconference/4.wav
%{_datadir}/%{name}/audio/webconference/5.wav
%{_datadir}/%{name}/audio/webconference/6.wav
%{_datadir}/%{name}/audio/webconference/7.wav
%{_datadir}/%{name}/audio/webconference/8.wav
%{_datadir}/%{name}/audio/webconference/9.wav
%{_datadir}/%{name}/audio/webconference/beep.wav
%{_datadir}/%{name}/audio/webconference/entering_conference.wav
%{_datadir}/%{name}/audio/webconference/first_participant.wav
%{_datadir}/%{name}/audio/webconference/pin_prompt.wav
%{_datadir}/%{name}/audio/webconference/wrong_pin.wav

%{_libdir}/%{name}/dsm/mod_dlg.so
%{_libdir}/%{name}/dsm/mod_sys.so
%{_libdir}/%{name}/dsm/mod_uri.so
%{_libdir}/%{name}/dsm/inbound_call.dsm
%{_libdir}/%{name}/dsm/outbound_call.dsm

%{_libdir}/%{name}/plug-in/adpcm.so
%{_libdir}/%{name}/plug-in/ann_b2b.so
%{_libdir}/%{name}/plug-in/announce_transfer.so
%{_libdir}/%{name}/plug-in/announcement.so
%{_libdir}/%{name}/plug-in/annrecorder.so
%{_libdir}/%{name}/plug-in/auth_b2b.so
%{_libdir}/%{name}/plug-in/binrpcctrl.so
%{_libdir}/%{name}/plug-in/call_timer.so
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/cc_acc.so
%{_libdir}/%{name}/plug-in/click2dial.so
%{_libdir}/%{name}/plug-in/conference.so
%{_libdir}/%{name}/plug-in/dsm.so
%{_libdir}/%{name}/plug-in/early_announce.so
%{_libdir}/%{name}/plug-in/echo.so
%if 0%{?with_ilbc}
%{_libdir}/%{name}/plug-in/ilbc.so
%endif
%{_libdir}/%{name}/plug-in/l16.so
%{_libdir}/%{name}/plug-in/msg_storage.so
%{_libdir}/%{name}/plug-in/precoded_announce.so
%{_libdir}/%{name}/plug-in/reg_agent.so
%{_libdir}/%{name}/plug-in/registrar_client.so
%{_libdir}/%{name}/plug-in/sipctrl.so
%{_libdir}/%{name}/plug-in/session_timer.so
%{_libdir}/%{name}/plug-in/stats.so
%{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
%{_libdir}/%{name}/plug-in/uac_auth.so
%{_libdir}/%{name}/plug-in/unixsockctrl.so
%{_libdir}/%{name}/plug-in/voicebox.so
%{_libdir}/%{name}/plug-in/voicemail.so
%{_libdir}/%{name}/plug-in/wav.so
%{_libdir}/%{name}/plug-in/webconference.so

%files conf_auth
%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth
%{_libdir}/%{name}/ivr/conf_auth.py
%{_libdir}/%{name}/ivr/conf_auth.pyc
%{_libdir}/%{name}/ivr/conf_auth.pyo

%files diameter_client
%defattr(-,root,root)
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so

%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so

%files gateway
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
%{_libdir}/%{name}/plug-in/gateway.so

%files gsm
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so

%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr
%dir %{_libdir}/%{name}/ivr
%{_libdir}/%{name}/plug-in/ivr.so
%{_libdir}/%{name}/plug-in/log.py
%{_libdir}/%{name}/plug-in/log.pyc
%{_libdir}/%{name}/plug-in/log.pyo

%files mailbox
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox
%dir %{_datadir}/%{name}/audio/mailbox
%dir %{_libdir}/%{name}/ivr/imap_mailbox
%{_datadir}/%{name}/audio/mailbox/and.wav
%{_datadir}/%{name}/audio/mailbox/beep.wav
%{_datadir}/%{name}/audio/mailbox/bye.wav
%{_datadir}/%{name}/audio/mailbox/default_en.wav
%{_datadir}/%{name}/audio/mailbox/first_msg.wav
%{_datadir}/%{name}/audio/mailbox/msg_deleted.wav
%{_datadir}/%{name}/audio/mailbox/msg_menu.wav
%{_datadir}/%{name}/audio/mailbox/msg_saved.wav
%{_datadir}/%{name}/audio/mailbox/new_msg.wav
%{_datadir}/%{name}/audio/mailbox/next_msg.wav
%{_datadir}/%{name}/audio/mailbox/no_msg.wav
%{_datadir}/%{name}/audio/mailbox/saved_msg.wav
%{_datadir}/%{name}/audio/mailbox/you_have.wav
%{_libdir}/%{name}/ivr/mailbox.py
%{_libdir}/%{name}/ivr/mailbox.pyc
%{_libdir}/%{name}/ivr/mailbox.pyo
%{_libdir}/%{name}/ivr/mailbox_query.py
%{_libdir}/%{name}/ivr/mailbox_query.pyc
%{_libdir}/%{name}/ivr/mailbox_query.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.py
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.py
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.py
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo

%files pin_collect
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect
%dir %{_datadir}/%{name}/audio/pincollect
%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
%{_datadir}/%{name}/audio/pincollect/welcome.wav
%{_libdir}/%{name}/ivr/pin_collect.py
%{_libdir}/%{name}/ivr/pin_collect.pyc
%{_libdir}/%{name}/ivr/pin_collect.pyo

%files python
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems
%{_libdir}/%{name}/plug-in/py_sems.so
%{_libdir}/%{name}/plug-in/py_sems_log.py
%{_libdir}/%{name}/plug-in/py_sems_log.pyc
%{_libdir}/%{name}/plug-in/py_sems_log.pyo

%files speex
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so

%files xmlrpc2di
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di
%{_libdir}/%{name}/plug-in/xmlrpc2di.so

%changelog
* Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
- Use modified tarball (with ilBC sources completely removed)

* Thu Apr  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-4
- Internally shipped xmlrpc++ now uses system optflags
- Added more docs
- Moved audiofiles from libdir to datadir
- Removed empty conf_auth.conf
- Splitted out g722 module
- Splitted out xmlrpc2di module

* Wed Apr  8 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-3
- Fixed installation of python files

* Tue Apr  7 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-2
- Module dsm is back
- Disabled OpenSER-specific features (OpenSER is able to manage SEMS
  via SIP-headers).

* Tue Feb 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-1
- Ver. 1.1.0
- Disabled module dsm

* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.9.svn1160
- New svn snapshot

* Wed Dec  3 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.8.svn1095
- Another one fix for audio installation

* Fri Oct 17 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.7.svn1095
- Fixed installation of audio files

* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.6.svn1095
- New svn rev. 1095
- Some rpmlint-related fixes

* Thu Aug 21 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.5.svn
- Dropped upstreamed sems--initscript_fix.diff
- Installation of some audiofiles was fixed upstream

* Tue Aug 19 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.4.svn
- Splitted ivr module
- Fixed some rpmlint errors

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.3.svn
- Conditional switch "with_ilbc"

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.2.svn
- Splitted some modules

* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.1.svn
- Preliminary ver. 1.0.0 (from svn)

* Sun Jun 29 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-rc1
- GCC4.3 patches upstreamed
- Ver. 1.0.0-rc1

* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> 0.10.0
- Initial package for Fedora

* Wed Dec 13 2006 Peter Nixon <peter+rpmspam at suntel.com.tr>
- First version of the spec file for SUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:07:06 -0000	1.1
+++ .cvsignore	11 Apr 2009 03:29:02 -0000	1.2
@@ -0,0 +1 @@
+sems-1.1.0.w_o_ilbc_sources.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:07:06 -0000	1.1
+++ sources	11 Apr 2009 03:29:02 -0000	1.2
@@ -0,0 +1 @@
+6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz



From peter at fedoraproject.org  Sat Apr 11 03:31:34 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 11 Apr 2009 03:31:34 +0000 (UTC)
Subject: rpms/sems/F-9 import.log, NONE, 1.1 sems--external_gsm_lib.diff,
	NONE, 1.1 sems--flite-hardcoded-path-removal.diff, NONE,
	1.1 sems--py_sources_install.diff, NONE,
	1.1 sems--xmlrpc++-use_fedora_cxxflags.diff, NONE, 1.1 sems.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411033134.ED34B70098@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff 
	sems--py_sources_install.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff sems.spec 
Log Message:
initial import


--- NEW FILE import.log ---
sems-1_1_0-5_fc10:F-9:sems-1.1.0-5.fc10.src.rpm:1239420632

sems--external_gsm_lib.diff:

--- NEW FILE sems--external_gsm_lib.diff ---
--- core/plug-in/gsm/gsm.c~	2008-02-10 21:52:44.000000000 +0300
+++ core/plug-in/gsm/gsm.c	2008-08-13 13:25:17.000000000 +0400
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include "gsm.h"
 #include "../../log.h"
 
 #include <stdlib.h>
--- core/plug-in/gsm/Makefile~	2007-01-18 23:35:32.000000000 +0300
+++ core/plug-in/gsm/Makefile	2008-08-13 14:17:41.000000000 +0400
@@ -3,17 +3,14 @@
 plug_in_name = gsm
 
 module_ldflags = 
-module_cflags  = -I gsm-1.0-pl10/inc -DHAS_STDLIB_H
+module_cflags  = -DHAS_STDLIB_H
 
-module_extra_objs = gsm-1.0-pl10/lib/libgsm.a
+module_extra_objs = -lgsm
 
 extra_clean = clean_gsmlib
 
 include ../Makefile.audio_module
 
-gsm-1.0-pl10/lib/libgsm.a::
-	cd gsm-1.0-pl10; $(MAKE) ./lib/libgsm.a
-
 .PHONY: clean_gsmlib
 clean_gsmlib:
 	cd gsm-1.0-pl10; $(MAKE) clean

sems--flite-hardcoded-path-removal.diff:

--- NEW FILE sems--flite-hardcoded-path-removal.diff ---
--- apps/py_sems/Makefile~	2008-04-23 22:15:21.000000000 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:48:00.725992047 +0400
@@ -21,15 +21,12 @@
 #   flite text to speech
 #
 # uncomment the next lines if you want to have flite text-to-speech (ivr.say("Hello there"); ) 
-FLITE_DIR = /usr/src/flite-1.2-release
 ALT_FLITE_DIR = /usr/include/flite
-PY_SEMS_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+PY_SEMS_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-PY_SEMS_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
+PY_SEMS_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 # On FreeBSD, remove the following flags: -ldl -lpthread 
 module_ldflags = -ldl -lpthread -lutil -lm \
 	$(PYTHON_module_ldflags) \
--- apps/ivr/Makefile~	2008-04-13 15:51:02.000000000 +0400
+++ apps/ivr/Makefile	2009-04-07 23:50:55.087991178 +0400
@@ -25,16 +25,14 @@
 #
 #   flite text to speech
 #
-IVR_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+IVR_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-IVR_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
+IVR_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
 else
 FLITE_DIR = 
 ALT_FLITE_DIR =
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 module_ldflags = -lutil \
 	$(PYTHON_module_ldflags) \
 	$(IVR_TTS_module_ldflags)

sems--py_sources_install.diff:

--- NEW FILE sems--py_sources_install.diff ---
--- apps/py_sems/Makefile~	2009-04-07 23:48:00.725992047 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:52:09.909991935 +0400
@@ -81,7 +81,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile~	2009-04-08 08:30:00.788685533 +0400
+++ apps/ivr/Makefile	2009-04-08 08:31:48.349687025 +0400
@@ -92,7 +92,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in  $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile.ivr_application~	2008-08-20 17:23:41.000000000 +0400
+++ apps/ivr/Makefile.ivr_application	2009-04-08 08:32:38.509685952 +0400
@@ -41,8 +41,10 @@
 .PHONY: install
 install: all $(extra_install)
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
+	install -m ${LIB_PERMISSIONS}  *.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -m ${LIB_PERMISSIONS}  *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
+	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 
 .PHONY: install-cfg

sems--xmlrpc++-use_fedora_cxxflags.diff:

--- NEW FILE sems--xmlrpc++-use_fedora_cxxflags.diff ---
--- apps/xmlrpc2di/xmlrpc++/Makefile~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/Makefile	2009-04-08 11:52:21.235663373 +0400
@@ -6,7 +6,7 @@
 DEBUG		= -g
 OPTIMIZE	= -O2
 GCCWARN		= -Wall #-Wstrict-prototypes
-CXXFLAGS	= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
+EXTRA_CXXFLAGS	?= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
 VERSION		= 0.8
 
 DESTDIR		=
@@ -43,7 +43,7 @@
 
 
 tests:		$(LIB)
-		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
+		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(EXTRA_CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
 
 doc doxygen:
 		cd src && doxygen Doxyfile


--- NEW FILE sems.spec ---
Summary:	SIP Express Media Server, an extensible SIP media server
Name:		sems
Version:	1.1.0
Release:	5%{?dist}
URL:		http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
License:	GPLv2+
Group:		Applications/Communications
# Use external gsm instead of shipped one
Patch2:		sems--external_gsm_lib.diff
# Remove hardcoded path to search for flite includes
Patch3:		sems--flite-hardcoded-path-removal.diff
# install also *.py (not only *.pyc) files
Patch4:		sems--py_sources_install.diff
# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires:	python >= 2.3
BuildRequires:	python
BuildRequires:	sip-devel
BuildRequires:	libsamplerate-devel
BuildRequires:	gsm-devel
BuildRequires:	spandsp-devel
# TODO consider enabling flite support in apps/conference
BuildRequires:	flite-devel
BuildRequires:	speex-devel
BuildRequires:	mISDN-devel
BuildRequires:	openssl-devel
Requires(post):	/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service

%description
SEMS (SIP Express Media Server) is very extensible and programmable
SIP media server for SER or OpenSER. The plug-in based SDK enables
you to extend SEMS and write your own applications and integrate new
codec. Voicemail, announcement and echo plug-ins are already included.
SEMS supports g711u, g711a, GSM06.10 and wav file.

%package	conf_auth
Summary:	Conference with authorization
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	conf_auth
Conference with authorization by PIN-numbers.

%package	diameter_client
Summary:	A simple DIAMETER client implementation
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	diameter_client
This is a very simple DIAMETER client implementation. it does
implement only parts of the base protocol, and is not a complete
DIAMETER implementation.

It is used from other modules with the DI API - i.e. other modules
can execute DI functions to add a server connection, or send a
DIAMETER request.

%package	g722
Summary:	G.722 support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	g722
This is a wrapper around the g722 codec from the spandsp library.

%package	gateway
Summary:	ISDN gateway for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gateway
ISDN gateway for SEMS.

%package	gsm
Summary:	GSM support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gsm
GSM support for SEMS.

%package	ivr
Summary:	IVR functionality for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	ivr
IVR functionality for SEMS.

%package	mailbox
Summary:	Mailbox application
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	mailbox
The mailbox application is a mailbox where callers can leave messages
for offline or unavailable users and the users can dial in to check their
messages. It uses an IMAP server as backend to store the voice messages.

%package	pin_collect
Summary:	Collects a PIN
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	pin_collect
This application collects a PIN and then transfers using a
(proprietary) REFER the call.

%package	python
Summary:	Python bindings for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	python
Python bindings for SEMS.

%package	speex
Summary:	Speex support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	speex
Speex support for SEMS.

%package	xmlrpc2di
Summary:	XMLRPC interface for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	xmlrpc2di
This module makes the Dynamic Invocation (DI) Interfaces exported
by component modules accessible from XMLRPC. Additionally the builtin
methods calls, get_loglevel and set_loglevel are implemented (like in the
stats UDP server). Additionally, it can be used as client to access
XMLRPC servers.

%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch2 -p0 -b .gsm_ext
%patch3 -p0 -b .flite_hardcoded
%patch4 -p0 -b .py_install_also
%patch5 -p0 -b .cxxflags

iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt

%build
make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all

%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS="$RPM_OPT_FLAGS"
make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
	DESTDIR=$RPM_BUILD_ROOT \
	basedir= \
	prefix=%{_prefix} \
	modules-prefix= \
	modules-dir=%{_libdir}/%{name}/plug-in \
	modules-target=%{_libdir}/%{name}/plug-in \
	lib-prefix= \
	lib-dir=%{_libdir}/%{name}/ \
	lib-target=%{_libdir}/%{name}/ \
	ivr-modules-dir=%{_libdir}/%{name}/ivr \
	cfg-prefix= \
	cfg-target=%{_sysconfdir}/%{name}/ \
	doc-prefix= \
	doc-dir=%{_docdir}/%{name}/ \
	audio-prefix= \
	audio-dir=%{_datadir}/%{name}/audio/ \
	audio-target=%{_datadir}/%{name}/audio/

install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}

# Remove installed README
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default

# remove currently empty conf-file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf

# fix permissions
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]; then
	/sbin/chkconfig --add sems || :
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service sems stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del sems || :
fi

%files
%defattr(-,root,root)

%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/audio
%dir %{_datadir}/%{name}/audio/ann_b2b
%dir %{_datadir}/%{name}/audio/announcement
%dir %{_datadir}/%{name}/audio/announce_transfer
%dir %{_datadir}/%{name}/audio/annrecorder
%dir %{_datadir}/%{name}/audio/conference
%dir %{_datadir}/%{name}/audio/voicebox
%dir %{_datadir}/%{name}/audio/voicemail
%dir %{_datadir}/%{name}/audio/webconference
%dir %{_libdir}/%{name}/dsm
%dir %{_libdir}/%{name}/plug-in

%{_sysconfdir}/init.d/%{name}

%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/ann_b2b.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announce_transfer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf

%doc README
%doc apps/dsm/doc/Readme.dsm.txt
%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
%doc apps/dsm/fsmc/Readme.fsmc.txt
%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
%doc core/plug-in/adpcm/README_G711
%doc core/plug-in/stats/README.stats
%doc doc/figures
%doc doc/CHANGELOG
%doc doc/COPYING
%doc doc/Configure-Sems-OpenSER-HOWTO
%doc doc/Configure-Sems-Ser-HOWTO
%doc doc/Readme.ann_b2b
%doc doc/Readme.announce_transfer
%doc doc/Readme.announcement
%doc doc/Readme.annrecorder
%doc doc/Readme.auth_b2b
%doc doc/Readme.call_timer
%doc doc/Readme.callback
%doc doc/Readme.click2dial
%doc doc/Readme.conf_auth
%doc doc/Readme.conference
%doc doc/Readme.early_announce
%doc doc/Readme.echo
%if 0%{?with_ilbc}
%doc doc/Readme.iLBC
%endif
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin
%endif
%doc doc/Readme.msg_storage
%doc doc/Readme.reg_agent
%doc doc/Readme.registrar_client
%doc doc/Readme.sw_prepaid_sip
%doc doc/Readme.uac_auth
%doc doc/Readme.voicebox
%doc doc/Readme.voicemail
%doc doc/Readme.webconference
%doc doc/WHATSNEW_0.10

%{_sbindir}/%{name}
%{_sbindir}/%{name}-stats

%{_datadir}/%{name}/audio/beep.wav
%{_datadir}/%{name}/audio/default_en.wav
%{_datadir}/%{name}/audio/annrecorder/beep.wav
%{_datadir}/%{name}/audio/annrecorder/bye.wav
%{_datadir}/%{name}/audio/annrecorder/confirm.wav
%{_datadir}/%{name}/audio/annrecorder/greeting_set.wav
%{_datadir}/%{name}/audio/annrecorder/to_record.wav
%{_datadir}/%{name}/audio/annrecorder/welcome.wav
%{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
%{_datadir}/%{name}/audio/conference/beep.wav
%{_datadir}/%{name}/audio/conference/first_participant.wav
%{_datadir}/%{name}/audio/voicebox/0.wav
%{_datadir}/%{name}/audio/voicebox/1.wav
%{_datadir}/%{name}/audio/voicebox/10.wav
%{_datadir}/%{name}/audio/voicebox/11.wav
%{_datadir}/%{name}/audio/voicebox/12.wav
%{_datadir}/%{name}/audio/voicebox/13.wav
%{_datadir}/%{name}/audio/voicebox/14.wav
%{_datadir}/%{name}/audio/voicebox/15.wav
%{_datadir}/%{name}/audio/voicebox/16.wav
%{_datadir}/%{name}/audio/voicebox/17.wav
%{_datadir}/%{name}/audio/voicebox/18.wav
%{_datadir}/%{name}/audio/voicebox/19.wav
%{_datadir}/%{name}/audio/voicebox/2.wav
%{_datadir}/%{name}/audio/voicebox/20.wav
%{_datadir}/%{name}/audio/voicebox/3.wav
%{_datadir}/%{name}/audio/voicebox/30.wav
%{_datadir}/%{name}/audio/voicebox/4.wav
%{_datadir}/%{name}/audio/voicebox/40.wav
%{_datadir}/%{name}/audio/voicebox/5.wav
%{_datadir}/%{name}/audio/voicebox/50.wav
%{_datadir}/%{name}/audio/voicebox/6.wav
%{_datadir}/%{name}/audio/voicebox/60.wav
%{_datadir}/%{name}/audio/voicebox/7.wav
%{_datadir}/%{name}/audio/voicebox/70.wav
%{_datadir}/%{name}/audio/voicebox/8.wav
%{_datadir}/%{name}/audio/voicebox/80.wav
%{_datadir}/%{name}/audio/voicebox/9.wav
%{_datadir}/%{name}/audio/voicebox/90.wav
%{_datadir}/%{name}/audio/voicebox/and.wav
%{_datadir}/%{name}/audio/voicebox/bye.wav
%{_datadir}/%{name}/audio/voicebox/first_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/first_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/in_your_voicebox.wav
%{_datadir}/%{name}/audio/voicebox/msg_deleted.wav
%{_datadir}/%{name}/audio/voicebox/msg_end_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_saved.wav
%{_datadir}/%{name}/audio/voicebox/new_msg.wav
%{_datadir}/%{name}/audio/voicebox/new_msgs.wav
%{_datadir}/%{name}/audio/voicebox/next_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/next_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_more_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_msg.wav
%{_datadir}/%{name}/audio/voicebox/pin_prompt.wav
%{_datadir}/%{name}/audio/voicebox/saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/saved_msgs.wav
%{_datadir}/%{name}/audio/voicebox/x1.wav
%{_datadir}/%{name}/audio/voicebox/x2.wav
%{_datadir}/%{name}/audio/voicebox/x3.wav
%{_datadir}/%{name}/audio/voicebox/x4.wav
%{_datadir}/%{name}/audio/voicebox/x5.wav
%{_datadir}/%{name}/audio/voicebox/x6.wav
%{_datadir}/%{name}/audio/voicebox/x7.wav
%{_datadir}/%{name}/audio/voicebox/x8.wav
%{_datadir}/%{name}/audio/voicebox/x9.wav
%{_datadir}/%{name}/audio/voicebox/you_have.wav
%{_datadir}/%{name}/audio/voicemail/default_en.wav
%{_datadir}/%{name}/audio/voicemail/beep.wav
%{_datadir}/%{name}/audio/webconference/0.wav
%{_datadir}/%{name}/audio/webconference/1.wav
%{_datadir}/%{name}/audio/webconference/2.wav
%{_datadir}/%{name}/audio/webconference/3.wav
%{_datadir}/%{name}/audio/webconference/4.wav
%{_datadir}/%{name}/audio/webconference/5.wav
%{_datadir}/%{name}/audio/webconference/6.wav
%{_datadir}/%{name}/audio/webconference/7.wav
%{_datadir}/%{name}/audio/webconference/8.wav
%{_datadir}/%{name}/audio/webconference/9.wav
%{_datadir}/%{name}/audio/webconference/beep.wav
%{_datadir}/%{name}/audio/webconference/entering_conference.wav
%{_datadir}/%{name}/audio/webconference/first_participant.wav
%{_datadir}/%{name}/audio/webconference/pin_prompt.wav
%{_datadir}/%{name}/audio/webconference/wrong_pin.wav

%{_libdir}/%{name}/dsm/mod_dlg.so
%{_libdir}/%{name}/dsm/mod_sys.so
%{_libdir}/%{name}/dsm/mod_uri.so
%{_libdir}/%{name}/dsm/inbound_call.dsm
%{_libdir}/%{name}/dsm/outbound_call.dsm

%{_libdir}/%{name}/plug-in/adpcm.so
%{_libdir}/%{name}/plug-in/ann_b2b.so
%{_libdir}/%{name}/plug-in/announce_transfer.so
%{_libdir}/%{name}/plug-in/announcement.so
%{_libdir}/%{name}/plug-in/annrecorder.so
%{_libdir}/%{name}/plug-in/auth_b2b.so
%{_libdir}/%{name}/plug-in/binrpcctrl.so
%{_libdir}/%{name}/plug-in/call_timer.so
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/cc_acc.so
%{_libdir}/%{name}/plug-in/click2dial.so
%{_libdir}/%{name}/plug-in/conference.so
%{_libdir}/%{name}/plug-in/dsm.so
%{_libdir}/%{name}/plug-in/early_announce.so
%{_libdir}/%{name}/plug-in/echo.so
%if 0%{?with_ilbc}
%{_libdir}/%{name}/plug-in/ilbc.so
%endif
%{_libdir}/%{name}/plug-in/l16.so
%{_libdir}/%{name}/plug-in/msg_storage.so
%{_libdir}/%{name}/plug-in/precoded_announce.so
%{_libdir}/%{name}/plug-in/reg_agent.so
%{_libdir}/%{name}/plug-in/registrar_client.so
%{_libdir}/%{name}/plug-in/sipctrl.so
%{_libdir}/%{name}/plug-in/session_timer.so
%{_libdir}/%{name}/plug-in/stats.so
%{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
%{_libdir}/%{name}/plug-in/uac_auth.so
%{_libdir}/%{name}/plug-in/unixsockctrl.so
%{_libdir}/%{name}/plug-in/voicebox.so
%{_libdir}/%{name}/plug-in/voicemail.so
%{_libdir}/%{name}/plug-in/wav.so
%{_libdir}/%{name}/plug-in/webconference.so

%files conf_auth
%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth
%{_libdir}/%{name}/ivr/conf_auth.py
%{_libdir}/%{name}/ivr/conf_auth.pyc
%{_libdir}/%{name}/ivr/conf_auth.pyo

%files diameter_client
%defattr(-,root,root)
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so

%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so

%files gateway
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
%{_libdir}/%{name}/plug-in/gateway.so

%files gsm
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so

%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr
%dir %{_libdir}/%{name}/ivr
%{_libdir}/%{name}/plug-in/ivr.so
%{_libdir}/%{name}/plug-in/log.py
%{_libdir}/%{name}/plug-in/log.pyc
%{_libdir}/%{name}/plug-in/log.pyo

%files mailbox
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox
%dir %{_datadir}/%{name}/audio/mailbox
%dir %{_libdir}/%{name}/ivr/imap_mailbox
%{_datadir}/%{name}/audio/mailbox/and.wav
%{_datadir}/%{name}/audio/mailbox/beep.wav
%{_datadir}/%{name}/audio/mailbox/bye.wav
%{_datadir}/%{name}/audio/mailbox/default_en.wav
%{_datadir}/%{name}/audio/mailbox/first_msg.wav
%{_datadir}/%{name}/audio/mailbox/msg_deleted.wav
%{_datadir}/%{name}/audio/mailbox/msg_menu.wav
%{_datadir}/%{name}/audio/mailbox/msg_saved.wav
%{_datadir}/%{name}/audio/mailbox/new_msg.wav
%{_datadir}/%{name}/audio/mailbox/next_msg.wav
%{_datadir}/%{name}/audio/mailbox/no_msg.wav
%{_datadir}/%{name}/audio/mailbox/saved_msg.wav
%{_datadir}/%{name}/audio/mailbox/you_have.wav
%{_libdir}/%{name}/ivr/mailbox.py
%{_libdir}/%{name}/ivr/mailbox.pyc
%{_libdir}/%{name}/ivr/mailbox.pyo
%{_libdir}/%{name}/ivr/mailbox_query.py
%{_libdir}/%{name}/ivr/mailbox_query.pyc
%{_libdir}/%{name}/ivr/mailbox_query.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.py
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.py
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.py
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo

%files pin_collect
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect
%dir %{_datadir}/%{name}/audio/pincollect
%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
%{_datadir}/%{name}/audio/pincollect/welcome.wav
%{_libdir}/%{name}/ivr/pin_collect.py
%{_libdir}/%{name}/ivr/pin_collect.pyc
%{_libdir}/%{name}/ivr/pin_collect.pyo

%files python
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems
%{_libdir}/%{name}/plug-in/py_sems.so
%{_libdir}/%{name}/plug-in/py_sems_log.py
%{_libdir}/%{name}/plug-in/py_sems_log.pyc
%{_libdir}/%{name}/plug-in/py_sems_log.pyo

%files speex
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so

%files xmlrpc2di
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di
%{_libdir}/%{name}/plug-in/xmlrpc2di.so

%changelog
* Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
- Use modified tarball (with ilBC sources completely removed)

* Thu Apr  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-4
- Internally shipped xmlrpc++ now uses system optflags
- Added more docs
- Moved audiofiles from libdir to datadir
- Removed empty conf_auth.conf
- Splitted out g722 module
- Splitted out xmlrpc2di module

* Wed Apr  8 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-3
- Fixed installation of python files

* Tue Apr  7 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-2
- Module dsm is back
- Disabled OpenSER-specific features (OpenSER is able to manage SEMS
  via SIP-headers).

* Tue Feb 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-1
- Ver. 1.1.0
- Disabled module dsm

* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.9.svn1160
- New svn snapshot

* Wed Dec  3 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.8.svn1095
- Another one fix for audio installation

* Fri Oct 17 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.7.svn1095
- Fixed installation of audio files

* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.6.svn1095
- New svn rev. 1095
- Some rpmlint-related fixes

* Thu Aug 21 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.5.svn
- Dropped upstreamed sems--initscript_fix.diff
- Installation of some audiofiles was fixed upstream

* Tue Aug 19 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.4.svn
- Splitted ivr module
- Fixed some rpmlint errors

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.3.svn
- Conditional switch "with_ilbc"

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.2.svn
- Splitted some modules

* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.1.svn
- Preliminary ver. 1.0.0 (from svn)

* Sun Jun 29 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-rc1
- GCC4.3 patches upstreamed
- Ver. 1.0.0-rc1

* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> 0.10.0
- Initial package for Fedora

* Wed Dec 13 2006 Peter Nixon <peter+rpmspam at suntel.com.tr>
- First version of the spec file for SUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:07:06 -0000	1.1
+++ .cvsignore	11 Apr 2009 03:31:04 -0000	1.2
@@ -0,0 +1 @@
+sems-1.1.0.w_o_ilbc_sources.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:07:06 -0000	1.1
+++ sources	11 Apr 2009 03:31:04 -0000	1.2
@@ -0,0 +1 @@
+6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz



From peter at fedoraproject.org  Sat Apr 11 03:34:07 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 11 Apr 2009 03:34:07 +0000 (UTC)
Subject: rpms/sems/EL-5 import.log, NONE, 1.1 sems--external_gsm_lib.diff,
	NONE, 1.1 sems--flite-hardcoded-path-removal.diff, NONE,
	1.1 sems--py_sources_install.diff, NONE,
	1.1 sems--xmlrpc++-use_fedora_cxxflags.diff, NONE, 1.1 sems.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411033407.C09B670098@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30426/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff 
	sems--py_sources_install.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff sems.spec 
Log Message:
initial import


--- NEW FILE import.log ---
sems-1_1_0-5_fc10:EL-5:sems-1.1.0-5.fc10.src.rpm:1239420777

sems--external_gsm_lib.diff:

--- NEW FILE sems--external_gsm_lib.diff ---
--- core/plug-in/gsm/gsm.c~	2008-02-10 21:52:44.000000000 +0300
+++ core/plug-in/gsm/gsm.c	2008-08-13 13:25:17.000000000 +0400
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include "gsm.h"
 #include "../../log.h"
 
 #include <stdlib.h>
--- core/plug-in/gsm/Makefile~	2007-01-18 23:35:32.000000000 +0300
+++ core/plug-in/gsm/Makefile	2008-08-13 14:17:41.000000000 +0400
@@ -3,17 +3,14 @@
 plug_in_name = gsm
 
 module_ldflags = 
-module_cflags  = -I gsm-1.0-pl10/inc -DHAS_STDLIB_H
+module_cflags  = -DHAS_STDLIB_H
 
-module_extra_objs = gsm-1.0-pl10/lib/libgsm.a
+module_extra_objs = -lgsm
 
 extra_clean = clean_gsmlib
 
 include ../Makefile.audio_module
 
-gsm-1.0-pl10/lib/libgsm.a::
-	cd gsm-1.0-pl10; $(MAKE) ./lib/libgsm.a
-
 .PHONY: clean_gsmlib
 clean_gsmlib:
 	cd gsm-1.0-pl10; $(MAKE) clean

sems--flite-hardcoded-path-removal.diff:

--- NEW FILE sems--flite-hardcoded-path-removal.diff ---
--- apps/py_sems/Makefile~	2008-04-23 22:15:21.000000000 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:48:00.725992047 +0400
@@ -21,15 +21,12 @@
 #   flite text to speech
 #
 # uncomment the next lines if you want to have flite text-to-speech (ivr.say("Hello there"); ) 
-FLITE_DIR = /usr/src/flite-1.2-release
 ALT_FLITE_DIR = /usr/include/flite
-PY_SEMS_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+PY_SEMS_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-PY_SEMS_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
+PY_SEMS_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 # On FreeBSD, remove the following flags: -ldl -lpthread 
 module_ldflags = -ldl -lpthread -lutil -lm \
 	$(PYTHON_module_ldflags) \
--- apps/ivr/Makefile~	2008-04-13 15:51:02.000000000 +0400
+++ apps/ivr/Makefile	2009-04-07 23:50:55.087991178 +0400
@@ -25,16 +25,14 @@
 #
 #   flite text to speech
 #
-IVR_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+IVR_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-IVR_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
+IVR_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
 else
 FLITE_DIR = 
 ALT_FLITE_DIR =
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 module_ldflags = -lutil \
 	$(PYTHON_module_ldflags) \
 	$(IVR_TTS_module_ldflags)

sems--py_sources_install.diff:

--- NEW FILE sems--py_sources_install.diff ---
--- apps/py_sems/Makefile~	2009-04-07 23:48:00.725992047 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:52:09.909991935 +0400
@@ -81,7 +81,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile~	2009-04-08 08:30:00.788685533 +0400
+++ apps/ivr/Makefile	2009-04-08 08:31:48.349687025 +0400
@@ -92,7 +92,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in  $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile.ivr_application~	2008-08-20 17:23:41.000000000 +0400
+++ apps/ivr/Makefile.ivr_application	2009-04-08 08:32:38.509685952 +0400
@@ -41,8 +41,10 @@
 .PHONY: install
 install: all $(extra_install)
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
+	install -m ${LIB_PERMISSIONS}  *.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -m ${LIB_PERMISSIONS}  *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
+	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 
 .PHONY: install-cfg

sems--xmlrpc++-use_fedora_cxxflags.diff:

--- NEW FILE sems--xmlrpc++-use_fedora_cxxflags.diff ---
--- apps/xmlrpc2di/xmlrpc++/Makefile~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/Makefile	2009-04-08 11:52:21.235663373 +0400
@@ -6,7 +6,7 @@
 DEBUG		= -g
 OPTIMIZE	= -O2
 GCCWARN		= -Wall #-Wstrict-prototypes
-CXXFLAGS	= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
+EXTRA_CXXFLAGS	?= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
 VERSION		= 0.8
 
 DESTDIR		=
@@ -43,7 +43,7 @@
 
 
 tests:		$(LIB)
-		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
+		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(EXTRA_CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
 
 doc doxygen:
 		cd src && doxygen Doxyfile


--- NEW FILE sems.spec ---
Summary:	SIP Express Media Server, an extensible SIP media server
Name:		sems
Version:	1.1.0
Release:	5%{?dist}
URL:		http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
License:	GPLv2+
Group:		Applications/Communications
# Use external gsm instead of shipped one
Patch2:		sems--external_gsm_lib.diff
# Remove hardcoded path to search for flite includes
Patch3:		sems--flite-hardcoded-path-removal.diff
# install also *.py (not only *.pyc) files
Patch4:		sems--py_sources_install.diff
# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires:	python >= 2.3
BuildRequires:	python
BuildRequires:	sip-devel
BuildRequires:	libsamplerate-devel
BuildRequires:	gsm-devel
BuildRequires:	spandsp-devel
# TODO consider enabling flite support in apps/conference
BuildRequires:	flite-devel
BuildRequires:	speex-devel
BuildRequires:	mISDN-devel
BuildRequires:	openssl-devel
Requires(post):	/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service

%description
SEMS (SIP Express Media Server) is very extensible and programmable
SIP media server for SER or OpenSER. The plug-in based SDK enables
you to extend SEMS and write your own applications and integrate new
codec. Voicemail, announcement and echo plug-ins are already included.
SEMS supports g711u, g711a, GSM06.10 and wav file.

%package	conf_auth
Summary:	Conference with authorization
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	conf_auth
Conference with authorization by PIN-numbers.

%package	diameter_client
Summary:	A simple DIAMETER client implementation
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	diameter_client
This is a very simple DIAMETER client implementation. it does
implement only parts of the base protocol, and is not a complete
DIAMETER implementation.

It is used from other modules with the DI API - i.e. other modules
can execute DI functions to add a server connection, or send a
DIAMETER request.

%package	g722
Summary:	G.722 support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	g722
This is a wrapper around the g722 codec from the spandsp library.

%package	gateway
Summary:	ISDN gateway for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gateway
ISDN gateway for SEMS.

%package	gsm
Summary:	GSM support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gsm
GSM support for SEMS.

%package	ivr
Summary:	IVR functionality for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	ivr
IVR functionality for SEMS.

%package	mailbox
Summary:	Mailbox application
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	mailbox
The mailbox application is a mailbox where callers can leave messages
for offline or unavailable users and the users can dial in to check their
messages. It uses an IMAP server as backend to store the voice messages.

%package	pin_collect
Summary:	Collects a PIN
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	pin_collect
This application collects a PIN and then transfers using a
(proprietary) REFER the call.

%package	python
Summary:	Python bindings for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	python
Python bindings for SEMS.

%package	speex
Summary:	Speex support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	speex
Speex support for SEMS.

%package	xmlrpc2di
Summary:	XMLRPC interface for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	xmlrpc2di
This module makes the Dynamic Invocation (DI) Interfaces exported
by component modules accessible from XMLRPC. Additionally the builtin
methods calls, get_loglevel and set_loglevel are implemented (like in the
stats UDP server). Additionally, it can be used as client to access
XMLRPC servers.

%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch2 -p0 -b .gsm_ext
%patch3 -p0 -b .flite_hardcoded
%patch4 -p0 -b .py_install_also
%patch5 -p0 -b .cxxflags

iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt

%build
make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all

%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS="$RPM_OPT_FLAGS"
make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
	DESTDIR=$RPM_BUILD_ROOT \
	basedir= \
	prefix=%{_prefix} \
	modules-prefix= \
	modules-dir=%{_libdir}/%{name}/plug-in \
	modules-target=%{_libdir}/%{name}/plug-in \
	lib-prefix= \
	lib-dir=%{_libdir}/%{name}/ \
	lib-target=%{_libdir}/%{name}/ \
	ivr-modules-dir=%{_libdir}/%{name}/ivr \
	cfg-prefix= \
	cfg-target=%{_sysconfdir}/%{name}/ \
	doc-prefix= \
	doc-dir=%{_docdir}/%{name}/ \
	audio-prefix= \
	audio-dir=%{_datadir}/%{name}/audio/ \
	audio-target=%{_datadir}/%{name}/audio/

install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}

# Remove installed README
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default

# remove currently empty conf-file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf

# fix permissions
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]; then
	/sbin/chkconfig --add sems || :
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service sems stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del sems || :
fi

%files
%defattr(-,root,root)

%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/audio
%dir %{_datadir}/%{name}/audio/ann_b2b
%dir %{_datadir}/%{name}/audio/announcement
%dir %{_datadir}/%{name}/audio/announce_transfer
%dir %{_datadir}/%{name}/audio/annrecorder
%dir %{_datadir}/%{name}/audio/conference
%dir %{_datadir}/%{name}/audio/voicebox
%dir %{_datadir}/%{name}/audio/voicemail
%dir %{_datadir}/%{name}/audio/webconference
%dir %{_libdir}/%{name}/dsm
%dir %{_libdir}/%{name}/plug-in

%{_sysconfdir}/init.d/%{name}

%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/ann_b2b.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announce_transfer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf

%doc README
%doc apps/dsm/doc/Readme.dsm.txt
%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
%doc apps/dsm/fsmc/Readme.fsmc.txt
%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
%doc core/plug-in/adpcm/README_G711
%doc core/plug-in/stats/README.stats
%doc doc/figures
%doc doc/CHANGELOG
%doc doc/COPYING
%doc doc/Configure-Sems-OpenSER-HOWTO
%doc doc/Configure-Sems-Ser-HOWTO
%doc doc/Readme.ann_b2b
%doc doc/Readme.announce_transfer
%doc doc/Readme.announcement
%doc doc/Readme.annrecorder
%doc doc/Readme.auth_b2b
%doc doc/Readme.call_timer
%doc doc/Readme.callback
%doc doc/Readme.click2dial
%doc doc/Readme.conf_auth
%doc doc/Readme.conference
%doc doc/Readme.early_announce
%doc doc/Readme.echo
%if 0%{?with_ilbc}
%doc doc/Readme.iLBC
%endif
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin
%endif
%doc doc/Readme.msg_storage
%doc doc/Readme.reg_agent
%doc doc/Readme.registrar_client
%doc doc/Readme.sw_prepaid_sip
%doc doc/Readme.uac_auth
%doc doc/Readme.voicebox
%doc doc/Readme.voicemail
%doc doc/Readme.webconference
%doc doc/WHATSNEW_0.10

%{_sbindir}/%{name}
%{_sbindir}/%{name}-stats

%{_datadir}/%{name}/audio/beep.wav
%{_datadir}/%{name}/audio/default_en.wav
%{_datadir}/%{name}/audio/annrecorder/beep.wav
%{_datadir}/%{name}/audio/annrecorder/bye.wav
%{_datadir}/%{name}/audio/annrecorder/confirm.wav
%{_datadir}/%{name}/audio/annrecorder/greeting_set.wav
%{_datadir}/%{name}/audio/annrecorder/to_record.wav
%{_datadir}/%{name}/audio/annrecorder/welcome.wav
%{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
%{_datadir}/%{name}/audio/conference/beep.wav
%{_datadir}/%{name}/audio/conference/first_participant.wav
%{_datadir}/%{name}/audio/voicebox/0.wav
%{_datadir}/%{name}/audio/voicebox/1.wav
%{_datadir}/%{name}/audio/voicebox/10.wav
%{_datadir}/%{name}/audio/voicebox/11.wav
%{_datadir}/%{name}/audio/voicebox/12.wav
%{_datadir}/%{name}/audio/voicebox/13.wav
%{_datadir}/%{name}/audio/voicebox/14.wav
%{_datadir}/%{name}/audio/voicebox/15.wav
%{_datadir}/%{name}/audio/voicebox/16.wav
%{_datadir}/%{name}/audio/voicebox/17.wav
%{_datadir}/%{name}/audio/voicebox/18.wav
%{_datadir}/%{name}/audio/voicebox/19.wav
%{_datadir}/%{name}/audio/voicebox/2.wav
%{_datadir}/%{name}/audio/voicebox/20.wav
%{_datadir}/%{name}/audio/voicebox/3.wav
%{_datadir}/%{name}/audio/voicebox/30.wav
%{_datadir}/%{name}/audio/voicebox/4.wav
%{_datadir}/%{name}/audio/voicebox/40.wav
%{_datadir}/%{name}/audio/voicebox/5.wav
%{_datadir}/%{name}/audio/voicebox/50.wav
%{_datadir}/%{name}/audio/voicebox/6.wav
%{_datadir}/%{name}/audio/voicebox/60.wav
%{_datadir}/%{name}/audio/voicebox/7.wav
%{_datadir}/%{name}/audio/voicebox/70.wav
%{_datadir}/%{name}/audio/voicebox/8.wav
%{_datadir}/%{name}/audio/voicebox/80.wav
%{_datadir}/%{name}/audio/voicebox/9.wav
%{_datadir}/%{name}/audio/voicebox/90.wav
%{_datadir}/%{name}/audio/voicebox/and.wav
%{_datadir}/%{name}/audio/voicebox/bye.wav
%{_datadir}/%{name}/audio/voicebox/first_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/first_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/in_your_voicebox.wav
%{_datadir}/%{name}/audio/voicebox/msg_deleted.wav
%{_datadir}/%{name}/audio/voicebox/msg_end_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_saved.wav
%{_datadir}/%{name}/audio/voicebox/new_msg.wav
%{_datadir}/%{name}/audio/voicebox/new_msgs.wav
%{_datadir}/%{name}/audio/voicebox/next_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/next_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_more_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_msg.wav
%{_datadir}/%{name}/audio/voicebox/pin_prompt.wav
%{_datadir}/%{name}/audio/voicebox/saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/saved_msgs.wav
%{_datadir}/%{name}/audio/voicebox/x1.wav
%{_datadir}/%{name}/audio/voicebox/x2.wav
%{_datadir}/%{name}/audio/voicebox/x3.wav
%{_datadir}/%{name}/audio/voicebox/x4.wav
%{_datadir}/%{name}/audio/voicebox/x5.wav
%{_datadir}/%{name}/audio/voicebox/x6.wav
%{_datadir}/%{name}/audio/voicebox/x7.wav
%{_datadir}/%{name}/audio/voicebox/x8.wav
%{_datadir}/%{name}/audio/voicebox/x9.wav
%{_datadir}/%{name}/audio/voicebox/you_have.wav
%{_datadir}/%{name}/audio/voicemail/default_en.wav
%{_datadir}/%{name}/audio/voicemail/beep.wav
%{_datadir}/%{name}/audio/webconference/0.wav
%{_datadir}/%{name}/audio/webconference/1.wav
%{_datadir}/%{name}/audio/webconference/2.wav
%{_datadir}/%{name}/audio/webconference/3.wav
%{_datadir}/%{name}/audio/webconference/4.wav
%{_datadir}/%{name}/audio/webconference/5.wav
%{_datadir}/%{name}/audio/webconference/6.wav
%{_datadir}/%{name}/audio/webconference/7.wav
%{_datadir}/%{name}/audio/webconference/8.wav
%{_datadir}/%{name}/audio/webconference/9.wav
%{_datadir}/%{name}/audio/webconference/beep.wav
%{_datadir}/%{name}/audio/webconference/entering_conference.wav
%{_datadir}/%{name}/audio/webconference/first_participant.wav
%{_datadir}/%{name}/audio/webconference/pin_prompt.wav
%{_datadir}/%{name}/audio/webconference/wrong_pin.wav

%{_libdir}/%{name}/dsm/mod_dlg.so
%{_libdir}/%{name}/dsm/mod_sys.so
%{_libdir}/%{name}/dsm/mod_uri.so
%{_libdir}/%{name}/dsm/inbound_call.dsm
%{_libdir}/%{name}/dsm/outbound_call.dsm

%{_libdir}/%{name}/plug-in/adpcm.so
%{_libdir}/%{name}/plug-in/ann_b2b.so
%{_libdir}/%{name}/plug-in/announce_transfer.so
%{_libdir}/%{name}/plug-in/announcement.so
%{_libdir}/%{name}/plug-in/annrecorder.so
%{_libdir}/%{name}/plug-in/auth_b2b.so
%{_libdir}/%{name}/plug-in/binrpcctrl.so
%{_libdir}/%{name}/plug-in/call_timer.so
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/cc_acc.so
%{_libdir}/%{name}/plug-in/click2dial.so
%{_libdir}/%{name}/plug-in/conference.so
%{_libdir}/%{name}/plug-in/dsm.so
%{_libdir}/%{name}/plug-in/early_announce.so
%{_libdir}/%{name}/plug-in/echo.so
%if 0%{?with_ilbc}
%{_libdir}/%{name}/plug-in/ilbc.so
%endif
%{_libdir}/%{name}/plug-in/l16.so
%{_libdir}/%{name}/plug-in/msg_storage.so
%{_libdir}/%{name}/plug-in/precoded_announce.so
%{_libdir}/%{name}/plug-in/reg_agent.so
%{_libdir}/%{name}/plug-in/registrar_client.so
%{_libdir}/%{name}/plug-in/sipctrl.so
%{_libdir}/%{name}/plug-in/session_timer.so
%{_libdir}/%{name}/plug-in/stats.so
%{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
%{_libdir}/%{name}/plug-in/uac_auth.so
%{_libdir}/%{name}/plug-in/unixsockctrl.so
%{_libdir}/%{name}/plug-in/voicebox.so
%{_libdir}/%{name}/plug-in/voicemail.so
%{_libdir}/%{name}/plug-in/wav.so
%{_libdir}/%{name}/plug-in/webconference.so

%files conf_auth
%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth
%{_libdir}/%{name}/ivr/conf_auth.py
%{_libdir}/%{name}/ivr/conf_auth.pyc
%{_libdir}/%{name}/ivr/conf_auth.pyo

%files diameter_client
%defattr(-,root,root)
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so

%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so

%files gateway
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
%{_libdir}/%{name}/plug-in/gateway.so

%files gsm
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so

%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr
%dir %{_libdir}/%{name}/ivr
%{_libdir}/%{name}/plug-in/ivr.so
%{_libdir}/%{name}/plug-in/log.py
%{_libdir}/%{name}/plug-in/log.pyc
%{_libdir}/%{name}/plug-in/log.pyo

%files mailbox
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox
%dir %{_datadir}/%{name}/audio/mailbox
%dir %{_libdir}/%{name}/ivr/imap_mailbox
%{_datadir}/%{name}/audio/mailbox/and.wav
%{_datadir}/%{name}/audio/mailbox/beep.wav
%{_datadir}/%{name}/audio/mailbox/bye.wav
%{_datadir}/%{name}/audio/mailbox/default_en.wav
%{_datadir}/%{name}/audio/mailbox/first_msg.wav
%{_datadir}/%{name}/audio/mailbox/msg_deleted.wav
%{_datadir}/%{name}/audio/mailbox/msg_menu.wav
%{_datadir}/%{name}/audio/mailbox/msg_saved.wav
%{_datadir}/%{name}/audio/mailbox/new_msg.wav
%{_datadir}/%{name}/audio/mailbox/next_msg.wav
%{_datadir}/%{name}/audio/mailbox/no_msg.wav
%{_datadir}/%{name}/audio/mailbox/saved_msg.wav
%{_datadir}/%{name}/audio/mailbox/you_have.wav
%{_libdir}/%{name}/ivr/mailbox.py
%{_libdir}/%{name}/ivr/mailbox.pyc
%{_libdir}/%{name}/ivr/mailbox.pyo
%{_libdir}/%{name}/ivr/mailbox_query.py
%{_libdir}/%{name}/ivr/mailbox_query.pyc
%{_libdir}/%{name}/ivr/mailbox_query.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.py
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.py
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.py
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo

%files pin_collect
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect
%dir %{_datadir}/%{name}/audio/pincollect
%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
%{_datadir}/%{name}/audio/pincollect/welcome.wav
%{_libdir}/%{name}/ivr/pin_collect.py
%{_libdir}/%{name}/ivr/pin_collect.pyc
%{_libdir}/%{name}/ivr/pin_collect.pyo

%files python
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems
%{_libdir}/%{name}/plug-in/py_sems.so
%{_libdir}/%{name}/plug-in/py_sems_log.py
%{_libdir}/%{name}/plug-in/py_sems_log.pyc
%{_libdir}/%{name}/plug-in/py_sems_log.pyo

%files speex
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so

%files xmlrpc2di
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di
%{_libdir}/%{name}/plug-in/xmlrpc2di.so

%changelog
* Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
- Use modified tarball (with ilBC sources completely removed)

* Thu Apr  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-4
- Internally shipped xmlrpc++ now uses system optflags
- Added more docs
- Moved audiofiles from libdir to datadir
- Removed empty conf_auth.conf
- Splitted out g722 module
- Splitted out xmlrpc2di module

* Wed Apr  8 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-3
- Fixed installation of python files

* Tue Apr  7 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-2
- Module dsm is back
- Disabled OpenSER-specific features (OpenSER is able to manage SEMS
  via SIP-headers).

* Tue Feb 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-1
- Ver. 1.1.0
- Disabled module dsm

* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.9.svn1160
- New svn snapshot

* Wed Dec  3 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.8.svn1095
- Another one fix for audio installation

* Fri Oct 17 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.7.svn1095
- Fixed installation of audio files

* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.6.svn1095
- New svn rev. 1095
- Some rpmlint-related fixes

* Thu Aug 21 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.5.svn
- Dropped upstreamed sems--initscript_fix.diff
- Installation of some audiofiles was fixed upstream

* Tue Aug 19 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.4.svn
- Splitted ivr module
- Fixed some rpmlint errors

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.3.svn
- Conditional switch "with_ilbc"

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.2.svn
- Splitted some modules

* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.1.svn
- Preliminary ver. 1.0.0 (from svn)

* Sun Jun 29 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-rc1
- GCC4.3 patches upstreamed
- Ver. 1.0.0-rc1

* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> 0.10.0
- Initial package for Fedora

* Wed Dec 13 2006 Peter Nixon <peter+rpmspam at suntel.com.tr>
- First version of the spec file for SUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:07:06 -0000	1.1
+++ .cvsignore	11 Apr 2009 03:34:06 -0000	1.2
@@ -0,0 +1 @@
+sems-1.1.0.w_o_ilbc_sources.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:07:06 -0000	1.1
+++ sources	11 Apr 2009 03:34:06 -0000	1.2
@@ -0,0 +1 @@
+6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz



From peter at fedoraproject.org  Sat Apr 11 03:38:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 11 Apr 2009 03:38:06 +0000 (UTC)
Subject: rpms/sems/EL-4 import.log, NONE, 1.1 sems--external_gsm_lib.diff,
	NONE, 1.1 sems--flite-hardcoded-path-removal.diff, NONE,
	1.1 sems--py_sources_install.diff, NONE,
	1.1 sems--xmlrpc++-use_fedora_cxxflags.diff, NONE, 1.1 sems.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411033806.A558170098@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31731/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sems--external_gsm_lib.diff 
	sems--flite-hardcoded-path-removal.diff 
	sems--py_sources_install.diff 
	sems--xmlrpc++-use_fedora_cxxflags.diff sems.spec 
Log Message:
initial import


--- NEW FILE import.log ---
sems-1_1_0-5_fc10:EL-4:sems-1.1.0-5.fc10.src.rpm:1239421015

sems--external_gsm_lib.diff:

--- NEW FILE sems--external_gsm_lib.diff ---
--- core/plug-in/gsm/gsm.c~	2008-02-10 21:52:44.000000000 +0300
+++ core/plug-in/gsm/gsm.c	2008-08-13 13:25:17.000000000 +0400
@@ -27,7 +27,7 @@
 
 #include "amci.h"
 #include "codecs.h"
-#include "gsm-1.0-pl10/inc/gsm.h"
+#include "gsm.h"
 #include "../../log.h"
 
 #include <stdlib.h>
--- core/plug-in/gsm/Makefile~	2007-01-18 23:35:32.000000000 +0300
+++ core/plug-in/gsm/Makefile	2008-08-13 14:17:41.000000000 +0400
@@ -3,17 +3,14 @@
 plug_in_name = gsm
 
 module_ldflags = 
-module_cflags  = -I gsm-1.0-pl10/inc -DHAS_STDLIB_H
+module_cflags  = -DHAS_STDLIB_H
 
-module_extra_objs = gsm-1.0-pl10/lib/libgsm.a
+module_extra_objs = -lgsm
 
 extra_clean = clean_gsmlib
 
 include ../Makefile.audio_module
 
-gsm-1.0-pl10/lib/libgsm.a::
-	cd gsm-1.0-pl10; $(MAKE) ./lib/libgsm.a
-
 .PHONY: clean_gsmlib
 clean_gsmlib:
 	cd gsm-1.0-pl10; $(MAKE) clean

sems--flite-hardcoded-path-removal.diff:

--- NEW FILE sems--flite-hardcoded-path-removal.diff ---
--- apps/py_sems/Makefile~	2008-04-23 22:15:21.000000000 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:48:00.725992047 +0400
@@ -21,15 +21,12 @@
 #   flite text to speech
 #
 # uncomment the next lines if you want to have flite text-to-speech (ivr.say("Hello there"); ) 
-FLITE_DIR = /usr/src/flite-1.2-release
 ALT_FLITE_DIR = /usr/include/flite
-PY_SEMS_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+PY_SEMS_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-PY_SEMS_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
+PY_SEMS_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DPY_SEMS_WITH_TTS
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 # On FreeBSD, remove the following flags: -ldl -lpthread 
 module_ldflags = -ldl -lpthread -lutil -lm \
 	$(PYTHON_module_ldflags) \
--- apps/ivr/Makefile~	2008-04-13 15:51:02.000000000 +0400
+++ apps/ivr/Makefile	2009-04-07 23:50:55.087991178 +0400
@@ -25,16 +25,14 @@
 #
 #   flite text to speech
 #
-IVR_TTS_module_ldflags =  -L$(FLITE_DIR)/lib -lm  -lflite_cmu_us_kal  -lflite_usenglish \
+IVR_TTS_module_ldflags =  -lm  -lflite_cmu_us_kal  -lflite_usenglish \
 	-lflite_cmulex -lflite
-IVR_TTS_module_cflags = -I$(FLITE_DIR)/include  -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
+IVR_TTS_module_cflags = -I$(ALT_FLITE_DIR) -DIVR_WITH_TTS
 else
 FLITE_DIR = 
 ALT_FLITE_DIR =
 endif
 
-LOCAL_INCLUDES = -I$(FLITE_DIR)/lang/usenglish
-
 module_ldflags = -lutil \
 	$(PYTHON_module_ldflags) \
 	$(IVR_TTS_module_ldflags)

sems--py_sources_install.diff:

--- NEW FILE sems--py_sources_install.diff ---
--- apps/py_sems/Makefile~	2009-04-07 23:48:00.725992047 +0400
+++ apps/py_sems/Makefile	2009-04-07 23:52:09.909991935 +0400
@@ -81,7 +81,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile~	2009-04-08 08:30:00.788685533 +0400
+++ apps/ivr/Makefile	2009-04-08 08:31:48.349687025 +0400
@@ -92,7 +92,7 @@
 .PHONY: install_python_files
 install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir)
 	echo "Installing Python object files..."
-	for f in $(py_obj) ; do \
+	for f in  $(py_src) $(py_obj) ; do \
 		if [ -n "py/$$f" ]; then \
 			$(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
 			$(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \
--- apps/ivr/Makefile.ivr_application~	2008-08-20 17:23:41.000000000 +0400
+++ apps/ivr/Makefile.ivr_application	2009-04-08 08:32:38.509685952 +0400
@@ -41,8 +41,10 @@
 .PHONY: install
 install: all $(extra_install)
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
+	install -m ${LIB_PERMISSIONS}  *.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -m ${LIB_PERMISSIONS}  *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}
 	install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
+	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.py $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 	install -m ${LIB_PERMISSIONS}  ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR}
 
 .PHONY: install-cfg

sems--xmlrpc++-use_fedora_cxxflags.diff:

--- NEW FILE sems--xmlrpc++-use_fedora_cxxflags.diff ---
--- apps/xmlrpc2di/xmlrpc++/Makefile~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/Makefile	2009-04-08 11:52:21.235663373 +0400
@@ -6,7 +6,7 @@
 DEBUG		= -g
 OPTIMIZE	= -O2
 GCCWARN		= -Wall #-Wstrict-prototypes
-CXXFLAGS	= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
+EXTRA_CXXFLAGS	?= $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
 VERSION		= 0.8
 
 DESTDIR		=
@@ -43,7 +43,7 @@
 
 
 tests:		$(LIB)
-		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
+		cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(EXTRA_CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
 
 doc doxygen:
 		cd src && doxygen Doxyfile


--- NEW FILE sems.spec ---
Summary:	SIP Express Media Server, an extensible SIP media server
Name:		sems
Version:	1.1.0
Release:	5%{?dist}
URL:		http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
License:	GPLv2+
Group:		Applications/Communications
# Use external gsm instead of shipped one
Patch2:		sems--external_gsm_lib.diff
# Remove hardcoded path to search for flite includes
Patch3:		sems--flite-hardcoded-path-removal.diff
# install also *.py (not only *.pyc) files
Patch4:		sems--py_sources_install.diff
# module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires:	python >= 2.3
BuildRequires:	python
BuildRequires:	sip-devel
BuildRequires:	libsamplerate-devel
BuildRequires:	gsm-devel
BuildRequires:	spandsp-devel
# TODO consider enabling flite support in apps/conference
BuildRequires:	flite-devel
BuildRequires:	speex-devel
BuildRequires:	mISDN-devel
BuildRequires:	openssl-devel
Requires(post):	/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service

%description
SEMS (SIP Express Media Server) is very extensible and programmable
SIP media server for SER or OpenSER. The plug-in based SDK enables
you to extend SEMS and write your own applications and integrate new
codec. Voicemail, announcement and echo plug-ins are already included.
SEMS supports g711u, g711a, GSM06.10 and wav file.

%package	conf_auth
Summary:	Conference with authorization
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	conf_auth
Conference with authorization by PIN-numbers.

%package	diameter_client
Summary:	A simple DIAMETER client implementation
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	diameter_client
This is a very simple DIAMETER client implementation. it does
implement only parts of the base protocol, and is not a complete
DIAMETER implementation.

It is used from other modules with the DI API - i.e. other modules
can execute DI functions to add a server connection, or send a
DIAMETER request.

%package	g722
Summary:	G.722 support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	g722
This is a wrapper around the g722 codec from the spandsp library.

%package	gateway
Summary:	ISDN gateway for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gateway
ISDN gateway for SEMS.

%package	gsm
Summary:	GSM support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	gsm
GSM support for SEMS.

%package	ivr
Summary:	IVR functionality for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	ivr
IVR functionality for SEMS.

%package	mailbox
Summary:	Mailbox application
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	mailbox
The mailbox application is a mailbox where callers can leave messages
for offline or unavailable users and the users can dial in to check their
messages. It uses an IMAP server as backend to store the voice messages.

%package	pin_collect
Summary:	Collects a PIN
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-ivr = %{version}-%{release}

%description	pin_collect
This application collects a PIN and then transfers using a
(proprietary) REFER the call.

%package	python
Summary:	Python bindings for SEMS
Group:		Applications/Communications
Requires:	python >= 2.3
Requires:	%{name} = %{version}-%{release}

%description	python
Python bindings for SEMS.

%package	speex
Summary:	Speex support for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	speex
Speex support for SEMS.

%package	xmlrpc2di
Summary:	XMLRPC interface for SEMS
Group:		Applications/Communications
Requires:	%{name} = %{version}-%{release}

%description	xmlrpc2di
This module makes the Dynamic Invocation (DI) Interfaces exported
by component modules accessible from XMLRPC. Additionally the builtin
methods calls, get_loglevel and set_loglevel are implemented (like in the
stats UDP server). Additionally, it can be used as client to access
XMLRPC servers.

%prep
%setup -q
rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch2 -p0 -b .gsm_ext
%patch3 -p0 -b .flite_hardcoded
%patch4 -p0 -b .py_install_also
%patch5 -p0 -b .cxxflags

iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt

%build
make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all

%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS="$RPM_OPT_FLAGS"
make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
	DESTDIR=$RPM_BUILD_ROOT \
	basedir= \
	prefix=%{_prefix} \
	modules-prefix= \
	modules-dir=%{_libdir}/%{name}/plug-in \
	modules-target=%{_libdir}/%{name}/plug-in \
	lib-prefix= \
	lib-dir=%{_libdir}/%{name}/ \
	lib-target=%{_libdir}/%{name}/ \
	ivr-modules-dir=%{_libdir}/%{name}/ivr \
	cfg-prefix= \
	cfg-target=%{_sysconfdir}/%{name}/ \
	doc-prefix= \
	doc-dir=%{_docdir}/%{name}/ \
	audio-prefix= \
	audio-dir=%{_datadir}/%{name}/audio/ \
	audio-target=%{_datadir}/%{name}/audio/

install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}

# Remove installed README
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template.sample
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sems.conf.default

# remove currently empty conf-file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf

# fix permissions
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]; then
	/sbin/chkconfig --add sems || :
fi

%preun
if [ $1 -eq 0 ]; then
	/sbin/service sems stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del sems || :
fi

%files
%defattr(-,root,root)

%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/audio
%dir %{_datadir}/%{name}/audio/ann_b2b
%dir %{_datadir}/%{name}/audio/announcement
%dir %{_datadir}/%{name}/audio/announce_transfer
%dir %{_datadir}/%{name}/audio/annrecorder
%dir %{_datadir}/%{name}/audio/conference
%dir %{_datadir}/%{name}/audio/voicebox
%dir %{_datadir}/%{name}/audio/voicemail
%dir %{_datadir}/%{name}/audio/webconference
%dir %{_libdir}/%{name}/dsm
%dir %{_libdir}/%{name}/plug-in

%{_sysconfdir}/init.d/%{name}

%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/ann_b2b.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announce_transfer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/announcement.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/annrecorder.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/app_mapping.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/binrpcctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/call_timer.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/callback.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/click2dial.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/msg_storage.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/precoded_announce.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/reg_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sipctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/stats.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/sw_prepaid_sip.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/unixsockctrl.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicebox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/voicemail.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/webconference.conf

%doc README
%doc apps/dsm/doc/Readme.dsm.txt
%doc apps/dsm/mods/mod_dlg/Readme.mod_dlg.txt
%doc apps/dsm/mods/mod_sys/Readme.mod_sys.txt
%doc apps/dsm/mods/mod_uri/Readme.mod_uri.txt
%doc apps/dsm/fsmc/Readme.fsmc.txt
%doc apps/examples/tutorial/cc_acc/Readme.cc_acc
%doc core/plug-in/adpcm/README_G711
%doc core/plug-in/stats/README.stats
%doc doc/figures
%doc doc/CHANGELOG
%doc doc/COPYING
%doc doc/Configure-Sems-OpenSER-HOWTO
%doc doc/Configure-Sems-Ser-HOWTO
%doc doc/Readme.ann_b2b
%doc doc/Readme.announce_transfer
%doc doc/Readme.announcement
%doc doc/Readme.annrecorder
%doc doc/Readme.auth_b2b
%doc doc/Readme.call_timer
%doc doc/Readme.callback
%doc doc/Readme.click2dial
%doc doc/Readme.conf_auth
%doc doc/Readme.conference
%doc doc/Readme.early_announce
%doc doc/Readme.echo
%if 0%{?with_ilbc}
%doc doc/Readme.iLBC
%endif
%if 0%{?with_mp3}
%doc doc/Readme.mp3plugin
%endif
%doc doc/Readme.msg_storage
%doc doc/Readme.reg_agent
%doc doc/Readme.registrar_client
%doc doc/Readme.sw_prepaid_sip
%doc doc/Readme.uac_auth
%doc doc/Readme.voicebox
%doc doc/Readme.voicemail
%doc doc/Readme.webconference
%doc doc/WHATSNEW_0.10

%{_sbindir}/%{name}
%{_sbindir}/%{name}-stats

%{_datadir}/%{name}/audio/beep.wav
%{_datadir}/%{name}/audio/default_en.wav
%{_datadir}/%{name}/audio/annrecorder/beep.wav
%{_datadir}/%{name}/audio/annrecorder/bye.wav
%{_datadir}/%{name}/audio/annrecorder/confirm.wav
%{_datadir}/%{name}/audio/annrecorder/greeting_set.wav
%{_datadir}/%{name}/audio/annrecorder/to_record.wav
%{_datadir}/%{name}/audio/annrecorder/welcome.wav
%{_datadir}/%{name}/audio/annrecorder/your_prompt.wav
%{_datadir}/%{name}/audio/conference/beep.wav
%{_datadir}/%{name}/audio/conference/first_participant.wav
%{_datadir}/%{name}/audio/voicebox/0.wav
%{_datadir}/%{name}/audio/voicebox/1.wav
%{_datadir}/%{name}/audio/voicebox/10.wav
%{_datadir}/%{name}/audio/voicebox/11.wav
%{_datadir}/%{name}/audio/voicebox/12.wav
%{_datadir}/%{name}/audio/voicebox/13.wav
%{_datadir}/%{name}/audio/voicebox/14.wav
%{_datadir}/%{name}/audio/voicebox/15.wav
%{_datadir}/%{name}/audio/voicebox/16.wav
%{_datadir}/%{name}/audio/voicebox/17.wav
%{_datadir}/%{name}/audio/voicebox/18.wav
%{_datadir}/%{name}/audio/voicebox/19.wav
%{_datadir}/%{name}/audio/voicebox/2.wav
%{_datadir}/%{name}/audio/voicebox/20.wav
%{_datadir}/%{name}/audio/voicebox/3.wav
%{_datadir}/%{name}/audio/voicebox/30.wav
%{_datadir}/%{name}/audio/voicebox/4.wav
%{_datadir}/%{name}/audio/voicebox/40.wav
%{_datadir}/%{name}/audio/voicebox/5.wav
%{_datadir}/%{name}/audio/voicebox/50.wav
%{_datadir}/%{name}/audio/voicebox/6.wav
%{_datadir}/%{name}/audio/voicebox/60.wav
%{_datadir}/%{name}/audio/voicebox/7.wav
%{_datadir}/%{name}/audio/voicebox/70.wav
%{_datadir}/%{name}/audio/voicebox/8.wav
%{_datadir}/%{name}/audio/voicebox/80.wav
%{_datadir}/%{name}/audio/voicebox/9.wav
%{_datadir}/%{name}/audio/voicebox/90.wav
%{_datadir}/%{name}/audio/voicebox/and.wav
%{_datadir}/%{name}/audio/voicebox/bye.wav
%{_datadir}/%{name}/audio/voicebox/first_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/first_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/in_your_voicebox.wav
%{_datadir}/%{name}/audio/voicebox/msg_deleted.wav
%{_datadir}/%{name}/audio/voicebox/msg_end_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_menu.wav
%{_datadir}/%{name}/audio/voicebox/msg_saved.wav
%{_datadir}/%{name}/audio/voicebox/new_msg.wav
%{_datadir}/%{name}/audio/voicebox/new_msgs.wav
%{_datadir}/%{name}/audio/voicebox/next_new_msg.wav
%{_datadir}/%{name}/audio/voicebox/next_saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_more_msg.wav
%{_datadir}/%{name}/audio/voicebox/no_msg.wav
%{_datadir}/%{name}/audio/voicebox/pin_prompt.wav
%{_datadir}/%{name}/audio/voicebox/saved_msg.wav
%{_datadir}/%{name}/audio/voicebox/saved_msgs.wav
%{_datadir}/%{name}/audio/voicebox/x1.wav
%{_datadir}/%{name}/audio/voicebox/x2.wav
%{_datadir}/%{name}/audio/voicebox/x3.wav
%{_datadir}/%{name}/audio/voicebox/x4.wav
%{_datadir}/%{name}/audio/voicebox/x5.wav
%{_datadir}/%{name}/audio/voicebox/x6.wav
%{_datadir}/%{name}/audio/voicebox/x7.wav
%{_datadir}/%{name}/audio/voicebox/x8.wav
%{_datadir}/%{name}/audio/voicebox/x9.wav
%{_datadir}/%{name}/audio/voicebox/you_have.wav
%{_datadir}/%{name}/audio/voicemail/default_en.wav
%{_datadir}/%{name}/audio/voicemail/beep.wav
%{_datadir}/%{name}/audio/webconference/0.wav
%{_datadir}/%{name}/audio/webconference/1.wav
%{_datadir}/%{name}/audio/webconference/2.wav
%{_datadir}/%{name}/audio/webconference/3.wav
%{_datadir}/%{name}/audio/webconference/4.wav
%{_datadir}/%{name}/audio/webconference/5.wav
%{_datadir}/%{name}/audio/webconference/6.wav
%{_datadir}/%{name}/audio/webconference/7.wav
%{_datadir}/%{name}/audio/webconference/8.wav
%{_datadir}/%{name}/audio/webconference/9.wav
%{_datadir}/%{name}/audio/webconference/beep.wav
%{_datadir}/%{name}/audio/webconference/entering_conference.wav
%{_datadir}/%{name}/audio/webconference/first_participant.wav
%{_datadir}/%{name}/audio/webconference/pin_prompt.wav
%{_datadir}/%{name}/audio/webconference/wrong_pin.wav

%{_libdir}/%{name}/dsm/mod_dlg.so
%{_libdir}/%{name}/dsm/mod_sys.so
%{_libdir}/%{name}/dsm/mod_uri.so
%{_libdir}/%{name}/dsm/inbound_call.dsm
%{_libdir}/%{name}/dsm/outbound_call.dsm

%{_libdir}/%{name}/plug-in/adpcm.so
%{_libdir}/%{name}/plug-in/ann_b2b.so
%{_libdir}/%{name}/plug-in/announce_transfer.so
%{_libdir}/%{name}/plug-in/announcement.so
%{_libdir}/%{name}/plug-in/annrecorder.so
%{_libdir}/%{name}/plug-in/auth_b2b.so
%{_libdir}/%{name}/plug-in/binrpcctrl.so
%{_libdir}/%{name}/plug-in/call_timer.so
%{_libdir}/%{name}/plug-in/callback.so
%{_libdir}/%{name}/plug-in/cc_acc.so
%{_libdir}/%{name}/plug-in/click2dial.so
%{_libdir}/%{name}/plug-in/conference.so
%{_libdir}/%{name}/plug-in/dsm.so
%{_libdir}/%{name}/plug-in/early_announce.so
%{_libdir}/%{name}/plug-in/echo.so
%if 0%{?with_ilbc}
%{_libdir}/%{name}/plug-in/ilbc.so
%endif
%{_libdir}/%{name}/plug-in/l16.so
%{_libdir}/%{name}/plug-in/msg_storage.so
%{_libdir}/%{name}/plug-in/precoded_announce.so
%{_libdir}/%{name}/plug-in/reg_agent.so
%{_libdir}/%{name}/plug-in/registrar_client.so
%{_libdir}/%{name}/plug-in/sipctrl.so
%{_libdir}/%{name}/plug-in/session_timer.so
%{_libdir}/%{name}/plug-in/stats.so
%{_libdir}/%{name}/plug-in/sw_prepaid_sip.so
%{_libdir}/%{name}/plug-in/uac_auth.so
%{_libdir}/%{name}/plug-in/unixsockctrl.so
%{_libdir}/%{name}/plug-in/voicebox.so
%{_libdir}/%{name}/plug-in/voicemail.so
%{_libdir}/%{name}/plug-in/wav.so
%{_libdir}/%{name}/plug-in/webconference.so

%files conf_auth
%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth
%{_libdir}/%{name}/ivr/conf_auth.py
%{_libdir}/%{name}/ivr/conf_auth.pyc
%{_libdir}/%{name}/ivr/conf_auth.pyo

%files diameter_client
%defattr(-,root,root)
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so

%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so

%files gateway
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
%{_libdir}/%{name}/plug-in/gateway.so

%files gsm
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so

%files ivr
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr
%dir %{_libdir}/%{name}/ivr
%{_libdir}/%{name}/plug-in/ivr.so
%{_libdir}/%{name}/plug-in/log.py
%{_libdir}/%{name}/plug-in/log.pyc
%{_libdir}/%{name}/plug-in/log.pyo

%files mailbox
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox
%dir %{_datadir}/%{name}/audio/mailbox
%dir %{_libdir}/%{name}/ivr/imap_mailbox
%{_datadir}/%{name}/audio/mailbox/and.wav
%{_datadir}/%{name}/audio/mailbox/beep.wav
%{_datadir}/%{name}/audio/mailbox/bye.wav
%{_datadir}/%{name}/audio/mailbox/default_en.wav
%{_datadir}/%{name}/audio/mailbox/first_msg.wav
%{_datadir}/%{name}/audio/mailbox/msg_deleted.wav
%{_datadir}/%{name}/audio/mailbox/msg_menu.wav
%{_datadir}/%{name}/audio/mailbox/msg_saved.wav
%{_datadir}/%{name}/audio/mailbox/new_msg.wav
%{_datadir}/%{name}/audio/mailbox/next_msg.wav
%{_datadir}/%{name}/audio/mailbox/no_msg.wav
%{_datadir}/%{name}/audio/mailbox/saved_msg.wav
%{_datadir}/%{name}/audio/mailbox/you_have.wav
%{_libdir}/%{name}/ivr/mailbox.py
%{_libdir}/%{name}/ivr/mailbox.pyc
%{_libdir}/%{name}/ivr/mailbox.pyo
%{_libdir}/%{name}/ivr/mailbox_query.py
%{_libdir}/%{name}/ivr/mailbox_query.pyc
%{_libdir}/%{name}/ivr/mailbox_query.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.py
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/MailboxURL.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.py
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/__init__.pyo
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.py
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyc
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo

%files pin_collect
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect
%dir %{_datadir}/%{name}/audio/pincollect
%{_datadir}/%{name}/audio/pincollect/enter_pin.wav
%{_datadir}/%{name}/audio/pincollect/welcome.wav
%{_libdir}/%{name}/ivr/pin_collect.py
%{_libdir}/%{name}/ivr/pin_collect.pyc
%{_libdir}/%{name}/ivr/pin_collect.pyo

%files python
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems
%{_libdir}/%{name}/plug-in/py_sems.so
%{_libdir}/%{name}/plug-in/py_sems_log.py
%{_libdir}/%{name}/plug-in/py_sems_log.pyc
%{_libdir}/%{name}/plug-in/py_sems_log.pyo

%files speex
%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so

%files xmlrpc2di
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di
%{_libdir}/%{name}/plug-in/xmlrpc2di.so

%changelog
* Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
- Use modified tarball (with ilBC sources completely removed)

* Thu Apr  9 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-4
- Internally shipped xmlrpc++ now uses system optflags
- Added more docs
- Moved audiofiles from libdir to datadir
- Removed empty conf_auth.conf
- Splitted out g722 module
- Splitted out xmlrpc2di module

* Wed Apr  8 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-3
- Fixed installation of python files

* Tue Apr  7 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-2
- Module dsm is back
- Disabled OpenSER-specific features (OpenSER is able to manage SEMS
  via SIP-headers).

* Tue Feb 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-1
- Ver. 1.1.0
- Disabled module dsm

* Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.9.svn1160
- New svn snapshot

* Wed Dec  3 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.8.svn1095
- Another one fix for audio installation

* Fri Oct 17 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.7.svn1095
- Fixed installation of audio files

* Sun Sep 28 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.6.svn1095
- New svn rev. 1095
- Some rpmlint-related fixes

* Thu Aug 21 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.5.svn
- Dropped upstreamed sems--initscript_fix.diff
- Installation of some audiofiles was fixed upstream

* Tue Aug 19 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.4.svn
- Splitted ivr module
- Fixed some rpmlint errors

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.3.svn
- Conditional switch "with_ilbc"

* Thu Aug 14 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.2.svn
- Splitted some modules

* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-0.1.svn
- Preliminary ver. 1.0.0 (from svn)

* Sun Jun 29 2008 Peter Lemenkov <lemenkov at gmail.com> 1.0.0-rc1
- GCC4.3 patches upstreamed
- Ver. 1.0.0-rc1

* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> 0.10.0
- Initial package for Fedora

* Wed Dec 13 2006 Peter Nixon <peter+rpmspam at suntel.com.tr>
- First version of the spec file for SUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:07:06 -0000	1.1
+++ .cvsignore	11 Apr 2009 03:37:36 -0000	1.2
@@ -0,0 +1 @@
+sems-1.1.0.w_o_ilbc_sources.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:07:06 -0000	1.1
+++ sources	11 Apr 2009 03:37:36 -0000	1.2
@@ -0,0 +1 @@
+6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz



From mclasen at fedoraproject.org  Sat Apr 11 04:48:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 04:48:16 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-bash-completion.patch, NONE, 1.1 gvfs.spec,
	1.121, 1.122
Message-ID: <20090411044816.9C06D70098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16542

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-bash-completion.patch 
Log Message:
bash completion script need not be executable


gvfs-bash-completion.patch:

--- NEW FILE gvfs-bash-completion.patch ---
diff -up gvfs-1.2.1/programs/Makefile.am.bash-completion gvfs-1.2.1/programs/Makefile.am
--- gvfs-1.2.1/programs/Makefile.am.bash-completion	2009-04-11 00:36:25.730330858 -0400
+++ gvfs-1.2.1/programs/Makefile.am	2009-04-11 00:36:37.746330659 -0400
@@ -34,7 +34,7 @@ bin_SCRIPTS =					\
 
 if ENABLE_BASHCOMP
 profiledir = $(BASHCOMP_DIR)
-profile_SCRIPTS = gvfs-bash-completion.sh
+profile_DATA = gvfs-bash-completion.sh
 endif
 
 gvfs_cat_SOURCES = gvfs-cat.c


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gvfs.spec	10 Apr 2009 01:24:24 -0000	1.121
+++ gvfs.spec	11 Apr 2009 04:48:14 -0000	1.122
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -32,6 +32,8 @@
 Patch1: gvfs-0.99.2-archive-integration.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
 Patch2: gvfs-1.1.7-gdu-computer-expose-devices.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=578681
+Patch3: gvfs-bash-completion.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -132,6 +134,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p1 -b .computer-expose-devices
+%patch3 -p1 -b .bash-completion
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -283,6 +286,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.1-4
+- No need for bash completion to be executable
+
 * Thu Apr  9 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-3
 - Clean up gdu patches and bump BR for gdu to 0.3
 - Avoiding showing volume for ignored mounts (#495033)



From cweyl at fedoraproject.org  Sat Apr 11 05:06:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 11 Apr 2009 05:06:59 +0000 (UTC)
Subject: rpms/mod_perlite/devel import.log, NONE, 1.1 mod_perlite.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411050659.C656870098@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23754/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_perlite.spec 
Log Message:
initial import


--- NEW FILE import.log ---
mod_perlite-0_09-0_2_git20090314_fc10:HEAD:mod_perlite-0.09-0.2.git20090314.fc10.src.rpm:1239426376


--- NEW FILE mod_perlite.spec ---
%global tag     git20090314
%global git_tag a77521aa84ea5b8c5bcc3e387451acd9368292ee

%global httpd_mod_dir  %{_libdir}/httpd/modules
%global httpd_conf_dir %{_sysconfdir}/httpd/conf.d

Name:           mod_perlite
Version:        0.09
# I'm treating this as a pre-release as we don't have any actual tarballs yet.
Release:        0.2%{?tag:.%{tag}}%{?dist}
Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server

Group:          System Environment/Daemons
# see Build.PL, README
License:        GPL+ or Artistic
URL:            http://modperlite.org
# git://github.com/sodabrew/mod_perlite.git
# can be recreated with: 
#   TAG=a77521aa84ea5b8c5bcc3e387451acd9368292ee \
#   git archive --prefix mod_perlite/ $TAG | gzip > mod_perlite-$TAG.tar.gz
Source0:        mod_perlite-%{tag}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
BuildRequires:  apr-devel >= 1.2.0, apr-util-devel

BuildRequires:  perl(:WITH_PERLIO)

BuildRequires:  perl(Module::Build)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(File::Which)
BuildRequires:  perl(Test::More)

Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       perl(:WITH_PERLIO)

%description
mod_perlite is a lightweight Apache module that embeds a Perl interpreter
and suggests a default configuration where any file ending in ".pl" is
interpreted by Perl.  It is the Perl equivalent of PHP in its simplicity
and nothing like mod_perl in its complexity.

%prep
%setup -q -n %{name}

%build
%{__perl} Build.PL installdirs=vendor optimize="%{optflags} -fpic"
./Build build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0

# and our apache module...
mkdir -p %{buildroot}%{httpd_mod_dir}
cp mod_perlite.so %{buildroot}%{httpd_mod_dir}/

# install our conf file...
mkdir -p %{buildroot}%{httpd_conf_dir}
cat mod_perlite.conf | sed -re 's/^\s+//; s/AddDir/Dir/; /IfDefine/d' \
    > %{buildroot}%{httpd_conf_dir}/perlite.conf

%{_fixperms} %{buildroot}

%check
## This seems to fail
#./Build test

prove -b t/*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc TODO README
%config(noreplace) %{httpd_conf_dir}/*.conf
%{httpd_mod_dir}/mod_perlite.so
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.2.git20090314
- patch up tarball creation, per review

* Sat Mar 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.1.git20090314
- initial packaging (thanks, mod_perl.spec!)
- based off git a77521aa84ea5b8c5bcc3e387451acd9368292ee


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:10:00 -0000	1.1
+++ .cvsignore	11 Apr 2009 05:06:28 -0000	1.2
@@ -0,0 +1 @@
+mod_perlite-git20090314.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:10:00 -0000	1.1
+++ sources	11 Apr 2009 05:06:28 -0000	1.2
@@ -0,0 +1 @@
+b070e26defddb65dccac7c78270e8fc7  mod_perlite-git20090314.tar.gz



From cweyl at fedoraproject.org  Sat Apr 11 05:07:35 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 11 Apr 2009 05:07:35 +0000 (UTC)
Subject: rpms/mod_perlite/F-10 import.log, NONE, 1.1 mod_perlite.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411050735.BBF7270098@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24199/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_perlite.spec 
Log Message:
initial import


--- NEW FILE import.log ---
mod_perlite-0_09-0_2_git20090314_fc10:F-10:mod_perlite-0.09-0.2.git20090314.fc10.src.rpm:1239426436


--- NEW FILE mod_perlite.spec ---
%global tag     git20090314
%global git_tag a77521aa84ea5b8c5bcc3e387451acd9368292ee

%global httpd_mod_dir  %{_libdir}/httpd/modules
%global httpd_conf_dir %{_sysconfdir}/httpd/conf.d

Name:           mod_perlite
Version:        0.09
# I'm treating this as a pre-release as we don't have any actual tarballs yet.
Release:        0.2%{?tag:.%{tag}}%{?dist}
Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server

Group:          System Environment/Daemons
# see Build.PL, README
License:        GPL+ or Artistic
URL:            http://modperlite.org
# git://github.com/sodabrew/mod_perlite.git
# can be recreated with: 
#   TAG=a77521aa84ea5b8c5bcc3e387451acd9368292ee \
#   git archive --prefix mod_perlite/ $TAG | gzip > mod_perlite-$TAG.tar.gz
Source0:        mod_perlite-%{tag}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
BuildRequires:  apr-devel >= 1.2.0, apr-util-devel

BuildRequires:  perl(:WITH_PERLIO)

BuildRequires:  perl(Module::Build)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(File::Which)
BuildRequires:  perl(Test::More)

Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       perl(:WITH_PERLIO)

%description
mod_perlite is a lightweight Apache module that embeds a Perl interpreter
and suggests a default configuration where any file ending in ".pl" is
interpreted by Perl.  It is the Perl equivalent of PHP in its simplicity
and nothing like mod_perl in its complexity.

%prep
%setup -q -n %{name}

%build
%{__perl} Build.PL installdirs=vendor optimize="%{optflags} -fpic"
./Build build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0

# and our apache module...
mkdir -p %{buildroot}%{httpd_mod_dir}
cp mod_perlite.so %{buildroot}%{httpd_mod_dir}/

# install our conf file...
mkdir -p %{buildroot}%{httpd_conf_dir}
cat mod_perlite.conf | sed -re 's/^\s+//; s/AddDir/Dir/; /IfDefine/d' \
    > %{buildroot}%{httpd_conf_dir}/perlite.conf

%{_fixperms} %{buildroot}

%check
## This seems to fail
#./Build test

prove -b t/*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc TODO README
%config(noreplace) %{httpd_conf_dir}/*.conf
%{httpd_mod_dir}/mod_perlite.so
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.2.git20090314
- patch up tarball creation, per review

* Sat Mar 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.1.git20090314
- initial packaging (thanks, mod_perl.spec!)
- based off git a77521aa84ea5b8c5bcc3e387451acd9368292ee


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:10:00 -0000	1.1
+++ .cvsignore	11 Apr 2009 05:07:32 -0000	1.2
@@ -0,0 +1 @@
+mod_perlite-git20090314.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:10:00 -0000	1.1
+++ sources	11 Apr 2009 05:07:33 -0000	1.2
@@ -0,0 +1 @@
+b070e26defddb65dccac7c78270e8fc7  mod_perlite-git20090314.tar.gz



From cweyl at fedoraproject.org  Sat Apr 11 05:08:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 11 Apr 2009 05:08:45 +0000 (UTC)
Subject: rpms/mod_perlite/F-9 import.log, NONE, 1.1 mod_perlite.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411050845.8848E70098@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24554/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_perlite.spec 
Log Message:
initial import


--- NEW FILE import.log ---
mod_perlite-0_09-0_2_git20090314_fc10:F-9:mod_perlite-0.09-0.2.git20090314.fc10.src.rpm:1239426480


--- NEW FILE mod_perlite.spec ---
%global tag     git20090314
%global git_tag a77521aa84ea5b8c5bcc3e387451acd9368292ee

%global httpd_mod_dir  %{_libdir}/httpd/modules
%global httpd_conf_dir %{_sysconfdir}/httpd/conf.d

Name:           mod_perlite
Version:        0.09
# I'm treating this as a pre-release as we don't have any actual tarballs yet.
Release:        0.2%{?tag:.%{tag}}%{?dist}
Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server

Group:          System Environment/Daemons
# see Build.PL, README
License:        GPL+ or Artistic
URL:            http://modperlite.org
# git://github.com/sodabrew/mod_perlite.git
# can be recreated with: 
#   TAG=a77521aa84ea5b8c5bcc3e387451acd9368292ee \
#   git archive --prefix mod_perlite/ $TAG | gzip > mod_perlite-$TAG.tar.gz
Source0:        mod_perlite-%{tag}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
BuildRequires:  apr-devel >= 1.2.0, apr-util-devel

BuildRequires:  perl(:WITH_PERLIO)

BuildRequires:  perl(Module::Build)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(File::Which)
BuildRequires:  perl(Test::More)

Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       perl(:WITH_PERLIO)

%description
mod_perlite is a lightweight Apache module that embeds a Perl interpreter
and suggests a default configuration where any file ending in ".pl" is
interpreted by Perl.  It is the Perl equivalent of PHP in its simplicity
and nothing like mod_perl in its complexity.

%prep
%setup -q -n %{name}

%build
%{__perl} Build.PL installdirs=vendor optimize="%{optflags} -fpic"
./Build build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0

# and our apache module...
mkdir -p %{buildroot}%{httpd_mod_dir}
cp mod_perlite.so %{buildroot}%{httpd_mod_dir}/

# install our conf file...
mkdir -p %{buildroot}%{httpd_conf_dir}
cat mod_perlite.conf | sed -re 's/^\s+//; s/AddDir/Dir/; /IfDefine/d' \
    > %{buildroot}%{httpd_conf_dir}/perlite.conf

%{_fixperms} %{buildroot}

%check
## This seems to fail
#./Build test

prove -b t/*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc TODO README
%config(noreplace) %{httpd_conf_dir}/*.conf
%{httpd_mod_dir}/mod_perlite.so
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.2.git20090314
- patch up tarball creation, per review

* Sat Mar 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.1.git20090314
- initial packaging (thanks, mod_perl.spec!)
- based off git a77521aa84ea5b8c5bcc3e387451acd9368292ee


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:10:00 -0000	1.1
+++ .cvsignore	11 Apr 2009 05:08:14 -0000	1.2
@@ -0,0 +1 @@
+mod_perlite-git20090314.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:10:00 -0000	1.1
+++ sources	11 Apr 2009 05:08:14 -0000	1.2
@@ -0,0 +1 @@
+b070e26defddb65dccac7c78270e8fc7  mod_perlite-git20090314.tar.gz



From mtasaka at fedoraproject.org  Sat Apr 11 05:43:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 05:43:48 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.31,
	1.32 gnome-commander.spec, 1.55, 1.56 sources, 1.31, 1.32
Message-ID: <20090411054348.9E36770098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1054/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Sat Apr 11 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2532



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	6 Apr 2009 18:19:06 -0000	1.31
+++ .cvsignore	11 Apr 2009 05:43:16 -0000	1.32
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2517_trunk.tar.bz2
+gnome-commander-1.2.8-svn2532_trunk.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-commander.spec	6 Apr 2009 18:19:06 -0000	1.55
+++ gnome-commander.spec	11 Apr 2009 05:43:17 -0000	1.56
@@ -18,7 +18,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          3 
-%define        extratag              svn2517_trunk
+%define        extratag              svn2532_trunk
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -210,8 +210,8 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
-* Tue Apr  7 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2517
+* Sat Apr 11 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2532
 
 * Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-0.3.svn2502_trunk
 - rev 2502


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	6 Apr 2009 18:19:06 -0000	1.31
+++ sources	11 Apr 2009 05:43:17 -0000	1.32
@@ -1 +1 @@
-d495ba792513e73746f1191602bd5bd0  gnome-commander-1.2.8-svn2517_trunk.tar.bz2
+538d6bf7e77815ed29381b4c8837bc68  gnome-commander-1.2.8-svn2532_trunk.tar.bz2



From mtasaka at fedoraproject.org  Sat Apr 11 05:43:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 05:43:49 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.31,
	1.32 gnome-commander.spec, 1.55, 1.56 sources, 1.31, 1.32
Message-ID: <20090411054349.61B8570098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1054/devel

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Sat Apr 11 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2532



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	6 Apr 2009 18:19:06 -0000	1.31
+++ .cvsignore	11 Apr 2009 05:43:17 -0000	1.32
@@ -1 +1 @@
-gnome-commander-1.3-svn2517_13dev.tar.bz2
+gnome-commander-1.3-svn2532_13dev.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-commander.spec	6 Apr 2009 18:19:06 -0000	1.55
+++ gnome-commander.spec	11 Apr 2009 05:43:17 -0000	1.56
@@ -19,7 +19,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          1 
-%define        extratag              svn2517_13dev
+%define        extratag              svn2532_13dev
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -213,8 +213,8 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
-* Tue Apr  7 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2517
+* Sat Apr 11 2009 Mamour Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2532
 
 * Thu Apr  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.1.svn2502_13dev
 - F-12: switch to 1.3 development branch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	6 Apr 2009 18:19:06 -0000	1.31
+++ sources	11 Apr 2009 05:43:17 -0000	1.32
@@ -1 +1 @@
-d3183ebfb06030462e9660ca64e8b366  gnome-commander-1.3-svn2517_13dev.tar.bz2
+a5ef7429a44aab5feb548e59c852aee6  gnome-commander-1.3-svn2532_13dev.tar.bz2



From dwmw2 at fedoraproject.org  Sat Apr 11 05:53:37 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat, 11 Apr 2009 05:53:37 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-iommu-fixes.patch, NONE, 1.1 kernel.spec,
	1.1529, 1.1530
Message-ID: <20090411055337.F2D0C70098@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4033

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iommu-fixes.patch 
Log Message:
iommu fixes for 2.6.29 (suspend, devices behind bridge, crap Lenovo BIOS)


linux-2.6-iommu-fixes.patch:

--- NEW FILE linux-2.6-iommu-fixes.patch ---
commit c065567f392e05f0fda406369e1c8969c4411c68
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 10 22:27:48 2009 -0700

    intel-iommu: Avoid panic() for DRHD at address zero.
    
    If the BIOS does something obviously stupid, like claiming that the
    registers for the IOMMU are at physical address zero, then print a nasty
    message and abort, rather than trying to set up the IOMMU and then later
    panicking.
    
    It's becoming more and more obvious that trusting this stuff to the BIOS
    was a mistake.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit e523b38e2f568af58baa13120a994cbf24e6dee0)

commit 1d748e6cec8936af4c7044bdb51593a3f3904239
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Mon Apr 6 13:30:01 2009 -0700

    intel-iommu: Fix oops in device_to_iommu() when devices not found.
    
    It's possible for a device in the drhd->devices[] array to be NULL if
    it wasn't found at boot time, which means we have to check for that
    case.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e)

commit 3bf17fdaaadea04d4d82be5930dff93ec737aeed
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Apr 4 00:39:25 2009 +0100

    intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
    
    When the DMAR table identifies that a PCI-PCI bridge belongs to a given
    IOMMU, that means that the bridge and all devices behind it should be
    associated with the IOMMU. Not just the bridge itself.
    
    This fixes the device_to_iommu() function accordingly.
    
    (It's broken if you have the same PCI bus numbers in multiple domains,
    but this function was always broken in that way; I'll be dealing with
    that later).
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit 924b6231edfaf1e764ffb4f97ea382bf4facff58)

commit 948852c81654aa8572a2bac1d2dfb1abfcc76ab2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 7 07:59:41 2009 -0700

    Fix build errors due to CONFIG_BRANCH_TRACER=y
    
    The code that enables branch tracing for all (non-constant) branches
    plays games with the preprocessor and #define's the C 'if ()' construct
    to do tracing.
    
    That's all fine, but it fails for some unusual but valid C code that is
    sometimes used in macros, notably by the intel-iommu code:
    
    	if (i=drhd->iommu, drhd->ignored) ..
    
    because now the preprocessor complains about multiple arguments to the
    'if' macro.
    
    So make the macro expansion of this particularly horrid trick use
    varargs, and handle the case of comma-expressions in if-statements.  Use
    another macro to do it cleanly in just one place.
    
    This replaces a patch by David (and acked by Steven) that did this all
    inside that one already-too-horrid macro.
    
    Tested-by: Ingo Molnar <mingo at elte.hu>
    Cc: David Woodhouse <dwmw2 at infradead.org>
    Cc: Steven Rostedt <rostedt at goodmis.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    (cherry picked from commit aeeae86859f4319de0a4946b44771d9926eeed54)

commit 484abc37905056cc7b90a51311e6589bacd9ed65
Author: Fenghua Yu <fenghua.yu at intel.com>
Date:   Fri Mar 27 14:22:42 2009 -0700

    Intel IOMMU Suspend/Resume Support - DMAR
    
    This patch implements the suspend and resume feature for Intel IOMMU
    DMAR. It hooks to kernel suspend and resume interface. When suspend happens, it
    saves necessary hardware registers. When resume happens, it restores the
    registers and restarts IOMMU by enabling translation, setting up root entry, and
    re-enabling queued invalidation.
    
    Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 85e4b00c9d0378d7c19510d7bac8d5834b58edea
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 10 15:15:05 2009 -0700

    Intel IOMMU Suspend/Resume Support - Queued Invalidation
    
    This patch supports queued invalidation suspend/resume.
    
    Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit eb4a52bc660ea835482c582eaaf4893742cbd160)

commit 28dde4ade0c005b78f0cd0bda03ed20fcdfc11ae
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 3 15:19:32 2009 +0100

    intel-iommu: Add for_each_iommu() and for_each_active_iommu() macros
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    (cherry picked from commit 8f912ba4d7cdaf7d31cf39fe5a9b7732308a256d)

commit b35948e3225618ab7c1c7700eae0c9f4565f9199
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:57 2009 -0700

    x86, dmar: start with sane state while enabling dma and interrupt-remapping
    
    Impact: cleanup/sanitization
    
    Start from a sane state while enabling dma and interrupt-remapping, by
    clearing the previous recorded faults and disabling previously
    enabled queued invalidation and interrupt-remapping.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit 1531a6a6b81a4e6f9eec9a5608758a6ea14b96e0)

commit 26c3c4ad26414ea9f66c56a27e394fc7ae937231
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:56 2009 -0700

    x86, dmar: routines for disabling queued invalidation and intr remapping
    
    Impact: new interfaces (not yet used)
    
    Routines for disabling queued invalidation and interrupt remapping.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit eba67e5da6e971993b2899d2cdf459ce77d3dbc5)

commit 1c2f1031da6024fee999d2b115e31b40ff449405
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:54 2009 -0700

    x86, dmar: move page fault handling code to dmar.c
    
    Impact: code movement
    
    Move page fault handling code to dmar.c
    This will be shared both by DMA-remapping and Intr-remapping code.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit 0ac2491f57af5644f88383d28809760902d6f4d7)
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 26c536b..e095037 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -31,6 +31,8 @@
 #include <linux/iova.h>
 #include <linux/intel-iommu.h>
 #include <linux/timer.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #undef PREFIX
 #define PREFIX "DMAR:"
@@ -170,12 +172,21 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
 	struct dmar_drhd_unit *dmaru;
 	int ret = 0;
 
+	drhd = (struct acpi_dmar_hardware_unit *)header;
+	if (!drhd->address) {
+		/* Promote an attitude of violence to a BIOS engineer today */
+		WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+		     dmi_get_system_info(DMI_BIOS_VENDOR),
+		     dmi_get_system_info(DMI_BIOS_VERSION),
+		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		return -ENODEV;
+	}
 	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
 	if (!dmaru)
 		return -ENOMEM;
 
 	dmaru->hdr = header;
-	drhd = (struct acpi_dmar_hardware_unit *)header;
 	dmaru->reg_base_addr = drhd->address;
 	dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */
 
@@ -748,14 +759,77 @@ int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
 }
 
 /*
+ * Disable Queued Invalidation interface.
+ */
+void dmar_disable_qi(struct intel_iommu *iommu)
+{
+	unsigned long flags;
+	u32 sts;
+	cycles_t start_time = get_cycles();
+
+	if (!ecap_qis(iommu->ecap))
+		return;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	sts =  dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	if (!(sts & DMA_GSTS_QIES))
+		goto end;
+
+	/*
+	 * Give a chance to HW to complete the pending invalidation requests.
+	 */
+	while ((readl(iommu->reg + DMAR_IQT_REG) !=
+		readl(iommu->reg + DMAR_IQH_REG)) &&
+		(DMAR_OPERATION_TIMEOUT > (get_cycles() - start_time)))
+		cpu_relax();
+
+	iommu->gcmd &= ~DMA_GCMD_QIE;
+
+	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl,
+		      !(sts & DMA_GSTS_QIES), sts);
+end:
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+/*
+ * Enable queued invalidation.
+ */
+static void __dmar_enable_qi(struct intel_iommu *iommu)
+{
+	u32 cmd, sts;
+	unsigned long flags;
+	struct q_inval *qi = iommu->qi;
+
+	qi->free_head = qi->free_tail = 0;
+	qi->free_cnt = QI_LENGTH;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	/* write zero to the tail reg */
+	writel(0, iommu->reg + DMAR_IQT_REG);
+
+	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));
+
+	cmd = iommu->gcmd | DMA_GCMD_QIE;
+	iommu->gcmd |= DMA_GCMD_QIE;
+	writel(cmd, iommu->reg + DMAR_GCMD_REG);
+
+	/* Make sure hardware complete it */
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);
+
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+/*
  * Enable Queued Invalidation interface. This is a must to support
  * interrupt-remapping. Also used by DMA-remapping, which replaces
  * register based IOTLB invalidation.
  */
 int dmar_enable_qi(struct intel_iommu *iommu)
 {
-	u32 cmd, sts;
-	unsigned long flags;
 	struct q_inval *qi;
 
 	if (!ecap_qis(iommu->ecap))
@@ -793,19 +867,218 @@ int dmar_enable_qi(struct intel_iommu *iommu)
 
 	spin_lock_init(&qi->q_lock);
 
-	spin_lock_irqsave(&iommu->register_lock, flags);
-	/* write zero to the tail reg */
-	writel(0, iommu->reg + DMAR_IQT_REG);
+	__dmar_enable_qi(iommu);
 
-	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));
+	return 0;
+}
 
-	cmd = iommu->gcmd | DMA_GCMD_QIE;
-	iommu->gcmd |= DMA_GCMD_QIE;
-	writel(cmd, iommu->reg + DMAR_GCMD_REG);
+/* iommu interrupt handling. Most stuff are MSI-like. */
 
-	/* Make sure hardware complete it */
-	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);
-	spin_unlock_irqrestore(&iommu->register_lock, flags);
+static const char *fault_reason_strings[] =
+{
+	"Software",
+	"Present bit in root entry is clear",
+	"Present bit in context entry is clear",
+	"Invalid context entry",
+	"Access beyond MGAW",
+	"PTE Write access is not set",
+	"PTE Read access is not set",
+	"Next page table ptr is invalid",
+	"Root table address invalid",
+	"Context table ptr is invalid",
+	"non-zero reserved fields in RTP",
+	"non-zero reserved fields in CTP",
+	"non-zero reserved fields in PTE",
+};
+#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
+
+const char *dmar_get_fault_reason(u8 fault_reason)
+{
+	if (fault_reason > MAX_FAULT_REASON_IDX)
+		return "Unknown";
+	else
+		return fault_reason_strings[fault_reason];
+}
+
+void dmar_msi_unmask(unsigned int irq)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	/* unmask it */
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(0, iommu->reg + DMAR_FECTL_REG);
+	/* Read a reg to force flush the post write */
+	readl(iommu->reg + DMAR_FECTL_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_mask(unsigned int irq)
+{
+	unsigned long flag;
+	struct intel_iommu *iommu = get_irq_data(irq);
+
+	/* mask it */
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
+	/* Read a reg to force flush the post write */
+	readl(iommu->reg + DMAR_FECTL_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_write(int irq, struct msi_msg *msg)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
+	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
+	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_read(int irq, struct msi_msg *msg)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
+	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
+	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
+		u8 fault_reason, u16 source_id, unsigned long long addr)
+{
+	const char *reason;
+
+	reason = dmar_get_fault_reason(fault_reason);
+
+	printk(KERN_ERR
+		"DMAR:[%s] Request device [%02x:%02x.%d] "
+		"fault addr %llx \n"
+		"DMAR:[fault reason %02d] %s\n",
+		(type ? "DMA Read" : "DMA Write"),
+		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
+		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+	return 0;
+}
+
+#define PRIMARY_FAULT_REG_LEN (16)
+irqreturn_t dmar_fault(int irq, void *dev_id)
+{
+	struct intel_iommu *iommu = dev_id;
+	int reg, fault_index;
+	u32 fault_status;
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+
+	/* TBD: ignore advanced fault log currently */
+	if (!(fault_status & DMA_FSTS_PPF))
+		goto clear_overflow;
+
+	fault_index = dma_fsts_fault_record_index(fault_status);
+	reg = cap_fault_reg_offset(iommu->cap);
+	while (1) {
+		u8 fault_reason;
+		u16 source_id;
+		u64 guest_addr;
+		int type;
+		u32 data;
+
+		/* highest 32 bits */
+		data = readl(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN + 12);
+		if (!(data & DMA_FRCD_F))
+			break;
+
+		fault_reason = dma_frcd_fault_reason(data);
+		type = dma_frcd_type(data);
+
+		data = readl(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN + 8);
+		source_id = dma_frcd_source_id(data);
+
+		guest_addr = dmar_readq(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN);
+		guest_addr = dma_frcd_page_addr(guest_addr);
+		/* clear the fault */
+		writel(DMA_FRCD_F, iommu->reg + reg +
+			fault_index * PRIMARY_FAULT_REG_LEN + 12);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+
+		dmar_fault_do_one(iommu, type, fault_reason,
+				source_id, guest_addr);
+
+		fault_index++;
+		if (fault_index > cap_num_fault_regs(iommu->cap))
+			fault_index = 0;
+		spin_lock_irqsave(&iommu->register_lock, flag);
+	}
+clear_overflow:
+	/* clear primary fault overflow */
+	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+	if (fault_status & DMA_FSTS_PFO)
+		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
+
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+	return IRQ_HANDLED;
+}
+
+int dmar_set_interrupt(struct intel_iommu *iommu)
+{
+	int irq, ret;
+
+	irq = create_irq();
+	if (!irq) {
+		printk(KERN_ERR "IOMMU: no free vectors\n");
+		return -EINVAL;
+	}
+
+	set_irq_data(irq, iommu);
+	iommu->irq = irq;
+
+	ret = arch_setup_dmar_msi(irq);
+	if (ret) {
+		set_irq_data(irq, NULL);
+		iommu->irq = 0;
+		destroy_irq(irq);
+		return 0;
+	}
+
+	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);
+	if (ret)
+		printk(KERN_ERR "IOMMU: can't request irq\n");
+	return ret;
+}
+
+/*
+ * Re-enable Queued Invalidation interface.
+ */
+int dmar_reenable_qi(struct intel_iommu *iommu)
+{
+	if (!ecap_qis(iommu->ecap))
+		return -ENOENT;
+
+	if (!iommu->qi)
+		return -ENOENT;
+
+	/*
+	 * First disable queued invalidation.
+	 */
+	dmar_disable_qi(iommu);
+	/*
+	 * Then enable queued invalidation again. Since there is no pending
+	 * invalidation requests now, it's safe to re-enable queued
+	 * invalidation.
+	 */
+	__dmar_enable_qi(iommu);
 
 	return 0;
 }
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index f3f6865..8e4ac13 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -36,6 +36,7 @@
 #include <linux/iova.h>
 #include <linux/iommu.h>
 #include <linux/intel-iommu.h>
+#include <linux/sysdev.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 #include "pci.h"
@@ -447,11 +448,17 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn)
 		if (drhd->ignored)
 			continue;
 
-		for (i = 0; i < drhd->devices_cnt; i++)
+		for (i = 0; i < drhd->devices_cnt; i++) {
 			if (drhd->devices[i] &&
 			    drhd->devices[i]->bus->number == bus &&
 			    drhd->devices[i]->devfn == devfn)
 				return drhd->iommu;
+			if (drhd->devices[i] &&
+			    drhd->devices[i]->subordinate &&
+			    drhd->devices[i]->subordinate->number <= bus &&
+			    drhd->devices[i]->subordinate->subordinate >= bus)
+				return drhd->iommu;
+		}
 
 		if (drhd->include_all)
 			return drhd->iommu;
@@ -1004,194 +1011,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
 	return 0;
 }
 
-/* iommu interrupt handling. Most stuff are MSI-like. */
-
-static const char *fault_reason_strings[] =
-{
-	"Software",
-	"Present bit in root entry is clear",
-	"Present bit in context entry is clear",
-	"Invalid context entry",
-	"Access beyond MGAW",
-	"PTE Write access is not set",
-	"PTE Read access is not set",
-	"Next page table ptr is invalid",
-	"Root table address invalid",
-	"Context table ptr is invalid",
-	"non-zero reserved fields in RTP",
-	"non-zero reserved fields in CTP",
-	"non-zero reserved fields in PTE",
-};
-#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
-
-const char *dmar_get_fault_reason(u8 fault_reason)
-{
-	if (fault_reason > MAX_FAULT_REASON_IDX)
-		return "Unknown";
-	else
-		return fault_reason_strings[fault_reason];
-}
-
-void dmar_msi_unmask(unsigned int irq)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	/* unmask it */
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(0, iommu->reg + DMAR_FECTL_REG);
-	/* Read a reg to force flush the post write */
-	readl(iommu->reg + DMAR_FECTL_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_mask(unsigned int irq)
-{
-	unsigned long flag;
-	struct intel_iommu *iommu = get_irq_data(irq);
-
-	/* mask it */
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
-	/* Read a reg to force flush the post write */
-	readl(iommu->reg + DMAR_FECTL_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_write(int irq, struct msi_msg *msg)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
-	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
-	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_read(int irq, struct msi_msg *msg)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
-	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
-	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-static int iommu_page_fault_do_one(struct intel_iommu *iommu, int type,
-		u8 fault_reason, u16 source_id, unsigned long long addr)
-{
-	const char *reason;
-
-	reason = dmar_get_fault_reason(fault_reason);
-
-	printk(KERN_ERR
-		"DMAR:[%s] Request device [%02x:%02x.%d] "
-		"fault addr %llx \n"
-		"DMAR:[fault reason %02d] %s\n",
-		(type ? "DMA Read" : "DMA Write"),
-		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
-		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
-	return 0;
-}
-
-#define PRIMARY_FAULT_REG_LEN (16)
-static irqreturn_t iommu_page_fault(int irq, void *dev_id)
-{
-	struct intel_iommu *iommu = dev_id;
-	int reg, fault_index;
-	u32 fault_status;
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
-
-	/* TBD: ignore advanced fault log currently */
-	if (!(fault_status & DMA_FSTS_PPF))
-		goto clear_overflow;
-
-	fault_index = dma_fsts_fault_record_index(fault_status);
-	reg = cap_fault_reg_offset(iommu->cap);
-	while (1) {
-		u8 fault_reason;
-		u16 source_id;
-		u64 guest_addr;
-		int type;
-		u32 data;
-
-		/* highest 32 bits */
-		data = readl(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN + 12);
-		if (!(data & DMA_FRCD_F))
-			break;
-
-		fault_reason = dma_frcd_fault_reason(data);
-		type = dma_frcd_type(data);
-
-		data = readl(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN + 8);
-		source_id = dma_frcd_source_id(data);
-
-		guest_addr = dmar_readq(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN);
-		guest_addr = dma_frcd_page_addr(guest_addr);
-		/* clear the fault */
-		writel(DMA_FRCD_F, iommu->reg + reg +
-			fault_index * PRIMARY_FAULT_REG_LEN + 12);
-
-		spin_unlock_irqrestore(&iommu->register_lock, flag);
-
-		iommu_page_fault_do_one(iommu, type, fault_reason,
-				source_id, guest_addr);
-
-		fault_index++;
-		if (fault_index > cap_num_fault_regs(iommu->cap))
-			fault_index = 0;
-		spin_lock_irqsave(&iommu->register_lock, flag);
-	}
-clear_overflow:
-	/* clear primary fault overflow */
-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
-	if (fault_status & DMA_FSTS_PFO)
-		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
-
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-	return IRQ_HANDLED;
-}
-
-int dmar_set_interrupt(struct intel_iommu *iommu)
-{
-	int irq, ret;
-
-	irq = create_irq();
-	if (!irq) {
-		printk(KERN_ERR "IOMMU: no free vectors\n");
-		return -EINVAL;
-	}
-
-	set_irq_data(irq, iommu);
-	iommu->irq = irq;
-
-	ret = arch_setup_dmar_msi(irq);
-	if (ret) {
-		set_irq_data(irq, NULL);
-		iommu->irq = 0;
-		destroy_irq(irq);
-		return 0;
-	}
-
-	/* Force fault register is cleared */
-	iommu_page_fault(irq, iommu);
-
-	ret = request_irq(irq, iommu_page_fault, 0, iommu->name, iommu);
-	if (ret)
-		printk(KERN_ERR "IOMMU: can't request irq\n");
-	return ret;
-}
 
 static int iommu_init_domains(struct intel_iommu *iommu)
 {
@@ -2043,11 +1862,40 @@ static int __init init_dmars(void)
 		}
 	}
 
+	/*
+	 * Start from the sane iommu hardware state.
+	 */
 	for_each_drhd_unit(drhd) {
 		if (drhd->ignored)
 			continue;
 
 		iommu = drhd->iommu;
+
+		/*
+		 * If the queued invalidation is already initialized by us
+		 * (for example, while enabling interrupt-remapping) then
+		 * we got the things already rolling from a sane state.
+		 */
+		if (iommu->qi)
+			continue;
+
+		/*
+		 * Clear any previous faults.
+		 */
+		dmar_fault(-1, iommu);
+		/*
+		 * Disable queued invalidation if supported and already enabled
+		 * before OS handover.
+		 */
+		dmar_disable_qi(iommu);
+	}
+
+	for_each_drhd_unit(drhd) {
+		if (drhd->ignored)
+			continue;
+
+		iommu = drhd->iommu;
+
 		if (dmar_enable_qi(iommu)) {
 			/*
 			 * Queued Invalidate not enabled, use Register Based
@@ -2707,6 +2555,150 @@ static void __init init_no_remapping_devices(void)
 	}
 }
 
+#ifdef CONFIG_SUSPEND
+static int init_iommu_hw(void)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+
+	for_each_active_iommu(iommu, drhd)
+		if (iommu->qi)
+			dmar_reenable_qi(iommu);
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu_flush_write_buffer(iommu);
+
+		iommu_set_root_entry(iommu);
+
+		iommu->flush.flush_context(iommu, 0, 0, 0,
+						DMA_CCMD_GLOBAL_INVL, 0);
+		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+						DMA_TLB_GLOBAL_FLUSH, 0);
+		iommu_disable_protect_mem_regions(iommu);
+		iommu_enable_translation(iommu);
+	}
+
+	return 0;
+}
+
+static void iommu_flush_all(void)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu;
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu->flush.flush_context(iommu, 0, 0, 0,
+						DMA_CCMD_GLOBAL_INVL, 0);
+		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+						DMA_TLB_GLOBAL_FLUSH, 0);
+	}
+}
+
+static int iommu_suspend(struct sys_device *dev, pm_message_t state)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+	unsigned long flag;
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu->iommu_state = kzalloc(sizeof(u32) * MAX_SR_DMAR_REGS,
+						 GFP_ATOMIC);
+		if (!iommu->iommu_state)
+			goto nomem;
+	}
+
+	iommu_flush_all();
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu_disable_translation(iommu);
+
+		spin_lock_irqsave(&iommu->register_lock, flag);
+
+		iommu->iommu_state[SR_DMAR_FECTL_REG] =
+			readl(iommu->reg + DMAR_FECTL_REG);
+		iommu->iommu_state[SR_DMAR_FEDATA_REG] =
+			readl(iommu->reg + DMAR_FEDATA_REG);
+		iommu->iommu_state[SR_DMAR_FEADDR_REG] =
+			readl(iommu->reg + DMAR_FEADDR_REG);
+		iommu->iommu_state[SR_DMAR_FEUADDR_REG] =
+			readl(iommu->reg + DMAR_FEUADDR_REG);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+	}
+	return 0;
+
+nomem:
+	for_each_active_iommu(iommu, drhd)
+		kfree(iommu->iommu_state);
+
+	return -ENOMEM;
+}
+
+static int iommu_resume(struct sys_device *dev)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+	unsigned long flag;
+
+	if (init_iommu_hw()) {
+		WARN(1, "IOMMU setup failed, DMAR can not resume!\n");
+		return -EIO;
+	}
+
+	for_each_active_iommu(iommu, drhd) {
+
+		spin_lock_irqsave(&iommu->register_lock, flag);
+
+		writel(iommu->iommu_state[SR_DMAR_FECTL_REG],
+			iommu->reg + DMAR_FECTL_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEDATA_REG],
+			iommu->reg + DMAR_FEDATA_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEADDR_REG],
+			iommu->reg + DMAR_FEADDR_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEUADDR_REG],
+			iommu->reg + DMAR_FEUADDR_REG);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+	}
+
+	for_each_active_iommu(iommu, drhd)
+		kfree(iommu->iommu_state);
+
+	return 0;
+}
+
+static struct sysdev_class iommu_sysclass = {
+	.name		= "iommu",
+	.resume		= iommu_resume,
+	.suspend	= iommu_suspend,
+};
+
+static struct sys_device device_iommu = {
+	.cls	= &iommu_sysclass,
+};
+
+static int __init init_iommu_sysfs(void)
+{
+	int error;
+
+	error = sysdev_class_register(&iommu_sysclass);
+	if (error)
+		return error;
+
+	error = sysdev_register(&device_iommu);
+	if (error)
+		sysdev_class_unregister(&iommu_sysclass);
+
+	return error;
+}
+
+#else
+static int __init init_iommu_sysfs(void)
+{
+	return 0;
+}
+#endif	/* CONFIG_PM */
+
 int __init intel_iommu_init(void)
 {
 	int ret = 0;
@@ -2742,6 +2734,7 @@ int __init intel_iommu_init(void)
 	init_timer(&unmap_timer);
 	force_iommu = 1;
 	dma_ops = &intel_dma_ops;
+	init_iommu_sysfs();
 
 	register_iommu(&intel_iommu_ops);
 
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index 45effc5..0a490fe 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -458,11 +458,55 @@ static int setup_intr_remapping(struct intel_iommu *iommu, int mode)
 	return 0;
 }
 
+/*
+ * Disable Interrupt Remapping.
+ */
+static void disable_intr_remapping(struct intel_iommu *iommu)
+{
+	unsigned long flags;
+	u32 sts;
+
+	if (!ecap_ir_support(iommu->ecap))
+		return;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	sts = dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	if (!(sts & DMA_GSTS_IRES))
+		goto end;
+
+	iommu->gcmd &= ~DMA_GCMD_IRE;
+	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+		      readl, !(sts & DMA_GSTS_IRES), sts);
+
+end:
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
 int __init enable_intr_remapping(int eim)
 {
 	struct dmar_drhd_unit *drhd;
 	int setup = 0;
 
+	for_each_drhd_unit(drhd) {
+		struct intel_iommu *iommu = drhd->iommu;
+
+		/*
+		 * Clear previous faults.
+		 */
+		dmar_fault(-1, iommu);
+
+		/*
+		 * Disable intr remapping and queued invalidation, if already
+		 * enabled prior to OS handover.
+		 */
+		disable_intr_remapping(iommu);
+
+		dmar_disable_qi(iommu);
+	}
+
 	/*
 	 * check for the Interrupt-remapping support
 	 */
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index d95da10..fd4b619 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -113,7 +113,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  * "Define 'is'", Bill Clinton
  * "Define 'if'", Steven Rostedt
  */
-#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :		\
+#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+#define __trace_if(cond) \
+	if (__builtin_constant_p((cond)) ? !!(cond) :			\
 	({								\
 		int ______r;						\
 		static struct ftrace_branch_data			\
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f284407..b967e93 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -24,6 +24,7 @@
 #include <linux/acpi.h>
 #include <linux/types.h>
 #include <linux/msi.h>
+#include <linux/irqreturn.h>
 
 #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
 struct intel_iommu;
@@ -44,6 +45,14 @@ extern struct list_head dmar_drhd_units;
 #define for_each_drhd_unit(drhd) \
 	list_for_each_entry(drhd, &dmar_drhd_units, list)
 
+#define for_each_active_iommu(i, drhd)					\
+	list_for_each_entry(drhd, &dmar_drhd_units, list)		\
+		if (i=drhd->iommu, drhd->ignored) {} else
+
+#define for_each_iommu(i, drhd)						\
+	list_for_each_entry(drhd, &dmar_drhd_units, list)		\
+		if (i=drhd->iommu, 0) {} else 
+
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
 
@@ -127,6 +136,7 @@ extern void dmar_msi_mask(unsigned int irq);
 extern void dmar_msi_read(int irq, struct msi_msg *msg);
 extern void dmar_msi_write(int irq, struct msi_msg *msg);
 extern int dmar_set_interrupt(struct intel_iommu *iommu);
+extern irqreturn_t dmar_fault(int irq, void *dev_id);
 extern int arch_setup_dmar_msi(unsigned int irq);
 
 extern int iommu_detected, no_iommu;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index d2e3cbf..6520e07 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -284,6 +284,14 @@ struct iommu_flush {
 		unsigned int size_order, u64 type, int non_present_entry_flush);
 };
 
+enum {
+	SR_DMAR_FECTL_REG,
+	SR_DMAR_FEDATA_REG,
+	SR_DMAR_FEADDR_REG,
+	SR_DMAR_FEUADDR_REG,
+	MAX_SR_DMAR_REGS
+};
+
 struct intel_iommu {
 	void __iomem	*reg; /* Pointer to hardware regs, virtual addr */
 	u64		cap;
@@ -304,6 +312,8 @@ struct intel_iommu {
 	struct iommu_flush flush;
 #endif
 	struct q_inval  *qi;            /* Queued invalidation info */
+	u32 *iommu_state; /* Store iommu states between suspend and resume.*/
+
 #ifdef CONFIG_INTR_REMAP
 	struct ir_table *ir_table;	/* Interrupt remapping info */
 #endif
@@ -321,6 +331,8 @@ extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev);
 extern int alloc_iommu(struct dmar_drhd_unit *drhd);
 extern void free_iommu(struct intel_iommu *iommu);
 extern int dmar_enable_qi(struct intel_iommu *iommu);
+extern void dmar_disable_qi(struct intel_iommu *iommu);
+extern int dmar_reenable_qi(struct intel_iommu *iommu);
 extern void qi_global_iec(struct intel_iommu *iommu);
 
 extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1529
retrieving revision 1.1530
diff -u -r1.1529 -r1.1530
--- kernel.spec	10 Apr 2009 20:26:25 -0000	1.1529
+++ kernel.spec	11 Apr 2009 05:53:06 -0000	1.1530
@@ -594,6 +594,9 @@
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ftrace.patch
 
+# Support suspend/resume, other crash fixes
+Patch30: linux-2.6-iommu-fixes.patch
+
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch100: linux-2.6-e820-mark-esi-clobbered.patch
@@ -1116,6 +1119,9 @@
 ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-utrace-ftrace.patch
 
+# IOMMU fixes backported to 2.6.29
+ApplyPatch linux-2.6-iommu-fixes.patch
+
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1916,6 +1922,10 @@
 # and build.
 
 %changelog
+* Fri Apr 10 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Fix suspend/resume with Intel IOMMU, handle devices behind PCI-PCI
+  bridges, cope with BIOS claiming IOMMU is at address zero.
+
 * Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com>
 - Only print ext4 allocator fallback warning once.
 



From mtasaka at fedoraproject.org  Sat Apr 11 06:27:18 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 06:27:18 +0000 (UTC)
Subject: rpms/gnome-commander/devel sources,1.32,1.33
Message-ID: <20090411062719.3EFCA70098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12800

Modified Files:
	sources 
Log Message:
Fix source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	11 Apr 2009 05:43:17 -0000	1.32
+++ sources	11 Apr 2009 06:26:47 -0000	1.33
@@ -1 +1 @@
-a5ef7429a44aab5feb548e59c852aee6  gnome-commander-1.3-svn2532_13dev.tar.bz2
+c39d55b5491b5288a4b4556b81419fac  gnome-commander-1.3-svn2532_13dev.tar.bz2



From sharkcz at fedoraproject.org  Sat Apr 11 07:24:24 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 11 Apr 2009 07:24:24 +0000 (UTC)
Subject: rpms/wxPython/devel wxPython-2.8.9.2-treelist.patch,NONE,1.1
Message-ID: <20090411072424.D6DE270098@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29111

Added Files:
	wxPython-2.8.9.2-treelist.patch 
Log Message:
add patch

wxPython-2.8.9.2-treelist.patch:

--- NEW FILE wxPython-2.8.9.2-treelist.patch ---
--- wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp.orig	2009-04-10 23:03:18.000000000 +0200
+++ wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp	2009-04-10 23:03:41.000000000 +0200
@@ -10321,7 +10321,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_
   PyObject *resultobj = 0;
   wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
   wxTreeItemId *arg2 = 0 ;
-  wxTreeItemId const &arg3_defvalue = NULL ;
+  wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ;
   wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ;
   bool arg4 = (bool) true ;
   void *argp1 = 0 ;



From trasher at fedoraproject.org  Sat Apr 11 07:49:51 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 11 Apr 2009 07:49:51 +0000 (UTC)
Subject: rpms/childsplay/devel childsplay.spec,1.17,1.18
Message-ID: <20090411074951.A29D070098@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4074

Modified Files:
	childsplay.spec 
Log Message:
Missing python BR



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- childsplay.spec	31 Mar 2009 14:17:08 -0000	1.17
+++ childsplay.spec	11 Apr 2009 07:49:20 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -21,6 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
+BuildRequires:  python
 Requires:       pygame
 Requires:       python-sqlalchemy
 Requires:       hicolor-icon-theme
@@ -264,6 +265,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Johan Cwiklinski <johan AT x-tnd DOT be>  1.1-5
+- Added missing BR 
+
 * Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
 - fix dejavu-fonts dependency
 



From iarnell at fedoraproject.org  Sat Apr 11 07:50:43 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 11 Apr 2009 07:50:43 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.4,
	1.5 perl-DateTime-Format-Natural.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090411075043.9E49470098@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4387

Modified Files:
	.cvsignore perl-DateTime-Format-Natural.spec sources 
Log Message:
* Sat Apr 11 2009 Iain Arnell <iarnell at gmail.com> 0.76-1
- update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2009 05:41:17 -0000	1.4
+++ .cvsignore	11 Apr 2009 07:50:39 -0000	1.5
@@ -1 +1 @@
-DateTime-Format-Natural-0.75.tar.gz
+DateTime-Format-Natural-0.76.tar.gz


Index: perl-DateTime-Format-Natural.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/perl-DateTime-Format-Natural.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-DateTime-Format-Natural.spec	28 Feb 2009 05:41:17 -0000	1.4
+++ perl-DateTime-Format-Natural.spec	11 Apr 2009 07:50:39 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           perl-DateTime-Format-Natural
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Create machine readable date/time with natural parsing logic
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime-Format-Natural/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(boolean)
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Iain Arnell <iarnell at gmail.com> 0.76-1
+- update to latest upstream release
+
 * Sat Feb 28 2009 Iain Arnell <iarnell at gmail.com> 0.75-1
 - update to 0.75
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2009 05:41:17 -0000	1.4
+++ sources	11 Apr 2009 07:50:40 -0000	1.5
@@ -1 +1 @@
-d1027697f84e0fea42533c4ba709f728  DateTime-Format-Natural-0.75.tar.gz
+f36f9ed4606abc3b3b18018c03be251f  DateTime-Format-Natural-0.76.tar.gz



From tanguy at fedoraproject.org  Sat Apr 11 08:57:22 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sat, 11 Apr 2009 08:57:22 +0000 (UTC)
Subject: rpms/scidavis/devel .cvsignore, 1.4, 1.5 scidavis.spec, 1.15,
	1.16 sources, 1.4, 1.5
Message-ID: <20090411085722.EC0B670098@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23137

Modified Files:
	.cvsignore scidavis.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Feb 2009 21:06:29 -0000	1.4
+++ .cvsignore	11 Apr 2009 08:57:16 -0000	1.5
@@ -1,2 +1,2 @@
-scidavis-0.1.4.tar.bz2
+scidavis-0.2.1.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scidavis.spec	25 Feb 2009 22:56:16 -0000	1.15
+++ scidavis.spec	11 Apr 2009 08:57:16 -0000	1.16
@@ -1,10 +1,10 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.1.4
-Release: 	2%{?dist}
+Version:	0.2.1
+Release: 	1%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
-Patch0:		scidavis-0.1.4-pro.patch
+Patch0:		scidavis-0.2.0-pro.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -33,10 +33,12 @@
 sed -i -e 's/50/100/' scidavis/scidavis.xml
 
 %build
+cd scidavis
 qmake-qt4 scidavis.pro
 make %{?_smp_mflags}
 
 %install
+cd scidavis
 rm -rf %{buildroot}
 make INSTALL_ROOT="%{buildroot}" install
 install -d %{buildroot}%{_datadir}/applications
@@ -47,7 +49,7 @@
 rm %{buildroot}/%{_datadir}/applications/scidavis.desktop
 
 install -d %{buildroot}%{_datadir}/%{name}/translations
-install -D -pm 644 scidavis/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
+install -D -pm 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
 
 mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
 mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
@@ -78,10 +80,10 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGES README gpl.txt
-%exclude %{_sysconfdir}/scidavisrc.pyo
-%exclude %{_sysconfdir}/scidavisrc.pyc
+#%exclude %{_sysconfdir}/scidavisrc.pyo
+#%exclude %{_sysconfdir}/scidavisrc.pyc
 %{_bindir}/scidavis
-%{_libdir}/scidavis/
+#%{_libdir}/scidavis/
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/scidavis.xml
 %{_datadir}/mimelnk/application/x-sciprj.desktop
@@ -89,13 +91,17 @@
 %{_datadir}/icons/hicolor/*/apps/scidavis.*
 %{_datadir}/icons/locolor/*/apps/scidavis.*
 %{_datadir}/scidavis
-%{_sysconfdir}/scidavisrc.py
+#%{_sysconfdir}/scidavisrc.py
 
 %files manual
 %defattr(-,root,root,-)
 %doc manual/*
 
 %changelog
+
+* Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
+- Update to 0.2.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2009 21:06:29 -0000	1.4
+++ sources	11 Apr 2009 08:57:17 -0000	1.5
@@ -1,2 +1,2 @@
-18d884adbd33d0c63cddc7a4c6f2a08e  scidavis-0.1.4.tar.bz2
+5b4d766571163529fa15247b53a66889  scidavis-0.2.1.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2



From tanguy at fedoraproject.org  Sat Apr 11 08:59:37 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sat, 11 Apr 2009 08:59:37 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis-0.2.0-pro.patch, NONE,
	1.1 scidavis-0.1.4-pro.patch, 1.1, NONE
Message-ID: <20090411085937.3C58670098@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23624

Added Files:
	scidavis-0.2.0-pro.patch 
Removed Files:
	scidavis-0.1.4-pro.patch 
Log Message:


scidavis-0.2.0-pro.patch:

--- NEW FILE scidavis-0.2.0-pro.patch ---
--- scidavis-0.2.0/scidavis/scidavis.pro	2008-09-07 14:22:38.000000000 +0200
+++ scidavis-0.2.0/scidavis/scidavis.pro.new	2009-02-15 20:44:16.000000000 +0100
@@ -13,7 +13,7 @@
 
 ### what to install
 INSTALLS        += target       # this is the program itself
-INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
+#INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
 ### Comment out the next line if you do not want automatic compilation and installation of the translations
 INSTALLS        += translationfiles
 
@@ -42,7 +42,7 @@
 win32: documentation.path = "$$INSTALLBASE"                        # ... on Winodws
 ### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
 ### You can override this, uncomment and adjust the path behind the '=' in the next line.
-# manual.path = $$INSTALLBASE/share/doc/scidavis/manual
+manual.path = $$INSTALLBASE/share/doc/scidavis-manual-0.2.0
 ### Important: translationfiles.path will be the directory where scidavis expects
 ### the translation .qm files at runtime. Therefore you need to set it corretly even if 
 ### you do not use this project file to generate the translation files.
@@ -83,34 +83,34 @@
 ### are compiled against Qt4), dynamically against everything else.
 #############################################################################
 
-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 
-unix:INCLUDEPATH  += ../3rdparty/qwt/src
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+#unix:INCLUDEPATH  += ../3rdparty/qwt/src
+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 
-unix:LIBS         += -L/usr/lib$${libsuff}
-unix:LIBS         += -lgsl -lgslcblas -lz
+#unix:LIBS         += -L/usr/lib$${libsuff}
+#unix:LIBS         += -lgsl -lgslcblas -lz
 ### muparser 1.30 does not compile as a shared lib on Linux
-unix:LIBS         += -L/usr/local/lib$${libsuff}
-unix:LIBS         += /usr/local/lib/libmuparser.a
-unix:INCLUDEPATH  += /usr/local/include
+#unix:LIBS         += -L/usr/local/lib$${libsuff}
+#unix:LIBS         += /usr/local/lib/libmuparser.a
+#unix:INCLUDEPATH  += /usr/local/include
 
 #############################################################################
 ### Link everything dynamically
 #############################################################################
 
-#unix:INCLUDEPATH  += /usr/include/qwt5
-#unix:LIBS         += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH  += /usr/include/qwt
+unix:LIBS         += -L/usr/lib$${libsuff}
 ## dynamically link against Qwt(3D) installed system-wide
 ## WARNING: make sure they are compiled against >= Qt4.2
 ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
 ## cause problems.
-#unix:INCLUDEPATH  += /usr/include/qwtplot3d
-#unix:LIBS         += -lqwtplot3d
-#unix:LIBS         += -lqwt
+unix:INCLUDEPATH  += /usr/include/qwtplot3d
+unix:LIBS         += -lqwtplot3d-qt4
+unix:LIBS         += -lqwt
 ##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
 
 #############################################################################
 ### Default settings for Windows


--- scidavis-0.1.4-pro.patch DELETED ---



From pgordon at fedoraproject.org  Sat Apr 11 09:20:43 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sat, 11 Apr 2009 09:20:43 +0000 (UTC)
Subject: rpms/webkitgtk/F-11 webkitgtk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090411092043.6BDE570098@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/webkitgtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29991

Modified Files:
	.cvsignore sources 
Added Files:
	webkitgtk.spec 
Log Message:
Initial commit, renamed from WebKit-gtk (review bug #490399) & updated to 1.1.4


--- NEW FILE webkitgtk.spec ---
## NOTE: Lots of files in various subdirectories have the same name (such as
## "LICENSE") so this short macro allows us to distinguish them by using their
## directory names (from the source tree) as prefixes for the files.
%define 	add_to_doc_files()	\
	mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \
	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')

## Optional build modifications...
## --with coverage: Enables compile-time checking of code coverage.
##	(Default: No)
##
## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
##	Also disables the optimized memory allocator.
##	(Default: No)
##
## --with jit: Enable JIT ("just-in-time") JavaScript compiling support.
## 	Only supported on ix86 at this time, according to upstream.
##	(Default: No)
##	
## --with pango: Use Pango instead of freetype2 as the font renderer.
##	CJK support is functional only with the freetype2 backend.
##	(Default: No - use freetype2)
##
## --with svg: Experimental SVG support (filters)
##	(Default: No) 
##
## --with wml: Build support for WML
##	(Default: No)

%bcond_with 	coverage
%bcond_with 	debug
%bcond_with 	jit
%bcond_with 	pango
%bcond_with 	svg
%bcond_with 	wml

Name:		webkitgtk
Version:	1.1.4
Release:	1%{?dist}
Summary:	GTK+ Web content engine library

Provides:	WebKit-gtk = %{version}-%{release}
Obsoletes:	WebKit-gtk < %{version}-%{release}

Group:		Development/Libraries
License:	LGPLv2+ and BSD
URL:		http://www.webkitgtk.org/

Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	bison
BuildRequires:	flex
BuildRequires:	geoclue-devel
BuildRequires:	gperf
BuildRequires:	gnome-keyring-devel
BuildRequires:	gstreamer-devel
BuildRequires:	gstreamer-plugins-base-devel
BuildRequires:	gtk2-devel
BuildRequires:	libsoup-devel >= 2.25.91
BuildRequires:	libicu-devel
BuildRequires:	libjpeg-devel
BuildRequires:	libtool
BuildRequires:	libxslt-devel
BuildRequires:	libXt-devel
BuildRequires:	pcre-devel
BuildRequires:	sqlite-devel

## Conditional dependencies...
%if %{with pango}
BuildRequires:	pango-devel
%else
BuildRequires:	cairo-devel
BuildRequires:	fontconfig-devel
BuildRequires:	freetype-devel
%endif

%description 
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
GTK+ platform.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig
Requires:	gtk2-devel
Provides:	WebKit-gtk-devel = %{version}-%{release}
Obsoletes:	WebKit-gtk-devel < %{version}-%{release}

%description	devel
The %{name}-devel package contains libraries, build data, and header
files for developing applications that use %{name}.


%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
Provides:	WebKit-doc = %{version}-%{release}
Obsoletes:	WebKit-doc < %{version}-%{release}

%description	doc
This package contains the documentation for %{name}, including various
LICENSE, README, and AUTHORS files.


%prep
%setup -qn "webkit-%{version}"


%build
%configure							\
			--enable-gnomekeyring			\
			--enable-geolocation			\
%{?with_coverage:	--enable-coverage		}	\
%{?with_debug:		--enable-debug			}	\
%{?with_jit:		--enable-jit			}	\
%{?with_pango:		--with-font-backend=pango	}	\
%{?with_svg:		--enable-svg-filters		}	\
%{?with_wml:		--enable-wml			}
	
make %{?_smp_mflags}

# workaround for bug 488112
# Compile libJavaScriptCore.a with -fno-strict-aliasing
touch JavaScriptCore/AllInOneFile.cpp
make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing"


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}

## Finally, copy over and rename the various files for %%doc inclusion.
%add_to_doc_files JavaScriptCore/icu/LICENSE
%add_to_doc_files WebKit/LICENSE
%add_to_doc_files WebCore/icu/LICENSE
%add_to_doc_files WebCore/LICENSE-APPLE
%add_to_doc_files WebCore/LICENSE-LGPL-2
%add_to_doc_files WebCore/LICENSE-LGPL-2.1

%add_to_doc_files JavaScriptCore/pcre/COPYING
%add_to_doc_files JavaScriptCore/COPYING.LIB

#add_to_doc_files JavaScriptCore/icu/README
#add_to_doc_files WebCore/icu/README

%add_to_doc_files JavaScriptCore/AUTHORS
%add_to_doc_files JavaScriptCore/pcre/AUTHORS   

%add_to_doc_files JavaScriptCore/THANKS


%clean
rm -rf %{buildroot}


%post	-p /sbin/ldconfig

%postun	-p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc
%exclude %{_libdir}/*.la
%{_bindir}/jsc
%{_libdir}/libwebkit-1.0.so.*
%{_libexecdir}/%{name}/

%files	devel
%defattr(-,root,root,-)
%{_datadir}/webkit-1.0
%{_includedir}/webkit-1.0
%{_libdir}/libwebkit-1.0.so
%{_libdir}/pkgconfig/webkit-1.0.pc

%files	doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/


%changelog
* Tue Apr 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.4-1
- Update to new upstream release (1.1.4)
- Enable building with geolocation support.
- Add build-time conditional for enabling code coverage checking (coverage).
- Remove html5video conditional and update dependencies accordingly. (HTML5
  video embedding support is now enabled by default by upstream.)

* Sun Mar 15 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.3-1
- Rename from WebKit-gtk and friends to WebKitGTK and subpackages.
- Update to new upstream release (1.1.3)
- Clean up the add_to_doc_files macro usage.

* Sat Mar 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.1-1
- Update to new upstream release (1.1.1), includes a soname bump.
- Enable gnome-keyring support.

* Wed Mar  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-0.21.svn41071
- Compile libJavaScriptCore.a with -fno-strict-aliasing to
  do workaround for #488112

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.20.svn41071
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Feb 20 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.19.svn41071
- Update to new upstream snapshot (SVN 41071).
- Drop libsoup build conditional. Use libsoup as default HTTP backend instead
  of cURL, following upstream's default.

* Fri Jan 30 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.18.svn40351
- Fix ownership of doc directory...this time without the oops (#473619).
- Bump package version number to match that used in the configure/build
  scripts. (Thanks to Martin Sourada for the bug report via email.)

* Thu Jan 29 2009 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.17.svn40351
- Update to new upstream snapshot (SVN 40351): adds the WebPolicyDelegate
  implementaton and related API (#482739).
- Drop Bison 2.4 patch (fixed upstream):
  - bison24.patch
- Fixes CVE-2008-6059: Sensitive information disclosure from cookies via
  XMLHttpRequest calls (#484197).

* Sat Nov 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.16.svn39370
- Update to new upstream snapshot (SVN 39370)
- Fix ownership of %%_docdir in the doc subpackage. 
- Resolves: bug 473619 (WebKit : Unowned directories).
- Adds webinspector data to the gtk-devel subpackage.
- Add patch from upstream bug 22205 to fix compilation errors with Bison 2.4:
  + bison24.patch
- Add build-time conditional for WML support.

* Thu Oct 23 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.15.svn37790
- Update to new upstream snapshot (SVN 37790).
- Default to freetype font backend for improved CJK/Unicode support. (#448693)
- Add some notes to the build options comments block.
- Add a build-time conditional for jit

* Sun Aug 24 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.14.svn35904
- Update to new upstream snapshot (SVN 35904)

* Fri Jul 04 2008 Peter Gordon <peter at thecodergeek.com>
- Remove outdated and unnecessary GCC 4.3 patch:
  - gcc43.patch
- Fix the curl-devel BuildRequire conditional. (It is only needed when building
  against curl instead of libsoup.)

* Thu Jun 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.13.svn34655
- Update to new upstream snapshot (SVN 34655)
- Add some build-time conditionals for non-default features: debug, 
  html5video, libsoup, pango, svg. 

* Tue Jun  3 2008 Caol??n McNamara <caolanm at redhat.com> - 1.0.0-0.12.svn34279
- rebuild for new icu

* Tue Jun  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-0.11.svn34279
- Update to new upstream snapshot (SVN 34279) anyway
- Add BR: libXt-devel

* Tue Apr 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.10.svn32531
- Remove the -Qt subpackage stuff. QtWebKit is now included in Qt proper, as
  of qt-4.4.0-0.6.rc1. (We no longer need separate build-qt and build-gtk
  subdirectories either.)
- Reference: bug 442200 (RFE: WebKit Migration)
- Add libjpeg dependency (was previously pulled in by the qt4-devel dependency
  tree).

* Mon Apr 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-0.9.svn32531
- Update to new upstream snapshot (SVN 32531).
- Fix bug 443048 and hopefully fix bug 444445
- Modify the process of building GTK+ port a bit
- on qt port WebKit/qt/Plugins is not built for qt >= 4.4.0

* Sat Apr 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.8.svn31787
- Update to new upstream snapshot (SVN 31787).
- Resolves: CVE-2008-1010 (bug 438532: Arbitrary code execution) and
  CVE-2008-1011 (bug 438531: Cross-Site Scripting).
- Switch to using autotools for building the GTK+ port.

* Wed Mar 05 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.7.svn30667
- Fix the WebKitGtk pkgconfig data (should depend on gtk+-2.0). Resolves
  bug 436073 (Requires: gtk+-2.0 missing from WebKitGtk.pc).
- Thanks to Mamoru Tasaka for helping find and squash these many bugs. 
  
* Sat Mar 01 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.6.svn30667
- Fix include directory naming. Resolves: bug 435561 (Header file <> header
  file location mismatch)
- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel.
  Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) 

* Fri Feb 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.5.svn30667
- Update to new upstream snapshot (SVN 30667)
- Add some build fixes for GCC 4.3:
  + gcc43.patch

* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-0.5.svn29336
- Autorebuild for GCC 4.3

* Wed Jan 09 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.4.svn29336
- Update to new upstream snapshot (SVN 29336).
- Drop TCSpinLock pthread workaround (fixed upstream):
  - TCSpinLock-use-pthread-stubs.patch

* Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.3.svn28482
- Add proper %%defattr line to qt, qt-devel, and doc subpackages.
- Add patch to forcibly build the TCSpinLock code using the pthread
  implementation:
  + TCSpinLock-use-pthread-stubs.patch

* Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.2.svn28482
- Package renamed from WebKitGtk.
- Update to SVN 28482.
- Build both the GTK and Qt ports, putting each into their own respective
  subpackages.
- Invoke qmake-qt4 and make directly (with SMP build flags) instead of using
  the build-webkit script from upstream.
- Add various AUTHORS, README, and LICENSE files (via the doc subpackage). 

* Tue Dec 04 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.1.svn28383
- Initial packaging for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:11:33 -0000	1.1
+++ .cvsignore	11 Apr 2009 09:20:11 -0000	1.2
@@ -0,0 +1 @@
+webkit-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:11:33 -0000	1.1
+++ sources	11 Apr 2009 09:20:11 -0000	1.2
@@ -0,0 +1 @@
+2c941eb9ad9e791fba9b57bf252e3f04  webkit-1.1.4.tar.gz



From hpejakle at fedoraproject.org  Sat Apr 11 09:25:07 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sat, 11 Apr 2009 09:25:07 +0000 (UTC)
Subject: rpms/subdownloader/F-10 import.log, NONE, 1.1 subdownloader.spec,
	NONE, 
	1.1 subdownloader.xpm, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090411092507.BD75970098@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31401/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log subdownloader.spec subdownloader.xpm 
Log Message:
initial import for F-10 branch



--- NEW FILE import.log ---
subdownloader-2_0_9_3-1_fc10:F-10:subdownloader-2.0.9.3-1.fc10.src.rpm:1239441826


--- NEW FILE subdownloader.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		subdownloader
Version:	2.0.9.3
Release:	1%{?dist}
Summary:	Program for download/upload subtitles for videofiles and DVDs

Group:		Applications/Multimedia
# "modules/progressbar.py is LGPLv2+, everything else is GPLv3+"
License:	GPLv3+ and LGPLv2+
URL:		http://www.subdownloader.net/
Source0:	http://launchpad.net/%{name}/trunk/2.0.9/+download/%{name}-%{version}.tar.gz
# subdownloader.xpm is taken from apt-get source subdownloader
Source1:	subdownloader.xpm
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	gettext, desktop-file-utils
Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto	

%description
Program for automatic download/upload subtitles for videofiles 
(DIVX,MPEG,AVI,VOB,etc) and DVD's using fast hashing.

%prep
%setup -q -n %{name}
rm -rf modules/mmpython
sed -i 's/#\!\/usr\/bin\/env python//g' cli/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' languages/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' FileManagement/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' modules/*.py
sed -i 's/#\!\/usr\/bin\/python//g' modules/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' gui/*.py

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1/
cp -pR gui %{buildroot}%{python_sitelib}/%{name}
cp -pR languages %{buildroot}%{python_sitelib}/%{name}
cp -pR cli %{buildroot}%{python_sitelib}/%{name}
cp -pR FileManagement %{buildroot}%{python_sitelib}/%{name}
cp -pR modules %{buildroot}%{python_sitelib}/%{name}
cp -pR run.py %{buildroot}%{python_sitelib}/%{name}
cp -pR locale %{buildroot}%{python_sitelib}/%{name}
cp -pR locale %{buildroot}%{_datadir}
rm -rf %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.mo
rm -rf %{buildroot}%{_datadir}/locale/*/*/*.po
chmod +x %{buildroot}%{python_sitelib}/%{name}/run.py
desktop-file-install subdownloader.desktop --dir %{buildroot}%{_datadir}/applications
install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
install -pm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/
ln -s ../..%{python_sitelib}/%{name}/run.py %{buildroot}%{_bindir}/subdownloader
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README ChangeLog
%{python_sitelib}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm

%changelog
* Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
- initial version of rpm package


--- NEW FILE subdownloader.xpm ---
/* XPM */
static char *subdownloader[] = {
/* columns rows colors chars-per-pixel */
"32 32 256 2",
"   c #1D1C0C",
".  c #1C1D08",
"X  c #151D14",
"o  c #1C1C14",
"O  c #1E161B",
"+  c #1C1B1A",
"@  c #171A19",
"#  c #241B06",
"$  c #2B1A03",
"%  c #2B160C",
"&  c #241A0C",
"*  c #2B1A0A",
"=  c #281708",
"-  c #351B05",
";  c #341A07",
":  c #251614",
">  c #221A14",
",  c #23161B",
"<  c #28141F",
"1  c #22191A",
"2  c #2A1613",
"3  c #17200C",
"4  c #162011",
"5  c #282309",
"6  c #342304",
"7  c #3E2A00",
"8  c #382909",
"9  c #272512",
"0  c #35281A",
"q  c #2E321F",
"w  c #3B310C",
"e  c #1B1B22",
"r  c #1D182A",
"t  c #181822",
"y  c #231622",
"u  c #251621",
"i  c #2F2929",
"p  c #312F26",
"a  c #332D2E",
"s  c #323226",
"d  c #34322E",
"f  c #342D34",
"g  c #352D3A",
"h  c #382C3D",
"j  c #3A3334",
"k  c #393239",
"l  c #343230",
"z  c #442B07",
"x  c #4B3306",
"c  c #453409",
"v  c #4E3809",
"b  c #483603",
"n  c #5C3C0A",
"m  c #513908",
"M  c #4B3D12",
"N  c #643F0E",
"B  c #463C3C",
"V  c #5A450B",
"C  c #4D4114",
"Z  c #5B4E1C",
"A  c #5C4114",
"S  c #624A0C",
"D  c #62460B",
"F  c #684D15",
"G  c #6F5D14",
"H  c #6C5B1D",
"J  c #735B1C",
"K  c #7D5C17",
"L  c #7B641A",
"P  c #756018",
"I  c #4A462A",
"U  c #44403A",
"Y  c #544C3C",
"T  c #595439",
"R  c #5A4821",
"E  c #775A28",
"W  c #6A513C",
"Q  c #786939",
"!  c #7B6826",
"~  c #4C4548",
"^  c #554D44",
"/  c #53534B",
"(  c #5C564A",
")  c #57584A",
"_  c #564E53",
"`  c #5D5B54",
"'  c #575558",
"]  c #625A47",
"[  c #635D55",
"{  c #645B5B",
"}  c #63555A",
"|  c #6E614C",
" . c #7C704C",
".. c #65635B",
"X. c #6F6A5B",
"o. c #696258",
"O. c #77695B",
"+. c #77765E",
"@. c #555360",
"#. c #6C6A68",
"$. c #777565",
"%. c #776E72",
"&. c #7D7976",
"*. c #757978",
"=. c #787577",
"-. c #6F666C",
";. c #865D1A",
":. c #8A6A1C",
">. c #86671C",
",. c #8E701D",
"<. c #8D7016",
"1. c #96731C",
"2. c #987D18",
"3. c #926E17",
"4. c #A47C1A",
"5. c #845F20",
"6. c #8D7422",
"7. c #83742D",
"8. c #937223",
"9. c #987723",
"0. c #8B7738",
"q. c #826836",
"w. c #887756",
"e. c #927E5F",
"r. c #88784D",
"t. c #857A6A",
"y. c #847E7D",
"u. c #8A7E7A",
"i. c #7E8274",
"p. c #A4831A",
"a. c #AA851A",
"s. c #B08718",
"d. c #B99715",
"f. c #BAA012",
"g. c #A48526",
"h. c #B48A20",
"j. c #A89122",
"k. c #BC972A",
"l. c #A48732",
"z. c #AEA036",
"x. c #C89D14",
"c. c #C6A51C",
"v. c #CAA516",
"b. c #D9B518",
"n. c #CAA80E",
"m. c #FDBE03",
"M. c #FBBE0C",
"N. c #E5B819",
"B. c #F8BF1D",
"V. c #F6BE15",
"C. c #CAAC24",
"Z. c #CAA524",
"A. c #D2AA26",
"S. c #DDB621",
"D. c #DCBD2A",
"F. c #CEA137",
"G. c #CAB137",
"H. c #E3B927",
"J. c #EDC60C",
"K. c #EEC80B",
"L. c #ECC806",
"P. c #F4C402",
"I. c #FBC203",
"U. c #F4C902",
"Y. c #F4C40B",
"T. c #FAC20B",
"R. c #F2C808",
"E. c #EDC413",
"W. c #ECC812",
"Q. c #ECC41B",
"!. c #E9C719",
"~. c #F2C412",
"^. c #F9C213",
"/. c #F2C31A",
"(. c #F4C819",
"). c #DDC236",
"_. c #E3C224",
"`. c #EBC329",
"'. c #E9C724",
"]. c #F5C724",
"[. c #E7C933",
"{. c #FACB39",
"}. c #FBD032",
"|. c #948649",
" X c #8E8743",
".X c #AD9C56",
"XX c #BCA65C",
"oX c #B5A24A",
"OX c #84826D",
"+X c #9B8967",
"@X c #888576",
"#X c #928879",
"$X c #9F927C",
"%X c #A18C6D",
"&X c #A2976A",
"*X c #B49B6F",
"=X c #A99C76",
"-X c #B9AC78",
";X c #B7AA6A",
":X c #D2B65F",
">X c #C2A849",
",X c #CEBB6C",
"<X c #C5B773",
"1X c #D0BA67",
"2X c #DBC75D",
"3X c #FFCF40",
"4X c #FCD347",
"5X c #FED44B",
"6X c #FBDA4E",
"7X c #F4D247",
"8X c #EFD85C",
"9X c #FDD354",
"0X c #FBDB52",
"qX c #FBD35C",
"wX c #FBDA5C",
"eX c #F5D356",
"rX c #E1C94C",
"tX c #D7C374",
"yX c #E0CE6D",
"uX c #EFDA6B",
"iX c #E9D269",
"pX c #FCD562",
"aX c #FBDA64",
"sX c #FFD669",
"dX c #FEDB6D",
"fX c #F4DD67",
"gX c #EFD37A",
"hX c #EEDA79",
"jX c #F7DA76",
"kX c #F7E17A",
"lX c #7C7B87",
"zX c #827C81",
"xX c #877F85",
"cX c #847E94",
"vX c #898584",
"bX c #8C8983",
"nX c #848688",
"mX c #8C8C8C",
"MX c #888687",
"NX c #908E8C",
"BX c #938B82",
"VX c #8D938C",
"CX c #939387",
"ZX c #898392",
"AX c #8B8C95",
"SX c #928E97",
"DX c #8C9290",
"FX c #949498",
"GX c #B9AB81",
"HX c #AFAC9C",
"JX c #B6B6AE",
"KX c #C3B383",
"LX c #D8C680",
"PX c #EEDA8D",
"IX c #E6CE8A",
"UX c #F6E084",
/* pixels */
"HXMXMX at X@XAXbXMXNXmXAXmXBXBXNXAXmXNXVXVXVXSXSXCXCXSXFXFXVXFXFXJX",
"xXcXnX at XvXvX@Xu.OX at XvXvX@XvX at XnXmXMXMXMXbX#X=X-XGX=X#XNXNXNXNXSX",
"&.lX=.*.u.t.%XGX&X-X%Xt.zXlXi.y.y.y.u.u.+XLXUXUXhXPXKX#XcXvX at XMX",
"$.=.%.=.w.,XhX<X+XhXgX*X&.*.$.y.=.&.t.+XIXkXaXdXaXjXkX<Xt.OXOXzX",
"X.#.-. .1XfXuX+XO.yX0XgX=X$.+.%.=.%.r.tXfXaXaXaXsXsXwXfX;X$.&.=.",
"..#....XpXqXiX| #.;X6X6XgXr.X.#.#.X.&XfX0XwXpXwXsXpX0X0XuXe.%.%.",
"[ `  .8X4X9X>X{ ..|.8X4X9X:X| ..#.Q yXeX5X9X9X6X9X}.(.(.'.>XO.-.",
"' ( z.!.^.{.r.` ` W 2X9X4XeXr.` [ |.uX8XpX9X3X[.'.L.V.].~.).Q ..",
"^ I N.I.^.b.9 U ' Y oXeX3X4XoX( ( r.|. Xq.E H H J G G E G H M ] ",
"B V (.I.Y.p.  > f Y Q 7X{.{.rXT ^ W 0 o 2 2 2 > 2 # * : % $ Q ~ ",
"0 6.R.I.R.V > o o > 8 D.].].`.n M 0.* @ + : , 1 > @ & + . x G.p ",
"* x.U.I.N.* : 1 o O : 2.J.~.J.5.E C.* 4 4 o 4 > > e   + . :.Q.6 ",
"* N.P.T.p.> , o   + : D W.I.P.4.1.`.n O o o + : o e > +   Z.V.m ",
"6 W.P./.S + , > o O o ; b.P.M.x.a.V.9.= 3 o > & & o   & c Q.M.D ",
"w E.P.H.; o 1 o + o O % 9.R.Y.x.s.^.A.=   e + , , @ + & :.Y.~.F ",
"c /.I.p.: + o 1 1 o + & D ~.U.n.s.T./.m # e + : u o + % x.Y.K.F ",
"x M.^.Z , < X 1 < o   & = N.P.v.p.J.^.3.& e X : : u 4 w /.I.W.S ",
"w W.N.5 > > 4 1 1 + @ + : p.~.d.8.J.T.v.# + X , > 1   L V.I.Q.m ",
"& _.g.. &   o > o + 1 + + D '.s.L ~.I.(.v X + O > > & c.m.I./.8 ",
"& A.F > > @ : :   1 , > o - S.8.D Y.U.Y.,.& : y O X x V.I.I.b.: ",
"& l.* 1 y r e + o y u > + & g.F - E.Y.I.n.= : + e > >.T.I.P.d.o ",
"1 w # & &   &   & & % =   $ R s : d.Y.T.K.v % @ y & x.I.I.Y.P & ",
"+ 9 7.6.6.8.6.6.6.,.8.6.6.8.E X o J ~.I.R.:.& 1 1 b E.T.T.H.8 & ",
": & C.~.Y.^.Y.T.~.K.~.^.~./.>.&   6 N.I.~.c.& o o L R.Y.T.s.& > ",
"> * K Q.M.I.P.P.U.U.I.I.Y.H.7 > + # <.V.M.!.c & = f.T.T._.v . 1 ",
"X y ; C.P.P.M.P.I.m.T.I.W.,.& 3 : 1 6 A.I.K.>.: z W.I.V.1.* o 1 ",
"+ + 2 V _.Y.M.m.m.T.I.U.c.- > + O o > v H.M.n.= ;.K.~.k.6 + + 1 ",
"r X   2 G _.P.I.I.T.R.C.x &   t e > o   v F.[.c k._.g.- : e o 1 ",
"1 > & o = V C.'.!._.j.z , O o @ o y : X X * F M ! m % 1 X X o : ",
"0 1 o @ + * - m V 7 & + r > + e + y & o t +   & & > r @   @ O i ",
"~ B j k k j j g g k l f d s l h l d s j k s i g f f i p s p j / ",
"nX/ / _ / / / / ' T ' ' ) ) ( ( ] ) ' } } ( ` ` ( ` { { } [ [ MX"
};


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:25:36 -0000	1.1
+++ .cvsignore	11 Apr 2009 09:24:37 -0000	1.2
@@ -0,0 +1 @@
+subdownloader-2.0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:25:36 -0000	1.1
+++ sources	11 Apr 2009 09:24:37 -0000	1.2
@@ -0,0 +1 @@
+eff9ef5b0f027ff913798cdc41f5ce47  subdownloader-2.0.9.3.tar.gz



From tanguy at fedoraproject.org  Sat Apr 11 09:32:42 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sat, 11 Apr 2009 09:32:42 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis.spec,1.16,1.17
Message-ID: <20090411093243.08F1D70098@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv940

Modified Files:
	scidavis.spec 
Log Message:



Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scidavis.spec	11 Apr 2009 08:57:16 -0000	1.16
+++ scidavis.spec	11 Apr 2009 09:32:12 -0000	1.17
@@ -80,8 +80,8 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGES README gpl.txt
-#%exclude %{_sysconfdir}/scidavisrc.pyo
-#%exclude %{_sysconfdir}/scidavisrc.pyc
+%exclude %{_sysconfdir}/scidavisrc.pyo
+%exclude %{_sysconfdir}/scidavisrc.pyc
 %{_bindir}/scidavis
 #%{_libdir}/scidavis/
 %{_datadir}/applications/*
@@ -91,7 +91,7 @@
 %{_datadir}/icons/hicolor/*/apps/scidavis.*
 %{_datadir}/icons/locolor/*/apps/scidavis.*
 %{_datadir}/scidavis
-#%{_sysconfdir}/scidavisrc.py
+%{_sysconfdir}/scidavisrc.py
 
 %files manual
 %defattr(-,root,root,-)



From hpejakle at fedoraproject.org  Sat Apr 11 09:51:42 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sat, 11 Apr 2009 09:51:42 +0000 (UTC)
Subject: rpms/subdownloader/F-11 import.log, NONE, 1.1 subdownloader.spec,
	NONE, 
	1.1 subdownloader.xpm, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090411095142.39E8A70098@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3005/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log subdownloader.spec subdownloader.xpm 
Log Message:
initial package



--- NEW FILE import.log ---
subdownloader-2_0_9_3-1_fc10:F-11:subdownloader-2.0.9.3-1.fc10.src.rpm:1239442677


--- NEW FILE subdownloader.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		subdownloader
Version:	2.0.9.3
Release:	1%{?dist}
Summary:	Program for download/upload subtitles for videofiles and DVDs

Group:		Applications/Multimedia
# "modules/progressbar.py is LGPLv2+, everything else is GPLv3+"
License:	GPLv3+ and LGPLv2+
URL:		http://www.subdownloader.net/
Source0:	http://launchpad.net/%{name}/trunk/2.0.9/+download/%{name}-%{version}.tar.gz
# subdownloader.xpm is taken from apt-get source subdownloader
Source1:	subdownloader.xpm
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	gettext, desktop-file-utils
Requires:	python >= 2.3.5-7, PyQt4, python-kaa-metadata, python-crypto	

%description
Program for automatic download/upload subtitles for videofiles 
(DIVX,MPEG,AVI,VOB,etc) and DVD's using fast hashing.

%prep
%setup -q -n %{name}
rm -rf modules/mmpython
sed -i 's/#\!\/usr\/bin\/env python//g' cli/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' languages/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' FileManagement/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' modules/*.py
sed -i 's/#\!\/usr\/bin\/python//g' modules/*.py
sed -i 's/#\!\/usr\/bin\/env python//g' gui/*.py

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1/
cp -pR gui %{buildroot}%{python_sitelib}/%{name}
cp -pR languages %{buildroot}%{python_sitelib}/%{name}
cp -pR cli %{buildroot}%{python_sitelib}/%{name}
cp -pR FileManagement %{buildroot}%{python_sitelib}/%{name}
cp -pR modules %{buildroot}%{python_sitelib}/%{name}
cp -pR run.py %{buildroot}%{python_sitelib}/%{name}
cp -pR locale %{buildroot}%{python_sitelib}/%{name}
cp -pR locale %{buildroot}%{_datadir}
rm -rf %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.mo
rm -rf %{buildroot}%{_datadir}/locale/*/*/*.po
chmod +x %{buildroot}%{python_sitelib}/%{name}/run.py
desktop-file-install subdownloader.desktop --dir %{buildroot}%{_datadir}/applications
install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
install -pm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/
ln -s ../..%{python_sitelib}/%{name}/run.py %{buildroot}%{_bindir}/subdownloader
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README ChangeLog
%{python_sitelib}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm

%changelog
* Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
- initial version of rpm package


--- NEW FILE subdownloader.xpm ---
/* XPM */
static char *subdownloader[] = {
/* columns rows colors chars-per-pixel */
"32 32 256 2",
"   c #1D1C0C",
".  c #1C1D08",
"X  c #151D14",
"o  c #1C1C14",
"O  c #1E161B",
"+  c #1C1B1A",
"@  c #171A19",
"#  c #241B06",
"$  c #2B1A03",
"%  c #2B160C",
"&  c #241A0C",
"*  c #2B1A0A",
"=  c #281708",
"-  c #351B05",
";  c #341A07",
":  c #251614",
">  c #221A14",
",  c #23161B",
"<  c #28141F",
"1  c #22191A",
"2  c #2A1613",
"3  c #17200C",
"4  c #162011",
"5  c #282309",
"6  c #342304",
"7  c #3E2A00",
"8  c #382909",
"9  c #272512",
"0  c #35281A",
"q  c #2E321F",
"w  c #3B310C",
"e  c #1B1B22",
"r  c #1D182A",
"t  c #181822",
"y  c #231622",
"u  c #251621",
"i  c #2F2929",
"p  c #312F26",
"a  c #332D2E",
"s  c #323226",
"d  c #34322E",
"f  c #342D34",
"g  c #352D3A",
"h  c #382C3D",
"j  c #3A3334",
"k  c #393239",
"l  c #343230",
"z  c #442B07",
"x  c #4B3306",
"c  c #453409",
"v  c #4E3809",
"b  c #483603",
"n  c #5C3C0A",
"m  c #513908",
"M  c #4B3D12",
"N  c #643F0E",
"B  c #463C3C",
"V  c #5A450B",
"C  c #4D4114",
"Z  c #5B4E1C",
"A  c #5C4114",
"S  c #624A0C",
"D  c #62460B",
"F  c #684D15",
"G  c #6F5D14",
"H  c #6C5B1D",
"J  c #735B1C",
"K  c #7D5C17",
"L  c #7B641A",
"P  c #756018",
"I  c #4A462A",
"U  c #44403A",
"Y  c #544C3C",
"T  c #595439",
"R  c #5A4821",
"E  c #775A28",
"W  c #6A513C",
"Q  c #786939",
"!  c #7B6826",
"~  c #4C4548",
"^  c #554D44",
"/  c #53534B",
"(  c #5C564A",
")  c #57584A",
"_  c #564E53",
"`  c #5D5B54",
"'  c #575558",
"]  c #625A47",
"[  c #635D55",
"{  c #645B5B",
"}  c #63555A",
"|  c #6E614C",
" . c #7C704C",
".. c #65635B",
"X. c #6F6A5B",
"o. c #696258",
"O. c #77695B",
"+. c #77765E",
"@. c #555360",
"#. c #6C6A68",
"$. c #777565",
"%. c #776E72",
"&. c #7D7976",
"*. c #757978",
"=. c #787577",
"-. c #6F666C",
";. c #865D1A",
":. c #8A6A1C",
">. c #86671C",
",. c #8E701D",
"<. c #8D7016",
"1. c #96731C",
"2. c #987D18",
"3. c #926E17",
"4. c #A47C1A",
"5. c #845F20",
"6. c #8D7422",
"7. c #83742D",
"8. c #937223",
"9. c #987723",
"0. c #8B7738",
"q. c #826836",
"w. c #887756",
"e. c #927E5F",
"r. c #88784D",
"t. c #857A6A",
"y. c #847E7D",
"u. c #8A7E7A",
"i. c #7E8274",
"p. c #A4831A",
"a. c #AA851A",
"s. c #B08718",
"d. c #B99715",
"f. c #BAA012",
"g. c #A48526",
"h. c #B48A20",
"j. c #A89122",
"k. c #BC972A",
"l. c #A48732",
"z. c #AEA036",
"x. c #C89D14",
"c. c #C6A51C",
"v. c #CAA516",
"b. c #D9B518",
"n. c #CAA80E",
"m. c #FDBE03",
"M. c #FBBE0C",
"N. c #E5B819",
"B. c #F8BF1D",
"V. c #F6BE15",
"C. c #CAAC24",
"Z. c #CAA524",
"A. c #D2AA26",
"S. c #DDB621",
"D. c #DCBD2A",
"F. c #CEA137",
"G. c #CAB137",
"H. c #E3B927",
"J. c #EDC60C",
"K. c #EEC80B",
"L. c #ECC806",
"P. c #F4C402",
"I. c #FBC203",
"U. c #F4C902",
"Y. c #F4C40B",
"T. c #FAC20B",
"R. c #F2C808",
"E. c #EDC413",
"W. c #ECC812",
"Q. c #ECC41B",
"!. c #E9C719",
"~. c #F2C412",
"^. c #F9C213",
"/. c #F2C31A",
"(. c #F4C819",
"). c #DDC236",
"_. c #E3C224",
"`. c #EBC329",
"'. c #E9C724",
"]. c #F5C724",
"[. c #E7C933",
"{. c #FACB39",
"}. c #FBD032",
"|. c #948649",
" X c #8E8743",
".X c #AD9C56",
"XX c #BCA65C",
"oX c #B5A24A",
"OX c #84826D",
"+X c #9B8967",
"@X c #888576",
"#X c #928879",
"$X c #9F927C",
"%X c #A18C6D",
"&X c #A2976A",
"*X c #B49B6F",
"=X c #A99C76",
"-X c #B9AC78",
";X c #B7AA6A",
":X c #D2B65F",
">X c #C2A849",
",X c #CEBB6C",
"<X c #C5B773",
"1X c #D0BA67",
"2X c #DBC75D",
"3X c #FFCF40",
"4X c #FCD347",
"5X c #FED44B",
"6X c #FBDA4E",
"7X c #F4D247",
"8X c #EFD85C",
"9X c #FDD354",
"0X c #FBDB52",
"qX c #FBD35C",
"wX c #FBDA5C",
"eX c #F5D356",
"rX c #E1C94C",
"tX c #D7C374",
"yX c #E0CE6D",
"uX c #EFDA6B",
"iX c #E9D269",
"pX c #FCD562",
"aX c #FBDA64",
"sX c #FFD669",
"dX c #FEDB6D",
"fX c #F4DD67",
"gX c #EFD37A",
"hX c #EEDA79",
"jX c #F7DA76",
"kX c #F7E17A",
"lX c #7C7B87",
"zX c #827C81",
"xX c #877F85",
"cX c #847E94",
"vX c #898584",
"bX c #8C8983",
"nX c #848688",
"mX c #8C8C8C",
"MX c #888687",
"NX c #908E8C",
"BX c #938B82",
"VX c #8D938C",
"CX c #939387",
"ZX c #898392",
"AX c #8B8C95",
"SX c #928E97",
"DX c #8C9290",
"FX c #949498",
"GX c #B9AB81",
"HX c #AFAC9C",
"JX c #B6B6AE",
"KX c #C3B383",
"LX c #D8C680",
"PX c #EEDA8D",
"IX c #E6CE8A",
"UX c #F6E084",
/* pixels */
"HXMXMX at X@XAXbXMXNXmXAXmXBXBXNXAXmXNXVXVXVXSXSXCXCXSXFXFXVXFXFXJX",
"xXcXnX at XvXvX@Xu.OX at XvXvX@XvX at XnXmXMXMXMXbX#X=X-XGX=X#XNXNXNXNXSX",
"&.lX=.*.u.t.%XGX&X-X%Xt.zXlXi.y.y.y.u.u.+XLXUXUXhXPXKX#XcXvX at XMX",
"$.=.%.=.w.,XhX<X+XhXgX*X&.*.$.y.=.&.t.+XIXkXaXdXaXjXkX<Xt.OXOXzX",
"X.#.-. .1XfXuX+XO.yX0XgX=X$.+.%.=.%.r.tXfXaXaXaXsXsXwXfX;X$.&.=.",
"..#....XpXqXiX| #.;X6X6XgXr.X.#.#.X.&XfX0XwXpXwXsXpX0X0XuXe.%.%.",
"[ `  .8X4X9X>X{ ..|.8X4X9X:X| ..#.Q yXeX5X9X9X6X9X}.(.(.'.>XO.-.",
"' ( z.!.^.{.r.` ` W 2X9X4XeXr.` [ |.uX8XpX9X3X[.'.L.V.].~.).Q ..",
"^ I N.I.^.b.9 U ' Y oXeX3X4XoX( ( r.|. Xq.E H H J G G E G H M ] ",
"B V (.I.Y.p.  > f Y Q 7X{.{.rXT ^ W 0 o 2 2 2 > 2 # * : % $ Q ~ ",
"0 6.R.I.R.V > o o > 8 D.].].`.n M 0.* @ + : , 1 > @ & + . x G.p ",
"* x.U.I.N.* : 1 o O : 2.J.~.J.5.E C.* 4 4 o 4 > > e   + . :.Q.6 ",
"* N.P.T.p.> , o   + : D W.I.P.4.1.`.n O o o + : o e > +   Z.V.m ",
"6 W.P./.S + , > o O o ; b.P.M.x.a.V.9.= 3 o > & & o   & c Q.M.D ",
"w E.P.H.; o 1 o + o O % 9.R.Y.x.s.^.A.=   e + , , @ + & :.Y.~.F ",
"c /.I.p.: + o 1 1 o + & D ~.U.n.s.T./.m # e + : u o + % x.Y.K.F ",
"x M.^.Z , < X 1 < o   & = N.P.v.p.J.^.3.& e X : : u 4 w /.I.W.S ",
"w W.N.5 > > 4 1 1 + @ + : p.~.d.8.J.T.v.# + X , > 1   L V.I.Q.m ",
"& _.g.. &   o > o + 1 + + D '.s.L ~.I.(.v X + O > > & c.m.I./.8 ",
"& A.F > > @ : :   1 , > o - S.8.D Y.U.Y.,.& : y O X x V.I.I.b.: ",
"& l.* 1 y r e + o y u > + & g.F - E.Y.I.n.= : + e > >.T.I.P.d.o ",
"1 w # & &   &   & & % =   $ R s : d.Y.T.K.v % @ y & x.I.I.Y.P & ",
"+ 9 7.6.6.8.6.6.6.,.8.6.6.8.E X o J ~.I.R.:.& 1 1 b E.T.T.H.8 & ",
": & C.~.Y.^.Y.T.~.K.~.^.~./.>.&   6 N.I.~.c.& o o L R.Y.T.s.& > ",
"> * K Q.M.I.P.P.U.U.I.I.Y.H.7 > + # <.V.M.!.c & = f.T.T._.v . 1 ",
"X y ; C.P.P.M.P.I.m.T.I.W.,.& 3 : 1 6 A.I.K.>.: z W.I.V.1.* o 1 ",
"+ + 2 V _.Y.M.m.m.T.I.U.c.- > + O o > v H.M.n.= ;.K.~.k.6 + + 1 ",
"r X   2 G _.P.I.I.T.R.C.x &   t e > o   v F.[.c k._.g.- : e o 1 ",
"1 > & o = V C.'.!._.j.z , O o @ o y : X X * F M ! m % 1 X X o : ",
"0 1 o @ + * - m V 7 & + r > + e + y & o t +   & & > r @   @ O i ",
"~ B j k k j j g g k l f d s l h l d s j k s i g f f i p s p j / ",
"nX/ / _ / / / / ' T ' ' ) ) ( ( ] ) ' } } ( ` ` ( ` { { } [ [ MX"
};


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:25:36 -0000	1.1
+++ .cvsignore	11 Apr 2009 09:51:11 -0000	1.2
@@ -0,0 +1 @@
+subdownloader-2.0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:25:36 -0000	1.1
+++ sources	11 Apr 2009 09:51:11 -0000	1.2
@@ -0,0 +1 @@
+eff9ef5b0f027ff913798cdc41f5ce47  subdownloader-2.0.9.3.tar.gz



From tanguy at fedoraproject.org  Sat Apr 11 09:52:20 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sat, 11 Apr 2009 09:52:20 +0000 (UTC)
Subject: rpms/scidavis/F-10 scidavis-0.2.0-pro.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 scidavis.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090411095220.1751A70098@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7448

Modified Files:
	.cvsignore scidavis.spec sources 
Added Files:
	scidavis-0.2.0-pro.patch 
Log Message:


scidavis-0.2.0-pro.patch:

--- NEW FILE scidavis-0.2.0-pro.patch ---
--- scidavis-0.2.0/scidavis/scidavis.pro	2008-09-07 14:22:38.000000000 +0200
+++ scidavis-0.2.0/scidavis/scidavis.pro.new	2009-02-15 20:44:16.000000000 +0100
@@ -13,7 +13,7 @@
 
 ### what to install
 INSTALLS        += target       # this is the program itself
-INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
+#INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
 ### Comment out the next line if you do not want automatic compilation and installation of the translations
 INSTALLS        += translationfiles
 
@@ -42,7 +42,7 @@
 win32: documentation.path = "$$INSTALLBASE"                        # ... on Winodws
 ### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
 ### You can override this, uncomment and adjust the path behind the '=' in the next line.
-# manual.path = $$INSTALLBASE/share/doc/scidavis/manual
+manual.path = $$INSTALLBASE/share/doc/scidavis-manual-0.2.0
 ### Important: translationfiles.path will be the directory where scidavis expects
 ### the translation .qm files at runtime. Therefore you need to set it corretly even if 
 ### you do not use this project file to generate the translation files.
@@ -83,34 +83,34 @@
 ### are compiled against Qt4), dynamically against everything else.
 #############################################################################
 
-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 
-unix:INCLUDEPATH  += ../3rdparty/qwt/src
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+#unix:INCLUDEPATH  += ../3rdparty/qwt/src
+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 
-unix:LIBS         += -L/usr/lib$${libsuff}
-unix:LIBS         += -lgsl -lgslcblas -lz
+#unix:LIBS         += -L/usr/lib$${libsuff}
+#unix:LIBS         += -lgsl -lgslcblas -lz
 ### muparser 1.30 does not compile as a shared lib on Linux
-unix:LIBS         += -L/usr/local/lib$${libsuff}
-unix:LIBS         += /usr/local/lib/libmuparser.a
-unix:INCLUDEPATH  += /usr/local/include
+#unix:LIBS         += -L/usr/local/lib$${libsuff}
+#unix:LIBS         += /usr/local/lib/libmuparser.a
+#unix:INCLUDEPATH  += /usr/local/include
 
 #############################################################################
 ### Link everything dynamically
 #############################################################################
 
-#unix:INCLUDEPATH  += /usr/include/qwt5
-#unix:LIBS         += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH  += /usr/include/qwt
+unix:LIBS         += -L/usr/lib$${libsuff}
 ## dynamically link against Qwt(3D) installed system-wide
 ## WARNING: make sure they are compiled against >= Qt4.2
 ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
 ## cause problems.
-#unix:INCLUDEPATH  += /usr/include/qwtplot3d
-#unix:LIBS         += -lqwtplot3d
-#unix:LIBS         += -lqwt
+unix:INCLUDEPATH  += /usr/include/qwtplot3d
+unix:LIBS         += -lqwtplot3d-qt4
+unix:LIBS         += -lqwt
 ##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
 
 #############################################################################
 ### Default settings for Windows


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2009 21:41:27 -0000	1.4
+++ .cvsignore	11 Apr 2009 09:51:48 -0000	1.5
@@ -1,3 +1,2 @@
-scidavis-0.1.4.tar.bz2
-scidavis-0.1.4-pro.patch
+scidavis-0.2.1.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/scidavis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scidavis.spec	13 Feb 2009 21:41:28 -0000	1.7
+++ scidavis.spec	11 Apr 2009 09:51:48 -0000	1.8
@@ -1,10 +1,10 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.1.4
+Version:	0.2.1
 Release: 	1%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
-Patch0:		scidavis-0.1.4-pro.patch
+Patch0:		scidavis-0.2.0-pro.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -33,10 +33,12 @@
 sed -i -e 's/50/100/' scidavis/scidavis.xml
 
 %build
+cd scidavis
 qmake-qt4 scidavis.pro
 make %{?_smp_mflags}
 
 %install
+cd scidavis
 rm -rf %{buildroot}
 make INSTALL_ROOT="%{buildroot}" install
 install -d %{buildroot}%{_datadir}/applications
@@ -47,7 +49,7 @@
 rm %{buildroot}/%{_datadir}/applications/scidavis.desktop
 
 install -d %{buildroot}%{_datadir}/%{name}/translations
-install -D -pm 644 scidavis/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
+install -D -pm 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
 
 mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
 mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
@@ -81,7 +83,7 @@
 %exclude %{_sysconfdir}/scidavisrc.pyo
 %exclude %{_sysconfdir}/scidavisrc.pyc
 %{_bindir}/scidavis
-%{_libdir}/scidavis/
+#%{_libdir}/scidavis/
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/scidavis.xml
 %{_datadir}/mimelnk/application/x-sciprj.desktop
@@ -96,6 +98,13 @@
 %doc manual/*
 
 %changelog
+
+* Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
+- Update to 0.2.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 09 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.4-1
 - Update to 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2009 21:41:28 -0000	1.4
+++ sources	11 Apr 2009 09:51:49 -0000	1.5
@@ -1,3 +1,2 @@
-18d884adbd33d0c63cddc7a4c6f2a08e  scidavis-0.1.4.tar.bz2
-ebc9a90674c0fd5304b36ee2700e7bf3  scidavis-0.1.4-pro.patch
+5b4d766571163529fa15247b53a66889  scidavis-0.2.1.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2



From thias at fedoraproject.org  Sat Apr 11 10:07:53 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 11 Apr 2009 10:07:53 +0000 (UTC)
Subject: rpms/thttpd/devel thttpd-2.25b-getline.patch, NONE, 1.1 thttpd.spec,
	1.21, 1.22
Message-ID: <20090411100753.C1ABF70098@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/thttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11578

Modified Files:
	thttpd.spec 
Added Files:
	thttpd-2.25b-getline.patch 
Log Message:
Include patch to rename conflicting "getline" function (stdio.h).


thttpd-2.25b-getline.patch:

--- NEW FILE thttpd-2.25b-getline.patch ---
diff -Naupr thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
--- thttpd-2.25b.orig/extras/htpasswd.c	2009-04-11 11:43:28.910251860 +0200
+++ thttpd-2.25b/extras/htpasswd.c	2009-04-11 11:44:00.737126470 +0200
@@ -54,7 +54,7 @@ static void getword(char *word, char *li
     while((line[y++] = line[x++]));
 }
 
-static int getline(char *s, int n, FILE *f) {
+static int get_line(char *s, int n, FILE *f) {
     register int i=0;
 
     while(1) {
@@ -225,7 +225,7 @@ int main(int argc, char *argv[]) {
 
     found = 0;
     /* line we get is username:pwd, or possibly any other cruft */
-    while(!(getline(line,MAX_LINE_LEN,f))) {
+    while(!(get_line(line,MAX_LINE_LEN,f))) {
         char *i;
 
         if(found || (line[0] == '#') || (!line[0])) {


Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- thttpd.spec	10 Apr 2009 13:15:20 -0000	1.21
+++ thttpd.spec	11 Apr 2009 10:07:23 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
@@ -15,6 +15,7 @@
 Source11: thttpd_powered_3.png
 Patch0: thttpd-2.25b-CVE-2005-3124.patch
 Patch1: thttpd-2.25b-fixes.patch
+Patch2: thttpd-2.25b-getline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: system-logos >= 7.92.1
 Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
@@ -38,6 +39,7 @@
 %setup -q
 %patch0 -p1 -b .CVE-2005-3124
 %patch1 -p1 -b .fixes
+%patch2 -p1 -b .getline
 # Convert man pages to UTF8
 for man in *.8 */*.8 */*.1; do
     iconv -f iso8859-1 -t utf-8 -o tmp ${man}
@@ -55,8 +57,8 @@
 %{?_without_indexes:      %{__perl} -pi -e 's/#define GENERATE_INDEXES/#undef GENERATE_INDEXES/g' config.h}
 %{!?_with_showversion:    %{__perl} -pi -e 's/#define SHOW_SERVER_VERSION/#undef SHOW_SERVER_VERSION/g' config.h}
 %{!?_with_expliciterrors: %{__perl} -pi -e 's/#define EXPLICIT_ERROR_PAGES/#undef EXPLICIT_ERROR_PAGES/g' config.h}
-# Don't use _smp_mflags since the build fails with it
-%{__make} WEBDIR=%{webroot} STATICFLAG="" \
+# (list SUBDIRS to exclude "cgi-src")
+%{__make} %{?_smp_mflags} SUBDIRS="extras" WEBDIR=%{webroot} STATICFLAG="" \
     CCOPT="%{optflags} -D_FILE_OFFSET_BITS=64"
 
 
@@ -72,8 +74,9 @@
 %{__install} -Dpm 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/thttpd
 %{__install} -Dpm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/thttpd
 
-# Main install
-%{__make} install BINDIR=%{buildroot}%{_sbindir} \
+# Main install (list SUBDIRS to exclude "cgi-src")
+%{__make} install SUBDIRS="extras" \
+    BINDIR=%{buildroot}%{_sbindir} \
     MANDIR=%{buildroot}%{_mandir} \
     WEBDIR=%{buildroot}%{webroot}
 
@@ -155,19 +158,18 @@
 %{_sbindir}/syslogtocern
 %{_sbindir}/thttpd
 %{webroot}/
-# We don't want those default cgi-bin programs
-%exclude %{webroot}/cgi-bin/
 %{_mandir}/man1/thtpasswd.1*
 %{_mandir}/man8/syslogtocern.8*
 %{_mandir}/man8/thttpd.8*
-# Also exclude cgi-bin man pages
-%exclude %{_mandir}/man8/redirect.8*
-%exclude %{_mandir}/man8/ssi.8*
 # Hack to own parent directory for the default "webroot". Remove if needed.
 %dir /var/www
 
 
 %changelog
+* Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.25b-21
+- Include patch to rename conflicting "getline" function (stdio.h).
+- Fix so that makeweb gets compiled in "build" section with the right WEBDIR.
+
 * Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 2.25b-20
 - Fix thttpd-2.25b-CVE-2005-3124.patch (#483733).
 - Remove unwanted .orig files from patches (#484205).
@@ -178,7 +180,8 @@
 - Fix thttpd mode from 555 to 755.
 - Add new init block to the init script (commands and exit status need work).
 - Re-enable indexes by default, it's possible to turn them off with dir modes.
-- Don't build htpasswd as static.
+- Don't even compile the CGI programs instead of just excluding them.
+- No longer build htpasswd as static.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From chkr at fedoraproject.org  Sat Apr 11 10:12:14 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Sat, 11 Apr 2009 10:12:14 +0000 (UTC)
Subject: rpms/anki/devel .cvsignore, 1.3, 1.4 anki.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20090411101214.70A0970098@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/anki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12548

Modified Files:
	.cvsignore anki.spec sources 
Log Message:
- Update to new upstream version 0.9.9.7.4 (BZ 494598)
- Require python-matplotlib instead of numpy (BZ 495232)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anki/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Apr 2009 21:11:01 -0000	1.3
+++ .cvsignore	11 Apr 2009 10:11:43 -0000	1.4
@@ -1 +1 @@
-anki-0.9.9.7.1.tgz
+anki-0.9.9.7.4.tgz


Index: anki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anki/devel/anki.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- anki.spec	1 Apr 2009 21:11:01 -0000	1.4
+++ anki.spec	11 Apr 2009 10:11:43 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		anki
-Version:	0.9.9.7.1
+Version:	0.9.9.7.4
 Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
@@ -17,10 +17,10 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, python-setuptools, python-sqlalchemy
 BuildRequires:	PyQt4-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 Requires:	qt4, PyQt4
 Requires:	python-sqlalchemy, python-simplejson, python-sqlite2
-Requires:	numpy
+Requires:	python-matplotlib
 Requires:	pygame
 BuildArch:	noarch
 
@@ -100,6 +100,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Apr 11 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.4-1
+- Update to new upstream version 0.9.9.7.4 (BZ 494598)
+- Require python-matplotlib instead of numpy (BZ 495232)
+
 * Wed Apr 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.1-1
 - Update to new upstream version 0.9.9.7.1
 - Drop unihaninstall patch (applied upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anki/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Apr 2009 21:11:01 -0000	1.3
+++ sources	11 Apr 2009 10:11:43 -0000	1.4
@@ -1 +1 @@
-7b39a2c58b31641a46d9be308aa1e56b  anki-0.9.9.7.1.tgz
+fb2de3abcdc7ced9215215ec2c7511d0  anki-0.9.9.7.4.tgz



From chkr at fedoraproject.org  Sat Apr 11 10:42:07 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Sat, 11 Apr 2009 10:42:07 +0000 (UTC)
Subject: rpms/anki/F-10 .cvsignore, 1.3, 1.4 anki.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <20090411104207.8A17970098@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/anki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17943

Modified Files:
	.cvsignore anki.spec sources 
Log Message:
- Update to new upstream version 0.9.9.7.4 (BZ 494598)
- Require python-matplotlib instead of numpy (BZ 495232)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2009 21:12:35 -0000	1.3
+++ .cvsignore	11 Apr 2009 10:41:37 -0000	1.4
@@ -1 +1 @@
-anki-0.9.9.7.1.tgz
+anki-0.9.9.7.4.tgz


Index: anki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-10/anki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- anki.spec	7 Apr 2009 21:12:35 -0000	1.3
+++ anki.spec	11 Apr 2009 10:41:37 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		anki
-Version:	0.9.9.7.1
+Version:	0.9.9.7.4
 Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
@@ -20,7 +20,7 @@
 BuildRequires:  desktop-file-utils
 Requires:	qt4, PyQt4
 Requires:	python-sqlalchemy, python-simplejson, python-sqlite2
-Requires:	numpy
+Requires:	python-matplotlib
 Requires:	pygame
 BuildArch:	noarch
 
@@ -100,6 +100,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Apr 11 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.4-1
+- Update to new upstream version 0.9.9.7.4 (BZ 494598)
+- Require python-matplotlib instead of numpy (BZ 495232)
+
 * Tue Apr 07 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.1-1
 - Update to new upstream version 0.9.9.7.1
 - Drop unihaninstall patch (applied upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Apr 2009 21:12:35 -0000	1.3
+++ sources	11 Apr 2009 10:41:37 -0000	1.4
@@ -1 +1 @@
-7b39a2c58b31641a46d9be308aa1e56b  anki-0.9.9.7.1.tgz
+fb2de3abcdc7ced9215215ec2c7511d0  anki-0.9.9.7.4.tgz



From thias at fedoraproject.org  Sat Apr 11 10:52:32 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 11 Apr 2009 10:52:32 +0000 (UTC)
Subject: rpms/glusterfs/devel .cvsignore, 1.6, 1.7 glusterfs.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090411105232.B2CD370098@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20054

Modified Files:
	.cvsignore glusterfs.spec sources 
Log Message:
Update to 2.0.0rc7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2009 12:24:48 -0000	1.6
+++ .cvsignore	11 Apr 2009 10:52:28 -0000	1.7
@@ -1 +1 @@
-glusterfs-1.3.12.tar.gz
+glusterfs-2.0.0rc7.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/glusterfs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glusterfs.spec	24 Feb 2009 22:19:35 -0000	1.7
+++ glusterfs.spec	11 Apr 2009 10:52:29 -0000	1.8
@@ -1,3 +1,5 @@
+%define pre rc7
+
 # Possible rpmbuild options
 %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
 %{?_without_client:%define _without_client --disable-fuse-client}
@@ -13,12 +15,12 @@
 
 Summary: Cluster File System
 Name: glusterfs
-Version: 1.3.12
-Release: 2%{?dist}
+Version: 2.0.0
+Release: 0.1%{?pre:.%{pre}}%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/docs/index.php/GlusterFS
-Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}.tar.gz
+Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
 Source1: glusterfsd.init
 Source2: glusterfsd.sysconfig
 Source3: umount.glusterfs
@@ -41,12 +43,13 @@
 is in userspace and easily manageable.
 
 
-%package libs
-Summary: GlusterFS Library and Translators
+%package common
+Summary: GlusterFS common files for both the client and the server
 Group: System Environment/Libraries
-Obsoletes: glusterfs-common >= 1.3.7-2
+Obsoletes: glusterfs-libs < 2.0.0
+Provides: glusterfs-libs = %{version}-%{release}
 
-%description libs
+%description common
 GlusterFS is a clustered file-system capable of scaling to several
 peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
@@ -55,15 +58,15 @@
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
 is in userspace and easily manageable.
 
-This package includes libglusterfs and glusterfs translator modules
-common to both GlusterFS server and client framework.
+This package includes the glusterfs binary, libglusterfs and glusterfs
+translator modules common to both GlusterFS server and client framework.
 
 
 %package client
 Summary: GlusterFS Client
 Group: Applications/File
 Requires: fuse
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description client
 GlusterFS is a clustered file-system capable of scaling to several
@@ -80,7 +83,7 @@
 %package server
 Summary: GlusterFS Server
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -97,7 +100,7 @@
 %package devel
 Summary: GlusterFS Development Libraries
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -112,11 +115,16 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?pre}
+# Don't get executable sources in the debuginfo package (as of 2.0.0rc7)
+chmod -x libglusterfsclient/src/*.{c,h}
 
 
 %build
 %configure %{?_without_ibverbs} %{?_without_client} %{?_without_python}
+# Remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 
 
@@ -128,6 +136,9 @@
 %{__install} -p -m 0644 libglusterfs/src/*.h \
     %{buildroot}%{_includedir}/glusterfs/
 
+# Remove unwanted files from all of the shared libraries
+find %{buildroot}%{_libdir}/glusterfs -name '*.a' -o -name '*.la' | xargs rm -f
+
 # Remove installed docs, we include them ourselves as %%doc
 %{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
 
@@ -157,9 +168,9 @@
 %{__rm} -rf %{buildroot}
 
 
-%post libs -p /sbin/ldconfig
+%post common -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun common -p /sbin/ldconfig
 
 
 %post server
@@ -177,45 +188,51 @@
 fi
 
 
-%files libs
+%files common
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/glusterfs/
 %{_libdir}/*.so.*
+%{_sbindir}/glusterfs
+%{_mandir}/man8/glusterfs.8*
+%dir /var/log/glusterfs/
 
 
 %if 0%{!?_without_client:1}
 %files client
-%{_sbindir}/glusterfs
 /sbin/mount.glusterfs
 /sbin/umount.glusterfs
-%dir /var/log/glusterfs/
-%{_mandir}/man8/glusterfs.8*
 %endif
 
 
 %files server
-%doc examples/ doc/glusterfs-*.vol.sample
+%doc examples/ doc/glusterfs*.vol.sample
 %dir %{_sysconfdir}/glusterfs/
 %config(noreplace) %{_sysconfdir}/glusterfs/*.vol
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 %{_sysconfdir}/init.d/glusterfsd
-%{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
-%dir /var/log/glusterfs/
-%{_mandir}/man8/glusterfs.8*
 
 
 %files devel
 %{_includedir}/glusterfs/
+%{_includedir}/libglusterfsclient.h
 %exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-2
+* Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc7
+- Update to 2.0.0rc7.
+- Rename "libs" to "common" and move the binary, man page and log dir there.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc1
+- Update to 2.0.0rc1.
+- Include new libglusterfsclient.h.
+
 * Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
 - Update to 1.3.12.
 - Remove no longer needed ocreat patch.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2009 12:24:48 -0000	1.6
+++ sources	11 Apr 2009 10:52:29 -0000	1.7
@@ -1 +1 @@
-db11e3d9d227f5b10b2a93c0d8929123  glusterfs-1.3.12.tar.gz
+5bf45dcb8a3ad14042fcf2c2dd25e125  glusterfs-2.0.0rc7.tar.gz



From thias at fedoraproject.org  Sat Apr 11 11:32:29 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 11 Apr 2009 11:32:29 +0000 (UTC)
Subject: rpms/autodir/devel autodir-0.99.9-noskeldirmodforce.patch, NONE,
	1.1 autodir.spec, 1.6, 1.7 autogroup.init, 1.2,
	1.3 autohome.init, 1.2, 1.3
Message-ID: <20090411113229.784D770098@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/autodir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28053

Modified Files:
	autodir.spec autogroup.init autohome.init 
Added Files:
	autodir-0.99.9-noskeldirmodforce.patch 
Log Message:
Finish updating init scripts (#246873).


autodir-0.99.9-noskeldirmodforce.patch:

--- NEW FILE autodir-0.99.9-noskeldirmodforce.patch ---
diff -Naupr autodir-0.99.9.orig/src/modules/autohome.c autodir-0.99.9/src/modules/autohome.c
--- autodir-0.99.9.orig/src/modules/autohome.c	2007-04-10 06:49:51.000000000 +0200
+++ autodir-0.99.9/src/modules/autohome.c	2008-09-18 17:04:02.000000000 +0200
@@ -629,7 +629,7 @@ static int copy_skel_dir( const char *sr
 		}
 		else if( S_ISDIR( sdent_st.st_mode ) )
 		{
-			if( mkdir( ddent, sdent_st.st_mode & S_IRWXU ) == -1 )
+			if( mkdir( ddent, sdent_st.st_mode ) == -1 )
 			{
 				if( errno == EEXIST )
 				{


Index: autodir.spec
===================================================================
RCS file: /cvs/extras/rpms/autodir/devel/autodir.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- autodir.spec	24 Feb 2009 03:20:31 -0000	1.6
+++ autodir.spec	11 Apr 2009 11:31:57 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Creates user directories on demand
 Name: autodir
 Version: 0.99.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.intraperson.com/autodir/
@@ -12,6 +12,7 @@
 Source4: autohome.sysconfig
 Patch0: autodir-0.96.0-cflags.patch
 Patch1: autodir-0.99.8-auto_fs4.patch
+Patch2: autodir-0.99.9-noskeldirmodforce.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -28,6 +29,7 @@
 %setup -q
 %patch0 -p1 -b .cflags
 %patch1 -p1 -b .auto_fs4
+%patch2 -p1 -b .noskeldirmodforce
 
 
 %build
@@ -92,13 +94,19 @@
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.9-7
+* Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 0.99.9-8
+- Finish updating init scripts (#246873).
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Nov 30 2008 Caol??n McNamara <caolanm at redhat.com> - 0.99.9-6
 - rebuild for dependencies
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99.9-5
+* Thu Sep 18 2008 Matthias Saou <http://freshrpms.net/> 0.99.9-6
+- Include patch to remove forced mode 700 on dirs installed from skel.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.99.9-4


Index: autogroup.init
===================================================================
RCS file: /cvs/extras/rpms/autodir/devel/autogroup.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogroup.init	22 Aug 2007 12:38:41 -0000	1.2
+++ autogroup.init	11 Apr 2009 11:31:57 -0000	1.3
@@ -1,104 +1,115 @@
 #!/bin/sh
+#
+# autogroup Creates user home directories on demand
+#
 # chkconfig: - 29 71
-# description: Creates user group directories on demand
+# description: Autohome creates user home directories in a transparent \
+#              manner. It relies on the autofs protocol for its operation.
 
 ### BEGIN INIT INFO
 # Provides: autogroup
 # Required-Start: $local_fs
 # Required-Stop: $local_fs
-# Short-Description: Creates group home directories on demand
-# Description: Autogroup creates group home directories in a transparent manner.
-#       It relies on the autofs protocol for its operation.
+# Should-Start: autohome
+# Should-Stop: autohome
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: Creates user home directories on demand
+# Description: Autohome creates user home directories in a transparent manner.
+#    It relies on the autofs protocol for its operation.
 ### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
 
-# Source configuration
-. /etc/sysconfig/autogroup
+exec="/usr/sbin/autodir"
+prog="autogroup"
 
-prog=autogroup
-RETVAL=0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-start() {
+lockfile=/var/lock/subsys/$prog
 
-	# If autofs old module is loaded unload it now
-	grep -q -w autofs /proc/modules || \
-		/sbin/rmmod autofs &>/dev/null
-
-	# If module is not loaded load it now
-	grep -q autofs4 /proc/modules || \
-		/sbin/modprobe -k autofs4 &>/dev/null
-
-	# See if autofs module actually loaded
-	if ! grep -q -w autofs4 /proc/modules
-	then
-		exit 1
-	fi
-
-	echo -n $"Starting $prog: "
-
-	daemon /usr/sbin/autodir -d $AUTOGROUP_HOME -m $AUTOGROUP_MODULE \
-		${AUTOGROUP_OPTIONS+"-o $AUTOGROUP_OPTIONS"} \
-		${AUTOGROUP_TIMEOUT+"-t $AUTOGROUP_TIMEOUT"} \
-		${AUTOGROUP_BACKUP+"-b $AUTOGROUP_BACKUP"} \
-		${AUTOGROUP_BACKWAIT+"-w $AUTOGROUP_BACKWAIT"} \
-		${AUTOGROUP_BACKPRI+"-p $AUTOGROUP_BACKPRI"} \
-		${AUTOGROUP_MAXBACK+"-c $AUTOGROUP_MAXBACK"} \
-		-l /var/run/$prog.pid
-
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	echo
+start() {
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    # If module is not loaded, load it now
+    grep -q autofs4 /proc/modules || /sbin/modprobe -k autofs4 &>/dev/null
+    # Now start autodir for autogroup
+    echo -n $"Starting $prog: "
+    daemon $exec -d $AUTOGROUP_HOME -m $AUTOGROUP_MODULE \
+        ${AUTOGROUP_OPTIONS+"-o $AUTOGROUP_OPTIONS"} \
+        ${AUTOGROUP_TIMEOUT+"-t $AUTOGROUP_TIMEOUT"} \
+        ${AUTOGROUP_BACKUP+"-b $AUTOGROUP_BACKUP"} \
+        ${AUTOGROUP_BACKWAIT+"-w $AUTOGROUP_BACKWAIT"} \
+        ${AUTOGROUP_BACKPRI+"-p $AUTOGROUP_BACKPRI"} \
+        ${AUTOGROUP_MAXBACK+"-c $AUTOGROUP_MAXBACK"} \
+        -l /var/run/$prog.pid 2>/dev/null
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	echo -n $"Stopping $prog: "
-	killproc $prog
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-	echo
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
 }
 
 restart() {
-	stop
-	start
+    stop
+    start
 }
 
-dostatus() {
-	pid=`pidfileofproc $prog`
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
 
-	if [ -n "$pid" -a -d "/proc/$pid" ]
-	then
-		echo "$prog (pid $pid) running..."
-		RETVAL=0
-	else
-		echo "$prog stopped"
-		RETVAL=1
-	fi
+rh_status() {
+    status $prog
 }
 
-# See how we were called.
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	restart
-	;;
-  condrestart)
-	[ -f /var/lock/subsys/$prog ] && restart
-	;;
-  status)
-	dostatus
-	;;
-  *)
-	echo $"Usage: $prog {start|stop|restart|reload|condrestart|status}"
-	exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+       ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?
 


Index: autohome.init
===================================================================
RCS file: /cvs/extras/rpms/autodir/devel/autohome.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autohome.init	22 Aug 2007 12:38:41 -0000	1.2
+++ autohome.init	11 Apr 2009 11:31:57 -0000	1.3
@@ -1,104 +1,113 @@
 #!/bin/sh
+#
+# autohome Creates user home directories on demand
+#
 # chkconfig: - 28 72
-# description: Creates user home directories on demand
+# description: Autohome creates user home directories in a transparent \
+#              manner. It relies on the autofs protocol for its operation.
 
 ### BEGIN INIT INFO
 # Provides: autohome
 # Required-Start: $local_fs
 # Required-Stop: $local_fs
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Creates user home directories on demand
 # Description: Autohome creates user home directories in a transparent manner.
-#	It relies on the autofs protocol for its operation.
+#    It relies on the autofs protocol for its operation.
 ### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
 
-# Source configuration
-. /etc/sysconfig/autohome
+exec="/usr/sbin/autodir"
+prog="autohome"
 
-prog=autohome
-RETVAL=0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-start() {
+lockfile=/var/lock/subsys/$prog
 
-	# If autofs old module is loaded unload it now
-	grep -q -w autofs /proc/modules || \
-		/sbin/rmmod autofs &>/dev/null
-
-	# If module is not loaded load it now
-	grep -q autofs4 /proc/modules || \
-		/sbin/modprobe -k autofs4 &>/dev/null
-
-	# See if autofs module actually loaded
-	if ! grep -q -w autofs4 /proc/modules
-	then
-		exit 1
-	fi
-
-	echo -n $"Starting $prog: "
-
-	daemon /usr/sbin/autodir -d $AUTOHOME_HOME -m $AUTOHOME_MODULE \
-		${AUTOHOME_OPTIONS+"-o $AUTOHOME_OPTIONS"} \
-		${AUTOHOME_TIMEOUT+"-t $AUTOHOME_TIMEOUT"} \
-		${AUTOHOME_BACKUP+"-b $AUTOHOME_BACKUP"} \
-		${AUTOHOME_BACKWAIT+"-w $AUTOHOME_BACKWAIT"} \
-		${AUTOHOME_BACKPRI+"-p $AUTOHOME_BACKPRI"} \
-		${AUTOHOME_MAXBACK+"-c $AUTOHOME_MAXBACK"} \
-		-l /var/run/$prog.pid
-
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	echo
+start() {
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    # If module is not loaded, load it now
+    grep -q autofs4 /proc/modules || /sbin/modprobe -k autofs4 &>/dev/null
+    # Now start autodir for autohome
+    echo -n $"Starting $prog: "
+    daemon $exec -d $AUTOHOME_HOME -m $AUTOHOME_MODULE \
+        ${AUTOHOME_OPTIONS+"-o $AUTOHOME_OPTIONS"} \
+        ${AUTOHOME_TIMEOUT+"-t $AUTOHOME_TIMEOUT"} \
+        ${AUTOHOME_BACKUP+"-b $AUTOHOME_BACKUP"} \
+        ${AUTOHOME_BACKWAIT+"-w $AUTOHOME_BACKWAIT"} \
+        ${AUTOHOME_BACKPRI+"-p $AUTOHOME_BACKPRI"} \
+        ${AUTOHOME_MAXBACK+"-c $AUTOHOME_MAXBACK"} \
+        -l /var/run/$prog.pid 2>/dev/null
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	echo -n $"Stopping $prog: "
-	killproc $prog
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-	echo
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
 }
 
 restart() {
-	stop
-	start
+    stop
+    start
 }
 
-dostatus() {
-	pid=`pidfileofproc $prog`
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
 
-	if [ -n "$pid" -a -d "/proc/$pid" ]
-	then
-		echo "$prog (pid $pid) running..."
-		RETVAL=0
-	else
-		echo "$prog stopped"
-		RETVAL=1
-	fi
+rh_status() {
+    status $prog
 }
 
-# See how we were called.
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	restart
-	;;
-  condrestart)
-	[ -f /var/lock/subsys/$prog ] && restart
-	;;
-  status)
-	dostatus
-	;;
-  *)
-	echo $"Usage: $prog {start|stop|restart|reload|condrestart|status}"
-	exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+       ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?
 



From rishi at fedoraproject.org  Sat Apr 11 11:44:56 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 11:44:56 +0000 (UTC)
Subject: rpms/anjuta/F-10 anjuta.spec,1.59,1.60
Message-ID: <20090411114456.184E570098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30937

Modified Files:
	anjuta.spec 
Log Message:
Fixed Spec in F-10.
 
 Modified Files:
 	anjuta.spec 



Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-10/anjuta.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- anjuta.spec	16 Mar 2009 20:36:22 -0000	1.59
+++ anjuta.spec	11 Apr 2009 11:44:25 -0000	1.60
@@ -319,7 +319,7 @@
   from a different application. (GNOME Bugzilla #560284)
 - Backported fix to hide .pyc and .pyo files. (GNOME Bugzilla #563530)
 - Backported fix to actually save files, modified by the GtkSourceview editor
-  plugin, on exit from 2.25.x. (GNOME Bugzilla #574376)
+  plugin, on exit. (GNOME Bugzilla #574376)
 - Added patch against class generator plugin to fix wrong copyright and license
   notices. (GNOME Bugzilla #575147)
 



From chkr at fedoraproject.org  Sat Apr 11 11:45:59 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Sat, 11 Apr 2009 11:45:59 +0000 (UTC)
Subject: rpms/anki/F-9 anki-0.9.9.7.1-noupdate.patch, NONE, 1.1 anki.spec,
	1.2, 1.3 anki-0.9.9.6-noupdate.patch, 1.1,
	NONE anki-0.9.9.6-unihaninstall.patch, 1.1,
	NONE generate-anki-tarball.sh, 1.1, NONE
Message-ID: <20090411114559.274D170098@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/anki/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31180

Modified Files:
	anki.spec 
Added Files:
	anki-0.9.9.7.1-noupdate.patch 
Removed Files:
	anki-0.9.9.6-noupdate.patch anki-0.9.9.6-unihaninstall.patch 
	generate-anki-tarball.sh 
Log Message:
- Update to new upstream version 0.9.9.7.4 (BZ 495232)
- Require python-matplotlib instead of numpy (BZ 494598)
- Drop unihaninstall patch (applied upstream)
- Updated noupdate patch
- Use original upstream tgz since upstream doesn't ship the example files
anymore



anki-0.9.9.7.1-noupdate.patch:

--- NEW FILE anki-0.9.9.7.1-noupdate.patch ---
diff -uNr anki-0.9.9.7.1.old/ankiqt/config.py anki-0.9.9.7.1/ankiqt/config.py
--- anki-0.9.9.7.1.old/ankiqt/config.py	2009-03-23 05:40:26.000000000 +0100
+++ anki-0.9.9.7.1/ankiqt/config.py	2009-03-29 23:24:00.000000000 +0200
@@ -44,7 +44,7 @@
             'iconSize': 32,
             'syncOnLoad': True,
             'syncOnClose': True,
-            'checkForUpdates': True,
+            'checkForUpdates': False,
             'interfaceLang': "",
             'syncUsername': "",
             'syncPassword': "",


Index: anki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-9/anki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anki.spec	6 Mar 2009 23:23:04 -0000	1.2
+++ anki.spec	11 Apr 2009 11:45:57 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		anki
-Version:	0.9.9.6
-Release:	4%{?dist}
+Version:	0.9.9.7.4
+Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
 Group:		Amusements/Games
@@ -10,26 +10,17 @@
 # was created out of  Unihan.txt from www.unicode.org (MIT license)
 License:	GPLv3+ and MIT
 URL:		http://www.ichi2.net/anki
-Source0:	%{name}-%{version}-nosamples.tgz
-# anki contains a sample with an unclear license
-# this script to remove all samples since they are not installed anyway
-# Download the upstream tarball and invoke this script while in the
-# tarball's directory:
-# ./generate-anki-tarball.sh 0.9.9.6
-# upstream tarball: http://ichi2.net/anki/download/%{name}-%{version}.tgz
-Source1:	generate-anki-tarball.sh
+Source0:	http://ichi2.net/anki/download/files/%{name}-%{version}.tgz
+
 # Config change: don't check for new updates.
-Patch0:		anki-0.9.9.6-noupdate.patch
-# install issue tracked upstream:
-# http://code.google.com/p/anki/issues/detail?id=561
-Patch1:		anki-0.9.9.6-unihaninstall.patch
+Patch0:		anki-0.9.9.7.1-noupdate.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, python-setuptools, python-sqlalchemy
 BuildRequires:	PyQt4-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 Requires:	qt4, PyQt4
 Requires:	python-sqlalchemy, python-simplejson, python-sqlite2
-Requires:	numpy
+Requires:	python-matplotlib
 Requires:	pygame
 BuildArch:	noarch
 
@@ -41,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .noupdate
-%patch1 -p1 -b .unihaninstall
 
 %build
 pushd libanki
@@ -99,7 +89,10 @@
 %lang(ja) %{python_sitelib}/*/locale/ja_*/
 %lang(ko) %{python_sitelib}/*/locale/ko_*/
 %lang(pl) %{python_sitelib}/*/locale/pl_*/
-%lang(zh) %{python_sitelib}/anki/locale/zh_*/
+%lang(zh) %{python_sitelib}/*/locale/zh_*/
+%lang(sv) %{python_sitelib}/*/locale/sv_*/
+%lang(pt) %{python_sitelib}/*/locale/pt_*/
+%lang(ee) %{python_sitelib}/*/locale/ee_*/
 
 %{python_sitelib}/*egg-info
 %{_bindir}/anki
@@ -107,6 +100,17 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Apr 11 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.4-1
+- Update to new upstream version 0.9.9.7.4 (BZ 495232)
+- Require python-matplotlib instead of numpy (BZ 494598)
+
+* Wed Apr 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.7.1-1
+- Update to new upstream version 0.9.9.7.1
+- Drop unihaninstall patch (applied upstream)
+- Updated noupdate patch
+- Use original upstream tgz since upstream doesn't ship the example files
+anymore
+
 * Sat Mar 07 2009 Christian Krause <chkr at fedoraproject.org> - 0.9.9.6-4
 - Bump release
 


--- anki-0.9.9.6-noupdate.patch DELETED ---


--- anki-0.9.9.6-unihaninstall.patch DELETED ---


--- generate-anki-tarball.sh DELETED ---



From chkr at fedoraproject.org  Sat Apr 11 11:48:22 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Sat, 11 Apr 2009 11:48:22 +0000 (UTC)
Subject: rpms/anki/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090411114822.F173A70098@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/anki/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31941

Modified Files:
	.cvsignore sources 
Log Message:
Update to new upstream version 0.9.9.7.4: add tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 23:16:11 -0000	1.2
+++ .cvsignore	11 Apr 2009 11:47:51 -0000	1.3
@@ -1 +1 @@
-anki-0.9.9.6-nosamples.tgz
+anki-0.9.9.7.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Mar 2009 23:16:11 -0000	1.2
+++ sources	11 Apr 2009 11:47:51 -0000	1.3
@@ -1 +1 @@
-0f029c744c849a5e2ca7f95df119c59f  anki-0.9.9.6-nosamples.tgz
+fb2de3abcdc7ced9215215ec2c7511d0  anki-0.9.9.7.4.tgz



From thias at fedoraproject.org  Sat Apr 11 11:52:41 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sat, 11 Apr 2009 11:52:41 +0000 (UTC)
Subject: rpms/oidentd/devel oidentd.init,1.1,1.2 oidentd.spec,1.16,1.17
Message-ID: <20090411115241.19B5970098@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/oidentd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv804

Modified Files:
	oidentd.init oidentd.spec 
Log Message:
Update init script (#247006).



Index: oidentd.init
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oidentd.init	29 Jun 2006 09:58:20 -0000	1.1
+++ oidentd.init	11 Apr 2009 11:52:10 -0000	1.2
@@ -1,74 +1,111 @@
 #!/bin/sh
 #
-# oidentd	Start/Stop RFC 1413 identd server
+# oidentd      RFC 1413 identification server
 #
-# chkconfig: - 35 65
-# description:	The identd server provides a means to determine the identity \
-#		of a user of a particular TCP connection.  Given a TCP port \
-#		number pair, it returns a character string which identifies \
-#		the owner of that connection on the server's system.
-# processname: oidentd
-# config: /etc/oidentd.conf
+# chkconfig:   - 35 65
+# description: The identd server provides a means to determine the identity \
+#              of a user of a particular TCP connection.  Given a TCP port \
+#              number pair, it returns a character string which identifies \
+#              the owner of that connection on the server's system.
+
+### BEGIN INIT INFO
+# Provides: identd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: RFC 1413 identification server
+# Description:       The identd server provides a means to determine the
+#                    identity of a user of a particular TCP connection.
+#                    Given a TCP port number pair, it returns a character
+#                    string which identifies the owner of that connection
+#                    on the server's system.
+### END INIT INFO
 
 # Source function library.
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
 
-# Get config.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
-[ -x /usr/sbin/oidentd ] || exit 0
+exec="/usr/sbin/oidentd"
+prog="oidentd"
+config="/etc/oidentd.conf"
 
-# Get options
-. /etc/sysconfig/oidentd
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-RETVAL=0
-prog="oidentd"
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	echo -n $"Starting $prog: "
-	daemon $prog $OIDENTD_OPTIONS
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	return $RETVAL
+    [ -x $exec ] || exit 5
+    [ -f /etc/sysconfig/$prog ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon $exec $OIDENTD_OPTIONS
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	echo -n $"Stopping $prog: "
-	killproc $prog
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-	return $RETVAL
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
 }
 
-# See how we were called.
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-	status $prog
-	;;
-  restart|reload)
-	stop
-	start
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/$prog ]; then
-	    stop
-	    start
-	fi
-	;;
-  *)
-	echo "Usage: $prog {start|stop|status|restart|condrestart}"
-	exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
+exit $?
 
-exit $RETVAL


Index: oidentd.spec
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- oidentd.spec	26 Feb 2009 08:00:41 -0000	1.16
+++ oidentd.spec	11 Apr 2009 11:52:10 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Implementation of the RFC1413 identification server
 Name: oidentd
 Version: 2.0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 # A few files taken from other projects are GPLv2+, but the core of oidentd
 # is definitely GPLv2 only.
 License: GPLv2
@@ -77,8 +77,8 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COPYING* NEWS README TODO doc/rfc1413
-%ghost %config %{_sysconfdir}/oidentd.conf
-%ghost %config %{_sysconfdir}/oidentd_masq.conf
+%ghost %config(noreplace) %{_sysconfdir}/oidentd.conf
+%ghost %config(noreplace) %{_sysconfdir}/oidentd_masq.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/oidentd
 /etc/rc.d/init.d/oidentd
 %{_sbindir}/oidentd
@@ -86,10 +86,14 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.8-6
+* Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.8-7
+- Update init script (#247006).
+- Mark the ghosted config files as noreplace just in case.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.8-5
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 2.0.8-4



From rdieter at fedoraproject.org  Sat Apr 11 11:56:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 11 Apr 2009 11:56:43 +0000 (UTC)
Subject: rpms/merkaartor/F-10 merkaartor.spec,1.8,1.9
Message-ID: <20090411115643.84EA970126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/merkaartor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1685

Modified Files:
	merkaartor.spec 
Log Message:
* Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> 0.13.1-1.1
- rebuild against qt-4.4.x



Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/merkaartor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merkaartor.spec	4 Apr 2009 19:58:41 -0000	1.8
+++ merkaartor.spec	11 Apr 2009 11:56:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.13.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -57,6 +57,9 @@
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> 0.13.1-1.1
+- rebuild against qt-4.4.x
+
 * Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
 - new upstream release
 



From rdieter at fedoraproject.org  Sat Apr 11 11:59:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 11 Apr 2009 11:59:24 +0000 (UTC)
Subject: rpms/merkaartor/F-10 merkaartor.spec,1.9,1.10
Message-ID: <20090411115924.0B66270098@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/merkaartor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3099

Modified Files:
	merkaartor.spec 
Log Message:
note bz#495182



Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/merkaartor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merkaartor.spec	11 Apr 2009 11:56:12 -0000	1.9
+++ merkaartor.spec	11 Apr 2009 11:58:53 -0000	1.10
@@ -58,7 +58,7 @@
 
 %changelog
 * Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> 0.13.1-1.1
-- rebuild against qt-4.4.x
+- rebuild against qt-4.4.x (#495182)
 
 * Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
 - new upstream release



From ensc at fedoraproject.org  Sat Apr 11 12:02:02 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Sat, 11 Apr 2009 12:02:02 +0000 (UTC)
Subject: rpms/milter-greylist/devel .cvsignore, 1.5, 1.6 lastver, 1.4,
	1.5 milter-greylist.spec, 1.30, 1.31 sources, 1.13,
	1.14 overflow.patch, 1.1, NONE p0f-silent.patch, 1.2,
	NONE size_t.patch, 1.1, NONE
Message-ID: <20090411120202.AA7B470098@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3633

Modified Files:
	.cvsignore lastver milter-greylist.spec sources 
Removed Files:
	overflow.patch p0f-silent.patch size_t.patch 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2009 10:56:28 -0000	1.5
+++ .cvsignore	11 Apr 2009 12:01:30 -0000	1.6
@@ -1 +1 @@
-milter-greylist-4.2b1.tgz
+milter-greylist-4.2.2.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/lastver,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lastver	14 Feb 2009 10:56:29 -0000	1.4
+++ lastver	11 Apr 2009 12:01:30 -0000	1.5
@@ -1 +1 @@
-4.1.12
+4.2.2


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- milter-greylist.spec	9 Mar 2009 14:36:42 -0000	1.30
+++ milter-greylist.spec	11 Apr 2009 12:01:30 -0000	1.31
@@ -6,7 +6,7 @@
 %bcond_with			spf
 ##
 
-%global beta		b1
+#global beta		b1
 
 %global username	grmilter
 %global vardir		%_var/lib/%name
@@ -18,17 +18,14 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	4.2
-Release:	%release_func 0.5.%{?beta}
+Version:	4.2.2
+Release:	%release_func 0%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version%{?beta}.tgz
 Source1:	README.fedora
 Patch0:		milter-greylist-2.0.2-sysv.patch
-Patch1:		overflow.patch
-Patch2:		size_t.patch
-Patch3:		p0f-silent.patch
 Patch4:		ai_addrconfig.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
@@ -100,9 +97,6 @@
 %prep
 %setup -q %{?beta:-n %name-%version%beta}
 %patch0 -p1 -b .sysv
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 install -p -m0644 %SOURCE1 .
@@ -218,6 +212,10 @@
 
 
 %changelog
+* Sat Apr 11 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.2-0.
+- updated to 4.2.2
+- removed patches which where applied upstream
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> - 4.2-0.5.b1
 - libbind has been moved to separate package, rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Feb 2009 10:56:29 -0000	1.13
+++ sources	11 Apr 2009 12:01:30 -0000	1.14
@@ -1 +1 @@
-2e76e2643469ec393a15dfce9f8ff695  milter-greylist-4.2b1.tgz
+ed287c8371b9a5818835387dc101d02a  milter-greylist-4.2.2.tgz


--- overflow.patch DELETED ---


--- p0f-silent.patch DELETED ---


--- size_t.patch DELETED ---



From sindrepb at fedoraproject.org  Sat Apr 11 12:10:58 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sat, 11 Apr 2009 12:10:58 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.34,1.35
Message-ID: <20090411121059.113B770098@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5153

Modified Files:
	gnome-do.spec 
Log Message:
fixes


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-do.spec	10 Apr 2009 17:57:04 -0000	1.34
+++ gnome-do.spec	11 Apr 2009 12:10:23 -0000	1.35
@@ -16,7 +16,8 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:		ppc64
+#ExcludeArch:		ppc64
+ExclusiveArch:  %ix86 x86_64 ia64 armv4l sparc alpha
 
 BuildRequires:		mono-devel, mono-addins-devel
 BuildRequires:		desktop-file-utils
@@ -29,14 +30,13 @@
 BuildRequires:		perl-XML-Parser
 BuildRequires:		intltool
 BuildRequires:		gtk2-devel
+BuildRequires:		desktop-file-utils
 
 Requires(pre):		GConf2
 Requires(post): 	GConf2
 Requires(preun): 	GConf2
 
-Requires:		mono-core mono-addins
-Requires:		ndesk-dbus
-Requires:		ndesk-dbus-glib
+Requires:		mono(NDesk.DBus.GLib)
 Requires:		gnome-keyring-sharp, gnome-desktop-sharp
 Requires:		pkgconfig
 
@@ -71,10 +71,15 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor gnome --delete-original		\
+desktop-file-install 	\
 	--dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart	\
 	--add-only-show-in=GNOME				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/gnome-do.desktop
+desktop-file-install --delete-original  \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        --remove-category Application \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 
 #own this dir:
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -123,6 +128,7 @@
 %config(noreplace) %{_sysconfdir}/xdg/autostart/gnome-do.desktop
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/gnome-do.*
+%{_datadir}/applications/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -130,6 +136,7 @@
 
 %changelog
 * Fri Apr 10 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-4
+- Fix .desktop issue, install in both autostart and applications
 - Rebuild for new gnome-desktop-sharp
 - Add missing gnome-desktop-sharp requires
 



From sindrepb at fedoraproject.org  Sat Apr 11 12:13:16 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sat, 11 Apr 2009 12:13:16 +0000 (UTC)
Subject: rpms/avant-window-navigator/devel avant-window-navigator.spec, 1.28,
	1.29
Message-ID: <20090411121316.B7DD170098@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/avant-window-navigator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5958

Modified Files:
	avant-window-navigator.spec 
Log Message:
fix desktop file install


Index: avant-window-navigator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/devel/avant-window-navigator.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- avant-window-navigator.spec	3 Mar 2009 19:10:15 -0000	1.28
+++ avant-window-navigator.spec	11 Apr 2009 12:12:45 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           avant-window-navigator
 Version:        0.3.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Provides: avant-window-navigator-python = %{version}-%{release}
 Obsoletes: avant-window-navigator-python < 0.2.6-3
@@ -74,12 +74,12 @@
 
 %find_lang %{name}
 
-desktop-file-install --vendor fedora --delete-original  \
+desktop-file-install --delete-original  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --remove-category Application \
         $RPM_BUILD_ROOT%{_datadir}/applications/avant-window-navigator.desktop
 
-desktop-file-install --vendor fedora --delete-original  \
+desktop-file-install --delete-original  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --remove-category Application \
         $RPM_BUILD_ROOT%{_datadir}/applications/awn-manager.desktop
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Tue Mar 03 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2-6
+- Remove vendor from desktop-file-install
+
 * Tue Mar 03 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.3.2-5
 - Fix issue with arch dependent python files installed to noarch dir, #486395
 



From dwalsh at fedoraproject.org  Sat Apr 11 12:22:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 11 Apr 2009 12:22:29 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.413,
	1.414 policycoreutils.spec, 1.600, 1.601
Message-ID: <20090411122230.0968370098@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8251

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Sat Apr 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-9
- Handle case where subs file does not exist


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- policycoreutils-rhat.patch	9 Apr 2009 02:05:28 -0000	1.413
+++ policycoreutils-rhat.patch	11 Apr 2009 12:22:23 -0000	1.414
@@ -120,6 +120,32 @@
 +/root/.ssh/*
 +
 +
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.62/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.62/scripts/chcat	2009-04-09 12:28:34.000000000 -0400
+@@ -281,14 +281,14 @@
+ def expandCats(cats):
+     newcats = []
+     for c in cats:
+-        if c.find(".") != -1:
+-            c = c.split(".")
+-            for i in range(int(c[0][1:]), int(c[1][1:]) + 1):
+-                x = ("c%d" % i)
+-                if x not in newcats:
+-                    newcats.append("c%d" % i)
+-        else:
+-            for i in c.split(","):
++        for i in c.split(","):
++            if i.find(".") != -1:
++                j = i.split(".")
++                for k in range(int(j[0][1:]), int(j[1][1:]) + 1):
++                    x = ("c%d" % k)
++                    if x not in newcats:
++                        newcats.append(x)
++            else:
+                 if i not in newcats:
+                     newcats.append(i)
+     if len(newcats) > 25:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2009-02-18 16:44:47.000000000 -0500
 +++ policycoreutils-2.0.62/scripts/fixfiles	2009-04-03 14:12:56.000000000 -0400
@@ -240,10 +266,13 @@
  			
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-08 22:01:48.000000000 -0400
-@@ -23,14 +23,14 @@
++++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-11 08:13:02.000000000 -0400
+@@ -21,16 +21,16 @@
+ #
+ #  
  
- import pwd, grp, string, selinux, tempfile, os, re, sys
+-import pwd, grp, string, selinux, tempfile, os, re, sys
++import pwd, grp, string, selinux, tempfile, os, re, sys, stat
  from semanage import *;
 -PROGNAME="policycoreutils"
 +PROGNAME = "policycoreutils"
@@ -325,7 +354,15 @@
  		if heading:
  			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
  		keys = self.ddict.keys()
-@@ -281,15 +281,20 @@
+@@ -273,6 +273,7 @@
+ 		(fd, newfilename) = tempfile.mkstemp('', self.filename)
+ 		os.write(fd, self.out())
+ 		os.close(fd)
++                os.chmod(newfilename, os.stat(self.filename)[stat.ST_MODE])
+ 		os.rename(newfilename, self.filename)
+                 os.system("/sbin/service mcstrans reload > /dev/null")
+ 
+@@ -281,15 +282,20 @@
                 global handle
                        
                 if handle != None:
@@ -349,7 +386,7 @@
          def begin(self):
                 if self.transaction:
                        return
-@@ -303,6 +308,12 @@
+@@ -303,6 +309,12 @@
                 if rc < 0:
                        raise ValueError(_("Could not commit semanage transaction"))
  
@@ -362,7 +399,7 @@
  class permissiveRecords(semanageRecords):
  	def __init__(self, store):
                 semanageRecords.__init__(self, store)
-@@ -320,7 +331,7 @@
+@@ -320,7 +332,7 @@
                               l.append(name.split("permissive_")[1])
                 return l
  
@@ -371,7 +408,7 @@
  		if heading:
  			print "\n%-25s\n" % (_("Permissive Types"))
                  for t in self.get_all():
-@@ -328,6 +339,7 @@
+@@ -328,6 +340,7 @@
  
  
  	def add(self, type):
@@ -379,7 +416,7 @@
                 name = "permissive_%s" % type
                 dirname = "/var/lib/selinux"
                 os.chdir(dirname)
-@@ -341,7 +353,7 @@
+@@ -341,7 +354,7 @@
  
  permissive %s;
  """ % (name, type, type)
@@ -388,7 +425,7 @@
                 fd.write(modtxt)
                 fd.close()
                 mc = module.ModuleCompiler()
-@@ -351,16 +363,19 @@
+@@ -351,16 +364,19 @@
                 fd.close()
  
                 rc = semanage_module_install(self.sh, data, len(data));
@@ -413,7 +450,7 @@
  
  	def delete(self, name):
                 for n in name.split():
-@@ -390,11 +405,11 @@
+@@ -390,11 +406,11 @@
  		if sename == "":
  			sename = "user_u"
  			
@@ -427,7 +464,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
  		if exists:
-@@ -410,7 +425,7 @@
+@@ -410,7 +426,7 @@
                         except:
                                raise ValueError(_("Linux User %s does not exist") % name)
  
@@ -436,7 +473,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not create login mapping for %s") % name)
  
-@@ -450,17 +465,17 @@
+@@ -450,17 +466,17 @@
                 if sename == "" and serange == "":
                        raise ValueError(_("Requires seuser or serange"))
  
@@ -457,7 +494,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not query seuser for %s") % name)
  
-@@ -483,7 +498,7 @@
+@@ -483,7 +499,7 @@
                 semanage_seuser_key_free(k)
                 semanage_seuser_free(u)
  
@@ -466,7 +503,7 @@
  
  	def modify(self, name, sename = "", serange = ""):
  		try:
-@@ -492,21 +507,21 @@
+@@ -492,21 +508,21 @@
                          self.commit()
  
  		except ValueError, error:
@@ -492,7 +529,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not check if login mapping for %s is defined") % name)
                 if not exists:
-@@ -525,10 +540,10 @@
+@@ -525,10 +541,10 @@
                         self.commit()
  
  		except ValueError, error:
@@ -505,7 +542,7 @@
  
  	def get_all(self, locallist = 0):
  		ddict = {}
-@@ -578,17 +593,17 @@
+@@ -578,17 +594,17 @@
                  if len(roles) < 1:
                         raise ValueError(_("You must add at least one role for %s") % name)
                         
@@ -526,7 +563,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not create SELinux user for %s") % name)
  
-@@ -612,7 +627,7 @@
+@@ -612,7 +628,7 @@
                  rc = semanage_user_set_prefix(self.sh, u, prefix)
                  if rc < 0:
                         raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
@@ -535,7 +572,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not extract key for %s") % name)
  
-@@ -645,17 +660,17 @@
+@@ -645,17 +661,17 @@
                         else:
                                raise ValueError(_("Requires prefix or roles"))
  
@@ -556,7 +593,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not query user for %s") % name)
  
-@@ -703,17 +718,17 @@
+@@ -703,17 +719,17 @@
  			raise error
  
  	def __delete(self, name):
@@ -577,7 +614,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
                 if not exists:
-@@ -795,7 +810,7 @@
+@@ -795,7 +811,7 @@
  			low = int(ports[0])
  			high = int(ports[1])
  
@@ -586,7 +623,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
  		return ( k, proto_d, low, high )
-@@ -812,13 +827,13 @@
+@@ -812,13 +828,13 @@
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)			
  
@@ -602,7 +639,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create port for %s/%s") % (proto, port))
  		
-@@ -871,13 +886,13 @@
+@@ -871,13 +887,13 @@
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)
  
@@ -618,7 +655,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not query port %s/%s") % (proto, port))
  
-@@ -926,13 +941,13 @@
+@@ -926,13 +942,13 @@
  
  	def __delete(self, port, proto):
  		( k, proto_d, low, high ) = self.__genkey(port, proto)
@@ -634,7 +671,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
  		if not exists:
-@@ -1038,17 +1053,17 @@
+@@ -1038,17 +1054,17 @@
                 if ctype == "":
                         raise ValueError(_("SELinux Type is required"))
  
@@ -655,7 +692,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not create addr for %s") % addr)
  
-@@ -1113,17 +1128,17 @@
+@@ -1113,17 +1129,17 @@
                 if serange == "" and setype == "":
                         raise ValueError(_("Requires setype or serange"))
  
@@ -676,7 +713,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not query addr %s") % addr)
  
-@@ -1160,17 +1175,17 @@
+@@ -1160,17 +1176,17 @@
                 else:
                        raise ValueError(_("Unknown or missing protocol"))
  
@@ -697,7 +734,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not check if addr %s is defined") % addr)
                 if not exists:
-@@ -1240,17 +1255,17 @@
+@@ -1240,17 +1256,17 @@
  		if ctype == "":
  			raise ValueError(_("SELinux Type is required"))
  
@@ -718,7 +755,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create interface for %s") % interface)
  		
-@@ -1301,17 +1316,17 @@
+@@ -1301,17 +1317,17 @@
  		if serange == "" and setype == "":
  			raise ValueError(_("Requires setype or serange"))
  
@@ -739,7 +776,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not query interface %s") % interface)
  
-@@ -1335,17 +1350,17 @@
+@@ -1335,17 +1351,17 @@
                  self.commit()
  
  	def __delete(self, interface):
@@ -760,26 +797,31 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if interface %s is defined") % interface)
  		if not exists:
-@@ -1393,6 +1408,40 @@
+@@ -1393,6 +1409,45 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
 +                self.equiv = {}
-+                fd = open(selinux.selinux_file_context_subs_path(), "r")
-+                for i in fd.readlines():
-+                       src, dst = i.split()
-+                       self.equiv[src] = dst
-+                fd.close()
 +                self.equil_ind = False
++                try:
++                       fd = open(selinux.selinux_file_context_subs_path(), "r")
++                       for i in fd.readlines():
++                              src, dst = i.split()
++                              self.equiv[src] = dst
++                       fd.close()
++                except IOError:
++                       pass
 +
 +        def commit(self):
 +                if self.equil_ind:
-+                       tmpfile = "%s.tmp" % selinux.selinux_file_context_subs_path()
++                       subs_file = selinux.selinux_file_context_subs_path()
++                       tmpfile = "%s.tmp" % subs_file
 +                       fd = open(tmpfile, "w")
 +                       for src in self.equiv.keys():
 +                              fd.write("%s %s\n" % (src, self.equiv[src]))
 +                       fd.close()
-+                       os.rename(tmpfile,selinux.selinux_file_context_subs_path())
++                       os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE])
++                       os.rename(tmpfile,subs_file)
 +                       self.equil_ind = False
 +		semanageRecords.commit(self)
 +
@@ -801,7 +843,7 @@
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1429,23 +1478,23 @@
+@@ -1429,23 +1484,23 @@
  		if type == "":
  			raise ValueError(_("SELinux Type is required"))
  
@@ -829,7 +871,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create file context for %s") % target)
  		
-@@ -1486,21 +1535,21 @@
+@@ -1486,21 +1541,21 @@
  			raise ValueError(_("Requires setype, serange or seuser"))
                  self.validate(target)
  
@@ -856,7 +898,7 @@
                         if rc < 0:
                                raise ValueError(_("Could not query file context for %s") % target)
  
-@@ -1550,7 +1599,7 @@
+@@ -1550,7 +1605,7 @@
                         target = semanage_fcontext_get_expr(fcontext)
                         ftype = semanage_fcontext_get_type(fcontext)
                         ftype_str = semanage_fcontext_get_type_str(ftype)
@@ -865,7 +907,7 @@
                         if rc < 0:
                                raise ValueError(_("Could not create a key for %s") % target)
  
-@@ -1558,19 +1607,26 @@
+@@ -1558,19 +1613,26 @@
                         if rc < 0:
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
@@ -896,7 +938,7 @@
  			if rc < 0:
  				raise ValueError(_("Could not check if file context for %s is defined") % target)
  			if exists:
-@@ -1617,11 +1673,11 @@
+@@ -1617,11 +1679,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -910,7 +952,7 @@
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1630,11 +1686,17 @@
+@@ -1630,11 +1692,17 @@
  					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
  			else:
  				print "%-50s %-18s <<None>>" % (k[0], k[1])
@@ -929,7 +971,7 @@
                  self.dict["TRUE"] = 1
                  self.dict["FALSE"] = 0
                  self.dict["ON"] = 1
-@@ -1643,16 +1705,16 @@
+@@ -1643,16 +1711,16 @@
                  self.dict["0"] = 0
  
  	def __mod(self, name, value):
@@ -949,7 +991,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not query file context %s") % name)
  
-@@ -1670,7 +1732,7 @@
+@@ -1670,7 +1738,7 @@
  		semanage_bool_key_free(k)
  		semanage_bool_free(b)
  
@@ -958,7 +1000,7 @@
                  
                  self.begin()
  
-@@ -1694,16 +1756,16 @@
+@@ -1694,16 +1762,16 @@
  		
  	def __delete(self, name):
  
@@ -978,7 +1020,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if boolean %s is defined") % name)
  		if not exists:
-@@ -1762,7 +1824,7 @@
+@@ -1762,7 +1830,7 @@
                        return _("unknown")
  
  	def list(self, heading = True, locallist = False, use_file = False):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- policycoreutils.spec	9 Apr 2009 02:05:30 -0000	1.600
+++ policycoreutils.spec	11 Apr 2009 12:22:27 -0000	1.601
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Sat Apr 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-9
+- Handle case where subs file does not exist
+
 * Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-8
 - Update po files
 - Add --equiv command for semanage



From dwalsh at fedoraproject.org  Sat Apr 11 12:30:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 11 Apr 2009 12:30:54 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.21,
	1.22 modules-targeted.conf, 1.123, 1.124 policy-20090105.patch,
	1.84, 1.85 selinux-policy.spec, 1.821, 1.822
Message-ID: <20090411123054.2B9BB70126@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10851

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-3
- Separate out the ucnonfined user from the unconfined.pp package



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- modules-minimum.conf	8 Apr 2009 00:59:45 -0000	1.21
+++ modules-minimum.conf	11 Apr 2009 12:30:21 -0000	1.22
@@ -1676,6 +1676,13 @@
 # 
 soundserver = module
 
+# Layer: role
+# Module: unconfineduser
+#
+# The unconfined user domain.
+# 
+unconfineduser = module
+
 # Layer:role
 # Module: staff
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- modules-targeted.conf	8 Apr 2009 00:59:45 -0000	1.123
+++ modules-targeted.conf	11 Apr 2009 12:30:22 -0000	1.124
@@ -1676,6 +1676,13 @@
 # 
 soundserver = module
 
+# Layer: role
+# Module: unconfineduser
+#
+# The unconfined user domain.
+# 
+unconfineduser = module
+
 # Layer:role
 # Module: staff
 #

policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.84 -r 1.85 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- policy-20090105.patch	8 Apr 2009 13:18:20 -0000	1.84
+++ policy-20090105.patch	11 Apr 2009 12:30:22 -0000	1.85
@@ -1022,7 +1022,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.12/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-09 04:59:09.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -1101,7 +1101,7 @@
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,10 +190,20 @@
+@@ -174,17 +190,28 @@
  ')
  
  optional_policy(`
@@ -1122,8 +1122,9 @@
  	prelink_domtrans(rpm_t)
  ')
  
-@@ -185,6 +211,7 @@
- 	unconfined_domain(rpm_t)
+ optional_policy(`
+-	unconfined_domain(rpm_t)
++	unconfined_domain_noaudit(rpm_t)
  	# yum-updatesd requires this
  	unconfined_dbus_chat(rpm_t)
 +	unconfined_dbus_chat(rpm_script_t)
@@ -1514,6 +1515,16 @@
 +	xserver_write_pid(vbetool_t)
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.te serefpolicy-3.6.12/policy/modules/apps/ada.te
+--- nsaserefpolicy/policy/modules/apps/ada.te	2009-01-05 15:39:38.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/apps/ada.te	2009-04-09 04:47:52.000000000 -0400
+@@ -21,5 +21,5 @@
+ userdom_use_user_terminals(ada_t)
+ 
+ optional_policy(`
+-	unconfined_domain_noaudit(ada_t)
++	unconfined_domain(ada_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/awstats.te serefpolicy-3.6.12/policy/modules/apps/awstats.te
 --- nsaserefpolicy/policy/modules/apps/awstats.te	2009-02-16 08:44:12.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/awstats.te	2009-04-07 16:01:44.000000000 -0400
@@ -2384,7 +2395,7 @@
  	corecmd_search_bin($1)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.6.12/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/mono.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/mono.te	2009-04-09 04:48:20.000000000 -0400
 @@ -15,7 +15,7 @@
  # Local policy
  #
@@ -2394,7 +2405,12 @@
  
  init_dbus_chat_script(mono_t)
  
-@@ -46,3 +46,7 @@
+@@ -42,7 +42,11 @@
+ ')
+ 
+ optional_policy(`
+-	unconfined_domain_noaudit(mono_t)
++	unconfined_domain(mono_t)
  	unconfined_dbus_chat(mono_t)
  	unconfined_dbus_connect(mono_t)
  ')
@@ -4272,7 +4288,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.12/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/wine.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/wine.te	2009-04-09 04:47:36.000000000 -0400
 @@ -9,6 +9,7 @@
  type wine_t;
  type wine_exec_t;
@@ -4285,9 +4301,10 @@
  
  optional_policy(`
  	allow wine_t self:process { execstack execmem execheap };
+-	unconfined_domain_noaudit(wine_t)
 +	domain_mmap_low_type(wine_t)
 +	domain_mmap_low(wine_t)
- 	unconfined_domain_noaudit(wine_t)
++	unconfined_domain(wine_t)
  	files_execmod_all_files(wine_t)
  
 +')
@@ -4689,7 +4706,7 @@
  type urandom_device_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.12/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-09 10:10:17.000000000 -0400
 @@ -629,6 +629,7 @@
  
  	dontaudit $1 unconfined_domain_type:dir search_dir_perms;
@@ -4909,7 +4926,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-09 10:14:04.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5118,7 +5135,36 @@
  ')
  
  ########################################
-@@ -4532,7 +4662,8 @@
+@@ -4413,6 +4543,28 @@
+ 
+ ########################################
+ ## <summary>
++##	manage all lock files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_manage_all_locks',`
++	gen_require(`
++		attribute lockfile;
++		type var_t, var_lock_t;
++	')
++
++	allow $1 { var_t var_lock_t }:dir search_dir_perms;
++	manage_dirs_pattern($1, lockfile, lockfile)
++	manage_files_pattern($1, lockfile, lockfile)
++	manage_lnk_files_pattern($1, lockfile, lockfile)
++')
++
++########################################
++## <summary>
+ ##	Create an object in the locks directory, with a private
+ ##	type using a type transition.
+ ## </summary>
+@@ -4532,7 +4684,8 @@
  		type var_t, var_run_t;
  	')
  
@@ -5128,7 +5174,7 @@
  ')
  
  ########################################
-@@ -4873,7 +5004,7 @@
+@@ -4873,7 +5026,7 @@
  	selinux_compute_member($1)
  
  	# Need sys_admin capability for mounting
@@ -5137,7 +5183,7 @@
  
  	# Need to give access to the directories to be polyinstantiated
  	allow $1 polydir:dir { create open getattr search write add_name setattr mounton rmdir };
-@@ -4895,12 +5026,15 @@
+@@ -4895,12 +5048,15 @@
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
  
@@ -5154,7 +5200,7 @@
  	')
  ')
  
-@@ -4921,3 +5055,95 @@
+@@ -4921,3 +5077,95 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -5493,7 +5539,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.12/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2009-02-03 22:50:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.te	2009-04-09 10:10:27.000000000 -0400
 @@ -63,6 +63,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -5576,23 +5622,27 @@
  tunable_policy(`read_default_t',`
  	files_list_default(kernel_t)
  	files_read_default_files(kernel_t)
-@@ -359,6 +384,10 @@
- 	unconfined_domain(kernel_t)
+@@ -356,7 +381,11 @@
  ')
  
[...39694 lines suppressed...]
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1048,47 @@
+@@ -986,37 +1049,47 @@
  		')
  	')
  
@@ -28365,7 +29724,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1122,7 @@
+@@ -1050,7 +1123,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -28374,7 +29733,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1131,7 @@
+@@ -1059,8 +1132,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -28384,7 +29743,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1154,8 @@
+@@ -1083,7 +1155,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -28394,7 +29753,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1099,6 +1171,7 @@
+@@ -1099,6 +1172,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -28402,7 +29761,7 @@
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1106,8 +1179,6 @@
+@@ -1106,8 +1180,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -28411,7 +29770,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1233,6 @@
+@@ -1162,20 +1234,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -28432,7 +29791,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1278,7 @@
+@@ -1221,6 +1279,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -28440,7 +29799,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1344,15 @@
+@@ -1286,11 +1345,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -28456,7 +29815,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1449,7 @@
+@@ -1387,7 +1450,7 @@
  
  ########################################
  ## <summary>
@@ -28465,7 +29824,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1482,14 @@
+@@ -1420,6 +1483,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -28480,7 +29839,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1505,11 @@
+@@ -1435,9 +1506,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -28492,7 +29851,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1566,25 @@
+@@ -1494,6 +1567,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -28518,7 +29877,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1568,6 +1659,8 @@
+@@ -1568,6 +1660,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -28527,7 +29886,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1736,7 @@
+@@ -1643,6 +1737,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -28535,7 +29894,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,30 +1835,79 @@
+@@ -1741,30 +1836,80 @@
  
  ########################################
  ## <summary>
@@ -28622,10 +29981,11 @@
 +
 +	files_search_home($1)
 +	exec_files_pattern($1, { user_home_dir_t user_home_type }, user_home_type)
++	dontaudit $1 user_home_type:sock_file execute;
  ')
  
  ########################################
-@@ -1787,6 +1930,46 @@
+@@ -1787,6 +1932,46 @@
  
  ########################################
  ## <summary>
@@ -28672,7 +30032,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -1799,6 +1982,7 @@
+@@ -1799,6 +1984,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -28680,7 +30040,7 @@
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2328,7 +2512,7 @@
+@@ -2328,7 +2514,7 @@
  
  ########################################
  ## <summary>
@@ -28689,7 +30049,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2814,7 +2998,25 @@
+@@ -2814,7 +3000,25 @@
  		type user_tmp_t;
  	')
  
@@ -28716,7 +30076,7 @@
  ')
  
  ########################################
-@@ -2851,6 +3053,7 @@
+@@ -2851,6 +3055,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -28724,7 +30084,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3184,482 @@
+@@ -2981,3 +3186,482 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -r1.821 -r1.822
--- selinux-policy.spec	8 Apr 2009 13:18:20 -0000	1.821
+++ selinux-policy.spec	11 Apr 2009 12:30:22 -0000	1.822
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -167,7 +167,7 @@
 
 %define loadminpolicy() \
 ( cd /usr/share/selinux/%1; \
-semodule -b base.pp.bz2 -i unconfined.pp.bz2 -s %1; \
+semodule -b base.pp.bz2 -i unconfined.pp.bz2 unconfineduser.pp.bz2 -s %1; \
 ); \
 
 %define loadpolicy() \
@@ -313,14 +313,10 @@
 %post targeted
 if [ $1 -eq 1 ]; then
 %loadpolicy targeted
-#semanage -S targeted -i - << __eof
-#login -m  -s unconfined_u -r s0-s0:c0.c1023 __default__
-#login -m  -s unconfined_u -r s0-s0:c0.c1023 root
-#__eof
 restorecon -R /root /var/log /var/run 2> /dev/null
 else
 semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-%loadpolicy targeted
+%loadpolicy targeted unconfined.pp unconfineduser.pp
 %relabel targeted
 fi
 exit 0
@@ -444,6 +440,9 @@
 %endif
 
 %changelog
+* Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-3
+- Separate out the ucnonfined user from the unconfined.pp package
+
 * Wed Apr 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-2
 - Make sure unconfined_java_t and unconfined_mono_t create user_tmpfs_t.
 



From pkgdb at fedoraproject.org  Sat Apr 11 13:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 13:26:59 +0000
Subject: [pkgdb] ms-sys ownership updated
Message-ID: <20090411132555.01F6D10F80D@bastion2.fedora.phx.redhat.com>

Package ms-sys in Fedora devel was orphaned by sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ms-sys



From pkgdb at fedoraproject.org  Sat Apr 11 13:27:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 13:27:01 +0000
Subject: [pkgdb] ms-sys ownership updated
Message-ID: <20090411132555.24A7C10F870@bastion2.fedora.phx.redhat.com>

Package ms-sys in Fedora 9 was orphaned by sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ms-sys



From pkgdb at fedoraproject.org  Sat Apr 11 13:27:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 13:27:04 +0000
Subject: [pkgdb] ms-sys ownership updated
Message-ID: <20090411132559.4A10710F872@bastion2.fedora.phx.redhat.com>

Package ms-sys in Fedora 8 was orphaned by sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ms-sys



From pkgdb at fedoraproject.org  Sat Apr 11 13:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 13:26:04 +0000
Subject: [pkgdb] ms-sys ownership updated
Message-ID: <20090411132604.0F70810F876@bastion2.fedora.phx.redhat.com>

Package ms-sys in Fedora EPEL 5 was orphaned by sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ms-sys



From pkgdb at fedoraproject.org  Sat Apr 11 13:27:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 13:27:16 +0000
Subject: [pkgdb] ms-sys ownership updated
Message-ID: <20090411132609.BC43D10F80D@bastion2.fedora.phx.redhat.com>

Package ms-sys in Fedora EPEL 4 was orphaned by sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ms-sys



From pfj at fedoraproject.org  Sat Apr 11 13:26:19 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sat, 11 Apr 2009 13:26:19 +0000 (UTC)
Subject: rpms/mono/devel mono-24-ppc-glocks.patch, NONE, 1.1 import.log, 1.45,
	1.46 mono.spec, 1.122, 1.123
Message-ID: <20090411132619.BFF9270098@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7083/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-24-ppc-glocks.patch 
Log Message:

Add ppc patch
Add ppc64 arch
Rebuild 


mono-24-ppc-glocks.patch:

--- NEW FILE mono-24-ppc-glocks.patch ---
--- mono-131222-orig/libgc/include/private/gc_locks.h	2009-02-03 19:00:12.000000000 -0500
+++ mono-131222-patched/libgc/include/private/gc_locks.h	2009-04-09 15:20:11.000000000 -0400
@@ -160,15 +160,15 @@
           int temp = 1; /* locked value */
 
           __asm__ __volatile__(
-               "1:\tlwarx %0,0,%3\n"   /* load and reserve               */
+               "1:\tlwarx %0,0,%1\n"   /* load and reserve               */
                "\tcmpwi %0, 0\n"       /* if load is                     */
                "\tbne 2f\n"            /*   non-zero, return already set */
                "\tstwcx. %2,0,%1\n"    /* else store conditional         */
                "\tbne- 1b\n"           /* retry if lost reservation      */
                "\tsync\n"              /* import barrier                 */
                "2:\t\n"                /* oldval is zero if we set       */
-              : "=&r"(oldval), "=p"(addr)
-              : "r"(temp), "1"(addr)
+              : "=&r"(oldval)
+              : "r"(addr), "r"(temp)
               : "cr0","memory");
           return oldval;
         }


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- import.log	7 Apr 2009 09:41:39 -0000	1.45
+++ import.log	11 Apr 2009 13:25:46 -0000	1.46
@@ -43,3 +43,4 @@
 mono-2_4-12_fc11:HEAD:mono-2.4-12.fc11.src.rpm:1238109092
 mono-2_4-12_1_fc11:HEAD:mono-2.4-12.1.fc11.src.rpm:1239049596
 mono-2_4-13_1_fc11:HEAD:mono-2.4-13.1.fc11.src.rpm:1239097233
+mono-2_4-13_2_fc11:HEAD:mono-2.4-13.2.fc11.src.rpm:1239456192


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- mono.spec	7 Apr 2009 09:41:39 -0000	1.122
+++ mono.spec	11 Apr 2009 13:25:46 -0000	1.123
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.4
-Release:        13.1%{?dist}
+Release:        13.2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -29,10 +29,10 @@
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-BuildRequires: mono-core
+#BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc ppc64
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -42,6 +42,7 @@
 Patch5: mono-2.0-metadata-makefile.patch
 Patch6: mono-22-libgdiwinform.patch
 Patch7: mono-22-libdir.patch
+Patch8: mono-24-ppc-glocks.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -287,6 +288,7 @@
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
 %patch6 -p1 -b .libgdiplus
+%patch8 -p1 -b .glocks-ppc
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
@@ -301,7 +303,7 @@
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-rm -rf mcs/class/lib/monolite/*
+#rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -707,6 +709,10 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-13.2
+- Re-enable PPC and PPC64
+- sub point build for scratch build and bootstrap
+
 * Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-13.1
 - Remove ppc support
 - moonlight parts are now in their own subpackage



From pkgdb at fedoraproject.org  Sat Apr 11 13:27:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 13:27:16 +0000
Subject: [pkgdb] ms-sys ownership updated
Message-ID: <20090411132611.E317210F878@bastion2.fedora.phx.redhat.com>

Package ms-sys in Fedora 10 was orphaned by sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ms-sys



From sandeen at fedoraproject.org  Sat Apr 11 13:29:44 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sat, 11 Apr 2009 13:29:44 +0000 (UTC)
Subject: rpms/e2fsprogs/devel
	e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch, NONE,
	1.1 e2fsprogs.spec, 1.131, 1.132
Message-ID: <20090411132944.6FEA470098@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8017

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch 
Log Message:
* Sat Apr 11 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-6
- ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)


e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch:

--- NEW FILE e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch ---
This is for RH bugzilla 471925 -  Complete scan of filesystems expanded online

When we resize online, the primary superblock gets copied to all
the backups, and of course since we're mounted the NEEDS_RECOVERY
flag is set.  A subsequent fsck will find the backups have the
NEEDS_RECOVERY flag set while the primary does not, and this
forces a full fsck pass.

I think this flag can be safely ignored in the flag comparisons.

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: e2fsprogs-1.41.4/e2fsck/super.c
===================================================================
--- e2fsprogs-1.41.4.orig/e2fsck/super.c
+++ e2fsprogs-1.41.4/e2fsck/super.c
@@ -864,7 +864,8 @@ void check_super_block(e2fsck_t ctx)
  * try to discourage it in the future.  In particular, for the newer
  * ext4 files, especially EXT4_FEATURE_RO_COMPAT_DIR_NLINK and
  * EXT3_FEATURE_INCOMPAT_EXTENTS.  So some of these may go away in the
- * future.
+ * future.  EXT3_FEATURE_INCOMPAT_RECOVER may also get set when
+ * copying the primary superblock during online resize.
  *
  * The kernel will set EXT2_FEATURE_COMPAT_EXT_ATTR, but
  * unfortunately, we shouldn't ignore it since if it's not set in the
@@ -877,7 +878,8 @@ void check_super_block(e2fsck_t ctx)
 #define FEATURE_COMPAT_IGNORE          (EXT2_FEATURE_COMPAT_EXT_ATTR)
 #define FEATURE_RO_COMPAT_IGNORE	(EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
 					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
-#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS)
+#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS| \
+					 EXT3_FEATURE_INCOMPAT_RECOVER)
 
 int check_backup_super_block(e2fsck_t ctx)
 {


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- e2fsprogs.spec	27 Feb 2009 01:09:10 -0000	1.131
+++ e2fsprogs.spec	11 Apr 2009 13:29:14 -0000	1.132
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -18,6 +18,7 @@
 Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
 Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
 Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
+Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,6 +102,8 @@
 %patch4 -p1 -b .info
 # Fix blkid segfault in modules.dep scanning
 %patch5 -p1 -b .info
+# Ignore NEEDS_RECOVERY mismatch
+%patch6 -p1 -b .recovery
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -299,6 +302,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Sat Apr 11 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-6
+- ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)
+
 * Thu Feb 26 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-5
 - fix a couple missed descriptions; obsolete e4fsprogs
 



From sandeen at fedoraproject.org  Sat Apr 11 13:32:58 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sat, 11 Apr 2009 13:32:58 +0000 (UTC)
Subject: rpms/e2fsprogs/F-10
	e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch, NONE,
	1.1 e2fsprogs.spec, 1.126, 1.127
Message-ID: <20090411133258.E9B3F70098@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8721

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch 
Log Message:
* Sat Apr 11 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-5
- ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)


e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch:

--- NEW FILE e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch ---
This is for RH bugzilla 471925 -  Complete scan of filesystems expanded online

When we resize online, the primary superblock gets copied to all
the backups, and of course since we're mounted the NEEDS_RECOVERY
flag is set.  A subsequent fsck will find the backups have the
NEEDS_RECOVERY flag set while the primary does not, and this
forces a full fsck pass.

I think this flag can be safely ignored in the flag comparisons.

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: e2fsprogs-1.41.4/e2fsck/super.c
===================================================================
--- e2fsprogs-1.41.4.orig/e2fsck/super.c
+++ e2fsprogs-1.41.4/e2fsck/super.c
@@ -864,7 +864,8 @@ void check_super_block(e2fsck_t ctx)
  * try to discourage it in the future.  In particular, for the newer
  * ext4 files, especially EXT4_FEATURE_RO_COMPAT_DIR_NLINK and
  * EXT3_FEATURE_INCOMPAT_EXTENTS.  So some of these may go away in the
- * future.
+ * future.  EXT3_FEATURE_INCOMPAT_RECOVER may also get set when
+ * copying the primary superblock during online resize.
  *
  * The kernel will set EXT2_FEATURE_COMPAT_EXT_ATTR, but
  * unfortunately, we shouldn't ignore it since if it's not set in the
@@ -877,7 +878,8 @@ void check_super_block(e2fsck_t ctx)
 #define FEATURE_COMPAT_IGNORE          (EXT2_FEATURE_COMPAT_EXT_ATTR)
 #define FEATURE_RO_COMPAT_IGNORE	(EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
 					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
-#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS)
+#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS| \
+					 EXT3_FEATURE_INCOMPAT_RECOVER)
 
 int check_backup_super_block(e2fsck_t ctx)
 {


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-10/e2fsprogs.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- e2fsprogs.spec	27 Feb 2009 00:46:43 -0000	1.126
+++ e2fsprogs.spec	11 Apr 2009 13:32:28 -0000	1.127
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -18,6 +18,7 @@
 Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
 Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
 Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
+Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
 Patch10: e2fsprogs-journal-move.patch
 
 Url: http://e2fsprogs.sourceforge.net/
@@ -101,6 +102,9 @@
 %patch4 -p1 -b .info
 # Fix blkid segfault in modules.dep scanning
 %patch5 -p1 -b .info
+# Ignore NEEDS_RECOVERY mismatch
+%patch6 -p1 -b .recovery
+
 # Only change the journal placement for ext4, for now.
 %patch10 -p1 -b .journalmove
 
@@ -301,6 +305,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Sat Apr 11 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-5
+- ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)
+
 * Thu Feb 26 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-4
 - Edit summary & description to include ext4 (#487469)
 - Fix blkid null ptr deref in initrd (#486997)



From ndim at fedoraproject.org  Sat Apr 11 14:17:44 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat, 11 Apr 2009 14:17:44 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.46, 1.47 sources,
	1.46, 1.47 xorg-x11-drv-radeonhd-README.fedora, 1.46,
	1.47 xorg-x11-drv-radeonhd.spec, 1.59, 1.60
Message-ID: <20090411141744.8B7E970098@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18954

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Sat Apr 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-2.8.20090411git
- Updated README.fedora with new feature set (2D+XVideo on R[67]xx)
- This snapshot is the 1.2.5 release.
- New snapshot (upstream commit cb54f48b212d5ae54e13bbdf24575b6163798c0d):
  - cb54f48b: Bump to 1.2.5. Updated README.
  - 9d2a5088: Fix resume from suspend for r6xx/r7xx
  - 1137e096: RHDDRIGetIntGARTLocation is called too often to be logged. Nuked RHDFUNC there.
  - 76d6973a: man: R6xx and R7xx 2D possible now.
  - 00656976: LUT: reduce number of writes to DC_LUT_RW_INDEX
  - 6d7f2486: Use () in macro arguments of new RHDRegMask.
  - d6c37277: CS: Replace register read/write macros with ones from compiler.h
  - c9d1af91: Use X MMIO macros instead of own register read/write functions
  - f65014d8: Add RV790 (HD 4890) Support
  - 79efc609: AtomBIOS: Fixed wrong logic: switch -> if.
  - ecd61667: rhd_dump: fix error introduced by LUT dump addition
  - 7e4948a3: R6xx/R7xx EXA: rework composite pixel shader
  - 461701c6: R6xx/R7xx: clean up bool const code
  - cc6e6fe4: add new chip ids
  - f0f640f1: R6xx/R7xx EXA: fix maxPitchBytes
  - 37da5e5a: Add new pci ids
  - 4fa65062: Really disable UTS/DFS on r6xx/r7xx AGP
  - b075ec9c: R6xx/R7xx AGP: disable gart data transfers
  - d9c8f9ce: r600: reload shaders into VRAM on resume
  - 12611c8f: R6xx/R7xx shader: Fix OFFSET_[XYZ] macro for TEX_DWORD2 to accept floats
  - 70490504: RS600: fix page table size for rs600 as well
  - 10ebf657: r600: fix sizing of PCI GART table for r600
  - f27383df: R6xx/R7xx: Fix OFFSET_[XYZ] macros for negative values.
  - 827fb141: randr: Set use_screen_monitor correctly using helper function.
  - 76490dd8: Enable DRI by default on R5xx chips.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	6 Mar 2009 12:15:36 -0000	1.46
+++ .cvsignore	11 Apr 2009 14:17:13 -0000	1.47
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.4-20090306git.tar.lzma
+xf86-video-radeonhd-1.2.5-20090411git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	6 Mar 2009 12:15:37 -0000	1.46
+++ sources	11 Apr 2009 14:17:13 -0000	1.47
@@ -1 +1 @@
-31e894377795fcfa21f13a5254657f36  xf86-video-radeonhd-1.2.4-20090306git.tar.lzma
+7ca12bf3def9a3e0353563ad3ca177f5  xf86-video-radeonhd-1.2.5-20090411git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xorg-x11-drv-radeonhd-README.fedora	6 Mar 2009 12:15:37 -0000	1.46
+++ xorg-x11-drv-radeonhd-README.fedora	11 Apr 2009 14:17:14 -0000	1.47
@@ -11,7 +11,7 @@
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: 093e5934a26f784f70b5febf8ae6d50a3459552c
+Latest upstream commit: cb54f48b212d5ae54e13bbdf24575b6163798c0d
 
 
 Contents
@@ -71,8 +71,10 @@
 4. Known Issues
 ===============
 
-  * 2D and 3D acceleration for R6xx and R7xx chipsets not supported
-    at this time, as ATI/AMD have not released the required docs yet.
+  * Conflicts with kernel based modesetting (KMS). Boot kernel
+    with option "nomodeset" to use radeonhd(4).
+
+  * 3D acceleration for R6xx and R7xx chipsets not supported yet.
 
 
 5. Resources


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xorg-x11-drv-radeonhd.spec	6 Mar 2009 12:15:37 -0000	1.59
+++ xorg-x11-drv-radeonhd.spec	11 Apr 2009 14:17:14 -0000	1.60
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20090306
-%define git_commit 093e5934a26f784f70b5febf8ae6d50a3459552c
+%define date 20090411
+%define git_commit cb54f48b212d5ae54e13bbdf24575b6163798c0d
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -32,8 +32,8 @@
 
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
-Version:       1.2.4
-Release:       2.4%{?alphatag}%{?dist}
+Version:       1.2.5
+Release:       2.8%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -164,6 +164,36 @@
 %endif
 
 %changelog
+* Sat Apr 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-2.8.20090411git
+- Updated README.fedora with new feature set (2D+XVideo on R[67]xx)
+- This snapshot is the 1.2.5 release.
+- New snapshot (upstream commit cb54f48b212d5ae54e13bbdf24575b6163798c0d):
+  - cb54f48b: Bump to 1.2.5. Updated README.
+  - 9d2a5088: Fix resume from suspend for r6xx/r7xx
+  - 1137e096: RHDDRIGetIntGARTLocation is called too often to be logged. Nuked RHDFUNC there.
+  - 76d6973a: man: R6xx and R7xx 2D possible now.
+  - 00656976: LUT: reduce number of writes to DC_LUT_RW_INDEX
+  - 6d7f2486: Use () in macro arguments of new RHDRegMask.
+  - d6c37277: CS: Replace register read/write macros with ones from compiler.h
+  - c9d1af91: Use X MMIO macros instead of own register read/write functions
+  - f65014d8: Add RV790 (HD 4890) Support
+  - 79efc609: AtomBIOS: Fixed wrong logic: switch -> if.
+  - ecd61667: rhd_dump: fix error introduced by LUT dump addition
+  - 7e4948a3: R6xx/R7xx EXA: rework composite pixel shader
+  - 461701c6: R6xx/R7xx: clean up bool const code
+  - cc6e6fe4: add new chip ids
+  - f0f640f1: R6xx/R7xx EXA: fix maxPitchBytes
+  - 37da5e5a: Add new pci ids
+  - 4fa65062: Really disable UTS/DFS on r6xx/r7xx AGP
+  - b075ec9c: R6xx/R7xx AGP: disable gart data transfers
+  - d9c8f9ce: r600: reload shaders into VRAM on resume
+  - 12611c8f: R6xx/R7xx shader: Fix OFFSET_[XYZ] macro for TEX_DWORD2 to accept floats
+  - 70490504: RS600: fix page table size for rs600 as well
+  - 10ebf657: r600: fix sizing of PCI GART table for r600
+  - f27383df: R6xx/R7xx: Fix OFFSET_[XYZ] macros for negative values.
+  - 827fb141: randr: Set use_screen_monitor correctly using helper function.
+  - 76490dd8: Enable DRI by default on R5xx chips.
+
 * Fri Mar 06 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.4-2.4.20090306git
 - New snapshot (upstream commit 093e5934a26f784f70b5febf8ae6d50a3459552c)
   Mainly includes the R6xx/R7xx acceleration stuff (no 3D, that depends on mesa).



From rakesh at fedoraproject.org  Sat Apr 11 14:23:25 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 11 Apr 2009 14:23:25 +0000 (UTC)
Subject: rpms/gedit-plugins/devel .cvsignore, 1.4, 1.5 gedit-plugins.spec,
	1.8, 1.9 import.log, 1.1, 1.2 sources, 1.4, 1.5
Message-ID: <20090411142325.BA3A970098@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19965/devel

Modified Files:
	.cvsignore gedit-plugins.spec import.log sources 
Log Message:

Updated to 2.26.1.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Sep 2008 17:58:36 -0000	1.4
+++ .cvsignore	11 Apr 2009 14:22:54 -0000	1.5
@@ -1 +1 @@
-gedit-plugins-2.22.3.tar.gz
+gedit-plugins-2.26.1.tar.gz


Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/gedit-plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gedit-plugins.spec	24 Feb 2009 20:24:53 -0000	1.8
+++ gedit-plugins.spec	11 Apr 2009 14:22:54 -0000	1.9
@@ -1,19 +1,18 @@
 Name:           gedit-plugins
-Version:        2.22.3
-Release:        4%{?dist}
+Version:        2.26.1
+Release:        1%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins 
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.22/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.26/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gedit-devel
 BuildRequires:  gucharmap-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  libgnomeui-devel
 BuildRequires:  gettext
 BuildRequires:  vte-devel
 BuildRequires:  cairo-devel
@@ -24,8 +23,8 @@
 BuildRequires:  intltool
 Requires:       gedit
 Requires:       pygtk2
-Requires:  	pygtksourceview
-Requires:  	pygobject2
+Requires:       pygtksourceview
+Requires:       pygobject2
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -42,7 +41,7 @@
 
 %build
 %configure --disable-schemas-install --enable-python
-#--with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal
+#--with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal,bookmarks
 make %{?_smp_mflags}
 
 
@@ -50,8 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins/libcharmap.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins/libshowtabbar.la
+find $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins -name "*.la" -exec rm {} \;
 
 
 %clean
@@ -89,9 +87,22 @@
 %doc README NEWS AUTHORS COPYING
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_libdir}/gedit-2/plugins/*
+%{_datadir}/gedit-2/plugins/*
 
 
 %changelog
+* Sat Apr 11 2009 Dodji Seketeli <dodji at redhat.org> - 2.26.1-1
+- Update to upstream release 2..26.1
+- Fixes GNOME bugzilla bug #576766 - Crash when Configuring "Draw Spaces"
+- Make sure to remove all *.la files
+- Remove BuildRequire libgnomeui-devel as needless now
+
+* Fri Apr 10 2009 Dodji Seketeli <dodji at redhat.org> - 2.26.0-1
+- Update to upstream release (2.26.1)
+- Add plugin files from %%{_datadir}
+- Don't check for vte anymore, the package checks it pkg-config
+- Add 'bookmarks' to the plugin set
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.22.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Sep 2008 17:58:36 -0000	1.1
+++ import.log	11 Apr 2009 14:22:54 -0000	1.2
@@ -1 +1,2 @@
 gedit-plugins-2_22_3-1_fc9:HEAD:gedit-plugins-2.22.3-1.fc9.src.rpm:1222710398
+gedit-plugins-2_26_1-1_fc11:HEAD:gedit-plugins-2.26.1-1.fc11.src.rpm:1239459462


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Sep 2008 17:58:36 -0000	1.4
+++ sources	11 Apr 2009 14:22:54 -0000	1.5
@@ -1 +1 @@
-6e6ab57f47e15167381a86e7865d6d59  gedit-plugins-2.22.3.tar.gz
+f16f21dbf39ac31d7d43f4ee881e86cb  gedit-plugins-2.26.1.tar.gz



From ndim at fedoraproject.org  Sat Apr 11 14:33:39 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat, 11 Apr 2009 14:33:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/F-10 .cvsignore, 1.44, 1.45 sources, 1.44,
	1.45 xorg-x11-drv-radeonhd-README.fedora, 1.43,
	1.44 xorg-x11-drv-radeonhd-snapshot.sh, 1.12,
	1.13 xorg-x11-drv-radeonhd.spec, 1.55, 1.56
Message-ID: <20090411143339.142C370098@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22432

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec 
Log Message:
* Sat Apr 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-2.8.20090411git
- Updated README.fedora with new feature set (2D+XVideo on R[67]xx)
- This snapshot is the 1.2.5 release.
- New snapshot (upstream commit cb54f48b212d5ae54e13bbdf24575b6163798c0d):
  - cb54f48b: Bump to 1.2.5. Updated README.
  - 9d2a5088: Fix resume from suspend for r6xx/r7xx
  - 1137e096: RHDDRIGetIntGARTLocation is called too often to be logged. Nuked RHDFUNC there.
  - 76d6973a: man: R6xx and R7xx 2D possible now.
  - 00656976: LUT: reduce number of writes to DC_LUT_RW_INDEX
  - 6d7f2486: Use () in macro arguments of new RHDRegMask.
  - d6c37277: CS: Replace register read/write macros with ones from compiler.h
  - c9d1af91: Use X MMIO macros instead of own register read/write functions
  - f65014d8: Add RV790 (HD 4890) Support
  - 79efc609: AtomBIOS: Fixed wrong logic: switch -> if.
  - ecd61667: rhd_dump: fix error introduced by LUT dump addition
  - 7e4948a3: R6xx/R7xx EXA: rework composite pixel shader
  - 461701c6: R6xx/R7xx: clean up bool const code
  - cc6e6fe4: add new chip ids
  - f0f640f1: R6xx/R7xx EXA: fix maxPitchBytes
  - 37da5e5a: Add new pci ids
  - 4fa65062: Really disable UTS/DFS on r6xx/r7xx AGP
  - b075ec9c: R6xx/R7xx AGP: disable gart data transfers
  - d9c8f9ce: r600: reload shaders into VRAM on resume
  - 12611c8f: R6xx/R7xx shader: Fix OFFSET_[XYZ] macro for TEX_DWORD2 to accept floats
  - 70490504: RS600: fix page table size for rs600 as well
  - 10ebf657: r600: fix sizing of PCI GART table for r600
  - f27383df: R6xx/R7xx: Fix OFFSET_[XYZ] macros for negative values.
  - 827fb141: randr: Set use_screen_monitor correctly using helper function.
  - 76490dd8: Enable DRI by default on R5xx chips.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-10/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	12 Dec 2008 19:42:44 -0000	1.44
+++ .cvsignore	11 Apr 2009 14:33:08 -0000	1.45
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.4-20081212git.tar.bz2
+xf86-video-radeonhd-1.2.5-20090411git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-10/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	12 Dec 2008 19:42:44 -0000	1.44
+++ sources	11 Apr 2009 14:33:08 -0000	1.45
@@ -1 +1 @@
-c893e9d62aa00ef45da99903ce02a2bd  xf86-video-radeonhd-1.2.4-20081212git.tar.bz2
+7ca12bf3def9a3e0353563ad3ca177f5  xf86-video-radeonhd-1.2.5-20090411git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-10/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-drv-radeonhd-README.fedora	12 Dec 2008 19:42:44 -0000	1.43
+++ xorg-x11-drv-radeonhd-README.fedora	11 Apr 2009 14:33:08 -0000	1.44
@@ -11,7 +11,7 @@
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: 4e8972638db59d007bc61eb1bef8adb99cc67000
+Latest upstream commit: cb54f48b212d5ae54e13bbdf24575b6163798c0d
 
 
 Contents
@@ -71,8 +71,10 @@
 4. Known Issues
 ===============
 
-  * 2D and 3D acceleration for R6xx and R7xx chipsets not supported
-    at this time, as ATI/AMD have not released the required docs yet.
+  * Conflicts with kernel based modesetting (KMS). Boot kernel
+    with option "nomodeset" to use radeonhd(4).
+
+  * 3D acceleration for R6xx and R7xx chipsets not supported yet.
 
 
 5. Resources
@@ -85,7 +87,7 @@
     http://wiki.x.org/wiki/radeonhd
 
   * Overview about development code:
-    http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-radeonhd
+    http://cgit.freedesktop.org/xorg/driver/xf86-video-radeonhd/
 
   * Git clone URL:
     git://anongit.freedesktop.org/git/xorg/driver/xf86-video-radeonhd/
@@ -120,7 +122,7 @@
   * Check that the Fedora snapshot package is about up to date:
       rpm -qi xorg-x11-drv-radeonhd
     and compare the commit ID and snapshot date with
-      http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-radeonhd
+      http://cgit.freedesktop.org/xorg/driver/xf86-video-radeonhd/
 
   * Query upstream radeonhd's bugtracker:
     https://bugs.freedesktop.org/query.cgi?product=xorg&component=Driver/radeonhd


Index: xorg-x11-drv-radeonhd-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-10/xorg-x11-drv-radeonhd-snapshot.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-radeonhd-snapshot.sh	19 Jul 2008 11:52:02 -0000	1.12
+++ xorg-x11-drv-radeonhd-snapshot.sh	11 Apr 2009 14:33:08 -0000	1.13
@@ -99,7 +99,7 @@
 
     fullspecfile="$PWD/$specfile"
     [ -f "$specfile" ]
-    rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')"
+    rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9][0-9]*$//')"
 
     pre_update_dir=`pwd`
     cd "$(dirname "$0")/xf86-video-radeonhd.src"
@@ -192,7 +192,7 @@
     disttarget="distcheck"
 fi
 make -C "${builddir}" "${disttarget}" distdir="${tarname}"
-mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2"
+bzip2 -c -d "${builddir}/${tarname}.tar.bz2" | lzma -c > "${tarname}.tar.lzma"
 
 # Update spec file with the proper timestamp
 old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"`
@@ -213,5 +213,5 @@
 
 echo "Old upstream commit in spec: ${old_git_commit}"
 echo "Latest upstream commit:      ${upstream_commit}"
-echo "$ make new-sources FILES=\"${tarname}.tar.bz2\""
+echo "$ make new-sources FILES=\"${tarname}.tar.lzma\""
 


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-10/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-drv-radeonhd.spec	12 Dec 2008 19:42:44 -0000	1.55
+++ xorg-x11-drv-radeonhd.spec	11 Apr 2009 14:33:08 -0000	1.56
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20081212
-%define git_commit 4e8972638db59d007bc61eb1bef8adb99cc67000
+%define date 20090411
+%define git_commit cb54f48b212d5ae54e13bbdf24575b6163798c0d
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -32,8 +32,8 @@
 
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
-Version:       1.2.4
-Release:       1.1%{?alphatag}%{?dist}
+Version:       1.2.5
+Release:       2.8%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -42,13 +42,13 @@
 
 %if %{snapshot}
 # The source for this package was pulled from upstream's git repository.
-# (cf. http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-radeonhd)
+# (cf. http://cgit.freedesktop.org/xorg/driver/xf86-video-radeonhd/)
 # Use the following commands to generate the tarball:
 #  sh xorg-x11-drv-radeonhd-snapshot.sh
 #  sh xorg-x11-drv-radeonhd-snapshot.sh --update-config
 # The latter updates this spec file with the appropriate definition of %date.
 # This requires git, automake, autoconf, libtool to be installed.
-Source0:       %{tarball}.tar.bz2
+Source0:       %{tarball}.tar.lzma
 %else
 Source0:       ftp://ftp.x.org/pub/individual/driver/%{tarball}.tar.bz2
 %endif
@@ -164,6 +164,84 @@
 %endif
 
 %changelog
+* Sat Apr 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.5-2.8.20090411git
+- Updated README.fedora with new feature set (2D+XVideo on R[67]xx)
+- This snapshot is the 1.2.5 release.
+- New snapshot (upstream commit cb54f48b212d5ae54e13bbdf24575b6163798c0d):
+  - cb54f48b: Bump to 1.2.5. Updated README.
+  - 9d2a5088: Fix resume from suspend for r6xx/r7xx
+  - 1137e096: RHDDRIGetIntGARTLocation is called too often to be logged. Nuked RHDFUNC there.
+  - 76d6973a: man: R6xx and R7xx 2D possible now.
+  - 00656976: LUT: reduce number of writes to DC_LUT_RW_INDEX
+  - 6d7f2486: Use () in macro arguments of new RHDRegMask.
+  - d6c37277: CS: Replace register read/write macros with ones from compiler.h
+  - c9d1af91: Use X MMIO macros instead of own register read/write functions
+  - f65014d8: Add RV790 (HD 4890) Support
+  - 79efc609: AtomBIOS: Fixed wrong logic: switch -> if.
+  - ecd61667: rhd_dump: fix error introduced by LUT dump addition
+  - 7e4948a3: R6xx/R7xx EXA: rework composite pixel shader
+  - 461701c6: R6xx/R7xx: clean up bool const code
+  - cc6e6fe4: add new chip ids
+  - f0f640f1: R6xx/R7xx EXA: fix maxPitchBytes
+  - 37da5e5a: Add new pci ids
+  - 4fa65062: Really disable UTS/DFS on r6xx/r7xx AGP
+  - b075ec9c: R6xx/R7xx AGP: disable gart data transfers
+  - d9c8f9ce: r600: reload shaders into VRAM on resume
+  - 12611c8f: R6xx/R7xx shader: Fix OFFSET_[XYZ] macro for TEX_DWORD2 to accept floats
+  - 70490504: RS600: fix page table size for rs600 as well
+  - 10ebf657: r600: fix sizing of PCI GART table for r600
+  - f27383df: R6xx/R7xx: Fix OFFSET_[XYZ] macros for negative values.
+  - 827fb141: randr: Set use_screen_monitor correctly using helper function.
+  - 76490dd8: Enable DRI by default on R5xx chips.
+
+* Fri Mar 06 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.4-2.4.20090306git
+- New snapshot (upstream commit 093e5934a26f784f70b5febf8ae6d50a3459552c)
+  Mainly includes the R6xx/R7xx acceleration stuff (no 3D, that depends on mesa).
+  Detailed changelong: "git log 047bd705..093e5934" (much too long for here)
+
+* Thu Feb 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.4-2.3.20090226git
+- Change snapshot compression method to lzma (from bzip2)
+- New snapshot (upstream commit 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6):
+  - 047bd705: EXA: fix for (incompatible) upstream EXA version 3.
+  - ad6c789a: (Hopefully) fix cursor corruptions, at least on some configs. fdo #13405
+  - c7735333: Fix some warnings.
+  - a5a7b085: Fix warning: only compile rhdRRCrtcSetOrigin() if required for RandR 1.3.
+  - 368bb0d7: LUT: Fix incorrect shifts and masks for 15- and 16-bit depth
+  - 4d208cdd: Fix LUT precision handling for 8, 24, and 32bit depth
+  - 6e71f01f: rhd_dump: add LUT printing support
+  - ed86b90a: Add missing definition of atom_Panel.
+  - b76bfbd7: Add 'force-shadowfb' AccelMethod. For testing purposes only.
+  - 95aa9113: AtomBIOS: Fix build for build w --disable-atombios-parser.
+  - c349a523: Trivial typo in properties / man page.
+  - 68c317da: Unify and fix quirk table macros.
+  - e216e686: Add quirk table entry for HIS Radeon X1550 PCI.
+  - f45e95cc: build: catch incompatible options in configure
+  - e738e579: Quirk for PowerColor HD 3450.
+  - 127d362c: I2C: Fix NULL pointer deference spotted by Maciej Cencora.
+  - 1652f150: Build: Fix build when AtomBIOS subsystem is disabled.
+  - a981e2d0: Remove xorgconfig & xorgcfg from See Also list in man page
+  - f57a410c: Fix scaling documentation.
+  - 44720209: RS780: set bustype to PCIE
+  - 421edfd7: MC: Fix warnings and streamline naming of MCGetFBLocation.
+  - 28956656: Card quirks: fix warning introduced in b2e2693d
+  - 5eed0c4f: ID: add 0x944C (RV770).
+  - b2e2693d: Add quirk table entry for GeCube Radeon HD 2400PRO
+  - 003325a5: Implement RandR 1.3 mandatory properties.
+  - 33bf07be: Renamed properties according to RandR 1.3 property guideline.
+  - c990d6d7: Typo fix in man page
+  - 107c97a6: Change all gitweb URL references to cgit
+  - 0b47e600: man page: Add R7xx to NAME section
+  - d46d50e6: MC: Pass FbLocation and FbSize to RHDMCFBLocationSetup().
+  - 0fd284c0: MC/Idle: ASSERT() the right setup order, don't change an unidled MC.
+  - eeb66dc9: MC: Refactor MC code.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2.2.20081212git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 22 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.4-1.2.20081212git
+- Force rebuild on rawhide aka F-11.
+- Change obsolete gitweb references to valid cgit references.
+
 * Fri Dec 12 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.4-1.1.20081212git
 - Upstream have released 1.2.4 today. This snapshot is 1.2.4.
 - New snapshot (upstream commit 4e8972638db59d007bc61eb1bef8adb99cc67000):



From mtasaka at fedoraproject.org  Sat Apr 11 14:42:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 14:42:14 +0000 (UTC)
Subject: rpms/ruby/devel .cvsignore, 1.28, 1.29 ruby.spec, 1.131,
	1.132 sources, 1.27, 1.28
Message-ID: <20090411144214.1C2F570098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24792

Modified Files:
	.cvsignore ruby.spec sources 
Log Message:
* Sat Apr 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.287-8
- Merge Review fix (#226381)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	15 Mar 2009 05:56:17 -0000	1.28
+++ .cvsignore	11 Apr 2009 14:41:42 -0000	1.29
@@ -2,3 +2,4 @@
 ruby-refm-rdp-1.8.1-ja-html.tar.gz
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
+ruby-refm-rdp-1.8.2-ja-html.tar.gz


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ruby.spec	18 Mar 2009 04:50:29 -0000	1.131
+++ ruby.spec	11 Apr 2009 14:41:42 -0000	1.132
@@ -10,9 +10,13 @@
 %define	sitedir2	%{_prefix}/lib/ruby/site_ruby
 %define	_normalized_cpu	%(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/' | sed -e 's|i.86|i386|'`)
 
+# emacs sitelisp directory
+%{!?_emacs_sitelispdir: %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp}
+%{!?_emacs_sitestartdir: %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp/site-start.d}
+
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +26,8 @@
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2
 ## Dead link
 ##Source1:	http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz
-Source1:	%{name}-refm-rdp-1.8.1-ja-html.tar.gz
+#Source1:	%{name}-refm-rdp-1.8.1-ja-html.tar.gz
+Source1:	http://elbereth-hp.hp.infoseek.co.jp/files/ruby/refm/old/2005/%{name}-refm-rdp-1.8.2-ja-html.tar.gz
 Source2:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz
 Source3:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz
 Source4:	irb.1
@@ -53,6 +58,9 @@
 %package libs
 Summary:	Libraries necessary to run Ruby
 Group:		Development/Libraries
+# ext/bigdecimal/bigdecimal.{c,h} are under (GPL+ or Artistic) which
+# are used for bigdecimal.so
+License:	(Ruby or GPLv2) and (GPL+ or Artistic)
 Provides:	ruby(abi) = %{rubyxver}
 Provides:	libruby = %{version}-%{release}
 Obsoletes:	libruby <= %{version}-%{release}
@@ -75,6 +83,8 @@
 %package tcltk
 Summary:	Tcl/Tk interface for scripting language Ruby
 Group:		Development/Languages
+# Many files under ext/tk/sample/ are under TCL
+License:	(Ruby or GPLv2) and TCL
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description tcltk
@@ -96,6 +106,8 @@
 %package rdoc
 Summary:	A tool to generate documentation from Ruby source files
 Group:		Development/Languages
+# generators/template/html/html.rb is under CC-BY
+License:	(GPLv2 or Ruby) and CC-BY
 ## ruby-irb requires ruby
 #Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-irb = %{version}-%{release}
@@ -197,7 +209,9 @@
 
 %check
 pushd %{name}-%{arcver}
-%ifnarch ppc64
+%ifarch ppc64
+make test || :
+%else
 make test
 %endif
 popd
@@ -205,8 +219,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ruby-mode
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 # installing documents and exapmles...
 rm -rf tmp-ruby-docs
@@ -286,10 +300,15 @@
 
 # convert to utf-8
 for i in `find -type f ! -name "*.gif"`; do
-    sh -c "iconv -f utf-8 -t utf-8 $i > /dev/null 2>&1 || (iconv -f euc-jp -t utf-8 $i > $i.new && mv $i.new $i || exit 1)
-    if [ $? != 0 ]; then
-        iconv -f iso8859-1 -t utf-8 $i > $.new && mv $i.new $i || exit 1
-    fi"
+    status=0
+    iconv -f utf-8 -t utf-8 $i >/dev/null || { iconv -f euc-jp -t utf-8 $i > $i.new && mv $i.new $i || status=1 ; }
+    if [ $status = 0 ]; then
+        if dirname $i | grep -q refm-ja ; then
+          sed -i -e '/encoding/s|EUC-JP|UTF-8|' -e '/charset/s|EUC-JP|UTF-8|' $i
+        fi
+    else
+        iconv -f iso8859-1 -t utf-8 $i > $.new && mv $i.new $i || rm -f $i.new
+    fi
 done
 
 # done
@@ -312,10 +331,10 @@
 
 # installing ruby-mode
 cd %{name}-%{arcver}
-cp -p misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+cp -p misc/*.el $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ruby-mode
 
 ## for ruby-mode
-pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+pushd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ruby-mode
 cat <<EOF > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
@@ -323,7 +342,7 @@
 rm -f path.el*
 popd
 install -p -m 644 %{SOURCE10} \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+	$RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 cd ..
 
@@ -336,7 +355,6 @@
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf tmp-ruby-docs
 
 %post libs -p /sbin/ldconfig
 
@@ -508,16 +526,19 @@
 %doc %{name}-%{arcver}/LEGAL
 %doc %{name}-%{arcver}/LGPL
 %doc %{name}-%{arcver}/misc/README
-%{_datadir}/emacs/site-lisp/ruby-mode
-%{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el
+%{_emacs_sitelispdir}/ruby-mode
+%{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sat Apr 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.287-8
+- Merge Review fix (#226381)
+
 * Wed Mar 18 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.8.6.287-7
 - Fix regression in CVE-2008-3790 (#485383)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.287-6
 - Again use -O2 optimization level
-- i586 should search i386-linux directory
+- i586 should search i386-linux directory (on <= F-11)
 
 * Thu Mar 05 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.287-5
 - Rebuild for gcc4.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	15 Mar 2009 05:56:18 -0000	1.27
+++ sources	11 Apr 2009 14:41:42 -0000	1.28
@@ -2,3 +2,4 @@
 d65e3a216d6d345a2a6f1aa8758c2f75  ruby-refm-rdp-1.8.1-ja-html.tar.gz
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
+b6dd396f513efeb7864685c840f9643a  ruby-refm-rdp-1.8.2-ja-html.tar.gz



From sindrepb at fedoraproject.org  Sat Apr 11 15:30:02 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Sat, 11 Apr 2009 15:30:02 +0000 (UTC)
Subject: rpms/solfege/devel solfege.spec,1.19,1.20
Message-ID: <20090411153002.C5E0970098@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3636

Modified Files:
	solfege.spec 
Log Message:
remove lilypond dependency


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/solfege.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- solfege.spec	7 Apr 2009 16:40:02 -0000	1.19
+++ solfege.spec	11 Apr 2009 15:29:30 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		solfege
 Version:	3.14.1       
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Music education software
 
 Group:		Applications/Multimedia
@@ -17,10 +17,10 @@
 
 BuildRequires:	texinfo, swig, gettext, docbook-style-xsl 
 BuildRequires:	pygtk2-devel >= 2.12, libxslt
-BuildRequires:  lilypond, swig
+BuildRequires:  swig
 BuildRequires:	desktop-file-utils, gettext
 
-Requires:	timidity++, lilypond
+Requires:	timidity++
 Requires:       gnome-python2-gtkhtml2, esound
 Requires:	pygtk2 >= 2.12
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-2
+- Don't depend on lilypond
+
 * Wed Apr 7 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-2
 - Update launcher script to use esdcompat and not esd
 



From mtasaka at fedoraproject.org  Sat Apr 11 17:00:36 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 17:00:36 +0000 (UTC)
Subject: rpms/kazehakase/devel
	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch, NONE,
	1.1 kazehakase.spec, 1.78, 1.79
Message-ID: <20090411170036.CB05F70098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30745

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch 
Log Message:
* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-8.svn3769_trunk
- Fix crash when kazehakase-webkit only is installed (bug 444569)


kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/kz-window.c.debug	2009-02-20 16:15:36.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/kz-window.c	2009-04-12 01:40:20.000000000 +0900
@@ -840,7 +840,7 @@
 	if (!kz_embed)
 		kz_embed = KZ_EMBED(kz_embed_new("gecko"));
 	if (!kz_embed)
-		kz_embed = KZ_EMBED(kz_embed_new("webkit-gtk"));
+		kz_embed = KZ_EMBED(kz_embed_new("webkit_gtk"));
 	if (!kz_embed)
 		kz_embed = KZ_EMBED(kz_embed_new("ie"));
 


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kazehakase.spec	26 Mar 2009 18:18:35 -0000	1.78
+++ kazehakase.spec	11 Apr 2009 17:00:05 -0000	1.79
@@ -34,7 +34,7 @@
 %define		svnver		3769_trunk
 
 
-%define		fedorarel	7
+%define		fedorarel	8
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -53,6 +53,9 @@
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
+# kazehakase crashed when only kazehakase-webkit is installed
+# (bug 444569)
+Patch12:	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -179,6 +182,7 @@
 	-e '/SHAVE_INIT/s|\[enable\]|\[disable\]|' configure.ac
 
 %patch11 -p0 -b .rhbug
+%patch12 -p1 -b .onlywebkit
 
 %if %{need_autogen}
 sh autogen.sh
@@ -321,6 +325,9 @@
 %endif
 
 %changelog
+* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-8.svn3769_trunk
+- Fix crash when kazehakase-webkit only is installed (bug 444569)
+
 * Fri Mar 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-7.svn3769_trunk
 - Fix Group tag (bug 486452)
 



From davidz at fedoraproject.org  Sat Apr 11 17:05:04 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sat, 11 Apr 2009 17:05:04 +0000 (UTC)
Subject: rpms/gvfs/devel gdu-0008-ignore-drives-without-volumes.patch, NONE, 
	1.1 gdu-0009-never-ignore-drives-without-media.patch, NONE,
	1.1 gvfs.spec, 1.122, 1.123
Message-ID: <20090411170504.93EA670098@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32599

Modified Files:
	gvfs.spec 
Added Files:
	gdu-0008-ignore-drives-without-volumes.patch 
	gdu-0009-never-ignore-drives-without-media.patch 
Log Message:
* Sat Apr 11 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-5
- Don't show drives in computer:/// if media is available but
  no volumes are recognized (#495152)



gdu-0008-ignore-drives-without-volumes.patch:

--- NEW FILE gdu-0008-ignore-drives-without-volumes.patch ---
>From 9a265228542de72df41caef8bd31402841ac389c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Sat, 11 Apr 2009 12:43:06 -0400
Subject: [PATCH] ignore drives without volumes

This fixes a problem on some dmraid setups where we have drives
without any partitions (the dmraid boot scripts removes all partitions
(!)). See https://bugzilla.redhat.com/show_bug.cgi?id=495152 for more
details.

This fix is also consistent with the policy of ignoring drives where
all volumes are ignored. E.g. prior to this patch we didn't shown
neither sdb if sdb1 was a the only unrecognized partition on sdb.. so
if you delete sdb1, it would be natural to keep hiding sdb (which is
what this patch does).
---
 monitor/gdu/ggduvolumemonitor.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 9ecee8b..0e7ce6f 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -799,7 +799,13 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
         }
     }
 
-  ret = has_volumes && all_volumes_are_ignored;
+  /* we ignore a drive if
+   *
+   * a) it doesn't have any volumes; or
+   *
+   * b) the volumes of the drive are all ignored
+   */
+  ret = (!has_volumes) || (has_volumes && all_volumes_are_ignored);
 
  out:
   g_list_foreach (enclosed, (GFunc) g_object_unref, NULL);
-- 
1.6.2.2


gdu-0009-never-ignore-drives-without-media.patch:

--- NEW FILE gdu-0009-never-ignore-drives-without-media.patch ---
>From c54217a58f71f3ca7a85ce81fb96f363255c6110 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Sat, 11 Apr 2009 12:57:55 -0400
Subject: [PATCH] never ignore drives without media

---
 monitor/gdu/ggduvolumemonitor.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 0e7ce6f..caa25a0 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -751,13 +751,13 @@ static gboolean
 should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
 {
   GduDevice *device;
-  gboolean ret;
+  gboolean ignored;
   gboolean has_volumes;
   gboolean all_volumes_are_ignored;
   GList *enclosed;
   GList *l;
 
-  ret = FALSE;
+  ignored = FALSE;
   device = NULL;
   enclosed = NULL;
 
@@ -771,7 +771,7 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
    */
   if (device == NULL)
     {
-      ret = TRUE;
+      ignored = TRUE;
       goto out;
     }
 
@@ -801,11 +801,20 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
 
   /* we ignore a drive if
    *
-   * a) it doesn't have any volumes; or
+   * a) no volumes are available AND media is available; OR
    *
    * b) the volumes of the drive are all ignored
    */
-  ret = (!has_volumes) || (has_volumes && all_volumes_are_ignored);
+  if (!has_volumes)
+    {
+      if (gdu_device_is_media_available (device))
+        ignored = TRUE;
+    }
+  else
+    {
+      if (all_volumes_are_ignored)
+        ignored = TRUE;
+    }
 
  out:
   g_list_foreach (enclosed, (GFunc) g_object_unref, NULL);
@@ -814,7 +823,7 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
   if (device != NULL)
     g_object_unref (device);
 
-  return ret;
+  return ignored;
 }
 
 static void
-- 
1.6.2.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gvfs.spec	11 Apr 2009 04:48:14 -0000	1.122
+++ gvfs.spec	11 Apr 2009 17:04:34 -0000	1.123
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -52,6 +52,10 @@
 # - Pending discussion + requires Nautilus patch
 #Patch107: gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=495152
+Patch108: gdu-0008-ignore-drives-without-volumes.patch
+Patch109: gdu-0009-never-ignore-drives-without-media.patch
+
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -143,6 +147,8 @@
 %patch105 -p1 -b .gdu-ignore-1
 %patch106 -p1 -b .gdu-ignore-2
 #%patch107 -p1 -b .gdu-always-eject
+%patch108 -p1 -b .gdu-ignore-drives-without-volumes
+%patch109 -p1 -b .gdu-never-ignore-drives-without-media
 
 %build
 
@@ -286,6 +292,10 @@
 
 
 %changelog
+* Sat Apr 11 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-5
+- Don't show drives in computer:/// if media is available but
+  no volumes are recognized (#495152)
+
 * Sat Apr 11 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.1-4
 - No need for bash completion to be executable
 



From mtasaka at fedoraproject.org  Sat Apr 11 17:10:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 17:10:39 +0000 (UTC)
Subject: rpms/kazehakase/F-10
	kazehakase-0.5.6-crash-only_webkit_installed.patch, NONE,
	1.1 kazehakase.spec, 1.72, 1.73
Message-ID: <20090411171039.4D38070098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2193

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-crash-only_webkit_installed.patch 
Log Message:
* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
- Fix crash when kazehakase-webkit only is installed (bug 444569)


kazehakase-0.5.6-crash-only_webkit_installed.patch:

--- NEW FILE kazehakase-0.5.6-crash-only_webkit_installed.patch ---
--- kazehakase-0.5.6/src/kz-window.c.debug	2008-10-29 00:09:18.000000000 +0900
+++ kazehakase-0.5.6/src/kz-window.c	2009-04-12 01:51:24.000000000 +0900
@@ -835,7 +835,7 @@
 	if (!kz_embed)
 		kz_embed = KZ_EMBED(kz_embed_new("gecko"));
 	if (!kz_embed)
-		kz_embed = KZ_EMBED(kz_embed_new("gtk-webcore"));
+		kz_embed = KZ_EMBED(kz_embed_new("webkit_gtk"));
 	if (!kz_embed)
 		kz_embed = KZ_EMBED(kz_embed_new("ie"));
 


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kazehakase.spec	27 Mar 2009 19:36:53 -0000	1.72
+++ kazehakase.spec	11 Apr 2009 17:10:08 -0000	1.73
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.5
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -50,6 +50,9 @@
 %if 0%{?fedora} >= 9
 Patch11:	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch
 %endif
+# kazehakase crashed when only kazehakase-webkit is installed
+# (bug 444569)
+Patch12:	kazehakase-0.5.6-crash-only_webkit_installed.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -178,6 +181,7 @@
 %if 0%{?fedora} >= 9
 %patch11 -p0 -b .rhbug
 %endif
+%patch12 -p1 -b .onlywebkit
 
 %if %{need_autogen}
 sh autogen.sh
@@ -293,6 +297,9 @@
 %endif
 
 %changelog
+* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
+- Fix crash when kazehakase-webkit only is installed (bug 444569)
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-1.5
 - Rebuild against newer gecko
 



From mtasaka at fedoraproject.org  Sat Apr 11 17:18:46 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 17:18:46 +0000 (UTC)
Subject: rpms/kazehakase/F-9
	kazehakase-0.5.6-crash-only_webkit_installed.patch, NONE,
	1.1 kazehakase.spec, 1.71, 1.72
Message-ID: <20090411171846.846FC70126@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4813

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-crash-only_webkit_installed.patch 
Log Message:
* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
- Fix crash when kazehakase-webkit only is installed (bug 444569)


kazehakase-0.5.6-crash-only_webkit_installed.patch:

--- NEW FILE kazehakase-0.5.6-crash-only_webkit_installed.patch ---
--- kazehakase-0.5.6/src/kz-window.c.debug	2008-10-29 00:09:18.000000000 +0900
+++ kazehakase-0.5.6/src/kz-window.c	2009-04-12 01:51:24.000000000 +0900
@@ -835,7 +835,7 @@
 	if (!kz_embed)
 		kz_embed = KZ_EMBED(kz_embed_new("gecko"));
 	if (!kz_embed)
-		kz_embed = KZ_EMBED(kz_embed_new("gtk-webcore"));
+		kz_embed = KZ_EMBED(kz_embed_new("webkit_gtk"));
 	if (!kz_embed)
 		kz_embed = KZ_EMBED(kz_embed_new("ie"));
 


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kazehakase.spec	27 Mar 2009 19:38:52 -0000	1.71
+++ kazehakase.spec	11 Apr 2009 17:18:45 -0000	1.72
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.5
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -50,6 +50,9 @@
 %if 0%{?fedora} >= 9
 Patch11:	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch
 %endif
+# kazehakase crashed when only kazehakase-webkit is installed
+# (bug 444569)
+Patch12:	kazehakase-0.5.6-crash-only_webkit_installed.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -178,6 +181,7 @@
 %if 0%{?fedora} >= 9
 %patch11 -p0 -b .rhbug
 %endif
+%patch12 -p1 -b .onlywebkit
 
 %if %{need_autogen}
 sh autogen.sh
@@ -293,6 +297,9 @@
 %endif
 
 %changelog
+* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
+- Fix crash when kazehakase-webkit only is installed (bug 444569)
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-1.5
 - Rebuild against newer gecko
 



From vpv at fedoraproject.org  Sat Apr 11 17:23:19 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sat, 11 Apr 2009 17:23:19 +0000 (UTC)
Subject: rpms/libvoikko/devel libvoikko-svn-head-r2591.patch, NONE,
	1.1 libvoikko.spec, 1.20, 1.21
Message-ID: <20090411172319.6564970098@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6831

Modified Files:
	libvoikko.spec 
Added Files:
	libvoikko-svn-head-r2591.patch 
Log Message:
* Sat Apr 11 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.3.rc2
- Patch to current SVN HEAD, includes a fix for a memory leak in the grammar
  checker


libvoikko-svn-head-r2591.patch:

--- NEW FILE libvoikko-svn-head-r2591.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2585)
+++ ChangeLog	(working copy)
@@ -1,3 +1,22 @@
+2009-04-11 Harri Pitk??nen <hatapitk at iki.fi>
+
+	* Remove --as-needed from linker flags. It is
+	  unnecessary as long as libtool < 2.0 is used
+	  and breaks build on OS X.
+
+2009-04-10 Harri Pitk??nen <hatapitk at iki.fi>
+
+	* Fixed typo that prevented dictionary loader from
+	  working correctly on Windows.
+	* Add struct keywords to voikko.h to make the header
+	  compatible with plain C compilers.
+	* Fix memory leak in grammar checker.
+
+2009-04-07 Harri Pitk??nen <hatapitk at iki.fi>
+
+	* Change trie compiler to not use a construct that
+	  is not supported in python 2.3.
+
 2009-07-05 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
 
 	* Build fixes for Fedora 11.
Index: src/setup/DictionaryLoader.cpp
===================================================================
--- src/setup/DictionaryLoader.cpp	(revision 2585)
+++ src/setup/DictionaryLoader.cpp	(working copy)
@@ -112,7 +112,7 @@
 	mainPath.append("/");
 	mainPath.append(VOIKKO_DICTIONARY_VERSION);
 #ifdef WIN32
-	string searchPattern(path);
+	string searchPattern(mainPath);
 	searchPattern.append("\\*");
 	WIN32_FIND_DATA dirData;
 	HANDLE handle = FindFirstFile(searchPattern.c_str(), &dirData);
Index: src/tools/Makefile.am
===================================================================
--- src/tools/Makefile.am	(revision 2585)
+++ src/tools/Makefile.am	(working copy)
@@ -1,15 +1,15 @@
 bin_PROGRAMS = voikkospell voikkohyphenate voikkogc
 
 voikkospell_SOURCES = voikkospell.cpp
-voikkospell_CXXFLAGS = $(AM_CXXFLAGS) -Wl,--as-needed
+voikkospell_CXXFLAGS = $(AM_CXXFLAGS)
 voikkospell_LDADD = ../libvoikko.la
 
 voikkohyphenate_SOURCES = voikkohyphenate.cpp
-voikkohyphenate_CXXFLAGS = $(AM_CXXFLAGS) -Wl,--as-needed
+voikkohyphenate_CXXFLAGS = $(AM_CXXFLAGS)
 voikkohyphenate_LDADD = ../libvoikko.la
 
 voikkogc_SOURCES = voikkogc.cpp
-voikkogc_CXXFLAGS = $(AM_CXXFLAGS) -Wl,--as-needed
+voikkogc_CXXFLAGS = $(AM_CXXFLAGS)
 voikkogc_LDADD = ../libvoikko.la
 
 dist_man_MANS = voikkospell.1 voikkohyphenate.1 voikkogc.1
Index: src/grammar/cache.cpp
===================================================================
--- src/grammar/cache.cpp	(revision 2585)
+++ src/grammar/cache.cpp	(working copy)
@@ -84,7 +84,7 @@
 		}
 	}
 	
-	for (int i = 0; i < para->sentenceCount; i++) {
+	for (size_t i = 0; i < para->sentenceCount; i++) {
 		AutoCorrect::autoCorrect(handle, para->sentences[i]);
 		gc_local_punctuation(handle, para->sentences[i]);
 		gc_punctuation_of_quotations(handle, para->sentences[i]);
Index: src/grammar/Paragraph.cpp
===================================================================
--- src/grammar/Paragraph.cpp	(revision 2585)
+++ src/grammar/Paragraph.cpp	(working copy)
@@ -24,6 +24,9 @@
 }
 
 Paragraph::~Paragraph() {
+	for (size_t i = 0; i < sentenceCount; i++) {
+		delete this->sentences[i];
+	}
 	delete[] this->sentences;
 }
 
Index: src/grammar/Paragraph.hpp
===================================================================
--- src/grammar/Paragraph.hpp	(revision 2585)
+++ src/grammar/Paragraph.hpp	(working copy)
@@ -24,7 +24,9 @@
 namespace libvoikko { namespace grammar {
 
 /**
- * Analyzed paragraph for grammar checker.
+ * Analyzed paragraph for grammar checker. The user of this class
+ * must ensure that sentenceCount matches the number of sentences
+ * stored in this paragraph.
  */
 class Paragraph {
 	public:
@@ -33,13 +35,13 @@
 		~Paragraph();
 		
 		/* Maximum number of sentences in a paragraph */
-		static const int MAX_SENTENCES_IN_PARAGRAPH = 200;
+		static const size_t MAX_SENTENCES_IN_PARAGRAPH = 200;
 		
 		/** Pointers to analyzed sentences */
 		Sentence ** sentences;
 		
 		/** Number of sentences in the paragraph */
-		int sentenceCount;
+		size_t sentenceCount;
 	
 	private:
 		Paragraph(Paragraph const & other);
Index: src/voikko.h
===================================================================
--- src/voikko.h	(revision 2585)
+++ src/voikko.h	(working copy)
@@ -436,25 +436,25 @@
  *        first before looking into the standard dictionary locations.
  * @return A pointer to a null terminated array of dictionary entries.
  */
-voikko_dict ** voikko_list_dicts(const char * path);
+struct voikko_dict ** voikko_list_dicts(const char * path);
 
 /**
  * Free the memory allocated for dictionary list.
  * @param dicts A list of available dictionaries obtained with voikko_list_dicts
  */
-void voikko_free_dicts(voikko_dict ** dicts);
+void voikko_free_dicts(struct voikko_dict ** dicts);
 
 /**
  * Get the variant identifier for a dictionary.
  * @return The variant identifier for given dictionary.
  */
-const char * voikko_dict_variant(const voikko_dict * dict);
+const char * voikko_dict_variant(const struct voikko_dict * dict);
 
 /**
  * Get the human readable description for a dictionary.
  * @return The description for given dictionary.
  */
-const char * voikko_dict_description(const voikko_dict * dict);
+const char * voikko_dict_description(const struct voikko_dict * dict);
 
 END_C_DECLS
 #endif
Index: src/autocorrect/triecompiler.py
===================================================================
--- src/autocorrect/triecompiler.py	(revision 2585)
+++ src/autocorrect/triecompiler.py	(working copy)
@@ -75,7 +75,8 @@
 		# These characters cannot be represented as unicode literals in C++
 		return unicodeChar
 	hexCode = hex(ordinal)[2:]
-	return "\\u" + hexCode.rjust(4, "0")
+	# hexCode.rjust(4, "0") is not supported in Python version 2.3
+	return "\\u" + hexCode.rjust(4).replace(" ", "0")
 
 def writeTrieNodes(trie, outputFile):
 	for node in trie.children:


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libvoikko.spec	7 Apr 2009 19:30:47 -0000	1.20
+++ libvoikko.spec	11 Apr 2009 17:23:18 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.1
-Release:        0.2.rc2%{?dist}
+Release:        0.3.rc2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@
 #Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
 Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
+Patch0:         libvoikko-svn-head-r2591.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga-devel >= 7.8 python
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -96,6 +98,10 @@
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Sat Apr 11 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.3.rc2
+- Patch to current SVN HEAD, includes a fix for a memory leak in the grammar
+  checker
+
 * Mon Apr 6 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.2.rc2
 - New release candidate
 - Both patches applied upstream



From ausil at fedoraproject.org  Sat Apr 11 17:45:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 11 Apr 2009 17:45:45 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sunffb/devel sunffb-sparc64.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xorg-x11-drv-sunffb.spec, 1.3,
	1.4 xorg-x11-drv-sunffb-git-checkout.sh, 1.1,
	NONE xorg-x11-drv-sunffb-remove-dri.patch, 1.1, NONE
Message-ID: <20090411174545.97BE170098@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13836

Modified Files:
	.cvsignore sources xorg-x11-drv-sunffb.spec 
Added Files:
	sunffb-sparc64.patch 
Removed Files:
	xorg-x11-drv-sunffb-git-checkout.sh 
	xorg-x11-drv-sunffb-remove-dri.patch 
Log Message:
update to 1.2.0 patch asm to build sparc64


sunffb-sparc64.patch:

--- NEW FILE sunffb-sparc64.patch ---
diff -uNr xf86-video-sunffb-1.2.0-orig/src/ffb_asm.s xf86-video-sunffb-1.2.0/src/ffb_asm.s
--- xf86-video-sunffb-1.2.0-orig/src/ffb_asm.s	2008-08-15 14:49:00.000000000 -0500
+++ xf86-video-sunffb-1.2.0/src/ffb_asm.s	2009-04-11 12:33:42.000000000 -0500
@@ -24,6 +24,12 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
 
+
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+.register %g2,#scratch
+.register %g3,#scratch
+#endif
+
 /* Hardware register offsets */
 #define FFB_BY		0x0060
 #define FFB_DY		0x0068
diff -uNr xf86-video-sunffb-1.2.0-orig/src/VISmoveImage.s xf86-video-sunffb-1.2.0/src/VISmoveImage.s
--- xf86-video-sunffb-1.2.0-orig/src/VISmoveImage.s	2008-08-15 14:49:00.000000000 -0500
+++ xf86-video-sunffb-1.2.0/src/VISmoveImage.s	2009-04-11 12:07:36.000000000 -0500
@@ -79,6 +79,8 @@
 #if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
 #define SMUL			mulx
 #define ICC			xcc
+.register %g2,#scratch
+.register %g3,#scratch
 #else
 #define SMUL			smul
 #define ICC			icc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2008 04:51:59 -0000	1.2
+++ .cvsignore	11 Apr 2009 17:45:13 -0000	1.3
@@ -1 +1 @@
-xf86-video-sunffb-20080526.tar.bz2
+xf86-video-sunffb-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2008 04:51:59 -0000	1.2
+++ sources	11 Apr 2009 17:45:13 -0000	1.3
@@ -1 +1 @@
-dd6e531c07969fd9a9346c8dad57e488  xf86-video-sunffb-20080526.tar.bz2
+816842de26bce8a935f3c9c3cfedbc42  xf86-video-sunffb-1.2.0.tar.bz2


Index: xorg-x11-drv-sunffb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/xorg-x11-drv-sunffb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-sunffb.spec	26 Feb 2009 11:15:48 -0000	1.3
+++ xorg-x11-drv-sunffb.spec	11 Apr 2009 17:45:14 -0000	1.4
@@ -1,25 +1,22 @@
 %define tarball xf86-video-sunffb
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir       %{moduledir}/drivers
-%define gitdate 20080526
 
 Summary:   Xorg X11 sunffb video driver
 Name:      xorg-x11-drv-sunffb
-Version:   1.1.0
-Release:   7%{?dist}.git%{gitdate}
+Version:   1.2.0
+Release:   1%{?dist}
 URL:       http://www.x.org
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:   %{tarball}-%{gitdate}.tar.bz2
-Source1:   xorg-x11-drv-sunffb-git-checkout.sh
-Patch0:    xorg-x11-drv-sunffb-remove-dri.patch
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch0:    sunffb-sparc64.patch
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # we are not building sparc64 at this time because we need to do some assembly work
-ExclusiveArch: sparcv9
+ExclusiveArch: sparcv9 sparc64
 
-BuildRequires: xorg-x11-server-devel
+BuildRequires: xorg-x11-server-devel libdrm-devel
 BuildRequires: automake autoconf gettext libtool
 
 Requires:  xorg-x11-server-Xorg
@@ -27,11 +24,10 @@
 X.Org X11 sunffb video driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate} 
+%setup -q -n %{tarball}-%{version} 
 %patch0 -p1 
 
 %build
-./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -50,6 +46,10 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Sat Apr 11 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.0-1
+- update to 1.2.0
+- enable sparc64 with asm patch
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-7.git20080526
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xorg-x11-drv-sunffb-git-checkout.sh DELETED ---


--- xorg-x11-drv-sunffb-remove-dri.patch DELETED ---



From mebourne at fedoraproject.org  Sat Apr 11 18:04:19 2009
From: mebourne at fedoraproject.org (Martin Ebourne)
Date: Sat, 11 Apr 2009 18:04:19 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder-1.24.1-perldep.patch, NONE,
	1.1 zoneminder.spec, 1.20, 1.21
Message-ID: <20090411180420.83B4070098@cvs1.fedora.phx.redhat.com>

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20230

Modified Files:
	zoneminder.spec 
Added Files:
	zoneminder-1.24.1-perldep.patch 
Log Message:
* Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-3
- Remove unused Sys::Mmap perl dependency RPM is finding


zoneminder-1.24.1-perldep.patch:

--- NEW FILE zoneminder-1.24.1-perldep.patch ---
--- scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm.perldep	2009-04-11 19:00:53.000000000 +0100
+++ scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm	2009-04-11 19:00:29.000000000 +0100
@@ -66,7 +66,8 @@
 use ZoneMinder::Config qw(:all);
 use ZoneMinder::Debug qw(:all);
 
-use Sys::Mmap;
+# Remove this, we don't use it but RPM is finding it as a dependency
+# use Sys::Mmap;
 
 sub zmMemKey( $ )
 {


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- zoneminder.spec	11 Apr 2009 01:24:27 -0000	1.20
+++ zoneminder.spec	11 Apr 2009 18:03:48 -0000	1.21
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.24.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -24,6 +24,7 @@
 Patch1: 	zoneminder-1.24.1-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
 Patch3:		zoneminder-1.24.1-noffmpeg.patch
+Patch4:		zoneminder-1.24.1-perldep.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 Patch11: 	zoneminder-1.24.1-gcc44.patch
 
@@ -69,6 +70,7 @@
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
 %patch3 -p0 -b .noffmpeg
+%patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
@@ -195,6 +197,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
 * Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-2
 - Update gcc44 patch to disable -frepo, seems to be broken with gcc44
 - Added noffmpeg patch to make building outside mock easier



From cweyl at fedoraproject.org  Sat Apr 11 18:14:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 11 Apr 2009 18:14:09 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-StackTrace/F-10
	perl-Catalyst-Plugin-StackTrace.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090411181409.4545970098@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-StackTrace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23547

Modified Files:
	perl-Catalyst-Plugin-StackTrace.spec sources 
Log Message:
* Fri Feb 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- update to 0.09



Index: perl-Catalyst-Plugin-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-StackTrace/F-10/perl-Catalyst-Plugin-StackTrace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Plugin-StackTrace.spec	7 Jun 2008 15:49:41 -0000	1.3
+++ perl-Catalyst-Plugin-StackTrace.spec	11 Apr 2009 18:14:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-StackTrace
-Version:        0.07
-Release:        4%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Display a stack trace on the debug screen
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,11 +49,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes 
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
+- update to 0.09
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jun 07 2008 Caol??n McNamara <caolanm at redhat.com> 0.07-4
 - rebuild for dependencies
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-StackTrace/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2008 19:56:34 -0000	1.2
+++ sources	11 Apr 2009 18:14:07 -0000	1.3
@@ -1 +1 @@
-4bd2dc12f9b6f6bb310c1fe07a8321f1  Catalyst-Plugin-StackTrace-0.07.tar.gz
+f8a06ada342a7bb697044c62302164ef  Catalyst-Plugin-StackTrace-0.09.tar.gz



From rishi at fedoraproject.org  Sat Apr 11 18:16:57 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 18:16:57 +0000 (UTC)
Subject: rpms/anjuta/devel anjuta.spec,1.70,1.71
Message-ID: <20090411181657.6789470098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24642

Modified Files:
	anjuta.spec 
Log Message:
* Sat Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-2
- Replaced 'Obsoletes: gnome-build <= 2.24.1-1' with
  'Obsoletes: gnome-build <= 2.24.1-1.fc10'. (Red Hat Bugzilla #485452).
- Explicitly passed '--enable-scrollkeeper' to configure.



Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- anjuta.spec	7 Apr 2009 03:33:54 -0000	1.70
+++ anjuta.spec	11 Apr 2009 18:16:25 -0000	1.71
@@ -2,7 +2,7 @@
 Name:		anjuta
 Epoch:		1
 Version:	2.26.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
@@ -10,7 +10,7 @@
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Obsoletes:	gnome-build <= 2.24.1-1
+Obsoletes:	gnome-build <= 2.24.1-1.fc10
 Provides:	perl(GBF::Make) = %{version}-%{release}
 
 Requires:	GConf2
@@ -137,7 +137,8 @@
 
 %build
 export PKG_CONFIG_PATH="./PKGCONFIG"
-%configure --disable-schemas-install --disable-static --enable-gtk-doc \
+%configure --disable-schemas-install --disable-static \
+  --enable-gtk-doc --enable-scrollkeeper \
   --enable-plugin-devhelp --enable-graphviz --enable-plugin-glade \
   --enable-plugin-scintilla --enable-plugin-sourceview \
   --enable-plugin-subversion --enable-plugin-valgrind \
@@ -322,6 +323,11 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-2
+- Replaced 'Obsoletes: gnome-build <= 2.24.1-1' with
+  'Obsoletes: gnome-build <= 2.24.1-1.fc10'. (Red Hat Bugzilla #485452).
+- Explicitly passed '--enable-scrollkeeper' to configure.
+
 * Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-1
 - Version bump to 2.26.0.1.
   * Get rid of libgnomecanvas. (GNOME Bugzilla #571740)



From silas at fedoraproject.org  Sat Apr 11 18:44:39 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Sat, 11 Apr 2009 18:44:39 +0000 (UTC)
Subject: rpms/python-stomper/devel import.log, NONE, 1.1 python-stomper.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090411184440.6626270098@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/python-stomper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv718/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-stomper.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
python-stomper-0_2_2-7_fc10:HEAD:python-stomper-0.2.2-7.fc10.src.rpm:1239475358


--- NEW FILE python-stomper.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-stomper
Version:        0.2.2
Release:        7%{?dist}
Summary:        A python client implementation of the STOMP protocol

Group:          Development/Languages
License:        ASL 2.0
URL:            http://code.google.com/p/stomper/
Source0:        http://stomper.googlecode.com/files/stomper-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools

%description
This is a python client implementation of the STOMP protocol. The client is
attempting to be transport layer neutral. This module provides functions to
create and parse STOMP messages in a programatic fashion.

%prep
%setup -q -n stomper-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/examples
rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/tests

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc lib/stomper/doc lib/stomper/examples lib/stomper/tests
%{python_sitelib}/*

%changelog
* Thu Apr 09 2009 Silas Sewell <silas at sewell ch> - 0.2.2-7
- Remove Python version dependency

* Sun Mar 29 2009 Silas Sewell <silas at sewell ch> - 0.2.2-6
- Fix dependencies

* Thu Mar 26 2009 Silas Sewell <silas at sewell ch> - 0.2.2-5
- Update package name to conform to Fedora naming standards
- Change define to global

* Fri Mar 20 2009 Silas Sewell <silas at sewell ch> - 0.2.2-4
- Update upstream package to remove hidden files

* Thu Mar 05 2009 Silas Sewell <silas at sewell ch> - 0.2.2-3
- Manually remove hidden files

* Wed Dec 17 2008 Silas Sewell <silas at sewell ch> - 0.2.2-2
- Increase Python requirements to 2.5 because stomper uses uuid

* Wed Dec 17 2008 Silas Sewell <silas at sewell ch> - 0.2.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-stomper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:09:07 -0000	1.1
+++ .cvsignore	11 Apr 2009 18:44:37 -0000	1.2
@@ -0,0 +1 @@
+stomper-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-stomper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:09:07 -0000	1.1
+++ sources	11 Apr 2009 18:44:37 -0000	1.2
@@ -0,0 +1 @@
+c82988f145290943ba78dfd572b398b4  stomper-0.2.2.tar.gz



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:16 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested watchcommits
Message-ID: <20090411185208.6613510F872@bastion2.fedora.phx.redhat.com>

dodji has requested the watchcommits acl on gedit-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:13 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested watchbugzilla
Message-ID: <20090411185207.EDBAF10F80D@bastion2.fedora.phx.redhat.com>

dodji has requested the watchbugzilla acl on gedit-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:52:10 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested commit
Message-ID: <20090411185210.C04E710F876@bastion2.fedora.phx.redhat.com>

dodji has requested the commit acl on gedit-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:19 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested approveacls
Message-ID: <20090411185212.3477010F879@bastion2.fedora.phx.redhat.com>

dodji has requested the approveacls acl on gedit-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:52:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:52:24 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested watchcommits
Message-ID: <20090411185224.2DA9E10F87C@bastion2.fedora.phx.redhat.com>

dodji has requested the watchcommits acl on gedit-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:32 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested watchbugzilla
Message-ID: <20090411185224.D3B5210F87F@bastion2.fedora.phx.redhat.com>

dodji has requested the watchbugzilla acl on gedit-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:33 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested approveacls
Message-ID: <20090411185225.D9D6B10F882@bastion2.fedora.phx.redhat.com>

dodji has requested the approveacls acl on gedit-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:32 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested commit
Message-ID: <20090411185226.47D2E10F885@bastion2.fedora.phx.redhat.com>

dodji has requested the commit acl on gedit-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:52:30 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested watchbugzilla
Message-ID: <20090411185230.625C710F888@bastion2.fedora.phx.redhat.com>

dodji has requested the watchbugzilla acl on gedit-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:40 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested commit
Message-ID: <20090411185232.C309410F80D@bastion2.fedora.phx.redhat.com>

dodji has requested the commit acl on gedit-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:39 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested watchcommits
Message-ID: <20090411185233.DC0F310F889@bastion2.fedora.phx.redhat.com>

dodji has requested the watchcommits acl on gedit-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:45 +0000
Subject: [pkgdb] gedit-plugins: dodji has requested approveacls
Message-ID: <20090411185237.8BBA610F88C@bastion2.fedora.phx.redhat.com>

dodji has requested the approveacls acl on gedit-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:14 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185314.ACA0D10F87A@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on gedit-plugins (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:20 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185315.794D210F87D@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on gedit-plugins (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:23 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185316.43E1010F880@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on gedit-plugins (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:17 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185317.5B73110F883@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on gedit-plugins (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:27 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185321.6F1FE10F886@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on gedit-plugins (Fedora 9) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:30 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185322.8DA7010F890@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on gedit-plugins (Fedora 9) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:28 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185323.0F4BC10F892@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on gedit-plugins (Fedora 9) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:31 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185323.B2C1410F895@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on gedit-plugins (Fedora 9) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:26 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185326.4521610F898@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on gedit-plugins (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:33 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185327.B4BA210F888@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on gedit-plugins (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:54:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:54:36 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185328.7EC8810F89D@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on gedit-plugins (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From pkgdb at fedoraproject.org  Sat Apr 11 18:53:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 18:53:29 +0000
Subject: [pkgdb] gedit-plugins had acl change status
Message-ID: <20090411185329.37D6310F89F@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on gedit-plugins (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gedit-plugins



From mtasaka at fedoraproject.org  Sat Apr 11 19:12:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 19:12:03 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.73,1.74
Message-ID: <20090411191203.1637570098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10234/F-10

Modified Files:
	kazehakase.spec 
Log Message:
Fix Group tag (bug 486452)


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kazehakase.spec	11 Apr 2009 17:10:08 -0000	1.73
+++ kazehakase.spec	11 Apr 2009 19:11:32 -0000	1.74
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -115,7 +115,7 @@
 
 %package	base
 Summary:	Base package of Kazehakase
-Group:		Application/Internet
+Group:		Applications/Internet
 
 %description	base
 This package contains base files for Kazehakase.
@@ -165,7 +165,7 @@
 %if %{support_webkit}
 %package	webkit
 Summary:	Kazehakase browser using WebKit rendering engine
-Group:		Application/Internet
+Group:		Applications/Internet
 Requires:	%{name}-base = %{version}-%{release}
 
 %description	webkit
@@ -299,6 +299,7 @@
 %changelog
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
+- Fix Group tag (bug 486452)
 
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-1.5
 - Rebuild against newer gecko



From mtasaka at fedoraproject.org  Sat Apr 11 19:12:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 19:12:03 +0000 (UTC)
Subject: rpms/kazehakase/F-9 kazehakase.spec,1.72,1.73
Message-ID: <20090411191203.6AB9D70098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10234/F-9

Modified Files:
	kazehakase.spec 
Log Message:
Fix Group tag (bug 486452)


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kazehakase.spec	11 Apr 2009 17:18:45 -0000	1.72
+++ kazehakase.spec	11 Apr 2009 19:11:32 -0000	1.73
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -115,7 +115,7 @@
 
 %package	base
 Summary:	Base package of Kazehakase
-Group:		Application/Internet
+Group:		Applications/Internet
 
 %description	base
 This package contains base files for Kazehakase.
@@ -165,7 +165,7 @@
 %if %{support_webkit}
 %package	webkit
 Summary:	Kazehakase browser using WebKit rendering engine
-Group:		Application/Internet
+Group:		Applications/Internet
 Requires:	%{name}-base = %{version}-%{release}
 
 %description	webkit
@@ -299,6 +299,7 @@
 %changelog
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
+- Fix Group tag (bug 486452)
 
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-1.5
 - Rebuild against newer gecko



From mtasaka at fedoraproject.org  Sat Apr 11 19:13:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 19:13:07 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.74,1.75
Message-ID: <20090411191307.BDEBC70098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10590/F-10

Modified Files:
	kazehakase.spec 
Log Message:
And oops... orz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kazehakase.spec	11 Apr 2009 19:11:32 -0000	1.74
+++ kazehakase.spec	11 Apr 2009 19:12:37 -0000	1.75
@@ -297,7 +297,7 @@
 %endif
 
 %changelog
-* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
+* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-3
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
 - Fix Group tag (bug 486452)
 



From mtasaka at fedoraproject.org  Sat Apr 11 19:13:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 11 Apr 2009 19:13:08 +0000 (UTC)
Subject: rpms/kazehakase/F-9 kazehakase.spec,1.73,1.74
Message-ID: <20090411191308.0EC2770098@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10590/F-9

Modified Files:
	kazehakase.spec 
Log Message:
And oops... orz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kazehakase.spec	11 Apr 2009 19:11:32 -0000	1.73
+++ kazehakase.spec	11 Apr 2009 19:12:37 -0000	1.74
@@ -297,7 +297,7 @@
 %endif
 
 %changelog
-* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-2
+* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-3
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
 - Fix Group tag (bug 486452)
 



From pkgdb at fedoraproject.org  Sat Apr 11 19:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:28:50 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested commit
Message-ID: <20090411192850.A997B10F80D@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:28:51 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested approveacls
Message-ID: <20090411192851.7076110F872@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:00 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchcommits
Message-ID: <20090411192852.5FC7D10F876@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:13 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchcommits
Message-ID: <20090411192906.3E9FE10F878@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:11 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchbugzilla
Message-ID: <20090411192906.6B49510F87B@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:29:06 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested approveacls
Message-ID: <20090411192906.F0D4F10F87E@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:29:11 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchcommits
Message-ID: <20090411192911.AA82610F884@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:29:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:29:07 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested commit
Message-ID: <20090411192907.75A1F10F881@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:20 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested approveacls
Message-ID: <20090411192913.14F1010F887@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:20 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested commit
Message-ID: <20090411192914.9BD5D10F888@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:29:16 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchbugzilla
Message-ID: <20090411192916.6CC5910F889@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:21 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchbugzilla
Message-ID: <20090411192916.DD64E10F88B@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:26 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested commit
Message-ID: <20090411192919.2C89210F88D@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:29:19 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested approveacls
Message-ID: <20090411192919.DBD0110F891@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:29 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchcommits
Message-ID: <20090411192923.54A1810F894@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:34 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchbugzilla
Message-ID: <20090411192926.9D07B10F875@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:36 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested commit
Message-ID: <20090411192928.CBBB010F895@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:38 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested approveacls
Message-ID: <20090411192932.6AA3310F89A@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:41 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchcommits
Message-ID: <20090411192935.381BC10F89D@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:49 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchbugzilla
Message-ID: <20090411192941.DDE0310F87A@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:29:42 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchcommits
Message-ID: <20090411192942.CE33B10F89E@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:52 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested approveacls
Message-ID: <20090411192944.D6AC810F8A2@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:50 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested commit
Message-ID: <20090411192945.ACC2D10F8A5@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:30:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:30:56 +0000
Subject: [pkgdb] debmirror: cassmodiah has requested watchbugzilla
Message-ID: <20090411192950.C34F210F87F@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From trasher at fedoraproject.org  Sat Apr 11 19:32:27 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 11 Apr 2009 19:32:27 +0000 (UTC)
Subject: rpms/BackupPC/EL-5 BackupPC.spec,1.5,1.6
Message-ID: <20090411193227.4203B70098@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16058

Modified Files:
	BackupPC.spec 
Log Message:
Fix TopDir change (bug #473944)



Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/EL-5/BackupPC.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BackupPC.spec	23 Aug 2008 09:46:47 -0000	1.5
+++ BackupPC.spec	11 Apr 2009 19:31:55 -0000	1.6
@@ -6,8 +6,8 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        2%{?dist}
-Summary:        BackupPC - high-performance backup system
+Release:        3%{?dist}
+Summary:        High-performance backup system
 
 Group:          Applications/System
 License:        GPLv2+
@@ -16,6 +16,7 @@
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-3
+- Fix TopDir change (bug #473944)
+
 * Sat Aug 23 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-2
 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149)
 - correcting nologin path



From trasher at fedoraproject.org  Sat Apr 11 19:32:52 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 11 Apr 2009 19:32:52 +0000 (UTC)
Subject: rpms/BackupPC/EL-5 BackupPC-TopDir_change.patch,NONE,1.1
Message-ID: <20090411193252.F3AAF70098@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16795

Added Files:
	BackupPC-TopDir_change.patch 
Log Message:
Patch has been forgotten


BackupPC-TopDir_change.patch:

--- NEW FILE BackupPC-TopDir_change.patch ---
diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
@@ -152,8 +152,6 @@ sub new
     # Clean up %ENV and setup other variables.
     #
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
     if ( defined(my $error = $bpc->ConfigRead()) ) {
         print(STDERR $error, "\n");
         return;
@@ -167,6 +165,8 @@ sub new
         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
     }
     $bpc->{storage}->setPaths($paths);
+    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
 
     #
     # Verify we are running as the correct user



From pgordon at fedoraproject.org  Sat Apr 11 19:36:18 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sat, 11 Apr 2009 19:36:18 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore, 1.9, 1.10 midori.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <20090411193618.9F3D470098@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18071

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.5; temporarily disable single-instance support (broken with libunique 1.0.4) and temporarily switch to using the in-tarball waf to build (FTBFS otherwise, due to a python error).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Mar 2009 06:42:46 -0000	1.9
+++ .cvsignore	11 Apr 2009 19:36:16 -0000	1.10
@@ -1 +1 @@
-midori-0.1.4.tar.bz2
+midori-0.1.5.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- midori.spec	10 Mar 2009 16:32:22 -0000	1.19
+++ midori.spec	11 Apr 2009 19:36:16 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		midori
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -25,8 +25,9 @@
 BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	unique-devel
-BuildRequires:	waf >= 1.5
-BuildRequires:	WebKit-gtk-devel
+## XXX: Using the system waf makes it fail to build (python error).
+# BuildRequires:	waf >= 1.5
+BuildRequires:	webkitgtk-devel >= 1.1.1
 
 %description
 Midori is a lightweight web browser, and has many features expected of a
@@ -46,21 +47,22 @@
 %prep
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
-rm -rf waf
+#rm -rf waf
 
 
 %build
 export CFLAGS="%{optflags}"
-waf	--prefix=%{_usr}			\
+./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
-	configure
-waf %{?_smp_mflags} build
+	configure				\
+		--disable-unique
+./waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-waf --destdir=%{buildroot} install
+./waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -101,6 +103,13 @@
 
 
 %changelog
+* Sat Apr 11 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.5-2
+- Update to new upstream release (0.1.5): download support (with WebKitGTK
+  1.1.3+), a new "Colorful Tabs" extension, and saving of extension settings.
+- Temporarily switch to building using the in-tarball waf (FTBFS otherwise).
+- Temporarily disable libunique (single-instance) support, as it's broken
+  with libunique 1.0.4 (which is the current in rawhide).
+
 * Tue Mar 10 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.4-2
 - Build against the recently-updated libidn for proper IDN support.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Mar 2009 06:42:47 -0000	1.9
+++ sources	11 Apr 2009 19:36:16 -0000	1.10
@@ -1 +1 @@
-a9b21027ba894fed3055d7074c5f073d  midori-0.1.4.tar.bz2
+dccaddeb49d7def8a19cf497cb7eabf8  midori-0.1.5.tar.bz2



From trasher at fedoraproject.org  Sat Apr 11 19:38:52 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 11 Apr 2009 19:38:52 +0000 (UTC)
Subject: rpms/BackupPC/EL-4 BackupPC-TopDir_change.patch, NONE,
	1.1 BackupPC.spec, 1.6, 1.7
Message-ID: <20090411193852.D008270098@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/BackupPC/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19005

Modified Files:
	BackupPC.spec 
Added Files:
	BackupPC-TopDir_change.patch 
Log Message:
Fix TopDir change (bug #473944)


BackupPC-TopDir_change.patch:

--- NEW FILE BackupPC-TopDir_change.patch ---
diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
@@ -152,8 +152,6 @@ sub new
     # Clean up %ENV and setup other variables.
     #
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
     if ( defined(my $error = $bpc->ConfigRead()) ) {
         print(STDERR $error, "\n");
         return;
@@ -167,6 +165,8 @@ sub new
         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
     }
     $bpc->{storage}->setPaths($paths);
+    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
 
     #
     # Verify we are running as the correct user


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/EL-4/BackupPC.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BackupPC.spec	11 Aug 2008 16:11:39 -0000	1.6
+++ BackupPC.spec	11 Apr 2009 19:38:22 -0000	1.7
@@ -6,8 +6,8 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        3%{?dist}
-Summary:        BackupPC - high-performance backup system
+Release:        4%{?dist}
+Summary:        High-performance backup system
 
 Group:          Applications/System
 License:        GPLv2+
@@ -16,6 +16,7 @@
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-4
+- Fix TopDir change (bug #473944)
+
 * Mon Aug 11 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-3
 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149)
 



From hadess at fedoraproject.org  Sat Apr 11 19:40:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 11 Apr 2009 19:40:12 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.29, 1.30 bluez.spec, 1.57,
	1.58 sources, 
	1.29, 1.30 bluez-fix-audio-service-crasher.patch, 1.1,
	NONE bluez-fix-audio-service-disconnect.patch, 1.1, NONE
Message-ID: <20090411194012.03FD070098@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19528

Modified Files:
	.cvsignore bluez.spec sources 
Removed Files:
	bluez-fix-audio-service-crasher.patch 
	bluez-fix-audio-service-disconnect.patch 
Log Message:
* Sat Apr 11 2009 - Bastien Nocera <bnocera at redhat.com> - 4.35-1
- Update to 4.35



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	29 Mar 2009 21:15:06 -0000	1.29
+++ .cvsignore	11 Apr 2009 19:39:41 -0000	1.30
@@ -1 +1 @@
-bluez-4.34.tar.gz
+bluez-4.35.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- bluez.spec	3 Apr 2009 17:41:03 -0000	1.57
+++ bluez.spec	11 Apr 2009 19:39:41 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.34
-Release: 3%{?dist}
+Version: 4.35
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -14,10 +14,6 @@
 Patch2: bluez-try-utf8-harder.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1754
 Patch3: bluez-activate-wacom-mode2.patch
-# http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=457056310229911e820357470ee8fb30c82516da
-Patch4: bluez-fix-audio-service-crasher.patch
-# http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=1200c9362b09dcc0cd362c046b93c560a7a47256
-Patch5: bluez-fix-audio-service-disconnect.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -106,8 +102,6 @@
 %patch1 -p0 -b .oui
 %patch2 -p1 -b .non-utf8-name
 %patch3 -p1 -b .wacom
-%patch4 -p1 -b .audio-service-crasher
-%patch5 -p1 -b .audio-service-disconnect
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -200,6 +194,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sat Apr 11 2009 - Bastien Nocera <bnocera at redhat.com> - 4.35-1
+- Update to 4.35
+
 * Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.34-3
 - Avoid disconnecting audio devices straight after they're connected
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	29 Mar 2009 21:15:07 -0000	1.29
+++ sources	11 Apr 2009 19:39:41 -0000	1.30
@@ -1 +1 @@
-2435f7a932cdeecce01211e06142795f  bluez-4.34.tar.gz
+5919d6383cd9446f8b90fdca748dc961  bluez-4.35.tar.gz


--- bluez-fix-audio-service-crasher.patch DELETED ---


--- bluez-fix-audio-service-disconnect.patch DELETED ---



From rishi at fedoraproject.org  Sat Apr 11 19:45:36 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 19:45:36 +0000 (UTC)
Subject: rpms/glade3/devel glade3.spec,1.24,1.25
Message-ID: <20090411194536.692AB70098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21812

Modified Files:
	glade3.spec 
Log Message:
* Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-1
- Version bump to 3.6.1.
  * Fixed crash during internal widget selection.
  * Fixed Libglade regression. Libglade needs specific ordering of properties,
    ATK props, signals and accelerators.
  * Disable loading and displaying of 'data' property on GtkTreeStore. Only
    GtkListStore understands the 'data' construct.
  * Properly initialize a GValue on the stack. (GNOME Bugzilla #577822)
  * Translation updates: ar and cs.
  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.news
- Added 'Requires: devhelp' to glade3-libgladeui.
- Removed 'Requires: gtk2-devel >= 2.14.0 libxml2-devel pkgconfig' from
  glade3-libgladeui-devel.



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- glade3.spec	7 Apr 2009 04:16:52 -0000	1.24
+++ glade3.spec	11 Apr 2009 19:45:05 -0000	1.25
@@ -42,6 +42,8 @@
 License:	GPLv2+ and (GPLv2+ and LGPLv2+) and LGPLv2
 Group:		Development/Libraries
 
+Requires:	devhelp
+
 %description libgladeui
 Libgladeui consists of the widgets that compose the Glade GUI as a separate
 library to ease the integration of Glade into other applications.
@@ -53,10 +55,7 @@
 Group:		Development/Libraries
 
 Requires:	gtk-doc
-Requires:	gtk2-devel >= 2.14.0
 Requires:	%{name}-libgladeui = %{version}-%{release}
-Requires:	libxml2-devel
-Requires:	pkgconfig
 
 %description libgladeui-devel
 This package contains development files for %{name}-libgladeui.
@@ -202,6 +201,9 @@
   * Properly initialize a GValue on the stack. (GNOME Bugzilla #577822)
   * Translation updates: ar and cs.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.news
+- Added 'Requires: devhelp' to glade3-libgladeui.
+- Removed 'Requires: gtk2-devel >= 2.14.0 libxml2-devel pkgconfig' from
+  glade3-libgladeui-devel.
 
 * Tue Mar 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.0-1
 - Version bump to 3.6.0.



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:48 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195540.788DE10F871@bastion2.fedora.phx.redhat.com>

ruben has set the watchbugzilla acl on debmirror (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:55:42 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195542.B402E10F875@bastion2.fedora.phx.redhat.com>

ruben has set the watchcommits acl on debmirror (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:51 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195543.9007F10F878@bastion2.fedora.phx.redhat.com>

ruben has set the commit acl on debmirror (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:52 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195546.B6F3E10F87B@bastion2.fedora.phx.redhat.com>

ruben has set the approveacls acl on debmirror (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:59 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195554.08C5510F87C@bastion2.fedora.phx.redhat.com>

ruben has set the watchbugzilla acl on debmirror (Fedora 11) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:03 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195556.1ED2B10F87F@bastion2.fedora.phx.redhat.com>

ruben has set the watchcommits acl on debmirror (Fedora 11) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:06 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195558.BE49310F882@bastion2.fedora.phx.redhat.com>

ruben has set the approveacls acl on debmirror (Fedora 11) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:13 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195613.D570210F872@bastion2.fedora.phx.redhat.com>

ruben has set the watchcommits acl on debmirror (Fedora 10) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:06 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195601.70ADF10F871@bastion2.fedora.phx.redhat.com>

ruben has set the commit acl on debmirror (Fedora 11) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:14 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195614.E91AD10F876@bastion2.fedora.phx.redhat.com>

ruben has set the commit acl on debmirror (Fedora 10) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:22 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195616.1FA5310F886@bastion2.fedora.phx.redhat.com>

ruben has set the approveacls acl on debmirror (Fedora 10) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:22 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195616.50CD010F889@bastion2.fedora.phx.redhat.com>

ruben has set the watchbugzilla acl on debmirror (Fedora 10) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:18 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195618.23BB710F88D@bastion2.fedora.phx.redhat.com>

ruben has set the watchbugzilla acl on debmirror (Fedora 9) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:18 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195618.A470C10F88F@bastion2.fedora.phx.redhat.com>

ruben has set the watchcommits acl on debmirror (Fedora 9) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:27 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195620.3477110F892@bastion2.fedora.phx.redhat.com>

ruben has set the commit acl on debmirror (Fedora 9) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:22 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195622.2DCC710F896@bastion2.fedora.phx.redhat.com>

ruben has set the approveacls acl on debmirror (Fedora 9) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:24 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195624.BA0F410F879@bastion2.fedora.phx.redhat.com>

ruben has set the watchbugzilla acl on debmirror (Fedora EPEL 5) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:31 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195625.3A73510F897@bastion2.fedora.phx.redhat.com>

ruben has set the watchcommits acl on debmirror (Fedora EPEL 5) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:26 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195626.0B5BA10F89A@bastion2.fedora.phx.redhat.com>

ruben has set the commit acl on debmirror (Fedora EPEL 5) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:37 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195631.4468210F89D@bastion2.fedora.phx.redhat.com>

ruben has set the approveacls acl on debmirror (Fedora EPEL 5) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:42 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195635.05CED10F89F@bastion2.fedora.phx.redhat.com>

ruben has set the watchbugzilla acl on debmirror (Fedora EPEL 4) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:56:35 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195635.6485510F87E@bastion2.fedora.phx.redhat.com>

ruben has set the watchcommits acl on debmirror (Fedora EPEL 4) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:44 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195637.361C710F8A2@bastion2.fedora.phx.redhat.com>

ruben has set the commit acl on debmirror (Fedora EPEL 4) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Apr 11 19:57:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 19:57:46 +0000
Subject: [pkgdb] debmirror had acl change status
Message-ID: <20090411195640.DCE1E10F8A7@bastion2.fedora.phx.redhat.com>

ruben has set the approveacls acl on debmirror (Fedora EPEL 4) to Approved for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From hno at fedoraproject.org  Sat Apr 11 20:14:58 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 11 Apr 2009 20:14:58 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.27, 1.28 bzrtools.spec, 1.42,
	1.43 sources, 1.28, 1.29
Message-ID: <20090411201458.D3CEB70098@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31965

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
1.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	11 Mar 2009 19:01:15 -0000	1.27
+++ .cvsignore	11 Apr 2009 20:14:28 -0000	1.28
@@ -1 +1 @@
-bzrtools-1.13.0.tar.gz
+bzrtools-1.14.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- bzrtools.spec	11 Mar 2009 19:01:15 -0000	1.42
+++ bzrtools.spec	11 Apr 2009 20:14:28 -0000	1.43
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.13
-%define bzrnextver 1.14
+%define bzrver 1.14
+%define bzrnextver 1.15
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -16,7 +16,7 @@
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
-Source0:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/bzrtools/stable/%{bzrver}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Sat Apr 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14.0-1
+- Update to 1.14.0
+
 * Wed Mar 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.13.0-1
 - Update to 1.13.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	11 Mar 2009 19:01:15 -0000	1.28
+++ sources	11 Apr 2009 20:14:28 -0000	1.29
@@ -1 +1 @@
-dda51994e233c67175d7f9fb3f2bdc14  bzrtools-1.13.0.tar.gz
+f5b46f1c18301ce9264112375175e51f  bzrtools-1.14.0.tar.gz



From rishi at fedoraproject.org  Sat Apr 11 20:19:48 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 20:19:48 +0000 (UTC)
Subject: rpms/bouml/devel .cvsignore, 1.18, 1.19 bouml.spec, 1.26,
	1.27 sources, 1.20, 1.21 bouml-4.11-glibc210.patch, 1.1, NONE
Message-ID: <20090411201948.413F270098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1253

Modified Files:
	.cvsignore bouml.spec sources 
Removed Files:
	bouml-4.11-glibc210.patch 
Log Message:
* Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
- Version bump to 4.12.1.
  * Previous releases can not read a project saved with this version, but
    projects made by previous releases can be read.
  * Python Generator:
    + When a class referenced another one placed in the same python package,
      the python code generator wrongly produced <artifact name>.<class name>
      rather than <package name>.<artifact name>.<class name>. Fixed.
  * XMI2 Generator:
    + When an association is defined between a class and an actor, an
      unexpected and inconsistent attribute was generated. Fixed. 
  * When a class associated with a relation (for instance in case of a class
    relation) is deleted, the plug-out API operation
    UmlRelation::association() wrongly returned the deleted class. Fixed.
  * In a diagram when two elements were linked by a line (whatever it
    represented) and one of the elements contained the other one, the line was
    not drawn. This was mainly a problem in case of high-level transition from
    a composite state with a target inside the composite state. Fixed.
  * Changing the geometry of a junction between two instances in a
    communication diagram, without supporting a message, using the menu,
    produced a crash. Fixed.
  * Duplicating an activity might produce a crash. Fixed.
  * When any colour is assigned to an activity partition in horizontal display
    mode, closing and re-opening the diagram produced an error message and a
    part of the diagram was lost. Fixed.
  * In a state diagram it was possible to resize choices by selecting them
    with other elements and doing a resize. Ditto for decision and merge in an
    activity diagram. Fixed.
  * The virtual desktop set through the environment dialog was not taken into
    account. Fixed.
  * Added new US diagram formats: letter, legal, tabloid, letter landscape,
    legal landscape and ledger.
  * It is now possible to add marked elements in class, use case, component
    and deployment diagrams though the diagram menu entry add marked elements.
  * It is now possible to add related elements in diagram for a class, use
    case, package, component, artifact and deployment node. A related element
    is an element having a relation with the current element which can be
    shown in the current diagram and part of the browser.
  * http://bouml.free.fr/historic.html
- glibc-2.10 fixes accepted by upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 Feb 2009 04:21:08 -0000	1.18
+++ .cvsignore	11 Apr 2009 20:19:45 -0000	1.19
@@ -1 +1 @@
-bouml_4.11.tar.gz
+bouml_4.12.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bouml.spec	24 Feb 2009 13:28:20 -0000	1.26
+++ bouml.spec	11 Apr 2009 20:19:46 -0000	1.27
@@ -5,15 +5,13 @@
 
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.11
-Release:	2%{?dist}
+Version:	4.12.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
 Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-glibc210.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	hicolor-icon-theme
@@ -39,7 +37,6 @@
 
 %prep
 %setup -q -n %{name}_%{version}
-%patch0 -p1
 
 %build
 # To prevent failure on ppc64 and x86_64.
@@ -113,6 +110,47 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
+- Version bump to 4.12.1.
+  * Previous releases can not read a project saved with this version, but
+    projects made by previous releases can be read.
+  * Python Generator:
+    + When a class referenced another one placed in the same python package,
+      the python code generator wrongly produced <artifact name>.<class name>
+      rather than <package name>.<artifact name>.<class name>. Fixed.
+  * XMI2 Generator:
+    + When an association is defined between a class and an actor, an
+      unexpected and inconsistent attribute was generated. Fixed. 
+  * When a class associated with a relation (for instance in case of a class
+    relation) is deleted, the plug-out API operation
+    UmlRelation::association() wrongly returned the deleted class. Fixed.
+  * In a diagram when two elements were linked by a line (whatever it
+    represented) and one of the elements contained the other one, the line was
+    not drawn. This was mainly a problem in case of high-level transition from
+    a composite state with a target inside the composite state. Fixed.
+  * Changing the geometry of a junction between two instances in a
+    communication diagram, without supporting a message, using the menu,
+    produced a crash. Fixed.
+  * Duplicating an activity might produce a crash. Fixed.
+  * When any colour is assigned to an activity partition in horizontal display
+    mode, closing and re-opening the diagram produced an error message and a
+    part of the diagram was lost. Fixed.
+  * In a state diagram it was possible to resize choices by selecting them
+    with other elements and doing a resize. Ditto for decision and merge in an
+    activity diagram. Fixed.
+  * The virtual desktop set through the environment dialog was not taken into
+    account. Fixed.
+  * Added new US diagram formats: letter, legal, tabloid, letter landscape,
+    legal landscape and ledger.
+  * It is now possible to add marked elements in class, use case, component
+    and deployment diagrams though the diagram menu entry add marked elements.
+  * It is now possible to add related elements in diagram for a class, use
+    case, package, component, artifact and deployment node. A related element
+    is an element having a relation with the current element which can be
+    shown in the current diagram and part of the browser.
+  * http://bouml.free.fr/historic.html
+- glibc-2.10 fixes accepted by upstream.
+
 * Mon Feb 23 2009 Release Engineering <rel-eng at fedoraproject.org> - 4.11-2
 - Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -122,7 +160,7 @@
     projects made by previous releases can be read.
   * XMI2 Import and XMI2 Generator:
     + Forms produced / expected for provided and required interfaces and for
-      realizing classes were not the right ones, fixed.
+      realizing classes were not the right ones. Fixed.
     + Importing of forms produced by previous releases is not managed.
   * A crash might occur when the drawing setting is changed depending on the
     changes made before. Fixed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Feb 2009 04:21:08 -0000	1.20
+++ sources	11 Apr 2009 20:19:46 -0000	1.21
@@ -1 +1 @@
-cbb40e656f44eca7f3032d16c83b1862  bouml_4.11.tar.gz
+b7f5a90de1c7cfeeab8986e44e8037de  bouml_4.12.1.tar.gz


--- bouml-4.11-glibc210.patch DELETED ---



From rishi at fedoraproject.org  Sat Apr 11 20:22:28 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 20:22:28 +0000 (UTC)
Subject: rpms/bouml/F-9 .cvsignore, 1.18, 1.19 bouml.spec, 1.23, 1.24 sources,
	1.20, 1.21 bouml-4.11-glibc210.patch, 1.1, NONE
Message-ID: <20090411202229.6BD7870098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2405

Modified Files:
	.cvsignore bouml.spec sources 
Removed Files:
	bouml-4.11-glibc210.patch 
Log Message:
* Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
- Version bump to 4.12.1.
  * Previous releases can not read a project saved with this version, but
    projects made by previous releases can be read.
  * Python Generator:
    + When a class referenced another one placed in the same python package,
      the python code generator wrongly produced <artifact name>.<class name>
      rather than <package name>.<artifact name>.<class name>. Fixed.
  * XMI2 Generator:
    + When an association is defined between a class and an actor, an
      unexpected and inconsistent attribute was generated. Fixed. 
  * When a class associated with a relation (for instance in case of a class
    relation) is deleted, the plug-out API operation
    UmlRelation::association() wrongly returned the deleted class. Fixed.
  * In a diagram when two elements were linked by a line (whatever it
    represented) and one of the elements contained the other one, the line was
    not drawn. This was mainly a problem in case of high-level transition from
    a composite state with a target inside the composite state. Fixed.
  * Changing the geometry of a junction between two instances in a
    communication diagram, without supporting a message, using the menu,
    produced a crash. Fixed.
  * Duplicating an activity might produce a crash. Fixed.
  * When any colour is assigned to an activity partition in horizontal display
    mode, closing and re-opening the diagram produced an error message and a
    part of the diagram was lost. Fixed.
  * In a state diagram it was possible to resize choices by selecting them
    with other elements and doing a resize. Ditto for decision and merge in an
    activity diagram. Fixed.
  * The virtual desktop set through the environment dialog was not taken into
    account. Fixed.
  * Added new US diagram formats: letter, legal, tabloid, letter landscape,
    legal landscape and ledger.
  * It is now possible to add marked elements in class, use case, component
    and deployment diagrams though the diagram menu entry add marked elements.
  * It is now possible to add related elements in diagram for a class, use
    case, package, component, artifact and deployment node. A related element
    is an element having a relation with the current element which can be
    shown in the current diagram and part of the browser.
  * http://bouml.free.fr/historic.html
- glibc-2.10 fixes accepted by upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 Feb 2009 04:14:26 -0000	1.18
+++ .cvsignore	11 Apr 2009 20:21:55 -0000	1.19
@@ -1 +1 @@
-bouml_4.11.tar.gz
+bouml_4.12.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-9/bouml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bouml.spec	18 Feb 2009 04:14:26 -0000	1.23
+++ bouml.spec	11 Apr 2009 20:21:55 -0000	1.24
@@ -5,15 +5,13 @@
 
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.11
+Version:	4.12.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
 Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-glibc210.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	hicolor-icon-theme
@@ -39,7 +37,6 @@
 
 %prep
 %setup -q -n %{name}_%{version}
-%patch0 -p1
 
 %build
 # To prevent failure on ppc64 and x86_64.
@@ -113,13 +110,57 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
+- Version bump to 4.12.1.
+  * Previous releases can not read a project saved with this version, but
+    projects made by previous releases can be read.
+  * Python Generator:
+    + When a class referenced another one placed in the same python package,
+      the python code generator wrongly produced <artifact name>.<class name>
+      rather than <package name>.<artifact name>.<class name>. Fixed.
+  * XMI2 Generator:
+    + When an association is defined between a class and an actor, an
+      unexpected and inconsistent attribute was generated. Fixed. 
+  * When a class associated with a relation (for instance in case of a class
+    relation) is deleted, the plug-out API operation
+    UmlRelation::association() wrongly returned the deleted class. Fixed.
+  * In a diagram when two elements were linked by a line (whatever it
+    represented) and one of the elements contained the other one, the line was
+    not drawn. This was mainly a problem in case of high-level transition from
+    a composite state with a target inside the composite state. Fixed.
+  * Changing the geometry of a junction between two instances in a
+    communication diagram, without supporting a message, using the menu,
+    produced a crash. Fixed.
+  * Duplicating an activity might produce a crash. Fixed.
+  * When any colour is assigned to an activity partition in horizontal display
+    mode, closing and re-opening the diagram produced an error message and a
+    part of the diagram was lost. Fixed.
+  * In a state diagram it was possible to resize choices by selecting them
+    with other elements and doing a resize. Ditto for decision and merge in an
+    activity diagram. Fixed.
+  * The virtual desktop set through the environment dialog was not taken into
+    account. Fixed.
+  * Added new US diagram formats: letter, legal, tabloid, letter landscape,
+    legal landscape and ledger.
+  * It is now possible to add marked elements in class, use case, component
+    and deployment diagrams though the diagram menu entry add marked elements.
+  * It is now possible to add related elements in diagram for a class, use
+    case, package, component, artifact and deployment node. A related element
+    is an element having a relation with the current element which can be
+    shown in the current diagram and part of the browser.
+  * http://bouml.free.fr/historic.html
+- glibc-2.10 fixes accepted by upstream.
+
+* Mon Feb 23 2009 Release Engineering <rel-eng at fedoraproject.org> - 4.11-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.11-1
 - Version bump to 4.11.
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * XMI2 Import and XMI2 Generator:
     + Forms produced / expected for provided and required interfaces and for
-      realizing classes were not the right ones, fixed.
+      realizing classes were not the right ones. Fixed.
     + Importing of forms produced by previous releases is not managed.
   * A crash might occur when the drawing setting is changed depending on the
     changes made before. Fixed.
@@ -139,7 +180,7 @@
 - Fixed build failure with glibc-2.10.
 
 * Sat Nov 22 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.8.3-1
-- Version bump to 4.8.3. Closes Red Hat Bugzilla bug #472408.
+- Version bump to 4.8.3. (Red Hat Bugzilla #472408)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * Modification of some generation settings through a plug-out could produce a
@@ -153,7 +194,7 @@
 - Shortened summary to suit PackageKit's UI.
 
 * Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
-- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
+- Version bump to 4.5. (Red Hat Bugzilla #460528)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * Loading a project containing a modelled class instance (part of the
@@ -164,11 +205,11 @@
   * http://bouml.free.fr/historic.html
 
 * Sun Jun 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.5-1
-- Version bump to 4.3.5. Closes Red Hat Bugzilla bug #448520.
+- Version bump to 4.3.5. (Red Hat Bugzilla #448520)
   * http://bouml.free.fr/historic.html
 
 * Wed May 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.3-1
-- Version bump to 4.3.3. Closes Red Hat Bugzilla bug #445908.
+- Version bump to 4.3.3. (Red Hat Bugzilla #445908)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * Plug-out:
@@ -179,10 +220,10 @@
 
 * Sun Apr 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.2-2
 - Replaced 'BuildRequires: qt-devel' with 'Buildrequires: qt3-devel' on all
-  distributions starting from Fedora 9. Closes Red Hat Bugzilla bug #440750.
+  distributions starting from Fedora 9. (Red Hat Bugzilla #440750)
 
 * Fri Feb 22 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.2-1
-- Version bump to 4.2. Closes Red Hat Bugzilla bug #434284.
+- Version bump to 4.2. (Red Hat Bugzilla #434284)
   * Introduced Python support.
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
@@ -197,19 +238,19 @@
 - Autorebuild for gcc-4.3.
 
 * Wed Jan 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.5-1
-- Version bump to 3.5. Closes Red Hat Bugzilla bug #428840.
+- Version bump to 3.5. (Red Hat Bugzilla #428840)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * http://bouml.free.fr/historic.html
 
 * Fri Dec 21 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.4-1
-- Version bump to 3.4. Closes Red Hat Bugzilla bug #426485.
+- Version bump to 3.4. (Red Hat Bugzilla #426485)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * http://bouml.free.fr/historic.html
 
 * Thu Nov 29 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.3.3-1
-- Version bump to 3.3.3. Closes Red Hat Bugzilla bug #398811.
+- Version bump to 3.3.3. (Red Hat Bugzilla #398811)
   * http://bouml.free.fr/historic.html
 - Fixed usage of _remove_encoding to prevent failure on Fedora 7.
 
@@ -224,7 +265,7 @@
 - Removed Encoding from Desktop Entry.
 
 * Sun Nov 04 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.0.2-1
-- Version bump to 3.0.2. Closes Red Hat Bugzilla bug #326641.
+- Version bump to 3.0.2. (Red Hat Bugzilla #326641)
   * Introduced PHP support.
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
@@ -232,17 +273,17 @@
 - Backported bug-fix from 3.3.
 
 * Thu Oct 11 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.32-1
-- Version bump to 2.32. Closes Red Hat Bugzilla bug #303721.
+- Version bump to 2.32. (Red Hat Bugzilla #303721)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * http://bouml.free.fr/historic_old.html
 
 * Wed Oct 03 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.3-1
-- Version bump to 2.31.3. Closes Red Hat Bugzilla bug #292541.
+- Version bump to 2.31.3. (Red Hat Bugzilla #292541)
   * http://bouml.free.fr/historic_old.html
 
 * Fri Sep 14 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.2-1
-- Version bump to 2.31.2. Closes Red Hat Bugzilla bug #286661.
+- Version bump to 2.31.2. (Red Hat Bugzilla bug #286661)
   * http://bouml.free.fr/historic_old.html
 
 * Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Feb 2009 04:14:26 -0000	1.20
+++ sources	11 Apr 2009 20:21:55 -0000	1.21
@@ -1 +1 @@
-cbb40e656f44eca7f3032d16c83b1862  bouml_4.11.tar.gz
+b7f5a90de1c7cfeeab8986e44e8037de  bouml_4.12.1.tar.gz


--- bouml-4.11-glibc210.patch DELETED ---



From rishi at fedoraproject.org  Sat Apr 11 20:25:13 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 20:25:13 +0000 (UTC)
Subject: rpms/bouml/F-10 .cvsignore, 1.18, 1.19 bouml.spec, 1.24,
	1.25 sources, 1.20, 1.21 bouml-4.11-glibc210.patch, 1.1, NONE
Message-ID: <20090411202513.CF41A70098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3551

Modified Files:
	.cvsignore bouml.spec sources 
Removed Files:
	bouml-4.11-glibc210.patch 
Log Message:
* Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
- Version bump to 4.12.1.
  * Previous releases can not read a project saved with this version, but
    projects made by previous releases can be read.
  * Python Generator:
    + When a class referenced another one placed in the same python package,
      the python code generator wrongly produced <artifact name>.<class name>
      rather than <package name>.<artifact name>.<class name>. Fixed.
  * XMI2 Generator:
    + When an association is defined between a class and an actor, an
      unexpected and inconsistent attribute was generated. Fixed. 
  * When a class associated with a relation (for instance in case of a class
    relation) is deleted, the plug-out API operation
    UmlRelation::association() wrongly returned the deleted class. Fixed.
  * In a diagram when two elements were linked by a line (whatever it
    represented) and one of the elements contained the other one, the line was
    not drawn. This was mainly a problem in case of high-level transition from
    a composite state with a target inside the composite state. Fixed.
  * Changing the geometry of a junction between two instances in a
    communication diagram, without supporting a message, using the menu,
    produced a crash. Fixed.
  * Duplicating an activity might produce a crash. Fixed.
  * When any colour is assigned to an activity partition in horizontal display
    mode, closing and re-opening the diagram produced an error message and a
    part of the diagram was lost. Fixed.
  * In a state diagram it was possible to resize choices by selecting them
    with other elements and doing a resize. Ditto for decision and merge in an
    activity diagram. Fixed.
  * The virtual desktop set through the environment dialog was not taken into
    account. Fixed.
  * Added new US diagram formats: letter, legal, tabloid, letter landscape,
    legal landscape and ledger.
  * It is now possible to add marked elements in class, use case, component
    and deployment diagrams though the diagram menu entry add marked elements.
  * It is now possible to add related elements in diagram for a class, use
    case, package, component, artifact and deployment node. A related element
    is an element having a relation with the current element which can be
    shown in the current diagram and part of the browser.
  * http://bouml.free.fr/historic.html
- glibc-2.10 fixes accepted by upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 Feb 2009 04:18:09 -0000	1.18
+++ .cvsignore	11 Apr 2009 20:24:42 -0000	1.19
@@ -1 +1 @@
-bouml_4.11.tar.gz
+bouml_4.12.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-10/bouml.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bouml.spec	18 Feb 2009 04:18:09 -0000	1.24
+++ bouml.spec	11 Apr 2009 20:24:43 -0000	1.25
@@ -5,15 +5,13 @@
 
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
-Version:	4.11
+Version:	4.12.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
 Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-glibc210.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	hicolor-icon-theme
@@ -39,7 +37,6 @@
 
 %prep
 %setup -q -n %{name}_%{version}
-%patch0 -p1
 
 %build
 # To prevent failure on ppc64 and x86_64.
@@ -113,13 +110,57 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Wed Apr 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.12.1-1
+- Version bump to 4.12.1.
+  * Previous releases can not read a project saved with this version, but
+    projects made by previous releases can be read.
+  * Python Generator:
+    + When a class referenced another one placed in the same python package,
+      the python code generator wrongly produced <artifact name>.<class name>
+      rather than <package name>.<artifact name>.<class name>. Fixed.
+  * XMI2 Generator:
+    + When an association is defined between a class and an actor, an
+      unexpected and inconsistent attribute was generated. Fixed. 
+  * When a class associated with a relation (for instance in case of a class
+    relation) is deleted, the plug-out API operation
+    UmlRelation::association() wrongly returned the deleted class. Fixed.
+  * In a diagram when two elements were linked by a line (whatever it
+    represented) and one of the elements contained the other one, the line was
+    not drawn. This was mainly a problem in case of high-level transition from
+    a composite state with a target inside the composite state. Fixed.
+  * Changing the geometry of a junction between two instances in a
+    communication diagram, without supporting a message, using the menu,
+    produced a crash. Fixed.
+  * Duplicating an activity might produce a crash. Fixed.
+  * When any colour is assigned to an activity partition in horizontal display
+    mode, closing and re-opening the diagram produced an error message and a
+    part of the diagram was lost. Fixed.
+  * In a state diagram it was possible to resize choices by selecting them
+    with other elements and doing a resize. Ditto for decision and merge in an
+    activity diagram. Fixed.
+  * The virtual desktop set through the environment dialog was not taken into
+    account. Fixed.
+  * Added new US diagram formats: letter, legal, tabloid, letter landscape,
+    legal landscape and ledger.
+  * It is now possible to add marked elements in class, use case, component
+    and deployment diagrams though the diagram menu entry add marked elements.
+  * It is now possible to add related elements in diagram for a class, use
+    case, package, component, artifact and deployment node. A related element
+    is an element having a relation with the current element which can be
+    shown in the current diagram and part of the browser.
+  * http://bouml.free.fr/historic.html
+- glibc-2.10 fixes accepted by upstream.
+
+* Mon Feb 23 2009 Release Engineering <rel-eng at fedoraproject.org> - 4.11-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 4.11-1
 - Version bump to 4.11.
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * XMI2 Import and XMI2 Generator:
     + Forms produced / expected for provided and required interfaces and for
-      realizing classes were not the right ones, fixed.
+      realizing classes were not the right ones. Fixed.
     + Importing of forms produced by previous releases is not managed.
   * A crash might occur when the drawing setting is changed depending on the
     changes made before. Fixed.
@@ -139,7 +180,7 @@
 - Fixed build failure with glibc-2.10.
 
 * Sat Nov 22 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.8.3-1
-- Version bump to 4.8.3. Closes Red Hat Bugzilla bug #472408.
+- Version bump to 4.8.3. (Red Hat Bugzilla #472408)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * Modification of some generation settings through a plug-out could produce a
@@ -153,7 +194,7 @@
 - Shortened summary to suit PackageKit's UI.
 
 * Sat Sep 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.5-1
-- Version bump to 4.5. Closes Red Hat Bugzilla bug #460528.
+- Version bump to 4.5. (Red Hat Bugzilla #460528)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * Loading a project containing a modelled class instance (part of the
@@ -164,11 +205,11 @@
   * http://bouml.free.fr/historic.html
 
 * Sun Jun 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.5-1
-- Version bump to 4.3.5. Closes Red Hat Bugzilla bug #448520.
+- Version bump to 4.3.5. (Red Hat Bugzilla #448520)
   * http://bouml.free.fr/historic.html
 
 * Wed May 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.3.3-1
-- Version bump to 4.3.3. Closes Red Hat Bugzilla bug #445908.
+- Version bump to 4.3.3. (Red Hat Bugzilla #445908)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * Plug-out:
@@ -179,10 +220,10 @@
 
 * Sun Apr 06 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.2-2
 - Replaced 'BuildRequires: qt-devel' with 'Buildrequires: qt3-devel' on all
-  distributions starting from Fedora 9. Closes Red Hat Bugzilla bug #440750.
+  distributions starting from Fedora 9. (Red Hat Bugzilla #440750)
 
 * Fri Feb 22 2008 Debarshi Ray <rishi at fedoraproject.org> - 4.2-1
-- Version bump to 4.2. Closes Red Hat Bugzilla bug #434284.
+- Version bump to 4.2. (Red Hat Bugzilla #434284)
   * Introduced Python support.
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
@@ -197,19 +238,19 @@
 - Autorebuild for gcc-4.3.
 
 * Wed Jan 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.5-1
-- Version bump to 3.5. Closes Red Hat Bugzilla bug #428840.
+- Version bump to 3.5. (Red Hat Bugzilla #428840)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * http://bouml.free.fr/historic.html
 
 * Fri Dec 21 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.4-1
-- Version bump to 3.4. Closes Red Hat Bugzilla bug #426485.
+- Version bump to 3.4. (Red Hat Bugzilla #426485)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * http://bouml.free.fr/historic.html
 
 * Thu Nov 29 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.3.3-1
-- Version bump to 3.3.3. Closes Red Hat Bugzilla bug #398811.
+- Version bump to 3.3.3. (Red Hat Bugzilla #398811)
   * http://bouml.free.fr/historic.html
 - Fixed usage of _remove_encoding to prevent failure on Fedora 7.
 
@@ -224,7 +265,7 @@
 - Removed Encoding from Desktop Entry.
 
 * Sun Nov 04 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.0.2-1
-- Version bump to 3.0.2. Closes Red Hat Bugzilla bug #326641.
+- Version bump to 3.0.2. (Red Hat Bugzilla #326641)
   * Introduced PHP support.
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
@@ -232,17 +273,17 @@
 - Backported bug-fix from 3.3.
 
 * Thu Oct 11 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.32-1
-- Version bump to 2.32. Closes Red Hat Bugzilla bug #303721.
+- Version bump to 2.32. (Red Hat Bugzilla #303721)
   * Previous releases can not read a project saved with this version, but
     projects made by previous releases can be read.
   * http://bouml.free.fr/historic_old.html
 
 * Wed Oct 03 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.3-1
-- Version bump to 2.31.3. Closes Red Hat Bugzilla bug #292541.
+- Version bump to 2.31.3. (Red Hat Bugzilla #292541)
   * http://bouml.free.fr/historic_old.html
 
 * Fri Sep 14 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.2-1
-- Version bump to 2.31.2. Closes Red Hat Bugzilla bug #286661.
+- Version bump to 2.31.2. (Red Hat Bugzilla bug #286661)
   * http://bouml.free.fr/historic_old.html
 
 * Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Feb 2009 04:18:09 -0000	1.20
+++ sources	11 Apr 2009 20:24:43 -0000	1.21
@@ -1 +1 @@
-cbb40e656f44eca7f3032d16c83b1862  bouml_4.11.tar.gz
+b7f5a90de1c7cfeeab8986e44e8037de  bouml_4.12.1.tar.gz


--- bouml-4.11-glibc210.patch DELETED ---



From hno at fedoraproject.org  Sat Apr 11 20:40:31 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 11 Apr 2009 20:40:31 +0000 (UTC)
Subject: rpms/bzr/devel bzr.spec,1.55,1.56
Message-ID: <20090411204031.3208970098@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9607

Modified Files:
	bzr.spec 
Log Message:
build-dep zlib-devel


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- bzr.spec	11 Apr 2009 20:37:19 -0000	1.55
+++ bzr.spec	11 Apr 2009 20:40:00 -0000	1.56
@@ -89,6 +89,9 @@
 %endif
 
 %changelog
+* Sat Apr 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.2.rc1
+- Correct build dependencies
+
 * Thu Apr 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.1.rc1
 - Update to 1.14rc1
 



From bochecha at fedoraproject.org  Sat Apr 11 20:42:50 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sat, 11 Apr 2009 20:42:50 +0000 (UTC)
Subject: rpms/nafees-web-naskh-fonts/devel
	nafees-web-naskh-update-preferred-family.pe, NONE,
	1.1 .cvsignore, 1.2, 1.3 nafees-web-naskh-fonts.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090411204250.741B370098@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/nafees-web-naskh-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10248

Modified Files:
	.cvsignore nafees-web-naskh-fonts.spec sources 
Added Files:
	nafees-web-naskh-update-preferred-family.pe 
Log Message:
Updated to 1.2 release and fixed RHBZ#490830 with a fontforge script, while not fixed upstream.




--- NEW FILE nafees-web-naskh-update-preferred-family.pe ---
#!/usr/bin/fontforge 


fontfile = $1
Open(fontfile)

SetTTFName(0x409, 16, 'Nafees Web Naskh')

Generate('NafeesWeb.ttf')
Close()



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nafees-web-naskh-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2007 03:50:20 -0000	1.2
+++ .cvsignore	11 Apr 2009 20:42:19 -0000	1.3
@@ -1 +1 @@
-NafeesWeb-20070820.zip
+nafees-web-naskh-20080509.zip


Index: nafees-web-naskh-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nafees-web-naskh-fonts/devel/nafees-web-naskh-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nafees-web-naskh-fonts.spec	26 Feb 2009 04:06:04 -0000	1.5
+++ nafees-web-naskh-fonts.spec	11 Apr 2009 20:42:19 -0000	1.6
@@ -1,21 +1,30 @@
 %define fontname        nafees-web-naskh
 %define archivename     NafeesWeb
-%define archivedate     20070820
+%define archivedate     20080509
 
 Name:           %{fontname}-fonts
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.2
+Release:        2%{?dist}
 Summary:        Nafees Web font for writing Urdu in the Naskh script 
 
 Group:          User Interface/X
 License:        Bitstream Vera
 URL:            http://www.crulp.org/Downloads/NafeesWeb.zip
-# NOTE: the original archive is unversioned, so we rename it to add a date stamp
-Source0:        %{archivename}-%{archivedate}.zip
+
+## NOTE: the original archive is unversioned, so we rename it to add a date stamp
+# The Source0 is obtained by doing the following:
+# $ wget -S http://www.crulp.org/Downloads/NafeesWeb.zip
+# $ mv %{archivename} %{fontname}-%{archivedate}.zip
+Source0:        %{fontname}-%{archivedate}.zip
+
+## Fix RHBZ# while not fixed upstream
+Source1:        %{fontname}-update-preferred-family.pe
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 Requires:       fontpackages-filesystem
 BuildRequires:  fontpackages-devel
+BuildRequires:  fontforge
 
 %description
 
@@ -29,7 +38,8 @@
 %setup -q -c
 
 %build
-#nop
+# Fix RHBZ#490830 while not fixed upstream
+%{_bindir}/fontforge %{SOURCE1} %{archivename}.ttf
 
 %install
 rm -rf %{buildroot}
@@ -48,6 +58,13 @@
 %dir %{_fontdir}
 
 %changelog
+* Sat Apr 11 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2-2
+- added comment explaining how the source is obtained (as it is modified from upstream)
+- temporary fix for RHBZ#490830 while not fixed upstream
+
+* Sat Apr 11 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2-1
+- update to 1.2 release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nafees-web-naskh-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2007 03:50:20 -0000	1.2
+++ sources	11 Apr 2009 20:42:19 -0000	1.3
@@ -1 +1 @@
-ad8bc7947df986d30306868f7a9c6096  NafeesWeb-20070820.zip
+ad8bc7947df986d30306868f7a9c6096  nafees-web-naskh-20080509.zip



From bochecha at fedoraproject.org  Sat Apr 11 20:58:52 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sat, 11 Apr 2009 20:58:52 +0000 (UTC)
Subject: rpms/nafees-web-naskh-fonts/F-10
	nafees-web-naskh-update-preferred-family.pe, NONE,
	1.1 .cvsignore, 1.2, 1.3 nafees-web-naskh-fonts.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090411205852.BD03670098@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/nafees-web-naskh-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15024

Modified Files:
	.cvsignore nafees-web-naskh-fonts.spec sources 
Added Files:
	nafees-web-naskh-update-preferred-family.pe 
Log Message:
Update to 1.2 release and fix RHBZ#490830 with a fontforge script while not fixed upstream.




--- NEW FILE nafees-web-naskh-update-preferred-family.pe ---
#!/usr/bin/fontforge 


fontfile = $1
Open(fontfile)

SetTTFName(0x409, 16, 'Nafees Web Naskh')

Generate('NafeesWeb.ttf')
Close()



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nafees-web-naskh-fonts/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2007 03:50:20 -0000	1.2
+++ .cvsignore	11 Apr 2009 20:58:21 -0000	1.3
@@ -1 +1 @@
-NafeesWeb-20070820.zip
+nafees-web-naskh-20080509.zip


Index: nafees-web-naskh-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nafees-web-naskh-fonts/F-10/nafees-web-naskh-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nafees-web-naskh-fonts.spec	6 Oct 2007 03:50:20 -0000	1.1
+++ nafees-web-naskh-fonts.spec	11 Apr 2009 20:58:21 -0000	1.2
@@ -1,21 +1,30 @@
+%define fontname        nafees-web-naskh
 %define archivename     NafeesWeb
-%define archivedate     20070820
-%define fontdir         %{_datadir}/fonts/nafees
+%define archivedate     20080509
 
-Name:           nafees-web-naskh-fonts
-Version:        1.0
-Release:        1%{?dist}
+Name:           %{fontname}-fonts
+Version:        1.2
+Release:        2%{?dist}
 Summary:        Nafees Web font for writing Urdu in the Naskh script 
 
 Group:          User Interface/X
 License:        Bitstream Vera
 URL:            http://www.crulp.org/Downloads/NafeesWeb.zip
-# NOTE: the original archive is unversioned, so we rename it to add a date stamp
-Source0:        %{archivename}-%{archivedate}.zip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## NOTE: the original archive is unversioned, so we rename it to add a date stamp
+# The Source0 is obtained by doing the following:
+# $ wget -S http://www.crulp.org/Downloads/NafeesWeb.zip
+# $ mv %{archivename} %{fontname}-%{archivedate}.zip
+Source0:        %{fontname}-%{archivedate}.zip
+
+## Fix RHBZ# while not fixed upstream
+Source1:        %{fontname}-update-preferred-family.pe
+
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-Provides:       nafees-web-naskh-fonts = %{version}-%{release}
-Requires:       fontconfig
+Requires:       fontpackages-filesystem
+BuildRequires:  fontpackages-devel
+BuildRequires:  fontforge
 
 %description
 
@@ -29,41 +38,44 @@
 %setup -q -c
 
 %build
-#nop
+# Fix RHBZ#490830 while not fixed upstream
+%{_bindir}/fontforge %{SOURCE1} %{archivename}.ttf
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 #fonts
-install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
-install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
+install -d -m 0755 %{buildroot}%{_fontdir}
+install -m 0644 *.ttf %{buildroot}%{_fontdir}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
+%_font_pkg *.ttf
 
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{fontdir}
-fi
+%doc
+%dir %{_fontdir}
 
+%changelog
+* Sat Apr 11 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2-2
+- added comment explaining how the source is obtained (as it is modified from upstream)
+- temporary fix for RHBZ#490830 while not fixed upstream
 
-%postun
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{fontdir}
-  fi
-fi
+* Sat Apr 11 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2-1
+- update to 1.2 release
 
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-%files
-%defattr(0644,root,root,0755)
+* Sun Dec 21 2008 Bernie Innocenti <bernie at codewiz.org> 1.0-4
+- Builddep on fontpackages-devel
 
-%dir %{fontdir}
-%{fontdir}/*.ttf
+* Sun Dec 21 2008 Bernie Innocenti <bernie at codewiz.org> 1.0-3
+- Typo: fontdir -> _fontdir
 
+* Sun Dec 21 2008 Bernie Innocenti <bernie at codewiz.org> 1.0-2
+- Updated to current Fedora font packaging guidelines
 
-%changelog
 * Sat Sep 15 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
 - Initial packaging, borrowing many things from abyssinica-fonts


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nafees-web-naskh-fonts/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2007 03:50:20 -0000	1.2
+++ sources	11 Apr 2009 20:58:21 -0000	1.3
@@ -1 +1 @@
-ad8bc7947df986d30306868f7a9c6096  NafeesWeb-20070820.zip
+ad8bc7947df986d30306868f7a9c6096  nafees-web-naskh-20080509.zip



From jjh at fedoraproject.org  Sat Apr 11 21:20:48 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 21:20:48 +0000 (UTC)
Subject: rpms/beanstalkd/devel .cvsignore, 1.3, 1.4 beanstalkd.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090411212048.2148470098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23370

Modified Files:
	.cvsignore beanstalkd.spec sources 
Log Message:
update to upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Feb 2009 04:17:47 -0000	1.3
+++ .cvsignore	11 Apr 2009 21:20:15 -0000	1.4
@@ -1 +1 @@
-beanstalkd-1.2.tar.gz
+beanstalkd-1.3.tar.gz


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beanstalkd.spec	24 Feb 2009 04:23:10 -0000	1.3
+++ beanstalkd.spec	11 Apr 2009 21:20:16 -0000	1.4
@@ -4,8 +4,8 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.2
-Release:        2%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        A fast, distributed, in-memory workqueue service
 
 Group:          System Environment/Daemons
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
+- update to upstream 1.3
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2009 04:17:47 -0000	1.3
+++ sources	11 Apr 2009 21:20:16 -0000	1.4
@@ -1 +1 @@
-7b30b840069e679526e564b42796630b  beanstalkd-1.2.tar.gz
+de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:10:21 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:10:21 +0000 (UTC)
Subject: rpms/beanstalkd/F-9 .cvsignore, 1.2, 1.3 beanstalkd.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090411221022.05D9970098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/F-9

Modified Files:
	.cvsignore beanstalkd.spec sources 
Log Message:
update to upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 05:12:38 -0000	1.2
+++ .cvsignore	11 Apr 2009 22:10:20 -0000	1.3
@@ -1 +1 @@
-beanstalkd-1.1.tar.gz
+beanstalkd-1.3.tar.gz


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-9/beanstalkd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beanstalkd.spec	18 Feb 2009 04:35:50 -0000	1.2
+++ beanstalkd.spec	11 Apr 2009 22:10:20 -0000	1.3
@@ -4,7 +4,7 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        A fast, distributed, in-memory workqueue service
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
+- update to upstream 1.3
+
 * Tue Feb 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.2-1
 - update to upstream 1.2
 - remove man page source as it was incorporated upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2009 04:35:50 -0000	1.3
+++ sources	11 Apr 2009 22:10:20 -0000	1.4
@@ -1 +1 @@
-7b30b840069e679526e564b42796630b  beanstalkd-1.2.tar.gz
+de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:10:52 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:10:52 +0000 (UTC)
Subject: rpms/beanstalkd/EL-5 .cvsignore, 1.2, 1.3 beanstalkd.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090411221054.9C76270126@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/EL-5

Modified Files:
	.cvsignore beanstalkd.spec sources 
Log Message:
update to upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 05:04:53 -0000	1.2
+++ .cvsignore	11 Apr 2009 22:10:19 -0000	1.3
@@ -1 +1 @@
-beanstalkd-1.1.tar.gz
+beanstalkd-1.3.tar.gz


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beanstalkd.spec	18 Feb 2009 04:35:49 -0000	1.2
+++ beanstalkd.spec	11 Apr 2009 22:10:19 -0000	1.3
@@ -4,7 +4,7 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        A fast, distributed, in-memory workqueue service
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
+- update to upstream 1.3
+
 * Tue Feb 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.2-1
 - update to upstream 1.2
 - remove man page source as it was incorporated upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2009 04:35:49 -0000	1.3
+++ sources	11 Apr 2009 22:10:19 -0000	1.4
@@ -1 +1 @@
-7b30b840069e679526e564b42796630b  beanstalkd-1.2.tar.gz
+de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:10:51 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:10:51 +0000 (UTC)
Subject: rpms/beanstalkd/F-10 .cvsignore, 1.2, 1.3 beanstalkd.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090411221054.7B8A570098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/F-10

Modified Files:
	.cvsignore beanstalkd.spec sources 
Log Message:
update to upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 05:11:20 -0000	1.2
+++ .cvsignore	11 Apr 2009 22:10:20 -0000	1.3
@@ -1 +1 @@
-beanstalkd-1.1.tar.gz
+beanstalkd-1.3.tar.gz


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/beanstalkd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beanstalkd.spec	18 Feb 2009 04:35:50 -0000	1.2
+++ beanstalkd.spec	11 Apr 2009 22:10:20 -0000	1.3
@@ -4,7 +4,7 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        A fast, distributed, in-memory workqueue service
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
+- update to upstream 1.3
+
 * Tue Feb 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.2-1
 - update to upstream 1.2
 - remove man page source as it was incorporated upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2009 04:35:50 -0000	1.3
+++ sources	11 Apr 2009 22:10:20 -0000	1.4
@@ -1 +1 @@
-7b30b840069e679526e564b42796630b  beanstalkd-1.2.tar.gz
+de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz



From karsten at fedoraproject.org  Sat Apr 11 22:12:55 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sat, 11 Apr 2009 22:12:55 +0000 (UTC)
Subject: rpms/mdbtools/devel mdbtools.spec,1.4,1.5
Message-ID: <20090411221255.379E570098@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/mdbtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8848

Modified Files:
	mdbtools.spec 
Log Message:
- bump and rebuild for current unixODBC libs


Index: mdbtools.spec
===================================================================
RCS file: /cvs/extras/rpms/mdbtools/devel/mdbtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mdbtools.spec	26 Feb 2009 00:04:29 -0000	1.4
+++ mdbtools.spec	11 Apr 2009 22:12:24 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           mdbtools
 Version:        0.6
-Release:        0.6.cvs20051109%{?dist}
+Release:        0.6.cvs20051109%{?dist}.1
 Summary:        Access data stored in Microsoft Access databases
 Group:          Applications/Databases
 License:        GPLv2+
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Karsten Hopp <karsten at redhat.com> 0.6-0.6.cvs20051109.1
+- bump and rebuild for current unixODBC libs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-0.6.cvs20051109
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From oget at fedoraproject.org  Sat Apr 11 22:17:52 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 11 Apr 2009 22:17:52 +0000 (UTC)
Subject: rpms/pdf-renderer/devel .cvsignore, 1.3, 1.4 pdf-renderer.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090411221752.1B20970098@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pdf-renderer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10501

Modified Files:
	.cvsignore pdf-renderer.spec sources 
Log Message:
* Sat Apr 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.5.20090405cvs
- New cvs checkout



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2009 04:09:24 -0000	1.3
+++ .cvsignore	11 Apr 2009 22:17:21 -0000	1.4
@@ -1 +1 @@
-PDFRenderer-2009_01_18-src.zip
+PDFRenderer-2009_04_05-src.zip


Index: pdf-renderer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/pdf-renderer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pdf-renderer.spec	26 Feb 2009 10:17:19 -0000	1.3
+++ pdf-renderer.spec	11 Apr 2009 22:17:21 -0000	1.4
@@ -1,16 +1,16 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%define alternate_name PDFRenderer
-%define cvs_version 2009_01_18
-%define release_number 0.4.20090118cvs%{?dist}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global alternate_name PDFRenderer
+%global cvs_version 2009_04_05
+%global cvs_rel .%(echo %{cvs_version}|sed 's|_||g')cvs
 
 Summary:        A 100% Java PDF renderer and viewer
 Name:           pdf-renderer
 Version:        0
-Release:        %{release_number}.1
+Release:        0.5%{?cvs_rel}%{?dist}
 License:        LGPLv2+
 URL:            https://pdf-renderer.dev.java.net/
 Group:          Development/Libraries
-Source0:        https://pdf-renderer.dev.java.net/files/documents/6008/124103/%{alternate_name}-%{cvs_version}-src.zip
+Source0:        https://pdf-renderer.dev.java.net/files/documents/6008/131974/%{alternate_name}-%{cvs_version}-src.zip
 BuildRequires:  ant
 BuildRequires:  ant-apache-regexp
 BuildRequires:  java-devel >= 1.5
@@ -93,7 +93,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/PDFRenderer.jar \
+install -m 644 dist/%{alternate_name}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 %if %{with_gcj}
@@ -126,8 +126,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc dist/launch*
-%{_javadir}/*
+%doc demos
+%{_javadir}/%{name}.jar
 %if %{with_gcj}
 %{_libdir}/gcj/%{name}
 %endif
@@ -139,6 +139,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Apr 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.5.20090405cvs
+- New cvs checkout
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.4.20090118cvs.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2009 04:09:24 -0000	1.3
+++ sources	11 Apr 2009 22:17:21 -0000	1.4
@@ -1 +1 @@
-fedbda92569aa9846279c5c1be86a0c4  PDFRenderer-2009_01_18-src.zip
+d366b17cb5ef6d000dbd241d4fb4182c  PDFRenderer-2009_04_05-src.zip



From ricky at fedoraproject.org  Sat Apr 11 22:19:29 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Sat, 11 Apr 2009 22:19:29 +0000 (UTC)
Subject: rpms/supybot/devel supybot-0.83.3-python2.6.patch, NONE,
	1.1 supybot.spec, 1.5, 1.6
Message-ID: <20090411221929.B658F70098@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11271

Modified Files:
	supybot.spec 
Added Files:
	supybot-0.83.3-python2.6.patch 
Log Message:
Backporting Python 2.6 fixes from Supybot git.


supybot-0.83.3-python2.6.patch:

--- NEW FILE supybot-0.83.3-python2.6.patch ---
diff -ur Supybot-0.83.3.orig/src/callbacks.py Supybot-0.83.3/src/callbacks.py
--- Supybot-0.83.3.orig/src/callbacks.py	2009-04-11 17:22:48.000000000 -0400
+++ Supybot-0.83.3/src/callbacks.py	2009-04-11 17:20:16.000000000 -0400
@@ -1051,7 +1051,7 @@
                 setattr(self, attr, cb)
                 self.cbs.append(cb)
                 cb.log = log.getPluginLogger('%s.%s' % (self.name(),cb.name()))
-        super(BasePlugin, self).__init__(*args, **kwargs)
+        super(BasePlugin, self).__init__()
 
 class SynchronizedAndFirewalled(log.MetaFirewall, utils.python.Synchronized):
     pass # Necessary for the metaclass compatibility issue.
diff -ur Supybot-0.83.3.orig/src/drivers/__init__.py Supybot-0.83.3/src/drivers/__init__.py
--- Supybot-0.83.3.orig/src/drivers/__init__.py	2009-04-11 17:22:48.000000000 -0400
+++ Supybot-0.83.3/src/drivers/__init__.py	2009-04-11 17:42:31.000000000 -0400
@@ -48,7 +48,6 @@
     """Base class for drivers."""
     def __init__(self, *args, **kwargs):
         add(self.name(), self)
-        super(IrcDriver, self).__init__(*args, **kwargs)
 
     def run(self):
         raise NotImplementedError
@@ -69,7 +68,7 @@
     def __init__(self, irc, servers=()):
         self.networkGroup = conf.supybot.networks.get(irc.network)
         self.servers = servers
-        super(ServersMixin, self).__init__(irc)
+        super(ServersMixin, self).__init__()
 
     def _getServers(self):
         # We do this, rather than utils.iter.cycle the servers in __init__,
diff -ur Supybot-0.83.3.orig/src/drivers/Socket.py Supybot-0.83.3/src/drivers/Socket.py
--- Supybot-0.83.3.orig/src/drivers/Socket.py	2009-04-11 17:22:48.000000000 -0400
+++ Supybot-0.83.3/src/drivers/Socket.py	2009-04-11 17:21:25.000000000 -0400
@@ -48,8 +48,8 @@
 class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
     def __init__(self, irc):
         self.irc = irc
-        self.__parent = super(SocketDriver, self)
-        self.__parent.__init__(irc)
+        drivers.IrcDriver.__init__(self, irc)
+        drivers.ServersMixin.__init__(self, irc)
         self.conn = None
         self.servers = ()
         self.eagains = 0
@@ -77,7 +77,7 @@
 
     def _getNextServer(self):
         oldServer = getattr(self, 'currentServer', None)
-        server = self.__parent._getNextServer()
+        server = drivers.ServersMixin._getNextServer(self)
         if self.currentServer != oldServer:
             self.resetDelay()
         return server


Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/supybot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supybot.spec	26 Mar 2009 08:55:02 -0000	1.5
+++ supybot.spec	11 Apr 2009 22:18:59 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           supybot
 Version:        0.83.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -14,6 +14,11 @@
 Source0:        http://downloads.sourceforge.net/supybot/%{origname}-%{version}.tar.bz2
 # Disable the Google plugin
 Patch0:         %{name}-%{version}-plugins.patch
+# Backported upstream fixes for Python 2.6
+# All patches are from upstream git except for the first chunk in
+# Supybot-0.83.3/src/drivers/__init__.py, which I'm submitting
+# upstream.
+Patch1:         %{name}-%{version}-python2.6.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -40,6 +45,7 @@
 %prep
 %setup -q -n %{origname}-%{version}
 %patch0 -b .plugins
+%patch1 -p1 -b .python2.6
 
 
 %build
@@ -96,6 +102,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-10
+- Backporting Python 2.6 fixes from Supybot git.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.83.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rishi at fedoraproject.org  Sat Apr 11 22:23:11 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 22:23:11 +0000 (UTC)
Subject: rpms/glade3/F-10 glade3-3.4.5-edit-menuitem.patch, NONE,
	1.1 glade3.spec, 1.17, 1.18
Message-ID: <20090411222311.3066570098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12582

Modified Files:
	glade3.spec 
Added Files:
	glade3-3.4.5-edit-menuitem.patch 
Log Message:
* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
  #533471)


glade3-3.4.5-edit-menuitem.patch:

--- NEW FILE glade3-3.4.5-edit-menuitem.patch ---
diff -urNp glade3-3.4.5.orig/gladeui/glade-base-editor.c glade3-3.4.5/gladeui/glade-base-editor.c
--- glade3-3.4.5.orig/gladeui/glade-base-editor.c	2009-04-12 02:41:26.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-base-editor.c	2009-04-12 02:42:55.000000000 +0530
@@ -377,7 +377,7 @@ static gboolean
 glade_base_editor_update_properties_idle (gpointer data)
 {
 	GladeBaseEditor *editor = (GladeBaseEditor *)data;
-	glade_base_editor_treeview_cursor_changed (NULL, editor);
+	glade_base_editor_treeview_cursor_changed (editor->priv->treeview, editor);
 	editor->priv->properties_idle = 0;
 	return FALSE;
 }
@@ -1146,7 +1146,7 @@ glade_base_editor_change_type (GladeBase
 	}
 
 	/* Set the name */
-	glade_widget_set_name (gchild_new, name);
+	glade_command_set_name (gchild_new, name);
 	
 	if (GTK_IS_WIDGET (child_new))
 		gtk_widget_show_all (GTK_WIDGET (child_new));
diff -urNp glade3-3.4.5.orig/gladeui/glade-project.c glade3-3.4.5/gladeui/glade-project.c
--- glade3-3.4.5.orig/gladeui/glade-project.c	2009-04-12 02:41:26.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-project.c	2009-04-12 02:48:22.000000000 +0530
@@ -1030,6 +1030,7 @@ glade_project_release_widget_name (Glade
 
 	g_return_if_fail (GLADE_IS_PROJECT (project));
 	g_return_if_fail (GLADE_IS_WIDGET (glade_widget));
+	g_return_if_fail (widget_name);
 
 	do
 	{


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-10/glade3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glade3.spec	26 Feb 2009 21:08:05 -0000	1.17
+++ glade3.spec	11 Apr 2009 22:22:40 -0000	1.18
@@ -6,7 +6,7 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
@@ -15,6 +15,8 @@
 # http://bugzilla.gnome.org/531585
 Patch0:		%{name}-%{version}-anjuta-hang.patch
 Patch1:		%{name}-%{version}-desktop.patch
+# http://bugzilla.gnome.org/533471
+Patch2:		%{name}-%{version}-edit-menuitem.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -77,6 +79,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -193,6 +196,10 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
+- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
+  #533471)
+
 * Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)
 
@@ -208,6 +215,7 @@
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
   * Duplicate widget names not allowed in a project.
+  * Fixed crash when adding items to a GtkComboBox. (GNOME Bugzilla #528511)
   * Translation updates: sq, tr, bg, da, es, en_GB, ml, pt_BR and hi.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.news
 



From rishi at fedoraproject.org  Sat Apr 11 22:24:44 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 11 Apr 2009 22:24:44 +0000 (UTC)
Subject: rpms/glade3/F-9 glade3-3.4.5-edit-menuitem.patch, NONE,
	1.1 glade3.spec, 1.18, 1.19
Message-ID: <20090411222444.6C84970098@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13020

Modified Files:
	glade3.spec 
Added Files:
	glade3-3.4.5-edit-menuitem.patch 
Log Message:
* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
  #533471)


glade3-3.4.5-edit-menuitem.patch:

--- NEW FILE glade3-3.4.5-edit-menuitem.patch ---
diff -urNp glade3-3.4.5.orig/gladeui/glade-base-editor.c glade3-3.4.5/gladeui/glade-base-editor.c
--- glade3-3.4.5.orig/gladeui/glade-base-editor.c	2009-04-12 02:41:26.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-base-editor.c	2009-04-12 02:42:55.000000000 +0530
@@ -377,7 +377,7 @@ static gboolean
 glade_base_editor_update_properties_idle (gpointer data)
 {
 	GladeBaseEditor *editor = (GladeBaseEditor *)data;
-	glade_base_editor_treeview_cursor_changed (NULL, editor);
+	glade_base_editor_treeview_cursor_changed (editor->priv->treeview, editor);
 	editor->priv->properties_idle = 0;
 	return FALSE;
 }
@@ -1146,7 +1146,7 @@ glade_base_editor_change_type (GladeBase
 	}
 
 	/* Set the name */
-	glade_widget_set_name (gchild_new, name);
+	glade_command_set_name (gchild_new, name);
 	
 	if (GTK_IS_WIDGET (child_new))
 		gtk_widget_show_all (GTK_WIDGET (child_new));
diff -urNp glade3-3.4.5.orig/gladeui/glade-project.c glade3-3.4.5/gladeui/glade-project.c
--- glade3-3.4.5.orig/gladeui/glade-project.c	2009-04-12 02:41:26.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-project.c	2009-04-12 02:48:22.000000000 +0530
@@ -1030,6 +1030,7 @@ glade_project_release_widget_name (Glade
 
 	g_return_if_fail (GLADE_IS_PROJECT (project));
 	g_return_if_fail (GLADE_IS_WIDGET (glade_widget));
+	g_return_if_fail (widget_name);
 
 	do
 	{


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/glade3.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- glade3.spec	26 Feb 2009 21:05:48 -0000	1.18
+++ glade3.spec	11 Apr 2009 22:24:14 -0000	1.19
@@ -6,7 +6,7 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
@@ -15,6 +15,8 @@
 # http://bugzilla.gnome.org/531585
 Patch0:		%{name}-%{version}-anjuta-hang.patch
 Patch1:		%{name}-%{version}-desktop.patch
+# http://bugzilla.gnome.org/533471
+Patch2:		%{name}-%{version}-edit-menuitem.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -77,6 +79,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -193,6 +196,10 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
+- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
+  #533471)
+
 * Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)
 
@@ -208,6 +215,7 @@
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
   * Duplicate widget names not allowed in a project.
+  * Fixed crash when adding items to a GtkComboBox. (GNOME Bugzilla #528511)
   * Translation updates: sq, tr, bg, da, es, en_GB, ml, pt_BR and hi.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.news
 



From svahl at fedoraproject.org  Sat Apr 11 22:35:19 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat, 11 Apr 2009 22:35:19 +0000 (UTC)
Subject: rpms/grsync/F-10 .cvsignore, 1.4, 1.5 grsync.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20090411223519.A29A770098@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15420/F-10

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
update for older branches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2008 23:52:12 -0000	1.4
+++ .cvsignore	11 Apr 2009 22:34:48 -0000	1.5
@@ -1 +1 @@
-grsync-0.6.2.tar.gz
+grsync-0.6.3.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-10/grsync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grsync.spec	13 Dec 2008 23:52:12 -0000	1.5
+++ grsync.spec	11 Apr 2009 22:34:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grsync
-Version:        0.6.2
-Release:        1%{?dist}
+Version:        0.6.3
+Release:        2%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
+BuildRequires:  intltool
 
 %description
 Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
@@ -55,6 +56,15 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-2
+- BR: intltool
+
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-1
+- new upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Dec 11 2008 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.2-1
 - new upstream release
 - drop grsync-0.6.1-fix-crash-when-adding-new-sessions.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2008 23:52:12 -0000	1.4
+++ sources	11 Apr 2009 22:34:48 -0000	1.5
@@ -1 +1 @@
-5470c87807738ce9a5623c9bbefaff85  grsync-0.6.2.tar.gz
+6c368560e349ddc7ff00124338074a48  grsync-0.6.3.tar.gz



From svahl at fedoraproject.org  Sat Apr 11 22:35:19 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat, 11 Apr 2009 22:35:19 +0000 (UTC)
Subject: rpms/grsync/F-9 .cvsignore, 1.4, 1.5 grsync.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20090411223519.BB8B970126@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15420/F-9

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
update for older branches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2008 23:52:13 -0000	1.4
+++ .cvsignore	11 Apr 2009 22:34:49 -0000	1.5
@@ -1 +1 @@
-grsync-0.6.2.tar.gz
+grsync-0.6.3.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-9/grsync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grsync.spec	13 Dec 2008 23:52:13 -0000	1.5
+++ grsync.spec	11 Apr 2009 22:34:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grsync
-Version:        0.6.2
-Release:        1%{?dist}
+Version:        0.6.3
+Release:        2%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
+BuildRequires:  intltool
 
 %description
 Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
@@ -55,6 +56,15 @@
 
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-2
+- BR: intltool
+
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-1
+- new upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Dec 11 2008 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.2-1
 - new upstream release
 - drop grsync-0.6.1-fix-crash-when-adding-new-sessions.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2008 23:52:13 -0000	1.4
+++ sources	11 Apr 2009 22:34:49 -0000	1.5
@@ -1 +1 @@
-5470c87807738ce9a5623c9bbefaff85  grsync-0.6.2.tar.gz
+6c368560e349ddc7ff00124338074a48  grsync-0.6.3.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:39:52 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:39:52 +0000 (UTC)
Subject: rpms/haproxy/devel .cvsignore, 1.11, 1.12 haproxy.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090411223952.93AB970098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17476

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Dec 2008 04:27:54 -0000	1.11
+++ .cvsignore	11 Apr 2009 22:39:21 -0000	1.12
@@ -1 +1 @@
-haproxy-1.3.15.7.tar.gz
+haproxy-1.3.17.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- haproxy.spec	25 Feb 2009 03:23:51 -0000	1.17
+++ haproxy.spec	11 Apr 2009 22:39:21 -0000	1.18
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.15.7
+Version:        1.3.17
 Release:        2%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.17-2
+-  Update to 1.3.17
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.15.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Dec 2008 04:27:54 -0000	1.11
+++ sources	11 Apr 2009 22:39:21 -0000	1.12
@@ -1 +1 @@
-6c1978071139c5cc27563232c2a488da  haproxy-1.3.15.7.tar.gz
+423ad955828a2de1803410a4405696f2  haproxy-1.3.17.tar.gz



From lkundrak at fedoraproject.org  Sat Apr 11 22:41:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 11 Apr 2009 22:41:06 +0000 (UTC)
Subject: rpms/koules/devel koules.sndsrv.linux,NONE,1.1 koules.spec,1.7,1.8
Message-ID: <20090411224106.321B770098@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/koules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17870

Modified Files:
	koules.spec 
Added Files:
	koules.sndsrv.linux 
Log Message:
* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-6
- Wrap the OSS-based sound server in padsp



--- NEW FILE koules.sndsrv.linux ---
#!/bin/sh

if pactl stat
then
	exec padsp "$0".bin "$@"
else
	exec "$0".bin "$@"
fi


Index: koules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koules.spec	16 Mar 2009 21:59:43 -0000	1.7
+++ koules.spec	11 Apr 2009 22:40:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           koules
 Version:        1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Action game with multiplayer, network and sound support
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://www.ucw.cz/~hubicka/koules/
 Source0:        http://www.ucw.cz/~hubicka/koules/packages/%{name}%{version}-src.tar.gz
 Source1:        koules.desktop
+Source2:        koules.sndsrv.linux
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libX11-devel
@@ -150,6 +151,10 @@
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
         %{SOURCE1}
 
+# PulseAudio wrapper for the sound server
+mv $RPM_BUILD_ROOT%{_libexecdir}/%{name}/koules.sndsrv.linux{,.bin}
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/koules.sndsrv.linux
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -185,6 +190,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-6
+- Wrap the OSS-based sound server in padsp
+
 * Mon Mar 16 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-5
 - Require fonts
 - Fix Xshm support



From jjh at fedoraproject.org  Sat Apr 11 22:54:45 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:54:45 +0000 (UTC)
Subject: rpms/haproxy/EL-4 .cvsignore, 1.9, 1.10 haproxy.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090411225446.0D13C70098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21699/EL-4

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Dec 2008 04:23:39 -0000	1.9
+++ .cvsignore	11 Apr 2009 22:54:14 -0000	1.10
@@ -1 +1 @@
-haproxy-1.3.14.11.tar.gz
+haproxy-1.3.17.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- haproxy.spec	31 Dec 2008 04:23:39 -0000	1.12
+++ haproxy.spec	11 Apr 2009 22:54:14 -0000	1.13
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.14.11
+Version:        1.3.17
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.17-1
+-  update to 1.3.17
+
 * Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.11-1
 - update to 1.3.14.11
 - remove upstream patches, they are part of source distribution


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Dec 2008 04:23:39 -0000	1.9
+++ sources	11 Apr 2009 22:54:14 -0000	1.10
@@ -1 +1 @@
-efddd4296da32ac1edc90d5d183c9e2f  haproxy-1.3.14.11.tar.gz
+423ad955828a2de1803410a4405696f2  haproxy-1.3.17.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:54:46 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:54:46 +0000 (UTC)
Subject: rpms/haproxy/F-9 .cvsignore, 1.11, 1.12 haproxy.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <20090411225446.A85E870098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21699/F-9

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Dec 2008 04:35:37 -0000	1.11
+++ .cvsignore	11 Apr 2009 22:54:16 -0000	1.12
@@ -1 +1 @@
-haproxy-1.3.15.7.tar.gz
+haproxy-1.3.17.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-9/haproxy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- haproxy.spec	31 Dec 2008 04:35:37 -0000	1.15
+++ haproxy.spec	11 Apr 2009 22:54:16 -0000	1.16
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.15.7
+Version:        1.3.17
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.17-1
+-  update to 1.3.17
+
 * Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.15.7-1
 - update to 1.3.15.7
 - remove upstream patches, they are now part of source distribution


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Dec 2008 04:35:37 -0000	1.11
+++ sources	11 Apr 2009 22:54:16 -0000	1.12
@@ -1 +1 @@
-6c1978071139c5cc27563232c2a488da  haproxy-1.3.15.7.tar.gz
+423ad955828a2de1803410a4405696f2  haproxy-1.3.17.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:54:46 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:54:46 +0000 (UTC)
Subject: rpms/haproxy/F-10 .cvsignore, 1.11, 1.12 haproxy.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20090411225446.6A18C70098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21699/F-10

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Dec 2008 04:35:36 -0000	1.11
+++ .cvsignore	11 Apr 2009 22:54:16 -0000	1.12
@@ -1 +1 @@
-haproxy-1.3.15.7.tar.gz
+haproxy-1.3.17.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- haproxy.spec	31 Dec 2008 04:35:36 -0000	1.14
+++ haproxy.spec	11 Apr 2009 22:54:16 -0000	1.15
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.15.7
+Version:        1.3.17
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.17-1
+-  update to 1.3.17
+
 * Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.15.7-1
 - update to 1.3.15.7
 - remove upstream patches, they are now part of source distribution


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Dec 2008 04:35:36 -0000	1.11
+++ sources	11 Apr 2009 22:54:16 -0000	1.12
@@ -1 +1 @@
-6c1978071139c5cc27563232c2a488da  haproxy-1.3.15.7.tar.gz
+423ad955828a2de1803410a4405696f2  haproxy-1.3.17.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 22:54:46 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:54:46 +0000 (UTC)
Subject: rpms/haproxy/EL-5 .cvsignore, 1.9, 1.10 haproxy.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090411225446.15F3070126@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21699/EL-5

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Dec 2008 04:21:50 -0000	1.9
+++ .cvsignore	11 Apr 2009 22:54:15 -0000	1.10
@@ -1 +1 @@
-haproxy-1.3.14.11.tar.gz
+haproxy-1.3.17.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- haproxy.spec	31 Dec 2008 04:21:50 -0000	1.13
+++ haproxy.spec	11 Apr 2009 22:54:15 -0000	1.14
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.14.11
+Version:        1.3.17
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.17-1
+-  update to 1.3.17
+
 * Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.11-1
 - update to 1.3.14.11
 - remove upstream patches, they are now part of source distribution


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Dec 2008 04:21:50 -0000	1.9
+++ sources	11 Apr 2009 22:54:15 -0000	1.10
@@ -1 +1 @@
-efddd4296da32ac1edc90d5d183c9e2f  haproxy-1.3.14.11.tar.gz
+423ad955828a2de1803410a4405696f2  haproxy-1.3.17.tar.gz



From svahl at fedoraproject.org  Sat Apr 11 22:55:15 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat, 11 Apr 2009 22:55:15 +0000 (UTC)
Subject: rpms/roxterm/F-10 .cvsignore, 1.14, 1.15 roxterm.spec, 1.12,
	1.13 sources, 1.14, 1.15
Message-ID: <20090411225515.8D2DD70098@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22176/F-10

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
update for older branches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Dec 2008 09:29:24 -0000	1.14
+++ .cvsignore	11 Apr 2009 22:54:45 -0000	1.15
@@ -1 +1 @@
-roxterm-1.13.0.tar.gz
+roxterm-1.14.1.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-10/roxterm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- roxterm.spec	4 Dec 2008 09:29:24 -0000	1.12
+++ roxterm.spec	11 Apr 2009 22:54:45 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.13.0
+Version:        1.14.1
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,12 @@
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.1-1
+- new upstream version: 1.14.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 01 2008 Sebastian Vahl <fedora at deadbabylon.de> - 1.13.0-1
 - new upstream version: 1.13.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Dec 2008 09:29:24 -0000	1.14
+++ sources	11 Apr 2009 22:54:45 -0000	1.15
@@ -1 +1 @@
-5ec0918781d113181afccf454dbff236  roxterm-1.13.0.tar.gz
+906a8e98eaf84dd9f3c4c920786e2038  roxterm-1.14.1.tar.gz



From svahl at fedoraproject.org  Sat Apr 11 22:55:16 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Sat, 11 Apr 2009 22:55:16 +0000 (UTC)
Subject: rpms/roxterm/F-9 .cvsignore, 1.13, 1.14 roxterm.spec, 1.11,
	1.12 sources, 1.13, 1.14
Message-ID: <20090411225516.150D970098@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22176/F-9

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
update for older branches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Dec 2008 09:29:25 -0000	1.13
+++ .cvsignore	11 Apr 2009 22:54:45 -0000	1.14
@@ -1 +1 @@
-roxterm-1.13.0.tar.gz
+roxterm-1.14.1.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-9/roxterm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- roxterm.spec	4 Dec 2008 09:29:25 -0000	1.11
+++ roxterm.spec	11 Apr 2009 22:54:45 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.13.0
+Version:        1.14.1
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,12 @@
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.1-1
+- new upstream version: 1.14.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 01 2008 Sebastian Vahl <fedora at deadbabylon.de> - 1.13.0-1
 - new upstream version: 1.13.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Dec 2008 09:29:25 -0000	1.13
+++ sources	11 Apr 2009 22:54:45 -0000	1.14
@@ -1 +1 @@
-5ec0918781d113181afccf454dbff236  roxterm-1.13.0.tar.gz
+906a8e98eaf84dd9f3c4c920786e2038  roxterm-1.14.1.tar.gz



From mclasen at fedoraproject.org  Sat Apr 11 22:56:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 11 Apr 2009 22:56:34 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.103, 1.104 gtk2.spec, 1.368,
	1.369 sources, 1.112, 1.113
Message-ID: <20090411225634.6B42270098@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22521

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.16.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	13 Mar 2009 18:02:00 -0000	1.103
+++ .cvsignore	11 Apr 2009 22:56:02 -0000	1.104
@@ -1 +1 @@
-gtk+-2.16.0.tar.bz2
+gtk+-2.16.1.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- gtk2.spec	7 Apr 2009 15:00:44 -0000	1.368
+++ gtk2.spec	11 Apr 2009 22:56:02 -0000	1.369
@@ -11,13 +11,13 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.16.0
+%define base_version 2.16.1
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
@@ -126,7 +126,7 @@
 Requires: gtk2 = %{version}-%{release}
 # for /usr/share/gtk-doc/html
 Requires: gtk-doc
-BuildArch: noarch
+#BuildArch: noarch
 
 %description devel-docs
 This package contains developer documentation for the GTK+ widget toolkit.
@@ -342,6 +342,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1
+- Update to 2.16.1
+
 * Tue Apr  7 2009 Marek Kasik <mkasik at redhat.com> - 2.16.0-2
 - Add authentication support to GtkPrintBackend.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sources	13 Mar 2009 18:02:00 -0000	1.112
+++ sources	11 Apr 2009 22:56:02 -0000	1.113
@@ -1 +1 @@
-139528802794287427fd4d18875b5cf5  gtk+-2.16.0.tar.bz2
+74e35ff3e6e02c960fe2117a4b6b102f  gtk+-2.16.1.tar.bz2



From jjh at fedoraproject.org  Sat Apr 11 22:59:59 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 22:59:59 +0000 (UTC)
Subject: rpms/nginx/devel .cvsignore, 1.21, 1.22 nginx.spec, 1.32,
	1.33 sources, 1.21, 1.22
Message-ID: <20090411225959.EDE5870098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24009/devel

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 Feb 2009 08:44:56 -0000	1.21
+++ .cvsignore	11 Apr 2009 22:59:28 -0000	1.22
@@ -1 +1 @@
-nginx-0.6.35.tar.gz
+nginx-0.6.36.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nginx.spec	26 Feb 2009 05:37:07 -0000	1.32
+++ nginx.spec	11 Apr 2009 22:59:28 -0000	1.33
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.35
-Release:        3%{?dist}
+Version:        0.6.36
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
+-  update to 0.6.36
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	19 Feb 2009 08:44:56 -0000	1.21
+++ sources	11 Apr 2009 22:59:28 -0000	1.22
@@ -1 +1 @@
-45c7a2d3d91f27f5af1b463f0ff46070  nginx-0.6.35.tar.gz
+15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz



From pkgdb at fedoraproject.org  Sat Apr 11 23:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 11 Apr 2009 23:12:44 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090411231139.3697010F80D@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora devel) to Obsolete for holtmann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From cwickert at fedoraproject.org  Sat Apr 11 23:19:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 11 Apr 2009 23:19:22 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-power-manager.spec, 1.5, 1.6
Message-ID: <20090411231922.85C4D70098@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30470

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Sun Apr 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta1
- Update to 0.8.0beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Apr 2009 22:48:07 -0000	1.4
+++ .cvsignore	11 Apr 2009 23:18:52 -0000	1.5
@@ -1 +1 @@
-xfce4-power-manager-0.8.0alpha2.tar.bz2
+xfce4-power-manager-0.8.0beta1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 22:48:08 -0000	1.4
+++ sources	11 Apr 2009 23:18:52 -0000	1.5
@@ -1 +1 @@
-5899c764c040edb4e017d3ca0067ade7  xfce4-power-manager-0.8.0alpha2.tar.bz2
+6d860b824430b654d084d7fb9db1c279  xfce4-power-manager-0.8.0beta1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-power-manager.spec	8 Apr 2009 22:48:08 -0000	1.5
+++ xfce4-power-manager.spec	11 Apr 2009 23:18:52 -0000	1.6
@@ -1,14 +1,14 @@
-%define alphaversion alpha2
+%define betaversion beta1
 
 Name:           xfce4-power-manager
 Version:        0.8.0
-Release:        0.1.%{alphaversion}%{?dist}
+Release:        0.1.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{alphaversion}.tar.bz2
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -29,7 +29,7 @@
 
 
 %prep
-%setup -qn %{name}-%{version}%{alphaversion}
+%setup -qn %{name}-%{version}%{betaversion}
 
 
 %build
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta1
+- Update to 0.8.0beta1
+
 * Thu Apr 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha2
 - Update to 0.8.0alpha2
 



From jjh at fedoraproject.org  Sat Apr 11 23:29:28 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 23:29:28 +0000 (UTC)
Subject: rpms/nginx/F-9 .cvsignore, 1.21, 1.22 nginx.spec, 1.27, 1.28 sources,
	1.21, 1.22
Message-ID: <20090411232928.3213870098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1064/F-9

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 Feb 2009 08:44:55 -0000	1.21
+++ .cvsignore	11 Apr 2009 23:29:26 -0000	1.22
@@ -1 +1 @@
-nginx-0.6.35.tar.gz
+nginx-0.6.36.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-9/nginx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nginx.spec	19 Feb 2009 08:49:03 -0000	1.27
+++ nginx.spec	11 Apr 2009 23:29:26 -0000	1.28
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.35
-Release:        2%{?dist}
+Version:        0.6.36
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
+-  update to 0.6.36
+
 * Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	19 Feb 2009 08:44:55 -0000	1.21
+++ sources	11 Apr 2009 23:29:26 -0000	1.22
@@ -1 +1 @@
-45c7a2d3d91f27f5af1b463f0ff46070  nginx-0.6.35.tar.gz
+15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz



From oget at fedoraproject.org  Sat Apr 11 23:29:24 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 11 Apr 2009 23:29:24 +0000 (UTC)
Subject: rpms/pdf-renderer/devel pdf-renderer.spec,1.4,1.5
Message-ID: <20090411232924.B058F70098@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pdf-renderer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv918

Modified Files:
	pdf-renderer.spec 
Log Message:
Raise minimum java requirement to >= 1.7



Index: pdf-renderer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/pdf-renderer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pdf-renderer.spec	11 Apr 2009 22:17:21 -0000	1.4
+++ pdf-renderer.spec	11 Apr 2009 23:29:23 -0000	1.5
@@ -13,7 +13,7 @@
 Source0:        https://pdf-renderer.dev.java.net/files/documents/6008/131974/%{alternate_name}-%{cvs_version}-src.zip
 BuildRequires:  ant
 BuildRequires:  ant-apache-regexp
-BuildRequires:  java-devel >= 1.5
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  jpackage-utils
 BuildRequires:  urw-fonts
 %if %{with_gcj}
@@ -25,7 +25,7 @@
 BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       java >= 1.5
+Requires:       java >= 1.7
 Requires:       jpackage-utils >= 1.5
 Requires:       urw-fonts
 Provides:       %{alternate_name} == %{version}-%{release}
@@ -141,6 +141,7 @@
 %changelog
 * Sat Apr 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.5.20090405cvs
 - New cvs checkout
+- Raise minimum java requirement
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.4.20090118cvs.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From jjh at fedoraproject.org  Sat Apr 11 23:29:55 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 23:29:55 +0000 (UTC)
Subject: rpms/nginx/EL-5 .cvsignore, 1.15, 1.16 nginx.spec, 1.21,
	1.22 sources, 1.16, 1.17
Message-ID: <20090411232955.D4FB070098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1064/EL-5

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Feb 2009 08:44:54 -0000	1.15
+++ .cvsignore	11 Apr 2009 23:29:23 -0000	1.16
@@ -1 +1 @@
-nginx-0.6.35.tar.gz
+nginx-0.6.36.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nginx.spec	19 Feb 2009 08:49:03 -0000	1.21
+++ nginx.spec	11 Apr 2009 23:29:24 -0000	1.22
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.35
-Release:        2%{?dist}
+Version:        0.6.36
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
+-  update to 0.6.36
+
 * Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Feb 2009 08:44:54 -0000	1.16
+++ sources	11 Apr 2009 23:29:24 -0000	1.17
@@ -1 +1 @@
-45c7a2d3d91f27f5af1b463f0ff46070  nginx-0.6.35.tar.gz
+15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz



From jjh at fedoraproject.org  Sat Apr 11 23:29:56 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sat, 11 Apr 2009 23:29:56 +0000 (UTC)
Subject: rpms/nginx/F-10 .cvsignore, 1.21, 1.22 nginx.spec, 1.29,
	1.30 sources, 1.21, 1.22
Message-ID: <20090411232956.5B5B870098@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1064/F-10

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 Feb 2009 08:44:55 -0000	1.21
+++ .cvsignore	11 Apr 2009 23:29:25 -0000	1.22
@@ -1 +1 @@
-nginx-0.6.35.tar.gz
+nginx-0.6.36.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nginx.spec	19 Feb 2009 08:49:03 -0000	1.29
+++ nginx.spec	11 Apr 2009 23:29:25 -0000	1.30
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.35
-Release:        2%{?dist}
+Version:        0.6.36
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
+-  update to 0.6.36
+
 * Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	19 Feb 2009 08:44:55 -0000	1.21
+++ sources	11 Apr 2009 23:29:25 -0000	1.22
@@ -1 +1 @@
-45c7a2d3d91f27f5af1b463f0ff46070  nginx-0.6.35.tar.gz
+15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz



From rdieter at fedoraproject.org  Sun Apr 12 00:15:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 00:15:53 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.30,1.31
Message-ID: <20090412001553.713E270126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18499

Modified Files:
	phonon.spec 
Log Message:
* Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- optimize scriptlets
- Provides/Requires: phonon-backend%{_isa} ...



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- phonon.spec	3 Mar 2009 16:41:33 -0000	1.30
+++ phonon.spec	12 Apr 2009 00:15:21 -0000	1.31
@@ -1,12 +1,14 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2
 Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # Make PulseAudio the default again when listed by the backend.
 # Note that this currently only works for the Xine backend. Device selection in
 # the GStreamer backend is weird: there is a setting for "sink" which cannot be
@@ -20,8 +22,6 @@
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
 Patch101: phonon-4.3.2-gstreamer-volumefader.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
@@ -35,9 +35,9 @@
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-Requires: phonon-backend >= %{version}
+Requires: phonon-backend%{?_isa} >= %{version}
 ## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine >= %{version}
+#Requires(hint): phonon-backend-xine%{?_isa} >= %{version}
 
 %description
 %{summary}.
@@ -46,9 +46,7 @@
 Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-Provides: phonon-backend = %{version}-%{release}
+Provides: phonon-backend%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
 %description backend-gstreamer
@@ -58,9 +56,7 @@
 Summary: xine phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-Provides: phonon-backend = %{version}-%{release}
+Provides: phonon-backend%{?_isa} = %{version}-%{release}
 %description backend-xine
 %{summary}.
 
@@ -81,13 +77,14 @@
 %patch100 -p0 -b .gstreamer-utf8-url
 %patch101 -p0 -b .gstreamer-volumefader
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -115,17 +112,29 @@
 
 %postun -p /sbin/ldconfig
 
+%post backend-gstreamer
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
 %post backend-xine
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%postun backend-xine
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%posttrans backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%post backend-gstreamer
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%posttrans backend-xine
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun backend-gstreamer
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%postun backend-xine
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files
@@ -159,6 +168,10 @@
 
 
 %changelog
+* Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- optimize scriptlets
+- Provides/Requires: phonon-backend%%{_isa} ...
+
 * Tue Mar  3 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.3.1-2
 - backport GStreamer backend bugfixes (UTF-8 file handling, volume
 fader)



From wolfy at fedoraproject.org  Sun Apr 12 00:18:32 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Sun, 12 Apr 2009 00:18:32 +0000 (UTC)
Subject: rpms/twinkle/EL-5 twinkle-1.1-msg.patch, NONE, 1.1 .cvsignore, 1.5, 
	1.6 sources, 1.5, 1.6 twinkle.spec, 1.6, 1.7
Message-ID: <20090412001832.C215F70126@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/twinkle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19050

Modified Files:
	.cvsignore sources twinkle.spec 
Added Files:
	twinkle-1.1-msg.patch 
Log Message:
update to version 1.4.2


twinkle-1.1-msg.patch:

--- NEW FILE twinkle-1.1-msg.patch ---
--- twinkle-1.1/src/mwi/mwi.cpp.orig	2007-01-07 02:47:33.000000000 -0500
+++ twinkle-1.1/src/mwi/mwi.cpp	2007-12-06 09:29:31.000000000 -0500
@@ -20,7 +20,12 @@
 
 t_mwi::t_mwi() :
 	status(MWI_UNKNOWN)
-{}
+{
+	voice_msg_summary.newmsgs = 0;
+	voice_msg_summary.newmsgs_urgent = 0;
+	voice_msg_summary.oldmsgs = 0;
+	voice_msg_summary.oldmsgs_urgent = 0;
+}
 
 t_mwi::t_status t_mwi::get_status(void) const {
 	t_status result;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Aug 2007 01:20:57 -0000	1.5
+++ .cvsignore	12 Apr 2009 00:18:01 -0000	1.6
@@ -1 +1 @@
-twinkle-1.1.tar.gz
+twinkle-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Aug 2007 01:20:57 -0000	1.5
+++ sources	12 Apr 2009 00:18:01 -0000	1.6
@@ -1 +1 @@
-40f8341a4a82c06d00bd1b326d9c6bbf  twinkle-1.1.tar.gz
+d70c8972f296ffd998c7fb698774705b  twinkle-1.4.2.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/EL-5/twinkle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- twinkle.spec	9 Aug 2007 01:20:57 -0000	1.6
+++ twinkle.spec	12 Apr 2009 00:18:01 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           twinkle
-Version:        1.1
+Version:        1.4.2
 Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
@@ -7,6 +7,7 @@
 License:        GPLv2+
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
+Patch0:         twinkle-1.1-msg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -15,16 +16,26 @@
 BuildRequires: speex-devel
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
-BuildRequires: qt-devel
-BuildRequires: bind-libbind-devel
 BuildRequires: alsa-lib-devel
+BuildRequires: bison
+BuildRequires: libzrtpcpp-devel
+BuildRequires: readline-devel
+%if 0%{?fedora}
+BuildRequires: file-devel
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: file
+BuildRequires: ncurses-devel
+BuildRequires: bind-libbind-devel
 BuildRequires: kdelibs-devel
+%endif
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
 
 %prep
 %setup -q
+%patch0 -p1 -b .msg
 
 %build
 %configure
@@ -39,7 +50,12 @@
 install -m 644 src/gui/images/twinkle48.png %{buildroot}%{_datadir}/pixmaps/twinkle.png
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/twinkle.desktop
-desktop-file-install --vendor fedora                            \
+desktop-file-install                            \
+%if 0%{?fedora}
+         --vendor fedora                        \
+%else
+         --vendor ""                            \
+%endif
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         twinkle.desktop
@@ -54,9 +70,56 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/twinkle.png
+%if 0%{?fedora}
 %{_datadir}/applications/fedora-twinkle.desktop
+%else
+%{_datadir}/applications/twinkle.desktop
+%endif
 
 %changelog
+* Wed Feb 25 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 1.4.2-2
+- adapt for EL-5
+
+* Wed Feb 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.2-1
+- Update to 1.4.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 02 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Sun Jan 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4-1
+- Update to 1.4
+
+* Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> - 1.3.2-3
+- Rebuild for boost-1.37.0.
+
+* Tue Dec 09 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-2
+- Add patch to fix command line segfault (fixes #473677)
+
+* Tue Sep 02 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-1
+- Update to 1.3.2
+
+* Mon Jun 30 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-3
+- Rebuild with libzrtpcpp
+
+* Mon Mar 31 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-2
+- Rebuild for new qt3
+
+* Sat Mar 08 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-1
+- Update to 1.2
+
+* Sat Feb 09 2008 Kevin Fenzi <kevin at tummy.com> - 1.1-5
+- Rebuild for gcc-4.3
+- Rebuild for new cctrp and commoncpp2
+
+* Tue Jan 01 2008 Kevin Fenzi <kevin at tummy.com> - 1.1-4
+- Add patch for message waiting bug (fixes #427068)
+
+* Wed Oct 10 2007 Kevin Fenzi <kevin at tummy.com> - 1.1-3
+- Rebuild for BuilID
+
 * Fri Aug 03 2007 Kevin Fenzi <kevin at tummy.com> - 1.1-2
 - Rebuild for new boost
 - Fix License tag
@@ -70,6 +133,7 @@
 * Wed Jan 24 2007 Kevin Fenzi <kevin at tummy.com> - 1.0-1
 - Update to 1.0
 - Removed unneeded patch (merged upstream)
+- Changed bind-libbind-devel BuildRequires to bind-devel
 
 * Fri Nov 10 2006 Kevin Fenzi <kevin at tummy.com> - 0.9-2
 - Rebuild with correct libbind patch



From karsten at fedoraproject.org  Sun Apr 12 00:22:18 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sun, 12 Apr 2009 00:22:18 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.369,1.370
Message-ID: <20090412002218.B7E2670126@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20504

Modified Files:
	gtk2.spec 
Log Message:
- autoconf uses ibm-linux not redhat-linux (s390x),
  fix host similar to ppc



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- gtk2.spec	11 Apr 2009 22:56:02 -0000	1.369
+++ gtk2.spec	12 Apr 2009 00:22:17 -0000	1.370
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
@@ -190,6 +190,8 @@
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux (s390x)
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 # Make sure that the host value that is passed to the compile
 # is the same as the host that we're using in the spec file
@@ -342,6 +344,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Karsten Hopp <karsten at redhat.com> 2.16.1-2
+- autoconf uses ibm-linux not redhat-linux (s390x), 
+  fix host similar to ppc
+
 * Sat Apr 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1
 - Update to 2.16.1
 



From jjh at fedoraproject.org  Sun Apr 12 00:48:58 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sun, 12 Apr 2009 00:48:58 +0000 (UTC)
Subject: rpms/ragel/devel .cvsignore, 1.10, 1.11 ragel-Makefile-install.patch,
	1.2, 1.3 ragel.spec, 1.14, 1.15 sources, 1.10, 1.11
Message-ID: <20090412004858.780FA70126@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30009

Modified Files:
	.cvsignore ragel-Makefile-install.patch ragel.spec sources 
Log Message:
update to rage 6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Aug 2008 20:23:44 -0000	1.10
+++ .cvsignore	12 Apr 2009 00:48:52 -0000	1.11
@@ -1 +1 @@
-ragel-6.3.tar.gz
+ragel-6.4.tar.gz

ragel-Makefile-install.patch:

Index: ragel-Makefile-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel-Makefile-install.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ragel-Makefile-install.patch	12 May 2008 07:03:29 -0000	1.2
+++ ragel-Makefile-install.patch	12 Apr 2009 00:48:52 -0000	1.3
@@ -1,66 +1,11 @@
-diff -Nuar ragel-6.2.orig/ragel/Makefile.in ragel-6.2/ragel/Makefile.in
---- ragel-6.2.orig/ragel/Makefile.in	2008-01-11 16:14:17.000000000 -0700
-+++ ragel-6.2/ragel/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -89,6 +89,6 @@
+diff -up ragel/Makefile.in.fedora ./ragel/Makefile.in
+--- ragel/Makefile.in.fedora	2009-04-11 18:19:45.000000000 -0600
++++ ragel/Makefile.in	2009-04-11 18:20:04.000000000 -0600
+@@ -109,6 +109,6 @@ clean:
  
  install: all
- 	install -d $(prefix)/bin
--	install -s ragel $(prefix)/bin/ragel
-+	install ragel $(prefix)/bin/ragel
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-cd/Makefile.in ragel-6.2/rlgen-cd/Makefile.in
---- ragel-6.2.orig/rlgen-cd/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-cd/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -64,6 +64,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-cd $(prefix)/bin/rlgen-cd
-+	install rlgen-cd $(prefix)/bin/rlgen-cd
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-csharp/Makefile.in ragel-6.2/rlgen-csharp/Makefile.in
---- ragel-6.2.orig/rlgen-csharp/Makefile.in	2008-03-30 14:04:15.000000000 -0600
-+++ ragel-6.2/rlgen-csharp/Makefile.in	2008-05-12 00:42:49.000000000 -0600
-@@ -64,6 +64,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-csharp $(prefix)/bin/rlgen-csharp
-+	install rlgen-csharp $(prefix)/bin/rlgen-csharp
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-dot/Makefile.in ragel-6.2/rlgen-dot/Makefile.in
---- ragel-6.2.orig/rlgen-dot/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-dot/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -60,6 +60,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-dot $(prefix)/bin/rlgen-dot
-+	install rlgen-dot $(prefix)/bin/rlgen-dot
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-java/Makefile.in ragel-6.2/rlgen-java/Makefile.in
---- ragel-6.2.orig/rlgen-java/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-java/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -61,6 +61,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-java $(prefix)/bin/rlgen-java
-+	install rlgen-java $(prefix)/bin/rlgen-java
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-ruby/Makefile.in ragel-6.2/rlgen-ruby/Makefile.in
---- ragel-6.2.orig/rlgen-ruby/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-ruby/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -62,6 +62,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-ruby $(prefix)/bin/rlgen-ruby
-+	install rlgen-ruby $(prefix)/bin/rlgen-ruby
+ 	install -d $(DESTDIR)$(prefix)/bin
+-	install -s ragel $(DESTDIR)$(prefix)/bin/ragel
++	install ragel $(DESTDIR)$(prefix)/bin/ragel
  
  -include $(DEPS)


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ragel.spec	25 Feb 2009 18:40:41 -0000	1.14
+++ ragel.spec	12 Apr 2009 00:48:52 -0000	1.15
@@ -1,15 +1,16 @@
 Name:           ragel   
-Version:        6.3
-Release:        2%{?dist}
+Version:        6.4
+Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://www.cs.queensu.ca/~thurston/ragel/ 
-Source0:        http://www.cs.queensu.ca/~thurston/ragel/%{name}-%{version}.tar.gz
+URL:            http://www.complang.org/%{name}/
+Source0:        http://www.complang.org/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  transfig, tetex-latex
+# for documentation building
+BuildRequires:  transfig, tetex-latex, gcc-objc
 Requires:       gawk
 
 Patch0:         ragel-Makefile-install.patch
@@ -24,10 +25,12 @@
 %prep
 %setup -q
 
-%patch0 -p1
+%patch0 -p0
 
 %build
-%configure 
+# set the names of the other programming commandline programs
+%configure RUBY=ruby JAVAC=javac GMCS=gmcs 
+
 make %{?_smp_mflags}
 pushd doc
 make %{?_smp_mflags}
@@ -51,15 +54,13 @@
 %doc COPYING ragel.vim
 %doc examples
 %doc doc/ragel-guide.pdf
-%{_bindir}/rlgen-ruby
-%{_bindir}/rlgen-java
-%{_bindir}/rlgen-dot
-%{_bindir}/rlgen-cd
-%{_bindir}/rlgen-csharp
 %{_bindir}/ragel
 %{_mandir}/*/*
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-1
+-  Update to 6.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Aug 2008 20:23:44 -0000	1.10
+++ sources	12 Apr 2009 00:48:52 -0000	1.11
@@ -1 +1 @@
-61b53fb53c28b31bec28da8e7bd21351  ragel-6.3.tar.gz
+c0dc274083e9d825bfb48966810de046  ragel-6.4.tar.gz



From jjh at fedoraproject.org  Sun Apr 12 01:52:24 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Sun, 12 Apr 2009 01:52:24 +0000 (UTC)
Subject: rpms/ragel/devel ragel-main.patch,NONE,1.1 ragel.spec,1.15,1.16
Message-ID: <20090412015225.0D0D470126@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18773

Modified Files:
	ragel.spec 
Added Files:
	ragel-main.patch 
Log Message:
testing fix for upstream compilation error in build environment

ragel-main.patch:

--- NEW FILE ragel-main.patch ---
diff -up ./ragel/main.cpp.fedora ./ragel/main.cpp
--- ragel/main.cpp.fedora	2009-04-11 19:19:03.000000000 -0600
+++ ragel/main.cpp	2009-04-11 19:18:34.000000000 -0600
@@ -336,7 +336,7 @@ void processArgs( int argc, const char *
 				printStatistics = true;
 				break;
 			case '-': {
-				char *eq = strchr( pc.paramArg, '=' );
+				char *eq = strchr( (char *)pc.paramArg, '=' );
 
 				if ( eq != 0 )
 					*eq++ = 0;
@@ -507,7 +507,7 @@ char *makeIntermedTemplate( const char *
 {
 	char *result = 0;
 	const char *templ = "ragel-XXXXXX.xml";
-	char *lastSlash = strrchr( baseFileName, '/' );
+	char *lastSlash = strrchr( (char *)baseFileName, '/' );
 	if ( lastSlash == 0 ) {
 		result = new char[strlen(templ)+1];
 		strcpy( result, templ );


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ragel.spec	12 Apr 2009 00:48:52 -0000	1.15
+++ ragel.spec	12 Apr 2009 01:51:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           ragel   
 Version:        6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
@@ -14,6 +14,7 @@
 Requires:       gawk
 
 Patch0:         ragel-Makefile-install.patch
+Patch1:         ragel-main.patch
 
 %description
 Ragel compiles finite state machines from regular languages into executable C,
@@ -26,6 +27,7 @@
 %setup -q
 
 %patch0 -p0
+%patch1 -p0
 
 %build
 # set the names of the other programming commandline programs
@@ -58,6 +60,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-2
+-  add patch for main.cpp
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-1
 -  Update to 6.4
 



From ausil at fedoraproject.org  Sun Apr 12 01:57:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 12 Apr 2009 01:57:29 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools.spec,1.52,1.53
Message-ID: <20090412015729.EC17C70126@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	smartmontools.spec 
Log Message:
remove ExclusiveArch use -fPIE on sparc64



Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- smartmontools.spec	9 Mar 2009 14:57:05 -0000	1.52
+++ smartmontools.spec	12 Apr 2009 01:56:59 -0000	1.53
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -18,7 +18,6 @@
 Requires:	fileutils mailx chkconfig initscripts
 BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext
 BuildRequires: libselinux-devel
-ExclusiveArch:	%{ix86} x86_64 %{arm} ia64 ppc ppc64
 
 %description
 The smartmontools package contains two utility programs (smartctl
@@ -39,8 +38,11 @@
 %build
 ./autogen.sh
 %configure --with-selinux
+%ifarch sparc64
+make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,relro,-z,now"
+%else
 make CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
-
+%endif
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -74,6 +76,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Sat Apr 11 2009 Dennis Gilmore <dennis at ausil.us> - 1:5.38-11
+- remove ExclusiveArch use -fPIE on sparc64  
+- tested builds on sparcv9 sparc64 and s390x
+
 * Mon Mar 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-10
 - cleanup for merge review
 



From cweyl at fedoraproject.org  Sun Apr 12 02:06:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 02:06:25 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/devel .cvsignore, 1.7,
	1.8 perl-Catalyst-Manual.spec, 1.12, 1.13
Message-ID: <20090412020625.7102270126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23481

Modified Files:
	.cvsignore perl-Catalyst-Manual.spec 
Log Message:
* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-2
- reclaim Catalyst::Manual



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Apr 2009 06:58:18 -0000	1.7
+++ .cvsignore	12 Apr 2009 02:05:55 -0000	1.8
@@ -1 +1,7 @@
 Catalyst-Manual-5.7020.tar.gz
+Catalyst-Manual-*
+clog
+noarch
+*.rpm
+*.gz
+.build*


Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Catalyst-Manual.spec	2 Apr 2009 06:58:18 -0000	1.12
+++ perl-Catalyst-Manual.spec	12 Apr 2009 02:05:55 -0000	1.13
@@ -1,7 +1,7 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
 Version:        5.7020
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,11 +48,11 @@
 %doc Changes README t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
-# this is actually better done in perl-Catalyst-Runtime
-%exclude %{perl_vendorlib}/Catalyst/Manual.pm
-%exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %changelog
+* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-2
+- reclaim Catalyst::Manual
+
 * Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7020-1
 - update to 5.7020
 



From cweyl at fedoraproject.org  Sun Apr 12 02:07:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 02:07:07 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/devel .cvsignore, 1.8,
	1.9 perl-Catalyst-Runtime.spec, 1.12, 1.13
Message-ID: <20090412020707.17FE770126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23746

Modified Files:
	.cvsignore perl-Catalyst-Runtime.spec 
Log Message:
* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-2
- return Catalyst::Manual perl-Catalyst-Manual



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Apr 2009 07:02:30 -0000	1.8
+++ .cvsignore	12 Apr 2009 02:06:36 -0000	1.9
@@ -1 +1,7 @@
 Catalyst-Runtime-5.71001.tar.gz
+Catalyst-Runtime-*
+*.rpm
+*.gz
+noarch
+clog
+.build*


Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Catalyst-Runtime.spec	2 Apr 2009 07:02:30 -0000	1.12
+++ perl-Catalyst-Runtime.spec	12 Apr 2009 02:06:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Runtime
 Version:        5.71001
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst core modules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -135,6 +135,9 @@
 %doc Changes COPYING* t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
+# this is properly in perl-Catalyst-Manual
+%exclude %{perl_vendorlib}/Catalyst/Manual.pm
+%exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %files scripts 
 %defattr(-,root,root,-)
@@ -142,6 +145,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-2
+- return Catalyst::Manual perl-Catalyst-Manual
+
 * Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71001-1
 - update to 5.71001
 



From ausil at fedoraproject.org  Sun Apr 12 03:07:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun, 12 Apr 2009 03:07:27 +0000 (UTC)
Subject: rpms/smartmontools/F-10 smartmontools.spec,1.49,1.50
Message-ID: <20090412030728.1A0A670126@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/smartmontools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8605

Modified Files:
	smartmontools.spec 
Log Message:
remove ExclusiveArch use -fPIE on sparc64



Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-10/smartmontools.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- smartmontools.spec	11 Aug 2008 06:04:43 -0000	1.49
+++ smartmontools.spec	12 Apr 2009 03:06:55 -0000	1.50
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -21,7 +21,6 @@
 BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext
 BuildRequires: libselinux-devel
 Obsoletes:	kernel-utils smartmontools-config
-ExclusiveArch:	i386 x86_64 %{arm} ia64 ppc ppc64
 
 %description
 The smartmontools package contains two utility programs (smartctl
@@ -42,7 +41,11 @@
 %build
 ./autogen.sh
 %configure --with-selinux
+%ifarch sparc64
+make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,relro,-z,now"
+%else
 make CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +86,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Sat Apr 11 2009 Dennis Gilmore <dennis at ausil.us> - 1:5.38-8
+- remove ExclusiveArch use -fPIE on sparc64
+- tested builds on sparcv9 sparc64 and s390x
+
 * Mon Aug 11 2008 Tomas Smetana <tsmetana at redhat.com> - 1:5.38-7
 - fix #458549 - obsolete smartmontools-config
 - change the default configuration file



From kushal at fedoraproject.org  Sun Apr 12 08:50:47 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Sun, 12 Apr 2009 08:50:47 +0000 (UTC)
Subject: rpms/python-chardet/devel import.log, NONE, 1.1 python-chardet.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412085047.B4EA270126@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-chardet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25062/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-chardet.spec 
Log Message:
Found the long lost srpm, imported first time.



--- NEW FILE import.log ---
python-chardet-1_0_1-1_fc9:HEAD:python-chardet-1.0.1-1.fc9.src.rpm:1239526287


--- NEW FILE python-chardet.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-chardet
Version:        1.0.1
Release:        1%{?dist}
Summary:        Character encoding auto-detection in Python

Group:          Development/Languages
License:        LGPLv2
URL:            http://chardet.feedparser.org
Source0:        http://chardet.feedparser.org/download/chardet-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Character encoding auto-detection in Python. As 
smart as your browser. Open source.

%prep
%setup -q -n chardet-%{version}



%build
# Remove CFLAGS=... for noarch packages (unneeded)
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod -x COPYING
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
# For noarch packages: sitelib
%{python_sitelib}/*


%changelog
* Mon Aug 04 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Aug 2008 16:27:29 -0000	1.1
+++ .cvsignore	12 Apr 2009 08:50:14 -0000	1.2
@@ -0,0 +1 @@
+chardet-1.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Aug 2008 16:27:29 -0000	1.1
+++ sources	12 Apr 2009 08:50:15 -0000	1.2
@@ -0,0 +1 @@
+f8c510a6fac300fe0ac9a0c24a76a7ba  chardet-1.0.1.tgz



From denis at fedoraproject.org  Sun Apr 12 09:00:06 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 12 Apr 2009 09:00:06 +0000 (UTC)
Subject: rpms/libxml++/devel .cvsignore, 1.11, 1.12 libxml++.spec, 1.26,
	1.27 sources, 1.11, 1.12
Message-ID: <20090412090006.6788170126@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libxml++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27394

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Update to upstream 2.26.0 (to match Gnome release)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Jan 2009 12:03:59 -0000	1.11
+++ .cvsignore	12 Apr 2009 08:59:35 -0000	1.12
@@ -1 +1 @@
-libxml++-2.24.2.tar.bz2
+libxml++-2.26.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libxml++.spec	25 Feb 2009 20:09:28 -0000	1.26
+++ libxml++.spec	12 Apr 2009 08:59:35 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           libxml++
-Version:        2.24.2
-Release:        2%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-1
+- Update to upstream 2.26.0 (to match Gnome release)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Jan 2009 12:03:59 -0000	1.11
+++ sources	12 Apr 2009 08:59:35 -0000	1.12
@@ -1 +1 @@
-ec98c0975cc21d62c3e9e71f3beffde2  libxml++-2.24.2.tar.bz2
+a52fc7e6e44bb5cc187672930b843f72  libxml++-2.26.0.tar.bz2



From mtasaka at fedoraproject.org  Sun Apr 12 09:28:06 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 12 Apr 2009 09:28:06 +0000 (UTC)
Subject: rpms/kazehakase/devel
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch, NONE,
	1.1 kazehakase-0.5.6-rev3769-embed-vendor-version.patch, NONE,
	1.1 kazehakase.spec, 1.79, 1.80
Message-ID: <20090412092806.985D370126@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3914

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch 
	kazehakase-0.5.6-rev3769-embed-vendor-version.patch 
Log Message:
* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-9.svn3769_trunk
- Prevent crash even if no modules are installed (related to bug 444569)
- Embed Vendor version information


kazehakase-0.5.6-rev3769-crash-no_module_installed.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-crash-no_module_installed.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/kz-window.c.debug	2009-04-12 15:31:16.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/kz-window.c	2009-04-12 15:41:27.000000000 +0900
@@ -859,6 +859,7 @@
 	if (url) g_return_val_if_fail(g_utf8_validate(url, strlen(url), NULL), NULL);
 
 	kzembed = kz_window_create_embed(kz);
+	g_return_val_if_fail(kzembed, NULL);
 	kztab = KZ_TAB_LABEL(kz_tab_label_new(kz, kzembed));
 
 	gtk_widget_show_all(GTK_WIDGET(kzembed));

kazehakase-0.5.6-rev3769-embed-vendor-version.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-embed-vendor-version.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c.version	2009-01-28 04:25:07.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c	2009-04-12 18:01:15.000000000 +0900
@@ -95,7 +95,12 @@
 			GDK_RGB_DITHER_NORMAL,
 			0, 0);
 	/* Draw version and backends under the logo */
-	version = g_strdup_printf (_("Version %s"), VERSION);
+	version = g_strdup_printf (_("Version %s"), 
+#ifdef VERSION_VENDOR
+		VERSION_VENDOR);
+#else
+		VERSION);
+#endif
 	backends = backend_names();
 	if (backends)
 	{


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kazehakase.spec	11 Apr 2009 17:00:05 -0000	1.79
+++ kazehakase.spec	12 Apr 2009 09:28:03 -0000	1.80
@@ -34,7 +34,7 @@
 %define		svnver		3769_trunk
 
 
-%define		fedorarel	8
+%define		fedorarel	9
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -56,6 +56,9 @@
 # kazehakase crashed when only kazehakase-webkit is installed
 # (bug 444569)
 Patch12:	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch
+# Also prevent crash even if no modules are installed
+Patch13:	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch
+Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -183,6 +186,8 @@
 
 %patch11 -p0 -b .rhbug
 %patch12 -p1 -b .onlywebkit
+%patch13 -p1 -b .nomodule
+%patch14 -p1 -b .evr
 
 %if %{need_autogen}
 sh autogen.sh
@@ -233,6 +238,8 @@
 	%{_builddir}/%{name}-%{version}%{?usesvn:-svn%svnver}/%{name}-filter-requires.sh
 
 %build
+export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
+
 %configure \
 	CC="%{__cc} `nspr-config --cflags`" \
 	CXX="%{__cxx} `nspr-config --cflags`" \
@@ -325,6 +332,10 @@
 %endif
 
 %changelog
+* Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-9.svn3769_trunk
+- Prevent crash even if no modules are installed (related to bug 444569)
+- Embed Vendor version information
+
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-8.svn3769_trunk
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
 



From thias at fedoraproject.org  Sun Apr 12 11:01:41 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 11:01:41 +0000 (UTC)
Subject: rpms/glusterfs/F-9 glusterfs.spec,1.3,1.4
Message-ID: <20090412110141.99E0670137@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28638/F-9

Modified Files:
	glusterfs.spec 
Log Message:
Fix the common sub-package's obsoletes of libs. A simple typo which might cause major problems...



Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/F-9/glusterfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glusterfs.spec	16 Feb 2009 12:24:48 -0000	1.3
+++ glusterfs.spec	12 Apr 2009 11:01:37 -0000	1.4
@@ -14,7 +14,7 @@
 Summary: Cluster File System
 Name: glusterfs
 Version: 1.3.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/docs/index.php/GlusterFS
@@ -44,7 +44,7 @@
 %package libs
 Summary: GlusterFS Library and Translators
 Group: System Environment/Libraries
-Obsoletes: glusterfs-common >= 1.3.7-2
+Obsoletes: glusterfs-common <= 1.3.7-2
 
 %description libs
 GlusterFS is a clustered file-system capable of scaling to several
@@ -213,6 +213,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-2
+- Fix the common sub-package's obsoletes of libs. A simple typo which might
+  cause major problems...
+
 * Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
 - Update to 1.3.12.
 - Remove no longer needed ocreat patch.



From thias at fedoraproject.org  Sun Apr 12 11:02:06 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 11:02:06 +0000 (UTC)
Subject: rpms/glusterfs/EL-5 glusterfs.spec,1.4,1.5
Message-ID: <20090412110206.C436170138@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28638/EL-5

Modified Files:
	glusterfs.spec 
Log Message:
Fix the common sub-package's obsoletes of libs. A simple typo which might cause major problems...



Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-5/glusterfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glusterfs.spec	16 Feb 2009 12:24:47 -0000	1.4
+++ glusterfs.spec	12 Apr 2009 11:01:35 -0000	1.5
@@ -14,7 +14,7 @@
 Summary: Cluster File System
 Name: glusterfs
 Version: 1.3.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/docs/index.php/GlusterFS
@@ -44,7 +44,7 @@
 %package libs
 Summary: GlusterFS Library and Translators
 Group: System Environment/Libraries
-Obsoletes: glusterfs-common >= 1.3.7-2
+Obsoletes: glusterfs-common <= 1.3.7-2
 
 %description libs
 GlusterFS is a clustered file-system capable of scaling to several
@@ -213,6 +213,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-2
+- Fix the common sub-package's obsoletes of libs. A simple typo which might
+  cause major problems...
+
 * Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
 - Update to 1.3.12.
 - Remove no longer needed ocreat patch.



From thias at fedoraproject.org  Sun Apr 12 11:02:07 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 11:02:07 +0000 (UTC)
Subject: rpms/glusterfs/F-10 glusterfs.spec,1.6,1.7
Message-ID: <20090412110207.96A8170138@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28638/F-10

Modified Files:
	glusterfs.spec 
Log Message:
Fix the common sub-package's obsoletes of libs. A simple typo which might cause major problems...



Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/F-10/glusterfs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glusterfs.spec	16 Feb 2009 12:24:47 -0000	1.6
+++ glusterfs.spec	12 Apr 2009 11:01:36 -0000	1.7
@@ -14,7 +14,7 @@
 Summary: Cluster File System
 Name: glusterfs
 Version: 1.3.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/docs/index.php/GlusterFS
@@ -44,7 +44,7 @@
 %package libs
 Summary: GlusterFS Library and Translators
 Group: System Environment/Libraries
-Obsoletes: glusterfs-common >= 1.3.7-2
+Obsoletes: glusterfs-common <= 1.3.7-2
 
 %description libs
 GlusterFS is a clustered file-system capable of scaling to several
@@ -213,6 +213,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-2
+- Fix the common sub-package's obsoletes of libs. A simple typo which might
+  cause major problems...
+
 * Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
 - Update to 1.3.12.
 - Remove no longer needed ocreat patch.



From thias at fedoraproject.org  Sun Apr 12 11:02:05 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 11:02:05 +0000 (UTC)
Subject: rpms/glusterfs/EL-4 glusterfs.spec,1.3,1.4
Message-ID: <20090412110205.97D6070137@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28638/EL-4

Modified Files:
	glusterfs.spec 
Log Message:
Fix the common sub-package's obsoletes of libs. A simple typo which might cause major problems...



Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/EL-4/glusterfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glusterfs.spec	16 Feb 2009 12:24:46 -0000	1.3
+++ glusterfs.spec	12 Apr 2009 11:01:34 -0000	1.4
@@ -14,7 +14,7 @@
 Summary: Cluster File System
 Name: glusterfs
 Version: 1.3.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/docs/index.php/GlusterFS
@@ -44,7 +44,7 @@
 %package libs
 Summary: GlusterFS Library and Translators
 Group: System Environment/Libraries
-Obsoletes: glusterfs-common >= 1.3.7-2
+Obsoletes: glusterfs-common <= 1.3.7-2
 
 %description libs
 GlusterFS is a clustered file-system capable of scaling to several
@@ -213,6 +213,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-2
+- Fix the common sub-package's obsoletes of libs. A simple typo which might
+  cause major problems...
+
 * Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
 - Update to 1.3.12.
 - Remove no longer needed ocreat patch.



From lucilanga at fedoraproject.org  Sun Apr 12 12:35:21 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 12 Apr 2009 12:35:21 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss-0.1.2-updateinterval.patch, 
	NONE, 1.1 evolution-rss.spec, 1.23, 1.24
Message-ID: <20090412123522.3417770126@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19322

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.2-updateinterval.patch 
Log Message:
* Sat Apr 11 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-5
- temporary fix for bug #489217: set interval longer than 100 minutes

evolution-rss-0.1.2-updateinterval.patch:

--- NEW FILE evolution-rss-0.1.2-updateinterval.patch ---
Index: src/rss-config-factory.c
===================================================================
--- src/rss-config-factory.c	(revision 499)
+++ src/rss-config-factory.c	(working copy)
@@ -374,6 +374,7 @@
 	GtkWidget *radiobutton5 = (GtkWidget *)glade_xml_get_widget (gui, "ttl");
 	GtkWidget *radiobutton6 = (GtkWidget *)glade_xml_get_widget (gui, "ttl_disabled");
 	GtkWidget *ttl_value = (GtkWidget *)glade_xml_get_widget (gui, "ttl_value");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(ttl_value), 0, 10000);
 
   	switch (del_feed)
   	{


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- evolution-rss.spec	8 Mar 2009 11:36:29 -0000	1.23
+++ evolution-rss.spec	12 Apr 2009 12:34:47 -0000	1.24
@@ -1,33 +1,35 @@
-Summary: Evolution RSS Reader
-Name: evolution-rss
-Version: 0.1.2
-Release: 4%{?dist}
-Group: Applications/Internet
-License: GPLv2 and GPLv2+
-Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
-Requires: evolution
-
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-
-BuildRequires: gettext
-BuildRequires: evolution-devel
-BuildRequires: evolution-data-server-devel 
-BuildRequires: dbus-glib-devel
-BuildRequires: xulrunner-devel-unstable
-BuildRequires: WebKit-gtk-devel
-BuildRequires: perl(XML::Parser)
-BuildRequires: libtool
-BuildRequires: intltool
+Name:		evolution-rss
+Summary:	Evolution RSS Reader
+Version:	0.1.2
+Release:	5%{?dist}
+Group:		Applications/Internet
+License:	GPLv2 and GPLv2+
+URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
+Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
+Patch0:		evolution-rss-0.1.2-updateinterval.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	evolution
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(preun):GConf2
+
+BuildRequires:	gettext
+BuildRequires:	evolution-devel
+BuildRequires:	evolution-data-server-devel 
+BuildRequires:	dbus-glib-devel
+BuildRequires:	xulrunner-devel-unstable
+BuildRequires:	WebKit-gtk-devel
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	libtool
+BuildRequires:	intltool
 
 %description
 This is an evolution plugin which enables evolution to read rss feeds.
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p0 -b .updateinterval
 
 %build
 %configure
@@ -67,6 +69,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
 # Only the following binary is under GPLv2. Other
 # parts are under GPLv2+.
 %{_bindir}/evolution-import-rss
@@ -78,15 +81,11 @@
 %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.xml
 %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
-%doc AUTHORS
-%doc COPYING
-%doc ChangeLog
-%doc FAQ
-%doc NEWS
-%doc README
-%doc TODO
 
 %changelog
+* Sat Apr 11 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-5
+- temporary fix for bug #489217: set interval longer than 100 minutes
+
 * Sun Mar 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-4
 - rebuild against newer webkit
 



From thias at fedoraproject.org  Sun Apr 12 12:53:24 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 12:53:24 +0000 (UTC)
Subject: rpms/glusterfs/devel glusterfs.logrotate, NONE,
	1.1 glusterfsd.logrotate, NONE, 1.1 glusterfs.spec, 1.8,
	1.9 glusterfsd.init, 1.2, 1.3 glusterfsd.sysconfig, 1.2, 1.3
Message-ID: <20090412125325.70C7170126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glusterfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25558

Modified Files:
	glusterfs.spec glusterfsd.init glusterfsd.sysconfig 
Added Files:
	glusterfs.logrotate glusterfsd.logrotate 
Log Message:
* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.2.rc7
- Update glusterfsd init script to the new style init.
- Update files to match the new default vol file names.
- Include logrotate for glusterfsd, use a pid file by default.
- Include logrotate for glusterfs, using killall for lack of anything better.



--- NEW FILE glusterfs.logrotate ---
/var/log/glusterfs/glusterfs.log {
    missingok
    postrotate
        /usr/bin/killall -HUP glusterfs 2>/dev/null || true
    endscript
}


--- NEW FILE glusterfsd.logrotate ---
/var/log/glusterfs/glusterfsd.log {
    missingok
    postrotate
        /bin/kill -HUP `cat /var/run/glusterfsd.pid 2>/dev/null` 2>/dev/null || true
    endscript
}


Index: glusterfs.spec
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/glusterfs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glusterfs.spec	11 Apr 2009 10:52:29 -0000	1.8
+++ glusterfs.spec	12 Apr 2009 12:52:51 -0000	1.9
@@ -16,7 +16,7 @@
 Summary: Cluster File System
 Name: glusterfs
 Version: 2.0.0
-Release: 0.1%{?pre:.%{pre}}%{?dist}
+Release: 0.2%{?pre:.%{pre}}%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: http://www.gluster.org/docs/index.php/GlusterFS
@@ -24,6 +24,8 @@
 Source1: glusterfsd.init
 Source2: glusterfsd.sysconfig
 Source3: umount.glusterfs
+Source4: glusterfs.logrotate
+Source5: glusterfsd.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -161,8 +163,15 @@
 # Install wrapper umount script
 %{__install} -D -p -m 0755 %{SOURCE3} \
     %{buildroot}/sbin/umount.glusterfs
+# Client logrotate entry
+%{__install} -D -p -m 0644 %{SOURCE4} \
+    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
 %endif
 
+# Server logrotate entry
+%{__install} -D -p -m 0644 %{SOURCE5} \
+    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -199,6 +208,7 @@
 
 %if 0%{!?_without_client:1}
 %files client
+%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
 /sbin/mount.glusterfs
 /sbin/umount.glusterfs
 %endif
@@ -208,6 +218,7 @@
 %doc examples/ doc/glusterfs*.vol.sample
 %dir %{_sysconfdir}/glusterfs/
 %config(noreplace) %{_sysconfdir}/glusterfs/*.vol
+%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 %{_sysconfdir}/init.d/glusterfsd
 %{_sbindir}/glusterfsd
@@ -222,6 +233,12 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.2.rc7
+- Update glusterfsd init script to the new style init.
+- Update files to match the new default vol file names.
+- Include logrotate for glusterfsd, use a pid file by default.
+- Include logrotate for glusterfs, using killall for lack of anything better.
+
 * Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc7
 - Update to 2.0.0rc7.
 - Rename "libs" to "common" and move the binary, man page and log dir there.


Index: glusterfsd.init
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/glusterfsd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glusterfsd.init	16 Feb 2009 12:24:48 -0000	1.2
+++ glusterfsd.init	12 Apr 2009 12:52:52 -0000	1.3
@@ -2,70 +2,106 @@
 #
 # glusterfsd   Startup script for the glusterfs server
 #
-# chkconfig: - 20 80
+# chkconfig:   - 20 80
 # description: Clustered file-system server
-#
-# processname: glusterfsd
-# config: /etc/glusterfs/glusterfs-server.vol
-# pidfile: /var/run/glusterfsd.pid
 
-# Source function library
+### BEGIN INIT INFO
+# Provides: glusterfsd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: glusterfs server
+# Description:       Clustered file-system server
+### END INIT INFO
+
+# Source function library.
 . /etc/rc.d/init.d/functions
 
+exec="/usr/sbin/glusterfsd"
 prog="glusterfsd"
-glusterfsd="/usr/sbin/glusterfsd"
-RETVAL=0
 
 # Set defaults, then source config for eventual overrides
-GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfs-server.vol"
-GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfsd.log"
-GLUSTERFSD_LOGLEVEL="WARNING"
 GLUSTERFSD_NOFILE="65536"
-[ -f /etc/sysconfig/glusterfsd ] && source /etc/sysconfig/glusterfsd
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	echo -n $"Starting $prog: "
-	ulimit -n ${GLUSTERFSD_NOFILE}
-	daemon $glusterfsd -f ${GLUSTERFSD_CONFIG} -l ${GLUSTERFSD_LOGFILE} -L ${GLUSTERFSD_LOGLEVEL}
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	return $RETVAL
+    [ -x $exec ] || exit 5
+    [ -f $GLUSTERFSD_CONFIG ] || exit 6
+    ulimit -n $GLUSTERFSD_NOFILE
+    echo -n $"Starting $prog: "
+    daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterfsd.pid
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	echo -n $"Stopping $prog: "
-	killproc $glusterfsd
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-	return $RETVAL
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
 }
 
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart|reload)
-		stop
-		start
-		;;
-	condrestart)
-		if [ -f /var/lock/subsys/$prog ]; then
-			stop
-			start
-		fi
-		;;
-	status)
-		status $glusterfsd
-		RETVAL=$?
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-		RETVAL=1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
+exit $?
 
-exit $RETVAL


Index: glusterfsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/glusterfs/devel/glusterfsd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glusterfsd.sysconfig	16 Feb 2009 12:24:48 -0000	1.2
+++ glusterfsd.sysconfig	12 Apr 2009 12:52:52 -0000	1.3
@@ -1,8 +1,8 @@
 # Change the glusterfsd service defaults here.
-# LOGLEVEL is one of DEBUG WARNING ERROR (default) CRITICAL or NONE
+# See "glusterfsd --help" outpout for defaults and possible values.
 
-#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfs-server.vol"
-#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfsd.log"
-#GLUSTERFSD_LOGLEVEL="ERROR"
+#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfsd.vol"
+#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfs.log"
+#GLUSTERFSD_LOGLEVEL="NORMAL"
 #GLUSTERFSD_NOFILE="65536"
 



From lkundrak at fedoraproject.org  Sun Apr 12 13:56:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 12 Apr 2009 13:56:23 +0000 (UTC)
Subject: rpms/yofrankie-bge/devel yofrankie-bge-1.3-wrapper.patch, NONE,
	1.1 sources, 1.2, 1.3 yofrankie-bge.spec, 1.2, 1.3
Message-ID: <20090412135624.25AE570137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/yofrankie-bge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24265

Modified Files:
	sources yofrankie-bge.spec 
Added Files:
	yofrankie-bge-1.3-wrapper.patch 
Log Message:
* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.4-0.4.20090412svn
- Update the SVN snapshots with new levels
- Enhancements to the wrapper


yofrankie-bge-1.3-wrapper.patch:

--- NEW FILE yofrankie-bge-1.3-wrapper.patch ---
Pass parameters to the wrapper and don't unnecessarily keep the shell
in memory.

Lubomir Rintle <lkundrak at v3.sk>

Index: dist/yofrankie-bge
===================================================================
--- dist/yofrankie-bge	(revision 34)
+++ dist/yofrankie-bge	(working copy)
@@ -1,3 +1,3 @@
-#!/bin/sh
-blenderplayer /usr/share/yofrankie-bge/levels/start_menu.blend
+#!/bin/bash
+exec blenderplayer "$@" /usr/share/yofrankie-bge/levels/start_menu.blend
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yofrankie-bge/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2009 06:12:50 -0000	1.2
+++ sources	12 Apr 2009 13:55:50 -0000	1.3
@@ -1 +1 @@
-5a42b730256448211a704bf634669895  yofrankie-bge.tar.lzma
+0aa3d210a69be80a90055bcb7257579b  yofrankie-bge.tar.lzma


Index: yofrankie-bge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yofrankie-bge/devel/yofrankie-bge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yofrankie-bge.spec	16 Mar 2009 06:31:31 -0000	1.2
+++ yofrankie-bge.spec	12 Apr 2009 13:55:50 -0000	1.3
@@ -3,7 +3,7 @@
 # The site puts the last "technical demo" before the DVD release at
 # version 1.2; that may make the DVD version 1.3.
 Version:        1.4
-Release:        0.4.20081221svn
+Release:        0.4.20090412svn
 Summary:        3D Game with characters from Big Buck Bunny movie
 
 Group:          Amusements/Games
@@ -17,14 +17,16 @@
 # modify the contents, but use on cover art is restricted).
 License:        CC-BY and Freely redistributable without restriction
 URL:            http://www.yofrankie.org/
-# svn export -r9 https://svn.blender.org/svnroot/yofrankie at 9 yofrankie-bge
+# svn export -r34 https://svn.blender.org/svnroot/yofrankie at 34 yofrankie-bge
 # tar cf - yofrankie-bge |lzma -c -9 >yofrankie-bge.tar.lzma
-Source0:        yofrankie-bge.tar.lzma
+#Source0:        yofrankie-bge.tar.lzma
+Source0:        yofrankie-bge.tar.gz
 # This is the license as it is on the Game DVD
 # Game developer confirmed that this is the license to be used here
 # and was asked to include it in SVN repository
 Source1:        yofrankie-DVD-license.txt 
 Patch0:         yofrankie-bge-1.3-imgcompr.patch
+Patch1:         yofrankie-bge-1.3-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -47,7 +49,10 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .imgcompr
+# This is (probably temporarily) disabled by upstream, but we may want
+# to disable it even once upstream enables it again
+#%patch0 -p1 -b .imgcompr
+%patch1 -p0 -b .wrapper
 install -pm 0644 %{SOURCE1} yofrankie-DVD-license.txt
 
 
@@ -87,6 +92,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.4-0.4.20090412svn
+- Update the SVN snapshots with new levels
+- Enhancements to the wrapper
+
 * Mon Mar 16 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.4-0.4.20081221svn
 - Further licensing clarification
 



From lkundrak at fedoraproject.org  Sun Apr 12 14:02:02 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 12 Apr 2009 14:02:02 +0000 (UTC)
Subject: rpms/yofrankie-bge/devel yofrankie-bge.spec,1.3,1.4
Message-ID: <20090412140202.986C470126@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/yofrankie-bge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26629

Modified Files:
	yofrankie-bge.spec 
Log Message:
* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.4-0.4.20090412svn
- Update the SVN snapshots with new levels
- Enhancements to the wrapper



Index: yofrankie-bge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yofrankie-bge/devel/yofrankie-bge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yofrankie-bge.spec	12 Apr 2009 13:55:50 -0000	1.3
+++ yofrankie-bge.spec	12 Apr 2009 14:01:31 -0000	1.4
@@ -19,8 +19,7 @@
 URL:            http://www.yofrankie.org/
 # svn export -r34 https://svn.blender.org/svnroot/yofrankie at 34 yofrankie-bge
 # tar cf - yofrankie-bge |lzma -c -9 >yofrankie-bge.tar.lzma
-#Source0:        yofrankie-bge.tar.lzma
-Source0:        yofrankie-bge.tar.gz
+Source0:        yofrankie-bge.tar.lzma
 # This is the license as it is on the Game DVD
 # Game developer confirmed that this is the license to be used here
 # and was asked to include it in SVN repository



From pkgdb at fedoraproject.org  Sun Apr 12 14:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:25:07 +0000
Subject: [pkgdb] bluez: holtmann has requested watchcommits
Message-ID: <20090412142357.A46D210F80B@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchcommits acl on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sun Apr 12 14:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:25:40 +0000
Subject: [pkgdb] bluez-hcidump: holtmann has requested watchbugzilla
Message-ID: <20090412142432.E72BF10F80B@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchbugzilla acl on bluez-hcidump (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sun Apr 12 14:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:24:33 +0000
Subject: [pkgdb] bluez-hcidump: holtmann has requested watchcommits
Message-ID: <20090412142435.9AC2D10F87D@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchcommits acl on bluez-hcidump (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-hcidump



From pkgdb at fedoraproject.org  Sun Apr 12 14:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:24:54 +0000
Subject: [pkgdb] obexd: holtmann has requested watchbugzilla
Message-ID: <20090412142458.D4C6310F806@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchbugzilla acl on obexd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/obexd



From pkgdb at fedoraproject.org  Sun Apr 12 14:26:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:26:11 +0000
Subject: [pkgdb] obexd: holtmann has requested watchcommits
Message-ID: <20090412142502.2B08C10F87D@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchcommits acl on obexd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/obexd



From pkgdb at fedoraproject.org  Sun Apr 12 14:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:25:19 +0000
Subject: [pkgdb] openobex: holtmann has requested watchbugzilla
Message-ID: <20090412142523.BA70710F87C@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchbugzilla acl on openobex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openobex



From pkgdb at fedoraproject.org  Sun Apr 12 14:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:25:24 +0000
Subject: [pkgdb] openobex: holtmann has requested watchcommits
Message-ID: <20090412142526.56E8310F87F@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchcommits acl on openobex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openobex



From pkgdb at fedoraproject.org  Sun Apr 12 14:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:26:57 +0000
Subject: [pkgdb] libgdbus: holtmann has requested watchbugzilla
Message-ID: <20090412142549.CF3CB10F87C@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchbugzilla acl on libgdbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgdbus



From pkgdb at fedoraproject.org  Sun Apr 12 14:27:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:27:01 +0000
Subject: [pkgdb] libgdbus: holtmann has requested watchcommits
Message-ID: <20090412142552.077ED10F87E@bastion2.fedora.phx.redhat.com>

holtmann has requested the watchcommits acl on libgdbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgdbus



From pkgdb at fedoraproject.org  Sun Apr 12 14:27:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:27:30 +0000
Subject: [pkgdb] bluez: holtmann has given up watchbugzilla
Message-ID: <20090412142623.0AB2E10F80B@bastion2.fedora.phx.redhat.com>

holtmann has given up the watchbugzilla acl on bluez (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Sun Apr 12 14:27:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 14:27:35 +0000
Subject: [pkgdb] bluez: holtmann has given up watchcommits
Message-ID: <20090412142625.8F64510F87E@bastion2.fedora.phx.redhat.com>

holtmann has given up the watchcommits acl on bluez (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From rakesh at fedoraproject.org  Sun Apr 12 14:39:10 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 14:39:10 +0000 (UTC)
Subject: rpms/lynis/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 lynis.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090412143910.B54AF70126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/lynis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3209/devel

Modified Files:
	.cvsignore import.log lynis.spec sources 
Log Message:
Updated to 1.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 04:14:39 -0000	1.2
+++ .cvsignore	12 Apr 2009 14:38:37 -0000	1.3
@@ -1 +1 @@
-lynis-1.2.1.tar.gz
+lynis-1.2.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 04:14:39 -0000	1.1
+++ import.log	12 Apr 2009 14:38:37 -0000	1.2
@@ -1 +1,2 @@
 lynis-1_2_1-3_fc10:HEAD:lynis-1.2.1-3.fc10.src.rpm:1226137230
+lynis-1_2_6-1_fc11:HEAD:lynis-1.2.6-1.fc11.src.rpm:1239546793


Index: lynis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/lynis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lynis.spec	25 Feb 2009 22:27:36 -0000	1.2
+++ lynis.spec	12 Apr 2009 14:38:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lynis
-Version:        1.2.1
-Release:        4%{?dist}
+Version:        1.2.6
+Release:        1%{?dist}
 Summary:        Security and system auditing tool
 Group:          Applications/System
 License:        GPLv3
@@ -54,7 +54,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG FAQ LICENSE README TODO
+%doc CHANGELOG FAQ LICENSE README
 %{_mandir}/man8/lynis.8.gz
 %{_bindir}/lynis
 %{_datadir}/%{name}
@@ -63,6 +63,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/default.prf
 
 %changelog
+* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraporject.org> - 1.2.6-1
+- Updated to 1.2.6: CHANHELOG for details
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 04:14:39 -0000	1.2
+++ sources	12 Apr 2009 14:38:37 -0000	1.3
@@ -1 +1 @@
-4f8db3c524c1014db5842ca2dbd575aa  lynis-1.2.1.tar.gz
+46921fc56873a53074f4cf6775ce9007  lynis-1.2.6.tar.gz



From thias at fedoraproject.org  Sun Apr 12 14:47:00 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 14:47:00 +0000 (UTC)
Subject: rpms/boa/devel boa-0.94.14rc21-config.patch, NONE, 1.1 boa.init, 1.1,
	1.2 boa.spec, 1.15, 1.16 boa.sysconfig, 1.1,
	1.2 boa-0.94.14rc17-config.patch, 1.3, NONE
Message-ID: <20090412144700.B134D70126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/boa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4940

Modified Files:
	boa.init boa.spec boa.sysconfig 
Added Files:
	boa-0.94.14rc21-config.patch 
Removed Files:
	boa-0.94.14rc17-config.patch 
Log Message:
* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.94.14-0.12.rc21
- Update init script to the new style.
- Move boa_indexer to libexec, as it makes more sense there.
- Fix cgi-bin location in the config patch.


boa-0.94.14rc21-config.patch:

--- NEW FILE boa-0.94.14rc21-config.patch ---
diff -Naupr boa-0.94.14rc21.orig/examples/boa.conf boa-0.94.14rc21/examples/boa.conf
--- boa-0.94.14rc21.orig/examples/boa.conf	2003-02-02 06:02:22.000000000 +0100
+++ boa-0.94.14rc21/examples/boa.conf	2009-04-12 16:32:00.412150369 +0200
@@ -45,14 +45,14 @@ Port 80
 #  User: The name or UID the server should run as.
 # Group: The group name or GID the server should run as.
 
-User nobody
-Group nogroup
+User boa
+Group boa
 
 # ServerAdmin: The email address where server problems should be sent.
 # Note: this is not currently used, except as an environment variable
 # for CGIs.
 
-#ServerAdmin root at localhost
+ServerAdmin root at localhost
 
 # PidFile: where to put the pid of the process.
 # Comment out to write no pid file.
@@ -155,7 +155,7 @@ AccessLog /var/log/boa/access_log
 # DocumentRoot: The root directory of the HTML documents.
 # Comment out to disable server non user files.
 
-DocumentRoot /var/www
+DocumentRoot /var/www/boa/html
 
 # UserDir: The name of the directory which is appended onto a user's home
 # directory if a ~user request is received.
@@ -174,7 +174,7 @@ DirectoryIndex index.html
 # DirectoryIndex are commented out, accessing a directory will give
 # an error (though accessing files in the directory are still ok).
 
-DirectoryMaker /usr/lib/boa/boa_indexer
+DirectoryMaker /usr/libexec/boa/boa_indexer
 
 # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
 # has been commented out, the the on-the-fly indexing of Boa can be used
@@ -217,7 +217,8 @@ CGIPath /bin:/usr/bin:/usr/local/bin
 # Example: AddType type extension [extension ...]
 
 # Uncomment the next line if you want .cgi files to execute from anywhere
-#AddType application/x-httpd-cgi cgi
+AddType application/x-httpd-cgi cgi
+AddType application/x-httpd-cgi pl
 
 # Redirect, Alias, and ScriptAlias all have the same semantics -- they
 # match the beginning of a request and take appropriate action.  Use
@@ -232,10 +233,10 @@ CGIPath /bin:/usr/bin:/usr/local/bin
 # Aliases: Aliases one path to another.
 # Example: Alias /path1/bar /path2/foo
 
-Alias /doc /usr/doc
+# Alias /doc /usr/doc
 
 # ScriptAlias: Maps a virtual path to a directory for serving scripts
 # Example: ScriptAlias /htbin/ /www/htbin/
 
-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+ScriptAlias /cgi-bin/ /var/www/boa/cgi-bin/
 


Index: boa.init
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boa.init	9 Nov 2004 02:43:26 -0000	1.1
+++ boa.init	12 Apr 2009 14:46:58 -0000	1.2
@@ -1,93 +1,111 @@
-#!/bin/bash
+#!/bin/sh
 #
-# $Id$
+# boa          Boa web server
 #
-# boa		This shell script takes care of starting and stopping \
-#		the boa webserver
-#
-# chkconfig: - 85 15
-# description:	This web server is used to serve HTML files and CGI scripts.
-#
-# processname: boa
-# config: /etc/boa/boa.conf
+# chkconfig:   - 85 15
+# description: Web server used to serve HTML files and CGI scripts.
+
+### BEGIN INIT INFO
+# Provides: httpd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: Boa web server
+# Description:       Web server used to serve HTML files and CGI scripts.
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
+exec="/usr/sbin/boa"
+prog="boa"
+config="/etc/boa/boa.conf"
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-[ -f /etc/boa/boa.conf ] || exit 0
-[ -f /etc/sysconfig/boa ] && . /etc/sysconfig/boa
- 
-# Optional configuration
 TMP=${TMP:=/tmp}
-[ -n "${SERVERROOT}" ] && BOA_OPTIONS="-c "${SERVERROOT}
-[ -n "${CHROOT}" ] && BOA_OPTIONS="-r "${CHROOT}
 
-RETVAL=0
-prog="boa"
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	# Start daemons.
-	echo -n $"Starting $prog: "
-	daemon boa ${BOA_OPTIONS}
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/boa
-	echo
-	return $RETVAL
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    # Remove stderr since messages get spit out when the DEBUG_LEVEL is high
+    daemon $exec${SERVERROOT+" -c $SERVERROOT"}${CHROOT+" -r $CHROOT"}${DEBUG_LEVEL+" -l $DEBUG_LEVEL"} 2>/dev/null
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	# Stop daemons.
-	echo -n $"Stopping $prog: "
-	killproc boa
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/boa
-	echo
-	return $RETVAL
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
 }
 
 reload() {
-	# REload daemons.
-	echo -n $"Reloading $prog: "
-	killproc boa -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
+    echo -n $"Reloading $prog: "
+    killproc $prog -HUP
+    retval=$?
+    echo
+    return $retval
 }
 
-restart() {
-	stop
-	start
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
 }
 
-# See how we were called.
+
 case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-	status boa
-	;;
-  reload)
-	reload
-	;;
-  restart)
-	restart
-	;;
-  condrestart)
-	[ -f /var/lock/subsys/boa ] && restart
-	;;
-  *)
-	echo $"Usage: boa {start|stop|status|reload|restart|condrestart}"
-	exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
 exit $?
+


Index: boa.spec
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- boa.spec	24 Feb 2009 05:20:30 -0000	1.15
+++ boa.spec	12 Apr 2009 14:46:58 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: Single-tasking HTTP server
 Name: boa
 Version: 0.94.14
-Release: 0.11%{?rcver:.%{rcver}}%{?dist}
+Release: 0.12%{?rcver:.%{rcver}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.boa.org/
@@ -13,7 +13,7 @@
 Source2: boa.sysconfig
 Source10: index.html
 Source11: boa_logo_pasi2.png
-Patch0: boa-0.94.14rc17-config.patch
+Patch0: boa-0.94.14rc21-config.patch
 Patch1: boa-0.94.14rc21-cgi.c.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: system-logos >= 7.92.1
@@ -65,7 +65,7 @@
 %{__install} -p -m 0755 -D src/boa \
     %{buildroot}%{_sbindir}/boa
 %{__install} -p -m 0755 -D src/boa_indexer \
-    %{buildroot}%{_libdir}/boa/boa_indexer
+    %{buildroot}%{_libexecdir}/boa/boa_indexer
 %{__install} -p -m 0644 -D docs/boa.8 \
     %{buildroot}%{_mandir}/man8/boa.8
 %{__install} -p -m 0644 -D examples/boa.conf \
@@ -126,8 +126,8 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/boa
 %config(noreplace) %{_sysconfdir}/sysconfig/boa
 %{_sysconfdir}/rc.d/init.d/boa
-%dir %{_libdir}/boa/
-%{_libdir}/boa/boa_indexer
+%dir %{_libexecdir}/boa/
+%{_libexecdir}/boa/boa_indexer
 %{_sbindir}/boa
 %{webroot}/
 %dir %{_var}/log/boa/
@@ -135,10 +135,15 @@
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.14-0.11.rc21
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.94.14-0.12.rc21
+- Update init script to the new style.
+- Move boa_indexer to libexec, as it makes more sense there.
+- Fix cgi-bin location in the config patch.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.94.14-0.10.rc21
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 0.94.14-0.9.rc21


Index: boa.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boa.sysconfig	9 Nov 2004 02:43:26 -0000	1.1
+++ boa.sysconfig	12 Apr 2009 14:46:58 -0000	1.2
@@ -2,11 +2,14 @@
 # you've set up a chroot environment for the boa webserver to run in.
 
 # Read/write directory needed for CGI/POST
-TMP="/tmp"
+#TMP=/tmp
 
 # Alternate boa.conf location (default: /etc/boa)
-SERVERROOT=
+#SERVERROOT=
 
 # Chroot directory (default: empty for normal startup)
-CHROOT=
+#CHROOT=
+
+# Debug level (see "boa --help" output for details)
+#DEBUG_LEVEL=
 


--- boa-0.94.14rc17-config.patch DELETED ---



From mbarnes at fedoraproject.org  Sun Apr 12 14:50:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 12 Apr 2009 14:50:01 +0000 (UTC)
Subject: rpms/gnome-python2/devel .cvsignore, 1.40, 1.41 gnome-python2.spec, 
	1.32, 1.33 sources, 1.40, 1.41
Message-ID: <20090412145001.6F93170126@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5545

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:

* Sun Apr 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
- Update to 2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	14 Mar 2009 22:22:28 -0000	1.40
+++ .cvsignore	12 Apr 2009 14:49:30 -0000	1.41
@@ -1 +1 @@
-gnome-python-2.26.0.tar.bz2
+gnome-python-2.26.1.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-python2.spec	14 Mar 2009 22:22:28 -0000	1.32
+++ gnome-python2.spec	12 Apr 2009 14:49:30 -0000	1.33
@@ -20,7 +20,7 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -211,6 +211,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Sun Apr 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
+- Update to 2.26.1
+
 * Sat Mar 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-1.fc11
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	14 Mar 2009 22:22:28 -0000	1.40
+++ sources	12 Apr 2009 14:49:30 -0000	1.41
@@ -1 +1 @@
-452b8489eed892d09c506c17efd597f1  gnome-python-2.26.0.tar.bz2
+e5dcae40b2c291126843680dbed924a8  gnome-python-2.26.1.tar.bz2



From thias at fedoraproject.org  Sun Apr 12 14:50:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 14:50:18 +0000 (UTC)
Subject: rpms/thttpd/devel thttpd.init,1.4,1.5 thttpd.spec,1.22,1.23
Message-ID: <20090412145018.1822270126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/thttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5760

Modified Files:
	thttpd.init thttpd.spec 
Log Message:
Update init script all the way.



Index: thttpd.init
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thttpd.init	10 Apr 2009 12:57:50 -0000	1.4
+++ thttpd.init	12 Apr 2009 14:49:47 -0000	1.5
@@ -1,98 +1,107 @@
-#!/bin/bash
+#!/bin/sh
 #
-# thttpd	This shell script takes care of starting and stopping \
-#		thttpd (tiny/turbo/throttling HTTP server)
+# thttpd       tiny/turbo/throttling HTTP server
 #
-# chkconfig: - 85 15
-# description:	This tiny/turbo/throttling HTTP server is used to \
-#		serve HTML files and CGI.
-#
-# processname: thttpd
-# pidfile: /var/run/thttpd.pid
-# config: /etc/thttpd.conf
+# chkconfig:   - 85 15
+# description: This tiny/turbo/throttling HTTP server is used to serve web \
+#              content.
 
 ### BEGIN INIT INFO
 # Provides: httpd
-# Required-Start: $local_fs $remote_fs $network $named
-# Required-Stop: $local_fs $remote_fs $network $named
-# Short-Description: start and stop thttpd HTTP Server
-# Description: This tiny/turbo/throttling HTTP server is used to serve
-#              web content.
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: $named $remote_fs
+# Should-Stop: $named $remote_fs
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: tiny/turbo/throttling HTTP server
+# Description:       This tiny/turbo/throttling HTTP server is used to serve
+#                    web content.
 ### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+exec="/usr/sbin/thttpd"
+prog="thttpd"
+config="/etc/thttpd.conf"
 
-[ -f /etc/thttpd.conf ] || exit 0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-RETVAL=0
-prog="thttpd"
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	# Start daemons.
-	echo -n $"Starting $prog: "
-	daemon thttpd -C /etc/thttpd.conf
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/thttpd
-	echo
-	return $RETVAL
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon $exec -C $config
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
-	# Stop daemons.
-	echo -n $"Stopping $prog: "
-	killproc thttpd
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/thttpd
-	echo
-	return $RETVAL
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
 }
 
 restart() {
-	stop
-	start
+    stop
+    start
+}
+
+reload() {
+    restart
 }
 
-nicestop() {
-	# Stop gracefully (once active connections are ended)
-	echo -n $"Stopping $prog gracefully: "
-	killproc thttpd -USR1
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/thttpd
-	echo
-	return $RETVAL
+force_reload() {
+    restart
 }
 
-# See how we were called.
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	status)
-		status thttpd
-		;;
-	restart)
-		restart
-		;;
-	condrestart)
-		[ -f /var/lock/subsys/thttpd ] && restart
-		;;
-	nicestop)
-		nicestop
-		;;
-	*)
-		echo $"Usage: thttpd {start|stop|status|restart|condrestart|nicestop}"
-		exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
 exit $?
 


Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- thttpd.spec	11 Apr 2009 10:07:23 -0000	1.22
+++ thttpd.spec	12 Apr 2009 14:49:47 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 2.25b-22
+- Update init script all the way.
+
 * Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.25b-21
 - Include patch to rename conflicting "getline" function (stdio.h).
 - Fix so that makeweb gets compiled in "build" section with the right WEBDIR.



From thias at fedoraproject.org  Sun Apr 12 15:18:50 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 15:18:50 +0000 (UTC)
Subject: rpms/postgrey/devel .cvsignore, 1.5, 1.6 README-rpm, 1.1,
	1.2 postgrey.init, 1.1, 1.2 postgrey.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090412151850.37DE470126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/postgrey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13843

Modified Files:
	.cvsignore README-rpm postgrey.init postgrey.spec sources 
Log Message:
* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.32-1
- Update to 1.32.
- Update init script to the new style.
- Slightly update README-rpm instructions.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgrey/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 May 2008 14:20:48 -0000	1.5
+++ .cvsignore	12 Apr 2009 15:18:17 -0000	1.6
@@ -1 +1 @@
-postgrey-1.31.tar.gz
+postgrey-1.32.tar.gz


Index: README-rpm
===================================================================
RCS file: /cvs/extras/rpms/postgrey/devel/README-rpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README-rpm	12 Feb 2007 19:16:36 -0000	1.1
+++ README-rpm	12 Apr 2009 15:18:17 -0000	1.2
@@ -1,4 +1,4 @@
-Edit your configuration files:
+To make use of postgrey, edit your configuration files:
 
 /etc/postfix/main.cf:
 
@@ -10,10 +10,12 @@
 
 /etc/sysconfig/postgrey:
 
-  OPTIONS="--inet=127.0.0.1:10023"
+  options="--inet=127.0.0.1:10023"
 
 /etc/postfix/main.cf:
 
   smtpd_recipient_restrictions = ...
     check_policy_service inet:127.0.0.1:10023, ...
 
+And don't forget to activate the service on startup!
+


Index: postgrey.init
===================================================================
RCS file: /cvs/extras/rpms/postgrey/devel/postgrey.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgrey.init	12 Feb 2007 19:16:36 -0000	1.1
+++ postgrey.init	12 Apr 2009 15:18:17 -0000	1.2
@@ -1,48 +1,56 @@
 #!/bin/sh
 #
-# chkconfig: - 79 31
-# description: Postfix Greylisting Policy Server
-#
-# processname: postgrey
+# postgrey     Postfix Greylisting Policy Server
 #
+# chkconfig:   - 79 31
+# description: Postfix Greylisting Policy Server
+
+### BEGIN INIT INFO
+# Provides: postgrey
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: Postfix Greylisting Policy Server
+# Description:       Postgrey is a Postfix policy server implementing
+#                    greylisting. When a request for delivery of a mail is
+#                    received by Postfix via SMTP, the triplet CLIENT_IP /
+#                    SENDER / RECIPIENT is built.  If it is the first time
+#                    that this triplet is seen, or if the triplet was first
+#                    seen less than 5 minutes, then the mail gets rejected
+#                    with a temporary error.
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+exec="/usr/sbin/postgrey"
+prog="postgrey"
+options="--unix=/var/spool/postfix/postgrey/socket"
 
-prog=postgrey
-postgrey=/usr/sbin/$prog
-DBPATH=/var/spool/postfix/postgrey
-SOCKET=$DBPATH/socket
-OPTIONS="--unix=$SOCKET"
-
-# Source an auxiliary options file if we have one, and pick up OPTIONS,
-if [ -r /etc/sysconfig/$prog ]; then
-    . /etc/sysconfig/$prog
-fi
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-[ -x $postgrey -a -d $DBPATH ] || exit 0
-
-RETVAL=0
+lockfile=/var/lock/subsys/$prog
 
 start() {
+    [ -x $exec ] || exit 5
     echo -n $"Starting $prog: "
-    daemon $postgrey -d $OPTIONS
-    RETVAL=$?
+    daemon $exec -d $options
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
+
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $postgrey
-    RETVAL=$?
+    killproc $prog
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
 }
 
 restart() {
@@ -52,34 +60,54 @@
 
 reload() {
     echo -n $"Reloading $prog: "
-    killproc $postgrey -HUP
-    RETVAL=$?
+    killproc $prog -HUP
+    retval=$?
     echo
+    return $retval
+}
+
+force_reload() {
+    restart
 }
- 
-# See how we were called.
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
     start)
-        start
-    ;;
+        rh_status_q && exit 0
+        $1
+        ;;
     stop)
-        stop
-    ;;
+        rh_status_q || exit 0
+        $1
+        ;;
     restart)
-        restart
-    ;;
+        $1
+        ;;
     reload)
-        reload
-    ;;
-    condrestart)
-        [ -f /var/lock/subsys/$prog ] && restart
-    ;;
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
     status)
-        status $postgrey
-    ;;
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}"
-        exit 1
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
+exit $?
 
-exit $RETVAL


Index: postgrey.spec
===================================================================
RCS file: /cvs/extras/rpms/postgrey/devel/postgrey.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- postgrey.spec	27 Feb 2009 01:55:48 -0000	1.5
+++ postgrey.spec	12 Apr 2009 15:18:17 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary: Postfix Greylisting Policy Server
 Name: postgrey
-Version: 1.31
-Release: 2%{?dist}
+Version: 1.32
+Release: 1%{?dist}
 # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any
 # later version"
 License: GPLv2+
@@ -112,7 +112,12 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.31-2
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.32-1
+- Update to 1.32.
+- Update init script to the new style.
+- Slightly update README-rpm instructions.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu May 22 2008 Matthias Saou <http://freshrpms.net/> 1.31-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgrey/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 May 2008 14:20:48 -0000	1.5
+++ sources	12 Apr 2009 15:18:17 -0000	1.6
@@ -1 +1 @@
-b7a8a6fc9f1ad802c5a516a3be34bb29  postgrey-1.31.tar.gz
+524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz



From lkundrak at fedoraproject.org  Sun Apr 12 15:19:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 12 Apr 2009 15:19:03 +0000 (UTC)
Subject: rpms/celestia/devel celestia-1.5.1-gcc43.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 celestia.spec, 1.26, 1.27 sources, 1.7,
	1.8 celestia-1.5.0-gcc43.patch, 1.1, NONE
Message-ID: <20090412151903.B0BB170126@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/celestia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14027

Modified Files:
	.cvsignore celestia.spec sources 
Added Files:
	celestia-1.5.1-gcc43.patch 
Removed Files:
	celestia-1.5.0-gcc43.patch 
Log Message:
* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5.1-1
- New upstream release


celestia-1.5.1-gcc43.patch:

--- NEW FILE celestia-1.5.1-gcc43.patch ---
Marek Mahut <mmahut at fedoraproject.org>: Fix problems with compilation under gcc 4.3
Lubomir Rintel <lkundrak at v3.sk>: Adjust for celestia 1.5.1

diff -up celestia-1.5.1/src/buildstardb.cpp.gcc43 celestia-1.5.1/src/buildstardb.cpp
--- celestia-1.5.1/src/buildstardb.cpp.gcc43	2008-04-23 23:17:20.000000000 +0200
+++ celestia-1.5.1/src/buildstardb.cpp	2009-04-12 17:01:35.854035658 +0200
@@ -17,6 +17,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include "celengine/stardb.h"
+#include <libintl.h>                                                                                                         
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/asterism.cpp.gcc43 celestia-1.5.1/src/celengine/asterism.cpp
--- celestia-1.5.1/src/celengine/asterism.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/asterism.cpp	2009-04-12 17:01:35.869035253 +0200
@@ -8,6 +8,7 @@
 // of the License, or (at your option) any later version.
 
 #include <algorithm>
+#include <libintl.h>
 
 #ifndef _WIN32
 #ifndef TARGET_OS_MAC
diff -up celestia-1.5.1/src/celengine/astro.cpp.gcc43 celestia-1.5.1/src/celengine/astro.cpp
--- celestia-1.5.1/src/celengine/astro.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/astro.cpp	2009-04-12 17:01:35.891034976 +0200
@@ -10,12 +10,14 @@
 #include <cmath>
 #include <iomanip>
 #include <cstdio>
+#include <cstring>
 #include <time.h>
 #include <celutil/basictypes.h>
 #include <celmath/mathlib.h>
 #include "celestia.h"
 #include "astro.h"
 #include <celutil/util.h>
+#include <libintl.h>
 
 #ifndef TARGET_OS_MAC
 #ifdef __GNUC__
diff -up celestia-1.5.1/src/celengine/body.cpp.gcc43 celestia-1.5.1/src/celengine/body.cpp
--- celestia-1.5.1/src/celengine/body.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/body.cpp	2009-04-12 17:01:35.894034113 +0200
@@ -14,6 +14,7 @@
 #include <celmath/mathlib.h>
 #include <celutil/util.h>
 #include <celutil/utf8.h>
+#include <libintl.h>
 #include "mesh.h"
 #include "meshmanager.h"
 #include "body.h"
diff -up celestia-1.5.1/src/celengine/cmdparser.cpp.gcc43 celestia-1.5.1/src/celengine/cmdparser.cpp
--- celestia-1.5.1/src/celengine/cmdparser.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/cmdparser.cpp	2009-04-12 17:01:35.898035104 +0200
@@ -30,6 +30,7 @@
 #include "astro.h"
 #include "cmdparser.h"
 #include "glcontext.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/console.cpp.gcc43 celestia-1.5.1/src/celengine/console.cpp
--- celestia-1.5.1/src/celengine/console.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/console.cpp	2009-04-12 17:01:35.901036196 +0200
@@ -10,6 +10,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cassert>
+#include <cstring>
 #include "celutil/utf8.h"
 #include "gl.h"
 #include "vecgl.h"
diff -up celestia-1.5.1/src/celengine/dds.cpp.gcc43 celestia-1.5.1/src/celengine/dds.cpp
--- celestia-1.5.1/src/celengine/dds.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/dds.cpp	2009-04-12 17:01:35.903036273 +0200
@@ -15,6 +15,7 @@
 #include <celengine/gl.h>
 #include <celengine/glext.h>
 #include <celengine/image.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/dsodb.cpp.gcc43 celestia-1.5.1/src/celengine/dsodb.cpp
--- celestia-1.5.1/src/celengine/dsodb.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/dsodb.cpp	2009-04-12 17:01:35.914035435 +0200
@@ -32,6 +32,7 @@
 #include <celengine/galaxy.h>
 #include <celengine/opencluster.h>
 #include <celengine/nebula.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/fragmentprog.cpp.gcc43 celestia-1.5.1/src/celengine/fragmentprog.cpp
--- celestia-1.5.1/src/celengine/fragmentprog.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/fragmentprog.cpp	2009-04-12 17:01:35.917035969 +0200
@@ -13,6 +13,7 @@
 #include "gl.h"
 #include "glext.h"
 #include "fragmentprog.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/galaxy.cpp.gcc43 celestia-1.5.1/src/celengine/galaxy.cpp
--- celestia-1.5.1/src/celengine/galaxy.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/galaxy.cpp	2009-04-12 17:01:35.942035387 +0200
@@ -23,6 +23,8 @@
 #include "vecgl.h"
 #include "render.h"
 #include "texture.h"
+#include <libintl.h>
+#include <string.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/glcontext.cpp.gcc43 celestia-1.5.1/src/celengine/glcontext.cpp
--- celestia-1.5.1/src/celengine/glcontext.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/glcontext.cpp	2009-04-12 17:01:35.945035362 +0200
@@ -12,6 +12,7 @@
 #include "gl.h"
 #include "glext.h"
 #include "glcontext.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/glext.cpp.gcc43 celestia-1.5.1/src/celengine/glext.cpp
--- celestia-1.5.1/src/celengine/glext.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/glext.cpp	2009-04-12 17:01:35.949035235 +0200
@@ -8,6 +8,7 @@
 // of the License, or (at your option) any later version.
 
 #include <string.h>
+#include <cstring>
 #include "gl.h"
 
 #ifndef _WIN32
@@ -19,6 +20,7 @@
 #endif /* ! _WIN32 */
 
 #include "glext.h"
+#include <libintl.h>
 
 // ARB_texture_compression
 glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB;
diff -up celestia-1.5.1/src/celengine/image.cpp.gcc43 celestia-1.5.1/src/celengine/image.cpp
--- celestia-1.5.1/src/celengine/image.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/image.cpp	2009-04-12 17:01:35.981035619 +0200
@@ -66,6 +66,7 @@ extern "C" {
 #include <iostream>
 #include <algorithm>
 #include <cmath>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/location.cpp.gcc43 celestia-1.5.1/src/celengine/location.cpp
--- celestia-1.5.1/src/celengine/location.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/location.cpp	2009-04-12 17:01:35.984035874 +0200
@@ -11,6 +11,7 @@
 #include <celengine/location.h>
 #include <celengine/body.h>
 #include <celutil/util.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/lodspheremesh.cpp.gcc43 celestia-1.5.1/src/celengine/lodspheremesh.cpp
--- celestia-1.5.1/src/celengine/lodspheremesh.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/lodspheremesh.cpp	2009-04-12 17:01:35.988035468 +0200
@@ -17,6 +17,7 @@
 #include "glext.h"
 #include "vecgl.h"
 #include "lodspheremesh.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/marker.cpp.gcc43 celestia-1.5.1/src/celengine/marker.cpp
--- celestia-1.5.1/src/celengine/marker.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/marker.cpp	2009-04-12 17:01:35.991035163 +0200
@@ -9,6 +9,7 @@
 
 #include "marker.h"
 #include "gl.h"
+#include <libintl.h>
 
 
 using namespace std;
diff -up celestia-1.5.1/src/celengine/mesh.cpp.gcc43 celestia-1.5.1/src/celengine/mesh.cpp
--- celestia-1.5.1/src/celengine/mesh.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/mesh.cpp	2009-04-12 17:01:35.995034199 +0200
@@ -14,6 +14,7 @@
 #include <cassert>
 #include <iostream>
 #include <algorithm>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/meshmanager.cpp.gcc43 celestia-1.5.1/src/celengine/meshmanager.cpp
--- celestia-1.5.1/src/celengine/meshmanager.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/meshmanager.cpp	2009-04-12 17:01:35.998035291 +0200
@@ -26,6 +26,7 @@
 #include "spheremesh.h"
 #include "texmanager.h"
 #include "meshmanager.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/modelfile.cpp.gcc43 celestia-1.5.1/src/celengine/modelfile.cpp
--- celestia-1.5.1/src/celengine/modelfile.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/modelfile.cpp	2009-04-12 17:01:36.003035622 +0200
@@ -15,6 +15,8 @@
 #include <cassert>
 #include <cmath>
 #include <cstdio>
+#include <libintl.h>
+#include <string.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/nebula.cpp.gcc43 celestia-1.5.1/src/celengine/nebula.cpp
--- celestia-1.5.1/src/celengine/nebula.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/nebula.cpp	2009-04-12 17:01:36.011036765 +0200
@@ -21,6 +21,7 @@
 #include "glext.h"
 #include "vecgl.h"
 #include "render.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/opencluster.cpp.gcc43 celestia-1.5.1/src/celengine/opencluster.cpp
--- celestia-1.5.1/src/celengine/opencluster.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/opencluster.cpp	2009-04-12 17:01:36.022036207 +0200
@@ -19,6 +19,7 @@
 #include "gl.h"
 #include "vecgl.h"
 #include "render.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/overlay.cpp.gcc43 celestia-1.5.1/src/celengine/overlay.cpp
--- celestia-1.5.1/src/celengine/overlay.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/overlay.cpp	2009-04-12 17:01:36.032035751 +0200
@@ -9,6 +9,7 @@
 
 #include <cstdarg>
 #include <cstdio>
+#include <cstring>
 #include <celutil/utf8.h>
 #include "gl.h"
 #include "vecgl.h"
diff -up celestia-1.5.1/src/celengine/parseobject.cpp.gcc43 celestia-1.5.1/src/celengine/parseobject.cpp
--- celestia-1.5.1/src/celengine/parseobject.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/parseobject.cpp	2009-04-12 17:01:36.039035041 +0200
@@ -21,6 +21,7 @@
 #include "trajmanager.h"
 #include "rotationmanager.h"
 #include "universe.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/render.cpp.gcc43 celestia-1.5.1/src/celengine/render.cpp
--- celestia-1.5.1/src/celengine/render.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/render.cpp	2009-04-12 17:01:36.081037762 +0200
@@ -11,6 +11,7 @@
 #include <cstdio>
 #include <cstring>
 #include <cassert>
+#include <libintl.h>
 
 #ifndef _WIN32
 #ifndef TARGET_OS_MAC
diff -up celestia-1.5.1/src/celengine/rotationmanager.cpp.gcc43 celestia-1.5.1/src/celengine/rotationmanager.cpp
--- celestia-1.5.1/src/celengine/rotationmanager.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/rotationmanager.cpp	2009-04-12 17:01:36.120036038 +0200
@@ -14,6 +14,7 @@
 #include <celutil/debug.h>
 #include "samporient.h"
 #include "rotationmanager.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/selection.cpp.gcc43 celestia-1.5.1/src/celengine/selection.cpp
--- celestia-1.5.1/src/celengine/selection.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/selection.cpp	2009-04-12 17:01:36.123035175 +0200
@@ -8,6 +8,7 @@
 // of the License, or (at your option) any later version.
 
 #include <cstdio>
+#include <libintl.h>
 #include "astro.h"
 #include "selection.h"
 
diff -up celestia-1.5.1/src/celengine/shadermanager.cpp.gcc43 celestia-1.5.1/src/celengine/shadermanager.cpp
--- celestia-1.5.1/src/celengine/shadermanager.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/shadermanager.cpp	2009-04-12 17:01:36.168035077 +0200
@@ -15,6 +15,7 @@
 #include <iomanip>
 #include <cstdio>
 #include <cassert>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/simulation.cpp.gcc43 celestia-1.5.1/src/celengine/simulation.cpp
--- celestia-1.5.1/src/celengine/simulation.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/simulation.cpp	2009-04-12 17:01:36.171036170 +0200
@@ -11,6 +11,7 @@
 // of the License, or (at your option) any later version.
 
 #include <algorithm>
+#include <libintl.h>
 #include "simulation.h"
 
 using namespace std;
diff -up celestia-1.5.1/src/celengine/solarsys.cpp.gcc43 celestia-1.5.1/src/celengine/solarsys.cpp
--- celestia-1.5.1/src/celengine/solarsys.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/solarsys.cpp	2009-04-12 17:01:36.175035764 +0200
@@ -30,6 +30,7 @@
 #include "universe.h"
 #include "multitexture.h"
 #include "parseobject.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/solarsysxml.cpp.gcc43 celestia-1.5.1/src/celengine/solarsysxml.cpp
--- celestia-1.5.1/src/celengine/solarsysxml.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/solarsysxml.cpp	2009-04-12 17:01:36.224034701 +0200
@@ -8,6 +8,8 @@
 // of the License, or (at your option) any later version.
 
 #include <cassert>
+#include <cstring>
+#include <string.h>
 
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
@@ -20,6 +22,7 @@
 #include "texmanager.h"
 #include "meshmanager.h"
 #include "solarsysxml.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/spiceinterface.cpp.gcc43 celestia-1.5.1/src/celengine/spiceinterface.cpp
--- celestia-1.5.1/src/celengine/spiceinterface.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/spiceinterface.cpp	2009-04-12 17:01:36.227035515 +0200
@@ -11,6 +11,7 @@
 
 #include "SpiceUsr.h"
 #include "spiceinterface.h"
+#include <libintl.h>
 
 
 bool
diff -up celestia-1.5.1/src/celengine/spiceorbit.cpp.gcc43 celestia-1.5.1/src/celengine/spiceorbit.cpp
--- celestia-1.5.1/src/celengine/spiceorbit.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/spiceorbit.cpp	2009-04-12 17:01:36.231033991 +0200
@@ -14,6 +14,7 @@
 #include "SpiceUsr.h"
 #include "astro.h"
 #include "spiceorbit.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/stardb.cpp.gcc43 celestia-1.5.1/src/celengine/stardb.cpp
--- celestia-1.5.1/src/celengine/stardb.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/stardb.cpp	2009-04-12 17:01:36.258036280 +0200
@@ -10,6 +10,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <cstdio>
+#include <cstring>
 #include <cassert>
 #include <algorithm>
 #include <celmath/mathlib.h>
@@ -24,6 +25,7 @@
 #include "multitexture.h"
 #include "meshmanager.h"
 #include <celutil/debug.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/texmanager.cpp.gcc43 celestia-1.5.1/src/celengine/texmanager.cpp
--- celestia-1.5.1/src/celengine/texmanager.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/texmanager.cpp	2009-04-12 17:01:36.264034832 +0200
@@ -13,6 +13,7 @@
 #include <fstream>
 #include "multitexture.h"
 #include "texmanager.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/texture.cpp.gcc43 celestia-1.5.1/src/celengine/texture.cpp
--- celestia-1.5.1/src/celengine/texture.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/texture.cpp	2009-04-12 17:01:36.271036357 +0200
@@ -28,6 +28,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cassert>
+#include <libintl.h>
 
 #ifndef _WIN32
 #ifndef TARGET_OS_MAC
diff -up celestia-1.5.1/src/celengine/tokenizer.cpp.gcc43 celestia-1.5.1/src/celengine/tokenizer.cpp
--- celestia-1.5.1/src/celengine/tokenizer.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/tokenizer.cpp	2009-04-12 17:01:36.278035367 +0200
@@ -12,6 +12,7 @@
 #include <iomanip>
 #include <celutil/utf8.h>
 #include "tokenizer.h"
+#include <libintl.h>
 
 
 static bool issep(char c)
diff -up celestia-1.5.1/src/celengine/trajmanager.cpp.gcc43 celestia-1.5.1/src/celengine/trajmanager.cpp
--- celestia-1.5.1/src/celengine/trajmanager.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/trajmanager.cpp	2009-04-12 17:01:36.280035443 +0200
@@ -15,6 +15,7 @@
 #include <celutil/debug.h>
 #include "samporbit.h"
 #include "trajmanager.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/universe.cpp.gcc43 celestia-1.5.1/src/celengine/universe.cpp
--- celestia-1.5.1/src/celengine/universe.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/universe.cpp	2009-04-12 17:01:36.322035650 +0200
@@ -13,6 +13,7 @@
 #include <celmath/intersect.h>
 #include <celutil/utf8.h>
 #include <cassert>
+#include <libintl.h>
 #include "astro.h"
 #include "3dsmesh.h"
 #include "meshmanager.h"
diff -up celestia-1.5.1/src/celengine/vertexprog.cpp.gcc43 celestia-1.5.1/src/celengine/vertexprog.cpp
--- celestia-1.5.1/src/celengine/vertexprog.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/vertexprog.cpp	2009-04-12 17:01:36.325035346 +0200
@@ -14,6 +14,7 @@
 #include "gl.h"
 #include "glext.h"
 #include "vertexprog.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celengine/virtualtex.cpp.gcc43 celestia-1.5.1/src/celengine/virtualtex.cpp
--- celestia-1.5.1/src/celengine/virtualtex.cpp.gcc43	2008-04-23 23:17:16.000000000 +0200
+++ celestia-1.5.1/src/celengine/virtualtex.cpp	2009-04-12 17:01:36.328035879 +0200
@@ -19,6 +19,7 @@
 #include "virtualtex.h"
 #include "gl.h"
 #include "parser.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/celestiacore.cpp.gcc43 celestia-1.5.1/src/celestia/celestiacore.cpp
--- celestia-1.5.1/src/celestia/celestiacore.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/celestiacore.cpp	2009-04-12 17:01:36.360034867 +0200
@@ -43,6 +43,7 @@
 #include <celutil/debug.h>
 #include <celutil/utf8.h>
 #include "url.h"
+#include <libintl.h>
 
 #ifdef CELX
 #include <celengine/scriptobject.h>
diff -up celestia-1.5.1/src/celestia/celx.cpp.gcc43 celestia-1.5.1/src/celestia/celx.cpp
--- celestia-1.5.1/src/celestia/celx.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/celx.cpp	2009-04-12 17:01:36.404034591 +0200
@@ -11,7 +11,9 @@
 
 #include <cassert>
 #include <cstring>
+#include <string.h>
 #include <cstdio>
+#include <libintl.h>
 #include <map>
 #include <celengine/astro.h>
 #include <celengine/celestia.h>
diff -up celestia-1.5.1/src/celestia/configfile.cpp.gcc43 celestia-1.5.1/src/celestia/configfile.cpp
--- celestia-1.5.1/src/celestia/configfile.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/configfile.cpp	2009-04-12 17:01:36.444035839 +0200
@@ -16,6 +16,7 @@
 #include <celengine/celestia.h>
 #include <celengine/texmanager.h>
 #include "configfile.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/destination.cpp.gcc43 celestia-1.5.1/src/celestia/destination.cpp
--- celestia-1.5.1/src/celestia/destination.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/destination.cpp	2009-04-12 17:01:36.445036017 +0200
@@ -14,6 +14,7 @@
 #include <celengine/astro.h>
 #include <celengine/parser.h>
 #include "destination.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/eclipsefinder.cpp.gcc43 celestia-1.5.1/src/celestia/eclipsefinder.cpp
--- celestia-1.5.1/src/celestia/eclipsefinder.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/eclipsefinder.cpp	2009-04-12 17:01:36.447035814 +0200
@@ -15,6 +15,7 @@
 #include <algorithm>
 #include <set>
 #include <cassert>
+#include <cstring>
 #include "eclipsefinder.h"
 #include "celmath/mathlib.h"
 #include "celmath/ray.h"
diff -up celestia-1.5.1/src/celestia/glutmain.cpp.gcc43 celestia-1.5.1/src/celestia/glutmain.cpp
--- celestia-1.5.1/src/celestia/glutmain.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/glutmain.cpp	2009-04-12 17:01:36.450034950 +0200
@@ -15,6 +15,7 @@
 #include <cstdlib>
 #include <cctype>
 #include <cstring>
+#include <libintl.h>
 #include <time.h>
 #include <unistd.h>
 #include <celengine/gl.h>
diff -up celestia-1.5.1/src/celestia/gtk/actions.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/actions.cpp
--- celestia-1.5.1/src/celestia/gtk/actions.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/actions.cpp	2009-04-12 17:01:36.486035487 +0200
@@ -15,6 +15,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <cstring>
+#include <libintl.h>
 #include <fstream>
 #include <gtk/gtk.h>
 
diff -up celestia-1.5.1/src/celestia/gtk/common.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/common.cpp
--- celestia-1.5.1/src/celestia/gtk/common.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/common.cpp	2009-04-12 17:01:36.488035564 +0200
@@ -20,6 +20,7 @@
 #include <celestia/celestiacore.h>
 
 #include "common.h"
+#include <libintl.h>
 
 
 /* Returns the offset of the timezone at date */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp	2009-04-12 17:01:36.491036097 +0200
@@ -18,6 +18,7 @@
 
 #include "dialog-eclipse.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Definitions: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp	2009-04-12 17:01:36.493035335 +0200
@@ -18,6 +18,7 @@
 
 #include "dialog-goto.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Declarations: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-options.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-options.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-options.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-options.cpp	2009-04-12 17:01:36.496036707 +0200
@@ -17,6 +17,7 @@
 #include "dialog-options.h"
 #include "common.h"
 #include "ui.h"
+#include <libintl.h>
 
 
 /* Definitions: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp	2009-04-12 17:01:36.498036784 +0200
@@ -22,6 +22,7 @@
 #include "dialog-solar.h"
 #include "actions.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Declarations: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-star.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-star.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-star.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-star.cpp	2009-04-12 17:01:36.503035158 +0200
@@ -25,6 +25,7 @@
 #include "dialog-star.h"
 #include "actions.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Declarations: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-time.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-time.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-time.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-time.cpp	2009-04-12 17:01:36.505035235 +0200
@@ -18,6 +18,7 @@
 
 #include "dialog-time.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Declarations: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp
--- celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp	2009-04-12 17:01:36.507035590 +0200
@@ -18,6 +18,7 @@
 
 #include "dialog-tour.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Declarations: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/main.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/main.cpp
--- celestia-1.5.1/src/celestia/gtk/main.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/main.cpp	2009-04-12 17:01:36.510036404 +0200
@@ -19,6 +19,7 @@
 #include <cstdlib>
 #include <cctype>
 #include <cstring>
+#include <libintl.h>
 #include <time.h>
 
 #ifdef WIN32
diff -up celestia-1.5.1/src/celestia/gtk/menu-context.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/menu-context.cpp
--- celestia-1.5.1/src/celestia/gtk/menu-context.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/menu-context.cpp	2009-04-12 17:01:36.513036658 +0200
@@ -20,6 +20,7 @@
 #include "menu-context.h"
 #include "actions.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Definitions: Callbacks */
diff -up celestia-1.5.1/src/celestia/gtk/settings-file.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/settings-file.cpp
--- celestia-1.5.1/src/celestia/gtk/settings-file.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/settings-file.cpp	2009-04-12 17:01:36.517035414 +0200
@@ -11,6 +11,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <libintl.h>
 
 #include <celengine/body.h>
 #include <celengine/galaxy.h>
diff -up celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp
--- celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp	2009-04-12 17:01:36.520035389 +0200
@@ -12,6 +12,7 @@
 
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
+#include <libintl.h>
 
 #include <celengine/body.h>
 #include <celengine/galaxy.h>
diff -up celestia-1.5.1/src/celestia/gtk/splash.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/splash.cpp
--- celestia-1.5.1/src/celestia/gtk/splash.cpp.gcc43	2008-04-23 23:16:49.000000000 +0200
+++ celestia-1.5.1/src/celestia/gtk/splash.cpp	2009-04-12 17:01:36.523035643 +0200
@@ -22,6 +22,7 @@
 
 #include "splash.h"
 #include "common.h"
+#include <libintl.h>
 
 
 /* Declarations */
diff -up celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp.gcc43 celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp
--- celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp	2009-04-12 17:01:36.544035746 +0200
@@ -16,6 +16,7 @@
 #include "cellistviewitem.h"
 #include "selectionpopup.h"
 #include "celutil/utf8.h"
+#include <libintl.h>
 
 /*
  *  Constructs a CelestialBrowser which is a child of 'parent', with the
diff -up celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp.gcc43 celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp
--- celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp	2009-04-12 17:01:36.570035342 +0200
@@ -22,6 +22,7 @@
 #include <kglobalsettings.h>
 #include <celsplashscreen.h>
 #include <X11/Xlib.h>
+#include <libintl.h>
 
 CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent):
     QWidget(0, 0, WStyle_Customize | WX11BypassWM), 
diff -up celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp.gcc43 celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp
--- celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp	2009-04-12 17:01:36.573036714 +0200
@@ -11,6 +11,7 @@
 #include "celestiacore.h"
 #include "celengine/astro.h"
 #include "eclipsefinder.h"
+#include <libintl.h>
 
 /* 
  *  Constructs a EclipseFinder which is a child of 'parent', with the 
diff -up celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp
--- celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp	2009-04-12 17:01:36.575035393 +0200
@@ -19,6 +19,7 @@
 #include <qdir.h>
 #include <kstandarddirs.h>
 #include "kcelbookmarkmanager.h"
+#include <libintl.h>
 
 KBookmarkManager* KCelBookmarkManager::self() {
     if ( !s_bookmarkManager )
diff -up celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp
--- celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp	2009-04-12 17:01:36.578036486 +0200
@@ -45,6 +45,7 @@
 #include <kpopupmenu.h>
 #include <kstdaccel.h>
 #include <kstdaction.h>
+#include <libintl.h>
 
 template class QPtrList<KCelBookmarkMenu>;
 
diff -up celestia-1.5.1/src/celestia/kde/kdeapp.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdeapp.cpp
--- celestia-1.5.1/src/celestia/kde/kdeapp.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kdeapp.cpp	2009-04-12 17:01:36.606037275 +0200
@@ -87,6 +87,7 @@
 #endif
 
 #include "celengine/glext.h"
+#include <libintl.h>
 
 #define MENUMAXSIZE 100
 
diff -up celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp
--- celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp	2009-04-12 17:01:36.610034914 +0200
@@ -48,6 +48,7 @@
 
 #include <math.h>
 #include <vector>
+#include <libintl.h>
 
 KdeGlWidget::KdeGlWidget(  QWidget* parent, const char* name, CelestiaCore* core)
     : QGLWidget( parent, name )
diff -up celestia-1.5.1/src/celestia/kde/kdemain.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdemain.cpp
--- celestia-1.5.1/src/celestia/kde/kdemain.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kdemain.cpp	2009-04-12 17:01:36.611035650 +0200
@@ -20,6 +20,7 @@
 #include <klocale.h>
 
 #include "kdeuniquecelestia.h"
+#include <libintl.h>
 
 static const char *description =
     I18N_NOOP("Celestia");
diff -up celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp
--- celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp	2009-04-12 17:01:36.615035244 +0200
@@ -40,6 +40,7 @@
 #include "celengine/render.h"
 #include "celengine/glcontext.h"
 #include "celengine/astro.h"
+#include <libintl.h>
 
 static uint32 FilterOtherLocations = ~(Location::City |
                     Location::Observatory |
diff -up celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp
--- celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp	2009-04-12 17:01:36.617036717 +0200
@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 #include <klocale.h>
+#include <libintl.h>
 
 KdeUniqueCelestia::KdeUniqueCelestia() {
 
diff -up celestia-1.5.1/src/celestia/kde/selectionpopup.cpp.gcc43 celestia-1.5.1/src/celestia/kde/selectionpopup.cpp
--- celestia-1.5.1/src/celestia/kde/selectionpopup.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/selectionpopup.cpp	2009-04-12 17:01:36.619035956 +0200
@@ -29,6 +29,7 @@
 #include <krun.h>
 
 #include "celutil/utf8.h"
+#include <libintl.h>
 
 SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel):
 KPopupMenu(parent),
diff -up celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp.gcc43 celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp
--- celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp.gcc43	2008-04-23 23:17:05.000000000 +0200
+++ celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp	2009-04-12 17:01:36.623035270 +0200
@@ -36,6 +36,7 @@
 #include <kstatusbar.h>
 #include <kapp.h>
 #include "kdeapp.h"
+#include <libintl.h>
 
 VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir):
     accepted(false)
diff -up celestia-1.5.1/src/celestia/oggtheoracapture.cpp.gcc43 celestia-1.5.1/src/celestia/oggtheoracapture.cpp
--- celestia-1.5.1/src/celestia/oggtheoracapture.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/oggtheoracapture.cpp	2009-04-12 17:01:36.688033701 +0200
@@ -66,11 +66,13 @@
 #include <celutil/util.h>
 #include "../celengine/gl.h"
 #include <string>
+#include <cstring>
 #include "theora/theora.h"
 
 using namespace std;
 
 #include "oggtheoracapture.h"
+#include <libintl.h>
 
 //  {"video-rate-target",required_argument,NULL,'V'},
 //  {"video-quality",required_argument,NULL,'v'},
diff -up celestia-1.5.1/src/celestia/scriptmenu.cpp.gcc43 celestia-1.5.1/src/celestia/scriptmenu.cpp
--- celestia-1.5.1/src/celestia/scriptmenu.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/scriptmenu.cpp	2009-04-12 17:01:36.724036472 +0200
@@ -13,6 +13,7 @@
 #include "celutil/directory.h"
 #include "celutil/filetype.h"
 #include <fstream>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/url.cpp.gcc43 celestia-1.5.1/src/celestia/url.cpp
--- celestia-1.5.1/src/celestia/url.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/url.cpp	2009-04-12 17:01:36.727036726 +0200
@@ -16,10 +16,12 @@
  ***************************************************************************/
 
 #include <string>
+#include <string.h>
 #include <stdio.h>
 #include "celestiacore.h"
 #include "celengine/astro.h"
 #include "url.h"
+#include <libintl.h>
 
 static const unsigned int CurrentCelestiaURLVersion = 2;
 
diff -up celestia-1.5.1/src/celestia/wglext.cpp.gcc43 celestia-1.5.1/src/celestia/wglext.cpp
--- celestia-1.5.1/src/celestia/wglext.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/wglext.cpp	2009-04-12 17:01:36.729034847 +0200
@@ -14,7 +14,10 @@
 #include "wglext.h"
 #include <windows.h>
 #include <cstdio>
+#include <cstring>
+#include <string.h>
 #include <vector>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/winbookmarks.cpp.gcc43 celestia-1.5.1/src/celestia/winbookmarks.cpp
--- celestia-1.5.1/src/celestia/winbookmarks.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/winbookmarks.cpp	2009-04-12 17:01:36.733035559 +0200
@@ -13,6 +13,7 @@
 #include "res/resource.h"
 #include <celutil/winutil.h>
 #include <iostream>
+#include <string.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/windatepicker.cpp.gcc43 celestia-1.5.1/src/celestia/windatepicker.cpp
--- celestia-1.5.1/src/celestia/windatepicker.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/windatepicker.cpp	2009-04-12 17:01:36.736034975 +0200
@@ -11,10 +11,12 @@
 
 #include <windows.h>
 #include <commctrl.h>
+#include <cstring>
 #include "celutil/basictypes.h"
 #include "celengine/astro.h"
 #include "celutil/util.h"
 #include "celutil/winutil.h"
+#include <libintl.h>
 
 
 // DatePicker is a Win32 control for setting the date. It replaces the
diff -up celestia-1.5.1/src/celestia/wineclipses.cpp.gcc43 celestia-1.5.1/src/celestia/wineclipses.cpp
--- celestia-1.5.1/src/celestia/wineclipses.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/wineclipses.cpp	2009-04-12 17:01:36.739035509 +0200
@@ -10,6 +10,7 @@
 
 #include <string>
 #include <sstream>
+#include <string.h>
 #include <algorithm>
 #include <set>
 #include <cassert>
@@ -23,6 +24,7 @@
 #include "celmath/distance.h"
 #include "celutil/util.h"
 #include "celutil/winutil.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/winhyperlinks.cpp.gcc43 celestia-1.5.1/src/celestia/winhyperlinks.cpp
--- celestia-1.5.1/src/celestia/winhyperlinks.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/winhyperlinks.cpp	2009-04-12 17:01:36.741035864 +0200
@@ -9,6 +9,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <cstring>
 #include "winhyperlinks.h"
 #include "res/resource.h"
 
diff -up celestia-1.5.1/src/celestia/winmain.cpp.gcc43 celestia-1.5.1/src/celestia/winmain.cpp
--- celestia-1.5.1/src/celestia/winmain.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/winmain.cpp	2009-04-12 17:01:36.779035359 +0200
@@ -23,6 +23,7 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <mmsystem.h>
+#include <string.h>
 
 #include <celmath/vecmath.h>
 #include <celmath/quaternion.h>
@@ -59,6 +60,7 @@
 #include "wglext.h"
 
 #include <locale.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/winsplash.cpp.gcc43 celestia-1.5.1/src/celestia/winsplash.cpp
--- celestia-1.5.1/src/celestia/winsplash.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/winsplash.cpp	2009-04-12 17:02:44.303036196 +0200
@@ -17,6 +17,7 @@
 #include "celutil/util.h"
 #include <iostream>
 #include <locale.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celestia/winstarbrowser.cpp.gcc43 celestia-1.5.1/src/celestia/winstarbrowser.cpp
--- celestia-1.5.1/src/celestia/winstarbrowser.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/winstarbrowser.cpp	2009-04-12 17:01:36.788035284 +0200
@@ -15,10 +15,12 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <cstring>
+#include <string.h>
 #include "winstarbrowser.h"
 #include "celutil/winutil.h"
 
 #include "res/resource.h"
+#include <libintl.h>
 
 extern void SetMouseCursor(LPCTSTR lpCursor);
 
diff -up celestia-1.5.1/src/celestia/wintime.cpp.gcc43 celestia-1.5.1/src/celestia/wintime.cpp
--- celestia-1.5.1/src/celestia/wintime.cpp.gcc43	2008-04-23 23:17:06.000000000 +0200
+++ celestia-1.5.1/src/celestia/wintime.cpp	2009-04-12 17:01:36.790036758 +0200
@@ -18,6 +18,7 @@
 #include <celengine/astro.h>
 #include "celutil/util.h"
 #include "celutil/winutil.h"
+#include <libintl.h>
 
 
 
diff -up celestia-1.5.1/src/celmath/quaternion.h.gcc43 celestia-1.5.1/src/celmath/quaternion.h
--- celestia-1.5.1/src/celmath/quaternion.h.gcc43	2008-04-23 23:17:20.000000000 +0200
+++ celestia-1.5.1/src/celmath/quaternion.h	2009-04-12 17:01:36.843035010 +0200
@@ -16,7 +16,6 @@
 #include <celmath/mathlib.h>
 #include <celmath/vecmath.h>
 
-
 template<class T> class Quaternion
 {
 public:
diff -up celestia-1.5.1/src/celutil/bigfix.cpp.gcc43 celestia-1.5.1/src/celutil/bigfix.cpp
--- celestia-1.5.1/src/celutil/bigfix.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/bigfix.cpp	2009-04-12 17:01:36.846036381 +0200
@@ -10,6 +10,7 @@
 #include <math.h>
 #include <stdio.h>
 #include "bigfix.h"
+#include <libintl.h>
 
 
 /*** Constructors ***/
diff -up celestia-1.5.1/src/celutil/color.cpp.gcc43 celestia-1.5.1/src/celutil/color.cpp
--- celestia-1.5.1/src/celutil/color.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/color.cpp	2009-04-12 17:01:36.847034883 +0200
@@ -9,6 +9,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <string.h>
 #include <cctype>
 #include "color.h"
 
diff -up celestia-1.5.1/src/celutil/directory.cpp.gcc43 celestia-1.5.1/src/celutil/directory.cpp
--- celestia-1.5.1/src/celutil/directory.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/directory.cpp	2009-04-12 17:01:36.849035239 +0200
@@ -9,6 +9,7 @@
 
 #include <iostream>
 #include "directory.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celutil/filetype.cpp.gcc43 celestia-1.5.1/src/celutil/filetype.cpp
--- celestia-1.5.1/src/celutil/filetype.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/filetype.cpp	2009-04-12 17:01:36.850034858 +0200
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include "util.h"
 #include "filetype.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celutil/formatnum.cpp.gcc43 celestia-1.5.1/src/celutil/formatnum.cpp
--- celestia-1.5.1/src/celutil/formatnum.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/formatnum.cpp	2009-04-12 17:01:36.852036051 +0200
@@ -10,6 +10,8 @@
 #include <cmath>
 #include <cstdio>
 #include <string>
+#include <cstring>
+#include <limits.h>
 #include "formatnum.h"
 
 // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf
diff -up celestia-1.5.1/src/celutil/utf8.cpp.gcc43 celestia-1.5.1/src/celutil/utf8.cpp
--- celestia-1.5.1/src/celutil/utf8.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/utf8.cpp	2009-04-12 17:01:36.856035366 +0200
@@ -9,7 +9,9 @@
 
 #include "utf8.h"
 #include <cctype>
+#include <cstring>
 #include "util.h"
+#include <libintl.h>
 
 unsigned int WGL4_Normalization_00[256] = {
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
diff -up celestia-1.5.1/src/celutil/util.cpp.gcc43 celestia-1.5.1/src/celutil/util.cpp
--- celestia-1.5.1/src/celutil/util.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/util.cpp	2009-04-12 17:01:36.858036560 +0200
@@ -12,6 +12,7 @@
 #include "util.h"
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/celutil/util.h.gcc43 celestia-1.5.1/src/celutil/util.h
--- celestia-1.5.1/src/celutil/util.h.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/util.h	2009-04-12 17:01:36.860035519 +0200
@@ -22,11 +22,11 @@
     switch(0){case 0: case pred:;}
 
 #ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
+template <typename T1, typename T2> bool min(T1 a, T2 b){ return a<(T1)b; }
 #endif
 
 #ifndef max
-#define max(a, b) ((a) < (b) ? (b) : (a))
+template <typename T1, typename T2> bool max(T1 a, T2 b){ return a<(T1)b; }
 #endif
 				      
 #ifdef _WIN32
diff -up celestia-1.5.1/src/celutil/windirectory.cpp.gcc43 celestia-1.5.1/src/celutil/windirectory.cpp
--- celestia-1.5.1/src/celutil/windirectory.cpp.gcc43	2008-04-23 23:17:19.000000000 +0200
+++ celestia-1.5.1/src/celutil/windirectory.cpp	2009-04-12 17:01:36.862036154 +0200
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <windows.h>
 #include "directory.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/packdb.cpp.gcc43 celestia-1.5.1/src/packdb.cpp
--- celestia-1.5.1/src/packdb.cpp.gcc43	2008-04-23 23:17:20.000000000 +0200
+++ celestia-1.5.1/src/packdb.cpp	2009-04-12 17:01:36.864035392 +0200
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <libintl.h>
 
 #define SPECTRAL_O 0
 #define SPECTRAL_B 1
diff -up celestia-1.5.1/src/tools/atmosphere/scattersim.cpp.gcc43 celestia-1.5.1/src/tools/atmosphere/scattersim.cpp
--- celestia-1.5.1/src/tools/atmosphere/scattersim.cpp.gcc43	2008-04-23 23:17:18.000000000 +0200
+++ celestia-1.5.1/src/tools/atmosphere/scattersim.cpp	2009-04-12 17:01:36.893039712 +0200
@@ -11,7 +11,9 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <string.h>
 #include <cstdlib>
+#include <libintl.h>
 #include <cmath>
 #include <algorithm>
 #include <map>
diff -up celestia-1.5.1/src/tools/buildstardb.cpp.gcc43 celestia-1.5.1/src/tools/buildstardb.cpp
--- celestia-1.5.1/src/tools/buildstardb.cpp.gcc43	2008-04-23 23:17:18.000000000 +0200
+++ celestia-1.5.1/src/tools/buildstardb.cpp	2009-04-12 17:01:36.932034915 +0200
@@ -16,6 +16,7 @@
 #include <cstdio>
 #include <assert.h>
 #include "stardb.h"
+#include <libintl.h>
 
 using namespace std;
 
diff -up celestia-1.5.1/src/tools/cmod/cmodfix.cpp.gcc43 celestia-1.5.1/src/tools/cmod/cmodfix.cpp
--- celestia-1.5.1/src/tools/cmod/cmodfix.cpp.gcc43	2008-04-23 23:17:17.000000000 +0200
+++ celestia-1.5.1/src/tools/cmod/cmodfix.cpp	2009-04-12 17:01:36.959036645 +0200
@@ -18,6 +18,7 @@
 #include <cassert>
 #include <cmath>
 #include <cstdio>
+#include <string.h>
 #include <algorithm>
 #include <vector>
 #ifdef TRISTRIP
diff -up celestia-1.5.1/src/tools/cmod/xtocmod.cpp.gcc43 celestia-1.5.1/src/tools/cmod/xtocmod.cpp
--- celestia-1.5.1/src/tools/cmod/xtocmod.cpp.gcc43	2008-04-23 23:17:17.000000000 +0200
+++ celestia-1.5.1/src/tools/cmod/xtocmod.cpp	2009-04-12 17:01:36.962036340 +0200
@@ -3,6 +3,7 @@
 #include <iomanip>
 #include <algorithm>
 #include <cstdio>
+#include <string.h>
 #include <cassert>
 #include <cstring>
 #include <d3dx9.h>
diff -up celestia-1.5.1/src/tools/stardb/makestardb.cpp.gcc43 celestia-1.5.1/src/tools/stardb/makestardb.cpp
--- celestia-1.5.1/src/tools/stardb/makestardb.cpp.gcc43	2008-04-23 23:17:17.000000000 +0200
+++ celestia-1.5.1/src/tools/stardb/makestardb.cpp	2009-04-12 17:01:36.964036696 +0200
@@ -14,6 +14,7 @@
 #include <iomanip>
 #include <cctype>
 #include <cassert>
+#include <string.h>
 #include <celutil/basictypes.h>
 #include <celutil/bytes.h>
 #include <celengine/astro.h>
diff -up celestia-1.5.1/src/tools/stardb/startextdump.cpp.gcc43 celestia-1.5.1/src/tools/stardb/startextdump.cpp
--- celestia-1.5.1/src/tools/stardb/startextdump.cpp.gcc43	2008-04-23 23:17:17.000000000 +0200
+++ celestia-1.5.1/src/tools/stardb/startextdump.cpp	2009-04-12 17:01:36.982035707 +0200
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
+#include <string.h>
 #include <celutil/basictypes.h>
 #include <celutil/bytes.h>
 #include <celengine/astro.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Mar 2008 14:36:07 -0000	1.7
+++ .cvsignore	12 Apr 2009 15:18:33 -0000	1.8
@@ -1 +1 @@
-celestia-1.5.0.tar.gz
+celestia-1.5.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- celestia.spec	1 Mar 2009 14:31:33 -0000	1.26
+++ celestia.spec	12 Apr 2009 15:18:33 -0000	1.27
@@ -1,12 +1,12 @@
 Name:		celestia
-Version:        1.5.0
-Release:        3%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Applications/Emulators
 License:        GPLv2+
 Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
-Patch0:		celestia-1.5.0-gcc43.patch
+Patch0:		celestia-1.5.1-gcc43.patch
 Patch1:         celestia-1.5.0-gcc44.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5.1-1
+- New upstream release
+
 * Sun Mar  1 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5.0-3
 - Fix build with GCC 4.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/celestia/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Mar 2008 14:36:07 -0000	1.7
+++ sources	12 Apr 2009 15:18:33 -0000	1.8
@@ -1 +1 @@
-156bc1080d27906122945a20d84d4a82  celestia-1.5.0.tar.gz
+df6854a2cf62d2e96612398c13b68fd2  celestia-1.5.1.tar.gz


--- celestia-1.5.0-gcc43.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Apr 12 15:32:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 12 Apr 2009 15:32:27 +0000 (UTC)
Subject: rpms/alexandria/devel
	alexandria-0.6.4.1-hang-importing-invalid-isdn.patch, NONE,
	1.1 alexandria.spec, 1.32, 1.33
Message-ID: <20090412153228.5B46A70126@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18331

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.4.1-hang-importing-invalid-isdn.patch 
Log Message:
* Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
- Trial fix to fix hang when importing list containing invalid
  isdn (alexandria-Bugs-25348)


alexandria-0.6.4.1-hang-importing-invalid-isdn.patch:

--- NEW FILE alexandria-0.6.4.1-hang-importing-invalid-isdn.patch ---
Index: lib/alexandria/import_library.rb
===================================================================
--- lib/alexandria/import_library.rb	(revision 1073)
+++ lib/alexandria/import_library.rb	(working copy)
@@ -300,7 +300,11 @@
           unless isbn[1]
             bad_isbns << isbn[0]
           else
-            books << Alexandria::BookProviders.isbn_search(isbn[1])
+            begin
+              books << Alexandria::BookProviders.isbn_search(isbn[1])
+            rescue => e
+              puts e.message
+            end
           end
         rescue => e
           puts e.message


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- alexandria.spec	8 Apr 2009 09:23:33 -0000	1.32
+++ alexandria.spec	12 Apr 2009 15:32:25 -0000	1.33
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,6 +26,9 @@
 # Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# Trial fix for hang up when importing list containing invalid isdn
+# ref: alexandria-Bugs-25348
+Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -77,6 +80,7 @@
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
+%patch2 -p0 -b .up25348
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -203,6 +207,10 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
+- Trial fix to fix hang when importing list containing invalid
+  isdn (alexandria-Bugs-25348)
+
 * Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
 - Embed Fedora EVR
 
@@ -215,12 +223,12 @@
   (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
-- 0.6.4.1 (fixing upstream bug 24568)
+- 0.6.4.1 (fixing alexandria-Bugs-24568)
 
 * Sun Mar 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4-1
 - 0.6.4
 - Patch from upstream to fix issue when book entry is once sorted
-  (upstream bug 24568)
+  (alexandria-Bugs-24568)
 
 * Fri Mar  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4-0.2.b1
 - Add ruby(htmlentities) dependency
@@ -237,6 +245,7 @@
 
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-9
 - Attempt to handle UTF-8 strings in library names correctly
+  (alexandria-Bugs-20168)
 
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
@@ -254,6 +263,7 @@
 * Wed Jul 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-5
 - Remove workaround for bug 436697 (tooltips crash).
   This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1
+  (ref: alexandria-Bugs-19042)
 
 * Thu Apr  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-4
 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3,



From thias at fedoraproject.org  Sun Apr 12 15:43:11 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 15:43:11 +0000 (UTC)
Subject: rpms/spampd/devel spampd.init,1.1,1.2 spampd.spec,1.3,1.4
Message-ID: <20090412154311.7025F70126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/spampd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21879

Modified Files:
	spampd.init spampd.spec 
Log Message:
Update init script to the new style.



Index: spampd.init
===================================================================
RCS file: /cvs/extras/rpms/spampd/devel/spampd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spampd.init	12 Feb 2007 19:10:47 -0000	1.1
+++ spampd.init	12 Apr 2009 15:42:39 -0000	1.2
@@ -1,44 +1,56 @@
 #!/bin/sh
 #
-# This script starts and stops the spampd daemon
+# spampd       Transparent SMTP/LMTP proxy filter using spamassassin
 #
-# chkconfig: - 79 31
-#
-# description: spampd uses SpamAssassin to check email messages for SPAM.
+# chkconfig:   - 79 31
+# description: Spampd is a program used within an e-mail delivery system to \
+#              scan messages for possible Unsolicited Commercial E-mail (UCE, \
+#              aka spam) content. It uses SpamAssassin (SA) to do the actual \
+#              message scanning.
+
+### BEGIN INIT INFO
+# Provides: spampd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: 
+# Should-Stop: 
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: Transparent SMTP/LMTP proxy filter using spamassassin
+# Description:       Spampd is a program used within an e-mail delivery system
+#                    to scan messages for possible Unsolicited Commercial
+#                    E-mail (UCE, aka spam) content. It uses SpamAssassin (SA)
+#                    to do the actual message scanning.
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
+exec="/usr/sbin/spampd"
 prog="spampd"
-OPTIONS="--user=spampd --group=spampd --tagall --local-only"
+options="--user=spampd --group=spampd --tagall --local-only"
 
-# Source an auxiliary options file if we have one, and pick up OPTIONS,
-if [ -r /etc/sysconfig/$prog ]; then
-    . /etc/sysconfig/$prog
-fi
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-RETVAL=0
+lockfile=/var/lock/subsys/$prog
 
 start() {
+    [ -x $exec ] || exit 5
     echo -n $"Starting $prog: "
-    daemon $prog $OPTIONS
-    RETVAL=$?
+    daemon $exec $options
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
     echo -n $"Stopping $prog: "
     killproc $prog
-    RETVAL=$?
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
 }
 
 restart() {
@@ -46,27 +58,52 @@
     start
 }
 
-# See how we were called.
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
+}
+
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
     start)
-        start
-    ;;
+        rh_status_q && exit 0
+        $1
+        ;;
     stop)
-        stop
-    ;;
+        rh_status_q || exit 0
+        $1
+        ;;
     restart)
-        restart
-    ;;
-    condrestart)
-        [ -f /var/lock/subsys/$prog ] && restart
-    ;;
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
     status)
-        status $prog
-    ;;
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-        exit 1
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?
 


Index: spampd.spec
===================================================================
RCS file: /cvs/extras/rpms/spampd/devel/spampd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spampd.spec	26 Feb 2009 02:19:20 -0000	1.3
+++ spampd.spec	12 Apr 2009 15:42:39 -0000	1.4
@@ -1,13 +1,14 @@
 Summary: Transparent SMTP/LMTP proxy filter using spamassassin
 Name: spampd
 Version: 2.30
-Release: 5
+Release: 6
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm
 Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz
 Source1: spampd.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
@@ -82,7 +83,11 @@
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30-5
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 2.30-6
+- Update init script to the new style.
+- Add missing Requires(pre): /usr/sbin/useradd.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 2.30-4



From rakesh at fedoraproject.org  Sun Apr 12 15:53:07 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 15:53:07 +0000 (UTC)
Subject: rpms/ctemplate/devel ctemplate-0.93.consts.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 ctemplate.spec, 1.4, 1.5 import.log, 1.1, 1.2 sources,
	1.2, 1.3 ctemplate-0.91.consts.patch, 1.1, NONE
Message-ID: <20090412155307.9771570126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24347/devel

Modified Files:
	.cvsignore ctemplate.spec import.log sources 
Added Files:
	ctemplate-0.93.consts.patch 
Removed Files:
	ctemplate-0.91.consts.patch 
Log Message:
Updated to 0.93.


ctemplate-0.93.consts.patch:

--- NEW FILE ctemplate-0.93.consts.patch ---
diff -ru ctemplate-0.93.org/src/template.cc ctemplate-0.93/src/template.cc
--- ctemplate-0.91.orig/src/tests/htmlparser_test.cc	2009-04-12 10:01:11.000000000 +0000
+++ ctemplate-0.91/src/tests/htmlparser_test.cc	2009-04-12 10:10:48.000000000 +0000
@@ -70,6 +70,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
+#include <stdio.h>
 #include <string>
 #include <utility>
 #include <vector>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2008 07:10:33 -0000	1.2
+++ .cvsignore	12 Apr 2009 15:52:36 -0000	1.3
@@ -1 +1 @@
-ctemplate-0.91.tar.gz
+ctemplate-0.93.tar.gz


Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ctemplate.spec	3 Mar 2009 10:21:58 -0000	1.4
+++ ctemplate.spec	12 Apr 2009 15:52:36 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           ctemplate
-Version:        0.91
-Release:        5%{?dist}
+Version:        0.93
+Release:        1%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://code.google.com/p/google-ctemplate/
 Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         ctemplate-0.91.consts.patch
+Patch0:         ctemplate-0.93.consts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  chrpath
 
@@ -28,7 +28,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .consts
+%patch0 -p1 -b .const
+
 
 %build
 %configure --disable-static
@@ -90,6 +91,9 @@
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.93-1
+- Updated to 0.93, removed patch for consts - fixed upstream
+
 * Tue Mar 03 2009 Caol??n McNamara <caolanm at redhat.com> - 0.91-5
 - fix up consts to build
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2008 07:10:33 -0000	1.1
+++ import.log	12 Apr 2009 15:52:36 -0000	1.2
@@ -1 +1,2 @@
 ctemplate-0_91-2_fc10:HEAD:ctemplate-0.91-2.fc10.src.rpm:1220684308
+ctemplate-0_93-1_fc11:HEAD:ctemplate-0.93-1.fc11.src.rpm:1239551194


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2008 07:10:33 -0000	1.2
+++ sources	12 Apr 2009 15:52:36 -0000	1.3
@@ -1 +1 @@
-0270ab187e32f31cd759736049d4d1bb  ctemplate-0.91.tar.gz
+bd42a10bbbcf3e4bffd21663c0bd61fa  ctemplate-0.93.tar.gz


--- ctemplate-0.91.consts.patch DELETED ---



From thias at fedoraproject.org  Sun Apr 12 15:55:29 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 15:55:29 +0000 (UTC)
Subject: rpms/xmms-skins/devel xmms-skins.spec,1.6,1.7
Message-ID: <20090412155529.EDB8170126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25471

Modified Files:
	xmms-skins.spec 
Log Message:
Replace "xmms" requirement with "xmms-gui" which other players can provide, audacious for instance (#470135).



Index: xmms-skins.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-skins/devel/xmms-skins.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmms-skins.spec	26 Feb 2009 10:25:32 -0000	1.6
+++ xmms-skins.spec	12 Apr 2009 15:54:59 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Skins for the X MultiMedia System
 Name: xmms-skins
 Version: 1.2.10
-Release: 20
+Release: 21
 Epoch: 1
 License: MIT and GPL+ and Copyright only and CC-BY
 Group: Applications/Multimedia
@@ -65,7 +65,8 @@
 # Source27: http://xmms.org/files/Skins/X-Tra.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-Requires: xmms
+# Virtual provides from "compatible" players (e.g. audacious), not just xmms
+Requires: xmms-gui
 Obsoletes: xmmsskins <= 1.0-5
 
 %description
@@ -100,7 +101,11 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.10-20
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.10-21
+- Replace "xmms" requirement with "xmms-gui" which other players can provide,
+  audacious for instance (#470135).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1:1.2.10-19



From thias at fedoraproject.org  Sun Apr 12 15:58:38 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 15:58:38 +0000 (UTC)
Subject: rpms/xmms/devel xmms.spec,1.39,1.40
Message-ID: <20090412155838.DB36C70126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26572

Modified Files:
	xmms.spec 
Log Message:
Add "xmms-gui" provides, to be required from xmms-skins package (#470135).



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xmms.spec	26 Feb 2009 10:11:08 -0000	1.39
+++ xmms.spec	12 Apr 2009 15:58:08 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        4.20071117cvs%{?dist}
+Release:        5.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -50,6 +50,9 @@
 Requires(post): desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
 
+# Skin packages can require this from xmms and all GUI compatible players
+Provides:       xmms-gui
+
 %description
 XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
 with an interface similar to Winamp's.  XMMS supports playlists and
@@ -215,6 +218,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-5.20071117cvs
+- Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.11-4.20071117cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sun Apr 12 15:58:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 15:58:50 +0000
Subject: [pkgdb] XaraLX: attila has requested watchcommits
Message-ID: <20090412155852.85F3D10F806@bastion2.fedora.phx.redhat.com>

attila has requested the watchcommits acl on XaraLX (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/XaraLX



From pkgdb at fedoraproject.org  Sun Apr 12 16:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 16:00:10 +0000
Subject: [pkgdb] XaraLX: attila has given up watchcommits
Message-ID: <20090412155900.B7BC210F87D@bastion2.fedora.phx.redhat.com>

attila has given up the watchcommits acl on XaraLX (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/XaraLX



From laxathom at fedoraproject.org  Sun Apr 12 16:00:29 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sun, 12 Apr 2009 16:00:29 +0000 (UTC)
Subject: rpms/gammu/devel .cvsignore, 1.14, 1.15 gammu.spec, 1.23,
	1.24 sources, 1.14, 1.15
Message-ID: <20090412160030.02B5070126@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27177

Modified Files:
	.cvsignore gammu.spec sources 
Log Message:
Update release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Feb 2009 22:58:45 -0000	1.14
+++ .cvsignore	12 Apr 2009 15:59:58 -0000	1.15
@@ -1 +1 @@
-gammu-1.22.94.tar.bz2
+gammu-1.23.92.tar.bz2


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gammu.spec	24 Feb 2009 19:29:50 -0000	1.23
+++ gammu.spec	12 Apr 2009 15:59:58 -0000	1.24
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.22.94
-Release:        2%{?dist}
+Version:        1.23.1
+Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -59,8 +59,7 @@
 Python bindings for Gammu library.
 It currently does not support all Gammu features,
 but range of covered functions is increasing,
-if you need some specific, feel free to use bug tracking
-system for feature requests.
+if you need some specific, feel free to use bug tracking system for feature requests.
 
 %description	devel
 The %{name}-devel  package contains Header and libraries files for
@@ -72,8 +71,8 @@
 %prep
 %setup -q
 
-sed -i 's|${INSTALL_LIB_DIR}|%{_libdir}|' CMakeLists.txt common/CMakeLists.txt \
-				smsd/CMakeLists.txt gammu/CMakeLists.txt
+#sed -i 's|${INSTALL_LIB_DIR}|%{_libdir}|' CMakeLists.txt libgammu/CMakeLists.txt \
+#				smsd/CMakeLists.txt gammu/CMakeLists.txt
 
 %build
 mkdir build
@@ -140,7 +139,7 @@
 %{_mandir}/cs/man1/*.gz
 %{_mandir}/cs/man5/*.gz
 %{_mandir}/cs/man7/*.gz
-#%config %{_sysconfdir}/bash_completion.d/%{name}
+%config %{_sysconfdir}/bash_completion.d/%{name}
 
 %files		libs
 %defattr(-,root,root,-)
@@ -159,6 +158,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Xavier Lamien <lxntow at gmail.com> - 1.23.1-1
+- Update release.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22.94-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Feb 2009 22:58:45 -0000	1.14
+++ sources	12 Apr 2009 15:59:59 -0000	1.15
@@ -1 +1 @@
-5f7a3ba8398e7757ffecc41aa1a48f00  gammu-1.22.94.tar.bz2
+796833440bb1f02b791375116ee564af  gammu-1.23.92.tar.bz2



From thias at fedoraproject.org  Sun Apr 12 16:12:23 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 16:12:23 +0000 (UTC)
Subject: rpms/audacious/devel audacious.spec,1.43,1.44
Message-ID: <20090412161223.DA94C70126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31493

Modified Files:
	audacious.spec 
Log Message:
Add "xmms-gui" provides, to be required from xmms-skins package (#470135).



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- audacious.spec	24 Feb 2009 03:04:16 -0000	1.43
+++ audacious.spec	12 Apr 2009 16:11:52 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -43,6 +43,9 @@
 Provides:       audacious-docklet
 Obsoletes:      audacious-docklet < 0.1.1-3
 
+# Skin packages can require this from xmms and all GUI compatible players
+Provides:       xmms-gui
+
 %description
 Audacious is a media player that currently uses a skinned
 user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -204,6 +207,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.5.1-7
+- Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rakesh at fedoraproject.org  Sun Apr 12 16:12:35 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 16:12:35 +0000 (UTC)
Subject: rpms/octave/devel .cvsignore, 1.23, 1.24 import.log, 1.1,
	1.2 octave.spec, 1.79, 1.80 sources, 1.23,
	1.24 octave-gcc44.patch, 1.1, NONE octave-sh-arch.patch, 1.1, NONE
Message-ID: <20090412161235.EC0C170126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31417/devel

Modified Files:
	.cvsignore import.log octave.spec sources 
Removed Files:
	octave-gcc44.patch octave-sh-arch.patch 
Log Message:
Updated to 3.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	10 Dec 2008 08:45:58 -0000	1.23
+++ .cvsignore	12 Apr 2009 16:12:05 -0000	1.24
@@ -1 +1 @@
-octave-3.0.3.tar.bz2
+octave-3.0.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Oct 2008 10:13:54 -0000	1.1
+++ import.log	12 Apr 2009 16:12:05 -0000	1.2
@@ -1 +1,2 @@
 octave-3_0_2-2_fc10:HEAD:octave-3.0.2-2.fc10.src.rpm:1224776342
+octave-3_0_5-1_fc11:HEAD:octave-3.0.5-1.fc11.src.rpm:1239552316


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- octave.spec	24 Feb 2009 04:55:19 -0000	1.79
+++ octave.spec	12 Apr 2009 16:12:05 -0000	1.80
@@ -2,16 +2,16 @@
 %define octave_api api-v32
 
 Name:           octave
-Version:        3.0.3
-Release:        2%{?dist}
+Version:        3.0.5
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPLv3+
 Source:         ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
-Patch1:         %{name}-sh-arch.patch
-Patch2:         %{name}-gcc44.patch
+#Patch1:         %{name}-sh-arch.patch
+#Patch2:         %{name}-gcc44.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -64,9 +64,9 @@
 fi
 
 # patch for sh arch
-%patch1 -p1 -b .sh-arch
+#%patch1 -p1 -b .sh-arch
 # patch for gcc 4.4
-%patch2 -p1 -b .gcc44
+#%patch2 -p1 -b .gcc44
 
 %build
 %define enable64 no
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 6:3.0.5-1
+- Updated to latest upstream (3.0.5)
+
 * Mon Feb 23 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.0.3-2
 - Add patches from upstream for compiling against GCC 4.4
   http://hg.savannah.gnu.org/hgweb/octave/rev/93cf10950334


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Dec 2008 08:45:59 -0000	1.23
+++ sources	12 Apr 2009 16:12:05 -0000	1.24
@@ -1 +1 @@
-38d258d60242cf4844e3c4350691ccff  octave-3.0.3.tar.bz2
+bfba44eeda8fa6e29c2bbcd2604c34eb  octave-3.0.5.tar.bz2


--- octave-gcc44.patch DELETED ---


--- octave-sh-arch.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Apr 12 16:23:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 12 Apr 2009 16:23:39 +0000 (UTC)
Subject: rpms/ochusha/devel .cvsignore, 1.73, 1.74 ochusha.spec, 1.101,
	1.102 sources, 1.73, 1.74
Message-ID: <20090412162339.2622370126@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2450

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	11 Mar 2009 15:55:01 -0000	1.73
+++ .cvsignore	12 Apr 2009 16:23:07 -0000	1.74
@@ -1 +1 @@
-ochusha-0.6.0.1-cvs20090312T0050.tar.bz2
+ochusha-0.6.0.1-cvs20090413T0000.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ochusha.spec	11 Mar 2009 15:55:01 -0000	1.101
+++ ochusha.spec	12 Apr 2009 16:23:07 -0000	1.102
@@ -16,8 +16,8 @@
 %define		help_url			file://%{_docdir}/%{name}-%{version}/doc/index.html
 
 %define		main_ver	0.6.0.1
-%define		codate		20090312
-%define		cotime_JST	0050
+%define		codate		20090413
+%define		cotime_JST	0000
 %define		strtag		cvs%{codate}T%{cotime_JST}
 %define		repoid		36733
 
@@ -220,7 +220,7 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Thu Mar 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to the latest CVS
 
 * Sat Feb 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	11 Mar 2009 15:55:02 -0000	1.73
+++ sources	12 Apr 2009 16:23:07 -0000	1.74
@@ -1 +1 @@
-5b0f35e6985def0b10243af63c77a604  ochusha-0.6.0.1-cvs20090312T0050.tar.bz2
+554a3f33e8c86fc4b5fff30353e0aee4  ochusha-0.6.0.1-cvs20090413T0000.tar.bz2



From rakesh at fedoraproject.org  Sun Apr 12 16:33:44 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 16:33:44 +0000 (UTC)
Subject: rpms/libkml/devel libkml-0.6.1.configure_ac.patch, NONE,
	1.1 import.log, 1.1, 1.2 libkml.spec, 1.1, 1.2
Message-ID: <20090412163344.21D4470126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/libkml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5246/devel

Modified Files:
	import.log libkml.spec 
Added Files:
	libkml-0.6.1.configure_ac.patch 
Log Message:
Initial import.


libkml-0.6.1.configure_ac.patch:

--- NEW FILE libkml-0.6.1.configure_ac.patch ---
--- libkml-0.6.1.org/configure.ac	2009-04-13 09:24:15.041537747 +0530
+++ libkml-0.6.1/configure.ac	2009-04-13 09:25:24.670599502 +0530
@@ -72,8 +72,8 @@
 	AC_CHECK_PROG(SWIG, swig, swig)
 	if test "x$SWIG" != x; then
 		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
-		if test $SWIG_VERSION != 1.3.35; then
-			AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires SWIG 1.3.35. The bindings will not be built.])
+		if test $SWIG_VERSION >= 1.3.35; then
+			AC_MSG_WARN([You have SWIG have $SWIG_VERSION installed, but libkml requires greater then SWIG 1.3.35. The bindings will not be built.])
 			SWIG=
 		fi
 	fi


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libkml/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2009 17:21:09 -0000	1.1
+++ import.log	12 Apr 2009 16:33:11 -0000	1.2
@@ -1 +1,2 @@
 libkml-0_6_1-2_fc10:HEAD:libkml-0.6.1-2.fc10.src.rpm:1236446111
+libkml-0_6_1-3_fc11:HEAD:libkml-0.6.1-3.fc11.src.rpm:1239553153


Index: libkml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkml/devel/libkml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libkml.spec	7 Mar 2009 17:21:09 -0000	1.1
+++ libkml.spec	12 Apr 2009 16:33:12 -0000	1.2
@@ -3,15 +3,15 @@
 
 Name:           libkml
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A KML library written in C++ with bindings to other languagues
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://code.google.com/p/%{name}/
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
-#Patch0:         libkml-string.patch
-Patch1:         libkml-third_party_removal.diff
+Patch0:         libkml-third_party_removal.diff
+Patch1:         libkml-0.6.1.configure_ac.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # requires swig >= 1.3.35
@@ -40,8 +40,8 @@
 %prep
 %setup -q
 rm -rf third_party
-%patch1 -p0 -b .third_party
-#%patch0 -p1 -b .string
+%patch0 -p0 -b .third_party
+%patch1 -p1 -b .configure_ac
 
 %build
 autoreconf -fi
@@ -100,8 +100,8 @@
 %{_libdir}/libkml/*.so.*
 %{python_sitearch}/*.so
 %{python_sitearch}/*.py
-%{python_sitearch}/*.pyc
-%{python_sitearch}/*.pyo
+#%{python_sitearch}/*.pyc
+#%{python_sitearch}/*.pyo
 
 %files devel
 %defattr(-,root,root,-)
@@ -111,6 +111,9 @@
 %{_libdir}/libkml/*.so
 
 %changelog
+* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.6.1-3
+- libkml-0.6.1.configure_ac.patch patch for swig > 1.3.35
+
 * Sat Mar 07 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.6.1-2
 - updated to 0.6.1
 - libkml-third_party_removal.diff Removes third part dependency



From thias at fedoraproject.org  Sun Apr 12 16:39:27 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 16:39:27 +0000 (UTC)
Subject: rpms/lighttpd/devel lighttpd.init,NONE,1.1 lighttpd.spec,1.57,1.58
Message-ID: <20090412163927.C4F1570126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7430

Modified Files:
	lighttpd.spec 
Added Files:
	lighttpd.init 
Log Message:
Update init script to new style.



--- NEW FILE lighttpd.init ---
#!/bin/sh
#
# lighttpd     Lightning fast webserver with light system requirements
#
# chkconfig:   - 85 15
# description: Secure, fast, compliant and very flexible web-server which has \
#              been optimized for high-performance environments. It has a \
#              very low memory footprint compared to other web servers and \
#              takes care of cpu-load.

### BEGIN INIT INFO
# Provides: httpd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $named
# Should-Stop: $named
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Lightning fast webserver with light system requirements
# Description:       Secure, fast, compliant and very flexible web-server which
#                    has been optimized for high-performance environments. It
#                    has a very low memory footprint compared to other web
#                    servers and takes care of cpu-load.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/sbin/lighttpd"
prog="lighttpd"
config="/etc/lighttpd/lighttpd.conf"

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec -f $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    echo -n $"Reloading $prog: "
    killproc $prog -HUP
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status &>/dev/null
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- lighttpd.spec	30 Mar 2009 09:30:43 -0000	1.57
+++ lighttpd.spec	12 Apr 2009 16:38:57 -0000	1.58
@@ -6,13 +6,14 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.22
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
 Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
+Source3: lighttpd.init
 Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
 Source12: http://www.lighttpd.net/light_button.png
@@ -130,12 +131,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# Install included init script and sysconfig entry
-%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
-%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \
-    %{buildroot}%{_sysconfdir}/sysconfig/lighttpd
-
 # Install (*patched above*) sample config file
 %{__install} -D -p -m 0640 doc/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
@@ -149,6 +144,10 @@
 %{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
 
+# Install our own init script (the included one is old style)
+%{__install} -D -p -m 0755 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
+
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -200,7 +199,6 @@
 %dir %{_sysconfdir}/lighttpd/conf.d/
 %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
-%config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
 %{_sbindir}/lighttpd-angel
@@ -242,7 +240,13 @@
 %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
+
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
+- Update init script to new style.
+- No longer include a sysconfig file, though one can be set to override the
+  default configuration file location.
+
 * Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
 - Update to 1.4.22.
 - Add missing defattr for the spawn-fcgi package.



From thias at fedoraproject.org  Sun Apr 12 17:08:29 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 17:08:29 +0000 (UTC)
Subject: rpms/keepalived/devel .cvsignore, 1.4, 1.5 keepalived.init, 1.3,
	1.4 keepalived.spec, 1.14, 1.15 sources, 1.5, 1.6
Message-ID: <20090412170830.1C35D70126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15887

Modified Files:
	.cvsignore keepalived.init keepalived.spec sources 
Log Message:
Update to 1.1.17 and update init script all the way.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Sep 2007 09:31:01 -0000	1.4
+++ .cvsignore	12 Apr 2009 17:07:57 -0000	1.5
@@ -1 +1 @@
-keepalived-1.1.15.tar.gz
+keepalived-1.1.17.tar.gz


Index: keepalived.init
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keepalived.init	24 Dec 2008 14:56:52 -0000	1.3
+++ keepalived.init	12 Apr 2009 17:07:57 -0000	1.4
@@ -1,85 +1,110 @@
 #!/bin/sh
 #
-# Startup script for the Keepalived daemon
-# chkconfig: - 21 79
-# description: HA monitor built upon LVS, VRRP and service pollers
-# processname: keepalived
-# config: /etc/keepalived/keepalived.conf
-# config: /etc/sysconfig/keepalived
-# pidfile: /var/run/keepalived.pid
+# keepalived   High Availability monitor built upon LVS and VRRP
 #
+# chkconfig:   - 21 79
+# description: Robust keepalive facility to the Linux Virtual Server project \
+#              with multilayer TCP/IP stack checks.
+
 ### BEGIN INIT INFO
 # Provides: keepalived
-# Required-Start: $local_fs $network $named
-# Required-Stop: $local_fs $remote_fs $network
-# Short-Description: HA monitor built upon LVS, VRRP and service pollers
-# Description: Robust keepalive facility to the Linux Virtual Server project
-#  with multilayer TCP/IP stack checks.
+# Required-Start: $local_fs $network $named $syslog
+# Required-Stop: $local_fs $network $named $syslog
+# Should-Start: httpd
+# Should-Stop:  httpd
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: High Availability monitor built upon LVS and VRRP
+# Description:       Robust keepalive facility to the Linux Virtual Server
+#                    project with multilayer TCP/IP stack checks.
 ### END INIT INFO
 
-# Source function library
+# Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source configuration file (we set KEEPALIVED_OPTIONS there)
-. /etc/sysconfig/keepalived
+exec="/usr/sbin/keepalived"
+prog="keepalived"
+config="/etc/keepalived/keepalived.conf"
 
-RETVAL=0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-prog="keepalived"
+lockfile=/var/lock/subsys/$prog
 
 start() {
+    [ -x $exec ] || exit 5
+    [ -e $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon keepalived ${KEEPALIVED_OPTIONS}
-    RETVAL=$?
+    daemon $exec $KEEPALIVED_OPTIONS
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc keepalived
-    RETVAL=$?
+    killproc $prog
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
 }
 
 reload() {
     echo -n $"Reloading $prog: "
-    killproc keepalived -1
-    RETVAL=$?
+    killproc $prog -1
+    retval=$?
     echo
+    return $retval
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
 }
 
-# See how we were called.
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
     start)
-        start
+        rh_status_q && exit 0
+        $1
         ;;
     stop)
-        stop
-        ;;
-    reload|force-reload)
-        reload
+        rh_status_q || exit 0
+        $1
         ;;
     restart)
-        stop
-        start
+        $1
         ;;
-    condrestart|try-restart)
-        if [ -f /var/lock/subsys/$prog ]; then
-            stop
-            start
-        else
-            echo $"Service $prog not running."
-            exit 7
-        fi
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
         ;;
     status)
-        status keepalived
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
         ;;
     *)
-        echo "Usage: $0 {start|stop|reload|force-reload|restart|try-restart|status}"
-        exit 3
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
+exit $?
 
-exit $RETVAL


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- keepalived.spec	25 Feb 2009 11:02:39 -0000	1.14
+++ keepalived.spec	12 Apr 2009 17:07:57 -0000	1.15
@@ -3,8 +3,8 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.15
-Release: 8%{?dist}
+Version: 1.1.17
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
@@ -39,7 +39,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .installmodes
-# Fix file mode (600 as of 1.1.13)
+# Fix file mode (600 as of 1.1.13, still as of 1.1.17)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
 %{__chmod} -x goodies/arpreset.pl
@@ -57,7 +57,7 @@
 %{__make} install DESTDIR=%{buildroot}
 # Remove "samples", as we include them in %%doc
 %{__rm} -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
-# Overwrite the init script with our (mostly) LSB compliant one
+# Overwrite the init script with our LSB compliant one
 %{__install} -p -m 0755 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/keepalived
 
@@ -106,7 +106,11 @@
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.15-8
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.1.17-1
+- Update to 1.1.17.
+- Update init script all the way.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.15-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2007 09:33:00 -0000	1.5
+++ sources	12 Apr 2009 17:07:57 -0000	1.6
@@ -1 +1 @@
-4c93f5d8b6bfabe84b02828a5bbb7aa0  keepalived-1.1.15.tar.gz
+324ef61a9eed389679f0a05edd1d1323  keepalived-1.1.17.tar.gz



From lucilanga at fedoraproject.org  Sun Apr 12 17:50:50 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 12 Apr 2009 17:50:50 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss.spec,1.24,1.25
Message-ID: <20090412175050.4F63170126@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26587

Modified Files:
	evolution-rss.spec 
Log Message:
* Sun Apr 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-8
- EVR bump


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- evolution-rss.spec	12 Apr 2009 12:34:47 -0000	1.24
+++ evolution-rss.spec	12 Apr 2009 17:50:17 -0000	1.25
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.2
-Release:	5%{?dist}
+Release:	8%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -83,6 +83,9 @@
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Sun Apr 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-8
+- EVR bump
+
 * Sat Apr 11 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-5
 - temporary fix for bug #489217: set interval longer than 100 minutes
 



From rakesh at fedoraproject.org  Sun Apr 12 18:02:20 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 18:02:20 +0000 (UTC)
Subject: rpms/ctemplate/devel ctemplate-0.93.bswap.patch, NONE,
	1.1 ctemplate.spec, 1.5, 1.6 import.log, 1.2, 1.3
Message-ID: <20090412180220.820EF70126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29311/devel

Modified Files:
	ctemplate.spec import.log 
Added Files:
	ctemplate-0.93.bswap.patch 
Log Message:
Added python as BuildRequires, and bswap patch for ppc.


ctemplate-0.93.bswap.patch:

--- NEW FILE ctemplate-0.93.bswap.patch ---
--- ctemplate-0.93.org/src/template_string.cc	2009-04-13 09:59:48.301599306 +0530
+++ ctemplate-0.93/src/template_string.cc	2009-04-13 11:15:10.005599785 +0530
@@ -85,7 +85,7 @@
 // we do what we can to make this as efficient as possible.
 #if defined(HAVE_BYTESWAP_H)
 # include <byteswap.h>              // GNU (especially linux)
-# define BSWAP32(x)  bswap32(x)
+# define BSWAP32(x)  bswap_32(x)
 #elif defined(HAVE_LIBKERN_OSBYTEORDER_H)
 # include <libkern/OSByteOrder.h>   // OS X
 # define BSWAP32(x)  OSSwapInt32(x)


Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ctemplate.spec	12 Apr 2009 15:52:36 -0000	1.5
+++ ctemplate.spec	12 Apr 2009 18:01:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ctemplate
 Version:        0.93
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -8,8 +8,9 @@
 URL:            http://code.google.com/p/google-ctemplate/
 Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         ctemplate-0.93.consts.patch
+Patch1:         ctemplate-0.93.bswap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  chrpath
+BuildRequires:  chrpath, python
 
 %description
 CTemplate is a simple but powerful template language for C++. It
@@ -29,7 +30,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .const
-
+chmod 644 src/template_string.cc
+%patch1 -p1 -b .bswap
 
 %build
 %configure --disable-static
@@ -91,6 +93,9 @@
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.93-2
+- Added python as BuildRequires, and bswap patch for ppc
+
 * Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.93-1
 - Updated to 0.93, removed patch for consts - fixed upstream
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Apr 2009 15:52:36 -0000	1.2
+++ import.log	12 Apr 2009 18:01:48 -0000	1.3
@@ -1,2 +1,3 @@
 ctemplate-0_91-2_fc10:HEAD:ctemplate-0.91-2.fc10.src.rpm:1220684308
 ctemplate-0_93-1_fc11:HEAD:ctemplate-0.93-1.fc11.src.rpm:1239551194
+ctemplate-0_93-2_fc11:HEAD:ctemplate-0.93-2.fc11.src.rpm:1239559001



From lucilanga at fedoraproject.org  Sun Apr 12 18:02:49 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 12 Apr 2009 18:02:49 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 evolution-rss-0.1.2-updateinterval.patch,
	NONE, 1.1 evolution-rss.spec, 1.26, 1.27
Message-ID: <20090412180249.5FF4770126@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29533

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.2-updateinterval.patch 
Log Message:
* Sun Apr 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-7
- temporary fix for bug #489217: set interval longer than 100 minutes

evolution-rss-0.1.2-updateinterval.patch:

--- NEW FILE evolution-rss-0.1.2-updateinterval.patch ---
Index: src/rss-config-factory.c
===================================================================
--- src/rss-config-factory.c	(revision 499)
+++ src/rss-config-factory.c	(working copy)
@@ -374,6 +374,7 @@
 	GtkWidget *radiobutton5 = (GtkWidget *)glade_xml_get_widget (gui, "ttl");
 	GtkWidget *radiobutton6 = (GtkWidget *)glade_xml_get_widget (gui, "ttl_disabled");
 	GtkWidget *ttl_value = (GtkWidget *)glade_xml_get_widget (gui, "ttl_value");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(ttl_value), 0, 10000);
 
   	switch (del_feed)
   	{


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- evolution-rss.spec	27 Mar 2009 19:32:24 -0000	1.26
+++ evolution-rss.spec	12 Apr 2009 18:02:18 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %doc TODO
 
 %changelog
+* Sun Apr 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-7
+- temporary fix for bug #489217: set interval longer than 100 minutes
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-6
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Sun Apr 12 18:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:18:26 +0000
Subject: [pkgdb] frei0r-plugins was added for kwizart
Message-ID: <20090412181826.5378810F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package frei0r-plugins with summary Frei0r - a minimalistic plugin API for video effects
kevin has approved Package frei0r-plugins
kevin has added a Fedora devel branch for frei0r-plugins with an owner of kwizart
kevin has approved frei0r-plugins in Fedora devel
kevin has approved Package frei0r-plugins
kevin has set commit to Approved for provenpackager on frei0r-plugins (Fedora devel)
kevin has set build to Approved for provenpackager on frei0r-plugins (Fedora devel)
kevin has set checkout to Approved for provenpackager on frei0r-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/frei0r-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:19:39 +0000
Subject: [pkgdb] frei0r-plugins (Fedora, 9) updated by kevin
Message-ID: <20090412181827.F37B610F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for frei0r-plugins
kevin has set commit to Approved for provenpackager on frei0r-plugins (Fedora 9)
kevin has set build to Approved for provenpackager on frei0r-plugins (Fedora 9)
kevin has set checkout to Approved for provenpackager on frei0r-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/frei0r-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:19:39 +0000
Subject: [pkgdb] frei0r-plugins (Fedora, 10) updated by kevin
Message-ID: <20090412181828.0679610F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for frei0r-plugins
kevin has set commit to Approved for provenpackager on frei0r-plugins (Fedora 10)
kevin has set build to Approved for provenpackager on frei0r-plugins (Fedora 10)
kevin has set checkout to Approved for provenpackager on frei0r-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/frei0r-plugins



From kevin at fedoraproject.org  Sun Apr 12 18:18:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:18:41 +0000 (UTC)
Subject: rpms/frei0r-plugins - New directory
Message-ID: <20090412181841.6CCCD70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frei0r-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvg2025/rpms/frei0r-plugins

Log Message:
Directory /cvs/pkgs/rpms/frei0r-plugins added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:18:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:18:41 +0000 (UTC)
Subject: rpms/frei0r-plugins/devel - New directory
Message-ID: <20090412181841.B76FC70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frei0r-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvg2025/rpms/frei0r-plugins/devel

Log Message:
Directory /cvs/pkgs/rpms/frei0r-plugins/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:18:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:18:51 +0000 (UTC)
Subject: rpms/frei0r-plugins Makefile,NONE,1.1
Message-ID: <20090412181851.9736E70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frei0r-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvg2025/rpms/frei0r-plugins

Added Files:
	Makefile 
Log Message:
Setup of module frei0r-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module frei0r-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:18:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:18:52 +0000 (UTC)
Subject: rpms/frei0r-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412181852.36F0870126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/frei0r-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvg2025/rpms/frei0r-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module frei0r-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: frei0r-plugins
# $Id: Makefile,v 1.1 2009/04/12 18:18:51 kevin Exp $
NAME := frei0r-plugins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Sun Apr 12 18:19:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:19:54 +0000 (UTC)
Subject: rpms/fabric - New directory
Message-ID: <20090412181954.2A0C070126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fabric
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuN2455/rpms/fabric

Log Message:
Directory /cvs/pkgs/rpms/fabric added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:19:37 +0000
Subject: [pkgdb] fabric was added for silas
Message-ID: <20090412181937.2BD5210F80B@bastion2.fedora.phx.redhat.com>

kevin has added Package fabric with summary A simple Pythonic remote deployment tool
kevin has approved Package fabric
kevin has added a Fedora devel branch for fabric with an owner of silas
kevin has approved fabric in Fedora devel
kevin has approved Package fabric
kevin has set commit to Approved for provenpackager on fabric (Fedora devel)
kevin has set build to Approved for provenpackager on fabric (Fedora devel)
kevin has set checkout to Approved for provenpackager on fabric (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From kevin at fedoraproject.org  Sun Apr 12 18:19:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:19:54 +0000 (UTC)
Subject: rpms/fabric/devel - New directory
Message-ID: <20090412181954.802F270126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fabric/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuN2455/rpms/fabric/devel

Log Message:
Directory /cvs/pkgs/rpms/fabric/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:20:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:20:05 +0000 (UTC)
Subject: rpms/fabric Makefile,NONE,1.1
Message-ID: <20090412182005.A41A870126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fabric
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuN2455/rpms/fabric

Added Files:
	Makefile 
Log Message:
Setup of module fabric


--- NEW FILE Makefile ---
# Top level Makefile for module fabric
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:20:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:20:06 +0000 (UTC)
Subject: rpms/fabric/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090412182006.10EB270126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fabric/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsuN2455/rpms/fabric/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fabric


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fabric
# $Id: Makefile,v 1.1 2009/04/12 18:20:05 kevin Exp $
NAME := fabric
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:02 +0000
Subject: [pkgdb] lxmusic was added for cwickert
Message-ID: <20090412182050.B3B3510F80B@bastion2.fedora.phx.redhat.com>

kevin has added Package lxmusic with summary Lightweight XMMS2 client with simple user interface
kevin has approved Package lxmusic
kevin has added a Fedora devel branch for lxmusic with an owner of cwickert
kevin has approved lxmusic in Fedora devel
kevin has approved Package lxmusic
kevin has set commit to Approved for provenpackager on lxmusic (Fedora devel)
kevin has set build to Approved for provenpackager on lxmusic (Fedora devel)
kevin has set checkout to Approved for provenpackager on lxmusic (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxmusic



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:07 +0000
Subject: [pkgdb] lxmusic (Fedora, 9) updated by kevin
Message-ID: <20090412182057.11CE410F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for lxmusic
kevin has set commit to Approved for provenpackager on lxmusic (Fedora 9)
kevin has set build to Approved for provenpackager on lxmusic (Fedora 9)
kevin has set checkout to Approved for provenpackager on lxmusic (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxmusic



From kevin at fedoraproject.org  Sun Apr 12 18:21:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:21:09 +0000 (UTC)
Subject: rpms/lxmusic - New directory
Message-ID: <20090412182109.55CB770126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxmusic
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssw2741/rpms/lxmusic

Log Message:
Directory /cvs/pkgs/rpms/lxmusic added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:21:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:21:09 +0000 (UTC)
Subject: rpms/lxmusic/devel - New directory
Message-ID: <20090412182109.AE20A70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssw2741/rpms/lxmusic/devel

Log Message:
Directory /cvs/pkgs/rpms/lxmusic/devel added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:07 +0000
Subject: [pkgdb] lxmusic (Fedora, 10) updated by kevin
Message-ID: <20090412182057.2385F10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lxmusic
kevin has set commit to Approved for provenpackager on lxmusic (Fedora 10)
kevin has set build to Approved for provenpackager on lxmusic (Fedora 10)
kevin has set checkout to Approved for provenpackager on lxmusic (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxmusic



From kevin at fedoraproject.org  Sun Apr 12 18:21:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:21:25 +0000 (UTC)
Subject: rpms/lxmusic Makefile,NONE,1.1
Message-ID: <20090412182125.31F0370126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxmusic
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssw2741/rpms/lxmusic

Added Files:
	Makefile 
Log Message:
Setup of module lxmusic


--- NEW FILE Makefile ---
# Top level Makefile for module lxmusic
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sun Apr 12 18:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:21:12 +0000
Subject: [pkgdb] aquamarine: thias has given up watchbugzilla
Message-ID: <20090412182112.2107710F87D@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on aquamarine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From kevin at fedoraproject.org  Sun Apr 12 18:21:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:21:25 +0000 (UTC)
Subject: rpms/lxmusic/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090412182125.9ECC270126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssw2741/rpms/lxmusic/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lxmusic


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lxmusic
# $Id: Makefile,v 1.1 2009/04/12 18:21:25 kevin Exp $
NAME := lxmusic
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:40 +0000
Subject: [pkgdb] aquamarine: thias has given up watchcommits
Message-ID: <20090412182128.1E43E10F881@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on aquamarine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:44 +0000
Subject: [pkgdb] aquamarine: thias has given up commit
Message-ID: <20090412182134.B75C210F85A@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on aquamarine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:21:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:21:38 +0000
Subject: [pkgdb] aquamarine: thias has given up approveacls
Message-ID: <20090412182138.0D22F10F87D@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on aquamarine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:56 +0000
Subject: [pkgdb] gmusicbrowser was added for remi
Message-ID: <20090412182146.1B01110F882@bastion2.fedora.phx.redhat.com>

kevin has added Package gmusicbrowser with summary Jukebox for large collections of music files
kevin has approved Package gmusicbrowser
kevin has added a Fedora devel branch for gmusicbrowser with an owner of remi
kevin has approved gmusicbrowser in Fedora devel
kevin has approved Package gmusicbrowser
kevin has set commit to Approved for provenpackager on gmusicbrowser (Fedora devel)
kevin has set build to Approved for provenpackager on gmusicbrowser (Fedora devel)
kevin has set checkout to Approved for provenpackager on gmusicbrowser (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gmusicbrowser



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:00 +0000
Subject: [pkgdb] gmusicbrowser (Fedora, 10) updated by kevin
Message-ID: <20090412182148.7ACEE10F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gmusicbrowser
kevin has set commit to Approved for provenpackager on gmusicbrowser (Fedora 10)
kevin has set build to Approved for provenpackager on gmusicbrowser (Fedora 10)
kevin has set checkout to Approved for provenpackager on gmusicbrowser (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gmusicbrowser



From kevin at fedoraproject.org  Sun Apr 12 18:21:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:21:56 +0000 (UTC)
Subject: rpms/gmusicbrowser - New directory
Message-ID: <20090412182156.27C7570126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gmusicbrowser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZg3095/rpms/gmusicbrowser

Log Message:
Directory /cvs/pkgs/rpms/gmusicbrowser added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:21:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:21:56 +0000 (UTC)
Subject: rpms/gmusicbrowser/devel - New directory
Message-ID: <20090412182156.662A670126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gmusicbrowser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZg3095/rpms/gmusicbrowser/devel

Log Message:
Directory /cvs/pkgs/rpms/gmusicbrowser/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:22:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:22:07 +0000 (UTC)
Subject: rpms/gmusicbrowser Makefile,NONE,1.1
Message-ID: <20090412182207.A660170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gmusicbrowser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZg3095/rpms/gmusicbrowser

Added Files:
	Makefile 
Log Message:
Setup of module gmusicbrowser


--- NEW FILE Makefile ---
# Top level Makefile for module gmusicbrowser
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:22:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:22:08 +0000 (UTC)
Subject: rpms/gmusicbrowser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412182208.3C73970126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gmusicbrowser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZg3095/rpms/gmusicbrowser/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gmusicbrowser


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gmusicbrowser
# $Id: Makefile,v 1.1 2009/04/12 18:22:07 kevin Exp $
NAME := gmusicbrowser
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:13 +0000
Subject: [pkgdb] aquamarine: thias has given up watchcommits
Message-ID: <20090412182215.38F9710F88D@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on aquamarine (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:23 +0000
Subject: [pkgdb] aquamarine: thias has given up approveacls
Message-ID: <20090412182211.2DE1A10F886@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on aquamarine (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:25 +0000
Subject: [pkgdb] aquamarine: thias has given up watchbugzilla
Message-ID: <20090412182215.6FD6B10F890@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on aquamarine (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:28 +0000
Subject: [pkgdb] aquamarine: thias has given up commit
Message-ID: <20090412182216.E7D0510F885@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on aquamarine (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:15 +0000
Subject: [pkgdb] aquamarine: thias has given up approveacls
Message-ID: <20090412182217.7241510F895@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on aquamarine (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:34 +0000
Subject: [pkgdb] aquamarine: thias has given up watchbugzilla
Message-ID: <20090412182224.D669610F87E@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on aquamarine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:34 +0000
Subject: [pkgdb] aquamarine: thias has given up approveacls
Message-ID: <20090412182224.E8CDD10F888@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on aquamarine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:35 +0000
Subject: [pkgdb] aquamarine: thias has given up commit
Message-ID: <20090412182225.0B4E110F894@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on aquamarine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:35 +0000
Subject: [pkgdb] aquamarine: thias has given up watchcommits
Message-ID: <20090412182225.5B83C10F898@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on aquamarine (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aquamarine



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:52 +0000
Subject: [pkgdb] bdock: thias has given up watchbugzilla
Message-ID: <20090412182240.5527410F882@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on bdock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:51 +0000
Subject: [pkgdb] bdock: thias has given up watchcommits
Message-ID: <20090412182241.2B10810F88D@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on bdock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:55 +0000
Subject: [pkgdb] unclutter was added for till
Message-ID: <20090412182243.4451610F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package unclutter with summary hide mouse cursor when idle
kevin has approved Package unclutter
kevin has added a Fedora devel branch for unclutter with an owner of till
kevin has approved unclutter in Fedora devel
kevin has approved Package unclutter
kevin has set commit to Approved for provenpackager on unclutter (Fedora devel)
kevin has set build to Approved for provenpackager on unclutter (Fedora devel)
kevin has set checkout to Approved for provenpackager on unclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unclutter



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:44 +0000
Subject: [pkgdb] bdock: thias has given up commit
Message-ID: <20090412182244.2F1A410F89F@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on bdock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:42 +0000
Subject: [pkgdb] unclutter (Fedora EPEL, 5) updated by kevin
Message-ID: <20090412182244.88F3C10F8A7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for unclutter
kevin has set commit to Approved for provenpackager on unclutter (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on unclutter (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on unclutter (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unclutter



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:44 +0000
Subject: [pkgdb] bdock: thias has given up approveacls
Message-ID: <20090412182244.6CD7E10F8A3@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on bdock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:42 +0000
Subject: [pkgdb] unclutter (Fedora, 10) updated by kevin
Message-ID: <20090412182244.8BB5D10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for unclutter
kevin has set commit to Approved for provenpackager on unclutter (Fedora 10)
kevin has set build to Approved for provenpackager on unclutter (Fedora 10)
kevin has set checkout to Approved for provenpackager on unclutter (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unclutter



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:42 +0000
Subject: [pkgdb] unclutter (Fedora, 11) updated by kevin
Message-ID: <20090412182244.981A510F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for unclutter
kevin has set commit to Approved for provenpackager on unclutter (Fedora 11)
kevin has set build to Approved for provenpackager on unclutter (Fedora 11)
kevin has set checkout to Approved for provenpackager on unclutter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unclutter



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:42 +0000
Subject: [pkgdb] unclutter (Fedora, 9) updated by kevin
Message-ID: <20090412182244.A056210F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for unclutter
kevin has set commit to Approved for provenpackager on unclutter (Fedora 9)
kevin has set build to Approved for provenpackager on unclutter (Fedora 9)
kevin has set checkout to Approved for provenpackager on unclutter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unclutter



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:43 +0000
Subject: [pkgdb] bdock: thias has given up watchbugzilla
Message-ID: <20090412182245.C3AD310F8B2@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on bdock (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:58 +0000
Subject: [pkgdb] bdock: thias has given up commit
Message-ID: <20090412182246.E276110F8B7@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on bdock (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:01 +0000
Subject: [pkgdb] bdock: thias has given up watchcommits
Message-ID: <20090412182251.40BA110F88F@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on bdock (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:01 +0000
Subject: [pkgdb] bdock: thias has given up approveacls
Message-ID: <20090412182251.63F0410F8BA@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on bdock (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:49 +0000
Subject: [pkgdb] bdock: thias has given up watchcommits
Message-ID: <20090412182251.84BD610F8BD@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on bdock (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:52 +0000
Subject: [pkgdb] bdock: thias has given up watchbugzilla
Message-ID: <20090412182252.3B8E010F8C1@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on bdock (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:04 +0000
Subject: [pkgdb] bdock: thias has given up watchbugzilla
Message-ID: <20090412182254.520AD10F8C4@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on bdock (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:06 +0000
Subject: [pkgdb] bdock: thias has given up approveacls
Message-ID: <20090412182254.A081010F8C7@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on bdock (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:07 +0000
Subject: [pkgdb] bdock: thias has given up commit
Message-ID: <20090412182255.15CE610F8CB@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on bdock (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:55 +0000
Subject: [pkgdb] bdock: thias has given up watchcommits
Message-ID: <20090412182255.4FEA710F8CD@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on bdock (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:22:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:22:53 +0000
Subject: [pkgdb] bdock: thias has given up commit
Message-ID: <20090412182255.B47F810F8D0@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on bdock (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From kevin at fedoraproject.org  Sun Apr 12 18:22:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:22:57 +0000 (UTC)
Subject: rpms/unclutter - New directory
Message-ID: <20090412182257.36E6770126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unclutter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWW3399/rpms/unclutter

Log Message:
Directory /cvs/pkgs/rpms/unclutter added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:22:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:22:57 +0000 (UTC)
Subject: rpms/unclutter/devel - New directory
Message-ID: <20090412182257.B77A870126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unclutter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWW3399/rpms/unclutter/devel

Log Message:
Directory /cvs/pkgs/rpms/unclutter/devel added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:08 +0000
Subject: [pkgdb] bdock: thias has given up approveacls
Message-ID: <20090412182256.BD81810F8D4@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on bdock (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bdock



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:20 +0000
Subject: [pkgdb] beryl-core: thias has given up watchbugzilla
Message-ID: <20090412182311.1BAFF10F87F@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:09 +0000
Subject: [pkgdb] beryl-core: thias has given up commit
Message-ID: <20090412182311.6A64410F893@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:25 +0000
Subject: [pkgdb] beryl-core: thias has given up approveacls
Message-ID: <20090412182313.A2A0E10F8DA@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From kevin at fedoraproject.org  Sun Apr 12 18:23:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:23:13 +0000 (UTC)
Subject: rpms/unclutter Makefile,NONE,1.1
Message-ID: <20090412182313.631AB70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unclutter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWW3399/rpms/unclutter

Added Files:
	Makefile 
Log Message:
Setup of module unclutter


--- NEW FILE Makefile ---
# Top level Makefile for module unclutter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:23:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:23:13 +0000 (UTC)
Subject: rpms/unclutter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412182313.DF6CE70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unclutter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWW3399/rpms/unclutter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module unclutter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: unclutter
# $Id: Makefile,v 1.1 2009/04/12 18:23:13 kevin Exp $
NAME := unclutter
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:15 +0000
Subject: [pkgdb] beryl-core: thias has given up watchcommits
Message-ID: <20090412182314.C587510F8E2@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:13 +0000
Subject: [pkgdb] beryl-core: thias has given up commit
Message-ID: <20090412182315.6C6AC10F8E6@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-core (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:28 +0000
Subject: [pkgdb] beryl-core: thias has given up approveacls
Message-ID: <20090412182316.E1A7A10F8E8@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-core (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:17 +0000
Subject: [pkgdb] beryl-core: thias has given up watchcommits
Message-ID: <20090412182317.0433A10F8EB@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-core (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:28 +0000
Subject: [pkgdb] beryl-core: thias has given up watchbugzilla
Message-ID: <20090412182318.75B1610F8EE@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-core (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:30 +0000
Subject: [pkgdb] beryl-core: thias has given up watchbugzilla
Message-ID: <20090412182319.3C65710F8F1@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-core (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:30 +0000
Subject: [pkgdb] beryl-core: thias has given up watchcommits
Message-ID: <20090412182320.2364C10F8F4@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-core (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:19 +0000
Subject: [pkgdb] beryl-core: thias has given up approveacls
Message-ID: <20090412182321.9222C10F8FC@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-core (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:23 +0000
Subject: [pkgdb] beryl-core: thias has given up commit
Message-ID: <20090412182323.47EE910F88B@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-core (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:36 +0000
Subject: [pkgdb] beryl-core: thias has given up watchcommits
Message-ID: <20090412182324.3AEE510F8FD@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:24 +0000
Subject: [pkgdb] beryl-core: thias has given up watchbugzilla
Message-ID: <20090412182324.5316310F8FA@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:38 +0000
Subject: [pkgdb] beryl-core: thias has given up commit
Message-ID: <20090412182328.B4A7410F902@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:29 +0000
Subject: [pkgdb] beryl-core: thias has given up approveacls
Message-ID: <20090412182329.1EA4110F905@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-core



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:41 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchbugzilla
Message-ID: <20090412182343.4DE9A10F881@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:56 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchcommits
Message-ID: <20090412182344.E046410F910@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:45 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchbugzilla
Message-ID: <20090412182347.255C410F87C@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-dbus (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:01 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchcommits
Message-ID: <20090412182349.2433D10F88C@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-dbus (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:49 +0000
Subject: [pkgdb] beryl-dbus: thias has given up approveacls
Message-ID: <20090412182349.586A210F907@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:59 +0000
Subject: [pkgdb] beryl-dbus: thias has given up commit
Message-ID: <20090412182349.8A1E610F90B@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:00 +0000
Subject: [pkgdb] beryl-dbus: thias has given up commit
Message-ID: <20090412182349.F35C810F911@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-dbus (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:49 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchbugzilla
Message-ID: <20090412182351.1EAF610F913@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:51 +0000
Subject: [pkgdb] beryl-dbus: thias has given up approveacls
Message-ID: <20090412182353.C196010F917@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:04 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchcommits
Message-ID: <20090412182352.A714010F919@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:53 +0000
Subject: [pkgdb] beryl-dbus: thias has given up approveacls
Message-ID: <20090412182354.11A7210F91E@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-dbus (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:07 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchbugzilla
Message-ID: <20090412182355.CE63210F921@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:56 +0000
Subject: [pkgdb] beryl-dbus: thias has given up commit
Message-ID: <20090412182355.D694210F923@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:55 +0000
Subject: [pkgdb] beryl-dbus: thias has given up approveacls
Message-ID: <20090412182357.6103010F89A@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:23:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:23:58 +0000
Subject: [pkgdb] beryl-dbus: thias has given up commit
Message-ID: <20090412182358.B766D10F89C@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:08 +0000
Subject: [pkgdb] beryl-dbus: thias has given up watchcommits
Message-ID: <20090412182358.D792210F929@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-dbus



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:16 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchbugzilla
Message-ID: <20090412182404.D0FAB10F92D@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:04 +0000
Subject: [pkgdb] beryl-manager: thias has given up commit
Message-ID: <20090412182406.126E710F930@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:20 +0000
Subject: [pkgdb] beryl-manager: thias has given up approveacls
Message-ID: <20090412182408.6577810F89D@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:18 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchcommits
Message-ID: <20090412182408.7E73210F89F@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:18 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchbugzilla
Message-ID: <20090412182408.D320310F8A0@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-manager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:08 +0000
Subject: [pkgdb] beryl-manager: thias has given up commit
Message-ID: <20090412182410.16D9410F937@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-manager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:12 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchcommits
Message-ID: <20090412182412.2333B10F93D@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-manager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:23 +0000
Subject: [pkgdb] beryl-manager: thias has given up approveacls
Message-ID: <20090412182412.0F80010F93B@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-manager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:12 +0000
Subject: [pkgdb] clearlooks-compact-gnome-theme was added for sindrepb
Message-ID: <20090412182412.4147910F940@bastion2.fedora.phx.redhat.com>

kevin has added Package clearlooks-compact-gnome-theme with summary GNOME Desktop theme optimized for small displays
kevin has approved Package clearlooks-compact-gnome-theme
kevin has added a Fedora devel branch for clearlooks-compact-gnome-theme with an owner of sindrepb
kevin has approved clearlooks-compact-gnome-theme in Fedora devel
kevin has approved Package clearlooks-compact-gnome-theme
kevin has set commit to Approved for provenpackager on clearlooks-compact-gnome-theme (Fedora devel)
kevin has set build to Approved for provenpackager on clearlooks-compact-gnome-theme (Fedora devel)
kevin has set checkout to Approved for provenpackager on clearlooks-compact-gnome-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearlooks-compact-gnome-theme



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:11 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchcommits
Message-ID: <20090412182413.8DF7010F943@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-manager (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:26 +0000
Subject: [pkgdb] beryl-manager: thias has given up commit
Message-ID: <20090412182414.A175410F946@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-manager (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:26 +0000
Subject: [pkgdb] clearlooks-compact-gnome-theme (Fedora,
	devel) updated by kevin
Message-ID: <20090412182414.AFBF510F94A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on clearlooks-compact-gnome-theme (Fedora devel) for lkundrak
kevin approved watchcommits on clearlooks-compact-gnome-theme (Fedora devel) for lkundrak
kevin approved commit on clearlooks-compact-gnome-theme (Fedora devel) for lkundrak
kevin approved build on clearlooks-compact-gnome-theme (Fedora devel) for lkundrak
kevin approved approveacls on clearlooks-compact-gnome-theme (Fedora devel) for lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearlooks-compact-gnome-theme



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:26 +0000
Subject: [pkgdb] clearlooks-compact-gnome-theme (Fedora, 10) updated by kevin
Message-ID: <20090412182414.BC26710F94E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for clearlooks-compact-gnome-theme
kevin has set commit to Approved for provenpackager on clearlooks-compact-gnome-theme (Fedora 10)
kevin has set build to Approved for provenpackager on clearlooks-compact-gnome-theme (Fedora 10)
kevin has set checkout to Approved for provenpackager on clearlooks-compact-gnome-theme (Fedora 10)
kevin approved watchbugzilla on clearlooks-compact-gnome-theme (Fedora 10) for lkundrak
kevin approved watchcommits on clearlooks-compact-gnome-theme (Fedora 10) for lkundrak
kevin approved commit on clearlooks-compact-gnome-theme (Fedora 10) for lkundrak
kevin approved build on clearlooks-compact-gnome-theme (Fedora 10) for lkundrak
kevin approved approveacls on clearlooks-compact-gnome-theme (Fedora 10) for lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearlooks-compact-gnome-theme



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:14 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchbugzilla
Message-ID: <20090412182415.53D6610F951@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-manager (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:14 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchcommits
Message-ID: <20090412182416.9949810F955@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:27 +0000
Subject: [pkgdb] beryl-manager: thias has given up approveacls
Message-ID: <20090412182417.9687010F8A5@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-manager (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:30 +0000
Subject: [pkgdb] beryl-manager: thias has given up commit
Message-ID: <20090412182418.B3D7F10F957@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:19 +0000
Subject: [pkgdb] beryl-manager: thias has given up watchbugzilla
Message-ID: <20090412182419.26E1C10F95B@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:30 +0000
Subject: [pkgdb] beryl-manager: thias has given up approveacls
Message-ID: <20090412182420.527D110F95D@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-manager



From kevin at fedoraproject.org  Sun Apr 12 18:24:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:24:27 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme - New directory
Message-ID: <20090412182427.3DEAA70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmy4284/rpms/clearlooks-compact-gnome-theme

Log Message:
Directory /cvs/pkgs/rpms/clearlooks-compact-gnome-theme added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:24:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:25 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchcommits
Message-ID: <20090412182426.EF14710F962@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From kevin at fedoraproject.org  Sun Apr 12 18:24:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:24:27 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme/devel - New directory
Message-ID: <20090412182427.9063070126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmy4284/rpms/clearlooks-compact-gnome-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:40 +0000
Subject: [pkgdb] beryl-plugins: thias has given up commit
Message-ID: <20090412182428.9BE5710F96C@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:39 +0000
Subject: [pkgdb] beryl-plugins: thias has given up approveacls
Message-ID: <20090412182429.9267810F96B@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:28 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchcommits
Message-ID: <20090412182430.CD01410F96D@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:31 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchbugzilla
Message-ID: <20090412182431.4A87B10F96F@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:44 +0000
Subject: [pkgdb] beryl-plugins: thias has given up commit
Message-ID: <20090412182432.237B510F971@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:32 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchbugzilla
Message-ID: <20090412182433.08C3410F977@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From silas at fedoraproject.org  Sun Apr 12 18:24:32 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Sun, 12 Apr 2009 18:24:32 +0000 (UTC)
Subject: rpms/fabric/devel fabric.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412182432.0CD5770126@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/fabric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4102/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fabric.spec import.log 
Log Message:
Initial commit



--- NEW FILE fabric.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           fabric
Version:        0.1.1
Release:        1%{?dist}
Summary:        A simple pythonic remote deployment tool

Group:          Applications/System
License:        GPLv2+
URL:            http://www.nongnu.org/fab/
Source0:        http://download.savannah.gnu.org/releases/fab/fab-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       python-paramiko >= 1.7

%description
Fabric is a simple pythonic remote deployment tool which is designed to upload
files to, and run shell commands on, a number of servers in parallel or
serially.

%prep
%setup -q -n fab-%{version}
sed -i '/^#!\/usr\/bin\/env\ python -i/,+1 d' fabric.py

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE README TODO
%{python_sitelib}/*
%{_bindir}/fab

%changelog
* Thu Apr 09 2009 Silas Sewell <silas at sewell ch> - 0.1.1-1
- Update to 0.1.1
- Up Paramiko version dependency to 1.7
- Remove Python version dependency
- Make sed safer

* Sat Mar 28 2009 Silas Sewell <silas at sewell ch> - 0.1.0-3
- Fix dependencies
- Fix non-executable-script error

* Thu Mar 26 2009 Silas Sewell <silas at sewell ch> - 0.1.0-2
- Changed define to global

* Sun Feb 22 2009 Silas Sewell <silas at sewell ch> - 0.1.0-1
- Updated to 0.1.0
- Upped Python requirement to 2.5 per recommendation on official site

* Thu Nov 20 2008 Silas Sewell <silas at sewell ch> - 0.0.9-3
- Fixed changelog syntax issue

* Thu Nov 20 2008 Silas Sewell <silas at sewell ch> - 0.0.9-2
- Fixed various issues with the SPEC file

* Wed Nov 19 2008 Silas Sewell <silas at sewell ch> - 0.0.9-1
- Initial package


--- NEW FILE import.log ---
fabric-0_1_1-1_fc10:HEAD:fabric-0.1.1-1.fc10.src.rpm:1239560592


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:20:05 -0000	1.1
+++ .cvsignore	12 Apr 2009 18:24:01 -0000	1.2
@@ -0,0 +1 @@
+fab-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:20:05 -0000	1.1
+++ sources	12 Apr 2009 18:24:01 -0000	1.2
@@ -0,0 +1 @@
+b317a951d44abb2649b86c0539dadd3b  fab-0.1.1.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:44 +0000
Subject: [pkgdb] beryl-plugins: thias has given up approveacls
Message-ID: <20090412182434.E46CE10F979@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:33 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchcommits
Message-ID: <20090412182435.9994510F97C@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-plugins (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:48 +0000
Subject: [pkgdb] beryl-plugins: thias has given up commit
Message-ID: <20090412182436.C95BF10F980@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-plugins (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:37 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchbugzilla
Message-ID: <20090412182437.680A110F983@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-plugins (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:48 +0000
Subject: [pkgdb] beryl-plugins: thias has given up approveacls
Message-ID: <20090412182438.1831E10F986@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-plugins (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:38 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchcommits
Message-ID: <20090412182440.2F9A810F8AC@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:40 +0000
Subject: [pkgdb] beryl-plugins: thias has given up watchbugzilla
Message-ID: <20090412182440.4BC5610F991@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From kevin at fedoraproject.org  Sun Apr 12 18:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:24:41 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme Makefile,NONE,1.1
Message-ID: <20090412182441.37A2C70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmy4284/rpms/clearlooks-compact-gnome-theme

Added Files:
	Makefile 
Log Message:
Setup of module clearlooks-compact-gnome-theme


--- NEW FILE Makefile ---
# Top level Makefile for module clearlooks-compact-gnome-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:53 +0000
Subject: [pkgdb] beryl-plugins: thias has given up commit
Message-ID: <20090412182441.9ED4510F8AF@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From kevin at fedoraproject.org  Sun Apr 12 18:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:24:41 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090412182441.D095170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmy4284/rpms/clearlooks-compact-gnome-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clearlooks-compact-gnome-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clearlooks-compact-gnome-theme
# $Id: Makefile,v 1.1 2009/04/12 18:24:41 kevin Exp $
NAME := clearlooks-compact-gnome-theme
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:54 +0000
Subject: [pkgdb] beryl-plugins: thias has given up approveacls
Message-ID: <20090412182444.6355D10F995@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-plugins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-plugins



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:49 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchcommits
Message-ID: <20090412182450.EE39B10F8B1@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-settings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:04 +0000
Subject: [pkgdb] beryl-settings: thias has given up commit
Message-ID: <20090412182452.9D1DA10F8B7@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-settings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:04 +0000
Subject: [pkgdb] beryl-settings: thias has given up approveacls
Message-ID: <20090412182454.3DFFC10F99C@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-settings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:54 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchbugzilla
Message-ID: <20090412182454.00D5110F999@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-settings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:52 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchcommits
Message-ID: <20090412182454.918AD10F9A1@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-settings (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:54 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchbugzilla
Message-ID: <20090412182454.8F7C010F99F@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-settings (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:07 +0000
Subject: [pkgdb] beryl-settings: thias has given up commit
Message-ID: <20090412182455.65FE610F9A5@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-settings (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:06 +0000
Subject: [pkgdb] beryl-settings: thias has given up approveacls
Message-ID: <20090412182457.5627410F8B9@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-settings (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:56 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchcommits
Message-ID: <20090412182458.A63E710F9A8@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-settings (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:12 +0000
Subject: [pkgdb] beryl-settings: thias has given up commit
Message-ID: <20090412182500.732E010F9AE@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-settings (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:24:59 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchbugzilla
Message-ID: <20090412182500.5AEB710F9AD@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-settings (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:00 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchcommits
Message-ID: <20090412182502.B088410F9B1@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on beryl-settings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:04 +0000
Subject: [pkgdb] beryl-settings: thias has given up watchbugzilla
Message-ID: <20090412182504.5131A10F9B6@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on beryl-settings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:13 +0000
Subject: [pkgdb] beryl-settings: thias has given up approveacls
Message-ID: <20090412182503.B91A110F88F@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-settings (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:16 +0000
Subject: [pkgdb] beryl-settings: thias has given up commit
Message-ID: <20090412182504.A682110F9BA@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on beryl-settings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:15 +0000
Subject: [pkgdb] beryl-settings: thias has given up approveacls
Message-ID: <20090412182505.5862110F9BE@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on beryl-settings (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beryl-settings



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:17 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182519.D78AB10F8BB@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora devel was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:37 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182525.7CF1F10F8BC@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora EPEL 4 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:40 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182530.D4AC110F8C1@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora EPEL 5 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:35 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182535.1F10810F8C3@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 7 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:37 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182539.0E1D910F8C6@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 1 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:53 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182541.D132910F8C9@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 2 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:59 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182549.D6A3C10F8C8@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 3 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:53 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182553.36B2910F8CC@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 4 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From rdieter at fedoraproject.org  Sun Apr 12 18:25:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 18:25:50 +0000 (UTC)
Subject: rpms/kaffeine/devel kaffeine.spec,1.24,1.25
Message-ID: <20090412182550.DC96370126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4716

Modified Files:
	kaffeine.spec 
Log Message:
* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-7
- re-enable dvb (#495379)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kaffeine.spec	17 Mar 2009 22:23:40 -0000	1.24
+++ kaffeine.spec	12 Apr 2009 18:25:20 -0000	1.25
@@ -11,12 +11,12 @@
 #define freeworld 1
 
 # FIXME 
-%if 0%{?fedora} > 10
-%define _without_dvb --without-dvb
-%endif
+#if 0%{?fedora} > 10
+#define _without_dvb --without-dvb
+#endif
 
 Version: 0.8.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?freeworld:1} == 0 
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
 * Wed Mar 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.7-6
 - Improve icon cache and desktop database update scriptlets.
 - Update URL.



From pkgdb at fedoraproject.org  Sun Apr 12 18:25:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:25:52 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182554.C977C10F8D2@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 5 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:27:09 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182557.47BF310F8CE@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 6 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:27:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:27:11 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182601.40BB610F8D1@bastion2.fedora.phx.redhat.com>

Package djvulibre in Red Hat Linux 8 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:27:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:27:15 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182603.2395E10F8D7@bastion2.fedora.phx.redhat.com>

Package djvulibre in Red Hat Linux 9 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:27:19 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182608.E2C5210F8D4@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 8 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:26:10 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182612.21D7210F8D5@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 9 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:27:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:27:29 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412182619.DFB1010F87F@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 10 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From kevin at fedoraproject.org  Sun Apr 12 18:26:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:26:39 +0000 (UTC)
Subject: rpms/python-xkit - New directory
Message-ID: <20090412182639.6B4B570126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-xkit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNS5272/rpms/python-xkit

Log Message:
Directory /cvs/pkgs/rpms/python-xkit added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:27:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:27:36 +0000
Subject: [pkgdb] python-xkit was added for sundaram
Message-ID: <20090412182624.419C810F9C9@bastion2.fedora.phx.redhat.com>

kevin has added Package python-xkit with summary A simple, transparent and easy to extend xorg parser
kevin has approved Package python-xkit
kevin has added a Fedora devel branch for python-xkit with an owner of sundaram
kevin has approved python-xkit in Fedora devel
kevin has approved Package python-xkit
kevin has set commit to Approved for provenpackager on python-xkit (Fedora devel)
kevin has set build to Approved for provenpackager on python-xkit (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-xkit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xkit



From kevin at fedoraproject.org  Sun Apr 12 18:26:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:26:39 +0000 (UTC)
Subject: rpms/python-xkit/devel - New directory
Message-ID: <20090412182639.CE34670126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-xkit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNS5272/rpms/python-xkit/devel

Log Message:
Directory /cvs/pkgs/rpms/python-xkit/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:26:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:26:51 +0000 (UTC)
Subject: rpms/python-xkit Makefile,NONE,1.1
Message-ID: <20090412182651.D9A5570126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-xkit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNS5272/rpms/python-xkit

Added Files:
	Makefile 
Log Message:
Setup of module python-xkit


--- NEW FILE Makefile ---
# Top level Makefile for module python-xkit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:26:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:26:52 +0000 (UTC)
Subject: rpms/python-xkit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412182652.9197070126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-xkit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNS5272/rpms/python-xkit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-xkit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-xkit
# $Id: Makefile,v 1.1 2009/04/12 18:26:52 kevin Exp $
NAME := python-xkit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:30 +0000
Subject: [pkgdb] perl-Number-Format was added for iarnell
Message-ID: <20090412182718.4E21710F8EB@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Number-Format with summary Perl extension for formatting numbers
kevin has approved Package perl-Number-Format
kevin has added a Fedora devel branch for perl-Number-Format with an owner of iarnell
kevin has approved perl-Number-Format in Fedora devel
kevin has approved Package perl-Number-Format
kevin has set commit to Approved for provenpackager on perl-Number-Format (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Number-Format (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Number-Format (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Number-Format



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:31 +0000
Subject: [pkgdb] perl-Number-Format (Fedora, 9) updated by kevin
Message-ID: <20090412182719.CC16F10F8EE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Number-Format
kevin has set commit to Approved for provenpackager on perl-Number-Format (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Number-Format (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Number-Format (Fedora 9)
kevin approved watchbugzilla on perl-Number-Format (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Number-Format (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Number-Format



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:31 +0000
Subject: [pkgdb] perl-Number-Format (Fedora, 10) updated by kevin
Message-ID: <20090412182719.D4C9B10F8F1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Number-Format
kevin has set commit to Approved for provenpackager on perl-Number-Format (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Number-Format (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Number-Format (Fedora 10)
kevin approved watchbugzilla on perl-Number-Format (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Number-Format (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Number-Format



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:31 +0000
Subject: [pkgdb] perl-Number-Format (Fedora, devel) updated by kevin
Message-ID: <20090412182719.DEA2010F9CA@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Number-Format (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Number-Format (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Number-Format



From kevin at fedoraproject.org  Sun Apr 12 18:27:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:27:29 +0000 (UTC)
Subject: rpms/perl-Number-Format - New directory
Message-ID: <20090412182729.3C14870126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Number-Format
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBB5589/rpms/perl-Number-Format

Log Message:
Directory /cvs/pkgs/rpms/perl-Number-Format added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:27:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:27:29 +0000 (UTC)
Subject: rpms/perl-Number-Format/devel - New directory
Message-ID: <20090412182729.9B49470126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Number-Format/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBB5589/rpms/perl-Number-Format/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Number-Format/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:27:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:27:46 +0000 (UTC)
Subject: rpms/perl-Number-Format Makefile,NONE,1.1
Message-ID: <20090412182746.6035170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Number-Format
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBB5589/rpms/perl-Number-Format

Added Files:
	Makefile 
Log Message:
Setup of module perl-Number-Format


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Number-Format
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:27:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:27:47 +0000 (UTC)
Subject: rpms/perl-Number-Format/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090412182747.43C5170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Number-Format/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBB5589/rpms/perl-Number-Format/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Number-Format


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Number-Format
# $Id: Makefile,v 1.1 2009/04/12 18:27:46 kevin Exp $
NAME := perl-Number-Format
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:08 +0000
Subject: [pkgdb] perl-POE-Test-Loops was added for cweyl
Message-ID: <20090412182807.DD59C10F904@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-POE-Test-Loops with summary Reusable tests for POE::Loop authors
kevin has approved Package perl-POE-Test-Loops
kevin has added a Fedora devel branch for perl-POE-Test-Loops with an owner of cweyl
kevin has approved perl-POE-Test-Loops in Fedora devel
kevin has approved Package perl-POE-Test-Loops
kevin has set commit to Approved for provenpackager on perl-POE-Test-Loops (Fedora devel)
kevin has set build to Approved for provenpackager on perl-POE-Test-Loops (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-POE-Test-Loops (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Test-Loops



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:07 +0000
Subject: [pkgdb] perl-POE-Test-Loops (Fedora, 9) updated by kevin
Message-ID: <20090412182809.6BACC10F906@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-POE-Test-Loops
kevin has set commit to Approved for provenpackager on perl-POE-Test-Loops (Fedora 9)
kevin has set build to Approved for provenpackager on perl-POE-Test-Loops (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-POE-Test-Loops (Fedora 9)
kevin approved watchbugzilla on perl-POE-Test-Loops (Fedora 9) for perl-sig
kevin approved watchcommits on perl-POE-Test-Loops (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Test-Loops



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:07 +0000
Subject: [pkgdb] perl-POE-Test-Loops (Fedora, 10) updated by kevin
Message-ID: <20090412182809.81D6D10F9D3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-POE-Test-Loops
kevin has set commit to Approved for provenpackager on perl-POE-Test-Loops (Fedora 10)
kevin has set build to Approved for provenpackager on perl-POE-Test-Loops (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-POE-Test-Loops (Fedora 10)
kevin approved watchbugzilla on perl-POE-Test-Loops (Fedora 10) for perl-sig
kevin approved watchcommits on perl-POE-Test-Loops (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Test-Loops



From pkgdb at fedoraproject.org  Sun Apr 12 18:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:28:07 +0000
Subject: [pkgdb] perl-POE-Test-Loops (Fedora, devel) updated by kevin
Message-ID: <20090412182809.732DA10F9D0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-POE-Test-Loops (Fedora devel) for perl-sig
kevin approved watchcommits on perl-POE-Test-Loops (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Test-Loops



From kevin at fedoraproject.org  Sun Apr 12 18:28:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:28:21 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops - New directory
Message-ID: <20090412182821.3DE3170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-POE-Test-Loops
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI5984/rpms/perl-POE-Test-Loops

Log Message:
Directory /cvs/pkgs/rpms/perl-POE-Test-Loops added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:28:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:28:21 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/devel - New directory
Message-ID: <20090412182821.85D8870126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-POE-Test-Loops/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI5984/rpms/perl-POE-Test-Loops/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-POE-Test-Loops/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:28:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:28:32 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops Makefile,NONE,1.1
Message-ID: <20090412182832.286B170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-POE-Test-Loops
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI5984/rpms/perl-POE-Test-Loops

Added Files:
	Makefile 
Log Message:
Setup of module perl-POE-Test-Loops


--- NEW FILE Makefile ---
# Top level Makefile for module perl-POE-Test-Loops
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:28:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:28:33 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412182833.01C4270126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-POE-Test-Loops/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRI5984/rpms/perl-POE-Test-Loops/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-POE-Test-Loops


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-POE-Test-Loops
# $Id: Makefile,v 1.1 2009/04/12 18:28:32 kevin Exp $
NAME := perl-POE-Test-Loops
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:31:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:31:04 +0000
Subject: [pkgdb] perl-DBIx-Class-DateTime-Epoch was added for cweyl
Message-ID: <20090412182955.42A1210F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-DBIx-Class-DateTime-Epoch with summary Automatic inflation/deflation of epoch-based DateTime objects for DBIx::Class
kevin has approved Package perl-DBIx-Class-DateTime-Epoch
kevin has added a Fedora devel branch for perl-DBIx-Class-DateTime-Epoch with an owner of cweyl
kevin has approved perl-DBIx-Class-DateTime-Epoch in Fedora devel
kevin has approved Package perl-DBIx-Class-DateTime-Epoch
kevin has set commit to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora devel)
kevin has set build to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-DateTime-Epoch



From pkgdb at fedoraproject.org  Sun Apr 12 18:29:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:29:54 +0000
Subject: [pkgdb] perl-DBIx-Class-DateTime-Epoch (Fedora, 9) updated by kevin
Message-ID: <20090412182956.B707510F912@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DBIx-Class-DateTime-Epoch
kevin has set commit to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora 9)
kevin has set build to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora 9)
kevin approved watchbugzilla on perl-DBIx-Class-DateTime-Epoch (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DBIx-Class-DateTime-Epoch (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-DateTime-Epoch



From pkgdb at fedoraproject.org  Sun Apr 12 18:29:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:29:54 +0000
Subject: [pkgdb] perl-DBIx-Class-DateTime-Epoch (Fedora, 10) updated by kevin
Message-ID: <20090412182956.BFEA510F915@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-DBIx-Class-DateTime-Epoch
kevin has set commit to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora 10)
kevin has set build to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-DBIx-Class-DateTime-Epoch (Fedora 10)
kevin approved watchbugzilla on perl-DBIx-Class-DateTime-Epoch (Fedora 10) for perl-sig
kevin approved watchcommits on perl-DBIx-Class-DateTime-Epoch (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-DateTime-Epoch



From pkgdb at fedoraproject.org  Sun Apr 12 18:29:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:29:54 +0000
Subject: [pkgdb] perl-DBIx-Class-DateTime-Epoch (Fedora,
	devel) updated by kevin
Message-ID: <20090412182956.CA00D10F918@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-DBIx-Class-DateTime-Epoch (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DBIx-Class-DateTime-Epoch (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-DateTime-Epoch



From kevin at fedoraproject.org  Sun Apr 12 18:30:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:30:10 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/devel - New directory
Message-ID: <20090412183010.A9D4470126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmQ6679/rpms/perl-DBIx-Class-DateTime-Epoch/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:30:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:30:10 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch - New directory
Message-ID: <20090412183010.37B6C70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmQ6679/rpms/perl-DBIx-Class-DateTime-Epoch

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:30:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:30:25 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch Makefile,NONE,1.1
Message-ID: <20090412183025.8102470126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmQ6679/rpms/perl-DBIx-Class-DateTime-Epoch

Added Files:
	Makefile 
Log Message:
Setup of module perl-DBIx-Class-DateTime-Epoch


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBIx-Class-DateTime-Epoch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:30:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:30:26 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090412183026.1A60670126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmQ6679/rpms/perl-DBIx-Class-DateTime-Epoch/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBIx-Class-DateTime-Epoch


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DBIx-Class-DateTime-Epoch
# $Id: Makefile,v 1.1 2009/04/12 18:30:25 kevin Exp $
NAME := perl-DBIx-Class-DateTime-Epoch
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:32:31 +0000
Subject: [pkgdb] perl-Devel-NYTProf was added for iarnell
Message-ID: <20090412183121.9790910F92E@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Devel-NYTProf with summary Powerful feature-rich perl source code profiler
kevin has approved Package perl-Devel-NYTProf
kevin has added a Fedora devel branch for perl-Devel-NYTProf with an owner of iarnell
kevin has approved perl-Devel-NYTProf in Fedora devel
kevin has approved Package perl-Devel-NYTProf
kevin has set commit to Approved for provenpackager on perl-Devel-NYTProf (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Devel-NYTProf (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Devel-NYTProf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-NYTProf



From pkgdb at fedoraproject.org  Sun Apr 12 18:31:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:31:26 +0000
Subject: [pkgdb] perl-Devel-NYTProf (Fedora, 9) updated by kevin
Message-ID: <20090412183126.260C010F932@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Devel-NYTProf
kevin has set commit to Approved for provenpackager on perl-Devel-NYTProf (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Devel-NYTProf (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Devel-NYTProf (Fedora 9)
kevin approved watchbugzilla on perl-Devel-NYTProf (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Devel-NYTProf (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-NYTProf



From pkgdb at fedoraproject.org  Sun Apr 12 18:31:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:31:26 +0000
Subject: [pkgdb] perl-Devel-NYTProf (Fedora, devel) updated by kevin
Message-ID: <20090412183126.3B84510F935@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Devel-NYTProf (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Devel-NYTProf (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-NYTProf



From pkgdb at fedoraproject.org  Sun Apr 12 18:31:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:31:26 +0000
Subject: [pkgdb] perl-Devel-NYTProf (Fedora, 10) updated by kevin
Message-ID: <20090412183126.57E9310F938@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Devel-NYTProf
kevin has set commit to Approved for provenpackager on perl-Devel-NYTProf (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Devel-NYTProf (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Devel-NYTProf (Fedora 10)
kevin approved watchbugzilla on perl-Devel-NYTProf (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Devel-NYTProf (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-NYTProf



From kevin at fedoraproject.org  Sun Apr 12 18:31:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:31:42 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf - New directory
Message-ID: <20090412183142.60F5C70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMp7154/rpms/perl-Devel-NYTProf

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-NYTProf added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:31:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:31:42 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf/devel - New directory
Message-ID: <20090412183143.01C0670126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMp7154/rpms/perl-Devel-NYTProf/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-NYTProf/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:31:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:31:58 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf Makefile,NONE,1.1
Message-ID: <20090412183158.B239C70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMp7154/rpms/perl-Devel-NYTProf

Added Files:
	Makefile 
Log Message:
Setup of module perl-Devel-NYTProf


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Devel-NYTProf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:31:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:31:59 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090412183159.9D2C070126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMp7154/rpms/perl-Devel-NYTProf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Devel-NYTProf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Devel-NYTProf
# $Id: Makefile,v 1.1 2009/04/12 18:31:59 kevin Exp $
NAME := perl-Devel-NYTProf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:34 +0000
Subject: [pkgdb] python-pyrad was added for peter
Message-ID: <20090412183222.EC2D010F948@bastion2.fedora.phx.redhat.com>

kevin has added Package python-pyrad with summary Python RADIUS client
kevin has approved Package python-pyrad
kevin has added a Fedora devel branch for python-pyrad with an owner of peter
kevin has approved python-pyrad in Fedora devel
kevin has approved Package python-pyrad
kevin has set commit to Approved for provenpackager on python-pyrad (Fedora devel)
kevin has set build to Approved for provenpackager on python-pyrad (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-pyrad (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyrad



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:37 +0000
Subject: [pkgdb] python-pyrad (Fedora, 10) updated by kevin
Message-ID: <20090412183225.CADFB10F94C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-pyrad
kevin has set commit to Approved for provenpackager on python-pyrad (Fedora 10)
kevin has set build to Approved for provenpackager on python-pyrad (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-pyrad (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyrad



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:37 +0000
Subject: [pkgdb] python-pyrad (Fedora, 9) updated by kevin
Message-ID: <20090412183225.D1CDD10F950@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-pyrad
kevin has set commit to Approved for provenpackager on python-pyrad (Fedora 9)
kevin has set build to Approved for provenpackager on python-pyrad (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-pyrad (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyrad



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:37 +0000
Subject: [pkgdb] python-pyrad (Fedora, 11) updated by kevin
Message-ID: <20090412183225.D4EC310F952@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-pyrad
kevin has set commit to Approved for provenpackager on python-pyrad (Fedora 11)
kevin has set build to Approved for provenpackager on python-pyrad (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-pyrad (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyrad



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:37 +0000
Subject: [pkgdb] python-pyrad (Fedora EPEL, 4) updated by kevin
Message-ID: <20090412183225.E08C810F956@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-pyrad
kevin has set commit to Approved for provenpackager on python-pyrad (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on python-pyrad (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on python-pyrad (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyrad



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:37 +0000
Subject: [pkgdb] python-pyrad (Fedora EPEL, 5) updated by kevin
Message-ID: <20090412183225.E75BE10F958@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-pyrad
kevin has set commit to Approved for provenpackager on python-pyrad (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on python-pyrad (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on python-pyrad (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyrad



From kevin at fedoraproject.org  Sun Apr 12 18:32:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:32:43 +0000 (UTC)
Subject: rpms/python-pyrad - New directory
Message-ID: <20090412183243.3312470126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pyrad
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszr7572/rpms/python-pyrad

Log Message:
Directory /cvs/pkgs/rpms/python-pyrad added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:32:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:32:43 +0000 (UTC)
Subject: rpms/python-pyrad/devel - New directory
Message-ID: <20090412183243.8F1BC70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pyrad/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszr7572/rpms/python-pyrad/devel

Log Message:
Directory /cvs/pkgs/rpms/python-pyrad/devel added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:32:51 +0000
Subject: [pkgdb] emerald: thias has given up watchbugzilla
Message-ID: <20090412183251.4C4E210F960@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on emerald (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:03 +0000
Subject: [pkgdb] emerald: thias has given up watchcommits
Message-ID: <20090412183251.9963A10F963@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on emerald (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:32:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:32:50 +0000
Subject: [pkgdb] emerald: thias has given up commit
Message-ID: <20090412183252.2DAF410F967@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on emerald (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:05 +0000
Subject: [pkgdb] emerald: thias has given up approveacls
Message-ID: <20090412183255.BFF6910F96C@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on emerald (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From kevin at fedoraproject.org  Sun Apr 12 18:32:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:32:56 +0000 (UTC)
Subject: rpms/python-pyrad Makefile,NONE,1.1
Message-ID: <20090412183256.771EB70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pyrad
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszr7572/rpms/python-pyrad

Added Files:
	Makefile 
Log Message:
Setup of module python-pyrad


--- NEW FILE Makefile ---
# Top level Makefile for module python-pyrad
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:32:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:32:56 +0000 (UTC)
Subject: rpms/python-pyrad/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412183256.EE4FA70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pyrad/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszr7572/rpms/python-pyrad/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-pyrad


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-pyrad
# $Id: Makefile,v 1.1 2009/04/12 18:32:56 kevin Exp $
NAME := python-pyrad
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:15 +0000
Subject: [pkgdb] emerald: thias has given up watchcommits
Message-ID: <20090412183303.03EB310F972@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on emerald (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:03 +0000
Subject: [pkgdb] emerald: thias has given up watchbugzilla
Message-ID: <20090412183303.95D7A10F969@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on emerald (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:01 +0000
Subject: [pkgdb] emerald: thias has given up commit
Message-ID: <20090412183303.BED2110F9DF@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on emerald (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:15 +0000
Subject: [pkgdb] emerald: thias has given up approveacls
Message-ID: <20090412183305.835AE10F9E5@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on emerald (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:07 +0000
Subject: [pkgdb] emerald: thias has given up watchbugzilla
Message-ID: <20090412183307.5562210F9EA@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on emerald (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:19 +0000
Subject: [pkgdb] emerald: thias has given up watchcommits
Message-ID: <20090412183307.5C4EA10F9EC@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on emerald (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:05 +0000
Subject: [pkgdb] emerald: thias has given up commit
Message-ID: <20090412183307.EBD0F10F9EE@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on emerald (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:24 +0000
Subject: [pkgdb] emerald: thias has given up approveacls
Message-ID: <20090412183313.F007710F974@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on emerald (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From remi at fedoraproject.org  Sun Apr 12 18:33:14 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 12 Apr 2009 18:33:14 +0000 (UTC)
Subject: rpms/gmusicbrowser/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090412183314.D14A270126@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/gmusicbrowser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7617

Modified Files:
	.cvsignore sources 
Log Message:
    import new package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:22:07 -0000	1.1
+++ .cvsignore	12 Apr 2009 18:32:44 -0000	1.2
@@ -0,0 +1 @@
+gmusicbrowser-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:22:07 -0000	1.1
+++ sources	12 Apr 2009 18:32:44 -0000	1.2
@@ -0,0 +1 @@
+f088bc27f4c1ddfb46e441b879560398  gmusicbrowser-1.0.1.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:28 +0000
Subject: [pkgdb] perl-CSS-Minifier-XS was added for cweyl
Message-ID: <20090412183316.B1B2C10F9F1@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-CSS-Minifier-XS with summary XS based CSS minifier
kevin has approved Package perl-CSS-Minifier-XS
kevin has added a Fedora devel branch for perl-CSS-Minifier-XS with an owner of cweyl
kevin has approved perl-CSS-Minifier-XS in Fedora devel
kevin has approved Package perl-CSS-Minifier-XS
kevin has set commit to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora devel)
kevin has set build to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier-XS



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:16 +0000
Subject: [pkgdb] perl-CSS-Minifier-XS (Fedora, 9) updated by kevin
Message-ID: <20090412183318.BE1F110F9F5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-CSS-Minifier-XS
kevin has set commit to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora 9)
kevin has set build to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora 9)
kevin approved watchbugzilla on perl-CSS-Minifier-XS (Fedora 9) for perl-sig
kevin approved watchcommits on perl-CSS-Minifier-XS (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier-XS



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:16 +0000
Subject: [pkgdb] perl-CSS-Minifier-XS (Fedora, devel) updated by kevin
Message-ID: <20090412183318.CCF3610F9F8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-CSS-Minifier-XS (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CSS-Minifier-XS (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier-XS



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:16 +0000
Subject: [pkgdb] perl-CSS-Minifier-XS (Fedora, 10) updated by kevin
Message-ID: <20090412183318.DF64310F9FB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-CSS-Minifier-XS
kevin has set commit to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora 10)
kevin has set build to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-CSS-Minifier-XS (Fedora 10)
kevin approved watchbugzilla on perl-CSS-Minifier-XS (Fedora 10) for perl-sig
kevin approved watchcommits on perl-CSS-Minifier-XS (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier-XS



From kevin at fedoraproject.org  Sun Apr 12 18:33:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:33:31 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS - New directory
Message-ID: <20090412183331.5B21770126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier-XS
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL8025/rpms/perl-CSS-Minifier-XS

Log Message:
Directory /cvs/pkgs/rpms/perl-CSS-Minifier-XS added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:33:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:33:31 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/devel - New directory
Message-ID: <20090412183331.E528170126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL8025/rpms/perl-CSS-Minifier-XS/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CSS-Minifier-XS/devel added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:33:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:30 +0000
Subject: [pkgdb] emerald-themes: thias has given up watchbugzilla
Message-ID: <20090412183332.560E110F9FF@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on emerald-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:43 +0000
Subject: [pkgdb] emerald-themes: thias has given up watchcommits
Message-ID: <20090412183333.E6A8110F980@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on emerald-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:48 +0000
Subject: [pkgdb] emerald-themes: thias has given up approveacls
Message-ID: <20090412183336.2747810FA06@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on emerald-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:36 +0000
Subject: [pkgdb] emerald-themes: thias has given up commit
Message-ID: <20090412183336.2E73A10FA08@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on emerald-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From remi at fedoraproject.org  Sun Apr 12 18:33:42 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 12 Apr 2009 18:33:42 +0000 (UTC)
Subject: rpms/gmusicbrowser/devel gmusicbrowser.spec,NONE,1.1
Message-ID: <20090412183342.D84E970126@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/gmusicbrowser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8109

Added Files:
	gmusicbrowser.spec 
Log Message:
    import new package


--- NEW FILE gmusicbrowser.spec ---
Name:      gmusicbrowser
Summary:   Jukebox for large collections of music files
Version:   1.0.1
Release:   2%{?dist}
License:   GPLv3+
Group:     Applications/Multimedia

URL:       http://gmusicbrowser.sourceforge.net/
Source0:   http://squentin.free.fr/%{name}/%{name}-%{version}.tar.gz

Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires:    desktop-file-utils
Requires(post):   desktop-file-utils
Requires(postun): desktop-file-utils

# Optionnal Deps and not detected
Requires:         perl(Gtk2::TrayIcon), perl(Locale::gettext) >= 1.04, perl(GStreamer)
Requires:         vorbis-tools, flac123, alsa-utils 
%if 0%{?fedora} >= 10
Requires:         perl(Gtk2::MozEmbed)
%endif

# Only perl* retrieved which aren't needed
AutoProv: no


%description
Jukebox for large collections of music files
Uses gstreamer, mpg321/ogg123/flac123  or mplayer for playback
Main features :
- customizable window layouts
- artist/album lock : easily restrict playlist to current artist/album
- easy access to related songs (same artist/album/title)
- simple mass-tagging and mass-renaming
- support multiple genres for each song
- customizable labels can be set for each song
- filters with unlimited nesting of conditions
- customizable weighted random mode


%prep
%setup -q

# Fix Makefile to preserve Timestamp
sed -ie 's/install /install -p /' Makefile

cat <<EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(gmusicbrowser/d' -e '/perl(simple_http)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build
# Empty


%install
rm -rf %{buildroot}

make install \
   prefix=%{_prefix} \
   DESTDIR=%{buildroot}

rm -f %{buildroot}/%{_prefix}/lib/menu/gmusicbrowser

desktop-file-install --vendor="" \
   --dir=%{buildroot}%{_datadir}/applications/ \
   %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf %{buildroot}


%post
update-desktop-database &> /dev/null ||:


%postun
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS layout_doc.html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}*
%{_datadir}/icons/%{name}.png
%{_datadir}/icons/large/%{name}.png
%{_datadir}/icons/mini/%{name}.png


%changelog
* Sun Apr 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-2
- From review (#485961)
- preserve timestamp
- own all directory
- missing Requires
- fix license

* Tue Feb 17 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-1
- Initial Fedora RPM from Quentin Sculo spec




From kevin at fedoraproject.org  Sun Apr 12 18:33:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:33:45 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS Makefile,NONE,1.1
Message-ID: <20090412183345.8DC6E70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier-XS
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL8025/rpms/perl-CSS-Minifier-XS

Added Files:
	Makefile 
Log Message:
Setup of module perl-CSS-Minifier-XS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CSS-Minifier-XS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:33:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:33:45 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412183345.D927E70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL8025/rpms/perl-CSS-Minifier-XS/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CSS-Minifier-XS


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CSS-Minifier-XS
# $Id: Makefile,v 1.1 2009/04/12 18:33:45 kevin Exp $
NAME := perl-CSS-Minifier-XS
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:03 +0000
Subject: [pkgdb] emerald-themes: thias has given up watchbugzilla
Message-ID: <20090412183353.1C14D10FA0B@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on emerald-themes (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:53 +0000
Subject: [pkgdb] emerald-themes: thias has given up watchcommits
Message-ID: <20090412183353.9715210FA0F@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on emerald-themes (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:05 +0000
Subject: [pkgdb] emerald-themes: thias has given up commit
Message-ID: <20090412183353.C7FF610FA12@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on emerald-themes (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:11 +0000
Subject: [pkgdb] emerald-themes: thias has given up commit
Message-ID: <20090412183359.A709810F986@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on emerald-themes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:52 +0000
Subject: [pkgdb] emerald-themes: thias has given up approveacls
Message-ID: <20090412183354.3184010FA15@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on emerald-themes (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:33:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:33:57 +0000
Subject: [pkgdb] emerald-themes: thias has given up approveacls
Message-ID: <20090412183359.D21CB10F98D@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on emerald-themes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:00 +0000
Subject: [pkgdb] emerald-themes: thias has given up watchcommits
Message-ID: <20090412183400.028AE10FA19@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on emerald-themes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:11 +0000
Subject: [pkgdb] emerald-themes: thias has given up watchbugzilla
Message-ID: <20090412183401.C57D810FA21@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on emerald-themes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Sun Apr 12 18:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:34:17 +0000
Subject: [pkgdb] python-cly was added for silas
Message-ID: <20090412183417.6D84610F98B@bastion2.fedora.phx.redhat.com>

kevin has added Package python-cly with summary A module for adding powerful text-based consoles to your Python application
kevin has approved Package python-cly
kevin has added a Fedora devel branch for python-cly with an owner of silas
kevin has approved python-cly in Fedora devel
kevin has approved Package python-cly
kevin has set commit to Approved for provenpackager on python-cly (Fedora devel)
kevin has set build to Approved for provenpackager on python-cly (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-cly (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From kevin at fedoraproject.org  Sun Apr 12 18:34:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:34:30 +0000 (UTC)
Subject: rpms/python-cly - New directory
Message-ID: <20090412183430.2FF2570126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cly
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaX8434/rpms/python-cly

Log Message:
Directory /cvs/pkgs/rpms/python-cly added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:34:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:34:30 +0000 (UTC)
Subject: rpms/python-cly/devel - New directory
Message-ID: <20090412183430.65D1C70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cly/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaX8434/rpms/python-cly/devel

Log Message:
Directory /cvs/pkgs/rpms/python-cly/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 12 18:34:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:34:39 +0000 (UTC)
Subject: rpms/python-cly Makefile,NONE,1.1
Message-ID: <20090412183439.EC34970126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cly
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaX8434/rpms/python-cly

Added Files:
	Makefile 
Log Message:
Setup of module python-cly


--- NEW FILE Makefile ---
# Top level Makefile for module python-cly
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:34:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:34:40 +0000 (UTC)
Subject: rpms/python-cly/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412183440.57FB770126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cly/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaX8434/rpms/python-cly/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-cly


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-cly
# $Id: Makefile,v 1.1 2009/04/12 18:34:40 kevin Exp $
NAME := python-cly
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rakesh at fedoraproject.org  Sun Apr 12 18:35:03 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 18:35:03 +0000 (UTC)
Subject: rpms/libkml/devel libkml.spec,1.2,1.3
Message-ID: <20090412183503.B876570126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/libkml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8454

Modified Files:
	libkml.spec 
Log Message:
libkml.spec


Index: libkml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkml/devel/libkml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libkml.spec	12 Apr 2009 16:33:12 -0000	1.2
+++ libkml.spec	12 Apr 2009 18:34:33 -0000	1.3
@@ -21,6 +21,7 @@
 BuildRequires:  minizip-devel, uriparser-devel, zlib-devel
 BuildRequires:  boost-devel
 BuildRequires:  autoconf, libtool
+BuildRequires:  libgcj-devel
 Requires:       python, java
 
 %description
@@ -100,8 +101,8 @@
 %{_libdir}/libkml/*.so.*
 %{python_sitearch}/*.so
 %{python_sitearch}/*.py
-#%{python_sitearch}/*.pyc
-#%{python_sitearch}/*.pyo
+%{python_sitearch}/*.pyc
+%{python_sitearch}/*.pyo
 
 %files devel
 %defattr(-,root,root,-)
@@ -111,6 +112,9 @@
 %{_libdir}/libkml/*.so
 
 %changelog
+* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.6.1-4
+- Included *pyc and pyo files in %%files and added BuildRequires libgcj-devel.
+
 * Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.6.1-3
 - libkml-0.6.1.configure_ac.patch patch for swig > 1.3.35
 



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:09 +0000
Subject: [pkgdb] perl-Sort-Key was added for iarnell
Message-ID: <20090412183511.5775B10F9A0@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Sort-Key with summary Fastest way to sort anything in Perl
kevin has approved Package perl-Sort-Key
kevin has added a Fedora devel branch for perl-Sort-Key with an owner of iarnell
kevin has approved perl-Sort-Key in Fedora devel
kevin has approved Package perl-Sort-Key
kevin has set commit to Approved for provenpackager on perl-Sort-Key (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Sort-Key (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Sort-Key (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sort-Key



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:11 +0000
Subject: [pkgdb] perl-Sort-Key (Fedora, devel) updated by kevin
Message-ID: <20090412183513.39AB810F9A1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Sort-Key (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Sort-Key (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sort-Key



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:11 +0000
Subject: [pkgdb] perl-Sort-Key (Fedora, 10) updated by kevin
Message-ID: <20090412183513.42D1A10F9A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Sort-Key
kevin has set commit to Approved for provenpackager on perl-Sort-Key (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Sort-Key (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Sort-Key (Fedora 10)
kevin approved watchbugzilla on perl-Sort-Key (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Sort-Key (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sort-Key



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:21 +0000
Subject: [pkgdb] heliodor: thias has given up watchbugzilla
Message-ID: <20090412183523.CA31B10F9A6@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on heliodor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From kevin at fedoraproject.org  Sun Apr 12 18:35:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:35:25 +0000 (UTC)
Subject: rpms/perl-Sort-Key - New directory
Message-ID: <20090412183525.390FE70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Sort-Key
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit8797/rpms/perl-Sort-Key

Log Message:
Directory /cvs/pkgs/rpms/perl-Sort-Key added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:35:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:26 +0000
Subject: [pkgdb] heliodor: thias has given up commit
Message-ID: <20090412183525.B8CC010F9AA@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on heliodor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From kevin at fedoraproject.org  Sun Apr 12 18:35:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:35:25 +0000 (UTC)
Subject: rpms/perl-Sort-Key/devel - New directory
Message-ID: <20090412183525.7A6A970126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Sort-Key/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit8797/rpms/perl-Sort-Key/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Sort-Key/devel added to the repository




From pkgdb at fedoraproject.org  Sun Apr 12 18:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:36:37 +0000
Subject: [pkgdb] heliodor: thias has given up watchcommits
Message-ID: <20090412183527.547D610FA2B@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on heliodor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From pkgdb at fedoraproject.org  Sun Apr 12 18:36:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:36:39 +0000
Subject: [pkgdb] heliodor: thias has given up approveacls
Message-ID: <20090412183527.C2C7010FA2F@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on heliodor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:28 +0000
Subject: [pkgdb] heliodor: thias has given up watchbugzilla
Message-ID: <20090412183530.2020F10FA31@bastion2.fedora.phx.redhat.com>

thias has given up the watchbugzilla acl on heliodor (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From pkgdb at fedoraproject.org  Sun Apr 12 18:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:36:44 +0000
Subject: [pkgdb] heliodor: thias has given up approveacls
Message-ID: <20090412183532.1B20710FA34@bastion2.fedora.phx.redhat.com>

thias has given up the approveacls acl on heliodor (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From pkgdb at fedoraproject.org  Sun Apr 12 18:36:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:36:41 +0000
Subject: [pkgdb] heliodor: thias has given up watchcommits
Message-ID: <20090412183531.B99C010F88E@bastion2.fedora.phx.redhat.com>

thias has given up the watchcommits acl on heliodor (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From pkgdb at fedoraproject.org  Sun Apr 12 18:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:35:33 +0000
Subject: [pkgdb] heliodor: thias has given up commit
Message-ID: <20090412183533.96CC610F9AC@bastion2.fedora.phx.redhat.com>

thias has given up the commit acl on heliodor (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/heliodor



From kevin at fedoraproject.org  Sun Apr 12 18:35:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:35:37 +0000 (UTC)
Subject: rpms/perl-Sort-Key Makefile,NONE,1.1
Message-ID: <20090412183537.4330970126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Sort-Key
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit8797/rpms/perl-Sort-Key

Added Files:
	Makefile 
Log Message:
Setup of module perl-Sort-Key


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Sort-Key
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 12 18:35:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 12 Apr 2009 18:35:38 +0000 (UTC)
Subject: rpms/perl-Sort-Key/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090412183538.3BA0B70126@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Sort-Key/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit8797/rpms/perl-Sort-Key/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Sort-Key


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Sort-Key
# $Id: Makefile,v 1.1 2009/04/12 18:35:37 kevin Exp $
NAME := perl-Sort-Key
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 12 18:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:38:06 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090412183654.3E01810F8BD@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora devel was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Sun Apr 12 18:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:36:54 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090412183656.97CD610F8BC@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora EPEL 4 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Sun Apr 12 18:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:38:09 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090412183659.2D8FC10F8C3@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora EPEL 5 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Sun Apr 12 18:37:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:37:08 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090412183708.A3E7910F8CA@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora 9 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Sun Apr 12 18:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:38:22 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090412183710.ED14010F8C8@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora 10 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Sun Apr 12 18:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:37:15 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412183717.428C010F8CB@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora devel was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Sun Apr 12 18:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:38:32 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412183722.645A810F8CD@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora EPEL 4 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Sun Apr 12 18:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:37:25 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412183724.E413810F8CF@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora EPEL 5 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Sun Apr 12 18:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:38:42 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412183730.3CFB310F8D1@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 9 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Sun Apr 12 18:37:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:37:30 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412183732.7BC0110F9B8@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 10 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From rakesh at fedoraproject.org  Sun Apr 12 18:37:53 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 18:37:53 +0000 (UTC)
Subject: rpms/libkml/devel libkml.spec,1.3,1.4
Message-ID: <20090412183753.6C81570126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/libkml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9639

Modified Files:
	libkml.spec 
Log Message:
Included *pyc and pyo files in %%files and added BuildRequires libgcj-devel. Missed bump earlier.


Index: libkml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkml/devel/libkml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libkml.spec	12 Apr 2009 18:34:33 -0000	1.3
+++ libkml.spec	12 Apr 2009 18:37:22 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           libkml
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A KML library written in C++ with bindings to other languagues
 
 Group:          Development/Libraries



From pkgdb at fedoraproject.org  Sun Apr 12 18:39:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:39:38 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090412183938.0690A10F8DC@bastion2.fedora.phx.redhat.com>

Package moin in Fedora devel was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Sun Apr 12 18:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:40:52 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090412183940.4287010F8DE@bastion2.fedora.phx.redhat.com>

Package moin in Fedora EPEL 4 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Sun Apr 12 18:39:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:39:40 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090412183942.42D7510F8E0@bastion2.fedora.phx.redhat.com>

Package moin in Fedora EPEL 5 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Sun Apr 12 18:41:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:41:01 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090412183951.DA0C410F7C2@bastion2.fedora.phx.redhat.com>

Package moin in Fedora 9 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Sun Apr 12 18:39:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:39:54 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090412183953.C589510F87C@bastion2.fedora.phx.redhat.com>

Package moin in Fedora 10 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Sun Apr 12 18:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:40:33 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090412184035.CA22B10F886@bastion2.fedora.phx.redhat.com>

Package js in Fedora devel was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Sun Apr 12 18:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:41:49 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090412184039.5C9CA10F899@bastion2.fedora.phx.redhat.com>

Package js in Fedora EPEL 4 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Sun Apr 12 18:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:40:43 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090412184042.C529910F89B@bastion2.fedora.phx.redhat.com>

Package js in Fedora EPEL 5 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:00 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090412184048.73F9910F8E7@bastion2.fedora.phx.redhat.com>

Package js in Fedora 9 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Sun Apr 12 18:40:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:40:47 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090412184049.B76B110F8E9@bastion2.fedora.phx.redhat.com>

Package js in Fedora 10 was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:06 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412184156.7890F10F8F2@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora devel is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:03 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184203.861C910F8A5@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:02 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184204.2817210F8F9@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:18 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184206.0FA4910F8FB@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:19 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184209.C1CE610F8FE@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:11 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412184213.5952910F900@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 9 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:12 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184214.AC63710F903@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:27 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090412184215.CCB6E10F904@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora 10 is now owned by rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:16 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184216.1ABE210F907@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:28 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184216.6FF1C10F8A6@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:17 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184219.17C6110F90B@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:18 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184218.9098B10F90D@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:24 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184217.C09C810F90A@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:29 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184219.B980210F90E@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:34 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412184222.B250110F913@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:23 +0000
Subject: [pkgdb] djvulibre: rakesh has requested commit
Message-ID: <20090412184225.C801610F914@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:26 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchcommits
Message-ID: <20090412184226.38E0E10F917@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:39 +0000
Subject: [pkgdb] djvulibre: rakesh has requested approveacls
Message-ID: <20090412184227.0808A10F919@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:39 +0000
Subject: [pkgdb] djvulibre: rakesh has requested approveacls
Message-ID: <20090412184229.1ED4B10F91C@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:38 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090412184228.E04D310F91A@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:27 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchcommits
Message-ID: <20090412184229.A02B910F91F@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:30 +0000
Subject: [pkgdb] djvulibre: rakesh has requested commit
Message-ID: <20090412184229.CD89E10F921@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:43 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090412184231.7030410F923@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:36 +0000
Subject: [pkgdb] djvulibre: rakesh has requested commit
Message-ID: <20090412184238.BD11F10F927@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:42:38 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchcommits
Message-ID: <20090412184239.D4C0710F928@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:51 +0000
Subject: [pkgdb] djvulibre: rakesh has requested approveacls
Message-ID: <20090412184239.E6F8510F92A@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:43:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:43:50 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090412184240.5AA6310F92C@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From remi at fedoraproject.org  Sun Apr 12 18:46:01 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 12 Apr 2009 18:46:01 +0000 (UTC)
Subject: rpms/gmusicbrowser/F-10 gmusicbrowser.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090412184601.D865870126@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/gmusicbrowser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11743

Modified Files:
	sources 
Added Files:
	gmusicbrowser.spec 
Log Message:
    import new package


--- NEW FILE gmusicbrowser.spec ---
Name:      gmusicbrowser
Summary:   Jukebox for large collections of music files
Version:   1.0.1
Release:   2%{?dist}
License:   GPLv3+
Group:     Applications/Multimedia

URL:       http://gmusicbrowser.sourceforge.net/
Source0:   http://squentin.free.fr/%{name}/%{name}-%{version}.tar.gz

Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires:    desktop-file-utils
Requires(post):   desktop-file-utils
Requires(postun): desktop-file-utils

# Optionnal Deps and not detected
Requires:         perl(Gtk2::TrayIcon), perl(Locale::gettext) >= 1.04, perl(GStreamer)
Requires:         vorbis-tools, flac123, alsa-utils 
%if 0%{?fedora} >= 10
Requires:         perl(Gtk2::MozEmbed)
%endif

# Only perl* retrieved which aren't needed
AutoProv: no


%description
Jukebox for large collections of music files
Uses gstreamer, mpg321/ogg123/flac123  or mplayer for playback
Main features :
- customizable window layouts
- artist/album lock : easily restrict playlist to current artist/album
- easy access to related songs (same artist/album/title)
- simple mass-tagging and mass-renaming
- support multiple genres for each song
- customizable labels can be set for each song
- filters with unlimited nesting of conditions
- customizable weighted random mode


%prep
%setup -q

# Fix Makefile to preserve Timestamp
sed -ie 's/install /install -p /' Makefile

cat <<EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(gmusicbrowser/d' -e '/perl(simple_http)/d'
EOF

%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}


%build
# Empty


%install
rm -rf %{buildroot}

make install \
   prefix=%{_prefix} \
   DESTDIR=%{buildroot}

rm -f %{buildroot}/%{_prefix}/lib/menu/gmusicbrowser

desktop-file-install --vendor="" \
   --dir=%{buildroot}%{_datadir}/applications/ \
   %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf %{buildroot}


%post
update-desktop-database &> /dev/null ||:


%postun
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS layout_doc.html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}*
%{_datadir}/icons/%{name}.png
%{_datadir}/icons/large/%{name}.png
%{_datadir}/icons/mini/%{name}.png


%changelog
* Sun Apr 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-2
- From review (#485961)
- preserve timestamp
- own all directory
- missing Requires
- fix license

* Tue Feb 17 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-1
- Initial Fedora RPM from Quentin Sculo spec



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:22:07 -0000	1.1
+++ sources	12 Apr 2009 18:45:31 -0000	1.2
@@ -0,0 +1 @@
+f088bc27f4c1ddfb46e441b879560398  gmusicbrowser-1.0.1.tar.gz



From rdieter at fedoraproject.org  Sun Apr 12 18:48:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 18:48:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.2-kde#187699.patch, 
	NONE, 1.1 kdebase-workspace.spec, 1.211, 1.212
Message-ID: <20090412184841.A462570126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12335

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
Log Message:
* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)


kdebase-workspace-4.2.2-kde#187699.patch:

--- NEW FILE kdebase-workspace-4.2.2-kde#187699.patch ---
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
@@ -45,12 +45,9 @@
          */
         QGraphicsWidget *graphicsWidget();
 
-    protected:
-        void updateDate();
-        void timerEvent(QTimerEvent *event);
-
     protected slots:
         void configAccepted();
+        void updateDate();
 
     private:
         void paintIcon();
@@ -58,7 +55,6 @@
         Plasma::Calendar *m_calendarDialog;
         Plasma::Svg *m_theme;
         int m_date;
-        int m_updateTimerId;
 };
 
 K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
@@ -19,6 +19,7 @@
 
 #include <QGraphicsLayout>
 #include <QPainter>
+#include <QTimer>
 
 #include <KDebug>
 #include <KIcon>
@@ -35,7 +36,6 @@
     m_calendarDialog(0),
     m_theme(0),
     m_date(0),
-    m_updateTimerId(0)
 {
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
     setCacheMode(DeviceCoordinateCache);
@@ -116,18 +116,9 @@
     QDateTime d = QDateTime::currentDateTime();
     m_date = d.date().day();
     int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
-    m_updateTimerId = startTimer(updateIn * 1000);
+    QTimer::singleShot(updateIn * 1000, this, SLOT(updateDate()));
     constraintsEvent(Plasma::FormFactorConstraint);
 }
 
-void CalendarTest::timerEvent(QTimerEvent *event)
-{
-    if (event->timerId() != m_updateTimerId) {
-        return;
-    }
-
-    killTimer(m_updateTimerId);
-    updateDate();
-}
 
 #include "calendar.moc"


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- kdebase-workspace.spec	1 Apr 2009 17:43:11 -0000	1.211
+++ kdebase-workspace.spec	12 Apr 2009 18:48:10 -0000	1.212
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -44,6 +44,8 @@
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
 #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
+# http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
+Patch106: kdebase-workspace-4.2.2-kde#187699.patch
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -239,6 +241,8 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
+%patch106 -p5 -b .kde#187699
+
 
 %build
 
@@ -510,6 +514,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 - drop upstreamed patches



From silas at fedoraproject.org  Sun Apr 12 18:50:13 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Sun, 12 Apr 2009 18:50:13 +0000 (UTC)
Subject: rpms/fabric/devel fabric.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090412185013.BF6BC70126@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/fabric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12721/devel

Modified Files:
	fabric.spec import.log sources 
Log Message:
* Sun Apr 12 2009 Silas Sewell <silas at sewell ch> - 0.1.1-2
- Add runtime setuptools requirements
- Re-import source package



Index: fabric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/fabric.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fabric.spec	12 Apr 2009 18:24:01 -0000	1.1
+++ fabric.spec	12 Apr 2009 18:49:43 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           fabric
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple pythonic remote deployment tool
 
 Group:          Applications/System
@@ -15,6 +15,7 @@
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python-paramiko >= 1.7
+Requires:       python-setuptools
 
 %description
 Fabric is a simple pythonic remote deployment tool which is designed to upload
@@ -42,6 +43,10 @@
 %{_bindir}/fab
 
 %changelog
+* Sun Apr 12 2009 Silas Sewell <silas at sewell ch> - 0.1.1-2
+- Add runtime setuptools requirements
+- Re-import source package
+
 * Thu Apr 09 2009 Silas Sewell <silas at sewell ch> - 0.1.1-1
 - Update to 0.1.1
 - Up Paramiko version dependency to 1.7


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Apr 2009 18:24:01 -0000	1.1
+++ import.log	12 Apr 2009 18:49:43 -0000	1.2
@@ -1 +1,2 @@
 fabric-0_1_1-1_fc10:HEAD:fabric-0.1.1-1.fc10.src.rpm:1239560592
+fabric-0_1_1-2_fc10:HEAD:fabric-0.1.1-2.fc10.src.rpm:1239562092


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fabric/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2009 18:24:01 -0000	1.2
+++ sources	12 Apr 2009 18:49:43 -0000	1.3
@@ -1 +1 @@
-b317a951d44abb2649b86c0539dadd3b  fab-0.1.1.tar.gz
+63a5301c584825f0b7c5e7274e1c00df  fab-0.1.1.tar.gz



From cweyl at fedoraproject.org  Sun Apr 12 18:53:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 18:53:24 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/devel import.log, NONE,
	1.1 perl-POE-Test-Loops.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412185324.795CF70126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Test-Loops/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13511/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-POE-Test-Loops.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-POE-Test-Loops-1_005-1_fc10:HEAD:perl-POE-Test-Loops-1.005-1.fc10.src.rpm:1239562368


--- NEW FILE perl-POE-Test-Loops.spec ---
Name:       perl-POE-Test-Loops 
Version:    1.005 
Release:    1%{?dist}
# META.yml, bin/poe-gen-tests -> perl
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Reusable tests for POE::Loop authors 
Source:     http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Test-Loops-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/POE-Test-Loops
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)

%description
POE::Test::Loops contains one function, generate(), which will generate
all the loop tests for one or more POE::Loop subclasses. The SYNOPSIS
example is a version of poe-gen-tests, which is a stand-alone utility
to generate the actual tests. The poe-gen-tests manpage also documents
the POE::Test::Loops system in more detail.


%prep
%setup -q -n POE-Test-Loops-%{version}

find . -type f -exec chmod -c -x {} ';'

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` | \
    sed -e '/perl([DIFMOSU].*)/d; /perl(POE::MySession)/d'
    #sed -e '/perl((?!(POE)).*)/d'
    #perl -p -e '/^(?!POE)/d'
EOF

%define __perl_provides %{_builddir}/POE-Test-Loops-%{version}/%{name}-prov
chmod +x %{__perl_provides}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc CHANGES README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*
%{_bindir}/poe-gen-tests
%{_mandir}/man1/poe-gen-tests.1.gz

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:28:32 -0000	1.1
+++ .cvsignore	12 Apr 2009 18:52:54 -0000	1.2
@@ -0,0 +1 @@
+POE-Test-Loops-1.005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:28:32 -0000	1.1
+++ sources	12 Apr 2009 18:52:54 -0000	1.2
@@ -0,0 +1 @@
+a075c590ef3024293377678088ebfe50  POE-Test-Loops-1.005.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:37 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185527.4FF8210F8D6@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora devel) to Denied for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:55:32 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185531.BFE0B10F8D5@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:45 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090412185533.BA19410F8DB@bastion2.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:55:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:55:31 +0000
Subject: [pkgdb] djvulibre: rakesh has given up watchcommits
Message-ID: <20090412185533.12E5110F8D8@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:55:33 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185535.2B8FA10F8D9@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:46 +0000
Subject: [pkgdb] djvulibre: rakesh has given up commit
Message-ID: <20090412185536.44D8210F8DE@bastion2.fedora.phx.redhat.com>

rakesh has given up the commit acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:49 +0000
Subject: [pkgdb] djvulibre: rakesh has given up approveacls
Message-ID: <20090412185538.2EF2A10F8E0@bastion2.fedora.phx.redhat.com>

rakesh has given up the approveacls acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:51 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185539.3C18C10F8E2@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:55:39 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185539.4DD7810F8E4@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:04 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185606.AABE210F8E6@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:06 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185608.8292E10F8E7@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:57:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:57:23 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185613.01C8710F8EA@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:57:22 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185612.4D58C10F8E8@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:57:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:57:31 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185619.EA01010F8AF@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:22 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185622.19FE710F8EB@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:22 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185622.8E08310F8EC@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:57:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:57:35 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185623.30FC410F8EE@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:38 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185640.3E6BC10F8B6@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:45 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185645.21DE410F8EF@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:56:40 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185642.DC9A010F8B8@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Sun Apr 12 18:57:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 18:57:57 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090412185647.6F22410F8F1@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on djvulibre (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From cweyl at fedoraproject.org  Sun Apr 12 18:57:42 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 18:57:42 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/F-9 import.log, NONE,
	1.1 perl-POE-Test-Loops.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412185742.82C0E70126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Test-Loops/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14359/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-POE-Test-Loops.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-POE-Test-Loops-1_005-1_fc10:F-9:perl-POE-Test-Loops-1.005-1.fc10.src.rpm:1239562625


--- NEW FILE perl-POE-Test-Loops.spec ---
Name:       perl-POE-Test-Loops 
Version:    1.005 
Release:    1%{?dist}
# META.yml, bin/poe-gen-tests -> perl
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Reusable tests for POE::Loop authors 
Source:     http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Test-Loops-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/POE-Test-Loops
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)

%description
POE::Test::Loops contains one function, generate(), which will generate
all the loop tests for one or more POE::Loop subclasses. The SYNOPSIS
example is a version of poe-gen-tests, which is a stand-alone utility
to generate the actual tests. The poe-gen-tests manpage also documents
the POE::Test::Loops system in more detail.


%prep
%setup -q -n POE-Test-Loops-%{version}

find . -type f -exec chmod -c -x {} ';'

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` | \
    sed -e '/perl([DIFMOSU].*)/d; /perl(POE::MySession)/d'
    #sed -e '/perl((?!(POE)).*)/d'
    #perl -p -e '/^(?!POE)/d'
EOF

%define __perl_provides %{_builddir}/POE-Test-Loops-%{version}/%{name}-prov
chmod +x %{__perl_provides}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc CHANGES README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*
%{_bindir}/poe-gen-tests
%{_mandir}/man1/poe-gen-tests.1.gz

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:28:32 -0000	1.1
+++ .cvsignore	12 Apr 2009 18:57:11 -0000	1.2
@@ -0,0 +1 @@
+POE-Test-Loops-1.005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:28:32 -0000	1.1
+++ sources	12 Apr 2009 18:57:12 -0000	1.2
@@ -0,0 +1 @@
+a075c590ef3024293377678088ebfe50  POE-Test-Loops-1.005.tar.gz



From thias at fedoraproject.org  Sun Apr 12 18:59:09 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 18:59:09 +0000 (UTC)
Subject: rpms/p7zip/devel p7zip_4.65-norar.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 p7zip.spec, 1.23, 1.24 sources, 1.12,
	1.13 p7zip_4.61-norar.patch, 1.1, NONE
Message-ID: <20090412185909.315C470126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/p7zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14850

Modified Files:
	.cvsignore p7zip.spec sources 
Added Files:
	p7zip_4.65-norar.patch 
Removed Files:
	p7zip_4.61-norar.patch 
Log Message:
Update to 4.65.


p7zip_4.65-norar.patch:

--- NEW FILE p7zip_4.65-norar.patch ---
diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile
--- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile	2009-02-09 21:47:24.000000000 +0100
+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile	2009-04-12 20:47:44.973127047 +0200
@@ -172,14 +172,6 @@ NSIS_OBJS = \
   NsisIn.o \
   NsisRegister.o \
 
-RAR_OBJS = \
-  RarHandler.o \
-  RarHeader.o \
-  RarIn.o \
-  RarItem.o \
-  RarVolumeInStream.o \
-  RarRegister.o \
-
 # SplitHandlerOut.o
 SPLIT_OBJS = \
   SplitHandler.o \
@@ -257,13 +249,6 @@ COMPRESS_OBJS = \
   ZlibDecoder.o \
   ZDecoder.o \
 
-COMPRESS_OBJS_NON_FREE = \
-  Rar1Decoder.o \
-  Rar2Decoder.o \
-  Rar3Decoder.o \
-  Rar3Vm.o \
-  RarCodecsRegister.o \
-
 CRYPTO_OBJS = \
   7zAes.o \
   7zAesRegister.o \
@@ -271,8 +256,6 @@ CRYPTO_OBJS = \
   MyAes.o \
   Pbkdf2HmacSha1.o \
   RandGen.o \
-  Rar20Crypto.o \
-  RarAes.o \
   Sha1.o \
   WzAes.o \
   ZipCrypto.o \
@@ -315,7 +298,6 @@ OBJS = \
   $(LZH_OBJS) \
   $(LZM_OBJS) \
   $(NSIS_OBJS) \
-  $(RAR_OBJS) \
   $(SPLIT_OBJS) \
   $(TAR_OBJS) \
   $(UDF_OBJS) \
diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list
--- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-02-09 21:04:32.000000000 +0100
+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-04-12 20:47:04.713126284 +0200
@@ -141,13 +141,6 @@ SRCS=\
  ../../Archive/Nsis/NsisIn.cpp \
  ../../Archive/Nsis/NsisRegister.cpp \
  \
- ../../Archive/Rar/RarHandler.cpp \
- ../../Archive/Rar/RarHeader.cpp \
- ../../Archive/Rar/RarIn.cpp \
- ../../Archive/Rar/RarItem.cpp \
- ../../Archive/Rar/RarVolumeInStream.cpp \
- ../../Archive/Rar/RarRegister.cpp \
- \
  ../../Archive/Split/SplitHandler.cpp \
  ../../Archive/Split/SplitRegister.cpp \
  \
@@ -229,8 +222,6 @@ SRCS=\
  ../../Crypto/RandGen.cpp \
  ../../Crypto/Sha1.cpp \
  ../../Crypto/WzAes.cpp \
- ../../Crypto/Rar20Crypto.cpp \
- ../../Crypto/RarAes.cpp \
  ../../Crypto/ZipCrypto.cpp \
  ../../Crypto/ZipStrong.cpp
 
diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile
--- p7zip_4.65.orig/makefile	2009-02-14 17:03:50.000000000 +0100
+++ p7zip_4.65/makefile	2009-04-12 20:48:21.342256593 +0200
@@ -41,7 +41,6 @@ depend:
 	cd CPP/7zip/UI/Client7z       ; $(MAKE) depend
 	cd CPP/7zip/UI/Console        ; $(MAKE) depend
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
-	cd CPP/7zip/Compress/Rar      ; $(MAKE) depend
 	cd CPP/7zip/UI/GUI            ; $(MAKE) depend
 
 sfx: common
@@ -51,7 +50,6 @@ sfx: common
 common7z:common
 	$(MKDIR) bin/Codecs
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
-	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
 
 7z: common7z
 	cd CPP/7zip/UI/Console           ; $(MAKE) all
@@ -71,7 +69,6 @@ clean:
 	cd CPP/7zip/UI/FileManager       ; $(MAKE) clean
 	cd CPP/7zip/UI/GUI               ; $(MAKE) clean
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
-	cd CPP/7zip/Compress/Rar         ; $(MAKE) clean
 	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) clean
 	cd CPP/7zip/Compress/PPMD_Alone  ; $(MAKE) clean
 	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Dec 2008 15:46:55 -0000	1.12
+++ .cvsignore	12 Apr 2009 18:58:38 -0000	1.13
@@ -1 +1 @@
-p7zip_4.61_src_all-norar.tar.bz2
+p7zip_4.65_src_all-norar.tar.bz2


Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- p7zip.spec	26 Feb 2009 09:18:57 -0000	1.23
+++ p7zip.spec	12 Apr 2009 18:58:38 -0000	1.24
@@ -1,20 +1,21 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
-Version: 4.61
-Release: 2%{?dist}
+Version: 4.65
+Release: 1%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 License: LGPLv2 and (LGPLv2+ or CPL)
 Group: Applications/Archiving
 URL: http://p7zip.sourceforge.net/
 # RAR sources removed since their license is incompatible with the LGPL
-#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2
+#Source: http://downloads.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2
 # VERSION=
+# wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2
 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2
 # rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar*
 # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt
 # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION}
 Source: p7zip_%{version}_src_all-norar.tar.bz2
-Patch0: p7zip_4.61-norar.patch
+Patch0: p7zip_4.65-norar.patch
 Patch1: p7zip_4.58-install.patch
 Patch2: p7zip_4.51-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -110,7 +111,11 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.61-2
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 4.65-1
+- Update to 4.65.
+- Update norar patch.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 4.61-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Dec 2008 15:46:55 -0000	1.12
+++ sources	12 Apr 2009 18:58:38 -0000	1.13
@@ -1 +1 @@
-3e787d5f0414f062c1834586c2562bd4  p7zip_4.61_src_all-norar.tar.bz2
+41e748eccdf42d1cc7f84d22c6fb815b  p7zip_4.65_src_all-norar.tar.bz2


--- p7zip_4.61-norar.patch DELETED ---



From rdieter at fedoraproject.org  Sun Apr 12 19:01:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 19:01:08 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.2-kde#187699.patch, 
	NONE, 1.1 kdebase-workspace.spec, 1.169, 1.170
Message-ID: <20090412190108.72E4470126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15486

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
Log Message:
* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)


kdebase-workspace-4.2.2-kde#187699.patch:

--- NEW FILE kdebase-workspace-4.2.2-kde#187699.patch ---
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
@@ -45,12 +45,9 @@
          */
         QGraphicsWidget *graphicsWidget();
 
-    protected:
-        void updateDate();
-        void timerEvent(QTimerEvent *event);
-
     protected slots:
         void configAccepted();
+        void updateDate();
 
     private:
         void paintIcon();
@@ -58,7 +55,6 @@
         Plasma::Calendar *m_calendarDialog;
         Plasma::Svg *m_theme;
         int m_date;
-        int m_updateTimerId;
 };
 
 K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
@@ -19,6 +19,7 @@
 
 #include <QGraphicsLayout>
 #include <QPainter>
+#include <QTimer>
 
 #include <KDebug>
 #include <KIcon>
@@ -35,7 +36,6 @@
     m_calendarDialog(0),
     m_theme(0),
     m_date(0),
-    m_updateTimerId(0)
 {
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
     setCacheMode(DeviceCoordinateCache);
@@ -116,18 +116,9 @@
     QDateTime d = QDateTime::currentDateTime();
     m_date = d.date().day();
     int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
-    m_updateTimerId = startTimer(updateIn * 1000);
+    QTimer::singleShot(updateIn * 1000, this, SLOT(updateDate()));
     constraintsEvent(Plasma::FormFactorConstraint);
 }
 
-void CalendarTest::timerEvent(QTimerEvent *event)
-{
-    if (event->timerId() != m_updateTimerId) {
-        return;
-    }
-
-    killTimer(m_updateTimerId);
-    updateDate();
-}
 
 #include "calendar.moc"


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdebase-workspace.spec	1 Apr 2009 23:08:30 -0000	1.169
+++ kdebase-workspace.spec	12 Apr 2009 19:00:37 -0000	1.170
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -44,6 +44,8 @@
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
 #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
+# http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
+Patch106: kdebase-workspace-4.2.2-kde#187699.patch
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -239,6 +241,8 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
+%patch106 -p5 -b .kde#187699
+
 
 %build
 
@@ -510,6 +514,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 - drop upstreamed patches



From rdieter at fedoraproject.org  Sun Apr 12 19:02:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 19:02:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.2-kde#187699.patch,
	NONE, 1.1 kdebase-workspace.spec, 1.143, 1.144
Message-ID: <20090412190238.15D5670126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15911

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
Log Message:
* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)


kdebase-workspace-4.2.2-kde#187699.patch:

--- NEW FILE kdebase-workspace-4.2.2-kde#187699.patch ---
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
@@ -45,12 +45,9 @@
          */
         QGraphicsWidget *graphicsWidget();
 
-    protected:
-        void updateDate();
-        void timerEvent(QTimerEvent *event);
-
     protected slots:
         void configAccepted();
+        void updateDate();
 
     private:
         void paintIcon();
@@ -58,7 +55,6 @@
         Plasma::Calendar *m_calendarDialog;
         Plasma::Svg *m_theme;
         int m_date;
-        int m_updateTimerId;
 };
 
 K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
@@ -19,6 +19,7 @@
 
 #include <QGraphicsLayout>
 #include <QPainter>
+#include <QTimer>
 
 #include <KDebug>
 #include <KIcon>
@@ -35,7 +36,6 @@
     m_calendarDialog(0),
     m_theme(0),
     m_date(0),
-    m_updateTimerId(0)
 {
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
     setCacheMode(DeviceCoordinateCache);
@@ -116,18 +116,9 @@
     QDateTime d = QDateTime::currentDateTime();
     m_date = d.date().day();
     int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
-    m_updateTimerId = startTimer(updateIn * 1000);
+    QTimer::singleShot(updateIn * 1000, this, SLOT(updateDate()));
     constraintsEvent(Plasma::FormFactorConstraint);
 }
 
-void CalendarTest::timerEvent(QTimerEvent *event)
-{
-    if (event->timerId() != m_updateTimerId) {
-        return;
-    }
-
-    killTimer(m_updateTimerId);
-    updateDate();
-}
 
 #include "calendar.moc"


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kdebase-workspace.spec	1 Apr 2009 23:31:39 -0000	1.143
+++ kdebase-workspace.spec	12 Apr 2009 19:02:07 -0000	1.144
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -44,6 +44,8 @@
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
 #??4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
+# http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
+Patch106: kdebase-workspace-4.2.2-kde#187699.patch
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -239,6 +241,8 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
+%patch106 -p5 -b .kde#187699
+
 
 %build
 
@@ -365,9 +369,6 @@
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
-%if 0%{?have_bluez3}
-%{_kde4_appsdir}/solidfakebluetoothbackend/
-%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 
@@ -513,6 +514,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 - drop upstreamed patches



From thias at fedoraproject.org  Sun Apr 12 19:03:17 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 19:03:17 +0000 (UTC)
Subject: rpms/elisa/devel .cvsignore, 1.16, 1.17 elisa.spec, 1.20,
	1.21 sources, 1.16, 1.17
Message-ID: <20090412190317.E907F70126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/elisa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16040

Modified Files:
	.cvsignore elisa.spec sources 
Log Message:
Update to 0.5.35.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Mar 2009 09:55:45 -0000	1.16
+++ .cvsignore	12 Apr 2009 19:02:47 -0000	1.17
@@ -1 +1 @@
-elisa-0.5.30.tar.gz
+elisa-0.5.35.tar.gz


Index: elisa.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/elisa.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- elisa.spec	3 Mar 2009 09:55:45 -0000	1.20
+++ elisa.spec	12 Apr 2009 19:02:47 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Media Center
 Name: elisa
-Version: 0.5.30
+Version: 0.5.35
 Release: 1%{?dist}
 # The base of Elisa is GPLv3, some plugins are MIT but are in other packages.
 # See the included COPYING file for the details.
@@ -92,6 +92,12 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.5.35-1
+- Update to 0.5.35.
+
+* Tue Mar 24 2009 Matthias Saou <http://freshrpms.net/> 0.5.33-1
+- Update to 0.5.33.
+
 * Tue Mar  3 2009 Matthias Saou <http://freshrpms.net/> 0.5.30-1
 - Update to 0.5.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Mar 2009 09:55:45 -0000	1.16
+++ sources	12 Apr 2009 19:02:47 -0000	1.17
@@ -1 +1 @@
-e733f377103d2ded6eb4acc16fbf1768  elisa-0.5.30.tar.gz
+1819ffe25f47f3987228e8bddb49ddb0  elisa-0.5.35.tar.gz



From silas at fedoraproject.org  Sun Apr 12 19:03:23 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Sun, 12 Apr 2009 19:03:23 +0000 (UTC)
Subject: rpms/python-cly/devel import.log, NONE, 1.1 python-cly.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412190323.4FBD970126@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/python-cly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16123/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-cly.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
python-cly-0_9-1_fc10:HEAD:python-cly-0.9-1.fc10.src.rpm:1239562645


--- NEW FILE python-cly.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-cly
Version:        0.9
Release:        1%{?dist}
Summary:        A module for adding powerful text-based consoles to your Python application

Group:          Development/Languages
License:        BSD
URL:            http://swapoff.org/cly
Source0:        http://pypi.python.org/packages/source/c/cly/cly-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  python-docutils
BuildRequires:  python-pygments
BuildRequires:  python-setuptools
BuildRequires:  readline-devel

%description
CLY is a Python module for simplifying the creation of interactive shells, much
like the built-in "cmd" module on steroids.

%prep
%setup -q -n cly-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
# Build documents
make --directory doc/
# Fix non-standard-executable-perm on rlext.so 0775
find build/ -name rlext.so -exec chmod 755 {} \;

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING PKG-INFO README doc/*.html doc/tutorial.py doc/video1.py
%{python_sitearch}/cly/
%{python_sitearch}/cly-%{version}-*.egg-info

%changelog
* Sat Apr 11 2009 Silas Sewell <silas at sewell.ch> - 0.9-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cly/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:34:40 -0000	1.1
+++ .cvsignore	12 Apr 2009 19:02:52 -0000	1.2
@@ -0,0 +1 @@
+cly-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cly/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:34:40 -0000	1.1
+++ sources	12 Apr 2009 19:02:53 -0000	1.2
@@ -0,0 +1 @@
+c6921cb612c840fe3cf754501ecc2cdb  cly-0.9.tar.gz



From thias at fedoraproject.org  Sun Apr 12 19:03:38 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 19:03:38 +0000 (UTC)
Subject: rpms/elisa-plugins-good/devel .cvsignore, 1.4,
	1.5 elisa-plugins-good.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090412190338.3145570126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/elisa-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16299

Modified Files:
	.cvsignore elisa-plugins-good.spec sources 
Log Message:
Update to 0.5.35.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa-plugins-good/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Mar 2009 09:55:54 -0000	1.4
+++ .cvsignore	12 Apr 2009 19:03:07 -0000	1.5
@@ -1 +1 @@
-elisa-plugins-good-0.5.30.tar.gz
+elisa-plugins-good-0.5.35.tar.gz


Index: elisa-plugins-good.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa-plugins-good/devel/elisa-plugins-good.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- elisa-plugins-good.spec	3 Mar 2009 09:55:54 -0000	1.4
+++ elisa-plugins-good.spec	12 Apr 2009 19:03:07 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Good Plugins for the Elisa Media Center
 Name: elisa-plugins-good
-Version: 0.5.30
+Version: 0.5.35
 Release: 1%{?dist}
 License: GPLv3
 Group: Applications/Multimedia
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.5.35-1
+- Update to 0.5.35.
+
 * Tue Mar  3 2009 Matthias Saou <http://freshrpms.net/> 0.5.30-1
 - Update to 0.5.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elisa-plugins-good/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 09:55:54 -0000	1.4
+++ sources	12 Apr 2009 19:03:07 -0000	1.5
@@ -1 +1 @@
-104b35232f7f765cacb4c3220dda8944  elisa-plugins-good-0.5.30.tar.gz
+dd83c89bdf61f424cf610a5beb8612e6  elisa-plugins-good-0.5.35.tar.gz



From thias at fedoraproject.org  Sun Apr 12 19:04:06 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Sun, 12 Apr 2009 19:04:06 +0000 (UTC)
Subject: rpms/elisa-plugins-bad/devel .cvsignore, 1.2,
	1.3 elisa-plugins-bad.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090412190406.D27D870126@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/elisa-plugins-bad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16506

Modified Files:
	.cvsignore elisa-plugins-bad.spec sources 
Log Message:
Update to 0.5.35.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa-plugins-bad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 09:58:03 -0000	1.2
+++ .cvsignore	12 Apr 2009 19:03:36 -0000	1.3
@@ -1 +1 @@
-elisa-plugins-bad-0.5.30.tar.gz
+elisa-plugins-bad-0.5.35.tar.gz


Index: elisa-plugins-bad.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa-plugins-bad/devel/elisa-plugins-bad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elisa-plugins-bad.spec	3 Mar 2009 09:58:03 -0000	1.1
+++ elisa-plugins-bad.spec	12 Apr 2009 19:03:36 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary: Bad Plugins for the Elisa Media Center
 Name: elisa-plugins-bad
-Version: 0.5.30
+Version: 0.5.35
 Release: 1%{?dist}
 License: GPLv3
 Group: Applications/Multimedia
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.5.35-1
+- Update to 0.5.35.
+
 * Tue Mar  3 2009 Matthias Saou <http://freshrpms.net/> 0.5.30-1
 - Update to 0.5.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elisa-plugins-bad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Mar 2009 09:58:03 -0000	1.2
+++ sources	12 Apr 2009 19:03:36 -0000	1.3
@@ -1 +1 @@
-dac30feca252a25dd3d7cf147ad0d184  elisa-plugins-bad-0.5.30.tar.gz
+4b36a741e61f95b110f05e0516333a68  elisa-plugins-bad-0.5.35.tar.gz



From cweyl at fedoraproject.org  Sun Apr 12 19:14:27 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 19:14:27 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/F-10 import.log, NONE,
	1.1 perl-POE-Test-Loops.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412191427.74AC470126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Test-Loops/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18716/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-POE-Test-Loops.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-POE-Test-Loops-1_005-1_fc10:F-10:perl-POE-Test-Loops-1.005-1.fc10.src.rpm:1239563630


--- NEW FILE perl-POE-Test-Loops.spec ---
Name:       perl-POE-Test-Loops 
Version:    1.005 
Release:    1%{?dist}
# META.yml, bin/poe-gen-tests -> perl
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Reusable tests for POE::Loop authors 
Source:     http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Test-Loops-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/POE-Test-Loops
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)

%description
POE::Test::Loops contains one function, generate(), which will generate
all the loop tests for one or more POE::Loop subclasses. The SYNOPSIS
example is a version of poe-gen-tests, which is a stand-alone utility
to generate the actual tests. The poe-gen-tests manpage also documents
the POE::Test::Loops system in more detail.


%prep
%setup -q -n POE-Test-Loops-%{version}

find . -type f -exec chmod -c -x {} ';'

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` | \
    sed -e '/perl([DIFMOSU].*)/d; /perl(POE::MySession)/d'
    #sed -e '/perl((?!(POE)).*)/d'
    #perl -p -e '/^(?!POE)/d'
EOF

%define __perl_provides %{_builddir}/POE-Test-Loops-%{version}/%{name}-prov
chmod +x %{__perl_provides}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc CHANGES README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*
%{_bindir}/poe-gen-tests
%{_mandir}/man1/poe-gen-tests.1.gz

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:28:32 -0000	1.1
+++ .cvsignore	12 Apr 2009 19:13:56 -0000	1.2
@@ -0,0 +1 @@
+POE-Test-Loops-1.005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:28:32 -0000	1.1
+++ sources	12 Apr 2009 19:13:56 -0000	1.2
@@ -0,0 +1 @@
+a075c590ef3024293377678088ebfe50  POE-Test-Loops-1.005.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 12 19:16:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:16:47 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412191535.7EBBF10F806@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora devel is now owned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Sun Apr 12 19:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:15:47 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412191547.97F4510F806@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 10 is now owned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Sun Apr 12 19:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:17:04 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090412191554.0875B10F85A@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 9 is now owned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From rdieter at fedoraproject.org  Sun Apr 12 19:19:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 19:19:06 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.2-kde#187699.patch, 
	1.1, 1.2 kdebase-workspace.spec, 1.212, 1.213
Message-ID: <20090412191906.5499E70126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20544

Modified Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
	kdebase-workspace.spec 
Log Message:
fix kde#187699 patch


kdebase-workspace-4.2.2-kde#187699.patch:

Index: kdebase-workspace-4.2.2-kde#187699.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.2.2-kde#187699.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 18:48:10 -0000	1.1
+++ kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:19:05 -0000	1.2
@@ -1,29 +1,6 @@
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
-@@ -45,12 +45,9 @@
-          */
-         QGraphicsWidget *graphicsWidget();
- 
--    protected:
--        void updateDate();
--        void timerEvent(QTimerEvent *event);
--
-     protected slots:
-         void configAccepted();
-+        void updateDate();
- 
-     private:
-         void paintIcon();
-@@ -58,7 +55,6 @@
-         Plasma::Calendar *m_calendarDialog;
-         Plasma::Svg *m_theme;
-         int m_date;
--        int m_updateTimerId;
- };
- 
- K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp	2009-04-12 14:16:05.000000000 -0500
 @@ -19,6 +19,7 @@
  
  #include <QGraphicsLayout>
@@ -32,15 +9,17 @@
  
  #include <KDebug>
  #include <KIcon>
-@@ -35,7 +36,6 @@
+@@ -34,8 +35,7 @@ CalendarTest::CalendarTest(QObject *pare
+     : Plasma::PopupApplet(parent, args),
      m_calendarDialog(0),
      m_theme(0),
-     m_date(0),
+-    m_date(0),
 -    m_updateTimerId(0)
++    m_date(0)
  {
      setAspectRatioMode(Plasma::IgnoreAspectRatio);
      setCacheMode(DeviceCoordinateCache);
-@@ -116,18 +116,9 @@
+@@ -116,18 +116,9 @@ void CalendarTest::updateDate()
      QDateTime d = QDateTime::currentDateTime();
      m_date = d.date().day();
      int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
@@ -60,3 +39,28 @@
 -}
  
  #include "calendar.moc"
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h	2009-04-12 14:12:17.000000000 -0500
+@@ -45,12 +45,9 @@ class CalendarTest : public Plasma::Popu
+          */
+         QGraphicsWidget *graphicsWidget();
+ 
+-    protected:
+-        void updateDate();
+-        void timerEvent(QTimerEvent *event);
+-
+     protected slots:
+         void configAccepted();
++        void updateDate();
+ 
+     private:
+         void paintIcon();
+@@ -58,7 +55,6 @@ class CalendarTest : public Plasma::Popu
+         Plasma::Calendar *m_calendarDialog;
+         Plasma::Svg *m_theme;
+         int m_date;
+-        int m_updateTimerId;
+ };
+ 
+ K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- kdebase-workspace.spec	12 Apr 2009 18:48:10 -0000	1.212
+++ kdebase-workspace.spec	12 Apr 2009 19:19:05 -0000	1.213
@@ -241,7 +241,7 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p5 -b .kde#187699
+%patch106 -p1 -b .kde#187699
 
 
 %build



From rdieter at fedoraproject.org  Sun Apr 12 19:23:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 19:23:14 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.2-kde#187699.patch, 
	1.1, 1.2 kdebase-workspace.spec, 1.170,
	1.171 kdebase-workspace-4.1.72-plasma-konsole.patch, 1.1,
	NONE kdebase-workspace-4.2.1-kde#185585.patch, 1.1,
	NONE kdebase-workspace-4.2.1-kde#185736.patch, 1.1, NONE
Message-ID: <20090412192314.4DA9370126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21476/F-10

Modified Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.72-plasma-konsole.patch 
	kdebase-workspace-4.2.1-kde#185585.patch 
	kdebase-workspace-4.2.1-kde#185736.patch 
Log Message:
fix kde#187699 patch
drop unused patches


kdebase-workspace-4.2.2-kde#187699.patch:

Index: kdebase-workspace-4.2.2-kde#187699.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace-4.2.2-kde#187699.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:00:37 -0000	1.1
+++ kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:23:13 -0000	1.2
@@ -1,29 +1,6 @@
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
-@@ -45,12 +45,9 @@
-          */
-         QGraphicsWidget *graphicsWidget();
- 
--    protected:
--        void updateDate();
--        void timerEvent(QTimerEvent *event);
--
-     protected slots:
-         void configAccepted();
-+        void updateDate();
- 
-     private:
-         void paintIcon();
-@@ -58,7 +55,6 @@
-         Plasma::Calendar *m_calendarDialog;
-         Plasma::Svg *m_theme;
-         int m_date;
--        int m_updateTimerId;
- };
- 
- K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp	2009-04-12 14:16:05.000000000 -0500
 @@ -19,6 +19,7 @@
  
  #include <QGraphicsLayout>
@@ -32,15 +9,17 @@
  
  #include <KDebug>
  #include <KIcon>
-@@ -35,7 +36,6 @@
+@@ -34,8 +35,7 @@ CalendarTest::CalendarTest(QObject *pare
+     : Plasma::PopupApplet(parent, args),
      m_calendarDialog(0),
      m_theme(0),
-     m_date(0),
+-    m_date(0),
 -    m_updateTimerId(0)
++    m_date(0)
  {
      setAspectRatioMode(Plasma::IgnoreAspectRatio);
      setCacheMode(DeviceCoordinateCache);
-@@ -116,18 +116,9 @@
+@@ -116,18 +116,9 @@ void CalendarTest::updateDate()
      QDateTime d = QDateTime::currentDateTime();
      m_date = d.date().day();
      int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
@@ -60,3 +39,28 @@
 -}
  
  #include "calendar.moc"
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h	2009-04-12 14:12:17.000000000 -0500
+@@ -45,12 +45,9 @@ class CalendarTest : public Plasma::Popu
+          */
+         QGraphicsWidget *graphicsWidget();
+ 
+-    protected:
+-        void updateDate();
+-        void timerEvent(QTimerEvent *event);
+-
+     protected slots:
+         void configAccepted();
++        void updateDate();
+ 
+     private:
+         void paintIcon();
+@@ -58,7 +55,6 @@ class CalendarTest : public Plasma::Popu
+         Plasma::Calendar *m_calendarDialog;
+         Plasma::Svg *m_theme;
+         int m_date;
+-        int m_updateTimerId;
+ };
+ 
+ K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdebase-workspace.spec	12 Apr 2009 19:00:37 -0000	1.170
+++ kdebase-workspace.spec	12 Apr 2009 19:23:13 -0000	1.171
@@ -241,7 +241,7 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p5 -b .kde#187699
+%patch106 -p1 -b .kde#187699
 
 
 %build


--- kdebase-workspace-4.1.72-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185585.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185736.patch DELETED ---



From rdieter at fedoraproject.org  Sun Apr 12 19:23:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 19:23:43 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.2-kde#187699.patch,
	1.1, 1.2 kdebase-workspace.spec, 1.144,
	1.145 kdebase-workspace-4.1.72-plasma-konsole.patch, 1.1,
	NONE kdebase-workspace-4.2.1-kde#185585.patch, 1.1,
	NONE kdebase-workspace-4.2.1-kde#185736.patch, 1.1, NONE
Message-ID: <20090412192343.497D770126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21476/F-9

Modified Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.72-plasma-konsole.patch 
	kdebase-workspace-4.2.1-kde#185585.patch 
	kdebase-workspace-4.2.1-kde#185736.patch 
Log Message:
fix kde#187699 patch
drop unused patches


kdebase-workspace-4.2.2-kde#187699.patch:

Index: kdebase-workspace-4.2.2-kde#187699.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.2.2-kde#187699.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:02:07 -0000	1.1
+++ kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:23:12 -0000	1.2
@@ -1,29 +1,6 @@
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
-@@ -45,12 +45,9 @@
-          */
-         QGraphicsWidget *graphicsWidget();
- 
--    protected:
--        void updateDate();
--        void timerEvent(QTimerEvent *event);
--
-     protected slots:
-         void configAccepted();
-+        void updateDate();
- 
-     private:
-         void paintIcon();
-@@ -58,7 +55,6 @@
-         Plasma::Calendar *m_calendarDialog;
-         Plasma::Svg *m_theme;
-         int m_date;
--        int m_updateTimerId;
- };
- 
- K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp	2009-04-12 14:16:05.000000000 -0500
 @@ -19,6 +19,7 @@
  
  #include <QGraphicsLayout>
@@ -32,15 +9,17 @@
  
  #include <KDebug>
  #include <KIcon>
-@@ -35,7 +36,6 @@
+@@ -34,8 +35,7 @@ CalendarTest::CalendarTest(QObject *pare
+     : Plasma::PopupApplet(parent, args),
      m_calendarDialog(0),
      m_theme(0),
-     m_date(0),
+-    m_date(0),
 -    m_updateTimerId(0)
++    m_date(0)
  {
      setAspectRatioMode(Plasma::IgnoreAspectRatio);
      setCacheMode(DeviceCoordinateCache);
-@@ -116,18 +116,9 @@
+@@ -116,18 +116,9 @@ void CalendarTest::updateDate()
      QDateTime d = QDateTime::currentDateTime();
      m_date = d.date().day();
      int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
@@ -60,3 +39,28 @@
 -}
  
  #include "calendar.moc"
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h	2009-04-12 14:12:17.000000000 -0500
+@@ -45,12 +45,9 @@ class CalendarTest : public Plasma::Popu
+          */
+         QGraphicsWidget *graphicsWidget();
+ 
+-    protected:
+-        void updateDate();
+-        void timerEvent(QTimerEvent *event);
+-
+     protected slots:
+         void configAccepted();
++        void updateDate();
+ 
+     private:
+         void paintIcon();
+@@ -58,7 +55,6 @@ class CalendarTest : public Plasma::Popu
+         Plasma::Calendar *m_calendarDialog;
+         Plasma::Svg *m_theme;
+         int m_date;
+-        int m_updateTimerId;
+ };
+ 
+ K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kdebase-workspace.spec	12 Apr 2009 19:02:07 -0000	1.144
+++ kdebase-workspace.spec	12 Apr 2009 19:23:12 -0000	1.145
@@ -241,7 +241,7 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p5 -b .kde#187699
+%patch106 -p1 -b .kde#187699
 
 
 %build


--- kdebase-workspace-4.1.72-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185585.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185736.patch DELETED ---



From cweyl at fedoraproject.org  Sun Apr 12 19:31:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 19:31:00 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/devel import.log, NONE,
	1.1 perl-DBIx-Class-DateTime-Epoch.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412193100.D675B70126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23153/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DBIx-Class-DateTime-Epoch.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-DBIx-Class-DateTime-Epoch-0_03-1_fc10:HEAD:perl-DBIx-Class-DateTime-Epoch-0.03-1.fc10.src.rpm:1239564618


--- NEW FILE perl-DBIx-Class-DateTime-Epoch.spec ---
Name:       perl-DBIx-Class-DateTime-Epoch 
Version:    0.03 
Release:    1%{?dist}
# lib/DBIx/Class/DateTime/Epoch.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Automatic inflation/deflation of epoch-based DateTime objects for DBIx::Class 
Source:     http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/DBIx-Class-DateTime-Epoch-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DBIx-Class-DateTime-Epoch
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(DateTime)
BuildRequires: perl(DBIx::Class)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

Requires:      perl(DBIx::Class)

%description
This module automatically inflates/deflates DateTime objects
corresponding to applicable columns. Columns may also be defined to
specify their nature, such as columns representing a creation time
(set at time of insertion) or a modification time (set at time of
every update).


%prep
%setup -q -n DBIx-Class-DateTime-Epoch-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:30:25 -0000	1.1
+++ .cvsignore	12 Apr 2009 19:30:29 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Class-DateTime-Epoch-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:30:25 -0000	1.1
+++ sources	12 Apr 2009 19:30:30 -0000	1.2
@@ -0,0 +1 @@
+09506b137eee4050c8283dafbd3a98bb  DBIx-Class-DateTime-Epoch-0.03.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:36 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193236.29A9210F87C@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on zile (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:34 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193236.1A49B10F806@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on zile (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:48 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193236.E95F310F87E@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on zile (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:51 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193241.6D28A10F87F@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on zile (Fedora devel) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:42 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193242.695AE10F882@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on zile (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:54 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193242.6E4CF10F884@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on zile (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:42 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193244.491BE10F886@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on zile (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:58 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193246.72B1F10F888@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on zile (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:44 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193246.9DAA510F88A@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on zile (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:59 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193249.135AF10F88B@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on zile (Fedora 10) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:50 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193249.DF1B110F88D@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on zile (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:32:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:32:50 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193250.05E1E10F88F@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on zile (Fedora 9) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From rakesh at fedoraproject.org  Sun Apr 12 19:32:52 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 19:32:52 +0000 (UTC)
Subject: rpms/ratproxy/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 ratproxy.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090412193252.76A2E70126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23713/devel

Modified Files:
	.cvsignore import.log ratproxy.spec sources 
Log Message:
Updated to 1.56.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2009 12:15:41 -0000	1.2
+++ .cvsignore	12 Apr 2009 19:32:20 -0000	1.3
@@ -1 +1 @@
-ratproxy-1.53-nobinary.tar.gz
+ratproxy-1.56-nobinary.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2009 12:15:41 -0000	1.1
+++ import.log	12 Apr 2009 19:32:21 -0000	1.2
@@ -1 +1,2 @@
 ratproxy-1_51-4_fc10:HEAD:ratproxy-1.51-4.fc10.src.rpm:1232367157
+ratproxy-1_56-1_fc11:HEAD:ratproxy-1.56-1.fc11.src.rpm:1239564444


Index: ratproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/ratproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ratproxy.spec	25 Feb 2009 18:53:21 -0000	1.2
+++ ratproxy.spec	12 Apr 2009 19:32:21 -0000	1.3
@@ -1,14 +1,13 @@
 Name:           ratproxy
-Version:        1.51
-Release:        5%{?dist}
+Version:        1.56
+Release:        1%{?dist}
 Summary:        A passive web application security assessment tool
 Group:          Applications/Internet
 License:        ASL 2.0
 URL:            http://code.google.com/p/%{name}/
 # URL of actual source containing binary
-# http://rakesh.fedorapeople.org/srpm/ratproxy-1.51-3.fc10.src.rpm
 # generate-tarball.sh removes that binary and makes source0 tarball.
-Source0:        ratproxy-1.53-nobinary.tar.gz
+Source0:        ratproxy-1.56-nobinary.tar.gz
 Source1:        generate-tarball.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
@@ -48,6 +47,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.56-1
+- Updated to 1.56
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.51-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2009 12:15:41 -0000	1.2
+++ sources	12 Apr 2009 19:32:21 -0000	1.3
@@ -1 +1 @@
-ea939987fbf30ed8cd36a8b18c3c406d  ratproxy-1.53-nobinary.tar.gz
+d7edc4cbb2539e17499978d2b0c54849  ratproxy-1.56-nobinary.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:27 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193327.8138A10F87F@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on zile (Fedora 8) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:34:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:34:39 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193327.D3B7610F882@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on zile (Fedora 8) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:34:38 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193328.9522110F884@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on zile (Fedora 8) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From pkgdb at fedoraproject.org  Sun Apr 12 19:33:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 12 Apr 2009 19:33:26 +0000
Subject: [pkgdb] zile had acl change status
Message-ID: <20090412193328.BEF8210F886@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on zile (Fedora 8) to Obsolete for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zile



From cweyl at fedoraproject.org  Sun Apr 12 19:42:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 19:42:23 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/F-9 import.log, NONE,
	1.1 perl-DBIx-Class-DateTime-Epoch.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412194223.66BE770126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26392/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DBIx-Class-DateTime-Epoch.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-DBIx-Class-DateTime-Epoch-0_03-1_fc10:F-9:perl-DBIx-Class-DateTime-Epoch-0.03-1.fc10.src.rpm:1239565304


--- NEW FILE perl-DBIx-Class-DateTime-Epoch.spec ---
Name:       perl-DBIx-Class-DateTime-Epoch 
Version:    0.03 
Release:    1%{?dist}
# lib/DBIx/Class/DateTime/Epoch.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Automatic inflation/deflation of epoch-based DateTime objects for DBIx::Class 
Source:     http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/DBIx-Class-DateTime-Epoch-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DBIx-Class-DateTime-Epoch
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(DateTime)
BuildRequires: perl(DBIx::Class)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

Requires:      perl(DBIx::Class)

%description
This module automatically inflates/deflates DateTime objects
corresponding to applicable columns. Columns may also be defined to
specify their nature, such as columns representing a creation time
(set at time of insertion) or a modification time (set at time of
every update).


%prep
%setup -q -n DBIx-Class-DateTime-Epoch-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:30:25 -0000	1.1
+++ .cvsignore	12 Apr 2009 19:41:52 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Class-DateTime-Epoch-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:30:25 -0000	1.1
+++ sources	12 Apr 2009 19:41:52 -0000	1.2
@@ -0,0 +1 @@
+09506b137eee4050c8283dafbd3a98bb  DBIx-Class-DateTime-Epoch-0.03.tar.gz



From joost at fedoraproject.org  Sun Apr 12 19:47:35 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Sun, 12 Apr 2009 19:47:35 +0000 (UTC)
Subject: rpms/fpc/devel fpc-2.2.4-build-id.patch, NONE,
	1.1 fpc-2.2.4-samplecfg_32and64bit.patch, NONE,
	1.1 fpc-2.2.4-stackexecute.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 fpc.spec, 1.31, 1.32 sources, 1.12,
	1.13 fpc-2.2.2-build-id.patch, 1.1, NONE fpc-2.2.2-fpcdocs.patch,
	1.1, NONE fpc-2.2.2-gtk2-r11651.patch, 1.1,
	NONE fpc-2.2.2-samplecfg_32and64bit.patch, 1.3,
	NONE fpc-2.2.2-stackexecute.patch, 1.1, NONE
Message-ID: <20090412194735.36FBA70137@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27928

Modified Files:
	.cvsignore fpc.spec sources 
Added Files:
	fpc-2.2.4-build-id.patch fpc-2.2.4-samplecfg_32and64bit.patch 
	fpc-2.2.4-stackexecute.patch 
Removed Files:
	fpc-2.2.2-build-id.patch fpc-2.2.2-fpcdocs.patch 
	fpc-2.2.2-gtk2-r11651.patch 
	fpc-2.2.2-samplecfg_32and64bit.patch 
	fpc-2.2.2-stackexecute.patch 
Log Message:
* Sun Apr 12 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
- Updated to version 2.2.4


fpc-2.2.4-build-id.patch:

--- NEW FILE fpc-2.2.4-build-id.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -360,6 +360,11 @@
 # to perform
 
 # -----------------------
+# Use BuildId by default
+# -----------------------
+-k--build-id
+
+# -----------------------
 # Set Filenames and Paths
 # -----------------------
 

fpc-2.2.4-samplecfg_32and64bit.patch:

--- NEW FILE fpc-2.2.4-samplecfg_32and64bit.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -17,7 +17,7 @@
 
 setgccdirarch() {
 # First argument is fpc define for CPU type; remaining args are passed to gcc to set corresponding architecture
-FPCDEFINE=$1
+FPCDEFINE="$1"/"$libdir"/fpc
 shift
 setgccdir $@
 
@@ -35,7 +35,7 @@
 if [ $# = 0 ]; then
   echo 'Usage :'
   echo 'samplecfg fpcdir confdir'
-  echo 'fpcdir = Path where FPC is installed'
+  echo 'fpcdir = Prefix where FPC is installed (/usr/., /usr/local/.)'
   echo 'confdir = Path to /etc'
   exit 1
 fi
@@ -45,9 +45,16 @@
 else
   sysdir=/etc
 fi
-FPCBIN=`dirname "$1"`/../../bin/fpc
-FPBIN=`dirname "$1"`/../../bin/fp
-sysfpdirbase=`dirname "$1"`/`$FPCBIN -iV`
+FPCBIN="$1"/bin/fpc
+FPBIN="$1"/bin/fp
+fpctargetproc=`$FPCBIN -iTP`
+echo "$fpctargetproc"
+if [ "$fpctargetproc" = "x86_64" -o "$fpctargetproc" = "powerpc64" ]; then
+  libdir=lib64
+else
+  libdir=lib
+fi
+sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
 sysfpdirbase2=$sysfpdirbase/ide
 sysfpdir=$sysfpdirbase2/text
 fpctargetos=`$FPCBIN -iTO`
@@ -223,7 +230,8 @@
 
 
 # set right path to FPC with $fpcversion
-FPCPATH=`dirname "$1"`/\$fpcversion
+FPCPATH32="$1"/lib/fpc/\$fpcversion
+FPCPATH64="$1"/lib64/fpc/\$fpcversion
 
 # Write (.)fpc.cfg
 echo Writing sample configuration file to $fpccfgfile
@@ -359,26 +367,48 @@
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
-#-Fr$FPCPATH/msg/errore.msg
-#-Fr$FPCPATH/msg/errorn.msg
+#-Fr$FPCPATH32/msg/errore.msg
+#-Fr$FPCPATH32/msg/errorn.msg
+#-Fr$FPCPATH64/msg/errore.msg
+#-Fr$FPCPATH64/msg/errorn.msg
 
 # searchpath for includefiles
 #-Fi/pp/inc;/pp/rtl/inc
 
 #IFDEF FPCAPACHE_1_3
--Fu$FPCPATH/units/\$fpctarget/httpd13/
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd13/
+#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd13/
+#ENDIF
 #ELSE
 #IFDEF FPCAPACHE_2_0
--Fu$FPCPATH/units/\$fpctarget/httpd20
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd20
+#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd20
+#ENDIF
+#ELSE
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd22
 #ELSE
--Fu$FPCPATH/units/\$fpctarget/httpd22
+-Fu$FPCPATH32/units/\$fpctarget/httpd22
+#ENDIF
 #ENDIF
 #ENDIF
 
 # searchpath for units and other system dependent things
--Fu$FPCPATH/units/\$fpctarget
--Fu$FPCPATH/units/\$fpctarget/*
--Fu$FPCPATH/units/\$fpctarget/rtl
+#IFDEF CPU64
+# 64-bits
+-Fu$FPCPATH64/units/\$fpctarget
+-Fu$FPCPATH64/units/\$fpctarget/*
+-Fu$FPCPATH64/units/\$fpctarget/rtl
+#ELSE
+# 32-bits
+-Fu$FPCPATH32/units/\$fpctarget
+-Fu$FPCPATH32/units/\$fpctarget/*
+-Fu$FPCPATH32/units/\$fpctarget/rtl
+#ENDIF
 #-Fu~/fpc/packages/base/*/units/$fpctarget;~/fpc/fcl/units/$fpctarget;~/fpc/rtl/units/$fpctarget
 
 # searchpath for libraries

fpc-2.2.4-stackexecute.patch:

--- NEW FILE fpc-2.2.4-stackexecute.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -365,6 +365,11 @@
 -k--build-id
 
 # -----------------------
+# Do not mark executables as requiring an executable stack (fpc-bug #11563)
+# -----------------------
+-k-z noexecstack
+
+# -----------------------
 # Set Filenames and Paths
 # -----------------------
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Aug 2008 20:43:10 -0000	1.11
+++ .cvsignore	12 Apr 2009 19:47:03 -0000	1.12
@@ -1 +1 @@
-fpcbuild-2.2.2.tar.gz
+fpcbuild-2.2.4.tar.gz


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fpc.spec	24 Feb 2009 18:04:11 -0000	1.31
+++ fpc.spec	12 Apr 2009 19:47:04 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           fpc
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        2.2.4
+Release:        1%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -13,16 +13,14 @@
 # Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
 Patch1:         %{name}-%{version}-build-id.patch
-Patch2:         %{name}-%{version}-fpcdocs.patch
-Patch3:         %{name}-%{version}-stackexecute.patch
-Patch4:         %{name}-%{version}-gtk2-r11651.patch
+Patch2:         %{name}-%{version}-stackexecute.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
 %if ! %{defined useprebuiltcompiler}
 BuildRequires:  fpc
 %endif
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, glibc-devel
 
 %description
 
@@ -78,8 +76,6 @@
 %patch0
 %patch1
 %patch2
-%patch3
-%patch4
 
 %build
 # The source-files:
@@ -179,6 +175,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Sun Apr 12 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
+- Updated to version 2.2.4
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Aug 2008 20:43:10 -0000	1.12
+++ sources	12 Apr 2009 19:47:04 -0000	1.13
@@ -1 +1 @@
-ec3d463ec9859da4122e9edfa2ab992d  fpcbuild-2.2.2.tar.gz
+20bb9a4a9f1449e2249c80d7aba7c245  fpcbuild-2.2.4.tar.gz


--- fpc-2.2.2-build-id.patch DELETED ---


--- fpc-2.2.2-fpcdocs.patch DELETED ---


--- fpc-2.2.2-gtk2-r11651.patch DELETED ---


--- fpc-2.2.2-samplecfg_32and64bit.patch DELETED ---


--- fpc-2.2.2-stackexecute.patch DELETED ---



From rakesh at fedoraproject.org  Sun Apr 12 19:51:44 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 19:51:44 +0000 (UTC)
Subject: rpms/zile/devel .cvsignore, 1.6, 1.7 import.log, 1.2, 1.3 sources,
	1.6, 1.7 zile.spec, 1.11, 1.12
Message-ID: <20090412195144.841CB70126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/zile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29685/devel

Modified Files:
	.cvsignore import.log sources zile.spec 
Log Message:
Updated to 2.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jan 2009 06:54:29 -0000	1.6
+++ .cvsignore	12 Apr 2009 19:51:13 -0000	1.7
@@ -1 +1 @@
-zile-2.3.0.tar.gz
+zile-2.3.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Jan 2009 06:54:29 -0000	1.2
+++ import.log	12 Apr 2009 19:51:13 -0000	1.3
@@ -1,2 +1,3 @@
 zile-2_2_61-2_fc9:HEAD:zile-2.2.61-2.fc9.src.rpm:1218691536
 zile-2_3_0-1_fc10:HEAD:zile-2.3.0-1.fc10.src.rpm:1232045193
+zile-2_3_6-1_fc11:HEAD:zile-2.3.6-1.fc11.src.rpm:1239565544


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jan 2009 06:54:29 -0000	1.6
+++ sources	12 Apr 2009 19:51:13 -0000	1.7
@@ -1 +1 @@
-c35fd88c9045eaffb83aa46abe7e9d27  zile-2.3.0.tar.gz
+5ca5a8810f857940ed0786ac20959651  zile-2.3.6.tar.gz


Index: zile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/zile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zile.spec	25 Feb 2009 18:40:51 -0000	1.11
+++ zile.spec	12 Apr 2009 19:51:13 -0000	1.12
@@ -1,13 +1,13 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Editors
 URL: http://www.gnu.org/software/%{name}/
 Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: texinfo ncurses-devel
+BuildRequires: texinfo ncurses-devel help2man
 Requires(post): info
 Requires(preun): info
 
@@ -45,11 +45,14 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/*
-%{_infodir}/*
 %{_mandir}/man1/*
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.6-1
+- Updated to 2.3.6 (Check changelog for details)
+- Added help2man in BuildRequires and adjusted %%files
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From davidz at fedoraproject.org  Sun Apr 12 19:51:58 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sun, 12 Apr 2009 19:51:58 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.6, 1.7 DeviceKit-disks.spec,
	1.19, 1.20 sources, 1.6,
	1.7 0001-use-correct-dmode-for-iso9660-mounts.patch, 1.1, NONE
Message-ID: <20090412195158.A60CF70126@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29873

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Removed Files:
	0001-use-correct-dmode-for-iso9660-mounts.patch 
Log Message:
* Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 004-0.7.20090412git%{?dist}
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Apr 2009 21:49:00 -0000	1.6
+++ .cvsignore	12 Apr 2009 19:51:27 -0000	1.7
@@ -3,3 +3,4 @@
 DeviceKit-disks-004.20080406git.tar.gz
 DeviceKit-disks-004.20090406git.tar.gz
 DeviceKit-disks-004.20090408git.tar.gz
+DeviceKit-disks-004.20090412git.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DeviceKit-disks.spec	9 Apr 2009 15:33:09 -0000	1.19
+++ DeviceKit-disks.spec	12 Apr 2009 19:51:28 -0000	1.20
@@ -7,16 +7,16 @@
 %define udev_version            139
 %define mdadm_version           2.6.7
 %define device_mapper_version   1.02
-%define libatasmart_version     0.5
+%define libatasmart_version     0.8
 
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.6.20090408git%{?dist}
+Release: 0.7.20090412git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
-Source0: %{name}-%{version}.20090408git.tar.gz
+Source0: %{name}-%{version}.20090412git.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -59,8 +59,6 @@
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
-Patch0: 0001-use-correct-dmode-for-iso9660-mounts.patch
-
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -77,7 +75,6 @@
 
 %prep
 %setup -q
-%patch0 -p 1 -b .iso9660-dmode
 
 %build
 %configure
@@ -135,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 004-0.7.20090412git%{?dist}
+- New snapshot
+
 * Thu Apr 09 2009 David Zeuthen <davidz at redhat.com> - 004-0.6.20090408git%{?dist}
 - use correct dmode for iso9660 mounts (#495018)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Apr 2009 21:49:00 -0000	1.6
+++ sources	12 Apr 2009 19:51:28 -0000	1.7
@@ -1 +1 @@
-8821f15cc3933e496c8a19c08320704e  DeviceKit-disks-004.20090408git.tar.gz
+a87ecdb2f6b2cbb9daae8ce9022dc792  DeviceKit-disks-004.20090412git.tar.gz


--- 0001-use-correct-dmode-for-iso9660-mounts.patch DELETED ---



From rakesh at fedoraproject.org  Sun Apr 12 20:04:30 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 12 Apr 2009 20:04:30 +0000 (UTC)
Subject: rpms/taskcoach/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 sources, 1.4, 1.5 taskcoach.spec, 1.8, 1.9
Message-ID: <20090412200430.AB1F470126@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1037/devel

Modified Files:
	.cvsignore import.log sources taskcoach.spec 
Log Message:
Updated to 0.72.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jan 2009 06:09:25 -0000	1.4
+++ .cvsignore	12 Apr 2009 20:03:59 -0000	1.5
@@ -1 +1 @@
-TaskCoach-0.71.5.tar.gz
+TaskCoach-0.72.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2009 06:09:25 -0000	1.1
+++ import.log	12 Apr 2009 20:04:00 -0000	1.2
@@ -1 +1,2 @@
 taskcoach-0_71_5-1_fc10:HEAD:taskcoach-0.71.5-1.fc10.src.rpm:1232042892
+taskcoach-0_72_5-1_fc11:HEAD:taskcoach-0.72.5-1.fc11.src.rpm:1239566339


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jan 2009 06:09:25 -0000	1.4
+++ sources	12 Apr 2009 20:04:00 -0000	1.5
@@ -1 +1 @@
-4265b00ae37f84507f8a1c69aa32a908  TaskCoach-0.71.5.tar.gz
+3f28e02d16cb8dde3fc3172f6b985edf  TaskCoach-0.72.5.tar.gz


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/taskcoach.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- taskcoach.spec	25 Feb 2009 18:31:00 -0000	1.8
+++ taskcoach.spec	12 Apr 2009 20:04:00 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        0.71.5
-Release:        2%{?dist}
+Version:        0.72.5
+Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw??j przyjazny menad??er zada??
 Group:          Applications/Productivity
@@ -13,7 +13,6 @@
 Source1:        %{name}.png
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 BuildRequires:  python-devel wxPython >= 2.8 desktop-file-utils
 Requires:       hicolor-icon-theme wxPython
 
@@ -87,6 +86,9 @@
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Mon Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.72.5-1
+- Updated to 0.72.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From davidz at fedoraproject.org  Sun Apr 12 20:10:40 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Sun, 12 Apr 2009 20:10:40 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.4,
	1.5 gnome-disk-utility.spec, 1.9, 1.10 sources, 1.4,
	1.5 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch,
	1.1, NONE
Message-ID: <20090412201040.1C67A70126@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3112

Modified Files:
	.cvsignore gnome-disk-utility.spec sources 
Removed Files:
	0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch 
Log Message:
* Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.4.20090412git%{?dist}
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2009 00:32:28 -0000	1.4
+++ .cvsignore	12 Apr 2009 20:10:08 -0000	1.5
@@ -1,3 +1,4 @@
 gnome-disk-utility-0.1.git20080720.tar.bz2
 gnome-disk-utility-0.2.tar.bz2
 gnome-disk-utility-0.3.20090406git.tar.bz2
+gnome-disk-utility-0.3.20090412git.tar.bz2


Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-disk-utility.spec	11 Apr 2009 02:19:23 -0000	1.9
+++ gnome-disk-utility.spec	12 Apr 2009 20:10:09 -0000	1.10
@@ -12,11 +12,11 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.3
-Release: 0.3.20090406git%{?dist}
+Release: 0.4.20090412git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: %{name}-%{version}.20090406git.tar.bz2
+Source0: %{name}-%{version}.20090412git.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -35,8 +35,7 @@
 BuildRequires: intltool
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-
-Patch0: 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 This package contains the Palimpsest disk management application.
@@ -58,6 +57,7 @@
 %package ui-libs
 Summary: Shared libraries used by Palimpsest
 Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -91,7 +91,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gdu-polkit-authz
 
 %build
 %configure
@@ -109,6 +108,10 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/palimpsest.desktop
 
+desktop-file-install --delete-original  \
+  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -147,6 +150,9 @@
 %files
 %defattr(-,root,root,-)
 
+%{_libexecdir}/gdu-notification-daemon
+%{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
+
 %{_bindir}/palimpsest
 %{_datadir}/applications/palimpsest.desktop
 
@@ -200,6 +206,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.4.20090412git%{?dist}
+- New snapshot
+
 * Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 0.3-0.3.20090406git%{?dist}
 - Don't own directories that belong to hicolor-icon-theme
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Apr 2009 00:32:28 -0000	1.4
+++ sources	12 Apr 2009 20:10:09 -0000	1.5
@@ -1 +1 @@
-5d1c0065390398bf599e23a2c6386352  gnome-disk-utility-0.3.20090406git.tar.bz2
+409fa6bb700fa9fab6e7de88dacd4b46  gnome-disk-utility-0.3.20090412git.tar.bz2


--- 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch DELETED ---



From cweyl at fedoraproject.org  Sun Apr 12 20:14:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 20:14:01 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/F-10 import.log, NONE,
	1.1 perl-DBIx-Class-DateTime-Epoch.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412201401.A0AC970126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4083/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DBIx-Class-DateTime-Epoch.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-DBIx-Class-DateTime-Epoch-0_03-1_fc10:F-10:perl-DBIx-Class-DateTime-Epoch-0.03-1.fc10.src.rpm:1239567201


--- NEW FILE perl-DBIx-Class-DateTime-Epoch.spec ---
Name:       perl-DBIx-Class-DateTime-Epoch 
Version:    0.03 
Release:    1%{?dist}
# lib/DBIx/Class/DateTime/Epoch.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Automatic inflation/deflation of epoch-based DateTime objects for DBIx::Class 
Source:     http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/DBIx-Class-DateTime-Epoch-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DBIx-Class-DateTime-Epoch
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(DateTime)
BuildRequires: perl(DBIx::Class)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

Requires:      perl(DBIx::Class)

%description
This module automatically inflates/deflates DateTime objects
corresponding to applicable columns. Columns may also be defined to
specify their nature, such as columns representing a creation time
(set at time of insertion) or a modification time (set at time of
every update).


%prep
%setup -q -n DBIx-Class-DateTime-Epoch-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:30:25 -0000	1.1
+++ .cvsignore	12 Apr 2009 20:13:30 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Class-DateTime-Epoch-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:30:25 -0000	1.1
+++ sources	12 Apr 2009 20:13:30 -0000	1.2
@@ -0,0 +1 @@
+09506b137eee4050c8283dafbd3a98bb  DBIx-Class-DateTime-Epoch-0.03.tar.gz



From till at fedoraproject.org  Sun Apr 12 20:24:53 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun, 12 Apr 2009 20:24:53 +0000 (UTC)
Subject: rpms/unclutter/devel unclutter.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412202453.489E070126@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/unclutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7700/devel

Modified Files:
	.cvsignore sources 
Added Files:
	unclutter.spec 
Log Message:
initial import



--- NEW FILE unclutter.spec ---
Name:           unclutter
Version:        8
Release:        2%{?dist}
Summary:        Hide mouse cursor when idle

Group:          User Interface/X
License:        Public Domain
URL:            ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.README
Source0:        ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.tar.Z
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for xmkmf
BuildRequires:  imake
# for Xlib.h and Xutil.h
BuildRequires:  libX11-devel
# for Xos.h and Xproto.h
BuildRequires:  xorg-x11-proto-devel
# for -lXext
BuildRequires: libXext-devel

%description
Unclutter hides the mouse cursor image from the screen so that it does not
obstruct the area you are looking at. It hides the mouse cursor when it is not
moved for a specified amount of time or no buttons are pressed on the mouse.
Cursor image will be restored once the mouse is moved again.  


%prep
%setup -q -n unclutter


%build
xmkmf
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CDEBUGFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT INSTMANFLAGS="-p -m0644"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/unclutter
%{_mandir}/man1/unclutter.1*


%changelog
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa

* Thu Apr 02 2009 Till Maas <opensource at till.name> - 8-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:23:13 -0000	1.1
+++ .cvsignore	12 Apr 2009 20:24:22 -0000	1.2
@@ -0,0 +1 @@
+unclutter-8.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:23:13 -0000	1.1
+++ sources	12 Apr 2009 20:24:22 -0000	1.2
@@ -0,0 +1 @@
+83d7a6498b69078f869378f801b6a84b  unclutter-8.tar.Z



From till at fedoraproject.org  Sun Apr 12 20:36:12 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun, 12 Apr 2009 20:36:12 +0000 (UTC)
Subject: rpms/unclutter/F-11 unclutter.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412203612.7612670126@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/unclutter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10611

Modified Files:
	.cvsignore sources 
Added Files:
	unclutter.spec 
Log Message:
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa



--- NEW FILE unclutter.spec ---
Name:           unclutter
Version:        8
Release:        2%{?dist}
Summary:        Hide mouse cursor when idle

Group:          User Interface/X
License:        Public Domain
URL:            ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.README
Source0:        ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.tar.Z
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for xmkmf
BuildRequires:  imake
# for Xlib.h and Xutil.h
BuildRequires:  libX11-devel
# for Xos.h and Xproto.h
BuildRequires:  xorg-x11-proto-devel
# for -lXext
BuildRequires: libXext-devel

%description
Unclutter hides the mouse cursor image from the screen so that it does not
obstruct the area you are looking at. It hides the mouse cursor when it is not
moved for a specified amount of time or no buttons are pressed on the mouse.
Cursor image will be restored once the mouse is moved again.  


%prep
%setup -q -n unclutter


%build
xmkmf
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CDEBUGFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT INSTMANFLAGS="-p -m0644"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/unclutter
%{_mandir}/man1/unclutter.1*


%changelog
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa

* Thu Apr 02 2009 Till Maas <opensource at till.name> - 8-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:23:13 -0000	1.1
+++ .cvsignore	12 Apr 2009 20:35:41 -0000	1.2
@@ -0,0 +1 @@
+unclutter-8.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:23:13 -0000	1.1
+++ sources	12 Apr 2009 20:35:41 -0000	1.2
@@ -0,0 +1 @@
+83d7a6498b69078f869378f801b6a84b  unclutter-8.tar.Z



From till at fedoraproject.org  Sun Apr 12 20:37:26 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun, 12 Apr 2009 20:37:26 +0000 (UTC)
Subject: rpms/unclutter/EL-5 unclutter.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412203726.2950370126@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/unclutter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10918

Modified Files:
	.cvsignore sources 
Added Files:
	unclutter.spec 
Log Message:
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa



--- NEW FILE unclutter.spec ---
Name:           unclutter
Version:        8
Release:        2%{?dist}
Summary:        Hide mouse cursor when idle

Group:          User Interface/X
License:        Public Domain
URL:            ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.README
Source0:        ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.tar.Z
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for xmkmf
BuildRequires:  imake
# for Xlib.h and Xutil.h
BuildRequires:  libX11-devel
# for Xos.h and Xproto.h
BuildRequires:  xorg-x11-proto-devel
# for -lXext
BuildRequires: libXext-devel

%description
Unclutter hides the mouse cursor image from the screen so that it does not
obstruct the area you are looking at. It hides the mouse cursor when it is not
moved for a specified amount of time or no buttons are pressed on the mouse.
Cursor image will be restored once the mouse is moved again.  


%prep
%setup -q -n unclutter


%build
xmkmf
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CDEBUGFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT INSTMANFLAGS="-p -m0644"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/unclutter
%{_mandir}/man1/unclutter.1*


%changelog
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa

* Thu Apr 02 2009 Till Maas <opensource at till.name> - 8-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:23:13 -0000	1.1
+++ .cvsignore	12 Apr 2009 20:36:55 -0000	1.2
@@ -0,0 +1 @@
+unclutter-8.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:23:13 -0000	1.1
+++ sources	12 Apr 2009 20:36:55 -0000	1.2
@@ -0,0 +1 @@
+83d7a6498b69078f869378f801b6a84b  unclutter-8.tar.Z



From till at fedoraproject.org  Sun Apr 12 20:46:09 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun, 12 Apr 2009 20:46:09 +0000 (UTC)
Subject: rpms/unclutter/F-10 unclutter.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412204609.5DF3E70126@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/unclutter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12441

Modified Files:
	.cvsignore sources 
Added Files:
	unclutter.spec 
Log Message:
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa



--- NEW FILE unclutter.spec ---
Name:           unclutter
Version:        8
Release:        2%{?dist}
Summary:        Hide mouse cursor when idle

Group:          User Interface/X
License:        Public Domain
URL:            ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.README
Source0:        ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.tar.Z
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for xmkmf
BuildRequires:  imake
# for Xlib.h and Xutil.h
BuildRequires:  libX11-devel
# for Xos.h and Xproto.h
BuildRequires:  xorg-x11-proto-devel
# for -lXext
BuildRequires: libXext-devel

%description
Unclutter hides the mouse cursor image from the screen so that it does not
obstruct the area you are looking at. It hides the mouse cursor when it is not
moved for a specified amount of time or no buttons are pressed on the mouse.
Cursor image will be restored once the mouse is moved again.  


%prep
%setup -q -n unclutter


%build
xmkmf
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CDEBUGFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT INSTMANFLAGS="-p -m0644"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/unclutter
%{_mandir}/man1/unclutter.1*


%changelog
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa

* Thu Apr 02 2009 Till Maas <opensource at till.name> - 8-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:23:13 -0000	1.1
+++ .cvsignore	12 Apr 2009 20:45:38 -0000	1.2
@@ -0,0 +1 @@
+unclutter-8.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:23:13 -0000	1.1
+++ sources	12 Apr 2009 20:45:38 -0000	1.2
@@ -0,0 +1 @@
+83d7a6498b69078f869378f801b6a84b  unclutter-8.tar.Z



From till at fedoraproject.org  Sun Apr 12 20:47:33 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun, 12 Apr 2009 20:47:33 +0000 (UTC)
Subject: rpms/unclutter/F-9 unclutter.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412204733.5CC7270126@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/unclutter/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12779

Modified Files:
	.cvsignore sources 
Added Files:
	unclutter.spec 
Log Message:
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa



--- NEW FILE unclutter.spec ---
Name:           unclutter
Version:        8
Release:        2%{?dist}
Summary:        Hide mouse cursor when idle

Group:          User Interface/X
License:        Public Domain
URL:            ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.README
Source0:        ftp://export.lcs.mit.edu/contrib/utilities/unclutter-%{version}.tar.Z
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for xmkmf
BuildRequires:  imake
# for Xlib.h and Xutil.h
BuildRequires:  libX11-devel
# for Xos.h and Xproto.h
BuildRequires:  xorg-x11-proto-devel
# for -lXext
BuildRequires: libXext-devel

%description
Unclutter hides the mouse cursor image from the screen so that it does not
obstruct the area you are looking at. It hides the mouse cursor when it is not
moved for a specified amount of time or no buttons are pressed on the mouse.
Cursor image will be restored once the mouse is moved again.  


%prep
%setup -q -n unclutter


%build
xmkmf
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CDEBUGFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT INSTMANFLAGS="-p -m0644"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/unclutter
%{_mandir}/man1/unclutter.1*


%changelog
* Sun Apr 12 2009 Till Maas <opensource at till.name> - 8-2
- Update description to the one provided by Lucian Langa

* Thu Apr 02 2009 Till Maas <opensource at till.name> - 8-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:23:13 -0000	1.1
+++ .cvsignore	12 Apr 2009 20:47:02 -0000	1.2
@@ -0,0 +1 @@
+unclutter-8.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unclutter/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:23:13 -0000	1.1
+++ sources	12 Apr 2009 20:47:03 -0000	1.2
@@ -0,0 +1 @@
+83d7a6498b69078f869378f801b6a84b  unclutter-8.tar.Z



From bpepple at fedoraproject.org  Sun Apr 12 20:59:26 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 12 Apr 2009 20:59:26 +0000 (UTC)
Subject: rpms/telepathy-stream-engine/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-stream-engine.spec, 1.13, 1.14
Message-ID: <20090412205926.39CE770126@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-stream-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16128

Modified Files:
	.cvsignore sources telepathy-stream-engine.spec 
Log Message:
* Sun Apr 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.8-1
- Update to 0.5.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 May 2008 23:21:36 -0000	1.8
+++ .cvsignore	12 Apr 2009 20:58:55 -0000	1.9
@@ -1 +1 @@
-telepathy-stream-engine-0.5.3.tar.gz
+telepathy-stream-engine-0.5.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 May 2008 23:21:36 -0000	1.8
+++ sources	12 Apr 2009 20:58:55 -0000	1.9
@@ -1 +1 @@
-3dd96588590204d008d2421f7186f85c  telepathy-stream-engine-0.5.3.tar.gz
+574ac22957bade06e974d3a3d04f507e  telepathy-stream-engine-0.5.8.tar.gz


Index: telepathy-stream-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/telepathy-stream-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- telepathy-stream-engine.spec	25 Feb 2009 19:48:23 -0000	1.13
+++ telepathy-stream-engine.spec	12 Apr 2009 20:58:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           telepathy-stream-engine
-Version:        0.5.3
-Release:        3%{?dist}
+Version:        0.5.8
+Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming
 
 Group:          Applications/Communications
@@ -9,10 +9,12 @@
 Source0:        http://telepathy.freedesktop.org/releases/stream-engine/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  farsight-devel >= 0.1.27
+BuildRequires:  farsight2-devel >= 0.0.3
+BuildRequires:  telepathy-farsight-devel >= 0.0.3
 BuildRequires:	dbus-devel >= 0.95
 BuildRequires:	dbus-glib-devel >= 0.73
-BuildRequires:	telepathy-glib-devel >= 0.7.6
+BuildRequires:	telepathy-glib-devel >= 0.7.8
+BuildRequires:	gtk2-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libxslt
@@ -28,7 +30,7 @@
 
 
 %build
-%configure --enable-sequence-diagrams=no
+%configure
 make %{?_smp_mflags}
 
 
@@ -45,10 +47,16 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog
 %{_libexecdir}/%{name}
-%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.StreamEngine.service
+%dir %{_sysconfdir}/stream-engine
+%config(noreplace) %{_sysconfdir}/stream-engine/gstcodecs.conf
+%config(noreplace) %{_sysconfdir}/stream-engine/gstelements.conf
+%{_datadir}/dbus-1/services/org.maemo.Telepathy.StreamEngine.service
 
 
 %changelog
+* Sun Apr 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.8-1
+- Update to 0.5.8.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sun Apr 12 21:01:37 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 21:01:37 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/devel import.log, NONE,
	1.1 perl-CSS-Minifier-XS.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412210137.8701670126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16820/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CSS-Minifier-XS.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CSS-Minifier-XS-0_03-1_fc10:HEAD:perl-CSS-Minifier-XS-0.03-1.fc10.src.rpm:1239570058


--- NEW FILE perl-CSS-Minifier-XS.spec ---
Name:       perl-CSS-Minifier-XS 
Version:    0.03 
Release:    1%{?dist}
# lib/CSS/Minifier/XS.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    XS based CSS minifier 
Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/CSS-Minifier-XS
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
'CSS::Minifier::XS' is a CSS "minifier"; it's designed to remove un-
necessary whitespace and comments from CSS files, while also *not*
breaking the CSS. 'CSS::Minifier::XS' is similar in function to
'CSS::Minifier', but is substantially faster as it's written in XS and
not just pure Perl.


%prep
%setup -q -n CSS-Minifier-XS-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:33:45 -0000	1.1
+++ .cvsignore	12 Apr 2009 21:01:06 -0000	1.2
@@ -0,0 +1 @@
+CSS-Minifier-XS-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:33:45 -0000	1.1
+++ sources	12 Apr 2009 21:01:06 -0000	1.2
@@ -0,0 +1 @@
+31522fe802f1dbfbc7e079ab8b70df76  CSS-Minifier-XS-0.03.tar.gz



From deji at fedoraproject.org  Sun Apr 12 21:06:43 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 12 Apr 2009 21:06:43 +0000 (UTC)
Subject: rpms/gparted/devel .cvsignore, 1.20, 1.21 gparted.spec, 1.48,
	1.49 sources, 1.20, 1.21
Message-ID: <20090412210643.F40F570126@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17982

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Sun Apr 12 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.4-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Feb 2009 20:21:32 -0000	1.20
+++ .cvsignore	12 Apr 2009 21:06:12 -0000	1.21
@@ -1 +1 @@
-gparted-0.4.3.tar.bz2
+gparted-0.4.4.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gparted.spec	25 Feb 2009 00:29:18 -0000	1.48
+++ gparted.spec	12 Apr 2009 21:06:12 -0000	1.49
@@ -1,7 +1,7 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.4.3
-Release:	2%{?dist}
+Version:	0.4.4
+Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
@@ -89,6 +89,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Sun Apr 12 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.4-1
+- New upstream version
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Feb 2009 20:21:32 -0000	1.20
+++ sources	12 Apr 2009 21:06:12 -0000	1.21
@@ -1 +1 @@
-da976113bf0962293d419222618bc091  gparted-0.4.3.tar.bz2
+1fec16c61c76770d2fddd834f0d37997  gparted-0.4.4.tar.bz2



From cweyl at fedoraproject.org  Sun Apr 12 21:07:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 12 Apr 2009 21:07:33 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/F-9 import.log, NONE,
	1.1 perl-CSS-Minifier-XS.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090412210733.B23B370126@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier-XS/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18268/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CSS-Minifier-XS.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CSS-Minifier-XS-0_03-1_fc10:F-9:perl-CSS-Minifier-XS-0.03-1.fc10.src.rpm:1239570404


--- NEW FILE perl-CSS-Minifier-XS.spec ---
Name:       perl-CSS-Minifier-XS 
Version:    0.03 
Release:    1%{?dist}
# lib/CSS/Minifier/XS.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    XS based CSS minifier 
Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/CSS-Minifier-XS
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
'CSS::Minifier::XS' is a CSS "minifier"; it's designed to remove un-
necessary whitespace and comments from CSS files, while also *not*
breaking the CSS. 'CSS::Minifier::XS' is similar in function to
'CSS::Minifier', but is substantially faster as it's written in XS and
not just pure Perl.


%prep
%setup -q -n CSS-Minifier-XS-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:33:45 -0000	1.1
+++ .cvsignore	12 Apr 2009 21:07:01 -0000	1.2
@@ -0,0 +1 @@
+CSS-Minifier-XS-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:33:45 -0000	1.1
+++ sources	12 Apr 2009 21:07:02 -0000	1.2
@@ -0,0 +1 @@
+31522fe802f1dbfbc7e079ab8b70df76  CSS-Minifier-XS-0.03.tar.gz



From sailer at fedoraproject.org  Sun Apr 12 21:10:46 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sun, 12 Apr 2009 21:10:46 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel mingw32-pangomm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412211046.2F77370126@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19092

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-pangomm.spec 
Log Message:
import from review



--- NEW FILE mingw32-pangomm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

%define apiver 1.4

Name:           mingw32-pangomm
Version:        2.24.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for Pango

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.24/pangomm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-glibmm24 >= 2.14.1
BuildRequires:  mingw32-cairomm >= 1.2.2
BuildRequires:  mingw32-pango >= 1.21.4
BuildRequires:  doxygen
BuildRequires:  graphviz

Requires:       pkgconfig


%description
pangomm provides a C++ interface to the Pango library. Highlights
include typesafe callbacks, widgets extensible via inheritance and a
comprehensive set of widget classes that can be freely combined to
quickly create complex user interfaces.


%prep
%setup -q -n pangomm-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

rm -r $RPM_BUILD_ROOT%{_mingw32_libdir}/pangomm-%{apiver}

# Remove documentation.
rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/pangomm-%{apiver}
rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING.tools
%{_mingw32_bindir}/libpangomm-%{apiver}-1.dll
%{_mingw32_libdir}/libpangomm-%{apiver}.la
%{_mingw32_libdir}/libpangomm-%{apiver}.dll.a
%{_mingw32_libdir}/pkgconfig/pangomm-%{apiver}.pc
%{_mingw32_includedir}/pangomm-%{apiver}


%changelog
* Tue Apr  7 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.0-1
- Update to upstream 2.24.0, to keep mingw32 package in sync with
  native pangomm

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.14.1-1
- update to 2.14.1

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-6
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-5
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-4
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-3
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:13:15 -0000	1.1
+++ .cvsignore	12 Apr 2009 21:10:15 -0000	1.2
@@ -0,0 +1 @@
+pangomm-2.24.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:13:15 -0000	1.1
+++ sources	12 Apr 2009 21:10:15 -0000	1.2
@@ -0,0 +1 @@
+fa0f44c37499433455857becad4bbcda  pangomm-2.24.0.tar.bz2



From sailer at fedoraproject.org  Sun Apr 12 21:12:22 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sun, 12 Apr 2009 21:12:22 +0000 (UTC)
Subject: rpms/mingw32-pangomm/F-10 mingw32-pangomm.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090412211222.D217F70126@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-pangomm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19524

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-pangomm.spec 
Log Message:
import from review



--- NEW FILE mingw32-pangomm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

%define apiver 1.4

Name:           mingw32-pangomm
Version:        2.14.1
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for Pango

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-glibmm24 >= 2.14.1
BuildRequires:  mingw32-cairomm >= 1.2.2
BuildRequires:  mingw32-pango >= 1.21.4
BuildRequires:  doxygen
BuildRequires:  graphviz

Requires:       pkgconfig


%description
pangomm provides a C++ interface to the Pango library. Highlights
include typesafe callbacks, widgets extensible via inheritance and a
comprehensive set of widget classes that can be freely combined to
quickly create complex user interfaces.


%prep
%setup -q -n pangomm-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

rm -r $RPM_BUILD_ROOT%{_mingw32_libdir}/pangomm-%{apiver}

# Remove documentation.
rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/pangomm-%{apiver}
rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING.tools
%{_mingw32_bindir}/libpangomm-%{apiver}-1.dll
%{_mingw32_libdir}/libpangomm-%{apiver}.la
%{_mingw32_libdir}/libpangomm-%{apiver}.dll.a
%{_mingw32_libdir}/pkgconfig/pangomm-%{apiver}.pc
%{_mingw32_includedir}/pangomm-%{apiver}


%changelog
* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.14.1-1
- update to 2.14.1

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-6
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-5
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-4
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-3
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:13:15 -0000	1.1
+++ .cvsignore	12 Apr 2009 21:11:52 -0000	1.2
@@ -0,0 +1 @@
+pangomm-2.14.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-pangomm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:13:15 -0000	1.1
+++ sources	12 Apr 2009 21:11:52 -0000	1.2
@@ -0,0 +1 @@
+c67228ea93dd977394d2872b61754b53  pangomm-2.14.1.tar.bz2



From deji at fedoraproject.org  Sun Apr 12 21:18:32 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 12 Apr 2009 21:18:32 +0000 (UTC)
Subject: rpms/gparted/F-10 .cvsignore, 1.18, 1.19 gparted.spec, 1.45,
	1.46 sources, 1.18, 1.19
Message-ID: <20090412211832.F30F770126@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gparted/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20685

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Sun Apr 12 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.4-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Feb 2009 20:42:57 -0000	1.18
+++ .cvsignore	12 Apr 2009 21:18:01 -0000	1.19
@@ -1 +1 @@
-gparted-0.4.3.tar.bz2
+gparted-0.4.4.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/F-10/gparted.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gparted.spec	12 Feb 2009 20:42:57 -0000	1.45
+++ gparted.spec	12 Apr 2009 21:18:01 -0000	1.46
@@ -1,6 +1,6 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.4.3
+Version:	0.4.4
 Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
@@ -89,6 +89,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Sun Apr 12 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.4-1
+- New upstream version
+
 * Thu Feb 12 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.3-1
 - New upstream version, fixes the automounting bug (RH #468953)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Feb 2009 20:42:57 -0000	1.18
+++ sources	12 Apr 2009 21:18:02 -0000	1.19
@@ -1 +1 @@
-da976113bf0962293d419222618bc091  gparted-0.4.3.tar.bz2
+1fec16c61c76770d2fddd834f0d37997  gparted-0.4.4.tar.bz2



From pbrobinson at fedoraproject.org  Sun Apr 12 21:23:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 12 Apr 2009 21:23:25 +0000 (UTC)
Subject: rpms/gupnp-av/devel .cvsignore, 1.4, 1.5 gupnp-av.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20090412212326.118F670137@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21967

Modified Files:
	.cvsignore gupnp-av.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2009 12:04:40 -0000	1.4
+++ .cvsignore	12 Apr 2009 21:22:55 -0000	1.5
@@ -1 +1 @@
-gupnp-av-0.3.1.tar.gz
+gupnp-av-0.4.tar.gz


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/gupnp-av.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gupnp-av.spec	4 Mar 2009 22:59:20 -0000	1.9
+++ gupnp-av.spec	12 Apr 2009 21:22:55 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gupnp-av
-Version:        0.3.1
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@
 %{_datadir}/gtk-doc/html/gupnp-av/
 
 %changelog
+* Sun Apr 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
+- New upstream release
+
 * Wed Mar 4  2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-3
 - Move docs to noarch subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2009 12:04:40 -0000	1.4
+++ sources	12 Apr 2009 21:22:55 -0000	1.5
@@ -1 +1 @@
-6a98f25c794bb9766e956f714261587d  gupnp-av-0.3.1.tar.gz
+a83661ecbe260dad85f9f90e0e3c22d5  gupnp-av-0.4.tar.gz



From pbrobinson at fedoraproject.org  Sun Apr 12 21:35:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 12 Apr 2009 21:35:36 +0000 (UTC)
Subject: rpms/gupnp-av/F-10 .cvsignore, 1.2, 1.3 gupnp-av.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090412213536.E7E7070126@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25010

Modified Files:
	.cvsignore gupnp-av.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2008 18:08:02 -0000	1.2
+++ .cvsignore	12 Apr 2009 21:35:06 -0000	1.3
@@ -1 +1 @@
-gupnp-av-0.2.1.tar.gz
+gupnp-av-0.4.tar.gz


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-10/gupnp-av.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gupnp-av.spec	3 Feb 2009 12:06:57 -0000	1.5
+++ gupnp-av.spec	12 Apr 2009 21:35:06 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           gupnp-av
-Version:        0.3.1
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
@@ -27,15 +27,24 @@
 %package devel
 Summary: Development package for gupnp-av
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 Requires: gssdp-devel
 Requires: gupnp-devel
-Requires: gupnp-av = %{version}-%{release}
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 Files for development with gupnp-av.
 
+%package docs
+Summary: Documentation files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk-doc
+BuildArch: noarch
+
+%description docs
+This package contains developer documentation for %{name}.
+
 %prep
 %setup -q
 
@@ -63,12 +72,24 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/gupnp-av/
 %{_includedir}/gupnp-av-1.0
 %{_libdir}/pkgconfig/gupnp-av-1.0.pc
 %{_libdir}/libgupnp-av-1.0.so
 
+%files docs
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/gupnp-av/
+
 %changelog
+* Sun Apr 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
+- New upstream release
+
+* Wed Mar 4  2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-3
+- Move docs to noarch subpackage
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 3  2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2009 12:06:57 -0000	1.4
+++ sources	12 Apr 2009 21:35:06 -0000	1.5
@@ -1 +1 @@
-6a98f25c794bb9766e956f714261587d  gupnp-av-0.3.1.tar.gz
+a83661ecbe260dad85f9f90e0e3c22d5  gupnp-av-0.4.tar.gz



From lennart at fedoraproject.org  Sun Apr 12 21:52:51 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sun, 12 Apr 2009 21:52:51 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.9, 1.10 libatasmart.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <20090412215252.1E10370126@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28615

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2009 03:30:37 -0000	1.9
+++ .cvsignore	12 Apr 2009 21:52:20 -0000	1.10
@@ -1 +1 @@
-libatasmart-0.8.tar.gz
+libatasmart-0.9.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libatasmart.spec	10 Apr 2009 03:32:22 -0000	1.11
+++ libatasmart.spec	12 Apr 2009 21:52:20 -0000	1.12
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.8
+Version: 0.9
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -52,8 +52,12 @@
 %{_includedir}/atasmart.h
 %{_libdir}/libatasmart.so
 %{_libdir}/pkgconfig/libatasmart.pc
+%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
 
 %changelog
+* Sun Apr 12 2009 Lennart Poettering <lpoetter at redhat.com> 0.9-1
+- New upstream release
+
 * Fri Apr 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Apr 2009 03:30:37 -0000	1.9
+++ sources	12 Apr 2009 21:52:20 -0000	1.10
@@ -1 +1 @@
-0d0808fd8f95aa0e83778f58505b5640  libatasmart-0.8.tar.gz
+05b81d0a3eeee3104fd412879834ed77  libatasmart-0.9.tar.gz



From mjakubicek at fedoraproject.org  Sun Apr 12 22:12:16 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 12 Apr 2009 22:12:16 +0000 (UTC)
Subject: rpms/orsa/devel orsa-file.patch,1.2,1.3 orsa.spec,1.6,1.7
Message-ID: <20090412221216.CAB0570126@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1850

Modified Files:
	orsa-file.patch orsa.spec 
Log Message:
- Do not complain at all if the configuration file is missing.



orsa-file.patch:

Index: orsa-file.patch
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa-file.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- orsa-file.patch	8 Apr 2009 00:05:16 -0000	1.2
+++ orsa-file.patch	12 Apr 2009 22:11:44 -0000	1.3
@@ -1,6 +1,6 @@
 --- src/liborsa/orsa_file.cc.orig	2009-04-07 16:27:28.000000000 +0200
 +++ src/liborsa/orsa_file.cc	2009-04-07 17:33:23.000000000 +0200
-@@ -1399,6 +1399,36 @@
+@@ -1399,6 +1399,32 @@
      list_enum.push_back(TEXTURE_NEPTUNE);
    }
    
@@ -27,10 +27,6 @@
 +      return;
 +    }
 +    
-+    if (file == 0) {
-+      ORSA_DEBUG("Configuration file %s not found.",filename.c_str());
-+    }
-+    
 +    status = CLOSE;
 +  }
 +  


Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- orsa.spec	8 Apr 2009 00:11:58 -0000	1.6
+++ orsa.spec	12 Apr 2009 22:11:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:			orsa
 Version:		0.7.0
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -93,6 +93,9 @@
 %{_libdir}/libxorsa.so
 
 %changelog
+* Sun Apr 12 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-8
+- Do not complain at all if the configuration file is missing.
+
 * Tue Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-7
 - Fix segfault on missing jpl file.
 



From lkundrak at fedoraproject.org  Sun Apr 12 22:18:37 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 12 Apr 2009 22:18:37 +0000 (UTC)
Subject: rpms/kBuild/devel kBuild.spec,1.5,1.6
Message-ID: <20090412221837.1250A70126@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3611

Modified Files:
	kBuild.spec 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
- Fix typoes (Robert P. J. Day, #495393)



Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/kBuild.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kBuild.spec	1 Mar 2009 11:11:30 -0000	1.5
+++ kBuild.spec	12 Apr 2009 22:18:06 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           kBuild
 Version:        0.1.5
-Release:        3%{?dist}
-Summary:        A cross-platform build enviroment
+Release:        4%{?dist}
+Summary:        A cross-platform build environment
 
 Group:          Development/Tools
 License:        BSD and GPLv2+
@@ -17,7 +17,7 @@
 
 
 %description
-This is a GNU make fork that with a set of scripts to simplify
+This is a GNU make fork with a set of scripts to simplify
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
+- Fix typoes (Robert P. J. Day, #495393)
+
 * Sun Mar 1 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-3
 - Fix up BRs
 



From drago01 at fedoraproject.org  Sun Apr 12 23:00:03 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 12 Apr 2009 23:00:03 +0000 (UTC)
Subject: rpms/fedora-setup-keyboard/devel .cvsignore, 1.2,
	1.3 fedora-setup-keyboard.spec, 1.3, 1.4 sources, 1.2,
	1.3 fedora-setup-keyboard-0.3-merge-terminate.patch, 1.1, NONE
Message-ID: <20090412230003.6224170126@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15203

Modified Files:
	.cvsignore fedora-setup-keyboard.spec sources 
Removed Files:
	fedora-setup-keyboard-0.3-merge-terminate.patch 
Log Message:
Update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 08:01:47 -0000	1.2
+++ .cvsignore	12 Apr 2009 22:59:29 -0000	1.3
@@ -1 +1 @@
-fedora-setup-keyboard-0.3.tar.bz2
+fedora-setup-keyboard-0.4.tar.bz2


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-setup-keyboard.spec	9 Apr 2009 05:24:11 -0000	1.3
+++ fedora-setup-keyboard.spec	12 Apr 2009 22:59:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
-Version:	0.3
-Release:	4%{?dist}
+Version:	0.4
+Release:	1%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -9,7 +9,6 @@
 Source0:	https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:		fedora-setup-keyboard-0.3-merge-terminate.patch
 
 BuildRequires:	hal-devel
 BuildRequires:	glib2-devel
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .terminate
 
 
 %build
@@ -47,6 +45,10 @@
 %doc COPYING
 
 %changelog
+* Mon Apr 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.4-1
+- 0.4 release
+- Dropped patch, merged upstream
+
 * Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.3-4
 - fedora-setup-keyboard-0.3-merge-terminate.patch: merge xkb options for
   termination.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Mar 2009 08:01:47 -0000	1.2
+++ sources	12 Apr 2009 22:59:30 -0000	1.3
@@ -1 +1 @@
-6bcb3d6a9f31eddd69aac5df3b50dd98  fedora-setup-keyboard-0.3.tar.bz2
+1a42b001f19e615aa81211fd35b6fc41  fedora-setup-keyboard-0.4.tar.bz2


--- fedora-setup-keyboard-0.3-merge-terminate.patch DELETED ---



From rdieter at fedoraproject.org  Sun Apr 12 23:07:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 12 Apr 2009 23:07:32 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec,1.145,1.146
Message-ID: <20090412230732.EB4AD70126@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17782

Modified Files:
	kdebase-workspace.spec 
Log Message:
drop smp_mflags until borkage is figured out



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdebase-workspace.spec	12 Apr 2009 19:23:12 -0000	1.145
+++ kdebase-workspace.spec	12 Apr 2009 23:07:31 -0000	1.146
@@ -255,8 +255,8 @@
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
-#  -k || make -C %{_target_platform}
+# not smp-safe?
+make -C %{_target_platform}
 
 
 %install



From pgordon at fedoraproject.org  Sun Apr 12 23:10:48 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 12 Apr 2009 23:10:48 +0000 (UTC)
Subject: rpms/WebKit/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE WebKit.spec, 1.29, NONE sources, 1.14, NONE
Message-ID: <20090412231048.246BB70126@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18885

Added Files:
	dead.package 
Removed Files:
	Makefile WebKit.spec sources 
Log Message:
Remove old files; add dead.package: This package has been renamed to webkitgtk.


--- NEW FILE dead.package ---
Fedora is now tracking upstream releases of the WebKitGTK+ port (instead of
SVN snapshots); and the package has been renamed to 'webkitgtk' accordingly.


--- Makefile DELETED ---


--- WebKit.spec DELETED ---


--- sources DELETED ---



From lkundrak at fedoraproject.org  Sun Apr 12 23:26:47 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 12 Apr 2009 23:26:47 +0000 (UTC)
Subject: rpms/kBuild/devel kBuild.spec,1.6,1.7
Message-ID: <20090412232647.4AB3C70126@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22771

Modified Files:
	kBuild.spec 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
- Fix typoes (Robert P. J. Day, #495393)
- Comment out the colliding dprintf



Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/kBuild.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kBuild.spec	12 Apr 2009 22:18:06 -0000	1.6
+++ kBuild.spec	12 Apr 2009 23:26:15 -0000	1.7
@@ -10,6 +10,7 @@
 URL:            http://svn.netlabs.org/kbuild
 Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
+Patch1:         kBuild-0.1.5-dprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .escape
+%patch1 -p1 -b .dprintf
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
@@ -75,6 +77,7 @@
 %changelog
 * Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
 - Fix typoes (Robert P. J. Day, #495393)
+- Comment out the colliding dprintf
 
 * Sun Mar 1 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-3
 - Fix up BRs



From lkundrak at fedoraproject.org  Sun Apr 12 23:33:50 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 12 Apr 2009 23:33:50 +0000 (UTC)
Subject: rpms/kBuild/devel kBuild-0.1.5-dprintf.patch,NONE,1.1
Message-ID: <20090412233350.5D2A270126@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25526

Added Files:
	kBuild-0.1.5-dprintf.patch 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
- Fix typoes (Robert P. J. Day, #495393)
- Comment out the colliding dprintf


kBuild-0.1.5-dprintf.patch:

--- NEW FILE kBuild-0.1.5-dprintf.patch ---
This dprintf() collides with POSIX.1-2008 dprintf() and is not used at all
anyways. (Whoa! what a stupid name! standardized before invention of grep!)

Lubomir Rintel <lkundrak at v3.sk>

diff -up kBuild-0.1.5/src/ash/output.c.gcc44 kBuild-0.1.5/src/ash/output.c
--- kBuild-0.1.5/src/ash/output.c.gcc44	2009-04-13 01:20:33.857017054 +0200
+++ kBuild-0.1.5/src/ash/output.c	2009-04-13 01:20:57.570033297 +0200
@@ -230,6 +230,7 @@ out1fmt(const char *fmt, ...)
 	va_end(ap);
 }
 
+#if 0
 void
 dprintf(const char *fmt, ...)
 {
@@ -240,6 +241,7 @@ dprintf(const char *fmt, ...)
 	va_end(ap);
 	flushout(out2);
 }
+#endif
 
 void
 fmtstr(char *outbuf, size_t length, const char *fmt, ...)
diff -up kBuild-0.1.5/src/ash/output.h.gcc44 kBuild-0.1.5/src/ash/output.h
--- kBuild-0.1.5/src/ash/output.h.gcc44	2009-04-13 01:20:37.724140366 +0200
+++ kBuild-0.1.5/src/ash/output.h	2009-04-13 01:20:47.933142098 +0200
@@ -65,8 +65,10 @@ void outfmt(struct output *, const char 
     __attribute__((__format__(__printf__,2,3)));
 void out1fmt(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
+#if 0
 void dprintf(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
+#endif
 void fmtstr(char *, size_t, const char *, ...)
     __attribute__((__format__(__printf__,3,4)));
 void doformat(struct output *, const char *, va_list);



From rdieter at fedoraproject.org  Mon Apr 13 00:24:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 13 Apr 2009 00:24:08 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec,1.146,1.147
Message-ID: <20090413002408.52DD270124@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3283

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix %files for %{?have_bluez3} case (why needed now though?)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdebase-workspace.spec	12 Apr 2009 23:07:31 -0000	1.146
+++ kdebase-workspace.spec	13 Apr 2009 00:23:36 -0000	1.147
@@ -369,6 +369,9 @@
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
+%if 0%{?have_bluez3}
+%{_kde4_appsdir}/solidfakebluetoothbackend/
+%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 



From rdieter at fedoraproject.org  Mon Apr 13 00:32:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 13 Apr 2009 00:32:25 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.213,1.214
Message-ID: <20090413003225.B054E70124@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4947

Modified Files:
	kdebase-workspace.spec 
Log Message:
sync F-9 mods



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- kdebase-workspace.spec	12 Apr 2009 19:19:05 -0000	1.213
+++ kdebase-workspace.spec	13 Apr 2009 00:31:55 -0000	1.214
@@ -255,8 +255,8 @@
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
-#  -k || make -C %{_target_platform}
+# FIXME: not smp-safe?
+make -C %{_target_platform}
 
 
 %install
@@ -369,6 +369,9 @@
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
+%if 0%{?have_bluez3}
+%{_kde4_appsdir}/solidfakebluetoothbackend/
+%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 



From jgu at fedoraproject.org  Mon Apr 13 00:38:52 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Mon, 13 Apr 2009 00:38:52 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.52, 1.53 shorewall.spec, 1.77,
	1.78 sources, 1.52, 1.53
Message-ID: <20090413003852.28B0F70124@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6671

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Mon Apr 13 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-5
- Update shorewall-perl to version 4.2.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	3 Apr 2009 21:34:56 -0000	1.52
+++ .cvsignore	13 Apr 2009 00:38:21 -0000	1.53
@@ -1,6 +1,6 @@
 shorewall-common-4.2.7.tar.bz2
 shorewall-lite-4.2.7.tar.bz2
-shorewall-perl-4.2.7.1.tar.bz2
+shorewall-perl-4.2.7.3.tar.bz2
 shorewall-shell-4.2.7.tar.bz2
 shorewall6-4.2.7.tar.bz2
 shorewall6-lite-4.2.7.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- shorewall.spec	3 Apr 2009 21:34:56 -0000	1.77
+++ shorewall.spec	13 Apr 2009 00:38:21 -0000	1.78
@@ -3,7 +3,7 @@
 
 %define major_ver 4.2.7
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}.1
+%define perl_ver %{major_ver}.3
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
 %define shorewall6_ver %{major_ver}
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:        %{major_ver}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -407,6 +407,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Mon Apr 13 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-5
+- Update shorewall-perl to version 4.2.7.3
+
 * Fri Apr  3 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-4
 - Update shorewall-perl to version 4.2.7.1 (BZ 493984)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	3 Apr 2009 21:34:56 -0000	1.52
+++ sources	13 Apr 2009 00:38:21 -0000	1.53
@@ -1,6 +1,6 @@
 47f51b083bdea3904ffaf3a3c9317526  shorewall-common-4.2.7.tar.bz2
 7a18ae9de56aa1836e67b394a5176fc4  shorewall-lite-4.2.7.tar.bz2
-6bcf27f5eccd7d24f411e5aa9977ae7e  shorewall-perl-4.2.7.1.tar.bz2
+40f2e1a0b10a5fb40bf177f2653ed38b  shorewall-perl-4.2.7.3.tar.bz2
 c5555ef10e493af3d3ad40785bf33caa  shorewall-shell-4.2.7.tar.bz2
 807c26daac5fd44f263c16205fdeadc1  shorewall6-4.2.7.tar.bz2
 e5546dceab21046ea0f652febe180779  shorewall6-lite-4.2.7.tar.bz2



From jgu at fedoraproject.org  Mon Apr 13 00:41:23 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Mon, 13 Apr 2009 00:41:23 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.75,1.76 sources,1.52,1.53
Message-ID: <20090413004123.CCE8C70124@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7244

Modified Files:
	shorewall.spec sources 
Log Message:
* Mon Apr 13 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-3
- Update shorewall-perl to version 4.2.7.3



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- shorewall.spec	3 Apr 2009 21:39:11 -0000	1.75
+++ shorewall.spec	13 Apr 2009 00:40:52 -0000	1.76
@@ -3,7 +3,7 @@
 
 %define major_ver 4.2.7
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}.1
+%define perl_ver %{major_ver}.3
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
 %define shorewall6_ver %{major_ver}
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:        %{major_ver}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -405,6 +405,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Mon Apr 13 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-3
+- Update shorewall-perl to version 4.2.7.3
+
 * Fri Apr  6 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-2
 - Update shorewall-perl to 4.2.7.1 (BZ 493984)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	3 Apr 2009 21:39:11 -0000	1.52
+++ sources	13 Apr 2009 00:40:53 -0000	1.53
@@ -1,6 +1,6 @@
 47f51b083bdea3904ffaf3a3c9317526  shorewall-common-4.2.7.tar.bz2
 7a18ae9de56aa1836e67b394a5176fc4  shorewall-lite-4.2.7.tar.bz2
-6bcf27f5eccd7d24f411e5aa9977ae7e  shorewall-perl-4.2.7.1.tar.bz2
+40f2e1a0b10a5fb40bf177f2653ed38b  shorewall-perl-4.2.7.3.tar.bz2
 c5555ef10e493af3d3ad40785bf33caa  shorewall-shell-4.2.7.tar.bz2
 807c26daac5fd44f263c16205fdeadc1  shorewall6-4.2.7.tar.bz2
 e5546dceab21046ea0f652febe180779  shorewall6-lite-4.2.7.tar.bz2



From pkgdb at fedoraproject.org  Mon Apr 13 00:46:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 00:46:39 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090413004529.0AE8A10F806@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora devel was orphaned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Mon Apr 13 00:45:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 00:45:35 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090413004536.B624E10F806@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 10 was orphaned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Mon Apr 13 00:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 00:46:55 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090413004542.972AE10F85A@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 9 was orphaned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From salimma at fedoraproject.org  Mon Apr 13 01:35:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 13 Apr 2009 01:35:53 +0000 (UTC)
Subject: rpms/deskbar-applet/devel deskbar-applet-2.26.0-py_sitearch.patch, 
	NONE, 1.1 deskbar-applet.spec, 1.80, 1.81
Message-ID: <20090413013553.D6F9870124@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18756

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-2.26.0-py_sitearch.patch 
Log Message:
* Sun Apr 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-2
- Fix site-packages location for 64-bit platforms


deskbar-applet-2.26.0-py_sitearch.patch:

--- NEW FILE deskbar-applet-2.26.0-py_sitearch.patch ---
--- deskbar-applet-2.26.0/configure.py_sitearch	2009-04-12 21:03:45.569274941 -0400
+++ deskbar-applet-2.26.0/configure	2009-04-12 21:13:12.450525690 -0400
@@ -14354,7 +14354,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- deskbar-applet.spec	8 Apr 2009 13:53:37 -0000	1.80
+++ deskbar-applet.spec	13 Apr 2009 01:35:50 -0000	1.81
@@ -1,9 +1,9 @@
 %{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
-%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           deskbar-applet
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -13,6 +13,7 @@
 Source1:        fedorabz.py
 Source2:        fedorabz.png
 Patch0:         %{name}-2.26.0-gapplet.patch
+Patch1:         %{name}-2.26.0-py_sitearch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
@@ -40,6 +41,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gapplet
+# http://bugzilla.gnome.org/show_activity.cgi?id=578803
+%patch1 -p1 -b .py_sitearch
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -98,7 +101,7 @@
 %{_libdir}/%{name}
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
 %{_libdir}/pkgconfig/%{name}.pc
-%{python_sitelib}/deskbar
+%{python_sitearch}/deskbar
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/omf/deskbar/
@@ -106,6 +109,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-2
+- Fix site-packages location for 64-bit platforms
+
 * Wed Apr  8 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-1
 - Update to 2.26.0
 



From cweyl at fedoraproject.org  Mon Apr 13 02:19:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 13 Apr 2009 02:19:13 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/F-10 perl-CSS-Minifier-XS.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413021914.3131D70124@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier-XS/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27636

Modified Files:
	.cvsignore sources 
Added Files:
	perl-CSS-Minifier-XS.spec 
Log Message:
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission



--- NEW FILE perl-CSS-Minifier-XS.spec ---
Name:       perl-CSS-Minifier-XS 
Version:    0.03 
Release:    1%{?dist}
# lib/CSS/Minifier/XS.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    XS based CSS minifier 
Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/CSS-Minifier-XS
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
'CSS::Minifier::XS' is a CSS "minifier"; it's designed to remove un-
necessary whitespace and comments from CSS files, while also *not*
breaking the CSS. 'CSS::Minifier::XS' is similar in function to
'CSS::Minifier', but is substantially faster as it's written in XS and
not just pure Perl.


%prep
%setup -q -n CSS-Minifier-XS-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:33:45 -0000	1.1
+++ .cvsignore	13 Apr 2009 02:18:41 -0000	1.2
@@ -0,0 +1 @@
+CSS-Minifier-XS-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:33:45 -0000	1.1
+++ sources	13 Apr 2009 02:18:41 -0000	1.2
@@ -0,0 +1 @@
+31522fe802f1dbfbc7e079ab8b70df76  CSS-Minifier-XS-0.03.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 13 02:35:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:35:32 +0000
Subject: [pkgdb] libzzub ownership updated
Message-ID: <20090413023418.AFF2910F806@bastion2.fedora.phx.redhat.com>

Package libzzub in Fedora devel was orphaned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From pkgdb at fedoraproject.org  Mon Apr 13 02:34:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:34:26 +0000
Subject: [pkgdb] libzzub ownership updated
Message-ID: <20090413023426.7A45710F87C@bastion2.fedora.phx.redhat.com>

Package libzzub in Fedora 10 was orphaned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From kyle at fedoraproject.org  Mon Apr 13 02:34:18 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 13 Apr 2009 02:34:18 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc1-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1047, 1.1048 kernel.spec, 1.1513, 1.1514 sources, 1.1009,
	1.1010 upstream, 1.920, 1.921 patch-2.6.30-rc1-git2.bz2.sign,
	1.1, NONE revert-fix-modules_install-via-nfs.patch, 1.1, NONE
Message-ID: <20090413023418.E5B0B70124@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30588

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc1-git5.bz2.sign 
Removed Files:
	patch-2.6.30-rc1-git2.bz2.sign 
	revert-fix-modules_install-via-nfs.patch 
Log Message:
* Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.30-rc1-git5
- revert-fix-modules_install-via-nfs.patch: reverted upstream



--- NEW FILE patch-2.6.30-rc1-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ4TEUyGugalF9Dw4RAt7jAJ9drr3fiEqlFu2NWgxJaiwZSnJ81wCeOaYF
+2qqWGVhIfRDHpWoHCvsEFo=
=UN13
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1047
retrieving revision 1.1048
diff -u -r1.1047 -r1.1048
--- .cvsignore	9 Apr 2009 21:09:52 -0000	1.1047
+++ .cvsignore	13 Apr 2009 02:33:45 -0000	1.1048
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc1.bz2
-patch-2.6.30-rc1-git2.bz2
+patch-2.6.30-rc1-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1513
retrieving revision 1.1514
diff -u -r1.1513 -r1.1514
--- kernel.spec	10 Apr 2009 21:31:49 -0000	1.1513
+++ kernel.spec	13 Apr 2009 02:33:46 -0000	1.1514
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 2
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -673,8 +673,6 @@
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
-Patch9001: revert-fix-modules_install-via-nfs.patch
-
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
@@ -1229,9 +1227,6 @@
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
-# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
-ApplyPatch revert-fix-modules_install-via-nfs.patch
-
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
@@ -1829,6 +1824,10 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc1-git5
+- revert-fix-modules_install-via-nfs.patch: reverted upstream
+
 * Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
 - actually drop utrace-ftrace from srpm.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1009
retrieving revision 1.1010
diff -u -r1.1009 -r1.1010
--- sources	9 Apr 2009 21:09:52 -0000	1.1009
+++ sources	13 Apr 2009 02:33:46 -0000	1.1010
@@ -1,3 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 05daeda25430fd13bbdb47b3481f7320  patch-2.6.30-rc1.bz2
-3de7669e5027d9372ba1804e98ab3807  patch-2.6.30-rc1-git2.bz2
+34427f7c541ea93766ff67fbc7d48863  patch-2.6.30-rc1-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- upstream	9 Apr 2009 21:09:52 -0000	1.920
+++ upstream	13 Apr 2009 02:33:47 -0000	1.921
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc1.bz2
-patch-2.6.30-rc1-git2.bz2
+patch-2.6.30-rc1-git5.bz2


--- patch-2.6.30-rc1-git2.bz2.sign DELETED ---


--- revert-fix-modules_install-via-nfs.patch DELETED ---



From katzj at fedoraproject.org  Mon Apr 13 02:36:48 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Mon, 13 Apr 2009 02:36:48 +0000 (UTC)
Subject: rpms/syslinux/devel .cvsignore, 1.24, 1.25 sources, 1.25,
	1.26 syslinux.spec, 1.57, 1.58
Message-ID: <20090413023648.E1B8C70124@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31197

Modified Files:
	.cvsignore sources syslinux.spec 
Log Message:
* Fri Apr 10 2009 Jeremy Katz <katzj at redhat.com> - 3.74-1
- update to 3.74



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	27 Feb 2009 17:42:23 -0000	1.24
+++ .cvsignore	13 Apr 2009 02:36:18 -0000	1.25
@@ -1 +1 @@
-syslinux-3.73.tar.bz2
+syslinux-3.74.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Feb 2009 17:42:23 -0000	1.25
+++ sources	13 Apr 2009 02:36:18 -0000	1.26
@@ -1 +1 @@
-476d5b2f10b3703de7562a3ec118618e  syslinux-3.73.tar.bz2
+2154fee98c34bc1bd5a14f5d6f4e1f77  syslinux-3.74.tar.bz2


Index: syslinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- syslinux.spec	27 Feb 2009 20:11:06 -0000	1.57
+++ syslinux.spec	13 Apr 2009 02:36:18 -0000	1.58
@@ -1,8 +1,8 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 3.73
-%define tarball_version 3.73
-Release: 2%{?dist}
+Version: 3.74
+%define tarball_version 3.74
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/
@@ -84,6 +84,9 @@
 %{_datadir}/syslinux/com32
 
 %changelog
+* Fri Apr 10 2009 Jeremy Katz <katzj at redhat.com> - 3.74-1
+- update to 3.74
+
 * Fri Feb 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.73-2
 - fix arch issues 
 



From pkgdb at fedoraproject.org  Mon Apr 13 02:39:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:39:07 +0000
Subject: [pkgdb] ibus-hangul: wtogami has requested watchbugzilla
Message-ID: <20090413023753.ADF8910F80B@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchbugzilla acl on ibus-hangul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 02:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:39:12 +0000
Subject: [pkgdb] ibus-hangul: wtogami has requested watchcommits
Message-ID: <20090413023758.5F6AB10F87D@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchcommits acl on ibus-hangul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 02:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:38:14 +0000
Subject: [pkgdb] ibus-hangul: wtogami has requested watchbugzilla
Message-ID: <20090413023814.BE46B10F881@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchbugzilla acl on ibus-hangul (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 02:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:38:03 +0000
Subject: [pkgdb] ibus-hangul: wtogami has requested commit
Message-ID: <20090413023803.9229710F880@bastion2.fedora.phx.redhat.com>

wtogami has requested the commit acl on ibus-hangul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 02:39:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:39:29 +0000
Subject: [pkgdb] ibus-hangul: wtogami has requested watchcommits
Message-ID: <20090413023815.932D910F884@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchcommits acl on ibus-hangul (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 02:38:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 02:38:19 +0000
Subject: [pkgdb] ibus-hangul: wtogami has requested commit
Message-ID: <20090413023819.03B5410F87C@bastion2.fedora.phx.redhat.com>

wtogami has requested the commit acl on ibus-hangul (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From wtogami at fedoraproject.org  Mon Apr 13 02:57:43 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 13 Apr 2009 02:57:43 +0000 (UTC)
Subject: rpms/ibus-hangul/devel
	ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch, NONE,
	1.1 ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch, NONE,
	1.1 ibus-hangul.spec, 1.8, 1.9
Message-ID: <20090413025743.4A74570124@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ibus-hangul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3446

Modified Files:
	ibus-hangul.spec 
Added Files:
	ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch 
	ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch 
Log Message:
- Bug 493706: ibus-hangul Hanja arrow keys are wrong
- Bug 493509: ibus-hangul missing right Ctrl for Hanja button
  These fixes are not ideal, but they make it usable for Fedora 11.
  These must become configurable in a future version.


ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch:

--- NEW FILE ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch ---
diff -urN ibus-hangul-1.1.0.20090328.orig/src/engine.c ibus-hangul-1.1.0.20090328/src/engine.c
--- ibus-hangul-1.1.0.20090328.orig/src/engine.c	2009-04-06 16:21:46.663081165 -0400
+++ ibus-hangul-1.1.0.20090328/src/engine.c	2009-04-06 16:50:00.163321101 -0400
@@ -384,19 +384,19 @@
 
 	ibus_hangul_engine_commit_current_candidate (hangul);
         ibus_hangul_engine_close_lookup_table (hangul);
-    } else if (keyval == IBUS_Left) {
+    } else if (keyval == IBUS_Up) {
         ibus_lookup_table_cursor_up (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Right) {
+    } else if (keyval == IBUS_Down) {
         ibus_lookup_table_cursor_down (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Up) {
+    } else if (keyval == IBUS_Left) {
         ibus_lookup_table_page_up (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Down) {
+    } else if (keyval == IBUS_Right) {
         ibus_lookup_table_page_down (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);

ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch:

--- NEW FILE ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch ---
diff -urN ibus-hangul-1.1.0.20090328.orig/src/engine.c ibus-hangul-1.1.0.20090328/src/engine.c
--- ibus-hangul-1.1.0.20090328.orig/src/engine.c	2009-03-26 01:50:18.000000000 -0400
+++ ibus-hangul-1.1.0.20090328/src/engine.c	2009-04-06 16:20:44.935321507 -0400
@@ -450,7 +450,7 @@
     if (keyval == IBUS_Shift_L || keyval == IBUS_Shift_R)
         return FALSE;
 
-    if (keyval == IBUS_F9 || keyval == IBUS_Hangul_Hanja) {
+    if (keyval == IBUS_F9 || keyval == IBUS_Hangul_Hanja || keyval == IBUS_Control_R) {
 	ibus_hangul_engine_toggle_lookup_table (hangul);
 	return TRUE;
     }


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/ibus-hangul.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ibus-hangul.spec	30 Mar 2009 07:07:19 -0000	1.8
+++ ibus-hangul.spec	13 Apr 2009 02:57:12 -0000	1.9
@@ -1,11 +1,13 @@
 Name:       ibus-hangul
 Version:    1.1.0.20090328
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:     ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch
+Patch1:     ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -47,6 +51,12 @@
 %{_datadir}/ibus/component/*
 
 %changelog
+* Sun Apr 12 2009 Warren Togami <wtogami at redhat.com> - 1.1.0.20090330-2
+- Bug 493706: ibus-hangul Hanja arrow keys are wrong
+- Bug 493509: ibus-hangul missing right Ctrl for Hanja button
+  These fixes are not ideal, but they make it usable for Fedora 11.
+  These must become configurable in a future version.
+
 * Mon Mar 30 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090330-1
 - Update version to 1.1.0.20090330.
 - Fix bug 486056 - missing options for 2bul, 3bul and other Korean layouts



From dcm at fedoraproject.org  Mon Apr 13 02:59:42 2009
From: dcm at fedoraproject.org (David C. Moore)
Date: Mon, 13 Apr 2009 02:59:42 +0000 (UTC)
Subject: rpms/libiptcdata/devel .cvsignore, 1.3, 1.4 libiptcdata.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <20090413025942.3EA4570124@cvs1.fedora.phx.redhat.com>

Author: dcm

Update of /cvs/pkgs/rpms/libiptcdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4021

Modified Files:
	.cvsignore libiptcdata.spec sources 
Log Message:
Updated to version 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiptcdata/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2007 07:25:43 -0000	1.3
+++ .cvsignore	13 Apr 2009 02:59:11 -0000	1.4
@@ -1 +1 @@
-libiptcdata-1.0.2.tar.gz
+libiptcdata-1.0.3.tar.gz


Index: libiptcdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiptcdata/devel/libiptcdata.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libiptcdata.spec	25 Feb 2009 15:55:57 -0000	1.6
+++ libiptcdata.spec	13 Apr 2009 02:59:11 -0000	1.7
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libiptcdata
-Version: 1.0.2
-Release: 5%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Summary: IPTC tag library
 
 Group: Development/Libraries
@@ -64,7 +64,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/*
 %{_libdir}/lib*.so.*
-# %{_datadir}/locale/*/LC_MESSAGES/*.mo
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
 
 %files devel
 %defattr(-,root,root)
@@ -80,6 +80,10 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Sun Apr 12 2009 David Moore <dcm at acm.org> 1.0.3-1
+- New upstream version
+- Added translation to file list
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiptcdata/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2007 07:25:44 -0000	1.3
+++ sources	13 Apr 2009 02:59:11 -0000	1.4
@@ -1 +1 @@
-4ed81889846a5d9b750331f684651f89  libiptcdata-1.0.2.tar.gz
+803ff4c3deb9b4458708c75842cce636  libiptcdata-1.0.3.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:03 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030049.B78DF10F87C@bastion2.fedora.phx.redhat.com>

phuang has set the watchbugzilla acl on ibus-hangul (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:10 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030058.A1A1C10F87D@bastion2.fedora.phx.redhat.com>

phuang has set the commit acl on ibus-hangul (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:10 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030058.B378210F880@bastion2.fedora.phx.redhat.com>

phuang has set the watchcommits acl on ibus-hangul (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:27 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030118.CCE9710F85A@bastion2.fedora.phx.redhat.com>

phuang has set the approveacls acl on ibus-hangul (Fedora devel) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:37 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030123.CE13E10F87E@bastion2.fedora.phx.redhat.com>

phuang has set the watchcommits acl on ibus-hangul (Fedora 10) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:01:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:01:25 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030125.CF6E310F880@bastion2.fedora.phx.redhat.com>

phuang has set the approveacls acl on ibus-hangul (Fedora 10) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:37 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030128.AFFDB10F882@bastion2.fedora.phx.redhat.com>

phuang has set the watchbugzilla acl on ibus-hangul (Fedora 10) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From pkgdb at fedoraproject.org  Mon Apr 13 03:02:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 03:02:42 +0000
Subject: [pkgdb] ibus-hangul had acl change status
Message-ID: <20090413030130.8E27410F886@bastion2.fedora.phx.redhat.com>

phuang has set the commit acl on ibus-hangul (Fedora 10) to Approved for wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-hangul



From mclasen at fedoraproject.org  Mon Apr 13 03:08:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:08:13 +0000 (UTC)
Subject: rpms/sound-juicer/devel .cvsignore, 1.54, 1.55 sound-juicer.spec,
	1.112, 1.113 sources, 1.56, 1.57
Message-ID: <20090413030813.600D570124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5600

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 Mar 2009 20:15:31 -0000	1.54
+++ .cvsignore	13 Apr 2009 03:07:42 -0000	1.55
@@ -1 +1 @@
-sound-juicer-2.26.0.tar.bz2
+sound-juicer-2.26.1.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sound-juicer.spec	17 Mar 2009 20:15:31 -0000	1.112
+++ sound-juicer.spec	13 Apr 2009 03:07:42 -0000	1.113
@@ -7,11 +7,11 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.26.0
+Version:	2.26.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-Source:		http://download.gnome.org/sources/sound-juicer/2.25/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/sound-juicer/2.26/%{name}-%{version}.tar.bz2
 URL:		http://www.burtonini.com/blog/computers/sound-juicer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	cdparanoia
@@ -112,6 +112,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/sound-juicer/2.26/sound-juicer-2.26.1.news
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	17 Mar 2009 20:15:32 -0000	1.56
+++ sources	13 Apr 2009 03:07:42 -0000	1.57
@@ -1 +1 @@
-6dd30f5a8119f9698eabd8220d5c5392  sound-juicer-2.26.0.tar.bz2
+68d085cb577af88553f2dcaf3a0fc2a1  sound-juicer-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 03:14:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:14:27 +0000 (UTC)
Subject: rpms/gnome-mag/devel .cvsignore, 1.35, 1.36 gnome-mag.spec, 1.64,
	1.65 sources, 1.36, 1.37
Message-ID: <20090413031427.9CCC070124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-mag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7919

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.15.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	17 Mar 2009 03:17:20 -0000	1.35
+++ .cvsignore	13 Apr 2009 03:13:56 -0000	1.36
@@ -1 +1 @@
-gnome-mag-0.15.5.tar.bz2
+gnome-mag-0.15.6.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-mag.spec	17 Mar 2009 05:48:53 -0000	1.64
+++ gnome-mag.spec	13 Apr 2009 03:13:57 -0000	1.65
@@ -2,14 +2,12 @@
 
 Summary: Screen magnifier for GNOME
 Name: gnome-mag
-Version: 0.15.5
+Version: 0.15.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-mag/0.15/%{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=562079
-# Patch0: gnome-mag-pixbuf-xlib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: intltool
@@ -41,7 +39,6 @@
 
 %prep
 %setup -q
-# %patch0 -p1 -b .pixbuf-xlib
 
 %build
 %configure
@@ -81,6 +78,10 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.6-1
+- Update to 0.15.6
+- See http://download.gnome.org/sources/gnome-mag/0.15/gnome-mag-0.15.6.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.5-1
 - Update to 0.15.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	17 Mar 2009 03:17:20 -0000	1.36
+++ sources	13 Apr 2009 03:13:57 -0000	1.37
@@ -1 +1 @@
-8d380056b90619f2e0b86e785836fbc4  gnome-mag-0.15.5.tar.bz2
+6f05fc7aa02277c60431a280ba632120  gnome-mag-0.15.6.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 03:21:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:21:25 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.60, 1.61 gnome-keyring.spec, 
	1.121, 1.122 sources, 1.60,
	1.61 gnome-keyring-2.26.0-egg-endless-loop.patch, 1.1,
	NONE gnome-keyring-autostart.patch, 1.1, NONE
Message-ID: <20090413032125.B33EE70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10057

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Removed Files:
	gnome-keyring-2.26.0-egg-endless-loop.patch 
	gnome-keyring-autostart.patch 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	16 Mar 2009 10:43:22 -0000	1.60
+++ .cvsignore	13 Apr 2009 03:20:53 -0000	1.61
@@ -1 +1 @@
-gnome-keyring-2.26.0.tar.bz2
+gnome-keyring-2.26.1.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnome-keyring.spec	9 Apr 2009 03:28:43 -0000	1.121
+++ gnome-keyring.spec	13 Apr 2009 03:20:53 -0000	1.122
@@ -7,17 +7,14 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.26.0
-Release: 4%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=578448
-Patch0: gnome-keyring-autostart.patch
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
@@ -68,7 +65,6 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .activation
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -145,6 +141,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-2.26.1.news
+
 * Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
 - Fix service activation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	16 Mar 2009 10:43:22 -0000	1.60
+++ sources	13 Apr 2009 03:20:53 -0000	1.61
@@ -1 +1 @@
-0395fcf79b990465030a2795dcddacb9  gnome-keyring-2.26.0.tar.bz2
+060b349a0aae130fdd3cd0a9827258c6  gnome-keyring-2.26.1.tar.bz2


--- gnome-keyring-2.26.0-egg-endless-loop.patch DELETED ---


--- gnome-keyring-autostart.patch DELETED ---



From mclasen at fedoraproject.org  Mon Apr 13 03:33:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:33:42 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.122,1.123
Message-ID: <20090413033342.B4FBD70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12439

Modified Files:
	gnome-keyring.spec 
Log Message:
fix file lists



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnome-keyring.spec	13 Apr 2009 03:20:53 -0000	1.122
+++ gnome-keyring.spec	13 Apr 2009 03:33:12 -0000	1.123
@@ -134,6 +134,7 @@
 %{_includedir}/*
 %doc %{_datadir}/gtk-doc/html/gnome-keyring/
 %doc %{_datadir}/gtk-doc/html/gp11/
+%doc %{_datadir}/gtk-doc/html/gcr/
 
 %files pam
 %defattr(-, root, root)



From mclasen at fedoraproject.org  Mon Apr 13 03:38:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:38:27 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.58, 1.59 gcalctool.spec, 1.88,
	1.89 sources, 1.59, 1.60
Message-ID: <20090413033827.EFC2870124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13419

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	17 Mar 2009 03:20:02 -0000	1.58
+++ .cvsignore	13 Apr 2009 03:37:57 -0000	1.59
@@ -1 +1 @@
-gcalctool-5.26.0.tar.bz2
+gcalctool-5.26.1.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gcalctool.spec	17 Mar 2009 03:20:02 -0000	1.88
+++ gcalctool.spec	13 Apr 2009 03:37:57 -0000	1.89
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.26.0
+Version:        5.26.1
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen at redhat.com> - 5.26.1-1
+- Update to 5.26.1
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 5.26.0-1
 - Update to 5.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	17 Mar 2009 03:20:02 -0000	1.59
+++ sources	13 Apr 2009 03:37:57 -0000	1.60
@@ -1 +1 @@
-c2162ac18e9c1dae145cb79e677023c5  gcalctool-5.26.0.tar.bz2
+f21752e7bf18e445367f9ae6e22e73d9  gcalctool-5.26.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 03:48:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:48:34 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.27, 1.28 seahorse.spec, 1.69,
	1.70 sources, 1.29, 1.30
Message-ID: <20090413034834.2879A70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15918

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	16 Mar 2009 10:34:21 -0000	1.27
+++ .cvsignore	13 Apr 2009 03:48:03 -0000	1.28
@@ -1 +1 @@
-seahorse-2.26.0.tar.bz2
+seahorse-2.26.1.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- seahorse.spec	11 Apr 2009 01:37:24 -0000	1.69
+++ seahorse.spec	13 Apr 2009 03:48:03 -0000	1.70
@@ -1,6 +1,6 @@
 Name: 		seahorse
-Version: 	2.26.0
-Release:        2%{?dist}
+Version: 	2.26.1
+Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -38,8 +38,8 @@
 Obsoletes: gnome-keyring-manager
 
 %description
-Seahorse is a graphical interface for managing and using encryption keys. 
-It also integrates with nautilus, gedit and other places for encryption 
+Seahorse is a graphical interface for managing and using encryption keys.
+It also integrates with nautilus, gedit and other places for encryption
 operations.
 
 
@@ -155,6 +155,10 @@
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/seahorse/2.26/seahorse-2.26.1.news
+
 * Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> 2.26.0-2
 - Fix directory ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	16 Mar 2009 10:34:21 -0000	1.29
+++ sources	13 Apr 2009 03:48:03 -0000	1.30
@@ -1 +1 @@
-ddecca2181d4c9f0dfbe412b68508e5d  seahorse-2.26.0.tar.bz2
+f7b6d7755473db01ed1b802b9f3c91d2  seahorse-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 03:54:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 03:54:33 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.26, 1.27 gtksourceview2.spec,
	1.31, 1.32 sources, 1.26, 1.27
Message-ID: <20090413035433.6F24770124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17193

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	16 Mar 2009 20:07:20 -0000	1.26
+++ .cvsignore	13 Apr 2009 03:54:02 -0000	1.27
@@ -1 +1 @@
-gtksourceview-2.6.0.tar.bz2
+gtksourceview-2.6.1.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gtksourceview2.spec	16 Mar 2009 20:07:20 -0000	1.31
+++ gtksourceview2.spec	13 Apr 2009 03:54:02 -0000	1.32
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.6.0
+Version: 2.6.1
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -13,7 +13,6 @@
 URL: http://gtksourceview.sourceforge.net/
 Source0: http://download.gnome.org/sources/gtksourceview/2.6/gtksourceview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gnome-vfs2-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -81,6 +80,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Apr 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1
+- Update to 2.6.1
+- See http://download.gnome.org/sources/gtksourceview/2.6/gtksourceview-2.6.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.6.0-1
 - Update to 2.6.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Mar 2009 20:07:20 -0000	1.26
+++ sources	13 Apr 2009 03:54:02 -0000	1.27
@@ -1 +1 @@
-dd065ab2e96e51aade949249c5556439  gtksourceview-2.6.0.tar.bz2
+e30339b58a5597233ef3163e9fabe2ee  gtksourceview-2.6.1.tar.bz2



From rishi at fedoraproject.org  Mon Apr 13 03:59:13 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 13 Apr 2009 03:59:13 +0000 (UTC)
Subject: rpms/glade3/F-9 glade3.spec,1.19,1.20
Message-ID: <20090413035913.B4D9D70124@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18241

Modified Files:
	glade3.spec 
Log Message:
* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
- Backported fix to prevent a crash when editing a GtkMenuItem. (GNOME Bugzilla
  #533471)
- Added 'Requires: devhelp' to glade3-libgladeui.



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/glade3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- glade3.spec	11 Apr 2009 22:24:14 -0000	1.19
+++ glade3.spec	13 Apr 2009 03:58:43 -0000	1.20
@@ -57,6 +57,8 @@
 License:	GPLv2+ and LGPLv2
 Group:		Development/Libraries
 
+Requires:	devhelp
+
 %description libgladeui
 Libgladeui consists of the widgets that compose the Glade GUI as a separate
 library to ease the integration of Glade into other applications.
@@ -197,8 +199,9 @@
 
 %changelog
 * Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
-- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
+- Backported fix to prevent a crash when editing a GtkMenuItem. (GNOME Bugzilla
   #533471)
+- Added 'Requires: devhelp' to glade3-libgladeui.
 
 * Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)



From rishi at fedoraproject.org  Mon Apr 13 04:02:02 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 13 Apr 2009 04:02:02 +0000 (UTC)
Subject: rpms/glade3/F-10 glade3.spec,1.18,1.19
Message-ID: <20090413040202.3CC6970124@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18941

Modified Files:
	glade3.spec 
Log Message:
* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
- Backported fix to prevent a crash when editing a GtkMenuItem. (GNOME Bugzilla
  #533471)
- Added 'Requires: devhelp' to glade3-libgladeui.



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-10/glade3.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- glade3.spec	11 Apr 2009 22:22:40 -0000	1.18
+++ glade3.spec	13 Apr 2009 04:01:31 -0000	1.19
@@ -57,6 +57,8 @@
 License:	GPLv2+ and LGPLv2
 Group:		Development/Libraries
 
+Requires:	devhelp
+
 %description libgladeui
 Libgladeui consists of the widgets that compose the Glade GUI as a separate
 library to ease the integration of Glade into other applications.
@@ -197,8 +199,9 @@
 
 %changelog
 * Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
-- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
+- Backported fix to prevent a crash when editing a GtkMenuItem. (GNOME Bugzilla
   #533471)
+- Added 'Requires: devhelp' to glade3-libgladeui.
 
 * Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)



From kyle at fedoraproject.org  Mon Apr 13 04:02:48 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 13 Apr 2009 04:02:48 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1514,
	1.1515 linux-2.6-execshield.patch, 1.105, 1.106
Message-ID: <20090413040248.14A0370124@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19099

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
- execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1514
retrieving revision 1.1515
diff -u -r1.1514 -r1.1515
--- kernel.spec	13 Apr 2009 02:33:46 -0000	1.1514
+++ kernel.spec	13 Apr 2009 04:02:16 -0000	1.1515
@@ -1824,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
+- execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)
+
 * Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.30-rc1-git5
 - revert-fix-modules_install-via-nfs.patch: reverted upstream

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- linux-2.6-execshield.patch	6 Apr 2009 17:35:34 -0000	1.105
+++ linux-2.6-execshield.patch	13 Apr 2009 04:02:17 -0000	1.106
@@ -462,7 +462,7 @@
  	}
  }
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 821e970..cc106da 100644
+index 821e970..ea5a4c3 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -6,6 +6,7 @@
@@ -473,12 +473,15 @@
  #include <asm/tlbflush.h>
  #include <asm/mmu_context.h>
  #include <asm/apic.h>
-@@ -129,6 +130,9 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -129,6 +130,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	union smp_flush_state *f;
  
  	cpu = smp_processor_id();
++
++#ifdef CONFIG_X86_32
 +	if (current->active_mm)
 +		load_user_cs_desc(cpu, current->active_mm);
++#endif
 +
  	/*
  	 * orig_rax contains the negated interrupt vector.



From mclasen at fedoraproject.org  Mon Apr 13 04:10:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 04:10:41 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.20, 1.21 gucharmap.spec, 1.34,
	1.35 sources, 1.20, 1.21
Message-ID: <20090413041041.9070C70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20316

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Mar 2009 04:16:54 -0000	1.20
+++ .cvsignore	13 Apr 2009 04:10:10 -0000	1.21
@@ -1 +1 @@
-gucharmap-2.26.0.tar.bz2
+gucharmap-2.26.1.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gucharmap.spec	16 Mar 2009 04:16:54 -0000	1.34
+++ gucharmap.spec	13 Apr 2009 04:10:11 -0000	1.35
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.26.0
+Version:        2.26.1
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -11,14 +11,12 @@
 License:        GPLv2+ and GFDL and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.25/gucharmap-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.26/gucharmap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= 2.13.2
-BuildRequires: libgnome-devel >= 2.13.7
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: gettext
@@ -144,6 +142,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	16 Mar 2009 04:16:54 -0000	1.20
+++ sources	13 Apr 2009 04:10:11 -0000	1.21
@@ -1 +1 @@
-c4384767bd11f43ef997bda7d77600a4  gucharmap-2.26.0.tar.bz2
+8de640fb671b06a2ae554d0d780ea379  gucharmap-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 04:17:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 04:17:30 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.78, 1.79 gnome-applets.spec, 
	1.334, 1.335 sources, 1.88,
	1.89 cpufreq-error-registration-error.patch, 1.1,
	NONE gnome-applets-invest-defs.patch, 1.1,
	NONE mini-commander-https.patch, 1.1, NONE
Message-ID: <20090413041730.877C570124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22318

Modified Files:
	.cvsignore gnome-applets.spec sources 
Removed Files:
	cpufreq-error-registration-error.patch 
	gnome-applets-invest-defs.patch mini-commander-https.patch 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	2 Mar 2009 21:51:24 -0000	1.78
+++ .cvsignore	13 Apr 2009 04:16:59 -0000	1.79
@@ -1 +1 @@
-gnome-applets-2.25.92.tar.bz2
+gnome-applets-2.26.1.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- gnome-applets.spec	29 Mar 2009 17:56:01 -0000	1.334
+++ gnome-applets.spec	13 Apr 2009 04:16:59 -0000	1.335
@@ -34,13 +34,13 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.92
-Release: 	4%{?dist}
+Version:	2.26.1
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
-Source: 	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,15 +61,6 @@
 # and keep the mixer hidden away from the add to panel dialog
 Patch41:	gnome-applets-no-mixer-icon.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=575782
-Patch42:	mini-commander-https.patch
-
-# fixed upstream
-Patch43:	gnome-applets-invest-defs.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=577212
-Patch44:	cpufreq-error-registration-error.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -153,9 +144,6 @@
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .minicommander-https
-%patch43 -p1 -b .invest-defs
-%patch44 -p1 -b .error-registration-error
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -350,6 +338,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+
 * Sun Mar 29 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.92-4
 - Make cpufreq applet work (#492741)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	2 Mar 2009 21:51:24 -0000	1.88
+++ sources	13 Apr 2009 04:17:00 -0000	1.89
@@ -1,2 +1,2 @@
-6c19de60f92fa619892f16dae8ebf238  gnome-applets-2.25.92.tar.bz2
+ef6c44bba892d28b46cf19fcb2e71d61  gnome-applets-2.26.1.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2


--- cpufreq-error-registration-error.patch DELETED ---


--- gnome-applets-invest-defs.patch DELETED ---


--- mini-commander-https.patch DELETED ---



From mclasen at fedoraproject.org  Mon Apr 13 04:35:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 04:35:07 +0000 (UTC)
Subject: rpms/gnome-applets/devel gnome-applets-null-battstat.patch,1.5,1.6
Message-ID: <20090413043507.C0FCF70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24866

Modified Files:
	gnome-applets-null-battstat.patch 
Log Message:
fix patch


gnome-applets-null-battstat.patch:

Index: gnome-applets-null-battstat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-null-battstat.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-applets-null-battstat.patch	4 Feb 2009 02:07:48 -0000	1.5
+++ gnome-applets-null-battstat.patch	13 Apr 2009 04:35:05 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null	2009-02-03 19:10:33.912072100 -0500
-+++ gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in	2009-02-03 20:59:23.000000000 -0500
+diff -up /dev/null gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null	2009-04-12 17:29:07.367057280 -0400
++++ gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in	2009-04-13 00:29:58.095336633 -0400
 @@ -0,0 +1,22 @@
 +<oaf_info>
 +
@@ -24,9 +24,9 @@
 +</oaf_server>
 +
 +</oaf_info>
-diff -up gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null gnome-applets-2.25.90/null_applet/Makefile.am
---- gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null	2009-01-26 19:05:02.000000000 -0500
-+++ gnome-applets-2.25.90/null_applet/Makefile.am	2009-02-03 21:04:50.000000000 -0500
+diff -up gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null gnome-applets-2.26.1/null_applet/Makefile.am
+--- gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null	2009-03-16 19:38:50.000000000 -0400
++++ gnome-applets-2.26.1/null_applet/Makefile.am	2009-04-13 00:29:58.096337117 -0400
 @@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
  mixer_server_in = GNOME_MixerApplet.server.in
  endif
@@ -47,17 +47,15 @@
  	$(mixer_server_in)
  server_DATA = $(server_in_files:.server.in=.server)
  
-diff -up gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null gnome-applets-2.25.90/null_applet/null_applet.c
---- gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null	2009-01-07 00:22:38.000000000 -0500
-+++ gnome-applets-2.25.90/null_applet/null_applet.c	2009-02-03 20:59:23.000000000 -0500
-@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
+diff -up gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null gnome-applets-2.26.1/null_applet/null_applet.c
+--- gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null	2009-04-12 21:09:18.000000000 -0400
++++ gnome-applets-2.26.1/null_applet/null_applet.c	2009-04-13 00:31:10.112337087 -0400
+@@ -44,6 +44,8 @@ insert_oafiids (GHashTable *hash_table)
+ 			     "OAFIID:GNOME_MixerApplet_Factory", _("Volume Control"));
  	g_hash_table_insert (hash_table,
- 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
- 	g_hash_table_insert (hash_table,
--			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
-+			"OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
-+	g_hash_table_insert (hash_table,
-+			     "OAFIID:GNOME_MixerApplet", "Volume Control");
+ 			     "OAFIID:GNOME_MixerApplet", _("Volume Control"));
++        g_hash_table_insert (hash_table,
++                            "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
  }
  
  static gboolean already_running;



From mclasen at fedoraproject.org  Mon Apr 13 04:43:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 04:43:13 +0000 (UTC)
Subject: rpms/gucharmap/devel gucharmap.spec,1.35,1.36
Message-ID: <20090413044313.58CE370124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26559

Modified Files:
	gucharmap.spec 
Log Message:
Fix BRs



Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gucharmap.spec	13 Apr 2009 04:10:11 -0000	1.35
+++ gucharmap.spec	13 Apr 2009 04:42:42 -0000	1.36
@@ -17,6 +17,7 @@
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: GConf2-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: gettext



From rishi at fedoraproject.org  Mon Apr 13 04:46:20 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 13 Apr 2009 04:46:20 +0000 (UTC)
Subject: rpms/anjuta/devel anjuta.spec,1.71,1.72
Message-ID: <20090413044620.C1EE770137@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27321

Modified Files:
	anjuta.spec 
Log Message:
* Mon Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-3
- Added 'Requires: ctags libgda-sqlite >= 3.99.7'. (Red Hat Bugzilla #494423)
- Removed 'Requires: libglade2-devel >= 2.6.3-2 libgnomeui-devel pkgconfig'
  from anjuta-devel.



Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- anjuta.spec	11 Apr 2009 18:16:25 -0000	1.71
+++ anjuta.spec	13 Apr 2009 04:45:50 -0000	1.72
@@ -2,7 +2,7 @@
 Name:		anjuta
 Epoch:		1
 Version:	2.26.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
@@ -15,10 +15,12 @@
 
 Requires:	GConf2
 Requires:	autogen
+Requires:	ctags
 Requires:	git
 Requires:	glade3-libgladeui >= 3.5.7
 Requires:	gnome-icon-theme
 Requires:	hicolor-icon-theme
+Requires:	libgda-sqlite >= 3.99.7
 Requires:	libglade2 >= 2.6.3-2
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -65,9 +67,6 @@
 
 Requires:	gtk-doc
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libgnomeui-devel
-Requires:	libglade2-devel >= 2.6.3-2
-Requires:	pkgconfig
 
 %description devel
 This package contains development files for %{name}.
@@ -323,7 +322,12 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
-* Sat Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-2
+* Mon Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-3
+- Added 'Requires: ctags libgda-sqlite >= 3.99.7'. (Red Hat Bugzilla #494423)
+- Removed 'Requires: libglade2-devel >= 2.6.3-2 libgnomeui-devel pkgconfig'
+  from anjuta-devel.
+
+* Sat Apr 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-2
 - Replaced 'Obsoletes: gnome-build <= 2.24.1-1' with
   'Obsoletes: gnome-build <= 2.24.1-1.fc10'. (Red Hat Bugzilla #485452).
 - Explicitly passed '--enable-scrollkeeper' to configure.



From peter at fedoraproject.org  Mon Apr 13 04:53:35 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 13 Apr 2009 04:53:35 +0000 (UTC)
Subject: rpms/python-pyrad/devel import.log, NONE, 1.1 python-pyrad.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413045335.7DE2B70124@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-pyrad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30068/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pyrad.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-pyrad-1_1-2_fc10:HEAD:python-pyrad-1.1-2.fc10.src.rpm:1239598338


--- NEW FILE python-pyrad.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


%define realname pyrad


Name:		python-%{realname}
Version:	1.1
Release:	2%{?dist}
Summary:	Python RADIUS client
Group:		Development/Languages
License:	BSD
URL:		http://www.wiggy.net/code/pyrad/
Source0:	http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires:	python-twisted-core
BuildArch:	noarch


%description
This is an implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending
them and decoding responses.


%prep
%setup -q -n %{realname}-%{version}
chmod 644 example/acct.py example/auth.py example/server.py


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt example
%{python_sitelib}/%{realname}/
%{python_sitelib}/%{realname}-%{version}-*.egg-info/


%changelog
* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-2
- Fixed rpmling warning
- Changed 'files' section
- Added missing requires python-twisted-core

* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:32:56 -0000	1.1
+++ .cvsignore	13 Apr 2009 04:53:04 -0000	1.2
@@ -0,0 +1 @@
+pyrad-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:32:56 -0000	1.1
+++ sources	13 Apr 2009 04:53:04 -0000	1.2
@@ -0,0 +1 @@
+ab1502f8ccd7409ced757d78b0dee7df  pyrad-1.1.tar.gz



From mclasen at fedoraproject.org  Mon Apr 13 04:53:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 04:53:54 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.79, 1.80 epiphany.spec, 1.225,
	1.226 sources, 1.82, 1.83
Message-ID: <20090413045354.9023B70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29670

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	17 Mar 2009 05:10:55 -0000	1.79
+++ .cvsignore	13 Apr 2009 04:53:23 -0000	1.80
@@ -1 +1 @@
-epiphany-2.26.0.tar.bz2
+epiphany-2.26.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- epiphany.spec	19 Mar 2009 09:41:38 -0000	1.225
+++ epiphany.spec	13 Apr 2009 04:53:24 -0000	1.226
@@ -7,8 +7,8 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 %define major_version 2.26
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -255,6 +255,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/epiphany/2.26/epiphany-2.26.1.changes
+
 * Thu Mar 19 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-2
 - Rebuild against newer gecko
 - Fix the missing headers by patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	17 Mar 2009 05:10:55 -0000	1.82
+++ sources	13 Apr 2009 04:53:24 -0000	1.83
@@ -1 +1 @@
-98043cd7332fd3025e9b69f65904e5a4  epiphany-2.26.0.tar.bz2
+fbe4c76a41983e3d9aaab146b850a93b  epiphany-2.26.1.tar.bz2



From kyle at fedoraproject.org  Mon Apr 13 04:57:47 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 13 Apr 2009 04:57:47 +0000 (UTC)
Subject: rpms/kernel/devel ppc-fix-parport_pc.patch, NONE, 1.1 kernel.spec, 
	1.1515, 1.1516
Message-ID: <20090413045747.4168670124@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31434

Modified Files:
	kernel.spec 
Added Files:
	ppc-fix-parport_pc.patch 
Log Message:
* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
- ppc-fix-parport_pc.patch: add from linuxppc-dev@


ppc-fix-parport_pc.patch:

--- NEW FILE ppc-fix-parport_pc.patch ---
>From linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org Tue Apr  7 23:26:06 2009
Return-path: <linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bombadil.infradead.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL autolearn=ham
	version=3.2.5
Envelope-to: kyle at bombadil.infradead.org
Delivery-date: Wed, 08 Apr 2009 03:26:06 +0000
Received: from casper.infradead.org ([2001:770:15f::2])
	by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux))
	id 1LrOQQ-0006BX-H8
	for kyle at bombadil.infradead.org; Wed, 08 Apr 2009 03:26:06 +0000
Received: from ozlabs.org ([203.10.76.45])
	by casper.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux))
	id 1LrOQI-0002YH-Ls
	for kyle at mcmartin.ca; Wed, 08 Apr 2009 03:26:05 +0000
Received: from ozlabs.org (localhost [127.0.0.1])
	by ozlabs.org (Postfix) with ESMTP id 83E68DE377
	for <kyle at mcmartin.ca>; Wed,  8 Apr 2009 13:25:47 +1000 (EST)
X-Original-To: linuxppc-dev at ozlabs.org
Delivered-To: linuxppc-dev at ozlabs.org
Received: from bilbo.ozlabs.org (bilbo.ozlabs.org [203.10.76.25])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "bilbo.ozlabs.org",
	Issuer "CAcert Class 3 Root" (verified OK))
	by ozlabs.org (Postfix) with ESMTPS id 4A85CDDFB5
	for <linuxppc-dev at ozlabs.org>; Wed,  8 Apr 2009 13:25:29 +1000 (EST)
Received: from thor.ozlabs.ibm.com (localhost [127.0.0.1])
	by bilbo.ozlabs.org (Postfix) with ESMTP id 24C7BB6F3A;
	Wed,  8 Apr 2009 13:25:29 +1000 (EST)
Received: by thor.ozlabs.ibm.com (Postfix, from userid 500)
	id C994F50017; Wed,  8 Apr 2009 13:25:28 +1000 (EST)
To: <linux-kernel at vger.kernel.org>, Alan Cox <alan at lxorguk.ukuu.org.uk>
Message-Id: <aea82416ed6c6805412a2631fe8a8be6420c5c9d.1239161114.git.tony at bakeyournoodle.com>
From: Tony Breeds <tony at bakeyournoodle.com>
Subject: [PATCH] Fix build failure drivers/parport/parport_pc.c for powerpc
Date: Wed,  8 Apr 2009 13:25:28 +1000 (EST)
Cc: linuxppc-dev at ozlabs.org
X-BeenThere: linuxppc-dev at ozlabs.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/options/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev at ozlabs.org>
List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org
Errors-To: linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org

In commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI
IRQ if offered) parport_pc_probe_port() gained an irqflags arg.  This
isn't being supplied on powerpc.  This patch make powerpc fallback to
the old behaviour, that is using "0" for irqflags.

Fixes build failure:
In file included from drivers/parport/parport_pc.c:68:
arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports':
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
make[3]: *** [drivers/parport/parport_pc.o] Error 1

Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
---
 arch/powerpc/include/asm/parport.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/parport.h b/arch/powerpc/include/asm/parport.h
index 414c50e..94942d6 100644
--- a/arch/powerpc/include/asm/parport.h
+++ b/arch/powerpc/include/asm/parport.h
@@ -29,7 +29,7 @@ static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 		prop = of_get_property(np, "interrupts", NULL);
 		if (!prop)
 			continue;
-		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)
+		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL, 0) != NULL)
 			count++;
 	}
 	return count;
-- 
1.6.0.6

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1515
retrieving revision 1.1516
diff -u -r1.1515 -r1.1516
--- kernel.spec	13 Apr 2009 04:02:16 -0000	1.1515
+++ kernel.spec	13 Apr 2009 04:57:15 -0000	1.1516
@@ -673,6 +673,7 @@
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
+Patch9000: ppc-fix-parport_pc.patch
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
@@ -1227,6 +1228,8 @@
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+ApplyPatch ppc-fix-parport_pc.patch
+
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
@@ -1825,6 +1828,9 @@
 #	                ||     ||
 %changelog
 * Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
+- ppc-fix-parport_pc.patch: add from linuxppc-dev@
+
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
 - execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)
 
 * Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>



From mclasen at fedoraproject.org  Mon Apr 13 04:58:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 04:58:06 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel .cvsignore, 1.3, 1.4 gnome-web-photo.spec,
	1.19, 1.20 sources, 1.3, 1.4
Message-ID: <20090413045806.B44B670124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30926

Modified Files:
	.cvsignore gnome-web-photo.spec sources 
Log Message:
0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Mar 2009 08:47:23 -0000	1.3
+++ .cvsignore	13 Apr 2009 04:57:36 -0000	1.4
@@ -1,2 +1 @@
-gnome-web-photo-0.3.tar.bz2
-gnome-web-photo-0.6.tar.bz2
+gnome-web-photo-0.7.tar.bz2


Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-web-photo.spec	25 Mar 2009 08:47:24 -0000	1.19
+++ gnome-web-photo.spec	13 Apr 2009 04:57:36 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
-Version: 0.6
-Release: 2%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.7-1
+- Update to 0.7
+
 * Tue Mar 24 2009 Jan Horak <jhorak at redhat.com> - 0.6-2
 - Fix for rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Mar 2009 14:00:43 -0000	1.3
+++ sources	13 Apr 2009 04:57:36 -0000	1.4
@@ -1 +1 @@
-037e17ca3dfbae7fff7983f43115a7b1  gnome-web-photo-0.6.tar.bz2
+90c556a29ba57b8d1629f21705beba54  gnome-web-photo-0.7.tar.bz2



From peter at fedoraproject.org  Mon Apr 13 04:58:19 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 13 Apr 2009 04:58:19 +0000 (UTC)
Subject: rpms/python-pyrad/F-11 import.log, NONE, 1.1 python-pyrad.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413045819.121D270124@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-pyrad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31593/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pyrad.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-pyrad-1_1-2_fc10:F-11:python-pyrad-1.1-2.fc10.src.rpm:1239598597


--- NEW FILE python-pyrad.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


%define realname pyrad


Name:		python-%{realname}
Version:	1.1
Release:	2%{?dist}
Summary:	Python RADIUS client
Group:		Development/Languages
License:	BSD
URL:		http://www.wiggy.net/code/pyrad/
Source0:	http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires:	python-twisted-core
BuildArch:	noarch


%description
This is an implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending
them and decoding responses.


%prep
%setup -q -n %{realname}-%{version}
chmod 644 example/acct.py example/auth.py example/server.py


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt example
%{python_sitelib}/%{realname}/
%{python_sitelib}/%{realname}-%{version}-*.egg-info/


%changelog
* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-2
- Fixed rpmling warning
- Changed 'files' section
- Added missing requires python-twisted-core

* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:32:56 -0000	1.1
+++ .cvsignore	13 Apr 2009 04:57:47 -0000	1.2
@@ -0,0 +1 @@
+pyrad-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:32:56 -0000	1.1
+++ sources	13 Apr 2009 04:57:48 -0000	1.2
@@ -0,0 +1 @@
+ab1502f8ccd7409ced757d78b0dee7df  pyrad-1.1.tar.gz



From peter at fedoraproject.org  Mon Apr 13 04:59:57 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 13 Apr 2009 04:59:57 +0000 (UTC)
Subject: rpms/python-pyrad/F-10 import.log, NONE, 1.1 python-pyrad.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413045957.B066D70124@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-pyrad/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32482/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pyrad.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-pyrad-1_1-2_fc10:F-10:python-pyrad-1.1-2.fc10.src.rpm:1239598734


--- NEW FILE python-pyrad.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


%define realname pyrad


Name:		python-%{realname}
Version:	1.1
Release:	2%{?dist}
Summary:	Python RADIUS client
Group:		Development/Languages
License:	BSD
URL:		http://www.wiggy.net/code/pyrad/
Source0:	http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires:	python-twisted-core
BuildArch:	noarch


%description
This is an implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending
them and decoding responses.


%prep
%setup -q -n %{realname}-%{version}
chmod 644 example/acct.py example/auth.py example/server.py


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt example
%{python_sitelib}/%{realname}/
%{python_sitelib}/%{realname}-%{version}-*.egg-info/


%changelog
* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-2
- Fixed rpmling warning
- Changed 'files' section
- Added missing requires python-twisted-core

* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:32:56 -0000	1.1
+++ .cvsignore	13 Apr 2009 04:59:27 -0000	1.2
@@ -0,0 +1 @@
+pyrad-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:32:56 -0000	1.1
+++ sources	13 Apr 2009 04:59:27 -0000	1.2
@@ -0,0 +1 @@
+ab1502f8ccd7409ced757d78b0dee7df  pyrad-1.1.tar.gz



From peter at fedoraproject.org  Mon Apr 13 05:04:35 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 13 Apr 2009 05:04:35 +0000 (UTC)
Subject: rpms/python-pyrad/F-9 import.log, NONE, 1.1 python-pyrad.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413050435.863E870124@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-pyrad/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1242/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pyrad.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-pyrad-1_1-2_fc10:F-9:python-pyrad-1.1-2.fc10.src.rpm:1239598905


--- NEW FILE python-pyrad.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


%define realname pyrad


Name:		python-%{realname}
Version:	1.1
Release:	2%{?dist}
Summary:	Python RADIUS client
Group:		Development/Languages
License:	BSD
URL:		http://www.wiggy.net/code/pyrad/
Source0:	http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires:	python-twisted-core
BuildArch:	noarch


%description
This is an implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending
them and decoding responses.


%prep
%setup -q -n %{realname}-%{version}
chmod 644 example/acct.py example/auth.py example/server.py


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt example
%{python_sitelib}/%{realname}/
%{python_sitelib}/%{realname}-%{version}-*.egg-info/


%changelog
* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-2
- Fixed rpmling warning
- Changed 'files' section
- Added missing requires python-twisted-core

* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:32:56 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:04:04 -0000	1.2
@@ -0,0 +1 @@
+pyrad-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:32:56 -0000	1.1
+++ sources	13 Apr 2009 05:04:04 -0000	1.2
@@ -0,0 +1 @@
+ab1502f8ccd7409ced757d78b0dee7df  pyrad-1.1.tar.gz



From peter at fedoraproject.org  Mon Apr 13 05:08:41 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 13 Apr 2009 05:08:41 +0000 (UTC)
Subject: rpms/python-pyrad/EL-5 import.log, NONE, 1.1 python-pyrad.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413050841.356B370124@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-pyrad/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pyrad.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-pyrad-1_1-2_fc10:EL-5:python-pyrad-1.1-2.fc10.src.rpm:1239599171


--- NEW FILE python-pyrad.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


%define realname pyrad


Name:		python-%{realname}
Version:	1.1
Release:	2%{?dist}
Summary:	Python RADIUS client
Group:		Development/Languages
License:	BSD
URL:		http://www.wiggy.net/code/pyrad/
Source0:	http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires:	python-twisted-core
BuildArch:	noarch


%description
This is an implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending
them and decoding responses.


%prep
%setup -q -n %{realname}-%{version}
chmod 644 example/acct.py example/auth.py example/server.py


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt example
%{python_sitelib}/%{realname}/
%{python_sitelib}/%{realname}-%{version}-*.egg-info/


%changelog
* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-2
- Fixed rpmling warning
- Changed 'files' section
- Added missing requires python-twisted-core

* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:32:56 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:08:10 -0000	1.2
@@ -0,0 +1 @@
+pyrad-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:32:56 -0000	1.1
+++ sources	13 Apr 2009 05:08:10 -0000	1.2
@@ -0,0 +1 @@
+ab1502f8ccd7409ced757d78b0dee7df  pyrad-1.1.tar.gz



From mclasen at fedoraproject.org  Mon Apr 13 05:09:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 05:09:16 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.20,1.21
Message-ID: <20090413050916.AF7E870124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2251

Modified Files:
	gnome-web-photo.spec 
Log Message:
fix spec



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-web-photo.spec	13 Apr 2009 04:57:36 -0000	1.20
+++ gnome-web-photo.spec	13 Apr 2009 05:08:46 -0000	1.21
@@ -20,10 +20,10 @@
 BuildRequires: libjpeg-devel
 BuildRequires: gettext intltool
 # Required for the xulrunner patch
-BuildRequires: libtool gnome-common
+# BuildRequires: libtool gnome-common
 
 #Patch0: xulrunner191.patch
-Patch1: gnome-web-photo-0.6-xulfixbuild.patch
+#Patch1: gnome-web-photo-0.6-xulfixbuild.patch
 
 %description
 gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
@@ -33,7 +33,7 @@
 %setup -q
 
 #%patch0 -p1 -b .xulrunner191
-%patch1 -p1 -b .xulfixbuild
+#%patch1 -p1 -b .xulfixbuild
 
 %build
 #autoreconf



From peter at fedoraproject.org  Mon Apr 13 05:12:04 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 13 Apr 2009 05:12:04 +0000 (UTC)
Subject: rpms/python-pyrad/EL-4 import.log, NONE, 1.1 python-pyrad.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413051204.C0CB370124@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-pyrad/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3223/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pyrad.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-pyrad-1_1-2_fc10:EL-4:python-pyrad-1.1-2.fc10.src.rpm:1239599365


--- NEW FILE python-pyrad.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}


%define realname pyrad


Name:		python-%{realname}
Version:	1.1
Release:	2%{?dist}
Summary:	Python RADIUS client
Group:		Development/Languages
License:	BSD
URL:		http://www.wiggy.net/code/pyrad/
Source0:	http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires:	python-twisted-core
BuildArch:	noarch


%description
This is an implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending
them and decoding responses.


%prep
%setup -q -n %{realname}-%{version}
chmod 644 example/acct.py example/auth.py example/server.py


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt example
%{python_sitelib}/%{realname}/
%{python_sitelib}/%{realname}-%{version}-*.egg-info/


%changelog
* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-2
- Fixed rpmling warning
- Changed 'files' section
- Added missing requires python-twisted-core

* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:32:56 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:11:33 -0000	1.2
@@ -0,0 +1 @@
+pyrad-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyrad/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:32:56 -0000	1.1
+++ sources	13 Apr 2009 05:11:34 -0000	1.2
@@ -0,0 +1 @@
+ab1502f8ccd7409ced757d78b0dee7df  pyrad-1.1.tar.gz



From mclasen at fedoraproject.org  Mon Apr 13 05:14:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 05:14:41 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.30,
	1.31 epiphany-extensions.spec, 1.57, 1.58 sources, 1.30, 1.31
Message-ID: <20090413051441.3504270124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3925

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Mar 2009 00:23:06 -0000	1.30
+++ .cvsignore	13 Apr 2009 05:14:10 -0000	1.31
@@ -1 +1 @@
-epiphany-extensions-2.26.0.tar.bz2
+epiphany-extensions-2.26.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- epiphany-extensions.spec	30 Mar 2009 00:23:06 -0000	1.57
+++ epiphany-extensions.spec	13 Apr 2009 05:14:10 -0000	1.58
@@ -4,7 +4,7 @@
 %global gecko_version       1.9.1
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.0
+Version:        %{ephy_major}.1
 Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
+- Update to 2.26.1
+
 * Sun Mar 29 2009 Matthias Clasen <mclasen at redhat.com> 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Mar 2009 00:23:06 -0000	1.30
+++ sources	13 Apr 2009 05:14:10 -0000	1.31
@@ -1 +1 @@
-88f194ed26e8d1cea20b500dc4e1998e  epiphany-extensions-2.26.0.tar.bz2
+bc3044148e915312654f8c82a575e58e  epiphany-extensions-2.26.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 13 05:15:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 05:15:21 +0000 (UTC)
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.31,1.32
Message-ID: <20090413051521.93C2170124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4229

Modified Files:
	rdiff-backup.spec 
Log Message:
Add conditional for egg info file (bug 490341)



Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rdiff-backup.spec	27 Mar 2009 05:26:28 -0000	1.31
+++ rdiff-backup.spec	13 Apr 2009 05:14:49 -0000	1.32
@@ -3,7 +3,7 @@
 Version: 1.2.8
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -53,9 +53,14 @@
 %{python_sitearch}/rdiff_backup/*.pyc
 %{python_sitearch}/rdiff_backup/*.so
 %{python_sitearch}/rdiff_backup/*.pyo
+%if 0%{?fedora} >= 9
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
+%endif
 
 %changelog
+* Sun Apr 12 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.8-2
+- Add conditional for egg info file (bug 490341)
+
 * Thu Mar 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.8-1
 - Update to 1.2.8
 



From iarnell at fedoraproject.org  Mon Apr 13 05:23:04 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:23:04 +0000 (UTC)
Subject: rpms/perl-Number-Format/F-10 perl-Number-Format.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052304.0FDFD70124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Number-Format/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6601/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Number-Format.spec 
Log Message:
initial import


--- NEW FILE perl-Number-Format.spec ---
Name:           perl-Number-Format
Version:        1.70
Release:        1%{?dist}
Summary:        Perl extension for formatting numbers
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Number-Format/
Source0:        http://www.cpan.org/modules/by-module/Number/Number-Format-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides an easy means of formatting numbers in a manner
suitable for displaying to the user.

%prep
%setup -q -n Number-Format-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 1.70-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:27:46 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:22:33 -0000	1.2
@@ -0,0 +1 @@
+Number-Format-1.70.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:27:46 -0000	1.1
+++ sources	13 Apr 2009 05:22:33 -0000	1.2
@@ -0,0 +1 @@
+72fd7eb99086208404b743f53e3e2e12  Number-Format-1.70.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:23:04 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:23:04 +0000 (UTC)
Subject: rpms/perl-Number-Format/F-9 perl-Number-Format.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052304.7AFD570124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Number-Format/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6601/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Number-Format.spec 
Log Message:
initial import


--- NEW FILE perl-Number-Format.spec ---
Name:           perl-Number-Format
Version:        1.70
Release:        1%{?dist}
Summary:        Perl extension for formatting numbers
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Number-Format/
Source0:        http://www.cpan.org/modules/by-module/Number/Number-Format-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides an easy means of formatting numbers in a manner
suitable for displaying to the user.

%prep
%setup -q -n Number-Format-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 1.70-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:27:46 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:22:34 -0000	1.2
@@ -0,0 +1 @@
+Number-Format-1.70.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:27:46 -0000	1.1
+++ sources	13 Apr 2009 05:22:34 -0000	1.2
@@ -0,0 +1 @@
+72fd7eb99086208404b743f53e3e2e12  Number-Format-1.70.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:23:05 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:23:05 +0000 (UTC)
Subject: rpms/perl-Number-Format/devel perl-Number-Format.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052305.1D86E70124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Number-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6601/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Number-Format.spec 
Log Message:
initial import


--- NEW FILE perl-Number-Format.spec ---
Name:           perl-Number-Format
Version:        1.70
Release:        1%{?dist}
Summary:        Perl extension for formatting numbers
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Number-Format/
Source0:        http://www.cpan.org/modules/by-module/Number/Number-Format-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides an easy means of formatting numbers in a manner
suitable for displaying to the user.

%prep
%setup -q -n Number-Format-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 1.70-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:27:46 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:22:34 -0000	1.2
@@ -0,0 +1 @@
+Number-Format-1.70.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:27:46 -0000	1.1
+++ sources	13 Apr 2009 05:22:34 -0000	1.2
@@ -0,0 +1 @@
+72fd7eb99086208404b743f53e3e2e12  Number-Format-1.70.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:26:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:26:06 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf/F-9 perl-Devel-NYTProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052606.0339D70124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7332/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-NYTProf.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-NYTProf.spec ---
Name:           perl-Devel-NYTProf
Version:        2.09
Release:        1%{?dist}
Summary:        Powerful feature-rich perl source code profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-NYTProf/
Source0:        http://www.cpan.org/authors/id/T/TI/TIMB/Devel-NYTProf-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Devel::NYTProf is a powerful feature-rich perl source code profiler.

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Devel-NYTProf-%{version}

# fix perftest.pl shebang
sed -i -e 's~#!perl~#!/usr/bin/perl~' perftest.pl

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

# remove perftest.pl and benchmark.pl - installed as docs
find $RPM_BUILD_ROOT -type f -name 'benchmark.pl' -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name 'perftest.pl' -exec rm -f {} \;

# remove duplicate installed lib in wrong location
rm -rf $RPM_BUILD_ROOT/%{perl_vendorarch}/Devel/auto/

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes HACKING README *.pl demo
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Devel*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
- update to latest upstream

* Tue Mar 17 2009 Iain Arnell 2.08-1
- Specfile autogenerated by cpanspec 1.77.
- strip private perl libs from provides
- add scripts and man pages to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:31:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:25:35 -0000	1.2
@@ -0,0 +1 @@
+Devel-NYTProf-2.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:31:59 -0000	1.1
+++ sources	13 Apr 2009 05:25:35 -0000	1.2
@@ -0,0 +1 @@
+2bd0f5fc881fe581b35c11e615cf9ec1  Devel-NYTProf-2.09.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:26:05 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:26:05 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf/F-10 perl-Devel-NYTProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052605.5810E70124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7332/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-NYTProf.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-NYTProf.spec ---
Name:           perl-Devel-NYTProf
Version:        2.09
Release:        1%{?dist}
Summary:        Powerful feature-rich perl source code profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-NYTProf/
Source0:        http://www.cpan.org/authors/id/T/TI/TIMB/Devel-NYTProf-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Devel::NYTProf is a powerful feature-rich perl source code profiler.

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Devel-NYTProf-%{version}

# fix perftest.pl shebang
sed -i -e 's~#!perl~#!/usr/bin/perl~' perftest.pl

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

# remove perftest.pl and benchmark.pl - installed as docs
find $RPM_BUILD_ROOT -type f -name 'benchmark.pl' -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name 'perftest.pl' -exec rm -f {} \;

# remove duplicate installed lib in wrong location
rm -rf $RPM_BUILD_ROOT/%{perl_vendorarch}/Devel/auto/

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes HACKING README *.pl demo
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Devel*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
- update to latest upstream

* Tue Mar 17 2009 Iain Arnell 2.08-1
- Specfile autogenerated by cpanspec 1.77.
- strip private perl libs from provides
- add scripts and man pages to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:31:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:25:34 -0000	1.2
@@ -0,0 +1 @@
+Devel-NYTProf-2.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:31:59 -0000	1.1
+++ sources	13 Apr 2009 05:25:34 -0000	1.2
@@ -0,0 +1 @@
+2bd0f5fc881fe581b35c11e615cf9ec1  Devel-NYTProf-2.09.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:26:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:26:06 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf/devel perl-Devel-NYTProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052606.C3C0070124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7332/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-NYTProf.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-NYTProf.spec ---
Name:           perl-Devel-NYTProf
Version:        2.09
Release:        1%{?dist}
Summary:        Powerful feature-rich perl source code profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-NYTProf/
Source0:        http://www.cpan.org/authors/id/T/TI/TIMB/Devel-NYTProf-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Devel::NYTProf is a powerful feature-rich perl source code profiler.

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Devel-NYTProf-%{version}

# fix perftest.pl shebang
sed -i -e 's~#!perl~#!/usr/bin/perl~' perftest.pl

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

# remove perftest.pl and benchmark.pl - installed as docs
find $RPM_BUILD_ROOT -type f -name 'benchmark.pl' -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name 'perftest.pl' -exec rm -f {} \;

# remove duplicate installed lib in wrong location
rm -rf $RPM_BUILD_ROOT/%{perl_vendorarch}/Devel/auto/

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes HACKING README *.pl demo
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Devel*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell <iarnell at gmail.com> 2.09-1
- update to latest upstream

* Tue Mar 17 2009 Iain Arnell 2.08-1
- Specfile autogenerated by cpanspec 1.77.
- strip private perl libs from provides
- add scripts and man pages to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:31:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:25:35 -0000	1.2
@@ -0,0 +1 @@
+Devel-NYTProf-2.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:31:59 -0000	1.1
+++ sources	13 Apr 2009 05:25:36 -0000	1.2
@@ -0,0 +1 @@
+2bd0f5fc881fe581b35c11e615cf9ec1  Devel-NYTProf-2.09.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:28:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:28:10 +0000 (UTC)
Subject: rpms/perl-Sort-Key/F-10 perl-Sort-Key.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052810.3A82570124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Sort-Key/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7910/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Sort-Key.spec 
Log Message:
initial import


--- NEW FILE perl-Sort-Key.spec ---
Name:           perl-Sort-Key
Version:        1.28
Release:        1%{?dist}
Summary:        Fastest way to sort anything in Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Sort-Key/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Sort-Key-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.54
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Sort::Key provides a set of functions to sort lists of values by some
calculated key value.

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Sort-Key-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Sort*
%{_mandir}/man3/*

%changelog
* Sat Apr 11 2009 Iain Arnell 1.28-1
- Specfile autogenerated by cpanspec 1.77.
- don't provide private Perl libs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Key/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:35:37 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:27:39 -0000	1.2
@@ -0,0 +1 @@
+Sort-Key-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Key/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:35:37 -0000	1.1
+++ sources	13 Apr 2009 05:27:39 -0000	1.2
@@ -0,0 +1 @@
+ec9d003d68784a5643815c65124aad18  Sort-Key-1.28.tar.gz



From iarnell at fedoraproject.org  Mon Apr 13 05:28:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:28:10 +0000 (UTC)
Subject: rpms/perl-Sort-Key/devel perl-Sort-Key.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413052810.8926370124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Sort-Key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7910/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Sort-Key.spec 
Log Message:
initial import


--- NEW FILE perl-Sort-Key.spec ---
Name:           perl-Sort-Key
Version:        1.28
Release:        1%{?dist}
Summary:        Fastest way to sort anything in Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Sort-Key/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Sort-Key-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.54
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Sort::Key provides a set of functions to sort lists of values by some
calculated key value.

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Sort-Key-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Sort*
%{_mandir}/man3/*

%changelog
* Sat Apr 11 2009 Iain Arnell 1.28-1
- Specfile autogenerated by cpanspec 1.77.
- don't provide private Perl libs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Key/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:35:37 -0000	1.1
+++ .cvsignore	13 Apr 2009 05:27:40 -0000	1.2
@@ -0,0 +1 @@
+Sort-Key-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Key/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:35:37 -0000	1.1
+++ sources	13 Apr 2009 05:27:40 -0000	1.2
@@ -0,0 +1 @@
+ec9d003d68784a5643815c65124aad18  Sort-Key-1.28.tar.gz



From pgordon at fedoraproject.org  Mon Apr 13 05:30:11 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 13 Apr 2009 05:30:11 +0000 (UTC)
Subject: rpms/telepathy-haze/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 telepathy-haze.spec, 1.14, 1.15
Message-ID: <20090413053011.7992670124@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8488

Modified Files:
	.cvsignore sources telepathy-haze.spec 
Log Message:
Update to new upstream release (0.3.0)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Sep 2008 18:39:16 -0000	1.6
+++ .cvsignore	13 Apr 2009 05:29:40 -0000	1.7
@@ -1 +1 @@
-telepathy-haze-0.2.1.tar.gz
+telepathy-haze-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Sep 2008 18:39:16 -0000	1.6
+++ sources	13 Apr 2009 05:29:40 -0000	1.7
@@ -1 +1 @@
-6da0d8194848be0fe95cae6d49cce112  telepathy-haze-0.2.1.tar.gz
+3d5528baa98f5e8151d2b740ff69cc85  telepathy-haze-0.3.0.tar.gz


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- telepathy-haze.spec	25 Feb 2009 19:38:51 -0000	1.14
+++ telepathy-haze.spec	13 Apr 2009 05:29:40 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
-Version:	0.2.1
-Release:	2%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -12,7 +12,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel
-BuildRequires:	telepathy-glib-devel
+BuildRequires:	telepathy-glib-devel >= 0.7.21
   
 Requires:	telepathy-filesystem    
 
@@ -51,6 +51,9 @@
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Sun Apr 12 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.0-1
+- Update to new upstream release (0.3.0)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Mon Apr 13 05:32:40 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 05:32:40 +0000 (UTC)
Subject: rpms/alevt/devel alevt-1.6.2-rus-greek.patch,1.1,1.2
Message-ID: <20090413053240.0B17370124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9300

Modified Files:
	alevt-1.6.2-rus-greek.patch 
Log Message:
fix wrongly converted chars in patch2

alevt-1.6.2-rus-greek.patch:

Index: alevt-1.6.2-rus-greek.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt-1.6.2-rus-greek.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-rus-greek.patch	10 Apr 2009 12:48:12 -0000	1.1
+++ alevt-1.6.2-rus-greek.patch	13 Apr 2009 05:32:39 -0000	1.2
@@ -240,7 +240,7 @@
 +
 +      c= *p;
 +      if ( (c >= 0x40) && (c <= 0x7f)) *p=l2koi[(c & 0x7f) - 0x40];
-+      if (c=='&') *p='???';
++      if (c=='&') *p='??';
 +}
 +/* teletext to iso8859-7 conversion */
 +void
@@ -258,69 +258,69 @@
 +    };
 +*/
 +   static u8 l2greek[]={
-+/* 1 @ 0x40->???*/0xc0,
-+/* 2 A 0x41->???*/0xc1,
-+/* 3 B 0x42->???*/0xc2,
-+/* 4 C 0x43->???*/0xc3,
-+/* 5 D 0x44->???*/0xc4,
-+/* 6 E 0x45->???*/0xc5,
-+/* 7 F 0x46->???*/0xc6,
-+/* 8 G 0x47->???*/0xc7,
-+/* 9 H 0x48->???*/0xc8,
-+/*10 I 0x49->???*/0xc9,
-+/*11 J 0x4a->???*/0xca,
-+/*12 K 0x4b->???*/0xcb,
-+/*13 L 0x4c->???*/0xcc,
-+/*14 M 0x4d->???*/0xcd,
-+/*15 N 0x4e->???*/0xce,
-+/*16 O 0x4f->???*/0xcf,
-+/*17 P 0x50->???*/0xd0,
-+/*18 Q 0x51->???*/0xd1,
++/* 1 @ 0x40->??*/0xc0,
++/* 2 A 0x41->??*/0xc1,
++/* 3 B 0x42->??*/0xc2,
++/* 4 C 0x43->??*/0xc3,
++/* 5 D 0x44->??*/0xc4,
++/* 6 E 0x45->??*/0xc5,
++/* 7 F 0x46->??*/0xc6,
++/* 8 G 0x47->??*/0xc7,
++/* 9 H 0x48->??*/0xc8,
++/*10 I 0x49->??*/0xc9,
++/*11 J 0x4a->??*/0xca,
++/*12 K 0x4b->??*/0xcb,
++/*13 L 0x4c->??*/0xcc,
++/*14 M 0x4d->??*/0xcd,
++/*15 N 0x4e->??*/0xce,
++/*16 O 0x4f->??*/0xcf,
++/*17 P 0x50->??*/0xd0,
++/*18 Q 0x51->??*/0xd1,
 +/*19 R 0x52->?*/0x52,
-+/*20 S 0x53->???*/0xd3,
-+/*21 T 0x54->???*/0xd4,
-+/*22 U 0x55->???*/0xd5,
-+/*23 V 0x56->???*/0xd6,
-+/*24 W 0x57->???*/0xd7,
-+/*25 X 0x58->???*/0xd8,
-+/*26 Y 0x59->???*/0xd9,
++/*20 S 0x53->??*/0xd3,
++/*21 T 0x54->??*/0xd4,
++/*22 U 0x55->??*/0xd5,
++/*23 V 0x56->??*/0xd6,
++/*24 W 0x57->??*/0xd7,
++/*25 X 0x58->??*/0xd8,
++/*26 Y 0x59->??*/0xd9,
 +/*27 Z 0x5a->?*/0x5a,
 +/*28 [ 0x5b->?*/0x5b,
-+/*!29 \ 0x5c->???*/0xdc,
-+/*!30 ] 0x5d->???*/0xdd,
-+/*!31 ^ 0x5e->???*/0xde,
-+/*!32 _ 0x5f->???*/0xdf,
++/*!29 \ 0x5c->??*/0xdc,
++/*!30 ] 0x5d->??*/0xdd,
++/*!31 ^ 0x5e->??*/0xde,
++/*!32 _ 0x5f->??*/0xdf,
 +/*33 ` 0x60->?*/0x60,
-+/*!34 a 0x61->???*/0xe1,
-+/*!35 b 0x62->???*/0xe2,
-+/*!36 c 0x63->???*/0xe3,
-+/*!37 d 0x64->???*/0xe4,
-+/*!38 e 0x65->???*/0xe5,
-+/*!39 f 0x66->???*/0xe6,
-+/*!40 g 0x67->???*/0xe7,
-+/*!41 h 0x68->???*/0xe8,
-+/*!42 i 0x69->???*/0xe9,
-+/*!43 j 0x6a->???*/0xea,
-+/*!44 k 0x6b->???*/0xeb,
-+/*!45 l 0x6c->???*/0xec,
-+/*!46 m 0x6d->???*/0xed,
-+/*!47 n 0x6e->???*/0xee,
-+/*!48 o 0x6f->???*/0xef,
-+/*!49 p 0x70->???*/0xf0,
-+/*!50 q 0x71->???*/0xf1,
-+/*!51 r 0x72->???*/0xf2,
-+/*!52 s 0x73->???*/0xf3,
-+/*!53 t 0x74->???*/0xf4,
-+/*!54 u 0x75->???*/0xf5,
-+/*!55 v 0x76->???*/0xf6,
-+/*!56 w 0x77->???*/0xf7,
-+/*!57 x 0x78->???*/0xf8,
-+/*!58 y 0x79->???*/0xf9,
-+/*59 z 0x7a->???(?????? ????????????)*/0xc0,
++/*!34 a 0x61->??*/0xe1,
++/*!35 b 0x62->??*/0xe2,
++/*!36 c 0x63->??*/0xe3,
++/*!37 d 0x64->??*/0xe4,
++/*!38 e 0x65->??*/0xe5,
++/*!39 f 0x66->??*/0xe6,
++/*!40 g 0x67->??*/0xe7,
++/*!41 h 0x68->??*/0xe8,
++/*!42 i 0x69->??*/0xe9,
++/*!43 j 0x6a->??*/0xea,
++/*!44 k 0x6b->??*/0xeb,
++/*!45 l 0x6c->??*/0xec,
++/*!46 m 0x6d->??*/0xed,
++/*!47 n 0x6e->??*/0xee,
++/*!48 o 0x6f->??*/0xef,
++/*!49 p 0x70->??*/0xf0,
++/*!50 q 0x71->??*/0xf1,
++/*!51 r 0x72->??*/0xf2,
++/*!52 s 0x73->??*/0xf3,
++/*!53 t 0x74->??*/0xf4,
++/*!54 u 0x75->??*/0xf5,
++/*!55 v 0x76->??*/0xf6,
++/*!56 w 0x77->??*/0xf7,
++/*!57 x 0x78->??*/0xf8,
++/*!58 y 0x79->??*/0xf9,
++/*59 z 0x7a->??(???? ????????)*/0xc0,
 +/*60 { 0x7b->?*/0x7b,
-+/*!61 | 0x7c->???*/0xfc,
-+/*!62 } 0x7d->???*/0xfd,
-+/*!63 ~ 0x7e->???*/0xfe,
++/*!61 | 0x7c->??*/0xfc,
++/*!62 } 0x7d->??*/0xfd,
++/*!63 ~ 0x7e->??*/0xfe,
 +/*64   0x7f->?*/0x7f
 +  };
 +      c= *p;
@@ -488,32 +488,32 @@
 @@ -0,0 +1,28 @@
 +29-9-2003
 +
-+???????????????????????? ????????? ?????? ALEVT 
-+??? ???????????????????????? ??????????????????????????? ??????????????? ??????????????????????????????????????? ?????? patch alevt-1.6.1.rus.diff ????????? ???????????????????????? ????????? ??????????????????
-+contrib ????????? sources  ????????? alevt-1.6.1
++???????????????? ?????? ???? ALEVT 
++?? ???????????????? ?????????????????? ?????????? ?????????????????????????? ???? patch alevt-1.6.1.rus.diff ?????? ???????????????? ?????? ????????????
++contrib ?????? sources  ?????? alevt-1.6.1
 +
-+??????????????????????????? ?????? ??????????????????????????? ?????? ????????? ??????????????????????????? 
++?????????????????? ???? ?????????????????? ???? ?????? ?????????????????? 
 +
 +alevt -charset iso8859-7 
 +
-+??? 
++?? 
 +
 +alevt -charset el
 +
-+???????????????????????? ????????? ??????????????? ?????? ??????????????????:
-+??????????????????????????? ?????????????????????????????? ????????? font file vtxt-iso8859-7.bdf 
-+?????? ???????????????????????? ?????????????????????????????? ???????????????????????? ????????? bold ?????? ??????????????? ?????? ???????????? ?????????????????????????????? ????????? ???????????????????????? 
-+?????????????????? ??????????????? ??????????????????????????????????????? ?????? ???????????? graphics  (0x01 -0x1f)
++???????????????? ?????? ?????????? ???? ????????????:
++?????????????????? ???????????????????? ?????? font file vtxt-iso8859-7.bdf 
++???? ???????????????? ???????????????????? ???????????????? ?????? bold ???? ?????????? ???? ???????? ???????????????????? ?????? ???????????????? 
++???????????? ?????????? ?????????????????????????? ???? ???????? graphics  (0x01 -0x1f)
 +
-+????????????????????? ????????? ?????? ?????? ?????????????????????????????????????????? ??????????????? ???????????? ?????? ??????????????????????????????
++??????????????? ?????? ???? ???? ???????????????????????????? ?????????? ???????? ???? ????????????????????
 +
-+?????????????????? ??????????????? ?????? ???????????????????????? ???????????????????????? ?????? ????????? ????????????????????? ????????? ????????????????????? ????????? ????????? sl45sms at yahoo.gr
-+?????? ????????????????????? ??????????????? ????????????????????????????????? ????????????????????? ????????? ????????? ????????????????????? ?????? ???????????????????????? ?????? ?????????????????? ?????? ????????? ????????????????????? ?????????
-+???????????? ??????????????????????????? ????????? ????????????????????????????????????
++????????????? ?????????? ???? ???????????????? ???????????????? ???? ?????? ?????????????? ?????? ?????????????? ?????? ?????? sl45sms at yahoo.gr
++???? ?????????????? ?????????? ?????????????????????? ?????????????? ?????? ?????? ?????????????? ???? ???????????????? ???? ???????????? ???? ?????? ?????????????? ??????
++???????? ?????????????????? ?????? ????????????????????????
 +
-+????????????????????? ?????????????????? ????????? ???????????????????????? ?????? ???????????????????????? ?????? ???????????????????????? ?????????  http://go.to/sl45sms/alevt/index.html
++?????????????? ???????????? ?????? ???????????????? ???? ???????????????? ???? ???????????????? ??????  http://go.to/sl45sms/alevt/index.html
 +
-+??????????????????????????? ??????????????????????????????
++?????????????????? ????????????????????
 diff -Nur alevt-1.6.2/vbi.c alevt-1.6.2.rus+greek/vbi.c
 --- alevt-1.6.2/vbi.c	2007-12-03 10:02:00.000000000 +0300
 +++ alevt-1.6.2.rus+greek/vbi.c	2009-04-10 06:59:25.000000000 +0400



From lucilanga at fedoraproject.org  Mon Apr 13 05:34:19 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 05:34:19 +0000 (UTC)
Subject: rpms/alevt/F-9 alevt-1.6.2-rus-greek.patch,1.1,1.2
Message-ID: <20090413053419.9D5C870124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9829

Modified Files:
	alevt-1.6.2-rus-greek.patch 
Log Message:
fix wrongly converted chars in patch2

alevt-1.6.2-rus-greek.patch:

Index: alevt-1.6.2-rus-greek.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt-1.6.2-rus-greek.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-rus-greek.patch	10 Apr 2009 13:35:00 -0000	1.1
+++ alevt-1.6.2-rus-greek.patch	13 Apr 2009 05:34:19 -0000	1.2
@@ -240,7 +240,7 @@
 +
 +      c= *p;
 +      if ( (c >= 0x40) && (c <= 0x7f)) *p=l2koi[(c & 0x7f) - 0x40];
-+      if (c=='&') *p='???';
++      if (c=='&') *p='??';
 +}
 +/* teletext to iso8859-7 conversion */
 +void
@@ -258,69 +258,69 @@
 +    };
 +*/
 +   static u8 l2greek[]={
-+/* 1 @ 0x40->???*/0xc0,
-+/* 2 A 0x41->???*/0xc1,
-+/* 3 B 0x42->???*/0xc2,
-+/* 4 C 0x43->???*/0xc3,
-+/* 5 D 0x44->???*/0xc4,
-+/* 6 E 0x45->???*/0xc5,
-+/* 7 F 0x46->???*/0xc6,
-+/* 8 G 0x47->???*/0xc7,
-+/* 9 H 0x48->???*/0xc8,
-+/*10 I 0x49->???*/0xc9,
-+/*11 J 0x4a->???*/0xca,
-+/*12 K 0x4b->???*/0xcb,
-+/*13 L 0x4c->???*/0xcc,
-+/*14 M 0x4d->???*/0xcd,
-+/*15 N 0x4e->???*/0xce,
-+/*16 O 0x4f->???*/0xcf,
-+/*17 P 0x50->???*/0xd0,
-+/*18 Q 0x51->???*/0xd1,
++/* 1 @ 0x40->??*/0xc0,
++/* 2 A 0x41->??*/0xc1,
++/* 3 B 0x42->??*/0xc2,
++/* 4 C 0x43->??*/0xc3,
++/* 5 D 0x44->??*/0xc4,
++/* 6 E 0x45->??*/0xc5,
++/* 7 F 0x46->??*/0xc6,
++/* 8 G 0x47->??*/0xc7,
++/* 9 H 0x48->??*/0xc8,
++/*10 I 0x49->??*/0xc9,
++/*11 J 0x4a->??*/0xca,
++/*12 K 0x4b->??*/0xcb,
++/*13 L 0x4c->??*/0xcc,
++/*14 M 0x4d->??*/0xcd,
++/*15 N 0x4e->??*/0xce,
++/*16 O 0x4f->??*/0xcf,
++/*17 P 0x50->??*/0xd0,
++/*18 Q 0x51->??*/0xd1,
 +/*19 R 0x52->?*/0x52,
-+/*20 S 0x53->???*/0xd3,
-+/*21 T 0x54->???*/0xd4,
-+/*22 U 0x55->???*/0xd5,
-+/*23 V 0x56->???*/0xd6,
-+/*24 W 0x57->???*/0xd7,
-+/*25 X 0x58->???*/0xd8,
-+/*26 Y 0x59->???*/0xd9,
++/*20 S 0x53->??*/0xd3,
++/*21 T 0x54->??*/0xd4,
++/*22 U 0x55->??*/0xd5,
++/*23 V 0x56->??*/0xd6,
++/*24 W 0x57->??*/0xd7,
++/*25 X 0x58->??*/0xd8,
++/*26 Y 0x59->??*/0xd9,
 +/*27 Z 0x5a->?*/0x5a,
 +/*28 [ 0x5b->?*/0x5b,
-+/*!29 \ 0x5c->???*/0xdc,
-+/*!30 ] 0x5d->???*/0xdd,
-+/*!31 ^ 0x5e->???*/0xde,
-+/*!32 _ 0x5f->???*/0xdf,
++/*!29 \ 0x5c->??*/0xdc,
++/*!30 ] 0x5d->??*/0xdd,
++/*!31 ^ 0x5e->??*/0xde,
++/*!32 _ 0x5f->??*/0xdf,
 +/*33 ` 0x60->?*/0x60,
-+/*!34 a 0x61->???*/0xe1,
-+/*!35 b 0x62->???*/0xe2,
-+/*!36 c 0x63->???*/0xe3,
-+/*!37 d 0x64->???*/0xe4,
-+/*!38 e 0x65->???*/0xe5,
-+/*!39 f 0x66->???*/0xe6,
-+/*!40 g 0x67->???*/0xe7,
-+/*!41 h 0x68->???*/0xe8,
-+/*!42 i 0x69->???*/0xe9,
-+/*!43 j 0x6a->???*/0xea,
-+/*!44 k 0x6b->???*/0xeb,
-+/*!45 l 0x6c->???*/0xec,
-+/*!46 m 0x6d->???*/0xed,
-+/*!47 n 0x6e->???*/0xee,
-+/*!48 o 0x6f->???*/0xef,
-+/*!49 p 0x70->???*/0xf0,
-+/*!50 q 0x71->???*/0xf1,
-+/*!51 r 0x72->???*/0xf2,
-+/*!52 s 0x73->???*/0xf3,
-+/*!53 t 0x74->???*/0xf4,
-+/*!54 u 0x75->???*/0xf5,
-+/*!55 v 0x76->???*/0xf6,
-+/*!56 w 0x77->???*/0xf7,
-+/*!57 x 0x78->???*/0xf8,
-+/*!58 y 0x79->???*/0xf9,
-+/*59 z 0x7a->???(?????? ????????????)*/0xc0,
++/*!34 a 0x61->??*/0xe1,
++/*!35 b 0x62->??*/0xe2,
++/*!36 c 0x63->??*/0xe3,
++/*!37 d 0x64->??*/0xe4,
++/*!38 e 0x65->??*/0xe5,
++/*!39 f 0x66->??*/0xe6,
++/*!40 g 0x67->??*/0xe7,
++/*!41 h 0x68->??*/0xe8,
++/*!42 i 0x69->??*/0xe9,
++/*!43 j 0x6a->??*/0xea,
++/*!44 k 0x6b->??*/0xeb,
++/*!45 l 0x6c->??*/0xec,
++/*!46 m 0x6d->??*/0xed,
++/*!47 n 0x6e->??*/0xee,
++/*!48 o 0x6f->??*/0xef,
++/*!49 p 0x70->??*/0xf0,
++/*!50 q 0x71->??*/0xf1,
++/*!51 r 0x72->??*/0xf2,
++/*!52 s 0x73->??*/0xf3,
++/*!53 t 0x74->??*/0xf4,
++/*!54 u 0x75->??*/0xf5,
++/*!55 v 0x76->??*/0xf6,
++/*!56 w 0x77->??*/0xf7,
++/*!57 x 0x78->??*/0xf8,
++/*!58 y 0x79->??*/0xf9,
++/*59 z 0x7a->??(???? ????????)*/0xc0,
 +/*60 { 0x7b->?*/0x7b,
-+/*!61 | 0x7c->???*/0xfc,
-+/*!62 } 0x7d->???*/0xfd,
-+/*!63 ~ 0x7e->???*/0xfe,
++/*!61 | 0x7c->??*/0xfc,
++/*!62 } 0x7d->??*/0xfd,
++/*!63 ~ 0x7e->??*/0xfe,
 +/*64   0x7f->?*/0x7f
 +  };
 +      c= *p;
@@ -488,32 +488,32 @@
 @@ -0,0 +1,28 @@
 +29-9-2003
 +
-+???????????????????????? ????????? ?????? ALEVT 
-+??? ???????????????????????? ??????????????????????????? ??????????????? ??????????????????????????????????????? ?????? patch alevt-1.6.1.rus.diff ????????? ???????????????????????? ????????? ??????????????????
-+contrib ????????? sources  ????????? alevt-1.6.1
++???????????????? ?????? ???? ALEVT 
++?? ???????????????? ?????????????????? ?????????? ?????????????????????????? ???? patch alevt-1.6.1.rus.diff ?????? ???????????????? ?????? ????????????
++contrib ?????? sources  ?????? alevt-1.6.1
 +
-+??????????????????????????? ?????? ??????????????????????????? ?????? ????????? ??????????????????????????? 
++?????????????????? ???? ?????????????????? ???? ?????? ?????????????????? 
 +
 +alevt -charset iso8859-7 
 +
-+??? 
++?? 
 +
 +alevt -charset el
 +
-+???????????????????????? ????????? ??????????????? ?????? ??????????????????:
-+??????????????????????????? ?????????????????????????????? ????????? font file vtxt-iso8859-7.bdf 
-+?????? ???????????????????????? ?????????????????????????????? ???????????????????????? ????????? bold ?????? ??????????????? ?????? ???????????? ?????????????????????????????? ????????? ???????????????????????? 
-+?????????????????? ??????????????? ??????????????????????????????????????? ?????? ???????????? graphics  (0x01 -0x1f)
++???????????????? ?????? ?????????? ???? ????????????:
++?????????????????? ???????????????????? ?????? font file vtxt-iso8859-7.bdf 
++???? ???????????????? ???????????????????? ???????????????? ?????? bold ???? ?????????? ???? ???????? ???????????????????? ?????? ???????????????? 
++???????????? ?????????? ?????????????????????????? ???? ???????? graphics  (0x01 -0x1f)
 +
-+????????????????????? ????????? ?????? ?????? ?????????????????????????????????????????? ??????????????? ???????????? ?????? ??????????????????????????????
++??????????????? ?????? ???? ???? ???????????????????????????? ?????????? ???????? ???? ????????????????????
 +
-+?????????????????? ??????????????? ?????? ???????????????????????? ???????????????????????? ?????? ????????? ????????????????????? ????????? ????????????????????? ????????? ????????? sl45sms at yahoo.gr
-+?????? ????????????????????? ??????????????? ????????????????????????????????? ????????????????????? ????????? ????????? ????????????????????? ?????? ???????????????????????? ?????? ?????????????????? ?????? ????????? ????????????????????? ?????????
-+???????????? ??????????????????????????? ????????? ????????????????????????????????????
++????????????? ?????????? ???? ???????????????? ???????????????? ???? ?????? ?????????????? ?????? ?????????????? ?????? ?????? sl45sms at yahoo.gr
++???? ?????????????? ?????????? ?????????????????????? ?????????????? ?????? ?????? ?????????????? ???? ???????????????? ???? ???????????? ???? ?????? ?????????????? ??????
++???????? ?????????????????? ?????? ????????????????????????
 +
-+????????????????????? ?????????????????? ????????? ???????????????????????? ?????? ???????????????????????? ?????? ???????????????????????? ?????????  http://go.to/sl45sms/alevt/index.html
++?????????????? ???????????? ?????? ???????????????? ???? ???????????????? ???? ???????????????? ??????  http://go.to/sl45sms/alevt/index.html
 +
-+??????????????????????????? ??????????????????????????????
++?????????????????? ????????????????????
 diff -Nur alevt-1.6.2/vbi.c alevt-1.6.2.rus+greek/vbi.c
 --- alevt-1.6.2/vbi.c	2007-12-03 10:02:00.000000000 +0300
 +++ alevt-1.6.2.rus+greek/vbi.c	2009-04-10 06:59:25.000000000 +0400



From lucilanga at fedoraproject.org  Mon Apr 13 05:34:41 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 05:34:41 +0000 (UTC)
Subject: rpms/alevt/devel alevt.spec,1.7,1.8
Message-ID: <20090413053441.8C8C870124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9779

Modified Files:
	alevt.spec 
Log Message:
fix wrongly converted chars in patch2


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alevt.spec	10 Apr 2009 13:15:11 -0000	1.7
+++ alevt.spec	13 Apr 2009 05:34:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Teletext decoder/browser
 Group: Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-11
+- rebuild with corrected patch2
+
 * Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
 - new patch for chrilic fonts from Alexey Loukianov (mooroon2 at mail.ru)
 - updated doublefont patch



From lucilanga at fedoraproject.org  Mon Apr 13 05:35:23 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 05:35:23 +0000 (UTC)
Subject: rpms/alevt/F-9 alevt.spec,1.3,1.4
Message-ID: <20090413053523.7F35A70124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9902

Modified Files:
	alevt.spec 
Log Message:
fix wrongly converted chars in patch2


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alevt.spec	10 Apr 2009 13:35:00 -0000	1.3
+++ alevt.spec	13 Apr 2009 05:34:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Teletext decoder/browser
 Group:  Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
+- rebuild with corrected patch2
+
 * Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-9
 - new patch for cyrillic fonts from Alexey Loukianov (mooroon2 at mail.ru)
 - updated doublefont patch



From lucilanga at fedoraproject.org  Mon Apr 13 05:40:16 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 05:40:16 +0000 (UTC)
Subject: rpms/alevt/F-10 alevt-1.6.2-rus-greek.patch,1.1,1.2
Message-ID: <20090413054016.1E42570124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10941

Modified Files:
	alevt-1.6.2-rus-greek.patch 
Log Message:
fix wrongly converted chars in patch2

alevt-1.6.2-rus-greek.patch:

Index: alevt-1.6.2-rus-greek.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt-1.6.2-rus-greek.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alevt-1.6.2-rus-greek.patch	10 Apr 2009 13:07:42 -0000	1.1
+++ alevt-1.6.2-rus-greek.patch	13 Apr 2009 05:40:15 -0000	1.2
@@ -240,7 +240,7 @@
 +
 +      c= *p;
 +      if ( (c >= 0x40) && (c <= 0x7f)) *p=l2koi[(c & 0x7f) - 0x40];
-+      if (c=='&') *p='???';
++      if (c=='&') *p='??';
 +}
 +/* teletext to iso8859-7 conversion */
 +void
@@ -258,69 +258,69 @@
 +    };
 +*/
 +   static u8 l2greek[]={
-+/* 1 @ 0x40->???*/0xc0,
-+/* 2 A 0x41->???*/0xc1,
-+/* 3 B 0x42->???*/0xc2,
-+/* 4 C 0x43->???*/0xc3,
-+/* 5 D 0x44->???*/0xc4,
-+/* 6 E 0x45->???*/0xc5,
-+/* 7 F 0x46->???*/0xc6,
-+/* 8 G 0x47->???*/0xc7,
-+/* 9 H 0x48->???*/0xc8,
-+/*10 I 0x49->???*/0xc9,
-+/*11 J 0x4a->???*/0xca,
-+/*12 K 0x4b->???*/0xcb,
-+/*13 L 0x4c->???*/0xcc,
-+/*14 M 0x4d->???*/0xcd,
-+/*15 N 0x4e->???*/0xce,
-+/*16 O 0x4f->???*/0xcf,
-+/*17 P 0x50->???*/0xd0,
-+/*18 Q 0x51->???*/0xd1,
++/* 1 @ 0x40->??*/0xc0,
++/* 2 A 0x41->??*/0xc1,
++/* 3 B 0x42->??*/0xc2,
++/* 4 C 0x43->??*/0xc3,
++/* 5 D 0x44->??*/0xc4,
++/* 6 E 0x45->??*/0xc5,
++/* 7 F 0x46->??*/0xc6,
++/* 8 G 0x47->??*/0xc7,
++/* 9 H 0x48->??*/0xc8,
++/*10 I 0x49->??*/0xc9,
++/*11 J 0x4a->??*/0xca,
++/*12 K 0x4b->??*/0xcb,
++/*13 L 0x4c->??*/0xcc,
++/*14 M 0x4d->??*/0xcd,
++/*15 N 0x4e->??*/0xce,
++/*16 O 0x4f->??*/0xcf,
++/*17 P 0x50->??*/0xd0,
++/*18 Q 0x51->??*/0xd1,
 +/*19 R 0x52->?*/0x52,
-+/*20 S 0x53->???*/0xd3,
-+/*21 T 0x54->???*/0xd4,
-+/*22 U 0x55->???*/0xd5,
-+/*23 V 0x56->???*/0xd6,
-+/*24 W 0x57->???*/0xd7,
-+/*25 X 0x58->???*/0xd8,
-+/*26 Y 0x59->???*/0xd9,
++/*20 S 0x53->??*/0xd3,
++/*21 T 0x54->??*/0xd4,
++/*22 U 0x55->??*/0xd5,
++/*23 V 0x56->??*/0xd6,
++/*24 W 0x57->??*/0xd7,
++/*25 X 0x58->??*/0xd8,
++/*26 Y 0x59->??*/0xd9,
 +/*27 Z 0x5a->?*/0x5a,
 +/*28 [ 0x5b->?*/0x5b,
-+/*!29 \ 0x5c->???*/0xdc,
-+/*!30 ] 0x5d->???*/0xdd,
-+/*!31 ^ 0x5e->???*/0xde,
-+/*!32 _ 0x5f->???*/0xdf,
++/*!29 \ 0x5c->??*/0xdc,
++/*!30 ] 0x5d->??*/0xdd,
++/*!31 ^ 0x5e->??*/0xde,
++/*!32 _ 0x5f->??*/0xdf,
 +/*33 ` 0x60->?*/0x60,
-+/*!34 a 0x61->???*/0xe1,
-+/*!35 b 0x62->???*/0xe2,
-+/*!36 c 0x63->???*/0xe3,
-+/*!37 d 0x64->???*/0xe4,
-+/*!38 e 0x65->???*/0xe5,
-+/*!39 f 0x66->???*/0xe6,
-+/*!40 g 0x67->???*/0xe7,
-+/*!41 h 0x68->???*/0xe8,
-+/*!42 i 0x69->???*/0xe9,
-+/*!43 j 0x6a->???*/0xea,
-+/*!44 k 0x6b->???*/0xeb,
-+/*!45 l 0x6c->???*/0xec,
-+/*!46 m 0x6d->???*/0xed,
-+/*!47 n 0x6e->???*/0xee,
-+/*!48 o 0x6f->???*/0xef,
-+/*!49 p 0x70->???*/0xf0,
-+/*!50 q 0x71->???*/0xf1,
-+/*!51 r 0x72->???*/0xf2,
-+/*!52 s 0x73->???*/0xf3,
-+/*!53 t 0x74->???*/0xf4,
-+/*!54 u 0x75->???*/0xf5,
-+/*!55 v 0x76->???*/0xf6,
-+/*!56 w 0x77->???*/0xf7,
-+/*!57 x 0x78->???*/0xf8,
-+/*!58 y 0x79->???*/0xf9,
-+/*59 z 0x7a->???(?????? ????????????)*/0xc0,
++/*!34 a 0x61->??*/0xe1,
++/*!35 b 0x62->??*/0xe2,
++/*!36 c 0x63->??*/0xe3,
++/*!37 d 0x64->??*/0xe4,
++/*!38 e 0x65->??*/0xe5,
++/*!39 f 0x66->??*/0xe6,
++/*!40 g 0x67->??*/0xe7,
++/*!41 h 0x68->??*/0xe8,
++/*!42 i 0x69->??*/0xe9,
++/*!43 j 0x6a->??*/0xea,
++/*!44 k 0x6b->??*/0xeb,
++/*!45 l 0x6c->??*/0xec,
++/*!46 m 0x6d->??*/0xed,
++/*!47 n 0x6e->??*/0xee,
++/*!48 o 0x6f->??*/0xef,
++/*!49 p 0x70->??*/0xf0,
++/*!50 q 0x71->??*/0xf1,
++/*!51 r 0x72->??*/0xf2,
++/*!52 s 0x73->??*/0xf3,
++/*!53 t 0x74->??*/0xf4,
++/*!54 u 0x75->??*/0xf5,
++/*!55 v 0x76->??*/0xf6,
++/*!56 w 0x77->??*/0xf7,
++/*!57 x 0x78->??*/0xf8,
++/*!58 y 0x79->??*/0xf9,
++/*59 z 0x7a->??(???? ????????)*/0xc0,
 +/*60 { 0x7b->?*/0x7b,
-+/*!61 | 0x7c->???*/0xfc,
-+/*!62 } 0x7d->???*/0xfd,
-+/*!63 ~ 0x7e->???*/0xfe,
++/*!61 | 0x7c->??*/0xfc,
++/*!62 } 0x7d->??*/0xfd,
++/*!63 ~ 0x7e->??*/0xfe,
 +/*64   0x7f->?*/0x7f
 +  };
 +      c= *p;
@@ -488,32 +488,32 @@
 @@ -0,0 +1,28 @@
 +29-9-2003
 +
-+???????????????????????? ????????? ?????? ALEVT 
-+??? ???????????????????????? ??????????????????????????? ??????????????? ??????????????????????????????????????? ?????? patch alevt-1.6.1.rus.diff ????????? ???????????????????????? ????????? ??????????????????
-+contrib ????????? sources  ????????? alevt-1.6.1
++???????????????? ?????? ???? ALEVT 
++?? ???????????????? ?????????????????? ?????????? ?????????????????????????? ???? patch alevt-1.6.1.rus.diff ?????? ???????????????? ?????? ????????????
++contrib ?????? sources  ?????? alevt-1.6.1
 +
-+??????????????????????????? ?????? ??????????????????????????? ?????? ????????? ??????????????????????????? 
++?????????????????? ???? ?????????????????? ???? ?????? ?????????????????? 
 +
 +alevt -charset iso8859-7 
 +
-+??? 
++?? 
 +
 +alevt -charset el
 +
-+???????????????????????? ????????? ??????????????? ?????? ??????????????????:
-+??????????????????????????? ?????????????????????????????? ????????? font file vtxt-iso8859-7.bdf 
-+?????? ???????????????????????? ?????????????????????????????? ???????????????????????? ????????? bold ?????? ??????????????? ?????? ???????????? ?????????????????????????????? ????????? ???????????????????????? 
-+?????????????????? ??????????????? ??????????????????????????????????????? ?????? ???????????? graphics  (0x01 -0x1f)
++???????????????? ?????? ?????????? ???? ????????????:
++?????????????????? ???????????????????? ?????? font file vtxt-iso8859-7.bdf 
++???? ???????????????? ???????????????????? ???????????????? ?????? bold ???? ?????????? ???? ???????? ???????????????????? ?????? ???????????????? 
++???????????? ?????????? ?????????????????????????? ???? ???????? graphics  (0x01 -0x1f)
 +
-+????????????????????? ????????? ?????? ?????? ?????????????????????????????????????????? ??????????????? ???????????? ?????? ??????????????????????????????
++??????????????? ?????? ???? ???? ???????????????????????????? ?????????? ???????? ???? ????????????????????
 +
-+?????????????????? ??????????????? ?????? ???????????????????????? ???????????????????????? ?????? ????????? ????????????????????? ????????? ????????????????????? ????????? ????????? sl45sms at yahoo.gr
-+?????? ????????????????????? ??????????????? ????????????????????????????????? ????????????????????? ????????? ????????? ????????????????????? ?????? ???????????????????????? ?????? ?????????????????? ?????? ????????? ????????????????????? ?????????
-+???????????? ??????????????????????????? ????????? ????????????????????????????????????
++????????????? ?????????? ???? ???????????????? ???????????????? ???? ?????? ?????????????? ?????? ?????????????? ?????? ?????? sl45sms at yahoo.gr
++???? ?????????????? ?????????? ?????????????????????? ?????????????? ?????? ?????? ?????????????? ???? ???????????????? ???? ???????????? ???? ?????? ?????????????? ??????
++???????? ?????????????????? ?????? ????????????????????????
 +
-+????????????????????? ?????????????????? ????????? ???????????????????????? ?????? ???????????????????????? ?????? ???????????????????????? ?????????  http://go.to/sl45sms/alevt/index.html
++?????????????? ???????????? ?????? ???????????????? ???? ???????????????? ???? ???????????????? ??????  http://go.to/sl45sms/alevt/index.html
 +
-+??????????????????????????? ??????????????????????????????
++?????????????????? ????????????????????
 diff -Nur alevt-1.6.2/vbi.c alevt-1.6.2.rus+greek/vbi.c
 --- alevt-1.6.2/vbi.c	2007-12-03 10:02:00.000000000 +0300
 +++ alevt-1.6.2.rus+greek/vbi.c	2009-04-10 06:59:25.000000000 +0400



From iarnell at fedoraproject.org  Mon Apr 13 05:53:35 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 13 Apr 2009 05:53:35 +0000 (UTC)
Subject: rpms/vim-perl-support/devel vim-perl-support.spec,1.6,1.7
Message-ID: <20090413055335.AD81C70124@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/vim-perl-support/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14096

Modified Files:
	vim-perl-support.spec 
Log Message:
* Mon Apr 13 2009 Iain Arnell <iarnell at gmail.com> 4.1-2
- require perl(Devel::NYTProf) now that it's available



Index: vim-perl-support.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/vim-perl-support.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vim-perl-support.spec	17 Mar 2009 04:27:16 -0000	1.6
+++ vim-perl-support.spec	13 Apr 2009 05:53:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vim-perl-support
 Version:        4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl-IDE for VIM
 
 Group:          Applications/Editors
@@ -24,6 +24,8 @@
 Requires:         perl(Perl::Tidy)           
 # per-line Perl profiler
 Requires:         perl(Devel::SmallProf)     
+# Powerful feature-rich perl source code profiler
+Requires:         perl(Devel::NYTProf)
 
 # the following are not yet available in fedora
 # Perl debugger using a Tk GUI
@@ -34,7 +36,6 @@
 #Requires:         perl(YAPE::Regex::Explain) 
 # additional profilers
 #Requires:         perl(Devel::FastProf)
-#Requires:         perl(Devel::NYTProf)
 
 
 %define vimfiles  %{_datadir}/vim/vimfiles
@@ -133,6 +134,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Iain Arnell <iarnell at gmail.com> 4.1-2
+- require perl(Devel::NYTProf) now that it's available
+
 * Tue Mar 17 2009 Iain Arnell <iarnell at gmail.com> 4.1-1
 - update to latest upstream version
 



From kushal at fedoraproject.org  Mon Apr 13 06:11:32 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Mon, 13 Apr 2009 06:11:32 +0000 (UTC)
Subject: rpms/python-chardet/F-9 python-chardet.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090413061132.5307C70124@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-chardet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17172

Modified Files:
	sources 
Added Files:
	python-chardet.spec 
Log Message:
Building for F-9



--- NEW FILE python-chardet.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-chardet
Version:        1.0.1
Release:        1%{?dist}
Summary:        Character encoding auto-detection in Python

Group:          Development/Languages
License:        LGPLv2
URL:            http://chardet.feedparser.org
Source0:        http://chardet.feedparser.org/download/chardet-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Character encoding auto-detection in Python. As 
smart as your browser. Open source.

%prep
%setup -q -n chardet-%{version}



%build
# Remove CFLAGS=... for noarch packages (unneeded)
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod -x COPYING
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
# For noarch packages: sitelib
%{python_sitelib}/*


%changelog
* Mon Aug 04 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1
- Initial release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Aug 2008 16:27:29 -0000	1.1
+++ sources	13 Apr 2009 06:11:01 -0000	1.2
@@ -0,0 +1 @@
+f8c510a6fac300fe0ac9a0c24a76a7ba  chardet-1.0.1.tgz



From dcm at fedoraproject.org  Mon Apr 13 06:14:44 2009
From: dcm at fedoraproject.org (David C. Moore)
Date: Mon, 13 Apr 2009 06:14:44 +0000 (UTC)
Subject: rpms/libiptcdata/devel libiptcdata.spec,1.7,1.8
Message-ID: <20090413061444.58BDF70124@cvs1.fedora.phx.redhat.com>

Author: dcm

Update of /cvs/pkgs/rpms/libiptcdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17906

Modified Files:
	libiptcdata.spec 
Log Message:
Added missing requires and buildrequires


Index: libiptcdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiptcdata/devel/libiptcdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libiptcdata.spec	13 Apr 2009 02:59:11 -0000	1.7
+++ libiptcdata.spec	13 Apr 2009 06:14:13 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name: libiptcdata
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: IPTC tag library
 
 Group: Development/Libraries
@@ -10,6 +10,8 @@
 URL: http://libiptcdata.sourceforge.net/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gettext
+BuildRequires: libtool
 
 %description
 libiptcdata is a library for parsing, editing, and saving IPTC data
@@ -23,6 +25,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: gtk-doc
 
 %description devel
 The libiptcdata-devel package contains the libraries and include files
@@ -80,6 +83,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Sun Apr 12 2009 David Moore <dcm at acm.org> 1.0.3-2
+- Added 'Requires: gtk-doc' and 'BuildRequires: libtool' and gettext
+
 * Sun Apr 12 2009 David Moore <dcm at acm.org> 1.0.3-1
 - New upstream version
 - Added translation to file list



From lucilanga at fedoraproject.org  Mon Apr 13 06:31:33 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 06:31:33 +0000 (UTC)
Subject: rpms/alevt/F-10 alevt.spec,1.6,1.7
Message-ID: <20090413063134.4893B70124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23510

Modified Files:
	alevt.spec 
Log Message:
corrected patch2


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alevt.spec	10 Apr 2009 13:17:06 -0000	1.6
+++ alevt.spec	13 Apr 2009 06:31:01 -0000	1.7
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Teletext decoder/browser
 Group:  Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-11
+- corrected patch2
+
 * Fri Apr 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
 - new patch for cyrillic fonts from Alexey Loukianov (mooroon2 at mail.ru)
 - updated doublefont patch



From dcm at fedoraproject.org  Mon Apr 13 06:36:48 2009
From: dcm at fedoraproject.org (David C. Moore)
Date: Mon, 13 Apr 2009 06:36:48 +0000 (UTC)
Subject: rpms/libiptcdata/devel libiptcdata.spec,1.8,1.9
Message-ID: <20090413063648.4B2FD70124@cvs1.fedora.phx.redhat.com>

Author: dcm

Update of /cvs/pkgs/rpms/libiptcdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25403

Modified Files:
	libiptcdata.spec 
Log Message:
Updated BuildRequires


Index: libiptcdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiptcdata/devel/libiptcdata.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libiptcdata.spec	13 Apr 2009 06:14:13 -0000	1.8
+++ libiptcdata.spec	13 Apr 2009 06:36:17 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: libiptcdata
 Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: IPTC tag library
 
 Group: Development/Libraries
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: libtool
+BuildRequires: gtk-doc
 
 %description
 libiptcdata is a library for parsing, editing, and saving IPTC data
@@ -83,6 +84,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Sun Apr 12 2009 David Moore <dcm at acm.org> 1.0.3-3
+- Added 'BuildRequires: gtk-doc'
+
 * Sun Apr 12 2009 David Moore <dcm at acm.org> 1.0.3-2
 - Added 'Requires: gtk-doc' and 'BuildRequires: libtool' and gettext
 



From lucilanga at fedoraproject.org  Mon Apr 13 07:50:31 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 07:50:31 +0000 (UTC)
Subject: rpms/alevt/F-9 alevt-1.6.2-doublefont.patch, 1.2,
	1.3 alevt-1.6.2-rus-greek.patch, 1.2, 1.3 alevt.spec, 1.4, 1.5
Message-ID: <20090413075032.C8CC670124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13022

Modified Files:
	alevt-1.6.2-doublefont.patch alevt-1.6.2-rus-greek.patch 
	alevt.spec 
Log Message:
new patches from Alexey

alevt-1.6.2-doublefont.patch:

Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt-1.6.2-doublefont.patch	10 Apr 2009 13:35:00 -0000	1.2
+++ alevt-1.6.2-doublefont.patch	13 Apr 2009 07:49:59 -0000	1.3
@@ -234,4 +234,3 @@
      }
  
      xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-

alevt-1.6.2-rus-greek.patch:

Index: alevt-1.6.2-rus-greek.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt-1.6.2-rus-greek.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt-1.6.2-rus-greek.patch	13 Apr 2009 05:34:19 -0000	1.2
+++ alevt-1.6.2-rus-greek.patch	13 Apr 2009 07:49:59 -0000	1.3
@@ -240,7 +240,7 @@
 +
 +      c= *p;
 +      if ( (c >= 0x40) && (c <= 0x7f)) *p=l2koi[(c & 0x7f) - 0x40];
-+      if (c=='&') *p='??';
++      if (c=='&') *p='?';
 +}
 +/* teletext to iso8859-7 conversion */
 +void
@@ -258,69 +258,69 @@
 +    };
 +*/
 +   static u8 l2greek[]={
-+/* 1 @ 0x40->??*/0xc0,
-+/* 2 A 0x41->??*/0xc1,
-+/* 3 B 0x42->??*/0xc2,
-+/* 4 C 0x43->??*/0xc3,
-+/* 5 D 0x44->??*/0xc4,
-+/* 6 E 0x45->??*/0xc5,
-+/* 7 F 0x46->??*/0xc6,
-+/* 8 G 0x47->??*/0xc7,
-+/* 9 H 0x48->??*/0xc8,
-+/*10 I 0x49->??*/0xc9,
-+/*11 J 0x4a->??*/0xca,
-+/*12 K 0x4b->??*/0xcb,
-+/*13 L 0x4c->??*/0xcc,
-+/*14 M 0x4d->??*/0xcd,
-+/*15 N 0x4e->??*/0xce,
-+/*16 O 0x4f->??*/0xcf,
-+/*17 P 0x50->??*/0xd0,
-+/*18 Q 0x51->??*/0xd1,
++/* 1 @ 0x40->?*/0xc0,
++/* 2 A 0x41->?*/0xc1,
++/* 3 B 0x42->?*/0xc2,
++/* 4 C 0x43->?*/0xc3,
++/* 5 D 0x44->?*/0xc4,
++/* 6 E 0x45->?*/0xc5,
++/* 7 F 0x46->?*/0xc6,
++/* 8 G 0x47->?*/0xc7,
++/* 9 H 0x48->?*/0xc8,
++/*10 I 0x49->?*/0xc9,
++/*11 J 0x4a->?*/0xca,
++/*12 K 0x4b->?*/0xcb,
++/*13 L 0x4c->?*/0xcc,
++/*14 M 0x4d->?*/0xcd,
++/*15 N 0x4e->?*/0xce,
++/*16 O 0x4f->?*/0xcf,
++/*17 P 0x50->?*/0xd0,
++/*18 Q 0x51->?*/0xd1,
 +/*19 R 0x52->?*/0x52,
-+/*20 S 0x53->??*/0xd3,
-+/*21 T 0x54->??*/0xd4,
-+/*22 U 0x55->??*/0xd5,
-+/*23 V 0x56->??*/0xd6,
-+/*24 W 0x57->??*/0xd7,
-+/*25 X 0x58->??*/0xd8,
-+/*26 Y 0x59->??*/0xd9,
++/*20 S 0x53->?*/0xd3,
++/*21 T 0x54->?*/0xd4,
++/*22 U 0x55->?*/0xd5,
++/*23 V 0x56->?*/0xd6,
++/*24 W 0x57->?*/0xd7,
++/*25 X 0x58->?*/0xd8,
++/*26 Y 0x59->?*/0xd9,
 +/*27 Z 0x5a->?*/0x5a,
 +/*28 [ 0x5b->?*/0x5b,
-+/*!29 \ 0x5c->??*/0xdc,
-+/*!30 ] 0x5d->??*/0xdd,
-+/*!31 ^ 0x5e->??*/0xde,
-+/*!32 _ 0x5f->??*/0xdf,
++/*!29 \ 0x5c->?*/0xdc,
++/*!30 ] 0x5d->?*/0xdd,
++/*!31 ^ 0x5e->?*/0xde,
++/*!32 _ 0x5f->?*/0xdf,
 +/*33 ` 0x60->?*/0x60,
-+/*!34 a 0x61->??*/0xe1,
-+/*!35 b 0x62->??*/0xe2,
-+/*!36 c 0x63->??*/0xe3,
-+/*!37 d 0x64->??*/0xe4,
-+/*!38 e 0x65->??*/0xe5,
-+/*!39 f 0x66->??*/0xe6,
-+/*!40 g 0x67->??*/0xe7,
-+/*!41 h 0x68->??*/0xe8,
-+/*!42 i 0x69->??*/0xe9,
-+/*!43 j 0x6a->??*/0xea,
-+/*!44 k 0x6b->??*/0xeb,
-+/*!45 l 0x6c->??*/0xec,
-+/*!46 m 0x6d->??*/0xed,
-+/*!47 n 0x6e->??*/0xee,
-+/*!48 o 0x6f->??*/0xef,
-+/*!49 p 0x70->??*/0xf0,
-+/*!50 q 0x71->??*/0xf1,
-+/*!51 r 0x72->??*/0xf2,
-+/*!52 s 0x73->??*/0xf3,
-+/*!53 t 0x74->??*/0xf4,
-+/*!54 u 0x75->??*/0xf5,
-+/*!55 v 0x76->??*/0xf6,
-+/*!56 w 0x77->??*/0xf7,
-+/*!57 x 0x78->??*/0xf8,
-+/*!58 y 0x79->??*/0xf9,
-+/*59 z 0x7a->??(???? ????????)*/0xc0,
++/*!34 a 0x61->?*/0xe1,
++/*!35 b 0x62->?*/0xe2,
++/*!36 c 0x63->?*/0xe3,
++/*!37 d 0x64->?*/0xe4,
++/*!38 e 0x65->?*/0xe5,
++/*!39 f 0x66->?*/0xe6,
++/*!40 g 0x67->?*/0xe7,
++/*!41 h 0x68->?*/0xe8,
++/*!42 i 0x69->?*/0xe9,
++/*!43 j 0x6a->?*/0xea,
++/*!44 k 0x6b->?*/0xeb,
++/*!45 l 0x6c->?*/0xec,
++/*!46 m 0x6d->?*/0xed,
++/*!47 n 0x6e->?*/0xee,
++/*!48 o 0x6f->?*/0xef,
++/*!49 p 0x70->?*/0xf0,
++/*!50 q 0x71->?*/0xf1,
++/*!51 r 0x72->?*/0xf2,
++/*!52 s 0x73->?*/0xf3,
++/*!53 t 0x74->?*/0xf4,
++/*!54 u 0x75->?*/0xf5,
++/*!55 v 0x76->?*/0xf6,
++/*!56 w 0x77->?*/0xf7,
++/*!57 x 0x78->?*/0xf8,
++/*!58 y 0x79->?*/0xf9,
++/*59 z 0x7a->?(?? ????)*/0xc0,
 +/*60 { 0x7b->?*/0x7b,
-+/*!61 | 0x7c->??*/0xfc,
-+/*!62 } 0x7d->??*/0xfd,
-+/*!63 ~ 0x7e->??*/0xfe,
++/*!61 | 0x7c->?*/0xfc,
++/*!62 } 0x7d->?*/0xfd,
++/*!63 ~ 0x7e->?*/0xfe,
 +/*64   0x7f->?*/0x7f
 +  };
 +      c= *p;
@@ -488,32 +488,32 @@
 @@ -0,0 +1,28 @@
 +29-9-2003
 +
-+???????????????? ?????? ???? ALEVT 
-+?? ???????????????? ?????????????????? ?????????? ?????????????????????????? ???? patch alevt-1.6.1.rus.diff ?????? ???????????????? ?????? ????????????
-+contrib ?????? sources  ?????? alevt-1.6.1
++???????? ??? ?? ALEVT 
++? ???????? ????????? ????? ????????????? ?? patch alevt-1.6.1.rus.diff ??? ???????? ??? ??????
++contrib ??? sources  ??? alevt-1.6.1
 +
-+?????????????????? ???? ?????????????????? ???? ?????? ?????????????????? 
++????????? ?? ????????? ?? ??? ????????? 
 +
 +alevt -charset iso8859-7 
 +
-+?? 
++? 
 +
 +alevt -charset el
 +
-+???????????????? ?????? ?????????? ???? ????????????:
-+?????????????????? ???????????????????? ?????? font file vtxt-iso8859-7.bdf 
-+???? ???????????????? ???????????????????? ???????????????? ?????? bold ???? ?????????? ???? ???????? ???????????????????? ?????? ???????????????? 
-+???????????? ?????????? ?????????????????????????? ???? ???????? graphics  (0x01 -0x1f)
++???????? ??? ????? ?? ??????:
++????????? ?????????? ??? font file vtxt-iso8859-7.bdf 
++?? ???????? ?????????? ???????? ??? bold ?? ????? ?? ???? ?????????? ??? ???????? 
++?????? ????? ????????????? ?? ???? graphics  (0x01 -0x1f)
 +
-+??????????????? ?????? ???? ???? ???????????????????????????? ?????????? ???????? ???? ????????????????????
++??????? ??? ?? ?? ?????????????? ????? ???? ?? ??????????
 +
-+????????????? ?????????? ???? ???????????????? ???????????????? ???? ?????? ?????????????? ?????? ?????????????? ?????? ?????? sl45sms at yahoo.gr
-+???? ?????????????? ?????????? ?????????????????????? ?????????????? ?????? ?????? ?????????????? ???? ???????????????? ???? ???????????? ???? ?????? ?????????????? ??????
-+???????? ?????????????????? ?????? ????????????????????????
++?????? ????? ?? ???????? ???????? ?? ??? ??????? ??? ??????? ??? ??? sl45sms at yahoo.gr
++?? ??????? ????? ??????????? ??????? ??? ??? ??????? ?? ???????? ?? ?????? ?? ??? ??????? ???
++???? ????????? ??? ????????????
 +
-+?????????????? ???????????? ?????? ???????????????? ???? ???????????????? ???? ???????????????? ??????  http://go.to/sl45sms/alevt/index.html
++??????? ?????? ??? ???????? ?? ???????? ?? ???????? ???  http://go.to/sl45sms/alevt/index.html
 +
-+?????????????????? ????????????????????
++????????? ??????????
 diff -Nur alevt-1.6.2/vbi.c alevt-1.6.2.rus+greek/vbi.c
 --- alevt-1.6.2/vbi.c	2007-12-03 10:02:00.000000000 +0300
 +++ alevt-1.6.2.rus+greek/vbi.c	2009-04-10 06:59:25.000000000 +0400
@@ -12264,4 +12264,3 @@
  		    case 0x1b:		/* ESC (reserved) */
  			c = ' ';
  			break;
-


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-9/alevt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alevt.spec	13 Apr 2009 05:34:53 -0000	1.4
+++ alevt.spec	13 Apr 2009 07:49:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Teletext decoder/browser
 Group:  Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-11
+- new patches from Alexey
+
 * Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-10
 - rebuild with corrected patch2
 



From lucilanga at fedoraproject.org  Mon Apr 13 07:57:40 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 07:57:40 +0000 (UTC)
Subject: rpms/gaupol/devel gaupol.spec,1.2,1.3
Message-ID: <20090413075740.5433C70124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15924

Modified Files:
	gaupol.spec 
Log Message:
new upstream release


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/gaupol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaupol.spec	24 Feb 2009 19:38:41 -0000	1.2
+++ gaupol.spec	13 Apr 2009 07:57:39 -0000	1.3
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
-Version:	0.13.1
-Release:	2%{?dist}
+Version:	0.14
+Release:	1%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://home.gna.org/gaupol
-Source0:	http://download.gna.org/gaupol/0.13/%{name}-%{version}.tar.gz
+Source0:	http://download.gna.org/gaupol/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
+- new upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Mon Apr 13 07:59:07 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 07:59:07 +0000 (UTC)
Subject: rpms/gaupol/devel .cvsignore, 1.2, 1.3 gaupol.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090413075907.CD30270124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16291

Modified Files:
	.cvsignore gaupol.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jan 2009 05:40:34 -0000	1.2
+++ .cvsignore	13 Apr 2009 07:58:37 -0000	1.3
@@ -1 +1 @@
-gaupol-0.13.1.tar.gz
+gaupol-0.14.tar.gz


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/gaupol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gaupol.spec	13 Apr 2009 07:57:39 -0000	1.3
+++ gaupol.spec	13 Apr 2009 07:58:37 -0000	1.4
@@ -65,6 +65,7 @@
 
 %changelog
 * Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
+- fix Source url
 - new upstream release
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jan 2009 05:40:34 -0000	1.2
+++ sources	13 Apr 2009 07:58:37 -0000	1.3
@@ -1 +1 @@
-11c62f478bcd9cd10a88752e4545e1d2  gaupol-0.13.1.tar.gz
+702a7a449981a51b70fc9c682f49a333  gaupol-0.14.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 13 08:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:13:21 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090413081321.40E2110F851@bastion2.fedora.phx.redhat.com>

Package moin in Fedora devel is now owned by vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:14:54 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090413081340.00D1110F851@bastion2.fedora.phx.redhat.com>

Package moin in Fedora 9 is now owned by vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:13:51 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090413081352.A013D10F87C@bastion2.fedora.phx.redhat.com>

Package moin in Fedora 10 is now owned by vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:14:36 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090413081436.C805610F85A@bastion2.fedora.phx.redhat.com>

Package moin in Fedora EPEL 5 is now owned by vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:15:59 +0000
Subject: [pkgdb] moin ownership updated
Message-ID: <20090413081446.B98B210F87B@bastion2.fedora.phx.redhat.com>

Package moin in Fedora EPEL 4 is now owned by vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:14:58 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413081457.AA42F10F85A@bastion2.fedora.phx.redhat.com>

vpv has set the watchbugzilla acl on moin (Fedora EPEL 5) to Approved for mmcgrath

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:16:15 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413081500.8803810F87B@bastion2.fedora.phx.redhat.com>

vpv has set the watchcommits acl on moin (Fedora EPEL 5) to Approved for mmcgrath

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 08:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 08:15:04 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413081504.6C2F110F87F@bastion2.fedora.phx.redhat.com>

vpv has set the commit acl on moin (Fedora EPEL 5) to Approved for mmcgrath

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From lucilanga at fedoraproject.org  Mon Apr 13 08:16:34 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 08:16:34 +0000 (UTC)
Subject: rpms/alevt/F-10 alevt.spec,1.7,1.8
Message-ID: <20090413081634.BF13470124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21544

Modified Files:
	alevt.spec 
Log Message:
new patches from Alexey


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alevt.spec	13 Apr 2009 06:31:01 -0000	1.7
+++ alevt.spec	13 Apr 2009 08:16:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Teletext decoder/browser
 Group:  Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-12
+- new patches from Alexey
+
 * Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-11
 - corrected patch2
 



From lucilanga at fedoraproject.org  Mon Apr 13 08:23:33 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 08:23:33 +0000 (UTC)
Subject: rpms/alevt/F-10 alevt-1.6.2-doublefont.patch, 1.2,
	1.3 alevt-1.6.2-rus-greek.patch, 1.2, 1.3
Message-ID: <20090413082333.6220070124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23240

Modified Files:
	alevt-1.6.2-doublefont.patch alevt-1.6.2-rus-greek.patch 
Log Message:
new patches from Alexey

alevt-1.6.2-doublefont.patch:

Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt-1.6.2-doublefont.patch	10 Apr 2009 13:07:42 -0000	1.2
+++ alevt-1.6.2-doublefont.patch	13 Apr 2009 08:23:02 -0000	1.3
@@ -234,4 +234,3 @@
      }
  
      xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-

alevt-1.6.2-rus-greek.patch:

Index: alevt-1.6.2-rus-greek.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/F-10/alevt-1.6.2-rus-greek.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt-1.6.2-rus-greek.patch	13 Apr 2009 05:40:15 -0000	1.2
+++ alevt-1.6.2-rus-greek.patch	13 Apr 2009 08:23:02 -0000	1.3
@@ -240,7 +240,7 @@
 +
 +      c= *p;
 +      if ( (c >= 0x40) && (c <= 0x7f)) *p=l2koi[(c & 0x7f) - 0x40];
-+      if (c=='&') *p='??';
++      if (c=='&') *p='?';
 +}
 +/* teletext to iso8859-7 conversion */
 +void
@@ -258,69 +258,69 @@
 +    };
 +*/
 +   static u8 l2greek[]={
-+/* 1 @ 0x40->??*/0xc0,
-+/* 2 A 0x41->??*/0xc1,
-+/* 3 B 0x42->??*/0xc2,
-+/* 4 C 0x43->??*/0xc3,
-+/* 5 D 0x44->??*/0xc4,
-+/* 6 E 0x45->??*/0xc5,
-+/* 7 F 0x46->??*/0xc6,
-+/* 8 G 0x47->??*/0xc7,
-+/* 9 H 0x48->??*/0xc8,
-+/*10 I 0x49->??*/0xc9,
-+/*11 J 0x4a->??*/0xca,
-+/*12 K 0x4b->??*/0xcb,
-+/*13 L 0x4c->??*/0xcc,
-+/*14 M 0x4d->??*/0xcd,
-+/*15 N 0x4e->??*/0xce,
-+/*16 O 0x4f->??*/0xcf,
-+/*17 P 0x50->??*/0xd0,
-+/*18 Q 0x51->??*/0xd1,
++/* 1 @ 0x40->?*/0xc0,
++/* 2 A 0x41->?*/0xc1,
++/* 3 B 0x42->?*/0xc2,
++/* 4 C 0x43->?*/0xc3,
++/* 5 D 0x44->?*/0xc4,
++/* 6 E 0x45->?*/0xc5,
++/* 7 F 0x46->?*/0xc6,
++/* 8 G 0x47->?*/0xc7,
++/* 9 H 0x48->?*/0xc8,
++/*10 I 0x49->?*/0xc9,
++/*11 J 0x4a->?*/0xca,
++/*12 K 0x4b->?*/0xcb,
++/*13 L 0x4c->?*/0xcc,
++/*14 M 0x4d->?*/0xcd,
++/*15 N 0x4e->?*/0xce,
++/*16 O 0x4f->?*/0xcf,
++/*17 P 0x50->?*/0xd0,
++/*18 Q 0x51->?*/0xd1,
 +/*19 R 0x52->?*/0x52,
-+/*20 S 0x53->??*/0xd3,
-+/*21 T 0x54->??*/0xd4,
-+/*22 U 0x55->??*/0xd5,
-+/*23 V 0x56->??*/0xd6,
-+/*24 W 0x57->??*/0xd7,
-+/*25 X 0x58->??*/0xd8,
-+/*26 Y 0x59->??*/0xd9,
++/*20 S 0x53->?*/0xd3,
++/*21 T 0x54->?*/0xd4,
++/*22 U 0x55->?*/0xd5,
++/*23 V 0x56->?*/0xd6,
++/*24 W 0x57->?*/0xd7,
++/*25 X 0x58->?*/0xd8,
++/*26 Y 0x59->?*/0xd9,
 +/*27 Z 0x5a->?*/0x5a,
 +/*28 [ 0x5b->?*/0x5b,
-+/*!29 \ 0x5c->??*/0xdc,
-+/*!30 ] 0x5d->??*/0xdd,
-+/*!31 ^ 0x5e->??*/0xde,
-+/*!32 _ 0x5f->??*/0xdf,
++/*!29 \ 0x5c->?*/0xdc,
++/*!30 ] 0x5d->?*/0xdd,
++/*!31 ^ 0x5e->?*/0xde,
++/*!32 _ 0x5f->?*/0xdf,
 +/*33 ` 0x60->?*/0x60,
-+/*!34 a 0x61->??*/0xe1,
-+/*!35 b 0x62->??*/0xe2,
-+/*!36 c 0x63->??*/0xe3,
-+/*!37 d 0x64->??*/0xe4,
-+/*!38 e 0x65->??*/0xe5,
-+/*!39 f 0x66->??*/0xe6,
-+/*!40 g 0x67->??*/0xe7,
-+/*!41 h 0x68->??*/0xe8,
-+/*!42 i 0x69->??*/0xe9,
-+/*!43 j 0x6a->??*/0xea,
-+/*!44 k 0x6b->??*/0xeb,
-+/*!45 l 0x6c->??*/0xec,
-+/*!46 m 0x6d->??*/0xed,
-+/*!47 n 0x6e->??*/0xee,
-+/*!48 o 0x6f->??*/0xef,
-+/*!49 p 0x70->??*/0xf0,
-+/*!50 q 0x71->??*/0xf1,
-+/*!51 r 0x72->??*/0xf2,
-+/*!52 s 0x73->??*/0xf3,
-+/*!53 t 0x74->??*/0xf4,
-+/*!54 u 0x75->??*/0xf5,
-+/*!55 v 0x76->??*/0xf6,
-+/*!56 w 0x77->??*/0xf7,
-+/*!57 x 0x78->??*/0xf8,
-+/*!58 y 0x79->??*/0xf9,
-+/*59 z 0x7a->??(???? ????????)*/0xc0,
++/*!34 a 0x61->?*/0xe1,
++/*!35 b 0x62->?*/0xe2,
++/*!36 c 0x63->?*/0xe3,
++/*!37 d 0x64->?*/0xe4,
++/*!38 e 0x65->?*/0xe5,
++/*!39 f 0x66->?*/0xe6,
++/*!40 g 0x67->?*/0xe7,
++/*!41 h 0x68->?*/0xe8,
++/*!42 i 0x69->?*/0xe9,
++/*!43 j 0x6a->?*/0xea,
++/*!44 k 0x6b->?*/0xeb,
++/*!45 l 0x6c->?*/0xec,
++/*!46 m 0x6d->?*/0xed,
++/*!47 n 0x6e->?*/0xee,
++/*!48 o 0x6f->?*/0xef,
++/*!49 p 0x70->?*/0xf0,
++/*!50 q 0x71->?*/0xf1,
++/*!51 r 0x72->?*/0xf2,
++/*!52 s 0x73->?*/0xf3,
++/*!53 t 0x74->?*/0xf4,
++/*!54 u 0x75->?*/0xf5,
++/*!55 v 0x76->?*/0xf6,
++/*!56 w 0x77->?*/0xf7,
++/*!57 x 0x78->?*/0xf8,
++/*!58 y 0x79->?*/0xf9,
++/*59 z 0x7a->?(?? ????)*/0xc0,
 +/*60 { 0x7b->?*/0x7b,
-+/*!61 | 0x7c->??*/0xfc,
-+/*!62 } 0x7d->??*/0xfd,
-+/*!63 ~ 0x7e->??*/0xfe,
++/*!61 | 0x7c->?*/0xfc,
++/*!62 } 0x7d->?*/0xfd,
++/*!63 ~ 0x7e->?*/0xfe,
 +/*64   0x7f->?*/0x7f
 +  };
 +      c= *p;
@@ -488,32 +488,32 @@
 @@ -0,0 +1,28 @@
 +29-9-2003
 +
-+???????????????? ?????? ???? ALEVT 
-+?? ???????????????? ?????????????????? ?????????? ?????????????????????????? ???? patch alevt-1.6.1.rus.diff ?????? ???????????????? ?????? ????????????
-+contrib ?????? sources  ?????? alevt-1.6.1
++???????? ??? ?? ALEVT 
++? ???????? ????????? ????? ????????????? ?? patch alevt-1.6.1.rus.diff ??? ???????? ??? ??????
++contrib ??? sources  ??? alevt-1.6.1
 +
-+?????????????????? ???? ?????????????????? ???? ?????? ?????????????????? 
++????????? ?? ????????? ?? ??? ????????? 
 +
 +alevt -charset iso8859-7 
 +
-+?? 
++? 
 +
 +alevt -charset el
 +
-+???????????????? ?????? ?????????? ???? ????????????:
-+?????????????????? ???????????????????? ?????? font file vtxt-iso8859-7.bdf 
-+???? ???????????????? ???????????????????? ???????????????? ?????? bold ???? ?????????? ???? ???????? ???????????????????? ?????? ???????????????? 
-+???????????? ?????????? ?????????????????????????? ???? ???????? graphics  (0x01 -0x1f)
++???????? ??? ????? ?? ??????:
++????????? ?????????? ??? font file vtxt-iso8859-7.bdf 
++?? ???????? ?????????? ???????? ??? bold ?? ????? ?? ???? ?????????? ??? ???????? 
++?????? ????? ????????????? ?? ???? graphics  (0x01 -0x1f)
 +
-+??????????????? ?????? ???? ???? ???????????????????????????? ?????????? ???????? ???? ????????????????????
++??????? ??? ?? ?? ?????????????? ????? ???? ?? ??????????
 +
-+????????????? ?????????? ???? ???????????????? ???????????????? ???? ?????? ?????????????? ?????? ?????????????? ?????? ?????? sl45sms at yahoo.gr
-+???? ?????????????? ?????????? ?????????????????????? ?????????????? ?????? ?????? ?????????????? ???? ???????????????? ???? ???????????? ???? ?????? ?????????????? ??????
-+???????? ?????????????????? ?????? ????????????????????????
++?????? ????? ?? ???????? ???????? ?? ??? ??????? ??? ??????? ??? ??? sl45sms at yahoo.gr
++?? ??????? ????? ??????????? ??????? ??? ??? ??????? ?? ???????? ?? ?????? ?? ??? ??????? ???
++???? ????????? ??? ????????????
 +
-+?????????????? ???????????? ?????? ???????????????? ???? ???????????????? ???? ???????????????? ??????  http://go.to/sl45sms/alevt/index.html
++??????? ?????? ??? ???????? ?? ???????? ?? ???????? ???  http://go.to/sl45sms/alevt/index.html
 +
-+?????????????????? ????????????????????
++????????? ??????????
 diff -Nur alevt-1.6.2/vbi.c alevt-1.6.2.rus+greek/vbi.c
 --- alevt-1.6.2/vbi.c	2007-12-03 10:02:00.000000000 +0300
 +++ alevt-1.6.2.rus+greek/vbi.c	2009-04-10 06:59:25.000000000 +0400
@@ -12264,4 +12264,3 @@
  		    case 0x1b:		/* ESC (reserved) */
  			c = ' ';
  			break;
-



From lucilanga at fedoraproject.org  Mon Apr 13 08:26:23 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 08:26:23 +0000 (UTC)
Subject: rpms/gaupol/F-10 .cvsignore, 1.2, 1.3 gaupol.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090413082623.80BE570124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24416

Modified Files:
	.cvsignore gaupol.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jan 2009 05:48:24 -0000	1.2
+++ .cvsignore	13 Apr 2009 08:25:52 -0000	1.3
@@ -1 +1 @@
-gaupol-0.13.1.tar.gz
+gaupol-0.14.tar.gz


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-10/gaupol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaupol.spec	20 Jan 2009 05:48:24 -0000	1.1
+++ gaupol.spec	13 Apr 2009 08:25:53 -0000	1.2
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
-Version:	0.13.1
+Version:	0.14
 Release:	1%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://home.gna.org/gaupol
-Source0:	http://download.gna.org/gaupol/0.13/%{name}-%{version}.tar.gz
+Source0:	http://download.gna.org/gaupol/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
+- update source url
+- new upstream release
+
 * Thu Jan 15 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.1-1
 - initial package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jan 2009 05:48:24 -0000	1.2
+++ sources	13 Apr 2009 08:25:53 -0000	1.3
@@ -1 +1 @@
-11c62f478bcd9cd10a88752e4545e1d2  gaupol-0.13.1.tar.gz
+702a7a449981a51b70fc9c682f49a333  gaupol-0.14.tar.gz



From akurtakov at fedoraproject.org  Mon Apr 13 08:27:00 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 13 Apr 2009 08:27:00 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.629,1.630
Message-ID: <20090413082700.5BBF970124@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24653/devel

Modified Files:
	eclipse.spec 
Log Message:
Do not install p2 generatad file.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- eclipse.spec	10 Apr 2009 07:53:56 -0000	1.629
+++ eclipse.spec	13 Apr 2009 08:26:28 -0000	1.630
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.9%{?dist}
+Release:        0.1.10%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1058,6 +1058,7 @@
 # Do this again after we've run the file initializer
 rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache
 rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml
+rm -rf $sdkDir/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
 pushd $profileDir
   sed -i "s|$RPM_BUILD_ROOT||g" *.profile/*
 popd
@@ -1591,6 +1592,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.10
+- Do not install p2 generatad file.
+
 * Fri Apr 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.9
 - BR/R jakarta-commons-codec and jakarta-commons-httpclient.
 



From lucilanga at fedoraproject.org  Mon Apr 13 08:31:54 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 08:31:54 +0000 (UTC)
Subject: rpms/alevt/devel alevt-1.6.2-doublefont.patch, 1.2,
	1.3 alevt-1.6.2-rus-greek.patch, 1.2, 1.3 alevt.spec, 1.8, 1.9
Message-ID: <20090413083154.A04BA70124@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/alevt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26607

Modified Files:
	alevt-1.6.2-doublefont.patch alevt-1.6.2-rus-greek.patch 
	alevt.spec 
Log Message:
upload new patches from Alexey

alevt-1.6.2-doublefont.patch:

Index: alevt-1.6.2-doublefont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt-1.6.2-doublefont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt-1.6.2-doublefont.patch	10 Apr 2009 12:48:12 -0000	1.2
+++ alevt-1.6.2-doublefont.patch	13 Apr 2009 08:31:23 -0000	1.3
@@ -234,4 +234,3 @@
      }
  
      xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
-

alevt-1.6.2-rus-greek.patch:

Index: alevt-1.6.2-rus-greek.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt-1.6.2-rus-greek.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alevt-1.6.2-rus-greek.patch	13 Apr 2009 05:32:39 -0000	1.2
+++ alevt-1.6.2-rus-greek.patch	13 Apr 2009 08:31:23 -0000	1.3
@@ -240,7 +240,7 @@
 +
 +      c= *p;
 +      if ( (c >= 0x40) && (c <= 0x7f)) *p=l2koi[(c & 0x7f) - 0x40];
-+      if (c=='&') *p='??';
++      if (c=='&') *p='?';
 +}
 +/* teletext to iso8859-7 conversion */
 +void
@@ -258,69 +258,69 @@
 +    };
 +*/
 +   static u8 l2greek[]={
-+/* 1 @ 0x40->??*/0xc0,
-+/* 2 A 0x41->??*/0xc1,
-+/* 3 B 0x42->??*/0xc2,
-+/* 4 C 0x43->??*/0xc3,
-+/* 5 D 0x44->??*/0xc4,
-+/* 6 E 0x45->??*/0xc5,
-+/* 7 F 0x46->??*/0xc6,
-+/* 8 G 0x47->??*/0xc7,
-+/* 9 H 0x48->??*/0xc8,
-+/*10 I 0x49->??*/0xc9,
-+/*11 J 0x4a->??*/0xca,
-+/*12 K 0x4b->??*/0xcb,
-+/*13 L 0x4c->??*/0xcc,
-+/*14 M 0x4d->??*/0xcd,
-+/*15 N 0x4e->??*/0xce,
-+/*16 O 0x4f->??*/0xcf,
-+/*17 P 0x50->??*/0xd0,
-+/*18 Q 0x51->??*/0xd1,
++/* 1 @ 0x40->?*/0xc0,
++/* 2 A 0x41->?*/0xc1,
++/* 3 B 0x42->?*/0xc2,
++/* 4 C 0x43->?*/0xc3,
++/* 5 D 0x44->?*/0xc4,
++/* 6 E 0x45->?*/0xc5,
++/* 7 F 0x46->?*/0xc6,
++/* 8 G 0x47->?*/0xc7,
++/* 9 H 0x48->?*/0xc8,
++/*10 I 0x49->?*/0xc9,
++/*11 J 0x4a->?*/0xca,
++/*12 K 0x4b->?*/0xcb,
++/*13 L 0x4c->?*/0xcc,
++/*14 M 0x4d->?*/0xcd,
++/*15 N 0x4e->?*/0xce,
++/*16 O 0x4f->?*/0xcf,
++/*17 P 0x50->?*/0xd0,
++/*18 Q 0x51->?*/0xd1,
 +/*19 R 0x52->?*/0x52,
-+/*20 S 0x53->??*/0xd3,
-+/*21 T 0x54->??*/0xd4,
-+/*22 U 0x55->??*/0xd5,
-+/*23 V 0x56->??*/0xd6,
-+/*24 W 0x57->??*/0xd7,
-+/*25 X 0x58->??*/0xd8,
-+/*26 Y 0x59->??*/0xd9,
++/*20 S 0x53->?*/0xd3,
++/*21 T 0x54->?*/0xd4,
++/*22 U 0x55->?*/0xd5,
++/*23 V 0x56->?*/0xd6,
++/*24 W 0x57->?*/0xd7,
++/*25 X 0x58->?*/0xd8,
++/*26 Y 0x59->?*/0xd9,
 +/*27 Z 0x5a->?*/0x5a,
 +/*28 [ 0x5b->?*/0x5b,
-+/*!29 \ 0x5c->??*/0xdc,
-+/*!30 ] 0x5d->??*/0xdd,
-+/*!31 ^ 0x5e->??*/0xde,
-+/*!32 _ 0x5f->??*/0xdf,
++/*!29 \ 0x5c->?*/0xdc,
++/*!30 ] 0x5d->?*/0xdd,
++/*!31 ^ 0x5e->?*/0xde,
++/*!32 _ 0x5f->?*/0xdf,
 +/*33 ` 0x60->?*/0x60,
-+/*!34 a 0x61->??*/0xe1,
-+/*!35 b 0x62->??*/0xe2,
-+/*!36 c 0x63->??*/0xe3,
-+/*!37 d 0x64->??*/0xe4,
-+/*!38 e 0x65->??*/0xe5,
-+/*!39 f 0x66->??*/0xe6,
-+/*!40 g 0x67->??*/0xe7,
-+/*!41 h 0x68->??*/0xe8,
-+/*!42 i 0x69->??*/0xe9,
-+/*!43 j 0x6a->??*/0xea,
-+/*!44 k 0x6b->??*/0xeb,
-+/*!45 l 0x6c->??*/0xec,
-+/*!46 m 0x6d->??*/0xed,
-+/*!47 n 0x6e->??*/0xee,
-+/*!48 o 0x6f->??*/0xef,
-+/*!49 p 0x70->??*/0xf0,
-+/*!50 q 0x71->??*/0xf1,
-+/*!51 r 0x72->??*/0xf2,
-+/*!52 s 0x73->??*/0xf3,
-+/*!53 t 0x74->??*/0xf4,
-+/*!54 u 0x75->??*/0xf5,
-+/*!55 v 0x76->??*/0xf6,
-+/*!56 w 0x77->??*/0xf7,
-+/*!57 x 0x78->??*/0xf8,
-+/*!58 y 0x79->??*/0xf9,
-+/*59 z 0x7a->??(???? ????????)*/0xc0,
++/*!34 a 0x61->?*/0xe1,
++/*!35 b 0x62->?*/0xe2,
++/*!36 c 0x63->?*/0xe3,
++/*!37 d 0x64->?*/0xe4,
++/*!38 e 0x65->?*/0xe5,
++/*!39 f 0x66->?*/0xe6,
++/*!40 g 0x67->?*/0xe7,
++/*!41 h 0x68->?*/0xe8,
++/*!42 i 0x69->?*/0xe9,
++/*!43 j 0x6a->?*/0xea,
++/*!44 k 0x6b->?*/0xeb,
++/*!45 l 0x6c->?*/0xec,
++/*!46 m 0x6d->?*/0xed,
++/*!47 n 0x6e->?*/0xee,
++/*!48 o 0x6f->?*/0xef,
++/*!49 p 0x70->?*/0xf0,
++/*!50 q 0x71->?*/0xf1,
++/*!51 r 0x72->?*/0xf2,
++/*!52 s 0x73->?*/0xf3,
++/*!53 t 0x74->?*/0xf4,
++/*!54 u 0x75->?*/0xf5,
++/*!55 v 0x76->?*/0xf6,
++/*!56 w 0x77->?*/0xf7,
++/*!57 x 0x78->?*/0xf8,
++/*!58 y 0x79->?*/0xf9,
++/*59 z 0x7a->?(?? ????)*/0xc0,
 +/*60 { 0x7b->?*/0x7b,
-+/*!61 | 0x7c->??*/0xfc,
-+/*!62 } 0x7d->??*/0xfd,
-+/*!63 ~ 0x7e->??*/0xfe,
++/*!61 | 0x7c->?*/0xfc,
++/*!62 } 0x7d->?*/0xfd,
++/*!63 ~ 0x7e->?*/0xfe,
 +/*64   0x7f->?*/0x7f
 +  };
 +      c= *p;
@@ -488,32 +488,32 @@
 @@ -0,0 +1,28 @@
 +29-9-2003
 +
-+???????????????? ?????? ???? ALEVT 
-+?? ???????????????? ?????????????????? ?????????? ?????????????????????????? ???? patch alevt-1.6.1.rus.diff ?????? ???????????????? ?????? ????????????
-+contrib ?????? sources  ?????? alevt-1.6.1
++???????? ??? ?? ALEVT 
++? ???????? ????????? ????? ????????????? ?? patch alevt-1.6.1.rus.diff ??? ???????? ??? ??????
++contrib ??? sources  ??? alevt-1.6.1
 +
-+?????????????????? ???? ?????????????????? ???? ?????? ?????????????????? 
++????????? ?? ????????? ?? ??? ????????? 
 +
 +alevt -charset iso8859-7 
 +
-+?? 
++? 
 +
 +alevt -charset el
 +
-+???????????????? ?????? ?????????? ???? ????????????:
-+?????????????????? ???????????????????? ?????? font file vtxt-iso8859-7.bdf 
-+???? ???????????????? ???????????????????? ???????????????? ?????? bold ???? ?????????? ???? ???????? ???????????????????? ?????? ???????????????? 
-+???????????? ?????????? ?????????????????????????? ???? ???????? graphics  (0x01 -0x1f)
++???????? ??? ????? ?? ??????:
++????????? ?????????? ??? font file vtxt-iso8859-7.bdf 
++?? ???????? ?????????? ???????? ??? bold ?? ????? ?? ???? ?????????? ??? ???????? 
++?????? ????? ????????????? ?? ???? graphics  (0x01 -0x1f)
 +
-+??????????????? ?????? ???? ???? ???????????????????????????? ?????????? ???????? ???? ????????????????????
++??????? ??? ?? ?? ?????????????? ????? ???? ?? ??????????
 +
-+????????????? ?????????? ???? ???????????????? ???????????????? ???? ?????? ?????????????? ?????? ?????????????? ?????? ?????? sl45sms at yahoo.gr
-+???? ?????????????? ?????????? ?????????????????????? ?????????????? ?????? ?????? ?????????????? ???? ???????????????? ???? ???????????? ???? ?????? ?????????????? ??????
-+???????? ?????????????????? ?????? ????????????????????????
++?????? ????? ?? ???????? ???????? ?? ??? ??????? ??? ??????? ??? ??? sl45sms at yahoo.gr
++?? ??????? ????? ??????????? ??????? ??? ??? ??????? ?? ???????? ?? ?????? ?? ??? ??????? ???
++???? ????????? ??? ????????????
 +
-+?????????????? ???????????? ?????? ???????????????? ???? ???????????????? ???? ???????????????? ??????  http://go.to/sl45sms/alevt/index.html
++??????? ?????? ??? ???????? ?? ???????? ?? ???????? ???  http://go.to/sl45sms/alevt/index.html
 +
-+?????????????????? ????????????????????
++????????? ??????????
 diff -Nur alevt-1.6.2/vbi.c alevt-1.6.2.rus+greek/vbi.c
 --- alevt-1.6.2/vbi.c	2007-12-03 10:02:00.000000000 +0300
 +++ alevt-1.6.2.rus+greek/vbi.c	2009-04-10 06:59:25.000000000 +0400
@@ -12264,4 +12264,3 @@
  		    case 0x1b:		/* ESC (reserved) */
  			c = ' ';
  			break;
-


Index: alevt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alevt/devel/alevt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alevt.spec	13 Apr 2009 05:34:11 -0000	1.8
+++ alevt.spec	13 Apr 2009 08:31:23 -0000	1.9
@@ -1,6 +1,6 @@
 Name: alevt
 Version: 1.6.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Teletext decoder/browser
 Group: Applications/Multimedia
 License: GPLv2
@@ -63,6 +63,9 @@
 %doc README CHANGELOG COPYRIGHT
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-12
+- new patches from Alexey
+
 * Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1.6.2-11
 - rebuild with corrected patch2
 



From lucilanga at fedoraproject.org  Mon Apr 13 08:35:21 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 08:35:21 +0000 (UTC)
Subject: rpms/gaupol/F-9 .cvsignore, 1.2, 1.3 gaupol.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20090413083521.CC80570137@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28059

Modified Files:
	.cvsignore gaupol.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jan 2009 05:47:46 -0000	1.2
+++ .cvsignore	13 Apr 2009 08:34:50 -0000	1.3
@@ -1 +1 @@
-gaupol-0.13.1.tar.gz
+gaupol-0.14.tar.gz


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-9/gaupol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaupol.spec	20 Jan 2009 05:47:46 -0000	1.1
+++ gaupol.spec	13 Apr 2009 08:34:51 -0000	1.2
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
-Version:	0.13.1
+Version:	0.14
 Release:	1%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://home.gna.org/gaupol
-Source0:	http://download.gna.org/gaupol/0.13/%{name}-%{version}.tar.gz
+Source0:	http://download.gna.org/gaupol/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -64,6 +64,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.14-1
+- update source url
+- new upstream release
+
 * Thu Jan 15 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.1-1
 - initial package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jan 2009 05:47:47 -0000	1.2
+++ sources	13 Apr 2009 08:34:51 -0000	1.3
@@ -1 +1 @@
-11c62f478bcd9cd10a88752e4545e1d2  gaupol-0.13.1.tar.gz
+702a7a449981a51b70fc9c682f49a333  gaupol-0.14.tar.gz



From phuang at fedoraproject.org  Mon Apr 13 08:55:10 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 13 Apr 2009 08:55:10 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.28, 1.29 ibus.spec, 1.61, 1.62 sources,
	1.32, 1.33
Message-ID: <20090413085511.2A50670124@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2116

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.1.0.20090413


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	7 Apr 2009 03:09:32 -0000	1.28
+++ .cvsignore	13 Apr 2009 08:54:32 -0000	1.29
@@ -1 +1 @@
-ibus-1.1.0.20090407.tar.gz
+ibus-1.1.0.20090413.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ibus.spec	7 Apr 2009 10:45:15 -0000	1.61
+++ ibus.spec	13 Apr 2009 08:54:32 -0000	1.62
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090407
-Release:    3%{?dist}
+Version:    1.1.0.20090413
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -218,6 +218,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-1
+- Update to ibus-1.1.0.20090413.
+- Fix crash when restart the ibus-daemon
+- Add some translations.
+
 * Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-3
 - Update the tarball.
 - Fix bug 494511 - ibus-gtk makes gnome-terminal abort 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Apr 2009 10:45:15 -0000	1.32
+++ sources	13 Apr 2009 08:54:32 -0000	1.33
@@ -1 +1 @@
-6b335d802d131f6937613da7cd6da011  ibus-1.1.0.20090407.tar.gz
+80d8bf601bd1e00da26bfdeb59ca8bce  ibus-1.1.0.20090413.tar.gz



From akurtakov at fedoraproject.org  Mon Apr 13 09:14:19 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 13 Apr 2009 09:14:19 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.630,1.631
Message-ID: <20090413091419.3251B70124@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8240/devel

Modified Files:
	eclipse.spec 
Log Message:
Remove more p2 generated files.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -r1.630 -r1.631
--- eclipse.spec	13 Apr 2009 08:26:28 -0000	1.630
+++ eclipse.spec	13 Apr 2009 09:14:11 -0000	1.631
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.10%{?dist}
+Release:        0.1.11%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1059,6 +1059,7 @@
 rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache
 rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml
 rm -rf $sdkDir/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
+rm -rf $sdkDir/p2/org.eclipse.equinox.p2.engine/profileRegistry/PlatformProfile.profile/.data/.settings
 pushd $profileDir
   sed -i "s|$RPM_BUILD_ROOT||g" *.profile/*
 popd
@@ -1592,6 +1593,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.11
+- Remove more p2 generated files.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.10
 - Do not install p2 generatad file.
 



From pkgdb at fedoraproject.org  Mon Apr 13 09:16:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 09:16:49 +0000
Subject: [pkgdb] libgdbus had acl change status
Message-ID: <20090413091534.9CC3510F85A@bastion2.fedora.phx.redhat.com>

fab has set the watchbugzilla acl on libgdbus (Fedora devel) to Approved for holtmann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgdbus



From pkgdb at fedoraproject.org  Mon Apr 13 09:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 09:15:38 +0000
Subject: [pkgdb] libgdbus had acl change status
Message-ID: <20090413091537.DF82F10F87D@bastion2.fedora.phx.redhat.com>

fab has set the watchcommits acl on libgdbus (Fedora devel) to Approved for holtmann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgdbus



From huzaifas at fedoraproject.org  Mon Apr 13 09:46:48 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 13 Apr 2009 09:46:48 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric.spec,1.44,1.45
Message-ID: <20090413094648.B97E970124@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17418

Modified Files:
	gnumeric.spec 
Log Message:
resolve regression #495314


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnumeric.spec	6 Apr 2009 22:26:04 -0000	1.44
+++ gnumeric.spec	13 Apr 2009 09:46:18 -0000	1.45
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -9,6 +9,7 @@
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
+Patch0:		  gnumeric-1.8.4-desktop.patch
 Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
 Patch2:		  gnumeric-1.8.2-python.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
@@ -59,6 +60,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
 
@@ -189,6 +191,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-2
+- Resolved rhbz #495314
+
 * Tue Apr 07 2009 Robert Scheck <robert at fedoraproject.org> 1:1.8.4-1
 - Upgrade to 1.8.4 (#491769)
 



From huzaifas at fedoraproject.org  Mon Apr 13 09:47:52 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 13 Apr 2009 09:47:52 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric-1.8.4-desktop.patch,NONE,1.1
Message-ID: <20090413094752.CD98B70124@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17896

Added Files:
	gnumeric-1.8.4-desktop.patch 
Log Message:
resolve regression #495314

gnumeric-1.8.4-desktop.patch:

--- NEW FILE gnumeric-1.8.4-desktop.patch ---
--- gnumeric-1.8.4/gnumeric.desktop.in.desktop	2009-04-13 10:22:21.000000000 +0530
+++ gnumeric-1.8.4/gnumeric.desktop.in	2009-04-13 10:22:51.000000000 +0530
@@ -3,7 +3,7 @@
 _GenericName=Spreadsheet
 _Comment=Calculation, Analysis, and Visualization of Information
 Exec=gnumeric %F_OR_U
-Icon=gnome-gnumeric
+Icon=gnumeric
 Terminal=false
 Type=Application
 Categories=Application;Office;Spreadsheet;Science;Math;GNOME;GTK;



From akurtakov at fedoraproject.org  Mon Apr 13 09:55:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 13 Apr 2009 09:55:35 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.631,1.632
Message-ID: <20090413095536.19C1670124@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20194/devel

Modified Files:
	eclipse.spec 
Log Message:
o.e.update.core.linux is x86 only.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- eclipse.spec	13 Apr 2009 09:14:11 -0000	1.631
+++ eclipse.spec	13 Apr 2009 09:55:34 -0000	1.632
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.11%{?dist}
+Release:        0.1.12%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1447,6 +1447,7 @@
 %{_libdir}/%{name}/plugins/org.eclipse.core.net_*
 %ifarch %{ix86}
 %{_libdir}/%{name}/plugins/org.eclipse.core.net.linux.x86_*
+%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
 %endif
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
@@ -1496,7 +1497,6 @@
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.ui_*
 %{_libdir}/%{name}/plugins/org.mortbay.jetty.util_*
@@ -1593,6 +1593,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.12
+- o.e.update.core.linux is x86 only.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.11
 - Remove more p2 generated files.
 



From cwickert at fedoraproject.org  Mon Apr 13 10:09:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 10:09:27 +0000 (UTC)
Subject: rpms/lxmusic/devel import.log, NONE, 1.1 lxmusic.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413100927.8F4E770137@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23975/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lxmusic.spec 
Log Message:
Initial import of lxmusic. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=478668



--- NEW FILE import.log ---
lxmusic-0_2_3-2_fc11:HEAD:lxmusic-0.2.3-2.fc11.src.rpm:1239615969


--- NEW FILE lxmusic.spec ---
Name:           lxmusic
Version:        0.2.3
Release:        2%{?dist}
Summary:        Lightweight XMMS2 client with simple user interface

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://lxde.org
Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
BuildRequires:  desktop-file-utils gettext intltool
Requires:       xmms2 >= 0.5

%description
LXMusic is a very simple gtk+ XMMS2 client written in pure C. It has very few 
functionality, and can do nothing more than play the music. The UI is very 
clean and simple. This is currently aimed to be used as the default music 
player of LXDE (Lightweight X11 Desktop Environment) project.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/lxmusic.desktop
%{_datadir}/lxmusic
%{_datadir}/pixmaps/lxmusic.png


%changelog
* Sun Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-2
- Build Require gtk2-devel

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:21:25 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:08:56 -0000	1.2
@@ -0,0 +1 @@
+lxmusic-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:21:25 -0000	1.1
+++ sources	13 Apr 2009 10:08:56 -0000	1.2
@@ -0,0 +1 @@
+10d6fbbb7053afd338c0e0674f09949e  lxmusic-0.2.3.tar.gz



From cwickert at fedoraproject.org  Mon Apr 13 10:12:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 10:12:57 +0000 (UTC)
Subject: rpms/lxmusic/F-10 lxmusic.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090413101257.BF46870124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25772

Modified Files:
	.cvsignore sources 
Added Files:
	lxmusic.spec 
Log Message:
initial build for F10


--- NEW FILE lxmusic.spec ---
Name:           lxmusic
Version:        0.2.3
Release:        2%{?dist}
Summary:        Lightweight XMMS2 client with simple user interface

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://lxde.org
Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
BuildRequires:  desktop-file-utils gettext intltool
Requires:       xmms2 >= 0.5

%description
LXMusic is a very simple gtk+ XMMS2 client written in pure C. It has very few 
functionality, and can do nothing more than play the music. The UI is very 
clean and simple. This is currently aimed to be used as the default music 
player of LXDE (Lightweight X11 Desktop Environment) project.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/lxmusic.desktop
%{_datadir}/lxmusic
%{_datadir}/pixmaps/lxmusic.png


%changelog
* Sun Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-2
- Build Require gtk2-devel

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:21:25 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:12:27 -0000	1.2
@@ -0,0 +1 @@
+lxmusic-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:21:25 -0000	1.1
+++ sources	13 Apr 2009 10:12:27 -0000	1.2
@@ -0,0 +1 @@
+10d6fbbb7053afd338c0e0674f09949e  lxmusic-0.2.3.tar.gz



From amdunn at fedoraproject.org  Mon Apr 13 10:23:54 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Mon, 13 Apr 2009 10:23:54 +0000 (UTC)
Subject: rpms/emacs-mmm/devel emacs-mmm-fix-compile-warnings-0.4.8.patch,
	NONE, 
	1.1 emacs-mmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413102354.9E81870124@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/emacs-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28712/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mmm-fix-compile-warnings-0.4.8.patch emacs-mmm.spec 
	import.log 
Log Message:
Initial Fedora RPM.


emacs-mmm-fix-compile-warnings-0.4.8.patch:

--- NEW FILE emacs-mmm-fix-compile-warnings-0.4.8.patch ---
diff -dur mmm-mode-0.4.8.ORIG/mmm-compat.el mmm-mode-0.4.8/mmm-compat.el
--- mmm-mode-0.4.8.ORIG/mmm-compat.el	2003-03-09 10:04:03.000000000 -0700
+++ mmm-mode-0.4.8/mmm-compat.el	2009-04-08 11:21:19.000000000 -0600
@@ -65,9 +65,9 @@
   (defmacro defgroup (&rest args)
     nil)
   (defmacro defface (var values doc &rest args)
-    (` (make-face (quote (, var)))))
+    `(make-face (quote ,var)))
   (defmacro defcustom (var value doc &rest args) 
-    (` (defvar (, var) (, value) (, doc)))))
+    `(defvar ,var ,value ,doc)))
 
 ;;}}}
 ;;{{{ Regexp-Opt (Emacs 19)
diff -dur mmm-mode-0.4.8.ORIG/mmm-noweb.el mmm-mode-0.4.8/mmm-noweb.el
--- mmm-mode-0.4.8.ORIG/mmm-noweb.el	2004-06-16 08:01:10.000000000 -0600
+++ mmm-mode-0.4.8/mmm-noweb.el	2009-04-08 11:22:28.000000000 -0600
@@ -154,7 +154,7 @@
 				     nil)
 				 (list name
 				       (car pos-list) (cadr pos-list)))))))
-		   (mmm-submode-changes-in start stop t delim))))
+		   (mmm-submode-changes-in start stop))))
     ;; The above loop leaves lots of nils in the list...
     ;; Removing them saves us from having to do the (last x 2)
     ;; trick that mmm-regions-in does.
diff -dur mmm-mode-0.4.8.ORIG/mmm-region.el mmm-mode-0.4.8/mmm-region.el
--- mmm-mode-0.4.8.ORIG/mmm-region.el	2003-06-19 05:24:04.000000000 -0600
+++ mmm-mode-0.4.8/mmm-region.el	2009-04-08 11:27:30.000000000 -0600
@@ -586,7 +586,6 @@
       (ignore-errors (funcall func)))))
 
 (defun mmm-add-hooks ()
-  (make-local-hook 'post-command-hook)
   (add-hook 'post-command-hook 'mmm-update-submode-region nil 'local))
 
 (defun mmm-remove-hooks ()
diff -dur mmm-mode-0.4.8.ORIG/mmm-utils.el mmm-mode-0.4.8/mmm-utils.el
--- mmm-mode-0.4.8.ORIG/mmm-utils.el	2003-03-09 10:04:04.000000000 -0700
+++ mmm-mode-0.4.8/mmm-utils.el	2009-04-08 11:27:47.000000000 -0600
@@ -93,7 +93,7 @@
           subexp)
       (save-match-data
         (while (string-match "~\\([0-9]\\)" string)
-          (setq subexp (string-to-int (match-string-no-properties 1 string))
+          (setq subexp (string-to-number (match-string-no-properties 1 string))
                 string (replace-match
 			(save-match-data
 			  (set-match-data old-data)


--- NEW FILE emacs-mmm.spec ---
%define pkg mmm

# Check version defaults

# If the emacs-el package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise
# set defaults.
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.4.8
Release:        1%{?dist}
Summary:        Emacs minor mode allowing different major modes in the same file

Group:          Applications/Editors
License:        GPLv2+
URL:            http://mmm-mode.sourceforge.net/
Source0:        mmm-mode-%{version}.tar.gz
Patch0:         emacs-mmm-fix-compile-warnings-%{version}.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  emacs, texinfo-tex
Requires:       emacs(bin)
Requires(post): info
Requires(preun): info

%description
MMM Mode is an emacs add-on package providing a minor mode that allows
Multiple Major Modes to coexist in one buffer. It is particularly
well-suited to editing embedded code or code that generates other
code, such as Mason or Embperl server-side Perl code, or HTML output
by CGI scripts.

MMM Mode defines a general syntax--the "submode class"--for telling it
how one major mode should be embedded in another. At present, the list
of supplied submode classes is rather limited, but that will hopefully
change soon. Contributions are always welcome; writing a submode class
can be a good introduction to Emacs Lisp, and is usually a simple
excercise for those already proficient. MMM Mode was originally
designed to work in Emacs 19 and 20 and XEmacs 20 and 21.

This has been created as an emacs-only package as it already exists
for XEmacs in xemacs-packages-extra.

%package -n %{name}-el
Summary:        Elisp source files for %{pkg} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description -n %{name}-el

This package contains the elisp source files for %{pkg} under GNU
Emacs. You do not need to install this package to run %{pkg}. Install
the %{name} package to use %{pkg} with GNU Emacs.

%prep
%setup -q -n mmm-mode-%{version}

# Fix a number of compile warnings. Fixes courtesy Jerry James
# (see:
%patch0 -p1

%build
export EMACS=%{_bindir}/emacs

%configure
make

# Fix encoding with iconv for info page
mv mmm.info-2 mmm.info-2.tmp && \
   iconv -f ISO-8859-1 -t UTF-8 < mmm.info-2.tmp > mmm.info-2  &&\
   rm mmm.info-2.tmp

# The texinfo.tex here is stale, using it causes errors, so this will
# get the system one to be used instead
rm texinfo.tex
make mmm.pdf

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Fix an issue that occurs in the info files (not quite sure where in
# the process, so doing it here):

mv %{buildroot}%{_infodir}/mmm.info-2.gz \
   %{buildroot}%{_infodir}/mmm.info-2 && \
   gzip %{buildroot}%{_infodir}/mmm.info-2

# We don't want this either, but otherwise we need to do a more complicated
# make command
rm %{buildroot}%{_infodir}/dir

%clean
rm -rf %{buildroot}

%post
/sbin/install-info %{_infodir}/mmm.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/mmm.info.gz %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README README.Mason %{pkg}.pdf
%{emacs_lispdir}/*.elc
%{_infodir}/*.gz

%files -n %{name}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el

%changelog
* Wed Apr 08 2009 Alan Dunn <amdunn at gmail.com> 0.4.8-1
- Initial Fedora RPM.


--- NEW FILE import.log ---
emacs-mmm-0_4_8-1_fc10:HEAD:emacs-mmm-0.4.8-1.fc10.src.rpm:1239617910


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:16:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:23:24 -0000	1.2
@@ -0,0 +1 @@
+mmm-mode-0.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:16:59 -0000	1.1
+++ sources	13 Apr 2009 10:23:24 -0000	1.2
@@ -0,0 +1 @@
+5dd9e415ced923b588962efa41324de4  mmm-mode-0.4.8.tar.gz



From amdunn at fedoraproject.org  Mon Apr 13 10:25:58 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Mon, 13 Apr 2009 10:25:58 +0000 (UTC)
Subject: rpms/emacs-mmm/F-10 emacs-mmm-fix-compile-warnings-0.4.8.patch, NONE,
	1.1 emacs-mmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413102558.58FE170124@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/emacs-mmm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29463/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mmm-fix-compile-warnings-0.4.8.patch emacs-mmm.spec 
	import.log 
Log Message:
Initial Fedora RPM.


emacs-mmm-fix-compile-warnings-0.4.8.patch:

--- NEW FILE emacs-mmm-fix-compile-warnings-0.4.8.patch ---
diff -dur mmm-mode-0.4.8.ORIG/mmm-compat.el mmm-mode-0.4.8/mmm-compat.el
--- mmm-mode-0.4.8.ORIG/mmm-compat.el	2003-03-09 10:04:03.000000000 -0700
+++ mmm-mode-0.4.8/mmm-compat.el	2009-04-08 11:21:19.000000000 -0600
@@ -65,9 +65,9 @@
   (defmacro defgroup (&rest args)
     nil)
   (defmacro defface (var values doc &rest args)
-    (` (make-face (quote (, var)))))
+    `(make-face (quote ,var)))
   (defmacro defcustom (var value doc &rest args) 
-    (` (defvar (, var) (, value) (, doc)))))
+    `(defvar ,var ,value ,doc)))
 
 ;;}}}
 ;;{{{ Regexp-Opt (Emacs 19)
diff -dur mmm-mode-0.4.8.ORIG/mmm-noweb.el mmm-mode-0.4.8/mmm-noweb.el
--- mmm-mode-0.4.8.ORIG/mmm-noweb.el	2004-06-16 08:01:10.000000000 -0600
+++ mmm-mode-0.4.8/mmm-noweb.el	2009-04-08 11:22:28.000000000 -0600
@@ -154,7 +154,7 @@
 				     nil)
 				 (list name
 				       (car pos-list) (cadr pos-list)))))))
-		   (mmm-submode-changes-in start stop t delim))))
+		   (mmm-submode-changes-in start stop))))
     ;; The above loop leaves lots of nils in the list...
     ;; Removing them saves us from having to do the (last x 2)
     ;; trick that mmm-regions-in does.
diff -dur mmm-mode-0.4.8.ORIG/mmm-region.el mmm-mode-0.4.8/mmm-region.el
--- mmm-mode-0.4.8.ORIG/mmm-region.el	2003-06-19 05:24:04.000000000 -0600
+++ mmm-mode-0.4.8/mmm-region.el	2009-04-08 11:27:30.000000000 -0600
@@ -586,7 +586,6 @@
       (ignore-errors (funcall func)))))
 
 (defun mmm-add-hooks ()
-  (make-local-hook 'post-command-hook)
   (add-hook 'post-command-hook 'mmm-update-submode-region nil 'local))
 
 (defun mmm-remove-hooks ()
diff -dur mmm-mode-0.4.8.ORIG/mmm-utils.el mmm-mode-0.4.8/mmm-utils.el
--- mmm-mode-0.4.8.ORIG/mmm-utils.el	2003-03-09 10:04:04.000000000 -0700
+++ mmm-mode-0.4.8/mmm-utils.el	2009-04-08 11:27:47.000000000 -0600
@@ -93,7 +93,7 @@
           subexp)
       (save-match-data
         (while (string-match "~\\([0-9]\\)" string)
-          (setq subexp (string-to-int (match-string-no-properties 1 string))
+          (setq subexp (string-to-number (match-string-no-properties 1 string))
                 string (replace-match
 			(save-match-data
 			  (set-match-data old-data)


--- NEW FILE emacs-mmm.spec ---
%define pkg mmm

# Check version defaults

# If the emacs-el package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise
# set defaults.
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.4.8
Release:        1%{?dist}
Summary:        Emacs minor mode allowing different major modes in the same file

Group:          Applications/Editors
License:        GPLv2+
URL:            http://mmm-mode.sourceforge.net/
Source0:        mmm-mode-%{version}.tar.gz
Patch0:         emacs-mmm-fix-compile-warnings-%{version}.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  emacs, texinfo-tex
Requires:       emacs(bin)
Requires(post): info
Requires(preun): info

%description
MMM Mode is an emacs add-on package providing a minor mode that allows
Multiple Major Modes to coexist in one buffer. It is particularly
well-suited to editing embedded code or code that generates other
code, such as Mason or Embperl server-side Perl code, or HTML output
by CGI scripts.

MMM Mode defines a general syntax--the "submode class"--for telling it
how one major mode should be embedded in another. At present, the list
of supplied submode classes is rather limited, but that will hopefully
change soon. Contributions are always welcome; writing a submode class
can be a good introduction to Emacs Lisp, and is usually a simple
excercise for those already proficient. MMM Mode was originally
designed to work in Emacs 19 and 20 and XEmacs 20 and 21.

This has been created as an emacs-only package as it already exists
for XEmacs in xemacs-packages-extra.

%package -n %{name}-el
Summary:        Elisp source files for %{pkg} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description -n %{name}-el

This package contains the elisp source files for %{pkg} under GNU
Emacs. You do not need to install this package to run %{pkg}. Install
the %{name} package to use %{pkg} with GNU Emacs.

%prep
%setup -q -n mmm-mode-%{version}

# Fix a number of compile warnings. Fixes courtesy Jerry James
# (see:
%patch0 -p1

%build
export EMACS=%{_bindir}/emacs

%configure
make

# Fix encoding with iconv for info page
mv mmm.info-2 mmm.info-2.tmp && \
   iconv -f ISO-8859-1 -t UTF-8 < mmm.info-2.tmp > mmm.info-2  &&\
   rm mmm.info-2.tmp

# The texinfo.tex here is stale, using it causes errors, so this will
# get the system one to be used instead
rm texinfo.tex
make mmm.pdf

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Fix an issue that occurs in the info files (not quite sure where in
# the process, so doing it here):

mv %{buildroot}%{_infodir}/mmm.info-2.gz \
   %{buildroot}%{_infodir}/mmm.info-2 && \
   gzip %{buildroot}%{_infodir}/mmm.info-2

# We don't want this either, but otherwise we need to do a more complicated
# make command
rm %{buildroot}%{_infodir}/dir

%clean
rm -rf %{buildroot}

%post
/sbin/install-info %{_infodir}/mmm.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/mmm.info.gz %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README README.Mason %{pkg}.pdf
%{emacs_lispdir}/*.elc
%{_infodir}/*.gz

%files -n %{name}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el

%changelog
* Wed Apr 08 2009 Alan Dunn <amdunn at gmail.com> 0.4.8-1
- Initial Fedora RPM.


--- NEW FILE import.log ---
emacs-mmm-0_4_8-1_fc10:F-10:emacs-mmm-0.4.8-1.fc10.src.rpm:1239618019


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:16:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:25:27 -0000	1.2
@@ -0,0 +1 @@
+mmm-mode-0.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:16:59 -0000	1.1
+++ sources	13 Apr 2009 10:25:27 -0000	1.2
@@ -0,0 +1 @@
+5dd9e415ced923b588962efa41324de4  mmm-mode-0.4.8.tar.gz



From cwickert at fedoraproject.org  Mon Apr 13 10:27:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 10:27:33 +0000 (UTC)
Subject: rpms/lxmusic/F-9 lxmusic.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090413102733.593B470124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30026

Modified Files:
	.cvsignore sources 
Added Files:
	lxmusic.spec 
Log Message:
initial build for F9


--- NEW FILE lxmusic.spec ---
Name:           lxmusic
Version:        0.2.3
Release:        2%{?dist}
Summary:        Lightweight XMMS2 client with simple user interface

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://lxde.org
Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
BuildRequires:  desktop-file-utils gettext intltool
Requires:       xmms2 >= 0.5

%description
LXMusic is a very simple gtk+ XMMS2 client written in pure C. It has very few 
functionality, and can do nothing more than play the music. The UI is very 
clean and simple. This is currently aimed to be used as the default music 
player of LXDE (Lightweight X11 Desktop Environment) project.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/lxmusic.desktop
%{_datadir}/lxmusic
%{_datadir}/pixmaps/lxmusic.png


%changelog
* Sun Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-2
- Build Require gtk2-devel

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:21:25 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:27:03 -0000	1.2
@@ -0,0 +1 @@
+lxmusic-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:21:25 -0000	1.1
+++ sources	13 Apr 2009 10:27:03 -0000	1.2
@@ -0,0 +1 @@
+10d6fbbb7053afd338c0e0674f09949e  lxmusic-0.2.3.tar.gz



From amdunn at fedoraproject.org  Mon Apr 13 10:28:05 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Mon, 13 Apr 2009 10:28:05 +0000 (UTC)
Subject: rpms/emacs-mmm/F-9 emacs-mmm-fix-compile-warnings-0.4.8.patch, NONE,
	1.1 emacs-mmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413102805.EB89670124@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/emacs-mmm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30267/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mmm-fix-compile-warnings-0.4.8.patch emacs-mmm.spec 
	import.log 
Log Message:
Initial Fedora RPM.


emacs-mmm-fix-compile-warnings-0.4.8.patch:

--- NEW FILE emacs-mmm-fix-compile-warnings-0.4.8.patch ---
diff -dur mmm-mode-0.4.8.ORIG/mmm-compat.el mmm-mode-0.4.8/mmm-compat.el
--- mmm-mode-0.4.8.ORIG/mmm-compat.el	2003-03-09 10:04:03.000000000 -0700
+++ mmm-mode-0.4.8/mmm-compat.el	2009-04-08 11:21:19.000000000 -0600
@@ -65,9 +65,9 @@
   (defmacro defgroup (&rest args)
     nil)
   (defmacro defface (var values doc &rest args)
-    (` (make-face (quote (, var)))))
+    `(make-face (quote ,var)))
   (defmacro defcustom (var value doc &rest args) 
-    (` (defvar (, var) (, value) (, doc)))))
+    `(defvar ,var ,value ,doc)))
 
 ;;}}}
 ;;{{{ Regexp-Opt (Emacs 19)
diff -dur mmm-mode-0.4.8.ORIG/mmm-noweb.el mmm-mode-0.4.8/mmm-noweb.el
--- mmm-mode-0.4.8.ORIG/mmm-noweb.el	2004-06-16 08:01:10.000000000 -0600
+++ mmm-mode-0.4.8/mmm-noweb.el	2009-04-08 11:22:28.000000000 -0600
@@ -154,7 +154,7 @@
 				     nil)
 				 (list name
 				       (car pos-list) (cadr pos-list)))))))
-		   (mmm-submode-changes-in start stop t delim))))
+		   (mmm-submode-changes-in start stop))))
     ;; The above loop leaves lots of nils in the list...
     ;; Removing them saves us from having to do the (last x 2)
     ;; trick that mmm-regions-in does.
diff -dur mmm-mode-0.4.8.ORIG/mmm-region.el mmm-mode-0.4.8/mmm-region.el
--- mmm-mode-0.4.8.ORIG/mmm-region.el	2003-06-19 05:24:04.000000000 -0600
+++ mmm-mode-0.4.8/mmm-region.el	2009-04-08 11:27:30.000000000 -0600
@@ -586,7 +586,6 @@
       (ignore-errors (funcall func)))))
 
 (defun mmm-add-hooks ()
-  (make-local-hook 'post-command-hook)
   (add-hook 'post-command-hook 'mmm-update-submode-region nil 'local))
 
 (defun mmm-remove-hooks ()
diff -dur mmm-mode-0.4.8.ORIG/mmm-utils.el mmm-mode-0.4.8/mmm-utils.el
--- mmm-mode-0.4.8.ORIG/mmm-utils.el	2003-03-09 10:04:04.000000000 -0700
+++ mmm-mode-0.4.8/mmm-utils.el	2009-04-08 11:27:47.000000000 -0600
@@ -93,7 +93,7 @@
           subexp)
       (save-match-data
         (while (string-match "~\\([0-9]\\)" string)
-          (setq subexp (string-to-int (match-string-no-properties 1 string))
+          (setq subexp (string-to-number (match-string-no-properties 1 string))
                 string (replace-match
 			(save-match-data
 			  (set-match-data old-data)


--- NEW FILE emacs-mmm.spec ---
%define pkg mmm

# Check version defaults

# If the emacs-el package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise
# set defaults.
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.4.8
Release:        1%{?dist}
Summary:        Emacs minor mode allowing different major modes in the same file

Group:          Applications/Editors
License:        GPLv2+
URL:            http://mmm-mode.sourceforge.net/
Source0:        mmm-mode-%{version}.tar.gz
Patch0:         emacs-mmm-fix-compile-warnings-%{version}.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  emacs, texinfo-tex
Requires:       emacs(bin)
Requires(post): info
Requires(preun): info

%description
MMM Mode is an emacs add-on package providing a minor mode that allows
Multiple Major Modes to coexist in one buffer. It is particularly
well-suited to editing embedded code or code that generates other
code, such as Mason or Embperl server-side Perl code, or HTML output
by CGI scripts.

MMM Mode defines a general syntax--the "submode class"--for telling it
how one major mode should be embedded in another. At present, the list
of supplied submode classes is rather limited, but that will hopefully
change soon. Contributions are always welcome; writing a submode class
can be a good introduction to Emacs Lisp, and is usually a simple
excercise for those already proficient. MMM Mode was originally
designed to work in Emacs 19 and 20 and XEmacs 20 and 21.

This has been created as an emacs-only package as it already exists
for XEmacs in xemacs-packages-extra.

%package -n %{name}-el
Summary:        Elisp source files for %{pkg} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description -n %{name}-el

This package contains the elisp source files for %{pkg} under GNU
Emacs. You do not need to install this package to run %{pkg}. Install
the %{name} package to use %{pkg} with GNU Emacs.

%prep
%setup -q -n mmm-mode-%{version}

# Fix a number of compile warnings. Fixes courtesy Jerry James
# (see:
%patch0 -p1

%build
export EMACS=%{_bindir}/emacs

%configure
make

# Fix encoding with iconv for info page
mv mmm.info-2 mmm.info-2.tmp && \
   iconv -f ISO-8859-1 -t UTF-8 < mmm.info-2.tmp > mmm.info-2  &&\
   rm mmm.info-2.tmp

# The texinfo.tex here is stale, using it causes errors, so this will
# get the system one to be used instead
rm texinfo.tex
make mmm.pdf

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Fix an issue that occurs in the info files (not quite sure where in
# the process, so doing it here):

mv %{buildroot}%{_infodir}/mmm.info-2.gz \
   %{buildroot}%{_infodir}/mmm.info-2 && \
   gzip %{buildroot}%{_infodir}/mmm.info-2

# We don't want this either, but otherwise we need to do a more complicated
# make command
rm %{buildroot}%{_infodir}/dir

%clean
rm -rf %{buildroot}

%post
/sbin/install-info %{_infodir}/mmm.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/mmm.info.gz %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README README.Mason %{pkg}.pdf
%{emacs_lispdir}/*.elc
%{_infodir}/*.gz

%files -n %{name}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el

%changelog
* Wed Apr 08 2009 Alan Dunn <amdunn at gmail.com> 0.4.8-1
- Initial Fedora RPM.


--- NEW FILE import.log ---
emacs-mmm-0_4_8-1_fc10:F-9:emacs-mmm-0.4.8-1.fc10.src.rpm:1239618164


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:16:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:27:35 -0000	1.2
@@ -0,0 +1 @@
+mmm-mode-0.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:16:59 -0000	1.1
+++ sources	13 Apr 2009 10:27:35 -0000	1.2
@@ -0,0 +1 @@
+5dd9e415ced923b588962efa41324de4  mmm-mode-0.4.8.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 13 10:31:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:31:28 +0000
Subject: [pkgdb] moin: ivazquez has requested watchbugzilla
Message-ID: <20090413103127.C9F3810F85A@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchbugzilla acl on moin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:31:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:31:28 +0000
Subject: [pkgdb] moin: ivazquez has requested watchcommits
Message-ID: <20090413103128.33F7610F87D@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchcommits acl on moin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:32:48 +0000
Subject: [pkgdb] moin: ivazquez has requested commit
Message-ID: <20090413103135.C3AB310F880@bastion2.fedora.phx.redhat.com>

ivazquez has requested the commit acl on moin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:31:40 +0000
Subject: [pkgdb] moin: ivazquez has requested watchcommits
Message-ID: <20090413103139.7B49B10F884@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchcommits acl on moin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:32:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:32:56 +0000
Subject: [pkgdb] moin: ivazquez has requested watchbugzilla
Message-ID: <20090413103141.3746910F886@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchbugzilla acl on moin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:31:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:31:42 +0000
Subject: [pkgdb] moin: ivazquez has requested watchbugzilla
Message-ID: <20090413103143.7E2CA10F889@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchbugzilla acl on moin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:32:58 +0000
Subject: [pkgdb] moin: ivazquez has requested commit
Message-ID: <20090413103145.A125910F88C@bastion2.fedora.phx.redhat.com>

ivazquez has requested the commit acl on moin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:33:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:33:06 +0000
Subject: [pkgdb] moin: ivazquez has requested commit
Message-ID: <20090413103151.A415310F88E@bastion2.fedora.phx.redhat.com>

ivazquez has requested the commit acl on moin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:33:08 +0000
Subject: [pkgdb] moin: ivazquez has requested watchcommits
Message-ID: <20090413103155.2B60810F87D@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchcommits acl on moin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:32:05 +0000
Subject: [pkgdb] moin: ivazquez has requested watchbugzilla
Message-ID: <20090413103204.D9C5810F880@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchbugzilla acl on moin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:33:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:33:21 +0000
Subject: [pkgdb] moin: ivazquez has requested commit
Message-ID: <20090413103206.2CC9510F883@bastion2.fedora.phx.redhat.com>

ivazquez has requested the commit acl on moin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:32:08 +0000
Subject: [pkgdb] moin: ivazquez has requested watchcommits
Message-ID: <20090413103209.6918510F891@bastion2.fedora.phx.redhat.com>

ivazquez has requested the watchcommits acl on moin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From amdunn at fedoraproject.org  Mon Apr 13 10:38:53 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Mon, 13 Apr 2009 10:38:53 +0000 (UTC)
Subject: rpms/emacs-mmm/F-11 emacs-mmm-fix-compile-warnings-0.4.8.patch, NONE,
	1.1 emacs-mmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413103853.E43C570124@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/emacs-mmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv910/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mmm-fix-compile-warnings-0.4.8.patch emacs-mmm.spec 
	import.log 
Log Message:
Initial Fedora RPM.


emacs-mmm-fix-compile-warnings-0.4.8.patch:

--- NEW FILE emacs-mmm-fix-compile-warnings-0.4.8.patch ---
diff -dur mmm-mode-0.4.8.ORIG/mmm-compat.el mmm-mode-0.4.8/mmm-compat.el
--- mmm-mode-0.4.8.ORIG/mmm-compat.el	2003-03-09 10:04:03.000000000 -0700
+++ mmm-mode-0.4.8/mmm-compat.el	2009-04-08 11:21:19.000000000 -0600
@@ -65,9 +65,9 @@
   (defmacro defgroup (&rest args)
     nil)
   (defmacro defface (var values doc &rest args)
-    (` (make-face (quote (, var)))))
+    `(make-face (quote ,var)))
   (defmacro defcustom (var value doc &rest args) 
-    (` (defvar (, var) (, value) (, doc)))))
+    `(defvar ,var ,value ,doc)))
 
 ;;}}}
 ;;{{{ Regexp-Opt (Emacs 19)
diff -dur mmm-mode-0.4.8.ORIG/mmm-noweb.el mmm-mode-0.4.8/mmm-noweb.el
--- mmm-mode-0.4.8.ORIG/mmm-noweb.el	2004-06-16 08:01:10.000000000 -0600
+++ mmm-mode-0.4.8/mmm-noweb.el	2009-04-08 11:22:28.000000000 -0600
@@ -154,7 +154,7 @@
 				     nil)
 				 (list name
 				       (car pos-list) (cadr pos-list)))))))
-		   (mmm-submode-changes-in start stop t delim))))
+		   (mmm-submode-changes-in start stop))))
     ;; The above loop leaves lots of nils in the list...
     ;; Removing them saves us from having to do the (last x 2)
     ;; trick that mmm-regions-in does.
diff -dur mmm-mode-0.4.8.ORIG/mmm-region.el mmm-mode-0.4.8/mmm-region.el
--- mmm-mode-0.4.8.ORIG/mmm-region.el	2003-06-19 05:24:04.000000000 -0600
+++ mmm-mode-0.4.8/mmm-region.el	2009-04-08 11:27:30.000000000 -0600
@@ -586,7 +586,6 @@
       (ignore-errors (funcall func)))))
 
 (defun mmm-add-hooks ()
-  (make-local-hook 'post-command-hook)
   (add-hook 'post-command-hook 'mmm-update-submode-region nil 'local))
 
 (defun mmm-remove-hooks ()
diff -dur mmm-mode-0.4.8.ORIG/mmm-utils.el mmm-mode-0.4.8/mmm-utils.el
--- mmm-mode-0.4.8.ORIG/mmm-utils.el	2003-03-09 10:04:04.000000000 -0700
+++ mmm-mode-0.4.8/mmm-utils.el	2009-04-08 11:27:47.000000000 -0600
@@ -93,7 +93,7 @@
           subexp)
       (save-match-data
         (while (string-match "~\\([0-9]\\)" string)
-          (setq subexp (string-to-int (match-string-no-properties 1 string))
+          (setq subexp (string-to-number (match-string-no-properties 1 string))
                 string (replace-match
 			(save-match-data
 			  (set-match-data old-data)


--- NEW FILE emacs-mmm.spec ---
%define pkg mmm

# Check version defaults

# If the emacs-el package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise
# set defaults.
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.4.8
Release:        1%{?dist}
Summary:        Emacs minor mode allowing different major modes in the same file

Group:          Applications/Editors
License:        GPLv2+
URL:            http://mmm-mode.sourceforge.net/
Source0:        mmm-mode-%{version}.tar.gz
Patch0:         emacs-mmm-fix-compile-warnings-%{version}.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  emacs, texinfo-tex
Requires:       emacs(bin)
Requires(post): info
Requires(preun): info

%description
MMM Mode is an emacs add-on package providing a minor mode that allows
Multiple Major Modes to coexist in one buffer. It is particularly
well-suited to editing embedded code or code that generates other
code, such as Mason or Embperl server-side Perl code, or HTML output
by CGI scripts.

MMM Mode defines a general syntax--the "submode class"--for telling it
how one major mode should be embedded in another. At present, the list
of supplied submode classes is rather limited, but that will hopefully
change soon. Contributions are always welcome; writing a submode class
can be a good introduction to Emacs Lisp, and is usually a simple
excercise for those already proficient. MMM Mode was originally
designed to work in Emacs 19 and 20 and XEmacs 20 and 21.

This has been created as an emacs-only package as it already exists
for XEmacs in xemacs-packages-extra.

%package -n %{name}-el
Summary:        Elisp source files for %{pkg} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description -n %{name}-el

This package contains the elisp source files for %{pkg} under GNU
Emacs. You do not need to install this package to run %{pkg}. Install
the %{name} package to use %{pkg} with GNU Emacs.

%prep
%setup -q -n mmm-mode-%{version}

# Fix a number of compile warnings. Fixes courtesy Jerry James
# (see:
%patch0 -p1

%build
export EMACS=%{_bindir}/emacs

%configure
make

# Fix encoding with iconv for info page
mv mmm.info-2 mmm.info-2.tmp && \
   iconv -f ISO-8859-1 -t UTF-8 < mmm.info-2.tmp > mmm.info-2  &&\
   rm mmm.info-2.tmp

# The texinfo.tex here is stale, using it causes errors, so this will
# get the system one to be used instead
rm texinfo.tex
make mmm.pdf

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Fix an issue that occurs in the info files (not quite sure where in
# the process, so doing it here):

mv %{buildroot}%{_infodir}/mmm.info-2.gz \
   %{buildroot}%{_infodir}/mmm.info-2 && \
   gzip %{buildroot}%{_infodir}/mmm.info-2

# We don't want this either, but otherwise we need to do a more complicated
# make command
rm %{buildroot}%{_infodir}/dir

%clean
rm -rf %{buildroot}

%post
/sbin/install-info %{_infodir}/mmm.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/mmm.info.gz %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README README.Mason %{pkg}.pdf
%{emacs_lispdir}/*.elc
%{_infodir}/*.gz

%files -n %{name}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el

%changelog
* Wed Apr 08 2009 Alan Dunn <amdunn at gmail.com> 0.4.8-1
- Initial Fedora RPM.


--- NEW FILE import.log ---
emacs-mmm-0_4_8-1_fc10:F-11:emacs-mmm-0.4.8-1.fc10.src.rpm:1239618801


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:16:59 -0000	1.1
+++ .cvsignore	13 Apr 2009 10:38:22 -0000	1.2
@@ -0,0 +1 @@
+mmm-mode-0.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:16:59 -0000	1.1
+++ sources	13 Apr 2009 10:38:22 -0000	1.2
@@ -0,0 +1 @@
+5dd9e415ced923b588962efa41324de4  mmm-mode-0.4.8.tar.gz



From cwickert at fedoraproject.org  Mon Apr 13 10:39:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 10:39:42 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.237, 1.238 comps-f11.xml.in, 1.180,
	1.181 comps-f9.xml.in, 1.447, 1.448
Message-ID: <20090413103942.23AA970124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1317

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
add lxmusic


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- comps-f10.xml.in	9 Apr 2009 18:13:36 -0000	1.237
+++ comps-f10.xml.in	13 Apr 2009 10:39:39 -0000	1.238
@@ -3334,6 +3334,7 @@
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
+      <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">parcellite</packagereq>
     </packagelist>
@@ -4119,6 +4120,7 @@
       <packagereq type="optional">kdemultimedia</packagereq>
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
+      <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mkvtoolnix-gui</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- comps-f11.xml.in	9 Apr 2009 18:13:36 -0000	1.180
+++ comps-f11.xml.in	13 Apr 2009 10:39:39 -0000	1.181
@@ -3589,6 +3589,7 @@
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
+      <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">parcellite</packagereq>
     </packagelist>
@@ -4493,6 +4494,7 @@
       <packagereq type="optional">kdemultimedia</packagereq>
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
+      <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mkvtoolnix-gui</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- comps-f9.xml.in	9 Apr 2009 18:13:36 -0000	1.447
+++ comps-f9.xml.in	13 Apr 2009 10:39:40 -0000	1.448
@@ -3687,6 +3687,7 @@
       <packagereq type="optional">kdemultimedia</packagereq>
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
+      <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mkvtoolnix-gui</packagereq>



From pkgdb at fedoraproject.org  Mon Apr 13 10:41:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:41:27 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104127.045CA10F85A@bastion2.fedora.phx.redhat.com>

vpv has set the watchbugzilla acl on moin (Fedora devel) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:41:30 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104129.E9CE210F87D@bastion2.fedora.phx.redhat.com>

vpv has set the watchcommits acl on moin (Fedora devel) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:41:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:41:37 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104138.E39AE10F851@bastion2.fedora.phx.redhat.com>

vpv has set the commit acl on moin (Fedora devel) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:42:57 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104143.7702F10F881@bastion2.fedora.phx.redhat.com>

vpv has set the watchbugzilla acl on moin (Fedora EPEL 5) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:41:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:41:47 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104148.6191410F884@bastion2.fedora.phx.redhat.com>

vpv has set the watchcommits acl on moin (Fedora EPEL 5) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:41:52 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104151.B9B3510F87D@bastion2.fedora.phx.redhat.com>

vpv has set the commit acl on moin (Fedora EPEL 5) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:43:21 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104206.811E310F87B@bastion2.fedora.phx.redhat.com>

vpv has set the commit acl on moin (Fedora 9) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:42:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:42:07 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104208.194A910F880@bastion2.fedora.phx.redhat.com>

vpv has set the watchbugzilla acl on moin (Fedora 9) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:43:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:43:23 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104210.A2BBB10F887@bastion2.fedora.phx.redhat.com>

vpv has set the watchcommits acl on moin (Fedora 9) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:43:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:43:26 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104213.64E9210F889@bastion2.fedora.phx.redhat.com>

vpv has set the watchbugzilla acl on moin (Fedora 10) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:43:29 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104214.8BB0F10F88A@bastion2.fedora.phx.redhat.com>

vpv has set the watchcommits acl on moin (Fedora 10) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From pkgdb at fedoraproject.org  Mon Apr 13 10:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 10:42:16 +0000
Subject: [pkgdb] moin had acl change status
Message-ID: <20090413104217.7DC2310F88D@bastion2.fedora.phx.redhat.com>

vpv has set the commit acl on moin (Fedora 10) to Approved for ivazquez

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moin



From bskeggs at fedoraproject.org  Mon Apr 13 10:45:56 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 13 Apr 2009 10:45:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.31, 1.32 sources, 1.32,
	1.33 xorg-x11-drv-nouveau.spec, 1.37, 1.38 nouveau-eedid.patch,
	1.3, NONE nouveau-fedora.patch, 1.20, NONE
Message-ID: <20090413104556.6AD8570124@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138

Modified Files:
	.cvsignore sources xorg-x11-drv-nouveau.spec 
Removed Files:
	nouveau-eedid.patch nouveau-fedora.patch 
Log Message:
* Mon Apr 13 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-26.20090413git7100c06
- nouveau-fedora.patch: split out into indivdual functionality
- nv50: disable acceleration on NVAx chipsets, it won't work properly yet
- drop nouveau-eedid.patch, it's upstream now





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	8 Apr 2009 06:28:11 -0000	1.31
+++ .cvsignore	13 Apr 2009 10:45:22 -0000	1.32
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090408gitd8545e6.tar.bz2
+xf86-video-nouveau-0.0.12-20090413git7100c06.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Apr 2009 06:28:11 -0000	1.32
+++ sources	13 Apr 2009 10:45:23 -0000	1.33
@@ -1 +1 @@
-5caf4c97e5d07c448c00487e4aaef0d4  xf86-video-nouveau-0.0.12-20090408gitd8545e6.tar.bz2
+830eee644788c6357cb0f965ceedd764  xf86-video-nouveau-0.0.12-20090413git7100c06.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-drv-nouveau.spec	8 Apr 2009 06:28:11 -0000	1.37
+++ xorg-x11-drv-nouveau.spec	13 Apr 2009 10:45:23 -0000	1.38
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090408
-%define git_version d8545e6
+%define gitdate 20090413
+%define git_version 7100c06
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,9 +19,9 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   25.%{snapshot}%{?dist}
+Release:   26.%{snapshot}%{?dist}
 URL:       http://www.x.org
-License: MIT
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,9 +41,12 @@
 Requires:  libdrm >= 2.4.4-4
 Requires:  kernel-drm-nouveau = 12
 
-Patch0: nouveau-fedora.patch
-Patch1: nouveau-eedid.patch
-Patch2: dcbconf_7_4_ignore.diff
+Patch0: nouveau-transition-hack.patch
+Patch1: nouveau-store-vbios.patch
+Patch2: nouveau-multiple-xserver.patch
+Patch3: nouveau-nv50-fb-accel.patch
+Patch4: nouveau-nv50-nva0-noaccel.patch
+Patch5: dcbconf_7_4_ignore.diff
 
 %description 
 X.Org X11 nouveau video driver.
@@ -51,9 +54,12 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .fedora
-%patch1 -p1 -b .eedid
-%patch2 -p1 -b .dcbconf
+%patch0 -p1 -b .transition
+%patch1 -p1 -b .vbios
+%patch2 -p1 -b .userswitch
+%patch3 -p1 -b .nv50_fb_render
+%patch4 -p1 -b .nva0_noaccel
+%patch5 -p1 -b .dcbconf
 
 %build
 autoreconf -v --install
@@ -77,6 +83,11 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Apr 13 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-26.20090413git7100c06
+- nouveau-fedora.patch: split out into indivdual functionality
+- nv50: disable acceleration on NVAx chipsets, it won't work properly yet
+- drop nouveau-eedid.patch, it's upstream now
+
 * Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-25.20090408gitd8545e6
 - correct logic error in vbios parser (rh#493981)
 


--- nouveau-eedid.patch DELETED ---


--- nouveau-fedora.patch DELETED ---



From bskeggs at fedoraproject.org  Mon Apr 13 10:47:02 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 13 Apr 2009 10:47:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel nouveau-multiple-xserver.patch, NONE,
	1.1 nouveau-nv50-fb-accel.patch, NONE,
	1.1 nouveau-nv50-nva0-noaccel.patch, NONE,
	1.1 nouveau-store-vbios.patch, NONE,
	1.1 nouveau-transition-hack.patch, NONE, 1.1
Message-ID: <20090413104702.3007F70124@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4731

Added Files:
	nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch 
	nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch 
	nouveau-transition-hack.patch 
Log Message:
add new patches


nouveau-multiple-xserver.patch:

--- NEW FILE nouveau-multiple-xserver.patch ---
>From 5e1a05537d929b011bac973a36dfb17d5cbce85d Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at gmail.com>
Date: Mon, 13 Apr 2009 19:25:25 +1000
Subject: [PATCH 3/5] f11: hack to support multiple xserver instances

---
 src/nv_driver.c |  126 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 92232dd..9f4c96f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <sys/ioctl.h>
 
 #include "nv_include.h"
 
@@ -654,14 +655,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
  */
 
 /* Mandatory */
+static void NVMapMemGART(ScrnInfoPtr);
 static Bool
 NVEnterVT(int scrnIndex, int flags)
 {
 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 	NVPtr pNv = NVPTR(pScrn);
+	int ret;
 
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
 
+	if (pNv->dev) {
+		ret = ioctl(nouveau_device(pNv->dev)->fd,
+			    DRM_IOCTL_SET_MASTER, NULL);
+		if (ret) {
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "Unable to set master\n");
+		}
+
+		NVMapMemGART(pScrn);
+	}
+
 	if (!pNv->NoAccel)
 		NVAccelCommonInit(pScrn);
 
@@ -718,6 +732,12 @@ NVLeaveVT(int scrnIndex, int flags)
 
 	NVSync(pScrn);
 
+	if (pNv->dev) {
+		nouveau_bo_ref(NULL, &pNv->GART);
+
+		ioctl(nouveau_device(pNv->dev)->fd, DRM_IOCTL_DROP_MASTER, NULL);
+	}
+
 	if (!pNv->kms_enable) {
 		if (pNv->Architecture < NV_ARCH_50)
 			NVRestore(pScrn);
@@ -1629,11 +1649,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
 }
 
 static Bool
+NVMapMemSharedFB(ScrnInfoPtr pScrn)
+{
+	NVPtr pNv = NVPTR(pScrn);
+	uint64_t handle, size;
+	void *map;
+	int ret;
+
+	ret = nouveau_device_get_param(pNv->dev, 0xdeadcafe00000001, &handle);
+	if (ret)
+		return FALSE;
+
+	ret = nouveau_device_get_param(pNv->dev, 0xdeadcafe00000002, &size);
+	if (ret)
+		return FALSE;
+
+	if (nouveau_device(pNv->dev)->mm_enabled) {
+		ret = nouveau_bo_handle_ref(pNv->dev, handle, &pNv->FB);
+		if (ret) {
+			ErrorF("%d\n", ret);
+			return FALSE;
+		}
+
+		pNv->FB->size = size;
+		pNv->FB->tiled = (pNv->Architecture == NV_ARCH_50);
+		return TRUE;
+	}
+
+	ret = drmMap(nouveau_device(pNv->dev)->fd, handle >> 32, size, &map);
+	if (ret)
+		return FALSE;
+
+	ret = nouveau_bo_fake(pNv->dev, handle & 0xffffffff, NOUVEAU_BO_VRAM |
+			      NOUVEAU_BO_PIN, size, map, &pNv->FB);
+	if (ret)
+		return FALSE;
+
+	pNv->FB->tiled = (pNv->Architecture == NV_ARCH_50);
+	return TRUE;
+}
+
+static void
+NVMapMemGART(ScrnInfoPtr pScrn) {
+	NVPtr pNv = NVPTR(pScrn);
+	int size;
+
+	if (pNv->AGPSize) {
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			   "AGPGART: %dMiB available\n",
+			   (unsigned int)(pNv->AGPSize >> 20));
+		if (pNv->AGPSize > (16*1024*1024))
+			size = 16*1024*1024;
+		else
+			/* always leave 512kb for other things like the fifos */
+			size = pNv->AGPSize - 512*1024;
+	} else {
+		size = (4 << 20) - (1 << 18) ;
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			   "GART: PCI DMA - using %dKiB\n",
+			   size >> 10);
+	}
+
+	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN, 0,
+			   size, &pNv->GART)) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Unable to allocate GART memory\n");
+	}
+}
+
+static Bool
 NVMapMem(ScrnInfoPtr pScrn)
 {
 	NVPtr pNv = NVPTR(pScrn);
 	uint64_t res;
 	int size;
+	uint32_t flags;
 
 	if (!pNv->dev)
 		return NVMapMemSW(pScrn);
@@ -1650,46 +1740,26 @@ NVMapMem(ScrnInfoPtr pScrn)
 		size = size * (pScrn->bitsPerPixel >> 3);
 		size = size * pScrn->virtualY;
 	} else {
+		if (NVMapMemSharedFB(pScrn))
+			goto skip_fb;
 		size = pNv->VRAMPhysicalSize / 2;
 	}
 
-	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
-			   0, size, &pNv->FB)) {
+	flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN;
+	if (pNv->Architecture >= NV_ARCH_50)
+		flags |= NOUVEAU_BO_TILED;
+
+	if (nouveau_bo_new(pNv->dev, flags, 0, size, &pNv->FB)) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "Failed to allocate framebuffer memory\n");
 		return FALSE;
 	}
+skip_fb:
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "Allocated %dMiB VRAM for framebuffer + offscreen pixmaps, "
 		   "at offset 0x%X\n",
 		   (uint32_t)(pNv->FB->size >> 20), (uint32_t) pNv->FB->offset);
 
-	if (pNv->AGPSize) {
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			   "AGPGART: %dMiB available\n",
-			   (unsigned int)(pNv->AGPSize >> 20));
-		if (pNv->AGPSize > (16*1024*1024))
-			size = 16*1024*1024;
-		else
-			/* always leave 512kb for other things like the fifos */
-			size = pNv->AGPSize - 512*1024;
-	} else {
-		size = (4 << 20) - (1 << 18) ;
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			   "GART: PCI DMA - using %dKiB\n",
-			   size >> 10);
-	}
-
-	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN, 0,
-			   size, &pNv->GART)) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "Unable to allocate GART memory\n");
-	}
-	if (pNv->GART) {
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			   "GART: Allocated %dMiB as a scratch buffer\n",
-			   (unsigned int)(pNv->GART->size >> 20));
-	}
 
 	/* We don't need to allocate cursors / lut here if we're using
 	 * kernel modesetting
-- 
1.6.2.2


nouveau-nv50-fb-accel.patch:

--- NEW FILE nouveau-nv50-fb-accel.patch ---
>From ef28c68a7f4563b591e725d8d0119e2156a28f30 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at gmail.com>
Date: Mon, 13 Apr 2009 19:30:38 +1000
Subject: [PATCH 4/5] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout

---
 src/Makefile.am          |    1 +
 src/drmmode_display.c    |    8 +-
 src/nouveau_exa.c        |   37 +++++--
 src/nv50_randr.c         |    2 +-
 src/nv50_shadow_damage.c |  275 ++++++++++++++++++++++++++++++++++++++++++++++
 src/nv_dri.c             |    2 +-
 src/nv_driver.c          |   38 ++++++-
 src/nv_proto.h           |    4 +
 src/nv_shadow.c          |    8 +-
 src/nv_type.h            |    4 +
 10 files changed, 356 insertions(+), 23 deletions(-)
 create mode 100644 src/nv50_shadow_damage.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 29253a6..0c9e4e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,6 +81,7 @@ nouveau_drv_la_SOURCES = \
 			 nv50_xv.c \
 			 nv50_texture.h \
 			 nv50reg.h \
+			 nv50_shadow_damage.c \
 			 nouveau_crtc.h \
 			 nouveau_output.h \
 			 nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c315a70..55f7468 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -214,8 +214,8 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
 	}
 	src = (void *)req.vaddr;
 	
-	nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR);
-	dst = pNv->FB->map;
+	nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
+	dst = pNv->scanout->map;
 	dst += (y * fb->pitch) + (x * (fb->bpp >> 3));
 
 	h = fb->height;
@@ -225,7 +225,7 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
 		dst += pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
 	}
 
-	nouveau_bo_unmap(pNv->FB);
+	nouveau_bo_unmap(pNv->scanout);
 	drmFree(fb);
 }
 
@@ -289,7 +289,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		ret = drmModeAddFB(drmmode->fd,
 				   pScrn->virtualX, pScrn->virtualY,
 				   pScrn->depth, pScrn->bitsPerPixel,
-				   pitch, pNv->FB->handle, &drmmode->fb_id);
+				   pitch, pNv->scanout->handle, &drmmode->fb_id);
 		if (ret < 0) {
 			ErrorF("failed to add fb\n");
 			return FALSE;
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
index b7bcc87..aee2794 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -265,7 +265,8 @@ nouveau_exa_wait_marker(ScreenPtr pScreen, int marker)
 static Bool
 nouveau_exa_prepare_access(PixmapPtr ppix, int index)
 {
-	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
+	ScreenPtr pScreen = ppix->drawable.pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
 
 	if (pNv->exa_driver_pixmaps) {
@@ -275,20 +276,33 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
 			return FALSE;
 
 		ppix->devPrivate.ptr = map;
-		return TRUE;
+	} else
+	if (ppix == pScreen->GetScreenPixmap(pScreen)) {
+		nouveau_bo_map(pNv->scanout, NOUVEAU_BO_RDWR);
+		ppix->devPrivate.ptr = pNv->scanout->map;
+	} else {
+		/* force migration */
+		return FALSE;
 	}
 
-	return FALSE;
+	return TRUE;
 }
 
 static void
 nouveau_exa_finish_access(PixmapPtr ppix, int index)
 {
-	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
+	ScreenPtr pScreen = ppix->drawable.pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
 
-	if (pNv->exa_driver_pixmaps)
+	if (pNv->exa_driver_pixmaps) {
 		nouveau_exa_pixmap_unmap(ppix);
+	} else
+	if (ppix == pScreen->GetScreenPixmap(pScreen)) {
+		ppix->devPrivate.ptr = NULL;
+		nouveau_bo_unmap(pNv->scanout);
+		nv50_shadow_damage_frontbuffer_fallback(pScrn);
+	}
 }
 
 static Bool
@@ -393,8 +407,7 @@ nouveau_exa_pixmap_is_tiled(PixmapPtr ppix)
 		if (!nouveau_pixmap_bo(ppix)->tiled)
 			return false;
 	} else
-	if (pNv->Architecture < NV_ARCH_50 ||
-	    exaGetPixmapOffset(ppix) < pNv->EXADriverPtr->offScreenBase)
+	if (pNv->Architecture < NV_ARCH_50)
 		return false;
 
 	return true;
@@ -406,7 +419,7 @@ nouveau_exa_pixmap_map(PixmapPtr ppix)
 	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
 	unsigned delta = nouveau_pixmap_offset(ppix);
 
-	if (bo->tiled) {
+	if (NVPTR(xf86Screens[ppix->drawable.pScreen->myNum])->GART && bo->tiled) {
 		struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
 
 		nvpix->map_refcount++;
@@ -432,7 +445,7 @@ nouveau_exa_pixmap_unmap(PixmapPtr ppix)
 {
 	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
 
-	if (bo->tiled) {
+	if (NVPTR(xf86Screens[ppix->drawable.pScreen->myNum])->GART && bo->tiled) {
 		struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
 
 		if (--nvpix->map_refcount)
@@ -616,6 +629,12 @@ nouveau_exa_init(ScreenPtr pScreen)
 		exa->maxY = 2048;
 	}
 
+	/* Needed for frontbuffer fallbacks (to ensure it accesses the linear fb). */
+	if (pNv->Architecture >= NV_ARCH_50) {
+		exa->PrepareAccess = nouveau_exa_prepare_access;
+		exa->FinishAccess = nouveau_exa_finish_access;
+	}
+
 	exa->MarkSync = nouveau_exa_mark_sync;
 	exa->WaitMarker = nouveau_exa_wait_marker;
 
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
index 657e13a..6c19780 100644
--- a/src/nv50_randr.c
+++ b/src/nv50_randr.c
@@ -99,7 +99,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste
 		nv_crtc->crtc->SetFB(nv_crtc->crtc, nv_crtc->shadow);
 		nv_crtc->crtc->SetFBOffset(nv_crtc->crtc, 0, 0);
 	} else {
-		nv_crtc->crtc->SetFB(nv_crtc->crtc, pNv->FB);
+		nv_crtc->crtc->SetFB(nv_crtc->crtc, pNv->scanout);
 		nv_crtc->crtc->SetFBOffset(nv_crtc->crtc, x, y);
 	}
 	nv_crtc->crtc->ModeSet(nv_crtc->crtc, mode);
diff --git a/src/nv50_shadow_damage.c b/src/nv50_shadow_damage.c
new file mode 100644
index 0000000..942aba3
--- /dev/null
+++ b/src/nv50_shadow_damage.c
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2009 Maarten Maathuis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * This file serves to process all damage to the frontbuffer pixmap.
+ * This is needed until we can/have:
+ * - Tiled frontbufffer support.
+ * - Working wfb support.
+ * - Widespread wfb exa support.
+ */
+
+#include "nv_include.h"
+#include "damagestr.h"
+
+/* When driver allocated pixmaps are used we can easily fold this back into exa code. */
+static void nv50_shadow_damage_blit(PixmapPtr ppix, RegionPtr pRegion)
+{
+	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
+	NVPtr pNv = NVPTR(pScrn);
+	struct nouveau_channel *chan = pNv->chan;
+	struct nouveau_grobj *eng2d = pNv->Nv2D;
+	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+	unsigned delta = nouveau_pixmap_offset(ppix);
+	uint32_t fmt;
+	BoxPtr pbox;
+	int nbox;
+
+	pbox = REGION_RECTS(pRegion);
+	nbox = REGION_NUM_RECTS(pRegion);
+	if (!nbox)
+		return;
+
+	/* flush_notify is not needed, we check for all the ring space in advance. */
+	WAIT_RING (chan, 26 + nbox * 13);
+
+	switch (ppix->drawable.depth) {
+		case 8 : fmt = NV50_2D_SRC_FORMAT_8BPP; break;
+		case 15: fmt = NV50_2D_SRC_FORMAT_15BPP; break;
+		case 16: fmt = NV50_2D_SRC_FORMAT_16BPP; break;
+		case 24: fmt = NV50_2D_SRC_FORMAT_24BPP; break;
+		case 32: fmt = NV50_2D_SRC_FORMAT_32BPP; break;
+		default:
+			 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				    "Unknown surface format for bpp=%d\n",
+				    ppix->drawable.depth);
+			 return;
+	}
+
+	/* tiled source */
+	BEGIN_RING(chan, eng2d, NV50_2D_SRC_FORMAT, 5);
+	OUT_RING  (chan, fmt);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, 1);
+	OUT_RING  (chan, 0);
+
+	BEGIN_RING(chan, eng2d, NV50_2D_SRC_WIDTH, 4);
+	OUT_RING  (chan, ppix->drawable.width);
+	OUT_RING  (chan, ppix->drawable.height);
+	OUT_RELOCh(chan, bo, delta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	OUT_RELOCl(chan, bo, delta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
+	/* untiled destination */
+	BEGIN_RING(chan, eng2d, NV50_2D_DST_FORMAT, 2);
+	OUT_RING  (chan, fmt);
+	OUT_RING  (chan, 1);
+	BEGIN_RING(chan, eng2d, NV50_2D_DST_PITCH, 5);
+	OUT_RING  (chan, NOUVEAU_ALIGN(pScrn->virtualX, 64) *
+			 (pScrn->bitsPerPixel >> 3));
+	OUT_RING  (chan, ppix->drawable.width);
+	OUT_RING  (chan, ppix->drawable.height);
+	OUT_RELOCh(chan, pNv->scanout, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	OUT_RELOCl(chan, pNv->scanout, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
+	BEGIN_RING(chan, eng2d, NV50_2D_CLIP_X, 4);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, ppix->drawable.width);
+	OUT_RING  (chan, ppix->drawable.height);
+	BEGIN_RING(chan, eng2d, NV50_2D_OPERATION, 1);
+	OUT_RING  (chan, NV50_2D_OPERATION_SRCCOPY);
+
+	while (nbox--) {
+		BEGIN_RING(chan, eng2d, NV50_2D_BLIT_DST_X, 12);
+		OUT_RING  (chan, pbox->x1);
+		OUT_RING  (chan, pbox->y1);
+		OUT_RING  (chan, pbox->x2 - pbox->x1);
+		OUT_RING  (chan, pbox->y2 - pbox->y1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, 1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, 1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, pbox->x1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, pbox->y1);
+
+		pbox++;
+	}
+}
+
+/* For frontbuffer fallbacks. */
+static void nv50_shadow_damage_blit_back(PixmapPtr ppix, RegionPtr pRegion)
+{
+	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
+	NVPtr pNv = NVPTR(pScrn);
+	struct nouveau_channel *chan = pNv->chan;
+	struct nouveau_grobj *eng2d = pNv->Nv2D;
+	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+	unsigned delta = nouveau_pixmap_offset(ppix);
+	uint32_t fmt;
+	BoxPtr pbox;
+	int nbox;
+
+	pbox = REGION_RECTS(pRegion);
+	nbox = REGION_NUM_RECTS(pRegion);
+	if (!nbox)
+		return;
+
+	/* flush_notify is not needed, we check for all the ring space in advance. */
+	WAIT_RING (chan, 26 + nbox * 13);
+
+	switch (ppix->drawable.depth) {
+		case 8 : fmt = NV50_2D_SRC_FORMAT_8BPP; break;
+		case 15: fmt = NV50_2D_SRC_FORMAT_15BPP; break;
+		case 16: fmt = NV50_2D_SRC_FORMAT_16BPP; break;
+		case 24: fmt = NV50_2D_SRC_FORMAT_24BPP; break;
+		case 32: fmt = NV50_2D_SRC_FORMAT_32BPP; break;
+		default:
+			 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				    "Unknown surface format for bpp=%d\n",
+				    ppix->drawable.depth);
+			 return;
+	}
+
+	/* untiled source */
+	BEGIN_RING(chan, eng2d, NV50_2D_SRC_FORMAT, 2);
+	OUT_RING  (chan, fmt);
+	OUT_RING  (chan, 1);
+	BEGIN_RING(chan, eng2d, NV50_2D_SRC_PITCH, 5);
+	OUT_RING  (chan, NOUVEAU_ALIGN(pScrn->virtualX, 64) *
+			 (pScrn->bitsPerPixel >> 3));
+	OUT_RING  (chan, ppix->drawable.width);
+	OUT_RING  (chan, ppix->drawable.height);
+	OUT_RELOCh(chan, pNv->scanout, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	OUT_RELOCl(chan, pNv->scanout, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
+	/* tiled destination */
+	BEGIN_RING(chan, eng2d, NV50_2D_DST_FORMAT, 5);
+	OUT_RING  (chan, fmt);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, 1);
+	OUT_RING  (chan, 0);
+
+	BEGIN_RING(chan, eng2d, NV50_2D_DST_WIDTH, 4);
+	OUT_RING  (chan, ppix->drawable.width);
+	OUT_RING  (chan, ppix->drawable.height);
+	OUT_RELOCh(chan, bo, delta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+	OUT_RELOCl(chan, bo, delta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+
+	BEGIN_RING(chan, eng2d, NV50_2D_CLIP_X, 4);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, 0);
+	OUT_RING  (chan, ppix->drawable.width);
+	OUT_RING  (chan, ppix->drawable.height);
+	BEGIN_RING(chan, eng2d, NV50_2D_OPERATION, 1);
+	OUT_RING  (chan, NV50_2D_OPERATION_SRCCOPY);
+
+	while (nbox--) {
+		BEGIN_RING(chan, eng2d, NV50_2D_BLIT_DST_X, 12);
+		OUT_RING  (chan, pbox->x1);
+		OUT_RING  (chan, pbox->y1);
+		OUT_RING  (chan, pbox->x2 - pbox->x1);
+		OUT_RING  (chan, pbox->y2 - pbox->y1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, 1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, 1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, pbox->x1);
+		OUT_RING  (chan, 0);
+		OUT_RING  (chan, pbox->y1);
+
+		pbox++;
+	}
+}
+
+static void nv50_shadow_damage_report(DamagePtr pDamage, RegionPtr pRegion, void *closure)
+{
+	PixmapPtr ppix = closure;
+
+	nv50_shadow_damage_blit(ppix, pRegion);
+}
+
+void nv50_shadow_damage_frontbuffer_fallback(ScrnInfoPtr pScrn)
+{
+	NVPtr pNv = NVPTR(pScrn);
+	ScreenPtr pScreen = pScrn->pScreen;
+	PixmapPtr ppix = NULL;
+	DamagePtr pDamage = pNv->screen_damage;
+
+	if (pNv->Architecture < NV_ARCH_50)
+		return;
+
+	ppix = pScreen->GetScreenPixmap(pScreen);
+	if (!ppix) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			"No screen pixmap.\n");
+		return;
+	}
+
+	/* Pending damage reflects the rendering currently being done. */
+	/* When exa calls finish access, damage hasn't flushed it yet. */
+	nv50_shadow_damage_blit_back(ppix, &pDamage->pendingDamage);
+}
+
+static void nv50_shadow_damage_destroy(DamagePtr pDamage, void *closure)
+{
+	PixmapPtr ppix = closure;
+	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
+	NVPtr pNv = NVPTR(pScrn);
+
+	pNv->screen_damage = NULL;
+}
+
+bool nv50_shadow_damage_create(ScrnInfoPtr pScrn)
+{
+	NVPtr pNv = NVPTR(pScrn);
+	ScreenPtr pScreen = pScrn->pScreen;
+	PixmapPtr ppix = NULL;
+
+	if (pNv->Architecture < NV_ARCH_50)
+		return false;
+
+	ppix = pScreen->GetScreenPixmap(pScreen);
+	if (!ppix) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			"No screen pixmap.\n");
+		return false;
+	}
+
+	pNv->screen_damage = DamageCreate(nv50_shadow_damage_report, nv50_shadow_damage_destroy, DamageReportRawRegion, true, pScreen, ppix);
+	if (!pNv->screen_damage) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			"No screen damage\n");
+		return false;
+	}
+
+	/* We want the notification after submission. */
+	DamageSetReportAfterOp(pNv->screen_damage, true);
+
+	DamageRegister(&ppix->drawable, pNv->screen_damage);
+
+	return true;
+}
diff --git a/src/nv_dri.c b/src/nv_dri.c
index bd3e5a9..dca6a40 100644
--- a/src/nv_dri.c
+++ b/src/nv_dri.c
@@ -337,7 +337,7 @@ Bool NVDRIFinishScreenInit(ScrnInfoPtr pScrn)
 	pNOUVEAUDRI->depth		= pScrn->depth;
 	pNOUVEAUDRI->bpp		= pScrn->bitsPerPixel;
 
-	ret = nouveau_bo_handle_get(pNv->FB, &pNOUVEAUDRI->front_offset);
+	ret = nouveau_bo_handle_get(pNv->scanout, &pNOUVEAUDRI->front_offset);
 	if (ret) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "[dri] unable to reference front buffer: %d\n", ret);
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 9f4c96f..d6391f3 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -686,10 +686,11 @@ NVEnterVT(int scrnIndex, int flags)
 		/* Clear the framebuffer, we don't want to see garbage
 		 * on-screen up until X decides to draw something
 		 */
-		nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR);
-		memset(pNv->FB->map, 0, NOUVEAU_ALIGN(pScrn->virtualX, 64) *
-		       pScrn->virtualY * (pScrn->bitsPerPixel >> 3));
-		nouveau_bo_unmap(pNv->FB);
+		nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
+		memset(pNv->scanout->map, 0,
+		       NOUVEAU_ALIGN(pScrn->virtualX, 64) * pScrn->virtualY *
+		       (pScrn->bitsPerPixel >> 3));
+		nouveau_bo_unmap(pNv->scanout);
 
 		if (pNv->Architecture == NV_ARCH_50) {
 			if (!NV50AcquireDisplay(pScrn))
@@ -1609,6 +1610,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
 		return FALSE;
 	pNv->GART = NULL;
 
+	nouveau_bo_ref(pNv->FB, &pNv->scanout);
+
 	ret = nouveau_bo_fake(&dev, Cursor0Offset,
 			      NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
 			      64 * 64 * 4, pNv->VRAMMap + Cursor0Offset,
@@ -1760,6 +1763,23 @@ skip_fb:
 		   "at offset 0x%X\n",
 		   (uint32_t)(pNv->FB->size >> 20), (uint32_t) pNv->FB->offset);
 
+	/* Allocate linear scanout. */
+	if (pNv->Architecture >= NV_ARCH_50) {
+		unsigned scanout_size;
+
+		scanout_size = NOUVEAU_ALIGN(pScrn->virtualX, 64);
+		scanout_size *= (pScrn->bitsPerPixel >> 3);
+		scanout_size *= pScrn->virtualY;
+
+		if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
+				   0, scanout_size, &pNv->scanout)) {
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "Failed to allocate scanout buffer\n");
+			return FALSE;
+		}
+	} else {
+		nouveau_bo_ref(pNv->FB, &pNv->scanout);
+	}
 
 	/* We don't need to allocate cursors / lut here if we're using
 	 * kernel modesetting
@@ -1832,6 +1852,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
 	}
 
 	nouveau_bo_ref(NULL, &pNv->FB);
+	nouveau_bo_ref(NULL, &pNv->scanout);
 	nouveau_bo_ref(NULL, &pNv->GART);
 	nouveau_bo_ref(NULL, &pNv->Cursor);
 	nouveau_bo_ref(NULL, &pNv->Cursor2);
@@ -2347,6 +2368,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
 	bool on = xf86IsUnblank(mode);
 	int i;
 
+	/* This might seem strange, but we need an entry point after CreateScreenResources.
+	 * This happens to one of the few, if not the only place.
+	 * When we move to driver allocated pixmaps, we can move this.
+	 */
+	if (mode == SCREEN_SAVER_FORCER && pNv->Architecture == NV_ARCH_50 &&
+	    !pNv->NoAccel && !pNv->screen_damage &&
+	    !nv50_shadow_damage_create(pScrn))
+		return FALSE;
+
 	if (!pNv->randr12_enable)
 		return vgaHWSaveScreen(pScreen, mode);
 
diff --git a/src/nv_proto.h b/src/nv_proto.h
index 43fa62e..f06c757 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
@@ -267,6 +267,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
 int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer);
 int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer);
 
+/* nv50_shadow_damage.c */
+bool nv50_shadow_damage_create(ScrnInfoPtr pScrn);
+void nv50_shadow_damage_frontbuffer_fallback(ScrnInfoPtr pScrn);
+
 /* To support EXA 2.0, 2.1 has this in the header */
 #ifndef exaMoveInPixmap
 extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_shadow.c b/src/nv_shadow.c
index ea1ba35..e15051c 100644
--- a/src/nv_shadow.c
+++ b/src/nv_shadow.c
@@ -38,9 +38,9 @@ NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
    
 	cpp = pScrn->bitsPerPixel >> 3;
 	FBPitch = pScrn->displayWidth * cpp;
-	max_height = pNv->FB->size/FBPitch;
+	max_height = pNv->scanout->size/FBPitch;
 
-	nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR);
+	nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
 	while(num--) {
 		x1 = MAX(pbox->x1, 0);
 		y1 = MAX(pbox->y1, 0);
@@ -51,7 +51,7 @@ NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
 
 		if (width > 0 && height > 0) {
 			src = pNv->ShadowPtr + (y1 * pNv->ShadowPitch) + (x1 * cpp);
-			dst = pNv->FB->map + (y1 * FBPitch) + (x1 * cpp);
+			dst = pNv->scanout->map + (y1 * FBPitch) + (x1 * cpp);
 
 			while(height--) {
 				memcpy(dst, src, width);
@@ -62,5 +62,5 @@ NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
 
 		pbox++;
 	}
-	nouveau_bo_unmap(pNv->FB);
+	nouveau_bo_unmap(pNv->scanout);
 } 
diff --git a/src/nv_type.h b/src/nv_type.h
index 2ec4fba..5396cc8 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -270,6 +270,7 @@ typedef struct _NVRec {
     /* Various pinned memory regions */
     struct nouveau_bo * FB;
     void *              FBMap;
+    struct nouveau_bo * scanout;
     //struct nouveau_bo * FB_old; /* for KMS */
     struct nouveau_bo * shadow[2]; /* for easy acces by exa */
     struct nouveau_bo * Cursor;
@@ -278,6 +279,9 @@ typedef struct _NVRec {
 
     struct nvbios	VBIOS;
     struct nouveau_bios_info	*vbios;
+
+    DamagePtr screen_damage; /* for NV50+ */
+
     Bool                NoAccel;
     Bool                HWCursor;
     Bool                FpScale;
-- 
1.6.2.2


nouveau-nv50-nva0-noaccel.patch:

--- NEW FILE nouveau-nv50-nva0-noaccel.patch ---
>From 30e4f6c24c167f03b8fb5e634904072be715dbc8 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at gmail.com>
Date: Mon, 13 Apr 2009 20:20:39 +1000
Subject: [PATCH 5/5] nv50/f11: disable acceleration on NVAx chipsets

---
 src/nv_driver.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/nv_driver.c b/src/nv_driver.c
index d6391f3..b423cfd 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1144,6 +1144,14 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 		pNv->ShadowFB = TRUE;
 	}
 
+	if ((pNv->dev->chipset & 0xf0) == 0xa0) {
+		xf86DrvMsg(pScrn->scrnIndex, X_NOTICE,
+			   "Acceleration disabled, currently non-functional "
+			   "on this chipset\n");
+		pNv->NoAccel = TRUE;
+		pNv->ShadowFB = TRUE;
+	}
+
 	/* Save current console video mode */
 	if (pNv->Architecture >= NV_ARCH_50 && pNv->pInt10 && !pNv->kms_enable) {
 		const xf86Int10InfoPtr pInt10 = pNv->pInt10;
-- 
1.6.2.2


nouveau-store-vbios.patch:

--- NEW FILE nouveau-store-vbios.patch ---
>From 0b64ce0faefd2a87d46699ff1255e39d0051f115 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at gmail.com>
Date: Mon, 13 Apr 2009 19:13:26 +1000
Subject: [PATCH 2/5] bios/f11: store a copy of used vbios image in /var/run

---
 src/nv_bios.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/nv_bios.c b/src/nv_bios.c
index ebf4027..ad4ff1f 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "nv_include.h"
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -4492,7 +4495,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
 
 bool NVInitVBIOS(ScrnInfoPtr pScrn)
 {
+	NVPtr pNv = NVPTR(pScrn);
 	struct nvbios *bios = &NVPTR(pScrn)->VBIOS;
+	char img[128];
+	int fd;
 
 	memset(bios, 0, sizeof(struct nvbios));
 
@@ -4503,6 +4509,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
 	if (bios->length > NV_PROM_SIZE)
 		bios->length = NV_PROM_SIZE;
 
+	sprintf(img, "/var/run/nv%02x_%04x.rom", pNv->NVArch, pNv->Chipset);
+	fd = open(img, O_CREAT|O_RDWR|O_EXCL, 0700);
+	if (fd >= 0) {
+		write(fd, bios->data, bios->length);
+		close(fd);
+	}
+
 	return true;
 }
 
-- 
1.6.2.2


nouveau-transition-hack.patch:

--- NEW FILE nouveau-transition-hack.patch ---
>From 0a328a89d65f3b6a98fbf49cefd3deb4f3521254 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at gmail.com>
Date: Mon, 13 Apr 2009 19:12:25 +1000
Subject: [PATCH 1/5] kms/f11: hack in transition support without driver pixmaps

---
 src/drmmode_display.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index aa8befe..c315a70 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -185,6 +185,51 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
 }
 
 static void
+drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
+		   int src_id, int x, int y)
+{
+	drmModeFBPtr fb;
+	NVPtr pNv = NVPTR(pScrn);
+	char *dst = NULL, *src = NULL;
+	struct drm_nouveau_gem_mmap req;
+	int ret, h;
+
+	/* This is not what this should look like.  Until we can do driver
+	 * pixmaps, this will be a nasty hack!
+	 */
+
+	fb = drmModeGetFB(nouveau_device(pNv->dev)->fd, src_id);
+	if (!fb) {
+		ErrorF("src fb\n");
+		return;
+	}
+
+	req.handle = fb->handle;
+	ret = drmCommandWriteRead(nouveau_device(pNv->dev)->fd,
+				  DRM_NOUVEAU_GEM_MMAP, &req, sizeof(req));
+	if (ret) {
+		ErrorF("src bo map: %d\n", ret);
+		drmFree(fb);
+		return;
+	}
+	src = (void *)req.vaddr;
+	
+	nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR);
+	dst = pNv->FB->map;
+	dst += (y * fb->pitch) + (x * (fb->bpp >> 3));
+
+	h = fb->height;
+	while (h--) {
+		memcpy(dst, src, fb->width * (fb->bpp >> 3));
+		src += fb->pitch;
+		dst += pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
+	}
+
+	nouveau_bo_unmap(pNv->FB);
+	drmFree(fb);
+}
+
+static void
 drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
 		int x, int y)
 {
@@ -194,6 +239,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
 	PixmapPtr pspix, pdpix;
 	int w, h;
 
+	if (!pNv->exa_driver_pixmaps) {
+		drmmode_fb_copy_sw(pScrn, drmmode, dst_id, src_id, x, y);
+		return;
+	}
+
 	pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
 	if (!pspix)
 		return;
@@ -292,8 +342,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 	if (drmmode_crtc->rotate_fb_id)
 		fb_id = drmmode_crtc->rotate_fb_id;
 	else
-	if (fb_id != drmmode_crtc->mode_crtc->buffer_id &&
-	    pNv->exa_driver_pixmaps) {
+	if (fb_id != drmmode_crtc->mode_crtc->buffer_id) {
 		drmmode_fb_copy(pScrn, drmmode, fb_id,
 				drmmode_crtc->mode_crtc->buffer_id, x, y);
 	}
-- 
1.6.2.2




From epienbro at fedoraproject.org  Mon Apr 13 10:57:55 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Mon, 13 Apr 2009 10:57:55 +0000 (UTC)
Subject: rpms/nntpgrab/F-10
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch, NONE,
	1.1 nntpgrab_0_4_90_fix_removing_collections.patch, NONE,
	1.1 nntpgrab.spec, 1.30, 1.31
Message-ID: <20090413105755.9DA1D70124@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/F-10

Modified Files:
	nntpgrab.spec 
Added Files:
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch 
	nntpgrab_0_4_90_fix_removing_collections.patch 
Log Message:
- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
- Added a patch to fix the removal of collections (upstream SVN rev #1260)
- Added BR: gail-devel for F9 (RHBZ #491785)


nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch:

--- NEW FILE nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch ---
--- trunk/plugins/unpack/plugin_unpack.c	2009/04/10 19:26:25	1263
+++ trunk/plugins/unpack/plugin_unpack.c	2009/04/12 18:17:58	1264
@@ -137,7 +137,7 @@
         g_idle_add(do_start_unpack, unpack_data);
     }
 
-    if (action == FR_ACTION_EXTRACTING_FILES) {
+    if (action == FR_ACTION_EXTRACTING_FILES || unpack_data->error_occured) {
         on_progress(archive, 1.0, unpack_data);
 
         /* Send a signal to the unpack thread that we're done */

nntpgrab_0_4_90_fix_removing_collections.patch:

--- NEW FILE nntpgrab_0_4_90_fix_removing_collections.patch ---
--- trunk/plugins/schedular/schedular.c	2009/03/21 15:03:04	1259
+++ trunk/plugins/schedular/schedular.c	2009/04/04 18:44:29	1260
@@ -1060,6 +1060,7 @@
                     // Remove the entry from the database
                     if (!remove_file_from_database(collection, file, delete_flag, errmsg)) {
                         g_static_mutex_unlock(&schedular->mutex);
+                        db_close();
                         return FALSE;
                     }
 
@@ -1098,6 +1099,11 @@
                         imported_funcs_collection_unref(collection);
 
                         g_static_mutex_unlock(&schedular->mutex);
+
+                        if (!db_end_transaction(errmsg)) {
+                            return FALSE;
+                        }
+
                         db_close();
                         return TRUE;
                     }


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/nntpgrab.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nntpgrab.spec	21 Mar 2009 15:12:55 -0000	1.30
+++ nntpgrab.spec	13 Apr 2009 10:57:25 -0000	1.31
@@ -1,13 +1,15 @@
 Summary: Download files from the usenet
 Name: nntpgrab
 Version: 0.4.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
 Patch0:  nntpgrab_0_4_90_load_correct_library.patch
+Patch1:  nntpgrab_0_4_90_fix_removing_collections.patch
+Patch2:  nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -35,6 +37,9 @@
 BuildRequires:	nss-devel
 BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
+%if 0%{fedora} == 9
+BuildRequires:	gail-devel
+%endif
 
 %description
 With this program it is possible to download files from the usenet
@@ -131,6 +136,12 @@
 # Patch is already applied in upstream SVN rev #1259
 %patch0 -p0
 
+# Patch is already applied in upstream SVN rev #1260
+%patch1 -p1
+
+# Patch is already applied in upstream SVN rev #1264
+%patch2 -p1
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -276,6 +287,11 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Mon Apr 13 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-3
+- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
+- Added a patch to fix the removal of collections (upstream SVN rev #1260)
+- Added BR: gail-devel for F9 (RHBZ #491785)
+
 * Sat Mar 21 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-2
 - The program wouldn't start unless the -devel package was installed. Fixed
 



From epienbro at fedoraproject.org  Mon Apr 13 10:57:56 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Mon, 13 Apr 2009 10:57:56 +0000 (UTC)
Subject: rpms/nntpgrab/F-9
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch, 
	NONE, 1.1 nntpgrab_0_4_90_fix_removing_collections.patch, NONE,
	1.1 nntpgrab.spec, 1.30, 1.31
Message-ID: <20090413105756.4669C70124@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/F-9

Modified Files:
	nntpgrab.spec 
Added Files:
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch 
	nntpgrab_0_4_90_fix_removing_collections.patch 
Log Message:
- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
- Added a patch to fix the removal of collections (upstream SVN rev #1260)
- Added BR: gail-devel for F9 (RHBZ #491785)


nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch:

--- NEW FILE nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch ---
--- trunk/plugins/unpack/plugin_unpack.c	2009/04/10 19:26:25	1263
+++ trunk/plugins/unpack/plugin_unpack.c	2009/04/12 18:17:58	1264
@@ -137,7 +137,7 @@
         g_idle_add(do_start_unpack, unpack_data);
     }
 
-    if (action == FR_ACTION_EXTRACTING_FILES) {
+    if (action == FR_ACTION_EXTRACTING_FILES || unpack_data->error_occured) {
         on_progress(archive, 1.0, unpack_data);
 
         /* Send a signal to the unpack thread that we're done */

nntpgrab_0_4_90_fix_removing_collections.patch:

--- NEW FILE nntpgrab_0_4_90_fix_removing_collections.patch ---
--- trunk/plugins/schedular/schedular.c	2009/03/21 15:03:04	1259
+++ trunk/plugins/schedular/schedular.c	2009/04/04 18:44:29	1260
@@ -1060,6 +1060,7 @@
                     // Remove the entry from the database
                     if (!remove_file_from_database(collection, file, delete_flag, errmsg)) {
                         g_static_mutex_unlock(&schedular->mutex);
+                        db_close();
                         return FALSE;
                     }
 
@@ -1098,6 +1099,11 @@
                         imported_funcs_collection_unref(collection);
 
                         g_static_mutex_unlock(&schedular->mutex);
+
+                        if (!db_end_transaction(errmsg)) {
+                            return FALSE;
+                        }
+
                         db_close();
                         return TRUE;
                     }


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nntpgrab.spec	21 Mar 2009 19:07:10 -0000	1.30
+++ nntpgrab.spec	13 Apr 2009 10:57:25 -0000	1.31
@@ -1,13 +1,15 @@
 Summary: Download files from the usenet
 Name: nntpgrab
 Version: 0.4.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
 Patch0:  nntpgrab_0_4_90_load_correct_library.patch
+Patch1:  nntpgrab_0_4_90_fix_removing_collections.patch
+Patch2:  nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -35,7 +37,9 @@
 BuildRequires:	nss-devel
 BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
+%if 0%{fedora} == 9
 BuildRequires:	gail-devel
+%endif
 
 %description
 With this program it is possible to download files from the usenet
@@ -132,6 +136,12 @@
 # Patch is already applied in upstream SVN rev #1259
 %patch0 -p0
 
+# Patch is already applied in upstream SVN rev #1260
+%patch1 -p1
+
+# Patch is already applied in upstream SVN rev #1264
+%patch2 -p1
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -277,6 +287,11 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Mon Apr 13 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-3
+- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
+- Added a patch to fix the removal of collections (upstream SVN rev #1260)
+- Added BR: gail-devel for F9 (RHBZ #491785)
+
 * Sat Mar 21 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-2
 - The program wouldn't start unless the -devel package was installed. Fixed
 



From epienbro at fedoraproject.org  Mon Apr 13 10:57:56 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Mon, 13 Apr 2009 10:57:56 +0000 (UTC)
Subject: rpms/nntpgrab/devel
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch, NONE,
	1.1 nntpgrab_0_4_90_fix_removing_collections.patch, NONE,
	1.1 nntpgrab.spec, 1.34, 1.35
Message-ID: <20090413105756.D602E70124@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/devel

Modified Files:
	nntpgrab.spec 
Added Files:
	nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch 
	nntpgrab_0_4_90_fix_removing_collections.patch 
Log Message:
- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
- Added a patch to fix the removal of collections (upstream SVN rev #1260)
- Added BR: gail-devel for F9 (RHBZ #491785)


nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch:

--- NEW FILE nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch ---
--- trunk/plugins/unpack/plugin_unpack.c	2009/04/10 19:26:25	1263
+++ trunk/plugins/unpack/plugin_unpack.c	2009/04/12 18:17:58	1264
@@ -137,7 +137,7 @@
         g_idle_add(do_start_unpack, unpack_data);
     }
 
-    if (action == FR_ACTION_EXTRACTING_FILES) {
+    if (action == FR_ACTION_EXTRACTING_FILES || unpack_data->error_occured) {
         on_progress(archive, 1.0, unpack_data);
 
         /* Send a signal to the unpack thread that we're done */

nntpgrab_0_4_90_fix_removing_collections.patch:

--- NEW FILE nntpgrab_0_4_90_fix_removing_collections.patch ---
--- trunk/plugins/schedular/schedular.c	2009/03/21 15:03:04	1259
+++ trunk/plugins/schedular/schedular.c	2009/04/04 18:44:29	1260
@@ -1060,6 +1060,7 @@
                     // Remove the entry from the database
                     if (!remove_file_from_database(collection, file, delete_flag, errmsg)) {
                         g_static_mutex_unlock(&schedular->mutex);
+                        db_close();
                         return FALSE;
                     }
 
@@ -1098,6 +1099,11 @@
                         imported_funcs_collection_unref(collection);
 
                         g_static_mutex_unlock(&schedular->mutex);
+
+                        if (!db_end_transaction(errmsg)) {
+                            return FALSE;
+                        }
+
                         db_close();
                         return TRUE;
                     }


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nntpgrab.spec	21 Mar 2009 15:12:55 -0000	1.34
+++ nntpgrab.spec	13 Apr 2009 10:57:26 -0000	1.35
@@ -1,13 +1,15 @@
 Summary: Download files from the usenet
 Name: nntpgrab
 Version: 0.4.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
 Source2: nntpgrab_apache.conf
 Patch0:  nntpgrab_0_4_90_load_correct_library.patch
+Patch1:  nntpgrab_0_4_90_fix_removing_collections.patch
+Patch2:  nntpgrab_0_4_90_fix_deadlock_in_unpack_thread.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -35,6 +37,9 @@
 BuildRequires:	nss-devel
 BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
+%if 0%{fedora} == 9
+BuildRequires:	gail-devel
+%endif
 
 %description
 With this program it is possible to download files from the usenet
@@ -131,6 +136,12 @@
 # Patch is already applied in upstream SVN rev #1259
 %patch0 -p0
 
+# Patch is already applied in upstream SVN rev #1260
+%patch1 -p1
+
+# Patch is already applied in upstream SVN rev #1264
+%patch2 -p1
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -276,6 +287,11 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Mon Apr 13 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-3
+- Added a patch to prevent a possible deadlock (upstream SVN rev #1264)
+- Added a patch to fix the removal of collections (upstream SVN rev #1260)
+- Added BR: gail-devel for F9 (RHBZ #491785)
+
 * Sat Mar 21 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-2
 - The program wouldn't start unless the -devel package was installed. Fixed
 



From tagoh at fedoraproject.org  Mon Apr 13 11:11:44 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 13 Apr 2009 11:11:44 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-disable-xim.patch, 1.2,
	1.3 imsettings.spec, 1.28, 1.29
Message-ID: <20090413111144.EDD7170124@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13104

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-disable-xim.patch 
Log Message:
* Mon Apr 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-2
- Disable applet by default.

imsettings-disable-xim.patch:

Index: imsettings-disable-xim.patch
===================================================================
RCS file: imsettings-disable-xim.patch
diff -N imsettings-disable-xim.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ imsettings-disable-xim.patch	13 Apr 2009 11:11:40 -0000	1.3
@@ -0,0 +1,25 @@
+diff -pruN imsettings-0.106.2.orig/data/xinput.sh.in.in imsettings-0.106.2/data/xinput.sh.in.in
+--- imsettings-0.106.2.orig/data/xinput.sh.in.in	2009-04-07 16:11:28.000000000 +0900
++++ imsettings-0.106.2/data/xinput.sh.in.in	2009-04-13 18:32:35.000000000 +0900
+@@ -60,14 +60,15 @@ function setup_qt_immodule() {
+ }
+ 
+ function setup_xim() {
+-    if is_imsettings_enabled; then
+-	# setup XMODIFIERS
+-	XMODIFIERS="@im=imsettings"
+-	export XMODIFIERS
+-    else
++# XXX: Disable XIM support so far.
++#    if is_imsettings_enabled; then
++#	# setup XMODIFIERS
++#	XMODIFIERS="@im=imsettings"
++#	export XMODIFIERS
++#    else
+ 	[ -z "$XMODIFIERS" -a -n "$XIM" ] && XMODIFIERS="@im=$XIM"
+ 	[ -n "$XMODIFIERS" ] && export XMODIFIERS
+-    fi
++#    fi
+ }
+ 
+ function run_imsettings() {


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- imsettings.spec	7 Apr 2009 12:15:09 -0000	1.28
+++ imsettings.spec	13 Apr 2009 11:11:41 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.106.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,6 +15,7 @@
 # workaround for KDE, it will be removed when we have a correct fix
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
+Patch1:		imsettings-disable-xim.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -80,6 +81,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
+%patch1 -p1 -b .1-xim
 
 %build
 %configure	\
@@ -110,6 +112,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/
 
+# disable running applet by default
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
+
 #desktop-file-install						\
 #	--delete-original					\
 #	--dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart	\
@@ -170,7 +175,6 @@
 %{_datadir}/pixmaps/*.png
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
-%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
 %{_sysconfdir}/xdg/autostart/imsettings-start.desktop
 %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas
 %{_sysconfdir}/kde/env/*.sh
@@ -197,6 +201,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-2
+- Disable applet by default.
+
 * Tue Apr  7 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-1
 - New upstream release.
   - Fix a freeze issue on X applications with switching IM (#488877)



From pkgdb at fedoraproject.org  Mon Apr 13 11:20:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 11:20:53 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090413112054.4621A10F851@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora devel is now owned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Mon Apr 13 11:22:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 11:22:11 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090413112056.100DF10F87B@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 9 is now owned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From pkgdb at fedoraproject.org  Mon Apr 13 11:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 11:21:00 +0000
Subject: [pkgdb] portaudio ownership updated
Message-ID: <20090413112101.6E6AF10F87D@bastion2.fedora.phx.redhat.com>

Package portaudio in Fedora 10 is now owned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portaudio



From drago01 at fedoraproject.org  Mon Apr 13 11:55:55 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Mon, 13 Apr 2009 11:55:55 +0000 (UTC)
Subject: rpms/pinot/devel .cvsignore, 1.14, 1.15 pinot.spec, 1.40,
	1.41 sources, 1.14, 1.15
Message-ID: <20090413115557.0952370124@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27650

Modified Files:
	.cvsignore pinot.spec sources 
Log Message:
update to 0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Mar 2009 10:25:13 -0000	1.14
+++ .cvsignore	13 Apr 2009 11:55:20 -0000	1.15
@@ -1 +1 @@
-pinot-0.90.tar.gz
+pinot-0.93.tar.gz


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pinot.spec	1 Mar 2009 10:25:13 -0000	1.40
+++ pinot.spec	13 Apr 2009 11:55:20 -0000	1.41
@@ -1,5 +1,5 @@
 Name:  pinot
-Version: 0.90
+Version: 0.93
 Release: 1%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
@@ -9,7 +9,6 @@
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: fix_lang_detect.patch
 Patch1: pinot-0.90-gmime24.patch
-Patch2:	pinot-0.90-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -28,6 +27,7 @@
 BuildRequires: shared-mime-info
 BuildRequires: libexif-devel
 BuildRequires: libtool
+BuildRequires: libarchive-devel
 
 Requires: shared-mime-info
 Requires: unzip
@@ -57,7 +57,6 @@
 %setup -q 
 %patch0 -p1 -b .lang_detect
 %patch1 -p1 -b .gmime24
-%patch2 -p1 -b .gcc44
 
 %build
 autoreconf --force --install
@@ -130,6 +129,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.93-1
+- Update to 0.93
+- Drop gcc patch, now upstream
+
 * Sun Mar 01 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.90-1
 - Update to 0.90
 - Fix build against gcc-4.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Mar 2009 10:25:13 -0000	1.14
+++ sources	13 Apr 2009 11:55:21 -0000	1.15
@@ -1 +1 @@
-5c106f781e82ecf18fb9d8b0cae65c71  pinot-0.90.tar.gz
+ecb646394b932fd3cb7ce25c995d6b79  pinot-0.93.tar.gz



From pmachata at fedoraproject.org  Mon Apr 13 11:57:35 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 13 Apr 2009 11:57:35 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009e-karachi.patch, NONE, 1.1 tzdata.spec,
	1.76, 1.77
Message-ID: <20090413115735.4DDF170124@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28628

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009e-karachi.patch 
Log Message:
- Upstream 2009e
  - Historical changes for Jordan
  - Palestine will start DST on 2009-03-26 and end 2009-09-27
- Egypt ends DST on 2009-09-24
- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01


tzdata-2009e-karachi.patch:

--- NEW FILE tzdata-2009e-karachi.patch ---
diff -urp tzdata2009e/asia tzdata2009e.pm/asia
--- tzdata2009e/asia	2009-04-06 15:08:11.000000000 +0200
+++ tzdata2009e.pm/asia	2009-04-13 13:31:28.000000000 +0200
@@ -1593,7 +1593,8 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
-Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- tzdata.spec	23 Mar 2009 14:24:13 -0000	1.76
+++ tzdata.spec	13 Apr 2009 11:57:32 -0000	1.77
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009d
+Version: 2009e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,8 @@
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2009e-cairo.patch
+Patch2: tzdata-2009e-karachi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +49,8 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p0
+%patch2 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +111,15 @@
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009e-2
+- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
+
+* Mon Apr  6 2009 Petr Machata <pmachata at redhat.com> - 2009e-1
+- Upstream 2009e
+  - Historical changes for Jordan
+  - Palestine will start DST on 2009-03-26 and end 2009-09-27
+- Egypt ends DST on 2009-09-24
+
 * Mon Mar 23 2009 Petr Machata <pmachata at redhat.com> - 2009d-1
 - Upstream 2009d
   - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00



From drago01 at fedoraproject.org  Mon Apr 13 12:03:38 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Mon, 13 Apr 2009 12:03:38 +0000 (UTC)
Subject: rpms/pinot/devel pinot.spec, 1.41, 1.42 pinot-0.90-gcc44.patch, 1.1,
	NONE
Message-ID: <20090413120338.E843C70124@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30757

Modified Files:
	pinot.spec 
Removed Files:
	pinot-0.90-gcc44.patch 
Log Message:
remove patch & enable libarchive support


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pinot.spec	13 Apr 2009 11:55:20 -0000	1.41
+++ pinot.spec	13 Apr 2009 12:03:08 -0000	1.42
@@ -60,7 +60,7 @@
 
 %build
 autoreconf --force --install
-%configure
+%configure --enable-libarchive
 make %{?_smp_mflags}
 
 %install


--- pinot-0.90-gcc44.patch DELETED ---



From caolanm at fedoraproject.org  Mon Apr 13 12:10:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 13 Apr 2009 12:10:51 +0000 (UTC)
Subject: rpms/hunspell-sv/devel hunspell-sv.spec, 1.12, 1.13 sources, 1.10,
	1.11
Message-ID: <20090413121051.9470F70124@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv588

Modified Files:
	hunspell-sv.spec sources 
Log Message:
latest version


Index: hunspell-sv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/hunspell-sv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hunspell-sv.spec	25 Feb 2009 05:35:05 -0000	1.12
+++ hunspell-sv.spec	13 Apr 2009 12:10:50 -0000	1.13
@@ -1,7 +1,7 @@
 Name: hunspell-sv
 Summary: Swedish hunspell dictionaries
-Version: 1.29
-Release: 2%{?dist}
+Version: 1.30
+Release: 1%{?dist}
 Source: http://hem.bredband.net/dsso1/sv_SE.zip
 Group: Applications/Text
 URL: http://dsso.se/
@@ -42,6 +42,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Apr 13 2008 Caolan McNamara <caolanm at redhat.com> - 1.30-1
+- latest version
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Aug 2008 18:24:24 -0000	1.10
+++ sources	13 Apr 2009 12:10:50 -0000	1.11
@@ -1 +1 @@
-f56785aa2b388a32c261de41f6dc12d4  sv_SE.zip
+2c15c478288b11a0dbe77f87476fbf1b  sv_SE.zip



From vpv at fedoraproject.org  Mon Apr 13 12:12:50 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 13 Apr 2009 12:12:50 +0000 (UTC)
Subject: rpms/libvoikko/devel .cvsignore, 1.12, 1.13 libvoikko.spec, 1.21,
	1.22 sources, 1.12, 1.13 libvoikko-svn-head-r2591.patch, 1.1, NONE
Message-ID: <20090413121250.51E0F70124@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1169

Modified Files:
	.cvsignore libvoikko.spec sources 
Removed Files:
	libvoikko-svn-head-r2591.patch 
Log Message:
* Mon Apr 13 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.4.rc3
- 2.1rc3, remove patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Apr 2009 19:30:47 -0000	1.12
+++ .cvsignore	13 Apr 2009 12:12:46 -0000	1.13
@@ -1 +1 @@
-libvoikko-2.1rc2.tar.gz
+libvoikko-2.1rc3.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libvoikko.spec	11 Apr 2009 17:23:18 -0000	1.21
+++ libvoikko.spec	13 Apr 2009 12:12:46 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.1
-Release:        0.3.rc2%{?dist}
+Release:        0.4.rc3%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -9,8 +9,7 @@
 # The usual format of stable release URLs
 #Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
-Patch0:         libvoikko-svn-head-r2591.patch
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga-devel >= 7.8 python
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -98,6 +96,9 @@
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Mon Apr 13 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.4.rc3
+- 2.1rc3, remove patch
+
 * Sat Apr 11 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.3.rc2
 - Patch to current SVN HEAD, includes a fix for a memory leak in the grammar
   checker


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Apr 2009 19:30:47 -0000	1.12
+++ sources	13 Apr 2009 12:12:46 -0000	1.13
@@ -1 +1 @@
-4fc9aaf66891a1f5ec1ada65d558fb21  libvoikko-2.1rc2.tar.gz
+828eef05c34c1d536c672e20fe717e11  libvoikko-2.1rc3.tar.gz


--- libvoikko-svn-head-r2591.patch DELETED ---



From caolanm at fedoraproject.org  Mon Apr 13 12:13:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 13 Apr 2009 12:13:33 +0000 (UTC)
Subject: rpms/hunspell-sv/devel hunspell-sv.spec,1.13,1.14
Message-ID: <20090413121333.98C6470124@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1381

Modified Files:
	hunspell-sv.spec 
Log Message:
latest version


Index: hunspell-sv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/hunspell-sv.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hunspell-sv.spec	13 Apr 2009 12:10:50 -0000	1.13
+++ hunspell-sv.spec	13 Apr 2009 12:13:03 -0000	1.14
@@ -42,7 +42,7 @@
 %{_datadir}/myspell/*
 
 %changelog
-* Mon Apr 13 2008 Caolan McNamara <caolanm at redhat.com> - 1.30-1
+* Mon Apr 13 2009 Caolan McNamara <caolanm at redhat.com> - 1.30-1
 - latest version
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.29-2



From olea at fedoraproject.org  Mon Apr 13 12:21:42 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 13 Apr 2009 12:21:42 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-9 import.log, NONE, 1.1 .cvsignore, 1.4, 
	1.5 purple-facebookchat.spec, 1.8, 1.9 sources, 1.7,
	1.8 purple-facebookchat-MC-build.patch, 1.1, NONE
Message-ID: <20090413122142.A578070124@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4593/F-9

Modified Files:
	.cvsignore purple-facebookchat.spec sources 
Added Files:
	import.log 
Removed Files:
	purple-facebookchat-MC-build.patch 
Log Message:
Updating to 1.50




--- NEW FILE import.log ---
purple-facebookchat-1_50-1olea:F-9:purple-facebookchat-1.50-1olea.src.rpm:1239625175


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Dec 2008 12:03:44 -0000	1.4
+++ .cvsignore	13 Apr 2009 12:21:11 -0000	1.5
@@ -1 +1 @@
-pidgin-facebookchat-source-1.45.tar.bz2
+pidgin-facebookchat-source-1.50.tar.bz2


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-9/purple-facebookchat.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- purple-facebookchat.spec	31 Dec 2008 13:17:28 -0000	1.8
+++ purple-facebookchat.spec	13 Apr 2009 12:21:12 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.47
+Version:        1.50
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -49,6 +49,9 @@
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Mon Apr 13 2009 Ismael Olea <ismael at olea.org> 1.50-1
+- updating to 1.50
+
 * Wed Dec 31 2008 Ismael Olea <ismael at olea.org> 1.47-1
 - updating to 1.47
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2008 13:17:28 -0000	1.7
+++ sources	13 Apr 2009 12:21:12 -0000	1.8
@@ -1 +1 @@
-1d55d811751704c058763c53365d36ea  pidgin-facebookchat-source-1.47.tar.bz2
+e055de27cc71495155af242663c08367  pidgin-facebookchat-source-1.50.tar.bz2


--- purple-facebookchat-MC-build.patch DELETED ---



From olea at fedoraproject.org  Mon Apr 13 12:21:44 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 13 Apr 2009 12:21:44 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-10 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 purple-facebookchat.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20090413122144.E393D70124@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5238/F-10

Modified Files:
	.cvsignore purple-facebookchat.spec sources 
Added Files:
	import.log 
Log Message:
Updating to 1.50




--- NEW FILE import.log ---
purple-facebookchat-1_50-1olea:F-10:purple-facebookchat-1.50-1olea.src.rpm:1239625210


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Dec 2008 13:11:08 -0000	1.7
+++ .cvsignore	13 Apr 2009 12:21:14 -0000	1.8
@@ -1 +1 @@
-pidgin-facebookchat-source-1.47.tar.bz2
+pidgin-facebookchat-source-1.50.tar.bz2


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/purple-facebookchat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- purple-facebookchat.spec	31 Dec 2008 13:11:08 -0000	1.11
+++ purple-facebookchat.spec	13 Apr 2009 12:21:14 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.47
+Version:        1.50
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -49,6 +49,9 @@
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Mon Apr 13 2009 Ismael Olea <ismael at olea.org> 1.50-1
+- updating to 1.50
+
 * Wed Dec 31 2008 Ismael Olea <ismael at olea.org> 1.47-1
 - updating to 1.47
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2008 13:11:08 -0000	1.8
+++ sources	13 Apr 2009 12:21:14 -0000	1.9
@@ -1 +1 @@
-1d55d811751704c058763c53365d36ea  pidgin-facebookchat-source-1.47.tar.bz2
+e055de27cc71495155af242663c08367  pidgin-facebookchat-source-1.50.tar.bz2



From olea at fedoraproject.org  Mon Apr 13 12:21:43 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 13 Apr 2009 12:21:43 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 purple-facebookchat.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20090413122143.BC3A370124@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5199/devel

Modified Files:
	.cvsignore purple-facebookchat.spec sources 
Added Files:
	import.log 
Log Message:
Updating to 1.50




--- NEW FILE import.log ---
purple-facebookchat-1_50-1olea:HEAD:purple-facebookchat-1.50-1olea.src.rpm:1239625208


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Dec 2008 12:05:23 -0000	1.6
+++ .cvsignore	13 Apr 2009 12:21:13 -0000	1.7
@@ -1 +1 @@
-pidgin-facebookchat-source-1.45.tar.bz2
+pidgin-facebookchat-source-1.50.tar.bz2


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- purple-facebookchat.spec	27 Feb 2009 03:04:19 -0000	1.12
+++ purple-facebookchat.spec	13 Apr 2009 12:21:13 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
-Version:        1.47
-Release:        2%{?dist}
+Version:        1.50
+Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -49,8 +49,8 @@
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.47-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Apr 13 2009 Ismael Olea <ismael at olea.org> 1.50-1
+- updating to 1.50
 
 * Wed Dec 31 2008 Ismael Olea <ismael at olea.org> 1.47-1
 - updating to 1.47


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2008 13:17:29 -0000	1.8
+++ sources	13 Apr 2009 12:21:13 -0000	1.9
@@ -1 +1 @@
-1d55d811751704c058763c53365d36ea  pidgin-facebookchat-source-1.47.tar.bz2
+e055de27cc71495155af242663c08367  pidgin-facebookchat-source-1.50.tar.bz2



From pkgdb at fedoraproject.org  Mon Apr 13 12:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 12:23:15 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090413122315.2063C10F850@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Mon Apr 13 12:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 12:23:18 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090413122316.2812F10F87B@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora EPEL 5 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Mon Apr 13 12:24:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 12:24:32 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090413122318.43F3F10F87D@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora EPEL 4 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Mon Apr 13 12:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 12:24:45 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090413122329.96DF910F880@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora 10 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From pkgdb at fedoraproject.org  Mon Apr 13 12:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 12:23:28 +0000
Subject: [pkgdb] ucarp ownership updated
Message-ID: <20090413122328.2A3F210F851@bastion2.fedora.phx.redhat.com>

Package ucarp in Fedora 9 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ucarp



From nalin at fedoraproject.org  Mon Apr 13 12:27:44 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 13 Apr 2009 12:27:44 +0000 (UTC)
Subject: rpms/hmaccalc/devel hmaccalc.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413122744.6370270124@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/hmaccalc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7796/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hmaccalc.spec import.log 
Log Message:
- initial import



--- NEW FILE hmaccalc.spec ---
# We need to regenerate the HMAC values after the buildroot policies have
# mucked around with binaries.  This overrides the default which was in place
# at least from Red Hat Linux 9 through Fedora 11's development cycle.
%define __spec_install_post \
	%{?__debug_package:%{__debug_install_post}} \
	%{__arch_install_post} \
	%{__os_install_post} \
	for length in 1 256 384 512 ; do \
		$RPM_BUILD_ROOT/%{_bindir}/sha${length}hmac -S > \\\
		$RPM_BUILD_ROOT/%{_libdir}/%{name}/sha${length}hmac.hmac \
	done \
	%{nil}

Name:		hmaccalc
Version:	0.9.6
Release:	1%{?dist}
Summary:	Tools for computing and checking HMAC values for files

Group:		System Environment/Base
License:	MIT
URL:		https://fedorahosted.org/hmaccalc/
Source0:	https://fedorahosted.org/released/hmaccalc/hmaccalc-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	nss-devel

%description
The hmaccalc package contains tools which can calculate HMAC (hash-based
message authentication code) values for files.  The names and interfaces are
meant to mimic the sha*sum tools provided by the coreutils package.

%prep
%setup -q

%build
%configure --enable-sum-directory=%{_libdir}/%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%check
make check

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/sha1hmac
%{_bindir}/sha256hmac
%{_bindir}/sha384hmac
%{_bindir}/sha512hmac
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/sha1hmac.hmac
%{_libdir}/%{name}/sha256hmac.hmac
%{_libdir}/%{name}/sha384hmac.hmac
%{_libdir}/%{name}/sha512hmac.hmac
%{_mandir}/*/*

%changelog
* Wed Apr  8 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.6-1
- fix 'make check' by using binaries built with a different path for their
  own check files
- add a non-fips compile-time option, which we don't use

* Mon Mar 30 2009 Nalin Dahyabhai <nalin at redhat.com>
- handle '-' as indicating that stdin should be used for the input file

* Fri Mar 27 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.5-1
- add a -t option, for truncating HMAC outputs

* Wed Mar 25 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.4-1
- use a longer default key, when we use the default key

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-1
- fix the -k option
- move self-check files to %%{_libdir}/%{name}

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.2-1
- provide a way to override the directory which will be searched for self-check
  values (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.1-1
- store self-check values in hex rather than in binary form (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9-2
- add URL to fedorahosted home page, and mention it in the man page as a means
  to report bugs and whatnot (part of #491719)
- correct the license tag: "X11" -> "MIT" (part of #491719)
- expand the acronym HMAC in the description (part of #491719)
- disable the sumfile prefix (part of #491719)

* Fri Mar 20 2009 Nalin Dahyabhai <nalin at redhat.com>
- initial .spec file


--- NEW FILE import.log ---
hmaccalc-0_9_6-1:HEAD:hmaccalc-0.9.6-1.src.rpm:1239625585


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:31:51 -0000	1.1
+++ .cvsignore	13 Apr 2009 12:27:12 -0000	1.2
@@ -0,0 +1 @@
+hmaccalc-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:31:51 -0000	1.1
+++ sources	13 Apr 2009 12:27:13 -0000	1.2
@@ -0,0 +1 @@
+502ef68c4b215f01214dc8169d9e6298  hmaccalc-0.9.6.tar.gz



From nalin at fedoraproject.org  Mon Apr 13 12:29:31 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 13 Apr 2009 12:29:31 +0000 (UTC)
Subject: rpms/hmaccalc/F-10 hmaccalc.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413122931.79D9C70124@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/hmaccalc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8845/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	hmaccalc.spec import.log 
Log Message:
- initial checkin



--- NEW FILE hmaccalc.spec ---
# We need to regenerate the HMAC values after the buildroot policies have
# mucked around with binaries.  This overrides the default which was in place
# at least from Red Hat Linux 9 through Fedora 11's development cycle.
%define __spec_install_post \
	%{?__debug_package:%{__debug_install_post}} \
	%{__arch_install_post} \
	%{__os_install_post} \
	for length in 1 256 384 512 ; do \
		$RPM_BUILD_ROOT/%{_bindir}/sha${length}hmac -S > \\\
		$RPM_BUILD_ROOT/%{_libdir}/%{name}/sha${length}hmac.hmac \
	done \
	%{nil}

Name:		hmaccalc
Version:	0.9.6
Release:	1%{?dist}
Summary:	Tools for computing and checking HMAC values for files

Group:		System Environment/Base
License:	MIT
URL:		https://fedorahosted.org/hmaccalc/
Source0:	https://fedorahosted.org/released/hmaccalc/hmaccalc-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	nss-devel

%description
The hmaccalc package contains tools which can calculate HMAC (hash-based
message authentication code) values for files.  The names and interfaces are
meant to mimic the sha*sum tools provided by the coreutils package.

%prep
%setup -q

%build
%configure --enable-sum-directory=%{_libdir}/%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%check
make check

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/sha1hmac
%{_bindir}/sha256hmac
%{_bindir}/sha384hmac
%{_bindir}/sha512hmac
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/sha1hmac.hmac
%{_libdir}/%{name}/sha256hmac.hmac
%{_libdir}/%{name}/sha384hmac.hmac
%{_libdir}/%{name}/sha512hmac.hmac
%{_mandir}/*/*

%changelog
* Wed Apr  8 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.6-1
- fix 'make check' by using binaries built with a different path for their
  own check files
- add a non-fips compile-time option, which we don't use

* Mon Mar 30 2009 Nalin Dahyabhai <nalin at redhat.com>
- handle '-' as indicating that stdin should be used for the input file

* Fri Mar 27 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.5-1
- add a -t option, for truncating HMAC outputs

* Wed Mar 25 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.4-1
- use a longer default key, when we use the default key

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-1
- fix the -k option
- move self-check files to %%{_libdir}/%{name}

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.2-1
- provide a way to override the directory which will be searched for self-check
  values (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.1-1
- store self-check values in hex rather than in binary form (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9-2
- add URL to fedorahosted home page, and mention it in the man page as a means
  to report bugs and whatnot (part of #491719)
- correct the license tag: "X11" -> "MIT" (part of #491719)
- expand the acronym HMAC in the description (part of #491719)
- disable the sumfile prefix (part of #491719)

* Fri Mar 20 2009 Nalin Dahyabhai <nalin at redhat.com>
- initial .spec file


--- NEW FILE import.log ---
hmaccalc-0_9_6-1:F-10:hmaccalc-0.9.6-1.src.rpm:1239625721


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:31:51 -0000	1.1
+++ .cvsignore	13 Apr 2009 12:29:00 -0000	1.2
@@ -0,0 +1 @@
+hmaccalc-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:31:51 -0000	1.1
+++ sources	13 Apr 2009 12:29:01 -0000	1.2
@@ -0,0 +1 @@
+502ef68c4b215f01214dc8169d9e6298  hmaccalc-0.9.6.tar.gz



From pmachata at fedoraproject.org  Mon Apr 13 12:31:12 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 13 Apr 2009 12:31:12 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009e-cairo.patch,NONE,1.1
Message-ID: <20090413123112.C46E070124@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9862

Added Files:
	tzdata-2009e-cairo.patch 
Log Message:
Forgotten cairo patch


tzdata-2009e-cairo.patch:

--- NEW FILE tzdata-2009e-cairo.patch ---
diff -up tzdata2009e/africa tzdata2009e-pm/africa
--- tzdata2009e/africa	2009-03-23 14:37:51.000000000 +0100
+++ tzdata2009e-pm/africa	2009-04-06 16:06:49.000000000 +0200
@@ -236,7 +236,8 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # unless discontinued, next DST may end Thursday 28 August 2008.
 # From Paul Eggert (2007-08-17):
 # For lack of better info, assume the new rule is last Thursday in August.
-Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

Diff finished.  Mon Apr  6 16:06:53 2009



From vpv at fedoraproject.org  Mon Apr 13 12:34:47 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 13 Apr 2009 12:34:47 +0000 (UTC)
Subject: rpms/openoffice.org-voikko/devel .cvsignore, 1.9,
	1.10 openoffice.org-voikko.spec, 1.19, 1.20 sources, 1.9, 1.10
Message-ID: <20090413123447.365E170124@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11203

Modified Files:
	.cvsignore openoffice.org-voikko.spec sources 
Log Message:
* Mon Apr 13 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-0.2.rc2
- New release candidate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Apr 2009 19:34:43 -0000	1.9
+++ .cvsignore	13 Apr 2009 12:34:44 -0000	1.10
@@ -1 +1 @@
-openoffice.org-voikko-3.1rc1.tar.gz
+openoffice.org-voikko-3.1rc2.tar.gz


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openoffice.org-voikko.spec	7 Apr 2009 19:34:43 -0000	1.19
+++ openoffice.org-voikko.spec	13 Apr 2009 12:34:44 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           openoffice.org-voikko
 Version:        3.1 
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc2%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
@@ -9,7 +9,7 @@
 # The usual format of stable release URLs
 #Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    openoffice.org-sdk >= 1:3.1.0
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-0.2.rc2
+- New release candidate
+
 * Mon Apr 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-0.1.rc1
 - New release candidate
 - Grammar checking enabled


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Apr 2009 19:34:43 -0000	1.9
+++ sources	13 Apr 2009 12:34:44 -0000	1.10
@@ -1 +1 @@
-34567b18f75ffe29cf89e1249fd56359  openoffice.org-voikko-3.1rc1.tar.gz
+8dda075fa199fe9cd0f6b5ec1f2ff46e  openoffice.org-voikko-3.1rc2.tar.gz



From caolanm at fedoraproject.org  Mon Apr 13 12:36:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 13 Apr 2009 12:36:22 +0000 (UTC)
Subject: rpms/hunspell-mt/devel hunspell-mt.spec,1.2,1.3
Message-ID: <20090413123622.6697270124@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-mt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11743

Modified Files:
	hunspell-mt.spec 
Log Message:
spurious extra .aff file packaged


Index: hunspell-mt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-mt/devel/hunspell-mt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-mt.spec	25 Feb 2009 05:11:52 -0000	1.2
+++ hunspell-mt.spec	13 Apr 2009 12:35:52 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: Maltese hunspell dictionaries
 %define upstreamid 20020708
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Text
 Source: http://linux.org.mt/downloads/spellcheck-mt-0.3.tar.gz
 URL: http://linux.org.mt/projects/spellcheck
@@ -27,7 +27,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cp -p mt_MT.dic mt_MT.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Apr 13 2009 Caolan McNamara <caolanm at redhat.com> - 0.20020708-3
+- spurious extra .aff file packaged
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20020708-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nalin at fedoraproject.org  Mon Apr 13 12:36:54 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 13 Apr 2009 12:36:54 +0000 (UTC)
Subject: rpms/hmaccalc/F-9 hmaccalc.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413123654.AD51870124@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/hmaccalc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11890/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	hmaccalc.spec import.log 
Log Message:
- initial import



--- NEW FILE hmaccalc.spec ---
# We need to regenerate the HMAC values after the buildroot policies have
# mucked around with binaries.  This overrides the default which was in place
# at least from Red Hat Linux 9 through Fedora 11's development cycle.
%define __spec_install_post \
	%{?__debug_package:%{__debug_install_post}} \
	%{__arch_install_post} \
	%{__os_install_post} \
	for length in 1 256 384 512 ; do \
		$RPM_BUILD_ROOT/%{_bindir}/sha${length}hmac -S > \\\
		$RPM_BUILD_ROOT/%{_libdir}/%{name}/sha${length}hmac.hmac \
	done \
	%{nil}

Name:		hmaccalc
Version:	0.9.6
Release:	1%{?dist}
Summary:	Tools for computing and checking HMAC values for files

Group:		System Environment/Base
License:	MIT
URL:		https://fedorahosted.org/hmaccalc/
Source0:	https://fedorahosted.org/released/hmaccalc/hmaccalc-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	nss-devel

%description
The hmaccalc package contains tools which can calculate HMAC (hash-based
message authentication code) values for files.  The names and interfaces are
meant to mimic the sha*sum tools provided by the coreutils package.

%prep
%setup -q

%build
%configure --enable-sum-directory=%{_libdir}/%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%check
make check

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/sha1hmac
%{_bindir}/sha256hmac
%{_bindir}/sha384hmac
%{_bindir}/sha512hmac
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/sha1hmac.hmac
%{_libdir}/%{name}/sha256hmac.hmac
%{_libdir}/%{name}/sha384hmac.hmac
%{_libdir}/%{name}/sha512hmac.hmac
%{_mandir}/*/*

%changelog
* Wed Apr  8 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.6-1
- fix 'make check' by using binaries built with a different path for their
  own check files
- add a non-fips compile-time option, which we don't use

* Mon Mar 30 2009 Nalin Dahyabhai <nalin at redhat.com>
- handle '-' as indicating that stdin should be used for the input file

* Fri Mar 27 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.5-1
- add a -t option, for truncating HMAC outputs

* Wed Mar 25 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.4-1
- use a longer default key, when we use the default key

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-1
- fix the -k option
- move self-check files to %%{_libdir}/%{name}

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.2-1
- provide a way to override the directory which will be searched for self-check
  values (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.1-1
- store self-check values in hex rather than in binary form (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9-2
- add URL to fedorahosted home page, and mention it in the man page as a means
  to report bugs and whatnot (part of #491719)
- correct the license tag: "X11" -> "MIT" (part of #491719)
- expand the acronym HMAC in the description (part of #491719)
- disable the sumfile prefix (part of #491719)

* Fri Mar 20 2009 Nalin Dahyabhai <nalin at redhat.com>
- initial .spec file


--- NEW FILE import.log ---
hmaccalc-0_9_6-1:F-9:hmaccalc-0.9.6-1.src.rpm:1239625894


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:31:51 -0000	1.1
+++ .cvsignore	13 Apr 2009 12:36:23 -0000	1.2
@@ -0,0 +1 @@
+hmaccalc-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:31:51 -0000	1.1
+++ sources	13 Apr 2009 12:36:24 -0000	1.2
@@ -0,0 +1 @@
+502ef68c4b215f01214dc8169d9e6298  hmaccalc-0.9.6.tar.gz



From nalin at fedoraproject.org  Mon Apr 13 12:39:39 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 13 Apr 2009 12:39:39 +0000 (UTC)
Subject: rpms/hmaccalc/F-11 hmaccalc.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413123939.B237470124@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/hmaccalc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12979/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	hmaccalc.spec import.log 
Log Message:
- initial checkin



--- NEW FILE hmaccalc.spec ---
# We need to regenerate the HMAC values after the buildroot policies have
# mucked around with binaries.  This overrides the default which was in place
# at least from Red Hat Linux 9 through Fedora 11's development cycle.
%define __spec_install_post \
	%{?__debug_package:%{__debug_install_post}} \
	%{__arch_install_post} \
	%{__os_install_post} \
	for length in 1 256 384 512 ; do \
		$RPM_BUILD_ROOT/%{_bindir}/sha${length}hmac -S > \\\
		$RPM_BUILD_ROOT/%{_libdir}/%{name}/sha${length}hmac.hmac \
	done \
	%{nil}

Name:		hmaccalc
Version:	0.9.6
Release:	1%{?dist}
Summary:	Tools for computing and checking HMAC values for files

Group:		System Environment/Base
License:	MIT
URL:		https://fedorahosted.org/hmaccalc/
Source0:	https://fedorahosted.org/released/hmaccalc/hmaccalc-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	nss-devel

%description
The hmaccalc package contains tools which can calculate HMAC (hash-based
message authentication code) values for files.  The names and interfaces are
meant to mimic the sha*sum tools provided by the coreutils package.

%prep
%setup -q

%build
%configure --enable-sum-directory=%{_libdir}/%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%check
make check

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/sha1hmac
%{_bindir}/sha256hmac
%{_bindir}/sha384hmac
%{_bindir}/sha512hmac
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/sha1hmac.hmac
%{_libdir}/%{name}/sha256hmac.hmac
%{_libdir}/%{name}/sha384hmac.hmac
%{_libdir}/%{name}/sha512hmac.hmac
%{_mandir}/*/*

%changelog
* Wed Apr  8 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.6-1
- fix 'make check' by using binaries built with a different path for their
  own check files
- add a non-fips compile-time option, which we don't use

* Mon Mar 30 2009 Nalin Dahyabhai <nalin at redhat.com>
- handle '-' as indicating that stdin should be used for the input file

* Fri Mar 27 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.5-1
- add a -t option, for truncating HMAC outputs

* Wed Mar 25 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.4-1
- use a longer default key, when we use the default key

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-1
- fix the -k option
- move self-check files to %%{_libdir}/%{name}

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.2-1
- provide a way to override the directory which will be searched for self-check
  values (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.1-1
- store self-check values in hex rather than in binary form (part of #491719)

* Tue Mar 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9-2
- add URL to fedorahosted home page, and mention it in the man page as a means
  to report bugs and whatnot (part of #491719)
- correct the license tag: "X11" -> "MIT" (part of #491719)
- expand the acronym HMAC in the description (part of #491719)
- disable the sumfile prefix (part of #491719)

* Fri Mar 20 2009 Nalin Dahyabhai <nalin at redhat.com>
- initial .spec file


--- NEW FILE import.log ---
hmaccalc-0_9_6-1:F-11:hmaccalc-0.9.6-1.src.rpm:1239626320


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 23:31:51 -0000	1.1
+++ .cvsignore	13 Apr 2009 12:39:08 -0000	1.2
@@ -0,0 +1 @@
+hmaccalc-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 23:31:51 -0000	1.1
+++ sources	13 Apr 2009 12:39:09 -0000	1.2
@@ -0,0 +1 @@
+502ef68c4b215f01214dc8169d9e6298  hmaccalc-0.9.6.tar.gz



From pmachata at fedoraproject.org  Mon Apr 13 12:44:23 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 13 Apr 2009 12:44:23 +0000 (UTC)
Subject: rpms/tzdata/devel .cvsignore, 1.52, 1.53 sources, 1.56,
	1.57 tzdata.spec, 1.77, 1.78
Message-ID: <20090413124423.A36DE70124@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21818

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Forgot to upload sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	23 Mar 2009 14:24:12 -0000	1.52
+++ .cvsignore	13 Apr 2009 12:43:52 -0000	1.53
@@ -20,3 +20,5 @@
 tzcode2009a.tar.gz
 tzdata2009d.tar.gz
 tzcode2009d.tar.gz
+tzdata2009e.tar.gz
+tzcode2009e.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	23 Mar 2009 14:24:12 -0000	1.56
+++ sources	13 Apr 2009 12:43:52 -0000	1.57
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-95a7af89e6ec9a08096dda3c659d1bf3  tzdata2009d.tar.gz
-bcd22fb108f302bdcc2128e3de915550  tzcode2009d.tar.gz
+206709f3373f8baebaec07b3d8b7ac40  tzdata2009e.tar.gz
+329c3ff06919193c55a293a73a8c618f  tzcode2009e.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- tzdata.spec	13 Apr 2009 11:57:32 -0000	1.77
+++ tzdata.spec	13 Apr 2009 12:43:52 -0000	1.78
@@ -3,7 +3,7 @@
 Version: 2009e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -111,6 +111,9 @@
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009e-3
+- Bump up for rebuild
+
 * Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009e-2
 - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
 



From scop at fedoraproject.org  Mon Apr 13 12:45:38 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 13 Apr 2009 12:45:38 +0000 (UTC)
Subject: rpms/bash-completion/F-10 .cvsignore, 1.10,
	1.11 bash-completion-mock, 
	1.4, 1.5 bash-completion-plague-client, 1.1,
	1.2 bash-completion-repomanage, 1.1, 1.2 bash-completion.spec,
	1.30, 1.31 sources, 1.10,
	1.11 bash-completion-20060301-debian.patch, 1.2,
	NONE bash-completion-20060301-getent.patch, 1.1,
	NONE bash-completion-20060301-gzip.patch, 1.1,
	NONE bash-completion-20060301-jpeg2000-304771.patch, 1.1,
	NONE bash-completion-20060301-lzma.patch, 1.1,
	NONE bash-completion-20060301-mediafiles-444467.patch, 1.2,
	NONE bash-completion-20060301-perl-299571.patch, 1.1,
	NONE bash-completion-20060301-rpm-backups.patch, 1.1,
	NONE bash-completion-20060301-rpm-eval.patch, 1.1,
	NONE bash-completion-20060301-scp-apos-217178.patch, 1.1,
	NONE bash-completion-20060301-sqlite.patch, 1.1,
	NONE bash-completion-20060301-svn-filenames-430059.patch, 1.1,
	NONE bash-completion-lzop, 1.1, NONE
Message-ID: <20090413124538.D3BAB70124@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25094/F-10

Modified Files:
	.cvsignore bash-completion-mock bash-completion-plague-client 
	bash-completion-repomanage bash-completion.spec sources 
Removed Files:
	bash-completion-20060301-debian.patch 
	bash-completion-20060301-getent.patch 
	bash-completion-20060301-gzip.patch 
	bash-completion-20060301-jpeg2000-304771.patch 
	bash-completion-20060301-lzma.patch 
	bash-completion-20060301-mediafiles-444467.patch 
	bash-completion-20060301-perl-299571.patch 
	bash-completion-20060301-rpm-backups.patch 
	bash-completion-20060301-rpm-eval.patch 
	bash-completion-20060301-scp-apos-217178.patch 
	bash-completion-20060301-sqlite.patch 
	bash-completion-20060301-svn-filenames-430059.patch 
	bash-completion-lzop 
Log Message:
* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
- Apply upstream patch to fix quoting issues with bash 4.x (#490322).

* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
- 1.0.

* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
- Add dependency on coreutils for triggers (#490768).
- Update and improve mock completion.

* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
- git snapshot f4f0984, fixes #484578 (another issue), #486998.

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
- git snapshot 47d0c5b, fixes #484578.
- lzop and repomanage completions included upstream.

* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
- r1252 snapshot; all patches applied upstream.
- Do not install mercurial completion, an updated version is shipped with it.
- Improve lzop and repomanage completion.

* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
- 20080705; new upstream at http://bash-completion.alioth.debian.org/
- Perl, Debian, and scp patches applied upstream.
- Patch to improve man completion: more sections, better filename handling.
- Patch to speed up yum install/deplist completion (#478784).
- Patch to fix and speed up rpm installed packages completion.
- Update mock completion.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Mar 2006 21:12:24 -0000	1.10
+++ .cvsignore	13 Apr 2009 12:45:07 -0000	1.11
@@ -1 +1 @@
-bash-completion-20060301.tar.bz2
+bash-completion-1.0.tar.gz


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-10/bash-completion-mock,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bash-completion-mock	30 Dec 2007 22:23:36 -0000	1.4
+++ bash-completion-mock	13 Apr 2009 12:45:08 -0000	1.5
@@ -1,68 +1,79 @@
-# bash completion for mock                                           -*- sh -*-
-
-# TODO: --copyin, --copyout
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for mock
 
 _mock()
 {
-    local cur prev plugins cfgdir
+	local cur prev plugins cfgdir
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    plugins='ccache yum_cache root_cache bind_mount'
-    cfgdir=/etc/mock
-
-    count=0
-    for i in ${COMP_WORDS[@]} ; do
-        [ $count -eq $COMP_CWORD ] && break
-        if [[ "$i" == --configdir ]] ; then
-            cfgdir="${COMP_WORDS[((count+1))]}"
-        elif [[ "$i" == --configdir=* ]] ; then
-            cfgdir=${i/*=/}
-        fi
-        count=$((++count))
-    done
-
-    case $prev in
-        -r)
-            COMPREPLY=( $( command ls $cfgdir | \
-                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
-            return 0
-            ;;
-        -@(-help|h))
-            return 0
-            ;;
-    esac
-
-    # --name=value style option
-    if [[ "$cur" == *=* ]] ; then
-        prev=${cur/=*/}
-        cur=${cur/*=/}
-        case $prev in 
-            --@(config|result)dir)
-                _filedir -d
-                return 0
-                ;;
-            --@(en|dis)able-plugin)
-                COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
-                return 0
-                ;;
-            --@(arch|define|with|without|uniqueext|rpmbuild_timeout))
-                return 0
-                ;;
-        esac
-    fi
-
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help --rebuild --chroot \
-            --shell --clean --init --installdeps --install --update \
-            --orphanskill -r --offline --no-clean --cleanup-after \
-            --no-cleanup-after --arch= --define= --with= --without= \
-            --resultdir= --uniqueext= --configdir= --rpmbuild_timeout -v \
-            --verbose -q --quiet --trace --enable-plugin= --disable-plugin=' \
-            -- $cur ) )
-    else
-        _filedir '?(no)src.rpm'
-    fi
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+	plugins='tmpfs root_cache yum_cache bind_mount ccache'
+	cfgdir=/etc/mock
+
+	count=0
+	for i in "${COMP_WORDS[@]}" ; do
+		[ $count -eq $COMP_CWORD ] && break
+		if [[ "$i" == --configdir ]] ; then
+			cfgdir="${COMP_WORDS[((count+1))]}"
+		elif [[ "$i" == --configdir=* ]] ; then
+			cfgdir=${i/*=/}
+		fi
+		count=$((++count))
+	done
+
+	# --name=value style option
+	if [[ "$cur" == --?*=* ]] ; then
+		prev="${cur/=*}"
+		cur="${cur#$prev=}"
+	fi
+
+	case $prev in
+		-@(h|-help|-copy@(in|out)|-arch|D|-define|-with?(out)|-uniqueext|-rpmbuild_timeout|-sources|-cwd))
+			return 0
+			;;
+		-@(r|-root))
+			COMPREPLY=( $( command ls $cfgdir | \
+				sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
+			return 0
+			;;
+		--@(config|result)dir)
+			_filedir -d
+			return 0
+			;;
+		--spec)
+			_filedir spec
+			return 0
+			;;
+		--target)
+			# Yep, compatible archs, not compatible build archs
+			# (e.g. ix86 chroot builds in x86_64 mock host)
+			# This would actually depend on what the target root
+			# can be used to build for...
+			COMPREPLY=( $( compgen -W "$( command rpm --showrc | sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" -- $cur ) )
+			return 0
+			;;
+		--@(en|dis)able-plugin)
+			COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '--version -h --help --rebuild \
+			--buildsrpm --shell --chroot --clean --init \
+			--installdeps --install --update --orphanskill \
+			--copyin --copyout -r --root --offline --no-clean \
+			--cleanup-after --no-cleanup-after --arch --target \
+			-D --define --with --without --resultdir --uniqueext \
+			--configdir --rpmbuild_timeout --unpriv --cwd --spec \
+			--sources -v --verbose -q --quiet --trace \
+			--enable-plugin --disable-plugin --print-root-path' \
+			-- $cur ) )
+	else
+		_filedir '?(no)src.rpm'
+	fi
 }
 complete -F _mock $filenames mock


Index: bash-completion-plague-client
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-10/bash-completion-plague-client,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-plague-client	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-plague-client	13 Apr 2009 12:45:08 -0000	1.2
@@ -1,16 +1,20 @@
-# bash completion for plague-client                                  -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+
+# bash completion for plague-client
 
 _plague_client()
 {
-    local cur
+	local cur
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+	COMPREPLY=()
+	cur=`_get_cword`
 
-    [ $COMP_CWORD = 1 ] && \
-    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
-        list_builders pause requeue unpause update_builders' -- $cur ) )
+	[ $COMP_CWORD = 1 ] && \
+		COMPREPLY=( $( compgen -W 'build detail finish help is_paused \
+				kill list list_builders pause requeue unpause \
+				update_builders' -- $cur ) )
 
-    return 0
+	return 0
 }
 complete -F _plague_client plague-client


Index: bash-completion-repomanage
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-10/bash-completion-repomanage,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-repomanage	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-repomanage	13 Apr 2009 12:45:08 -0000	1.2
@@ -1,24 +1,24 @@
-# bash completion for repomanage                                     -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for repomanage
 
+have repomanage &&
 _repomanage()
 {
-    local cur prev
+	local cur prev
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    case $prev in
-        -@(h|-help|k|-keep))
-            return 0
-            ;;
-    esac
+	[[ "$prev" == -@(h|-help|k|-keep) ]] && return 0
 
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
-            -c --nocheck -h --help' -- $cur ) )
-    else
-        _filedir -d
-    fi
-}
-complete -F _repomanage repomanage
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \
+				--keep -c --nocheck -h --help' -- $cur ) )
+	else
+		_filedir -d
+	fi
+} &&
+complete -F _repomanage $filenames repomanage


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-10/bash-completion.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bash-completion.spec	2 Oct 2008 19:27:50 -0000	1.30
+++ bash-completion.spec	13 Apr 2009 12:45:08 -0000	1.31
@@ -1,32 +1,24 @@
 Name:           bash-completion
-Version:        20060301
-Release:        13
+Version:        1.0
+Release:        2%{?dist}
+Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
-URL:            http://www.caliban.org/bash/
-Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
-Source1:        %{name}-lzop
-Source2:        %{name}-mock
+URL:            http://bash-completion.alioth.debian.org/
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
+Source1:        %{name}-mock
+Source2:        %{name}-plague-client
 Source3:        %{name}-repomanage
-Source4:        %{name}-plague-client
-Patch0:         %{name}-20060301-scp-apos-217178.patch
-Patch1:         %{name}-20060301-debian.patch
-Patch2:         %{name}-20060301-perl-299571.patch
-Patch3:         %{name}-20060301-jpeg2000-304771.patch
-Patch4:         %{name}-20060301-mediafiles-444467.patch
-Patch5:         %{name}-20060301-svn-filenames-430059.patch
-Patch6:         %{name}-20060301-gzip.patch
-Patch7:         %{name}-20060301-lzma.patch
-Patch8:         %{name}-20060301-rpm-backups.patch
-Patch9:         %{name}-20060301-rpm-eval.patch
-Patch10:        %{name}-20060301-getent.patch
-Patch11:        %{name}-20060301-sqlite.patch
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
+Patch0:         %{name}-1.0-bash4quoting-490322.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       bash >= 2.05-12
+# For symlinking in triggers, #490768
+Requires:       coreutils
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -34,24 +26,11 @@
 
 
 %prep
-%setup -q -n bash_completion
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-install -pm 644 %{SOURCE1} contrib/lzop
-install -pm 644 %{SOURCE2} contrib/mock
+%setup -q
+%patch0 -p1
+install -pm 644 %{SOURCE1} contrib/mock
+install -pm 644 %{SOURCE2} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
-install -pm 644 %{SOURCE4} contrib/plague-client
 
 
 %build
@@ -81,13 +60,18 @@
 %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
 
 # Not handled (yet?):
-# bitkeeper, harbour, larch, lisp, p4, povray
+# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
 
 %triggerin -- bittorrent
 %do_triggerin bittorrent
 %triggerun -- bittorrent
 %do_triggerun bittorrent
 
+%triggerin -- bridge-utils
+%do_triggerin brctl
+%triggerun -- bridge-utils
+%do_triggerun brctl
+
 %triggerin -- cksfv
 %do_triggerin cksfv
 %triggerun -- cksfv
@@ -98,6 +82,11 @@
 %triggerun -- clisp
 %do_triggerun clisp
 
+%triggerin -- cowsay
+%do_triggerin cowsay
+%triggerun -- cowsay
+%do_triggerun cowsay
+
 %triggerin -- dsniff
 %do_triggerin dsniff
 %triggerun -- dsniff
@@ -123,11 +112,21 @@
 %triggerun -- gkrellm
 %do_triggerun gkrellm
 
+%triggerin -- gnupg2
+%do_triggerin gpg2
+%triggerun -- gnupg2
+%do_triggerun gpg2
+
 %triggerin -- lilypond
 %do_triggerin lilypond
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzma
+%do_triggerin lzma
+%triggerun -- lzma
+%do_triggerun lzma
+
 %triggerin -- lzop
 %do_triggerin lzop
 %triggerun -- lzop
@@ -143,21 +142,41 @@
 %triggerun -- mcrypt
 %do_triggerun mcrypt
 
-%triggerin -- mercurial
-%do_triggerin hg
-%triggerun -- mercurial
-%do_triggerun hg
+%triggerin -- minicom
+%do_triggerin minicom
+%triggerun -- minicom
+%do_triggerun minicom
 
 %triggerin -- mock
 %do_triggerin mock
 %triggerun -- mock
 %do_triggerun mock
 
+%triggerin -- monodevelop
+%do_triggerin monodevelop
+%triggerun -- monodevelop
+%do_triggerun monodevelop
+
 %triggerin -- mtx
 %do_triggerin mtx
 %triggerun -- mtx
 %do_triggerun mtx
 
+%triggerin -- net-tools
+%do_triggerin net-tools
+%triggerun -- net-tools
+%do_triggerun net-tools
+
+%triggerin -- openssh-clients
+%do_triggerin ssh
+%triggerun -- openssh-clients
+%do_triggerun ssh
+
+%triggerin -- perl-CPANPLUS
+%do_triggerin cpan2dist
+%triggerun -- perl-CPANPLUS
+%do_triggerun cpan2dist
+
 %triggerin -- perl-SVK
 %do_triggerin svk
 %triggerun -- perl-SVK
@@ -168,6 +187,26 @@
 %triggerun -- plague-client
 %do_triggerun plague-client
 
+%triggerin -- qemu
+%do_triggerin qemu
+%triggerun -- qemu
+%do_triggerun qemu
+
+%triggerin -- quota
+%do_triggerin quota-tools
+%triggerun -- quota
+%do_triggerun quota-tools
+
+%triggerin -- qt
+%do_triggerin qdbus
+%triggerun -- qt
+%do_triggerun qdbus
+
+%triggerin -- rdesktop
+%do_triggerin rdesktop
+%triggerun -- rdesktop
+%do_triggerun rdesktop
+
 %triggerin -- ruby-ri
 %do_triggerin ri
 %triggerun -- ruby-ri
@@ -188,6 +227,11 @@
 %triggerun -- snownews
 %do_triggerun snownews
 
+%triggerin -- subversion
+%do_triggerin _subversion
+%triggerun -- subversion
+%do_triggerun _subversion
+
 %triggerin -- unace
 %do_triggerin unace
 %triggerun -- unace
@@ -208,10 +252,15 @@
 %triggerun -- yum-utils
 %do_triggerun repomanage
 
+%triggerin -- vnc
+%do_triggerin vncviewer
+%triggerun -- vnc
+%do_triggerun vncviewer
+
 
 %files -f %{name}-ghosts.list
 %defattr(-,root,root,-)
-%doc BUGS Changelog COPYING README
+%doc AUTHORS CHANGES COPYING README TODO
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
@@ -219,6 +268,39 @@
 
 
 %changelog
+* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
+- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
+
+* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
+- 1.0.
+
+* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
+- Add dependency on coreutils for triggers (#490768).
+- Update and improve mock completion.
+
+* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
+- git snapshot f4f0984, fixes #484578 (another issue), #486998.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
+- git snapshot 47d0c5b, fixes #484578.
+- lzop and repomanage completions included upstream.
+
+* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+- r1252 snapshot; all patches applied upstream.
+- Do not install mercurial completion, an updated version is shipped with it.
+- Improve lzop and repomanage completion.
+
+* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
+- 20080705; new upstream at http://bash-completion.alioth.debian.org/
+- Perl, Debian, and scp patches applied upstream.
+- Patch to improve man completion: more sections, better filename handling.
+- Patch to speed up yum install/deplist completion (#478784).
+- Patch to fix and speed up rpm installed packages completion.
+- Update mock completion.
+
 * Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
 - More Matroska associations (#463829, based on patch from Yanko Kaneti).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Mar 2006 21:12:24 -0000	1.10
+++ sources	13 Apr 2009 12:45:08 -0000	1.11
@@ -1 +1 @@
-ed95a89f57357a42b8e4eb95487bf9d0  bash-completion-20060301.tar.bz2
+cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz


--- bash-completion-20060301-debian.patch DELETED ---


--- bash-completion-20060301-getent.patch DELETED ---


--- bash-completion-20060301-gzip.patch DELETED ---


--- bash-completion-20060301-jpeg2000-304771.patch DELETED ---


--- bash-completion-20060301-lzma.patch DELETED ---


--- bash-completion-20060301-mediafiles-444467.patch DELETED ---


--- bash-completion-20060301-perl-299571.patch DELETED ---


--- bash-completion-20060301-rpm-backups.patch DELETED ---


--- bash-completion-20060301-rpm-eval.patch DELETED ---


--- bash-completion-20060301-scp-apos-217178.patch DELETED ---


--- bash-completion-20060301-sqlite.patch DELETED ---


--- bash-completion-20060301-svn-filenames-430059.patch DELETED ---


--- bash-completion-lzop DELETED ---



From scop at fedoraproject.org  Mon Apr 13 12:46:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 13 Apr 2009 12:46:09 +0000 (UTC)
Subject: rpms/bash-completion/F-10
	bash-completion-1.0-bash4quoting-490322.patch, NONE, 1.1
Message-ID: <20090413124609.A937D70124@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30186

Added Files:
	bash-completion-1.0-bash4quoting-490322.patch 
Log Message:
Add missing patch.

bash-completion-1.0-bash4quoting-490322.patch:

--- NEW FILE bash-completion-1.0-bash4quoting-490322.patch ---
From: Mike Kelly <pioto at pioto.org>
Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400)
Subject: Fix _filedir on bash 4.
X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c

Fix _filedir on bash 4.

We don't need to double-quote things for compgen w/ bash 4. Just putting
each file in double quotes is sufficient.

See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
---

diff --git a/bash_completion b/bash_completion
index 0246cd8..4d21cf8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -209,6 +209,12 @@ quote()
 # results in the original argument
 quote_readline()
 {
+	if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
+		# This function isn't really necessary on bash 4
+		# See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+		echo "${1}"
+		return
+	fi
 	local t="${1//\\/\\\\}"
 	echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
 }



From scop at fedoraproject.org  Mon Apr 13 12:49:03 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 13 Apr 2009 12:49:03 +0000 (UTC)
Subject: rpms/bash-completion/F-9
	bash-completion-1.0-bash4quoting-490322.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 bash-completion-mock, 1.4,
	1.5 bash-completion-plague-client, 1.1,
	1.2 bash-completion-repomanage, 1.1, 1.2 bash-completion.spec,
	1.29, 1.30 sources, 1.10,
	1.11 bash-completion-20060301-debian.patch, 1.2,
	NONE bash-completion-20060301-getent.patch, 1.1,
	NONE bash-completion-20060301-gzip.patch, 1.1,
	NONE bash-completion-20060301-jpeg2000-304771.patch, 1.1,
	NONE bash-completion-20060301-lzma.patch, 1.1,
	NONE bash-completion-20060301-mediafiles-444467.patch, 1.1,
	NONE bash-completion-20060301-perl-299571.patch, 1.1,
	NONE bash-completion-20060301-rpm-backups.patch, 1.1,
	NONE bash-completion-20060301-rpm-eval.patch, 1.1,
	NONE bash-completion-20060301-scp-apos-217178.patch, 1.1,
	NONE bash-completion-20060301-sqlite.patch, 1.1,
	NONE bash-completion-20060301-svn-filenames-430059.patch, 1.1,
	NONE bash-completion-lzop, 1.1, NONE
Message-ID: <20090413124903.E152C70124@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31804/F-9

Modified Files:
	.cvsignore bash-completion-mock bash-completion-plague-client 
	bash-completion-repomanage bash-completion.spec sources 
Added Files:
	bash-completion-1.0-bash4quoting-490322.patch 
Removed Files:
	bash-completion-20060301-debian.patch 
	bash-completion-20060301-getent.patch 
	bash-completion-20060301-gzip.patch 
	bash-completion-20060301-jpeg2000-304771.patch 
	bash-completion-20060301-lzma.patch 
	bash-completion-20060301-mediafiles-444467.patch 
	bash-completion-20060301-perl-299571.patch 
	bash-completion-20060301-rpm-backups.patch 
	bash-completion-20060301-rpm-eval.patch 
	bash-completion-20060301-scp-apos-217178.patch 
	bash-completion-20060301-sqlite.patch 
	bash-completion-20060301-svn-filenames-430059.patch 
	bash-completion-lzop 
Log Message:
* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
- Apply upstream patch to fix quoting issues with bash 4.x (#490322).

* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
- 1.0.

* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
- Add dependency on coreutils for triggers (#490768).
- Update and improve mock completion.

* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
- git snapshot f4f0984, fixes #484578 (another issue), #486998.

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
- git snapshot 47d0c5b, fixes #484578.
- lzop and repomanage completions included upstream.

* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
- r1252 snapshot; all patches applied upstream.
- Do not install mercurial completion, an updated version is shipped with it.
- Improve lzop and repomanage completion.

* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
- 20080705; new upstream at http://bash-completion.alioth.debian.org/
- Perl, Debian, and scp patches applied upstream.
- Patch to improve man completion: more sections, better filename handling.
- Patch to speed up yum install/deplist completion (#478784).
- Patch to fix and speed up rpm installed packages completion.
- Update mock completion.

* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
- More Matroska associations (#463829, based on patch from Yanko Kaneti).


bash-completion-1.0-bash4quoting-490322.patch:

--- NEW FILE bash-completion-1.0-bash4quoting-490322.patch ---
From: Mike Kelly <pioto at pioto.org>
Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400)
Subject: Fix _filedir on bash 4.
X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c

Fix _filedir on bash 4.

We don't need to double-quote things for compgen w/ bash 4. Just putting
each file in double quotes is sufficient.

See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
---

diff --git a/bash_completion b/bash_completion
index 0246cd8..4d21cf8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -209,6 +209,12 @@ quote()
 # results in the original argument
 quote_readline()
 {
+	if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
+		# This function isn't really necessary on bash 4
+		# See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+		echo "${1}"
+		return
+	fi
 	local t="${1//\\/\\\\}"
 	echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Mar 2006 21:12:24 -0000	1.10
+++ .cvsignore	13 Apr 2009 12:48:30 -0000	1.11
@@ -1 +1 @@
-bash-completion-20060301.tar.bz2
+bash-completion-1.0.tar.gz


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion-mock,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bash-completion-mock	30 Dec 2007 22:23:36 -0000	1.4
+++ bash-completion-mock	13 Apr 2009 12:48:31 -0000	1.5
@@ -1,68 +1,79 @@
-# bash completion for mock                                           -*- sh -*-
-
-# TODO: --copyin, --copyout
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for mock
 
 _mock()
 {
-    local cur prev plugins cfgdir
+	local cur prev plugins cfgdir
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    plugins='ccache yum_cache root_cache bind_mount'
-    cfgdir=/etc/mock
-
-    count=0
-    for i in ${COMP_WORDS[@]} ; do
-        [ $count -eq $COMP_CWORD ] && break
-        if [[ "$i" == --configdir ]] ; then
-            cfgdir="${COMP_WORDS[((count+1))]}"
-        elif [[ "$i" == --configdir=* ]] ; then
-            cfgdir=${i/*=/}
-        fi
-        count=$((++count))
-    done
-
-    case $prev in
-        -r)
-            COMPREPLY=( $( command ls $cfgdir | \
-                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
-            return 0
-            ;;
-        -@(-help|h))
-            return 0
-            ;;
-    esac
-
-    # --name=value style option
-    if [[ "$cur" == *=* ]] ; then
-        prev=${cur/=*/}
-        cur=${cur/*=/}
-        case $prev in 
-            --@(config|result)dir)
-                _filedir -d
-                return 0
-                ;;
-            --@(en|dis)able-plugin)
-                COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
-                return 0
-                ;;
-            --@(arch|define|with|without|uniqueext|rpmbuild_timeout))
-                return 0
-                ;;
-        esac
-    fi
-
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help --rebuild --chroot \
-            --shell --clean --init --installdeps --install --update \
-            --orphanskill -r --offline --no-clean --cleanup-after \
-            --no-cleanup-after --arch= --define= --with= --without= \
-            --resultdir= --uniqueext= --configdir= --rpmbuild_timeout -v \
-            --verbose -q --quiet --trace --enable-plugin= --disable-plugin=' \
-            -- $cur ) )
-    else
-        _filedir '?(no)src.rpm'
-    fi
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+	plugins='tmpfs root_cache yum_cache bind_mount ccache'
+	cfgdir=/etc/mock
+
+	count=0
+	for i in "${COMP_WORDS[@]}" ; do
+		[ $count -eq $COMP_CWORD ] && break
+		if [[ "$i" == --configdir ]] ; then
+			cfgdir="${COMP_WORDS[((count+1))]}"
+		elif [[ "$i" == --configdir=* ]] ; then
+			cfgdir=${i/*=/}
+		fi
+		count=$((++count))
+	done
+
+	# --name=value style option
+	if [[ "$cur" == --?*=* ]] ; then
+		prev="${cur/=*}"
+		cur="${cur#$prev=}"
+	fi
+
+	case $prev in
+		-@(h|-help|-copy@(in|out)|-arch|D|-define|-with?(out)|-uniqueext|-rpmbuild_timeout|-sources|-cwd))
+			return 0
+			;;
+		-@(r|-root))
+			COMPREPLY=( $( command ls $cfgdir | \
+				sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
+			return 0
+			;;
+		--@(config|result)dir)
+			_filedir -d
+			return 0
+			;;
+		--spec)
+			_filedir spec
+			return 0
+			;;
+		--target)
+			# Yep, compatible archs, not compatible build archs
+			# (e.g. ix86 chroot builds in x86_64 mock host)
+			# This would actually depend on what the target root
+			# can be used to build for...
+			COMPREPLY=( $( compgen -W "$( command rpm --showrc | sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" -- $cur ) )
+			return 0
+			;;
+		--@(en|dis)able-plugin)
+			COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '--version -h --help --rebuild \
+			--buildsrpm --shell --chroot --clean --init \
+			--installdeps --install --update --orphanskill \
+			--copyin --copyout -r --root --offline --no-clean \
+			--cleanup-after --no-cleanup-after --arch --target \
+			-D --define --with --without --resultdir --uniqueext \
+			--configdir --rpmbuild_timeout --unpriv --cwd --spec \
+			--sources -v --verbose -q --quiet --trace \
+			--enable-plugin --disable-plugin --print-root-path' \
+			-- $cur ) )
+	else
+		_filedir '?(no)src.rpm'
+	fi
 }
 complete -F _mock $filenames mock


Index: bash-completion-plague-client
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion-plague-client,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-plague-client	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-plague-client	13 Apr 2009 12:48:31 -0000	1.2
@@ -1,16 +1,20 @@
-# bash completion for plague-client                                  -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+
+# bash completion for plague-client
 
 _plague_client()
 {
-    local cur
+	local cur
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+	COMPREPLY=()
+	cur=`_get_cword`
 
-    [ $COMP_CWORD = 1 ] && \
-    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
-        list_builders pause requeue unpause update_builders' -- $cur ) )
+	[ $COMP_CWORD = 1 ] && \
+		COMPREPLY=( $( compgen -W 'build detail finish help is_paused \
+				kill list list_builders pause requeue unpause \
+				update_builders' -- $cur ) )
 
-    return 0
+	return 0
 }
 complete -F _plague_client plague-client


Index: bash-completion-repomanage
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion-repomanage,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-repomanage	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-repomanage	13 Apr 2009 12:48:31 -0000	1.2
@@ -1,24 +1,24 @@
-# bash completion for repomanage                                     -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for repomanage
 
+have repomanage &&
 _repomanage()
 {
-    local cur prev
+	local cur prev
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    case $prev in
-        -@(h|-help|k|-keep))
-            return 0
-            ;;
-    esac
+	[[ "$prev" == -@(h|-help|k|-keep) ]] && return 0
 
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
-            -c --nocheck -h --help' -- $cur ) )
-    else
-        _filedir -d
-    fi
-}
-complete -F _repomanage repomanage
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \
+				--keep -c --nocheck -h --help' -- $cur ) )
+	else
+		_filedir -d
+	fi
+} &&
+complete -F _repomanage $filenames repomanage


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bash-completion.spec	11 Sep 2008 18:20:08 -0000	1.29
+++ bash-completion.spec	13 Apr 2009 12:48:31 -0000	1.30
@@ -1,32 +1,24 @@
 Name:           bash-completion
-Version:        20060301
-Release:        13
+Version:        1.0
+Release:        2%{?dist}
+Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
-URL:            http://www.caliban.org/bash/
-Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
-Source1:        %{name}-lzop
-Source2:        %{name}-mock
+URL:            http://bash-completion.alioth.debian.org/
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
+Source1:        %{name}-mock
+Source2:        %{name}-plague-client
 Source3:        %{name}-repomanage
-Source4:        %{name}-plague-client
-Patch0:         %{name}-20060301-scp-apos-217178.patch
-Patch1:         %{name}-20060301-debian.patch
-Patch2:         %{name}-20060301-perl-299571.patch
-Patch3:         %{name}-20060301-jpeg2000-304771.patch
-Patch4:         %{name}-20060301-mediafiles-444467.patch
-Patch5:         %{name}-20060301-svn-filenames-430059.patch
-Patch6:         %{name}-20060301-gzip.patch
-Patch7:         %{name}-20060301-lzma.patch
-Patch8:         %{name}-20060301-rpm-backups.patch
-Patch9:         %{name}-20060301-rpm-eval.patch
-Patch10:        %{name}-20060301-getent.patch
-Patch11:        %{name}-20060301-sqlite.patch
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
+Patch0:         %{name}-1.0-bash4quoting-490322.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       bash >= 2.05-12
+# For symlinking in triggers, #490768
+Requires:       coreutils
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -34,24 +26,11 @@
 
 
 %prep
-%setup -q -n bash_completion
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-install -pm 644 %{SOURCE1} contrib/lzop
-install -pm 644 %{SOURCE2} contrib/mock
+%setup -q
+%patch0 -p1
+install -pm 644 %{SOURCE1} contrib/mock
+install -pm 644 %{SOURCE2} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
-install -pm 644 %{SOURCE4} contrib/plague-client
 
 
 %build
@@ -81,13 +60,18 @@
 %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
 
 # Not handled (yet?):
-# bitkeeper, harbour, larch, lisp, p4, povray
+# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
 
 %triggerin -- bittorrent
 %do_triggerin bittorrent
 %triggerun -- bittorrent
 %do_triggerun bittorrent
 
+%triggerin -- bridge-utils
+%do_triggerin brctl
+%triggerun -- bridge-utils
+%do_triggerun brctl
+
 %triggerin -- cksfv
 %do_triggerin cksfv
 %triggerun -- cksfv
@@ -98,6 +82,11 @@
 %triggerun -- clisp
 %do_triggerun clisp
 
+%triggerin -- cowsay
+%do_triggerin cowsay
+%triggerun -- cowsay
+%do_triggerun cowsay
+
 %triggerin -- dsniff
 %do_triggerin dsniff
 %triggerun -- dsniff
@@ -123,11 +112,21 @@
 %triggerun -- gkrellm
 %do_triggerun gkrellm
 
+%triggerin -- gnupg2
+%do_triggerin gpg2
+%triggerun -- gnupg2
+%do_triggerun gpg2
+
 %triggerin -- lilypond
 %do_triggerin lilypond
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzma
+%do_triggerin lzma
+%triggerun -- lzma
+%do_triggerun lzma
+
 %triggerin -- lzop
 %do_triggerin lzop
 %triggerun -- lzop
@@ -143,21 +142,41 @@
 %triggerun -- mcrypt
 %do_triggerun mcrypt
 
-%triggerin -- mercurial
-%do_triggerin hg
-%triggerun -- mercurial
-%do_triggerun hg
+%triggerin -- minicom
+%do_triggerin minicom
+%triggerun -- minicom
+%do_triggerun minicom
 
 %triggerin -- mock
 %do_triggerin mock
 %triggerun -- mock
 %do_triggerun mock
 
+%triggerin -- monodevelop
+%do_triggerin monodevelop
+%triggerun -- monodevelop
+%do_triggerun monodevelop
+
 %triggerin -- mtx
 %do_triggerin mtx
 %triggerun -- mtx
 %do_triggerun mtx
 
+%triggerin -- net-tools
+%do_triggerin net-tools
+%triggerun -- net-tools
+%do_triggerun net-tools
+
+%triggerin -- openssh-clients
+%do_triggerin ssh
+%triggerun -- openssh-clients
+%do_triggerun ssh
+
+%triggerin -- perl-CPANPLUS
+%do_triggerin cpan2dist
+%triggerun -- perl-CPANPLUS
+%do_triggerun cpan2dist
+
 %triggerin -- perl-SVK
 %do_triggerin svk
 %triggerun -- perl-SVK
@@ -168,6 +187,26 @@
 %triggerun -- plague-client
 %do_triggerun plague-client
 
+%triggerin -- qemu
+%do_triggerin qemu
+%triggerun -- qemu
+%do_triggerun qemu
+
+%triggerin -- quota
+%do_triggerin quota-tools
+%triggerun -- quota
+%do_triggerun quota-tools
+
+%triggerin -- qt
+%do_triggerin qdbus
+%triggerun -- qt
+%do_triggerun qdbus
+
+%triggerin -- rdesktop
+%do_triggerin rdesktop
+%triggerun -- rdesktop
+%do_triggerun rdesktop
+
 %triggerin -- ruby-ri
 %do_triggerin ri
 %triggerun -- ruby-ri
@@ -188,6 +227,11 @@
 %triggerun -- snownews
 %do_triggerun snownews
 
+%triggerin -- subversion
+%do_triggerin _subversion
+%triggerun -- subversion
+%do_triggerun _subversion
+
 %triggerin -- unace
 %do_triggerin unace
 %triggerun -- unace
@@ -208,10 +252,15 @@
 %triggerun -- yum-utils
 %do_triggerun repomanage
 
+%triggerin -- vnc
+%do_triggerin vncviewer
+%triggerun -- vnc
+%do_triggerun vncviewer
+
 
 %files -f %{name}-ghosts.list
 %defattr(-,root,root,-)
-%doc BUGS Changelog COPYING README
+%doc AUTHORS CHANGES COPYING README TODO
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
@@ -219,6 +268,42 @@
 
 
 %changelog
+* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
+- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
+
+* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
+- 1.0.
+
+* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
+- Add dependency on coreutils for triggers (#490768).
+- Update and improve mock completion.
+
+* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
+- git snapshot f4f0984, fixes #484578 (another issue), #486998.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
+- git snapshot 47d0c5b, fixes #484578.
+- lzop and repomanage completions included upstream.
+
+* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+- r1252 snapshot; all patches applied upstream.
+- Do not install mercurial completion, an updated version is shipped with it.
+- Improve lzop and repomanage completion.
+
+* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
+- 20080705; new upstream at http://bash-completion.alioth.debian.org/
+- Perl, Debian, and scp patches applied upstream.
+- Patch to improve man completion: more sections, better filename handling.
+- Patch to speed up yum install/deplist completion (#478784).
+- Patch to fix and speed up rpm installed packages completion.
+- Update mock completion.
+
+* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- More Matroska associations (#463829, based on patch from Yanko Kaneti).
+
 * Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
 - Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
   for getent and rpm --eval, better rpm backup file avoidance, lzma support.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Mar 2006 21:12:24 -0000	1.10
+++ sources	13 Apr 2009 12:48:31 -0000	1.11
@@ -1 +1 @@
-ed95a89f57357a42b8e4eb95487bf9d0  bash-completion-20060301.tar.bz2
+cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz


--- bash-completion-20060301-debian.patch DELETED ---


--- bash-completion-20060301-getent.patch DELETED ---


--- bash-completion-20060301-gzip.patch DELETED ---


--- bash-completion-20060301-jpeg2000-304771.patch DELETED ---


--- bash-completion-20060301-lzma.patch DELETED ---


--- bash-completion-20060301-mediafiles-444467.patch DELETED ---


--- bash-completion-20060301-perl-299571.patch DELETED ---


--- bash-completion-20060301-rpm-backups.patch DELETED ---


--- bash-completion-20060301-rpm-eval.patch DELETED ---


--- bash-completion-20060301-scp-apos-217178.patch DELETED ---


--- bash-completion-20060301-sqlite.patch DELETED ---


--- bash-completion-20060301-svn-filenames-430059.patch DELETED ---


--- bash-completion-lzop DELETED ---



From pmachata at fedoraproject.org  Mon Apr 13 13:02:30 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 13 Apr 2009 13:02:30 +0000 (UTC)
Subject: rpms/tzdata/F-10 tzdata-2009e-cairo.patch, NONE,
	1.1 tzdata-2009e-karachi.patch, NONE, 1.1 sources, 1.56,
	1.57 tzdata.spec, 1.75, 1.76
Message-ID: <20090413130230.5ABE470124@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5347

Modified Files:
	sources tzdata.spec 
Added Files:
	tzdata-2009e-cairo.patch tzdata-2009e-karachi.patch 
Log Message:
- Upstream 2009e
  - Historical changes for Jordan
  - Palestine will start DST on 2009-03-26 and end 2009-09-27
- Egypt ends DST on 2009-09-24
- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01


tzdata-2009e-cairo.patch:

--- NEW FILE tzdata-2009e-cairo.patch ---
diff -up tzdata2009e/africa tzdata2009e-pm/africa
--- tzdata2009e/africa	2009-03-23 14:37:51.000000000 +0100
+++ tzdata2009e-pm/africa	2009-04-06 16:06:49.000000000 +0200
@@ -236,7 +236,8 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # unless discontinued, next DST may end Thursday 28 August 2008.
 # From Paul Eggert (2007-08-17):
 # For lack of better info, assume the new rule is last Thursday in August.
-Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

Diff finished.  Mon Apr  6 16:06:53 2009

tzdata-2009e-karachi.patch:

--- NEW FILE tzdata-2009e-karachi.patch ---
diff -urp tzdata2009e/asia tzdata2009e.pm/asia
--- tzdata2009e/asia	2009-04-06 15:08:11.000000000 +0200
+++ tzdata2009e.pm/asia	2009-04-13 13:31:28.000000000 +0200
@@ -1593,7 +1593,8 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
-Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	23 Mar 2009 14:36:00 -0000	1.56
+++ sources	13 Apr 2009 13:02:27 -0000	1.57
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-95a7af89e6ec9a08096dda3c659d1bf3  tzdata2009d.tar.gz
-bcd22fb108f302bdcc2128e3de915550  tzcode2009d.tar.gz
+206709f3373f8baebaec07b3d8b7ac40  tzdata2009e.tar.gz
+329c3ff06919193c55a293a73a8c618f  tzcode2009e.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- tzdata.spec	23 Mar 2009 14:36:00 -0000	1.75
+++ tzdata.spec	13 Apr 2009 13:02:28 -0000	1.76
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009d
+Version: 2009e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,8 @@
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2009e-cairo.patch
+Patch2: tzdata-2009e-karachi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +49,8 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p0
+%patch2 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +111,13 @@
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009e-3
+- Upstream 2009e
+  - Historical changes for Jordan
+  - Palestine will start DST on 2009-03-26 and end 2009-09-27
+- Egypt ends DST on 2009-09-24
+- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
+
 * Mon Mar 23 2009 Petr Machata <pmachata at redhat.com> - 2009d-1
 - Upstream 2009d
   - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00



From pmachata at fedoraproject.org  Mon Apr 13 13:04:03 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 13 Apr 2009 13:04:03 +0000 (UTC)
Subject: rpms/tzdata/F-9 tzdata-2009e-cairo.patch, NONE,
	1.1 tzdata-2009e-karachi.patch, NONE, 1.1 sources, 1.56,
	1.57 tzdata.spec, 1.74, 1.75
Message-ID: <20090413130403.B8F6E70124@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5891

Modified Files:
	sources tzdata.spec 
Added Files:
	tzdata-2009e-cairo.patch tzdata-2009e-karachi.patch 
Log Message:
- Upstream 2009e
  - Historical changes for Jordan
  - Palestine will start DST on 2009-03-26 and end 2009-09-27
- Egypt ends DST on 2009-09-24
- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01


tzdata-2009e-cairo.patch:

--- NEW FILE tzdata-2009e-cairo.patch ---
diff -up tzdata2009e/africa tzdata2009e-pm/africa
--- tzdata2009e/africa	2009-03-23 14:37:51.000000000 +0100
+++ tzdata2009e-pm/africa	2009-04-06 16:06:49.000000000 +0200
@@ -236,7 +236,8 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # unless discontinued, next DST may end Thursday 28 August 2008.
 # From Paul Eggert (2007-08-17):
 # For lack of better info, assume the new rule is last Thursday in August.
-Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

Diff finished.  Mon Apr  6 16:06:53 2009

tzdata-2009e-karachi.patch:

--- NEW FILE tzdata-2009e-karachi.patch ---
diff -urp tzdata2009e/asia tzdata2009e.pm/asia
--- tzdata2009e/asia	2009-04-06 15:08:11.000000000 +0200
+++ tzdata2009e.pm/asia	2009-04-13 13:31:28.000000000 +0200
@@ -1593,7 +1593,8 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
-Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	23 Mar 2009 14:39:51 -0000	1.56
+++ sources	13 Apr 2009 13:04:00 -0000	1.57
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-95a7af89e6ec9a08096dda3c659d1bf3  tzdata2009d.tar.gz
-bcd22fb108f302bdcc2128e3de915550  tzcode2009d.tar.gz
+206709f3373f8baebaec07b3d8b7ac40  tzdata2009e.tar.gz
+329c3ff06919193c55a293a73a8c618f  tzcode2009e.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/tzdata.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- tzdata.spec	23 Mar 2009 14:39:51 -0000	1.74
+++ tzdata.spec	13 Apr 2009 13:04:01 -0000	1.75
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009d
+Version: 2009e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,8 @@
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2009e-cairo.patch
+Patch2: tzdata-2009e-karachi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +49,8 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p0
+%patch2 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +111,13 @@
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009e-3
+- Upstream 2009e
+  - Historical changes for Jordan
+  - Palestine will start DST on 2009-03-26 and end 2009-09-27
+- Egypt ends DST on 2009-09-24
+- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
+
 * Mon Mar 23 2009 Petr Machata <pmachata at redhat.com> - 2009d-1
 - Upstream 2009d
   - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00



From scop at fedoraproject.org  Mon Apr 13 13:19:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 13 Apr 2009 13:19:32 +0000 (UTC)
Subject: rpms/bash-completion/EL-4
	bash-completion-1.0-bash4quoting-490322.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 bash-completion-mock, 1.2,
	1.3 bash-completion-plague-client, 1.1,
	1.2 bash-completion-repomanage, 1.1, 1.2 bash-completion.spec,
	1.9, 1.10 sources, 1.8,
	1.9 bash-completion-20060301-debian.patch, 1.1,
	NONE bash-completion-20060301-scp-apos-217178.patch, 1.1, NONE
Message-ID: <20090413131932.BA12970124@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11259/EL-4

Modified Files:
	.cvsignore bash-completion-mock bash-completion-plague-client 
	bash-completion-repomanage bash-completion.spec sources 
Added Files:
	bash-completion-1.0-bash4quoting-490322.patch 
Removed Files:
	bash-completion-20060301-debian.patch 
	bash-completion-20060301-scp-apos-217178.patch 
Log Message:
* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
- Apply upstream patch to fix quoting issues with bash 4.x (#490322).

* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
- 1.0.

* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
- Add dependency on coreutils for triggers (#490768).
- Update and improve mock completion.

* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
- git snapshot f4f0984, fixes #484578 (another issue), #486998.

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
- git snapshot 47d0c5b, fixes #484578.
- lzop and repomanage completions included upstream.

* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
- r1252 snapshot; all patches applied upstream.
- Do not install mercurial completion, an updated version is shipped with it.
- Improve lzop and repomanage completion.

* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
- 20080705; new upstream at http://bash-completion.alioth.debian.org/
- Perl, Debian, and scp patches applied upstream.
- Patch to improve man completion: more sections, better filename handling.
- Patch to speed up yum install/deplist completion (#478784).
- Patch to fix and speed up rpm installed packages completion.
- Update mock completion.

* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
- More Matroska associations (#463829, based on patch from Yanko Kaneti).

* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
- Patch/unpatch to fix gzip and bzip2 options completion.
- Patch to add --rsyncable to gzip options completion.
- Add and trigger-install support for lzop.
- Associate *.sqlite with sqlite3.

* Wed Jul 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-12
- Fix plague-client completion install (#456355, Ricky Zhou).
- Trigger-install support for sitecopy.

* Tue Apr 29 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-11
- Media player association improvements (#444467).

* Sat Feb 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-10
- Patch to fix filename completion with svn (#430059).
- Trigger-install support for dsniff.
- Drop disttag.

* Mon Dec 31 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-8
- Associate VDR recording files with media players.
- Update mock completion.

* Fri Nov 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-7
- Add JPEG2000 extensions for display(1) (#304771).
- Update mock completion.

* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-6
- Patch to improve perl completion (#299571, Jim Radford,
  http://use.perl.org/~Alias/journal/33508).

* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-5
- License: GPLv2+


bash-completion-1.0-bash4quoting-490322.patch:

--- NEW FILE bash-completion-1.0-bash4quoting-490322.patch ---
From: Mike Kelly <pioto at pioto.org>
Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400)
Subject: Fix _filedir on bash 4.
X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c

Fix _filedir on bash 4.

We don't need to double-quote things for compgen w/ bash 4. Just putting
each file in double quotes is sufficient.

See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
---

diff --git a/bash_completion b/bash_completion
index 0246cd8..4d21cf8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -209,6 +209,12 @@ quote()
 # results in the original argument
 quote_readline()
 {
+	if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
+		# This function isn't really necessary on bash 4
+		# See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+		echo "${1}"
+		return
+	fi
 	local t="${1//\\/\\\\}"
 	echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Jun 2007 17:46:10 -0000	1.8
+++ .cvsignore	13 Apr 2009 13:19:01 -0000	1.9
@@ -1 +1 @@
-bash-completion-20060301.tar.bz2
+bash-completion-1.0.tar.gz


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-4/bash-completion-mock,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion-mock	24 Jun 2007 17:46:10 -0000	1.2
+++ bash-completion-mock	13 Apr 2009 13:19:01 -0000	1.3
@@ -1,44 +1,79 @@
-# bash completion for mock                                           -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for mock
 
 _mock()
 {
-    local cur prev commands cfgdir
+	local cur prev plugins cfgdir
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    commands='rebuild chroot init clean shell'
-    cfgdir=/etc/mock
-
-    count=0
-    for i in ${COMP_WORDS[@]} ; do
-        [ $count -eq $COMP_CWORD ] && break
-        [ "$i" == --configdir ] && cfgdir="${COMP_WORDS[((count+1))]}"
-        count=$((++count))
-    done
-
-    case $prev in
-        --@(config|result|state)dir)
-            _filedir -d
-            return 0
-            ;;
-        -r)
-            COMPREPLY=( $( command ls $cfgdir | \
-                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
-            return 0
-            ;;
-        -@(-arch|-uniqueext|-help|h))
-            return 0
-            ;;
-    esac
-
-    # TODO: process $commands
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
-            --debug --resultdir --statedir --uniqueext --configdir --quiet \
-            --autocache --rebuildcache' -- $cur ) )
-    else
-        _filedir '?(no)src.rpm'
-    fi
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+	plugins='tmpfs root_cache yum_cache bind_mount ccache'
+	cfgdir=/etc/mock
+
+	count=0
+	for i in "${COMP_WORDS[@]}" ; do
+		[ $count -eq $COMP_CWORD ] && break
+		if [[ "$i" == --configdir ]] ; then
+			cfgdir="${COMP_WORDS[((count+1))]}"
+		elif [[ "$i" == --configdir=* ]] ; then
+			cfgdir=${i/*=/}
+		fi
+		count=$((++count))
+	done
+
+	# --name=value style option
+	if [[ "$cur" == --?*=* ]] ; then
+		prev="${cur/=*}"
+		cur="${cur#$prev=}"
+	fi
+
+	case $prev in
+		-@(h|-help|-copy@(in|out)|-arch|D|-define|-with?(out)|-uniqueext|-rpmbuild_timeout|-sources|-cwd))
+			return 0
+			;;
+		-@(r|-root))
+			COMPREPLY=( $( command ls $cfgdir | \
+				sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
+			return 0
+			;;
+		--@(config|result)dir)
+			_filedir -d
+			return 0
+			;;
+		--spec)
+			_filedir spec
+			return 0
+			;;
+		--target)
+			# Yep, compatible archs, not compatible build archs
+			# (e.g. ix86 chroot builds in x86_64 mock host)
+			# This would actually depend on what the target root
+			# can be used to build for...
+			COMPREPLY=( $( compgen -W "$( command rpm --showrc | sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" -- $cur ) )
+			return 0
+			;;
+		--@(en|dis)able-plugin)
+			COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '--version -h --help --rebuild \
+			--buildsrpm --shell --chroot --clean --init \
+			--installdeps --install --update --orphanskill \
+			--copyin --copyout -r --root --offline --no-clean \
+			--cleanup-after --no-cleanup-after --arch --target \
+			-D --define --with --without --resultdir --uniqueext \
+			--configdir --rpmbuild_timeout --unpriv --cwd --spec \
+			--sources -v --verbose -q --quiet --trace \
+			--enable-plugin --disable-plugin --print-root-path' \
+			-- $cur ) )
+	else
+		_filedir '?(no)src.rpm'
+	fi
 }
 complete -F _mock $filenames mock


Index: bash-completion-plague-client
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-4/bash-completion-plague-client,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-plague-client	11 Feb 2006 10:05:59 -0000	1.1
+++ bash-completion-plague-client	13 Apr 2009 13:19:01 -0000	1.2
@@ -1,16 +1,20 @@
-# bash completion for plague-client                                  -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+
+# bash completion for plague-client
 
 _plague_client()
 {
-    local cur
+	local cur
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+	COMPREPLY=()
+	cur=`_get_cword`
 
-    [ $COMP_CWORD = 1 ] && \
-    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
-        list_builders pause requeue unpause update_builders' -- $cur ) )
+	[ $COMP_CWORD = 1 ] && \
+		COMPREPLY=( $( compgen -W 'build detail finish help is_paused \
+				kill list list_builders pause requeue unpause \
+				update_builders' -- $cur ) )
 
-    return 0
+	return 0
 }
 complete -F _plague_client plague-client


Index: bash-completion-repomanage
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-4/bash-completion-repomanage,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-repomanage	11 Feb 2006 10:05:59 -0000	1.1
+++ bash-completion-repomanage	13 Apr 2009 13:19:01 -0000	1.2
@@ -1,24 +1,24 @@
-# bash completion for repomanage                                     -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for repomanage
 
+have repomanage &&
 _repomanage()
 {
-    local cur prev
+	local cur prev
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    case $prev in
-        -@(h|-help|k|-keep))
-            return 0
-            ;;
-    esac
+	[[ "$prev" == -@(h|-help|k|-keep) ]] && return 0
 
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
-            -c --nocheck -h --help' -- $cur ) )
-    else
-        _filedir -d
-    fi
-}
-complete -F _repomanage repomanage
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \
+				--keep -c --nocheck -h --help' -- $cur ) )
+	else
+		_filedir -d
+	fi
+} &&
+complete -F _repomanage $filenames repomanage


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-4/bash-completion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bash-completion.spec	24 Jun 2007 17:46:10 -0000	1.9
+++ bash-completion.spec	13 Apr 2009 13:19:01 -0000	1.10
@@ -1,21 +1,24 @@
 Name:           bash-completion
-Version:        20060301
-Release:        4%{?dist}
+Version:        1.0
+Release:        2%{?dist}
+Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
-License:        GPL
-URL:            http://www.caliban.org/bash/
-Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
-Source2:        %{name}-mock
+License:        GPLv2+
+URL:            http://bash-completion.alioth.debian.org/
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
+Source1:        %{name}-mock
+Source2:        %{name}-plague-client
 Source3:        %{name}-repomanage
-Source4:        %{name}-plague-client
-Patch0:         %{name}-20060301-scp-apos-217178.patch
-Patch1:         %{name}-20060301-debian.patch
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
+Patch0:         %{name}-1.0-bash4quoting-490322.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       bash >= 2.05-12
+# For symlinking in triggers, #490768
+Requires:       coreutils
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -23,12 +26,10 @@
 
 
 %prep
-%setup -q -n bash_completion
-%patch0
-%patch1
-f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-install -pm 644 %{SOURCE2} contrib/mock
-install -pm 644 %{SOURCE3} contrib/plague-client
+%setup -q
+%patch0 -p1
+install -pm 644 %{SOURCE1} contrib/mock
+install -pm 644 %{SOURCE2} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
 
 
@@ -59,13 +60,18 @@
 %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
 
 # Not handled (yet?):
-# bitkeeper, dsniff, harbour, larch, lisp, p4, povray, sitecopy
+# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
 
 %triggerin -- bittorrent
 %do_triggerin bittorrent
 %triggerun -- bittorrent
 %do_triggerun bittorrent
 
+%triggerin -- bridge-utils
+%do_triggerin brctl
+%triggerun -- bridge-utils
+%do_triggerun brctl
+
 %triggerin -- cksfv
 %do_triggerin cksfv
 %triggerun -- cksfv
@@ -76,6 +82,16 @@
 %triggerun -- clisp
 %do_triggerun clisp
 
+%triggerin -- cowsay
+%do_triggerin cowsay
+%triggerun -- cowsay
+%do_triggerun cowsay
+
+%triggerin -- dsniff
+%do_triggerin dsniff
+%triggerun -- dsniff
+%do_triggerun dsniff
+
 %triggerin -- freeciv
 %do_triggerin freeciv
 %triggerun -- freeciv
@@ -96,11 +112,26 @@
 %triggerun -- gkrellm
 %do_triggerun gkrellm
 
+%triggerin -- gnupg2
+%do_triggerin gpg2
+%triggerun -- gnupg2
+%do_triggerun gpg2
+
 %triggerin -- lilypond
 %do_triggerin lilypond
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzma
+%do_triggerin lzma
+%triggerun -- lzma
+%do_triggerun lzma
+
+%triggerin -- lzop
+%do_triggerin lzop
+%triggerun -- lzop
+%do_triggerun lzop
+
 %triggerin -- mailman
 %do_triggerin mailman
 %triggerun -- mailman
@@ -111,21 +142,41 @@
 %triggerun -- mcrypt
 %do_triggerun mcrypt
 
-%triggerin -- mercurial
-%do_triggerin hg
-%triggerun -- mercurial
-%do_triggerun hg
+%triggerin -- minicom
+%do_triggerin minicom
+%triggerun -- minicom
+%do_triggerun minicom
 
 %triggerin -- mock
 %do_triggerin mock
 %triggerun -- mock
 %do_triggerun mock
 
+%triggerin -- monodevelop
+%do_triggerin monodevelop
+%triggerun -- monodevelop
+%do_triggerun monodevelop
+
 %triggerin -- mtx
 %do_triggerin mtx
 %triggerun -- mtx
 %do_triggerun mtx
 
+%triggerin -- net-tools
+%do_triggerin net-tools
+%triggerun -- net-tools
+%do_triggerun net-tools
+
+%triggerin -- openssh-clients
+%do_triggerin ssh
+%triggerun -- openssh-clients
+%do_triggerun ssh
+
+%triggerin -- perl-CPANPLUS
+%do_triggerin cpan2dist
+%triggerun -- perl-CPANPLUS
+%do_triggerun cpan2dist
+
 %triggerin -- perl-SVK
 %do_triggerin svk
 %triggerun -- perl-SVK
@@ -136,6 +187,26 @@
 %triggerun -- plague-client
 %do_triggerun plague-client
 
+%triggerin -- qemu
+%do_triggerin qemu
+%triggerun -- qemu
+%do_triggerun qemu
+
+%triggerin -- quota
+%do_triggerin quota-tools
+%triggerun -- quota
+%do_triggerun quota-tools
+
+%triggerin -- qt
+%do_triggerin qdbus
+%triggerun -- qt
+%do_triggerun qdbus
+
+%triggerin -- rdesktop
+%do_triggerin rdesktop
+%triggerun -- rdesktop
+%do_triggerun rdesktop
+
 %triggerin -- ruby-ri
 %do_triggerin ri
 %triggerun -- ruby-ri
@@ -146,11 +217,21 @@
 %triggerun -- sbcl
 %do_triggerun sbcl
 
+%triggerin -- sitecopy
+%do_triggerin sitecopy
+%triggerun -- sitecopy
+%do_triggerun sitecopy
+
 %triggerin -- snownews
 %do_triggerin snownews
 %triggerun -- snownews
 %do_triggerun snownews
 
+%triggerin -- subversion
+%do_triggerin _subversion
+%triggerun -- subversion
+%do_triggerun _subversion
+
 %triggerin -- unace
 %do_triggerin unace
 %triggerun -- unace
@@ -171,10 +252,15 @@
 %triggerun -- yum-utils
 %do_triggerun repomanage
 
+%triggerin -- vnc
+%do_triggerin vncviewer
+%triggerun -- vnc
+%do_triggerun vncviewer
+
 
 %files -f %{name}-ghosts.list
 %defattr(-,root,root,-)
-%doc BUGS Changelog COPYING README
+%doc AUTHORS CHANGES COPYING README TODO
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
@@ -182,6 +268,77 @@
 
 
 %changelog
+* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
+- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
+
+* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
+- 1.0.
+
+* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
+- Add dependency on coreutils for triggers (#490768).
+- Update and improve mock completion.
+
+* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
+- git snapshot f4f0984, fixes #484578 (another issue), #486998.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
+- git snapshot 47d0c5b, fixes #484578.
+- lzop and repomanage completions included upstream.
+
+* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+- r1252 snapshot; all patches applied upstream.
+- Do not install mercurial completion, an updated version is shipped with it.
+- Improve lzop and repomanage completion.
+
+* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
+- 20080705; new upstream at http://bash-completion.alioth.debian.org/
+- Perl, Debian, and scp patches applied upstream.
+- Patch to improve man completion: more sections, better filename handling.
+- Patch to speed up yum install/deplist completion (#478784).
+- Patch to fix and speed up rpm installed packages completion.
+- Update mock completion.
+
+* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- More Matroska associations (#463829, based on patch from Yanko Kaneti).
+
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
+- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
+  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
+- Patch/unpatch to fix gzip and bzip2 options completion.
+- Patch to add --rsyncable to gzip options completion.
+- Add and trigger-install support for lzop.
+- Associate *.sqlite with sqlite3.
+
+* Wed Jul 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-12
+- Fix plague-client completion install (#456355, Ricky Zhou).
+- Trigger-install support for sitecopy.
+
+* Tue Apr 29 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-11
+- Media player association improvements (#444467).
+
+* Sat Feb 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-10
+- Patch to fix filename completion with svn (#430059).
+- Trigger-install support for dsniff.
+- Drop disttag.
+
+* Mon Dec 31 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-8
+- Associate VDR recording files with media players.
+- Update mock completion.
+
+* Fri Nov 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-7
+- Add JPEG2000 extensions for display(1) (#304771).
+- Update mock completion.
+
+* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-6
+- Patch to improve perl completion (#299571, Jim Radford,
+  http://use.perl.org/~Alias/journal/33508).
+
+* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-5
+- License: GPLv2+
+
 * Sun Jun 24 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 20060301-4
 - Update triggers to work with older versions of RPM
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Jun 2007 17:46:10 -0000	1.8
+++ sources	13 Apr 2009 13:19:01 -0000	1.9
@@ -1 +1 @@
-ed95a89f57357a42b8e4eb95487bf9d0  bash-completion-20060301.tar.bz2
+cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz


--- bash-completion-20060301-debian.patch DELETED ---


--- bash-completion-20060301-scp-apos-217178.patch DELETED ---



From scop at fedoraproject.org  Mon Apr 13 13:19:34 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 13 Apr 2009 13:19:34 +0000 (UTC)
Subject: rpms/bash-completion/EL-5
	bash-completion-1.0-bash4quoting-490322.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 bash-completion-mock, 1.2,
	1.3 bash-completion-plague-client, 1.1,
	1.2 bash-completion-repomanage, 1.1, 1.2 bash-completion.spec,
	1.19, 1.20 sources, 1.10,
	1.11 bash-completion-20060301-debian.patch, 1.1,
	NONE bash-completion-20060301-scp-apos-217178.patch, 1.1, NONE
Message-ID: <20090413131934.1EB5870124@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11259/EL-5

Modified Files:
	.cvsignore bash-completion-mock bash-completion-plague-client 
	bash-completion-repomanage bash-completion.spec sources 
Added Files:
	bash-completion-1.0-bash4quoting-490322.patch 
Removed Files:
	bash-completion-20060301-debian.patch 
	bash-completion-20060301-scp-apos-217178.patch 
Log Message:
* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
- Apply upstream patch to fix quoting issues with bash 4.x (#490322).

* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
- 1.0.

* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
- Add dependency on coreutils for triggers (#490768).
- Update and improve mock completion.

* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
- git snapshot f4f0984, fixes #484578 (another issue), #486998.

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
- git snapshot 47d0c5b, fixes #484578.
- lzop and repomanage completions included upstream.

* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
- r1252 snapshot; all patches applied upstream.
- Do not install mercurial completion, an updated version is shipped with it.
- Improve lzop and repomanage completion.

* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
- 20080705; new upstream at http://bash-completion.alioth.debian.org/
- Perl, Debian, and scp patches applied upstream.
- Patch to improve man completion: more sections, better filename handling.
- Patch to speed up yum install/deplist completion (#478784).
- Patch to fix and speed up rpm installed packages completion.
- Update mock completion.

* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
- More Matroska associations (#463829, based on patch from Yanko Kaneti).

* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
- Patch/unpatch to fix gzip and bzip2 options completion.
- Patch to add --rsyncable to gzip options completion.
- Add and trigger-install support for lzop.
- Associate *.sqlite with sqlite3.

* Wed Jul 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-12
- Fix plague-client completion install (#456355, Ricky Zhou).
- Trigger-install support for sitecopy.

* Tue Apr 29 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-11
- Media player association improvements (#444467).

* Sat Feb 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-10
- Patch to fix filename completion with svn (#430059).
- Trigger-install support for dsniff.
- Drop disttag.

* Mon Dec 31 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-8
- Associate VDR recording files with media players.
- Update mock completion.

* Fri Nov 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-7
- Add JPEG2000 extensions for display(1) (#304771).
- Update mock completion.

* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-6
- Patch to improve perl completion (#299571, Jim Radford,
  http://use.perl.org/~Alias/journal/33508).

* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-5
- License: GPLv2+


bash-completion-1.0-bash4quoting-490322.patch:

--- NEW FILE bash-completion-1.0-bash4quoting-490322.patch ---
From: Mike Kelly <pioto at pioto.org>
Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400)
Subject: Fix _filedir on bash 4.
X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c

Fix _filedir on bash 4.

We don't need to double-quote things for compgen w/ bash 4. Just putting
each file in double quotes is sufficient.

See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
---

diff --git a/bash_completion b/bash_completion
index 0246cd8..4d21cf8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -209,6 +209,12 @@ quote()
 # results in the original argument
 quote_readline()
 {
+	if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
+		# This function isn't really necessary on bash 4
+		# See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+		echo "${1}"
+		return
+	fi
 	local t="${1//\\/\\\\}"
 	echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Mar 2006 21:12:24 -0000	1.10
+++ .cvsignore	13 Apr 2009 13:19:02 -0000	1.11
@@ -1 +1 @@
-bash-completion-20060301.tar.bz2
+bash-completion-1.0.tar.gz


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/bash-completion-mock,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion-mock	30 Aug 2006 21:27:32 -0000	1.2
+++ bash-completion-mock	13 Apr 2009 13:19:02 -0000	1.3
@@ -1,44 +1,79 @@
-# bash completion for mock                                           -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for mock
 
 _mock()
 {
-    local cur prev commands cfgdir
+	local cur prev plugins cfgdir
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    commands='rebuild chroot init clean shell'
-    cfgdir=/etc/mock
-
-    count=0
-    for i in ${COMP_WORDS[@]} ; do
-        [ $count -eq $COMP_CWORD ] && break
-        [ "$i" == --configdir ] && cfgdir="${COMP_WORDS[((count+1))]}"
-        count=$((++count))
-    done
-
-    case $prev in
-        --@(config|result|state)dir)
-            _filedir -d
-            return 0
-            ;;
-        -r)
-            COMPREPLY=( $( command ls $cfgdir | \
-                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
-            return 0
-            ;;
-        -@(-arch|-uniqueext|-help|h))
-            return 0
-            ;;
-    esac
-
-    # TODO: process $commands
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
-            --debug --resultdir --statedir --uniqueext --configdir --quiet \
-            --autocache --rebuildcache' -- $cur ) )
-    else
-        _filedir '?(no)src.rpm'
-    fi
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+	plugins='tmpfs root_cache yum_cache bind_mount ccache'
+	cfgdir=/etc/mock
+
+	count=0
+	for i in "${COMP_WORDS[@]}" ; do
+		[ $count -eq $COMP_CWORD ] && break
+		if [[ "$i" == --configdir ]] ; then
+			cfgdir="${COMP_WORDS[((count+1))]}"
+		elif [[ "$i" == --configdir=* ]] ; then
+			cfgdir=${i/*=/}
+		fi
+		count=$((++count))
+	done
+
+	# --name=value style option
+	if [[ "$cur" == --?*=* ]] ; then
+		prev="${cur/=*}"
+		cur="${cur#$prev=}"
+	fi
+
+	case $prev in
+		-@(h|-help|-copy@(in|out)|-arch|D|-define|-with?(out)|-uniqueext|-rpmbuild_timeout|-sources|-cwd))
+			return 0
+			;;
+		-@(r|-root))
+			COMPREPLY=( $( command ls $cfgdir | \
+				sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
+			return 0
+			;;
+		--@(config|result)dir)
+			_filedir -d
+			return 0
+			;;
+		--spec)
+			_filedir spec
+			return 0
+			;;
+		--target)
+			# Yep, compatible archs, not compatible build archs
+			# (e.g. ix86 chroot builds in x86_64 mock host)
+			# This would actually depend on what the target root
+			# can be used to build for...
+			COMPREPLY=( $( compgen -W "$( command rpm --showrc | sed -ne 's/^\s*compatible\s\+archs\s*:\s*\(.*\)/\1/i p' )" -- $cur ) )
+			return 0
+			;;
+		--@(en|dis)able-plugin)
+			COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '--version -h --help --rebuild \
+			--buildsrpm --shell --chroot --clean --init \
+			--installdeps --install --update --orphanskill \
+			--copyin --copyout -r --root --offline --no-clean \
+			--cleanup-after --no-cleanup-after --arch --target \
+			-D --define --with --without --resultdir --uniqueext \
+			--configdir --rpmbuild_timeout --unpriv --cwd --spec \
+			--sources -v --verbose -q --quiet --trace \
+			--enable-plugin --disable-plugin --print-root-path' \
+			-- $cur ) )
+	else
+		_filedir '?(no)src.rpm'
+	fi
 }
 complete -F _mock $filenames mock


Index: bash-completion-plague-client
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/bash-completion-plague-client,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-plague-client	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-plague-client	13 Apr 2009 13:19:03 -0000	1.2
@@ -1,16 +1,20 @@
-# bash completion for plague-client                                  -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+
+# bash completion for plague-client
 
 _plague_client()
 {
-    local cur
+	local cur
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+	COMPREPLY=()
+	cur=`_get_cword`
 
-    [ $COMP_CWORD = 1 ] && \
-    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
-        list_builders pause requeue unpause update_builders' -- $cur ) )
+	[ $COMP_CWORD = 1 ] && \
+		COMPREPLY=( $( compgen -W 'build detail finish help is_paused \
+				kill list list_builders pause requeue unpause \
+				update_builders' -- $cur ) )
 
-    return 0
+	return 0
 }
 complete -F _plague_client plague-client


Index: bash-completion-repomanage
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/bash-completion-repomanage,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-repomanage	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-repomanage	13 Apr 2009 13:19:03 -0000	1.2
@@ -1,24 +1,24 @@
-# bash completion for repomanage                                     -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for repomanage
 
+have repomanage &&
 _repomanage()
 {
-    local cur prev
+	local cur prev
 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    case $prev in
-        -@(h|-help|k|-keep))
-            return 0
-            ;;
-    esac
+	[[ "$prev" == -@(h|-help|k|-keep) ]] && return 0
 
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
-            -c --nocheck -h --help' -- $cur ) )
-    else
-        _filedir -d
-    fi
-}
-complete -F _repomanage repomanage
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \
+				--keep -c --nocheck -h --help' -- $cur ) )
+	else
+		_filedir -d
+	fi
+} &&
+complete -F _repomanage $filenames repomanage


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/bash-completion.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bash-completion.spec	24 Jun 2007 17:30:15 -0000	1.19
+++ bash-completion.spec	13 Apr 2009 13:19:03 -0000	1.20
@@ -1,21 +1,24 @@
 Name:           bash-completion
-Version:        20060301
-Release:        4%{?dist}
+Version:        1.0
+Release:        2%{?dist}
+Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
-License:        GPL
-URL:            http://www.caliban.org/bash/
-Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
-Source2:        %{name}-mock
+License:        GPLv2+
+URL:            http://bash-completion.alioth.debian.org/
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
+Source1:        %{name}-mock
+Source2:        %{name}-plague-client
 Source3:        %{name}-repomanage
-Source4:        %{name}-plague-client
-Patch0:         %{name}-20060301-scp-apos-217178.patch
-Patch1:         %{name}-20060301-debian.patch
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
+Patch0:         %{name}-1.0-bash4quoting-490322.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       bash >= 2.05-12
+# For symlinking in triggers, #490768
+Requires:       coreutils
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -23,12 +26,10 @@
 
 
 %prep
-%setup -q -n bash_completion
-%patch0
-%patch1
-f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-install -pm 644 %{SOURCE2} contrib/mock
-install -pm 644 %{SOURCE3} contrib/plague-client
+%setup -q
+%patch0 -p1
+install -pm 644 %{SOURCE1} contrib/mock
+install -pm 644 %{SOURCE2} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
 
 
@@ -59,13 +60,18 @@
 %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
 
 # Not handled (yet?):
-# bitkeeper, dsniff, harbour, larch, lisp, p4, povray, sitecopy
+# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
 
 %triggerin -- bittorrent
 %do_triggerin bittorrent
 %triggerun -- bittorrent
 %do_triggerun bittorrent
 
+%triggerin -- bridge-utils
+%do_triggerin brctl
+%triggerun -- bridge-utils
+%do_triggerun brctl
+
 %triggerin -- cksfv
 %do_triggerin cksfv
 %triggerun -- cksfv
@@ -76,6 +82,16 @@
 %triggerun -- clisp
 %do_triggerun clisp
 
+%triggerin -- cowsay
+%do_triggerin cowsay
+%triggerun -- cowsay
+%do_triggerun cowsay
+
+%triggerin -- dsniff
+%do_triggerin dsniff
+%triggerun -- dsniff
+%do_triggerun dsniff
+
 %triggerin -- freeciv
 %do_triggerin freeciv
 %triggerun -- freeciv
@@ -96,11 +112,26 @@
 %triggerun -- gkrellm
 %do_triggerun gkrellm
 
+%triggerin -- gnupg2
+%do_triggerin gpg2
+%triggerun -- gnupg2
+%do_triggerun gpg2
+
 %triggerin -- lilypond
 %do_triggerin lilypond
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzma
+%do_triggerin lzma
+%triggerun -- lzma
+%do_triggerun lzma
+
+%triggerin -- lzop
+%do_triggerin lzop
+%triggerun -- lzop
+%do_triggerun lzop
+
 %triggerin -- mailman
 %do_triggerin mailman
 %triggerun -- mailman
@@ -111,21 +142,41 @@
 %triggerun -- mcrypt
 %do_triggerun mcrypt
 
-%triggerin -- mercurial
-%do_triggerin hg
-%triggerun -- mercurial
-%do_triggerun hg
+%triggerin -- minicom
+%do_triggerin minicom
+%triggerun -- minicom
+%do_triggerun minicom
 
 %triggerin -- mock
 %do_triggerin mock
 %triggerun -- mock
 %do_triggerun mock
 
+%triggerin -- monodevelop
+%do_triggerin monodevelop
+%triggerun -- monodevelop
+%do_triggerun monodevelop
+
 %triggerin -- mtx
 %do_triggerin mtx
 %triggerun -- mtx
 %do_triggerun mtx
 
+%triggerin -- net-tools
+%do_triggerin net-tools
+%triggerun -- net-tools
+%do_triggerun net-tools
+
+%triggerin -- openssh-clients
+%do_triggerin ssh
+%triggerun -- openssh-clients
+%do_triggerun ssh
+
+%triggerin -- perl-CPANPLUS
+%do_triggerin cpan2dist
+%triggerun -- perl-CPANPLUS
+%do_triggerun cpan2dist
+
 %triggerin -- perl-SVK
 %do_triggerin svk
 %triggerun -- perl-SVK
@@ -136,6 +187,26 @@
 %triggerun -- plague-client
 %do_triggerun plague-client
 
+%triggerin -- qemu
+%do_triggerin qemu
+%triggerun -- qemu
+%do_triggerun qemu
+
+%triggerin -- quota
+%do_triggerin quota-tools
+%triggerun -- quota
+%do_triggerun quota-tools
+
+%triggerin -- qt
+%do_triggerin qdbus
+%triggerun -- qt
+%do_triggerun qdbus
+
+%triggerin -- rdesktop
+%do_triggerin rdesktop
+%triggerun -- rdesktop
+%do_triggerun rdesktop
+
 %triggerin -- ruby-ri
 %do_triggerin ri
 %triggerun -- ruby-ri
@@ -146,11 +217,21 @@
 %triggerun -- sbcl
 %do_triggerun sbcl
 
+%triggerin -- sitecopy
+%do_triggerin sitecopy
+%triggerun -- sitecopy
+%do_triggerun sitecopy
+
 %triggerin -- snownews
 %do_triggerin snownews
 %triggerun -- snownews
 %do_triggerun snownews
 
+%triggerin -- subversion
+%do_triggerin _subversion
+%triggerun -- subversion
+%do_triggerun _subversion
+
 %triggerin -- unace
 %do_triggerin unace
 %triggerun -- unace
@@ -171,10 +252,15 @@
 %triggerun -- yum-utils
 %do_triggerun repomanage
 
+%triggerin -- vnc
+%do_triggerin vncviewer
+%triggerun -- vnc
+%do_triggerun vncviewer
+
 
 %files -f %{name}-ghosts.list
 %defattr(-,root,root,-)
-%doc BUGS Changelog COPYING README
+%doc AUTHORS CHANGES COPYING README TODO
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
@@ -182,6 +268,77 @@
 
 
 %changelog
+* Tue Apr  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-2
+- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
+
+* Mon Apr  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1
+- 1.0.
+
+* Mon Mar 23 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
+- Add dependency on coreutils for triggers (#490768).
+- Update and improve mock completion.
+
+* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
+- git snapshot f4f0984, fixes #484578 (another issue), #486998.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
+- git snapshot 47d0c5b, fixes #484578.
+- lzop and repomanage completions included upstream.
+
+* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+- r1252 snapshot; all patches applied upstream.
+- Do not install mercurial completion, an updated version is shipped with it.
+- Improve lzop and repomanage completion.
+
+* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
+- 20080705; new upstream at http://bash-completion.alioth.debian.org/
+- Perl, Debian, and scp patches applied upstream.
+- Patch to improve man completion: more sections, better filename handling.
+- Patch to speed up yum install/deplist completion (#478784).
+- Patch to fix and speed up rpm installed packages completion.
+- Update mock completion.
+
+* Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- More Matroska associations (#463829, based on patch from Yanko Kaneti).
+
+* Thu Sep 11 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-13
+- Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
+  for getent and rpm --eval, better rpm backup file avoidance, lzma support.
+- Patch/unpatch to fix gzip and bzip2 options completion.
+- Patch to add --rsyncable to gzip options completion.
+- Add and trigger-install support for lzop.
+- Associate *.sqlite with sqlite3.
+
+* Wed Jul 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-12
+- Fix plague-client completion install (#456355, Ricky Zhou).
+- Trigger-install support for sitecopy.
+
+* Tue Apr 29 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-11
+- Media player association improvements (#444467).
+
+* Sat Feb 23 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-10
+- Patch to fix filename completion with svn (#430059).
+- Trigger-install support for dsniff.
+- Drop disttag.
+
+* Mon Dec 31 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-8
+- Associate VDR recording files with media players.
+- Update mock completion.
+
+* Fri Nov 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-7
+- Add JPEG2000 extensions for display(1) (#304771).
+- Update mock completion.
+
+* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-6
+- Patch to improve perl completion (#299571, Jim Radford,
+  http://use.perl.org/~Alias/journal/33508).
+
+* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 20060301-5
+- License: GPLv2+
+
 * Sun Jun 24 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 20060301-4
 - Update triggers to work with older versions of RPM
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Mar 2006 21:12:24 -0000	1.10
+++ sources	13 Apr 2009 13:19:03 -0000	1.11
@@ -1 +1 @@
-ed95a89f57357a42b8e4eb95487bf9d0  bash-completion-20060301.tar.bz2
+cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz


--- bash-completion-20060301-debian.patch DELETED ---


--- bash-completion-20060301-scp-apos-217178.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr 13 13:48:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 13:48:14 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested commit
Message-ID: <20090413134658.1CE3410F85A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on system-config-lvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Apr 13 13:46:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 13:46:59 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested approveacls
Message-ID: <20090413134659.23B8710F87E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on system-config-lvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Apr 13 13:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 13:47:05 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested commit
Message-ID: <20090413134703.C8EE810F882@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on system-config-lvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Apr 13 13:48:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 13:48:22 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested approveacls
Message-ID: <20090413134706.68EA610F886@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on system-config-lvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Apr 13 13:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 13:47:08 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested commit
Message-ID: <20090413134708.AE7B110F88A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on system-config-lvm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Apr 13 13:47:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 13:47:10 +0000
Subject: [pkgdb] system-config-lvm: itamarjp has requested approveacls
Message-ID: <20090413134709.2203010F88E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on system-config-lvm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From lkundrak at fedoraproject.org  Mon Apr 13 13:54:32 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 13:54:32 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme/devel
	clearlooks-compact-gnome-theme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090413135432.C773670124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25249

Modified Files:
	.cvsignore sources 
Added Files:
	clearlooks-compact-gnome-theme.spec 
Log Message:
* Sat Apr 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-1
- New upstream version



--- NEW FILE clearlooks-compact-gnome-theme.spec ---
Name:           clearlooks-compact-gnome-theme
Version:        1.5
Release:        1%{?dist}
Summary:        GNOME Desktop theme optimized for small displays

Group:          User Interface/Desktops
License:        LGPLv2+
URL:            http://martin.ankerl.com/2007/11/04/clearlooks-compact-gnome-theme/
Source0:        http://martin.ankerl.com/files/ClearlooksCompact-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

# Just in case Clearlooks ever gets moved to another package
Requires:       libclearlooks.so
# Just for convenience
Provides:       clearlooks-compact = %{version}-%{release}

%description
Compact version of Clearlooks theme, especially great on small screens like
the Eee PC, or for intense applications like Eclipse.


%prep
%setup -q -c
# Backup file, apparently forgotten there by upstream
rm Clearlooks\ Compact/gtk-2.0/gtkrc~


%build


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/themes
cp -ap Clearlooks\ Compact $RPM_BUILD_ROOT%{_datadir}/themes/
rm -f $RPM_BUILD_ROOT%{_datadir}/themes/Clearlooks\ Compact/COPYING


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_datadir}/themes/*
%doc Clearlooks\ Compact/COPYING


%changelog
* Sat Apr 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-1
- New upstream version

* Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.4-1
- Versioning change (no epoch bump since noone uses this now anyways :)
- Upstream included our theme.index, drop it
- Upstream clarified the license

* Thu Apr 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 20080411-1
- Initial package creation


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:24:41 -0000	1.1
+++ .cvsignore	13 Apr 2009 13:53:59 -0000	1.2
@@ -0,0 +1 @@
+ClearlooksCompact-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:24:41 -0000	1.1
+++ sources	13 Apr 2009 13:54:00 -0000	1.2
@@ -0,0 +1 @@
+9d6f111db273f065cfd2e3ee5c390eac  ClearlooksCompact-1.5.tar.bz2



From limb at fedoraproject.org  Mon Apr 13 13:56:21 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 13 Apr 2009 13:56:21 +0000 (UTC)
Subject: rpms/ucarp/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ucarp.init, 
	1.2, 1.3 ucarp.spec, 1.17, 1.18
Message-ID: <20090413135621.7372070137@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ucarp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25358

Modified Files:
	.cvsignore sources ucarp.init ucarp.spec 
Log Message:
1.5, initscript fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Feb 2008 19:51:43 -0000	1.5
+++ .cvsignore	13 Apr 2009 13:56:19 -0000	1.6
@@ -1 +1 @@
-ucarp-1.4.tar.bz2
+ucarp-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Feb 2008 19:51:44 -0000	1.5
+++ sources	13 Apr 2009 13:56:19 -0000	1.6
@@ -1 +1 @@
-9e1765de2eea1bb59c9ad9c8596f4f89  ucarp-1.4.tar.bz2
+5b50ca5553bc520f4e639964c9ad5056  ucarp-1.5.tar.bz2


Index: ucarp.init
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/devel/ucarp.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ucarp.init	3 Feb 2008 19:51:44 -0000	1.2
+++ ucarp.init	13 Apr 2009 13:56:19 -0000	1.3
@@ -4,6 +4,16 @@
 # chkconfig: - 91 09
 # description: Starts and stops the common address redundancy protocol daemon
 
+### BEGIN INIT INFO
+# Provides: lsb-ucarp
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop ucarp
+# Description: Common Address Redundancy Protocol (CARP) for Unix
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 


Index: ucarp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/devel/ucarp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ucarp.spec	25 Feb 2009 22:26:34 -0000	1.17
+++ ucarp.spec	13 Apr 2009 13:56:19 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
-Version: 1.4
-Release: 2%{?dist}
+Version: 1.5
+Release: 1%{?dist}
 # See the COPYING file which details everything
 License: MIT and BSD
 Group: System Environment/Daemons
@@ -97,8 +97,12 @@
 %{_libexecdir}/ucarp/
 %{_sbindir}/ucarp
 
-
 %changelog
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 1.5-1
+- Update to 1.5 BZ 458767.
+- Added LSB header to init script, BZ 247082.
+- New upstream should address BZ 427495, 449266, 455394.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Mon Apr 13 13:56:23 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 13 Apr 2009 13:56:23 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-buildswtnatives.patch, 1.2,
	1.3 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.6,
	1.7 eclipse.spec, 1.632, 1.633 eclipse-ecj-rpmdebuginfo.patch,
	1.3, NONE eclipse-pdeapicasting-ui.patch, 1.1, NONE ecj.sh.in,
	1.1, NONE eclipse-pdeapicasting.patch, 1.1,
	NONE eclipse-ecj-defaultto1.5.patch, 1.1, NONE
Message-ID: <20090413135623.77E5870137@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26145/devel

Modified Files:
	eclipse-buildswtnatives.patch 
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch eclipse.spec 
Removed Files:
	eclipse-ecj-rpmdebuginfo.patch eclipse-pdeapicasting-ui.patch 
	ecj.sh.in eclipse-pdeapicasting.patch 
	eclipse-ecj-defaultto1.5.patch 
Log Message:
- Remove patches for the ecj package and others already applied upstream.
- Rediff some ppc64 patches.

eclipse-buildswtnatives.patch:

Index: eclipse-buildswtnatives.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-buildswtnatives.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-buildswtnatives.patch	2 Apr 2009 08:12:56 -0000	1.2
+++ eclipse-buildswtnatives.patch	13 Apr 2009 13:56:20 -0000	1.3
@@ -53,18 +53,6 @@
  		<available property="@dot" file="${build.result.folder}/@dot" />
 --- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.orig	2009-03-24 18:54:29.000000000 +0100
 +++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml	2009-03-25 10:08:51.000000000 +0100
-@@ -276,6 +276,11 @@
- 	</target>
- 
- 	<target name="build.cfiles" depends="build.jars">
-+		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
-+		<!--compile swtools.jar in org.eclipse.swt.tools-->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
-+
- 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
- 		<!-- assumes the swt.jar has already been built  -->
- 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar">
 @@ -330,6 +335,7 @@
  			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library" />
  			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library" />

eclipse-add-ppc64-sparc64-s390-s390x-2.patch:

Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch	26 Feb 2009 16:25:24 -0000	1.6
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch	13 Apr 2009 13:56:20 -0000	1.7
@@ -53,16 +53,18 @@
           os="solaris"
           ws="gtk"
 diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.arches	2008-10-03 09:05:08.000000000 -0400
-+++ ./features/org.eclipse.rcp.source/feature.xml	2008-10-03 09:07:51.000000000 -0400
-@@ -45,6 +45,10 @@
- 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.4.1.v3452b" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.4.1.v3452b" os="linux" arch="x86" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.4.0.HEAD" os="linux" arch="ia64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.4.1.v3452b" os="linux" arch="ppc64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.4.1.v3452b" os="linux" arch="sparc" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.4.1.v3452b" os="linux" arch="sparc64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.4.1.v3452b" os="linux" arch="alpha" ws="gtk"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.4.1.v3452b" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.4.1.v3452b" os="qnx" arch="x86" ws="photon"  unpack="false"/>
- 	<plugin id="org.eclipse.rcp.source" version="3.4.1.R342_v20090205"     unpack="false"/>
+--- ./features/org.eclipse.rcp.source/feature.xml.orig	2009-04-13 15:04:47.000000000 +0200
++++ ./features/org.eclipse.rcp.source/feature.xml	2009-04-13 15:07:51.000000000 +0200
+@@ -49,7 +49,11 @@
+ 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3539" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3539" os="linux" arch="x86" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.5.0.HEAD" os="linux" arch="ia64" ws="gtk"  unpack="false"/>
+-	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.5.0.v3539" os="linux" arch="ppc64" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.5.0.v3539" os="linux" arch="sparc" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.5.0.v3539" os="linux" arch="sparc64" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.5.0.v3539" os="linux" arch="alpha" ws="gtk"  unpack="false"/>
++ 	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3539" os="qnx" arch="x86" ws="photon"  unpack="false"/>
+ 	<plugin id="org.eclipse.rcp.source" version="3.4.0.v20080507"     unpack="false"/>
+ 	<plugin id="org.eclipse.core.contenttype.source" version="3.4.0.v20090302"     unpack="false"/>


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- eclipse.spec	13 Apr 2009 09:55:34 -0000	1.632
+++ eclipse.spec	13 Apr 2009 13:56:20 -0000	1.633
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.12%{?dist}
+Release:        0.2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -409,8 +409,7 @@
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
-# TODO check this patch
-#%patch28
+%patch28
 # TODO and this one
 #%patch30
 %patch31 -p1
@@ -1593,6 +1592,10 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2
+- Remove patches for the ecj package and others already applied upstream.
+- Rediff some ppc64 patches.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.12
 - o.e.update.core.linux is x86 only.
 


--- eclipse-ecj-rpmdebuginfo.patch DELETED ---


--- eclipse-pdeapicasting-ui.patch DELETED ---


--- ecj.sh.in DELETED ---


--- eclipse-pdeapicasting.patch DELETED ---


--- eclipse-ecj-defaultto1.5.patch DELETED ---



From maxamillion at fedoraproject.org  Mon Apr 13 13:59:57 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 13 Apr 2009 13:59:57 +0000 (UTC)
Subject: rpms/python-twyt/devel .cvsignore, 1.6, 1.7 import.log, 1.2,
	1.3 python-twyt.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090413135957.6BFFD70124@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-twyt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28200/devel

Modified Files:
	.cvsignore import.log python-twyt.spec sources 
Log Message:
New upstream release of twyt, trying to get it built in time for the F11
development freeze.





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Feb 2009 21:10:25 -0000	1.6
+++ .cvsignore	13 Apr 2009 13:59:25 -0000	1.7
@@ -1 +1 @@
-twyt-0.9.1.tar.gz
+twyt-0.9.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Feb 2009 21:10:25 -0000	1.2
+++ import.log	13 Apr 2009 13:59:25 -0000	1.3
@@ -1,2 +1,3 @@
 python-twyt-0_9_0-1_fc8:HEAD:python-twyt-0.9.0-1.fc8.src.rpm:1231753051
 python-twyt-0_9_1-1_fc10:HEAD:python-twyt-0.9.1-1.fc10.src.rpm:1235768993
+python-twyt-0_9_2-1:HEAD:python-twyt-0.9.2-1.src.rpm:1239631084


Index: python-twyt.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/devel/python-twyt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-twyt.spec	27 Feb 2009 21:10:25 -0000	1.7
+++ python-twyt.spec	13 Apr 2009 13:59:25 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: An interface to Twitter API functions for Python
 Name: python-twyt
-Version: 0.9.1
+Version: 0.9.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD
@@ -47,6 +47,9 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-1
+- New upstream release
+
 * Fri Feb 27 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Feb 2009 21:10:25 -0000	1.6
+++ sources	13 Apr 2009 13:59:26 -0000	1.7
@@ -1 +1 @@
-8232a3e998e281e8b69d0a90af1a0cf9  twyt-0.9.1.tar.gz
+609a094e85a3d36b89d1a3d173ebfd9d  twyt-0.9.2.tar.gz



From michich at fedoraproject.org  Mon Apr 13 14:01:07 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 13 Apr 2009 14:01:07 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim-0.4-fix-rosterStyle-preferences.diff, NONE,
	1.1 .cvsignore, 1.14, 1.15 jabbim.spec, 1.30, 1.31 sources, 1.23, 1.24
Message-ID: <20090413140107.4B5AD70124@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29204

Modified Files:
	.cvsignore jabbim.spec sources 
Added Files:
	jabbim-0.4-fix-rosterStyle-preferences.diff 
Log Message:
* Mon Apr 13 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.5.svn20090408
- Update to SVN rev. 4103:
  - bugfixes for filetransfer, uniemoticons, logging
  - faster loading of avatars after login
- Install only the addons likely to be included in 0.5 final release.
- Hardcode the SVN revision into self.version.
- Prefer %global over %define.


jabbim-0.4-fix-rosterStyle-preferences.diff:

--- NEW FILE jabbim-0.4-fix-rosterStyle-preferences.diff ---
Patch status note: Upstream is rewriting the appearance preferences dialog
completely, this patch will be obsolete.  -- Michal

commit 2f1294279682ad1d37231b57a764c8e93c18e957
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Apr 13 12:09:41 2009 +0200

    fix program appearance prefs dialog when no theme is set
    
    rosterStyle can be None in the config in which case rosterStyleChanged
    would traceback.

diff --git a/widgets/preferences.py b/widgets/preferences.py
index 5f44c53..13fd8f6 100644
--- a/widgets/preferences.py
+++ b/widgets/preferences.py
@@ -648,7 +648,8 @@ class preferencesWindow(QtGui.QDialog):
 		for variant in variants:
 			if variant.endswith(".cfg"):
 				default=unicode(variant)
-				if variant==self.main.config["rosterStyle"].split("/")[1]:
+				configured = self.main.config["rosterStyle"].split("/")
+				if len(configured) > 1 and variant == configured[1]:
 					self.ui.rosterVariant.insertItem(0,variant[:-4],QtCore.QVariant(variant))
 					v=unicode(variant)
 				else:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	14 Mar 2009 15:02:17 -0000	1.14
+++ .cvsignore	13 Apr 2009 14:01:03 -0000	1.15
@@ -1 +1 @@
-jabbim-svn20090314.tar.bz2
+jabbim-svn20090408.tar.bz2


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jabbim.spec	14 Mar 2009 15:02:17 -0000	1.30
+++ jabbim.spec	13 Apr 2009 14:01:03 -0000	1.31
@@ -1,16 +1,19 @@
+%global	svnrev	4103
+%global	svndate	20090408
 Name:		jabbim
 Version:	0.5
-Release:	0.4.svn20090314%{?dist}
+Release:	0.5.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
-# svn export -r 4062 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn20090314
-# tar -cjf jabbim-svn20090314.tar.bz2 jabbim-svn20090314/
-Source0:	jabbim-svn20090314.tar.bz2
+# svn export -r %{svnrev} svn://dev.jabbim.cz/jabbim/trunk jabbim-svn%{svndate}
+# tar -cjf jabbim-svn%{svndate}.tar.bz2 jabbim-svn%{svndate}/
+Source0:	jabbim-svn%{svndate}.tar.bz2
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.4-fix-rosterStyle-preferences.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +30,7 @@
 Requires:	python-configobj
 Requires:	pyOpenSSL
 
-%define jabbimdata %{_datadir}/jabbim
+%global jabbimdata %{_datadir}/jabbim
 
 %description
 Jabbim is a user-friendly Jabber (XMPP) client. Its goal is to make the modern
@@ -37,13 +40,25 @@
 
 
 %prep
-%setup -q -n jabbim-svn20090314
+%setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
+%patch1 -p1
+# replace runtime detection of the SVN revision with hardcoded info
+sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
 # Make sure they are recreated from the *.ts files:
 make clean
+
+# The current manpage is not useful.
+rm -r doc/
+# Remove addons which are unlikely to be included in 0.5 final.
+rm -r plugins/{dcoper,devconsole,festival,gpg,ibuddy,network-manager,styler}
+rm -r sounds/{future,xylo}
+rm -r themes/{Grain,TmavoZeleny,rose}
+rm -r chatskins/grom_elegant_2
+
 make PREFIX=%{_prefix}
 
 %install
@@ -83,6 +98,14 @@
 
 
 %changelog
+* Mon Apr 13 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.5.svn20090408
+- Update to SVN rev. 4103:
+  - bugfixes for filetransfer, uniemoticons, logging
+  - faster loading of avatars after login
+- Install only the addons likely to be included in 0.5 final release.
+- Hardcode the SVN revision into self.version.
+- Prefer %%global over %%define.
+
 * Sat Mar 14 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.4.svn20090314
 - Update to current SVN snapshot.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	14 Mar 2009 15:02:18 -0000	1.23
+++ sources	13 Apr 2009 14:01:03 -0000	1.24
@@ -1 +1 @@
-676f2968046ace7d67544030d9cc63bc  jabbim-svn20090314.tar.bz2
+9405f481a8a06060fbc4cb909e54d584  jabbim-svn20090408.tar.bz2



From limb at fedoraproject.org  Mon Apr 13 14:04:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 13 Apr 2009 14:04:13 +0000 (UTC)
Subject: rpms/ucarp/F-10 sources, 1.5, 1.6 ucarp.init, 1.2, 1.3 ucarp.spec, 
	1.16, 1.17
Message-ID: <20090413140413.235A370124@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ucarp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30492

Modified Files:
	sources ucarp.init ucarp.spec 
Log Message:
1.5.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Feb 2008 19:51:44 -0000	1.5
+++ sources	13 Apr 2009 14:03:42 -0000	1.6
@@ -1 +1 @@
-9e1765de2eea1bb59c9ad9c8596f4f89  ucarp-1.4.tar.bz2
+5b50ca5553bc520f4e639964c9ad5056  ucarp-1.5.tar.bz2


Index: ucarp.init
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/F-10/ucarp.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ucarp.init	3 Feb 2008 19:51:44 -0000	1.2
+++ ucarp.init	13 Apr 2009 14:03:42 -0000	1.3
@@ -4,6 +4,16 @@
 # chkconfig: - 91 09
 # description: Starts and stops the common address redundancy protocol daemon
 
+### BEGIN INIT INFO
+# Provides: lsb-ucarp
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop ucarp
+# Description: Common Address Redundancy Protocol (CARP) for Unix
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 


Index: ucarp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/F-10/ucarp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ucarp.spec	3 Feb 2008 19:51:44 -0000	1.16
+++ ucarp.spec	13 Apr 2009 14:03:42 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
-Version: 1.4
+Version: 1.5
 Release: 1%{?dist}
 # See the COPYING file which details everything
 License: MIT and BSD
@@ -97,8 +97,15 @@
 %{_libexecdir}/ucarp/
 %{_sbindir}/ucarp
 
-
 %changelog
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 1.5-1
+- Update to 1.5 BZ 458767.
+- Added LSB header to init script, BZ 247082.
+- New upstream should address BZ 427495, 449266, 455394.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.4-1
 - Update to 1.4.
 - Rip out all of the "list" stuff and 255.255.255.255 address hack (#427495).



From robert at fedoraproject.org  Mon Apr 13 14:05:27 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 13 Apr 2009 14:05:27 +0000 (UTC)
Subject: rpms/xqilla10/devel xqilla10-cstdio.patch, NONE, 1.1 xqilla10.spec, 
	1.8, 1.9
Message-ID: <20090413140527.9E25970124@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/xqilla10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31002

Modified Files:
	xqilla10.spec 
Added Files:
	xqilla10-cstdio.patch 
Log Message:
Added a few #include lines needed to build properly with g++ 4.4


xqilla10-cstdio.patch:

--- NEW FILE xqilla10-cstdio.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for xqilla >= 1.0.2, that
adds a few #include lines needed to build properly with g++ version 4.4.

--- src/items/Numeric.cpp		2007-12-13 00:55:40.000000000 +0100
+++ src/items/Numeric.cpp.cstdio	2009-04-13 15:32:12.000000000 +0200
@@ -11,6 +11,7 @@
  * $Id: Numeric.cpp,v 1.15 2006/11/01 16:37:20 jpcs Exp $
  */
 
+#include <cstdio>
 #include <assert.h>
 
 #include "../config/xqilla_config.h"
--- src/lexer/XQLexer.hpp		2007-12-13 00:55:41.000000000 +0100
+++ src/lexer/XQLexer.hpp.cstdio	2009-04-13 15:50:14.000000000 +0200
@@ -22,6 +22,7 @@
 #include "FlexLexer.h"
 #endif
 
+#include <cstdio>
 #include <xercesc/util/BitSet.hpp>
 #include <xercesc/util/RefHashTableOf.hpp>
 #include <xqilla/simple-api/XQQuery.hpp>


Index: xqilla10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla10/devel/xqilla10.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xqilla10.spec	26 Feb 2009 11:58:20 -0000	1.8
+++ xqilla10.spec	13 Apr 2009 14:04:57 -0000	1.9
@@ -1,14 +1,14 @@
 %define _unpackaged_files_terminate_build  1
 %define _missing_doc_files_terminate_build 1
 
-%define xqilla_release 5
+%define xqilla_release 6
 %define xercesc_dir xerces-c-src_2_8_0
 
 Name: xqilla10
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
 Version: 1.0.2
-Release: %{xqilla_release}%{?dist}.1
+Release: %{xqilla_release}%{?dist}
 License: BSD
 URL: http://xqilla.sourceforge.net/HomePage
 Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
@@ -23,6 +23,7 @@
 Patch1:	xqilla10-10-namespace.patch
 Patch2: xqilla10-cstring.patch
 Patch3: xqilla10-xercesc-attributes.patch
+Patch4: xqilla10-cstdio.patch
 
 %define xercesc_build_root %{_builddir}/%{xercesc_dir}
 
@@ -49,6 +50,7 @@
 %patch1
 %patch2
 %patch3
+%patch4
 
 %build
 rm -f aclocal.m4
@@ -94,6 +96,9 @@
 %{_includedir}/xqilla10
 
 %changelog
+* Mon Apr 13 2009 Robert Scheck <robert at fedoraproject.org> - 1.0.2-6
+- Added a few #include lines needed to build properly with g++ 4.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pmachata at fedoraproject.org  Mon Apr 13 14:09:30 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 13 Apr 2009 14:09:30 +0000 (UTC)
Subject: rpms/tzdata/devel .cvsignore, 1.53, 1.54 sources, 1.57,
	1.58 tzdata-2009e-cairo.patch, 1.1, 1.2 tzdata.spec, 1.78,
	1.79 tzdata-2009e-karachi.patch, 1.1, NONE
Message-ID: <20090413140930.C3A3D70124@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32152

Modified Files:
	.cvsignore sources tzdata-2009e-cairo.patch tzdata.spec 
Removed Files:
	tzdata-2009e-karachi.patch 
Log Message:
Upstream now has the Pakistan change.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	13 Apr 2009 12:43:52 -0000	1.53
+++ .cvsignore	13 Apr 2009 14:08:59 -0000	1.54
@@ -22,3 +22,4 @@
 tzcode2009d.tar.gz
 tzdata2009e.tar.gz
 tzcode2009e.tar.gz
+tzdata2009f.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	13 Apr 2009 12:43:52 -0000	1.57
+++ sources	13 Apr 2009 14:08:59 -0000	1.58
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-206709f3373f8baebaec07b3d8b7ac40  tzdata2009e.tar.gz
 329c3ff06919193c55a293a73a8c618f  tzcode2009e.tar.gz
+ff432bff80111f4bb998be5d4fd6260d  tzdata2009f.tar.gz

tzdata-2009e-cairo.patch:

Index: tzdata-2009e-cairo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata-2009e-cairo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tzdata-2009e-cairo.patch	13 Apr 2009 12:31:11 -0000	1.1
+++ tzdata-2009e-cairo.patch	13 Apr 2009 14:08:59 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up tzdata2009e/africa tzdata2009e-pm/africa
---- tzdata2009e/africa	2009-03-23 14:37:51.000000000 +0100
-+++ tzdata2009e-pm/africa	2009-04-06 16:06:49.000000000 +0200
+--- tzdata2009f/africa	2009-03-23 14:37:51.000000000 +0100
++++ tzdata2009f-pm/africa	2009-04-06 16:06:49.000000000 +0200
 @@ -236,7 +236,8 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
  # unless discontinued, next DST may end Thursday 28 August 2008.
  # From Paul Eggert (2007-08-17):


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- tzdata.spec	13 Apr 2009 12:43:52 -0000	1.78
+++ tzdata.spec	13 Apr 2009 14:08:59 -0000	1.79
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009e
+Version: 2009f
 %define tzdata_version %{version}
-%define tzcode_version %{version}
-Release: 3%{?dist}
+%define tzcode_version 2009e
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,6 @@
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 Patch1: tzdata-2009e-cairo.patch
-Patch2: tzdata-2009e-karachi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -50,7 +49,6 @@
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 %patch1 -p0
-%patch2 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -111,6 +109,11 @@
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009f-1
+- Upstream 2009f
+  - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
+- Drop Pakistan patch
+
 * Mon Apr 13 2009 Petr Machata <pmachata at redhat.com> - 2009e-3
 - Bump up for rebuild
 


--- tzdata-2009e-karachi.patch DELETED ---



From limb at fedoraproject.org  Mon Apr 13 14:17:43 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 13 Apr 2009 14:17:43 +0000 (UTC)
Subject: rpms/ucarp/F-9 sources, 1.5, 1.6 ucarp.init, 1.2, 1.3 ucarp.spec,
	1.16, 1.17
Message-ID: <20090413141743.293AF70124@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ucarp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2320

Modified Files:
	sources ucarp.init ucarp.spec 
Log Message:
1.5.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Feb 2008 19:51:44 -0000	1.5
+++ sources	13 Apr 2009 14:17:12 -0000	1.6
@@ -1 +1 @@
-9e1765de2eea1bb59c9ad9c8596f4f89  ucarp-1.4.tar.bz2
+5b50ca5553bc520f4e639964c9ad5056  ucarp-1.5.tar.bz2


Index: ucarp.init
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/F-9/ucarp.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ucarp.init	3 Feb 2008 19:51:44 -0000	1.2
+++ ucarp.init	13 Apr 2009 14:17:12 -0000	1.3
@@ -4,6 +4,16 @@
 # chkconfig: - 91 09
 # description: Starts and stops the common address redundancy protocol daemon
 
+### BEGIN INIT INFO
+# Provides: lsb-ucarp
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop ucarp
+# Description: Common Address Redundancy Protocol (CARP) for Unix
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 


Index: ucarp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/F-9/ucarp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ucarp.spec	3 Feb 2008 19:51:44 -0000	1.16
+++ ucarp.spec	13 Apr 2009 14:17:12 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
-Version: 1.4
+Version: 1.5
 Release: 1%{?dist}
 # See the COPYING file which details everything
 License: MIT and BSD
@@ -97,8 +97,15 @@
 %{_libexecdir}/ucarp/
 %{_sbindir}/ucarp
 
-
 %changelog
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 1.5-1
+- Update to 1.5 BZ 458767.
+- Added LSB header to init script, BZ 247082.
+- New upstream should address BZ 427495, 449266, 455394.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.4-1
 - Update to 1.4.
 - Rip out all of the "list" stuff and 255.255.255.255 address hack (#427495).



From dwalsh at fedoraproject.org  Mon Apr 13 15:18:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 13 Apr 2009 15:18:42 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.17,
	1.18 setroubleshoot-plugins.spec, 1.21, 1.22 sources, 1.18, 1.19
Message-ID: <20090413151843.2B8E570124@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22148

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Mon Apr 13 2009  <dwalsh at redhat.com> - 2.0.16-1
- Change priority on restorecon plugin to happen before public_content



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	3 Apr 2009 20:30:56 -0000	1.17
+++ .cvsignore	13 Apr 2009 15:18:09 -0000	1.18
@@ -7,3 +7,4 @@
 setroubleshoot-plugins-2.0.12.tar.gz
 setroubleshoot-plugins-2.0.14.tar.gz
 setroubleshoot-plugins-2.0.15.tar.gz
+setroubleshoot-plugins-2.0.16.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- setroubleshoot-plugins.spec	3 Apr 2009 20:30:56 -0000	1.21
+++ setroubleshoot-plugins.spec	13 Apr 2009 15:18:10 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.0.15
+Version: 2.0.16
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Mon Apr 13 2009  <dwalsh at redhat.com> - 2.0.16-1
+- Change priority on restorecon plugin to happen before public_content
+
 * Fri Apr 3 2009  <dwalsh at redhat.com> - 2.0.15-1
 - Update po files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Apr 2009 20:30:57 -0000	1.18
+++ sources	13 Apr 2009 15:18:10 -0000	1.19
@@ -1 +1 @@
-3ef3c051867710035877e706266c8e0d  setroubleshoot-plugins-2.0.15.tar.gz
+ab02b6356a3431cc98d02d6d883ba07d  setroubleshoot-plugins-2.0.16.tar.gz



From jeckersb at fedoraproject.org  Mon Apr 13 15:20:04 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon, 13 Apr 2009 15:20:04 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.7, 1.8 python-netaddr.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090413152004.58CC170124@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22708

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
new upstream bugfix release 0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Apr 2009 02:13:14 -0000	1.7
+++ .cvsignore	13 Apr 2009 15:19:33 -0000	1.8
@@ -1 +1 @@
-netaddr-0.6.1.tar.gz
+netaddr-0.6.2.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-netaddr.spec	8 Apr 2009 02:13:14 -0000	1.9
+++ python-netaddr.spec	13 Apr 2009 15:19:33 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-netaddr
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 John Eckersberg <jeckersb at redhat.com> - 0.6.2-1
+- New upstream bugfix release
+
 * Tue Apr 7 2009 John Eckersberg <jeckersb at redhat.com> - 0.6.1-1
 - New upstream bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Apr 2009 02:13:14 -0000	1.7
+++ sources	13 Apr 2009 15:19:33 -0000	1.8
@@ -1 +1 @@
-029bbcd05dfb06056fa141cf3634b68f  netaddr-0.6.1.tar.gz
+87bd5c5c4753487f872f3ed4592aa24e  netaddr-0.6.2.tar.gz



From theinric at fedoraproject.org  Mon Apr 13 15:21:46 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Mon, 13 Apr 2009 15:21:46 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog-3.21.11-HUPisRestart.patch, NONE,
	1.1 .cvsignore, 1.30, 1.31 rsyslog.spec, 1.58, 1.59 sources,
	1.32, 1.33 rsyslog-3.21.10-HUPisRestart.patch, 1.1,
	NONE rsyslog-3.21.10-convVar.patch, 1.1, NONE
Message-ID: <20090413152146.59BA970124@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23259

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-3.21.11-HUPisRestart.patch 
Removed Files:
	rsyslog-3.21.10-HUPisRestart.patch 
	rsyslog-3.21.10-convVar.patch 
Log Message:
upgrade to new upstream version



rsyslog-3.21.11-HUPisRestart.patch:

--- NEW FILE rsyslog-3.21.11-HUPisRestart.patch ---
diff -u -p -r rsyslog-3.21.11.orig/ChangeLog rsyslog-3.21.11/ChangeLog
--- rsyslog-3.21.11.orig/ChangeLog	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/ChangeLog	2009-04-13 11:53:46.000000000 +0200
@@ -1,3 +1,6 @@
+- added configuration directive "HUPisRestart" which enables to configure
+  HUP to be either a full restart or "just" a leightweight way to
+  close open files.
 ---------------------------------------------------------------------------
 Version 3.21.11 [BETA] (rgerhards), 2009-04-03
 - build system improvements contributed by Michael Biebl - thx!
Only in rsyslog-3.21.11: ChangeLog.orig
diff -u -p -r rsyslog-3.21.11.orig/action.c rsyslog-3.21.11/action.c
--- rsyslog-3.21.11.orig/action.c	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/action.c	2009-04-13 11:53:46.000000000 +0200
@@ -498,6 +498,39 @@ finalize_it:
 }
 #pragma GCC diagnostic warning "-Wempty-body"
 
+
+/* call the HUP handler for a given action, if such a handler is defined. The
+ * action mutex is locked, because the HUP handler most probably needs to modify
+ * some internal state information.
+ * rgerhards, 2008-10-22
+ */
+#pragma GCC diagnostic ignored "-Wempty-body"
+rsRetVal
+actionCallHUPHdlr(action_t *pAction)
+{
+	DEFiRet;
+	int iCancelStateSave;
+
+	ASSERT(pAction != NULL);
+	dbgprintf("Action %p checks HUP hdlr: %p\n", pAction, pAction->pMod->doHUP);
+
+	if(pAction->pMod->doHUP == NULL) {
+		FINALIZE;	/* no HUP handler, so we are done ;) */
+	}
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave);
+	d_pthread_mutex_lock(&pAction->mutActExec);
+	pthread_cleanup_push(mutexCancelCleanup, &pAction->mutActExec);
+	pthread_setcancelstate(iCancelStateSave, NULL);
+	CHKiRet(pAction->pMod->doHUP(pAction->pModData));
+	pthread_cleanup_pop(1); /* unlock mutex */
+
+finalize_it:
+	RETiRet;
+}
+#pragma GCC diagnostic warning "-Wempty-body"
+
+
 /* set the action message queue mode
  * TODO: probably move this into queue object, merge with MainMsgQueue!
  * rgerhards, 2008-01-28
diff -u -p -r rsyslog-3.21.11.orig/action.h rsyslog-3.21.11/action.h
--- rsyslog-3.21.11.orig/action.h	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/action.h	2009-04-13 11:53:46.000000000 +0200
@@ -85,6 +85,7 @@ rsRetVal actionSetGlobalResumeInterval(i
 rsRetVal actionDoAction(action_t *pAction);
 rsRetVal actionCallAction(action_t *pAction, msg_t *pMsg);
 rsRetVal actionWriteToAction(action_t *pAction);
+rsRetVal actionCallHUPHdlr(action_t *pAction);
 rsRetVal actionClassInit(void);
 rsRetVal addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringRequest_t *pOMSR, int bSuspended);
 
diff -u -p -r rsyslog-3.21.11.orig/doc/rsyslog_conf.html rsyslog-3.21.11/doc/rsyslog_conf.html
--- rsyslog-3.21.11.orig/doc/rsyslog_conf.html	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/doc/rsyslog_conf.html	2009-04-13 11:53:46.000000000 +0200
@@ -175,6 +175,11 @@ default 60000 (1 minute)]</li>
 <li><a href="rsconf1_gssforwardservicename.html">$GssForwardServiceName</a></li>
 <li><a href="rsconf1_gsslistenservicename.html">$GssListenServiceName</a></li>
 <li><a href="rsconf1_gssmode.html">$GssMode</a></li>
+<li>$HUPisRestart [<b>on</b>/off] - if set to on, a HUP is a full daemon restart. This means any queued messages are discarded (depending
+on queue configuration, of course) all modules are unloaded and reloaded. This mode keeps compatible with sysklogd, but is
+not recommended for use with rsyslog. To do a full restart, simply stop and start the daemon. The default is "on" for
+compatibility reasons. If it is set to "off", a HUP will only close open files. This is a much quicker action and usually
+the only one that is needed e.g. for log rotation. <b>It is recommended to set the setting to "off".</b></li>
 <li><a href="rsconf1_includeconfig.html">$IncludeConfig</a></li><li>MainMsgQueueCheckpointInterval &lt;number&gt;</li>
 <li>$MainMsgQueueDequeueSlowdown &lt;number&gt; [number
 is timeout in <i> micro</i>seconds (1000000us is 1sec!),
diff -u -p -r rsyslog-3.21.11.orig/runtime/glbl.c rsyslog-3.21.11/runtime/glbl.c
--- rsyslog-3.21.11.orig/runtime/glbl.c	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/runtime/glbl.c	2009-04-13 11:53:46.000000000 +0200
@@ -52,6 +52,7 @@ DEFobjStaticHelpers
  */
 static uchar *pszWorkDir = NULL;
 static int iMaxLine = 2048;		/* maximum length of a syslog message */
+static int bHUPisRestart = 1;	/* should SIGHUP cause a full system restart? */
 static int iDefPFFamily = PF_UNSPEC;     /* protocol family (IPv4, IPv6 or both) */
 static int bDropMalPTRMsgs = 0;/* Drop messages which have malicious PTR records during DNS lookup */
 static int option_DisallowWarning = 1;	/* complain if message from disallowed sender is received */
@@ -86,6 +87,7 @@ static dataType Get##nameFunc(void) \
 }
 
 SIMP_PROP(MaxLine, iMaxLine, int)
+SIMP_PROP(HUPisRestart, bHUPisRestart, int)
 SIMP_PROP(DefPFFamily, iDefPFFamily, int) /* note that in the future we may check the family argument */
 SIMP_PROP(DropMalPTRMsgs, bDropMalPTRMsgs, int)
 SIMP_PROP(Option_DisallowWarning, option_DisallowWarning, int)
@@ -173,6 +175,7 @@ CODESTARTobjQueryInterface(glbl)
 	pIf->Get##name = Get##name; \
 	pIf->Set##name = Set##name;
 	SIMP_PROP(MaxLine);
+	SIMP_PROP(HUPisRestart);
 	SIMP_PROP(DefPFFamily);
 	SIMP_PROP(DropMalPTRMsgs);
 	SIMP_PROP(Option_DisallowWarning);
@@ -216,6 +219,7 @@ static rsRetVal resetConfigVariables(uch
 		pszWorkDir = NULL;
 	}
 	bDropMalPTRMsgs = 0;
+	bHUPisRestart = 1;
 	return RS_RET_OK;
 }
 
@@ -235,6 +239,7 @@ BEGINAbstractObjClassInit(glbl, 1, OBJ_I
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercafile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrCAF, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdriverkeyfile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrKeyFile, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercertfile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrCertFile, NULL));
+	CHKiRet(regCfSysLineHdlr((uchar *)"hupisrestart", 0, eCmdHdlrBinary, NULL, &bHUPisRestart, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL));
 ENDObjClassInit(glbl)
 
diff -u -p -r rsyslog-3.21.11.orig/runtime/glbl.h rsyslog-3.21.11/runtime/glbl.h
--- rsyslog-3.21.11.orig/runtime/glbl.h	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/runtime/glbl.h	2009-04-13 11:53:46.000000000 +0200
@@ -41,6 +41,7 @@ BEGINinterface(glbl) /* name must also b
 	dataType (*Get##name)(void); \
 	rsRetVal (*Set##name)(dataType);
 	SIMP_PROP(MaxLine, int)
+	SIMP_PROP(HUPisRestart, int)
 	SIMP_PROP(DefPFFamily, int)
 	SIMP_PROP(DropMalPTRMsgs, int)
 	SIMP_PROP(Option_DisallowWarning, int)
diff -u -p -r rsyslog-3.21.11.orig/runtime/module-template.h rsyslog-3.21.11/runtime/module-template.h
--- rsyslog-3.21.11.orig/runtime/module-template.h	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/runtime/module-template.h	2009-04-13 11:53:46.000000000 +0200
@@ -481,6 +481,33 @@ static rsRetVal afterRun(void)\
 }
 
 
-/*
- * vi:set ai:
+/* doHUP()
+ * This function is optional. Currently, it is available to output plugins
+ * only, but may be made available to other types of plugins in the future.
+ * A plugin does not need to define this entry point. If if does, it gets
+ * called when a non-restart type of HUP is done. A plugin should register
+ * this function so that it can close files, connection or other ressources
+ * on HUP - if it can be assume the user wanted to do this as a part of HUP
+ * processing. Note that the name "HUP" has historical reasons, it stems back
+ * to the infamous SIGHUP which was sent to restart a syslogd. We still retain
+ * that legacy, but may move this to a different signal.
+ * rgerhards, 2008-10-22
+ */
+#define CODEqueryEtryPt_doHUP \
+	else if(!strcmp((char*) name, "doHUP")) {\
+		*pEtryPoint = doHUP;\
+	}
+#define BEGINdoHUP \
+static rsRetVal doHUP(instanceData __attribute__((unused)) *pData)\
+{\
+	DEFiRet;
+
+#define CODESTARTdoHUP 
+
+#define ENDdoHUP \
+	RETiRet;\
+}
+
+
+/* vim:set ai:
  */
diff -u -p -r rsyslog-3.21.11.orig/runtime/modules.c rsyslog-3.21.11/runtime/modules.c
--- rsyslog-3.21.11.orig/runtime/modules.c	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/runtime/modules.c	2009-04-13 11:53:46.000000000 +0200
@@ -347,6 +347,7 @@ static rsRetVal
 doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_t*), uchar *name, void *pModHdlr)
 {
 	DEFiRet;
+	rsRetVal localRet;
 	modInfo_t *pNew = NULL;
 	rsRetVal (*modGetType)(eModType_t *pType);
 
@@ -391,6 +392,10 @@ doModInit(rsRetVal (*modInit)(int, int*,
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"parseSelectorAct", &pNew->mod.om.parseSelectorAct));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"isCompatibleWithFeature", &pNew->isCompatibleWithFeature));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"tryResume", &pNew->tryResume));
+			/* try load optional interfaces */
+			localRet = (*pNew->modQueryEtryPt)((uchar*)"doHUP", &pNew->doHUP);
+			if(localRet != RS_RET_OK && localRet != RS_RET_MODULE_ENTRY_POINT_NOT_FOUND)
+				ABORT_FINALIZE(localRet);
 			break;
 		case eMOD_LIB:
 			break;
diff -u -p -r rsyslog-3.21.11.orig/runtime/modules.h rsyslog-3.21.11/runtime/modules.h
--- rsyslog-3.21.11.orig/runtime/modules.h	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/runtime/modules.h	2009-04-13 11:53:46.000000000 +0200
@@ -88,6 +88,7 @@ typedef struct modInfo_s {
 	rsRetVal (*tryResume)(void*);/* called to see if module actin can be resumed now */
 	rsRetVal (*modExit)(void);		/* called before termination or module unload */
 	rsRetVal (*modGetID)(void **);		/* get its unique ID from module */
+	rsRetVal (*doHUP)(void *);		/* non-restart type HUP handler */
 	/* below: parse a configuration line - return if processed
 	 * or not. If not, must be parsed to next module.
 	 */
diff -u -p -r rsyslog-3.21.11.orig/tools/omfile.c rsyslog-3.21.11/tools/omfile.c
--- rsyslog-3.21.11.orig/tools/omfile.c	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/tools/omfile.c	2009-04-13 11:53:46.000000000 +0200
@@ -244,7 +244,6 @@ static rsRetVal cflineParseOutchannel(in
 	 */
 	pData->f_sizeLimitCmd = (char*) pOch->cmdOnSizeLimit;
 
-RUNLOG_VAR("%p", pszTplName);
 	iRet = cflineParseTemplateName(&p, pOMSR, iEntry, iTplOpts,
 				       (pszTplName == NULL) ? (uchar*)"RSYSLOG_FileFormat" : pszTplName);
 
@@ -349,9 +348,11 @@ finalize_it:
 }
 
 
-/* This function frees the dynamic file name cache.
+/* This function frees all dynamic file name cache entries and closes the
+ * relevant files. Part of Shutdown and HUP processing.
+ * rgerhards, 2008-10-23
  */
-static void dynaFileFreeCache(instanceData *pData)
+static inline void dynaFileFreeCacheEntries(instanceData *pData)
 {
 	register int i;
 	ASSERT(pData != NULL);
@@ -360,17 +361,36 @@ static void dynaFileFreeCache(instanceDa
 	for(i = 0 ; i < pData->iCurrCacheSize ; ++i) {
 		dynaFileDelCacheEntry(pData->dynCache, i, 1);
 	}
+	ENDfunc;
+}
+
+
+/* This function frees the dynamic file name cache.
+ */
+static void dynaFileFreeCache(instanceData *pData)
+{
+	ASSERT(pData != NULL);
 
+	BEGINfunc;
+	dynaFileFreeCacheEntries(pData);
 	if(pData->dynCache != NULL)
 		d_free(pData->dynCache);
 	ENDfunc;
 }
 
 
-/* This is a shared code for both static and dynamic files.
+/* This is now shared code for all types of files. It simply prepares
+ * file access, which, among others, means the the file wil be opened
+ * and any directories in between will be created (based on config, of
+ * course). -- rgerhards, 2008-10-22
  */
 static void prepareFile(instanceData *pData, uchar *newFileName)
 {
+	if(pData->fileType == eTypePIPE) {
+		pData->fd = open((char*) pData->f_fname, O_RDWR|O_NONBLOCK);
+		FINALIZE; /* we are done in this case */
+	}
+
 	if(access((char*)newFileName, F_OK) == 0) {
 		/* file already exists */
 		pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
@@ -413,6 +433,12 @@ static void prepareFile(instanceData *pD
 			}
 		}
 	}
+finalize_it:
+	if((pData->fd) != 0 && isatty(pData->fd)) {
+		dbgprintf("file %d is a tty file\n", pData->fd);
+		pData->fileType = eTypeTTY;
+		untty();
+	}
 }
 
 
@@ -537,6 +563,8 @@ static rsRetVal writeFile(uchar **ppStri
 	if(pData->bDynamicName) {
 		if(prepareDynFile(pData, ppString[1], iMsgOpts) != 0)
 			ABORT_FINALIZE(RS_RET_ERR);
+	} else if(pData->fd == -1) {
+		prepareFile(pData, pData->f_fname);
 	}
 
 	/* create the message based on format specified */
@@ -642,12 +670,7 @@ ENDtryResume
 BEGINdoAction
 CODESTARTdoAction
 	dbgprintf(" (%s)\n", pData->f_fname);
-	/* pData->fd == -1 is an indicator that the we couldn't
-	 * open the file at startup. For dynaFiles, this is ok,
-	 * all others are doomed.
-	 */
-	if(pData->bDynamicName || (pData->fd != -1))
-		iRet = writeFile(ppString, iMsgOpts, pData);
+	iRet = writeFile(ppString, iMsgOpts, pData);
 ENDdoAction
 
 
@@ -764,11 +787,7 @@ CODESTARTparseSelectorAct
 		pData->dirUID = dirUID;
 		pData->dirGID = dirGID;
 
-		if(pData->fileType == eTypePIPE) {
-			pData->fd = open((char*) pData->f_fname, O_RDWR|O_NONBLOCK);
-	        } else {
-			prepareFile(pData, pData->f_fname);
-		}
+		prepareFile(pData, pData->f_fname);
 		        
 	  	if ( pData->fd < 0 ){
 			pData->fd = -1;
@@ -776,10 +795,6 @@ CODESTARTparseSelectorAct
 			errmsg.LogError(0, NO_ERRCODE, "%s", pData->f_fname);
 			break;
 		}
-		if (isatty(pData->fd)) {
-			pData->fileType = eTypeTTY;
-			untty();
-		}
 		if (strcmp((char*) p, _PATH_CONSOLE) == 0)
 			pData->fileType = eTypeCONSOLE;
 		break;
@@ -815,6 +830,20 @@ static rsRetVal resetConfigVariables(uch
 }
 
 
+BEGINdoHUP
+CODESTARTdoHUP
+	if(pData->bDynamicName) {
+		dynaFileFreeCacheEntries(pData);
+		pData->iCurrElt = -1; /* invalidate current element */
+	} else {
+		if(pData->fd != -1) {
+			close(pData->fd);
+			pData->fd = -1;
+		}
+	}
+ENDdoHUP
+
+
 BEGINmodExit
 CODESTARTmodExit
 	if(pszTplName != NULL)
@@ -825,6 +854,7 @@ ENDmodExit
 BEGINqueryEtryPt
 CODESTARTqueryEtryPt
 CODEqueryEtryPt_STD_OMOD_QUERIES
+CODEqueryEtryPt_doHUP
 ENDqueryEtryPt
 
 
diff -u -p -r rsyslog-3.21.11.orig/tools/syslogd.c rsyslog-3.21.11/tools/syslogd.c
--- rsyslog-3.21.11.orig/tools/syslogd.c	2009-04-13 11:50:41.000000000 +0200
+++ rsyslog-3.21.11/tools/syslogd.c	2009-04-13 11:53:46.000000000 +0200
@@ -219,7 +219,7 @@ static char	*PidFile = _PATH_LOGPID; /* 
 
 static pid_t myPid;	/* our pid for use in self-generated messages, e.g. on startup */
 /* mypid is read-only after the initial fork() */
-static int restart = 0; /* do restart (config read) - multithread safe */
+static int bHadHUP = 0; /* did we have a HUP? */
 
 static int bParseHOSTNAMEandTAG = 1; /* global config var: should the hostname and tag be
                                       * parsed inside message - rgerhards, 2006-03-13 */
@@ -2525,13 +2525,13 @@ static rsRetVal setMainMsgQueType(void _
  * The following function is resposible for handling a SIGHUP signal.  Since
  * we are now doing mallocs/free as part of init we had better not being
  * doing this during a signal handler.  Instead this function simply sets
- * a flag variable which will tell the main loop to go through a restart.
+ * a flag variable which will tells the main loop to do "the right thing".
  */
 void sighup_handler()
 {
 	struct sigaction sigAct;
 	
-	restart = 1;
+	bHadHUP = 1;
 
 	memset(&sigAct, 0, sizeof (sigAct));
 	sigemptyset(&sigAct.sa_mask);
@@ -2560,6 +2560,49 @@ static void processImInternal(void)
 }
 
 
+/* helper to doHUP(), this "HUPs" each action. The necessary locking
+ * is done inside the action class and nothing we need to take care of.
+ * rgerhards, 2008-10-22
+ */
+DEFFUNC_llExecFunc(doHUPActions)
+{
+	BEGINfunc
+	actionCallHUPHdlr((action_t*) pData);
+	ENDfunc
+	return RS_RET_OK; /* we ignore errors, we can not do anything either way */
+}
+
+
+/* This function processes a HUP after one has been detected. Note that this
+ * is *NOT* the sighup handler. The signal is recorded by the handler, that record
+ * detected inside the mainloop and then this function is called to do the
+ * real work. -- rgerhards, 2008-10-22
+ */
+static inline void
+doHUP(void)
+{
+	selector_t *f;
+	char buf[512];
+
+	snprintf(buf, sizeof(buf) / sizeof(char),
+		 " [origin software=\"rsyslogd\" " "swVersion=\"" VERSION
+		 "\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] rsyslogd was HUPed, type '%s'.",
+		 (int) myPid, glbl.GetHUPisRestart() ? "restart" : "lightweight");
+		errno = 0;
+	logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)buf, 0);
+
+	if(glbl.GetHUPisRestart()) {
+		dbgprintf("Received SIGHUP, configured to be restart, reloading rsyslogd.\n");
+		init(); /* main queue is stopped as part of init() */
+	} else {
+		dbgprintf("Received SIGHUP, configured to be a non-restart type of HUP - notifying actions.\n");
+		for(f = Files; f != NULL ; f = f->f_next) {
+			llExecFunc(&f->llActList, doHUPActions, NULL);
+		}
+	}
+}
+
+
 /* This is the main processing loop. It is called after successful initialization.
  * When it returns, the syslogd terminates.
  * Its sole function is to provide some housekeeping things. The real work is done
@@ -2616,11 +2659,9 @@ mainloop(void)
 		if(bReduceRepeatMsgs == 1)
 			doFlushRptdMsgs();
 
-		if(restart) {
-			dbgprintf("\nReceived SIGHUP, reloading rsyslogd.\n");
-			/* main queue is stopped as part of init() */
-			init();
-			restart = 0;
+		if(bHadHUP) {
+			doHUP();
+			bHadHUP = 0;
 			continue;
 		}
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	10 Feb 2009 14:15:38 -0000	1.30
+++ .cvsignore	13 Apr 2009 15:21:14 -0000	1.31
@@ -1 +1 @@
-rsyslog-3.21.10.tar.gz
+rsyslog-3.21.11.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- rsyslog.spec	3 Apr 2009 15:01:28 -0000	1.58
+++ rsyslog.spec	13 Apr 2009 15:21:15 -0000	1.59
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 3.21.10
-Release: 4%{?dist}
+Version: 3.21.11
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,8 +12,7 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
-Patch0: rsyslog-3.21.10-convVar.patch
-Patch1: rsyslog-3.21.10-HUPisRestart.patch
+Patch0: rsyslog-3.21.11-HUPisRestart.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -89,8 +88,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .convVar
-%patch1 -p1 -b .HUPisRestart
+%patch0 -p1 -b .HUPisRestart
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -196,6 +194,9 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Apr 13 2009 Tomas Heinrich <theinric at redhat.com> 3.21.11-1
+- upgrade
+
 * Tue Mar 31 2009 Lubomir Rintel <lkundrak at v3.sk> 3.21.10-4
 - Backport HUPisRestart option
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	10 Feb 2009 14:15:38 -0000	1.32
+++ sources	13 Apr 2009 15:21:15 -0000	1.33
@@ -1 +1 @@
-c3354921ccb1d83d00199212d35e1d43  rsyslog-3.21.10.tar.gz
+fd796e15e780c954d43adc9680378403  rsyslog-3.21.11.tar.gz


--- rsyslog-3.21.10-HUPisRestart.patch DELETED ---


--- rsyslog-3.21.10-convVar.patch DELETED ---



From michich at fedoraproject.org  Mon Apr 13 15:39:28 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 13 Apr 2009 15:39:28 +0000 (UTC)
Subject: rpms/icecream/F-10 icecream-0.9.3-fix-perms-of-cache.patch, NONE,
	1.1 icecream-0.9.3-tighten-security.patch, NONE,
	1.1 icecream.spec, 1.11, 1.12 icecream.te, 1.5, 1.6
Message-ID: <20090413153928.7813070124@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30008

Modified Files:
	icecream.spec icecream.te 
Added Files:
	icecream-0.9.3-fix-perms-of-cache.patch 
	icecream-0.9.3-tighten-security.patch 
Log Message:
* Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
- Fix wrong permissions on the cache dir preventing the jobs from being
  distributed.
- SELinux policy update based on review comments on refpolicy ML.


icecream-0.9.3-fix-perms-of-cache.patch:

--- NEW FILE icecream-0.9.3-fix-perms-of-cache.patch ---
Patch sent upstream (to Stephan Kulow) on 2009-04-06. -- Michal

commit e5dcc8beda99ffb4cb19b8eef024dbc22b010d54
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Sun Apr 5 23:32:32 2009 +0200

    fix permissions in the cache dir
    
    The way icecream changes permissions of /var/cache/icecream is buggy.
    When the daemon initializes, it creates the directory owned by root:root
    and readable for everyone. As soon as it installs a foreign environment,
    it changes the owner to root:icecream and removes access for everyone
    else.  This causes trouble for locally run icecc which wants read access
    to /var/cache/icecream/native. As a result, local compile jobs can no
    longer determine the native environment and fail to get distributed to
    other nodes.
    
    This patch assigns the owners and permissions like this:
    0755 root:root      /var/cache/icecream/
    0775 root:icecream  /var/cache/icecream/native/
    0770 root:icecream  /var/cache/icecream/target=<target>/
    0770 root:icecream  /var/cache/icecream/target=<target>/<hash>/
    
    It also sets the umask in the initialization of the daemon so that we
    can depend on it being sane and we no longer need some of the chmods.
    
    The access() check in start_install_environment() can be dropped,
    because if we don't have access, we'll soon find out anyway.

diff --git a/daemon/environment.cpp b/daemon/environment.cpp
index 9dc2831..979da91 100644
--- a/daemon/environment.cpp
+++ b/daemon/environment.cpp
@@ -180,8 +180,6 @@ bool cleanup_cache( const string &basedir )
             log_perror( "mkdir in cleanup_cache() failed" );
         return false;
     }
-    chown( basedir.c_str(), 0, 0 );
-    chmod( basedir.c_str(), 0755 );
 
     return ret;
 }
@@ -219,14 +217,14 @@ size_t setup_env_cache(const string &basedir, string &native_environment, uid_t
     if ( ::access( "/usr/bin/gcc", X_OK ) || ::access( "/usr/bin/g++", X_OK ) ) 
 	return 0;
 
-    if ( mkdir( nativedir.c_str(), 0755 ) )
+    if ( mkdir( nativedir.c_str(), 0775 ) )
    	return 0; 
 
-    if ( chown( nativedir.c_str(), nobody_uid, nobody_gid) ) {
+    if ( chown( nativedir.c_str(), 0, nobody_gid ) ||
+         chmod( nativedir.c_str(), 0775 ) ) {
 	rmdir( nativedir.c_str() );
 	return 0;
     }
-    chmod( nativedir.c_str(), 0755 );
 
     flush_debug();
     pid_t pid = fork();
@@ -251,7 +249,6 @@ size_t setup_env_cache(const string &basedir, string &native_environment, uid_t
         }
     }
     // else
-    umask(022);
 
     if ( setgid( nobody_gid ) < 0) {
       log_perror("setgid failed");
@@ -313,30 +310,28 @@ pid_t start_install_environment( const std::string &basename, const std::string
             compression = BZip2;
     }
 
-    if( ::access( basename.c_str(), W_OK ) ) {
-       log_error() << "access for basename " <<  basename.c_str() << " gives " << strerror(errno) << endl;
-       return 0;
-    }
-
-    chown( basename.c_str(), 0, nobody_gid );
-    chmod( basename.c_str(), 0770 );
-
-    if ( mkdir( dirname.c_str(), 0755 ) && errno != EEXIST ) {
+    if ( mkdir( dirname.c_str(), 0770 ) && errno != EEXIST ) {
         log_perror( "mkdir target" );
         return 0;
     }
 
-    chown( dirname.c_str(), 0, nobody_gid );
-    chmod( dirname.c_str(), 0770 );
+    if ( chown( dirname.c_str(), 0, nobody_gid ) ||
+         chmod( dirname.c_str(), 0770 ) ) {
+        log_perror( "chown,chmod target" );
+        return 0;
+    }
 
     dirname = dirname + "/" + name;
-    if ( mkdir( dirname.c_str(), 0700 ) ) {
+    if ( mkdir( dirname.c_str(), 0770 ) ) {
         log_perror( "mkdir name" );
         return 0;
     }
 
-    chown( dirname.c_str(), 0, nobody_gid );
-    chmod( dirname.c_str(), 0770 );
+    if ( chown( dirname.c_str(), 0, nobody_gid ) ||
+         chmod( dirname.c_str(), 0770 ) ) {
+        log_perror( "chown,chmod name" );
+        return 0;
+    }
 
     int fds[2];
     if ( pipe( fds ) )
diff --git a/daemon/main.cpp b/daemon/main.cpp
index 17fc761..7a6498f 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -1598,6 +1598,8 @@ int main( int argc, char ** argv )
         }
     }
 
+    umask(022);
+
     if ( !logfile.length() && detach)
         logfile = "/var/log/iceccd";
 

icecream-0.9.3-tighten-security.patch:

--- NEW FILE icecream-0.9.3-tighten-security.patch ---
commit 3cf2e4b4f1912d18772a0fa476d4671c25ca2ea4
Author: coolo <coolo at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date:   Mon Mar 2 09:47:26 2009 +0000

    more fixes from Michal Schmidt:
    - don't leak file descriptor to create-env
    - don't use the shell to call simple commands
    
    
    git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/icecream at 934044 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/daemon/environment.cpp b/daemon/environment.cpp
index fd38f8e..9dc2831 100644
--- a/daemon/environment.cpp
+++ b/daemon/environment.cpp
@@ -142,40 +142,48 @@ static void list_target_dirs( const string &current_target, const string &target
     closedir( envdir );
 }
 
-bool cleanup_cache( const string &basedir )
+/* Returns true if the child exited with success */
+static bool exec_and_wait( const char *const argv[] )
 {
-    flush_debug();
     pid_t pid = fork();
-    if ( pid )
-    {
-        int status = 0;
+    if ( pid == -1 ) {
+        log_perror("fork");
+        return false;
+    }
+    if ( pid ) {
+        // parent
+        int status;
         while ( waitpid( pid, &status, 0 ) < 0 && errno == EINTR )
             ;
+        return WIFEXITED(status) && WEXITSTATUS(status) == 0;
+    }
+    // child
+    _exit(execv(argv[0], const_cast<char *const *>(argv)));
+}
 
-        if ( mkdir( basedir.c_str(), 0755 ) && errno != EEXIST ) {
-            if ( errno == EPERM )
-                log_error() << "permission denied on mkdir " << basedir << endl;
-            else
-                log_perror( "mkdir in cleanup_cache() failed" );
-            return false;
-        }
-        chown( basedir.c_str(), 0, 0 );
-        chmod( basedir.c_str(), 0755 );
+bool cleanup_cache( const string &basedir )
+{
+    flush_debug();
 
-        return WIFEXITED(status);
-    }
-    // else
-    char **argv;
-    argv = new char*[5];
-    argv[0] = strdup( "/bin/rm" );
-    argv[1] = strdup( "-rf" );
-    argv[2] = strdup( "--" );
     // make sure it ends with '/' to not fall into symlink traps
     string bdir = basedir + '/';
-    argv[3] = strdup( bdir.c_str()  );
-    argv[4] = NULL;
+    const char *const argv[] = {
+        "/bin/rm", "-rf", "--", bdir.c_str(), NULL
+    };
 
-    _exit(execv(argv[0], argv));
+    bool ret = exec_and_wait( argv );
+
+    if ( mkdir( basedir.c_str(), 0755 ) && errno != EEXIST ) {
+        if ( errno == EPERM )
+            log_error() << "permission denied on mkdir " << basedir << endl;
+        else
+            log_perror( "mkdir in cleanup_cache() failed" );
+        return false;
+    }
+    chown( basedir.c_str(), 0, 0 );
+    chmod( basedir.c_str(), 0755 );
+
+    return ret;
 }
 
 Environments available_environmnents(const string &basedir)
@@ -259,7 +267,10 @@ size_t setup_env_cache(const string &basedir, string &native_environment, uid_t
          _exit(1);
     }
 
-    if ( system( BINDIR "/icecc --build-native" ) ) {
+    const char *const argv[] = {
+        BINDIR "/icecc", "--build-native", NULL
+    };
+    if ( !exec_and_wait( argv ) ) {
         log_error() << BINDIR "/icecc --build-native failed\n";
         _exit(1);
     }
diff --git a/services/comm.cpp b/services/comm.cpp
index 47e7304..5ffb790 100644
--- a/services/comm.cpp
+++ b/services/comm.cpp
@@ -987,6 +987,12 @@ open_send_broadcast (void)
       return -1;
     }
 
+  if (fcntl (ask_fd, F_SETFD, FD_CLOEXEC) < 0)
+    {
+      log_perror("open_send_broadcast fcntl");
+      close (ask_fd);
+      return -1;
+    }
   int optval = 1;
   if (setsockopt (ask_fd, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) < 0)
     {


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-10/icecream.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- icecream.spec	16 Feb 2009 21:16:26 -0000	1.11
+++ icecream.spec	13 Apr 2009 15:38:56 -0000	1.12
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.3
-Release:	3%{?dist}
+Release:	6%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -30,6 +30,8 @@
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
 Patch2:		%{name}-0.9.3-fix-gcc44-ftbfs.patch
+Patch3:		%{name}-0.9.3-tighten-security.patch
+Patch4:		%{name}-0.9.3-fix-perms-of-cache.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +80,8 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -235,6 +239,18 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
+- Fix wrong permissions on the cache dir preventing the jobs from being
+  distributed.
+- SELinux policy update based on review comments on refpolicy ML.
+
+* Mon Mar 02 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-5
+- Fix a fd leak from iceccd + avoid using system().
+- Allows tighter SELinux policy.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 16 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-3
 - Do not use --disable-rpath, icecream's configure script does not understand
   it and warns about it. We still remove rpath using the sed tricks.


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-10/icecream.te,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icecream.te	16 Feb 2009 21:16:26 -0000	1.5
+++ icecream.te	13 Apr 2009 15:38:56 -0000	1.6
@@ -1,12 +1,11 @@
 
-policy_module(icecream,0.0.42)
+policy_module(icecream,0.1.3)
 
 ########################################
 #
-# Declarations
+# iceccd declarations
 #
 
-# the compiler node daemon
 type iceccd_t;
 type iceccd_exec_t;
 init_daemon_domain(iceccd_t, iceccd_exec_t)
@@ -20,29 +19,39 @@
 type iceccd_var_run_t;
 files_pid_file(iceccd_var_run_t)
 
-# the working area
 type iceccd_cache_t;
 files_type(iceccd_cache_t)
 
-# icecc-create-env script makes a tarball of the local compiler and its
-# dependencies for other nodes to use
+########################################
+#
+# iceccd_createenv declarations
+#
+
 type iceccd_createenv_t;
 type iceccd_createenv_exec_t;
-domain_type(iceccd_createenv_t)
-domain_entry_file(iceccd_createenv_t, iceccd_createenv_exec_t)
+application_domain(iceccd_createenv_t, iceccd_createenv_exec_t)
 role system_r types iceccd_createenv_t;
 
-# foreign compilers
-type iceccd_untrusted_t;
-domain_type(iceccd_untrusted_t);
-domain_entry_file(iceccd_untrusted_t, iceccd_cache_t)
-role system_r types iceccd_untrusted_t;
+########################################
+#
+# icecc_scheduler declarations
+#
 
-# the scheduler
 type icecc_scheduler_t;
 type icecc_scheduler_exec_t;
 init_daemon_domain(icecc_scheduler_t, icecc_scheduler_exec_t)
 
+########################################
+#
+# iceccd_untrusted declarations
+#
+
+type iceccd_untrusted_t;
+domain_type(iceccd_untrusted_t);
+domain_entry_file(iceccd_untrusted_t, iceccd_cache_t)
+role system_r types iceccd_untrusted_t;
+
+# port declarations. for separate module only.
 type iceccd_port_t;
 type icecc_scheduler_port_t;
 corenet_port(iceccd_port_t);
@@ -50,31 +59,39 @@
 
 ########################################
 #
-# Icecream policy
+# iceccd policy
 #
 
-allow iceccd_t self:process { signal_perms setsched setrlimit };
+allow iceccd_t self:capability { chown dac_override fowner fsetid kill
+	setgid setuid sys_chroot };
+allow iceccd_t self:fifo_file rw_fifo_file_perms;
 allow iceccd_t self:netlink_route_socket r_netlink_socket_perms;
+allow iceccd_t self:process { signal_perms setsched setrlimit };
 allow iceccd_t self:tcp_socket create_stream_socket_perms;
 allow iceccd_t self:udp_socket create_socket_perms;
-allow iceccd_t self:fifo_file rw_fifo_file_perms;
-allow iceccd_t self:capability { chown dac_override fowner fsetid kill setgid setuid sys_chroot };
-allow iceccd_t iceccd_untrusted_t:process { siginh rlimitinh noatsecure signal };
 
-files_read_etc_files(iceccd_t)
-libs_use_ld_so(iceccd_t)
-libs_use_shared_libs(iceccd_t)
-miscfiles_read_localization(iceccd_t)
+dontaudit iceccd_t iceccd_untrusted_t:process { siginh rlimitinh
+	noatsecure };
 
-fs_getattr_all_fs(iceccd_t)
-kernel_read_system_state(iceccd_t)
-sysnet_read_config(iceccd_t)
+allow iceccd_t iceccd_untrusted_t:process signal;
 
-corecmd_exec_bin(iceccd_t)
-corecmd_read_bin_symlinks(iceccd_t)
+domtrans_pattern(iceccd_t, iceccd_createenv_exec_t, iceccd_createenv_t)
+domtrans_pattern(iceccd_t, iceccd_cache_t, iceccd_untrusted_t)
+
+manage_files_pattern(iceccd_t, iceccd_log_t, iceccd_log_t)
+logging_log_filetrans(iceccd_t, iceccd_log_t, file)
+
+manage_files_pattern(iceccd_t, iceccd_var_run_t, iceccd_var_run_t)
+files_pid_filetrans(iceccd_t, iceccd_var_run_t, file)
+
+manage_dirs_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
+manage_files_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
+files_var_filetrans(iceccd_t, iceccd_cache_t, { dir file })
 
-files_getattr_tmp_dirs(iceccd_t)
 files_search_tmp(iceccd_t)
+manage_dirs_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
+manage_files_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
+files_tmp_filetrans(iceccd_t, iceccd_tmp_t, { dir file })
 
 corenet_all_recvfrom_unlabeled(iceccd_t)
 corenet_all_recvfrom_netlabel(iceccd_t)
@@ -88,84 +105,89 @@
 allow iceccd_t iceccd_port_t:tcp_socket { name_bind };
 allow iceccd_t icecc_scheduler_port_t:tcp_socket { name_connect };
 
-domtrans_pattern(iceccd_t, iceccd_createenv_exec_t, iceccd_createenv_t)
-domtrans_pattern(iceccd_t, iceccd_cache_t, iceccd_untrusted_t)
+corecmd_exec_bin(iceccd_t)
+corecmd_read_bin_symlinks(iceccd_t)
 
-manage_files_pattern(iceccd_t, iceccd_log_t, iceccd_log_t)
-logging_log_filetrans(iceccd_t, iceccd_log_t, file)
+#files_getattr_tmp_dirs(iceccd_t)
+files_read_etc_files(iceccd_t)
 
-manage_files_pattern(iceccd_t, iceccd_var_run_t, iceccd_var_run_t)
-files_pid_filetrans(iceccd_t, iceccd_var_run_t, file)
+fs_getattr_all_fs(iceccd_t)
 
-manage_dirs_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
-manage_files_pattern(iceccd_t, iceccd_cache_t, iceccd_cache_t)
+kernel_read_system_state(iceccd_t)
 
-manage_dirs_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
-manage_files_pattern(iceccd_t, iceccd_tmp_t, iceccd_tmp_t)
-files_tmp_filetrans(iceccd_t, iceccd_tmp_t, file)
+sysnet_read_config(iceccd_t)
 
+libs_use_ld_so(iceccd_t)
+libs_use_shared_libs(iceccd_t)
+
+miscfiles_read_localization(iceccd_t)
+
+########################################
+#
+# iceccd_createenv policy
+#
 
-allow iceccd_createenv_t iceccd_log_t:file { append };
 allow iceccd_createenv_t self:fifo_file rw_fifo_file_perms;
-# icecc-create-env looks for executable files to strip them. It does not
-# really execute them, but the -x check would trigger a denial. Do not allow
-# this, typically the binaries are already stripped anyway. Just silence it.
-dontaudit iceccd_createenv_t iceccd_tmp_t:file { execute };
 
-allow iceccd_untrusted_t self:fifo_file rw_fifo_file_perms;
-allow iceccd_untrusted_t self:process signal_perms;
-allow iceccd_untrusted_t iceccd_t:unix_stream_socket rw_sock_file_perms;
-manage_files_pattern(iceccd_untrusted_t, iceccd_cache_t, iceccd_cache_t)
-allow iceccd_untrusted_t iceccd_cache_t:file { execute_no_trans };
+dontaudit iceccd_createenv_t iceccd_tmp_t:file { execute };
 
-files_read_etc_files(iceccd_createenv_t)
-libs_use_ld_so(iceccd_createenv_t)
-libs_use_shared_libs(iceccd_createenv_t)
-miscfiles_read_localization(iceccd_createenv_t)
+allow iceccd_createenv_t iceccd_log_t:file { append };
 
 manage_dirs_pattern(iceccd_createenv_t, iceccd_cache_t, iceccd_cache_t)
 manage_files_pattern(iceccd_createenv_t, iceccd_cache_t, iceccd_cache_t)
+# no files_var_filetrans, createenv does not create the cache dir itself
+
+manage_dirs_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
+manage_files_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
+files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, { dir file })
 
-files_read_usr_files(iceccd_createenv_t)
-libs_exec_ld_so(iceccd_createenv_t)
-libs_exec_lib_files(iceccd_createenv_t)
-libs_domtrans_ldconfig(iceccd_createenv_t)
 corecmd_exec_bin(iceccd_createenv_t)
 corecmd_exec_shell(iceccd_createenv_t)
+
 dev_read_urand(iceccd_createenv_t)
+
+files_read_etc_files(iceccd_createenv_t)
+files_read_usr_files(iceccd_createenv_t)
+
 kernel_read_system_state(iceccd_createenv_t)
-# silence file(1) looking for /root/.magic
-userdom_dontaudit_list_admin_dir(iceccd_createenv_t)
 
-manage_dirs_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
-manage_files_pattern(iceccd_createenv_t, iceccd_tmp_t, iceccd_tmp_t)
-files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, file)
-files_tmp_filetrans(iceccd_createenv_t, iceccd_tmp_t, dir)
+libs_exec_ld_so(iceccd_createenv_t)
+libs_exec_lib_files(iceccd_createenv_t)
+
+libs_domtrans_ldconfig(iceccd_createenv_t)
+
+libs_use_ld_so(iceccd_createenv_t)
+libs_use_shared_libs(iceccd_createenv_t)
+
+miscfiles_read_localization(iceccd_createenv_t)
+
+userdom_dontaudit_list_admin_dir(iceccd_createenv_t)
 
 optional_policy(`
 	nscd_socket_use(iceccd_createenv_t)
 ')
 
-# Some rules that can probably go away when iceccd is fixed properly:
+########################################
 #
-# XXX: icecc-create-env does not really need to talk to the open UDP socket
-# leaked from its parent.
-dontaudit iceccd_createenv_t iceccd_t:udp_socket { read write };
-# XXX: iceccd could be modified to avoid the shell completely
-corecmd_exec_shell(iceccd_t)
-# XXX: fix iceccd to only nuke the contents of /var/cache/icecream,
-# not the directory itself.
-files_var_filetrans(iceccd_t, iceccd_cache_t, dir)
+# iceccd_untrusted policy
+#
+
+allow iceccd_untrusted_t self:fifo_file rw_fifo_file_perms;
+allow iceccd_untrusted_t self:process signal_perms;
+allow iceccd_untrusted_t iceccd_t:unix_stream_socket rw_stream_socket_perms;
+
+manage_files_pattern(iceccd_untrusted_t, iceccd_cache_t, iceccd_cache_t)
 
+can_exec(iceccd_untrusted_t, iceccd_cache_t)
+
+########################################
+#
+# icecc_scheduler policy
+#
 
 allow icecc_scheduler_t self:tcp_socket create_stream_socket_perms;
 allow icecc_scheduler_t self:udp_socket create_socket_perms;
 
-files_read_etc_files(icecc_scheduler_t)
-libs_use_ld_so(icecc_scheduler_t)
-libs_use_shared_libs(icecc_scheduler_t)
-miscfiles_read_localization(icecc_scheduler_t)
-
 corenet_all_recvfrom_unlabeled(icecc_scheduler_t)
 corenet_all_recvfrom_netlabel(icecc_scheduler_t)
 corenet_tcp_sendrecv_all_if(icecc_scheduler_t)
@@ -178,3 +200,10 @@
 corenet_udp_bind_all_nodes(icecc_scheduler_t)
 allow icecc_scheduler_t icecc_scheduler_port_t:tcp_socket { name_bind };
 allow icecc_scheduler_t icecc_scheduler_port_t:udp_socket { name_bind };
+
+files_read_etc_files(icecc_scheduler_t)
+
+libs_use_ld_so(icecc_scheduler_t)
+libs_use_shared_libs(icecc_scheduler_t)
+
+miscfiles_read_localization(icecc_scheduler_t)



From pkgdb at fedoraproject.org  Mon Apr 13 15:39:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:39:45 +0000
Subject: [pkgdb] cpptest was added for rakesh
Message-ID: <20090413153943.7976610F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package cpptest with summary A portable and powerful and simple unit testing framework for c++
kevin has approved Package cpptest
kevin has added a Fedora devel branch for cpptest with an owner of rakesh
kevin has approved cpptest in Fedora devel
kevin has approved Package cpptest
kevin has set commit to Approved for provenpackager on cpptest (Fedora devel)
kevin has set build to Approved for provenpackager on cpptest (Fedora devel)
kevin has set checkout to Approved for provenpackager on cpptest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpptest



From pkgdb at fedoraproject.org  Mon Apr 13 15:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:41:06 +0000
Subject: [pkgdb] cpptest (Fedora, 9) updated by kevin
Message-ID: <20090413153952.7830110F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cpptest
kevin has set commit to Approved for provenpackager on cpptest (Fedora 9)
kevin has set build to Approved for provenpackager on cpptest (Fedora 9)
kevin has set checkout to Approved for provenpackager on cpptest (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpptest



From pkgdb at fedoraproject.org  Mon Apr 13 15:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:41:06 +0000
Subject: [pkgdb] cpptest (Fedora, 10) updated by kevin
Message-ID: <20090413153952.80D9910F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cpptest
kevin has set commit to Approved for provenpackager on cpptest (Fedora 10)
kevin has set build to Approved for provenpackager on cpptest (Fedora 10)
kevin has set checkout to Approved for provenpackager on cpptest (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpptest



From kevin at fedoraproject.org  Mon Apr 13 15:40:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:40:13 +0000 (UTC)
Subject: rpms/cpptest - New directory
Message-ID: <20090413154013.53FD170137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT30351/rpms/cpptest

Log Message:
Directory /cvs/pkgs/rpms/cpptest added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:40:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:40:13 +0000 (UTC)
Subject: rpms/cpptest/devel - New directory
Message-ID: <20090413154013.A0C2E70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT30351/rpms/cpptest/devel

Log Message:
Directory /cvs/pkgs/rpms/cpptest/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:40:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:40:36 +0000 (UTC)
Subject: rpms/cpptest Makefile,NONE,1.1
Message-ID: <20090413154036.66E8770138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT30351/rpms/cpptest

Added Files:
	Makefile 
Log Message:
Setup of module cpptest


--- NEW FILE Makefile ---
# Top level Makefile for module cpptest
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 13 15:40:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:40:41 +0000 (UTC)
Subject: rpms/cpptest/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090413154041.D5B1770138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT30351/rpms/cpptest/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cpptest


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cpptest
# $Id: Makefile,v 1.1 2009/04/13 15:40:38 kevin Exp $
NAME := cpptest
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 13 15:42:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:42:33 +0000
Subject: [pkgdb] mmv (Fedora EPEL, 5) updated by kevin
Message-ID: <20090413154117.5E1C310F85A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mmv
kevin has set commit to Approved for provenpackager on mmv (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mmv (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mmv (Fedora EPEL 5)
kevin changed owner of mmv in Fedora EPEL 5 to till

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mmv



From pkgdb at fedoraproject.org  Mon Apr 13 15:45:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:45:03 +0000
Subject: [pkgdb] links was added for lkundrak
Message-ID: <20090413154501.B220810F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package links with summary Web browser running in both graphics and text mode
kevin has approved Package links
kevin has added a Fedora devel branch for links with an owner of lkundrak
kevin has approved links in Fedora devel
kevin has approved Package links
kevin has set commit to Approved for provenpackager on links (Fedora devel)
kevin has set build to Approved for provenpackager on links (Fedora devel)
kevin has set checkout to Approved for provenpackager on links (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/links



From pkgdb at fedoraproject.org  Mon Apr 13 15:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:46:21 +0000
Subject: [pkgdb] links (Fedora EPEL, 5) updated by kevin
Message-ID: <20090413154507.7B23F10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for links
kevin has set commit to Approved for provenpackager on links (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on links (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on links (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/links



From kevin at fedoraproject.org  Mon Apr 13 15:45:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:45:18 +0000 (UTC)
Subject: rpms/links - New directory
Message-ID: <20090413154518.52F4670138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/links
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEaQ802/rpms/links

Log Message:
Directory /cvs/pkgs/rpms/links added to the repository




From pkgdb at fedoraproject.org  Mon Apr 13 15:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:46:21 +0000
Subject: [pkgdb] links (Fedora, 10) updated by kevin
Message-ID: <20090413154507.84EFC10F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for links
kevin has set commit to Approved for provenpackager on links (Fedora 10)
kevin has set build to Approved for provenpackager on links (Fedora 10)
kevin has set checkout to Approved for provenpackager on links (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/links



From kevin at fedoraproject.org  Mon Apr 13 15:45:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:45:18 +0000 (UTC)
Subject: rpms/links/devel - New directory
Message-ID: <20090413154518.A54C370138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/links/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEaQ802/rpms/links/devel

Log Message:
Directory /cvs/pkgs/rpms/links/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:45:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:45:29 +0000 (UTC)
Subject: rpms/links Makefile,NONE,1.1
Message-ID: <20090413154529.9A0C670138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/links
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEaQ802/rpms/links

Added Files:
	Makefile 
Log Message:
Setup of module links


--- NEW FILE Makefile ---
# Top level Makefile for module links
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 13 15:45:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:45:30 +0000 (UTC)
Subject: rpms/links/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090413154530.2E69D7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/links/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEaQ802/rpms/links/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module links


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: links
# $Id: Makefile,v 1.1 2009/04/13 15:45:29 kevin Exp $
NAME := links
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 13 15:45:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:45:48 +0000
Subject: [pkgdb] gallery2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090413154546.C5C6B10F85A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gallery2
kevin has set commit to Approved for provenpackager on gallery2 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on gallery2 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on gallery2 (Fedora EPEL 5)
kevin changed owner of gallery2 in Fedora EPEL 5 to limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gallery2



From ajax at fedoraproject.org  Mon Apr 13 15:45:53 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 15:45:53 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel intel-2.6.99.902-to-git.patch, NONE, 
	1.1 intel-2.6.99.902-kms-get-crtc.patch, 1.1,
	1.2 xorg-x11-drv-intel.spec, 1.11, 1.12
Message-ID: <20090413154553.A854A70141@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1270

Modified Files:
	intel-2.6.99.902-kms-get-crtc.patch xorg-x11-drv-intel.spec 
Added Files:
	intel-2.6.99.902-to-git.patch 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.6.99.902-3
- Update to today's git snapshot.


intel-2.6.99.902-to-git.patch:

--- NEW FILE intel-2.6.99.902-to-git.patch ---
053432991c812146f6e7c6f13c6ace55385c825f

diff --git a/Makefile.am b/Makefile.am
index d1118fe..45b0c42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = uxa src man
 
diff --git a/RELEASING b/RELEASING
new file mode 100644
index 0000000..c4006c3
--- /dev/null
+++ b/RELEASING
@@ -0,0 +1,32 @@
+The process for releasing a new tarball is as follows:
+
+1. make sure you have the latest build requirements installed:
+
+	git://git.freedesktop.org/git/util/macros
+	git://git.freedesktop.org/git/util/modular
+
+2. update your module version (usually found in configure.ac)
+
+	$ vi configure.ac # bump version
+        $ git push origin # make sure you're on the release branch
+
+3. verify your module builds
+
+	$ make distcheck
+
+4. tag the release
+
+	$ git tag -m "Intel <ver> release" xf86-video-intel-<ver>
+
+5. run the release script (this should push the tag)
+
+	$ <path_to>/util/modular/release.sh driver xf86-video-intel-<last_ver> xf86-video-intel-<ver>
+
+6. edit the generated release message as needed and send it out
+
+	for major releases list added features and known limitations
+
+	for minor releases indicate which bugs were fixed and which
+	are still present
+
+7. throw a release party, you're done! :)
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 254b352..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,140 +0,0 @@
-dnl dolt, a replacement for libtool
-dnl Copyright ?? 2007-2008 Josh Triplett <josh at freedesktop.org>
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-dnl
-dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
-dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
-dnl installed when running autoconf on your project.
-dnl
-dnl git snapshot: d91f2b4e9041538400e2703a2a6fbeecdb8ee27d
-AC_DEFUN([DOLT], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-# dolt, a replacement for libtool
-# Josh Triplett <josh at freedesktop.org>
-AC_PATH_PROG(DOLT_BASH, bash)
-AC_MSG_CHECKING([if libtool sucks])
-AC_MSG_RESULT([yup, it does])
-AC_MSG_CHECKING([if dolt supports this host])
-dolt_supported=yes
-if test x$DOLT_BASH = x; then
-    dolt_supported=no
-fi
-if test x$GCC != xyes; then
-    dolt_supported=no
-fi
-case $host in
-i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*) ;;
-amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) ;;
-*) dolt_supported=no ;;
-esac
-if test x$dolt_supported = xno ; then
-    AC_MSG_RESULT([no, falling back to libtool])
-    LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
-    LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
-else
-    AC_MSG_RESULT([yes, replacing libtool])
-
-dnl Start writing out doltcompile.
-    cat <<__DOLTCOMPILE__EOF__ >doltcompile
-#!$DOLT_BASH
-__DOLTCOMPILE__EOF__
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-args=("$[]@")
-for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
-    if test x"${args@<:@$arg@:>@}" = x-o ; then
-        objarg=$((arg+1))
-        break
-    fi
-done
-if test x$objarg = x ; then
-    echo 'Error: no -o on compiler command line' 1>&2
-    exit 1
-fi
-lo="${args@<:@$objarg@:>@}"
-obj="${lo%.lo}"
-if test x"$lo" = x"$obj" ; then
-    echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
-    exit 1
-fi
-objbase="${obj##*/}"
-__DOLTCOMPILE__EOF__
-
-dnl Write out shared compilation code.
-    if test x$enable_shared = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-libobjdir="${obj%$objbase}.libs"
-if test ! -d "$libobjdir" ; then
-    mkdir_out="$(mkdir "$libobjdir" 2>&1)"
-    mkdir_ret=$?
-    if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
-	echo "$mkdir_out" 1>&2
-        exit $mkdir_ret
-    fi
-fi
-pic_object="$libobjdir/$objbase.o"
-args@<:@$objarg@:>@="$pic_object"
-"${args@<:@@@:>@}" -fPIC -DPIC || exit $?
-__DOLTCOMPILE__EOF__
-    fi
-
-dnl Write out static compilation code.
-dnl Avoid duplicate compiler output if also building shared objects.
-    if test x$enable_static = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-non_pic_object="$obj.o"
-args@<:@$objarg@:>@="$non_pic_object"
-__DOLTCOMPILE__EOF__
-        if test x$enable_shared = xyes; then
-            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
-__DOLTCOMPILE__EOF__
-        else
-            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}" || exit $?
-__DOLTCOMPILE__EOF__
-        fi
-    fi
-
-dnl Write out the code to write the .lo file.
-dnl The second line of the .lo file must match "^# Generated by .*libtool"
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-{
-echo "# $lo - a libtool object file"
-echo "# Generated by doltcompile, not libtool"
-__DOLTCOMPILE__EOF__
-
-    if test x$enable_shared = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "pic_object='$pic_object'"
-__DOLTCOMPILE__EOF__
-    else
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo pic_object=none
-__DOLTCOMPILE__EOF__
-    fi
-
-    if test x$enable_static = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "non_pic_object='$non_pic_object'"
-__DOLTCOMPILE__EOF__
-    else
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo non_pic_object=none
-__DOLTCOMPILE__EOF__
-    fi
-
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-} > "$lo"
-__DOLTCOMPILE__EOF__
-
-dnl Done writing out doltcompile; substitute it for libtool compilation.
-    chmod +x doltcompile
-    LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
-    LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
-fi
-AC_SUBST(LTCOMPILE)
-AC_SUBST(LTCXXCOMPILE)
-# end dolt
-])
diff --git a/configure.ac b/configure.ac
[...2738 lines suppressed...]
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <pciaccess.h>
+#include <err.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "reg_dumper.h"
+#include "../i810_reg.h"
+#include "../i830_bios.h"
+
+enum lid_status {
+    LID_UNKNOWN = -1,
+    LID_OPEN,
+    LID_CLOSE,
+};
+
+#define ACPI_BUTTON "/proc/acpi/button/"
+#define ACPI_LID "/proc/acpi/button/lid/"
+
+static int
+i830_lvds_acpi_lid_state(void)
+{
+    int fd;
+    DIR *button_dir;
+    DIR *lid_dir;
+    struct dirent *lid_dent;
+    char *state_name;
+    char state[64];
+    enum lid_status ret = LID_UNKNOWN;
+
+    button_dir = opendir(ACPI_BUTTON);
+    /* If acpi button driver is not loaded, bypass ACPI check method */
+    if (button_dir == NULL)
+	goto out;
+    closedir(button_dir);
+
+    lid_dir = opendir(ACPI_LID);
+
+    /* no acpi lid object found */
+    if (lid_dir == NULL)
+	goto out;
+
+    while (1) {
+	lid_dent = readdir(lid_dir);
+	if (lid_dent == NULL) {
+	    /* no LID object */
+	    closedir(lid_dir);
+	    goto out;
+	}
+	if (strcmp(lid_dent->d_name, ".") &&
+		strcmp(lid_dent->d_name, "..")) {
+	    break;
+	}
+    }
+    state_name = malloc(strlen(ACPI_LID) + strlen(lid_dent->d_name) + 7);
+    memset(state_name, 0, sizeof(state_name));
+    strcat(state_name, ACPI_LID);
+    strcat(state_name, lid_dent->d_name);
+    strcat(state_name, "/state");
+
+    closedir(lid_dir);
+
+    if ((fd = open(state_name, O_RDONLY)) == -1) {
+	free(state_name);
+	goto out;
+    }
+    free(state_name);
+    if (read(fd, state, 64) == -1) {
+	close(fd);
+	goto out;
+    }
+    close(fd);
+    if (strstr(state, "open"))
+	ret = LID_OPEN;
+    else if (strstr(state, "closed"))
+	ret = LID_CLOSE;
+    else /* "unsupported" */
+	ret = LID_UNKNOWN;
+
+out:
+    return ret;
+}
+
+int main(int argc, char **argv)
+{
+    I830Rec i830;
+    I830Ptr pI830 = &i830;
+    int swf14, acpi_lid;
+
+    intel_i830rec_init(pI830);
+
+    while (1) {
+	swf14 = INREG(SWF14);
+
+	printf("Intel LVDS Lid status:\n");
+	printf("\tSWF14(0x%x) : %s\n", swf14, swf14 & SWF14_LID_SWITCH_EN ? "close" : "open");
+
+	acpi_lid = i830_lvds_acpi_lid_state();
+	switch (acpi_lid) {
+	    case LID_UNKNOWN:
+		printf("\tACPI Lid state : unknown\n");
+		break;
+	    case LID_OPEN:
+		printf("\tACPI Lid state : open\n");
+		break;
+	    case LID_CLOSE:
+		printf("\tACPI Lid state : close\n");
+		break;
+	}
+	sleep(2);
+    }
+    return 0;
+}
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 9e62683..a376eb7 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -1,5 +1,6 @@
 if XVMC
 lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
+endif
 
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
@@ -123,4 +124,3 @@ BUILT_SOURCES= $(INTEL_G4B)
 clean-local:
 	-rm -f $(INTEL_G4B)
 endif
-endif
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
index 5abd001..3cb03f5 100644
--- a/uxa/uxa-glyphs.c
+++ b/uxa/uxa-glyphs.c
@@ -353,9 +353,7 @@ uxa_glyph_cache_hash_remove(uxa_glyph_cache_t *cache,
 #define CACHE_Y(pos) (cache->yOffset + ((pos) / cache->columns) * cache->glyphHeight)
 
 /* The most efficient thing to way to upload the glyph to the screen
- * is to use the UploadToScreen() driver hook; this allows us to
- * pipeline glyph uploads and to avoid creating offscreen pixmaps for
- * glyphs that we'll never use again.
+ * is to use CopyArea; uxa pixmaps are always offscreen.
  */
 static Bool
 uxa_glyph_cache_upload_glyph(ScreenPtr		    pScreen,
@@ -363,37 +361,23 @@ uxa_glyph_cache_upload_glyph(ScreenPtr		    pScreen,
 			     int		    pos,
 			     GlyphPtr		    pGlyph)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
     PicturePtr	    pGlyphPicture = GlyphPicture(pGlyph)[pScreen->myNum];
     PixmapPtr	    pGlyphPixmap = (PixmapPtr)pGlyphPicture->pDrawable;
     PixmapPtr	    pCachePixmap = (PixmapPtr)cache->picture->pDrawable;
-    int		    cacheXoff, cacheYoff;
-
-    if (!uxa_screen->info->put_image || uxa_screen->swappedOut)
-	return FALSE;
-
-    /* If the glyph pixmap is already uploaded, no point in doing
-     * things this way */
-    if (uxa_pixmap_is_offscreen(pGlyphPixmap))
-	return FALSE;
+    GCPtr	    pGC;
 
     /* UploadToScreen only works if bpp match */
     if (pGlyphPixmap->drawable.bitsPerPixel != pCachePixmap->drawable.bitsPerPixel)
 	return FALSE;
 
-    pCachePixmap = uxa_get_offscreen_pixmap ((DrawablePtr)pCachePixmap, &cacheXoff, &cacheYoff);
-    if (!pCachePixmap)
-	return FALSE;
-
-    if (!uxa_screen->info->put_image(pCachePixmap,
-				     CACHE_X(pos) + cacheXoff,
-				     CACHE_Y(pos) + cacheYoff,
-				     pGlyph->info.width,
-				     pGlyph->info.height,
-				     (char *)pGlyphPixmap->devPrivate.ptr,
-				     pGlyphPixmap->devKind))
-	return FALSE;
-
+    pGC = GetScratchGC(pCachePixmap->drawable.depth, pScreen);
+    ValidateGC(&pCachePixmap->drawable, pGC);
+    (void) uxa_copy_area (&pGlyphPixmap->drawable,
+			  &pCachePixmap->drawable,
+			  pGC,
+			  0, 0, pGlyph->info.width, pGlyph->info.height,
+			  CACHE_X(pos), CACHE_Y(pos));
+    FreeScratchGC (pGC);
     return TRUE;
 }
 

intel-2.6.99.902-kms-get-crtc.patch:

Index: intel-2.6.99.902-kms-get-crtc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/intel-2.6.99.902-kms-get-crtc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-2.6.99.902-kms-get-crtc.patch	12 Mar 2009 22:53:18 -0000	1.1
+++ intel-2.6.99.902-kms-get-crtc.patch	13 Apr 2009 15:45:53 -0000	1.2
@@ -1,8 +1,8 @@
-diff -up xf86-video-intel-2.6.99.902/src/drmmode_display.c.jx xf86-video-intel-2.6.99.902/src/drmmode_display.c
---- xf86-video-intel-2.6.99.902/src/drmmode_display.c.jx	2009-03-12 18:24:10.000000000 -0400
-+++ xf86-video-intel-2.6.99.902/src/drmmode_display.c	2009-03-12 18:41:31.813969036 -0400
-@@ -550,8 +550,19 @@ drmmode_output_dpms(xf86OutputPtr output
- 	}
+diff -up xf86-video-intel-2.6.99.902/src/drmmode_display.c.get-crtc xf86-video-intel-2.6.99.902/src/drmmode_display.c
+--- xf86-video-intel-2.6.99.902/src/drmmode_display.c.get-crtc	2009-04-13 11:41:29.000000000 -0400
++++ xf86-video-intel-2.6.99.902/src/drmmode_display.c	2009-04-13 11:42:50.000000000 -0400
+@@ -730,8 +730,19 @@ drmmode_output_set_property(xf86OutputPt
+     return FALSE;
  }
  
 +#ifdef RANDR_GET_CRTC_INTERFACE
@@ -14,10 +14,10 @@
 +#endif
 +
  static const xf86OutputFuncsRec drmmode_output_funcs = {
- 	.dpms = drmmode_output_dpms,
+ 	.create_resources = drmmode_output_create_resources,
 +#ifdef RANDR_GET_CRTC_INTERFACE
 +	.get_crtc = drmmode_get_crtc,
 +#endif
- #if 0
- 
- 	.save = drmmode_crt_save,
+ #ifdef RANDR_12_INTERFACE
+ 	.set_property = drmmode_output_set_property,
+ #endif


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-intel.spec	7 Apr 2009 13:41:32 -0000	1.11
+++ xorg-x11-drv-intel.spec	13 Apr 2009 15:45:53 -0000	1.12
@@ -3,12 +3,10 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define batchbuffer_version 2.2.0-219-gc9676d0
-
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-intel
 Version:   2.6.99.902
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,12 +14,10 @@
 
 Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
 
-# Update git snapshot by saying make dist distdir=$(git-describe) from
-# the intel-batchbuffer branch.
-#Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
 Source2:   intel.xinf
 
-Patch1: rc1-to-2.7.patch
+# 053432991c812146f6e7c6f13c6ace55385c825f 
+Patch1: intel-2.6.99.902-to-git.patch
 Patch2: kill-svideo.patch
 Patch3: copy-fb.patch
 Patch4: intel-2.6.99.902-kms-get-crtc.patch
@@ -38,7 +34,6 @@
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 
-Conflicts:  kudzu < 1.2.42-1
 Requires:  kernel >= 2.6.29-0.203.rc7.fc11
 Provides:   %{legacyname} = %{legacyver}
 Obsoletes:  %{legacyname} < %{legacyver}
@@ -59,7 +54,7 @@
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
-%patch1 -p1 -b .rc1-to-2.7
+%patch1 -p1 -b .to-git
 %patch2 -p1 -b .svideo
 %patch3 -p1 -b .copy-fb
 %patch4 -p1 -b .get-crtc
@@ -101,6 +96,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.6.99.902-3
+- Update to today's git snapshot.
+
 * Mon Apr  6 2009 Kristian H??gsberg <krh at redhat.com> - 2.6.99.902-2
 - Update to newer 2.7 snapshot, drop no-legacy3d.patch.
 



From spot at fedoraproject.org  Mon Apr 13 15:47:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 15:47:17 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.47, 1.48 asymptote.spec, 1.59,
	1.60 sources, 1.47, 1.48
Message-ID: <20090413154717.CB0B170124@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1855

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.70


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	7 Apr 2009 21:38:10 -0000	1.47
+++ .cvsignore	13 Apr 2009 15:46:47 -0000	1.48
@@ -1 +1 @@
-asymptote-1.69.src.tgz
+asymptote-1.70.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- asymptote.spec	7 Apr 2009 21:38:10 -0000	1.59
+++ asymptote.spec	13 Apr 2009 15:46:47 -0000	1.60
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.69
+Version:        1.70
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.70-1
+- update to 1.70
+
 * Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.69-1
 - update to 1.69
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	7 Apr 2009 21:38:10 -0000	1.47
+++ sources	13 Apr 2009 15:46:47 -0000	1.48
@@ -1 +1 @@
-70c8a87bf19e6cec16fd210ca32d2608  asymptote-1.69.src.tgz
+3d001d5ce77f00f5c3061cccfd4832af  asymptote-1.70.src.tgz



From pkgdb at fedoraproject.org  Mon Apr 13 15:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:49:17 +0000
Subject: [pkgdb] swami was added for oget
Message-ID: <20090413154801.429EA10F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package swami with summary MIDI instrument and sound editor
kevin has approved Package swami
kevin has added a Fedora devel branch for swami with an owner of oget
kevin has approved swami in Fedora devel
kevin has approved Package swami
kevin has set commit to Approved for provenpackager on swami (Fedora devel)
kevin has set build to Approved for provenpackager on swami (Fedora devel)
kevin has set checkout to Approved for provenpackager on swami (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swami



From pkgdb at fedoraproject.org  Mon Apr 13 15:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:48:02 +0000
Subject: [pkgdb] swami (Fedora, 9) updated by kevin
Message-ID: <20090413154803.213B910F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for swami
kevin has set commit to Approved for provenpackager on swami (Fedora 9)
kevin has set build to Approved for provenpackager on swami (Fedora 9)
kevin has set checkout to Approved for provenpackager on swami (Fedora 9)
kevin approved watchbugzilla on swami (Fedora 9) for nando
kevin approved watchcommits on swami (Fedora 9) for nando
kevin approved commit on swami (Fedora 9) for nando
kevin approved build on swami (Fedora 9) for nando
kevin approved approveacls on swami (Fedora 9) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swami



From pkgdb at fedoraproject.org  Mon Apr 13 15:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:48:02 +0000
Subject: [pkgdb] swami (Fedora, 10) updated by kevin
Message-ID: <20090413154803.378D910F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for swami
kevin has set commit to Approved for provenpackager on swami (Fedora 10)
kevin has set build to Approved for provenpackager on swami (Fedora 10)
kevin has set checkout to Approved for provenpackager on swami (Fedora 10)
kevin approved watchbugzilla on swami (Fedora 10) for nando
kevin approved watchcommits on swami (Fedora 10) for nando
kevin approved commit on swami (Fedora 10) for nando
kevin approved build on swami (Fedora 10) for nando
kevin approved approveacls on swami (Fedora 10) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swami



From pkgdb at fedoraproject.org  Mon Apr 13 15:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:48:02 +0000
Subject: [pkgdb] swami (Fedora, devel) updated by kevin
Message-ID: <20090413154803.48D2010F885@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on swami (Fedora devel) for nando
kevin approved watchcommits on swami (Fedora devel) for nando
kevin approved commit on swami (Fedora devel) for nando
kevin approved build on swami (Fedora devel) for nando
kevin approved approveacls on swami (Fedora devel) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/swami



From kevin at fedoraproject.org  Mon Apr 13 15:48:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:48:12 +0000 (UTC)
Subject: rpms/swami - New directory
Message-ID: <20090413154812.38C4970124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/swami
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskJ2265/rpms/swami

Log Message:
Directory /cvs/pkgs/rpms/swami added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:48:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:48:12 +0000 (UTC)
Subject: rpms/swami/devel - New directory
Message-ID: <20090413154812.8545570124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/swami/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskJ2265/rpms/swami/devel

Log Message:
Directory /cvs/pkgs/rpms/swami/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:48:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:48:23 +0000 (UTC)
Subject: rpms/swami Makefile,NONE,1.1
Message-ID: <20090413154823.6472E70124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/swami
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskJ2265/rpms/swami

Added Files:
	Makefile 
Log Message:
Setup of module swami


--- NEW FILE Makefile ---
# Top level Makefile for module swami
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 13 15:48:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:48:24 +0000 (UTC)
Subject: rpms/swami/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090413154824.1198D70124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/swami/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskJ2265/rpms/swami/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module swami


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: swami
# $Id: Makefile,v 1.1 2009/04/13 15:48:23 kevin Exp $
NAME := swami
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 13 15:49:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:49:13 +0000
Subject: [pkgdb] perl-CSS-Minifier was added for cweyl
Message-ID: <20090413154914.CE29910F87E@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-CSS-Minifier with summary Remove unnecessary whitespace from CSS files
kevin has approved Package perl-CSS-Minifier
kevin has added a Fedora devel branch for perl-CSS-Minifier with an owner of cweyl
kevin has approved perl-CSS-Minifier in Fedora devel
kevin has approved Package perl-CSS-Minifier
kevin has set commit to Approved for provenpackager on perl-CSS-Minifier (Fedora devel)
kevin has set build to Approved for provenpackager on perl-CSS-Minifier (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-CSS-Minifier (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier



From pkgdb at fedoraproject.org  Mon Apr 13 15:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:49:16 +0000
Subject: [pkgdb] perl-CSS-Minifier (Fedora, devel) updated by kevin
Message-ID: <20090413154916.B32DC10F87F@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-CSS-Minifier (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CSS-Minifier (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier



From pkgdb at fedoraproject.org  Mon Apr 13 15:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:49:16 +0000
Subject: [pkgdb] perl-CSS-Minifier (Fedora, 9) updated by kevin
Message-ID: <20090413154916.CD3F310F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-CSS-Minifier
kevin has set commit to Approved for provenpackager on perl-CSS-Minifier (Fedora 9)
kevin has set build to Approved for provenpackager on perl-CSS-Minifier (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-CSS-Minifier (Fedora 9)
kevin approved watchbugzilla on perl-CSS-Minifier (Fedora 9) for perl-sig
kevin approved watchcommits on perl-CSS-Minifier (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier



From pkgdb at fedoraproject.org  Mon Apr 13 15:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:49:16 +0000
Subject: [pkgdb] perl-CSS-Minifier (Fedora, 10) updated by kevin
Message-ID: <20090413154917.02C9C10F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-CSS-Minifier
kevin has set commit to Approved for provenpackager on perl-CSS-Minifier (Fedora 10)
kevin has set build to Approved for provenpackager on perl-CSS-Minifier (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-CSS-Minifier (Fedora 10)
kevin approved watchbugzilla on perl-CSS-Minifier (Fedora 10) for perl-sig
kevin approved watchcommits on perl-CSS-Minifier (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Minifier



From kevin at fedoraproject.org  Mon Apr 13 15:49:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:49:25 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier - New directory
Message-ID: <20090413154925.3840E70124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ2754/rpms/perl-CSS-Minifier

Log Message:
Directory /cvs/pkgs/rpms/perl-CSS-Minifier added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:49:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:49:25 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier/devel - New directory
Message-ID: <20090413154925.8710C70138@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ2754/rpms/perl-CSS-Minifier/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CSS-Minifier/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:49:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:49:36 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier Makefile,NONE,1.1
Message-ID: <20090413154936.AA88270124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ2754/rpms/perl-CSS-Minifier

Added Files:
	Makefile 
Log Message:
Setup of module perl-CSS-Minifier


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CSS-Minifier
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 13 15:49:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:49:37 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090413154937.2E5CB70124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CSS-Minifier/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ2754/rpms/perl-CSS-Minifier/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CSS-Minifier


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CSS-Minifier
# $Id: Makefile,v 1.1 2009/04/13 15:49:36 kevin Exp $
NAME := perl-CSS-Minifier
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From simo at fedoraproject.org  Mon Apr 13 15:49:57 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 13 Apr 2009 15:49:57 +0000 (UTC)
Subject: rpms/sssd/devel sssd.conf.default, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5 sssd.spec, 1.3, 1.4
Message-ID: <20090413154957.9E85570124@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3080

Modified Files:
	.cvsignore sources sssd.spec 
Added Files:
	sssd.conf.default 
Log Message:
* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-1
- Version 0.3.0
- Provides file based configuration and lots of improvements



--- NEW FILE sssd.conf.default ---
[services]
description = Local Service Configuration
activeServices = nss, dp, pam

[services/nss]
description = NSS Responder Configuration
timeout = 150
# the following prevents sssd for searching for the root user/group in
# all domains (you can add here a comma separated list of system accounts are
# always going to be /etc/passwd users, or that you want to filter out)
filterGroups = root
filterUsers = root

[services/dp]
description = Data Provider Configuration
timeout = 150

[services/pam]
description = PAM Responder Configuration
timeout = 150

[services/info]
description = InfoPipe Configuration
timeout = 150

[services/monitor]
description = Service Monitor Configuration
sbusTimeout = 150
servicePingTime = 300

[domains]
description = Domains served by SSSD
; domains = LOCAL,LDAP

# SSSD will not start if you don't configure any domain.
# Add new domains condifgurations as [domains/<NAME>] sections.
# Then add the list of domains (in the order you want them to be
# queried in the 'domains" attribute above and uncomment it

# Example LOCAL domain that proxies to /etc/passwd and /etc/group files
# This configuration is meant mostly as a migration path to be able to store
# additional information about users while still keeping /etc/passwd
# authoritative.

; [domains/LOCAL]
; description = LOCAL migration domain
; enumerate = 3
; minId = 500
; magicPrivateGroups = FALSE
; legacy = TRUE
;
; provider = proxy
; libName = files
; libPath = libnss_files.so.2

# optionally a file named sssdproxylocal can be place in pam.d configured to
# check pam_unix only and pam_sss can be used in the normal pam stack
; auth-module = proxy
; pam-target = sssdproxylocal

# Example LOCAL domain that stores all users natively in the SSSD internal
# directory. These local users and groups are not visibile in /etc/passwd, it
# now contains only root and system accounts.

; [domains/LOCAL]
; description = LOCAL Users domain
; enumerate = 3
; minId = 500
; maxId = 999
; legacy = FALSE
; magicPrivateGroups = TRUE

# Example LDAP domain that uses the proxy backend and the standard nss_ldap
# and pam_ldap modules (Useful until we have good working native ldap backends).
# For this to work the /etc/ldap.conf file needs to be correctly configured just
# like you would do when using nss_ldap in nsswitch.conf, but instead of setting
# passwd: files ldap, set passwd: files, sss instead there.
# Also consider using the following setting in /etc/ldap.conf to avoid needless
# delays if the ldap server is offline:
# timelimit 10
# bind_timelimit 5
# nss_reconnect_maxsleeptime 2
# nss_reconnect_sleeptime 1

; [domains/LDAP]
; description = Proxy request to our LDAP server
; enumerate = 0
; minId = 1000
; legacy = TRUE
;
; provider = proxy
; libName = ldap
; libPath = libnss_ldap.so.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Mar 2009 21:34:16 -0000	1.4
+++ .cvsignore	13 Apr 2009 15:49:54 -0000	1.5
@@ -1 +1 @@
-sssd-0.2.1.tar.gz
+sssd-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Mar 2009 21:34:16 -0000	1.4
+++ sources	13 Apr 2009 15:49:54 -0000	1.5
@@ -1 +1 @@
-61c77ffd7aa0295862d534ceb6688284  sssd-0.2.1.tar.gz
+b6b93c71f8907af5c66ca561d24b052c  sssd-0.3.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sssd.spec	10 Mar 2009 21:34:16 -0000	1.3
+++ sssd.spec	13 Apr 2009 15:49:54 -0000	1.4
@@ -1,12 +1,15 @@
 Name: sssd
-Version: 0.2.1
+Version: 0.3.0
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
+
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/sssd/attachment/wiki/WikiStart/sssd-%{version}.tar.gz
+
+Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
@@ -47,6 +50,15 @@
 
 %build
 
+# common
+pushd common
+autoreconf -i -f
+%configure --disable-shared \
+           --enable-static
+
+make %{?_smp_mflags}
+popd
+
 # sssd
 pushd server
 ./autogen.sh
@@ -54,7 +66,7 @@
            --sysconfdir=%{_sysconfdir} \
            --without-tests     \
            --without-policykit \
-           --with-infopipe \
+           --without-infopipe \
            --with-init-dir=%{_initrddir} \
 
 make %{?_smp_mflags}
@@ -78,6 +90,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+install -m700 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,8 +113,7 @@
 %attr(700,root,root) %dir /var/lib/sss/db
 %dir /var/lib/sss/pipes
 %attr(700,root,root) %dir /var/lib/sss/pipes/private
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freeipa.sssd.infopipe.conf
-%{_datadir}/%{name}/introspect/infopipe/org.freeipa.sssd.infopipe.Introspect.xml
+%config(noreplace) %{_sysconfdir}/sssd/sssd.conf
 /%{_lib}/libnss_sss.so
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
@@ -122,6 +135,10 @@
 fi
 
 %changelog
+* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-1
+- Version 0.3.0
+- Provides file based configuration and lots of improvements
+
 * Tue Mar 10 2009 Simo Sorce <ssorce at redhat.com> - 0.2.1-1
 - Version 0.2.1
 



From pkgdb at fedoraproject.org  Mon Apr 13 15:51:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:51:24 +0000
Subject: [pkgdb] perl-Devel-FastProf was added for iarnell
Message-ID: <20090413155008.B097210F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Devel-FastProf with summary Fast perl per-line profiler
kevin has approved Package perl-Devel-FastProf
kevin has added a Fedora devel branch for perl-Devel-FastProf with an owner of iarnell
kevin has approved perl-Devel-FastProf in Fedora devel
kevin has approved Package perl-Devel-FastProf
kevin has set commit to Approved for provenpackager on perl-Devel-FastProf (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Devel-FastProf (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Devel-FastProf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-FastProf



From pkgdb at fedoraproject.org  Mon Apr 13 15:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:50:11 +0000
Subject: [pkgdb] perl-Devel-FastProf (Fedora, devel) updated by kevin
Message-ID: <20090413155010.1557010F87E@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Devel-FastProf (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Devel-FastProf (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-FastProf



From pkgdb at fedoraproject.org  Mon Apr 13 15:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:50:11 +0000
Subject: [pkgdb] perl-Devel-FastProf (Fedora, 10) updated by kevin
Message-ID: <20090413155010.2923F10F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Devel-FastProf
kevin has set commit to Approved for provenpackager on perl-Devel-FastProf (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Devel-FastProf (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Devel-FastProf (Fedora 10)
kevin approved watchbugzilla on perl-Devel-FastProf (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Devel-FastProf (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-FastProf



From kevin at fedoraproject.org  Mon Apr 13 15:50:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:50:19 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf - New directory
Message-ID: <20090413155019.2552770124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-FastProf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNo3366/rpms/perl-Devel-FastProf

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-FastProf added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:50:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:50:19 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf/devel - New directory
Message-ID: <20090413155019.68BC570124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-FastProf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNo3366/rpms/perl-Devel-FastProf/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-FastProf/devel added to the repository




From rakesh at fedoraproject.org  Mon Apr 13 15:50:45 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 13 Apr 2009 15:50:45 +0000 (UTC)
Subject: rpms/cpptest/devel cpptest-1.1.0-libcpptest_pc_in.patch, NONE,
	1.1 cpptest.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413155045.88CA070124@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/cpptest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3198/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cpptest-1.1.0-libcpptest_pc_in.patch cpptest.spec import.log 
Log Message:
Initial import.


cpptest-1.1.0-libcpptest_pc_in.patch:

--- NEW FILE cpptest-1.1.0-libcpptest_pc_in.patch ---
--- cpptest-1.1.0.org/libcpptest.pc.in	2009-03-17 04:13:58.000000000 +0530
+++ cpptest-1.1.0/libcpptest.pc.in	2009-03-17 04:15:05.000000000 +0530
@@ -1,7 +1,7 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: libcpptest
 Description: C++ test suite


--- NEW FILE cpptest.spec ---
Name:           cpptest
Version:        1.1.0
Release:        3%{?dist}
Summary:        A portable and powerful and simple unit testing framework for C++

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://%{name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         cpptest-1.1.0-libcpptest_pc_in.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  doxygen

%description
CppTest is a portable and powerful, yet simple, unit testing framework
for handling automated tests in C++. The focus lies on usability and
extendability.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}, pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .libcpptest_pc_in

%build
%configure --disable-static --enable-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Not useful. Aready present in html and images folder
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/screenshot*png
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/index.html
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/html-example.html


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc NEWS COPYING AUTHORS ChangeLog
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-3
- Remove check section.

* Tue Mar 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-2
- Commented testsuite. Patched .pc file, fixed spacing and tab mix
- Removed image folder in %%doc

* Fri Mar 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-1
- Initial package


--- NEW FILE import.log ---
cpptest-1_1_0-3_fc10:HEAD:cpptest-1.1.0-3.fc10.src.rpm:1239637512


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:40:36 -0000	1.1
+++ .cvsignore	13 Apr 2009 15:50:14 -0000	1.2
@@ -0,0 +1 @@
+cpptest-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:40:39 -0000	1.1
+++ sources	13 Apr 2009 15:50:15 -0000	1.2
@@ -0,0 +1 @@
+818401e4698c2cfe8395e0ed61fbd097  cpptest-1.1.0.tar.gz



From kevin at fedoraproject.org  Mon Apr 13 15:50:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:50:55 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf Makefile,NONE,1.1
Message-ID: <20090413155055.AE5F370124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-FastProf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNo3366/rpms/perl-Devel-FastProf

Added Files:
	Makefile 
Log Message:
Setup of module perl-Devel-FastProf


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Devel-FastProf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 13 15:50:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:50:56 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090413155056.AC97A70124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-FastProf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNo3366/rpms/perl-Devel-FastProf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Devel-FastProf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Devel-FastProf
# $Id: Makefile,v 1.1 2009/04/13 15:50:56 kevin Exp $
NAME := perl-Devel-FastProf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 13 15:51:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:51:26 +0000
Subject: [pkgdb] perl-MooseX-Storage was added for cweyl
Message-ID: <20090413155124.DF9DF10F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Storage with summary An serialization framework for Moose classes
kevin has approved Package perl-MooseX-Storage
kevin has added a Fedora devel branch for perl-MooseX-Storage with an owner of cweyl
kevin has approved perl-MooseX-Storage in Fedora devel
kevin has approved Package perl-MooseX-Storage
kevin has set commit to Approved for provenpackager on perl-MooseX-Storage (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-Storage (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Storage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Storage



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:43 +0000
Subject: [pkgdb] perl-MooseX-Storage (Fedora, devel) updated by kevin
Message-ID: <20090413155126.E7C9C10F87E@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Storage (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Storage (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Storage



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:43 +0000
Subject: [pkgdb] perl-MooseX-Storage (Fedora, 9) updated by kevin
Message-ID: <20090413155126.F00B010F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-Storage
kevin has set commit to Approved for provenpackager on perl-MooseX-Storage (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-Storage (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Storage (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-Storage (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-Storage (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Storage



From kevin at fedoraproject.org  Mon Apr 13 15:51:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:51:40 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage - New directory
Message-ID: <20090413155140.3835770124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Storage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbs4000/rpms/perl-MooseX-Storage

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Storage added to the repository




From pkgdb at fedoraproject.org  Mon Apr 13 15:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:43 +0000
Subject: [pkgdb] perl-MooseX-Storage (Fedora, 10) updated by kevin
Message-ID: <20090413155127.06A6710F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Storage
kevin has set commit to Approved for provenpackager on perl-MooseX-Storage (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-Storage (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Storage (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Storage (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Storage (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Storage



From kevin at fedoraproject.org  Mon Apr 13 15:51:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:51:40 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/devel - New directory
Message-ID: <20090413155140.9455070124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Storage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbs4000/rpms/perl-MooseX-Storage/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Storage/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 13 15:52:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:52:09 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage Makefile,NONE,1.1
Message-ID: <20090413155209.95BC670124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Storage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbs4000/rpms/perl-MooseX-Storage

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Storage


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Storage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:08 +0000
Subject: [pkgdb] perl-File-Pid was added for iarnell
Message-ID: <20090413155209.29A4210F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-File-Pid with summary Pid File Manipulation
kevin has approved Package perl-File-Pid
kevin has added a Fedora devel branch for perl-File-Pid with an owner of iarnell
kevin has approved perl-File-Pid in Fedora devel
kevin has approved Package perl-File-Pid
kevin has set commit to Approved for provenpackager on perl-File-Pid (Fedora devel)
kevin has set build to Approved for provenpackager on perl-File-Pid (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-File-Pid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Pid



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:10 +0000
Subject: [pkgdb] perl-File-Pid (Fedora, devel) updated by kevin
Message-ID: <20090413155211.10C8E10F881@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-File-Pid (Fedora devel) for perl-sig
kevin approved watchcommits on perl-File-Pid (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Pid



From kevin at fedoraproject.org  Mon Apr 13 15:52:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 13 Apr 2009 15:52:11 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090413155211.131D770124@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Storage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbs4000/rpms/perl-MooseX-Storage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Storage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Storage
# $Id: Makefile,v 1.1 2009/04/13 15:52:10 kevin Exp $
NAME := perl-MooseX-Storage
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:10 +0000
Subject: [pkgdb] perl-File-Pid (Fedora, 10) updated by kevin
Message-ID: <20090413155211.1A70F10F851@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-File-Pid
kevin has set commit to Approved for provenpackager on perl-File-Pid (Fedora 10)
kevin has set build to Approved for provenpackager on perl-File-Pid (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-File-Pid (Fedora 10)
kevin approved watchbugzilla on perl-File-Pid (Fedora 10) for perl-sig
kevin approved watchcommits on perl-File-Pid (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Pid



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:45 +0000
Subject: [pkgdb] pdsh ownership updated
Message-ID: <20090413155245.A2ECD10F87C@bastion2.fedora.phx.redhat.com>

Package pdsh in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdsh



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:55 +0000
Subject: [pkgdb] pdsh ownership updated
Message-ID: <20090413155253.5653310F87D@bastion2.fedora.phx.redhat.com>

Package pdsh in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdsh



From pkgdb at fedoraproject.org  Mon Apr 13 15:52:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:52:57 +0000
Subject: [pkgdb] pdsh ownership updated
Message-ID: <20090413155257.EDA5210F87F@bastion2.fedora.phx.redhat.com>

Package pdsh in Fedora 10 is now owned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdsh



From pkgdb at fedoraproject.org  Mon Apr 13 15:54:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:54:21 +0000
Subject: [pkgdb] pdsh ownership updated
Message-ID: <20090413155305.7E94910F851@bastion2.fedora.phx.redhat.com>

Package pdsh in Fedora devel is now owned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdsh



From rakesh at fedoraproject.org  Mon Apr 13 15:53:33 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 13 Apr 2009 15:53:33 +0000 (UTC)
Subject: rpms/cpptest/F-10 cpptest-1.1.0-libcpptest_pc_in.patch, NONE,
	1.1 cpptest.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413155334.0619370124@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/cpptest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4640/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	cpptest-1.1.0-libcpptest_pc_in.patch cpptest.spec import.log 
Log Message:
Initial import.


cpptest-1.1.0-libcpptest_pc_in.patch:

--- NEW FILE cpptest-1.1.0-libcpptest_pc_in.patch ---
--- cpptest-1.1.0.org/libcpptest.pc.in	2009-03-17 04:13:58.000000000 +0530
+++ cpptest-1.1.0/libcpptest.pc.in	2009-03-17 04:15:05.000000000 +0530
@@ -1,7 +1,7 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: libcpptest
 Description: C++ test suite


--- NEW FILE cpptest.spec ---
Name:           cpptest
Version:        1.1.0
Release:        3%{?dist}
Summary:        A portable and powerful and simple unit testing framework for C++

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://%{name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         cpptest-1.1.0-libcpptest_pc_in.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  doxygen

%description
CppTest is a portable and powerful, yet simple, unit testing framework
for handling automated tests in C++. The focus lies on usability and
extendability.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}, pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .libcpptest_pc_in

%build
%configure --disable-static --enable-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Not useful. Aready present in html and images folder
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/screenshot*png
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/index.html
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/html-example.html


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc NEWS COPYING AUTHORS ChangeLog
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-3
- Remove check section.

* Tue Mar 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-2
- Commented testsuite. Patched .pc file, fixed spacing and tab mix
- Removed image folder in %%doc

* Fri Mar 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-1
- Initial package


--- NEW FILE import.log ---
cpptest-1_1_0-3_fc10:F-10:cpptest-1.1.0-3.fc10.src.rpm:1239637678


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptest/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:40:36 -0000	1.1
+++ .cvsignore	13 Apr 2009 15:53:02 -0000	1.2
@@ -0,0 +1 @@
+cpptest-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptest/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:40:39 -0000	1.1
+++ sources	13 Apr 2009 15:53:02 -0000	1.2
@@ -0,0 +1 @@
+818401e4698c2cfe8395e0ed61fbd097  cpptest-1.1.0.tar.gz



From rakesh at fedoraproject.org  Mon Apr 13 15:55:39 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 13 Apr 2009 15:55:39 +0000 (UTC)
Subject: rpms/cpptest/F-9 cpptest-1.1.0-libcpptest_pc_in.patch, NONE,
	1.1 cpptest.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413155539.4CF4B70124@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/cpptest/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5621/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	cpptest-1.1.0-libcpptest_pc_in.patch cpptest.spec import.log 
Log Message:
Initial import.


cpptest-1.1.0-libcpptest_pc_in.patch:

--- NEW FILE cpptest-1.1.0-libcpptest_pc_in.patch ---
--- cpptest-1.1.0.org/libcpptest.pc.in	2009-03-17 04:13:58.000000000 +0530
+++ cpptest-1.1.0/libcpptest.pc.in	2009-03-17 04:15:05.000000000 +0530
@@ -1,7 +1,7 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: libcpptest
 Description: C++ test suite


--- NEW FILE cpptest.spec ---
Name:           cpptest
Version:        1.1.0
Release:        3%{?dist}
Summary:        A portable and powerful and simple unit testing framework for C++

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://%{name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         cpptest-1.1.0-libcpptest_pc_in.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  doxygen

%description
CppTest is a portable and powerful, yet simple, unit testing framework
for handling automated tests in C++. The focus lies on usability and
extendability.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}, pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .libcpptest_pc_in

%build
%configure --disable-static --enable-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Not useful. Aready present in html and images folder
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/screenshot*png
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/index.html
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/html-example.html


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc NEWS COPYING AUTHORS ChangeLog
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-3
- Remove check section.

* Tue Mar 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-2
- Commented testsuite. Patched .pc file, fixed spacing and tab mix
- Removed image folder in %%doc

* Fri Mar 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.1.0-1
- Initial package


--- NEW FILE import.log ---
cpptest-1_1_0-3_fc10:F-9:cpptest-1.1.0-3.fc10.src.rpm:1239637820


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptest/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:40:36 -0000	1.1
+++ .cvsignore	13 Apr 2009 15:55:08 -0000	1.2
@@ -0,0 +1 @@
+cpptest-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptest/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:40:39 -0000	1.1
+++ sources	13 Apr 2009 15:55:08 -0000	1.2
@@ -0,0 +1 @@
+818401e4698c2cfe8395e0ed61fbd097  cpptest-1.1.0.tar.gz



From wtogami at fedoraproject.org  Mon Apr 13 15:57:14 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 13 Apr 2009 15:57:14 +0000 (UTC)
Subject: rpms/dash/devel .cvsignore, 1.2, 1.3 dash.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090413155714.4AA9A70124@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/dash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6361

Modified Files:
	.cvsignore dash.spec sources 
Log Message:
0.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dash/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Nov 2007 05:07:14 -0000	1.2
+++ .cvsignore	13 Apr 2009 15:56:43 -0000	1.3
@@ -1 +1 @@
-dash-0.5.4.tar.gz
+dash-0.5.5.1.tar.gz


Index: dash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dash/devel/dash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dash.spec	24 Feb 2009 10:50:17 -0000	1.3
+++ dash.spec	13 Apr 2009 15:56:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dash
-Version:        0.5.4
-Release:        4%{?dist}
+Version:        0.5.5.1
+Release:        1%{?dist}
 Summary:        Small and fast POSIX-compliant shell
 
 Group:          System Environment/Shells
@@ -38,6 +38,9 @@
 %{_datadir}/man/man1/dash.1.gz
 
 %changelog
+* Mon Apr 13 2009 Warren Togami <wtogami at redhat.com> - 0.5.5.1
+- 0.5.5.1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dash/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Nov 2007 05:07:14 -0000	1.2
+++ sources	13 Apr 2009 15:56:43 -0000	1.3
@@ -1 +1 @@
-bc457e490a589d2f87f2333616b67931  dash-0.5.4.tar.gz
+7ac832b440b91f5a52cf8eb68e172616  dash-0.5.5.1.tar.gz



From spot at fedoraproject.org  Mon Apr 13 15:57:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 15:57:42 +0000 (UTC)
Subject: rpms/pdsh/devel .cvsignore, 1.6, 1.7 pdsh.spec, 1.14, 1.15 sources, 
	1.6, 1.7
Message-ID: <20090413155742.4195370124@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pdsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492

Modified Files:
	.cvsignore pdsh.spec sources 
Log Message:
update to 2.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jan 2009 19:28:19 -0000	1.6
+++ .cvsignore	13 Apr 2009 15:57:10 -0000	1.7
@@ -1 +1 @@
-pdsh-2.17.tar.bz2
+pdsh-2.18.tar.bz2


Index: pdsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/pdsh.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pdsh.spec	31 Mar 2009 19:49:12 -0000	1.14
+++ pdsh.spec	13 Apr 2009 15:57:11 -0000	1.15
@@ -1,6 +1,6 @@
 Name: pdsh
-Version: 2.17
-Release: 3%{?dist}
+Version: 2.18
+Release: 1%{?dist}
 Summary: Parallel remote shell program
 License: GPLv2+
 Url: http://sourceforge.net/projects/pdsh/
@@ -408,6 +408,9 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.18-1
+- update to 2.18
+
 * Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.17-3
 - fix unowned directories (#473578)
   and let all module subpackages require the main package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jan 2009 19:28:19 -0000	1.6
+++ sources	13 Apr 2009 15:57:11 -0000	1.7
@@ -1 +1 @@
-94c5ca03a3e4bd221aa54e3cb452bea5  pdsh-2.17.tar.bz2
+ff5dc11f25ce9c7474e71aafb5d293e8  pdsh-2.18.tar.bz2



From pkgdb at fedoraproject.org  Mon Apr 13 15:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:57:55 +0000
Subject: [pkgdb] funionfs ownership updated
Message-ID: <20090413155753.8673810F85A@bastion2.fedora.phx.redhat.com>

Package funionfs in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/funionfs



From pkgdb at fedoraproject.org  Mon Apr 13 15:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 15:57:58 +0000
Subject: [pkgdb] funionfs ownership updated
Message-ID: <20090413155756.87C7F10F87D@bastion2.fedora.phx.redhat.com>

Package funionfs in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/funionfs



From spot at fedoraproject.org  Mon Apr 13 16:01:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 16:01:05 +0000 (UTC)
Subject: rpms/funionfs/devel funionfs.spec,1.4,1.5
Message-ID: <20090413160105.D329770124@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/funionfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7848

Modified Files:
	funionfs.spec 
Log Message:
minor spec cleanup


Index: funionfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funionfs/devel/funionfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- funionfs.spec	24 Feb 2009 18:46:39 -0000	1.4
+++ funionfs.spec	13 Apr 2009 16:00:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           funionfs
 Version:        0.4.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Union filesystem in userspace
 
 Group:          System Environment/Base
@@ -34,12 +34,15 @@
 
 %files
 %defattr(-,root,root,-)
-/usr/bin/funionfs
 %doc AUTHORS ChangeLog COPYING BUGS TODO NEWS README
+%{_bindir}/funionfs
 %{_mandir}/man1/*
 
 
 %changelog
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.3-4
+- minor spec cleanup
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Apr 13 16:03:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:03:41 +0000
Subject: [pkgdb] perl-Callback ownership updated
Message-ID: <20090413160339.EC5CD10F851@bastion2.fedora.phx.redhat.com>

Package perl-Callback in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Callback



From pkgdb at fedoraproject.org  Mon Apr 13 16:03:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:03:42 +0000
Subject: [pkgdb] perl-Callback ownership updated
Message-ID: <20090413160342.B0D4510F87B@bastion2.fedora.phx.redhat.com>

Package perl-Callback in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Callback



From pkgdb at fedoraproject.org  Mon Apr 13 16:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:05:01 +0000
Subject: [pkgdb] perl-Callback ownership updated
Message-ID: <20090413160345.BBACA10F87D@bastion2.fedora.phx.redhat.com>

Package perl-Callback in Fedora 10 is now owned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Callback



From pkgdb at fedoraproject.org  Mon Apr 13 16:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:03:51 +0000
Subject: [pkgdb] perl-Callback ownership updated
Message-ID: <20090413160350.334BB10F880@bastion2.fedora.phx.redhat.com>

Package perl-Callback in Fedora devel is now owned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Callback



From ajax at fedoraproject.org  Mon Apr 13 16:04:00 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 16:04:00 +0000 (UTC)
Subject: rpms/libxcb/devel libxcb-1.2-to-git-6e2e87d.patch, NONE,
	1.1 libxcb.spec, 1.19, 1.20
Message-ID: <20090413160400.E3CD570124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8827

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.2-to-git-6e2e87d.patch 
Log Message:
* Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 1.2-3
- libxcb-1.2-to-git-6e2e87d.patch: Various updates from git, XID generation
  being the most important.


libxcb-1.2-to-git-6e2e87d.patch:

--- NEW FILE libxcb-1.2-to-git-6e2e87d.patch ---
diff --git a/configure.ac b/configure.ac
index 6fe3e57..46c4611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,8 @@ AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
 
 XCB_CHECK_DOXYGEN()
 
+AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+
 XCB_EXTENSION(Composite, "yes")
 XCB_EXTENSION(Damage, "yes")
 XCB_EXTENSION(DPMS, "yes")
diff --git a/src/c_client.py b/src/c_client.py
index 73bd064..d86d05e 100755
--- a/src/c_client.py
+++ b/src/c_client.py
@@ -135,6 +135,9 @@ def c_open(self):
     _ns = self.namespace
     _ns.c_ext_global_name = _n(_ns.prefix + ('id',))
 
+    # Build the type-name collision avoidance table used by c_enum
+    build_collision_table()
+
     _h_setlevel(0)
     _c_setlevel(0)
 
@@ -216,13 +219,26 @@ def c_close(self):
             cfile.write('\n')
     cfile.close()
 
+def build_collision_table():
+    global namecount
+    namecount = {}
+
+    for v in module.types.values():
+        name = _t(v[0])
+        namecount[name] = (namecount.get(name) or 0) + 1
+
 def c_enum(self, name):
     '''
     Exported function that handles enum declarations.
     '''
+
+    tname = _t(name)
+    if namecount[tname] > 1:
+        tname = _t(name + ('enum',))
+
     _h_setlevel(0)
     _h('')
-    _h('typedef enum %s {', _t(name))
+    _h('typedef enum %s {', tname)
 
     count = len(self.values)
 
@@ -232,7 +248,7 @@ def c_enum(self, name):
         comma = ',' if count > 0 else ''
         _h('    %s%s%s%s', _n(name + (enam,)).upper(), equals, eval, comma)
 
-    _h('} %s;', _t(name))
+    _h('} %s;', tname)
 
 def _c_type_setup(self, name, postfix):
     '''
diff --git a/src/xcb_auth.c b/src/xcb_auth.c
index b44855e..93a6f68 100644
--- a/src/xcb_auth.c
+++ b/src/xcb_auth.c
@@ -187,7 +187,7 @@ static int compute_auth(xcb_auth_info_t *info, Xauth *authptr, struct sockaddr *
             struct sockaddr_in6 *si6 = (struct sockaddr_in6 *) sockname;
             if(IN6_IS_ADDR_V4MAPPED(SIN6_ADDR(sockname)))
             {
-                APPEND(info->data, j, si6->sin6_addr.s6_addr[12]);
+                do_append(info->data, &j, &si6->sin6_addr.s6_addr[12], 4);
                 APPEND(info->data, j, si6->sin6_port);
             }
             else
@@ -243,7 +243,14 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
     int ret = 1;
 
     if (getpeername(fd, sockname, &socknamelen) == -1)
-        return 0;  /* can only authenticate sockets */
+    {
+        if (getsockname(fd, sockname, &socknamelen) == -1)
+            return 0;  /* can only authenticate sockets */
+        if (sockname->sa_family != AF_UNIX)
+            return 0;
+        /* Some systems like hpux or Hurd do not expose peer names
+         * for UNIX Domain Sockets.  We do not need it anyway.  */
+    }
 
     authptr = get_authptr(sockname, socknamelen, display);
     if (authptr == 0)
diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 5b097f7..251d62e 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -31,12 +31,16 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <netinet/in.h>
-#include <sys/select.h>
 #include <fcntl.h>
 #include <errno.h>
 
 #include "xcb.h"
 #include "xcbint.h"
+#if USE_POLL
+#include <poll.h>
+#else
+#include <sys/select.h>
+#endif
 
 typedef struct {
     uint8_t  status;
@@ -258,7 +262,11 @@ void _xcb_conn_shutdown(xcb_connection_t *c)
 int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
 {
     int ret;
+#if USE_POLL
+    struct pollfd fd;
+#else
     fd_set rfds, wfds;
+#endif
 
     /* If the thing I should be doing is already being done, wait for it. */
     if(count ? c->out.writing : c->in.reading)
@@ -267,20 +275,38 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
         return 1;
     }
 
+#if USE_POLL
+    memset(&fd, 0, sizeof(fd));
+    fd.fd = c->fd;
+    fd.events = POLLIN;
+#else
     FD_ZERO(&rfds);
     FD_SET(c->fd, &rfds);
+#endif
     ++c->in.reading;
 
+#if USE_POLL
+    if(count)
+    {
+        fd.events |= POLLOUT;
+        ++c->out.writing;
+    }
+#else
     FD_ZERO(&wfds);
     if(count)
     {
         FD_SET(c->fd, &wfds);
         ++c->out.writing;
     }
+#endif
 
     pthread_mutex_unlock(&c->iolock);
     do {
+#if USE_POLL
+    ret = poll(&fd, 1, -1);
+#else
 	ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+#endif
     } while (ret == -1 && errno == EINTR);
     if (ret < 0)
     {
@@ -291,10 +317,18 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
 
     if(ret)
     {
+#if USE_POLL
+        if((fd.revents & POLLIN) == POLLIN)
+#else
         if(FD_ISSET(c->fd, &rfds))
+#endif
             ret = ret && _xcb_in_read(c);
 
+#if USE_POLL
+        if((fd.revents & POLLOUT) == POLLOUT)
+#else
         if(FD_ISSET(c->fd, &wfds))
+#endif
             ret = ret && write_vec(c, vector, count);
     }
 
diff --git a/src/xcb_in.c b/src/xcb_in.c
index 212dc9a..26ab358 100644
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -30,12 +30,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <sys/select.h>
 #include <errno.h>
 
 #include "xcb.h"
 #include "xcbext.h"
 #include "xcbint.h"
+#if USE_POLL
+#include <poll.h>
+#else
+#include <sys/select.h>
+#endif
 
 #define XCB_ERROR 0
 #define XCB_REPLY 1
@@ -268,12 +272,22 @@ static int read_block(const int fd, void *buf, const ssize_t len)
             done += ret;
         if(ret < 0 && errno == EAGAIN)
         {
+#if USE_POLL
+            struct pollfd pfd;
+            pfd.fd = fd;
+            pfd.events = POLLIN;
+            pfd.revents = 0;
+            do {
+                ret = poll(&pfd, 1, -1);
+            } while (ret == -1 && errno == EINTR);
+#else
             fd_set fds;
             FD_ZERO(&fds);
             FD_SET(fd, &fds);
 	    do {
 		ret = select(fd + 1, &fds, 0, 0, 0);
 	    } while (ret == -1 && errno == EINTR);
+#endif
         }
         if(ret <= 0)
             return ret;
diff --git a/src/xcb_xid.c b/src/xcb_xid.c
index 7ff0c5f..3df5dbe 100644
--- a/src/xcb_xid.c
+++ b/src/xcb_xid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2004 Bart Massey and Jamey Sharp.
+/* Copyright (C) 2001-2008 Bart Massey and Jamey Sharp.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
 
 /* XID allocators. */
 
+#include <assert.h>
 #include <stdlib.h>
 #include "xcb.h"
 #include "xcbext.h"
@@ -39,21 +40,40 @@ uint32_t xcb_generate_id(xcb_connection_t *c)
     if(c->has_error)
         return -1;
     pthread_mutex_lock(&c->xid.lock);
-    if(c->xid.last == c->xid.max)
+    if(c->xid.last >= c->xid.max - c->xid.inc + 1)
     {
         xcb_xc_misc_get_xid_range_reply_t *range;
-        range = xcb_xc_misc_get_xid_range_reply(c, xcb_xc_misc_get_xid_range(c), 0);
-        if(!range)
-        {
-            pthread_mutex_unlock(&c->xid.lock);
-            return -1;
+        assert(c->xid.last == c->xid.max);
+        if (c->xid.last == 0) {
+            /* finish setting up initial range */
+            c->xid.max = c->setup->resource_id_mask;
+        } else {
+            /* check for extension */
+            const xcb_query_extension_reply_t *xc_misc_reply =
+              xcb_get_extension_data(c, &xcb_xc_misc_id);
+            if (!xc_misc_reply) {
+                pthread_mutex_unlock(&c->xid.lock);
+                return -1;
+            }
+            /* get new range */
+            range = xcb_xc_misc_get_xid_range_reply(c,
+                      xcb_xc_misc_get_xid_range(c), 0);
+            /* XXX The latter disjunct is what the server returns
+               when it is out of XIDs.  Sweet. */
+            if(!range || (range->start_id == 0 && range->count == 1))
+            {
+                pthread_mutex_unlock(&c->xid.lock);
+                return -1;
+            }
+            assert(range->count > 0 && range->start_id > 0);
+            c->xid.last = range->start_id;
+            c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
+            free(range);
         }
-        c->xid.last = range->start_id;
-        c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
-        free(range);
+    } else {
+        c->xid.last += c->xid.inc;
     }
     ret = c->xid.last | c->xid.base;
-    c->xid.last += c->xid.inc;
     pthread_mutex_unlock(&c->xid.lock);
     return ret;
 }
@@ -65,8 +85,8 @@ int _xcb_xid_init(xcb_connection_t *c)
     if(pthread_mutex_init(&c->xid.lock, 0))
         return 0;
     c->xid.last = 0;
+    c->xid.max = 0;
     c->xid.base = c->setup->resource_id_base;
-    c->xid.max = c->setup->resource_id_mask;
     c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);
     return 1;
 }


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libxcb.spec	25 Feb 2009 03:14:43 -0000	1.19
+++ libxcb.spec	13 Apr 2009 16:03:30 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@
 Source1:	pthread-stubs.pc.in
 
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
+Patch1:		libxcb-1.2-to-git-6e2e87d.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .pthread-stubs
+%patch1 -p1 -b .git
 
 %build
 autoreconf -v --install
@@ -87,6 +89,10 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 1.2-3
+- libxcb-1.2-to-git-6e2e87d.patch: Various updates from git, XID generation
+  being the most important.
+
 * Tue Feb 24 2009 Matthias Clasen <mclasen at redhat.com> 1.2-2
 - Make -doc noarch
 



From simo at fedoraproject.org  Mon Apr 13 16:04:47 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 13 Apr 2009 16:04:47 +0000 (UTC)
Subject: rpms/sssd/devel sssd.spec,1.4,1.5
Message-ID: <20090413160447.360F670124@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9138

Modified Files:
	sssd.spec 
Log Message:
* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-2
- Try to fix build adding automake as an explicit BuildRequire



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sssd.spec	13 Apr 2009 15:49:54 -0000	1.4
+++ sssd.spec	13 Apr 2009 16:04:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -26,6 +26,7 @@
 ### Build Dependencies ###
 
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: popt-devel
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
@@ -135,6 +136,9 @@
 fi
 
 %changelog
+* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-2
+- Try to fix build adding automake as an explicit BuildRequire
+
 * Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-1
 - Version 0.3.0
 - Provides file based configuration and lots of improvements



From cebbert at fedoraproject.org  Mon Apr 13 16:08:36 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 13 Apr 2009 16:08:36 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-iommu-fixes.patch, NONE, 1.1 kernel.spec,
	1.1319, 1.1320
Message-ID: <20090413160836.E8F9570124@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10677

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iommu-fixes.patch 
Log Message:
Copy Intel iommu fixes, backported from 2.6.30, from F-11 kernel.

linux-2.6-iommu-fixes.patch:

--- NEW FILE linux-2.6-iommu-fixes.patch ---
commit c065567f392e05f0fda406369e1c8969c4411c68
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 10 22:27:48 2009 -0700

    intel-iommu: Avoid panic() for DRHD at address zero.
    
    If the BIOS does something obviously stupid, like claiming that the
    registers for the IOMMU are at physical address zero, then print a nasty
    message and abort, rather than trying to set up the IOMMU and then later
    panicking.
    
    It's becoming more and more obvious that trusting this stuff to the BIOS
    was a mistake.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit e523b38e2f568af58baa13120a994cbf24e6dee0)

commit 1d748e6cec8936af4c7044bdb51593a3f3904239
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Mon Apr 6 13:30:01 2009 -0700

    intel-iommu: Fix oops in device_to_iommu() when devices not found.
    
    It's possible for a device in the drhd->devices[] array to be NULL if
    it wasn't found at boot time, which means we have to check for that
    case.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e)

commit 3bf17fdaaadea04d4d82be5930dff93ec737aeed
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Apr 4 00:39:25 2009 +0100

    intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
    
    When the DMAR table identifies that a PCI-PCI bridge belongs to a given
    IOMMU, that means that the bridge and all devices behind it should be
    associated with the IOMMU. Not just the bridge itself.
    
    This fixes the device_to_iommu() function accordingly.
    
    (It's broken if you have the same PCI bus numbers in multiple domains,
    but this function was always broken in that way; I'll be dealing with
    that later).
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit 924b6231edfaf1e764ffb4f97ea382bf4facff58)

commit 948852c81654aa8572a2bac1d2dfb1abfcc76ab2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 7 07:59:41 2009 -0700

    Fix build errors due to CONFIG_BRANCH_TRACER=y
    
    The code that enables branch tracing for all (non-constant) branches
    plays games with the preprocessor and #define's the C 'if ()' construct
    to do tracing.
    
    That's all fine, but it fails for some unusual but valid C code that is
    sometimes used in macros, notably by the intel-iommu code:
    
    	if (i=drhd->iommu, drhd->ignored) ..
    
    because now the preprocessor complains about multiple arguments to the
    'if' macro.
    
    So make the macro expansion of this particularly horrid trick use
    varargs, and handle the case of comma-expressions in if-statements.  Use
    another macro to do it cleanly in just one place.
    
    This replaces a patch by David (and acked by Steven) that did this all
    inside that one already-too-horrid macro.
    
    Tested-by: Ingo Molnar <mingo at elte.hu>
    Cc: David Woodhouse <dwmw2 at infradead.org>
    Cc: Steven Rostedt <rostedt at goodmis.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    (cherry picked from commit aeeae86859f4319de0a4946b44771d9926eeed54)

commit 484abc37905056cc7b90a51311e6589bacd9ed65
Author: Fenghua Yu <fenghua.yu at intel.com>
Date:   Fri Mar 27 14:22:42 2009 -0700

    Intel IOMMU Suspend/Resume Support - DMAR
    
    This patch implements the suspend and resume feature for Intel IOMMU
    DMAR. It hooks to kernel suspend and resume interface. When suspend happens, it
    saves necessary hardware registers. When resume happens, it restores the
    registers and restarts IOMMU by enabling translation, setting up root entry, and
    re-enabling queued invalidation.
    
    Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 85e4b00c9d0378d7c19510d7bac8d5834b58edea
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 10 15:15:05 2009 -0700

    Intel IOMMU Suspend/Resume Support - Queued Invalidation
    
    This patch supports queued invalidation suspend/resume.
    
    Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit eb4a52bc660ea835482c582eaaf4893742cbd160)

commit 28dde4ade0c005b78f0cd0bda03ed20fcdfc11ae
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 3 15:19:32 2009 +0100

    intel-iommu: Add for_each_iommu() and for_each_active_iommu() macros
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    (cherry picked from commit 8f912ba4d7cdaf7d31cf39fe5a9b7732308a256d)

commit b35948e3225618ab7c1c7700eae0c9f4565f9199
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:57 2009 -0700

    x86, dmar: start with sane state while enabling dma and interrupt-remapping
    
    Impact: cleanup/sanitization
    
    Start from a sane state while enabling dma and interrupt-remapping, by
    clearing the previous recorded faults and disabling previously
    enabled queued invalidation and interrupt-remapping.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit 1531a6a6b81a4e6f9eec9a5608758a6ea14b96e0)

commit 26c3c4ad26414ea9f66c56a27e394fc7ae937231
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:56 2009 -0700

    x86, dmar: routines for disabling queued invalidation and intr remapping
    
    Impact: new interfaces (not yet used)
    
    Routines for disabling queued invalidation and interrupt remapping.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit eba67e5da6e971993b2899d2cdf459ce77d3dbc5)

commit 1c2f1031da6024fee999d2b115e31b40ff449405
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:54 2009 -0700

    x86, dmar: move page fault handling code to dmar.c
    
    Impact: code movement
    
    Move page fault handling code to dmar.c
    This will be shared both by DMA-remapping and Intr-remapping code.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit 0ac2491f57af5644f88383d28809760902d6f4d7)
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 26c536b..e095037 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -31,6 +31,8 @@
 #include <linux/iova.h>
 #include <linux/intel-iommu.h>
 #include <linux/timer.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #undef PREFIX
 #define PREFIX "DMAR:"
@@ -170,12 +172,21 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
 	struct dmar_drhd_unit *dmaru;
 	int ret = 0;
 
+	drhd = (struct acpi_dmar_hardware_unit *)header;
+	if (!drhd->address) {
+		/* Promote an attitude of violence to a BIOS engineer today */
+		WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+		     dmi_get_system_info(DMI_BIOS_VENDOR),
+		     dmi_get_system_info(DMI_BIOS_VERSION),
+		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		return -ENODEV;
+	}
 	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
 	if (!dmaru)
 		return -ENOMEM;
 
 	dmaru->hdr = header;
-	drhd = (struct acpi_dmar_hardware_unit *)header;
 	dmaru->reg_base_addr = drhd->address;
 	dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */
 
@@ -748,14 +759,77 @@ int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
 }
 
 /*
+ * Disable Queued Invalidation interface.
+ */
+void dmar_disable_qi(struct intel_iommu *iommu)
+{
+	unsigned long flags;
+	u32 sts;
+	cycles_t start_time = get_cycles();
+
+	if (!ecap_qis(iommu->ecap))
+		return;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	sts =  dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	if (!(sts & DMA_GSTS_QIES))
+		goto end;
+
+	/*
+	 * Give a chance to HW to complete the pending invalidation requests.
+	 */
+	while ((readl(iommu->reg + DMAR_IQT_REG) !=
+		readl(iommu->reg + DMAR_IQH_REG)) &&
+		(DMAR_OPERATION_TIMEOUT > (get_cycles() - start_time)))
+		cpu_relax();
+
+	iommu->gcmd &= ~DMA_GCMD_QIE;
+
+	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl,
+		      !(sts & DMA_GSTS_QIES), sts);
+end:
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+/*
+ * Enable queued invalidation.
+ */
+static void __dmar_enable_qi(struct intel_iommu *iommu)
+{
+	u32 cmd, sts;
+	unsigned long flags;
+	struct q_inval *qi = iommu->qi;
+
+	qi->free_head = qi->free_tail = 0;
+	qi->free_cnt = QI_LENGTH;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	/* write zero to the tail reg */
+	writel(0, iommu->reg + DMAR_IQT_REG);
+
+	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));
+
+	cmd = iommu->gcmd | DMA_GCMD_QIE;
+	iommu->gcmd |= DMA_GCMD_QIE;
+	writel(cmd, iommu->reg + DMAR_GCMD_REG);
+
+	/* Make sure hardware complete it */
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);
+
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+/*
  * Enable Queued Invalidation interface. This is a must to support
  * interrupt-remapping. Also used by DMA-remapping, which replaces
  * register based IOTLB invalidation.
  */
 int dmar_enable_qi(struct intel_iommu *iommu)
 {
-	u32 cmd, sts;
-	unsigned long flags;
 	struct q_inval *qi;
 
 	if (!ecap_qis(iommu->ecap))
@@ -793,19 +867,218 @@ int dmar_enable_qi(struct intel_iommu *iommu)
 
 	spin_lock_init(&qi->q_lock);
 
-	spin_lock_irqsave(&iommu->register_lock, flags);
-	/* write zero to the tail reg */
-	writel(0, iommu->reg + DMAR_IQT_REG);
+	__dmar_enable_qi(iommu);
 
-	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));
+	return 0;
+}
 
-	cmd = iommu->gcmd | DMA_GCMD_QIE;
-	iommu->gcmd |= DMA_GCMD_QIE;
-	writel(cmd, iommu->reg + DMAR_GCMD_REG);
+/* iommu interrupt handling. Most stuff are MSI-like. */
 
-	/* Make sure hardware complete it */
-	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);
-	spin_unlock_irqrestore(&iommu->register_lock, flags);
+static const char *fault_reason_strings[] =
+{
+	"Software",
+	"Present bit in root entry is clear",
+	"Present bit in context entry is clear",
+	"Invalid context entry",
+	"Access beyond MGAW",
+	"PTE Write access is not set",
+	"PTE Read access is not set",
+	"Next page table ptr is invalid",
+	"Root table address invalid",
+	"Context table ptr is invalid",
+	"non-zero reserved fields in RTP",
+	"non-zero reserved fields in CTP",
+	"non-zero reserved fields in PTE",
+};
+#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
+
+const char *dmar_get_fault_reason(u8 fault_reason)
+{
+	if (fault_reason > MAX_FAULT_REASON_IDX)
+		return "Unknown";
+	else
+		return fault_reason_strings[fault_reason];
+}
+
+void dmar_msi_unmask(unsigned int irq)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	/* unmask it */
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(0, iommu->reg + DMAR_FECTL_REG);
+	/* Read a reg to force flush the post write */
+	readl(iommu->reg + DMAR_FECTL_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_mask(unsigned int irq)
+{
+	unsigned long flag;
+	struct intel_iommu *iommu = get_irq_data(irq);
+
+	/* mask it */
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
+	/* Read a reg to force flush the post write */
+	readl(iommu->reg + DMAR_FECTL_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_write(int irq, struct msi_msg *msg)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
+	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
+	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_read(int irq, struct msi_msg *msg)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
+	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
+	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
+		u8 fault_reason, u16 source_id, unsigned long long addr)
+{
+	const char *reason;
+
+	reason = dmar_get_fault_reason(fault_reason);
+
+	printk(KERN_ERR
+		"DMAR:[%s] Request device [%02x:%02x.%d] "
+		"fault addr %llx \n"
+		"DMAR:[fault reason %02d] %s\n",
+		(type ? "DMA Read" : "DMA Write"),
+		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
+		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+	return 0;
+}
+
+#define PRIMARY_FAULT_REG_LEN (16)
+irqreturn_t dmar_fault(int irq, void *dev_id)
+{
+	struct intel_iommu *iommu = dev_id;
+	int reg, fault_index;
+	u32 fault_status;
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+
+	/* TBD: ignore advanced fault log currently */
+	if (!(fault_status & DMA_FSTS_PPF))
+		goto clear_overflow;
+
+	fault_index = dma_fsts_fault_record_index(fault_status);
+	reg = cap_fault_reg_offset(iommu->cap);
+	while (1) {
+		u8 fault_reason;
+		u16 source_id;
+		u64 guest_addr;
+		int type;
+		u32 data;
+
+		/* highest 32 bits */
+		data = readl(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN + 12);
+		if (!(data & DMA_FRCD_F))
+			break;
+
+		fault_reason = dma_frcd_fault_reason(data);
+		type = dma_frcd_type(data);
+
+		data = readl(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN + 8);
+		source_id = dma_frcd_source_id(data);
+
+		guest_addr = dmar_readq(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN);
+		guest_addr = dma_frcd_page_addr(guest_addr);
+		/* clear the fault */
+		writel(DMA_FRCD_F, iommu->reg + reg +
+			fault_index * PRIMARY_FAULT_REG_LEN + 12);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+
+		dmar_fault_do_one(iommu, type, fault_reason,
+				source_id, guest_addr);
+
+		fault_index++;
+		if (fault_index > cap_num_fault_regs(iommu->cap))
+			fault_index = 0;
+		spin_lock_irqsave(&iommu->register_lock, flag);
+	}
+clear_overflow:
+	/* clear primary fault overflow */
+	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+	if (fault_status & DMA_FSTS_PFO)
+		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
+
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+	return IRQ_HANDLED;
+}
+
+int dmar_set_interrupt(struct intel_iommu *iommu)
+{
+	int irq, ret;
+
+	irq = create_irq();
+	if (!irq) {
+		printk(KERN_ERR "IOMMU: no free vectors\n");
+		return -EINVAL;
+	}
+
+	set_irq_data(irq, iommu);
+	iommu->irq = irq;
+
+	ret = arch_setup_dmar_msi(irq);
+	if (ret) {
+		set_irq_data(irq, NULL);
+		iommu->irq = 0;
+		destroy_irq(irq);
+		return 0;
+	}
+
+	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);
+	if (ret)
+		printk(KERN_ERR "IOMMU: can't request irq\n");
+	return ret;
+}
+
+/*
+ * Re-enable Queued Invalidation interface.
+ */
+int dmar_reenable_qi(struct intel_iommu *iommu)
+{
+	if (!ecap_qis(iommu->ecap))
+		return -ENOENT;
+
+	if (!iommu->qi)
+		return -ENOENT;
+
+	/*
+	 * First disable queued invalidation.
+	 */
+	dmar_disable_qi(iommu);
+	/*
+	 * Then enable queued invalidation again. Since there is no pending
+	 * invalidation requests now, it's safe to re-enable queued
+	 * invalidation.
+	 */
+	__dmar_enable_qi(iommu);
 
 	return 0;
 }
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index f3f6865..8e4ac13 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -36,6 +36,7 @@
 #include <linux/iova.h>
 #include <linux/iommu.h>
 #include <linux/intel-iommu.h>
+#include <linux/sysdev.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 #include "pci.h"
@@ -447,11 +448,17 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn)
 		if (drhd->ignored)
 			continue;
 
-		for (i = 0; i < drhd->devices_cnt; i++)
+		for (i = 0; i < drhd->devices_cnt; i++) {
 			if (drhd->devices[i] &&
 			    drhd->devices[i]->bus->number == bus &&
 			    drhd->devices[i]->devfn == devfn)
 				return drhd->iommu;
+			if (drhd->devices[i] &&
+			    drhd->devices[i]->subordinate &&
+			    drhd->devices[i]->subordinate->number <= bus &&
+			    drhd->devices[i]->subordinate->subordinate >= bus)
+				return drhd->iommu;
+		}
 
 		if (drhd->include_all)
 			return drhd->iommu;
@@ -1004,194 +1011,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
 	return 0;
 }
 
-/* iommu interrupt handling. Most stuff are MSI-like. */
-
-static const char *fault_reason_strings[] =
-{
-	"Software",
-	"Present bit in root entry is clear",
-	"Present bit in context entry is clear",
-	"Invalid context entry",
-	"Access beyond MGAW",
-	"PTE Write access is not set",
-	"PTE Read access is not set",
-	"Next page table ptr is invalid",
-	"Root table address invalid",
-	"Context table ptr is invalid",
-	"non-zero reserved fields in RTP",
-	"non-zero reserved fields in CTP",
-	"non-zero reserved fields in PTE",
-};
-#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
-
-const char *dmar_get_fault_reason(u8 fault_reason)
-{
-	if (fault_reason > MAX_FAULT_REASON_IDX)
-		return "Unknown";
-	else
-		return fault_reason_strings[fault_reason];
-}
-
-void dmar_msi_unmask(unsigned int irq)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	/* unmask it */
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(0, iommu->reg + DMAR_FECTL_REG);
-	/* Read a reg to force flush the post write */
-	readl(iommu->reg + DMAR_FECTL_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_mask(unsigned int irq)
-{
-	unsigned long flag;
-	struct intel_iommu *iommu = get_irq_data(irq);
-
-	/* mask it */
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
-	/* Read a reg to force flush the post write */
-	readl(iommu->reg + DMAR_FECTL_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_write(int irq, struct msi_msg *msg)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
-	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
-	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_read(int irq, struct msi_msg *msg)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
-	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
-	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-static int iommu_page_fault_do_one(struct intel_iommu *iommu, int type,
-		u8 fault_reason, u16 source_id, unsigned long long addr)
-{
-	const char *reason;
-
-	reason = dmar_get_fault_reason(fault_reason);
-
-	printk(KERN_ERR
-		"DMAR:[%s] Request device [%02x:%02x.%d] "
-		"fault addr %llx \n"
-		"DMAR:[fault reason %02d] %s\n",
-		(type ? "DMA Read" : "DMA Write"),
-		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
-		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
-	return 0;
-}
-
-#define PRIMARY_FAULT_REG_LEN (16)
-static irqreturn_t iommu_page_fault(int irq, void *dev_id)
-{
-	struct intel_iommu *iommu = dev_id;
-	int reg, fault_index;
-	u32 fault_status;
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
-
-	/* TBD: ignore advanced fault log currently */
-	if (!(fault_status & DMA_FSTS_PPF))
-		goto clear_overflow;
-
-	fault_index = dma_fsts_fault_record_index(fault_status);
-	reg = cap_fault_reg_offset(iommu->cap);
-	while (1) {
-		u8 fault_reason;
-		u16 source_id;
-		u64 guest_addr;
-		int type;
-		u32 data;
-
-		/* highest 32 bits */
-		data = readl(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN + 12);
-		if (!(data & DMA_FRCD_F))
-			break;
-
-		fault_reason = dma_frcd_fault_reason(data);
-		type = dma_frcd_type(data);
-
-		data = readl(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN + 8);
-		source_id = dma_frcd_source_id(data);
-
-		guest_addr = dmar_readq(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN);
-		guest_addr = dma_frcd_page_addr(guest_addr);
-		/* clear the fault */
-		writel(DMA_FRCD_F, iommu->reg + reg +
-			fault_index * PRIMARY_FAULT_REG_LEN + 12);
-
-		spin_unlock_irqrestore(&iommu->register_lock, flag);
-
-		iommu_page_fault_do_one(iommu, type, fault_reason,
-				source_id, guest_addr);
-
-		fault_index++;
-		if (fault_index > cap_num_fault_regs(iommu->cap))
-			fault_index = 0;
-		spin_lock_irqsave(&iommu->register_lock, flag);
-	}
-clear_overflow:
-	/* clear primary fault overflow */
-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
-	if (fault_status & DMA_FSTS_PFO)
-		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
-
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-	return IRQ_HANDLED;
-}
-
-int dmar_set_interrupt(struct intel_iommu *iommu)
-{
-	int irq, ret;
-
-	irq = create_irq();
-	if (!irq) {
-		printk(KERN_ERR "IOMMU: no free vectors\n");
-		return -EINVAL;
-	}
-
-	set_irq_data(irq, iommu);
-	iommu->irq = irq;
-
-	ret = arch_setup_dmar_msi(irq);
-	if (ret) {
-		set_irq_data(irq, NULL);
-		iommu->irq = 0;
-		destroy_irq(irq);
-		return 0;
-	}
-
-	/* Force fault register is cleared */
-	iommu_page_fault(irq, iommu);
-
-	ret = request_irq(irq, iommu_page_fault, 0, iommu->name, iommu);
-	if (ret)
-		printk(KERN_ERR "IOMMU: can't request irq\n");
-	return ret;
-}
 
 static int iommu_init_domains(struct intel_iommu *iommu)
 {
@@ -2043,11 +1862,40 @@ static int __init init_dmars(void)
 		}
 	}
 
+	/*
+	 * Start from the sane iommu hardware state.
+	 */
 	for_each_drhd_unit(drhd) {
 		if (drhd->ignored)
 			continue;
 
 		iommu = drhd->iommu;
+
+		/*
+		 * If the queued invalidation is already initialized by us
+		 * (for example, while enabling interrupt-remapping) then
+		 * we got the things already rolling from a sane state.
+		 */
+		if (iommu->qi)
+			continue;
+
+		/*
+		 * Clear any previous faults.
+		 */
+		dmar_fault(-1, iommu);
+		/*
+		 * Disable queued invalidation if supported and already enabled
+		 * before OS handover.
+		 */
+		dmar_disable_qi(iommu);
+	}
+
+	for_each_drhd_unit(drhd) {
+		if (drhd->ignored)
+			continue;
+
+		iommu = drhd->iommu;
+
 		if (dmar_enable_qi(iommu)) {
 			/*
 			 * Queued Invalidate not enabled, use Register Based
@@ -2707,6 +2555,150 @@ static void __init init_no_remapping_devices(void)
 	}
 }
 
+#ifdef CONFIG_SUSPEND
+static int init_iommu_hw(void)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+
+	for_each_active_iommu(iommu, drhd)
+		if (iommu->qi)
+			dmar_reenable_qi(iommu);
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu_flush_write_buffer(iommu);
+
+		iommu_set_root_entry(iommu);
+
+		iommu->flush.flush_context(iommu, 0, 0, 0,
+						DMA_CCMD_GLOBAL_INVL, 0);
+		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+						DMA_TLB_GLOBAL_FLUSH, 0);
+		iommu_disable_protect_mem_regions(iommu);
+		iommu_enable_translation(iommu);
+	}
+
+	return 0;
+}
+
+static void iommu_flush_all(void)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu;
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu->flush.flush_context(iommu, 0, 0, 0,
+						DMA_CCMD_GLOBAL_INVL, 0);
+		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+						DMA_TLB_GLOBAL_FLUSH, 0);
+	}
+}
+
+static int iommu_suspend(struct sys_device *dev, pm_message_t state)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+	unsigned long flag;
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu->iommu_state = kzalloc(sizeof(u32) * MAX_SR_DMAR_REGS,
+						 GFP_ATOMIC);
+		if (!iommu->iommu_state)
+			goto nomem;
+	}
+
+	iommu_flush_all();
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu_disable_translation(iommu);
+
+		spin_lock_irqsave(&iommu->register_lock, flag);
+
+		iommu->iommu_state[SR_DMAR_FECTL_REG] =
+			readl(iommu->reg + DMAR_FECTL_REG);
+		iommu->iommu_state[SR_DMAR_FEDATA_REG] =
+			readl(iommu->reg + DMAR_FEDATA_REG);
+		iommu->iommu_state[SR_DMAR_FEADDR_REG] =
+			readl(iommu->reg + DMAR_FEADDR_REG);
+		iommu->iommu_state[SR_DMAR_FEUADDR_REG] =
+			readl(iommu->reg + DMAR_FEUADDR_REG);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+	}
+	return 0;
+
+nomem:
+	for_each_active_iommu(iommu, drhd)
+		kfree(iommu->iommu_state);
+
+	return -ENOMEM;
+}
+
+static int iommu_resume(struct sys_device *dev)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+	unsigned long flag;
+
+	if (init_iommu_hw()) {
+		WARN(1, "IOMMU setup failed, DMAR can not resume!\n");
+		return -EIO;
+	}
+
+	for_each_active_iommu(iommu, drhd) {
+
+		spin_lock_irqsave(&iommu->register_lock, flag);
+
+		writel(iommu->iommu_state[SR_DMAR_FECTL_REG],
+			iommu->reg + DMAR_FECTL_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEDATA_REG],
+			iommu->reg + DMAR_FEDATA_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEADDR_REG],
+			iommu->reg + DMAR_FEADDR_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEUADDR_REG],
+			iommu->reg + DMAR_FEUADDR_REG);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+	}
+
+	for_each_active_iommu(iommu, drhd)
+		kfree(iommu->iommu_state);
+
+	return 0;
+}
+
+static struct sysdev_class iommu_sysclass = {
+	.name		= "iommu",
+	.resume		= iommu_resume,
+	.suspend	= iommu_suspend,
+};
+
+static struct sys_device device_iommu = {
+	.cls	= &iommu_sysclass,
+};
+
+static int __init init_iommu_sysfs(void)
+{
+	int error;
+
+	error = sysdev_class_register(&iommu_sysclass);
+	if (error)
+		return error;
+
+	error = sysdev_register(&device_iommu);
+	if (error)
+		sysdev_class_unregister(&iommu_sysclass);
+
+	return error;
+}
+
+#else
+static int __init init_iommu_sysfs(void)
+{
+	return 0;
+}
+#endif	/* CONFIG_PM */
+
 int __init intel_iommu_init(void)
 {
 	int ret = 0;
@@ -2742,6 +2734,7 @@ int __init intel_iommu_init(void)
 	init_timer(&unmap_timer);
 	force_iommu = 1;
 	dma_ops = &intel_dma_ops;
+	init_iommu_sysfs();
 
 	register_iommu(&intel_iommu_ops);
 
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index 45effc5..0a490fe 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -458,11 +458,55 @@ static int setup_intr_remapping(struct intel_iommu *iommu, int mode)
 	return 0;
 }
 
+/*
+ * Disable Interrupt Remapping.
+ */
+static void disable_intr_remapping(struct intel_iommu *iommu)
+{
+	unsigned long flags;
+	u32 sts;
+
+	if (!ecap_ir_support(iommu->ecap))
+		return;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	sts = dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	if (!(sts & DMA_GSTS_IRES))
+		goto end;
+
+	iommu->gcmd &= ~DMA_GCMD_IRE;
+	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+		      readl, !(sts & DMA_GSTS_IRES), sts);
+
+end:
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
 int __init enable_intr_remapping(int eim)
 {
 	struct dmar_drhd_unit *drhd;
 	int setup = 0;
 
+	for_each_drhd_unit(drhd) {
+		struct intel_iommu *iommu = drhd->iommu;
+
+		/*
+		 * Clear previous faults.
+		 */
+		dmar_fault(-1, iommu);
+
+		/*
+		 * Disable intr remapping and queued invalidation, if already
+		 * enabled prior to OS handover.
+		 */
+		disable_intr_remapping(iommu);
+
+		dmar_disable_qi(iommu);
+	}
+
 	/*
 	 * check for the Interrupt-remapping support
 	 */
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index d95da10..fd4b619 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -113,7 +113,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  * "Define 'is'", Bill Clinton
  * "Define 'if'", Steven Rostedt
  */
-#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :		\
+#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+#define __trace_if(cond) \
+	if (__builtin_constant_p((cond)) ? !!(cond) :			\
 	({								\
 		int ______r;						\
 		static struct ftrace_branch_data			\
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f284407..b967e93 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -24,6 +24,7 @@
 #include <linux/acpi.h>
 #include <linux/types.h>
 #include <linux/msi.h>
+#include <linux/irqreturn.h>
 
 #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
 struct intel_iommu;
@@ -44,6 +45,14 @@ extern struct list_head dmar_drhd_units;
 #define for_each_drhd_unit(drhd) \
 	list_for_each_entry(drhd, &dmar_drhd_units, list)
 
+#define for_each_active_iommu(i, drhd)					\
+	list_for_each_entry(drhd, &dmar_drhd_units, list)		\
+		if (i=drhd->iommu, drhd->ignored) {} else
+
+#define for_each_iommu(i, drhd)						\
+	list_for_each_entry(drhd, &dmar_drhd_units, list)		\
+		if (i=drhd->iommu, 0) {} else 
+
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
 
@@ -127,6 +136,7 @@ extern void dmar_msi_mask(unsigned int irq);
 extern void dmar_msi_read(int irq, struct msi_msg *msg);
 extern void dmar_msi_write(int irq, struct msi_msg *msg);
 extern int dmar_set_interrupt(struct intel_iommu *iommu);
+extern irqreturn_t dmar_fault(int irq, void *dev_id);
 extern int arch_setup_dmar_msi(unsigned int irq);
 
 extern int iommu_detected, no_iommu;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index d2e3cbf..6520e07 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -284,6 +284,14 @@ struct iommu_flush {
 		unsigned int size_order, u64 type, int non_present_entry_flush);
 };
 
+enum {
+	SR_DMAR_FECTL_REG,
+	SR_DMAR_FEDATA_REG,
+	SR_DMAR_FEADDR_REG,
+	SR_DMAR_FEUADDR_REG,
+	MAX_SR_DMAR_REGS
+};
+
 struct intel_iommu {
 	void __iomem	*reg; /* Pointer to hardware regs, virtual addr */
 	u64		cap;
@@ -304,6 +312,8 @@ struct intel_iommu {
 	struct iommu_flush flush;
 #endif
 	struct q_inval  *qi;            /* Queued invalidation info */
+	u32 *iommu_state; /* Store iommu states between suspend and resume.*/
+
 #ifdef CONFIG_INTR_REMAP
 	struct ir_table *ir_table;	/* Interrupt remapping info */
 #endif
@@ -321,6 +331,8 @@ extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev);
 extern int alloc_iommu(struct dmar_drhd_unit *drhd);
 extern void free_iommu(struct intel_iommu *iommu);
 extern int dmar_enable_qi(struct intel_iommu *iommu);
+extern void dmar_disable_qi(struct intel_iommu *iommu);
+extern int dmar_reenable_qi(struct intel_iommu *iommu);
 extern void qi_global_iec(struct intel_iommu *iommu);
 
 extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1319
retrieving revision 1.1320
diff -u -r1.1319 -r1.1320
--- kernel.spec	10 Apr 2009 21:25:58 -0000	1.1319
+++ kernel.spec	13 Apr 2009 16:08:33 -0000	1.1320
@@ -591,6 +591,9 @@
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ftrace.patch
 
+# Support suspend/resume, other crash fixes
+Patch30: linux-2.6-iommu-fixes.patch
+
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch81: linux-2.6-defaults-saner-vm-settings.patch
@@ -1091,6 +1094,9 @@
 ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-utrace-ftrace.patch
 
+# IOMMU fixes backported to 2.6.29
+ApplyPatch linux-2.6-iommu-fixes.patch
+
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1845,6 +1851,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-19
+- Copy Intel iommu fixes, backported from 2.6.30, from F-11 kernel.
+
 * Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-18
 - Only print ext4 allocator fallback warning once.
 



From lkundrak at fedoraproject.org  Mon Apr 13 16:09:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 16:09:41 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme/devel
	clearlooks-compact-gnome-theme.spec, 1.1, 1.2
Message-ID: <20090413160941.19FF970124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033

Modified Files:
	clearlooks-compact-gnome-theme.spec 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-2
- Require gtk-engines



Index: clearlooks-compact-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/devel/clearlooks-compact-gnome-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clearlooks-compact-gnome-theme.spec	13 Apr 2009 13:54:00 -0000	1.1
+++ clearlooks-compact-gnome-theme.spec	13 Apr 2009 16:09:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           clearlooks-compact-gnome-theme
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME Desktop theme optimized for small displays
 
 Group:          User Interface/Desktops
@@ -10,8 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# Just in case Clearlooks ever gets moved to another package
-Requires:       libclearlooks.so
+Requires:       gtk2-engines
 # Just for convenience
 Provides:       clearlooks-compact = %{version}-%{release}
 
@@ -47,6 +46,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-2
+- Require gtk-engines
+
 * Sat Apr 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-1
 - New upstream version
 



From wtogami at fedoraproject.org  Mon Apr 13 16:12:11 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 13 Apr 2009 16:12:11 +0000 (UTC)
Subject: rpms/perl-Finance-YahooQuote/devel .cvsignore, 1.2,
	1.3 perl-Finance-YahooQuote.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090413161211.9B89F70124@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11815

Modified Files:
	.cvsignore perl-Finance-YahooQuote.spec sources 
Log Message:
0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Dec 2006 07:04:13 -0000	1.2
+++ .cvsignore	13 Apr 2009 16:11:37 -0000	1.3
@@ -1 +1 @@
-Finance-YahooQuote-0.21.tar.gz
+Finance-YahooQuote-0.22.tar.gz


Index: perl-Finance-YahooQuote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel/perl-Finance-YahooQuote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Finance-YahooQuote.spec	26 Feb 2009 16:38:02 -0000	1.4
+++ perl-Finance-YahooQuote.spec	13 Apr 2009 16:11:37 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           perl-Finance-YahooQuote
-Version:        0.21
-Release:        4%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Perl interface to get stock quotes from Yahoo! Finance
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://search.cpan.org/~edd/Finance-YahooQuote/
-Source0:        http://search.cpan.org/CPAN/authors/id/E/ED/EDD/Finance-YahooQuote-0.21.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/E/ED/EDD/Finance-YahooQuote-0.22.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Warren Togami <wtogami at redhat.com> - 0.22-1
+- 0.22
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Dec 2006 07:04:13 -0000	1.2
+++ sources	13 Apr 2009 16:11:37 -0000	1.3
@@ -1 +1 @@
-844d26ef02f16216840aac5815a6a6a7  Finance-YahooQuote-0.21.tar.gz
+f38b620a7126be785442cda794d052ca  Finance-YahooQuote-0.22.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 13 16:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:14:03 +0000
Subject: [pkgdb] giflib ownership updated
Message-ID: <20090413161247.C322610F87B@bastion2.fedora.phx.redhat.com>

Package giflib in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/giflib



From pkgdb at fedoraproject.org  Mon Apr 13 16:14:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:14:12 +0000
Subject: [pkgdb] giflib ownership updated
Message-ID: <20090413161258.2585610F87E@bastion2.fedora.phx.redhat.com>

Package giflib in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/giflib



From spot at fedoraproject.org  Mon Apr 13 16:13:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 16:13:20 +0000 (UTC)
Subject: rpms/giflib/devel .cvsignore, 1.2, 1.3 giflib.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <20090413161320.676A670124@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/giflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12397

Modified Files:
	.cvsignore giflib.spec sources 
Log Message:
update to 4.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/giflib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 19:18:35 -0000	1.2
+++ .cvsignore	13 Apr 2009 16:13:13 -0000	1.3
@@ -1 +1 @@
-giflib-4.1.3.tar.bz2
+giflib-4.1.6.tar.bz2


Index: giflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giflib/devel/giflib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- giflib.spec	24 Feb 2009 21:25:40 -0000	1.10
+++ giflib.spec	13 Apr 2009 16:13:14 -0000	1.11
@@ -1,11 +1,10 @@
 Summary: Library for manipulating GIF format image files
 Name: giflib
-Version: 4.1.3
-Release: 10
+Version: 4.1.6
+Release: 1%{?dist}
 License: MIT
-URL: http://www.sf.net/projects/libungif/
-Source0: http://dl.sf.net/libungif/%{name}-%{version}.tar.bz2
-Patch0: giflib-hash64.patch
+URL: http://www.sf.net/projects/giflib/
+Source0: http://download.sourceforge.net/sourceforge/giflib/%{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXt-devel
@@ -54,7 +53,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .amd64
 %{__sed} -i 's/\r//' doc/lzgif.txt
 
 %build
@@ -100,6 +98,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1.6-1
+- update to 4.1.6
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/giflib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 19:18:35 -0000	1.2
+++ sources	13 Apr 2009 16:13:14 -0000	1.3
@@ -1 +1 @@
-22efc9599ccf91d288374dcf0679abf1  giflib-4.1.3.tar.bz2
+7125644155ae6ad33dbc9fc15a14735f  giflib-4.1.6.tar.bz2



From rdieter at fedoraproject.org  Mon Apr 13 16:13:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 13 Apr 2009 16:13:38 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.214,1.215
Message-ID: <20090413161338.87A9670124@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12867

Modified Files:
	kdepim.spec 
Log Message:
* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- drop extraneous BR's, including libmal-devel (not currently used)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kdepim.spec	6 Apr 2009 11:01:26 -0000	1.214
+++ kdepim.spec	13 Apr 2009 16:13:36 -0000	1.215
@@ -6,7 +6,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -31,23 +31,22 @@
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libassuan-devel
+BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
 # TODO: libmapi from http://www.openchange.org/
 #BuildRequires: libmapi-devel
 # Not used, has broken deps to boot -- Rex
 #BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
-BuildRequires: lockdev-devel
-%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12 libmal-devel >= 0.40}
+%if 0%{?_with_pilot_link:1}
+# libmal currently not used, recheck with kdepim-4.3
+#BuildRequirs: libmal-devel >= 0.40
+BuildRequires: pilot-link-devel >= 0.12
+%endif
 BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
-# these seem mostly bogus, not checked for, but linked nonetheless -- Rex
-BuildRequires: giflib-devel
-BuildRequires: openldap-devel
-BuildRequires: pcre-devel
-BuildRequires: libical-devel
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -188,6 +187,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- drop extraneous BR's, including libmal-devel (not currently used)
+
 * Mon Apr 06 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - apply upstream patch to fix crash in korganizer
 



From wtogami at fedoraproject.org  Mon Apr 13 16:15:36 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 13 Apr 2009 16:15:36 +0000 (UTC)
Subject: rpms/perl-IO-Socket-INET6/devel .cvsignore, 1.3,
	1.4 perl-IO-Socket-INET6.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20090413161536.61A6D70124@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13611

Modified Files:
	.cvsignore perl-IO-Socket-INET6.spec sources 
Log Message:
2.56



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Mar 2008 16:04:45 -0000	1.3
+++ .cvsignore	13 Apr 2009 16:15:04 -0000	1.4
@@ -1 +1 @@
-IO-Socket-INET6-2.54.tar.gz
+IO-Socket-INET6-2.56.tar.gz


Index: perl-IO-Socket-INET6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel/perl-IO-Socket-INET6.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-IO-Socket-INET6.spec	26 Feb 2009 18:23:55 -0000	1.7
+++ perl-IO-Socket-INET6.spec	13 Apr 2009 16:15:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-IO-Socket-INET6
-Version:        2.54
-Release:        2%{?dist}
+Version:        2.56
+Release:        1%{?dist}
 Summary:        Perl Object interface for AF_INET|AF_INET6 domain sockets
 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 13 2009 Warren Togami <wtogami at redhat.com> - 2.56-1
+- 2.56
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.54-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Mar 2008 16:04:45 -0000	1.3
+++ sources	13 Apr 2009 16:15:04 -0000	1.4
@@ -1 +1 @@
-f2e34c8a0d17c0bd63e1559e29de1676  IO-Socket-INET6-2.54.tar.gz
+24e31d757247893f5178e690be9b006f  IO-Socket-INET6-2.56.tar.gz



From avesh at fedoraproject.org  Mon Apr 13 16:17:18 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Mon, 13 Apr 2009 16:17:18 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6.21-nss-disabled.patch, NONE,
	1.1 openswan.spec, 1.73, 1.74
Message-ID: <20090413161719.0D56D70137@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14641

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6.21-nss-disabled.patch 
Log Message:
* Mon Apr 13 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-2
- Applied patch to support NSS, currently disabled due to
  dependency on rh bz #491693
- The patch also supports fips check integrity 
   (requires fipscheck-devel library)


openswan-2.6.21-nss-disabled.patch:

--- NEW FILE openswan-2.6.21-nss-disabled.patch ---
diff -urNp openswan-2.6.21-orig/include/certs.h openswan-2.6.21/include/certs.h
--- openswan-2.6.21-orig/include/certs.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/certs.h	2009-04-02 14:49:47.000000000 -0400
@@ -90,6 +90,12 @@ extern bool load_coded_file(const char *
 			    , int verbose
 			    , const char *type, chunk_t *blob, bool *pgp);
 
+#ifdef HAVE_LIBNSS
+extern bool load_cert_from_nss(bool forcedtype, const char *nssHostCertNickName, int verbose,
+                   const char *label, cert_t *cert);
+extern void load_authcerts_from_nss(const char *type, u_char auth_flags);
+#endif
+
 #endif /* _CERTS_H */
 
 /*
diff -urNp openswan-2.6.21-orig/include/constants.h openswan-2.6.21/include/constants.h
--- openswan-2.6.21-orig/include/constants.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/constants.h	2009-04-02 14:49:47.000000000 -0400
@@ -53,10 +53,10 @@ typedef int bool;
 #define dup_any(fd) ((fd) == NULL_FD? NULL_FD : dup(fd))
 #define close_any(fd) { if ((fd) != NULL_FD) { close(fd); (fd) = NULL_FD; } }
 
-
-/* Also comes in via <nspr4/prcpucfg.h> with USE_NSS */
-#ifndef BITS_PER_BYTE
-# define BITS_PER_BYTE	8
+#ifdef HAVE_LIBNSS
+#include <prcpucfg.h>
+#else
+#define BITS_PER_BYTE	8
 #endif
 #define BYTES_FOR_BITS(b)   (((b) + BITS_PER_BYTE - 1) / BITS_PER_BYTE)
 
diff -urNp openswan-2.6.21-orig/include/md5.h openswan-2.6.21/include/md5.h
--- openswan-2.6.21-orig/include/md5.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/md5.h	2009-04-02 14:49:47.000000000 -0400
@@ -62,11 +62,21 @@ These notices must be retained in any co
 documentation and/or software.
  */
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
+
 /* MD5 context. */
 typedef struct {
+#ifdef HAVE_LIBNSS
+  PK11Context* ctx_nss;
+#else
   UINT4 state[4];                                   /* state (ABCD) */
   UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
   unsigned char buffer[64];                         /* input buffer */
+#endif
 } MD5_CTX;
 
 void osMD5Init PROTO_LIST ((MD5_CTX *));
diff -urNp openswan-2.6.21-orig/include/oswconf.h openswan-2.6.21/include/oswconf.h
--- openswan-2.6.21-orig/include/oswconf.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/oswconf.h	2009-04-02 14:49:47.000000000 -0400
@@ -19,6 +19,11 @@
 
 #include "constants.h"
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
 struct paththing {
   char    *path;
   size_t   path_space;
@@ -50,10 +55,30 @@ struct osw_conf_options {
     char *ocspcerts_dir;          /* "/etc/ipsec.d/ocspcerts" */
 };
 
+#ifdef HAVE_LIBNSS
+typedef struct {
+    enum {
+    PW_NONE = 0,      /* no password */
+    PW_FROMFILE = 1,  /* password data in a text file */
+    PW_PLAINTEXT = 2, /* password data in the clear in memory buffer */
+    PW_EXTERNAL = 3   /* external source, user will be prompted */
+    } source ;
+    char *data;
+} secuPWData;
+#endif
+
+
 extern const struct osw_conf_options *osw_init_options(void);
 extern const struct osw_conf_options *osw_init_ipsecdir(const char *ipsec_dir);
 extern const struct osw_conf_options *osw_init_rootdir(const char *root_dir);
 
+
+#ifdef HAVE_LIBNSS
+extern secuPWData *osw_return_nss_password_file_info(void);
+extern char *getNSSPassword(PK11SlotInfo *slot, PRBool retry, void *arg);
+extern bool Pluto_IsFIPS(void);
+#endif
+
 #endif /* _OSW_ALLOC_H_ */
 
 /*
diff -urNp openswan-2.6.21-orig/include/pem.h openswan-2.6.21/include/pem.h
--- openswan-2.6.21-orig/include/pem.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/pem.h	2009-04-02 14:49:47.000000000 -0400
@@ -18,3 +18,6 @@
 
 extern err_t pemtobin(chunk_t *blob, prompt_pass_t *pass, const char* label
     , bool *pgp);
+
+extern void do_3des_nss(u_int8_t *buf, size_t buf_len
+	, u_int8_t *key, size_t key_size, u_int8_t *iv, bool enc);
diff -urNp openswan-2.6.21-orig/include/secrets.h openswan-2.6.21/include/secrets.h
--- openswan-2.6.21-orig/include/secrets.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/secrets.h	2009-04-02 14:49:47.000000000 -0400
@@ -19,6 +19,11 @@
 #include <gmp.h>    /* GNU MP library */
 #include "id.h"
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
 #ifndef SHARED_SECRETS_FILE
 # define SHARED_SECRETS_FILE  "/etc/ipsec.secrets"
 #endif
@@ -37,6 +42,9 @@ struct RSA_public_key
     MP_INT
 	n,	/* modulus: p * q */
 	e;	/* exponent: relatively prime to (p-1) * (q-1) [probably small] */
+#ifdef HAVE_LIBNSS
+    CERTCertificate *nssCert;
+#endif
 };
 
 struct RSA_private_key {
@@ -50,6 +58,10 @@ struct RSA_private_key {
 	dP,	/* first factor's exponent: (e^-1) mod (p-1) == d mod (p-1) */
 	dQ,	/* second factor's exponent: (e^-1) mod (q-1) == d mod (q-1) */
 	qInv;	/* (q^-1) mod p */
+#ifdef HAVE_LIBNSS
+    unsigned char ckaid[HMAC_BUFSIZE];  /*ckaid for use in NSS*/
+    unsigned int  ckaid_len;	
+#endif
 };
 
 extern void free_RSA_public_content(struct RSA_public_key *rsa);
@@ -133,6 +145,11 @@ extern void delete_public_keys(struct pu
 			       , enum pubkey_alg alg);
 extern void form_keyid(chunk_t e, chunk_t n, char* keyid, unsigned *keysize);
 
+#ifdef HAVE_LIBNSS
+extern void form_keyid_from_nss(SECItem e, SECItem n, char* keyid, unsigned *keysize);
+extern err_t extract_and_add_secret_from_nss_cert_file(struct RSA_private_key *rsak, char *nssHostCertNickName);
+#endif
+
 extern struct pubkey *reference_key(struct pubkey *pk);
 extern void unreference_key(struct pubkey **pkp);
 
diff -urNp openswan-2.6.21-orig/include/sha1.h openswan-2.6.21/include/sha1.h
--- openswan-2.6.21-orig/include/sha1.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/sha1.h	2009-04-02 14:49:47.000000000 -0400
@@ -15,7 +15,7 @@ By Steve Reid <steve at edmweb.com>
 
 typedef struct {
 #ifdef HAVE_LIBNSS
-PK11Context* DigestContext;
+    PK11Context* ctx_nss;
 #else
     u_int32_t state[5];
     u_int32_t count[2];
diff -urNp openswan-2.6.21-orig/lib/libcrypto/libmd5/Makefile openswan-2.6.21/lib/libcrypto/libmd5/Makefile
--- openswan-2.6.21-orig/lib/libcrypto/libmd5/Makefile	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/lib/libcrypto/libmd5/Makefile	2009-04-02 14:49:47.000000000 -0400
@@ -10,4 +10,9 @@ ONEFILE=md5.c
 LIBRARY=crypto/libmd5
 LIB=libmd5.a
 
+ifeq ($(USE_LIBNSS),true)
+CFLAGS+=-DHAVE_LIBNSS
+CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+endif
+
 include ${srcdir}../../Makefile.library
diff -urNp openswan-2.6.21-orig/lib/libcrypto/libmd5/md5.c openswan-2.6.21/lib/libcrypto/libmd5/md5.c
--- openswan-2.6.21-orig/lib/libcrypto/libmd5/md5.c	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/lib/libcrypto/libmd5/md5.c	2009-04-02 14:49:47.000000000 -0400
@@ -46,6 +46,11 @@ documentation and/or software.
 #include "md5.h"
 #include "oswendian.h" /* sets BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN */
 
+#ifdef HAVE_LIBNSS
+#include <pk11pub.h>
+#include "oswlog.h"
+#endif
[...5341 lines suppressed...]
@@ -0,0 +1,117 @@
+Title: Using NSS crypto library with Pluto (Openswan)
+Author: Avesh Agarwal email: avagarwa at redhat.com
+Version:0.0
+
+
+About NSS crypto library
+--------------------------
+Please visit http://www.mozilla.org/projects/security/pki/nss/
+ 
+NSS crypto library is user space library. It is only used with Pluto (user space IKE daemon) for cryptographic operations. When using NSS, it does not impact the way IPSEC kernel (KLIPS or NETKEY) works. The usefulness of using NSS lies in the fact that the secret information (like private keys or anything else) never comes out of NSS database.
+
+
+How to enable NSS crypto library with Openswan
+-----------------------------------------------
+Change the flag USE_LIBNSS in openswan/Makefile.inc to "true" before compilation
+
+
+Basic NSS tools required
+-------------------------
+certutil: To create/modify/delete NSS db, certificates etc. More description can be found at
+http://www.mozilla.org/projects/security/pki/nss/tools/certutil.html
+
+pk12util: To import/export certificates or keys in to/out of NSS db. More description can be found at
+http://www.mozilla.org/projects/security/pki/nss/tools/pk12util.html  
+
+modutil: To put NSS into FIPS mode. 
+http://www.mozilla.org/projects/security/pki/nss/tools/modutil.html
+
+
+Creating database before using NSS with Pluto (Openswan)
+--------------------------------------------------------
+You must create a NSS db before running pluto with NSS enabled. NSS db can be created as follows.
+
+certutil -N -d <path-to-ipsec.d- dir>/ipsec.d
+
+By default the path to ipsec.d is set to /etc/ipsec.d. 
+
+Without loss of generality, the further discussion is based on that the path to ipsec.d is "/etc/ipsec.d".
+
+
+NSS database password
+----------------------
+When creating a database, the certutil command also prompts for a password. It is upto the user to provide a password or not for the database.
+However, database password must be provided in FIPS mode. 
+
+
+About the password file "nsspassword"
+-------------------------------------
+If you create the database with a password, and want to run NSS in FIPS mode, you must create a password file with the name "nsspassword" in the /etc/ipsec.d before running pluto with NSS. The "nsspassword" file must contain the password you provided when creating NSS database. 
+
+Important thing to note: 
+i) You only need the "nsspassword" file if you run pluto in FIPS. In other way, if you run pluto in normal or NonFIPS mode and even if you create the NSS database with a password, you need not create a "nsspassword" file. 
+
+ii) If you create he "nsspassword" file, it must contain only the password nothing else.  
+
+
+Generating RSA keys when using NSS
+-----------------------------------
+You can still use ipsec newhostkey and ipsec rsasigkey tools for creating RSA keys. The only difference is that you need to provide a path to NSS db directory (or config directoty). Assuming that NSS db is is "/etc/ipsec.d", an example is as follows
+
+ipsec newhostkey --configdir /etc/ipsec.d [--password password] --output /etc/ipsec.d/ipsec.secrets 
+
+A password is only required if NSS database is used in FIPS mode. If you use NSS and create RSA keys (private/public), you will notice that the contents of the ipsec.secrets are different than what used to be before. 
+
+Public key information in ipsec.secrets is stored in the same way as before. However, all the fields of the Private key information contain just a similar ID. This ID is called CKA ID, which is used to locate private keys inside NSS database during the IKE negotiation.
+
+Important thing to note
+------------------------
+It means that ipsec.secrets does not contain any real private key information, as private key never comes out of NSS database. Therefore ipsec.secrets is not really a secret file anymore when using pluto with NSS. 
+
+ipsec.conf does not require any changes the way it is configured when using RSA sig keys with Pluto.
+
+
+Creating certificates with NSS
+-------------------------------
+i)To create a certificate authority (CA certficate):
+
+certutil -S -k rsa -n <ca-cert-nickname> -s "CN=ca-cert-common-name" -w 12 -d . -t "C,C,C" -x -d /etc/ipsec.d
+
+It creates a certificate with RSA keys (-k rsa) with the nick name "ca-cert-nickname", and with common name "ca-cert-common-name". The option "-w" specifies the certificates validy period. "-t" specifies the attributes of the certificate. "C" is require for creating a CA certificate. "-x" mean self signed. "-d" specifies the path of the database directory.
+
+Important thing to note: It is not a requirement to create the CA in NSS database. The CA certificate can be obtained from anywhere in the world.
+
+ii) To create a user certificate signed by the above CA
+
+certutil -S -k rsa -c <ca-cert-nickname> -n <user-cert-nickname> -s "CN=user-cet-common-name" -w 12 -t "u,u,u" -d /etc/ipsec.d 
+
+It creates a user cert with nick name "user-cert-nickname" with attributes "u,u,u" signed by the CA cert "ca-cert-name". 
+
+Important thing to note: You must provided a nick name when creating a user cert, because Pluto reads the user cert from the NSS database nased on the user cert's nickname. 
+
+
+Changes in the certitificates usage with Pluto
+------------------------------------------------
+1) ipsec.comf changes
+
+The only change is "leftcert" field must contain the nick name of the user cert. For example if the nickname of the user cert is "xyz", then it can be  "leftid=xyz".
+
+2) ipsec.secrets changes
+
+ : RSA <user-cert-nick-name> 
+
+You just need to provide the user cert's nick name. For example if the nickname of the user cert is "xyz", then
+
+ : RSA xyz 
+
+There is no need to provide private key file information or its password. 
+
+3) changes in the directories in /etc/ipsec.d/ (cacerts, certs, private)  
+i)You need not have "private" or "certs" directory.
+
+ii) If you obtain a CA certificate from outside, and it is not inside NSS database, then you need to put the certificate inside "cacerts" directory, so that Pluto can read it. If the CA certificate is created in the NSS database, or imported from outside inside the NSS database, you need not have "cacerts" directory,as Pluto can read the CA cert from the database.
+
+
+Things not supported
+---------------------
+PSK: It is not supported when using NSS, because it required both pluto peers to have a mutual keys created outside the NSS database. So It should not be configured with NSS. 
diff -urNp openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/local.conf openswan-2.6.21/testing/pluto/nss-examples/x509-nss/local.conf
--- openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/local.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.21/testing/pluto/nss-examples/x509-nss/local.conf	2009-04-02 14:49:47.000000000 -0400
@@ -0,0 +1,37 @@
+# /etc/ipsec.conf - Openswan IPsec configuration file
+
+version 2.0
+
+config setup
+        # put the logs in /tmp for the UMLs, so that we can operate
+        # without syslogd, which seems to break on UMLs
+        plutostderrlog=/tmp/pluto.log
+        plutorestartoncrash=false
+        dumpdir=/var/tmp
+
+# only used in x509-pluto-02
+conn north-east-x509-pluto-02
+        also=eastnet
+        also=northnet
+        # Left security gateway, subnet behind it, next hop toward right.
+        left=192.1.3.33
+        leftrsasigkey=%cert
+        leftnexthop=192.1.3.254
+	leftid="C=ca, ST=Ontario, O=Xelerance, L=Toronto, CN=north.testing.xelerance.com, E=testing at xelerance.com"
+	leftcert="user-cert-nick-name"
+        # Right security gateway, subnet behind it, next hop toward left.
+        right=192.1.2.23
+        rightnexthop=192.1.2.254
+        rightrsasigkey=%cert
+        auto=ignore
+
+conn northnet
+        leftsubnet=192.0.3.0/24
+
+include /etc/ipsec.d/ipsec.conf.common
+
+conn us
+        rightsubnet=192.0.2.0/24
+
+conn them
+        leftsubnet=192.0.1.0/24
diff -urNp openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/remote.conf openswan-2.6.21/testing/pluto/nss-examples/x509-nss/remote.conf
--- openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/remote.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.21/testing/pluto/nss-examples/x509-nss/remote.conf	2009-04-02 14:49:47.000000000 -0400
@@ -0,0 +1,37 @@
+# /etc/ipsec.conf - Openswan IPsec configuration file
+
+version 2.0
+
+config setup
+        # put the logs in /tmp for the UMLs, so that we can operate
+        # without syslogd, which seems to break on UMLs
+        plutostderrlog=/tmp/pluto.log
+        plutorestartoncrash=false
+        dumpdir=/var/tmp
+
+# only used in x509-pluto-02
+conn north-east-x509-pluto-02
+        also=eastnet
+        also=northnet
+        # Left security gateway, subnet behind it, next hop toward right.
+        left=192.1.2.33
+        leftrsasigkey=%cert
+        leftnexthop=192.1.2.254
+	leftid="C=ca, ST=Ontario, O=Xelerance, L=Toronto, CN=north.testing.xelerance.com, E=testing at xelerance.com"
+	leftcert="user-cert-nick-name"
+        # Right security gateway, subnet behind it, next hop toward left.
+        right=192.1.3.23
+        rightnexthop=192.1.3.254
+        rightrsasigkey=%cert
+        auto=ignore
+
+conn northnet
+        leftsubnet=192.0.2.0/24
+
+include /etc/ipsec.d/ipsec.conf.common
+
+conn us
+        rightsubnet=192.0.3.0/24
+
+conn them
+        leftsubnet=192.0.1.0/24


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- openswan.spec	30 Mar 2009 18:59:50 -0000	1.73
+++ openswan.spec	13 Apr 2009 16:16:48 -0000	1.74
@@ -1,8 +1,10 @@
+%define USE_FIPSCHECK 0
+
 Summary: Openswan IPSEC implementation
 Name: openswan
 Version: 2.6.21
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -14,6 +16,7 @@
 Patch3: openswan-2.6-selinux.patch
 Patch4: openswan-2.6.16-initscript-correction.patch
 Patch5: openswan-2.6.21-gcc44.patch
+Patch6: openswan-2.6.21-nss-disabled.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +27,10 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+%if %{USE_FIPSCHECK}
+BuildRequires: fipscheck-devel
+%endif
+
 Provides: ipsec-userland = %{version}-%{release}
 #unless kernel with NETKEY supplies this capability we cannot do this
 #Requires: ipsec-kernel
@@ -62,6 +69,7 @@
 %patch3 -p1 -b .selinux
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 
@@ -77,6 +85,16 @@
   programs
 FS=$(pwd)
 
+%if %{USE_FIPSCHECK}
+# Add generation of HMAC checksums of the final stripped binaries
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/rsasigkey \
+    fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/pluto \
+%{nil}
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -151,6 +169,12 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Apr 13 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-2
+- Applied patch to support NSS, currently disabled due to
+  dependency on rh bz #491693
+- The patch also supports fips check integrity 
+   (requires fipscheck-devel library)
+
 * Mon Mar 30 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-1
 - new upstream release
 - Fix for CVE-2009-0790 DPD crasher



From lkundrak at fedoraproject.org  Mon Apr 13 16:17:35 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 16:17:35 +0000 (UTC)
Subject: rpms/perl-KinoSearch/devel .cvsignore, 1.3, 1.4 perl-KinoSearch.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090413161735.01FC370137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-KinoSearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14757

Modified Files:
	.cvsignore perl-KinoSearch.spec sources 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.165-1
- Upstream applied our PowerPC patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-KinoSearch/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2009 19:49:00 -0000	1.3
+++ .cvsignore	13 Apr 2009 16:17:04 -0000	1.4
@@ -1 +1 @@
-KinoSearch-0.164.tar.gz
+KinoSearch-0.165.tar.gz


Index: perl-KinoSearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-KinoSearch/devel/perl-KinoSearch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-KinoSearch.spec	30 Mar 2009 19:49:00 -0000	1.5
+++ perl-KinoSearch.spec	13 Apr 2009 16:17:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-KinoSearch
-Version:        0.164
+Version:        0.165
 Release:        1%{?dist}
 Summary:        Search engine library
 # ApacheLicense2.0.txt included is included just becuase the upstream
@@ -11,7 +11,6 @@
 URL:            http://search.cpan.org/dist/KinoSearch/
 Source0:        http://www.cpan.org/authors/id/C/CR/CREAMYG/KinoSearch-%{version}.tar.gz
 Source1:        LICENSING.mbox
-Patch0:         KinoSearch-0.164-ppc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Compress::Zlib)
 BuildRequires:  perl(ExtUtils::CBuilder)
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q -n KinoSearch-%{version}
-%patch0 -p1 -b .ppc
 cp %{SOURCE1} LICENSING.mbox
 
 %build
@@ -64,6 +62,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.165-1
+- Upstream applied our PowerPC patch
+
 * Sun Mar 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.164-1
 - Update to 0.164
 - Add missing Pod::Coverage BRs (Robert Scheck)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-KinoSearch/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2009 19:49:00 -0000	1.3
+++ sources	13 Apr 2009 16:17:04 -0000	1.4
@@ -1 +1 @@
-9fd011170455974544af83005f0cb350  KinoSearch-0.164.tar.gz
+c191fd096aaf4d6219bbb36812551693  KinoSearch-0.165.tar.gz



From wtogami at fedoraproject.org  Mon Apr 13 16:20:45 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 13 Apr 2009 16:20:45 +0000 (UTC)
Subject: rpms/perl-Socket6/devel .cvsignore, 1.3, 1.4 perl-Socket6.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <20090413162045.8617670124@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Socket6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16655

Modified Files:
	.cvsignore perl-Socket6.spec sources 
Log Message:
0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Socket6/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Apr 2008 16:56:29 -0000	1.3
+++ .cvsignore	13 Apr 2009 16:20:14 -0000	1.4
@@ -1 +1 @@
-Socket6-0.20.tar.gz
+Socket6-0.23.tar.gz


Index: perl-Socket6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Socket6/devel/perl-Socket6.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Socket6.spec	27 Feb 2009 01:32:37 -0000	1.9
+++ perl-Socket6.spec	13 Apr 2009 16:20:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Socket6
-Version:        0.20
-Release:        2%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 Summary:        IPv6 related part of the C socket.h defines and structure manipulators
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Warren Togami <wtogami at redhat.com> - 0.23-1
+- 0.23
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Socket6/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Apr 2008 16:56:29 -0000	1.3
+++ sources	13 Apr 2009 16:20:14 -0000	1.4
@@ -1 +1 @@
-c66d1b99cabe964573ece3c3b684c23c  Socket6-0.20.tar.gz
+2c02adb13c449d48d232bb704ddbd492  Socket6-0.23.tar.gz



From lkundrak at fedoraproject.org  Mon Apr 13 16:31:14 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 16:31:14 +0000 (UTC)
Subject: rpms/clearlooks-compact-gnome-theme/F-10
	clearlooks-compact-gnome-theme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090413163114.1A63C70124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21004

Modified Files:
	.cvsignore sources 
Added Files:
	clearlooks-compact-gnome-theme.spec 
Log Message:
Import into f10


--- NEW FILE clearlooks-compact-gnome-theme.spec ---
Name:           clearlooks-compact-gnome-theme
Version:        1.5
Release:        2%{?dist}
Summary:        GNOME Desktop theme optimized for small displays

Group:          User Interface/Desktops
License:        LGPLv2+
URL:            http://martin.ankerl.com/2007/11/04/clearlooks-compact-gnome-theme/
Source0:        http://martin.ankerl.com/files/ClearlooksCompact-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       gtk2-engines
# Just for convenience
Provides:       clearlooks-compact = %{version}-%{release}

%description
Compact version of Clearlooks theme, especially great on small screens like
the Eee PC, or for intense applications like Eclipse.


%prep
%setup -q -c
# Backup file, apparently forgotten there by upstream
rm Clearlooks\ Compact/gtk-2.0/gtkrc~


%build


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/themes
cp -ap Clearlooks\ Compact $RPM_BUILD_ROOT%{_datadir}/themes/
rm -f $RPM_BUILD_ROOT%{_datadir}/themes/Clearlooks\ Compact/COPYING


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_datadir}/themes/*
%doc Clearlooks\ Compact/COPYING


%changelog
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-2
- Require gtk-engines

* Sat Apr 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5-1
- New upstream version

* Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.4-1
- Versioning change (no epoch bump since noone uses this now anyways :)
- Upstream included our theme.index, drop it
- Upstream clarified the license

* Thu Apr 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 20080411-1
- Initial package creation


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:24:41 -0000	1.1
+++ .cvsignore	13 Apr 2009 16:30:43 -0000	1.2
@@ -0,0 +1 @@
+ClearlooksCompact-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clearlooks-compact-gnome-theme/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:24:41 -0000	1.1
+++ sources	13 Apr 2009 16:30:43 -0000	1.2
@@ -0,0 +1 @@
+9d6f111db273f065cfd2e3ee5c390eac  ClearlooksCompact-1.5.tar.bz2



From limb at fedoraproject.org  Mon Apr 13 16:45:32 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 13 Apr 2009 16:45:32 +0000 (UTC)
Subject: rpms/gallery2/devel .cvsignore, 1.7, 1.8 gallery2.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090413164532.9899670124@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25820

Modified Files:
	.cvsignore gallery2.spec sources 
Log Message:
Multiple packaging fixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Dec 2008 20:37:34 -0000	1.7
+++ .cvsignore	13 Apr 2009 16:45:00 -0000	1.8
@@ -1 +1,2 @@
-gallery-2.3-full.zip
+gallery-2.3-jarless.tar.gz
+gallery-jar-sources-2.3.tar.gz


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gallery2.spec	24 Feb 2009 19:22:20 -0000	1.21
+++ gallery2.spec	13 Apr 2009 16:45:00 -0000	1.22
@@ -7,20 +7,26 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
-Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
-# Tarball from upstream will not work - must use SVN snapshot
-#Source0: gallery2-svn20080618.tar.bz2
+#Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
+# Tarball from upstream contains prebuilt jars, some of which are not redistributable.
+# Generated from gallery-2.3-full.zip
+# unzip gallery-2.3-full.zip
+# find . -name '*.jar' | xargs rm -f
+# tar -czf gallery-2.3-jarless.tar.gz gallery2/
+Source0: gallery-2.3-jarless.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
+Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
 # Subversion needed to generate manifest
 #BuildRequires: perl-String-CRC32, subversion
-
+BuildRequires: java-1.6.0-openjdk-devel
+Obsoletes: gallery2-panorama <= 2.3-4
 #Patch0: gallery2-perl-location.patch
 
 %package albumselect
@@ -216,12 +222,6 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-
-%package panorama
-Summary: Panorama module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
-
 %package password
 Summary: Password module for Gallery 2
 Group: Applications/Publishing
@@ -553,9 +553,6 @@
 %description notification
 Gallery 2 module - Email notification
 
-%description panorama
-Gallery 2 module - View wide jpeg/gif images in a java applet viewer 
-
 %description password
 Gallery 2 module - password - CVS only
 
@@ -681,6 +678,10 @@
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
+tar -xf %{SOURCE4}
+cd gallery-jar-sources-2.3
+sh build-jars.sh
+cd ..
 
 %build
 #pushd lib/tools/bin
@@ -696,6 +697,13 @@
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
+#Panorama needs an unredistributable jar, so we'll remove the files.
+rm -rf modules/panorama
+#install built jars
+install -m 0644 gallery-jar-sources-2.3/jars/remote/* modules/remote/applets
+install -m 0644 gallery-jar-sources-2.3/jars/slideshowapplet/* modules/slideshowapplet/applets
+install -m 0644 gallery-jar-sources-2.3/jars/uploadapplet/* modules/uploadapplet/applets
+rm -rf gallery-jar-sources-2.3
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -705,8 +713,6 @@
 #remove bundled Smarty.
 rm -rf lib/smarty
 cp -pr * ${RPM_BUILD_ROOT}%{installprefix}/gallery2
-#use system Smarty
-ln -s ../../php/Smarty ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/smarty
 install -m 0644 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/README.fedora
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/premerge-messages.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/update-all-translations.pl
@@ -723,9 +729,17 @@
 ln -s ../../..%{g2confdir}/config.php ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
 chmod 644 ${RPM_BUILD_ROOT}%{g2confdir}/config.php
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%pretrans
+#symlink to system smarty
+if [ -d /usr/share/gallery2/lib/smarty ]; then
+  rm -rf /usr/share/gallery2/lib/smarty
+  ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
+fi
+
 %post
 if [[ -f %{installprefix}/gallery2/config.php.rpmnew ]]
 then
@@ -923,10 +937,6 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/notification/
 
-%files panorama
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/panorama/
-
 %files password
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/password/
@@ -1088,6 +1098,12 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-5
+- Remove .jar files and build from source BZ464566.
+- Modify source to remove two non-redistutable .jar files.
+- Dropped panorama module as a result.
+- Fix symlink/dir issues, BZ 484240.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Dec 2008 20:37:34 -0000	1.9
+++ sources	13 Apr 2009 16:45:00 -0000	1.10
@@ -1 +1,2 @@
-59aa83d15989fdd05c623ef3563b800f  gallery-2.3-full.zip
+f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
+01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz



From ausil at fedoraproject.org  Mon Apr 13 16:53:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 13 Apr 2009 16:53:05 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sunleo/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xorg-x11-drv-sunleo.spec, 1.2, 1.3
Message-ID: <20090413165306.0951D70138@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29126

Modified Files:
	.cvsignore sources xorg-x11-drv-sunleo.spec 
Log Message:
update git snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2008 04:56:41 -0000	1.2
+++ .cvsignore	13 Apr 2009 16:52:33 -0000	1.3
@@ -1 +1 @@
-xf86-video-sunleo-20080526.tar.bz2
+xf86-video-sunleo-20090413.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2008 04:56:41 -0000	1.2
+++ sources	13 Apr 2009 16:52:33 -0000	1.3
@@ -1 +1 @@
-f9d73488aacbac2c831ee02a13cf895f  xf86-video-sunleo-20080526.tar.bz2
+b50f804139aad08b7d5111b98d1d6dc0  xf86-video-sunleo-20090413.tar.bz2


Index: xorg-x11-drv-sunleo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel/xorg-x11-drv-sunleo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-sunleo.spec	26 Feb 2009 11:16:43 -0000	1.2
+++ xorg-x11-drv-sunleo.spec	13 Apr 2009 16:52:33 -0000	1.3
@@ -1,12 +1,12 @@
 %define tarball xf86-video-sunleo
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir       %{moduledir}/drivers
-%define gitdate 20080526
+%define gitdate 20090413
 
 Summary:   Xorg X11 sunleo video driver
 Name:      xorg-x11-drv-sunleo
 Version:   1.1.0
-Release:   5%{?dist}.git%{gitdate}
+Release:   6%{?dist}.git%{gitdate}
 URL:       http://www.x.org
 #Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source0:   %{tarball}-%{gitdate}.tar.bz2
@@ -51,6 +51,9 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Mon Apr 13 2009 Dennis Gilmore <dennis at ausil.us> - 1.1.0-6.git20090413
+- update git snpashot
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-5.git20080526
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Apr 13 16:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:58:14 +0000
Subject: [pkgdb] libmng ownership updated
Message-ID: <20090413165812.B7AE810F85A@bastion2.fedora.phx.redhat.com>

Package libmng in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmng



From pkgdb at fedoraproject.org  Mon Apr 13 16:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 16:59:34 +0000
Subject: [pkgdb] libmng ownership updated
Message-ID: <20090413165818.2CCAC10F87D@bastion2.fedora.phx.redhat.com>

Package libmng in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmng



From spot at fedoraproject.org  Mon Apr 13 16:58:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 16:58:38 +0000 (UTC)
Subject: rpms/libmng/devel .cvsignore, 1.10, 1.11 libmng.spec, 1.33,
	1.34 sources, 1.10, 1.11
Message-ID: <20090413165838.CFD4E70124@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libmng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31367

Modified Files:
	.cvsignore libmng.spec sources 
Log Message:
1.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmng/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Mar 2005 17:13:35 -0000	1.10
+++ .cvsignore	13 Apr 2009 16:58:07 -0000	1.11
@@ -1,3 +1 @@
-libmng-1.0.7.tar.gz
-libmng-1.0.8.tar.gz
-libmng-1.0.9.tar.gz
+libmng-1.0.10.tar.gz


Index: libmng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libmng.spec	25 Feb 2009 16:18:58 -0000	1.33
+++ libmng.spec	13 Apr 2009 16:58:07 -0000	1.34
@@ -1,11 +1,11 @@
 Name: libmng
-Version: 1.0.9
-Release: 8
+Version: 1.0.10
+Release: 1%{?dist}
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 # This is a common zlib variant.
 License: zlib
-Source: http://dl.sf.net/libmng/%{name}-%{version}.tar.gz
+Source: http://dl.sf.net/sourceforge/libmng/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
@@ -65,6 +65,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.10-1
+- update to 1.0.10
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -163,7 +166,7 @@
 * Thu May  3 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.1-1
 - 1.0.1
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - remove bogus symlink trick
 
 * Mon Feb 26 2001 Bernhard Rosenkraenzer <bero at redhat.com>
@@ -181,4 +184,3 @@
 
 * Tue Sep 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - initial rpm
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmng/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Mar 2005 17:13:35 -0000	1.10
+++ sources	13 Apr 2009 16:58:07 -0000	1.11
@@ -1 +1 @@
-ff1205ef70855a75c098ea09690413c6  libmng-1.0.9.tar.gz
+a464ae7d679781beebdf7440d144b7bd  libmng-1.0.10.tar.gz



From lkundrak at fedoraproject.org  Mon Apr 13 17:00:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 17:00:41 +0000 (UTC)
Subject: rpms/links/devel links-2.2-nss.patch, NONE, 1.1 links.desktop, NONE,
	1.1 links.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413170041.9746B70124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/links/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32161

Modified Files:
	.cvsignore sources 
Added Files:
	links-2.2-nss.patch links.desktop links.spec 
Log Message:
Initial import

links-2.2-nss.patch:

--- NEW FILE links-2.2-nss.patch ---
Support SSL/TLS by the means of NSS.

Lubomir Rintel <lkundrak at v3.sk>

diff -up links-2.2/configure.in.nss links-2.2/configure.in
--- links-2.2/configure.in.nss	2008-08-01 00:03:04.000000000 +0200
+++ links-2.2/configure.in	2009-04-03 08:18:16.847916975 +0200
@@ -355,8 +355,34 @@ AC_CHECK_LIB(dl, dlopen)
 AC_ARG_WITH(ssl, [  --with-ssl(=directory)  enable SSL support], [if test "$withval" = no; then disable_ssl=yes; else ssld="$withval"; fi])
 CPPFLAGS_X="$CPPFLAGS"
 LIBS_X="$LIBS"
-cf_result=no
 if test -z "$disable_ssl"; then
+
+	AC_PROG_CXX
+	PKG_CHECK_MODULES(NSS,nss,
+		CPPFLAGS="$CPPFLAGS $NSS_CFLAGS $NSS_CFLAGS"
+
+		if test -f "${ssld}"; then
+			CPPFLAGS="$CPPFLAGS -I${ssld}"
+		fi
+
+		AC_CHECK_LIB(nss_compat_ossl, SSL_CTX_new, [
+			LIBS="$LIBS -lnss_compat_ossl"
+			cf_result="yes"
+		], cf_result="no")
+	,cf_result="no")
+
+	if test "$cf_result" != yes; then
+		if test "$withval" = yes; then
+			AC_MSG_ERROR("NSS Compat not found")
+		fi
+	        CPPFLAGS="$CPPFLAGS_X"
+        	LIBS="$LIBS_X"
+	else
+		AC_DEFINE([HAVE_NSS_COMPAT], 1, [Include NSS support])
+		AC_DEFINE(HAVE_SSL)
+	fi
+
+	if test "$cf_result" != yes; then
 	PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
 	if test "$pkgconfig_openssl" = "yes"; then
 		AC_MSG_CHECKING([for OpenSSL])
@@ -395,6 +421,7 @@ if test -z "$disable_ssl"; then
 	else
 		AC_DEFINE(HAVE_SSL)
 	fi
+	fi # No NSS Compat
 fi
 cf_have_ssl=$cf_result;
 #endif
diff -up links-2.2/connect.c.nss links-2.2/connect.c
--- links-2.2/connect.c.nss	2008-08-01 00:02:23.000000000 +0200
+++ links-2.2/connect.c	2009-04-03 08:15:17.812914880 +0200
@@ -151,7 +151,9 @@ void ssl_want_read(struct connection *c)
 
 	set_timeout(c);
 
+#ifndef HAVE_NSS_COMPAT
 	if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
+#endif
 	switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
 		case SSL_ERROR_NONE:
 			c->newconn = NULL;
@@ -318,7 +320,9 @@ void connected(struct connection *c)
 	if (c->ssl) {
 		c->ssl = getSSL();
 		SSL_set_fd(c->ssl, *b->sock);
+#ifndef HAVE_NSS_COMPAT
 		if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
+#endif
 		switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
 			case SSL_ERROR_WANT_READ:
 				setcstate(c, S_SSL_NEG);
diff -up links-2.2/links.h.nss links-2.2/links.h
--- links-2.2/links.h.nss	2008-08-01 00:02:29.000000000 +0200
+++ links-2.2/links.h	2009-04-03 08:15:17.818912636 +0200
@@ -144,9 +144,13 @@ x #endif*/
 #include <utime.h>
 
 #ifdef HAVE_SSL
+#ifdef HAVE_NSS_COMPAT
+#include <nss_compat_ossl/nss_compat_ossl.h>
+#else
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
 #endif
+#endif
 
 #if defined(G) 
 #if defined(HAVE_PNG_H)


--- NEW FILE links.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Links
Comment=Simple Web Browser
Exec=links2 -g
Icon=links
Categories=Network;WebBrowser;
Type=Application


--- NEW FILE links.spec ---
Name:           links
Version:        2.2
Release:        7%{?dist}
Summary:        Web browser running in both graphics and text mode

Group:          Applications/Internet
License:        GPLv2+
URL:            http://links.twibright.com/
Source0:        http://links.twibright.com/download/%{name}-%{version}.tar.bz2
Source1:        links.desktop
Patch0:         links-2.2-nss.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libtiff-devel
BuildRequires:  bzip2-devel
BuildRequires:  zlib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gpm-devel
BuildRequires:  libX11-devel
BuildRequires:  autoconf automake
BuildRequires:  nss-devel
BuildRequires:  nss_compat_ossl-devel

Requires(preun): %{_sbindir}/alternatives
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives

Provides:       webclient
Provides:       text-www-browser


%description
Links is a web browser capable of running in either graphics or text mode.
It provides a pull-down menu system, renders complex pages, has partial HTML
4.0 support (including tables, frames and support for multiple character sets
and UTF-8), supports color and monochrome terminals and allows horizontal
scrolling.


%prep
%setup -q
%patch0 -p1 -b .nss


%build
iconv -f ISO-8859-1 -t UTF-8 AUTHORS >converted.AUTHORS
touch -r AUTHORS converted.AUTHORS
mv converted.AUTHORS AUTHORS

autoreconf -i
%configure --enable-graphics
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
mv $RPM_BUILD_ROOT/%{_bindir}/links $RPM_BUILD_ROOT/%{_bindir}/links2
mv $RPM_BUILD_ROOT/%{_mandir}/man1/links.1 $RPM_BUILD_ROOT/%{_mandir}/man1/links2.1
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
install -D -p Links_logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/links.png

# Alternatives cruft
touch $RPM_BUILD_ROOT%{_bindir}/links
touch $RPM_BUILD_ROOT%{_mandir}/man1/links.1.gz


%clean
rm -rf $RPM_BUILD_ROOT


%postun
[ $1 = 0 ] && exit 0
[ $(readlink %{_sysconfdir}/alternatives/links) = %{_bindir}/links2 ] &&
        %{_sbindir}/alternatives --set links %{_bindir}/links2
exit 0


%preun
[ $1 = 0 ] || exit 0
%{_sbindir}/alternatives --remove links %{_bindir}/links2


%post
%{_sbindir}/alternatives \
        --install %{_bindir}/links links %{_bindir}/links2 80 \
        --slave %{_mandir}/man1/links.1.gz links-man %{_mandir}/man1/links2.1.gz
[ $(readlink %{_sysconfdir}/alternatives/links) = %{_bindir}/links2 ] &&
        %{_sbindir}/alternatives --set links %{_bindir}/links2
exit 0


%files
%defattr(-,root,root,-)
%doc doc/* AUTHORS BUGS KEYS TODO README COPYING
%{_bindir}/links2
%{_mandir}/man1/links2.1*
%{_datadir}/pixmaps/links.png
%{_datadir}/applications/links.desktop
%ghost %verify(not md5 size mtime) %{_bindir}/links
%ghost %verify(not md5 size mtime) %{_mandir}/man1/links.1.gz


%changelog
* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-7
- removing unnecessary BuildConflicts

* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-6
- Cosmetic fixes
- Ship license

* Fri Apr 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-5
- Add SSL/TLS support by the means of NSS
- Add web browser provides

* Thu Apr 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-4
- Do not silence make
- Use bundled icon, place it in pixmaps directory
- Adjust summary, description and style
- Remove useless configure parameters
- Include X11 support
- Adjust menu entry text
- Add alternatives support

* Mon Nov 10 2008 johnhford at gmail.com - 2.2-3
- Do not mutilate timestamps on AUTHORS
- Removed vendor from desktop-file-install
- No longer gzipping manpage

* Mon Nov 10 2008 John Ford <johnhford.gmail at com> 2.2-2
- Modified %%build to ensure shared libraries are used
- Added missing requirements (desktop-file-utils)
* Sat Nov 08 2008 John Ford <johnhford.gmail at com> 2.2-1
- Initial Submission



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/links/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:45:29 -0000	1.1
+++ .cvsignore	13 Apr 2009 17:00:11 -0000	1.2
@@ -0,0 +1 @@
+links-2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/links/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:45:29 -0000	1.1
+++ sources	13 Apr 2009 17:00:11 -0000	1.2
@@ -0,0 +1 @@
+bf5b20529a2a811701c5af52b28ebdd4  links-2.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Apr 13 17:02:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 17:02:44 +0000
Subject: [pkgdb] ImageMagick ownership updated
Message-ID: <20090413170128.2031E10F85A@bastion2.fedora.phx.redhat.com>

Package ImageMagick in Fedora 10 was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Mon Apr 13 17:01:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 17:01:33 +0000
Subject: [pkgdb] ImageMagick ownership updated
Message-ID: <20090413170134.19AED10F87C@bastion2.fedora.phx.redhat.com>

Package ImageMagick in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From sindrepb at fedoraproject.org  Mon Apr 13 17:09:24 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon, 13 Apr 2009 17:09:24 +0000 (UTC)
Subject: rpms/solfege/devel .cvsignore, 1.8, 1.9 solfege.spec, 1.20,
	1.21 sources, 1.8, 1.9
Message-ID: <20090413170925.0150F70124@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2848

Modified Files:
	.cvsignore solfege.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Apr 2009 13:44:19 -0000	1.8
+++ .cvsignore	13 Apr 2009 17:09:19 -0000	1.9
@@ -1 +1 @@
-solfege-3.14.1.tar.gz
+solfege-3.14.2.tar.gz


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/solfege.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- solfege.spec	11 Apr 2009 15:29:30 -0000	1.20
+++ solfege.spec	13 Apr 2009 17:09:20 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		solfege
-Version:	3.14.1       
-Release:	3%{?dist}
+Version:	3.14.2      
+Release:	1%{?dist}
 Summary:	Music education software
 
 Group:		Applications/Multimedia
@@ -8,8 +8,6 @@
 URL:		http://www.solfege.org/
 Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Source1:	solfege.sh.in
-#don't require X to build from Tom Cato Amundsen, to be merged upstream
-Patch0:         solfege-%{version}-no-x.patch
 #make sure desktop file is sane, don't use extension without path in Icon=
 Patch1:         solfege-%{version}-desktop.patch
 
@@ -30,7 +28,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 %patch1 -p0
 
 #preserve timestamps
@@ -89,6 +86,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.2-1
+- New upstream release
+- No-X patch merged upstream, remove it.
+
 * Sat Apr 11 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 3.14.1-2
 - Don't depend on lilypond
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Apr 2009 13:44:19 -0000	1.8
+++ sources	13 Apr 2009 17:09:20 -0000	1.9
@@ -1 +1 @@
-bb7720a9c847232fad6c8cd462fa1dcc  solfege-3.14.1.tar.gz
+d3b342867f8f7d7e8768bd81656559f4  solfege-3.14.2.tar.gz



From simo at fedoraproject.org  Mon Apr 13 17:11:41 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 13 Apr 2009 17:11:41 +0000 (UTC)
Subject: rpms/sssd/devel sssd.spec,1.5,1.6
Message-ID: <20090413171141.A5E1170124@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3915

Modified Files:
	sssd.spec 
Log Message:
Some more build requires



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sssd.spec	13 Apr 2009 16:04:16 -0000	1.5
+++ sssd.spec	13 Apr 2009 17:11:39 -0000	1.6
@@ -26,7 +26,6 @@
 ### Build Dependencies ###
 
 BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: popt-devel
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
@@ -38,6 +37,10 @@
 BuildRequires: pam-devel
 BuildRequires: nss-devel
 BuildRequires: nspr-devel
+BuildRequires: pcre-devel
+BuildRequires: zlib-devel
+BuildRequires: automake
+BuildRequires: libtool
 
 %description
 Provides a set of daemons to manage access to remote directories and



From ausil at fedoraproject.org  Mon Apr 13 17:13:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 13 Apr 2009 17:13:08 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sunleo/devel xorg-x11-drv-sunleo.spec, 1.3,
	1.4 xorg-x11-drv-sunleo-ALLOCATE_LOCAL.patch, 1.1, NONE
Message-ID: <20090413171308.C6A3D70124@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4433

Modified Files:
	xorg-x11-drv-sunleo.spec 
Removed Files:
	xorg-x11-drv-sunleo-ALLOCATE_LOCAL.patch 
Log Message:
remove unnedded xorg-x11-drv-sunleo-ALLOCATE_LOCAL.patch patch
cvs: ----------------------------------------------------------------------



Index: xorg-x11-drv-sunleo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel/xorg-x11-drv-sunleo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-sunleo.spec	13 Apr 2009 16:52:33 -0000	1.3
+++ xorg-x11-drv-sunleo.spec	13 Apr 2009 17:13:07 -0000	1.4
@@ -11,7 +11,6 @@
 #Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source0:   %{tarball}-%{gitdate}.tar.bz2
 Source1:   xorg-x11-drv-sunleo-git-checkout.sh
-Patch0:    xorg-x11-drv-sunleo-ALLOCATE_LOCAL.patch
 
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -29,7 +28,6 @@
 
 %prep
 %setup -q -n %{tarball}-%{gitdate}
-%patch0 -p1 
 
 %build
 ./autogen.sh
@@ -51,6 +49,9 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Mon Apr 13 2009 Dennis Gilmore <dennis at ausil.us> - 1.1.0-7.git20090413
+- remove no longer needed patch
+
 * Mon Apr 13 2009 Dennis Gilmore <dennis at ausil.us> - 1.1.0-6.git20090413
 - update git snpashot
 


--- xorg-x11-drv-sunleo-ALLOCATE_LOCAL.patch DELETED ---



From mclasen at fedoraproject.org  Mon Apr 13 17:14:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 17:14:13 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.88, 1.89 gedit.spec, 1.190,
	1.191 sources, 1.90, 1.91
Message-ID: <20090413171413.CBD9E70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5045

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	17 Mar 2009 02:21:07 -0000	1.88
+++ .cvsignore	13 Apr 2009 17:13:39 -0000	1.89
@@ -1 +1 @@
-gedit-2.26.0.tar.bz2
+gedit-2.26.1.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- gedit.spec	17 Mar 2009 02:21:07 -0000	1.190
+++ gedit.spec	13 Apr 2009 17:13:39 -0000	1.191
@@ -17,7 +17,7 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.26.0
+Version: 	2.26.1
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -225,6 +225,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gedit/2.26/gedit-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	17 Mar 2009 02:21:07 -0000	1.90
+++ sources	13 Apr 2009 17:13:39 -0000	1.91
@@ -1 +1 @@
-577b30e6f17f6dce0af7be3e522d6058  gedit-2.26.0.tar.bz2
+ced9cdd3da86cbc8ed353f7ebd3c398f  gedit-2.26.1.tar.bz2



From rdieter at fedoraproject.org  Mon Apr 13 17:14:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 13 Apr 2009 17:14:13 +0000 (UTC)
Subject: rpms/amarok/EL-5 amarok-1.4.10-wikipedia.patch, NONE,
	1.1 amarok.spec, 1.83, 1.84
Message-ID: <20090413171413.E169E70138@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5170

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-wikipedia.patch 
Log Message:
* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
- fix wikipedia access


amarok-1.4.10-wikipedia.patch:

--- NEW FILE amarok-1.4.10-wikipedia.patch ---
diff -up amarok-1.4.10/amarok/src/contextbrowser.cpp.wikipedia amarok-1.4.10/amarok/src/contextbrowser.cpp
--- amarok-1.4.10/amarok/src/contextbrowser.cpp.wikipedia	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/contextbrowser.cpp	2009-04-13 12:09:53.000000000 -0500
@@ -4189,7 +4189,7 @@ ContextBrowser::wikiResult( KIO::Job* jo
     }
 
     // Ok lets remove the top and bottom parts of the page
-    m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
+    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\">" ) );
     m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
     // Adding back license information
     m_wiki += copyright;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- amarok.spec	12 Jan 2009 15:16:11 -0000	1.83
+++ amarok.spec	13 Apr 2009 17:13:42 -0000	1.84
@@ -31,7 +31,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -46,6 +46,8 @@
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
 Patch100:   amarok-1.4.10-aa_security.patch
+# fix wikipedia, see also https://bugs.edge.launchpad.net/ubuntu/+source/amarok/+bug/316140
+Patch101:   amarok-1.4.10-wikipedia.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -150,6 +152,7 @@
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
 %patch100 -p4 -b .aa_security
+%patch101 -p1 -b .wikipedia
 
 
 %build
@@ -311,6 +314,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
+- fix wikipedia access
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
 - backport security patch
 



From linville at fedoraproject.org  Mon Apr 13 17:17:20 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 13 Apr 2009 17:17:20 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1530,1.1531
Message-ID: <20090413171720.BEFD770124@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6605

Modified Files:
	kernel.spec 
Log Message:
Remove back-port iwlwifi rfkill while device down patches (#495003)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1530
retrieving revision 1.1531
diff -u -r1.1530 -r1.1531
--- kernel.spec	11 Apr 2009 05:53:06 -0000	1.1530
+++ kernel.spec	13 Apr 2009 17:16:49 -0000	1.1531
@@ -661,7 +661,6 @@
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-Patch685: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch700: linux-2.6-dma-debug-fixes.patch
 
@@ -1280,9 +1279,6 @@
 ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 
-# fix locking in ipw3945 conf_tx callback
-ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
-
 # Fix up DMA debug code
 ApplyPatch linux-2.6-dma-debug-fixes.patch
 
@@ -1922,6 +1918,9 @@
 # and build.
 
 %changelog
+* Mon Apr 13 2009 John W. Linville <linville at redhat.com>
+- Remove back-port iwlwifi rfkill while device down patches (#495003)
+
 * Fri Apr 10 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Fix suspend/resume with Intel IOMMU, handle devices behind PCI-PCI
   bridges, cope with BIOS claiming IOMMU is at address zero.



From linville at fedoraproject.org  Mon Apr 13 17:17:33 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 13 Apr 2009 17:17:33 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch,
	1.1, NONE
Message-ID: <20090413171733.99ED170124@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6972

Removed Files:
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
Log Message:
remove unused patch


--- linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch DELETED ---



From ausil at fedoraproject.org  Mon Apr 13 17:19:56 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 13 Apr 2009 17:19:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sunleo/devel xorg-x11-drv-sunleo.spec,1.4,1.5
Message-ID: <20090413171956.EAC1C70124@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7588

Modified Files:
	xorg-x11-drv-sunleo.spec 
Log Message:
actually bump teh release



Index: xorg-x11-drv-sunleo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunleo/devel/xorg-x11-drv-sunleo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-sunleo.spec	13 Apr 2009 17:13:07 -0000	1.4
+++ xorg-x11-drv-sunleo.spec	13 Apr 2009 17:19:26 -0000	1.5
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 sunleo video driver
 Name:      xorg-x11-drv-sunleo
 Version:   1.1.0
-Release:   6%{?dist}.git%{gitdate}
+Release:   7%{?dist}.git%{gitdate}
 URL:       http://www.x.org
 #Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source0:   %{tarball}-%{gitdate}.tar.bz2



From rdieter at fedoraproject.org  Mon Apr 13 17:20:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 13 Apr 2009 17:20:52 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok-1.4.10-wikipedia.patch, NONE, 1.1 amarok.spec,
	1.114, 1.115
Message-ID: <20090413172052.E8C5770124@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8140

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-wikipedia.patch 
Log Message:
* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
- fix wikipedia access


amarok-1.4.10-wikipedia.patch:

--- NEW FILE amarok-1.4.10-wikipedia.patch ---
diff -up amarok-1.4.10/amarok/src/contextbrowser.cpp.wikipedia amarok-1.4.10/amarok/src/contextbrowser.cpp
--- amarok-1.4.10/amarok/src/contextbrowser.cpp.wikipedia	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/contextbrowser.cpp	2009-04-13 12:09:53.000000000 -0500
@@ -4189,7 +4189,7 @@ ContextBrowser::wikiResult( KIO::Job* jo
     }
 
     // Ok lets remove the top and bottom parts of the page
-    m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
+    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\">" ) );
     m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
     // Adding back license information
     m_wiki += copyright;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- amarok.spec	12 Jan 2009 14:52:33 -0000	1.114
+++ amarok.spec	13 Apr 2009 17:20:50 -0000	1.115
@@ -31,7 +31,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -46,6 +46,8 @@
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
 Patch100:   amarok-1.4.10-aa_security.patch
+# fix wikipedia, see also https://bugs.edge.launchpad.net/ubuntu/+source/amarok/+bug/316140
+Patch101:   amarok-1.4.10-wikipedia.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -53,6 +55,8 @@
 BuildRequires:  gettext
 %{?_with_helix:BuildRequires:  HelixPlayer}
 BuildRequires:  kdelibs%{?kde3}-devel
+# workaround missing dep on rhel5
+BuildRequires:  libutempter-devel
 %if 0%{?konq}
 BuildRequires:  kdebase%{?kde3}-devel
 %else
@@ -148,6 +152,7 @@
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
 %patch100 -p4 -b .aa_security
+%patch101 -p1 -b .wikipedia
 
 
 %build
@@ -309,6 +314,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
+- fix wikipedia access
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
 - backport security patch
 



From mclasen at fedoraproject.org  Mon Apr 13 17:21:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 17:21:42 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.47, 1.48 sources, 1.47, 1.48 vino.spec,
	1.93, 1.94
Message-ID: <20090413172142.400BA70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8073

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	17 Mar 2009 03:49:11 -0000	1.47
+++ .cvsignore	13 Apr 2009 17:21:11 -0000	1.48
@@ -1 +1 @@
-vino-2.26.0.tar.bz2
+vino-2.26.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	17 Mar 2009 03:49:11 -0000	1.47
+++ sources	13 Apr 2009 17:21:11 -0000	1.48
@@ -1 +1 @@
-7a10464824d8446411b90c162d34401e  vino-2.26.0.tar.bz2
+f6f5122b0644eb72b4cfaf202b3c8b1e  vino-2.26.1.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- vino.spec	17 Mar 2009 03:49:11 -0000	1.93
+++ vino.spec	13 Apr 2009 17:21:11 -0000	1.94
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.26/%{name}-%{version}.tar.bz2
@@ -108,6 +108,10 @@
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/vino/2.26/vino-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From spot at fedoraproject.org  Mon Apr 13 17:26:15 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 17:26:15 +0000 (UTC)
Subject: rpms/ImageMagick/devel .cvsignore, 1.25, 1.26 ImageMagick.spec, 1.89,
	1.90 sources, 1.25, 1.26
Message-ID: <20090413172615.37AE070124@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10809

Modified Files:
	.cvsignore ImageMagick.spec sources 
Log Message:
6.5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	9 Mar 2009 11:06:50 -0000	1.25
+++ .cvsignore	13 Apr 2009 17:25:44 -0000	1.26
@@ -1 +1 @@
-ImageMagick-6.4.9-6.tar.bz2
+ImageMagick-6.5.1-2.tar.bz2


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ImageMagick.spec	13 Mar 2009 10:57:42 -0000	1.89
+++ ImageMagick.spec	13 Apr 2009 17:25:44 -0000	1.90
@@ -1,17 +1,15 @@
-%define VER 6.4.9
-%define Patchlevel 6
+%define VER 6.5.1
+%define Patchlevel 2
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
 Url:            http://www.imagemagick.org/
 Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
 Patch1:         ImageMagick-6.4.0-multilib.patch
-Patch2:         ImageMagick-6.4.9-6-undef-warning.patch
-Patch3:         ImageMagick-6.4.9-6-perl-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -130,8 +128,6 @@
 %prep
 %setup -q -n %{name}-%{VER}-%{Patchlevel}
 %patch1 -p1 -b .multilib
-%patch2 -p1
-%patch3 -p1
 sed -i 's/libltdl.la/libltdl.so/g' configure
 iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp
 touch -r README.txt README.txt.tmp
@@ -305,6 +301,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 6.5.1.2-1
+- update to 6.5.1-2
+
 * Fri Mar 13 2009 Hans de Goede <hdegoede at redhat.com> 6.4.9.6-2
 - Fix undefined warning in magick-type.h (#489453)
 - Do not link PerlMagick against system ImageMagick, but against the just


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	9 Mar 2009 11:06:50 -0000	1.25
+++ sources	13 Apr 2009 17:25:44 -0000	1.26
@@ -1 +1 @@
-d65a4cd3cf103d49085a55c90c871854  ImageMagick-6.4.9-6.tar.bz2
+ad7d28ccef6ba3ea7bb44039b3ff5048  ImageMagick-6.5.1-2.tar.bz2



From linville at fedoraproject.org  Mon Apr 13 17:27:56 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 13 Apr 2009 17:27:56 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1206.2.59, 1.1206.2.60
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch,
	1.1.2.1, NONE
Message-ID: <20090413172756.DF42570124@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11431

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
Log Message:
Remove iwlwifi: remove implicit direct scan


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.59
retrieving revision 1.1206.2.60
diff -u -r1.1206.2.59 -r1.1206.2.60
--- kernel.spec	7 Apr 2009 19:02:31 -0000	1.1206.2.59
+++ kernel.spec	13 Apr 2009 17:27:25 -0000	1.1206.2.60
@@ -656,8 +656,7 @@
 Patch685: linux-2.6-rtl8187b-tx-status-feedback.patch
 Patch686: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch687: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-Patch688: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
-Patch689: linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
+Patch688: linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1309,9 +1308,6 @@
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 
-# fix locking in ipw3945 conf_tx callback
-ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
-
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1979,6 +1975,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 13 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.59
+- Remove iwlwifi: remove implicit direct scan
+
 * Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.58
 - iwlwifi: remove implicit direct scan
 


--- linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch DELETED ---



From mclasen at fedoraproject.org  Mon Apr 13 17:30:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 17:30:37 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 vinagre.spec, 1.43, 1.44
Message-ID: <20090413173037.3627F70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9492

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	17 Mar 2009 03:51:50 -0000	1.24
+++ .cvsignore	13 Apr 2009 17:30:06 -0000	1.25
@@ -1 +1 @@
-vinagre-2.26.0.tar.bz2
+vinagre-2.26.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	17 Mar 2009 03:51:50 -0000	1.24
+++ sources	13 Apr 2009 17:30:06 -0000	1.25
@@ -1 +1 @@
-6930bec2968c96dfb3407d6492ae42d4  vinagre-2.26.0.tar.bz2
+1ff7756444f85320565c606c9c8aa5d5  vinagre-2.26.1.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- vinagre.spec	17 Mar 2009 03:51:50 -0000	1.43
+++ vinagre.spec	13 Apr 2009 17:30:06 -0000	1.44
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.26.0
+Version:	2.26.1
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
@@ -122,6 +122,10 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/vinagre/2.26/vinagre-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From linville at fedoraproject.org  Mon Apr 13 17:31:15 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 13 Apr 2009 17:31:15 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1320, 1.1321
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch,
	1.2, NONE
Message-ID: <20090413173115.13BC970124@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12484

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
Log Message:
Remove iwl3945: rely on priv->lock to protect priv access


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1320
retrieving revision 1.1321
diff -u -r1.1320 -r1.1321
--- kernel.spec	13 Apr 2009 16:08:33 -0000	1.1320
+++ kernel.spec	13 Apr 2009 17:30:44 -0000	1.1321
@@ -638,7 +638,6 @@
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-Patch685: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1231,9 +1230,6 @@
 ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 
-# fix locking in ipw3945 conf_tx callback
-ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1851,6 +1847,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 13 2009 John W. Linville <linville at redhat.com>  2.6.29.1-20
+- Remove iwl3945: rely on priv->lock to protect priv access
+
 * Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-19
 - Copy Intel iommu fixes, backported from 2.6.30, from F-11 kernel.
 


--- linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch DELETED ---



From lkundrak at fedoraproject.org  Mon Apr 13 17:35:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 17:35:03 +0000 (UTC)
Subject: rpms/links/devel links-2.2-ssl-verify.patch, NONE, 1.1 links.spec,
	1.1, 1.2
Message-ID: <20090413173504.1295F70124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/links/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13774

Modified Files:
	links.spec 
Added Files:
	links-2.2-ssl-verify.patch 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-8
- Enable SSL certificates verification


links-2.2-ssl-verify.patch:

--- NEW FILE links-2.2-ssl-verify.patch ---
Fix a security issue -- links would not verify SSL and TLS
certificates, rendering SSL support practically useless.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510417

Lubomir Rintel <lkundrak at v3.sk>

diff -up links-2.2/connect.c.ssl-verify links-2.2/connect.c
--- links-2.2/connect.c.ssl-verify	2009-04-13 19:28:13.076133802 +0200
+++ links-2.2/connect.c	2009-04-13 19:27:34.467258505 +0200
@@ -319,6 +319,8 @@ void connected(struct connection *c)
 #ifdef HAVE_SSL
 	if (c->ssl) {
 		c->ssl = getSSL();
+		if (!getenv("UNSAFE_SSL"))
+			SSL_set_verify(c->ssl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
 		SSL_set_fd(c->ssl, *b->sock);
 #ifndef HAVE_NSS_COMPAT
 		if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;


Index: links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/links/devel/links.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- links.spec	13 Apr 2009 17:00:11 -0000	1.1
+++ links.spec	13 Apr 2009 17:34:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           links
 Version:        2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Web browser running in both graphics and text mode
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://links.twibright.com/download/%{name}-%{version}.tar.bz2
 Source1:        links.desktop
 Patch0:         links-2.2-nss.patch
+Patch1:         links-2.2-ssl-verify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpng-devel
@@ -42,6 +43,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nss
+%patch1 -p1 -b .verify-ssl
 
 
 %build
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-8
+- Enable SSL certificates verification
+
 * Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-7
 - removing unnecessary BuildConflicts
 



From pkgdb at fedoraproject.org  Mon Apr 13 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 17:38:56 +0000
Subject: [pkgdb] ImageMagick ownership updated
Message-ID: <20090413173856.B48B910F85A@bastion2.fedora.phx.redhat.com>

Package ImageMagick in Fedora devel is now owned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Mon Apr 13 17:40:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 17:40:15 +0000
Subject: [pkgdb] ImageMagick ownership updated
Message-ID: <20090413173859.3A2CE10F87C@bastion2.fedora.phx.redhat.com>

Package ImageMagick in Fedora 10 is now owned by jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From mclasen at fedoraproject.org  Mon Apr 13 17:39:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 17:39:56 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.50, 1.51 orca.spec, 1.82, 1.83 sources,
	1.51, 1.52
Message-ID: <20090413173956.6BF4B70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13927

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	16 Mar 2009 18:14:14 -0000	1.50
+++ .cvsignore	13 Apr 2009 17:39:25 -0000	1.51
@@ -1 +1 @@
-orca-2.26.0.tar.bz2
+orca-2.26.1.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- orca.spec	16 Mar 2009 18:14:14 -0000	1.82
+++ orca.spec	13 Apr 2009 17:39:25 -0000	1.83
@@ -16,7 +16,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.26.0
+Version:	2.26.1
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -104,6 +104,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/orca/2.26/orca-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Mar 2009 18:14:14 -0000	1.51
+++ sources	13 Apr 2009 17:39:26 -0000	1.52
@@ -1 +1 @@
-d097f28747943a32d50e3b91eab5c518  orca-2.26.0.tar.bz2
+7c8b995b0e55cf902d3a658f1adae0cf  orca-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 17:40:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 17:40:05 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel .cvsignore, 1.11,
	1.12 seahorse-plugins.spec, 1.22, 1.23 sources, 1.11, 1.12
Message-ID: <20090413174005.C84A270124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15463

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Mar 2009 02:48:05 -0000	1.11
+++ .cvsignore	13 Apr 2009 17:39:35 -0000	1.12
@@ -1 +1 @@
-seahorse-plugins-2.26.0.tar.bz2
+seahorse-plugins-2.26.1.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- seahorse-plugins.spec	17 Mar 2009 02:48:05 -0000	1.22
+++ seahorse-plugins.spec	13 Apr 2009 17:39:35 -0000	1.23
@@ -1,5 +1,5 @@
 Name: 		seahorse-plugins
-Version: 	2.26.0
+Version: 	2.26.1
 Release:        1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
@@ -21,7 +21,6 @@
 BuildRequires:  gnupg2
 BuildRequires:  gpgme-devel
 BuildRequires:  nautilus-devel
-BuildRequires:  gnome-vfs2-devel
 BuildRequires:  gnome-keyring-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  seahorse-devel
@@ -176,6 +175,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/seahorse-plugins/2.26/seahorse-plugins-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2009 02:48:05 -0000	1.11
+++ sources	13 Apr 2009 17:39:35 -0000	1.12
@@ -1 +1 @@
-8936feb29cf9e4b935d1059ee4e416c6  seahorse-plugins-2.26.0.tar.bz2
+d0aecc4e8e008b45362adf8a8716f38c  seahorse-plugins-2.26.1.tar.bz2



From lkundrak at fedoraproject.org  Mon Apr 13 17:45:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 17:45:09 +0000 (UTC)
Subject: rpms/links/F-10 links-2.2-nss.patch, NONE,
	1.1 links-2.2-ssl-verify.patch, NONE, 1.1 links.desktop, NONE,
	1.1 links.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413174509.63FE970124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/links/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17215

Modified Files:
	.cvsignore sources 
Added Files:
	links-2.2-nss.patch links-2.2-ssl-verify.patch links.desktop 
	links.spec 
Log Message:
Import into stable branch

links-2.2-nss.patch:

--- NEW FILE links-2.2-nss.patch ---
Support SSL/TLS by the means of NSS.

Lubomir Rintel <lkundrak at v3.sk>

diff -up links-2.2/configure.in.nss links-2.2/configure.in
--- links-2.2/configure.in.nss	2008-08-01 00:03:04.000000000 +0200
+++ links-2.2/configure.in	2009-04-03 08:18:16.847916975 +0200
@@ -355,8 +355,34 @@ AC_CHECK_LIB(dl, dlopen)
 AC_ARG_WITH(ssl, [  --with-ssl(=directory)  enable SSL support], [if test "$withval" = no; then disable_ssl=yes; else ssld="$withval"; fi])
 CPPFLAGS_X="$CPPFLAGS"
 LIBS_X="$LIBS"
-cf_result=no
 if test -z "$disable_ssl"; then
+
+	AC_PROG_CXX
+	PKG_CHECK_MODULES(NSS,nss,
+		CPPFLAGS="$CPPFLAGS $NSS_CFLAGS $NSS_CFLAGS"
+
+		if test -f "${ssld}"; then
+			CPPFLAGS="$CPPFLAGS -I${ssld}"
+		fi
+
+		AC_CHECK_LIB(nss_compat_ossl, SSL_CTX_new, [
+			LIBS="$LIBS -lnss_compat_ossl"
+			cf_result="yes"
+		], cf_result="no")
+	,cf_result="no")
+
+	if test "$cf_result" != yes; then
+		if test "$withval" = yes; then
+			AC_MSG_ERROR("NSS Compat not found")
+		fi
+	        CPPFLAGS="$CPPFLAGS_X"
+        	LIBS="$LIBS_X"
+	else
+		AC_DEFINE([HAVE_NSS_COMPAT], 1, [Include NSS support])
+		AC_DEFINE(HAVE_SSL)
+	fi
+
+	if test "$cf_result" != yes; then
 	PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
 	if test "$pkgconfig_openssl" = "yes"; then
 		AC_MSG_CHECKING([for OpenSSL])
@@ -395,6 +421,7 @@ if test -z "$disable_ssl"; then
 	else
 		AC_DEFINE(HAVE_SSL)
 	fi
+	fi # No NSS Compat
 fi
 cf_have_ssl=$cf_result;
 #endif
diff -up links-2.2/connect.c.nss links-2.2/connect.c
--- links-2.2/connect.c.nss	2008-08-01 00:02:23.000000000 +0200
+++ links-2.2/connect.c	2009-04-03 08:15:17.812914880 +0200
@@ -151,7 +151,9 @@ void ssl_want_read(struct connection *c)
 
 	set_timeout(c);
 
+#ifndef HAVE_NSS_COMPAT
 	if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
+#endif
 	switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
 		case SSL_ERROR_NONE:
 			c->newconn = NULL;
@@ -318,7 +320,9 @@ void connected(struct connection *c)
 	if (c->ssl) {
 		c->ssl = getSSL();
 		SSL_set_fd(c->ssl, *b->sock);
+#ifndef HAVE_NSS_COMPAT
 		if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
+#endif
 		switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
 			case SSL_ERROR_WANT_READ:
 				setcstate(c, S_SSL_NEG);
diff -up links-2.2/links.h.nss links-2.2/links.h
--- links-2.2/links.h.nss	2008-08-01 00:02:29.000000000 +0200
+++ links-2.2/links.h	2009-04-03 08:15:17.818912636 +0200
@@ -144,9 +144,13 @@ x #endif*/
 #include <utime.h>
 
 #ifdef HAVE_SSL
+#ifdef HAVE_NSS_COMPAT
+#include <nss_compat_ossl/nss_compat_ossl.h>
+#else
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
 #endif
+#endif
 
 #if defined(G) 
 #if defined(HAVE_PNG_H)

links-2.2-ssl-verify.patch:

--- NEW FILE links-2.2-ssl-verify.patch ---
Fix a security issue -- links would not verify SSL and TLS
certificates, rendering SSL support practically useless.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510417

Lubomir Rintel <lkundrak at v3.sk>

diff -up links-2.2/connect.c.ssl-verify links-2.2/connect.c
--- links-2.2/connect.c.ssl-verify	2009-04-13 19:28:13.076133802 +0200
+++ links-2.2/connect.c	2009-04-13 19:27:34.467258505 +0200
@@ -319,6 +319,8 @@ void connected(struct connection *c)
 #ifdef HAVE_SSL
 	if (c->ssl) {
 		c->ssl = getSSL();
+		if (!getenv("UNSAFE_SSL"))
+			SSL_set_verify(c->ssl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
 		SSL_set_fd(c->ssl, *b->sock);
 #ifndef HAVE_NSS_COMPAT
 		if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;


--- NEW FILE links.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Links
Comment=Simple Web Browser
Exec=links2 -g
Icon=links
Categories=Network;WebBrowser;
Type=Application


--- NEW FILE links.spec ---
Name:           links
Version:        2.2
Release:        8%{?dist}
Summary:        Web browser running in both graphics and text mode

Group:          Applications/Internet
License:        GPLv2+
URL:            http://links.twibright.com/
Source0:        http://links.twibright.com/download/%{name}-%{version}.tar.bz2
Source1:        links.desktop
Patch0:         links-2.2-nss.patch
Patch1:         links-2.2-ssl-verify.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libtiff-devel
BuildRequires:  bzip2-devel
BuildRequires:  zlib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gpm-devel
BuildRequires:  libX11-devel
BuildRequires:  autoconf automake
BuildRequires:  nss-devel
BuildRequires:  nss_compat_ossl-devel

Requires(preun): %{_sbindir}/alternatives
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives

Provides:       webclient
Provides:       text-www-browser


%description
Links is a web browser capable of running in either graphics or text mode.
It provides a pull-down menu system, renders complex pages, has partial HTML
4.0 support (including tables, frames and support for multiple character sets
and UTF-8), supports color and monochrome terminals and allows horizontal
scrolling.


%prep
%setup -q
%patch0 -p1 -b .nss
%patch1 -p1 -b .verify-ssl


%build
iconv -f ISO-8859-1 -t UTF-8 AUTHORS >converted.AUTHORS
touch -r AUTHORS converted.AUTHORS
mv converted.AUTHORS AUTHORS

autoreconf -i
%configure --enable-graphics
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
mv $RPM_BUILD_ROOT/%{_bindir}/links $RPM_BUILD_ROOT/%{_bindir}/links2
mv $RPM_BUILD_ROOT/%{_mandir}/man1/links.1 $RPM_BUILD_ROOT/%{_mandir}/man1/links2.1
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
install -D -p Links_logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/links.png

# Alternatives cruft
touch $RPM_BUILD_ROOT%{_bindir}/links
touch $RPM_BUILD_ROOT%{_mandir}/man1/links.1.gz


%clean
rm -rf $RPM_BUILD_ROOT


%postun
[ $1 = 0 ] && exit 0
[ $(readlink %{_sysconfdir}/alternatives/links) = %{_bindir}/links2 ] &&
        %{_sbindir}/alternatives --set links %{_bindir}/links2
exit 0


%preun
[ $1 = 0 ] || exit 0
%{_sbindir}/alternatives --remove links %{_bindir}/links2


%post
%{_sbindir}/alternatives \
        --install %{_bindir}/links links %{_bindir}/links2 80 \
        --slave %{_mandir}/man1/links.1.gz links-man %{_mandir}/man1/links2.1.gz
[ $(readlink %{_sysconfdir}/alternatives/links) = %{_bindir}/links2 ] &&
        %{_sbindir}/alternatives --set links %{_bindir}/links2
exit 0


%files
%defattr(-,root,root,-)
%doc doc/* AUTHORS BUGS KEYS TODO README COPYING
%{_bindir}/links2
%{_mandir}/man1/links2.1*
%{_datadir}/pixmaps/links.png
%{_datadir}/applications/links.desktop
%ghost %verify(not md5 size mtime) %{_bindir}/links
%ghost %verify(not md5 size mtime) %{_mandir}/man1/links.1.gz


%changelog
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-8
- Enable SSL certificates verification

* Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-7
- removing unnecessary BuildConflicts

* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-6
- Cosmetic fixes
- Ship license

* Fri Apr 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-5
- Add SSL/TLS support by the means of NSS
- Add web browser provides

* Thu Apr 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-4
- Do not silence make
- Use bundled icon, place it in pixmaps directory
- Adjust summary, description and style
- Remove useless configure parameters
- Include X11 support
- Adjust menu entry text
- Add alternatives support

* Mon Nov 10 2008 johnhford at gmail.com - 2.2-3
- Do not mutilate timestamps on AUTHORS
- Removed vendor from desktop-file-install
- No longer gzipping manpage

* Mon Nov 10 2008 John Ford <johnhford.gmail at com> 2.2-2
- Modified %%build to ensure shared libraries are used
- Added missing requirements (desktop-file-utils)
* Sat Nov 08 2008 John Ford <johnhford.gmail at com> 2.2-1
- Initial Submission



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/links/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:45:29 -0000	1.1
+++ .cvsignore	13 Apr 2009 17:44:38 -0000	1.2
@@ -0,0 +1 @@
+links-2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/links/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:45:29 -0000	1.1
+++ sources	13 Apr 2009 17:44:38 -0000	1.2
@@ -0,0 +1 @@
+bf5b20529a2a811701c5af52b28ebdd4  links-2.2.tar.bz2



From limb at fedoraproject.org  Mon Apr 13 17:46:05 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 13 Apr 2009 17:46:05 +0000 (UTC)
Subject: rpms/gallery2/F-10 gallery2.spec,1.19,1.20 sources,1.9,1.10
Message-ID: <20090413174605.0909C70124@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17454

Modified Files:
	gallery2.spec sources 
Log Message:
Multiple packaging fixes.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gallery2.spec	4 Feb 2009 20:46:01 -0000	1.19
+++ gallery2.spec	13 Apr 2009 17:45:34 -0000	1.20
@@ -7,20 +7,26 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
-Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
-# Tarball from upstream will not work - must use SVN snapshot
-#Source0: gallery2-svn20080618.tar.bz2
+#Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
+# Tarball from upstream contains prebuilt jars, some of which are not redistributable.
+# Generated from gallery-2.3-full.zip
+# unzip gallery-2.3-full.zip
+# find . -name '*.jar' | xargs rm -f
+# tar -czf gallery-2.3-jarless.tar.gz gallery2/
+Source0: gallery-2.3-jarless.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
+Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
 # Subversion needed to generate manifest
 #BuildRequires: perl-String-CRC32, subversion
-
+BuildRequires: java-1.6.0-openjdk-devel
+Obsoletes: gallery2-panorama <= 2.3-4
 #Patch0: gallery2-perl-location.patch
 
 %package albumselect
@@ -216,12 +222,6 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-
-%package panorama
-Summary: Panorama module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
-
 %package password
 Summary: Password module for Gallery 2
 Group: Applications/Publishing
@@ -553,9 +553,6 @@
 %description notification
 Gallery 2 module - Email notification
 
-%description panorama
-Gallery 2 module - View wide jpeg/gif images in a java applet viewer 
-
 %description password
 Gallery 2 module - password - CVS only
 
@@ -681,6 +678,10 @@
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
+tar -xf %{SOURCE4}
+cd gallery-jar-sources-2.3
+sh build-jars.sh
+cd ..
 
 %build
 #pushd lib/tools/bin
@@ -696,6 +697,13 @@
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
+#Panorama needs an unredistributable jar, so we'll remove the files.
+rm -rf modules/panorama
+#install built jars
+install -m 0644 gallery-jar-sources-2.3/jars/remote/* modules/remote/applets
+install -m 0644 gallery-jar-sources-2.3/jars/slideshowapplet/* modules/slideshowapplet/applets
+install -m 0644 gallery-jar-sources-2.3/jars/uploadapplet/* modules/uploadapplet/applets
+rm -rf gallery-jar-sources-2.3
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -705,8 +713,6 @@
 #remove bundled Smarty.
 rm -rf lib/smarty
 cp -pr * ${RPM_BUILD_ROOT}%{installprefix}/gallery2
-#use system Smarty
-ln -s ../../php/Smarty ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/smarty
 install -m 0644 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/README.fedora
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/premerge-messages.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/update-all-translations.pl
@@ -723,9 +729,17 @@
 ln -s ../../..%{g2confdir}/config.php ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
 chmod 644 ${RPM_BUILD_ROOT}%{g2confdir}/config.php
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%pretrans
+#symlink to system smarty
+if [ -d /usr/share/gallery2/lib/smarty ]; then
+  rm -rf /usr/share/gallery2/lib/smarty
+  ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
+fi
+
 %post
 if [[ -f %{installprefix}/gallery2/config.php.rpmnew ]]
 then
@@ -923,10 +937,6 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/notification/
 
-%files panorama
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/panorama/
-
 %files password
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/password/
@@ -1088,6 +1098,15 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-5
+- Remove .jar files and build from source BZ464566.
+- Modify source to remove two non-redistutable .jar files.
+- Dropped panorama module as a result.
+- Fix symlink/dir issues, BZ 484240.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-3
 - Base requires gallery2-httpauth for upgrade path, BZ 483523.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Dec 2008 20:49:56 -0000	1.9
+++ sources	13 Apr 2009 17:45:34 -0000	1.10
@@ -1 +1,2 @@
-59aa83d15989fdd05c623ef3563b800f  gallery-2.3-full.zip
+f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
+01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz



From kyle at fedoraproject.org  Mon Apr 13 17:47:56 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 13 Apr 2009 17:47:56 +0000 (UTC)
Subject: rpms/kernel/F-11 alsa-dont-reset-stream-at-each-prepare-callb.patch,
	NONE, 1.1 alsa-hda-dont-reset-BDL-unnecessarily.patch, NONE,
	1.1 alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch, NONE,
	1.1 alsa-pcm-midlevel-add-more-strict-buffer-position.patch,
	NONE, 1.1 kernel.spec, 1.1531, 1.1532
Message-ID: <20090413174757.0459170124@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18295

Modified Files:
	kernel.spec 
Added Files:
	alsa-dont-reset-stream-at-each-prepare-callb.patch 
	alsa-hda-dont-reset-BDL-unnecessarily.patch 
	alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch 
	alsa-pcm-midlevel-add-more-strict-buffer-position.patch 
Log Message:
* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-70
- merge alsa fixes from wwoods:
  alsa-hda-dont-reset-BDL-unnecessarily.patch
  alsa-dont-reset-stream-at-each-prepare-callb.patch
  alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
  alsa-pcm-midlevel-add-more-strict-buffer-position.patch
    bbf6ad13, fa00e046 from alsa-kernel/master (and deps)


alsa-dont-reset-stream-at-each-prepare-callb.patch:

--- NEW FILE alsa-dont-reset-stream-at-each-prepare-callb.patch ---
>From fc546201dfe40d09c1a1e82384dc3774025984da Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 18 Mar 2009 15:15:37 +0100
Subject: ALSA: hda - Don't reset stream at each prepare callback

Don't reset the stream at each prepare callback but do it only once
after the open.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/pci/hda/hda_intel.c |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b7a61a1..931a62d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -858,13 +858,18 @@ static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
 		      SD_CTL_DMA_START | SD_INT_MASK);
 }
 
-/* stop a stream */
-static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+/* stop DMA */
+static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)
 {
-	/* stop DMA */
 	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
 		      ~(SD_CTL_DMA_START | SD_INT_MASK));
 	azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
+}
+
+/* stop a stream */
+static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+{
+	azx_stream_clear(chip, azx_dev);
 	/* disable SIE */
 	azx_writeb(chip, INTCTL,
 		   azx_readb(chip, INTCTL) & ~(1 << azx_dev->index));
@@ -1125,18 +1130,14 @@ static int azx_setup_periods(struct azx *chip,
 	return -EINVAL;
 }
 
-/*
- * set up the SD for streaming
- */
-static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+/* reset stream */
+static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 {
 	unsigned char val;
 	int timeout;
 
-	/* make sure the run bit is zero for SD */
-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
-		      ~SD_CTL_DMA_START);
-	/* reset stream */
+	azx_stream_clear(chip, azx_dev);
+
 	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
 		      SD_CTL_STREAM_RESET);
 	udelay(3);
@@ -1153,7 +1154,15 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
 	while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
 	       --timeout)
 		;
+}
 
+/*
+ * set up the SD for streaming
+ */
+static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+{
+	/* make sure the run bit is zero for SD */
+	azx_stream_clear(chip, azx_dev);
 	/* program the stream_tag */
 	azx_sd_writel(azx_dev, SD_CTL,
 		      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK)|
@@ -1399,6 +1408,8 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
 	runtime->private_data = azx_dev;
 	snd_pcm_set_sync(substream);
 	mutex_unlock(&chip->open_mutex);
+
+	azx_stream_reset(chip, azx_dev);
 	return 0;
 }
 
-- 
1.6.2.2


alsa-hda-dont-reset-BDL-unnecessarily.patch:

--- NEW FILE alsa-hda-dont-reset-BDL-unnecessarily.patch ---
>From b98a9f6d1619b7fe32c2a6a4e5190121830f979b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 18 Mar 2009 15:09:13 +0100
Subject: ALSA: hda - Don't reset BDL unnecessarily

So far, the prepare callback is called multiple times, BDL entries
are reset and re-programmed at each time.

This patch adds the check to avoid the reset of BDL entries when the
same parameters are used.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/pci/hda/hda_intel.c |   46 +++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f3b5723..b7a61a1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1075,8 +1075,7 @@ static int azx_setup_periods(struct azx *chip,
 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 
-	period_bytes = snd_pcm_lib_period_bytes(substream);
-	azx_dev->period_bytes = period_bytes;
+	period_bytes = azx_dev->period_bytes;
 	periods = azx_dev->bufsize / period_bytes;
 
 	/* program the initial BDL entries */
@@ -1123,9 +1122,6 @@ static int azx_setup_periods(struct azx *chip,
  error:
 	snd_printk(KERN_ERR "Too many BDL entries: buffer=%d, period=%d\n",
 		   azx_dev->bufsize, period_bytes);
-	/* reset */
-	azx_sd_writel(azx_dev, SD_BDLPL, 0);
-	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 	return -EINVAL;
 }
 
@@ -1429,6 +1425,11 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
 static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
 			     struct snd_pcm_hw_params *hw_params)
 {
+	struct azx_dev *azx_dev = get_azx_dev(substream);
+
+	azx_dev->bufsize = 0;
+	azx_dev->period_bytes = 0;
+	azx_dev->format_val = 0;
 	return snd_pcm_lib_malloc_pages(substream,
 					params_buffer_bytes(hw_params));
 }
@@ -1443,6 +1444,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 	azx_sd_writel(azx_dev, SD_CTL, 0);
+	azx_dev->bufsize = 0;
+	azx_dev->period_bytes = 0;
+	azx_dev->format_val = 0;
 
 	hinfo->ops.cleanup(hinfo, apcm->codec, substream);
 
@@ -1456,23 +1460,37 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 	struct azx_dev *azx_dev = get_azx_dev(substream);
 	struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
 	struct snd_pcm_runtime *runtime = substream->runtime;
+	unsigned int bufsize, period_bytes, format_val;
+	int err;
 
-	azx_dev->bufsize = snd_pcm_lib_buffer_bytes(substream);
-	azx_dev->format_val = snd_hda_calc_stream_format(runtime->rate,
-							 runtime->channels,
-							 runtime->format,
-							 hinfo->maxbps);
-	if (!azx_dev->format_val) {
+	format_val = snd_hda_calc_stream_format(runtime->rate,
+						runtime->channels,
+						runtime->format,
+						hinfo->maxbps);
+	if (!format_val) {
 		snd_printk(KERN_ERR SFX
 			   "invalid format_val, rate=%d, ch=%d, format=%d\n",
 			   runtime->rate, runtime->channels, runtime->format);
 		return -EINVAL;
 	}
 
+	bufsize = snd_pcm_lib_buffer_bytes(substream);
+	period_bytes = snd_pcm_lib_period_bytes(substream);
+
 	snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
-		    azx_dev->bufsize, azx_dev->format_val);
-	if (azx_setup_periods(chip, substream, azx_dev) < 0)
-		return -EINVAL;
+		    bufsize, format_val);
+
+	if (bufsize != azx_dev->bufsize ||
+	    period_bytes != azx_dev->period_bytes ||
+	    format_val != azx_dev->format_val) {
+		azx_dev->bufsize = bufsize;
+		azx_dev->period_bytes = period_bytes;
+		azx_dev->format_val = format_val;
+		err = azx_setup_periods(chip, substream, azx_dev);
+		if (err < 0)
+			return err;
+	}
+
 	azx_setup_controller(chip, azx_dev);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
-- 
1.6.2.2


alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch:

--- NEW FILE alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch ---
>From 8820b651ddf48830af44520a13e63f5b9c5b9f9f Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Fri, 10 Apr 2009 12:20:45 +0200
Subject: [ALSA] hda_intel: fix unexpected ring buffer positions

I found two issues with ICH7-M (it should be related to other HDA chipsets
as well):

- the ring buffer position is not reset when stream restarts (after xrun) -
  solved by moving azx_stream_reset() call from open() to prepare() callback
  and reset posbuf to zero (it might be filled with hw later than position()
  callback is called)
- irq_ignore flag should be set also when ring buffer memory area is not
  changed in prepare() callback - this patch replaces irq_ignore with
  more universal check based on jiffies clock

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 sound/pci/hda/hda_intel.c |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 931a62d..7112e0e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -312,6 +312,9 @@ struct azx_dev {
 	unsigned int period_bytes; /* size of the period in bytes */
 	unsigned int frags;	/* number for period in the play buffer */
 	unsigned int fifo_size;	/* FIFO size */
+	unsigned int start_flag: 1;	/* stream full start flag */
+	unsigned long start_jiffies;	/* start + minimum jiffies */
+	unsigned long min_jiffies;	/* minimum jiffies before position is valid */
 
 	void __iomem *sd_addr;	/* stream descriptor pointer */
 
@@ -330,7 +333,6 @@ struct azx_dev {
 	unsigned int opened :1;
 	unsigned int running :1;
 	unsigned int irq_pending :1;
-	unsigned int irq_ignore :1;
 	/*
 	 * For VIA:
 	 *  A flag to ensure DMA position is 0
@@ -974,7 +976,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
 	struct azx *chip = dev_id;
 	struct azx_dev *azx_dev;
 	u32 status;
-	int i;
+	int i, ok;
 
 	spin_lock(&chip->reg_lock);
 
@@ -990,18 +992,14 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
 			azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);
 			if (!azx_dev->substream || !azx_dev->running)
 				continue;
-			/* ignore the first dummy IRQ (due to pos_adj) */
-			if (azx_dev->irq_ignore) {
-				azx_dev->irq_ignore = 0;
-				continue;
-			}
 			/* check whether this IRQ is really acceptable */
-			if (azx_position_ok(chip, azx_dev)) {
+			ok = azx_position_ok(chip, azx_dev);
+			if (ok == 1) {
 				azx_dev->irq_pending = 0;
 				spin_unlock(&chip->reg_lock);
 				snd_pcm_period_elapsed(azx_dev->substream);
 				spin_lock(&chip->reg_lock);
-			} else if (chip->bus && chip->bus->workq) {
+			} else if (ok == 0 && chip->bus && chip->bus->workq) {
 				/* bogus IRQ, process it later */
 				azx_dev->irq_pending = 1;
 				queue_work(chip->bus->workq,
@@ -1087,7 +1085,6 @@ static int azx_setup_periods(struct azx *chip,
 	bdl = (u32 *)azx_dev->bdl.area;
 	ofs = 0;
 	azx_dev->frags = 0;
-	azx_dev->irq_ignore = 0;
 	pos_adj = bdl_pos_adj[chip->dev_index];
 	if (pos_adj > 0) {
 		struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1108,7 +1105,6 @@ static int azx_setup_periods(struct azx *chip,
 					 &bdl, ofs, pos_adj, 1);
 			if (ofs < 0)
 				goto error;
-			azx_dev->irq_ignore = 1;
 		}
 	} else
 		pos_adj = 0;
@@ -1154,6 +1150,9 @@ static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 	while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
 	       --timeout)
 		;
+
+	/* reset first position - may not be synced with hw at this time */
+	*azx_dev->posbuf = 0;
 }
 
 /*
@@ -1409,7 +1408,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
 	snd_pcm_set_sync(substream);
 	mutex_unlock(&chip->open_mutex);
 
-	azx_stream_reset(chip, azx_dev);
 	return 0;
 }
 
@@ -1474,6 +1472,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 	unsigned int bufsize, period_bytes, format_val;
 	int err;
 
+	azx_stream_reset(chip, azx_dev);
 	format_val = snd_hda_calc_stream_format(runtime->rate,
 						runtime->channels,
 						runtime->format,
@@ -1502,6 +1501,8 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 			return err;
 	}
 
+	azx_dev->min_jiffies = (runtime->period_size * HZ) /
+						(runtime->rate * 2);
 	azx_setup_controller(chip, azx_dev);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
@@ -1518,13 +1519,14 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 	struct azx *chip = apcm->chip;
 	struct azx_dev *azx_dev;
 	struct snd_pcm_substream *s;
-	int start, nsync = 0, sbits = 0;
+	int rstart = 0, start, nsync = 0, sbits = 0;
 	int nwait, timeout;
 
 	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START:
+		rstart = 1;
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 	case SNDRV_PCM_TRIGGER_RESUME:
-	case SNDRV_PCM_TRIGGER_START:
 		start = 1;
 		break;
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
@@ -1554,6 +1556,10 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 		if (s->pcm->card != substream->pcm->card)
 			continue;
 		azx_dev = get_azx_dev(s);
+		if (rstart) {
+			azx_dev->start_flag = 1;
+			azx_dev->start_jiffies = jiffies + azx_dev->min_jiffies;
+		}
 		if (start)
 			azx_stream_start(chip, azx_dev);
 		else
@@ -1703,6 +1709,11 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 {
 	unsigned int pos;
 
+	if (azx_dev->start_flag &&
+	    time_before_eq(jiffies, azx_dev->start_jiffies))
+		return -1;	/* bogus (too early) interrupt */
+	azx_dev->start_flag = 0;
+
 	pos = azx_get_position(chip, azx_dev);
 	if (chip->position_fix == POS_FIX_AUTO) {
 		if (!pos) {
-- 
1.6.2.2


alsa-pcm-midlevel-add-more-strict-buffer-position.patch:

--- NEW FILE alsa-pcm-midlevel-add-more-strict-buffer-position.patch ---
>From bbf6ad1399e9516b0a95de3ad58ffbaed670e4cc Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Fri, 10 Apr 2009 12:28:58 +0200
Subject: [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies

Some drivers like Intel8x0 or Intel HDA are broken for some hardware variants.
This patch adds more strict buffer position checks based on jiffies when
internal hw_ptr is updated. Enable xrun_debug to see mangling of wrong
positions.

As a side effect, the hw_ptr interrupt update routine might do slightly better
job when many interrupts are lost.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 include/sound/pcm.h  |    3 ++-
 sound/core/pcm_lib.c |   47 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 8904b19..c172968 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -268,7 +268,8 @@ struct snd_pcm_runtime {
 	int overrange;
 	snd_pcm_uframes_t avail_max;
 	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */
-	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/
+	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
+	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */
 
 	/* -- HW params -- */
 	snd_pcm_access_t access;	/* access mode */
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index fbb2e39..63d088f 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -209,9 +209,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	snd_pcm_uframes_t pos;
-	snd_pcm_uframes_t new_hw_ptr, hw_ptr_interrupt, hw_base;
-	snd_pcm_sframes_t delta;
+	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_ptr_interrupt, hw_base;
+	snd_pcm_sframes_t hdelta, delta;
+	unsigned long jdelta;
 
+	old_hw_ptr = runtime->status->hw_ptr;
 	pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
 	if (pos == SNDRV_PCM_POS_XRUN) {
 		xrun(substream);
@@ -247,7 +249,30 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 			new_hw_ptr = hw_base + pos;
 		}
 	}
-	if (delta > runtime->period_size) {
+	hdelta = new_hw_ptr - old_hw_ptr;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
+	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {
+		delta = jdelta /
+			(((runtime->period_size * HZ) / runtime->rate)
+								+ HZ/100);
+		hw_ptr_error(substream,
+			     "hw_ptr skipping! [Q] "
+			     "(pos=%ld, delta=%ld, period=%ld, "
+			     "jdelta=%lu/%lu/%lu)\n",
+			     (long)pos, (long)hdelta,
+			     (long)runtime->period_size, jdelta,
+			     ((hdelta * HZ) / runtime->rate), delta);
+		hw_ptr_interrupt = runtime->hw_ptr_interrupt +
+				   runtime->period_size * delta;
+		if (hw_ptr_interrupt >= runtime->boundary)
+			hw_ptr_interrupt -= runtime->boundary;
+		/* rebase to interrupt position */
+		hw_base = new_hw_ptr = hw_ptr_interrupt;
+		/* align hw_base to buffer_size */
+		hw_base -= hw_base % runtime->buffer_size;
+		delta = 0;
+	}
+	if (delta > runtime->period_size + runtime->period_size / 2) {
 		hw_ptr_error(substream,
 			     "Lost interrupts? "
 			     "(stream=%i, delta=%ld, intr_ptr=%ld)\n",
@@ -263,6 +288,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 
 	runtime->hw_ptr_base = hw_base;
 	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
 	runtime->hw_ptr_interrupt = hw_ptr_interrupt;
 
 	return snd_pcm_update_hw_ptr_post(substream, runtime);
@@ -275,6 +301,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 	snd_pcm_uframes_t pos;
 	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;
 	snd_pcm_sframes_t delta;
+	unsigned long jdelta;
 
 	old_hw_ptr = runtime->status->hw_ptr;
 	pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
@@ -286,14 +313,15 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 	new_hw_ptr = hw_base + pos;
 
 	delta = new_hw_ptr - old_hw_ptr;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
 	if (delta < 0) {
 		delta += runtime->buffer_size;
 		if (delta < 0) {
 			hw_ptr_error(substream, 
 				     "Unexpected hw_pointer value [2] "
-				     "(stream=%i, pos=%ld, old_ptr=%ld)\n",
+				     "(stream=%i, pos=%ld, old_ptr=%ld, jdelta=%li)\n",
 				     substream->stream, (long)pos,
-				     (long)old_hw_ptr);
+				     (long)old_hw_ptr, jdelta);
 			return 0;
 		}
 		hw_base += runtime->buffer_size;
@@ -301,12 +329,13 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 			hw_base = 0;
 		new_hw_ptr = hw_base + pos;
 	}
-	if (delta > runtime->period_size && runtime->periods > 1) {
+	if (((delta * HZ) / runtime->rate) > jdelta + HZ/100) {
 		hw_ptr_error(substream,
 			     "hw_ptr skipping! "
-			     "(pos=%ld, delta=%ld, period=%ld)\n",
+			     "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n",
 			     (long)pos, (long)delta,
-			     (long)runtime->period_size);
+			     (long)runtime->period_size, jdelta,
+			     ((delta * HZ) / runtime->rate));
 		return 0;
 	}
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
@@ -315,6 +344,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 
 	runtime->hw_ptr_base = hw_base;
 	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
 
 	return snd_pcm_update_hw_ptr_post(substream, runtime);
 }
@@ -1441,6 +1471,7 @@ static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,
 		runtime->status->hw_ptr %= runtime->buffer_size;
 	else
 		runtime->status->hw_ptr = 0;
+	runtime->hw_ptr_jiffies = jiffies;
 	snd_pcm_stream_unlock_irqrestore(substream, flags);
 	return 0;
 }
-- 
1.6.2.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1531
retrieving revision 1.1532
diff -u -r1.1531 -r1.1532
--- kernel.spec	13 Apr 2009 17:16:49 -0000	1.1531
+++ kernel.spec	13 Apr 2009 17:47:26 -0000	1.1532
@@ -651,6 +651,10 @@
 Patch602: alsa-pcm-always-reset-invalid-position.patch
 Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
 Patch604: alsa-pcm-safer-boundary-checks.patch
+Patch605: alsa-hda-dont-reset-BDL-unnecessarily.patch
+Patch606: alsa-dont-reset-stream-at-each-prepare-callb.patch
+Patch607: alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+Patch608: alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
 Patch611: linux-2.6.29-alsa-update-quirks.patch
 
@@ -1225,7 +1229,10 @@
 ApplyPatch alsa-pcm-always-reset-invalid-position.patch
 ApplyPatch alsa-pcm-fix-delta-calc-at-overlap.patch
 ApplyPatch alsa-pcm-safer-boundary-checks.patch
-
+ApplyPatch alsa-hda-dont-reset-BDL-unnecessarily.patch
+ApplyPatch alsa-dont-reset-stream-at-each-prepare-callb.patch
+ApplyPatch alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+ApplyPatch alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
@@ -1918,6 +1925,14 @@
 # and build.
 
 %changelog
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-70
+- merge alsa fixes from wwoods:
+  alsa-hda-dont-reset-BDL-unnecessarily.patch
+  alsa-dont-reset-stream-at-each-prepare-callb.patch
+  alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+  alsa-pcm-midlevel-add-more-strict-buffer-position.patch
+    bbf6ad13, fa00e046 from alsa-kernel/master (and deps)
+
 * Mon Apr 13 2009 John W. Linville <linville at redhat.com>
 - Remove back-port iwlwifi rfkill while device down patches (#495003)
 



From simo at fedoraproject.org  Mon Apr 13 17:48:33 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 13 Apr 2009 17:48:33 +0000 (UTC)
Subject: rpms/sssd/devel 0001-Add-a-LSB-header-to-the-initscript.patch, NONE,
	1.1 0001-Build-fixes-for-RPM-packaging-of-SSSD.patch, NONE,
	1.1 sssd.spec, 1.6, 1.7
Message-ID: <20090413174833.9739B70124@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18585

Modified Files:
	sssd.spec 
Added Files:
	0001-Add-a-LSB-header-to-the-initscript.patch 
	0001-Build-fixes-for-RPM-packaging-of-SSSD.patch 
Log Message:
* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-2
- Try to fix build adding automake as an explicit BuildRequire
- Add also a couple of last minute patches from upstream


0001-Add-a-LSB-header-to-the-initscript.patch:

--- NEW FILE 0001-Add-a-LSB-header-to-the-initscript.patch ---
>From 8dcfa62361fd6ed0fe6babf7c24702dbc53729ae Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Wed, 8 Apr 2009 11:42:02 +0200
Subject: [PATCH] Add a LSB header to the initscript

---
 server/sysv/sssd |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/server/sysv/sssd b/server/sysv/sssd
index c1364b9..9facb44 100644
--- a/server/sysv/sssd
+++ b/server/sysv/sssd
@@ -9,6 +9,20 @@
 #              basis to provide client auditing and policy services for projects
 #              like FreeIPA.
 #
+### BEGIN INIT INFO
+# Provides: sssd
+# Required-Start: $remote_fs $time
+# Should-Start: $syslog
+# Should-Stop: $null
+# Required-Stop: $null
+# Short-Description: System Security Services Daemon
+# Description: Provides a set of daemons to manage access to remote directories
+#              and authentication mechanisms. It provides an NSS and PAM
+#              interface toward the system and a pluggable backend system to
+#              connect to multiple different account sources. It is also the
+#              basis to provide client auditing and policy services for projects
+#              like FreeIPA.
+### END INIT INFO
 
 RETVAL=0
 prog="sssd"
-- 
1.6.0.6


0001-Build-fixes-for-RPM-packaging-of-SSSD.patch:

--- NEW FILE 0001-Build-fixes-for-RPM-packaging-of-SSSD.patch ---
>From 948c47122cca0897e824dee064b3640c40b83ca6 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Mon, 13 Apr 2009 12:55:07 -0400
Subject: [PATCH] Build fixes for RPM packaging of SSSD

We were missing several BuildRequires for the autotools. Also, we
were linking against two external libraries in the common code
that we do not actually use.
---
 common/collection/Makefile.am |    2 +-
 common/ini/Makefile.am        |    2 +-
 sssd.spec                     |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/collection/Makefile.am b/common/collection/Makefile.am
index a47f8f9..c47327d 100644
--- a/common/collection/Makefile.am
+++ b/common/collection/Makefile.am
@@ -16,4 +16,4 @@ include_HEADERS = collection.h collection_tools.h
 # Build unit test
 noinst_PROGRAMS = collection_ut
 collection_ut_SOURCES = collection_ut.c
-collection_ut_LDADD = libcollection.la -lm -lz
+collection_ut_LDADD = libcollection.la
diff --git a/common/ini/Makefile.am b/common/ini/Makefile.am
index 962172f..7b5324d 100644
--- a/common/ini/Makefile.am
+++ b/common/ini/Makefile.am
@@ -16,4 +16,4 @@ include_HEADERS = ini_config.h
 # Build unit test
 noinst_PROGRAMS = ini_config_ut
 ini_config_ut_SOURCES = ini_config_ut.c
-ini_config_ut_LDADD = libini_config.la -lm -lz ../collection/libcollection.la
\ No newline at end of file
+ini_config_ut_LDADD = libini_config.la ../collection/libcollection.la
diff --git a/sssd.spec b/sssd.spec
index 88da56f..31e18f7 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -24,6 +24,9 @@ Requires(postun): /sbin/service
 ### Build Dependencies ###
 
 BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: m4
 BuildRequires: popt-devel
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
@@ -35,6 +38,7 @@ BuildRequires: openldap-devel
 BuildRequires: pam-devel
 BuildRequires: nss-devel
 BuildRequires: nspr-devel
+BuildRequires: pcre-devel
 
 %description
 Provides a set of daemons to manage access to remote directories and
-- 
1.6.0.6



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sssd.spec	13 Apr 2009 17:11:39 -0000	1.6
+++ sssd.spec	13 Apr 2009 17:48:03 -0000	1.7
@@ -13,6 +13,8 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
+Patch100: 0001-Add-a-LSB-header-to-the-initscript.patch
+Patch101: 0001-Build-fixes-for-RPM-packaging-of-SSSD.patch
 
 ### Dependencies ###
 
@@ -38,7 +40,6 @@
 BuildRequires: nss-devel
 BuildRequires: nspr-devel
 BuildRequires: pcre-devel
-BuildRequires: zlib-devel
 BuildRequires: automake
 BuildRequires: libtool
 
@@ -52,6 +53,9 @@
 %prep
 %setup -q
 
+%patch100 -p1 -b .lsb_init
+%patch101 -p1 -b .build_fixes
+
 %build
 
 # common
@@ -141,6 +145,7 @@
 %changelog
 * Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-2
 - Try to fix build adding automake as an explicit BuildRequire
+- Add also a couple of last minute patches from upstream
 
 * Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-1
 - Version 0.3.0



From ajax at fedoraproject.org  Mon Apr 13 17:50:49 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 17:50:49 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.28, 1.29 import.log, 1.1, 
	1.2 radeon-modeset.patch, 1.44, 1.45 sources, 1.28,
	1.29 xorg-x11-drv-ati.spec, 1.174, 1.175 gen_radeon.xinf, 1.1,
	NONE radeon-6.12.0-git-fixes.patch, 1.3,
	NONE radeon-6.9.0-panel-size-sanity.patch, 1.1,
	NONE radeon-6.9.0-remove-limit-heuristics.patch, 1.2, NONE
Message-ID: <20090413175050.0C0B970124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19647/devel

Modified Files:
	.cvsignore import.log radeon-modeset.patch sources 
	xorg-x11-drv-ati.spec 
Removed Files:
	gen_radeon.xinf radeon-6.12.0-git-fixes.patch 
	radeon-6.9.0-panel-size-sanity.patch 
	radeon-6.9.0-remove-limit-heuristics.patch 
Log Message:
radeon 6.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	1 Apr 2009 08:54:08 -0000	1.28
+++ .cvsignore	13 Apr 2009 17:50:18 -0000	1.29
@@ -1 +1 @@
-xf86-video-ati-6.12.1.tar.bz2
+xf86-video-ati-6.12.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Aug 2008 04:14:20 -0000	1.1
+++ import.log	13 Apr 2009 17:50:18 -0000	1.2
@@ -1 +1,2 @@
 xorg-x11-drv-ati-6_9_0-1_fc10:HEAD:xorg-x11-drv-ati-6.9.0-1.fc10.src.rpm:1218428001
+xorg-x11-drv-ati-6_12_2-1_fc11:HEAD:xorg-x11-drv-ati-6.12.2-1.fc11.src.rpm:1239644931

radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.44 -r 1.45 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- radeon-modeset.patch	6 Apr 2009 08:48:25 -0000	1.44
+++ radeon-modeset.patch	13 Apr 2009 17:50:18 -0000	1.45
@@ -1,7 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index 660ea1f..4ddec1c 100644
---- a/configure.ac
-+++ b/configure.ac
+diff -up xf86-video-ati-6.12.2/configure.ac.modeset xf86-video-ati-6.12.2/configure.ac
+--- xf86-video-ati-6.12.2/configure.ac.modeset	2009-04-08 10:29:53.000000000 -0400
++++ xf86-video-ati-6.12.2/configure.ac	2009-04-13 13:24:51.000000000 -0400
 @@ -31,6 +31,7 @@ AM_CONFIG_HEADER([config.h])
  AC_CONFIG_AUX_DIR(.)
  
@@ -30,48 +29,9 @@
  save_CFLAGS="$CFLAGS"
  CFLAGS="$XORG_CFLAGS"
  AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7cc2a6f..8a55d1c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -90,12 +90,14 @@ radeon_drv_ladir = @moduledir@/drivers
- radeon_drv_la_SOURCES = \
- 	radeon_accel.c radeon_cursor.c radeon_dga.c radeon_legacy_memory.c \
- 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
--	radeon_vip.c radeon_misc.c radeon_probe.c \
-+	radeon_vip.c radeon_misc.c radeon_probe.c radeon_memory.c \
- 	legacy_crtc.c legacy_output.c \
- 	radeon_textured_video.c \
- 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
- 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
--	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
-+	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c \
-+	atombios_crtc.c  drmmode_display.c radeon_bufmgr_gem.c \
-+	radeon_dri_bufmgr.c radeon_dri2.c
- 
- if XMODES
- radeon_drv_la_SOURCES += \
-@@ -144,6 +146,7 @@ EXTRA_DIST = \
- 	radeon_exa_render.c \
- 	radeon_exa_funcs.c \
- 	radeon.h \
-+	radeon_dri2.h \
- 	radeon_macros.h \
- 	radeon_probe.h \
- 	radeon_reg.h \
-@@ -164,4 +167,6 @@ EXTRA_DIST = \
- 	radeon_pci_device_match_gen.h \
- 	pcidb/ati_pciids.csv \
- 	pcidb/parse_pci_ids.pl \
--	radeon_atombios.h
-+	radeon_atombios.h \
-+	drmmode_display.h \
-+	radeon_dri_bufmgr.h
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-new file mode 100644
-index 0000000..14384ba
---- /dev/null
-+++ b/src/drmmode_display.c
+diff -up /dev/null xf86-video-ati-6.12.2/src/drmmode_display.c
+--- /dev/null	2009-04-02 14:26:50.181076715 -0400
++++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-13 13:24:51.000000000 -0400
 @@ -0,0 +1,921 @@
 +/*
 + * Copyright ?? 2007 Red Hat, Inc.
@@ -994,11 +954,9 @@
 +	return TRUE;
 +}
 +#endif
-diff --git a/src/drmmode_display.h b/src/drmmode_display.h
-new file mode 100644
-index 0000000..5ea904b
---- /dev/null
-+++ b/src/drmmode_display.h
+diff -up /dev/null xf86-video-ati-6.12.2/src/drmmode_display.h
+--- /dev/null	2009-04-02 14:26:50.181076715 -0400
++++ xf86-video-ati-6.12.2/src/drmmode_display.h	2009-04-13 13:24:51.000000000 -0400
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright ?? 2007 Red Hat, Inc.
@@ -1074,11 +1032,46 @@
 +extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
 +#endif
 +#endif
-diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
-index 3dfe151..04b6457 100644
---- a/src/r600_textured_videofuncs.c
-+++ b/src/r600_textured_videofuncs.c
-@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+diff -up xf86-video-ati-6.12.2/src/Makefile.am.modeset xf86-video-ati-6.12.2/src/Makefile.am
+--- xf86-video-ati-6.12.2/src/Makefile.am.modeset	2009-03-31 15:11:10.000000000 -0400
++++ xf86-video-ati-6.12.2/src/Makefile.am	2009-04-13 13:24:51.000000000 -0400
+@@ -90,12 +90,14 @@ radeon_drv_ladir = @moduledir@/drivers
+ radeon_drv_la_SOURCES = \
+ 	radeon_accel.c radeon_cursor.c radeon_dga.c radeon_legacy_memory.c \
+ 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
+-	radeon_vip.c radeon_misc.c radeon_probe.c \
++	radeon_vip.c radeon_misc.c radeon_probe.c radeon_memory.c \
+ 	legacy_crtc.c legacy_output.c \
+ 	radeon_textured_video.c \
+ 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
+ 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
+-	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
++	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c \
++	atombios_crtc.c  drmmode_display.c radeon_bufmgr_gem.c \
++	radeon_dri_bufmgr.c radeon_dri2.c
+ 
+ if XMODES
+ radeon_drv_la_SOURCES += \
+@@ -144,6 +146,7 @@ EXTRA_DIST = \
+ 	radeon_exa_render.c \
+ 	radeon_exa_funcs.c \
+ 	radeon.h \
++	radeon_dri2.h \
+ 	radeon_macros.h \
+ 	radeon_probe.h \
+ 	radeon_reg.h \
+@@ -164,4 +167,6 @@ EXTRA_DIST = \
+ 	radeon_pci_device_match_gen.h \
+ 	pcidb/ati_pciids.csv \
+ 	pcidb/parse_pci_ids.pl \
+-	radeon_atombios.h
++	radeon_atombios.h \
++	drmmode_display.h \
++	radeon_dri_bufmgr.h
+diff -up xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c.modeset xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c
+--- xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c.modeset	2009-04-07 11:32:33.000000000 -0400
++++ xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c	2009-04-13 13:24:51.000000000 -0400
+@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pSc
      switch(pPriv->id) {
      case FOURCC_YV12:
      case FOURCC_I420:
@@ -1087,7 +1080,7 @@
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
-@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pSc
      case FOURCC_UYVY:
      case FOURCC_YUY2:
      default:
@@ -1096,325 +1089,77 @@
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
-diff --git a/src/radeon.h b/src/radeon.h
-index d488429..d1bca2e 100644
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -46,6 +46,8 @@
- #include "compiler.h"
- #include "xf86fbman.h"
- 
-+#include "drmmode_display.h"
-+
- 				/* PCI support */
- #include "xf86Pci.h"
- 
-@@ -75,6 +77,7 @@
- #include "dri.h"
- #include "GL/glxint.h"
- #include "xf86drm.h"
-+#include "radeon_dri2.h"
+diff -up xf86-video-ati-6.12.2/src/radeon_accel.c.modeset xf86-video-ati-6.12.2/src/radeon_accel.c
+--- xf86-video-ati-6.12.2/src/radeon_accel.c.modeset	2009-04-07 02:39:04.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_accel.c	2009-04-13 13:24:51.000000000 -0400
+@@ -92,6 +92,7 @@
  
- #ifdef DAMAGE
- #include "damage.h"
-@@ -85,6 +88,7 @@
- #include "xf86Crtc.h"
- #include "X11/Xatom.h"
+ 				/* X and server generic header files */
+ #include "xf86.h"
++#include "radeon_bufmgr_gem.h"
  
-+#include "radeon_bufmgr.h"
- 				/* Render support */
- #ifdef RENDER
- #include "picturestr.h"
-@@ -414,6 +418,14 @@ typedef enum {
+ static void R600EngineReset(ScrnInfoPtr pScrn);
  
- typedef struct _atomBiosHandle *atomBiosHandlePtr;
+@@ -373,6 +374,9 @@ void RADEONEngineRestore(ScrnInfoPtr pSc
+     RADEONInfoPtr  info       = RADEONPTR(pScrn);
+     unsigned char *RADEONMMIO = info->MMIO;
  
-+#define RADEON_POOL_GART 0
-+#define RADEON_POOL_VRAM 1
++    if (info->drm_mode_setting)
++      return;
 +
[...4807 lines suppressed...]
  #endif
-diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 05acb93..852f4ac 100644
---- a/src/radeon_textured_videofuncs.c
-+++ b/src/radeon_textured_videofuncs.c
+diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
+--- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset	2009-04-07 11:32:12.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-13 13:24:51.000000000 -0400
 @@ -87,11 +87,25 @@ do {								\
  
  #endif /* !ACCEL_CP */
@@ -8011,7 +7970,7 @@
      uint32_t txformat;
      uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
      uint32_t dst_offset, dst_pitch, dst_format;
-@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
      int dstxoff, dstyoff, pixel_shift, vtx_count;
      BoxPtr pBox = REGION_RECTS(&pPriv->clip);
      int nBox = REGION_NUM_RECTS(&pPriv->clip);
@@ -8072,7 +8031,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			  RADEON_WAIT_DMA_GUI_IDLE);
  	    FINISH_ACCEL();
  
@@ -8081,7 +8040,7 @@
  		RADEONInit3DEngine(pScrn);
  	}
  
-@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	if (IS_R500_3D && ((pPriv->h - 1) & 0x800))
  	    txpitch |= R500_TXHEIGHT_11;
  
@@ -8104,7 +8063,7 @@
  	FINISH_ACCEL();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			R300_TX_MIN_FILTER_LINEAR |
  			R300_TX_MAG_FILTER_LINEAR);
  
@@ -8130,7 +8089,7 @@
  		FINISH_ACCEL();
  		txenable |= R300_TEX_1_ENABLE | R300_TEX_2_ENABLE;
  	}
-@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
  
@@ -8152,7 +8111,7 @@
  		FINISH_ACCEL();
  
  		/* Enable tex 1 */
-@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	    }
  	}
  
@@ -8173,7 +8132,7 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	if (RADEONTilingEnabled(pScrn, pPixmap))
  	    colorpitch |= RADEON_COLOR_TILE_ENABLE;
  
@@ -8195,7 +8154,7 @@
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
  
-@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8205,7 +8164,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
-@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8231,7 +8190,7 @@
  
  		/* similar to r300 code. Note the big problem is that hardware constants
  		 * are 8 bits only, representing 0.0-1.0. We can get that up (using bias
-@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8241,7 +8200,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8250,7 +8209,7 @@
  
  		/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
-@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  		FINISH_ACCEL();
  	    }
  	    else {
@@ -8260,7 +8219,7 @@
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  
-@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
@@ -8269,7 +8228,7 @@
  
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			      R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	    info->accel_state->texW[0] = 1;
  	    info->accel_state->texH[0] = 1;
  
@@ -8279,7 +8238,7 @@
  
  	    OUT_ACCEL_REG(RADEON_PP_CNTL,
  			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);
@@ -8290,11 +8249,10 @@
  	    OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
-diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 42aa036..bd6408d 100644
---- a/src/radeon_video.c
-+++ b/src/radeon_video.c
-@@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+diff -up xf86-video-ati-6.12.2/src/radeon_video.c.modeset xf86-video-ati-6.12.2/src/radeon_video.c
+--- xf86-video-ati-6.12.2/src/radeon_video.c.modeset	2009-04-07 11:31:32.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_video.c	2009-04-13 13:24:51.000000000 -0400
+@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
  
@@ -8303,7 +8261,7 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -297,9 +297,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -294,9 +294,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
  	RADEONInitOffscreenImages(pScreen);
      }
  
@@ -8318,7 +8276,7 @@
  #endif
  	) {
  	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2200,7 +2203,7 @@ RADEONCopyData(
+@@ -2197,7 +2200,7 @@ RADEONCopyData(
  
  #ifdef XF86DRI
  
@@ -8327,10 +8285,9 @@
      {
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
-diff --git a/src/radeon_video.h b/src/radeon_video.h
-index 34fb07f..7b75ec3 100644
---- a/src/radeon_video.h
-+++ b/src/radeon_video.h
+diff -up xf86-video-ati-6.12.2/src/radeon_video.h.modeset xf86-video-ati-6.12.2/src/radeon_video.h
+--- xf86-video-ati-6.12.2/src/radeon_video.h.modeset	2009-04-07 11:31:53.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_video.h	2009-04-13 13:31:13.000000000 -0400
 @@ -121,6 +121,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;
@@ -8340,4 +8297,4 @@
 +    dri_bo *bicubic_bo;
  } RADEONPortPrivRec, *RADEONPortPrivPtr;
  
- int
+ xf86CrtcPtr


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	1 Apr 2009 08:54:08 -0000	1.28
+++ sources	13 Apr 2009 17:50:19 -0000	1.29
@@ -1 +1 @@
-2adf5988c5e5b6df5f4cb61006fa2bf1  xf86-video-ati-6.12.1.tar.bz2
+2bf50461378771497501ca7f678d36f3  xf86-video-ati-6.12.2.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- xorg-x11-drv-ati.spec	9 Apr 2009 15:54:20 -0000	1.174
+++ xorg-x11-drv-ati.spec	13 Apr 2009 17:50:19 -0000	1.175
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.12.1
-Release:   10%{?dist}
+Version:   6.12.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,11 +14,8 @@
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   radeon.xinf
 
-Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-modeset-fixes.patch
-#Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
-Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
@@ -42,11 +39,8 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .modeset-fix
-#patch4 -p1 -b .remove-limit-heuristics
-#%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -80,6 +74,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 6.12.2-1
+- radeon 6.12.2
+
 * Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 6.12.1-10
 - radeon-6.12.1-r600-fb-size.patch: Bump fb size max on R600+ when no KMS
   so single-link dualhead stands a chance of working.


--- gen_radeon.xinf DELETED ---


--- radeon-6.12.0-git-fixes.patch DELETED ---


--- radeon-6.9.0-panel-size-sanity.patch DELETED ---


--- radeon-6.9.0-remove-limit-heuristics.patch DELETED ---



From oget at fedoraproject.org  Mon Apr 13 17:54:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 13 Apr 2009 17:54:23 +0000 (UTC)
Subject: rpms/swami/devel import.log, NONE, 1.1 swami.desktop, NONE,
	1.1 swami.spec, NONE, 1.1 swami.svg, NONE, 1.1 swami.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413175423.4513570124@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/swami/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21109/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log swami.desktop swami.spec swami.svg swami.xml 
Log Message:
* Sun Apr 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-4
- Add Requires: hicolor-icon-theme

* Fri Mar 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
- Initial Fedora build



--- NEW FILE import.log ---
swami-0_9_4-4_fc10:HEAD:swami-0.9.4-4.fc10.src.rpm:1239645200


--- NEW FILE swami.desktop ---
[Desktop Entry]
Name=Swami Instrument Editor
GenericName=Instrument Editor
Comment=Create, play and organize MIDI instruments and sounds
Exec=swami %F
Icon=swami
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;
MimeType=audio/dls;audio/x-soundfont;


--- NEW FILE swami.spec ---
Name:           swami
Version:        0.9.4
Release:        4%{?dist}
Summary:        MIDI instrument and sound editor
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://swami.resonance.org/
Source0:        http://downloads.sourceforge.net/swami/%{name}-%{version}.tar.bz2
# These files are from upstream trunk (.desktop file is slightly modified)
# http://swami.resonance.org/trac/browser/trunk/swami
Source1:        %{name}.svg
Source2:        %{name}.desktop
Source3:        %{name}.xml
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  audiofile-devel 
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  desktop-file-utils
BuildRequires:  fluidsynth-devel
BuildRequires:  gnome-libs-devel
BuildRequires:  ImageMagick
BuildRequires:  libpng-devel
BuildRequires:  libsndfile-devel
BuildRequires:  libtool
BuildRequires:  popt-devel

Requires:       hicolor-icon-theme

%description
The Swami Project - Sampled Waveforms And Musical Instruments - is a collection
of free software for editing and sharing MIDI instruments and sounds. Swami
aims to provide an instrument editing and sharing software for instrument 
formats such as SoundFont, DLS and GigaSampler. 

%prep
%setup -q

# Fix libdir
sed -i 's|/lib/|/%{_lib}/|g' configure.ac

%build
autoreconf -v -i -f
%configure --disable-static
make %{?_smp_mflags} 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# kill .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la

# desktop file
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps

# icon
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install                                    \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications      \
   %{SOURCE2}

# mime-type file
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/

# to avoid filename conflicts
for file in AUTHORS ChangeLog README; do
   mv src/libinstpatch/$file $file.libinstpatch
done

%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS* ChangeLog* COPYING NEWS README*
%{_libdir}/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Sun Apr 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-4
- Add Requires: hicolor-icon-theme

* Fri Mar 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
- Initial Fedora build

* Sun Jul 27 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.4-2
- updated for new fluidsynth libraries (1.0.8) on fc8

* Wed Nov 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated desktop categories
- add popt-devel build requirement for f8

* Fri Sep 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.4-1
- updated to 0.9.4

* Tue May  8 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-2
- build on fc7, use autogen.sh to use the newer versions of auto* tools
- add MKINSTALLDIRS explicitly in make invocation

* Mon Apr 16 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-2
- spec file tweaks, build on fc6

* Mon May 29 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-1
- added Planet CCRMA categories to desktop file, spec file cleanups
- updated to 0.9.3

* Fri Nov 18 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-3
- rebuild for new version of fluidsynth (1.0.6)
- build requires lash (name change from ladcca)
- change all references from ladcca to lash
- added autotools build requirement (for change to lash), needs
  automake17

* Fri Dec 31 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- spec file cleanup

* Fri Sep 24 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-2
- built for new fluidsynth libraries
- set libfluidsynth require to be for the exact version, swami is
  very picky and won't work with newer versions than the one it was
  compiled with

* Thu May 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added code to recognize libpng12.pc in configure

* Wed May 12 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added buildrequires

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-1
- updated to 0.9.2
- patched config.status to force recognition of libpng
- erased and obsoleted old libswami and libswami-devel packages

* Mon Nov 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1a-3
- spec file tweaks, autogen ommited, does not work on FC1

* Fri Jul 25 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-3
- rebuilt for fluidsynth 1.0.3
- added release tags and an explicit dependency with the current
  version of libfluidsynth

* Fri Jul 25 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-2
- rebuilt for fluidsynth 1.0.2

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-1
- updated to 0.9.1a

* Thu Mar  6 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1.cvs
- cvs: 20030306.185320

* Thu Feb 27 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1.cvs
- adapted from mandrake spec file
- switched over to cvs swami

* Fri Jan 31 2003 Austin Acton <aacton at yorku.ca> 0.9.0-1mdk
- adapted spec file from Torbjorn Turpeinen <tobbe at nyvalls.se>


--- NEW FILE swami.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://web.resource.org/cc/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="48"
   height="48"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.43"
   sodipodi:docbase="/home/josh/images/swami"
   sodipodi:docname="Swami_neu12.svg"
   version="1.0"
   inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90">
  <defs
     id="defs4">
    <linearGradient
       id="linearGradient2363">
      <stop
         style="stop-color:#ff2e69;stop-opacity:1;"
         offset="0"
         id="stop2367" />
      <stop
         id="stop3988"
         offset="0.50413221"
         style="stop-color:#f9ffb1;stop-opacity:1;" />
      <stop
         id="stop2369"
         offset="1"
         style="stop-color:#ff2e69;stop-opacity:1;" />
    </linearGradient>
    <linearGradient
       id="linearGradient2275">
      <stop
         style="stop-color:#ffe999;stop-opacity:1;"
         offset="0"
         id="stop2277" />
      <stop
         id="stop2283"
         offset="1"
         style="stop-color:#e25b7a;stop-opacity:1;" />
      <stop
         style="stop-color:#2ed8ff;stop-opacity:0;"
         offset="1"
         id="stop2279" />
    </linearGradient>
    <linearGradient
       id="linearGradient2219">
      <stop
         style="stop-color:#2e2eff;stop-opacity:1;"
         offset="0"
         id="stop2221" />
      <stop
         style="stop-color:#2e2eff;stop-opacity:0.75789475;"
         offset="0.82644629"
         id="stop2303" />
      <stop
         style="stop-color:#2e2eff;stop-opacity:0;"
         offset="1"
         id="stop2223" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient2219"
       id="radialGradient2377"
       cx="130.41817"
       cy="68.150551"
       fx="130.41817"
       fy="68.150551"
       r="15.390964"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(0.480863,0.497137)" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="11.07237"
     inkscape:cx="24.359107"
     inkscape:cy="27.675456"
     inkscape:document-units="px"
     inkscape:current-layer="layer3"
     inkscape:window-width="1166"
     inkscape:window-height="856"
     inkscape:window-x="78"
     inkscape:window-y="58"
     showgrid="false"
     inkscape:grid-bbox="false"
     inkscape:showpageshadow="false" />
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:groupmode="layer"
     id="layer3"
     inkscape:label="Waves">
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.85289347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2409"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 140.76803,79.541865 A 15.390964,15.390964 0 0 1 119.72479,79.220035"
       transform="matrix(1.381901,0,0,1.317353,-156.3313,-80.40712)"
       sodipodi:start="0.83326371"
       sodipodi:end="2.3389141"
       sodipodi:open="true" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.57907322;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2413"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 140.15994,80.066074 A 15.390964,15.390964 0 0 1 120.67425,80.064321"
       transform="matrix(1.869625,0,0,1.782295,-219.9394,-112.0932)"
       sodipodi:start="0.88543369"
       sodipodi:end="2.2563389"
       sodipodi:open="true" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.37966251;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2415"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 139.50509,80.572689 A 15.390964,15.390964 0 0 1 121.38797,80.613992"
       transform="matrix(2.434941,0,0,2.321205,-293.6669,-148.8202)"
       sodipodi:start="0.93923371"
       sodipodi:end="2.1977994"
       sodipodi:open="true" />
  </g>
  <g
     inkscape:groupmode="layer"
     id="layer2"
     inkscape:label="Shadow"
     style="display:inline">
    <path
       sodipodi:type="inkscape:offset"
       inkscape:radius="1.3931054"
       inkscape:original="M 9.125 1.03125 C 8.2748124 1.1828233 7.6442988 1.9118652 7.59375 2.78125 C 7.59375 2.78125 7.1147764 8.1992955 9.875 13.9375 C 12.401215 19.189226 16.827056 22.644336 22.3125 22.875 C 22.325715 23.84024 22.335495 24.859289 22.34375 25.90625 C 22.374855 29.851045 22.271052 34.137341 21.9375 36 C 20.15904 41.163117 15.124472 42.220393 14.8125 42.28125 C 14.382801 42.335163 13.979313 42.543834 13.6875 42.84375 C 13.572738 42.965718 13.454489 43.130292 13.375 43.28125 C 13.346109 43.338467 13.304412 43.408059 13.28125 43.46875 C 13.107535 43.92393 13.131384 44.438763 13.3125 44.875 C 13.350218 44.961702 13.417738 45.075357 13.46875 45.15625 C 13.515391 45.227492 13.568096 45.309702 13.625 45.375 C 13.639226 45.391324 13.672792 45.421752 13.6875 45.4375 C 13.784623 45.537976 13.916873 45.643622 14.03125 45.71875 C 14.093447 45.75812 14.183961 45.812106 14.25 45.84375 C 14.620657 46.013796 15.057382 46.063954 15.46875 45.96875 C 15.46875 45.96875 20.37881
 4 45.012887 23.59375 40.8125 C 23.5958 40.818195 23.62253 40.838428 23.625 40.84375 C 24.465752 41.797221 25.453462 42.590854 26.46875 43.28125 C 27.484038 43.971646 28.520593 44.540954 29.375 44.96875 C 30.229407 45.396546 30.728217 45.671668 31.4375 45.84375 C 32.447146 46.085375 33.445875 45.447146 33.6875 44.4375 C 33.927237 43.435742 33.339479 42.43917 32.34375 42.1875 C 32.247209 42.140704 31.64906 41.918687 31.0625 41.625 C 30.34058 41.263539 29.437286 40.761105 28.59375 40.1875 C 27.750214 39.613895 26.963747 38.971801 26.4375 38.375 C 25.944143 37.815499 25.72277 37.317722 25.6875 37.09375 C 25.686724 37.086878 25.687883 37.068765 25.6875 37.0625 C 25.67741 36.946221 25.656486 36.831139 25.625 36.71875 C 25.625087 36.708334 25.625087 36.697916 25.625 36.6875 C 26.109594 34.021983 26.125167 29.859423 26.09375 25.875 C 26.085137 24.782615 26.076028 23.712268 26.0625 22.71875 C 32.383122 22.050777 36.36159 18.619542 38.625 15.125 C 40.179377 12.725154 40.775796 9.74918
 76 41.09375 7.3125 C 41.411704 4.875812 41.40625 2.9375 41.40625 2.9375 C 41.412376 2.5043143 41.25756 2.0810974 41 1.75 C 40.858826 1.574523 40.66952 1.3984299 40.46875 1.28125 C 40.450498 1.2705973 40.424763 1.2599869 40.40625 1.25 C 40.294422 1.1920759 40.150067 1.1277055 40.03125 1.09375 C 39.71329 1.0085283 39.349211 1.0085283 39.03125 1.09375 C 38.912433 1.1277055 38.768078 1.1920759 38.65625 1.25 C 38.637737 1.2599869 38.612002 1.2705973 38.59375 1.28125 C 38.392979 1.3984299 38.203674 1.574523 38.0625 1.75 C 37.80494 2.0810974 37.650124 2.5043143 37.65625 2.9375 C 37.65625 2.9375 37.658178 4.6423232 37.375 6.8125 C 37.091822 8.9826772 36.437515 11.598046 35.46875 13.09375 C 33.653649 15.896136 31.030277 18.43119 26.03125 19 C 26.04844 18.130656 26.090158 17.52074 26.09375 17.5 C 26.198266 16.940982 26.058108 16.368864 25.6875 15.9375 C 25.316893 15.506137 24.755883 15.262143 24.1875 15.28125 C 23.288237 15.316242 22.540637 15.985147 22.40625 16.875 C 22.291352 17.538
 502 22.2797 18.248393 22.28125 19.15625 C 18.238505 18.996641 15.338641 16.654558 13.25 12.3125 C 10.959624 7.5510571 11.3125 3.09375 11.3125 3.09375 C 11.373997 2.5244703 11.157916 1.9643279 10.75 1.5625 C 10.342084 1.1606722 9.7870406 0.96119953 9.21875 1.03125 C 9.1909028 1.0349507 9.1524254 1.0263605 9.125 1.03125 z M 24.03125 5.34375 C 22.257801 5.5014132 20.875 6.9982851 20.875 8.8125 C 20.875 10.73167 22.42458 12.28125 24.34375 12.28125 C 26.26292 12.28125 27.84375 10.73167 27.84375 8.8125 C 27.84375 6.8933301 26.26292 5.3437499 24.34375 5.34375 C 24.238795 5.34375 24.133846 5.334629 24.03125 5.34375 z "
       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2406"
       d="M 8.875,-0.34375 C 7.3820938,-0.077591424 6.2743943,1.1930122 6.1875,2.6875 C 6.1875,2.6875 5.6889937,8.4276125 8.625,14.53125 C 11.111993,19.701437 15.511924,23.286935 20.90625,24.03125 C 20.913047,24.655654 20.932348,25.252824 20.9375,25.90625 C 20.967958,29.769043 20.832536,34.027252 20.5625,35.625 C 18.991474,39.975604 14.63073,40.886844 14.53125,40.90625 L 14.53125,40.9375 C 13.810312,41.050652 13.178458,41.37041 12.6875,41.875 C 12.471435,42.104632 12.306634,42.339404 12.15625,42.625 C 12.145669,42.635251 12.135251,42.645669 12.125,42.65625 C 12.134338,42.637757 12.064008,42.719146 11.96875,42.96875 C 11.655121,43.790541 11.717905,44.651525 12.03125,45.40625 C 12.031133,45.416666 12.031133,45.427084 12.03125,45.4375 C 12.13392,45.673506 12.212045,45.796507 12.28125,45.90625 C 12.291666,45.906367 12.302084,45.906367 12.3125,45.90625 C 12.35356,45.968967 12.405021,46.100541 12.5625,46.28125 C 12.726472,46.469404 12.752213,46.477748 12.65625,46.375 C 12.666501,46
 .385581 12.676919,46.395999 12.6875,46.40625 C 12.884686,46.610243 13.077841,46.741392 13.28125,46.875 C 13.281133,46.885416 13.281133,46.895834 13.28125,46.90625 C 13.373248,46.964484 13.480731,47.009646 13.65625,47.09375 C 13.656133,47.104166 13.656133,47.114584 13.65625,47.125 C 14.309495,47.424689 15.054155,47.480774 15.78125,47.3125 C 15.78125,47.3125 20.169836,46.34938 23.65625,42.6875 C 24.325463,43.300444 24.981973,43.957742 25.6875,44.4375 C 26.772902,45.175573 27.856494,45.771377 28.75,46.21875 C 29.58469,46.636674 30.199273,46.970487 31.09375,47.1875 C 31.104166,47.187617 31.114584,47.187617 31.125,47.1875 C 32.876917,47.606763 34.618316,46.475474 35.03125,44.75 C 35.417426,43.136336 34.489945,41.513864 32.9375,40.96875 L 32.9375,40.9375 C 32.797622,40.869697 32.755197,40.869844 32.6875,40.84375 C 32.616623,40.81643 32.549248,40.765397 32.4375,40.71875 C 32.219019,40.62755 31.93693,40.499888 31.6875,40.375 C 31.011716,40.036639 30.148928,39.557522 29.375,39.03125 
 C 28.598263,38.503069 27.867449,37.920903 27.46875,37.46875 C 27.109762,37.061632 27.007769,36.527449 27.0625,36.875 C 27.056816,36.821442 27.039568,36.77193 27.03125,36.71875 C 27.032783,36.709777 27.029726,36.696495 27.03125,36.6875 C 27.522315,33.788235 27.530735,29.772919 27.5,25.875 C 27.494424,25.167757 27.475824,24.488184 27.46875,23.8125 C 33.471075,22.778432 37.504187,19.390621 39.78125,15.875 C 41.532909,13.170565 42.140705,10.01402 42.46875,7.5 C 42.799233,4.9672951 42.8125,2.9375 42.8125,2.9375 C 42.8235,2.1596652 42.538444,1.4779105 42.09375,0.90625 C 42.093867,0.89583366 42.093867,0.88541634 42.09375,0.875 C 41.856634,0.58026888 41.552522,0.2937854 41.15625,0.0625 C 40.993446,-0.032519813 40.969097,-0.019136563 41.0625,0.03125 C 41.062617,0.020833661 41.062617,0.010416339 41.0625,-1.3066335e-17 C 40.890191,-0.089251933 40.685686,-0.17014284 40.40625,-0.25 C 39.831428,-0.4040675 39.231071,-0.40406689 38.65625,-0.25 C 38.376814,-0.17014284 38.172309,-0.089251933 
 38,0 C 37.999883,0.010416339 37.999883,0.020833661 38,0.03125 C 38.093403,-0.019136563 38.069054,-0.032519813 37.90625,0.0625 C 37.509973,0.29378667 37.205864,0.58027139 36.96875,0.875 C 36.968633,0.88541634 36.968633,0.89583366 36.96875,0.90625 C 36.524056,1.4779105 36.239,2.1909152 36.25,2.96875 C 36.25,2.96875 36.270961,4.5484479 36,6.625 C 35.733866,8.6645614 35.034034,11.229753 34.3125,12.34375 C 32.842602,14.613167 30.903698,16.444258 27.4375,17.25 C 27.462814,16.459349 27.290371,15.660208 26.75,15.03125 C 26.095751,14.269745 25.153408,13.841479 24.15625,13.875 C 24.145834,13.874883 24.135416,13.874883 24.125,13.875 C 22.56645,13.935646 21.264162,15.114008 21.03125,16.65625 C 20.981977,16.940787 20.989725,17.25072 20.96875,17.53125 C 18.208131,16.988504 16.179737,15.210742 14.5,11.71875 C 12.381076,7.3137366 12.6875,3.21875 12.6875,3.21875 C 12.796901,2.206018 12.412548,1.2459433 11.71875,0.5625 C 11.024952,-0.12094344 10.058802,-0.46655939 9.0625,-0.34375 C 9.0520837,
 -0.34386682 9.0416663,-0.34386682 9.03125,-0.34375 C 9.4485881,-0.39921134 9.4016396,-0.43764122 8.875,-0.34375 z M 24.34375,3.9375 C 24.319506,3.9375 24.173912,3.9449543 23.90625,3.96875 C 21.42173,4.1896288 19.46875,6.2903985 19.46875,8.8125 C 19.46875,11.481553 21.674697,13.6875 24.34375,13.6875 C 27.012803,13.6875 29.25,11.496675 29.25,8.8125 C 29.25,6.1283248 27.012803,3.9374999 24.34375,3.9375 z "
       transform="translate(-0.461784,0.552099)" />
  </g>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     style="display:inline">
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       id="path1395"
       style="fill:none;stroke:#2e2eff;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="M 23.797811,17.732005 C 23.46144,19.674457 24.184247,32.57449 23.329006,37.045324 C 21.197006,43.497063 14.682811,44.680774 14.682811,44.680774 M 23.360254,37.731367 C 23.561959,41.027502 30.376898,44.3094 31.415912,44.561479"
       sodipodi:nodetypes="ccccc" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:nodetypes="csczc"
       style="fill:none;stroke:#2e2eff;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="M 39.056097,3.4894952 C 39.056097,3.4894952 39.115404,10.75545 36.592262,14.651 C 34.292243,18.202065 30.399605,21.578243 23.304352,21.554256 C 17.816838,21.945927 13.632929,18.95855 11.092691,13.677671 C 8.5673909,8.4278472 8.9899956,3.4797832 8.9899956,3.4797832"
       id="path1391" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="fill:#2e2eff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:21.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="path2289"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 145.80913 68.150551 A 15.390964 15.390964 0 1 1  115.0272,68.150551 A 15.390964 15.390964 0 1 1  145.80913 68.150551 z"
       transform="matrix(0.225896,0,0,0.225896,-5.56725,-6.023737)" />
  </g>
</svg>


--- NEW FILE swami.xml ---
<?xml version="1.0"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
  <mime-type type="audio/dls">
    <comment>Downloadable Sounds</comment>
    <magic priority="50">
      <match type="string" offset="0" value="RIFF">
        <match type="string" offset="8" value="DLS "/>
      </match>
    </magic>
    <glob pattern="*.dls"/>
    <glob pattern="*.dls2"/>
  </mime-type>
  <mime-type type="audio/x-soundfont">
    <comment>SoundFont</comment>
    <magic priority="50">
      <match type="string" offset="0" value="RIFF">
        <match type="string" offset="8" value="sfbk"/>
      </match>
    </magic>
    <glob pattern="*.sf2"/>
  </mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swami/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:48:23 -0000	1.1
+++ .cvsignore	13 Apr 2009 17:53:52 -0000	1.2
@@ -0,0 +1 @@
+swami-0.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swami/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:48:23 -0000	1.1
+++ sources	13 Apr 2009 17:53:52 -0000	1.2
@@ -0,0 +1 @@
+83da8e71ce1e6cda0f41d9f5e0ed3fdf  swami-0.9.4.tar.bz2



From oget at fedoraproject.org  Mon Apr 13 17:56:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 13 Apr 2009 17:56:07 +0000 (UTC)
Subject: rpms/swami/F-10 import.log, NONE, 1.1 swami.desktop, NONE,
	1.1 swami.spec, NONE, 1.1 swami.svg, NONE, 1.1 swami.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413175607.80F1170138@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/swami/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22056/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log swami.desktop swami.spec swami.svg swami.xml 
Log Message:
* Sun Apr 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-4
- Add Requires: hicolor-icon-theme

* Fri Mar 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
- Initial Fedora build



--- NEW FILE import.log ---
swami-0_9_4-4_fc10:F-10:swami-0.9.4-4.fc10.src.rpm:1239645311


--- NEW FILE swami.desktop ---
[Desktop Entry]
Name=Swami Instrument Editor
GenericName=Instrument Editor
Comment=Create, play and organize MIDI instruments and sounds
Exec=swami %F
Icon=swami
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;
MimeType=audio/dls;audio/x-soundfont;


--- NEW FILE swami.spec ---
Name:           swami
Version:        0.9.4
Release:        4%{?dist}
Summary:        MIDI instrument and sound editor
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://swami.resonance.org/
Source0:        http://downloads.sourceforge.net/swami/%{name}-%{version}.tar.bz2
# These files are from upstream trunk (.desktop file is slightly modified)
# http://swami.resonance.org/trac/browser/trunk/swami
Source1:        %{name}.svg
Source2:        %{name}.desktop
Source3:        %{name}.xml
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  audiofile-devel 
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  desktop-file-utils
BuildRequires:  fluidsynth-devel
BuildRequires:  gnome-libs-devel
BuildRequires:  ImageMagick
BuildRequires:  libpng-devel
BuildRequires:  libsndfile-devel
BuildRequires:  libtool
BuildRequires:  popt-devel

Requires:       hicolor-icon-theme

%description
The Swami Project - Sampled Waveforms And Musical Instruments - is a collection
of free software for editing and sharing MIDI instruments and sounds. Swami
aims to provide an instrument editing and sharing software for instrument 
formats such as SoundFont, DLS and GigaSampler. 

%prep
%setup -q

# Fix libdir
sed -i 's|/lib/|/%{_lib}/|g' configure.ac

%build
autoreconf -v -i -f
%configure --disable-static
make %{?_smp_mflags} 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# kill .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la

# desktop file
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps

# icon
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install                                    \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications      \
   %{SOURCE2}

# mime-type file
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/

# to avoid filename conflicts
for file in AUTHORS ChangeLog README; do
   mv src/libinstpatch/$file $file.libinstpatch
done

%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS* ChangeLog* COPYING NEWS README*
%{_libdir}/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Sun Apr 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-4
- Add Requires: hicolor-icon-theme

* Fri Mar 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
- Initial Fedora build

* Sun Jul 27 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.4-2
- updated for new fluidsynth libraries (1.0.8) on fc8

* Wed Nov 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated desktop categories
- add popt-devel build requirement for f8

* Fri Sep 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.4-1
- updated to 0.9.4

* Tue May  8 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-2
- build on fc7, use autogen.sh to use the newer versions of auto* tools
- add MKINSTALLDIRS explicitly in make invocation

* Mon Apr 16 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-2
- spec file tweaks, build on fc6

* Mon May 29 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-1
- added Planet CCRMA categories to desktop file, spec file cleanups
- updated to 0.9.3

* Fri Nov 18 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-3
- rebuild for new version of fluidsynth (1.0.6)
- build requires lash (name change from ladcca)
- change all references from ladcca to lash
- added autotools build requirement (for change to lash), needs
  automake17

* Fri Dec 31 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- spec file cleanup

* Fri Sep 24 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-2
- built for new fluidsynth libraries
- set libfluidsynth require to be for the exact version, swami is
  very picky and won't work with newer versions than the one it was
  compiled with

* Thu May 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added code to recognize libpng12.pc in configure

* Wed May 12 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added buildrequires

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-1
- updated to 0.9.2
- patched config.status to force recognition of libpng
- erased and obsoleted old libswami and libswami-devel packages

* Mon Nov 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1a-3
- spec file tweaks, autogen ommited, does not work on FC1

* Fri Jul 25 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-3
- rebuilt for fluidsynth 1.0.3
- added release tags and an explicit dependency with the current
  version of libfluidsynth

* Fri Jul 25 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-2
- rebuilt for fluidsynth 1.0.2

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-1
- updated to 0.9.1a

* Thu Mar  6 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1.cvs
- cvs: 20030306.185320

* Thu Feb 27 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1.cvs
- adapted from mandrake spec file
- switched over to cvs swami

* Fri Jan 31 2003 Austin Acton <aacton at yorku.ca> 0.9.0-1mdk
- adapted spec file from Torbjorn Turpeinen <tobbe at nyvalls.se>


--- NEW FILE swami.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://web.resource.org/cc/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="48"
   height="48"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.43"
   sodipodi:docbase="/home/josh/images/swami"
   sodipodi:docname="Swami_neu12.svg"
   version="1.0"
   inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90">
  <defs
     id="defs4">
    <linearGradient
       id="linearGradient2363">
      <stop
         style="stop-color:#ff2e69;stop-opacity:1;"
         offset="0"
         id="stop2367" />
      <stop
         id="stop3988"
         offset="0.50413221"
         style="stop-color:#f9ffb1;stop-opacity:1;" />
      <stop
         id="stop2369"
         offset="1"
         style="stop-color:#ff2e69;stop-opacity:1;" />
    </linearGradient>
    <linearGradient
       id="linearGradient2275">
      <stop
         style="stop-color:#ffe999;stop-opacity:1;"
         offset="0"
         id="stop2277" />
      <stop
         id="stop2283"
         offset="1"
         style="stop-color:#e25b7a;stop-opacity:1;" />
      <stop
         style="stop-color:#2ed8ff;stop-opacity:0;"
         offset="1"
         id="stop2279" />
    </linearGradient>
    <linearGradient
       id="linearGradient2219">
      <stop
         style="stop-color:#2e2eff;stop-opacity:1;"
         offset="0"
         id="stop2221" />
      <stop
         style="stop-color:#2e2eff;stop-opacity:0.75789475;"
         offset="0.82644629"
         id="stop2303" />
      <stop
         style="stop-color:#2e2eff;stop-opacity:0;"
         offset="1"
         id="stop2223" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient2219"
       id="radialGradient2377"
       cx="130.41817"
       cy="68.150551"
       fx="130.41817"
       fy="68.150551"
       r="15.390964"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(0.480863,0.497137)" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="11.07237"
     inkscape:cx="24.359107"
     inkscape:cy="27.675456"
     inkscape:document-units="px"
     inkscape:current-layer="layer3"
     inkscape:window-width="1166"
     inkscape:window-height="856"
     inkscape:window-x="78"
     inkscape:window-y="58"
     showgrid="false"
     inkscape:grid-bbox="false"
     inkscape:showpageshadow="false" />
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:groupmode="layer"
     id="layer3"
     inkscape:label="Waves">
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.85289347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2409"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 140.76803,79.541865 A 15.390964,15.390964 0 0 1 119.72479,79.220035"
       transform="matrix(1.381901,0,0,1.317353,-156.3313,-80.40712)"
       sodipodi:start="0.83326371"
       sodipodi:end="2.3389141"
       sodipodi:open="true" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.57907322;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2413"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 140.15994,80.066074 A 15.390964,15.390964 0 0 1 120.67425,80.064321"
       transform="matrix(1.869625,0,0,1.782295,-219.9394,-112.0932)"
       sodipodi:start="0.88543369"
       sodipodi:end="2.2563389"
       sodipodi:open="true" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.37966251;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2415"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 139.50509,80.572689 A 15.390964,15.390964 0 0 1 121.38797,80.613992"
       transform="matrix(2.434941,0,0,2.321205,-293.6669,-148.8202)"
       sodipodi:start="0.93923371"
       sodipodi:end="2.1977994"
       sodipodi:open="true" />
  </g>
  <g
     inkscape:groupmode="layer"
     id="layer2"
     inkscape:label="Shadow"
     style="display:inline">
    <path
       sodipodi:type="inkscape:offset"
       inkscape:radius="1.3931054"
       inkscape:original="M 9.125 1.03125 C 8.2748124 1.1828233 7.6442988 1.9118652 7.59375 2.78125 C 7.59375 2.78125 7.1147764 8.1992955 9.875 13.9375 C 12.401215 19.189226 16.827056 22.644336 22.3125 22.875 C 22.325715 23.84024 22.335495 24.859289 22.34375 25.90625 C 22.374855 29.851045 22.271052 34.137341 21.9375 36 C 20.15904 41.163117 15.124472 42.220393 14.8125 42.28125 C 14.382801 42.335163 13.979313 42.543834 13.6875 42.84375 C 13.572738 42.965718 13.454489 43.130292 13.375 43.28125 C 13.346109 43.338467 13.304412 43.408059 13.28125 43.46875 C 13.107535 43.92393 13.131384 44.438763 13.3125 44.875 C 13.350218 44.961702 13.417738 45.075357 13.46875 45.15625 C 13.515391 45.227492 13.568096 45.309702 13.625 45.375 C 13.639226 45.391324 13.672792 45.421752 13.6875 45.4375 C 13.784623 45.537976 13.916873 45.643622 14.03125 45.71875 C 14.093447 45.75812 14.183961 45.812106 14.25 45.84375 C 14.620657 46.013796 15.057382 46.063954 15.46875 45.96875 C 15.46875 45.96875 20.37881
 4 45.012887 23.59375 40.8125 C 23.5958 40.818195 23.62253 40.838428 23.625 40.84375 C 24.465752 41.797221 25.453462 42.590854 26.46875 43.28125 C 27.484038 43.971646 28.520593 44.540954 29.375 44.96875 C 30.229407 45.396546 30.728217 45.671668 31.4375 45.84375 C 32.447146 46.085375 33.445875 45.447146 33.6875 44.4375 C 33.927237 43.435742 33.339479 42.43917 32.34375 42.1875 C 32.247209 42.140704 31.64906 41.918687 31.0625 41.625 C 30.34058 41.263539 29.437286 40.761105 28.59375 40.1875 C 27.750214 39.613895 26.963747 38.971801 26.4375 38.375 C 25.944143 37.815499 25.72277 37.317722 25.6875 37.09375 C 25.686724 37.086878 25.687883 37.068765 25.6875 37.0625 C 25.67741 36.946221 25.656486 36.831139 25.625 36.71875 C 25.625087 36.708334 25.625087 36.697916 25.625 36.6875 C 26.109594 34.021983 26.125167 29.859423 26.09375 25.875 C 26.085137 24.782615 26.076028 23.712268 26.0625 22.71875 C 32.383122 22.050777 36.36159 18.619542 38.625 15.125 C 40.179377 12.725154 40.775796 9.74918
 76 41.09375 7.3125 C 41.411704 4.875812 41.40625 2.9375 41.40625 2.9375 C 41.412376 2.5043143 41.25756 2.0810974 41 1.75 C 40.858826 1.574523 40.66952 1.3984299 40.46875 1.28125 C 40.450498 1.2705973 40.424763 1.2599869 40.40625 1.25 C 40.294422 1.1920759 40.150067 1.1277055 40.03125 1.09375 C 39.71329 1.0085283 39.349211 1.0085283 39.03125 1.09375 C 38.912433 1.1277055 38.768078 1.1920759 38.65625 1.25 C 38.637737 1.2599869 38.612002 1.2705973 38.59375 1.28125 C 38.392979 1.3984299 38.203674 1.574523 38.0625 1.75 C 37.80494 2.0810974 37.650124 2.5043143 37.65625 2.9375 C 37.65625 2.9375 37.658178 4.6423232 37.375 6.8125 C 37.091822 8.9826772 36.437515 11.598046 35.46875 13.09375 C 33.653649 15.896136 31.030277 18.43119 26.03125 19 C 26.04844 18.130656 26.090158 17.52074 26.09375 17.5 C 26.198266 16.940982 26.058108 16.368864 25.6875 15.9375 C 25.316893 15.506137 24.755883 15.262143 24.1875 15.28125 C 23.288237 15.316242 22.540637 15.985147 22.40625 16.875 C 22.291352 17.538
 502 22.2797 18.248393 22.28125 19.15625 C 18.238505 18.996641 15.338641 16.654558 13.25 12.3125 C 10.959624 7.5510571 11.3125 3.09375 11.3125 3.09375 C 11.373997 2.5244703 11.157916 1.9643279 10.75 1.5625 C 10.342084 1.1606722 9.7870406 0.96119953 9.21875 1.03125 C 9.1909028 1.0349507 9.1524254 1.0263605 9.125 1.03125 z M 24.03125 5.34375 C 22.257801 5.5014132 20.875 6.9982851 20.875 8.8125 C 20.875 10.73167 22.42458 12.28125 24.34375 12.28125 C 26.26292 12.28125 27.84375 10.73167 27.84375 8.8125 C 27.84375 6.8933301 26.26292 5.3437499 24.34375 5.34375 C 24.238795 5.34375 24.133846 5.334629 24.03125 5.34375 z "
       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2406"
       d="M 8.875,-0.34375 C 7.3820938,-0.077591424 6.2743943,1.1930122 6.1875,2.6875 C 6.1875,2.6875 5.6889937,8.4276125 8.625,14.53125 C 11.111993,19.701437 15.511924,23.286935 20.90625,24.03125 C 20.913047,24.655654 20.932348,25.252824 20.9375,25.90625 C 20.967958,29.769043 20.832536,34.027252 20.5625,35.625 C 18.991474,39.975604 14.63073,40.886844 14.53125,40.90625 L 14.53125,40.9375 C 13.810312,41.050652 13.178458,41.37041 12.6875,41.875 C 12.471435,42.104632 12.306634,42.339404 12.15625,42.625 C 12.145669,42.635251 12.135251,42.645669 12.125,42.65625 C 12.134338,42.637757 12.064008,42.719146 11.96875,42.96875 C 11.655121,43.790541 11.717905,44.651525 12.03125,45.40625 C 12.031133,45.416666 12.031133,45.427084 12.03125,45.4375 C 12.13392,45.673506 12.212045,45.796507 12.28125,45.90625 C 12.291666,45.906367 12.302084,45.906367 12.3125,45.90625 C 12.35356,45.968967 12.405021,46.100541 12.5625,46.28125 C 12.726472,46.469404 12.752213,46.477748 12.65625,46.375 C 12.666501,46
 .385581 12.676919,46.395999 12.6875,46.40625 C 12.884686,46.610243 13.077841,46.741392 13.28125,46.875 C 13.281133,46.885416 13.281133,46.895834 13.28125,46.90625 C 13.373248,46.964484 13.480731,47.009646 13.65625,47.09375 C 13.656133,47.104166 13.656133,47.114584 13.65625,47.125 C 14.309495,47.424689 15.054155,47.480774 15.78125,47.3125 C 15.78125,47.3125 20.169836,46.34938 23.65625,42.6875 C 24.325463,43.300444 24.981973,43.957742 25.6875,44.4375 C 26.772902,45.175573 27.856494,45.771377 28.75,46.21875 C 29.58469,46.636674 30.199273,46.970487 31.09375,47.1875 C 31.104166,47.187617 31.114584,47.187617 31.125,47.1875 C 32.876917,47.606763 34.618316,46.475474 35.03125,44.75 C 35.417426,43.136336 34.489945,41.513864 32.9375,40.96875 L 32.9375,40.9375 C 32.797622,40.869697 32.755197,40.869844 32.6875,40.84375 C 32.616623,40.81643 32.549248,40.765397 32.4375,40.71875 C 32.219019,40.62755 31.93693,40.499888 31.6875,40.375 C 31.011716,40.036639 30.148928,39.557522 29.375,39.03125 
 C 28.598263,38.503069 27.867449,37.920903 27.46875,37.46875 C 27.109762,37.061632 27.007769,36.527449 27.0625,36.875 C 27.056816,36.821442 27.039568,36.77193 27.03125,36.71875 C 27.032783,36.709777 27.029726,36.696495 27.03125,36.6875 C 27.522315,33.788235 27.530735,29.772919 27.5,25.875 C 27.494424,25.167757 27.475824,24.488184 27.46875,23.8125 C 33.471075,22.778432 37.504187,19.390621 39.78125,15.875 C 41.532909,13.170565 42.140705,10.01402 42.46875,7.5 C 42.799233,4.9672951 42.8125,2.9375 42.8125,2.9375 C 42.8235,2.1596652 42.538444,1.4779105 42.09375,0.90625 C 42.093867,0.89583366 42.093867,0.88541634 42.09375,0.875 C 41.856634,0.58026888 41.552522,0.2937854 41.15625,0.0625 C 40.993446,-0.032519813 40.969097,-0.019136563 41.0625,0.03125 C 41.062617,0.020833661 41.062617,0.010416339 41.0625,-1.3066335e-17 C 40.890191,-0.089251933 40.685686,-0.17014284 40.40625,-0.25 C 39.831428,-0.4040675 39.231071,-0.40406689 38.65625,-0.25 C 38.376814,-0.17014284 38.172309,-0.089251933 
 38,0 C 37.999883,0.010416339 37.999883,0.020833661 38,0.03125 C 38.093403,-0.019136563 38.069054,-0.032519813 37.90625,0.0625 C 37.509973,0.29378667 37.205864,0.58027139 36.96875,0.875 C 36.968633,0.88541634 36.968633,0.89583366 36.96875,0.90625 C 36.524056,1.4779105 36.239,2.1909152 36.25,2.96875 C 36.25,2.96875 36.270961,4.5484479 36,6.625 C 35.733866,8.6645614 35.034034,11.229753 34.3125,12.34375 C 32.842602,14.613167 30.903698,16.444258 27.4375,17.25 C 27.462814,16.459349 27.290371,15.660208 26.75,15.03125 C 26.095751,14.269745 25.153408,13.841479 24.15625,13.875 C 24.145834,13.874883 24.135416,13.874883 24.125,13.875 C 22.56645,13.935646 21.264162,15.114008 21.03125,16.65625 C 20.981977,16.940787 20.989725,17.25072 20.96875,17.53125 C 18.208131,16.988504 16.179737,15.210742 14.5,11.71875 C 12.381076,7.3137366 12.6875,3.21875 12.6875,3.21875 C 12.796901,2.206018 12.412548,1.2459433 11.71875,0.5625 C 11.024952,-0.12094344 10.058802,-0.46655939 9.0625,-0.34375 C 9.0520837,
 -0.34386682 9.0416663,-0.34386682 9.03125,-0.34375 C 9.4485881,-0.39921134 9.4016396,-0.43764122 8.875,-0.34375 z M 24.34375,3.9375 C 24.319506,3.9375 24.173912,3.9449543 23.90625,3.96875 C 21.42173,4.1896288 19.46875,6.2903985 19.46875,8.8125 C 19.46875,11.481553 21.674697,13.6875 24.34375,13.6875 C 27.012803,13.6875 29.25,11.496675 29.25,8.8125 C 29.25,6.1283248 27.012803,3.9374999 24.34375,3.9375 z "
       transform="translate(-0.461784,0.552099)" />
  </g>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     style="display:inline">
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       id="path1395"
       style="fill:none;stroke:#2e2eff;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="M 23.797811,17.732005 C 23.46144,19.674457 24.184247,32.57449 23.329006,37.045324 C 21.197006,43.497063 14.682811,44.680774 14.682811,44.680774 M 23.360254,37.731367 C 23.561959,41.027502 30.376898,44.3094 31.415912,44.561479"
       sodipodi:nodetypes="ccccc" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:nodetypes="csczc"
       style="fill:none;stroke:#2e2eff;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="M 39.056097,3.4894952 C 39.056097,3.4894952 39.115404,10.75545 36.592262,14.651 C 34.292243,18.202065 30.399605,21.578243 23.304352,21.554256 C 17.816838,21.945927 13.632929,18.95855 11.092691,13.677671 C 8.5673909,8.4278472 8.9899956,3.4797832 8.9899956,3.4797832"
       id="path1391" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="fill:#2e2eff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:21.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="path2289"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 145.80913 68.150551 A 15.390964 15.390964 0 1 1  115.0272,68.150551 A 15.390964 15.390964 0 1 1  145.80913 68.150551 z"
       transform="matrix(0.225896,0,0,0.225896,-5.56725,-6.023737)" />
  </g>
</svg>


--- NEW FILE swami.xml ---
<?xml version="1.0"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
  <mime-type type="audio/dls">
    <comment>Downloadable Sounds</comment>
    <magic priority="50">
      <match type="string" offset="0" value="RIFF">
        <match type="string" offset="8" value="DLS "/>
      </match>
    </magic>
    <glob pattern="*.dls"/>
    <glob pattern="*.dls2"/>
  </mime-type>
  <mime-type type="audio/x-soundfont">
    <comment>SoundFont</comment>
    <magic priority="50">
      <match type="string" offset="0" value="RIFF">
        <match type="string" offset="8" value="sfbk"/>
      </match>
    </magic>
    <glob pattern="*.sf2"/>
  </mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swami/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:48:23 -0000	1.1
+++ .cvsignore	13 Apr 2009 17:55:35 -0000	1.2
@@ -0,0 +1 @@
+swami-0.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swami/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:48:23 -0000	1.1
+++ sources	13 Apr 2009 17:55:36 -0000	1.2
@@ -0,0 +1 @@
+83da8e71ce1e6cda0f41d9f5e0ed3fdf  swami-0.9.4.tar.bz2



From oget at fedoraproject.org  Mon Apr 13 17:57:44 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 13 Apr 2009 17:57:44 +0000 (UTC)
Subject: rpms/swami/F-9 import.log, NONE, 1.1 swami.desktop, NONE,
	1.1 swami.spec, NONE, 1.1 swami.svg, NONE, 1.1 swami.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090413175744.A43B870124@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/swami/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23342/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log swami.desktop swami.spec swami.svg swami.xml 
Log Message:
* Sun Apr 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-4
- Add Requires: hicolor-icon-theme

* Fri Mar 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
- Initial Fedora build



--- NEW FILE import.log ---
swami-0_9_4-4_fc10:F-9:swami-0.9.4-4.fc10.src.rpm:1239645407


--- NEW FILE swami.desktop ---
[Desktop Entry]
Name=Swami Instrument Editor
GenericName=Instrument Editor
Comment=Create, play and organize MIDI instruments and sounds
Exec=swami %F
Icon=swami
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;
MimeType=audio/dls;audio/x-soundfont;


--- NEW FILE swami.spec ---
Name:           swami
Version:        0.9.4
Release:        4%{?dist}
Summary:        MIDI instrument and sound editor
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://swami.resonance.org/
Source0:        http://downloads.sourceforge.net/swami/%{name}-%{version}.tar.bz2
# These files are from upstream trunk (.desktop file is slightly modified)
# http://swami.resonance.org/trac/browser/trunk/swami
Source1:        %{name}.svg
Source2:        %{name}.desktop
Source3:        %{name}.xml
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  audiofile-devel 
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  desktop-file-utils
BuildRequires:  fluidsynth-devel
BuildRequires:  gnome-libs-devel
BuildRequires:  ImageMagick
BuildRequires:  libpng-devel
BuildRequires:  libsndfile-devel
BuildRequires:  libtool
BuildRequires:  popt-devel

Requires:       hicolor-icon-theme

%description
The Swami Project - Sampled Waveforms And Musical Instruments - is a collection
of free software for editing and sharing MIDI instruments and sounds. Swami
aims to provide an instrument editing and sharing software for instrument 
formats such as SoundFont, DLS and GigaSampler. 

%prep
%setup -q

# Fix libdir
sed -i 's|/lib/|/%{_lib}/|g' configure.ac

%build
autoreconf -v -i -f
%configure --disable-static
make %{?_smp_mflags} 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# kill .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la

# desktop file
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps

# icon
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install                                    \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications      \
   %{SOURCE2}

# mime-type file
install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/

# to avoid filename conflicts
for file in AUTHORS ChangeLog README; do
   mv src/libinstpatch/$file $file.libinstpatch
done

%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS* ChangeLog* COPYING NEWS README*
%{_libdir}/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Sun Apr 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-4
- Add Requires: hicolor-icon-theme

* Fri Mar 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
- Initial Fedora build

* Sun Jul 27 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.4-2
- updated for new fluidsynth libraries (1.0.8) on fc8

* Wed Nov 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated desktop categories
- add popt-devel build requirement for f8

* Fri Sep 14 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.4-1
- updated to 0.9.4

* Tue May  8 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-2
- build on fc7, use autogen.sh to use the newer versions of auto* tools
- add MKINSTALLDIRS explicitly in make invocation

* Mon Apr 16 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-2
- spec file tweaks, build on fc6

* Mon May 29 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.3-1
- added Planet CCRMA categories to desktop file, spec file cleanups
- updated to 0.9.3

* Fri Nov 18 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-3
- rebuild for new version of fluidsynth (1.0.6)
- build requires lash (name change from ladcca)
- change all references from ladcca to lash
- added autotools build requirement (for change to lash), needs
  automake17

* Fri Dec 31 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- spec file cleanup

* Fri Sep 24 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-2
- built for new fluidsynth libraries
- set libfluidsynth require to be for the exact version, swami is
  very picky and won't work with newer versions than the one it was
  compiled with

* Thu May 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added code to recognize libpng12.pc in configure

* Wed May 12 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added buildrequires

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.2-1
- updated to 0.9.2
- patched config.status to force recognition of libpng
- erased and obsoleted old libswami and libswami-devel packages

* Mon Nov 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1a-3
- spec file tweaks, autogen ommited, does not work on FC1

* Fri Jul 25 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-3
- rebuilt for fluidsynth 1.0.3
- added release tags and an explicit dependency with the current
  version of libfluidsynth

* Fri Jul 25 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-2
- rebuilt for fluidsynth 1.0.2

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.1-1
- updated to 0.9.1a

* Thu Mar  6 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1.cvs
- cvs: 20030306.185320

* Thu Feb 27 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.9.0-1.cvs
- adapted from mandrake spec file
- switched over to cvs swami

* Fri Jan 31 2003 Austin Acton <aacton at yorku.ca> 0.9.0-1mdk
- adapted spec file from Torbjorn Turpeinen <tobbe at nyvalls.se>


--- NEW FILE swami.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://web.resource.org/cc/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="48"
   height="48"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.43"
   sodipodi:docbase="/home/josh/images/swami"
   sodipodi:docname="Swami_neu12.svg"
   version="1.0"
   inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90">
  <defs
     id="defs4">
    <linearGradient
       id="linearGradient2363">
      <stop
         style="stop-color:#ff2e69;stop-opacity:1;"
         offset="0"
         id="stop2367" />
      <stop
         id="stop3988"
         offset="0.50413221"
         style="stop-color:#f9ffb1;stop-opacity:1;" />
      <stop
         id="stop2369"
         offset="1"
         style="stop-color:#ff2e69;stop-opacity:1;" />
    </linearGradient>
    <linearGradient
       id="linearGradient2275">
      <stop
         style="stop-color:#ffe999;stop-opacity:1;"
         offset="0"
         id="stop2277" />
      <stop
         id="stop2283"
         offset="1"
         style="stop-color:#e25b7a;stop-opacity:1;" />
      <stop
         style="stop-color:#2ed8ff;stop-opacity:0;"
         offset="1"
         id="stop2279" />
    </linearGradient>
    <linearGradient
       id="linearGradient2219">
      <stop
         style="stop-color:#2e2eff;stop-opacity:1;"
         offset="0"
         id="stop2221" />
      <stop
         style="stop-color:#2e2eff;stop-opacity:0.75789475;"
         offset="0.82644629"
         id="stop2303" />
      <stop
         style="stop-color:#2e2eff;stop-opacity:0;"
         offset="1"
         id="stop2223" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient2219"
       id="radialGradient2377"
       cx="130.41817"
       cy="68.150551"
       fx="130.41817"
       fy="68.150551"
       r="15.390964"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(0.480863,0.497137)" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="11.07237"
     inkscape:cx="24.359107"
     inkscape:cy="27.675456"
     inkscape:document-units="px"
     inkscape:current-layer="layer3"
     inkscape:window-width="1166"
     inkscape:window-height="856"
     inkscape:window-x="78"
     inkscape:window-y="58"
     showgrid="false"
     inkscape:grid-bbox="false"
     inkscape:showpageshadow="false" />
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:groupmode="layer"
     id="layer3"
     inkscape:label="Waves">
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.85289347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2409"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 140.76803,79.541865 A 15.390964,15.390964 0 0 1 119.72479,79.220035"
       transform="matrix(1.381901,0,0,1.317353,-156.3313,-80.40712)"
       sodipodi:start="0.83326371"
       sodipodi:end="2.3389141"
       sodipodi:open="true" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.57907322;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2413"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 140.15994,80.066074 A 15.390964,15.390964 0 0 1 120.67425,80.064321"
       transform="matrix(1.869625,0,0,1.782295,-219.9394,-112.0932)"
       sodipodi:start="0.88543369"
       sodipodi:end="2.2563389"
       sodipodi:open="true" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaff;stroke-width:1.37966251;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2415"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 139.50509,80.572689 A 15.390964,15.390964 0 0 1 121.38797,80.613992"
       transform="matrix(2.434941,0,0,2.321205,-293.6669,-148.8202)"
       sodipodi:start="0.93923371"
       sodipodi:end="2.1977994"
       sodipodi:open="true" />
  </g>
  <g
     inkscape:groupmode="layer"
     id="layer2"
     inkscape:label="Shadow"
     style="display:inline">
    <path
       sodipodi:type="inkscape:offset"
       inkscape:radius="1.3931054"
       inkscape:original="M 9.125 1.03125 C 8.2748124 1.1828233 7.6442988 1.9118652 7.59375 2.78125 C 7.59375 2.78125 7.1147764 8.1992955 9.875 13.9375 C 12.401215 19.189226 16.827056 22.644336 22.3125 22.875 C 22.325715 23.84024 22.335495 24.859289 22.34375 25.90625 C 22.374855 29.851045 22.271052 34.137341 21.9375 36 C 20.15904 41.163117 15.124472 42.220393 14.8125 42.28125 C 14.382801 42.335163 13.979313 42.543834 13.6875 42.84375 C 13.572738 42.965718 13.454489 43.130292 13.375 43.28125 C 13.346109 43.338467 13.304412 43.408059 13.28125 43.46875 C 13.107535 43.92393 13.131384 44.438763 13.3125 44.875 C 13.350218 44.961702 13.417738 45.075357 13.46875 45.15625 C 13.515391 45.227492 13.568096 45.309702 13.625 45.375 C 13.639226 45.391324 13.672792 45.421752 13.6875 45.4375 C 13.784623 45.537976 13.916873 45.643622 14.03125 45.71875 C 14.093447 45.75812 14.183961 45.812106 14.25 45.84375 C 14.620657 46.013796 15.057382 46.063954 15.46875 45.96875 C 15.46875 45.96875 20.37881
 4 45.012887 23.59375 40.8125 C 23.5958 40.818195 23.62253 40.838428 23.625 40.84375 C 24.465752 41.797221 25.453462 42.590854 26.46875 43.28125 C 27.484038 43.971646 28.520593 44.540954 29.375 44.96875 C 30.229407 45.396546 30.728217 45.671668 31.4375 45.84375 C 32.447146 46.085375 33.445875 45.447146 33.6875 44.4375 C 33.927237 43.435742 33.339479 42.43917 32.34375 42.1875 C 32.247209 42.140704 31.64906 41.918687 31.0625 41.625 C 30.34058 41.263539 29.437286 40.761105 28.59375 40.1875 C 27.750214 39.613895 26.963747 38.971801 26.4375 38.375 C 25.944143 37.815499 25.72277 37.317722 25.6875 37.09375 C 25.686724 37.086878 25.687883 37.068765 25.6875 37.0625 C 25.67741 36.946221 25.656486 36.831139 25.625 36.71875 C 25.625087 36.708334 25.625087 36.697916 25.625 36.6875 C 26.109594 34.021983 26.125167 29.859423 26.09375 25.875 C 26.085137 24.782615 26.076028 23.712268 26.0625 22.71875 C 32.383122 22.050777 36.36159 18.619542 38.625 15.125 C 40.179377 12.725154 40.775796 9.74918
 76 41.09375 7.3125 C 41.411704 4.875812 41.40625 2.9375 41.40625 2.9375 C 41.412376 2.5043143 41.25756 2.0810974 41 1.75 C 40.858826 1.574523 40.66952 1.3984299 40.46875 1.28125 C 40.450498 1.2705973 40.424763 1.2599869 40.40625 1.25 C 40.294422 1.1920759 40.150067 1.1277055 40.03125 1.09375 C 39.71329 1.0085283 39.349211 1.0085283 39.03125 1.09375 C 38.912433 1.1277055 38.768078 1.1920759 38.65625 1.25 C 38.637737 1.2599869 38.612002 1.2705973 38.59375 1.28125 C 38.392979 1.3984299 38.203674 1.574523 38.0625 1.75 C 37.80494 2.0810974 37.650124 2.5043143 37.65625 2.9375 C 37.65625 2.9375 37.658178 4.6423232 37.375 6.8125 C 37.091822 8.9826772 36.437515 11.598046 35.46875 13.09375 C 33.653649 15.896136 31.030277 18.43119 26.03125 19 C 26.04844 18.130656 26.090158 17.52074 26.09375 17.5 C 26.198266 16.940982 26.058108 16.368864 25.6875 15.9375 C 25.316893 15.506137 24.755883 15.262143 24.1875 15.28125 C 23.288237 15.316242 22.540637 15.985147 22.40625 16.875 C 22.291352 17.538
 502 22.2797 18.248393 22.28125 19.15625 C 18.238505 18.996641 15.338641 16.654558 13.25 12.3125 C 10.959624 7.5510571 11.3125 3.09375 11.3125 3.09375 C 11.373997 2.5244703 11.157916 1.9643279 10.75 1.5625 C 10.342084 1.1606722 9.7870406 0.96119953 9.21875 1.03125 C 9.1909028 1.0349507 9.1524254 1.0263605 9.125 1.03125 z M 24.03125 5.34375 C 22.257801 5.5014132 20.875 6.9982851 20.875 8.8125 C 20.875 10.73167 22.42458 12.28125 24.34375 12.28125 C 26.26292 12.28125 27.84375 10.73167 27.84375 8.8125 C 27.84375 6.8933301 26.26292 5.3437499 24.34375 5.34375 C 24.238795 5.34375 24.133846 5.334629 24.03125 5.34375 z "
       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
       id="path2406"
       d="M 8.875,-0.34375 C 7.3820938,-0.077591424 6.2743943,1.1930122 6.1875,2.6875 C 6.1875,2.6875 5.6889937,8.4276125 8.625,14.53125 C 11.111993,19.701437 15.511924,23.286935 20.90625,24.03125 C 20.913047,24.655654 20.932348,25.252824 20.9375,25.90625 C 20.967958,29.769043 20.832536,34.027252 20.5625,35.625 C 18.991474,39.975604 14.63073,40.886844 14.53125,40.90625 L 14.53125,40.9375 C 13.810312,41.050652 13.178458,41.37041 12.6875,41.875 C 12.471435,42.104632 12.306634,42.339404 12.15625,42.625 C 12.145669,42.635251 12.135251,42.645669 12.125,42.65625 C 12.134338,42.637757 12.064008,42.719146 11.96875,42.96875 C 11.655121,43.790541 11.717905,44.651525 12.03125,45.40625 C 12.031133,45.416666 12.031133,45.427084 12.03125,45.4375 C 12.13392,45.673506 12.212045,45.796507 12.28125,45.90625 C 12.291666,45.906367 12.302084,45.906367 12.3125,45.90625 C 12.35356,45.968967 12.405021,46.100541 12.5625,46.28125 C 12.726472,46.469404 12.752213,46.477748 12.65625,46.375 C 12.666501,46
 .385581 12.676919,46.395999 12.6875,46.40625 C 12.884686,46.610243 13.077841,46.741392 13.28125,46.875 C 13.281133,46.885416 13.281133,46.895834 13.28125,46.90625 C 13.373248,46.964484 13.480731,47.009646 13.65625,47.09375 C 13.656133,47.104166 13.656133,47.114584 13.65625,47.125 C 14.309495,47.424689 15.054155,47.480774 15.78125,47.3125 C 15.78125,47.3125 20.169836,46.34938 23.65625,42.6875 C 24.325463,43.300444 24.981973,43.957742 25.6875,44.4375 C 26.772902,45.175573 27.856494,45.771377 28.75,46.21875 C 29.58469,46.636674 30.199273,46.970487 31.09375,47.1875 C 31.104166,47.187617 31.114584,47.187617 31.125,47.1875 C 32.876917,47.606763 34.618316,46.475474 35.03125,44.75 C 35.417426,43.136336 34.489945,41.513864 32.9375,40.96875 L 32.9375,40.9375 C 32.797622,40.869697 32.755197,40.869844 32.6875,40.84375 C 32.616623,40.81643 32.549248,40.765397 32.4375,40.71875 C 32.219019,40.62755 31.93693,40.499888 31.6875,40.375 C 31.011716,40.036639 30.148928,39.557522 29.375,39.03125 
 C 28.598263,38.503069 27.867449,37.920903 27.46875,37.46875 C 27.109762,37.061632 27.007769,36.527449 27.0625,36.875 C 27.056816,36.821442 27.039568,36.77193 27.03125,36.71875 C 27.032783,36.709777 27.029726,36.696495 27.03125,36.6875 C 27.522315,33.788235 27.530735,29.772919 27.5,25.875 C 27.494424,25.167757 27.475824,24.488184 27.46875,23.8125 C 33.471075,22.778432 37.504187,19.390621 39.78125,15.875 C 41.532909,13.170565 42.140705,10.01402 42.46875,7.5 C 42.799233,4.9672951 42.8125,2.9375 42.8125,2.9375 C 42.8235,2.1596652 42.538444,1.4779105 42.09375,0.90625 C 42.093867,0.89583366 42.093867,0.88541634 42.09375,0.875 C 41.856634,0.58026888 41.552522,0.2937854 41.15625,0.0625 C 40.993446,-0.032519813 40.969097,-0.019136563 41.0625,0.03125 C 41.062617,0.020833661 41.062617,0.010416339 41.0625,-1.3066335e-17 C 40.890191,-0.089251933 40.685686,-0.17014284 40.40625,-0.25 C 39.831428,-0.4040675 39.231071,-0.40406689 38.65625,-0.25 C 38.376814,-0.17014284 38.172309,-0.089251933 
 38,0 C 37.999883,0.010416339 37.999883,0.020833661 38,0.03125 C 38.093403,-0.019136563 38.069054,-0.032519813 37.90625,0.0625 C 37.509973,0.29378667 37.205864,0.58027139 36.96875,0.875 C 36.968633,0.88541634 36.968633,0.89583366 36.96875,0.90625 C 36.524056,1.4779105 36.239,2.1909152 36.25,2.96875 C 36.25,2.96875 36.270961,4.5484479 36,6.625 C 35.733866,8.6645614 35.034034,11.229753 34.3125,12.34375 C 32.842602,14.613167 30.903698,16.444258 27.4375,17.25 C 27.462814,16.459349 27.290371,15.660208 26.75,15.03125 C 26.095751,14.269745 25.153408,13.841479 24.15625,13.875 C 24.145834,13.874883 24.135416,13.874883 24.125,13.875 C 22.56645,13.935646 21.264162,15.114008 21.03125,16.65625 C 20.981977,16.940787 20.989725,17.25072 20.96875,17.53125 C 18.208131,16.988504 16.179737,15.210742 14.5,11.71875 C 12.381076,7.3137366 12.6875,3.21875 12.6875,3.21875 C 12.796901,2.206018 12.412548,1.2459433 11.71875,0.5625 C 11.024952,-0.12094344 10.058802,-0.46655939 9.0625,-0.34375 C 9.0520837,
 -0.34386682 9.0416663,-0.34386682 9.03125,-0.34375 C 9.4485881,-0.39921134 9.4016396,-0.43764122 8.875,-0.34375 z M 24.34375,3.9375 C 24.319506,3.9375 24.173912,3.9449543 23.90625,3.96875 C 21.42173,4.1896288 19.46875,6.2903985 19.46875,8.8125 C 19.46875,11.481553 21.674697,13.6875 24.34375,13.6875 C 27.012803,13.6875 29.25,11.496675 29.25,8.8125 C 29.25,6.1283248 27.012803,3.9374999 24.34375,3.9375 z "
       transform="translate(-0.461784,0.552099)" />
  </g>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     style="display:inline">
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       id="path1395"
       style="fill:none;stroke:#2e2eff;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="M 23.797811,17.732005 C 23.46144,19.674457 24.184247,32.57449 23.329006,37.045324 C 21.197006,43.497063 14.682811,44.680774 14.682811,44.680774 M 23.360254,37.731367 C 23.561959,41.027502 30.376898,44.3094 31.415912,44.561479"
       sodipodi:nodetypes="ccccc" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:nodetypes="csczc"
       style="fill:none;stroke:#2e2eff;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="M 39.056097,3.4894952 C 39.056097,3.4894952 39.115404,10.75545 36.592262,14.651 C 34.292243,18.202065 30.399605,21.578243 23.304352,21.554256 C 17.816838,21.945927 13.632929,18.95855 11.092691,13.677671 C 8.5673909,8.4278472 8.9899956,3.4797832 8.9899956,3.4797832"
       id="path1391" />
    <path
       inkscape:export-ydpi="17.288649"
       inkscape:export-xdpi="17.288649"
       inkscape:export-filename="/home/josh/images/swami/swami_icon.png"
       sodipodi:type="arc"
       style="fill:#2e2eff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:21.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="path2289"
       sodipodi:cx="130.41817"
       sodipodi:cy="68.150551"
       sodipodi:rx="15.390964"
       sodipodi:ry="15.390964"
       d="M 145.80913 68.150551 A 15.390964 15.390964 0 1 1  115.0272,68.150551 A 15.390964 15.390964 0 1 1  145.80913 68.150551 z"
       transform="matrix(0.225896,0,0,0.225896,-5.56725,-6.023737)" />
  </g>
</svg>


--- NEW FILE swami.xml ---
<?xml version="1.0"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
  <mime-type type="audio/dls">
    <comment>Downloadable Sounds</comment>
    <magic priority="50">
      <match type="string" offset="0" value="RIFF">
        <match type="string" offset="8" value="DLS "/>
      </match>
    </magic>
    <glob pattern="*.dls"/>
    <glob pattern="*.dls2"/>
  </mime-type>
  <mime-type type="audio/x-soundfont">
    <comment>SoundFont</comment>
    <magic priority="50">
      <match type="string" offset="0" value="RIFF">
        <match type="string" offset="8" value="sfbk"/>
      </match>
    </magic>
    <glob pattern="*.sf2"/>
  </mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swami/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:48:23 -0000	1.1
+++ .cvsignore	13 Apr 2009 17:57:14 -0000	1.2
@@ -0,0 +1 @@
+swami-0.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swami/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:48:23 -0000	1.1
+++ sources	13 Apr 2009 17:57:14 -0000	1.2
@@ -0,0 +1 @@
+83da8e71ce1e6cda0f41d9f5e0ed3fdf  swami-0.9.4.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 18:09:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 18:09:29 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel seahorse-plugins.spec,1.23,1.24
Message-ID: <20090413180930.26B3E70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26695

Modified Files:
	seahorse-plugins.spec 
Log Message:
fix file lists



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- seahorse-plugins.spec	13 Apr 2009 17:39:35 -0000	1.23
+++ seahorse-plugins.spec	13 Apr 2009 18:08:58 -0000	1.24
@@ -156,8 +156,8 @@
 %{_libdir}/gedit-2/plugins/libseahorse-pgp.so
 %{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
 %{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so
-%{_libdir}/epiphany/2.25/extensions/libseahorseextension.so
-%{_libdir}/epiphany/2.25/extensions/seahorse.ephy-extension
+%{_libdir}/epiphany/2.26/extensions/libseahorseextension.so
+%{_libdir}/epiphany/2.26/extensions/seahorse.ephy-extension
 %{_libdir}/seahorse/seahorse-applet
 %{_datadir}/gnome-2.0/ui/GNOME_SeahorseApplet.xml
 %{_datadir}/applications/seahorse-pgp-encrypted.desktop



From cebbert at fedoraproject.org  Mon Apr 13 18:21:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 13 Apr 2009 18:21:12 +0000 (UTC)
Subject: rpms/kernel/F-10 alsa-dont-reset-stream-at-each-prepare-callb.patch,
	NONE, 1.1 alsa-hda-dont-reset-BDL-unnecessarily.patch, NONE,
	1.1 alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch,
	NONE, 1.1 alsa-hda_intel-prealloc-4mb-dmabuffer.patch, NONE,
	1.1 alsa-pcm-always-reset-invalid-position.patch, NONE,
	1.1 alsa-pcm-fix-delta-calc-at-overlap.patch, NONE,
	1.1 alsa-pcm-midlevel-add-more-strict-buffer-position.patch,
	NONE, 1.1 alsa-pcm-safer-boundary-checks.patch, NONE,
	1.1 kernel.spec, 1.1321, 1.1322
Message-ID: <20090413182112.15A9970124@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31585

Modified Files:
	kernel.spec 
Added Files:
	alsa-dont-reset-stream-at-each-prepare-callb.patch 
	alsa-hda-dont-reset-BDL-unnecessarily.patch 
	alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch 
	alsa-hda_intel-prealloc-4mb-dmabuffer.patch 
	alsa-pcm-always-reset-invalid-position.patch 
	alsa-pcm-fix-delta-calc-at-overlap.patch 
	alsa-pcm-midlevel-add-more-strict-buffer-position.patch 
	alsa-pcm-safer-boundary-checks.patch 
Log Message:
Copy ALSA pulseaudio fixes from F-11.

alsa-dont-reset-stream-at-each-prepare-callb.patch:

--- NEW FILE alsa-dont-reset-stream-at-each-prepare-callb.patch ---
>From fc546201dfe40d09c1a1e82384dc3774025984da Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 18 Mar 2009 15:15:37 +0100
Subject: ALSA: hda - Don't reset stream at each prepare callback

Don't reset the stream at each prepare callback but do it only once
after the open.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/pci/hda/hda_intel.c |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b7a61a1..931a62d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -858,13 +858,18 @@ static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
 		      SD_CTL_DMA_START | SD_INT_MASK);
 }
 
-/* stop a stream */
-static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+/* stop DMA */
+static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)
 {
-	/* stop DMA */
 	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
 		      ~(SD_CTL_DMA_START | SD_INT_MASK));
 	azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
+}
+
+/* stop a stream */
+static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+{
+	azx_stream_clear(chip, azx_dev);
 	/* disable SIE */
 	azx_writeb(chip, INTCTL,
 		   azx_readb(chip, INTCTL) & ~(1 << azx_dev->index));
@@ -1125,18 +1130,14 @@ static int azx_setup_periods(struct azx *chip,
 	return -EINVAL;
 }
 
-/*
- * set up the SD for streaming
- */
-static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+/* reset stream */
+static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 {
 	unsigned char val;
 	int timeout;
 
-	/* make sure the run bit is zero for SD */
-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
-		      ~SD_CTL_DMA_START);
-	/* reset stream */
+	azx_stream_clear(chip, azx_dev);
+
 	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
 		      SD_CTL_STREAM_RESET);
 	udelay(3);
@@ -1153,7 +1154,15 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
 	while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
 	       --timeout)
 		;
+}
 
+/*
+ * set up the SD for streaming
+ */
+static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+{
+	/* make sure the run bit is zero for SD */
+	azx_stream_clear(chip, azx_dev);
 	/* program the stream_tag */
 	azx_sd_writel(azx_dev, SD_CTL,
 		      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK)|
@@ -1399,6 +1408,8 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
 	runtime->private_data = azx_dev;
 	snd_pcm_set_sync(substream);
 	mutex_unlock(&chip->open_mutex);
+
+	azx_stream_reset(chip, azx_dev);
 	return 0;
 }
 
-- 
1.6.2.2


alsa-hda-dont-reset-BDL-unnecessarily.patch:

--- NEW FILE alsa-hda-dont-reset-BDL-unnecessarily.patch ---
>From b98a9f6d1619b7fe32c2a6a4e5190121830f979b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 18 Mar 2009 15:09:13 +0100
Subject: ALSA: hda - Don't reset BDL unnecessarily

So far, the prepare callback is called multiple times, BDL entries
are reset and re-programmed at each time.

This patch adds the check to avoid the reset of BDL entries when the
same parameters are used.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/pci/hda/hda_intel.c |   46 +++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f3b5723..b7a61a1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1075,8 +1075,7 @@ static int azx_setup_periods(struct azx *chip,
 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 
-	period_bytes = snd_pcm_lib_period_bytes(substream);
-	azx_dev->period_bytes = period_bytes;
+	period_bytes = azx_dev->period_bytes;
 	periods = azx_dev->bufsize / period_bytes;
 
 	/* program the initial BDL entries */
@@ -1123,9 +1122,6 @@ static int azx_setup_periods(struct azx *chip,
  error:
 	snd_printk(KERN_ERR "Too many BDL entries: buffer=%d, period=%d\n",
 		   azx_dev->bufsize, period_bytes);
-	/* reset */
-	azx_sd_writel(azx_dev, SD_BDLPL, 0);
-	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 	return -EINVAL;
 }
 
@@ -1429,6 +1425,11 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
 static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
 			     struct snd_pcm_hw_params *hw_params)
 {
+	struct azx_dev *azx_dev = get_azx_dev(substream);
+
+	azx_dev->bufsize = 0;
+	azx_dev->period_bytes = 0;
+	azx_dev->format_val = 0;
 	return snd_pcm_lib_malloc_pages(substream,
 					params_buffer_bytes(hw_params));
 }
@@ -1443,6 +1444,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 	azx_sd_writel(azx_dev, SD_CTL, 0);
+	azx_dev->bufsize = 0;
+	azx_dev->period_bytes = 0;
+	azx_dev->format_val = 0;
 
 	hinfo->ops.cleanup(hinfo, apcm->codec, substream);
 
@@ -1456,23 +1460,37 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 	struct azx_dev *azx_dev = get_azx_dev(substream);
 	struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
 	struct snd_pcm_runtime *runtime = substream->runtime;
+	unsigned int bufsize, period_bytes, format_val;
+	int err;
 
-	azx_dev->bufsize = snd_pcm_lib_buffer_bytes(substream);
-	azx_dev->format_val = snd_hda_calc_stream_format(runtime->rate,
-							 runtime->channels,
-							 runtime->format,
-							 hinfo->maxbps);
-	if (!azx_dev->format_val) {
+	format_val = snd_hda_calc_stream_format(runtime->rate,
+						runtime->channels,
+						runtime->format,
+						hinfo->maxbps);
+	if (!format_val) {
 		snd_printk(KERN_ERR SFX
 			   "invalid format_val, rate=%d, ch=%d, format=%d\n",
 			   runtime->rate, runtime->channels, runtime->format);
 		return -EINVAL;
 	}
 
+	bufsize = snd_pcm_lib_buffer_bytes(substream);
+	period_bytes = snd_pcm_lib_period_bytes(substream);
+
 	snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
-		    azx_dev->bufsize, azx_dev->format_val);
-	if (azx_setup_periods(chip, substream, azx_dev) < 0)
-		return -EINVAL;
+		    bufsize, format_val);
+
+	if (bufsize != azx_dev->bufsize ||
+	    period_bytes != azx_dev->period_bytes ||
+	    format_val != azx_dev->format_val) {
+		azx_dev->bufsize = bufsize;
+		azx_dev->period_bytes = period_bytes;
+		azx_dev->format_val = format_val;
+		err = azx_setup_periods(chip, substream, azx_dev);
+		if (err < 0)
+			return err;
+	}
+
 	azx_setup_controller(chip, azx_dev);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
-- 
1.6.2.2


alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch:

--- NEW FILE alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch ---
>From 8820b651ddf48830af44520a13e63f5b9c5b9f9f Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Fri, 10 Apr 2009 12:20:45 +0200
Subject: [ALSA] hda_intel: fix unexpected ring buffer positions

I found two issues with ICH7-M (it should be related to other HDA chipsets
as well):

- the ring buffer position is not reset when stream restarts (after xrun) -
  solved by moving azx_stream_reset() call from open() to prepare() callback
  and reset posbuf to zero (it might be filled with hw later than position()
  callback is called)
- irq_ignore flag should be set also when ring buffer memory area is not
  changed in prepare() callback - this patch replaces irq_ignore with
  more universal check based on jiffies clock

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 sound/pci/hda/hda_intel.c |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 931a62d..7112e0e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -312,6 +312,9 @@ struct azx_dev {
 	unsigned int period_bytes; /* size of the period in bytes */
 	unsigned int frags;	/* number for period in the play buffer */
 	unsigned int fifo_size;	/* FIFO size */
+	unsigned int start_flag: 1;	/* stream full start flag */
+	unsigned long start_jiffies;	/* start + minimum jiffies */
+	unsigned long min_jiffies;	/* minimum jiffies before position is valid */
 
 	void __iomem *sd_addr;	/* stream descriptor pointer */
 
@@ -330,7 +333,6 @@ struct azx_dev {
 	unsigned int opened :1;
 	unsigned int running :1;
 	unsigned int irq_pending :1;
-	unsigned int irq_ignore :1;
 	/*
 	 * For VIA:
 	 *  A flag to ensure DMA position is 0
@@ -974,7 +976,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
 	struct azx *chip = dev_id;
 	struct azx_dev *azx_dev;
 	u32 status;
-	int i;
+	int i, ok;
 
 	spin_lock(&chip->reg_lock);
 
@@ -990,18 +992,14 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
 			azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);
 			if (!azx_dev->substream || !azx_dev->running)
 				continue;
-			/* ignore the first dummy IRQ (due to pos_adj) */
-			if (azx_dev->irq_ignore) {
-				azx_dev->irq_ignore = 0;
-				continue;
-			}
 			/* check whether this IRQ is really acceptable */
-			if (azx_position_ok(chip, azx_dev)) {
+			ok = azx_position_ok(chip, azx_dev);
+			if (ok == 1) {
 				azx_dev->irq_pending = 0;
 				spin_unlock(&chip->reg_lock);
 				snd_pcm_period_elapsed(azx_dev->substream);
 				spin_lock(&chip->reg_lock);
-			} else if (chip->bus && chip->bus->workq) {
+			} else if (ok == 0 && chip->bus && chip->bus->workq) {
 				/* bogus IRQ, process it later */
 				azx_dev->irq_pending = 1;
 				queue_work(chip->bus->workq,
@@ -1087,7 +1085,6 @@ static int azx_setup_periods(struct azx *chip,
 	bdl = (u32 *)azx_dev->bdl.area;
 	ofs = 0;
 	azx_dev->frags = 0;
-	azx_dev->irq_ignore = 0;
 	pos_adj = bdl_pos_adj[chip->dev_index];
 	if (pos_adj > 0) {
 		struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1108,7 +1105,6 @@ static int azx_setup_periods(struct azx *chip,
 					 &bdl, ofs, pos_adj, 1);
 			if (ofs < 0)
 				goto error;
-			azx_dev->irq_ignore = 1;
 		}
 	} else
 		pos_adj = 0;
@@ -1154,6 +1150,9 @@ static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 	while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
 	       --timeout)
 		;
+
+	/* reset first position - may not be synced with hw at this time */
+	*azx_dev->posbuf = 0;
 }
 
 /*
@@ -1409,7 +1408,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
 	snd_pcm_set_sync(substream);
 	mutex_unlock(&chip->open_mutex);
 
-	azx_stream_reset(chip, azx_dev);
 	return 0;
 }
 
@@ -1474,6 +1472,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 	unsigned int bufsize, period_bytes, format_val;
 	int err;
 
+	azx_stream_reset(chip, azx_dev);
 	format_val = snd_hda_calc_stream_format(runtime->rate,
 						runtime->channels,
 						runtime->format,
@@ -1502,6 +1501,8 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 			return err;
 	}
 
+	azx_dev->min_jiffies = (runtime->period_size * HZ) /
+						(runtime->rate * 2);
 	azx_setup_controller(chip, azx_dev);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
@@ -1518,13 +1519,14 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 	struct azx *chip = apcm->chip;
 	struct azx_dev *azx_dev;
 	struct snd_pcm_substream *s;
-	int start, nsync = 0, sbits = 0;
+	int rstart = 0, start, nsync = 0, sbits = 0;
 	int nwait, timeout;
 
 	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START:
+		rstart = 1;
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 	case SNDRV_PCM_TRIGGER_RESUME:
-	case SNDRV_PCM_TRIGGER_START:
 		start = 1;
 		break;
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
@@ -1554,6 +1556,10 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 		if (s->pcm->card != substream->pcm->card)
 			continue;
 		azx_dev = get_azx_dev(s);
+		if (rstart) {
+			azx_dev->start_flag = 1;
+			azx_dev->start_jiffies = jiffies + azx_dev->min_jiffies;
+		}
 		if (start)
 			azx_stream_start(chip, azx_dev);
 		else
@@ -1703,6 +1709,11 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 {
 	unsigned int pos;
 
+	if (azx_dev->start_flag &&
+	    time_before_eq(jiffies, azx_dev->start_jiffies))
+		return -1;	/* bogus (too early) interrupt */
+	azx_dev->start_flag = 0;
+
 	pos = azx_get_position(chip, azx_dev);
 	if (chip->position_fix == POS_FIX_AUTO) {
 		if (!pos) {
-- 
1.6.2.2


alsa-hda_intel-prealloc-4mb-dmabuffer.patch:

--- NEW FILE alsa-hda_intel-prealloc-4mb-dmabuffer.patch ---
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c8d9178..7d3bb15 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1774,6 +1774,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
 	struct azx_pcm *apcm;
 	int pcm_dev = cpcm->device;
 	int s, err;
+	size_t prealloc_min = 64*1024;	/* 64KB */
 
 	if (pcm_dev >= AZX_MAX_PCMS) {
 		snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",
@@ -1807,10 +1808,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
 		if (cpcm->stream[s].substreams)
 			snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
 	}
+
 	/* buffer pre-allocation */
+
+	/* subtle, don't allocate a big buffer for modems...
+	 * also, don't just test 32BIT_MASK, since azx supports
+	 * 64-bit DMA in some cases.
+	 */
+	/* lennart wants a 2.2MB buffer for 2sec of 48khz */
+	if (pcm->dev_class == SNDRV_PCM_CLASS_GENERIC &&
+	    chip->pci->dma_mask >= DMA_32BIT_MASK)
+		prealloc_min = 4 * 1024 * 1024;	/* 4MB */
+
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
 					      snd_dma_pci_data(chip->pci),
-					      1024 * 64, 32 * 1024 * 1024);
+					      prealloc_min, 32 * 1024 * 1024);
 	return 0;
 }
 

alsa-pcm-always-reset-invalid-position.patch:

--- NEW FILE alsa-pcm-always-reset-invalid-position.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Thu, 19 Mar 2009 09:01:47 +0000 (+0100)
Subject: ALSA: pcm - Reset invalid position even without debug option
X-Git-Url: http://git.alsa-project.org/?p=alsa-kernel.git;a=commitdiff_plain;h=f28f43ce9ae6573952d2348bb6da859cad762143

ALSA: pcm - Reset invalid position even without debug option

Always reset the invalind hw_ptr position returned by the pointer
callback.  The behavior should be consitent independently from the
debug option.

Also, add the printk_ratelimit() check to avoid flooding debug
prints.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 3026547..92ed6d8 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -159,11 +159,15 @@ snd_pcm_update_hw_ptr_pos(struct snd_pcm_substream *substream,
 	pos = substream->ops->pointer(substream);
 	if (pos == SNDRV_PCM_POS_XRUN)
 		return pos; /* XRUN */
-#ifdef CONFIG_SND_DEBUG
 	if (pos >= runtime->buffer_size) {
-		snd_printk(KERN_ERR  "BUG: stream = %i, pos = 0x%lx, buffer size = 0x%lx, period size = 0x%lx\n", substream->stream, pos, runtime->buffer_size, runtime->period_size);
+		if (printk_ratelimit()) {
+			snd_printd(KERN_ERR  "BUG: stream = %i, pos = 0x%lx, "
+				   "buffer size = 0x%lx, period size = 0x%lx\n",
+				   substream->stream, pos, runtime->buffer_size,
+				   runtime->period_size);
+		}
+		pos = 0;
 	}
-#endif
 	pos -= pos % runtime->min_align;
 	return pos;
 }

alsa-pcm-fix-delta-calc-at-overlap.patch:

--- NEW FILE alsa-pcm-fix-delta-calc-at-overlap.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Thu, 19 Mar 2009 09:08:49 +0000 (+0100)
Subject: ALSA: pcm - Fix delta calculation at boundary overlap
X-Git-Url: http://git.alsa-project.org/?p=alsa-kernel.git;a=commitdiff_plain;h=09a067199b6caa61818fc04f4759048dff13b21c

ALSA: pcm - Fix delta calculation at boundary overlap

When the hw_ptr_interrupt reaches the boundary, it must check whether
the hw_base was already lapped and corret the delta value appropriately.

Also, rebasing the hw_ptr needs a correction because buffer_size isn't
always aligned to period_size.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 92ed6d8..063c675 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -221,8 +221,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 	new_hw_ptr = hw_base + pos;
 	hw_ptr_interrupt = runtime->hw_ptr_interrupt + runtime->period_size;
 	delta = new_hw_ptr - hw_ptr_interrupt;
-	if (hw_ptr_interrupt == runtime->boundary)
-		hw_ptr_interrupt = 0;
+	if (hw_ptr_interrupt >= runtime->boundary) {
+		hw_ptr_interrupt %= runtime->boundary;
+		if (!hw_base) /* hw_base was already lapped; recalc delta */
+			delta = new_hw_ptr - hw_ptr_interrupt;
+	}
 	if (delta < 0) {
 		delta += runtime->buffer_size;
 		if (delta < 0) {
@@ -233,6 +236,8 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 				     (long)hw_ptr_interrupt);
 			/* rebase to interrupt position */
 			hw_base = new_hw_ptr = hw_ptr_interrupt;
+			/* align hw_base to buffer_size */
+			hw_base -= hw_base % runtime->buffer_size;
 			delta = 0;
 		} else {
 			hw_base += runtime->buffer_size;

alsa-pcm-midlevel-add-more-strict-buffer-position.patch:

--- NEW FILE alsa-pcm-midlevel-add-more-strict-buffer-position.patch ---
>From bbf6ad1399e9516b0a95de3ad58ffbaed670e4cc Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Fri, 10 Apr 2009 12:28:58 +0200
Subject: [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies

Some drivers like Intel8x0 or Intel HDA are broken for some hardware variants.
This patch adds more strict buffer position checks based on jiffies when
internal hw_ptr is updated. Enable xrun_debug to see mangling of wrong
positions.

As a side effect, the hw_ptr interrupt update routine might do slightly better
job when many interrupts are lost.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 include/sound/pcm.h  |    3 ++-
 sound/core/pcm_lib.c |   47 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 8904b19..c172968 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -268,7 +268,8 @@ struct snd_pcm_runtime {
 	int overrange;
 	snd_pcm_uframes_t avail_max;
 	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */
-	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/
+	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
+	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */
 
 	/* -- HW params -- */
 	snd_pcm_access_t access;	/* access mode */
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index fbb2e39..63d088f 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -209,9 +209,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	snd_pcm_uframes_t pos;
-	snd_pcm_uframes_t new_hw_ptr, hw_ptr_interrupt, hw_base;
-	snd_pcm_sframes_t delta;
+	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_ptr_interrupt, hw_base;
+	snd_pcm_sframes_t hdelta, delta;
+	unsigned long jdelta;
 
+	old_hw_ptr = runtime->status->hw_ptr;
 	pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
 	if (pos == SNDRV_PCM_POS_XRUN) {
 		xrun(substream);
@@ -247,7 +249,30 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 			new_hw_ptr = hw_base + pos;
 		}
 	}
-	if (delta > runtime->period_size) {
+	hdelta = new_hw_ptr - old_hw_ptr;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
+	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {
+		delta = jdelta /
+			(((runtime->period_size * HZ) / runtime->rate)
+								+ HZ/100);
+		hw_ptr_error(substream,
+			     "hw_ptr skipping! [Q] "
+			     "(pos=%ld, delta=%ld, period=%ld, "
+			     "jdelta=%lu/%lu/%lu)\n",
+			     (long)pos, (long)hdelta,
+			     (long)runtime->period_size, jdelta,
+			     ((hdelta * HZ) / runtime->rate), delta);
+		hw_ptr_interrupt = runtime->hw_ptr_interrupt +
+				   runtime->period_size * delta;
+		if (hw_ptr_interrupt >= runtime->boundary)
+			hw_ptr_interrupt -= runtime->boundary;
+		/* rebase to interrupt position */
+		hw_base = new_hw_ptr = hw_ptr_interrupt;
+		/* align hw_base to buffer_size */
+		hw_base -= hw_base % runtime->buffer_size;
+		delta = 0;
+	}
+	if (delta > runtime->period_size + runtime->period_size / 2) {
 		hw_ptr_error(substream,
 			     "Lost interrupts? "
 			     "(stream=%i, delta=%ld, intr_ptr=%ld)\n",
@@ -263,6 +288,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 
 	runtime->hw_ptr_base = hw_base;
 	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
 	runtime->hw_ptr_interrupt = hw_ptr_interrupt;
 
 	return snd_pcm_update_hw_ptr_post(substream, runtime);
@@ -275,6 +301,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 	snd_pcm_uframes_t pos;
 	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;
 	snd_pcm_sframes_t delta;
+	unsigned long jdelta;
 
 	old_hw_ptr = runtime->status->hw_ptr;
 	pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
@@ -286,14 +313,15 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 	new_hw_ptr = hw_base + pos;
 
 	delta = new_hw_ptr - old_hw_ptr;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
 	if (delta < 0) {
 		delta += runtime->buffer_size;
 		if (delta < 0) {
 			hw_ptr_error(substream, 
 				     "Unexpected hw_pointer value [2] "
-				     "(stream=%i, pos=%ld, old_ptr=%ld)\n",
+				     "(stream=%i, pos=%ld, old_ptr=%ld, jdelta=%li)\n",
 				     substream->stream, (long)pos,
-				     (long)old_hw_ptr);
+				     (long)old_hw_ptr, jdelta);
 			return 0;
 		}
 		hw_base += runtime->buffer_size;
@@ -301,12 +329,13 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 			hw_base = 0;
 		new_hw_ptr = hw_base + pos;
 	}
-	if (delta > runtime->period_size && runtime->periods > 1) {
+	if (((delta * HZ) / runtime->rate) > jdelta + HZ/100) {
 		hw_ptr_error(substream,
 			     "hw_ptr skipping! "
-			     "(pos=%ld, delta=%ld, period=%ld)\n",
+			     "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n",
 			     (long)pos, (long)delta,
-			     (long)runtime->period_size);
+			     (long)runtime->period_size, jdelta,
+			     ((delta * HZ) / runtime->rate));
 		return 0;
 	}
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
@@ -315,6 +344,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 
 	runtime->hw_ptr_base = hw_base;
 	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
 
 	return snd_pcm_update_hw_ptr_post(substream, runtime);
 }
@@ -1441,6 +1471,7 @@ static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,
 		runtime->status->hw_ptr %= runtime->buffer_size;
 	else
 		runtime->status->hw_ptr = 0;
+	runtime->hw_ptr_jiffies = jiffies;
 	snd_pcm_stream_unlock_irqrestore(substream, flags);
 	return 0;
 }
-- 
1.6.2.2


alsa-pcm-safer-boundary-checks.patch:

--- NEW FILE alsa-pcm-safer-boundary-checks.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Fri, 20 Mar 2009 15:26:15 +0000 (+0100)
Subject: ALSA: pcm - Safer boundary checks
X-Git-Url: http://git.alsa-project.org/?p=alsa-kernel.git;a=commitdiff_plain;h=d9b59892fb7108f6ee33a4fcdc257587b68f2ed6

ALSA: pcm - Safer boundary checks

Make the boundary checks a bit safer.
These caese are rare or theoretically won't happen, but nothing
bad to keep the checks safer...

Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 063c675..fbb2e39 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -222,8 +222,9 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 	hw_ptr_interrupt = runtime->hw_ptr_interrupt + runtime->period_size;
 	delta = new_hw_ptr - hw_ptr_interrupt;
 	if (hw_ptr_interrupt >= runtime->boundary) {
-		hw_ptr_interrupt %= runtime->boundary;
-		if (!hw_base) /* hw_base was already lapped; recalc delta */
+		hw_ptr_interrupt -= runtime->boundary;
+		if (hw_base < runtime->boundary / 2)
+			/* hw_base was already lapped; recalc delta */
 			delta = new_hw_ptr - hw_ptr_interrupt;
 	}
 	if (delta < 0) {
@@ -241,7 +242,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 			delta = 0;
 		} else {
 			hw_base += runtime->buffer_size;
-			if (hw_base == runtime->boundary)
+			if (hw_base >= runtime->boundary)
 				hw_base = 0;
 			new_hw_ptr = hw_base + pos;
 		}
@@ -296,7 +297,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 			return 0;
 		}
 		hw_base += runtime->buffer_size;
-		if (hw_base == runtime->boundary)
+		if (hw_base >= runtime->boundary)
 			hw_base = 0;
 		new_hw_ptr = hw_base + pos;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -r1.1321 -r1.1322
--- kernel.spec	13 Apr 2009 17:30:44 -0000	1.1321
+++ kernel.spec	13 Apr 2009 18:21:11 -0000	1.1322
@@ -629,7 +629,15 @@
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch602: alsa-rewrite-hw_ptr-updaters.patch
+Patch601: alsa-rewrite-hw_ptr-updaters.patch
+Patch602: alsa-pcm-always-reset-invalid-position.patch
+Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
+Patch604: alsa-pcm-safer-boundary-checks.patch
+Patch605: alsa-hda-dont-reset-BDL-unnecessarily.patch
+Patch606: alsa-dont-reset-stream-at-each-prepare-callb.patch
+Patch607: alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+Patch608: alsa-pcm-midlevel-add-more-strict-buffer-position.patch
+Patch609: alsa-hda_intel-prealloc-4mb-dmabuffer.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
@@ -1189,8 +1197,16 @@
 # fix cpqarray pci enable
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 
-# ALSA
+# fix alsa for pulseaudio
 ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
+ApplyPatch alsa-pcm-always-reset-invalid-position.patch
+ApplyPatch alsa-pcm-fix-delta-calc-at-overlap.patch
+ApplyPatch alsa-pcm-safer-boundary-checks.patch
+ApplyPatch alsa-hda-dont-reset-BDL-unnecessarily.patch
+ApplyPatch alsa-dont-reset-stream-at-each-prepare-callb.patch
+ApplyPatch alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+ApplyPatch alsa-pcm-midlevel-add-more-strict-buffer-position.patch
+ApplyPatch alsa-hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
 
@@ -1847,6 +1863,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-21
+- Copy ALSA pulseaudio fixes from F-11.
+
 * Mon Apr 13 2009 John W. Linville <linville at redhat.com>  2.6.29.1-20
 - Remove iwl3945: rely on priv->lock to protect priv access
 



From till at fedoraproject.org  Mon Apr 13 18:27:48 2009
From: till at fedoraproject.org (Till Maas)
Date: Mon, 13 Apr 2009 18:27:48 +0000 (UTC)
Subject: rpms/bindfs/devel .cvsignore, 1.2, 1.3 bindfs.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090413182748.EF8CE70137@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/bindfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1450

Modified Files:
	.cvsignore bindfs.spec sources 
Log Message:
* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.8.3-1
- Update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bindfs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2008 13:16:52 -0000	1.2
+++ .cvsignore	13 Apr 2009 18:27:17 -0000	1.3
@@ -1 +1 @@
-bindfs-1.8.2.tar.gz
+bindfs-1.8.3.tar.gz


Index: bindfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bindfs/devel/bindfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bindfs.spec	24 Feb 2009 04:42:45 -0000	1.3
+++ bindfs.spec	13 Apr 2009 18:27:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bindfs
-Version:        1.8.2
-Release:        3%{?dist}
+Version:        1.8.3
+Release:        1%{?dist}
 Summary:        Fuse filesystem to mirror a directory
 
 Group:          System Environment/Base
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.8.3-1
+- Update to new upstream release
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bindfs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2008 13:16:52 -0000	1.2
+++ sources	13 Apr 2009 18:27:18 -0000	1.3
@@ -1 +1 @@
-e53d5449e010a79305fdb72f0edcf3a2  bindfs-1.8.2.tar.gz
+9ff4eafc37ce7ed4092bd6fec086e7cf  bindfs-1.8.3.tar.gz



From mclasen at fedoraproject.org  Mon Apr 13 18:33:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 18:33:43 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.39, 1.40 gvfs.spec, 1.123,
	1.124 sources, 1.39, 1.40
Message-ID: <20090413183343.E9E9970124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4417

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	2 Apr 2009 23:48:08 -0000	1.39
+++ .cvsignore	13 Apr 2009 18:33:12 -0000	1.40
@@ -1 +1 @@
-gvfs-1.2.1.tar.bz2
+gvfs-1.2.2.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gvfs.spec	11 Apr 2009 17:04:34 -0000	1.123
+++ gvfs.spec	13 Apr 2009 18:33:12 -0000	1.124
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.2.1
-Release: 5%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -50,7 +50,7 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=576587
 # - Pending discussion + requires Nautilus patch
-#Patch107: gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch
+Patch107: gdu-0007-Bug-576587-allow-eject-even-on-non-ejectable-vol.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=495152
 Patch108: gdu-0008-ignore-drives-without-volumes.patch
@@ -146,7 +146,7 @@
 %patch104 -p1 -b .gdu-debug-spew
 %patch105 -p1 -b .gdu-ignore-1
 %patch106 -p1 -b .gdu-ignore-2
-#%patch107 -p1 -b .gdu-always-eject
+%patch107 -p1 -b .gdu-always-eject
 %patch108 -p1 -b .gdu-ignore-drives-without-volumes
 %patch109 -p1 -b .gdu-never-ignore-drives-without-media
 
@@ -292,6 +292,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.2-1
+- Update to 1.2.2
+- Allow eject even on non-ejectable devices
+
 * Sat Apr 11 2009 David Zeuthen <davidz at redhat.com> - 1.2.1-5
 - Don't show drives in computer:/// if media is available but
   no volumes are recognized (#495152)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	2 Apr 2009 23:48:08 -0000	1.39
+++ sources	13 Apr 2009 18:33:12 -0000	1.40
@@ -1 +1 @@
-df8f624587adfabe7009838ce6d8d5fd  gvfs-1.2.1.tar.bz2
+85f69289185b0c9c42644c0e730b67c8  gvfs-1.2.2.tar.bz2



From jspaleta at fedoraproject.org  Mon Apr 13 18:34:08 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Mon, 13 Apr 2009 18:34:08 +0000 (UTC)
Subject: rpms/gpodder/devel .cvsignore, 1.21, 1.22 gpodder.spec, 1.26,
	1.27 sources, 1.21, 1.22
Message-ID: <20090413183409.1A2BE70124@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gpodder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4755

Modified Files:
	.cvsignore gpodder.spec sources 
Log Message:
* Mon Apr 13 2009 - 0.15.2-1 jpaleta <jspaleta AT fedoraproject DOT org>
- new upstream point release with multiple bug fixes and updates translations.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Mar 2009 00:01:28 -0000	1.21
+++ .cvsignore	13 Apr 2009 18:34:04 -0000	1.22
@@ -1 +1 @@
-gpodder-0.15.1.tar.gz
+gpodder-0.15.2.tar.gz


Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gpodder.spec	21 Mar 2009 00:01:29 -0000	1.26
+++ gpodder.spec	13 Apr 2009 18:34:05 -0000	1.27
@@ -2,7 +2,7 @@
 
 
 Name:           gpodder
-Version:        0.15.1
+Version:        0.15.2
 Release:        1%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
@@ -77,6 +77,9 @@
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Mon Apr 13 2009 - 0.15.2-1 jpaleta <jspaleta AT fedoraproject DOT org>
+- new upstream point release with multiple bug fixes and updates translations.
+
 * Fri Mar 20 2009 - 0.15.1-1 jpaleta <jspaleta AT fedoraproject DOT org>
 - new upstream release and packaging fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	21 Mar 2009 00:01:29 -0000	1.21
+++ sources	13 Apr 2009 18:34:06 -0000	1.22
@@ -1 +1 @@
-2f84e9bb991aa56f15fac67f581d0d92  gpodder-0.15.1.tar.gz
+7ca7256604f6e65bedb45aa856d3de37  gpodder-0.15.2.tar.gz



From sandeen at fedoraproject.org  Mon Apr 13 18:35:56 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 13 Apr 2009 18:35:56 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.273, 1.274 kernel.spec, 1.1532, 
	1.1533
Message-ID: <20090413183556.B3AE170124@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5348

Modified Files:
	config-generic kernel.spec 
Log Message:
* Mon Apr 13 2009 Eric Sandeen <sandeen at redhat.com>
- Turn of CONFIG_SND_HDA_POWER_SAVE_DEFAULT again (#493972)



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- config-generic	9 Apr 2009 14:01:13 -0000	1.273
+++ config-generic	13 Apr 2009 18:35:55 -0000	1.274
@@ -2560,7 +2560,7 @@
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1532
retrieving revision 1.1533
diff -u -r1.1532 -r1.1533
--- kernel.spec	13 Apr 2009 17:47:26 -0000	1.1532
+++ kernel.spec	13 Apr 2009 18:35:55 -0000	1.1533
@@ -1925,6 +1925,9 @@
 # and build.
 
 %changelog
+* Mon Apr 13 2009 Eric Sandeen <sandeen at redhat.com>
+- Turn of CONFIG_SND_HDA_POWER_SAVE_DEFAULT again (#493972)
+
 * Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-70
 - merge alsa fixes from wwoods:
   alsa-hda-dont-reset-BDL-unnecessarily.patch



From clumens at fedoraproject.org  Mon Apr 13 18:40:21 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Mon, 13 Apr 2009 18:40:21 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.633, 1.634 anaconda.spec, 1.781, 
	1.782 sources, 1.767, 1.768
Message-ID: <20090413184022.1D08A70124@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6852

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- .cvsignore	9 Apr 2009 21:04:57 -0000	1.633
+++ .cvsignore	13 Apr 2009 18:39:48 -0000	1.634
@@ -1,3 +1,4 @@
 clog
 anaconda-11.5.0.41.tar.bz2
 anaconda-11.5.0.42.tar.bz2
+anaconda-11.5.0.43.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.781
retrieving revision 1.782
diff -u -r1.781 -r1.782
--- anaconda.spec	9 Apr 2009 21:04:58 -0000	1.781
+++ anaconda.spec	13 Apr 2009 18:39:48 -0000	1.782
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.42
+Version: 11.5.0.43
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,27 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.43-1
+- Run programs with LC_ALL=C in case we're parsing output (#492549).
+  (clumens)
+- A volume group device has a "peSize" attribute (not "pesize"). (dlehman)
+- Remove uncommitted new lv from dict on cancel. (dlehman)
+- Use the correct value when setting new extent size. (#493753) (dlehman)
+- Fix image generation so all ELF binaries have their deps included
+  (#495231). (clumens)
+- Clean up the code in editLogicalVolume function. (jgranado)
+- Setup the disks before partitioning as the nodes are needed. (jgranado)
+- Rescan the devices when we are saving a traceback. (jgranado)
+- Close file descriptors when an error occurs. (jgranado)
+- Aesthetic changes to "editLogicalVolume" function. (jgranado)
+- When deallocating a partition also set its disk attribute to None
+  (hdegoede)
+- Check self.partedPartition not being None before using it (#495077)
+  (hdegoede)
+- growPartitions: Change op_func (back to) add when an iteration succeeds
+  (hdegoede)
+- partedPartition can be None while growing partitions (#495076) (hdegoede)
+
 * Thu Apr 09 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.42-1
 - Fix display of format type for devices. (dlehman)
 - Fix handling of priority option from swap fstab entries. (#494992)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- sources	9 Apr 2009 21:04:58 -0000	1.767
+++ sources	13 Apr 2009 18:39:49 -0000	1.768
@@ -1 +1 @@
-6d39e6659579b995b2c9af32be740b53  anaconda-11.5.0.42.tar.bz2
+0f786092df3c424a2e2ffa06863b62ec  anaconda-11.5.0.43.tar.bz2



From ausil at fedoraproject.org  Mon Apr 13 18:41:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 13 Apr 2009 18:41:29 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.339,1.340
Message-ID: <20090413184129.685B070124@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7277

Modified Files:
	gdb.spec 
Log Message:
enable gdbserver package on sparc64



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- gdb.spec	5 Apr 2009 21:02:55 -0000	1.339
+++ gdb.spec	13 Apr 2009 18:40:58 -0000	1.340
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 15%{?_with_upstream:.upstream}%{?dist}
+Release: 16%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -844,13 +844,16 @@
 
 # don't include the files in include, they are part of binutils
 
-%ifnarch sparcv9 sparc64
+%ifnarch sparcv9 
 %files gdbserver
 %{_bindir}/gdbserver
 %{_mandir}/*/gdbserver.1*
 %endif
 
 %changelog
+* Mon Apr 13 2009 Dennis Gilmore <dennis at ausil.us> - 6.8.50.20090302-16
+- enable gdbserver package on sparc64
+
 * Sun Apr  5 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-15
 - Archer update to the snapshot: 7c7c77576669d17ad5072daa47ea3a4fd954483d
 - Archer backport: 7c7c77576669d17ad5072daa47ea3a4fd954483d (Peter Bergner)



From mclasen at fedoraproject.org  Mon Apr 13 18:44:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 18:44:13 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.31, 1.32 empathy.spec, 1.54,
	1.55 sources, 1.31, 1.32
Message-ID: <20090413184413.75EAF70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8015

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Mar 2009 07:02:56 -0000	1.31
+++ .cvsignore	13 Apr 2009 18:43:41 -0000	1.32
@@ -1 +1 @@
-empathy-2.26.0.1.tar.bz2
+empathy-2.26.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- empathy.spec	3 Apr 2009 19:02:33 -0000	1.54
+++ empathy.spec	13 Apr 2009 18:43:41 -0000	1.55
@@ -9,15 +9,15 @@
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	2.26.0.1
-Release:	2%{?dist}
+Version:	2.26.1
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
 ## Fedora-specific, to automagically transition the profile names. (#459282)
@@ -33,7 +33,7 @@
 BuildRequires:	iso-codes-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	evolution-data-server-devel
-BuildRequires:	GConf2-devel 
+BuildRequires:	GConf2-devel
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.3.2
@@ -43,9 +43,8 @@
 BuildRequires:	intltool
 BuildRequires:	libglade2-devel
 BuildRequires:	libxml2-devel
-BuildRequires:	perl(XML::Parser)
 BuildRequires:	pygtk2-devel
-BuildRequires:	scrollkeeper	
+BuildRequires:	scrollkeeper
 BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
 BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:	telepathy-farsight-devel
@@ -55,7 +54,7 @@
 Requires:	telepathy-filesystem
 ## Empathy is useless without a proper Telepathy connection manager installed.
 ## We hardcode dependencies on Salut and Gabble to support XMPP on a default
-## install, in both the link-local and Jabber/GoogleTalk incarnations. 
+## install, in both the link-local and Jabber/GoogleTalk incarnations.
 ## (RHBZ: 308871 and 334221)
 ## TODO: Perhaps we can configure these to be installed "on demand" with
 ##       PackageKit and friends?
@@ -116,7 +115,7 @@
 %package	python
 Summary:	Python bindings for libempathy and libempathy-gtk
 Group:		Development/Languages
-Requires:	%{name}-libs = %{version}-%{release}	
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description	python
 This package contains the empathy and empathygtk Python modules, which provide
@@ -229,6 +228,10 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/empathy/2.26/empathy-2.26.1.news
+
 * Fri Apr  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.26.0.1-2
 - Update pkgconfig patch to add libcanberra-gtk requires. (#493954)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	31 Mar 2009 07:02:57 -0000	1.31
+++ sources	13 Apr 2009 18:43:41 -0000	1.32
@@ -1 +1 @@
-e3b0e891c7eac3d6f3eb85373a6f4e25  empathy-2.26.0.1.tar.bz2
+1edc492c0fd339dc30f0a443adad5fbe  empathy-2.26.1.tar.bz2



From steved at fedoraproject.org  Mon Apr 13 18:48:04 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 13 Apr 2009 18:48:04 +0000 (UTC)
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.36,1.37
Message-ID: <20090413184804.82E1F70124@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9485

Modified Files:
	nfs-utils-lib.spec 
Log Message:
Moved the .pc files into the -devel rpm (bz 489173)




Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nfs-utils-lib.spec	1 Apr 2009 08:21:28 -0000	1.36
+++ nfs-utils-lib.spec	13 Apr 2009 18:47:33 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
-Version: 1.1.4
+Version: 1.1.5
 Release: 4%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
@@ -119,14 +119,12 @@
 %{_libdir}/librpcsecgss.la
 %dir %{librpcsecgss_docdir}
 %{librpcsecgss_docdir}/*
-%{_libdir}/pkgconfig/librpcsecgss.pc
 
 %config(noreplace) /etc/idmapd.conf
 %{_libdir}/libnfsidmap*.so.*
 %{_libdir}/libnfsidmap*.la
 %dir %{libnfsidmap_docdir}
 %{libnfsidmap_docdir}/*
-%{_libdir}/pkgconfig/libnfsidmap.pc
 %{_mandir}/man3/nfs4_uid_to_name.3.gz
 
 %files devel
@@ -135,6 +133,8 @@
 %{_libdir}/librpcsecgss.so
 %dir %{_includedir}/rpcsecgss
 %dir %{_includedir}/rpcsecgss/rpc
+%{_libdir}/pkgconfig/librpcsecgss.pc
+%{_libdir}/pkgconfig/libnfsidmap.pc
 %{_includedir}/rpcsecgss/rpc/auth.h
 %{_includedir}/rpcsecgss/rpc/auth_gss.h
 %{_includedir}/rpcsecgss/rpc/svc.h
@@ -146,6 +146,9 @@
 %{_libdir}/libnfsidmap*.a
 
 %changelog
+* Mon Apr 13 2009  Steve Dickson <steved at redhat.com> 1.1.4-5
+- Moved the .pc files into the -devel rpm (bz 489173)
+
 * Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1.4-4
 - Fix unowned header directories (#483464).
 



From steved at fedoraproject.org  Mon Apr 13 18:49:51 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 13 Apr 2009 18:49:51 +0000 (UTC)
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.37,1.38
Message-ID: <20090413184951.A7AD070124@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10046

Modified Files:
	nfs-utils-lib.spec 
Log Message:
Fixed typo in package version



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- nfs-utils-lib.spec	13 Apr 2009 18:47:33 -0000	1.37
+++ nfs-utils-lib.spec	13 Apr 2009 18:49:21 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
-Version: 1.1.5
-Release: 4%{?dist}
+Version: 1.1.4
+Release: 5%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 



From ajax at fedoraproject.org  Mon Apr 13 18:53:02 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 18:53:02 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.431,1.432
Message-ID: <20090413185302.DB99070124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11287

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.6.0-20
- Obsolete a bunch of input drivers. (#493221)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- xorg-x11-server.spec	9 Apr 2009 14:45:38 -0000	1.431
+++ xorg-x11-server.spec	13 Apr 2009 18:52:29 -0000	1.432
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   19%{?dist}
+Release:   20%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -154,8 +154,6 @@
 # openssl? really?
 BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
 BuildRequires: mesa-libGL-devel >= 7.1-0.37
-# should be useless now...
-# BuildRequires: mesa-source >= 7.1-0.36
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0 kernel-headers
 
@@ -197,8 +195,24 @@
 Requires: fedora-setup-keyboard
 # Dropped from F9 for being broken, uninstall it.
 Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8
+# Dropped from F11, use evdev instead
+Obsoletes: xorg-x11-drv-calcomp <= 1.1.2-1.fc9
+Obsoletes: xorg-x11-drv-citron <= 2.2.1-1.fc9
+Obsoletes: xorg-x11-drv-diamondtouch <= 0.2.0-0.1.fc9
+Obsoletes: xorg-x11-drv-digitaledge <= 1.1.1-1.fc9
+Obsoletes: xorg-x11-drv-dmc <= 1.1.2-1.fc9
+Obsoletes: xorg-x11-drv-dynapro <= 1.1.2-1.fc9
+Obsoletes: xorg-x11-drv-jamstudio <= 1.2.0-1.fc9
+Obsoletes: xorg-x11-drv-magellan <= 1.2.0-1.fc9
+Obsoletes: xorg-x11-drv-microtouch <= 1.2.0-1.fc9
+Obsoletes: xorg-x11-drv-palmax <= 1.2.0-1.fc9
+Obsoletes: xorg-x11-drv-spaceorb <= 1.1.0-6.fc9
+Obsoletes: xorg-x11-drv-summa <= 1.2.0-2.fc10
+Obsoletes: xorg-x11-drv-tek4957 <= 1.2.0-1.fc9
+Obsoletes: xorg-x11-drv-ur98 <= 1.1.0-5.fc9
+Obsoletes: xorg-x11-drv-wiimote <= 0.0.1-1.fc9
 # Force sufficiently new libpciaccess
-Conflicts: libpciaccess < 0.9.1-2
+Conflicts: libpciaccess < 0.10.3-5
 
 %description Xorg
 X.org X11 is an open source implementation of the X Window System.  It
@@ -529,6 +543,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.6.0-20
+- Obsolete a bunch of input drivers. (#493221)
+
 * Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 1.6.0-19
 - xserver-1.6.0-no-i810.patch: Don't try to load i810.
 



From mclasen at fedoraproject.org  Mon Apr 13 18:55:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 18:55:27 +0000 (UTC)
Subject: rpms/gtk2-engines/devel .cvsignore, 1.63, 1.64 gtk2-engines.spec,
	1.108, 1.109 sources, 1.64, 1.65
Message-ID: <20090413185527.A212670124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2-engines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10290

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	16 Mar 2009 20:12:53 -0000	1.63
+++ .cvsignore	13 Apr 2009 18:55:23 -0000	1.64
@@ -1 +1 @@
-gtk-engines-2.18.0.tar.bz2
+gtk-engines-2.18.1.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gtk2-engines.spec	16 Mar 2009 20:12:53 -0000	1.108
+++ gtk2-engines.spec	13 Apr 2009 18:55:23 -0000	1.109
@@ -2,7 +2,7 @@
 
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.18.0
+Version:        2.18.1
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
@@ -80,6 +80,10 @@
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+- See http://download.gnome.org/sources/gtk-engines/2.18/gtk-engines-2.18.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	16 Mar 2009 20:12:53 -0000	1.64
+++ sources	13 Apr 2009 18:55:23 -0000	1.65
@@ -1 +1 @@
-6a7ac01fc9f9429bfb126e068e74eb4f  gtk-engines-2.18.0.tar.bz2
+5dc748cfb0587bb412adc49b666fb6f8  gtk-engines-2.18.1.tar.bz2



From ajax at fedoraproject.org  Mon Apr 13 18:59:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 18:59:32 +0000 (UTC)
Subject: rpms/xorg-x11-xfs/devel xfs.init, 1.8, 1.9 xorg-x11-xfs.spec, 1.35,
	1.36
Message-ID: <20090413185932.8384670138@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14101

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-5
- xfs.init: Fix mkdir race (#492517)



Index: xfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfs.init	27 Jul 2007 16:06:21 -0000	1.8
+++ xfs.init	13 Apr 2009 18:59:00 -0000	1.9
@@ -56,12 +56,12 @@
    FONT_UNIX_DIR=/tmp/.font-unix
    echo -n $"Starting $prog: "
    [ -x /usr/sbin/chkfontpath ] && buildfontlist
-   # Clean out .font-unix dir, and recreate it with the proper ownership and
-   # permissions.
-   rm -rf $FONT_UNIX_DIR
-   mkdir $FONT_UNIX_DIR
-   chown root:root $FONT_UNIX_DIR
-   chmod 1777 $FONT_UNIX_DIR
+   # Make sure .font-unix dir, exists.
+   if [ ! -d $FONT_UNIX_DIR ]
+   then
+       mkdir -m 1777 $FONT_UNIX_DIR || :
+       restorecon $FONT_UNIX_DIR 2>/dev/null || :
+   fi
    # Fix needed for SELinux for bug (#130421,130969)
    [ -x /sbin/restorecon ] && /sbin/restorecon $FONT_UNIX_DIR
 


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-xfs.spec	26 Feb 2009 11:39:52 -0000	1.35
+++ xorg-x11-xfs.spec	13 Apr 2009 18:59:01 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-xfs
 Version: 1.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT
@@ -244,6 +244,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-5
+- xfs.init: Fix mkdir race (#492517)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Apr 13 18:59:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 18:59:41 +0000 (UTC)
Subject: rpms/empathy/devel empathy-broken-pkgconfig.patch,1.2,1.3
Message-ID: <20090413185941.ABD4170138@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14125

Modified Files:
	empathy-broken-pkgconfig.patch 
Log Message:
update patch


empathy-broken-pkgconfig.patch:

Index: empathy-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- empathy-broken-pkgconfig.patch	3 Apr 2009 19:02:33 -0000	1.2
+++ empathy-broken-pkgconfig.patch	13 Apr 2009 18:59:11 -0000	1.3
@@ -1,26 +1,26 @@
-diff -urp empathy-2.26.0.1.OLD/libempathy/libempathy.pc.in empathy-2.26.0.1/libempathy/libempathy.pc.in
---- empathy-2.26.0.1.OLD/libempathy/libempathy.pc.in	2009-02-20 13:33:48.000000000 -0500
-+++ empathy-2.26.0.1/libempathy/libempathy.pc.in	2009-04-03 14:59:09.000000000 -0400
+diff -up empathy-2.26.1/libempathy-gtk/libempathy-gtk.pc.in.pkgconfig empathy-2.26.1/libempathy-gtk/libempathy-gtk.pc.in
+--- empathy-2.26.1/libempathy-gtk/libempathy-gtk.pc.in.pkgconfig	2009-04-13 11:03:07.000000000 -0400
++++ empathy-2.26.1/libempathy-gtk/libempathy-gtk.pc.in	2009-04-13 14:58:12.540770577 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
- Name: libempathy
- Description:  Empathy base library
+ Name: libempathy-gtk
+ Description:  Empathy interface library
 -Requires: pkg-config >= 0.21
--Requires.private: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, gio-2.0, gio-unix-2.0, telepathy-glib
-+Requires: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, gio-2.0, gio-unix-2.0, telepathy-glib
+-Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, \
++Requires: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, \
+                   libmissioncontrol, libempathy, telepathy-glib, libcanberra-gtk
  Version: @VERSION@
- Libs: -L${libdir} -lempathy
- Cflags: -I${includedir} 
-diff -urp empathy-2.26.0.1.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.26.0.1/libempathy-gtk/libempathy-gtk.pc.in
---- empathy-2.26.0.1.OLD/libempathy-gtk/libempathy-gtk.pc.in	2009-02-20 13:33:48.000000000 -0500
-+++ empathy-2.26.0.1/libempathy-gtk/libempathy-gtk.pc.in	2009-04-03 14:58:50.000000000 -0400
+ Libs: -L${libdir} -lempathy-gtk
+diff -up empathy-2.26.1/libempathy/libempathy.pc.in.pkgconfig empathy-2.26.1/libempathy/libempathy.pc.in
+--- empathy-2.26.1/libempathy/libempathy.pc.in.pkgconfig	2009-04-13 11:03:07.000000000 -0400
++++ empathy-2.26.1/libempathy/libempathy.pc.in	2009-04-13 14:57:46.835760669 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
- Name: libempathy-gtk
- Description:  Empathy interface library
+ Name: libempathy
+ Description:  Empathy base library
 -Requires: pkg-config >= 0.21
--Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libmissioncontrol, libempathy, telepathy-glib
-+Requires: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libcanberra-gtk, libmissioncontrol, libempathy, telepathy-glib
+-Requires.private: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, \
++Requires: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, \
+                   gio-2.0, gio-unix-2.0, telepathy-glib
  Version: @VERSION@
- Libs: -L${libdir} -lempathy-gtk
- Cflags: -I${includedir} 
+ Libs: -L${libdir} -lempathy



From ajax at fedoraproject.org  Mon Apr 13 19:02:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 19:02:05 +0000 (UTC)
Subject: rpms/xorg-x11-xfs/F-10 xfs.init, 1.8, 1.9 xorg-x11-xfs.spec, 1.34,
	1.35
Message-ID: <20090413190205.6956270124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15738

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-3.1
- xfs.init: Fix mkdir race (#492517)



Index: xfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/F-10/xfs.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfs.init	27 Jul 2007 16:06:21 -0000	1.8
+++ xfs.init	13 Apr 2009 19:01:34 -0000	1.9
@@ -56,12 +56,12 @@
    FONT_UNIX_DIR=/tmp/.font-unix
    echo -n $"Starting $prog: "
    [ -x /usr/sbin/chkfontpath ] && buildfontlist
-   # Clean out .font-unix dir, and recreate it with the proper ownership and
-   # permissions.
-   rm -rf $FONT_UNIX_DIR
-   mkdir $FONT_UNIX_DIR
-   chown root:root $FONT_UNIX_DIR
-   chmod 1777 $FONT_UNIX_DIR
+   # Make sure .font-unix dir, exists.
+   if [ ! -d $FONT_UNIX_DIR ]
+   then
+       mkdir -m 1777 $FONT_UNIX_DIR || :
+       restorecon $FONT_UNIX_DIR 2>/dev/null || :
+   fi
    # Fix needed for SELinux for bug (#130421,130969)
    [ -x /sbin/restorecon ] && /sbin/restorecon $FONT_UNIX_DIR
 


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/F-10/xorg-x11-xfs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-xfs.spec	15 Jul 2008 17:41:49 -0000	1.34
+++ xorg-x11-xfs.spec	13 Apr 2009 19:01:34 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-xfs
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT
@@ -244,6 +244,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-3.1
+- xfs.init: Fix mkdir race (#492517)
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 1.0.5-3
 - Fix license tag.
 



From ajax at fedoraproject.org  Mon Apr 13 19:04:49 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 19:04:49 +0000 (UTC)
Subject: rpms/xorg-x11-xfs/F-9 xfs.init,1.8,1.9 xorg-x11-xfs.spec,1.33,1.34
Message-ID: <20090413190449.9F19C70124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17141

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-2.1
- xfs.init: Fix mkdir race (#492517)



Index: xfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/F-9/xfs.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfs.init	27 Jul 2007 16:06:21 -0000	1.8
+++ xfs.init	13 Apr 2009 19:04:43 -0000	1.9
@@ -56,12 +56,12 @@
    FONT_UNIX_DIR=/tmp/.font-unix
    echo -n $"Starting $prog: "
    [ -x /usr/sbin/chkfontpath ] && buildfontlist
-   # Clean out .font-unix dir, and recreate it with the proper ownership and
-   # permissions.
-   rm -rf $FONT_UNIX_DIR
-   mkdir $FONT_UNIX_DIR
-   chown root:root $FONT_UNIX_DIR
-   chmod 1777 $FONT_UNIX_DIR
+   # Make sure .font-unix dir, exists.
+   if [ ! -d $FONT_UNIX_DIR ]
+   then
+       mkdir -m 1777 $FONT_UNIX_DIR || :
+       restorecon $FONT_UNIX_DIR 2>/dev/null || :
+   fi
    # Fix needed for SELinux for bug (#130421,130969)
    [ -x /sbin/restorecon ] && /sbin/restorecon $FONT_UNIX_DIR
 


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/F-9/xorg-x11-xfs.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-xfs.spec	20 Feb 2008 08:14:11 -0000	1.33
+++ xorg-x11-xfs.spec	13 Apr 2009 19:04:43 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-xfs
 Version: 1.0.5
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -244,6 +244,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.0.5-2.1
+- xfs.init: Fix mkdir race (#492517)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:1.0.5-2
 - Autorebuild for GCC 4.3
 



From toshio at fedoraproject.org  Mon Apr 13 19:08:42 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 19:08:42 +0000 (UTC)
Subject: rpms/python-fedora/devel .cvsignore, 1.29, 1.30 python-fedora.spec, 
	1.37, 1.38 sources, 1.30, 1.31
Message-ID: <20090413190842.F139C70124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17030

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
- Bugfix and cleanup release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	12 Mar 2009 17:07:24 -0000	1.29
+++ .cvsignore	13 Apr 2009 19:08:31 -0000	1.30
@@ -1 +1 @@
-python-fedora-0.3.11.1.tar.gz
+python-fedora-0.3.12.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- python-fedora.spec	12 Mar 2009 17:07:24 -0000	1.37
+++ python-fedora.spec	13 Apr 2009 19:08:32 -0000	1.38
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.11.1
+Version:        0.3.12
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -16,6 +16,12 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-paver
 BuildRequires:  python-sphinx
+%if 0%{?fedora} >= 9
+BuildRequires:  python-cherrypy2
+%else
+BuildRequires:  python-cherrypy
+%endif
+BuildRequires:  python-babel
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
@@ -46,17 +52,22 @@
 %install
 rm -rf %{buildroot}
 paver install --skip-build --root %{buildroot}
+
 mv build-doc/html doc/
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog doc
 %{python_sitelib}/*
 
 %changelog
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
+- Bugfix and cleanup release.
+
 * Thu Mar 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.11.1-1
 - Update to fix problem with django auth and redirects.
 
@@ -157,92 +168,3 @@
 
 * Wed Feb 13 2008 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.99.0-1
 - First beta of new release.  This release is for TG-1.0.4 and SA-0.4.
-
-* Thu Dec 13 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.22-1
-- Convert fasLDAP to get its connection information fedora-db-access.
-- Add requirements for python-feedparser and python-bugzilla
-- Add fedora.tg.widgets module containing a few proof-of-concept
-  Fedora TurboGears widgets
-- Add a new method to fas: get_users() that returns common public information
-  about all users.
-
-* Thu Nov 15 2007 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.90.21-1
-- Bugfix release for expired sessions.
-
-* Wed Nov 14 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-3
-- Handle our SQLAlchemy requirement differently for Fedora 8+, until
-  TurboGears can use SQLAlchemy >= 0.4
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-2
-- Require SQLAlchemy 0.3 for python-fedora-infrastructure
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-1
-- Latest upstream release
-
-* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
-- New upstream release with a FAS2 unicode fix.
-
-* Mon Sep 24 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-3
-- Fix the Source URL.  Should be fedorapeople rather than fedoraproject.
-
-* Fri Sep 21 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-2
-- BR: python-setuptools-devel as this has been split in the new versions.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-1
-- Update to version wih handling of control-center-maint bugzilla address.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-2
-- Minor touchups to description and URL.
-
-* Mon Sep 17 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-1
-- Update to 0.2.90.17. 
-- Build separate packages for pieces useful on clients and only on the server.
-
-* Mon Sep 10 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.16-1
-- Bugfix to fasLDAP module.
-
-* Fri Sep 7 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.15-1
-- Make the fasLDAP module more OO.
-- Bugfixes.
-- Update the install line.
-
-* Thu Aug 2 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.14-1
-- Fix safas2provider to only create the visit_identity class.
-- Add COPYING and AUTHORS files.
-
-* Sat Jul 21 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.13-1
-- New class fedora.tg.client.BaseClient that can be used as the basis of a TG
-  standalone application.  With a little support on the server side (mostly
-  allowing tg_format=json) this class will provide you with the basis to read
-  and write data to the server.
-- Fix safasprovider to only create the visit_identity class since the other
-  information is stored directly in FAS.
-
-* Mon Jul 10 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.12-1
-- Fix some issues with Unicode.
-- Catch a traceback when the database is down.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.11-1
-- Remove a decorator so running on python-2.3 works.
-- Have FASUser and FASGroup emit json on demand so that they can be returned
-  when tg_format=json.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.10-1
-- Update fas2 integration with changes from mmcgrath.
-- berrange has changed his email address in the account system, no longer need
-  to special case his bugzilla address.
-- Fix a bug in the handling of db errors in accounts/fas.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.9-1
-- Update fas2 integration with changes from mmcgrath.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.8-1
-- Catch some exceptions when the database connection dies.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.7-1
-- Fix another bug with the new bugzilla email code.  Need to grab the user
-  email from the database even if unathenticated so bugzilla_email has
-  something to pull from.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.6-1
-- Fix bug with the new bugzilla email code.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	12 Mar 2009 17:07:24 -0000	1.30
+++ sources	13 Apr 2009 19:08:32 -0000	1.31
@@ -1 +1 @@
-35b1d2376b48e46fe9494f9c19930278  python-fedora-0.3.11.1.tar.gz
+e81443acf339eabfb54b009765e1892b  python-fedora-0.3.12.tar.gz



From alexl at fedoraproject.org  Mon Apr 13 19:17:01 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Mon, 13 Apr 2009 19:17:01 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.2.2-ssh-auth-sock.patch, NONE, 1.1 gvfs.spec,
	1.124, 1.125
Message-ID: <20090413191702.0388C70124@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21173

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.2.2-ssh-auth-sock.patch 
Log Message:
* Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 1.2.2-2
- Add ssh-auth-sock patch from svn


gvfs-1.2.2-ssh-auth-sock.patch:

--- NEW FILE gvfs-1.2.2-ssh-auth-sock.patch ---
Index: daemon/gvfsbackendsftp.c
===================================================================
--- daemon/gvfsbackendsftp.c	(revision 2371)
+++ daemon/gvfsbackendsftp.c	(working copy)
@@ -333,6 +333,84 @@ look_for_stderr_errors (GVfsBackend *bac
     }
 }
 
+static gchar*
+read_dbus_string_dict_value (DBusMessageIter *args, const gchar *key)
+{
+  DBusMessageIter items, entry;
+  gchar *str, *sig;
+
+  sig = dbus_message_iter_get_signature (args);
+  if (!sig || strcmp (sig, "a{ss}") != 0)
+    return NULL;
+
+  dbus_message_iter_recurse (args, &items);
+
+  if (dbus_message_iter_has_next (&items))
+    {
+      do
+	{
+	  dbus_message_iter_recurse (&items, &entry);
+	  dbus_message_iter_get_basic (&entry, &str);
+	  if (str && strcmp (key, str) == 0) 
+	    {
+	      dbus_message_iter_next (&entry);
+	      dbus_message_iter_get_basic (&entry, &str);
+	      return g_strdup (str);
+	    }
+	}
+      while (dbus_message_iter_next (&items));
+    }
+
+  return NULL;
+}
+
+static void
+setup_ssh_environment (void)
+{
+  DBusConnection *dconn;
+  DBusMessage *reply;
+  DBusMessage *msg;
+  DBusMessageIter args;
+  DBusError derr;
+  gchar *env;
+
+  dbus_error_init (&derr);
+  dconn = dbus_bus_get (DBUS_BUS_SESSION, &derr);
+  if (!dconn)
+    return;
+
+  msg = dbus_message_new_method_call ("org.gnome.keyring",
+				      "/org/gnome/keyring/daemon",
+				      "org.gnome.keyring.Daemon",
+				      "GetEnvironment");
+  if (!msg)
+    {
+      dbus_connection_unref (dconn);
+      return;
+    }
+
+  /* Send message and get a handle for a reply */
+  reply = dbus_connection_send_with_reply_and_block (dconn, msg, 1000, &derr);
+  dbus_message_unref (msg);
+  if (!reply)
+    {
+      dbus_connection_unref (dconn);
+      return;
+    }
+
+  /* Read the return value */
+  if (dbus_message_iter_init (reply, &args))
+    {
+      env = read_dbus_string_dict_value (&args, "SSH_AUTH_SOCK");
+      if (env && env[0])
+	g_setenv ("SSH_AUTH_SOCK", env, TRUE);
+      g_free (env);
+    }
+
+  dbus_message_unref (reply);
+  dbus_connection_unref (dconn);
+}
+
 static char **
 setup_ssh_commandline (GVfsBackend *backend)
 {
@@ -1559,6 +1637,18 @@ do_mount (GVfsBackend *backend,
   /* NOTE: job_succeeded called async from setup_icon reply */
 }
 
+static void
+real_do_mount (GVfsBackend *backend,
+	       GVfsJobMount *job,
+	       GMountSpec *mount_spec,
+	       GMountSource *mount_source,
+	       gboolean is_automount)
+{
+  setup_ssh_environment ();
+
+  do_mount (backend, job, mount_spec, mount_source, is_automount);
+}
+
 static gboolean
 try_mount (GVfsBackend *backend,
            GVfsJobMount *job,
@@ -4481,7 +4571,7 @@ g_vfs_backend_sftp_class_init (GVfsBacke
   
   gobject_class->finalize = g_vfs_backend_sftp_finalize;
 
-  backend_class->mount = do_mount;
+  backend_class->mount = real_do_mount;
   backend_class->try_mount = try_mount;
   backend_class->try_open_icon_for_read = try_open_icon_for_read;
   backend_class->try_open_for_read = try_open_for_read;


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gvfs.spec	13 Apr 2009 18:33:12 -0000	1.124
+++ gvfs.spec	13 Apr 2009 19:16:30 -0000	1.125
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,6 +34,8 @@
 Patch2: gvfs-1.1.7-gdu-computer-expose-devices.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=578681
 Patch3: gvfs-bash-completion.patch
+# From svn:
+Patch4: gvfs-1.2.2-ssh-auth-sock.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -139,6 +141,7 @@
 %patch1 -p0 -b .archive-integration
 %patch2 -p1 -b .computer-expose-devices
 %patch3 -p1 -b .bash-completion
+%patch4 -p0 -b .ssh-auth-sock
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -292,6 +295,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 1.2.2-2
+- Add ssh-auth-sock patch from svn
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.2-1
 - Update to 1.2.2
 - Allow eject even on non-ejectable devices



From toshio at fedoraproject.org  Mon Apr 13 19:17:04 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 19:17:04 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.123,1.124
Message-ID: <20090413191704.60E8D70124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21217

Modified Files:
	mono.spec 
Log Message:

* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-14
- Remove bootstrap changes as it's not necessary.
- remove ppc64 as we only had ppc before.
- Correct release number format
- Fix Source and URL.



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mono.spec	11 Apr 2009 13:25:46 -0000	1.123
+++ mono.spec	13 Apr 2009 19:16:34 -0000	1.124
@@ -1,13 +1,15 @@
-Name:		mono
+Name:           mono
 Version:        2.4
-Release:        13.2%{?dist}
+Release:        14%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:        %{name}-%{version}.tar.bz2
-Source1:	monodir.c
+URL:            http://www.mono-project.com/Main_Page
+# Prereleases are available here
+# http://mono.ximian.com/monobuild/preview/sources-preview/
+Source0:        http://ftp.novell.com/pub/%{name}/sources/%{name}/%{name}-%{version}.tar.bz2
+Source1:        monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison 
@@ -29,10 +31,10 @@
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-#BuildRequires: mono-core
+BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc ppc64
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -303,7 +305,7 @@
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-#rm -rf mcs/class/lib/monolite/*
+rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -709,6 +711,12 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-14
+- Remove bootstrap changes as it's not necessary.
+- remove ppc64 as we only had ppc before.
+- Correct release number format
+- Fix Source and URL.
+
 * Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-13.2
 - Re-enable PPC and PPC64
 - sub point build for scratch build and bootstrap



From maxamillion at fedoraproject.org  Mon Apr 13 19:17:36 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 13 Apr 2009 19:17:36 +0000 (UTC)
Subject: rpms/shed/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 shed.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090413191736.20B1C70124@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21539/devel

Modified Files:
	.cvsignore import.log shed.spec sources 
Log Message:
New upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2008 21:29:19 -0000	1.3
+++ .cvsignore	13 Apr 2009 19:17:05 -0000	1.4
@@ -1 +1 @@
-shed1.14.tar.gz
+shed-1.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Nov 2008 21:29:19 -0000	1.2
+++ import.log	13 Apr 2009 19:17:05 -0000	1.3
@@ -1,2 +1,3 @@
 shed-1_13-2:HEAD:shed-1.13-2.src.rpm:1225481433
 shed-1_14-1:HEAD:shed-1.14-1.src.rpm:1227821254
+shed-1_15-1:HEAD:shed-1.15-1.src.rpm:1239650206


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/shed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- shed.spec	26 Feb 2009 00:51:46 -0000	1.4
+++ shed.spec	13 Apr 2009 19:17:05 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           shed
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/shed/%{name}%{version}.tar.gz
+Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
+- New upstream release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2008 21:29:19 -0000	1.3
+++ sources	13 Apr 2009 19:17:05 -0000	1.4
@@ -1 +1 @@
-90c70fa667641dd04decaaec4b5ccaa3  shed1.14.tar.gz
+c7d7d464d6b4fa28a7980270d03e0906  shed-1.15.tar.gz



From davidz at fedoraproject.org  Mon Apr 13 19:31:20 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 13 Apr 2009 19:31:20 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel-2.26.0-show-emblemed-icons.patch,
	NONE, 1.1 gnome-panel.spec, 1.349, 1.350
Message-ID: <20090413193120.EA89870124@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26013

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.26.0-show-emblemed-icons.patch 
Log Message:
* Mon Apr 13 2009 David Zeuthen <davidz at redhat.com> - 2.26.0-2
- Handle emblemed icons (GNOME #578859)



gnome-panel-2.26.0-show-emblemed-icons.patch:

--- NEW FILE gnome-panel-2.26.0-show-emblemed-icons.patch ---
--- gnome-panel-2.26.0/gnome-panel/panel-util.h.orig	2009-04-13 15:12:27.000000000 -0400
+++ gnome-panel-2.26.0/gnome-panel/panel-util.h	2009-04-13 15:19:17.000000000 -0400
@@ -65,6 +65,9 @@ void panel_util_set_tooltip_text (GtkWid
 char *panel_util_get_icon_name_from_g_icon (GIcon *gicon);
 GdkPixbuf *panel_util_get_pixbuf_from_g_loadable_icon (GIcon *gicon,
 						       int    size);
+GdkPixbuf *panel_util_get_pixbuf_from_gicon (GtkIconTheme  *icon_theme,
+                                             GIcon         *gicon,
+                                             int            size);
 GFile *panel_util_get_file_optional_homedir (const char *location);
 
 G_END_DECLS
--- gnome-panel-2.26.0/gnome-panel/panel-util.c.orig	2009-04-13 15:12:22.000000000 -0400
+++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-13 15:19:09.000000000 -0400
@@ -832,6 +832,33 @@ panel_util_get_pixbuf_from_g_loadable_ic
 	return pixbuf;
 }
 
+GdkPixbuf *
+panel_util_get_pixbuf_from_gicon (GtkIconTheme  *icon_theme,
+				  GIcon *gicon,
+				  int    size)
+{
+	GdkPixbuf    *pixbuf;
+	GtkIconInfo  *icon_info;
+
+	g_return_val_if_fail (G_IS_ICON (gicon), NULL);
+
+	pixbuf = NULL;
+
+	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+						    gicon,
+						    size,
+						    0);
+	if (icon_info == NULL)
+		goto out;
+
+	pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+
+	gtk_icon_info_free (icon_info);
+
+ out:
+	return pixbuf;
+}
+
 static char *
 panel_util_get_file_display_name_if_mount (GFile *file)
 {
--- gnome-panel-2.26.0/gnome-panel/menu.c.orig	2009-04-13 15:05:37.000000000 -0400
+++ gnome-panel-2.26.0/gnome-panel/menu.c	2009-04-13 15:22:38.000000000 -0400
@@ -599,7 +599,7 @@ load_icons_handler_again:
 						   &long_operation);
 			g_free (icon_name);
 		} else {
-			pb = panel_util_get_pixbuf_from_g_loadable_icon (icon->gicon, icon_height);
+                        pb = panel_util_get_pixbuf_from_gicon (icon->icon_theme, icon->gicon, icon_height);
 			if (!pb && icon->fallback_image) {
 				pb = panel_make_menu_icon (icon->icon_theme,
 							   NULL,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- gnome-panel.spec	17 Mar 2009 05:03:24 -0000	1.349
+++ gnome-panel.spec	13 Apr 2009 19:30:49 -0000	1.350
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
 
@@ -115,6 +115,9 @@
 
 Patch35: clock-wakeups.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=578859
+Patch100: gnome-panel-2.26.0-show-emblemed-icons.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -161,6 +164,7 @@
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
+%patch100 -p1 -b .emblemed-icons
 
 libtoolize --force --copy
 
@@ -362,6 +366,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Apr 13 2009 David Zeuthen <davidz at redhat.com> - 2.26.0-2
+- Handle emblemed icons (GNOME #578859)
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From lucilanga at fedoraproject.org  Mon Apr 13 19:32:22 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 19:32:22 +0000 (UTC)
Subject: rpms/evolution-rspam/F-10 rspam-0.0.8-razorconfig.patch, NONE,
	1.1 evolution-rspam.spec, 1.3, 1.4
Message-ID: <20090413193222.A3B7F70138@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26514

Modified Files:
	evolution-rspam.spec 
Added Files:
	rspam-0.0.8-razorconfig.patch 
Log Message:
* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-1
- update BR
- new upstream release

rspam-0.0.8-razorconfig.patch:

--- NEW FILE rspam-0.0.8-razorconfig.patch ---
--- evolution-rspam-0.0.8/src/rspam.c	2009-03-13 12:41:17.000000000 +0200
+++ evolution-rspam-0.0.8-mod/src/rspam.c	2009-04-06 08:48:39.000000000 +0300
@@ -295,13 +295,7 @@
 
     account = mail_config_get_default_account ();
 
-	 g_print("account:%p\n", account);
-	if (account)
-	 g_print("account->transport:%p\n", account->transport);
-	if (account->transport)
-	 g_print("account->transport->url:%p\n", account->transport->url);
-
-	if ( !account || (account->transport == NULL) ||
+    if ( !account || (account->transport == NULL) ||
                         (account->transport->url == NULL) || (*account->transport->url == '\0'))
 		goto fail;
 


Index: evolution-rspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-10/evolution-rspam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-rspam.spec	28 Mar 2009 10:36:39 -0000	1.3
+++ evolution-rspam.spec	13 Apr 2009 19:32:19 -0000	1.4
@@ -1,13 +1,13 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
-Version: 0.0.6
-Release: 5%{?dist}
+Version: 0.0.8
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
-Source: http://gnome.eu.org/rspam-%{version}.tar.gz
+Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Report_as_Spam
-Patch: rspam-0.0.6-razorconfig.patch
+Patch: rspam-0.0.8-razorconfig.patch
 
 Requires: perl-Razor-Agent
 Requires: pyzor
@@ -17,9 +17,7 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
-BuildRequires: gettext
-BuildRequires: evolution-devel
-BuildRequires: perl(XML::Parser)
+BuildRequires: evolution-devel, perl(XML::Parser), intltool
 
 %description
 Rspam Evolution Plugin enables Evolution Mail client to report email messages
@@ -29,7 +27,7 @@
 See README for more information about required programs.
 
 %prep
-%setup -q -n rspam-%{version}
+%setup -q -n %{name}-%{version}
 %patch -p1 -b .razor
 
 %build
@@ -67,20 +65,16 @@
 
 %files -f rspam.lang
 %defattr(-,root,root,-)
-%{_datadir}/evolution/*/images/spam.gif
-%{_datadir}/evolution/*/images/nspam.gif
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_sysconfdir}/gconf/schemas/rspam.schemas
-%{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error
 %{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug
 %{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so
-%doc AUTHORS
-%doc COPYING
-%doc ChangeLog
-%doc NEWS
-%doc README
-%doc TODO
 
 %changelog
+* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-1
+- update BR
+- new upstream release
+
 * Sat Mar 28 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.6-5
 - fix for bug #492319
 



From ajax at fedoraproject.org  Mon Apr 13 19:33:14 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 19:33:14 +0000 (UTC)
Subject: rpms/GConf2/devel GConf2.spec,1.100,1.101
Message-ID: <20090413193314.4A15070137@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27022

Modified Files:
	GConf2.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.26.0-2
- Explicit Conflicts: GConf2-dbus (#492636)



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- GConf2.spec	17 Mar 2009 03:53:55 -0000	1.100
+++ GConf2.spec	13 Apr 2009 19:33:10 -0000	1.101
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.25/GConf-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 Requires: dbus
 # for patch0
 Requires: /usr/bin/killall
+Conflicts: GConf2-dbus
 
 Patch0: GConf-2.18.0.1-reload.patch
 Patch1: gconf-less-work.patch
@@ -50,7 +51,7 @@
 Requires: pkgconfig
 # we install an automake macro
 Requires: automake
-
+Conflicts: GConf2-dbus-devel
 
 %description devel
 GConf development package. Contains files needed for doing
@@ -143,6 +144,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.26.0-2
+- Explicit Conflicts: GConf2-dbus (#492636)
+
 * Mon Mar 16 2009 Ray Strode <rstrode at redhat.com> - 2.26.0-1
 - update to 2.26.0
 



From lucilanga at fedoraproject.org  Mon Apr 13 19:33:40 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 13 Apr 2009 19:33:40 +0000 (UTC)
Subject: rpms/evolution-rspam/F-10 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090413193340.4395570137@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rspam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27105

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Apr 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-1
- update BR
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jul 2008 13:21:37 -0000	1.2
+++ .cvsignore	13 Apr 2009 19:33:38 -0000	1.3
@@ -1 +1 @@
-rspam-0.0.6.tar.gz
+evolution-rspam-0.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rspam/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jul 2008 13:21:37 -0000	1.2
+++ sources	13 Apr 2009 19:33:39 -0000	1.3
@@ -1 +1 @@
-52f91ef52157f4f223cabfb4495dd4d4  rspam-0.0.6.tar.gz
+dd8fe595fc36947731d6ab2aacb11eba  evolution-rspam-0.0.8.tar.gz



From lkundrak at fedoraproject.org  Mon Apr 13 19:34:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 19:34:04 +0000 (UTC)
Subject: rpms/koules/devel koules-1.4-defines.patch, NONE,
	1.1 koules-1.4-fix_xsynchronize.patch, NONE,
	1.1 koules-1.4-fpe_fix.patch, NONE,
	1.1 koules-1.4-shm_check.patch, NONE,
	1.1 koules-1.4-use_right_visual.patch, NONE, 1.1 koules.spec, 1.8, 1.9
Message-ID: <20090413193404.169A370137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/koules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27348

Modified Files:
	koules.spec 
Added Files:
	koules-1.4-defines.patch koules-1.4-fix_xsynchronize.patch 
	koules-1.4-fpe_fix.patch koules-1.4-shm_check.patch 
	koules-1.4-use_right_visual.patch 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-7
- Debian apparently fixed shm more sanely than me
- Import bunch of Debian fixes


koules-1.4-defines.patch:

--- NEW FILE koules-1.4-defines.patch ---
>From Debian: 050_defines.diff

--- koules-1.4.orig/xlib/init.c
+++ koules-1.4/xlib/init.c
@@ -769,6 +770,32 @@
 #endif
 	  break;
 	default:
+#ifdef NETSUPPORT
+#define USAGE_NETSUPPORT " -S run koules as network server\n \
+-C<host> run koules as network client\n \
+-P<port> select port. Default is:%i\n \
+-W run server in width mode-support for 320x200 svgalib and OS/2 clients\n \
+-L<level> select level for server\n \
+-D<number> select dificulty for server:\n \
+    0: nightmare\n \
+    1: hard\n \
+    2: medium(default and recomended)\n \
+    3: easy\n \
+    4: very easy\n \
+-K run server in deathmatch mode\n "
+#else
+#define USAGE_NETSUPPORT ""
+#endif
+#ifdef SOUND
+#define USAGE_SOUND " -d Disable sound support\n"
+#else
+#define USAGE_SOUND ""
+#endif
+#ifdef MITSHM
+#define USAGE_MITSHM " -M DISABLE shared memory support\n"
+#else
+#define USAGE_MITSHM ""
+#endif
 	  printf ("USAGE:"
 		  " -h for help\n"
 		  " -b for blackandwhite displays\n"
@@ -778,27 +805,10 @@
 		  " -p use private colormap\n"
 		  " -y Synchronize with X(for debugging)\n"
 		  " -f nofade(for debugging)\n"
-#ifdef SOUND
-		  " -d Disable sound support\n"
-#endif
+		  USAGE_SOUND
 		  " -x Disable X11 pointer\n"
-#ifdef MITSHM
-		  " -M DISABLE shared memory support\n"
-#endif
-#ifdef NETSUPPORT
-		  " -S run koules as network server\n"
-		  " -C<host> run koules as network client\n"
-		  " -P<port> select port. Default is:%i\n"
-		  " -W run server in width mode-support for 320x200 svgalib and OS/2 clients\n"
-		  " -L<level> select level for server\n"
-		  " -D<number> select dificulty for server:\n"
-		  "     0: nightmare\n"
-		  "     1: hard\n"
-		  "     2: medium(default and recomended)\n"
-		  "     3: easy\n"
-		  "     4: very easy\n"
-		  " -K run server in deathmatch mode\n", DEFAULTINITPORT
-#endif
+		  USAGE_MITSHM
+		  USAGE_NETSUPPORT, DEFAULTINITPORT
 	    );
 	  exit (2);
 	}
--- koules-1.4.orig/Iconfig
+++ koules-1.4/Iconfig
@@ -18,7 +18,7 @@
    use my emulation
    If you are unsure try to leave it commented out. My emulation
    works on most unixes*/
-/*#define HAVEUSLEEP*/
+#define HAVEUSLEEP
 /* for network audio server(supported by most unixes)*/
 /* It does not sound as well as built in driver ... koules uses too 
    much sounds*/
@@ -29,14 +29,14 @@
 /* linux joystick support
    Now compiles w/o joystick toolkit. For using joystick support is
    joystick toolikit required...of course */
-/*#define JOYSTICK*/
+#define JOYSTICK
 /*for fast 386 based assembler routines
   recomended for linux*/
-/*#define I386ASSEMBLY*/
+#define I386ASSEMBLY
 /* directories*/
-KOULESDIR		=/usr/bin/X11
-SOUNDDIR		=/usr/local/lib/koules
-MANDIR			=/usr/local/man/man6
+KOULESDIR		=/usr/games
+SOUNDDIR		=/usr/games/lib/koules
+MANDIR			=/usr/man/man6
 
 /*You need some extra libraryes for BSD sockets compatibility?*/
 /* TOP_INCLUDES =                       /* Sun users with GCC need this */
@@ -61,7 +61,7 @@
 #endif
 
 
-#if defined(HPArchitecture)
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
     SYSDEFS = +O3 -Ae 
 #if !defined(NAS_SOUND)&&!defined(RSOUND)
 #define SOUND

koules-1.4-fix_xsynchronize.patch:

--- NEW FILE koules-1.4-fix_xsynchronize.patch ---
>From Debian: 107_fix_xsynchronize.diff

diff -up koules1.4/xlib/init.c.fix_xsynchronize koules1.4/xlib/init.c
--- koules1.4/xlib/init.c.fix_xsynchronize	2009-04-13 21:18:35.765152286 +0200
+++ koules1.4/xlib/init.c	2009-04-13 21:20:16.543140365 +0200
@@ -392,6 +392,8 @@ initialize (char **argv, int argc)
       GAMEHEIGHT = MAPHEIGHT = DisplayHeight (dp, DefaultScreen (dp)) * 0.8;
     }
 
+  if (Sync)
+     XSynchronize (dp, 1);
   XSetCloseDownMode (dp, DestroyAll);
   screen = DefaultScreen (dp);
   fadeenable = 1;
@@ -584,8 +586,6 @@ initialize (char **argv, int argc)
     }
 #endif
 
-  if (Sync)
-    XSynchronize (dp, 1);
 #if defined(NAS_SOUND)||defined(RSOUND)
   printf ("Initializing sound server...\n");
   if (sndinit)
@@ -670,7 +670,7 @@ main (int argc, char **argv)
 	  "\n\n\n\n"
 	  "                     Copyright(c) Jan Hubicka 1995, 1996\n\n\n");
   useprivate = 0;
-  while ((c = mygetopt (argc, argv, "KWD:P:L:C:SxslEMmpdhfb")) != -1)
+  while ((c = mygetopt (argc, argv, "KWD:P:L:C:SxyslEMmpdhfb")) != -1)
     {
       switch (c)
 	{

koules-1.4-fpe_fix.patch:

--- NEW FILE koules-1.4-fpe_fix.patch ---
>From Debian: 109_fpe_fix.diff

--- koules-1.4.orig/xlib/shmbitmap.c	2007-10-26 21:16:50.000000000 -0400
+++ koules-1.4/xlib/shmbitmap.c	2007-10-26 21:18:21.000000000 -0400
@@ -187,6 +187,9 @@
 void
 ShmPutBitmap (int x, int y, int w, int h, void *_dp)
 {
+  if (x < 0 || y < 0)
+    return;
+
 /* no clipping */
   uchar          *dp = _dp;
   uchar          *vp, *vpline;

koules-1.4-shm_check.patch:

--- NEW FILE koules-1.4-shm_check.patch ---
>From Debian: 106_shm_check.diff

Index: koules-1.4/xlib/init.c
===================================================================
--- koules-1.4.orig/xlib/init.c	2006-11-03 11:43:49.000000000 +0100
+++ koules-1.4/xlib/init.c	2006-11-03 11:56:04.000000000 +0100
@@ -91,6 +91,8 @@
 
 #ifdef MITSHM
 extern int      XShmQueryExtension (Display * dpy);
+extern Bool     XShmQueryVersion (Display* dpy, int * major, int * minor,
+                                  Bool * sharedpixmaps);
 static int      haderror;
 static int      (*origerrorhandler) (Display *, XErrorEvent *);
 static int      bpp;
@@ -107,6 +109,15 @@
   return (0);
 }
 
+static int
+badmatcherrorhandler (Display * d, XErrorEvent * e)
+{
+  haderror++;
+  if (e->error_code != BadMatch)
+    (*origerrorhandler) (d, e);
+  return (0);
+}
+
 #define Width MAPWIDTH
 #define Height (MAPHEIGHT+20)
 XShmSegmentInfo shminfo;
@@ -186,16 +197,27 @@
   fflush (stdout);
   testpixmap = XCreatePixmap (dp, wi, MAPWIDTH, MAPHEIGHT + 20, DefaultDepth (dp, screen));
   XSync (dp, 0);
+  haderror = False;
+  origerrorhandler = XSetErrorHandler (badmatcherrorhandler);
   for (i = 0; i < 10 && wait > 0; i++)
     {
-      XPutImage (dp, testpixmap, gc, pixmap->ximage, 0, 0, 0, 0, MAPWIDTH, MAPHEIGHT + 20);
+      if (!XPutImage (dp, testpixmap, gc, pixmap->ximage, 0, 0, 0, 0,
+                      MAPWIDTH, MAPHEIGHT + 20))
+        break;
       XSync (dp, 0);
       gettimeofday (&VnewClk, NULL);
       if (VnewClk.tv_usec < VendSleep)
 	VendSleep -= 1000000;
       wait = (VfTime - VnewClk.tv_usec + VendSleep);
     }
+  XSync (dp, False);
+  XSetErrorHandler (origerrorhandler);
   XFreePixmap (dp, testpixmap);
+  if (haderror)
+    {
+      printf (" XPutImage failed (remote server?)\n");
+      return 0;
+    }
   if (i == 10)
     {
       printf ("OK\n");
@@ -258,6 +280,7 @@
   pixmap->ximage->data = (char *) shared_mem;
 
   /* Now try to attach it to the X Server */
+  XSync (dp, False);
   haderror = False;
   origerrorhandler = XSetErrorHandler (shmerrorhandler);
   if (!XShmAttach (dp, &shminfo))
@@ -416,22 +439,25 @@
 #ifdef MITSHM
   /* Make sure all is destroyed if killed off */
 
-  /* Make sure we can do PsuedoColor colormap stuff */
+  /* Make sure we can do PseudoColor colormap stuff */
   if (!shm)
     {
       printf ("Shm support disabled\n");
     }
   else
-    /* Check to see if the extensions are supported */
-  if (!XShmQueryExtension (dp))
     {
-      fprintf (stderr, "X server doesn't support MITSHM extension.\n");
-      shm = 0;
+      /* Check to see if the extensions are supported */
+      int major, minor;
+      Bool pixmaps;
+      if (XShmQueryVersion (dp, &major, &minor, &pixmaps) != 0
+           && (major > 1 || (major == 1 && minor >= 1)))
+          printf ("Shm mode seems to be possible\n");
+      else
+        {
+          fprintf (stderr, "X server doesn't support MITSHM extension.\n");
+          shm = 0;
+        }
     }
-  if (shm)
-    printf ("Shm mode seems to be possible\n");
-
-
 #endif
   wi = physicalscreen.pixmap = XCreateSimpleWindow (dp, RootWindow (dp, screen), 50, 50, MAPWIDTH, MAPHEIGHT + 20,
 						    0, 0, 0);

koules-1.4-use_right_visual.patch:

--- NEW FILE koules-1.4-use_right_visual.patch ---
>From Debian: 108_use_right_visual.diff

diff -up koules1.4/xlib/init.c.use_right_visual koules1.4/xlib/init.c
--- koules1.4/xlib/init.c.use_right_visual	2009-04-13 21:21:50.639259228 +0200
+++ koules1.4/xlib/init.c	2009-04-13 21:27:57.082161986 +0200
@@ -95,7 +95,6 @@ extern Bool     XShmQueryVersion (Displa
                                   Bool * sharedpixmaps);
 static int      haderror;
 static int      (*origerrorhandler) (Display *, XErrorEvent *);
-static int      bpp;
 
 
 static int
@@ -179,14 +178,14 @@ GetImage (VScreenType * pixmap)	/*Work a
   VfTime = 1000000 / 25 * 12;
   pixmap->ximage = XCreateImage (dp, DefaultVisual (dp, screen),
 				 depth, ZPixmap, 0,
-				 NULL, Width, Height, bpp * 8, 0);
+				 NULL, Width, Height, depth, 0);
   if (!pixmap->ximage)
     {
       fprintf (stderr, "Can't get image\n");
       return 0;
     }
   /*Calculate size of shared memory */
-  memsize = ((Width + 1) * (Height + 1) * bpp);
+  memsize = ((Width + 1) * (Height + 1) * depth / 8);
   if ((data = malloc (memsize)) == NULL)
     {
       printf ("Can't malloc memory for image\n");
@@ -340,7 +339,6 @@ initialize (char **argv, int argc)
   char           *title1 = "Koules";
 
   Font            f;
-  XVisualInfo     vinfo_return;
   XGCValues       values;
 #ifndef NAS_SOUND
 #ifndef RSOUND
@@ -396,54 +394,46 @@ initialize (char **argv, int argc)
      XSynchronize (dp, 1);
   XSetCloseDownMode (dp, DestroyAll);
   screen = DefaultScreen (dp);
-  fadeenable = 1;
-  if (XMatchVisualInfo (dp, DefaultScreen (dp),
-			8, PseudoColor, &vinfo_return) == False)
-    {
-      fadeenable = 0;
-      printf ("X: Screen doesn't support PseudoColor!\n");
-      if (XMatchVisualInfo (dp, DefaultScreen (dp),
-			    32, TrueColor, &vinfo_return) == True)
-	{
-	  useprivate = 0;
-	  bpp = 4;
-	}
-      else if (XMatchVisualInfo (dp, DefaultScreen (dp),
-				 24, TrueColor, &vinfo_return) == True)
-	{
-	  useprivate = 0;
-	  bpp = 4;
-	}
-      else if (XMatchVisualInfo (dp, DefaultScreen (dp),
-				 16, TrueColor, &vinfo_return) == True)
-	{
-	  useprivate = 0;
-	  bpp = 2;
-	}
-      else if (XMatchVisualInfo (dp, DefaultScreen (dp),
-				 15, TrueColor, &vinfo_return) == True)
-	{
-	  useprivate = 0;
-	  bpp = 2;
-	}
-      else if (XMatchVisualInfo (dp, DefaultScreen (dp),
-				 8, GrayScale, &vinfo_return) == True)
-	{
-	  useprivate = 0;
-	  monochrome = 1;
-	  bpp = 2;
-	}
-      else
-	{
-	  printf ("Unsupported visual! Using slow and reliable mode\n");
+  {
+    XVisualInfo template;
+    XVisualInfo * vinfo;
+    int nitems_return;
+    template.visualid = XVisualIDFromVisual (DefaultVisual (dp, DefaultScreen (dp)));
+    vinfo = XGetVisualInfo (dp, VisualIDMask, &template, &nitems_return);
+    if (nitems_return == 0)
+      {
+        printf ("X server does not know about the default visual...");
+        exit (0);
+      }
+
+    if (vinfo->class == PseudoColor && vinfo->depth == 8)
+      {
+        fadeenable = 1;
+      }
+    else
+      {
+        fadeenable = 0;
+        printf ("X: Screen doesn't support PseudoColor!\n");
+        if (vinfo->class == TrueColor)
+          {
+            useprivate = 0;
+          }
+        else if (vinfo->class == GrayScale)
+          {
+            useprivate = 0;
+            monochrome = 1;
+          }
+        else
+          {
+            printf ("Unsupported visual! Using slow and reliable mode\n");
 #ifdef MITSHM
-	  shm = 0;
+            shm = 0;
 #endif
-	}
-    }
-  else
-    bpp = 1;
-  depth = vinfo_return.depth;
+          }
+      }
+    depth = vinfo->depth;
+    XFree(vinfo);
+  }
 #ifdef MITSHM
   /* Make sure all is destroyed if killed off */
 


Index: koules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- koules.spec	11 Apr 2009 22:40:35 -0000	1.8
+++ koules.spec	13 Apr 2009 19:33:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           koules
 Version:        1.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Action game with multiplayer, network and sound support
 
 Group:          Amusements/Games
@@ -29,6 +29,7 @@
 Patch0:         koules-1.4-clean.patch
 Patch1:         koules-1.4-overflows.patch
 Patch2:         koules-1.4-spelling.patch
+Patch3:         koules-1.4-defines.patch
 
 # SVGAlib specific patches
 Patch10:        koules-1.4-retrace.patch
@@ -40,6 +41,10 @@
 Patch22:        koules-1.4-imake.patch
 Patch23:        koules-1.4-shm.patch
 Patch24:        koules-1.4-mode.patch
+Patch25:        koules-1.4-shm_check.patch
+Patch26:        koules-1.4-fix_xsynchronize.patch
+Patch27:        koules-1.4-use_right_visual.patch
+Patch28:        koules-1.4-fpe_fix.patch
 
 %description
 Koules is a fast action arcade-style game.  It works in fine resolution
@@ -97,6 +102,7 @@
 %patch0 -p1 -b .clean
 %patch1 -p1 -b .overflows
 %patch2 -p1 -b .spelling
+%patch3 -p1 -b .defines
 %patch10 -p1 -b .retrace
 %patch11 -p1 -b .make
 %endif
@@ -107,11 +113,16 @@
 %patch0 -p1 -b .clean
 %patch1 -p1 -b .overflows
 %patch2 -p1 -b .spelling
+%patch3 -p1 -b .defines
 %patch20 -p1 -b .noman
 %patch21 -p1 -b .asmfix
 %patch22 -p1 -b .imake
-%patch23 -p1 -b .shm
+#patch23 -p1 -b .shm
 %patch24 -p1 -b .mode
+%patch25 -p1 -b .shm_check
+%patch26 -p1 -b .fix_xsynchronize
+%patch27 -p1 -b .use_right_visual
+%patch28 -p1 -b .fpe_fix
 
 
 %build
@@ -190,6 +201,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-7
+- Debian apparently fixed shm more sanely than me
+- Import bunch of Debian fixes
+
 * Sun Apr 12 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-6
 - Wrap the OSS-based sound server in padsp
 



From mso at fedoraproject.org  Mon Apr 13 19:42:22 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon, 13 Apr 2009 19:42:22 +0000 (UTC)
Subject: rpms/leonidas-backgrounds/devel .cvsignore, 1.3,
	1.4 leonidas-backgrounds.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090413194222.CBE1270124@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/leonidas-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30130

Modified Files:
	.cvsignore leonidas-backgrounds.spec sources 
Log Message:


Updated lion backgrounds. 
Don't display the lion on single screens, it's too complex.
Use just leonidas-1-noon.png for the kdm version, there is no need to add
the '-simple' suffix anymore.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2009 19:45:01 -0000	1.3
+++ .cvsignore	13 Apr 2009 19:42:19 -0000	1.4
@@ -1 +1 @@
-leonidas-backgrounds-10.93.0.tar.lzma
+leonidas-backgrounds-10.93.1.tar.lzma


Index: leonidas-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/leonidas-backgrounds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- leonidas-backgrounds.spec	10 Apr 2009 19:45:01 -0000	1.2
+++ leonidas-backgrounds.spec	13 Apr 2009 19:42:19 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           leonidas-backgrounds
-Version:        10.93.0
+Version:        10.93.1
 Release:        1%{?dist}
 Summary:        Leonidas desktop backgrounds
 
@@ -12,7 +12,7 @@
 # Images in the source archive are basically crops/resizes of 
 # https://fedoraproject.org/w/uploads/e/e9/Artwork_F11_Betamockup1_n.jpg
 # and
-# https://fedoraproject.org/wiki/Image:King_4070x1536.jpg
+# https://fedoraproject.org/wiki/File:King_4096x1536.xcf.bz2
 Source0:        %{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -136,7 +136,7 @@
 %dir %{_datadir}/backgrounds/leonidas
 %dir %{_datadir}/backgrounds/leonidas/lion/normal
 %dir %{_datadir}/backgrounds/leonidas/lion/normal/2048x1536
-%{_datadir}/backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon-simple.png
+%{_datadir}/backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png
 
 %files landscape
 %defattr(-,root,root,-)
@@ -148,6 +148,12 @@
 %{_datadir}/backgrounds/leonidas/leonidas_right.xml
 
 %changelog
+* Mon Apr 13 2009 Martin Sourada <mso at fedoraproejct.org> - 10.93.1-1
+- Updated lion backgrounds
+- Don't display the lion for single screens
+- Use just leonidas-1-noon.png for the kdm version, no need to add the '-simple'
+  suffix
+
 * Fri Apr 10 2009 Martin Sourada <mso at fedoraproject.org> - 10.93.0-1
 - Add lion backgrounds
 - Split -common (shared between GNOME and KDE), -kdm (simplified version for 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2009 19:45:01 -0000	1.3
+++ sources	13 Apr 2009 19:42:19 -0000	1.4
@@ -1 +1 @@
-90b5344be91a49c99c1484e956d022e0  leonidas-backgrounds-10.93.0.tar.lzma
+90680c08c55efa94c53edf9e4316cfb3  leonidas-backgrounds-10.93.1.tar.lzma



From lkundrak at fedoraproject.org  Mon Apr 13 19:49:28 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 13 Apr 2009 19:49:28 +0000 (UTC)
Subject: rpms/system-config-kdump/devel
	system-config-kdump-1.0.14-error-handling.patch, NONE,
	1.1 system-config-kdump.spec, 1.7, 1.8
Message-ID: <20090413194928.4AFE570124@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-kdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv942

Modified Files:
	system-config-kdump.spec 
Added Files:
	system-config-kdump-1.0.14-error-handling.patch 
Log Message:
* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0.14-6
- Improve error handling when applying settings


system-config-kdump-1.0.14-error-handling.patch:

--- NEW FILE system-config-kdump-1.0.14-error-handling.patch ---
Display an action progressbar while reconfiguring the boot loader
and generating the ram disk image. Handle errors and display
diagnostic information in case an error occur.

Lubomir Rintel <lkundrak at v3.sk>

diff -up system-config-kdump-1.0.14/src/system-config-kdump.py.error-handling system-config-kdump-1.0.14/src/system-config-kdump.py
--- system-config-kdump-1.0.14/src/system-config-kdump.py.error-handling	2009-04-13 21:46:19.789256429 +0200
+++ system-config-kdump-1.0.14/src/system-config-kdump.py	2009-04-13 21:46:27.429137877 +0200
@@ -1,7 +1,9 @@
 # system-config-kdump.py - configures kexec/kdump
 # Copyright (c) 2006 Red Hat, Inc.
+# Copyright (c) 2008 Lubomir Rintel
 # Authors: Dave Lehman <dlehman at redhat.com>
 #          Jarod Wilson <jwilson at redhat.com>
+#          Lubomir Rintel <lkundrak at v3.sk>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +22,7 @@
 import gtk
 import gobject
 import gtk.glade
+from rhpl.executil import gtkExecWithCaptureStatus
 
 import sys
 import os
@@ -338,16 +341,6 @@ class mainWindow:
             else:
                 return
 
-        kernelKdumpNote = ""
-        if self.arch in kernelKdumpArches:
-            kernelKdumpNote = _("\n\nNote that the %s architecture does not "
-                                "feature a relocatable kernel at this time, "
-                                "and thus requires a separate kernel-kdump "
-                                "package to be installed for kdump to "
-                                "function. This can be installed via 'yum "
-                                "install kernel-kdump' at your convenience."
-                                "\n\n") % self.arch
-
         if self.xenKernel and self.kdumpEnabled:
             self.showMessage(_("WARNING: xen kdump support requires a "
                                "non-xen %s RPM to perform actual crash "
@@ -356,18 +349,6 @@ class mainWindow:
                                "as your xen kernel installed.") %
                                (self.xenKdumpKernel, self.xenKdumpKernel))
 
-        try:
-            origKdumpMem = int(self.origCrashKernel.split("@")[0][:-1])
-        except ValueError:
-            origKdumpMem = 0
-
-        if self.kdumpEnabled and self.kdumpMem != origKdumpMem:
-            self.showMessage(_("Changing Kdump settings requires rebooting "
-                               "the system to reallocate memory accordingly. "
-                               "%sYou will have to reboot the system for the "
-                               "new settings to take effect.")
-                               % kernelKdumpNote)
-
         if not testing:
             if debug:
                 print "writing kdump config"
@@ -377,12 +358,13 @@ class mainWindow:
             if debug:
                 print "writing bootloader config"
 
-            self.writeBootloaderConfig()
+            if self.writeBootloaderConfig():
+                self.destroy()
+
         else:
             print "would have called writeDumpConfig"
             print "would have called writeBootloaderConfig"
-
-        self.destroy()
+            self.destroy()
 
     def cancelClicked(self, *args):
         self.destroy()
@@ -701,7 +683,7 @@ class mainWindow:
 
     def writeBootloaderConfig(self):
         if testing:
-            return
+            return True
 
         (blConfig, offset, kpath) = bootloaders[self.bootloader]
 
@@ -717,31 +699,94 @@ class mainWindow:
         # Are we adding or removing the crashkernel param?
         if self.kdumpEnabled:
             crashKernel = "%iM" % (self.kdumpMem)
-            grubbyCmd = '/sbin/grubby --%s --update-kernel=%s --%s="crashkernel=%s"' \
-                        % (self.bootloader, self.defKern, 
-                           args, crashKernel)
+            grubbyCmd = ('/sbin/grubby', '--%s' % self.bootloader,
+                         '--update-kernel=%s' % self.defKern,
+                         '--%s="crashkernel=%s"' % (args, crashKernel))
             chkconfigStatus = "on"
             if self.origCrashKernel:
                 serviceOp = "restart"
             else:
                 serviceOp = "start"
         else:
-            grubbyCmd = '/sbin/grubby --%s --update-kernel=%s --remove-%s="crashkernel=%s"' \
-                        % (self.bootloader, self.defKern, 
-                           args, self.origCrashKernel)
+            grubbyCmd = ('/sbin/grubby', '--%s' % self.bootloader,
+                         '--update-kernel=%s' % self.defKern,
+                         '--remove-%s="crashkernel=%s"' % (args, self.origCrashKernel))
             chkconfigStatus = "off"
-            serviceOp = "stop"
+            if self.origCrashKernel:
+                serviceOp = "stop"
+            else:
+                serviceOp = None
 
         if debug:
             print "Using %s bootloader without offset" % (self.bootloader)
             print "Grubby command:\n    %s" % grubbyCmd
 
-        # FIXME: use rhpl.executil (and handle errors)!
-        os.system(grubbyCmd)
-        os.system("/sbin/chkconfig kdump %s" % chkconfigStatus)
-        os.system("/sbin/service kdump %s" % serviceOp)
-        if self.bootloader == 'yaboot':
-            os.system('/sbin/ybin')
+        # Distract the user while we build a dam from all her files
+        window = progressWindow(_("Applying configuration..."),
+                                _("kdump is being reconfigured with the new settings now.\n"
+                                  "Please be patient, it can take up to one minute to complete."));
+        window.show()
+
+        rebootNeeded = False 
+	try:
+            def call(*args):
+                (status, output) = gtkExecWithCaptureStatus(args[0], args, catchfd = (1, 2))
+                if status:
+                    output = _("Command '%s' failed:\n%s") %  (" ".join (args), output)
+                    raise RuntimeError(output)
+    
+            call(*grubbyCmd)
+            if self.bootloader == 'yaboot': 
+                call("/sbin/ybin")
+            call("/sbin/chkconfig", "kdump", chkconfigStatus)
+
+            try:
+                if serviceOp:
+                    call("/sbin/service", "kdump", serviceOp)
+            except:
+                # Tolerate problems in case the boot memory is not yet allocated,
+                # just tell the user to reboot.  If the problem is not related to 
+                # boot memory being allocated, she'll notice the kdump service fail
+                # anyways.
+                try:
+                    origKdumpMem = int(self.origCrashKernel.split("@")[0][:-1])
+                except ValueError:
+                    origKdumpMem = 0
+   
+                if self.kdumpEnabled and self.kdumpMem != origKdumpMem:
+                    rebootNeeded = True
+                else:
+                    raise
+
+        except RuntimeError, output:
+            # RuntimeError is risen by call() as well as gtkExecWithCaptureStatus() itself
+            window.stop()
+            self.showErrorMessage (_("Couldn't apply the new configuration. Please revisit "
+                               "the configuration dialog and try to correct the problem, "
+                               "otherwise kdump will not function properly.\n\n%s" % output))
+            window.hide()
+            return False
+
+        kernelKdumpNote = ""
+        if self.arch in kernelKdumpArches:
+            kernelKdumpNote = _("\n\nNote that the %s architecture does not "
+                                "feature a relocatable kernel at this time, "
+                                "and thus requires a separate kernel-kdump "
+                                "package to be installed for kdump to "
+                                "function. This can be installed via 'yum "
+                                "install kernel-kdump' at your convenience."
+                                "\n\n") % self.arch
+
+        if rebootNeeded:
+            window.stop ()
+            self.showMessage(_("Changing Kdump settings requires rebooting "
+                               "the system to reallocate memory accordingly. "
+                               "%sYou will have to reboot the system for the "
+                               "new settings to take effect.")
+                               % kernelKdumpNote)
+
+        window.hide()
+        return True
 
     def updateUsableMem(self, *args):
         self.kdumpMem = int(args[0].get_value())
@@ -866,7 +911,49 @@ class mainWindow:
             rc = False
 
         return rc
- 
+
+class progressWindow(gtk.Window):
+    def __init__(self, title, label):
+        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
+        self.set_deletable(False)
+        self.set_resizable(False)
+        self.set_position(gtk.WIN_POS_CENTER)
+        self.set_modal(True)
+
+        self.set_title(title)
+        self.progress = gtk.ProgressBar()
+        self.progress.show()
+
+        label = gtk.Label(label)
+        label.show()
+
+        vbox = gtk.VBox()
+        vbox.set_spacing(10);
+        vbox.set_border_width(10);
+        vbox.show()
+
+        vbox.pack_start(label)
+        vbox.pack_start(self.progress)
+
+        self.add(vbox)
+
+    def start(self):
+        self.timer = gobject.timeout_add(100, lambda progress:
+            progress.pulse() or True, self.progress)
+
+    def stop(self):
+        if self.timer:
+            gobject.source_remove(self.timer)
+            self.timer = None
+
+    def show(self):
+        self.start()
+        gtk.Window.show(self)
+
+    def hide(self):
+        self.stop()
+        gtk.Window.hide(self)
+
 if __name__ == "__main__":
     import getopt
 


Index: system-config-kdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kdump/devel/system-config-kdump.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system-config-kdump.spec	23 Mar 2009 13:18:31 -0000	1.7
+++ system-config-kdump.spec	13 Apr 2009 19:48:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
 Version: 1.0.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 Group: System Environment/Base
@@ -22,6 +22,7 @@
 Patch2: system-config-kdump-1.0.14-fedora.patch
 Patch3: system-config-kdump-1.0.14-ommit-offset.patch
 Patch4: system-config-kdump-1.0.14-off-by-one.patch
+Patch5: system-config-kdump-1.0.14-error-handling.patch
 
 %description
 system-config-kdump is a graphical tool for configuring kernel crash
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .fedora
 %patch3 -p1 -b .ommit-offset
 %patch4 -p1 -b .off-by-one
+%patch5 -p1 -b .error-handling
 %build
 make
 
@@ -76,6 +78,9 @@
 %doc ChangeLog COPYING
 
 %changelog
+* Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0.14-6
+- Improve error handling when applying settings
+
 * Mon Mar 23 2009 Roman Rakus <rrakus at redhat.com> - 1.0.14-5
 - Fix off by one error in kernel command line parsing
   Resolves #334269



From alexl at fedoraproject.org  Mon Apr 13 19:50:51 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Mon, 13 Apr 2009 19:50:51 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.94,
	1.95 nautilus-2.23.5-selinux.patch, 1.2, 1.3 nautilus.spec,
	1.269, 1.270 sources, 1.98, 1.99
Message-ID: <20090413195051.2B90970124@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1602

Modified Files:
	.cvsignore nautilus-2.23.5-selinux.patch nautilus.spec sources 
Log Message:
* Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-1
- Update to 2.26.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	3 Apr 2009 03:03:38 -0000	1.94
+++ .cvsignore	13 Apr 2009 19:50:18 -0000	1.95
@@ -1 +1,2 @@
 nautilus-2.26.1.tar.bz2
+nautilus-2.26.2.tar.bz2

nautilus-2.23.5-selinux.patch:

Index: nautilus-2.23.5-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus-2.23.5-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-2.23.5-selinux.patch	16 Feb 2009 16:31:34 -0000	1.2
+++ nautilus-2.23.5-selinux.patch	13 Apr 2009 19:50:18 -0000	1.3
@@ -79,8 +79,8 @@
  					       "description", _("The SELinux security context of the file."),
 +					       "ellipsize", TRUE,
  					       NULL));
- 	
- 	return columns;
+ 	columns = g_list_append (columns,
+ 				 g_object_new (NAUTILUS_TYPE_COLUMN,
 diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c
 --- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux	2009-02-16 09:45:37.000000000 +0100
 +++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c	2009-02-16 17:20:33.000000000 +0100


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- nautilus.spec	6 Apr 2009 13:08:54 -0000	1.269
+++ nautilus.spec	13 Apr 2009 19:50:18 -0000	1.270
@@ -15,8 +15,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.26.1
-Release:	2%{?dist}
+Version: 	2.26.2
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -87,11 +87,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=456515
-# Dragging Files via NFS share moves instead of copy
-Patch18:	nautilus-2.26.1-dnd-not-recurse.patch
-
-
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -129,7 +124,6 @@
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch18 -p0 -b .dnd-recurse
 
 %build
 
@@ -267,6 +261,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-1
+- Update to 2.26.2
+
 * Mon Apr  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.1-2
 - Fix dragging files via NFS moves instead of copy (#456515)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	3 Apr 2009 03:03:38 -0000	1.98
+++ sources	13 Apr 2009 19:50:18 -0000	1.99
@@ -1 +1,2 @@
 5d75f5de2806e9003e36a4613866b8d1  nautilus-2.26.1.tar.bz2
+6b9292ed9dde8b5f86a3b6df1422d5f8  nautilus-2.26.2.tar.bz2



From dcantrel at fedoraproject.org  Mon Apr 13 19:53:29 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 13 Apr 2009 19:53:29 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.31, 1.32 pyparted.spec, 1.59,
	1.60 sources, 1.36, 1.37
Message-ID: <20090413195329.C776570124@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3173

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 2.0.11-1
- Upgrade to pyparted-2.0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Apr 2009 02:23:40 -0000	1.31
+++ .cvsignore	13 Apr 2009 19:52:59 -0000	1.32
@@ -1 +1 @@
-pyparted-2.0.10.tar.gz
+pyparted-2.0.11.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pyparted.spec	4 Apr 2009 02:23:40 -0000	1.59
+++ pyparted.spec	13 Apr 2009 19:52:59 -0000	1.60
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.0.10
+Version: 2.0.11
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -41,6 +41,9 @@
 %{python_sitearch}/parted
 
 %changelog
+* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 2.0.11-1
+- Upgrade to pyparted-2.0.11
+
 * Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.10-1
 - Upgrade to pyparted-2.0.10
       Fix LVM problems around parted.Disk.commit() (#491746)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Apr 2009 02:23:40 -0000	1.36
+++ sources	13 Apr 2009 19:52:59 -0000	1.37
@@ -1 +1 @@
-edaff191f825a759762097f867823aa2  pyparted-2.0.10.tar.gz
+8c42d3b66543b47911da8e2d48b26668  pyparted-2.0.11.tar.gz



From twoerner at fedoraproject.org  Mon Apr 13 19:56:43 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Mon, 13 Apr 2009 19:56:43 +0000 (UTC)
Subject: rpms/system-config-firewall/devel .cvsignore, 1.26, 1.27 sources,
	1.29, 1.30 system-config-firewall.spec, 1.39, 1.40
Message-ID: <20090413195643.6BCFC70124@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4677

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- fixed icon reference in desktop file (rhbz#493674)
- fixed po/POTFILES.in
- updated translations: as, bn_IN, el, fi, gu, hi, hu, it, kn, ko, mai, ml, mr, or, pa, pt, ru, sk, sv, ta, te, zh_TW




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	30 Mar 2009 11:47:27 -0000	1.26
+++ .cvsignore	13 Apr 2009 19:56:12 -0000	1.27
@@ -1 +1,2 @@
 system-config-firewall-1.2.14.tar.bz2
+system-config-firewall-1.2.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	30 Mar 2009 11:47:27 -0000	1.29
+++ sources	13 Apr 2009 19:56:12 -0000	1.30
@@ -1 +1 @@
-7d652948bcd3aa379cda780d291a0959  system-config-firewall-1.2.14.tar.bz2
+c40dcdd913922616c5a2a0cad126162d  system-config-firewall-1.2.15.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-firewall.spec	30 Mar 2009 11:47:28 -0000	1.39
+++ system-config-firewall.spec	13 Apr 2009 19:56:12 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.14
+Version: 1.2.15
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -119,6 +119,11 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Mon Apr 13 2009 Thomas Woerner <twoerner at redhat.com> 1.2.15-1
+- fixed icon reference in desktop file (rhbz#493674)
+- fixed po/POTFILES.in
+- updated translations: as, bn_IN, el, fi, gu, hi, hu, it, kn, ko, mai, ml, mr, or, pa, pt, ru, sk, sv, ta, te, zh_TW
+
 * Fri Mar 27 2009 Thomas Woerner <twoerner at redhat.com> 1.2.14-1
 - new build environment using configure, autofoo and intltool
 - fixed typo in router-solicitation description (rhbz#490979)



From toshio at fedoraproject.org  Mon Apr 13 20:00:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 20:00:07 +0000 (UTC)
Subject: rpms/python-fedora/EL-5 .cvsignore, 1.20, 1.21 python-fedora.spec, 
	1.22, 1.23 sources, 1.21, 1.22
Message-ID: <20090413200007.8CED770124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5678/EL-5

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
- Bugfix and cleanup release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Mar 2009 17:15:47 -0000	1.20
+++ .cvsignore	13 Apr 2009 19:59:37 -0000	1.21
@@ -1 +1 @@
-python-fedora-0.3.11.1.tar.gz
+python-fedora-0.3.12.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-fedora.spec	12 Mar 2009 17:15:47 -0000	1.22
+++ python-fedora.spec	13 Apr 2009 19:59:37 -0000	1.23
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.11.1
+Version:        0.3.12
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -16,6 +16,12 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-paver
 BuildRequires:  python-sphinx
+%if 0%{?fedora} >= 9
+BuildRequires:  python-cherrypy2
+%else
+BuildRequires:  python-cherrypy
+%endif
+BuildRequires:  python-babel
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
@@ -46,17 +52,22 @@
 %install
 rm -rf %{buildroot}
 paver install --skip-build --root %{buildroot}
+
 mv build-doc/html doc/
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog doc
 %{python_sitelib}/*
 
 %changelog
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
+- Bugfix and cleanup release.
+
 * Thu Mar 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.11.1-1
 - Update to fix problem with django auth and redirects.
 
@@ -157,92 +168,3 @@
 
 * Wed Feb 13 2008 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.99.0-1
 - First beta of new release.  This release is for TG-1.0.4 and SA-0.4.
-
-* Thu Dec 13 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.22-1
-- Convert fasLDAP to get its connection information fedora-db-access.
-- Add requirements for python-feedparser and python-bugzilla
-- Add fedora.tg.widgets module containing a few proof-of-concept
-  Fedora TurboGears widgets
-- Add a new method to fas: get_users() that returns common public information
-  about all users.
-
-* Thu Nov 15 2007 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.90.21-1
-- Bugfix release for expired sessions.
-
-* Wed Nov 14 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-3
-- Handle our SQLAlchemy requirement differently for Fedora 8+, until
-  TurboGears can use SQLAlchemy >= 0.4
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-2
-- Require SQLAlchemy 0.3 for python-fedora-infrastructure
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-1
-- Latest upstream release
-
-* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
-- New upstream release with a FAS2 unicode fix.
-
-* Mon Sep 24 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-3
-- Fix the Source URL.  Should be fedorapeople rather than fedoraproject.
-
-* Fri Sep 21 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-2
-- BR: python-setuptools-devel as this has been split in the new versions.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-1
-- Update to version wih handling of control-center-maint bugzilla address.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-2
-- Minor touchups to description and URL.
-
-* Mon Sep 17 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-1
-- Update to 0.2.90.17. 
-- Build separate packages for pieces useful on clients and only on the server.
-
-* Mon Sep 10 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.16-1
-- Bugfix to fasLDAP module.
-
-* Fri Sep 7 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.15-1
-- Make the fasLDAP module more OO.
-- Bugfixes.
-- Update the install line.
-
-* Thu Aug 2 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.14-1
-- Fix safas2provider to only create the visit_identity class.
-- Add COPYING and AUTHORS files.
-
-* Sat Jul 21 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.13-1
-- New class fedora.tg.client.BaseClient that can be used as the basis of a TG
-  standalone application.  With a little support on the server side (mostly
-  allowing tg_format=json) this class will provide you with the basis to read
-  and write data to the server.
-- Fix safasprovider to only create the visit_identity class since the other
-  information is stored directly in FAS.
-
-* Mon Jul 10 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.12-1
-- Fix some issues with Unicode.
-- Catch a traceback when the database is down.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.11-1
-- Remove a decorator so running on python-2.3 works.
-- Have FASUser and FASGroup emit json on demand so that they can be returned
-  when tg_format=json.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.10-1
-- Update fas2 integration with changes from mmcgrath.
-- berrange has changed his email address in the account system, no longer need
-  to special case his bugzilla address.
-- Fix a bug in the handling of db errors in accounts/fas.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.9-1
-- Update fas2 integration with changes from mmcgrath.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.8-1
-- Catch some exceptions when the database connection dies.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.7-1
-- Fix another bug with the new bugzilla email code.  Need to grab the user
-  email from the database even if unathenticated so bugzilla_email has
-  something to pull from.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.6-1
-- Fix bug with the new bugzilla email code.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Mar 2009 17:15:47 -0000	1.21
+++ sources	13 Apr 2009 19:59:37 -0000	1.22
@@ -1 +1 @@
-35b1d2376b48e46fe9494f9c19930278  python-fedora-0.3.11.1.tar.gz
+e81443acf339eabfb54b009765e1892b  python-fedora-0.3.12.tar.gz



From toshio at fedoraproject.org  Mon Apr 13 20:00:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 20:00:07 +0000 (UTC)
Subject: rpms/python-fedora/F-10 .cvsignore, 1.29, 1.30 python-fedora.spec, 
	1.32, 1.33 sources, 1.30, 1.31
Message-ID: <20090413200007.D3CE070124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5678/F-10

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
- Bugfix and cleanup release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	12 Mar 2009 17:15:47 -0000	1.29
+++ .cvsignore	13 Apr 2009 19:59:37 -0000	1.30
@@ -1 +1 @@
-python-fedora-0.3.11.1.tar.gz
+python-fedora-0.3.12.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/python-fedora.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- python-fedora.spec	12 Mar 2009 17:15:47 -0000	1.32
+++ python-fedora.spec	13 Apr 2009 19:59:37 -0000	1.33
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.11.1
+Version:        0.3.12
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -16,6 +16,12 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-paver
 BuildRequires:  python-sphinx
+%if 0%{?fedora} >= 9
+BuildRequires:  python-cherrypy2
+%else
+BuildRequires:  python-cherrypy
+%endif
+BuildRequires:  python-babel
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
@@ -46,17 +52,22 @@
 %install
 rm -rf %{buildroot}
 paver install --skip-build --root %{buildroot}
+
 mv build-doc/html doc/
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog doc
 %{python_sitelib}/*
 
 %changelog
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
+- Bugfix and cleanup release.
+
 * Thu Mar 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.11.1-1
 - Update to fix problem with django auth and redirects.
 
@@ -157,92 +168,3 @@
 
 * Wed Feb 13 2008 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.99.0-1
 - First beta of new release.  This release is for TG-1.0.4 and SA-0.4.
-
-* Thu Dec 13 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.22-1
-- Convert fasLDAP to get its connection information fedora-db-access.
-- Add requirements for python-feedparser and python-bugzilla
-- Add fedora.tg.widgets module containing a few proof-of-concept
-  Fedora TurboGears widgets
-- Add a new method to fas: get_users() that returns common public information
-  about all users.
-
-* Thu Nov 15 2007 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.90.21-1
-- Bugfix release for expired sessions.
-
-* Wed Nov 14 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-3
-- Handle our SQLAlchemy requirement differently for Fedora 8+, until
-  TurboGears can use SQLAlchemy >= 0.4
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-2
-- Require SQLAlchemy 0.3 for python-fedora-infrastructure
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-1
-- Latest upstream release
-
-* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
-- New upstream release with a FAS2 unicode fix.
-
-* Mon Sep 24 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-3
-- Fix the Source URL.  Should be fedorapeople rather than fedoraproject.
-
-* Fri Sep 21 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-2
-- BR: python-setuptools-devel as this has been split in the new versions.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-1
-- Update to version wih handling of control-center-maint bugzilla address.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-2
-- Minor touchups to description and URL.
-
-* Mon Sep 17 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-1
-- Update to 0.2.90.17. 
-- Build separate packages for pieces useful on clients and only on the server.
-
-* Mon Sep 10 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.16-1
-- Bugfix to fasLDAP module.
-
-* Fri Sep 7 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.15-1
-- Make the fasLDAP module more OO.
-- Bugfixes.
-- Update the install line.
-
-* Thu Aug 2 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.14-1
-- Fix safas2provider to only create the visit_identity class.
-- Add COPYING and AUTHORS files.
-
-* Sat Jul 21 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.13-1
-- New class fedora.tg.client.BaseClient that can be used as the basis of a TG
-  standalone application.  With a little support on the server side (mostly
-  allowing tg_format=json) this class will provide you with the basis to read
-  and write data to the server.
-- Fix safasprovider to only create the visit_identity class since the other
-  information is stored directly in FAS.
-
-* Mon Jul 10 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.12-1
-- Fix some issues with Unicode.
-- Catch a traceback when the database is down.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.11-1
-- Remove a decorator so running on python-2.3 works.
-- Have FASUser and FASGroup emit json on demand so that they can be returned
-  when tg_format=json.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.10-1
-- Update fas2 integration with changes from mmcgrath.
-- berrange has changed his email address in the account system, no longer need
-  to special case his bugzilla address.
-- Fix a bug in the handling of db errors in accounts/fas.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.9-1
-- Update fas2 integration with changes from mmcgrath.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.8-1
-- Catch some exceptions when the database connection dies.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.7-1
-- Fix another bug with the new bugzilla email code.  Need to grab the user
-  email from the database even if unathenticated so bugzilla_email has
-  something to pull from.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.6-1
-- Fix bug with the new bugzilla email code.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	12 Mar 2009 17:15:47 -0000	1.30
+++ sources	13 Apr 2009 19:59:37 -0000	1.31
@@ -1 +1 @@
-35b1d2376b48e46fe9494f9c19930278  python-fedora-0.3.11.1.tar.gz
+e81443acf339eabfb54b009765e1892b  python-fedora-0.3.12.tar.gz



From toshio at fedoraproject.org  Mon Apr 13 20:00:08 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 20:00:08 +0000 (UTC)
Subject: rpms/python-fedora/F-9 .cvsignore, 1.26, 1.27 python-fedora.spec,
	1.30, 1.31 sources, 1.28, 1.29
Message-ID: <20090413200008.1883F70124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5678/F-9

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
- Bugfix and cleanup release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	12 Mar 2009 17:15:48 -0000	1.26
+++ .cvsignore	13 Apr 2009 19:59:37 -0000	1.27
@@ -1 +1 @@
-python-fedora-0.3.11.1.tar.gz
+python-fedora-0.3.12.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- python-fedora.spec	12 Mar 2009 17:15:48 -0000	1.30
+++ python-fedora.spec	13 Apr 2009 19:59:37 -0000	1.31
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.11.1
+Version:        0.3.12
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -16,6 +16,12 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-paver
 BuildRequires:  python-sphinx
+%if 0%{?fedora} >= 9
+BuildRequires:  python-cherrypy2
+%else
+BuildRequires:  python-cherrypy
+%endif
+BuildRequires:  python-babel
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
@@ -46,17 +52,22 @@
 %install
 rm -rf %{buildroot}
 paver install --skip-build --root %{buildroot}
+
 mv build-doc/html doc/
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog doc
 %{python_sitelib}/*
 
 %changelog
+* Thu Mar 19 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.12-1
+- Bugfix and cleanup release.
+
 * Thu Mar 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.11.1-1
 - Update to fix problem with django auth and redirects.
 
@@ -157,92 +168,3 @@
 
 * Wed Feb 13 2008 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.99.0-1
 - First beta of new release.  This release is for TG-1.0.4 and SA-0.4.
-
-* Thu Dec 13 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.22-1
-- Convert fasLDAP to get its connection information fedora-db-access.
-- Add requirements for python-feedparser and python-bugzilla
-- Add fedora.tg.widgets module containing a few proof-of-concept
-  Fedora TurboGears widgets
-- Add a new method to fas: get_users() that returns common public information
-  about all users.
-
-* Thu Nov 15 2007 Toshio Kuratomi <tkuratom at redhat.com> - 0.2.90.21-1
-- Bugfix release for expired sessions.
-
-* Wed Nov 14 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-3
-- Handle our SQLAlchemy requirement differently for Fedora 8+, until
-  TurboGears can use SQLAlchemy >= 0.4
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-2
-- Require SQLAlchemy 0.3 for python-fedora-infrastructure
-
-* Wed Nov  7 2007 Luke Macken <lmacken at redhat.com> - 0.2.90.20-1
-- Latest upstream release
-
-* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
-- New upstream release with a FAS2 unicode fix.
-
-* Mon Sep 24 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-3
-- Fix the Source URL.  Should be fedorapeople rather than fedoraproject.
-
-* Fri Sep 21 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-2
-- BR: python-setuptools-devel as this has been split in the new versions.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.18-1
-- Update to version wih handling of control-center-maint bugzilla address.
-
-* Tue Sep 18 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-2
-- Minor touchups to description and URL.
-
-* Mon Sep 17 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.17-1
-- Update to 0.2.90.17. 
-- Build separate packages for pieces useful on clients and only on the server.
-
-* Mon Sep 10 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.16-1
-- Bugfix to fasLDAP module.
-
-* Fri Sep 7 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.15-1
-- Make the fasLDAP module more OO.
-- Bugfixes.
-- Update the install line.
-
-* Thu Aug 2 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.14-1
-- Fix safas2provider to only create the visit_identity class.
-- Add COPYING and AUTHORS files.
-
-* Sat Jul 21 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.13-1
-- New class fedora.tg.client.BaseClient that can be used as the basis of a TG
-  standalone application.  With a little support on the server side (mostly
-  allowing tg_format=json) this class will provide you with the basis to read
-  and write data to the server.
-- Fix safasprovider to only create the visit_identity class since the other
-  information is stored directly in FAS.
-
-* Mon Jul 10 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.12-1
-- Fix some issues with Unicode.
-- Catch a traceback when the database is down.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.11-1
-- Remove a decorator so running on python-2.3 works.
-- Have FASUser and FASGroup emit json on demand so that they can be returned
-  when tg_format=json.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.10-1
-- Update fas2 integration with changes from mmcgrath.
-- berrange has changed his email address in the account system, no longer need
-  to special case his bugzilla address.
-- Fix a bug in the handling of db errors in accounts/fas.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.9-1
-- Update fas2 integration with changes from mmcgrath.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.8-1
-- Catch some exceptions when the database connection dies.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.7-1
-- Fix another bug with the new bugzilla email code.  Need to grab the user
-  email from the database even if unathenticated so bugzilla_email has
-  something to pull from.
-
-* Sun Apr 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.6-1
-- Fix bug with the new bugzilla email code.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Mar 2009 17:15:48 -0000	1.28
+++ sources	13 Apr 2009 19:59:37 -0000	1.29
@@ -1 +1 @@
-35b1d2376b48e46fe9494f9c19930278  python-fedora-0.3.11.1.tar.gz
+e81443acf339eabfb54b009765e1892b  python-fedora-0.3.12.tar.gz



From till at fedoraproject.org  Mon Apr 13 20:07:13 2009
From: till at fedoraproject.org (Till Maas)
Date: Mon, 13 Apr 2009 20:07:13 +0000 (UTC)
Subject: rpms/aircrack-ng/devel .cvsignore, 1.16, 1.17 aircrack-ng.spec, 1.25,
	1.26 sources, 1.16, 1.17
Message-ID: <20090413200714.3103070138@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8528

Modified Files:
	.cvsignore aircrack-ng.spec sources 
Log Message:
* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.0-0.8.rc3
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	24 Feb 2009 18:47:15 -0000	1.16
+++ .cvsignore	13 Apr 2009 20:07:11 -0000	1.17
@@ -1,3 +1,3 @@
 aircrack-ng-ptw.cap
 aircrack-ng-test.ivs
-aircrack-ng-1.0-20090224.tar.gz
+aircrack-ng-1.0-rc3.tar.gz


Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- aircrack-ng.spec	24 Feb 2009 18:47:15 -0000	1.25
+++ aircrack-ng.spec	13 Apr 2009 20:07:11 -0000	1.26
@@ -1,9 +1,9 @@
-%define alphatag 20090224
+%define alphatag rc3
 
 Name:           aircrack-ng
 Version:        1.0
-#Release:        0.7.%{alphatag}%{?dist}
-Release:        0.7.%{alphatag}svn%{?dist}
+Release:        0.8.%{alphatag}%{?dist}
+#Release:        0.7.%{alphatag}svn%{?dist}
 #Release:        1%{?dist}
 Summary:        802.11 (wireless) sniffer and WEP/WPA-PSK key cracker
 
@@ -12,8 +12,8 @@
 License:        GPLv2+
 URL:            http://www.aircrack-ng.org/
 #Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz
-#Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}-%{alphatag}.tar.gz
-Source0:        aircrack-ng-%{version}-%{alphatag}.tar.gz
+Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}-%{alphatag}.tar.gz
+#Source0:        aircrack-ng-%{version}-%{alphatag}.tar.gz
 Source1:        %{name}-tarball
 #Source2:        aircrack-ng-ptw.cap
 #Source2:        http://dl.aircrack-ng.org/ptw.cap
@@ -35,7 +35,6 @@
 %prep
 %setup -q -n aircrack-ng-%{version}-%{alphatag}
 #%setup -q -n aircrack-ng-%{version}
-#%patch0 -p1 -b .check
 #%patch0 -p1 -b .parallel_make
 
 %build
@@ -110,6 +109,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.0-0.8.rc3
+- Update to new release
+
 * Tue Feb 24 2009 Till Maas <opensource at till.name> - 1.0-0.7.20090224svn
 - Update to new svn snapshot to make it compile again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	24 Feb 2009 18:47:15 -0000	1.16
+++ sources	13 Apr 2009 20:07:11 -0000	1.17
@@ -1,3 +1,3 @@
 cad87df60f251eb73d2dbc9216cef4e3  aircrack-ng-ptw.cap
 f9f430b935e82c69ffecf0be95d7348b  aircrack-ng-test.ivs
-9792d985d394fa50eb4542a9353c503f  aircrack-ng-1.0-20090224.tar.gz
+37884de939af82eab60d3e7d165b40ad  aircrack-ng-1.0-rc3.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 13 20:10:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 20:10:50 +0000
Subject: [pkgdb] aircrack-ng had acl change status
Message-ID: <20090413201050.D457210F851@bastion2.fedora.phx.redhat.com>

till has set the watchcommits acl on aircrack-ng (Fedora 9) to Denied for tiburcy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Mon Apr 13 20:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 20:10:53 +0000
Subject: [pkgdb] aircrack-ng had acl change status
Message-ID: <20090413201053.AE14B10F87C@bastion2.fedora.phx.redhat.com>

till has set the watchcommits acl on aircrack-ng (Fedora 9) to Denied for xtragicmagic

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Mon Apr 13 20:11:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 20:11:03 +0000
Subject: [pkgdb] aircrack-ng had acl change status
Message-ID: <20090413201103.0919910F851@bastion2.fedora.phx.redhat.com>

till has set the watchcommits acl on aircrack-ng (Fedora 10) to Denied for ramxx

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Mon Apr 13 20:11:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 20:11:06 +0000
Subject: [pkgdb] aircrack-ng had acl change status
Message-ID: <20090413201106.A442710F880@bastion2.fedora.phx.redhat.com>

till has set the watchcommits acl on aircrack-ng (Fedora 10) to Denied for thomasthetank

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Mon Apr 13 20:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 20:11:09 +0000
Subject: [pkgdb] aircrack-ng had acl change status
Message-ID: <20090413201109.8837410F883@bastion2.fedora.phx.redhat.com>

till has set the watchbugzilla acl on aircrack-ng (Fedora 10) to Denied for thomasthetank

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Mon Apr 13 20:11:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 13 Apr 2009 20:11:12 +0000
Subject: [pkgdb] aircrack-ng had acl change status
Message-ID: <20090413201112.D844210F886@bastion2.fedora.phx.redhat.com>

till has set the watchbugzilla acl on aircrack-ng (Fedora 10) to Denied for ramxx

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From akurtakov at fedoraproject.org  Mon Apr 13 20:12:13 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 13 Apr 2009 20:12:13 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.633,1.634
Message-ID: <20090413201213.533C670124@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11171/devel

Modified Files:
	eclipse.spec 
Log Message:
Create org.eclipse.swt.gtk.linux.* based on the ppc version.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- eclipse.spec	13 Apr 2009 13:56:20 -0000	1.633
+++ eclipse.spec	13 Apr 2009 20:11:42 -0000	1.634
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2%{?dist}
+Release:        0.2.1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -469,6 +469,17 @@
       fi
     done
   popd
+  rm -rf plugins/org.eclipse.swt.gtk.linux.%{_arch}
+  mv plugins/org.eclipse.swt.gtk.linux.{ppc,%{_arch}}
+  pushd plugins/org.eclipse.swt.gtk.linux.linux.%{_arch}
+    for f in $(find -type f); do
+      sed -i -e "s/ppc/%{_arch}/g" $f
+      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
+      if [ $tofile != $f ]; then
+        cp -rp $f $tofile
+      fi
+    done
+  popd
   IFS=$OLDIFS
 
 %endif
@@ -1592,6 +1603,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.1
+- Create org.eclipse.swt.gtk.linux.* based on the ppc version.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2
 - Remove patches for the ecj package and others already applied upstream.
 - Rediff some ppc64 patches.



From limb at fedoraproject.org  Mon Apr 13 20:13:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 13 Apr 2009 20:13:59 +0000 (UTC)
Subject: rpms/gallery2/devel gallery2.spec,1.22,1.23
Message-ID: <20090413201400.1881F70124@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11965

Modified Files:
	gallery2.spec 
Log Message:
Document jar source origins, build jars in build, not prep.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gallery2.spec	13 Apr 2009 16:45:00 -0000	1.22
+++ gallery2.spec	13 Apr 2009 20:13:58 -0000	1.23
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -19,6 +19,8 @@
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
+#The following are the sources of the bundled jars.
+#Generated by extracting the jars using jar -xf.
 Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
@@ -678,15 +680,15 @@
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
-tar -xf %{SOURCE4}
-cd gallery-jar-sources-2.3
-sh build-jars.sh
-cd ..
 
 %build
 #pushd lib/tools/bin
 #perl makeManifest.pl
 #popd
+tar -xf %{SOURCE4}
+cd gallery-jar-sources-2.3
+sh build-jars.sh
+cd ..
 rm -rf `cat MANIFEST | grep -e "^R" | cut -f 2`
 find . -depth -name .svn -type d -exec rm -rf {} \;
 # Remove the execute bit from files that don't start with #!
@@ -1098,6 +1100,9 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-6
+- Document jar source origins, build jars in build, not prep.
+
 * Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-5
 - Remove .jar files and build from source BZ464566.
 - Modify source to remove two non-redistutable .jar files.



From till at fedoraproject.org  Mon Apr 13 20:23:36 2009
From: till at fedoraproject.org (Till Maas)
Date: Mon, 13 Apr 2009 20:23:36 +0000 (UTC)
Subject: rpms/aircrack-ng/devel aircrack-ng.spec,1.26,1.27
Message-ID: <20090413202336.8256C70124@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15145

Modified Files:
	aircrack-ng.spec 
Log Message:
* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.0-0.8.rc3
- Update to new release



Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- aircrack-ng.spec	13 Apr 2009 20:07:11 -0000	1.26
+++ aircrack-ng.spec	13 Apr 2009 20:23:35 -0000	1.27
@@ -35,7 +35,7 @@
 %prep
 %setup -q -n aircrack-ng-%{version}-%{alphatag}
 #%setup -q -n aircrack-ng-%{version}
-#%patch0 -p1 -b .parallel_make
+%patch0 -p1 -b .parallel_make
 
 %build
 export CFLAGS=$RPM_OPT_FLAGS



From till at fedoraproject.org  Mon Apr 13 20:30:36 2009
From: till at fedoraproject.org (Till Maas)
Date: Mon, 13 Apr 2009 20:30:36 +0000 (UTC)
Subject: rpms/aircrack-ng/devel aircrack-ng.spec,1.27,1.28
Message-ID: <20090413203036.77C6A70124@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17344

Modified Files:
	aircrack-ng.spec 
Log Message:
* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.0-0.8.rc3
- Update to new release
- Enable patch to make parallel make work on x86_64



Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- aircrack-ng.spec	13 Apr 2009 20:23:35 -0000	1.27
+++ aircrack-ng.spec	13 Apr 2009 20:30:04 -0000	1.28
@@ -19,6 +19,7 @@
 #Source2:        http://dl.aircrack-ng.org/ptw.cap
 #Source3:        aircrack-ng-test.ivs
 #Source3:       http://download.aircrack-ng.org/wiki-files/other/test.ivs
+# 2009-04-13: will be sent to upstream if upstream bugtracker is reachable again
 Patch0:         aircrack-ng-parallel_make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  sqlite-devel openssl-devel
@@ -111,6 +112,7 @@
 %changelog
 * Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.0-0.8.rc3
 - Update to new release
+- Enable patch to make parallel make work on x86_64
 
 * Tue Feb 24 2009 Till Maas <opensource at till.name> - 1.0-0.7.20090224svn
 - Update to new svn snapshot to make it compile again



From sindrepb at fedoraproject.org  Mon Apr 13 20:31:21 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon, 13 Apr 2009 20:31:21 +0000 (UTC)
Subject: rpms/solfege/devel solfege.spec,1.21,1.22
Message-ID: <20090413203121.A2FD270124@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17630

Modified Files:
	solfege.spec 
Log Message:



Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/devel/solfege.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- solfege.spec	13 Apr 2009 17:09:20 -0000	1.21
+++ solfege.spec	13 Apr 2009 20:30:51 -0000	1.22
@@ -9,7 +9,7 @@
 Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Source1:	solfege.sh.in
 #make sure desktop file is sane, don't use extension without path in Icon=
-Patch1:         solfege-%{version}-desktop.patch
+Patch1:         solfege-3.14.1-desktop.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From cwickert at fedoraproject.org  Mon Apr 13 20:31:46 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 20:31:46 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4.spec,1.32,1.33
Message-ID: <20090413203146.8614F70124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17861

Modified Files:
	xfwm4.spec 
Log Message:
* Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
- Fix directory ownership problems
- Require xfce4-doc



Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xfwm4.spec	27 Feb 2009 20:29:37 -0000	1.32
+++ xfwm4.spec	13 Apr 2009 20:31:16 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libxfcegui4 >= %{version}
+Requires: xfce4-doc
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libXext-devel
 BuildRequires: gettext intltool
@@ -64,14 +65,17 @@
 %{_bindir}/xfwm4-workspace-settings
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
-%dir %{_datadir}/xfce4
-%{_datadir}/xfce4/doc/*/images/*
-%{_datadir}/xfce4/doc/*/*.html
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfwm4
-%{_datadir}/themes
-%{_libexecdir}/xfce4
+%{_datadir}/themes/*
+%{_libexecdir}/xfce4/xfwm4
 
 %changelog
+* Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
+- Fix directory ownership problems
+- Require xfce4-doc
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 - Remove unneeded BuildRequires



From cwickert at fedoraproject.org  Mon Apr 13 20:35:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 20:35:44 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel
	xfce4-power-manager-0.8.0beta1-button-hal.patch, NONE,
	1.1 xfce4-power-manager.spec, 1.6, 1.7
Message-ID: <20090413203544.8D59970124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19170

Modified Files:
	xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.0beta1-button-hal.patch 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
- Add xfpm-button-hal.patch by Mike Massonnet


xfce4-power-manager-0.8.0beta1-button-hal.patch:

--- NEW FILE xfce4-power-manager-0.8.0beta1-button-hal.patch ---
--- xfce4-power-manager-0.8.0beta1.orig/src/xfpm-button-hal.c	2009-04-10 21:12:15.000000000 +0200
+++ xfce4-power-manager-0.8.0beta1/src/xfpm-button-hal.c	2009-04-13 21:14:10.000000000 +0200
@@ -71,27 +71,27 @@
 
     TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 
-    if ( xfpm_strequal (detail, "power")  && !bt->priv->keys & POWER_KEY )
+    if ( xfpm_strequal (detail, "power")  && !(bt->priv->keys & POWER_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
     }
-    else if ( xfpm_strequal (detail, "sleep")  && !bt->priv->keys & SLEEP_KEY )
+    else if ( xfpm_strequal (detail, "sleep")  && !(bt->priv->keys & SLEEP_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_SLEEP);
     }
-    else if ( xfpm_strequal (detail, "hibernate") && !bt->priv->keys & HIBERNATE_KEY )
+    else if ( xfpm_strequal (detail, "hibernate") && !(bt->priv->keys & HIBERNATE_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_HIBERNATE);
     }
-    else if ( xfpm_strequal (detail, "brightness-up")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-up")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_UP);
     }
-    else if ( xfpm_strequal (detail, "brightness-down")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-down")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_DOWN);


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-power-manager.spec	11 Apr 2009 23:18:52 -0000	1.6
+++ xfce4-power-manager.spec	13 Apr 2009 20:35:13 -0000	1.7
@@ -2,17 +2,18 @@
 
 Name:           xfce4-power-manager
 Version:        0.8.0
-Release:        0.1.%{betaversion}%{?dist}
+Release:        0.2.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
+# Posted on goodies-dev and applied upstream on Apr 11th 2009
+Patch0:         xfce4-power-manager-0.8.0beta1-button-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
-
 BuildRequires:  xfce4-panel-devel >= 4.6.0
 BuildRequires:  dbus-devel >= 0.60
 BuildRequires:  dbus-glib-devel >= 0.70
@@ -30,6 +31,7 @@
 
 %prep
 %setup -qn %{name}-%{version}%{betaversion}
+%patch0 -p1 -b .button-hal
 
 
 %build
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
+- Add xfpm-button-hal.patch by Mike Massonnet
+
 * Sun Apr 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta1
 - Update to 0.8.0beta1
 



From cwickert at fedoraproject.org  Mon Apr 13 20:38:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 20:38:31 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11
	xfce4-power-manager-0.8.0beta1-button-hal.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-power-manager.spec, 1.4, 1.5
Message-ID: <20090413203831.962CF70124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20363

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.0beta1-button-hal.patch 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
- Add xfpm-button-hal.patch by Mike Massonnet


xfce4-power-manager-0.8.0beta1-button-hal.patch:

--- NEW FILE xfce4-power-manager-0.8.0beta1-button-hal.patch ---
--- xfce4-power-manager-0.8.0beta1.orig/src/xfpm-button-hal.c	2009-04-10 21:12:15.000000000 +0200
+++ xfce4-power-manager-0.8.0beta1/src/xfpm-button-hal.c	2009-04-13 21:14:10.000000000 +0200
@@ -71,27 +71,27 @@
 
     TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 
-    if ( xfpm_strequal (detail, "power")  && !bt->priv->keys & POWER_KEY )
+    if ( xfpm_strequal (detail, "power")  && !(bt->priv->keys & POWER_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
     }
-    else if ( xfpm_strequal (detail, "sleep")  && !bt->priv->keys & SLEEP_KEY )
+    else if ( xfpm_strequal (detail, "sleep")  && !(bt->priv->keys & SLEEP_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_SLEEP);
     }
-    else if ( xfpm_strequal (detail, "hibernate") && !bt->priv->keys & HIBERNATE_KEY )
+    else if ( xfpm_strequal (detail, "hibernate") && !(bt->priv->keys & HIBERNATE_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_HIBERNATE);
     }
-    else if ( xfpm_strequal (detail, "brightness-up")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-up")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_UP);
     }
-    else if ( xfpm_strequal (detail, "brightness-down")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-down")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_DOWN);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Mar 2009 19:19:25 -0000	1.3
+++ .cvsignore	13 Apr 2009 20:38:01 -0000	1.4
@@ -1 +1 @@
-xfce4-power-manager-0.6.5.tar.bz2
+xfce4-power-manager-0.8.0beta1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Mar 2009 19:19:25 -0000	1.3
+++ sources	13 Apr 2009 20:38:01 -0000	1.4
@@ -1 +1 @@
-3db8d413b90e2b6bf1df4d5c06e7d2fb  xfce4-power-manager-0.6.5.tar.bz2
+6d860b824430b654d084d7fb9db1c279  xfce4-power-manager-0.8.0beta1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-power-manager.spec	24 Mar 2009 19:19:25 -0000	1.4
+++ xfce4-power-manager.spec	13 Apr 2009 20:38:01 -0000	1.5
@@ -1,19 +1,24 @@
+%define betaversion beta1
+
 Name:           xfce4-power-manager
-Version:        0.6.5
-Release:        1%{?dist}
+Version:        0.8.0
+Release:        0.2.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
+# Posted on goodies-dev and applied upstream on Apr 11th 2009
+Patch0:         xfce4-power-manager-0.8.0beta1-button-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfconf-devel >= 4.5.90 
-BuildRequires:  libxfcegui4-devel >= 4.4.1
-BuildRequires:  dbus-glib-devel >= 0.5.6
-BuildRequires:  hal-devel >= 0.5.6
+BuildRequires:  xfconf-devel >= 4.6.0
+BuildRequires:  xfce4-panel-devel >= 4.6.0
+BuildRequires:  dbus-devel >= 0.60
+BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libnotify-devel >= 0.4.1
+BuildRequires:  libglade2-devel >= 2.0.0
 BuildRequires:  gettext intltool desktop-file-utils
 Requires:       xfce4-panel
 
@@ -25,7 +30,8 @@
 
 
 %prep
-%setup -q
+%setup -qn %{name}-%{version}%{betaversion}
+%patch0 -p1 -b .button-hal
 
 
 %build
@@ -66,17 +72,33 @@
 %{_bindir}/%{name}
 %{_bindir}/xfce4-power-manager-settings
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
+%{_libexecdir}/xfce4/panel-plugins/xfce4-*-plugin
 %{_datadir}/applications/%{name}-settings.desktop
-%{_datadir}/icons/hicolor/scalable/apps/xfpm-cpu.svg
+%{_datadir}/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
 %{_datadir}/icons/hicolor/scalable/*/gpm-*.svg
+%{_datadir}/xfce4/panel-plugins/xfce4-*-plugin.desktop
 %doc %{_datadir}/xfce4/doc/C/images/*.png
 %doc %{_datadir}/xfce4/doc/C/%{name}.html
+%{_mandir}/man1/%{name}-settings.1.gz
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
+- Add xfpm-button-hal.patch by Mike Massonnet
+
+* Sun Apr 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta1
+- Update to 0.8.0beta1
+
+* Thu Apr 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha2
+- Update to 0.8.0alpha2
+
+* Thu Apr 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha
+- Update to 0.8.0alpha 
+
 * Tue Mar 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.5-1
 - Update to 0.6.5
-- Remove custom autostart desktop
+- Remove custom autostart file
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From spot at fedoraproject.org  Mon Apr 13 20:41:23 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 20:41:23 +0000 (UTC)
Subject: rpms/giggle/devel .cvsignore, 1.6, 1.7 giggle.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20090413204123.A008270137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/giggle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22002

Modified Files:
	.cvsignore giggle.spec sources 
Log Message:
update to 0.4.91


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Feb 2009 00:42:26 -0000	1.6
+++ .cvsignore	13 Apr 2009 20:40:51 -0000	1.7
@@ -1 +1 @@
-giggle-0.4.90.tar.gz
+giggle-0.4.91.tar.gz


Index: giggle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/giggle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- giggle.spec	24 Feb 2009 21:30:22 -0000	1.14
+++ giggle.spec	13 Apr 2009 20:40:51 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          giggle
-Version:       0.4.90
-Release:       3%{?dist}
+Version:       0.4.91
+Release:       1%{?dist}
 Summary:       A Gtk frontend to git
 
 Group:         Development/Tools
@@ -25,6 +25,13 @@
 Giggle is a graphical frontend for the git directory tracker (think of gitk on
 GTK+).
 
+%package devel
+Summary:	Headers for Giggle plugin development
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Headers for developing plugins for Giggle.
 
 %prep
 %setup -q
@@ -87,8 +94,14 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/giggle/
 
 %changelog
+* Fri Apr 10 2009 Lennart Poettering <lpoetter at redhat.com> - 0.4.91-1 
+- Update to 0.4.91
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.90-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Feb 2009 00:42:26 -0000	1.6
+++ sources	13 Apr 2009 20:40:51 -0000	1.7
@@ -1 +1 @@
-be8e72a782ebcd38dccda6d760d0f3cd  giggle-0.4.90.tar.gz
+ea88213fa3c9cbf5c571dd17b0e430ea  giggle-0.4.91.tar.gz



From jkratoch at fedoraproject.org  Mon Apr 13 20:45:30 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 13 Apr 2009 20:45:30 +0000 (UTC)
Subject: rpms/libunwind/devel .cvsignore, 1.7, 1.8 libunwind.spec, 1.28,
	1.29 sources, 1.7, 1.8 frysk-patch-update, 1.1,
	NONE libunwind-orphanripper.c, 1.1,
	NONE libunwind-snap-070224-dprintf-vs-stdio.h, 1.1,
	NONE libunwind-snap-070224-frysk20070405cvs.patch, 1.1,
	NONE libunwind-snap-070224-multilib-rh342451.patch, 1.1,
	NONE libunwind-snap-070224-orphanripper.patch, 1.1, NONE
Message-ID: <20090413204530.B441770124@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/libunwind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24134

Modified Files:
	.cvsignore libunwind.spec sources 
Removed Files:
	frysk-patch-update libunwind-orphanripper.c 
	libunwind-snap-070224-dprintf-vs-stdio.h 
	libunwind-snap-070224-frysk20070405cvs.patch 
	libunwind-snap-070224-multilib-rh342451.patch 
	libunwind-snap-070224-orphanripper.patch 
Log Message:
* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.9.20090413betagitb483ea3f
- Rebase the package on the upstream variant: http://www.nongnu.org/libunwind/
  - Drop the patch libunwind-snap-070224-frysk20070405cvs.patch
    as even frysk-0.4-8.fc11 still has this library bundled statically.
- Disable the testsuite by default during the build.
  - It should be run separately as it crashes some ia64 kernels.
  - Drop the patch libunwind-snap-070224-orphanripper.patch.
- Drop the patch libunwind-snap-070224-dprintf-vs-stdio.h as no longer needed.
- Drop libunwind-snap-070224-multilib-rh342451.patch as accepted upstream.
- Fix and enable ppc (ppc32) arch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2007 22:17:46 -0000	1.7
+++ .cvsignore	13 Apr 2009 20:44:55 -0000	1.8
@@ -1 +1 @@
-libunwind-snap-070224.tar.gz
+libunwind-20090413betagitb483ea3f.tar.bz2


Index: libunwind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libunwind.spec	3 Mar 2009 17:45:21 -0000	1.28
+++ libunwind.spec	13 Apr 2009 20:44:57 -0000	1.29
@@ -7,26 +7,21 @@
 
 Summary: An unwinding library
 Name: libunwind
-# Latest libunwind release.
 Version: 0.99
-%define frysksnap 20070405cvs
-%define upstreamsnap 070224
-Release: 0.8.frysk%{frysksnap}%{?dist}
+%define snapshot 20090413betagitb483ea3f
+Release: 0.9.%{snapshot}%{?dist}
 License: BSD
 Group: Development/Debuggers
-Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz
-Patch1: libunwind-snap-%{upstreamsnap}-frysk%{frysksnap}.patch
-Patch2: libunwind-snap-070224-orphanripper.patch
-Patch3: libunwind-snap-070224-multilib-rh342451.patch
-Patch4: libunwind-snap-070224-dprintf-vs-stdio.h
-Source1: libunwind-orphanripper.c
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source: libunwind-%{snapshot}.tar.bz2
 URL: http://savannah.nongnu.org/projects/libunwind
-ExclusiveArch: ia64 x86_64 %{ix86} ppc64
+ExclusiveArch: arm hppa ia64 mips ppc ppc64 %{ix86} x86_64
 
 BuildRequires: automake libtool autoconf
 Conflicts: gdb < 6.6-9
 
+# host != target would cause REMOTE_ONLY build even if building i386 on x86_64.
+%define _host %{_target_platform}
+
 %description
 Libunwind provides a C ABI to determine the call-chain of a program.
 This version of libunwind is targetted for the ia64 platform.
@@ -40,23 +35,11 @@
 libunwind.
 
 %prep
-%setup -q -n %{name}-%{version}-alpha
-
-%patch1 -p1 -E
-# New files from Patch1:
-chmod +x tests/run-ptrace-stepper
-chmod +x tests/run-ptrace-signull
-
-%patch2 -p1 -E
-cp -p %{SOURCE1} tests/orphanripper.c
-
-%patch3 -p1 -E
-%patch4 -p1 -E
+%setup -q -n libunwind-%{snapshot}
 
 %build
-mkdir -p config
 aclocal
-libtoolize
+libtoolize --force
 autoheader
 automake --add-missing
 autoconf
@@ -65,15 +48,15 @@
 
 %install
 %makeinstall
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libunwind*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libunwind*.{la,a}
 
 %check
-%if 0%{?_without_check:1} || 0%{?_without_testsuite:1}
-echo ====================TESTSUITE DISABLED=========================
-%else
+%if 0%{?_with_check:1} || 0%{?_with_testsuite:1}
 echo ====================TESTING=========================
 make check || true
 echo ====================TESTING END=====================
+%else
+echo ====================TESTSUITE DISABLED=========================
 %endif
 
 %clean
@@ -92,9 +75,22 @@
 %defattr(-,root,root)
 %{_libdir}/libunwind*.so
 %{_mandir}/*/*
-%{_includedir}/*
+# <unwind.h> does not get installed for REMOTE_ONLY targets - check it.
+%{_includedir}/unwind.h
+%{_includedir}/libunwind*.h
 
 %changelog
+* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.9.20090413betagitb483ea3f
+- Rebase the package on the upstream variant: http://www.nongnu.org/libunwind/
+  - Drop the patch libunwind-snap-070224-frysk20070405cvs.patch
+    as even frysk-0.4-8.fc11 still has this library bundled statically.
+- Disable the testsuite by default during the build.
+  - It should be run separately as it crashes some ia64 kernels.
+  - Drop the patch libunwind-snap-070224-orphanripper.patch.
+- Drop the patch libunwind-snap-070224-dprintf-vs-stdio.h as no longer needed.
+- Drop libunwind-snap-070224-multilib-rh342451.patch as accepted upstream.
+- Fix and enable ppc (ppc32) arch.
+
 * Tue Mar  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.8.frysk20070405cvs
 - Fix .spec ExclusiveArch from i386 to %%{ix86}.
 - Remove `BuildRequires: glibc gcc make tar gzip' - minimum build environment.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2007 22:17:46 -0000	1.7
+++ sources	13 Apr 2009 20:44:57 -0000	1.8
@@ -1 +1 @@
-679af461131997a5200af8b327f0c44b  libunwind-snap-070224.tar.gz
+8df7a5d328f59201a433afcb391c48ed  libunwind-20090413betagitb483ea3f.tar.bz2


--- frysk-patch-update DELETED ---


--- libunwind-orphanripper.c DELETED ---


--- libunwind-snap-070224-dprintf-vs-stdio.h DELETED ---


--- libunwind-snap-070224-frysk20070405cvs.patch DELETED ---


--- libunwind-snap-070224-multilib-rh342451.patch DELETED ---


--- libunwind-snap-070224-orphanripper.patch DELETED ---



From rayvd at fedoraproject.org  Mon Apr 13 20:46:15 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Mon, 13 Apr 2009 20:46:15 +0000 (UTC)
Subject: rpms/pyodbc/F-10 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090413204615.C76B070124@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24663

Modified Files:
	.cvsignore sources 
Log Message:
2.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2008 04:29:37 -0000	1.3
+++ .cvsignore	13 Apr 2009 20:46:13 -0000	1.4
@@ -1 +1 @@
-pyodbc-2.1.1.zip
+pyodbc-2.1.4.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2008 04:29:38 -0000	1.3
+++ sources	13 Apr 2009 20:46:14 -0000	1.4
@@ -1 +1 @@
-7cdd5e8e1f5726951d820b02e3db46f2  pyodbc-2.1.1.zip
+87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip



From akurtakov at fedoraproject.org  Mon Apr 13 20:49:15 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 13 Apr 2009 20:49:15 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.634,1.635
Message-ID: <20090413204915.9F64570124@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26184/devel

Modified Files:
	eclipse.spec 
Log Message:
Fix typo.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- eclipse.spec	13 Apr 2009 20:11:42 -0000	1.634
+++ eclipse.spec	13 Apr 2009 20:48:45 -0000	1.635
@@ -471,7 +471,7 @@
   popd
   rm -rf plugins/org.eclipse.swt.gtk.linux.%{_arch}
   mv plugins/org.eclipse.swt.gtk.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.swt.gtk.linux.linux.%{_arch}
+  pushd plugins/org.eclipse.swt.gtk.linux.%{_arch}
     for f in $(find -type f); do
       sed -i -e "s/ppc/%{_arch}/g" $f
       tofile=$(echo $f | sed "s/ppc/%{_arch}/")



From toshio at fedoraproject.org  Mon Apr 13 20:51:25 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 20:51:25 +0000 (UTC)
Subject: rpms/python-paver/EL-5 paver-python2.4.patch, NONE,
	1.1 python-paver.spec, 1.2, 1.3
Message-ID: <20090413205125.11CEE70124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-paver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27089

Modified Files:
	python-paver.spec 
Added Files:
	paver-python2.4.patch 
Log Message:

* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-2
- Patch for python-2.4 compatibility


paver-python2.4.patch:

--- NEW FILE paver-python2.4.patch ---
diff -up Paver-1.0/paver/tasks.py.py2.4 Paver-1.0/paver/tasks.py
--- Paver-1.0/paver/tasks.py.py2.4	2009-04-13 13:12:28.000000000 -0700
+++ Paver-1.0/paver/tasks.py	2009-04-13 13:12:43.000000000 -0700
@@ -207,7 +207,7 @@ def _import_task(taskname):
     full_mod_name = ".".join(parts[:-1])
     mod_name = parts[-2]
     try:
-        module = __import__(full_mod_name, fromlist=[mod_name])
+        module = __import__(full_mod_name, globals(), locals(), [mod_name])
     except ImportError:
         return None
     return getattr(module, func_name, None)


Index: python-paver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/EL-5/python-paver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-paver.spec	8 Apr 2009 14:08:24 -0000	1.2
+++ python-paver.spec	13 Apr 2009 20:50:54 -0000	1.3
@@ -3,13 +3,15 @@
 %define srcname Paver
 Name: python-paver
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
 Group: Development/Languages
 License: BSD
 URL: http://www.blueskyonmars.com/projects/paver/
 Source0: http://pypi.python.org/packages/source/P/%{srcname}/%{srcname}-%{version}.tar.gz
+Patch0: paver-python2.4.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -49,6 +51,7 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .py2.4
 
 # Note: This falls somewhere in between source and non-source.  It's a copy
 # of the essential files from the library that's being packaged.  But it's
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-2
+- Patch for python-2.4 compatibility
+
 * Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
 - New upstream final.
 



From cwickert at fedoraproject.org  Mon Apr 13 20:52:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 20:52:56 +0000 (UTC)
Subject: rpms/xfdesktop/devel xfdesktop-4.6.0-redhat-menus.patch, 1.1,
	1.2 xfdesktop.spec, 1.32, 1.33
Message-ID: <20090413205256.1A9D170124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27844

Modified Files:
	xfdesktop-4.6.0-redhat-menus.patch xfdesktop.spec 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
- Exclude gnome-default-applications from menu to avoid duplicates (#488558)


xfdesktop-4.6.0-redhat-menus.patch:

Index: xfdesktop-4.6.0-redhat-menus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop-4.6.0-redhat-menus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfdesktop-4.6.0-redhat-menus.patch	2 Mar 2009 22:22:35 -0000	1.1
+++ xfdesktop-4.6.0-redhat-menus.patch	13 Apr 2009 20:52:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- xfdesktop-4.6.0.orig/modules/menu/menu-data/xfce-applications.menu	2009-01-12 23:03:21.000000000 +0100
-+++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu	2009-02-28 23:26:49.000000000 +0100
++++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu	2009-04-13 21:36:32.000000000 +0200
 @@ -18,7 +18,8 @@
          <Filename>xfce4-file-manager.desktop</Filename>
          <Filename>xfce4-web-browser.desktop</Filename>
@@ -10,7 +10,7 @@
          <Separator/>
          <Merge type="all"/>
          <Separator/>
-@@ -28,10 +29,14 @@
+@@ -28,10 +29,15 @@
      </Layout>
      
      <Menu>
@@ -24,11 +24,12 @@
 +                <Category>Settings</Category>
 +                <Not><Category>System</Category></Not>
 +                <Not><Category>Screensaver</Category></Not>
++                <Not><Filename>gnome-default-applications.desktop</Filename></Not>
 +            </And>
          </Include>
          
          <Layout>
-@@ -40,25 +45,29 @@
+@@ -40,25 +46,29 @@
              <Merge type="all"/>
          </Layout>
          
@@ -70,7 +71,7 @@
          </Include>
      </Menu>
      
-@@ -124,7 +133,11 @@
+@@ -124,7 +134,11 @@
          <Name>System</Name>
          <Directory>xfce-system.directory</Directory>
          <Include>
@@ -83,7 +84,7 @@
          </Include>
      </Menu>
      
-@@ -133,7 +146,13 @@
+@@ -133,7 +147,13 @@
          <Directory>xfce-other.directory</Directory>
          <OnlyUnallocated/>
          <Include>


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xfdesktop.spec	2 Mar 2009 22:27:43 -0000	1.32
+++ xfdesktop.spec	13 Apr 2009 20:52:25 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -90,6 +90,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
+- Exclude gnome-default-applications from menu to avoid duplicates (#488558)
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
 - Fix directory ownership problems
 - Require xfce4-doc and redhat-menus



From jkratoch at fedoraproject.org  Mon Apr 13 20:53:00 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 13 Apr 2009 20:53:00 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.8-inlining.patch, 1.11, 1.12 gdb-archer.patch, 
	1.12, 1.13 gdb.spec, 1.340, 1.341
Message-ID: <20090413205300.7A1AB70124@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27728

Modified Files:
	gdb-6.8-inlining.patch gdb-archer.patch gdb.spec 
Log Message:
* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-17
- Archer update to the snapshot: 7c250ce99c90cf6097e2ec55ea0f205830979cee
- Archer backport: c14d9ab7eef43281b2052c885f89d2db96fb5f8e
  - Revert a change regressing: gdb.objc/basicclass.exp
- Archer backport: ebd649b96e61a1fb481801b65d827bca998c6633
                 + 1f080e897996d60ab7fde20423e2947512115667
		 + 1948198702b51b31d79793fc49434b529b4e245f
		 + e107fb9687bb1e7f74170aa3d19c4a8f6edbb10f
		 + 1e012c996e121cb35053d239a46bd5dc65b0ce60
  - Update the Python API from upstream.
- Archer backport: d3c83ad5ec9f7672b87af9ad29279f459e53da11
  - Fix a Python branch crash.


gdb-6.8-inlining.patch:

Index: gdb-6.8-inlining.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdb-6.8-inlining.patch	27 Mar 2009 08:52:15 -0000	1.11
+++ gdb-6.8-inlining.patch	13 Apr 2009 20:52:58 -0000	1.12
@@ -7,8 +7,8 @@
 
 Index: gdb-6.8.50.20090302/gdb/NEWS
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/NEWS	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/NEWS	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/NEWS	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/NEWS	2009-04-13 22:22:01.000000000 +0200
 @@ -1,6 +1,11 @@
  		What has changed in GDB?
  	     (Organized release by release)
@@ -23,8 +23,8 @@
  * GDB now has support for multi-byte and wide character sets on the
 Index: gdb-6.8.50.20090302/gdb/block.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/block.c	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/block.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/block.c	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/block.c	2009-04-13 22:22:01.000000000 +0200
 @@ -47,8 +47,16 @@ contained_in (const struct block *a, con
  {
    if (!a || !b)
@@ -70,7 +70,7 @@
 Index: gdb-6.8.50.20090302/gdb/block.h
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/block.h	2009-01-03 06:57:50.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/block.h	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/block.h	2009-04-13 22:22:01.000000000 +0200
 @@ -65,7 +65,7 @@ struct block
    CORE_ADDR endaddr;
  
@@ -92,7 +92,7 @@
 Index: gdb-6.8.50.20090302/gdb/blockframe.c
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/blockframe.c	2009-01-03 06:57:50.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/blockframe.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/blockframe.c	2009-04-13 22:22:01.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "command.h"
  #include "gdbcmd.h"
@@ -163,8 +163,8 @@
        frame = get_prev_frame (frame);
 Index: gdb-6.8.50.20090302/gdb/breakpoint.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/breakpoint.c	2009-03-27 00:14:24.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/breakpoint.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/breakpoint.c	2009-04-13 22:19:50.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/breakpoint.c	2009-04-13 22:22:01.000000000 +0200
 @@ -2641,19 +2641,21 @@ watchpoint_check (void *p)
      within_current_scope = 1;
    else
@@ -244,7 +244,7 @@
    b = set_raw_breakpoint (sal, type);
    b->enable_state = bp_enabled;
    b->disposition = disp_donttouch;
-@@ -6203,7 +6213,6 @@ watch_command_1 (char *arg, int accessfl
+@@ -6208,7 +6218,6 @@ watch_command_1 (char *arg, int accessfl
    struct block *exp_valid_block;
    struct value *val, *mark, *val_chain;
    struct frame_info *frame;
@@ -252,7 +252,7 @@
    char *exp_start = NULL;
    char *exp_end = NULL;
    char *tok, *id_tok_start, *end_tok;
-@@ -6364,34 +6373,34 @@ watch_command_1 (char *arg, int accessfl
+@@ -6369,34 +6378,34 @@ watch_command_1 (char *arg, int accessfl
      bp_type = bp_watchpoint;
  
    frame = block_innermost_frame (exp_valid_block);
@@ -305,7 +305,7 @@
      }
  
    /* Now set up the breakpoint.  */
-@@ -6572,7 +6581,6 @@ until_break_command (char *arg, int from
+@@ -6577,7 +6586,6 @@ until_break_command (char *arg, int from
    struct symtabs_and_lines sals;
    struct symtab_and_line sal;
    struct frame_info *frame = get_selected_frame (NULL);
@@ -313,7 +313,7 @@
    struct breakpoint *breakpoint;
    struct breakpoint *breakpoint2 = NULL;
    struct cleanup *old_chain;
-@@ -6605,20 +6613,22 @@ until_break_command (char *arg, int from
+@@ -6610,20 +6618,22 @@ until_break_command (char *arg, int from
         we don't specify a frame at which we need to stop.  */
      breakpoint = set_momentary_breakpoint (sal, null_frame_id, bp_until);
    else
@@ -344,8 +344,8 @@
      }
 Index: gdb-6.8.50.20090302/gdb/buildsym.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/buildsym.c	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/buildsym.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/buildsym.c	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/buildsym.c	2009-04-13 22:22:01.000000000 +0200
 @@ -1155,6 +1155,12 @@ end_symtab (CORE_ADDR end_addr, struct o
  	  struct symbol *sym;
  	  struct dict_iterator iter;
@@ -361,8 +361,8 @@
  	       sym = dict_iterator_next (&iter))
 Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo	2009-03-27 00:14:24.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo	2009-04-13 22:19:50.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo	2009-04-13 22:22:01.000000000 +0200
 @@ -137,6 +137,7 @@ software in general.  We will miss him.
  * Stack::                       Examining the stack
  * Source::                      Examining source files
@@ -514,8 +514,8 @@
  
 Index: gdb-6.8.50.20090302/gdb/dwarf2loc.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/dwarf2loc.c	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/dwarf2loc.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/dwarf2loc.c	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/dwarf2loc.c	2009-04-13 22:22:01.000000000 +0200
 @@ -31,6 +31,7 @@
  #include "regcache.h"
  #include "objfiles.h"
@@ -538,8 +538,8 @@
       some function associated with a frame. If we can't find the frame,
 Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-03-27 00:14:24.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-03-27 00:16:07.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-04-13 22:19:50.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-04-13 22:22:41.000000000 +0200
 @@ -50,6 +50,7 @@
  #include "c-lang.h"
  #include "typeprint.h"
@@ -657,7 +657,7 @@
 Index: gdb-6.8.50.20090302/gdb/frame-unwind.c
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/frame-unwind.c	2009-01-03 06:57:51.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/frame-unwind.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/frame-unwind.c	2009-04-13 22:22:01.000000000 +0200
 @@ -21,6 +21,7 @@
  #include "frame.h"
  #include "frame-unwind.h"
@@ -680,8 +680,8 @@
  
 Index: gdb-6.8.50.20090302/gdb/frame.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/frame.c	2009-03-27 00:14:21.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/frame.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/frame.c	2009-04-13 22:19:48.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/frame.c	2009-04-13 22:22:01.000000000 +0200
 @@ -41,8 +41,14 @@
  #include "objfiles.h"
  #include "exceptions.h"
@@ -1041,7 +1041,7 @@
 Index: gdb-6.8.50.20090302/gdb/frame.h
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/frame.h	2009-02-05 18:28:20.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/frame.h	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/frame.h	2009-04-13 22:22:01.000000000 +0200
 @@ -34,6 +34,9 @@
     frame_unwind_WHAT...(): Unwind THIS frame's WHAT from the NEXT
     frame.
@@ -1105,8 +1105,8 @@
  /* Assuming that a frame is `normal', return its base-address, or 0 if
 Index: gdb-6.8.50.20090302/gdb/gdbthread.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/gdbthread.h	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/gdbthread.h	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/gdbthread.h	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/gdbthread.h	2009-04-13 22:22:01.000000000 +0200
 @@ -83,6 +83,13 @@ struct thread_info
       This is how we know when we step into a subroutine call, and how
       to set the frame for the breakpoint used to step out.  */
@@ -1123,8 +1123,8 @@
  
 Index: gdb-6.8.50.20090302/gdb/infcall.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infcall.c	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/infcall.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/infcall.c	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/infcall.c	2009-04-13 22:22:01.000000000 +0200
 @@ -898,15 +898,8 @@ The program being debugged exited while 
  
  	  if (unwind_on_signal_p)
@@ -1145,8 +1145,8 @@
  		 long if it's a C++ name with arguments and stuff.  */
 Index: gdb-6.8.50.20090302/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infcmd.c	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/infcmd.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/infcmd.c	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/infcmd.c	2009-04-13 22:22:01.000000000 +0200
 @@ -52,6 +52,7 @@
  #include "cli/cli-decode.h"
  #include "gdbthread.h"
@@ -1250,8 +1250,8 @@
    function = find_pc_function (get_frame_pc (get_selected_frame (NULL)));
 Index: gdb-6.8.50.20090302/gdb/inferior.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/inferior.h	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/inferior.h	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/inferior.h	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/inferior.h	2009-04-13 22:22:01.000000000 +0200
 @@ -259,6 +259,9 @@ extern void error_is_running (void);
  /* Calls error_is_running if the current thread is running.  */
  extern void ensure_not_running (void);
@@ -1264,8 +1264,8 @@
  extern void tty_command (char *, int);
 Index: gdb-6.8.50.20090302/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infrun.c	2009-03-27 00:14:23.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/infrun.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/infrun.c	2009-04-13 22:19:49.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/infrun.c	2009-04-13 22:22:01.000000000 +0200
 @@ -48,6 +48,7 @@
  #include "gdb_assert.h"
  #include "mi/mi-common.h"
@@ -1541,7 +1541,7 @@
 Index: gdb-6.8.50.20090302/gdb/inline-frame.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/inline-frame.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/inline-frame.c	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,382 @@
 +/* Inline frame unwinder for GDB.
 +
@@ -1928,7 +1928,7 @@
 Index: gdb-6.8.50.20090302/gdb/inline-frame.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/inline-frame.h	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/inline-frame.h	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,62 @@
 +/* Definitions for inline frame support.
 +
@@ -1994,8 +1994,8 @@
 +#endif /* !defined (INLINE_FRAME_H) */
 Index: gdb-6.8.50.20090302/gdb/minsyms.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/minsyms.c	2009-03-27 00:14:22.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/minsyms.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/minsyms.c	2009-04-13 22:19:49.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/minsyms.c	2009-04-13 22:22:01.000000000 +0200
 @@ -795,7 +795,7 @@ prim_record_minimal_symbol_and_info (con
  
    if (msym_bunch_index == BUNCH_SIZE)
@@ -2008,7 +2008,7 @@
 Index: gdb-6.8.50.20090302/gdb/s390-tdep.c
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/s390-tdep.c	2009-02-22 02:02:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/s390-tdep.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/s390-tdep.c	2009-04-13 22:22:01.000000000 +0200
 @@ -1182,6 +1182,7 @@ s390_prologue_frame_unwind_cache (struct
    CORE_ADDR prev_sp;
    int frame_pointer;
@@ -2044,8 +2044,8 @@
        /* See the comment in s390_in_function_epilogue_p on why this is
 Index: gdb-6.8.50.20090302/gdb/stack.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/stack.c	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/stack.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/stack.c	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/stack.c	2009-04-13 22:22:01.000000000 +0200
 @@ -45,6 +45,7 @@
  #include "valprint.h"
  #include "gdbthread.h"
@@ -2194,15 +2194,16 @@
       RETURN_VALUE to NULL, and QUERY_PREFIX to an informational
 Index: gdb-6.8.50.20090302/gdb/symtab.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symtab.c	2009-03-27 00:14:22.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/symtab.c	2009-03-27 00:15:36.000000000 +0100
-@@ -1426,10 +1426,13 @@ lookup_symbol_aux_local (const char *nam
-             return sym;
-         }
- 
-+      if (BLOCK_FUNCTION (block_iterator) != NULL && block_inlined_p (block_iterator))
-+	break;
+--- gdb-6.8.50.20090302.orig/gdb/symtab.c	2009-04-13 22:19:49.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/symtab.c	2009-04-13 22:22:01.000000000 +0200
+@@ -1417,11 +1417,14 @@ lookup_symbol_aux_local (const char *nam
+       sym = lookup_symbol_aux_block (name, linkage_name, block_iterator, domain);
+       if (sym != NULL)
+ 	return sym;
 +
++      if (BLOCK_FUNCTION (block) != NULL && block_inlined_p (block))
++	break;
+     
        block_iterator = BLOCK_SUPERBLOCK (block_iterator);
      }
  
@@ -2211,7 +2212,7 @@
  
    return NULL;
  }
-@@ -2686,6 +2689,7 @@ find_function_start_sal (struct symbol *
+@@ -2678,6 +2681,7 @@ find_function_start_sal (struct symbol *
  
    CORE_ADDR pc;
    struct symtab_and_line sal;
@@ -2219,7 +2220,7 @@
  
    pc = BLOCK_START (block);
    fixup_symbol_section (sym, objfile);
-@@ -2724,6 +2728,25 @@ find_function_start_sal (struct symbol *
+@@ -2716,6 +2720,25 @@ find_function_start_sal (struct symbol *
  
    sal.pc = pc;
  
@@ -2245,7 +2246,7 @@
    return sal;
  }
  
-@@ -3746,6 +3769,24 @@ add_macro_name (const char *name, const 
+@@ -3738,6 +3761,24 @@ add_macro_name (const char *name, const 
  			    datum->text, datum->word);
  }
  
@@ -2270,7 +2271,7 @@
  char **
  default_make_symbol_completion_list (char *text, char *word)
  {
-@@ -3758,9 +3799,9 @@ default_make_symbol_completion_list (cha
+@@ -3750,9 +3791,9 @@ default_make_symbol_completion_list (cha
    struct partial_symtab *ps;
    struct minimal_symbol *msymbol;
    struct objfile *objfile;
@@ -2282,7 +2283,7 @@
    struct partial_symbol **psym;
    /* The symbol we are completing on.  Points in same buffer as text.  */
    char *sym_text;
-@@ -3870,41 +3911,43 @@ default_make_symbol_completion_list (cha
+@@ -3862,41 +3903,43 @@ default_make_symbol_completion_list (cha
    }
  
    /* Search upwards from currently selected frame (so that we can
@@ -2357,7 +2358,7 @@
  
    /* Go through the symtabs and check the externs and statics for
       symbols which match.  */
-@@ -3923,9 +3966,6 @@ default_make_symbol_completion_list (cha
+@@ -3915,9 +3958,6 @@ default_make_symbol_completion_list (cha
    {
      QUIT;
      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
@@ -2367,7 +2368,7 @@
      ALL_BLOCK_SYMBOLS (b, iter, sym)
        {
  	COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
-@@ -4392,6 +4432,25 @@ skip_prologue_using_sal (CORE_ADDR func_
+@@ -4384,6 +4424,25 @@ skip_prologue_using_sal (CORE_ADDR func_
  	     line mark the prologue -> body transition.  */
  	  if (sal.line >= prologue_sal.line)
  	    break;
@@ -2395,9 +2396,9 @@
  	     the function looking for address ranges whose
 Index: gdb-6.8.50.20090302/gdb/symtab.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symtab.h	2009-03-27 00:14:19.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/symtab.h	2009-03-27 00:14:33.000000000 +0100
-@@ -556,9 +556,18 @@ struct symbol
+--- gdb-6.8.50.20090302.orig/gdb/symtab.h	2009-04-13 22:19:47.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/symtab.h	2009-04-13 22:22:01.000000000 +0200
+@@ -562,9 +562,18 @@ struct symbol
  
    unsigned is_argument : 1;
  
@@ -2419,7 +2420,7 @@
  
    unsigned short line;
  
-@@ -589,6 +598,7 @@ struct symbol
+@@ -595,6 +604,7 @@ struct symbol
  #define SYMBOL_DOMAIN(symbol)	(symbol)->domain
  #define SYMBOL_CLASS(symbol)		(symbol)->aclass
  #define SYMBOL_IS_ARGUMENT(symbol)	(symbol)->is_argument
@@ -2430,7 +2431,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.base/break.exp	2009-01-19 20:05:01.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp	2009-04-13 22:22:01.000000000 +0200
 @@ -880,6 +880,13 @@ gdb_expect {
          # marker4() is defined at line 46 when compiled with -DPROTOTYPES
  	pass "run until breakpoint set at small function, optimized file (line bp_location14)"
@@ -2448,7 +2449,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.cp/annota2.exp	2009-01-03 06:58:04.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp	2009-04-13 22:22:01.000000000 +0200
 @@ -119,10 +119,11 @@ gdb_expect {
  # continue until exit
  # this will test:
@@ -2465,7 +2466,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,47 @@
 +/* Copyright (C) 2008 Free Software Foundation, Inc.
 +
@@ -2517,7 +2518,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,63 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -2585,7 +2586,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,85 @@
 +/* Copyright (C) 2008 Free Software Foundation, Inc.
 +
@@ -2675,7 +2676,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,279 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -2959,7 +2960,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,52 @@
 +/* Copyright (C) 2008 Free Software Foundation, Inc.
 +
@@ -3016,7 +3017,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,118 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -3139,7 +3140,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c	2009-04-13 22:22:01.000000000 +0200
 @@ -0,0 +1,36 @@
 +/* Copyright (C) 2008 Free Software Foundation, Inc.
 +
@@ -3179,8 +3180,8 @@
 +}
 Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp	2009-03-27 00:14:23.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp	2009-04-13 22:19:50.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp	2009-04-13 22:22:01.000000000 +0200
 @@ -1474,6 +1474,37 @@ proc skip_hp_tests {} {
      return $skip_hp
  }
@@ -3221,8 +3222,8 @@
  set hp_cc_compiler		0
 Index: gdb-6.8.50.20090302/gdb/valops.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/valops.c	2009-03-27 00:14:20.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/valops.c	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/valops.c	2009-04-13 22:19:48.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/valops.c	2009-04-13 22:22:01.000000000 +0200
 @@ -1072,7 +1072,7 @@ value_of_variable (struct symbol *var, s
        frame = block_innermost_frame (b);
        if (!frame)
@@ -3234,8 +3235,8 @@
  		   SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)));
 Index: gdb-6.8.50.20090302/gdb/Makefile.in
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/Makefile.in	2009-03-27 00:14:23.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/Makefile.in	2009-03-27 00:14:33.000000000 +0100
+--- gdb-6.8.50.20090302.orig/gdb/Makefile.in	2009-04-13 22:19:49.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/Makefile.in	2009-04-13 22:22:01.000000000 +0200
 @@ -667,6 +667,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr
  	inf-loop.c \
  	infcall.c \
@@ -3255,7 +3256,7 @@
 Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in
 ===================================================================
 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/Makefile.in	2008-04-18 01:06:54.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in	2009-03-27 00:14:33.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in	2009-04-13 22:22:01.000000000 +0200
 @@ -1,7 +1,7 @@
  VPATH = @srcdir@
  srcdir = @srcdir@

gdb-archer.patch:

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdb-archer.patch	5 Apr 2009 21:02:55 -0000	1.12
+++ gdb-archer.patch	13 Apr 2009 20:52:59 -0000	1.13
@@ -2,7 +2,7 @@
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 7c7c77576669d17ad5072daa47ea3a4fd954483d
+commit 7c250ce99c90cf6097e2ec55ea0f205830979cee
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-merge-expr
@@ -12560,7 +12560,7 @@
  
  extern struct cleanup *make_final_cleanup (make_cleanup_ftype *, void *);
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 10e7388..e959189 100644
+index 10e7388..c4ab391 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -955,8 +955,10 @@ Connect to process ID @var{number}, as with the @code{attach} command.
@@ -12997,7 +12997,7 @@
 -* Values From Inferior::
 +* Auto-loading::                Automatically loading Python code.
 +* Values From Inferior::	Python representation of values.
-+* Types From Inferior::		Python representation of types.
++* Types In Python::		Python representation of types.
 +* Pretty Printing::		Pretty-printing values.
 +* Threads In Python::           Accessing inferior threads from Python.
  * Commands In Python::          Implementing new commands in Python.
@@ -13185,21 +13185,36 @@
  @node Values From Inferior
  @subsubsection Values From Inferior
  @cindex values from inferior, with Python
-@@ -18258,8 +18605,21 @@ bar = some_val['foo']
+@@ -18258,8 +18605,36 @@ bar = some_val['foo']
  
  Again, @code{bar} will also be a @code{gdb.Value} object.
  
 -For pointer data types, @code{gdb.Value} provides a method for
 -dereferencing the pointer to obtain the object it points to.
-+The following methods are provided:
++The following attributes are provided:
 +
 + at table @code
-+ at defmethod Value address
-+If the @code{gdb.Value} object is addressable, this will return a new
-+ at code{gdb.Value} object representing the address.  Otherwise, this
-+will throw an exception.
-+ at end defmethod
++ at defivar Value address
++If this object is addressable, this read-only attribute holds a
++ at code{gdb.Value} object representing the address.  Otherwise,
++this attribute holds @code{None}.
++ at end defivar
++
++ at cindex optimized out value in Python
++ at defivar Value is_optimized_out
++This read-only boolean attribute is true if the compiler optimized out
++this value, thus it is not available for fetching from the inferior.
++ at end defivar
++
++ at defivar Value type
++The type of this @code{gdb.Value}.  The result is a @code{gdb.Type}
++object.
++ at end defivar
++ at end table
 +
++The following methods are provided:
++
++ at table @code
 + at defmethod Value cast type
 +Cast the @code{gdb.Value} to the type represented by @var{type}, and
 +return a new @code{gdb.Value}.  @var{type} must be a @code{gdb.Type}
@@ -13209,7 +13224,7 @@
  
  @defmethod Value dereference
  This method returns a new @code{gdb.Value} object whose contents is
-@@ -18282,7 +18642,7 @@ The result @code{bar} will be a @code{gdb.Value} object holding the
+@@ -18282,7 +18657,7 @@ The result @code{bar} will be a @code{gdb.Value} object holding the
  value pointed to by @code{foo}.
  @end defmethod
  
@@ -13218,54 +13233,75 @@
  If this @code{gdb.Value} represents a string, then this method
  converts the contents to a Python string.  Otherwise, this method will
  throw an exception.
-@@ -18309,6 +18669,469 @@ The optional @var{errors} argument is the same as the corresponding
+@@ -18308,6 +18683,465 @@ will be used, if the current language is able to supply one.
+ The optional @var{errors} argument is the same as the corresponding
  argument to Python's @code{string.decode} method.
  @end defmethod
- 
-+ at defmethod Value type
-+Return the type of this @code{gdb.Value}.  The result is a
-+ at code{gdb.Type} object.
-+ at end defmethod
 + at end table
 +
-+ at node Types From Inferior
-+ at subsubsection Types From Inferior
++ at node Types In Python
++ at subsubsection Types In Python
++ at cindex types in Python
++ at cindex Python, working with types
 +
-+ at cindex gdb.Type
++ at tindex gdb.Type
 + at value{GDBN} represents types from the inferior using the class
 + at code{gdb.Type}.
 +
-+The following methods are provided:
-+
-+ at table @code
-+ at defmethod Type Type [name [block]]
-+Construct a new instance of @code{gdb.Type}.
++The following type-related functions are available in the @code{gdb}
++module:
 +
-+If @var{name} is given, it specifies the name of a type to look up in
-+the inferior.
++ at findex gdb.lookup_type
++ at defun lookup_type name [block]
++This function looks up a type by name.  @var{name} is the name of the
++type to look up.  It must be a string.
 +
 +If @var{block} is given, then @var{name} is looked up in that scope.
 +Otherwise, it is searched for globally.
-+ at end defmethod
 +
-+ at defmethod Type code
-+Return the type code for this type.  The type code will be one of the
++Ordinarily, this function will return an instance of @code{gdb.Type}.
++If the named type cannot be found, it will throw an exception.
++ at end defun
++
++An instance of @code{Type} has the following attributes:
++
++ at table @code
++ at defivar Type code
++The type code for this type.  The type code will be one of the
 + at code{TYPE_CODE_} constants defined below.
-+ at end defmethod
++ at end defivar
 +
++ at defivar Type sizeof
++The size of this type, in target @code{char} units.  Usually, a
++target's @code{char} type will be an 8-bit byte.  However, on some
++unusual platforms, this type may have a different size.
++ at end defivar
++
++ at defivar Type tag
++The tag name for this type.  The tag name is the name after
++ at code{struct}, @code{union}, or @code{enum} in C and C at t{++}; not all
++languages have this concept.  If this type has no tag name, then
++ at code{None} is returned.
++ at end defivar
++ at end table
++
++The following methods are provided:
++
++ at table @code
 + at defmethod Type fields
 +For structure and union types, this method returns the fields.  Range
 +types have two fields, the minimum and maximum values.  Enum types
 +have one field per enum constant.  Function and method types have one
-+field per parameter.  The base types of C++ classes are also
++field per parameter.  The base types of C at t{++} classes are also
 +represented as fields.  If the type has no fields, or does not fit
 +into one of these categories, an empty sequence will be returned.
 +
 +Each field is an object, with some pre-defined attributes:
 + at table @code
 + at item bitpos
-+This attribute is not available for @code{static} fields.  For
-+non- at code{static} fields, the value is the bit position of the field.
++This attribute is not available for @code{static} fields (as in
++C at t{++} or Java).  For non- at code{static} fields, the value is the bit
++position of the field.
 +
 + at item name
 +The name of the field, or @code{None} for anonymous fields.
@@ -13307,43 +13343,33 @@
 +type.
 + at end defmethod
 +
-+ at defmethod Type sizeof
-+Return the size of this type, in target @code{char} units.  Usually, a
-+target's @code{char} type will be an 8-bit byte.  However, on some
-+unusual platforms, this type may have a different size.
-+ at end defmethod
-+
 + at defmethod Type strip_typedefs
 +Return a new @code{gdb.Type} that represents the real type,
 +after removing all layers of typedefs.
 + at end defmethod
 +
-+ at defmethod Type tag
-+Return the tag name for this type.  The tag name is the name after
-+ at code{struct}, @code{union}, or @code{enum} in C; not all languages
-+have this concept.  If this type has no tag name, then @code{None} is
-+returned.
-+ at end defmethod
-+
 + at defmethod Type target
 +Return a new @code{gdb.Type} object which represents the target type
 +of this type.
 +
 +For a pointer type, the target type is the type of the pointed-to
-+object.  For an array type, the target type is the type of the
-+elements of the array.  For a function type, the target type is the
-+type of the return value.  For a complex type, the target type is the
-+type of the elements.  For a typedef, the target type is the aliased
-+type.
++object.  For an array type (meaning C-like arrays), the target type is
++the type of the elements of the array.  For a function or method type,
++the target type is the type of the return value.  For a complex type,
++the target type is the type of the elements.  For a typedef, the
++target type is the aliased type.
++
++If the type does not have a target, this method will throw an
++exception.
 + at end defmethod
 +
 + at defmethod Type template_argument n [block]
-+If this @code{gdb.Type} is a template type, this will return a new
-+ at code{gdb.Type} which represents the type of the @var{n}th template
-+argument.
++If this @code{gdb.Type} is an instantiation of a template, this will
++return a new @code{gdb.Type} which represents the type of the
++ at var{n}th template argument.
 +
 +If this @code{gdb.Type} is not a template type, this will throw an
-+exception.
++exception.  Ordinarily, only C at t{++} code will have template types.
 +
 +If @var{block} is given, then @var{name} is looked up in that scope.
 +Otherwise, it is searched for globally.
@@ -13384,8 +13410,7 @@
 + at findex TYPE_CODE_FLAGS
 + at findex gdb.TYPE_CODE_FLAGS
 + at item TYPE_CODE_FLAGS
-+A bit flags type.
-+ at c FIXME: what is this?
++A bit flags type, used for things such as status registers.
 +
 + at findex TYPE_CODE_FUNC
 + at findex gdb.TYPE_CODE_FUNC
@@ -13436,7 +13461,7 @@
 + at findex TYPE_CODE_METHOD
 + at findex gdb.TYPE_CODE_METHOD
 + at item TYPE_CODE_METHOD
-+A C++ method type.
++A method type, as found in C++ or Java.
 +
 + at findex TYPE_CODE_METHODPTR
 + at findex gdb.TYPE_CODE_METHODPTR
@@ -13473,19 +13498,6 @@
 + at item TYPE_CODE_TYPEDEF
 +A typedef to some other type.
 +
-+ at findex TYPE_CODE_TEMPLATE
-+ at findex gdb.TYPE_CODE_TEMPLATE
-+ at item TYPE_CODE_TEMPLATE
-+A C++ template type.  Note that this is not used for a template
-+instantiation; those appear as ordinary struct types.
-+ at c FIXME I hope that is true
-+
-+ at findex TYPE_CODE_TEMPLATE_ARG
-+ at findex gdb.TYPE_CODE_TEMPLATE_ARG
-+ at item TYPE_CODE_TEMPLATE_ARG
-+A C++ template argument.
-+ at c FIXME: is this ever used?
-+
 + at findex TYPE_CODE_NAMESPACE
 + at findex gdb.TYPE_CODE_NAMESPACE
 + at item TYPE_CODE_NAMESPACE
@@ -13620,7 +13632,7 @@
 + at smallexample
 +def str_lookup_function (val):
 +
-+    lookup_tag = val.type ().tag ()
++    lookup_tag = val.type.tag
 +    regex = re.compile ("^std::basic_string<char,.*>$")
 +    if lookup_tag == None:
 +        return None
@@ -13684,11 +13696,10 @@
 + at code{threads}.  If @var{id} is invalid, this function throws an
 +exception.
 + at end defun
-+
+ 
  @node Commands In Python
  @subsubsection Commands In Python
- 
-@@ -18320,7 +19143,7 @@ You can implement new @value{GDBN} CLI commands in Python.  A CLI
+@@ -18320,7 +19154,7 @@ You can implement new @value{GDBN} CLI commands in Python.  A CLI
  command is implemented using an instance of the @code{gdb.Command}
  class, most commonly using a subclass.
  
@@ -13697,7 +13708,7 @@
  The object initializer for @code{Command} registers the new command
  with @value{GDBN}.  This initializer is normally invoked from the
  subclass' own @code{__init__} method.
-@@ -18332,11 +19155,11 @@ an exception is raised.
+@@ -18332,11 +19166,11 @@ an exception is raised.
  
  There is no support for multi-line commands.
  
@@ -13711,7 +13722,7 @@
  one of the @samp{COMPLETE_} constants defined below.  This argument
  tells @value{GDBN} how to perform completion for this command.  If not
  given, @value{GDBN} will attempt to complete using the object's
-@@ -18563,6 +19386,374 @@ registration of the command with @value{GDBN}.  Depending on how the
+@@ -18563,6 +19397,374 @@ registration of the command with @value{GDBN}.  Depending on how the
  Python code is read into @value{GDBN}, you may need to import the
  @code{gdb} module explicitly.
  
@@ -14086,7 +14097,7 @@
  @node Interpreters
  @chapter Command Interpreters
  @cindex command interpreters
-@@ -22273,6 +23464,103 @@ Unfreezing a variable does not update it, only subsequent
+@@ -22273,6 +23475,103 @@ Unfreezing a variable does not update it, only subsequent
  (gdb)
  @end smallexample
  
@@ -14190,7 +14201,7 @@
  
  @c %%%%%%%%%%%%%%%%%%%%%%%%%%%% SECTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  @node GDB/MI Data Manipulation
-@@ -23832,6 +25120,10 @@ as possible presense of the @code{frozen} field in the output
+@@ -23832,6 +25131,10 @@ as possible presense of the @code{frozen} field in the output
  of @code{-varobj-create}.
  @item pending-breakpoints
  Indicates presence of the @option{-f} option to the @code{-break-insert} command.
@@ -14201,7 +14212,7 @@
  @item thread-info
  Indicates presence of the @code{-thread-info} command.
  
-@@ -25402,28 +26694,6 @@ data in a @file{gmon.out} file, be sure to move it to a safe location.
+@@ -25402,28 +26705,6 @@ data in a @file{gmon.out} file, be sure to move it to a safe location.
  Configuring with @samp{--enable-profiling} arranges for @value{GDBN} to be
  compiled with the @samp{-pg} compiler option.
  
@@ -24359,13 +24370,13 @@
 +IgnoreErrorsCommand ()
 diff --git a/gdb/python/lib/gdb/command/pahole.py b/gdb/python/lib/gdb/command/pahole.py
 new file mode 100644
-index 0000000..569b816
+index 0000000..21a0bf0
 --- /dev/null
 +++ b/gdb/python/lib/gdb/command/pahole.py
-@@ -0,0 +1,81 @@
+@@ -0,0 +1,75 @@
 +# pahole command for gdb
 +
-+# Copyright (C) 2008 Free Software Foundation, Inc.
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -24391,16 +24402,10 @@
 +        super (Pahole, self).__init__ ("pahole", gdb.COMMAND_NONE,
 +                                       gdb.COMPLETE_SYMBOL)
 +
-+    @staticmethod
-+    def strip (type):
-+        while type.code () == gdb.TYPE_CODE_TYPEDEF:
-+            type = type.target ()
-+        return type
-+
 +    def pahole (self, type, level, name):
 +        if name is None:
 +            name = ''
-+        tag = type.tag ()
++        tag = type.tag
 +        if tag is None:
 +            tag = ''
 +        print '%sstruct %s {' % (' ' * (2 * level), tag)
@@ -24410,7 +24415,7 @@
 +            if not hasattr (field, ('bitpos')):
 +                continue
 +
-+            ftype = self.strip (field.type)
++            ftype = field.type.strip_typedefs()
 +
 +            if bitpos != field.bitpos:
 +                hole = field.bitpos - bitpos
@@ -24420,13 +24425,13 @@
 +                fieldsize = field.bitsize
 +            else:
 +                # TARGET_CHAR_BIT here...
-+                fieldsize = 8 * ftype.sizeof ()
++                fieldsize = 8 * ftype.sizeof
 +
 +            # TARGET_CHAR_BIT
 +            print ' /* %3d %3d */' % (int (bitpos / 8), int (fieldsize / 8)),
 +            bitpos = bitpos + fieldsize
 +
-+            if ftype.code () == gdb.TYPE_CODE_STRUCT:
++            if ftype.code == gdb.TYPE_CODE_STRUCT:
 +                self.pahole (ftype, level + 1, field.name)
 +            else:
 +                print ' ' * (2 + 2 * level),
@@ -24436,9 +24441,9 @@
 +        print '} %s' % name
 +
 +    def invoke (self, arg, from_tty):
-+        type = gdb.Type (arg)
-+        type = self.strip (type)
-+        if type.code () != gdb.TYPE_CODE_STRUCT:
++        type = gdb.lookup_type (arg)
++        type = type.strip_typedefs ()
++        if type.code != gdb.TYPE_CODE_STRUCT:
 +            raise TypeError, '%s is not a struct type' % arg
 +        print ' ' * 14,
 +        self.pahole (type, 0, '')
@@ -24751,7 +24756,7 @@
 +register_libstdcxx_printers (gdb.current_objfile ())
 diff --git a/gdb/python/lib/gdb/libstdcxx/v6/printers.py b/gdb/python/lib/gdb/libstdcxx/v6/printers.py
 new file mode 100644
-index 0000000..2572731
+index 0000000..58fd91c
 --- /dev/null
 +++ b/gdb/python/lib/gdb/libstdcxx/v6/printers.py
 @@ -0,0 +1,629 @@
@@ -24804,7 +24809,7 @@
 +        def __init__(self, nodetype, head):
 +            self.nodetype = nodetype
 +            self.base = head['_M_next']
-+            self.head = head.address()
++            self.head = head.address
 +            self.count = 0
 +
 +        def __iter__(self):
@@ -24823,12 +24828,12 @@
 +        self.val = val
 +
 +    def children(self):
-+        itype = self.val.type().template_argument(0)
-+        nodetype = gdb.Type('std::_List_node<%s>' % itype).pointer()
++        itype = self.val.type.template_argument(0)
++        nodetype = gdb.lookup_type('std::_List_node<%s>' % itype).pointer()
 +        return self._iterator(nodetype, self.val['_M_impl']['_M_node'])
 +
 +    def to_string(self):
-+        if self.val['_M_impl']['_M_node'].address() == self.val['_M_impl']['_M_node']['_M_next']:
++        if self.val['_M_impl']['_M_node'].address == self.val['_M_impl']['_M_node']['_M_next']:
 +            return 'empty std::list'
 +        return 'std::list'
 +
@@ -24839,8 +24844,8 @@
 +        self.val = val
 +
 +    def to_string(self):
-+        itype = self.val.type().template_argument(0)
-+        nodetype = gdb.Type('std::_List_node<%s>' % itype).pointer()
++        itype = self.val.type.template_argument(0)
++        nodetype = gdb.lookup_type('std::_List_node<%s>' % itype).pointer()
 +        return self.val['_M_node'].cast(nodetype).dereference()['_M_data']
 +
 +class StdSlistPrinter:
@@ -24868,8 +24873,8 @@
 +        self.val = val
 +
 +    def children(self):
-+        itype = self.val.type().template_argument(0)
-+        nodetype = gdb.Type('__gnu_cxx::_Slist_node<%s>' % itype).pointer()
++        itype = self.val.type.template_argument(0)
++        nodetype = gdb.lookup_type('__gnu_cxx::_Slist_node<%s>' % itype).pointer()
 +        return self._iterator(nodetype, self.val)
 +
 +    def to_string(self):
@@ -24884,8 +24889,8 @@
 +        self.val = val
 +
 +    def to_string(self):
-+        itype = self.val.type().template_argument(0)
-+        nodetype = gdb.Type('__gnu_cxx::_Slist_node<%s>' % itype).pointer()
++        itype = self.val.type.template_argument(0)
++        nodetype = gdb.lookup_type('__gnu_cxx::_Slist_node<%s>' % itype).pointer()
 +        return self.val['_M_node'].cast(nodetype).dereference()['_M_data']
 +
 +class StdVectorPrinter:
@@ -24998,8 +25003,8 @@
 +        self.val = val
 +
 +    def to_string (self):
-+        valuetype = self.val.type().template_argument(0)
-+        nodetype = gdb.Type('std::_Rb_tree_node < %s >' % valuetype)
++        valuetype = self.val.type.template_argument(0)
++        nodetype = gdb.lookup_type('std::_Rb_tree_node < %s >' % valuetype)
 +        nodetype = nodetype.pointer()
 +        return self.val.cast(nodetype).dereference()['_M_value_field']
 +
@@ -25038,9 +25043,9 @@
 +        return '%s with %d elements' % (self.typename, len (self.iter))
 +
 +    def children (self):
-+        keytype = self.val.type().template_argument(0).const()
-+        valuetype = self.val.type().template_argument(1)
-+        nodetype = gdb.Type('std::_Rb_tree_node< std::pair< %s, %s > >' % (keytype, valuetype))
++        keytype = self.val.type.template_argument(0).const()
++        valuetype = self.val.type.template_argument(1)
++        nodetype = gdb.lookup_type('std::_Rb_tree_node< std::pair< %s, %s > >' % (keytype, valuetype))
 +        nodetype = nodetype.pointer()
 +        return self._iter (self.iter, nodetype)
 +
@@ -25078,8 +25083,8 @@
 +        return '%s with %d elements' % (self.typename, len (self.iter))
 +
 +    def children (self):
-+        keytype = self.val.type().template_argument(0)
-+        nodetype = gdb.Type('std::_Rb_tree_node< %s >' % keytype).pointer()
++        keytype = self.val.type.template_argument(0)
++        nodetype = gdb.lookup_type('std::_Rb_tree_node< %s >' % keytype).pointer()
 +        return self._iter (self.iter, nodetype)
 +
 +class StdBitsetPrinter:
@@ -25095,18 +25100,18 @@
 +
 +    def children (self):
 +        words = self.val['_M_w']
-+        wtype = words.type()
++        wtype = words.type
 +
 +        # The _M_w member can be either an unsigned long, or an
 +        # array.  This depends on the template specialization used.
 +        # If it is a single long, convert to a single element list.
-+        if wtype.code () == gdb.TYPE_CODE_ARRAY:
-+            tsize = wtype.target ().sizeof ()
++        if wtype.code == gdb.TYPE_CODE_ARRAY:
++            tsize = wtype.target ().sizeof
 +        else:
 +            words = [words]
-+            tsize = wtype.sizeof () 
++            tsize = wtype.sizeof 
 +
-+        nwords = wtype.sizeof() / tsize
++        nwords = wtype.sizeof / tsize
 +        result = []
 +        byte = 0
 +        while byte < nwords:
@@ -25156,8 +25161,8 @@
 +
 +    def __init__(self, val):
 +        self.val = val
-+        self.elttype = val.type().template_argument(0)
-+        size = self.elttype.sizeof ()
++        self.elttype = val.type.template_argument(0)
++        size = self.elttype.sizeof
 +        if size < 512:
 +            self.buffer_size = int (512 / size)
 +        else:
@@ -25310,17 +25315,17 @@
 +    "Look-up and return a pretty-printer that can print val."
 +
 +    # Get the type.
-+    type = val.type ();
++    type = val.type;
 +
 +    # If it points to a reference, get the reference.
-+    if type.code () == gdb.TYPE_CODE_REF:
++    if type.code == gdb.TYPE_CODE_REF:
 +        type = type.target ()
 +
 +    # Get the unqualified type, stripped of typedefs.
 +    type = type.unqualified ().strip_typedefs ()
 +
 +    # Get the type name.    
-+    typename = type.tag ()
++    typename = type.tag
 +    if typename == None:
 +        return None
 +
@@ -27373,7 +27378,7 @@
 +  return result;
 +}
 diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
-index 02dbfc4..4aae0aa 100644
+index 02dbfc4..5e43267 100644
 --- a/gdb/python/python-internal.h
 +++ b/gdb/python/python-internal.h
 @@ -33,6 +33,7 @@
@@ -27395,7 +27400,7 @@
  #else
  #error "Unable to find usable Python.h"
  #endif
-@@ -58,23 +61,69 @@ typedef int Py_ssize_t;
+@@ -58,23 +61,70 @@ typedef int Py_ssize_t;
  #define PyEval_ReleaseLock() 0
  #endif
  
@@ -27422,6 +27427,7 @@
 +PyObject *gdbpy_block_for_pc (PyObject *self, PyObject *args);
 +PyObject *gdbpy_read_memory (PyObject *self, PyObject *args);
 +PyObject *gdbpy_write_memory (PyObject *self, PyObject *args);
++PyObject *gdbpy_lookup_type (PyObject *self, PyObject *args, PyObject *kw);
 +
 +PyObject *symtab_and_line_to_sal_object (struct symtab_and_line sal);
 +PyObject *symtab_to_symtab_object (struct symtab *symtab);
@@ -27466,7 +27472,7 @@
  /* Use this after a TRY_EXCEPT to throw the appropriate Python
     exception.  */
  #define GDB_PY_HANDLE_EXCEPTION(Exception)				\
-@@ -85,6 +134,19 @@ struct cleanup *make_cleanup_py_restore_gil (PyGILState_STATE *state);
+@@ -85,6 +135,19 @@ struct cleanup *make_cleanup_py_restore_gil (PyGILState_STATE *state);
  			     "%s", Exception.message);			\
      } while (0)
  
@@ -27486,7 +27492,7 @@
  
  void gdbpy_print_stack (void);
  
-@@ -95,6 +157,21 @@ char *python_string_to_host_string (PyObject *obj);
+@@ -95,6 +158,21 @@ char *python_string_to_host_string (PyObject *obj);
  PyObject *target_string_to_unicode (const gdb_byte *str, int length);
  int gdbpy_is_string (PyObject *obj);
  
@@ -27759,10 +27765,10 @@
 +}
 diff --git a/gdb/python/python-objfile.c b/gdb/python/python-objfile.c
 new file mode 100644
-index 0000000..e97d3a2
+index 0000000..f5db084
 --- /dev/null
 +++ b/gdb/python/python-objfile.c
-@@ -0,0 +1,221 @@
+@@ -0,0 +1,225 @@
 +/* Python interface to objfiles.
 +
 +   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
@@ -27881,9 +27887,13 @@
 +static void
 +clean_up_objfile (struct objfile *objfile, void *datum)
 +{
++  PyGILState_STATE state;
 +  objfile_object *object = datum;
++
++  state = PyGILState_Ensure ();
 +  object->objfile = NULL;
 +  Py_DECREF ((PyObject *) object);
++  PyGILState_Release (state);
 +}
 +
 +/* Return the Python object of type Objfile representing OBJFILE.  If
@@ -29258,10 +29268,10 @@
 +};
 diff --git a/gdb/python/python-type.c b/gdb/python/python-type.c
 new file mode 100644
-index 0000000..c851cdb
+index 0000000..fcf6b82
 --- /dev/null
 +++ b/gdb/python/python-type.c
-@@ -0,0 +1,828 @@
+@@ -0,0 +1,836 @@
 +/* Python interface to types.
 +
 +   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
@@ -29353,8 +29363,6 @@
 +  ENTRY (TYPE_CODE_BOOL),
 +  ENTRY (TYPE_CODE_COMPLEX),
 +  ENTRY (TYPE_CODE_TYPEDEF),
-+  ENTRY (TYPE_CODE_TEMPLATE),
-+  ENTRY (TYPE_CODE_TEMPLATE_ARG),
 +  ENTRY (TYPE_CODE_NAMESPACE),
 +  ENTRY (TYPE_CODE_DECFLOAT),
 +  ENTRY (TYPE_CODE_INTERNAL_FUNCTION),
@@ -29368,6 +29376,7 @@
 +{
 +  field_object *f = (field_object *) obj;
 +  Py_XDECREF (f->dict);
++  f->ob_type->tp_free (obj);
 +}
 +
 +static PyObject *
@@ -29390,7 +29399,7 @@
 +
 +/* Return the code for this type.  */
 +static PyObject *
-+typy_code (PyObject *self, PyObject *args)
++typy_get_code (PyObject *self, void *closure)
 +{
 +  struct type *type = ((type_object *) self)->type;
 +  return PyInt_FromLong (TYPE_CODE (type));
@@ -29497,7 +29506,7 @@
 +
 +/* Return the type's tag, or None.  */
 +static PyObject *
-+typy_tag (PyObject *self, PyObject *args)
++typy_get_tag (PyObject *self, void *closure)
 +{
 +  struct type *type = ((type_object *) self)->type;
 +  if (!TYPE_TAG_NAME (type))
@@ -29611,16 +29620,16 @@
 +
 +/* Return the size of the type represented by SELF, in bytes.  */
 +static PyObject *
-+typy_sizeof (PyObject *self, PyObject *args)
++typy_get_sizeof (PyObject *self, void *closure)
 +{
 +  struct type *type = ((type_object *) self)->type;
 +  volatile struct gdb_exception except;
 +
 +  TRY_CATCH (except, RETURN_MASK_ALL)
 +    {
-+      CHECK_TYPEDEF (type);
++      check_typedef (type);
 +    }
-+  GDB_PY_HANDLE_EXCEPTION (except);
++  /* Ignore exceptions.  */
 +
 +  return PyLong_FromLong (TYPE_LENGTH (type));
 +}
@@ -29861,47 +29870,6 @@
 +    obj->next = NULL;
 +}
 +
-+static PyObject *
-+typy_new (PyTypeObject *subtype, PyObject *args, PyObject *kwargs)
-+{
-+  char *type_name = NULL;
-+  struct type *type = NULL;
-+  type_object *result;
-+  PyObject *block_obj = NULL;
-+  struct block *block = NULL;
-+
-+  /* FIXME: it is strange to allow a Type with no name, but we need
-+     this for type_to_type_object.  */
-+  if (! PyArg_ParseTuple (args, "|sO", &type_name, &block_obj))
-+    return NULL;
-+
-+  if (block_obj)
-+    {
-+      block = block_object_to_block (block_obj);
-+      if (! block)
-+	{
-+	  PyErr_SetString (PyExc_RuntimeError,
-+			   "second argument must be block");
-+	  return NULL;
-+	}
-+    }
-+
-+  if (type_name)
-+    {
-+      type = typy_lookup_typename (type_name, block);
-+      if (! type)
-+	return NULL;
-+    }
-+
-+  result = (type_object *) subtype->tp_alloc (subtype, 1);
-+  if (! result)
-+    return NULL;
-+
-+  set_type (result, type);
-+
-+  return (PyObject *) result;
-+}
-+
 +static void
 +typy_dealloc (PyObject *obj)
 +{
@@ -29948,6 +29916,38 @@
 +
 +
 +
++/* Implementation of gdb.lookup_type.  */
++PyObject *
++gdbpy_lookup_type (PyObject *self, PyObject *args, PyObject *kw)
++{
++  static char *keywords[] = { "name", "block", NULL };
++  char *type_name = NULL;
++  struct type *type = NULL;
++  PyObject *block_obj = NULL;
++  struct block *block = NULL;
++
++  if (! PyArg_ParseTupleAndKeywords (args, kw, "s|O", keywords,
++				     &type_name, &block_obj))
++    return NULL;
++
++  if (block_obj)
++    {
++      block = block_object_to_block (block_obj);
++      if (! block)
++	{
++	  PyErr_SetString (PyExc_RuntimeError,
++			   "'block' argument must be a Block");
++	  return NULL;
++	}
++    }
++
++  type = typy_lookup_typename (type_name, block);
++  if (! type)
++    return NULL;
++
++  return (PyObject *) type_to_type_object (type);
++}
++
 +void
 +gdbpy_initialize_types (void)
 +{
@@ -29979,29 +29979,47 @@
 +
 +
 +
++static PyGetSetDef type_object_getset[] =
++{
++  { "code", typy_get_code, NULL,
++    "The code for this type.", NULL },
++  { "sizeof", typy_get_sizeof, NULL,
++    "The size of this type, in bytes.", NULL },
++  { "tag", typy_get_tag, NULL,
++    "The tag name for this type, or None.", NULL },
++  { NULL }
++};
++
 +static PyMethodDef type_object_methods[] =
 +{
-+  { "code", typy_code, METH_NOARGS, "Return the code for this type" },
-+  { "const", typy_const, METH_NOARGS, "Return a const variant of this type" },
++  { "const", typy_const, METH_NOARGS,
++    "const () -> Type\n\
++Return a const variant of this type." },
 +  { "fields", typy_fields, METH_NOARGS,
-+    "Return a sequence holding all the fields of this type.\n\
++    "field () -> list\n\
++Return a sequence holding all the fields of this type.\n\
 +Each field is a dictionary." },
-+  { "pointer", typy_pointer, METH_NOARGS, "Return pointer to this type" },
-+  { "reference", typy_reference, METH_NOARGS, "Return reference to this type" },
-+  { "sizeof", typy_sizeof, METH_NOARGS,
-+    "Return the size of this type, in bytes" },
-+  { "tag", typy_tag, METH_NOARGS,
-+    "Return the tag name for this type, or None." },
++  { "pointer", typy_pointer, METH_NOARGS,
++    "pointer () -> Type\n\
++Return a type of pointer to this type." },
++  { "reference", typy_reference, METH_NOARGS,
++    "reference () -> Type\n\
++Return a type of reference to this type." },
 +  { "strip_typedefs", typy_strip_typedefs, METH_NOARGS,
-+    "Return a type stripped of typedefs"},
++    "strip_typedefs () -> Type\n\
++Return a type formed by stripping this type of all typedefs."},
 +  { "target", typy_target, METH_NOARGS,
-+    "Return the target type of this type" },
++    "target () -> Type\n\
++Return the target type of this type." },
 +  { "template_argument", typy_template_argument, METH_VARARGS,
-+    "Return a single template argument type" },
++    "template_argument (arg) -> Type\n\
++Return the type of a template argument." },
 +  { "unqualified", typy_unqualified, METH_NOARGS,
-+    "Return a variant of this type without const or volatile attributes" },
++    "unqualified () -> Type\n\
++Return a variant of this type without const or volatile attributes." },
 +  { "volatile", typy_volatile, METH_NOARGS,
-+    "Return a volatile variant of this type" },
++    "volatile () -> Type\n\
++Return a volatile variant of this type" },
 +  { NULL }
 +};
 +
@@ -30037,7 +30055,7 @@
 +  0,				  /* tp_iternext */
 +  type_object_methods,		  /* tp_methods */
 +  0,				  /* tp_members */
-+  0,				  /* tp_getset */
++  type_object_getset,		  /* tp_getset */
 +  0,				  /* tp_base */
 +  0,				  /* tp_dict */
 +  0,				  /* tp_descr_get */
@@ -30045,7 +30063,7 @@
 +  0,				  /* tp_dictoffset */
 +  0,				  /* tp_init */
 +  0,				  /* tp_alloc */
-+  typy_new,			  /* tp_new */
++  0,				  /* tp_new */
 +};
 +
 +static PyTypeObject field_object_type =
@@ -30163,7 +30181,7 @@
 +  return 1;
 +}
 diff --git a/gdb/python/python-value.c b/gdb/python/python-value.c
-index bc077b6..2507fcd 100644
+index bc077b6..e26880a 100644
 --- a/gdb/python/python-value.c
 +++ b/gdb/python/python-value.c
 @@ -52,6 +52,10 @@ struct value *values_in_python = NULL;
@@ -30177,30 +30195,108 @@
  #define builtin_type_pybool \
    language_bool_type (current_language, current_gdbarch)
  
-@@ -143,10 +147,19 @@ valpy_address (PyObject *self, PyObject *args)
-   return value_to_value_object (res_val);
+@@ -59,6 +63,8 @@ typedef struct {
+   PyObject_HEAD
+   struct value *value;
+   int owned_by_gdb;
++  PyObject *address;
++  PyObject *type;
+ } value_object;
+ 
+ /* Called by the Python interpreter when deallocating a value object.  */
+@@ -71,6 +77,18 @@ valpy_dealloc (PyObject *obj)
+ 
+   if (!self->owned_by_gdb)
+     value_free (self->value);
++
++  if (self->address)
++    /* Use braces to appease gcc warning.  *sigh*  */
++    {
++      Py_DECREF (self->address);
++    }
++
++  if (self->type)
++    {
++      Py_DECREF (self->type);
++    }
++
+   self->ob_type->tp_free (self);
+ }
+ 
+@@ -105,6 +123,8 @@ valpy_new (PyTypeObject *subtype, PyObject *args, PyObject *keywords)
+ 
+   value_obj->value = value;
+   value_obj->owned_by_gdb = 0;
++  value_obj->address = NULL;
++  value_obj->type = NULL;
+   release_value (value);
+   value_prepend_to_list (&values_in_python, value);
+ 
+@@ -129,24 +149,55 @@ valpy_dereference (PyObject *self, PyObject *args)
+ 
+ /* Return "&value".  */
+ static PyObject *
+-valpy_address (PyObject *self, PyObject *args)
++valpy_get_address (PyObject *self, void *closure)
+ {
+   struct value *res_val = NULL;	  /* Initialize to appease gcc warning.  */
++  value_object *val_obj = (value_object *) self;
+   volatile struct gdb_exception except;
+ 
+-  TRY_CATCH (except, RETURN_MASK_ALL)
++  if (!val_obj->address)
+     {
+-      res_val = value_addr (((value_object *) self)->value);
++      TRY_CATCH (except, RETURN_MASK_ALL)
++	{
++	  res_val = value_addr (val_obj->value);
++	}
++      if (except.reason < 0)
++	{
++	  val_obj->address = Py_None;
++	  Py_INCREF (Py_None);
++	}
++      else
++	val_obj->address = value_to_value_object (res_val);
+     }
+-  GDB_PY_HANDLE_EXCEPTION (except);
+ 
+-  return value_to_value_object (res_val);
++  Py_INCREF (val_obj->address);
++
++  return val_obj->address;
  }
  
 -/* Return Unicode string with value contents (assumed to be encoded in the
 -   target's charset).  */
 +/* Return type of the value.  */
-+static PyObject *
-+valpy_type (PyObject *self, PyObject *args)
+ static PyObject *
+-valpy_string (PyObject *self, PyObject *args)
++valpy_get_type (PyObject *self, void *closure)
 +{
-+  struct value *value = ((value_object *) self)->value;
-+  return type_to_type_object (value_type (value));
++  value_object *obj = (value_object *) self;
++  if (!obj->type)
++    {
++      obj->type = type_to_type_object (value_type (obj->value));
++      if (!obj->type)
++	{
++	  obj->type = Py_None;
++	  Py_INCREF (obj->type);
++	}
++    }
++  Py_INCREF (obj->type);
++  return obj->type;
 +}
 +
 +/* Implementation of gdb.Value.string ([encoding] [, errors]) -> string
 +   Return Unicode string with value contents.  If ENCODING is not given,
 +   the string is assumed to be encoded in the target's charset.  */
- static PyObject *
--valpy_string (PyObject *self, PyObject *args)
++static PyObject *
 +valpy_string (PyObject *self, PyObject *args, PyObject *kw)
  {
    int length, ret = 0;
    gdb_byte *buffer;
-@@ -157,8 +170,10 @@ valpy_string (PyObject *self, PyObject *args)
+@@ -157,8 +208,10 @@ valpy_string (PyObject *self, PyObject *args)
    const char *errors = NULL;
    const char *user_encoding = NULL;
    const char *la_encoding = NULL;
@@ -30212,7 +30308,7 @@
      return NULL;
  
    TRY_CATCH (except, RETURN_MASK_ALL)
-@@ -174,6 +189,34 @@ valpy_string (PyObject *self, PyObject *args)
+@@ -174,6 +227,34 @@ valpy_string (PyObject *self, PyObject *args)
    return unicode;
  }
  
@@ -30247,7 +30343,26 @@
  static Py_ssize_t
  valpy_length (PyObject *self)
  {
-@@ -306,11 +349,11 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
+@@ -269,6 +350,18 @@ valpy_str (PyObject *self)
+   return result;
+ }
+ 
++/* Implements gdb.Value.is_optimized_out.  */
++static PyObject *
++valpy_get_is_optimized_out (PyObject *self, void *closure)
++{
++  struct value *value = ((value_object *) self)->value;
++
++  if (value_optimized_out (value))
++    Py_RETURN_TRUE;
++
++  Py_RETURN_FALSE;
++}
++
+ enum valpy_opcode
+ {
+   VALPY_ADD,
+@@ -306,11 +399,11 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
  	 a gdb.Value object and need to convert it from python as well.  */
        arg1 = convert_value_from_python (self);
        if (arg1 == NULL)
@@ -30261,7 +30376,7 @@
  
        switch (opcode)
  	{
-@@ -387,7 +430,7 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
+@@ -387,7 +480,7 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
      }
    GDB_PY_HANDLE_EXCEPTION (except);
  
@@ -30270,7 +30385,16 @@
  }
  
  static PyObject *
-@@ -718,6 +761,17 @@ value_to_value_object (struct value *val)
+@@ -711,6 +804,8 @@ value_to_value_object (struct value *val)
+     {
+       val_obj->value = val;
+       val_obj->owned_by_gdb = 0;
++      val_obj->address = NULL;
++      val_obj->type = NULL;
+       release_value (val);
+       value_prepend_to_list (&values_in_python, val);
+     }
+@@ -718,6 +813,17 @@ value_to_value_object (struct value *val)
    return (PyObject *) val_obj;
  }
  
@@ -30288,7 +30412,7 @@
  /* Try to convert a Python value to a gdb value.  If the value cannot
     be converted, set a Python exception and return NULL.  */
  
-@@ -751,7 +805,34 @@ convert_value_from_python (PyObject *obj)
+@@ -751,7 +857,34 @@ convert_value_from_python (PyObject *obj)
  	{
  	  LONGEST l = PyLong_AsLongLong (obj);
  
@@ -30324,7 +30448,7 @@
  	    value = value_from_longest (builtin_type_pylong, l);
  	}
        else if (PyFloat_Check (obj))
-@@ -774,7 +855,7 @@ convert_value_from_python (PyObject *obj)
+@@ -774,7 +907,7 @@ convert_value_from_python (PyObject *obj)
  	    }
  	}
        else if (PyObject_TypeCheck (obj, &value_object_type))
@@ -30333,7 +30457,7 @@
        else
  	PyErr_Format (PyExc_TypeError, _("Could not convert Python object: %s"),
  		      PyString_AsString (PyObject_Str (obj)));
-@@ -810,6 +891,14 @@ gdbpy_history (PyObject *self, PyObject *args)
+@@ -810,6 +943,14 @@ gdbpy_history (PyObject *self, PyObject *args)
    return value_to_value_object (res_val);
  }
  
@@ -30348,27 +30472,45 @@
  void
  gdbpy_initialize_values (void)
  {
-@@ -822,11 +911,16 @@ gdbpy_initialize_values (void)
+@@ -822,11 +963,24 @@ gdbpy_initialize_values (void)
    values_in_python = NULL;
  }
  
 +
 +
++static PyGetSetDef value_object_getset[] = {
++  { "address", valpy_get_address, NULL, "The address of the value.",
++    NULL },
++  { "is_optimized_out", valpy_get_is_optimized_out, NULL,
++    "Boolean telling whether the value is optimized out (i.e., not available).",
++    NULL },
++  { "type", valpy_get_type, NULL, "Type of the value.", NULL },
++  {NULL}  /* Sentinel */
++};
++
  static PyMethodDef value_object_methods[] = {
-   { "address", valpy_address, METH_NOARGS, "Return the address of the value." },
+-  { "address", valpy_address, METH_NOARGS, "Return the address of the value." },
 +  { "cast", valpy_cast, METH_VARARGS, "Cast the value to the supplied type." },
    { "dereference", valpy_dereference, METH_NOARGS, "Dereferences the value." },
 -  { "string", valpy_string, METH_VARARGS,
 -    "Return Unicode string representation of the value." },
-+  { "type", valpy_type, METH_NOARGS, "Return type of the value." },
 +  { "string", (PyCFunction) valpy_string, METH_VARARGS | METH_KEYWORDS,
 +    "string ([encoding] [, errors]) -> string\n\
 +Return Unicode string representation of the value." },
    {NULL}  /* Sentinel */
  };
  
+@@ -893,7 +1047,7 @@ PyTypeObject value_object_type = {
+   0,				  /* tp_iternext */
+   value_object_methods,		  /* tp_methods */
+   0,				  /* tp_members */
+-  0,				  /* tp_getset */
++  value_object_getset,		  /* tp_getset */
+   0,				  /* tp_base */
+   0,				  /* tp_dict */
+   0,				  /* tp_descr_get */
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index b3a27d6..2b06748 100644
+index b3a27d6..995835b 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
 @@ -22,6 +22,12 @@
@@ -31969,7 +32111,7 @@
  ");
  
    /* Release the GIL while gdb runs.  */
-@@ -461,9 +1868,79 @@ static PyMethodDef GdbMethods[] =
+@@ -461,9 +1868,84 @@ static PyMethodDef GdbMethods[] =
      "Get a value from history" },
    { "execute", execute_gdb_command, METH_VARARGS,
      "Execute a gdb command" },
@@ -32003,6 +32145,11 @@
 +    "stop_reason_string (Integer) -> String.\n\
 +Return a string explaining unwind stop reason." },
 +
++  { "lookup_type", (PyCFunction) gdbpy_lookup_type,
++    METH_VARARGS | METH_KEYWORDS,
++    "lookup_type (name [, block]) -> type\n\
++Return a Type corresponding to the given name." },
++
 +  { "lookup_symbol", (PyCFunction) gdbpy_lookup_symbol,
 +    METH_VARARGS | METH_KEYWORDS,
 +    "lookup_symbol (name [, block] [, domain]) -> (symbol, is_field_of_this)\n\
@@ -32579,7 +32726,7 @@
  extern void dwarf2_build_frame_info (struct objfile *);
  
 diff --git a/gdb/symtab.c b/gdb/symtab.c
-index d2ba1f3..c1c4459 100644
+index d2ba1f3..f9d27b2 100644
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
 @@ -42,6 +42,7 @@
@@ -32598,18 +32745,7 @@
  #include "observer.h"
  #include "gdb_assert.h"
  #include "solist.h"
-@@ -94,7 +96,9 @@ static
- struct symbol *lookup_symbol_aux_local (const char *name,
- 					const char *linkage_name,
- 					const struct block *block,
--					const domain_enum domain);
-+					const domain_enum domain,
-+					enum language lang,
-+					int *is_a_field_of_this);
- 
- static
- struct symbol *lookup_symbol_aux_symtabs (int block_index,
-@@ -273,7 +277,7 @@ lookup_partial_symtab (const char *name)
+@@ -273,7 +275,7 @@ lookup_partial_symtab (const char *name)
        make_cleanup (xfree, real_path);
      }
  
@@ -32618,7 +32754,7 @@
    {
      if (FILENAME_CMP (name, pst->filename) == 0)
        {
-@@ -870,7 +874,13 @@ find_pc_sect_psymtab (CORE_ADDR pc, struct obj_section *section)
+@@ -870,7 +872,13 @@ find_pc_sect_psymtab (CORE_ADDR pc, struct obj_section *section)
       than the later used TEXTLOW/TEXTHIGH one.  */
  
    ALL_OBJFILES (objfile)
@@ -32633,7 +32769,7 @@
        {
  	struct partial_symtab *pst;
  
-@@ -903,6 +913,7 @@ find_pc_sect_psymtab (CORE_ADDR pc, struct obj_section *section)
+@@ -903,6 +911,7 @@ find_pc_sect_psymtab (CORE_ADDR pc, struct obj_section *section)
  	    return pst;
  	  }
        }
@@ -32641,7 +32777,7 @@
  
    /* Existing PSYMTABS_ADDRMAP mapping is present even for PARTIAL_SYMTABs
       which still have no corresponding full SYMTABs read.  But it is not
-@@ -1170,6 +1181,22 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)
+@@ -1170,6 +1179,22 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)
    return psym;
  }
  
@@ -32664,7 +32800,7 @@
  /* Find the definition for a specified symbol name NAME
     in domain DOMAIN, visible from lexical block BLOCK.
     Returns the struct symbol pointer, or zero if no symbol is found.
-@@ -1200,6 +1227,11 @@ lookup_symbol_in_language (const char *name, const struct block *block,
+@@ -1200,6 +1225,11 @@ lookup_symbol_in_language (const char *name, const struct block *block,
    int needtofreename = 0;
    struct symbol *returnval;
  
@@ -32676,7 +32812,7 @@
    modified_name = name;
  
    /* If we are using C++ or Java, demangle the name before doing a lookup, so
-@@ -1213,6 +1245,17 @@ lookup_symbol_in_language (const char *name, const struct block *block,
+@@ -1213,6 +1243,17 @@ lookup_symbol_in_language (const char *name, const struct block *block,
  	  modified_name = demangled_name;
  	  needtofreename = 1;
  	}
@@ -32694,79 +32830,37 @@
      }
    else if (lang == language_java)
      {
-@@ -1283,8 +1326,8 @@ lookup_symbol_aux (const char *name, const char *linkage_name,
-   /* Search specified block and its superiors.  Don't search
-      STATIC_BLOCK or GLOBAL_BLOCK.  */
- 
--  sym = lookup_symbol_aux_local (name, linkage_name, block, domain);
--  if (sym != NULL)
-+  sym = lookup_symbol_aux_local (name, linkage_name, block, domain, language, is_a_field_of_this);
-+  if (sym != NULL || (is_a_field_of_this && *is_a_field_of_this))
-     return sym;
- 
-   /* If requested to do so by the caller and if appropriate for LANGUAGE,
-@@ -1292,41 +1335,6 @@ lookup_symbol_aux (const char *name, const char *linkage_name,
- 
-   langdef = language_def (language);
- 
--  if (langdef->la_name_of_this != NULL && is_a_field_of_this != NULL
--      && block != NULL)
--    {
--      struct symbol *sym = NULL;
--      /* 'this' is only defined in the function's block, so find the
--	 enclosing function block.  */
+@@ -1296,13 +1337,15 @@ lookup_symbol_aux (const char *name, const char *linkage_name,
+       && block != NULL)
+     {
+       struct symbol *sym = NULL;
++      const struct block *function_block = block;
++
+       /* 'this' is only defined in the function's block, so find the
+ 	 enclosing function block.  */
 -      for (; block && !BLOCK_FUNCTION (block); 
 -	   block = BLOCK_SUPERBLOCK (block));
--
++      for (; function_block && !BLOCK_FUNCTION (function_block);
++	   function_block = BLOCK_SUPERBLOCK (function_block));
+ 
 -      if (block && !dict_empty (BLOCK_DICT (block)))
 -	sym = lookup_block_symbol (block, langdef->la_name_of_this,
--				   NULL, VAR_DOMAIN);
--      if (sym)
--	{
--	  struct type *t = sym->type;
--	  
--	  /* I'm not really sure that type of this can ever
--	     be typedefed; just be safe.  */
--	  CHECK_TYPEDEF (t);
--	  if (TYPE_CODE (t) == TYPE_CODE_PTR
--	      || TYPE_CODE (t) == TYPE_CODE_REF)
--	    t = TYPE_TARGET_TYPE (t);
--	  
--	  if (TYPE_CODE (t) != TYPE_CODE_STRUCT
--	      && TYPE_CODE (t) != TYPE_CODE_UNION)
--	    error (_("Internal error: `%s' is not an aggregate"), 
--		   langdef->la_name_of_this);
--	  
--	  if (check_field (t, name))
--	    {
--	      *is_a_field_of_this = 1;
--	      return NULL;
--	    }
--	}
--    }
- 
-   /* Now do whatever is appropriate for LANGUAGE to look
-      up static and global variables.  */
-@@ -1358,25 +1366,70 @@ lookup_symbol_aux (const char *name, const char *linkage_name,
- static struct symbol *
- lookup_symbol_aux_local (const char *name, const char *linkage_name,
- 			 const struct block *block,
--			 const domain_enum domain)
-+			 const domain_enum domain,
-+			 enum language language,
-+			 int *is_a_field_of_this)
++      if (function_block && !dict_empty (BLOCK_DICT (function_block)))
++	sym = lookup_block_symbol (function_block, langdef->la_name_of_this,
+ 				   NULL, VAR_DOMAIN);
+       if (sym)
+ 	{
+@@ -1361,22 +1404,24 @@ lookup_symbol_aux_local (const char *name, const char *linkage_name,
+ 			 const domain_enum domain)
  {
    struct symbol *sym;
 -  const struct block *static_block = block_static_block (block);
 +  const struct block *global_block = block_global_block (block);
 +  const struct block *block_iterator = block;
-+  const struct language_defn *langdef;
  
--  /* Check if either no block is specified or it's a global block.  */
-+  langdef = language_def (language);
+   /* Check if either no block is specified or it's a global block.  */
  
 -  if (static_block == NULL)
-+  /* Check if either no block is specified or it's a global block.  */
 +  if (global_block == NULL)
      return NULL;
  
@@ -32774,50 +32868,11 @@
 +  while (block_iterator != global_block)
      {
 -      sym = lookup_symbol_aux_block (name, linkage_name, block, domain);
-+      /* First check the local lexical level */
 +      sym = lookup_symbol_aux_block (name, linkage_name, block_iterator, domain);
        if (sym != NULL)
  	return sym;
 -      block = BLOCK_SUPERBLOCK (block);
 +    
-+      if (language == language_cplus)
-+        {
-+          /* Check class scope, if we have reach the function block */
-+          if(BLOCK_FUNCTION (block_iterator)){
-+
-+          if (block_iterator && !dict_empty (BLOCK_DICT (block_iterator)))
-+            sym = lookup_block_symbol (block_iterator, langdef->la_name_of_this,
-+                                       NULL, VAR_DOMAIN);
-+          if (sym)
-+            {
-+              struct type *t = sym->type;
-+
-+              /* I'm not really sure that type of this can ever
-+                 be typedefed; just be safe.  */
-+              CHECK_TYPEDEF (t);
-+              if (TYPE_CODE (t) == TYPE_CODE_PTR
-+                  || TYPE_CODE (t) == TYPE_CODE_REF)
-+                t = TYPE_TARGET_TYPE (t);
-+
-+              if (TYPE_CODE (t) != TYPE_CODE_STRUCT
-+                  && TYPE_CODE (t) != TYPE_CODE_UNION)
-+                error (_("Internal error: `%s' is not an aggregate"),
-+                       langdef->la_name_of_this);
-+
-+              if (check_field (t, name))
-+                {
-+                  *is_a_field_of_this = 1;
-+                  return NULL;
-+                }
-+            }
-+          }
-+
-+          /* Check the namespace scope */
-+          sym = langdef->la_lookup_symbol_nonlocal (name, linkage_name, block, domain);
-+          if (sym != NULL)
-+            return sym;
-+        }
-+
 +      block_iterator = BLOCK_SUPERBLOCK (block_iterator);
      }
  
@@ -32826,7 +32881,7 @@
  
    return NULL;
  }
-@@ -1450,6 +1503,7 @@ lookup_global_symbol_from_objfile (const struct objfile *objfile,
+@@ -1450,6 +1495,7 @@ lookup_global_symbol_from_objfile (const struct objfile *objfile,
    }
  
    /* Now go through psymtabs.  */
@@ -32834,7 +32889,7 @@
    ALL_OBJFILE_PSYMTABS (objfile, ps)
    {
      if (!ps->readin
-@@ -1520,7 +1574,7 @@ lookup_symbol_aux_psymtabs (int block_index, const char *name,
+@@ -1520,7 +1566,7 @@ lookup_symbol_aux_psymtabs (int block_index, const char *name,
    struct symtab *s;
    const int psymtab_index = (block_index == GLOBAL_BLOCK ? 1 : 0);
  
@@ -32843,7 +32898,7 @@
    {
      if (!ps->readin
  	&& lookup_partial_symbol (ps, name, linkage_name,
-@@ -1805,7 +1859,11 @@ basic_lookup_transparent_type (const char *name)
+@@ -1805,7 +1851,11 @@ basic_lookup_transparent_type (const char *name)
        }
    }
  
@@ -32856,7 +32911,7 @@
    {
      if (!ps->readin && lookup_partial_symbol (ps, name, NULL,
  					      1, STRUCT_DOMAIN))
-@@ -1853,7 +1911,12 @@ basic_lookup_transparent_type (const char *name)
+@@ -1853,7 +1903,12 @@ basic_lookup_transparent_type (const char *name)
        }
    }
  
@@ -32870,7 +32925,7 @@
    {
      if (!ps->readin && lookup_partial_symbol (ps, name, NULL, 0, STRUCT_DOMAIN))
        {
-@@ -1894,7 +1957,21 @@ find_main_psymtab (void)
+@@ -1894,7 +1949,21 @@ find_main_psymtab (void)
    struct partial_symtab *pst;
    struct objfile *objfile;
  
@@ -32893,7 +32948,7 @@
    {
      if (lookup_partial_symbol (pst, main_name (), NULL, 1, VAR_DOMAIN))
        {
-@@ -3085,7 +3162,7 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[],
+@@ -3085,7 +3154,7 @@ search_symbols (char *regexp, domain_enum kind, int nfiles, char *files[],
       matching the regexp.  That way we don't have to reproduce all of
       the machinery below. */
  
@@ -40135,7 +40190,7 @@
 +}
 diff --git a/gdb/testsuite/gdb.python/find.exp b/gdb/testsuite/gdb.python/find.exp
 new file mode 100644
-index 0000000..dd9aabc
+index 0000000..defc31c
 --- /dev/null
 +++ b/gdb/testsuite/gdb.python/find.exp
 @@ -0,0 +1,203 @@
@@ -40232,8 +40287,8 @@
 +
 +gdb_test "set *(int32_t*) &int8_search_buf\[10\] = 0x61616161" "" ""
 +gdb_test "py search_buf = gdb.selected_frame ().read_var ('int8_search_buf')" "" ""
-+gdb_test "py start_addr = search_buf.address ()" "" ""
-+gdb_test "py length = search_buf.type ().sizeof ()" "" ""
++gdb_test "py start_addr = search_buf.address" "" ""
++gdb_test "py length = search_buf.type.sizeof" "" ""
 +
 +gdb_test "py print gdb.search_memory (start_addr, length, 'aaa')" \
 +  "${two_patterns_found}" "find string pattern"
@@ -40270,8 +40325,8 @@
 +
 +gdb_test "set int16_search_buf\[10\] = 0x1234" "" ""
 +gdb_test "py search_buf = gdb.selected_frame ().read_var ('int16_search_buf')" "" ""
-+gdb_test "py start_addr = search_buf.address ()" "" ""
-+gdb_test "py length = search_buf.type ().sizeof ()" "" ""
++gdb_test "py start_addr = search_buf.address" "" ""
++gdb_test "py length = search_buf.type.sizeof" "" ""
 +gdb_test "py pattern = gdb.parse_and_eval ('(int16_t) 0x1234')" "" ""
 +
 +gdb_test "py print gdb.search_memory (start_addr, length, 0x1234, 2)" \
@@ -40284,8 +40339,8 @@
 +
 +gdb_test "set int32_search_buf\[10\] = 0x12345678" "" ""
 +gdb_test "py search_buf = gdb.selected_frame ().read_var ('int32_search_buf')" "" ""
-+gdb_test "py start_addr = search_buf.address ()" "" ""
-+gdb_test "py length = search_buf.type ().sizeof ()" "" ""
++gdb_test "py start_addr = search_buf.address" "" ""
++gdb_test "py length = search_buf.type.sizeof" "" ""
 +gdb_test "py pattern = gdb.parse_and_eval ('(int32_t) 0x12345678')" "" ""
 +
 +gdb_test "py print gdb.search_memory (start_addr, length, 0x12345678, 4)" \
@@ -40297,8 +40352,8 @@
 +
 +gdb_test "set int64_search_buf\[10\] = 0xfedcba9876543210LL" "" ""
 +gdb_test "py search_buf = gdb.selected_frame ().read_var ('int64_search_buf')" "" ""
-+gdb_test "py start_addr = search_buf.address ()" "" ""
-+gdb_test "py length = search_buf.type ().sizeof ()" "" ""
++gdb_test "py start_addr = search_buf.address" "" ""
++gdb_test "py length = search_buf.type.sizeof" "" ""
 +gdb_test "py pattern = gdb.parse_and_eval ('(int64_t) 0xfedcba9876543210LL')" "" ""
 +
 +gdb_test "py print gdb.search_memory (start_addr, length, 0xfedcba9876543210, 8)" \
@@ -40312,7 +40367,7 @@
 +gdb_test "set *(int16_t*) &search_buf\[11\] = 0x6363" "" ""
 +gdb_test "set *(int32_t*) &search_buf\[13\] = 0x64646464" "" ""
 +gdb_test "py search_buf = gdb.selected_frame ().read_var ('search_buf')" "" ""
-+gdb_test "py start_addr = search_buf\[0\].address ()" "" ""
++gdb_test "py start_addr = search_buf\[0\].address" "" ""
 +gdb_test "py pattern1 = gdb.parse_and_eval ('(int8_t) 0x62')" "" ""
 +gdb_test "py pattern2 = gdb.parse_and_eval ('(int16_t) 0x6363')" "" ""
 +gdb_test "py pattern3 = gdb.parse_and_eval ('(int32_t) 0x64646464')" "" ""
@@ -41009,7 +41064,7 @@
 +run_lang_tests "c++"
 diff --git a/gdb/testsuite/gdb.python/python-prettyprint.py b/gdb/testsuite/gdb.python/python-prettyprint.py
 new file mode 100644
-index 0000000..8379ecf
+index 0000000..a53e412
 --- /dev/null
 +++ b/gdb/testsuite/gdb.python/python-prettyprint.py
 @@ -0,0 +1,151 @@
@@ -41075,8 +41130,8 @@
 +    def to_string(self):
 +        a = self.val["a"]
 +        b = self.val["b"]
-+        if a.address() != b:
-+            raise Exception("&a(%s) != b(%s)" % (str(a.address()), str(b)))
++        if a.address != b:
++            raise Exception("&a(%s) != b(%s)" % (str(a.address), str(b)))
 +        return " a=<" + str(self.val["a"]) + "> b=<" + str(self.val["b"]) + ">"
 +
 +class pp_ss:
@@ -41105,23 +41160,23 @@
 +        self.val = val
 +
 +    def to_string (self):
-+        return "pp class name: " + self.val.type ().tag ()
++        return "pp class name: " + self.val.type.tag
 +
 +def lookup_function (val):
 +    "Look-up and return a pretty-printer that can print val."
 +
 +    # Get the type.
-+    type = val.type ();
++    type = val.type
 +
 +    # If it points to a reference, get the reference.
-+    if type.code () == gdb.TYPE_CODE_REF:
++    if type.code == gdb.TYPE_CODE_REF:
 +        type = type.target ()
 +
 +    # Get the unqualified type, stripped of typedefs.
 +    type = type.unqualified ().strip_typedefs ()
 +
 +    # Get the type name.    
-+    typename = type.tag ()
++    typename = type.tag
 +
 +    if typename == None:
 +        return None
@@ -41202,11 +41257,11 @@
 +}
 diff --git a/gdb/testsuite/gdb.python/python-template.exp b/gdb/testsuite/gdb.python/python-template.exp
 new file mode 100644
-index 0000000..561ff73
+index 0000000..1ace5d6
 --- /dev/null
 +++ b/gdb/testsuite/gdb.python/python-template.exp
 @@ -0,0 +1,75 @@
-+# Copyright (C) 2008 Free Software Foundation, Inc.
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -41270,7 +41325,7 @@
 +
 +    # Replace '*' with '\*' in regex.
 +    regsub -all {\*} $type {\*} t
-+    gdb_test "python print foo.type().template_argument(0)" $t $type
++    gdb_test "python print foo.type.template_argument(0)" $t $type
 +}
 +
 +test_template_arg "const int"
@@ -41304,16 +41359,34 @@
    s.a = 3;
    s.b = 5;
 diff --git a/gdb/testsuite/gdb.python/python-value.exp b/gdb/testsuite/gdb.python/python-value.exp
-index 8f5e0ab..9ca9593 100644
+index 8f5e0ab..c1a051c 100644
 --- a/gdb/testsuite/gdb.python/python-value.exp
 +++ b/gdb/testsuite/gdb.python/python-value.exp
-@@ -227,6 +227,37 @@ proc test_value_in_inferior {} {
-   gdb_test "python print arg0" "0x.*$testfile\"" "verify dereferenced value"
+@@ -70,6 +70,9 @@ proc test_value_creation {} {
+   gdb_py_test_silent_cmd "python a = gdb.Value (u'unicode test')" "create unicode value" 1
+   gdb_test "python print a" "\"unicode test\"" "print Unicode string"
+   gdb_test "python print a.__class__" "<type 'gdb.Value'>" "verify type of unicode string"
++
++  # Test address attribute is None in a non-addressable value
++  gdb_test "python print 'result =', i.address" "= None" "Test address attribute in non-addressable value"
  }
  
+ proc test_value_numeric_ops {} {
+@@ -225,6 +228,43 @@ proc test_value_in_inferior {} {
+ 
+   # Check that the dereferenced value is sane
+   gdb_test "python print arg0" "0x.*$testfile\"" "verify dereferenced value"
++
++  # Smoke-test is_optimized_out attribute
++  gdb_test "python print 'result =', arg0.is_optimized_out" "= False" "Test is_optimized_out attribute"
++
++  # Test address attribute
++  gdb_test "python print 'result =', arg0.address" "= 0x\[\[:xdigit:\]\]+" "Test address attribute"
++}
++
 +proc test_value_after_death {} {
 +  # Construct a type while the inferior is still running.
-+  gdb_py_test_silent_cmd "python ptrtype = gdb.Type('PTR')" \
++  gdb_py_test_silent_cmd "python ptrtype = gdb.lookup_type('PTR')" \
 +    "create PTR type" 1
 +
 +  # Check the type has the expected name.
@@ -41338,14 +41411,12 @@
 +    "delete PTR type" 1
 +
 +  # Now see if the value's type is still valid.
-+  gdb_test "python print castval.type()" "PTR \\*" \
++  gdb_test "python print castval.type" "PTR \\*" \
 +    "print value's type"
-+}
-+
+ }
  
- # Start with a fresh gdb.
  
-@@ -256,3 +287,4 @@ if ![runto_main] then {
+@@ -256,3 +296,4 @@ if ![runto_main] then {
  }
  
  test_value_in_inferior


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- gdb.spec	13 Apr 2009 18:40:58 -0000	1.340
+++ gdb.spec	13 Apr 2009 20:52:59 -0000	1.341
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 16%{?_with_upstream:.upstream}%{?dist}
+Release: 17%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -851,6 +851,19 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-17
+- Archer update to the snapshot: 7c250ce99c90cf6097e2ec55ea0f205830979cee
+- Archer backport: c14d9ab7eef43281b2052c885f89d2db96fb5f8e
+  - Revert a change regressing: gdb.objc/basicclass.exp
+- Archer backport: ebd649b96e61a1fb481801b65d827bca998c6633
+                 + 1f080e897996d60ab7fde20423e2947512115667
+		 + 1948198702b51b31d79793fc49434b529b4e245f
+		 + e107fb9687bb1e7f74170aa3d19c4a8f6edbb10f
+		 + 1e012c996e121cb35053d239a46bd5dc65b0ce60
+  - Update the Python API from upstream.
+- Archer backport: d3c83ad5ec9f7672b87af9ad29279f459e53da11
+  - Fix a Python branch crash.
+
 * Mon Apr 13 2009 Dennis Gilmore <dennis at ausil.us> - 6.8.50.20090302-16
 - enable gdbserver package on sparc64
 



From jjames at fedoraproject.org  Mon Apr 13 21:03:30 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 13 Apr 2009 21:03:30 +0000 (UTC)
Subject: rpms/latexmk/F-10 .cvsignore, 1.7, 1.8 latexmk-conf.patch, 1.6,
	1.7 latexmk.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090413210330.8B63C70124@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31388/F-10

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.spec sources 
Log Message:
* Mon Apr 13 2009 Jerry James <loganjerry at gmail.com> - 4.05-1
- Update to 4.05 to correct problems when running latex and pdflatex on the
  same source file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jan 2009 00:22:03 -0000	1.7
+++ .cvsignore	13 Apr 2009 21:02:59 -0000	1.8
@@ -1 +1 @@
-latexmk-403.zip
+latexmk-405.zip

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/latexmk-conf.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- latexmk-conf.patch	7 Jan 2009 00:22:03 -0000	1.6
+++ latexmk-conf.patch	13 Apr 2009 21:02:59 -0000	1.7
@@ -1,1745 +1,16 @@
-diff -dur latexmk-4.03.ORIG/latexmk.1 latexmk-4.03/latexmk.1
---- latexmk-4.03.ORIG/latexmk.1	2008-12-22 15:49:44.000000000 -0700
-+++ latexmk-4.03/latexmk.1	2009-01-06 17:17:34.000000000 -0700
-@@ -1,9 +1,9 @@
--.TH LATEXMK 1L "22 December 2008" ""
--.SH NAME
-+.TH "LATEXMK" "1L" "22 December 2008" "" ""
-+.SH "NAME"
- latexmk \- generate LaTeX document
--.SH SYNOPSIS
-+.SH "SYNOPSIS"
- .B latexmk [options] [file ...] 
--.SH DESCRIPTION
-+.SH "DESCRIPTION"
- .I Latexmk
- completely automates the process of compiling a LaTeX document.
- Essentially, it is like a specialized relative of the general
-@@ -13,12 +13,12 @@
- source file for a document, and it issues the appropriate sequence of
- commands to generate a .dvi, .ps, .pdf and/or hardcopy version of the
- document.  
--.PP
-+.PP 
- \fILatexmk\fR can also be set to run continuously with a suitable
- previewer.  In that case the LaTeX program, etc, are rerun whenever
- one of the source files is modified, and the previewer automatically
--updates the on-screen view of the compiled document.
--.PP
-+updates the on\-screen view of the compiled document.
-+.PP 
- \fILatexmk\fR determines which are the source files by examining the
- log file.  When \fIlatexmk\fR is run, it examines properties of the
- source files, and if any have been changed since the last document
-@@ -32,14 +32,14 @@
- For example, from an updated figure file it can automatically generate
- a file in encapsulated postscript or another suitable format for
- reading by LaTeX.
--.PP
-+.PP 
- \fILatexmk\fR has two different previewing options.  In the simple
--\fB-pv\fR option, a dvi, postscript or pdf previewer is automatically
-+\fB\-pv\fR option, a dvi, postscript or pdf previewer is automatically
- run after generating the dvi, postscript or pdf version of the
- document.  The type of file to view is selected according to
- configuration settings and command line options.
--.PP
--The second previewing option is the powerful \fB-pvc\fR option
-+.PP 
-+The second previewing option is the powerful \fB\-pvc\fR option
- (mnemonic: "preview continuously").  In this case, \fIlatexmk\fR runs
- continuously, regularly monitoring all the source files to see if any
- have changed.  Every time a change is detected, \fIlatexmk\fR runs all
-@@ -49,31 +49,31 @@
- are written to disk, \fIlatexmk\fR completely automates the cycle of
- updating the .dvi (and possibly the .ps and .pdf) file, and refreshing
- the previewer's display.  It's not quite WYSIWYG, but usefully close.
--.PP
-+.PP 
- For other previewers, the user may have to manually make the previewer
- update its display, which can be (some versions of xdvi and gsview) as
- simple as forcing a redraw of its display.
--.PP
-+.PP 
- \fILatexmk\fR has the ability to print a banner in gray diagonally
- across each page when making the postscript file.  It can also, if
- needed, call an external program to do other postprocessing on the
- generated files.
--.PP
-+.PP 
- \fILatexmk\fR is highly configurable, both from the command line and
- in configuration files, so that it can accommodate a wide variety of
- user needs and system configurations.  Default values are set
- according to the operating system, so \fIlatexmk\fR often works 
--without special configuration on MS-Windows, cygwin, Linux, OS-X, and
-+without special configuration on MS\-Windows, cygwin, Linux, OS\-X, and
- other UNIX systems (notably Solaris).
--.PP
-+.PP 
- A very annoying complication handled very reliably by \fILatexmk\fR,
- is that LaTeX is a multiple pass system.  On each run, LaTeX reads in
- information generated on a previous run, for things like cross
- referencing and indexing.  In the simplest cases, a second run of
- LaTeX suffices, and often the log file contains a message about the
--need for another pass.  However, there is a wide variety of add-on
-+need for another pass.  However, there is a wide variety of add\-on
- macro packages to LaTeX, with a variety of behaviors.  The result is
--to break simple-minded determinations of how many runs are needed and
-+to break simple\-minded determinations of how many runs are needed and
- of which programs.  In its new version, \fIlatexmk\fR has a highly
- general and efficient solution to these issues.  The solution involves
- retaining between runs information on the source files, and a symptom
-@@ -81,10 +81,10 @@
- \fR.fdb_latexmk\fR, by default) that contains the source file
- information.
- 
--.SH LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE
--(All options can be introduced by single or double "-" characters,
--e.g., "latexmk -help" or "latexmk --help".)
--.TP
-+.SH "LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE"
-+(All options can be introduced by single or double "\-" characters,
-+e.g., "latexmk \-help" or "latexmk \-\-help".)
-+.TP 
- .B file
- One or more files can be specified.  If no files are specified,
- \fIlatexmk\fR will, by default, run on all files in the current working directory
-@@ -92,39 +92,39 @@
- description concerning the \fI at default_files\fR variable in the
- section "List of configuration variables usable in initialization
- files". 
--.PP
-+.PP 
- If a file is specified without an extension, then the ".tex" extension
- is automatically added, just as LaTeX does.  Thus, if you specify:
- 
- 	latexmk foo
- 
- then \fIlatexmk\fR will operate on the file "foo.tex".  
--.TP
--.B -bm <message>
-+.TP 
-+.B \-bm <message>
- A banner message to print diagonally across each page when converting
- the dvi file to postscript.  The message must be a single argument on
- the command line so be careful with quoting spaces and such.
- 
--Note that if the \fB-bm\fR option is specified, the \fB-ps\fR option is
-+Note that if the \fB\-bm\fR option is specified, the \fB\-ps\fR option is
- assumed.
--.TP
--.B -bi <intensity>
-+.TP 
-+.B \-bi <intensity>
- How dark to print the banner message.  A decimal number between 0 and 1.
- 0 is black and 1 is white.  The default is 0.95, which is OK unless your
- toner cartridge is getting low.
--.TP
--.B -bs <scale>
-+.TP 
-+.B \-bs <scale>
- A decimal number that specifies how large the banner message will be
- printed.  Experimentation is necessary to get the right scale for your
- message, as a rule of thumb the scale should be about equal to 1100
- divided by the number of characters in the message.  The default is 220.0
- which is just right for 5 character messages.
- .TP 
--.B -commands
-+.B \-commands
- List the commands used by \fIlatexmk\fR for processing files, and then
- exit. 
- .TP 
--.B -c
-+.B \-c
- Clean up (remove) all regeneratable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  These files are a
- combination of log files, aux files, latexmk's database file of source
-@@ -134,43 +134,43 @@
- files with extensions by the \fI$clean_ext\fR configuration variable are
- removed.  
- 
--This cleanup is instead of a regular make.  See the \fB-gg\fR option
-+This cleanup is instead of a regular make.  See the \fB\-gg\fR option
- if you want to do a cleanup then a make.
- .TP 
--.B -C
-+.B \-C
- Clean up (remove) all regeneratable files generated by \fIlatex\fR and
--\fIbibtex\fR.  This is the same as the \fB-c\fR option with the
-+\fIbibtex\fR.  This is the same as the \fB\-c\fR option with the
- addition of dvi, postscript and pdf files, and those with extensions
- in the \fI$clean_full_ext\fR configuration variable.
- 
--This cleanup is instead of a regular make.  See the \fB-gg\fR option
-+This cleanup is instead of a regular make.  See the \fB\-gg\fR option
- if you want to do a cleanup than a make.
- .TP 
--.B -CA
-+.B \-CA
- Clean up (remove) absolutely all regeneratable files.  It is now
--equivalent to the \fB-C\fR option
-+equivalent to the \fB\-C\fR option
- 
- This cleanup is instead of a regular make.  
--See the \fB-gg\fR option if you want to do a cleanup then a
-+See the \fB\-gg\fR option if you want to do a cleanup then a
- make.
- .TP 
--.B -CF
-+.B \-CF
- Remove the file containing the database of source file information,
- before doing the other actions requested.
- .TP 
--.B -d
-+.B \-d
- Set draft mode.  This prints the banner message "DRAFT" across your
- page when converting the dvi file to postscript.  Size and intensity
--can be modified with the \fB-bs\fR and \fB-bi\fR options.  The \fB-bm\fR
-+can be modified with the \fB\-bs\fR and \fB\-bi\fR options.  The \fB\-bm\fR
- option will override this option as this is really just a short way of
- specifying:
- 
--	latexmk -bm DRAFT
-+	latexmk \-bm DRAFT
- 
--Note that if the \fB-d\fR option is specified, the \fB-ps\fR option is
-+Note that if the \fB\-d\fR option is specified, the \fB\-ps\fR option is
- assumed.
--.TP
--.B -dF
-+.TP 
-+.B \-dF
- Dvi file filtering.  The argument to this option is a filter which will
- generate a filtered dvi file with the extension ".dviF".  All extra
- processing (e.g. conversion to postscript, preview, printing) will then
-@@ -178,150 +178,150 @@
- 
- Example usage: To use dviselect to select only the even pages of the dvi file:
- 
--	latexmk -dF 'dviselect even' foo.tex
--.TP
--.B -diagnostics
-+	latexmk \-dF 'dviselect even' foo.tex
-+.TP 
-+.B \-diagnostics
- Print detailed diagnostics during a run.  This may help for debugging
- problems or to understand \fI.latexmk\fR's behavior in difficult
- situations. 
--.TP
--.B -dvi
-+.TP 
-+.B \-dvi
- Generate dvi version of document.
--.TP
--.B -dvi-
-+.TP 
-+.B \-dvi\-
- Turn off generation of dvi version of document.  (This may get
- overridden, if some other file is made (e.g., a .ps file) that is
- generated from the dvi file, or if no generated file at all is
- requested.) 
--.TP
--.B -e <code>
-+.TP 
-+.B \-e <code>
- Execute the specified initialization code before processing.  The code
- is \fIPerl\fR code of the same form as is used in \fIlatexmk\fR's
--initialization files -- for more details, see the information on the
--\fB-r\fR option, and the section about "Configuration/initialization
-+initialization files \-\- for more details, see the information on the
-+\fB\-r\fR option, and the section about "Configuration/initialization
- (RC) files".  The code is typically a sequence of assignment
- statements separated by semicolons.
- 
--The code is executed when the \fB-e\fR option is encountered during
--\fIlatexmk\fR's parsing of its command line.  See the \fB-r\fR option
-+The code is executed when the \fB\-e\fR option is encountered during
-+\fIlatexmk\fR's parsing of its command line.  See the \fB\-r\fR option
- for a way of executing initialization code from a file.  An error
--results in \fIlatexmk\fR stopping.  Multiple instances of the \fB-r\fR
--and \fB-e\fR options can be used, and they are executed in the order
-+results in \fIlatexmk\fR stopping.  Multiple instances of the \fB\-r\fR
-+and \fB\-e\fR options can be used, and they are executed in the order
- they appear on the command line.
- 
- Some care is needed to deal with proper quoting of special characters
- in the code on the command line.  For example, suppose it is desired
--to set the latex command to use its -shell-escape option, then under
-+to set the latex command to use its \-shell\-escape option, then under
- UNIX/LINUX you could use the line
- 
--	latexmk -e '$latex=q/latex %O -shell-escape %S/' file.tex
-+	latexmk \-e '$latex=q/latex %O \-shell\-escape %S/' file.tex
- 
- (Note that the q/.../ construct is a \fIPerl\fR idiom equivalent to using
- single quotes.  This is easier than arranging to get a quote character
- correctly escaped in a way that is independent of the shell and the
--operating-system.)
--.TP
--.B -f
-+operating\-system.)
-+.TP 
-+.B \-f
- Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that LaTeX or another program has
- found an error which will not be resolved by further processing, no
- further processing is carried out.
--.TP
--.B -f-
--Turn off the forced processing-past-errors such as is set by the
--\fB-f\fR option.  This could be used to override a setting in a
-+.TP 
-+.B \-f\-
-+Turn off the forced processing\-past\-errors such as is set by the
-+\fB\-f\fR option.  This could be used to override a setting in a
- configuration file.
--.TP
--.B -g
-+.TP 
-+.B \-g
- Force \fIlatexmk\fR to process document fully, even under situations
- where \fIlatexmk\fR would normally decide that no changes in the
- source files have occurred since the previous run. 
- This option is useful, for example, if you change some options and
- wish to reprocess the files.
--.TP
--.B -g-
--Turn off \fB-g\fR.
--.TP
--.B -gg
-+.TP 
-+.B \-g\-
-+Turn off \fB\-g\fR.
-+.TP 
-+.B \-gg
- "Super go mode" or "clean make": clean out generated files as if
--\fB-CA\fR had been given, and then do a regular make.
--.TP
--.B -h, -help
-+\fB\-CA\fR had been given, and then do a regular make.
-+.TP 
-+.B \-h, \-help
- Print help information.
--.TP
--.B -l
-+.TP 
-+.B \-l
- Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.  This option is not normally needed
- nowadays, since current previewers normally determine this information
- automatically. 
--.TP
--.B -l-
--Turn off \fB-l\fR.
--.TP
--.B -new-viewer
--When in continuous-preview mode, always start a new viewer to view the
--generated file.  By default, \fIlatexmk\fR will, in continuous-preview
-+.TP 
-+.B \-l\-
-+Turn off \fB\-l\fR.
-+.TP 
-+.B \-new\-viewer
-+When in continuous\-preview mode, always start a new viewer to view the
-+generated file.  By default, \fIlatexmk\fR will, in continuous\-preview
- mode, test for a previously running previewer for the same file and
- not start a new one if a previous previewer is running.  However, its
--test sometimes fails (notably if there is an already-running previewer
-+test sometimes fails (notably if there is an already\-running previewer
- that is viewing a file of the same name as the current file, but in a
- different directory).  This option turns off the default behavior.
--.TP
--.B -new-viewer-
--The inverse of the \fB-new-viewer\fR option.  It puts \fIlatexmk\fR
--in its normal behavior that in preview-continuous mode it checks for
--an already-running previewer.  
--.TP
--.B -p
-+.TP 
-+.B \-new\-viewer\-
-+The inverse of the \fB\-new\-viewer\fR option.  It puts \fIlatexmk\fR
-+in its normal behavior that in preview\-continuous mode it checks for
-+an already\-running previewer.  
-+.TP 
-+.B \-p
- Print out the document.  By default it is
- the generated postscript file that is printed.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you
-+\fB\-print=...\fR option to print the dvi or pdf files instead, and you
- can configure this in a start up file (by setting the
- \fI$print_type\fR variable).  
- 
- However, printing is enabled by default only under UNIX/LINUX systems,
- where the default is to use the lpr command.  In general, the correct
- behavior for printing very much depends on your system's software.  In
--particular, under MS-Windows you must have suitable program(s)
-+particular, under MS\-Windows you must have suitable program(s)
- available, and you must have configured the print commands used by
--\fIlatexmk\fR.  This can be non-trivial.  See the documentation on the
-+\fIlatexmk\fR.  This can be non\-trivial.  See the documentation on the
- \fI$lpr\fR, \fI$lpr_dvi\fR, and \fI$lpr_pdf\fR configuration variables
- to see how to set the commands for printing.
- 
--This option is incompatible with the \fB-pv\fR and \fB-pvc\fR options,
-+This option is incompatible with the \fB\-pv\fR and \fB\-pvc\fR options,
- so it turns them off. 
--.TP
--.B -pdf
-+.TP 
-+.B \-pdf
- Generate pdf version of document using pdflatex.
--.TP
--.B -pdfdvi
-+.TP 
-+.B \-pdfdvi
- Generate pdf version of document from the dvi file, by default using dvipdf.
--.TP
--.B -pdfps
-+.TP 
-+.B \-pdfps
- Generate pdf version of document from the ps file, by default using
- ps2pdf. 
--.TP
--.B -pdf-
-+.TP 
-+.B \-pdf\-
- Turn off generation of pdf version of document.  
- (This can be used to override a setting in a configuration file.
- It may get overridden if some other option requires the generation of
- a pdf file.)
--.TP
--.B -print=dvi, -print=ps, -print=pdf
-+.TP 
-+.B \-print=dvi, \-print=ps, \-print=pdf
- Define which kind of file is printed.  This option also ensures that
- the requisite file is made, and turns on printing.  The default is to
- print a postscript file.
--.TP
--.B -ps
-+.TP 
-+.B \-ps
- Generate postscript version of document.
--.TP
--.B -ps-
-+.TP 
-+.B \-ps\-
- Turn off generation of postscript version of document.
- This can be used to override a setting in a configuration file.
- (It may get overridden by some other option that requires a postscript
- file, for example a request for printing.)
--.TP
--.B -pF
-+.TP 
-+.B \-pF
- Postscript file filtering.  The argument to this option is a filter
- which will generate a filtered postscript file with the extension
- ".psF".  All extra processing (e.g. preview, printing) will then be
-@@ -329,52 +329,52 @@
- 
- Example of usage: Use psnup to print two pages on the one page:
- 
--	latexmk -ps -pF 'psnup -2' foo.tex
-+	latexmk \-ps \-pF 'psnup \-2' foo.tex
- 
- or
- 
--	latexmk -ps -pF "psnup -2" foo.tex
-+	latexmk \-ps \-pF "psnup \-2" foo.tex
- 
--Whether to use single or double quotes round the "psnup -2" will
-+Whether to use single or double quotes round the "psnup \-2" will
- depend on your command interpreter, as used by the particular version
- of perl and the operating system on your computer.
--.TP
--.B -pv
--Run file previewer.  If the \fB-view\fR option is used, this will select
-+.TP 
-+.B \-pv
-+Run file previewer.  If the \fB\-view\fR option is used, this will select
- the kind of file to be previewed (dvi, ps or pdf).
- Otherwise the viewer views the "highest" kind of file selected, by the
--\fB-dvi\fR, \fB-ps\fR, \fB-pdf\fR, \fB-pdfps\fR options, in the
-+\fB\-dvi\fR, \fB\-ps\fR, \fB\-pdf\fR, \fB\-pdfps\fR options, in the
- order dvi, ps, pdf (low to high).
- If no file type has been selected, the dvi previewer will be used.
--This option is incompatible with the \fB-p\fR and \fB-pvc\fR options,
-+This option is incompatible with the \fB\-p\fR and \fB\-pvc\fR options,
- so it turns them off.
--.TP
--.B -pv-
--Turn off \fB-pv\fR.
--.TP
--.B -pvc
-+.TP 
-+.B \-pv\-
-+Turn off \fB\-pv\fR.
-+.TP 
-+.B \-pvc
- Run a file previewer and continually update the .dvi, .ps, and/or .pdf
- files whenever changes are made to source files (see the Description
- above).  Which of these files is generated and which is viewed is
--governed by the other options, and is the same as for the \fB-pv\fR
-+governed by the other options, and is the same as for the \fB\-pv\fR
- option. 
--The preview-continuous option \fB-pvc\fR can only work with one file.
-+The preview\-continuous option \fB\-pvc\fR can only work with one file.
- So in this case you will normally only specify one filename on
- the command line.  It is also incompatible with the 
--\fB-p\fR and \fB-pv\fR options, so it turns these options off
-+\fB\-p\fR and \fB\-pv\fR options, so it turns these options off
- 
- With a good previewer the display will be automatically updated.
--(Under \fIsome but not all\fR versions of UNIX/Linux "gv -watch" does
-+(Under \fIsome but not all\fR versions of UNIX/Linux "gv \-watch" does
- this for postscript files; this can be set by a configuration
- variable.  This would also work for pdf files except for an apparent
- bug in gv that causes an error when the newly updated pdf file is
- read.)  Many other previewers will need a manual update.
- 
--Important note: the acroread program on MS-Windows locks the pdf file,
-+Important note: the acroread program on MS\-Windows locks the pdf file,
- and prevents new versions being written, so it is a bad idea to use
--acroread to view pdf files in preview-continuous mode.  It is better
--to use a dvi or ps viewer, as set by one of the \fB-view=dvi\fR and
--\fB-view=ps\fR options.
-+acroread to view pdf files in preview\-continuous mode.  It is better
-+to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
-+\fB\-view=ps\fR options.
- 
- There are some other methods for arranging an update, notably useful
- for many versions of xdvi and xpdf.  These are best set in
-@@ -382,26 +382,26 @@
- 
- Note that if \fIlatexmk\fR dies or is stopped by the user, the
- "forked" previewer will continue to run.  Successive invocations with
--the \fB-pvc\fR option will not fork new previewers, but \fIlatexmk\fR
-+the \fB\-pvc\fR option will not fork new previewers, but \fIlatexmk\fR
- will normally use the existing previewer.  (At least this will happen
- when \fIlatexmk\fR is running under an operating system where it knows
- how to determine whether an existing previewer is running.)
--.TP
--.B -pvc-
--Turn off \fB-pvc\fR.
--.TP
--.B -quiet
--Same as -silent
--.TP
--.B -r <rcfile>
-+.TP 
-+.B \-pvc\-
-+Turn off \fB\-pvc\fR.
-+.TP 
-+.B \-quiet
-+Same as \-silent
-+.TP 
-+.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.
- 
--Be careful about the ordering: (1) Standard initialization files --
--see the section below on "Configuration/initialization (RC) files" --
-+Be careful about the ordering: (1) Standard initialization files \-\-
-+see the section below on "Configuration/initialization (RC) files" \-\-
- are read first.  (2) Then the options on the command line are acted on
- in the order they are given.  Therefore if an initialization file is
--specified by the \fB-r\fR option, it is read during this second step.
--Thus an initialization file specified with the \fB-r\fR option can
-+specified by the \fB\-r\fR option, it is read during this second step.
-+Thus an initialization file specified with the \fB\-r\fR option can
- override both the standard initialization files and \fIpreviously\fR
- specified options.  But all of these can be overridden by \fIlater\fR
- options.
-@@ -409,48 +409,48 @@
- The contents of the RC file just comprise a piece of code in the
- \fIPerl\fR programming language
- (typically a sequence of assignment statements); they are executed
--when the \fB-r\fR option is encountered during \fIlatexmk\fR's parsing
--of its command line.  See the \fB-e\fR option for a way of giving
-+when the \fB\-r\fR option is encountered during \fIlatexmk\fR's parsing
-+of its command line.  See the \fB\-e\fR option for a way of giving
- initialization code directly on \fIlatexmk\fR's command line.  An
- error results in \fIlatexmk\fR stopping.  Multiple instances of the
--\fB-r\fR and \fB-e\fR options can be used, and they are executed in
-+\fB\-r\fR and \fB\-e\fR options can be used, and they are executed in
- the order they appear on the command line.
--.TP
--.B -silent
-+.TP 
-+.B \-silent
- Run commands silently, i.e., with options that reduce the amount of
- diagnostics generated.  For example, with the default settings for
--commands under UNIX, the command "latex -interaction=batchmode" is used
-+commands under UNIX, the command "latex \-interaction=batchmode" is used
- for latex.
- 
- Also reduce the number of informational messages that \fIlatexmk\fR
- generates. 
--.TP
--.B -v, -version
-+.TP 
-+.B \-v, \-version
- Print version number of \fIlatexmk\fR.
--.TP
--.B -verbose
--Opposite of \fB-silent\fR.  This is the default setting.
--.TP
--.B -view=default, -view=dvi, -view=ps, -view=pdf
-+.TP 
-+.B \-verbose
-+Opposite of \fB\-silent\fR.  This is the default setting.
-+.TP 
-+.B \-view=default, \-view=dvi, \-view=ps, \-view=pdf
- Set the kind of file used when previewing is requested (e.g., by the
--\fB-pv\fR or \fB-pvc\fR switches).  The default is to view the "highest"
-+\fB\-pv\fR or \fB\-pvc\fR switches).  The default is to view the "highest"
- kind of requested file (in the order dvi, ps, pdf).  
--.PP
--The preview-continuous option \fB-pvc\fR can only work with one file.
-+.PP 
-+The preview\-continuous option \fB\-pvc\fR can only work with one file.
- So in this case you will normally only specify one filename on
- the command line.  
--.PP
--Options \fB-p\fR, \fB-pv\fR and \fB-pvc\fR are mutually exclusive.  So
-+.PP 
-+Options \fB\-p\fR, \fB\-pv\fR and \fB\-pvc\fR are mutually exclusive.  So
- each of these options turns the others off.
- 
--.SH EXAMPLES
--.nf
-+.SH "EXAMPLES"
-+.nf 
- .ta 2i
- % \fBlatexmk thesis\fR		\fI# run latex enough times to resolve
--				cross-references\fR 
-+				cross\-references\fR 
- 
--% \fBlatexmk -pvc -ps thesis\fR	\fI# run latex enough times to resolve
--					cross-references, make a postscript
-+% \fBlatexmk \-pvc \-ps thesis\fR	\fI# run latex enough times to resolve
-+					cross\-references, make a postscript
- 					file, start a previewer.  Then
- 					watch for changes in the source
- 					file thesis.tex and any files it
-@@ -461,37 +461,38 @@
- 					keep running, watching for
- 					source file changes.
- 
--% \fBlatexmk -c\fR		\fI# remove .aux, .log, .bbl, .blg, .dvi, 
-+% \fBlatexmk \-c\fR		\fI# remove .aux, .log, .bbl, .blg, .dvi, 
- 					.pdf, .ps & .bbl files\fR
- 
- 
--.SH CONFIGURATION/INITIALIZATION (RC) FILES
--.PP
-+.SH "CONFIGURATION/INITIALIZATION (RC) FILES"
-+.PP 
- \fILatexmk\fR can be customized using initialization files, which are
- read at startup in the following order:
--.PP
-+.PP 
- 1) The system RC file, if it exists.  
-    On a UNIX system, \fIlatexmk\fR searches for following places for its
- system RC file, in the following order, and reads the first it finds:
+--- latexmk.1.ORIG	2009-04-10 15:49:52.000000000 -0600
++++ latexmk.1	2009-04-13 14:54:50.000000000 -0600
+@@ -479,6 +479,7 @@
     "/opt/local/share/latexmk/LatexMk",
     "/usr/local/share/latexmk/LatexMk",
     "/usr/local/lib/latexmk/LatexMk".
--   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
--.PP
 +   On a Fedora system, it only looks for "/etc/latexmk.conf".
-+   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
-+.PP 
+    On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
+ .PP
  2) The user's RC file, "$HOME/.latexmkrc", if it exists.  Here $HOME
- is the value of the environment variable HOME.  On UNIX and clones
--(including LINUX), this variable is set by the system; on MS-Windows,
-+(including LINUX), this variable is set by the system; on MS\-Windows,
- the user may choose to set it.
--.PP
-+.PP 
- 3) The RC file in the current working directory.  This file can be
- named either "latexmkrc" or ".latexmkrc", and the first of these to be
- found is used, if any.
--.PP
--4) Any RC file(s) specified on the command line with the \fB-r\fR option.
--.PP
-+.PP 
-+4) Any RC file(s) specified on the command line with the \fB\-r\fR option.
-+.PP 
- Each RC file is a sequence of \fIPerl\fR commands.  Naturally, a user can use
- this in creative ways.  But for most purposes, one simply uses a
--sequence of assignment statements that override some of the built-in
-+sequence of assignment statements that override some of the built\-in
- settings of \fILatexmk\fR.  Straightforward cases can be handled
- without knowledge of the \fIPerl\fR language by using the examples in this
- document as templates.  Comment lines are introduced by the "#"
-@@ -499,27 +500,27 @@
- 
- Note that command line options are obeyed in the order in which
- they are written; thus any RC file specified on the command line with
--the \fB-r\fR option can override previous options but can be itself
-+the \fB\-r\fR option can override previous options but can be itself
- overridden by later options on the command line.  There is also the
--\fB-e\fR option, which allows initialization code to be specified in
-+\fB\-e\fR option, which allows initialization code to be specified in
- \fIlatexmk\fR's command line.
- 
--.SH HOW TO SET VARIABLES IN INITIALIZATION FILES
--.PP
-+.SH "HOW TO SET VARIABLES IN INITIALIZATION FILES"
-+.PP 
- The important variables that can be configured are described in the
- section "List of configuration variables usable in initialization
- files".  Syntax for setting these variables is of the following forms:
--.PP
-+.PP 
- 	$bibtex = 'bibtex %O %B';
--.PP
-+.PP 
- for the setting of a string variable, 
--.PP
-+.PP 
- 	$preview_mode = 1;
--.PP
-+.PP 
- for the setting of a numeric variable, and
--.PP
-+.PP 
- 	@default_files = ('paper', 'paper1');
--.PP
-+.PP 
- for the setting of an array of strings.  It is possible to append an
- item to an array variable as follows:
- 
-@@ -534,8 +535,7 @@
- 
- 
- 
--.SH FORMAT OF COMMAND SPECIFICATIONS
--
-+.SH "FORMAT OF COMMAND SPECIFICATIONS"
- Some of the variables set the commands that \fIlatexmk\fR uses for
- carrying out its work, for example to generate a dvi file from a tex
- file or to view a postscript file.  This section describes some
-@@ -543,42 +543,42 @@
- 
- \fBPlaceholders\fR:  Supposed you wanted \fIlatexmk\fR to use the
- command elatex in place of the regular latex command, and suppose
--moreover that you wanted to give it the option "--shell-escape".  You
-+moreover that you wanted to give it the option "\-\-shell\-escape".  You
- could do this by the following setting:
--.PP
--     $latex = 'elatex --shell-escape %O %S';
--.PP
-+.PP 
-+     $latex = 'elatex \-\-shell\-escape %O %S';
-+.PP 
- The two items starting with the % character are placeholders.  These
- are substituted by appropriate values before the command is run.  Thus
- %S will be replaced by the source file that elatex will be applied to,
- and %O will be replaced by any options that \fIlatexmk\fR has decided
--to use for this command.  (E.g., if you used the -silent option it
--would replace %O by "-interaction=batchmode".)
-+to use for this command.  (E.g., if you used the \-silent option it
-+would replace %O by "\-interaction=batchmode".)
- 
- The available placeholders are:
--.TP
-+.TP 
- .B %B
- base of filename for current command.  E.g., if a postscript file
- document.ps is being made from the dvi file document.dvi, then the
- basename is document.
--.TP
-+.TP 
- .B %D
- destination file (e.g., the name of the postscript file when
- converting a dvi file to postscript).
--.TP
-+.TP 
- .B %O
- options
--.TP
-+.TP 
- .B %R
- root filename.  This is the base name for the main tex file.  
--.TP
-+.TP 
- .B %S
- source file (e.g., the name of the dvi file when converting a dvi file
- to ps).
--.TP
-+.TP 
- .B %T
- The name of the primary tex file.
--.PP
-+.PP 
- The distinction between %B and %R needs a bit of care, since they are
- often the same, but not always.  For example on a simple document, the
- basename of a bibtex run is the same as for the texfile.  But in a
-@@ -586,9 +586,9 @@
- a variety of names.  Since bibtex is invoked with the basename of the
- bibliography file, the setting for the bibtex command should therefore
- be 
--.PP
-+.PP 
-      $bibtex = 'bibtex %O %B';
--.PP
-+.PP 
- Generally, you should use %B rather than %R.  Similarly for most
- purposes, the name %T of the primary texfile is not a useful
- placeholder.
-@@ -610,9 +610,9 @@
- the previewer running and then returns to its next task (or exits if
- there is nothing else to do).  To achieve this effect of detaching a
- command, you need to precede the command name with "start ", as in
--.PP
-+.PP 
-      $dvi_previewer = 'start xdvi %O %S';
--.PP
-+.PP 
- This will be translated to whatever is appropriate for your operating
- system.
- 
-@@ -623,31 +623,31 @@
- start.  (3) If the word start occurs more than once at the beginning
- of the command string, that is equivalent to having just one.  (4)
- Under cygwin, some complications happen, since cygwin amounts to a
--complicated merging of UNIX and MS-Windows.  See the source code for
-+complicated merging of UNIX and MS\-Windows.  See the source code for
- how I've handled the problem.
- 
--\fBCommand names containing spaces\fR: Under MS-Windows it is common
-+\fBCommand names containing spaces\fR: Under MS\-Windows it is common
- that the name of a command includes spaces, since software is often
- installed in a subdirectory of "C:\Program Files".  Such command names
- should be enclosed in double quotes, as in
--.PP
-+.PP 
-      $lpr_pdf = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p %S';
--.PP
--\fBUsing MS-Windows file associations\fR: A useful trick under modern
--versions of MS-Windows (e.g., WinXP) is to use just the command
-+.PP 
-+\fBUsing MS\-Windows file associations\fR: A useful trick under modern
-+versions of MS\-Windows (e.g., WinXP) is to use just the command
- 'start' by itself:
--.PP
-+.PP 
-      $dvi_previewer = 'start %S';
--.PP
--Under recent versions of MS-Windows, this will cause to be run
-+.PP 
-+Under recent versions of MS\-Windows, this will cause to be run
- whatever program the system has associated with dvi files.  (The same
- applies for a postscript viewer and a pdf viewer.)  
- 
- \fBNot using a certain command\fR: If a command is not to be run, the
- command name NONE is used, as in
--.PP
-+.PP 
-      $lpr  = 'NONE lpr';
--.PP
-+.PP 
- This typically is used when an appropriate command does not exist on
- your system.  The string after the "NONE" is effectively a comment.
- 
-@@ -657,9 +657,9 @@
- Suppose you want \fIlatexmk\fR to use latex with source specials
- enabled.  Then you might use the following line in an initialization
- file:
--.PP
--     $latex = 'latex --src-specials %O %S';
--.PP
-+.PP 
-+     $latex = 'latex \-\-src\-specials %O %S';
-+.PP 
- 
- \fBAdvanced tricks\fR: Normally one specifies a single command for the
- commands invoked by \fIlatexmk\fR.  Naturally, if there is some
-@@ -673,45 +673,45 @@
- file from a tex file you need to run another program after pdflatex to
- perform some extra processing, you could do something like:
- 
--     $pdflatex = 'pdflatex --shell-escape %O %S; pst2pdf_for_latexmk %B';
-+     $pdflatex = 'pdflatex \-\-shell\-escape %O %S; pst2pdf_for_latexmk %B';
- 
--This definition assumes you are using a UNIX-like system, so that the
-+This definition assumes you are using a UNIX\-like system, so that the
- two commands to be run are separated by the semicolon in the middle of
- the string.  
- 
- 
--.SH LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES
--.PP
-+.SH "LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES"
-+.PP 
- Default values are indicated in brackets.
--.TP
-+.TP 
- .B $banner [0]
- If nonzero, the banner message is printed across each page when
- converting the dvi file to postscript.  Without modifying the variable
--\fI$banner_message\fR, this is equivalent to specifying the \fB-d\fR
-+\fI$banner_message\fR, this is equivalent to specifying the \fB\-d\fR
- option.
- 
- Note that if \fB$banner\fR is nonzero, the \fB$postscript_mode\fR is
- assumed and the postscript file is always generated, even if it is newer
- than the dvi file.
--.TP
-+.TP 
- .B $banner_intensity [0.95]
--Equivalent to the \fB-bi\fR option, this is a decimal number between 0
-+Equivalent to the \fB\-bi\fR option, this is a decimal number between 0
- and 1 that specifies how dark to print the banner message. 0 is black,
- 1 is white.  The default is just right if your toner cartridge isn't
- running too low.
--.TP
-+.TP 
- .B $banner_message ["DRAFT"]
- The banner message to print across each page when converting the dvi
--file to postscript.  This is equivalent to the \fB-bm\fR option.
--.TP
-+file to postscript.  This is equivalent to the \fB\-bm\fR option.
-+.TP 
- .B $banner_scale [220.0]
- A decimal number that specifies how large the banner message will be
- printed.  Experimentation is necessary to get the right scale for your
- message, as a rule of thumb the scale should be about equal to 1100
- divided by the number of characters in the message.  The Default is
- just right for 5 character messages.  This is equivalent to the
--\fB-bs\fR option.
--.TP
-+\fB\-bs\fR option.
-+.TP 
- .B @BIBINPUTS
- This is an array variable, now mostly obsolete, that specifies
- directories where 
-@@ -733,50 +733,50 @@
- two and the second two examples are equivalent.  Each backward slash
- should be doubled to avoid running afoul of \fIPerl\fR's rules for writing
- strings. 
--.PP
-+.PP 
- \fIImportant note:\fR This variable is now mostly obsolete in the
- current version of \fIlatexmk\fR, 
- since it has a better method of searching for files using the
- kpsewhich command.  However, if your system is an unusual one without
- the kpsewhich command, you may need to set the variable \fI at BIBINPUTS\fR.
--.TP
-+.TP 
- .B $bibtex ["bibtex %O %S"]
- The BibTeX processing program.
--.TP
--.B $bibtex_silent_switch ["-terse"]
-+.TP 
-+.B $bibtex_silent_switch ["\-terse"]
- \fBSwitch(es)\fR for the BibTeX processing program when silent mode is on.
--.TP
-+.TP 
- .B $cleanup_includes_generated [0]
- If nonzero, specifies that cleanup also deletes files that are
- detected in log file as being generated (see the \\openout lines in
- the log file).  It will also include files made from these first
- generation generated files.
--.TP
-+.TP 
- .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for cleanup
- except for dvi, ps and pdf files, 3 for cleanup except for dep and aux
- files.  (There is also extra cleaning as specified by the
- \fI$clean_ext\fR, \fI$clean_full_ext\fR and \fI at generated_exts\fR
- variables.)
--.PP
-+.PP 
- This variable is equivalent to specifying one of
--the \fB-c\fR, \fB-c1\fR, or \fB-C\fR options.  But there should be no need
-+the \fB\-c\fR, \fB\-c1\fR, or \fB\-C\fR options.  But there should be no need
- to set this variable from an RC file.
--.TP
-+.TP 
- .B $clean_ext [""]
- Extra extensions of files for \fIlatexmk\fR to remove when any of the
--clean-up options (\fB-c\fR, \fB-c1\fR, or \fB-C\fR) is selected.
-+clean\-up options (\fB\-c\fR, \fB\-c1\fR, or \fB\-C\fR) is selected.
- The value of this variable is a string containing the extensions
- separated by spaces.
--.TP
-+.TP 
- .B $clean_full_ext [""]
--Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
-+Extra extensions of files for \fIlatexmk\fR to remove when the \fB\-C\fR
- option is selected, i.e., extensions of files to remove when the .dvi,
--etc files are to be cleaned-up.
--.TP
-+etc files are to be cleaned\-up.
-+.TP 
- .B @cus_dep_list [()]
--Custom dependency list -- see section on "Custom Dependencies".
--.TP
-+Custom dependency list \-\- see section on "Custom Dependencies".
-+.TP 
- .B @default_files [("*.tex")]
- Default list of files to be processed.  
- 
-@@ -803,63 +803,63 @@
- is ".tex".  Wild cards are allowed.  The parentheses are because
- \fI at default_files\fR is an array variable, i.e., a sequence of
- filename specifications is possible.
--.TP
-+.TP 
- .B $dvi_filter [empty]
- The dvi file filter to be run on the newly produced dvi file before
--other processing.  Equivalent to specifying the \fB-dF\fR option.
--.TP
-+other processing.  Equivalent to specifying the \fB\-dF\fR option.
-+.TP 
- .B $dvi_mode [0]
- If nonzero, generate a dvi version of the document.  
--Equivalent to the \fB-dvi\fR option.
--.TP
-+Equivalent to the \fB\-dvi\fR option.
-+.TP 
- .B $dvi_previewer ["start xdvi %O %S" under UNIX]
--The command to invoke a dvi-previewer.
--[Default is "start" under MS-WINDOWS; under more recent versions of
-+The command to invoke a dvi\-previewer.
-+[Default is "start" under MS\-WINDOWS; under more recent versions of
- Windows, this will cause to be run whatever command the system has
- associated with .dvi files.] 
--.TP
-+.TP 
- .B $dvi_previewer_landscape ["start xdvi %O %S"]
--The command to invoke a dvi-previewer in landscape mode.
--[Default is "start" under MS-WINDOWS; under more recent versions of
-+The command to invoke a dvi\-previewer in landscape mode.
-+[Default is "start" under MS\-WINDOWS; under more recent versions of
- Windows, this will cause to be run whatever command the system has
- associated with .dvi files.] 
--.TP
-+.TP 
- .B $dvipdf ["dvipdf %O %S %D"]
- Command to convert dvi to pdf file.  A common reconfiguration is to
- use the dvipdfm command, which needs its arguments in a different order:
- 
--     $dvipdf = "dvipdfm %O -o %D %S";
-+     $dvipdf = "dvipdfm %O \-o %D %S";
- 
- WARNING: The default dvipdf script generates pdf files with bitmapped
- fonts, which do not look good when viewed by acroread.  That script
--should be modified to give dvips the options "-P pdf" to ensure that
-+should be modified to give dvips the options "\-P pdf" to ensure that
- type 1 fonts are used in the pdf file.
--.TP
--.B $dvips ["dvips %O -o %D %S"]
-+.TP 
-+.B $dvips ["dvips %O \-o %D %S"]
- The program to used as a filter to convert a .dvi file to a .ps file.  
- If pdf is going to be generated from pdf, then the value of the
--$dvips_pdf_switch -- see below -- will be included in the options
-+$dvips_pdf_switch \-\- see below \-\- will be included in the options
- substituted for "%O".
--.TP
--.B $dvips_landscape ["dvips -tlandscape %O -o %D %S"]
-+.TP 
-+.B $dvips_landscape ["dvips \-tlandscape %O \-o %D %S"]
- The program to used as a filter to convert a .dvi file to a .ps file
- in landscape mode.
--.TP
--.B $dvips_pdf_switch ["-P pdf"]
-+.TP 
-+.B $dvips_pdf_switch ["\-P pdf"]
- Switch(es) for dvips program when pdf file is to be generated from
- ps file. 
--.TP
--.B $dvips_silent_switch ["-q"]
-+.TP 
-+.B $dvips_silent_switch ["\-q"]
- Switch(es) for dvips program when silent mode is on.
--.TP
-+.TP 
- .B $dvi_update_command [""]
- When the dvi previewer is set to be updated by running a command, this
- is the command that is run.  See the information for the variable
- \fI$dvi_update_method\fR for further information, and see information
- on the variable \fI$pdf_update_method\fR for an example for the
- analogous case of a pdf previewer.
--.TP
--.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
-+.TP 
-+.B $dvi_update_method [2 under UNIX, 1 under MS\-Windows]
- How the dvi viewer updates its display when the dvi file has changed.
- The values here apply equally to the \fI$pdf_update_method\fR and to
- the \fI$ps_update_method\fR variables.
-@@ -870,37 +870,37 @@
- \fI$dvi_update_signal\fR.  The default value under UNIX is
- suitable for xdvi. 
-     3 => Viewer cannot do an update, because it locks the file. (As with
--acroread under MS-Windows.)
-+acroread under MS\-Windows.)
-     4 => run a command to do the update.  The command is specified by
- the variable \fI$dvi_update_command\fR.   
- 
- See information on the variable \fI$pdf_update_method\fR for an
- example of updating by command.
--.TP
--.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+.TP 
-+.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system\-dependent value]
- The number of the signal that is sent to the dvi viewer when it is
--updated by sending a signal -- see the information on the variable
-+updated by sending a signal \-\- see the information on the variable
- \fI$dvi_update_method\fR.  The default value is the one appropriate
- for xdvi on a UNIX system.
--.TP
-+.TP 
- .B $fdb_ext ["fdb_latexmk"]
- The extension of the file which \fIlatexmk\fR generates to contain a
- database of information on source files.  You will not normally need
- to change this.
--.TP
-+.TP 
- .B $force_mode [0]
- If nonzero, continue processing past minor \fIlatex\fR errors 
- including unrecognized cross references.  Equivalent to specifying the
--\fB-f\fR option.
--.TP
-+\fB\-f\fR option.
-+.TP 
- .B @generated_exts [( "aux", "bbl", "idx", "ind", "lof", "lot", "out", "toc", $fdb_ext )]
- This contains a list of extensions for files that are generated during
- a LaTeX run and that are read in by LaTeX in later runs, either
- directly or indirectly. 
- 
- This list has two uses: (a) to set the kinds of file to be deleted in
--a cleanup operation (with the \fB-c\fR, \fB-C\fR, \fB-CA\fR, \fB-g\fR
--and \fB-gg\fR options), and (b) in the determination of whether a
-+a cleanup operation (with the \fB\-c\fR, \fB\-C\fR, \fB\-CA\fR, \fB\-g\fR
-+and \fB\-gg\fR options), and (b) in the determination of whether a
- rerun of (pdf)LaTeX is needed after a run that gives an error.
- 
- (Normally, a change of a source file during a run should provoke a
-@@ -909,7 +909,7 @@
- an error, a new run should occur until the user has made a change in
- the files.  But the user may have corrected an error in a source .tex
- file during the run.  So \fIlatexmk\fR needs to distinguish
--user-generated and automatically generated files; it determines the
-+user\-generated and automatically generated files; it determines the
- automatically generated files as those with extensions in the list in
- @generated_exts.)
- 
-@@ -922,11 +922,11 @@
- adds the extension "end" to the list of predefined generated
- extensions.  (This extension is used by the RevTeX package, for
- example.) 
--.TP
-+.TP 
- .B $go_mode [0]
- If nonzero, process files regardless of timestamps, and is then
--equivalent to the \fB-g\fR option.
--.TP
-+equivalent to the \fB\-g\fR option.
-+.TP 
- .B %hash_calc_ignore_pattern
- \fB!!!This variable is for experts only!!!\fR
- 
-@@ -946,15 +946,15 @@
-    $hash_calc_ignore_pattern{'eps'} = '^%%CreationDate: ';
- 
- This creates a rule for files with extension \fI.eps\fR about lines to
--ignore.  The left-hand side is a \fIPerl\fR idiom for setting an item
-+ignore.  The left\-hand side is a \fIPerl\fR idiom for setting an item
- in a hash.  Note that the file extension is specified without a
--period.  The value, on the right-hand side, is a string containing a
-+period.  The value, on the right\-hand side, is a string containing a
- regular expresssion.  (See documentation on \fIPerl\fR for how they
- are to be specified in general.)  This particular regular expression
- specifies that lines beginning with "%%CreationDate: " are to be
- ignored in deciding whether a file of the given extension \fI.eps\fR
- has changed.
--.TP
-+.TP 
- .B $kpsewhich ["kpsewhich %S"]
- The program called to locate a source file when the name alone is not
- sufficient.  Most filenames used by \fIlatexmk\fR have sufficient path
-@@ -966,28 +966,28 @@
- See also the \fI at BIBINPUTS\fR variable for another way that \fIlatexmk\fR
- also uses to try to locate files; it applies only in the case of .bib
- files.
--.TP
-+.TP 
- .B $landscape_mode [0]
- If nonzero, run in landscape mode, using the landscape mode previewers and
--dvi to postscript converters.  Equivalent to the \fB-l\fR option.
-+dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
- Normally not needed with current previewers.
--.TP
-+.TP 
- .B $latex ["latex %O %S"]
- The LaTeX processing program.  Note that as with other programs, you
- can use this variable not just to change the name of the program used,
- but also specify options to the program.  E.g.,
- 
--	$latex = "latex --src-specials";
--.TP
--.B $latex_silent_switch ["-interaction=batchmode"]
-+	$latex = "latex \-\-src\-specials";
-+.TP 
-+.B $latex_silent_switch ["\-interaction=batchmode"]
- Switch(es) for the LaTeX processing program when silent mode is on.
--Under MS-Windows, the default value is changed to 
--"-interaction=batchmode -c-style-errors", as used by MikTeX and fpTeX.
--.TP
--.B $lpr ["lpr  %O %S" under UNIX/LINUX, \(dqNONE lpr\(dq under MS-WINDOWS]
-+Under MS\-Windows, the default value is changed to 
-+"\-interaction=batchmode \-c\-style\-errors", as used by MikTeX and fpTeX.
-+.TP 
-+.B $lpr ["lpr  %O %S" under UNIX/LINUX, \(dqNONE lpr\(dq under MS\-WINDOWS]
- The command to print postscript files.
- 
--Under MS-Windows (unlike UNIX/LINUX), there is no standard program for
-+Under MS\-Windows (unlike UNIX/LINUX), there is no standard program for
- printing files.  But there are ways you can do it.  For example, if
- you have gsview installed, you could use it with the option "/p":
- 
-@@ -1001,14 +1001,14 @@
- the command obeyed; this is necessary because one part of the command
- name ("Program Files") contains a space which would otherwise be
- misinterpreted.
--.TP
-+.TP 
- .B $lpr_dvi ["NONE lpr_dvi"]
- The printing program to print dvi files.
--.TP
-+.TP 
- .B $lpr_pdf ["NONE lpr_pdf"]
- The printing program to print pdf files.
- 
--Under MS-Windows you could set this to use gsview, if it is installed,
-+Under MS\-Windows you could set this to use gsview, if it is installed,
- e.g.,
- 
-     $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -1018,27 +1018,27 @@
- is necessary because one part of the command name ("Program Files")
- contains a space which would otherwise be misinterpreted. 
- 
--.TP
--.B $makeindex ["makeindex %O -o %D %S"]
-+.TP 
-+.B $makeindex ["makeindex %O \-o %D %S"]
- The index processing program.
--.TP
-+.TP 
- .B $max_repeat  [5]
- The maximum number of times \fIlatexmk\fR will run latex/pdflatex
- before deciding that there may be an infinite loop and that it needs
- to bail out, rather than rerunning latex/pdflatex again to resolve
--cross-references, etc.  The default value covers all normal cases.
-+cross\-references, etc.  The default value covers all normal cases.
- 
- (Note that the "etc" covers a lot of cases where one run of
- latex/pdflatex generates files to be read in on a later run.)
--.TP
-+.TP 
- .B $new_viewer_always [0]
- This variable applies to \fIlatexmk\fR \fBonly\fR in
--continuous-preview mode.  If \fI$new_viewer_always\fR is 0,
-+continuous\-preview mode.  If \fI$new_viewer_always\fR is 0,
- \fIlatexmk\fR will check for a previously running previewer on the
- same file, and if one is running will not start a new one.  If
--\fI$new_viewer_always\fR is non-zero, this check will be skipped, and
-+\fI$new_viewer_always\fR is non\-zero, this check will be skipped, and
- \fIlatexmk\fR will behave as if no viewer is running.
--.TP
-+.TP 
- .B $pdf_mode [0]
- If zero, do NOT generate a pdf version of the document.
- If equal to 1, generate a pdf version of the document using pdflatex.  
-@@ -1047,39 +1047,39 @@
- If equal to 3, generate a pdf version of the document from the dvi
- file, by using the command specified by the \fI$dvipdf\fR variable.  
- 
--Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options.
--.TP
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options.
-+.TP 
- .B $pdflatex ["pdflatex %O %S"]
- The LaTeX processing program in the version that makes a pdf file instead
- of a dvi file.
--.TP
--.B $pdflatex_silent_switch  ["-interaction=batchmode"]
-+.TP 
-+.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- Switch(es) for the pdflatex program (specified in the variable
- \fI$pdflatex\fR when silent mode is on.
--Under MS-Windows, the default value is changed to 
--"-interaction=batchmode -c-style-errors", as used by MikTeX and fpTeX.
--.TP
-+Under MS\-Windows, the default value is changed to 
-+"\-interaction=batchmode \-c\-style\-errors", as used by MikTeX and fpTeX.
-+.TP 
- .B $pdf_previewer ["start acroread %O %S"]
--The command to invoke a pdf-previewer.
--[Default is changed to "start" on MS-WINDOWS; under more recent versions of
-+The command to invoke a pdf\-previewer.
-+[Default is changed to "start" on MS\-WINDOWS; under more recent versions of
- Windows, this will cause to be run whatever command the system has
- associated with .pdf files.]  
- 
--\fBWARNING\fR: Potential problem under MS-Windows:
-+\fBWARNING\fR: Potential problem under MS\-Windows:
- if acroread is used as the pdf previewer, and it is
- actually viewing a pdf file, the pdf file cannot be updated.  Thus
- makes acroread a bad choice of previewer if you use \fIlatexmk\fR's
--previous-continuous mode (option \fB-pvc\fR) under MS-windows.
-+previous\-continuous mode (option \fB\-pvc\fR) under MS\-windows.
- This problem does not occur if ghostview, gv or gsview is used to
- view pdf files.
--.TP
-+.TP 
- .B $pdf_update_command [""]
- When the pdf previewer is set to be updated by running a command, this
- is the command that is run.  See the information for the variable
- \fI$pdf_update_method\fR. 
--.TP
--.B $pdf_update_method [1 under UNIX, 3 under MS-Windows]
-+.TP 
-+.B $pdf_update_method [1 under UNIX, 3 under MS\-Windows]
- How the pdf viewer updates its display when the pdf file has
- changed. See the information on the variable \fI$dvi_update_method\fR
- for the codes.  (Note that information needs be changed slightly so
-@@ -1088,64 +1088,64 @@
- value 2, to specify update by signal, the signal is specified by
- \fI$pdf_update_signal\fR.)
- 
--Note that acroread under MS-Windows (but not UNIX) locks the pdf file, so
-+Note that acroread under MS\-Windows (but not UNIX) locks the pdf file, so
- the default value is then 3.  
- 
- Arranging to use a command to get a previewer explicitly updated
- requires three variables to be set.  For example:
- 
--    $pdf_previewer = "start xpdf -remote %R %O %S";
-+    $pdf_previewer = "start xpdf \-remote %R %O %S";
-     $pdf_update_method = 4;
--    $pdf_update_command = "xpdf -remote %R -reload";
-+    $pdf_update_command = "xpdf \-remote %R \-reload";
- 
- The first setting arranges for the xpdf program to be used in its
- "remote server mode", with the server name specified as the rootname
- of the TeX file.  The second setting arranges for updating to be done
- in response to a command, and the third setting sets the update command.
- 
--.TP
--.B $pdf_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
-+.TP 
-+.B $pdf_update_signal [Under UNIX: SIGHUP, which is a system\-dependent value]
- The number of the signal that is sent to the pdf viewer when it is
--updated by sending a signal -- see the information on the variable
-+updated by sending a signal \-\- see the information on the variable
- \fI$pdf_update_method\fR.  The default value is the one appropriate
- for gv on a UNIX system.
--.TP
--.B $pid_position[1 under UNIX, -1 under MS-Windows]     
-+.TP 
-+.B $pid_position[1 under UNIX, \-1 under MS\-Windows]     
- The variable \fI$pid_position\fR is used to
- specify which word in lines of the output from \fI$pscmd\fR
- corresponds to the process ID.  The first word in the line is numbered
- 0.  The default value of 1 (2nd word in line) is correct for Solaris
--2.6 and Linux.  Setting the variable to -1 is used to indicate that
-+2.6 and Linux.  Setting the variable to \-1 is used to indicate that
- \fI$pscmd\fR is not to be used.
--.TP
-+.TP 
- .B $postscript_mode [0]
- If nonzero, generate a postscript version of the document.  
--Equivalent to the \fB-ps\fR option.
--.TP
-+Equivalent to the \fB\-ps\fR option.
-+.TP 
- .B $preview_continuous_mode [0]
- If nonzero, run a previewer to view the document, and
--continue running \fIlatexmk\fR to keep .dvi up-to-date.  Equivalent to
--the \fB-pvc\fR option.
-+continue running \fIlatexmk\fR to keep .dvi up\-to\-date.  Equivalent to
-+the \fB\-pvc\fR option.
- Which previewer is run depends on the other settings, see the command
--line options \fB-view=\fR, and the variable \fI$view\fR.  
--.TP
-+line options \fB\-view=\fR, and the variable \fI$view\fR.  
-+.TP 
- .B $preview_mode [0]
- If nonzero, run a previewer to preview the document.
--Equivalent to the \fB-pv\fR option.  
-+Equivalent to the \fB\-pv\fR option.  
- Which previewer is run depends on the other settings, see the command
--line options \fB-view=\fR, and the variable \fI$view\fR.  
--.TP
-+line options \fB\-view=\fR, and the variable \fI$view\fR.  
-+.TP 
- .B $printout_mode [0]
- If nonzero, print the document using \fIlpr\fR.  Equivalent to the
--\fB-p\fR option.  This is recommended \fBnot\fR to be set from an RC
-+\fB\-p\fR option.  This is recommended \fBnot\fR to be set from an RC
- file, otherwise you could waste lots of paper.
--.TP
-+.TP 
- .B $print_type = ["ps"]
- Type of file to printout: possibilities are "dvi", "none", "pdf", or "ps".  
--.TP
-+.TP 
- .B $pscmd
- Command used to get all the processes currently run by the user.  The
---pvc option uses the command specified by the variable \fI$pscmd\fR to
-+\-pvc option uses the command specified by the variable \fI$pscmd\fR to
- determine if there is an already running previewer, and to find the
- process ID (needed if \fIlatexmk\fR needs to signal the previewer
- about file changes).  
-@@ -1154,27 +1154,27 @@
- one process.  See the \fI$pid_position\fR variable for how the process
- number is determined.
- 
--The default for \fIpscmd\fR is "NONE" under MS-Windows and cygwin
--(i.e., the command is not used), "ps --width 200 -f -u $ENV{USER}"
--under linux, "ps -ww -u $ENV{USER}" under darwin (Macintosh OS-X), and
--"ps -f -u $ENV{USER}" under other operating systems (including other
-+The default for \fIpscmd\fR is "NONE" under MS\-Windows and cygwin
-+(i.e., the command is not used), "ps \-\-width 200 \-f \-u $ENV{USER}"
-+under linux, "ps \-ww \-u $ENV{USER}" under darwin (Macintosh OS\-X), and
-+"ps \-f \-u $ENV{USER}" under other operating systems (including other
- flavors of UNIX).  In these specifications "$ENV{USER}" is substituted
- by the username.
--.TP
-+.TP 
- .B $ps2pdf ["ps2pdf  %O %S %D"]
- Command to convert ps to pdf file.  
--.TP
-+.TP 
- .B $ps_filter [empty]
- The postscript file filter to be run on the newly produced postscript
--file before other processing.  Equivalent to specifying the \fB-pF\fR
-+file before other processing.  Equivalent to specifying the \fB\-pF\fR
- option.
--.TP
--.B $ps_previewer ["start gv %O %S", but \(dqstart %O %S" under MS-WINDOWS]
--The command to invoke a ps-previewer.  (The default under MS-WINDOWS
-+.TP 
-+.B $ps_previewer ["start gv %O %S", but \(dqstart %O %S" under MS\-WINDOWS]
-+The command to invoke a ps\-previewer.  (The default under MS\-WINDOWS
- will cause to be run whatever command the system has associated 
- with .ps files.)
- 
--Note that gv could be used with the -watch option updates its display
-+Note that gv could be used with the \-watch option updates its display
- whenever the postscript file changes, whereas ghostview does not.
- However, different versions of gv have slightly different ways of
- writing this option.  You can configure this variable apppropriately.
-@@ -1182,16 +1182,16 @@
- \fBWARNING\fR: Linux systems may have installed one (or more) versions
- of gv under different names, e.g., ggv, kghostview, etc, but perhaps
- not one called gv.  
--.TP
--.B $ps_previewer_landscape ["start gv -swap %O %S", but \(dqstart %O %S" under MS-WINDOWS]
--The command to invoke a ps-previewer in landscape mode.
--.TP
-+.TP 
-+.B $ps_previewer_landscape ["start gv \-swap %O %S", but \(dqstart %O %S" under MS\-WINDOWS]
-+The command to invoke a ps\-previewer in landscape mode.
-+.TP 
- .B $ps_update_command [""]
- When the postscript previewer is set to be updated by running a command, this
- is the command that is run.  See the information for the variable
- \fI$ps_update_method\fR. 
--.TP
--.B $ps_update_method [0 under UNIX, 1 under MS-Windows]
-+.TP 
-+.B $ps_update_method [0 under UNIX, 1 under MS\-Windows]
- How the postscript viewer updates its display when the ps file has
- changed. See the information on the variable \fI$dvi_update_method\fR
- for the codes.  (Note that information needs be changed slightly so
-@@ -1200,25 +1200,25 @@
- value 2, to specify update by signal, the signal is specified by
- \fI$ps_update_signal\fR.)
- 
--.TP
--.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
-+.TP 
-+.B $ps_update_signal [Under UNIX: SIGHUP, which is a system\-dependent value]
- The number of the signal that is sent to the pdf viewer when it is
--updated by sending a signal -- see \fI$ps_update_method\fR.  The
-+updated by sending a signal \-\- see \fI$ps_update_method\fR.  The
- default value is the one appropriate for gv on a UNIX system.
--.TP
-+.TP 
- .B $sleep_time [2]
- The time to sleep (in seconds) between checking for source file 
--changes when running the \fB-pvc\fR option.
--.TP
-+changes when running the \fB\-pvc\fR option.
-+.TP 
- .B $texfile_search [""]
- This is an obsolete variable, replaced by the \fI at default_files\fR
- variable.  
- 
- For backward compatibility, if you choose to set
--\fI$texfile_search\fR, it is a string of space-separated filenames, and
-+\fI$texfile_search\fR, it is a string of space\-separated filenames, and
- then \fIlatexmk\fR replaces \fI at default_files\fR with the filenames in
- \fI$texfile_search\fR to which is added "*.tex".
--.TP
-+.TP 
- .B $tmpdir [See below for default]
- Directory to store temporary files that \fIlatexmk\fR may generate while
- running.  
-@@ -1227,20 +1227,20 @@
- \fI$tmpdir\fR to the value of the first of whichever of the system
- environment variables TMPDIR or TEMP exists, otherwise to the current
- directory.  Under other operating systems (expected to be UNIX/Linux,
--including OS-X), the default is the value of the system environment
-+including OS\-X), the default is the value of the system environment
- variable TMPDIR if it exists, otherwise "/tmp".
--.TP
-+.TP 
- .B $view ["default"]
- Which kind of file is to be previewed if a previewer is used.  The
- possible values are "default", "dvi", "ps", "pdf".  The value 
- of "default" means that the "highest" of the kinds of file generated is
- to be used (among dvi, ps and pdf).
- 
--.SH CUSTOM DEPENDENCIES
--.PP
-+.SH "CUSTOM DEPENDENCIES"
-+.PP 
- In any RC file a set of custom dependencies can be set up to convert a
- file with one extension to a file with another.  An example use of this
--would be to allow \fIlatexmk\fR to convert a \fI.fig\fR file to
-+would be to allow \fIlatexmk\fR to convert a \fI.fi g\fR file to
- \fI.eps\fR to be included in the \fI.tex\fR file.  
- 
- The old method of configuring \fIlatexmk\fR was to directly manipulate
-@@ -1255,35 +1255,35 @@
- 
- The custom dependency is a list of rules, each of which is specified
- as follow:
--.TP
-+.TP 
- .B from extension:
- The extension of the file we are converting from (e.g. "fig").
- It is specified without a period.
--.TP
-+.TP 
- .B to extension:
- The extension of the file we are converting to (e.g. "eps").
- It is specified without a period.
--.TP
-+.TP 
- .B must:
--If non-zero, the file from which we are converting \fBmust\fR exist, if it
-+If non\-zero, the file from which we are converting \fBmust\fR exist, if it
- doesn't exist \fIlatexmk\fR will give an error message and exit unless
--the \fB-f\fR option is specified.  If \fImust\fR is zero and the file
-+the \fB\-f\fR option is specified.  If \fImust\fR is zero and the file
- we are converting from doesn't exist, then no action is taken.
--.TP
-+.TP 
- .B function:
- The name of the subroutine that \fIlatexmk\fR should call to perform the
- file conversion.  The first argument to the subroutine is the base name
- of the file to be converted without any extension.  The subroutines are
- declared in the syntax of \fIPerl\fR.  The function should return 0 if
- it was successful and a nonzero number if it failed.
--.PP
-+.PP 
- It is invoked whenever \fIlatexmk\fR detects that a run of
- latex/pdflatex needs to read a file, like a graphics file, whose
--extension is the to-extension of a custom dependency.  Then
-+extension is the to\-extension of a custom dependency.  Then
- \fIlatexmk\fR examines whether a file exists with the same name, but
--with the corresponding from-extension, as specified in the
--custom-dependency rule.  If it does, then whenever the destination
--file (the one with the to-extension) is out-of-date with respect to
-+with the corresponding from\-extension, as specified in the
-+custom\-dependency rule.  If it does, then whenever the destination
-+file (the one with the to\-extension) is out\-of\-date with respect to
- the corresponding source file.
- 
- To make the new destination file, the \fIPerl\fR subroutine specified in the
-@@ -1293,7 +1293,7 @@
- even by those without knowledge of the \fIPerl\fR programming language.  Of
- course, experts could do something much more elaborate.
- 
--One other item in each custom-dependency rule labelled "must" above
-+One other item in each custom\-dependency rule labelled "must" above
- specifies how the rule should be applied when the source file fails to
- exist.
- 
-@@ -1301,19 +1301,19 @@
- 
-     add_cus_dep( 'fig', 'eps', 0, 'fig2eps' );
-     sub fig2eps {
--        system("fig2dev -Leps $_[0].fig $_[0].eps"); 
-+        system("fig2dev \-Leps $_[0].fi g $_[0].eps"); 
-     }
- 
- The first line adds a custom dependency that converts a file with
- extension "fig", as created by the xfig program, to an encapsulated
- postscript file, with extension "eps".  The remaining lines define a
- subroutine that carries out the conversion.  If a rule for converting
--"fig" to "eps" files already exists (e.g., from a previously read-in
-+"fig" to "eps" files already exists (e.g., from a previously read\-in
- initialization file), the \fIlatexmk\fR will delete this rule before
- making the new one.
- 
- Suppose \fIlatexmk\fR is using this rule to convert a file
--"figure.fig" to "figure.eps".  Then it will invoke the fig2eps
-+"figure.fi g" to "figure.eps".  Then it will invoke the fig2eps
- subroutine defined in the above code with a single argument "figure",
- which is the basename of each of the files (possibly with a path
- component).  This argument is referred to by \fIPerl\fR as $_[0].  In
-@@ -1322,7 +1322,7 @@
- are a \fIPerl\fR idiom that signify that each string of the form of a
- variable name, $_[0] in this case, is to be substituted by its value.
- 
--If the return value of the subroutine is non-zero, then \fIlatexmk\fR
-+If the return value of the subroutine is non\-zero, then \fIlatexmk\fR
- will assume an error occurred during the execution of the subroutine.
- In the above example, no explicit return value is given, and instead
- the return value is the value returned by the last (and only)
-@@ -1336,7 +1336,7 @@
- 
-     add_cus_dep( 'fig', 'eps', 0, 'fig2eps' );
-     sub fig2eps {
--        system("fig2dev -Lps '$_[0].fig' '$_[0].eps'");
-+        system("fig2dev \-Lps '$_[0].fi g' '$_[0].eps'");
-     }
- 
- This causes the invocation of the \fIfig2dev\fR program to have quoted
-@@ -1352,7 +1352,7 @@
- 
-     add_cus_dep( 'fig', 'pdf, 0, 'fig2pdf' );
-     sub fig2pdf {
--        system("fig2dev -Lpdf $_[0].fig $_[0].pdf"); 
-+        system("fig2dev \-Lpdf $_[0].fi g $_[0].pdf"); 
-     }
- 
- If you have some general custom dependencies defined in the system or
-@@ -1371,8 +1371,8 @@
- in an initialization file. 
- 
- Another example of a custom dependency overcomes a limitation of
--\fIlatexmk\fR concerning index files.  The only index-file conversion
--built-in to \fIlatexmk\fR is from an ".idx" file written on one run of
-+\fIlatexmk\fR concerning index files.  The only index\-file conversion
-+built\-in to \fIlatexmk\fR is from an ".idx" file written on one run of
- latex/pdflatex to an ".ind" file to be read in on a subsequent run.
- But with the index.sty package you can create extra indexes with
- extensions that you configure.  \fILatexmk\fR does not know how to
-@@ -1385,7 +1385,7 @@
- 
-     add_cus_dep('ndx', 'nnd', 0, 'makendx2nnd');
-     sub makendx2nnd {
--        system("makeindex -o $_[0].nnd $_[0].ndx");
-+        system("makeindex \-o $_[0].nnd $_[0].ndx");
-     }
- 
- (You will need to modify this code if you use filenames
-@@ -1394,7 +1394,7 @@
- Those of you with experience with Makefiles, will undoubtedly be
- concerned that the \fI.ndx\fR file is written during a run of
- latex/pdflatex and is always later than the \fI.nnd\fR last read in.
--Thus the \fI.nnd\fR appears to be perpetually out-of-date.  This
-+Thus the \fI.nnd\fR appears to be perpetually out\-of\-date.  This
- situation, of circular dependencies, is endemic to latex, and
- \fIlatexmk\fR in its current version works correctly with circular
- dependencies.  It examines the contents of the files (by use of an md5
-@@ -1408,32 +1408,32 @@
- 
- Glossaries can be dealt with similarly.
- 
--.SH OLD METHOD OF DEFINING CUSTOM DEPENDENCIES
-+.SH "OLD METHOD OF DEFINING CUSTOM DEPENDENCIES"
- In previous versions of \fIlatexmk\fR, the only method of defining
- custom dependencies was to directly manipulate the table of custom
- dependencies.  This is contained in the \fB at cus_dep_list\fR array.  It
- is an array of strings, and each string in the array has four items in
--it, each separated by a space, the from-extension, the to-extension,
-+it, each separated by a space, the from\-extension, the to\-extension,
- the "must" item, and the name of the subroutine for the custom
- dependency.  These were all defined above.
--.PP
-+.PP 
- An example of the old method of defining custom dependencies is as
- follows. It is the code in an RC file to ensure automatic conversion
--of \fI.fig\fR files to \fI.eps\fR files:
-+of \fI.fi g\fR files to \fI.eps\fR files:
- 
-     push @cus_dep_list, "fig eps 0 fig2eps";
-     sub fig2eps {
--        system("fig2dev -Lps $_[0].fig $_[0].eps");
-+        system("fig2dev \-Lps $_[0].fi g $_[0].eps");
-     }
- 
- This method still works, and is equivalent to the earlier code using
- the add_cus_dep subroutine, except that it doesn't delete any previous
--custom-dependency for the same conversion.  So the new method is
-+custom\-dependency for the same conversion.  So the new method is
- preferable.
- 
--.SH SEE ALSO
-+.SH "SEE ALSO"
- latex(1), bibtex(1).
--.SH BUGS
-+.SH "BUGS"
- Sometimes a viewer (gv) tries to read an updated .ps or .pdf file
- after its creation is started but before the file is complete.  Work
- around: manually refresh (or reopen) display.  Or use one of the other
-@@ -1445,31 +1445,31 @@
- Gv on UNIX/LINUX works for both postscript and pdf.
- Ghostview on UNIX/LINUX needs a manual update (reopen); it views
- postscript and pdf. 
--Gsview under MS-Windows works for both postscript and pdf, 
-+Gsview under MS\-Windows works for both postscript and pdf, 
- but only reads the updated file when its screen is refreshed.
- Acroread under UNIX/LINUX views pdf, but the file needs to be closed
- and reopened to view an updated version.
--Under MS-Windows, acroread locks its input file and so the
-+Under MS\-Windows, acroread locks its input file and so the
- pdf file cannot be updated.  (Remedy: configure \fIlatexmk\fR to use gsview
- instead.) 
--.SH THANKS TO
-+.SH "THANKS TO"
- Authors of previous versions.  Many users with their feedback, and
- especially 
- David Coppit (username david at node coppit.org) who made many useful
- suggestions that contributed to version 3, and Herbert Schulz.
- (Please note that the
--e-mail addresses are not written in their standard form to avoid being
-+e\-mail addresses are not written in their standard form to avoid being
- harvested by worms and viruses.)
--.SH AUTHOR
-+.SH "AUTHOR"
- Current version, by John Collins (username collins at node phys.psu.edu).
- (Version 4.03).
- 
- Released version can be obtained from CTAN:
--<http://www.tug.org/tex-archive/support/latexmk/>, and from the
-+<http://www.tug.org/tex\-archive/support/latexmk/>, and from the
- author's website <http://www.phys.psu.edu/~collins/software/latexmk/>.
--.br
-+.br 
- Modifications and enhancements by Evan McLean (Version 2.0)
--.br
-+.br 
- Original script called "go" by David J. Musliner (RCS Version 3.2)
- 
- \"  LocalWords:  fR fIlatexmk dvi ps fILatexmk pdflatex bibtex makeindex fB pv
-diff -dur latexmk-4.03.ORIG/latexmk.pl latexmk-4.03/latexmk.pl
---- latexmk-4.03.ORIG/latexmk.pl	2008-12-22 15:49:28.000000000 -0700
-+++ latexmk-4.03/latexmk.pl	2009-01-06 17:16:31.000000000 -0700
-@@ -689,10 +689,8 @@
+--- latexmk.pl.ORIG	2009-04-10 15:49:17.000000000 -0600
++++ latexmk.pl	2009-04-13 14:55:40.000000000 -0600
+@@ -725,10 +725,8 @@
      ## /usr/local/share, depending on the local conventions.
      ## /usr/local/lib/latexmk/LatexMk is put in the list for
      ## compatibility with older versions of latexmk.
@@ -1747,8 +18,8 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora change: only look in /etc
-+    @rc_system_files = ( '/etc/latexmk.conf' );
++	## Fedora change: only look in /etc
++	@rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path
  


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/latexmk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- latexmk.spec	7 Jan 2009 00:22:04 -0000	1.8
+++ latexmk.spec	13 Apr 2009 21:02:59 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.03
+Version:        4.05
 Release:        1%{?dist}
 Summary:        A make-like utility for LaTeX files
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.phys.psu.edu/~collins/software/latexmk-jcc/
-Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-403.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-405.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -17,7 +17,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       texlive, texlive-latex, ghostscript, xdg-utils
+Requires:       tex(latex), ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q -c
-%patch0 -p1
+%patch0
 cp %{SOURCE2} README.fedora
 
 %build
@@ -58,6 +58,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Mon Apr 13 2009 Jerry James <loganjerry at gmail.com> - 4.05-1
+- Update to 4.05 to correct problems when running latex and pdflatex on the
+  same source file.
+
 * Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 4.03-1
 - Update to 4.03 to fix log file parsing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Jan 2009 00:22:04 -0000	1.7
+++ sources	13 Apr 2009 21:02:59 -0000	1.8
@@ -1 +1 @@
-7925dadf697d1832f225d04e4ce445c2  latexmk-403.zip
+cdc9957ac69120310c0b2527e9ed6a23  latexmk-405.zip



From jjames at fedoraproject.org  Mon Apr 13 21:03:30 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 13 Apr 2009 21:03:30 +0000 (UTC)
Subject: rpms/latexmk/devel .cvsignore, 1.7, 1.8 latexmk-conf.patch, 1.6,
	1.7 latexmk.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090413210330.C9F7970137@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31388/devel

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.spec sources 
Log Message:
* Mon Apr 13 2009 Jerry James <loganjerry at gmail.com> - 4.05-1
- Update to 4.05 to correct problems when running latex and pdflatex on the
  same source file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jan 2009 00:22:04 -0000	1.7
+++ .cvsignore	13 Apr 2009 21:03:00 -0000	1.8
@@ -1 +1 @@
-latexmk-403.zip
+latexmk-405.zip

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-conf.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- latexmk-conf.patch	7 Jan 2009 00:22:04 -0000	1.6
+++ latexmk-conf.patch	13 Apr 2009 21:03:00 -0000	1.7
@@ -1,1745 +1,16 @@
-diff -dur latexmk-4.03.ORIG/latexmk.1 latexmk-4.03/latexmk.1
---- latexmk-4.03.ORIG/latexmk.1	2008-12-22 15:49:44.000000000 -0700
-+++ latexmk-4.03/latexmk.1	2009-01-06 17:17:34.000000000 -0700
-@@ -1,9 +1,9 @@
--.TH LATEXMK 1L "22 December 2008" ""
--.SH NAME
-+.TH "LATEXMK" "1L" "22 December 2008" "" ""
-+.SH "NAME"
- latexmk \- generate LaTeX document
--.SH SYNOPSIS
-+.SH "SYNOPSIS"
- .B latexmk [options] [file ...] 
--.SH DESCRIPTION
-+.SH "DESCRIPTION"
- .I Latexmk
- completely automates the process of compiling a LaTeX document.
- Essentially, it is like a specialized relative of the general
-@@ -13,12 +13,12 @@
- source file for a document, and it issues the appropriate sequence of
- commands to generate a .dvi, .ps, .pdf and/or hardcopy version of the
- document.  
--.PP
-+.PP 
- \fILatexmk\fR can also be set to run continuously with a suitable
- previewer.  In that case the LaTeX program, etc, are rerun whenever
- one of the source files is modified, and the previewer automatically
--updates the on-screen view of the compiled document.
--.PP
-+updates the on\-screen view of the compiled document.
-+.PP 
- \fILatexmk\fR determines which are the source files by examining the
- log file.  When \fIlatexmk\fR is run, it examines properties of the
- source files, and if any have been changed since the last document
-@@ -32,14 +32,14 @@
- For example, from an updated figure file it can automatically generate
- a file in encapsulated postscript or another suitable format for
- reading by LaTeX.
--.PP
-+.PP 
- \fILatexmk\fR has two different previewing options.  In the simple
--\fB-pv\fR option, a dvi, postscript or pdf previewer is automatically
-+\fB\-pv\fR option, a dvi, postscript or pdf previewer is automatically
- run after generating the dvi, postscript or pdf version of the
- document.  The type of file to view is selected according to
- configuration settings and command line options.
--.PP
--The second previewing option is the powerful \fB-pvc\fR option
-+.PP 
-+The second previewing option is the powerful \fB\-pvc\fR option
- (mnemonic: "preview continuously").  In this case, \fIlatexmk\fR runs
- continuously, regularly monitoring all the source files to see if any
- have changed.  Every time a change is detected, \fIlatexmk\fR runs all
-@@ -49,31 +49,31 @@
- are written to disk, \fIlatexmk\fR completely automates the cycle of
- updating the .dvi (and possibly the .ps and .pdf) file, and refreshing
- the previewer's display.  It's not quite WYSIWYG, but usefully close.
--.PP
-+.PP 
- For other previewers, the user may have to manually make the previewer
- update its display, which can be (some versions of xdvi and gsview) as
- simple as forcing a redraw of its display.
--.PP
-+.PP 
- \fILatexmk\fR has the ability to print a banner in gray diagonally
- across each page when making the postscript file.  It can also, if
- needed, call an external program to do other postprocessing on the
- generated files.
--.PP
-+.PP 
- \fILatexmk\fR is highly configurable, both from the command line and
- in configuration files, so that it can accommodate a wide variety of
- user needs and system configurations.  Default values are set
- according to the operating system, so \fIlatexmk\fR often works 
--without special configuration on MS-Windows, cygwin, Linux, OS-X, and
-+without special configuration on MS\-Windows, cygwin, Linux, OS\-X, and
- other UNIX systems (notably Solaris).
--.PP
-+.PP 
- A very annoying complication handled very reliably by \fILatexmk\fR,
- is that LaTeX is a multiple pass system.  On each run, LaTeX reads in
- information generated on a previous run, for things like cross
- referencing and indexing.  In the simplest cases, a second run of
- LaTeX suffices, and often the log file contains a message about the
--need for another pass.  However, there is a wide variety of add-on
-+need for another pass.  However, there is a wide variety of add\-on
- macro packages to LaTeX, with a variety of behaviors.  The result is
--to break simple-minded determinations of how many runs are needed and
-+to break simple\-minded determinations of how many runs are needed and
- of which programs.  In its new version, \fIlatexmk\fR has a highly
- general and efficient solution to these issues.  The solution involves
- retaining between runs information on the source files, and a symptom
-@@ -81,10 +81,10 @@
- \fR.fdb_latexmk\fR, by default) that contains the source file
- information.
- 
--.SH LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE
--(All options can be introduced by single or double "-" characters,
--e.g., "latexmk -help" or "latexmk --help".)
--.TP
-+.SH "LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE"
-+(All options can be introduced by single or double "\-" characters,
-+e.g., "latexmk \-help" or "latexmk \-\-help".)
-+.TP 
- .B file
- One or more files can be specified.  If no files are specified,
- \fIlatexmk\fR will, by default, run on all files in the current working directory
-@@ -92,39 +92,39 @@
- description concerning the \fI at default_files\fR variable in the
- section "List of configuration variables usable in initialization
- files". 
--.PP
-+.PP 
- If a file is specified without an extension, then the ".tex" extension
- is automatically added, just as LaTeX does.  Thus, if you specify:
- 
- 	latexmk foo
- 
- then \fIlatexmk\fR will operate on the file "foo.tex".  
--.TP
--.B -bm <message>
-+.TP 
-+.B \-bm <message>
- A banner message to print diagonally across each page when converting
- the dvi file to postscript.  The message must be a single argument on
- the command line so be careful with quoting spaces and such.
- 
--Note that if the \fB-bm\fR option is specified, the \fB-ps\fR option is
-+Note that if the \fB\-bm\fR option is specified, the \fB\-ps\fR option is
- assumed.
--.TP
--.B -bi <intensity>
-+.TP 
-+.B \-bi <intensity>
- How dark to print the banner message.  A decimal number between 0 and 1.
- 0 is black and 1 is white.  The default is 0.95, which is OK unless your
- toner cartridge is getting low.
--.TP
--.B -bs <scale>
-+.TP 
-+.B \-bs <scale>
- A decimal number that specifies how large the banner message will be
- printed.  Experimentation is necessary to get the right scale for your
- message, as a rule of thumb the scale should be about equal to 1100
- divided by the number of characters in the message.  The default is 220.0
- which is just right for 5 character messages.
- .TP 
--.B -commands
-+.B \-commands
- List the commands used by \fIlatexmk\fR for processing files, and then
- exit. 
- .TP 
--.B -c
-+.B \-c
- Clean up (remove) all regeneratable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  These files are a
- combination of log files, aux files, latexmk's database file of source
-@@ -134,43 +134,43 @@
- files with extensions by the \fI$clean_ext\fR configuration variable are
- removed.  
- 
--This cleanup is instead of a regular make.  See the \fB-gg\fR option
-+This cleanup is instead of a regular make.  See the \fB\-gg\fR option
- if you want to do a cleanup then a make.
- .TP 
--.B -C
-+.B \-C
- Clean up (remove) all regeneratable files generated by \fIlatex\fR and
--\fIbibtex\fR.  This is the same as the \fB-c\fR option with the
-+\fIbibtex\fR.  This is the same as the \fB\-c\fR option with the
- addition of dvi, postscript and pdf files, and those with extensions
- in the \fI$clean_full_ext\fR configuration variable.
- 
--This cleanup is instead of a regular make.  See the \fB-gg\fR option
-+This cleanup is instead of a regular make.  See the \fB\-gg\fR option
- if you want to do a cleanup than a make.
- .TP 
--.B -CA
-+.B \-CA
- Clean up (remove) absolutely all regeneratable files.  It is now
--equivalent to the \fB-C\fR option
-+equivalent to the \fB\-C\fR option
- 
- This cleanup is instead of a regular make.  
--See the \fB-gg\fR option if you want to do a cleanup then a
-+See the \fB\-gg\fR option if you want to do a cleanup then a
- make.
- .TP 
--.B -CF
-+.B \-CF
- Remove the file containing the database of source file information,
- before doing the other actions requested.
- .TP 
--.B -d
-+.B \-d
- Set draft mode.  This prints the banner message "DRAFT" across your
- page when converting the dvi file to postscript.  Size and intensity
--can be modified with the \fB-bs\fR and \fB-bi\fR options.  The \fB-bm\fR
-+can be modified with the \fB\-bs\fR and \fB\-bi\fR options.  The \fB\-bm\fR
- option will override this option as this is really just a short way of
- specifying:
- 
--	latexmk -bm DRAFT
-+	latexmk \-bm DRAFT
- 
--Note that if the \fB-d\fR option is specified, the \fB-ps\fR option is
-+Note that if the \fB\-d\fR option is specified, the \fB\-ps\fR option is
- assumed.
--.TP
--.B -dF
-+.TP 
-+.B \-dF
- Dvi file filtering.  The argument to this option is a filter which will
- generate a filtered dvi file with the extension ".dviF".  All extra
- processing (e.g. conversion to postscript, preview, printing) will then
-@@ -178,150 +178,150 @@
- 
- Example usage: To use dviselect to select only the even pages of the dvi file:
- 
--	latexmk -dF 'dviselect even' foo.tex
--.TP
--.B -diagnostics
-+	latexmk \-dF 'dviselect even' foo.tex
-+.TP 
-+.B \-diagnostics
- Print detailed diagnostics during a run.  This may help for debugging
- problems or to understand \fI.latexmk\fR's behavior in difficult
- situations. 
--.TP
--.B -dvi
-+.TP 
-+.B \-dvi
- Generate dvi version of document.
--.TP
--.B -dvi-
-+.TP 
-+.B \-dvi\-
- Turn off generation of dvi version of document.  (This may get
- overridden, if some other file is made (e.g., a .ps file) that is
- generated from the dvi file, or if no generated file at all is
- requested.) 
--.TP
--.B -e <code>
-+.TP 
-+.B \-e <code>
- Execute the specified initialization code before processing.  The code
- is \fIPerl\fR code of the same form as is used in \fIlatexmk\fR's
--initialization files -- for more details, see the information on the
--\fB-r\fR option, and the section about "Configuration/initialization
-+initialization files \-\- for more details, see the information on the
-+\fB\-r\fR option, and the section about "Configuration/initialization
- (RC) files".  The code is typically a sequence of assignment
- statements separated by semicolons.
- 
--The code is executed when the \fB-e\fR option is encountered during
--\fIlatexmk\fR's parsing of its command line.  See the \fB-r\fR option
-+The code is executed when the \fB\-e\fR option is encountered during
-+\fIlatexmk\fR's parsing of its command line.  See the \fB\-r\fR option
- for a way of executing initialization code from a file.  An error
--results in \fIlatexmk\fR stopping.  Multiple instances of the \fB-r\fR
--and \fB-e\fR options can be used, and they are executed in the order
-+results in \fIlatexmk\fR stopping.  Multiple instances of the \fB\-r\fR
-+and \fB\-e\fR options can be used, and they are executed in the order
- they appear on the command line.
- 
- Some care is needed to deal with proper quoting of special characters
- in the code on the command line.  For example, suppose it is desired
--to set the latex command to use its -shell-escape option, then under
-+to set the latex command to use its \-shell\-escape option, then under
- UNIX/LINUX you could use the line
- 
--	latexmk -e '$latex=q/latex %O -shell-escape %S/' file.tex
-+	latexmk \-e '$latex=q/latex %O \-shell\-escape %S/' file.tex
- 
- (Note that the q/.../ construct is a \fIPerl\fR idiom equivalent to using
- single quotes.  This is easier than arranging to get a quote character
- correctly escaped in a way that is independent of the shell and the
--operating-system.)
--.TP
--.B -f
-+operating\-system.)
-+.TP 
-+.B \-f
- Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that LaTeX or another program has
- found an error which will not be resolved by further processing, no
- further processing is carried out.
--.TP
--.B -f-
--Turn off the forced processing-past-errors such as is set by the
--\fB-f\fR option.  This could be used to override a setting in a
-+.TP 
-+.B \-f\-
-+Turn off the forced processing\-past\-errors such as is set by the
-+\fB\-f\fR option.  This could be used to override a setting in a
- configuration file.
--.TP
--.B -g
-+.TP 
-+.B \-g
- Force \fIlatexmk\fR to process document fully, even under situations
- where \fIlatexmk\fR would normally decide that no changes in the
- source files have occurred since the previous run. 
- This option is useful, for example, if you change some options and
- wish to reprocess the files.
--.TP
--.B -g-
--Turn off \fB-g\fR.
--.TP
--.B -gg
-+.TP 
-+.B \-g\-
-+Turn off \fB\-g\fR.
-+.TP 
-+.B \-gg
- "Super go mode" or "clean make": clean out generated files as if
--\fB-CA\fR had been given, and then do a regular make.
--.TP
--.B -h, -help
-+\fB\-CA\fR had been given, and then do a regular make.
-+.TP 
-+.B \-h, \-help
- Print help information.
--.TP
--.B -l
-+.TP 
-+.B \-l
- Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.  This option is not normally needed
- nowadays, since current previewers normally determine this information
- automatically. 
--.TP
--.B -l-
--Turn off \fB-l\fR.
--.TP
--.B -new-viewer
--When in continuous-preview mode, always start a new viewer to view the
--generated file.  By default, \fIlatexmk\fR will, in continuous-preview
-+.TP 
-+.B \-l\-
-+Turn off \fB\-l\fR.
-+.TP 
-+.B \-new\-viewer
-+When in continuous\-preview mode, always start a new viewer to view the
-+generated file.  By default, \fIlatexmk\fR will, in continuous\-preview
- mode, test for a previously running previewer for the same file and
- not start a new one if a previous previewer is running.  However, its
--test sometimes fails (notably if there is an already-running previewer
-+test sometimes fails (notably if there is an already\-running previewer
- that is viewing a file of the same name as the current file, but in a
- different directory).  This option turns off the default behavior.
--.TP
--.B -new-viewer-
--The inverse of the \fB-new-viewer\fR option.  It puts \fIlatexmk\fR
--in its normal behavior that in preview-continuous mode it checks for
--an already-running previewer.  
--.TP
--.B -p
-+.TP 
-+.B \-new\-viewer\-
-+The inverse of the \fB\-new\-viewer\fR option.  It puts \fIlatexmk\fR
-+in its normal behavior that in preview\-continuous mode it checks for
-+an already\-running previewer.  
-+.TP 
-+.B \-p
- Print out the document.  By default it is
- the generated postscript file that is printed.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you
-+\fB\-print=...\fR option to print the dvi or pdf files instead, and you
- can configure this in a start up file (by setting the
- \fI$print_type\fR variable).  
- 
- However, printing is enabled by default only under UNIX/LINUX systems,
- where the default is to use the lpr command.  In general, the correct
- behavior for printing very much depends on your system's software.  In
--particular, under MS-Windows you must have suitable program(s)
-+particular, under MS\-Windows you must have suitable program(s)
- available, and you must have configured the print commands used by
--\fIlatexmk\fR.  This can be non-trivial.  See the documentation on the
-+\fIlatexmk\fR.  This can be non\-trivial.  See the documentation on the
- \fI$lpr\fR, \fI$lpr_dvi\fR, and \fI$lpr_pdf\fR configuration variables
- to see how to set the commands for printing.
- 
--This option is incompatible with the \fB-pv\fR and \fB-pvc\fR options,
-+This option is incompatible with the \fB\-pv\fR and \fB\-pvc\fR options,
- so it turns them off. 
--.TP
--.B -pdf
-+.TP 
-+.B \-pdf
- Generate pdf version of document using pdflatex.
--.TP
--.B -pdfdvi
-+.TP 
-+.B \-pdfdvi
- Generate pdf version of document from the dvi file, by default using dvipdf.
--.TP
--.B -pdfps
-+.TP 
-+.B \-pdfps
- Generate pdf version of document from the ps file, by default using
- ps2pdf. 
--.TP
--.B -pdf-
-+.TP 
-+.B \-pdf\-
- Turn off generation of pdf version of document.  
- (This can be used to override a setting in a configuration file.
- It may get overridden if some other option requires the generation of
- a pdf file.)
--.TP
--.B -print=dvi, -print=ps, -print=pdf
-+.TP 
-+.B \-print=dvi, \-print=ps, \-print=pdf
- Define which kind of file is printed.  This option also ensures that
- the requisite file is made, and turns on printing.  The default is to
- print a postscript file.
--.TP
--.B -ps
-+.TP 
-+.B \-ps
- Generate postscript version of document.
--.TP
--.B -ps-
-+.TP 
-+.B \-ps\-
- Turn off generation of postscript version of document.
- This can be used to override a setting in a configuration file.
- (It may get overridden by some other option that requires a postscript
- file, for example a request for printing.)
--.TP
--.B -pF
-+.TP 
-+.B \-pF
- Postscript file filtering.  The argument to this option is a filter
- which will generate a filtered postscript file with the extension
- ".psF".  All extra processing (e.g. preview, printing) will then be
-@@ -329,52 +329,52 @@
- 
- Example of usage: Use psnup to print two pages on the one page:
- 
--	latexmk -ps -pF 'psnup -2' foo.tex
-+	latexmk \-ps \-pF 'psnup \-2' foo.tex
- 
- or
- 
--	latexmk -ps -pF "psnup -2" foo.tex
-+	latexmk \-ps \-pF "psnup \-2" foo.tex
- 
--Whether to use single or double quotes round the "psnup -2" will
-+Whether to use single or double quotes round the "psnup \-2" will
- depend on your command interpreter, as used by the particular version
- of perl and the operating system on your computer.
--.TP
--.B -pv
--Run file previewer.  If the \fB-view\fR option is used, this will select
-+.TP 
-+.B \-pv
-+Run file previewer.  If the \fB\-view\fR option is used, this will select
- the kind of file to be previewed (dvi, ps or pdf).
- Otherwise the viewer views the "highest" kind of file selected, by the
--\fB-dvi\fR, \fB-ps\fR, \fB-pdf\fR, \fB-pdfps\fR options, in the
-+\fB\-dvi\fR, \fB\-ps\fR, \fB\-pdf\fR, \fB\-pdfps\fR options, in the
- order dvi, ps, pdf (low to high).
- If no file type has been selected, the dvi previewer will be used.
--This option is incompatible with the \fB-p\fR and \fB-pvc\fR options,
-+This option is incompatible with the \fB\-p\fR and \fB\-pvc\fR options,
- so it turns them off.
--.TP
--.B -pv-
--Turn off \fB-pv\fR.
--.TP
--.B -pvc
-+.TP 
-+.B \-pv\-
-+Turn off \fB\-pv\fR.
-+.TP 
-+.B \-pvc
- Run a file previewer and continually update the .dvi, .ps, and/or .pdf
- files whenever changes are made to source files (see the Description
- above).  Which of these files is generated and which is viewed is
--governed by the other options, and is the same as for the \fB-pv\fR
-+governed by the other options, and is the same as for the \fB\-pv\fR
- option. 
--The preview-continuous option \fB-pvc\fR can only work with one file.
-+The preview\-continuous option \fB\-pvc\fR can only work with one file.
- So in this case you will normally only specify one filename on
- the command line.  It is also incompatible with the 
--\fB-p\fR and \fB-pv\fR options, so it turns these options off
-+\fB\-p\fR and \fB\-pv\fR options, so it turns these options off
- 
- With a good previewer the display will be automatically updated.
--(Under \fIsome but not all\fR versions of UNIX/Linux "gv -watch" does
-+(Under \fIsome but not all\fR versions of UNIX/Linux "gv \-watch" does
- this for postscript files; this can be set by a configuration
- variable.  This would also work for pdf files except for an apparent
- bug in gv that causes an error when the newly updated pdf file is
- read.)  Many other previewers will need a manual update.
- 
--Important note: the acroread program on MS-Windows locks the pdf file,
-+Important note: the acroread program on MS\-Windows locks the pdf file,
- and prevents new versions being written, so it is a bad idea to use
--acroread to view pdf files in preview-continuous mode.  It is better
--to use a dvi or ps viewer, as set by one of the \fB-view=dvi\fR and
--\fB-view=ps\fR options.
-+acroread to view pdf files in preview\-continuous mode.  It is better
-+to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
-+\fB\-view=ps\fR options.
- 
- There are some other methods for arranging an update, notably useful
- for many versions of xdvi and xpdf.  These are best set in
-@@ -382,26 +382,26 @@
- 
- Note that if \fIlatexmk\fR dies or is stopped by the user, the
- "forked" previewer will continue to run.  Successive invocations with
--the \fB-pvc\fR option will not fork new previewers, but \fIlatexmk\fR
-+the \fB\-pvc\fR option will not fork new previewers, but \fIlatexmk\fR
- will normally use the existing previewer.  (At least this will happen
- when \fIlatexmk\fR is running under an operating system where it knows
- how to determine whether an existing previewer is running.)
--.TP
--.B -pvc-
--Turn off \fB-pvc\fR.
--.TP
--.B -quiet
--Same as -silent
--.TP
--.B -r <rcfile>
-+.TP 
-+.B \-pvc\-
-+Turn off \fB\-pvc\fR.
-+.TP 
-+.B \-quiet
-+Same as \-silent
-+.TP 
-+.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.
- 
--Be careful about the ordering: (1) Standard initialization files --
--see the section below on "Configuration/initialization (RC) files" --
-+Be careful about the ordering: (1) Standard initialization files \-\-
-+see the section below on "Configuration/initialization (RC) files" \-\-
- are read first.  (2) Then the options on the command line are acted on
- in the order they are given.  Therefore if an initialization file is
--specified by the \fB-r\fR option, it is read during this second step.
--Thus an initialization file specified with the \fB-r\fR option can
-+specified by the \fB\-r\fR option, it is read during this second step.
-+Thus an initialization file specified with the \fB\-r\fR option can
- override both the standard initialization files and \fIpreviously\fR
- specified options.  But all of these can be overridden by \fIlater\fR
- options.
-@@ -409,48 +409,48 @@
- The contents of the RC file just comprise a piece of code in the
- \fIPerl\fR programming language
- (typically a sequence of assignment statements); they are executed
--when the \fB-r\fR option is encountered during \fIlatexmk\fR's parsing
--of its command line.  See the \fB-e\fR option for a way of giving
-+when the \fB\-r\fR option is encountered during \fIlatexmk\fR's parsing
-+of its command line.  See the \fB\-e\fR option for a way of giving
- initialization code directly on \fIlatexmk\fR's command line.  An
- error results in \fIlatexmk\fR stopping.  Multiple instances of the
--\fB-r\fR and \fB-e\fR options can be used, and they are executed in
-+\fB\-r\fR and \fB\-e\fR options can be used, and they are executed in
- the order they appear on the command line.
--.TP
--.B -silent
-+.TP 
-+.B \-silent
- Run commands silently, i.e., with options that reduce the amount of
- diagnostics generated.  For example, with the default settings for
--commands under UNIX, the command "latex -interaction=batchmode" is used
-+commands under UNIX, the command "latex \-interaction=batchmode" is used
- for latex.
- 
- Also reduce the number of informational messages that \fIlatexmk\fR
- generates. 
--.TP
--.B -v, -version
-+.TP 
-+.B \-v, \-version
- Print version number of \fIlatexmk\fR.
--.TP
--.B -verbose
--Opposite of \fB-silent\fR.  This is the default setting.
--.TP
--.B -view=default, -view=dvi, -view=ps, -view=pdf
-+.TP 
-+.B \-verbose
-+Opposite of \fB\-silent\fR.  This is the default setting.
-+.TP 
-+.B \-view=default, \-view=dvi, \-view=ps, \-view=pdf
- Set the kind of file used when previewing is requested (e.g., by the
--\fB-pv\fR or \fB-pvc\fR switches).  The default is to view the "highest"
-+\fB\-pv\fR or \fB\-pvc\fR switches).  The default is to view the "highest"
- kind of requested file (in the order dvi, ps, pdf).  
--.PP
--The preview-continuous option \fB-pvc\fR can only work with one file.
-+.PP 
-+The preview\-continuous option \fB\-pvc\fR can only work with one file.
- So in this case you will normally only specify one filename on
- the command line.  
--.PP
--Options \fB-p\fR, \fB-pv\fR and \fB-pvc\fR are mutually exclusive.  So
-+.PP 
-+Options \fB\-p\fR, \fB\-pv\fR and \fB\-pvc\fR are mutually exclusive.  So
- each of these options turns the others off.
- 
--.SH EXAMPLES
--.nf
-+.SH "EXAMPLES"
-+.nf 
- .ta 2i
- % \fBlatexmk thesis\fR		\fI# run latex enough times to resolve
--				cross-references\fR 
-+				cross\-references\fR 
- 
--% \fBlatexmk -pvc -ps thesis\fR	\fI# run latex enough times to resolve
--					cross-references, make a postscript
-+% \fBlatexmk \-pvc \-ps thesis\fR	\fI# run latex enough times to resolve
-+					cross\-references, make a postscript
- 					file, start a previewer.  Then
- 					watch for changes in the source
- 					file thesis.tex and any files it
-@@ -461,37 +461,38 @@
- 					keep running, watching for
- 					source file changes.
- 
--% \fBlatexmk -c\fR		\fI# remove .aux, .log, .bbl, .blg, .dvi, 
-+% \fBlatexmk \-c\fR		\fI# remove .aux, .log, .bbl, .blg, .dvi, 
- 					.pdf, .ps & .bbl files\fR
- 
- 
--.SH CONFIGURATION/INITIALIZATION (RC) FILES
--.PP
-+.SH "CONFIGURATION/INITIALIZATION (RC) FILES"
-+.PP 
- \fILatexmk\fR can be customized using initialization files, which are
- read at startup in the following order:
--.PP
-+.PP 
- 1) The system RC file, if it exists.  
-    On a UNIX system, \fIlatexmk\fR searches for following places for its
- system RC file, in the following order, and reads the first it finds:
+--- latexmk.1.ORIG	2009-04-10 15:49:52.000000000 -0600
++++ latexmk.1	2009-04-13 14:54:50.000000000 -0600
+@@ -479,6 +479,7 @@
     "/opt/local/share/latexmk/LatexMk",
     "/usr/local/share/latexmk/LatexMk",
     "/usr/local/lib/latexmk/LatexMk".
--   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
--.PP
 +   On a Fedora system, it only looks for "/etc/latexmk.conf".
-+   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
-+.PP 
+    On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
+ .PP
  2) The user's RC file, "$HOME/.latexmkrc", if it exists.  Here $HOME
- is the value of the environment variable HOME.  On UNIX and clones
--(including LINUX), this variable is set by the system; on MS-Windows,
-+(including LINUX), this variable is set by the system; on MS\-Windows,
- the user may choose to set it.
--.PP
-+.PP 
- 3) The RC file in the current working directory.  This file can be
- named either "latexmkrc" or ".latexmkrc", and the first of these to be
- found is used, if any.
--.PP
--4) Any RC file(s) specified on the command line with the \fB-r\fR option.
--.PP
-+.PP 
-+4) Any RC file(s) specified on the command line with the \fB\-r\fR option.
-+.PP 
- Each RC file is a sequence of \fIPerl\fR commands.  Naturally, a user can use
- this in creative ways.  But for most purposes, one simply uses a
--sequence of assignment statements that override some of the built-in
-+sequence of assignment statements that override some of the built\-in
- settings of \fILatexmk\fR.  Straightforward cases can be handled
- without knowledge of the \fIPerl\fR language by using the examples in this
- document as templates.  Comment lines are introduced by the "#"
-@@ -499,27 +500,27 @@
- 
- Note that command line options are obeyed in the order in which
- they are written; thus any RC file specified on the command line with
--the \fB-r\fR option can override previous options but can be itself
-+the \fB\-r\fR option can override previous options but can be itself
- overridden by later options on the command line.  There is also the
--\fB-e\fR option, which allows initialization code to be specified in
-+\fB\-e\fR option, which allows initialization code to be specified in
- \fIlatexmk\fR's command line.
- 
--.SH HOW TO SET VARIABLES IN INITIALIZATION FILES
--.PP
-+.SH "HOW TO SET VARIABLES IN INITIALIZATION FILES"
-+.PP 
- The important variables that can be configured are described in the
- section "List of configuration variables usable in initialization
- files".  Syntax for setting these variables is of the following forms:
--.PP
-+.PP 
- 	$bibtex = 'bibtex %O %B';
--.PP
-+.PP 
- for the setting of a string variable, 
--.PP
-+.PP 
- 	$preview_mode = 1;
--.PP
-+.PP 
- for the setting of a numeric variable, and
--.PP
-+.PP 
- 	@default_files = ('paper', 'paper1');
--.PP
-+.PP 
- for the setting of an array of strings.  It is possible to append an
- item to an array variable as follows:
- 
-@@ -534,8 +535,7 @@
- 
- 
- 
--.SH FORMAT OF COMMAND SPECIFICATIONS
--
-+.SH "FORMAT OF COMMAND SPECIFICATIONS"
- Some of the variables set the commands that \fIlatexmk\fR uses for
- carrying out its work, for example to generate a dvi file from a tex
- file or to view a postscript file.  This section describes some
-@@ -543,42 +543,42 @@
- 
- \fBPlaceholders\fR:  Supposed you wanted \fIlatexmk\fR to use the
- command elatex in place of the regular latex command, and suppose
--moreover that you wanted to give it the option "--shell-escape".  You
-+moreover that you wanted to give it the option "\-\-shell\-escape".  You
- could do this by the following setting:
--.PP
--     $latex = 'elatex --shell-escape %O %S';
--.PP
-+.PP 
-+     $latex = 'elatex \-\-shell\-escape %O %S';
-+.PP 
- The two items starting with the % character are placeholders.  These
- are substituted by appropriate values before the command is run.  Thus
- %S will be replaced by the source file that elatex will be applied to,
- and %O will be replaced by any options that \fIlatexmk\fR has decided
--to use for this command.  (E.g., if you used the -silent option it
--would replace %O by "-interaction=batchmode".)
-+to use for this command.  (E.g., if you used the \-silent option it
-+would replace %O by "\-interaction=batchmode".)
- 
- The available placeholders are:
--.TP
-+.TP 
- .B %B
- base of filename for current command.  E.g., if a postscript file
- document.ps is being made from the dvi file document.dvi, then the
- basename is document.
--.TP
-+.TP 
- .B %D
- destination file (e.g., the name of the postscript file when
- converting a dvi file to postscript).
--.TP
-+.TP 
- .B %O
- options
--.TP
-+.TP 
- .B %R
- root filename.  This is the base name for the main tex file.  
--.TP
-+.TP 
- .B %S
- source file (e.g., the name of the dvi file when converting a dvi file
- to ps).
--.TP
-+.TP 
- .B %T
- The name of the primary tex file.
--.PP
-+.PP 
- The distinction between %B and %R needs a bit of care, since they are
- often the same, but not always.  For example on a simple document, the
- basename of a bibtex run is the same as for the texfile.  But in a
-@@ -586,9 +586,9 @@
- a variety of names.  Since bibtex is invoked with the basename of the
- bibliography file, the setting for the bibtex command should therefore
- be 
--.PP
-+.PP 
-      $bibtex = 'bibtex %O %B';
--.PP
-+.PP 
- Generally, you should use %B rather than %R.  Similarly for most
- purposes, the name %T of the primary texfile is not a useful
- placeholder.
-@@ -610,9 +610,9 @@
- the previewer running and then returns to its next task (or exits if
- there is nothing else to do).  To achieve this effect of detaching a
- command, you need to precede the command name with "start ", as in
--.PP
-+.PP 
-      $dvi_previewer = 'start xdvi %O %S';
--.PP
-+.PP 
- This will be translated to whatever is appropriate for your operating
- system.
- 
-@@ -623,31 +623,31 @@
- start.  (3) If the word start occurs more than once at the beginning
- of the command string, that is equivalent to having just one.  (4)
- Under cygwin, some complications happen, since cygwin amounts to a
--complicated merging of UNIX and MS-Windows.  See the source code for
-+complicated merging of UNIX and MS\-Windows.  See the source code for
- how I've handled the problem.
- 
--\fBCommand names containing spaces\fR: Under MS-Windows it is common
-+\fBCommand names containing spaces\fR: Under MS\-Windows it is common
- that the name of a command includes spaces, since software is often
- installed in a subdirectory of "C:\Program Files".  Such command names
- should be enclosed in double quotes, as in
--.PP
-+.PP 
-      $lpr_pdf = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p %S';
--.PP
--\fBUsing MS-Windows file associations\fR: A useful trick under modern
--versions of MS-Windows (e.g., WinXP) is to use just the command
-+.PP 
-+\fBUsing MS\-Windows file associations\fR: A useful trick under modern
-+versions of MS\-Windows (e.g., WinXP) is to use just the command
- 'start' by itself:
--.PP
-+.PP 
-      $dvi_previewer = 'start %S';
--.PP
--Under recent versions of MS-Windows, this will cause to be run
-+.PP 
-+Under recent versions of MS\-Windows, this will cause to be run
- whatever program the system has associated with dvi files.  (The same
- applies for a postscript viewer and a pdf viewer.)  
- 
- \fBNot using a certain command\fR: If a command is not to be run, the
- command name NONE is used, as in
--.PP
-+.PP 
-      $lpr  = 'NONE lpr';
--.PP
-+.PP 
- This typically is used when an appropriate command does not exist on
- your system.  The string after the "NONE" is effectively a comment.
- 
-@@ -657,9 +657,9 @@
- Suppose you want \fIlatexmk\fR to use latex with source specials
- enabled.  Then you might use the following line in an initialization
- file:
--.PP
--     $latex = 'latex --src-specials %O %S';
--.PP
-+.PP 
-+     $latex = 'latex \-\-src\-specials %O %S';
-+.PP 
- 
- \fBAdvanced tricks\fR: Normally one specifies a single command for the
- commands invoked by \fIlatexmk\fR.  Naturally, if there is some
-@@ -673,45 +673,45 @@
- file from a tex file you need to run another program after pdflatex to
- perform some extra processing, you could do something like:
- 
--     $pdflatex = 'pdflatex --shell-escape %O %S; pst2pdf_for_latexmk %B';
-+     $pdflatex = 'pdflatex \-\-shell\-escape %O %S; pst2pdf_for_latexmk %B';
- 
--This definition assumes you are using a UNIX-like system, so that the
-+This definition assumes you are using a UNIX\-like system, so that the
- two commands to be run are separated by the semicolon in the middle of
- the string.  
- 
- 
--.SH LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES
--.PP
-+.SH "LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES"
-+.PP 
- Default values are indicated in brackets.
--.TP
-+.TP 
- .B $banner [0]
- If nonzero, the banner message is printed across each page when
- converting the dvi file to postscript.  Without modifying the variable
--\fI$banner_message\fR, this is equivalent to specifying the \fB-d\fR
-+\fI$banner_message\fR, this is equivalent to specifying the \fB\-d\fR
- option.
- 
- Note that if \fB$banner\fR is nonzero, the \fB$postscript_mode\fR is
- assumed and the postscript file is always generated, even if it is newer
- than the dvi file.
--.TP
-+.TP 
- .B $banner_intensity [0.95]
--Equivalent to the \fB-bi\fR option, this is a decimal number between 0
-+Equivalent to the \fB\-bi\fR option, this is a decimal number between 0
- and 1 that specifies how dark to print the banner message. 0 is black,
- 1 is white.  The default is just right if your toner cartridge isn't
- running too low.
--.TP
-+.TP 
- .B $banner_message ["DRAFT"]
- The banner message to print across each page when converting the dvi
--file to postscript.  This is equivalent to the \fB-bm\fR option.
--.TP
-+file to postscript.  This is equivalent to the \fB\-bm\fR option.
-+.TP 
- .B $banner_scale [220.0]
- A decimal number that specifies how large the banner message will be
- printed.  Experimentation is necessary to get the right scale for your
- message, as a rule of thumb the scale should be about equal to 1100
- divided by the number of characters in the message.  The Default is
- just right for 5 character messages.  This is equivalent to the
--\fB-bs\fR option.
--.TP
-+\fB\-bs\fR option.
-+.TP 
- .B @BIBINPUTS
- This is an array variable, now mostly obsolete, that specifies
- directories where 
-@@ -733,50 +733,50 @@
- two and the second two examples are equivalent.  Each backward slash
- should be doubled to avoid running afoul of \fIPerl\fR's rules for writing
- strings. 
--.PP
-+.PP 
- \fIImportant note:\fR This variable is now mostly obsolete in the
- current version of \fIlatexmk\fR, 
- since it has a better method of searching for files using the
- kpsewhich command.  However, if your system is an unusual one without
- the kpsewhich command, you may need to set the variable \fI at BIBINPUTS\fR.
--.TP
-+.TP 
- .B $bibtex ["bibtex %O %S"]
- The BibTeX processing program.
--.TP
--.B $bibtex_silent_switch ["-terse"]
-+.TP 
-+.B $bibtex_silent_switch ["\-terse"]
- \fBSwitch(es)\fR for the BibTeX processing program when silent mode is on.
--.TP
-+.TP 
- .B $cleanup_includes_generated [0]
- If nonzero, specifies that cleanup also deletes files that are
- detected in log file as being generated (see the \\openout lines in
- the log file).  It will also include files made from these first
- generation generated files.
--.TP
-+.TP 
- .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for cleanup
- except for dvi, ps and pdf files, 3 for cleanup except for dep and aux
- files.  (There is also extra cleaning as specified by the
- \fI$clean_ext\fR, \fI$clean_full_ext\fR and \fI at generated_exts\fR
- variables.)
--.PP
-+.PP 
- This variable is equivalent to specifying one of
--the \fB-c\fR, \fB-c1\fR, or \fB-C\fR options.  But there should be no need
-+the \fB\-c\fR, \fB\-c1\fR, or \fB\-C\fR options.  But there should be no need
- to set this variable from an RC file.
--.TP
-+.TP 
- .B $clean_ext [""]
- Extra extensions of files for \fIlatexmk\fR to remove when any of the
--clean-up options (\fB-c\fR, \fB-c1\fR, or \fB-C\fR) is selected.
-+clean\-up options (\fB\-c\fR, \fB\-c1\fR, or \fB\-C\fR) is selected.
- The value of this variable is a string containing the extensions
- separated by spaces.
--.TP
-+.TP 
- .B $clean_full_ext [""]
--Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
-+Extra extensions of files for \fIlatexmk\fR to remove when the \fB\-C\fR
- option is selected, i.e., extensions of files to remove when the .dvi,
--etc files are to be cleaned-up.
--.TP
-+etc files are to be cleaned\-up.
-+.TP 
- .B @cus_dep_list [()]
--Custom dependency list -- see section on "Custom Dependencies".
--.TP
-+Custom dependency list \-\- see section on "Custom Dependencies".
-+.TP 
- .B @default_files [("*.tex")]
- Default list of files to be processed.  
- 
-@@ -803,63 +803,63 @@
- is ".tex".  Wild cards are allowed.  The parentheses are because
- \fI at default_files\fR is an array variable, i.e., a sequence of
- filename specifications is possible.
--.TP
-+.TP 
- .B $dvi_filter [empty]
- The dvi file filter to be run on the newly produced dvi file before
--other processing.  Equivalent to specifying the \fB-dF\fR option.
--.TP
-+other processing.  Equivalent to specifying the \fB\-dF\fR option.
-+.TP 
- .B $dvi_mode [0]
- If nonzero, generate a dvi version of the document.  
--Equivalent to the \fB-dvi\fR option.
--.TP
-+Equivalent to the \fB\-dvi\fR option.
-+.TP 
- .B $dvi_previewer ["start xdvi %O %S" under UNIX]
--The command to invoke a dvi-previewer.
--[Default is "start" under MS-WINDOWS; under more recent versions of
-+The command to invoke a dvi\-previewer.
-+[Default is "start" under MS\-WINDOWS; under more recent versions of
- Windows, this will cause to be run whatever command the system has
- associated with .dvi files.] 
--.TP
-+.TP 
- .B $dvi_previewer_landscape ["start xdvi %O %S"]
--The command to invoke a dvi-previewer in landscape mode.
--[Default is "start" under MS-WINDOWS; under more recent versions of
-+The command to invoke a dvi\-previewer in landscape mode.
-+[Default is "start" under MS\-WINDOWS; under more recent versions of
- Windows, this will cause to be run whatever command the system has
- associated with .dvi files.] 
--.TP
-+.TP 
- .B $dvipdf ["dvipdf %O %S %D"]
- Command to convert dvi to pdf file.  A common reconfiguration is to
- use the dvipdfm command, which needs its arguments in a different order:
- 
--     $dvipdf = "dvipdfm %O -o %D %S";
-+     $dvipdf = "dvipdfm %O \-o %D %S";
- 
- WARNING: The default dvipdf script generates pdf files with bitmapped
- fonts, which do not look good when viewed by acroread.  That script
--should be modified to give dvips the options "-P pdf" to ensure that
-+should be modified to give dvips the options "\-P pdf" to ensure that
- type 1 fonts are used in the pdf file.
--.TP
--.B $dvips ["dvips %O -o %D %S"]
-+.TP 
-+.B $dvips ["dvips %O \-o %D %S"]
- The program to used as a filter to convert a .dvi file to a .ps file.  
- If pdf is going to be generated from pdf, then the value of the
--$dvips_pdf_switch -- see below -- will be included in the options
-+$dvips_pdf_switch \-\- see below \-\- will be included in the options
- substituted for "%O".
--.TP
--.B $dvips_landscape ["dvips -tlandscape %O -o %D %S"]
-+.TP 
-+.B $dvips_landscape ["dvips \-tlandscape %O \-o %D %S"]
- The program to used as a filter to convert a .dvi file to a .ps file
- in landscape mode.
--.TP
--.B $dvips_pdf_switch ["-P pdf"]
-+.TP 
-+.B $dvips_pdf_switch ["\-P pdf"]
- Switch(es) for dvips program when pdf file is to be generated from
- ps file. 
--.TP
--.B $dvips_silent_switch ["-q"]
-+.TP 
-+.B $dvips_silent_switch ["\-q"]
- Switch(es) for dvips program when silent mode is on.
--.TP
-+.TP 
- .B $dvi_update_command [""]
- When the dvi previewer is set to be updated by running a command, this
- is the command that is run.  See the information for the variable
- \fI$dvi_update_method\fR for further information, and see information
- on the variable \fI$pdf_update_method\fR for an example for the
- analogous case of a pdf previewer.
--.TP
--.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
-+.TP 
-+.B $dvi_update_method [2 under UNIX, 1 under MS\-Windows]
- How the dvi viewer updates its display when the dvi file has changed.
- The values here apply equally to the \fI$pdf_update_method\fR and to
- the \fI$ps_update_method\fR variables.
-@@ -870,37 +870,37 @@
- \fI$dvi_update_signal\fR.  The default value under UNIX is
- suitable for xdvi. 
-     3 => Viewer cannot do an update, because it locks the file. (As with
--acroread under MS-Windows.)
-+acroread under MS\-Windows.)
-     4 => run a command to do the update.  The command is specified by
- the variable \fI$dvi_update_command\fR.   
- 
- See information on the variable \fI$pdf_update_method\fR for an
- example of updating by command.
--.TP
--.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+.TP 
-+.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system\-dependent value]
- The number of the signal that is sent to the dvi viewer when it is
--updated by sending a signal -- see the information on the variable
-+updated by sending a signal \-\- see the information on the variable
- \fI$dvi_update_method\fR.  The default value is the one appropriate
- for xdvi on a UNIX system.
--.TP
-+.TP 
- .B $fdb_ext ["fdb_latexmk"]
- The extension of the file which \fIlatexmk\fR generates to contain a
- database of information on source files.  You will not normally need
- to change this.
--.TP
-+.TP 
- .B $force_mode [0]
- If nonzero, continue processing past minor \fIlatex\fR errors 
- including unrecognized cross references.  Equivalent to specifying the
--\fB-f\fR option.
--.TP
-+\fB\-f\fR option.
-+.TP 
- .B @generated_exts [( "aux", "bbl", "idx", "ind", "lof", "lot", "out", "toc", $fdb_ext )]
- This contains a list of extensions for files that are generated during
- a LaTeX run and that are read in by LaTeX in later runs, either
- directly or indirectly. 
- 
- This list has two uses: (a) to set the kinds of file to be deleted in
--a cleanup operation (with the \fB-c\fR, \fB-C\fR, \fB-CA\fR, \fB-g\fR
--and \fB-gg\fR options), and (b) in the determination of whether a
-+a cleanup operation (with the \fB\-c\fR, \fB\-C\fR, \fB\-CA\fR, \fB\-g\fR
-+and \fB\-gg\fR options), and (b) in the determination of whether a
- rerun of (pdf)LaTeX is needed after a run that gives an error.
- 
- (Normally, a change of a source file during a run should provoke a
-@@ -909,7 +909,7 @@
- an error, a new run should occur until the user has made a change in
- the files.  But the user may have corrected an error in a source .tex
- file during the run.  So \fIlatexmk\fR needs to distinguish
--user-generated and automatically generated files; it determines the
-+user\-generated and automatically generated files; it determines the
- automatically generated files as those with extensions in the list in
- @generated_exts.)
- 
-@@ -922,11 +922,11 @@
- adds the extension "end" to the list of predefined generated
- extensions.  (This extension is used by the RevTeX package, for
- example.) 
--.TP
-+.TP 
- .B $go_mode [0]
- If nonzero, process files regardless of timestamps, and is then
--equivalent to the \fB-g\fR option.
--.TP
-+equivalent to the \fB\-g\fR option.
-+.TP 
- .B %hash_calc_ignore_pattern
- \fB!!!This variable is for experts only!!!\fR
- 
-@@ -946,15 +946,15 @@
-    $hash_calc_ignore_pattern{'eps'} = '^%%CreationDate: ';
- 
- This creates a rule for files with extension \fI.eps\fR about lines to
--ignore.  The left-hand side is a \fIPerl\fR idiom for setting an item
-+ignore.  The left\-hand side is a \fIPerl\fR idiom for setting an item
- in a hash.  Note that the file extension is specified without a
--period.  The value, on the right-hand side, is a string containing a
-+period.  The value, on the right\-hand side, is a string containing a
- regular expresssion.  (See documentation on \fIPerl\fR for how they
- are to be specified in general.)  This particular regular expression
- specifies that lines beginning with "%%CreationDate: " are to be
- ignored in deciding whether a file of the given extension \fI.eps\fR
- has changed.
--.TP
-+.TP 
- .B $kpsewhich ["kpsewhich %S"]
- The program called to locate a source file when the name alone is not
- sufficient.  Most filenames used by \fIlatexmk\fR have sufficient path
-@@ -966,28 +966,28 @@
- See also the \fI at BIBINPUTS\fR variable for another way that \fIlatexmk\fR
- also uses to try to locate files; it applies only in the case of .bib
- files.
--.TP
-+.TP 
- .B $landscape_mode [0]
- If nonzero, run in landscape mode, using the landscape mode previewers and
--dvi to postscript converters.  Equivalent to the \fB-l\fR option.
-+dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
- Normally not needed with current previewers.
--.TP
-+.TP 
- .B $latex ["latex %O %S"]
- The LaTeX processing program.  Note that as with other programs, you
- can use this variable not just to change the name of the program used,
- but also specify options to the program.  E.g.,
- 
--	$latex = "latex --src-specials";
--.TP
--.B $latex_silent_switch ["-interaction=batchmode"]
-+	$latex = "latex \-\-src\-specials";
-+.TP 
-+.B $latex_silent_switch ["\-interaction=batchmode"]
- Switch(es) for the LaTeX processing program when silent mode is on.
--Under MS-Windows, the default value is changed to 
--"-interaction=batchmode -c-style-errors", as used by MikTeX and fpTeX.
--.TP
--.B $lpr ["lpr  %O %S" under UNIX/LINUX, \(dqNONE lpr\(dq under MS-WINDOWS]
-+Under MS\-Windows, the default value is changed to 
-+"\-interaction=batchmode \-c\-style\-errors", as used by MikTeX and fpTeX.
-+.TP 
-+.B $lpr ["lpr  %O %S" under UNIX/LINUX, \(dqNONE lpr\(dq under MS\-WINDOWS]
- The command to print postscript files.
- 
--Under MS-Windows (unlike UNIX/LINUX), there is no standard program for
-+Under MS\-Windows (unlike UNIX/LINUX), there is no standard program for
- printing files.  But there are ways you can do it.  For example, if
- you have gsview installed, you could use it with the option "/p":
- 
-@@ -1001,14 +1001,14 @@
- the command obeyed; this is necessary because one part of the command
- name ("Program Files") contains a space which would otherwise be
- misinterpreted.
--.TP
-+.TP 
- .B $lpr_dvi ["NONE lpr_dvi"]
- The printing program to print dvi files.
--.TP
-+.TP 
- .B $lpr_pdf ["NONE lpr_pdf"]
- The printing program to print pdf files.
- 
--Under MS-Windows you could set this to use gsview, if it is installed,
-+Under MS\-Windows you could set this to use gsview, if it is installed,
- e.g.,
- 
-     $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -1018,27 +1018,27 @@
- is necessary because one part of the command name ("Program Files")
- contains a space which would otherwise be misinterpreted. 
- 
--.TP
--.B $makeindex ["makeindex %O -o %D %S"]
-+.TP 
-+.B $makeindex ["makeindex %O \-o %D %S"]
- The index processing program.
--.TP
-+.TP 
- .B $max_repeat  [5]
- The maximum number of times \fIlatexmk\fR will run latex/pdflatex
- before deciding that there may be an infinite loop and that it needs
- to bail out, rather than rerunning latex/pdflatex again to resolve
--cross-references, etc.  The default value covers all normal cases.
-+cross\-references, etc.  The default value covers all normal cases.
- 
- (Note that the "etc" covers a lot of cases where one run of
- latex/pdflatex generates files to be read in on a later run.)
--.TP
-+.TP 
- .B $new_viewer_always [0]
- This variable applies to \fIlatexmk\fR \fBonly\fR in
--continuous-preview mode.  If \fI$new_viewer_always\fR is 0,
-+continuous\-preview mode.  If \fI$new_viewer_always\fR is 0,
- \fIlatexmk\fR will check for a previously running previewer on the
- same file, and if one is running will not start a new one.  If
--\fI$new_viewer_always\fR is non-zero, this check will be skipped, and
-+\fI$new_viewer_always\fR is non\-zero, this check will be skipped, and
- \fIlatexmk\fR will behave as if no viewer is running.
--.TP
-+.TP 
- .B $pdf_mode [0]
- If zero, do NOT generate a pdf version of the document.
- If equal to 1, generate a pdf version of the document using pdflatex.  
-@@ -1047,39 +1047,39 @@
- If equal to 3, generate a pdf version of the document from the dvi
- file, by using the command specified by the \fI$dvipdf\fR variable.  
- 
--Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options.
--.TP
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options.
-+.TP 
- .B $pdflatex ["pdflatex %O %S"]
- The LaTeX processing program in the version that makes a pdf file instead
- of a dvi file.
--.TP
--.B $pdflatex_silent_switch  ["-interaction=batchmode"]
-+.TP 
-+.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- Switch(es) for the pdflatex program (specified in the variable
- \fI$pdflatex\fR when silent mode is on.
--Under MS-Windows, the default value is changed to 
--"-interaction=batchmode -c-style-errors", as used by MikTeX and fpTeX.
--.TP
-+Under MS\-Windows, the default value is changed to 
-+"\-interaction=batchmode \-c\-style\-errors", as used by MikTeX and fpTeX.
-+.TP 
- .B $pdf_previewer ["start acroread %O %S"]
--The command to invoke a pdf-previewer.
--[Default is changed to "start" on MS-WINDOWS; under more recent versions of
-+The command to invoke a pdf\-previewer.
-+[Default is changed to "start" on MS\-WINDOWS; under more recent versions of
- Windows, this will cause to be run whatever command the system has
- associated with .pdf files.]  
- 
--\fBWARNING\fR: Potential problem under MS-Windows:
-+\fBWARNING\fR: Potential problem under MS\-Windows:
- if acroread is used as the pdf previewer, and it is
- actually viewing a pdf file, the pdf file cannot be updated.  Thus
- makes acroread a bad choice of previewer if you use \fIlatexmk\fR's
--previous-continuous mode (option \fB-pvc\fR) under MS-windows.
-+previous\-continuous mode (option \fB\-pvc\fR) under MS\-windows.
- This problem does not occur if ghostview, gv or gsview is used to
- view pdf files.
--.TP
-+.TP 
- .B $pdf_update_command [""]
- When the pdf previewer is set to be updated by running a command, this
- is the command that is run.  See the information for the variable
- \fI$pdf_update_method\fR. 
--.TP
--.B $pdf_update_method [1 under UNIX, 3 under MS-Windows]
-+.TP 
-+.B $pdf_update_method [1 under UNIX, 3 under MS\-Windows]
- How the pdf viewer updates its display when the pdf file has
- changed. See the information on the variable \fI$dvi_update_method\fR
- for the codes.  (Note that information needs be changed slightly so
-@@ -1088,64 +1088,64 @@
- value 2, to specify update by signal, the signal is specified by
- \fI$pdf_update_signal\fR.)
- 
--Note that acroread under MS-Windows (but not UNIX) locks the pdf file, so
-+Note that acroread under MS\-Windows (but not UNIX) locks the pdf file, so
- the default value is then 3.  
- 
- Arranging to use a command to get a previewer explicitly updated
- requires three variables to be set.  For example:
- 
--    $pdf_previewer = "start xpdf -remote %R %O %S";
-+    $pdf_previewer = "start xpdf \-remote %R %O %S";
-     $pdf_update_method = 4;
--    $pdf_update_command = "xpdf -remote %R -reload";
-+    $pdf_update_command = "xpdf \-remote %R \-reload";
- 
- The first setting arranges for the xpdf program to be used in its
- "remote server mode", with the server name specified as the rootname
- of the TeX file.  The second setting arranges for updating to be done
- in response to a command, and the third setting sets the update command.
- 
--.TP
--.B $pdf_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
-+.TP 
-+.B $pdf_update_signal [Under UNIX: SIGHUP, which is a system\-dependent value]
- The number of the signal that is sent to the pdf viewer when it is
--updated by sending a signal -- see the information on the variable
-+updated by sending a signal \-\- see the information on the variable
- \fI$pdf_update_method\fR.  The default value is the one appropriate
- for gv on a UNIX system.
--.TP
--.B $pid_position[1 under UNIX, -1 under MS-Windows]     
-+.TP 
-+.B $pid_position[1 under UNIX, \-1 under MS\-Windows]     
- The variable \fI$pid_position\fR is used to
- specify which word in lines of the output from \fI$pscmd\fR
- corresponds to the process ID.  The first word in the line is numbered
- 0.  The default value of 1 (2nd word in line) is correct for Solaris
--2.6 and Linux.  Setting the variable to -1 is used to indicate that
-+2.6 and Linux.  Setting the variable to \-1 is used to indicate that
- \fI$pscmd\fR is not to be used.
--.TP
-+.TP 
- .B $postscript_mode [0]
- If nonzero, generate a postscript version of the document.  
--Equivalent to the \fB-ps\fR option.
--.TP
-+Equivalent to the \fB\-ps\fR option.
-+.TP 
- .B $preview_continuous_mode [0]
- If nonzero, run a previewer to view the document, and
--continue running \fIlatexmk\fR to keep .dvi up-to-date.  Equivalent to
--the \fB-pvc\fR option.
-+continue running \fIlatexmk\fR to keep .dvi up\-to\-date.  Equivalent to
-+the \fB\-pvc\fR option.
- Which previewer is run depends on the other settings, see the command
--line options \fB-view=\fR, and the variable \fI$view\fR.  
--.TP
-+line options \fB\-view=\fR, and the variable \fI$view\fR.  
-+.TP 
- .B $preview_mode [0]
- If nonzero, run a previewer to preview the document.
--Equivalent to the \fB-pv\fR option.  
-+Equivalent to the \fB\-pv\fR option.  
- Which previewer is run depends on the other settings, see the command
--line options \fB-view=\fR, and the variable \fI$view\fR.  
--.TP
-+line options \fB\-view=\fR, and the variable \fI$view\fR.  
-+.TP 
- .B $printout_mode [0]
- If nonzero, print the document using \fIlpr\fR.  Equivalent to the
--\fB-p\fR option.  This is recommended \fBnot\fR to be set from an RC
-+\fB\-p\fR option.  This is recommended \fBnot\fR to be set from an RC
- file, otherwise you could waste lots of paper.
--.TP
-+.TP 
- .B $print_type = ["ps"]
- Type of file to printout: possibilities are "dvi", "none", "pdf", or "ps".  
--.TP
-+.TP 
- .B $pscmd
- Command used to get all the processes currently run by the user.  The
---pvc option uses the command specified by the variable \fI$pscmd\fR to
-+\-pvc option uses the command specified by the variable \fI$pscmd\fR to
- determine if there is an already running previewer, and to find the
- process ID (needed if \fIlatexmk\fR needs to signal the previewer
- about file changes).  
-@@ -1154,27 +1154,27 @@
- one process.  See the \fI$pid_position\fR variable for how the process
- number is determined.
- 
--The default for \fIpscmd\fR is "NONE" under MS-Windows and cygwin
--(i.e., the command is not used), "ps --width 200 -f -u $ENV{USER}"
--under linux, "ps -ww -u $ENV{USER}" under darwin (Macintosh OS-X), and
--"ps -f -u $ENV{USER}" under other operating systems (including other
-+The default for \fIpscmd\fR is "NONE" under MS\-Windows and cygwin
-+(i.e., the command is not used), "ps \-\-width 200 \-f \-u $ENV{USER}"
-+under linux, "ps \-ww \-u $ENV{USER}" under darwin (Macintosh OS\-X), and
-+"ps \-f \-u $ENV{USER}" under other operating systems (including other
- flavors of UNIX).  In these specifications "$ENV{USER}" is substituted
- by the username.
--.TP
-+.TP 
- .B $ps2pdf ["ps2pdf  %O %S %D"]
- Command to convert ps to pdf file.  
--.TP
-+.TP 
- .B $ps_filter [empty]
- The postscript file filter to be run on the newly produced postscript
--file before other processing.  Equivalent to specifying the \fB-pF\fR
-+file before other processing.  Equivalent to specifying the \fB\-pF\fR
- option.
--.TP
--.B $ps_previewer ["start gv %O %S", but \(dqstart %O %S" under MS-WINDOWS]
--The command to invoke a ps-previewer.  (The default under MS-WINDOWS
-+.TP 
-+.B $ps_previewer ["start gv %O %S", but \(dqstart %O %S" under MS\-WINDOWS]
-+The command to invoke a ps\-previewer.  (The default under MS\-WINDOWS
- will cause to be run whatever command the system has associated 
- with .ps files.)
- 
--Note that gv could be used with the -watch option updates its display
-+Note that gv could be used with the \-watch option updates its display
- whenever the postscript file changes, whereas ghostview does not.
- However, different versions of gv have slightly different ways of
- writing this option.  You can configure this variable apppropriately.
-@@ -1182,16 +1182,16 @@
- \fBWARNING\fR: Linux systems may have installed one (or more) versions
- of gv under different names, e.g., ggv, kghostview, etc, but perhaps
- not one called gv.  
--.TP
--.B $ps_previewer_landscape ["start gv -swap %O %S", but \(dqstart %O %S" under MS-WINDOWS]
--The command to invoke a ps-previewer in landscape mode.
--.TP
-+.TP 
-+.B $ps_previewer_landscape ["start gv \-swap %O %S", but \(dqstart %O %S" under MS\-WINDOWS]
-+The command to invoke a ps\-previewer in landscape mode.
-+.TP 
- .B $ps_update_command [""]
- When the postscript previewer is set to be updated by running a command, this
- is the command that is run.  See the information for the variable
- \fI$ps_update_method\fR. 
--.TP
--.B $ps_update_method [0 under UNIX, 1 under MS-Windows]
-+.TP 
-+.B $ps_update_method [0 under UNIX, 1 under MS\-Windows]
- How the postscript viewer updates its display when the ps file has
- changed. See the information on the variable \fI$dvi_update_method\fR
- for the codes.  (Note that information needs be changed slightly so
-@@ -1200,25 +1200,25 @@
- value 2, to specify update by signal, the signal is specified by
- \fI$ps_update_signal\fR.)
- 
--.TP
--.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
-+.TP 
-+.B $ps_update_signal [Under UNIX: SIGHUP, which is a system\-dependent value]
- The number of the signal that is sent to the pdf viewer when it is
--updated by sending a signal -- see \fI$ps_update_method\fR.  The
-+updated by sending a signal \-\- see \fI$ps_update_method\fR.  The
- default value is the one appropriate for gv on a UNIX system.
--.TP
-+.TP 
- .B $sleep_time [2]
- The time to sleep (in seconds) between checking for source file 
--changes when running the \fB-pvc\fR option.
--.TP
-+changes when running the \fB\-pvc\fR option.
-+.TP 
- .B $texfile_search [""]
- This is an obsolete variable, replaced by the \fI at default_files\fR
- variable.  
- 
- For backward compatibility, if you choose to set
--\fI$texfile_search\fR, it is a string of space-separated filenames, and
-+\fI$texfile_search\fR, it is a string of space\-separated filenames, and
- then \fIlatexmk\fR replaces \fI at default_files\fR with the filenames in
- \fI$texfile_search\fR to which is added "*.tex".
--.TP
-+.TP 
- .B $tmpdir [See below for default]
- Directory to store temporary files that \fIlatexmk\fR may generate while
- running.  
-@@ -1227,20 +1227,20 @@
- \fI$tmpdir\fR to the value of the first of whichever of the system
- environment variables TMPDIR or TEMP exists, otherwise to the current
- directory.  Under other operating systems (expected to be UNIX/Linux,
--including OS-X), the default is the value of the system environment
-+including OS\-X), the default is the value of the system environment
- variable TMPDIR if it exists, otherwise "/tmp".
--.TP
-+.TP 
- .B $view ["default"]
- Which kind of file is to be previewed if a previewer is used.  The
- possible values are "default", "dvi", "ps", "pdf".  The value 
- of "default" means that the "highest" of the kinds of file generated is
- to be used (among dvi, ps and pdf).
- 
--.SH CUSTOM DEPENDENCIES
--.PP
-+.SH "CUSTOM DEPENDENCIES"
-+.PP 
- In any RC file a set of custom dependencies can be set up to convert a
- file with one extension to a file with another.  An example use of this
--would be to allow \fIlatexmk\fR to convert a \fI.fig\fR file to
-+would be to allow \fIlatexmk\fR to convert a \fI.fi g\fR file to
- \fI.eps\fR to be included in the \fI.tex\fR file.  
- 
- The old method of configuring \fIlatexmk\fR was to directly manipulate
-@@ -1255,35 +1255,35 @@
- 
- The custom dependency is a list of rules, each of which is specified
- as follow:
--.TP
-+.TP 
- .B from extension:
- The extension of the file we are converting from (e.g. "fig").
- It is specified without a period.
--.TP
-+.TP 
- .B to extension:
- The extension of the file we are converting to (e.g. "eps").
- It is specified without a period.
--.TP
-+.TP 
- .B must:
--If non-zero, the file from which we are converting \fBmust\fR exist, if it
-+If non\-zero, the file from which we are converting \fBmust\fR exist, if it
- doesn't exist \fIlatexmk\fR will give an error message and exit unless
--the \fB-f\fR option is specified.  If \fImust\fR is zero and the file
-+the \fB\-f\fR option is specified.  If \fImust\fR is zero and the file
- we are converting from doesn't exist, then no action is taken.
--.TP
-+.TP 
- .B function:
- The name of the subroutine that \fIlatexmk\fR should call to perform the
- file conversion.  The first argument to the subroutine is the base name
- of the file to be converted without any extension.  The subroutines are
- declared in the syntax of \fIPerl\fR.  The function should return 0 if
- it was successful and a nonzero number if it failed.
--.PP
-+.PP 
- It is invoked whenever \fIlatexmk\fR detects that a run of
- latex/pdflatex needs to read a file, like a graphics file, whose
--extension is the to-extension of a custom dependency.  Then
-+extension is the to\-extension of a custom dependency.  Then
- \fIlatexmk\fR examines whether a file exists with the same name, but
--with the corresponding from-extension, as specified in the
--custom-dependency rule.  If it does, then whenever the destination
--file (the one with the to-extension) is out-of-date with respect to
-+with the corresponding from\-extension, as specified in the
-+custom\-dependency rule.  If it does, then whenever the destination
-+file (the one with the to\-extension) is out\-of\-date with respect to
- the corresponding source file.
- 
- To make the new destination file, the \fIPerl\fR subroutine specified in the
-@@ -1293,7 +1293,7 @@
- even by those without knowledge of the \fIPerl\fR programming language.  Of
- course, experts could do something much more elaborate.
- 
--One other item in each custom-dependency rule labelled "must" above
-+One other item in each custom\-dependency rule labelled "must" above
- specifies how the rule should be applied when the source file fails to
- exist.
- 
-@@ -1301,19 +1301,19 @@
- 
-     add_cus_dep( 'fig', 'eps', 0, 'fig2eps' );
-     sub fig2eps {
--        system("fig2dev -Leps $_[0].fig $_[0].eps"); 
-+        system("fig2dev \-Leps $_[0].fi g $_[0].eps"); 
-     }
- 
- The first line adds a custom dependency that converts a file with
- extension "fig", as created by the xfig program, to an encapsulated
- postscript file, with extension "eps".  The remaining lines define a
- subroutine that carries out the conversion.  If a rule for converting
--"fig" to "eps" files already exists (e.g., from a previously read-in
-+"fig" to "eps" files already exists (e.g., from a previously read\-in
- initialization file), the \fIlatexmk\fR will delete this rule before
- making the new one.
- 
- Suppose \fIlatexmk\fR is using this rule to convert a file
--"figure.fig" to "figure.eps".  Then it will invoke the fig2eps
-+"figure.fi g" to "figure.eps".  Then it will invoke the fig2eps
- subroutine defined in the above code with a single argument "figure",
- which is the basename of each of the files (possibly with a path
- component).  This argument is referred to by \fIPerl\fR as $_[0].  In
-@@ -1322,7 +1322,7 @@
- are a \fIPerl\fR idiom that signify that each string of the form of a
- variable name, $_[0] in this case, is to be substituted by its value.
- 
--If the return value of the subroutine is non-zero, then \fIlatexmk\fR
-+If the return value of the subroutine is non\-zero, then \fIlatexmk\fR
- will assume an error occurred during the execution of the subroutine.
- In the above example, no explicit return value is given, and instead
- the return value is the value returned by the last (and only)
-@@ -1336,7 +1336,7 @@
- 
-     add_cus_dep( 'fig', 'eps', 0, 'fig2eps' );
-     sub fig2eps {
--        system("fig2dev -Lps '$_[0].fig' '$_[0].eps'");
-+        system("fig2dev \-Lps '$_[0].fi g' '$_[0].eps'");
-     }
- 
- This causes the invocation of the \fIfig2dev\fR program to have quoted
-@@ -1352,7 +1352,7 @@
- 
-     add_cus_dep( 'fig', 'pdf, 0, 'fig2pdf' );
-     sub fig2pdf {
--        system("fig2dev -Lpdf $_[0].fig $_[0].pdf"); 
-+        system("fig2dev \-Lpdf $_[0].fi g $_[0].pdf"); 
-     }
- 
- If you have some general custom dependencies defined in the system or
-@@ -1371,8 +1371,8 @@
- in an initialization file. 
- 
- Another example of a custom dependency overcomes a limitation of
--\fIlatexmk\fR concerning index files.  The only index-file conversion
--built-in to \fIlatexmk\fR is from an ".idx" file written on one run of
-+\fIlatexmk\fR concerning index files.  The only index\-file conversion
-+built\-in to \fIlatexmk\fR is from an ".idx" file written on one run of
- latex/pdflatex to an ".ind" file to be read in on a subsequent run.
- But with the index.sty package you can create extra indexes with
- extensions that you configure.  \fILatexmk\fR does not know how to
-@@ -1385,7 +1385,7 @@
- 
-     add_cus_dep('ndx', 'nnd', 0, 'makendx2nnd');
-     sub makendx2nnd {
--        system("makeindex -o $_[0].nnd $_[0].ndx");
-+        system("makeindex \-o $_[0].nnd $_[0].ndx");
-     }
- 
- (You will need to modify this code if you use filenames
-@@ -1394,7 +1394,7 @@
- Those of you with experience with Makefiles, will undoubtedly be
- concerned that the \fI.ndx\fR file is written during a run of
- latex/pdflatex and is always later than the \fI.nnd\fR last read in.
--Thus the \fI.nnd\fR appears to be perpetually out-of-date.  This
-+Thus the \fI.nnd\fR appears to be perpetually out\-of\-date.  This
- situation, of circular dependencies, is endemic to latex, and
- \fIlatexmk\fR in its current version works correctly with circular
- dependencies.  It examines the contents of the files (by use of an md5
-@@ -1408,32 +1408,32 @@
- 
- Glossaries can be dealt with similarly.
- 
--.SH OLD METHOD OF DEFINING CUSTOM DEPENDENCIES
-+.SH "OLD METHOD OF DEFINING CUSTOM DEPENDENCIES"
- In previous versions of \fIlatexmk\fR, the only method of defining
- custom dependencies was to directly manipulate the table of custom
- dependencies.  This is contained in the \fB at cus_dep_list\fR array.  It
- is an array of strings, and each string in the array has four items in
--it, each separated by a space, the from-extension, the to-extension,
-+it, each separated by a space, the from\-extension, the to\-extension,
- the "must" item, and the name of the subroutine for the custom
- dependency.  These were all defined above.
--.PP
-+.PP 
- An example of the old method of defining custom dependencies is as
- follows. It is the code in an RC file to ensure automatic conversion
--of \fI.fig\fR files to \fI.eps\fR files:
-+of \fI.fi g\fR files to \fI.eps\fR files:
- 
-     push @cus_dep_list, "fig eps 0 fig2eps";
-     sub fig2eps {
--        system("fig2dev -Lps $_[0].fig $_[0].eps");
-+        system("fig2dev \-Lps $_[0].fi g $_[0].eps");
-     }
- 
- This method still works, and is equivalent to the earlier code using
- the add_cus_dep subroutine, except that it doesn't delete any previous
--custom-dependency for the same conversion.  So the new method is
-+custom\-dependency for the same conversion.  So the new method is
- preferable.
- 
--.SH SEE ALSO
-+.SH "SEE ALSO"
- latex(1), bibtex(1).
--.SH BUGS
-+.SH "BUGS"
- Sometimes a viewer (gv) tries to read an updated .ps or .pdf file
- after its creation is started but before the file is complete.  Work
- around: manually refresh (or reopen) display.  Or use one of the other
-@@ -1445,31 +1445,31 @@
- Gv on UNIX/LINUX works for both postscript and pdf.
- Ghostview on UNIX/LINUX needs a manual update (reopen); it views
- postscript and pdf. 
--Gsview under MS-Windows works for both postscript and pdf, 
-+Gsview under MS\-Windows works for both postscript and pdf, 
- but only reads the updated file when its screen is refreshed.
- Acroread under UNIX/LINUX views pdf, but the file needs to be closed
- and reopened to view an updated version.
--Under MS-Windows, acroread locks its input file and so the
-+Under MS\-Windows, acroread locks its input file and so the
- pdf file cannot be updated.  (Remedy: configure \fIlatexmk\fR to use gsview
- instead.) 
--.SH THANKS TO
-+.SH "THANKS TO"
- Authors of previous versions.  Many users with their feedback, and
- especially 
- David Coppit (username david at node coppit.org) who made many useful
- suggestions that contributed to version 3, and Herbert Schulz.
- (Please note that the
--e-mail addresses are not written in their standard form to avoid being
-+e\-mail addresses are not written in their standard form to avoid being
- harvested by worms and viruses.)
--.SH AUTHOR
-+.SH "AUTHOR"
- Current version, by John Collins (username collins at node phys.psu.edu).
- (Version 4.03).
- 
- Released version can be obtained from CTAN:
--<http://www.tug.org/tex-archive/support/latexmk/>, and from the
-+<http://www.tug.org/tex\-archive/support/latexmk/>, and from the
- author's website <http://www.phys.psu.edu/~collins/software/latexmk/>.
--.br
-+.br 
- Modifications and enhancements by Evan McLean (Version 2.0)
--.br
-+.br 
- Original script called "go" by David J. Musliner (RCS Version 3.2)
- 
- \"  LocalWords:  fR fIlatexmk dvi ps fILatexmk pdflatex bibtex makeindex fB pv
-diff -dur latexmk-4.03.ORIG/latexmk.pl latexmk-4.03/latexmk.pl
---- latexmk-4.03.ORIG/latexmk.pl	2008-12-22 15:49:28.000000000 -0700
-+++ latexmk-4.03/latexmk.pl	2009-01-06 17:16:31.000000000 -0700
-@@ -689,10 +689,8 @@
+--- latexmk.pl.ORIG	2009-04-10 15:49:17.000000000 -0600
++++ latexmk.pl	2009-04-13 14:55:40.000000000 -0600
+@@ -725,10 +725,8 @@
      ## /usr/local/share, depending on the local conventions.
      ## /usr/local/lib/latexmk/LatexMk is put in the list for
      ## compatibility with older versions of latexmk.
@@ -1747,8 +18,8 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora change: only look in /etc
-+    @rc_system_files = ( '/etc/latexmk.conf' );
++	## Fedora change: only look in /etc
++	@rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path
  


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- latexmk.spec	25 Feb 2009 12:42:09 -0000	1.9
+++ latexmk.spec	13 Apr 2009 21:03:00 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.03
-Release:        2%{?dist}
+Version:        4.05
+Release:        1%{?dist}
 Summary:        A make-like utility for LaTeX files
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.phys.psu.edu/~collins/software/latexmk-jcc/
-Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-403.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-405.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -17,7 +17,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       texlive, texlive-latex, ghostscript, xdg-utils
+Requires:       tex(latex), ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q -c
-%patch0 -p1
+%patch0
 cp %{SOURCE2} README.fedora
 
 %build
@@ -58,6 +58,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Mon Apr 13 2009 Jerry James <loganjerry at gmail.com> - 4.05-1
+- Update to 4.05 to correct problems when running latex and pdflatex on the
+  same source file.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Jan 2009 00:22:04 -0000	1.7
+++ sources	13 Apr 2009 21:03:00 -0000	1.8
@@ -1 +1 @@
-7925dadf697d1832f225d04e4ce445c2  latexmk-403.zip
+cdc9957ac69120310c0b2527e9ed6a23  latexmk-405.zip



From toshio at fedoraproject.org  Mon Apr 13 21:10:42 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 21:10:42 +0000 (UTC)
Subject: rpms/python-paver/devel paver-python2.4.patch, NONE,
	1.1 python-paver.spec, 1.7, 1.8
Message-ID: <20090413211042.E40F670124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-paver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1279

Modified Files:
	python-paver.spec 
Added Files:
	paver-python2.4.patch 
Log Message:
python-2.4 compat.  Just syncing with EPEL patch no fedora build needed.


paver-python2.4.patch:

--- NEW FILE paver-python2.4.patch ---
diff -up Paver-1.0/paver/tasks.py.py2.4 Paver-1.0/paver/tasks.py
--- Paver-1.0/paver/tasks.py.py2.4	2009-04-13 13:12:28.000000000 -0700
+++ Paver-1.0/paver/tasks.py	2009-04-13 13:12:43.000000000 -0700
@@ -207,7 +207,7 @@ def _import_task(taskname):
     full_mod_name = ".".join(parts[:-1])
     mod_name = parts[-2]
     try:
-        module = __import__(full_mod_name, fromlist=[mod_name])
+        module = __import__(full_mod_name, globals(), locals(), [mod_name])
     except ImportError:
         return None
     return getattr(module, func_name, None)


Index: python-paver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paver/devel/python-paver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paver.spec	24 Mar 2009 16:18:38 -0000	1.7
+++ python-paver.spec	13 Apr 2009 21:10:09 -0000	1.8
@@ -3,13 +3,15 @@
 %define srcname Paver
 Name: python-paver
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python-based build/distribution/deployment scripting tool
 
 Group: Development/Languages
 License: BSD
 URL: http://www.blueskyonmars.com/projects/paver/
 Source0: http://pypi.python.org/packages/source/P/%{srcname}/%{srcname}-%{version}.tar.gz
+Patch0: paver-python2.4.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -49,6 +51,7 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .py2.4
 
 # Note: This falls somewhere in between source and non-source.  It's a copy
 # of the essential files from the library that's being packaged.  But it's
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-2
+- Patch for python-2.4 compatibility
+
 * Tue Mar 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-1
 - New upstream final.
 



From jkratoch at fedoraproject.org  Mon Apr 13 21:25:32 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 13 Apr 2009 21:25:32 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch,1.13,1.14 gdb.spec,1.341,1.342
Message-ID: <20090413212532.38ADC70124@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6049

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-18
- Archer update to the snapshot: d1fee5066408a09423621d1ebc64e6d3e248ed08
- Archer backport: 4854339f75bdaf4b228fc35579bddbb2a1fecdc1
  - Fix Python FrameIterator.


gdb-archer.patch:

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gdb-archer.patch	13 Apr 2009 20:52:59 -0000	1.13
+++ gdb-archer.patch	13 Apr 2009 21:25:31 -0000	1.14
@@ -2,7 +2,7 @@
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 7c250ce99c90cf6097e2ec55ea0f205830979cee
+commit d1fee5066408a09423621d1ebc64e6d3e248ed08
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-merge-expr
@@ -23940,13 +23940,13 @@
  	      struct type *type = value_type (val_args[i]);
 diff --git a/gdb/python/lib/gdb/FrameIterator.py b/gdb/python/lib/gdb/FrameIterator.py
 new file mode 100644
-index 0000000..87fb074
+index 0000000..5654546
 --- /dev/null
 +++ b/gdb/python/lib/gdb/FrameIterator.py
 @@ -0,0 +1,33 @@
 +# Iterator over frames.
 +
-+# Copyright (C) 2008 Free Software Foundation, Inc.
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -23973,7 +23973,7 @@
 +
 +    def next (self):
 +        result = self.frame
-+        if result == None:
++        if result is None:
 +            raise StopIteration
 +        self.frame = result.older ()
 +        return result
@@ -26445,10 +26445,10 @@
  
 diff --git a/gdb/python/python-frame.c b/gdb/python/python-frame.c
 new file mode 100644
-index 0000000..c257ac3
+index 0000000..dafe69a
 --- /dev/null
 +++ b/gdb/python/python-frame.c
-@@ -0,0 +1,686 @@
+@@ -0,0 +1,713 @@
 +/* Python interface to stack frames
 +
 +   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
@@ -27029,6 +27029,33 @@
 +  return PyUnicode_Decode (str, strlen (str), host_charset (), NULL);
 +}
 +
++/* Implements the equality comparison for Frame objects.
++   All other comparison operators will throw a TypeError Python exception,
++   as they aren't valid for frames.  */
++
++static PyObject *
++frapy_richcompare (PyObject *self, PyObject *other, int op)
++{
++  int result;
++
++  if (!PyObject_TypeCheck (other, &frame_object_type)
++      || (op != Py_EQ && op != Py_NE))
++    {
++      Py_INCREF (Py_NotImplemented);
++      return Py_NotImplemented;
++    }
++
++  if (frame_id_eq (((frame_object *) self)->frame_id,
++		   ((frame_object *) other)->frame_id))
++    result = Py_EQ;
++  else
++    result = Py_NE;
++
++  if (op == result)
++    Py_RETURN_TRUE;
++  Py_RETURN_FALSE;
++}
++
 +/* Sets up the Frame API in the gdb module.  */
 +
 +void


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- gdb.spec	13 Apr 2009 20:52:59 -0000	1.341
+++ gdb.spec	13 Apr 2009 21:25:31 -0000	1.342
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 17%{?_with_upstream:.upstream}%{?dist}
+Release: 18%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -851,6 +851,11 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-18
+- Archer update to the snapshot: d1fee5066408a09423621d1ebc64e6d3e248ed08
+- Archer backport: 4854339f75bdaf4b228fc35579bddbb2a1fecdc1
+  - Fix Python FrameIterator.
+
 * Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-17
 - Archer update to the snapshot: 7c250ce99c90cf6097e2ec55ea0f205830979cee
 - Archer backport: c14d9ab7eef43281b2052c885f89d2db96fb5f8e



From cebbert at fedoraproject.org  Mon Apr 13 21:28:59 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 13 Apr 2009 21:28:59 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, NONE,
	1.1 kernel.spec, 1.1533, 1.1534
Message-ID: <20090413212859.2307270124@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7021

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch 
Log Message:
Fix oops in md raid1 resync (#495550)

linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch:

--- NEW FILE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch ---
From: NeilBrown <neilb at suse.de>
Date: Mon, 6 Apr 2009 04:40:38 +0000 (+1000)
Subject: md/raid1 - don't assume newly allocated bvecs are initialised.
X-Git-Tag: v2.6.30-rc1~176^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=303a0e11d0ee136ad8f53f747f3c377daece763b

md/raid1 - don't assume newly allocated bvecs are initialised.

Since commit d3f761104b097738932afcc310fbbbbfb007ef92
newly allocated bvecs aren't initialised to NULL, so we have
to be more careful about freeing a bio which only managed
to get a few pages allocated to it.  Otherwise the resync
process crashes.

This patch is appropriate for 2.6.29-stable.

Cc: stable at kernel.org
Cc: "Jens Axboe" <jens.axboe at oracle.com>
Reported-by: Gabriele Tozzi <gabriele at tozzi.eu>
Signed-off-by: NeilBrown <neilb at suse.de>
---

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b4f4bad..f2247b0 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -123,6 +123,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 				goto out_free_pages;
 
 			bio->bi_io_vec[i].bv_page = page;
+			bio->bi_vcnt = i+1;
 		}
 	}
 	/* If not user-requests, copy the page pointers to all bios */
@@ -138,9 +139,9 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 	return r1_bio;
 
 out_free_pages:
-	for (i=0; i < RESYNC_PAGES ; i++)
-		for (j=0 ; j < pi->raid_disks; j++)
-			safe_put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
+	for (j=0 ; j < pi->raid_disks; j++)
+		for (i=0; i < r1_bio->bios[j]->bi_vcnt ; i++)
+			put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
 	j = -1;
 out_free_bio:
 	while ( ++j < pi->raid_disks )


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1533
retrieving revision 1.1534
diff -u -r1.1533 -r1.1534
--- kernel.spec	13 Apr 2009 18:35:55 -0000	1.1533
+++ kernel.spec	13 Apr 2009 21:28:27 -0000	1.1534
@@ -716,6 +716,9 @@
 
 Patch5000: linux-2.6-add-qcserial.patch
 
+# fix oops in md raid1 (#495550)
+Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
@@ -920,12 +923,14 @@
 %endif
 
 # more sanity checking; do it quietly
-for patch in %{patches} ; do
-  if [ ! -f $patch ] ; then
-    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
-    exit 1
-  fi
-done 2>/dev/null
+if [ "%{patches}" != "%%{patches}" ] ; then
+  for patch in %{patches} ; do
+    if [ ! -f $patch ] ; then
+      echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+      exit 1
+    fi
+  done 2>/dev/null
+fi
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -1331,6 +1336,8 @@
 ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1925,6 +1932,9 @@
 # and build.
 
 %changelog
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix oops in md raid1 resync (#495550)
+
 * Mon Apr 13 2009 Eric Sandeen <sandeen at redhat.com>
 - Turn of CONFIG_SND_HDA_POWER_SAVE_DEFAULT again (#493972)
 



From rstrode at fedoraproject.org  Mon Apr 13 21:29:45 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 13 Apr 2009 21:29:45 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.26.0-multistack.patch, NONE,
	1.1 gdm-fingerprint-16.png, NONE, 1.1 gdm-fingerprint-48.png,
	NONE, 1.1 gdm-fingerprint.pam, NONE, 1.1 gdm-password.pam, NONE,
	1.1 gdm-smartcard-16.png, NONE, 1.1 gdm-smartcard-48.png, NONE,
	1.1 gdm-smartcard.pam, NONE, 1.1 gdm.spec, 1.460, 1.461
Message-ID: <20090413212945.1AB4970124@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7212

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.26.0-multistack.patch gdm-fingerprint-16.png 
	gdm-fingerprint-48.png gdm-fingerprint.pam gdm-password.pam 
	gdm-smartcard-16.png gdm-smartcard-48.png gdm-smartcard.pam 
Log Message:
* Mon Apr 13 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.0-8
- Add less boring multistack patch for testing


gdm-2.26.0-multistack.patch:

--- NEW FILE gdm-2.26.0-multistack.patch ---
>From 9376a6f3e7fcd139f50dcf0d8c91ce93c8215ec6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 20 Feb 2009 13:52:19 -0500
Subject: [PATCH 01/33] Add a comment marking protected api in chooser

The chooser widget has methods that only its
subclasses are supposed to call.  We should
mark them as such.
---
 gui/simple-greeter/gdm-chooser-widget.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h
index 578e613..7e3e59c 100644
--- a/gui/simple-greeter/gdm-chooser-widget.h
+++ b/gui/simple-greeter/gdm-chooser-widget.h
@@ -136,6 +136,8 @@ int            gdm_chooser_widget_get_number_of_items          (GdmChooserWidget
 void           gdm_chooser_widget_activate_if_one_item         (GdmChooserWidget          *widget);
 void           gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget          *widget);
 
+/* Protected
+ */
 void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
 
 G_END_DECLS
-- 
1.6.2.2


>From 73b2c5ea212dcd38a5c825f264261138edb1f03d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 17:44:37 -0500
Subject: [PATCH 02/33] Drop duplicated entry introspection output

---
 daemon/gdm-greeter-server.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 2e01d33..cecce83 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -752,7 +752,6 @@ do_introspect (DBusConnection *connection,
                                "      <arg name=\"layout_name\" type=\"s\"/>\n"
                                "    </signal>\n"
                                "    <signal name=\"DefaultSessionNameChanged\">\n"
-                               "    <signal name=\"DefaultSessionNameChanged\">\n"
                                "      <arg name=\"session_name\" type=\"s\"/>\n"
                                "    </signal>\n"
                                "    <signal name=\"TimedLoginRequested\">\n"
-- 
1.6.2.2


>From c785ddc8f889a566dc247847721a19e88ad9a88f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 2 Mar 2009 10:07:03 -0500
Subject: [PATCH 03/33] Make lookup_item not warn when passing NULL for args

gtk_tree_model_get doesn't like NULL, and we allow
NULL for optional return values.

We now check each argument for NULL and call
gtk_tree_model_get individually N times (one for
each argument) instead of just once.
---
 gui/simple-greeter/gdm-chooser-widget.c |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index f0298c6..b1ba9b4 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -2132,13 +2132,30 @@ gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
         }
         g_free (active_item_id);
 
-        gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-                            CHOOSER_IMAGE_COLUMN, image,
-                            CHOOSER_NAME_COLUMN, name,
-                            CHOOSER_PRIORITY_COLUMN, priority,
-                            CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use,
-                            CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate,
-                            -1);
+        if (image != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_IMAGE_COLUMN, image, -1);
+        }
+
+        if (name != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_NAME_COLUMN, name, -1);
+        }
+
+        if (priority != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_PRIORITY_COLUMN, priority, -1);
+        }
+
+        if (is_in_use != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, -1);
+        }
+
+        if (is_separate != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1);
+        }
 
         return TRUE;
 }
-- 
1.6.2.2


>From d888673141c9b947ccada6293600765f618c2ef5 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 15:35:00 -0500
Subject: [PATCH 04/33] Drop "stopped" signal from worker-job class

It was unused, dead code.
---
 daemon/gdm-session-direct.c     |   14 --------------
 daemon/gdm-session-worker-job.c |   11 -----------
 daemon/gdm-session-worker-job.h |    1 -
 3 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 34a126f..3942ec7 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -1548,13 +1548,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
 }
 
 static void
-worker_stopped (GdmSessionWorkerJob *job,
-                GdmSessionDirect    *session)
-{
-        g_debug ("GdmSessionDirect: Worker job stopped");
-}
-
-static void
 worker_started (GdmSessionWorkerJob *job,
                 GdmSessionDirect    *session)
 {
@@ -1605,10 +1598,6 @@ start_worker (GdmSessionDirect *session)
         session->priv->job = gdm_session_worker_job_new ();
         gdm_session_worker_job_set_server_address (session->priv->job, session->priv->server_address);
         g_signal_connect (session->priv->job,
-                          "stopped",
-                          G_CALLBACK (worker_stopped),
-                          session);
-        g_signal_connect (session->priv->job,
                           "started",
                           G_CALLBACK (worker_started),
                           session);
@@ -1630,9 +1619,6 @@ static void
 stop_worker (GdmSessionDirect *session)
 {
         g_signal_handlers_disconnect_by_func (session->priv->job,
-                                              G_CALLBACK (worker_stopped),
-                                              session);
-        g_signal_handlers_disconnect_by_func (session->priv->job,
                                               G_CALLBACK (worker_started),
                                               session);
         g_signal_handlers_disconnect_by_func (session->priv->job,
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 6723464..633d6e2 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -68,7 +68,6 @@ enum {
 
 enum {
         STARTED,
-        STOPPED,
         EXITED,
         DIED,
         LAST_SIGNAL
@@ -390,16 +389,6 @@ gdm_session_worker_job_class_init (GdmSessionWorkerJobClass *klass)
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE,
                               0);
-        signals [STOPPED] =
-                g_signal_new ("stopped",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (GdmSessionWorkerJobClass, stopped),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
         signals [EXITED] =
                 g_signal_new ("exited",
                               G_OBJECT_CLASS_TYPE (object_class),
diff --git a/daemon/gdm-session-worker-job.h b/daemon/gdm-session-worker-job.h
index d42eb37..5ad1c92 100644
--- a/daemon/gdm-session-worker-job.h
+++ b/daemon/gdm-session-worker-job.h
[...17581 lines suppressed...]
diff --git a/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am b/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am
new file mode 100644
index 0000000..e79d85b
--- /dev/null
+++ b/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am
@@ -0,0 +1,5 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA = gdm-smartcard.png
+
+EXTRA_DIST = $(icons_DATA)
diff --git a/gui/simple-greeter/plugins/smartcard/icons/48x48/gdm-smartcard.png b/gui/simple-greeter/plugins/smartcard/icons/48x48/gdm-smartcard.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d5578d9ec83ae6b17aa7230c1b4df34e13e2cc
GIT binary patch
literal 4202
zcmV-w5S8zVP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXJ-
z6cal&#5zC#000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM at dakSAh-}000lgNkl<Z
zXx{Cad2C$AeaAoZ-rIw_ORjkBl9DKjl6A0T?0~kcgIw8)k0g$Q#I9>2aFf(X>ozT5
zC$5a<Xi*?(0=rFf6bRrpMPt-W(?*Sv>Zk)aA|*R=Bt;5o9kwWGLxmKt<-N<j-g`6C
zKlUJ3l-;CF+!n|H4|~j;neT6Yzu))wo8Q2%+b_Mf12Mq*{{nae at VmgbOw*hMbn*G(
z|5d;(z(;`ROw+tp0vw4%+=m`|NPq2XU(=nPoeFsQ=b7y7P*W6m7jUP?<9WB^IIRHn
z_4O(iiy5(4jPCAkHg4Q#3LyYEbm)+{aN&ZXwf<ibpdPprxYO(PzT39#O#tC=SoQSu
z7(G2b^z`(wWy==BFpP?UB>{vG7>41KQobz$)Btw?d%RxnyB)`A*IJ8UFsQn_yUTz(
zIywx~G;av_`rnpip|uYDs!S+YWQjXH9?w0l>%LQKZTS6uy>sVI(cRrmPfriG+;WTI
z at p#@6 at Iu;UXgp0zq>6^HuiPI91TYLkD5ZWW0{DTQz#hx8?o~?Nrj#<hUa#J^ZJX%n
z=^+-2(bd%@yk74O!RBp=X&TI>^8Cli339gNwym|C9-PB*HI at kv?`fqW>?@BILKy#D
z4S0a<MZotcrFJN#Jf>;tuC6Y+ySqg!7UTBYZx?>Q|Av62(oD=`2?xClT$$(W&^%g!
zTIQ6mo}a-m1X^pf7EI3NXk4{4pHeFHiwMvG>@`jEE+8hQ^c#kuJ3Bk+>FE)%Sd1Mz
zc8Fjw_@?GCIhSXAHcNDspBGO};7E<_NQ5YWEH$6Uz?B-Qba9Tt=f>65<vGLQFyi_J
z-a>#Ugb-f=#OBSLRV)@WcJJQJ&Ye3&I2?Xcz^>Gsxim*Q?-KBt3|v`2Duq&D7y_j<
z0x%8GT2LLZXlt%!eN&J%4OM6j-+g(6iP<cUs~DTkvZ<x!7j{Ttnr8OVM<4Y+_0&_;
z*Vn%#LyROc96vve&to#T=#aHtl+rAxYma3hl_peWvA!w9`lbMD8-w^f#)>&p8JBMy
zy3F*%&q)02ENiPXEG{l``t)fA1_rW9sr5kOEj1ve^tZRS)6mec0`UBz&A;|tBkxE8
zJ`-DNTvuTTQMPBVWuO4R$D}nHpshK?+Qt9 at f2Dh6vsn^}1XEK}BoYa1+on2P$8&%6
zXIvfZ$23jq>+2Chkjv#zN>u?Pz<%H<VEj#eKq*z;9i=qKUYjD7aT%M<Vmk#Y%Q*_A
zG+s-fw7_o}tcwO|YYx%U7$6j=q|9_WO(KyXkw`E(IY~O5UhbfL|NGzP at ZrNWH#hU}
z!w<7_=T2&CYY{?_&1RXNp60}f6W(LTjy;l0Cf^G at 27LF10u*TrfFJZv5+6<BNI+{0
zLtqMlX$o2*0X8&;Xo&==304ALSXe0UZX%H&o6S~ovENT55}~1?fv2B-nu7-qa`)YL
zbN~JK)6vnv{QNv~b91CpDU!(~Qp!?1;n1N&bprzf`+?sFzOh1pTrP(Yf^^R1%C$vY
zsf%U=yKj!r)*Pg^+E*T=wPtp9whVY`YKnY5UjaA}2oQ-xh(@DCqfu&VY7j#3)vtb)
z7hZUQ2OfBUM;>{Erluyw#>N;L8e(*Gv`DLkM=6Eh at 8_O-?!oKzic_afJqug{j#UWY
zI1WMx{9Y4}DUeEFnSyt9HPNv?jFgh;>FJ6cc3rnJpQx!J5{Z<b>gwtW?Zo48;_*12
z``qW)zI{6nKKLN5t*wlWjnUuVPdc4OO3Cu*tCS+0PNS5ftE-FQ;bCK9V&ZR$v at chf
zkjFCFxTc!(L-W*!{dBgi;_~Io^!N9#0K96|Dx%RSjg5^&qfr8ZKzY%*xj8OgyvW4F
z1XEK}<Z`)EmI=Up_ua>>x86!T9_QS-bIi`plFQ}rcswhZN^6ajlEuYEVzC(e_wU~V
z+zY(8LIVqFhs)QJ0IY2cAcP>F&!d#0zP_GlG)g2Ap|P=%QWSPwm+9$g;_-OdoE*og
z01*m>XliQW%9Sf at -MW=syLK@>JxwZ=VrXcH^XJdAdi838!626|T_TxG(%9I@=FOYS
zb7V3ZJRT2`NQ6Wp@!QJ<P}ywO5JE6Il|gG!%wG!3bo0$O)7jZcDU-BqyKF{@M1q-_
znF_TFA*ijbE!%!cJM;7N3=R(Rfe(Cuwzf6~2M0NK?i>RH14t>!X0sePaDb|+Dtta4
zufP5}>(;HKy}g}yJWeK)K}yM*HET#D5_gq-z%<Q_5F#XmU|lqbD+|E&vS4PKCPD~K
zo;=Cm;9$k>nx;u(V<SyXO=S&vz1|h3FfuZNQi?5GwqV;fN-4(2#~B|Vr at OnG0|ySU
zckf=FfBt!%efC-Q?c0aX=VQZ$4Gawpk;~=CX0wDsq0%8~6)<lt-?^Hg4<QOkmz25!
zgb)J9ams2eF-${41D0jIX>MPRx)Uz}P+MC|E|(*h%P~DYjo0fXolcX at W|^3n;K?VS
z<jk2fg}gl&WaGw-^!E0W$z({SQY_2IYRUp6lSzaSj83NusemoZnph5K_wL;{1n4*p
zQ&UsS&CRiK<3_5gs>=PjT#i5a<Hz{MKm1EsV~*pH&*#bIa`=2cT-Rmm*3AeOxpeV|
zgaVT7x3yAN7ow%5rR<BTREkI>QW?mE5b2T$nTAnL5%hH+mw(UYawHN7CMG7BoSbBK
zcDC#XmSxf2-d=ux&mFsn4_)CepZOr~-DB`-zg6b=QkMFm4`zAa9rIv#i`l6cfsfvw
z_z8tV<+xB{xngSqhOH8x3L#k27{o9{kzJNdD3i&Q!A?v}Fh4)Pf>N8BnrLorrmd~5
zBC`MZ%vp~A^A0vdhpDPHkW!Sv=ks~A)_B7YQoHF6K%;R$=YcHQS6;()T|6F7S%CJ<
zbqo!K7#mys4zSHC0Te=DI}%+K&@JZcGcz+BJb17yxe$W-`uZ~9Xf#@3GS_Qtdshpd
zwL$D_<2Z{M=10zx+0coUlJW6zgb*Yyo<{4fMa?VFE?|@Y=}Y|0muHAXA{a&?n~etY
z9P4|4p56OfCnvLCu!Imf*L4eElX(zJ0YnHvFc_q*t*y-E(P;FBEOY(uGv_CfN at Iyd
zG=jRG)y$q8<eu>NID7Ow6H`@eTVF+6OPB|KYcpCU3TtbPMgo#YKK*`%esqSRvqNln
zpqi at 2ChmQx6*WK2XMblkk3SRtJqyT}R35DhAP@)vj$3fzKp?=LJ$v31aC~^4{x=eA
zXj#R{fia%>`ybP`HcWiDU}lTM)ujQ{++^d8y6n0%1+77R?~CGDRgI<Mq~jx$c2DJP
zoW(iZ#U!D{6z#Ps94mvnkmtwGoF#gbCL(QsbC%Xx+qPX!CF*LtjL%5WOCYs|BR?8u
z&yIDNMx`KoKJuLvIeL6}o_!y?jc>ki0dHM>MW1&~E51#8(B?Z)b2G at 9BjiR-q4GA`
z1ub=fK}=Ct*j6}6g`JexNsUf|*Y6{37kt7}N;%nV79j+wjLp=14y`qgT5{rlI`BH5
z{mKvd{1e at L^!^UAIhUc)1+HFO;Fhh8oWDGcl$uX|^j7xn*+4^G6}2^f9{+F`vDn{L
z20p7A?c0LsjY3r&qTw=za|xYyakFs#oWrS~*yucTzr#yQorzb0vK2C~srG4v)|3pQ
zM5AR5h>{xR(mC-vFAnngC%W-i2J7yu1oZVkzl;0s*uX+6PhHsmU!P$`9z1I?gdc^x
zt`9mkTYUR_S^n|gGW_BFK_3555VOj_sxol18q=#;KFm@|=@P?K`7AcIgt;&@%krwE
zWg5KNKgNqM4*{_6W4G~}_ipC-e}A2u*41JfVg>lwWR9!jDW>ML#nMs{q)Z@$4<V`$
zI(I`M>sA?5`wY$vF6CHez{E%@3`>BkDOHUut+h_2QsozaHc|NQ$fdzg?~8Hx=udg_
z(OcQlR#*Q2Q;*%gl=Cmz42>tbG(5-E at f1>O6q;<lG7U%P5iDRBQIuX-0e*Bs^1|U9
zA+KOzPBJsEsr7 at f1eg?n%gPhkf-Xb}k#{6nyVSd+gDq`!6~F-&GY&)JNv at 2{6CX=r
zI|?Ddc4Ya`Z<z*TSKj~{E5;gX3`5+Ez^Ksl=(yz0ho-3#28}_Jkk23<m)zD-$b<{U
zV1<@Tl at P1Q`5F*Dk4bZVfU)Ux!BNMOw5=}GYBD*OtK&)H*XFrAnk1KZF at zxR6a+4T
z_E-j0K8tMLWov6K+qd5i*H_8q2trf=mBrpnPJ=551q&ur8#LH-)6zRyszQZNQ4Y8k
zKq{3gFLC#_7M?r&1_0lF=`v0ARV-#4k{KJ*Fp5<QUEC3YWf}ylETVNmGC7AmU2E8|
zW~m^yf9+bH`{r at J@NplaR63Qz7=|CND}NdSLSBPvpCIHD+!gau8y2WsVLdkw%GEe>
zX-_O5v;07EtbcS_^-VG|xmachDJ7OAFfh5jGlJ`CydHyHoz3{XW<?F?`0?W$J$jV>
z{(dz$IAT2ho_d-#6|#4&hB1V1g$WsgB6x$QI*YsCwN&|#S%sTbNE at USNTtgHIC@#}
zG8FJ)ngXp0H6j3yX`s=3<h|`A<}yTT1GGe!YOl6!^U5o)(%ak1kt0Xci4!Mq9LEqs
zIKU~O?T@~cTK%mrh6&ahpdGZ%-+*EZ;6pxx_wDuL_X||6U at qx#7n#!}^MZO)VB5N~
ztWs+4?_N*9XOhiJ?%uW*LkJRcS?X$hghM`Bq9I(@<-~~-^!4 at 8+uN&NdF2(I&*x1c
zgfa}{jFhq$=+#;u2hzZA^q#iQ9DF(Nf3U&88w7m=23oh)<WD~n;I)&A9Xm|0HOhtg
zOE&pgNirvx&YHBY64-X(Hpl|(<pOvtgZJ!ct(dsgXEHD_PzHST=uw@?WK1E17DAj;
zN*w|EwAL?6DU&y#_Sb>WJoXpKFL!MA(BVttUA6Kx!+>2od~AOws2nU#N~T`3Nv9y~
zm^h|M`!<7cBlMoN0Zv;$_WFsm)?B!7f!^L;`uh5GZ*Q+kCX;57$_9&od$ratYprK~
z&O-86fXE$>&V1^7U-z<O?h}~N-3ae2NQt&J+6HZFR37F>HPRK--Qpu^f!9}X+|e<~
z6MvoI at K5qN;7er_x_I#-M~@z*udk0IM~=vunHdwn<M9kRj`IVc59m`$P5uw=(?0D=
zCiecp_+Q at oj*NHT$86R&&JpmWK}#G*<JyqSXlCaWqf?UcDaGJbR}EZojghHx1Un6U
z95^k2PZW2jbR-;gUH2uRw+Q;$uiz$g3-HO}UE4;$cU}JskOD at 5X<!(b0^TTszgl*D
zzzcl1NbX00pT5l(-zE at V7Wx+e#jo41+uPIr6KfBhqy$$z_y7O^07*qoM6N<$f=Ipg
ARR910

literal 0
HcmV?d00001

diff --git a/gui/simple-greeter/plugins/smartcard/icons/Makefile.am b/gui/simple-greeter/plugins/smartcard/icons/Makefile.am
new file mode 100644
index 0000000..c20f10d
--- /dev/null
+++ b/gui/simple-greeter/plugins/smartcard/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 16x16 48x48
-- 
1.6.2.2


>From 771ee68a51d5140130116b4ab5aa67dae7334969 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 13 Apr 2009 16:50:11 -0400
Subject: [PATCH 33/33] Add icon for fingerprint plugin

We were just using some random one before
---
 configure.ac                                       |    3 +++
 gui/simple-greeter/plugins/fingerprint/Makefile.am |    2 ++
 .../fingerprint/gdm-fingerprint-extension.c        |    2 +-
 .../plugins/fingerprint/icons/16x16/Makefile.am    |    5 +++++
 .../plugins/fingerprint/icons/48x48/Makefile.am    |    5 +++++
 .../plugins/fingerprint/icons/Makefile.am          |    1 +
 6 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am
 create mode 100644 gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am
 create mode 100644 gui/simple-greeter/plugins/fingerprint/icons/Makefile.am

diff --git a/configure.ac b/configure.ac
index aa54a9b..287dfa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1410,6 +1410,9 @@ gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc
 gui/simple-greeter/plugins/Makefile
 gui/simple-greeter/plugins/password/Makefile
 gui/simple-greeter/plugins/fingerprint/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile
+gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile
 gui/simple-greeter/plugins/smartcard/Makefile
 gui/simple-greeter/plugins/smartcard/icons/Makefile
 gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile
diff --git a/gui/simple-greeter/plugins/fingerprint/Makefile.am b/gui/simple-greeter/plugins/fingerprint/Makefile.am
index d5f7e28..25fb6e8 100644
--- a/gui/simple-greeter/plugins/fingerprint/Makefile.am
+++ b/gui/simple-greeter/plugins/fingerprint/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 NULL =
 PAM_SERVICE_NAME = gdm-fingerprint
 
diff --git a/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
index 63f6ef3..316ef46 100644
--- a/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
+++ b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
@@ -297,7 +297,7 @@ gdm_fingerprint_extension_init (GdmFingerprintExtension *extension)
                                                        GDM_TYPE_FINGERPRINT_EXTENSION,
                                                        GdmFingerprintExtensionPrivate);
 
-        extension->priv->icon = g_themed_icon_new ("stock_allow-effects");
+        extension->priv->icon = g_themed_icon_new ("gdm-fingerprint");
         create_page (extension);
         create_actions (extension);
         gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension));
diff --git a/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am b/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am
new file mode 100644
index 0000000..f42e317
--- /dev/null
+++ b/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am
@@ -0,0 +1,5 @@
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+
+icons_DATA = gdm-fingerprint.png
+
+EXTRA_DIST = $(icons_DATA)
diff --git a/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am b/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am
new file mode 100644
index 0000000..f4ab2a0
--- /dev/null
+++ b/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am
@@ -0,0 +1,5 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA = gdm-fingerprint.png
+
+EXTRA_DIST = $(icons_DATA)
diff --git a/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am b/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am
new file mode 100644
index 0000000..c20f10d
--- /dev/null
+++ b/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 16x16 48x48
-- 
1.6.2.2



--- NEW FILE gdm-fingerprint.pam ---
auth        substack      fingerprint-auth
auth        required      pam_succeed_if.so user != root quiet

account     required      pam_nologin.so
account     include       fingerprint-auth

password    include       fingerprint-auth

session     required      pam_selinux.so close
session     required      pam_loginuid.so
session     optional      pam_console.so
session     required      pam_selinux.so open
session     optional      pam_keyinit.so force revoke
session     required      pam_namespace.so
session     include       fingerprint-auth


--- NEW FILE gdm-password.pam ---
auth        substack      password-auth
auth        required      pam_succeed_if.so user != root quiet
auth        optional      pam_gnome_keyring.so

account     required      pam_nologin.so
account     include       password-auth

password    include       password-auth

session     required      pam_selinux.so close
session     required      pam_loginuid.so
session     optional      pam_console.so
session     required      pam_selinux.so open
session     optional      pam_keyinit.so force revoke
session     required      pam_namespace.so
session     optional      pam_gnome_keyring.so auto_start
session     include       password-auth


--- NEW FILE gdm-smartcard.pam ---
auth        substack      smartcard-auth
auth        required      pam_succeed_if.so user != root quiet

account     required      pam_nologin.so
account     include       smartcard-auth

password    include       smartcard-auth

session     required      pam_selinux.so close
session     required      pam_loginuid.so
session     optional      pam_console.so
session     required      pam_selinux.so open
session     optional      pam_keyinit.so force revoke
session     required      pam_namespace.so
session     include       smartcard-auth


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- gdm.spec	23 Mar 2009 15:39:07 -0000	1.460
+++ gdm.spec	13 Apr 2009 21:29:14 -0000	1.461
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -23,7 +23,13 @@
 Source: http://download.gnome.org/sources/gdm/2.25/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
-Source3: gdmsetup-pam
+Source3: gdm-password.pam
+Source4: gdm-smartcard.pam
+Source5: gdm-fingerprint.pam
+Source6: gdm-smartcard-16.png
+Source7: gdm-smartcard-48.png
+Source8: gdm-fingerprint-16.png
+Source9: gdm-fingerprint-48.png
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /usr/sbin/useradd
@@ -90,7 +96,6 @@
 # should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
 
-Patch14: gdm-2.25.2-multistack-but-boring.patch
 Patch15: gdm-2.25.2-start-faster.patch
 
 Patch16: gdm-2.25.2-dont-depend-on-hostname.patch
@@ -99,6 +104,7 @@
 Patch17: gdm-2.26.0-clean-up-auth-entries.patch
 
 Patch18: gdm-2.26.0-load-settings-for-other-user.patch
+Patch19: gdm-2.26.0-multistack.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -110,6 +116,16 @@
 Obsoletes: fast-user-switch-applet
 Provides:  fast-user-switch-applet = %{epoch}:%{version}-%{release}
 
+%package plugin-smartcard
+Summary:   GDM smartcard plugin
+Group:     User Interface/Desktops
+Requires:  gdm = %{epoch}:%{version}-%{release}
+
+%package plugin-fingerprint
+Summary:   GDM fingerprint plugin
+Group:     User Interface/Desktops
+Requires:  gdm = %{epoch}:%{version}-%{release}
+
 %description
 GDM provides the graphical login screen, shown shortly after boot up,
 log out, and when user switching.
@@ -118,6 +134,12 @@
 The GDM user switcher applet provides a mechanism for changing among
 multiple simulanteous logged in users.
 
+%description plugin-smartcard
+The GDM smartcard plugin provides functionality necessary to use a smart card with GDM.
+
+%description plugin-fingerprint
+The GDM fingerprint plugin provides functionality necessary to use a fingerprint reader with GDM.
+
 %prep
 %setup -q
 %patch2 -p1 -b .force-active-vt
@@ -125,11 +147,11 @@
 %patch4 -p1 -b .append-logs
 %patch13 -p1 -b .system-keyboard
 
-%patch14 -p1 -b .multistack-but-boring
 %patch15 -p1 -b .start-faster
 %patch16 -p1 -b .dont-depend-on-hostname
 %patch17 -p1 -b .clean-up-auth-entries
 %patch18 -p1 -b .load-settings-for-other-user
+%patch19 -p1 -b .multistack
 
 %patch99 -p1 -b .fedora-logo
 
@@ -138,7 +160,13 @@
 %build
 cp -f %{SOURCE1} data/gdm
 cp -f %{SOURCE2} data/gdm-autologin
-cp -f %{SOURCE3} utils/gdmsetup-pam
+cp -f %{SOURCE3} gui/simple-greeter/plugins/password/gdm-password.pam
+cp -f %{SOURCE4} gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam
+cp -f %{SOURCE5} gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam
+cp -f %{SOURCE6} gui/simple-greeter/plugins/smartcard/icons/16x16/gdm-smartcard.png
+cp -f %{SOURCE7} gui/simple-greeter/plugins/smartcard/icons/48x48/gdm-smartcard.png
+cp -f %{SOURCE8} gui/simple-greeter/plugins/fingerprint/icons/16x16/gdm-fingerprint.png
+cp -f %{SOURCE9} gui/simple-greeter/plugins/fingerprint/icons/48x48/gdm-fingerprint.png
 
 %configure --with-pam-prefix=%{_sysconfdir} \
 	   --enable-profiling      \
@@ -192,7 +220,6 @@
 
 rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-greeter-extension.h
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gdm-password
 
 %find_lang gdm --with-gnome
 
@@ -297,6 +324,7 @@
 %config %{_sysconfdir}/gdm/PostSession/*
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdm-autologin
+%config %{_sysconfdir}/pam.d/gdm-password
 # not config files
 %{_sysconfdir}/gdm/Xsession
 %{_sysconfdir}/gdm/gdm.schemas
@@ -345,14 +373,29 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
 
-
 %files user-switch-applet
 %defattr(-, root, root)
 %{_libexecdir}/gdm-user-switch-applet
 %{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
+%files plugin-smartcard
+%defattr(-, root, root)
+%config %{_sysconfdir}/pam.d/gdm-smartcard
+%{_datadir}/gdm/simple-greeter/extensions/smartcard/page.ui
+%{_libdir}/gdm/simple-greeter/plugins/smartcard.so
+%{_libexecdir}/gdm-smartcard-worker
+
+%files plugin-fingerprint
+%defattr(-, root, root)
+%config %{_sysconfdir}/pam.d/gdm-fingerprint
+%{_datadir}/gdm/simple-greeter/extensions/fingerprint/page.ui
+%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
+
 %changelog
+* Mon Apr 13 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.0-8
+- Add less boring multistack patch for testing
+
 * Mon Mar 23 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.0-7
 - Load session and language settings when username is read on
   Other user



From cebbert at fedoraproject.org  Mon Apr 13 21:38:20 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 13 Apr 2009 21:38:20 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, NONE,
	1.1 kernel.spec, 1.1322, 1.1323
Message-ID: <20090413213820.2E6F270124@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10224

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch 
Log Message:
Fix oops in md raid1 resync (F11#495550)

linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch:

--- NEW FILE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch ---
From: NeilBrown <neilb at suse.de>
Date: Mon, 6 Apr 2009 04:40:38 +0000 (+1000)
Subject: md/raid1 - don't assume newly allocated bvecs are initialised.
X-Git-Tag: v2.6.30-rc1~176^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=303a0e11d0ee136ad8f53f747f3c377daece763b

md/raid1 - don't assume newly allocated bvecs are initialised.

Since commit d3f761104b097738932afcc310fbbbbfb007ef92
newly allocated bvecs aren't initialised to NULL, so we have
to be more careful about freeing a bio which only managed
to get a few pages allocated to it.  Otherwise the resync
process crashes.

This patch is appropriate for 2.6.29-stable.

Cc: stable at kernel.org
Cc: "Jens Axboe" <jens.axboe at oracle.com>
Reported-by: Gabriele Tozzi <gabriele at tozzi.eu>
Signed-off-by: NeilBrown <neilb at suse.de>
---

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b4f4bad..f2247b0 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -123,6 +123,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 				goto out_free_pages;
 
 			bio->bi_io_vec[i].bv_page = page;
+			bio->bi_vcnt = i+1;
 		}
 	}
 	/* If not user-requests, copy the page pointers to all bios */
@@ -138,9 +139,9 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 	return r1_bio;
 
 out_free_pages:
-	for (i=0; i < RESYNC_PAGES ; i++)
-		for (j=0 ; j < pi->raid_disks; j++)
-			safe_put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
+	for (j=0 ; j < pi->raid_disks; j++)
+		for (i=0; i < r1_bio->bios[j]->bi_vcnt ; i++)
+			put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
 	j = -1;
 out_free_bio:
 	while ( ++j < pi->raid_disks )


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1322
retrieving revision 1.1323
diff -u -r1.1322 -r1.1323
--- kernel.spec	13 Apr 2009 18:21:11 -0000	1.1322
+++ kernel.spec	13 Apr 2009 21:38:18 -0000	1.1323
@@ -690,6 +690,9 @@
 
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
+# fix oops in md raid1 (#495550)
+Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
 
@@ -899,12 +902,14 @@
 %endif
 
 # more sanity checking; do it quietly
-for patch in %{patches} ; do
-  if [ ! -f $patch ] ; then
-    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
-    exit 1
-  fi
-done 2>/dev/null
+if [ "%{patches}" != "%%{patches}" ] ; then
+  for patch in %{patches} ; do
+    if [ ! -f $patch ] ; then
+      echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+      exit 1
+    fi
+  done 2>/dev/null
+fi
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -1274,6 +1279,8 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
+ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
 ApplyPatch squashfs-fixups.patch
@@ -1863,6 +1870,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-22
+- Fix oops in md raid1 resync (F11#495550)
+
 * Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-21
 - Copy ALSA pulseaudio fixes from F-11.
 



From rstrode at fedoraproject.org  Mon Apr 13 21:41:32 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 13 Apr 2009 21:41:32 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.461,1.462
Message-ID: <20090413214133.0964870124@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11181

Modified Files:
	gdm.spec 
Log Message:
Ease up on patch fuzz requirements



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- gdm.spec	13 Apr 2009 21:29:14 -0000	1.461
+++ gdm.spec	13 Apr 2009 21:41:02 -0000	1.462
@@ -11,6 +11,7 @@
 %define consolekit_version 0.2.7
 %define hal_version 0.5.9
 %define fontconfig_version 2.6.0
+%define _default_patch_fuzz 999
 
 Summary: The GNOME Display Manager
 Name: gdm



From cwickert at fedoraproject.org  Mon Apr 13 21:44:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 21:44:33 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xfce4-power-manager.spec, 1.7,
	1.8 xfce4-power-manager-0.8.0beta1-button-hal.patch, 1.1, NONE
Message-ID: <20090413214434.315AA70137@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12697

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Removed Files:
	xfce4-power-manager-0.8.0beta1-button-hal.patch 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta2
- Update to 0.8.0beta2
- Drop xfpm-button-hal.patch, no longer necessary



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2009 23:18:52 -0000	1.5
+++ .cvsignore	13 Apr 2009 21:44:01 -0000	1.6
@@ -1 +1 @@
-xfce4-power-manager-0.8.0beta1.tar.bz2
+xfce4-power-manager-0.8.0beta2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2009 23:18:52 -0000	1.5
+++ sources	13 Apr 2009 21:44:01 -0000	1.6
@@ -1 +1 @@
-6d860b824430b654d084d7fb9db1c279  xfce4-power-manager-0.8.0beta1.tar.bz2
+7cb430b70876740daba4cc424473deca  xfce4-power-manager-0.8.0beta2.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-power-manager.spec	13 Apr 2009 20:35:13 -0000	1.7
+++ xfce4-power-manager.spec	13 Apr 2009 21:44:02 -0000	1.8
@@ -1,16 +1,14 @@
-%define betaversion beta1
+%define betaversion beta2
 
 Name:           xfce4-power-manager
 Version:        0.8.0
-Release:        0.2.%{betaversion}%{?dist}
+Release:        0.1.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
-# Posted on goodies-dev and applied upstream on Apr 11th 2009
-Patch0:         xfce4-power-manager-0.8.0beta1-button-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -31,7 +29,6 @@
 
 %prep
 %setup -qn %{name}-%{version}%{betaversion}
-%patch0 -p1 -b .button-hal
 
 
 %build
@@ -84,6 +81,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta2
+- Update to 0.8.0beta2
+- Drop xfpm-button-hal.patch, no longer necessary
+
 * Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
 - Add xfpm-button-hal.patch by Mike Massonnet
 


--- xfce4-power-manager-0.8.0beta1-button-hal.patch DELETED ---



From spot at fedoraproject.org  Mon Apr 13 21:44:54 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 13 Apr 2009 21:44:54 +0000 (UTC)
Subject: rpms/audio-entropyd/devel audio-entropyd-1.0.5-alsa.patch, NONE,
	1.1 audio-entropyd.spec, 1.14, 1.15
Message-ID: <20090413214454.0C2A170137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/audio-entropyd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12910

Modified Files:
	audio-entropyd.spec 
Added Files:
	audio-entropyd-1.0.5-alsa.patch 
Log Message:
port from OSS to ALSA

audio-entropyd-1.0.5-alsa.patch:

--- NEW FILE audio-entropyd-1.0.5-alsa.patch ---
diff -up audio-entropyd-1.0.5/audio-entropyd.c.alsa audio-entropyd-1.0.5/audio-entropyd.c
--- audio-entropyd-1.0.5/audio-entropyd.c.alsa	2008-09-28 10:34:06.000000000 -0400
+++ audio-entropyd-1.0.5/audio-entropyd.c	2009-04-13 16:52:50.000000000 -0400
@@ -62,6 +62,10 @@
  **
  ** 02Apr2007  Folkert van Heusden <folkert at vanheusden.com>
  **            Added entropy-tester
+ **
+ ** 13Apr2009  Tom "spot" Callaway <tcallawa at redhat.com>
+ **            Migrated code to use ALSA (libasound)
+ **            Many thanks to Lennart Poettering
  *
  * $Log: audio-entropyd.c,v $
  * Revision 0.5  2003/01/27 17:39:31  folkert
@@ -86,6 +90,7 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 
+#include <alsa/asoundlib.h>
 #include <linux/soundcard.h>
 #include <asm/types.h>
 #include <linux/random.h>
@@ -97,7 +102,6 @@
 #include "RNGTEST.h"
 #include "error.h"
 
-#define DEFAULT_DSP_DEV				"/dev/dsp"
 #define RANDOM_DEVICE				"/dev/random"
 #define URANDOM_DEVICE				"/dev/urandom"
 #define DEFAULT_INPUT_BUFFER_SIZE		16384
@@ -112,21 +116,25 @@ int treshold = 0;
 char skip_test = 0;
 int error_state = 0;
 
+static char *cdevice = "hw:0";				/* capture device */
+static snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE;	/* sample format */
+static unsigned int channels = 2;			/* 2 channels = stereo */
+const char *id = "capture";
+int err;
+
 #define max(x, y)	((x)>(y)?(x):(y))
 
 /* Prototypes */
-void main_loop(const char *dsp_device, int read_size, int sample_rate);
-int setup_dsp_device(const char *dsp_device, int sample_rate);
+void main_loop(const char *cdevice, int read_size, int sample_rate);
+int setparams(snd_pcm_t *chandle, int sample_rate);
 void usage(void);
 void credit_krng(int random_fd, struct rand_pool_info *entropy);
 void daemonise(void);
 void gracefully_exit(int signum);
 void logging_handler(int signum);
-void get_random_data(char *input_buffer, int read_size, int sample_rate, int *n_output_bytes, char *output_buffer);
+void get_random_data(snd_pcm_t *chandle, char *input_buffer, int read_size, int sample_rate, int *n_output_bytes, char *output_buffer);
 int add_to_kernel_entropyspool(int handle, char *buffer, int nbytes);
 
-char *dsp_device = DEFAULT_DSP_DEV;
-
 /* Functions */
 
 int main(int argc, char **argv)
@@ -137,7 +145,7 @@ int main(int argc, char **argv)
 	static struct option long_options[] =
 	{
 		{"read-size",	1, NULL, 'r' },
-		{"dsp-device",	1, NULL, 'd' },
+		{"device",	1, NULL, 'd' },
 		{"sample-rate",	1, NULL, 'N' },
 		{"skip-test",	0, NULL, 's' },
 		{"verbose",	0, NULL, 'v' },
@@ -167,7 +175,7 @@ int main(int argc, char **argv)
 				break;
 
 			case 'd':
-				dsp_device = strdup(optarg);
+				cdevice = strdup(optarg);
 				break;
 
 			case 'N':
@@ -211,37 +219,52 @@ int main(int argc, char **argv)
 
 	daemonise();
 
-	main_loop(dsp_device, read_size, sample_rate);
+	main_loop(cdevice, read_size, sample_rate);
 
 	exit(0);
 }
 
-int setup_dsp_device(const char *dsp_device, int sample_rate)
+int setparams(snd_pcm_t *chandle, int sample_rate)
 {
-	int dsp_fd, setting;
+	snd_pcm_hw_params_t *ct_params;		/* templates with rate, format and channels */
+	snd_pcm_hw_params_alloca(&ct_params);
 
-	/* Open sound device */
-	dsp_fd = open(dsp_device, O_RDONLY);
-	if (dsp_fd == -1)
-		error_exit("Could not open %s for reading: %m", dsp_device);
-
-	/* Set sample rate */
-	if (set_soundcard_sample_rate(dsp_fd, sample_rate) == -1)
-		error_exit("Could not set %i sample rate", sample_rate);
+	err = snd_pcm_hw_params_any(chandle, ct_params);
+	if (err < 0)
+		error_exit("Broken configuration for %s PCM: no configurations available: %s", id, snd_strerror(err));
+
+	/* Disable rate resampling */
+	err = snd_pcm_hw_params_set_rate_resample(chandle, ct_params, 0);
+	if (err < 0)
+		error_exit("Could not disable rate resampling: %s", snd_strerror(err));
+
+	/* Set access to SND_PCM_ACCESS_RW_INTERLEAVED */
+	err = snd_pcm_hw_params_set_access(chandle, ct_params, SND_PCM_ACCESS_RW_INTERLEAVED);
+	if (err < 0)
+		error_exit("Could not set access to SND_PCM_ACCESS_RW_INTERLEAVED: %s", snd_strerror(err));
+
+	/* Restrict a configuration space to have rate nearest to our target rate */
+	err = snd_pcm_hw_params_set_rate_near(chandle, ct_params, &sample_rate, 0);
+	if (err < 0)
+		error_exit("Rate %iHz not available for %s: %s", sample_rate, id, snd_strerror(err));
 
 	/* Set sample format */
-	setting = AFMT_S16_LE; /* 16 bit little endian */
-	if (ioctl(dsp_fd, SNDCTL_DSP_SETFMT, &setting) == -1)
-		error_exit("Could not set 16 bit sample mode: %m");
+	err = snd_pcm_hw_params_set_format(chandle, ct_params, format);
+	if (err < 0)
+		error_exit("Sample format not available for %s: %s", id, snd_strerror(err));
 
 	/* Set stereo */
-	if (set_soundcard_number_of_channels(dsp_fd, 2) == -1)
-		error_exit("Could not set stereo sample mode: %m");
-
-	return(dsp_fd);
+	err = snd_pcm_hw_params_set_channels(chandle, ct_params, channels);
+	if (err < 0)
+		error_exit("Channels count (%i) not available for %s: %s", channels, id, snd_strerror(err));
+
+	/* Apply settings to sound device */
+	err = snd_pcm_hw_params(chandle, ct_params);
+	if (err < 0)
+		error_exit("Could not apply settings to sound device!");
 }
 
-void main_loop(const char *dsp_device, int read_size, int sample_rate)
+void main_loop(const char *cdevice, int read_size, int sample_rate)
 {
 	unsigned char output_buffer[read_size];
 	char input_buffer[max(read_size, DEFAULT_CLICK_READ)];
@@ -249,6 +272,11 @@ void main_loop(const char *dsp_device, i
 	int random_fd = -1, max_bits;
 	FILE *poolsize_fh;
 
+	snd_pcm_t *chandle;
+
+	if ((err = snd_pcm_open(&chandle, cdevice, SND_PCM_STREAM_CAPTURE, 0)) < 0)
+		error_exit("Record open error: %s", snd_strerror(err));
+
 	/* lock buffers in core */
 	if (mlock(output_buffer, sizeof(output_buffer)) == -1 || mlock(input_buffer, sizeof(input_buffer)) == -1)
 		error_exit("Could not lock buffers in core");
@@ -268,7 +296,7 @@ void main_loop(const char *dsp_device, i
 	/* first get some data so that we can immediately submit something when the
 	 * kernel entropy-buffer gets below some limit
 	 */
-	get_random_data(input_buffer, read_size, sample_rate, &n_output_bytes, output_buffer);
+	get_random_data(chandle, input_buffer, read_size, sample_rate, &n_output_bytes, output_buffer);
 
 	/* Main read loop */
 	for(;;)
@@ -308,7 +336,7 @@ void main_loop(const char *dsp_device, i
 			if (ioctl(random_fd, RNDGETENTCNT, &after) == -1)
 				error_exit("Coundn't query entropy-level from kernel: %m");
 
-			get_random_data(input_buffer, read_size, sample_rate, &n_output_bytes, output_buffer);
+			get_random_data(chandle, input_buffer, read_size, sample_rate, &n_output_bytes, output_buffer);
 		}
 
 		if (loggingstate == 1)
@@ -348,9 +376,8 @@ int add_to_kernel_entropyspool(int handl
 
 #define order(a, b)     (((a) == (b)) ? -1 : (((a) > (b)) ? 1 : 0))
 
-void get_random_data(char *input_buffer, int read_size, int sample_rate, int *n_output_bytes, char *output_buffer)
+void get_random_data(snd_pcm_t *chandle, char *input_buffer, int read_size, int sample_rate, int *n_output_bytes, char *output_buffer)
 {
-	int dsp_fd;
 	int n_to_do, bits_out=0, loop;
 	char *dummy;
 	static short psl=0, psr=0; /* previous samples */
@@ -359,29 +386,42 @@ void get_random_data(char *input_buffer,
 
 	*n_output_bytes=0;
 
-	/* Open and set up DSP for reading */
-	dsp_fd = setup_dsp_device(dsp_device, sample_rate);	
+	/* Open and set up ALSA device for reading */
+	setparams(chandle, sample_rate);
 
 	/* Discard the first data read */
 	/* it often contains weird looking data - probably a click from */
 	/* driver loading / card initialisation */
-	read(dsp_fd, input_buffer, DEFAULT_CLICK_READ);
+	int initial_len = snd_pcm_bytes_to_frames(chandle, DEFAULT_CLICK_READ);
+	snd_pcm_sframes_t garbage_frames_read = snd_pcm_readi(chandle, input_buffer, initial_len);
+	/* Make sure we aren't hitting a disconnect/suspend case */
+	if (garbage_frames_read < 0)
+		snd_pcm_recover(chandle, garbage_frames_read, 0);
+	/* Nope, something else is wrong. Bail. */
+	if (garbage_frames_read < 0)
+		error_exit("Read error: %m");
 
 	/* Read a buffer of audio */
-	n_to_do = read_size;
+	n_to_do = snd_pcm_bytes_to_frames(chandle, read_size);
 	dummy = input_buffer;
 	while (n_to_do)
 	{
-		int bytes_read = read(dsp_fd, dummy, n_to_do);
-		if (bytes_read == -1) 
+		snd_pcm_sframes_t frames_read = snd_pcm_readi(chandle, dummy, n_to_do);
+		/* Make	sure we	aren't hitting a disconnect/suspend case */
+		if (frames_read < 0)
+			frames_read = snd_pcm_recover(chandle, frames_read, 0);
+		/* Nope, something else is wrong. Bail.	*/
+		if (frames_read < 0)
+			error_exit("Read error: %m");
+		if (frames_read == -1) 
 		{
 			if (errno != EINTR)
 				error_exit("Read error: %m");
 		}
 		else
 		{
-			n_to_do -= bytes_read;
-			dummy += bytes_read;	
+			n_to_do -= frames_read;
+			dummy += frames_read;	
 		}
 	}
 
@@ -458,8 +498,6 @@ void get_random_data(char *input_buffer,
 			}
 		}
 	}
-
-	close(dsp_fd);
 }
 
 void usage(void)
@@ -469,7 +507,7 @@ void usage(void)
 	fprintf(stderr, "\n");
 	fprintf(stderr, "Options:\n");
 	fprintf(stderr, "--read-size,    -r []  Number of bytes to read at a time. (Default %i)\n", DEFAULT_INPUT_BUFFER_SIZE);
-	fprintf(stderr, "--dsp-device,   -d []  Specify sound device to use. (Default %s)\n", DEFAULT_DSP_DEV);
+	fprintf(stderr, "--device,       -d []  Specify sound device to use. (Default %s)\n", cdevice);
 	fprintf(stderr, "--sample-rate,  -N []  Audio sampling rate. (default %i)\n", DEFAULT_SAMPLE_RATE);
 	fprintf(stderr, "--skip-test,    -s     Do not check if data is random enough.\n");
 	fprintf(stderr, "--verbose,      -v     Be verbose (to syslog).\n");
diff -up audio-entropyd-1.0.5/Makefile.alsa audio-entropyd-1.0.5/Makefile
--- audio-entropyd-1.0.5/Makefile.alsa	2008-09-28 10:34:06.000000000 -0400
+++ audio-entropyd-1.0.5/Makefile	2009-04-13 17:26:10.000000000 -0400
@@ -5,13 +5,13 @@ DEBUGFLAGS= #-DDEBUG
 INCLUDES=
 DEFINES+=# -DDEBUG
 CFLAGS+= $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) $(OPT_FLAGS) -DVERSION=\"$(VERSION)\"
-LFLAGS=-lm
+LFLAGS=-lm -lasound
 
 TARGETS=audio-entropyd
 
 all: $(TARGETS) 
 
-audio-entropyd: snd_dev.o audio-entropyd.o error.o proc.o val.o RNGTEST.o error.o
+audio-entropyd: audio-entropyd.o error.o proc.o val.o RNGTEST.o error.o
 	$(CC) -o $@ $^ $(LFLAGS) 
 
 install: audio-entropyd
diff -up audio-entropyd-1.0.5/snd_dev.c.alsa audio-entropyd-1.0.5/snd_dev.c
--- audio-entropyd-1.0.5/snd_dev.c.alsa	2008-09-28 10:34:06.000000000 -0400
+++ audio-entropyd-1.0.5/snd_dev.c	2009-04-13 17:26:30.000000000 -0400
@@ -1,46 +0,0 @@
-#include <sys/ioctl.h>
-#include <linux/soundcard.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "error.h"
-
-int set_soundcard_sample_format(int fd)
-{
-	int format = AFMT_S16_NE;	/* machine-endian 16 bit signed */
-
-	if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) == -1)
-		error_exit("set_soundcard_sample_format::ioctl: failed\n");
-
-	if (format != AFMT_S16_NE)
-		error_exit("set_soundcard_sample_format: sampleformat unexpected: %d\n", format);
-
-	return 0;
-}
-
-int set_soundcard_number_of_channels(int fd, int n_channels)
-{
-	int dummy = n_channels;
-
-	if (ioctl(fd, SNDCTL_DSP_CHANNELS, &dummy) == -1)
-		error_exit("set_soundcard_number_of_channels::ioctl: failed");
-
-	if (dummy != n_channels)
-		error_exit("set_soundcard_number_of_channels::ioctl: number of channels unexpected: %d", dummy);
-
-	return 0;
-}
-
-int set_soundcard_sample_rate(int fd, int hz)
-{
-	int dummy = hz;
-
-	if (ioctl(fd, SNDCTL_DSP_SPEED, &dummy) == -1)
-		error_exit("set_soundcard_sample_rate::ioctl: failed: %d");
-
-	if (dummy != hz)
-		error_exit("set_soundcard_sample_rate::ioctl: samplerate unexpected: %d", dummy);
-
-	return 0;
-}
diff -up audio-entropyd-1.0.5/snd_dev.h.alsa audio-entropyd-1.0.5/snd_dev.h
--- audio-entropyd-1.0.5/snd_dev.h.alsa	2008-09-28 10:34:06.000000000 -0400
+++ audio-entropyd-1.0.5/snd_dev.h	2009-04-13 17:26:30.000000000 -0400
@@ -1,3 +0,0 @@
-int set_soundcard_sample_format(int fd);
-int set_soundcard_number_of_channels(int fd, int n_channels);
-int set_soundcard_sample_rate(int fd, int hz);


Index: audio-entropyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audio-entropyd.spec	24 Feb 2009 03:09:30 -0000	1.14
+++ audio-entropyd.spec	13 Apr 2009 21:44:23 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           audio-entropyd
 Version:        1.0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 Summary:        Generate entropy from audio output
@@ -8,7 +8,9 @@
 Source0:        http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz
 Source1:        audio-entropyd
 Source2:	audio-entropyd.conf
+Patch0:		audio-entropyd-1.0.5-alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	alsa-lib-devel
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .alsa
 
 %build
 make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -56,6 +59,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd
 
 %changelog
+* Wed Mar 25 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-4
+- port from OSS to ALSA
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cwickert at fedoraproject.org  Mon Apr 13 21:50:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 21:50:11 +0000 (UTC)
Subject: rpms/lxmusic/devel lxmusic-0.2.3-no-tools-menu.patch, NONE,
	1.1 lxmusic.spec, 1.1, 1.2
Message-ID: <20090413215011.888D770124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15582

Modified Files:
	lxmusic.spec 
Added Files:
	lxmusic-0.2.3-no-tools-menu.patch 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-3
- Disable empty tools menu


lxmusic-0.2.3-no-tools-menu.patch:

--- NEW FILE lxmusic-0.2.3-no-tools-menu.patch ---
diff -dur lxmusic-0.2.3.orig/data/lxmusic.ui lxmusic-0.2.3/data/lxmusic.ui
--- lxmusic-0.2.3.orig/data/lxmusic.ui	2008-12-17 06:06:36.000000000 +0100
+++ lxmusic-0.2.3/data/lxmusic.ui	2009-04-13 20:41:40.000000000 +0200
@@ -180,12 +180,6 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="tools_mi">
-            <property name="name">tools_mi</property>
-            <property name="label" translatable="yes">_Tools</property>
-          </object>
-        </child>
-        <child>
           <object class="GtkAction" id="help_mi">
             <property name="name">help_mi</property>
             <property name="label" translatable="yes">_Help</property>
@@ -230,7 +224,6 @@
         <menu action="view_mi">
           <menuitem action="show_pl"/>
         </menu>
-        <menuitem action="tools_mi"/>
         <menu action="help_mi">
           <menuitem action="about_mi"/>
         </menu>


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lxmusic.spec	13 Apr 2009 10:08:56 -0000	1.1
+++ lxmusic.spec	13 Apr 2009 21:49:41 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           lxmusic
 Version:        0.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
+Patch0:         lxmusic-0.2.3-no-tools-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-tools
 
 
 %build
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-3
+- Disable empty tools menu
+
 * Sun Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-2
 - Build Require gtk2-devel
 



From cwickert at fedoraproject.org  Mon Apr 13 21:52:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 21:52:30 +0000 (UTC)
Subject: rpms/lxmusic/F-10 lxmusic.spec,1.1,1.2
Message-ID: <20090413215230.E28EF70124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16459

Modified Files:
	lxmusic.spec 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-3
- Disable empty tools menu



Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-10/lxmusic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lxmusic.spec	13 Apr 2009 10:12:27 -0000	1.1
+++ lxmusic.spec	13 Apr 2009 21:51:59 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           lxmusic
 Version:        0.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
+Patch0:         lxmusic-0.2.3-no-tools-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-tools
 
 
 %build
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-3
+- Disable empty tools menu
+
 * Sun Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-2
 - Build Require gtk2-devel
 



From dcantrel at fedoraproject.org  Mon Apr 13 21:56:31 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 13 Apr 2009 21:56:31 +0000 (UTC)
Subject: rpms/dhcp/devel .cvsignore, 1.24, 1.25 dhclient-script, 1.8,
	1.9 dhcp.spec, 1.249, 1.250 sources, 1.25, 1.26
Message-ID: <20090413215631.88A4070124@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18044

Modified Files:
	.cvsignore dhclient-script dhcp.spec sources 
Log Message:
* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
- Correct %post problems in dhclient package (#495361)
- Read hooks scripts from /etc/dhcp (#495361)
- Update to latest ldap-for-dhcp



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	9 Mar 2009 23:01:06 -0000	1.24
+++ .cvsignore	13 Apr 2009 21:56:00 -0000	1.25
@@ -1,2 +1,2 @@
 dhcp-4.1.0.tar.gz
-ldap-for-dhcp-4.1.0.tar.gz
+ldap-for-dhcp-4.1.0-2.tar.gz


Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dhclient-script	11 Mar 2009 19:12:56 -0000	1.8
+++ dhclient-script	13 Apr 2009 21:56:00 -0000	1.9
@@ -3,7 +3,7 @@
 # dhclient-script: Network interface configuration script run by
 #                  dhclient based on DHCP client communication
 #
-# Copyright (C) 2008 Red Hat, Inc.
+# Copyright (C) 2008, 2009  Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@
 LOGFACILITY="local7"
 LOGLEVEL="notice"
 
+ETCDIR="/etc/dhcp"
+
 logmessage() {
     msg="${1}"
     logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}"
@@ -107,8 +109,8 @@
 exit_with_hooks() {
     exit_status="${1}"
 
-    if [ -x /etc/dhclient-exit-hooks ]; then
-        . /etc/dhclient-exit-hooks
+    if [ -x ${ETCDIR}/dhclient-exit-hooks ]; then
+        . ${ETCDIR}/dhclient-exit-hooks
     fi
 
     exit ${exit_status}
@@ -236,10 +238,10 @@
             ip link set ${interface} mtu ${new_interface_mtu}
         fi
 
-        if [ -x /etc/dhclient-${interface}-up-hooks ]; then
-            . /etc/dhclient-${interface}-up-hooks
-        elif [ -x /etc/dhclient-up-hooks ]; then
-            . /etc/dhclient-up-hooks
+        if [ -x ${ETCDIR}/dhclient-${interface}-up-hooks ]; then
+            . ${ETCDIR}/dhclient-${interface}-up-hooks
+        elif [ -x ${ETCDIR}/dhclient-up-hooks ]; then
+            . ${ETCDIR}/dhclient-up-hooks
         fi
 
         if [[ (( -z "${GATEWAYDEV}" ) ||
@@ -360,8 +362,8 @@
     fi
 
     # execute any additional client side configuration scripts we have
-    if [ -d /etc/dhcp/dhclient.d ]; then
-        for f in /etc/dhcp/dhclient.d/*.sh ; do
+    if [ -d ${ETCDIR}/dhclient.d ]; then
+        for f in ${ETCDIR}/dhclient.d/*.sh ; do
             if [ -x ${f} ]; then
                 subsystem="${f%.sh}"
                 subsystem="${subsystem##*/}"
@@ -386,12 +388,12 @@
 # ### MAIN
 #
 
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -x ${ETCDIR}/dhclient-enter-hooks ]; then
     exit_status=0
 
     # dhclient-enter-hooks can abort dhclient-script by setting
     # the exit_status variable to a non-zero value
-    . /etc/dhclient-enter-hooks
+    . ${ETCDIR}/dhclient-enter-hooks
     if [ ${exit_status} -ne 0 ]; then
         exit ${exit_status}
     fi
@@ -488,8 +490,8 @@
         fi
 
         # execute any additional client side configuration scripts we have
-        if [ -d /etc/dhcp/dhclient.d ]; then
-            for f in /etc/dhcp/dhclient.d/*.sh ; do
+        if [ -d ${ETCDIR}/dhclient.d ]; then
+            for f in ${ETCDIR}/dhclient.d/*.sh ; do
                 if [ -x ${f} ]; then
                     subsystem="${f%.sh}"
                     subsystem="${subsystem##*/}"
@@ -499,10 +501,10 @@
             done
         fi
 
-        if [ -x /etc/dhclient-${interface}-down-hooks ]; then
-            . /etc/dhclient-${interface}-down-hooks
-        elif [ -x /etc/dhclient-down-hooks ]; then
-            . /etc/dhclient-down-hooks
+        if [ -x ${ETCDIR}/dhclient-${interface}-down-hooks ]; then
+            . ${ETCDIR}/dhclient-${interface}-down-hooks
+        elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then
+            . ${ETCDIR}/dhclient-down-hooks
         fi
 
         if [ -n "${alias_ip_address}" ]; then


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- dhcp.spec	4 Apr 2009 01:50:27 -0000	1.249
+++ dhcp.spec	13 Apr 2009 21:56:00 -0000	1.250
@@ -1,10 +1,13 @@
 # vendor string (e.g., Fedora, EL)
 %define vvendor Fedora
 
+# Where dhcp configuration files are stored
+%define dhcpconfdir %{_sysconfdir}/dhcp
+
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  15%{?dist}
+Release:  16%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -14,7 +17,7 @@
 Group:    System Environment/Daemons
 URL:      http://isc.org/products/DHCP/
 Source0:  ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
-Source1:  http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{version}.tar.gz
+Source1:  http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{version}-2.tar.gz
 Source2:  dhcpd.init
 Source3:  dhcrelay.init
 Source4:  dhclient-script
@@ -70,6 +73,7 @@
 Group: System Environment/Base
 Requires: initscripts >= 6.75
 Requires(post): coreutils
+Requires(post): grep
 Obsoletes: dhcpcd <= 1.3.22pl1-7
 Obsoletes: libdhcp4client <= 12:4.0.0-31.fc10
 Obsoletes: libdhcp <= 1.99.8-1.fc10
@@ -102,7 +106,7 @@
 %setup -T -D -a 1
 
 # Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{version}/%{name}-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{version}-2/%{name}-%{version}-ldap.patch
 
 # Replace the standard ISC warning message about requesting help with an
 # explanation that this is a patched build of ISC DHCP and bugs should be
@@ -222,14 +226,14 @@
     %{__sed} -i -e 's|CLIENTBINDIR|/sbin|g' \
                 -e 's|RUNDIR|%{_localstatedir}/run|g' \
                 -e 's|DBDIR|%{_localstatedir}/db/dhclient|g' \
-                -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
+                -e 's|ETCDIR|%{dhcpconfdir}|g' $page
 done
 
 for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do
     %{__sed} -i -e 's|CLIENTBINDIR|/sbin|g' \
                 -e 's|RUNDIR|%{_localstatedir}/run|g' \
                 -e 's|DBDIR|%{_localstatedir}/db/dhcpd|g' \
-                -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
+                -e 's|ETCDIR|%{dhcpconfdir}|g' $page
 done
 
 aclocal
@@ -296,8 +300,8 @@
 %{__cp} -p server/dhcpd.conf dhcpd.conf.sample
 
 # Install default (empty) dhcpd.conf:
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
+%{__mkdir} -p %{buildroot}%{dhcpconfdir}
+%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd.conf
 #
 # DHCP Server Configuration file.
 #   see /usr/share/doc/dhcp*/dhcpd.conf.sample
@@ -311,33 +315,28 @@
     %{buildroot}%{_sysconfdir}/openldap/schema
 
 # Install empty directory for dhclient.d scripts
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d
+%{__mkdir} -p %{buildroot}%{dhcpconfdir}/dhclient.d
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
-if [ -f /etc/dhcpd.conf ]; then
-    /bin/cp -a /etc/dhcpd.conf /etc/dhcp/dhcpd.conf >/dev/null 2>&1
+if [ -f %{_sysconfdir}/dhcpd.conf ] && [ ! -r %{dhcpconfdir}/dhcpd.conf ]; then
+    /bin/ln -s %{_sysconfdir}/dhcpd.conf %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
 fi
 
 /sbin/chkconfig --add dhcpd
 /sbin/chkconfig --add dhcrelay || :
 
 %post -n dhclient
-/bin/ls -1 /etc/dhclient* >/dev/null 2>&1
+/bin/ls -1 %{_sysconfdir}/dhclient* >/dev/null 2>&1
 if [ $? = 0 ]; then
-    /bin/ls -1 /etc/dhclient* 2>/dev/null | while read etcfile ; do
+    /bin/ls -1 %{_sysconfdir}/dhclient* | \
+    /bin/grep -v "\.rpmsave$" 2>/dev/null | \
+    while read etcfile ; do
         cf="$(/bin/basename ${etcfile})"
-        if [ ! -f /etc/dhcp/${cf} ]; then
-            /bin/cp -a "${etcfile}" /etc/dhcp
-            if [ ! -f "${etcfile}.rpmsave" ]; then
-                /bin/mv -f "${etcfile}" "${etcfile}.rpmsave"
-            elif [ ! -f "${etcfile}.rpmsave.$$" ]; then
-                /bin/mv -f "${etcfile}" "${etcfile}.rpmsave.$$"
-            else
-                /bin/mv -f "${etcfile}" "${etcfile}.rpmsave.$(date +%s)"
-            fi
+        if [ -f ${etcfile} ] && [ ! -r %{dhcpconfdir}/${cf} ]; then
+            /bin/ln -s ${etcfile} %{dhcpconfdir}/${cf} >/dev/null 2>&1
         fi
     done || :
 fi || :
@@ -370,12 +369,12 @@
 %doc RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters doc/api+protocol
 %doc doc/*.txt __fedora_contrib/* ldap-for-dhcp-%{version}/*.txt
 %dir %{_localstatedir}/lib/dhcpd
-%dir %{_sysconfdir}/dhcp
+%dir %{dhcpconfdir}
 %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases
 %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd6.leases
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay
-%config(noreplace) %{_sysconfdir}/dhcp/dhcpd.conf
+%config(noreplace) %{dhcpconfdir}/dhcpd.conf
 %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
 %{_initrddir}/dhcpd
 %{_initrddir}/dhcrelay
@@ -393,8 +392,8 @@
 %files -n dhclient
 %defattr(-,root,root,-)
 %doc dhclient.conf.sample README.dhclient.d
-%dir %{_sysconfdir}/dhcp
-%dir %{_sysconfdir}/dhcp/dhclient.d
+%dir %{dhcpconfdir}
+%dir %{dhcpconfdir}/dhclient.d
 %dir %{_localstatedir}/lib/dhclient
 /sbin/dhclient
 /sbin/dhclient-script
@@ -417,6 +416,11 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
+- Correct %%post problems in dhclient package (#495361)
+- Read hooks scripts from /etc/dhcp (#495361)
+- Update to latest ldap-for-dhcp
+
 * Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-15
 - Obsolete libdhcp and libdhcp-devel (#493547)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	9 Mar 2009 23:01:07 -0000	1.25
+++ sources	13 Apr 2009 21:56:00 -0000	1.26
@@ -1,2 +1,2 @@
 1fffed2e8c3d67b111316d6a9b33db7a  dhcp-4.1.0.tar.gz
-782cf7358bab53fd564895a253f93fff  ldap-for-dhcp-4.1.0.tar.gz
+04d735015e104e3e6377e7fb80fd4fce  ldap-for-dhcp-4.1.0-2.tar.gz



From till at fedoraproject.org  Mon Apr 13 21:59:24 2009
From: till at fedoraproject.org (Till Maas)
Date: Mon, 13 Apr 2009 21:59:24 +0000 (UTC)
Subject: rpms/pam_mount/devel
	0001-use-extra_opts-in-etc-mtab-unless-empty.patch, NONE,
	1.1 pam_mount-1.22-uninitialized-variable.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 pam_mount.spec, 1.54, 1.55 sources,
	1.24, 1.25
Message-ID: <20090413215924.89F3A70124@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19611

Modified Files:
	.cvsignore pam_mount.spec sources 
Added Files:
	0001-use-extra_opts-in-etc-mtab-unless-empty.patch 
	pam_mount-1.22-uninitialized-variable.patch 
Log Message:
* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.22-1
- Update to new release
- Support remount (Red Hat Bugzilla: #492347)
- Show more correct mount options in /etc/mtab
- backport fix against uninitialized value


0001-use-extra_opts-in-etc-mtab-unless-empty.patch:

--- NEW FILE 0001-use-extra_opts-in-etc-mtab-unless-empty.patch ---
>From fcc3c29f4eea2ce3194029453e4ae7597cc32b1e Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Mon, 13 Apr 2009 23:02:37 +0200
Subject: [PATCH] - use extra_opts in /etc/mtab unless empty

---
 src/mtcrypt.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mtcrypt.c b/src/mtcrypt.c
index 493afb7..3b80663 100644
--- a/src/mtcrypt.c
+++ b/src/mtcrypt.c
@@ -450,8 +450,13 @@ static int mtcr_mount(struct mount_options *opt)
 	} else if (opt->no_update) {
 		/* awesome logic */;
 	} else {
-		pmt_smtab_add(mount_info.container, opt->mountpoint,
-			"crypt", "defaults");
+		if (opt->extra_opts != NULL) {
+			pmt_smtab_add(mount_info.container, opt->mountpoint,
+				"crypt", opt->extra_opts);
+		} else {
+			pmt_smtab_add(mount_info.container, opt->mountpoint,
+				"crypt", "defaults");
+		}
 	}
 
 	ehd_mtfree(&mount_info);
-- 
1.5.4.1


pam_mount-1.22-uninitialized-variable.patch:

--- NEW FILE pam_mount-1.22-uninitialized-variable.patch ---
From: Jan Engelhardt <jengelh at medozas.de>
Date: Sun, 12 Apr 2009 17:51:02 +0000 (+0200)
Subject: src: fix one uninitialized value
X-Git-Url: http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount;a=commitdiff_plain;h=d4f898a53b7fc039c0bbb08bf125e5c43b99d966

src: fix one uninitialized value

valgrind reported (which "disable_interactive" pam_mount option):

==8731== Conditional jump or move depends on uninitialised value(s)
==8731==    at 0x4E15D6B: pam_sm_open_session (pam_mount.c:517)
==8731==    by 0x48436DE: (within /lib/libpam.so.0.81.12)
==8731==    by 0x4847392: pam_open_session (in /lib/libpam.so.0.81.12)
==8731==    by 0x2CDC: main (in /bin/su)
---

diff --git a/src/pam_mount.c b/src/pam_mount.c
index 1e5e780..921885f 100644
--- a/src/pam_mount.c
+++ b/src/pam_mount.c
@@ -446,7 +446,7 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open_session(pam_handle_t *pamh, int flags,
 	struct vol *vol;
 	int ret;
 	unsigned int krb5_set;
-	char *system_authtok;
+	char *system_authtok = NULL;
 	const void *tmp;
 	int getval;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Mar 2009 17:39:26 -0000	1.23
+++ .cvsignore	13 Apr 2009 21:59:23 -0000	1.24
@@ -1,2 +1,2 @@
-pam_mount-1.20.tar.bz2
-pam_mount-1.20.tar.bz2.asc
+pam_mount-1.22.tar.bz2
+pam_mount-1.22.tar.bz2.asc


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pam_mount.spec	3 Mar 2009 17:39:26 -0000	1.54
+++ pam_mount.spec	13 Apr 2009 21:59:23 -0000	1.55
@@ -1,7 +1,7 @@
 %define packext bz2
 
 Name:           pam_mount
-Version:        1.20
+Version:        1.22
 Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
@@ -13,6 +13,10 @@
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}
 Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}.asc
+# from upstream: http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount;a=commitdiff_plain;h=d4f898a53b7fc039c0bbb08bf125e5c43b99d966
+Patch0:         pam_mount-1.22-uninitialized-variable.patch
+# 2009-04-13: submitted to upstream https://sourceforge.net/support/tracker.php?aid=2715698
+Patch1:         0001-use-extra_opts-in-etc-mtab-unless-empty.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
@@ -55,6 +59,8 @@
 %setup -q
 %endif
 
+%patch0 -p1 -b .uninitialized-variable
+%patch1 -p1 -b .use-extra_opts
 
 %build
 %configure --with-slibdir=/%{_lib} --with-dtd
@@ -110,6 +116,12 @@
 
 
 %changelog
+* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.22-1
+- Update to new release
+- Support remount (Red Hat Bugzilla: #492347)
+- Show more correct mount options in /etc/mtab
+- backport fix against uninitialized value
+
 * Tue Mar 03 2009 Till Maas <opensource at till.name> - 1.20-1
 - Update to new release
 - Update libHX dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Mar 2009 17:39:26 -0000	1.24
+++ sources	13 Apr 2009 21:59:23 -0000	1.25
@@ -1,2 +1,2 @@
-006136e2d955be6b4feeda89fdea0d1a  pam_mount-1.20.tar.bz2
-1d063a0532c788fd3d72c08556e006a7  pam_mount-1.20.tar.bz2.asc
+afabec61b86d859cb73af438d1ec63bd  pam_mount-1.22.tar.bz2
+58a229effc324489ebe12203ce262254  pam_mount-1.22.tar.bz2.asc



From cwickert at fedoraproject.org  Mon Apr 13 22:03:54 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 22:03:54 +0000 (UTC)
Subject: rpms/lxmusic/F-9 lxmusic.spec,1.1,1.2
Message-ID: <20090413220355.00E0670124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21091

Modified Files:
	lxmusic.spec 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-3
- Disable empty tools menu



Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-9/lxmusic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lxmusic.spec	13 Apr 2009 10:27:03 -0000	1.1
+++ lxmusic.spec	13 Apr 2009 22:03:24 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           lxmusic
 Version:        0.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
+Patch0:         lxmusic-0.2.3-no-tools-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-tools
 
 
 %build
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-3
+- Disable empty tools menu
+
 * Sun Mar 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-2
 - Build Require gtk2-devel
 



From cwickert at fedoraproject.org  Mon Apr 13 22:14:28 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 22:14:28 +0000 (UTC)
Subject: rpms/lxmusic/F-9 lxmusic-0.2.3-no-tools-menu.patch,NONE,1.1
Message-ID: <20090413221428.2E62770124@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24146/F-9

Added Files:
	lxmusic-0.2.3-no-tools-menu.patch 
Log Message:
add missing patch

lxmusic-0.2.3-no-tools-menu.patch:

--- NEW FILE lxmusic-0.2.3-no-tools-menu.patch ---
diff -dur lxmusic-0.2.3.orig/data/lxmusic.ui lxmusic-0.2.3/data/lxmusic.ui
--- lxmusic-0.2.3.orig/data/lxmusic.ui	2008-12-17 06:06:36.000000000 +0100
+++ lxmusic-0.2.3/data/lxmusic.ui	2009-04-13 20:41:40.000000000 +0200
@@ -180,12 +180,6 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="tools_mi">
-            <property name="name">tools_mi</property>
-            <property name="label" translatable="yes">_Tools</property>
-          </object>
-        </child>
-        <child>
           <object class="GtkAction" id="help_mi">
             <property name="name">help_mi</property>
             <property name="label" translatable="yes">_Help</property>
@@ -230,7 +224,6 @@
         <menu action="view_mi">
           <menuitem action="show_pl"/>
         </menu>
-        <menuitem action="tools_mi"/>
         <menu action="help_mi">
           <menuitem action="about_mi"/>
         </menu>



From cwickert at fedoraproject.org  Mon Apr 13 22:14:28 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 13 Apr 2009 22:14:28 +0000 (UTC)
Subject: rpms/lxmusic/F-10 lxmusic-0.2.3-no-tools-menu.patch,NONE,1.1
Message-ID: <20090413221428.3A16270137@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24146/F-10

Added Files:
	lxmusic-0.2.3-no-tools-menu.patch 
Log Message:
add missing patch

lxmusic-0.2.3-no-tools-menu.patch:

--- NEW FILE lxmusic-0.2.3-no-tools-menu.patch ---
diff -dur lxmusic-0.2.3.orig/data/lxmusic.ui lxmusic-0.2.3/data/lxmusic.ui
--- lxmusic-0.2.3.orig/data/lxmusic.ui	2008-12-17 06:06:36.000000000 +0100
+++ lxmusic-0.2.3/data/lxmusic.ui	2009-04-13 20:41:40.000000000 +0200
@@ -180,12 +180,6 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="tools_mi">
-            <property name="name">tools_mi</property>
-            <property name="label" translatable="yes">_Tools</property>
-          </object>
-        </child>
-        <child>
           <object class="GtkAction" id="help_mi">
             <property name="name">help_mi</property>
             <property name="label" translatable="yes">_Help</property>
@@ -230,7 +224,6 @@
         <menu action="view_mi">
           <menuitem action="show_pl"/>
         </menu>
-        <menuitem action="tools_mi"/>
         <menu action="help_mi">
           <menuitem action="about_mi"/>
         </menu>



From dcantrel at fedoraproject.org  Mon Apr 13 22:23:08 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 13 Apr 2009 22:23:08 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.250,1.251
Message-ID: <20090413222308.E288070124@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28087

Modified Files:
	dhcp.spec 
Log Message:
* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
- Correct %post problems in dhclient package (#495361)
- Read hooks scripts from /etc/dhcp (#495361)
- Update to latest ldap-for-dhcp



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- dhcp.spec	13 Apr 2009 21:56:00 -0000	1.250
+++ dhcp.spec	13 Apr 2009 22:22:38 -0000	1.251
@@ -4,6 +4,9 @@
 # Where dhcp configuration files are stored
 %define dhcpconfdir %{_sysconfdir}/dhcp
 
+# LDAP patch version
+%define ldappatchver %{version}-2
+
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
@@ -17,7 +20,7 @@
 Group:    System Environment/Daemons
 URL:      http://isc.org/products/DHCP/
 Source0:  ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
-Source1:  http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{version}-2.tar.gz
+Source1:  http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{ldappatchver}.tar.gz
 Source2:  dhcpd.init
 Source3:  dhcrelay.init
 Source4:  dhclient-script
@@ -106,7 +109,7 @@
 %setup -T -D -a 1
 
 # Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{version}-2/%{name}-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{version}-ldap.patch
 
 # Replace the standard ISC warning message about requesting help with an
 # explanation that this is a patched build of ISC DHCP and bugs should be
@@ -185,7 +188,7 @@
 %patch18 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
-%{__install} -p -m 0755 ldap-for-dhcp-%{version}/dhcpd-conf-to-ldap contrib/
+%{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
 # Copy in the Fedora/RHEL dhclient script
 %{__install} -p -m 0755 %{SOURCE4} client/scripts/linux
@@ -311,7 +314,7 @@
 
 # Install dhcp.schema for LDAP configuration
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
-%{__install} -p -m 0644 -D ldap-for-dhcp-%{version}/dhcp.schema \
+%{__install} -p -m 0644 -D ldap-for-dhcp-%{ldappatchver}/dhcp.schema \
     %{buildroot}%{_sysconfdir}/openldap/schema
 
 # Install empty directory for dhclient.d scripts
@@ -365,9 +368,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README ldap-for-dhcp-%{version}/README.ldap
+%doc LICENSE README ldap-for-dhcp-%{ldappatchver}/README.ldap
 %doc RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters doc/api+protocol
-%doc doc/*.txt __fedora_contrib/* ldap-for-dhcp-%{version}/*.txt
+%doc doc/*.txt __fedora_contrib/* ldap-for-dhcp-%{ldappatchver}/*.txt
 %dir %{_localstatedir}/lib/dhcpd
 %dir %{dhcpconfdir}
 %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases



From ajax at fedoraproject.org  Mon Apr 13 22:28:22 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 13 Apr 2009 22:28:22 +0000 (UTC)
Subject: rpms/i2c-tools/devel i2c-tools.spec,1.5,1.6
Message-ID: <20090413222822.589A570124@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/i2c-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29802

Modified Files:
	i2c-tools.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 3.0.2-3
- mv /etc/modprobe.d/i2c-dev /etc/modprobe.d/i2c-dev.conf (#495455)



Index: i2c-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i2c-tools/devel/i2c-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- i2c-tools.spec	25 Feb 2009 06:22:50 -0000	1.5
+++ i2c-tools.spec	13 Apr 2009 22:27:51 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           i2c-tools
 Version:        3.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A heterogeneous set of I2C tools for Linux
 Group:          Applications/System
 License:        GPLv2+
@@ -59,7 +59,7 @@
 # for i2c-dev ondemand loading through kmod
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d 
 echo "alias char-major-89-* i2c-dev" > \
-  $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/i2c-dev
+  $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/i2c-dev.conf
 # for /dev/i2c-# creation (which are needed for kmod i2c-dev autoloading)
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
 for (( i = 0 ; i < 8 ; i++ )) do
@@ -74,7 +74,7 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGES COPYING README
-%config(noreplace) %{_sysconfdir}/modprobe.d/i2c-dev
+%config(noreplace) %{_sysconfdir}/modprobe.d/i2c-dev.conf
 %config(noreplace) %{_sysconfdir}/udev/makedev.d/99-i2c-dev.nodes
 %{_bindir}/*
 %{_sbindir}/*
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 3.0.2-3
+- mv /etc/modprobe.d/i2c-dev /etc/modprobe.d/i2c-dev.conf (#495455)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From simo at fedoraproject.org  Mon Apr 13 22:37:42 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 13 Apr 2009 22:37:42 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sssd.conf.default, 1.1, 1.2 sssd.spec, 1.7,
	1.8 0001-Add-a-LSB-header-to-the-initscript.patch, 1.1,
	NONE 0001-Build-fixes-for-RPM-packaging-of-SSSD.patch, 1.1, NONE
Message-ID: <20090413223742.5B82770124@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv961

Modified Files:
	.cvsignore sources sssd.conf.default sssd.spec 
Removed Files:
	0001-Add-a-LSB-header-to-the-initscript.patch 
	0001-Build-fixes-for-RPM-packaging-of-SSSD.patch 
Log Message:
* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-1
- Version 0.3.1
- includes previous release patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Apr 2009 15:49:54 -0000	1.5
+++ .cvsignore	13 Apr 2009 22:37:11 -0000	1.6
@@ -1 +1 @@
-sssd-0.3.0.tar.gz
+sssd-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Apr 2009 15:49:54 -0000	1.5
+++ sources	13 Apr 2009 22:37:11 -0000	1.6
@@ -1 +1 @@
-b6b93c71f8907af5c66ca561d24b052c  sssd-0.3.0.tar.gz
+c46bcc028e10c7da3fd0057a038a023f  sssd-0.3.1.tar.gz


Index: sssd.conf.default
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.conf.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sssd.conf.default	13 Apr 2009 15:49:54 -0000	1.1
+++ sssd.conf.default	13 Apr 2009 22:37:11 -0000	1.2
@@ -4,7 +4,6 @@
 
 [services/nss]
 description = NSS Responder Configuration
-timeout = 150
 # the following prevents sssd for searching for the root user/group in
 # all domains (you can add here a comma separated list of system accounts are
 # always going to be /etc/passwd users, or that you want to filter out)
@@ -13,20 +12,17 @@
 
 [services/dp]
 description = Data Provider Configuration
-timeout = 150
 
 [services/pam]
 description = PAM Responder Configuration
-timeout = 150
 
 [services/info]
 description = InfoPipe Configuration
-timeout = 150
 
 [services/monitor]
 description = Service Monitor Configuration
-sbusTimeout = 150
-servicePingTime = 300
+#if a backend is particularly slow you can raise this timeout here
+sbusTimeout = 30
 
 [domains]
 description = Domains served by SSSD
@@ -91,3 +87,6 @@
 ; provider = proxy
 ; libName = ldap
 ; libPath = libnss_ldap.so.2
+;
+#if a backend is particularly slow you can raise this timeout here
+; timeout = 60


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sssd.spec	13 Apr 2009 17:48:03 -0000	1.7
+++ sssd.spec	13 Apr 2009 22:37:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name: sssd
-Version: 0.3.0
-Release: 2%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -13,12 +13,10 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
-Patch100: 0001-Add-a-LSB-header-to-the-initscript.patch
-Patch101: 0001-Build-fixes-for-RPM-packaging-of-SSSD.patch
 
 ### Dependencies ###
 
-Requires: libldb >= 0.9.3
+Requires: libldb = 0.9.3
 
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -53,9 +51,6 @@
 %prep
 %setup -q
 
-%patch100 -p1 -b .lsb_init
-%patch101 -p1 -b .build_fixes
-
 %build
 
 # common
@@ -143,6 +138,10 @@
 fi
 
 %changelog
+* Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-1
+- Version 0.3.1
+- includes previous release patches
+
 * Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.0-2
 - Try to fix build adding automake as an explicit BuildRequire
 - Add also a couple of last minute patches from upstream


--- 0001-Add-a-LSB-header-to-the-initscript.patch DELETED ---


--- 0001-Build-fixes-for-RPM-packaging-of-SSSD.patch DELETED ---



From toshio at fedoraproject.org  Mon Apr 13 23:05:24 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 13 Apr 2009 23:05:24 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.124,1.125 sources,1.48,1.49
Message-ID: <20090413230524.38B2870124@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11457

Modified Files:
	mono.spec sources 
Log Message:

* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-15
- Revert to RC1 with changes to the spec file such as enabling moonlight so
  that we have a working build for F11.



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- mono.spec	13 Apr 2009 19:16:34 -0000	1.124
+++ mono.spec	13 Apr 2009 23:04:52 -0000	1.125
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        14%{?dist}
+Release:        15.1.RC1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -294,7 +294,7 @@
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/mono.web.pc.in
+#sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/mono.web.pc.in
 sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in
 sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
@@ -643,7 +643,7 @@
 
 %files web-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mono.web.pc
+#%{_libdir}/pkgconfig/mono.web.pc
 %{_libdir}/pkgconfig/system.web.extensions_1.0.pc
 %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
 
@@ -711,6 +711,10 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-15
+- Revert to RC1 with changes to the spec file such as enabling moonlight so
+  that we have a working build for F11.
+
 * Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-14
 - Remove bootstrap changes as it's not necessary.
 - remove ppc64 as we only had ppc before.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	19 Mar 2009 00:01:30 -0000	1.48
+++ sources	13 Apr 2009 23:04:52 -0000	1.49
@@ -1 +1 @@
-da2bf1c0aba2958d26c5e8a9a49fd9d1  mono-2.4.tar.bz2
+17f740bcff59983cdbe9ef89b80cf969  mono-2.4.tar.bz2



From jkeating at fedoraproject.org  Mon Apr 13 23:20:17 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:20:17 +0000 (UTC)
Subject: rpms/pungi/devel .cvsignore, 1.63, 1.64 import.log, 1.14,
	1.15 pungi.spec, 1.70, 1.71 sources, 1.66, 1.67
Message-ID: <20090413232017.69B6070124@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17311/devel

Modified Files:
	.cvsignore import.log pungi.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	24 Mar 2009 17:08:18 -0000	1.63
+++ .cvsignore	13 Apr 2009 23:20:14 -0000	1.64
@@ -1 +1 @@
-pungi-2.0.13.tar.bz2
+pungi-2.0.14.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	24 Mar 2009 17:08:18 -0000	1.14
+++ import.log	13 Apr 2009 23:20:14 -0000	1.15
@@ -12,3 +12,4 @@
 pungi-2_0_11-1_fc11:HEAD:pungi-2.0.11-1.fc11.src.rpm:1236621458
 pungi-2_0_12-1_fc11:HEAD:pungi-2.0.12-1.fc11.src.rpm:1236819215
 pungi-2_0_13-1_fc11:HEAD:pungi-2.0.13-1.fc11.src.rpm:1237914344
+pungi-2_0_14-1_fc11:HEAD:pungi-2.0.14-1.fc11.src.rpm:1239664741


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- pungi.spec	24 Mar 2009 17:08:18 -0000	1.70
+++ pungi.spec	13 Apr 2009 23:20:14 -0000	1.71
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.13
+Version:        2.0.14
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -56,6 +56,11 @@
 
 
 %changelog
+* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 2.0.14-1
+- Fix package excludes in kickstart files
+- Correctly account for ppc bootable isofs overhead
+- Wire in support for composing 'full' trees with all subpackages
+
 * Tue Mar 24 2009 Jesse Keating <jkeating at redhat.com> - 2.0.13-1
 - Add online-docs to pkgorder
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	24 Mar 2009 17:08:19 -0000	1.66
+++ sources	13 Apr 2009 23:20:14 -0000	1.67
@@ -1 +1 @@
-bd3308c0ea47921b8241b0d436ae4a65  pungi-2.0.13.tar.bz2
+31c59645f0d63097b3893dc3ee2951cd  pungi-2.0.14.tar.bz2



From jkeating at fedoraproject.org  Mon Apr 13 23:27:45 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:27:45 +0000 (UTC)
Subject: rpms/mono-addins/devel mono-addins.spec,1.16,1.17
Message-ID: <20090413232745.C45C470124@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/mono-addins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20801

Modified Files:
	mono-addins.spec 
Log Message:
* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 0.4-6.20091702svn127062.1
- re-enable ppc



Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mono-addins.spec	10 Apr 2009 09:03:50 -0000	1.16
+++ mono-addins.spec	13 Apr 2009 23:27:15 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:		mono-addins
 Version:	0.4
-Release:	5.20091702svn%{svnver}.1%{?dist}
+Release:	6.20091702svn%{svnver}.1%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	MIT
@@ -13,7 +13,7 @@
 
 BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel, autoconf, automake
 BuildRequires:	pkgconfig
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 
 %description
 Mono.Addins is a generic framework for creating extensible applications,
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 0.4-6.20091702svn127062.1
+- re-enable ppc
+
 * Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.4-5.20091702svn127062.1
 - Exclude ppc
 



From mclasen at fedoraproject.org  Mon Apr 13 23:36:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 23:36:25 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.76, 1.77 sources, 1.76, 1.77 vte.spec, 
	1.147, 1.148
Message-ID: <20090413233625.4D64870124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23515

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	16 Mar 2009 16:10:59 -0000	1.76
+++ .cvsignore	13 Apr 2009 23:36:19 -0000	1.77
@@ -1 +1 @@
-vte-0.20.0.tar.bz2
+vte-0.20.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	16 Mar 2009 16:10:59 -0000	1.76
+++ sources	13 Apr 2009 23:36:19 -0000	1.77
@@ -1 +1 @@
-12dde859bc98e039336baff6e9e6b15b  vte-0.20.0.tar.bz2
+c0fe9038978eaeb70abf16cd7f791752  vte-0.20.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- vte.spec	16 Mar 2009 16:10:59 -0000	1.147
+++ vte.spec	13 Apr 2009 23:36:19 -0000	1.148
@@ -3,13 +3,13 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://download.gnome.org/sources/vte/0.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/vte/0.20/%{name}-%{version}.tar.bz2
 
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -108,6 +108,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 0.20.1-1
+- Update to 2.20.1
+- See http://download.gnome.org/sources/vte/0.20/vte-0.20.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> 0.20.0-1
 - Update to 0.20.0
 



From jkeating at fedoraproject.org  Mon Apr 13 23:36:50 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:36:50 +0000 (UTC)
Subject: rpms/monotorrent/devel monotorrent.spec,1.9,1.10
Message-ID: <20090413233650.5CB8470124@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/monotorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23675

Modified Files:
	monotorrent.spec 
Log Message:
* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 0.72-2
- re-enable ppc



Index: monotorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/devel/monotorrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monotorrent.spec	10 Apr 2009 08:58:59 -0000	1.9
+++ monotorrent.spec	13 Apr 2009 23:36:46 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           monotorrent
 Version:        0.72
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mono bittorrent client
 Group:          Development/Languages
 License:        MIT
@@ -12,7 +12,7 @@
 BuildRequires:  mono-devel, gtk-sharp2-devel, desktop-file-utils
 
 # Bug 241850 - no Mono on ppc64
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
 Monotorrent is a bittorrent for mono
@@ -49,6 +49,9 @@
 %{_libdir}/pkgconfig/monotorrent.pc
 
 %changelog
+* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 0.72-2
+- re-enable ppc
+
 * Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.72-1
 - Fix URL
 - update to 0.72



From lennart at fedoraproject.org  Mon Apr 13 23:37:56 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Mon, 13 Apr 2009 23:37:56 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.33, 1.34 pulseaudio.spec, 1.79, 
	1.80 sources, 1.34, 1.35
Message-ID: <20090413233756.37BBA70124@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24242

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
Final 0.9.15 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	10 Apr 2009 00:44:17 -0000	1.33
+++ .cvsignore	13 Apr 2009 23:37:51 -0000	1.34
@@ -1 +1 @@
-pulseaudio-0.9.15-test8.tar.gz
+pulseaudio-0.9.15.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- pulseaudio.spec	10 Apr 2009 00:44:17 -0000	1.79
+++ pulseaudio.spec	13 Apr 2009 23:37:51 -0000	1.80
@@ -3,10 +3,10 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	9.test8%{?dist}
+Release:	10%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
-Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test8.tar.gz
+Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -186,7 +186,7 @@
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.15-test8
+%setup -q -T -b0
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -407,6 +407,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-10
+- Final 0.9.15 release
+
 * Thu Apr 9 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-9.test8
 - New test release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	10 Apr 2009 00:44:18 -0000	1.34
+++ sources	13 Apr 2009 23:37:51 -0000	1.35
@@ -1 +1 @@
-52f2a7c7c58f076be1dda560f325b368  pulseaudio-0.9.15-test8.tar.gz
+4510364eeab219fd100bd1b373b1a002  pulseaudio-0.9.15.tar.gz



From jkeating at fedoraproject.org  Mon Apr 13 23:39:03 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:39:03 +0000 (UTC)
Subject: rpms/db4o/devel db4o.spec,1.11,1.12
Message-ID: <20090413233903.3A52270124@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/db4o/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24790

Modified Files:
	db4o.spec 
Log Message:
* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 6.1-6
- Re-enable ppc



Index: db4o.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- db4o.spec	10 Apr 2009 08:02:17 -0000	1.11
+++ db4o.spec	13 Apr 2009 23:39:02 -0000	1.12
@@ -5,7 +5,7 @@
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
 Version: 6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Patch0: db4o-6.1-usesyslibs.patch
 Group: Development/Libraries
@@ -14,7 +14,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel, mono-cecil-flowanalysis-devel
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 
 %description
 Embed db4o's native Java or .NET/Mono open source object database
@@ -107,6 +107,9 @@
 %{_libdir}/pkgconfig/db4o.pc
 
 %changelog
+* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 6.1-6
+- Re-enable ppc
+
 * Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 6.1-5
 - Alter excludearch to exclusivearch
 - Remove ppc build



From mclasen at fedoraproject.org  Mon Apr 13 23:40:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 23:40:12 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.72, 1.73 libwnck.spec, 1.108,
	1.109 sources, 1.72, 1.73
Message-ID: <20090413234012.D45C370124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25112

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	17 Mar 2009 03:00:32 -0000	1.72
+++ .cvsignore	13 Apr 2009 23:39:41 -0000	1.73
@@ -1 +1 @@
-libwnck-2.26.0.tar.bz2
+libwnck-2.26.1.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- libwnck.spec	17 Mar 2009 03:00:33 -0000	1.108
+++ libwnck.spec	13 Apr 2009 23:39:41 -0000	1.109
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.26/%{name}-%{version}.tar.bz2
@@ -23,7 +23,6 @@
 BuildRequires:  startup-notification-devel >= %{startup_notification_version}
 BuildRequires:  libXt-devel
 BuildRequires:  libXres-devel
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext
 BuildRequires:  intltool
 
@@ -94,6 +93,10 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/libwnck/2.26/libwnck-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	17 Mar 2009 03:00:33 -0000	1.72
+++ sources	13 Apr 2009 23:39:41 -0000	1.73
@@ -1 +1 @@
-73873bf666fc18dff04d66c48400b0c5  libwnck-2.26.0.tar.bz2
+015b5d2e65d15448fa143513fce03541  libwnck-2.26.1.tar.bz2



From jkeating at fedoraproject.org  Mon Apr 13 23:41:41 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:41:41 +0000 (UTC)
Subject: rpms/mod_mono/devel mod_mono.spec,1.23,1.24
Message-ID: <20090413234141.5022970124@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/mod_mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25864

Modified Files:
	mod_mono.spec 
Log Message:
* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 2.4-5
- Re-enable ppc.
- Fix release numbering



Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_mono.spec	6 Apr 2009 20:30:06 -0000	1.23
+++ mod_mono.spec	13 Apr 2009 23:41:10 -0000	1.24
@@ -1,6 +1,6 @@
 Name: mod_mono
 Version: 2.4
-Release: 4.1%{?dist}
+Release: 5%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
@@ -11,7 +11,7 @@
 Summary: A module to deploy an ASP.NET application on Apache with Mono
 Group: System Environment/Daemons
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
 
@@ -53,6 +53,10 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 2.4-5
+- Re-enable ppc.
+- Fix release numbering
+
 * Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-4.1
 - Remove ppc support
 



From mclasen at fedoraproject.org  Mon Apr 13 23:44:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 23:44:10 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.48, 1.49 libsoup.spec, 1.90,
	1.91 sources, 1.48, 1.49
Message-ID: <20090413234410.AB3B370124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	9 Apr 2009 17:55:38 -0000	1.48
+++ .cvsignore	13 Apr 2009 23:43:36 -0000	1.49
@@ -1 +1 @@
-libsoup-2.26.0.9.tar.bz2
+libsoup-2.26.1.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- libsoup.spec	9 Apr 2009 17:55:38 -0000	1.90
+++ libsoup.spec	13 Apr 2009 23:43:37 -0000	1.91
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.26.0.9
+Version: 2.26.1
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -84,6 +84,10 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/libsoup/2.26/libsoup-2.26.1.changes
+
 * Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0.9-1
 - Upate to 2.26.0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	9 Apr 2009 17:55:39 -0000	1.48
+++ sources	13 Apr 2009 23:43:37 -0000	1.49
@@ -1 +1 @@
-61e526ff503922888ac107767e9f31c0  libsoup-2.26.0.9.tar.bz2
+94c0495dc8bf213709bdb175ab224c7e  libsoup-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 13 23:50:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 23:50:50 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.75, 1.76 gnome-themes.spec,
	1.133, 1.134 sources, 1.80, 1.81
Message-ID: <20090413235050.A0ACA70124@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28742

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	17 Mar 2009 19:09:50 -0000	1.75
+++ .cvsignore	13 Apr 2009 23:50:47 -0000	1.76
@@ -1 +1 @@
-gnome-themes-2.26.0.tar.bz2
+gnome-themes-2.26.1.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-themes.spec	17 Mar 2009 23:30:12 -0000	1.133
+++ gnome-themes.spec	13 Apr 2009 23:50:47 -0000	1.134
@@ -1,6 +1,6 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.26.0
+Version: 2.26.1
 Release:1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.26/%{name}-%{version}.tar.bz2
@@ -96,6 +96,10 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-themes/2.26/gnome-themes-2.26.1.news
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	17 Mar 2009 19:09:50 -0000	1.80
+++ sources	13 Apr 2009 23:50:47 -0000	1.81
@@ -1 +1 @@
-3f841154544867585504153d57df1fda  gnome-themes-2.26.0.tar.bz2
+edab6b4f97121f449ab69d8eda373d07  gnome-themes-2.26.1.tar.bz2



From jkeating at fedoraproject.org  Mon Apr 13 23:54:17 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:54:17 +0000 (UTC)
Subject: rpms/xsp/devel xsp.spec,1.37,1.38
Message-ID: <20090413235417.C6183700B2@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30283

Modified Files:
	xsp.spec 
Log Message:
* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 2.4-8
- Re-enable ppc
- Fix release numbering






From mclasen at fedoraproject.org  Mon Apr 13 23:55:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 13 Apr 2009 23:55:40 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.85, 1.86 file-roller.spec,
	1.146, 1.147 sources, 1.85, 1.86
Message-ID: <20090413235540.99A0E700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30793

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	17 Mar 2009 00:50:08 -0000	1.85
+++ .cvsignore	13 Apr 2009 23:55:06 -0000	1.86
@@ -1 +1 @@
-file-roller-2.26.0.tar.bz2
+file-roller-2.26.1.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- file-roller.spec	17 Mar 2009 00:50:08 -0000	1.146
+++ file-roller.spec	13 Apr 2009 23:55:07 -0000	1.147
@@ -10,7 +10,7 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.26.0
+Version:	2.26.1
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -128,6 +128,10 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/file-roller/2.26/file-roller-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	17 Mar 2009 00:50:08 -0000	1.85
+++ sources	13 Apr 2009 23:55:07 -0000	1.86
@@ -1 +1 @@
-795c6b0a2b3b02c5f407b1d9f9b643ef  file-roller-2.26.0.tar.bz2
+b9e25c0e96d3cacc69be42037ba93589  file-roller-2.26.1.tar.bz2



From jkeating at fedoraproject.org  Mon Apr 13 23:57:25 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 13 Apr 2009 23:57:25 +0000 (UTC)
Subject: rpms/mono-basic/devel mono-basic.spec,1.23,1.24
Message-ID: <20090413235725.C2E747012C@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31955

Modified Files:
	mono-basic.spec 
Log Message:
* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 2.4-5
- Re-enable ppc
- Fix release numbering



Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mono-basic.spec	6 Apr 2009 20:25:25 -0000	1.23
+++ mono-basic.spec	13 Apr 2009 23:57:24 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:		mono-basic
 Version:	2.4
-Release:	4.1%{?dist}
+Release:	5%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
@@ -20,7 +20,7 @@
 BuildRequires:  mono-devel >= 2.4
 Requires: 	mono-winforms
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
 This package contains the Visual Basic .NET compiler and language
@@ -80,6 +80,10 @@
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
+* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 2.4-5
+- Re-enable ppc
+- Fix release numbering
+
 * Mon Apr 06 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-4.1
 - Remove ppc
 



From sindrepb at fedoraproject.org  Mon Apr 13 23:59:50 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Mon, 13 Apr 2009 23:59:50 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.35,1.36
Message-ID: <20090413235950.B9C197012C@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32432

Modified Files:
	gnome-do.spec 
Log Message:



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-do.spec	11 Apr 2009 12:10:23 -0000	1.35
+++ gnome-do.spec	13 Apr 2009 23:59:13 -0000	1.36
@@ -16,15 +16,14 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
-#ExcludeArch:		ppc64
-ExclusiveArch:  %ix86 x86_64 ia64 armv4l sparc alpha
+ExcludeArch:		ppc64
 
 BuildRequires:		mono-devel, mono-addins-devel
 BuildRequires:		desktop-file-utils
 BuildRequires:		ndesk-dbus-devel
 BuildRequires:		ndesk-dbus-glib-devel
 BuildRequires:		gtk-sharp2-devel, notify-sharp-devel
-BuildRequires:		gnome-sharp-devel, gnome-desktop-sharp-devel
+BuildRequires:		gnome-sharp-devel, gnome-desktop-sharp-devel >= 2.26
 BuildRequires:		gnome-keyring-sharp-devel
 BuildRequires:		gettext
 BuildRequires:		perl-XML-Parser
@@ -36,7 +35,7 @@
 Requires(post): 	GConf2
 Requires(preun): 	GConf2
 
-Requires:		mono(NDesk.DBus.GLib)
+Requires:		mono(NDesk.DBus.GLib) = 1.0.0.0
 Requires:		gnome-keyring-sharp, gnome-desktop-sharp
 Requires:		pkgconfig
 
@@ -139,6 +138,7 @@
 - Fix .desktop issue, install in both autostart and applications
 - Rebuild for new gnome-desktop-sharp
 - Add missing gnome-desktop-sharp requires
+- Fix Ndesk-dbus Requires
 
 * Wed Apr 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-3
 - Add patch to fix issue where applications wasn't being indexed



From lennart at fedoraproject.org  Tue Apr 14 00:06:23 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 14 Apr 2009 00:06:23 +0000 (UTC)
Subject: rpms/pavucontrol/devel .cvsignore, 1.11, 1.12 pavucontrol.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090414000623.47717700B2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3134

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
New upstream release 0.9.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Apr 2009 01:16:18 -0000	1.11
+++ .cvsignore	14 Apr 2009 00:05:52 -0000	1.12
@@ -1 +1 @@
-pavucontrol-0.9.7.git20090410.tar.gz
+pavucontrol-0.9.8.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pavucontrol.spec	10 Apr 2009 01:16:18 -0000	1.17
+++ pavucontrol.spec	14 Apr 2009 00:05:52 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           pavucontrol
-Version:        0.9.7
-Release:        6%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.git20090410.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pulseaudio-libs-devel >= 0.9.15-3.test4
@@ -56,6 +56,9 @@
 %{_datadir}/applications/pavucontrol.desktop
 
 %changelog
+* Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.8-1
+- New upstream release 0.9.8
+
 * Fri Apr 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.7-6
 - Third preview of upcoming 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Apr 2009 01:16:18 -0000	1.11
+++ sources	14 Apr 2009 00:05:52 -0000	1.12
@@ -1 +1 @@
-18bac4edb4dbf15bf1f5fed0958e25ee  pavucontrol-0.9.7.git20090410.tar.gz
+ec37148c658fa5110bc991ab17ea82f0  pavucontrol-0.9.8.tar.gz



From sindrepb at fedoraproject.org  Tue Apr 14 00:08:37 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Tue, 14 Apr 2009 00:08:37 +0000 (UTC)
Subject: rpms/bottlerocket/devel bottlerocket.spec,1.4,1.5
Message-ID: <20090414000837.6D4B9700B2@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/bottlerocket/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3841

Modified Files:
	bottlerocket.spec 
Log Message:



Index: bottlerocket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bottlerocket/devel/bottlerocket.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bottlerocket.spec	24 Feb 2009 05:39:32 -0000	1.4
+++ bottlerocket.spec	14 Apr 2009 00:08:34 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           bottlerocket
 Version:        0.04c
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities to use the FireCracker X10 kit
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.04c-5
+- Rebuilt 
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04c-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Apr 14 00:12:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 00:12:39 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.85, 1.86 pango.spec, 1.158,
	1.159 sources, 1.86, 1.87
Message-ID: <20090414001239.31C0A700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5001

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.24.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	16 Mar 2009 23:17:14 -0000	1.85
+++ .cvsignore	14 Apr 2009 00:12:00 -0000	1.86
@@ -1 +1 @@
-pango-1.24.0.tar.bz2
+pango-1.24.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- pango.spec	26 Mar 2009 04:03:40 -0000	1.158
+++ pango.spec	14 Apr 2009 00:12:00 -0000	1.159
@@ -8,13 +8,13 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.24.0
-Release: 2%{?dist}
+Version: 1.24.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.24/pango-%{version}.tar.bz2
 URL: http://www.pango.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We need to prereq this so we can run pango-querymodules
 Prereq: glib2 >= %{glib2_version}
@@ -39,17 +39,16 @@
 Patch0: pango-1.21.4-lib64.patch
 
 %description
-Pango is a library for laying out and rendering of text, with an emphasis 
+Pango is a library for laying out and rendering of text, with an emphasis
 on internationalization. Pango can be used anywhere that text layout is needed,
-though most of the work on Pango so far has been done in the context of the 
-GTK+ widget toolkit. Pango forms the core of text and font handling for 
-GTK+.
+though most of the work on Pango so far has been done in the context of the
+GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+.
 
-Pango is designed to be modular; the core Pango layout engine can be used 
+Pango is designed to be modular; the core Pango layout engine can be used
 with different font backends.
 
-The integration of Pango with Cairo provides a complete solution with high 
-quality text handling and graphics rendering. 
+The integration of Pango with Cairo provides a complete solution with high
+quality text handling and graphics rendering.
 
 %package devel
 Summary: Development files for pango
@@ -96,7 +95,7 @@
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
 
-# Make sure that the host value that is passed to the compile 
+# Make sure that the host value that is passed to the compile
 # is the same as the host that we're using in the spec file
 #
 compile_host=`grep 'host_triplet =' pango/Makefile | sed "s/.* = //"`
@@ -116,7 +115,7 @@
         echo "$PANGOXFT_SO not found; did not build with Xft support?"
         ls $RPM_BUILD_ROOT%{_libdir}
         exit 1
-fi      
+fi
 
 # We need to have separate 32-bit and 64-bit pango-querymodules binaries
 # for places where we have two copies of the Pango libraries installed.
@@ -224,6 +223,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.24.1-1
+- Update to 1.24.1
+- See http://download.gnome.org/sources/pango/1.24/pango-1.24.1.news
+
 * Wed Mar 26 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.24.0-2
 - Remove weird Requires(pre).
 - Resolves #486641


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	16 Mar 2009 23:17:14 -0000	1.86
+++ sources	14 Apr 2009 00:12:00 -0000	1.87
@@ -1 +1 @@
-d209f41079833cd2ef2c5e580ab9c5ee  pango-1.24.0.tar.bz2
+af0beac1dd1825e241c5728081f16acd  pango-1.24.1.tar.bz2



From bpepple at fedoraproject.org  Tue Apr 14 00:20:47 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 14 Apr 2009 00:20:47 +0000 (UTC)
Subject: rpms/libnice/devel .cvsignore, 1.3, 1.4 libnice.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090414002047.36F7A700B2@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libnice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8652

Modified Files:
	.cvsignore libnice.spec sources 
Log Message:
* Mon Apr 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-1
- Update to 0.0.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Mar 2009 23:30:01 -0000	1.3
+++ .cvsignore	14 Apr 2009 00:20:14 -0000	1.4
@@ -1 +1 @@
-libnice-0.0.5.tar.gz
+libnice-0.0.6.tar.gz


Index: libnice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/libnice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libnice.spec	18 Mar 2009 23:30:01 -0000	1.3
+++ libnice.spec	14 Apr 2009 00:20:15 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           libnice
-Version:        0.0.5
+Version:        0.0.6
 Release:        1%{?dist}
 Summary:        GLib ICE implementation
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-1
+- Update to 0.0.6.
+
 * Wed Mar 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.5-1
 - Update to 0.0.5.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Mar 2009 23:30:01 -0000	1.3
+++ sources	14 Apr 2009 00:20:15 -0000	1.4
@@ -1 +1 @@
-e6341a8039b6bcdd6c5b885bdd8fa24c  libnice-0.0.5.tar.gz
+055e3eedf735ee1257fd4bb9ce86d04e  libnice-0.0.6.tar.gz



From mclasen at fedoraproject.org  Tue Apr 14 00:39:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 00:39:39 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.22, 1.23 libgweather.spec, 1.38,
	1.39 sources, 1.22, 1.23
Message-ID: <20090414003939.6741B700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15599

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Mar 2009 01:54:43 -0000	1.22
+++ .cvsignore	14 Apr 2009 00:39:08 -0000	1.23
@@ -1 +1 @@
-libgweather-2.26.0.tar.bz2
+libgweather-2.26.1.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgweather.spec	17 Mar 2009 01:54:43 -0000	1.38
+++ libgweather.spec	14 Apr 2009 00:39:08 -0000	1.39
@@ -1,5 +1,5 @@
 Name:           libgweather
-Version:        2.26.0
+Version:        2.26.1
 Release:        1%{?dist}
 Summary:        A library for weather information
 
@@ -122,6 +122,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/libgweather/2.26/libgweather-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Mar 2009 01:54:43 -0000	1.22
+++ sources	14 Apr 2009 00:39:08 -0000	1.23
@@ -1 +1 @@
-b96016d7b35c66cf251189e9851ee252  libgweather-2.26.0.tar.bz2
+382041ee8f4efeec1afde968624d34fe  libgweather-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Tue Apr 14 00:40:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 00:40:12 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.53, 1.54 gnome-menus.spec,
	1.100, 1.101 sources, 1.53, 1.54
Message-ID: <20090414004012.EA450700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9875

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	17 Mar 2009 01:44:38 -0000	1.53
+++ .cvsignore	14 Apr 2009 00:39:40 -0000	1.54
@@ -1 +1 @@
-gnome-menus-2.26.0.tar.bz2
+gnome-menus-2.26.1.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-menus.spec	17 Mar 2009 01:44:38 -0000	1.100
+++ gnome-menus.spec	14 Apr 2009 00:39:41 -0000	1.101
@@ -5,7 +5,7 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-menus/2.26/gnome-menus-2.26.1.news
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	17 Mar 2009 01:44:38 -0000	1.53
+++ sources	14 Apr 2009 00:39:41 -0000	1.54
@@ -1 +1 @@
-55fd07e67d8334de2e03e4e23c011452  gnome-menus-2.26.0.tar.bz2
+c5100879f6ff9750d4bc7e553671ad93  gnome-menus-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Tue Apr 14 00:46:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 00:46:03 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.59, 1.60 gnome-terminal.spec,
	1.120, 1.121 sources, 1.60, 1.61
Message-ID: <20090414004603.5CAC6700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17445

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	16 Mar 2009 16:41:42 -0000	1.59
+++ .cvsignore	14 Apr 2009 00:45:32 -0000	1.60
@@ -1 +1 @@
-gnome-terminal-2.26.0.tar.bz2
+gnome-terminal-2.26.1.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-terminal.spec	8 Apr 2009 17:57:25 -0000	1.120
+++ gnome-terminal.spec	14 Apr 2009 00:45:32 -0000	1.121
@@ -10,8 +10,8 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -135,6 +135,10 @@
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-terminal/2.26/gnome-terminal-2.26.1.news
+
 * Wed Apr  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Incorporate upstream patch to make session saving work better
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	16 Mar 2009 16:41:42 -0000	1.60
+++ sources	14 Apr 2009 00:45:32 -0000	1.61
@@ -1 +1 @@
-013e51a2c4dd7dde5db49587952065ae  gnome-terminal-2.26.0.tar.bz2
+49acf3da4c820249b763d636f27e3a46  gnome-terminal-2.26.1.tar.bz2



From lennart at fedoraproject.org  Tue Apr 14 00:49:12 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 14 Apr 2009 00:49:12 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.10, 1.11 libcanberra.spec, 1.24,
	1.25 sources, 1.11,
	1.12 ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch, 1.1, NONE
Message-ID: <20090414004912.40B80700B2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19127

Modified Files:
	.cvsignore libcanberra.spec sources 
Removed Files:
	ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch 
Log Message:
New version 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Jan 2009 21:25:47 -0000	1.10
+++ .cvsignore	14 Apr 2009 00:49:11 -0000	1.11
@@ -1 +1 @@
-libcanberra-0.11.tar.gz
+libcanberra-0.12.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libcanberra.spec	1 Apr 2009 00:31:47 -0000	1.24
+++ libcanberra.spec	14 Apr 2009 00:49:11 -0000	1.25
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.11
-Release: 9%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -19,7 +19,6 @@
 BuildRequires: gettext-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
-Patch0: ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -73,10 +72,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .febbf740799d85dfbdca965efa9867fd70fa2cfc
 
 %build
-%configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
+%configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
 make %{?_smp_mflags}
 
 %install
@@ -97,7 +95,6 @@
 %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
-%{_libdir}/libcanberra-%{version}/libcanberra-oss.so
 %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 
 %files gtk2
@@ -120,6 +117,9 @@
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.12-1
+- New version 0.12
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-9
 - Another preview for 0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jan 2009 21:25:47 -0000	1.11
+++ sources	14 Apr 2009 00:49:11 -0000	1.12
@@ -1 +1 @@
-c661db14cb0b1fe9b6963defacc3bba6  libcanberra-0.11.tar.gz
+01a1952e861defa6de9d193558f2a732  libcanberra-0.12.tar.gz


--- ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch DELETED ---



From mclasen at fedoraproject.org  Tue Apr 14 00:52:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 00:52:20 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.82, 1.83 gnome-desktop.spec, 
	1.208, 1.209 sources, 1.82, 1.83
Message-ID: <20090414005221.1DAD2700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20153

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	17 Mar 2009 03:09:38 -0000	1.82
+++ .cvsignore	14 Apr 2009 00:51:49 -0000	1.83
@@ -1 +1 @@
-gnome-desktop-2.26.0.tar.bz2
+gnome-desktop-2.26.1.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- gnome-desktop.spec	17 Mar 2009 03:14:12 -0000	1.208
+++ gnome-desktop.spec	14 Apr 2009 00:51:49 -0000	1.209
@@ -11,7 +11,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
@@ -117,6 +117,10 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-desktop/2.26/gnome-desktop-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	17 Mar 2009 03:09:38 -0000	1.82
+++ sources	14 Apr 2009 00:51:49 -0000	1.83
@@ -1 +1 @@
-796fc830e0baff24381809a7abe012f8  gnome-desktop-2.26.0.tar.bz2
+96f2a033b2db2da1cd8d3d21fef61c4d  gnome-desktop-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Tue Apr 14 00:59:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 00:59:42 +0000 (UTC)
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.121,1.122
Message-ID: <20090414005942.388BD700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23010

Modified Files:
	gnome-terminal.spec 
Log Message:
drop obsolete patch



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnome-terminal.spec	14 Apr 2009 00:45:32 -0000	1.121
+++ gnome-terminal.spec	14 Apr 2009 00:59:40 -0000	1.122
@@ -20,8 +20,6 @@
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 # From upstream trunk
 Patch3: tab-switching.patch
-# from upstream
-Patch4: gnome-terminal-session.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,7 +54,6 @@
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
 %patch3 -p1 -b .tab-switching
-%patch4 -p0 -b .session
 
 %build
 



From mclasen at fedoraproject.org  Tue Apr 14 01:10:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 01:10:44 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.80, 1.81 eog.spec, 1.142, 1.143 sources,
	1.80, 1.81
Message-ID: <20090414011044.9E97B70137@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26546

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	17 Mar 2009 01:36:15 -0000	1.80
+++ .cvsignore	14 Apr 2009 01:10:12 -0000	1.81
@@ -1 +1 @@
-eog-2.26.0.tar.bz2
+eog-2.26.1.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- eog.spec	17 Mar 2009 01:36:15 -0000	1.142
+++ eog.spec	14 Apr 2009 01:10:13 -0000	1.143
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.26/%{name}-%{version}.tar.bz2
@@ -170,6 +170,10 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/eog/2.26/eog-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	17 Mar 2009 01:36:15 -0000	1.80
+++ sources	14 Apr 2009 01:10:13 -0000	1.81
@@ -1 +1 @@
-5d513046f80bc989e715243d8cee2825  eog-2.26.0.tar.bz2
+d64d556b58c6342479a1efcb1bf9401e  eog-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Tue Apr 14 01:16:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 01:16:03 +0000 (UTC)
Subject: rpms/libgtop2/devel .cvsignore, 1.49, 1.50 libgtop2.spec, 1.75,
	1.76 sources, 1.49, 1.50
Message-ID: <20090414011603.7D425700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgtop2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29096

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	2 Mar 2009 20:40:46 -0000	1.49
+++ .cvsignore	14 Apr 2009 01:15:31 -0000	1.50
@@ -1 +1 @@
-libgtop-2.26.0.tar.bz2
+libgtop-2.26.1.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- libgtop2.spec	2 Mar 2009 20:46:35 -0000	1.75
+++ libgtop2.spec	14 Apr 2009 01:15:31 -0000	1.76
@@ -6,7 +6,7 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.26.0
+Version: 	2.26.1
 Release: 	1%{?dist}
 License: 	GPLv2+
 URL:            http://download.gnome.org/sources/libgtop/2.26
@@ -71,6 +71,10 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/libgtop/2.26/libgtop-2.26.1.news
+
 * Mon Mar  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	2 Mar 2009 20:40:46 -0000	1.49
+++ sources	14 Apr 2009 01:15:31 -0000	1.50
@@ -1 +1 @@
-a51ff49eddcce4573f7385e4be33158a  libgtop-2.26.0.tar.bz2
+49fe5c91a6bbc103a0a05c6854a6cc11  libgtop-2.26.1.tar.bz2



From ausil at fedoraproject.org  Tue Apr 14 01:24:42 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 14 Apr 2009 01:24:42 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.125,1.126
Message-ID: <20090414012443.02CB4700B2@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31932

Modified Files:
	mono.spec 
Log Message:
build 32 bit sparc sparcv9



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- mono.spec	13 Apr 2009 23:04:52 -0000	1.125
+++ mono.spec	14 Apr 2009 01:24:12 -0000	1.126
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        15.1.RC1%{?dist}
+Release:        16.1.RC1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -34,7 +34,7 @@
 BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -711,6 +711,9 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-16
+- set sparc32 to build sparcv9
+
 * Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-15
 - Revert to RC1 with changes to the spec file such as enabling moonlight so
   that we have a working build for F11.



From mclasen at fedoraproject.org  Tue Apr 14 01:33:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 01:33:45 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.77,
	1.78 gnome-system-monitor.spec, 1.139, 1.140 sources, 1.77, 1.78
Message-ID: <20090414013345.6BE27700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1794

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	16 Mar 2009 18:19:09 -0000	1.77
+++ .cvsignore	14 Apr 2009 01:33:43 -0000	1.78
@@ -1 +1 @@
-gnome-system-monitor-2.26.0.1.tar.bz2
+gnome-system-monitor-2.26.1.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-system-monitor.spec	16 Mar 2009 18:19:09 -0000	1.139
+++ gnome-system-monitor.spec	14 Apr 2009 01:33:43 -0000	1.140
@@ -12,7 +12,7 @@
 
 Summary: Process and resource monitor
 Name: gnome-system-monitor
-Version: 2.26.0.1
+Version: 2.26.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-system-monitor/2.26/gnome-system-monitor-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0.1-1
 - Update to 2.26.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	16 Mar 2009 18:19:09 -0000	1.77
+++ sources	14 Apr 2009 01:33:43 -0000	1.78
@@ -1 +1 @@
-553de9c4912f4af25f92a3380626c0f1  gnome-system-monitor-2.26.0.1.tar.bz2
+105eaf7f64a19848d5fe94e4cd4e4189  gnome-system-monitor-2.26.1.tar.bz2



From mclasen at fedoraproject.org  Tue Apr 14 01:44:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 01:44:20 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.42, 1.43 sources, 1.42,
	1.43 tomboy.spec, 1.112, 1.113
Message-ID: <20090414014420.576FC70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6460

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	17 Mar 2009 02:30:51 -0000	1.42
+++ .cvsignore	14 Apr 2009 01:44:17 -0000	1.43
@@ -1 +1 @@
-tomboy-0.14.0.tar.bz2
+tomboy-0.14.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	17 Mar 2009 02:30:51 -0000	1.42
+++ sources	14 Apr 2009 01:44:18 -0000	1.43
@@ -1 +1 @@
-75ab86e08d925c7ab74d88999e2121e7  tomboy-0.14.0.tar.bz2
+d62cbf3de404899a27de4332327419f4  tomboy-0.14.1.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- tomboy.spec	5 Apr 2009 22:29:54 -0000	1.112
+++ tomboy.spec	14 Apr 2009 01:44:18 -0000	1.113
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.14.0
-Release: 	2%{?dist}
+Version:        0.14.1
+Release: 	1%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -145,6 +145,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.1-1
+- Update to 0.14.1
+- See http://download.gnome.org/sources/tomboy/0.14/tomboy-0.14.1.news
+
 * Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.0-2
 - Split off a silly one-file devel package (#476251)
 



From robert at fedoraproject.org  Tue Apr 14 02:07:22 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 02:07:22 +0000 (UTC)
Subject: rpms/xqilla/devel xqilla-cstdio.patch, NONE, 1.1 xqilla.spec, 1.10,
	1.11
Message-ID: <20090414020722.1C9A2700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/xqilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15766

Modified Files:
	xqilla.spec 
Added Files:
	xqilla-cstdio.patch 
Log Message:
Added a few #include lines needed to build properly with g++ 4.4


xqilla-cstdio.patch:

--- NEW FILE xqilla-cstdio.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for xqilla >= 2.1.3, that
adds a few #include lines needed to build properly with g++ version 4.4.

--- src/items/Numeric.cpp		2008-04-11 03:03:41.000000000 +0200
+++ src/items/Numeric.cpp.cstdio	2009-04-14 03:48:59.000000000 +0200
@@ -19,6 +19,7 @@
  * $Id: Numeric.cpp 475 2008-01-08 18:47:44Z jpcs $
  */
 
+#include <cstdio>
 #include <assert.h>
 
 #include "../config/xqilla_config.h"
--- src/lexer/XQLexer.hpp		2008-04-11 03:03:40.000000000 +0200
+++ src/lexer/XQLexer.hpp.cstdio	2009-04-14 03:55:29.000000000 +0200
@@ -76,6 +76,7 @@
 #include "FlexLexer.h"
 #endif
 
+#include <cstdio>
 #include <xercesc/util/BitSet.hpp>
 #include <xercesc/util/RefHashTableOf.hpp>
 #include <xqilla/simple-api/XQQuery.hpp>


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/xqilla.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xqilla.spec	26 Feb 2009 11:57:21 -0000	1.10
+++ xqilla.spec	14 Apr 2009 02:07:18 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
 Version: 2.1.3
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
 Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
@@ -18,6 +18,7 @@
 BuildRequires: autoconf automake libtool
 BuildRequires: doxygen graphviz
 
+Patch0: xqilla-cstdio.patch
 Patch1: xqilla-xercesc-libdir.patch
 
 %define xercesc_build_root %{_builddir}/%{xercesc_dir}
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q -b 1 -n XQilla-%{version}
+%patch0
 %patch1
 
 %build
@@ -105,6 +107,9 @@
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
+* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 2.1.3-0.6
+- Added a few #include lines needed to build properly with g++ 4.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lennart at fedoraproject.org  Tue Apr 14 02:14:50 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 14 Apr 2009 02:14:50 +0000 (UTC)
Subject: rpms/avahi/devel .cvsignore, 1.19, 1.20 avahi.spec, 1.113,
	1.114 sources, 1.20, 1.21 avahi-0.6.22-update-de.patch, 1.1,
	NONE avahi-0.6.22-vncviewer.patch, 1.1, NONE
Message-ID: <20090414021450.7752D70127@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18436

Modified Files:
	.cvsignore avahi.spec sources 
Removed Files:
	avahi-0.6.22-update-de.patch avahi-0.6.22-vncviewer.patch 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Dec 2008 21:36:22 -0000	1.19
+++ .cvsignore	14 Apr 2009 02:14:19 -0000	1.20
@@ -1 +1 @@
-avahi-0.6.24.tar.gz
+avahi-0.6.25.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- avahi.spec	24 Feb 2009 03:34:54 -0000	1.113
+++ avahi.spec	14 Apr 2009 02:14:19 -0000	1.114
@@ -5,8 +5,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.24
-Release:        2%{?dist}
+Version:        0.6.25
+Release:        1%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPLv2
@@ -559,6 +559,9 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> - 0.6.25-1
+- New upstream release
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Dec 2008 21:36:22 -0000	1.20
+++ sources	14 Apr 2009 02:14:19 -0000	1.21
@@ -1 +1 @@
-068c1d220b07037e64caf87d4a7a0504  avahi-0.6.24.tar.gz
+a83155a6e29e3988f07e5eea3287b21e  avahi-0.6.25.tar.gz


--- avahi-0.6.22-update-de.patch DELETED ---


--- avahi-0.6.22-vncviewer.patch DELETED ---



From mbarnes at fedoraproject.org  Tue Apr 14 02:18:33 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 02:18:33 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.92, 1.93 gtkhtml3.spec, 1.147,
	1.148 sources, 1.92, 1.93
Message-ID: <20090414021833.701E3700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20287

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 3.26.1-1.fc11
- Update to 3.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	16 Mar 2009 11:47:04 -0000	1.92
+++ .cvsignore	14 Apr 2009 02:18:01 -0000	1.93
@@ -1 +1 @@
-gtkhtml-3.26.0.tar.bz2
+gtkhtml-3.26.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gtkhtml3.spec	16 Mar 2009 11:47:04 -0000	1.147
+++ gtkhtml3.spec	14 Apr 2009 02:18:02 -0000	1.148
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.26.0
+Version: 3.26.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -119,6 +119,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 3.26.1-1.fc11
+- Update to 3.26.1
+
 * Mon Mar 16 2009 Matthew Barnes <mbarnes at redhat.com> - 3.26.0-1.fc11
 - Update to 3.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources	16 Mar 2009 11:47:05 -0000	1.92
+++ sources	14 Apr 2009 02:18:02 -0000	1.93
@@ -1 +1 @@
-75d3b6dcd939c2ddcad8aa255ab76f90  gtkhtml-3.26.0.tar.bz2
+3f50519cfa7014d281a02563de487430  gtkhtml-3.26.1.tar.bz2



From cweyl at fedoraproject.org  Tue Apr 14 02:22:53 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 14 Apr 2009 02:22:53 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier/devel import.log, NONE,
	1.1 perl-CSS-Minifier.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090414022253.4EC22700B2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22183/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CSS-Minifier.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CSS-Minifier-0_01-1_fc10:HEAD:perl-CSS-Minifier-0.01-1.fc10.src.rpm:1239675680


--- NEW FILE perl-CSS-Minifier.spec ---
Name:       perl-CSS-Minifier 
Version:    0.01 
Release:    1%{?dist}
# lib/CSS/Minifier.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Remove unnecessary whitespace from CSS files 
Source:     http://search.cpan.org/CPAN/authors/id/P/PM/PMICHAUX/CSS-Minifier-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/CSS-Minifier
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
# tests
BuildRequires: perl(Test::More)

%description
This module removes unnecessary whitespace from CSS. The primary
requirement developing this module is to not break working stylesheets:
if working CSS is in input then working CSS is output. The Mac/Internet
Explorer comment hack will be minimized but not stripped and so will
continue to function.This module understands space, horizontal tab, new
line, carriage return, and form feed characters to be whitespace. Any
other characters that may be considered whitespace are not minimized.
These other characters include paragraph separator and vertical tab.For
static CSS files, it is recommended that you minify during the build
stage of web deployment. If you minify on-the-fly then it might be a
good idea to cache the minified file. Minifying static files on-the-fly
repeatedly is wasteful.

%prep
%setup -q -n CSS-Minifier-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission

* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:49:36 -0000	1.1
+++ .cvsignore	14 Apr 2009 02:22:44 -0000	1.2
@@ -0,0 +1 @@
+CSS-Minifier-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:49:36 -0000	1.1
+++ sources	14 Apr 2009 02:22:49 -0000	1.2
@@ -0,0 +1 @@
+04f64c08c9268fd0fc619ef8110d2cf4  CSS-Minifier-0.01.tar.gz



From cweyl at fedoraproject.org  Tue Apr 14 02:29:04 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 14 Apr 2009 02:29:04 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier/F-9 import.log, NONE,
	1.1 perl-CSS-Minifier.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090414022904.E315A700B2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24387/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CSS-Minifier.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CSS-Minifier-0_01-1_fc10:F-9:perl-CSS-Minifier-0.01-1.fc10.src.rpm:1239676078


--- NEW FILE perl-CSS-Minifier.spec ---
Name:       perl-CSS-Minifier 
Version:    0.01 
Release:    1%{?dist}
# lib/CSS/Minifier.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Remove unnecessary whitespace from CSS files 
Source:     http://search.cpan.org/CPAN/authors/id/P/PM/PMICHAUX/CSS-Minifier-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/CSS-Minifier
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
# tests
BuildRequires: perl(Test::More)

%description
This module removes unnecessary whitespace from CSS. The primary
requirement developing this module is to not break working stylesheets:
if working CSS is in input then working CSS is output. The Mac/Internet
Explorer comment hack will be minimized but not stripped and so will
continue to function.This module understands space, horizontal tab, new
line, carriage return, and form feed characters to be whitespace. Any
other characters that may be considered whitespace are not minimized.
These other characters include paragraph separator and vertical tab.For
static CSS files, it is recommended that you minify during the build
stage of web deployment. If you minify on-the-fly then it might be a
good idea to cache the minified file. Minifying static files on-the-fly
repeatedly is wasteful.

%prep
%setup -q -n CSS-Minifier-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission

* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:49:36 -0000	1.1
+++ .cvsignore	14 Apr 2009 02:28:34 -0000	1.2
@@ -0,0 +1 @@
+CSS-Minifier-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:49:36 -0000	1.1
+++ sources	14 Apr 2009 02:28:34 -0000	1.2
@@ -0,0 +1 @@
+04f64c08c9268fd0fc619ef8110d2cf4  CSS-Minifier-0.01.tar.gz



From mbarnes at fedoraproject.org  Tue Apr 14 02:31:32 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 02:31:32 +0000 (UTC)
Subject: rpms/evolution-data-server/devel
	evolution-data-server-2.26.1-fix-libical-include.patch, NONE,
	1.1 .cvsignore, 1.104, 1.105 evolution-data-server.spec, 1.259,
	1.260 sources, 1.104, 1.105
Message-ID: <20090414023132.EDFE5700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25017

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-2.26.1-fix-libical-include.patch 
Log Message:

* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
- Update to 2.26.1


evolution-data-server-2.26.1-fix-libical-include.patch:

--- NEW FILE evolution-data-server-2.26.1-fix-libical-include.patch ---
diff -up evolution-data-server-2.26.1/calendar/libedata-cal/e-cal-backend-sync.c.fix-libical-include evolution-data-server-2.26.1/calendar/libedata-cal/e-cal-backend-sync.c
--- evolution-data-server-2.26.1/calendar/libedata-cal/e-cal-backend-sync.c.fix-libical-include	2009-04-13 05:02:39.000000000 -0400
+++ evolution-data-server-2.26.1/calendar/libedata-cal/e-cal-backend-sync.c	2009-04-13 22:22:08.000000000 -0400
@@ -11,7 +11,7 @@
 #endif
 
 #include "e-cal-backend-sync.h"
-#include <icaltz-util.h>
+#include <libical/icaltz-util.h>
 
 struct _ECalBackendSyncPrivate {
 	GMutex *sync_mutex;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	16 Mar 2009 11:47:10 -0000	1.104
+++ .cvsignore	14 Apr 2009 02:31:31 -0000	1.105
@@ -1 +1 @@
-evolution-data-server-2.26.0.tar.bz2
+evolution-data-server-2.26.1.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- evolution-data-server.spec	16 Mar 2009 11:47:10 -0000	1.259
+++ evolution-data-server.spec	14 Apr 2009 02:31:31 -0000	1.260
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -53,6 +53,8 @@
 # RH bug #243296
 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+Patch13: evolution-data-server-2.26.1-fix-libical-include.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -136,6 +138,7 @@
 %patch10 -p1 -b .fix-ldap-query
 %patch11 -p1 -b .camel-folder-summary-crash
 %patch12 -p1 -b .fix-64bit-acinclude
+%patch13 -p1 -b .fix-libical-include
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -381,6 +384,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
+- Update to 2.26.1
+
 * Mon Mar 16 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-1.fc11
 - Update to 2.26.0
 - Remove patch for RH bug #568332 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	16 Mar 2009 11:47:11 -0000	1.104
+++ sources	14 Apr 2009 02:31:31 -0000	1.105
@@ -1 +1 @@
-d010845a4ee9604f050403b106c2f416  evolution-data-server-2.26.0.tar.bz2
+2f5651141653f130d83301212b17db70  evolution-data-server-2.26.1.tar.bz2



From ivazquez at fedoraproject.org  Tue Apr 14 02:40:59 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Tue, 14 Apr 2009 02:40:59 +0000 (UTC)
Subject: rpms/oflb-riordonfancy-fonts/devel oflb-riordonfancy-fonts.spec, 1.1,
	1.2
Message-ID: <20090414024059.37028700B2@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/oflb-riordonfancy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27687

Modified Files:
	oflb-riordonfancy-fonts.spec 
Log Message:
Rebuild for stronger hashes


Index: oflb-riordonfancy-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-riordonfancy-fonts/devel/oflb-riordonfancy-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oflb-riordonfancy-fonts.spec	24 Mar 2009 17:59:17 -0000	1.1
+++ oflb-riordonfancy-fonts.spec	14 Apr 2009 02:40:26 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           oflb-%{fontname}-fonts
 Version:        4
-Release:        1
+Release:        2
 Summary:        A stylized font
 
 Group:          User Interface/X
@@ -66,6 +66,9 @@
 %dir %{_fontdir}
 
 %changelog
+* Mon Apr 13 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 4-2
+- Rebuild for stronger hashes
+
 * Mon Mar 16 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 4-1
 - Upstream update
 - Renamed to oflb-riordon-fancy-fonts



From robert at fedoraproject.org  Tue Apr 14 02:42:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 02:42:10 +0000 (UTC)
Subject: rpms/aria2/devel .cvsignore, 1.9, 1.10 aria2.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <20090414024210.71368700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/aria2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28235

Modified Files:
	.cvsignore aria2.spec sources 
Log Message:
Upgrade to 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aria2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Dec 2008 15:35:47 -0000	1.9
+++ .cvsignore	14 Apr 2009 02:42:07 -0000	1.10
@@ -1 +1 @@
-aria2c-1.0.1.tar.bz2
+aria2-1.3.1.tar.bz2


Index: aria2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aria2/devel/aria2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aria2.spec	24 Feb 2009 01:43:46 -0000	1.15
+++ aria2.spec	14 Apr 2009 02:42:07 -0000	1.16
@@ -1,13 +1,13 @@
 %define binname aria2c
 
 Name:           aria2
-Version:        1.0.1
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        High speed download utility with resuming and segmented downloading
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://aria2.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{binname}/%{binname}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bison
 BuildRequires:  c-ares-devel cppunit-devel
@@ -36,7 +36,7 @@
 - Limiting download/upload speed
 
 %prep
-%setup -q -n %{binname}-%{version}
+%setup -q
 
 %build
 %configure --enable-bittorrent \
@@ -58,15 +58,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang aria2c
+%find_lang %{name}
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{binname}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f aria2c.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README doc/aria2c.1.html
 %{_bindir}/%{binname}
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> - 1.3.1-1
+- Upgrade to 1.3.1
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aria2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Dec 2008 15:35:47 -0000	1.9
+++ sources	14 Apr 2009 02:42:08 -0000	1.10
@@ -1 +1 @@
-50d804451022d9f9fd03cc34d0862c1e  aria2c-1.0.1.tar.bz2
+b6dba5a335936b1dd5a47ede2cabdbc5  aria2-1.3.1.tar.bz2



From airlied at fedoraproject.org  Tue Apr 14 02:42:54 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 14 Apr 2009 02:42:54 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-modesetting-radeon-fixes.patch, NONE,
	1.1 kernel.spec, 1.1323, 1.1324
Message-ID: <20090414024254.B8B67700B2@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28451

Modified Files:
	kernel.spec 
Added Files:
	drm-modesetting-radeon-fixes.patch 
Log Message:
* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-23
- radeon: add some more kms fixes backported from F11


drm-modesetting-radeon-fixes.patch:

--- NEW FILE drm-modesetting-radeon-fixes.patch ---
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 5332de5..b7a2a6c 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -222,7 +222,7 @@ atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 			if (!radeon_is_avivo(dev_priv)) {
 				if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
 					pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
-				if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS)
+				if (!radeon_is_avivo(dev_priv) && (encoder->encoder_type == DRM_MODE_ENCODER_LVDS))
 					pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 			radeon_encoder = to_radeon_encoder(encoder);
@@ -342,8 +342,8 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
 	RADEON_WRITE(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
 	RADEON_WRITE(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0);
 	RADEON_WRITE(AVIVO_D1GRPH_Y_START + radeon_crtc->crtc_offset, 0);
-	RADEON_WRITE(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, crtc->mode.hdisplay); /*XXX fb width in pixels*/
-	RADEON_WRITE(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, crtc->mode.vdisplay); /*XXX fb height in pixels*/
+	RADEON_WRITE(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, crtc->fb->width);
+	RADEON_WRITE(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, crtc->fb->height);
 
 	fb_pitch_pixels = crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8);
 	RADEON_WRITE(AVIVO_D1GRPH_PITCH + radeon_crtc->crtc_offset, fb_pitch_pixels);
diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
index 86ab054..6ea52a8 100644
--- a/drivers/gpu/drm/radeon/radeon_buffer.c
+++ b/drivers/gpu/drm/radeon/radeon_buffer.c
@@ -447,11 +447,18 @@ fallback:
  */
 uint64_t radeon_evict_flags(struct drm_buffer_object *bo)
 {
+	struct drm_device *dev = bo->dev;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	int cached = 0;
+
+	if (!(dev_priv->flags & RADEON_IS_AGP))
+		cached = DRM_BO_FLAG_CACHED;
+
 	switch (bo->mem.mem_type) {
 	case DRM_BO_MEM_LOCAL:
 	case DRM_BO_MEM_TT:
-		return DRM_BO_FLAG_MEM_LOCAL;
+		return DRM_BO_FLAG_MEM_LOCAL | cached;
 	default:
-		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL;
+		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL | cached;
 	}
 }
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index cb750f1..a8d82d4 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -528,8 +528,8 @@ bool radeon_combios_get_clock_info(struct drm_device *dev)
 		}
 
 		/* default sclk/mclk */
-		sclk = radeon_bios16(dev_priv, pll_info + 0x8);
-		mclk = radeon_bios16(dev_priv, pll_info + 0xa);
+		sclk = radeon_bios16(dev_priv, pll_info + 0xa);
+		mclk = radeon_bios16(dev_priv, pll_info + 0x8);
 		if (sclk == 0)
 			sclk = 200;
 		if (mclk == 0)
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index 531774a..7ddc8fd 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -160,7 +160,8 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 	if (!handle) {
 		/* turn off cursor */
 		radeon_hide_cursor(crtc);
-		return 0;
+		obj = NULL;
+		goto unpin;
 	}
 
 	if ((width > CURSOR_WIDTH) || (height > CURSOR_HEIGHT)) {
@@ -184,6 +185,7 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 	radeon_show_cursor(crtc);
 	radeon_lock_cursor(crtc, false);
 
+unpin:
 	if (radeon_crtc->cursor_bo) {
 		radeon_gem_object_unpin(radeon_crtc->cursor_bo);
 		mutex_lock(&crtc->dev->struct_mutex);
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 2d5ffc9..2bbdd39 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -242,6 +242,7 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
 		kfree(edid);
 		return ret;
 	}
+	drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
 	return -1;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index f3e4109..b789378 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -2211,7 +2211,7 @@ struct drm_radeon_gem_object {
 	struct drm_buffer_object *bo;
 	struct drm_fence_object *fence;
 	struct drm_gem_object *obj;
-	
+	int pin_count;
 };
 
 #define RADEON_IB_MEMORY (1*1024*1024)
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index d3777a4..433ebc9 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -219,8 +219,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
 }
 
 static void
-atombios_dac_setup(struct drm_encoder *encoder,
-		   struct drm_display_mode *mode)
+atombios_dac_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -245,7 +244,7 @@ atombios_dac_setup(struct drm_encoder *encoder,
 		break;
 	}
 
-	args.ucAction = ATOM_ENABLE;
+	args.ucAction = action;
 
 	if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))
 		args.ucDacStandard = ATOM_DAC1_PS2;
@@ -268,15 +267,14 @@ atombios_dac_setup(struct drm_encoder *encoder,
 			break;
 		}
 	}
-	args.usPixelClock = cpu_to_le16(mode->clock / 10);
+	args.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 
 	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 
 }
 
 static void
-atombios_tv_setup(struct drm_encoder *encoder,
-		  struct drm_display_mode *mode)
+atombios_tv_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -290,7 +288,7 @@ atombios_tv_setup(struct drm_encoder *encoder,
 
 	index = GetIndexIntoMasterTable(COMMAND, TVEncoderControl);
 
-	args.sTVEncoder.ucAction = ATOM_ENABLE;
+	args.sTVEncoder.ucAction = action;
 
 	if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
 		args.sTVEncoder.ucTvStandard = ATOM_TV_CV;
@@ -326,18 +324,18 @@ atombios_tv_setup(struct drm_encoder *encoder,
 		}
 	}
 
-	args.sTVEncoder.usPixelClock = cpu_to_le16(mode->clock / 10);
+	args.sTVEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 
 	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 
 }
 
 void
-atombios_external_tmds_setup(struct drm_encoder *encoder,
-			     struct drm_display_mode *mode)
+atombios_external_tmds_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 	ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION args;
 	int index = 0;
 
@@ -345,9 +343,9 @@ atombios_external_tmds_setup(struct drm_encoder *encoder,
 
 	index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl);
 
-	args.sXTmdsEncoder.ucEnable = ATOM_ENABLE;
+	args.sXTmdsEncoder.ucEnable = action;
 
-	if (mode->clock > 165000)
+	if (radeon_encoder->pixel_clock > 165000)
 		args.sXTmdsEncoder.ucMisc = PANEL_ENCODER_MISC_DUAL;
 
 	/*if (pScrn->rgbBits == 8)*/
@@ -358,11 +356,11 @@ atombios_external_tmds_setup(struct drm_encoder *encoder,
 }
 
 static void
-atombios_ddia_setup(struct drm_encoder *encoder,
-		    struct drm_display_mode *mode)
+atombios_ddia_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 	DVO_ENCODER_CONTROL_PS_ALLOCATION args;
 	int index = 0;
 
@@ -370,10 +368,10 @@ atombios_ddia_setup(struct drm_encoder *encoder,
 
 	index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl);
 
-	args.sDVOEncoder.ucAction = ATOM_ENABLE;
-	args.sDVOEncoder.usPixelClock = cpu_to_le16(mode->clock / 10);
+	args.sDVOEncoder.ucAction = action;
+	args.sDVOEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 
-	if (mode->clock > 165000)
+	if (radeon_encoder->pixel_clock > 165000)
 		args.sDVOEncoder.usDevAttr.sDigAttrib.ucAttribute = PANEL_ENCODER_MISC_DUAL;
 
 	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
@@ -386,8 +384,7 @@ union lvds_encoder_control {
 };
 
 static void
-atombios_digital_setup(struct drm_encoder *encoder,
-		       struct drm_display_mode *mode)
+atombios_digital_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -442,12 +439,12 @@ atombios_digital_setup(struct drm_encoder *encoder,
 		switch (crev) {
 		case 1:
 			args.v1.ucMisc = 0;
-			args.v1.ucAction = PANEL_ENCODER_ACTION_ENABLE;
+			args.v1.ucAction = action;
 			/* XXX should probably check based on edid */
 			if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
 			    (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
 				args.v1.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
-			args.v1.usPixelClock = cpu_to_le16(mode->clock / 10);
+			args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 			if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
 				if (dig->lvds_misc & (1 << 0))
 					args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL;
@@ -456,7 +453,7 @@ atombios_digital_setup(struct drm_encoder *encoder,
 			} else {
 				if (dig_connector->linkb)
 					args.v1.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
-				if (mode->clock > 165000)
+				if (radeon_encoder->pixel_clock > 165000)
 					args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 				/*if (pScrn->rgbBits == 8) */
 				args.v1.ucMisc |= (1 << 1);
@@ -465,7 +462,7 @@ atombios_digital_setup(struct drm_encoder *encoder,
 		case 2:
 		case 3:
 			args.v2.ucMisc = 0;
-			args.v2.ucAction = PANEL_ENCODER_ACTION_ENABLE;
+			args.v2.ucAction = action;
 			if (crev == 3) {
 				if (dig->coherent_mode)
 					args.v2.ucMisc |= PANEL_ENCODER_MISC_COHERENT;
@@ -474,7 +471,7 @@ atombios_digital_setup(struct drm_encoder *encoder,
 			if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
 			    (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
 				args.v2.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
-			args.v2.usPixelClock = cpu_to_le16(mode->clock / 10);
+			args.v2.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 			args.v2.ucTruncate = 0;
 			args.v2.ucSpatial = 0;
 			args.v2.ucTemporal = 0;
@@ -497,7 +494,7 @@ atombios_digital_setup(struct drm_encoder *encoder,
 			} else {
 				if (dig_connector->linkb)
 					args.v2.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
-				if (mode->clock > 165000)
+				if (radeon_encoder->pixel_clock > 165000)
 					args.v2.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 			}
 			break;
@@ -582,16 +579,15 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
 }
 
 static void
-atombios_dig_encoder_setup(struct drm_encoder *encoder,
-			   struct drm_display_mode *mode)
+atombios_dig_encoder_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 	DIG_ENCODER_CONTROL_PS_ALLOCATION args;
 	int index = 0, num = 0;
 	uint8_t frev, crev;
+	struct radeon_encoder_atom_dig *dig;
 	struct drm_connector *connector;
 	struct radeon_connector *radeon_connector;
 	struct radeon_connector_atom_dig *dig_connector;
@@ -607,24 +603,25 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder,
 
 	dig_connector = radeon_connector->con_priv;
 
+	if (!radeon_encoder->enc_priv)
+		return;
+
+	dig = radeon_encoder->enc_priv;
+
 	memset(&args, 0, sizeof(args));
 
 	if (radeon_is_dce32(dev_priv)) {
-		if (radeon_crtc->crtc_id)
+		if (dig->dig_block)
 			index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
 		else
 			index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
-		num = radeon_crtc->crtc_id + 1;
+		num = dig->dig_block + 1;
 	} else {
 		switch (radeon_encoder->encoder_id) {
-		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 			index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
 			num = 1;
 			break;
-		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 			index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
 			num = 2;
@@ -634,8 +631,8 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder,
 
 	atom_parse_cmd_header(dev_priv->mode_info.atom_context, index, &frev, &crev);
 
-	args.ucAction = ATOM_ENABLE;
-	args.usPixelClock = cpu_to_le16(mode->clock / 10);
+	args.ucAction = action;
+	args.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
 
 	if (radeon_is_dce32(dev_priv)) {
 		switch (radeon_encoder->encoder_id) {
@@ -651,20 +648,16 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder,
 		}
 	} else {
 		switch (radeon_encoder->encoder_id) {
-		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 			args.ucConfig = ATOM_ENCODER_CONFIG_TRANSMITTER1;
 			break;
-		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 			args.ucConfig = ATOM_ENCODER_CONFIG_TRANSMITTER2;
 			break;
 		}
 	}
 
-	if (mode->clock > 165000) {
+	if (radeon_encoder->pixel_clock > 165000) {
 		args.ucConfig |= ATOM_ENCODER_CONFIG_LINKA_B;
 		args.ucLaneNum = 8;
 	} else {
@@ -687,13 +680,11 @@ union dig_transmitter_control {
 };
 
 static void
-atombios_dig_transmitter_setup(struct drm_encoder *encoder,
-			       struct drm_display_mode *mode)
+atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 	union dig_transmitter_control args;
 	int index = 0, num = 0;
 	uint8_t frev, crev;
@@ -724,13 +715,9 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder,
 		index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl);
 	else {
 		switch (radeon_encoder->encoder_id) {
-		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 			index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl);
 			break;
-		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 			index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl);
 			break;
@@ -739,16 +726,16 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder,
 
 	atom_parse_cmd_header(dev_priv->mode_info.atom_context, index, &frev, &crev);
 
-	args.v1.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
+	args.v1.ucAction = action;
 
 	if (radeon_is_dce32(dev_priv)) {
-		if (mode->clock > 165000) {
-			args.v2.usPixelClock = cpu_to_le16((mode->clock * 10 * 2) / 100);
+		if (radeon_encoder->pixel_clock > 165000) {
+			args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock * 10 * 2) / 100);
 			args.v2.acConfig.fDualLinkConnector = 1;
 		} else {
-			args.v2.usPixelClock = cpu_to_le16((mode->clock * 10 * 4) / 100);
+			args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock * 10 * 4) / 100);
 		}
-		if (radeon_crtc->crtc_id)
+		if (dig->dig_block)
 			args.v2.acConfig.ucEncoderSel = 1;
 
 		switch (radeon_encoder->encoder_id) {
@@ -772,24 +759,20 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder,
 		}
 	} else {
 		args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
-		args.v1.usPixelClock = cpu_to_le16((mode->clock) / 10);
+		args.v1.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock) / 10);
 
 		switch (radeon_encoder->encoder_id) {
-		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 			args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
 			if (dev_priv->flags & RADEON_IS_IGP) {
-				if (mode->clock > 165000) {
+				if (radeon_encoder->pixel_clock > 165000) {
 					args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 							     ATOM_TRANSMITTER_CONFIG_LINKA_B);
-					/* fixme!!! lanes are based on connector, not encoder*/
 					if (dig_connector->igp_lane_info & 0x3)
 						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_7;
 					else if (dig_connector->igp_lane_info & 0xc)
 						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_15;
 				} else {
-					/* fixme!!! lanes are based on connector, not encoder*/
 					args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA;
 					if (dig_connector->igp_lane_info & 0x1)
 						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3;
@@ -801,7 +784,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder,
 						args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15;
 				}
 			} else {
-				if (mode->clock > 165000)
+				if (radeon_encoder->pixel_clock > 165000)
 					args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 							     ATOM_TRANSMITTER_CONFIG_LINKA_B |
 							     ATOM_TRANSMITTER_CONFIG_LANE_0_7);
@@ -813,11 +796,9 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder,
 				}
 			}
 			break;
-		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 			args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
-			if (mode->clock > 165000)
+			if (radeon_encoder->pixel_clock > 165000)
 				args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 						     ATOM_TRANSMITTER_CONFIG_LINKA_B |
 						     ATOM_TRANSMITTER_CONFIG_LANE_0_7);
@@ -835,7 +816,6 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder,
 				args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT;
 		}
 	}
-	dig->transmitter_config = args.v1.ucConfig;
 
 	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 
@@ -1073,19 +1053,37 @@ static void
 atombios_yuv_setup(struct drm_encoder *encoder, bool enable)
 {
 	struct drm_device *dev = encoder->dev;
+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 	struct drm_radeon_private *dev_priv = dev->dev_private;
 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 	ENABLE_YUV_PS_ALLOCATION args;
 	int index = GetIndexIntoMasterTable(COMMAND, EnableYUV);
+	uint32_t temp, reg;
 
 	memset(&args, 0, sizeof(args));
 
+	if (dev_priv->chip_family >= CHIP_R600)
+		reg = R600_BIOS_3_SCRATCH;
+	else
+		reg = RADEON_BIOS_3_SCRATCH;
+
+	temp = RADEON_READ(reg);
+	if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT))
+		RADEON_WRITE(reg, (ATOM_S3_TV1_ACTIVE |
+				(radeon_crtc->crtc_id << 18)));
+	else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT))
+		RADEON_WRITE(reg, (ATOM_S3_CV_ACTIVE |
+				(radeon_crtc->crtc_id << 18)));
+	else
+		RADEON_WRITE(reg, 0);
+
 	if (enable)
 		args.ucEnable = ATOM_ENABLE;
 	args.ucCRTC = radeon_crtc->crtc_id;
 
 	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 
+	RADEON_WRITE(reg, 0);
 }
 
 static void
@@ -1138,8 +1136,7 @@ atombios_overscan_setup(struct drm_encoder *encoder,
 }
 
 static void
-atombios_scaler_setup(struct drm_encoder *encoder,
-		      struct drm_display_mode *mode)
+atombios_scaler_setup(struct drm_encoder *encoder)
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_radeon_private *dev_priv = dev->dev_private;
@@ -1213,57 +1210,6 @@ atombios_scaler_setup(struct drm_encoder *encoder,
 }
 
 static void
-atombios_dig_dpms(struct drm_encoder *encoder, int mode)
-{
-	struct drm_device *dev = encoder->dev;
-	struct drm_radeon_private *dev_priv = dev->dev_private;
-	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-	DIG_TRANSMITTER_CONTROL_PS_ALLOCATION args;
-	int index = 0;
-	struct radeon_encoder_atom_dig *dig;
-
-	if (!radeon_encoder->enc_priv)
-		return;
-
-	dig = radeon_encoder->enc_priv;
-
-	memset(&args, 0, sizeof(args));
-
-	switch (mode) {
-	case DRM_MODE_DPMS_ON:
-		args.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT;
-		break;
-	case DRM_MODE_DPMS_STANDBY:
-	case DRM_MODE_DPMS_SUSPEND:
-	case DRM_MODE_DPMS_OFF:
-		args.ucAction = ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT;
-		break;
-	}
-
-	args.ucConfig = dig->transmitter_config;
-
-	if (radeon_is_dce32(dev_priv))
-		index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl);
-	else {
-		switch (radeon_encoder->encoder_id) {
-		case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
-		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-			index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl);
-			break;
-		case ENCODER_OBJECT_ID_INTERNAL_LVDS:
-		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
-		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-			index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl);
-			break;
-		}
-	}
-
-	atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
-
-}
-
-static void
 radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
 {
 	struct drm_device *dev = encoder->dev;
@@ -1320,9 +1266,18 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
 		break;
 	}
 
-	if (is_dig)
-		atombios_dig_dpms(encoder, mode);
-	else {
+	if (is_dig) {
+		switch (mode) {
+		case DRM_MODE_DPMS_ON:
+			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE);
+			break;
+		case DRM_MODE_DPMS_STANDBY:
+		case DRM_MODE_DPMS_SUSPEND:
+		case DRM_MODE_DPMS_OFF:
+			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE);
+			break;
+		}
+	} else {
 		switch (mode) {
 		case DRM_MODE_DPMS_ON:
 			args.ucAction = ATOM_ENABLE;
@@ -1365,8 +1320,12 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
 		default:
 			if (radeon_is_avivo(dev_priv))
 				args.v1.ucCRTC = radeon_crtc->crtc_id;
-			else
-				args.v1.ucCRTC = radeon_crtc->crtc_id << 2;
+			else {
+				if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
+					args.v1.ucCRTC = radeon_crtc->crtc_id;
+				else
+					args.v1.ucCRTC = radeon_crtc->crtc_id << 2;
+			}
 			switch (radeon_encoder->encoder_id) {
 			case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
 			case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
@@ -1492,9 +1451,17 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
 
+	if (radeon_encoder->enc_priv) {
+		struct radeon_encoder_atom_dig *dig;
+
+		dig = radeon_encoder->enc_priv;
+		dig->dig_block = radeon_crtc->crtc_id;
+	}
+	radeon_encoder->pixel_clock = adjusted_mode->clock;
+
 	radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id);
 	atombios_overscan_setup(encoder, mode, adjusted_mode);
-	atombios_scaler_setup(encoder, adjusted_mode);
+	atombios_scaler_setup(encoder);
 	atombios_set_encoder_crtc_source(encoder);
 
 	if (radeon_is_avivo(dev_priv)) {
@@ -1509,29 +1476,31 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 	case ENCODER_OBJECT_ID_INTERNAL_LVDS:
 	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
-		atombios_digital_setup(encoder, adjusted_mode);
+		atombios_digital_setup(encoder, PANEL_ENCODER_ACTION_ENABLE);
 		break;
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-		atombios_dig_encoder_setup(encoder, adjusted_mode);
-		atombios_dig_transmitter_setup(encoder, adjusted_mode);
+		atombios_dig_encoder_setup(encoder, ATOM_ENABLE);
+		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_INIT);
+		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP);
+		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE);
 		break;
 	case ENCODER_OBJECT_ID_INTERNAL_DDI:
-		atombios_ddia_setup(encoder, adjusted_mode);
+		atombios_ddia_setup(encoder, ATOM_ENABLE);
 		break;
 	case ENCODER_OBJECT_ID_INTERNAL_DVO1:
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
-		atombios_external_tmds_setup(encoder, adjusted_mode);
+		atombios_external_tmds_setup(encoder, ATOM_ENABLE);
 		break;
 	case ENCODER_OBJECT_ID_INTERNAL_DAC1:
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
 	case ENCODER_OBJECT_ID_INTERNAL_DAC2:
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-		atombios_dac_setup(encoder, adjusted_mode);
+		atombios_dac_setup(encoder, ATOM_ENABLE);
 		if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
-			atombios_tv_setup(encoder, adjusted_mode);
+			atombios_tv_setup(encoder, ATOM_ENABLE);
 		break;
 	}
 	atombios_apply_encoder_quirks(encoder, adjusted_mode);
@@ -1557,7 +1526,8 @@ atombios_dac_load_detect(struct drm_encoder *encoder)
 
 		args.sDacload.ucMisc = 0;
 
-		if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
+		if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1 ||
+		    radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1)
 			args.sDacload.ucDacType = ATOM_DAC_A;
 		else
 			args.sDacload.ucDacType = ATOM_DAC_B;
@@ -1570,8 +1540,11 @@ atombios_dac_load_detect(struct drm_encoder *encoder)
 			args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CV_SUPPORT);
 			if (crev >= 3)
 				args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
-		} else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT)
+		} else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) {
 			args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_TV1_SUPPORT);
+			if (crev >= 3)
+				args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
+		}
 
 		atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args);
 
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 244b066..148ee30 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -913,6 +913,7 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 		drm_bo_kunmap(&radeon_fb->kmap_obj);
 		dev_priv->mm.vram_visible += radeon_fb->obj->size;
 		mutex_lock(&dev->struct_mutex);
+		radeon_gem_object_unpin(radeon_fb->obj);
 		drm_gem_object_unreference(radeon_fb->obj);
 		radeon_fb->obj = NULL;
 		mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 2fd1c5d..15103cb 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -677,11 +677,15 @@ int radeon_alloc_gart_objects(struct drm_device *dev)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	int ret;
+	int cached = 0;
+
+	if (!(dev_priv->flags & RADEON_IS_AGP))
+		cached = DRM_BO_FLAG_CACHED;
 
 	ret = drm_buffer_object_create(dev, RADEON_DEFAULT_RING_SIZE,
 				       drm_bo_type_kernel,
 				       DRM_BO_FLAG_READ | DRM_BO_FLAG_MEM_TT |
-				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT,
+				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT | cached,
 				       0, 1, 0, &dev_priv->mm.ring.bo);
 	if (ret) {
 		if (dev_priv->flags & RADEON_IS_AGP)
@@ -701,7 +705,7 @@ int radeon_alloc_gart_objects(struct drm_device *dev)
 	ret = drm_buffer_object_create(dev, PAGE_SIZE,
 				       drm_bo_type_kernel,
 				       DRM_BO_FLAG_WRITE |DRM_BO_FLAG_READ | DRM_BO_FLAG_MEM_TT |
-				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT,
+				       DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_NO_EVICT | cached,
 				       0, 1, 0, &dev_priv->mm.ring_read.bo);
 	if (ret) {
 		DRM_ERROR("failed to allocate ring read\n");
@@ -1220,6 +1224,10 @@ int radeon_gem_object_pin(struct drm_gem_object *obj,
 
 	obj_priv = obj->driver_private;
 
+	obj_priv->pin_count++;
+	if (obj_priv->pin_count != 1)
+		return 0;
+
 	if (pin_domain) {
 		mask |= DRM_BO_MASK_MEM;
 		if (pin_domain == RADEON_GEM_DOMAIN_GTT)
@@ -1242,6 +1250,10 @@ int radeon_gem_object_unpin(struct drm_gem_object *obj)
 
 	obj_priv = obj->driver_private;
 
+	obj_priv->pin_count--;
+	if (obj_priv->pin_count != 0)
+		return 0;
+
 	ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
 				 DRM_BO_HINT_DONT_FENCE, 0);
 
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index a991fb0..175397c 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -823,7 +823,8 @@ static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder,
 		radeon_legacy_rmx_mode_set(encoder, mode, adjusted_mode);
 
 	if (dev_priv->is_atom_bios) {
-		atombios_external_tmds_setup(encoder, adjusted_mode);
+ 		radeon_encoder->pixel_clock = adjusted_mode->clock;
+ 		atombios_external_tmds_setup(encoder, ATOM_ENABLE);
 		fp2_gen_cntl = RADEON_READ(RADEON_FP2_GEN_CNTL);
 	} else {
 		fp2_gen_cntl = RADEON_READ(RADEON_FP2_GEN_CNTL);
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 43c28f8..963859c 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -234,8 +234,8 @@ struct radeon_encoder_int_tmds {
 
 struct radeon_encoder_atom_dig {
 	/* atom dig */
-	uint32_t transmitter_config;
 	bool coherent_mode;
+	int dig_block;
 	/* atom lvds */
 	uint32_t lvds_misc;
 	uint16_t panel_pwr_delay;
@@ -248,6 +248,7 @@ struct radeon_encoder {
 	uint32_t encoder_id;
 	uint32_t devices;
 	uint32_t flags;
+	uint32_t pixel_clock;
 	enum radeon_rmx_type rmx_type;
 	struct radeon_native_mode native_mode;
 	void *enc_priv;
@@ -296,8 +297,7 @@ struct drm_encoder *radeon_encoder_legacy_primary_dac_add(struct drm_device *dev
 struct drm_encoder *radeon_encoder_legacy_tv_dac_add(struct drm_device *dev, int bios_index, int with_tv);
 struct drm_encoder *radeon_encoder_legacy_tmds_int_add(struct drm_device *dev, int bios_index);
 struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, int bios_index);
-extern void atombios_external_tmds_setup(struct drm_encoder *encoder,
-					 struct drm_display_mode *mode);
+extern void atombios_external_tmds_setup(struct drm_encoder *encoder, int action);
 extern int atombios_get_encoder_mode(struct drm_encoder *encoder);
 
 extern void radeon_crtc_load_lut(struct drm_crtc *crtc);
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index ac7bc0a..0d2f4a5 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -111,8 +111,6 @@ int radeon_resume(struct drm_device *dev)
 	if (pci_enable_device(dev->pdev))
 		return -1;
 
-	/* Turn on bus mastering -todo fix properly */
-	radeon_enable_bm(dev_priv);
 
 	DRM_ERROR("\n");
 	/* on atom cards re init the whole card 
@@ -125,7 +123,6 @@ int radeon_resume(struct drm_device *dev)
 		radeon_combios_asic_init(dev);
 	}
 
-	pci_set_master(dev->pdev);
 
 	for (i = 0; i < 8; i++)
 		RADEON_WRITE(RADEON_BIOS_0_SCRATCH + (i * 4), dev_priv->pmregs.bios_scratch[i]);
@@ -150,6 +147,10 @@ int radeon_resume(struct drm_device *dev)
 	
 	radeon_init_memory_map(dev);
 
+	pci_set_master(dev->pdev);
+	/* Turn on bus mastering -todo fix properly */
+	radeon_enable_bm(dev_priv);
+
 	if (dev_priv->flags & RADEON_IS_PCIE) {
 		memcpy_toio(dev_priv->mm.pcie_table.kmap.virtual, dev_priv->mm.pcie_table_backup, dev_priv->gart_info.table_size);
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1323
retrieving revision 1.1324
diff -u -r1.1323 -r1.1324
--- kernel.spec	13 Apr 2009 21:38:18 -0000	1.1323
+++ kernel.spec	14 Apr 2009 02:42:54 -0000	1.1324
@@ -657,6 +657,7 @@
 # nouveau + drm fixes
 Patch1811: drm-next.patch
 Patch1812: drm-modesetting-radeon.patch
+Patch1813: drm-modesetting-radeon-fixes.patch
 Patch1814: drm-nouveau.patch
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1817: drm-f10-compat.patch
@@ -1265,6 +1266,7 @@
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-modesetting-radeon-fixes.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-f10-compat.patch
@@ -1870,6 +1872,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-23
+- radeon: add some more kms fixes backported from F11
+
 * Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-22
 - Fix oops in md raid1 resync (F11#495550)
 



From mclasen at fedoraproject.org  Tue Apr 14 02:50:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 02:50:28 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.52,
	1.53 gnome-screensaver.spec, 1.209, 1.210 sources, 1.57, 1.58
Message-ID: <20090414025029.0485F70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30007

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	19 Mar 2009 04:21:35 -0000	1.52
+++ .cvsignore	14 Apr 2009 02:50:23 -0000	1.53
@@ -1 +1 @@
-gnome-screensaver-2.26.0.tar.bz2
+gnome-screensaver-2.26.1.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- gnome-screensaver.spec	7 Apr 2009 18:22:15 -0000	1.209
+++ gnome-screensaver.spec	14 Apr 2009 02:50:24 -0000	1.210
@@ -13,8 +13,8 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.26/%{name}-%{version}.tar.bz2
@@ -24,8 +24,6 @@
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
-# upstream fix
-Patch9: gnome-screensaver-idle-delay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -79,7 +77,6 @@
 %patch2 -p1 -b .securitytoken
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
-%patch9 -p1 -b .idle-delay
 
 libtoolize --force --copy
 
@@ -149,6 +146,10 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-screensaver/2.26/gnome-screensaver-2.26.1.news
+
 * Tue Apr  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Make the idle time slider work again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	19 Mar 2009 04:21:36 -0000	1.57
+++ sources	14 Apr 2009 02:50:24 -0000	1.58
@@ -1 +1 @@
-f9c5144defc80991b18c653c029001d6  gnome-screensaver-2.26.0.tar.bz2
+13b9066bb2dfe9face50b3d852b67ded  gnome-screensaver-2.26.1.tar.bz2



From toshio at fedoraproject.org  Tue Apr 14 02:52:59 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 14 Apr 2009 02:52:59 +0000 (UTC)
Subject: rpms/python-myghty/devel myghty-importer.patch, NONE,
	1.1 python-myghty.spec, 1.15, 1.16
Message-ID: <20090414025259.CA89570127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-myghty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31327

Modified Files:
	python-myghty.spec 
Added Files:
	myghty-importer.patch 
Log Message:

* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-9
- Fix for building with python2.6


myghty-importer.patch:

--- NEW FILE myghty-importer.patch ---
diff -up Myghty-1.1/lib/myghty/importer.py.bak Myghty-1.1/lib/myghty/importer.py
--- Myghty-1.1/lib/myghty/importer.py.bak	2009-04-13 19:19:56.000000000 -0700
+++ Myghty-1.1/lib/myghty/importer.py	2009-04-13 19:23:42.000000000 -0700
@@ -47,11 +47,13 @@ modules = weakref.WeakValueDictionary()
 
 # override __import__ to look in our own local module dict first
 builtin_importer = __builtin__.__import__
-def import_module(name, globals = None, locals = None, fromlist = None):
+def import_module(name, globals = None, locals = None, fromlist = None,
+        level=-1):
+    # For now, level is ignored
     try:
         return modules[name].module
     except KeyError:
-        return builtin_importer(name, globals, locals, fromlist)
+        return builtin_importer(name, globals, locals, fromlist, level)
 
 __builtin__.__import__ = import_module
 


Index: python-myghty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-myghty.spec	26 Feb 2009 22:29:29 -0000	1.15
+++ python-myghty.spec	14 Apr 2009 02:52:29 -0000	1.16
@@ -2,13 +2,14 @@
 
 Name:           python-myghty
 Version:        1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.myghty.org
 Source0:        http://download.sourceforge.net/sourceforge/myghty/Myghty-%{version}.tar.gz
+Patch0: myghty-importer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +32,7 @@
 
 %prep
 %setup -q -n Myghty-%{version}
-
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-9
+- Fix for building with python2.6
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Apr 14 02:59:41 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 14 Apr 2009 02:59:41 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier/F-10 perl-CSS-Minifier.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090414025942.053C2700B2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1217

Modified Files:
	sources 
Added Files:
	perl-CSS-Minifier.spec 
Log Message:
* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission



--- NEW FILE perl-CSS-Minifier.spec ---
Name:       perl-CSS-Minifier 
Version:    0.01 
Release:    1%{?dist}
# lib/CSS/Minifier.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Remove unnecessary whitespace from CSS files 
Source:     http://search.cpan.org/CPAN/authors/id/P/PM/PMICHAUX/CSS-Minifier-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/CSS-Minifier
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
# tests
BuildRequires: perl(Test::More)

%description
This module removes unnecessary whitespace from CSS. The primary
requirement developing this module is to not break working stylesheets:
if working CSS is in input then working CSS is output. The Mac/Internet
Explorer comment hack will be minimized but not stripped and so will
continue to function.This module understands space, horizontal tab, new
line, carriage return, and form feed characters to be whitespace. Any
other characters that may be considered whitespace are not minimized.
These other characters include paragraph separator and vertical tab.For
static CSS files, it is recommended that you minify during the build
stage of web deployment. If you minify on-the-fly then it might be a
good idea to cache the minified file. Minifying static files on-the-fly
repeatedly is wasteful.

%prep
%setup -q -n CSS-Minifier-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission

* Sat Apr 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:49:36 -0000	1.1
+++ sources	14 Apr 2009 02:59:11 -0000	1.2
@@ -0,0 +1 @@
+04f64c08c9268fd0fc619ef8110d2cf4  CSS-Minifier-0.01.tar.gz



From robert at fedoraproject.org  Tue Apr 14 03:00:00 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 03:00:00 +0000 (UTC)
Subject: rpms/srm/devel srm-1.2.9-sort_headers.patch, NONE, 1.1 srm.spec, 1.2,
	1.3
Message-ID: <20090414030000.13997700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/srm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1265

Modified Files:
	srm.spec 
Added Files:
	srm-1.2.9-sort_headers.patch 
Log Message:
Changed include order of ext3_fs.h and fs.h for gcc 4.4 builds


srm-1.2.9-sort_headers.patch:

--- NEW FILE srm-1.2.9-sort_headers.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for srm >= 1.2.9, which re-orders
the included header files to successfully build with GCC 4.4 and above. Definement
of FS_TOPDIR_FL etc. is required by <linux/ext2_fs.h>, but defined in <linux/fs.h>.

--- srm-1.2.9/src/sunlink.c			2008-07-10 23:50:08.000000000 +0200
+++ srm-1.2.9/src/sunlink.c.sort_headers	2009-04-14 04:52:01.000000000 +0200
@@ -26,8 +26,8 @@
 #endif
 
 #if HAVE_LINUX_EXT3_FS_H
-#include <linux/ext3_fs.h>
 #include <linux/fs.h>
+#include <linux/ext3_fs.h>
 
 #define EXT2_IOC_GETFLAGS EXT3_IOC_GETFLAGS
 #define EXT2_UNRM_FL EXT3_UNRM_FL
@@ -36,8 +36,8 @@
 #define EXT2_IOC_SETFLAGS EXT3_IOC_SETFLAGS
 
 #elif HAVE_LINUX_EXT2_FS_H
-#include <linux/ext2_fs.h>
 #include <linux/fs.h>
+#include <linux/ext2_fs.h>
 #endif
 
 #include "srm.h"


Index: srm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/srm/devel/srm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- srm.spec	26 Feb 2009 02:46:30 -0000	1.2
+++ srm.spec	14 Apr 2009 02:59:29 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           srm
 Version:        1.2.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Secure file deletion
 
 Group:          Applications/System
 License:        MIT
 URL:            http://srm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         srm-1.2.9-sort_headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,6 +22,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .sort_headers
+
 # Convert to utf-8
 for file in COPYING; do
     mv $file timestamp
@@ -50,6 +53,9 @@
 
 
 %changelog
+* Tue Apr 24 2009 Robert Scheck <robert at fedoraproject.org> - 1.2.9-4
+- Changed include order of ext3_fs.h and fs.h for gcc 4.4 builds
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mbarnes at fedoraproject.org  Tue Apr 14 03:01:32 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 03:01:32 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.110, 1.111 evolution.spec, 1.379,
	1.380 sources, 1.110, 1.111
Message-ID: <20090414030132.B0DBC700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1770

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
- Update to 2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- .cvsignore	16 Mar 2009 11:47:20 -0000	1.110
+++ .cvsignore	14 Apr 2009 03:01:30 -0000	1.111
@@ -1 +1 @@
-evolution-2.26.0.tar.bz2
+evolution-2.26.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- evolution.spec	11 Apr 2009 02:36:46 -0000	1.379
+++ evolution.spec	14 Apr 2009 03:01:30 -0000	1.380
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.26.0
-Release: 3%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -691,6 +691,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
+- Update to 2.26.1
+
 * Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3.fc11
 - Fix directory ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sources	16 Mar 2009 11:47:21 -0000	1.110
+++ sources	14 Apr 2009 03:01:30 -0000	1.111
@@ -1 +1 @@
-97234b1ecded0232a1b68d2fc03b0252  evolution-2.26.0.tar.bz2
+7089171fe7e127f061f6722b33bf3107  evolution-2.26.1.tar.bz2



From lennart at fedoraproject.org  Tue Apr 14 03:21:40 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 14 Apr 2009 03:21:40 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.10, 1.11 libatasmart.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <20090414032141.003F8700B2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7185

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Apr 2009 21:52:20 -0000	1.10
+++ .cvsignore	14 Apr 2009 03:21:37 -0000	1.11
@@ -1 +1 @@
-libatasmart-0.9.tar.gz
+libatasmart-0.10.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libatasmart.spec	12 Apr 2009 21:52:20 -0000	1.12
+++ libatasmart.spec	14 Apr 2009 03:21:37 -0000	1.13
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.9
+Version: 0.10
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -55,6 +55,9 @@
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
 
 %changelog
+* Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.10-1
+- New upstream release
+
 * Sun Apr 12 2009 Lennart Poettering <lpoetter at redhat.com> 0.9-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Apr 2009 21:52:20 -0000	1.10
+++ sources	14 Apr 2009 03:21:37 -0000	1.11
@@ -1 +1 @@
-05b81d0a3eeee3104fd412879834ed77  libatasmart-0.9.tar.gz
+9742e6b9cf29ae78c061062605dceeaf  libatasmart-0.10.tar.gz



From whot at fedoraproject.org  Tue Apr 14 03:33:48 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 14 Apr 2009 03:33:48 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel
	synaptics-1.1.0-synclient-64.patch, 
	NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.26, 1.27
Message-ID: <20090414033348.74E2E700B2@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10508

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.1.0-synclient-64.patch 
Log Message:
* Tue Apr 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-2
- synaptics-1.1.0-synclient-64.patch: fix 64-bit integer issues with
  synclient (#494766) 



synaptics-1.1.0-synclient-64.patch:

--- NEW FILE synaptics-1.1.0-synclient-64.patch ---
>From 77d732035ae56cd19125f3a25127391dde42a1d6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 14 Apr 2009 07:27:07 -0400
Subject: [PATCH] synclient: fix 32-bit integer handling on 64 bit machines.

libX11 actually expects longs for 32-bit values, even if they are 64 bits.

Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
---
 tools/synclient.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/synclient.c b/tools/synclient.c
index 82ce61b..39b3bf6 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -532,7 +532,7 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c
     unsigned long nitems, bytes_after;
 
     float *f;
-    int *n;
+    long *n;
     char *b;
 
     float_type = XInternAtom(dpy, XATOM_FLOAT, True);
@@ -573,7 +573,7 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c
 			    par->name, format);
 		    break;
 		}
-		n = (int*)data;
+		n = (long*)data;
 		n[par->prop_offset] = rint(val);
 		break;
 	    case 0: /* float */
@@ -607,7 +607,7 @@ dp_show_settings(Display *dpy, XDevice *dev)
     int len;
 
     float *f;
-    int *i;
+    long *i;
     char *b;
 
     float_type = XInternAtom(dpy, XATOM_FLOAT, True);
@@ -648,8 +648,8 @@ dp_show_settings(Display *dpy, XDevice *dev)
 		    break;
 		}
 
-		i = (int*)data;
-		printf("    %-23s = %d\n", par->name, i[par->prop_offset]);
+		i = (long*)data;
+		printf("    %-23s = %ld\n", par->name, i[par->prop_offset]);
 		break;
 	    case 0: /* Float */
 		if (!float_type)
-- 
1.6.2.2.447.g4afa7



Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-synaptics.spec	9 Mar 2009 02:13:14 -0000	1.26
+++ xorg-x11-drv-synaptics.spec	14 Apr 2009 03:33:17 -0000	1.27
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch1:         synaptics-1.1.0-synclient-64.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -74,6 +76,8 @@
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
 
+%patch1 -p1
+
 %build
 autoreconf -v --install --force || exit 1
 %configure --disable-static
@@ -121,6 +125,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-2
+- synaptics-1.1.0-synclient-64.patch: fix 64-bit integer issues with
+  synclient (#494766) 
+
 * Mon Mar 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-1
 - synaptics 1.1
 



From iarnell at fedoraproject.org  Tue Apr 14 03:39:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 14 Apr 2009 03:39:49 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf/F-10 perl-Devel-FastProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414033949.139CA700B2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-FastProf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-FastProf.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-FastProf.spec ---
Name:           perl-Devel-FastProf
Version:        0.08
Release:        1%{?dist}
Summary:        Fast perl per-line profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-FastProf/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Devel-FastProf-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Sort::Key)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Devel::FastProf is a perl per-line profiler. What that means is that it can
tell you how much time is spent on every line of a perl script (the
standard Devel::DProf is a per-subroutine profiler).

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Devel-FastProf-%{version}

# filter unwanted perl provides
cat << \EOF > %{name}-prov
#!/bin/sh
%{__find_provides} $* |\
sed -e '/perl(DB)/d'
EOF

%global __find_provides %{_builddir}/Devel-FastProf-%{version}/%{name}-prov
chmod +x %{__find_provides}



%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Devel*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Tue Mar 17 2009 Iain Arnell 0.08-1
- Specfile autogenerated by cpanspec 1.77.
- add fprofpp and man page to files
- strip private perl libs from provides


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FastProf/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:50:56 -0000	1.1
+++ .cvsignore	14 Apr 2009 03:39:16 -0000	1.2
@@ -0,0 +1 @@
+Devel-FastProf-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FastProf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:50:56 -0000	1.1
+++ sources	14 Apr 2009 03:39:18 -0000	1.2
@@ -0,0 +1 @@
+f8185d084e0323b96ad69fc24775aa94  Devel-FastProf-0.08.tar.gz



From iarnell at fedoraproject.org  Tue Apr 14 03:39:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 14 Apr 2009 03:39:49 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf/devel perl-Devel-FastProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414033949.7A9AE700B2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-FastProf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-FastProf.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-FastProf.spec ---
Name:           perl-Devel-FastProf
Version:        0.08
Release:        1%{?dist}
Summary:        Fast perl per-line profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-FastProf/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Devel-FastProf-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Sort::Key)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Devel::FastProf is a perl per-line profiler. What that means is that it can
tell you how much time is spent on every line of a perl script (the
standard Devel::DProf is a per-subroutine profiler).

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%prep
%setup -q -n Devel-FastProf-%{version}

# filter unwanted perl provides
cat << \EOF > %{name}-prov
#!/bin/sh
%{__find_provides} $* |\
sed -e '/perl(DB)/d'
EOF

%global __find_provides %{_builddir}/Devel-FastProf-%{version}/%{name}-prov
chmod +x %{__find_provides}



%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Devel*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Tue Mar 17 2009 Iain Arnell 0.08-1
- Specfile autogenerated by cpanspec 1.77.
- add fprofpp and man page to files
- strip private perl libs from provides


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FastProf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:50:56 -0000	1.1
+++ .cvsignore	14 Apr 2009 03:39:19 -0000	1.2
@@ -0,0 +1 @@
+Devel-FastProf-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FastProf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:50:56 -0000	1.1
+++ sources	14 Apr 2009 03:39:19 -0000	1.2
@@ -0,0 +1 @@
+f8185d084e0323b96ad69fc24775aa94  Devel-FastProf-0.08.tar.gz



From dcantrel at fedoraproject.org  Tue Apr 14 03:48:06 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 14 Apr 2009 03:48:06 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.634, 1.635 anaconda.spec, 1.782, 
	1.783 sources, 1.768, 1.769
Message-ID: <20090414034806.8A3DF700B2@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14139

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.44-1
- Default to SHA512 password encoding algorithm. (dcantrell)
- Handle format combo box not existing (#495288) (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- .cvsignore	13 Apr 2009 18:39:48 -0000	1.634
+++ .cvsignore	14 Apr 2009 03:47:35 -0000	1.635
@@ -1,4 +1,2 @@
 clog
-anaconda-11.5.0.41.tar.bz2
-anaconda-11.5.0.42.tar.bz2
-anaconda-11.5.0.43.tar.bz2
+anaconda-11.5.0.44.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -r1.782 -r1.783
--- anaconda.spec	13 Apr 2009 18:39:48 -0000	1.782
+++ anaconda.spec	14 Apr 2009 03:47:35 -0000	1.783
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.43
+Version: 11.5.0.44
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,10 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.44-1
+- Default to SHA512 password encoding algorithm. (dcantrell)
+- Handle format combo box not existing (#495288) (dcantrell)
+
 * Mon Apr 13 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.43-1
 - Run programs with LC_ALL=C in case we're parsing output (#492549).
   (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.768
retrieving revision 1.769
diff -u -r1.768 -r1.769
--- sources	13 Apr 2009 18:39:49 -0000	1.768
+++ sources	14 Apr 2009 03:47:36 -0000	1.769
@@ -1 +1 @@
-0f786092df3c424a2e2ffa06863b62ec  anaconda-11.5.0.43.tar.bz2
+88831b5b5ee1754793e2fc199a4aa4bf  anaconda-11.5.0.44.tar.bz2



From robert at fedoraproject.org  Tue Apr 14 04:15:55 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 04:15:55 +0000 (UTC)
Subject: rpms/esc/devel esc-1.0.1-elif.patch,NONE,1.1 esc.spec,1.39,1.40
Message-ID: <20090414041556.117F3700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/esc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21063

Modified Files:
	esc.spec 
Added Files:
	esc-1.0.1-elif.patch 
Log Message:
Added a patch to correct the wrong elif preprocessor statement


esc-1.0.1-elif.patch:

--- NEW FILE esc-1.0.1-elif.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for esc >= 1.0.1, that corrects
the preprocessor conditional from empty (wrong) elif to else.

--- mozilla/toolkit/xre/nsAppRunner.cpp		2006-04-06 19:27:00.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.cpp.elif	2009-04-14 05:35:25.000000000 +0200
@@ -1157,7 +1157,7 @@
   if (NS_FAILED(rv))
     return rv;
 
-#elif
+#else
 #error Oops, you need platform-specific code here
 #endif
 


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/esc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- esc.spec	24 Feb 2009 15:24:10 -0000	1.39
+++ esc.spec	14 Apr 2009 04:15:24 -0000	1.40
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 13%{?dist} 
+Release: 14%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -19,6 +19,7 @@
 Patch9:  esc-1.0.1-nss-devel-fix.patch
 Patch10: firefox.secalg.patch
 Patch11: esc-1.0.1-xulrunner-sparc-fixes.patch
+Patch12: esc-1.0.1-elif.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -92,6 +93,7 @@
 %patch2 -p1 -b .fix2
 %patch10 -p1 -b .secalg
 %patch11 -p1 -b .sparc
+%patch12 -p1 -b .elif
 
 %build
 
@@ -201,6 +203,9 @@
 fi
 
 %changelog
+* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> - 1.0.1-14
+- Added a patch to correct the wrong elif preprocessor statement
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Apr 14 04:46:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 04:46:41 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.96, 1.97 gnome-games.spec,
	1.203, 1.204 sources, 1.101, 1.102
Message-ID: <20090414044641.91125700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30866

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	17 Mar 2009 01:02:48 -0000	1.96
+++ .cvsignore	14 Apr 2009 04:46:08 -0000	1.97
@@ -1 +1 @@
-gnome-games-2.26.0.tar.bz2
+gnome-games-2.26.1.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- gnome-games.spec	2 Apr 2009 02:03:49 -0000	1.203
+++ gnome-games.spec	14 Apr 2009 04:46:08 -0000	1.204
@@ -43,8 +43,8 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -358,6 +358,10 @@
 %{_datadir}/omf/*
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-games/2.26/gnome-games-2.26.1.news
+
 * Wed Apr  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-2
 - Add a workaround for sudoku crashing on certain saved games (#492962)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	17 Mar 2009 01:02:48 -0000	1.101
+++ sources	14 Apr 2009 04:46:08 -0000	1.102
@@ -1 +1 @@
-77e03e0caa57daec39e7cf8e09c87598  gnome-games-2.26.0.tar.bz2
+bce5a4126f103cb8fb25aee76e5dd119  gnome-games-2.26.1.tar.bz2



From toshio at fedoraproject.org  Tue Apr 14 04:50:02 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 14 Apr 2009 04:50:02 +0000 (UTC)
Subject: rpms/perl-File-Pid - New directory
Message-ID: <20090414045002.97394700B2@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/perl-File-Pid
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsN32232/rpms/perl-File-Pid

Log Message:
Directory /cvs/pkgs/rpms/perl-File-Pid added to the repository




From toshio at fedoraproject.org  Tue Apr 14 04:50:02 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 14 Apr 2009 04:50:02 +0000 (UTC)
Subject: rpms/perl-File-Pid/devel - New directory
Message-ID: <20090414045002.B8C39700B2@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/perl-File-Pid/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsN32232/rpms/perl-File-Pid/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-File-Pid/devel added to the repository




From toshio at fedoraproject.org  Tue Apr 14 04:50:15 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 14 Apr 2009 04:50:15 +0000 (UTC)
Subject: rpms/perl-File-Pid Makefile,NONE,1.1
Message-ID: <20090414045015.7B730700B2@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/perl-File-Pid
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsN32232/rpms/perl-File-Pid

Added Files:
	Makefile 
Log Message:
Setup of module perl-File-Pid


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Pid
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From toshio at fedoraproject.org  Tue Apr 14 04:50:16 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 14 Apr 2009 04:50:16 +0000 (UTC)
Subject: rpms/perl-File-Pid/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090414045016.640D2700B2@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/perl-File-Pid/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsN32232/rpms/perl-File-Pid/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Pid


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-File-Pid
# $Id: Makefile,v 1.1 2009/04/14 04:50:15 toshio Exp $
NAME := perl-File-Pid
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From athimm at fedoraproject.org  Tue Apr 14 05:01:48 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 05:01:48 +0000 (UTC)
Subject: rpms/fakechroot/F-9 .cvsignore, 1.3, 1.4 fakechroot.spec, 1.6,
	1.7 sources, 1.3, 1.4 fakechroot-2.8-initsocketlen.patch, 1.1, NONE
Message-ID: <20090414050148.6A60370127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fakechroot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3969/F-9

Modified Files:
	.cvsignore fakechroot.spec sources 
Removed Files:
	fakechroot-2.8-initsocketlen.patch 
Log Message:
Update to 2.9.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Aug 2008 19:26:55 -0000	1.3
+++ .cvsignore	14 Apr 2009 05:01:17 -0000	1.4
@@ -1 +1 @@
-fakechroot_2.8.orig.tar.gz
+fakechroot_2.9.orig.tar.gz


Index: fakechroot.spec
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/F-9/fakechroot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fakechroot.spec	15 Jan 2009 13:38:25 -0000	1.6
+++ fakechroot.spec	14 Apr 2009 05:01:17 -0000	1.7
@@ -1,13 +1,13 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
-Version: 2.8
-Release: 16%{?dist}
+Version: 2.9
+Release: 19%{?dist}
 License: LGPLv2+
 Group: Development/Tools
 URL: http://fakechroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz
-Patch0: fakechroot-2.8-initsocketlen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires: fakechroot-libs = %{version}-%{release}
 
 %description
 fakechroot runs a command in an environment were is additionally
@@ -16,11 +16,15 @@
 with possibility to install another packages without need for root
 privileges.
 
+%package libs
+Summary: Gives a fake chroot environment (libraries)
+Group: Development/Tools
+
+%description libs
+This package contains the libraries required by %{name}.
+
 %prep
 %setup -q
-%patch0 -p1 -b .missinginit
-perl -pi -e's,int readlink,ssize_t readlink,' src/libfakechroot.c
-chmod -x scripts/ldd.fake scripts/restoremode.sh scripts/savemode.sh
 
 %build
 %configure \
@@ -40,7 +44,7 @@
 #FAIL: t.echoarg
 #==================================
 #1 of 1 tests failed
-#make check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -49,13 +53,26 @@
 %defattr(-,root,root,-)
 %doc LICENSE scripts/ldd.fake scripts/restoremode.sh scripts/savemode.sh
 %{_bindir}/fakechroot
+%{_mandir}/man1/fakechroot.1.gz
+
+%files libs
 %dir %{_libdir}/fakechroot
 %exclude %{_libdir}/fakechroot/libfakechroot.la
 %{_libdir}/fakechroot/libfakechroot.so
-%{_mandir}/man1/fakechroot.1.gz
 
 %changelog
-* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.8.16
+* Tue Apr 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.9-19
+- Update to 2.9.
+- Removed fakechroot-2.8-initsocketlen.patch (upstream now).
+- Removed int->ssize_t readlink type change (upstream testing for type
+  now).
+- Removed permission fix for scripts/ldd.fake scripts/restoremode.sh
+  scripts/savemode.sh (fixed upstream).
+
+* Wed Mar 18 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8-18
+- Create a fakeroot-libs subpackage so that the package is multilib aware.
+
+* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> 2.8-16
 - Fixed URL
 
 * Sun Oct  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.8-15


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Aug 2008 19:26:55 -0000	1.3
+++ sources	14 Apr 2009 05:01:17 -0000	1.4
@@ -1 +1 @@
-aa71113e7526b4c2bb16e09915047323  fakechroot_2.8.orig.tar.gz
+7b0048e50a6309acf0dda4e547735022  fakechroot_2.9.orig.tar.gz


--- fakechroot-2.8-initsocketlen.patch DELETED ---



From athimm at fedoraproject.org  Tue Apr 14 05:01:47 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 05:01:47 +0000 (UTC)
Subject: rpms/fakechroot/F-10 .cvsignore, 1.3, 1.4 fakechroot.spec, 1.7,
	1.8 sources, 1.3, 1.4 fakechroot-2.8-initsocketlen.patch, 1.1, NONE
Message-ID: <20090414050147.C45E370127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fakechroot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3969/F-10

Modified Files:
	.cvsignore fakechroot.spec sources 
Removed Files:
	fakechroot-2.8-initsocketlen.patch 
Log Message:
Update to 2.9.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Aug 2008 19:20:29 -0000	1.3
+++ .cvsignore	14 Apr 2009 05:01:16 -0000	1.4
@@ -1 +1 @@
-fakechroot_2.8.orig.tar.gz
+fakechroot_2.9.orig.tar.gz


Index: fakechroot.spec
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/F-10/fakechroot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fakechroot.spec	15 Jan 2009 13:28:31 -0000	1.7
+++ fakechroot.spec	14 Apr 2009 05:01:17 -0000	1.8
@@ -1,13 +1,13 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
-Version: 2.8
-Release: 16%{?dist}
+Version: 2.9
+Release: 19%{?dist}
 License: LGPLv2+
 Group: Development/Tools
 URL: http://fakechroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz
-Patch0: fakechroot-2.8-initsocketlen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires: fakechroot-libs = %{version}-%{release}
 
 %description
 fakechroot runs a command in an environment were is additionally
@@ -16,11 +16,15 @@
 with possibility to install another packages without need for root
 privileges.
 
+%package libs
+Summary: Gives a fake chroot environment (libraries)
+Group: Development/Tools
+
+%description libs
+This package contains the libraries required by %{name}.
+
 %prep
 %setup -q
-%patch0 -p1 -b .missinginit
-perl -pi -e's,int readlink,ssize_t readlink,' src/libfakechroot.c
-chmod -x scripts/ldd.fake scripts/restoremode.sh scripts/savemode.sh
 
 %build
 %configure \
@@ -40,7 +44,7 @@
 #FAIL: t.echoarg
 #==================================
 #1 of 1 tests failed
-#make check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -49,14 +53,27 @@
 %defattr(-,root,root,-)
 %doc LICENSE scripts/ldd.fake scripts/restoremode.sh scripts/savemode.sh
 %{_bindir}/fakechroot
+%{_mandir}/man1/fakechroot.1.gz
+
+%files libs
 %dir %{_libdir}/fakechroot
 %exclude %{_libdir}/fakechroot/libfakechroot.la
 %{_libdir}/fakechroot/libfakechroot.so
-%{_mandir}/man1/fakechroot.1.gz
 
 %changelog
-* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.8-16
-- Fixed URL.
+* Tue Apr 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.9-19
+- Update to 2.9.
+- Removed fakechroot-2.8-initsocketlen.patch (upstream now).
+- Removed int->ssize_t readlink type change (upstream testing for type
+  now).
+- Removed permission fix for scripts/ldd.fake scripts/restoremode.sh
+  scripts/savemode.sh (fixed upstream).
+
+* Wed Mar 18 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8-18
+- Create a fakeroot-libs subpackage so that the package is multilib aware.
+
+* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> 2.8-16
+- Fixed URL
 
 * Sun Oct  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.8-15
 - Fix getpeername/getsockname socklen initialization.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Aug 2008 19:20:29 -0000	1.3
+++ sources	14 Apr 2009 05:01:17 -0000	1.4
@@ -1 +1 @@
-aa71113e7526b4c2bb16e09915047323  fakechroot_2.8.orig.tar.gz
+7b0048e50a6309acf0dda4e547735022  fakechroot_2.9.orig.tar.gz


--- fakechroot-2.8-initsocketlen.patch DELETED ---



From athimm at fedoraproject.org  Tue Apr 14 05:01:49 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 05:01:49 +0000 (UTC)
Subject: rpms/fakechroot/devel .cvsignore, 1.3, 1.4 fakechroot.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <20090414050149.5808C70127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fakechroot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3969/devel

Modified Files:
	.cvsignore fakechroot.spec sources 
Log Message:
Update to 2.9.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Aug 2008 19:20:29 -0000	1.3
+++ .cvsignore	14 Apr 2009 05:01:18 -0000	1.4
@@ -1 +1 @@
-fakechroot_2.8.orig.tar.gz
+fakechroot_2.9.orig.tar.gz


Index: fakechroot.spec
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/devel/fakechroot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fakechroot.spec	22 Mar 2009 14:28:59 -0000	1.9
+++ fakechroot.spec	14 Apr 2009 05:01:18 -0000	1.10
@@ -1,12 +1,11 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
-Version: 2.8
-Release: 18%{?dist}
+Version: 2.9
+Release: 19%{?dist}
 License: LGPLv2+
 Group: Development/Tools
 URL: http://fakechroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz
-Patch0: fakechroot-2.8-initsocketlen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: fakechroot-libs = %{version}-%{release}
 
@@ -26,9 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .missinginit
-perl -pi -e's,int readlink,ssize_t readlink,' src/libfakechroot.c
-chmod -x scripts/ldd.fake scripts/restoremode.sh scripts/savemode.sh
 
 %build
 %configure \
@@ -48,7 +44,7 @@
 #FAIL: t.echoarg
 #==================================
 #1 of 1 tests failed
-#make check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -65,6 +61,14 @@
 %{_libdir}/fakechroot/libfakechroot.so
 
 %changelog
+* Tue Apr 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.9-19
+- Update to 2.9.
+- Removed fakechroot-2.8-initsocketlen.patch (upstream now).
+- Removed int->ssize_t readlink type change (upstream testing for type
+  now).
+- Removed permission fix for scripts/ldd.fake scripts/restoremode.sh
+  scripts/savemode.sh (fixed upstream).
+
 * Wed Mar 18 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8-18
 - Create a fakeroot-libs subpackage so that the package is multilib aware.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fakechroot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Aug 2008 19:20:29 -0000	1.3
+++ sources	14 Apr 2009 05:01:18 -0000	1.4
@@ -1 +1 @@
-aa71113e7526b4c2bb16e09915047323  fakechroot_2.8.orig.tar.gz
+7b0048e50a6309acf0dda4e547735022  fakechroot_2.9.orig.tar.gz



From mclasen at fedoraproject.org  Tue Apr 14 05:12:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 05:12:19 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.204,1.205
Message-ID: <20090414051219.EA7DA700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6673

Modified Files:
	gnome-games.spec 
Log Message:
drop obsolete patch



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- gnome-games.spec	14 Apr 2009 04:46:08 -0000	1.204
+++ gnome-games.spec	14 Apr 2009 05:11:49 -0000	1.205
@@ -52,8 +52,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=551455
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=516491
-Patch2: sudoku-saved-data.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
@@ -126,7 +124,6 @@
 %patch0 -p1 -b .ggz-api-changes
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
-%patch2 -p1 -b .sudoku-saved-data
 
 sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
   -e 's/GNOMEtris/GnomeFallingBlocks/g' \



From salimma at fedoraproject.org  Tue Apr 14 05:17:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 14 Apr 2009 05:17:32 +0000 (UTC)
Subject: rpms/deskbar-applet/devel deskbar-applet-2.26.0-urlopener.patch,
	NONE, 1.1 deskbar-applet.spec, 1.81, 1.82
Message-ID: <20090414051732.8AA50700B2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9946

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-2.26.0-urlopener.patch 
Log Message:
* Tue Apr 14 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-3
- Patch for a multiple inheritance bug on 64-bit platforms


deskbar-applet-2.26.0-urlopener.patch:

--- NEW FILE deskbar-applet-2.26.0-urlopener.patch ---
### Eclipse Workspace Patch 1.0
#P deskbar-applet
Index: deskbar/handlers/twitter.py
===================================================================
--- deskbar/handlers/twitter.py	(revision 2633)
+++ deskbar/handlers/twitter.py	(working copy)
@@ -83,12 +83,10 @@
         self._update_url = update_url
         self._domain = domain
         
-        self._opener.connect ("done", self._on_opener_done)
-        
     def update (self, msg):
         try:
             post_payload = urllib.urlencode({"status" : msg, "source" : "deskbar"})
-            self._opener.open_async (self._update_url, post_payload)
+            self._opener.open_async (self._update_url, post_payload, self._on_opener_done)
         except ConcurrentRequestsException :
             LOGGER.warning ("Attempting to post while another post is already running. Ignoring")
             error = gtk.MessageDialog (None,
Index: deskbar/core/Web.py
===================================================================
--- deskbar/core/Web.py	(revision 2632)
+++ deskbar/core/Web.py	(working copy)
@@ -208,7 +208,7 @@
         Exception.__init__ (self)
 
 
-class GnomeURLopener (urllib.FancyURLopener, gobject.GObject):
+class GnomeURLopener (urllib.FancyURLopener):
     """
     A subclass of C{urllib.URLopener} able to intercept user/password requests
     and pass them through an L{Account}, displaying a L{AccountDialog} if
@@ -219,10 +219,6 @@
                      a new fresh GnomeURLopener each time you need one
     """
     
-    __gsignals__ = {
-        "done" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [gobject.TYPE_PYOBJECT]),
-    }
-    
     def __init__ (self, account, extra_widget_factory=None):
         """
         @param account: The L{Account} object to request credentials from
@@ -235,7 +231,7 @@
         """
         proxies = get_proxy()
         urllib.FancyURLopener.__init__ (self, proxies)
-        gobject.GObject.__init__ (self)
+        
         self._account = account
         self._thread = None
         self._authentication_retries = 0
@@ -311,7 +307,7 @@
                         # The factory returned a non-None non-widget object
                         LOGGER.error ("%s returned a non-gtk.Widget instance: %s" % (self._extra_widget_factory, type(widget)))
     
-    def open_async (self, url, payload=None):
+    def open_async (self, url, payload=None, callback=None):
         """
         Open a URL asynchronously. When the request has been completed the
         C{"done"} signal of this class is emitted.
@@ -334,9 +330,9 @@
             raise ConcurrentRequestsException()
     
         if payload != None :
-            async_args = (url, payload)
+            async_args = ((url, payload), callback)
         else :
-            async_args = (url, )
+            async_args = ((url, ), callback)
         
         self._thread = threading.Thread (target=self._do_open_async,
                                          args=async_args,
@@ -355,9 +351,10 @@
         self._thread = None
         
         info = None
+        open_args, callback = args
         
         try:
-            info = self.open (*args)
+            info = self.open (*open_args)
         except AuthenticationAborted:
             LOGGER.debug ("Detected authentication abort")
             self._success = True # The user should not be warned
@@ -366,6 +363,7 @@
             self._success = False            
             
         gtk.gdk.threads_enter()
-        self.emit ("done", info)
+        if callback != None and callable(callback):
+            callback(self, info)
         gtk.gdk.threads_leave()



Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- deskbar-applet.spec	13 Apr 2009 01:35:50 -0000	1.81
+++ deskbar-applet.spec	14 Apr 2009 05:17:02 -0000	1.82
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.26.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 Source2:        fedorabz.png
 Patch0:         %{name}-2.26.0-gapplet.patch
 Patch1:         %{name}-2.26.0-py_sitearch.patch
+Patch2:         %{name}-2.26.0-urlopener.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
@@ -43,6 +44,8 @@
 %patch0 -p1 -b .gapplet
 # http://bugzilla.gnome.org/show_activity.cgi?id=578803
 %patch1 -p1 -b .py_sitearch
+# http://bugzilla.gnome.org/show_bug.cgi?id=577649
+%patch2 -p0 -b .urlopener
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -109,6 +112,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-3
+- Patch for a multiple inheritance bug on 64-bit platforms
+
 * Sun Apr 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-2
 - Fix site-packages location for 64-bit platforms
 



From jjh at fedoraproject.org  Tue Apr 14 05:52:08 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Tue, 14 Apr 2009 05:52:08 +0000 (UTC)
Subject: rpms/ragel/F-10 .cvsignore, 1.10, 1.11 ragel-Makefile-install.patch,
	1.2, 1.3 ragel.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20090414055209.3F50F700B2@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19432

Modified Files:
	.cvsignore ragel-Makefile-install.patch ragel.spec sources 
Log Message:
update to 6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Aug 2008 20:23:44 -0000	1.10
+++ .cvsignore	14 Apr 2009 05:51:37 -0000	1.11
@@ -1 +1 @@
-ragel-6.3.tar.gz
+ragel-6.4.tar.gz

ragel-Makefile-install.patch:

Index: ragel-Makefile-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/ragel-Makefile-install.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ragel-Makefile-install.patch	12 May 2008 07:03:29 -0000	1.2
+++ ragel-Makefile-install.patch	14 Apr 2009 05:51:37 -0000	1.3
@@ -1,66 +1,11 @@
-diff -Nuar ragel-6.2.orig/ragel/Makefile.in ragel-6.2/ragel/Makefile.in
---- ragel-6.2.orig/ragel/Makefile.in	2008-01-11 16:14:17.000000000 -0700
-+++ ragel-6.2/ragel/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -89,6 +89,6 @@
+diff -up ragel/Makefile.in.fedora ./ragel/Makefile.in
+--- ragel/Makefile.in.fedora	2009-04-11 18:19:45.000000000 -0600
++++ ragel/Makefile.in	2009-04-11 18:20:04.000000000 -0600
+@@ -109,6 +109,6 @@ clean:
  
  install: all
- 	install -d $(prefix)/bin
--	install -s ragel $(prefix)/bin/ragel
-+	install ragel $(prefix)/bin/ragel
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-cd/Makefile.in ragel-6.2/rlgen-cd/Makefile.in
---- ragel-6.2.orig/rlgen-cd/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-cd/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -64,6 +64,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-cd $(prefix)/bin/rlgen-cd
-+	install rlgen-cd $(prefix)/bin/rlgen-cd
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-csharp/Makefile.in ragel-6.2/rlgen-csharp/Makefile.in
---- ragel-6.2.orig/rlgen-csharp/Makefile.in	2008-03-30 14:04:15.000000000 -0600
-+++ ragel-6.2/rlgen-csharp/Makefile.in	2008-05-12 00:42:49.000000000 -0600
-@@ -64,6 +64,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-csharp $(prefix)/bin/rlgen-csharp
-+	install rlgen-csharp $(prefix)/bin/rlgen-csharp
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-dot/Makefile.in ragel-6.2/rlgen-dot/Makefile.in
---- ragel-6.2.orig/rlgen-dot/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-dot/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -60,6 +60,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-dot $(prefix)/bin/rlgen-dot
-+	install rlgen-dot $(prefix)/bin/rlgen-dot
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-java/Makefile.in ragel-6.2/rlgen-java/Makefile.in
---- ragel-6.2.orig/rlgen-java/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-java/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -61,6 +61,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-java $(prefix)/bin/rlgen-java
-+	install rlgen-java $(prefix)/bin/rlgen-java
- 
- -include $(DEPS)
-diff -Nuar ragel-6.2.orig/rlgen-ruby/Makefile.in ragel-6.2/rlgen-ruby/Makefile.in
---- ragel-6.2.orig/rlgen-ruby/Makefile.in	2007-10-24 09:15:38.000000000 -0600
-+++ ragel-6.2/rlgen-ruby/Makefile.in	2008-05-12 00:43:07.000000000 -0600
-@@ -62,6 +62,6 @@
- 
- install: all
- 	install -d $(prefix)/bin
--	install -s rlgen-ruby $(prefix)/bin/rlgen-ruby
-+	install rlgen-ruby $(prefix)/bin/rlgen-ruby
+ 	install -d $(DESTDIR)$(prefix)/bin
+-	install -s ragel $(DESTDIR)$(prefix)/bin/ragel
++	install ragel $(DESTDIR)$(prefix)/bin/ragel
  
  -include $(DEPS)


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/ragel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ragel.spec	30 Aug 2008 20:23:44 -0000	1.13
+++ ragel.spec	14 Apr 2009 05:51:37 -0000	1.14
@@ -1,15 +1,16 @@
 Name:           ragel   
-Version:        6.3
+Version:        6.4
 Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://www.cs.queensu.ca/~thurston/ragel/ 
-Source0:        http://www.cs.queensu.ca/~thurston/ragel/%{name}-%{version}.tar.gz
+URL:            http://www.complang.org/%{name}/
+Source0:        http://www.complang.org/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  transfig, tetex-latex
+# for documentation building
+BuildRequires:  transfig, tetex-latex, gcc-objc
 Requires:       gawk
 
 Patch0:         ragel-Makefile-install.patch
@@ -24,10 +25,12 @@
 %prep
 %setup -q
 
-%patch0 -p1
+%patch0 -p0
 
 %build
-%configure 
+# set the names of the other programming commandline programs
+%configure RUBY=ruby JAVAC=javac GMCS=gmcs 
+
 make %{?_smp_mflags}
 pushd doc
 make %{?_smp_mflags}
@@ -51,15 +54,16 @@
 %doc COPYING ragel.vim
 %doc examples
 %doc doc/ragel-guide.pdf
-%{_bindir}/rlgen-ruby
-%{_bindir}/rlgen-java
-%{_bindir}/rlgen-dot
-%{_bindir}/rlgen-cd
-%{_bindir}/rlgen-csharp
 %{_bindir}/ragel
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 13 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-1
+-  Update to 6.4
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Aug 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.3-1
 - update to 6.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Aug 2008 20:23:44 -0000	1.10
+++ sources	14 Apr 2009 05:51:37 -0000	1.11
@@ -1 +1 @@
-61b53fb53c28b31bec28da8e7bd21351  ragel-6.3.tar.gz
+c0dc274083e9d825bfb48966810de046  ragel-6.4.tar.gz



From ondrejj at fedoraproject.org  Tue Apr 14 05:54:58 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 14 Apr 2009 05:54:58 +0000 (UTC)
Subject: rpms/aspell-sk/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 aspell-sk.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090414055458.20CA2700B2@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20479/devel

Modified Files:
	.cvsignore aspell-sk.spec sources 
Added Files:
	import.log 
Log Message:
Update upstream.


--- NEW FILE import.log ---
aspell-sk-2_01-1_fc10:HEAD:aspell-sk-2.01-1.fc10.src.rpm:1239688447


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2007 06:49:07 -0000	1.3
+++ .cvsignore	14 Apr 2009 05:54:26 -0000	1.4
@@ -1 +1 @@
-aspell6-sk-2.00-0.tar.bz2
+aspell6-sk-2.01-2.tar.bz2


Index: aspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/aspell-sk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aspell-sk.spec	24 Feb 2009 02:36:14 -0000	1.4
+++ aspell-sk.spec	14 Apr 2009 05:54:27 -0000	1.5
@@ -1,11 +1,11 @@
 %define aspellversion 6
 %define lang sk
-%define langrelease 0
+%define langrelease 2
 %define aspellname aspell%{aspellversion}-%{lang}
 
 Name:           aspell-%{lang}
-Version:        2.00
-Release:        5%{?dist}
+Version:        2.01
+Release:        1%{?dist}
 Summary:        Slovak dictionaries for Aspell
 
 Group:          Applications/Text
@@ -48,11 +48,8 @@
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Feb 9 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-4
-- rebuild against gcc4.3
+* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-1
+- update upstream
 
 * Thu Nov 1 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-3
 - update upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2007 06:49:07 -0000	1.3
+++ sources	14 Apr 2009 05:54:27 -0000	1.4
@@ -1 +1 @@
-b7ac2b1cb31bad0cd676c1027fa46dc4  aspell6-sk-2.00-0.tar.bz2
+b31bdc33a681902e5bc493a0692022a9  aspell6-sk-2.01-2.tar.bz2



From ondrejj at fedoraproject.org  Tue Apr 14 05:59:48 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 14 Apr 2009 05:59:48 +0000 (UTC)
Subject: rpms/aspell-sk/devel aspell-sk.spec,1.5,1.6
Message-ID: <20090414055948.C2806700B2@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21910

Modified Files:
	aspell-sk.spec 
Log Message:
update changelog


Index: aspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/aspell-sk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-sk.spec	14 Apr 2009 05:54:27 -0000	1.5
+++ aspell-sk.spec	14 Apr 2009 05:59:18 -0000	1.6
@@ -48,7 +48,7 @@
 
 
 %changelog
-* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-1
+* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.01-1
 - update upstream
 
 * Thu Nov 1 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-3



From jjh at fedoraproject.org  Tue Apr 14 06:02:02 2009
From: jjh at fedoraproject.org (Jeremy Hinegardner)
Date: Tue, 14 Apr 2009 06:02:02 +0000 (UTC)
Subject: rpms/ragel/devel ragel.spec,1.16,1.17
Message-ID: <20090414060202.2D970700B2@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22720

Modified Files:
	ragel.spec 
Log Message:
remove main.cpp patch to test builds


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ragel.spec	12 Apr 2009 01:51:53 -0000	1.16
+++ ragel.spec	14 Apr 2009 06:01:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           ragel   
 Version:        6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
@@ -14,7 +14,6 @@
 Requires:       gawk
 
 Patch0:         ragel-Makefile-install.patch
-Patch1:         ragel-main.patch
 
 %description
 Ragel compiles finite state machines from regular languages into executable C,
@@ -27,7 +26,6 @@
 %setup -q
 
 %patch0 -p0
-%patch1 -p0
 
 %build
 # set the names of the other programming commandline programs
@@ -60,6 +58,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Apr 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-3
+-  remove main.cpp patch for testing
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-2
 -  add patch for main.cpp
 



From airlied at fedoraproject.org  Tue Apr 14 06:04:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 14 Apr 2009 06:04:16 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.71,
	1.72 kernel.spec, 1.1534, 1.1535
Message-ID: <20090414060416.5EAE7700B2@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23715

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-73
- drm-modesetting-radeon.patch: more bug fixes


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- drm-modesetting-radeon.patch	9 Apr 2009 10:12:07 -0000	1.71
+++ drm-modesetting-radeon.patch	14 Apr 2009 06:04:13 -0000	1.72
@@ -1,3 +1,62 @@
+commit 02b2eac96ef3cd6a59bf2a13c9ae104f855ff582
+Merge: 1076a8a 24eacd0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 15:55:42 2009 +1000
+
+    Merge branch 'drm-rawhide' into drm-f11
+
+commit 24eacd0cf8cb65a038934c11ef8ae5da348f1365
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 15:52:28 2009 +1000
+
+    radeon: add another debugging hook to gem code
+
+commit e612721b43a6fb107aa74a41e9438f23bc833051
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 15:32:08 2009 +1000
+
+    radeon: add M7 thinkpad quirk
+
+commit 6a166a2d7b4a4d9ba8ee1535f5ab1d156df6743d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 13:59:29 2009 +1000
+
+    radeon: IGPs enable snooping in theory
+
+commit b954fe6e4c28e92e636afac1110c203148899129
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 13:19:32 2009 +1000
+
+    radeon: ack irqs before suspend in case any are pending
+
+commit 7ac7ebfef2088c943d20f683a7da1a5dcfe1bce3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 13:18:37 2009 +1000
+
+    radeon: add initial fixed point bandwidth calcs for legacy chips.
+    
+    This does the bandwidth calcs using a 20/12 fixed point representation,
+    and ports all the code from userspace, it needs testing, but it also
+    ICEs gcc so can't really test until that is fixed.
+
+commit 7db0b18f5cbc62b89f904b5f18d046e7bcac83cc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 13 15:49:34 2009 +1000
+
+    radeon: feed back updated limits to userspace
+
+commit ca7f16ed835965f0f29f38958fa8547331eeba67
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 13 15:45:14 2009 +1000
+
+    radeon: sync atom quirks
+
+commit 173bbeca616f4ffff4d8205f86bfb79c35151de1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 13 15:35:12 2009 +1000
+
+    radeon: agp mode quirks ported from userspace
+
 commit 1076a8a749c46b964ee49f5d4dc42070b1905e26
 Merge: e94c6e1 8765b83
 Author: Dave Airlie <airlied at redhat.com>
@@ -1880,7 +1939,7 @@
  int __read_mostly pat_enabled = 1;
 +EXPORT_SYMBOL_GPL(pat_enabled);
  
- void __cpuinit pat_disable(char *reason)
+ void __cpuinit pat_disable(const char *reason)
  {
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
 index 3a22eb9..a74980b 100644
@@ -15493,10 +15552,10 @@
  			      - dev->agp->base
 diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
 new file mode 100644
-index 0000000..1cadda2
+index 0000000..4ac4c40
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
-@@ -0,0 +1,1035 @@
+@@ -0,0 +1,1050 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -15639,6 +15698,21 @@
 +			return false;
 +	}
 +
++	/* some BIOSes seem to report DAC on HDMI - they hurt me with their lies */
++	if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
++	    (*connector_type == DRM_MODE_CONNECTOR_HDMIB)) {
++		if (supported_device & (ATOM_DEVICE_CRT_SUPPORT))
++			return false;
++	}
++
++	/* ASUS HD 3600 XT board lists the DVI port as HDMI */
++	if ((dev->pdev->device == 0x9598) &&
++	(dev->pdev->subsystem_vendor == 0x1043) &&
++	(dev->pdev->subsystem_device == 0x01da)) {
++		if (*connector_type == DRM_MODE_CONNECTOR_HDMIB)
++			*connector_type = DRM_MODE_CONNECTOR_DVID;
++	}
++
 +	return true;
 +}
 +
@@ -16534,10 +16608,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
 new file mode 100644
-index 0000000..6ea52a8
+index 0000000..8b360e0
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,464 @@
+@@ -0,0 +1,469 @@
 +/**************************************************************************
 + * 
 + * Copyright 2007 Dave Airlie
@@ -16573,6 +16647,8 @@
 +#include "radeon_drm.h"
 +#include "radeon_drv.h"
 +
++extern int radeon_no_gart_wb;
++
 +struct drm_ttm_backend *radeon_create_ttm_backend_entry(struct drm_device * dev)
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -16953,6 +17029,9 @@
 +    	if (!dev_priv->cp_running)
 +		goto fallback;
 +	
++	if (bo->mem.mem_type == DRM_BO_MEM_VRAM && radeon_no_gart_wb)
++		goto fallback;
++		
 +	if (bo->mem.flags & DRM_BO_FLAG_CLEAN) /* need to implement solid fill */
 +	{
 +		if (radeon_move_zero_fill(bo, evict, no_wait, new_mem))
@@ -17004,7 +17083,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..a8d82d4
+index 0000000..fab8f75
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
 @@ -0,0 +1,1767 @@
@@ -17541,9 +17620,9 @@
 +		sclk = radeon_bios16(dev_priv, pll_info + 0xa);
 +		mclk = radeon_bios16(dev_priv, pll_info + 0x8);
 +		if (sclk == 0)
-+			sclk = 200;
++			sclk = 200 * 100;
 +		if (mclk == 0)
-+			mclk = 200;
++			mclk = 200 * 100;
 +
 +		mode_info->sclk = sclk;
 +		mode_info->mclk = mclk;
@@ -19390,7 +19469,7 @@
 +	kfree(connector);
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 77a7a4d..2028a52 100644
+index 77a7a4d..948cc37 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
@@ -19597,14 +19676,11 @@
 -	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	if (!(dev_priv->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS))
 +		return;
- 
--	RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x1f);
--	return RADEON_READ(RADEON_CLOCK_CNTL_DATA);
++
 +	(void)RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +	(void)RADEON_READ(RADEON_CRTC_GEN_CNTL);
- }
- 
--static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
++}
++
 +void radeon_pll_errata_after_data(struct drm_radeon_private *dev_priv)
 +{
 +	/* This workarounds is necessary on RV100, RS100 and RS200 chips
@@ -19612,7 +19688,9 @@
 +	 */
 +	if (dev_priv->pll_errata & CHIP_ERRATA_PLL_DELAY)
 +		udelay(5000);
-+
+ 
+-	RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x1f);
+-	return RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +	/* This function is required to workaround a hardware bug in some (all?)
 +	 * revisions of the R300.  This workaround should be called after every
 +	 * CLOCK_CNTL_INDEX register access.  If not, register reads afterward
@@ -19646,8 +19724,9 @@
 +	radeon_pll_errata_after_index(dev_priv);
 +	RADEON_WRITE(RADEON_CLOCK_CNTL_DATA, data);
 +	radeon_pll_errata_after_data(dev_priv);
-+}
-+
+ }
+ 
+-static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
 +u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
  {
  	RADEON_WRITE8(RADEON_PCIE_INDEX, addr & 0xff);
@@ -19919,7 +19998,7 @@
  		RADEON_WRITE(RADEON_SCRATCH_UMSK, 0);
  	}
  }
-@@ -862,68 +1040,88 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+@@ -862,68 +1040,90 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
  	u32 temp;
  
  	if (on) {
@@ -19976,16 +20055,20 @@
  		temp = dev_priv->gart_info.bus_addr & 0xfffff000;
  		temp |= (upper_32_bits(dev_priv->gart_info.bus_addr) & 0xff) << 4;
 -		IGP_WRITE_MCIND(RS480_GART_BASE, temp);
-+		RADEON_WRITE_MCIND(RS480_GART_BASE, temp);
- 
+-
 -		temp = IGP_READ_MCIND(dev_priv, RS480_AGP_MODE_CNTL);
 -		IGP_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) |
 -						      RS480_REQ_TYPE_SNOOP_DIS));
-+		temp = RADEON_READ_MCIND(dev_priv, RS480_AGP_MODE_CNTL);
-+		RADEON_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) |
-+							 RS480_REQ_TYPE_SNOOP_DIS));
- 
+-
 -		radeon_write_agp_base(dev_priv, dev_priv->gart_vm_start);
++		RADEON_WRITE_MCIND(RS480_GART_BASE, temp);
++
++		/* enable snooping on gart mapped address */
++		temp = RADEON_READ_MCIND(dev_priv, RS480_AGP_MODE_CNTL);
++		temp &= (RS480_REQ_TYPE_SNOOP_DIS);
++		temp |= (1 << RS480_REQ_TYPE_SNOOP_SHIFT);
++		RADEON_WRITE_MCIND(RS480_AGP_MODE_CNTL, temp);
++
 +		if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) {
 +			RADEON_WRITE_MCIND(RS690_MC_AGP_BASE,
 +					   (unsigned int)dev_priv->gart_vm_start);
@@ -20042,7 +20125,7 @@
  	}
  }
  
-@@ -939,11 +1137,11 @@ static void rs600_set_igpgart(drm_radeon_private_t *dev_priv, int on)
+@@ -939,11 +1139,11 @@ static void rs600_set_igpgart(drm_radeon_private_t *dev_priv, int on)
  			 (long)dev_priv->gart_info.bus_addr,
  			 dev_priv->gart_size);
  
@@ -20057,7 +20140,7 @@
  					(RS600_ENABLE_TRANSLATION_MODE_OVERRIDE |
  					 RS600_SYSTEM_ACCESS_MODE_IN_SYS |
  					 RS600_SYSTEM_APERTURE_UNMAPPED_ACCESS_PASSTHROUGH |
-@@ -951,55 +1149,55 @@ static void rs600_set_igpgart(drm_radeon_private_t *dev_priv, int on)
+@@ -951,55 +1151,55 @@ static void rs600_set_igpgart(drm_radeon_private_t *dev_priv, int on)
  					 RS600_ENABLE_FRAGMENT_PROCESSING |
  					 RS600_EFFECTIVE_L1_QUEUE_SIZE(3)));
  
@@ -20141,7 +20224,7 @@
  	}
  }
  
-@@ -1022,7 +1220,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
+@@ -1022,7 +1222,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
  				  dev_priv->gart_vm_start +
  				  dev_priv->gart_size - 1);
  
@@ -20150,7 +20233,7 @@
  
  		RADEON_WRITE_PCIE(RADEON_PCIE_TX_GART_CNTL,
  				  RADEON_PCIE_TX_GART_EN);
-@@ -1033,7 +1231,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
+@@ -1033,7 +1233,7 @@ static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
  }
  
  /* Enable or disable PCI GART on the chip */
@@ -20159,7 +20242,7 @@
  {
  	u32 tmp;
  
-@@ -1072,7 +1270,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
+@@ -1072,7 +1272,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
  
  		/* Turn off AGP aperture -- is this required for PCI GART?
  		 */
@@ -20168,7 +20251,7 @@
  		RADEON_WRITE(RADEON_AGP_COMMAND, 0);	/* clear AGP_COMMAND */
  	} else {
  		RADEON_WRITE(RADEON_AIC_CNTL,
-@@ -1162,17 +1360,6 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
+@@ -1162,17 +1362,6 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
  	 */
  	dev_priv->vblank_crtc = DRM_RADEON_VBLANK_CRTC1;
  
@@ -20186,7 +20269,7 @@
  	dev_priv->do_boxes = 0;
  	dev_priv->cp_mode = init->cp_mode;
  
-@@ -1220,9 +1407,8 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
+@@ -1220,9 +1409,8 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
  	 */
  	dev_priv->depth_clear.rb3d_cntl = (RADEON_PLANE_MASK_ENABLE |
  					   (dev_priv->color_fmt << 10) |
@@ -20198,7 +20281,7 @@
  	dev_priv->depth_clear.rb3d_zstencilcntl =
  	    (dev_priv->depth_fmt |
  	     RADEON_Z_TEST_ALWAYS |
-@@ -1419,28 +1605,41 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
+@@ -1419,28 +1607,41 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
  		dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
  		/* if we have an offset set from userspace */
  		if (dev_priv->pcigart_offset_set) {
@@ -20260,7 +20343,7 @@
  			if (dev_priv->flags & RADEON_IS_IGPGART)
  				dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
  			else
-@@ -1449,12 +1648,7 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
+@@ -1449,12 +1650,7 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
  			    DRM_ATI_GART_MAIN;
  			dev_priv->gart_info.addr = NULL;
  			dev_priv->gart_info.bus_addr = 0;
@@ -20274,7 +20357,7 @@
  		}
  
  		sctrl = RADEON_READ(RADEON_SURFACE_CNTL);
-@@ -1486,6 +1680,9 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
+@@ -1486,6 +1682,9 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
  		radeon_set_pcigart(dev_priv, 1);
  	}
  
@@ -20284,7 +20367,7 @@
  	radeon_cp_load_microcode(dev_priv);
  	radeon_cp_init_ring_buffer(dev, dev_priv, file_priv);
  
-@@ -1540,8 +1737,11 @@ static int radeon_do_cleanup_cp(struct drm_device * dev)
+@@ -1540,8 +1739,11 @@ static int radeon_do_cleanup_cp(struct drm_device * dev)
  
  		if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB)
  		{
@@ -20298,7 +20381,7 @@
  		}
  	}
  	/* only clear to the start of flags */
-@@ -1594,6 +1794,10 @@ int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_pri
+@@ -1594,6 +1796,10 @@ int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_pri
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	drm_radeon_init_t *init = data;
@@ -20309,7 +20392,7 @@
  
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
-@@ -1622,6 +1826,9 @@ int radeon_cp_start(struct drm_device *dev, void *data, struct drm_file *file_pr
+@@ -1622,6 +1828,9 @@ int radeon_cp_start(struct drm_device *dev, void *data, struct drm_file *file_pr
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	DRM_DEBUG("\n");
  
@@ -20319,7 +20402,7 @@
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
  	if (dev_priv->cp_running) {
-@@ -1652,6 +1859,9 @@ int radeon_cp_stop(struct drm_device *dev, void *data, struct drm_file *file_pri
+@@ -1652,6 +1861,9 @@ int radeon_cp_stop(struct drm_device *dev, void *data, struct drm_file *file_pri
  	int ret;
  	DRM_DEBUG("\n");
  
@@ -20329,7 +20412,7 @@
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
  	if (!dev_priv->cp_running)
-@@ -1699,6 +1909,9 @@ void radeon_do_release(struct drm_device * dev)
+@@ -1699,6 +1911,9 @@ void radeon_do_release(struct drm_device * dev)
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	int i, ret;
  
@@ -20339,7 +20422,7 @@
  	if (dev_priv) {
  		if (dev_priv->cp_running) {
  			/* Stop the cp */
-@@ -1750,6 +1963,9 @@ void radeon_do_release(struct drm_device * dev)
+@@ -1750,6 +1965,9 @@ void radeon_do_release(struct drm_device * dev)
  		radeon_mem_takedown(&(dev_priv->gart_heap));
  		radeon_mem_takedown(&(dev_priv->fb_heap));
  
@@ -20349,7 +20432,7 @@
  		/* deallocate kernel resources */
  		if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
  			r600_do_cleanup_cp(dev);
-@@ -1765,6 +1981,9 @@ int radeon_cp_reset(struct drm_device *dev, void *data, struct drm_file *file_pr
+@@ -1765,6 +1983,9 @@ int radeon_cp_reset(struct drm_device *dev, void *data, struct drm_file *file_pr
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	DRM_DEBUG("\n");
  
@@ -20359,7 +20442,7 @@
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
  	if (!dev_priv) {
-@@ -1788,7 +2007,9 @@ int radeon_cp_idle(struct drm_device *dev, void *data, struct drm_file *file_pri
+@@ -1788,7 +2009,9 @@ int radeon_cp_idle(struct drm_device *dev, void *data, struct drm_file *file_pri
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	DRM_DEBUG("\n");
  
@@ -20370,7 +20453,7 @@
  
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
  		return r600_do_cp_idle(dev_priv);
-@@ -1803,6 +2024,9 @@ int radeon_cp_resume(struct drm_device *dev, void *data, struct drm_file *file_p
+@@ -1803,6 +2026,9 @@ int radeon_cp_resume(struct drm_device *dev, void *data, struct drm_file *file_p
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	DRM_DEBUG("\n");
  
@@ -20380,7 +20463,7 @@
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
  		return r600_do_resume_cp(dev, file_priv);
  	else
-@@ -1814,6 +2038,9 @@ int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_file *fil
+@@ -1814,6 +2040,9 @@ int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_file *fil
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	DRM_DEBUG("\n");
  
@@ -20390,7 +20473,7 @@
  	LOCK_TEST_WITH_RETURN(dev, file_priv);
  
  	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
-@@ -2040,6 +2267,822 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_
+@@ -2040,6 +2269,822 @@ int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_
  	return ret;
  }
  
@@ -21213,7 +21296,7 @@
  int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  {
  	drm_radeon_private_t *dev_priv;
-@@ -2053,6 +3096,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -2053,6 +3098,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  	dev->dev_private = (void *)dev_priv;
  	dev_priv->flags = flags;
  
@@ -21222,7 +21305,7 @@
  	switch (flags & RADEON_FAMILY_MASK) {
  	case CHIP_R100:
  	case CHIP_RV200:
-@@ -2073,6 +3118,21 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -2073,6 +3120,21 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		break;
  	}
  
@@ -21244,7 +21327,7 @@
  	if (drm_device_is_agp(dev))
  		dev_priv->flags |= RADEON_IS_AGP;
  	else if (drm_device_is_pcie(dev))
-@@ -2080,9 +3140,34 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -2080,9 +3142,34 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  	else
  		dev_priv->flags |= RADEON_IS_PCI;
  
@@ -21280,7 +21363,7 @@
  	if (ret != 0)
  		return ret;
  
-@@ -2092,8 +3177,63 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -2092,8 +3179,63 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		return ret;
  	}
  
@@ -21346,7 +21429,7 @@
  	return ret;
  }
  
-@@ -2147,18 +3287,12 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
+@@ -2147,18 +3289,12 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
   */
  int radeon_driver_firstopen(struct drm_device *dev)
  {
@@ -21368,7 +21451,7 @@
  
  	return 0;
  }
-@@ -2167,6 +3301,14 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -2167,6 +3303,14 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@ -21383,7 +21466,7 @@
  	DRM_DEBUG("\n");
  
  	drm_rmmap(dev, dev_priv->mmio);
-@@ -2214,3 +3356,41 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv)
+@@ -2214,3 +3358,41 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv)
  		RADEON_READ(RADEON_CP_RB_RPTR);
  	}
  }
@@ -21427,10 +21510,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
 new file mode 100644
-index 0000000..5c1082f
+index 0000000..6e61ec7
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cs.c
-@@ -0,0 +1,681 @@
+@@ -0,0 +1,684 @@
 +/*
 + * Copyright 2008 Jerome Glisse.
 + * All Rights Reserved.
@@ -21596,6 +21679,9 @@
 +	dev_priv->cs.id_emit(&parser, &cs_id);
 +
 +	cs->cs_id = cs_id;
++	cs->gart_limit = dev_priv->mm.gart_useable;
++	cs->vram_limit = dev_priv->mm.vram_visible;
++
 +out:
 +	dev_priv->cs.ib_free(&parser, r);
 +	mutex_unlock(&dev_priv->cs.cs_mutex);
@@ -22384,10 +22470,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..fd53172
+index 0000000..76834ae
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -0,0 +1,644 @@
+@@ -0,0 +1,673 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -23032,11 +23118,40 @@
 +{
 +	drm_mode_config_cleanup(dev);
 +}
++
++void radeon_init_disp_bandwidth(struct drm_device *dev)
++{
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	struct drm_display_mode *modes[2];
++	int pixel_bytes[2];
++	struct drm_crtc *crtc;
++
++	pixel_bytes[0] = pixel_bytes[1] = 0;
++	modes[0] = modes[1] = NULL;
++
++	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
++		struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
++			
++		if (crtc->enabled) {
++			modes[radeon_crtc->crtc_id] = &crtc->mode;
++			pixel_bytes[radeon_crtc->crtc_id] = crtc->fb->bits_per_pixel / 8;
++		}
++	}
++  
++	if (radeon_is_avivo(dev_priv)) {
++	} else {
++		radeon_init_disp_bw_legacy(dev,
++					   modes[0],
++					   pixel_bytes[0],
++					   modes[1],
++					   pixel_bytes[1]);
++	}
++}
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 13a60f4..8207f33 100644
+index 13a60f4..298ae3d 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -35,48 +35,101 @@
+@@ -35,48 +35,105 @@
  #include "radeon_drv.h"
  
  #include "drm_pciids.h"
@@ -23049,6 +23164,7 @@
 +int radeon_vram_zero = 0;
 +int radeon_gart_size = 512; /* default gart size */
 +int radeon_vram_limit = -1;
++int radeon_no_gart_wb = 0;
  
  MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
  module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -23070,22 +23186,20 @@
 +
 +MODULE_PARM_DESC(vramzero, "Zero VRAM for new objects");
 +module_param_named(vramzero, radeon_vram_zero, int, 0600);
- 
--	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
--		return 0;
++
 +MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32,64, etc)\n");
 +module_param_named(gartsize, radeon_gart_size, int, 0600);
- 
--	/* Disable *all* interrupts */
--	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
--		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
--	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
--	return 0;
++
 +MODULE_PARM_DESC(vramlimit, "Restrict VRAM vfor testing");
 +module_param_named(vramlimit, radeon_vram_limit, int, 0600);
 +
-+static struct drm_driver driver;
++MODULE_PARM_DESC(no_gart_wb, "avoid using GART for moves from VRAM to GTT");
++module_param_named(no_gart_wb, radeon_no_gart_wb, int, 0600);
 +
++static struct drm_driver driver;
+ 
+-	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+-		return 0;
 +static struct pci_device_id pciidlist[] = {
 +	radeon_PCI_IDS
 +};
@@ -23093,7 +23207,12 @@
 +#if defined(CONFIG_DRM_RADEON_KMS)
 +MODULE_DEVICE_TABLE(pci, pciidlist);
 +#endif
-+
+ 
+-	/* Disable *all* interrupts */
+-	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
+-		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
+-	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
+-	return 0;
 +static int __devinit
 +radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 +{
@@ -23160,7 +23279,7 @@
  	.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
  	.load = radeon_driver_load,
  	.firstopen = radeon_driver_firstopen,
-@@ -92,6 +145,10 @@ static struct drm_driver driver = {
+@@ -92,6 +149,10 @@ static struct drm_driver driver = {
  	.disable_vblank = radeon_disable_vblank,
  	.master_create = radeon_master_create,
  	.master_destroy = radeon_master_destroy,
@@ -23171,7 +23290,7 @@
  	.irq_preinstall = radeon_driver_irq_preinstall,
  	.irq_postinstall = radeon_driver_irq_postinstall,
  	.irq_uninstall = radeon_driver_irq_uninstall,
-@@ -100,7 +157,11 @@ static struct drm_driver driver = {
+@@ -100,7 +161,11 @@ static struct drm_driver driver = {
  	.get_map_ofs = drm_core_get_map_ofs,
  	.get_reg_ofs = drm_core_get_reg_ofs,
  	.ioctls = radeon_ioctls,
@@ -23183,7 +23302,7 @@
  	.fops = {
  		 .owner = THIS_MODULE,
  		 .open = drm_open,
-@@ -117,8 +178,15 @@ static struct drm_driver driver = {
+@@ -117,8 +182,15 @@ static struct drm_driver driver = {
  	.pci_driver = {
  		 .name = DRIVER_NAME,
  		 .id_table = pciidlist,
@@ -23199,7 +23318,7 @@
  	.name = DRIVER_NAME,
  	.desc = DRIVER_DESC,
  	.date = DRIVER_DATE,
-@@ -130,6 +198,29 @@ static struct drm_driver driver = {
+@@ -130,6 +202,29 @@ static struct drm_driver driver = {
  static int __init radeon_init(void)
  {
  	driver.num_ioctls = radeon_max_ioctl;
@@ -23230,7 +23349,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index ed4d27e..c7d2265 100644
+index ed4d27e..009bbcd 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -23432,7 +23551,7 @@
  	drm_local_map_t *mmio;
  
  	/* r6xx/r7xx pipe/shader config */
-@@ -348,6 +441,39 @@ typedef struct drm_radeon_private {
+@@ -348,6 +441,40 @@ typedef struct drm_radeon_private {
  	int r700_sc_hiz_tile_fifo_size;
  	int r700_sc_earlyz_tile_fifo_fize;
  
@@ -23469,10 +23588,11 @@
 +
 +	uint32_t aper_size;
 +	int vram_mtrr;
++	int disp_priority;
  } drm_radeon_private_t;
  
  typedef struct drm_radeon_buf_priv {
-@@ -362,8 +488,15 @@ typedef struct drm_radeon_kcmd_buffer {
+@@ -362,8 +489,15 @@ typedef struct drm_radeon_kcmd_buffer {
  } drm_radeon_kcmd_buffer_t;
  
  extern int radeon_no_wb;
@@ -23488,7 +23608,7 @@
  
  extern u32 radeon_get_ring_head(drm_radeon_private_t *dev_priv);
  extern void radeon_set_ring_head(drm_radeon_private_t *dev_priv, u32 val);
-@@ -397,7 +530,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi
+@@ -397,7 +531,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi
  extern int radeon_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv);
@@ -23497,7 +23617,7 @@
  extern void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base);
  extern u32 RADEON_READ_MM(drm_radeon_private_t *dev_priv, int addr);
  
-@@ -406,12 +539,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev);
+@@ -406,12 +540,9 @@ extern struct drm_buf *radeon_freelist_get(struct drm_device * dev);
  
  extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
  
@@ -23511,7 +23631,15 @@
  extern int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *file_priv);
-@@ -443,13 +573,13 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
+@@ -427,6 +558,7 @@ extern void radeon_write_ring_rptr(drm_radeon_private_t *dev_priv, u32 off, u32
+ extern void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state);
+ extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv);
+ extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv);
++extern u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r500_disp_int);
+ 
+ extern void radeon_do_release(struct drm_device * dev);
+ extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc);
+@@ -443,13 +575,13 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
  extern int radeon_driver_load(struct drm_device *dev, unsigned long flags);
  extern int radeon_driver_unload(struct drm_device *dev);
  extern int radeon_driver_firstopen(struct drm_device *dev);
@@ -23529,7 +23657,7 @@
  extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
  				unsigned long arg);
  
-@@ -478,6 +608,12 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev,
+@@ -478,6 +610,12 @@ extern int r600_cp_dispatch_indirect(struct drm_device *dev,
  extern int r600_page_table_init(struct drm_device *dev);
  extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info);
  
@@ -23542,7 +23670,7 @@
  /* Flags for stats.boxes
   */
  #define RADEON_BOX_DMA_IDLE      0x1
-@@ -486,12 +622,17 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
+@@ -486,12 +624,17 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
  #define RADEON_BOX_WAIT_IDLE     0x8
  #define RADEON_BOX_TEXTURE_LOAD  0x10
  
@@ -23560,7 +23688,7 @@
  #define RADEON_AGP_COMMAND		0x0f60
  #define RADEON_AGP_COMMAND_PCI_CONFIG   0x0060	/* offset in PCI config */
  #	define RADEON_AGP_ENABLE	(1<<8)
-@@ -667,16 +808,6 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
+@@ -667,16 +810,6 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
  #define R520_MC_IND_WR_EN (1 << 24)
  #define R520_MC_IND_DATA  0x74
  
@@ -23577,7 +23705,7 @@
  #define RADEON_MPP_TB_CONFIG		0x01c0
  #define RADEON_MEM_CNTL			0x0140
  #define RADEON_MEM_SDRAM_MODE_REG	0x0158
-@@ -740,6 +871,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
+@@ -740,6 +873,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga
  #define RADEON_SCRATCH_REG3		0x15ec
  #define RADEON_SCRATCH_REG4		0x15f0
  #define RADEON_SCRATCH_REG5		0x15f4
@@ -23585,7 +23713,7 @@
  #define RADEON_SCRATCH_UMSK		0x0770
  #define RADEON_SCRATCH_ADDR		0x0774
  
-@@ -762,6 +894,12 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -762,6 +896,12 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  
  #define R600_SCRATCHOFF(x)		(R600_SCRATCH_REG_OFFSET + 4*(x))
  
@@ -23598,7 +23726,7 @@
  #define RADEON_GEN_INT_CNTL		0x0040
  #	define RADEON_CRTC_VBLANK_MASK		(1 << 0)
  #	define RADEON_CRTC2_VBLANK_MASK		(1 << 9)
-@@ -779,10 +917,13 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -779,10 +919,13 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define RADEON_SW_INT_FIRE		(1 << 26)
  #       define R500_DISPLAY_INT_STATUS          (1 << 0)
  
@@ -23616,7 +23744,7 @@
  
  #define RADEON_ISYNC_CNTL		0x1724
  #	define RADEON_ISYNC_ANY2D_IDLE3D	(1 << 0)
-@@ -821,12 +962,17 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -821,12 +964,17 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_PP_TXFILTER_1		0x1c6c
  #define RADEON_PP_TXFILTER_2		0x1c84
  
@@ -23640,7 +23768,7 @@
  #define RADEON_RB3D_CNTL		0x1c3c
  #	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
  #	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
-@@ -853,11 +999,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -853,11 +1001,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define R300_ZC_FLUSH		        (1 << 0)
  #	define R300_ZC_FREE		        (1 << 1)
  #	define R300_ZC_BUSY		        (1 << 31)
@@ -23652,7 +23780,7 @@
  #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
  #	define R300_RB3D_DC_FLUSH		(2 << 0)
  #	define R300_RB3D_DC_FREE		(2 << 2)
-@@ -865,15 +1006,15 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -865,15 +1008,15 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_RB3D_ZSTENCILCNTL	0x1c2c
  #	define RADEON_Z_TEST_MASK		(7 << 4)
  #	define RADEON_Z_TEST_ALWAYS		(7 << 4)
@@ -23672,7 +23800,7 @@
  #define RADEON_RBBM_SOFT_RESET		0x00f0
  #	define RADEON_SOFT_RESET_CP		(1 <<  0)
  #	define RADEON_SOFT_RESET_HI		(1 <<  1)
-@@ -1051,6 +1192,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1051,6 +1194,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define RADEON_PRE_WRITE_LIMIT_SHIFT	23
  
  #define RADEON_CP_IB_BASE		0x0738
@@ -23680,7 +23808,7 @@
  
  #define RADEON_CP_CSQ_CNTL		0x0740
  #	define RADEON_CSQ_CNT_PRIMARY_MASK	(0xff << 0)
-@@ -1061,6 +1203,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1061,6 +1205,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #	define RADEON_CSQ_PRIBM_INDBM		(4 << 28)
  #	define RADEON_CSQ_PRIPIO_INDPIO		(15 << 28)
  
@@ -23689,7 +23817,7 @@
  #define RADEON_AIC_CNTL			0x01d0
  #	define RADEON_PCIGART_TRANSLATE_EN	(1 << 0)
  #	define RS400_MSI_REARM	                (1 << 3)
-@@ -1143,27 +1287,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1143,27 +1289,6 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_NUM_VERTICES_SHIFT		16
  
  #define RADEON_COLOR_FORMAT_CI8		2
@@ -23717,7 +23845,7 @@
  
  #define R200_PP_TXCBLEND_0                0x2f00
  #define R200_PP_TXCBLEND_1                0x2f10
-@@ -1274,16 +1397,44 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1274,16 +1399,44 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  
  #define R200_SE_TCL_POINT_SPRITE_CNTL     0x22c4
  
@@ -23764,7 +23892,7 @@
  #define R500_D1CRTC_STATUS 0x609c
  #define R500_D2CRTC_STATUS 0x689c
  #define R500_CRTC_V_BLANK (1<<0)
-@@ -1745,6 +1896,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
+@@ -1745,6 +1898,8 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
  #define RADEON_RING_HIGH_MARK		128
  
  #define RADEON_PCIGART_TABLE_SIZE      (32*1024)
@@ -23773,7 +23901,7 @@
  
  #define RADEON_READ(reg)	DRM_READ32(  dev_priv->mmio, (reg) )
  #define RADEON_WRITE(reg, val)                                          \
-@@ -1759,11 +1912,24 @@ do {									\
+@@ -1759,11 +1914,24 @@ do {									\
  #define RADEON_READ8(reg)	DRM_READ8(  dev_priv->mmio, (reg) )
  #define RADEON_WRITE8(reg,val)	DRM_WRITE8( dev_priv->mmio, (reg), (val) )
  
@@ -23803,7 +23931,7 @@
  } while (0)
  
  #define RADEON_WRITE_PCIE(addr, val)					\
-@@ -1801,15 +1967,18 @@ do {							        \
+@@ -1801,15 +1969,18 @@ do {							        \
  	RADEON_WRITE(RS600_MC_DATA, val);                       \
  } while (0)
  
@@ -23825,7 +23953,7 @@
  } while (0)
  
  #define CP_PACKET0( reg, n )						\
-@@ -1830,7 +1999,7 @@ do {									\
+@@ -1830,7 +2001,7 @@ do {									\
  #define RADEON_WAIT_UNTIL_2D_IDLE() do {				\
  	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
  	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
@@ -23834,7 +23962,7 @@
  } while (0)
  
  #define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
-@@ -2035,4 +2204,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv);
+@@ -2035,4 +2206,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv);
  	write &= mask;						\
  } while (0)
  
@@ -26757,10 +26885,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..d1abc6e
+index 0000000..a0b0f5b
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1496 @@
+@@ -0,0 +1,1604 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -27682,6 +27810,99 @@
 +}
 +
 +#if __OS_HAS_AGP
++
++struct radeon_agpmode_quirk {
++	u32 hostbridge_vendor;
++	u32 hostbridge_device;
++	u32 chip_vendor;
++	u32 chip_device;
++	u32 subsys_vendor;
++	u32 subsys_device;
++	u32 default_mode;
++};
++
++static struct radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {
++	/* Intel E7505 Memory Controller Hub / RV350 AR [Radeon 9600XT] Needs AGPMode 4 (deb #515326) */
++	{ PCI_VENDOR_ID_INTEL,0x2550, PCI_VENDOR_ID_ATI, 0x4152,
++	  0x1458,0x4038, 4},
++	/* Intel 82865G/PE/P DRAM Controller/Host-Hub / Mobility 9800 Needs AGPMode 4 (deb #462590) */
++	{ PCI_VENDOR_ID_INTEL, 0x2570, PCI_VENDOR_ID_ATI, 0x4a4e,
++	  PCI_VENDOR_ID_DELL, 0x5106, 4},
++	/* Intel 82865G/PE/P DRAM Controller/Host-Hub / RV280 [Radeon 9200 SE] Needs AGPMode 4 (lp #300304) */
++	{ PCI_VENDOR_ID_INTEL, 0x2570, PCI_VENDOR_ID_ATI, 0x5964,
++	  0x148c, 0x2073, 4},
++	/* Intel 82855PM Processor to I/O Controller / Mobility M6 LY Needs AGPMode 1 (deb #467235) */
++	{ PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x4c59,
++	  PCI_VENDOR_ID_IBM, 0x052f, 1},
++	/* Intel 82855PM host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #195051) */
++	{ PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x4e50,
++	  PCI_VENDOR_ID_IBM, 0x0550, 1},
++	/* Intel 82855PM host bridge / Mobility M7 needs AGPMode 1 */
++	{ PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x4c57,
++	  PCI_VENDOR_ID_IBM, 0x0530, 1},
++	/* Intel 82855PM host bridge / FireGL Mobility T2 RV350 Needs AGPMode 2 (fdo #20647) */
++	{ PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x4e54,
++	 PCI_VENDOR_ID_IBM, 0x054f, 2},
++	/* Intel 82855PM host bridge / Mobility M9+ / VaioPCG-V505DX Needs AGPMode 2 (fdo #17928) */
++	{ PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x5c61,
++	  PCI_VENDOR_ID_SONY, 0x816b, 2},
++  /* Intel 82855PM Processor to I/O Controller / Mobility M9+ Needs AGPMode 8 (phoronix forum) */
++	{ PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x5c61,
++	  PCI_VENDOR_ID_SONY, 0x8195, 8},
++	/* Intel 82830 830 Chipset Host Bridge / Mobility M6 LY Needs AGPMode 2 (fdo #17360)*/
++	{ PCI_VENDOR_ID_INTEL, 0x3575, PCI_VENDOR_ID_ATI, 0x4c59,
++	PCI_VENDOR_ID_DELL, 0x00e3, 2},
++	/* Intel 82852/82855 host bridge / Mobility FireGL 9000 R250 Needs AGPMode 1 (lp #296617) */
++	{ PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4c66,
++	  PCI_VENDOR_ID_DELL, 0x0149, 1},
++	/* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (deb #467460) */
++	{ PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4e50,
++	  0x1025, 0x0061, 1},
++	/* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #203007) */
++	{ PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4e50,
++	  0x1025, 0x0064, 1},
++	/* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #141551) */
++	{ PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4e50,
++	  PCI_VENDOR_ID_ASUSTEK, 0x1942, 1},
++	/* Intel 82852/82855 host bridge / Mobility 9600/9700 Needs AGPMode 1 (deb #510208) */
++	{ PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4e50,
++	  0x10cf, 0x127f, 1},
++	/* ASRock K7VT4A+ AGP 8x / ATI Radeon 9250 AGP Needs AGPMode 4 (lp #133192) */
++	{ 0x1849, 0x3189, PCI_VENDOR_ID_ATI, 0x5960,
++	  0x1787, 0x5960, 4},
++	/* VIA K8M800 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (fdo #12544) */
++	{ PCI_VENDOR_ID_VIA, 0x0204, PCI_VENDOR_ID_ATI, 0x5960,
++	  0x17af, 0x2020, 4},
++	/* VIA KT880 Host Bridge / RV350 [Radeon 9550] Needs AGPMode 4 (fdo #19981) */
++	{ PCI_VENDOR_ID_VIA, 0x0269, PCI_VENDOR_ID_ATI, 0x4153,
++	  PCI_VENDOR_ID_ASUSTEK, 0x003c, 4},
++	/* VIA VT8363 Host Bridge / R200 QL [Radeon 8500] Needs AGPMode 2 (lp #141551) */
++	{ PCI_VENDOR_ID_VIA, 0x0305, PCI_VENDOR_ID_ATI, 0x514c,
++	  PCI_VENDOR_ID_ATI, 0x013a, 2},
++	/* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 (deb #515512) */
++	{ PCI_VENDOR_ID_VIA, 0x0691, PCI_VENDOR_ID_ATI, 0x5960,
++	  PCI_VENDOR_ID_ASUSTEK, 0x004c, 2},
++	/* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 */
++	{ PCI_VENDOR_ID_VIA, 0x0691, PCI_VENDOR_ID_ATI, 0x5960,
++	  PCI_VENDOR_ID_ASUSTEK, 0x0054, 2},
++	/* VIA VT8377 Host Bridge / R200 QM [Radeon 9100] Needs AGPMode 4 (deb #461144) */
++	{ PCI_VENDOR_ID_VIA, 0x3189, PCI_VENDOR_ID_ATI, 0x514d,
++	  0x174b, 0x7149, 4},
++	/* VIA VT8377 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (lp #312693) */
++	{ PCI_VENDOR_ID_VIA, 0x3189, PCI_VENDOR_ID_ATI, 0x5960,
++	  0x1462, 0x0380, 4},
++	/* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (ati ML) */
++	{ PCI_VENDOR_ID_VIA, 0x3189, PCI_VENDOR_ID_ATI, 0x5964,
++	  0x148c, 0x2073, 4},
++	/* ATI Host Bridge / RV280 [M9+] Needs AGPMode 1 (phoronix forum) */
++	{ PCI_VENDOR_ID_ATI, 0xcbb2, PCI_VENDOR_ID_ATI, 0x5c61,
++	  PCI_VENDOR_ID_SONY, 0x8175, 1},
++	/* HP Host Bridge / R300 [FireGL X1] Needs AGPMode 2 (fdo #7770) */
++	{ PCI_VENDOR_ID_HP, 0x122e, PCI_VENDOR_ID_ATI, 0x4e47,
++	  PCI_VENDOR_ID_ATI, 0x0152, 2},
++	{ 0, 0, 0, 0, 0, 0, 0 },
++};
++
 +int radeon_modeset_agp_init(struct drm_device *dev)
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -27691,6 +27912,7 @@
 +	int default_mode;
 +	uint32_t agp_status;
 +	bool is_v3;
++	struct radeon_agpmode_quirk *p = radeon_agpmode_quirk_list;
 +
 +	/* Acquire AGP. */
 +	ret = drm_agp_acquire(dev);
@@ -27718,6 +27940,20 @@
 +		else default_mode = 1;
 +	}
 +
++	/* Apply AGPMode Quirks */
++	while (p && p->chip_device != 0) {
++	    if (info.id_vendor == p->hostbridge_vendor &&
++		info.id_device == p->hostbridge_device &&
++		dev->pdev->vendor == p->chip_vendor &&
++		dev->pdev->device == p->chip_device &&
++		dev->pdev->subsystem_vendor == p->subsys_vendor &&
++		dev->pdev->subsystem_device == p->subsys_device)
++	    {
++		default_mode = p->default_mode;
++	    }
++	    ++p;
++	}
++
 +	if (radeon_agpmode > 0) {
 +		if ((radeon_agpmode < (is_v3 ? 4 : 1)) ||
 +		    (radeon_agpmode > (is_v3 ? 8 : 4)) ||
@@ -28644,9 +28880,18 @@
 +}
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
-index 9836c70..b6f5786 100644
+index 9836c70..d4f0f6f 100644
 --- a/drivers/gpu/drm/radeon/radeon_irq.c
 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
+@@ -129,7 +129,7 @@ void radeon_disable_vblank(struct drm_device *dev, int crtc)
+ 	}
+ }
+ 
+-static inline u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r500_disp_int)
++u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r500_disp_int)
+ {
+ 	u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS);
+ 	u32 irq_mask = RADEON_SW_INT_TEST;
 @@ -154,11 +154,10 @@ static inline u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r
  	} else
  		irq_mask |= RADEON_CRTC_VBLANK_STAT | RADEON_CRTC2_VBLANK_STAT;
@@ -28759,10 +29004,10 @@
  	dev->max_vblank_count = 0x001fffff;
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
 new file mode 100644
-index 0000000..1227471
+index 0000000..93038a7
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
-@@ -0,0 +1,1121 @@
+@@ -0,0 +1,1608 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -29884,6 +30129,493 @@
 +{
 +	drm_crtc_helper_add(&radeon_crtc->base, &legacy_helper_funcs);
 +}
++
++
++typedef union rfixed {
++	uint32_t full;
++} fixed20_12;
++
++#define rfixed_const(A,B) (uint32_t)((A<<12) + ((B + 0.000122)*4096))
++#define rfixed_mul(A,B)  (uint64_t)(A.full*B.full+2048) >> 12
++#define rfixed_div(A,B)   (uint64_t)(((A.full<<13)/B.full)+1)/2
++#define fixed_init(A,B) { .full = rfixed_const(A,B) }
++#define rfixed_trunc(A) (A.full >> 12)
++/* fixed point shift */
++#define R_FIXED_INT_SHIFT 10000
++void radeon_init_disp_bw_legacy(struct drm_device *dev,
++				struct drm_display_mode *mode1,
++				uint32_t pixel_bytes1,
++				struct drm_display_mode *mode2,
++				uint32_t pixel_bytes2)
++	
++{
++#if 0 // GCC ICEs
++	struct drm_radeon_private *dev_priv = dev->dev_private;
++	fixed20_12 trcd_ff, trp_ff, tras_ff, trbs_ff, tcas_ff;
++	fixed20_12 sclk_ff, mclk_ff, sclk_eff_ff, sclk_delay_ff;
++	fixed20_12 peak_disp_bw, mem_bw, pix_clk, pix_clk2, temp_ff, crit_point_ff;
++	uint32_t temp, data, mem_trcd, mem_trp, mem_tras;
++	fixed20_12 memtcas_ff[8] = {
++		fixed_init(1, 0),
++		fixed_init(2, 0),
++		fixed_init(3, 0),
++		fixed_init(0, 0),
++		fixed_init(1, 0.5),
++		fixed_init(2, 0.5),
++		fixed_init(0, 0),
++	};
++	fixed20_12 memtcas_rs480_ff[8] = {
++		fixed_init(0,0),
++		fixed_init(1,0),
++		fixed_init(2,0),
++		fixed_init(3,0),
++		fixed_init(0,0),
++		fixed_init(1,0.5),
++		fixed_init(2,0.5),
++		fixed_init(3,0.5)
++	};
++	fixed20_12 memtcas2_ff[8] = {
++		fixed_init(0,0),
++		fixed_init(1,0),
++		fixed_init(2,0),
++		fixed_init(3,0),
++		fixed_init(4,0),
++		fixed_init(5,0),
++		fixed_init(6,0),
++		fixed_init(7,0),
++	};
++	fixed20_12 memtrbs[8] = {
++		fixed_init(1,0),
++		fixed_init(1,0.5),
++		fixed_init(2,0),
++		fixed_init(2,0.5),
++		fixed_init(3,0),
++		fixed_init(3,0.5),
++		fixed_init(4,0),
++		fixed_init(4,0.5)
++	};
++	fixed20_12 memtrbs_r4xx[8] = {
++		fixed_init(4,0),
++		fixed_init(5,0),
++		fixed_init(6,0),
++		fixed_init(7,0),
++		fixed_init(8,0),
++		fixed_init(9,0),
++		fixed_init(10,0),
++		fixed_init(11,0)
++	};
++	fixed20_12 min_mem_eff = fixed_init(8, 0);
++	fixed20_12 mc_latency_sclk, mc_latency_mclk, k1;
++	fixed20_12 cur_latency_mclk, cur_latency_sclk;
++	fixed20_12 disp_latency, disp_latency_overhead, disp_drain_rate,
++		disp_drain_rate2, read_return_rate;
++	fixed20_12 time_disp1_drop_priority;
++	int c;
++	int cur_size = 16;       /* in octawords */
++	int critical_point = 0, critical_point2;
++//	uint32_t read_return_rate, time_disp1_drop_priority;
++	int stop_req, max_stop_req;
++
++	/* get modes */
++	if ((dev_priv->disp_priority == 2) && radeon_is_r300(dev_priv)) {
++		uint32_t mc_init_misc_lat_timer = RADEON_READ(R300_MC_INIT_MISC_LAT_TIMER);
++		mc_init_misc_lat_timer &= ~(R300_MC_DISP1R_INIT_LAT_MASK << R300_MC_DISP1R_INIT_LAT_SHIFT);
++		mc_init_misc_lat_timer &= ~(R300_MC_DISP0R_INIT_LAT_MASK << R300_MC_DISP0R_INIT_LAT_SHIFT);
++		/* check crtc enables */
++		if (mode2)
++			mc_init_misc_lat_timer |= (1 << R300_MC_DISP1R_INIT_LAT_SHIFT);
++		if (mode1)
++			mc_init_misc_lat_timer |= (1 << R300_MC_DISP0R_INIT_LAT_SHIFT);
++		RADEON_WRITE(R300_MC_INIT_MISC_LAT_TIMER, mc_init_misc_lat_timer);
++	}
++
++	/*
++ 	 * determine is there is enough bw for current mode
++ 	 */
++	mclk_ff.full = rfixed_const(dev_priv->mode_info.mclk, 0);
++	temp_ff.full = rfixed_const(100, 0);
++	mclk_ff.full = rfixed_div(mclk_ff, temp_ff);
++	sclk_ff.full = rfixed_const(dev_priv->mode_info.sclk, 0);
++	sclk_ff.full = rfixed_div(sclk_ff, temp_ff);
++
++	temp = (dev_priv->ram_width / 8) * (dev_priv->is_ddr ? 2 : 1);
++	temp_ff.full = rfixed_const(temp, 0);
++	mem_bw.full = rfixed_mul(mclk_ff, temp_ff);
++
++	pix_clk.full = 0;
++	pix_clk2.full = 0;
++	peak_disp_bw.full = 0;
++	if (mode1) {
++		pix_clk.full = rfixed_const(mode1->clock, 0); /* convert to fixed point */
++		temp_ff.full = rfixed_const(pixel_bytes1, 0);
++		peak_disp_bw.full += rfixed_mul(pix_clk, temp_ff);
++	}
++	if (mode2) {
++		pix_clk2.full = rfixed_const(mode2->clock, 0); /* convert to fixed point */
++		temp_ff.full = rfixed_const(pixel_bytes2, 0);
++		peak_disp_bw.full += rfixed_mul(pix_clk, temp_ff);
++	}
++
++	mem_bw.full = rfixed_mul(mem_bw, min_mem_eff);
++	if (peak_disp_bw.full >= mem_bw.full) {
++		DRM_ERROR("You may not have enough display bandwidth for current mode\n"
++			  "If you have flickering problem, try to lower resolution, refresh rate, or color depth\n");
++	}
++
++	/*  Get values from the EXT_MEM_CNTL register...converting its contents. */
++	temp = RADEON_READ(RADEON_MEM_TIMING_CNTL);
++	if ((dev_priv->chip_family == CHIP_RV100) || (dev_priv->flags & RADEON_IS_IGP)) { /* RV100, M6, IGPs */
++		mem_trcd = ((temp >> 2) & 0x3) + 1;
++		mem_trp  = ((temp & 0x3)) + 1;
++		mem_tras = ((temp & 0x70) >> 4) + 1;
++	} else if (dev_priv->chip_family == CHIP_R300 || 
++		   dev_priv->chip_family == CHIP_R350) { /* r300, r350 */
++		mem_trcd = (temp & 0x7) + 1;
++		mem_trp = ((temp >> 8) & 0x7) + 1;
++		mem_tras = ((temp >> 11) & 0xf) + 4;
++	} else if (dev_priv->chip_family == CHIP_RV350 ||
++		   dev_priv->chip_family <= CHIP_RV380) {
++		/* rv3x0 */
++		mem_trcd = (temp & 0x7) + 3;
++		mem_trp = ((temp >> 8) & 0x7) + 3;
++		mem_tras = ((temp >> 11) & 0xf) + 6;
++	} else if (dev_priv->chip_family == CHIP_R420 ||
++		   dev_priv->chip_family == CHIP_R423 ||
++		   dev_priv->chip_family == CHIP_RV410) {
++		/* r4xx */
++		mem_trcd = (temp & 0xf) + 3;
++		if (mem_trcd > 15)
++			mem_trcd = 15;
++		mem_trp = ((temp >> 8) & 0xf) + 3;
++		if (mem_trp > 15)
++			mem_trp = 15;
++		mem_tras = ((temp >> 12) & 0x1f) + 6;
++		if (mem_tras > 31)
++			mem_tras = 31;
++	} else { /* RV200, R200 */
++		mem_trcd = (temp & 0x7) + 1;
++		mem_trp = ((temp >> 8) & 0x7) + 1;
++		mem_tras = ((temp >> 12) & 0xf) + 4;
++	}
++	/* convert to FF */
++	trcd_ff.full = rfixed_const(mem_trcd, 0);
++	trp_ff.full = rfixed_const(mem_trp, 0);
++	tras_ff.full = rfixed_const(mem_tras, 0);
++
++	/* Get values from the MEM_SDRAM_MODE_REG register...converting its */
++	temp = RADEON_READ(RADEON_MEM_SDRAM_MODE_REG);
++	data = (temp & (7 << 20)) >> 20;
++	if ((dev_priv->chip_family == CHIP_RV100) || dev_priv->flags & RADEON_IS_IGP) {
++		if (dev_priv->chip_family == CHIP_RS480) /* don't think rs400 */
++			tcas_ff = memtcas_rs480_ff[data];
++		else
++			tcas_ff = memtcas_ff[data];
++	} else
++		tcas_ff = memtcas2_ff[data];
++
++	if (dev_priv->chip_family == CHIP_RS400 ||
++	    dev_priv->chip_family == CHIP_RS480) {
++		/* extra cas latency stored in bits 23-25 0-4 clocks */
++		data = (temp >> 23) & 0x7;
++		if (data < 5)
++			tcas_ff.full += rfixed_const(data, 0);
++	}
++	
++	if (radeon_is_r300(dev_priv) && !(dev_priv->flags & RADEON_IS_IGP)) {
++		/* on the R300, Tcas is included in Trbs.
++		 */
++		temp = RADEON_READ(RADEON_MEM_CNTL);
++		data = (R300_MEM_NUM_CHANNELS_MASK & temp);
++		if (data == 1) {
++			if (R300_MEM_USE_CD_CH_ONLY & temp) {
++				temp = RADEON_READ(R300_MC_IND_INDEX);
++				temp &= ~R300_MC_IND_ADDR_MASK;
++				temp |= R300_MC_READ_CNTL_CD_mcind;
++				RADEON_WRITE(R300_MC_IND_INDEX, temp);
++				temp = RADEON_READ(R300_MC_IND_DATA);
++				data = (R300_MEM_RBS_POSITION_C_MASK & temp);
++			} else {
++				temp = RADEON_READ(R300_MC_READ_CNTL_AB);
++				data = (R300_MEM_RBS_POSITION_A_MASK & temp);
++			}
++		} else {
++			temp = RADEON_READ(R300_MC_READ_CNTL_AB);
++			data = (R300_MEM_RBS_POSITION_A_MASK & temp);
++		}
++		if (dev_priv->chip_family == CHIP_RV410 ||
++		    dev_priv->chip_family == CHIP_R420 ||
++		    dev_priv->chip_family == CHIP_R423)
++			trbs_ff = memtrbs_r4xx[data];
++		else
++			trbs_ff = memtrbs[data];
++		tcas_ff.full += trbs_ff.full;
++	}
++
++	sclk_eff_ff.full = sclk_ff.full;
++	
++	if (dev_priv->flags & RADEON_IS_AGP) {
++		fixed20_12 agpmode_ff;
++		agpmode_ff.full = rfixed_const(radeon_agpmode, 0);
++		temp_ff.full = rfixed_const(16, 0.6666);
++		sclk_eff_ff.full -= rfixed_mul(agpmode_ff, temp_ff);
++	}
++	/* TODO PCIE lanes may affect this - agpmode == 16?? */
++	
++	if (radeon_is_r300(dev_priv)) {
++		sclk_delay_ff.full = rfixed_const(250, 0);;
++	} else {
++		if ((dev_priv->chip_family == CHIP_RV100) ||
++		    dev_priv->flags & RADEON_IS_IGP) {
++			if (dev_priv->is_ddr)
++				sclk_delay_ff.full = rfixed_const(41, 0);
++			else
++				sclk_delay_ff.full = rfixed_const(33, 0);
++		} else {
++			if (dev_priv->ram_width == 128)
++				sclk_delay_ff.full = rfixed_const(57, 0);
++			else
++				sclk_delay_ff.full = rfixed_const(41, 0);
++		}
++	}
++
++	mc_latency_sclk.full = rfixed_div(sclk_delay_ff, sclk_eff_ff);
++
++	if (dev_priv->is_ddr) {
++		if (dev_priv->ram_width == 32) {
++			k1.full = rfixed_const(40, 0);
++			c  = 3;
++		} else {
++			k1.full = rfixed_const(20, 0);
++			c  = 1;
++		}
++	} else {
++		k1.full = rfixed_const(40, 0);
++		c  = 3;
++	}
++
++	temp_ff.full = rfixed_const(2, 0);
++	mc_latency_mclk.full = rfixed_mul(trcd_ff, temp_ff);
++	temp_ff.full = rfixed_const(c, 0);
++	mc_latency_mclk.full += rfixed_mul(tcas_ff, temp_ff);
++	temp_ff.full = rfixed_const(4, 0);
++	mc_latency_mclk.full += rfixed_mul(tras_ff, temp_ff);
++	mc_latency_mclk.full += rfixed_mul(trp_ff, temp_ff);
++	mc_latency_mclk.full += k1.full;
++	
++	mc_latency_mclk.full = rfixed_div(mc_latency_mclk, mclk_ff);
++	mc_latency_mclk.full += rfixed_div(temp_ff, sclk_eff_ff);
++
++	/*
++	  HW cursor time assuming worst case of full size colour cursor.
++	*/
++	temp_ff.full = rfixed_const((2 * (cur_size - (dev_priv->is_ddr + 1))), 0);
++	temp_ff.full += trcd_ff.full;
++	if (temp_ff.full < tras_ff.full)
++		temp_ff.full = tras_ff.full;
++	cur_latency_mclk.full = rfixed_div(temp_ff, mclk_ff);
++
++	temp_ff.full = rfixed_const(cur_size, 0);
++	cur_latency_sclk.full = rfixed_div(temp_ff, sclk_eff_ff);
++	/*
++	  Find the total latency for the display data.
++	*/
++	disp_latency_overhead.full = rfixed_const(80, 0);
++	disp_latency_overhead.full = rfixed_div(disp_latency_overhead, sclk_ff);
++	mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full;
++	mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full;
++
++	if (mc_latency_mclk.full > mc_latency_sclk.full)
++		disp_latency.full = mc_latency_mclk.full;
++	else
++		disp_latency.full = mc_latency_sclk.full;
++
++	/* setup Max GRPH_STOP_REQ default value */
++	if (radeon_is_rv100(dev_priv))
++		max_stop_req = 0x5c;
++	else
++		max_stop_req = 0x7c;
++
++	if (mode1) {
++		/*  CRTC1
++		    Set GRPH_BUFFER_CNTL register using h/w defined optimal values.
++		    GRPH_STOP_REQ <= MIN[ 0x7C, (CRTC_H_DISP + 1) * (bit depth) / 0x10 ]
++		*/
++		stop_req = mode1->hdisplay * pixel_bytes1 / 16;
++
++		if (stop_req > max_stop_req)
++			stop_req = max_stop_req;
++
++		/*
++		  Find the drain rate of the display buffer.
++		*/
++		temp_ff.full = rfixed_const((16/pixel_bytes1), 0);
++		disp_drain_rate.full = rfixed_div(pix_clk, temp_ff);
++
++		/*
++		  Find the critical point of the display buffer.
++		*/
++		crit_point_ff.full = rfixed_mul(disp_drain_rate, disp_latency);
++		crit_point_ff.full += rfixed_const(0, 0.5);
++		
++		critical_point = rfixed_trunc(crit_point_ff);
++
++		if (dev_priv->disp_priority == 2) {
++			critical_point = 0;
++		}
++
++		/*
++		  The critical point should never be above max_stop_req-4.  Setting
++		  GRPH_CRITICAL_CNTL = 0 will thus force high priority all the time.
++		*/
++		if (max_stop_req - critical_point < 4)
++			critical_point = 0;
++		
++		if (critical_point == 0 && mode2 && dev_priv->chip_family == CHIP_R300) {
++			/* some R300 cards have problem with this set to 0, when CRTC2 is enabled.*/
++			critical_point = 0x10;
++		}
++
++		temp = RADEON_READ(RADEON_GRPH_BUFFER_CNTL);
++		temp &= ~(RADEON_GRPH_STOP_REQ_MASK);
++		temp |= (stop_req << RADEON_GRPH_STOP_REQ_SHIFT);
++		temp &= ~(RADEON_GRPH_START_REQ_MASK);
++		if ((dev_priv->chip_family == CHIP_R350) &&
++		    (stop_req > 0x15)) {
++			stop_req -= 0x10;
++		}
++		temp |= (stop_req << RADEON_GRPH_START_REQ_SHIFT);
++		temp |= RADEON_GRPH_BUFFER_SIZE;
++		temp &= ~(RADEON_GRPH_CRITICAL_CNTL   |
++			  RADEON_GRPH_CRITICAL_AT_SOF |
++			  RADEON_GRPH_STOP_CNTL);
++		/*
++		  Write the result into the register.
++		*/
++		RADEON_WRITE(RADEON_GRPH_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
++						       (critical_point << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
++		
++#if 0
++		if ((dev_priv->chip_family == CHIP_RS400) ||
++		    (dev_priv->chip_family == CHIP_RS480)) {
++			/* attempt to program RS400 disp regs correctly ??? */
++			temp = RADEON_READ(RS400_DISP1_REG_CNTL);
++			temp &= ~(RS400_DISP1_START_REQ_LEVEL_MASK |
++				  RS400_DISP1_STOP_REQ_LEVEL_MASK);
++			RADEON_WRITE(RS400_DISP1_REQ_CNTL1, (temp |
++						       (critical_point << RS400_DISP1_START_REQ_LEVEL_SHIFT) |
++						       (critical_point << RS400_DISP1_STOP_REQ_LEVEL_SHIFT)));
++			temp = RADEON_READ(RS400_DMIF_MEM_CNTL1);
++			temp &= ~(RS400_DISP1_CRITICAL_POINT_START_MASK |
++				  RS400_DISP1_CRITICAL_POINT_STOP_MASK);
++			RADEON_WRITE(RS400_DMIF_MEM_CNTL1, (temp |
++						      (critical_point << RS400_DISP1_CRITICAL_POINT_START_SHIFT) |
++						      (critical_point << RS400_DISP1_CRITICAL_POINT_STOP_SHIFT)));
++		}
++#endif
++		
++		DRM_DEBUG("GRPH_BUFFER_CNTL from to %x\n",
++			  //	  (unsigned int)info->SavedReg->grph_buffer_cntl,
++			  (unsigned int)RADEON_READ(RADEON_GRPH_BUFFER_CNTL));
++	}
++
++	if (mode2) {
++		stop_req = mode2->hdisplay * pixel_bytes2 / 16;
++		
++		if (stop_req > max_stop_req)
++			stop_req = max_stop_req;
++		
++		/*
++		  Find the drain rate of the display buffer.
++		*/
++		temp_ff.full = rfixed_const((16/pixel_bytes2), 0);
++		disp_drain_rate2.full = rfixed_div(pix_clk2, temp_ff);
++
++		temp = RADEON_READ(RADEON_GRPH2_BUFFER_CNTL);
++		temp &= ~(RADEON_GRPH_STOP_REQ_MASK);
++		temp |= (stop_req << RADEON_GRPH_STOP_REQ_SHIFT);
++		temp &= ~(RADEON_GRPH_START_REQ_MASK);
++		if ((dev_priv->chip_family == CHIP_R350) &&
++		    (stop_req > 0x15)) {
++			stop_req -= 0x10;
++		}
++		temp |= (stop_req << RADEON_GRPH_START_REQ_SHIFT);
++		temp |= RADEON_GRPH_BUFFER_SIZE;
++		temp &= ~(RADEON_GRPH_CRITICAL_CNTL   |
++			  RADEON_GRPH_CRITICAL_AT_SOF |
++			  RADEON_GRPH_STOP_CNTL);
++		
++		if ((dev_priv->chip_family == CHIP_RS100) ||
++		    (dev_priv->chip_family == CHIP_RS200))
++			critical_point2 = 0;
++		else {
++			temp = (dev_priv->ram_width * dev_priv->is_ddr + 1)/128;
++			temp_ff.full = rfixed_const(temp, 0);
++			temp_ff.full = rfixed_mul(mclk_ff, temp_ff);
++			if (sclk_ff.full < temp_ff.full)
++				temp_ff.full = sclk_ff.full;
++			
++			read_return_rate.full = temp_ff.full;
++
++			if (mode1) {
++				temp_ff.full = read_return_rate.full - disp_drain_rate.full;
++				time_disp1_drop_priority.full = rfixed_div(crit_point_ff, temp_ff);
++		        } else
++				time_disp1_drop_priority.full = 0;
++
++			crit_point_ff.full = disp_latency.full + time_disp1_drop_priority.full + disp_latency.full;
++			crit_point_ff.full = rfixed_mul(crit_point_ff, disp_drain_rate2);
++			crit_point_ff.full += rfixed_const(0, 0.5);
++		
++			critical_point2 = rfixed_trunc(crit_point_ff);
++			
++			if (dev_priv->disp_priority == 2) {
++				critical_point2 = 0;
++			}
++			
++			if (max_stop_req - critical_point2 < 4)
++				critical_point2 = 0;
++			
++		}
++		
++		if (critical_point2 == 0 && dev_priv->chip_family == CHIP_R300) {
++			/* some R300 cards have problem with this set to 0 */
++			critical_point2 = 0x10;
++		}
++		
++		RADEON_WRITE(RADEON_GRPH2_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
++						  (critical_point2 << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
++		
++		if ((dev_priv->chip_family == CHIP_RS400) ||
++		    (dev_priv->chip_family == CHIP_RS480)) {
++#if 0
++			/* attempt to program RS400 disp2 regs correctly ??? */
++			temp = RADEON_READ(RS400_DISP2_REQ_CNTL1);
++			temp &= ~(RS400_DISP2_START_REQ_LEVEL_MASK |
++				  RS400_DISP2_STOP_REQ_LEVEL_MASK);
++			RADEON_WRITE(RS400_DISP2_REQ_CNTL1, (temp |
++						       (critical_point2 << RS400_DISP1_START_REQ_LEVEL_SHIFT) |
++						       (critical_point2 << RS400_DISP1_STOP_REQ_LEVEL_SHIFT)));
++			temp = RADEON_READ(RS400_DISP2_REQ_CNTL2);
++			temp &= ~(RS400_DISP2_CRITICAL_POINT_START_MASK |
++				  RS400_DISP2_CRITICAL_POINT_STOP_MASK);
++			RADEON_WRITE(RS400_DISP2_REQ_CNTL2, (temp |
++						       (critical_point2 << RS400_DISP2_CRITICAL_POINT_START_SHIFT) |
++						       (critical_point2 << RS400_DISP2_CRITICAL_POINT_STOP_SHIFT)));
++#endif
++			RADEON_WRITE(RS400_DISP2_REQ_CNTL1, 0x105DC1CC);
++			RADEON_WRITE(RS400_DISP2_REQ_CNTL2, 0x2749D000);
++			RADEON_WRITE(RS400_DMIF_MEM_CNTL1,  0x29CA71DC);
++			RADEON_WRITE(RS400_DISP1_REQ_CNTL1, 0x28FBC3AC);
++		}
++		
++		DRM_DEBUG("GRPH2_BUFFER_CNTL from to %x\n",
++//			  (unsigned int)info->SavedReg->grph2_buffer_cntl,
++			  (unsigned int)RADEON_READ(RADEON_GRPH2_BUFFER_CNTL));
++	}
++#endif
++}
++
++
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
 new file mode 100644
 index 0000000..175397c
@@ -31189,10 +31921,10 @@
  
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..963859c
+index 0000000..f2ac719
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -0,0 +1,388 @@
+@@ -0,0 +1,393 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -31580,13 +32312,18 @@
 +void radeon_combios_asic_init(struct drm_device *dev);
 +extern int radeon_static_clocks_init(struct drm_device *dev);
 +
++void radeon_init_disp_bw_legacy(struct drm_device *dev,
++				struct drm_display_mode *mode1,
++				uint32_t pixel_bytes1,
++				struct drm_display_mode *mode2,
++				uint32_t pixel_bytes2);
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
 new file mode 100644
-index 0000000..0d2f4a5
+index 0000000..5a57056
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_pm.c
-@@ -0,0 +1,258 @@
+@@ -0,0 +1,263 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -31668,6 +32405,11 @@
 +		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
 +	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
 +
++	{
++		u32 irq_temp;
++		radeon_acknowledge_irqs(dev_priv, &irq_temp);
++	}
++
 +	if (dev_priv->flags & RADEON_IS_PCIE) {
 +		memcpy_fromio(dev_priv->mm.pcie_table_backup, dev_priv->mm.pcie_table.kmap.virtual, dev_priv->gart_info.table_size);
 +	}
@@ -31847,10 +32589,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
 new file mode 100644
-index 0000000..0edb592
+index 0000000..7daff2c
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_reg.h
-@@ -0,0 +1,5344 @@
+@@ -0,0 +1,5348 @@
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
@@ -32943,6 +33685,10 @@
 +#define RADEON_OV0_BASE_ADDR                0x43c
 +#define RADEON_NB_TOM                       0x15c
 +#define R300_MC_INIT_MISC_LAT_TIMER         0x180
++#       define R300_MC_DISP0R_INIT_LAT_SHIFT 8
++#       define R300_MC_DISP0R_INIT_LAT_MASK  0xf
++#       define R300_MC_DISP1R_INIT_LAT_SHIFT 12
++#       define R300_MC_DISP1R_INIT_LAT_MASK  0xf
 +#define RADEON_MCLK_CNTL                    0x0012 /* PLL */
 +#       define RADEON_FORCEON_MCLKA         (1 << 16)
 +#       define RADEON_FORCEON_MCLKB         (1 << 17)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1534
retrieving revision 1.1535
diff -u -r1.1534 -r1.1535
--- kernel.spec	13 Apr 2009 21:28:27 -0000	1.1534
+++ kernel.spec	14 Apr 2009 06:04:14 -0000	1.1535
@@ -1932,6 +1932,9 @@
 # and build.
 
 %changelog
+* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-73
+- drm-modesetting-radeon.patch: more bug fixes
+
 * Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix oops in md raid1 resync (#495550)
 



From ondrejj at fedoraproject.org  Tue Apr 14 06:06:30 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 14 Apr 2009 06:06:30 +0000 (UTC)
Subject: rpms/aspell-sk/devel aspell-sk.spec,1.6,1.7 import.log,1.2,1.3
Message-ID: <20090414060630.3E04670127@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24701/devel

Modified Files:
	aspell-sk.spec import.log 
Log Message:
Update upstream.


Index: aspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/aspell-sk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-sk.spec	14 Apr 2009 05:59:18 -0000	1.6
+++ aspell-sk.spec	14 Apr 2009 06:05:58 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           aspell-%{lang}
 Version:        2.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Slovak dictionaries for Aspell
 
 Group:          Applications/Text
@@ -48,7 +48,7 @@
 
 
 %changelog
-* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.01-1
+* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.01-2
 - update upstream
 
 * Thu Nov 1 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-3


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Apr 2009 06:04:35 -0000	1.2
+++ import.log	14 Apr 2009 06:05:58 -0000	1.3
@@ -1,2 +1,3 @@
 aspell-sk-2_01-1_fc10:HEAD:aspell-sk-2.01-1.fc10.src.rpm:1239688447
 aspell-sk-2_01-1_fc10:HEAD:aspell-sk-2.01-1.fc10.src.rpm:1239689046
+aspell-sk-2_01-2_fc10:HEAD:aspell-sk-2.01-2.fc10.src.rpm:1239689079



From ondrejj at fedoraproject.org  Tue Apr 14 06:14:45 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 14 Apr 2009 06:14:45 +0000 (UTC)
Subject: rpms/aspell-sk/F-10 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 aspell-sk.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090414061445.705D5700B2@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28215/F-10

Modified Files:
	.cvsignore aspell-sk.spec sources 
Added Files:
	import.log 
Log Message:
Update upstream.


--- NEW FILE import.log ---
aspell-sk-2_01-2_fc10:F-10:aspell-sk-2.01-2.fc10.src.rpm:1239689634


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2007 06:49:07 -0000	1.3
+++ .cvsignore	14 Apr 2009 06:14:14 -0000	1.4
@@ -1 +1 @@
-aspell6-sk-2.00-0.tar.bz2
+aspell6-sk-2.01-2.tar.bz2


Index: aspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-10/aspell-sk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-sk.spec	9 Feb 2008 09:06:19 -0000	1.3
+++ aspell-sk.spec	14 Apr 2009 06:14:14 -0000	1.4
@@ -1,11 +1,11 @@
 %define aspellversion 6
 %define lang sk
-%define langrelease 0
+%define langrelease 2
 %define aspellname aspell%{aspellversion}-%{lang}
 
 Name:           aspell-%{lang}
-Version:        2.00
-Release:        4%{?dist}
+Version:        2.01
+Release:        2%{?dist}
 Summary:        Slovak dictionaries for Aspell
 
 Group:          Applications/Text
@@ -48,8 +48,8 @@
 
 
 %changelog
-* Sat Feb 9 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-4
-- rebuild against gcc4.3
+* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.01-2
+- update upstream
 
 * Thu Nov 1 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-3
 - update upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2007 06:49:07 -0000	1.3
+++ sources	14 Apr 2009 06:14:15 -0000	1.4
@@ -1 +1 @@
-b7ac2b1cb31bad0cd676c1027fa46dc4  aspell6-sk-2.00-0.tar.bz2
+b31bdc33a681902e5bc493a0692022a9  aspell6-sk-2.01-2.tar.bz2



From bagnara at fedoraproject.org  Tue Apr 14 06:14:59 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 06:14:59 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.10.1-Makefile.patch, NONE, 1.1 ppl.hh, 1.1,
	1.2 ppl.spec, 1.27, 1.28 ppl_c.h, 1.1, 1.2 pwl.hh, 1.1, 1.2
Message-ID: <20090414061459.6480F700B2@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28289

Modified Files:
	ppl.hh ppl.spec ppl_c.h pwl.hh 
Added Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.1.


ppl-0.10.1-Makefile.patch:

--- NEW FILE ppl-0.10.1-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl.hh	9 Jan 2008 10:47:16 -0000	1.1
+++ ppl.hh	14 Apr 2009 06:14:28 -0000	1.2
@@ -1,5 +1,5 @@
 /* This is the header file switcher of the Parma Polyhedra Library.
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Polyhedra Library (PPL).
 


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ppl.spec	29 Mar 2009 14:42:33 -0000	1.27
+++ ppl.spec	14 Apr 2009 06:14:28 -0000	1.28
@@ -1,8 +1,8 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10
-Release:        11%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -12,8 +12,8 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-Patch0:         ppl-0.10-bigendian.patch
-Patch1:         ppl-0.10-configure.patch
+Patch0:         ppl-0.10.1-Makefile.patch
+#Patch1:
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -199,7 +199,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -392,9 +392,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/pwl/fdl.*
 %doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.ps.gz
 %doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.pdf
-%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.5-html/
-%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.5.pdf
-%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.5.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7-html/
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.ps.gz
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -405,6 +405,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
+- Updated for PPL 0.10.1.
+
 * Sun Mar 29 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-11
 - Moved changelogs and PostScript and PDF versions of the GPL to the
   `docs' subpackages. This saves considerable space on the live media.


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl_c.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl_c.h	9 Jan 2008 10:47:16 -0000	1.1
+++ ppl_c.h	14 Apr 2009 06:14:28 -0000	1.2
@@ -1,5 +1,5 @@
 /* Header file switcher for the C interface.  -*- C -*-
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Polyhedra Library (PPL).
 


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/pwl.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pwl.hh	9 Jan 2008 10:47:16 -0000	1.1
+++ pwl.hh	14 Apr 2009 06:14:29 -0000	1.2
@@ -1,5 +1,5 @@
 /* This is the header file switcher of the Parma Watchdog Library.
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Watchdog Library (PWL).
 



From ondrejj at fedoraproject.org  Tue Apr 14 06:16:36 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 14 Apr 2009 06:16:36 +0000 (UTC)
Subject: rpms/aspell-sk/F-9 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 aspell-sk.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090414061636.DF218700B2@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28937/F-9

Modified Files:
	.cvsignore aspell-sk.spec sources 
Added Files:
	import.log 
Log Message:
Update upstream.


--- NEW FILE import.log ---
aspell-sk-2_01-2_fc10:F-9:aspell-sk-2.01-2.fc10.src.rpm:1239689744


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2007 06:49:07 -0000	1.3
+++ .cvsignore	14 Apr 2009 06:16:06 -0000	1.4
@@ -1 +1 @@
-aspell6-sk-2.00-0.tar.bz2
+aspell6-sk-2.01-2.tar.bz2


Index: aspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-9/aspell-sk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-sk.spec	9 Feb 2008 09:06:19 -0000	1.3
+++ aspell-sk.spec	14 Apr 2009 06:16:06 -0000	1.4
@@ -1,11 +1,11 @@
 %define aspellversion 6
 %define lang sk
-%define langrelease 0
+%define langrelease 2
 %define aspellname aspell%{aspellversion}-%{lang}
 
 Name:           aspell-%{lang}
-Version:        2.00
-Release:        4%{?dist}
+Version:        2.01
+Release:        2%{?dist}
 Summary:        Slovak dictionaries for Aspell
 
 Group:          Applications/Text
@@ -48,8 +48,8 @@
 
 
 %changelog
-* Sat Feb 9 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-4
-- rebuild against gcc4.3
+* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.01-2
+- update upstream
 
 * Thu Nov 1 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-3
 - update upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2007 06:49:07 -0000	1.3
+++ sources	14 Apr 2009 06:16:06 -0000	1.4
@@ -1 +1 @@
-b7ac2b1cb31bad0cd676c1027fa46dc4  aspell6-sk-2.00-0.tar.bz2
+b31bdc33a681902e5bc493a0692022a9  aspell6-sk-2.01-2.tar.bz2



From ondrejj at fedoraproject.org  Tue Apr 14 06:18:23 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 14 Apr 2009 06:18:23 +0000 (UTC)
Subject: rpms/aspell-sk/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 aspell-sk.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090414061823.3CD34700B2@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29660/EL-5

Modified Files:
	.cvsignore aspell-sk.spec sources 
Added Files:
	import.log 
Log Message:
Update upstream.


--- NEW FILE import.log ---
aspell-sk-2_01-2_fc10:EL-5:aspell-sk-2.01-2.fc10.src.rpm:1239689848


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Nov 2007 06:51:12 -0000	1.2
+++ .cvsignore	14 Apr 2009 06:17:51 -0000	1.3
@@ -1 +1 @@
-aspell6-sk-2.00-0.tar.bz2
+aspell6-sk-2.01-2.tar.bz2


Index: aspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-5/aspell-sk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-sk.spec	16 Nov 2007 06:51:12 -0000	1.2
+++ aspell-sk.spec	14 Apr 2009 06:17:51 -0000	1.3
@@ -1,11 +1,11 @@
 %define aspellversion 6
 %define lang sk
-%define langrelease 0
+%define langrelease 2
 %define aspellname aspell%{aspellversion}-%{lang}
 
 Name:           aspell-%{lang}
-Version:        2.00
-Release:        3%{?dist}
+Version:        2.01
+Release:        2%{?dist}
 Summary:        Slovak dictionaries for Aspell
 
 Group:          Applications/Text
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.01-2
+- update upstream
+
 * Thu Nov 1 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.00-3
 - update upstream
 - updated license to upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2007 06:51:12 -0000	1.3
+++ sources	14 Apr 2009 06:17:52 -0000	1.4
@@ -1 +1 @@
-b7ac2b1cb31bad0cd676c1027fa46dc4  aspell6-sk-2.00-0.tar.bz2
+b31bdc33a681902e5bc493a0692022a9  aspell6-sk-2.01-2.tar.bz2



From bagnara at fedoraproject.org  Tue Apr 14 06:22:32 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 06:22:32 +0000 (UTC)
Subject: rpms/ppl/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090414062232.25D33700B2@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31393

Modified Files:
	.cvsignore sources 
Log Message:
Updated for the PPL 0.10.1 sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Nov 2008 13:11:56 -0000	1.3
+++ .cvsignore	14 Apr 2009 06:22:30 -0000	1.4
@@ -1 +1 @@
-ppl-0.10.tar.gz
+ppl-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Nov 2008 13:11:56 -0000	1.3
+++ sources	14 Apr 2009 06:22:31 -0000	1.4
@@ -1 +1 @@
-610a60c9bda8a36bd41f90b732f906b3  ppl-0.10.tar.gz
+327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz



From athimm at fedoraproject.org  Tue Apr 14 06:40:26 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 06:40:26 +0000 (UTC)
Subject: rpms/fakeroot/F-9 .cvsignore, 1.7, 1.8 fakeroot.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20090414064027.1A73670137@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fakeroot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4894/F-9

Modified Files:
	.cvsignore fakeroot.spec sources 
Log Message:
Update to 1.12.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fakeroot/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Dec 2008 21:14:52 -0000	1.7
+++ .cvsignore	14 Apr 2009 06:39:55 -0000	1.8
@@ -1 +1 @@
-fakeroot_1.11.tar.gz
+fakeroot_1.12.2.tar.gz


Index: fakeroot.spec
===================================================================
RCS file: /cvs/extras/rpms/fakeroot/F-9/fakeroot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fakeroot.spec	21 Dec 2008 21:14:52 -0000	1.7
+++ fakeroot.spec	14 Apr 2009 06:39:55 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Gives a fake root environment
 Name: fakeroot
-Version: 1.11
-Release: 19%{?dist}
+Version: 1.12.2
+Release: 21%{?dist}
 License: GPL+
 Group: Development/Tools
 URL: http://fakeroot.alioth.debian.org/
@@ -14,6 +14,7 @@
 #BuildRequires: po4a
 BuildRequires: sharutils
 Requires: /usr/bin/getopt
+Requires: fakeroot-libs = %{version}-%{release}
 
 %description
 fakeroot runs a command in an environment wherein it appears to have
@@ -22,6 +23,13 @@
 that simulate the effect the real library functions would have had,
 had the user really been root.
 
+%package libs
+Summary: Gives a fake root environment (libraries)
+Group: Development/Tools
+
+%description libs
+This package contains the libraries required by %{name}.
+
 %prep
 %setup -q
 #patch0 -p1 -b .atfixes
@@ -89,11 +97,22 @@
 %lang(sv) %{_mandir}/sv/man1/fakeroot-*.1*
 %lang(nl) %{_mandir}/nl/man1/faked-*.1*
 %lang(nl) %{_mandir}/nl/man1/fakeroot-*.1*
+
+%files libs
 %dir %{_libdir}/libfakeroot
 %{_libdir}/libfakeroot/libfakeroot-*.so
 %{_libdir}/libfakeroot/libfakeroot-0.so
 
 %changelog
+* Sun Mar 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.2-21
+- Update to 1.12.2.
+- Create a fakeroot-libs subpackage so that the package is multilib
+  aware (by Richard W.M. Jones <rjones at redhat.com>, see RH bug
+  #490953).
+
+* Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.1-20
+- Update to 1.12.1.
+
 * Sat Nov 22 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.11-19
 - Update to 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fakeroot/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Dec 2008 21:14:52 -0000	1.7
+++ sources	14 Apr 2009 06:39:55 -0000	1.8
@@ -1 +1 @@
-b95de26a01338eec7a9b372d0fb24507  fakeroot_1.11.tar.gz
+1eb7d972a19159035892e7d132602726  fakeroot_1.12.2.tar.gz



From athimm at fedoraproject.org  Tue Apr 14 06:40:26 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 06:40:26 +0000 (UTC)
Subject: rpms/fakeroot/F-10 .cvsignore, 1.7, 1.8 fakeroot.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20090414064027.2246670138@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fakeroot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4894/F-10

Modified Files:
	.cvsignore fakeroot.spec sources 
Log Message:
Update to 1.12.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fakeroot/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Dec 2008 21:14:49 -0000	1.7
+++ .cvsignore	14 Apr 2009 06:39:54 -0000	1.8
@@ -1 +1 @@
-fakeroot_1.11.tar.gz
+fakeroot_1.12.2.tar.gz


Index: fakeroot.spec
===================================================================
RCS file: /cvs/extras/rpms/fakeroot/F-10/fakeroot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fakeroot.spec	21 Dec 2008 21:14:49 -0000	1.8
+++ fakeroot.spec	14 Apr 2009 06:39:54 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Gives a fake root environment
 Name: fakeroot
-Version: 1.11
-Release: 19%{?dist}
+Version: 1.12.2
+Release: 21%{?dist}
 License: GPL+
 Group: Development/Tools
 URL: http://fakeroot.alioth.debian.org/
@@ -14,6 +14,7 @@
 #BuildRequires: po4a
 BuildRequires: sharutils
 Requires: /usr/bin/getopt
+Requires: fakeroot-libs = %{version}-%{release}
 
 %description
 fakeroot runs a command in an environment wherein it appears to have
@@ -22,6 +23,13 @@
 that simulate the effect the real library functions would have had,
 had the user really been root.
 
+%package libs
+Summary: Gives a fake root environment (libraries)
+Group: Development/Tools
+
+%description libs
+This package contains the libraries required by %{name}.
+
 %prep
 %setup -q
 #patch0 -p1 -b .atfixes
@@ -89,11 +97,22 @@
 %lang(sv) %{_mandir}/sv/man1/fakeroot-*.1*
 %lang(nl) %{_mandir}/nl/man1/faked-*.1*
 %lang(nl) %{_mandir}/nl/man1/fakeroot-*.1*
+
+%files libs
 %dir %{_libdir}/libfakeroot
 %{_libdir}/libfakeroot/libfakeroot-*.so
 %{_libdir}/libfakeroot/libfakeroot-0.so
 
 %changelog
+* Sun Mar 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.2-21
+- Update to 1.12.2.
+- Create a fakeroot-libs subpackage so that the package is multilib
+  aware (by Richard W.M. Jones <rjones at redhat.com>, see RH bug
+  #490953).
+
+* Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.1-20
+- Update to 1.12.1.
+
 * Sat Nov 22 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.11-19
 - Update to 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fakeroot/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Dec 2008 21:14:49 -0000	1.7
+++ sources	14 Apr 2009 06:39:54 -0000	1.8
@@ -1 +1 @@
-b95de26a01338eec7a9b372d0fb24507  fakeroot_1.11.tar.gz
+1eb7d972a19159035892e7d132602726  fakeroot_1.12.2.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 14 06:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:46:01 +0000
Subject: [pkgdb] chrpath ownership updated
Message-ID: <20090414064601.2E9C610F850@bastion2.fedora.phx.redhat.com>

Package chrpath in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From pkgdb at fedoraproject.org  Tue Apr 14 06:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:46:06 +0000
Subject: [pkgdb] chrpath ownership updated
Message-ID: <20090414064607.0BE5A10F85A@bastion2.fedora.phx.redhat.com>

Package chrpath in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From pkgdb at fedoraproject.org  Tue Apr 14 06:46:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:46:54 +0000
Subject: [pkgdb] fakechroot ownership updated
Message-ID: <20090414064654.C192910F851@bastion2.fedora.phx.redhat.com>

Package fakechroot in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 06:46:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:46:54 +0000
Subject: [pkgdb] fakechroot ownership updated
Message-ID: <20090414064654.E695610F87B@bastion2.fedora.phx.redhat.com>

Package fakechroot in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 06:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:47:16 +0000
Subject: [pkgdb] fakeroot ownership updated
Message-ID: <20090414064716.5BA0810F850@bastion2.fedora.phx.redhat.com>

Package fakeroot in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From pkgdb at fedoraproject.org  Tue Apr 14 06:47:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:47:22 +0000
Subject: [pkgdb] fakeroot ownership updated
Message-ID: <20090414064722.32AB510F85A@bastion2.fedora.phx.redhat.com>

Package fakeroot in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From pkgdb at fedoraproject.org  Tue Apr 14 06:47:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:47:41 +0000
Subject: [pkgdb] fedora-package-config-smart ownership updated
Message-ID: <20090414064741.78DD010F851@bastion2.fedora.phx.redhat.com>

Package fedora-package-config-smart in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From pkgdb at fedoraproject.org  Tue Apr 14 06:47:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:47:42 +0000
Subject: [pkgdb] fedora-package-config-smart ownership updated
Message-ID: <20090414064742.5F68810F87B@bastion2.fedora.phx.redhat.com>

Package fedora-package-config-smart in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From pkgdb at fedoraproject.org  Tue Apr 14 06:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:48:29 +0000
Subject: [pkgdb] greylistd ownership updated
Message-ID: <20090414064829.69CF610F85A@bastion2.fedora.phx.redhat.com>

Package greylistd in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From pkgdb at fedoraproject.org  Tue Apr 14 06:48:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:48:31 +0000
Subject: [pkgdb] greylistd ownership updated
Message-ID: <20090414064831.873CE10F87C@bastion2.fedora.phx.redhat.com>

Package greylistd in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From pkgdb at fedoraproject.org  Tue Apr 14 06:49:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:49:05 +0000
Subject: [pkgdb] libFoundation ownership updated
Message-ID: <20090414064905.6B8E710F85A@bastion2.fedora.phx.redhat.com>

Package libFoundation in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From pkgdb at fedoraproject.org  Tue Apr 14 06:49:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:49:05 +0000
Subject: [pkgdb] libFoundation ownership updated
Message-ID: <20090414064905.C800610F87D@bastion2.fedora.phx.redhat.com>

Package libFoundation in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From pkgdb at fedoraproject.org  Tue Apr 14 06:49:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:49:47 +0000
Subject: [pkgdb] perl-Text-CharWidth ownership updated
Message-ID: <20090414064947.3098210F85A@bastion2.fedora.phx.redhat.com>

Package perl-Text-CharWidth in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From pkgdb at fedoraproject.org  Tue Apr 14 06:49:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:49:48 +0000
Subject: [pkgdb] perl-Text-CharWidth ownership updated
Message-ID: <20090414064948.5CC9E10F87C@bastion2.fedora.phx.redhat.com>

Package perl-Text-CharWidth in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From pkgdb at fedoraproject.org  Tue Apr 14 06:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:49:58 +0000
Subject: [pkgdb] perl-Text-WrapI18N ownership updated
Message-ID: <20090414064958.60CB710F87E@bastion2.fedora.phx.redhat.com>

Package perl-Text-WrapI18N in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From pkgdb at fedoraproject.org  Tue Apr 14 06:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:50:00 +0000
Subject: [pkgdb] perl-Text-WrapI18N ownership updated
Message-ID: <20090414065000.7FADF10F87F@bastion2.fedora.phx.redhat.com>

Package perl-Text-WrapI18N in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From pkgdb at fedoraproject.org  Tue Apr 14 06:50:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:50:22 +0000
Subject: [pkgdb] smart ownership updated
Message-ID: <20090414065022.3BFDC10F7C2@bastion2.fedora.phx.redhat.com>

Package smart in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From pkgdb at fedoraproject.org  Tue Apr 14 06:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 06:50:27 +0000
Subject: [pkgdb] smart ownership updated
Message-ID: <20090414065027.D7E1410F87C@bastion2.fedora.phx.redhat.com>

Package smart in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From denis at fedoraproject.org  Tue Apr 14 06:59:46 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 14 Apr 2009 06:59:46 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.42,1.43
Message-ID: <20090414065946.45287700B2@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11281

Modified Files:
	brasero.spec 
Log Message:
Removed duplicate desktop source


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- brasero.spec	29 Mar 2009 23:58:21 -0000	1.42
+++ brasero.spec	14 Apr 2009 06:59:15 -0000	1.43
@@ -1,16 +1,12 @@
 
 Name:      brasero
 Version:   2.26.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.26/%{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=573789
-# http://bugzilla.gnome.org/show_bug.cgi?id=573790
-# http://bugzilla.gnome.org/show_bug.cgi?id=573791
-Source1:   nautilus-cd-burner.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.15.6
@@ -118,11 +114,9 @@
     --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# See comment for source1
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-ncb.desktop
 desktop-file-install --vendor ""                   \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-ncb.desktop
+    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-nautilus.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,7 +174,6 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-open-*.desktop
 %{_datadir}/applications/%{name}-copy-*.desktop
-%{_datadir}/applications/%{name}-ncb.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/omf/%{name}
 %{_datadir}/icons/hicolor/*/apps/*
@@ -208,6 +201,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-2
+- Removed duplicate desktop source
+
 * Sun Mar 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From bagnara at fedoraproject.org  Tue Apr 14 07:10:02 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 07:10:02 +0000 (UTC)
Subject: rpms/ppl/F-10 ppl-0.10.1-Makefile.patch, NONE, 1.1 ppl.hh, 1.1,
	1.2 ppl.spec, 1.19, 1.20 ppl_c.h, 1.1, 1.2 pwl.hh, 1.1, 1.2
Message-ID: <20090414071002.A20D7700B2@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14566

Modified Files:
	ppl.hh ppl.spec ppl_c.h pwl.hh 
Added Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.1.


ppl-0.10.1-Makefile.patch:

--- NEW FILE ppl-0.10.1-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl.hh	9 Jan 2008 10:47:16 -0000	1.1
+++ ppl.hh	14 Apr 2009 07:09:30 -0000	1.2
@@ -1,5 +1,5 @@
 /* This is the header file switcher of the Parma Polyhedra Library.
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Polyhedra Library (PPL).
 


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ppl.spec	4 Nov 2008 17:17:51 -0000	1.19
+++ ppl.spec	14 Apr 2009 07:09:30 -0000	1.20
@@ -1,8 +1,8 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10
-Release:        3%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -12,8 +12,8 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-#Patch0:        none
-#Patch1:        none
+Patch0:         ppl-0.10.1-Makefile.patch
+#Patch1:
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -60,7 +60,7 @@
 This package contains the mixed integer linear programming solver ppl_lpsol
 and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra.
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %package gprolog
 # The `gprolog' package is not available on ppc64:
 # the GNU Prolog interface must thus be disabled for that architecture.
@@ -73,7 +73,7 @@
 Install this package if you want to use the library in GNU Prolog programs.
 %endif
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %package gprolog-static
 Summary:        The static archive for the GNU Prolog interface of the Parma Polyhedra Library
 Group:          Development/Libraries
@@ -198,16 +198,16 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 #%patch1 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
 %endif
 CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
-%configure --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
+%configure --docdir=%{_datadir}/doc/%{name}-%{version} --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' Watchdog/libtool
@@ -245,27 +245,25 @@
 # Install the Javadocs for ppl-java.
 mkdir -p %{buildroot}%{_javadocdir}
 mv \
-%{buildroot}/%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}-html \
+%{buildroot}/%{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}-html \
 %{buildroot}%{_javadocdir}/%{name}-java
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/BUGS
-%doc %{_datadir}/doc/%{name}/COPYING
-%doc %{_datadir}/doc/%{name}/CREDITS
-%doc %{_datadir}/doc/%{name}/ChangeLog
-%doc %{_datadir}/doc/%{name}/NEWS
-%doc %{_datadir}/doc/%{name}/README
-%doc %{_datadir}/doc/%{name}/README.configure
-%doc %{_datadir}/doc/%{name}/TODO
-%doc %{_datadir}/doc/%{name}/gpl.*
+%doc %{_datadir}/doc/%{name}-%{version}/BUGS
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/CREDITS
+%doc %{_datadir}/doc/%{name}-%{version}/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/README.configure
+%doc %{_datadir}/doc/%{name}-%{version}/TODO
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.txt
 %{_libdir}/libppl.so.*
 %{_libdir}/libppl_c.so.*
 %{_bindir}/ppl-config
 %{_mandir}/man1/ppl-config.1.gz
-
 %dir %{_libdir}/%{name}
-%dir %{_datadir}/doc/%{name}
+%dir %{_datadir}/doc/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -290,7 +288,7 @@
 %{_mandir}/man1/ppl_lcdd.1.gz
 %{_mandir}/man1/ppl_lpsol.1.gz
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %files gprolog
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/GNU/README.gprolog
@@ -299,7 +297,7 @@
 %{_libdir}/%{name}/libppl_gprolog.so
 %endif
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %files gprolog-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_gprolog.a
@@ -346,33 +344,36 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/README.doc
-%doc %{_datadir}/doc/%{name}/fdl.*
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.pdf
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.ps.gz
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog*
+%doc %{_datadir}/doc/%{name}-%{version}/README.doc
+%doc %{_datadir}/doc/%{name}-%{version}/fdl.*
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}-html/
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.pdf
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.ps.gz
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.ps.gz
 
 %files pwl
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/pwl/BUGS
-%doc %{_datadir}/doc/pwl/COPYING
-%doc %{_datadir}/doc/pwl/CREDITS
-%doc %{_datadir}/doc/pwl/ChangeLog
-%doc %{_datadir}/doc/pwl/NEWS
-%doc %{_datadir}/doc/pwl/README
-%doc %{_datadir}/doc/pwl/gpl.*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/BUGS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/CREDITS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/README
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.txt
 %{_libdir}/libpwl.so.*
+%dir %{_datadir}/doc/%{name}-%{version}/pwl
 
 %files pwl-devel
 %defattr(-,root,root,-)
@@ -386,11 +387,14 @@
 
 %files pwl-docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/pwl/README.doc
-%doc %{_datadir}/doc/pwl/fdl.*
-%doc %{_datadir}/doc/pwl/pwl-user-0.5-html/
-%doc %{_datadir}/doc/pwl/pwl-user-0.5.pdf
-%doc %{_datadir}/doc/pwl/pwl-user-0.5.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/ChangeLog*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/README.doc
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/fdl.*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7-html/
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.ps.gz
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -401,13 +405,45 @@
 rm -rf %{buildroot}
 
 %changelog
-* Thu Nov 4 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-3
+* Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
+- Updated for PPL 0.10.1.
+
+* Sun Mar 29 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-11
+- Moved changelogs and PostScript and PDF versions of the GPL to the
+  `docs' subpackages. This saves considerable space on the live media.
+
+* Tue Mar 24 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-10
+- There are no GNU Prolog packages available on ia64: disable the GNU Prolog
+  interface also on those platforms (besides ppc64, s390 and s390x).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild.
+
+* Wed Feb 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-8
+- Install the documentation according to the Fedora packaging conventions.
+
+* Wed Feb 17 2009 Karsten Hopp <karsten at redhat.comt> 0.10-7
+- There are no GNU Prolog packages available on s390 and s390x: disable
+  the GNU Prolog interface also on those platforms (besides ppc64).
+
+* Wed Feb 04 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-6
+- Better workaround for the bug affecting PPL 0.10 on big-endian
+  architectures.
+
+* Tue Feb 03 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-5
+- Work around the bug affecting PPL 0.10 on big-endian architectures.
+
+* Fri Dec 05 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-4
+- Added `%%dir %%{_datadir}/doc/pwl' to the `%%files' section
+  of the `ppl-pwl' package.
+
+* Thu Nov 04 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-3
 - Fixed the requirements of the `ppl-java' package.
 
-* Thu Nov 4 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-2
+* Thu Nov 04 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-2
 - Added m4 >= 1.4.8 to build requirements.
 
-* Thu Nov 4 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-1
+* Thu Nov 04 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-1
 - Updated and extended for PPL 0.10.  In particular, the `ppl-config'
   program, being useful also for non-development activities, has been
   brought back to the main package.
@@ -415,17 +451,17 @@
 * Tue Sep 30 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-25
 - The `swiprolog' package now requires pl >= 5.6.57-2.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
 - Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
   the `-v' option.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
 - Fixed ppl-0.9-swiprolog.patch.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
 - Implemented a workaround to cope with the new location of SWI-Prolog.h.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
 - Fixed the SWI-Prolog interface dependencies.
 
 * Mon May 19 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-20


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl_c.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl_c.h	9 Jan 2008 10:47:16 -0000	1.1
+++ ppl_c.h	14 Apr 2009 07:09:31 -0000	1.2
@@ -1,5 +1,5 @@
 /* Header file switcher for the C interface.  -*- C -*-
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Polyhedra Library (PPL).
 


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/pwl.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pwl.hh	9 Jan 2008 10:47:16 -0000	1.1
+++ pwl.hh	14 Apr 2009 07:09:31 -0000	1.2
@@ -1,5 +1,5 @@
 /* This is the header file switcher of the Parma Watchdog Library.
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Watchdog Library (PWL).
 



From bagnara at fedoraproject.org  Tue Apr 14 07:11:52 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 07:11:52 +0000 (UTC)
Subject: rpms/ppl/F-10 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090414071152.51FDF70127@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15219

Modified Files:
	.cvsignore sources 
Log Message:
Updated for the PPL 0.10.1 sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Nov 2008 13:11:56 -0000	1.3
+++ .cvsignore	14 Apr 2009 07:11:21 -0000	1.4
@@ -1 +1 @@
-ppl-0.10.tar.gz
+ppl-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Nov 2008 13:11:56 -0000	1.3
+++ sources	14 Apr 2009 07:11:21 -0000	1.4
@@ -1 +1 @@
-610a60c9bda8a36bd41f90b732f906b3  ppl-0.10.tar.gz
+327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz



From bagnara at fedoraproject.org  Tue Apr 14 07:13:16 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 07:13:16 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.10-bigendian.patch, 1.1,
	NONE ppl-0.10-configure.patch, 1.1, NONE
Message-ID: <20090414071316.5466F70127@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16010

Removed Files:
	ppl-0.10-bigendian.patch ppl-0.10-configure.patch 
Log Message:
Obsolete patch files removed.



--- ppl-0.10-bigendian.patch DELETED ---


--- ppl-0.10-configure.patch DELETED ---



From zprikryl at fedoraproject.org  Tue Apr 14 07:14:00 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 14 Apr 2009 07:14:00 +0000 (UTC)
Subject: rpms/less/devel .cvsignore, 1.15, 1.16 less.spec, 1.55, 1.56 sources,
	1.15, 1.16
Message-ID: <20090414071400.7037170127@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/less/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16209

Modified Files:
	.cvsignore less.spec sources 
Log Message:
Update to 429



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/less/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Jun 2008 10:35:50 -0000	1.15
+++ .cvsignore	14 Apr 2009 07:13:29 -0000	1.16
@@ -1 +1 @@
-less-424.tar.gz
+less-429.tar.gz


Index: less.spec
===================================================================
RCS file: /cvs/extras/rpms/less/devel/less.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- less.spec	31 Mar 2009 08:25:57 -0000	1.55
+++ less.spec	14 Apr 2009 07:13:29 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better
 Name: less
-Version: 424
-Release: 4%{?dist}
+Version: 429
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Apr 14 2009 Zdenek Prikryl <zprikryl at redhat.com> - 429-1
+- Update to 429
+
 * Tue Mar 31 2009 Zdenek Prikryl <zprikryl at redhat.com> - 424-4
 - Added GraphicsMagick support (#492695)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/less/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Jun 2008 10:35:50 -0000	1.15
+++ sources	14 Apr 2009 07:13:29 -0000	1.16
@@ -1 +1 @@
-d616daa1351822885eb2d457dcb8c9c6  less-424.tar.gz
+206f2f13b9b0a35e45df660fcb6af31d  less-429.tar.gz



From zprikryl at fedoraproject.org  Tue Apr 14 07:18:35 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 14 Apr 2009 07:18:35 +0000 (UTC)
Subject: rpms/lksctp-tools/devel .cvsignore, 1.7,
	1.8 lksctp-tools-1.0.6-libdir.patch, 1.3, 1.4 lksctp-tools.spec,
	1.21, 1.22 sources, 1.7, 1.8
Message-ID: <20090414071835.6DF2C700B2@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/lksctp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18062

Modified Files:
	.cvsignore lksctp-tools-1.0.6-libdir.patch lksctp-tools.spec 
	sources 
Log Message:
added release tag to Requires of devel and doc packages (#492531)
Update to 1.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lksctp-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Aug 2008 14:12:45 -0000	1.7
+++ .cvsignore	14 Apr 2009 07:18:04 -0000	1.8
@@ -1 +1 @@
-lksctp-tools-1.0.9.tar.gz
+lksctp-tools-1.0.10.tar.gz

lksctp-tools-1.0.6-libdir.patch:

Index: lksctp-tools-1.0.6-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/lksctp-tools/devel/lksctp-tools-1.0.6-libdir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lksctp-tools-1.0.6-libdir.patch	6 Aug 2008 15:02:24 -0000	1.3
+++ lksctp-tools-1.0.6-libdir.patch	14 Apr 2009 07:18:04 -0000	1.4
@@ -6,5 +6,5 @@
 -LIBDIR=@libdir@/@PACKAGE@
 +LIBDIR=`rpm --eval "%{_libdir}"`/@PACKAGE@
  BINDIR=@bindir@
- export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.9
+ export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.10
  if ! ${BINDIR}/checksctp 2> /dev/null


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lksctp-tools.spec	25 Feb 2009 20:42:25 -0000	1.21
+++ lksctp-tools.spec	14 Apr 2009 07:18:04 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
-Version: 1.0.9
-Release: 2%{?dist}
+Version: 1.0.10
+Release: 1%{?dist}
 # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
 License: GPLv2 and GPLv2+ and LGPLv2 and MIT
 Group: System Environment/Libraries
@@ -29,7 +29,7 @@
 %package devel
 Summary: Development files for lksctp-tools
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 Development files for lksctp-tools which include man pages, header files,
@@ -38,7 +38,7 @@
 %package doc
 Summary: Documents pertaining to SCTP
 Group: System Environment/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description doc
 Documents pertaining to LKSCTP & SCTP in general (IETF RFC's & Internet
@@ -92,6 +92,10 @@
 %doc doc/*.txt
 
 %changelog
+* Tue Mar 31 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.0.10-1
+- added release tag to Requires of devel and doc packages (#492531)
+- Update to 1.0.10
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lksctp-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Aug 2008 14:12:45 -0000	1.7
+++ sources	14 Apr 2009 07:18:04 -0000	1.8
@@ -1 +1 @@
-8a6be287980d0035770f00f861b2286a  lksctp-tools-1.0.9.tar.gz
+cbcb78adc6ba251a99d45e78470b5571  lksctp-tools-1.0.10.tar.gz



From zprikryl at fedoraproject.org  Tue Apr 14 07:24:40 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 14 Apr 2009 07:24:40 +0000 (UTC)
Subject: rpms/lksctp-tools/devel lksctp-tools.spec,1.22,1.23
Message-ID: <20090414072440.DC648700B2@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/lksctp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19926

Modified Files:
	lksctp-tools.spec 
Log Message:
added release tag to Requires of devel and doc packages (#492531)
Update to 1.0.10



Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lksctp-tools.spec	14 Apr 2009 07:18:04 -0000	1.22
+++ lksctp-tools.spec	14 Apr 2009 07:24:10 -0000	1.23
@@ -92,7 +92,7 @@
 %doc doc/*.txt
 
 %changelog
-* Tue Mar 31 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.0.10-1
+* Tue Apr 14 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.0.10-1
 - added release tag to Requires of devel and doc packages (#492531)
 - Update to 1.0.10
 



From rbhalera at fedoraproject.org  Tue Apr 14 07:27:21 2009
From: rbhalera at fedoraproject.org (Rahul Bhalerao)
Date: Tue, 14 Apr 2009 07:27:21 +0000 (UTC)
Subject: rpms/culmus-fonts/devel culmus-fonts.spec,1.7,1.8
Message-ID: <20090414072721.2D6D3700B2@cvs1.fedora.phx.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/culmus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20786

Modified Files:
	culmus-fonts.spec 
Log Message:
package rebuild


Index: culmus-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/culmus-fonts/devel/culmus-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- culmus-fonts.spec	19 Mar 2009 13:51:07 -0000	1.7
+++ culmus-fonts.spec	14 Apr 2009 07:26:50 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:           %{fontname}-fonts
 Version:        0.102
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fonts for Hebrew from Culmus project
 
 Group:          User Interface/X
@@ -247,6 +247,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rahul Bhalerao <rbhalera at redhat.com> - 0.102-6.fc11
+- Rebuild for bug #491957.
+
 * Thu Mar 19 2009 Rahul Bhalerao <rbhalera at redhat.com> - 0.102-5.fc11
 - Corrected Obsoletes for compat.
 



From jorton at fedoraproject.org  Tue Apr 14 07:37:46 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Tue, 14 Apr 2009 07:37:46 +0000 (UTC)
Subject: rpms/subversion/devel subversion-1.6.1.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.30, 1.31 sources, 1.37, 1.38 subversion.spec,
	1.137, 1.138 upstream, 1.23, 1.24
Message-ID: <20090414073746.97CDC700B2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24104

Modified Files:
	.cvsignore sources subversion.spec upstream 
Added Files:
	subversion-1.6.1.tar.gz.asc 
Log Message:
* Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 1.6.1-3
- update to 1.6.1; disable PIE patch for the time being



--- NEW FILE subversion-1.6.1.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAknc50kACgkQCwOubk4kUXx2xACfUCx724/5r494oVGpnYpfg9nq
Y/YAoIHPysjMeCwcWWiDs/S8VgTmgcxF
=z1DJ
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)

iEYEABECAAYFAkndpNYACgkQYM9qgQ/zOWNawQCeLMiNS/PHZ4MiS2wml5itHfTO
MmkAoJ/3tWr/mFuX31ayPCsmRrGKMIv/
=YCH0
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkndmZIACgkQ9o1G+2zNQDjclACcCaL6NxFd+QIJ7PwD8IRdc3Jy
i4wAoJJ+M5COafJaw8xOhli8XVEJOr0I
=4Vb5
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)

iEYEABECAAYFAkneHZ4ACgkQ/P1jBZgh97LShQCfWUV36nwHJxGLf9xb9zBDpEAf
Jc4Anjk7Xg4xQiPYiGPVkylKm3Rru2kk
=4kOK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	31 Mar 2009 16:15:40 -0000	1.30
+++ .cvsignore	14 Apr 2009 07:37:15 -0000	1.31
@@ -1 +1 @@
-subversion-1.6.0.tar.gz
+subversion-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	31 Mar 2009 16:15:40 -0000	1.37
+++ sources	14 Apr 2009 07:37:15 -0000	1.38
@@ -1 +1 @@
-b74985c9191d4a652a9f618a06171880  subversion-1.6.0.tar.gz
+32014fe70397357fa1e0ef8f937a0232  subversion-1.6.1.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- subversion.spec	31 Mar 2009 19:37:12 -0000	1.137
+++ subversion.spec	14 Apr 2009 07:37:15 -0000	1.138
@@ -14,7 +14,7 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.0
+Version: 1.6.1
 Release: 3
 License: ASL 1.1
 Group: Development/Tools
@@ -107,7 +107,7 @@
 %setup -q
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
-%patch6 -p1 -b .pie
+#patch6 -p1 -b .pie
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
@@ -286,6 +286,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 1.6.1-3
+- update to 1.6.1; disable PIE patch for the time being
+
 * Tue Mar 31 2009 Joe Orton <jorton at redhat.com> 1.6.0-3
 - BR sqlite-devel
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- upstream	31 Mar 2009 16:15:40 -0000	1.23
+++ upstream	14 Apr 2009 07:37:15 -0000	1.24
@@ -1 +1 @@
-subversion-1.6.0.tar.gz
+subversion-1.6.1.tar.gz



From athimm at fedoraproject.org  Tue Apr 14 07:42:20 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 07:42:20 +0000 (UTC)
Subject: rpms/fedora-package-config-apt/devel fedora-package-config-apt.spec,
	1.10, 1.11
Message-ID: <20090414074220.9440D700B2@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25504/devel

Modified Files:
	fedora-package-config-apt.spec 
Log Message:
Fix bug #484096


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora-package-config-apt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-package-config-apt.spec	24 Feb 2009 16:34:27 -0000	1.10
+++ fedora-package-config-apt.spec	14 Apr 2009 07:41:49 -0000	1.11
@@ -1,13 +1,13 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 9.89
+Version: 10.92
 Release: 3
 # Nothing in here has copyright, much less license attribution, however,
 # since this is "upstream", we'll take this statement as the author's intent,
 # and use GPL+ here (since no version is specified).
 License: GPL+
 Group: System Environment/Base
-URL: http://fedora.redhat.com/
+URL: http://fedoraproject.org/
 
 # 100-149 for sources.list.d
 Source100:      fedora.list
@@ -30,8 +30,8 @@
 Provides: apt-config
 
 %description
-This package contains apt-rpm configuration files for Fedora (Core,
-Updates and Extras).
+This package contains apt-rpm configuration files for Fedora (Release and
+Updates).
 
 %install
 rm -rf %{buildroot}
@@ -42,7 +42,7 @@
 # install config parts
 install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
-# Fedora Extras fingerprint
+# Fedora fingerprint
 install -pm 644 %{SOURCE250} \
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
@@ -65,8 +65,8 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.89-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 10.92-3
+- Fix URL and Description (RH bug #484096).
 
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.89-2
 - fix license tag



From zprikryl at fedoraproject.org  Tue Apr 14 07:44:15 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue, 14 Apr 2009 07:44:15 +0000 (UTC)
Subject: rpms/gpm/devel gpm.spec,1.73,1.74
Message-ID: <20090414074415.94BF0700B2@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/gpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26077

Modified Files:
	gpm.spec 
Log Message:
created new subpackage gpm-libs (#495124)



Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gpm.spec	24 Feb 2009 09:44:33 -0000	1.73
+++ gpm.spec	14 Apr 2009 07:43:44 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -29,6 +29,14 @@
 includes a program to allow pop-up menus to appear at the click of a
 mouse button.
 
+%package libs
+Summary: Dynamic library for for the gpm
+Group: System Environment/Libraries
+
+%description libs
+This package contains the libgpm.so dynamic library which contains
+the gpm system calls and library functions.
+
 %package devel
 Requires: %{name} = %{version}-%{release}
 Summary: Development files for the gpm library
@@ -124,7 +132,6 @@
 %doc BUGS COPYING README TODO
 %doc doc/README* doc/FAQ doc/Announce doc/changes/*
 %{_infodir}/*
-%{_libdir}/libgpm.so.*
 %ifnarch s390 s390x
 %config(noreplace) %{_sysconfdir}/gpm-*
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/gpm
@@ -133,6 +140,10 @@
 %{_mandir}/man?/*
 %endif
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libgpm.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
@@ -143,6 +154,9 @@
 %{_libdir}/libgpm.a
 
 %changelog
+* Tue Apr 14 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.20.6-3
+- created new subpackage gpm-libs (#495124)
+
 * Tue Feb 24 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.6-2
 - Fixed gpm.info.gz building
 



From laxathom at fedoraproject.org  Tue Apr 14 07:47:19 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Tue, 14 Apr 2009 07:47:19 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/devel gnome-desktop-sharp.spec,1.6,1.7
Message-ID: <20090414074719.AEDC2700B2@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27566

Modified Files:
	gnome-desktop-sharp.spec 
Log Message:
Add new BR


Index: gnome-desktop-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/gnome-desktop-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-desktop-sharp.spec	6 Apr 2009 09:20:00 -0000	1.6
+++ gnome-desktop-sharp.spec	14 Apr 2009 07:46:48 -0000	1.7
@@ -14,6 +14,7 @@
 BuildRequires:  librsvg2-devel, vte-devel, gnome-panel-devel
 BuildRequires:  libwnck-devel, gtksourceview2-devel, libgnomeprintui22-devel
 BuildRequires:  nautilus-cd-burner-devel, gnome-sharp-devel
+BuildRequires:  gnome-desktop-devel
 BuildRequires:  gtk-sharp2-gapi >= 2.12.0
 BuildRequires:  gtk-sharp2-devel >= 2.12.0
 



From jsafrane at fedoraproject.org  Tue Apr 14 07:52:53 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue, 14 Apr 2009 07:52:53 +0000 (UTC)
Subject: rpms/freeipmi/devel .cvsignore, 1.7, 1.8 freeipmi.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20090414075253.99B31700B2@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29337

Modified Files:
	.cvsignore freeipmi.spec sources 
Log Message:
Update to freeipmi-0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Apr 2009 08:14:10 -0000	1.7
+++ .cvsignore	14 Apr 2009 07:52:22 -0000	1.8
@@ -1 +1 @@
-freeipmi-0.7.7.tar.gz
+freeipmi-0.7.8.tar.gz


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freeipmi.spec	9 Apr 2009 08:10:26 -0000	1.14
+++ freeipmi.spec	14 Apr 2009 07:52:22 -0000	1.15
@@ -9,7 +9,7 @@
 %endif
 
 Name: freeipmi
-Version: 0.7.7
+Version: 0.7.8
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -328,6 +328,9 @@
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Tue Apr 14 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.8-1
+- Update to freeipmi-0.7.8
+
 * Thu Apr  9 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.7-1
 - Update to freeipmi-0.7.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Apr 2009 08:14:10 -0000	1.7
+++ sources	14 Apr 2009 07:52:22 -0000	1.8
@@ -1 +1 @@
-8d616522c419132fa318a96cc2ab4a10  freeipmi-0.7.7.tar.gz
+633a015f931985640cd21324fa1db1aa  freeipmi-0.7.8.tar.gz



From tmraz at fedoraproject.org  Tue Apr 14 07:54:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 14 Apr 2009 07:54:24 +0000 (UTC)
Subject: rpms/gnutls/devel .cvsignore, 1.19, 1.20 gnutls.spec, 1.41,
	1.42 sources, 1.19, 1.20
Message-ID: <20090414075424.CF7A8700B2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29931

Modified Files:
	.cvsignore gnutls.spec sources 
Log Message:
* Tue Apr 14 2009 Tomas Mraz <tmraz at redhat.com> 2.6.5-1
- upgrade to a new upstream version, minor bugfixes only



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 Mar 2009 14:44:26 -0000	1.19
+++ .cvsignore	14 Apr 2009 07:53:54 -0000	1.20
@@ -1 +1 @@
-gnutls-2.6.4-nosrp.tar.bz2
+gnutls-2.6.5-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnutls.spec	6 Mar 2009 14:44:26 -0000	1.41
+++ gnutls.spec	14 Apr 2009 07:53:54 -0000	1.42
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.6.4
+Version: 2.6.5
 Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
@@ -149,6 +149,9 @@
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Tue Apr 14 2009 Tomas Mraz <tmraz at redhat.com> 2.6.5-1
+- upgrade to a new upstream version, minor bugfixes only
+
 * Fri Mar  6 2009 Tomas Mraz <tmraz at redhat.com> 2.6.4-1
 - upgrade to a new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Mar 2009 14:44:26 -0000	1.19
+++ sources	14 Apr 2009 07:53:54 -0000	1.20
@@ -1 +1 @@
-ac96cacb84b7dd7483a495d3907e7664  gnutls-2.6.4-nosrp.tar.bz2
+3fc710671d1fe0df2d2f660672cc9ab2  gnutls-2.6.5-nosrp.tar.bz2



From bagnara at fedoraproject.org  Tue Apr 14 08:05:48 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 08:05:48 +0000 (UTC)
Subject: rpms/ppl/F-9 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090414080548.A5A2D700B2@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1101

Modified Files:
	.cvsignore sources 
Log Message:
Updated for the PPL 0.10.1 sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Nov 2008 14:48:39 -0000	1.3
+++ .cvsignore	14 Apr 2009 08:05:17 -0000	1.4
@@ -1 +1 @@
-ppl-0.10.tar.gz
+ppl-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Nov 2008 14:48:40 -0000	1.3
+++ sources	14 Apr 2009 08:05:17 -0000	1.4
@@ -1 +1 @@
-610a60c9bda8a36bd41f90b732f906b3  ppl-0.10.tar.gz
+327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz



From dchen at fedoraproject.org  Tue Apr 14 08:11:19 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 14 Apr 2009 08:11:19 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.12, 1.13 ibus-chewing.spec,
	1.14, 1.15 import.log, 1.7, 1.8 sources, 1.12, 1.13
Message-ID: <20090414081119.18E8B700B2@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3341/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Fixed the issue with ibus-gtk after 1.1.0.20090407


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Apr 2009 05:40:34 -0000	1.12
+++ .cvsignore	14 Apr 2009 08:11:17 -0000	1.13
@@ -1 +1 @@
-ibus-chewing-1.0.6.20090403-Source.tar.gz
+ibus-chewing-1.0.7.20090414-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ibus-chewing.spec	3 Apr 2009 05:40:34 -0000	1.14
+++ ibus-chewing.spec	14 Apr 2009 08:11:17 -0000	1.15
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.6.20090403
+Version:    1.0.7.20090414
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -73,12 +73,8 @@
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Fri Apr 03 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.6.20090403-1
-- Fix iBus Google issue 326: Fail to build with CMake < 2.6.3
-- DateFormate.cmake is merged to BasicMacros.cmake
-- See headers of cmake modules in cmake_modules/ for detailed changed.
-- Add a make target "version_check" 
-- Add a make developer target "new_version"  which are hidden for ordinary users.
+* Tue Apr 14 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.7.20090414-1
+
 
 * Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1
 - Added tooltips.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	3 Apr 2009 05:40:34 -0000	1.7
+++ import.log	14 Apr 2009 08:11:18 -0000	1.8
@@ -5,3 +5,4 @@
 ibus-chewing-1_0_4_20090323-2_fc10:HEAD:ibus-chewing-1.0.4.20090323-2.fc10.src.rpm:1237775380
 ibus-chewing-1_0_5_20090330-1_fc10:HEAD:ibus-chewing-1.0.5.20090330-1.fc10.src.rpm:1238398686
 ibus-chewing-1_0_6_20090403-1_fc10:HEAD:ibus-chewing-1.0.6.20090403-1.fc10.src.rpm:1238737188
+ibus-chewing-1_0_7_20090414-1_fc10:HEAD:ibus-chewing-1.0.7.20090414-1.fc10.src.rpm:1239696303


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Apr 2009 05:40:34 -0000	1.12
+++ sources	14 Apr 2009 08:11:18 -0000	1.13
@@ -1 +1 @@
-7e3ad7dfa4b37b7353670a6eec2cfef5  ibus-chewing-1.0.6.20090403-Source.tar.gz
+492f878fd0f17ad071799573068ded9e  ibus-chewing-1.0.7.20090414-Source.tar.gz



From peter at fedoraproject.org  Tue Apr 14 08:14:16 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 14 Apr 2009 08:14:16 +0000 (UTC)
Subject: rpms/flashrom/devel .cvsignore, 1.13, 1.14 flashrom.spec, 1.17,
	1.18 import.log, 1.5, 1.6 sources, 1.13, 1.14
Message-ID: <20090414081416.8011A700B2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4352/devel

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 4107


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Mar 2009 12:59:11 -0000	1.13
+++ .cvsignore	14 Apr 2009 08:13:45 -0000	1.14
@@ -1 +1 @@
-flashrom-3984.tar.bz2
+flashrom-4107.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/flashrom.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- flashrom.spec	11 Mar 2009 12:59:11 -0000	1.17
+++ flashrom.spec	14 Apr 2009 08:13:45 -0000	1.18
@@ -1,8 +1,8 @@
-%define svnver 3984
+%define svnver 4107
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.17.20090311svn%{svnver}%{?dist}
+Release:	0.18.20090414svn%{svnver}%{?dist}
 License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
@@ -14,8 +14,8 @@
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Lacks of <sys/io.h>, see BZ# 283491, 450273
-ExcludeArch:	ppc ppc64 sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+# see BZ# 283491, 450273, 495226
+ExclusiveArch:	%{ix86} x86_64
 
 %description
 Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents
@@ -45,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue Apr 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090414svn4107
+- Various manpage / README fixes
+- Board enable support for HP DL145 G3
+- high coreboot table support
+- Since now we're using ExclusiveArch
+
 * Wed Mar 11 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.17.20090311svn3984
 - MSI MS-7046 board enable
 - Intel Desktop Board D201GLY


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Mar 2009 12:59:11 -0000	1.5
+++ import.log	14 Apr 2009 08:13:45 -0000	1.6
@@ -3,3 +3,4 @@
 flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701590
 flashrom-0-0_15_20090112svn3852_fc10:HEAD:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231410331
 flashrom-0-0_17_20090311svn3984_fc10:HEAD:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776289
+flashrom-0-0_18_20090414svn4107_fc10:HEAD:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239696789


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Mar 2009 12:59:11 -0000	1.13
+++ sources	14 Apr 2009 08:13:45 -0000	1.14
@@ -1 +1 @@
-78817263019763c4d08c95f2d4542ef7  flashrom-3984.tar.bz2
+784e25d61ac3ae7f3d31914e963acaa3  flashrom-4107.tar.bz2



From peter at fedoraproject.org  Tue Apr 14 08:17:00 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 14 Apr 2009 08:17:00 +0000 (UTC)
Subject: rpms/flashrom/F-10 .cvsignore, 1.13, 1.14 flashrom.spec, 1.16,
	1.17 import.log, 1.5, 1.6 sources, 1.13, 1.14
Message-ID: <20090414081700.DF8A2700B2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5507/F-10

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 4107


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Mar 2009 13:01:55 -0000	1.13
+++ .cvsignore	14 Apr 2009 08:16:30 -0000	1.14
@@ -1 +1 @@
-flashrom-3984.tar.bz2
+flashrom-4107.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/flashrom.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- flashrom.spec	11 Mar 2009 13:01:55 -0000	1.16
+++ flashrom.spec	14 Apr 2009 08:16:30 -0000	1.17
@@ -1,8 +1,8 @@
-%define svnver 3984
+%define svnver 4107
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.17.20090311svn%{svnver}%{?dist}
+Release:	0.18.20090414svn%{svnver}%{?dist}
 License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
@@ -14,8 +14,8 @@
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Lacks of <sys/io.h>, see BZ# 283491, 450273
-ExcludeArch:	ppc ppc64 sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+# see BZ# 283491, 450273, 495226
+ExclusiveArch:	%{ix86} x86_64
 
 %description
 Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents
@@ -45,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue Apr 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090414svn4107
+- Various manpage / README fixes
+- Board enable support for HP DL145 G3
+- high coreboot table support
+- Since now we're using ExclusiveArch
+
 * Wed Mar 11 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.17.20090311svn3984
 - MSI MS-7046 board enable
 - Intel Desktop Board D201GLY


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Mar 2009 13:01:55 -0000	1.5
+++ import.log	14 Apr 2009 08:16:30 -0000	1.6
@@ -3,3 +3,4 @@
 flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701590
 flashrom-0-0_15_20090112svn3852_fc10:F-10:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431767
 flashrom-0-0_17_20090311svn3984_fc10:F-10:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776491
+flashrom-0-0_18_20090414svn4107_fc10:F-10:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239696892


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Mar 2009 13:01:55 -0000	1.13
+++ sources	14 Apr 2009 08:16:30 -0000	1.14
@@ -1 +1 @@
-78817263019763c4d08c95f2d4542ef7  flashrom-3984.tar.bz2
+784e25d61ac3ae7f3d31914e963acaa3  flashrom-4107.tar.bz2



From scop at fedoraproject.org  Tue Apr 14 08:22:01 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 08:22:01 +0000 (UTC)
Subject: rpms/javasqlite/devel javasqlite-20090409-check-features.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 javasqlite.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090414082201.26F96700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8089

Modified Files:
	.cvsignore javasqlite.spec sources 
Added Files:
	javasqlite-20090409-check-features.patch 
Log Message:
* Sun Apr 12 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-1
- Update to 20090409, enable extension loading.
- Patch to actually check features of system sqlite lib at build time.


javasqlite-20090409-check-features.patch:

--- NEW FILE javasqlite-20090409-check-features.patch ---
diff -up javasqlite-20090409/configure~ javasqlite-20090409/configure
--- javasqlite-20090409/configure~	2009-02-25 12:17:46.000000000 +0200
+++ javasqlite-20090409/configure	2009-04-12 22:02:41.000000000 +0300
@@ -7655,10 +7655,6 @@ else
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
-if test -z "$SQLITE3_A10N_C" ; then
-  SQLITE3_A10N_C="native/dummy.c"
-  SQLITE3_A10N_O="dummy.lo"
-fi
 
 
 
@@ -8817,7 +8813,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
 echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6
 if test $ac_cv_lib_sqlite3_sqlite3_load_extension = yes; then
-  HAVE_SQLITE3_LOAD_EXTENSION=
+  HAVE_SQLITE3_LOAD_EXTENSION=1
 else
   HAVE_SQLITE3_LOAD_EXTENSION=0
 fi
@@ -8841,6 +8837,10 @@ fi
 
 
 
+if test -z "$SQLITE3_A10N_C" ; then
+  SQLITE3_A10N_C="native/dummy.c"
+  SQLITE3_A10N_O="dummy.lo"
+fi
 
 
 
diff -up javasqlite-20090409/configure.in~ javasqlite-20090409/configure.in
--- javasqlite-20090409/configure.in~	2009-02-25 12:17:41.000000000 +0200
+++ javasqlite-20090409/configure.in	2009-04-12 22:01:47.000000000 +0300
@@ -230,15 +230,8 @@ else
   HAVE_SQLITE3=1
   AC_MSG_RESULT(yes)
 fi
-if test -z "$SQLITE3_A10N_C" ; then
-  SQLITE3_A10N_C="native/dummy.c"
-  SQLITE3_A10N_O="dummy.lo"
-fi
 AC_SUBST(SQLITE3_INC)
 AC_SUBST(SQLITE3_LIB)
-AC_SUBST(SQLITE3_A10N_C)
-AC_SUBST(SQLITE3_A10N_O)
-AC_SUBST(SQLITE3_A10N_FLAGS)
 AC_SUBST(HAVE_SQLITE3)
 
 ##########
@@ -331,7 +324,7 @@ if test "$HAVE_SQLITE3" = 1 -a -z "$SQLI
 	       HAVE_SQLITE3_OPEN_V2=1,HAVE_SQLITE3_OPEN_V2=0)
   if test "$enable_load_extension" = "yes" ; then
     AC_CHECK_LIB(sqlite3,sqlite3_load_extension,
-		 HAVE_SQLITE3_LOAD_EXTENSION=,HAVE_SQLITE3_LOAD_EXTENSION=0)
+		 HAVE_SQLITE3_LOAD_EXTENSION=1,HAVE_SQLITE3_LOAD_EXTENSION=0)
   fi
   LIBS=$saved_LIBS
   CFLAGS=$saved_CFLAGS
@@ -354,6 +347,14 @@ AC_SUBST(HAVE_SQLITE3_SHARED_CACHE)
 AC_SUBST(HAVE_SQLITE3_OPEN_V2)
 AC_SUBST(HAVE_SQLITE3_LOAD_EXTENSION)
 
+if test -z "$SQLITE3_A10N_C" ; then
+  SQLITE3_A10N_C="native/dummy.c"
+  SQLITE3_A10N_O="dummy.lo"
+fi
+AC_SUBST(SQLITE3_A10N_C)
+AC_SUBST(SQLITE3_A10N_O)
+AC_SUBST(SQLITE3_A10N_FLAGS)
+
 ##########
 # Any usable SQLite found ?
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Feb 2009 01:37:24 -0000	1.5
+++ .cvsignore	14 Apr 2009 08:21:29 -0000	1.6
@@ -1 +1 @@
-javasqlite-20090213.tar.gz
+javasqlite-20090409.tar.gz


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- javasqlite.spec	25 Feb 2009 09:03:46 -0000	1.10
+++ javasqlite.spec	14 Apr 2009 08:21:30 -0000	1.11
@@ -1,8 +1,6 @@
-%global rpmver  %(v=$(rpmbuild --version | sed -e 's/.* //') ; echo ${v:-0})
-
 Name:           javasqlite
-Version:        20090213
-Release:        2%{?dist}
+Version:        20090409
+Release:        1%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -11,6 +9,8 @@
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
 # jnipath: Fedora specific, no need to send upstream.
 Patch0:         %{name}-20081006-jnipath.patch
+# Sent upstream 20090412
+Patch1:         %{name}-20090409-check-features.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sqlite-devel
@@ -27,7 +27,7 @@
 %package        javadoc
 Summary:        API documentation for %{name}
 Group:          Documentation
-%if "%{rpmver}" >= "4.6.0"
+%if 0%{?fedora} > 9
 BuildArch:      noarch
 %endif
 Requires:       java-javadoc
@@ -39,6 +39,7 @@
 %prep
 %setup -q
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
+%patch1 -p1
 sed -i -e 's/\r//g' doc/ajhowto.txt
 f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
@@ -46,18 +47,20 @@
 %build
 
 origpath="$PATH"
+common_flags="
+    --enable-load-extension
+    --with-jardir=%{_libdir}/%{name}
+    --libdir=%{_libdir}/%{name}
+"
 
 # Pass #1: JDBC 3 driver and common files with 1.5.0
 export PATH="%{_jvmdir}/java-1.5.0/bin:$origpath" # bug 460761
-%configure --with-jdk=%{_jvmdir}/java-1.5.0
+%configure $common_flags --with-jdk=%{_jvmdir}/java-1.5.0
 make %{?_smp_mflags} sqlite.jar JAVAC_FLAGS="-source 5"
 
 # Pass #2: JDBC 4 driver and the rest with 1.6.0
 export PATH="%{_jvmdir}/java-1.6.0/bin:$origpath" # bug 460761 (to be sure)
-%configure \
-    --with-jdk=%{_jvmdir}/java-1.6.0 \
-    --with-jardir=%{_libdir}/%{name} \
-    --libdir=%{_libdir}/%{name}
+%configure $common_flags --with-jdk=%{_jvmdir}/java-1.6.0
 make %{?_smp_mflags}
 
 # Add JDBC 3 classes
@@ -101,6 +104,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-1
+- Update to 20090409, enable extension loading.
+- Patch to actually check features of system sqlite lib at build time.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Feb 2009 01:37:24 -0000	1.5
+++ sources	14 Apr 2009 08:21:30 -0000	1.6
@@ -1 +1 @@
-13cfd717bed81409504abf73c0d59260  javasqlite-20090213.tar.gz
+fab26fee79be07fe3097b39ead7046d4  javasqlite-20090409.tar.gz



From peter at fedoraproject.org  Tue Apr 14 08:22:39 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 14 Apr 2009 08:22:39 +0000 (UTC)
Subject: rpms/flashrom/F-9 .cvsignore, 1.13, 1.14 flashrom.spec, 1.15,
	1.16 import.log, 1.5, 1.6 sources, 1.13, 1.14
Message-ID: <20090414082239.522B9700B2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8365/F-9

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 4107


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Mar 2009 13:03:56 -0000	1.13
+++ .cvsignore	14 Apr 2009 08:22:08 -0000	1.14
@@ -1 +1 @@
-flashrom-3984.tar.bz2
+flashrom-4107.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-9/flashrom.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- flashrom.spec	11 Mar 2009 13:03:56 -0000	1.15
+++ flashrom.spec	14 Apr 2009 08:22:08 -0000	1.16
@@ -1,8 +1,8 @@
-%define svnver 3984
+%define svnver 4107
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.17.20090311svn%{svnver}%{?dist}
+Release:	0.18.20090414svn%{svnver}%{?dist}
 License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
@@ -14,8 +14,8 @@
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Lacks of <sys/io.h>, see BZ# 283491, 450273
-ExcludeArch:	ppc ppc64 sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+# see BZ# 283491, 450273, 495226
+ExclusiveArch:	%{ix86} x86_64
 
 %description
 Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents
@@ -45,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue Apr 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090414svn4107
+- Various manpage / README fixes
+- Board enable support for HP DL145 G3
+- high coreboot table support
+- Since now we're using ExclusiveArch
+
 * Wed Mar 11 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.17.20090311svn3984
 - MSI MS-7046 board enable
 - Intel Desktop Board D201GLY


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-9/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Mar 2009 13:03:56 -0000	1.5
+++ import.log	14 Apr 2009 08:22:08 -0000	1.6
@@ -3,3 +3,4 @@
 flashrom-0-0_14_20081103svn3723_fc9:F-9:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701693
 flashrom-0-0_15_20090112svn3852_fc10:F-9:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231412366
 flashrom-0-0_17_20090311svn3984_fc10:F-9:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776575
+flashrom-0-0_18_20090414svn4107_fc10:F-9:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239697141


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Mar 2009 13:03:56 -0000	1.13
+++ sources	14 Apr 2009 08:22:08 -0000	1.14
@@ -1 +1 @@
-78817263019763c4d08c95f2d4542ef7  flashrom-3984.tar.bz2
+784e25d61ac3ae7f3d31914e963acaa3  flashrom-4107.tar.bz2



From pkgdb at fedoraproject.org  Tue Apr 14 08:22:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 08:22:42 +0000
Subject: [pkgdb] fakechroot had acl change status
Message-ID: <20090414082242.467A810F87B@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on fakechroot (Fedora devel) to Approved for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 08:22:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 08:22:43 +0000
Subject: [pkgdb] fakechroot had acl change status
Message-ID: <20090414082244.009CF10F87E@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on fakechroot (Fedora devel) to Approved for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 08:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 08:22:45 +0000
Subject: [pkgdb] fakechroot had acl change status
Message-ID: <20090414082245.EA63410F882@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on fakechroot (Fedora devel) to Approved for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 08:23:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 08:23:00 +0000
Subject: [pkgdb] fakechroot had acl change status
Message-ID: <20090414082301.0514010F883@bastion2.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on fakechroot (Fedora 10) to Approved for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 08:23:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 08:23:01 +0000
Subject: [pkgdb] fakechroot had acl change status
Message-ID: <20090414082301.D618F10F886@bastion2.fedora.phx.redhat.com>

athimm has set the watchcommits acl on fakechroot (Fedora 10) to Approved for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From pkgdb at fedoraproject.org  Tue Apr 14 08:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 08:23:03 +0000
Subject: [pkgdb] fakechroot had acl change status
Message-ID: <20090414082303.BB25610F87B@bastion2.fedora.phx.redhat.com>

athimm has set the commit acl on fakechroot (Fedora 10) to Approved for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From peter at fedoraproject.org  Tue Apr 14 08:24:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 14 Apr 2009 08:24:48 +0000 (UTC)
Subject: rpms/flashrom/EL-5 .cvsignore, 1.13, 1.14 flashrom.spec, 1.15,
	1.16 import.log, 1.5, 1.6 sources, 1.13, 1.14
Message-ID: <20090414082448.EEC0D700B2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9240/EL-5

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 4107


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Mar 2009 13:05:40 -0000	1.13
+++ .cvsignore	14 Apr 2009 08:24:17 -0000	1.14
@@ -1 +1 @@
-flashrom-3984.tar.bz2
+flashrom-4107.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/flashrom.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- flashrom.spec	11 Mar 2009 13:05:40 -0000	1.15
+++ flashrom.spec	14 Apr 2009 08:24:17 -0000	1.16
@@ -1,8 +1,8 @@
-%define svnver 3984
+%define svnver 4107
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.17.20090311svn%{svnver}%{?dist}
+Release:	0.18.20090414svn%{svnver}%{?dist}
 License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
@@ -14,8 +14,8 @@
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Lacks of <sys/io.h>, see BZ# 283491, 450273
-ExcludeArch:	ppc ppc64 sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+# see BZ# 283491, 450273, 495226
+ExclusiveArch:	%{ix86} x86_64
 
 %description
 Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents
@@ -45,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue Apr 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090414svn4107
+- Various manpage / README fixes
+- Board enable support for HP DL145 G3
+- high coreboot table support
+- Since now we're using ExclusiveArch
+
 * Wed Mar 11 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.17.20090311svn3984
 - MSI MS-7046 board enable
 - Intel Desktop Board D201GLY


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Mar 2009 13:05:40 -0000	1.5
+++ import.log	14 Apr 2009 08:24:17 -0000	1.6
@@ -3,3 +3,4 @@
 flashrom-0-0_14_20081103svn3723_fc9:EL-5:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701973
 flashrom-0-0_15_20090112svn3852_fc10:EL-5:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231426886
 flashrom-0-0_17_20090311svn3984_fc10:EL-5:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776717
+flashrom-0-0_18_20090414svn4107_fc10:EL-5:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239697384


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Mar 2009 13:05:40 -0000	1.13
+++ sources	14 Apr 2009 08:24:17 -0000	1.14
@@ -1 +1 @@
-78817263019763c4d08c95f2d4542ef7  flashrom-3984.tar.bz2
+784e25d61ac3ae7f3d31914e963acaa3  flashrom-4107.tar.bz2



From peter at fedoraproject.org  Tue Apr 14 08:26:59 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 14 Apr 2009 08:26:59 +0000 (UTC)
Subject: rpms/flashrom/EL-4 .cvsignore, 1.13, 1.14 flashrom.spec, 1.15,
	1.16 import.log, 1.5, 1.6 sources, 1.13, 1.14
Message-ID: <20090414082659.3BE38700B2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/flashrom/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10271/EL-4

Modified Files:
	.cvsignore flashrom.spec import.log sources 
Log Message:
svn ver. 4107


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Mar 2009 13:07:14 -0000	1.13
+++ .cvsignore	14 Apr 2009 08:26:28 -0000	1.14
@@ -1 +1 @@
-flashrom-3984.tar.bz2
+flashrom-4107.tar.bz2


Index: flashrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/flashrom.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- flashrom.spec	11 Mar 2009 13:07:14 -0000	1.15
+++ flashrom.spec	14 Apr 2009 08:26:28 -0000	1.16
@@ -1,8 +1,8 @@
-%define svnver 3984
+%define svnver 4107
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.17.20090311svn%{svnver}%{?dist}
+Release:	0.18.20090414svn%{svnver}%{?dist}
 License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
@@ -14,8 +14,8 @@
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Lacks of <sys/io.h>, see BZ# 283491, 450273
-ExcludeArch:	ppc ppc64 sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+# see BZ# 283491, 450273, 495226
+ExclusiveArch:	%{ix86} x86_64
 
 %description
 Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents
@@ -45,6 +45,12 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue Apr 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.18.20090414svn4107
+- Various manpage / README fixes
+- Board enable support for HP DL145 G3
+- high coreboot table support
+- Since now we're using ExclusiveArch
+
 * Wed Mar 11 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.17.20090311svn3984
 - MSI MS-7046 board enable
 - Intel Desktop Board D201GLY


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Mar 2009 13:07:14 -0000	1.5
+++ import.log	14 Apr 2009 08:26:28 -0000	1.6
@@ -3,3 +3,4 @@
 flashrom-0-0_14_20081103svn3723_fc9:EL-4:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225702185
 flashrom-0-0_15_20090112svn3852_fc10:EL-4:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431453
 flashrom-0-0_17_20090311svn3984_fc10:EL-4:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776794
+flashrom-0-0_18_20090414svn4107_fc10:EL-4:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239697521


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flashrom/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Mar 2009 13:07:14 -0000	1.13
+++ sources	14 Apr 2009 08:26:28 -0000	1.14
@@ -1 +1 @@
-78817263019763c4d08c95f2d4542ef7  flashrom-3984.tar.bz2
+784e25d61ac3ae7f3d31914e963acaa3  flashrom-4107.tar.bz2



From bagnara at fedoraproject.org  Tue Apr 14 08:03:26 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 14 Apr 2009 08:03:26 +0000 (UTC)
Subject: rpms/ppl/F-9 ppl-0.10.1-Makefile.patch, NONE, 1.1 ppl.hh, 1.1,
	1.2 ppl.spec, 1.14, 1.15 ppl_c.h, 1.1, 1.2 pwl.hh, 1.1, 1.2
Message-ID: <20090414080326.2D408700B2@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv325

Modified Files:
	ppl.hh ppl.spec ppl_c.h pwl.hh 
Added Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.1.


ppl-0.10.1-Makefile.patch:

--- NEW FILE ppl-0.10.1-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl.hh	9 Jan 2008 10:47:16 -0000	1.1
+++ ppl.hh	14 Apr 2009 08:02:55 -0000	1.2
@@ -1,5 +1,5 @@
 /* This is the header file switcher of the Parma Polyhedra Library.
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Polyhedra Library (PPL).
 


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ppl.spec	4 Nov 2008 17:19:47 -0000	1.14
+++ ppl.spec	14 Apr 2009 08:02:55 -0000	1.15
@@ -1,8 +1,8 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10
-Release:        3%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -12,8 +12,8 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-#Patch0:        none
-#Patch1:        none
+Patch0:         ppl-0.10.1-Makefile.patch
+#Patch1:
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -60,7 +60,7 @@
 This package contains the mixed integer linear programming solver ppl_lpsol
 and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra.
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %package gprolog
 # The `gprolog' package is not available on ppc64:
 # the GNU Prolog interface must thus be disabled for that architecture.
@@ -73,7 +73,7 @@
 Install this package if you want to use the library in GNU Prolog programs.
 %endif
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %package gprolog-static
 Summary:        The static archive for the GNU Prolog interface of the Parma Polyhedra Library
 Group:          Development/Libraries
@@ -198,16 +198,16 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 #%patch1 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
 %endif
 CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
-%configure --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
+%configure --docdir=%{_datadir}/doc/%{name}-%{version} --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' Watchdog/libtool
@@ -245,27 +245,25 @@
 # Install the Javadocs for ppl-java.
 mkdir -p %{buildroot}%{_javadocdir}
 mv \
-%{buildroot}/%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}-html \
+%{buildroot}/%{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}-html \
 %{buildroot}%{_javadocdir}/%{name}-java
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/BUGS
-%doc %{_datadir}/doc/%{name}/COPYING
-%doc %{_datadir}/doc/%{name}/CREDITS
-%doc %{_datadir}/doc/%{name}/ChangeLog
-%doc %{_datadir}/doc/%{name}/NEWS
-%doc %{_datadir}/doc/%{name}/README
-%doc %{_datadir}/doc/%{name}/README.configure
-%doc %{_datadir}/doc/%{name}/TODO
-%doc %{_datadir}/doc/%{name}/gpl.*
+%doc %{_datadir}/doc/%{name}-%{version}/BUGS
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/CREDITS
+%doc %{_datadir}/doc/%{name}-%{version}/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/README.configure
+%doc %{_datadir}/doc/%{name}-%{version}/TODO
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.txt
 %{_libdir}/libppl.so.*
 %{_libdir}/libppl_c.so.*
 %{_bindir}/ppl-config
 %{_mandir}/man1/ppl-config.1.gz
-
 %dir %{_libdir}/%{name}
-%dir %{_datadir}/doc/%{name}
+%dir %{_datadir}/doc/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -290,7 +288,7 @@
 %{_mandir}/man1/ppl_lcdd.1.gz
 %{_mandir}/man1/ppl_lpsol.1.gz
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %files gprolog
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/GNU/README.gprolog
@@ -299,7 +297,7 @@
 %{_libdir}/%{name}/libppl_gprolog.so
 %endif
 
-%ifnarch ppc64
+%ifnarch ia64 ppc64 s390 s390x
 %files gprolog-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_gprolog.a
@@ -346,33 +344,36 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/README.doc
-%doc %{_datadir}/doc/%{name}/fdl.*
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.pdf
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.ps.gz
-#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.ps.gz
-%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog*
+%doc %{_datadir}/doc/%{name}-%{version}/README.doc
+%doc %{_datadir}/doc/%{name}-%{version}/fdl.*
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/gpl.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}-html/
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}-html/
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.pdf
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.ps.gz
+#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.ps.gz
 
 %files pwl
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/pwl/BUGS
-%doc %{_datadir}/doc/pwl/COPYING
-%doc %{_datadir}/doc/pwl/CREDITS
-%doc %{_datadir}/doc/pwl/ChangeLog
-%doc %{_datadir}/doc/pwl/NEWS
-%doc %{_datadir}/doc/pwl/README
-%doc %{_datadir}/doc/pwl/gpl.*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/BUGS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/CREDITS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/README
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.txt
 %{_libdir}/libpwl.so.*
+%dir %{_datadir}/doc/%{name}-%{version}/pwl
 
 %files pwl-devel
 %defattr(-,root,root,-)
@@ -386,11 +387,14 @@
 
 %files pwl-docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/pwl/README.doc
-%doc %{_datadir}/doc/pwl/fdl.*
-%doc %{_datadir}/doc/pwl/pwl-user-0.5-html/
-%doc %{_datadir}/doc/pwl/pwl-user-0.5.pdf
-%doc %{_datadir}/doc/pwl/pwl-user-0.5.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/ChangeLog*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/README.doc
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/fdl.*
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.ps.gz
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7-html/
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.pdf
+%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.ps.gz
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -401,13 +405,45 @@
 rm -rf %{buildroot}
 
 %changelog
-* Thu Nov 4 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-3
+* Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
+- Updated for PPL 0.10.1.
+
+* Sun Mar 29 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-11
+- Moved changelogs and PostScript and PDF versions of the GPL to the
+  `docs' subpackages. This saves considerable space on the live media.
+
+* Tue Mar 24 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-10
+- There are no GNU Prolog packages available on ia64: disable the GNU Prolog
+  interface also on those platforms (besides ppc64, s390 and s390x).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild.
+
+* Wed Feb 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-8
+- Install the documentation according to the Fedora packaging conventions.
+
+* Wed Feb 17 2009 Karsten Hopp <karsten at redhat.comt> 0.10-7
+- There are no GNU Prolog packages available on s390 and s390x: disable
+  the GNU Prolog interface also on those platforms (besides ppc64).
+
+* Wed Feb 04 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-6
+- Better workaround for the bug affecting PPL 0.10 on big-endian
+  architectures.
+
+* Tue Feb 03 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-5
+- Work around the bug affecting PPL 0.10 on big-endian architectures.
+
+* Fri Dec 05 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-4
+- Added `%%dir %%{_datadir}/doc/pwl' to the `%%files' section
+  of the `ppl-pwl' package.
+
+* Thu Nov 04 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-3
 - Fixed the requirements of the `ppl-java' package.
 
-* Thu Nov 4 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-2
+* Thu Nov 04 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-2
 - Added m4 >= 1.4.8 to build requirements.
 
-* Thu Nov 4 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-1
+* Thu Nov 04 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.10-1
 - Updated and extended for PPL 0.10.  In particular, the `ppl-config'
   program, being useful also for non-development activities, has been
   brought back to the main package.
@@ -415,17 +451,17 @@
 * Tue Sep 30 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-25
 - The `swiprolog' package now requires pl >= 5.6.57-2.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
 - Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
   the `-v' option.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
 - Fixed ppl-0.9-swiprolog.patch.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
 - Implemented a workaround to cope with the new location of SWI-Prolog.h.
 
-* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
+* Mon Sep 08 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
 - Fixed the SWI-Prolog interface dependencies.
 
 * Mon May 19 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-20


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl_c.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl_c.h	9 Jan 2008 10:47:16 -0000	1.1
+++ ppl_c.h	14 Apr 2009 08:02:55 -0000	1.2
@@ -1,5 +1,5 @@
 /* Header file switcher for the C interface.  -*- C -*-
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Polyhedra Library (PPL).
 


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/pwl.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pwl.hh	9 Jan 2008 10:47:16 -0000	1.1
+++ pwl.hh	14 Apr 2009 08:02:55 -0000	1.2
@@ -1,5 +1,5 @@
 /* This is the header file switcher of the Parma Watchdog Library.
-   Copyright (C) 2001-2008 Roberto Bagnara <bagnara at cs.unipr.it>
+   Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
 
 This file is part of the Parma Watchdog Library (PWL).
 



From athimm at fedoraproject.org  Tue Apr 14 08:45:33 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Tue, 14 Apr 2009 08:45:33 +0000 (UTC)
Subject: rpms/fedora-package-config-smart/devel
	fedora-package-config-smart.spec, 1.12, 1.13
Message-ID: <20090414084533.6F631700B2@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15170/devel

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Fix bug #494068


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-package-config-smart.spec	24 Feb 2009 16:35:21 -0000	1.12
+++ fedora-package-config-smart.spec	14 Apr 2009 08:45:02 -0000	1.13
@@ -4,8 +4,8 @@
 
 Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
-Version: 9.89
-Release: 15
+Version: 10.92
+Release: 16
 License: GPL+
 Group: System Environment/Base
 URL: http://fedoraproject.org/
@@ -24,7 +24,7 @@
 # place the proper arch in the folders
 for filein in *.channel.in; do
   file=`echo $filein | sed -e's,\.in$,,'`
-  sed -e's, at ARCH@,%{_target_cpu},g' -e's, at DISTVERSION@,%{version},' < $filein > $file
+  sed -e's, at ARCH@,%{_arch},g' -e's, at DISTVERSION@,%{version},' < $filein > $file
 done
 
 %if %{rawhide}
@@ -51,6 +51,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Tue Apr 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 10.92-16
+- Use %%_arch instead of %%_target_cpu.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.89-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From gdha at fedoraproject.org  Tue Apr 14 08:50:05 2009
From: gdha at fedoraproject.org (Gratien Dhaese)
Date: Tue, 14 Apr 2009 08:50:05 +0000 (UTC)
Subject: rpms/rear/EL-5 import.log, NONE, 1.1 rear.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414085005.3B7B970137@cvs1.fedora.phx.redhat.com>

Author: gdha

Update of /cvs/pkgs/rpms/rear/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16159/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rear.spec 
Log Message:
* Fri Apr 10 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- initial import of the rear package into CVS



--- NEW FILE import.log ---
rear-1_7_20-1_fc10:EL-5:rear-1.7.20-1.fc10.src.rpm:1239698771


--- NEW FILE rear.spec ---
Name: rear
Version: 1.7.20
Release: 1%{?dist}
Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework

Group: Applications/Archiving
License: GPLv2+
URL: http://rear.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

# all RPM based systems seem to have this
Requires: mingetty binutils portmap iputils
Requires: iproute
Requires: /usr/bin/mkisofs
Requires: tar


%description
Relax and Recover (abbreviated rear) is a highly modular disaster recovery
framework for GNU/Linux based systems, but can be easily extended to other
UNIX alike systems. The disaster recovery information (and maybe the backups)
can be stored via the network, local on hard disks or USB devices, DVD/CD-R,
tape, etc. The result is also a bootable image that is capable of booting via
PXE, DVD/CD and USB media.

Relax and Recover integrates with other backup software and provides integrated
bare metal disaster recovery abilities to the compatible backup software.

%prep
%setup -q
 
%build
# no code to compile - all bash scripts

%install
rm -rf $RPM_BUILD_ROOT
# create directories
mkdir -vp \
	$RPM_BUILD_ROOT%{_mandir}/man8 \
	$RPM_BUILD_ROOT%{_datadir} \
	$RPM_BUILD_ROOT%{_sysconfdir} \
	$RPM_BUILD_ROOT%{_sbindir} \
	$RPM_BUILD_ROOT%{_localstatedir}/lib/rear

# copy rear components into directories
cp -av usr/share/rear $RPM_BUILD_ROOT%{_datadir}/
cp -av usr/sbin/rear $RPM_BUILD_ROOT%{_sbindir}/
cp -av etc/rear $RPM_BUILD_ROOT%{_sysconfdir}/

# patch rear main script with correct locations for rear components
sed -i	-e 's#^CONFIG_DIR=.*#CONFIG_DIR="%{_sysconfdir}/rear"#' \
	-e 's#^SHARE_DIR=.*#SHARE_DIR="%{_datadir}/rear"#' \
	-e 's#^VAR_DIR=.*#VAR_DIR="%{_localstatedir}/lib/rear"#' \
	$RPM_BUILD_ROOT%{_sbindir}/rear

# update man page with correct locations
sed	-e 's#/etc#%{_sysconfdir}#' \
	-e 's#/usr/sbin#%{_sbindir}#' \
	-e 's#/usr/share#%{_datadir}#' \
	-e 's#/usr/share/doc/packages#%{_docdir}#' \
	doc/rear.8 >$RPM_BUILD_ROOT%{_mandir}/man8/rear.8

# remove doc files under  $RPM_BUILD_ROOT/usr/share/rear
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/README
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/CHANGES
rm -f $RPM_BUILD_ROOT%{_datadir}/rear/COPYING
rm -rf $RPM_BUILD_ROOT%{_datadir}/rear/doc/*

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING CHANGES README
%doc doc/README.doc doc/relax-recover-*
%{_sbindir}/rear
%{_datadir}/rear
%{_localstatedir}/lib/rear
%{_mandir}/man8/*
%config(noreplace) %{_sysconfdir}/rear


%changelog
* Thu Apr 02 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.20-1
- update %%_localstatedir/rear to %%_localstatedir/lib/rear

* Mon Mar 16 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.19-1
- updated description, made the spec file a bit more readable
- changed BuildArchives in BuildArch

* Sun Mar 15 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.18-1
- updated spec file to support openSUSE 11.1

* Fri Mar 13 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.17-1
- do not gzip man page in spec file - rpmbuild will do this for us
- added extra %%doc line for excluding man page from doc itself

* Thu Feb 26 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.16-1
- make the spec better readable and removed not spec related items in changelog

* Tue Feb 04 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.15-1
- update the Fedora spec file with the 1.7.14 items
- added VAR_DIR (%%{_localstatedir}) variable to rear for /var/rear/recovery system data

* Thu Jan 29 2009 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.7.14-1
- added man page

* Tue Jan 20 2009 Gratien D'haese <gdha at sourceforge.net> - 1.7.13-1
- add COPYING license file

* Wed Dec 17 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.10-1
- remove contrib entry from %%doc line in spec file

* Mon Dec 01 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.9-1
- copy rear.sourcespec according OS_VENDOR
- correct rear.spec file according comment 11 of bugzilla #468189

* Mon Oct 27 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.8-1
- Fix rpmlint error/warnings for Fedora packaging
- updated the Summary line and %%install section

* Thu Oct 24 2008 Gratien D'haese <gdha at sourceforge.net> - 1.7.7-1
- rewrote rear.spec for Fedora Packaging request

* Tue Aug 28 2006 Schlomo Schapiro <rear at schlomo.schapiro.org> - 1.0-1
- Initial RPM Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rear/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2009 21:05:31 -0000	1.1
+++ .cvsignore	14 Apr 2009 08:49:33 -0000	1.2
@@ -0,0 +1 @@
+rear-1.7.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rear/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2009 21:05:31 -0000	1.1
+++ sources	14 Apr 2009 08:49:34 -0000	1.2
@@ -0,0 +1 @@
+8fed5a4d9e12aa94a97adff06979345a  rear-1.7.20.tar.gz



From mhlavink at fedoraproject.org  Tue Apr 14 08:59:43 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 14 Apr 2009 08:59:43 +0000 (UTC)
Subject: rpms/nut/devel nut.spec,1.70,1.71
Message-ID: <20090414085943.3F10B700B2@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19656

Modified Files:
	nut.spec 
Log Message:
change group from uucp to dialout (follow udev)



Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/nut.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- nut.spec	26 Feb 2009 06:26:40 -0000	1.70
+++ nut.spec	14 Apr 2009 08:59:12 -0000	1.71
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -122,7 +122,7 @@
 autoreconf -i
 %configure \
     --with-user=%{name} \
-    --with-group=uucp \
+    --with-group=dialout \
     --with-statepath=%{piddir} \
     --with-pidpath=%{piddir} \
     --with-altpidpath=%{piddir} \
@@ -183,15 +183,15 @@
 done
 
 %pre
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G uucp \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
 
 %pre client
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G uucp \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
 
 %pre cgi
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G uucp \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
 
 %post client
@@ -337,6 +337,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Tue Apr 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.4.1-3
+- udev changed group from uucp to dialout, follow the change (#494020)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Apr 14 09:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 09:00:11 +0000
Subject: [pkgdb] wireshark: cosmin has requested watchcommits
Message-ID: <20090414090012.549EF10F87B@bastion2.fedora.phx.redhat.com>

cosmin has requested the watchcommits acl on wireshark (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Tue Apr 14 09:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 09:01:46 +0000
Subject: [pkgdb] wireshark: cosmin has given up watchcommits
Message-ID: <20090414090147.2C3BC10F85A@bastion2.fedora.phx.redhat.com>

cosmin has given up the watchcommits acl on wireshark (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From kwizart at fedoraproject.org  Tue Apr 14 09:02:48 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 14 Apr 2009 09:02:48 +0000 (UTC)
Subject: rpms/frei0r-plugins/devel frei0r-plugins-1.1.21-libdir.patch, NONE, 
	1.1 frei0r-plugins.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414090248.209A4700B2@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/frei0r-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20825/devel

Modified Files:
	.cvsignore sources 
Added Files:
	frei0r-plugins-1.1.21-libdir.patch frei0r-plugins.spec 
	import.log 
Log Message:
Initial import for Rawhide


frei0r-plugins-1.1.21-libdir.patch:

--- NEW FILE frei0r-plugins-1.1.21-libdir.patch ---
diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am
--- frei0r-plugins-1.1.21/src/Makefile.am.libdir	2008-06-07 15:21:48.000000000 +0200
+++ frei0r-plugins-1.1.21/src/Makefile.am	2008-06-07 15:23:30.000000000 +0200
@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I at top_srcdir@/include 
 AM_CFLAGS = -I at top_srcdir@/include 
 AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
 
-plugindir = @prefix@/lib/frei0r-1
+plugindir = @libdir@/frei0r-1
 
 
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in
--- frei0r-plugins-1.1.21/src/Makefile.in.libdir	2008-06-07 15:21:44.000000000 +0200
+++ frei0r-plugins-1.1.21/src/Makefile.in	2008-06-07 15:23:08.000000000 +0200
@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c
 AM_CPPFLAGS = -I at top_srcdir@/include 
 AM_CFLAGS = -I at top_srcdir@/include 
 AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
-plugindir = @prefix@/lib/frei0r-1
+plugindir = @libdir@/frei0r-1
 all: all-am
 
 .SUFFIXES:


--- NEW FILE frei0r-plugins.spec ---
Name:           frei0r-plugins
Version:        1.1.22
Release:        1%{?dist}
Summary:        Frei0r - a minimalistic plugin API for video effects

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.piksel.org/frei0r
Source0:        http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz
Patch0:         frei0r-plugins-1.1.21-libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gavl-devel >= 0.2.3
BuildRequires:  opencv-devel >= 1.0.0
     

%description
It is a minimalistic plugin API for video sources and filters. The behaviour of
the effects can be controlled from the host by simple parameters. The intent is
to solve the recurring reimplementation or adaptation issue of standard effect

%package -n     frei0r-devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description -n frei0r-devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%if %{_lib} == lib64
%patch0 -p1 -b .libdir
%endif

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/frei0r-1/*.so

%files -n frei0r-devel
%defattr(-,root,root,-)
%{_includedir}/frei0r.h

%changelog
* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.22-1
- Update to 1.1.22
- Prevent timestamp change when installing

* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.1.21-2
- Add gcc43 patches

* Sat Jun  7 2008 kwizart < kwizart at gmail.com > - 1.1.21-1
- Initial spec file for Fedora.



--- NEW FILE import.log ---
frei0r-plugins-1_1_22-1_fc10:HEAD:frei0r-plugins-1.1.22-1.fc10.src.rpm:1239699754


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frei0r-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:18:51 -0000	1.1
+++ .cvsignore	14 Apr 2009 09:02:16 -0000	1.2
@@ -0,0 +1 @@
+frei0r-plugins-1.1.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frei0r-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:18:51 -0000	1.1
+++ sources	14 Apr 2009 09:02:17 -0000	1.2
@@ -0,0 +1 @@
+8123893c67fc5ce01ddcb09853d47ed4  frei0r-plugins-1.1.22.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 14 09:06:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 09:06:19 +0000
Subject: [pkgdb] gtk+: cosmin has requested watchcommits
Message-ID: <20090414090619.B3C8C10F87C@bastion2.fedora.phx.redhat.com>

cosmin has requested the watchcommits acl on gtk+ (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+



From phuang at fedoraproject.org  Tue Apr 14 09:06:25 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 14 Apr 2009 09:06:25 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.11,1.12 ibus.spec,1.62,1.63
Message-ID: <20090414090625.D3F64700B2@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22019

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch to improve security

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ibus-HEAD.patch	31 Mar 2009 03:55:08 -0000	1.11
+++ ibus-HEAD.patch	14 Apr 2009 09:06:24 -0000	1.12
@@ -0,0 +1,19 @@
+diff --git a/bus/server.c b/bus/server.c
+index 7245bd3..425dd86 100644
+--- a/bus/server.c
++++ b/bus/server.c
+@@ -90,10 +90,13 @@ bus_server_listen (BusServer *server)
+     gboolean retval;
+ 
+     path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
+-    mkdir (path, 0775);
++    mkdir (path, 0700);
++    chmod (path, 0700);
++
+     address = ibus_get_address ();
+ 
+     retval = ibus_server_listen (IBUS_SERVER (server), address);
++    chmod (ibus_get_socket_path (), 0600);
+ 
+     if (!retval) {
+         g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ibus.spec	13 Apr 2009 08:54:32 -0000	1.62
+++ ibus.spec	14 Apr 2009 09:06:25 -0000	1.63
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090413
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -105,8 +105,7 @@
 
 %prep
 %setup -q
-# rm -rf docs/reference/ibus/ibus-sections.txt
-# %patch0 -p1
+%patch0 -p1
 # ./autogen.sh --help
 
 %build
@@ -218,6 +217,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 14 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-2
+- Update ibus-HEAD.patch.
+- Change the mode of /tmp/ibus-$USER to 0700 to improve security
+- Change the mode of /tmp/ibus-$USER/socket-address to 0600 to improve security
+
 * Mon Apr 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-1
 - Update to ibus-1.1.0.20090413.
 - Fix crash when restart the ibus-daemon



From phuang at fedoraproject.org  Tue Apr 14 09:10:40 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 14 Apr 2009 09:10:40 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.12,1.13 ibus.spec,1.63,1.64
Message-ID: <20090414091040.89C3F700B2@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23163

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Add as.po

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ibus-HEAD.patch	14 Apr 2009 09:06:24 -0000	1.12
+++ ibus-HEAD.patch	14 Apr 2009 09:10:39 -0000	1.13
@@ -17,3 +17,402 @@
  
      if (!retval) {
          g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
+diff --git a/po/as.po b/po/as.po
+index 8e33ca2..9b81669 100644
+--- a/po/as.po
++++ b/po/as.po
+@@ -6,8 +6,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: ibus.master.ibus.as\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-02 02:13+0000\n"
+-"PO-Revision-Date: 2009-04-08 15:55+0530\n"
++"POT-Creation-Date: 2009-04-06 11:45+0800\n"
++"PO-Revision-Date: 2009-04-09 19:03+0530\n"
+ "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
+ "Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+@@ -16,163 +16,19 @@ msgstr ""
+ "X-Generator: Lokalize 0.3\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
+ 
+-#: ../src/keyname-table.h:3940
+-msgid "keyboard label|BackSpace"
+-msgstr "keyboard label|BackSpace"
++#: ../bus/ibus.desktop.in.h:1
++msgid "IBus"
++msgstr "IBus"
+ 
+-#: ../src/keyname-table.h:3941
+-msgid "keyboard label|Tab"
+-msgstr "keyboard label|Tab"
+-
+-#: ../src/keyname-table.h:3942
+-msgid "keyboard label|Return"
+-msgstr "keyboard label|Return"
+-
+-#: ../src/keyname-table.h:3943
+-msgid "keyboard label|Pause"
+-msgstr "keyboard label|Pause"
+-
+-#: ../src/keyname-table.h:3944
+-msgid "keyboard label|Scroll_Lock"
+-msgstr "keyboard label|Scroll_Lock"
+-
+-#: ../src/keyname-table.h:3945
+-msgid "keyboard label|Sys_Req"
+-msgstr "keyboard label|Sys_Req"
+-
+-#: ../src/keyname-table.h:3946
+-msgid "keyboard label|Escape"
+-msgstr "keyboard label|Escape"
+-
+-#: ../src/keyname-table.h:3947
+-msgid "keyboard label|Multi_key"
+-msgstr "keyboard label|Multi_key"
+-
+-#: ../src/keyname-table.h:3948
+-msgid "keyboard label|Home"
+-msgstr "keyboard label|Home"
+-
+-#: ../src/keyname-table.h:3949
+-msgid "keyboard label|Left"
+-msgstr "keyboard label|Left"
+-
+-#: ../src/keyname-table.h:3950
+-msgid "keyboard label|Up"
+-msgstr "keyboard label|Up"
+-
+-#: ../src/keyname-table.h:3951
+-msgid "keyboard label|Right"
+-msgstr "keyboard label|Right"
+-
+-#: ../src/keyname-table.h:3952
+-msgid "keyboard label|Down"
+-msgstr "keyboard label|Down"
+-
+-#: ../src/keyname-table.h:3953
+-msgid "keyboard label|Page_Up"
+-msgstr "keyboard label|Page_Up"
+-
+-#: ../src/keyname-table.h:3954
+-msgid "keyboard label|Page_Down"
+-msgstr "keyboard label|Page_Down"
+-
+-#: ../src/keyname-table.h:3955
+-msgid "keyboard label|End"
+-msgstr "keyboard label|End"
+-
+-#: ../src/keyname-table.h:3956
+-msgid "keyboard label|Begin"
+-msgstr "keyboard label|Begin"
+-
+-#: ../src/keyname-table.h:3957
+-msgid "keyboard label|Print"
+-msgstr "keyboard label|Print"
+-
+-#: ../src/keyname-table.h:3958
+-msgid "keyboard label|Insert"
+-msgstr "keyboard label|Insert"
+-
+-#: ../src/keyname-table.h:3959
+-msgid "keyboard label|Num_Lock"
+-msgstr "keyboard label|Num_Lock"
+-
+-#: ../src/keyname-table.h:3960
+-msgid "keyboard label|KP_Space"
+-msgstr "keyboard label|KP_Space"
+-
+-#: ../src/keyname-table.h:3961
+-msgid "keyboard label|KP_Tab"
+-msgstr "keyboard label|KP_Tab"
+-
+-#: ../src/keyname-table.h:3962
+-msgid "keyboard label|KP_Enter"
+-msgstr "keyboard label|KP_Enter"
+-
+-#: ../src/keyname-table.h:3963
+-msgid "keyboard label|KP_Home"
+-msgstr "keyboard label|KP_Home"
+-
+-#: ../src/keyname-table.h:3964
+-msgid "keyboard label|KP_Left"
+-msgstr "keyboard label|KP_Left"
+-
+-#: ../src/keyname-table.h:3965
+-msgid "keyboard label|KP_Up"
+-msgstr "keyboard label|KP_Up"
+-
+-#: ../src/keyname-table.h:3966
+-msgid "keyboard label|KP_Right"
+-msgstr "keyboard label|KP_Right"
+-
+-#: ../src/keyname-table.h:3967
+-msgid "keyboard label|KP_Down"
+-msgstr "keyboard label|KP_Down"
+-
+-#: ../src/keyname-table.h:3968
+-msgid "keyboard label|KP_Page_Up"
+-msgstr "keyboard label|KP_Page_Up"
+-
+-#: ../src/keyname-table.h:3969
+-msgid "keyboard label|KP_Prior"
+-msgstr "keyboard label|KP_Prior"
+-
+-#: ../src/keyname-table.h:3970
+-msgid "keyboard label|KP_Page_Down"
+-msgstr "keyboard label|KP_Page_Down"
+-
+-#: ../src/keyname-table.h:3971
+-msgid "keyboard label|KP_Next"
+-msgstr "keyboard label|KP_Next"
+-
+-#: ../src/keyname-table.h:3972
+-msgid "keyboard label|KP_End"
+-msgstr "keyboard label|KP_End"
+-
+-#: ../src/keyname-table.h:3973
+-msgid "keyboard label|KP_Begin"
+-msgstr "keyboard label|KP_Begin"
+-
+-#: ../src/keyname-table.h:3974
+-msgid "keyboard label|KP_Insert"
+-msgstr "keyboard label|KP_Insert"
+-
+-#: ../src/keyname-table.h:3975
+-msgid "keyboard label|KP_Delete"
+-msgstr "keyboard label|KP_Delete"
+-
+-#: ../src/keyname-table.h:3976
+-msgid "keyboard label|Delete"
+-msgstr "keyboard label|Delete"
++#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:97
++msgid "IBus input method framework"
++msgstr "IBus input method framework"
+ 
+ #: ../ibus/lang.py:40 ../ui/gtk/panel.py:307 ../ui/gtk/panel.py:308
+ #: ../ui/gtk/panel.py:309 ../ui/gtk/panel.py:310
+ msgid "Other"
+ msgstr "????????????"
+ 
+-#: ../ui/gtk/panel.py:97
+-msgid "IBus input method framework"
+-msgstr "IBus input method framework"
+-
+ #: ../ui/gtk/panel.py:282
+ msgid "Restart"
+ msgstr "???????????????????????????"
+@@ -191,25 +47,24 @@ msgstr "???????????????????????? ???????????? (aphukan at fedoraproject.org)"
+ 
+ #. create input methods menu
+ #: ../ui/gtk/languagebar.py:84
+-msgid "Switch engine"
+-msgstr "???????????? ???????????? ?????????"
++msgid "Switch input method"
++msgstr "??????????????? ?????????????????? ???????????? ?????????"
+ 
+ #: ../setup/main.py:103
+ msgid "trigger"
+ msgstr "?????????????????????"
+ 
+ #: ../setup/main.py:113
+-msgid "next engine"
+-msgstr "???????????? ????????????"
++msgid "next input method"
++msgstr "???????????? ??????????????? ??????????????????"
+ 
+ #: ../setup/main.py:123
+-msgid "prev engine"
+-msgstr "????????? ????????????"
++msgid "previous input method"
++msgstr "????????? ??????????????? ??????????????????"
+ 
+ #: ../setup/main.py:204
+ msgid "IBus daemon is not started. Do you want to start it now?"
+-msgstr ""
+-"IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
++msgstr "IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
+ 
+ #: ../setup/main.py:219
+ msgid ""
+@@ -219,8 +74,8 @@ msgid ""
+ "  export XMODIFIERS=@im=ibus\n"
+ "  export QT_IM_MODULE=ibus"
+ msgstr ""
+-"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????"
+-"$HOME/.bashrc ??? ????????? ????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
++"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????$HOME/.bashrc ??? ????????? "
++"????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
+ "  export GTK_IM_MODULE=ibus\n"
+ "  export XMODIFIERS=@im=ibus\n"
+ "  export QT_IM_MODULE=ibus"
+@@ -318,7 +173,7 @@ msgstr ""
+ "????????????????????????\n"
+ "???????????????"
+ 
+-#: ../setup/setup.glade.h:19
++#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+ msgid "IBus Preferences"
+ msgstr "IBus ???????????????"
+ 
+@@ -341,21 +196,21 @@ msgid "Next input method:"
+ msgstr "???????????? ??????????????? ??????????????????:"
+ 
+ #: ../setup/setup.glade.h:25
++msgid "Previous input method:"
++msgstr "????????? ??????????????? ??????????????????"
++
++#: ../setup/setup.glade.h:26
+ msgid "Show language panel:"
+ msgstr "??????????????? ??????????????? ????????????????????????:"
+ 
+-#: ../setup/setup.glade.h:26
++#: ../setup/setup.glade.h:27
+ msgid "Start ibus on login"
+ msgstr "????????????????????? ibus ??????????????? ?????????"
+ 
+-#: ../setup/setup.glade.h:27
++#: ../setup/setup.glade.h:28
+ msgid "Use custom font"
+ msgstr "???????????????????????????????????? ???????????? ????????????????????? ????????? ???'???"
+ 
+-#: ../setup/setup.glade.h:28
+-msgid "previous input method:"
+-msgstr "????????? ??????????????? ??????????????????:"
+-
+ #: ../data/ibus.schemas.in.h:1
+ msgid "Auto Hide"
+ msgstr "?????????????????????????????????????????? ??????????????????"
+@@ -405,8 +260,7 @@ msgid ""
+ "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+ "show"
+ msgstr ""
+-"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? "
+-"????????????????????????"
++"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? ????????????????????????"
+ 
+ #: ../data/ibus.schemas.in.h:13
+ msgid "Trigger Hotkey"
+@@ -428,4 +282,122 @@ msgstr "??????????????? ?????????????????? ???????????? ????????????????????????
+ msgid "[Control+space]"
+ msgstr "[Control+space]"
+ 
++#~ msgid "keyboard label|BackSpace"
++#~ msgstr "keyboard label|BackSpace"
++
++#~ msgid "keyboard label|Tab"
++#~ msgstr "keyboard label|Tab"
++
++#~ msgid "keyboard label|Return"
++#~ msgstr "keyboard label|Return"
++
++#~ msgid "keyboard label|Pause"
++#~ msgstr "keyboard label|Pause"
++
++#~ msgid "keyboard label|Scroll_Lock"
++#~ msgstr "keyboard label|Scroll_Lock"
++
++#~ msgid "keyboard label|Sys_Req"
++#~ msgstr "keyboard label|Sys_Req"
++
++#~ msgid "keyboard label|Escape"
++#~ msgstr "keyboard label|Escape"
++
++#~ msgid "keyboard label|Multi_key"
++#~ msgstr "keyboard label|Multi_key"
++
++#~ msgid "keyboard label|Home"
++#~ msgstr "keyboard label|Home"
++
++#~ msgid "keyboard label|Left"
++#~ msgstr "keyboard label|Left"
++
++#~ msgid "keyboard label|Up"
++#~ msgstr "keyboard label|Up"
++
++#~ msgid "keyboard label|Right"
++#~ msgstr "keyboard label|Right"
++
++#~ msgid "keyboard label|Down"
++#~ msgstr "keyboard label|Down"
++
++#~ msgid "keyboard label|Page_Up"
++#~ msgstr "keyboard label|Page_Up"
++
++#~ msgid "keyboard label|Page_Down"
++#~ msgstr "keyboard label|Page_Down"
++
++#~ msgid "keyboard label|End"
++#~ msgstr "keyboard label|End"
++
++#~ msgid "keyboard label|Begin"
++#~ msgstr "keyboard label|Begin"
++
++#~ msgid "keyboard label|Print"
++#~ msgstr "keyboard label|Print"
++
++#~ msgid "keyboard label|Insert"
++#~ msgstr "keyboard label|Insert"
++
++#~ msgid "keyboard label|Num_Lock"
++#~ msgstr "keyboard label|Num_Lock"
++
++#~ msgid "keyboard label|KP_Space"
++#~ msgstr "keyboard label|KP_Space"
++
++#~ msgid "keyboard label|KP_Tab"
++#~ msgstr "keyboard label|KP_Tab"
++
++#~ msgid "keyboard label|KP_Enter"
++#~ msgstr "keyboard label|KP_Enter"
++
++#~ msgid "keyboard label|KP_Home"
++#~ msgstr "keyboard label|KP_Home"
++
++#~ msgid "keyboard label|KP_Left"
++#~ msgstr "keyboard label|KP_Left"
++
++#~ msgid "keyboard label|KP_Up"
++#~ msgstr "keyboard label|KP_Up"
++
++#~ msgid "keyboard label|KP_Right"
++#~ msgstr "keyboard label|KP_Right"
++
++#~ msgid "keyboard label|KP_Down"
++#~ msgstr "keyboard label|KP_Down"
++
++#~ msgid "keyboard label|KP_Page_Up"
++#~ msgstr "keyboard label|KP_Page_Up"
++
++#~ msgid "keyboard label|KP_Prior"
++#~ msgstr "keyboard label|KP_Prior"
++
++#~ msgid "keyboard label|KP_Page_Down"
++#~ msgstr "keyboard label|KP_Page_Down"
++
++#~ msgid "keyboard label|KP_Next"
++#~ msgstr "keyboard label|KP_Next"
++
++#~ msgid "keyboard label|KP_End"
++#~ msgstr "keyboard label|KP_End"
++
++#~ msgid "keyboard label|KP_Begin"
++#~ msgstr "keyboard label|KP_Begin"
++
++#~ msgid "keyboard label|KP_Insert"
++#~ msgstr "keyboard label|KP_Insert"
++
++#~ msgid "keyboard label|KP_Delete"
++#~ msgstr "keyboard label|KP_Delete"
++
++#~ msgid "keyboard label|Delete"
++#~ msgstr "keyboard label|Delete"
++
++#~ msgid "Switch engine"
++#~ msgstr "???????????? ???????????? ?????????"
++
++#~ msgid "next engine"
++#~ msgstr "???????????? ????????????"
+ 
++#~ msgid "prev engine"
++#~ msgstr "????????? ????????????"


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ibus.spec	14 Apr 2009 09:06:25 -0000	1.63
+++ ibus.spec	14 Apr 2009 09:10:39 -0000	1.64
@@ -221,6 +221,7 @@
 - Update ibus-HEAD.patch.
 - Change the mode of /tmp/ibus-$USER to 0700 to improve security
 - Change the mode of /tmp/ibus-$USER/socket-address to 0600 to improve security
+- Update as.po
 
 * Mon Apr 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-1
 - Update to ibus-1.1.0.20090413.



From kwizart at fedoraproject.org  Tue Apr 14 09:13:33 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 14 Apr 2009 09:13:33 +0000 (UTC)
Subject: rpms/frei0r-plugins/F-10 frei0r-plugins-1.1.21-libdir.patch, NONE, 
	1.1 frei0r-plugins.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414091333.74D78700B2@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/frei0r-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23567/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	frei0r-plugins-1.1.21-libdir.patch frei0r-plugins.spec 
	import.log 
Log Message:
Initial import for F-10


frei0r-plugins-1.1.21-libdir.patch:

--- NEW FILE frei0r-plugins-1.1.21-libdir.patch ---
diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am
--- frei0r-plugins-1.1.21/src/Makefile.am.libdir	2008-06-07 15:21:48.000000000 +0200
+++ frei0r-plugins-1.1.21/src/Makefile.am	2008-06-07 15:23:30.000000000 +0200
@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I at top_srcdir@/include 
 AM_CFLAGS = -I at top_srcdir@/include 
 AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
 
-plugindir = @prefix@/lib/frei0r-1
+plugindir = @libdir@/frei0r-1
 
 
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in
--- frei0r-plugins-1.1.21/src/Makefile.in.libdir	2008-06-07 15:21:44.000000000 +0200
+++ frei0r-plugins-1.1.21/src/Makefile.in	2008-06-07 15:23:08.000000000 +0200
@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c
 AM_CPPFLAGS = -I at top_srcdir@/include 
 AM_CFLAGS = -I at top_srcdir@/include 
 AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
-plugindir = @prefix@/lib/frei0r-1
+plugindir = @libdir@/frei0r-1
 all: all-am
 
 .SUFFIXES:


--- NEW FILE frei0r-plugins.spec ---
Name:           frei0r-plugins
Version:        1.1.22
Release:        1%{?dist}
Summary:        Frei0r - a minimalistic plugin API for video effects

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.piksel.org/frei0r
Source0:        http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz
Patch0:         frei0r-plugins-1.1.21-libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gavl-devel >= 0.2.3
BuildRequires:  opencv-devel >= 1.0.0
     

%description
It is a minimalistic plugin API for video sources and filters. The behaviour of
the effects can be controlled from the host by simple parameters. The intent is
to solve the recurring reimplementation or adaptation issue of standard effect

%package -n     frei0r-devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description -n frei0r-devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%if %{_lib} == lib64
%patch0 -p1 -b .libdir
%endif

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/frei0r-1/*.so

%files -n frei0r-devel
%defattr(-,root,root,-)
%{_includedir}/frei0r.h

%changelog
* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.22-1
- Update to 1.1.22
- Prevent timestamp change when installing

* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.1.21-2
- Add gcc43 patches

* Sat Jun  7 2008 kwizart < kwizart at gmail.com > - 1.1.21-1
- Initial spec file for Fedora.



--- NEW FILE import.log ---
frei0r-plugins-1_1_22-1_fc10:F-10:frei0r-plugins-1.1.22-1.fc10.src.rpm:1239700098


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frei0r-plugins/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:18:51 -0000	1.1
+++ .cvsignore	14 Apr 2009 09:13:02 -0000	1.2
@@ -0,0 +1 @@
+frei0r-plugins-1.1.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frei0r-plugins/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:18:51 -0000	1.1
+++ sources	14 Apr 2009 09:13:03 -0000	1.2
@@ -0,0 +1 @@
+8123893c67fc5ce01ddcb09853d47ed4  frei0r-plugins-1.1.22.tar.gz



From kwizart at fedoraproject.org  Tue Apr 14 09:17:49 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 14 Apr 2009 09:17:49 +0000 (UTC)
Subject: rpms/frei0r-plugins/F-9 frei0r-plugins-1.1.21-libdir.patch, NONE,
	1.1 frei0r-plugins.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414091749.130A2700B2@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/frei0r-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25045/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	frei0r-plugins-1.1.21-libdir.patch frei0r-plugins.spec 
	import.log 
Log Message:
Initial import for F-9


frei0r-plugins-1.1.21-libdir.patch:

--- NEW FILE frei0r-plugins-1.1.21-libdir.patch ---
diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am
--- frei0r-plugins-1.1.21/src/Makefile.am.libdir	2008-06-07 15:21:48.000000000 +0200
+++ frei0r-plugins-1.1.21/src/Makefile.am	2008-06-07 15:23:30.000000000 +0200
@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I at top_srcdir@/include 
 AM_CFLAGS = -I at top_srcdir@/include 
 AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
 
-plugindir = @prefix@/lib/frei0r-1
+plugindir = @libdir@/frei0r-1
 
 
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in
--- frei0r-plugins-1.1.21/src/Makefile.in.libdir	2008-06-07 15:21:44.000000000 +0200
+++ frei0r-plugins-1.1.21/src/Makefile.in	2008-06-07 15:23:08.000000000 +0200
@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c
 AM_CPPFLAGS = -I at top_srcdir@/include 
 AM_CFLAGS = -I at top_srcdir@/include 
 AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
-plugindir = @prefix@/lib/frei0r-1
+plugindir = @libdir@/frei0r-1
 all: all-am
 
 .SUFFIXES:


--- NEW FILE frei0r-plugins.spec ---
Name:           frei0r-plugins
Version:        1.1.22
Release:        1%{?dist}
Summary:        Frei0r - a minimalistic plugin API for video effects

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.piksel.org/frei0r
Source0:        http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz
Patch0:         frei0r-plugins-1.1.21-libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gavl-devel >= 0.2.3
BuildRequires:  opencv-devel >= 1.0.0
     

%description
It is a minimalistic plugin API for video sources and filters. The behaviour of
the effects can be controlled from the host by simple parameters. The intent is
to solve the recurring reimplementation or adaptation issue of standard effect

%package -n     frei0r-devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description -n frei0r-devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%if %{_lib} == lib64
%patch0 -p1 -b .libdir
%endif

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/frei0r-1/*.so

%files -n frei0r-devel
%defattr(-,root,root,-)
%{_includedir}/frei0r.h

%changelog
* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.22-1
- Update to 1.1.22
- Prevent timestamp change when installing

* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.1.21-2
- Add gcc43 patches

* Sat Jun  7 2008 kwizart < kwizart at gmail.com > - 1.1.21-1
- Initial spec file for Fedora.



--- NEW FILE import.log ---
frei0r-plugins-1_1_22-1_fc10:F-9:frei0r-plugins-1.1.22-1.fc10.src.rpm:1239700506


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frei0r-plugins/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2009 18:18:51 -0000	1.1
+++ .cvsignore	14 Apr 2009 09:17:17 -0000	1.2
@@ -0,0 +1 @@
+frei0r-plugins-1.1.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frei0r-plugins/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2009 18:18:51 -0000	1.1
+++ sources	14 Apr 2009 09:17:18 -0000	1.2
@@ -0,0 +1 @@
+8123893c67fc5ce01ddcb09853d47ed4  frei0r-plugins-1.1.22.tar.gz



From nphilipp at fedoraproject.org  Tue Apr 14 09:28:11 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 09:28:11 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.67, 1.68 sources, 1.70,
	1.71 system-config-samba.spec, 1.74, 1.75
Message-ID: <20090414092811.F0092700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28797

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.75



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	9 Apr 2009 15:45:39 -0000	1.67
+++ .cvsignore	14 Apr 2009 09:27:40 -0000	1.68
@@ -1 +1 @@
-system-config-samba-1.2.74.tar.bz2
+system-config-samba-1.2.75.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	9 Apr 2009 15:45:39 -0000	1.70
+++ sources	14 Apr 2009 09:27:41 -0000	1.71
@@ -1 +1 @@
-0e41f90edcb351f16f08a167e0740462  system-config-samba-1.2.74.tar.bz2
+19031d4e60f3481bb9ee400e59eb75bb  system-config-samba-1.2.75.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- system-config-samba.spec	9 Apr 2009 15:45:39 -0000	1.74
+++ system-config-samba.spec	14 Apr 2009 09:27:41 -0000	1.75
@@ -3,7 +3,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.74
+Version: 1.2.75
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -86,6 +86,10 @@
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Thu Apr 09 2009 Nils Philippsen <nils at redhat.com> - 1.2.75-1
+- fix sambaSection.getKey() for inverted keys
+- allow auth_admin always (#494896)
+
 * Thu Apr 09 2009 Nils Philippsen <nils at redhat.com> - 1.2.74-1
 - fix use via dbus
 



From sindrepb at fedoraproject.org  Tue Apr 14 09:34:44 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Tue, 14 Apr 2009 09:34:44 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.36,1.37
Message-ID: <20090414093444.F05C4700B2@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30837

Modified Files:
	gnome-do.spec 
Log Message:



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-do.spec	13 Apr 2009 23:59:13 -0000	1.36
+++ gnome-do.spec	14 Apr 2009 09:34:13 -0000	1.37
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.1.3
-Release:		4%{?dist}
+Release:		5%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -134,7 +134,7 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Apr 10 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-4
+* Fri Apr 10 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.1.3-5
 - Fix .desktop issue, install in both autostart and applications
 - Rebuild for new gnome-desktop-sharp
 - Add missing gnome-desktop-sharp requires



From rhughes at fedoraproject.org  Tue Apr 14 09:42:16 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 09:42:16 +0000 (UTC)
Subject: rpms/pm-utils/devel pm-utils.spec,1.115,1.116 sources,1.43,1.44
Message-ID: <20090414094216.96B31700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv620

Modified Files:
	pm-utils.spec sources 
Log Message:
* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-1
- New upstream version
- If running on a system that is using KMS, we will refuse to handle any video
  quirks passed to us by HAL, and we will not chvt to an empty console.
- Fix a longstanding bug in tuning scheduler powersaving knobs on SMT systems.
  
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- pm-utils.spec	27 Feb 2009 01:08:29 -0000	1.115
+++ pm-utils.spec	14 Apr 2009 09:41:45 -0000	1.116
@@ -1,8 +1,8 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
-Version: 1.2.4
-Release: 2%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -23,9 +23,6 @@
 Source22: pm-utils-hd-apm-restore.conf
 Source23: pm-utils-bugreport-info.sh
 
-# not yet upstream as the radeon code isn't upstream yet
-Patch1: pm-utils-1.2.2.1-radeon-kms.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -46,7 +43,6 @@
 
 %prep
 %setup -q 
-%patch1 -p1
 
 %build
 %configure
@@ -108,6 +104,12 @@
 
 
 %changelog
+* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-1
+- New upstream version
+- If running on a system that is using KMS, we will refuse to handle any video
+  quirks passed to us by HAL, and we will not chvt to an empty console.
+- Fix a longstanding bug in tuning scheduler powersaving knobs on SMT systems.
+  
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	9 Feb 2009 13:01:42 -0000	1.43
+++ sources	14 Apr 2009 09:41:46 -0000	1.44
@@ -1 +1 @@
-965bdce8fccaaa5ae2b304e52b362c6e  pm-utils-1.2.4.tar.gz
+f69db402e1869321cac72ffd2f77fa99  pm-utils-1.2.5.tar.gz



From mgrepl at fedoraproject.org  Tue Apr 14 09:57:15 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 14 Apr 2009 09:57:15 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.159,
	1.160 selinux-policy.spec, 1.787, 1.788
Message-ID: <20090414095715.C83C5700B2@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5391

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Fix fail2ban policy



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- policy-20080710.patch	7 Apr 2009 12:15:38 -0000	1.159
+++ policy-20080710.patch	14 Apr 2009 09:57:10 -0000	1.160
@@ -15131,7 +15131,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.13/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/cups.te	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/cups.te	2009-04-09 14:15:20.000000000 +0200
 @@ -20,9 +20,18 @@
  type cupsd_etc_t;
  files_config_file(cupsd_etc_t)
@@ -15162,7 +15162,17 @@
  
  type hplip_etc_t;
  files_config_file(hplip_etc_t)
-@@ -65,6 +78,16 @@
+@@ -55,6 +68,9 @@
+ type hplip_var_run_t;
+ files_pid_file(hplip_var_run_t)
+ 
++type hplip_tmp_t;
++files_tmp_file(hplip_tmp_t)
++
+ type ptal_t;
+ type ptal_exec_t;
+ init_daemon_domain(ptal_t, ptal_exec_t)
+@@ -65,6 +81,16 @@
  type ptal_var_run_t;
  files_pid_file(ptal_var_run_t)
  
@@ -15179,7 +15189,7 @@
  ifdef(`enable_mcs',`
  	init_ranged_daemon_domain(cupsd_t,cupsd_exec_t,s0 - mcs_systemhigh)
  ')
-@@ -79,13 +102,14 @@
+@@ -79,13 +105,14 @@
  #
  
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
@@ -15197,7 +15207,7 @@
  allow cupsd_t self:tcp_socket create_stream_socket_perms;
  allow cupsd_t self:udp_socket create_socket_perms;
  allow cupsd_t self:appletalk_socket create_socket_perms;
-@@ -97,6 +121,9 @@
+@@ -97,6 +124,9 @@
  read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t)
  files_search_etc(cupsd_t)
  
@@ -15207,7 +15217,7 @@
  manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
-@@ -104,8 +131,11 @@
+@@ -104,8 +134,11 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
@@ -15221,7 +15231,7 @@
  
  manage_files_pattern(cupsd_t, cupsd_log_t, cupsd_log_t)
  allow cupsd_t cupsd_log_t:dir setattr;
-@@ -116,13 +146,20 @@
+@@ -116,13 +149,20 @@
  manage_fifo_files_pattern(cupsd_t, cupsd_tmp_t, cupsd_tmp_t)
  files_tmp_filetrans(cupsd_t, cupsd_tmp_t, { file dir fifo_file })
  
@@ -15244,7 +15254,7 @@
  allow cupsd_t hplip_var_run_t:file read_file_perms;
  
  stream_connect_pattern(cupsd_t, ptal_var_run_t, ptal_var_run_t, ptal_t)
-@@ -149,44 +186,49 @@
+@@ -149,44 +189,49 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -15299,7 +15309,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -195,15 +237,16 @@
+@@ -195,15 +240,16 @@
  files_read_var_symlinks(cupsd_t)
  # for /etc/printcap
  files_dontaudit_write_etc_files(cupsd_t)
@@ -15320,7 +15330,7 @@
  auth_use_nsswitch(cupsd_t)
  
  libs_use_ld_so(cupsd_t)
-@@ -219,17 +262,21 @@
+@@ -219,17 +265,21 @@
  miscfiles_read_fonts(cupsd_t)
  
  seutil_read_config(cupsd_t)
@@ -15345,7 +15355,7 @@
  ')
  
  optional_policy(`
-@@ -246,8 +293,16 @@
+@@ -246,8 +296,16 @@
  	userdom_dbus_send_all_users(cupsd_t)
  
  	optional_policy(`
@@ -15362,7 +15372,7 @@
  ')
  
  optional_policy(`
-@@ -263,6 +318,10 @@
+@@ -263,6 +321,10 @@
  ')
  
  optional_policy(`
@@ -15373,7 +15383,7 @@
  	# cups execs smbtool which reads samba_etc_t files
  	samba_read_config(cupsd_t)
  	samba_rw_var_files(cupsd_t)
-@@ -281,7 +340,7 @@
+@@ -281,7 +343,7 @@
  # Cups configuration daemon local policy
  #
  
@@ -15382,7 +15392,7 @@
  dontaudit cupsd_config_t self:capability sys_tty_config;
  allow cupsd_config_t self:process signal_perms;
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
-@@ -313,7 +372,7 @@
+@@ -313,7 +375,7 @@
  files_pid_filetrans(cupsd_config_t, cupsd_config_var_run_t, file)
  
  kernel_read_system_state(cupsd_config_t)
@@ -15391,7 +15401,7 @@
  
  corenet_all_recvfrom_unlabeled(cupsd_config_t)
  corenet_all_recvfrom_netlabel(cupsd_config_t)
-@@ -326,6 +385,7 @@
+@@ -326,6 +388,7 @@
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
  dev_read_rand(cupsd_config_t)
@@ -15399,7 +15409,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -343,7 +403,7 @@
+@@ -343,7 +406,7 @@
  files_read_var_symlinks(cupsd_config_t)
  
  # Alternatives asks for this
@@ -15408,7 +15418,7 @@
  
  auth_use_nsswitch(cupsd_config_t)
  
-@@ -353,6 +413,7 @@
+@@ -353,6 +416,7 @@
  logging_send_syslog_msg(cupsd_config_t)
  
  miscfiles_read_localization(cupsd_config_t)
@@ -15416,7 +15426,7 @@
  
  seutil_dontaudit_search_config(cupsd_config_t)
  
-@@ -365,14 +426,16 @@
+@@ -365,14 +429,16 @@
  sysadm_dontaudit_search_home_dirs(cupsd_config_t)
  
  ifdef(`distro_redhat',`
@@ -15435,7 +15445,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -388,6 +451,7 @@
+@@ -388,6 +454,7 @@
  optional_policy(`
  	hal_domtrans(cupsd_config_t)
  	hal_read_tmp_files(cupsd_config_t)
@@ -15443,7 +15453,7 @@
  ')
  
  optional_policy(`
-@@ -500,7 +564,11 @@
+@@ -500,7 +567,10 @@
  allow hplip_t self:udp_socket create_socket_perms;
  allow hplip_t self:rawip_socket create_socket_perms;
  
@@ -15452,20 +15462,22 @@
 +manage_dirs_pattern(hplip_t, cupsd_tmp_t, cupsd_tmp_t)
 +manage_files_pattern(hplip_t, cupsd_tmp_t, cupsd_tmp_t)
 +files_tmp_filetrans(hplip_t, cupsd_tmp_t, { file dir })
-+
  
  cups_stream_connect(hplip_t)
  
-@@ -509,6 +577,8 @@
+@@ -509,6 +579,11 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
 +read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
 +
++manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
++files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )  
++
  manage_files_pattern(hplip_t, hplip_var_run_t, hplip_var_run_t)
  files_pid_filetrans(hplip_t, hplip_var_run_t, file)
  
-@@ -538,7 +608,8 @@
+@@ -538,7 +613,8 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -15475,7 +15487,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -552,6 +623,8 @@
+@@ -552,6 +628,8 @@
  files_read_etc_runtime_files(hplip_t)
  files_read_usr_files(hplip_t)
  
@@ -15484,7 +15496,7 @@
  libs_use_ld_so(hplip_t)
  libs_use_shared_libs(hplip_t)
  
-@@ -564,12 +637,14 @@
+@@ -564,12 +642,14 @@
  userdom_dontaudit_use_unpriv_user_fds(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -15500,7 +15512,7 @@
  ')
  
  optional_policy(`
-@@ -651,3 +726,55 @@
+@@ -651,3 +731,55 @@
  optional_policy(`
  	udev_read_db(ptal_t)
  ')
@@ -15601,7 +15613,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.13/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/dbus.if	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/dbus.if	2009-04-14 10:39:44.000000000 +0200
 @@ -53,19 +53,19 @@
  	gen_require(`
  		type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
@@ -15830,7 +15842,7 @@
  ##	Read dbus configuration.
  ## </summary>
  ## <param name="domain">
-@@ -366,3 +440,120 @@
+@@ -366,3 +440,122 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -15885,6 +15897,8 @@
 +	dbus_system_bus_client_template($1, $1)
 +	dbus_connect_system_bus($1)
 +
++	userdom_dontaudit_search_admin_dir($1)
++
 +	ifdef(`hide_broken_symptoms', `
 +		dbus_dontaudit_rw_system_selinux_socket($1)
 +	');
@@ -17248,10 +17262,47 @@
 +	spamassassin_exec(exim_t)
 +	spamassassin_exec_client(exim_t)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.5.13/policy/modules/services/fail2ban.fc
+--- nsaserefpolicy/policy/modules/services/fail2ban.fc	2008-10-17 14:49:13.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/services/fail2ban.fc	2009-04-14 11:02:53.000000000 +0200
+@@ -2,5 +2,6 @@
+ 
+ /usr/bin/fail2ban	--	gen_context(system_u:object_r:fail2ban_exec_t,s0)
+ /usr/bin/fail2ban-server --	gen_context(system_u:object_r:fail2ban_exec_t,s0)
++/var/lib/fail2ban(/.*)?  	gen_context(system_u:object_r:fail2ban_var_lib_t,s0)
+ /var/log/fail2ban\.log	--	gen_context(system_u:object_r:fail2ban_log_t,s0)
+ /var/run/fail2ban.*		gen_context(system_u:object_r:fail2ban_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.5.13/policy/modules/services/fail2ban.if
 --- nsaserefpolicy/policy/modules/services/fail2ban.if	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/fail2ban.if	2009-03-30 12:51:09.000000000 +0200
-@@ -79,6 +79,27 @@
++++ serefpolicy-3.5.13/policy/modules/services/fail2ban.if	2009-04-14 11:02:23.000000000 +0200
+@@ -60,6 +60,26 @@
+ 	allow $1 fail2ban_log_t:file append_file_perms;
+ ')
+ 
++#######################################
++## <summary>
++## Read fail2ban lib files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`fail2ban_read_lib_files',`
++	gen_require(`
++  		type fail2ban_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	allow $1 fail2ban_var_lib_t:file read_file_perms;
++')
++
++
+ ########################################
+ ## <summary>
+ ##	Read fail2ban PID files.
+@@ -79,6 +99,27 @@
  	allow $1 fail2ban_var_run_t:file read_file_perms;
  ')
  
@@ -17279,10 +17330,39 @@
  ########################################
  ## <summary>
  ##	All of the rules required to administrate 
+@@ -100,6 +141,7 @@
+ 	gen_require(`
+ 		type fail2ban_t, fail2ban_log_t;
+ 		type fail2ban_var_run_t, fail2ban_initrc_exec_t;
++		type fail2ban_var_lib_t;
+ 	')
+ 
+ 	allow $1 fail2ban_t:process { ptrace signal_perms };
+@@ -113,6 +155,9 @@
+ 	logging_list_logs($1)
+ 	admin_pattern($1, fail2ban_log_t)
+ 
++	files_list_var_lib($1)
++	admin_pattern($1, fail2ban_var_lib_t)
++
+ 	files_list_pids($1)
+ 	admin_pattern($1, fail2ban_var_run_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.5.13/policy/modules/services/fail2ban.te
 --- nsaserefpolicy/policy/modules/services/fail2ban.te	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/fail2ban.te	2009-03-30 12:52:34.000000000 +0200
-@@ -27,6 +27,7 @@
++++ serefpolicy-3.5.13/policy/modules/services/fail2ban.te	2009-04-14 10:56:48.000000000 +0200
+@@ -17,6 +17,10 @@
+ type fail2ban_log_t;
+ logging_log_file(fail2ban_log_t)
+ 
++# lib files
++type fail2ban_var_lib_t;
++files_type(fail2ban_var_lib_t)
++
+ # pid files
+ type fail2ban_var_run_t;
+ files_pid_file(fail2ban_var_run_t)
+@@ -27,6 +31,7 @@
  #
  
  allow fail2ban_t self:process signal;
@@ -17290,6 +17370,18 @@
  allow fail2ban_t self:fifo_file rw_fifo_file_perms;
  allow fail2ban_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow fail2ban_t self:tcp_socket create_stream_socket_perms;
+@@ -36,6 +41,11 @@
+ manage_files_pattern(fail2ban_t, fail2ban_log_t, fail2ban_log_t)
+ logging_log_filetrans(fail2ban_t, fail2ban_log_t, file)
+ 
++# lib files
++manage_dirs_pattern(fail2ban_t, fail2ban_var_lib_t, fail2ban_var_lib_t)
++manage_files_pattern(fail2ban_t, fail2ban_var_lib_t, fail2ban_var_lib_t)
++files_var_lib_filetrans(fail2ban_t, fail2ban_var_lib_t, { dir file })
++
+ # pid file
+ manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+ manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.fc serefpolicy-3.5.13/policy/modules/services/fetchmail.fc
 --- nsaserefpolicy/policy/modules/services/fetchmail.fc	2008-10-17 14:49:11.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/services/fetchmail.fc	2009-03-05 15:02:41.000000000 +0100
@@ -17990,7 +18082,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.13/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/hal.te	2009-03-25 09:04:18.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/hal.te	2009-04-14 10:23:38.000000000 +0200
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -18161,7 +18253,7 @@
  dev_rw_input_dev(hald_keymap_t)
  
  files_read_usr_files(hald_keymap_t)
-@@ -419,4 +476,51 @@
+@@ -419,4 +476,53 @@
  
  # This is caused by a bug in hald and PolicyKit.  
  # Should be removed when this is fixed
@@ -18211,6 +18303,8 @@
 +libs_use_ld_so(hald_dccm_t)
 +libs_use_shared_libs(hald_dccm_t)
 +
++logging_send_syslog_msg(hald_dccm_t)
++
 +miscfiles_read_localization(hald_dccm_t)
 +
 +permissive hald_dccm_t;
@@ -19168,7 +19262,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.5.13/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/mta.te	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/mta.te	2009-04-14 10:49:52.000000000 +0200
 @@ -39,34 +39,50 @@
  #
  
@@ -19271,7 +19365,7 @@
  ')
  
  optional_policy(`
-@@ -142,11 +171,40 @@
+@@ -142,11 +171,44 @@
  ')
  
  optional_policy(`
@@ -19292,6 +19386,10 @@
  ')
  
 -# should break this up among sections:
++optional_policy(`
++        unconfined_use_terms(system_mail_t)
++')
++
 +read_files_pattern(mailserver_delivery, system_mail_tmp_t, system_mail_tmp_t)
 +
 +init_stream_connect_script(mailserver_delivery)
@@ -27301,7 +27399,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.13/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2009-04-14 11:07:49.000000000 +0200
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -27361,7 +27459,7 @@
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -91,34 +102,59 @@
+@@ -91,34 +102,63 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -27392,10 +27490,15 @@
  optional_policy(`
  	clamav_search_lib(sendmail_t)
 +	clamav_stream_connect(sendmail_t)
+ ')
+ 
+ optional_policy(`
+-	postfix_exec_master(sendmail_t)
++	cyrus_stream_connect(sendmail_t)
 +')
 +
 +optional_policy(`
-+	cyrus_stream_connect(sendmail_t)
++	fail2ban_read_lib_files(daemon)
 +')
 +
 +optional_policy(`
@@ -27408,10 +27511,9 @@
 +
 +optional_policy(`
 +	munin_dontaudit_search_lib(sendmail_t)
- ')
- 
- optional_policy(`
--	postfix_exec_master(sendmail_t)
++')
++
++optional_policy(`
 +	postfix_domtrans_postdrop(sendmail_t)
 +	postfix_domtrans_master(sendmail_t)
  	postfix_read_config(sendmail_t)
@@ -27424,7 +27526,7 @@
  ')
  
  optional_policy(`
-@@ -126,24 +162,33 @@
+@@ -126,24 +166,33 @@
  ')
  
  optional_policy(`
@@ -27946,11 +28048,13 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.13/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/spamassassin.fc	2009-02-10 15:07:15.000000000 +0100
-@@ -1,16 +1,27 @@
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.fc	2009-04-14 10:34:25.000000000 +0200
+@@ -1,16 +1,26 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
 +
++/root/\.razor(/.*)?             gen_context(system_u:object_r:spamc_home_t,s0) 
++
 +/etc/rc\.d/init\.d/spamd	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/mimedefang.*	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
  
@@ -27961,7 +28065,6 @@
  /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
  
  /usr/sbin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
-+#/usr/sbin/spamass-milter --	gen_context(system_u:object_r:spamd_exec_t,s0)
 +/usr/bin/mimedefang-multiplexor --	gen_context(system_u:object_r:spamd_exec_t,s0)
  
  /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
@@ -27971,8 +28074,6 @@
 +
  /var/run/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
 -/var/run/spamass-milter(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
-+#/var/run/spamass-milter.*	gen_context(system_u:object_r:spamd_var_run_t,s0)
-+#/var/spool/milter-regex(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
  
  /var/spool/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
  /var/spool/spamd(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
@@ -32899,7 +33000,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.13/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/init.te	2009-03-27 09:06:57.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/init.te	2009-04-14 11:07:25.000000000 +0200
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -33123,7 +33224,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -759,6 +819,11 @@
+@@ -759,6 +819,15 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -33132,10 +33233,14 @@
 +	cron_rw_pipes(daemon)
 +')
 +
++optional_policy(`
++	fail2ban_read_lib_files(daemon)
++')
++
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -773,6 +838,10 @@
+@@ -773,6 +842,10 @@
  ')
  
  optional_policy(`
@@ -33146,7 +33251,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -795,3 +864,17 @@
+@@ -795,3 +868,19 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -33164,6 +33269,8 @@
 + 		fs_dontaudit_rw_cifs_files(daemon)
 +	')
 +')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.fc serefpolicy-3.5.13/policy/modules/system/ipsec.fc
 --- nsaserefpolicy/policy/modules/system/ipsec.fc	2008-10-17 14:49:13.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/system/ipsec.fc	2009-02-10 15:07:15.000000000 +0100
@@ -36673,7 +36780,7 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-03-05 13:30:03.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-04-14 10:42:32.000000000 +0200
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -38894,7 +39001,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5513,3 +5725,622 @@
+@@ -5513,3 +5725,642 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -39500,6 +39607,25 @@
 +
 +	allow $1 user_home_t:file execmod;
 +')
++
++#######################################
++## <summary>
++##      dontaudit Search /root
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`userdom_dontaudit_search_admin_dir',`
++        gen_require(`
++                type admin_home_t;
++        ')
++
++        dontaudit $1 admin_home_t:dir search_dir_perms;
++')
++
 +########################################
 +## <summary>
 +##	dontaudit list /root
@@ -39517,6 +39643,7 @@
 +
 +	dontaudit $1 admin_home_t:dir list_dir_perms;
 +')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-02-10 15:07:15.000000000 +0100


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- selinux-policy.spec	7 Apr 2009 12:15:39 -0000	1.787
+++ selinux-policy.spec	14 Apr 2009 09:57:14 -0000	1.788
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -460,6 +460,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-56
+- Fix fail2ban policy
+
 * Tue Apr 7 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-55
 - Allow swat_t domtrans to smbd_t
 



From petersen at fedoraproject.org  Tue Apr 14 10:01:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 14 Apr 2009 10:01:35 +0000 (UTC)
Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.17,1.18
Message-ID: <20090414100135.CF9F5700B2@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6494

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
- use define not global to define subpackage since it broke ?3: expansion
- require the subpackage dependency with -devel suffix




Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ghc-gtk2hs.spec	10 Mar 2009 03:40:59 -0000	1.17
+++ ghc-gtk2hs.spec	14 Apr 2009 10:01:05 -0000	1.18
@@ -28,7 +28,7 @@
 Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-gtk2hs
 Version:        0.10.0
-Release:        3%{?snapdate:.%{snapdate}}%{?dist}
+Release:        4%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -130,13 +130,13 @@
 
 
 # subpackage name lib [dep] [obsoletes]
-%global subpackage()\
+%define subpackage()\
 %package -n ghc-%1-devel\
 Summary:        Haskell binding for %1\
 Group:          Development/Libraries\
 Requires:       ghc = %{ghc_version}\
 Requires:       %{name}-common = %{version}-%{release}\
-Requires:       %2-devel, %{?3:ghc-%3 = %{version}-%{release}}\
+Requires:       %2-devel, %{?3:ghc-%3-devel = %{version}-%{release}}\
 Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\
 Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\
 # added for F11\
@@ -293,6 +293,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-4
+- use define not global to define subpackage since it broke ?3: expansion
+- require the subpackage dependency with -devel suffix
+
 * Mon Mar  9 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-3
 - use global
 - update arch list



From jnovy at fedoraproject.org  Tue Apr 14 10:06:05 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 14 Apr 2009 10:06:05 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-docfix.patch, NONE, 1.1 .cvsignore, 
	1.52, 1.53 netpbm.spec, 1.136, 1.137 sources, 1.56, 1.57
Message-ID: <20090414100605.AAD08700B2@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7502

Modified Files:
	.cvsignore netpbm.spec sources 
Added Files:
	netpbm-10.35-docfix.patch 
Log Message:
* Tue Apr 14 2009 Jindrich Novy <jnovy at redhat.com> 10.35.62-1
- update to 10.35.62
- upstream fixes pamstereogram
- fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise
  so that they match their man pages (#483011, #483070, #483243, #483245)


netpbm-10.35-docfix.patch:

--- NEW FILE netpbm-10.35-docfix.patch ---
diff -up netpbm-10.35.62/converter/pbm/pbmtoepson.c.docfix netpbm-10.35.62/converter/pbm/pbmtoepson.c
--- netpbm-10.35.62/converter/pbm/pbmtoepson.c.docfix	2009-04-13 09:14:07.000000000 +0200
+++ netpbm-10.35.62/converter/pbm/pbmtoepson.c	2009-04-14 09:26:48.000000000 +0200
@@ -74,7 +74,7 @@ parseCommandLine(int                 arg
             &dpiSpec,                    0);
     OPTENT3(0, "adjacent",   OPT_FLAG,   NULL,
             &adjacentSpec,                    0);
-    OPTENT3(0, "nonadjacent",   OPT_FLAG,   NULL,
+    OPTENT3(0, "noadjacent",   OPT_FLAG,   NULL,
             &nonadjacentSpec,                    0);
 
     opt.opt_table = option_def;
diff -up netpbm-10.35.62/generator/ppmpat.c.docfix netpbm-10.35.62/generator/ppmpat.c
--- netpbm-10.35.62/generator/ppmpat.c.docfix	2009-04-13 09:13:56.000000000 +0200
+++ netpbm-10.35.62/generator/ppmpat.c	2009-04-14 09:29:35.000000000 +0200
@@ -919,7 +919,7 @@ main(int argc, char ** argv) {
 #define PAT_CAMO 7
 #define PAT_ANTICAMO 8
 #define PAT_TEST 9
-    const char* const usage = "-gingham|-g2|-gingham3|-g3|-madras|-tartan|-poles|-squig|-camo|-anticamo <width> <height>";
+    const char* const usage = "-gingham2|-g2|-gingham3|-g3|-madras|-tartan|-poles|-squig|-camo|-anticamo <width> <height>";
 
 
     ppm_init(&argc, argv);
diff -up netpbm-10.35.62/userguide/pamaddnoise.html.docfix netpbm-10.35.62/userguide/pamaddnoise.html
--- netpbm-10.35.62/userguide/pamaddnoise.html.docfix	2009-04-13 09:14:26.000000000 +0200
+++ netpbm-10.35.62/userguide/pamaddnoise.html	2009-04-14 09:32:47.000000000 +0200
@@ -38,7 +38,7 @@ pamaddnoise - add noise to a Netpbm imag
 
 <B>pamaddnoise</B> <B>-type </B> <B>multiplicative_gaussian</B>
 
-[<B>-msigma</B> <I>value</I>]
+[<B>-mgsigma</B> <I>value</I>]
 
 <BR>
 
@@ -102,7 +102,7 @@ a plane of colors in a color space.
 
 <DD>Used for laplacian noise only.  The default value is 10.0.
 
-<DT><B>-msigma</b> <i>value</i>
+<DT><B>-mgsigma</b> <i>value</i>
 
 <DD>Used for mutliplicative gaussian noise only.  The default value is
 0.5.
diff -up netpbm-10.35.62/userguide/pamperspective.html.docfix netpbm-10.35.62/userguide/pamperspective.html
--- netpbm-10.35.62/userguide/pamperspective.html.docfix	2009-04-13 09:14:26.000000000 +0200
+++ netpbm-10.35.62/userguide/pamperspective.html	2009-04-14 09:10:32.000000000 +0200
@@ -226,7 +226,7 @@ visible part is the smallest possible re
 parts specified those three ways.
 
 <p>The visible part must have nonzero size.  That means if you specify
-<b>--frame-include=no</b> (overriding the default), you'll need to
+<b>--frame_include=no</b> (overriding the default), you'll need to
 specify other frame options in order to have something in the visible
 part.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	23 Mar 2009 07:19:14 -0000	1.52
+++ .cvsignore	14 Apr 2009 10:05:34 -0000	1.53
@@ -1,2 +1 @@
-netpbm-10.35.60.tar.bz2
-netpbm-10.35.61.tar.bz2
+netpbm-10.35.62.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- netpbm.spec	31 Mar 2009 14:01:09 -0000	1.136
+++ netpbm.spec	14 Apr 2009 10:05:35 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.61
-Release: 2%{?dist}
+Version: 10.35.62
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -38,6 +38,7 @@
 Patch27: netpbm-10.35-ppmrainbowexit.patch
 Patch28: netpbm-10.35-ppmdfontfix.patch
 Patch29: netpbm-10.35-svgtopam.patch
+Patch30: netpbm-10.35-docfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -106,6 +107,7 @@
 %patch27 -p1 -b .ppmrainbowexit
 %patch28 -p1 -b .ppmdfontfix
 %patch29 -p1 -b .svgtopam
+%patch30 -p1 -b .docfix
 
 %build
 ./configure <<EOF
@@ -231,6 +233,12 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Tue Apr 14 2009 Jindrich Novy <jnovy at redhat.com> 10.35.62-1
+- update to 10.35.62
+- upstream fixes pamstereogram
+- fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise
+  so that they match their man pages (#483011, #483070, #483243, #483245)
+
 * Tue Mar 31 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-2
 - remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
 - fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	23 Mar 2009 07:19:15 -0000	1.56
+++ sources	14 Apr 2009 10:05:35 -0000	1.57
@@ -1 +1 @@
-ea6882cc00d8dc2b580184c25334ad5a  netpbm-10.35.61.tar.bz2
+70617ccd4e4e2c4fdd7092ba6e004334  netpbm-10.35.62.tar.bz2



From pvrabec at fedoraproject.org  Tue Apr 14 10:19:46 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue, 14 Apr 2009 10:19:46 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.3-goodname.patch, NONE,
	1.1 shadow-4.1.3-redhat.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 shadow-utils.spec, 1.128, 1.129 sources, 1.20,
	1.21 shadow-4.0.17-login.defs, 1.2,
	NONE shadow-4.1.1-selinuxUserMappings.patch, 1.1,
	NONE shadow-4.1.2-audit.patch, 1.1,
	NONE shadow-4.1.2-checkName.patch, 1.1,
	NONE shadow-4.1.2-gmNoGroup.patch, 1.1,
	NONE shadow-4.1.2-gmSEGV.patch, 1.1,
	NONE shadow-4.1.2-goodname.patch, 1.1,
	NONE shadow-4.1.2-redhat.patch, 1.1,
	NONE shadow-4.1.2-selinux.patch, 1.1,
	NONE shadow-4.1.2-sysAccountDownhill.patch, 1.1,
	NONE shadow-4.1.2-uid.patch, 1.1, NONE
Message-ID: <20090414101946.73202700B2@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10106

Modified Files:
	.cvsignore shadow-utils.spec sources 
Added Files:
	shadow-4.1.3-goodname.patch shadow-4.1.3-redhat.patch 
Removed Files:
	shadow-4.0.17-login.defs 
	shadow-4.1.1-selinuxUserMappings.patch 
	shadow-4.1.2-audit.patch shadow-4.1.2-checkName.patch 
	shadow-4.1.2-gmNoGroup.patch shadow-4.1.2-gmSEGV.patch 
	shadow-4.1.2-goodname.patch shadow-4.1.2-redhat.patch 
	shadow-4.1.2-selinux.patch 
	shadow-4.1.2-sysAccountDownhill.patch shadow-4.1.2-uid.patch 
Log Message:
upgrade


shadow-4.1.3-goodname.patch:

--- NEW FILE shadow-4.1.3-goodname.patch ---
diff -up shadow-4.1.3/libmisc/chkname.c.goodname shadow-4.1.3/libmisc/chkname.c
--- shadow-4.1.3/libmisc/chkname.c.goodname	2008-12-23 23:42:21.000000000 +0100
+++ shadow-4.1.3/libmisc/chkname.c	2009-04-14 11:46:21.000000000 +0200
@@ -54,20 +54,28 @@
 static bool is_valid_name (const char *name)
 {
 	/*
-	 * User/group names must match [a-z_][a-z0-9_-]*[$]
-	 */
-	if (('\0' == *name) ||
-	    !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
+         * User/group names must match gnu e-regex:
+         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
+         *
+         * as a non-POSIX, extension, allow "$" as the last char for
+         * sake of Samba 3.x "add machine script"
+         */
+	if ( ('\0' == *name) ||
+             !((*name >= 'a' && *name <= 'z') ||
+               (*name >= 'A' && *name <= 'Z') ||
+               (*name >= '0' && *name <= '9') ||
+               (*name == '_') || (*name == '.') 
+	      )) {
 		return false;
 	}
 
 	while ('\0' != *++name) {
-		if (!(( ('a' <= *name) && ('z' >= *name) ) ||
-		      ( ('0' <= *name) && ('9' >= *name) ) ||
-		      ('_' == *name) ||
-		      ('-' == *name) ||
-		      ( ('$' == *name) && ('\0' == *(name + 1)) )
-		     )) {
+                if (!(  (*name >= 'a' && *name <= 'z') ||
+                        (*name >= 'A' && *name <= 'Z') ||
+                        (*name >= '0' && *name <= '9') ||
+                        (*name == '_') || (*name == '.') || (*name == '-') ||
+                        (*name == '$' && *(name + 1) == '\0') 
+                     )) {
 			return false;
 		}
 	}
diff -up shadow-4.1.3/man/groupadd.8.goodname shadow-4.1.3/man/groupadd.8
--- shadow-4.1.3/man/groupadd.8.goodname	2009-04-12 04:46:15.000000000 +0200
+++ shadow-4.1.3/man/groupadd.8	2009-04-14 11:45:13.000000000 +0200
@@ -139,9 +139,7 @@ Shadow password suite configuration\&.
 .RE
 .SH "CAVEATS"
 .PP
-Groupnames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]?
-.PP
-Groupnames may only be up to 16 characters long\&.
+Groupnames may only be up to 32 characters long\&.
 .PP
 You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&.
 .PP
diff -up shadow-4.1.3/man/useradd.8.goodname shadow-4.1.3/man/useradd.8
--- shadow-4.1.3/man/useradd.8.goodname	2009-04-12 04:46:35.000000000 +0200
+++ shadow-4.1.3/man/useradd.8	2009-04-14 11:45:13.000000000 +0200
@@ -385,8 +385,6 @@ Similarly, if the username already exist
 \fBuseradd\fR
 will deny the user account creation request\&.
 .PP
-Usernames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]?
-.PP
 Usernames may only be up to 32 characters long\&.
 .SH "CONFIGURATION"
 .PP

shadow-4.1.3-redhat.patch:

--- NEW FILE shadow-4.1.3-redhat.patch ---
diff -up shadow-4.1.3-rc1/libmisc/find_new_gid.c.redhat shadow-4.1.3-rc1/libmisc/find_new_gid.c
--- shadow-4.1.3-rc1/libmisc/find_new_gid.c.redhat	2009-04-06 15:46:43.000000000 +0200
+++ shadow-4.1.3-rc1/libmisc/find_new_gid.c	2009-04-06 15:48:29.000000000 +0200
@@ -56,11 +56,11 @@ int find_new_gid (bool sys_group, gid_t 
 	assert (gid != NULL);
 
 	if (!sys_group) {
-		gid_min = getdef_ulong ("GID_MIN", 1000L);
+		gid_min = getdef_ulong ("GID_MIN", 500L);
 		gid_max = getdef_ulong ("GID_MAX", 60000L);
 	} else {
 		gid_min = getdef_ulong ("SYS_GID_MIN", 1L);
-		gid_max = getdef_ulong ("GID_MIN", 1000L) - 1;
+		gid_max = getdef_ulong ("GID_MIN", 500L) - 1;
 		gid_max = getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
 	}
 	used_gids = alloca (sizeof (char) * gid_max +1);
diff -up shadow-4.1.3-rc1/libmisc/find_new_uid.c.redhat shadow-4.1.3-rc1/libmisc/find_new_uid.c
--- shadow-4.1.3-rc1/libmisc/find_new_uid.c.redhat	2009-04-06 15:46:49.000000000 +0200
+++ shadow-4.1.3-rc1/libmisc/find_new_uid.c	2009-04-06 15:48:46.000000000 +0200
@@ -56,11 +56,11 @@ int find_new_uid (bool sys_user, uid_t *
 	assert (uid != NULL);
 
 	if (!sys_user) {
-		uid_min = getdef_ulong ("UID_MIN", 1000L);
+		uid_min = getdef_ulong ("UID_MIN", 500L);
 		uid_max = getdef_ulong ("UID_MAX", 60000L);
 	} else {
 		uid_min = getdef_ulong ("SYS_UID_MIN", 1L);
-		uid_max = getdef_ulong ("UID_MIN", 1000L) - 1;
+		uid_max = getdef_ulong ("UID_MIN", 500L) - 1;
 		uid_max = getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
 	}
 	used_uids = alloca (sizeof (char) * uid_max +1);
diff -up shadow-4.1.3-rc1/src/useradd.c.redhat shadow-4.1.3-rc1/src/useradd.c
--- shadow-4.1.3-rc1/src/useradd.c.redhat	2009-04-06 15:49:02.000000000 +0200
+++ shadow-4.1.3-rc1/src/useradd.c	2009-04-06 15:55:22.000000000 +0200
@@ -89,7 +89,7 @@ char *Prog;
 static gid_t def_group = 100;
 static const char *def_gname = "other";
 static const char *def_home = "/home";
-static const char *def_shell = "";
+static const char *def_shell = "/sbin/nologin";
 static const char *def_template = SKEL_DIR;
 static const char *def_create_mail_spool = "no";
 
@@ -101,7 +101,7 @@ static char def_file[] = USER_DEFAULTS_F
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 
 static const char *user_name = "";
-static const char *user_pass = "!";
+static const char *user_pass = "!!";
 static uid_t user_id;
 static gid_t user_gid;
 static const char *user_comment = "";


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 May 2008 13:17:35 -0000	1.19
+++ .cvsignore	14 Apr 2009 10:19:12 -0000	1.20
@@ -1,4 +1,3 @@
 shadow-4.0.17-login.defs
 shadow-4.0.18.1-useradd
-shadow-4.1.1.tar.bz2
-shadow-4.1.2.tar.bz2
+shadow-4.1.3.tar.bz2


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- shadow-utils.spec	24 Mar 2009 16:09:09 -0000	1.128
+++ shadow-utils.spec	14 Apr 2009 10:19:14 -0000	1.129
@@ -1,36 +1,22 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
-Version: 4.1.2
-Release: 13%{?dist}
+Version: 4.1.3
+Release: 1%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.17-login.defs
 Source2: shadow-4.0.18.1-useradd
-
-Patch0: shadow-4.1.2-redhat.patch
-Patch1: shadow-4.1.2-goodname.patch
-Patch2: shadow-4.1.2-selinux.patch
-Patch3: shadow-4.1.2-sysAccountDownhill.patch
-Patch4: shadow-4.1.2-gmSEGV.patch
-Patch5: shadow-4.1.2-audit.patch
-Patch6: shadow-4.1.1-selinuxUserMappings.patch
-Patch7: shadow-4.1.2-checkName.patch
-Patch8: shadow-4.1.2-gmNoGroup.patch
-Patch9: shadow-4.1.2-uid.patch
-
+Patch0: shadow-4.1.3-redhat.patch
+Patch1: shadow-4.1.3-goodname.patch
 License: BSD and GPLv2+
 Group: System Environment/Base
-BuildRequires: autoconf, automake, libtool, gettext-devel
 BuildRequires: libselinux-devel >= 1.25.2-1
 BuildRequires: audit-libs-devel >= 1.6.5
+#BuildRequires: autoconf, automake, libtool, gettext-devel
 Requires: libselinux >= 1.25.2-1
 Requires: audit-libs >= 1.6.5
-Requires: setup policycoreutils
+Requires: setup
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,34 +35,23 @@
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
-%patch2 -p1 -b .selinux
-%patch3 -p1 -b .sysAccountDownhill
-%patch4 -p1 -b .gmSEGV
-%patch5 -p1 -b .audit
-%patch6 -p1 -b .selinuxUserMappings
-%patch7 -p1 -b .checkName
-%patch8 -p1 -b .gmNoGroup
-%patch9 -p1 -b .uid
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
 
-rm po/*.gmo
-rm po/stamp-po
-
-aclocal
-libtoolize --force
-automake -a
-autoconf
+#rm po/*.gmo
+#rm po/stamp-po
+#aclocal
+#libtoolize --force
+#automake -a
+#autoconf
 
 %build
 %configure \
         --enable-shadowgrp \
         --with-audit \
         --with-sha-crypt \
-%if %{WITH_SELINUX}
         --with-selinux \
-%endif
         --without-libcrack \
         --without-libpam \
         --disable-shared
@@ -199,11 +174,11 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
-* Tue Mar 24 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-13
-- do not allow UID/GID = 4294967295 (#484040,#133664)
+* Tue Apr 14 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3-1
+- upgrade
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:4.1.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Mar 24 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-12
+- don not allow UID/GID = 4294967295 (#484040)
 
 * Mon Jan 19 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-11
 - fix license tag (#226416)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 May 2008 13:17:35 -0000	1.20
+++ sources	14 Apr 2009 10:19:14 -0000	1.21
@@ -1,4 +1,3 @@
 e91727c55dbafc9915250e31535f13bb  shadow-4.0.17-login.defs
 ebdf46b79f9b414353c9ae8aba4d55cc  shadow-4.0.18.1-useradd
-b1aa30abb3cce16a37b53e45e1ec70a4  shadow-4.1.1.tar.bz2
-ce90cbe9cba7f6673cb10cad49083c1c  shadow-4.1.2.tar.bz2
+d222bd50f64d52a32882c82ab1e85f28  shadow-4.1.3.tar.bz2


--- shadow-4.0.17-login.defs DELETED ---


--- shadow-4.1.1-selinuxUserMappings.patch DELETED ---


--- shadow-4.1.2-audit.patch DELETED ---


--- shadow-4.1.2-checkName.patch DELETED ---


--- shadow-4.1.2-gmNoGroup.patch DELETED ---


--- shadow-4.1.2-gmSEGV.patch DELETED ---


--- shadow-4.1.2-goodname.patch DELETED ---


--- shadow-4.1.2-redhat.patch DELETED ---


--- shadow-4.1.2-selinux.patch DELETED ---


--- shadow-4.1.2-sysAccountDownhill.patch DELETED ---


--- shadow-4.1.2-uid.patch DELETED ---



From kdudka at fedoraproject.org  Tue Apr 14 10:27:18 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 14 Apr 2009 10:27:18 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.4-nss-leak.patch, NONE, 1.1 curl.spec,
	1.92, 1.93 curl-7.17.1-sslgen.patch, 1.1, NONE
Message-ID: <20090414102718.351F170127@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11781

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-nss-leak.patch 
Removed Files:
	curl-7.17.1-sslgen.patch 
Log Message:
upstream patch fixing memory leak in lib/nss.c (#453612)
remove unused patch curl-7.17.1-sslgen.patch from cvs

curl-7.19.4-nss-leak.patch:

--- NEW FILE curl-7.19.4-nss-leak.patch ---
diff -ruNp curl-7.19.4.orig/lib/nss.c curl-7.19.4/lib/nss.c
--- curl-7.19.4.orig/lib/nss.c	2009-04-10 12:51:24.940363000 +0200
+++ curl-7.19.4/lib/nss.c	2009-04-10 12:51:59.268700902 +0200
@@ -282,13 +282,12 @@ static int is_file(const char *filename)
   return 0;
 }
 
-static int
-nss_load_cert(const char *filename, PRBool cacert)
+static int nss_load_cert(struct ssl_connect_data *ssl,
+                         const char *filename, PRBool cacert)
 {
 #ifdef HAVE_PK11_CREATEGENERICOBJECT
   CK_SLOT_ID slotID;
   PK11SlotInfo * slot = NULL;
-  PK11GenericObject *rv;
   CK_ATTRIBUTE *attrs;
   CK_ATTRIBUTE theTemplate[20];
   CK_BBOOL cktrue = CK_TRUE;
@@ -363,11 +362,12 @@ nss_load_cert(const char *filename, PRBo
   /* This load the certificate in our PEM module into the appropriate
    * slot.
    */
-  rv = PK11_CreateGenericObject(slot, theTemplate, 4, PR_FALSE /* isPerm */);
+  ssl->cacert[slotID] = PK11_CreateGenericObject(slot, theTemplate, 4,
+                                                 PR_FALSE /* isPerm */);
 
   PK11_FreeSlot(slot);
 
-  if(rv == NULL) {
+  if(ssl->cacert[slotID] == NULL) {
     free(nickname);
     return 0;
   }
@@ -474,11 +474,10 @@ static int nss_load_crl(const char* crlf
   return 1;
 }
 
-static int nss_load_key(struct connectdata *conn, char *key_file)
+static int nss_load_key(struct connectdata *conn, int sockindex, char *key_file)
 {
 #ifdef HAVE_PK11_CREATEGENERICOBJECT
   PK11SlotInfo * slot = NULL;
-  PK11GenericObject *rv;
   CK_ATTRIBUTE *attrs;
   CK_ATTRIBUTE theTemplate[20];
   CK_BBOOL cktrue = CK_TRUE;
@@ -486,6 +485,7 @@ static int nss_load_key(struct connectda
   CK_SLOT_ID slotID;
   pphrase_arg_t *parg = NULL;
   char slotname[SLOTSIZE];
+  struct ssl_connect_data *sslconn = &conn->ssl[sockindex];
 
   attrs = theTemplate;
 
@@ -505,8 +505,9 @@ static int nss_load_key(struct connectda
                 strlen(key_file)+1); attrs++;
 
   /* When adding an encrypted key the PKCS#11 will be set as removed */
-  rv = PK11_CreateGenericObject(slot, theTemplate, 3, PR_FALSE /* isPerm */);
-  if(rv == NULL) {
+  sslconn->key = PK11_CreateGenericObject(slot, theTemplate, 3,
+                                          PR_FALSE /* isPerm */);
+  if(sslconn->key == NULL) {
     PR_SetError(SEC_ERROR_BAD_KEY, 0);
     return 0;
   }
@@ -554,13 +555,14 @@ static int display_error(struct connectd
   return 0; /* The caller will print a generic error */
 }
 
-static int cert_stuff(struct connectdata *conn, char *cert_file, char *key_file)
+static int cert_stuff(struct connectdata *conn,
+                      int sockindex, char *cert_file, char *key_file)
 {
   struct SessionHandle *data = conn->data;
   int rv = 0;
 
   if(cert_file) {
-    rv = nss_load_cert(cert_file, PR_FALSE);
+    rv = nss_load_cert(&conn->ssl[sockindex], cert_file, PR_FALSE);
     if(!rv) {
       if(!display_error(conn, PR_GetError(), cert_file))
         failf(data, "Unable to load client cert %d.", PR_GetError());
@@ -569,10 +571,10 @@ static int cert_stuff(struct connectdata
   }
   if(key_file || (is_file(cert_file))) {
     if(key_file)
-      rv = nss_load_key(conn, key_file);
+      rv = nss_load_key(conn, sockindex, key_file);
     else
       /* In case the cert file also has the key */
-      rv = nss_load_key(conn, cert_file);
+      rv = nss_load_key(conn, sockindex, cert_file);
     if(!rv) {
       if(!display_error(conn, PR_GetError(), key_file))
         failf(data, "Unable to load client key %d.", PR_GetError());
@@ -938,6 +940,12 @@ void Curl_nss_close(struct connectdata *
       free(connssl->client_nickname);
       connssl->client_nickname = NULL;
     }
+    if(connssl->key)
+      (void)PK11_DestroyGenericObject(connssl->key);
+    if(connssl->cacert[1])
+      (void)PK11_DestroyGenericObject(connssl->cacert[1]);
+    if(connssl->cacert[0])
+      (void)PK11_DestroyGenericObject(connssl->cacert[0]);
     connssl->handle = NULL;
   }
 }
@@ -973,6 +981,10 @@ CURLcode Curl_nss_connect(struct connect
   if (connssl->state == ssl_connection_complete)
     return CURLE_OK;
 
+  connssl->cacert[0] = NULL;
+  connssl->cacert[1] = NULL;
+  connssl->key = NULL;
+
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   PR_Lock(nss_initlock);
   if(!initialized) {
@@ -1100,7 +1112,8 @@ CURLcode Curl_nss_connect(struct connect
     /* skip the verifying of the peer */
     ;
   else if(data->set.ssl.CAfile) {
-    int rc = nss_load_cert(data->set.ssl.CAfile, PR_TRUE);
+    int rc = nss_load_cert(&conn->ssl[sockindex], data->set.ssl.CAfile,
+                           PR_TRUE);
     if(!rc) {
       curlerr = CURLE_SSL_CACERT_BADFILE;
       goto error;
@@ -1128,7 +1141,7 @@ CURLcode Curl_nss_connect(struct connect
 
           snprintf(fullpath, sizeof(fullpath), "%s/%s", data->set.ssl.CApath,
                    entry->name);
-          rc = nss_load_cert(fullpath, PR_TRUE);
+          rc = nss_load_cert(&conn->ssl[sockindex], fullpath, PR_TRUE);
           /* FIXME: check this return value! */
         }
         /* This is purposefully tolerant of errors so non-PEM files
@@ -1178,7 +1191,7 @@ CURLcode Curl_nss_connect(struct connect
         free(nickname);
       goto error;
     }
-    if(!cert_stuff(conn, data->set.str[STRING_CERT],
+    if(!cert_stuff(conn, sockindex, data->set.str[STRING_CERT],
                     data->set.str[STRING_KEY])) {
       /* failf() is already done in cert_stuff() */
       if(nickname_alloc)
diff -ruNp curl-7.19.4.orig/lib/urldata.h curl-7.19.4/lib/urldata.h
--- curl-7.19.4.orig/lib/urldata.h	2009-03-03 00:05:31.000000000 +0100
+++ curl-7.19.4/lib/urldata.h	2009-04-10 12:51:59.270700921 +0200
@@ -93,6 +93,7 @@
 
 #ifdef USE_NSS
 #include <nspr.h>
+#include <pk11pub.h>
 #endif
 
 #ifdef USE_QSOSSL
@@ -210,6 +211,10 @@ struct ssl_connect_data {
 #ifdef USE_NSS
   PRFileDesc *handle;
   char *client_nickname;
+#ifdef HAVE_PK11_CREATEGENERICOBJECT
+  PK11GenericObject *key;
+  PK11GenericObject *cacert[2];
+#endif
 #endif /* USE_NSS */
 #ifdef USE_QSOSSL
   SSLHandle *handle;


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- curl.spec	18 Mar 2009 17:01:02 -0000	1.92
+++ curl.spec	14 Apr 2009 10:26:46 -0000	1.93
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 Patch3: curl-7.17.1-badsocket.patch
 Patch4: curl-7.19.4-tool-leak.patch
 Patch5: curl-7.19.4-enable-aes.patch
+Patch6: curl-7.19.4-nss-leak.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,9 +38,6 @@
 Requires: libcurl = %{version}-%{release}
 Requires: libidn-devel, pkgconfig, automake
 
-# redundant
-Requires: libssh2-devel
-
 Provides: curl-devel = %{version}-%{release}
 Obsoletes: curl-devel < %{version}-%{release}
 
@@ -56,6 +54,7 @@
 %patch3 -p1 -b .badsocket
 %patch4 -p1 -b .toolleak
 %patch5 -p1 -b .enableaes
+%patch6 -p1 -b .nssleak
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -147,6 +146,10 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Apr 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-6
+- upstream patch fixing memory leak in lib/nss.c (#453612)
+- remove redundant dependency of libcurl-devel on libssh2-devel
+
 * Wed Mar 18 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-5
 - enable 6 additional crypto algorithms by default (#436781,
   accepted by upstream)


--- curl-7.17.1-sslgen.patch DELETED ---



From karsten at fedoraproject.org  Tue Apr 14 10:30:32 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 14 Apr 2009 10:30:32 +0000 (UTC)
Subject: rpms/clucene/devel clucene.spec,1.9,1.10
Message-ID: <20090414103032.5F1E1700B2@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/clucene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13312

Modified Files:
	clucene.spec 
Log Message:
- bypass 'make check', similar to ppc64


Index: clucene.spec
===================================================================
RCS file: /cvs/extras/rpms/clucene/devel/clucene.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clucene.spec	24 Feb 2009 07:59:49 -0000	1.9
+++ clucene.spec	14 Apr 2009 10:30:01 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:	A C++ port of Lucene
 Name:		clucene
 Version:	0.9.21
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+ or ASL 2.0
 Group:		Development/System
 URL:		http://www.sourceforge.net/projects/clucene
@@ -107,7 +107,7 @@
 
 # Run the tests 
 ## It currently fails 2 tests for ppc64 builds, upstream is looking into it.
-%ifnarch ppc64
+%ifnarch ppc64 s390x
 %check
 pushd %{name}-core-%{version}
 make check
@@ -167,6 +167,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Karsten Hopp <karsten at redhat.com> 0.9.21-3
+- bypass 'make check', similar to ppc64
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Tue Apr 14 10:31:39 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 14 Apr 2009 10:31:39 +0000 (UTC)
Subject: rpms/clucene/devel clucene.spec,1.10,1.11
Message-ID: <20090414103139.ED743700B2@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/clucene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13545

Modified Files:
	clucene.spec 
Log Message:
- fix changelog


Index: clucene.spec
===================================================================
RCS file: /cvs/extras/rpms/clucene/devel/clucene.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clucene.spec	14 Apr 2009 10:30:01 -0000	1.10
+++ clucene.spec	14 Apr 2009 10:31:09 -0000	1.11
@@ -168,7 +168,7 @@
 
 %changelog
 * Tue Apr 14 2009 Karsten Hopp <karsten at redhat.com> 0.9.21-3
-- bypass 'make check', similar to ppc64
+- bypass 'make check' on s390x, similar to ppc64
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From jnovy at fedoraproject.org  Tue Apr 14 10:33:49 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 14 Apr 2009 10:33:49 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-glibc.patch, 1.1, 1.2 netpbm.spec,
	1.137, 1.138
Message-ID: <20090414103349.2B4BC700B2@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14228

Modified Files:
	netpbm-10.35-glibc.patch netpbm.spec 
Log Message:
- avoid clashes with getline() from glibc


netpbm-10.35-glibc.patch:

Index: netpbm-10.35-glibc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-10.35-glibc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.35-glibc.patch	23 Aug 2007 07:53:36 -0000	1.1
+++ netpbm-10.35-glibc.patch	14 Apr 2009 10:33:48 -0000	1.2
@@ -11,3 +11,41 @@
  
    while ( rt->in->hasMore( rt->in ) ) {
      if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;
+diff -up netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc netpbm-10.35.62/converter/ppm/xvminitoppm.c
+--- netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc	2009-04-13 09:14:06.000000000 +0200
++++ netpbm-10.35.62/converter/ppm/xvminitoppm.c	2009-04-14 12:27:48.000000000 +0200
+@@ -52,7 +52,7 @@ parseCommandLine(int const argc,
+ 
+ 
+ static void
+-getline(FILE * const ifP,
++get_line(FILE * const ifP,
+         char * const buf,
+         size_t const size) {
+ 
+@@ -105,7 +105,7 @@ readXvHeader(FILE *         const ifP,
+     int rc;
+     bool endOfComments;
+     
+-    getline(ifP, buf, sizeof(buf));
++    get_line(ifP, buf, sizeof(buf));
+ 
+     if (!STRNEQ(buf, "P7 332", 6))
+         pm_error("Input is not a XV thumbnail picture.  It does not "
+@@ -113,14 +113,14 @@ readXvHeader(FILE *         const ifP,
+ 
+     endOfComments = FALSE;
+     while (!endOfComments) {
+-        getline(ifP, buf, sizeof(buf));
++        get_line(ifP, buf, sizeof(buf));
+         if (STRNEQ(buf, "#END_OF_COMMENTS", 16))
+             endOfComments = TRUE;
+         else if (STRNEQ(buf, "#BUILTIN", 8))
+             pm_error("This program does not know how to "
+                      "convert builtin XV thumbnail pictures");
+     }
+-    getline(ifP, buf, sizeof(buf));
++    get_line(ifP, buf, sizeof(buf));
+     rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval);
+     if (rc != 3)
+         pm_error("error parsing dimension info '%s'.  "


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- netpbm.spec	14 Apr 2009 10:05:35 -0000	1.137
+++ netpbm.spec	14 Apr 2009 10:33:48 -0000	1.138
@@ -238,6 +238,7 @@
 - upstream fixes pamstereogram
 - fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise
   so that they match their man pages (#483011, #483070, #483243, #483245)
+- avoid clashes with getline() from glibc
 
 * Tue Mar 31 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-2
 - remove two hunks from security patch breaking pbmclean and pbmlife (#493015)



From mgrepl at fedoraproject.org  Tue Apr 14 10:34:51 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 14 Apr 2009 10:34:51 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.160,
	1.161 selinux-policy.spec, 1.788, 1.789
Message-ID: <20090414103451.4C9D9700B2@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14526

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow sendmail to read fail2ban_var_lib_t



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- policy-20080710.patch	14 Apr 2009 09:57:10 -0000	1.160
+++ policy-20080710.patch	14 Apr 2009 10:34:48 -0000	1.161
@@ -27399,7 +27399,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.13/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2009-04-14 11:07:49.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2009-04-14 12:30:20.000000000 +0200
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -27498,7 +27498,7 @@
 +')
 +
 +optional_policy(`
-+	fail2ban_read_lib_files(daemon)
++	fail2ban_read_lib_files(sendmail_t)
 +')
 +
 +optional_policy(`
@@ -27506,7 +27506,7 @@
 +')
 +
 +optional_policy(`
-+       milter_stream_connect_all(sendmail_t)
++	milter_stream_connect_all(sendmail_t)
 +')
 +
 +optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- selinux-policy.spec	14 Apr 2009 09:57:14 -0000	1.788
+++ selinux-policy.spec	14 Apr 2009 10:34:50 -0000	1.789
@@ -462,6 +462,7 @@
 %changelog
 * Tue Apr 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-56
 - Fix fail2ban policy
+- Allow sendmail to read fail2ban_var_lib_t
 
 * Tue Apr 7 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-55
 - Allow swat_t domtrans to smbd_t



From berrange at fedoraproject.org  Tue Apr 14 10:35:52 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Tue, 14 Apr 2009 10:35:52 +0000 (UTC)
Subject: rpms/perl-Test-YAML-Valid/devel perl-Test-YAML-Valid.spec,1.3,1.4
Message-ID: <20090414103552.BB960700B2@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/perl-Test-YAML-Valid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14925

Modified Files:
	perl-Test-YAML-Valid.spec 
Log Message:
Add perl(YAML) and perl(YAML::Syck) requirements (rhbz #495401)


Index: perl-Test-YAML-Valid.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-YAML-Valid/devel/perl-Test-YAML-Valid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Test-YAML-Valid.spec	27 Feb 2009 03:06:08 -0000	1.3
+++ perl-Test-YAML-Valid.spec	14 Apr 2009 10:35:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-YAML-Valid
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lets you test the validity of YAML files in unit tests
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,6 +17,8 @@
 BuildRequires:  perl(Test::Builder)
 BuildRequires:  perl(Test::Builder::Tester)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(YAML)
+Requires:       perl(YAML::Syck)
 
 %description
 Lets you test the validity of YAML files inside your
@@ -54,6 +56,9 @@
 %{_mandir}/man3/*3pm*
 
 %changelog
+* Tue Apr 14 2009 Daniel P. Berrange <berrange at redhat.com> - 0.03-4.fc11
+- Add perl(YAML) and perl(YAML::Syck) requirements (rhbz #495401)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mitr at fedoraproject.org  Tue Apr 14 10:37:23 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 14 Apr 2009 10:37:23 +0000 (UTC)
Subject: rpms/mlocate/devel .cvsignore, 1.12, 1.13 mlocate.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20090414103723.4D2E4700B2@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/mlocate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15357

Modified Files:
	.cvsignore mlocate.spec sources 
Log Message:
* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 0.22-1
- Update to mlocate-0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Oct 2008 04:17:08 -0000	1.12
+++ .cvsignore	14 Apr 2009 10:36:51 -0000	1.13
@@ -1 +1 @@
-mlocate-0.21.1.tar.bz2
+mlocate-0.22.tar.bz2


Index: mlocate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mlocate.spec	26 Feb 2009 01:44:27 -0000	1.22
+++ mlocate.spec	14 Apr 2009 10:36:52 -0000	1.23
@@ -1,12 +1,11 @@
 Summary: An utility for finding files by name
 Name: mlocate
-Version: 0.21.1
-Release: 4
+Version: 0.22
+Release: 1
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
 Group: Applications/System
-# https://fedorahosted.org/mlocate/attachment/wiki/MlocateDownloads/mlocate-%{version}.tar.bz2?format=raw
-Source0: %{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/m/l/mlocate/mlocate-%{version}.tar.bz2
 Source1: updatedb.conf
 Source2: mlocate.cron
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -38,7 +37,7 @@
 mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.daily}
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/updatedb.conf
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/mlocate.cron
-# %%ghost semantic is so stupid
+# %%ghost semantics is so stupid
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/mlocate/mlocate.db
 
 %find_lang mlocate
@@ -71,6 +70,9 @@
 %ghost %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
+* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 0.22-1
+- Update to mlocate-0.22
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Oct 2008 04:17:08 -0000	1.12
+++ sources	14 Apr 2009 10:36:52 -0000	1.13
@@ -1 +1 @@
-81ddfc3b798fde5d198dbfcc22602431  mlocate-0.21.1.tar.bz2
+ffd78b6ff967a8ae9f4780f6a9a95e68  mlocate-0.22.tar.bz2



From caolanm at fedoraproject.org  Tue Apr 14 10:45:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 14 Apr 2009 10:45:54 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch, NONE,
	1.1 openoffice.org.spec, 1.1875, 1.1876
Message-ID: <20090414104554.3A96C700B2@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17410

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch 
Log Message:
Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch

openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch ---
diff -ru sd.orig/source/ui/unoidl/unopback.cxx sd/source/ui/unoidl/unopback.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/unopback.cxx	2009-04-14 11:28:37.000000000 +0100
+++ openoffice.org/sd/source/ui/unoidl/unopback.cxx	2009-04-14 11:30:56.000000000 +0100
@@ -119,7 +119,7 @@
 
 }
 
-void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw()
+void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
 {
 	rSet.ClearItem();
 
diff -ru sd.orig/source/ui/unoidl/unopback.hxx sd/source/ui/unoidl/unopback.hxx
--- openoffice.org.orig/sd/source/ui/unoidl/unopback.hxx	2009-04-14 11:28:37.000000000 +0100
+++ openoffice.org/sd/source/ui/unoidl/unopback.hxx	2009-04-14 11:30:41.000000000 +0100
@@ -67,7 +67,7 @@
 	~SdUnoPageBackground() throw();
 
 	// internal
-	void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw();
+	void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet );
 	virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 	// uno helper


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -r1.1875 -r1.1876
--- openoffice.org.spec	9 Apr 2009 14:52:54 -0000	1.1875
+++ openoffice.org.spec	14 Apr 2009 10:45:22 -0000	1.1876
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 9
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -134,6 +134,7 @@
 Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch62: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1626,6 +1627,7 @@
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch61 -p1 -b .ooo100991.pyuno-fix.patch
+%patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4113,6 +4115,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 14 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
+- Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+
 * Thu Apr 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
   hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi



From jfch2222 at fedoraproject.org  Tue Apr 14 10:52:41 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Tue, 14 Apr 2009 10:52:41 +0000 (UTC)
Subject: rpms/tcp_wrappers/devel tcp_wrappers-7.6-220015.patch, 1.5,
	1.6 tcp_wrappers.spec, 1.37, 1.38
Message-ID: <20090414105241.7A8E1700B2@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/tcp_wrappers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18985

Modified Files:
	tcp_wrappers-7.6-220015.patch tcp_wrappers.spec 
Log Message:
resolving addr when name == "" (repair of patch #220015)


tcp_wrappers-7.6-220015.patch:

Index: tcp_wrappers-7.6-220015.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcp_wrappers/devel/tcp_wrappers-7.6-220015.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tcp_wrappers-7.6-220015.patch	29 Aug 2008 07:49:41 -0000	1.5
+++ tcp_wrappers-7.6-220015.patch	14 Apr 2009 10:52:10 -0000	1.6
@@ -42,7 +42,7 @@
 +     * and hostname. */
 +    if (strlen(request->client->addr) &&
 +	    HOSTNAME_KNOWN(request->client->addr) &&
-+	    (!strlen(request->client->addr) ||
++	    (!strlen(request->client->name) ||
 +		!HOSTNAME_KNOWN(request->client->name)))
 +	host = request->client->addr;
 +    else


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- tcp_wrappers.spec	25 Feb 2009 18:58:08 -0000	1.37
+++ tcp_wrappers.spec	14 Apr 2009 10:52:10 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons
 Name: tcp_wrappers
 Version: 7.6
-Release: 54%{?dist}
+Release: 55%{?dist}
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -148,6 +148,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 14 2009 Jan F. Chadima <jchadima at redhat.com> - 7.6-55
+- resolving addr when name == "" (repair of patch #220015)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.6-54
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Tue Apr 14 11:02:37 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 14 Apr 2009 11:02:37 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.85,
	1.86 selinux-policy.spec, 1.822, 1.823
Message-ID: <20090414110237.697E5700B2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22741

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-4
- Add fail2ban_var_lib_t
- Fixes for devicekit_power_t


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- policy-20090105.patch	11 Apr 2009 12:30:22 -0000	1.85
+++ policy-20090105.patch	14 Apr 2009 11:02:35 -0000	1.86
@@ -242,7 +242,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.12/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-13 10:52:18.000000000 -0400
 @@ -22,7 +22,7 @@
  .EX
  httpd_sys_content_t 
@@ -266,6 +266,88 @@
  .EX
  httpd_unconfined_script_exec_t  
  .EE 
+@@ -57,8 +57,7 @@
+ .EE
+ 
+ .SH BOOLEANS
+-SELinux policy is customizable based on least access required.  So by 
+-default SElinux prevents certain http scripts from working.  httpd policy is extremely flexible and has several booleans that allow you to manipulate the policy and run httpd with the tightest access possible.
++SELinux policy is customizable based on least access required.  SElinux can be setup to prevent certain http scripts from working.  httpd policy is extremely flexible and has several booleans that allow you to manipulate the policy and run httpd with the tightest access possible.
+ .PP
+ httpd can be setup to allow cgi scripts to be executed, set httpd_enable_cgi to allow this
+ 
+@@ -67,7 +66,7 @@
+ .EE
+ 
+ .PP
+-httpd by default is not allowed to access users home directories.  If you want to allow access to users home directories you need to set the httpd_enable_homedirs boolean and change the context of the files that you want people to access off the home dir.
++SELinux policy for httpd can be setup to not allowed to access users home directories.  If you want to allow access to users home directories you need to set the httpd_enable_homedirs boolean and change the context of the files that you want people to access off the home dir.
+ 
+ .EX
+ setsebool -P httpd_enable_homedirs 1
+@@ -75,7 +74,7 @@
+ .EE
+ 
+ .PP
+-httpd by default is not allowed access to the controlling terminal.  In most cases this is preferred, because an intruder might be able to use the access to the terminal to gain privileges. But in certain situations httpd needs to prompt for a password to open a certificate file, in these cases, terminal access is required.  Set the httpd_tty_comm boolean to allow terminal access.
++SELinux policy for httpd can be setup to not allow access to the controlling terminal.  In most cases this is preferred, because an intruder might be able to use the access to the terminal to gain privileges. But in certain situations httpd needs to prompt for a password to open a certificate file, in these cases, terminal access is required.  Set the httpd_tty_comm boolean to allow terminal access.
+ 
+ .EX
+ setsebool -P httpd_tty_comm 1
+@@ -89,7 +88,7 @@
+ .EE
+ 
+ .PP
+-httpd can be configured to turn on sending email. By default http is not allowed to send mail.  This is a security feature, since it would prevent a vulnerabiltiy in http from causing a spam attack.  I certain situations, you may want http modules to send mail.  You can turn on the httpd_send_mail boolean.
++SELinu policy for httpd can be configured to turn on sending email. This is a security feature, since it would prevent a vulnerabiltiy in http from causing a spam attack.  I certain situations, you may want http modules to send mail.  You can turn on the httpd_send_mail boolean.
+ 
+ .EX
+ setsebool -P httpd_can_sendmail 1
+@@ -102,7 +101,7 @@
+ .EE
+ 
+ .PP
+-httpd scripts by default are not allowed to connect out to the network.
++SELinux policy can be setup such that httpd scripts are not allowed to connect out to the network.
+ This would prevent a hacker from breaking into you httpd server and attacking 
+ other machines.  If you need scripts to be able to connect you can set the httpd_can_network_connect boolean on.
+ 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.12/man/man8/kerberos_selinux.8
+--- nsaserefpolicy/man/man8/kerberos_selinux.8	2009-03-05 09:22:34.000000000 -0500
++++ serefpolicy-3.6.12/man/man8/kerberos_selinux.8	2009-04-13 10:53:14.000000000 -0400
+@@ -12,7 +12,7 @@
+ .SH "DESCRIPTION"
+ 
+ Security-Enhanced Linux secures the system via flexible mandatory access
+-control. By default Kerberos access is not allowed, since it requires daemons to be allowed greater access to certain secure files and additional access to the network.  
++control. SELinux policy can be configured to deny Kerberos access to confined applications, since it requires daemons to be allowed greater access to certain secure files and additional access to the network.  
+ .SH BOOLEANS
+ .PP
+ You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment.
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.12/man/man8/nfs_selinux.8
+--- nsaserefpolicy/man/man8/nfs_selinux.8	2009-03-05 09:22:34.000000000 -0500
++++ serefpolicy-3.6.12/man/man8/nfs_selinux.8	2009-04-13 10:49:43.000000000 -0400
+@@ -6,7 +6,7 @@
+ Security Enhanced Linux secures the NFS server via flexible mandatory access
+ control.  
+ .SH BOOLEANS
+-SELinux policy is customizable based on the least level of access required. By default, SELinux policy does not allow NFS to share files. If you want to share NFS partitions, and only allow read-only access to those NFS partitions, turn the nfs_export_all_ro boolean on:
++SELinux policy is customizable based on the least level of access required. SELinux can be configured to not allow NFS to share files. If you want to share NFS partitions, and only allow read-only access to those NFS partitions, turn the nfs_export_all_ro boolean on:
+ 
+ .TP
+ setsebool -P nfs_export_all_ro 1
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ypbind_selinux.8 serefpolicy-3.6.12/man/man8/ypbind_selinux.8
+--- nsaserefpolicy/man/man8/ypbind_selinux.8	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/ypbind_selinux.8	2009-04-13 10:54:03.000000000 -0400
+@@ -4,7 +4,7 @@
+ .SH "DESCRIPTION"
+ 
+ Security-Enhanced Linux secures the system via flexible mandatory access
+-control. By default NIS is not allowed, since it requires daemons to be allowed greater access to the network.  
++control. SELinux can be setup deny NIS from working, since it requires daemons to be allowed greater access to the network.  
+ .SH BOOLEANS
+ .TP
+ You must set the allow_ypbind boolean to allow your system to work properly in a NIS environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
 +++ serefpolicy-3.6.12/policy/global_tunables	2009-04-07 16:01:44.000000000 -0400
@@ -5413,7 +5495,7 @@
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-13 08:28:24.000000000 -0400
 @@ -1197,6 +1197,26 @@
  	')
  
@@ -9163,7 +9245,7 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.6.12/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/bind.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/bind.fc	2009-04-13 10:45:45.000000000 -0400
 @@ -1,17 +1,22 @@
  /etc/rc\.d/init\.d/named --	gen_context(system_u:object_r:named_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/unbound	--	gen_context(system_u:object_r:named_initrc_exec_t,s0)
@@ -9187,12 +9269,16 @@
  
  ifdef(`distro_debian',`
  /etc/bind(/.*)?			gen_context(system_u:object_r:named_zone_t,s0)
-@@ -40,8 +45,8 @@
+@@ -40,8 +45,12 @@
  /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
  /var/named/named\.ca	--	gen_context(system_u:object_r:named_conf_t,s0)
  /var/named/chroot(/.*)?		gen_context(system_u:object_r:named_conf_t,s0)
 -/var/named/chroot/etc(/.*)? 	gen_context(system_u:object_r:named_conf_t,s0)
  /var/named/chroot/etc/rndc\.key -- gen_context(system_u:object_r:dnssec_t,s0)
++/var/named/chroot/etc/named\.conf -- gen_context(system_u:object_r:named_conf_t,s0)
++/var/named/chroot/etc/named\.rfc1912.zones --	gen_context(system_u:object_r:named_conf_t,s0)
++/var/named/chroot/etc/named\.root\.hints   --	gen_context(system_u:object_r:named_conf_t,s0)
++/var/named/chroot/etc/named\.caching-nameserver\.conf -- gen_context(system_u:object_r:named_conf_t,s0)
 +/var/named/chroot/proc(/.*)? 	<<none>>
  /var/named/chroot/var/run/named.* gen_context(system_u:object_r:named_var_run_t,s0)
  /var/named/chroot/var/tmp(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
@@ -11327,7 +11413,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-13 10:31:12.000000000 -0400
 @@ -44,6 +44,7 @@
  
  		attribute session_bus_type;
@@ -11362,16 +11448,18 @@
  
  	files_read_etc_files($1_dbusd_t)
  	files_list_home($1_dbusd_t)
-@@ -145,6 +147,8 @@
+@@ -145,7 +147,10 @@
  	seutil_read_config($1_dbusd_t)
  	seutil_read_default_contexts($1_dbusd_t)
  
 +	term_use_all_terms($1_dbusd_t)
 +
  	userdom_read_user_home_content_files($1_dbusd_t)
++	userdom_dontaudit_search_admin_dir($1_dbusd_t)
  
  	ifdef(`hide_broken_symptoms', `
-@@ -160,6 +164,10 @@
+ 		dontaudit $3 $1_dbusd_t:netlink_selinux_socket { read write };
+@@ -160,6 +165,10 @@
  	')
  
  	optional_policy(`
@@ -11382,7 +11470,7 @@
  		hal_dbus_chat($1_dbusd_t)
  	')
  
-@@ -185,10 +193,12 @@
+@@ -185,10 +194,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -11396,7 +11484,7 @@
  
  	read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($1)
-@@ -197,6 +207,10 @@
+@@ -197,6 +208,10 @@
  	files_search_pids($1)
  	stream_connect_pattern($1, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
  	dbus_read_config($1)
@@ -11407,7 +11495,7 @@
  ')
  
  #######################################
-@@ -244,6 +258,35 @@
+@@ -244,6 +259,35 @@
  
  ########################################
  ## <summary>
@@ -11443,7 +11531,7 @@
  ##	Read dbus configuration.
  ## </summary>
  ## <param name="domain">
-@@ -318,3 +361,77 @@
+@@ -318,3 +362,79 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -11501,6 +11589,8 @@
 +	ifdef(`hide_broken_symptoms', `
 +		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
 +	');
++
++	userdom_dontaudit_search_admin_dir($1)
 +')
 +
 +########################################
@@ -11894,8 +11984,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.12/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/devicekit.te	2009-04-11 08:02:27.000000000 -0400
-@@ -0,0 +1,235 @@
++++ serefpolicy-3.6.12/policy/modules/services/devicekit.te	2009-04-13 08:28:53.000000000 -0400
+@@ -0,0 +1,237 @@
 +policy_module(devicekit,1.0.0)
 +
 +########################################
@@ -11960,6 +12050,7 @@
 +manage_dirs_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
 +manage_files_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
 +files_var_lib_filetrans(devicekit_power_t, devicekit_var_lib_t, dir)
++files_read_kernel_img(devicekit_power_t)
 +
 +corecmd_exec_bin(devicekit_power_t)
 +corecmd_exec_shell(devicekit_power_t)
@@ -11968,9 +12059,10 @@
 +
 +domain_read_all_domains_state(devicekit_power_t)
 +
++kernel_read_network_state(devicekit_power_t)
 +kernel_read_system_state(devicekit_power_t)
-+kernel_rw_kernel_sysctl(devicekit_power_t)
 +kernel_rw_hotplug_sysctls(devicekit_power_t)
++kernel_rw_kernel_sysctl(devicekit_power_t)
 +kernel_write_proc_files(devicekit_power_t)
 +
 +dev_rw_generic_usb_dev(devicekit_power_t)
@@ -12761,10 +12853,62 @@
 +	spamassassin_exec(exim_t)
 +	spamassassin_exec_client(exim_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.6.12/policy/modules/services/fail2ban.fc
+--- nsaserefpolicy/policy/modules/services/fail2ban.fc	2008-10-08 19:00:27.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/fail2ban.fc	2009-04-13 08:03:31.000000000 -0400
+@@ -2,5 +2,9 @@
+ 
+ /usr/bin/fail2ban	--	gen_context(system_u:object_r:fail2ban_exec_t,s0)
+ /usr/bin/fail2ban-server --	gen_context(system_u:object_r:fail2ban_exec_t,s0)
++/var/lib/fail2ban(/.*)?		gen_context(system_u:object_r:fail2ban_var_lib_t,s0)
++
+ /var/log/fail2ban\.log	--	gen_context(system_u:object_r:fail2ban_log_t,s0)
++
++
+ /var/run/fail2ban.*		gen_context(system_u:object_r:fail2ban_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.6.12/policy/modules/services/fail2ban.if
+--- nsaserefpolicy/policy/modules/services/fail2ban.if	2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fail2ban.if	2009-04-13 08:04:42.000000000 -0400
+@@ -20,6 +20,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Read fail2ban lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fail2ban_read_lib_files',`
++	gen_require(`
++		type fail2ban_var_lib_t;
++	')
++
++	files_search_pids($1)
++	allow $1 fail2ban_var_lib_t:file read_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Allow the specified domain to read fail2ban's log files.
+ ## </summary>
+ ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.6.12/policy/modules/services/fail2ban.te
 --- nsaserefpolicy/policy/modules/services/fail2ban.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/fail2ban.te	2009-04-07 16:01:44.000000000 -0400
-@@ -26,6 +26,7 @@
++++ serefpolicy-3.6.12/policy/modules/services/fail2ban.te	2009-04-13 08:09:29.000000000 -0400
+@@ -17,6 +17,9 @@
+ type fail2ban_log_t;
+ logging_log_file(fail2ban_log_t)
+ 
++type fail2ban_var_lib_t;
++files_type(fail2ban_var_lib_t)
++
+ # pid files
+ type fail2ban_var_run_t;
+ files_pid_file(fail2ban_var_run_t)
+@@ -26,6 +29,7 @@
  # fail2ban local policy
  #
  
@@ -12772,6 +12916,17 @@
  allow fail2ban_t self:process signal;
  allow fail2ban_t self:fifo_file rw_fifo_file_perms;
  allow fail2ban_t self:unix_stream_socket { connectto create_stream_socket_perms };
+@@ -36,6 +40,10 @@
+ manage_files_pattern(fail2ban_t, fail2ban_log_t, fail2ban_log_t)
+ logging_log_filetrans(fail2ban_t, fail2ban_log_t, file)
+ 
++manage_dirs_pattern(fail2ban_t, fail2ban_var_lib_t, fail2ban_var_lib_t)
++manage_files_pattern(fail2ban_t, fail2ban_var_lib_t, fail2ban_var_lib_t)
++files_var_lib_filetrans(fail2ban_t, fail2ban_var_lib_t, { dir file })
++
+ # pid file
+ manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+ manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.12/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/ftp.te	2009-04-07 16:01:44.000000000 -0400
@@ -17475,7 +17630,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.12/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-13 11:44:30.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -19215,6 +19370,14 @@
  userdom_dontaudit_search_user_home_dirs(pyzor_t)
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.6.12/policy/modules/services/razor.fc
+--- nsaserefpolicy/policy/modules/services/razor.fc	2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/razor.fc	2009-04-13 10:23:30.000000000 -0400
+@@ -1,3 +1,4 @@
++/root/\.razor(/.*)?		gen_context(system_u:object_r:razor_home_t,s0)
+ HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:razor_home_t,s0)
+ 
+ /etc/razor(/.*)?		gen_context(system_u:object_r:razor_etc_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.6.12/policy/modules/services/razor.if
 --- nsaserefpolicy/policy/modules/services/razor.if	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/razor.if	2009-04-07 16:01:44.000000000 -0400
@@ -20495,7 +20658,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.6.12/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sendmail.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sendmail.te	2009-04-13 11:43:41.000000000 -0400
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -20555,7 +20718,7 @@
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -89,23 +100,38 @@
+@@ -89,23 +100,42 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -20592,11 +20755,15 @@
 +')
 +
 +optional_policy(`
++	fail2ban_read_lib_files(sendmail_t)
++')
++
++optional_policy(`
 +	kerberos_keytab_template(sendmail, sendmail_t)
  ')
  
  optional_policy(`
-@@ -113,13 +139,19 @@
+@@ -113,13 +143,19 @@
  ')
  
  optional_policy(`
@@ -20617,7 +20784,7 @@
  ')
  
  optional_policy(`
-@@ -127,24 +159,29 @@
+@@ -127,24 +163,29 @@
  ')
  
  optional_policy(`
@@ -22083,8 +22250,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,68 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-14 06:59:02.000000000 -0400
+@@ -0,0 +1,70 @@
 +policy_module(sssd,1.0.0)
 +
 +########################################
@@ -22143,6 +22310,8 @@
 +files_read_usr_files(sssd_t)
 +
 +auth_use_nsswitch(sssd_t)
++auth_domtrans_chk_passwd(sssd_t)
++auth_domtrans_upd_passwd(sssd_t)
 +
 +logging_send_syslog_msg(sssd_t)
 +logging_send_audit_msgs(sssd_t)
@@ -24897,7 +25066,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-09 10:06:45.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-13 10:35:22.000000000 -0400
 @@ -280,6 +280,29 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -25089,7 +25258,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-09 10:19:55.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-13 08:06:15.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25426,7 +25595,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +877,21 @@
+@@ -790,3 +877,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25448,6 +25617,10 @@
 +')
 +
 +init_rw_script_stream_sockets(daemon)
++
++optional_policy(`
++	fail2ban_read_lib_files(daemon)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.12/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-04-06 12:42:08.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-04-07 16:01:44.000000000 -0400
@@ -28678,7 +28851,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-11 07:13:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-13 10:33:55.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29115,7 +29288,7 @@
  
  	##############################
  	#
-@@ -512,189 +518,199 @@
+@@ -512,189 +518,200 @@
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
  
@@ -29284,6 +29457,7 @@
  
  		optional_policy(`
 -			hal_dbus_chat($1_t)
++			devicekit_dbus_chat($1_usertype)
 +			devicekit_power_dbus_chat($1_usertype)
 +			devicekit_disk_dbus_chat($1_usertype)
  		')
@@ -29396,7 +29570,7 @@
  ')
  
  #######################################
-@@ -722,13 +738,26 @@
+@@ -722,13 +739,26 @@
  
  	userdom_base_user_template($1)
  
@@ -29428,7 +29602,7 @@
  
  	userdom_change_password_template($1)
  
-@@ -746,70 +775,71 @@
+@@ -746,70 +776,71 @@
  
  	allow $1_t self:context contains;
  
@@ -29533,7 +29707,7 @@
  	')
  ')
  
-@@ -846,6 +876,28 @@
+@@ -846,6 +877,28 @@
  	# Local policy
  	#
  
@@ -29562,7 +29736,7 @@
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -876,7 +928,7 @@
+@@ -876,7 +929,7 @@
  
  	userdom_restricted_user_template($1)
  
@@ -29571,7 +29745,7 @@
  
  	##############################
  	#
-@@ -884,14 +936,19 @@
+@@ -884,14 +937,19 @@
  	#
  
  	auth_role($1_r, $1_t)
@@ -29596,7 +29770,7 @@
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -899,28 +956,33 @@
+@@ -899,28 +957,33 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -29637,7 +29811,7 @@
  	')
  ')
  
-@@ -954,8 +1016,8 @@
+@@ -954,8 +1017,8 @@
  	# Declarations
  	#
  
@@ -29647,7 +29821,7 @@
  	userdom_common_user_template($1)
  
  	##############################
-@@ -964,11 +1026,12 @@
+@@ -964,11 +1027,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -29662,7 +29836,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1049,47 @@
+@@ -986,37 +1050,47 @@
  		')
  	')
  
@@ -29724,7 +29898,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1123,7 @@
+@@ -1050,7 +1124,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -29733,7 +29907,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1132,7 @@
+@@ -1059,8 +1133,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -29743,7 +29917,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1155,8 @@
+@@ -1083,7 +1156,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -29753,7 +29927,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1099,6 +1172,7 @@
+@@ -1099,6 +1173,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -29761,7 +29935,7 @@
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1106,8 +1180,6 @@
+@@ -1106,8 +1181,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -29770,7 +29944,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1234,6 @@
+@@ -1162,20 +1235,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -29791,7 +29965,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1279,7 @@
+@@ -1221,6 +1280,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -29799,7 +29973,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1345,15 @@
+@@ -1286,11 +1346,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -29815,7 +29989,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1450,7 @@
+@@ -1387,7 +1451,7 @@
  
  ########################################
  ## <summary>
@@ -29824,7 +29998,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1483,14 @@
+@@ -1420,6 +1484,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -29839,7 +30013,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1506,11 @@
+@@ -1435,9 +1507,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -29851,7 +30025,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1567,25 @@
+@@ -1494,6 +1568,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -29877,7 +30051,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1568,6 +1660,8 @@
+@@ -1568,6 +1661,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -29886,7 +30060,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1737,7 @@
+@@ -1643,6 +1738,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -29894,7 +30068,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,30 +1836,80 @@
+@@ -1741,30 +1837,80 @@
  
  ########################################
  ## <summary>
@@ -29985,7 +30159,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1932,46 @@
+@@ -1787,6 +1933,46 @@
  
  ########################################
  ## <summary>
@@ -30032,7 +30206,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -1799,6 +1984,7 @@
+@@ -1799,6 +1985,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -30040,7 +30214,7 @@
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2328,7 +2514,7 @@
+@@ -2328,7 +2515,7 @@
  
  ########################################
  ## <summary>
@@ -30049,7 +30223,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2814,7 +3000,25 @@
+@@ -2814,7 +3001,25 @@
  		type user_tmp_t;
  	')
  
@@ -30076,7 +30250,7 @@
  ')
  
  ########################################
-@@ -2851,6 +3055,7 @@
+@@ -2851,6 +3056,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -30084,7 +30258,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3186,482 @@
+@@ -2981,3 +3187,482 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- selinux-policy.spec	11 Apr 2009 12:30:22 -0000	1.822
+++ selinux-policy.spec	14 Apr 2009 11:02:35 -0000	1.823
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -440,6 +440,10 @@
 %endif
 
 %changelog
+* Mon Apr 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-4
+- Add fail2ban_var_lib_t
+- Fixes for devicekit_power_t
+
 * Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-3
 - Separate out the ucnonfined user from the unconfined.pp package
 



From nphilipp at fedoraproject.org  Tue Apr 14 11:10:51 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 11:10:51 +0000 (UTC)
Subject: rpms/system-config-users-docs/devel .cvsignore, 1.3, 1.4 sources,
	1.4, 1.5 system-config-users-docs.spec, 1.4, 1.5
Message-ID: <20090414111051.D8E98700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24684

Modified Files:
	.cvsignore sources system-config-users-docs.spec 
Log Message:
version 1.0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 15:33:17 -0000	1.3
+++ .cvsignore	14 Apr 2009 11:10:21 -0000	1.4
@@ -1 +1 @@
-system-config-users-docs-1.0.5.tar.bz2
+system-config-users-docs-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 15:33:17 -0000	1.4
+++ sources	14 Apr 2009 11:10:21 -0000	1.5
@@ -1 +1 @@
-e5522794bf98cb5947e3db863a1c2af9  system-config-users-docs-1.0.5.tar.bz2
+dd948419edd15802e1476e0c2abf6950  system-config-users-docs-1.0.6.tar.bz2


Index: system-config-users-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users-docs/devel/system-config-users-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-config-users-docs.spec	8 Apr 2009 15:33:17 -0000	1.4
+++ system-config-users-docs.spec	14 Apr 2009 11:10:21 -0000	1.5
@@ -8,7 +8,7 @@
 
 Summary: Documentation for administering users and groups
 Name: system-config-users-docs
-Version: 1.0.5
+Version: 1.0.6
 Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
@@ -65,6 +65,10 @@
 %doc %{_datadir}/gnome/help/system-config-users
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
+- add sr at latin structure (#495293, sr at latin.po by Milo?? Komar??evi??)
+- pick up updated translations
+
 * Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.5-1
 - pull in updated translations
 



From mmaslano at fedoraproject.org  Tue Apr 14 11:11:25 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 14 Apr 2009 11:11:25 +0000 (UTC)
Subject: rpms/iproute/devel iproute2-display_ip4ip6tunnels.patch, NONE,
	1.1 iproute2-missing-arpd-directory.patch, NONE,
	1.1 iproute.spec, 1.94, 1.95
Message-ID: <20090414111125.EDD8F700B2@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24869

Modified Files:
	iproute.spec 
Added Files:
	iproute2-display_ip4ip6tunnels.patch 
	iproute2-missing-arpd-directory.patch 
Log Message:
* Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.29-2
- c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default 
 display of ip4ip6 tunnels
- e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 missing arpd directory


iproute2-display_ip4ip6tunnels.patch:

--- NEW FILE iproute2-display_ip4ip6tunnels.patch ---
>From c3651bf4763d7247e3edd4e20526a85de459041b Mon Sep 17 00:00:00 2001
From: Srivats P <srivats.p at conexant.com>
Date: Fri, 27 Mar 2009 11:17:26 -0700
Subject: [PATCH] ip6tunnel: Fix no default display of ip4ip6 tunnels

"ip -6 tunnel show" displays only ip6ip6 tunnels not ip4ip6 tunnels
 - it should display all irrespective of proto.

This is because the default tunnel proto is initialized to IPPROTO_IPV6 in ip6_tnl_parm_init() which is fine for a 'add' command but not for 'show'. This patch overrides proto with 0 signifying 'mode any' as the default in case of a 'show'.
---
 ip/ip6tunnel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index 8421983..8852a67 100644
--- iproute2-2.6.29/iproute2-2.6.29/ip/ip6tunnel.c.old
+++ iproute2-2.6.29/iproute2-2.6.29/ip/ip6tunnel.c
@@ -335,6 +335,7 @@ static int do_show(int argc, char **argv)
         struct ip6_tnl_parm p;
 
 	ip6_tnl_parm_init(&p, 0);
+	p.proto = 0;  /* default to any */
 
         if (parse_args(argc, argv, &p) < 0)
                 return -1;
-- 
1.6.2.2


iproute2-missing-arpd-directory.patch:

--- NEW FILE iproute2-missing-arpd-directory.patch ---
>From e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor at kopf-tisch.de>
Date: Wed, 9 Nov 2005 15:25:40 +0100
Subject: [PATCH] iproute2-2.6.14-051107: missing arpd directory

arpd requires a directory (/var/lib/arpd/) to run.
see attached patch, which lets iproute create this directroy during install.
---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff -up iproute-2.6.29/iproute2-2.6.29/Makefile.arpd iproute-2.6.29/iproute2-2.6.29/Makefile
--- iproute-2.6.29/iproute2-2.6.29/Makefile.arpd	2009-04-14 12:57:23.743114366 +0200
+++ iproute-2.6.29/iproute2-2.6.29/Makefile	2009-04-14 12:58:38.754111501 +0200
@@ -5,6 +5,7 @@ CONFDIR=/etc/iproute2
 DOCDIR=/share/doc/iproute2
 MANDIR=/share/man
 KERNEL_INCLUDE=/usr/include
+ARPDDIR=/var/lib/arpd                                                                       
 
 # Path to db_185.h include
 DBM_INCLUDE:=/usr/include
@@ -44,6 +45,7 @@ Config:
 install: all
 	install -m 0755 -d $(DESTDIR)$(SBINDIR)
 	install -m 0755 -d $(DESTDIR)$(CONFDIR)
+	install -m 0755 -d $(DESTDIR)$(ARPDDIR)
 	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
 	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
 	install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- iproute.spec	25 Mar 2009 12:49:42 -0000	1.94
+++ iproute.spec	14 Apr 2009 11:10:54 -0000	1.95
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
@@ -15,6 +15,8 @@
 Patch4: iproute2-2.6.25-segfault.patch
 Patch5: iproute2-sharepath.patch
 Patch6: iproute2-2.6.29-fix_headers_for_gre.patch
+Patch7: iproute2-missing-arpd-directory.patch
+Patch8: iproute2-display_ip4ip6tunnels.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,6 +36,8 @@
 %patch4 -p1 -b .seg
 %patch5 -p1 -b .share
 %patch6 -p1 -b .hdrs
+%patch7 -p1 -b .arpd
+%patch8 -p1 -b .ip4ip6
 
 %build
 export LIBDIR=%{_libdir}
@@ -109,6 +113,11 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.29-2
+- c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default 
+ display of ip4ip6 tunnels
+- e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 missing arpd directory
+
 * Wed Mar 25 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.29-1
 - update to 2.6.29
 - remove DDR patch which became part of sourc



From kasal at fedoraproject.org  Tue Apr 14 11:16:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 14 Apr 2009 11:16:53 +0000 (UTC)
Subject: rpms/perl/F-10 perl.spec,1.211,1.212
Message-ID: <20090414111653.4F571700B2@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26422/F-10

Modified Files:
	perl.spec 
Log Message:
- do not use quotes in patchlevel.h; it breaks installation from cpan (#495183)


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-10/perl.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- perl.spec	8 Apr 2009 09:36:00 -0000	1.211
+++ perl.spec	14 Apr 2009 11:16:21 -0000	1.212
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        67%{?dist}
+Release:        68%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1227,7 +1227,7 @@
 	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
 	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
 	'33287 Fix NULLOK items' \
-	'33554 Fix a typo in the predefined common protocols to make "udp" resolve without netbase' \
+	'33554 Fix a typo in the predefined common protocols to make _udp_ resolve without netbase' \
 	'33388 Fix a segmentation fault with debugperl -Dm' \
 	'33835 Allow the quote mark delimiter also for those #include directives chased with h2ph -a.' \
 	'32910 Disable the v-string in use/require is non-portable warning.' \
@@ -1887,6 +1887,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Apr 10 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-68
+- do not use quotes in patchlevel.h; it breaks installation from cpan (#495183)
+
 * Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-67
 - update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch
 



From kasal at fedoraproject.org  Tue Apr 14 11:16:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 14 Apr 2009 11:16:53 +0000 (UTC)
Subject: rpms/perl/F-9 perl.spec,1.192,1.193
Message-ID: <20090414111653.BCE26700B2@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26422/F-9

Modified Files:
	perl.spec 
Log Message:
- do not use quotes in patchlevel.h; it breaks installation from cpan (#495183)


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-9/perl.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- perl.spec	8 Apr 2009 09:36:05 -0000	1.192
+++ perl.spec	14 Apr 2009 11:16:22 -0000	1.193
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        67%{?dist}
+Release:        68%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1227,7 +1227,7 @@
 	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
 	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
 	'33287 Fix NULLOK items' \
-	'33554 Fix a typo in the predefined common protocols to make "udp" resolve without netbase' \
+	'33554 Fix a typo in the predefined common protocols to make _udp_ resolve without netbase' \
 	'33388 Fix a segmentation fault with debugperl -Dm' \
 	'33835 Allow the quote mark delimiter also for those #include directives chased with h2ph -a.' \
 	'32910 Disable the v-string in use/require is non-portable warning.' \
@@ -1887,6 +1887,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Apr 10 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-68
+- do not use quotes in patchlevel.h; it breaks installation from cpan (#495183)
+
 * Tue Apr  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-67
 - update CGI to 3.43, dropping upstreamed perl-CGI-escape.patch
 



From scop at fedoraproject.org  Tue Apr 14 11:20:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 11:20:29 +0000 (UTC)
Subject: rpms/javasqlite/devel javasqlite.spec,1.11,1.12
Message-ID: <20090414112029.C1348700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27672

Modified Files:
	javasqlite.spec 
Log Message:
* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-2
- Don't use parallel make, Java build doesn't appear parallel clean.



Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- javasqlite.spec	14 Apr 2009 08:21:30 -0000	1.11
+++ javasqlite.spec	14 Apr 2009 11:20:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           javasqlite
 Version:        20090409
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -56,12 +56,12 @@
 # Pass #1: JDBC 3 driver and common files with 1.5.0
 export PATH="%{_jvmdir}/java-1.5.0/bin:$origpath" # bug 460761
 %configure $common_flags --with-jdk=%{_jvmdir}/java-1.5.0
-make %{?_smp_mflags} sqlite.jar JAVAC_FLAGS="-source 5"
+make sqlite.jar JAVAC_FLAGS="-source 5" # Java build not parallel clean
 
 # Pass #2: JDBC 4 driver and the rest with 1.6.0
 export PATH="%{_jvmdir}/java-1.6.0/bin:$origpath" # bug 460761 (to be sure)
 %configure $common_flags --with-jdk=%{_jvmdir}/java-1.6.0
-make %{?_smp_mflags}
+make # Java build not parallel clean
 
 # Add JDBC 3 classes
 jar uf sqlite.jar SQLite/JDBC2y/*.class
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-2
+- Don't use parallel make, Java build doesn't appear parallel clean.
+
 * Sun Apr 12 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-1
 - Update to 20090409, enable extension loading.
 - Patch to actually check features of system sqlite lib at build time.



From cebbert at fedoraproject.org  Tue Apr 14 11:32:52 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 11:32:52 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.72,
	1.73 kernel.spec, 
	1.1535, 1.1536 linux-2.6-acer-wmi-bail-on-aao.patch, 1.1, 1.2
Message-ID: <20090414113253.035D870127@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30311

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
	linux-2.6-acer-wmi-bail-on-aao.patch 
Log Message:
acer-wmi: use upstream code to blacklist an additional model
Trivial fix to drm-modesetting-radeon to fix failure to apply

drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- drm-modesetting-radeon.patch	14 Apr 2009 06:04:13 -0000	1.72
+++ drm-modesetting-radeon.patch	14 Apr 2009 11:32:15 -0000	1.73
@@ -1939,7 +1939,7 @@
  int __read_mostly pat_enabled = 1;
 +EXPORT_SYMBOL_GPL(pat_enabled);
  
- void __cpuinit pat_disable(const char *reason)
+ void __cpuinit pat_disable(char *reason)
  {
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
 index 3a22eb9..a74980b 100644


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -r1.1535 -r1.1536
--- kernel.spec	14 Apr 2009 06:04:14 -0000	1.1535
+++ kernel.spec	14 Apr 2009 11:32:18 -0000	1.1536
@@ -929,8 +929,8 @@
       echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
       exit 1
     fi
-  done 2>/dev/null
-fi
+  done
+fi 2>/dev/null
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -1932,6 +1932,10 @@
 # and build.
 
 %changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- acer-wmi: use upstream code to blacklist an additional model
+- Trivial fix to drm-modesetting-radeon to fix failure to apply
+
 * Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-73
 - drm-modesetting-radeon.patch: more bug fixes
 

linux-2.6-acer-wmi-bail-on-aao.patch:

Index: linux-2.6-acer-wmi-bail-on-aao.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-acer-wmi-bail-on-aao.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-acer-wmi-bail-on-aao.patch	3 Apr 2009 19:34:05 -0000	1.1
+++ linux-2.6-acer-wmi-bail-on-aao.patch	14 Apr 2009 11:32:19 -0000	1.2
@@ -1,82 +1,66 @@
-[PATCH] acer-wmi: don't bother loading on unsupported systems
-
-Its both a waste of system resources to load this driver on unsupported
-systems (which happens often, due to the *Acer* dmi modalias wildcard),
-and actually causes problems -- we wind up with a sysfs rfkill entry
-that is always disabled, which throws things like NetworkManager for a
-loop, causing it to think your wireless card isn't available, even
-though the *real* rfkill entry for the card says it is. This is
-triggering on multiple Acer Aspire One's here in the office, like so:
-
-NetworkManager: <info> starting...
-NetworkManager: <WARN> nm_generic_enable_loopback(): error -17 returned from rtnl_addr_add():#012Sucess#012
-NetworkManager: <info> Found radio killswitch /org/freedesktop/Hal/devices/platform_acer_wmi_rfkill_acer_wireless_wlan
-NetworkManager: <info> Found radio killswitch /org/freedesktop/Hal/devices/pci_8086_423a_rfkill_5350AGN_wlan
-NetworkManager: <info> (eth0): new Ethernet device (driver: 'r8169')
-NetworkManager: <info> (eth0): exported as /org/freedesktop/Hal/devices/net_00_1e_68_8a_a1_f8
-NetworkManager: <info> (wlan0): driver supports SSID scans (scan_capa 0x01).
-NetworkManager: <info> (wlan0): new 802.11 WiFi device (driver: 'iwlagn')
-NetworkManager: <info> (wlan0): exported as /org/freedesktop/Hal/devices/net_00_16_eb_04_31_ea
-NetworkManager: <info> Trying to start the supplicant...
-NetworkManager: <info> Trying to start the system settings daemon...
-NetworkManager: <info> Wireless now disabled by radio killswitch
-NetworkManager: <info> (wlan0): supplicant manager state: down -> idle
-
-So have acer-wmi just bail on unsupported systems -- includes only my
-particular model of the Aspire One atm, but a larger list of unsupported
-systems can be found here:
-
-http://code.google.com/p/aceracpi/wiki/SupportedHardware
-
-This might well become unnecessary once the WMI sysfs interface mentioned in
-acer-wmi.c exists and the wild-card dmi modalias is gone, but for now... I
-prefer to have working wireless, and this isn't exactly an obvious root
-cause.
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
+From: Carlos Corbacho <carlos at strangeworlds.co.uk>
+Date: Sat, 4 Apr 2009 08:33:29 +0000 (+0100)
+Subject: acer-wmi: Blacklist Acer Aspire One
+X-Git-Tag: v2.6.30-rc1~199^2~15^2~2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a74dd5fdabcd34c93e17e9c7024eeb503c92b048
+
+acer-wmi: Blacklist Acer Aspire One
+
+The Aspire One's ACPI-WMI interface is a placeholder that does nothing,
+and the invalid results that we get from it are now causing userspace
+problems as acer-wmi always returns that the rfkill is enabled (i.e. the
+radio is off, when it isn't). As it's hardware controlled, acer-wmi
+isn't needed on the Aspire One either.
+
+Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace
+issues to this.
+
+Signed-off-by: Carlos Corbacho <carlos at strangeworlds.co.uk>
+Reported-by: Andy Whitcroft <apw at canonical.com>
+Cc: stable at kernel.org
+Signed-off-by: Len Brown <len.brown at intel.com>
 ---
- drivers/platform/x86/acer-wmi.c |   23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
-index a6a42e8..eda7eea 100644
+index a6a42e8..60fbef2 100644
 --- a/drivers/platform/x86/acer-wmi.c
 +++ b/drivers/platform/x86/acer-wmi.c
-@@ -355,6 +355,25 @@ static struct dmi_system_id acer_quirks[] = {
- 	{}
+@@ -225,6 +225,25 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
+ 	.wireless = 2,
  };
  
-+static int __init acer_wmi_unsupported_callback(const struct dmi_system_id *id)
-+{
-+	printk(ACER_INFO "%s not supported by Acer Laptop ACPI-WMI Extras\n",
-+	       id->ident);
-+	return 1;
-+}
-+
-+static const struct dmi_system_id __initdata acer_wmi_unsupported[] = {
++/* The Aspire One has a dummy ACPI-WMI interface - disable it */
++static struct dmi_system_id __devinitdata acer_blacklist[] = {
 +	{
-+		.callback = acer_wmi_unsupported_callback,
-+		.ident = "Acer Aspire One",
++		.ident = "Acer Aspire One (SSD)",
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
 +		},
 +	},
++	{
++		.ident = "Acer Aspire One (HDD)",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
++		},
++	},
 +	{}
 +};
 +
- /* Find which quirks are needed for a particular vendor/ model pair */
- static void find_quirks(void)
- {
-@@ -1252,6 +1271,10 @@ static int __init acer_wmi_init(void)
- {
- 	int err;
+ static struct dmi_system_id acer_quirks[] = {
+ 	{
+ 		.callback = dmi_matched,
+@@ -1254,6 +1273,12 @@ static int __init acer_wmi_init(void)
  
-+	/* Check for unsupported systems and bail */
-+	if (dmi_check_system(acer_wmi_unsupported))
-+		return -ENODEV;
-+
  	printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
  
++	if (dmi_check_system(acer_blacklist)) {
++		printk(ACER_INFO "Blacklisted hardware detected - "
++				"not loading\n");
++		return -ENODEV;
++	}
++
  	find_quirks();
+ 
+ 	/*



From cebbert at fedoraproject.org  Tue Apr 14 11:40:36 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 11:40:36 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-acer-wmi-bail-on-aao.patch, NONE,
	1.1 kernel.spec, 1.1324, 1.1325
Message-ID: <20090414114036.E1085700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv613

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acer-wmi-bail-on-aao.patch 
Log Message:
Blacklist acer-wmi on the AAO to fix rfkill switch problems

linux-2.6-acer-wmi-bail-on-aao.patch:

--- NEW FILE linux-2.6-acer-wmi-bail-on-aao.patch ---
From: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date: Sat, 4 Apr 2009 08:33:29 +0000 (+0100)
Subject: acer-wmi: Blacklist Acer Aspire One
X-Git-Tag: v2.6.30-rc1~199^2~15^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a74dd5fdabcd34c93e17e9c7024eeb503c92b048

acer-wmi: Blacklist Acer Aspire One

The Aspire One's ACPI-WMI interface is a placeholder that does nothing,
and the invalid results that we get from it are now causing userspace
problems as acer-wmi always returns that the rfkill is enabled (i.e. the
radio is off, when it isn't). As it's hardware controlled, acer-wmi
isn't needed on the Aspire One either.

Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace
issues to this.

Signed-off-by: Carlos Corbacho <carlos at strangeworlds.co.uk>
Reported-by: Andy Whitcroft <apw at canonical.com>
Cc: stable at kernel.org
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index a6a42e8..60fbef2 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -225,6 +225,25 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
 	.wireless = 2,
 };
 
+/* The Aspire One has a dummy ACPI-WMI interface - disable it */
+static struct dmi_system_id __devinitdata acer_blacklist[] = {
+	{
+		.ident = "Acer Aspire One (SSD)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+		},
+	},
+	{
+		.ident = "Acer Aspire One (HDD)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
+		},
+	},
+	{}
+};
+
 static struct dmi_system_id acer_quirks[] = {
 	{
 		.callback = dmi_matched,
@@ -1254,6 +1273,12 @@ static int __init acer_wmi_init(void)
 
 	printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
 
+	if (dmi_check_system(acer_blacklist)) {
+		printk(ACER_INFO "Blacklisted hardware detected - "
+				"not loading\n");
+		return -ENODEV;
+	}
+
 	find_quirks();
 
 	/*


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1324
retrieving revision 1.1325
diff -u -r1.1324 -r1.1325
--- kernel.spec	14 Apr 2009 02:42:54 -0000	1.1324
+++ kernel.spec	14 Apr 2009 11:40:05 -0000	1.1325
@@ -620,6 +620,7 @@
 Patch383: linux-2.6-defaults-fat-utf8.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
+Patch396: linux-2.6-acer-wmi-bail-on-aao.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -909,8 +910,8 @@
       echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
       exit 1
     fi
-  done 2>/dev/null
-fi
+  done
+fi 2>/dev/null
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -1173,6 +1174,7 @@
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
+ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1872,6 +1874,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-24
+- Blacklist acer-wmi on the AAO to fix rfkill switch problems
+
 * Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-23
 - radeon: add some more kms fixes backported from F11
 



From mitr at fedoraproject.org  Tue Apr 14 11:41:42 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 14 Apr 2009 11:41:42 +0000 (UTC)
Subject: rpms/usermode/devel .cvsignore, 1.60, 1.61 sources, 1.64,
	1.65 usermode.spec, 1.85, 1.86
Message-ID: <20090414114142.F0B58700B2@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv965

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.100-1
- Update to usermode-1.100



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	11 Nov 2008 11:58:27 -0000	1.60
+++ .cvsignore	14 Apr 2009 11:41:12 -0000	1.61
@@ -1 +1 @@
-usermode-1.99.tar.bz2
+usermode-1.100.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	11 Nov 2008 11:58:27 -0000	1.64
+++ sources	14 Apr 2009 11:41:12 -0000	1.65
@@ -1 +1 @@
-c02557e127ebf469e481e61b2be5fc7d  usermode-1.99.tar.bz2
+c7f1c6d353bed3d9c823e3620cab8d40  usermode-1.100.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- usermode.spec	25 Feb 2009 23:28:22 -0000	1.85
+++ usermode.spec	14 Apr 2009 11:41:12 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.99
-Release: 3
+Version: 1.100
+Release: 1
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -108,6 +108,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.100-1
+- Update to usermode-1.100
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.99-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From scop at fedoraproject.org  Tue Apr 14 11:48:25 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 11:48:25 +0000 (UTC)
Subject: rpms/libmodplug/devel .cvsignore, 1.4, 1.5 libmodplug.spec, 1.15,
	1.16 sources, 1.4, 1.5
Message-ID: <20090414114825.D034D700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2665

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
- Update to 0.8.5, should fix #483146.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Apr 2007 10:10:05 -0000	1.4
+++ .cvsignore	14 Apr 2009 11:47:54 -0000	1.5
@@ -1 +1 @@
-libmodplug-0.8.4.tar.gz
+libmodplug-0.8.5.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libmodplug.spec	25 Feb 2009 16:20:56 -0000	1.15
+++ libmodplug.spec	14 Apr 2009 11:47:54 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libmodplug
-Version:        0.8.4
-Release:        4%{?dist}
+Version:        0.8.5
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
+- Update to 0.8.5, should fix #483146.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.8.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Apr 2007 10:10:05 -0000	1.4
+++ sources	14 Apr 2009 11:47:54 -0000	1.5
@@ -1 +1 @@
-091bd1168a524a4f36fc61f95209e7e4  libmodplug-0.8.4.tar.gz
+f4143aaebe6163fa359d6a6f848296da  libmodplug-0.8.5.tar.gz



From jskala at fedoraproject.org  Tue Apr 14 11:57:25 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 14 Apr 2009 11:57:25 +0000 (UTC)
Subject: rpms/lftp/devel .cvsignore, 1.37, 1.38 lftp.spec, 1.75, 1.76 sources,
	1.37, 1.38
Message-ID: <20090414115725.D5064700B2@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4917

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-1
- rebase to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	21 Jan 2009 07:59:23 -0000	1.37
+++ .cvsignore	14 Apr 2009 11:56:54 -0000	1.38
@@ -1 +1 @@
-lftp-3.7.7.tar.gz
+lftp-3.7.11.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- lftp.spec	25 Feb 2009 12:57:40 -0000	1.75
+++ lftp.spec	14 Apr 2009 11:56:54 -0000	1.76
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	3.7.7
+Version:	3.7.11
 Release:	2%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -74,6 +74,9 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
+* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-1
+- rebase to latest upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	21 Jan 2009 07:59:24 -0000	1.37
+++ sources	14 Apr 2009 11:56:54 -0000	1.38
@@ -1 +1 @@
-7b7aebf99e862fa4b9dcf892b7b45d82  lftp-3.7.7.tar.gz
+6fe8793f3ccde1d2f8446d599d8a69a9  lftp-3.7.11.tar.gz



From kdudka at fedoraproject.org  Tue Apr 14 11:59:46 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 14 Apr 2009 11:59:46 +0000 (UTC)
Subject: rpms/elinks/devel elinks-nss.patch,1.3,1.4 elinks.spec,1.67,1.68
Message-ID: <20090414115946.DADAA700B2@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5645

Modified Files:
	elinks-nss.patch elinks.spec 
Log Message:
replace BuildRequire openssl-devel with krb5-devel
NSS related description for connection.ssl.cert_verify configuration option

elinks-nss.patch:

Index: elinks-nss.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-nss.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- elinks-nss.patch	3 Apr 2009 10:42:49 -0000	1.3
+++ elinks-nss.patch	14 Apr 2009 11:59:45 -0000	1.4
@@ -1,6 +1,6 @@
 diff -ruNp elinks-0.12pre3.orig/configure.in elinks-0.12pre3/configure.in
---- elinks-0.12pre3.orig/configure.in	2009-03-30 15:31:31.000000000 +0200
-+++ elinks-0.12pre3/configure.in	2009-03-30 15:31:31.000000000 +0200
+--- elinks-0.12pre3.orig/configure.in	2009-04-14 13:46:26.749379000 +0200
++++ elinks-0.12pre3/configure.in	2009-04-14 13:47:13.702846713 +0200
 @@ -1014,6 +1014,7 @@ gnutls_withval="$withval"
  
  if test "$enable_gnutls" = yes; then
@@ -60,9 +60,9 @@
  
  #endif
  
-diff -ruNp elinks-0.12pre2.orig/src/network/ssl/socket.c elinks-0.12pre2/src/network/ssl/socket.c
---- elinks-0.12pre2.orig/src/network/ssl/socket.c	2008-09-21 10:45:22.000000000 +0200
-+++ elinks-0.12pre2/src/network/ssl/socket.c	2008-10-01 10:41:01.000000000 +0200
+diff -ruNp elinks-0.12pre3.orig/src/network/ssl/socket.c elinks-0.12pre3/src/network/ssl/socket.c
+--- elinks-0.12pre3.orig/src/network/ssl/socket.c	2009-03-29 00:14:03.000000000 +0100
++++ elinks-0.12pre3/src/network/ssl/socket.c	2009-04-14 13:47:13.704846733 +0200
 @@ -6,6 +6,10 @@
  
  #ifdef CONFIG_OPENSSL
@@ -152,9 +152,9 @@
  		int err = SSL_get_error(socket->ssl, rd);
  #elif defined(CONFIG_GNUTLS)
  		int err = rd;
-diff -ruNp elinks-0.12pre2.orig/src/network/ssl/ssl.c elinks-0.12pre2/src/network/ssl/ssl.c
---- elinks-0.12pre2.orig/src/network/ssl/ssl.c	2008-10-01 10:38:34.000000000 +0200
-+++ elinks-0.12pre2/src/network/ssl/ssl.c	2008-10-01 10:39:43.000000000 +0200
+diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.c elinks-0.12pre3/src/network/ssl/ssl.c
+--- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-14 13:46:26.739379000 +0200
++++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-14 13:52:15.813854125 +0200
 @@ -7,6 +7,10 @@
  #ifdef CONFIG_OPENSSL
  #include <openssl/ssl.h>
@@ -175,7 +175,26 @@
  
  #ifndef PATH_MAX
  #define	PATH_MAX	256 /* according to my /usr/include/bits/posix1_lim.h */
-@@ -71,12 +75,27 @@ static struct option_info openssl_option
+@@ -57,10 +61,18 @@ done_openssl(struct module *module)
+ }
+ 
+ static struct option_info openssl_options[] = {
++#ifdef CONFIG_NSS_COMPAT_OSSL
++	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
++		"cert_verify", 0, 0,
++		N_("Verify the peer's SSL certificate. The NSS database "
++		"location can be changed by SSL_DIR environment variable. "
++		"The database can be also shared with Mozilla browsers.")),
++#else
+ 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
+ 		"cert_verify", 0, 0,
+ 		N_("Verify the peer's SSL certificate. Note that this "
+ 		"needs extensive configuration of OpenSSL by the user.")),
++#endif
+ 
+ 	INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
+         	"client_cert", OPT_SORT,
+@@ -71,12 +83,27 @@ static struct option_info openssl_option
  		N_("Enable or not the sending of X509 client certificates "
  		"to servers which request them.")),
  
@@ -203,7 +222,7 @@
  
  	NULL_OPTION_INFO,
  };
-@@ -181,7 +199,7 @@ static struct module gnutls_module = str
+@@ -182,7 +209,7 @@ static struct module gnutls_module = str
  	/* done: */		done_gnutls
  );
  
@@ -212,7 +231,7 @@
  
  static struct option_info ssl_options[] = {
  	INIT_OPT_TREE("connection", N_("SSL"),
-@@ -192,7 +210,7 @@ static struct option_info ssl_options[] 
+@@ -193,7 +220,7 @@ static struct option_info ssl_options[] 
  };
  
  static struct module *ssl_modules[] = {
@@ -221,7 +240,7 @@
  	&openssl_module,
  #elif defined(CONFIG_GNUTLS)
  	&gnutls_module,
-@@ -213,7 +231,7 @@ struct module ssl_module = struct_module
+@@ -214,7 +241,7 @@ struct module ssl_module = struct_module
  int
  init_ssl_connection(struct socket *socket)
  {
@@ -230,7 +249,7 @@
  	socket->ssl = SSL_new(context);
  	if (!socket->ssl) return S_SSL_ERROR;
  #elif defined(CONFIG_GNUTLS)
-@@ -262,7 +280,7 @@ done_ssl_connection(struct socket *socke
+@@ -263,7 +290,7 @@ done_ssl_connection(struct socket *socke
  	ssl_t *ssl = socket->ssl;
  
  	if (!ssl) return;
@@ -239,7 +258,7 @@
  	SSL_free(ssl);
  #elif defined(CONFIG_GNUTLS)
  	gnutls_deinit(*ssl);
-@@ -279,7 +297,7 @@ get_ssl_connection_cipher(struct socket 
+@@ -280,7 +307,7 @@ get_ssl_connection_cipher(struct socket 
  
  	if (!init_string(&str)) return NULL;
  
@@ -248,9 +267,9 @@
  	add_format_to_string(&str, "%ld-bit %s %s",
  		SSL_get_cipher_bits(ssl, NULL),
  		SSL_get_cipher_version(ssl),
-diff -ruNp elinks-0.12pre2.orig/src/network/ssl/ssl.h elinks-0.12pre2/src/network/ssl/ssl.h
---- elinks-0.12pre2.orig/src/network/ssl/ssl.h	2008-09-21 10:45:22.000000000 +0200
-+++ elinks-0.12pre2/src/network/ssl/ssl.h	2008-10-01 10:39:43.000000000 +0200
+diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.h elinks-0.12pre3/src/network/ssl/ssl.h
+--- elinks-0.12pre3.orig/src/network/ssl/ssl.h	2009-03-29 00:14:03.000000000 +0100
++++ elinks-0.12pre3/src/network/ssl/ssl.h	2009-04-14 13:47:13.706846753 +0200
 @@ -22,7 +22,7 @@ unsigned char *get_ssl_connection_cipher
  
  /* Internal type used in ssl module. */


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- elinks.spec	3 Apr 2009 10:42:49 -0000	1.67
+++ elinks.spec	14 Apr 2009 11:59:46 -0000	1.68
@@ -9,10 +9,10 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
-BuildRequires: openssl-devel
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
 BuildRequires: libidn-devel
+BuildRequires: krb5-devel
 BuildRequires: nss_compat_ossl-devel >= 0.9.3
 Requires: zlib >= 1.2.0.2
 Requires(preun): %{_sbindir}/alternatives



From cebbert at fedoraproject.org  Tue Apr 14 12:07:52 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 12:07:52 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch, NONE,
	1.1 kernel.spec, 1.1536, 1.1537
Message-ID: <20090414120752.7F243700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8065

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch 
Log Message:
Fix duplicated flag value in pagemap.h (-stable patch)

linux-2.6-mm-define-unique-value-for-as_unevictable.patch:

--- NEW FILE linux-2.6-mm-define-unique-value-for-as_unevictable.patch ---
From: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Date: Thu, 2 Apr 2009 23:56:45 +0000 (-0700)
Subject: mm: define a UNIQUE value for AS_UNEVICTABLE flag
X-Git-Tag: v2.6.30-rc1~398
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9a896c9a48ac6704c0ce8ee081b836644d0afe40

mm: define a UNIQUE value for AS_UNEVICTABLE flag

A new "address_space flag"--AS_MM_ALL_LOCKS--was defined to use the next
available AS flag while the Unevictable LRU was under development.  The
Unevictable LRU was using the same flag and "no one" noticed.  Current
mainline, since 2.6.28, has same value for two symbolic flag names.

So, define a unique flag value for AS_UNEVICTABLE--up close to the other
flags, [at the cost of an additional #ifdef] so we'll notice next time.
Note that #ifdef is not actually required, if we don't mind having the
unused flag value defined.

Replace #defines with an enum.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: <stable at kernel.org>		[2.6.28.x, 2.6.29.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 01ca085..076a7dc 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -18,9 +18,14 @@
  * Bits in mapping->flags.  The lower __GFP_BITS_SHIFT bits are the page
  * allocation mode flags.
  */
-#define	AS_EIO		(__GFP_BITS_SHIFT + 0)	/* IO error on async write */
-#define AS_ENOSPC	(__GFP_BITS_SHIFT + 1)	/* ENOSPC on async write */
-#define AS_MM_ALL_LOCKS	(__GFP_BITS_SHIFT + 2)	/* under mm_take_all_locks() */
+enum mapping_flags {
+	AS_EIO		= __GFP_BITS_SHIFT + 0,	/* IO error on async write */
+	AS_ENOSPC	= __GFP_BITS_SHIFT + 1,	/* ENOSPC on async write */
+	AS_MM_ALL_LOCKS	= __GFP_BITS_SHIFT + 2,	/* under mm_take_all_locks() */
+#ifdef CONFIG_UNEVICTABLE_LRU
+	AS_UNEVICTABLE	= __GFP_BITS_SHIFT + 3,	/* e.g., ramdisk, SHM_LOCK */
+#endif
+};
 
 static inline void mapping_set_error(struct address_space *mapping, int error)
 {
@@ -33,7 +38,6 @@ static inline void mapping_set_error(struct address_space *mapping, int error)
 }
 
 #ifdef CONFIG_UNEVICTABLE_LRU
-#define AS_UNEVICTABLE	(__GFP_BITS_SHIFT + 2)	/* e.g., ramdisk, SHM_LOCK */
 
 static inline void mapping_set_unevictable(struct address_space *mapping)
 {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1536
retrieving revision 1.1537
diff -u -r1.1536 -r1.1537
--- kernel.spec	14 Apr 2009 11:32:18 -0000	1.1536
+++ kernel.spec	14 Apr 2009 12:07:20 -0000	1.1537
@@ -719,6 +719,9 @@
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
 
+# patches headed for -stable
+Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
@@ -1336,7 +1339,9 @@
 ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+# patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -1933,6 +1938,9 @@
 
 %changelog
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix duplicated flag value in pagemap.h (-stable patch)
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - acer-wmi: use upstream code to blacklist an additional model
 - Trivial fix to drm-modesetting-radeon to fix failure to apply
 



From jskala at fedoraproject.org  Tue Apr 14 12:10:00 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 14 Apr 2009 12:10:00 +0000 (UTC)
Subject: rpms/lftp/devel lftp.spec,1.76,1.77
Message-ID: <20090414121000.706A3700B2@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8666

Modified Files:
	lftp.spec 
Log Message:
* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-2
- release number repaired



Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- lftp.spec	14 Apr 2009 11:56:54 -0000	1.76
+++ lftp.spec	14 Apr 2009 12:09:29 -0000	1.77
@@ -74,6 +74,9 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
+* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-2
+- release number repaired
+
 * Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-1
 - rebase to latest upstream release
 



From twaugh at fedoraproject.org  Tue Apr 14 12:10:42 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 14 Apr 2009 12:10:42 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.255, 
	1.256
Message-ID: <20090414121042.7AC27700B2@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8880

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
- Requires dbus-python (bug #495392).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- system-config-printer.spec	13 Mar 2009 17:42:10 -0000	1.255
+++ system-config-printer.spec	14 Apr 2009 12:10:12 -0000	1.256
@@ -30,6 +30,7 @@
 Requires: usermode >= 1.94
 Requires: desktop-file-utils >= 0.2.92
 Requires: dbus-x11
+Requires: dbus-python
 Requires: system-config-printer-libs = %{version}-%{release}
 Requires: gnome-icon-theme
 Requires: notification-daemon
@@ -164,6 +165,9 @@
 exit 0
 
 %changelog
+* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
+- Requires dbus-python (bug #495392).
+
 * Fri Mar 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.6-1
 - No longer requires gnome-python2-gnome.
 - Updated to 1.1.6:



From jskala at fedoraproject.org  Tue Apr 14 12:12:26 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 14 Apr 2009 12:12:26 +0000 (UTC)
Subject: rpms/lftp/devel lftp.spec,1.77,1.78
Message-ID: <20090414121226.E5F60700B2@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9369

Modified Files:
	lftp.spec 
Log Message:
* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-3
- release number repaired



Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- lftp.spec	14 Apr 2009 12:09:29 -0000	1.77
+++ lftp.spec	14 Apr 2009 12:11:55 -0000	1.78
@@ -1,7 +1,7 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
 Version:	3.7.11
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -74,7 +74,7 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
-* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-2
+* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-3
 - release number repaired
 
 * Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-1



From twaugh at fedoraproject.org  Tue Apr 14 12:13:51 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 14 Apr 2009 12:13:51 +0000 (UTC)
Subject: rpms/system-config-printer/F-10 system-config-printer.spec, 1.241, 
	1.242
Message-ID: <20090414121351.96964700B2@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9832

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
- Requires dbus-python (bug #495392).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- system-config-printer.spec	25 Mar 2009 18:49:43 -0000	1.241
+++ system-config-printer.spec	14 Apr 2009 12:13:20 -0000	1.242
@@ -31,6 +31,7 @@
 Requires: usermode >= 1.94
 Requires: desktop-file-utils >= 0.2.92
 Requires: dbus-x11
+Requires: dbus-python
 Requires: system-config-printer-libs = %{version}-%{release}
 Requires: gnome-icon-theme
 Requires: gnome-python2-gnome
@@ -151,6 +152,9 @@
 exit 0
 
 %changelog
+* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
+- Requires dbus-python (bug #495392).
+
 * Wed Mar 25 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-2
 - Prevent traceback in monitor when connection failed
   (Ubuntu #343387).



From twaugh at fedoraproject.org  Tue Apr 14 12:15:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 14 Apr 2009 12:15:16 +0000 (UTC)
Subject: rpms/system-config-printer/F-9 system-config-printer.spec, 1.213,
	1.214
Message-ID: <20090414121516.1FADE700B2@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10205

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
- Requires dbus-python (bug #495392).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- system-config-printer.spec	13 Mar 2009 18:26:48 -0000	1.213
+++ system-config-printer.spec	14 Apr 2009 12:14:45 -0000	1.214
@@ -30,6 +30,7 @@
 Requires: usermode >= 1.94
 Requires: desktop-file-utils >= 0.2.92
 Requires: dbus-x11
+Requires: dbus-python
 Requires: system-config-printer-libs = %{version}-%{release}
 Requires: gnome-icon-theme
 Requires: gnome-python2
@@ -149,6 +150,9 @@
 exit 0
 
 %changelog
+* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
+- Requires dbus-python (bug #495392).
+
 * Fri Mar 13 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-1
 - Updated to 1.0.16:
   - Better PPD fallback searching.



From cebbert at fedoraproject.org  Tue Apr 14 12:22:08 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 12:22:08 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch, NONE,
	1.1 kernel.spec, 1.1325, 1.1326
Message-ID: <20090414122208.6FDA0700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12067

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch 
Log Message:
Fix duplicated flag value in pagemap.h (-stable patch)

linux-2.6-mm-define-unique-value-for-as_unevictable.patch:

--- NEW FILE linux-2.6-mm-define-unique-value-for-as_unevictable.patch ---
From: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Date: Thu, 2 Apr 2009 23:56:45 +0000 (-0700)
Subject: mm: define a UNIQUE value for AS_UNEVICTABLE flag
X-Git-Tag: v2.6.30-rc1~398
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9a896c9a48ac6704c0ce8ee081b836644d0afe40

mm: define a UNIQUE value for AS_UNEVICTABLE flag

A new "address_space flag"--AS_MM_ALL_LOCKS--was defined to use the next
available AS flag while the Unevictable LRU was under development.  The
Unevictable LRU was using the same flag and "no one" noticed.  Current
mainline, since 2.6.28, has same value for two symbolic flag names.

So, define a unique flag value for AS_UNEVICTABLE--up close to the other
flags, [at the cost of an additional #ifdef] so we'll notice next time.
Note that #ifdef is not actually required, if we don't mind having the
unused flag value defined.

Replace #defines with an enum.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: <stable at kernel.org>		[2.6.28.x, 2.6.29.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 01ca085..076a7dc 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -18,9 +18,14 @@
  * Bits in mapping->flags.  The lower __GFP_BITS_SHIFT bits are the page
  * allocation mode flags.
  */
-#define	AS_EIO		(__GFP_BITS_SHIFT + 0)	/* IO error on async write */
-#define AS_ENOSPC	(__GFP_BITS_SHIFT + 1)	/* ENOSPC on async write */
-#define AS_MM_ALL_LOCKS	(__GFP_BITS_SHIFT + 2)	/* under mm_take_all_locks() */
+enum mapping_flags {
+	AS_EIO		= __GFP_BITS_SHIFT + 0,	/* IO error on async write */
+	AS_ENOSPC	= __GFP_BITS_SHIFT + 1,	/* ENOSPC on async write */
+	AS_MM_ALL_LOCKS	= __GFP_BITS_SHIFT + 2,	/* under mm_take_all_locks() */
+#ifdef CONFIG_UNEVICTABLE_LRU
+	AS_UNEVICTABLE	= __GFP_BITS_SHIFT + 3,	/* e.g., ramdisk, SHM_LOCK */
+#endif
+};
 
 static inline void mapping_set_error(struct address_space *mapping, int error)
 {
@@ -33,7 +38,6 @@ static inline void mapping_set_error(struct address_space *mapping, int error)
 }
 
 #ifdef CONFIG_UNEVICTABLE_LRU
-#define AS_UNEVICTABLE	(__GFP_BITS_SHIFT + 2)	/* e.g., ramdisk, SHM_LOCK */
 
 static inline void mapping_set_unevictable(struct address_space *mapping)
 {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1325
retrieving revision 1.1326
diff -u -r1.1325 -r1.1326
--- kernel.spec	14 Apr 2009 11:40:05 -0000	1.1325
+++ kernel.spec	14 Apr 2009 12:21:37 -0000	1.1326
@@ -692,8 +692,10 @@
 
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
+# patches headed for -stable
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -1283,7 +1285,9 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
+# patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
@@ -1874,6 +1878,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-25
+- Fix duplicated flag value in pagemap.h (-stable patch)
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-24
 - Blacklist acer-wmi on the AAO to fix rfkill switch problems
 



From scop at fedoraproject.org  Tue Apr 14 12:33:12 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 12:33:12 +0000 (UTC)
Subject: rpms/rpmdevtools/F-10 .cvsignore, 1.14, 1.15 rpmdevtools.spec, 1.14,
	1.15 sources, 1.15, 1.16
Message-ID: <20090414123313.20F9F700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15116

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Sat Apr  4 2009 Ville Skytt?? <ville.skytta at iki.fi> - 7.1-1
- 7.1.
- Make rpmdev-md5 and friends work on non-srpm package files too.

* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add bash completion.

* Mon Mar  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add query format option to rmdevelrpms, sort output by NEVRA.

* Sun Feb 22 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Use %global instead of %%define in spec templates.
- Handle %global in addition to %%define in rpmdev-bumpspec.

* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi>
- Add result dependent exit statuses to rpmdev-vercmp.

* Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Dec 2008 12:17:55 -0000	1.14
+++ .cvsignore	14 Apr 2009 12:32:39 -0000	1.15
@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-7.0.tar.lzma
+rpmdevtools-7.1.tar.lzma


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/F-10/rpmdevtools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rpmdevtools.spec	26 Dec 2008 12:17:55 -0000	1.14
+++ rpmdevtools.spec	14 Apr 2009 12:32:39 -0000	1.15
@@ -1,9 +1,9 @@
-%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.10
+%global emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
+%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -11,7 +11,7 @@
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.lzma
+Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,9 +31,11 @@
 Requires:       gawk
 Requires:       grep
 Requires:       rpm-build >= 4.4.2.1
-Requires:       rpm-python
+Requires:       rpm-python >= 4.4.2.2
 Requires:       sed
 Requires:       wget
+# For _get_cword in bash completion snippet
+Conflicts:      bash-completion < 20080705
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -100,6 +102,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
+%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
 %{_bindir}/rpm*
 %{_bindir}/spectool
@@ -108,6 +111,26 @@
 
 
 %changelog
+* Sat Apr  4 2009 Ville Skytt?? <ville.skytta at iki.fi> - 7.1-1
+- 7.1.
+- Make rpmdev-md5 and friends work on non-srpm package files too.
+
+* Sun Mar 15 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add bash completion.
+
+* Mon Mar  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add query format option to rmdevelrpms, sort output by NEVRA.
+
+* Sun Feb 22 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Use %%global instead of %%define in spec templates.
+- Handle %%global in addition to %%define in rpmdev-bumpspec.
+
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Add result dependent exit statuses to rpmdev-vercmp.
+
+* Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi>
+- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
+
 * Fri Dec 26 2008 Ville Skytt?? <ville.skytta at iki.fi> - 7.0-1
 - 7.0.
 - Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Dec 2008 12:17:55 -0000	1.15
+++ sources	14 Apr 2009 12:32:39 -0000	1.16
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-ccdff99d03845ab8ea294a702b5f6681  rpmdevtools-7.0.tar.lzma
+0d0e9fa78d3f5cfe09c25cf69d629ba2  rpmdevtools-7.1.tar.lzma



From pkgdb at fedoraproject.org  Tue Apr 14 12:44:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 12:44:07 +0000
Subject: [pkgdb] paprefs: lennart has requested watchcommits
Message-ID: <20090414124407.B1A8710F851@bastion2.fedora.phx.redhat.com>

lennart has requested the watchcommits acl on paprefs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Apr 14 12:44:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 12:44:07 +0000
Subject: [pkgdb] paprefs: lennart has requested watchbugzilla
Message-ID: <20090414124407.D251410F87C@bastion2.fedora.phx.redhat.com>

lennart has requested the watchbugzilla acl on paprefs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Apr 14 12:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 12:44:17 +0000
Subject: [pkgdb] paprefs: lennart has requested commit
Message-ID: <20090414124423.990E610F884@bastion2.fedora.phx.redhat.com>

lennart has requested the commit acl on paprefs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/paprefs



From pkgdb at fedoraproject.org  Tue Apr 14 12:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 12:44:14 +0000
Subject: [pkgdb] paprefs: lennart has requested approveacls
Message-ID: <20090414124414.2853010F87F@bastion2.fedora.phx.redhat.com>

lennart has requested the approveacls acl on paprefs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/paprefs



From akurtakov at fedoraproject.org  Tue Apr 14 12:52:48 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 14 Apr 2009 12:52:48 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.635,1.636
Message-ID: <20090414125248.A2CE8700B2@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7573/devel

Modified Files:
	eclipse.spec 
Log Message:
Fix version of source bundles.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- eclipse.spec	13 Apr 2009 20:48:45 -0000	1.635
+++ eclipse.spec	14 Apr 2009 12:52:13 -0000	1.636
@@ -10,7 +10,7 @@
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
-%define swtver          3.5.0.v3538
+%define swtver          3.5.0.v3539
 %define initialize      1
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.1%{?dist}
+Release:        0.2.2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -398,14 +398,18 @@
 SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
-swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/META-INF/MANIFEST.MF \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/build.xml \
                                                       assemble.org.eclipse.sdk.linux.gtk.s390x.xml \
-						      features/org.eclipse.rcp/build.xml
+						      features/org.eclipse.rcp/build.xml \
+						      features/org.eclipse.rcp.source/build.xml
+mv plugins/org.eclipse.swt.gtk.linux.s390.source_{3.5.0.HEAD,%{swtver}}
+mv plugins/org.eclipse.swt.gtk.linux.s390x.source_{3.5.0.HEAD,%{swtver}}
+mv plugins/org.eclipse.swt.gtk.linux.ia64.source_{3.5.0.HEAD,%{swtver}}
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
@@ -1603,6 +1607,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.2
+- Fix version of source bundles.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.1
 - Create org.eclipse.swt.gtk.linux.* based on the ppc version.
 



From timj at fedoraproject.org  Tue Apr 14 12:56:16 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Tue, 14 Apr 2009 12:56:16 +0000 (UTC)
Subject: rpms/rapidsvn/devel rapidsvn.spec,1.17,1.18
Message-ID: <20090414125616.37855700B2@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/rapidsvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8840

Modified Files:
	rapidsvn.spec 
Log Message:
Fix bug #487867 -  .desktop menu entry has wrong/missing categories



Index: rapidsvn.spec
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rapidsvn.spec	25 Feb 2009 18:46:25 -0000	1.17
+++ rapidsvn.spec	14 Apr 2009 12:55:45 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           rapidsvn
 Version:        0.9.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical interface for the Subversion revision control system
 
 Group:          Development/Tools
@@ -72,7 +72,7 @@
 Icon=rapidsvn
 Terminal=false
 Type=Application
-Categories=Application;Development;GNOME;
+Categories=Development;GNOME;GTK;RevisionControl;
 Version=0.9.4
 EOF
 
@@ -148,6 +148,9 @@
 %{_libdir}/libsvncpp.so
 
 %changelog
+* Tue Apr 14 2009 Tim Jackson <rpm at timj.co.uk> 0.9.6-4
+- Update .desktop file categories (#487867)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cebbert at fedoraproject.org  Tue Apr 14 13:05:30 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 13:05:30 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-posix-timers-fix-clock-monotonicity.patch, 
	NONE, 1.1 linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, NONE,
	1.1 linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, NONE,
	1.1 kernel.spec, 1.1537, 1.1538
Message-ID: <20090414130530.A5147700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12322

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-posix-timers-fix-clock-monotonicity.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch 
Log Message:
Timer fixes headed for -stable

linux-2.6-posix-timers-fix-clock-monotonicity.patch:

--- NEW FILE linux-2.6-posix-timers-fix-clock-monotonicity.patch ---
From: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Tue, 31 Mar 2009 07:56:03 +0000 (+0900)
Subject: posixtimers, sched: Fix posix clock monotonicity
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c5f8d99585d7b5b7e857fabf8aefd0174903a98c

posixtimers, sched: Fix posix clock monotonicity

Impact: Regression fix (against clock_gettime() backwarding bug)

This patch re-introduces a couple of functions, task_sched_runtime
and thread_group_sched_runtime, which was once removed at the
time of 2.6.28-rc1.

These functions protect the sampling of thread/process clock with
rq lock.  This rq lock is required not to update rq->clock during
the sampling.

i.e.
  The clock_gettime() may return
   ((accounted runtime before update) + (delta after update))
  that is less than what it should be.

v2 -> v3:
	- Rename static helper function __task_delta_exec()
	  to do_task_delta_exec() since -tip tree already has
	  a __task_delta_exec() of different version.

v1 -> v2:
	- Revises comments of function and patch description.
	- Add note about accuracy of thread group's runtime.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: stable at kernel.org	[2.6.28.x][2.6.29.x]
LKML-Reference: <49D1CC93.4080401 at jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index fa07da9..4318c30 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -224,7 +224,7 @@ static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p,
 		cpu->cpu = virt_ticks(p);
 		break;
 	case CPUCLOCK_SCHED:
-		cpu->sched = p->se.sum_exec_runtime + task_delta_exec(p);
+		cpu->sched = task_sched_runtime(p);
 		break;
 	}
 	return 0;
@@ -240,18 +240,19 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
 {
 	struct task_cputime cputime;
 
-	thread_group_cputime(p, &cputime);
 	switch (CPUCLOCK_WHICH(which_clock)) {
 	default:
 		return -EINVAL;
 	case CPUCLOCK_PROF:
+		thread_group_cputime(p, &cputime);
 		cpu->cpu = cputime_add(cputime.utime, cputime.stime);
 		break;
 	case CPUCLOCK_VIRT:
+		thread_group_cputime(p, &cputime);
 		cpu->cpu = cputime.utime;
 		break;
 	case CPUCLOCK_SCHED:
-		cpu->sched = cputime.sum_exec_runtime + task_delta_exec(p);
+		cpu->sched = thread_group_sched_runtime(p);
 		break;
 	}
 	return 0;
diff --git a/kernel/sched.c b/kernel/sched.c
index cc397aa..c8d7f17 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4139,9 +4139,25 @@ DEFINE_PER_CPU(struct kernel_stat, kstat);
 EXPORT_PER_CPU_SYMBOL(kstat);
 
 /*
- * Return any ns on the sched_clock that have not yet been banked in
+ * Return any ns on the sched_clock that have not yet been accounted in
  * @p in case that task is currently running.
+ *
+ * Called with task_rq_lock() held on @rq.
  */
+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
+{
+	u64 ns = 0;
+
+	if (task_current(rq, p)) {
+		update_rq_clock(rq);
+		ns = rq->clock - p->se.exec_start;
+		if ((s64)ns < 0)
+			ns = 0;
+	}
+
+	return ns;
+}
+
 unsigned long long task_delta_exec(struct task_struct *p)
 {
 	unsigned long flags;
@@ -4149,16 +4165,49 @@ unsigned long long task_delta_exec(struct task_struct *p)
 	u64 ns = 0;
 
 	rq = task_rq_lock(p, &flags);
+	ns = do_task_delta_exec(p, rq);
+	task_rq_unlock(rq, &flags);
 
-	if (task_current(rq, p)) {
-		u64 delta_exec;
+	return ns;
+}
 
-		update_rq_clock(rq);
-		delta_exec = rq->clock - p->se.exec_start;
-		if ((s64)delta_exec > 0)
-			ns = delta_exec;
-	}
+/*
+ * Return accounted runtime for the task.
+ * In case the task is currently running, return the runtime plus current's
+ * pending runtime that have not been accounted yet.
+ */
+unsigned long long task_sched_runtime(struct task_struct *p)
+{
+	unsigned long flags;
+	struct rq *rq;
+	u64 ns = 0;
+
+	rq = task_rq_lock(p, &flags);
+	ns = p->se.sum_exec_runtime + do_task_delta_exec(p, rq);
+	task_rq_unlock(rq, &flags);
+
+	return ns;
+}
 
+/*
+ * Return sum_exec_runtime for the thread group.
+ * In case the task is currently running, return the sum plus current's
+ * pending runtime that have not been accounted yet.
+ *
+ * Note that the thread group might have other running tasks as well,
+ * so the return value not includes other pending runtime that other
+ * running tasks might have.
+ */
+unsigned long long thread_group_sched_runtime(struct task_struct *p)
+{
+	struct task_cputime totals;
+	unsigned long flags;
+	struct rq *rq;
+	u64 ns;
+
+	rq = task_rq_lock(p, &flags);
+	thread_group_cputime(p, &totals);
+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
 	task_rq_unlock(rq, &flags);
 
 	return ns;

linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Mon, 23 Mar 2009 19:34:11 +0000 (+0100)
Subject: posix timers: fix RLIMIT_CPU && fork()
X-Git-Tag: v2.6.30-rc1~657^2^4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=37bebc70d7ad4144c571d74500db3bb26ec0c0eb

posix timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other cpu timers.

This is the minimal fix for 2.6.29 (tested) and 2.6.28. The patch is not
optimal, we need further cleanups here. With this patch update_rlimit_cpu()
is not really needed, but I don't think it should be removed.

The proper fix (I think) is:

	- set_process_cpu_timer() should just start the cputimer->running
	  logic (it does), no need to change cputime_expires.xxx_exp

	- posix_cpu_timers_init_group() should set ->running when needed

	- fastpath_timer_check() can check ->running instead of
	  task_cputime_zero(signal->cputime_expires)

Reported-by: Peter Lojkin <ia6432 at inbox.ru>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Roland McGrath <roland at redhat.com>
Cc: <stable at kernel.org> [for 2.6.29.x]
LKML-Reference: <20090323193411.GA17514 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index e976e50..8e5d9a6 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1370,7 +1370,8 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
 		if (task_cputime_expired(&group_sample, &sig->cputime_expires))
 			return 1;
 	}
-	return 0;
+
+	return sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY;
 }
 
 /*

linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 27 Mar 2009 00:06:10 +0000 (+0100)
Subject: posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8f2e586567b1bad72dac7c3810fe9a2ef7117506

posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)

update_rlimit_cpu() tries to optimize out set_process_cpu_timer() in case
when we already have CPUCLOCK_PROF timer which should expire first. But it
uses cputime_lt() instead of cputime_gt().

Test case:

	int main(void)
	{
		struct itimerval it = {
			.it_value = { .tv_sec = 1000 },
		};

		assert(!setitimer(ITIMER_PROF, &it, NULL));

		struct rlimit rl = {
			.rlim_cur = 1,
			.rlim_max = 1,
		};

		assert(!setrlimit(RLIMIT_CPU, &rl));

		for (;;)
			;

		return 0;
	}

Without this patch, the task is not killed as RLIMIT_CPU demands.

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Cc: Peter Lojkin <ia6432 at inbox.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: stable at kernel.org
LKML-Reference: <20090327000610.GA10108 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 8e5d9a6..bb53185 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -18,7 +18,7 @@ void update_rlimit_cpu(unsigned long rlim_new)
 
 	cputime = secs_to_cputime(rlim_new);
 	if (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
-	    cputime_lt(current->signal->it_prof_expires, cputime)) {
+	    cputime_gt(current->signal->it_prof_expires, cputime)) {
 		spin_lock_irq(&current->sighand->siglock);
 		set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
 		spin_unlock_irq(&current->sighand->siglock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1537
retrieving revision 1.1538
diff -u -r1.1537 -r1.1538
--- kernel.spec	14 Apr 2009 12:07:20 -0000	1.1537
+++ kernel.spec	14 Apr 2009 13:04:59 -0000	1.1538
@@ -716,11 +716,16 @@
 
 Patch5000: linux-2.6-add-qcserial.patch
 
+# patches headed for -stable
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-
-# patches headed for -stable
+# fix duplicated flags value
 Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+# fix posix clock monotonicity
+Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
+# make RLIMIT_CPU work again
+Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
@@ -1342,6 +1347,9 @@
 # patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -1938,6 +1946,9 @@
 
 %changelog
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Timer fixes headed for -stable
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix duplicated flag value in pagemap.h (-stable patch)
 
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>



From pkgdb at fedoraproject.org  Tue Apr 14 13:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 13:15:57 +0000
Subject: [pkgdb] libmng ownership updated
Message-ID: <20090414131557.E7C2D10F850@bastion2.fedora.phx.redhat.com>

Package libmng in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmng



From pkgdb at fedoraproject.org  Tue Apr 14 13:16:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 13:16:04 +0000
Subject: [pkgdb] libmng ownership updated
Message-ID: <20090414131605.1F4D410F87B@bastion2.fedora.phx.redhat.com>

Package libmng in Fedora 10 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmng



From pkgdb at fedoraproject.org  Tue Apr 14 13:16:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 13:16:30 +0000
Subject: [pkgdb] funionfs ownership updated
Message-ID: <20090414131630.57A4B10F850@bastion2.fedora.phx.redhat.com>

Package funionfs in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/funionfs



From pkgdb at fedoraproject.org  Tue Apr 14 13:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 13:16:33 +0000
Subject: [pkgdb] funionfs ownership updated
Message-ID: <20090414131633.96DC210F85A@bastion2.fedora.phx.redhat.com>

Package funionfs in Fedora 10 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/funionfs



From nphilipp at fedoraproject.org  Tue Apr 14 13:18:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 13:18:58 +0000 (UTC)
Subject: rpms/system-config-services-docs/devel .cvsignore, 1.3, 1.4 sources,
	1.4, 1.5 system-config-services-docs.spec, 1.4, 1.5
Message-ID: <20090414131858.37A14700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17693

Modified Files:
	.cvsignore sources system-config-services-docs.spec 
Log Message:
version 1.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 15:30:25 -0000	1.3
+++ .cvsignore	14 Apr 2009 13:18:26 -0000	1.4
@@ -1 +1 @@
-system-config-services-docs-1.1.5.tar.bz2
+system-config-services-docs-1.1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 15:30:25 -0000	1.4
+++ sources	14 Apr 2009 13:18:27 -0000	1.5
@@ -1 +1 @@
-f42c318bd2e6334266dc08498483d5bc  system-config-services-docs-1.1.5.tar.bz2
+6a29015b54ba7d4c440a12f899995b1f  system-config-services-docs-1.1.6.tar.bz2


Index: system-config-services-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services-docs/devel/system-config-services-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-config-services-docs.spec	8 Apr 2009 15:30:25 -0000	1.4
+++ system-config-services-docs.spec	14 Apr 2009 13:18:27 -0000	1.5
@@ -8,7 +8,7 @@
 
 Summary: Documentation for configuring system services
 Name: system-config-services-docs
-Version: 1.1.5
+Version: 1.1.6
 Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
@@ -66,6 +66,10 @@
 %doc %{_datadir}/gnome/help/system-config-services
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.1.6-1
+- add sr at latin structure, move po file (#495460)
+- pull in updated translations
+
 * Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.1.5-1
 - pull in updated translations
 



From jorton at fedoraproject.org  Tue Apr 14 13:19:24 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Tue, 14 Apr 2009 13:19:24 +0000 (UTC)
Subject: rpms/webalizer/devel webalizer-2.21-02-underrun.patch, NONE,
	1.1 webalizer.spec, 1.36, 1.37 dns-db1.patch, 1.1,
	NONE webalizer-2.01-06-rh.patch, 1.1,
	NONE webalizer-2.01-10-agent-apple.patch, 1.1,
	NONE webalizer-2.01-10-agent-compatible.patch, 1.1,
	NONE webalizer-2.01-10-agent-default.patch, 1.1,
	NONE webalizer-2.01-10-agent-gecko.patch, 1.1,
	NONE webalizer-2.01-10-agent-opera.patch, 1.1,
	NONE webalizer-2.01-10-countrycode.patch, 1.1,
	NONE webalizer-2.01-10-hostname.patch, 1.1,
	NONE webalizer-2.01-10-maxagent.patch, 1.1,
	NONE webalizer-2.01-10-overflow.patch, 1.1,
	NONE webalizer-2.01-10-underrun.patch, 1.1,
	NONE webalizer-2.01_10-lfs.patch, 1.1, NONE
Message-ID: <20090414131924.BDF50700B2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/webalizer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17816

Modified Files:
	webalizer.spec 
Added Files:
	webalizer-2.21-02-underrun.patch 
Removed Files:
	dns-db1.patch webalizer-2.01-06-rh.patch 
	webalizer-2.01-10-agent-apple.patch 
	webalizer-2.01-10-agent-compatible.patch 
	webalizer-2.01-10-agent-default.patch 
	webalizer-2.01-10-agent-gecko.patch 
	webalizer-2.01-10-agent-opera.patch 
	webalizer-2.01-10-countrycode.patch 
	webalizer-2.01-10-hostname.patch 
	webalizer-2.01-10-maxagent.patch 
	webalizer-2.01-10-overflow.patch 
	webalizer-2.01-10-underrun.patch webalizer-2.01_10-lfs.patch 
Log Message:
* Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 2.21_02-2
- update to 2.21-02 (thanks to Robert Scheck)


webalizer-2.21-02-underrun.patch:

--- NEW FILE webalizer-2.21-02-underrun.patch ---
--- webalizer-2.21-02/webalizer.c		2009-01-13 06:35:54.000000000 +0100
+++ webalizer-2.21-02/webalizer.c.underrun	2009-03-29 14:16:21.000000000 +0200
@@ -737,10 +737,16 @@
          rec_sec =atoi(&log_rec.datetime[19]);   /* get second number       */
 
          /* Kludge for Netscape server time (0-24?) error                   */
-         if (rec_hour>23) rec_hour=0;
+         if (rec_hour > 23)
+         	rec_hour=0;
+         /* Handle leap seconds (AC 2004) */
+         if (rec_sec > 59 && rec_sec < 62)	/* 23:59:60/61 exist */
+         	rec_sec = 59;
 
          /* minimal sanity check on date */
-         if ((i>=12)||(rec_min>59)||(rec_sec>60)||(rec_year<1990))
+         if ( i >= 12 || rec_min < 0 || rec_min > 59 ||
+              rec_sec < 0 || rec_sec > 59 || rec_year<1990 ||
+         	rec_day < 0)
          {
             total_bad++;                /* if a bad date, bump counter      */
             if (verbose)


Index: webalizer.spec
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- webalizer.spec	25 Feb 2009 18:20:01 -0000	1.36
+++ webalizer.spec	14 Apr 2009 13:18:54 -0000	1.37
@@ -1,12 +1,12 @@
-%define ver 2.01
-%define patchlevel 10
+%define ver 2.21
+%define patchlevel 02
 
 %define _default_patch_fuzz 2
 
 Name: webalizer
 Summary: A flexible Web server log file analysis program
 Group: Applications/Internet
-Version: 2.20_01
+Version: 2.21_02
 Release: 2
 URL: http://www.mrunix.net/webalizer/
 License: GPLv2+
@@ -14,24 +14,12 @@
 Source1: webalizer.conf
 Source2: webalizer.cron
 Source3: webalizer-httpd.conf
-Patch0: webalizer-2.01-06-rh.patch
-Patch1: dns-db1.patch
-Patch2: webalizer-2.01_10-lfs.patch
-Patch3: webalizer-2.01-10-overflow.patch
-Patch4: webalizer-2.01-10-underrun.patch
+Patch4: webalizer-2.21-02-underrun.patch
 Patch5: webalizer-2.01-10-ipv6.patch
 Patch6: webalizer-2.01_10-confuser.patch
-Patch7: webalizer-2.01-10-hostname.patch
-Patch8: webalizer-2.01-10-maxagent.patch
 Patch9: webalizer-2.01-10-groupvisit.patch
-Patch10: webalizer-2.01-10-countrycode.patch
-Patch11: webalizer-2.01-10-agent-opera.patch
-Patch12: webalizer-2.01-10-agent-gecko.patch
-Patch13: webalizer-2.01-10-agent-apple.patch
-Patch14: webalizer-2.01-10-agent-compatible.patch
-Patch15: webalizer-2.01-10-agent-default.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gd-devel, db4-devel
+BuildRequires: gd-devel, db4-devel, bzip2-devel
 Requires(pre): /usr/sbin/useradd
 Requires: httpd, crontabs
 
@@ -44,41 +32,27 @@
 
 %prep
 %setup -q -n %{name}-%{ver}-%{patchlevel}
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .db1
-%patch2 -p1 -b .lfs
-%patch3 -p1 -b .overflow
 %patch4 -p1 -b .underrun
-%patch5 -p1 -b .ipv6
 %patch6 -p1 -b .confuser
-%patch7 -p1 -b .hostname
-%patch8 -p1 -b .maxagent
 %patch9 -p1 -b .groupvisit
-%patch10 -p1 -b .countrycode
-%patch11 -p1 -b .agent-opera
-%patch12 -p1 -b .agent-gecko
-%patch13 -p1 -b .agent-apple
-%patch14 -p1 -b .agent-compatible
-%patch15 -p1 -b .agent-default
 
 %build
 CPPFLAGS="-I%{_includedir}/db4" ; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" ; export CFLAGS
-%configure --enable-dns --with-dblib=/lib
+CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -D_GNU_SOURCE" ; export CFLAGS
+%configure --enable-dns --with-dblib=/lib --enable-bz2
 
 make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir} \
-         $RPM_BUILD_ROOT/%{_mandir}/man1 \
-         $RPM_BUILD_ROOT%{_localstatedir}/www/usage \
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/usage \
          $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/webalizer
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
+
 install -p -m 644 $RPM_SOURCE_DIR/webalizer.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 644 *.png $RPM_BUILD_ROOT%{_localstatedir}/www/usage
 install -p -m 755 $RPM_SOURCE_DIR/webalizer.cron \
@@ -99,7 +73,7 @@
 %files
 %defattr(-,root,root)
 %doc README
-%{_mandir}/man1/webalizer.1*
+%{_mandir}/man1/*.1*
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/webalizer.conf
 %{_sysconfdir}/cron.daily/00webalizer
@@ -109,6 +83,9 @@
 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png
 
 %changelog
+* Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 2.21_02-2
+- update to 2.21-02 (thanks to Robert Scheck)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20_01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- dns-db1.patch DELETED ---


--- webalizer-2.01-06-rh.patch DELETED ---


--- webalizer-2.01-10-agent-apple.patch DELETED ---


--- webalizer-2.01-10-agent-compatible.patch DELETED ---


--- webalizer-2.01-10-agent-default.patch DELETED ---


--- webalizer-2.01-10-agent-gecko.patch DELETED ---


--- webalizer-2.01-10-agent-opera.patch DELETED ---


--- webalizer-2.01-10-countrycode.patch DELETED ---


--- webalizer-2.01-10-hostname.patch DELETED ---


--- webalizer-2.01-10-maxagent.patch DELETED ---


--- webalizer-2.01-10-overflow.patch DELETED ---


--- webalizer-2.01-10-underrun.patch DELETED ---


--- webalizer-2.01_10-lfs.patch DELETED ---



From cebbert at fedoraproject.org  Tue Apr 14 13:25:32 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 13:25:32 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-posix-timers-fix-clock-monotonicity.patch, 
	NONE, 1.1 linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, NONE,
	1.1 linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, NONE,
	1.1 kernel.spec, 1.1326, 1.1327
Message-ID: <20090414132532.C7363700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19804

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-posix-timers-fix-clock-monotonicity.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch 
Log Message:
Timer fixes headed for -stable

linux-2.6-posix-timers-fix-clock-monotonicity.patch:

--- NEW FILE linux-2.6-posix-timers-fix-clock-monotonicity.patch ---
From: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Tue, 31 Mar 2009 07:56:03 +0000 (+0900)
Subject: posixtimers, sched: Fix posix clock monotonicity
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c5f8d99585d7b5b7e857fabf8aefd0174903a98c

posixtimers, sched: Fix posix clock monotonicity

Impact: Regression fix (against clock_gettime() backwarding bug)

This patch re-introduces a couple of functions, task_sched_runtime
and thread_group_sched_runtime, which was once removed at the
time of 2.6.28-rc1.

These functions protect the sampling of thread/process clock with
rq lock.  This rq lock is required not to update rq->clock during
the sampling.

i.e.
  The clock_gettime() may return
   ((accounted runtime before update) + (delta after update))
  that is less than what it should be.

v2 -> v3:
	- Rename static helper function __task_delta_exec()
	  to do_task_delta_exec() since -tip tree already has
	  a __task_delta_exec() of different version.

v1 -> v2:
	- Revises comments of function and patch description.
	- Add note about accuracy of thread group's runtime.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: stable at kernel.org	[2.6.28.x][2.6.29.x]
LKML-Reference: <49D1CC93.4080401 at jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index fa07da9..4318c30 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -224,7 +224,7 @@ static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p,
 		cpu->cpu = virt_ticks(p);
 		break;
 	case CPUCLOCK_SCHED:
-		cpu->sched = p->se.sum_exec_runtime + task_delta_exec(p);
+		cpu->sched = task_sched_runtime(p);
 		break;
 	}
 	return 0;
@@ -240,18 +240,19 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
 {
 	struct task_cputime cputime;
 
-	thread_group_cputime(p, &cputime);
 	switch (CPUCLOCK_WHICH(which_clock)) {
 	default:
 		return -EINVAL;
 	case CPUCLOCK_PROF:
+		thread_group_cputime(p, &cputime);
 		cpu->cpu = cputime_add(cputime.utime, cputime.stime);
 		break;
 	case CPUCLOCK_VIRT:
+		thread_group_cputime(p, &cputime);
 		cpu->cpu = cputime.utime;
 		break;
 	case CPUCLOCK_SCHED:
-		cpu->sched = cputime.sum_exec_runtime + task_delta_exec(p);
+		cpu->sched = thread_group_sched_runtime(p);
 		break;
 	}
 	return 0;
diff --git a/kernel/sched.c b/kernel/sched.c
index cc397aa..c8d7f17 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4139,9 +4139,25 @@ DEFINE_PER_CPU(struct kernel_stat, kstat);
 EXPORT_PER_CPU_SYMBOL(kstat);
 
 /*
- * Return any ns on the sched_clock that have not yet been banked in
+ * Return any ns on the sched_clock that have not yet been accounted in
  * @p in case that task is currently running.
+ *
+ * Called with task_rq_lock() held on @rq.
  */
+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
+{
+	u64 ns = 0;
+
+	if (task_current(rq, p)) {
+		update_rq_clock(rq);
+		ns = rq->clock - p->se.exec_start;
+		if ((s64)ns < 0)
+			ns = 0;
+	}
+
+	return ns;
+}
+
 unsigned long long task_delta_exec(struct task_struct *p)
 {
 	unsigned long flags;
@@ -4149,16 +4165,49 @@ unsigned long long task_delta_exec(struct task_struct *p)
 	u64 ns = 0;
 
 	rq = task_rq_lock(p, &flags);
+	ns = do_task_delta_exec(p, rq);
+	task_rq_unlock(rq, &flags);
 
-	if (task_current(rq, p)) {
-		u64 delta_exec;
+	return ns;
+}
 
-		update_rq_clock(rq);
-		delta_exec = rq->clock - p->se.exec_start;
-		if ((s64)delta_exec > 0)
-			ns = delta_exec;
-	}
+/*
+ * Return accounted runtime for the task.
+ * In case the task is currently running, return the runtime plus current's
+ * pending runtime that have not been accounted yet.
+ */
+unsigned long long task_sched_runtime(struct task_struct *p)
+{
+	unsigned long flags;
+	struct rq *rq;
+	u64 ns = 0;
+
+	rq = task_rq_lock(p, &flags);
+	ns = p->se.sum_exec_runtime + do_task_delta_exec(p, rq);
+	task_rq_unlock(rq, &flags);
+
+	return ns;
+}
 
+/*
+ * Return sum_exec_runtime for the thread group.
+ * In case the task is currently running, return the sum plus current's
+ * pending runtime that have not been accounted yet.
+ *
+ * Note that the thread group might have other running tasks as well,
+ * so the return value not includes other pending runtime that other
+ * running tasks might have.
+ */
+unsigned long long thread_group_sched_runtime(struct task_struct *p)
+{
+	struct task_cputime totals;
+	unsigned long flags;
+	struct rq *rq;
+	u64 ns;
+
+	rq = task_rq_lock(p, &flags);
+	thread_group_cputime(p, &totals);
+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
 	task_rq_unlock(rq, &flags);
 
 	return ns;

linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Mon, 23 Mar 2009 19:34:11 +0000 (+0100)
Subject: posix timers: fix RLIMIT_CPU && fork()
X-Git-Tag: v2.6.30-rc1~657^2^4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=37bebc70d7ad4144c571d74500db3bb26ec0c0eb

posix timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other cpu timers.

This is the minimal fix for 2.6.29 (tested) and 2.6.28. The patch is not
optimal, we need further cleanups here. With this patch update_rlimit_cpu()
is not really needed, but I don't think it should be removed.

The proper fix (I think) is:

	- set_process_cpu_timer() should just start the cputimer->running
	  logic (it does), no need to change cputime_expires.xxx_exp

	- posix_cpu_timers_init_group() should set ->running when needed

	- fastpath_timer_check() can check ->running instead of
	  task_cputime_zero(signal->cputime_expires)

Reported-by: Peter Lojkin <ia6432 at inbox.ru>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Roland McGrath <roland at redhat.com>
Cc: <stable at kernel.org> [for 2.6.29.x]
LKML-Reference: <20090323193411.GA17514 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index e976e50..8e5d9a6 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1370,7 +1370,8 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
 		if (task_cputime_expired(&group_sample, &sig->cputime_expires))
 			return 1;
 	}
-	return 0;
+
+	return sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY;
 }
 
 /*

linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 27 Mar 2009 00:06:10 +0000 (+0100)
Subject: posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8f2e586567b1bad72dac7c3810fe9a2ef7117506

posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)

update_rlimit_cpu() tries to optimize out set_process_cpu_timer() in case
when we already have CPUCLOCK_PROF timer which should expire first. But it
uses cputime_lt() instead of cputime_gt().

Test case:

	int main(void)
	{
		struct itimerval it = {
			.it_value = { .tv_sec = 1000 },
		};

		assert(!setitimer(ITIMER_PROF, &it, NULL));

		struct rlimit rl = {
			.rlim_cur = 1,
			.rlim_max = 1,
		};

		assert(!setrlimit(RLIMIT_CPU, &rl));

		for (;;)
			;

		return 0;
	}

Without this patch, the task is not killed as RLIMIT_CPU demands.

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Cc: Peter Lojkin <ia6432 at inbox.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: stable at kernel.org
LKML-Reference: <20090327000610.GA10108 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 8e5d9a6..bb53185 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -18,7 +18,7 @@ void update_rlimit_cpu(unsigned long rlim_new)
 
 	cputime = secs_to_cputime(rlim_new);
 	if (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
-	    cputime_lt(current->signal->it_prof_expires, cputime)) {
+	    cputime_gt(current->signal->it_prof_expires, cputime)) {
 		spin_lock_irq(&current->sighand->siglock);
 		set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
 		spin_unlock_irq(&current->sighand->siglock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1326
retrieving revision 1.1327
diff -u -r1.1326 -r1.1327
--- kernel.spec	14 Apr 2009 12:21:37 -0000	1.1326
+++ kernel.spec	14 Apr 2009 13:25:02 -0000	1.1327
@@ -695,7 +695,13 @@
 # patches headed for -stable
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+# fix duplicated flags
 Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+# fix posix clock monotonicity
+Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
+# make RLIMIT_CPU work again
+Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -1288,6 +1294,9 @@
 # patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
@@ -1878,6 +1887,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-26
+- Timer fixes headed for -stable
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-25
 - Fix duplicated flag value in pagemap.h (-stable patch)
 



From cebbert at fedoraproject.org  Tue Apr 14 13:40:22 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 13:40:22 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch, 
	NONE, 1.1 kernel.spec, 1.1327, 1.1328
Message-ID: <20090414134022.7FCF4700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24526

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch 
Log Message:
Fix warnings/errors in USB cdc-acm modem driver (F11#495446)

linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch:

--- NEW FILE linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch ---
USB: cdc-acm: don't set tty low_latency flag

"The hack setting of it for high data rate devices was obsolete when the
tty buffer changes went in so it can definitely go in those cases."
  --Alan Cox

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.29.noarch/drivers/usb/class/cdc-acm.c
===================================================================
--- linux-2.6.29.noarch.orig/drivers/usb/class/cdc-acm.c
+++ linux-2.6.29.noarch/drivers/usb/class/cdc-acm.c
@@ -546,10 +546,6 @@ static int acm_tty_open(struct tty_struc
 	tty->driver_data = acm;
 	acm->tty = tty;
 
-	/* force low_latency on so that our tty_push actually forces the data through,
-	   otherwise it is scheduled, and with high data rates data can get lost. */
-	tty->low_latency = 1;
-
 	if (usb_autopm_get_interface(acm->control) < 0)
 		goto early_bail;
 	else


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1327
retrieving revision 1.1328
diff -u -r1.1327 -r1.1328
--- kernel.spec	14 Apr 2009 13:25:02 -0000	1.1327
+++ kernel.spec	14 Apr 2009 13:39:50 -0000	1.1328
@@ -692,6 +692,8 @@
 
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
+Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
+
 # patches headed for -stable
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
@@ -1178,6 +1180,7 @@
 ApplyPatch linux-2.6-btrfs-experimental-branch.patch
 
 # USB
+ApplyPatch linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1887,6 +1890,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-27
+- Fix warnings/errors in USB cdc-acm modem driver (F11#495446)
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-26
 - Timer fixes headed for -stable
 



From dwalsh at fedoraproject.org  Tue Apr 14 13:40:43 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 14 Apr 2009 13:40:43 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.414,
	1.415 policycoreutils.spec, 1.601, 1.602
Message-ID: <20090414134043.6B534700B2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24683

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10
- Do not print \n, if count < 1000;


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- policycoreutils-rhat.patch	11 Apr 2009 12:22:23 -0000	1.414
+++ policycoreutils-rhat.patch	14 Apr 2009 13:40:09 -0000	1.415
@@ -1029,3 +1029,41 @@
  		if use_file:
                         ddict = self.get_all(locallist)
                         keys = ddict.keys()
+Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.62/setfiles/restorecon differ
+Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.62/setfiles/setfiles differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.62/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.62/setfiles/setfiles.c	2009-04-14 09:38:55.000000000 -0400
+@@ -29,6 +29,8 @@
+ static int mass_relabel;
+ static int mass_relabel_errs;
+ 
++#define STAR_COUNT 1000
++
+ static FILE *outfile = NULL;
+ static int force = 0;
+ #define STAT_BLOCK_SIZE 1
+@@ -444,11 +446,11 @@
+ 
+ 	if (progress) {
+ 		count++;
+-		if (count % 80000 == 0) {
++		if (count % (80 * STAR_COUNT) == 0) {
+ 			fprintf(stdout, "\n");
+ 			fflush(stdout);
+ 		}
+-		if (count % 1000 == 0) {
++		if (count % STAR_COUNT == 0) {
+ 			fprintf(stdout, "*");
+ 			fflush(stdout);
+ 		}
+@@ -1017,7 +1019,7 @@
+ 		free(excludeArray[i].directory);
+ 	}
+ 
+-       if (progress)
++       if (progress && count >= STAR_COUNT)
+                printf("\n");
+ 	exit(errors);
+ }
+Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.62/setfiles/setfiles.o differ


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- policycoreutils.spec	11 Apr 2009 12:22:27 -0000	1.601
+++ policycoreutils.spec	14 Apr 2009 13:40:12 -0000	1.602
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10
+- Do not print \n, if count < 1000;
+
 * Sat Apr 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-9
 - Handle case where subs file does not exist
 



From cebbert at fedoraproject.org  Tue Apr 14 13:46:38 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 13:46:38 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch, 
	NONE, 1.1 kernel.spec, 1.1538, 1.1539
Message-ID: <20090414134639.04838700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27626

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch 
Log Message:
Fix warnings/errors in USB cdc-acm modem driver (#495446)

linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch:

--- NEW FILE linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch ---
USB: cdc-acm: don't set tty low_latency flag

"The hack setting of it for high data rate devices was obsolete when the
tty buffer changes went in so it can definitely go in those cases."
  --Alan Cox

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.29.noarch/drivers/usb/class/cdc-acm.c
===================================================================
--- linux-2.6.29.noarch.orig/drivers/usb/class/cdc-acm.c
+++ linux-2.6.29.noarch/drivers/usb/class/cdc-acm.c
@@ -546,10 +546,6 @@ static int acm_tty_open(struct tty_struc
 	tty->driver_data = acm;
 	acm->tty = tty;
 
-	/* force low_latency on so that our tty_push actually forces the data through,
-	   otherwise it is scheduled, and with high data rates data can get lost. */
-	tty->low_latency = 1;
-
 	if (usb_autopm_get_interface(acm->control) < 0)
 		goto early_bail;
 	else


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1538
retrieving revision 1.1539
diff -u -r1.1538 -r1.1539
--- kernel.spec	14 Apr 2009 13:04:59 -0000	1.1538
+++ kernel.spec	14 Apr 2009 13:46:36 -0000	1.1539
@@ -714,6 +714,8 @@
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 
+Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
+
 Patch5000: linux-2.6-add-qcserial.patch
 
 # patches headed for -stable
@@ -1196,6 +1198,7 @@
 
 # USB
 ApplyPatch linux-2.6-add-qcserial.patch
+ApplyPatch linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1946,6 +1949,9 @@
 
 %changelog
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix warnings/errors in USB cdc-acm modem driver (#495446)
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - Timer fixes headed for -stable
 
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>



From hadess at fedoraproject.org  Tue Apr 14 13:47:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 14 Apr 2009 13:47:20 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-0.12.0-sj-updates.patch, NONE,
	1.1 rhythmbox.spec, 1.242, 1.243
Message-ID: <20090414134720.62D78700B2@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27487

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-0.12.0-sj-updates.patch 
Log Message:
* Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-5
- Fix possible crashers in the libmusicbrainz3 code


rb-0.12.0-sj-updates.patch:

--- NEW FILE rb-0.12.0-sj-updates.patch ---
diff -upr rhythmbox-0.12.0.old/plugins/audiocd/sj-metadata.c rhythmbox-0.12.0/plugins/audiocd/sj-metadata.c
--- rhythmbox-0.12.0.old/plugins/audiocd/sj-metadata.c	2009-03-12 02:26:12.000000000 +0000
+++ rhythmbox-0.12.0/plugins/audiocd/sj-metadata.c	2009-04-14 14:34:41.000000000 +0100
@@ -26,7 +26,7 @@
 
 #ifndef USE_TOTEM_PL_PARSER
 #include <unistd.h>
-#include <nautilus-burn.h>
+#include <brasero-medium-selection.h>
 #else
 #include <totem-disc.h>
 #endif /* USE_TOTEM_PL_PARSER */
@@ -152,7 +152,11 @@ GDate *
 sj_metadata_helper_scan_date (const char *date)
 {
   int matched, year=1, month=1, day=1;
-  matched = sscanf(date, "%u-%u-%u", &year, &month, &day);
+
+  if (date == NULL)
+    return NULL;
+
+  matched = sscanf (date, "%u-%u-%u", &year, &month, &day);
   if (matched >= 1) {
     return g_date_new_dmy ((day == 0) ? 1 : day, (month == 0) ? 1 : month, year);
   }
@@ -164,22 +168,21 @@ gboolean
 sj_metadata_helper_check_media (const char *cdrom, GError **error)
 {
 #ifndef USE_TOTEM_PL_PARSER
-  NautilusBurnMediaType type;
-  NautilusBurnDriveMonitor *monitor;
-  NautilusBurnDrive *drive;
+  BraseroMediumMonitor *monitor;
+  BraseroMedium *medium;
+  BraseroDrive *drive;
 
-  if (! nautilus_burn_initialized ()) {
-    nautilus_burn_init ();
-  }
-  monitor = nautilus_burn_get_drive_monitor ();
-  drive = nautilus_burn_drive_monitor_get_drive_for_device (monitor, cdrom);
+
+  /* This initialize the library if it isn't done yet */
+  monitor = brasero_medium_monitor_get_default ();
+  drive = brasero_medium_monitor_get_drive (monitor, cdrom);
   if (drive == NULL) {
     return FALSE;
   }
-  type = nautilus_burn_drive_get_media_type (drive);
-  nautilus_burn_drive_unref (drive);
+  medium = brasero_drive_get_medium (drive);
+  g_object_unref (drive);
 
-  if (type == NAUTILUS_BURN_MEDIA_TYPE_ERROR) {
+  if (!medium || !BRASERO_MEDIUM_VALID (brasero_medium_get_status (medium))) {
     char *msg;
     SjError err;
 
diff -upr rhythmbox-0.12.0.old/plugins/audiocd/sj-metadata-gvfs.c rhythmbox-0.12.0/plugins/audiocd/sj-metadata-gvfs.c
--- rhythmbox-0.12.0.old/plugins/audiocd/sj-metadata-gvfs.c	2009-03-12 02:26:12.000000000 +0000
+++ rhythmbox-0.12.0/plugins/audiocd/sj-metadata-gvfs.c	2009-04-14 14:34:41.000000000 +0100
@@ -134,6 +134,8 @@ gvfs_list_albums (SjMetadata *metadata, 
     track->duration = g_file_info_get_attribute_uint64 (info, "xattr::org.gnome.audio.duration");
     album->number++;
     g_object_unref (info);
+
+    album->tracks = g_list_append (album->tracks, track);
   }
   g_object_unref (e);
 
diff -upr rhythmbox-0.12.0.old/plugins/audiocd/sj-metadata-musicbrainz3.c rhythmbox-0.12.0/plugins/audiocd/sj-metadata-musicbrainz3.c
--- rhythmbox-0.12.0.old/plugins/audiocd/sj-metadata-musicbrainz3.c	2009-03-12 02:26:12.000000000 +0000
+++ rhythmbox-0.12.0/plugins/audiocd/sj-metadata-musicbrainz3.c	2009-04-14 14:34:41.000000000 +0100
@@ -172,7 +172,9 @@ make_album_from_release (MbRelease *rele
     GET (track->title, mb_track_get_title, mbt);
     track->duration = mb_track_get_duration (mbt) / 1000;
 
-    artist = mb_release_get_artist (release);
+    artist = mb_track_get_artist (mbt);
+    if (artist == NULL)
+      artist = mb_release_get_artist (release);
     GET (track->artist_id, mb_artist_get_id, artist);
     GET (track->artist, mb_artist_get_name, artist);
     GET (track->artist_sortname, mb_artist_get_sortname, artist);
@@ -264,16 +266,19 @@ mb_list_albums (SjMetadata *metadata, ch
     char buffer[512];
 
     release = mb_result_list_get_release (results, i);
-    mb_release_get_id (release, buffer, sizeof (buffer));
-    includes = get_release_includes ();
-    release = mb_query_get_release_by_id (query, buffer, includes);
-    mb_release_includes_free (includes);
-
-    album = make_album_from_release (release);
-    album->metadata_source = SOURCE_MUSICBRAINZ;
-    fill_empty_durations (priv->disc, album);
-    albums = g_list_append (albums, album);
-    mb_release_free (release);
+    if(release) {
+      mb_release_get_id (release, buffer, sizeof (buffer));
+      includes = get_release_includes ();
+      release = mb_query_get_release_by_id (query, buffer, includes);
+      if(release) {
+        mb_release_includes_free (includes);
+        album = make_album_from_release (release);
+        album->metadata_source = SOURCE_MUSICBRAINZ;
+        fill_empty_durations (priv->disc, album);
+        albums = g_list_append (albums, album);
+        mb_release_free (release);
+      }
+    }
   }
   mb_result_list_free (results);
   mb_query_free (query);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- rhythmbox.spec	9 Apr 2009 17:12:35 -0000	1.242
+++ rhythmbox.spec	14 Apr 2009 13:46:49 -0000	1.243
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.12.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -59,6 +59,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=578514
 Patch3: rb-ddkit-monitor.patch
 BuildRequires: automake autoconf libtool
+Patch4: rb-0.12.0-sj-updates.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -96,6 +97,7 @@
 %patch1 -p0 -b .decodebin2
 %patch2 -p1 -b .psp-crasher
 %patch3 -p1 -b .ddkit
+%patch4 -p1 -b .sj
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -235,6 +237,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-5
+- Fix possible crashers in the libmusicbrainz3 code
+
 * Thu Apr 09 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-4
 - Fix iPod detection with the DeviceKit-disks gvfs monitor (#493640)
 



From kwizart at fedoraproject.org  Tue Apr 14 13:47:48 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 14 Apr 2009 13:47:48 +0000 (UTC)
Subject: rpms/lcdproc/devel lcdproc-0.5.2-novalidate.patch, NONE,
	1.1 lcdproc.spec, 1.12, 1.13
Message-ID: <20090414134748.3672F700B2@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28151

Modified Files:
	lcdproc.spec 
Added Files:
	lcdproc-0.5.2-novalidate.patch 
Log Message:
- Disable xmlto validation (Fix FTBFS)


lcdproc-0.5.2-novalidate.patch:

--- NEW FILE lcdproc-0.5.2-novalidate.patch ---
diff -up lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate	2007-04-14 16:39:53.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am	2009-04-14 15:28:01.000000000 +0200
@@ -18,6 +18,6 @@ developerguidedir = $(DESTDIR)$(htmldir)
 
 install-html-developerguide: $(xmlto) lcdproc-dev.docbook
 	$(mkinstalldirs) $(developerguidedir)
-	$(xmlto) html -o $(developerguidedir) lcdproc-dev.docbook
+	$(xmlto) html -o $(developerguidedir) --skip-validation lcdproc-dev.docbook
 
 ## EOF
diff -up lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-user/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate	2009-04-14 15:32:24.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-user/Makefile.am	2009-04-14 15:32:44.000000000 +0200
@@ -21,6 +21,6 @@ userguidedir = $(DESTDIR)$(htmldir)/user
 
 install-html-userguide: $(xmlto) lcdproc-user.docbook
 	$(mkinstalldirs) $(userguidedir)
-	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
+	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
 
 ## EOF


Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lcdproc.spec	5 Mar 2009 09:41:35 -0000	1.12
+++ lcdproc.spec	14 Apr 2009 13:47:47 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
 Name:           lcdproc
 Version:        0.5.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@
 Patch0:         lcdproc-0.5.2-initscripts.patch
 Patch1:         lcdproc-0.5.2-memset_swp.patch
 Patch2:         lcdproc-0.5.2-imonlcd.patch
+Patch3:         lcdproc-0.5.2-novalidate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -56,6 +57,7 @@
 %patch0 -p1 -b .initscripts
 %patch1 -p1 -b .memset_swp
 %patch2 -p1 -b .imonlcd
+%patch3 -p1 -b .novalidate
 chmod 644 server/drivers/timing.h
 
 sed -i -e 's|server/drivers|%{_libdir}/lcdproc|' LCDd.conf
@@ -136,6 +138,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 kwizart < kwizart at gmail.com > - 0.5.2-11
+- Disable xmlto validation (Fix FTBFS)
+
 * Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 0.5.2-10
 - Disable LCDd lcdproc initscript by default.
   (It needs to be configured first).



From harald at fedoraproject.org  Tue Apr 14 13:48:02 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 14 Apr 2009 13:48:02 +0000 (UTC)
Subject: rpms/udev/devel .cvsignore, 1.58, 1.59 sources, 1.58, 1.59 udev.spec,
	1.270, 1.271 udev-import-buffer.patch, 1.1, NONE
Message-ID: <20090414134802.1920E700B2@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28090

Modified Files:
	.cvsignore sources udev.spec 
Removed Files:
	udev-import-buffer.patch 
Log Message:
* Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 141-1
- version 141



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	27 Feb 2009 07:49:44 -0000	1.58
+++ .cvsignore	14 Apr 2009 13:47:30 -0000	1.59
@@ -1 +1 @@
-udev-139.tar.bz2
+udev-141.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	27 Feb 2009 07:49:44 -0000	1.58
+++ sources	14 Apr 2009 13:47:31 -0000	1.59
@@ -1 +1 @@
-7e705e237d29734c77bc26f6ccbc4594  udev-139.tar.bz2
+1670fe81cabf5161319c52084cf81134  udev-141.tar.bz2


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- udev.spec	1 Apr 2009 13:37:22 -0000	1.270
+++ udev.spec	14 Apr 2009 13:47:31 -0000	1.271
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 139
-Release: 4%{?dist}
+Version: 141
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,7 +19,6 @@
 Source5: udev.sysconfig
 
 Patch102: udev-118-sysconf.patch
-Patch103: udev-import-buffer.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -93,8 +92,6 @@
 %setup -q  
 
 %patch102 -p1 -b .sysconf
-%patch103 -p1 -b .import
-rm rules/redhat/95-pam-console.rules
 
 %build
 %if %{with_static}
@@ -326,6 +323,7 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/path_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/cdrom_id*.8*
+%attr(0644,root,root) %{_mandir}/man8/usb_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8*
 
 %dir %attr(0755,root,root) /var/lib/udev
@@ -381,6 +379,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 141-1
+- version 141
+
 * Wed Apr 01 2009 Harald Hoyer <harald at redhat.com> 139-4
 - double the IMPORT buffer (bug #488554)
 - Resolves: rhbz#488554


--- udev-import-buffer.patch DELETED ---



From rdieter at fedoraproject.org  Tue Apr 14 13:48:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 13:48:24 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok-1.4.10-libmtp03.patch, NONE, 1.1 amarok.spec,
	1.115, 1.116
Message-ID: <20090414134824.09CAA700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28288

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-libmtp03.patch 
Log Message:
* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
- libmtp03 patch (unused here, but others may find it useful)
- optimize scriptlets


amarok-1.4.10-libmtp03.patch:

--- NEW FILE amarok-1.4.10-libmtp03.patch ---
--- amarok-1.4.10.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -298,7 +298,7 @@
     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
         m_device, bundle.url().path().utf8(), trackmeta,
-        progressCallback, this, parent_id
+        progressCallback, this
     );
     m_critical_mutex.unlock();
 
@@ -529,7 +529,7 @@
         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
             album_object->tracks[i++] = it->track()->id();
         album_object->no_tracks = items->count();
-        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
+        ret = LIBMTP_Create_New_Album( m_device, album_object );
         if( ret != 0 )
         {
             debug() << "creating album failed : " << ret << endl;
@@ -608,7 +608,7 @@
 {
     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
     char *name_copy = qstrdup( name );
-    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
+    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
     delete(name_copy);
     debug() << "New folder ID: " << new_folder_id << endl;
     if( new_folder_id == 0 )
@@ -913,7 +913,7 @@
     if( item->playlist()->id() == 0 )
     {
         debug() << "creating new playlist : " << metadata->name << endl;
-        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
+        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
         if( ret == 0 )
         {
             item->playlist()->setId( metadata->playlist_id );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- amarok.spec	13 Apr 2009 17:20:50 -0000	1.115
+++ amarok.spec	14 Apr 2009 13:47:53 -0000	1.116
@@ -7,8 +7,13 @@
 %endif
 
 %if 0%{?fedora} > 6 
-# suffix for kde3 -devel packages
-%define kde3 3
+%define kdelibs3 kdelibs3
+%define kdebase3 kdebase3
+%else
+%define kdelibs3 kdelibs
+%define kdebase3 kdebase
+# workaround missing dep on rhel5
+BuildRequires:  libutempter-devel
 %endif
 
 %if 0%{?fedora} > 6
@@ -31,7 +36,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -42,6 +47,8 @@
 Patch1:     amarok-1.4.8-gcc43.patch
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
+# Fix for newer libmtp >= 0.3
+Patch3:     amarok-1.4.10-libmtp03.patch 
 
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
@@ -54,11 +61,9 @@
 BuildRequires:  esound-devel
 BuildRequires:  gettext
 %{?_with_helix:BuildRequires:  HelixPlayer}
-BuildRequires:  kdelibs%{?kde3}-devel
-# workaround missing dep on rhel5
-BuildRequires:  libutempter-devel
+BuildRequires:  %{kdelibs3}-devel
 %if 0%{?konq}
-BuildRequires:  kdebase%{?kde3}-devel
+BuildRequires:  %{kdebase3}-devel
 %else
 Obsoletes: %{name}-konqueror < %{version}-%{release}
 %endif
@@ -93,8 +98,6 @@
 
 # To open the selected browser, works with Patch2
 Requires:  xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 
@@ -151,6 +154,11 @@
 
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
+
+%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.2.0"
+%patch3 -p1 -b .libmtp03
+%endif
+
 %patch100 -p4 -b .aa_security
 %patch101 -p1 -b .wikipedia
 
@@ -184,12 +192,6 @@
 rm -fr $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
-# desktop files
-desktop-file-install  --vendor "" \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %if ! 0%{?konq}
@@ -208,15 +210,25 @@
 done
 
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
+
+
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %clean
@@ -232,7 +244,7 @@
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/amarok/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/amarok.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
@@ -314,6 +326,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
+- libmtp03 patch (unused here, but others may find it useful)
+- optimize scriptlets
+
 * Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
 - fix wikipedia access
 



From hadess at fedoraproject.org  Tue Apr 14 13:49:02 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 14 Apr 2009 13:49:02 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.13,
	1.14 gnome-bluetooth.spec, 1.71, 1.72 sources, 1.14, 1.15
Message-ID: <20090414134902.5AE8D700B2@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28251

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-1
- Update to 2.27.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Apr 2009 22:19:06 -0000	1.13
+++ .cvsignore	14 Apr 2009 13:48:31 -0000	1.14
@@ -1 +1 @@
-gnome-bluetooth-2.27.3.tar.bz2
+gnome-bluetooth-2.27.4.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gnome-bluetooth.spec	9 Apr 2009 22:19:06 -0000	1.71
+++ gnome-bluetooth.spec	14 Apr 2009 13:48:31 -0000	1.72
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.27.3
+Version:	2.27.4
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -158,6 +158,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
 * Thu Apr 09 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.3-1
 - Update to 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Apr 2009 22:19:06 -0000	1.14
+++ sources	14 Apr 2009 13:48:31 -0000	1.15
@@ -1 +1 @@
-541e8c554ccd801f372d42f786b8becb  gnome-bluetooth-2.27.3.tar.bz2
+e34180aa90d5d718b819572b21b76d08  gnome-bluetooth-2.27.4.tar.bz2



From rdieter at fedoraproject.org  Tue Apr 14 13:57:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 13:57:16 +0000 (UTC)
Subject: rpms/amarok/EL-5 amarok-1.4.10-libmtp03.patch, NONE, 1.1 amarok.spec,
	1.84, 1.85
Message-ID: <20090414135716.53A32700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31454

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-libmtp03.patch 
Log Message:
* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
- libmtp03 patch (unused here, but others may find it useful)
- optimize scriptlets
- enable libmp4v2 support (el5)


amarok-1.4.10-libmtp03.patch:

--- NEW FILE amarok-1.4.10-libmtp03.patch ---
--- amarok-1.4.10.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -298,7 +298,7 @@
     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
         m_device, bundle.url().path().utf8(), trackmeta,
-        progressCallback, this, parent_id
+        progressCallback, this
     );
     m_critical_mutex.unlock();
 
@@ -529,7 +529,7 @@
         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
             album_object->tracks[i++] = it->track()->id();
         album_object->no_tracks = items->count();
-        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
+        ret = LIBMTP_Create_New_Album( m_device, album_object );
         if( ret != 0 )
         {
             debug() << "creating album failed : " << ret << endl;
@@ -608,7 +608,7 @@
 {
     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
     char *name_copy = qstrdup( name );
-    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
+    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
     delete(name_copy);
     debug() << "New folder ID: " << new_folder_id << endl;
     if( new_folder_id == 0 )
@@ -913,7 +913,7 @@
     if( item->playlist()->id() == 0 )
     {
         debug() << "creating new playlist : " << metadata->name << endl;
-        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
+        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
         if( ret == 0 )
         {
             item->playlist()->setId( metadata->playlist_id );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- amarok.spec	13 Apr 2009 17:13:42 -0000	1.84
+++ amarok.spec	14 Apr 2009 13:56:45 -0000	1.85
@@ -7,8 +7,13 @@
 %endif
 
 %if 0%{?fedora} > 6 
-# suffix for kde3 -devel packages
-%define kde3 3
+%define kdelibs3 kdelibs3
+%define kdebase3 kdebase3
+%else
+%define kdelibs3 kdelibs
+%define kdebase3 kdebase
+# workaround missing dep on rhel5
+BuildRequires:  libutempter-devel
 %endif
 
 %if 0%{?fedora} > 6
@@ -25,13 +30,13 @@
 %define _with_libmtp --with-libmtp
 %define _with_libnjb --with-libnjb
 %define _with_libvisual --with-libvisual
-%define _with_mp4v2 --with-mp4v2
 %endif
+%define _with_mp4v2 --with-mp4v2
 
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -42,6 +47,8 @@
 Patch1:     amarok-1.4.8-gcc43.patch
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
+# Fix for newer libmtp >= 0.3
+Patch3:     amarok-1.4.10-libmtp03.patch 
 
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
@@ -54,11 +61,9 @@
 BuildRequires:  esound-devel
 BuildRequires:  gettext
 %{?_with_helix:BuildRequires:  HelixPlayer}
-BuildRequires:  kdelibs%{?kde3}-devel
-# workaround missing dep on rhel5
-BuildRequires:  libutempter-devel
+BuildRequires:  %{kdelibs3}-devel
 %if 0%{?konq}
-BuildRequires:  kdebase%{?kde3}-devel
+BuildRequires:  %{kdebase3}-devel
 %else
 Obsoletes: %{name}-konqueror < %{version}-%{release}
 %endif
@@ -93,8 +98,6 @@
 
 # To open the selected browser, works with Patch2
 Requires:  xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 
@@ -151,6 +154,11 @@
 
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
+
+%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.2.0"
+%patch3 -p1 -b .libmtp03
+%endif
+
 %patch100 -p4 -b .aa_security
 %patch101 -p1 -b .wikipedia
 
@@ -184,12 +192,6 @@
 rm -fr $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
-# desktop files
-desktop-file-install  --vendor "" \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %if ! 0%{?konq}
@@ -208,15 +210,25 @@
 done
 
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
+
+
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %clean
@@ -232,7 +244,7 @@
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/amarok/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/amarok.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
@@ -314,6 +326,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
+- libmtp03 patch (unused here, but others may find it useful)
+- optimize scriptlets
+- enable libmp4v2 support (el5)
+
 * Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
 - fix wikipedia access
 



From hadess at fedoraproject.org  Tue Apr 14 13:58:05 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 14 Apr 2009 13:58:05 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.72,1.73
Message-ID: <20090414135805.94C3C700B2@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31697

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Add missing gnome-doc-utils BR



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gnome-bluetooth.spec	14 Apr 2009 13:48:31 -0000	1.72
+++ gnome-bluetooth.spec	14 Apr 2009 13:57:34 -0000	1.73
@@ -15,6 +15,7 @@
 BuildRequires:	hal-devel
 BuildRequires:	unique-devel
 BuildRequires:	libnotify-devel
+BuildRequires:	gnome-doc-utils
 
 BuildRequires:	perl-XML-Parser intltool desktop-file-utils gettext gtk-doc
 



From rdieter at fedoraproject.org  Tue Apr 14 13:59:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 13:59:06 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok.spec,1.116,1.117
Message-ID: <20090414135906.D22A7700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32159

Modified Files:
	amarok.spec 
Log Message:
sync mods from EL-5 branch



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- amarok.spec	14 Apr 2009 13:47:53 -0000	1.116
+++ amarok.spec	14 Apr 2009 13:58:36 -0000	1.117
@@ -30,8 +30,8 @@
 %define _with_libmtp --with-libmtp
 %define _with_libnjb --with-libnjb
 %define _with_libvisual --with-libvisual
-%define _with_mp4v2 --with-mp4v2
 %endif
+%define _with_mp4v2 --with-mp4v2
 
 Name:       amarok
 Summary:    Media player
@@ -329,6 +329,7 @@
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
 - libmtp03 patch (unused here, but others may find it useful)
 - optimize scriptlets
+- enable libmp4v2 support (el5)
 
 * Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
 - fix wikipedia access



From glommer at fedoraproject.org  Tue Apr 14 13:59:34 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Tue, 14 Apr 2009 13:59:34 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.77,1.78
Message-ID: <20090414135934.D577C700B2@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31993

Modified Files:
	qemu.spec 
Log Message:
provide qemu-kvm. This will be useful to avoid installing ppc packages
on x86 via comp groups.




Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- qemu.spec	9 Apr 2009 15:08:34 -0000	1.77
+++ qemu.spec	14 Apr 2009 13:59:03 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -108,6 +108,9 @@
 Requires: bochs-bios >= 2.3.8-0.5
 Provides: kvm = 85
 Obsoletes: kvm < 85
+%ifarch %{ix86} x86_64
+Provides: qemu-kvm = %{epoch}:%{version}-%{release}
+%endif
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -122,6 +125,9 @@
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: openbios-ppc
+%ifarch ppc ppc64
+Provides: qemu-kvm = %{epoch}:%{version}-%{release}
+%endif
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
@@ -457,6 +463,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Apr  14 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-8
+- Provide qemu-kvm conditional on the architecture.
+
 * Thu Apr  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-7
 - Add a much cleaner fix for vga segfault (#494002)
 



From laxathom at fedoraproject.org  Tue Apr 14 13:49:56 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Tue, 14 Apr 2009 13:49:56 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.24,1.25
Message-ID: <20090414134956.4D17D700B2@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29046

Modified Files:
	gammu.spec 
Log Message:
Update release


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gammu.spec	12 Apr 2009 15:59:58 -0000	1.24
+++ gammu.spec	14 Apr 2009 13:49:25 -0000	1.25
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.23.1
+Version:        1.23.92
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -158,6 +158,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Xavier Lamien <lxtnow at gmail.com> - 1.23.92-1
+- Update release.
+
 * Sun Apr 12 2009 Xavier Lamien <lxntow at gmail.com> - 1.23.1-1
 - Update release.
 



From jorton at fedoraproject.org  Tue Apr 14 14:08:34 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Tue, 14 Apr 2009 14:08:34 +0000 (UTC)
Subject: rpms/webalizer/devel .cvsignore, 1.6, 1.7 sources, 1.5,
	1.6 webalizer.spec, 1.37, 1.38
Message-ID: <20090414140834.7489F700B2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/webalizer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3330

Modified Files:
	.cvsignore sources webalizer.spec 
Log Message:
- upload new source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Sep 2008 20:22:55 -0000	1.6
+++ .cvsignore	14 Apr 2009 14:08:03 -0000	1.7
@@ -3,3 +3,4 @@
 *.src.rpm
 x86_64
 webalizer-2.20-01-src.tgz
+webalizer-2.21-02-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2008 20:22:55 -0000	1.5
+++ sources	14 Apr 2009 14:08:03 -0000	1.6
@@ -1 +1 @@
-9a5e39b4f0e229a279d58f93b2fac28b  webalizer-2.20-01-src.tgz
+29af2558a5564493df654b6310b152e7  webalizer-2.21-02-src.tar.bz2


Index: webalizer.spec
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- webalizer.spec	14 Apr 2009 13:18:54 -0000	1.37
+++ webalizer.spec	14 Apr 2009 14:08:03 -0000	1.38
@@ -15,7 +15,6 @@
 Source2: webalizer.cron
 Source3: webalizer-httpd.conf
 Patch4: webalizer-2.21-02-underrun.patch
-Patch5: webalizer-2.01-10-ipv6.patch
 Patch6: webalizer-2.01_10-confuser.patch
 Patch9: webalizer-2.01-10-groupvisit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From cebbert at fedoraproject.org  Tue Apr 14 14:09:45 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 14:09:45 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch,
	NONE, 1.1 kernel.spec, 1.1539, 1.1540
Message-ID: <20090414140945.2C77E700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3747

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch 
Log Message:
Add missing patch for broken RLIMIT_CPU

linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 27 Mar 2009 00:06:07 +0000 (+0100)
Subject: posix-timers: fix RLIMIT_CPU && fork()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6279a751fe096a21dc7704e918d570d3ff06e769

posix-timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other expired cpu timers.

Change copy_signal() to set cputime_expires.prof_exp if we have RLIMIT_CPU.
Also, set cputimer.running = 1 in that case. This is not strictly necessary,
but imho makes sense.

Reported-by: Peter Lojkin <ia6432 at inbox.ru>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Cc: Peter Lojkin <ia6432 at inbox.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: stable at kernel.org
LKML-Reference: <20090327000607.GA10104 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 4854c2c..9b51a1b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -808,6 +808,12 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
 	sig->cputime_expires.virt_exp = cputime_zero;
 	sig->cputime_expires.sched_exp = 0;
 
+	if (sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) {
+		sig->cputime_expires.prof_exp =
+			secs_to_cputime(sig->rlim[RLIMIT_CPU].rlim_cur);
+		sig->cputimer.running = 1;
+	}
+
 	/* The timer lists. */
 	INIT_LIST_HEAD(&sig->cpu_timers[0]);
 	INIT_LIST_HEAD(&sig->cpu_timers[1]);
@@ -823,11 +829,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 		atomic_inc(&current->signal->live);
 		return 0;
 	}
-	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
-
-	if (sig)
-		posix_cpu_timers_init_group(sig);
 
+	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
 	tsk->signal = sig;
 	if (!sig)
 		return -ENOMEM;
@@ -865,6 +868,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 	memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim);
 	task_unlock(current->group_leader);
 
+	posix_cpu_timers_init_group(sig);
+
 	acct_init_pacct(&sig->pacct);
 
 	tty_audit_fork(sig);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1539
retrieving revision 1.1540
diff -u -r1.1539 -r1.1540
--- kernel.spec	14 Apr 2009 13:46:36 -0000	1.1539
+++ kernel.spec	14 Apr 2009 14:09:13 -0000	1.1540
@@ -727,7 +727,8 @@
 Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
 # make RLIMIT_CPU work again
 Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
+Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
@@ -1352,6 +1353,7 @@
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
@@ -1949,6 +1951,9 @@
 
 %changelog
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Add missing patch for broken RLIMIT_CPU
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix warnings/errors in USB cdc-acm modem driver (#495446)
 
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>



From pvrabec at fedoraproject.org  Tue Apr 14 14:12:18 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue, 14 Apr 2009 14:12:18 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.3-selinux.patch, NONE,
	1.1 shadow-4.1.3-redhat.patch, 1.1, 1.2 shadow-utils.spec, 1.129,
	1.130
Message-ID: <20090414141218.CBBF1700B2@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5008

Modified Files:
	shadow-4.1.3-redhat.patch shadow-utils.spec 
Added Files:
	shadow-4.1.3-selinux.patch 
Log Message:
- get "-n" option back
- fix selinux issues


shadow-4.1.3-selinux.patch:

--- NEW FILE shadow-4.1.3-selinux.patch ---
diff -up shadow-4.1.3/src/useradd.c.selinux shadow-4.1.3/src/useradd.c
--- shadow-4.1.3/src/useradd.c.selinux	2009-04-14 15:55:44.000000000 +0200
+++ shadow-4.1.3/src/useradd.c	2009-04-14 15:55:44.000000000 +0200
@@ -2011,9 +2011,7 @@ int main (int argc, char **argv)
 	close_files ();
 
 #ifdef WITH_SELINUX
-	if (Zflg) {
-		selinux_update_mapping ();
-	}
+	selinux_update_mapping ();
 #endif
 
 	nscd_flush_cache ("passwd");
diff -up shadow-4.1.3/src/userdel.c.selinux shadow-4.1.3/src/userdel.c
--- shadow-4.1.3/src/userdel.c.selinux	2009-04-11 18:52:42.000000000 +0200
+++ shadow-4.1.3/src/userdel.c	2009-04-14 16:01:10.000000000 +0200
@@ -797,17 +797,6 @@ int main (int argc, char **argv)
 	audit_help_open ();
 #endif
 
-#ifdef WITH_SELINUX
-	if (is_selinux_enabled () > 0) {
-		const char *args[5];
-		args[0] = "/usr/sbin/semanage";
-		args[1] = "login";
-		args[2] = "-d";
-		args[3] = user_name;
-		args[4] = NULL;
-		safe_system (args[0], args, NULL, 1);
-	}
-#endif
 	/*
 	 * Get my name so that I can use it to report errors.
 	 */
@@ -1010,6 +999,18 @@ int main (int argc, char **argv)
 	}
 #endif
 
+#ifdef WITH_SELINUX
+	if (is_selinux_enabled () > 0) {
+		const char *args[5];
+		args[0] = "/usr/sbin/semanage";
+		args[1] = "login";
+		args[2] = "-d";
+		args[3] = user_name;
+		args[4] = NULL;
+		safe_system (args[0], args, NULL, 1);
+	}
+#endif
+
 	/*
 	 * Cancel any crontabs or at jobs. Have to do this before we remove
 	 * the entry from /etc/passwd.

shadow-4.1.3-redhat.patch:

Index: shadow-4.1.3-redhat.patch
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-4.1.3-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shadow-4.1.3-redhat.patch	14 Apr 2009 10:19:14 -0000	1.1
+++ shadow-4.1.3-redhat.patch	14 Apr 2009 14:12:16 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up shadow-4.1.3-rc1/libmisc/find_new_gid.c.redhat shadow-4.1.3-rc1/libmisc/find_new_gid.c
---- shadow-4.1.3-rc1/libmisc/find_new_gid.c.redhat	2009-04-06 15:46:43.000000000 +0200
-+++ shadow-4.1.3-rc1/libmisc/find_new_gid.c	2009-04-06 15:48:29.000000000 +0200
+diff -up shadow-4.1.3/libmisc/find_new_gid.c.redhat shadow-4.1.3/libmisc/find_new_gid.c
+--- shadow-4.1.3/libmisc/find_new_gid.c.redhat	2009-04-11 17:55:13.000000000 +0200
++++ shadow-4.1.3/libmisc/find_new_gid.c	2009-04-14 14:49:34.000000000 +0200
 @@ -56,11 +56,11 @@ int find_new_gid (bool sys_group, gid_t 
  	assert (gid != NULL);
  
@@ -15,9 +15,9 @@
  		gid_max = getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
  	}
  	used_gids = alloca (sizeof (char) * gid_max +1);
-diff -up shadow-4.1.3-rc1/libmisc/find_new_uid.c.redhat shadow-4.1.3-rc1/libmisc/find_new_uid.c
---- shadow-4.1.3-rc1/libmisc/find_new_uid.c.redhat	2009-04-06 15:46:49.000000000 +0200
-+++ shadow-4.1.3-rc1/libmisc/find_new_uid.c	2009-04-06 15:48:46.000000000 +0200
+diff -up shadow-4.1.3/libmisc/find_new_uid.c.redhat shadow-4.1.3/libmisc/find_new_uid.c
+--- shadow-4.1.3/libmisc/find_new_uid.c.redhat	2009-04-11 17:53:19.000000000 +0200
++++ shadow-4.1.3/libmisc/find_new_uid.c	2009-04-14 14:49:34.000000000 +0200
 @@ -56,11 +56,11 @@ int find_new_uid (bool sys_user, uid_t *
  	assert (uid != NULL);
  
@@ -32,9 +32,9 @@
  		uid_max = getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
  	}
  	used_uids = alloca (sizeof (char) * uid_max +1);
-diff -up shadow-4.1.3-rc1/src/useradd.c.redhat shadow-4.1.3-rc1/src/useradd.c
---- shadow-4.1.3-rc1/src/useradd.c.redhat	2009-04-06 15:49:02.000000000 +0200
-+++ shadow-4.1.3-rc1/src/useradd.c	2009-04-06 15:55:22.000000000 +0200
+diff -up shadow-4.1.3/src/useradd.c.redhat shadow-4.1.3/src/useradd.c
+--- shadow-4.1.3/src/useradd.c.redhat	2009-04-11 20:39:52.000000000 +0200
++++ shadow-4.1.3/src/useradd.c	2009-04-14 14:58:17.000000000 +0200
 @@ -89,7 +89,7 @@ char *Prog;
  static gid_t def_group = 100;
  static const char *def_gname = "other";
@@ -53,3 +53,23 @@
  static uid_t user_id;
  static gid_t user_gid;
  static const char *user_comment = "";
+@@ -978,9 +978,9 @@ static void process_flags (int argc, cha
+ 		};
+ 		while ((c = getopt_long (argc, argv,
+ #ifdef WITH_SELINUX
+-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:",
++		                         "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:UZ:",
+ #else
+-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
++		                         "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:U",
+ #endif
+ 		                         long_options, NULL)) != -1) {
+ 			switch (c) {
+@@ -1130,6 +1130,7 @@ static void process_flags (int argc, cha
+ 			case 'M':
+ 				Mflg = true;
+ 				break;
++			case 'n':
+ 			case 'N':
+ 				Nflg = true;
+ 				break;


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- shadow-utils.spec	14 Apr 2009 10:19:14 -0000	1.129
+++ shadow-utils.spec	14 Apr 2009 14:12:16 -0000	1.130
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -9,6 +9,7 @@
 Source2: shadow-4.0.18.1-useradd
 Patch0: shadow-4.1.3-redhat.patch
 Patch1: shadow-4.1.3-goodname.patch
+Patch2: shadow-4.1.3-selinux.patch
 License: BSD and GPLv2+
 Group: System Environment/Base
 BuildRequires: libselinux-devel >= 1.25.2-1
@@ -35,6 +36,7 @@
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
+%patch2 -p1 -b .selinux
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -174,6 +176,10 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Tue Apr 14 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3-2
+- get "-n" option back
+- fix selinux issues
+
 * Tue Apr 14 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3-1
 - upgrade
 



From jwilson at fedoraproject.org  Tue Apr 14 14:14:12 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 14 Apr 2009 14:14:12 +0000 (UTC)
Subject: rpms/kernel/F-11
	squashfs-broken-when-pageszie-greater-than-blocksize.patch, NONE,
	1.1 TODO, 1.63, 1.64 config-generic, 1.274, 1.275 kernel.spec,
	1.1540, 1.1541
Message-ID: <20090414141412.29AD3700B2@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5955

Modified Files:
	TODO config-generic kernel.spec 
Added Files:
	squashfs-broken-when-pageszie-greater-than-blocksize.patch 
Log Message:
* Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
- Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)


squashfs-broken-when-pageszie-greater-than-blocksize.patch:

--- NEW FILE squashfs-broken-when-pageszie-greater-than-blocksize.patch ---
From: Doug Chapman <doug.chapman at hp.com>
To: fedora-kernel-list at redhat.com
Subject: [PATCH] squashfs broken when pageszie > blocksize

Not sure if we are too late for F11 on this or not but this patch
is needed to be able to mount squashfs (as used by anaconda) on
ia64.  Our goal is to be able to build Fedora on ia64 with no
custom SRPMs so it would be appreciated if this could be pulled
in.

--------------------

Squashfs is broken on any system where the pageszie is larger than either
the block size of the squashfs image or larger than the metadata size (8192).
This is easily fixed by ensuring cache->pages is always > 0.

Signed-off-by: Doug Chapman <doug.chapman at hp.com>
Cc: Phillip Lougher <phillip at lougher.demon.co.uk>

---
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 1c4739e..40c98fa 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -252,6 +252,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,
 	cache->entries = entries;
 	cache->block_size = block_size;
 	cache->pages = block_size >> PAGE_CACHE_SHIFT;
+	cache->pages = cache->pages ? cache->pages : 1;
 	cache->name = name;
 	cache->num_waiters = 0;
 	spin_lock_init(&cache->lock);


_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- TODO	8 Apr 2009 21:38:33 -0000	1.63
+++ TODO	14 Apr 2009 14:13:40 -0000	1.64
@@ -68,8 +68,11 @@
 	jarod working on upstreaming
 
 * drm-intel-lying-systems-without-lvds.patch
+	will be used as a fallback for 2.6.30 if vbios probing doesn't
+	pan out in time, may go to 2.6.29.x at some point (jarod's doing)
 * linux-2.6-acer-wmi-bail-on-aao.patch
-	jarod will send upstream shortly (so says he, on 20090303)
+	suck. something similar-but-less-pretty merged upstream on 20090304,
+	a day after I (jarod) wrote my version... Headed to stable too.
 
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- config-generic	13 Apr 2009 18:35:55 -0000	1.274
+++ config-generic	14 Apr 2009 14:13:40 -0000	1.275
@@ -3294,6 +3294,7 @@
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1540
retrieving revision 1.1541
diff -u -r1.1540 -r1.1541
--- kernel.spec	14 Apr 2009 14:09:13 -0000	1.1540
+++ kernel.spec	14 Apr 2009 14:13:40 -0000	1.1541
@@ -721,6 +721,8 @@
 # patches headed for -stable
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+# fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
+Patch6010: squashfs-broken-when-pageszie-greater-than-blocksize.patch
 # fix duplicated flags value
 Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 # fix posix clock monotonicity
@@ -1350,6 +1352,7 @@
 
 # patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+ApplyPatch squashfs-broken-when-pageszie-greater-than-blocksize.patch
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
@@ -1950,6 +1953,9 @@
 # and build.
 
 %changelog
+* Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
+- Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - Add missing patch for broken RLIMIT_CPU
 



From rdieter at fedoraproject.org  Tue Apr 14 14:14:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 14:14:16 +0000 (UTC)
Subject: rpms/amarok/EL-5 amarok.spec,1.85,1.86
Message-ID: <20090414141416.DD3D7700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5877/EL-5

Modified Files:
	amarok.spec 
Log Message:
fix libmtp version check



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- amarok.spec	14 Apr 2009 13:56:45 -0000	1.85
+++ amarok.spec	14 Apr 2009 14:13:46 -0000	1.86
@@ -155,7 +155,7 @@
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
 
-%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.2.0"
+%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.3.0"
 %patch3 -p1 -b .libmtp03
 %endif
 



From rdieter at fedoraproject.org  Tue Apr 14 14:14:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 14:14:17 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok.spec,1.117,1.118
Message-ID: <20090414141417.2A40F700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5877/F-9

Modified Files:
	amarok.spec 
Log Message:
fix libmtp version check



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- amarok.spec	14 Apr 2009 13:58:36 -0000	1.117
+++ amarok.spec	14 Apr 2009 14:13:46 -0000	1.118
@@ -155,7 +155,7 @@
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
 
-%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.2.0"
+%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.3.0"
 %patch3 -p1 -b .libmtp03
 %endif
 



From hadess at fedoraproject.org  Tue Apr 14 14:14:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 14 Apr 2009 14:14:36 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.73,1.74
Message-ID: <20090414141436.EBC32700B2@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5937

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Fix docs build



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-bluetooth.spec	14 Apr 2009 13:57:34 -0000	1.73
+++ gnome-bluetooth.spec	14 Apr 2009 14:14:06 -0000	1.74
@@ -84,9 +84,30 @@
 	--dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/	\
 	$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 
+# gnome-bluetooth2 is the name for the gettext domain,
+# gnome-bluetooth is the name in the docs
 %find_lang gnome-bluetooth2
+%find_lang %{name} --with-gnome
+cat %{name}.lang >> gnome-bluetooth2.lang
+
+# save space by linking identical images in translated docs
+helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
+for f in $helpdir/C/figures/*.png; do
+  b="$(basename $f)"
+  for d in $helpdir/*; do
+    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
+      g="$d/figures/$b"
+      if [ -f "$g" ]; then
+        if cmp -s $f $g; then
+          rm "$g"; ln -s "../../C/figures/$b" "$g"
+        fi
+      fi
+    fi
+  done
+done
 
 %post
+scrollkeeper-update -q
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule					\
@@ -125,6 +146,7 @@
 fi
 
 %postun
+scrollkeeper-update -q
 update-desktop-database -q
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor



From nphilipp at fedoraproject.org  Tue Apr 14 14:15:32 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 14:15:32 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.188,1.189
Message-ID: <20090414141532.6E81770127@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6562

Modified Files:
	gimp.spec 
Log Message:
build without rpath (#495670)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- gimp.spec	30 Mar 2009 12:41:53 -0000	1.188
+++ gimp.spec	14 Apr 2009 14:15:01 -0000	1.189
@@ -24,7 +24,7 @@
 Name:           gimp
 Epoch:          2
 Version:        2.6.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -235,6 +235,9 @@
     --with-gtkhtml2 --with-librsvg --with-poppler --with-gnomevfs --with-alsa \
     --with-webkit --with-dbus --with-script-fu
 
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 # convenience stuff for external plugins (e.g. xsane)
@@ -471,6 +474,9 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-3
+- build without rpath (#495670)
+
 * Mon Mar 30 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-2
 - minimize dialogs with single image window (#492796, backported from trunk,
   original patch by Sven Neumann)



From cebbert at fedoraproject.org  Tue Apr 14 14:17:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 14:17:07 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch,
	NONE, 1.1 kernel.spec, 1.1328, 1.1329
Message-ID: <20090414141707.1716F70137@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7540

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch 
Log Message:
Add missing patch for broken RLIMIT_CPU

linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 27 Mar 2009 00:06:07 +0000 (+0100)
Subject: posix-timers: fix RLIMIT_CPU && fork()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6279a751fe096a21dc7704e918d570d3ff06e769

posix-timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other expired cpu timers.

Change copy_signal() to set cputime_expires.prof_exp if we have RLIMIT_CPU.
Also, set cputimer.running = 1 in that case. This is not strictly necessary,
but imho makes sense.

Reported-by: Peter Lojkin <ia6432 at inbox.ru>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Cc: Peter Lojkin <ia6432 at inbox.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: stable at kernel.org
LKML-Reference: <20090327000607.GA10104 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 4854c2c..9b51a1b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -808,6 +808,12 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
 	sig->cputime_expires.virt_exp = cputime_zero;
 	sig->cputime_expires.sched_exp = 0;
 
+	if (sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) {
+		sig->cputime_expires.prof_exp =
+			secs_to_cputime(sig->rlim[RLIMIT_CPU].rlim_cur);
+		sig->cputimer.running = 1;
+	}
+
 	/* The timer lists. */
 	INIT_LIST_HEAD(&sig->cpu_timers[0]);
 	INIT_LIST_HEAD(&sig->cpu_timers[1]);
@@ -823,11 +829,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 		atomic_inc(&current->signal->live);
 		return 0;
 	}
-	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
-
-	if (sig)
-		posix_cpu_timers_init_group(sig);
 
+	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
 	tsk->signal = sig;
 	if (!sig)
 		return -ENOMEM;
@@ -865,6 +868,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 	memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim);
 	task_unlock(current->group_leader);
 
+	posix_cpu_timers_init_group(sig);
+
 	acct_init_pacct(&sig->pacct);
 
 	tty_audit_fork(sig);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1328
retrieving revision 1.1329
diff -u -r1.1328 -r1.1329
--- kernel.spec	14 Apr 2009 13:39:50 -0000	1.1328
+++ kernel.spec	14 Apr 2009 14:16:35 -0000	1.1329
@@ -703,7 +703,8 @@
 Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
 # make RLIMIT_CPU work again
 Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
+Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -1299,6 +1300,7 @@
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 # we need squashfs3 for Fedora-10
@@ -1890,6 +1892,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-28
+- Add missing patch for broken RLIMIT_CPU
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-27
 - Fix warnings/errors in USB cdc-acm modem driver (F11#495446)
 



From mmaslano at fedoraproject.org  Tue Apr 14 14:17:11 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 14 Apr 2009 14:17:11 +0000 (UTC)
Subject: rpms/anacron/devel anacron-2.3-range-rnd.patch, 1.1,
	1.2 anacron.spec, 1.63, 1.64
Message-ID: <20090414141711.88A0A70137@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7644

Modified Files:
	anacron-2.3-range-rnd.patch anacron.spec 
Log Message:
* Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-74
- 495333 fix ungrammatical job(s) in log


anacron-2.3-range-rnd.patch:

Index: anacron-2.3-range-rnd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron-2.3-range-rnd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anacron-2.3-range-rnd.patch	27 Mar 2009 09:43:13 -0000	1.1
+++ anacron-2.3-range-rnd.patch	14 Apr 2009 14:16:40 -0000	1.2
@@ -90,7 +90,7 @@
      }
      wait_children();
 -    explain("Normal exit (%d job%s run)", njobs, (njobs == 1 ? "" : "s"));
-+    explain("Normal exit (%d job%s run)", njobs-dropped_jobs, (njobs == 1 ? "" : "s"));
++    explain("Normal exit (%d job%s run)", njobs-dropped_jobs, (njobs-dropped_jobs == 1 ? "" : "s"));
      exit(0);
  }
 diff -up anacron-2.3.new/global.h.range-rnd anacron-2.3.new/global.h


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- anacron.spec	27 Mar 2009 09:43:13 -0000	1.63
+++ anacron.spec	14 Apr 2009 14:16:40 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 73%{?dist}
+Release: 74%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -92,6 +92,9 @@
 %attr(755,root,root) /etc/cron.hourly/0anacron
 
 %changelog
+* Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-74
+- 495333 fix ungrammatical job(s) in log
+
 * Fri Mar 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-73
 - rewrite the range and random patches with checking log to one 
   more lucid with help of tmraz.



From jwilson at fedoraproject.org  Tue Apr 14 14:18:28 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 14 Apr 2009 14:18:28 +0000 (UTC)
Subject: rpms/kernel/F-11
	squashfs-broken-when-pagesize-greater-than-blocksize.patch, NONE,
	1.1 kernel.spec, 1.1541,
	1.1542 squashfs-broken-when-pageszie-greater-than-blocksize.patch,
	1.1, NONE
Message-ID: <20090414141828.A0D90700B2@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8977

Modified Files:
	kernel.spec 
Added Files:
	squashfs-broken-when-pagesize-greater-than-blocksize.patch 
Removed Files:
	squashfs-broken-when-pageszie-greater-than-blocksize.patch 
Log Message:
fix incredibly important spelling error

squashfs-broken-when-pagesize-greater-than-blocksize.patch:

--- NEW FILE squashfs-broken-when-pagesize-greater-than-blocksize.patch ---
From: Doug Chapman <doug.chapman at hp.com>
To: fedora-kernel-list at redhat.com
Subject: [PATCH] squashfs broken when pageszie > blocksize

Not sure if we are too late for F11 on this or not but this patch
is needed to be able to mount squashfs (as used by anaconda) on
ia64.  Our goal is to be able to build Fedora on ia64 with no
custom SRPMs so it would be appreciated if this could be pulled
in.

--------------------

Squashfs is broken on any system where the pageszie is larger than either
the block size of the squashfs image or larger than the metadata size (8192).
This is easily fixed by ensuring cache->pages is always > 0.

Signed-off-by: Doug Chapman <doug.chapman at hp.com>
Cc: Phillip Lougher <phillip at lougher.demon.co.uk>

---
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 1c4739e..40c98fa 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -252,6 +252,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,
 	cache->entries = entries;
 	cache->block_size = block_size;
 	cache->pages = block_size >> PAGE_CACHE_SHIFT;
+	cache->pages = cache->pages ? cache->pages : 1;
 	cache->name = name;
 	cache->num_waiters = 0;
 	spin_lock_init(&cache->lock);


_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1541
retrieving revision 1.1542
diff -u -r1.1541 -r1.1542
--- kernel.spec	14 Apr 2009 14:13:40 -0000	1.1541
+++ kernel.spec	14 Apr 2009 14:18:25 -0000	1.1542
@@ -722,7 +722,7 @@
 # fix oops in md raid1 (#495550)
 Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
 # fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
-Patch6010: squashfs-broken-when-pageszie-greater-than-blocksize.patch
+Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
 # fix duplicated flags value
 Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 # fix posix clock monotonicity
@@ -1352,7 +1352,7 @@
 
 # patches headed for -stable
 ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-ApplyPatch squashfs-broken-when-pageszie-greater-than-blocksize.patch
+ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch


--- squashfs-broken-when-pageszie-greater-than-blocksize.patch DELETED ---



From harald at fedoraproject.org  Tue Apr 14 14:18:28 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 14 Apr 2009 14:18:28 +0000 (UTC)
Subject: rpms/system-config-network/devel .cvsignore, 1.31, 1.32 sources,
	1.34, 1.35 system-config-network.spec, 1.48, 1.49
Message-ID: <20090414141828.BA06E70137@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8578

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
* Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 1.5.97-1
- translation update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	17 Dec 2008 12:32:00 -0000	1.31
+++ .cvsignore	14 Apr 2009 14:17:56 -0000	1.32
@@ -1 +1 @@
-system-config-network-1.5.95.tar.bz2
+system-config-network-1.5.97.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	17 Dec 2008 12:32:01 -0000	1.34
+++ sources	14 Apr 2009 14:17:57 -0000	1.35
@@ -1 +1 @@
-78368afadf73b3149a2b30ed24e99c71  system-config-network-1.5.95.tar.bz2
+eb3d4d9f61c42e24d32cce719af0a739  system-config-network-1.5.97.tar.bz2


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- system-config-network.spec	26 Feb 2009 05:12:01 -0000	1.48
+++ system-config-network.spec	14 Apr 2009 14:17:57 -0000	1.49
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.5.95
-Release: 2%{?dist}
+Version: 1.5.97
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -26,7 +26,7 @@
 Group: Applications/System 
 Obsoletes: netcfg <= 2.36-3p redhat-config-network-tui <= %{version} netconf <= 0.1-1 netconfig <= 0.8.24-1.2.2.1
 Provides: redhat-config-network-tui = %{version} netcfg = 2.36-3p.1 netconf = 0.1-1.1 netconfig = 0.8.24-1.2.2.1.1
-Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils, usermode, dbus-python
+Requires: initscripts >= 0:5.99, usermode , python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils, usermode, dbus-python
 
 %description tui
 This is the network configuration tool,
@@ -102,8 +102,15 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.95-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 1.5.97-1
+- translation update
+
+* Wed Feb 18 2009 Harald Hoyer <harald at redhat.com> 1.5.96-1
+- translation update (harald)
+- added DNS1 and DNS2 to the device specific config (harald)
+- do not raise NotImplementedError for getDialog (harald)
+- DSN -> DNS typo (harald)
+- NotImplemented -> NotImplementedError (harald)
 
 * Fri Dec 12 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.5.95-1
 - New version 1.5.95



From mmcgrath at fedoraproject.org  Tue Apr 14 14:21:28 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue, 14 Apr 2009 14:21:28 +0000 (UTC)
Subject: rpms/smolt/devel smolt.spec,1.63,1.64
Message-ID: <20090414142128.AEE5A700B2@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10254

Modified Files:
	smolt.spec 
Log Message:
removing fake attack


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- smolt.spec	13 Mar 2009 19:52:08 -0000	1.63
+++ smolt.spec	14 Apr 2009 14:21:26 -0000	1.64
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 1.2
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -133,7 +133,6 @@
 
 %post
 /sbin/chkconfig --add smolt
-echo 'This is a fake attack.  If you see it please email me at mmcgrath at redhat.com and tell me' >> /dev/null
 
 #Randomize checkin times.
 TMPFILE=$(/bin/mktemp /tmp/smolt.XXXXX)
@@ -180,6 +179,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Tue Apr 14 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-4.2
+- Removed fake attack
+
 * Fri Mar 13 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-4.1
 - Fixed some formatting in the spec file
 - Added note to %post



From kwizart at fedoraproject.org  Tue Apr 14 14:23:12 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 14 Apr 2009 14:23:12 +0000 (UTC)
Subject: rpms/lcdproc/devel lcdproc-0.5.2-initscripts.patch, 1.5,
	1.6 lcdproc.spec, 1.13, 1.14
Message-ID: <20090414142313.09A09700B2@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855

Modified Files:
	lcdproc-0.5.2-initscripts.patch lcdproc.spec 
Log Message:
- Disable default configuration (only provided as examples)


lcdproc-0.5.2-initscripts.patch:

Index: lcdproc-0.5.2-initscripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc-0.5.2-initscripts.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lcdproc-0.5.2-initscripts.patch	5 Mar 2009 10:15:49 -0000	1.5
+++ lcdproc-0.5.2-initscripts.patch	14 Apr 2009 14:23:10 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/scripts/init-LCDd.LSB.in
 --- lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
-+++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-03-05 11:11:24.000000000 +0100
++++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-04-14 16:15:46.000000000 +0200
 @@ -1,10 +1,18 @@
  #! /bin/sh
 +#
@@ -22,7 +22,7 @@
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc Server Daemon
  # Description:       LSB init script for LCDd, the display
-@@ -12,57 +20,59 @@
+@@ -12,57 +20,62 @@
  ### END INIT INFO
  
  
@@ -44,30 +44,32 @@
 -if [ -e "${DEFAULTS}" ]; then
 -  . "${DEFAULTS}"
 -fi
--
--# If we're not to start the daemon, simply exit
--if [ "${START}" != "yes" ]; then
--    exit 0
--fi
 +prog=LCDd
 +lockfile=/var/lock/subsys/$prog
 +configfile=@sysconfdir@/$prog.conf
 +RETVAL=0
++
  
--# installation check
--test -x $DAEMON || exit 5
- 
- # load LSB 3.x init functions
--. /lib/lsb/init-functions
+-# If we're not to start the daemon, simply exit
+-if [ "${START}" != "yes" ]; then
+-    exit 0
++# load LSB 3.x init functions
 +if [ -e /lib/lsb/init-functions ]; then
 +  . /lib/lsb/init-functions
-+fi
-+
+ fi
+ 
+-# installation check
+-test -x $DAEMON || exit 5
 +# Source function library.
 +if [ -e /etc/rc.d/init.d/functions ]; then
 +  . /etc/rc.d/init.d/functions
 +fi
  
+-# load LSB 3.x init functions
+-. /lib/lsb/init-functions
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
+ 
  
  case "$1" in
    start)
@@ -124,7 +126,7 @@
 +exit $RETVAL
 diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scripts/init-lcdproc.LSB.in
 --- lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
-+++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-03-05 11:12:01.000000000 +0100
++++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-04-14 16:16:19.000000000 +0200
 @@ -1,10 +1,19 @@
  #! /bin/sh
 +#
@@ -147,7 +149,7 @@
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc system status information viewer
  # Description:       LSB init script for lcdproc, the system
-@@ -12,57 +21,58 @@
+@@ -12,57 +21,60 @@
  ### END INIT INFO
  
  
@@ -192,6 +194,8 @@
 +  . /etc/rc.d/init.d/functions
 +fi
  
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
  
  case "$1" in
    start)


Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lcdproc.spec	14 Apr 2009 13:47:47 -0000	1.13
+++ lcdproc.spec	14 Apr 2009 14:23:10 -0000	1.14
@@ -99,6 +99,15 @@
 install -pm 0755 scripts/init-LCDd.LSB  $RPM_BUILD_ROOT%{_initrddir}/LCDd
 install -pm 0755 scripts/init-lcdproc.LSB  $RPM_BUILD_ROOT%{_initrddir}/lcdproc
 
+#Disable default configuration
+#Thoses are only provided as an example since ncurses isn't a suitable default configuration.
+for f in LCDd.conf lcdproc.conf ; do
+mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}.example
+touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}
+done
+
+
 
 
 %post
@@ -132,7 +141,8 @@
 %{_sbindir}/*
 %{_mandir}/man?/*
 %dir %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}/*.conf
+%ghost %{_sysconfdir}/sysconfig/%{name}/*.conf
+%config %{_sysconfdir}/sysconfig/%{name}/*.conf.example
 %{_initrddir}/LCDd
 %{_initrddir}/lcdproc
 
@@ -140,6 +150,7 @@
 %changelog
 * Tue Apr 14 2009 kwizart < kwizart at gmail.com > - 0.5.2-11
 - Disable xmlto validation (Fix FTBFS)
+- Disable default configuration (only provided as examples)
 
 * Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 0.5.2-10
 - Disable LCDd lcdproc initscript by default.



From iarnell at fedoraproject.org  Tue Apr 14 14:25:56 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 14 Apr 2009 14:25:56 +0000 (UTC)
Subject: rpms/perl-File-Pid/F-10 perl-File-Pid.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414142556.1B93A700B2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-File-Pid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11927/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Pid.spec 
Log Message:
initial import


--- NEW FILE perl-File-Pid.spec ---
Name:           perl-File-Pid
Version:        1.01
Release:        1%{?dist}
Summary:        Pid File Manipulation
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-Pid/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/File-Pid-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Fast) >= 0.19
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(Class::Accessor::Fast) >= 0.19
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This software manages a pid file for you. It will create a pid file,
query the process within to discover if it's still running, and remove
the pid file.

%prep
%setup -q -n File-Pid-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 1.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Pid/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 04:50:15 -0000	1.1
+++ .cvsignore	14 Apr 2009 14:25:25 -0000	1.2
@@ -0,0 +1 @@
+File-Pid-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Pid/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 04:50:15 -0000	1.1
+++ sources	14 Apr 2009 14:25:25 -0000	1.2
@@ -0,0 +1 @@
+d927b40215cbfbff233d9feb53529532  File-Pid-1.01.tar.gz



From iarnell at fedoraproject.org  Tue Apr 14 14:25:56 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 14 Apr 2009 14:25:56 +0000 (UTC)
Subject: rpms/perl-File-Pid/devel perl-File-Pid.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414142556.99BA4700B2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-File-Pid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11927/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Pid.spec 
Log Message:
initial import


--- NEW FILE perl-File-Pid.spec ---
Name:           perl-File-Pid
Version:        1.01
Release:        1%{?dist}
Summary:        Pid File Manipulation
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-Pid/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/File-Pid-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Fast) >= 0.19
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(Class::Accessor::Fast) >= 0.19
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This software manages a pid file for you. It will create a pid file,
query the process within to discover if it's still running, and remove
the pid file.

%prep
%setup -q -n File-Pid-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 1.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Pid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 04:50:15 -0000	1.1
+++ .cvsignore	14 Apr 2009 14:25:26 -0000	1.2
@@ -0,0 +1 @@
+File-Pid-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Pid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 04:50:15 -0000	1.1
+++ sources	14 Apr 2009 14:25:26 -0000	1.2
@@ -0,0 +1 @@
+d927b40215cbfbff233d9feb53529532  File-Pid-1.01.tar.gz



From cebbert at fedoraproject.org  Tue Apr 14 14:27:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 14:27:55 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1329,1.1330
Message-ID: <20090414142755.77704700B2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12636

Modified Files:
	kernel.spec 
Log Message:
fix changelog versions


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1329
retrieving revision 1.1330
diff -u -r1.1329 -r1.1330
--- kernel.spec	14 Apr 2009 14:16:35 -0000	1.1329
+++ kernel.spec	14 Apr 2009 14:27:24 -0000	1.1330
@@ -1892,34 +1892,34 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-28
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-30
 - Add missing patch for broken RLIMIT_CPU
 
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-27
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-28
 - Fix warnings/errors in USB cdc-acm modem driver (F11#495446)
 
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-26
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-27
 - Timer fixes headed for -stable
 
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-25
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-26
 - Fix duplicated flag value in pagemap.h (-stable patch)
 
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-24
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-25
 - Blacklist acer-wmi on the AAO to fix rfkill switch problems
 
-* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-23
+* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-24
 - radeon: add some more kms fixes backported from F11
 
-* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-22
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-23
 - Fix oops in md raid1 resync (F11#495550)
 
-* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-21
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-22
 - Copy ALSA pulseaudio fixes from F-11.
 
-* Mon Apr 13 2009 John W. Linville <linville at redhat.com>  2.6.29.1-20
+* Mon Apr 13 2009 John W. Linville <linville at redhat.com>  2.6.29.1-21
 - Remove iwl3945: rely on priv->lock to protect priv access
 
-* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-19
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-20
 - Copy Intel iommu fixes, backported from 2.6.30, from F-11 kernel.
 
 * Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-18



From dnovotny at fedoraproject.org  Tue Apr 14 14:41:18 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 14 Apr 2009 14:41:18 +0000 (UTC)
Subject: rpms/amanda/devel amanda.spec,1.58,1.59
Message-ID: <20090414144118.D00A9700B2@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16821

Modified Files:
	amanda.spec 
Log Message:

fix #495724



Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- amanda.spec	8 Apr 2009 13:12:36 -0000	1.58
+++ amanda.spec	14 Apr 2009 14:40:46 -0000	1.59
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -167,7 +167,7 @@
 usermod -l %amanda_user amanda >/dev/null 2>&1 &&
 mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null
 
-/usr/sbin/useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
+/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
 	-c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
 
 %post
@@ -375,6 +375,9 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Tue Apr 14 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-8
+- fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") 
+
 * Wed Apr 08 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-7
 - the tcpport patch was lost after rebase, adding again
   (#448071, #462681)



From rstrode at fedoraproject.org  Tue Apr 14 14:42:18 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 14 Apr 2009 14:42:18 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec, 1.462, 1.463 gdm-2.25.2-append-logs.patch, 
	1.1, NONE gdm-2.25.2-dont-depend-on-hostname.patch, 1.3,
	NONE gdm-2.25.2-maybe-work-around-gcc-bug.patch, 1.1,
	NONE gdm-2.25.2-multistack-but-boring.patch, 1.11,
	NONE gdm-2.25.2-start-faster.patch, 1.1,
	NONE gdm-2.26.0-clean-up-auth-entries.patch, 1.1,
	NONE gdm-2.26.0-load-settings-for-other-user.patch, 1.1,
	NONE xkb-groups.patch, 1.2, NONE
Message-ID: <20090414144218.45EEC700B2@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17162

Modified Files:
	gdm.spec 
Removed Files:
	gdm-2.25.2-append-logs.patch 
	gdm-2.25.2-dont-depend-on-hostname.patch 
	gdm-2.25.2-maybe-work-around-gcc-bug.patch 
	gdm-2.25.2-multistack-but-boring.patch 
	gdm-2.25.2-start-faster.patch 
	gdm-2.26.0-clean-up-auth-entries.patch 
	gdm-2.26.0-load-settings-for-other-user.patch xkb-groups.patch 
Log Message:
- Update to 2.26.1



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- gdm.spec	13 Apr 2009 21:41:02 -0000	1.462
+++ gdm.spec	14 Apr 2009 14:41:47 -0000	1.463
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.26.0
-Release: 8%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -91,20 +91,11 @@
 Requires: audit-libs >= %{libauditver}
 Patch2: gdm-2.26.0-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
-Patch4: gdm-2.25.2-append-logs.patch
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
 
-Patch15: gdm-2.25.2-start-faster.patch
-
-Patch16: gdm-2.25.2-dont-depend-on-hostname.patch
-
-# http://bugzilla.redhat.com/show_bug.cgi?id=485974
-Patch17: gdm-2.26.0-clean-up-auth-entries.patch
-
-Patch18: gdm-2.26.0-load-settings-for-other-user.patch
 Patch19: gdm-2.26.0-multistack.patch
 
 # Fedora-specific
@@ -145,13 +136,8 @@
 %setup -q
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
-%patch4 -p1 -b .append-logs
 %patch13 -p1 -b .system-keyboard
 
-%patch15 -p1 -b .start-faster
-%patch16 -p1 -b .dont-depend-on-hostname
-%patch17 -p1 -b .clean-up-auth-entries
-%patch18 -p1 -b .load-settings-for-other-user
 %patch19 -p1 -b .multistack
 
 %patch99 -p1 -b .fedora-logo
@@ -394,6 +380,9 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Apr 14 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+
 * Mon Apr 13 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.0-8
 - Add less boring multistack patch for testing
 


--- gdm-2.25.2-append-logs.patch DELETED ---


--- gdm-2.25.2-dont-depend-on-hostname.patch DELETED ---


--- gdm-2.25.2-maybe-work-around-gcc-bug.patch DELETED ---


--- gdm-2.25.2-multistack-but-boring.patch DELETED ---


--- gdm-2.25.2-start-faster.patch DELETED ---


--- gdm-2.26.0-clean-up-auth-entries.patch DELETED ---


--- gdm-2.26.0-load-settings-for-other-user.patch DELETED ---


--- xkb-groups.patch DELETED ---



From kyle at fedoraproject.org  Tue Apr 14 14:44:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 14 Apr 2009 14:44:24 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc1-git7.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1048, 1.1049 Makefile, 1.102, 1.103 config-generic, 1.278,
	1.279 kernel.spec, 1.1516, 1.1517 sources, 1.1010,
	1.1011 upstream, 1.921, 1.922 patch-2.6.30-rc1-git5.bz2.sign,
	1.1, NONE
Message-ID: <20090414144425.039E5700B2@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18090

Modified Files:
	.cvsignore Makefile config-generic kernel.spec sources 
	upstream 
Added Files:
	patch-2.6.30-rc1-git7.bz2.sign 
Removed Files:
	patch-2.6.30-rc1-git5.bz2.sign 
Log Message:
* Tue Apr 14 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.30-rc1-git7
- CONFIG_TOUCHSCREEN_AD7879_I2C=m
- CONFIG_STRIP_ASM_SYMS=y, off for -debug



--- NEW FILE patch-2.6.30-rc1-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ5HwvyGugalF9Dw4RAnFMAJ929BUZksXLYcLEy00IEbhG7Ds0QQCcCf8k
3MrHQwB6RGq2PNpW7DK1ipo=
=wyJl
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1048
retrieving revision 1.1049
diff -u -r1.1048 -r1.1049
--- .cvsignore	13 Apr 2009 02:33:45 -0000	1.1048
+++ .cvsignore	14 Apr 2009 14:43:53 -0000	1.1049
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc1.bz2
-patch-2.6.30-rc1-git5.bz2
+patch-2.6.30-rc1-git7.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Makefile	8 Apr 2009 15:39:50 -0000	1.102
+++ Makefile	14 Apr 2009 14:43:53 -0000	1.103
@@ -71,6 +71,7 @@
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
+	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -116,6 +117,7 @@
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
+	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- config-generic	9 Apr 2009 21:09:52 -0000	1.278
+++ config-generic	14 Apr 2009 14:43:53 -0000	1.279
@@ -1835,6 +1835,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
@@ -3948,3 +3949,4 @@
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRASH is not set
 
+CONFIG_STRIP_ASM_SYMS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1516
retrieving revision 1.1517
diff -u -r1.1516 -r1.1517
--- kernel.spec	13 Apr 2009 04:57:15 -0000	1.1516
+++ kernel.spec	14 Apr 2009 14:43:53 -0000	1.1517
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 5
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1827,6 +1827,11 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 14 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc1-git7
+- CONFIG_TOUCHSCREEN_AD7879_I2C=m
+- CONFIG_STRIP_ASM_SYMS=y, off for -debug
+
 * Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
 - ppc-fix-parport_pc.patch: add from linuxppc-dev@
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -r1.1010 -r1.1011
--- sources	13 Apr 2009 02:33:46 -0000	1.1010
+++ sources	14 Apr 2009 14:43:54 -0000	1.1011
@@ -1,3 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 05daeda25430fd13bbdb47b3481f7320  patch-2.6.30-rc1.bz2
-34427f7c541ea93766ff67fbc7d48863  patch-2.6.30-rc1-git5.bz2
+1fcc13228f445829af1e67b291cecebc  patch-2.6.30-rc1-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- upstream	13 Apr 2009 02:33:47 -0000	1.921
+++ upstream	14 Apr 2009 14:43:54 -0000	1.922
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc1.bz2
-patch-2.6.30-rc1-git5.bz2
+patch-2.6.30-rc1-git7.bz2


--- patch-2.6.30-rc1-git5.bz2.sign DELETED ---



From jreznik at fedoraproject.org  Tue Apr 14 14:49:25 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 14 Apr 2009 14:49:25 +0000 (UTC)
Subject: rpms/system-config-bind/devel .cvsignore, 1.38, 1.39 sources, 1.55, 
	1.56 system-config-bind.spec, 1.82,
	1.83 system-config-bind-4.0.11-modal-dialog.patch, 1.1, NONE
Message-ID: <20090414144925.6336E70127@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19726

Modified Files:
	.cvsignore sources system-config-bind.spec 
Removed Files:
	system-config-bind-4.0.11-modal-dialog.patch 
Log Message:
* Tue Apr 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.12-1
- update to 4.0.12
- startup crash (rhbz#495599)
- fix dnssec support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	16 Sep 2008 07:06:21 -0000	1.38
+++ .cvsignore	14 Apr 2009 14:48:54 -0000	1.39
@@ -1 +1 @@
-system-config-bind-4.0.11.tar.gz
+system-config-bind-4.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	16 Sep 2008 07:06:21 -0000	1.55
+++ sources	14 Apr 2009 14:48:54 -0000	1.56
@@ -1 +1 @@
-52f7916994666c8f8238fbb6e623e9b5  system-config-bind-4.0.11.tar.gz
+f420cf46ed7ad82215bd9e4c5ebb53f1  system-config-bind-4.0.12.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- system-config-bind.spec	26 Feb 2009 04:58:30 -0000	1.82
+++ system-config-bind.spec	14 Apr 2009 14:48:54 -0000	1.83
@@ -1,12 +1,11 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
-Version:        4.0.11
-Release:        6%{?dist}
+Version:        4.0.12
+Release:        1%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
 Group:          Applications/System
 Source0:        https://fedorahosted.org/releases/s/y/system-config-bind/%{name}-%{version}.tar.gz
-Patch0:		system-config-bind-4.0.11-modal-dialog.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  python, gettext, make, intltool, desktop-file-utils
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .modal-dialog
 
 %build
 make 
@@ -83,6 +81,11 @@
 fi;
 
 %changelog
+* Tue Apr 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.12-1
+- update to 4.0.12
+- startup crash (rhbz#495599)
+- fix dnssec support
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- system-config-bind-4.0.11-modal-dialog.patch DELETED ---



From jmoskovc at fedoraproject.org  Tue Apr 14 14:54:34 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 14 Apr 2009 14:54:34 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.3, 1.4 abrt.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20090414145434.CD59A700B2@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21633

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
New version 0.0.3
Added BZ plugin
Many bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Mar 2009 10:13:10 -0000	1.3
+++ .cvsignore	14 Apr 2009 14:54:04 -0000	1.4
@@ -1 +1 @@
-abrt-0.0.2.tar.gz
+abrt-0.0.3.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- abrt.spec	12 Mar 2009 10:13:10 -0000	1.4
+++ abrt.spec	14 Apr 2009 14:54:04 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 0.0.2
+Version: 0.0.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -13,6 +13,10 @@
 BuildRequires: rpm-devel >= 4.6
 BuildRequires: sqlite-devel > 3.0
 BuildRequires: desktop-file-utils
+BuildRequires: nss-devel
+BuildRequires: libnotify-devel
+BuildRequires: xmlrpc-c-devel
+BuildRequires: file-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -61,17 +65,17 @@
 
 %description addon-ccpp
 This package contains hook for C/C++ crashed programs and %{name}'s C/C++ 
-language plugin.
+analyzer plugin.
 
-%package addon-kerneloops
-Summary: %{name}'s kerneloops addon
+%package plugin-kerneloops
+Summary: %{name}'s kerneloops plugin
 Group: System Environment/Libraries
 Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
-%description addon-kerneloops
-This package contains hook for kernel crashes information collecting.
-Application plugin.
+%description plugin-kerneloops
+This package contains plugin for kernel crashes information collecting.
+analyzer plugin.
 
 %package plugin-kerneloopsreporter
 Summary: %{name}'s kerneloops reporter plugin
@@ -110,6 +114,22 @@
 The simple reporter plugin, which sends a report via mailx to a specified
 email. 
 
+%package plugin-runapp
+Summary: %{name}'s runapp plugin
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-runapp
+Plugin to run external programs.
+
+%package plugin-bugzilla
+Summary: %{name}'s bugzilla plugin
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-bugzilla
+Plugin to report bugs into the bugzilla.
+
 %prep
 %setup -q
 
@@ -184,11 +204,10 @@
 %{_libdir}/%{name}/libCCpp.so*
 %{_libexecdir}/hookCCpp
 
-%files addon-kerneloops
+%files plugin-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf
 %{_libdir}/%{name}/libKerneloops.so*
-%{_libexecdir}/hookKerneloops
 
 %files plugin-kerneloopsreporter
 %defattr(-,root,root,-)
@@ -210,10 +229,49 @@
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf
 %{_libdir}/%{name}/libMailx.so*
 
+%files plugin-runapp
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libRunApp.so*
+
+%files plugin-bugzilla
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf
+%{_libdir}/%{name}/libBugzilla.so*
+
 %changelog
-* Wed Mar 11 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.2-1
+* Fri Apr 10 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.3-1
 - new version
-- removed unneeded patch for rpm 4.7
+- added bz plugin
+- minor fix in reporter gui
+- Configurable max size of debugdump storage rhbz#490889
+- Wrap lines in report to keep the window sane sized
+- Fixed gui for new daemon API
+- removed unneeded code
+- removed dependency on args
+- new guuid hash creating
+- fixed local UUID
+- fixed debuginfo-install checks
+- renamed MW library
+- Added notification thru libnotify
+- fixed parsing settings of action plugins
+- added support for action plugins
+- kerneloops - plugin: fail gracefully.
+- Added commlayer to make dbus optional
+- a lot of kerneloops fixes
+- new approach for getting debuginfos and backtraces
+- fixed unlocking of a debugdump
+- replaced language and application plugins by analyzer plugin
+- more excetpion handling
+- conf file isn't needed
+- Plugin's configuration file is optional
+- Add curl dependency
+- Added column 'user' to the gui
+- Gui: set the newest entry as active (ticket#23)
+- Delete and Report button are no longer active if no entry is selected (ticket#41)
+- Gui refreshes silently (ticket#36)
+- Added error reporting over dbus to daemon, error handling in gui, about dialog
+
+* Wed Mar 11 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.2-1
 - added kerneloops addon to rpm (aarapov)
 - added kerneloops addon and plugin (aarapov)
 - Made Crash() private
@@ -225,18 +283,15 @@
 - deps cleanup, signal AnalyzeComplete has the crashreport as an argument.
 - Fixed empty package Description.
 - Fixed problem with applet tooltip on x86_64
+
+* Wed Mar  4 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-13
 - More renaming issues fixed..
 - Changed BR from gtkmm24 to gtk2
 - Fixed saving of user comment
 - Added a progress bar, new Comment entry for user comments..
 - FILENAME_CMDLINE and FILENAME_RELEASE are optional
 - new default path to DB
-
-* Sun Mar 08 2009 Caol??n McNamara <caolanm at redhat.com> - 0.0.1-14
-- 0 -> RPMFI_NOHEADER enum for new rpmfiNew
-
-* Sat Mar 07 2009 Jesse Keating <jkeating at redhat.com> - 0.0.1-13
-- Bump for new rpm
+- Rename to abrt
 
 * Tue Mar  3 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-12
 - initial fedora release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Mar 2009 10:13:10 -0000	1.3
+++ sources	14 Apr 2009 14:54:04 -0000	1.4
@@ -1 +1 @@
-2622afa63a1176b0a754f564e879af12  abrt-0.0.2.tar.gz
+b532b5f02a3654a2e4f859d84c396990  abrt-0.0.3.tar.gz



From limb at fedoraproject.org  Tue Apr 14 14:57:08 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 14 Apr 2009 14:57:08 +0000 (UTC)
Subject: rpms/libmng/devel libmng.spec,1.34,1.35
Message-ID: <20090414145708.62DEE700B2@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/libmng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22521

Modified Files:
	libmng.spec 
Log Message:
Merge Review fixes.



Index: libmng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libmng.spec	13 Apr 2009 16:58:07 -0000	1.34
+++ libmng.spec	14 Apr 2009 14:56:37 -0000	1.35
@@ -1,11 +1,11 @@
 Name: libmng
 Version: 1.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 # This is a common zlib variant.
 License: zlib
-Source: http://dl.sf.net/sourceforge/libmng/%{name}-%{version}.tar.gz
+Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
@@ -43,6 +43,7 @@
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -55,16 +56,21 @@
 
 %files
 %defattr(-,root,root,0755)
+%doc CHANGES LICENSE README*
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,0755)
+%doc doc/*
 %{_libdir}/*.so
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_mandir}/man5/*
 
 %changelog
+* Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.10-2
+- Fixed install, source url, added docs for Merge Review BZ 226033.
+
 * Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.10-1
 - update to 1.0.10
 



From mclasen at fedoraproject.org  Tue Apr 14 15:04:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 15:04:50 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore,1.75,1.76 sources,1.110,1.111
Message-ID: <20090414150450.8CDBF700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25219

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	16 Mar 2009 18:42:49 -0000	1.75
+++ .cvsignore	14 Apr 2009 15:04:19 -0000	1.76
@@ -1 +1 @@
-gdm-2.26.0.tar.bz2
+gdm-2.26.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sources	16 Mar 2009 18:42:49 -0000	1.110
+++ sources	14 Apr 2009 15:04:19 -0000	1.111
@@ -1 +1 @@
-b1a8db2f0e058d3c7b4c9a4600839a14  gdm-2.26.0.tar.bz2
+c2c15f8b741962f278fa7e790aaa9a2b  gdm-2.26.1.tar.bz2



From rdieter at fedoraproject.org  Tue Apr 14 15:05:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 15:05:50 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.51, 1.52 kde-settings.spec,
	1.69, 1.70 sources, 1.52, 1.53
Message-ID: <20090414150550.1D9C8700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25766

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-5.20090414
- include kde-centric defaults.list
- kcmnspluginrc: include nspluginwrapper paths (#495632)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	25 Feb 2009 12:15:01 -0000	1.51
+++ .cvsignore	14 Apr 2009 15:05:19 -0000	1.52
@@ -1 +1 @@
-kde-settings-4.2-20090225svn.tar.bz2
+kde-settings-4.2-20090414svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kde-settings.spec	25 Feb 2009 12:15:01 -0000	1.69
+++ kde-settings.spec	14 Apr 2009 15:05:19 -0000	1.70
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090225svn
+%define rel 20090414svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 4.%{rel}%{?dist}
+Release: 5.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -95,7 +95,9 @@
 touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
 
 %postun
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
+fi
 
 %pre kdm
 ## KDM fixup(s)
@@ -157,6 +159,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-5.20090414
+- include kde-centric defaults.list
+- kcmnspluginrc: include nspluginwrapper paths (#495632)
+
 * Wed Feb 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2-4.20090225svn
 - disable desktop effects by default
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	25 Feb 2009 12:15:01 -0000	1.52
+++ sources	14 Apr 2009 15:05:19 -0000	1.53
@@ -1 +1 @@
-5bf22fbb8491c526e2969ad655be4e38  kde-settings-4.2-20090225svn.tar.bz2
+5ac1efbebff93ea240a4da0a28209468  kde-settings-4.2-20090414svn.tar.bz2



From mbarnes at fedoraproject.org  Tue Apr 14 15:07:41 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 15:07:41 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore,1.93,1.94 sources,1.93,1.94
Message-ID: <20090414150741.698DC700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26487

Modified Files:
	.cvsignore sources 
Log Message:
Forgot to commit sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	14 Apr 2009 02:18:01 -0000	1.93
+++ .cvsignore	14 Apr 2009 15:07:10 -0000	1.94
@@ -1 +1 @@
-gtkhtml-3.26.1.tar.bz2
+gtkhtml-3.26.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	14 Apr 2009 02:18:02 -0000	1.93
+++ sources	14 Apr 2009 15:07:11 -0000	1.94
@@ -1 +1 @@
-3f50519cfa7014d281a02563de487430  gtkhtml-3.26.1.tar.bz2
+fd5a76c425d3010af38dea5f36d84438  gtkhtml-3.26.1.1.tar.bz2



From rhughes at fedoraproject.org  Tue Apr 14 15:10:53 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 15:10:53 +0000 (UTC)
Subject: rpms/hal-info/devel hal-info-20090330-dell-media-key-hub.patch, NONE,
	1.1 hal-info.spec, 1.41, 1.42
Message-ID: <20090414151053.F0278700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27847

Modified Files:
	hal-info.spec 
Added Files:
	hal-info-20090330-dell-media-key-hub.patch 
Log Message:
* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090330-2
- A key labelled "Music" on a Dell USB keyboard shows up in X as "XF86Tools"
  which is wrong. Reassigns the key to be "Media".


hal-info-20090330-dell-media-key-hub.patch:

--- NEW FILE hal-info-20090330-dell-media-key-hub.patch ---
commit 73b7c9705bb87276d090e88800ef045f0ebb3a07
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Apr 14 16:04:31 2009 +0100

    remap Dell USB Keyboard Hub to have XF86Media for the media button, not XF86Tools

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 349cb17..295304a 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -43,6 +43,17 @@
         </match>
       </match>
     </match>
+
+    <!-- Dell USB Keyboard Hub -->
+    <match key="@input.originating_device:info.linux.driver" string="usbhid">
+      <match key="info.product" string="Dell Dell USB Keyboard Hub">
+        <match key="@input.originating_device:usb.interface.number" int="0x1">
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+          <append key="input.keymap.data" type="strlist">ce103:media</append> <!-- Media/Music key -->
+        </match>
+      </match>
+    </match>
+
   </device>
 </deviceinfo>
 


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- hal-info.spec	30 Mar 2009 11:03:22 -0000	1.41
+++ hal-info.spec	14 Apr 2009 15:10:23 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20090330
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -10,6 +10,9 @@
 # OLPC specific, not upstream yet, although on HAL mailing list
 Source1: 30-keymap-olpc.fdi
 
+# upstream, 73b7c9705bb87276d090e88800ef045f0ebb3a07
+Patch1: hal-info-20090330-dell-media-key-hub.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: hal >= 0.5.10
@@ -21,6 +24,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .dell-hub
 
 %build
 %configure --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no --enable-killswitch-dell-wwan=no
@@ -42,6 +46,10 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090330-2
+- A key labelled "Music" on a Dell USB keyboard shows up in X as "XF86Tools"
+  which is wrong. Reassigns the key to be "Media".
+
 * Mon Mar 30 2009 Richard Hughes <rhughes at redhat.com> - 20090330-1
 - Update to latest upstream release
 



From kyle at fedoraproject.org  Tue Apr 14 15:12:59 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 14 Apr 2009 15:12:59 +0000 (UTC)
Subject: rpms/kernel/devel config-generic,1.279,1.280
Message-ID: <20090414151259.13C24700B2@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28665

Modified Files:
	config-generic 
Log Message:
missed config options


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- config-generic	14 Apr 2009 14:43:53 -0000	1.279
+++ config-generic	14 Apr 2009 15:12:28 -0000	1.280
@@ -2046,6 +2046,7 @@
 CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
@@ -2986,6 +2987,7 @@
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_RTC_DRV_PCF50633=m



From carllibpst at fedoraproject.org  Tue Apr 14 15:13:13 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Tue, 14 Apr 2009 15:13:13 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore, 1.20, 1.21 libpst.spec, 1.19,
	1.20 sources, 1.20, 1.21
Message-ID: <20090414151313.BB963700B2@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28763

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	19 Mar 2009 23:55:37 -0000	1.20
+++ .cvsignore	14 Apr 2009 15:12:43 -0000	1.21
@@ -1 +1 @@
-libpst-0.6.34.tar.gz
+libpst-0.6.36.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/libpst.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libpst.spec	19 Mar 2009 23:55:37 -0000	1.19
+++ libpst.spec	14 Apr 2009 15:12:43 -0000	1.20
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.34
+Version:            0.6.36
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -8,9 +8,9 @@
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL:                http://www.five-ten-sg.com/%{name}/
 Requires:           ImageMagick
+Requires:           %{name}-libs = %{version}-%{release}
 BuildRequires:      ImageMagick freetype-devel gd-devel libjpeg-devel zlib-devel
 
-
 %description
 The Libpst utilities include readpst which can convert email messages
 to both mbox and MH mailbox formats, pst2ldif which can convert the
@@ -19,34 +19,120 @@
 Summation.
 
 
+%package libs
+Summary:            Shared library used by the pst utilities
+Group:              Development/Libraries
+
+%description libs
+The libpst-libs package contains the shared library used by the pst
+utilities.
+
+
+%package devel
+Summary:            Library links and header files for libpst application development
+Group:              Development/Libraries
+Requires:           pkgconfig
+Requires:           %{name}-libs = %{version}-%{release}
+
+%description devel
+The libpst-devel package contains the library links and header files
+you'll need to develop applications using the libpst shared library.
+You do not need to install it if you just want to use the libpst
+utilities.
+
+
+%package devel-doc
+Summary:            Documentation for libpst.so for libpst application development
+Group:              Documentation
+Requires:           %{name}-doc = %{version}-%{release}
+
+%description devel-doc
+The libpst-devel-doc package contains the doxygen generated
+documentation for the libpst.so shared library.
+
+
+%package doc
+Summary:            Documentation for the pst utilities in html format
+Group:              Documentation
+
+%description doc
+The libpst-doc package contains the html documentation for the pst
+utilities.  You do not need to install it if you just want to use the
+libpst utilities.
+
+
+
 %prep
 %setup -q
 
 
 %build
-%configure
+%configure --enable-libpst-shared
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/libpst.la
+rm $RPM_BUILD_ROOT%{_libdir}/libpst.a
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post libs -p /sbin/ldconfig
+
+
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
+
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libpst.so.*
+
+
+%files devel-doc
+%defattr(-,root,root,-)
+%{_datadir}/doc/%{name}-%{version}/devel/
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libpst.so
+%{_includedir}/%{name}-2/
+%{_libdir}/pkgconfig/libpst.pc
+
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_datadir}/doc/%{name}-%{version}/
+%{_datadir}/doc/%{name}-%{version}/*.html
+%{_datadir}/doc/%{name}-%{version}/*.pdf
+%{_datadir}/doc/%{name}-%{version}/AUTHORS
+%{_datadir}/doc/%{name}-%{version}/COPYING
+%{_datadir}/doc/%{name}-%{version}/ChangeLog
+%{_datadir}/doc/%{name}-%{version}/NEWS
+%{_datadir}/doc/%{name}-%{version}/README
 
 
 %changelog
+* Tue Apr 14 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.36-1
+- build separate -doc and -devel-doc subpackages.
+- other spec file cleanup
+
+* Wed Apr 08 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.35-1
+- properly add trailing mime boundary in all modes.
+- build separate libpst, libpst-libs, libpst-devel rpms.
+
 * Thu Mar 19 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.34-1
 - avoid putting mixed item types into the same output folder.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	19 Mar 2009 23:55:37 -0000	1.20
+++ sources	14 Apr 2009 15:12:43 -0000	1.21
@@ -1 +1 @@
-092067121a7f8c5f8bea8b3cdc31f5e6  libpst-0.6.34.tar.gz
+97244ec839cc208c6ce647a1ef3f99eb  libpst-0.6.36.tar.gz



From jwilson at fedoraproject.org  Tue Apr 14 15:14:09 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 14 Apr 2009 15:14:09 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.181,1.182
Message-ID: <20090414151409.D283E700B2@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29249

Modified Files:
	comps-f11.xml.in 
Log Message:
I have no problem with these fonts being default *IF YOU CHOOSE THE
CORRESPONDING LANGUAGE* but for a default install in English, this
is just a bunch of unnecessary, unwanted baggage.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- comps-f11.xml.in	13 Apr 2009 10:39:39 -0000	1.181
+++ comps-f11.xml.in	14 Apr 2009 15:13:39 -0000	1.182
@@ -1554,34 +1554,14 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">abyssinica-fonts</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
-      <packagereq type="default">jomolhari-fonts</packagereq>
-      <packagereq type="default">kacst-fonts</packagereq>
-      <packagereq type="default">khmeros-base-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
       <packagereq type="default">liberation-sans-fonts</packagereq>
       <packagereq type="default">liberation-serif-fonts</packagereq>
-      <packagereq type="default">lklug-fonts</packagereq>
-      <packagereq type="default">lohit-bengali-fonts</packagereq>
-      <packagereq type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq type="default">lohit-hindi-fonts</packagereq>
-      <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-maithili-fonts</packagereq>
-      <packagereq type="default">lohit-oriya-fonts</packagereq>
-      <packagereq type="default">lohit-punjabi-fonts</packagereq>
-      <packagereq type="default">lohit-tamil-fonts</packagereq>
-      <packagereq type="default">lohit-telugu-fonts</packagereq>
-      <packagereq type="default">padauk-fonts</packagereq>
-      <packagereq type="default">paktype-fonts</packagereq>
-      <packagereq type="default">smc-meera-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
-      <packagereq type="default">un-core-fonts-dotum</packagereq>
-      <packagereq type="default">vlgothic-fonts</packagereq>
+      <packagereq type="optional">abyssinica-fonts</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
       <packagereq type="optional">asana-math-fonts</packagereq>
@@ -1596,6 +1576,7 @@
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>
@@ -1641,7 +1622,9 @@
       <packagereq type="optional">hartke-aurulent-sans-fonts</packagereq>
       <packagereq type="optional">hartke-aurulent-sans-mono-fonts</packagereq>
       <packagereq type="optional">icelandic-fonts</packagereq>
-      <packagereq type="optional">levien-inconsolata-fonts</packagereq>
+      <packagereq type="optional">jomolhari-fonts</packagereq>
+      <packagereq type="optional">kacst-fonts</packagereq>
+      <packagereq type="optional">khmeros-base-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
       <packagereq type="optional">khmeros-bokor-fonts</packagereq>
       <packagereq type="optional">khmeros-handwritten-fonts</packagereq>
@@ -1649,6 +1632,7 @@
       <packagereq type="optional">khmeros-muol-fonts</packagereq>
       <packagereq type="optional">khmeros-siemreap-fonts</packagereq>
       <packagereq type="optional">kurdit-unikurd-web-fonts</packagereq>
+      <packagereq type="optional">levien-inconsolata-fonts</packagereq>
       <packagereq type="optional">lilypond-aybabtu-fonts</packagereq>
       <packagereq type="optional">lilypond-century-schoolbook-l-fonts</packagereq>
       <packagereq type="optional">lilypond-emmentaler-fonts</packagereq>
@@ -1657,12 +1641,22 @@
       <packagereq type="optional">lilypond-feta-braces-fonts</packagereq>
       <packagereq type="optional">lilypond-parmesan-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
+      <packagereq type="optional">lklug-fonts</packagereq>
+      <packagereq type="optional">lohit-bengali-fonts</packagereq>
+      <packagereq type="optional">lohit-gujarati-fonts</packagereq>
+      <packagereq type="optional">lohit-hindi-fonts</packagereq>
+      <packagereq type="optional">lohit-kannada-fonts</packagereq>
       <packagereq type="optional">lohit-kashmiri-fonts</packagereq>
       <packagereq type="optional">lohit-konkani-fonts</packagereq>
+      <packagereq type="optional">lohit-maithili-fonts</packagereq>
       <packagereq type="optional">lohit-malayalam-fonts</packagereq>
       <packagereq type="optional">lohit-marathi-fonts</packagereq>
       <packagereq type="optional">lohit-nepali-fonts</packagereq>
+      <packagereq type="optional">lohit-oriya-fonts</packagereq>
+      <packagereq type="optional">lohit-punjabi-fonts</packagereq>
       <packagereq type="optional">lohit-sindhi-fonts</packagereq>
+      <packagereq type="optional">lohit-tamil-fonts</packagereq>
+      <packagereq type="optional">lohit-telugu-fonts</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">mgopen-canonica-fonts</packagereq>
@@ -1674,6 +1668,8 @@
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
+      <packagereq type="optional">padauk-fonts</packagereq>
+      <packagereq type="optional">paktype-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
       <packagereq type="optional">samyak-gujarati-fonts</packagereq>
@@ -1698,6 +1694,7 @@
       <packagereq type="optional">smc-anjalioldlipi-fonts</packagereq>
       <packagereq type="optional">smc-dyuthi-fonts</packagereq>
       <packagereq type="optional">smc-kalyani-fonts</packagereq>
+      <packagereq type="optional">smc-meera-fonts</packagereq>
       <packagereq type="optional">smc-rachana-fonts</packagereq>
       <packagereq type="optional">smc-raghumalayalam-fonts</packagereq>
       <packagereq type="optional">smc-suruma-fonts</packagereq>
@@ -1706,6 +1703,7 @@
       <packagereq type="optional">stix-pua-fonts</packagereq>
       <packagereq type="optional">stix-sizes-fonts</packagereq>
       <packagereq type="optional">stix-variants-fonts</packagereq>
+      <packagereq type="optional">thai-scalable-waree-fonts</packagereq>
       <packagereq type="optional">thibault-fonts-essays1743</packagereq>
       <packagereq type="optional">thibault-fonts-isabella</packagereq>
       <packagereq type="optional">thibault-fonts-rockets</packagereq>
@@ -1721,6 +1719,7 @@
       <packagereq type="optional">tiresias-sign-z-fonts</packagereq>
       <packagereq type="optional">un-core-fonts-batang</packagereq>
       <packagereq type="optional">un-core-fonts-dinaru</packagereq>
+      <packagereq type="optional">un-core-fonts-dotum</packagereq>
       <packagereq type="optional">un-core-fonts-graphic</packagereq>
       <packagereq type="optional">un-core-fonts-gungseo</packagereq>
       <packagereq type="optional">un-core-fonts-pilgi</packagereq>
@@ -1736,6 +1735,7 @@
       <packagereq type="optional">un-extra-fonts-taza</packagereq>
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">vlgothic-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>



From carllibpst at fedoraproject.org  Tue Apr 14 15:14:18 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Tue, 14 Apr 2009 15:14:18 +0000 (UTC)
Subject: rpms/libpst/F-10 .cvsignore, 1.19, 1.20 libpst.spec, 1.19,
	1.20 sources, 1.19, 1.20
Message-ID: <20090414151418.2CA96700B2@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29359

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	19 Mar 2009 23:56:53 -0000	1.19
+++ .cvsignore	14 Apr 2009 15:13:47 -0000	1.20
@@ -1 +1 @@
-libpst-0.6.34.tar.gz
+libpst-0.6.36.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/libpst.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libpst.spec	19 Mar 2009 23:56:53 -0000	1.19
+++ libpst.spec	14 Apr 2009 15:13:47 -0000	1.20
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.34
+Version:            0.6.36
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -8,9 +8,9 @@
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL:                http://www.five-ten-sg.com/%{name}/
 Requires:           ImageMagick
+Requires:           %{name}-libs = %{version}-%{release}
 BuildRequires:      ImageMagick freetype-devel gd-devel libjpeg-devel zlib-devel
 
-
 %description
 The Libpst utilities include readpst which can convert email messages
 to both mbox and MH mailbox formats, pst2ldif which can convert the
@@ -19,34 +19,120 @@
 Summation.
 
 
+%package libs
+Summary:            Shared library used by the pst utilities
+Group:              Development/Libraries
+
+%description libs
+The libpst-libs package contains the shared library used by the pst
+utilities.
+
+
+%package devel
+Summary:            Library links and header files for libpst application development
+Group:              Development/Libraries
+Requires:           pkgconfig
+Requires:           %{name}-libs = %{version}-%{release}
+
+%description devel
+The libpst-devel package contains the library links and header files
+you'll need to develop applications using the libpst shared library.
+You do not need to install it if you just want to use the libpst
+utilities.
+
+
+%package devel-doc
+Summary:            Documentation for libpst.so for libpst application development
+Group:              Documentation
+Requires:           %{name}-doc = %{version}-%{release}
+
+%description devel-doc
+The libpst-devel-doc package contains the doxygen generated
+documentation for the libpst.so shared library.
+
+
+%package doc
+Summary:            Documentation for the pst utilities in html format
+Group:              Documentation
+
+%description doc
+The libpst-doc package contains the html documentation for the pst
+utilities.  You do not need to install it if you just want to use the
+libpst utilities.
+
+
+
 %prep
 %setup -q
 
 
 %build
-%configure
+%configure --enable-libpst-shared
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/libpst.la
+rm $RPM_BUILD_ROOT%{_libdir}/libpst.a
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post libs -p /sbin/ldconfig
+
+
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
+
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libpst.so.*
+
+
+%files devel-doc
+%defattr(-,root,root,-)
+%{_datadir}/doc/%{name}-%{version}/devel/
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libpst.so
+%{_includedir}/%{name}-2/
+%{_libdir}/pkgconfig/libpst.pc
+
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_datadir}/doc/%{name}-%{version}/
+%{_datadir}/doc/%{name}-%{version}/*.html
+%{_datadir}/doc/%{name}-%{version}/*.pdf
+%{_datadir}/doc/%{name}-%{version}/AUTHORS
+%{_datadir}/doc/%{name}-%{version}/COPYING
+%{_datadir}/doc/%{name}-%{version}/ChangeLog
+%{_datadir}/doc/%{name}-%{version}/NEWS
+%{_datadir}/doc/%{name}-%{version}/README
 
 
 %changelog
+* Tue Apr 14 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.36-1
+- build separate -doc and -devel-doc subpackages.
+- other spec file cleanup
+
+* Wed Apr 08 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.35-1
+- properly add trailing mime boundary in all modes.
+- build separate libpst, libpst-libs, libpst-devel rpms.
+
 * Thu Mar 19 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.34-1
 - avoid putting mixed item types into the same output folder.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	19 Mar 2009 23:56:53 -0000	1.19
+++ sources	14 Apr 2009 15:13:47 -0000	1.20
@@ -1 +1 @@
-092067121a7f8c5f8bea8b3cdc31f5e6  libpst-0.6.34.tar.gz
+97244ec839cc208c6ce647a1ef3f99eb  libpst-0.6.36.tar.gz



From pghmcfc at fedoraproject.org  Tue Apr 14 15:15:06 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 14 Apr 2009 15:15:06 +0000 (UTC)
Subject: rpms/gtkwave/devel .cvsignore, 1.56, 1.57 gtkwave.spec, 1.61,
	1.62 sources, 1.56, 1.57
Message-ID: <20090414151506.EF320700B2@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29636

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	17 Feb 2009 14:22:35 -0000	1.56
+++ .cvsignore	14 Apr 2009 15:14:36 -0000	1.57
@@ -1 +1 @@
-gtkwave-3.2.0.tar.gz
+gtkwave-3.2.1.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gtkwave.spec	25 Feb 2009 02:33:50 -0000	1.61
+++ gtkwave.spec	14 Apr 2009 15:14:36 -0000	1.62
@@ -1,9 +1,9 @@
-#define prerel RC5
+#global prerel RC5
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.2.0
-Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}.1
+Version:	3.2.1
+Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
@@ -94,6 +94,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Apr 14 2009 Paul Howarth <paul at city-fan.org> 3.2.1-1
+- update to 3.2.1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	17 Feb 2009 14:22:35 -0000	1.56
+++ sources	14 Apr 2009 15:14:36 -0000	1.57
@@ -1 +1 @@
-b2bbd52cfab4442c0be3b1d1c1403d5e  gtkwave-3.2.0.tar.gz
+6b1cb76e454d073da35ec646311178a4  gtkwave-3.2.1.tar.gz



From notting at fedoraproject.org  Tue Apr 14 15:18:10 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 14 Apr 2009 15:18:10 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.182,1.183
Message-ID: <20090414151810.CC3D1700B2@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30688

Modified Files:
	comps-f11.xml.in 
Log Message:
Reverting - large-scale changes should come from the Fonts SIG.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- comps-f11.xml.in	14 Apr 2009 15:13:39 -0000	1.182
+++ comps-f11.xml.in	14 Apr 2009 15:17:40 -0000	1.183
@@ -1554,14 +1554,34 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">abyssinica-fonts</packagereq>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">kacst-fonts</packagereq>
+      <packagereq type="default">khmeros-base-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
       <packagereq type="default">liberation-sans-fonts</packagereq>
       <packagereq type="default">liberation-serif-fonts</packagereq>
+      <packagereq type="default">lklug-fonts</packagereq>
+      <packagereq type="default">lohit-bengali-fonts</packagereq>
+      <packagereq type="default">lohit-gujarati-fonts</packagereq>
+      <packagereq type="default">lohit-hindi-fonts</packagereq>
+      <packagereq type="default">lohit-kannada-fonts</packagereq>
+      <packagereq type="default">lohit-maithili-fonts</packagereq>
+      <packagereq type="default">lohit-oriya-fonts</packagereq>
+      <packagereq type="default">lohit-punjabi-fonts</packagereq>
+      <packagereq type="default">lohit-tamil-fonts</packagereq>
+      <packagereq type="default">lohit-telugu-fonts</packagereq>
+      <packagereq type="default">padauk-fonts</packagereq>
+      <packagereq type="default">paktype-fonts</packagereq>
+      <packagereq type="default">smc-meera-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="optional">abyssinica-fonts</packagereq>
+      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
+      <packagereq type="default">un-core-fonts-dotum</packagereq>
+      <packagereq type="default">vlgothic-fonts</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
       <packagereq type="optional">asana-math-fonts</packagereq>
@@ -1576,7 +1596,6 @@
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
-      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>
@@ -1622,9 +1641,7 @@
       <packagereq type="optional">hartke-aurulent-sans-fonts</packagereq>
       <packagereq type="optional">hartke-aurulent-sans-mono-fonts</packagereq>
       <packagereq type="optional">icelandic-fonts</packagereq>
-      <packagereq type="optional">jomolhari-fonts</packagereq>
-      <packagereq type="optional">kacst-fonts</packagereq>
-      <packagereq type="optional">khmeros-base-fonts</packagereq>
+      <packagereq type="optional">levien-inconsolata-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
       <packagereq type="optional">khmeros-bokor-fonts</packagereq>
       <packagereq type="optional">khmeros-handwritten-fonts</packagereq>
@@ -1632,7 +1649,6 @@
       <packagereq type="optional">khmeros-muol-fonts</packagereq>
       <packagereq type="optional">khmeros-siemreap-fonts</packagereq>
       <packagereq type="optional">kurdit-unikurd-web-fonts</packagereq>
-      <packagereq type="optional">levien-inconsolata-fonts</packagereq>
       <packagereq type="optional">lilypond-aybabtu-fonts</packagereq>
       <packagereq type="optional">lilypond-century-schoolbook-l-fonts</packagereq>
       <packagereq type="optional">lilypond-emmentaler-fonts</packagereq>
@@ -1641,22 +1657,12 @@
       <packagereq type="optional">lilypond-feta-braces-fonts</packagereq>
       <packagereq type="optional">lilypond-parmesan-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
-      <packagereq type="optional">lklug-fonts</packagereq>
-      <packagereq type="optional">lohit-bengali-fonts</packagereq>
-      <packagereq type="optional">lohit-gujarati-fonts</packagereq>
-      <packagereq type="optional">lohit-hindi-fonts</packagereq>
-      <packagereq type="optional">lohit-kannada-fonts</packagereq>
       <packagereq type="optional">lohit-kashmiri-fonts</packagereq>
       <packagereq type="optional">lohit-konkani-fonts</packagereq>
-      <packagereq type="optional">lohit-maithili-fonts</packagereq>
       <packagereq type="optional">lohit-malayalam-fonts</packagereq>
       <packagereq type="optional">lohit-marathi-fonts</packagereq>
       <packagereq type="optional">lohit-nepali-fonts</packagereq>
-      <packagereq type="optional">lohit-oriya-fonts</packagereq>
-      <packagereq type="optional">lohit-punjabi-fonts</packagereq>
       <packagereq type="optional">lohit-sindhi-fonts</packagereq>
-      <packagereq type="optional">lohit-tamil-fonts</packagereq>
-      <packagereq type="optional">lohit-telugu-fonts</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">mgopen-canonica-fonts</packagereq>
@@ -1668,8 +1674,6 @@
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
-      <packagereq type="optional">padauk-fonts</packagereq>
-      <packagereq type="optional">paktype-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
       <packagereq type="optional">samyak-gujarati-fonts</packagereq>
@@ -1694,7 +1698,6 @@
       <packagereq type="optional">smc-anjalioldlipi-fonts</packagereq>
       <packagereq type="optional">smc-dyuthi-fonts</packagereq>
       <packagereq type="optional">smc-kalyani-fonts</packagereq>
-      <packagereq type="optional">smc-meera-fonts</packagereq>
       <packagereq type="optional">smc-rachana-fonts</packagereq>
       <packagereq type="optional">smc-raghumalayalam-fonts</packagereq>
       <packagereq type="optional">smc-suruma-fonts</packagereq>
@@ -1703,7 +1706,6 @@
       <packagereq type="optional">stix-pua-fonts</packagereq>
       <packagereq type="optional">stix-sizes-fonts</packagereq>
       <packagereq type="optional">stix-variants-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-waree-fonts</packagereq>
       <packagereq type="optional">thibault-fonts-essays1743</packagereq>
       <packagereq type="optional">thibault-fonts-isabella</packagereq>
       <packagereq type="optional">thibault-fonts-rockets</packagereq>
@@ -1719,7 +1721,6 @@
       <packagereq type="optional">tiresias-sign-z-fonts</packagereq>
       <packagereq type="optional">un-core-fonts-batang</packagereq>
       <packagereq type="optional">un-core-fonts-dinaru</packagereq>
-      <packagereq type="optional">un-core-fonts-dotum</packagereq>
       <packagereq type="optional">un-core-fonts-graphic</packagereq>
       <packagereq type="optional">un-core-fonts-gungseo</packagereq>
       <packagereq type="optional">un-core-fonts-pilgi</packagereq>
@@ -1735,7 +1736,6 @@
       <packagereq type="optional">un-extra-fonts-taza</packagereq>
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
-      <packagereq type="optional">vlgothic-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>



From kengert at fedoraproject.org  Tue Apr 14 15:21:50 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Tue, 14 Apr 2009 15:21:50 +0000 (UTC)
Subject: rpms/nss/devel .cvsignore, 1.22, 1.23 nss-nolocalsql.patch, 1.1,
	1.2 nss.spec, 1.64, 1.65 sources, 1.23, 1.24
Message-ID: <20090414152150.9AC4770137@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31927

Modified Files:
	.cvsignore nss-nolocalsql.patch nss.spec sources 
Log Message:
* Tue Apr 14 2009 Kai Engert <kaie at redhat.com> - 3.12.3-2                                                                          
- Update to NSS 3.12.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	31 Mar 2009 20:32:27 -0000	1.22
+++ .cvsignore	14 Apr 2009 15:21:18 -0000	1.23
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.2.99.3-stripped.tar.bz2
+nss-3.12.3-stripped.tar.bz2

nss-nolocalsql.patch:

Index: nss-nolocalsql.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-nolocalsql.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-nolocalsql.patch	7 Nov 2007 00:53:47 -0000	1.1
+++ nss-nolocalsql.patch	14 Apr 2009 15:21:19 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
---- mozilla/security/nss/lib/Makefile.nolocalsql	2007-11-06 15:12:37.000000000 +0100
-+++ mozilla/security/nss/lib/Makefile	2007-11-06 15:13:35.000000000 +0100
+diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
++++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
 @@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
  DIRS := $(filter-out fortcrypt,$(DIRS))
  endif
@@ -18,9 +18,9 @@
  
  #######################################################################
  # (5) Execute "global" rules. (OPTIONAL)                              #
-diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-11-06 15:10:59.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2007-11-06 15:11:07.000000000 +0100
+diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
 @@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
  
  DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
@@ -34,9 +34,9 @@
  
  CSRCS = \
  	dbmshim.c \
-diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
---- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2007-11-06 15:08:14.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/manifest.mn	2007-11-06 15:10:21.000000000 +0100
+diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
 @@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
  
  DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
@@ -49,5 +49,4 @@
 +#endif
  
  EXPORTS = \
- 	pkcs11.h \
-diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk
+ 	secmodt.h \


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nss.spec	6 Apr 2009 14:46:53 -0000	1.64
+++ nss.spec	14 Apr 2009 15:21:19 -0000	1.65
@@ -3,8 +3,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.2.99.3
-Release:          7%{?dist}
+Version:          3.12.3
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -404,6 +404,7 @@
 %{_includedir}/nss3/nsspem.h
 %{_includedir}/nss3/nssrwlk.h
 %{_includedir}/nss3/nssrwlkt.h
+%{_includedir}/nss3/nssutil.h
 %{_includedir}/nss3/ocsp.h
 %{_includedir}/nss3/ocspt.h
 %{_includedir}/nss3/p12.h
@@ -450,7 +451,6 @@
 %{_includedir}/nss3/sslproto.h
 %{_includedir}/nss3/sslt.h
 %{_includedir}/nss3/utilrename.h
-%{_includedir}/nss3/watcomfx.h
 
 
 %files pkcs11-devel
@@ -470,6 +470,8 @@
 
 
 %changelog
+* Tue Apr 14 2009 Kai Engert <kaie at redhat.com> - 3.12.3-2
+- Update to NSS 3.12.3
 * Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-7
 - temporarily disable the test suite because of bug 494266
 * Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	31 Mar 2009 20:32:27 -0000	1.23
+++ sources	14 Apr 2009 15:21:19 -0000	1.24
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-92af643ed959c78e2de765b9cf63fe8c  nss-3.12.2.99.3-stripped.tar.bz2
+de43077b1fb888bccf155506ec12e40a  nss-3.12.3-stripped.tar.bz2



From scop at fedoraproject.org  Tue Apr 14 15:23:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 15:23:36 +0000 (UTC)
Subject: rpms/libmodplug/F-10 .cvsignore, 1.4, 1.5 libmodplug.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <20090414152336.E9305700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv640

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
- Update to 0.8.5, should fix #483146.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Apr 2007 10:10:05 -0000	1.4
+++ .cvsignore	14 Apr 2009 15:23:06 -0000	1.5
@@ -1 +1 @@
-libmodplug-0.8.4.tar.gz
+libmodplug-0.8.5.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-10/libmodplug.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libmodplug.spec	9 Feb 2008 19:23:53 -0000	1.14
+++ libmodplug.spec	14 Apr 2009 15:23:06 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libmodplug
-Version:        0.8.4
-Release:        3%{?dist}
+Version:        0.8.5
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -68,6 +68,12 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
+- Update to 0.8.5, should fix #483146.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb  9 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.4-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Apr 2007 10:10:05 -0000	1.4
+++ sources	14 Apr 2009 15:23:06 -0000	1.5
@@ -1 +1 @@
-091bd1168a524a4f36fc61f95209e7e4  libmodplug-0.8.4.tar.gz
+f4143aaebe6163fa359d6a6f848296da  libmodplug-0.8.5.tar.gz



From scop at fedoraproject.org  Tue Apr 14 15:28:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 15:28:10 +0000 (UTC)
Subject: rpms/vdr/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 vdr.spec, 
	1.40, 1.41
Message-ID: <20090414152810.3A701700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2289

Modified Files:
	.cvsignore sources vdr.spec 
Log Message:
* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-20
- Use useradd -N instead of -n in scriptlets (#495731).
- Include Rolf Ahrenberg's sys_nice and ionice patches.
- Update liemikuutio patch to 1.25.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	1 Mar 2009 15:11:33 -0000	1.18
+++ .cvsignore	14 Apr 2009 15:27:38 -0000	1.19
@@ -6,5 +6,7 @@
 vdr-1.6.0-2.diff
 vdr-timer-info-0.5-1.5.15.diff
 vdr-1.6.0-2-ttxtsubs.patch
-vdr-1.6.0-liemikuutio-1.24.diff.gz
 vdr-1.6.0-subtitles-button.patch.gz
+vdr-1.6.0-liemikuutio-1.25.diff.gz
+vdr-1.6.0-ionice.patch.gz
+vdr-1.6.0-cap_sys_nice.patch.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Mar 2009 15:11:33 -0000	1.18
+++ sources	14 Apr 2009 15:27:38 -0000	1.19
@@ -6,5 +6,7 @@
 875b66a90d1c6f2e25aa1221b319136b  vdr-1.6.0-2.diff
 92ee6cdf60b795d9fbcf4fdcafe401b4  vdr-timer-info-0.5-1.5.15.diff
 ded3dacb4be2958c03a50e3064164eb8  vdr-1.6.0-2-ttxtsubs.patch
-a77e4db7aa22f11cfc397a2070b187db  vdr-1.6.0-liemikuutio-1.24.diff.gz
 bd3221bb080788a87b4560eb0f323f2b  vdr-1.6.0-subtitles-button.patch.gz
+122b40baef4d0c9a3e31e91b1c877e5b  vdr-1.6.0-liemikuutio-1.25.diff.gz
+bc2dbfe11e0ddbc791ceb2f659081c8c  vdr-1.6.0-ionice.patch.gz
+32004893569e9a68f17d2b4b93410ed5  vdr-1.6.0-cap_sys_nice.patch.gz


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vdr.spec	1 Mar 2009 15:11:33 -0000	1.40
+++ vdr.spec	14 Apr 2009 15:27:39 -0000	1.41
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -53,7 +53,7 @@
 Patch0:         %{name}-channel+epg.patch
 # TODO
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.24.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.25.diff.gz
 Patch3:         %{name}-1.6.0-scriptnames.patch
 Patch4:         %{name}-1.6.0-paths.patch
 Patch5:         %{name}-1.5.18-use-pkgconfig.patch
@@ -80,6 +80,8 @@
 Patch19:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff
 Patch20:        %{name}-1.6.0-remove-dvb-abi-check.patch
 Patch21:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz
+Patch22:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-cap_sys_nice.patch.gz
+Patch23:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ionice.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -95,7 +97,8 @@
 %endif # docs
 # udev >= 136-1 for the video group
 Requires:       udev >= 136-1
-Requires(pre):  shadow-utils
+# shadow-utils >= 4.1.1 for useradd -N
+Requires(pre):  shadow-utils >= 2:4.1.1
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Provides:       vdr(abi) = %{apiver}
@@ -197,6 +200,8 @@
 %patch19 -p1
 %patch20 -p0
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -404,7 +409,7 @@
 
 %pre
 getent passwd %{vdr_user} >/dev/null || \
-useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -n \
+useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
     -c "Video Disk Recorder" %{vdr_user}
 :
 
@@ -519,6 +524,11 @@
 %endif # plugins
 
 %changelog
+* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-20
+- Use useradd -N instead of -n in scriptlets (#495731).
+- Include Rolf Ahrenberg's sys_nice and ionice patches.
+- Update liemikuutio patch to 1.25.
+
 * Sat Feb 28 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-19
 - Update liemikuutio patch to 1.24 to fix some issues with gcc 4.4.
 - Apply Rolf Ahrenberg's patch to include audio and subtitles shortcut



From wwoods at fedoraproject.org  Tue Apr 14 15:32:47 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Tue, 14 Apr 2009 15:32:47 +0000 (UTC)
Subject: rpms/python-bugzilla/devel python-bugzilla.spec, 1.12, 1.13 sources,
	1.10, 1.11
Message-ID: <20090414153247.20EE4700B2@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3585

Modified Files:
	python-bugzilla.spec sources 
Log Message:
Fix tarball (missing util.py)


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/python-bugzilla.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-bugzilla.spec	9 Apr 2009 22:21:41 -0000	1.12
+++ python-bugzilla.spec	14 Apr 2009 15:32:16 -0000	1.13
@@ -2,12 +2,12 @@
 
 Name:           python-bugzilla
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
 Group:          Development/Languages
 License:        GPLv2+
-URL:            http://fedorahosted.org/python-bugzilla
+URL:            https://fedorahosted.org/python-bugzilla
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Will Woods <wwoods at redhat.com> - 0.5.1-2
+- Fix missing util.py
+
 * Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
 - CLI: fix unicode handling
 - CLI: add --from-url flag, which parses a bugzilla query.cgi URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Apr 2009 22:21:41 -0000	1.10
+++ sources	14 Apr 2009 15:32:16 -0000	1.11
@@ -1 +1 @@
-767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2
+4787d69b843d3f462bbd7e1bf5f16c90  python-bugzilla-0.5.1.tar.bz2



From dwalsh at fedoraproject.org  Tue Apr 14 15:37:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 14 Apr 2009 15:37:46 +0000 (UTC)
Subject: rpms/policycoreutils/F-10 policycoreutils-rhat.patch, 1.404,
	1.405 policycoreutils.spec, 1.579, 1.580
Message-ID: <20090414153746.398F3700B2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5122

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.57-20
- Do not print \n, if count < 1000;
- Add /root/.ssh to restorecond.conf
- fixfiles -R package should recursively fix files
- Add btrfs to fixfiles


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils-rhat.patch,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- policycoreutils-rhat.patch	2 Feb 2009 13:47:14 -0000	1.404
+++ policycoreutils-rhat.patch	14 Apr 2009 15:37:13 -0000	1.405
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.57/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/audit2allow/audit2allow	2009-02-02 08:33:36.000000000 -0500
++++ policycoreutils-2.0.57/audit2allow/audit2allow	2009-02-02 08:42:15.000000000 -0500
 @@ -42,10 +42,10 @@
          from optparse import OptionParser
  
@@ -50,7 +50,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.57/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/audit2allow/audit2allow.1	2009-02-02 08:33:36.000000000 -0500
++++ policycoreutils-2.0.57/audit2allow/audit2allow.1	2009-02-02 08:42:15.000000000 -0500
 @@ -44,9 +44,6 @@
  Note that all audit messages are not available via dmesg when
  auditd is running; use "ausearch -m avc | audit2allow"  or "-a" instead.
@@ -76,7 +76,7 @@
  .B "\-v" | "\-\-verbose"
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.57/Makefile
 --- nsapolicycoreutils/Makefile	2008-09-22 13:25:07.000000000 -0400
-+++ policycoreutils-2.0.57/Makefile	2009-02-02 08:33:36.000000000 -0500
++++ policycoreutils-2.0.57/Makefile	2009-02-02 08:42:15.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -85,7 +85,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-2.0.57/newrole/newrole.c
 --- nsapolicycoreutils/newrole/newrole.c	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/newrole/newrole.c	2009-02-02 08:33:36.000000000 -0500
++++ policycoreutils-2.0.57/newrole/newrole.c	2009-02-02 08:42:15.000000000 -0500
 @@ -553,7 +553,7 @@
  	new_caps = cap_init();
  	tmp_caps = cap_init();
@@ -106,7 +106,7 @@
  	rc |= cap_set_flag(new_caps, CAP_PERMITTED, 6, cap_list, CAP_SET);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.57/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/restorecond/Makefile	2009-02-02 08:34:07.000000000 -0500
++++ policycoreutils-2.0.57/restorecond/Makefile	2009-02-02 08:42:15.000000000 -0500
 @@ -20,7 +20,7 @@
  	install -m 755 restorecond $(SBINDIR)
  	install -m 644 restorecond.8 $(MANDIR)/man8
@@ -118,7 +118,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.57/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/restorecond/restorecond.c	2009-02-02 08:34:07.000000000 -0500
++++ policycoreutils-2.0.57/restorecond/restorecond.c	2009-02-02 08:42:15.000000000 -0500
 @@ -1,7 +1,7 @@
  /*
   * restorecond
@@ -212,15 +212,19 @@
  	if (!ptr->dir)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.57/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/restorecond/restorecond.conf	2009-02-02 08:34:07.000000000 -0500
-@@ -5,4 +5,3 @@
++++ policycoreutils-2.0.57/restorecond/restorecond.conf	2009-04-14 11:05:19.000000000 -0400
+@@ -5,4 +5,7 @@
  /var/run/utmp
  /var/log/wtmp
  ~/*
 -~/.mozilla/plugins/libflashplayer.so
++/root/.ssh
++/root/.ssh/*
++
++
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-2.0.57/restorecond/stringslist.c
 --- nsapolicycoreutils/restorecond/stringslist.c	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/restorecond/stringslist.c	2009-02-02 08:34:07.000000000 -0500
++++ policycoreutils-2.0.57/restorecond/stringslist.c	2009-02-02 08:42:15.000000000 -0500
 @@ -55,9 +55,10 @@
  		*list = newptr;
  }
@@ -235,7 +239,7 @@
  			return 0;	/* Match found */
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-2.0.57/restorecond/stringslist.h
 --- nsapolicycoreutils/restorecond/stringslist.h	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/restorecond/stringslist.h	2009-02-02 08:34:07.000000000 -0500
++++ policycoreutils-2.0.57/restorecond/stringslist.h	2009-02-02 08:42:15.000000000 -0500
 @@ -31,7 +31,7 @@
  void strings_list_free(struct stringsList *list);
  void strings_list_add(struct stringsList **list, const char *string);
@@ -247,7 +251,7 @@
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-2.0.57/restorecond/utmpwatcher.c
 --- nsapolicycoreutils/restorecond/utmpwatcher.c	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/restorecond/utmpwatcher.c	2009-02-02 08:34:07.000000000 -0500
++++ policycoreutils-2.0.57/restorecond/utmpwatcher.c	2009-02-02 08:42:15.000000000 -0500
 @@ -57,7 +57,7 @@
  	utmp_ptr = NULL;
  	FILE *cfg = fopen(utmp_path, "r");
@@ -269,9 +273,27 @@
  		strings_list_free(prev_utmp_ptr);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.57/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/scripts/chcat	2009-02-02 08:33:36.000000000 -0500
-@@ -291,6 +291,8 @@
-             for i in c.split(","):
++++ policycoreutils-2.0.57/scripts/chcat	2009-04-14 11:04:15.000000000 -0400
+@@ -281,16 +281,18 @@
+ def expandCats(cats):
+     newcats = []
+     for c in cats:
+-        if c.find(".") != -1:
+-            c = c.split(".")
+-            for i in range(int(c[0][1:]), int(c[1][1:]) + 1):
+-                x = ("c%d" % i)
+-                if x not in newcats:
+-                    newcats.append("c%d" % i)
+-        else:
+-            for i in c.split(","):
++        for i in c.split(","):
++            if i.find(".") != -1:
++                j = i.split(".")
++                for k in range(int(j[0][1:]), int(j[1][1:]) + 1):
++                    x = ("c%d" % k)
++                    if x not in newcats:
++                        newcats.append(x)
++            else:
                  if i not in newcats:
                      newcats.append(i)
 +    if len(newcats) > 25:
@@ -279,9 +301,41 @@
      return newcats
  
  def translate(cats):
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.57/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2008-09-22 13:25:08.000000000 -0400
++++ policycoreutils-2.0.57/scripts/fixfiles	2009-04-14 11:04:07.000000000 -0400
+@@ -3,7 +3,7 @@
+ #
+ # Script to restore labels on a SELinux box
+ #
+-# Copyright (C) 2004 Red Hat, Inc.
++# Copyright (C) 2004-2009 Red Hat, Inc.
+ # Authors: Dan Walsh <dwalsh at redhat.com>
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -36,8 +36,8 @@
+ LOGGER=/usr/sbin/logger
+ SETFILES=/sbin/setfiles
+ RESTORECON=/sbin/restorecon
+-FILESYSTEMSRW=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs ).*\(rw/{print $3}';`
+-FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs ).*\(ro/{print $3}';`
++FILESYSTEMSRW=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs | btrfs ).*\(rw/{print $3}';`
++FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs | btrfs ).*\(ro/{print $3}';`
+ FILESYSTEMS="$FILESYSTEMSRW $FILESYSTEMSRO"
+ SELINUXTYPE="targeted"
+ if [ -e /etc/selinux/config ]; then
+@@ -122,7 +122,7 @@
+ fi
+ if [ ! -z "$RPMFILES" ]; then
+     for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
+-	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -i -f - 2>&1 >> $LOGFILE
++	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE
+     done
+     exit $?
+ fi
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.57/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/semanage/seobject.py	2009-02-02 08:33:36.000000000 -0500
++++ policycoreutils-2.0.57/semanage/seobject.py	2009-02-02 08:42:15.000000000 -0500
 @@ -35,7 +35,7 @@
         import __builtin__
         __builtin__.__dict__['_'] = unicode
@@ -374,3 +428,38 @@
  				
  class booleanRecords(semanageRecords):
  	def __init__(self, store = ""):
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.57/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2008-09-22 13:25:08.000000000 -0400
++++ policycoreutils-2.0.57/setfiles/setfiles.c	2009-04-14 11:04:35.000000000 -0400
+@@ -29,6 +29,8 @@
+ static int mass_relabel;
+ static int mass_relabel_errs;
+ 
++#define STAR_COUNT 1000
++
+ static FILE *outfile = NULL;
+ static int force = 0;
+ #define STAT_BLOCK_SIZE 1
+@@ -444,11 +446,11 @@
+ 
+ 	if (progress) {
+ 		count++;
+-		if (count % 80000 == 0) {
++		if (count % (80 * STAR_COUNT) == 0) {
+ 			fprintf(stdout, "\n");
+ 			fflush(stdout);
+ 		}
+-		if (count % 1000 == 0) {
++		if (count % STAR_COUNT == 0) {
+ 			fprintf(stdout, "*");
+ 			fflush(stdout);
+ 		}
+@@ -1017,7 +1019,7 @@
+ 		free(excludeArray[i].directory);
+ 	}
+ 
+-       if (progress)
++       if (progress && count >= STAR_COUNT)
+                printf("\n");
+ 	exit(errors);
+ }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils.spec,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- policycoreutils.spec	16 Feb 2009 14:23:19 -0000	1.579
+++ policycoreutils.spec	14 Apr 2009 15:37:15 -0000	1.580
@@ -192,6 +192,12 @@
 fi
 
 %changelog
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.57-20
+- Do not print \n, if count < 1000;
+- Add /root/.ssh to restorecond.conf
+- fixfiles -R package should recursively fix files
+- Add btrfs to fixfiles
+
 * Mon Feb 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.57-19
 - Fix script created by polgengui to not refer to selinux-policy-devel
 



From mbarnes at fedoraproject.org  Tue Apr 14 14:59:59 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 14:59:59 +0000 (UTC)
Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.148,1.149
Message-ID: <20090414145959.F09EC700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23523

Modified Files:
	gtkhtml3.spec 
Log Message:

* Tue Apr 14 2009 Matthew Barnes <mbarnes at redhat.com> - 3.26.1.1-1.fc11
- Update to 3.26.1.1



Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- gtkhtml3.spec	14 Apr 2009 02:18:02 -0000	1.148
+++ gtkhtml3.spec	14 Apr 2009 14:59:29 -0000	1.149
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.26.1
+Version: 3.26.1.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -119,6 +119,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 14 2009 Matthew Barnes <mbarnes at redhat.com> - 3.26.1.1-1.fc11
+- Update to 3.26.1.1
+
 * Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 3.26.1-1.fc11
 - Update to 3.26.1
 



From nphilipp at fedoraproject.org  Tue Apr 14 15:39:55 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 15:39:55 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.189,1.190
Message-ID: <20090414153955.5FC12700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5641

Modified Files:
	gimp.spec 
Log Message:
remove rpaths from binaries (#495670)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gimp.spec	14 Apr 2009 14:15:01 -0000	1.189
+++ gimp.spec	14 Apr 2009 15:39:24 -0000	1.190
@@ -37,6 +37,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
+BuildRequires:  chrpath
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
@@ -235,9 +236,6 @@
     --with-gtkhtml2 --with-librsvg --with-poppler --with-gnomevfs --with-alsa \
     --with-webkit --with-dbus --with-script-fu
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 # convenience stuff for external plugins (e.g. xsane)
@@ -249,6 +247,9 @@
 # makeinstall macro won't work here - libexec is overriden
 make DESTDIR=%{buildroot} install
 
+# remove rpaths
+find %buildroot -type f -print0 | xargs -0 -L 20 chrpath --delete --keepgoing 2>/dev/null || :
+
 %ifos linux
 # remove .la files
 find %buildroot -name \*.la -exec %__rm -f {} \;
@@ -475,7 +476,7 @@
 
 %changelog
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-3
-- build without rpath (#495670)
+- remove rpaths from binaries (#495670)
 
 * Mon Mar 30 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-2
 - minimize dialogs with single image window (#492796, backported from trunk,



From wwoods at fedoraproject.org  Tue Apr 14 15:40:11 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Tue, 14 Apr 2009 15:40:11 +0000 (UTC)
Subject: rpms/python-bugzilla/F-10 python-bugzilla.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <20090414154011.F0508700B2@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6067

Modified Files:
	python-bugzilla.spec sources 
Log Message:
Fix bad tarball


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-10/python-bugzilla.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-bugzilla.spec	9 Apr 2009 22:24:37 -0000	1.9
+++ python-bugzilla.spec	14 Apr 2009 15:39:41 -0000	1.10
@@ -2,12 +2,12 @@
 
 Name:           python-bugzilla
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
 Group:          Development/Languages
 License:        GPLv2+
-URL:            http://fedorahosted.org/python-bugzilla
+URL:            https://fedorahosted.org/python-bugzilla
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Will Woods <wwoods at redhat.com> - 0.5.1-2
+- Fix missing util.py
+
 * Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
 - CLI: fix unicode handling
 - CLI: add --from-url flag, which parses a bugzilla query.cgi URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Apr 2009 22:24:38 -0000	1.9
+++ sources	14 Apr 2009 15:39:41 -0000	1.10
@@ -1 +1 @@
-767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2
+4787d69b843d3f462bbd7e1bf5f16c90  python-bugzilla-0.5.1.tar.bz2



From dwalsh at fedoraproject.org  Tue Apr 14 15:40:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 14 Apr 2009 15:40:31 +0000 (UTC)
Subject: rpms/policycoreutils/F-10 policycoreutils.spec,1.580,1.581
Message-ID: <20090414154031.DF36D700B2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6178

Modified Files:
	policycoreutils.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.57-20
- Do not print \n, if count < 1000;
- Add /root/.ssh to restorecond.conf
- fixfiles -R package should recursively fix files
- Add btrfs to fixfiles



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils.spec,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- policycoreutils.spec	14 Apr 2009 15:37:15 -0000	1.580
+++ policycoreutils.spec	14 Apr 2009 15:40:01 -0000	1.581
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.57
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz



From wwoods at fedoraproject.org  Tue Apr 14 15:40:55 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Tue, 14 Apr 2009 15:40:55 +0000 (UTC)
Subject: rpms/python-bugzilla/F-9 python-bugzilla.spec, 1.5, 1.6 sources, 1.5,
	1.6
Message-ID: <20090414154055.6BFB9700B2@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6277

Modified Files:
	python-bugzilla.spec sources 
Log Message:
Fix bad tarball


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-9/python-bugzilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-bugzilla.spec	9 Apr 2009 22:24:40 -0000	1.5
+++ python-bugzilla.spec	14 Apr 2009 15:40:22 -0000	1.6
@@ -2,12 +2,12 @@
 
 Name:           python-bugzilla
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
 Group:          Development/Languages
 License:        GPLv2+
-URL:            http://fedorahosted.org/python-bugzilla
+URL:            https://fedorahosted.org/python-bugzilla
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Will Woods <wwoods at redhat.com> - 0.5.1-2
+- Fix missing util.py
+
 * Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
 - CLI: fix unicode handling
 - CLI: add --from-url flag, which parses a bugzilla query.cgi URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Apr 2009 22:24:40 -0000	1.5
+++ sources	14 Apr 2009 15:40:22 -0000	1.6
@@ -1 +1 @@
-767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2
+4787d69b843d3f462bbd7e1bf5f16c90  python-bugzilla-0.5.1.tar.bz2



From wwoods at fedoraproject.org  Tue Apr 14 15:41:04 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Tue, 14 Apr 2009 15:41:04 +0000 (UTC)
Subject: rpms/python-bugzilla/EL-5 python-bugzilla.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20090414154104.7979D700B2@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/python-bugzilla/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6597

Modified Files:
	python-bugzilla.spec sources 
Log Message:
Fix bad tarball


Index: python-bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/EL-5/python-bugzilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-bugzilla.spec	9 Apr 2009 22:24:34 -0000	1.5
+++ python-bugzilla.spec	14 Apr 2009 15:41:02 -0000	1.6
@@ -2,12 +2,12 @@
 
 Name:           python-bugzilla
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A python library for interacting with Bugzilla
 
 Group:          Development/Languages
 License:        GPLv2+
-URL:            http://fedorahosted.org/python-bugzilla
+URL:            https://fedorahosted.org/python-bugzilla
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Will Woods <wwoods at redhat.com> - 0.5.1-2
+- Fix missing util.py
+
 * Thu Apr 9 2009 Will Woods <wwoods at redhat.com> - 0.5.1-1
 - CLI: fix unicode handling
 - CLI: add --from-url flag, which parses a bugzilla query.cgi URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bugzilla/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Apr 2009 22:24:35 -0000	1.5
+++ sources	14 Apr 2009 15:41:03 -0000	1.6
@@ -1 +1 @@
-767dc60d7dd6b66b2f9f69b09db89514  python-bugzilla-0.5.1.tar.bz2
+4787d69b843d3f462bbd7e1bf5f16c90  python-bugzilla-0.5.1.tar.bz2



From jakub at fedoraproject.org  Tue Apr 14 15:46:47 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 14 Apr 2009 15:46:47 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.267, 1.268 gcc.spec, 1.39,
	1.40 gcc44-power7.patch, 1.2, 1.3 gcc44-pr39543.patch, 1.1,
	1.2 sources, 1.270, 1.271 gcc44-power7-2.patch, 1.1, NONE
Message-ID: <20090414154648.0F24F700B2@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8401

Modified Files:
	.cvsignore gcc.spec gcc44-power7.patch gcc44-pr39543.patch 
	sources 
Removed Files:
	gcc44-power7-2.patch 
Log Message:
4.4.0-0.34


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- .cvsignore	9 Apr 2009 12:06:24 -0000	1.267
+++ .cvsignore	14 Apr 2009 15:46:14 -0000	1.268
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090409.tar.bz2
+gcc-4.4.0-20090414.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gcc.spec	10 Apr 2009 09:40:17 -0000	1.39
+++ gcc.spec	14 Apr 2009 15:46:15 -0000	1.40
@@ -1,9 +1,9 @@
-%define DATE 20090409
-%define SVNREV 145816
+%define DATE 20090414
+%define SVNREV 146037
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 0.33
+%define gcc_release 0.34
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -36,41 +36,13 @@
 %ifarch x86_64
 %define multilib_32_arch i586
 %endif
-
-# java-1.5.0-gcj-compat related definitions
-
-# convert an absolute path to a relative path.  each symbolic link is
-# specified relative to the directory in which it is installed so that
-# it will resolve properly within chrooted installations.
-%define abs2rel %{__perl} -e 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
-
-# python install location
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib().replace('%{_prefix}','',1)")}
-
-# Java version information and alternatives priority
-%define javaver         1.5.0
-%define javabuildver    0
-%define javadirname     java-%{javaver}-gcj-%{javaver}.%{javabuildver}
-%define origin          gcj
-%define priority        1500
-
-# installation directory names corresponding to JPackage specifications
-%define sdklnk          java-%{javaver}-%{origin}
-%define jrelnk          jre-%{javaver}-%{origin}
-%define sdkdir          java-%{javaver}-gcj-%{javaver}.%{javabuildver}
-%define jredir          %{sdkdir}/jre
-%define sdkbindir       %{_jvmdir}/%{sdklnk}/bin
-%define jrebindir       %{_jvmdir}/%{jrelnk}/bin
-%define jvmjardir       %{_jvmjardir}/java-%{javaver}-gcj-%{javaver}.%{javabuildver}
-
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
 Release: %{gcc_release}
-# libgcc, libgfortran, libmudflap and crtstuff have an exception which allows
-# linking it into any kind of programs or shared libraries without
-# restrictions.
-License: GPLv3+ and GPLv2+ with exceptions
+# libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
+# GCC Runtime Exception.
+License: GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
 Group: Development/Languages
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -82,7 +54,6 @@
 Source3: protoize.1
 %define fastjar_ver 0.97
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
-Source5: generate-cacerts.pl
 URL: http://gcc.gnu.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
@@ -177,10 +148,8 @@
 Patch22: gcc44-raw-string.patch
 Patch24: gcc44-atom.patch
 Patch26: gcc44-power7.patch
-Patch27: gcc44-power7-2.patch
 Patch28: gcc44-pr38757.patch
 Patch30: gcc44-pr39543.patch
-Patch31: gcc44-libjava-i386.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -387,165 +356,6 @@
 %description -n libgcj-src
 The Java(tm) runtime library sources for use in Eclipse.
 
-%package -n java-%{javaver}-gcj
-Summary: JPackage runtime compatibility layer for GCJ
-Group:   Development/Languages
-
-BuildRequires: gcc-java >= %{version}
-BuildRequires: libgcj-src >= %{version}
-# required for cacerts generation
-BuildRequires: openssl
-BuildRequires: python-devel
-%if ! %{bootstrap_java}
-# required for javadoc
-BuildRequires: java-1.6.0-openjdk-devel
-%endif
-BuildRequires: unzip
-
-# required for tools and libgcj.jar
-Requires:         libgcj = %{version}
-# required for directory structures
-Requires:         jpackage-utils >= 1.7.3
-# required for java.security symlink
-Requires:         %{_prefix}/%{_lib}/security/classpath.security
-%if ! %{bootstrap_java}
-# required for javadoc symlink
-Requires:         sinjdoc
-%endif
-# post requires alternatives to install tool alternatives
-Requires(post):   %{_sbindir}/alternatives
-# post requires gij to retrieve gcc version
-Requires(post):   %{_bindir}/gij
-# post rebuilds the gcj database
-Requires(post):   %{_bindir}/rebuild-gcj-db
-# rebuild-gcj-db requires gcj-dbtool
-Requires(post):   %{_bindir}/gcj-dbtool
-# rebuild-gcj-db requires findutils
-Requires(post):   findutils
-# postun requires alternatives to uninstall tool alternatives
-Requires(postun): %{_sbindir}/alternatives
-# postun requires gij to retrieve gcc version
-Requires(postun): %{_bindir}/gij
-# postun rebuilds the gcj database
-Requires(postun): %{_bindir}/rebuild-gcj-db
-# rebuild-gcj-db requires gcj-dbtool
-Requires(postun): %{_bindir}/gcj-dbtool
-# rebuild-gcj-db requires findutils
-Requires(postun): findutils
-
-# standard JPackage base provides
-Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
-Provides: jre-%{origin} = %{version}-%{release}
-Provides: jre-%{javaver} = %{version}-%{release}
-Provides: java-%{javaver} = %{version}-%{release}
-Provides: jre = %{javaver}
-Provides: java-%{origin} = %{version}-%{release}
-Provides: java = %{javaver}
-# libgcj provides, translated to JPackage provides
-Provides: jaas = %{version}-%{release}
-Provides: jce = %{version}-%{release}
-Provides: jdbc-stdext = %{version}-%{release}
-Provides: jdbc-stdext = 3.0
-Provides: jndi = %{version}-%{release}
-Provides: jndi-cos = %{version}-%{release}
-Provides: jndi-dns = %{version}-%{release}
-Provides: jndi-ldap = %{version}-%{release}
-Provides: jndi-rmi = %{version}-%{release}
-Provides: jsse = %{version}-%{release}
-Provides: java-sasl = %{version}-%{release}
-Provides: jaxp_parser_impl = %{version}-%{release}
-# java-gcj-compat base provides
-Provides: java-gcj-compat = 1.0.79
-Provides: java-1.4.2-gcj-compat > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat <= 1.4.2.0-40jpp.111
-Obsoletes: gnu-crypto <= 2.1.0-2jpp.1
-Obsoletes: gnu-crypto-sasl-jdk1.4 <= 2.1.0-2jpp.1
-Obsoletes: jessie <= 1.0.1-7
-
-%description -n java-%{javaver}-gcj
-This package installs directory structures, shell scripts and symbolic
-links to simulate a JPackage-compatible runtime environment with GCJ.
-
-%package -n java-%{javaver}-gcj-devel
-Summary: JPackage development compatibility layer for GCJ
-Group:   Development/Tools
-
-# require libgcj-src for tools.jar symlink
-Requires:         libgcj-src = %{version}
-# require base package
-Requires:         java-%{javaver}-gcj = %{version}-%{release}
-# require ecj for ecj binary
-Requires:         ecj >= 3.2.1
-# require python for aot-compile
-Requires:         python
-# require gcc-java for gjavah binary
-Requires:         gcc-java = %{version}
-# post requires alternatives to install tool alternatives
-Requires(post):   %{_sbindir}/alternatives
-# post requires gcj to retrieve gcj header file locations
-Requires(post):   %{_bindir}/gcj
-# postun requires alternatives to uninstall tool alternatives
-Requires(postun): %{_sbindir}/alternatives
-
-# standard JPackage devel provides
-Provides: java-sdk-%{javaver}-%{origin} = %{version}
-Provides: java-sdk-%{javaver} = %{version}
-Provides: java-sdk-%{origin} = %{version}
-Provides: java-sdk = %{javaver}
-Provides: java-%{javaver}-devel = %{version}
-Provides: java-devel-%{origin} = %{version}
-Provides: java-devel = %{javaver}
-# java-gcj-compat devel provides
-Provides: java-gcj-compat-devel = 1.0.79
-Provides: java-1.4.2-gcj-compat-devel > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat-devel <= 1.4.2.0-40jpp.111
-
-%description -n java-%{javaver}-gcj-devel
-This package installs directory structures, shell scripts and symbolic
-links to simulate a JPackage-compatible development environment with
-GCJ.
-
-%package -n java-%{javaver}-gcj-src
-Summary: Source files for libgcj
-Group:   Development/Libraries
-
-Requires:       java-%{javaver}-gcj = %{version}-%{release}
-Requires:       libgcj-src = %{version}
-# post requires gij to retrieve gcc version
-Requires(post): %{_bindir}/gij
-
-# java-gcj-compat src provides
-Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat-src <= 1.4.2.0-40jpp.111
-
-%description -n java-%{javaver}-gcj-src
-This package installs a src.zip symbolic link that points to a
-specific version of the libgcj sources.
-
-%if ! %{bootstrap_java}
-%package -n java-%{javaver}-gcj-javadoc
-Summary: API documentation for libgcj
-Group:   Documentation
-
-# require base package
-Requires: java-%{javaver}-gcj = %{version}-%{release}
-
-# standard JPackage javadoc provides
-Provides: java-javadoc = %{version}-%{release}
-Provides: java-%{javaver}-javadoc = %{version}-%{release}
-# java-gcj-compat javadoc provides
-Provides: java-1.4.2-gcj-compat-javadoc > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat-javadoc <= 1.4.2.0-40jpp.111
-Obsoletes: gnu-crypto-javadoc <= 2.1.0-2jpp.1
-
-%description -n java-%{javaver}-gcj-javadoc
-This package installs Javadoc API documentation for libgcj.
-%endif
-
 %package -n cpp
 Summary: The C Preprocessor
 Group: Development/Languages
@@ -626,10 +436,8 @@
 %patch22 -p0 -b .raw-string~
 %patch24 -p0 -b .atom~
 %patch26 -p0 -b .power7~
-%patch27 -p0 -b .power7-2~
 %patch28 -p0 -b .pr38757~
 #%patch30 -p0 -b .pr39543~
-%patch31 -p0 -b .libjava-i386~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -756,7 +564,6 @@
       ../gcc/Makefile.in
     ;;
 esac
-
 CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`" XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
 	GCJFLAGS="$OPT_FLAGS" \
 	../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@@ -772,11 +579,8 @@
 	--disable-libgcj \
 %else
 	--enable-java-awt=gtk --disable-dssi --enable-plugin \
-	--with-java-home=%{_prefix}/lib/jvm/%{javadirname}/jre \
-	--enable-libgcj-multifile --enable-java-home --enable-aot-compile-rpm \
-	--with-jvm-root-dir=\${prefix}/lib/jvm/%{javadirname} \
-	--with-jvm-jar-dir=\${prefix}/lib/jvm-exports/%{javadirname} \
-	--with-python-dir=%{python_sitelib} \
+	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
+	--enable-libgcj-multifile \
 %if !%{bootstrap_java}
 	--enable-java-maintainer-mode \
 %endif
@@ -1305,126 +1109,6 @@
 	  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version} \
 	  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
 touch $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
-
-# versionless symbolic links
-pushd $RPM_BUILD_ROOT%{_jvmdir}
-   ln -s %{jredir} %{jrelnk}
-   ln -s %{sdkdir} %{sdklnk}
-popd
-pushd $RPM_BUILD_ROOT%{_jvmjardir}
-   ln -s %{sdkdir} %{jrelnk}
-   ln -s %{sdkdir} %{sdklnk}
-popd
-
-# create relevant links in jre lib dir for backwards compatibility
-pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib
-for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
-    jndi-ldap jndi-rmi jsse sasl; do
-    ln -sf rt.jar $jarname.jar;
-done
-popd
-
-# security directory and provider list
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-  RELATIVE=$(%{abs2rel} %{_prefix}/%{_lib}/security \
-    %{_jvmdir}/%{jredir}/lib/security)
-  ln -sf $RELATIVE/classpath.security java.security
-popd
-# default security providers, provided by libgcj
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
-for provider in \
-  1000-gnu.java.security.provider.Gnu \
-  1001-gnu.javax.crypto.jce.GnuCrypto \
-  1002-gnu.javax.crypto.jce.GnuSasl \
-  1003-gnu.javax.net.ssl.provider.Jessie \
-  1004-gnu.javax.security.auth.callback.GnuCallbacks
-do
-  cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/$provider << EOF
-# This file's contents are ignored.  Its name, of the form
-# <priority>-<provider name>, is used by post and postun scripts to
-# rebuild the list of security providers in libgcj's
-# classpath.security file.
-EOF
-
-done
-# cacerts
-%{__perl} %{SOURCE5}
-install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-
-# classmap database directory
-install -dm 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj
-
-# set up ecj link
-RELATIVE=$(%{abs2rel} %{_prefix}/bin %{_jvmdir}/%{sdkdir}/bin)
-ln -sf \
-  $RELATIVE/ecj \
-  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac
-
-# source zip
-RELATIVE=$(%{abs2rel} %{_javadir} %{_jvmdir}/%{sdkdir})
-ln -s \
-  $RELATIVE/src-%{version}.zip \
-  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/src.zip
-
-#use fastjar instead of gjar
-RELATIVE=$(%{abs2rel} %{_prefix}/bin %{_jvmdir}/%{sdkdir}/bin)
-ln -sf \
-  $RELATIVE/fastjar \
-  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/jar
-
-# use sinjdoc if not bootstrapping
-%if ! %{bootstrap_java}
-ln -sf \
-  $RELATIVE/sinjdoc \
-  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javadoc
-%endif
-
-# arch dir for x86_64 should be x86_64, with amd64 being a link (to keep the 
-# package backwards compatible)
-%ifarch x86_64
-if [ -d $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64 ]; then
-
-  mv $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64 \
-     $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/x86_64
-
-  ln -s x86_64 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
-fi
-%endif
-
-%if ! %{bootstrap_java}
-# build and install API documentation
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/java-%{javaver}-gcj
-pushd $RPM_BUILD_ROOT%{_javadocdir}
-  ln -s java-%{javaver}-gcj java
-popd
-rm -rf docsbuild
-mkdir docsbuild
-pushd docsbuild
-  echo ==== CHECK ZIP ====
-  unzip -tq $RPM_BUILD_ROOT/usr/share/java/src-%{version}.zip || :
-  echo ==== END CHECK ZIP ====
-  if unzip -tq /usr/share/java/src-%{version}.zip
-  then
-    fastjar xvf /usr/share/java/src-%{version}.zip
-    rm -rf gnu
-    find ./ -name \*.java | xargs -n 1 dirname | sort | uniq \
-      | sed -e "s/\.\///" | sed -e "s/\//\./" \
-      | sed -e "s/\//\./" | sed -e "s/\//\./" \
-      | sed -e "s/\//\./" | sed -e "s/\//\./" \
-      | xargs %{_jvmdir}/java-openjdk/bin/javadoc -quiet \
-      -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
-      -encoding UTF-8 -breakiterator \
-      -linksource -splitindex -doctitle "GNU libgcj %{version}" \
-      -windowtitle "GNU libgcj %{version} Documentation"
-  else
-    # Work around https://bugzilla.redhat.com/show_bug.cgi?id=404981
-    touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}/package-list
-  fi
-popd
-%endif
-
-
 %endif
 
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/protoize.1
@@ -1522,128 +1206,6 @@
 
 %postun -n libgcj -p /sbin/ldconfig
 
-%post -n java-%{javaver}-gcj
-alternatives \
-  --install %{_bindir}/java java %{jrebindir}/java %{priority} \
-  --slave %{_jvmdir}/jre          jre          %{_jvmdir}/%{jrelnk} \
-  --slave %{_jvmjardir}/jre       jre_exports  %{_jvmjardir}/%{jrelnk} \
-  --slave %{_bindir}/keytool      keytool      %{jrebindir}/keytool \
-  --slave %{_bindir}/rmiregistry  rmiregistry  %{jrebindir}/rmiregistry
-
-alternatives \
-  --install %{_jvmdir}/jre-%{origin} \
-  jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
-  --slave %{_jvmjardir}/jre-%{origin} \
-  jre_%{origin}_exports %{_jvmjardir}/%{jrelnk}
-
-alternatives \
-  --install %{_jvmdir}/jre-%{javaver} \
-  jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \
-  --slave %{_jvmjardir}/jre-%{javaver} \
-  jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
-
-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
-  jaxp_parser_impl %{_javadir}/libgcj-%{version}.jar 20
-
-{
-  # Rebuild the list of security providers in classpath.security.
-  # This used to be a standalone script, rebuild-security-providers,
-  # provided by the Fedora version of jpackage-utils.  Now it is
-  # inlined here and removed from Fedora's jpackage-utils for
-  # compatibility with jpackage.org's jpackage-utils.  See:
-  # https://bugzilla.redhat.com/show_bug.cgi?id=260161
-  suffix=security/classpath.security
-  secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
-
-  for secfile in $secfiles
-  do
-    # check if this classpath.security file exists
-    [ -f "$secfile" ] || continue
-
-    sed -i '/^security\.provider\./d' "$secfile"
-
-    count=0
-    for provider in $(ls /etc/java/security/security.d)
-    do
-      count=$((count + 1))
-      echo "security.provider.${count}=${provider#*-}" >> "$secfile"
-    done
-  done
-} || :
-
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun -n java-%{javaver}-gcj
-if [ $1 -eq 0 ]
-then
-  alternatives --remove java %{jrebindir}/java
-  alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
-  alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
-  alternatives --remove jaxp_parser_impl \
-    %{_javadir}/libgcj-%{version}.jar
-fi
-
-{
-  # Rebuild the list of security providers in classpath.security
-  suffix=security/classpath.security
-  secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
-
-  for secfile in $secfiles
-  do
-    # check if this classpath.security file exists
-    [ -f "$secfile" ] || continue
-
-    sed -i '/^security\.provider\./d' "$secfile"
-
-    count=0
-    for provider in $(ls /etc/java/security/security.d)
-    do
-      count=$((count + 1))
-      echo "security.provider.${count}=${provider#*-}" >> "$secfile"
-    done
-  done
-} || :
-
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post -n java-%{javaver}-gcj-devel
-alternatives \
-  --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
-  --slave %{_jvmdir}/java         java_sdk          %{_jvmdir}/%{sdklnk} \
-  --slave %{_jvmjardir}/java      java_sdk_exports  %{_jvmjardir}/%{sdklnk} \
-  --slave %{_bindir}/javadoc      javadoc           %{sdkbindir}/javadoc \
-  --slave %{_bindir}/javah        javah             %{sdkbindir}/javah \
-  --slave %{_bindir}/jar          jar               %{sdkbindir}/jar \
-  --slave %{_bindir}/jarsigner    jarsigner         %{sdkbindir}/jarsigner \
-  --slave %{_bindir}/appletviewer appletviewer      %{sdkbindir}/appletviewer \
-  --slave %{_bindir}/rmic         rmic              %{sdkbindir}/rmic
-
-alternatives \
-  --install %{_jvmdir}/java-%{origin} \
-  java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \
-  --slave %{_jvmjardir}/java-%{origin} \
-  java_sdk_%{origin}_exports %{_jvmjardir}/%{sdklnk}
-
-alternatives \
-  --install %{_jvmdir}/java-%{javaver} \
-  java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \
-  --slave %{_jvmjardir}/java-%{javaver} \
-  java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
-
-%postun -n java-%{javaver}-gcj-devel
-if [ $1 -eq 0 ]
-then
-  alternatives --remove javac %{sdkbindir}/javac
-  alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
-  alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
-fi
-
 %post -n libgfortran -p /sbin/ldconfig
 
 %postun -n libgfortran -p /sbin/ldconfig
@@ -2093,137 +1655,6 @@
 %dir %{_prefix}/share/java
 %{_prefix}/share/java/src*.zip
 %{_prefix}/share/java/libgcj-tools-%{version}.jar
-
-%files -n java-%{javaver}-gcj
-%defattr(-,root,root,-)
-%dir %{_jvmdir}/%{sdkdir}
-%dir %{_jvmdir}/%{jredir}
-%dir %{_jvmdir}/%{jredir}/bin
-%dir %{_jvmdir}/%{jredir}/lib
-%dir %{_jvmdir}/%{jredir}/lib/%{_arch}
-%dir %{_jvmdir}/%{jredir}/lib/%{_arch}/client
-%dir %{_jvmdir}/%{jredir}/lib/%{_arch}/server
-%dir %{_jvmdir}/%{jredir}/lib/security
-%dir %{jvmjardir}
-%dir %{_prefix}/%{_lib}/gcj
-%{_bindir}/rebuild-gcj-db
-%{_jvmdir}/%{jredir}/bin/java
-%{_jvmdir}/%{jredir}/bin/keytool
-%{_jvmdir}/%{jredir}/bin/rmiregistry
-%{_jvmdir}/%{jredir}/bin/orbd
-%{_jvmdir}/%{jredir}/bin/rmid
-%{_jvmdir}/%{jredir}/bin/tnameserv
-%{_jvmdir}/%{jredir}/lib/security/cacerts
-%{_jvmdir}/%{jredir}/lib/security/java.security
-%{_jvmdir}/%{jredir}/lib/jaas.jar
-%{_jvmdir}/%{jredir}/lib/jce.jar
-%{_jvmdir}/%{jredir}/lib/jdbc-stdext.jar
-%{_jvmdir}/%{jredir}/lib/jndi-cos.jar
-%{_jvmdir}/%{jredir}/lib/jndi-dns.jar
-%{_jvmdir}/%{jredir}/lib/jndi-ldap.jar
-%{_jvmdir}/%{jredir}/lib/jndi-rmi.jar
-%{_jvmdir}/%{jredir}/lib/jndi.jar
-%{_jvmdir}/%{jredir}/lib/jsse.jar
-%{_jvmdir}/%{jredir}/lib/sasl.jar
-%ifarch x86_64
-%{_jvmdir}/%{jredir}/lib/amd64
-%endif
-%{_jvmdir}/%{jrelnk}
-%{jvmjardir}/jaas.jar
-%{jvmjardir}/jaas-%{javaver}.jar
-%{jvmjardir}/jaas-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jce.jar
-%{jvmjardir}/jce-%{javaver}.jar
-%{jvmjardir}/jce-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jdbc-stdext.jar
-%{jvmjardir}/jdbc-stdext-%{javaver}.jar
-%{jvmjardir}/jdbc-stdext-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi.jar
-%{jvmjardir}/jndi-%{javaver}.jar
-%{jvmjardir}/jndi-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-cos.jar
-%{jvmjardir}/jndi-cos-%{javaver}.jar
-%{jvmjardir}/jndi-cos-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-dns.jar
-%{jvmjardir}/jndi-dns-%{javaver}.jar
-%{jvmjardir}/jndi-dns-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-ldap.jar
-%{jvmjardir}/jndi-ldap-%{javaver}.jar
-%{jvmjardir}/jndi-ldap-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-rmi.jar
-%{jvmjardir}/jndi-rmi-%{javaver}.jar
-%{jvmjardir}/jndi-rmi-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jsse.jar
-%{jvmjardir}/jsse-%{javaver}.jar
-%{jvmjardir}/jsse-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/sasl.jar
-%{jvmjardir}/sasl-%{javaver}.jar
-%{jvmjardir}/sasl-%{javaver}.%{javabuildver}.jar
-%{_jvmjardir}/%{jrelnk}
-%{_jvmdir}/%{sdkdir}/jre/lib/rt.jar
-%{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
-%{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
-%{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
-# These must not be marked %config(noreplace).  Their file names are
-# used in post and postun.  Their contents are ignored, so replacing
-# them doesn't matter.  .rpmnew files are harmful since they're
-# interpreted by post and postun as classnames ending in rpmnew.
-%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
-%{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
-%{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
-%{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
-%{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
-
-%files -n java-%{javaver}-gcj-devel
-%defattr(-,root,root,-)
-%dir %{_jvmdir}/%{sdkdir}/bin
-%dir %{_jvmdir}/%{sdkdir}/include
-%dir %{_jvmdir}/%{sdkdir}/include/linux
-%dir %{_jvmdir}/%{sdkdir}/lib
-%{_bindir}/aot-compile
-%{_bindir}/aot-compile-rpm
-%{_prefix}/%{python_sitelib}/aotcompile.py*
-%{_prefix}/%{python_sitelib}/classfile.py*
-%{_jvmdir}/%{sdkdir}/bin/appletviewer
-%{_jvmdir}/%{sdkdir}/bin/jar
-%{_jvmdir}/%{sdkdir}/bin/jarsigner
-%{_jvmdir}/%{sdkdir}/bin/java
-%{_jvmdir}/%{sdkdir}/bin/javac
-%{_jvmdir}/%{sdkdir}/bin/javadoc
-%{_jvmdir}/%{sdkdir}/bin/javah
-%{_jvmdir}/%{sdkdir}/bin/keytool
-%{_jvmdir}/%{sdkdir}/bin/native2ascii
-%{_jvmdir}/%{sdkdir}/bin/orbd
-%{_jvmdir}/%{sdkdir}/bin/rmic
-%{_jvmdir}/%{sdkdir}/bin/rmid
-%{_jvmdir}/%{sdkdir}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir}/bin/serialver
-%{_jvmdir}/%{sdkdir}/bin/tnameserv
-%{_jvmdir}/%{sdklnk}
-%{_jvmjardir}/%{sdklnk}
-%{_jvmdir}/%{sdkdir}/include/jawt.h
-%{_jvmdir}/%{sdkdir}/include/jni.h
-%{_jvmdir}/%{sdkdir}/include/linux/jawt_md.h
-%{_jvmdir}/%{sdkdir}/include/linux/jni_md.h
-%{_jvmdir}/%{sdkdir}/lib/tools.jar
-
-%files -n java-%{javaver}-gcj-src
-%defattr(-,root,root,-)
-%{_jvmdir}/%{sdkdir}/src.zip
-
-%if ! %{bootstrap_java}
-%files -n java-%{javaver}-gcj-javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/java-%{javaver}-gcj
-# A JPackage that "provides" this directory will, in its %post script,
-# remove the existing directory and install a new symbolic link to its
-# versioned directory.  For Fedora we want clear file ownership so we
-# make java-1.5.0-gcj-javadoc own this file.  Installing the
-# corresponding JPackage over java-1.5.0-gcj-javadoc will work but
-# will invalidate this file.
-%doc %{_javadocdir}/java
-%endif
-
 %endif
 
 %if %{build_ada}
@@ -2317,8 +1748,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Fri Apr 10 2009 Deepak Bhole <dbhole at redhat.com> 4.4.0-0.33
-- create new java-1.5.0-gcj* packages to install JPackage compliant links
+* Tue Apr 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.34
+- update from gcc-4_4-branch
+  - GCC 4.4.0-rc1
+  - license changes to GPLv3+ with GCC Runtime Exception for most of the
+    lib* files
+  - PRs c++/28301, c++/39480, c++/39742, c++/39750, c/39613, c/39614, c/39673,
+	libobjc/36610, target/39740, testsuite/35621, tree-optimization/39713
 
 * Thu Apr  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.32
 - update from gcc-4_4-branch

gcc44-power7.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 gcc44-power7.patch
Index: gcc44-power7.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-power7.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc44-power7.patch	10 Mar 2009 11:23:08 -0000	1.2
+++ gcc44-power7.patch	14 Apr 2009 15:46:16 -0000	1.3
@@ -1,3 +1,247 @@
+2009-04-08  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* doc/invoke.texi (-mvsx-vector-memory): Make debug switches
+	undoucmented.
+	(-mvsx-vector-float): Ditto.
+	(-mvsx-vector-double): Ditto.
+	(-mvsx-scalar-double): Ditto.
+	(-mvsx-scalar-memory): Ditto.
+
+	* config/rs6000/vector.md (VEC_R): New iterator for reload
+	patterns.
+	(mov<mode>): Don't call rs6000_emit_move.
+	(reload_<VEC_R:mode>_<P:mptrsize>_*): New insns for
+	secondary_reload support.
+	(vec_reload_and_plus_<mptrsize>): New insns in case reload needs
+	to move a VSX/Altivec (and (plus reg reg) -16) type address to a
+	base register.
+
+	* config/rs6000/rs6000-protos.h (rs6000_secondary_reload_inner):
+	Rename from rs6000_vector_secondary_reload.
+
+	* config/rs6000/rs6000.opt (-mvsx-vector-memory): Make debug
+	switches undoucmented.
+	(-mvsx-vector-float): Ditto.
+	(-mvsx-vector-double): Ditto.
+	(-mvsx-scalar-double): Ditto.
+	(-mvsx-scalar-memory): Ditto.
+	(-mvsx-v4sf-altivec-regs): New undocumented debug switch to
+	control whether V4SF types prefer the Altivec registers or all of
+	the VSX registers.
+	(-mreload-functions): New undocumented debug switch to
+	enable/disable the secondary reload support.
+
+	* config/rs6000/rs6000.c (rs6000_regno_regclass): New global to
+	map register number to regclass.
+	(rs6000_vector_reload): New array to hold the secondary reload
+	insn codes for the vector types.
+	(rs6000_init_hard_regno_mode_ok): Fill in rs6000_regno_regclass
+	and rs6000_vector_reload.
+	(rs6000_mode_dependent_address): Using AND in addresses is mode
+	dependent.
+	(rs6000_emit_move): Add debug information if -mdebug=addr.
+	(rs6000_reload_register_type): Classify register classes for
+	secondary reload.
+	(rs6000_secondary_reload): For the vector types, add reload
+	support to support reg+reg addressing for gprs, and reg+offset
+	addressing for vector registers.
+	(rs6000_secondary_reload_inner): Rename from
+	rs6000_vector_secondary_reload.  Fixup gpr addressing to just reg
+	or reg+offset, and vector addressing to just reg or reg+reg.
+	(rs6000_preferred_reload_class): Make sure all cases set the
+	return value.  If VSX/Altivec address with AND -16, prefer using
+	an Altivec register.
+	(rs6000_secondary_memory_needed): Handle things like SFmode that
+	can go in floating registers, but not altivec registers under
+	-mvsx.
+
+	* config/rs6000/vsx.md (VSX_U): New iterator for load/store with
+	update.
+	(VSi, VSI): Reorder fields.
+	(VSd): Add support for load/store with update rewrite.
+	(VSv): Ditto.
+	(VStype_load_update): New mode attribute for load/store with
+	update.
+	(VStype_store_update): Ditto.
+	(vsx_mov<type>): Use * instead of store/load attributes for
+	multi-instruction gpr loads/stores.
+	(vsx_reload**): Delete unused reload patterns.
+
+	* config/rs6000/rs6000.h (REGNO_REG_CLASS): Change from a bunch of
+	if statements to using a lookup table.
+	(rs6000_regno_regclass): Lookup table for REGNO_REG_CLASS.
+
+	* config/rs6000/altivec.md (altivec_reload*): Delete unused reload
+	patterns.
+
+	* config/rs6000/rs6000.md (tptrsize, mptrsize): New mode
+	attributes for -m32/-m64 support.
+
+2009-03-27  Jakub Jelinek  <jakub at redhat.com>
+
+	PR target/39558
+	* macro.c (cpp_get_token): If macro_to_expand returns NULL
+	and used some tokens, add CPP_PADDING before next token.
+
+	* gcc.target/powerpc/altivec-29.c: New test.
+
+2009-03-27  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* config/rs6000/constraints.md ("wZ" constraint): New constraint
+	for using Altivec loads/stores under VSX for vector realignment.
+
+	* config/rs6000/predicates.md
+	(altivec_indexed_or_indirect_operand): New predicate to recognize
+	Altivec load/stores with an explicit AND -16.
+
+	* config/rs6000/power7.md: Whitespace change.
+
+	* config/rs6000/rs6000.opt (-mpower7-adjust-cost): New debug
+	switch.
+
+	* config/rs6000/rs6000-c.c (altivec_categorize_keyword): If -mvsx
+	and -mno-altivec, recognize the 'vector' keyword, but do not
+	recognize 'bool' or 'pixel'.  Recognize vector double under VSX.
+	(init_vector_keywords): Ditto.
+	(rs6000_macro_to_expand): Ditto.
+	(altivec_overloaded_builtins): Add VSX overloaded builtins.
+	(altivec_resolve_overloaded_builtin): Ditto.
+
+	* config/rs6000/rs6000.c (rs6000_debug_cost): New global for
+	-mdebug=cost.
+	(rs6000_debug_address_cost): New function for printing costs if
+	-mdebug=cost.
+	(rs6000_debug_rtx_costs): Ditto.
+	(rs6000_debug_adjust_cost): Ditto.
+	(rs6000_override_options): Add -mdebug=cost support.
+	(rs6000_legitimize_reload_address): Allow Altivec loads and stores
+	with an explicit AND -16, in VSX for vector realignment.
+	(rs6000_legitimize_reload_address): Ditto.
+	(rs6000_legitimate_address): Ditto.
+	(print_operand): Ditto.
+	(bdesc_3arg): Add VSX builtins.
+	(bdesc_2arg): Ditto.
+	(bdesc_1arg): Ditto.
+	(bdesc_abs): Ditto.
+	(vsx_expand_builtin): Stub function for expanding VSX builtins.
+	(rs6000_expand_builtin): Call vsx_expand_builtin.
+
+	* config/rs6000/vsx.md (most DF insns): Merge DF insns in with
+	V2DF and V4SF insns, rather than duplicating much of the code.
+	(all insns): Go through all insns, and alternatives to address the
+	full VSX register set, as a non-preferred option.
+	(vsx_mod<mode>): Add support for using Altivec load/store with
+	explicit AND -16.  Use xxlor to copy registers, not copy sign.
+	(multiply/add insns): Add an expander and unspec so the insn can
+	be used directly even if -mno-fused-madd.
+	(vsx_tdiv<mode>3): New insn for use as a builtin function.
+	(vsx_tsqrt<mode>2): Ditto.
+	(vsx_rsqrte<mode>2): Ditto.
+
+	* config/rs6000/rs6000.h (rs6000_debug_cost): New for
+	-mdebug=cost.
+	(TARGET_DEBUG_COST): Ditto.
+	(VSX_BUILTIN_*): Merge the two forms of multiply/add instructions
+	into a single insn.  Start to add overloaded VSX builtins.
+
+	* config/rs6000/altivec.md (build_vector_mask_for_load): Delete
+	VSX code.
+
+	* config/rs6000/rs6000.md (btruncsf2): Delete extra space.
+	(movdf_hardfloat32): Use xxlor instead of xscpsgndp to copy data.
+	(movdf_hardfloat64_mfpgpr): Ditto.
+	(movdf_hardfloat64): Ditto.
+
+2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	PR target/39457
+	* config/rs6000/rs6000.opt (-mdisallow-float-in-lr-ctr): Add
+	temporary debug switch.
+
+	* config/rs6000/rs6000.c (rs6000_hard_regno_mode_ok): Revert
+	behavior of disallowing 
+
+2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* config/rs6000/vector.md (vec_extract_evenv2df): Delete, insn
+	causes problems in building spec 2006.
+	(vec_extract_oddv2df): Ditto.
+	(vec_pack_trunc_v2df): New expanders for VSX vectorized
+	conversions.
+	(vec_pack_sfix_trunc_v2df): Ditto.
+	(vec_pack_ufix_trunc_v2df): Ditto.
+	(vec_unpacks_hi_v4sf): Ditto.
+	(vec_unpacks_lo_v4sf): Ditto.
+	(vec_unpacks_float_hi_v4si): Ditto.
+	(vec_unpacks_float_lo_v4si): Ditto.
+	(vec_unpacku_float_hi_v4si): Ditto.
+	(vec_unpacku_float_lo_v4si): Ditto.
+
+	* config/rs6000/rs6000-protos.h (rs6000_vector_secondary_reload):
+	Declaration for new target hook.
+
+	* config/rs6000/rs6000.c (TARGET_SECONDARY_RELOAD): Add new target
+	hook for eventually fixing up the memory references for Altivec
+	and VSX reloads to be reg+reg instead of reg+offset.  Right now,
+	this is a stub function that prints debug information if
+	-mdebug=addr and then calls default_secondary_reload.
+	(rs6000_secondary_reload): Ditto.
+	(rs6000_vector_secondary_reload): Ditto.
+	(rs6000_builtin_conversion): Add support for V2DI/V2DF
+	conversions.
[...6105 lines suppressed...]
@@ -9023,7 +10939,7 @@
     (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
  
  (define_split
-@@ -7718,7 +7828,9 @@ (define_insn "*anddi3_internal3_mc"
+@@ -7718,7 +7838,9 @@
     #
     #
     #"
@@ -9034,7 +10950,7 @@
     (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
  
  (define_split
-@@ -7858,7 +7970,7 @@ (define_insn "*booldi3_internal2"
+@@ -7858,7 +7980,7 @@
    "@
     %q4. %3,%1,%2
     #"
@@ -9043,7 +10959,7 @@
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -7887,7 +7999,7 @@ (define_insn "*booldi3_internal3"
+@@ -7887,7 +8009,7 @@
    "@
     %q4. %0,%1,%2
     #"
@@ -9052,7 +10968,7 @@
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -7958,7 +8070,7 @@ (define_insn "*boolcdi3_internal2"
+@@ -7958,7 +8080,7 @@
    "@
     %q4. %3,%2,%1
     #"
@@ -9061,7 +10977,7 @@
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -7987,7 +8099,7 @@ (define_insn "*boolcdi3_internal3"
+@@ -7987,7 +8109,7 @@
    "@
     %q4. %0,%2,%1
     #"
@@ -9070,7 +10986,7 @@
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -8024,7 +8136,7 @@ (define_insn "*boolccdi3_internal2"
+@@ -8024,7 +8146,7 @@
    "@
     %q4. %3,%1,%2
     #"
@@ -9079,7 +10995,7 @@
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -8053,7 +8165,7 @@ (define_insn "*boolccdi3_internal3"
+@@ -8053,7 +8175,7 @@
    "@
     %q4. %0,%1,%2
     #"
@@ -9088,7 +11004,7 @@
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -8070,6 +8182,51 @@ (define_split
+@@ -8070,6 +8192,51 @@
  	(compare:CC (match_dup 0)
  		    (const_int 0)))]
    "")
@@ -9140,7 +11056,7 @@
  
  ;; Now define ways of moving data around.
  
-@@ -8473,8 +8630,8 @@ (define_split
+@@ -8473,8 +8640,8 @@
  ;; The "??" is a kludge until we can figure out a more reasonable way
  ;; of handling these non-offsettable values.
  (define_insn "*movdf_hardfloat32"
@@ -9151,14 +11067,14 @@
    "! TARGET_POWERPC64 && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_DOUBLE_FLOAT 
     && (gpc_reg_operand (operands[0], DFmode)
         || gpc_reg_operand (operands[1], DFmode))"
-@@ -8553,19 +8710,30 @@ (define_insn "*movdf_hardfloat32"
+@@ -8553,19 +8720,30 @@
  	  return \"\";
  	}
      case 3:
 -      return \"fmr %0,%1\";
      case 4:
 -      return \"lfd%U1%X1 %0,%1\";
-+      return \"xscpsgndp %x0,%x1,%x1\";
++      return \"xxlor %x0,%x1,%x1\";
      case 5:
 -      return \"stfd%U0%X0 %1,%0\";
      case 6:
@@ -9187,7 +11103,7 @@
  
  (define_insn "*movdf_softfloat32"
    [(set (match_operand:DF 0 "nonimmediate_operand" "=r,r,m,r,r,r")
-@@ -8613,19 +8781,26 @@ (define_insn "*movdf_softfloat32"
+@@ -8613,19 +8791,26 @@
  ; ld/std require word-aligned displacements -> 'Y' constraint.
  ; List Y->r and r->Y before r->r for reload.
  (define_insn "*movdf_hardfloat64_mfpgpr"
@@ -9204,8 +11120,8 @@
     std%U0%X0 %1,%0
     ld%U1%X1 %0,%1
     mr %0,%1
-+   xscpsgndp %x0,%x1,%x1
-+   xscpsgndp %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
 +   lxsd%U1x %x0,%y1
 +   lxsd%U1x %x0,%y1
 +   stxsd%U0x %x1,%y0
@@ -9217,7 +11133,7 @@
     mt%0 %1
     mf%1 %0
     {cror 0,0,0|nop}
-@@ -8634,33 +8809,40 @@ (define_insn "*movdf_hardfloat64_mfpgpr"
+@@ -8634,33 +8819,40 @@
     #
     mftgpr %0,%1
     mffgpr %0,%1"
@@ -9242,8 +11158,8 @@
     std%U0%X0 %1,%0
     ld%U1%X1 %0,%1
     mr %0,%1
-+   xscpsgndp %x0,%x1,%x1
-+   xscpsgndp %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
 +   lxsd%U1x %x0,%y1
 +   lxsd%U1x %x0,%y1
 +   stxsd%U0x %x1,%y0
@@ -9265,7 +11181,7 @@
  
  (define_insn "*movdf_softfloat64"
    [(set (match_operand:DF 0 "nonimmediate_operand" "=r,Y,r,cl,r,r,r,r,*h")
-@@ -9237,15 +9419,16 @@ (define_insn "*movti_string"
+@@ -9237,15 +9429,16 @@
  (define_insn "*movti_ppc64"
    [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o<>,r")
  	(match_operand:TI 1 "input_operand" "r,r,m"))]
@@ -9285,7 +11201,7 @@
    [(set (match_dup 2) (match_dup 4))
     (set (match_dup 3) (match_dup 5))]
    "
-@@ -9271,7 +9454,7 @@ (define_split
+@@ -9271,7 +9464,7 @@
  (define_split
    [(set (match_operand:TI 0 "nonimmediate_operand" "")
          (match_operand:TI 1 "input_operand" ""))]
@@ -9294,7 +11210,7 @@
     && gpr_or_gpr_p (operands[0], operands[1])"
    [(pc)]
  { rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
-@@ -14891,6 +15074,8 @@ (define_insn "prefetch"
+@@ -14891,6 +15084,8 @@
  
  
  (include "sync.md")
@@ -9303,8 +11219,8 @@
  (include "altivec.md")
  (include "spe.md")
  (include "dfp.md")
---- gcc/config/rs6000/e500.h	(.../trunk)	(revision 144557)
-+++ gcc/config/rs6000/e500.h	(.../branches/ibm/power7-meissner)	(revision 144730)
+--- gcc/config/rs6000/e500.h	(.../trunk)	(revision 145777)
++++ gcc/config/rs6000/e500.h	(.../branches/ibm/power7-meissner)	(revision 146027)
 @@ -37,6 +37,8 @@
        {									\
  	if (TARGET_ALTIVEC)						\
@@ -9314,8 +11230,8 @@
  	if (TARGET_64BIT)						\
  	  error ("64-bit E500 not supported");				\
  	if (TARGET_HARD_FLOAT && TARGET_FPRS)				\
---- gcc/config/rs6000/driver-rs6000.c	(.../trunk)	(revision 144557)
-+++ gcc/config/rs6000/driver-rs6000.c	(.../branches/ibm/power7-meissner)	(revision 144730)
+--- gcc/config/rs6000/driver-rs6000.c	(.../trunk)	(revision 145777)
++++ gcc/config/rs6000/driver-rs6000.c	(.../branches/ibm/power7-meissner)	(revision 146027)
 @@ -343,11 +343,115 @@ detect_processor_aix (void)
  #endif /* _AIX */
  
@@ -9496,9 +11412,9 @@
    return concat (cache, "-m", argv[0], "=", cpu, " ", options, NULL);
  }
  
---- gcc/config/rs6000/sysv4.h	(.../trunk)	(revision 144557)
-+++ gcc/config/rs6000/sysv4.h	(.../branches/ibm/power7-meissner)	(revision 144730)
-@@ -119,9 +119,9 @@ do {									\
+--- gcc/config/rs6000/sysv4.h	(.../trunk)	(revision 145777)
++++ gcc/config/rs6000/sysv4.h	(.../branches/ibm/power7-meissner)	(revision 146027)
+@@ -120,9 +120,9 @@ do {									\
    else if (!strcmp (rs6000_abi_name, "i960-old"))			\
      {									\
        rs6000_current_abi = ABI_V4;					\

gcc44-pr39543.patch:

Index: gcc44-pr39543.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr39543.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc44-pr39543.patch	28 Mar 2009 09:33:10 -0000	1.1
+++ gcc44-pr39543.patch	14 Apr 2009 15:46:16 -0000	1.2
@@ -1,4 +1,4 @@
-2009-03-27  Jakub Jelinek  <jakub at redhat.com>
+2009-04-10  Jakub Jelinek  <jakub at redhat.com>
 
 	PR rtl-optimization/39543
 	* fwprop.c (forward_propagate_asm): New function.
@@ -9,8 +9,8 @@
 	* gcc.target/i386/pr39543-2.c: New test.
 	* gcc.target/i386/pr39543-3.c: New test.
 
---- gcc/fwprop.c.jj	2009-03-27 07:55:33.000000000 +0100
-+++ gcc/fwprop.c	2009-03-27 10:00:48.000000000 +0100
+--- gcc/fwprop.c.jj	2009-03-30 12:45:45.000000000 +0200
++++ gcc/fwprop.c	2009-04-10 16:19:36.000000000 +0200
 @@ -1,5 +1,5 @@
  /* RTL-based forward propagation pass for GNU compiler.
 -   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -18,7 +18,7 @@
     Contributed by Paolo Bonzini and Steven Bosscher.
  
  This file is part of GCC.
-@@ -852,6 +852,73 @@ forward_propagate_subreg (df_ref use, rt
+@@ -852,6 +852,80 @@ forward_propagate_subreg (df_ref use, rt
      return false;
  }
  
@@ -50,20 +50,27 @@
 +      asm_operands = use_pat;
 +      break;
 +    case SET:
-+      loc = &SET_DEST (use_pat);
-+      new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
-+      if (new_rtx)
-+	validate_unshare_change (use_insn, loc, new_rtx, true);
++      if (MEM_P (SET_DEST (use_pat)))
++	{
++	  loc = &SET_DEST (use_pat);
++	  new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
++	  if (new_rtx)
++	    validate_unshare_change (use_insn, loc, new_rtx, true);
++	}
 +      asm_operands = SET_SRC (use_pat);
 +      break;
 +    case PARALLEL:
 +      for (i = 0; i < XVECLEN (use_pat, 0); i++)
 +	if (GET_CODE (XVECEXP (use_pat, 0, i)) == SET)
 +	  {
-+	    loc = &SET_DEST (XVECEXP (use_pat, 0, i));
-+	    new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
-+	    if (new_rtx)
-+	      validate_unshare_change (use_insn, loc, new_rtx, true);
++	    if (MEM_P (SET_DEST (XVECEXP (use_pat, 0, i))))
++	      {
++		loc = &SET_DEST (XVECEXP (use_pat, 0, i));
++		new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg,
++					 src, speed_p);
++		if (new_rtx)
++		  validate_unshare_change (use_insn, loc, new_rtx, true);
++	      }
 +	    asm_operands = SET_SRC (XVECEXP (use_pat, 0, i));
 +	  }
 +	else if (GET_CODE (XVECEXP (use_pat, 0, i)) == ASM_OPERANDS)
@@ -92,7 +99,7 @@
  /* Try to replace USE with SRC (defined in DEF_INSN) and simplify the
     result.  */
  
-@@ -863,12 +930,16 @@ forward_propagate_and_simplify (df_ref u
+@@ -863,12 +937,16 @@ forward_propagate_and_simplify (df_ref u
    rtx src, reg, new_rtx, *loc;
    bool set_reg_equal;
    enum machine_mode mode;
@@ -111,7 +118,7 @@
      return false;
  
    /* If def and use are subreg, check if they match.  */
-@@ -900,7 +971,7 @@ forward_propagate_and_simplify (df_ref u
+@@ -900,7 +978,7 @@ forward_propagate_and_simplify (df_ref u
    if (MEM_P (src) && MEM_READONLY_P (src))
      {
        rtx x = avoid_constant_pool_reference (src);
@@ -120,7 +127,7 @@
  	{
            rtx note = find_reg_note (use_insn, REG_EQUAL, NULL_RTX);
  	  rtx old_rtx = note ? XEXP (note, 0) : SET_SRC (use_set);
-@@ -911,6 +982,9 @@ forward_propagate_and_simplify (df_ref u
+@@ -911,6 +989,9 @@ forward_propagate_and_simplify (df_ref u
        return false;
      }
  
@@ -130,8 +137,8 @@
    /* Else try simplifying.  */
  
    if (DF_REF_TYPE (use) == DF_REF_REG_MEM_STORE)
---- gcc/testsuite/gcc.target/i386/pr39543-1.c.jj	2009-03-25 16:40:18.000000000 +0100
-+++ gcc/testsuite/gcc.target/i386/pr39543-1.c	2009-03-25 16:40:50.000000000 +0100
+--- gcc/testsuite/gcc.target/i386/pr39543-1.c.jj	2009-04-09 09:47:16.000000000 +0200
++++ gcc/testsuite/gcc.target/i386/pr39543-1.c	2009-04-09 09:47:16.000000000 +0200
 @@ -0,0 +1,52 @@
 +/* PR rtl-optimization/39543 */
 +/* { dg-do compile } */
@@ -185,8 +192,8 @@
 +{
 +  bar (s0);
 +}
---- gcc/testsuite/gcc.target/i386/pr39543-2.c.jj	2009-03-25 16:40:18.000000000 +0100
-+++ gcc/testsuite/gcc.target/i386/pr39543-2.c	2009-03-25 16:40:38.000000000 +0100
+--- gcc/testsuite/gcc.target/i386/pr39543-2.c.jj	2009-04-09 09:47:16.000000000 +0200
++++ gcc/testsuite/gcc.target/i386/pr39543-2.c	2009-04-09 09:47:16.000000000 +0200
 @@ -0,0 +1,51 @@
 +/* PR rtl-optimization/39543 */
 +/* { dg-do compile } */
@@ -239,8 +246,8 @@
 +{
 +  bar (s0);
 +}
---- gcc/testsuite/gcc.target/i386/pr39543-3.c.jj	2009-03-25 16:41:29.000000000 +0100
-+++ gcc/testsuite/gcc.target/i386/pr39543-3.c	2009-03-25 16:41:19.000000000 +0100
+--- gcc/testsuite/gcc.target/i386/pr39543-3.c.jj	2009-04-09 09:47:16.000000000 +0200
++++ gcc/testsuite/gcc.target/i386/pr39543-3.c	2009-04-09 09:47:16.000000000 +0200
 @@ -0,0 +1,42 @@
 +/* PR rtl-optimization/39543 */
 +/* { dg-do compile } */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- sources	9 Apr 2009 12:06:24 -0000	1.270
+++ sources	14 Apr 2009 15:46:16 -0000	1.271
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-e45f1b49ad6bc7e78ef8887cab726943  gcc-4.4.0-20090409.tar.bz2
+004cfd0a49b225032953517a827da968  gcc-4.4.0-20090414.tar.bz2


--- gcc44-power7-2.patch DELETED ---



From nphilipp at fedoraproject.org  Tue Apr 14 15:47:01 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 15:47:01 +0000 (UTC)
Subject: rpms/system-config-samba-docs/devel .cvsignore, 1.3, 1.4 sources,
	1.4, 1.5 system-config-samba-docs.spec, 1.4, 1.5
Message-ID: <20090414154701.8C235700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8540

Modified Files:
	.cvsignore sources system-config-samba-docs.spec 
Log Message:
version 1.0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 15:25:21 -0000	1.3
+++ .cvsignore	14 Apr 2009 15:46:30 -0000	1.4
@@ -1 +1 @@
-system-config-samba-docs-1.0.5.tar.bz2
+system-config-samba-docs-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 15:25:22 -0000	1.4
+++ sources	14 Apr 2009 15:46:31 -0000	1.5
@@ -1 +1 @@
-aa53cb6078b2f76cfe6bbfc8e6ff1de9  system-config-samba-docs-1.0.5.tar.bz2
+137be52404a050568788db7cc48c4245  system-config-samba-docs-1.0.6.tar.bz2


Index: system-config-samba-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba-docs/devel/system-config-samba-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-config-samba-docs.spec	8 Apr 2009 15:25:22 -0000	1.4
+++ system-config-samba-docs.spec	14 Apr 2009 15:46:31 -0000	1.5
@@ -8,7 +8,7 @@
 
 Summary: Documentation for configuring a Samba server
 Name: system-config-samba-docs
-Version: 1.0.5
+Version: 1.0.6
 Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
@@ -65,6 +65,10 @@
 %doc %{_datadir}/gnome/help/system-config-samba
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
+- add sr at latin structure (#495589, sr at latin.po by Milo?? Komar??evi??)
+- pick up updated translations
+
 * Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.5-1
 - pull in updated translations
 



From jmoskovc at fedoraproject.org  Tue Apr 14 15:48:50 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 14 Apr 2009 15:48:50 +0000 (UTC)
Subject: rpms/abrt/F-10 abrt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090414154850.7E147700B2@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9326

Modified Files:
	.cvsignore sources 
Added Files:
	abrt.spec 
Log Message:
New version 0.0.3



--- NEW FILE abrt.spec ---
Summary: Automatic bug detection and reporting tool
Name: abrt
Version: 0.0.3
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/crash-catcher/
Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz
Source1: abrt.init
BuildRequires: dbus-c++-devel
BuildRequires: gtk2-devel
BuildRequires: curl-devel
BuildRequires: rpm-devel >= 4.6
BuildRequires: sqlite-devel > 3.0
BuildRequires: desktop-file-utils
BuildRequires: nss-devel
BuildRequires: libnotify-devel
BuildRequires: xmlrpc-c-devel
BuildRequires: file-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: abrt-0.0.1-newenum.patch

%description
%{name} is a tool to help users to detect defects in applications and 
to create a bug report with all informations needed by maintainer to fix it. 
It uses plugin system to extend its functionality.

%package libs
Summary: Libraries for %{name}
Group: System Environment/Libraries

%description libs
Libraries for %{name}.

%package devel
Summary: Development libraries for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}

%description devel
Development libraries and headers for %{name}.

%package applet
Summary: %{name}'s applet
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires: %{name}-gui

%description applet
Simple systray applet to notify user about new events detected by %{name} 
daemon.

%package gui
Summary: %{name}'s gui
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}

%description gui
GTK+ wizard for convenient bug reporting.

%package addon-ccpp
Summary: %{name}'s C/C++ addon
Group: System Environment/Libraries
Requires: gdb
Requires: %{name} = %{version}-%{release}

%description addon-ccpp
This package contains hook for C/C++ crashed programs and %{name}'s C/C++ 
analyzer plugin.

%package plugin-kerneloops
Summary: %{name}'s kerneloops plugin
Group: System Environment/Libraries
Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release}
Requires: %{name} = %{version}-%{release}

%description plugin-kerneloops
This package contains plugin for kernel crashes information collecting.
analyzer plugin.

%package plugin-kerneloopsreporter
Summary: %{name}'s kerneloops reporter plugin
Group: System Environment/Libraries
Requires: curl
Requires: %{name} = %{version}-%{release}

%description plugin-kerneloopsreporter
This package contains reporter plugin, that sends, collected by %{name}'s kerneloops
addon, information about kernel crashes to specified server, e.g. kerneloops.org.

%package plugin-sqlite3
Summary: %{name}'s SQLite3 database plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description plugin-sqlite3
This package contains SQLite3 database plugin. It is used for storing the data 
required for creating a bug report.

%package plugin-logger
Summary: %{name}'s logger reporter plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description plugin-logger
The simple reporter plugin, which writes a report to a specified file.

%package plugin-mailx
Summary: %{name}'s mailx reporter plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: mailx

%description plugin-mailx
The simple reporter plugin, which sends a report via mailx to a specified
email. 

%package plugin-runapp
Summary: %{name}'s runapp plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description plugin-runapp
Plugin to run external programs.

%package plugin-bugzilla
Summary: %{name}'s bugzilla plugin
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description plugin-bugzilla
Plugin to report bugs into the bugzilla.

%prep
%setup -q
%patch0 -p1 -b .rpm47

%build
%configure
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.la
rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib*.la
mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/%{name}
mkdir -p $RPM_BUILD_ROOT/var/cache/%{name}

desktop-file-install \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
        src/Gui/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%post libs -p /sbin/ldconfig

%preun
if [ "$1" = 0 ] ; then
  service %{name} stop >/dev/null 2>&1
  /sbin/chkconfig --del %{name}
fi

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README COPYING
%{_sbindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf
%{_initrddir}/%{name}
%dir /var/cache/%{name}
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/plugins
%dir %{_libdir}/%{name}

%files libs
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so

%files applet
%defattr(-,root,root,-)
%{_bindir}/%{name}-applet

%files gui
%defattr(-,root,root,-)
%{_bindir}/%{name}-gui
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop

%files addon-ccpp
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
%{_libdir}/%{name}/libCCpp.so*
%{_libexecdir}/hookCCpp

%files plugin-kerneloops
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf
%{_libdir}/%{name}/libKerneloops.so*

%files plugin-kerneloopsreporter
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf
%{_libdir}/%{name}/libKerneloopsReporter.so*

%files plugin-sqlite3
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf
%{_libdir}/%{name}/libSQLite3.so*

%files plugin-logger
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf
%{_libdir}/%{name}/libLogger.so*

%files plugin-mailx
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf
%{_libdir}/%{name}/libMailx.so*

%files plugin-runapp
%defattr(-,root,root,-)
%{_libdir}/%{name}/libRunApp.so*

%files plugin-bugzilla
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf
%{_libdir}/%{name}/libBugzilla.so*

%changelog
* Fri Apr 10 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.3-1
- new version
- added bz plugin
- minor fix in reporter gui
- Configurable max size of debugdump storage rhbz#490889
- Wrap lines in report to keep the window sane sized
- Fixed gui for new daemon API
- removed unneeded code
- removed dependency on args
- new guuid hash creating
- fixed local UUID
- fixed debuginfo-install checks
- renamed MW library
- Added notification thru libnotify
- fixed parsing settings of action plugins
- added support for action plugins
- kerneloops - plugin: fail gracefully.
- Added commlayer to make dbus optional
- a lot of kerneloops fixes
- new approach for getting debuginfos and backtraces
- fixed unlocking of a debugdump
- replaced language and application plugins by analyzer plugin
- more excetpion handling
- conf file isn't needed
- Plugin's configuration file is optional
- Add curl dependency
- Added column 'user' to the gui
- Gui: set the newest entry as active (ticket#23)
- Delete and Report button are no longer active if no entry is selected (ticket#41)
- Gui refreshes silently (ticket#36)
- Added error reporting over dbus to daemon, error handling in gui, about dialog

* Wed Mar 11 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.2-1
- added kerneloops addon to rpm (aarapov)
- added kerneloops addon and plugin (aarapov)
- Made Crash() private
- Applet requires gui, removed dbus-glib deps
- Closing stdout in daemon rhbz#489622
- Changed applet behaviour according to rhbz#489624
- Changed gui according to rhbz#489624, fixed dbus timeouts
- Increased timeout for async dbus calls to 60sec
- deps cleanup, signal AnalyzeComplete has the crashreport as an argument.
- Fixed empty package Description.
- Fixed problem with applet tooltip on x86_64

* Wed Mar  4 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-13
- More renaming issues fixed..
- Changed BR from gtkmm24 to gtk2
- Fixed saving of user comment
- Added a progress bar, new Comment entry for user comments..
- FILENAME_CMDLINE and FILENAME_RELEASE are optional
- new default path to DB
- Rename to abrt

* Tue Mar  3 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-12
- initial fedora release
- changed SOURCE url
- added desktop-file-utils to BR
- changed crash-catcher to %%{name}

* Mon Mar  2 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-11
- more spec file fixes according to review
- async dbus method calls, added exception handler
- avoid deadlocks (zprikryl)
- root is god (zprikryl)
- create bt only once (zprikryl)

* Sat Feb 28 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-10
- New gui
- Added new method DeleteDebugDump to daemon
- Removed gcc warnings from applet
- Rewritten CCpp hook and removed dealock in DebugDumps lib (zprikryl)
- fixed few gcc warnings
- DBusBackend improvements

* Fri Feb 27 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-9
- fixed few gcc warnings
- added scrolled window for long reports

* Thu Feb 26 2009 Adam Williamson <awilliam at redhat.com> 0.0.1-8
- fixes for all issues identified in review

* Thu Feb 26 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-7
- Fixed cancel button behaviour in reporter
- disabled core file sending
- removed some debug messages

* Thu Feb 26 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-6
- fixed DB path
- added new signals to handler
- gui should survive the dbus timeout

* Thu Feb 26 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-5
- fixed catching debuinfo install exceptions
- some gui fixes
- added check for GPGP public key

* Thu Feb 26 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-4
- changed from full bt to simple bt

* Thu Feb 26 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-3
- spec file cleanups
- changed default paths to crash DB and log DB
- fixed some memory leaks

* Tue Feb 24 2009 Jiri Moskovcak <jmoskovc at redhat.com> 0.0.1-2
- spec cleanup
- added new subpackage gui

* Wed Feb 18 2009 Zdenek Prikryl <zprikryl at redhat.com> 0.0.1-1
- initial packing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Mar 2009 20:33:12 -0000	1.1
+++ .cvsignore	14 Apr 2009 15:48:19 -0000	1.2
@@ -0,0 +1 @@
+abrt-0.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Mar 2009 20:33:12 -0000	1.1
+++ sources	14 Apr 2009 15:48:19 -0000	1.2
@@ -0,0 +1 @@
+b532b5f02a3654a2e4f859d84c396990  abrt-0.0.3.tar.gz



From nphilipp at fedoraproject.org  Tue Apr 14 15:52:10 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 15:52:10 +0000 (UTC)
Subject: rpms/system-config-date-docs/devel .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 system-config-date-docs.spec, 1.4, 1.5
Message-ID: <20090414155210.76964700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10436

Modified Files:
	.cvsignore sources system-config-date-docs.spec 
Log Message:
version 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 15:18:09 -0000	1.3
+++ .cvsignore	14 Apr 2009 15:51:39 -0000	1.4
@@ -1 +1 @@
-system-config-date-docs-1.0.6.tar.bz2
+system-config-date-docs-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 15:18:09 -0000	1.4
+++ sources	14 Apr 2009 15:51:39 -0000	1.5
@@ -1 +1 @@
-fdc0c1626c141753f8de0fcbd5f345b9  system-config-date-docs-1.0.6.tar.bz2
+eb70e0cc1ef456fc62e5ff35df897190  system-config-date-docs-1.0.7.tar.bz2


Index: system-config-date-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date-docs/devel/system-config-date-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-config-date-docs.spec	8 Apr 2009 15:18:09 -0000	1.4
+++ system-config-date-docs.spec	14 Apr 2009 15:51:39 -0000	1.5
@@ -8,7 +8,7 @@
 
 Summary: Documentation for setting the system date and time
 Name: system-config-date-docs
-Version: 1.0.6
+Version: 1.0.7
 Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
@@ -66,6 +66,10 @@
 %doc %{_datadir}/gnome/help/system-config-date
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.7-1
+- add sr at latin structure (#495591)
+- pick up updated translations
+
 * Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
 - pull in updated translations
 



From rakesh at fedoraproject.org  Tue Apr 14 15:53:32 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 14 Apr 2009 15:53:32 +0000 (UTC)
Subject: rpms/uriparser/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 uriparser.spec, 1.2, 1.3
Message-ID: <20090414155332.AC34770137@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/uriparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10967/devel

Modified Files:
	.cvsignore import.log sources uriparser.spec 
Log Message:
Upgrade to 0.7.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2008 17:26:10 -0000	1.2
+++ .cvsignore	14 Apr 2009 15:53:01 -0000	1.3
@@ -1 +1 @@
-uriparser-0.7.1.tar.gz
+uriparser-0.7.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Sep 2008 17:26:10 -0000	1.1
+++ import.log	14 Apr 2009 15:53:01 -0000	1.2
@@ -1 +1,2 @@
 uriparser-0_7_1-6_fc10:HEAD:uriparser-0.7.1-6.fc10.src.rpm:1220894085
+uriparser-0_7_5-1_fc10:HEAD:uriparser-0.7.5-1.fc10.src.rpm:1239724026


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2008 17:26:11 -0000	1.2
+++ sources	14 Apr 2009 15:53:02 -0000	1.3
@@ -1 +1 @@
-a0e04bcdec4083f24448e3aa28490ae9  uriparser-0.7.1.tar.gz
+459c2786758929b92bfbd0cee25b5aa0  uriparser-0.7.5.tar.gz


Index: uriparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uriparser/devel/uriparser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uriparser.spec	25 Feb 2009 23:22:36 -0000	1.2
+++ uriparser.spec	14 Apr 2009 15:53:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           uriparser
-Version:        0.7.1
-Release:        7%{?dist}
+Version:        0.7.5
+Release:        1%{?dist}
 Summary:        URI parsing library - RFC 3986
 
 Group:          System Environment/Libraries
@@ -8,7 +8,9 @@
 URL:            http://%{name}.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen, graphviz
+BuildRequires:  doxygen, graphviz, cpptest-devel
+Requires:       cpptest
+
 %description
 Uriparser is a strictly RFC 3986 compliant URI parsing library written
 in C. uriparser is cross-platform, fast, supports Unicode and is
@@ -32,13 +34,25 @@
 
 %build
 %configure --disable-static
+cd doc;
+
+# Remove qhelpgenerator dependency, by commenting these lines in
+# Doxygen.in
+## .qch output
+## QCH_FILE = "../uriparser-doc-0.7.5.qch"
+## QHG_LOCATION = "qhelpgenerator"
+sed -i 's/^# .qch output.*//' Doxyfile.in
+sed -i 's/^QCH.*//' Doxyfile.in
+sed -i 's/^QHG.*//' Doxyfile.in
+
+%configure; make %{?_smp_mflags}; cd ..
 make %{?_smp_mflags}
 
 # doc folder has separate configure file
-cd doc;
+#cd doc;
 # fix for automated autotool calls
-touch aclocal.m4 configure Makefile.in
-%configure; make %{?_smp_mflags}
+#touch aclocal.m4 configure Makefile.in
+#%configure; make %{?_smp_mflags}
 
 %check
 make check
@@ -48,6 +62,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+mv $RPM_BUILD_ROOT/%{_datadir}/doc/uriparser/html \
+ $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,8 +82,22 @@
 %doc doc/html
 %{_includedir}/*
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Mar 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.7.5-1
+- Upgrade to 0.7.5:
+-  Improved docs
+-  Test suite
+- 0.7.4
+-  Cleaned up code and fixed memory leaks
+- 0.7.3
+-  Builds for Cygwin, minor bug fix
+-  Changes in build system.
+-  Added: Qt Assistant documentation output
+- 0.7.2
+-  Improved and cleaned API 
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mgrepl at fedoraproject.org  Tue Apr 14 15:55:17 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 14 Apr 2009 15:55:17 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.161,
	1.162 selinux-policy.spec, 1.789, 1.790
Message-ID: <20090414155517.A392970127@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11704

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Fix iptables labeling



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- policy-20080710.patch	14 Apr 2009 10:34:48 -0000	1.161
+++ policy-20080710.patch	14 Apr 2009 15:54:45 -0000	1.162
@@ -25651,9 +25651,11 @@
  allow radvd_t self:unix_dgram_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.13/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/razor.fc	2009-02-10 15:07:15.000000000 +0100
-@@ -1,4 +1,4 @@
++++ serefpolicy-3.5.13/policy/modules/services/razor.fc	2009-04-14 17:49:39.000000000 +0200
+@@ -1,4 +1,6 @@
 -HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:ROLE_razor_home_t,s0)
++/root/\.razor(/.*)?             gen_context(system_u:object_r:spamc_home_t,s0)
++
 +HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:razor_home_t,s0)
  
  /etc/razor(/.*)?		gen_context(system_u:object_r:razor_etc_t,s0)
@@ -28048,13 +28050,11 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.13/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/spamassassin.fc	2009-04-14 10:34:25.000000000 +0200
-@@ -1,16 +1,26 @@
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.fc	2009-04-14 17:49:28.000000000 +0200
+@@ -1,16 +1,24 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
 +
-+/root/\.razor(/.*)?             gen_context(system_u:object_r:spamc_home_t,s0) 
-+
 +/etc/rc\.d/init\.d/spamd	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/mimedefang.*	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
  
@@ -33416,11 +33416,19 @@
  allow setkey_t ipsec_conf_file_t:dir list_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.5.13/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/iptables.fc	2009-03-25 22:38:51.000000000 +0100
-@@ -6,3 +6,4 @@
- /usr/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
- /usr/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
- /usr/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++++ serefpolicy-3.5.13/policy/modules/system/iptables.fc	2009-04-14 17:49:05.000000000 +0200
+@@ -1,8 +1,6 @@
+ 
+-/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables  		-- gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-restore  	-- gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-multi  	-- gen_context(system_u:object_r:iptables_exec_t,s0)
+ 
+-/usr/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/usr/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/usr/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 +/var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.5.13/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2008-10-17 14:49:13.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -r1.789 -r1.790
--- selinux-policy.spec	14 Apr 2009 10:34:50 -0000	1.789
+++ selinux-policy.spec	14 Apr 2009 15:54:46 -0000	1.790
@@ -463,6 +463,7 @@
 * Tue Apr 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-56
 - Fix fail2ban policy
 - Allow sendmail to read fail2ban_var_lib_t
+- Fix iptables labeling
 
 * Tue Apr 7 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-55
 - Allow swat_t domtrans to smbd_t



From rayvd at fedoraproject.org  Tue Apr 14 15:56:43 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Tue, 14 Apr 2009 15:56:43 +0000 (UTC)
Subject: rpms/pyodbc/F-9 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090414155643.81955700B2@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12953

Modified Files:
	.cvsignore sources 
Log Message:
New sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2008 04:31:57 -0000	1.3
+++ .cvsignore	14 Apr 2009 15:56:12 -0000	1.4
@@ -1 +1 @@
-pyodbc-2.1.1.zip
+pyodbc-2.1.4.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2008 04:31:57 -0000	1.3
+++ sources	14 Apr 2009 15:56:13 -0000	1.4
@@ -1 +1 @@
-7cdd5e8e1f5726951d820b02e3db46f2  pyodbc-2.1.1.zip
+87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip



From mitr at fedoraproject.org  Tue Apr 14 15:59:36 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 14 Apr 2009 15:59:36 +0000 (UTC)
Subject: rpms/usermode/devel usermode.spec,1.86,1.87
Message-ID: <20090414155936.2B6E9700B2@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13789

Modified Files:
	usermode.spec 
Log Message:
Add BuildRequires: intltool



Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- usermode.spec	14 Apr 2009 11:41:12 -0000	1.86
+++ usermode.spec	14 Apr 2009 15:59:05 -0000	1.87
@@ -7,10 +7,10 @@
 URL: https://fedorahosted.org/usermode/
 Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
 Requires: pam, passwd, util-linux
-BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
-BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
-BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
-BuildRequires: libselinux-devel
+BuildRequires: desktop-file-utils, e2fsprogs-devel, gettext, glib2-devel
+BuildRequires: gtk2-devel, intltool, libSM-devel, libglade2-devel
+BuildRequires: libselinux-devel, libuser-devel, pam-devel, perl-XML-Parser
+BuildRequires: startup-notification-devel, util-linux
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk



From mitr at fedoraproject.org  Tue Apr 14 16:06:30 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 14 Apr 2009 16:06:30 +0000 (UTC)
Subject: rpms/usermode/devel usermode.spec,1.87,1.88
Message-ID: <20090414160630.34053700B2@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16437

Modified Files:
	usermode.spec 
Log Message:
* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.100-2
- Add BuildRequires: intltool



Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- usermode.spec	14 Apr 2009 15:59:05 -0000	1.87
+++ usermode.spec	14 Apr 2009 16:05:59 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
 Version: 1.100
-Release: 1
+Release: 2
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/



From mjakubicek at fedoraproject.org  Tue Apr 14 16:06:39 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 14 Apr 2009 16:06:39 +0000 (UTC)
Subject: rpms/boinc-client/devel boinc-client-logrotate-d, 1.2,
	1.3 boinc-client.spec, 1.34, 1.35
Message-ID: <20090414160639.D3626700B2@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16021

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix lock file name in logrotate script, do not override
  global logrotate configuration (BZ#494179).




Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-logrotate-d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-client-logrotate-d	7 Apr 2009 23:41:59 -0000	1.2
+++ boinc-client-logrotate-d	14 Apr 2009 16:06:09 -0000	1.3
@@ -10,38 +10,28 @@
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
 # Modified: Milos Jakubicek <xjakub at fi.muni.cz>
-# Last Modified: April 7, 2009
+# Last Modified: April 12, 2009
 ######################################################################
 
-# Global Parameters
-
-missingok
-compress
-delaycompress
-notifempty
-nomail
-
-# Log Specific Parameters
-
-# boinc.log and boincerr.log
-
 /var/log/boinc.log /var/log/boincerr.log
 {
-        create 664 boinc boinc
-        sharedscripts
-        prerotate
-          if [ -f /var/lock/subsys/boinc ]; then
-            touch /var/run/boinc_was_running
-            /etc/init.d/boinc-client stop
-          fi
-        endscript
-        postrotate
-          if [ -f /var/run/boinc_was_running ]; then
-            rm /var/run/boinc_was_running
-            /etc/init.d/boinc-client start
-          fi
-        endscript
+	missingok
+	compress
+	delaycompress
+	notifempty
+	nomail
+	create 664 boinc boinc
+	sharedscripts
+	prerotate
+	if [ -f /var/lock/subsys/boinc-client ]; then
+		touch /var/run/boinc_was_running
+		service boinc-client stop >& /dev/null
+	fi
+	endscript
+	postrotate
+	if [ -f /var/run/boinc_was_running ]; then
+		rm /var/run/boinc_was_running
+		service boinc-client start >& /dev/null
+	fi
+	endscript
 }
-
-## EOF ##
-


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- boinc-client.spec	7 Apr 2009 23:41:59 -0000	1.34
+++ boinc-client.spec	14 Apr 2009 16:06:09 -0000	1.35
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	9.r%{revision}svn%{?dist}
+Release:	10.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -331,6 +331,10 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-10.r17542svn
+- Fix lock file name in logrotate script, do not override
+  global logrotate configuration (BZ#494179).
+
 * Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-9.r17542svn
 - Fix logrotate script (resolves BZ#494179).
 



From notting at fedoraproject.org  Tue Apr 14 16:07:09 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 14 Apr 2009 16:07:09 +0000 (UTC)
Subject: common Makefile.common,1.125,1.126
Message-ID: <20090414160709.D23A8700B2@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16848

Modified Files:
	Makefile.common 
Log Message:
Show progress bar during uploads.

Lubomir Rintel <lkundrak at v3.sk>




Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- Makefile.common	30 Mar 2009 21:09:02 -0000	1.125
+++ Makefile.common	14 Apr 2009 16:06:39 -0000	1.126
@@ -238,7 +238,7 @@
 # on curl's behavior on missing pages, ISEs, etc.
 UPLOAD_CERT	   = $(shell if test -f $(HOME)/.fedora.cert ; then echo " --cert $(HOME)/.fedora.cert" ; fi)
 UPLOAD_CHECK	   = curl -k $(UPLOAD_CERT) --fail --silent
-UPLOAD_CLIENT	   = curl -k $(UPLOAD_CERT) --fail --show-error --progress-bar
+UPLOAD_CLIENT	   = curl -k $(UPLOAD_CERT) --fail -o /dev/null --show-error --progress-bar
 
 upload-check = $(UPLOAD_CHECK) -F "name=$(NAME)" -F "md5sum=$${m%%[[:space:]]*}" -F "filename=$$f" $(UPLOAD_REPOSITORY)
 upload-file  = $(UPLOAD_CLIENT) -F "name=$(NAME)" -F "md5sum=$${m%%[[:space:]]*}" -F "file=@$$f" $(UPLOAD_REPOSITORY)



From pkgdb at fedoraproject.org  Tue Apr 14 16:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:07:25 +0000
Subject: [pkgdb] rmol was added for denisarnaud
Message-ID: <20090414160725.C6BCA10F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package rmol with summary C++ library of Revenue Management and Optimisation classes and functions
kevin has approved Package rmol
kevin has added a Fedora devel branch for rmol with an owner of denisarnaud
kevin has approved rmol in Fedora devel
kevin has approved Package rmol
kevin has set commit to Approved for provenpackager on rmol (Fedora devel)
kevin has set build to Approved for provenpackager on rmol (Fedora devel)
kevin has set checkout to Approved for provenpackager on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:07:28 +0000
Subject: [pkgdb] rmol (Fedora EPEL, 4) updated by kevin
Message-ID: <20090414160728.20B8D10F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for rmol
kevin has set commit to Approved for provenpackager on rmol (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on rmol (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on rmol (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:07:28 +0000
Subject: [pkgdb] rmol (Fedora, 10) updated by kevin
Message-ID: <20090414160728.2EF8E10F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rmol
kevin has set commit to Approved for provenpackager on rmol (Fedora 10)
kevin has set build to Approved for provenpackager on rmol (Fedora 10)
kevin has set checkout to Approved for provenpackager on rmol (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:07:28 +0000
Subject: [pkgdb] rmol (Fedora, 11) updated by kevin
Message-ID: <20090414160728.33E7710F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rmol
kevin has set commit to Approved for provenpackager on rmol (Fedora 11)
kevin has set build to Approved for provenpackager on rmol (Fedora 11)
kevin has set checkout to Approved for provenpackager on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:07:28 +0000
Subject: [pkgdb] rmol (Fedora EPEL, 5) updated by kevin
Message-ID: <20090414160728.3F3C710F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rmol
kevin has set commit to Approved for provenpackager on rmol (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on rmol (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on rmol (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:07:28 +0000
Subject: [pkgdb] rmol (Fedora, 9) updated by kevin
Message-ID: <20090414160728.4ABF310F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rmol
kevin has set commit to Approved for provenpackager on rmol (Fedora 9)
kevin has set build to Approved for provenpackager on rmol (Fedora 9)
kevin has set checkout to Approved for provenpackager on rmol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From kevin at fedoraproject.org  Tue Apr 14 16:07:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:07:47 +0000 (UTC)
Subject: rpms/rmol/devel - New directory
Message-ID: <20090414160747.0F9FF70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rmol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso17420/rpms/rmol/devel

Log Message:
Directory /cvs/pkgs/rpms/rmol/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:07:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:07:46 +0000 (UTC)
Subject: rpms/rmol - New directory
Message-ID: <20090414160746.5D9FF700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rmol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso17420/rpms/rmol

Log Message:
Directory /cvs/pkgs/rpms/rmol added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:08:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:08:03 +0000 (UTC)
Subject: rpms/rmol Makefile,NONE,1.1
Message-ID: <20090414160803.26265700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rmol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso17420/rpms/rmol

Added Files:
	Makefile 
Log Message:
Setup of module rmol


--- NEW FILE Makefile ---
# Top level Makefile for module rmol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 14 16:08:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:08:04 +0000 (UTC)
Subject: rpms/rmol/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090414160804.1D1DB700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rmol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso17420/rpms/rmol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rmol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rmol
# $Id: Makefile,v 1.1 2009/04/14 16:08:03 kevin Exp $
NAME := rmol
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mitr at fedoraproject.org  Tue Apr 14 16:08:20 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 14 Apr 2009 16:08:20 +0000 (UTC)
Subject: rpms/usermode/devel usermode.spec,1.88,1.89
Message-ID: <20090414160820.65BE3700B2@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17265

Modified Files:
	usermode.spec 
Log Message:
* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.100-2
- Add BuildRequires: intltool



Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- usermode.spec	14 Apr 2009 16:05:59 -0000	1.88
+++ usermode.spec	14 Apr 2009 16:07:50 -0000	1.89
@@ -108,6 +108,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.100-2
+- Add BuildRequires: intltool
+
 * Tue Apr 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.100-1
 - Update to usermode-1.100
 



From pkgdb at fedoraproject.org  Tue Apr 14 16:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:08:35 +0000
Subject: [pkgdb] xa was added for sharkcz
Message-ID: <20090414160835.5EBB810F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package xa with summary 6502/65816 cross-assembler
kevin has approved Package xa
kevin has added a Fedora devel branch for xa with an owner of sharkcz
kevin has approved xa in Fedora devel
kevin has approved Package xa
kevin has set commit to Approved for provenpackager on xa (Fedora devel)
kevin has set build to Approved for provenpackager on xa (Fedora devel)
kevin has set checkout to Approved for provenpackager on xa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xa



From mjakubicek at fedoraproject.org  Tue Apr 14 16:08:37 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 14 Apr 2009 16:08:37 +0000 (UTC)
Subject: rpms/boinc-client/F-10 boinc-client-logrotate-d, 1.2,
	1.3 boinc-client.spec, 1.29, 1.30
Message-ID: <20090414160837.582DD700B2@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17520

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix lock file name in logrotate script, do not override
  global logrotate configuration (BZ#494179).



Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client-logrotate-d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-client-logrotate-d	8 Apr 2009 00:01:02 -0000	1.2
+++ boinc-client-logrotate-d	14 Apr 2009 16:08:06 -0000	1.3
@@ -10,38 +10,28 @@
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
 # Modified: Milos Jakubicek <xjakub at fi.muni.cz>
-# Last Modified: April 7, 2009
+# Last Modified: April 12, 2009
 ######################################################################
 
-# Global Parameters
-
-missingok
-compress
-delaycompress
-notifempty
-nomail
-
-# Log Specific Parameters
-
-# boinc.log and boincerr.log
-
 /var/log/boinc.log /var/log/boincerr.log
 {
-        create 664 boinc boinc
-        sharedscripts
-        prerotate
-          if [ -f /var/lock/subsys/boinc ]; then
-            touch /var/run/boinc_was_running
-            /etc/init.d/boinc-client stop
-          fi
-        endscript
-        postrotate
-          if [ -f /var/run/boinc_was_running ]; then
-            rm /var/run/boinc_was_running
-            /etc/init.d/boinc-client start
-          fi
-        endscript
+	missingok
+	compress
+	delaycompress
+	notifempty
+	nomail
+	create 664 boinc boinc
+	sharedscripts
+	prerotate
+	if [ -f /var/lock/subsys/boinc-client ]; then
+		touch /var/run/boinc_was_running
+		service boinc-client stop >& /dev/null
+	fi
+	endscript
+	postrotate
+	if [ -f /var/run/boinc_was_running ]; then
+		rm /var/run/boinc_was_running
+		service boinc-client start >& /dev/null
+	fi
+	endscript
 }
-
-## EOF ##
-


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- boinc-client.spec	8 Apr 2009 00:01:02 -0000	1.29
+++ boinc-client.spec	14 Apr 2009 16:08:06 -0000	1.30
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	9.r%{revision}svn%{?dist}
+Release:	10.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -331,6 +331,10 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-10.r17542svn
+- Fix lock file name in logrotate script, do not override
+  global logrotate configuration (BZ#494179).
+
 * Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-9.r17542svn
 - Fix logrotate script (resolves BZ#494179).
 



From pkgdb at fedoraproject.org  Tue Apr 14 16:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:08:38 +0000
Subject: [pkgdb] xa (Fedora, 9) updated by kevin
Message-ID: <20090414160838.8692E10F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for xa
kevin has set commit to Approved for provenpackager on xa (Fedora 9)
kevin has set build to Approved for provenpackager on xa (Fedora 9)
kevin has set checkout to Approved for provenpackager on xa (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xa



From pkgdb at fedoraproject.org  Tue Apr 14 16:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:08:38 +0000
Subject: [pkgdb] xa (Fedora, 10) updated by kevin
Message-ID: <20090414160838.9134310F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xa
kevin has set commit to Approved for provenpackager on xa (Fedora 10)
kevin has set build to Approved for provenpackager on xa (Fedora 10)
kevin has set checkout to Approved for provenpackager on xa (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xa



From kevin at fedoraproject.org  Tue Apr 14 16:08:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:08:51 +0000 (UTC)
Subject: rpms/xa - New directory
Message-ID: <20090414160851.3AAE2700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE18048/rpms/xa

Log Message:
Directory /cvs/pkgs/rpms/xa added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:08:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:08:51 +0000 (UTC)
Subject: rpms/xa/devel - New directory
Message-ID: <20090414160851.88F05700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE18048/rpms/xa/devel

Log Message:
Directory /cvs/pkgs/rpms/xa/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:09:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:09:05 +0000 (UTC)
Subject: rpms/xa Makefile,NONE,1.1
Message-ID: <20090414160905.29DCE700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xa
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE18048/rpms/xa

Added Files:
	Makefile 
Log Message:
Setup of module xa


--- NEW FILE Makefile ---
# Top level Makefile for module xa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Apr 14 16:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:08:38 +0000
Subject: [pkgdb] xa (Fedora EPEL, 5) updated by kevin
Message-ID: <20090414160838.9EAF210F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for xa
kevin has set commit to Approved for provenpackager on xa (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on xa (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on xa (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xa



From kevin at fedoraproject.org  Tue Apr 14 16:09:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:09:06 +0000 (UTC)
Subject: rpms/xa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090414160906.1A489700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xa/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE18048/rpms/xa/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xa


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xa
# $Id: Makefile,v 1.1 2009/04/14 16:09:05 kevin Exp $
NAME := xa
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 14 16:09:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:09:38 +0000
Subject: [pkgdb] python-unipath was added for terjeros
Message-ID: <20090414160938.279FE10F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package python-unipath with summary Alternative to Python modules os, os.path and shutil
kevin has approved Package python-unipath
kevin has added a Fedora devel branch for python-unipath with an owner of terjeros
kevin has approved python-unipath in Fedora devel
kevin has approved Package python-unipath
kevin has set commit to Approved for provenpackager on python-unipath (Fedora devel)
kevin has set build to Approved for provenpackager on python-unipath (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-unipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-unipath



From pkgdb at fedoraproject.org  Tue Apr 14 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:09:39 +0000
Subject: [pkgdb] python-unipath (Fedora, 9) updated by kevin
Message-ID: <20090414160939.F27AF10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-unipath
kevin has set commit to Approved for provenpackager on python-unipath (Fedora 9)
kevin has set build to Approved for provenpackager on python-unipath (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-unipath (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-unipath



From pkgdb at fedoraproject.org  Tue Apr 14 16:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:09:40 +0000
Subject: [pkgdb] python-unipath (Fedora, 10) updated by kevin
Message-ID: <20090414160940.0A0A110F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-unipath
kevin has set commit to Approved for provenpackager on python-unipath (Fedora 10)
kevin has set build to Approved for provenpackager on python-unipath (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-unipath (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-unipath



From pkgdb at fedoraproject.org  Tue Apr 14 16:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:09:40 +0000
Subject: [pkgdb] python-unipath (Fedora, 11) updated by kevin
Message-ID: <20090414160940.2DF9F10F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-unipath
kevin has set commit to Approved for provenpackager on python-unipath (Fedora 11)
kevin has set build to Approved for provenpackager on python-unipath (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-unipath (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-unipath



From kevin at fedoraproject.org  Tue Apr 14 16:09:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:09:58 +0000 (UTC)
Subject: rpms/python-unipath - New directory
Message-ID: <20090414160958.837F4700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-unipath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18661/rpms/python-unipath

Log Message:
Directory /cvs/pkgs/rpms/python-unipath added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:09:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:09:59 +0000 (UTC)
Subject: rpms/python-unipath/devel - New directory
Message-ID: <20090414160959.2FEDE700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-unipath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18661/rpms/python-unipath/devel

Log Message:
Directory /cvs/pkgs/rpms/python-unipath/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:10:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:10:17 +0000 (UTC)
Subject: rpms/python-unipath Makefile,NONE,1.1
Message-ID: <20090414161017.CB718700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-unipath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18661/rpms/python-unipath

Added Files:
	Makefile 
Log Message:
Setup of module python-unipath


--- NEW FILE Makefile ---
# Top level Makefile for module python-unipath
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 14 16:10:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:10:18 +0000 (UTC)
Subject: rpms/python-unipath/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090414161018.B22E9700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-unipath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18661/rpms/python-unipath/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-unipath


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-unipath
# $Id: Makefile,v 1.1 2009/04/14 16:10:18 kevin Exp $
NAME := python-unipath
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 14 16:11:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:11:15 +0000
Subject: [pkgdb] numpy F-11 cloned from devel
Message-ID: <20090414161115.6F4BB10F87B@bastion2.fedora.phx.redhat.com>

kevin cloned numpy F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From ricky at fedoraproject.org  Tue Apr 14 16:12:12 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 16:12:12 +0000 (UTC)
Subject: rpms/supybot/F-10 supybot.spec,1.2,1.3
Message-ID: <20090414161212.B7349700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19368/F-10

Modified Files:
	supybot.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/F-10/supybot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot.spec	5 Jun 2008 23:30:13 -0000	1.2
+++ supybot.spec	14 Apr 2009 16:11:41 -0000	1.3
@@ -1,9 +1,9 @@
-%define origname Supybot
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global origname Supybot
+%{!?python_sitelib:??%global python_sitelib??%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
 Version:        0.83.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -17,12 +17,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 Requires:       python-twisted-core
 Requires:       python-twisted-names
 Requires:       python-dateutil
@@ -96,6 +91,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-8
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Jun 05 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-7
 - Uncomment python-dictclient requirement.
 



From ricky at fedoraproject.org  Tue Apr 14 16:12:13 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 16:12:13 +0000 (UTC)
Subject: rpms/supybot/F-9 supybot.spec,1.2,1.3
Message-ID: <20090414161213.215EA700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19368/F-9

Modified Files:
	supybot.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/F-9/supybot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot.spec	5 Jun 2008 23:29:51 -0000	1.2
+++ supybot.spec	14 Apr 2009 16:11:42 -0000	1.3
@@ -1,9 +1,9 @@
-%define origname Supybot
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global origname Supybot
+%{!?python_sitelib:??%global python_sitelib??%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
 Version:        0.83.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -17,12 +17,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 Requires:       python-twisted-core
 Requires:       python-twisted-names
 Requires:       python-dateutil
@@ -96,6 +91,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-8
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Jun 05 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-7
 - Uncomment python-dictclient requirement.
 



From ricky at fedoraproject.org  Tue Apr 14 16:12:13 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 16:12:13 +0000 (UTC)
Subject: rpms/supybot/devel supybot.spec,1.6,1.7
Message-ID: <20090414161213.9FAD0700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19368/devel

Modified Files:
	supybot.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/supybot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- supybot.spec	11 Apr 2009 22:18:59 -0000	1.6
+++ supybot.spec	14 Apr 2009 16:11:43 -0000	1.7
@@ -1,9 +1,9 @@
-%define origname Supybot
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global origname Supybot
+%{!?python_sitelib:??%global python_sitelib??%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
 Version:        0.83.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -22,12 +22,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 Requires:       python-twisted-core
 Requires:       python-twisted-names
 Requires:       python-dateutil
@@ -102,6 +97,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-11
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Apr 11 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-10
 - Backporting Python 2.6 fixes from Supybot git.
 



From nphilipp at fedoraproject.org  Tue Apr 14 16:13:33 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:13:33 +0000 (UTC)
Subject: rpms/system-config-nfs-docs/devel .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 system-config-nfs-docs.spec, 1.4, 1.5
Message-ID: <20090414161333.CCFB0700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20321

Modified Files:
	.cvsignore sources system-config-nfs-docs.spec 
Log Message:
version 1.0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 15:21:36 -0000	1.3
+++ .cvsignore	14 Apr 2009 16:13:02 -0000	1.4
@@ -1 +1 @@
-system-config-nfs-docs-1.0.5.tar.bz2
+system-config-nfs-docs-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 15:21:37 -0000	1.4
+++ sources	14 Apr 2009 16:13:02 -0000	1.5
@@ -1 +1 @@
-10e190f37c44c4a4023f0e2103aef0a9  system-config-nfs-docs-1.0.5.tar.bz2
+0517efb560fe1a11a55c7790f3c44f72  system-config-nfs-docs-1.0.6.tar.bz2


Index: system-config-nfs-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs-docs/devel/system-config-nfs-docs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-config-nfs-docs.spec	8 Apr 2009 15:21:37 -0000	1.4
+++ system-config-nfs-docs.spec	14 Apr 2009 16:13:02 -0000	1.5
@@ -8,7 +8,7 @@
 
 Summary: Documentation for configuring an NFS server
 Name: system-config-nfs-docs
-Version: 1.0.5
+Version: 1.0.6
 Release: 1%{?dist}
 URL: https://fedorahosted.org/%{name}
 License: GPLv2+
@@ -66,6 +66,10 @@
 %doc %{_datadir}/gnome/help/system-config-nfs
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.0.6-1
+- add sr at latin structure (#495593)
+- pick up updated translations
+
 * Wed Apr 08 2009 Nils Philippsen <nils at redhat.com> - 1.0.5-1
 - pull in updated translations
 



From pkgdb at fedoraproject.org  Tue Apr 14 16:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:15:53 +0000
Subject: [pkgdb] python-twill was added for thias
Message-ID: <20090414161553.B563510F850@bastion2.fedora.phx.redhat.com>

kevin has added Package python-twill with summary Simple scripting language for Web browsing
kevin has approved Package python-twill
kevin has added a Fedora devel branch for python-twill with an owner of thias
kevin has approved python-twill in Fedora devel
kevin has approved Package python-twill
kevin has set commit to Approved for provenpackager on python-twill (Fedora devel)
kevin has set build to Approved for provenpackager on python-twill (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-twill (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twill



From pkgdb at fedoraproject.org  Tue Apr 14 16:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:15:55 +0000
Subject: [pkgdb] python-twill (Fedora, 9) updated by kevin
Message-ID: <20090414161555.76B2E10F87B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-twill
kevin has set commit to Approved for provenpackager on python-twill (Fedora 9)
kevin has set build to Approved for provenpackager on python-twill (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-twill (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twill



From kevin at fedoraproject.org  Tue Apr 14 16:16:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:16:12 +0000 (UTC)
Subject: rpms/python-twill - New directory
Message-ID: <20090414161612.75FA1700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-twill
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21354/rpms/python-twill

Log Message:
Directory /cvs/pkgs/rpms/python-twill added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:16:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:16:13 +0000 (UTC)
Subject: rpms/python-twill/devel - New directory
Message-ID: <20090414161613.28AD5700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-twill/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21354/rpms/python-twill/devel

Log Message:
Directory /cvs/pkgs/rpms/python-twill/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr 14 16:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:15:55 +0000
Subject: [pkgdb] python-twill (Fedora, 10) updated by kevin
Message-ID: <20090414161555.833C210F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-twill
kevin has set commit to Approved for provenpackager on python-twill (Fedora 10)
kevin has set build to Approved for provenpackager on python-twill (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-twill (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twill



From kevin at fedoraproject.org  Tue Apr 14 16:16:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:16:25 +0000 (UTC)
Subject: rpms/python-twill Makefile,NONE,1.1
Message-ID: <20090414161625.96D5B700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-twill
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21354/rpms/python-twill

Added Files:
	Makefile 
Log Message:
Setup of module python-twill


--- NEW FILE Makefile ---
# Top level Makefile for module python-twill
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 14 16:16:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:16:26 +0000 (UTC)
Subject: rpms/python-twill/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090414161626.25FF2700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-twill/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21354/rpms/python-twill/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-twill


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-twill
# $Id: Makefile,v 1.1 2009/04/14 16:16:25 kevin Exp $
NAME := python-twill
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 14 16:16:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:16:38 +0000
Subject: [pkgdb] python-altgraph was added for fab
Message-ID: <20090414161638.6433710F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package python-altgraph with summary Python graph (network) package
kevin has approved Package python-altgraph
kevin has added a Fedora devel branch for python-altgraph with an owner of fab
kevin has approved python-altgraph in Fedora devel
kevin has approved Package python-altgraph
kevin has set commit to Approved for provenpackager on python-altgraph (Fedora devel)
kevin has set build to Approved for provenpackager on python-altgraph (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-altgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-altgraph



From pkgdb at fedoraproject.org  Tue Apr 14 16:16:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:16:40 +0000
Subject: [pkgdb] python-altgraph (Fedora, 9) updated by kevin
Message-ID: <20090414161640.7402C10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-altgraph
kevin has set commit to Approved for provenpackager on python-altgraph (Fedora 9)
kevin has set build to Approved for provenpackager on python-altgraph (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-altgraph (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-altgraph



From kevin at fedoraproject.org  Tue Apr 14 16:16:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:16:55 +0000 (UTC)
Subject: rpms/python-altgraph - New directory
Message-ID: <20090414161655.60292700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-altgraph
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX21715/rpms/python-altgraph

Log Message:
Directory /cvs/pkgs/rpms/python-altgraph added to the repository




From pkgdb at fedoraproject.org  Tue Apr 14 16:16:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:16:40 +0000
Subject: [pkgdb] python-altgraph (Fedora, 10) updated by kevin
Message-ID: <20090414161640.9B6C310F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-altgraph
kevin has set commit to Approved for provenpackager on python-altgraph (Fedora 10)
kevin has set build to Approved for provenpackager on python-altgraph (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-altgraph (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-altgraph



From kevin at fedoraproject.org  Tue Apr 14 16:16:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:16:56 +0000 (UTC)
Subject: rpms/python-altgraph/devel - New directory
Message-ID: <20090414161656.598B1700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-altgraph/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX21715/rpms/python-altgraph/devel

Log Message:
Directory /cvs/pkgs/rpms/python-altgraph/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:17:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:17:11 +0000 (UTC)
Subject: rpms/python-altgraph Makefile,NONE,1.1
Message-ID: <20090414161711.8F173700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-altgraph
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX21715/rpms/python-altgraph

Added Files:
	Makefile 
Log Message:
Setup of module python-altgraph


--- NEW FILE Makefile ---
# Top level Makefile for module python-altgraph
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 14 16:17:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:17:12 +0000 (UTC)
Subject: rpms/python-altgraph/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090414161712.3D693700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-altgraph/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX21715/rpms/python-altgraph/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-altgraph


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-altgraph
# $Id: Makefile,v 1.1 2009/04/14 16:17:11 kevin Exp $
NAME := python-altgraph
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 14 16:17:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:17:26 +0000
Subject: [pkgdb] python-upoints was added for fab
Message-ID: <20090414161728.3C07E10F851@bastion2.fedora.phx.redhat.com>

kevin has added Package python-upoints with summary Python modules for working with points on Earth
kevin has approved Package python-upoints
kevin has added a Fedora devel branch for python-upoints with an owner of fab
kevin has approved python-upoints in Fedora devel
kevin has approved Package python-upoints
kevin has set commit to Approved for provenpackager on python-upoints (Fedora devel)
kevin has set build to Approved for provenpackager on python-upoints (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-upoints (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-upoints



From kevin at fedoraproject.org  Tue Apr 14 16:17:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:17:39 +0000 (UTC)
Subject: rpms/python-upoints - New directory
Message-ID: <20090414161739.63DD470127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-upoints
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22103/rpms/python-upoints

Log Message:
Directory /cvs/pkgs/rpms/python-upoints added to the repository




From pkgdb at fedoraproject.org  Tue Apr 14 16:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:17:28 +0000
Subject: [pkgdb] python-upoints (Fedora, 9) updated by kevin
Message-ID: <20090414161728.A0D2B10F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-upoints
kevin has set commit to Approved for provenpackager on python-upoints (Fedora 9)
kevin has set build to Approved for provenpackager on python-upoints (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-upoints (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-upoints



From pkgdb at fedoraproject.org  Tue Apr 14 16:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:17:28 +0000
Subject: [pkgdb] python-upoints (Fedora, 10) updated by kevin
Message-ID: <20090414161728.A819510F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-upoints
kevin has set commit to Approved for provenpackager on python-upoints (Fedora 10)
kevin has set build to Approved for provenpackager on python-upoints (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-upoints (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-upoints



From kevin at fedoraproject.org  Tue Apr 14 16:17:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:17:39 +0000 (UTC)
Subject: rpms/python-upoints/devel - New directory
Message-ID: <20090414161739.B40C870127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-upoints/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22103/rpms/python-upoints/devel

Log Message:
Directory /cvs/pkgs/rpms/python-upoints/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:17:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:17:50 +0000 (UTC)
Subject: rpms/python-upoints Makefile,NONE,1.1
Message-ID: <20090414161750.BE854700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-upoints
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22103/rpms/python-upoints

Added Files:
	Makefile 
Log Message:
Setup of module python-upoints


--- NEW FILE Makefile ---
# Top level Makefile for module python-upoints
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 14 16:17:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:17:51 +0000 (UTC)
Subject: rpms/python-upoints/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090414161751.6C3BC70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-upoints/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22103/rpms/python-upoints/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-upoints


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-upoints
# $Id: Makefile,v 1.1 2009/04/14 16:17:51 kevin Exp $
NAME := python-upoints
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 14 16:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:18:24 +0000
Subject: [pkgdb] ifstatus was added for maxamillion
Message-ID: <20090414161824.ECC4810F882@bastion2.fedora.phx.redhat.com>

kevin has added Package ifstatus with summary Command line real time interface graphs using ncurses
kevin has approved Package ifstatus
kevin has added a Fedora devel branch for ifstatus with an owner of maxamillion
kevin has approved ifstatus in Fedora devel
kevin has approved Package ifstatus
kevin has set commit to Approved for provenpackager on ifstatus (Fedora devel)
kevin has set build to Approved for provenpackager on ifstatus (Fedora devel)
kevin has set checkout to Approved for provenpackager on ifstatus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifstatus



From pkgdb at fedoraproject.org  Tue Apr 14 16:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:18:27 +0000
Subject: [pkgdb] ifstatus (Fedora, 10) updated by kevin
Message-ID: <20090414161827.7C58910F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ifstatus
kevin has set commit to Approved for provenpackager on ifstatus (Fedora 10)
kevin has set build to Approved for provenpackager on ifstatus (Fedora 10)
kevin has set checkout to Approved for provenpackager on ifstatus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifstatus



From pkgdb at fedoraproject.org  Tue Apr 14 16:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:18:27 +0000
Subject: [pkgdb] ifstatus (Fedora EPEL, 5) updated by kevin
Message-ID: <20090414161827.8AFE410F889@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ifstatus
kevin has set commit to Approved for provenpackager on ifstatus (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on ifstatus (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on ifstatus (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifstatus



From kevin at fedoraproject.org  Tue Apr 14 16:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:18:38 +0000 (UTC)
Subject: rpms/ifstatus - New directory
Message-ID: <20090414161838.2C1BE700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ifstatus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22455/rpms/ifstatus

Log Message:
Directory /cvs/pkgs/rpms/ifstatus added to the repository




From pkgdb at fedoraproject.org  Tue Apr 14 16:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:18:27 +0000
Subject: [pkgdb] ifstatus (Fedora, 11) updated by kevin
Message-ID: <20090414161827.9C9DC10F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ifstatus
kevin has set commit to Approved for provenpackager on ifstatus (Fedora 11)
kevin has set build to Approved for provenpackager on ifstatus (Fedora 11)
kevin has set checkout to Approved for provenpackager on ifstatus (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifstatus



From pkgdb at fedoraproject.org  Tue Apr 14 16:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:18:27 +0000
Subject: [pkgdb] ifstatus (Fedora EPEL, 4) updated by kevin
Message-ID: <20090414161827.A1C9910F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for ifstatus
kevin has set commit to Approved for provenpackager on ifstatus (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on ifstatus (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on ifstatus (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ifstatus



From kevin at fedoraproject.org  Tue Apr 14 16:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:18:38 +0000 (UTC)
Subject: rpms/ifstatus/devel - New directory
Message-ID: <20090414161838.8452A700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ifstatus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22455/rpms/ifstatus/devel

Log Message:
Directory /cvs/pkgs/rpms/ifstatus/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 14 16:18:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:18:49 +0000 (UTC)
Subject: rpms/ifstatus Makefile,NONE,1.1
Message-ID: <20090414161849.F014D700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ifstatus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22455/rpms/ifstatus

Added Files:
	Makefile 
Log Message:
Setup of module ifstatus


--- NEW FILE Makefile ---
# Top level Makefile for module ifstatus
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 14 16:18:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 14 Apr 2009 16:18:50 +0000 (UTC)
Subject: rpms/ifstatus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090414161850.834CE700B2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ifstatus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22455/rpms/ifstatus/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ifstatus


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ifstatus
# $Id: Makefile,v 1.1 2009/04/14 16:18:50 kevin Exp $
NAME := ifstatus
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rhughes at fedoraproject.org  Tue Apr 14 16:19:37 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 16:19:37 +0000 (UTC)
Subject: rpms/PackageKit/devel
	PackageKit-0.4.6-check-package-ids-length.patch, 
	NONE, 1.1 PackageKit-0.4.6-command-not-found-length.patch, NONE,
	1.1 PackageKit-0.4.6-correct-sync-logic.patch, NONE,
	1.1 PackageKit-0.4.6-dont-use-obsolete-interfaces.patch, NONE,
	1.1 PackageKit.spec, 1.100, 1.101
Message-ID: <20090414161937.2B158700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22796

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-check-package-ids-length.patch 
	PackageKit-0.4.6-command-not-found-length.patch 
	PackageKit-0.4.6-correct-sync-logic.patch 
	PackageKit-0.4.6-dont-use-obsolete-interfaces.patch 
Log Message:
* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-3
- Backport 4 important patches from upstream.


PackageKit-0.4.6-check-package-ids-length.patch:

--- NEW FILE PackageKit-0.4.6-check-package-ids-length.patch ---
commit 79ace3ef67c14b435b2c0d8330aaa7a8774b482c
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Apr 6 17:12:33 2009 +0100

    bugfix: pk_package_ids_check is not valid when the packageids array is zero length

diff --git a/lib/packagekit-glib/pk-package-ids.c b/lib/packagekit-glib/pk-package-ids.c
index e4a39be..623fff5 100644
--- a/lib/packagekit-glib/pk-package-ids.c
+++ b/lib/packagekit-glib/pk-package-ids.c
@@ -114,7 +114,7 @@ pk_package_ids_check (gchar **package_ids)
 {
 	guint i;
 	guint size;
-	gboolean ret;
+	gboolean ret = FALSE;
 	const gchar *package_id;
 
 	g_return_val_if_fail (package_ids != NULL, FALSE);
@@ -125,9 +125,10 @@ pk_package_ids_check (gchar **package_ids)
 		package_id = package_ids[i];
 		ret = pk_package_id_check (package_id);
 		if (!ret)
-			return FALSE;
+			goto out;
 	}
-	return TRUE;
+out:
+	return ret;
 }
 
 /**
@@ -214,6 +215,7 @@ void
 pk_package_ids_test (EggTest *test)
 {
 	gboolean ret;
+	gchar *package_ids_blank[] = {};
 	gchar **package_ids;
 	guint size;
 
@@ -234,6 +236,11 @@ pk_package_ids_test (EggTest *test)
 	egg_test_assert (test, size == 2);
 
 	/************************************************************/
+	egg_test_title (test, "verify blank");
+	ret = pk_package_ids_check (package_ids_blank);
+	egg_test_assert (test, !ret);
+
+	/************************************************************/
 	egg_test_title (test, "verify");
 	ret = pk_package_ids_check (package_ids);
 	egg_test_assert (test, ret);

PackageKit-0.4.6-command-not-found-length.patch:

--- NEW FILE PackageKit-0.4.6-command-not-found-length.patch ---
commit b55842c2243c41850b839f900fe333ff3dbef2ab
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Apr 14 13:32:10 2009 +0100

    bugfix: still use command not found for commands one character long

diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index 2df80e9..f6aba8e 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -545,11 +545,12 @@ main (int argc, char *argv[])
 	/* get policy config */
 	pk_cnf_get_config (&config);
 
-	/* generate swizzles */
+	/* get length */
 	len = egg_strlen (argv[1], 1024);
-	if (len < 2)
+	if (len < 1)
 		goto out;
 
+	/* generate swizzles */
 	array = pk_cnf_find_alternatives (argv[1], len);
 
 	/* TRANSLATORS: the prefix of all the output telling the user why it's not executing */

PackageKit-0.4.6-correct-sync-logic.patch:

--- NEW FILE PackageKit-0.4.6-correct-sync-logic.patch ---
commit 28151ea72bcdd826a2d3a3f9109a073e90962169
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Apr 9 11:23:18 2009 +0100

    bugfix: correct the logic for pk_client_set_synchronous so we can set this false without returning in the duplicate check

diff --git a/lib/packagekit-glib/pk-client.c b/lib/packagekit-glib/pk-client.c
index c293677..f4294e0 100644
--- a/lib/packagekit-glib/pk-client.c
+++ b/lib/packagekit-glib/pk-client.c
@@ -383,9 +383,10 @@ pk_client_set_synchronous (PkClient *client, gboolean synchronous, GError **erro
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
 	/* are we doing this without any need? */
-	if (client->priv->synchronous) {
+	if ((client->priv->synchronous && synchronous) ||
+	    (!client->priv->synchronous && !synchronous)) {
 		if (error != NULL)
-			*error = g_error_new (PK_CLIENT_ERROR, PK_CLIENT_ERROR_FAILED, "already set synchronous!");
+			*error = g_error_new (PK_CLIENT_ERROR, PK_CLIENT_ERROR_FAILED, "already synchronous : %i!", synchronous);
 		return FALSE;
 	}
 
@@ -4732,13 +4733,33 @@ pk_client_test (EggTest *test)
 	g_free (file);
 
 	/************************************************************/
-	egg_test_title (test, "get client, then unref");
+	egg_test_title (test, "get client");
 	client = pk_client_new ();
+	egg_test_assert (test, client != NULL);
+
+	/************************************************************/
+	egg_test_title (test, "set non synchronous (fail)");
+	ret = pk_client_set_synchronous (client, FALSE, NULL);
+	egg_test_assert (test, !ret);
+
+	/************************************************************/
+	egg_test_title (test, "set synchronous (pass)");
+	ret = pk_client_set_synchronous (client, TRUE, NULL);
+	egg_test_assert (test, ret);
+
+	/************************************************************/
+	egg_test_title (test, "set synchronous again (fail)");
+	ret = pk_client_set_synchronous (client, TRUE, NULL);
+	egg_test_assert (test, !ret);
+
+	/************************************************************/
+	egg_test_title (test, "set non synchronous (pass)");
+	ret = pk_client_set_synchronous (client, FALSE, NULL);
+	egg_test_assert (test, ret);
 	g_object_unref (client);
-	egg_test_success (test, NULL);
 
 	/************************************************************/
-	egg_test_title (test, "get client");
+	egg_test_title (test, "get new client");
 	client = pk_client_new ();
 	egg_test_assert (test, client != NULL);
 
@@ -4751,8 +4772,12 @@ pk_client_test (EggTest *test)
 	g_signal_connect (client, "finished",
 			  G_CALLBACK (pk_client_test_finished_cb), test);
 
+	/************************************************************/
+	egg_test_title (test, "set synchronous after reset (pass)");
+	ret = pk_client_set_synchronous (client, TRUE, NULL);
+	egg_test_assert (test, ret);
+
 	/* run the method */
-	pk_client_set_synchronous (client, TRUE, NULL);
 	ret = pk_client_search_name (client, PK_FILTER_ENUM_NONE, "power", NULL);
 
 	/************************************************************/

PackageKit-0.4.6-dont-use-obsolete-interfaces.patch:

--- NEW FILE PackageKit-0.4.6-dont-use-obsolete-interfaces.patch ---
diff --git a/contrib/gstreamer-plugin/pk-gstreamer-install.c b/contrib/gstreamer-plugin/pk-gstreamer-install.c
index ba2f660..9c7a83f 100644
--- a/contrib/gstreamer-plugin/pk-gstreamer-install.c
+++ b/contrib/gstreamer-plugin/pk-gstreamer-install.c
@@ -274,18 +274,16 @@ main (int argc, char **argv)
 {
 	DBusGConnection *connection;
 	DBusGProxy *proxy = NULL;
-	GPtrArray *array = NULL;
-	GValueArray *varray;
-	GValue *value;
 	gboolean ret;
-	GType array_type;
 	GOptionContext *context;
 	GError *error = NULL;
 	guint i;
+	guint len;
 	gchar **codecs = NULL;
 	gint xid = 0;
 	gint retval = GST_INSTALL_PLUGINS_ERROR;
 	const gchar *suffix;
+	gchar **resources = NULL;
 
 	const GOptionEntry options[] = {
 		{ "transient-for", '\0', 0, G_OPTION_ARG_INT, &xid, "The XID of the parent window", NULL },
@@ -326,7 +324,7 @@ main (int argc, char **argv)
 	proxy = dbus_g_proxy_new_for_name (connection,
 					   "org.freedesktop.PackageKit",
 					   "/org/freedesktop/PackageKit",
-					   "org.freedesktop.PackageKit");
+					   "org.freedesktop.PackageKit.Modify");
 	if (proxy == NULL) {
 		g_print ("Cannot connect to PackageKit session service\n");
 		goto out;
@@ -335,9 +333,11 @@ main (int argc, char **argv)
 	/* use a ()(64bit) suffix for 64 bit */
 	suffix = pk_gst_get_arch_suffix ();
 
+	len = g_strv_length (codecs);
+	resources = g_new0 (gchar*, len+1);
+
 	/* process argv */
-	array = g_ptr_array_new ();
-	for (i = 0; codecs[i] != NULL; i++) {
+	for (i=0; i<len; i++) {
 		codec_info *info;
 		char *s;
 		char *type;
@@ -359,40 +359,21 @@ main (int argc, char **argv)
 			g_message ("PackageKit: non-structure: %s", type);
 		}
 
-		/* create (ss) structure */
-		varray = g_value_array_new (2);
-		value = g_new0 (GValue, 1);
-		g_value_init (value, G_TYPE_STRING);
-		g_value_set_string (value, info->codec_name);
-		g_value_array_append (varray, value);
-		g_value_reset (value);
-		g_value_set_string (value, type);
-		g_value_array_append (varray, value);
-		g_value_unset (value);
-		g_free (value);
-
-		/* add to array of (ss) */
-		g_ptr_array_add (array, varray);
+		/* "encode" */
+		resources[i] = g_strdup_printf ("%s|%s", info->codec_name, type);
 
 		/* free codec structure */
 		pk_gst_codec_free (info);
 	}
 
-	/* marshall a(ss) */
-	array_type = dbus_g_type_get_collection ("GPtrArray",
-					dbus_g_type_get_struct("GValueArray",
-						G_TYPE_STRING,
-						G_TYPE_STRING,
-						G_TYPE_INVALID));
-
 	/* don't timeout, as dbus-glib sets the timeout ~25 seconds */
 	dbus_g_proxy_set_default_timeout (proxy, INT_MAX);
 
 	/* invoke the method */
-	ret = dbus_g_proxy_call (proxy, "InstallGStreamerCodecs", &error,
+	ret = dbus_g_proxy_call (proxy, "InstallGStreamerResources", &error,
 				 G_TYPE_UINT, xid,
-				 G_TYPE_UINT, 0,
-				 array_type, array,
+				 G_TYPE_STRV, resources,
+				 G_TYPE_STRING, "hide-finished",
 				 G_TYPE_INVALID,
 				 G_TYPE_INVALID);
 	if (!ret) {
@@ -411,10 +392,7 @@ main (int argc, char **argv)
 	retval = GST_INSTALL_PLUGINS_SUCCESS;
 
 out:
-	if (array != NULL) {
-		g_ptr_array_foreach (array, (GFunc) g_value_array_free, NULL);
-		g_ptr_array_free (array, TRUE);
-	}
+	g_strfreev (resources);
 	if (proxy != NULL)
 		g_object_unref (proxy);
 	return retval;
diff --git a/contrib/gtk-module/README b/contrib/gtk-module/README
index 4cfb5fc..2e9200b 100644
--- a/contrib/gtk-module/README
+++ b/contrib/gtk-module/README
@@ -8,7 +8,7 @@ GTK_MODULES="$GTK_MODULES:/usr/lib/gtk-2.0/modules/pk-gtk-module.so" application
 The module installs a custom default pangocairo font map during gtk_init().
 Pango will then call back with any languages which need installing, and these
 are queued up. In an idle callback these are emitted as an asyncronous D-BUS
-method to the session PackageKit InstallFonts() method.
+method to the session PackageKit InstallFontconfigResources() method.
 
 If configured to do so, this will prompt the user to install new fonts.
 
@@ -16,5 +16,5 @@ Notes:
 
  * At the moment the window XID is not detected correctly, which means focus
    stealing prevention may not work properly.  We're working on this.
- * gnome-packagekit 0.4.x is needed for the InstallFonts method.
+ * gnome-packagekit 2.17.2 is needed for the InstallFontconfigResources method.
 
diff --git a/contrib/gtk-module/pk-gtk-module.c b/contrib/gtk-module/pk-gtk-module.c
index 0c38bad..0997a4b 100644
--- a/contrib/gtk-module/pk-gtk-module.c
+++ b/contrib/gtk-module/pk-gtk-module.c
@@ -119,7 +119,7 @@ pk_install_fonts_idle_cb (gpointer data G_GNUC_UNUSED)
 	proxy = dbus_g_proxy_new_for_name (connection,
 					   "org.freedesktop.PackageKit",
 					   "/org/freedesktop/PackageKit",
-					   "org.freedesktop.PackageKit");
+					   "org.freedesktop.PackageKit.Modify");
 	if (proxy == NULL) {
 		g_warning ("Could not connect to PackageKit session service\n");
 		goto out;
@@ -129,18 +129,18 @@ pk_install_fonts_idle_cb (gpointer data G_GNUC_UNUSED)
 	dbus_g_proxy_set_default_timeout (proxy, INT_MAX);
 
 	/* invoke the method */
-	call = dbus_g_proxy_begin_call (proxy, "InstallFonts",
+	call = dbus_g_proxy_begin_call (proxy, "InstallFontconfigResources",
 					pk_install_fonts_dbus_notify_cb, NULL, NULL,
 				        G_TYPE_UINT, xid,
-				        G_TYPE_UINT, 0,
 				        G_TYPE_STRV, font_tags,
+					G_TYPE_STRING, "hide-finished",
 				        G_TYPE_INVALID);
 	if (call == NULL) {
 		g_warning ("Could not send method");
 		goto out;
 	}
 
-	g_debug ("InstallFonts method invoked");
+	g_debug ("InstallFontconfigResources method invoked");
 
 out:
 	g_strfreev (font_tags);


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- PackageKit.spec	2 Apr 2009 10:34:15 -0000	1.100
+++ PackageKit.spec	14 Apr 2009 16:19:06 -0000	1.101
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -30,6 +30,18 @@
 # Already upstream: 826973135802ee453e014dc601168690b49af25d
 Patch3:    PackageKit-0.4.6-correct-allow-cancel-duplicate-logic.patch
 
+# Already upstream: 79ace3ef67c14b435b2c0d8330aaa7a8774b482c
+Patch4:    PackageKit-0.4.6-check-package-ids-length.patch
+
+# Already upstream: b55842c2243c41850b839f900fe333ff3dbef2ab
+Patch5:    PackageKit-0.4.6-command-not-found-length.patch
+
+# Already upstream: 28151ea72bcdd826a2d3a3f9109a073e90962169
+Patch6:    PackageKit-0.4.6-correct-sync-logic.patch
+
+# Already upstream: 31b85c79d516d0b97b87c2b205e9fea00c9190ed..426e6a8ba3be3408347af1d8f200956818e230cf
+Patch7:    PackageKit-0.4.6-dont-use-obsolete-interfaces.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -232,6 +244,10 @@
 %patch1 -p1 -b .no-time
 %patch2 -p1 -b .fake-repo-unicode
 %patch3 -p1 -b .correct-allow-cancel
+%patch4 -p1 -b .check-lengths
+%patch5 -p1 -b .cmd-not-found-lengths
+%patch6 -p1 -b .sync-logic
+%patch7 -p1 -b .dont-use-obsolete
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -426,6 +442,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-3
+- Backport 4 important patches from upstream.
+
 * Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-2
 - Fix installing local files with a unicode path. Fixes rh#486720
 - Fix the allow cancel duplicate filtering with a patch from upstream.



From mjakubicek at fedoraproject.org  Tue Apr 14 16:19:41 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 14 Apr 2009 16:19:41 +0000 (UTC)
Subject: rpms/boinc-client/F-9 boinc-client-logrotate-d, 1.2,
	1.3 boinc-client.spec, 1.22, 1.23
Message-ID: <20090414161941.4531E700B2@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22745

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix lock file name in logrotate script, do not override
  global logrotate configuration (BZ#494179).




Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client-logrotate-d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-client-logrotate-d	8 Apr 2009 00:12:28 -0000	1.2
+++ boinc-client-logrotate-d	14 Apr 2009 16:19:10 -0000	1.3
@@ -10,38 +10,28 @@
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
 # Modified: Milos Jakubicek <xjakub at fi.muni.cz>
-# Last Modified: April 7, 2009
+# Last Modified: April 12, 2009
 ######################################################################
 
-# Global Parameters
-
-missingok
-compress
-delaycompress
-notifempty
-nomail
-
-# Log Specific Parameters
-
-# boinc.log and boincerr.log
-
 /var/log/boinc.log /var/log/boincerr.log
 {
-        create 664 boinc boinc
-        sharedscripts
-        prerotate
-          if [ -f /var/lock/subsys/boinc ]; then
-            touch /var/run/boinc_was_running
-            /etc/init.d/boinc-client stop
-          fi
-        endscript
-        postrotate
-          if [ -f /var/run/boinc_was_running ]; then
-            rm /var/run/boinc_was_running
-            /etc/init.d/boinc-client start
-          fi
-        endscript
+	missingok
+	compress
+	delaycompress
+	notifempty
+	nomail
+	create 664 boinc boinc
+	sharedscripts
+	prerotate
+	if [ -f /var/lock/subsys/boinc-client ]; then
+		touch /var/run/boinc_was_running
+		service boinc-client stop >& /dev/null
+	fi
+	endscript
+	postrotate
+	if [ -f /var/run/boinc_was_running ]; then
+		rm /var/run/boinc_was_running
+		service boinc-client start >& /dev/null
+	fi
+	endscript
 }
-
-## EOF ##
-


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- boinc-client.spec	8 Apr 2009 00:12:28 -0000	1.22
+++ boinc-client.spec	14 Apr 2009 16:19:10 -0000	1.23
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	8.r%{revision}svn%{?dist}
+Release:	9.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -330,6 +330,10 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-9.r17542svn
+- Fix lock file name in logrotate script, do not override
+  global logrotate configuration (BZ#494179).
+
 * Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-8.r17542svn
 - Fix logrotate script (resolves BZ#494179).
 



From nphilipp at fedoraproject.org  Tue Apr 14 16:23:55 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:23:55 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.95, 1.96 sources, 1.104,
	1.105 system-config-date.spec, 1.110, 1.111
Message-ID: <20090414162355.88D5B700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24588

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	22 Dec 2008 17:52:00 -0000	1.95
+++ .cvsignore	14 Apr 2009 16:23:24 -0000	1.96
@@ -1 +1 @@
-system-config-date-1.9.36.tar.bz2
+system-config-date-1.9.37.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	22 Dec 2008 18:04:22 -0000	1.104
+++ sources	14 Apr 2009 16:23:24 -0000	1.105
@@ -1 +1 @@
-fdf5da74d3256620d761718b65afd21d  system-config-date-1.9.36.tar.bz2
+c7e97999733c426dcc609781e860d1bf  system-config-date-1.9.37.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- system-config-date.spec	26 Feb 2009 05:01:17 -0000	1.110
+++ system-config-date.spec	14 Apr 2009 16:23:25 -0000	1.111
@@ -14,8 +14,8 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.36
-Release: 2%{?dist}
+Version: 1.9.37
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
@@ -115,8 +115,8 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.36-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2008 Nils Philippsen <nils at redhat.com> - 1.9.37-1
+- pick up updated translations
 
 * Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> - 1.9.36-1
 - fix typo in Source0 URL



From limb at fedoraproject.org  Tue Apr 14 16:24:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 14 Apr 2009 16:24:22 +0000 (UTC)
Subject: rpms/numpy/devel numpy.spec,1.33,1.34
Message-ID: <20090414162422.3D6C8700B2@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24650

Modified Files:
	numpy.spec 
Log Message:
Split out f2py, BZ494113.



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- numpy.spec	7 Apr 2009 16:19:56 -0000	1.33
+++ numpy.spec	14 Apr 2009 16:23:51 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -15,10 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel lapack-devel python-setuptools gcc-gfortran atlas python-nose
-Requires:	python-nose python-devel
-
-Provides:       f2py
-Obsoletes:      f2py <= 2.45.241_1927
+Requires:	python-nose
 
 %description
 NumPy is a general-purpose array-processing package designed to
@@ -32,6 +29,17 @@
 basic linear algebra and random number generation. Also included in
 this package is a version of f2py that works properly with NumPy.
 
+%package f2py
+Summary:        f2py for numpy
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-devel
+Provides:       f2py
+Obsoletes:      f2py <= 2.45.241_1927
+
+%description f2py
+This package includes a version of f2py that works properly with NumPy.
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .f2py
@@ -57,6 +65,15 @@
 ln -s f2py f2py.numpy
 popd &> /dev/null
 
+# Remove doc files. They should in in %doc
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/COMPATIBILITY
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/DEV_README.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/INSTALL.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/LICENSE.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/README.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/THANKS.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/site.cfg.example
+
 %check
 pushd doc &> /dev/null
 PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test()"
@@ -67,15 +84,35 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs-f2py doc/* LICENSE.txt
-%{_bindir}/*
-%{_mandir}/man*/*
-%{python_sitearch}/%{name}
+%doc docs-f2py doc/* LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
+%dir %{python_sitearch}/%{name}
+%{python_sitearch}/%{name}/*.py*
+%{python_sitearch}/%{name}/core
+%{python_sitearch}/%{name}/lib
+%{python_sitearch}/%{name}/ma
+%{python_sitearch}/%{name}/numarray
+%{python_sitearch}/%{name}/oldnumeric
+%{python_sitearch}/%{name}/random
+%{python_sitearch}/%{name}/testing
+%{python_sitearch}/%{name}/tests
 %if 0%{?fedora} >= 9
 %{python_sitearch}/%{name}-*.egg-info
 %endif
 
+%files f2py
+%defattr(-,root,root,-)
+%{_mandir}/man*/*
+%{_bindir}/f2py
+%{_bindir}/f2py.numpy
+%{python_sitearch}/%{name}/distutils
+%{python_sitearch}/%{name}/f2py
+%{python_sitearch}/%{name}/fft
+%{python_sitearch}/%{name}/linalg
+
 %changelog
+* Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-2
+- Split out f2py into subpackage, thanks Peter Robinson pbrobinson at gmail.com.
+
 * Tue Apr 07 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-1
 - Update to latest upstream.
 - Fixed Source0 URL.



From maxamillion at fedoraproject.org  Tue Apr 14 16:24:35 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 14 Apr 2009 16:24:35 +0000 (UTC)
Subject: rpms/ifstatus/devel ifstatus-1.1.0-fedora.patch, NONE,
	1.1 ifstatus-1.1.0-gcc44.patch, NONE, 1.1 ifstatus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414162435.C372D700B2@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24701/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ifstatus-1.1.0-fedora.patch ifstatus-1.1.0-gcc44.patch 
	ifstatus.spec import.log 
Log Message:
Initial package of ifstatus for fedora



ifstatus-1.1.0-fedora.patch:

--- NEW FILE ifstatus-1.1.0-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which honors $RPM_OPT_FLAGS by default and allows to override all makefile
variables. Using of variables as been also corrected at missing points.

--- ifstatus/Makefile			2005-07-13 03:22:03.000000000 +0200
+++ ifstatus/Makefile.fedora		2009-04-14 00:48:26.000000000 +0200
@@ -3,7 +3,7 @@
 
 GCC = g++
 LDFLAGS = -lncurses
-CFLAGS = -O2 -Wall
+CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS)
 
 BIN = ifstatus
 OBJ = BorderDecorator.o\
@@ -23,9 +23,10 @@
 	Window.o
 	
 
-INSTDIR = /usr/local/bin
-INSTALL=/usr/bin/install
-INSTALL_PARMS=-o 0 -g 0 -s -m 0755
+MKDIR := mkdir -p
+INSTDIR := /usr/local/bin
+INSTALL := /usr/bin/install
+INSTALL_PARMS := -o 0 -g 0 -s -m 0755
 
 all : ifstatus printdone
 
@@ -38,7 +39,8 @@
 clean:
 	rm -f ${BIN} *.o core *~ 
 install:
-	$(INSTALL) $(INSTALL_PARMS) ifstatus /usr/local/bin
+	$(MKDIR) $(DESTDIR)$(INSTDIR)
+	$(INSTALL) $(INSTALL_PARMS) $(BIN) $(DESTDIR)$(INSTDIR)
 
 
 

ifstatus-1.1.0-gcc44.patch:

--- NEW FILE ifstatus-1.1.0-gcc44.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which adds a few missing #include lines to not violate the C++ standards
and to build successfully with G++ version 4.3 and 4.4.

--- ifstatus/IFStatus.cc		2006-01-17 00:18:46.000000000 +0100
+++ ifstatus/IFStatus.cc.gcc44		2009-04-14 00:42:04.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "IFStatus.h"
 #include "Graph.h"
--- ifstatus/GraphDecorator.cc		2006-01-17 01:00:59.000000000 +0100
+++ ifstatus/GraphDecorator.cc.gcc44	2009-04-14 00:41:38.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
+#include <cstdlib> 
 #include "GraphDecorator.h"
 #include "Config.h"
 
--- ifstatus/Interface.cc		2006-01-17 02:48:27.000000000 +0100
+++ ifstatus/Interface.cc.gcc44		2009-04-14 00:42:23.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interface.h"
 #include "Config.h"
 
--- ifstatus/Config.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Config.cc.gcc44		2009-04-14 00:40:13.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "Config.h"
 #include "Util.h"
--- ifstatus/Email.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Email.cc.gcc44		2009-04-14 00:40:44.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Email.h"
 #include "Config.h"
 
--- ifstatus/Interfaces.cc		2006-01-16 23:45:33.000000000 +0100
+++ ifstatus/Interfaces.cc.gcc44	2009-04-14 00:42:45.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interfaces.h"
 #include "Config.h"
 #include "Util.h"


--- NEW FILE ifstatus.spec ---
Name:           ifstatus
Version:        1.1.0
Release:        4%{?dist}
Summary:        Command line real time interface graphs using ncurses

Group:          Applications/Internet
License:        GPLv2+
URL:            http://ifstatus.sourceforge.net/
Source0:        http://ifstatus.sourceforge.net/download/%{name}-v%{version}.tar.gz
Patch0:         ifstatus-1.1.0-gcc44.patch
Patch1:         ifstatus-1.1.0-fedora.patch

BuildRoot:      %{_tmppath}/%{name}-v%{version}-%{release}-buildroot

BuildRequires:  ncurses-devel

%description
IFStatus was developed for Linux users that are usually in console mode. 
It is a simple, easy to use program for displaying commonly needed / wanted 
statistics in real time about ingoing and outgoing traffic of multiple 
network interfaces that is usually hard to find, with a simple and 
effecient view. It is the substitute for PPPStatus and EthStatus projects. 

%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .fedora

%build
# The Makefile of the upstream project is non-automake and can't handle 
# the %{?smp_mflags}
make


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTDIR=%{_sbindir} INSTALL_PARMS="-m 0755"

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_sbindir}/%{name}

%changelog
* Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
- Typo in the Summary field.

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-3
- Fixed rpm group tag to match similar utilities
- Fixed build for gcc44

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-2
- Fixed rpm Group tag

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-1
- First build of ifstatus


--- NEW FILE import.log ---
ifstatus-1_1_0-4:HEAD:ifstatus-1.1.0-4.src.rpm:1239726196


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:18:50 -0000	1.1
+++ .cvsignore	14 Apr 2009 16:24:05 -0000	1.2
@@ -0,0 +1 @@
+ifstatus-v1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:18:50 -0000	1.1
+++ sources	14 Apr 2009 16:24:05 -0000	1.2
@@ -0,0 +1 @@
+f4d413f880754fd6677290160f8bc5d7  ifstatus-v1.1.0.tar.gz



From thias at fedoraproject.org  Tue Apr 14 16:24:42 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue, 14 Apr 2009 16:24:42 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.spec,1.46,1.47
Message-ID: <20090414162442.56F7B700B2@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24900

Modified Files:
	proftpd.spec 
Log Message:
Update the tcp_wrappers BR to be just /usr/include/tcpd.h instead.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- proftpd.spec	9 Apr 2009 18:24:43 -0000	1.46
+++ proftpd.spec	14 Apr 2009 16:24:11 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 2%{?prever:.%{prever}}%{?dist}
+Release: 2.1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -24,12 +24,9 @@
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
 BuildRequires: zlib-devel
-# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-# We'll need to find a better way to do this once RHEL6 comes out
-BuildRequires: tcp_wrappers
-%if 0%{?fedora:1}
-BuildRequires: tcp_wrappers-devel
-%endif
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers but in
+# all recent Fedoras it's in tcp_wrappers-devel
+BuildRequires: /usr/include/tcpd.h
 BuildRequires: openldap-devel
 BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
@@ -207,6 +204,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2.1
+- Update the tcp_wrappers BR to be just /usr/include/tcpd.h instead.
+
 * Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
 - Fix tcp_wrappers-devel BR conditional.
 



From tibbs at fedoraproject.org  Tue Apr 14 16:27:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 14 Apr 2009 16:27:09 +0000 (UTC)
Subject: rpms/nazghul/devel nazghul-desktop.patch, 1.1, 1.2 nazghul.spec,
	1.21, 1.22
Message-ID: <20090414162709.F2FA270138@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/nazghul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26186

Modified Files:
	nazghul-desktop.patch nazghul.spec 
Log Message:
* Tue Apr 14 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-5.20080407cvs
- Tweak desktop file with proper categories (bug 485358) and fixes for other
  desktop-file-install complaints.


nazghul-desktop.patch:

Index: nazghul-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nazghul-desktop.patch	22 Aug 2007 17:13:13 -0000	1.1
+++ nazghul-desktop.patch	14 Apr 2009 16:26:38 -0000	1.2
@@ -1,8 +1,14 @@
---- haxima.desktop-orig	2007-08-22 11:44:08.000000000 -0500
-+++ haxima.desktop	2007-08-22 11:44:26.000000000 -0500
-@@ -8,4 +8,4 @@
+--- haxima.desktop.orig	2007-01-26 16:42:48.000000000 -0600
++++ haxima.desktop	2009-04-14 11:21:43.000000000 -0500
+@@ -4,8 +4,8 @@
+ GenericName=Role Playing Game
+ Comment=An old school role playing game
+ Exec=haxima
+-Icon=haxima.png
++Icon=haxima
  Terminal=false
  Type=Application
- Categories=Application;Game;
+-Categories=Application;Game;
 -Version=1.002
++Categories=Game;RolePlaying;
 +Version=1.0


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nazghul.spec	26 Feb 2009 04:28:50 -0000	1.21
+++ nazghul.spec	14 Apr 2009 16:26:38 -0000	1.22
@@ -46,7 +46,7 @@
 
 %prep
 %setup -q -n %{name}
-%patch0
+%patch0 -b .orig
 
 # clean up CVS directories left in the source tarball
 find . -depth -type d -name CVS -exec rm -rf {} \;
@@ -104,6 +104,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-5.20080407cvs
+- Tweak desktop file with proper categories (bug 485358) and fixes for other
+  desktop-file-install complaints.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5.20080407cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Tue Apr 14 16:27:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 14 Apr 2009 16:27:09 +0000 (UTC)
Subject: rpms/xa/devel xa-2.3.5-getline.patch, NONE, 1.1 xa-2.3.5-make.patch,
	NONE, 1.1 xa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414162709.E94AC70137@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/xa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26197

Modified Files:
	.cvsignore sources 
Added Files:
	xa-2.3.5-getline.patch xa-2.3.5-make.patch xa.spec 
Log Message:
initial import

xa-2.3.5-getline.patch:

--- NEW FILE xa-2.3.5-getline.patch ---
diff -Nrup xa-2.3.5.orig/src/xa.c xa-2.3.5/src/xa.c
--- xa-2.3.5.orig/src/xa.c	2009-01-21 17:57:32.000000000 +0100
+++ xa-2.3.5/src/xa.c	2009-03-31 16:47:33.000000000 +0200
@@ -87,7 +87,7 @@ static int pass2(void);
 static int puttmp(int);
 static int puttmps(signed char *, int);
 static void chrput(int);
-static int getline(char *);
+static int xgetline(char *);
 static void lineout(void);
 static long ga_p1(void);
 static long gm_p1(void);
@@ -763,7 +763,7 @@ static int pass1(void)
 	temp_er = 0;
 
 /*FIXIT*/
-     while(!(er=getline(s)))
+     while(!(er=xgetline(s)))
      {         
           er=t_p1((signed char*)s,o,&l,&al);
 	  switch(segment) {
@@ -1002,7 +1002,7 @@ static int puttmps(signed char *s, int l
 
 static char l[MAXLINE];
 
-static int getline(char *s)
+static int xgetline(char *s)
 {
      static int ec;
 

xa-2.3.5-make.patch:

--- NEW FILE xa-2.3.5-make.patch ---
diff -Nup xa-2.3.5.orig/Makefile xa-2.3.5/Makefile
--- xa-2.3.5.orig/Makefile	2009-02-08 07:49:30.000000000 +0100
+++ xa-2.3.5/Makefile	2009-04-02 11:18:47.000000000 +0200
@@ -15,11 +15,12 @@ LDFLAGS = -lc
 #CFLAGS =
 #LD = ld
 
-DESTDIR = /usr/local
+DESTDIR =
+PREFIX = /usr/local
 
-BINDIR = $(DESTDIR)/bin
-MANDIR = $(DESTDIR)/share/man/man1
-DOCDIR = $(DESTDIR)/share/doc
+BINDIR = $(DESTDIR)$(PREFIX)/bin
+MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
+DOCDIR = $(DESTDIR)$(PREFIX)/share/doc
 
 MKDIR = mkdir -p
 INSTALL = install
@@ -27,13 +28,13 @@ INSTALL = install
 all: xa uncpk
 
 xa:
-	(cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
+	(cd src && LD=${LD} CC="${CC}" CFLAGS="${CFLAGS}" ${MAKE})
 
 load:	
-	(cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
+	(cd loader && CC="${CC}" CFLAGS="${CFLAGS}" ${MAKE})
 
 uncpk:
-	(cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
+	(cd misc && CC="${CC}" CFLAGS="${CFLAGS}" ${MAKE})
 
 dos: clean
 	(cd src && LD=gcc-go32 CC=gcc-go32 CFLAGS="-W -Wall -pedantic" ${MAKE})
@@ -53,8 +54,8 @@ clean:
 install: xa uncpk
 	$(MKDIR) $(BINDIR)
 	$(MKDIR) $(MANDIR)
-	$(INSTALL) xa reloc65 ldo65 file65 printcbm uncpk $(BINDIR)
-	$(INSTALL) man/file65.1 man/ldo65.1 man/printcbm.1 man/reloc65.1 man/uncpk.1 man/xa.1 $(MANDIR)
+	$(INSTALL) -m 0755 xa reloc65 ldo65 file65 printcbm uncpk $(BINDIR)
+	$(INSTALL) -m 0644 man/file65.1 man/ldo65.1 man/printcbm.1 man/reloc65.1 man/uncpk.1 man/xa.1 $(MANDIR)
 	#$(MKDIR) $(DOCDIR)/xa65
 
 dist: clean


--- NEW FILE xa.spec ---
Name:           xa
Version:        2.3.5
Release:        3%{?dist}
Summary:        6502/65816 cross-assembler

Group:          Development/Tools
License:        GPLv2+
URL:            http://www.floodgap.com/retrotech/xa/
Source0:        http://www.floodgap.com/retrotech/%{name}/dists/%{name}-%{version}.tar.gz
# fix conflict with recent glibc, reported in private email
Patch0:         %{name}-2.3.5-getline.patch
# update the build system, reported in private email
Patch1:         %{name}-2.3.5-make.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
xa is a high-speed, two-pass portable cross-assembler. It understands
mnemonics and generates code for NMOS 6502s (such as 6502A, 6504, 6507,
6510, 7501, 8500, 8501, 8502 ...), CMOS 6502s (65C02 and Rockwell R65C02)
and the 65816.

Key amongst its features:

    * C-like preprocessor (and understands cpp for additional feature support)
    * rich expression syntax and pseudo-op vocabulary
    * multiple character sets
    * binary linking
    * supports o65 relocatable objects with a full linker and relocation suite, 
      as well as "bare" plain binary object files
    * block structure for label scoping 


%prep
%setup -q
%patch0 -p1 -b .getline
%patch1 -p1 -b .make

# fix encoding
for f in ChangeLog
do
    iconv -f ISO-8859-1 -t UTF-8 < $f > $f.new
    touch -r $f $f.new
    mv $f.new $f
done


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README.1st doc/xa.txt
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Tue Apr 14 2009 Dan Hor??k <dan[at]danny.cz> - 2.3.5-3
- move the INSTALL override to "make install"
- comment the patches

* Tue Mar 31 2009 Dan Hor??k <dan[at]danny.cz> - 2.3.5-2
- don't use hardcoded /usr
- preserve timestamps when using "install"

* Sat Feb 21 2009 Dan Hor??k <dan[at]danny.cz> - 2.3.5-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:09:05 -0000	1.1
+++ .cvsignore	14 Apr 2009 16:26:38 -0000	1.2
@@ -0,0 +1 @@
+xa-2.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:09:05 -0000	1.1
+++ sources	14 Apr 2009 16:26:38 -0000	1.2
@@ -0,0 +1 @@
+edd15aa8674fb86225faf34e56d5cab2  xa-2.3.5.tar.gz



From nphilipp at fedoraproject.org  Tue Apr 14 16:27:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:27:58 +0000 (UTC)
Subject: rpms/system-config-date/devel sources, 1.105,
	1.106 system-config-date.spec, 1.111, 1.112
Message-ID: <20090414162758.7BA6570137@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27159

Modified Files:
	sources system-config-date.spec 
Log Message:
version 1.9.37


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	14 Apr 2009 16:23:24 -0000	1.105
+++ sources	14 Apr 2009 16:27:57 -0000	1.106
@@ -1 +1 @@
-c7e97999733c426dcc609781e860d1bf  system-config-date-1.9.37.tar.bz2
+93e9a58c452e9124d6c75b469db31fa3  system-config-date-1.9.37.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- system-config-date.spec	14 Apr 2009 16:23:25 -0000	1.111
+++ system-config-date.spec	14 Apr 2009 16:27:57 -0000	1.112
@@ -115,7 +115,7 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
-* Tue Apr 14 2008 Nils Philippsen <nils at redhat.com> - 1.9.37-1
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.9.37-1
 - pick up updated translations
 
 * Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> - 1.9.36-1



From tibbs at fedoraproject.org  Tue Apr 14 16:28:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue, 14 Apr 2009 16:28:59 +0000 (UTC)
Subject: rpms/nazghul/devel nazghul.spec,1.22,1.23
Message-ID: <20090414162859.09677700B2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/nazghul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27441

Modified Files:
	nazghul.spec 
Log Message:
Oops, somehow neglected to bump Release:.



Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nazghul.spec	14 Apr 2009 16:26:38 -0000	1.22
+++ nazghul.spec	14 Apr 2009 16:28:28 -0000	1.23
@@ -1,7 +1,7 @@
 %define         cvsdate 20080407
 Name:           nazghul
 Version:        0.6.0
-Release:        5.%{cvsdate}cvs%{?dist}
+Release:        6.%{cvsdate}cvs%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
@@ -104,7 +104,7 @@
 
 
 %changelog
-* Tue Apr 14 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-5.20080407cvs
+* Tue Apr 14 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-6.20080407cvs
 - Tweak desktop file with proper categories (bug 485358) and fixes for other
   desktop-file-install complaints.
 



From thias at fedoraproject.org  Tue Apr 14 16:29:24 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue, 14 Apr 2009 16:29:24 +0000 (UTC)
Subject: rpms/python-twill/F-10 python-twill.spec, NONE,
	1.1 twill-0.9-noforks.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090414162924.6D63A700B2@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twill/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27402/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	python-twill.spec twill-0.9-noforks.patch 
Log Message:
Initial import of 0.9.



--- NEW FILE python-twill.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Simple scripting language for Web browsing
Name: python-twill
Version: 0.9
Release: 2%{?dist}
Group: Applications/Internet
License: MIT
URL: http://twill.idyll.org/
Source: http://darcs.idyll.org/~t/projects/twill-%{version}.tar.gz
# Don't use the included mechanize, pyparsing, ClientForm or subprocess
Patch0: twill-0.9-noforks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-clientform
Requires: python-mechanize
Requires: pyparsing
BuildRequires: python-devel
BuildRequires: python-setuptools
BuildArch: noarch

%description
twill is a simple language that allows users to browse the Web from a
command-line interface. With twill, you can navigate through Web sites that
use forms, cookies, and most standard Web features.


%prep
%setup -q -n twill-%{version}
%patch0 -p1 -b .noforks
%{__rm} -rf twill/other_packages/_mechanize_dist/


%build
%{__python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


%clean
%{__rm} -rf %{buildroot}



%files
%defattr(-,root,root,-)
%doc README.txt doc/LICENSE.txt doc/ANNOUNCE-*.txt
%doc doc/index.txt doc/examples.txt doc/browsing.txt doc/commands.txt
%doc doc/ChangeLog doc/developer.txt doc/advocacy/simple-example.txt
%doc doc/extensions.txt doc/python-api.txt doc/other.txt doc/testing.txt
%{python_sitelib}/twill/
%{python_sitelib}/twill-*.egg-info/
%{_bindir}/twill-fork
%{_bindir}/twill-sh


%changelog
* Tue Apr 14 2009 Matthias Saou <http://freshrpms.net/> 0.9-2
- Add -b .noforks to the patch0 line.
- Remove no longer needed --single-version-externally-managed option.

* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.9-1
- The original submission was abandoned (#253355), so take it from here.

* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 0.9-0.3
- Include patch and requirements to get rid of all the forked included
  python code and use proper packages instead.

* Tue Oct 21 2008 Matthias Saou <http://freshrpms.net/> 0.9-0.2
- Update to 0.9 final.
- Rename from twill to python-twill.

* Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 0.9-0.1.b1
- Initial creation


twill-0.9-noforks.patch:

--- NEW FILE twill-0.9-noforks.patch ---
diff -Naupr twill-0.9.orig/setup.py twill-0.9/setup.py
--- twill-0.9.orig/setup.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/setup.py	2008-12-24 19:32:02.325394252 +0100
@@ -18,8 +18,7 @@ setup(name = 'twill',
       author_email = 'titus at idyll.org',
       license='MIT',
 
-      packages = ['twill', 'twill.other_packages',
-                  'twill.other_packages._mechanize_dist',
+      packages = ['twill',
                   'twill.extensions',
                   'twill.extensions.match_parse'],
 
diff -Naupr twill-0.9.orig/tests/test-broken-html.py twill-0.9/tests/test-broken-html.py
--- twill-0.9.orig/tests/test-broken-html.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-broken-html.py	2008-12-24 19:23:06.941372178 +0100
@@ -3,7 +3,7 @@
 parser) can parse.
 """
 
-from _mechanize_dist import ClientForm
+import ClientForm
 
 import twilltestlib
 from twill import commands
diff -Naupr twill-0.9.orig/tests/test-checkbox.py twill-0.9/tests/test-checkbox.py
--- twill-0.9.orig/tests/test-checkbox.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-checkbox.py	2008-12-24 19:30:16.306371790 +0100
@@ -2,7 +2,8 @@ import twilltestlib
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from mechanize import BrowserStateError
+import ClientForm
 
 def setup_module():
     global url
diff -Naupr twill-0.9.orig/tests/test-encoding.py twill-0.9/tests/test-encoding.py
--- twill-0.9.orig/tests/test-encoding.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-encoding.py	2008-12-24 19:23:49.458246929 +0100
@@ -1,5 +1,5 @@
 import twilltestlib
-from _mechanize_dist import ClientForm
+import ClientForm
 from cStringIO import StringIO
 
 def test_form_parse():
diff -Naupr twill-0.9.orig/tests/test-form.py twill-0.9/tests/test-form.py
--- twill-0.9.orig/tests/test-form.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-form.py	2008-12-24 19:30:25.913371670 +0100
@@ -2,7 +2,8 @@ import twilltestlib
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from mechanize import BrowserStateError
+import ClientForm
 
 def test():
     url = twilltestlib.get_url()
diff -Naupr twill-0.9.orig/twill/_browser.py twill-0.9/twill/_browser.py
--- twill-0.9.orig/twill/_browser.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/_browser.py	2008-12-24 19:30:42.412271633 +0100
@@ -3,13 +3,13 @@ A subclass of the mechanize browser patc
 """
 
 # wwwsearch imports
-from _mechanize_dist import Browser as MechanizeBrowser
+from mechanize import Browser as MechanizeBrowser
 
 import wsgi_intercept
 from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
 
 def build_http_handler():
-    from _mechanize_dist._urllib2 import HTTPHandler
+    from mechanize._urllib2 import HTTPHandler
 
     class MyHTTPHandler(HTTPHandler):
         def http_open(self, req):
diff -Naupr twill-0.9.orig/twill/browser.py twill-0.9/twill/browser.py
--- twill-0.9.orig/twill/browser.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/browser.py	2008-12-24 19:31:02.618371499 +0100
@@ -10,8 +10,9 @@ OUT=None
 import re
 
 # wwwsearch imports
-import _mechanize_dist as mechanize
-from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
+import mechanize
+from mechanize import BrowserStateError, LinkNotFoundError
+import ClientForm
 
 # twill package imports
 from _browser import PatchedMechanizeBrowser
diff -Naupr twill-0.9.orig/twill/commands.py twill-0.9/twill/commands.py
--- twill-0.9.orig/twill/commands.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/commands.py	2008-12-24 19:31:18.490371194 +0100
@@ -4,9 +4,9 @@ twill-sh.
 """
 
 import sys
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._headersutil import is_html
+import mechanize
+import ClientForm
+from mechanize._headersutil import is_html
 
 OUT=None
 ERR=sys.stderr
diff -Naupr twill-0.9.orig/twill/__init__.py twill-0.9/twill/__init__.py
--- twill-0.9.orig/twill/__init__.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/__init__.py	2008-12-24 19:34:35.701247369 +0100
@@ -43,11 +43,6 @@ thisdir = os.path.dirname(__file__)
 extensions = os.path.join(thisdir, 'extensions')
 sys.path.append(extensions)
 
-# add other_packages in at the *beginning*, so that the correct
-# (patched) versions of pyparsing and mechanize get imported.
-wwwsearchlib = os.path.join(thisdir, 'other_packages')
-sys.path.insert(0, wwwsearchlib)
-
 # the two core components of twill:
 from shell import TwillCommandLoop
 from parse import execute_file, execute_string
diff -Naupr twill-0.9.orig/twill/utils.py twill-0.9/twill/utils.py
--- twill-0.9.orig/twill/utils.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/utils.py	2008-12-24 19:31:34.078371767 +0100
@@ -11,11 +11,11 @@ import base64
 
 import subprocess
 
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._util import time
-from _mechanize_dist._http import HTTPRefreshProcessor
-from _mechanize_dist import BrowserStateError
+import mechanize
+import ClientForm
+from mechanize._util import time
+from mechanize._http import HTTPRefreshProcessor
+from mechanize import BrowserStateError
 
 class ResultWrapper:
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twill/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:16:25 -0000	1.1
+++ .cvsignore	14 Apr 2009 16:28:53 -0000	1.2
@@ -0,0 +1 @@
+twill-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twill/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:16:25 -0000	1.1
+++ sources	14 Apr 2009 16:28:53 -0000	1.2
@@ -0,0 +1 @@
+c362307616696f4838e9456c42b70fdc  twill-0.9.tar.gz



From mbarnes at fedoraproject.org  Tue Apr 14 16:29:37 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 16:29:37 +0000 (UTC)
Subject: rpms/evolution-mapi/devel .cvsignore, 1.5, 1.6 evolution-mapi.spec, 
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090414162937.B7C2A700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27800

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Log Message:

* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 0.26.1-1
- Update to 0.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Mar 2009 14:03:08 -0000	1.5
+++ .cvsignore	14 Apr 2009 16:29:07 -0000	1.6
@@ -1 +1 @@
-evolution-mapi-0.26.0.1.tar.bz2
+evolution-mapi-0.26.1.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-mapi.spec	19 Mar 2009 14:03:08 -0000	1.4
+++ evolution-mapi.spec	14 Apr 2009 16:29:07 -0000	1.5
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.26.0.1
+Version: 0.26.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 0.26.1-1
+- Update to 0.26.1
+
 * Thu Mar 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.26.0.1-1
 - Update to 0.26.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Mar 2009 14:03:08 -0000	1.5
+++ sources	14 Apr 2009 16:29:07 -0000	1.6
@@ -1 +1 @@
-1b4fa58e1cf8e9e83d7f0e7f9520ed2f  evolution-mapi-0.26.0.1.tar.bz2
+6eb79722661ce7de30af34b9742201c7  evolution-mapi-0.26.1.tar.bz2



From thias at fedoraproject.org  Tue Apr 14 16:29:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue, 14 Apr 2009 16:29:25 +0000 (UTC)
Subject: rpms/python-twill/F-9 python-twill.spec, NONE,
	1.1 twill-0.9-noforks.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090414162925.75762700B2@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twill/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27402/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	python-twill.spec twill-0.9-noforks.patch 
Log Message:
Initial import of 0.9.



--- NEW FILE python-twill.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Simple scripting language for Web browsing
Name: python-twill
Version: 0.9
Release: 2%{?dist}
Group: Applications/Internet
License: MIT
URL: http://twill.idyll.org/
Source: http://darcs.idyll.org/~t/projects/twill-%{version}.tar.gz
# Don't use the included mechanize, pyparsing, ClientForm or subprocess
Patch0: twill-0.9-noforks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-clientform
Requires: python-mechanize
Requires: pyparsing
BuildRequires: python-devel
BuildRequires: python-setuptools
BuildArch: noarch

%description
twill is a simple language that allows users to browse the Web from a
command-line interface. With twill, you can navigate through Web sites that
use forms, cookies, and most standard Web features.


%prep
%setup -q -n twill-%{version}
%patch0 -p1 -b .noforks
%{__rm} -rf twill/other_packages/_mechanize_dist/


%build
%{__python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


%clean
%{__rm} -rf %{buildroot}



%files
%defattr(-,root,root,-)
%doc README.txt doc/LICENSE.txt doc/ANNOUNCE-*.txt
%doc doc/index.txt doc/examples.txt doc/browsing.txt doc/commands.txt
%doc doc/ChangeLog doc/developer.txt doc/advocacy/simple-example.txt
%doc doc/extensions.txt doc/python-api.txt doc/other.txt doc/testing.txt
%{python_sitelib}/twill/
%{python_sitelib}/twill-*.egg-info/
%{_bindir}/twill-fork
%{_bindir}/twill-sh


%changelog
* Tue Apr 14 2009 Matthias Saou <http://freshrpms.net/> 0.9-2
- Add -b .noforks to the patch0 line.
- Remove no longer needed --single-version-externally-managed option.

* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.9-1
- The original submission was abandoned (#253355), so take it from here.

* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 0.9-0.3
- Include patch and requirements to get rid of all the forked included
  python code and use proper packages instead.

* Tue Oct 21 2008 Matthias Saou <http://freshrpms.net/> 0.9-0.2
- Update to 0.9 final.
- Rename from twill to python-twill.

* Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 0.9-0.1.b1
- Initial creation


twill-0.9-noforks.patch:

--- NEW FILE twill-0.9-noforks.patch ---
diff -Naupr twill-0.9.orig/setup.py twill-0.9/setup.py
--- twill-0.9.orig/setup.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/setup.py	2008-12-24 19:32:02.325394252 +0100
@@ -18,8 +18,7 @@ setup(name = 'twill',
       author_email = 'titus at idyll.org',
       license='MIT',
 
-      packages = ['twill', 'twill.other_packages',
-                  'twill.other_packages._mechanize_dist',
+      packages = ['twill',
                   'twill.extensions',
                   'twill.extensions.match_parse'],
 
diff -Naupr twill-0.9.orig/tests/test-broken-html.py twill-0.9/tests/test-broken-html.py
--- twill-0.9.orig/tests/test-broken-html.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-broken-html.py	2008-12-24 19:23:06.941372178 +0100
@@ -3,7 +3,7 @@
 parser) can parse.
 """
 
-from _mechanize_dist import ClientForm
+import ClientForm
 
 import twilltestlib
 from twill import commands
diff -Naupr twill-0.9.orig/tests/test-checkbox.py twill-0.9/tests/test-checkbox.py
--- twill-0.9.orig/tests/test-checkbox.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-checkbox.py	2008-12-24 19:30:16.306371790 +0100
@@ -2,7 +2,8 @@ import twilltestlib
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from mechanize import BrowserStateError
+import ClientForm
 
 def setup_module():
     global url
diff -Naupr twill-0.9.orig/tests/test-encoding.py twill-0.9/tests/test-encoding.py
--- twill-0.9.orig/tests/test-encoding.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-encoding.py	2008-12-24 19:23:49.458246929 +0100
@@ -1,5 +1,5 @@
 import twilltestlib
-from _mechanize_dist import ClientForm
+import ClientForm
 from cStringIO import StringIO
 
 def test_form_parse():
diff -Naupr twill-0.9.orig/tests/test-form.py twill-0.9/tests/test-form.py
--- twill-0.9.orig/tests/test-form.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-form.py	2008-12-24 19:30:25.913371670 +0100
@@ -2,7 +2,8 @@ import twilltestlib
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from mechanize import BrowserStateError
+import ClientForm
 
 def test():
     url = twilltestlib.get_url()
diff -Naupr twill-0.9.orig/twill/_browser.py twill-0.9/twill/_browser.py
--- twill-0.9.orig/twill/_browser.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/_browser.py	2008-12-24 19:30:42.412271633 +0100
@@ -3,13 +3,13 @@ A subclass of the mechanize browser patc
 """
 
 # wwwsearch imports
-from _mechanize_dist import Browser as MechanizeBrowser
+from mechanize import Browser as MechanizeBrowser
 
 import wsgi_intercept
 from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
 
 def build_http_handler():
-    from _mechanize_dist._urllib2 import HTTPHandler
+    from mechanize._urllib2 import HTTPHandler
 
     class MyHTTPHandler(HTTPHandler):
         def http_open(self, req):
diff -Naupr twill-0.9.orig/twill/browser.py twill-0.9/twill/browser.py
--- twill-0.9.orig/twill/browser.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/browser.py	2008-12-24 19:31:02.618371499 +0100
@@ -10,8 +10,9 @@ OUT=None
 import re
 
 # wwwsearch imports
-import _mechanize_dist as mechanize
-from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
+import mechanize
+from mechanize import BrowserStateError, LinkNotFoundError
+import ClientForm
 
 # twill package imports
 from _browser import PatchedMechanizeBrowser
diff -Naupr twill-0.9.orig/twill/commands.py twill-0.9/twill/commands.py
--- twill-0.9.orig/twill/commands.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/commands.py	2008-12-24 19:31:18.490371194 +0100
@@ -4,9 +4,9 @@ twill-sh.
 """
 
 import sys
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._headersutil import is_html
+import mechanize
+import ClientForm
+from mechanize._headersutil import is_html
 
 OUT=None
 ERR=sys.stderr
diff -Naupr twill-0.9.orig/twill/__init__.py twill-0.9/twill/__init__.py
--- twill-0.9.orig/twill/__init__.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/__init__.py	2008-12-24 19:34:35.701247369 +0100
@@ -43,11 +43,6 @@ thisdir = os.path.dirname(__file__)
 extensions = os.path.join(thisdir, 'extensions')
 sys.path.append(extensions)
 
-# add other_packages in at the *beginning*, so that the correct
-# (patched) versions of pyparsing and mechanize get imported.
-wwwsearchlib = os.path.join(thisdir, 'other_packages')
-sys.path.insert(0, wwwsearchlib)
-
 # the two core components of twill:
 from shell import TwillCommandLoop
 from parse import execute_file, execute_string
diff -Naupr twill-0.9.orig/twill/utils.py twill-0.9/twill/utils.py
--- twill-0.9.orig/twill/utils.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/utils.py	2008-12-24 19:31:34.078371767 +0100
@@ -11,11 +11,11 @@ import base64
 
 import subprocess
 
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._util import time
-from _mechanize_dist._http import HTTPRefreshProcessor
-from _mechanize_dist import BrowserStateError
+import mechanize
+import ClientForm
+from mechanize._util import time
+from mechanize._http import HTTPRefreshProcessor
+from mechanize import BrowserStateError
 
 class ResultWrapper:
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twill/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:16:25 -0000	1.1
+++ .cvsignore	14 Apr 2009 16:28:54 -0000	1.2
@@ -0,0 +1 @@
+twill-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twill/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:16:25 -0000	1.1
+++ sources	14 Apr 2009 16:28:54 -0000	1.2
@@ -0,0 +1 @@
+c362307616696f4838e9456c42b70fdc  twill-0.9.tar.gz



From thias at fedoraproject.org  Tue Apr 14 16:29:26 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue, 14 Apr 2009 16:29:26 +0000 (UTC)
Subject: rpms/python-twill/devel python-twill.spec, NONE,
	1.1 twill-0.9-noforks.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090414162926.65A33700B2@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27402/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-twill.spec twill-0.9-noforks.patch 
Log Message:
Initial import of 0.9.



--- NEW FILE python-twill.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Simple scripting language for Web browsing
Name: python-twill
Version: 0.9
Release: 2%{?dist}
Group: Applications/Internet
License: MIT
URL: http://twill.idyll.org/
Source: http://darcs.idyll.org/~t/projects/twill-%{version}.tar.gz
# Don't use the included mechanize, pyparsing, ClientForm or subprocess
Patch0: twill-0.9-noforks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-clientform
Requires: python-mechanize
Requires: pyparsing
BuildRequires: python-devel
BuildRequires: python-setuptools
BuildArch: noarch

%description
twill is a simple language that allows users to browse the Web from a
command-line interface. With twill, you can navigate through Web sites that
use forms, cookies, and most standard Web features.


%prep
%setup -q -n twill-%{version}
%patch0 -p1 -b .noforks
%{__rm} -rf twill/other_packages/_mechanize_dist/


%build
%{__python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


%clean
%{__rm} -rf %{buildroot}



%files
%defattr(-,root,root,-)
%doc README.txt doc/LICENSE.txt doc/ANNOUNCE-*.txt
%doc doc/index.txt doc/examples.txt doc/browsing.txt doc/commands.txt
%doc doc/ChangeLog doc/developer.txt doc/advocacy/simple-example.txt
%doc doc/extensions.txt doc/python-api.txt doc/other.txt doc/testing.txt
%{python_sitelib}/twill/
%{python_sitelib}/twill-*.egg-info/
%{_bindir}/twill-fork
%{_bindir}/twill-sh


%changelog
* Tue Apr 14 2009 Matthias Saou <http://freshrpms.net/> 0.9-2
- Add -b .noforks to the patch0 line.
- Remove no longer needed --single-version-externally-managed option.

* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 0.9-1
- The original submission was abandoned (#253355), so take it from here.

* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 0.9-0.3
- Include patch and requirements to get rid of all the forked included
  python code and use proper packages instead.

* Tue Oct 21 2008 Matthias Saou <http://freshrpms.net/> 0.9-0.2
- Update to 0.9 final.
- Rename from twill to python-twill.

* Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 0.9-0.1.b1
- Initial creation


twill-0.9-noforks.patch:

--- NEW FILE twill-0.9-noforks.patch ---
diff -Naupr twill-0.9.orig/setup.py twill-0.9/setup.py
--- twill-0.9.orig/setup.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/setup.py	2008-12-24 19:32:02.325394252 +0100
@@ -18,8 +18,7 @@ setup(name = 'twill',
       author_email = 'titus at idyll.org',
       license='MIT',
 
-      packages = ['twill', 'twill.other_packages',
-                  'twill.other_packages._mechanize_dist',
+      packages = ['twill',
                   'twill.extensions',
                   'twill.extensions.match_parse'],
 
diff -Naupr twill-0.9.orig/tests/test-broken-html.py twill-0.9/tests/test-broken-html.py
--- twill-0.9.orig/tests/test-broken-html.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-broken-html.py	2008-12-24 19:23:06.941372178 +0100
@@ -3,7 +3,7 @@
 parser) can parse.
 """
 
-from _mechanize_dist import ClientForm
+import ClientForm
 
 import twilltestlib
 from twill import commands
diff -Naupr twill-0.9.orig/tests/test-checkbox.py twill-0.9/tests/test-checkbox.py
--- twill-0.9.orig/tests/test-checkbox.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-checkbox.py	2008-12-24 19:30:16.306371790 +0100
@@ -2,7 +2,8 @@ import twilltestlib
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from mechanize import BrowserStateError
+import ClientForm
 
 def setup_module():
     global url
diff -Naupr twill-0.9.orig/tests/test-encoding.py twill-0.9/tests/test-encoding.py
--- twill-0.9.orig/tests/test-encoding.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-encoding.py	2008-12-24 19:23:49.458246929 +0100
@@ -1,5 +1,5 @@
 import twilltestlib
-from _mechanize_dist import ClientForm
+import ClientForm
 from cStringIO import StringIO
 
 def test_form_parse():
diff -Naupr twill-0.9.orig/tests/test-form.py twill-0.9/tests/test-form.py
--- twill-0.9.orig/tests/test-form.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/tests/test-form.py	2008-12-24 19:30:25.913371670 +0100
@@ -2,7 +2,8 @@ import twilltestlib
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from mechanize import BrowserStateError
+import ClientForm
 
 def test():
     url = twilltestlib.get_url()
diff -Naupr twill-0.9.orig/twill/_browser.py twill-0.9/twill/_browser.py
--- twill-0.9.orig/twill/_browser.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/_browser.py	2008-12-24 19:30:42.412271633 +0100
@@ -3,13 +3,13 @@ A subclass of the mechanize browser patc
 """
 
 # wwwsearch imports
-from _mechanize_dist import Browser as MechanizeBrowser
+from mechanize import Browser as MechanizeBrowser
 
 import wsgi_intercept
 from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
 
 def build_http_handler():
-    from _mechanize_dist._urllib2 import HTTPHandler
+    from mechanize._urllib2 import HTTPHandler
 
     class MyHTTPHandler(HTTPHandler):
         def http_open(self, req):
diff -Naupr twill-0.9.orig/twill/browser.py twill-0.9/twill/browser.py
--- twill-0.9.orig/twill/browser.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/browser.py	2008-12-24 19:31:02.618371499 +0100
@@ -10,8 +10,9 @@ OUT=None
 import re
 
 # wwwsearch imports
-import _mechanize_dist as mechanize
-from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
+import mechanize
+from mechanize import BrowserStateError, LinkNotFoundError
+import ClientForm
 
 # twill package imports
 from _browser import PatchedMechanizeBrowser
diff -Naupr twill-0.9.orig/twill/commands.py twill-0.9/twill/commands.py
--- twill-0.9.orig/twill/commands.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/commands.py	2008-12-24 19:31:18.490371194 +0100
@@ -4,9 +4,9 @@ twill-sh.
 """
 
 import sys
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._headersutil import is_html
+import mechanize
+import ClientForm
+from mechanize._headersutil import is_html
 
 OUT=None
 ERR=sys.stderr
diff -Naupr twill-0.9.orig/twill/__init__.py twill-0.9/twill/__init__.py
--- twill-0.9.orig/twill/__init__.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/__init__.py	2008-12-24 19:34:35.701247369 +0100
@@ -43,11 +43,6 @@ thisdir = os.path.dirname(__file__)
 extensions = os.path.join(thisdir, 'extensions')
 sys.path.append(extensions)
 
-# add other_packages in at the *beginning*, so that the correct
-# (patched) versions of pyparsing and mechanize get imported.
-wwwsearchlib = os.path.join(thisdir, 'other_packages')
-sys.path.insert(0, wwwsearchlib)
-
 # the two core components of twill:
 from shell import TwillCommandLoop
 from parse import execute_file, execute_string
diff -Naupr twill-0.9.orig/twill/utils.py twill-0.9/twill/utils.py
--- twill-0.9.orig/twill/utils.py	2007-12-28 07:45:16.000000000 +0100
+++ twill-0.9/twill/utils.py	2008-12-24 19:31:34.078371767 +0100
@@ -11,11 +11,11 @@ import base64
 
 import subprocess
 
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._util import time
-from _mechanize_dist._http import HTTPRefreshProcessor
-from _mechanize_dist import BrowserStateError
+import mechanize
+import ClientForm
+from mechanize._util import time
+from mechanize._http import HTTPRefreshProcessor
+from mechanize import BrowserStateError
 
 class ResultWrapper:
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twill/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:16:25 -0000	1.1
+++ .cvsignore	14 Apr 2009 16:28:55 -0000	1.2
@@ -0,0 +1 @@
+twill-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twill/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:16:25 -0000	1.1
+++ sources	14 Apr 2009 16:28:55 -0000	1.2
@@ -0,0 +1 @@
+c362307616696f4838e9456c42b70fdc  twill-0.9.tar.gz



From mbarnes at fedoraproject.org  Tue Apr 14 16:29:55 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 16:29:55 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.40,
	1.41 evolution-exchange.spec, 1.58, 1.59 sources, 1.40, 1.41
Message-ID: <20090414162955.CC579700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28039

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
- Update to 2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	16 Mar 2009 11:47:26 -0000	1.40
+++ .cvsignore	14 Apr 2009 16:29:24 -0000	1.41
@@ -1 +1 @@
-evolution-exchange-2.26.0.tar.bz2
+evolution-exchange-2.26.1.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- evolution-exchange.spec	16 Mar 2009 11:47:26 -0000	1.58
+++ evolution-exchange.spec	14 Apr 2009 16:29:25 -0000	1.59
@@ -20,7 +20,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -151,6 +151,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
+- Update to 2.26.1
+
 * Mon Mar 16 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-1.fc11
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Mar 2009 11:47:26 -0000	1.40
+++ sources	14 Apr 2009 16:29:25 -0000	1.41
@@ -1 +1 @@
-845f0a74e4565a6639f3b8adb736cbc1  evolution-exchange-2.26.0.tar.bz2
+9333f3e0558aaf331d61493b7bae23ae  evolution-exchange-2.26.1.tar.bz2



From rhughes at fedoraproject.org  Tue Apr 14 16:34:32 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 16:34:32 +0000 (UTC)
Subject: rpms/hal-info/devel .cvsignore, 1.23, 1.24 hal-info.spec, 1.42,
	1.43 sources, 1.24, 1.25
Message-ID: <20090414163432.84BAF700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29930

Modified Files:
	.cvsignore hal-info.spec sources 
Log Message:
* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090414-1
- New upstream release to fix a load of HP keymaps.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Mar 2009 11:03:22 -0000	1.23
+++ .cvsignore	14 Apr 2009 16:34:01 -0000	1.24
@@ -1 +1 @@
-hal-info-20090330.tar.gz
+hal-info-20090414.tar.gz


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- hal-info.spec	14 Apr 2009 15:10:23 -0000	1.42
+++ hal-info.spec	14 Apr 2009 16:34:01 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
-Version: 20090330
-Release: 2%{?dist}
+Version: 20090414
+Release: 1%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -24,7 +24,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .dell-hub
 
 %build
 %configure --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no --enable-killswitch-dell-wwan=no
@@ -46,6 +45,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090414-1
+- New upstream release to fix a load of HP keymaps.
+
 * Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090330-2
 - A key labelled "Music" on a Dell USB keyboard shows up in X as "XF86Tools"
   which is wrong. Reassigns the key to be "Media".


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	30 Mar 2009 11:03:22 -0000	1.24
+++ sources	14 Apr 2009 16:34:01 -0000	1.25
@@ -1 +1 @@
-7e2ff017f057f4288f120a7089b157a2  hal-info-20090330.tar.gz
+ae7177ab8f0163d3ef2df71f0de2b357  hal-info-20090414.tar.gz



From nphilipp at fedoraproject.org  Tue Apr 14 16:36:41 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:36:41 +0000 (UTC)
Subject: rpms/system-config-nfs/devel .cvsignore, 1.49, 1.50 sources, 1.56, 
	1.57 system-config-nfs.spec, 1.63, 1.64
Message-ID: <20090414163641.E72AB700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30952

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
version 1.3.44


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	22 Dec 2008 18:04:12 -0000	1.49
+++ .cvsignore	14 Apr 2009 16:36:10 -0000	1.50
@@ -1 +1 @@
-system-config-nfs-1.3.43.tar.bz2
+system-config-nfs-1.3.44.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	22 Dec 2008 18:04:12 -0000	1.56
+++ sources	14 Apr 2009 16:36:10 -0000	1.57
@@ -1 +1 @@
-5cffb159d6a1a8dfed23164afa2c7f53  system-config-nfs-1.3.43.tar.bz2
+2bfad3c95b711e66ee5453ab7eef2adb  system-config-nfs-1.3.44.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- system-config-nfs.spec	26 Feb 2009 05:12:54 -0000	1.63
+++ system-config-nfs.spec	14 Apr 2009 16:36:11 -0000	1.64
@@ -8,8 +8,8 @@
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.43
-Release: 2%{?dist}
+Version: 1.3.44
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
@@ -83,8 +83,8 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.43-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.3.44-1
+- pick up updated translations
 
 * Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> - 1.3.43-1
 - fix typo in Source0 URL



From mtosatti at fedoraproject.org  Tue Apr 14 16:39:49 2009
From: mtosatti at fedoraproject.org (Marcelo Tosatti)
Date: Tue, 14 Apr 2009 16:39:49 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-kvm-kconfig-irqchip.patch, NONE,
	1.1 linux-2.6-kvm-mask-notifiers.patch, NONE,
	1.1 linux-2.6-kvm-reset-pit-irq-on-unmask.patch, NONE, 1.1 TODO,
	1.64, 1.65 kernel.spec, 1.1542, 1.1543
Message-ID: <20090414163949.1BDA2700B2@cvs1.fedora.phx.redhat.com>

Author: mtosatti

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32591

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-kvm-kconfig-irqchip.patch 
	linux-2.6-kvm-mask-notifiers.patch 
	linux-2.6-kvm-reset-pit-irq-on-unmask.patch 
Log Message:
* Thu Apr 14 2009 Marcelo Tosatti <mtosatti at redhat.com>
- kvm fixes for bz#491625


linux-2.6-kvm-kconfig-irqchip.patch:

--- NEW FILE linux-2.6-kvm-kconfig-irqchip.patch ---
commit 1dae8e15bb85de0116ed43cd3d798a035044954c
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Jan 4 18:04:18 2009 +0200

    KVM: Add CONFIG_HAVE_KVM_IRQCHIP
    
    Two KVM archs support irqchips and two don't.  Add a Kconfig item to
    make selecting between the two models easier.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index f833a0b..0a2d6b8 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
 	bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	depends on HAVE_KVM || IA64
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 1465705..5a152a5 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -2,6 +2,9 @@
 # KVM configuration
 #
 
+config HAVE_KVM_IRQCHIP
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	---help---
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index e051cad..3e260b7 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -4,6 +4,9 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	default y
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index b81125f..0a303c3 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	depends on HAVE_KVM || X86

linux-2.6-kvm-mask-notifiers.patch:

--- NEW FILE linux-2.6-kvm-mask-notifiers.patch ---
b018d32632d3c59d3618e23128e4312fe8e48d64
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 3cf0ede..99963f3 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -127,6 +127,10 @@ struct kvm {
 	struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
 #endif
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+	struct hlist_head mask_notifier_list;
+#endif
+
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
 	struct mmu_notifier mmu_notifier;
 	unsigned long mmu_notifier_seq;
@@ -320,6 +324,19 @@ struct kvm_assigned_dev_kernel {
 	struct pci_dev *dev;
 	struct kvm *kvm;
 };
+
+struct kvm_irq_mask_notifier {
+	void (*func)(struct kvm_irq_mask_notifier *kimn, bool masked);
+	int irq;
+	struct hlist_node link;
+};
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+				    struct kvm_irq_mask_notifier *kimn);
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+				      struct kvm_irq_mask_notifier *kimn);
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
+
 void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 23b81cf..e85a2bc 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -101,6 +101,7 @@ static void ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx)
 static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 {
 	unsigned index;
+	bool mask_before, mask_after;
 
 	switch (ioapic->ioregsel) {
 	case IOAPIC_REG_VERSION:
@@ -120,6 +121,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 		ioapic_debug("change redir index %x val %x\n", index, val);
 		if (index >= IOAPIC_NUM_PINS)
 			return;
+		mask_before = ioapic->redirtbl[index].fields.mask;
 		if (ioapic->ioregsel & 1) {
 			ioapic->redirtbl[index].bits &= 0xffffffff;
 			ioapic->redirtbl[index].bits |= (u64) val << 32;
@@ -128,6 +130,9 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 			ioapic->redirtbl[index].bits |= (u32) val;
 			ioapic->redirtbl[index].fields.remote_irr = 0;
 		}
+		mask_after = ioapic->redirtbl[index].fields.mask;
+		if (mask_before != mask_after)
+			kvm_fire_mask_notifiers(ioapic->kvm, index, mask_after);
 		if (ioapic->irr & (1 << index))
 			ioapic_service(ioapic, index);
 		break;
@@ -426,3 +431,4 @@ int kvm_ioapic_init(struct kvm *kvm)
 	kvm_io_bus_register_dev(&kvm->mmio_bus, &ioapic->dev);
 	return 0;
 }
+
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index aa5d1e5..5162a41 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -99,3 +99,27 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
 		clear_bit(irq_source_id, &kvm->arch.irq_states[i]);
 	clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
 }
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+				    struct kvm_irq_mask_notifier *kimn)
+{
+	kimn->irq = irq;
+	hlist_add_head(&kimn->link, &kvm->mask_notifier_list);
+}
+
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+				      struct kvm_irq_mask_notifier *kimn)
+{
+	hlist_del(&kimn->link);
+}
+
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask)
+{
+	struct kvm_irq_mask_notifier *kimn;
+	struct hlist_node *n;
+
+	hlist_for_each_entry(kimn, n, &kvm->mask_notifier_list, link)
+		if (kimn->irq == irq)
+			kimn->func(kimn, mask);
+}
+
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index dcbfc68..785c1e3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -831,6 +831,9 @@ static struct kvm *kvm_create_vm(void)
 
 	if (IS_ERR(kvm))
 		goto out;
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+	INIT_HLIST_HEAD(&kvm->mask_notifier_list);
+#endif
 
 #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET
 	page = alloc_page(GFP_KERNEL | __GFP_ZERO);

linux-2.6-kvm-reset-pit-irq-on-unmask.patch:

--- NEW FILE linux-2.6-kvm-reset-pit-irq-on-unmask.patch ---
commit 4780c65904f0fc4e312ee2da9383eacbe04e61ea
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Jan 4 18:06:06 2009 +0200

    KVM: Reset PIT irq injection logic when the PIT IRQ is unmasked
    
    While the PIT is masked the guest cannot ack the irq, so the reinject logic
    will never allow the interrupt to be injected.
    
    Fix by resetting the reinjection counters on unmask.
    
    Unbreaks Xen.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 69d1bbf..c13bb92 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -539,6 +539,16 @@ void kvm_pit_reset(struct kvm_pit *pit)
 	pit->pit_state.irq_ack = 1;
 }
 
+static void pit_mask_notifer(struct kvm_irq_mask_notifier *kimn, bool mask)
+{
+	struct kvm_pit *pit = container_of(kimn, struct kvm_pit, mask_notifier);
+
+	if (!mask) {
+		atomic_set(&pit->pit_state.pit_timer.pending, 0);
+		pit->pit_state.irq_ack = 1;
+	}
+}
+
 struct kvm_pit *kvm_create_pit(struct kvm *kvm)
 {
 	struct kvm_pit *pit;
@@ -586,6 +596,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
 
 	kvm_pit_reset(pit);
 
+	pit->mask_notifier.func = pit_mask_notifer;
+	kvm_register_irq_mask_notifier(kvm, 0, &pit->mask_notifier);
+
 	return pit;
 }
 
@@ -594,6 +607,8 @@ void kvm_free_pit(struct kvm *kvm)
 	struct hrtimer *timer;
 
 	if (kvm->arch.vpit) {
+		kvm_unregister_irq_mask_notifier(kvm, 0,
+					       &kvm->arch.vpit->mask_notifier);
 		mutex_lock(&kvm->arch.vpit->pit_state.lock);
 		timer = &kvm->arch.vpit->pit_state.pit_timer.timer;
 		hrtimer_cancel(timer);
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index 76959c4..6acbe4b 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -46,6 +46,7 @@ struct kvm_pit {
 	struct kvm *kvm;
 	struct kvm_kpit_state pit_state;
 	int irq_source_id;
+	struct kvm_irq_mask_notifier mask_notifier;
 };
 
 #define KVM_PIT_BASE_ADDRESS	    0x40


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- TODO	14 Apr 2009 14:13:40 -0000	1.64
+++ TODO	14 Apr 2009 16:39:17 -0000	1.65
@@ -101,3 +101,12 @@
         virtio_net guest->remote GSO busted with 2.6.29 host
         https://bugzilla.redhat.com/490266
         Should be in 2.6.29.1
+
+* linux-2.6-kvm-kconfig-irqchip.patch
+  linux-2.6-kvm-mask-notifiers.patch
+  linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+	Unable to run RHEL-5 Xen within KVM guest
+	https://bugzilla.redhat.com/show_bug.cgi?id=491625
+	Should be in 2.6.29.2
+
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1542
retrieving revision 1.1543
diff -u -r1.1542 -r1.1543
--- kernel.spec	14 Apr 2009 14:18:25 -0000	1.1542
+++ kernel.spec	14 Apr 2009 16:39:17 -0000	1.1543
@@ -742,6 +742,11 @@
 # fix for net lockups, will be in 2.6.29.1
 Patch9101: linux-2.6-net-fix-another-gro-bug.patch
 
+# kvm fixes
+Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
+Patch9301: linux-2.6-kvm-mask-notifiers.patch
+Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1368,6 +1373,11 @@
 
 ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
 
+# kvm fixes
+ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
+ApplyPatch linux-2.6-kvm-mask-notifiers.patch
+ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1953,6 +1963,9 @@
 # and build.
 
 %changelog
+* Thu Apr 14 2009 Marcelo Tosatti <mtosatti at redhat.com>
+- kvm fixes for bz#491625
+
 * Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
 - Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)
 



From nphilipp at fedoraproject.org  Tue Apr 14 16:41:13 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:41:13 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.72, 1.73 sources, 1.80,
	1.81 system-config-users.spec, 1.87, 1.88
Message-ID: <20090414164113.C2D9F700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv934

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.86


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	12 Feb 2009 11:37:16 -0000	1.72
+++ .cvsignore	14 Apr 2009 16:40:41 -0000	1.73
@@ -1 +1 @@
-system-config-users-1.2.85.tar.bz2
+system-config-users-1.2.86.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	12 Feb 2009 11:37:16 -0000	1.80
+++ sources	14 Apr 2009 16:40:41 -0000	1.81
@@ -1 +1 @@
-14f65292ea41f9b20236488635dfe43d  system-config-users-1.2.85.tar.bz2
+0479c585c2e8f224f91c60b0fac8666a  system-config-users-1.2.86.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- system-config-users.spec	26 Feb 2009 05:20:33 -0000	1.87
+++ system-config-users.spec	14 Apr 2009 16:40:41 -0000	1.88
@@ -28,8 +28,8 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.85
-Release: 2%{?dist}
+Version: 1.2.86
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Applications/System
@@ -125,8 +125,8 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.85-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2008 Nils Philippsen <nils at redhat.com> - 1.2.86-1
+- pick up updated translations
 
 * Thu Feb 12 2009 Nils Philippsen <nils at redhat.com> - 1.2.85-1
 - cope with new semantics in cracklib >= 2.8.13 (#484303)



From scop at fedoraproject.org  Tue Apr 14 16:42:17 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 14 Apr 2009 16:42:17 +0000 (UTC)
Subject: rpms/vdr/devel vdr-1.6.0-gcc44.patch,NONE,1.1 vdr.spec,1.41,1.42
Message-ID: <20090414164217.1F562700B2@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1855

Modified Files:
	vdr.spec 
Added Files:
	vdr-1.6.0-gcc44.patch 
Log Message:
Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.

vdr-1.6.0-gcc44.patch:

--- NEW FILE vdr-1.6.0-gcc44.patch ---
diff -up vdr-1.6.0/Makefile~ vdr-1.6.0/Makefile
--- vdr-1.6.0/Makefile~	2008-02-29 23:43:03.000000000 +0200
+++ vdr-1.6.0/Makefile	2009-04-14 19:10:22.000000000 +0300
@@ -82,6 +82,10 @@ all: vdr i18n
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
+recording.o: CXXFLAGS += -fpermissive
+svdrp.o: CXXFLAGS += -fpermissive
+videodir.o: CXXFLAGS += -fpermissive
+
 # Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vdr.spec	14 Apr 2009 15:27:39 -0000	1.41
+++ vdr.spec	14 Apr 2009 16:42:16 -0000	1.42
@@ -82,6 +82,7 @@
 Patch21:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz
 Patch22:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-cap_sys_nice.patch.gz
 Patch23:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ionice.patch.gz
+Patch24:        %{name}-1.6.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -202,6 +203,9 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%if "%(g++ -dumpversion)" >= "4.4"
+%patch24 -p1
+%endif
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -250,6 +254,9 @@
 ifdef PLUGIN
   CFLAGS    += -fPIC
   CXXFLAGS  += -fPIC
+else
+  # https://bugzilla.redhat.com/483644
+  CXXFLAGS  += -D__KERNEL_STRICT_NAMES
 endif
 
 MANDIR       = %{_mandir}
@@ -525,6 +532,7 @@
 
 %changelog
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-20
+- Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.
 - Use useradd -N instead of -n in scriptlets (#495731).
 - Include Rolf Ahrenberg's sys_nice and ionice patches.
 - Update liemikuutio patch to 1.25.



From nphilipp at fedoraproject.org  Tue Apr 14 16:43:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:43:58 +0000 (UTC)
Subject: rpms/system-config-users/devel sources, 1.81,
	1.82 system-config-users.spec, 1.88, 1.89
Message-ID: <20090414164358.F1F40700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652

Modified Files:
	sources system-config-users.spec 
Log Message:
version 1.2.86


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	14 Apr 2009 16:40:41 -0000	1.81
+++ sources	14 Apr 2009 16:43:27 -0000	1.82
@@ -1 +1 @@
-0479c585c2e8f224f91c60b0fac8666a  system-config-users-1.2.86.tar.bz2
+4fcfeb935362240d366fd644db18c9bf  system-config-users-1.2.86.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- system-config-users.spec	14 Apr 2009 16:40:41 -0000	1.88
+++ system-config-users.spec	14 Apr 2009 16:43:27 -0000	1.89
@@ -125,7 +125,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
-* Tue Apr 14 2008 Nils Philippsen <nils at redhat.com> - 1.2.86-1
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.2.86-1
 - pick up updated translations
 
 * Thu Feb 12 2009 Nils Philippsen <nils at redhat.com> - 1.2.85-1



From rhughes at fedoraproject.org  Tue Apr 14 16:46:45 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 16:46:45 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.44,
	1.45 gnome-packagekit.spec, 1.82, 1.83 sources, 1.45, 1.46
Message-ID: <20090414164645.C067D700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3943

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	30 Mar 2009 16:22:36 -0000	1.44
+++ .cvsignore	14 Apr 2009 16:46:14 -0000	1.45
@@ -1 +1 @@
-gnome-packagekit-2.27.1.tar.gz
+gnome-packagekit-2.27.2.tar.gz







From nphilipp at fedoraproject.org  Tue Apr 14 16:48:53 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 14 Apr 2009 16:48:53 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.77, 1.78 sources,
	1.90, 1.91 system-config-services.spec, 1.91, 1.92
Message-ID: <20090414164853.598F8700B2@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4845

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.33


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	2 Mar 2009 08:29:18 -0000	1.77
+++ .cvsignore	14 Apr 2009 16:48:22 -0000	1.78
@@ -1 +1 @@
-system-config-services-0.99.32.tar.bz2
+system-config-services-0.99.33.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	2 Mar 2009 08:29:18 -0000	1.90
+++ sources	14 Apr 2009 16:48:22 -0000	1.91
@@ -1 +1 @@
-d22c7e2cd234465779e517b0dbb9aa76  system-config-services-0.99.32.tar.bz2
+84b42b577d558e84dbfb34da3b6f6430  system-config-services-0.99.33.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- system-config-services.spec	2 Mar 2009 08:29:18 -0000	1.91
+++ system-config-services.spec	14 Apr 2009 16:48:22 -0000	1.92
@@ -3,7 +3,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.32
+Version: 0.99.33
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.33-1
+- pick up updated translations
+
 * Mon Mar 01 2009 Nils Philippsen <nils at redhat.com> - 0.99.32-1
 - require PolicyKit-authentication-agent from F-11 on (#487200)
 



From rhughes at fedoraproject.org  Tue Apr 14 16:50:48 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 16:50:48 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.83,1.84
Message-ID: <20090414165048.D8F93700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5727

Modified Files:
	gnome-packagekit.spec 
Log Message:
* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-0.1.20090414git
- New git snapshot fixing several bugs



Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gnome-packagekit.spec	14 Apr 2009 16:46:14 -0000	1.83
+++ gnome-packagekit.spec	14 Apr 2009 16:50:18 -0000	1.84
@@ -1,14 +1,14 @@
 %define dbus_version            0.61
 %define packagekit_version      0.4.5
-#%define alphatag                20090324
+%define alphatag                20090414
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
 Version:   2.27.2
-#Release:   0.1.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Release:   0.1.%{?alphatag}git%{?dist}
+#Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -205,8 +205,8 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
-* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-1
-- New upstream version
+* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-0.1.20090414git
+- New git snapshot fixing several bugs
 
 * Mon Mar 30 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.1-1
 - New upstream version



From kdudka at fedoraproject.org  Tue Apr 14 16:54:16 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 14 Apr 2009 16:54:16 +0000 (UTC)
Subject: rpms/elinks/devel elinks.spec,1.68,1.69
Message-ID: <20090414165416.66BAA700B2@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6698

Modified Files:
	elinks.spec 
Log Message:
add missing BuildRequires: nss-devel and pkgconfig


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- elinks.spec	14 Apr 2009 11:59:46 -0000	1.68
+++ elinks.spec	14 Apr 2009 16:53:45 -0000	1.69
@@ -14,6 +14,8 @@
 BuildRequires: libidn-devel
 BuildRequires: krb5-devel
 BuildRequires: nss_compat_ossl-devel >= 0.9.3
+BuildRequires: nss-devel
+BuildRequires: pkgconfig
 Requires: zlib >= 1.2.0.2
 Requires(preun): %{_sbindir}/alternatives
 Requires(post): %{_sbindir}/alternatives



From mbarnes at fedoraproject.org  Tue Apr 14 16:54:21 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 14 Apr 2009 16:54:21 +0000 (UTC)
Subject: rpms/evolution/devel evolution-2.26.1-attachment-bar-crasher.patch, 
	NONE, 1.1 evolution.spec, 1.380, 1.381
Message-ID: <20090414165421.D20BA700B2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6675

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.26.1-attachment-bar-crasher.patch 
Log Message:

* Tue Apr 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-2.fc11
- Add patch for GNOME bug #578685 (attachment bar crasher).


evolution-2.26.1-attachment-bar-crasher.patch:

--- NEW FILE evolution-2.26.1-attachment-bar-crasher.patch ---
diff -up evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher evolution-2.26.1/widgets/misc/e-attachment-bar.c
--- evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher	2009-04-14 12:49:45.000000000 -0400
+++ evolution-2.26.1/widgets/misc/e-attachment-bar.c	2009-04-14 12:50:54.000000000 -0400
@@ -450,6 +450,8 @@ update (EAttachmentBar *bar)
 				if (desc)
 					desc = g_strdup (desc);
 			}
+		} else {
+			desc = g_strdup (desc);
 		}
 
 		if (!desc)


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- evolution.spec	14 Apr 2009 03:01:30 -0000	1.380
+++ evolution.spec	14 Apr 2009 16:53:51 -0000	1.381
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -68,6 +68,9 @@
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# GNOME bug #578685
+Patch13: evolution-2.26.1-attachment-bar-crasher.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -225,6 +228,7 @@
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch13 -p1 -b .attachment-bar-crasher
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -691,6 +695,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Apr 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-2.fc11
+- Add patch for GNOME bug #578685 (attachment bar crasher).
+
 * Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
 - Update to 2.26.1
 



From pkgdb at fedoraproject.org  Tue Apr 14 16:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:54:40 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414165440.1E5BF10F87B@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:54:40 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414165440.0CBEF10F851@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:54:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:54:45 +0000
Subject: [pkgdb] rmol: denisarnaud has requested approveacls
Message-ID: <20090414165445.48D5810F885@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the approveacls acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:54:41 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414165441.49FC810F87D@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From mclasen at fedoraproject.org  Tue Apr 14 16:54:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 16:54:56 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.183,1.184
Message-ID: <20090414165456.2A19F700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6832

Modified Files:
	comps-f11.xml.in 
Log Message:
add pulseaudio-module-bluetooth to the default install



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- comps-f11.xml.in	14 Apr 2009 15:17:40 -0000	1.183
+++ comps-f11.xml.in	14 Apr 2009 16:54:25 -0000	1.184
@@ -2193,6 +2193,7 @@
       <packagereq type="default">notification-daemon</packagereq>
       <packagereq type="default">orca</packagereq>
       <packagereq type="default">PolicyKit-gnome</packagereq>
+      <packagereq type="default">pulseaudio-module-bluetooth</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">tomboy</packagereq>



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:03 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414165503.102BC10F851@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:14 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414165514.DDA1210F850@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:14 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414165514.EA4C210F87C@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:15 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414165515.D95CC10F87D@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:16 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414165516.A512D10F880@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:16 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414165516.D908610F884@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:17 +0000
Subject: [pkgdb] rmol: denisarnaud has requested approveacls
Message-ID: <20090414165517.2F94B10F886@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the approveacls acl on rmol (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:21 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414165521.1A4E310F85A@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:22 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414165522.729CD10F88C@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:22 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414165522.3226410F88A@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:22 +0000
Subject: [pkgdb] rmol: denisarnaud has requested approveacls
Message-ID: <20090414165522.76FF910F88D@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the approveacls acl on rmol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:26 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414165526.CFF5D10F7C2@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:27 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414165527.7678610F891@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:27 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414165527.9BAC110F893@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:28 +0000
Subject: [pkgdb] rmol: denisarnaud has requested approveacls
Message-ID: <20090414165528.C0BAE10F850@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the approveacls acl on rmol (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:31 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414165531.B833D10F87B@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:32 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414165532.583E310F897@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:32 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414165532.245DA10F87E@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 16:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 16:55:33 +0000
Subject: [pkgdb] rmol: denisarnaud has requested approveacls
Message-ID: <20090414165533.824D510F899@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the approveacls acl on rmol (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From linville at fedoraproject.org  Tue Apr 14 16:56:25 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 14 Apr 2009 16:56:25 +0000 (UTC)
Subject: rpms/iwl4965-firmware/devel iwl4965-firmware.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20090414165625.8A95D700B2@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl4965-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7538

Modified Files:
	iwl4965-firmware.spec sources 
Log Message:
Resync with F-10 version of the package


Index: iwl4965-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/iwl4965-firmware.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iwl4965-firmware.spec	25 Feb 2009 08:27:36 -0000	1.6
+++ iwl4965-firmware.spec	14 Apr 2009 16:55:54 -0000	1.7
@@ -1,5 +1,5 @@
 %define iwl4965_v1         228.57.1.21
-%define iwl4965_v2         228.57.2.21
+%define iwl4965_v2         228.57.2.23
 %define iwl4965_list       %{iwl4965_v1} %{iwl4965_v2}
 
 Name:           iwl4965-firmware
@@ -68,6 +68,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 John W. Linville <linville at redhat.com> - 228.57.2.23-4
+- Resync with F-10 version of the package
+- Update v2 to 228.57.2.23 - Should fix #457154
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 228.57.2.21-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jul 2008 15:53:02 -0000	1.4
+++ sources	14 Apr 2009 16:55:55 -0000	1.5
@@ -1,2 +1,2 @@
 bce5a13d681100aeee2ddac3beaff437  iwlwifi-4965-ucode-228.57.1.21.tgz
-83804fb4bfa991ffd4849c19a74bf38d  iwlwifi-4965-ucode-228.57.2.21.tgz
+505390a555b88c8b6b23057cebec4ad1  iwlwifi-4965-ucode-228.57.2.23.tgz



From mclasen at fedoraproject.org  Tue Apr 14 17:01:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 17:01:45 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec,1.13,1.14 sources,1.5,1.6
Message-ID: <20090414170145.99E62700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9585

Modified Files:
	paprefs.spec sources 
Log Message:
0.9.8



Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- paprefs.spec	15 Mar 2009 20:03:56 -0000	1.13
+++ paprefs.spec	14 Apr 2009 17:01:14 -0000	1.14
@@ -1,17 +1,16 @@
 Name:           paprefs
-Version:        0.9.7
-Release:        5%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Management tool for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/paprefs
 Source0:        http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.tar.gz
-Patch0:         paprefs-0.9.7-modulepath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       pulseaudio-module-gconf
 
-BuildRequires:  gconfmm26-devel libglademm24-devel lynx desktop-file-utils
+BuildRequires:  gconfmm26-devel libglademm24-devel lynx desktop-file-utils pulseaudio-libs-devel
 BuildRequires: intltool
 
 %description
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .modulepath
 
 
 %build
@@ -53,6 +51,9 @@
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Tue Apr 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.8-1
+- Update to 0.9.8
+
 * Sun Mar 15 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.9.7-5
 - Try harder when looking for modules
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2008 13:52:38 -0000	1.5
+++ sources	14 Apr 2009 17:01:15 -0000	1.6
@@ -1 +1 @@
-08407e55679c5ddd5bd4b20fe07bcd93  paprefs-0.9.7.tar.gz
+1c54aa1ef52e65097996f5930a816230  paprefs-0.9.8.tar.gz



From ricky at fedoraproject.org  Tue Apr 14 17:04:08 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:04:08 +0000 (UTC)
Subject: rpms/supybot/F-9 supybot.spec,1.3,1.4
Message-ID: <20090414170408.69215700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10565/F-9

Modified Files:
	supybot.spec 
Log Message:
Fix whitespace issue which was preventing the package from building.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/F-9/supybot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- supybot.spec	14 Apr 2009 16:11:42 -0000	1.3
+++ supybot.spec	14 Apr 2009 17:03:37 -0000	1.4
@@ -1,5 +1,5 @@
 %global origname Supybot
-%{!?python_sitelib:??%global python_sitelib??%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
 Version:        0.83.3



From ricky at fedoraproject.org  Tue Apr 14 17:04:08 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:04:08 +0000 (UTC)
Subject: rpms/supybot/F-10 supybot.spec,1.3,1.4
Message-ID: <20090414170408.1A9A5700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10565/F-10

Modified Files:
	supybot.spec 
Log Message:
Fix whitespace issue which was preventing the package from building.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/F-10/supybot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- supybot.spec	14 Apr 2009 16:11:41 -0000	1.3
+++ supybot.spec	14 Apr 2009 17:03:37 -0000	1.4
@@ -1,5 +1,5 @@
 %global origname Supybot
-%{!?python_sitelib:??%global python_sitelib??%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
 Version:        0.83.3



From ricky at fedoraproject.org  Tue Apr 14 17:04:08 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:04:08 +0000 (UTC)
Subject: rpms/supybot/devel supybot.spec,1.7,1.8
Message-ID: <20090414170408.CC239700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10565/devel

Modified Files:
	supybot.spec 
Log Message:
Fix whitespace issue which was preventing the package from building.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/supybot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- supybot.spec	14 Apr 2009 16:11:43 -0000	1.7
+++ supybot.spec	14 Apr 2009 17:03:38 -0000	1.8
@@ -1,5 +1,5 @@
 %global origname Supybot
-%{!?python_sitelib:??%global python_sitelib??%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
 Version:        0.83.3



From twaugh at fedoraproject.org  Tue Apr 14 17:04:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 14 Apr 2009 17:04:27 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.1.7.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.199, 1.200 sources, 1.205, 1.206 system-config-printer.spec,
	1.256, 1.257 system-config-printer-1.1.6.tar.bz2.sig, 1.1, NONE
Message-ID: <20090414170427.BE500700B2@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10774

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.7.tar.bz2.sig 
Removed Files:
	system-config-printer-1.1.6.tar.bz2.sig 
Log Message:
* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-1
- Requires dbus-python (bug #495392).
- Updated to 1.1.7:
  - Updated translations.
  - Don't abort if the jobviewer couldn't show a notification.
  - Don't use setlocale() for locale-independent case conversion.
  - Don't assume the notification daemon can show action buttons.
  - Use case-insensitive matching for model names.
  - HPLIP compatibility fixes.
  - Fixed typo in jobviewer keyring support (Ubuntu #343156).
  - Added support for https device URIs (bug #478677).
  - Prevent traceback in monitor when connection failed (Ubuntu #343387).



--- NEW FILE system-config-printer-1.1.7.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- .cvsignore	13 Mar 2009 17:42:07 -0000	1.199
+++ .cvsignore	14 Apr 2009 17:03:56 -0000	1.200
@@ -198,3 +198,4 @@
 system-config-printer-1.1.4.tar.bz2
 system-config-printer-1.1.5.tar.bz2
 system-config-printer-1.1.6.tar.bz2
+system-config-printer-1.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- sources	13 Mar 2009 17:42:07 -0000	1.205
+++ sources	14 Apr 2009 17:03:56 -0000	1.206
@@ -1,3 +1,4 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2
 b07e1d75130030fa3beae3b698c2d32b  system-config-printer-1.1.6.tar.bz2
+a77bde5adc5ee8822b0764ff786ccc09  system-config-printer-1.1.7.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- system-config-printer.spec	14 Apr 2009 12:10:12 -0000	1.256
+++ system-config-printer.spec	14 Apr 2009 17:03:57 -0000	1.257
@@ -6,7 +6,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.6
+Version: 1.1.7
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -165,8 +165,18 @@
 exit 0
 
 %changelog
-* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
+* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-1
 - Requires dbus-python (bug #495392).
+- Updated to 1.1.7:
+  - Updated translations.
+  - Don't abort if the jobviewer couldn't show a notification.
+  - Don't use setlocale() for locale-independent case conversion.
+  - Don't assume the notification daemon can show action buttons.
+  - Use case-insensitive matching for model names.
+  - HPLIP compatibility fixes.
+  - Fixed typo in jobviewer keyring support (Ubuntu #343156).
+  - Added support for https device URIs (bug #478677).
+  - Prevent traceback in monitor when connection failed (Ubuntu #343387).
 
 * Fri Mar 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.6-1
 - No longer requires gnome-python2-gnome.


--- system-config-printer-1.1.6.tar.bz2.sig DELETED ---



From mclasen at fedoraproject.org  Tue Apr 14 17:12:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 17:12:26 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.74, 1.75 gnome-session.spec, 
	1.232, 1.233 sources, 1.78, 1.79
Message-ID: <20090414171226.307DC700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13311

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	8 Apr 2009 15:49:57 -0000	1.74
+++ .cvsignore	14 Apr 2009 17:11:55 -0000	1.75
@@ -1 +1 @@
-gnome-session-2.26.0.90.tar.bz2
+gnome-session-2.26.1.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- gnome-session.spec	8 Apr 2009 15:49:57 -0000	1.232
+++ gnome-session.spec	14 Apr 2009 17:11:55 -0000	1.233
@@ -9,7 +9,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.26.0.90
+Version: 2.26.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
@@ -175,6 +175,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/gnome-session/2.26/gnome-session-2.26.1.news
+
 * Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0.90-1
 - Update to 2.26.0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	8 Apr 2009 15:49:57 -0000	1.78
+++ sources	14 Apr 2009 17:11:55 -0000	1.79
@@ -1 +1 @@
-b715b1de0de24a49eb91b41a6731919b  gnome-session-2.26.0.90.tar.bz2
+aa280939a3e07209081095e8e10fe619  gnome-session-2.26.1.tar.bz2



From ricky at fedoraproject.org  Tue Apr 14 17:16:34 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:16:34 +0000 (UTC)
Subject: rpms/python-dictclient/F-10 python-dictclient.spec,1.3,1.4
Message-ID: <20090414171634.EBD55700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-dictclient/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14622/F-10

Modified Files:
	python-dictclient.spec 
Log Message:
Change define to global, remove old >= 8 conditional.



Index: python-dictclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dictclient/F-10/python-dictclient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-dictclient.spec	29 Jul 2008 01:48:56 -0000	1.3
+++ python-dictclient.spec	14 Apr 2009 17:16:04 -0000	1.4
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dictclient
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python client for DICT protocol
 
 Group:          Development/Languages
@@ -13,11 +13,7 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
+BuildRequires:  python-setuptools-devel
 
 %description
 A client library for the DICT protocol.
@@ -47,5 +43,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.0.1-2
+- Change define to global.
+- Remove old >= 8 conditional.
+
 * Sat Apr 05 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.0.1-1
 - Initial RPM Package.



From ricky at fedoraproject.org  Tue Apr 14 17:16:35 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:16:35 +0000 (UTC)
Subject: rpms/python-dictclient/F-9 python-dictclient.spec,1.1,1.2
Message-ID: <20090414171635.96160700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-dictclient/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14622/F-9

Modified Files:
	python-dictclient.spec 
Log Message:
Change define to global, remove old >= 8 conditional.



Index: python-dictclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dictclient/F-9/python-dictclient.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-dictclient.spec	1 Jun 2008 08:03:06 -0000	1.1
+++ python-dictclient.spec	14 Apr 2009 17:16:04 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dictclient
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python client for DICT protocol
 
 Group:          Development/Languages
@@ -13,11 +13,7 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
+BuildRequires:  python-setuptools-devel
 
 %description
 A client library for the DICT protocol.
@@ -47,5 +43,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.0.1-2
+- Change define to global.
+- Remove old >= 8 conditional.
+
 * Sat Apr 05 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.0.1-1
 - Initial RPM Package.



From ricky at fedoraproject.org  Tue Apr 14 17:16:36 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:16:36 +0000 (UTC)
Subject: rpms/python-dictclient/devel python-dictclient.spec,1.5,1.6
Message-ID: <20090414171636.6D358700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-dictclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14622/devel

Modified Files:
	python-dictclient.spec 
Log Message:
Change define to global, remove old >= 8 conditional.



Index: python-dictclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dictclient/devel/python-dictclient.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-dictclient.spec	26 Feb 2009 21:12:00 -0000	1.5
+++ python-dictclient.spec	14 Apr 2009 17:16:05 -0000	1.6
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dictclient
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python client for DICT protocol
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
+BuildRequires:  python-setuptools-devel
 
 %description
 A client library for the DICT protocol.
@@ -47,6 +42,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.0.1-4
+- Change define to global.
+- Remove old >= 8 conditional.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ricky at fedoraproject.org  Tue Apr 14 17:20:04 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:20:04 +0000 (UTC)
Subject: rpms/python-dtopt/F-9 python-dtopt.spec,1.1,1.2
Message-ID: <20090414172004.21E8E70127@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-dtopt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15668/F-9

Modified Files:
	python-dtopt.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-dtopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dtopt/F-9/python-dtopt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-dtopt.spec	13 Jul 2008 19:31:42 -0000	1.1
+++ python-dtopt.spec	14 Apr 2009 17:19:33 -0000	1.2
@@ -1,16 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dtopt
 Summary:        Add options to doctest examples while they are running
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pypi.python.org/pypi/dtopt/
 Source0:        http://pypi.python.org/packages/source/d/dtopt/dtopt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 
 %description
@@ -42,6 +41,10 @@
 %{python_sitelib}/dtopt*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.1-3
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Fri Jun 27 2008 Ricky Zhou <ricky at fedoraproject.org> 0.1-2
 - Initial package for Fedora
 



From ricky at fedoraproject.org  Tue Apr 14 17:20:03 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:20:03 +0000 (UTC)
Subject: rpms/python-dtopt/F-10 python-dtopt.spec,1.1,1.2
Message-ID: <20090414172004.04051700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-dtopt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15668/F-10

Modified Files:
	python-dtopt.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-dtopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dtopt/F-10/python-dtopt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-dtopt.spec	13 Jul 2008 19:29:30 -0000	1.1
+++ python-dtopt.spec	14 Apr 2009 17:19:33 -0000	1.2
@@ -1,16 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dtopt
 Summary:        Add options to doctest examples while they are running
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pypi.python.org/pypi/dtopt/
 Source0:        http://pypi.python.org/packages/source/d/dtopt/dtopt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 
 %description
@@ -42,6 +41,10 @@
 %{python_sitelib}/dtopt*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.1-3
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Fri Jun 27 2008 Ricky Zhou <ricky at fedoraproject.org> 0.1-2
 - Initial package for Fedora
 



From ricky at fedoraproject.org  Tue Apr 14 17:20:04 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:20:04 +0000 (UTC)
Subject: rpms/python-dtopt/devel python-dtopt.spec,1.3,1.4
Message-ID: <20090414172004.C4953700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-dtopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15668/devel

Modified Files:
	python-dtopt.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-dtopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dtopt/devel/python-dtopt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-dtopt.spec	26 Feb 2009 21:17:46 -0000	1.3
+++ python-dtopt.spec	14 Apr 2009 17:19:34 -0000	1.4
@@ -1,16 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dtopt
 Summary:        Add options to doctest examples while they are running
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pypi.python.org/pypi/dtopt/
 Source0:        http://pypi.python.org/packages/source/d/dtopt/dtopt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 
 %description
@@ -42,6 +41,10 @@
 %{python_sitelib}/dtopt*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.1-5
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From avesh at fedoraproject.org  Tue Apr 14 17:22:47 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 14 Apr 2009 17:22:47 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6.21-nss.patch, NONE,
	1.1 openswan.spec, 
	1.74, 1.75 openswan-2.6.21-nss-disabled.patch, 1.1, NONE
Message-ID: <20090414172247.DCB06700B2@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16478

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6.21-nss.patch 
Removed Files:
	openswan-2.6.21-nss-disabled.patch 
Log Message:
* Mon Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
- Updated the Openswan-NSS porting to enable nss by default
- The patch includes README.nss for information about NSS usage


openswan-2.6.21-nss.patch:

--- NEW FILE openswan-2.6.21-nss.patch ---
diff -urNp openswan-2.6.21-orig/include/certs.h openswan-2.6.21/include/certs.h
--- openswan-2.6.21-orig/include/certs.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/certs.h	2009-04-02 14:49:47.000000000 -0400
@@ -90,6 +90,12 @@ extern bool load_coded_file(const char *
 			    , int verbose
 			    , const char *type, chunk_t *blob, bool *pgp);
 
+#ifdef HAVE_LIBNSS
+extern bool load_cert_from_nss(bool forcedtype, const char *nssHostCertNickName, int verbose,
+                   const char *label, cert_t *cert);
+extern void load_authcerts_from_nss(const char *type, u_char auth_flags);
+#endif
+
 #endif /* _CERTS_H */
 
 /*
diff -urNp openswan-2.6.21-orig/include/constants.h openswan-2.6.21/include/constants.h
--- openswan-2.6.21-orig/include/constants.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/constants.h	2009-04-02 14:49:47.000000000 -0400
@@ -53,10 +53,10 @@ typedef int bool;
 #define dup_any(fd) ((fd) == NULL_FD? NULL_FD : dup(fd))
 #define close_any(fd) { if ((fd) != NULL_FD) { close(fd); (fd) = NULL_FD; } }
 
-
-/* Also comes in via <nspr4/prcpucfg.h> with USE_NSS */
-#ifndef BITS_PER_BYTE
-# define BITS_PER_BYTE	8
+#ifdef HAVE_LIBNSS
+#include <prcpucfg.h>
+#else
+#define BITS_PER_BYTE	8
 #endif
 #define BYTES_FOR_BITS(b)   (((b) + BITS_PER_BYTE - 1) / BITS_PER_BYTE)
 
diff -urNp openswan-2.6.21-orig/include/md5.h openswan-2.6.21/include/md5.h
--- openswan-2.6.21-orig/include/md5.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/md5.h	2009-04-02 14:49:47.000000000 -0400
@@ -62,11 +62,21 @@ These notices must be retained in any co
 documentation and/or software.
  */
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
+
 /* MD5 context. */
 typedef struct {
+#ifdef HAVE_LIBNSS
+  PK11Context* ctx_nss;
+#else
   UINT4 state[4];                                   /* state (ABCD) */
   UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
   unsigned char buffer[64];                         /* input buffer */
+#endif
 } MD5_CTX;
 
 void osMD5Init PROTO_LIST ((MD5_CTX *));
diff -urNp openswan-2.6.21-orig/include/oswconf.h openswan-2.6.21/include/oswconf.h
--- openswan-2.6.21-orig/include/oswconf.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/oswconf.h	2009-04-02 14:49:47.000000000 -0400
@@ -19,6 +19,11 @@
 
 #include "constants.h"
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
 struct paththing {
   char    *path;
   size_t   path_space;
@@ -50,10 +55,30 @@ struct osw_conf_options {
     char *ocspcerts_dir;          /* "/etc/ipsec.d/ocspcerts" */
 };
 
+#ifdef HAVE_LIBNSS
+typedef struct {
+    enum {
+    PW_NONE = 0,      /* no password */
+    PW_FROMFILE = 1,  /* password data in a text file */
+    PW_PLAINTEXT = 2, /* password data in the clear in memory buffer */
+    PW_EXTERNAL = 3   /* external source, user will be prompted */
+    } source ;
+    char *data;
+} secuPWData;
+#endif
+
+
 extern const struct osw_conf_options *osw_init_options(void);
 extern const struct osw_conf_options *osw_init_ipsecdir(const char *ipsec_dir);
 extern const struct osw_conf_options *osw_init_rootdir(const char *root_dir);
 
+
+#ifdef HAVE_LIBNSS
+extern secuPWData *osw_return_nss_password_file_info(void);
+extern char *getNSSPassword(PK11SlotInfo *slot, PRBool retry, void *arg);
+extern bool Pluto_IsFIPS(void);
+#endif
+
 #endif /* _OSW_ALLOC_H_ */
 
 /*
diff -urNp openswan-2.6.21-orig/include/pem.h openswan-2.6.21/include/pem.h
--- openswan-2.6.21-orig/include/pem.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/pem.h	2009-04-02 14:49:47.000000000 -0400
@@ -18,3 +18,6 @@
 
 extern err_t pemtobin(chunk_t *blob, prompt_pass_t *pass, const char* label
     , bool *pgp);
+
+extern void do_3des_nss(u_int8_t *buf, size_t buf_len
+	, u_int8_t *key, size_t key_size, u_int8_t *iv, bool enc);
diff -urNp openswan-2.6.21-orig/include/secrets.h openswan-2.6.21/include/secrets.h
--- openswan-2.6.21-orig/include/secrets.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/secrets.h	2009-04-02 14:49:47.000000000 -0400
@@ -19,6 +19,11 @@
 #include <gmp.h>    /* GNU MP library */
 #include "id.h"
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <pk11pub.h>
+#endif
+
 #ifndef SHARED_SECRETS_FILE
 # define SHARED_SECRETS_FILE  "/etc/ipsec.secrets"
 #endif
@@ -37,6 +42,9 @@ struct RSA_public_key
     MP_INT
 	n,	/* modulus: p * q */
 	e;	/* exponent: relatively prime to (p-1) * (q-1) [probably small] */
+#ifdef HAVE_LIBNSS
+    CERTCertificate *nssCert;
+#endif
 };
 
 struct RSA_private_key {
@@ -50,6 +58,10 @@ struct RSA_private_key {
 	dP,	/* first factor's exponent: (e^-1) mod (p-1) == d mod (p-1) */
 	dQ,	/* second factor's exponent: (e^-1) mod (q-1) == d mod (q-1) */
 	qInv;	/* (q^-1) mod p */
+#ifdef HAVE_LIBNSS
+    unsigned char ckaid[HMAC_BUFSIZE];  /*ckaid for use in NSS*/
+    unsigned int  ckaid_len;	
+#endif
 };
 
 extern void free_RSA_public_content(struct RSA_public_key *rsa);
@@ -133,6 +145,11 @@ extern void delete_public_keys(struct pu
 			       , enum pubkey_alg alg);
 extern void form_keyid(chunk_t e, chunk_t n, char* keyid, unsigned *keysize);
 
+#ifdef HAVE_LIBNSS
+extern void form_keyid_from_nss(SECItem e, SECItem n, char* keyid, unsigned *keysize);
+extern err_t extract_and_add_secret_from_nss_cert_file(struct RSA_private_key *rsak, char *nssHostCertNickName);
+#endif
+
 extern struct pubkey *reference_key(struct pubkey *pk);
 extern void unreference_key(struct pubkey **pkp);
 
diff -urNp openswan-2.6.21-orig/include/sha1.h openswan-2.6.21/include/sha1.h
--- openswan-2.6.21-orig/include/sha1.h	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/include/sha1.h	2009-04-02 14:49:47.000000000 -0400
@@ -15,7 +15,7 @@ By Steve Reid <steve at edmweb.com>
 
 typedef struct {
 #ifdef HAVE_LIBNSS
-PK11Context* DigestContext;
+    PK11Context* ctx_nss;
 #else
     u_int32_t state[5];
     u_int32_t count[2];
diff -urNp openswan-2.6.21-orig/lib/libcrypto/libmd5/Makefile openswan-2.6.21/lib/libcrypto/libmd5/Makefile
--- openswan-2.6.21-orig/lib/libcrypto/libmd5/Makefile	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/lib/libcrypto/libmd5/Makefile	2009-04-02 14:49:47.000000000 -0400
@@ -10,4 +10,9 @@ ONEFILE=md5.c
 LIBRARY=crypto/libmd5
 LIB=libmd5.a
 
+ifeq ($(USE_LIBNSS),true)
+CFLAGS+=-DHAVE_LIBNSS
+CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+endif
+
 include ${srcdir}../../Makefile.library
diff -urNp openswan-2.6.21-orig/lib/libcrypto/libmd5/md5.c openswan-2.6.21/lib/libcrypto/libmd5/md5.c
--- openswan-2.6.21-orig/lib/libcrypto/libmd5/md5.c	2009-03-30 09:11:28.000000000 -0400
+++ openswan-2.6.21/lib/libcrypto/libmd5/md5.c	2009-04-02 14:49:47.000000000 -0400
@@ -46,6 +46,11 @@ documentation and/or software.
 #include "md5.h"
 #include "oswendian.h" /* sets BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN */
 
+#ifdef HAVE_LIBNSS
+#include <pk11pub.h>
+#include "oswlog.h"
+#endif
[...5344 lines suppressed...]
@@ -0,0 +1,117 @@
+Title: Using NSS crypto library with Pluto (Openswan)
+Author: Avesh Agarwal email: avagarwa at redhat.com
+Version:0.0
+
+
+About NSS crypto library
+--------------------------
+Please visit http://www.mozilla.org/projects/security/pki/nss/
+ 
+NSS crypto library is user space library. It is only used with Pluto (user space IKE daemon) for cryptographic operations. When using NSS, it does not impact the way IPSEC kernel (KLIPS or NETKEY) works. The usefulness of using NSS lies in the fact that the secret information (like private keys or anything else) never comes out of NSS database.
+
+
+How to enable NSS crypto library with Openswan
+-----------------------------------------------
+Change the flag USE_LIBNSS in openswan/Makefile.inc to "true" before compilation
+
+
+Basic NSS tools required
+-------------------------
+certutil: To create/modify/delete NSS db, certificates etc. More description can be found at
+http://www.mozilla.org/projects/security/pki/nss/tools/certutil.html
+
+pk12util: To import/export certificates or keys in to/out of NSS db. More description can be found at
+http://www.mozilla.org/projects/security/pki/nss/tools/pk12util.html  
+
+modutil: To put NSS into FIPS mode. 
+http://www.mozilla.org/projects/security/pki/nss/tools/modutil.html
+
+
+Creating database before using NSS with Pluto (Openswan)
+--------------------------------------------------------
+You must create a NSS db before running pluto with NSS enabled. NSS db can be created as follows.
+
+certutil -N -d <path-to-ipsec.d- dir>/ipsec.d
+
+By default the path to ipsec.d is set to /etc/ipsec.d. 
+
+Without loss of generality, the further discussion is based on that the path to ipsec.d is "/etc/ipsec.d".
+
+
+NSS database password
+----------------------
+When creating a database, the certutil command also prompts for a password. It is upto the user to provide a password or not for the database.
+However, database password must be provided in FIPS mode. 
+
+
+About the password file "nsspassword"
+-------------------------------------
+If you create the database with a password, and want to run NSS in FIPS mode, you must create a password file with the name "nsspassword" in the /etc/ipsec.d before running pluto with NSS. The "nsspassword" file must contain the password you provided when creating NSS database. 
+
+Important thing to note: 
+i) You only need the "nsspassword" file if you run pluto in FIPS. In other way, if you run pluto in normal or NonFIPS mode and even if you create the NSS database with a password, you need not create a "nsspassword" file. 
+
+ii) If you create he "nsspassword" file, it must contain only the password nothing else.  
+
+
+Generating RSA keys when using NSS
+-----------------------------------
+You can still use ipsec newhostkey and ipsec rsasigkey tools for creating RSA keys. The only difference is that you need to provide a path to NSS db directory (or config directoty). Assuming that NSS db is is "/etc/ipsec.d", an example is as follows
+
+ipsec newhostkey --configdir /etc/ipsec.d [--password password] --output /etc/ipsec.d/ipsec.secrets 
+
+A password is only required if NSS database is used in FIPS mode. If you use NSS and create RSA keys (private/public), you will notice that the contents of the ipsec.secrets are different than what used to be before. 
+
+Public key information in ipsec.secrets is stored in the same way as before. However, all the fields of the Private key information contain just a similar ID. This ID is called CKA ID, which is used to locate private keys inside NSS database during the IKE negotiation.
+
+Important thing to note
+------------------------
+It means that ipsec.secrets does not contain any real private key information, as private key never comes out of NSS database. Therefore ipsec.secrets is not really a secret file anymore when using pluto with NSS. 
+
+ipsec.conf does not require any changes the way it is configured when using RSA sig keys with Pluto.
+
+
+Creating certificates with NSS
+-------------------------------
+i)To create a certificate authority (CA certficate):
+
+certutil -S -k rsa -n <ca-cert-nickname> -s "CN=ca-cert-common-name" -w 12 -d . -t "C,C,C" -x -d /etc/ipsec.d
+
+It creates a certificate with RSA keys (-k rsa) with the nick name "ca-cert-nickname", and with common name "ca-cert-common-name". The option "-w" specifies the certificates validy period. "-t" specifies the attributes of the certificate. "C" is require for creating a CA certificate. "-x" mean self signed. "-d" specifies the path of the database directory.
+
+Important thing to note: It is not a requirement to create the CA in NSS database. The CA certificate can be obtained from anywhere in the world.
+
+ii) To create a user certificate signed by the above CA
+
+certutil -S -k rsa -c <ca-cert-nickname> -n <user-cert-nickname> -s "CN=user-cet-common-name" -w 12 -t "u,u,u" -d /etc/ipsec.d 
+
+It creates a user cert with nick name "user-cert-nickname" with attributes "u,u,u" signed by the CA cert "ca-cert-name". 
+
+Important thing to note: You must provided a nick name when creating a user cert, because Pluto reads the user cert from the NSS database nased on the user cert's nickname. 
+
+
+Changes in the certitificates usage with Pluto
+------------------------------------------------
+1) ipsec.comf changes
+
+The only change is "leftcert" field must contain the nick name of the user cert. For example if the nickname of the user cert is "xyz", then it can be  "leftid=xyz".
+
+2) ipsec.secrets changes
+
+ : RSA <user-cert-nick-name> 
+
+You just need to provide the user cert's nick name. For example if the nickname of the user cert is "xyz", then
+
+ : RSA xyz 
+
+There is no need to provide private key file information or its password. 
+
+3) changes in the directories in /etc/ipsec.d/ (cacerts, certs, private)  
+i)You need not have "private" or "certs" directory.
+
+ii) If you obtain a CA certificate from outside, and it is not inside NSS database, then you need to put the certificate inside "cacerts" directory, so that Pluto can read it. If the CA certificate is created in the NSS database, or imported from outside inside the NSS database, you need not have "cacerts" directory,as Pluto can read the CA cert from the database.
+
+
+Things not supported
+---------------------
+PSK: It is not supported when using NSS, because it required both pluto peers to have a mutual keys created outside the NSS database. So It should not be configured with NSS. 
diff -urNp openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/local.conf openswan-2.6.21/testing/pluto/nss-examples/x509-nss/local.conf
--- openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/local.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.21/testing/pluto/nss-examples/x509-nss/local.conf	2009-04-02 14:49:47.000000000 -0400
@@ -0,0 +1,37 @@
+# /etc/ipsec.conf - Openswan IPsec configuration file
+
+version 2.0
+
+config setup
+        # put the logs in /tmp for the UMLs, so that we can operate
+        # without syslogd, which seems to break on UMLs
+        plutostderrlog=/tmp/pluto.log
+        plutorestartoncrash=false
+        dumpdir=/var/tmp
+
+# only used in x509-pluto-02
+conn north-east-x509-pluto-02
+        also=eastnet
+        also=northnet
+        # Left security gateway, subnet behind it, next hop toward right.
+        left=192.1.3.33
+        leftrsasigkey=%cert
+        leftnexthop=192.1.3.254
+	leftid="C=ca, ST=Ontario, O=Xelerance, L=Toronto, CN=north.testing.xelerance.com, E=testing at xelerance.com"
+	leftcert="user-cert-nick-name"
+        # Right security gateway, subnet behind it, next hop toward left.
+        right=192.1.2.23
+        rightnexthop=192.1.2.254
+        rightrsasigkey=%cert
+        auto=ignore
+
+conn northnet
+        leftsubnet=192.0.3.0/24
+
+include /etc/ipsec.d/ipsec.conf.common
+
+conn us
+        rightsubnet=192.0.2.0/24
+
+conn them
+        leftsubnet=192.0.1.0/24
diff -urNp openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/remote.conf openswan-2.6.21/testing/pluto/nss-examples/x509-nss/remote.conf
--- openswan-2.6.21-orig/testing/pluto/nss-examples/x509-nss/remote.conf	1969-12-31 19:00:00.000000000 -0500
+++ openswan-2.6.21/testing/pluto/nss-examples/x509-nss/remote.conf	2009-04-02 14:49:47.000000000 -0400
@@ -0,0 +1,37 @@
+# /etc/ipsec.conf - Openswan IPsec configuration file
+
+version 2.0
+
+config setup
+        # put the logs in /tmp for the UMLs, so that we can operate
+        # without syslogd, which seems to break on UMLs
+        plutostderrlog=/tmp/pluto.log
+        plutorestartoncrash=false
+        dumpdir=/var/tmp
+
+# only used in x509-pluto-02
+conn north-east-x509-pluto-02
+        also=eastnet
+        also=northnet
+        # Left security gateway, subnet behind it, next hop toward right.
+        left=192.1.2.33
+        leftrsasigkey=%cert
+        leftnexthop=192.1.2.254
+	leftid="C=ca, ST=Ontario, O=Xelerance, L=Toronto, CN=north.testing.xelerance.com, E=testing at xelerance.com"
+	leftcert="user-cert-nick-name"
+        # Right security gateway, subnet behind it, next hop toward left.
+        right=192.1.3.23
+        rightnexthop=192.1.3.254
+        rightrsasigkey=%cert
+        auto=ignore
+
+conn northnet
+        leftsubnet=192.0.2.0/24
+
+include /etc/ipsec.d/ipsec.conf.common
+
+conn us
+        rightsubnet=192.0.3.0/24
+
+conn them
+        leftsubnet=192.0.1.0/24


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- openswan.spec	13 Apr 2009 16:16:48 -0000	1.74
+++ openswan.spec	14 Apr 2009 17:22:17 -0000	1.75
@@ -4,7 +4,7 @@
 Name: openswan
 Version: 2.6.21
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -16,7 +16,7 @@
 Patch3: openswan-2.6-selinux.patch
 Patch4: openswan-2.6.16-initscript-correction.patch
 Patch5: openswan-2.6.21-gcc44.patch
-Patch6: openswan-2.6.21-nss-disabled.patch
+Patch6: openswan-2.6.21-nss.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -169,6 +169,10 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
+- Updated the Openswan-NSS porting to enable nss by default
+- The patch includes README.nss for information about NSS usage
+
 * Mon Apr 13 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-2
 - Applied patch to support NSS, currently disabled due to
   dependency on rh bz #491693


--- openswan-2.6.21-nss-disabled.patch DELETED ---



From glommer at fedoraproject.org  Tue Apr 14 17:25:03 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Tue, 14 Apr 2009 17:25:03 +0000 (UTC)
Subject: rpms/openbios/devel openbios-ppc-nographic.patch, NONE,
	1.1 openbios.spec, 1.2, 1.3
Message-ID: <20090414172503.2691B700B2@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/openbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17223

Modified Files:
	openbios.spec 
Added Files:
	openbios-ppc-nographic.patch 
Log Message:
applied bugfix for 494075



openbios-ppc-nographic.patch:

--- NEW FILE openbios-ppc-nographic.patch ---
Index: /trunk/openbios-devel/drivers/pci.c
===================================================================
--- /trunk/openbios-devel/drivers/pci.c (revision 449)
+++ /trunk/openbios-devel/drivers/pci.c (revision 481)
@@ -37,5 +37,6 @@
 /* DECLARE data structures for the nodes.  */
 
-DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) );
+DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) );
+DECLARE_UNNAMED_NODE( ob_pci_simple_node, INSTALL_OPEN, 2*sizeof(int) );
 
 const pci_arch_t *arch;
@@ -157,5 +158,5 @@
 }
 
-NODE_METHODS(ob_pci_node) = {
+NODE_METHODS(ob_pci_bus_node) = {
 	{ NULL,			ob_pci_initialize	},
 	{ "open",		ob_pci_open		},
@@ -163,4 +164,10 @@
 	{ "decode-unit",	ob_pci_decode_unit	},
 	{ "encode-unit",	ob_pci_encode_unit	},
+};
+
+NODE_METHODS(ob_pci_simple_node) = {
+	{ NULL,			ob_pci_initialize	},
+	{ "open",		ob_pci_open		},
+	{ "close",		ob_pci_close		},
 };
 
@@ -738,5 +745,10 @@
 			config.dev = addr & 0x00FFFFFF;
 
-			REGISTER_NAMED_NODE(ob_pci_node, config.path);
+                        if (class == PCI_BASE_CLASS_BRIDGE &&
+                            (subclass == PCI_SUBCLASS_BRIDGE_HOST ||
+                             subclass == PCI_SUBCLASS_BRIDGE_PCI))
+                            REGISTER_NAMED_NODE(ob_pci_bus_node, config.path);
+                        else
+                            REGISTER_NAMED_NODE(ob_pci_simple_node, config.path);
 
 			activate_device(config.path);


Index: openbios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openbios.spec	9 Apr 2009 15:54:50 -0000	1.2
+++ openbios.spec	14 Apr 2009 17:24:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		openbios
 Version:	1.0
-Release:	0.5.svn463%{?dist}
+Release:	0.6.svn463%{?dist}
 Summary:	OpenBios implementation of IEEE 1275-1994
 Group:		Applications/Emulators
 License:	GPLv2
@@ -10,6 +10,7 @@
 # tar czvf openbios-1.0.tar.gz openbios-1.0
 Source0:	%{name}/%{name}-%{version}.tar.gz
 Patch0:		openbios-noerror.patch
+Patch1:		openbios-ppc-nographic.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxslt
 
@@ -91,6 +92,8 @@
 
 %setup -q
 %patch0 -p1
+# -p3, so we don't need to even touch upstream patch
+%patch1 -p3
 
 %build
 
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.6
+- Applied bugfix for #494075
+
 * Wed Mar 04 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.5
 - created openbios-common instead of openbios-doc. It owns the directories
   and everybody depends on it.



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:11 +0000
Subject: [pkgdb] mingw32-gettext: epienbro has requested watchcommits
Message-ID: <20090414172511.58B8510F85A@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:12 +0000
Subject: [pkgdb] mingw32-gettext: epienbro has requested commit
Message-ID: <20090414172512.76E1410F87F@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:15 +0000
Subject: [pkgdb] mingw32-gettext: epienbro has requested watchbugzilla
Message-ID: <20090414172515.7814710F885@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:31 +0000
Subject: [pkgdb] mingw32-cairo: epienbro has requested commit
Message-ID: <20090414172531.C2A1A10F88B@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:33 +0000
Subject: [pkgdb] mingw32-cairo: epienbro has requested watchbugzilla
Message-ID: <20090414172533.9E04310F892@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:33 +0000
Subject: [pkgdb] mingw32-cairo: epienbro has requested watchcommits
Message-ID: <20090414172533.AE45110F895@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:44 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested commit
Message-ID: <20090414172544.6A4FF10F897@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:45 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested watchbugzilla
Message-ID: <20090414172545.EA44D10F89C@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Tue Apr 14 17:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:25:50 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested watchcommits
Message-ID: <20090414172550.41CE310F89D@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Tue Apr 14 17:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:26:03 +0000
Subject: [pkgdb] mingw32-pixman: epienbro has requested commit
Message-ID: <20090414172603.219CA10F89F@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Tue Apr 14 17:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:26:04 +0000
Subject: [pkgdb] mingw32-pixman: epienbro has requested watchcommits
Message-ID: <20090414172605.066E810F8A3@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Tue Apr 14 17:26:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:26:07 +0000
Subject: [pkgdb] mingw32-pixman: epienbro has requested watchbugzilla
Message-ID: <20090414172607.4D9AD10F8A8@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Tue Apr 14 17:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:26:15 +0000
Subject: [pkgdb] mingw32-openssl: epienbro has requested commit
Message-ID: <20090414172615.43D5E10F8AB@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-openssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Tue Apr 14 17:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:26:16 +0000
Subject: [pkgdb] mingw32-openssl: epienbro has requested watchcommits
Message-ID: <20090414172616.D229A10F8B0@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-openssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From ricky at fedoraproject.org  Tue Apr 14 17:26:21 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:26:21 +0000 (UTC)
Subject: rpms/python-tempita/F-10 python-tempita.spec,1.4,1.5
Message-ID: <20090414172621.85EBF700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17685/F-10

Modified Files:
	python-tempita.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.




Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-10/python-tempita.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tempita.spec	6 Dec 2008 17:59:35 -0000	1.4
+++ python-tempita.spec	14 Apr 2009 17:25:50 -0000	1.5
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
@@ -13,12 +13,7 @@
 Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 BuildRequires:  python-nose
 
 %description
@@ -54,6 +49,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-2
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.3-1
 - Upstream released a new version.
 



From ricky at fedoraproject.org  Tue Apr 14 17:26:22 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:26:22 +0000 (UTC)
Subject: rpms/python-tempita/F-9 python-tempita.spec,1.3,1.4
Message-ID: <20090414172622.2E9AA700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17685/F-9

Modified Files:
	python-tempita.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.




Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-9/python-tempita.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-tempita.spec	6 Dec 2008 18:01:35 -0000	1.3
+++ python-tempita.spec	14 Apr 2009 17:25:51 -0000	1.4
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
@@ -13,12 +13,7 @@
 Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 BuildRequires:  python-nose
 
 %description
@@ -54,6 +49,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-2
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.3-1
 - Upstream released a new version.
 



From ricky at fedoraproject.org  Tue Apr 14 17:26:22 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:26:22 +0000 (UTC)
Subject: rpms/python-tempita/devel python-tempita.spec,1.6,1.7
Message-ID: <20090414172622.B7359700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17685/devel

Modified Files:
	python-tempita.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.




Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/devel/python-tempita.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-tempita.spec	26 Feb 2009 23:39:23 -0000	1.6
+++ python-tempita.spec	14 Apr 2009 17:25:52 -0000	1.7
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
@@ -13,12 +13,7 @@
 Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 BuildRequires:  python-nose
 
 %description
@@ -54,6 +49,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-3
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Apr 14 17:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 17:26:19 +0000
Subject: [pkgdb] mingw32-openssl: epienbro has requested watchbugzilla
Message-ID: <20090414172619.7337110F8B2@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-openssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From mclasen at fedoraproject.org  Tue Apr 14 17:28:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 17:28:18 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.19, 1.20 brasero.spec, 1.43,
	1.44 sources, 1.19, 1.20
Message-ID: <20090414172818.ACEE2700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18056

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Mar 2009 23:58:21 -0000	1.19
+++ .cvsignore	14 Apr 2009 17:27:47 -0000	1.20
@@ -1 +1 @@
-brasero-2.26.0.tar.bz2
+brasero-2.26.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- brasero.spec	14 Apr 2009 06:59:15 -0000	1.43
+++ brasero.spec	14 Apr 2009 17:27:48 -0000	1.44
@@ -1,7 +1,7 @@
 
 Name:      brasero
-Version:   2.26.0
-Release:   2%{?dist}
+Version:   2.26.1
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -201,6 +201,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/brasero/2.26/brasero-2.26.1.news
+
 * Mon Apr 13 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-2
 - Removed duplicate desktop source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Mar 2009 23:58:21 -0000	1.19
+++ sources	14 Apr 2009 17:27:48 -0000	1.20
@@ -1 +1 @@
-ef968fe98874da4e26b61591ee57be4a  brasero-2.26.0.tar.bz2
+06bec1a0442b33de80151cc8253b7160  brasero-2.26.1.tar.bz2



From ricky at fedoraproject.org  Tue Apr 14 17:28:50 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:28:50 +0000 (UTC)
Subject: rpms/python-weberror/F-10 python-weberror.spec,1.1,1.2
Message-ID: <20090414172850.AC64F700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-weberror/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18595/F-10

Modified Files:
	python-weberror.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-weberror.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/F-10/python-weberror.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-weberror.spec	30 Jan 2009 14:00:54 -0000	1.1
+++ python-weberror.spec	14 Apr 2009 17:28:20 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-weberror
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web Error handling and exception catching middleware
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-webob
@@ -62,6 +61,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.10.1-2
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.10.1-1
 - Update to 0.10.1
 - Remove the wsgiref patch



From ricky at fedoraproject.org  Tue Apr 14 17:28:51 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:28:51 +0000 (UTC)
Subject: rpms/python-weberror/F-9 python-weberror.spec,1.1,1.2
Message-ID: <20090414172851.1393A700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-weberror/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18595/F-9

Modified Files:
	python-weberror.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-weberror.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/F-9/python-weberror.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-weberror.spec	30 Jan 2009 14:00:24 -0000	1.1
+++ python-weberror.spec	14 Apr 2009 17:28:20 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-weberror
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web Error handling and exception catching middleware
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-webob
@@ -62,6 +61,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.10.1-2
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.10.1-1
 - Update to 0.10.1
 - Remove the wsgiref patch



From ricky at fedoraproject.org  Tue Apr 14 17:28:51 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:28:51 +0000 (UTC)
Subject: rpms/python-weberror/devel python-weberror.spec,1.2,1.3
Message-ID: <20090414172851.69F44700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-weberror/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18595/devel

Modified Files:
	python-weberror.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-weberror.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/devel/python-weberror.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-weberror.spec	27 Feb 2009 00:10:11 -0000	1.2
+++ python-weberror.spec	14 Apr 2009 17:28:21 -0000	1.3
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-weberror
 Version:        0.10.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Web Error handling and exception catching middleware
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-webob
@@ -62,6 +61,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.10.1-3
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Apr 14 17:31:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 17:31:07 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.184,1.185
Message-ID: <20090414173107.2524B70137@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19688

Modified Files:
	comps-f11.xml.in 
Log Message:
add gtk2-devel-docs to gnome software development by default



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- comps-f11.xml.in	14 Apr 2009 16:54:25 -0000	1.184
+++ comps-f11.xml.in	14 Apr 2009 17:30:35 -0000	1.185
@@ -2293,6 +2293,7 @@
       <packagereq type="default">gnome-devel-docs</packagereq>
       <packagereq type="default">gnome-panel-devel</packagereq>
       <packagereq type="default">gnome-pilot-devel</packagereq>
+      <packagereq type="default">gtk2-docs-devel</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
       <packagereq type="default">hal-devel</packagereq>
       <packagereq type="default">libgtop2-devel</packagereq>



From ricky at fedoraproject.org  Tue Apr 14 17:32:56 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:32:56 +0000 (UTC)
Subject: rpms/python-webob/F-9 python-webob.spec,1.6,1.7
Message-ID: <20090414173256.C0AA170137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20225/F-9

Modified Files:
	python-webob.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-9/python-webob.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-webob.spec	10 Mar 2009 14:24:48 -0000	1.6
+++ python-webob.spec	14 Apr 2009 17:32:26 -0000	1.7
@@ -1,16 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webob
 Summary:        WSGI request and response object
 Version:        0.9.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
@@ -59,6 +58,10 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-2
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Tue Mar 10 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-1
 - Upstream released new version.
 



From ricky at fedoraproject.org  Tue Apr 14 17:32:56 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:32:56 +0000 (UTC)
Subject: rpms/python-webob/F-10 python-webob.spec,1.7,1.8
Message-ID: <20090414173256.8188070137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20225/F-10

Modified Files:
	python-webob.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/F-10/python-webob.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-webob.spec	10 Mar 2009 14:21:09 -0000	1.7
+++ python-webob.spec	14 Apr 2009 17:32:25 -0000	1.8
@@ -1,16 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webob
 Summary:        WSGI request and response object
 Version:        0.9.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
@@ -59,6 +58,10 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-2
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Tue Mar 10 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-1
 - Upstream released new version.
 



From ricky at fedoraproject.org  Tue Apr 14 17:32:57 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:32:57 +0000 (UTC)
Subject: rpms/python-webob/devel python-webob.spec,1.10,1.11
Message-ID: <20090414173257.3767470137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20225/devel

Modified Files:
	python-webob.spec 
Log Message:
Change define to global, remove unnecessary BuildRequires on python-devel.



Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/python-webob.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-webob.spec	10 Mar 2009 14:17:24 -0000	1.10
+++ python-webob.spec	14 Apr 2009 17:32:26 -0000	1.11
@@ -1,16 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webob
 Summary:        WSGI request and response object
 Version:        0.9.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://pythonpaste.org/webob/
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
@@ -59,6 +58,10 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-2
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Tue Mar 10 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-1
 - Upstream released new version.
 



From kwizart at fedoraproject.org  Tue Apr 14 17:34:01 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 14 Apr 2009 17:34:01 +0000 (UTC)
Subject: rpms/iwl4965-firmware/devel iwl4965-firmware.spec,1.7,1.8
Message-ID: <20090414173401.70A10700B2@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/iwl4965-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21180

Modified Files:
	iwl4965-firmware.spec 
Log Message:
- Reintroduce dist tag



Index: iwl4965-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/iwl4965-firmware.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iwl4965-firmware.spec	14 Apr 2009 16:55:54 -0000	1.7
+++ iwl4965-firmware.spec	14 Apr 2009 17:33:30 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           iwl4965-firmware
 Version:        %{iwl4965_v2}
-Release:        4
+Release:        5%{?dist}
 Summary:        Firmware for Intel?? PRO/Wireless 4965 A/G/N network adaptors
 
 Group:          System Environment/Kernel
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 kwizart < kwizart at gmail.com > - 228.57.2.23-5
+- Reintroduce dist tag
+
 * Tue Apr 14 2009 John W. Linville <linville at redhat.com> - 228.57.2.23-4
 - Resync with F-10 version of the package
 - Update v2 to 228.57.2.23 - Should fix #457154



From ricky at fedoraproject.org  Tue Apr 14 17:36:44 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:36:44 +0000 (UTC)
Subject: rpms/python-webtest/F-10 python-webtest.spec,1.2,1.3
Message-ID: <20090414173644.AF0DF700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webtest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22356/F-10

Modified Files:
	python-webtest.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: python-webtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webtest/F-10/python-webtest.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-webtest.spec	6 Dec 2008 18:06:46 -0000	1.2
+++ python-webtest.spec	14 Apr 2009 17:36:13 -0000	1.3
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webtest
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Helper to test WSGI applications
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 BuildRequires:  python-nose
 BuildRequires:  python-webob
 Requires:       python-webob
@@ -58,6 +53,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.1-2
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.1-1
 - Upstream released new version.
 



From ricky at fedoraproject.org  Tue Apr 14 17:36:45 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:36:45 +0000 (UTC)
Subject: rpms/python-webtest/F-9 python-webtest.spec,1.2,1.3
Message-ID: <20090414173645.C80E5700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webtest/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22356/F-9

Modified Files:
	python-webtest.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: python-webtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webtest/F-9/python-webtest.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-webtest.spec	6 Dec 2008 18:38:21 -0000	1.2
+++ python-webtest.spec	14 Apr 2009 17:36:14 -0000	1.3
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webtest
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Helper to test WSGI applications
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 BuildRequires:  python-nose
 BuildRequires:  python-webob
 Requires:       python-webob
@@ -58,6 +53,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.1-2
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.1-1
 - Upstream released new version.
 



From ricky at fedoraproject.org  Tue Apr 14 17:36:46 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:36:46 +0000 (UTC)
Subject: rpms/python-webtest/devel python-webtest.spec,1.4,1.5
Message-ID: <20090414173646.602AC700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-webtest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22356/devel

Modified Files:
	python-webtest.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: python-webtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webtest/devel/python-webtest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-webtest.spec	27 Feb 2009 00:12:50 -0000	1.4
+++ python-webtest.spec	14 Apr 2009 17:36:15 -0000	1.5
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webtest
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Helper to test WSGI applications
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 BuildRequires:  python-nose
 BuildRequires:  python-webob
 Requires:       python-webob
@@ -58,6 +53,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.1-3
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ricky at fedoraproject.org  Tue Apr 14 17:39:24 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:39:24 +0000 (UTC)
Subject: rpms/python-wsgiproxy/F-10 python-wsgiproxy.spec,1.1,1.2
Message-ID: <20090414173924.3946B700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-wsgiproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23643/F-10

Modified Files:
	python-wsgiproxy.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: python-wsgiproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-wsgiproxy/F-10/python-wsgiproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-wsgiproxy.spec	18 Jun 2008 03:10:21 -0000	1.1
+++ python-wsgiproxy.spec	14 Apr 2009 17:38:53 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-wsgiproxy
 Version:        0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTTP proxying tools for WSGI apps
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 Requires:       python-paste
 Requires:       python-paste-deploy
 
@@ -51,5 +46,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.1-2
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.1-1
 - Initial RPM Package.



From ricky at fedoraproject.org  Tue Apr 14 17:39:24 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:39:24 +0000 (UTC)
Subject: rpms/python-wsgiproxy/F-9 python-wsgiproxy.spec,1.1,1.2
Message-ID: <20090414173924.70CA570137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-wsgiproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23643/F-9

Modified Files:
	python-wsgiproxy.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: python-wsgiproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-wsgiproxy/F-9/python-wsgiproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-wsgiproxy.spec	18 Jun 2008 03:14:36 -0000	1.1
+++ python-wsgiproxy.spec	14 Apr 2009 17:38:54 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-wsgiproxy
 Version:        0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTTP proxying tools for WSGI apps
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 Requires:       python-paste
 Requires:       python-paste-deploy
 
@@ -51,5 +46,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.1-2
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.1-1
 - Initial RPM Package.



From ricky at fedoraproject.org  Tue Apr 14 17:39:25 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Tue, 14 Apr 2009 17:39:25 +0000 (UTC)
Subject: rpms/python-wsgiproxy/devel python-wsgiproxy.spec,1.3,1.4
Message-ID: <20090414173925.0B816700B2@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-wsgiproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23643/devel

Modified Files:
	python-wsgiproxy.spec 
Log Message:
Change define to global, remove old >= 8 conditional, remove unnecessary BuildRequires on python-devel.



Index: python-wsgiproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-wsgiproxy/devel/python-wsgiproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-wsgiproxy.spec	27 Feb 2009 00:16:21 -0000	1.3
+++ python-wsgiproxy.spec	14 Apr 2009 17:38:54 -0000	1.4
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-wsgiproxy
 Version:        0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HTTP proxying tools for WSGI apps
 
 Group:          Development/Languages
@@ -12,12 +12,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
 Requires:       python-paste
 Requires:       python-paste-deploy
 
@@ -51,6 +46,11 @@
 
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.1-4
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jakub at fedoraproject.org  Tue Apr 14 17:55:05 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 14 Apr 2009 17:55:05 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-pr39763.patch, NONE, 1.1 gcc.spec, 1.40,
	1.41 gcc44-power7.patch, 1.3, 1.4
Message-ID: <20090414175505.36D1F700B2@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28897

Modified Files:
	gcc.spec gcc44-power7.patch 
Added Files:
	gcc44-pr39763.patch 
Log Message:
4.4.0-0.34

gcc44-pr39763.patch:

--- NEW FILE gcc44-pr39763.patch ---
2009-04-14  Jason Merrill  <jason at redhat.com>

	PR c++/39763
	* name-lookup.c (pushdecl_maybe_friend): Avoid all warnings
	about shadowing by tentative parms.

	* g++.dg/warn/Wshadow-4.C: Extend.

--- gcc/cp/name-lookup.c	(revision 146053)
+++ gcc/cp/name-lookup.c	(revision 146054)
@@ -1002,13 +1002,18 @@ pushdecl_maybe_friend (tree x, bool is_f
 	      && TREE_PUBLIC (x))
 	    TREE_PUBLIC (name) = 1;
 
+	  /* Don't complain about the parms we push and then pop
+	     while tentatively parsing a function declarator.  */
+	  if (TREE_CODE (x) == PARM_DECL && DECL_CONTEXT (x) == NULL_TREE)
+	    /* Ignore.  */;
+
 	  /* Warn if shadowing an argument at the top level of the body.  */
-	  if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x)
-	      /* Inline decls shadow nothing.  */
-	      && !DECL_FROM_INLINE (x)
-	      && TREE_CODE (oldlocal) == PARM_DECL
-	      /* Don't check the `this' parameter.  */
-	      && !DECL_ARTIFICIAL (oldlocal))
+	  else if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x)
+		   /* Inline decls shadow nothing.  */
+		   && !DECL_FROM_INLINE (x)
+		   && TREE_CODE (oldlocal) == PARM_DECL
+		   /* Don't check the `this' parameter.  */
+		   && !DECL_ARTIFICIAL (oldlocal))
 	    {
 	      bool err = false;
 
@@ -1032,10 +1037,7 @@ pushdecl_maybe_friend (tree x, bool is_f
 		    }
 		}
 
-	      if (warn_shadow && !err
-		  /* Don't complain about the parms we push and then pop
-		     while tentatively parsing a function declarator.  */
-		  && !(TREE_CODE (x) == PARM_DECL && DECL_CONTEXT (x) == NULL_TREE))
+	      if (warn_shadow && !err)
 		{
 		  warning (OPT_Wshadow, "declaration of %q#D shadows a parameter", x);
 		  warning (OPT_Wshadow, "%Jshadowed declaration is here", oldlocal);
--- gcc/testsuite/g++.dg/warn/Wshadow-4.C	(revision 146053)
+++ gcc/testsuite/g++.dg/warn/Wshadow-4.C	(revision 146054)
@@ -18,3 +18,15 @@ int foo(int infoo)		// { dg-warning "sha
   };
   return outfoo;
 }
+
+// PR c++/39763
+int foo2(void)
+{
+    int infoo = 0;		// { dg-warning "shadowed declaration" }
+    int outfoo( INetURLObject( infoo ).GetMainURL()); // { dg-bogus "shadows" }
+    struct A
+    {
+      void f(int infoo) { }	// { dg-warning "shadows a previous local" }
+    };
+    return outfoo;
+}
 2009-04-13  Jason Merrill  <jason at redhat.com>
 
 	PR c++/39480


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gcc.spec	14 Apr 2009 15:46:15 -0000	1.40
+++ gcc.spec	14 Apr 2009 17:54:33 -0000	1.41
@@ -150,6 +150,7 @@
 Patch26: gcc44-power7.patch
 Patch28: gcc44-pr38757.patch
 Patch30: gcc44-pr39543.patch
+Patch31: gcc44-pr39763.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -438,6 +439,7 @@
 %patch26 -p0 -b .power7~
 %patch28 -p0 -b .pr38757~
 #%patch30 -p0 -b .pr39543~
+%patch31 -p0 -b .pr39763~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1755,6 +1757,7 @@
     lib* files
   - PRs c++/28301, c++/39480, c++/39742, c++/39750, c/39613, c/39614, c/39673,
 	libobjc/36610, target/39740, testsuite/35621, tree-optimization/39713
+- fix another -Wshadow C++ issue (PR c++/39763)
 
 * Thu Apr  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.32
 - update from gcc-4_4-branch

gcc44-power7.patch:

Index: gcc44-power7.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-power7.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc44-power7.patch	14 Apr 2009 15:46:16 -0000	1.3
+++ gcc44-power7.patch	14 Apr 2009 17:54:33 -0000	1.4
@@ -8447,14 +8447,6 @@
 +  [(set_attr "type" "vecperm")])
 --- gcc/config/rs6000/rs6000.h	(.../trunk)	(revision 145777)
 +++ gcc/config/rs6000/rs6000.h	(.../branches/ibm/power7-meissner)	(revision 146027)
-@@ -1,6 +1,6 @@
- /* Definitions of target machine for GNU compiler, for IBM RS/6000.
-    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
-    Contributed by Richard Kenner (kenner at vlsi1.ultra.nyu.edu)
- 
 @@ -72,14 +72,16 @@
  #define ASM_CPU_POWER6_SPEC "-mpower4 -maltivec"
  #endif



From robert at fedoraproject.org  Tue Apr 14 17:56:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 17:56:50 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.35, 1.36 phpMyAdmin.spec, 1.39,
	1.40 sources, 1.35, 1.36
Message-ID: <20090414175650.E1F1E700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29340/F-9

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.3.2 (#495768)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	25 Mar 2009 09:00:48 -0000	1.35
+++ .cvsignore	14 Apr 2009 17:56:20 -0000	1.36
@@ -1 +1 @@
-phpMyAdmin-3.1.3.1-all-languages.tar.bz2
+phpMyAdmin-3.1.3.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- phpMyAdmin.spec	25 Mar 2009 09:00:48 -0000	1.39
+++ phpMyAdmin.spec	14 Apr 2009 17:56:20 -0000	1.40
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.1
+Version: 3.1.3.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
+- Upstream released 3.1.3.2 (#495768)
+
 * Wed Mar 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.1-1
 - Upstream released 3.1.3.1 (#492066)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Mar 2009 09:00:48 -0000	1.35
+++ sources	14 Apr 2009 17:56:20 -0000	1.36
@@ -1 +1 @@
-34fe1a16cb77bb3bc1e3e4288b5bbd43  phpMyAdmin-3.1.3.1-all-languages.tar.bz2
+8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Apr 14 17:56:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 17:56:50 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.35, 1.36 phpMyAdmin.spec, 1.39, 
	1.40 sources, 1.35, 1.36
Message-ID: <20090414175650.A1BF8700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29340/F-10

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.3.2 (#495768)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	25 Mar 2009 09:00:48 -0000	1.35
+++ .cvsignore	14 Apr 2009 17:56:19 -0000	1.36
@@ -1 +1 @@
-phpMyAdmin-3.1.3.1-all-languages.tar.bz2
+phpMyAdmin-3.1.3.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- phpMyAdmin.spec	25 Mar 2009 09:00:48 -0000	1.39
+++ phpMyAdmin.spec	14 Apr 2009 17:56:20 -0000	1.40
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.1
+Version: 3.1.3.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
+- Upstream released 3.1.3.2 (#495768)
+
 * Wed Mar 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.1-1
 - Upstream released 3.1.3.1 (#492066)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Mar 2009 09:00:48 -0000	1.35
+++ sources	14 Apr 2009 17:56:20 -0000	1.36
@@ -1 +1 @@
-34fe1a16cb77bb3bc1e3e4288b5bbd43  phpMyAdmin-3.1.3.1-all-languages.tar.bz2
+8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Apr 14 17:56:51 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 14 Apr 2009 17:56:51 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.35, 1.36 phpMyAdmin.spec, 1.40, 
	1.41 sources, 1.35, 1.36
Message-ID: <20090414175651.61F5E700B2@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29340/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.3.2 (#495768)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	25 Mar 2009 09:00:49 -0000	1.35
+++ .cvsignore	14 Apr 2009 17:56:20 -0000	1.36
@@ -1 +1 @@
-phpMyAdmin-3.1.3.1-all-languages.tar.bz2
+phpMyAdmin-3.1.3.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- phpMyAdmin.spec	25 Mar 2009 09:00:49 -0000	1.40
+++ phpMyAdmin.spec	14 Apr 2009 17:56:21 -0000	1.41
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.1
+Version: 3.1.3.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
+- Upstream released 3.1.3.2 (#495768)
+
 * Wed Mar 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.1-1
 - Upstream released 3.1.3.1 (#492066)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Mar 2009 09:00:49 -0000	1.35
+++ sources	14 Apr 2009 17:56:21 -0000	1.36
@@ -1 +1 @@
-34fe1a16cb77bb3bc1e3e4288b5bbd43  phpMyAdmin-3.1.3.1-all-languages.tar.bz2
+8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2



From katzj at fedoraproject.org  Tue Apr 14 18:01:50 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 14 Apr 2009 18:01:50 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.19, 1.20 livecd-tools.spec,
	1.23, 1.24 sources, 1.19, 1.20
Message-ID: <20090414180150.8B71A700B2@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30920

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
* Tue Apr 14 2009 Jeremy Katz <katzj at redhat.com> - 023-1
- Don't prompt about overwriting when making usb stick (#491234)
- Fix up livecd-iso-to-pxeboot for new syslinux paths
- Fix --xo variable expansion (Alexander Bostr??m)
- Name of EFI partitions doesn't matter for mactel mode (Jim Radford)
- Fix unterminated sed command (#492376)
- Handle kernel/squashfs mismatch when making usb stick in
  --xo mode (Alexander Bostr??m)
- Support all of the options for the 'firewall' kickstart directive
- Deal with syslinux com32 api incompat when making usb sticks (#492370)
- Add options to force fetching of repomd.xml every run (jkeating)
- Quiet restorecon (Marc Herbert)
- Fix traceback with syslinux disabled (#495269)
- Split python-imgcreate module into a subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	9 Mar 2009 15:04:56 -0000	1.19
+++ .cvsignore	14 Apr 2009 18:01:19 -0000	1.20
@@ -1 +1 @@
-livecd-tools-022.tar.bz2
+livecd-tools-023.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- livecd-tools.spec	9 Mar 2009 15:04:56 -0000	1.23
+++ livecd-tools.spec	14 Apr 2009 18:01:20 -0000	1.24
@@ -4,26 +4,16 @@
 
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 022
+Version: 023
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: util-linux
-Requires: coreutils
-Requires: e2fsprogs
-Requires: yum >= 3.2.18
+Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
-Requires: squashfs-tools
-Requires: pykickstart >= 0.96
-Requires: dosfstools >= 2.11-8
 Requires: isomd5sum
-Requires: rhpl
-Requires: python-urlgrabber
-Requires: libselinux-python
-Requires: dbus-python
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -39,6 +29,26 @@
 derived distributions such as RHEL, CentOS and others. See
 http://fedoraproject.org/wiki/FedoraLiveCD for more details.
 
+%package -n python-imgcreate
+Summary: Python modules for building system images
+Group: System Environment/Base
+Requires: util-linux
+Requires: coreutils
+Requires: e2fsprogs
+Requires: yum >= 3.2.18
+Requires: squashfs-tools
+Requires: pykickstart >= 0.96
+Requires: dosfstools >= 2.11-8
+Requires: rhpl
+Requires: python-urlgrabber
+Requires: libselinux-python
+Requires: dbus-python
+
+%description -n python-imgcreate
+Python modules that can be used for building images for things
+like live image or appliances.
+
+
 %prep
 %setup -q
 
@@ -54,19 +64,38 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README HACKING API
+%doc AUTHORS COPYING README HACKING
 %doc config/livecd-fedora-minimal.ks
 %{_mandir}/man*/*
 %{_bindir}/livecd-creator
 %{_bindir}/livecd-iso-to-disk
 %{_bindir}/livecd-iso-to-pxeboot
 %{_bindir}/image-creator
+
+%files -n python-imgcreate
+%defattr(-,root,root,-)
+%doc API
 %dir %{python_sitelib}/imgcreate
 %{python_sitelib}/imgcreate/*.py
 %{python_sitelib}/imgcreate/*.pyo
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Tue Apr 14 2009 Jeremy Katz <katzj at redhat.com> - 023-1
+- Don't prompt about overwriting when making usb stick (#491234)
+- Fix up livecd-iso-to-pxeboot for new syslinux paths
+- Fix --xo variable expansion (Alexander Bostr??m)
+- Name of EFI partitions doesn't matter for mactel mode (Jim Radford)
+- Fix unterminated sed command (#492376)
+- Handle kernel/squashfs mismatch when making usb stick in
+  --xo mode (Alexander Bostr??m)
+- Support all of the options for the 'firewall' kickstart directive
+- Deal with syslinux com32 api incompat when making usb sticks (#492370)
+- Add options to force fetching of repomd.xml every run (jkeating)
+- Quiet restorecon (Marc Herbert)
+- Fix traceback with syslinux disabled (#495269)
+- Split python-imgcreate module into a subpackage
+
 * Mon Mar  9 2009 Jeremy Katz <katzj at redhat.com> - 022-1
 - Fixes for hybird GPT/MBR usb sticks (Stewart Adam)
 - Support setting SELinux booleans (Dan Walsh)
@@ -116,7 +145,7 @@
 - Fix up boot from SD
 - Fix extracting boot parameters for pxe (apevec)
 - Make rpm macro information persist into the image (bkearney)
-- Support %packages --instLangs (bkearney)
+- Support %%packages --instLangs (bkearney)
 
 * Thu Aug 28 2008 Jeremy Katz <katzj at redhat.com> - 018-1
 - Use logging API for debugging messages (dhuff)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	9 Mar 2009 15:04:56 -0000	1.19
+++ sources	14 Apr 2009 18:01:20 -0000	1.20
@@ -1 +1 @@
-6a4dca80700cb74f902ac07de6d25356  livecd-tools-022.tar.bz2
+27cc1df7be92b47c02e4537666ca6dc4  livecd-tools-023.tar.bz2



From sereinit at fedoraproject.org  Tue Apr 14 18:27:10 2009
From: sereinit at fedoraproject.org (=?utf-8?q?Marcelin_Beno=C3=AEt?=)
Date: Tue, 14 Apr 2009 18:27:10 +0000 (UTC)
Subject: rpms/gbrainy/devel gbrainy.spec,1.13,1.14
Message-ID: <20090414182710.503F9700B2@cvs1.fedora.phx.redhat.com>

Author: sereinit

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5425

Modified Files:
	gbrainy.spec 
Log Message:
re-enable ppc


Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gbrainy.spec	9 Apr 2009 17:33:31 -0000	1.13
+++ gbrainy.spec	14 Apr 2009 18:26:37 -0000	1.14
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -18,7 +18,7 @@
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc
 
 %description
 gbrainy is a brain teaser game and trainer to have
@@ -83,6 +83,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Tue Apr 14 2009 Beno??t Marcelin <sereinity at online.fr> 1.1-3
+- Re-enable ppc
+
 * Thu Apr 09 2009 Beno??t Marcelin <sereinity at online.fr> 1.1-2
 - Fix buildrequires
 



From mclasen at fedoraproject.org  Tue Apr 14 18:27:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 18:27:50 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.25,
	1.26 gnome-settings-daemon.spec, 1.99, 1.100 sources, 1.26, 1.27
Message-ID: <20090414182750.D8ACB700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5542

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Mar 2009 18:28:35 -0000	1.25
+++ .cvsignore	14 Apr 2009 18:27:49 -0000	1.26
@@ -1 +1 @@
-gnome-settings-daemon-2.26.0.tar.bz2
+gnome-settings-daemon-2.26.1.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gnome-settings-daemon.spec	9 Apr 2009 01:38:46 -0000	1.99
+++ gnome-settings-daemon.spec	14 Apr 2009 18:27:49 -0000	1.100
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.26.0
-Release:	2%{?dist}
+Version:	2.26.1
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -170,6 +170,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-2
 - Support touchpads
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Mar 2009 18:28:35 -0000	1.26
+++ sources	14 Apr 2009 18:27:49 -0000	1.27
@@ -1 +1 @@
-c3a2934deccfcf13de15507d4be802d3  gnome-settings-daemon-2.26.0.tar.bz2
+7be383de54c0707c64843ae51563c43a  gnome-settings-daemon-2.26.1.tar.bz2



From avesh at fedoraproject.org  Tue Apr 14 18:42:31 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 14 Apr 2009 18:42:31 +0000 (UTC)
Subject: rpms/openswan/devel openswan.spec,1.75,1.76
Message-ID: <20090414184232.1B5B9700B2@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10238

Modified Files:
	openswan.spec 
Log Message:
* Mon Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
- Updated the Openswan-NSS porting to enable nss by default
- The patch includes README.nss for information about NSS usage



Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- openswan.spec	14 Apr 2009 17:22:17 -0000	1.75
+++ openswan.spec	14 Apr 2009 18:42:00 -0000	1.76
@@ -20,7 +20,7 @@
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gmp-devel bison flex man xmlto bind-devel
+BuildRequires: gmp-devel bison flex man xmlto bind-devel nss-devel
 Requires(post): coreutils bash
 Requires(preun): initscripts chkconfig
 Requires(post): /sbin/chkconfig



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:24 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090414184924.9E36C10F85A@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-openssl (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:27 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090414184927.6143510F87F@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-openssl (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:27 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090414184927.762C510F885@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-openssl (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:35 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090414184935.41F0610F893@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libxml2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:36 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090414184937.1EC7D10F896@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libxml2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:37 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090414184937.B066C10F89B@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-libxml2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:41 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090414184942.0233E10F8A1@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pixman (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:42 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090414184943.6ECA210F8A6@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pixman (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:43 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090414184943.C8D5F10F8AB@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-pixman (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:55 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090414184955.CC2E810F87C@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-cairo (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:56 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090414184956.57D7310F8B4@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-cairo (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Tue Apr 14 18:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:49:58 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090414184958.C164F10F8B9@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-cairo (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Tue Apr 14 18:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:50:03 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090414185004.192AC10F888@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gettext (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Tue Apr 14 18:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:50:04 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090414185004.9A77B10F8BD@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gettext (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Tue Apr 14 18:50:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:50:05 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090414185005.3BE0D10F8C0@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gettext (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Tue Apr 14 18:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:58:55 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414185855.8DDC110F87B@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora 7 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 18:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:58:52 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414185852.DAE6010F851@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 18:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:58:56 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414185856.D437810F87D@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora 8 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 18:58:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:58:59 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414185900.1970B10F882@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora 10 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 18:58:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 18:58:58 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414185858.36FF310F87F@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora 9 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 19:21:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 19:21:47 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414192148.0AC8E10F851@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora devel is now owned by clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 19:22:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 19:22:05 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414192205.C3C7810F85A@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora 9 is now owned by clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Tue Apr 14 19:22:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 19:22:11 +0000
Subject: [pkgdb] rhpl ownership updated
Message-ID: <20090414192211.A7D5C10F87C@bastion2.fedora.phx.redhat.com>

Package rhpl in Fedora 10 is now owned by clumens

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From steved at fedoraproject.org  Tue Apr 14 19:24:07 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 14 Apr 2009 19:24:07 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-pnfs-30-rc1.patch, NONE,
	1.1.2.1 config-generic, 1.280, 1.280.2.1 kernel.spec, 1.1517,
	1.1517.2.1
Message-ID: <20090414192407.A6BF3700B2@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23358

Modified Files:
      Tag: kernel-2_6_30-pnfs_041409
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_30-pnfs_041409
	linux-2.6-pnfs-30-rc1.patch 
Log Message:
Update to the latest pNFS code.


linux-2.6-pnfs-30-rc1.patch:

--- NEW FILE linux-2.6-pnfs-30-rc1.patch ---
diff -up linux-2.6.29.noarch/Documentation/filesystems/00-INDEX.orig linux-2.6.29.noarch/Documentation/filesystems/00-INDEX
--- linux-2.6.29.noarch/Documentation/filesystems/00-INDEX.orig	2009-04-14 14:35:13.638010000 -0400
+++ linux-2.6.29.noarch/Documentation/filesystems/00-INDEX	2009-04-14 14:39:16.021791000 -0400
@@ -66,6 +66,10 @@ mandatory-locking.txt
 	- info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
 	- info on Novell Netware(tm) filesystem using NCP protocol.
+nfs41-server.txt
+	- info on the Linux server implementation of NFSv4 minor version 1.
+nfs-rdma.txt
+	- how to install and setup the Linux NFS/RDMA client and server software.
 nfsroot.txt
 	- short guide on setting up a diskless box with NFS root filesystem.
 nilfs2.txt
diff -up /dev/null linux-2.6.29.noarch/Documentation/spnfs.txt
--- /dev/null	2009-03-31 07:03:53.540001347 -0400
+++ linux-2.6.29.noarch/Documentation/spnfs.txt	2009-04-14 14:39:16.028788000 -0400
@@ -0,0 +1,210 @@
+(c) 2007 Network Appliance Inc.
+
+spNFS
+-----
+
+An spNFS system consists of a Meta Data Server (MDS), a number of Client machines (C) and a number of Data Servers (DS).
+
+A file system is mounted by the clients from the MDS, and all file data
+is striped across the DSs.
+
+Identify the machines that will be filling each of these roles.
+
+The spnfs kernel will be installed on all machines: clients, the MDS and DSs.
+
+
+Building and installing the spNFS kernel
+----------------------------------------
+
+Get the spNFS kernel from:
+
+	git://linux-nfs.org/~dmuntz/spnfs.git
+
+add these options to your .config file
+
+	CONFIG_NETWORK_FILESYSTEMS=y
+	CONFIG_NFS_FS=y
+	CONFIG_NFSD=y
+	CONFIG_NFS_V4_1=y
+	CONFIG_NFSD_V4_1=y
+	CONFIG_PNFS=y
+	CONFIG_PNFSD=y
+	CONFIG_SPNFS=y
+
+By default, spNFS uses whole-file layouts.  Layout segments can be enabled
+by adding:
+
+	CONFIG_SPNFS_LAYOUTSEGMENTS=y
+
+to your .config file.
+
+Building and installation of kernel+modules is as usual.
+This kernel should be installed and booted on the client, MDS and DSs.
+
+
+Building nfs-utils
+------------------
+
+Get the nfs-utils package containing spnfsd from:
+
+	git://linux-nfs.org/~dmuntz/nfs-utils.git
+
+Follow the standard instructions for building nfs-utils.  We HIGHLY recommend
+NOT doing an install of the binaries generated by this build.  You will only
+need the spnfsd binary generated by this build, and the spnfsd.conf template.
+
+After building, the spnfsd daemon will be located in utils/spnfsd.  The spnfsd
+daemon will only be needed on the MDS.
+
+
+Installation
+------------
+
+The nfs-utils package contains a default spnfsd.conf file in
+utils/spnfsd/spnfsd.conf.  Copy this file to /etc/spnfsd.conf.
+
+By default, the DS-Mount-Directory is set to /spnfs (see spnfsd.conf).  Under
+this directory, mount points must be created for each DS to
+be used for pNFS data stripes.  These mount points are named by the ip address
+of the corresponding DS.  In the sample spnfsd.conf, there are two
+DSs defined (172.16.28.134 and 172.16.28.141).
+
+Following the sample spnfsd.conf,
+
+	mkdir /spnfs
+
+on the MDS (corresponding to DS-Mount-Directory).  Then
+
+	mkdir /spnfs/172.16.28.134
+	mkdir /spnfs/172.16.28.141
+
+to create the mount points for the DSs.
+
+On the DSs, chose a directory where data stripes will be created by the MDS.
+For the sample file, this directory is /pnfs, so on each DS execute:
+
+	mkdir /pnfs
+
+This directory is specified in the spnfsd.conf file by the DS*_ROOT option
+(where * is replaced by the DS number).  DS_ROOT is specified relative to
+the directory being exported by the DSs.  In our example, our DSs are exporting
+the root directory (/) and therefore our DS_ROOT is /pnfs.  On the DSs, we have
+the following entry in /etc/exports:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+N.B. If we had created a /exports directory and a /pnfs directory under
+/exports, and if we were exporting /exports, then DS_ROOT would still be /pnfs
+(not /exports/pnfs).
+
+It may be useful to add entries to /etc/fstab on the MDS to automatically
+mount the DS_ROOT file systems.  For this example, our MDS fstab would
+contain:
+
+	172.17.84.128:/pnfs /spnfs/172.17.84.128 nfs    defaults        1 2
+	172.17.84.122:/pnfs /spnfs/172.17.84.122 nfs    defaults        1 2
+
+The DS mounts must be performed manually or via fstab at this time (automatic
+mounting, directory creation, etc. are on the todo list).  To perform I/O
+through the MDS, the DS mounts MUST use NFSv3 at this time (this restriction
+will eventually be removed).
+
+
+On the MDS, choose a file system to use with spNFS and export it, e.g.:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+Make sure nfsd and all supporting processes are running on the MDS and DSs.
+
+
+Running
+-------
+
+If rpc_pipefs is not already mounted (if you're running idmapd it probably is),
+you may want to add the following line to /etc/fstab:
+
+	rpc_pipefs    /var/lib/nfs/rpc_pipefs rpc_pipefs defaults     0 0
+
+to automatically mount rpc_pipefs.
+
+With spnfsd.conf configured for your environment and the mounts mounted as
+described above, spnfsd can now be started.
+
+On the MDS, execute spnfsd:
+
+	spnfsd
+
+The executable is located in the directory where it was built, and
+may also have been installed elsewhere depending on how you built nfs-utils.
+It will run in the foreground by default, and in fact will do so despite
+any options suggesting the contrary (it's still a debugging build).
+
+On the client, make sure the nfslayoutdriver module is loaded:
+
+	modprobe nfslayoutdriver
+
+Then mount the file system from the MDS:
+
+	mount -t nfs4 mds:/ /mnt
+
+I/O through the MDS is now supported.  To use it, do not load the
+nfslayoutdriver on the client, and mount the MDS using NFSv4 or 4.1
+(NFSv2 and v3 are not yet supported).
+
+You may now use spNFS by performing file system activities in /mnt.
+If you create files in /mnt, you should see stripe files corresponding to
+new files being created on the DSs.  The current implementation names the
+stripe files based on the inode number of the file on the MDS.  For example,
+if you create a file foo in /mnt and do an 'ls -li /mnt/foo':
+
+	# ls -li foo
+	1233 -rw-r--r-- 1 root root 0 Nov 29 15:54 foo
+
+You should see stripe files on each under /pnfs (per the sample) named
+1233.  The file /pnfs/1233 on DS1 will contain the first <stripe size> bytes
+of data written to foo, DS2 will contain the next <stripe size> bytes, etc.
+Removing /mnt/foo will remove the corresponding stripe files on the DSs.
+Other file system operations should behave (mostly :-) as expected.
+
+
+Layout Segments
+---------------
+
+If the kernel is compiled to support layout segments, there will
+be two files created under /proc/fs/spnfs for controlling layout
+segment functionality.
+
+To enable layout segments, write a '1' to /proc/fs/spnfs/layoutseg, e.g.:
+
+	echo 1 > /proc/fs/spnfs/layoutseg
+
+Layout segments can be disabled (returning to whole-file layouts) by
[...31884 lines suppressed...]
+	len = sock->ops->sendpage(sock, virt_to_page(xbufp->head[0].iov_base),
+			(unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK,
+			xbufp->head[0].iov_len, flags);
+
+	if (len != xbufp->head[0].iov_len)
+		goto out;
+
+	/*
+	 * send page data
+	 *
+	 * Check the amount of data to be sent. If it is less than the
+	 * remaining page, then send it else send the current page
+	 */
+
+	size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen;
+	while (pglen > 0) {
+		if (total_len == size)
+			flags = 0;
+		result = sock->ops->sendpage(sock, *pages, base, size, flags);
+		if (result > 0)
+			len += result;
+		if (result != size)
+			goto out;
+		total_len -= size;
+		pglen -= size;
+		size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen;
+		base = 0;
+		pages++;
+	}
+	/*
+	 * send tail
+	 */
+	if (xbufp->tail[0].iov_len) {
+		result = sock->ops->sendpage(sock,
+			xbufp->tail[0].iov_base,
+			(unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK,
+			xbufp->tail[0].iov_len,
+			0);
+
+		if (result > 0)
+			len += result;
+	}
+out:
+	if (len != xbufp->len)
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct rpc_xprt *bc_xprt = req->rq_xprt;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	svsk = bc_xprt->bc_sock;
+	xprt = &svsk->sk_xprt;
+
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	return 0;
+
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -1994,11 +2359,32 @@ static struct rpc_xprt_ops xs_tcp_ops = 
 	.buf_free		= rpc_free,
 	.send_request		= xs_tcp_send_request,
 	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+#if defined(CONFIG_NFS_V4_1)
+	.release_request	= bc_release_request,
+#endif /* CONFIG_NFS_V4_1 */
 	.close			= xs_tcp_shutdown,
 	.destroy		= xs_destroy,
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.set_port		= bc_set_port,
+	.connect		= bc_connect,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2131,13 +2517,29 @@ static struct rpc_xprt *xs_setup_tcp(str
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_sock) {
+		/* backchannel */
+		xprt_set_bound(xprt);
+		INIT_DELAYED_WORK(&transport->connect_worker,
+				  bc_connect_worker);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_sock = args->bc_sock;
+		xprt->bc_sock->sk_bc_xprt = xprt;
+		transport->sock = xprt->bc_sock->sk_sock;
+		transport->inet = xprt->bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		goto next;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2145,13 +2547,29 @@ static struct rpc_xprt *xs_setup_tcp(str
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
+		break;
+	}
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+next:
+	xprt->timeout = &xs_tcp_default_timeout;
+
+	switch (addr->sa_family) {
+	case AF_INET:
+		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		break;
+	case AF_INET6:
 		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
 		break;
 	default:


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.280
retrieving revision 1.280.2.1
diff -u -r1.280 -r1.280.2.1
--- config-generic	14 Apr 2009 15:12:28 -0000	1.280
+++ config-generic	14 Apr 2009 19:24:05 -0000	1.280.2.1
@@ -3156,6 +3156,22 @@
 # CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
+#
+# Needed for NFS41
+#
+CONFIG_NFS_V4_1=y
+CONFIG_PNFSD=y
+#
+# Needed for pNFS
+#
+CONFIG_PNFS=y
+CONFIG_SPNFS=y
+CONFIG_PNFSD_LOCAL_EXPORT=y
+CONFIG_PNFS_PANLAYOUT=y
+CONFIG_PNFS_BLOCK=y
+CONFIG_SPNFS_LAYOUTSEGMENTS=y
+#
+#
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1517
retrieving revision 1.1517.2.1
diff -u -r1.1517 -r1.1517.2.1
--- kernel.spec	14 Apr 2009 14:43:53 -0000	1.1517
+++ kernel.spec	14 Apr 2009 19:24:05 -0000	1.1517.2.1
@@ -12,7 +12,7 @@
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .pnfs_041409
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -86,7 +86,7 @@
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
@@ -679,6 +679,7 @@
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
 Patch9210: linux-2.6.29-pat-fixes.patch
 
+Patch9300: linux-2.6-pnfs-30-rc1.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1234,6 +1235,7 @@
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
 
+ApplyPatch linux-2.6-pnfs-30-rc1.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1827,6 +1829,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 14 2009 Steve Dickson <steved at redhat.com>
+- Update to the latest pNFS code.
+
 * Tue Apr 14 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.30-rc1-git7
 - CONFIG_TOUCHSCREEN_AD7879_I2C=m



From epienbro at fedoraproject.org  Tue Apr 14 19:26:00 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Tue, 14 Apr 2009 19:26:00 +0000 (UTC)
Subject: rpms/mingw32-cairo/devel mingw32-cairo.spec,1.5,1.6
Message-ID: <20090414192600.5E257700B2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23802

Modified Files:
	mingw32-cairo.spec 
Log Message:
- Fixed %defattr line
- Added -static subpackage
- Use ./configure --disable-pthread to avoid conflict with native pthread library



Index: mingw32-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/mingw32-cairo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-cairo.spec	10 Mar 2009 13:47:38 -0000	1.5
+++ mingw32-cairo.spec	14 Apr 2009 19:25:29 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           mingw32-cairo
 Version:        1.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -41,6 +41,15 @@
 MinGW Windows Cairo library.
 
 
+%package static
+Summary:        Static version of the MinGW Windows Cairo library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Cairo library.
+
+
 %prep
 %setup -q -n cairo-%{version}
 
@@ -51,7 +60,8 @@
   --disable-xcb \
   --enable-win32 \
   --enable-png \
-  --disable-static \
+  --enable-static \
+  --disable-pthread \
   --disable-ft
 make %{?_smp_mflags}
 
@@ -69,7 +79,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
 %{_mingw32_bindir}/libcairo-2.dll
 %{_mingw32_includedir}/cairo/
@@ -84,7 +94,17 @@
 %{_mingw32_libdir}/pkgconfig/cairo.pc
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcairo.a
+
+
 %changelog
+* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.6-2
+- Fixed %%defattr line
+- Added -static subpackage
+- Use ./configure --disable-pthread to avoid conflict with native pthread library
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.6-1
 - Rebase to 1.8.6, same as Fedora native version.
 - Source URL corrected.



From epienbro at fedoraproject.org  Tue Apr 14 19:27:17 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Tue, 14 Apr 2009 19:27:17 +0000 (UTC)
Subject: rpms/mingw32-gettext/devel mingw32-gettext.spec,1.4,1.5
Message-ID: <20090414192717.4D6C8700B2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24382

Modified Files:
	mingw32-gettext.spec 
Log Message:
Added -static subpackage



Index: mingw32-gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/devel/mingw32-gettext.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mingw32-gettext.spec	26 Feb 2009 01:07:19 -0000	1.4
+++ mingw32-gettext.spec	14 Apr 2009 19:26:46 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:      mingw32-gettext
 Version:   0.17
-Release:   10%{?dist}
+Release:   11%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -39,6 +39,15 @@
 MinGW Windows Gettext library
 
 
+%package static
+Summary:        Static version of the MinGW Windows Gettext library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Gettext library.
+
+
 %prep
 %setup -q -n gettext-%{version}
 
@@ -50,7 +59,7 @@
   --disable-java \
   --disable-native-java \
   --disable-csharp \
-  --disable-static \
+  --enable-static \
   --enable-threads=win32 \
   --without-emacs
 make %{?_smp_mflags}
@@ -123,8 +132,17 @@
 %{_mingw32_datadir}/info/autosprintf.info
 %{_mingw32_datadir}/info/gettext.info
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libasprintf.a
+%{_mingw32_libdir}/libgettextpo.a
+%{_mingw32_libdir}/libintl.a
+
 
 %changelog
+* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.17-11
+- Added -static subpackage
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From avesh at fedoraproject.org  Tue Apr 14 19:28:31 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 14 Apr 2009 19:28:31 +0000 (UTC)
Subject: rpms/openswan/devel openswan.spec,1.76,1.77
Message-ID: <20090414192831.4B0EB700B2@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24845

Modified Files:
	openswan.spec 
Log Message:
* Mon Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
- Updated the Openswan-NSS porting to enable nss by default
- The patch includes README.nss for information about NSS usage



Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- openswan.spec	14 Apr 2009 18:42:00 -0000	1.76
+++ openswan.spec	14 Apr 2009 19:28:00 -0000	1.77
@@ -1,4 +1,4 @@
-%define USE_FIPSCHECK 0
+%define USE_FIPSCHECK 1
 
 Summary: Openswan IPSEC implementation
 Name: openswan



From akurtakov at fedoraproject.org  Tue Apr 14 19:29:04 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 14 Apr 2009 19:29:04 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-addfragmentsforotherplatforms.patch, 1.7,
	1.8 eclipse.spec, 1.636, 1.637
Message-ID: <20090414192904.D77A0700B2@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25134/devel

Modified Files:
	eclipse-addfragmentsforotherplatforms.patch eclipse.spec 
Log Message:
Rediff patch30.

eclipse-addfragmentsforotherplatforms.patch:

Index: eclipse-addfragmentsforotherplatforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-addfragmentsforotherplatforms.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-addfragmentsforotherplatforms.patch	26 Feb 2009 16:25:24 -0000	1.7
+++ eclipse-addfragmentsforotherplatforms.patch	14 Apr 2009 19:28:34 -0000	1.8
@@ -1,22 +1,21 @@
-diff -up ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml
---- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments	2008-10-03 08:59:56.000000000 -0400
-+++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2008-10-03 09:02:46.000000000 -0400
-@@ -184,6 +184,7 @@
- 		<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.101.R34x_v20081128" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+--- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments	2009-04-14 21:14:09.000000000 +0200
++++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2009-04-14 21:22:53.000000000 +0200
+@@ -205,6 +205,7 @@
+ 		<customGather dir="plugins/org.eclipse.update.scheduler" projectName="org.eclipse.update.scheduler_3.2.200.v20081127" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ 		<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.200.v20090213" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
  		<customGather dir="plugins/org.eclipse.ui.workbench.compatibility" projectName="org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
- 		<customGather dir="plugins/org.eclipse.update.core.linux" projectName="org.eclipse.update.core.linux_3.2.1.R34x_v20081024" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
-+		<customGather dir="plugins/org.eclipse.core.filesystem.linux.s390x" projectName="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
- 		<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.4.2.M20090127-1700" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
- 		<customGather dir="plugins/org.eclipse.core.commands.source" projectName="org.eclipse.core.commands.source_3.4.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
- 		<customGather dir="plugins/org.eclipse.core.databinding.source" projectName="org.eclipse.core.databinding.source_1.1.1.M20080827-0800b" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
-@@ -795,6 +796,10 @@
++		<customGather dir="plugins/org.eclipse.core.filesystem.linux.s390x" projectName="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ 		<customGather dir="plugins/org.eclipse.core.variables" projectName="org.eclipse.core.variables_3.2.200.v20090302-1500" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ 		<customGather dir="plugins/org.eclipse.ui.forms" projectName="org.eclipse.ui.forms_3.4.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ 		<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+@@ -838,6 +839,10 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
-+			<param name="elementName" value="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20080604-1400"/>
++			<param name="elementName" value="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316"/>
 +		</antcall>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.ui.views.properties.tabbed_3.4.2.M20090127-1700"/>
+ 			<param name="elementName" value="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800"/>
  		</antcall>
  		<antcall target="jarUp">


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- eclipse.spec	14 Apr 2009 12:52:13 -0000	1.636
+++ eclipse.spec	14 Apr 2009 19:28:34 -0000	1.637
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.2%{?dist}
+Release:        0.2.3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -414,8 +414,7 @@
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
 %patch28
-# TODO and this one
-#%patch30
+%patch30
 %patch31 -p1
 %patch38
 
@@ -1607,6 +1606,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.3
+- Rediff patch30.
+
 * Tue Apr 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.2
 - Fix version of source bundles.
 



From epienbro at fedoraproject.org  Tue Apr 14 19:29:22 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Tue, 14 Apr 2009 19:29:22 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel
	mingw32-libxml2-static-build-compile-fix.patch, NONE,
	1.1 mingw32-libxml2.spec, 1.3, 1.4
Message-ID: <20090414192922.A28F0700B2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25099

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	mingw32-libxml2-static-build-compile-fix.patch 
Log Message:
- Fixed %defattr line
- Added -static subpackage. Applications which want to link
  against this static library needs to add -DLIBXML_STATIC to the CFLAGS
- This package shouldn't own %%{_mingw32_libdir}/pkgconfig


mingw32-libxml2-static-build-compile-fix.patch:

--- NEW FILE mingw32-libxml2-static-build-compile-fix.patch ---
--- threads.c.orig	2009-04-03 19:12:55.382657819 +0200
+++ threads.c	2009-04-03 19:13:10.362407937 +0200
@@ -975,8 +975,8 @@
  */
 #if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
 #if defined(LIBXML_STATIC_FOR_DLL)
-BOOL XMLCALL
-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+int XMLCALL
+xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved)
 #else
 BOOL WINAPI
 DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-libxml2.spec	26 Feb 2009 01:17:29 -0000	1.3
+++ mingw32-libxml2.spec	14 Apr 2009 19:28:52 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -20,6 +20,7 @@
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
+Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
 
 BuildArch:      noarch
 
@@ -41,10 +42,20 @@
 MinGW Windows libxml2 XML processing library.
 
 
+%package static
+Summary:        Static version of the MinGW Windows XML processing library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows XML processing library.
+
+
 %prep
 %setup -q -n libxml2-%{version}
 
 %patch1000 -p1
+%patch1001 -p0
 
 # Patched configure.in, so rebuild configure.
 libtoolize --force --copy
@@ -52,15 +63,39 @@
 
 
 %build
-LDFLAGS="-no-undefined" \
-%{_mingw32_configure} --without-python --with-modules --disable-static
-make %{?_smp_mflags}
+# LibXML2 can't build static and shared libraries in one go, so we
+# build LibXML2 twice here
+mkdir build_static
+pushd build_static
+    LDFLAGS="-no-undefined" \
+    %{_mingw32_configure} --without-python --with-modules --enable-static --disable-shared CFLAGS="$CFLAGS -DLIBXML_STATIC_FOR_DLL"
+    make %{?_smp_mflags}
+popd
+
+mkdir build_shared
+pushd build_shared
+    LDFLAGS="-no-undefined" \
+    %{_mingw32_configure} --without-python --with-modules --disable-static --enable-shared
+    make %{?_smp_mflags}
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
+# First install all the files belonging to the shared build
+make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
+
+# Install all the files from the static build in a seperate folder
+# and move the static libraries to the right location
+make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
+mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+
+# Manually merge the libtool files
+sed -i s/"old_library=''"/"old_library='libxml2.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libxml2.la
+
+# Drop the folder which was temporary used for installing the static bits
+rm -rf $RPM_BUILD_ROOT/build_static
 
 # Remove manpages which duplicate Fedora native.
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
@@ -71,14 +106,13 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_mingw32_bindir}/libxml2-2.dll
 %{_mingw32_bindir}/xml2-config
 %{_mingw32_bindir}/xmlcatalog.exe
 %{_mingw32_bindir}/xmllint.exe
 %{_mingw32_libdir}/libxml2.dll.a
 %{_mingw32_libdir}/libxml2.la
-%{_mingw32_libdir}/pkgconfig
 %{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
 %{_mingw32_libdir}/xml2Conf.sh
 %{_mingw32_includedir}/libxml2
@@ -87,7 +121,17 @@
 %{_mingw32_datadir}/gtk-doc/html/libxml2/
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libxml2.a
+
 %changelog
+* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.2-9
+- Fixed %%defattr line
+- Added -static subpackage. Applications which want to link
+  against this static library needs to add -DLIBXML_STATIC to the CFLAGS
+- This package shouldn't own %%{_mingw32_libdir}/pkgconfig
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From epienbro at fedoraproject.org  Tue Apr 14 19:31:07 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Tue, 14 Apr 2009 19:31:07 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel mingw32-pixman.spec,1.3,1.4
Message-ID: <20090414193107.1AD97700B2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25972

Modified Files:
	mingw32-pixman.spec 
Log Message:
- Fixed %defattr line
- Added -static subpackage



Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-pixman.spec	26 Feb 2009 01:20:54 -0000	1.3
+++ mingw32-pixman.spec	14 Apr 2009 19:30:36 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:           mingw32-pixman
 Version:        0.13.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -32,6 +32,15 @@
 MinGW Windows Pixman library.
 
 
+%package static
+Summary:        Static version of the MinGW Windows Pixman library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Pixman library.
+
+
 %prep
 %setup -q -n pixman-%{version}
 %patch0 -p1
@@ -40,7 +49,7 @@
 %build
 # Uses GTK for its testsuite, so disable this otherwise
 # we have a chicken & egg problem on mingw
-%{_mingw32_configure} --disable-gtk --disable-static
+%{_mingw32_configure} --disable-gtk --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
@@ -55,7 +64,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE
 %{_mingw32_bindir}/libpixman-1-0.dll
 %{_mingw32_includedir}/pixman-1
@@ -64,7 +73,16 @@
 %{_mingw32_libdir}/pkgconfig/pixman-1.pc
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libpixman-1.a
+
+
 %changelog
+* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.13.2-5
+- Fixed %%defattr line
+- Added -static subpackage
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From epienbro at fedoraproject.org  Tue Apr 14 19:34:44 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Tue, 14 Apr 2009 19:34:44 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel mingw32-openssl.spec,1.3,1.4
Message-ID: <20090414193444.BE8E4700B2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27551

Modified Files:
	mingw32-openssl.spec 
Log Message:
- Fixed %defattr line
- Added -static subpackage



Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-openssl.spec	26 Feb 2009 01:19:25 -0000	1.3
+++ mingw32-openssl.spec	14 Apr 2009 19:34:14 -0000	1.4
@@ -27,7 +27,7 @@
 
 Name:           mingw32-openssl
 Version:        0.9.8j
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -131,6 +131,14 @@
 This package contains Windows (MinGW) libraries and development tools.
 
 
+%package static
+Summary:        Static version of the MinGW port of the OpenSSL toolkit
+Requires:       %{name} = %{version}-%{release}
+
+%description static
+Static version of the MinGW port of the OpenSSL toolkit.
+
+
 %prep
 %setup -q -n openssl-%{version}
 
@@ -282,10 +290,6 @@
 install libcrypto-%{soversion}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
 install libssl-%{soversion}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
 
-# Remove static libraries but DON'T remove *.dll.a files.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libcrypto.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libssl.a
-
 # I have no idea why it installs the manpages in /etc, but
 # we remove them anyway.
 rm -r $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pki/tls/man
@@ -313,7 +317,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE
 %{_mingw32_bindir}/openssl.exe
 %{_mingw32_bindir}/c_rehash
@@ -328,7 +332,17 @@
 %config(noreplace) %{_mingw32_sysconfdir}/pki
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcrypto.a
+%{_mingw32_libdir}/libssl.a
+
+
 %changelog
+* Tue Apr 14 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.9.8j-5
+- Fixed %%defattr line
+- Added -static subpackage
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8j-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From oget at fedoraproject.org  Tue Apr 14 19:34:55 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 14 Apr 2009 19:34:55 +0000 (UTC)
Subject: rpms/hydrogen/devel .cvsignore, 1.3, 1.4 hydrogen.spec, 1.9,
	1.10 sources, 1.3, 1.4 hydrogen-internal-tinyxml.patch, 1.1, NONE
Message-ID: <20090414193455.5FE02700B2@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27641

Modified Files:
	.cvsignore hydrogen.spec sources 
Removed Files:
	hydrogen-internal-tinyxml.patch 
Log Message:
* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.3.rc1.1
- Update to 0.9.4-rc1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2009 21:06:07 -0000	1.3
+++ .cvsignore	14 Apr 2009 19:34:24 -0000	1.4
@@ -1 +1 @@
-hydrogen-0.9.4-beta3-790svn.tar.bz2
+hydrogen-0.9.4-rc1-1.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hydrogen.spec	25 Feb 2009 05:56:44 -0000	1.9
+++ hydrogen.spec	14 Apr 2009 19:34:25 -0000	1.10
@@ -1,85 +1,100 @@
-%define svn 790
+%global prerel rc1.1
+%global prerel2 rc1-1
 
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.2.%{svn}svn%{?dist}
+Release:      0.3.%{prerel}%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      %{name}-%{version}-beta3-%{svn}svn.tar.bz2
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
-# Use internal tinyxml instead of the one supplied by hydrogen:
-# Sent upstream: 
-# https://sourceforge.net/mailarchive/message.php?msg_name=e76492710901221851m3a285da8n9422642afe443124%40mail.gmail.com
-Patch0:       hydrogen-internal-tinyxml.patch
 License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: flac-devel jack-audio-connection-kit-devel liblrdf-devel
-BuildRequires: qt4-devel libsndfile-devel alsa-lib-devel portaudio-devel
-BuildRequires: desktop-file-utils lash-devel libtar-devel scons tinyxml-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: flac-devel 
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lash-devel 
+BuildRequires: liblrdf-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libtar-devel
+BuildRequires: portaudio-devel
 BuildRequires: portmidi-devel
+BuildRequires: qt-devel
+BuildRequires: scons
 
 %description
 Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is to bring 
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{prerel2}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
-%patch0 -p1 -b .tinyxml
 
 %build
-scons %{?_smp_flags} prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
+export QTDIR=%{_qt4_prefix}
+scons %{?_smp_mflags} prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export QTDIR=%{_qt4_prefix}
 scons install DESTDIR=$RPM_BUILD_ROOT
 
-# Reinstall hydrogen.desktop properly.
-rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
+
+# install hydrogen.desktop properly.
+#rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
 desktop-file-install --vendor fedora              \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
   --add-category X-Drumming                       \
   --add-category X-MIDI                           \
   --add-category X-Jack                           \
   --remove-mime-type text/xml                     \
-  hydrogen.desktop
+  --delete-original                               \
+  $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
 
 # Move the icon to the proper place
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
+# No need to package these (they will not be installed automatically in rc2):
+rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
+      $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+        touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+        gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README.txt
-# FIXME: The software still shows the old documentation internally.
-# Remove these when this is fixed upstream:
-%doc data/new_manual/* data/new_tutorial/*
 %{_bindir}/hydrogen
 %{_datadir}/hydrogen
 %{_datadir}/applications/fedora-hydrogen.desktop
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.3.rc1.1
+- Update to 0.9.4-rc1-1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-0.2.790svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Feb 2009 21:06:07 -0000	1.3
+++ sources	14 Apr 2009 19:34:25 -0000	1.4
@@ -1 +1 @@
-125369a770cd183a3250084146e739b5  hydrogen-0.9.4-beta3-790svn.tar.bz2
+88f036f32153843997837a95c46ecbc5  hydrogen-0.9.4-rc1-1.tar.gz


--- hydrogen-internal-tinyxml.patch DELETED ---



From clumens at fedoraproject.org  Tue Apr 14 19:37:45 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue, 14 Apr 2009 19:37:45 +0000 (UTC)
Subject: rpms/rhpl/devel .cvsignore, 1.91, 1.92 rhpl.spec, 1.121,
	1.122 sources, 1.100, 1.101
Message-ID: <20090414193745.F2F36700B2@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/rhpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28438

Modified Files:
	.cvsignore rhpl.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	28 Jan 2009 15:57:55 -0000	1.91
+++ .cvsignore	14 Apr 2009 19:37:14 -0000	1.92
@@ -1 +1,2 @@
 rhpl-0.219.tar.bz2
+rhpl-0.220.tar.bz2


Index: rhpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- rhpl.spec	25 Feb 2009 19:55:02 -0000	1.121
+++ rhpl.spec	14 Apr 2009 19:37:14 -0000	1.122
@@ -2,8 +2,8 @@
 
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
-Version: 0.219
-Release: 2
+Version: 0.220
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Libraries
@@ -41,19 +41,12 @@
 %{python_sitearch}/rhpl
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.219-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Apr 13 2009 Chris Lumens <clumens at redhat.com> 0.220-1
+- Attempt to fix an error when catching OSError (#493271).
 
 * Tue Jan 27 2009 Martin Sivak <msivak at redhat.com> 0.219-1
 - National keyboard layout is prefered over us variant (#473056)
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.218-2
-- Rebuild for Python 2.6
-
-* Mon Oct 27 2008 Jeremy Katz <katzj at redhat.com> - 0.218-1
-- Updated translations
-- Write out all aspects of the keyboard to /etc/sysconfig/keyboard for ajax
-
 * Mon Oct 13 2008 Chris Lumens <clumens at redhat.com> 0.217-1
 - Don't set XKB model (ajax, #461832).
 - Don't use the deprecated gtk.mainiteration function (#432115).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	28 Jan 2009 15:57:55 -0000	1.100
+++ sources	14 Apr 2009 19:37:14 -0000	1.101
@@ -1 +1 @@
-2224daa17342305d65055788dc253324  rhpl-0.219.tar.bz2
+be021f2c1e342c37ad4757951744c257  rhpl-0.220.tar.bz2



From rdieter at fedoraproject.org  Tue Apr 14 19:41:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 19:41:29 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch, 
	NONE, 1.1 qt.spec, 1.260, 1.261
Message-ID: <20090414194129.AE7D270137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29789

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
Log Message:
* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
- fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)


qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter	2009-04-14 13:56:07.000000000 -0500
+++ qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp	2009-04-14 13:59:00.000000000 -0500
@@ -72,9 +72,9 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
-#define QT_USE_FREETYPE_LCDFILTER
-#endif
+//#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+//#define QT_USE_FREETYPE_LCDFILTER
+//#endif
 
 #ifdef QT_LINUXBASE
 #include FT_ERRORS_H


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- qt.spec	10 Apr 2009 08:05:04 -0000	1.260
+++ qt.spec	14 Apr 2009 19:40:59 -0000	1.261
@@ -2,7 +2,7 @@
 
 # configure options
 # -no-pch disables precompiled headers, make ccache-friendly
-#define no_pch -no-pch
+%define no_pch -no-pch
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -44,6 +44,8 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
+# http://bugzilla.redhat.com/490377
+Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -325,6 +327,7 @@
 %patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
+%patch15 -p1 -b .disable_ft_lcdfilter
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
@@ -809,6 +812,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
+- fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
+
 * Fri Apr 10 2009 Than Ngo <than at redhat.com> - 4.5.0-13
 - unneeded executable permissions for profile.d scripts
 



From terjeros at fedoraproject.org  Tue Apr 14 19:45:44 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Tue, 14 Apr 2009 19:45:44 +0000 (UTC)
Subject: rpms/python-unipath/devel import.log, NONE, 1.1 python-unipath.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414194544.A2C96700B2@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-unipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31319/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-unipath.spec 
Log Message:
Importing python-unipath.




--- NEW FILE import.log ---
python-unipath-0_2_1-2_fc10:HEAD:python-unipath-0.2.1-2.fc10.src.rpm:1239737998


--- NEW FILE python-unipath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%global oname  Unipath

Summary:       Alternative to Python modules os, os.path and shutil
Name:          python-unipath
Version:       0.2.1
Release:       2%{?dist}
License:       Python
Group:         Development/Tools
URL  :         http://pypi.python.org/pypi/Unipath/
Source0:       http://pypi.python.org/packages/source/U/Unipath/%{oname}-%{version}.tar.gz
BuildArch:     noarch
BuildRequires: python-setuptools-devel python-nose dos2unix
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description

Unipath is a package for doing pathname calculations and filesystem
access in an object-oriented manner, an alternative to functions in
os.path, shutil and glob, and even some functions in os.* It's based
on Jason Orendorff's path.py but does not adhere as strictly to the
underlying functions' syntax, in order to provide more user
convenience and higher-level functionality. For example:

 o p.mkdir() succeeds silently if the directory already exists, and
 o p.mkdir(True) creates intermediate directories a la os.makedirs.
 o p.rmtree(parents=True) combines shutil.rmtree, os.path.isdir,
   os.remove, and os.removedirs, to recursively remove whatever it is
   if it exists.
 o p.read_file("rb") returns the file's contents in binary mode.
 o p.needs_update([other_path1, ...]) returns True if p doesn't exist
   or has an older timestamp than any of the others.
 o extra convenience functions in the unipath.tools module. dict2dir
   creates a directory hierarchy described by a dict. dump_path displays
   an ASCII tree of a directory hierarchy.

%prep
%setup -q -n %{oname}-%{version}
for f in doc/reference/{test_,}path_nr.py ; do
    dos2unix -k $f
done
for f in README.txt doc/reference/path_355.py ; do
    iconv -f ISO-8859-1 -t UTF-8 -o $f.utf8 $f && \
    touch -r $f $f.utf8 && \
    %{__mv} $f.utf8 $f
done

# To avoid warning about script without execute bit set
%{__sed} -i -e '1d' unipath/test.py

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
%{__rm} -rf %{buildroot}

%check
%{__cp} unipath/test.py .
%{__python} test.py

%files
%defattr(-, root, root, -)
%doc BUGS.txt CHANGES doc/reference/ PKG-INFO README.html README.txt 
%{python_sitelib}/unipath/
%{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info

%changelog
* Tue Apr 14 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-2
- Minor changes taken from review

* Sun Mar 29 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:10:18 -0000	1.1
+++ .cvsignore	14 Apr 2009 19:45:12 -0000	1.2
@@ -0,0 +1 @@
+Unipath-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:10:18 -0000	1.1
+++ sources	14 Apr 2009 19:45:13 -0000	1.2
@@ -0,0 +1 @@
+da24f0e0d39931df3fc61f2db09d4e57  Unipath-0.2.1.tar.gz



From avesh at fedoraproject.org  Tue Apr 14 19:47:17 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 14 Apr 2009 19:47:17 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6.21-nss.patch,1.1,1.2
Message-ID: <20090414194717.A286E700B2@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31965

Modified Files:
	openswan-2.6.21-nss.patch 
Log Message:
* Mon Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
- Updated the Openswan-NSS porting to enable nss by default
- The patch includes README.nss for information about NSS usage


openswan-2.6.21-nss.patch:

Index: openswan-2.6.21-nss.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan-2.6.21-nss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openswan-2.6.21-nss.patch	14 Apr 2009 17:22:17 -0000	1.1
+++ openswan-2.6.21-nss.patch	14 Apr 2009 19:47:16 -0000	1.2
@@ -1433,7 +1433,7 @@
  /*
 diff -urNp openswan-2.6.21-orig/Makefile.inc openswan-2.6.21/Makefile.inc
 --- openswan-2.6.21-orig/Makefile.inc	2009-03-30 09:11:28.000000000 -0400
-+++ openswan-2.6.21/Makefile.inc	2009-04-14 12:18:29.000000000 -0400
++++ openswan-2.6.21/Makefile.inc	2009-04-14 15:44:04.000000000 -0400
 @@ -257,7 +257,14 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
  #       you may or maynot have
  
@@ -1442,7 +1442,7 @@
 +USE_LIBNSS?=true
 +
 +#Support for integrity check for binaries (requires fipscheck-devel) 
-+USE_FIPSCHECK?=false
++USE_FIPSCHECK?=true
 +
 +ifeq ($(USE_FIPSCHECK),true)
 +USE_LIBNSS?=true



From oget at fedoraproject.org  Tue Apr 14 19:54:44 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 14 Apr 2009 19:54:44 +0000 (UTC)
Subject: rpms/fluid-soundfont/F-10 fluid-soundfont.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414195444.492C0700B2@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/fluid-soundfont/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1497/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	fluid-soundfont.spec import.log 
Log Message:
* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 3.1-2
- Add "Provides: soundfont2" to gm and gs packages
- Add common subpackage for directory ownership and the doc files
- Update description

* Fri Jan 30 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 3.1-1
- Initial Fedora build. SPEC file adapted from PersonalCopy-Lite-soundfont




--- NEW FILE fluid-soundfont.spec ---
Name:           fluid-soundfont
Version:        3.1
Release:        2%{?dist}
Summary:        Pro-quality GM/GS soundfont
Group:          Applications/Multimedia
License:        MIT
# The original URL (http://www.powermage.com/fluid) seems dead. Therefore we point
# to the Hammersound archives:
URL:            http://www.hammersound.com/cgi-bin/soundlink.pl?action=view_category&category=Collections&ListStart=0&ListLength=20
# The Hammersound source gives us a soundfont in a linux-unfriendly .sfArk format. 
# In order to convert this to a linux-friendly .sf2 format one needs to use a 
# non-free utility sfarkxtc from 
#    http://www.melodymachine.com
# This page explains how this conversion is done:
#    http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/doc/ch01s46.html
# Debian folks already did this and we will borrow their source tarball:
Source0:        http://ftp.de.debian.org/debian/pool/main/f/%{name}/%{name}_%{version}.orig.tar.gz
# Some information about the soundfont that can be found in the Hammersound archive:
Source1:        Fluid_R3_Readme.pdf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch


%define common_description \
FluidR3 is the third release of Frank Wen's pro-quality GM/GS soundfont.\
The soundfont has lots of excellent samples, including all the GM instruments\
along side with the GS instruments that are recycled and reprogrammed versions\
of the GM presets.

%description
%common_description

%package common
Summary:        Common files for FluidR3 soundfont
Group:          Applications/Multimedia

%description common
%common_description

This package contains common files shared among all FluidR3 soundfont packages.

%package gm
Summary:        Pro-quality General Midi soundfont
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Provides:       soundfont2

%description gm
%common_description

This package contains Fluid General Midi (GM) soundfont in soundfont 2.0 (.sf2)
format.

%package gs
Summary:        Pro-quality General Standard Extension soundfont
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       %{name}-gm = %{version}-%{release}
Provides:       soundfont2


%description gs
%common_description

This package contains instruments belonging to General Midi's General Standard
(GS) Extension in soundfont 2.0 (.sf2) format.


%prep
%setup -q
cp -a %{SOURCE1} .

%build


%install
rm -rf $RPM_BUILD_ROOT

# The actual soundfonts:
mkdir -p $RPM_BUILD_ROOT%{_datadir}/soundfonts
install -p -m 644 FluidR3_GM.sf2 $RPM_BUILD_ROOT%{_datadir}/soundfonts
install -p -m 644 FluidR3_GS.sf2 $RPM_BUILD_ROOT%{_datadir}/soundfonts

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(-,root,root,-)
%doc COPYING README *Readme*
%dir %{_datadir}/soundfonts/

%files gm
%defattr(-,root,root,-)
%{_datadir}/soundfonts/FluidR3_GM.sf2

%files gs
%defattr(-,root,root,-)
%{_datadir}/soundfonts/FluidR3_GS.sf2


%changelog
* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 3.1-2
- Add "Provides: soundfont2" to gm and gs packages
- Add common subpackage for directory ownership and the doc files
- Update description

* Fri Jan 30 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 3.1-1
- Initial Fedora build. SPEC file adapted from PersonalCopy-Lite-soundfont


--- NEW FILE import.log ---
fluid-soundfont-3_1-2_fc10:F-10:fluid-soundfont-3.1-2.fc10.src.rpm:1239738809


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fluid-soundfont/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2009 03:35:59 -0000	1.1
+++ .cvsignore	14 Apr 2009 19:54:12 -0000	1.2
@@ -0,0 +1,2 @@
+Fluid_R3_Readme.pdf
+fluid-soundfont_3.1.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fluid-soundfont/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2009 03:35:59 -0000	1.1
+++ sources	14 Apr 2009 19:54:13 -0000	1.2
@@ -0,0 +1,2 @@
+01e65cc3ac20381b3b42f0b7a9e4a055  Fluid_R3_Readme.pdf
+189bbdf70221018cbda536984b105dfa  fluid-soundfont_3.1.orig.tar.gz



From oget at fedoraproject.org  Tue Apr 14 19:56:27 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 14 Apr 2009 19:56:27 +0000 (UTC)
Subject: rpms/hydrogen/F-10 .cvsignore, 1.3, 1.4 hydrogen.spec, 1.7,
	1.8 sources, 1.3, 1.4 hydrogen-internal-tinyxml.patch, 1.1, NONE
Message-ID: <20090414195627.43575700B2@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2216

Modified Files:
	.cvsignore hydrogen.spec sources 
Removed Files:
	hydrogen-internal-tinyxml.patch 
Log Message:
* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.2.rc1.1
- Update to 0.9.4-rc1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2009 21:26:33 -0000	1.3
+++ .cvsignore	14 Apr 2009 19:55:56 -0000	1.4
@@ -1 +1 @@
-hydrogen-0.9.4-beta3-790svn.tar.bz2
+hydrogen-0.9.4-rc1-1.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/hydrogen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hydrogen.spec	13 Feb 2009 21:26:33 -0000	1.7
+++ hydrogen.spec	14 Apr 2009 19:55:56 -0000	1.8
@@ -1,85 +1,100 @@
-%define svn 790
+%global prerel rc1.1
+%global prerel2 rc1-1
 
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.1.%{svn}svn%{?dist}
+Release:      0.2.%{prerel}%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      %{name}-%{version}-beta3-%{svn}svn.tar.bz2
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
-# Use internal tinyxml instead of the one supplied by hydrogen:
-# Sent upstream: 
-# https://sourceforge.net/mailarchive/message.php?msg_name=e76492710901221851m3a285da8n9422642afe443124%40mail.gmail.com
-Patch0:       hydrogen-internal-tinyxml.patch
 License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: flac-devel jack-audio-connection-kit-devel liblrdf-devel
-BuildRequires: qt4-devel libsndfile-devel alsa-lib-devel portaudio-devel
-BuildRequires: desktop-file-utils lash-devel libtar-devel scons tinyxml-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: flac-devel 
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lash-devel 
+BuildRequires: liblrdf-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libtar-devel
+BuildRequires: portaudio-devel
 BuildRequires: portmidi-devel
+BuildRequires: qt-devel
+BuildRequires: scons
 
 %description
 Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is to bring 
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{prerel2}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
-%patch0 -p1 -b .tinyxml
 
 %build
-scons prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
+export QTDIR=%{_qt4_prefix}
+scons %{?_smp_mflags} prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export QTDIR=%{_qt4_prefix}
 scons install DESTDIR=$RPM_BUILD_ROOT
 
-# Reinstall hydrogen.desktop properly.
-rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
+
+# install hydrogen.desktop properly.
+#rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
 desktop-file-install --vendor fedora              \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
   --add-category X-Drumming                       \
   --add-category X-MIDI                           \
   --add-category X-Jack                           \
   --remove-mime-type text/xml                     \
-  hydrogen.desktop
+  --delete-original                               \
+  $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
 
 # Move the icon to the proper place
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
+# No need to package these (they will not be installed automatically in rc2):
+rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
+      $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+        touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+        gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README.txt
-# FIXME: The software still shows the old documentation internally.
-# Remove these when this is fixed upstream:
-%doc data/new_manual/* data/new_tutorial/*
 %{_bindir}/hydrogen
 %{_datadir}/hydrogen
 %{_datadir}/applications/fedora-hydrogen.desktop
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.2.rc1.1
+- Update to 0.9.4-rc1-1
+
 * Fri Feb 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.1.790svn
 - Update to 0.9.4-beta3 (uses scons and qt4)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Feb 2009 21:26:33 -0000	1.3
+++ sources	14 Apr 2009 19:55:56 -0000	1.4
@@ -1 +1 @@
-125369a770cd183a3250084146e739b5  hydrogen-0.9.4-beta3-790svn.tar.bz2
+88f036f32153843997837a95c46ecbc5  hydrogen-0.9.4-rc1-1.tar.gz


--- hydrogen-internal-tinyxml.patch DELETED ---



From vpv at fedoraproject.org  Tue Apr 14 20:00:31 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 14 Apr 2009 20:00:31 +0000 (UTC)
Subject: rpms/vdr-skinsoppalusikka/devel .cvsignore, 1.8, 1.9 sources, 1.8, 
	1.9 vdr-skinsoppalusikka.spec, 1.11, 1.12
Message-ID: <20090414200031.45624700B2@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3541

Modified Files:
	.cvsignore sources vdr-skinsoppalusikka.spec 
Log Message:
* Tue Apr 14 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
- 1.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2008 21:18:46 -0000	1.8
+++ .cvsignore	14 Apr 2009 20:00:29 -0000	1.9
@@ -1 +1 @@
-vdr-skinsoppalusikka-1.6.3.tgz
+vdr-skinsoppalusikka-1.6.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2008 21:18:46 -0000	1.8
+++ sources	14 Apr 2009 20:00:29 -0000	1.9
@@ -1 +1 @@
-c42f6156615068bf4095f622009f2328  vdr-skinsoppalusikka-1.6.3.tgz
+b95beb8eb8f3fc651f0f6e50977685f1  vdr-skinsoppalusikka-1.6.4.tgz


Index: vdr-skinsoppalusikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel/vdr-skinsoppalusikka.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vdr-skinsoppalusikka.spec	25 Feb 2009 23:59:00 -0000	1.11
+++ vdr-skinsoppalusikka.spec	14 Apr 2009 20:00:29 -0000	1.12
@@ -5,8 +5,8 @@
 
 
 Name:           vdr-%{pname}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Summary:        The "Soppalusikka" skin for VDR
 
 Group:          Applications/Multimedia
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
+- 1.6.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From avesh at fedoraproject.org  Tue Apr 14 20:01:38 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 14 Apr 2009 20:01:38 +0000 (UTC)
Subject: rpms/openswan/devel openswan.spec,1.77,1.78
Message-ID: <20090414200138.CFEAE700B2@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3877

Modified Files:
	openswan.spec 
Log Message:
* Tue Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-4
- Updated the Openswan-NSS porting to enable nss and fipscheck by default
- fipscheck requires fipscheck-devel library



Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- openswan.spec	14 Apr 2009 19:28:00 -0000	1.77
+++ openswan.spec	14 Apr 2009 20:01:08 -0000	1.78
@@ -4,7 +4,7 @@
 Name: openswan
 Version: 2.6.21
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -169,7 +169,11 @@
 chkconfig --add ipsec || :
 
 %changelog
-* Mon Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
+* Tue Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-4
+- Updated the Openswan-NSS porting to enable nss and fipscheck by default
+- fipscheck requires fipscheck-devel library
+
+* Tue Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-3
 - Updated the Openswan-NSS porting to enable nss by default
 - The patch includes README.nss for information about NSS usage
 



From terjeros at fedoraproject.org  Tue Apr 14 20:02:02 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Tue, 14 Apr 2009 20:02:02 +0000 (UTC)
Subject: rpms/python-unipath/F-10 python-unipath.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414200202.D56CD700B2@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-unipath/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3813/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	python-unipath.spec 
Log Message:
Sync with rawhide.




--- NEW FILE python-unipath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%global oname  Unipath

Summary:       Alternative to Python modules os, os.path and shutil
Name:          python-unipath
Version:       0.2.1
Release:       2%{?dist}
License:       Python
Group:         Development/Tools
URL  :         http://pypi.python.org/pypi/Unipath/
Source0:       http://pypi.python.org/packages/source/U/Unipath/%{oname}-%{version}.tar.gz
BuildArch:     noarch
BuildRequires: python-setuptools-devel python-nose dos2unix
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description

Unipath is a package for doing pathname calculations and filesystem
access in an object-oriented manner, an alternative to functions in
os.path, shutil and glob, and even some functions in os.* It's based
on Jason Orendorff's path.py but does not adhere as strictly to the
underlying functions' syntax, in order to provide more user
convenience and higher-level functionality. For example:

 o p.mkdir() succeeds silently if the directory already exists, and
 o p.mkdir(True) creates intermediate directories a la os.makedirs.
 o p.rmtree(parents=True) combines shutil.rmtree, os.path.isdir,
   os.remove, and os.removedirs, to recursively remove whatever it is
   if it exists.
 o p.read_file("rb") returns the file's contents in binary mode.
 o p.needs_update([other_path1, ...]) returns True if p doesn't exist
   or has an older timestamp than any of the others.
 o extra convenience functions in the unipath.tools module. dict2dir
   creates a directory hierarchy described by a dict. dump_path displays
   an ASCII tree of a directory hierarchy.

%prep
%setup -q -n %{oname}-%{version}
for f in doc/reference/{test_,}path_nr.py ; do
    dos2unix -k $f
done
for f in README.txt doc/reference/path_355.py ; do
    iconv -f ISO-8859-1 -t UTF-8 -o $f.utf8 $f && \
    touch -r $f $f.utf8 && \
    %{__mv} $f.utf8 $f
done

# To avoid warning about script without execute bit set
%{__sed} -i -e '1d' unipath/test.py

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
%{__rm} -rf %{buildroot}

%check
%{__cp} unipath/test.py .
%{__python} test.py

%files
%defattr(-, root, root, -)
%doc BUGS.txt CHANGES doc/reference/ PKG-INFO README.html README.txt 
%{python_sitelib}/unipath/
%{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info

%changelog
* Tue Apr 14 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-2
- Minor changes taken from review

* Sun Mar 29 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:10:18 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:01:31 -0000	1.2
@@ -0,0 +1 @@
+Unipath-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:10:18 -0000	1.1
+++ sources	14 Apr 2009 20:01:32 -0000	1.2
@@ -0,0 +1 @@
+da24f0e0d39931df3fc61f2db09d4e57  Unipath-0.2.1.tar.gz



From terjeros at fedoraproject.org  Tue Apr 14 20:02:03 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Tue, 14 Apr 2009 20:02:03 +0000 (UTC)
Subject: rpms/python-unipath/F-11 python-unipath.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414200203.97180700B2@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-unipath/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3813/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	python-unipath.spec 
Log Message:
Sync with rawhide.




--- NEW FILE python-unipath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%global oname  Unipath

Summary:       Alternative to Python modules os, os.path and shutil
Name:          python-unipath
Version:       0.2.1
Release:       2%{?dist}
License:       Python
Group:         Development/Tools
URL  :         http://pypi.python.org/pypi/Unipath/
Source0:       http://pypi.python.org/packages/source/U/Unipath/%{oname}-%{version}.tar.gz
BuildArch:     noarch
BuildRequires: python-setuptools-devel python-nose dos2unix
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description

Unipath is a package for doing pathname calculations and filesystem
access in an object-oriented manner, an alternative to functions in
os.path, shutil and glob, and even some functions in os.* It's based
on Jason Orendorff's path.py but does not adhere as strictly to the
underlying functions' syntax, in order to provide more user
convenience and higher-level functionality. For example:

 o p.mkdir() succeeds silently if the directory already exists, and
 o p.mkdir(True) creates intermediate directories a la os.makedirs.
 o p.rmtree(parents=True) combines shutil.rmtree, os.path.isdir,
   os.remove, and os.removedirs, to recursively remove whatever it is
   if it exists.
 o p.read_file("rb") returns the file's contents in binary mode.
 o p.needs_update([other_path1, ...]) returns True if p doesn't exist
   or has an older timestamp than any of the others.
 o extra convenience functions in the unipath.tools module. dict2dir
   creates a directory hierarchy described by a dict. dump_path displays
   an ASCII tree of a directory hierarchy.

%prep
%setup -q -n %{oname}-%{version}
for f in doc/reference/{test_,}path_nr.py ; do
    dos2unix -k $f
done
for f in README.txt doc/reference/path_355.py ; do
    iconv -f ISO-8859-1 -t UTF-8 -o $f.utf8 $f && \
    touch -r $f $f.utf8 && \
    %{__mv} $f.utf8 $f
done

# To avoid warning about script without execute bit set
%{__sed} -i -e '1d' unipath/test.py

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
%{__rm} -rf %{buildroot}

%check
%{__cp} unipath/test.py .
%{__python} test.py

%files
%defattr(-, root, root, -)
%doc BUGS.txt CHANGES doc/reference/ PKG-INFO README.html README.txt 
%{python_sitelib}/unipath/
%{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info

%changelog
* Tue Apr 14 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-2
- Minor changes taken from review

* Sun Mar 29 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:10:18 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:01:32 -0000	1.2
@@ -0,0 +1 @@
+Unipath-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:10:18 -0000	1.1
+++ sources	14 Apr 2009 20:01:33 -0000	1.2
@@ -0,0 +1 @@
+da24f0e0d39931df3fc61f2db09d4e57  Unipath-0.2.1.tar.gz



From terjeros at fedoraproject.org  Tue Apr 14 20:02:04 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Tue, 14 Apr 2009 20:02:04 +0000 (UTC)
Subject: rpms/python-unipath/F-9 python-unipath.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414200204.4DDA4700B2@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-unipath/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3813/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	python-unipath.spec 
Log Message:
Sync with rawhide.




--- NEW FILE python-unipath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%global oname  Unipath

Summary:       Alternative to Python modules os, os.path and shutil
Name:          python-unipath
Version:       0.2.1
Release:       2%{?dist}
License:       Python
Group:         Development/Tools
URL  :         http://pypi.python.org/pypi/Unipath/
Source0:       http://pypi.python.org/packages/source/U/Unipath/%{oname}-%{version}.tar.gz
BuildArch:     noarch
BuildRequires: python-setuptools-devel python-nose dos2unix
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description

Unipath is a package for doing pathname calculations and filesystem
access in an object-oriented manner, an alternative to functions in
os.path, shutil and glob, and even some functions in os.* It's based
on Jason Orendorff's path.py but does not adhere as strictly to the
underlying functions' syntax, in order to provide more user
convenience and higher-level functionality. For example:

 o p.mkdir() succeeds silently if the directory already exists, and
 o p.mkdir(True) creates intermediate directories a la os.makedirs.
 o p.rmtree(parents=True) combines shutil.rmtree, os.path.isdir,
   os.remove, and os.removedirs, to recursively remove whatever it is
   if it exists.
 o p.read_file("rb") returns the file's contents in binary mode.
 o p.needs_update([other_path1, ...]) returns True if p doesn't exist
   or has an older timestamp than any of the others.
 o extra convenience functions in the unipath.tools module. dict2dir
   creates a directory hierarchy described by a dict. dump_path displays
   an ASCII tree of a directory hierarchy.

%prep
%setup -q -n %{oname}-%{version}
for f in doc/reference/{test_,}path_nr.py ; do
    dos2unix -k $f
done
for f in README.txt doc/reference/path_355.py ; do
    iconv -f ISO-8859-1 -t UTF-8 -o $f.utf8 $f && \
    touch -r $f $f.utf8 && \
    %{__mv} $f.utf8 $f
done

# To avoid warning about script without execute bit set
%{__sed} -i -e '1d' unipath/test.py

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
%{__rm} -rf %{buildroot}

%check
%{__cp} unipath/test.py .
%{__python} test.py

%files
%defattr(-, root, root, -)
%doc BUGS.txt CHANGES doc/reference/ PKG-INFO README.html README.txt 
%{python_sitelib}/unipath/
%{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info

%changelog
* Tue Apr 14 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-2
- Minor changes taken from review

* Sun Mar 29 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:10:18 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:01:33 -0000	1.2
@@ -0,0 +1 @@
+Unipath-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-unipath/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:10:18 -0000	1.1
+++ sources	14 Apr 2009 20:01:34 -0000	1.2
@@ -0,0 +1 @@
+da24f0e0d39931df3fc61f2db09d4e57  Unipath-0.2.1.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:27 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200527.7898A10F851@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:33 +0000
Subject: [pkgdb] rmol: denisarnaud has given up watchbugzilla
Message-ID: <20090414200533.E699C10F85A@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the watchbugzilla acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:36 +0000
Subject: [pkgdb] rmol: denisarnaud has given up watchcommits
Message-ID: <20090414200536.612FD10F87E@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the watchcommits acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:37 +0000
Subject: [pkgdb] rmol: denisarnaud has given up commit
Message-ID: <20090414200537.A27FC10F880@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the commit acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:38 +0000
Subject: [pkgdb] rmol: denisarnaud has given up approveacls
Message-ID: <20090414200538.67BF210F884@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the approveacls acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:49 +0000
Subject: [pkgdb] rmol: denisarnaud has given up watchbugzilla
Message-ID: <20090414200549.1F2A110F888@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the watchbugzilla acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:50 +0000
Subject: [pkgdb] rmol: denisarnaud has given up watchcommits
Message-ID: <20090414200550.0658210F87C@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the watchcommits acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:05:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:05:51 +0000
Subject: [pkgdb] rmol: denisarnaud has given up commit
Message-ID: <20090414200551.7D29910F852@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the commit acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:00 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200600.AFDC410F85A@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:01 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200601.D7B9310F87F@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:04 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200604.123FE10F882@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:04 +0000
Subject: [pkgdb] rmol: denisarnaud has given up approveacls
Message-ID: <20090414200604.A524D10F884@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the approveacls acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:05 +0000
Subject: [pkgdb] rmol: denisarnaud has given up commit
Message-ID: <20090414200605.B283B10F88C@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the commit acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:06 +0000
Subject: [pkgdb] rmol: denisarnaud has given up watchcommits
Message-ID: <20090414200606.9E58110F886@bastion2.fedora.phx.redhat.com>

denisarnaud has given up the watchcommits acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:09 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414200609.81B6B10F890@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:10 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchbugzilla
Message-ID: <20090414200609.EF85110F885@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on rmol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:11 +0000
Subject: [pkgdb] rmol: denisarnaud has requested watchcommits
Message-ID: <20090414200611.B952E10F893@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:13 +0000
Subject: [pkgdb] rmol: denisarnaud has requested commit
Message-ID: <20090414200613.6F51F10F89D@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on rmol (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:19 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200619.096BF10F888@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora 11) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:20 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200620.5666410F8A2@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora 11) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:06:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:06:23 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200623.106C310F852@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora 11) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:07:51 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200751.7D3DD10F852@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora 11) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:07:59 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200759.88DC710F87E@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora 10) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:01 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200801.541AB10F882@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora 10) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:02 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200802.4D88810F88B@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora 10) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:09 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200809.E06C510F7C2@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora 9) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:05 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200805.C171810F88E@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora 10) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:10 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200811.0383110F883@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora 9) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:13 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200813.B0FEA10F88A@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora 9) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:14 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200814.6D8D410F895@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora 9) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:18 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200818.36C8A10F886@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora EPEL 5) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:20 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200819.EFAAE10F852@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora EPEL 5) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:20 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200820.973DE10F88F@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora EPEL 5) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:08:22 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200822.3015510F899@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora EPEL 5) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:09:05 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200905.E6E5310F885@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora EPEL 4) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:09:05 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200904.EDD4D10F883@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora EPEL 4) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:09:06 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200906.B536810F89D@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora EPEL 4) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:09:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:09:09 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414200909.B2FB910F89F@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora EPEL 4) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From mclasen at fedoraproject.org  Tue Apr 14 20:10:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 20:10:35 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.36,
	1.37 gnome-doc-utils.spec, 1.64, 1.65 sources, 1.36, 1.37
Message-ID: <20090414201035.2F490700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6531

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.16.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	17 Mar 2009 02:29:21 -0000	1.36
+++ .cvsignore	14 Apr 2009 20:10:04 -0000	1.37
@@ -1 +1 @@
-gnome-doc-utils-0.16.0.tar.bz2
+gnome-doc-utils-0.16.1.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-doc-utils.spec	17 Mar 2009 02:29:21 -0000	1.64
+++ gnome-doc-utils.spec	14 Apr 2009 20:10:04 -0000	1.65
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.16.0
+Version: 0.16.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
@@ -100,6 +100,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 0.16.1-1
+- Update to 0.16.1
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 0.16.0-1
 - Update to 0.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	17 Mar 2009 02:29:21 -0000	1.36
+++ sources	14 Apr 2009 20:10:04 -0000	1.37
@@ -1 +1 @@
-45971197fd48147ee928462d5b74f234  gnome-doc-utils-0.16.0.tar.bz2
+85d4bba44773f6162de72e81e8bd0ab0  gnome-doc-utils-0.16.1.tar.bz2



From vpv at fedoraproject.org  Tue Apr 14 20:17:57 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 14 Apr 2009 20:17:57 +0000 (UTC)
Subject: rpms/vdr-skinsoppalusikka/F-10 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 vdr-skinsoppalusikka.spec, 1.10, 1.11
Message-ID: <20090414201757.61B3B700B2@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9629

Modified Files:
	.cvsignore sources vdr-skinsoppalusikka.spec 
Log Message:
* Tue Apr 14 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
- 1.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2008 21:29:07 -0000	1.8
+++ .cvsignore	14 Apr 2009 20:17:26 -0000	1.9
@@ -1 +1 @@
-vdr-skinsoppalusikka-1.6.3.tgz
+vdr-skinsoppalusikka-1.6.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2008 21:29:07 -0000	1.8
+++ sources	14 Apr 2009 20:17:26 -0000	1.9
@@ -1 +1 @@
-c42f6156615068bf4095f622009f2328  vdr-skinsoppalusikka-1.6.3.tgz
+b95beb8eb8f3fc651f0f6e50977685f1  vdr-skinsoppalusikka-1.6.4.tgz


Index: vdr-skinsoppalusikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-10/vdr-skinsoppalusikka.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vdr-skinsoppalusikka.spec	30 Nov 2008 21:30:19 -0000	1.10
+++ vdr-skinsoppalusikka.spec	14 Apr 2009 20:17:26 -0000	1.11
@@ -5,7 +5,7 @@
 
 
 Name:           vdr-%{pname}
-Version:        1.6.3
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        The "Soppalusikka" skin for VDR
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
+- 1.6.4
+
 * Sun Nov 30 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.3-1
 - 1.6.3
 



From pkgdb at fedoraproject.org  Tue Apr 14 20:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:19:46 +0000
Subject: [pkgdb] php-ezc-ConsoleTools F-11 cloned from devel
Message-ID: <20090414201946.B27A810F852@bastion2.fedora.phx.redhat.com>

toshio cloned php-ezc-ConsoleTools F-11 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-ConsoleTools



From mclasen at fedoraproject.org  Tue Apr 14 20:20:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 20:20:11 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel .cvsignore, 1.8,
	1.9 gnome-devel-docs.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20090414202011.BBCCD700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9905

Modified Files:
	.cvsignore gnome-devel-docs.spec sources 
Log Message:
2.26.12.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Mar 2009 20:18:11 -0000	1.8
+++ .cvsignore	14 Apr 2009 20:19:41 -0000	1.9
@@ -1 +1 @@
-gnome-devel-docs-2.26.0.tar.bz2
+gnome-devel-docs-2.26.1.tar.bz2


Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-devel-docs.spec	16 Mar 2009 20:18:11 -0000	1.11
+++ gnome-devel-docs.spec	14 Apr 2009 20:19:41 -0000	1.12
@@ -1,6 +1,6 @@
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
-Version: 2.26.0
+Version: 2.26.1
 Release: 1%{?dist}
 License: GFDL
 Group: System Environment/Libraries
@@ -51,6 +51,9 @@
 %{_datadir}/omf/platform-overview
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Mar 2009 20:18:11 -0000	1.8
+++ sources	14 Apr 2009 20:19:41 -0000	1.9
@@ -1 +1 @@
-122e1a90a2ff7bdea199ad9cb477c7a5  gnome-devel-docs-2.26.0.tar.bz2
+bd0ecf6d74888cd15a908b99da9877b3  gnome-devel-docs-2.26.1.tar.bz2



From rdieter at fedoraproject.org  Tue Apr 14 20:25:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 20:25:43 +0000 (UTC)
Subject: rpms/qt/F-9 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch, 
	NONE, 1.1 qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch, 
	NONE, 1.1 qt-x11-opensource-src-4.5.0-gcc_hack.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch, NONE,
	1.1 qt.spec, 1.194, 1.195
Message-ID: <20090414202543.9A984700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11856/F-9

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
	qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch 
	qt-x11-opensource-src-4.5.0-gcc_hack.patch 
	qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch 
Log Message:
sync w/devel branch


qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter	2009-04-14 13:56:07.000000000 -0500
+++ qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp	2009-04-14 13:59:00.000000000 -0500
@@ -72,9 +72,9 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
-#define QT_USE_FREETYPE_LCDFILTER
-#endif
+//#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+//#define QT_USE_FREETYPE_LCDFILTER
+//#endif
 
 #ifdef QT_LINUXBASE
 #include FT_ERRORS_H

qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch ---
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h	2009-04-01 17:54:21.000000000 +0200
@@ -115,8 +115,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -127,8 +127,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h	2009-04-01 17:54:32.000000000 +0200
@@ -116,8 +116,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -128,8 +128,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }

qt-x11-opensource-src-4.5.0-gcc_hack.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-gcc_hack.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp.gcc_hack qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp
--- qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp.gcc_hack	2009-02-25 15:09:22.000000000 -0600
+++ qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp	2009-03-27 11:56:51.000000000 -0500
@@ -102,8 +102,8 @@ static QHash<void *, QByteArray> *asciiC
 // internal
 int qFindString(const QChar *haystack, int haystackLen, int from,
     const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
+//int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
+//    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
 
 
 // Unicode case-insensitive comparison

qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp
--- qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken	2009-03-25 13:42:23.000000000 -0400
+++ qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp	2009-03-25 13:58:04.000000000 -0400
@@ -488,7 +488,11 @@ QT_END_NAMESPACE
 #  include <sys/syscall.h>
 #  include <unistd.h>
 
+#if defined(QT_ARCH_IA64)
+char boilerplate[] =
+#else
 static const char boilerplate[] =
+#endif
     "This is the QtCore library version " QT_VERSION_STR "\n"
     "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
     "Contact: Qt Software Information (qt-info at nokia.com)\n"


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- qt.spec	25 Mar 2009 18:43:51 -0000	1.194
+++ qt.spec	14 Apr 2009 20:25:13 -0000	1.195
@@ -2,7 +2,7 @@
 
 # configure options
 # -no-pch disables precompiled headers, make ccache-friendly
-#define no_pch -no-pch
+%define no_pch -no-pch
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 10%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -40,12 +40,22 @@
 Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
 Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
+# hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
+Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
+# qt fails to build on ia64: http://bugzilla.redhat.com/492174
+Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
+# http://bugzilla.redhat.com/490377
+Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
+# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
+# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
+# crash with Qt 4.5
+Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
 %define qt_copy 20090325
@@ -315,9 +325,13 @@
 %patch10 -p1 -b .ppc64
 %patch11 -p1 -b .linguist-crash
 %patch12 -p1 -b .lrelease
+%patch13 -p1 -b .gcc_hack
+%patch14 -p1 -b .ia64_boilerplate
+%patch15 -p1 -b .disable_ft_lcdfilter
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
+%patch53 -p1 -b .qatomic-inline-asm
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -508,8 +522,8 @@
 
 # qt4.(sh|csh), currently unused
 %if 0
-install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
+install -p -m644 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
+install -p -m644 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
 sed -i \
   -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \
   -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \
@@ -798,6 +812,18 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
+- fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
+
+* Fri Apr 10 2009 Than Ngo <than at redhat.com> - 4.5.0-13
+- unneeded executable permissions for profile.d scripts
+
+* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-12
+- fix inline asm in qatomic (de)ref (i386/x86_64), should fix Kolourpaint crash
+
+* Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-11
+- qt fails to build on ia64 (#492174)
+
 * Fri Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-10
 - qt-copy-patches-20090325
 



From rdieter at fedoraproject.org  Tue Apr 14 20:25:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 14 Apr 2009 20:25:44 +0000 (UTC)
Subject: rpms/qt/F-10 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch,
	NONE, 1.1 qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch,
	NONE, 1.1 qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch,
	NONE, 1.1 qt.spec, 1.223, 1.224
Message-ID: <20090414202544.5F19F700B2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11856/F-10

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
	qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch 
	qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch 
Log Message:
sync w/devel branch


qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter	2009-04-14 13:56:07.000000000 -0500
+++ qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp	2009-04-14 13:59:00.000000000 -0500
@@ -72,9 +72,9 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
-#define QT_USE_FREETYPE_LCDFILTER
-#endif
+//#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+//#define QT_USE_FREETYPE_LCDFILTER
+//#endif
 
 #ifdef QT_LINUXBASE
 #include FT_ERRORS_H

qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch ---
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h	2009-04-01 17:54:21.000000000 +0200
@@ -115,8 +115,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -127,8 +127,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h	2009-04-01 17:54:32.000000000 +0200
@@ -116,8 +116,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -128,8 +128,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }

qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp
--- qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken	2009-03-25 13:42:23.000000000 -0400
+++ qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp	2009-03-25 13:58:04.000000000 -0400
@@ -488,7 +488,11 @@ QT_END_NAMESPACE
 #  include <sys/syscall.h>
 #  include <unistd.h>
 
+#if defined(QT_ARCH_IA64)
+char boilerplate[] =
+#else
 static const char boilerplate[] =
+#endif
     "This is the QtCore library version " QT_VERSION_STR "\n"
     "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
     "Contact: Qt Software Information (qt-info at nokia.com)\n"


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- qt.spec	27 Mar 2009 16:59:11 -0000	1.223
+++ qt.spec	14 Apr 2009 20:25:14 -0000	1.224
@@ -2,7 +2,7 @@
 
 # configure options
 # -no-pch disables precompiled headers, make ccache-friendly
-#define no_pch -no-pch
+%define no_pch -no-pch
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 10%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,12 +42,20 @@
 Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
+# qt fails to build on ia64: http://bugzilla.redhat.com/492174
+Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
+# http://bugzilla.redhat.com/490377
+Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
+# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
+# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
+# crash with Qt 4.5
+Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
 %define qt_copy 20090325
@@ -318,9 +326,12 @@
 %patch11 -p1 -b .linguist-crash
 %patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
+%patch14 -p1 -b .ia64_boilerplate
+%patch15 -p1 -b .disable_ft_lcdfilter
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
+%patch53 -p1 -b .qatomic-inline-asm
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -511,8 +522,8 @@
 
 # qt4.(sh|csh), currently unused
 %if 0
-install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
+install -p -m644 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
+install -p -m644 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
 sed -i \
   -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \
   -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \
@@ -801,6 +812,18 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
+- fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
+
+* Fri Apr 10 2009 Than Ngo <than at redhat.com> - 4.5.0-13
+- unneeded executable permissions for profile.d scripts
+
+* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-12
+- fix inline asm in qatomic (de)ref (i386/x86_64), should fix Kolourpaint crash
+
+* Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-11
+- qt fails to build on ia64 (#492174)
+
 * Fri Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-10
 - qt-copy-patches-20090325
 



From mclasen at fedoraproject.org  Tue Apr 14 20:27:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 20:27:41 +0000 (UTC)
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.27,
	1.28 gnome-user-docs.spec, 1.40, 1.41 sources, 1.27, 1.28
Message-ID: <20090414202741.95D09700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12710

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	16 Mar 2009 20:27:19 -0000	1.27
+++ .cvsignore	14 Apr 2009 20:27:10 -0000	1.28
@@ -1 +1 @@
-gnome-user-docs-2.26.0.tar.bz2
+gnome-user-docs-2.26.1.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-user-docs.spec	16 Mar 2009 20:27:19 -0000	1.40
+++ gnome-user-docs.spec	14 Apr 2009 20:27:11 -0000	1.41
@@ -1,6 +1,6 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.26.0
+Version:        2.26.1
 Release:	1%{?dist}
 License:        GFDL
 Source:         http://download.gnome.org/sources/gnome-user-docs/2.26/gnome-user-docs-%{version}.tar.bz2
@@ -53,6 +53,9 @@
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	16 Mar 2009 20:27:19 -0000	1.27
+++ sources	14 Apr 2009 20:27:11 -0000	1.28
@@ -1 +1 @@
-3735096cf4b076696ebed217bf600190  gnome-user-docs-2.26.0.tar.bz2
+519ad5fa8e7a2ce31dd42fc2c67d824a  gnome-user-docs-2.26.1.tar.bz2



From avesh at fedoraproject.org  Tue Apr 14 20:29:09 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Tue, 14 Apr 2009 20:29:09 +0000 (UTC)
Subject: rpms/openswan/devel openswan-2.6.21-nss.patch,1.2,1.3
Message-ID: <20090414202909.C842C700B2@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13344

Modified Files:
	openswan-2.6.21-nss.patch 
Log Message:
* Tue Apr 14 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.21-4
- Updated the Openswan-NSS porting to enable nss and fipscheck by default
- fipscheck requires fipscheck-devel library


openswan-2.6.21-nss.patch:

Index: openswan-2.6.21-nss.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan-2.6.21-nss.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openswan-2.6.21-nss.patch	14 Apr 2009 19:47:16 -0000	1.2
+++ openswan-2.6.21-nss.patch	14 Apr 2009 20:29:09 -0000	1.3
@@ -4601,20 +4601,19 @@
  				    , wire_chunk_t *new
 diff -urNp openswan-2.6.21-orig/programs/pluto/plutomain.c openswan-2.6.21/programs/pluto/plutomain.c
 --- openswan-2.6.21-orig/programs/pluto/plutomain.c	2009-03-30 09:11:28.000000000 -0400
-+++ openswan-2.6.21/programs/pluto/plutomain.c	2009-04-14 13:05:03.000000000 -0400
-@@ -93,6 +93,11 @@
++++ openswan-2.6.21/programs/pluto/plutomain.c	2009-04-14 16:20:09.000000000 -0400
+@@ -93,6 +93,10 @@
  
  #ifdef HAVE_LIBNSS
  #include <nss.h>
 +#include <nspr.h>
 +#ifdef FIPS_CHECK
-+#include <openssl/fips.h>
 +#include <fipscheck.h>
 +#endif
  #endif
  
  const char *ctlbase = "/var/run/pluto";
-@@ -752,11 +757,43 @@ main(int argc, char **argv)
+@@ -752,11 +756,43 @@ main(int argc, char **argv)
      init_constants();
      pluto_init_log();
  
@@ -4658,7 +4657,7 @@
          const char *v = init_pluto_vendorid();
  	const char *vc = ipsec_version_code();
  
-@@ -781,6 +818,11 @@ main(int argc, char **argv)
+@@ -781,6 +817,11 @@ main(int argc, char **argv)
  	     */
  	    openswan_log("@(#) built on "__DATE__":" __TIME__ " by " BUILDER);
  	}
@@ -4670,7 +4669,7 @@
  
  #if defined(USE_1DES)
  	openswan_log("WARNING: 1DES is enabled");
-@@ -797,16 +839,6 @@ main(int argc, char **argv)
+@@ -797,16 +838,6 @@ main(int argc, char **argv)
      init_nat_traversal(nat_traversal, keep_alive, force_keepalive, nat_t_spf);
  #endif
  
@@ -4687,7 +4686,7 @@
      init_virtual_ip(virtual_private);
      init_rnd_pool();
      init_timer();
-@@ -843,6 +875,11 @@ main(int argc, char **argv)
+@@ -843,6 +874,11 @@ main(int argc, char **argv)
      /* loading attribute certificates (experimental) */
      load_acerts();
  
@@ -4973,8 +4972,8 @@
  <citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
 diff -urNp openswan-2.6.21-orig/programs/rsasigkey/rsasigkey.c openswan-2.6.21/programs/rsasigkey/rsasigkey.c
 --- openswan-2.6.21-orig/programs/rsasigkey/rsasigkey.c	2009-03-30 09:11:28.000000000 -0400
-+++ openswan-2.6.21/programs/rsasigkey/rsasigkey.c	2009-04-02 14:49:47.000000000 -0400
-@@ -29,9 +29,35 @@
++++ openswan-2.6.21/programs/rsasigkey/rsasigkey.c	2009-04-14 16:20:24.000000000 -0400
+@@ -29,9 +29,34 @@
  #include <getopt.h>
  #include <openswan.h>
  #include <gmp.h>
@@ -4999,7 +4998,6 @@
 +#include "oswconf.h"
 +
 +#ifdef FIPS_CHECK
-+#include <openssl/fips.h>
 +#include <fipscheck.h>
 +#endif
 +
@@ -5011,7 +5009,7 @@
   * /dev/random device is ONLY used for generating long term keys, which
   * should NEVER be done with /dev/urandom. If people use X.509, PSK or
   * even raw RSA keys generated on other systems, changing this will have
-@@ -47,8 +73,13 @@
+@@ -47,8 +72,13 @@
  /* the code in getoldkey() knows about this */
  #define	E	3		/* standard public exponent */
  
@@ -5025,7 +5023,7 @@
  struct option opts[] = {
    {"verbose",	0,	NULL,	'v',},
    {"random",	1,	NULL,	'r',},
-@@ -58,6 +89,10 @@ struct option opts[] = {
+@@ -58,6 +88,10 @@ struct option opts[] = {
    {"noopt",	0,	NULL,	'n',},
    {"help",		0,	NULL,	'h',},
    {"version",	0,	NULL,	'V',},
@@ -5036,7 +5034,7 @@
    {0,		0,	NULL,	0,}
  };
  int verbose = 0;		/* narrate the action? */
-@@ -72,7 +107,11 @@ char me[] = "ipsec rsasigkey";	/* for me
+@@ -72,7 +106,11 @@ char me[] = "ipsec rsasigkey";	/* for me
  
  /* forwards */
  int getoldkey(char *filename);
@@ -5048,7 +5046,7 @@
  void initprime(mpz_t var, int nbits, int eval);
  void initrandom(mpz_t var, int nbits);
  void getrandom(size_t nbytes, unsigned char *buf);
-@@ -81,6 +120,192 @@ char *conv(unsigned char *bits, size_t n
+@@ -81,6 +119,192 @@ char *conv(unsigned char *bits, size_t n
  char *hexout(mpz_t var);
  void report(char *msg);
  
@@ -5241,7 +5239,7 @@
  /*
   - main - mostly argument parsing
   */
-@@ -93,6 +318,10 @@ int main(int argc, char *argv[])
+@@ -93,6 +317,10 @@ int main(int argc, char *argv[])
  	int i;
  	int nbits;
  	char *oldkeyfile = NULL;
@@ -5252,7 +5250,7 @@
  
  	while ((opt = getopt_long(argc, argv, "", opts, NULL)) != EOF)
  		switch (opt) {
-@@ -120,25 +349,42 @@ int main(int argc, char *argv[])
+@@ -120,25 +348,42 @@ int main(int argc, char *argv[])
  			break;
  		case 'h':	/* help */
  			printf("Usage:\t%s\n", usage);
@@ -5295,7 +5293,7 @@
  
  	if (outputhostname[0] == '\0') {
  		i = gethostname(outputhostname, sizeof(outputhostname));
-@@ -169,7 +415,11 @@ int main(int argc, char *argv[])
+@@ -169,7 +414,11 @@ int main(int argc, char *argv[])
  		exit(1);
  	}
  
@@ -5307,7 +5305,7 @@
  	exit(0);
  }
  
-@@ -280,6 +530,145 @@ char *filename;
+@@ -280,6 +529,145 @@ char *filename;
   * keys were to be used for encryption, but for signatures there are some
   * real speed advantages.
   */
@@ -5453,7 +5451,7 @@
  void
  rsasigkey(nbits, useoldkey)
  int nbits;
-@@ -376,6 +765,9 @@ int useoldkey;			/* take primes from old
+@@ -376,6 +764,9 @@ int useoldkey;			/* take primes from old
  	printf("\tCoefficient: %s\n", hexout(coeff));
  }
  
@@ -5463,7 +5461,7 @@
  /*
   - initprime - initialize an mpz_t to a random prime of specified size
   * Efficiency tweak:  we reject candidates that are 1 higher than a multiple
-@@ -442,6 +834,7 @@ int nbits;			/* known to be a multiple o
+@@ -442,6 +833,7 @@ int nbits;			/* known to be a multiple o
  		exit(1);
  	}
  }



From vpv at fedoraproject.org  Tue Apr 14 20:30:55 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 14 Apr 2009 20:30:55 +0000 (UTC)
Subject: rpms/vdr-skinsoppalusikka/F-9 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 vdr-skinsoppalusikka.spec, 1.9, 1.10
Message-ID: <20090414203055.8A1E8700B2@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13887

Modified Files:
	.cvsignore sources vdr-skinsoppalusikka.spec 
Log Message:
* Tue Apr 14 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
- 1.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2008 21:25:06 -0000	1.8
+++ .cvsignore	14 Apr 2009 20:30:23 -0000	1.9
@@ -1 +1 @@
-vdr-skinsoppalusikka-1.6.3.tgz
+vdr-skinsoppalusikka-1.6.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2008 21:25:06 -0000	1.8
+++ sources	14 Apr 2009 20:30:24 -0000	1.9
@@ -1 +1 @@
-c42f6156615068bf4095f622009f2328  vdr-skinsoppalusikka-1.6.3.tgz
+b95beb8eb8f3fc651f0f6e50977685f1  vdr-skinsoppalusikka-1.6.4.tgz


Index: vdr-skinsoppalusikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/F-9/vdr-skinsoppalusikka.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdr-skinsoppalusikka.spec	30 Nov 2008 21:25:06 -0000	1.9
+++ vdr-skinsoppalusikka.spec	14 Apr 2009 20:30:24 -0000	1.10
@@ -5,7 +5,7 @@
 
 
 Name:           vdr-%{pname}
-Version:        1.6.3
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        The "Soppalusikka" skin for VDR
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
+- 1.6.4
+
 * Sun Nov 30 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.3-1
 - 1.6.3
 



From maxamillion at fedoraproject.org  Tue Apr 14 20:33:17 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 14 Apr 2009 20:33:17 +0000 (UTC)
Subject: rpms/ifstatus/F-10 ifstatus-1.1.0-fedora.patch, NONE,
	1.1 ifstatus-1.1.0-gcc44.patch, NONE, 1.1 ifstatus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414203317.C32EA700B2@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14772/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	ifstatus-1.1.0-fedora.patch ifstatus-1.1.0-gcc44.patch 
	ifstatus.spec import.log 
Log Message:
Initial package of ifstatus for fedora



ifstatus-1.1.0-fedora.patch:

--- NEW FILE ifstatus-1.1.0-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which honors $RPM_OPT_FLAGS by default and allows to override all makefile
variables. Using of variables as been also corrected at missing points.

--- ifstatus/Makefile			2005-07-13 03:22:03.000000000 +0200
+++ ifstatus/Makefile.fedora		2009-04-14 00:48:26.000000000 +0200
@@ -3,7 +3,7 @@
 
 GCC = g++
 LDFLAGS = -lncurses
-CFLAGS = -O2 -Wall
+CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS)
 
 BIN = ifstatus
 OBJ = BorderDecorator.o\
@@ -23,9 +23,10 @@
 	Window.o
 	
 
-INSTDIR = /usr/local/bin
-INSTALL=/usr/bin/install
-INSTALL_PARMS=-o 0 -g 0 -s -m 0755
+MKDIR := mkdir -p
+INSTDIR := /usr/local/bin
+INSTALL := /usr/bin/install
+INSTALL_PARMS := -o 0 -g 0 -s -m 0755
 
 all : ifstatus printdone
 
@@ -38,7 +39,8 @@
 clean:
 	rm -f ${BIN} *.o core *~ 
 install:
-	$(INSTALL) $(INSTALL_PARMS) ifstatus /usr/local/bin
+	$(MKDIR) $(DESTDIR)$(INSTDIR)
+	$(INSTALL) $(INSTALL_PARMS) $(BIN) $(DESTDIR)$(INSTDIR)
 
 
 

ifstatus-1.1.0-gcc44.patch:

--- NEW FILE ifstatus-1.1.0-gcc44.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which adds a few missing #include lines to not violate the C++ standards
and to build successfully with G++ version 4.3 and 4.4.

--- ifstatus/IFStatus.cc		2006-01-17 00:18:46.000000000 +0100
+++ ifstatus/IFStatus.cc.gcc44		2009-04-14 00:42:04.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "IFStatus.h"
 #include "Graph.h"
--- ifstatus/GraphDecorator.cc		2006-01-17 01:00:59.000000000 +0100
+++ ifstatus/GraphDecorator.cc.gcc44	2009-04-14 00:41:38.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
+#include <cstdlib> 
 #include "GraphDecorator.h"
 #include "Config.h"
 
--- ifstatus/Interface.cc		2006-01-17 02:48:27.000000000 +0100
+++ ifstatus/Interface.cc.gcc44		2009-04-14 00:42:23.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interface.h"
 #include "Config.h"
 
--- ifstatus/Config.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Config.cc.gcc44		2009-04-14 00:40:13.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "Config.h"
 #include "Util.h"
--- ifstatus/Email.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Email.cc.gcc44		2009-04-14 00:40:44.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Email.h"
 #include "Config.h"
 
--- ifstatus/Interfaces.cc		2006-01-16 23:45:33.000000000 +0100
+++ ifstatus/Interfaces.cc.gcc44	2009-04-14 00:42:45.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interfaces.h"
 #include "Config.h"
 #include "Util.h"


--- NEW FILE ifstatus.spec ---
Name:           ifstatus
Version:        1.1.0
Release:        4%{?dist}
Summary:        Command line real time interface graphs using ncurses

Group:          Applications/Internet
License:        GPLv2+
URL:            http://ifstatus.sourceforge.net/
Source0:        http://ifstatus.sourceforge.net/download/%{name}-v%{version}.tar.gz
Patch0:         ifstatus-1.1.0-gcc44.patch
Patch1:         ifstatus-1.1.0-fedora.patch

BuildRoot:      %{_tmppath}/%{name}-v%{version}-%{release}-buildroot

BuildRequires:  ncurses-devel

%description
IFStatus was developed for Linux users that are usually in console mode. 
It is a simple, easy to use program for displaying commonly needed / wanted 
statistics in real time about ingoing and outgoing traffic of multiple 
network interfaces that is usually hard to find, with a simple and 
effecient view. It is the substitute for PPPStatus and EthStatus projects. 

%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .fedora

%build
# The Makefile of the upstream project is non-automake and can't handle 
# the %{?smp_mflags}
make


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTDIR=%{_sbindir} INSTALL_PARMS="-m 0755"

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_sbindir}/%{name}

%changelog
* Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
- Typo in the Summary field.

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-3
- Fixed rpm group tag to match similar utilities
- Fixed build for gcc44

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-2
- Fixed rpm Group tag

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-1
- First build of ifstatus


--- NEW FILE import.log ---
ifstatus-1_1_0-4:F-10:ifstatus-1.1.0-4.src.rpm:1239740791


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:18:50 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:32:46 -0000	1.2
@@ -0,0 +1 @@
+ifstatus-v1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:18:50 -0000	1.1
+++ sources	14 Apr 2009 20:32:47 -0000	1.2
@@ -0,0 +1 @@
+f4d413f880754fd6677290160f8bc5d7  ifstatus-v1.1.0.tar.gz



From denisarnaud at fedoraproject.org  Tue Apr 14 20:34:05 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Tue, 14 Apr 2009 20:34:05 +0000 (UTC)
Subject: rpms/rmol/devel import.log, NONE, 1.1 rmol.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414203405.3395B700B2@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14554/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rmol.spec 
Log Message:
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release




--- NEW FILE import.log ---
rmol-0_19_0-1_fc10:HEAD:rmol-0.19.0-1.fc10.src.rpm:1239741024


--- NEW FILE rmol.spec ---
#
%define mydocs __tmp_docdir
#
Name:           rmol
Version:        0.19.0
Release:        1%{?dist}

Summary:        C++ library of Revenue Management and Optimisation classes and functions

Group:          System Environment/Libraries 
License:        LGPLv2
URL:            http://%{name}.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel >= 1.8
BuildRequires:  boost-devel >= 1.34
BuildRequires:  cppunit-devel >= 1.10
#Requires:       

%description
RMOL is a C++ library of Revenue Management and Optimisation classes 
and functions. Typically, that library may be used by service providers
(e.g., airlines offering flight seats, hotels offering rooms, rental car
companies offering rental days, broadcasting company offering advertisement 
slots, theaters offering seats, etc.) to help in optimising their revenues from
seat capacities.
Most of the algorithms implemented are public and documented in the following
book:
The Theory and practice of Revenue Management, by Kalyan T. Talluri and
Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7

Install the %{name} package if you need a library for high-level
revenue management functionality.

%package        devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires(post): info
Requires(preun): info

%description    devel
This package contains the header files, static libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.

%package doc
Summary:        HTML documentation for the RMOL library
Group:          Documentation
BuildArch:      noarch
BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript

%description doc
This package contains the documentation in the HTML format of the RMOL
library. The documentation is the same as at the RMOL web page.


%prep
%setup -q
# find ./doc -type f -perm 755 -exec chmod 644 {} \;
# Fix some permissions and formats
rm -f INSTALL
chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
rm -rf %{mydocs} && mkdir -p %{mydocs}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :

%preun devel 
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%{_libdir}/lib*.so.*
%{_mandir}/man3/%{name}.3.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}-ref.info.*
%{_mandir}/man1/%{name}-config.1.*

%files doc
%defattr(-,root,root,-)
%doc %{mydocs}/html
%doc AUTHORS ChangeLog COPYING NEWS README


%changelog
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:08:03 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:33:34 -0000	1.2
@@ -0,0 +1 @@
+rmol-0.19.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:08:03 -0000	1.1
+++ sources	14 Apr 2009 20:33:34 -0000	1.2
@@ -0,0 +1 @@
+6d124af07a5cea807f47acab699a38c5  rmol-0.19.0.tar.gz



From vpv at fedoraproject.org  Tue Apr 14 20:38:16 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 14 Apr 2009 20:38:16 +0000 (UTC)
Subject: rpms/moin/devel .cvsignore, 1.14, 1.15 README-rpm, 1.2,
	1.3 moin.spec, 1.24, 1.25 sources, 1.14, 1.15
Message-ID: <20090414203816.9A349700B2@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16574

Modified Files:
	.cvsignore README-rpm moin.spec sources 
Log Message:
* Tue Apr 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-1
- Update to 1.8.2
- Update README-rpm to include mod_wsgi instructions
- Fixes CVE-2008-3381



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	24 Apr 2008 09:58:38 -0000	1.14
+++ .cvsignore	14 Apr 2009 20:37:44 -0000	1.15
@@ -1 +1 @@
-moin-1.6.3.tar.gz
+moin-1.8.2.tar.gz


Index: README-rpm
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/README-rpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README-rpm	1 Sep 2005 07:47:44 -0000	1.2
+++ README-rpm	14 Apr 2009 20:37:44 -0000	1.3
@@ -1,38 +1,124 @@
-Steps to setup moin for your apache server:
+Steps to setup Moin for your Apache server
+==========================================
+
+These instructions are only an example, please refer to the upstream-supplied
+documentation files in this package, http://moinmo.in/ and
+http://code.google.com/p/modwsgi/ for more instructions on setting up Moin and
+mod_wsgi.
+
+It's very important to read the documentation in /usr/share/doc/moin-*,
+especially when upgrading to a newer version of this package! 'rpm -qd moin'
+should give a list of the documentation files in this package.
+
+Set up a wiki instance
+----------------------
+
+First you need a wiki instance, which can be set up as follows:
+
+#!/bin/sh
+DESTDIR=/var/www/mywiki
+mkdir -p $DESTDIR
+cp -a /usr/share/moin/{data,underlay,htdocs} $DESTDIR
+chown -R apache:apache $DESTDIR/{data,underlay,htdocs}
+
+These instructions also copy the htdocs directory, which includes the static
+content, such as images, themes, favicon.ico and robots.txt. You can also use
+the /usr/share/moin/htdocs directory, but that prevents you from editing the
+favicon or robots.txt or adding new themes. Another option is to symlink
+the files and directories you can use from /usr/share/moin/htdocs and only
+copy the files you need to edit.
+
+Set up Moin using mod_wsgi
+--------------------------
+
+This is the recommended way of using Moin with Apache. First install the
+mod_wsgi package from Fedora's package repository.
+
+Remember to change the line Alias /moin_static182/ "$DESTDIR/htdocs/"
+according to the Moin version. For example 182 is for Moin version 1.8.2.
+
+#!/bin/sh
+DESTDIR=/var/www/mywiki
+mkdir -p $DESTDIR/config
+cp -a /usr/share/moin/server/moin.wsgi $DESTDIR/config
+cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/config
+cat > /etc/httpd/conf.d/mywiki.conf <<EOF
+# this is for icons, css, js (and must match url_prefix from wiki config):
+Alias /moin_static182/ "$DESTDIR/htdocs/"
+<Directory "$DESTDIR/htdocs/">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+# this is the URL http://servername/mywiki/ you will use later to invoke moin:
+WSGIScriptAlias /mywiki "$DESTDIR/config/moin.wsgi"
+<Directory "$DESTDIR/config">
+    Options None
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+# The WSGI socket needs to be somewhere Apache has access to
+WSGISocketPrefix /var/run/moin-wsgi
+# in case you want your wiki under the root url (http://servername/), use this instead:
+#Alias /robots.txt $DESTDIR/htdocs/robots.txt
+#Alias /favicon.ico $DESTDIR/htdocs/favicon.ico
+#WSGIScriptAlias / $DESTDIR/config/moin.wsgi
+# create some wsgi daemons - use someuser.somegroup same as your data_dir:
+WSGIDaemonProcess moin user=apache group=apache processes=5 threads=10 maximum-requests=1000 umask=0007 display-name=wsgi-moin
+# use the daemons we defined above to process requests!
+WSGIProcessGroup moin
+# This is required if you plan to use HTTP authorization. Without it the user name won't
+# be passed to MoinMoin. 
+#WSGIPassAuthorization On
+EOF
+
+Edit /var/www/mywiki/config/moin.wsgi and add
+sys.path.insert(0, '/var/www/mywiki/config') after the comment lines.
+
+Edit /var/www/mywiki/config/wikiconfig.py to have something like the
+following (it's Python, spaces and quotes matter):
+    data_dir = '/var/www/mywiki/data/'
+    data_underlay_dir = '/var/www/mywiki/underlay/'
+
+Finally do a "service httpd restart".
+
+Set up Moin using CGI
+---------------------
+
+This is quite slow, using mod_wsgi is recommended.
+
+Remember to change the line Alias /moin_static182/ "$DESTDIR/htdocs/"
+according to the Moin version. For example 182 is for Moin version 1.8.2.
 
 #!/bin/sh
 DESTDIR=/var/www/mywiki
 mkdir -p $DESTDIR/cgi-bin
-cp -a /usr/share/moin/{data,underlay} $DESTDIR
 cp -a /usr/share/moin/server/moin.cgi $DESTDIR/cgi-bin
 cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin
-chown -R apache:apache $DESTDIR/{data,underlay}
 cat > /etc/httpd/conf.d/mywiki.conf <<EOF
 ScriptAlias /mywiki "$DESTDIR/cgi-bin/moin.cgi"
 <Directory "$DESTDIR/cgi-bin/">
-    Options Indexes FollowSymLinks ExecCGI
+    Options ExecCGI
     AllowOverride None
     Order allow,deny
     Allow from all
 </Directory>
-# To use mod_pyton disable all above, enable the following lines and
-# also change wikiconfig.py to have absolute paths for data/underlay dirs.
-#<Location /mywiki>
-#    SetHandler python-program
-#    PythonPath "['$DESTDIR/cgi-bin'] + sys.path"
-#    PythonHandler MoinMoin.request::RequestModPy.run
-#</Location>
-Alias /wiki/ "/usr/share/moin/htdocs/"
-<Directory "/usr/share/moin/htdocs/">
-    Options Indexes FollowSymLinks
+Alias /moin_static182 "$DESTDIR/htdocs/"
+<Directory "$DESTDIR/htdocs/">
+    Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
 </Directory>
 EOF
 
+Edit /etc/httpd/conf/httpd.conf to include "AddHandler cgi-script .cgi".
+Edit /var/www/mywiki/cgi-bin/wikiconfig.py to have something like the
+following (it's Python, spaces and quotes matter):
+    data_dir = '/var/www/mywiki/data/'
+    data_underlay_dir = '/var/www/mywiki/underlay/'
 
-Then edit /etc/httpd/conf/httpd.conf to include "AddHandler cgi-script .cgi"
-and edit /var/www/mywiki/cgi-bin/wikiconfig.py and finally do
-a "service httpd restart".
+Finally do a "service httpd restart".
 


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moin.spec	26 Feb 2009 02:19:21 -0000	1.24
+++ moin.spec	14 Apr 2009 20:37:45 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.6.3
-Release: 3%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
@@ -39,17 +39,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration
+%doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration docs/UPDATE.html
 %doc docs/licenses/
 %{_bindir}/moin
 %if 0%{?fedora} >= 9
 %{python_sitelib}/moin-*.egg-info/
 %endif
 %{python_sitelib}/MoinMoin/
+%{python_sitelib}/jabberbot/
 %{_datadir}/moin/
 
 
 %changelog
+* Tue Apr 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-1
+- Update to 1.8.2
+- Update README-rpm to include mod_wsgi instructions
+- Fixes CVE-2008-3381
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	24 Apr 2008 09:58:38 -0000	1.14
+++ sources	14 Apr 2009 20:37:45 -0000	1.15
@@ -1 +1 @@
-081aa0dd82b4220c8ff28a9a751bad7c  moin-1.6.3.tar.gz
+b3ced56bbe09311a7c56049423214cdb  moin-1.8.2.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 14 20:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:40:48 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414204048.2563110F87B@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchbugzilla acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:41:06 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414204106.16E4710F851@bastion2.fedora.phx.redhat.com>

denisarnaud has set the watchcommits acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:41:12 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414204112.D160C10F7C2@bastion2.fedora.phx.redhat.com>

denisarnaud has set the approveacls acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From pkgdb at fedoraproject.org  Tue Apr 14 20:41:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 20:41:10 +0000
Subject: [pkgdb] rmol had acl change status
Message-ID: <20090414204110.0824310F85A@bastion2.fedora.phx.redhat.com>

denisarnaud has set the commit acl on rmol (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rmol



From rjones at fedoraproject.org  Tue Apr 14 20:45:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 14 Apr 2009 20:45:59 +0000 (UTC)
Subject: rpms/fakechroot/devel fakechroot-scandir.patch, NONE,
	1.1 fakechroot.spec, 1.10, 1.11
Message-ID: <20090414204559.78D1870137@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/fakechroot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18936

Modified Files:
	fakechroot.spec 
Added Files:
	fakechroot-scandir.patch 
Log Message:
- Add fakechroot-scandir.patch to fix builds on Rawhide.


fakechroot-scandir.patch:

--- NEW FILE fakechroot-scandir.patch ---
Index: m4/scandir_argtypes.m4
===================================================================
--- m4/scandir_argtypes.m4	(revision 334)
+++ m4/scandir_argtypes.m4	(working copy)
@@ -12,7 +12,7 @@
  for ac_arg1 in 'const char *dir'; do
   for ac_arg2 in 'struct dirent ***namelist'; do
    for ac_arg3 in 'int(*filter)(const struct dirent *)' 'int(*filter)(struct dirent *)'; do
-    for ac_arg4 in 'int(*compar)(const void *,const void *)'; do
+    for ac_arg4 in 'int(*compar)(const void *,const void *)' 'int(*compar)(const struct dirent **, const struct dirent **)'; do
      AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
 [AC_INCLUDES_DEFAULT
@@ -46,3 +46,52 @@
 		   [Define to the type of arg 4 for `scandir'.])
 rm -f conftest*
 ])
+
+dnl  AC_FUNC_SCANDIR64_ARGTYPES
+dnl  -------------------------
+dnl  Determine the correct type to be passed to each of the `scandir64'
+dnl  function's arguments, and define those types in `SCANDIR64_TYPE_ARG1',
+dnl  `SCANDIR64_TYPE_ARG2', `SCANDIR64_TYPE_ARG3' and `SCANDIR64_TYPE_ARG4'.
+AN_FUNCTION([scandir64], [AC_FUNC_SCANDIR64_ARGTYPES])
+AC_DEFUN([AC_FUNC_SCANDIR64_ARGTYPES],
+[AC_CHECK_HEADERS(dirent.h)
+AC_CACHE_CHECK([types of arguments for scandir64],
+[ac_cv_func_scandir64_args],
+[for ac_return in 'int'; do
+ for ac_arg1 in 'const char *dir'; do
+  for ac_arg2 in 'struct dirent64 ***namelist'; do
+   for ac_arg3 in 'int(*filter)(const struct dirent64 *)' 'int(*filter)(struct dirent64 *)'; do
+    for ac_arg4 in 'int(*compar)(const void *,const void *)' 'int(*compar)(const struct dirent64 **, const struct dirent64 **)'; do
+     AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+[AC_INCLUDES_DEFAULT
+#ifdef HAVE_UNISTD_H
+#include <dirent.h>
+#endif
+],
+  	    [extern $ac_return scandir64 ($ac_arg1, $ac_arg2, $ac_arg3, $ac_arg4);])],
+	    [ac_cv_func_scandir64_args="$ac_return;$ac_arg1;$ac_arg2;$ac_arg3;$ac_arg4"; break 5])
+    done
+   done
+  done
+ done
+done
+# Provide a safe default value.
+: ${ac_cv_func_scandir64_args='(default) int;const char *dir;struct dirent64 ***namelist;int(*filter)(const struct dirent64 *);int(*compar)(const void *,const void *)'}
+])
+ac_save_IFS=$IFS; IFS=';'
+set dummy `echo "$ac_cv_func_scandir64_args" | sed 's/^(default) //' | sed 's/\*/\*/g'`
+IFS=$ac_save_IFS
+shift
+AC_DEFINE_UNQUOTED(SCANDIR64_TYPE_RETURN, $[1],
+		   [Define to the type of return value for `scandir64'.])
+AC_DEFINE_UNQUOTED(SCANDIR64_TYPE_ARG1, $[2],
+		   [Define to the type of arg 1 for `scandir64'.])
+AC_DEFINE_UNQUOTED(SCANDIR64_TYPE_ARG2, $[3],
+		   [Define to the type of arg 2 for `scandir64'.])
+AC_DEFINE_UNQUOTED(SCANDIR64_TYPE_ARG3, $[4],
+		   [Define to the type of arg 3 for `scandir64'.])
+AC_DEFINE_UNQUOTED(SCANDIR64_TYPE_ARG4, $[5],
+		   [Define to the type of arg 4 for `scandir64'.])
+rm -f conftest*
+])
Index: src/libfakechroot.c
===================================================================
--- src/libfakechroot.c	(revision 334)
+++ src/libfakechroot.c	(working copy)
@@ -512,10 +512,10 @@
 #endif
 static int     (*next_rmdir) (const char *pathname) = NULL;
 #ifdef HAVE_SCANDIR
-static int     (*next_scandir) (const char *dir, struct dirent ***namelist, SCANDIR_TYPE_ARG3, int(*compar)(const void *, const void *)) = NULL;
+static int     (*next_scandir) (SCANDIR_TYPE_ARG1, SCANDIR_TYPE_ARG2, SCANDIR_TYPE_ARG3, SCANDIR_TYPE_ARG4) = NULL;
 #endif
 #ifdef HAVE_SCANDIR64
-static int     (*next_scandir64) (const char *dir, struct dirent64 ***namelist, int(*filter)(const struct dirent64 *), int(*compar)(const void *, const void *)) = NULL;
+static int     (*next_scandir64) (SCANDIR64_TYPE_ARG1, SCANDIR64_TYPE_ARG2, SCANDIR64_TYPE_ARG3, SCANDIR64_TYPE_ARG4) = NULL;
 #endif
 #ifdef HAVE_SETXATTR
 static int     (*next_setxattr) (const char *path, const char *name, const void *value, size_t size, int flags) = NULL;
@@ -2619,7 +2619,7 @@
 
 #ifdef HAVE_SCANDIR
 /* #include <dirent.h> */
-int scandir (const char *dir, struct dirent ***namelist, SCANDIR_TYPE_ARG3, int(*compar)(const void *, const void *))
+int scandir (SCANDIR_TYPE_ARG1, SCANDIR_TYPE_ARG2, SCANDIR_TYPE_ARG3, SCANDIR_TYPE_ARG4)
 {
     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
     expand_chroot_path(dir, fakechroot_path, fakechroot_ptr, fakechroot_buf);
@@ -2631,7 +2631,7 @@
 
 #ifdef HAVE_SCANDIR64
 /* #include <dirent.h> */
-int scandir64 (const char *dir, struct dirent64 ***namelist, int(*filter)(const struct dirent64 *), int(*compar)(const void *, const void *))
+int scandir64 (SCANDIR64_TYPE_ARG1, SCANDIR64_TYPE_ARG2, SCANDIR64_TYPE_ARG3, SCANDIR64_TYPE_ARG4)
 {
     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
     expand_chroot_path(dir, fakechroot_path, fakechroot_ptr, fakechroot_buf);
Index: configure.ac
===================================================================
--- configure.ac	(revision 334)
+++ configure.ac	(working copy)
@@ -177,6 +177,7 @@
 
 AC_FUNC_READLINK_ARGTYPES
 AC_FUNC_SCANDIR_ARGTYPES
+AC_FUNC_SCANDIR64_ARGTYPES
 
 AC_CONFIG_FILES([ \
 Makefile \


Index: fakechroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakechroot/devel/fakechroot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fakechroot.spec	14 Apr 2009 05:01:18 -0000	1.10
+++ fakechroot.spec	14 Apr 2009 20:45:28 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
 Version: 2.9
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 Group: Development/Tools
 URL: http://fakechroot.alioth.debian.org/
@@ -9,6 +9,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: fakechroot-libs = %{version}-%{release}
 
+# Required for patch0:
+BuildRequires: autoconf, automake, libtool
+
+# Fix build problems with recent glibc.  Sent upstream 20090414.
+Patch0: fakechroot-scandir.patch
+
 %description
 fakechroot runs a command in an environment were is additionally
 possible to use the chroot(8) call without root privileges. This is
@@ -26,6 +32,11 @@
 %prep
 %setup -q
 
+%patch0 -p0
+
+# Patch0 updates autoconf, so rerun this:
+./autogen.sh
+
 %build
 %configure \
   --disable-dependency-tracking \
@@ -37,13 +48,6 @@
 make install DESTDIR=%{buildroot}
 
 %check
-#currently broken (reported upstream):
-#cp: cannot stat `/bin/busybox': No such file or directory
-#cp: cannot stat `/bin/csh': No such file or directory
-#...
-#FAIL: t.echoarg
-#==================================
-#1 of 1 tests failed
 make check
 
 %clean
@@ -61,6 +65,9 @@
 %{_libdir}/fakechroot/libfakechroot.so
 
 %changelog
+* Tue Apr 14 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-20
+- Add fakechroot-scandir.patch to fix builds on Rawhide.
+
 * Tue Apr 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.9-19
 - Update to 2.9.
 - Removed fakechroot-2.8-initsocketlen.patch (upstream now).



From denisarnaud at fedoraproject.org  Tue Apr 14 20:48:15 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Tue, 14 Apr 2009 20:48:15 +0000 (UTC)
Subject: rpms/rmol/F-9 import.log, NONE, 1.1 rmol.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414204815.DEC15700B2@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19981/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rmol.spec 
Log Message:
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release




--- NEW FILE import.log ---
rmol-0_19_0-1_fc10:F-9:rmol-0.19.0-1.fc10.src.rpm:1239741478


--- NEW FILE rmol.spec ---
#
%define mydocs __tmp_docdir
#
Name:           rmol
Version:        0.19.0
Release:        1%{?dist}

Summary:        C++ library of Revenue Management and Optimisation classes and functions

Group:          System Environment/Libraries 
License:        LGPLv2
URL:            http://%{name}.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel >= 1.8
BuildRequires:  boost-devel >= 1.34
BuildRequires:  cppunit-devel >= 1.10
#Requires:       

%description
RMOL is a C++ library of Revenue Management and Optimisation classes 
and functions. Typically, that library may be used by service providers
(e.g., airlines offering flight seats, hotels offering rooms, rental car
companies offering rental days, broadcasting company offering advertisement 
slots, theaters offering seats, etc.) to help in optimising their revenues from
seat capacities.
Most of the algorithms implemented are public and documented in the following
book:
The Theory and practice of Revenue Management, by Kalyan T. Talluri and
Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7

Install the %{name} package if you need a library for high-level
revenue management functionality.

%package        devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires(post): info
Requires(preun): info

%description    devel
This package contains the header files, static libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.

%package doc
Summary:        HTML documentation for the RMOL library
Group:          Documentation
BuildArch:      noarch
BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript

%description doc
This package contains the documentation in the HTML format of the RMOL
library. The documentation is the same as at the RMOL web page.


%prep
%setup -q
# find ./doc -type f -perm 755 -exec chmod 644 {} \;
# Fix some permissions and formats
rm -f INSTALL
chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
rm -rf %{mydocs} && mkdir -p %{mydocs}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :

%preun devel 
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%{_libdir}/lib*.so.*
%{_mandir}/man3/%{name}.3.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}-ref.info.*
%{_mandir}/man1/%{name}-config.1.*

%files doc
%defattr(-,root,root,-)
%doc %{mydocs}/html
%doc AUTHORS ChangeLog COPYING NEWS README


%changelog
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:08:03 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:47:44 -0000	1.2
@@ -0,0 +1 @@
+rmol-0.19.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:08:03 -0000	1.1
+++ sources	14 Apr 2009 20:47:45 -0000	1.2
@@ -0,0 +1 @@
+6d124af07a5cea807f47acab699a38c5  rmol-0.19.0.tar.gz



From jkeating at fedoraproject.org  Tue Apr 14 20:48:47 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 14 Apr 2009 20:48:47 +0000 (UTC)
Subject: fedora-release fedora-release.spec,1.72,1.72.2.1
Message-ID: <20090414204847.A76CD700B2@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20605

Modified Files:
      Tag: F-11
	fedora-release.spec 
Log Message:
Bump for preview



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.72
retrieving revision 1.72.2.1
diff -u -r1.72 -r1.72.2.1
--- fedora-release.spec	10 Mar 2009 02:12:23 -0000	1.72
+++ fedora-release.spec	14 Apr 2009 20:48:46 -0000	1.72.2.1
@@ -1,9 +1,9 @@
-%define release_name Rawhide
+%define release_name Leonidas
 %define dist_version 11
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	10.92
+Version:	10.93
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -93,6 +93,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Apr 14 2009 Jesse Keating <jkeating at redhat.com> - 10.93-1
+- Bump for F11 Preview
+- Add the release name
+
 * Mon Mar 09 2009 Jesse Keating <jkeating at redhat.com> - 10.92-1
 - Bump for F11 Beta
 - Add the (giant) F11 Test key



From denisarnaud at fedoraproject.org  Tue Apr 14 20:50:46 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Tue, 14 Apr 2009 20:50:46 +0000 (UTC)
Subject: rpms/rmol/F-10 import.log, NONE, 1.1 rmol.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414205046.BB335700B2@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21225/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rmol.spec 
Log Message:
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release




--- NEW FILE import.log ---
rmol-0_19_0-1_fc10:F-10:rmol-0.19.0-1.fc10.src.rpm:1239742169


--- NEW FILE rmol.spec ---
#
%define mydocs __tmp_docdir
#
Name:           rmol
Version:        0.19.0
Release:        1%{?dist}

Summary:        C++ library of Revenue Management and Optimisation classes and functions

Group:          System Environment/Libraries 
License:        LGPLv2
URL:            http://%{name}.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel >= 1.8
BuildRequires:  boost-devel >= 1.34
BuildRequires:  cppunit-devel >= 1.10
#Requires:       

%description
RMOL is a C++ library of Revenue Management and Optimisation classes 
and functions. Typically, that library may be used by service providers
(e.g., airlines offering flight seats, hotels offering rooms, rental car
companies offering rental days, broadcasting company offering advertisement 
slots, theaters offering seats, etc.) to help in optimising their revenues from
seat capacities.
Most of the algorithms implemented are public and documented in the following
book:
The Theory and practice of Revenue Management, by Kalyan T. Talluri and
Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7

Install the %{name} package if you need a library for high-level
revenue management functionality.

%package        devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires(post): info
Requires(preun): info

%description    devel
This package contains the header files, static libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.

%package doc
Summary:        HTML documentation for the RMOL library
Group:          Documentation
BuildArch:      noarch
BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript

%description doc
This package contains the documentation in the HTML format of the RMOL
library. The documentation is the same as at the RMOL web page.


%prep
%setup -q
# find ./doc -type f -perm 755 -exec chmod 644 {} \;
# Fix some permissions and formats
rm -f INSTALL
chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
rm -rf %{mydocs} && mkdir -p %{mydocs}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :

%preun devel 
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%{_libdir}/lib*.so.*
%{_mandir}/man3/%{name}.3.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}-ref.info.*
%{_mandir}/man1/%{name}-config.1.*

%files doc
%defattr(-,root,root,-)
%doc %{mydocs}/html
%doc AUTHORS ChangeLog COPYING NEWS README


%changelog
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:08:03 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:50:15 -0000	1.2
@@ -0,0 +1 @@
+rmol-0.19.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:08:03 -0000	1.1
+++ sources	14 Apr 2009 20:50:15 -0000	1.2
@@ -0,0 +1 @@
+6d124af07a5cea807f47acab699a38c5  rmol-0.19.0.tar.gz



From jkeating at fedoraproject.org  Tue Apr 14 20:51:52 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 14 Apr 2009 20:51:52 +0000 (UTC)
Subject: rpms/fedora-release/F-11 .cvsignore, 1.37, 1.38 fedora-release.spec,
	1.74, 1.75 sources, 1.61, 1.62
Message-ID: <20090414205152.7DF72700B2@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21619

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
Bump for preview



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	10 Mar 2009 02:19:47 -0000	1.37
+++ .cvsignore	14 Apr 2009 20:51:21 -0000	1.38
@@ -1 +1 @@
-fedora-release-10.92.tar.gz
+fedora-release-10.93.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-11/fedora-release.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- fedora-release.spec	10 Mar 2009 02:19:47 -0000	1.74
+++ fedora-release.spec	14 Apr 2009 20:51:21 -0000	1.75
@@ -1,9 +1,9 @@
-%define release_name Rawhide
+%define release_name Leonidas
 %define dist_version 11
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	10.92
+Version:	10.93
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -93,6 +93,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Apr 14 2009 Jesse Keating <jkeating at redhat.com> - 10.93-1
+- Bump for F11 Preview
+- Add the release name
+
 * Mon Mar 09 2009 Jesse Keating <jkeating at redhat.com> - 10.92-1
 - Bump for F11 Beta
 - Add the (giant) F11 Test key


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-11/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	10 Mar 2009 02:19:47 -0000	1.61
+++ sources	14 Apr 2009 20:51:21 -0000	1.62
@@ -1 +1 @@
-12ae96929f02c104e0c0ea48a5e71434  fedora-release-10.92.tar.gz
+c682e27109048a73856b4ba68f168b92  fedora-release-10.93.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 14 20:52:19 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 14 Apr 2009 20:52:19 +0000 (UTC)
Subject: rpms/ifstatus/EL-5 ifstatus-1.1.0-fedora.patch, NONE,
	1.1 ifstatus-1.1.0-gcc44.patch, NONE, 1.1 ifstatus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414205219.657F5700B2@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21864/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	ifstatus-1.1.0-fedora.patch ifstatus-1.1.0-gcc44.patch 
	ifstatus.spec import.log 
Log Message:
Initial package of ifstatus for fedora



ifstatus-1.1.0-fedora.patch:

--- NEW FILE ifstatus-1.1.0-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which honors $RPM_OPT_FLAGS by default and allows to override all makefile
variables. Using of variables as been also corrected at missing points.

--- ifstatus/Makefile			2005-07-13 03:22:03.000000000 +0200
+++ ifstatus/Makefile.fedora		2009-04-14 00:48:26.000000000 +0200
@@ -3,7 +3,7 @@
 
 GCC = g++
 LDFLAGS = -lncurses
-CFLAGS = -O2 -Wall
+CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS)
 
 BIN = ifstatus
 OBJ = BorderDecorator.o\
@@ -23,9 +23,10 @@
 	Window.o
 	
 
-INSTDIR = /usr/local/bin
-INSTALL=/usr/bin/install
-INSTALL_PARMS=-o 0 -g 0 -s -m 0755
+MKDIR := mkdir -p
+INSTDIR := /usr/local/bin
+INSTALL := /usr/bin/install
+INSTALL_PARMS := -o 0 -g 0 -s -m 0755
 
 all : ifstatus printdone
 
@@ -38,7 +39,8 @@
 clean:
 	rm -f ${BIN} *.o core *~ 
 install:
-	$(INSTALL) $(INSTALL_PARMS) ifstatus /usr/local/bin
+	$(MKDIR) $(DESTDIR)$(INSTDIR)
+	$(INSTALL) $(INSTALL_PARMS) $(BIN) $(DESTDIR)$(INSTDIR)
 
 
 

ifstatus-1.1.0-gcc44.patch:

--- NEW FILE ifstatus-1.1.0-gcc44.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which adds a few missing #include lines to not violate the C++ standards
and to build successfully with G++ version 4.3 and 4.4.

--- ifstatus/IFStatus.cc		2006-01-17 00:18:46.000000000 +0100
+++ ifstatus/IFStatus.cc.gcc44		2009-04-14 00:42:04.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "IFStatus.h"
 #include "Graph.h"
--- ifstatus/GraphDecorator.cc		2006-01-17 01:00:59.000000000 +0100
+++ ifstatus/GraphDecorator.cc.gcc44	2009-04-14 00:41:38.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
+#include <cstdlib> 
 #include "GraphDecorator.h"
 #include "Config.h"
 
--- ifstatus/Interface.cc		2006-01-17 02:48:27.000000000 +0100
+++ ifstatus/Interface.cc.gcc44		2009-04-14 00:42:23.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interface.h"
 #include "Config.h"
 
--- ifstatus/Config.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Config.cc.gcc44		2009-04-14 00:40:13.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "Config.h"
 #include "Util.h"
--- ifstatus/Email.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Email.cc.gcc44		2009-04-14 00:40:44.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Email.h"
 #include "Config.h"
 
--- ifstatus/Interfaces.cc		2006-01-16 23:45:33.000000000 +0100
+++ ifstatus/Interfaces.cc.gcc44	2009-04-14 00:42:45.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interfaces.h"
 #include "Config.h"
 #include "Util.h"


--- NEW FILE ifstatus.spec ---
Name:           ifstatus
Version:        1.1.0
Release:        4%{?dist}
Summary:        Command line real time interface graphs using ncurses

Group:          Applications/Internet
License:        GPLv2+
URL:            http://ifstatus.sourceforge.net/
Source0:        http://ifstatus.sourceforge.net/download/%{name}-v%{version}.tar.gz
Patch0:         ifstatus-1.1.0-gcc44.patch
Patch1:         ifstatus-1.1.0-fedora.patch

BuildRoot:      %{_tmppath}/%{name}-v%{version}-%{release}-buildroot

BuildRequires:  ncurses-devel

%description
IFStatus was developed for Linux users that are usually in console mode. 
It is a simple, easy to use program for displaying commonly needed / wanted 
statistics in real time about ingoing and outgoing traffic of multiple 
network interfaces that is usually hard to find, with a simple and 
effecient view. It is the substitute for PPPStatus and EthStatus projects. 

%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .fedora

%build
# The Makefile of the upstream project is non-automake and can't handle 
# the %{?smp_mflags}
make


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTDIR=%{_sbindir} INSTALL_PARMS="-m 0755"

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_sbindir}/%{name}

%changelog
* Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
- Typo in the Summary field.

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-3
- Fixed rpm group tag to match similar utilities
- Fixed build for gcc44

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-2
- Fixed rpm Group tag

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-1
- First build of ifstatus


--- NEW FILE import.log ---
ifstatus-1_1_0-4:EL-5:ifstatus-1.1.0-4.src.rpm:1239742277


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:18:50 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:51:48 -0000	1.2
@@ -0,0 +1 @@
+ifstatus-v1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:18:50 -0000	1.1
+++ sources	14 Apr 2009 20:51:48 -0000	1.2
@@ -0,0 +1 @@
+f4d413f880754fd6677290160f8bc5d7  ifstatus-v1.1.0.tar.gz



From denisarnaud at fedoraproject.org  Tue Apr 14 20:53:04 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Tue, 14 Apr 2009 20:53:04 +0000 (UTC)
Subject: rpms/rmol/F-11 import.log, NONE, 1.1 rmol.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414205304.B1356700B2@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22242/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rmol.spec 
Log Message:
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release




--- NEW FILE import.log ---
rmol-0_19_0-1_fc10:F-11:rmol-0.19.0-1.fc10.src.rpm:1239742308


--- NEW FILE rmol.spec ---
#
%define mydocs __tmp_docdir
#
Name:           rmol
Version:        0.19.0
Release:        1%{?dist}

Summary:        C++ library of Revenue Management and Optimisation classes and functions

Group:          System Environment/Libraries 
License:        LGPLv2
URL:            http://%{name}.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel >= 1.8
BuildRequires:  boost-devel >= 1.34
BuildRequires:  cppunit-devel >= 1.10
#Requires:       

%description
RMOL is a C++ library of Revenue Management and Optimisation classes 
and functions. Typically, that library may be used by service providers
(e.g., airlines offering flight seats, hotels offering rooms, rental car
companies offering rental days, broadcasting company offering advertisement 
slots, theaters offering seats, etc.) to help in optimising their revenues from
seat capacities.
Most of the algorithms implemented are public and documented in the following
book:
The Theory and practice of Revenue Management, by Kalyan T. Talluri and
Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7

Install the %{name} package if you need a library for high-level
revenue management functionality.

%package        devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires(post): info
Requires(preun): info

%description    devel
This package contains the header files, static libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.

%package doc
Summary:        HTML documentation for the RMOL library
Group:          Documentation
BuildArch:      noarch
BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript

%description doc
This package contains the documentation in the HTML format of the RMOL
library. The documentation is the same as at the RMOL web page.


%prep
%setup -q
# find ./doc -type f -perm 755 -exec chmod 644 {} \;
# Fix some permissions and formats
rm -f INSTALL
chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
rm -rf %{mydocs} && mkdir -p %{mydocs}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :

%preun devel 
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%{_libdir}/lib*.so.*
%{_mandir}/man3/%{name}.3.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}-ref.info.*
%{_mandir}/man1/%{name}-config.1.*

%files doc
%defattr(-,root,root,-)
%doc %{mydocs}/html
%doc AUTHORS ChangeLog COPYING NEWS README


%changelog
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:08:03 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:52:33 -0000	1.2
@@ -0,0 +1 @@
+rmol-0.19.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:08:03 -0000	1.1
+++ sources	14 Apr 2009 20:52:34 -0000	1.2
@@ -0,0 +1 @@
+6d124af07a5cea807f47acab699a38c5  rmol-0.19.0.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 14 20:53:37 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 14 Apr 2009 20:53:37 +0000 (UTC)
Subject: rpms/ifstatus/EL-4 ifstatus-1.1.0-fedora.patch, NONE,
	1.1 ifstatus-1.1.0-gcc44.patch, NONE, 1.1 ifstatus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414205337.D6D08700B2@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22745/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	ifstatus-1.1.0-fedora.patch ifstatus-1.1.0-gcc44.patch 
	ifstatus.spec import.log 
Log Message:
Initial package of ifstatus for fedora



ifstatus-1.1.0-fedora.patch:

--- NEW FILE ifstatus-1.1.0-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which honors $RPM_OPT_FLAGS by default and allows to override all makefile
variables. Using of variables as been also corrected at missing points.

--- ifstatus/Makefile			2005-07-13 03:22:03.000000000 +0200
+++ ifstatus/Makefile.fedora		2009-04-14 00:48:26.000000000 +0200
@@ -3,7 +3,7 @@
 
 GCC = g++
 LDFLAGS = -lncurses
-CFLAGS = -O2 -Wall
+CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS)
 
 BIN = ifstatus
 OBJ = BorderDecorator.o\
@@ -23,9 +23,10 @@
 	Window.o
 	
 
-INSTDIR = /usr/local/bin
-INSTALL=/usr/bin/install
-INSTALL_PARMS=-o 0 -g 0 -s -m 0755
+MKDIR := mkdir -p
+INSTDIR := /usr/local/bin
+INSTALL := /usr/bin/install
+INSTALL_PARMS := -o 0 -g 0 -s -m 0755
 
 all : ifstatus printdone
 
@@ -38,7 +39,8 @@
 clean:
 	rm -f ${BIN} *.o core *~ 
 install:
-	$(INSTALL) $(INSTALL_PARMS) ifstatus /usr/local/bin
+	$(MKDIR) $(DESTDIR)$(INSTDIR)
+	$(INSTALL) $(INSTALL_PARMS) $(BIN) $(DESTDIR)$(INSTDIR)
 
 
 

ifstatus-1.1.0-gcc44.patch:

--- NEW FILE ifstatus-1.1.0-gcc44.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which adds a few missing #include lines to not violate the C++ standards
and to build successfully with G++ version 4.3 and 4.4.

--- ifstatus/IFStatus.cc		2006-01-17 00:18:46.000000000 +0100
+++ ifstatus/IFStatus.cc.gcc44		2009-04-14 00:42:04.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "IFStatus.h"
 #include "Graph.h"
--- ifstatus/GraphDecorator.cc		2006-01-17 01:00:59.000000000 +0100
+++ ifstatus/GraphDecorator.cc.gcc44	2009-04-14 00:41:38.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
+#include <cstdlib> 
 #include "GraphDecorator.h"
 #include "Config.h"
 
--- ifstatus/Interface.cc		2006-01-17 02:48:27.000000000 +0100
+++ ifstatus/Interface.cc.gcc44		2009-04-14 00:42:23.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interface.h"
 #include "Config.h"
 
--- ifstatus/Config.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Config.cc.gcc44		2009-04-14 00:40:13.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "Config.h"
 #include "Util.h"
--- ifstatus/Email.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Email.cc.gcc44		2009-04-14 00:40:44.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Email.h"
 #include "Config.h"
 
--- ifstatus/Interfaces.cc		2006-01-16 23:45:33.000000000 +0100
+++ ifstatus/Interfaces.cc.gcc44	2009-04-14 00:42:45.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interfaces.h"
 #include "Config.h"
 #include "Util.h"


--- NEW FILE ifstatus.spec ---
Name:           ifstatus
Version:        1.1.0
Release:        4%{?dist}
Summary:        Command line real time interface graphs using ncurses

Group:          Applications/Internet
License:        GPLv2+
URL:            http://ifstatus.sourceforge.net/
Source0:        http://ifstatus.sourceforge.net/download/%{name}-v%{version}.tar.gz
Patch0:         ifstatus-1.1.0-gcc44.patch
Patch1:         ifstatus-1.1.0-fedora.patch

BuildRoot:      %{_tmppath}/%{name}-v%{version}-%{release}-buildroot

BuildRequires:  ncurses-devel

%description
IFStatus was developed for Linux users that are usually in console mode. 
It is a simple, easy to use program for displaying commonly needed / wanted 
statistics in real time about ingoing and outgoing traffic of multiple 
network interfaces that is usually hard to find, with a simple and 
effecient view. It is the substitute for PPPStatus and EthStatus projects. 

%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .fedora

%build
# The Makefile of the upstream project is non-automake and can't handle 
# the %{?smp_mflags}
make


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTDIR=%{_sbindir} INSTALL_PARMS="-m 0755"

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_sbindir}/%{name}

%changelog
* Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
- Typo in the Summary field.

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-3
- Fixed rpm group tag to match similar utilities
- Fixed build for gcc44

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-2
- Fixed rpm Group tag

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-1
- First build of ifstatus


--- NEW FILE import.log ---
ifstatus-1_1_0-4:EL-4:ifstatus-1.1.0-4.src.rpm:1239742370


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:18:50 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:53:06 -0000	1.2
@@ -0,0 +1 @@
+ifstatus-v1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:18:50 -0000	1.1
+++ sources	14 Apr 2009 20:53:07 -0000	1.2
@@ -0,0 +1 @@
+f4d413f880754fd6677290160f8bc5d7  ifstatus-v1.1.0.tar.gz



From ajax at fedoraproject.org  Tue Apr 14 20:55:38 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 14 Apr 2009 20:55:38 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.57, 1.58 import.log, 1.5, 
	1.6 sources, 1.52, 1.53 xorg-x11-server.spec, 1.432,
	1.433 10-x11-keymap.fdi, 1.2, NONE fedora-setup-keyboard, 1.2,
	NONE xserver-1.4.99-alloca-poison.patch, 1.1,
	NONE xserver-1.6.0-XATOM_FLOAT.patch, 1.1,
	NONE xserver-1.6.0-XIPropToInt.patch, 1.1,
	NONE xserver-1.6.0-preferred-thinko.patch, 1.1,
	NONE xserver-1.6.0-selinux-destroy.patch, 1.1,
	NONE xserver-1.6.0-selinux-nlfd.patch, 1.1,
	NONE xserver-1.6.0-selinux-raw.patch, 1.1,
	NONE xserver-1.6.0-xtest-pointerscreen.patch, 1.1, NONE
Message-ID: <20090414205538.41E21700B2@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23808/devel

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec 
Removed Files:
	10-x11-keymap.fdi fedora-setup-keyboard 
	xserver-1.4.99-alloca-poison.patch 
	xserver-1.6.0-XATOM_FLOAT.patch 
	xserver-1.6.0-XIPropToInt.patch 
	xserver-1.6.0-preferred-thinko.patch 
	xserver-1.6.0-selinux-destroy.patch 
	xserver-1.6.0-selinux-nlfd.patch 
	xserver-1.6.0-selinux-raw.patch 
	xserver-1.6.0-xtest-pointerscreen.patch 
Log Message:
xserver 1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	25 Feb 2009 20:37:02 -0000	1.57
+++ .cvsignore	14 Apr 2009 20:55:05 -0000	1.58
@@ -1 +1 @@
-xorg-server-1.6.0.tar.bz2
+xorg-server-1.6.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	25 Feb 2009 20:37:02 -0000	1.5
+++ import.log	14 Apr 2009 20:55:05 -0000	1.6
@@ -3,3 +3,4 @@
 xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x11-server-1.5.2-1.fc10.src.rpm:1223667007
 xorg-x11-server-1_5_3-1_fc10:HEAD:xorg-x11-server-1.5.3-1.fc10.src.rpm:1225918317
 xorg-x11-server-1_6_0-1_fc11:HEAD:xorg-x11-server-1.6.0-1.fc11.src.rpm:1235594175
+xorg-x11-server-1_6_1-1_fc11:HEAD:xorg-x11-server-1.6.1-1.fc11.src.rpm:1239742477


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	25 Feb 2009 20:37:02 -0000	1.52
+++ sources	14 Apr 2009 20:55:05 -0000	1.53
@@ -1 +1 @@
-aafe73f5807ce8bb534727ecb72467c7  xorg-server-1.6.0.tar.bz2
+ed0878bf32a24d4948c3b8a122a39eff  xorg-server-1.6.1.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- xorg-x11-server.spec	13 Apr 2009 18:52:29 -0000	1.432
+++ xorg-x11-server.spec	14 Apr 2009 20:55:05 -0000	1.433
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.0
-Release:   20%{?dist}
+Version:   1.6.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -56,9 +56,7 @@
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
-# Trivial things to never merge upstream ever
-# Don't merge this without protecting the gccisms.
-Patch5001:  xserver-1.4.99-alloca-poison.patch
+# Trivial things to never merge upstream ever:
 # This really could be done prettier.
 Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
 
@@ -85,7 +83,7 @@
 Patch6013: xserver-1.6.0-selinux-less.patch
 
 # selinux performance hack
-Patch6014: xserver-1.6.0-selinux-nlfd.patch
+#Patch6014: xserver-1.6.0-selinux-nlfd.patch
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=20087
 Patch6015: xserver-1.5.99.902-vnc.patch
@@ -93,17 +91,9 @@
 # Make autoconfiguration chose nouveau driver for NVIDIA GPUs
 Patch6016: xserver-1.5.99.902-nouveau.patch
 
-# from master, may end up in 1.6.1.
-Patch6018: xserver-1.6.0-XIPropToInt.patch
-Patch6019: xserver-1.6.0-XATOM_FLOAT.patch
-Patch6020: xserver-1.6.0-preferred-thinko.patch
-Patch6021: xserver-1.6.0-selinux-raw.patch
 Patch6022: xserver-1.6.0-primary.patch
-Patch6023: xserver-1.6.0-selinux-destroy.patch
 
 Patch6024: xserver-1.6.0-xinerama-cursors.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=490984
-Patch6025: xserver-1.6.0-xtest-pointerscreen.patch
 # http://bugs.freedesktop.org/show_bug.cgi?id=20557
 Patch6026: xserver-1.6.0-xinerama-crashes.patch
 
@@ -543,6 +533,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 1.6.1-1
+- xserver 1.6.1
+
 * Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 1.6.0-20
 - Obsolete a bunch of input drivers. (#493221)
 


--- 10-x11-keymap.fdi DELETED ---


--- fedora-setup-keyboard DELETED ---


--- xserver-1.4.99-alloca-poison.patch DELETED ---


--- xserver-1.6.0-XATOM_FLOAT.patch DELETED ---


--- xserver-1.6.0-XIPropToInt.patch DELETED ---


--- xserver-1.6.0-preferred-thinko.patch DELETED ---


--- xserver-1.6.0-selinux-destroy.patch DELETED ---


--- xserver-1.6.0-selinux-nlfd.patch DELETED ---


--- xserver-1.6.0-selinux-raw.patch DELETED ---


--- xserver-1.6.0-xtest-pointerscreen.patch DELETED ---



From denisarnaud at fedoraproject.org  Tue Apr 14 20:56:13 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Tue, 14 Apr 2009 20:56:13 +0000 (UTC)
Subject: rpms/rmol/EL-4 import.log, NONE, 1.1 rmol.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414205613.19A60700B2@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24008/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rmol.spec 
Log Message:
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release




--- NEW FILE import.log ---
rmol-0_19_0-1_fc10:EL-4:rmol-0.19.0-1.fc10.src.rpm:1239742482


--- NEW FILE rmol.spec ---
#
%define mydocs __tmp_docdir
#
Name:           rmol
Version:        0.19.0
Release:        1%{?dist}

Summary:        C++ library of Revenue Management and Optimisation classes and functions

Group:          System Environment/Libraries 
License:        LGPLv2
URL:            http://%{name}.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel >= 1.8
BuildRequires:  boost-devel >= 1.34
BuildRequires:  cppunit-devel >= 1.10
#Requires:       

%description
RMOL is a C++ library of Revenue Management and Optimisation classes 
and functions. Typically, that library may be used by service providers
(e.g., airlines offering flight seats, hotels offering rooms, rental car
companies offering rental days, broadcasting company offering advertisement 
slots, theaters offering seats, etc.) to help in optimising their revenues from
seat capacities.
Most of the algorithms implemented are public and documented in the following
book:
The Theory and practice of Revenue Management, by Kalyan T. Talluri and
Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7

Install the %{name} package if you need a library for high-level
revenue management functionality.

%package        devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires(post): info
Requires(preun): info

%description    devel
This package contains the header files, static libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.

%package doc
Summary:        HTML documentation for the RMOL library
Group:          Documentation
BuildArch:      noarch
BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript

%description doc
This package contains the documentation in the HTML format of the RMOL
library. The documentation is the same as at the RMOL web page.


%prep
%setup -q
# find ./doc -type f -perm 755 -exec chmod 644 {} \;
# Fix some permissions and formats
rm -f INSTALL
chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
rm -rf %{mydocs} && mkdir -p %{mydocs}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :

%preun devel 
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%{_libdir}/lib*.so.*
%{_mandir}/man3/%{name}.3.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}-ref.info.*
%{_mandir}/man1/%{name}-config.1.*

%files doc
%defattr(-,root,root,-)
%doc %{mydocs}/html
%doc AUTHORS ChangeLog COPYING NEWS README


%changelog
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:08:03 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:55:42 -0000	1.2
@@ -0,0 +1 @@
+rmol-0.19.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:08:03 -0000	1.1
+++ sources	14 Apr 2009 20:55:42 -0000	1.2
@@ -0,0 +1 @@
+6d124af07a5cea807f47acab699a38c5  rmol-0.19.0.tar.gz



From spot at fedoraproject.org  Tue Apr 14 20:56:18 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 14 Apr 2009 20:56:18 +0000 (UTC)
Subject: rpms/openmpi/devel .cvsignore, 1.6, 1.7 openmpi.spec, 1.30,
	1.31 sources, 1.7, 1.8
Message-ID: <20090414205618.F0DE6700B2@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24096

Modified Files:
	.cvsignore openmpi.spec sources 
Log Message:
update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2007 18:34:13 -0000	1.6
+++ .cvsignore	14 Apr 2009 20:55:48 -0000	1.7
@@ -1,5 +1 @@
-openmpi-1.0.1.tar.bz2
-openmpi-1.0.2.tar.bz2
-openmpi-1.1.tar.bz2
-openmpi-1.2.3.tar.bz2
-openmpi-1.2.4.tar.bz2
+openmpi-1.3.1.tar.bz2


Index: openmpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openmpi.spec	26 Feb 2009 08:35:35 -0000	1.30
+++ openmpi.spec	14 Apr 2009 20:55:48 -0000	1.31
@@ -1,41 +1,26 @@
-Name:           openmpi
-Version:        1.2.4
-Release:        3%{?dist}
-Summary:        Open Message Passing Interface
-
-Group:          Development/Libraries
-License:        BSD
-URL:            http://www.open-mpi.org/
-Source0:       	http://www.open-mpi.org/software/ompi/v1.2/downloads/%{name}-%{version}.tar.bz2
-Source1:	openmpi.pc.in
-Source2:	openmpi.module.in
-Patch0:		openmpi-1.2.4-open.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gcc-gfortran, libtool, numactl-devel, libtorque-devel
-#BuildRequires:  libibverbs-devel, opensm-devel
+Name:			openmpi
+Version:		1.3.1
+Release:		1%{?dist}
+Summary:		Open Message Passing Interface
+Group:			Development/Libraries
+License:		BSD
+URL:			http://www.open-mpi.org/
+Source0:		http://www.open-mpi.org/software/ompi/v1.3/downloads/%{name}-%{version}.tar.bz2
+Source1:		openmpi.pc.in
+Source2:		openmpi.module.in
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:		gcc-gfortran, libtool, numactl-devel, libtorque-devel
+#BuildRequires:		libibverbs-devel, opensm-devel
 #%ifnarch ppc
-#BuildRequires:  dapl-devel
+#BuildRequires:		dapl-devel
 #%endif
-Requires(post): /sbin/ldconfig, /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Requires:	%{name}-libs = %{version}-%{release}
-
-%package libs
-Summary:	Libraries used by openmpi programs
-Group:		Development/Libraries
-Requires(post): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-
-%package devel
-Summary:        Development files for openmpi
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-Provides:	mpi-devel
-Requires(post): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
+Requires(post):		/sbin/ldconfig
+Requires(post):		%{_sbindir}/update-alternatives
+Requires(preun):	%{_sbindir}/update-alternatives
+Requires:		%{name}-libs = %{version}-%{release}
 
 %description
-Open MPI is an open source, freely available implementation of both the 
+Open MPI is an open source, freely available implementation of both the
 MPI-1 and MPI-2 standards, combining technologies and resources from
 several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in
 order to build the best MPI library available.  A completely new MPI-2
@@ -43,11 +28,41 @@
 software vendors, application developers, and computer science
 researchers. For more information, see http://www.open-mpi.org/ .
 
+%package libs
+Summary:		Libraries used by openmpi programs
+Group:			Development/Libraries
+Requires(post):		%{_sbindir}/update-alternatives
+Requires(preun):	%{_sbindir}/update-alternatives
+
 %description libs
-Contains shared libraries used by openmpi applications
+Contains shared libraries used by openmpi applications.
+
+%package devel
+Summary:		Development files for openmpi
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{version}-%{release}
+Provides:		mpi-devel = %{version}-%{release}
+Requires(post):		%{_sbindir}/update-alternatives
+Requires(preun):	%{_sbindir}/update-alternatives
 
 %description devel
-Contains development headers and libraries for openmpi
+Contains development headers and libraries for openmpi.
+
+%package vt
+Summary:		VampirTrace versions of openmpi programs
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{version}-%{release}
+
+%description vt
+VampirTrace consists of a tool set and a run-time library for instrumentation 
+and tracing of software applications. In particular, it is tailored towards 
+parallel and distributed High Performance Computing (HPC) applications.
+The instrumentation part modifies a given application in order to inject 
+additional measurement calls during run-time. The tracing part provides the 
+actual measurement functionality used by the instrumentation calls. By this 
+means, a variety of detailed performance properties can be collected and 
+recorded during run-time. This package contains the openmpi programs 
+with VampirTrace enabled.
 
 # We only compile with gcc, but other people may want other compilers.
 # Set the compiler here.
@@ -71,7 +86,7 @@
 # in default arch packages (aka, the x86_64 package).  There are, however,
 # some arches that don't support forcing *any* mode, those we just leave
 # undefined.
-%ifarch i386 ppc
+%ifarch i386 ppc sparcv9
 %define mode 32
 %define modeflag -m32
 %endif
@@ -84,7 +99,7 @@
 %ifarch s390x
 %define mode 64
 %endif
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %define mode 64
 %define modeflag -m64
 %endif
@@ -93,7 +108,7 @@
 # Usually, that means 64bit preferred over 32bit on multilib, but ppc is an
 # exception in that 32bit is preferred over 64bit.  So, the priority values
 # selected here make that happen.
-%ifarch i386 ppc64 s390
+%ifarch i386 ppc64 s390 sparc64
 %define priority 10
 %else
 %define priority 11
@@ -105,10 +120,6 @@
 
 %prep
 %setup -q
-# Kill the stack protection and fortify source stuff...it slows things down
-# and openmpi hasn't been audited for it yet
-#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//' | sed -e 's/-fstack-protector//'`
-%patch0 -p1
 
 %ifarch x86_64
 XFLAGS="-fPIC"
@@ -118,7 +129,6 @@
 	--libdir=%{_libdir}/%{mpidir} \
 	--datadir=%{_datadir}/%{mpidir}/help%{mode} \
 	--mandir=%{_datadir}/%{mpidir}/man \
-	--with-libnuma=%{_libdir} \
 	--with-threads=posix \
 	--with-tm \
 	CC=%{opt_cc} \
@@ -153,7 +163,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}
 for i in mpicc mpic++ mpicxx mpiCC mpif77 mpif90 ; do
   ln -s %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-  	${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}/$i
+	${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}/$i
 done
 # The fortran include file differs between 32/64bit environments, so make
 # two copies
@@ -178,14 +188,41 @@
 # Make the pkgconfig files
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig;
 sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc;
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/%{name}.module;
+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@DATADIR@#'%{_datadir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/%{name}.module;
 
+# Ghost files for alternatives
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpirun
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpiexec
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
+touch ${RPM_BUILD_ROOT}%{_mandir}/man1/mpirun.1.gz
+touch ${RPM_BUILD_ROOT}%{_mandir}/man1/mpiexec.1.gz
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/
+touch ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpicc
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpic++
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpiCC
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpicxx
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpif77
+touch ${RPM_BUILD_ROOT}%{_bindir}/mpif90
+
+# Clean up static libs
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/*.a
+
+# This file is corrupt, don't try to package it.
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/vampirtrace/doc/opari/lacsi01.ps.gz
+
+# Clean up long names
+pushd ${RPM_BUILD_ROOT}%{_bindir}
+for i in otfaux otfcompress otfconfig otfdump otfmerge; do
+	ln -s %{_arch}-redhat-linux-gnu-$i $i;
+done
+popd
 
 %clean
 [ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
 
 %post
-alternatives --install %{_bindir}/mpirun mpi-run %{_bindir}/orterun \
+%{_sbindir}/update-alternatives --install %{_bindir}/mpirun mpi-run %{_bindir}/orterun \
 		%{priority} \
 	--slave %{_bindir}/mpiexec mpi-exec %{_bindir}/orterun \
 	--slave %{_mandir}/man1/mpirun.1.gz mpi-run-man \
@@ -194,21 +231,25 @@
 		%{_datadir}/%{mpidir}/man/man1/orterun.1.gz
 
 %preun
-alternatives --remove mpi-run %{_bindir}/orterun
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove mpi-run %{_bindir}/orterun
+fi
 
 
 %post libs
-alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
+%{_sbindir}/update-alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
 		mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf %{priority}
 /sbin/ldconfig
 
 %preun libs
-alternatives --remove mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf
+fi
 
 %postun libs -p /sbin/ldconfig
 
 %post devel
-alternatives --install  %{_bindir}/mpicc mpicc \
+%{_sbindir}/update-alternatives --install %{_bindir}/mpicc mpicc \
 			%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
 			%{priority} \
 	--slave %{_bindir}/mpic++ mpic++ \
@@ -223,7 +264,9 @@
 		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
 
 %preun devel
-alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
+fi
 
 %postun devel -p /sbin/ldconfig
 
@@ -232,9 +275,21 @@
 %doc LICENSE README
 %config(noreplace) %{_sysconfdir}/openmpi-*
 %dir %{_datadir}/%{mpidir}
+%{_bindir}/ompi-clean
+%{_bindir}/ompi-ps
+%{_bindir}/ompi-server
+%{_bindir}/opari
+%{_bindir}/orte-clean
+%{_bindir}/orte-iof
+%{_bindir}/orte-ps
 %{_bindir}/orted
 %{_bindir}/orterun
 %{_bindir}/ompi_info
+%{_bindir}/*otf*
+%ghost %{_bindir}/mpirun
+%ghost %{_bindir}/mpiexec
+%ghost %{_mandir}/man1/mpirun.1.gz
+%ghost %{_mandir}/man1/mpiexec.1.gz
 %{_datadir}/%{mpidir}/*
 %exclude %{_datadir}/%{mpidir}/bin%{mode}
 %exclude %{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
@@ -244,6 +299,7 @@
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{mpidir}
 %dir %{_libdir}/%{mpidir}/%{name}
+%ghost %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf
 %{_libdir}/%{mpidir}/*.so.*
 %{_libdir}/%{mpidir}/%{name}/*.so
 %{_libdir}/%{mpidir}/*.conf
@@ -251,13 +307,16 @@
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-%dir %{_includedir}/%{mpidir}
-%dir %{_datadir}/%{mpidir}/bin%{mode}
-%dir %{_datadir}/%{mpidir}/man/man3
-%{_datadir}/%{mpidir}/bin%{mode}
+%ghost %{_bindir}/mpicc
+%ghost %{_bindir}/mpic++
+%ghost %{_bindir}/mpiCC
+%ghost %{_bindir}/mpicxx
+%ghost %{_bindir}/mpif77
+%ghost %{_bindir}/mpif90
+%{_datadir}/%{mpidir}/bin%{mode}/
 %{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
-%{_includedir}/%{mpidir}/*
-%{_datadir}/%{mpidir}/man/man3/*
+%{_includedir}/%{mpidir}/
+%{_datadir}/%{mpidir}/man/man3/
 %{_libdir}/%{mpidir}/*.so
 %{_libdir}/%{mpidir}/*.la
 %{_libdir}/%{mpidir}/%{name}/*.la
@@ -265,8 +324,21 @@
 %{_libdir}/%{mpidir}/*.mod
 %{_libdir}/%{mpidir}/*.module
 
+%files vt
+%defattr(-,root,root,-)
+%{_bindir}/vtcc
+%{_bindir}/vtcxx
+%{_bindir}/vtf77
+%{_bindir}/vtf90
+%{_bindir}/vtfilter
+%{_bindir}/vtunify
+%{_datadir}/vampirtrace/
+
 
 %changelog
+* Tue Apr 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-1
+- update to 1.3.1, cleanup alternatives, spec, make new vt subpackage
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -302,7 +374,7 @@
 - Integrate fixes made in RHEL4 openmpi into RHEL5 (fix a multilib conflict
   for the openmpi.module file by moving from _datadir to _libdir, make sure
   all sed replacements have the g flag so they replace all instances of
-  the marker per line, not just the first, and add a %defattr tag to the
+  the marker per line, not just the first, and add a %%defattr tag to the
   files section of the -libs package to avoid install errors about
   brewbuilder not being a user or group)
 - Resolves: bz229298
@@ -333,7 +405,7 @@
 - Split the 32bit and 64bit libs ld.so.conf.d files into two files so
   multilib or single lib installs both work properly
 - Put libs into their own package
-- Add symlinks to /usr/share/openmpi/bin%{mode} so that opal_wrapper-%{mode}
+- Add symlinks to /usr/share/openmpi/bin%%{mode} so that opal_wrapper-%%{mode}
   can be called even if it isn't the currently selected default method in
   the alternatives setup (opal_wrapper needs to be called by mpicc, mpic++,
   etc. in order to determine compile mode from argv[0]).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openmpi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Oct 2007 18:34:13 -0000	1.7
+++ sources	14 Apr 2009 20:55:48 -0000	1.8
@@ -1 +1 @@
-311b38c597f54d8d6b277225ef458666  openmpi-1.2.4.tar.bz2
+d759523b0752139872c534714d641d64  openmpi-1.3.1.tar.bz2



From denisarnaud at fedoraproject.org  Tue Apr 14 20:58:12 2009
From: denisarnaud at fedoraproject.org (Denis Arnaud)
Date: Tue, 14 Apr 2009 20:58:12 +0000 (UTC)
Subject: rpms/rmol/EL-5 import.log, NONE, 1.1 rmol.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414205812.57CB1700B2@cvs1.fedora.phx.redhat.com>

Author: denisarnaud

Update of /cvs/pkgs/rpms/rmol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25286/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rmol.spec 
Log Message:
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release




--- NEW FILE import.log ---
rmol-0_19_0-1_fc10:EL-5:rmol-0.19.0-1.fc10.src.rpm:1239742618


--- NEW FILE rmol.spec ---
#
%define mydocs __tmp_docdir
#
Name:           rmol
Version:        0.19.0
Release:        1%{?dist}

Summary:        C++ library of Revenue Management and Optimisation classes and functions

Group:          System Environment/Libraries 
License:        LGPLv2
URL:            http://%{name}.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel >= 1.8
BuildRequires:  boost-devel >= 1.34
BuildRequires:  cppunit-devel >= 1.10
#Requires:       

%description
RMOL is a C++ library of Revenue Management and Optimisation classes 
and functions. Typically, that library may be used by service providers
(e.g., airlines offering flight seats, hotels offering rooms, rental car
companies offering rental days, broadcasting company offering advertisement 
slots, theaters offering seats, etc.) to help in optimising their revenues from
seat capacities.
Most of the algorithms implemented are public and documented in the following
book:
The Theory and practice of Revenue Management, by Kalyan T. Talluri and
Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7

Install the %{name} package if you need a library for high-level
revenue management functionality.

%package        devel
Summary:        Header files, libraries and development documentation for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires(post): info
Requires(preun): info

%description    devel
This package contains the header files, static libraries and
development documentation for %{name}. If you would like to develop
programs using %{name}, you will need to install %{name}-devel.

%package doc
Summary:        HTML documentation for the RMOL library
Group:          Documentation
BuildArch:      noarch
BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript

%description doc
This package contains the documentation in the HTML format of the RMOL
library. The documentation is the same as at the RMOL web page.


%prep
%setup -q
# find ./doc -type f -perm 755 -exec chmod 644 {} \;
# Fix some permissions and formats
rm -f INSTALL
chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
rm -rf %{mydocs} && mkdir -p %{mydocs}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :

%preun devel 
if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%{_libdir}/lib*.so.*
%{_mandir}/man3/%{name}.3.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}-ref.info.*
%{_mandir}/man1/%{name}-config.1.*

%files doc
%defattr(-,root,root,-)
%doc %{mydocs}/html
%doc AUTHORS ChangeLog COPYING NEWS README


%changelog
* Sun Mar 25 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.19.0-1
- RPM release for Fedora 10

* Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:08:03 -0000	1.1
+++ .cvsignore	14 Apr 2009 20:57:41 -0000	1.2
@@ -0,0 +1 @@
+rmol-0.19.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rmol/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:08:03 -0000	1.1
+++ sources	14 Apr 2009 20:57:41 -0000	1.2
@@ -0,0 +1 @@
+6d124af07a5cea807f47acab699a38c5  rmol-0.19.0.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 14 21:00:35 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 14 Apr 2009 21:00:35 +0000 (UTC)
Subject: rpms/ifstatus/F-11 ifstatus-1.1.0-fedora.patch, NONE,
	1.1 ifstatus-1.1.0-gcc44.patch, NONE, 1.1 ifstatus.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090414210035.8BACD700B2@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25497/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	ifstatus-1.1.0-fedora.patch ifstatus-1.1.0-gcc44.patch 
	ifstatus.spec import.log 
Log Message:
Initial package of ifstatus for fedora



ifstatus-1.1.0-fedora.patch:

--- NEW FILE ifstatus-1.1.0-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which honors $RPM_OPT_FLAGS by default and allows to override all makefile
variables. Using of variables as been also corrected at missing points.

--- ifstatus/Makefile			2005-07-13 03:22:03.000000000 +0200
+++ ifstatus/Makefile.fedora		2009-04-14 00:48:26.000000000 +0200
@@ -3,7 +3,7 @@
 
 GCC = g++
 LDFLAGS = -lncurses
-CFLAGS = -O2 -Wall
+CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS)
 
 BIN = ifstatus
 OBJ = BorderDecorator.o\
@@ -23,9 +23,10 @@
 	Window.o
 	
 
-INSTDIR = /usr/local/bin
-INSTALL=/usr/bin/install
-INSTALL_PARMS=-o 0 -g 0 -s -m 0755
+MKDIR := mkdir -p
+INSTDIR := /usr/local/bin
+INSTALL := /usr/bin/install
+INSTALL_PARMS := -o 0 -g 0 -s -m 0755
 
 all : ifstatus printdone
 
@@ -38,7 +39,8 @@
 clean:
 	rm -f ${BIN} *.o core *~ 
 install:
-	$(INSTALL) $(INSTALL_PARMS) ifstatus /usr/local/bin
+	$(MKDIR) $(DESTDIR)$(INSTDIR)
+	$(INSTALL) $(INSTALL_PARMS) $(BIN) $(DESTDIR)$(INSTDIR)
 
 
 

ifstatus-1.1.0-gcc44.patch:

--- NEW FILE ifstatus-1.1.0-gcc44.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ifstatus >= 1.1.0,
which adds a few missing #include lines to not violate the C++ standards
and to build successfully with G++ version 4.3 and 4.4.

--- ifstatus/IFStatus.cc		2006-01-17 00:18:46.000000000 +0100
+++ ifstatus/IFStatus.cc.gcc44		2009-04-14 00:42:04.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "IFStatus.h"
 #include "Graph.h"
--- ifstatus/GraphDecorator.cc		2006-01-17 01:00:59.000000000 +0100
+++ ifstatus/GraphDecorator.cc.gcc44	2009-04-14 00:41:38.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
+#include <cstdlib> 
 #include "GraphDecorator.h"
 #include "Config.h"
 
--- ifstatus/Interface.cc		2006-01-17 02:48:27.000000000 +0100
+++ ifstatus/Interface.cc.gcc44		2009-04-14 00:42:23.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interface.h"
 #include "Config.h"
 
--- ifstatus/Config.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Config.cc.gcc44		2009-04-14 00:40:13.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Main.h"
 #include "Config.h"
 #include "Util.h"
--- ifstatus/Email.cc			2005-02-26 12:54:51.000000000 +0100
+++ ifstatus/Email.cc.gcc44		2009-04-14 00:40:44.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Email.h"
 #include "Config.h"
 
--- ifstatus/Interfaces.cc		2006-01-16 23:45:33.000000000 +0100
+++ ifstatus/Interfaces.cc.gcc44	2009-04-14 00:42:45.000000000 +0200
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
 #include "Interfaces.h"
 #include "Config.h"
 #include "Util.h"


--- NEW FILE ifstatus.spec ---
Name:           ifstatus
Version:        1.1.0
Release:        4%{?dist}
Summary:        Command line real time interface graphs using ncurses

Group:          Applications/Internet
License:        GPLv2+
URL:            http://ifstatus.sourceforge.net/
Source0:        http://ifstatus.sourceforge.net/download/%{name}-v%{version}.tar.gz
Patch0:         ifstatus-1.1.0-gcc44.patch
Patch1:         ifstatus-1.1.0-fedora.patch

BuildRoot:      %{_tmppath}/%{name}-v%{version}-%{release}-buildroot

BuildRequires:  ncurses-devel

%description
IFStatus was developed for Linux users that are usually in console mode. 
It is a simple, easy to use program for displaying commonly needed / wanted 
statistics in real time about ingoing and outgoing traffic of multiple 
network interfaces that is usually hard to find, with a simple and 
effecient view. It is the substitute for PPPStatus and EthStatus projects. 

%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .fedora

%build
# The Makefile of the upstream project is non-automake and can't handle 
# the %{?smp_mflags}
make


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTDIR=%{_sbindir} INSTALL_PARMS="-m 0755"

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_sbindir}/%{name}

%changelog
* Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
- Typo in the Summary field.

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-3
- Fixed rpm group tag to match similar utilities
- Fixed build for gcc44

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-2
- Fixed rpm Group tag

* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-1
- First build of ifstatus


--- NEW FILE import.log ---
ifstatus-1_1_0-4:F-11:ifstatus-1.1.0-4.src.rpm:1239742646


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Apr 2009 16:18:50 -0000	1.1
+++ .cvsignore	14 Apr 2009 21:00:33 -0000	1.2
@@ -0,0 +1 @@
+ifstatus-v1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Apr 2009 16:18:50 -0000	1.1
+++ sources	14 Apr 2009 21:00:34 -0000	1.2
@@ -0,0 +1 @@
+f4d413f880754fd6677290160f8bc5d7  ifstatus-v1.1.0.tar.gz



From mclasen at fedoraproject.org  Tue Apr 14 21:04:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 14 Apr 2009 21:04:11 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.93, 1.94 gnome-panel.spec,
	1.350, 1.351 sources, 1.96, 1.97
Message-ID: <20090414210411.385EC700B2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24471

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	17 Mar 2009 05:03:24 -0000	1.93
+++ .cvsignore	14 Apr 2009 21:03:39 -0000	1.94
@@ -1 +1 @@
-gnome-panel-2.26.0.tar.bz2
+gnome-panel-2.26.1.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- gnome-panel.spec	13 Apr 2009 19:30:49 -0000	1.350
+++ gnome-panel.spec	14 Apr 2009 21:03:40 -0000	1.351
@@ -22,8 +22,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
 
@@ -115,9 +115,6 @@
 
 Patch35: clock-wakeups.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=578859
-Patch100: gnome-panel-2.26.0-show-emblemed-icons.patch
-
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -164,7 +161,6 @@
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
-%patch100 -p1 -b .emblemed-icons
 
 libtoolize --force --copy
 
@@ -366,6 +362,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Mon Apr 13 2009 David Zeuthen <davidz at redhat.com> - 2.26.0-2
 - Handle emblemed icons (GNOME #578859)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	17 Mar 2009 05:03:24 -0000	1.96
+++ sources	14 Apr 2009 21:03:40 -0000	1.97
@@ -1 +1 @@
-27965de9b12952b22b7e232af6acb0de  gnome-panel-2.26.0.tar.bz2
+af5587b38fc8b05aeeab3e834aa6e548  gnome-panel-2.26.1.tar.bz2



From crobinso at fedoraproject.org  Tue Apr 14 21:07:30 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 14 Apr 2009 21:07:30 +0000 (UTC)
Subject: rpms/python-virtinst/devel python-virtinst.spec, 1.65,
	1.66 virtinst-0.400.3-updated-trans.patch, 1.1, 1.2
Message-ID: <20090414210730.D56C5700B2@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28315

Modified Files:
	python-virtinst.spec virtinst-0.400.3-updated-trans.patch 
Log Message:
More translation updates.



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- python-virtinst.spec	9 Apr 2009 15:13:58 -0000	1.65
+++ python-virtinst.spec	14 Apr 2009 21:06:59 -0000	1.66
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 5%{_extra_release}
+Release: 6%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -97,6 +97,9 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Tue Apr 14 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-6.fc11
+- More translation updates
+
 * Thu Apr 9 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-5.fc11
 - Don't set a keymap if user doesn't specify one (bz 487737)
 - Fix adding floppy devices (bz 493408)

virtinst-0.400.3-updated-trans.patch:

Index: virtinst-0.400.3-updated-trans.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/virtinst-0.400.3-updated-trans.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtinst-0.400.3-updated-trans.patch	9 Apr 2009 15:11:55 -0000	1.1
+++ virtinst-0.400.3-updated-trans.patch	14 Apr 2009 21:06:59 -0000	1.2
@@ -14579,3 +14579,213 @@
 -
 -#~ msgid "Unsupported virtualization type"
 -#~ msgstr "???????????????????????????"
+--- virtinst-0.400.3/po/pl.po	2009-04-14 17:00:38.516111000 -0400
++++ test/po/pl.po	2009-04-14 17:02:55.650014000 -0400
+@@ -5,8 +5,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: pl\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-09 10:38-0400\n"
+-"PO-Revision-Date: 2009-03-25 22:57+0100\n"
++"POT-Creation-Date: 2009-04-14 17:02-0400\n"
++"PO-Revision-Date: 2009-04-13 16:30+0200\n"
+ "Last-Translator: Piotr Dr??g <piotrdrag at gmail.com>\n"
+ "Language-Team: Polish <pl at li.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -63,12 +63,12 @@ msgstr "Nie mo??na znale???? u??ywalnego
+ #: virtinst/cli.py:146
+ #, python-format
+ msgid "Force flag is set but input was required. Prompt was: %s"
+-msgstr "Flaga wymuszenia jest ustawiona, ale pro??ba by??a wymagana. By??o to: %s"
++msgstr ""
+ 
+ #: virtinst/cli.py:149
+ #, python-format
+ msgid "Prompting disabled, but input was requested. Prompt was: %s"
+-msgstr "Wy????czono pro??by, ale jedna by??a wymagana. By??a to: %s"
++msgstr ""
+ 
+ #: virtinst/cli.py:169
+ #, python-format
+@@ -76,12 +76,10 @@ msgid ""
+ "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for "
+ "such prompts. Prompt was: %s"
+ msgstr ""
+-"Wy????czono pro??by, ale pytanie tak/nie zosta??o za????dane. Spr??buj --force, aby "
+-"wymusi?? \"tak\" dla takich pr????b. Pro??ba to: %s"
+ 
+ #: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108
+ msgid "ERROR: "
+-msgstr "B????D: "
++msgstr ""
+ 
+ #: virtinst/cli.py:189
+ msgid "A name is required for the virtual machine."
+@@ -94,10 +92,10 @@ msgstr "Ilo???? pami??ci dla maszyny wir
+ #: virtinst/cli.py:199
+ #, python-format
+ msgid "Installs currently require %d megs of RAM."
+-msgstr "Instalacja obecnie wymaga %d megabajt??w RAM-u."
++msgstr "Instalacja obecnie wymaga %d megabajt??w pami??ci RAM."
+ 
+ #: virtinst/cli.py:219
+-#, python-format
++#, fuzzy, python-format
+ msgid ""
+ "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
+ "on the host. This will work, but performance will be poor. Are you sure? "
+@@ -105,7 +103,6 @@ msgid ""
+ msgstr ""
+ "Poprosi??e?? o wi??cej procesor??w wirtualnych (%d) ni?? jest procesor??w "
+ "fizycznych (%d) na ho??cie. To b??dzie dzia??a??o, ale wydajno???? b??dzie s??aba. "
+-"Jeste?? pewny? (\"yes\" lub \"no\")"
+ 
+ #: virtinst/cli.py:276
+ msgid "Unknown network type "
+@@ -323,7 +320,7 @@ msgstr "Nieznany wariant systemu operacy
+ 
+ #: virtinst/Guest.py:291
+ msgid "Must specify whether graphics are enabled"
+-msgstr "Musisz okre??li??, czy grafika ma by?? w????czona"
++msgstr "Musisz okre??li??, czy grafika ma zosta?? w????czona"
+ 
+ #: virtinst/Guest.py:314
+ msgid "Graphics enabled must be True or False"
+@@ -331,7 +328,7 @@ msgstr "W????czenie grafiki musi by?? \"
+ 
+ #: virtinst/Guest.py:373
+ msgid "You must specify a valid ISO or CD-ROM location for the installation"
+-msgstr "Musisz poda?? prawid??owe po??o??enie ISO lub CD-ROM-u dla instalacji"
++msgstr "Musisz poda?? prawid??owe po??o??enie ISO lub CD-ROM dla instalacji"
+ 
+ #: virtinst/Guest.py:376
+ msgid "The specified media path does not exist."
+@@ -588,9 +585,9 @@ msgid "OpenSolaris PV kernel not found a
+ msgstr "Nie znaleziono j??dra PV OpenSolarisa w %s"
+ 
+ #: virtinst/OSDistro.py:1066
+-#, python-format
++#, fuzzy, python-format
+ msgid "OpenSolaris microroot not found at %s"
+-msgstr "Nie znaleziono microroota OpenSolarisa w %s"
++msgstr "Nie znaleziono miniroota Solarisa w %s"
+ 
+ #: virtinst/Storage.py:85
+ #, python-format
+@@ -1253,8 +1250,9 @@ msgid "This will overwrite the existing 
+ msgstr "To zast??pi istniej??c?? ??cie??k?? \"%s\"!\n"
+ 
+ #: virt-clone:115
++#, fuzzy
+ msgid "Do you really want to use this disk (yes or no)?"
+-msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")?"
++msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")"
+ 
+ #: virt-clone:120 virt-install:206
+ #, python-format
+@@ -1262,8 +1260,9 @@ msgid "Disk %s is already in use by anot
+ msgstr "Dysk %s jest ju?? u??ywany przez innego go??cia!\n"
+ 
+ #: virt-clone:121 virt-install:207
++#, fuzzy
+ msgid "Do you really want to use the disk (yes or no)? "
+-msgstr "Na pewno chcesz u??y?? dysku (\"yes\" lub \"no\")? "
++msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")"
+ 
+ #: virt-clone:148 virt-image:88 virt-install:334
+ msgid "Connect to hypervisor with URI"
+@@ -1703,12 +1702,14 @@ msgid "Error with storage parameters: %s
+ msgstr "B????d parametr??w pami??ci masowej: %s"
+ 
+ #: virt-install:214
++#, fuzzy
+ msgid " Do you really want to use the disk (yes or no)?"
+-msgstr " Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")?"
++msgstr "Na pewno chcesz u??y?? tego dysku (\"yes\" lub \"no\")"
+ 
+ #: virt-install:222
++#, fuzzy
+ msgid "Cannot use --file, --size, or --disk with --nodisks"
+-msgstr "Nie mo??na u??ywa?? --file, --size lub --disk z --nodisks"
++msgstr "Nie mo??na u??ywa?? --file, --file-size lub --disk z --nodisks"
+ 
+ #: virt-install:225
+ msgid ""
+@@ -1872,12 +1873,12 @@ msgstr ""
+ "pro??bach"
+ 
+ #: virt-install:483
++#, fuzzy
+ msgid ""
+ "Request user input for ambiguous situations. Default is false, so will "
+ "terminate if a prompt would typically be fired. "
+ msgstr ""
+-"Popro?? u??ytkownika w niejasnych sytuacjach. Domy??lnie \"fa??sz\", wi??c b??dzie "
+-"zamykane, je??li zajdzie potrzeba poproszenia. "
++"Popro?? u??ytkownika w niejasnych sytuacjach lub je??li wymagane s?? opcje."
+ 
+ #: virt-install:503
+ msgid ""
+@@ -1991,3 +1992,62 @@ msgid ""
+ msgstr ""
+ "Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n"
+ "konsol??, aby zako??czy?? proces instalacji."
++
++#~ msgid "(use --prompt to run interactively)"
++#~ msgstr "(u??yj --prompt, aby uruchomi?? interaktywnie)"
++
++#~ msgid " (Use --prompt or --force to override)"
++#~ msgstr " (U??yj --prompt lub --force, aby zast??pi??)"
++
++#~ msgid "A disk path must be specified."
++#~ msgstr "??cie??ka dysku musi zosta?? podana."
++
++#~ msgid "What would you like to use as the disk (file path)?"
++#~ msgstr "Co chcesz u??y?? jako dysk (??cie??ka do pliku)?"
++
++#~ msgid ""
++#~ "Please enter the path to the file you would like to use for storage. It "
++#~ "will have size %sGB."
++#~ msgstr ""
++#~ "Podaj ??cie??k?? do pliku, kt??rego chcesz u??y?? dla pami??ci masowej. B??dzie "
++#~ "mia?? rozmiar %sGB."
++
++#~ msgid "A size must be specified for non-existent disks."
++#~ msgstr "Rozmiar musi zosta?? podany dla nieistniej??cych dysk??w."
++
++#~ msgid "How large would you like the disk (%s) to be (in gigabytes)?"
++#~ msgstr "Jak du??y ma by?? dysk %s (w gigabajtach)?"
++
++#~ msgid "What is the name of your virtual machine?"
++#~ msgstr "Jaka jest nazwa maszyny wirtualnej?"
++
++#~ msgid "How much RAM should be allocated (in megabytes)?"
++#~ msgstr "Ile pami??ci RAM powinno zosta?? przydzielonych (w megabajtach)?"
++
++#~ msgid "Are you sure? (yes or no)"
++#~ msgstr "Jeste?? pewny? (\"yes\" lub \"no\")"
++
++#~ msgid "Didn't match keymap '%s' in keytable!"
++#~ msgstr "Nie pasuje do mapy klawiszy \"%s\" w tablicy klawiszy!"
++
++#~ msgid "A name is required for the new virtual machine."
++#~ msgstr "Nazwa nowej maszyny wirtualnej jest wymagana."
++
++#~ msgid "An original machine name or xml file is required."
++#~ msgstr "Oryginalna nazwa maszyny lub plik XML s?? wymagane."
++
++#~ msgid ""
++#~ "Would you like a fully virtualized guest (yes or no)? This will allow you "
++#~ "to run unmodified operating systems."
++#~ msgstr ""
++#~ "Czy chcesz pe??n?? wirtualizacj?? go??cia (\"yes\" lub \"no\")? Umo??liwi to "
++#~ "uruchomienie niezmodyfikowanych system??w operacyjnych."
++
++#~ msgid "Would you like to use %s acceleration? (yes or no)"
++#~ msgstr "Na pewno chcesz u??y?? akceleracji %s? (\"yes\" lub \"no\")"
++
++#~ msgid "What is the install CD-ROM/ISO or URL?"
++#~ msgstr "Jaki jest CD-ROM/ISO lub adres URL instalacji?"
++
++#~ msgid "What is the install URL?"
++#~ msgstr "Jaki jest adres URL instalacji?"



From crobinso at fedoraproject.org  Tue Apr 14 21:12:31 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 14 Apr 2009 21:12:31 +0000 (UTC)
Subject: rpms/virt-manager/devel
	virt-manager-0.7.0-update-translations.patch, 
	1.1, 1.2 virt-manager.spec, 1.50, 1.51
Message-ID: <20090414211231.91BD9700B2@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29789

Modified Files:
	virt-manager-0.7.0-update-translations.patch virt-manager.spec 
Log Message:
More translation updates.


virt-manager-0.7.0-update-translations.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 virt-manager-0.7.0-update-translations.patch
Index: virt-manager-0.7.0-update-translations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager-0.7.0-update-translations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virt-manager-0.7.0-update-translations.patch	9 Apr 2009 19:19:06 -0000	1.1
+++ virt-manager-0.7.0-update-translations.patch	14 Apr 2009 21:12:29 -0000	1.2
@@ -122619,3 +122619,9025 @@
  #~ msgid "This will permanently delete the vm \"%s,\" are you sure?"
  #~ msgstr "????????? vm???%s?????????????????????????????????????????????"
  
+--- virt-manager-0.7.0/po/es.po	2009-04-14 17:00:09.340462000 -0400
++++ test/po/es.po	2009-04-14 17:07:29.045902000 -0400
+@@ -1,5 +1,5 @@
+ # translation of es.po to Spanish
+-# SOME DESCRIPTIVE TITLE HERE.
++# Spanish translation of virt-manager.
+ # This file is distributed under the same license as the PACKAGE package.
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+ # Manuel Ospina <mospina at redhat.com>, 2006.
+@@ -8,19 +8,19 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: es\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-09 12:36-0400\n"
+-"PO-Revision-Date: 2007-06-22 11:34-0300\n"
+-"Last-Translator: Domingo Becker <beckerde at hotmail.com>\n"
+-"Language-Team: Spanish <en at li.org>\n"
++"POT-Creation-Date: 2009-04-14 17:07-0400\n"
++"PO-Revision-Date: 2009-04-12 12:09-0600\n"
++"Last-Translator: Izaac Zavaleta <izaac at fedoraproject.org>\n"
++"Language-Team: fedora spanish <fedora-trans-es at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: KBabel 1.9.1\n"
++"X-Poedit-Language: Spanish\n"
+ 
+ #: ../src/virt-manager.desktop.in.in.h:1
+ #, fuzzy
+ msgid "Manage virtual machines"
+-msgstr "Guardando M??quina Virtual"
++msgstr "Administra M??quinas Virtuales"
+ 
+ #: ../src/virt-manager.desktop.in.in.h:2 ../src/vmm-manager.glade.h:17
+ msgid "Virtual Machine Manager"
+@@ -29,196 +29,243 @@ msgstr "Administrador de M??quina Virtua
+ #: ../src/virt-manager.py.in:55
+ #, fuzzy
+ msgid "Error starting Virtual Machine Manager"
+-msgstr "Administrador de M??quina Virtual"
++msgstr "Error iniciando Administrador de M??quina Virtual"
+ 
+ #. ...the risk is we catch too much though
+ #. Damned if we do, damned if we dont :-)(
+ #: ../src/virt-manager.py.in:284
+ #, fuzzy, python-format
+ msgid "Unable to initialize GTK: %s"
+-msgstr "No se pudo iniciar GTK:"
++msgstr "No se pudo iniciar GTK: %s"
+ 
+ #: ../src/virt-manager.schemas.in.h:1
++#, fuzzy
+ msgid "Install sound device for local VM"
+-msgstr ""
++msgstr "Instalar dispositivo de sonido para M??quina Virtual local"
+ 
+ #: ../src/virt-manager.schemas.in.h:2
+ msgid "Install sound device for remote VM"
+-msgstr ""
++msgstr "Instalar dispositivo de sonido para M??quina Virtual remota"
+ 
+ #: ../src/virt-manager.schemas.in.h:3
++#, fuzzy
+ msgid "Poll cpu stats"
+-msgstr ""
++msgstr "Muestrea estad??sticas de cpu"
+ 
+ #: ../src/virt-manager.schemas.in.h:4
++#, fuzzy
+ msgid "Poll disk i/o stats"
+-msgstr ""
++msgstr "Muestrea estad??sticas de e/s de disco"
+ 
+ #: ../src/virt-manager.schemas.in.h:5
+ #, fuzzy
+ msgid "Poll memory usage stats"
+-msgstr "Uso de Memoria"
++msgstr "Muestrea estad??sticas de Uso de Memoria"
+ 
+ #: ../src/virt-manager.schemas.in.h:6
++#, fuzzy
+ msgid "Poll net i/o stats"
+-msgstr ""
++msgstr "Muestrea estad??sticas de e/s de red"
+ 
+ #: ../src/virt-manager.schemas.in.h:7
+ msgid "Show VCPU count in summary"
+-msgstr ""
++msgstr "Muestra conteo VCPU en resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:8
+ msgid "Show cpu usage in summary"
+-msgstr ""
++msgstr "Muestra uso de cpu en resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:9
+ #, fuzzy
+ msgid "Show disk I/O in summary"
+-msgstr "Tr??fico de Red"
++msgstr "Muestra resumen E/S de disco"
+ 
+ #: ../src/virt-manager.schemas.in.h:10
+ msgid "Show domain id in summary"
+-msgstr ""
++msgstr "Muestra id de dominio en resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:11
+ msgid "Show memory usage in summary"
+-msgstr ""
++msgstr "Muestra uso de memoria en resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:12
+ #, fuzzy
+ msgid "Show network I/O in summary"
+-msgstr "Tr??fico de Red"
++msgstr "Muestra E/S de red en resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:13
+ msgid "Show run state in summary"
+-msgstr ""
++msgstr "Muestra estado de ejecuci??n en resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:14
++#, fuzzy
+ msgid "Show the cpu usage field in the domain list summary view"
+-msgstr ""
++msgstr "Muestra el campo de uso de cpu en la vista de resumen lista de dominio"
+ 
+ #: ../src/virt-manager.schemas.in.h:15
++#, fuzzy
+ msgid "Show the disk I/O field in the domain list summary view"
+ msgstr ""
++"Muestra el campo de E/S de disco en la lista de dominio en vista de resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:16
++#, fuzzy
+ msgid "Show the domain id field in the domain list summary view"
+ msgstr ""
++"Muestra el campo id de dominio en la lista de dominio en vista de resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:17
++#, fuzzy
+ msgid "Show the memory usage field in the domain list summary view"
+ msgstr ""
++"Muestra el campo de uso de memoria en la lista de dominio en vista de resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:18
++#, fuzzy
+ msgid "Show the network I/O field in the domain list summary view"
+-msgstr ""
++msgstr "Muestra el campo E/S de red en la lista de dominio en vista de resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:19
++#, fuzzy
+ msgid "Show the run state field in the domain list summary view"
+ msgstr ""
++"Muestra el campo estado de ejecuci??n en la lista de dominio en vista de "
++"resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:20
++#, fuzzy
+ msgid "Show the virtual CPU count field in the domain list summary view"
+ msgstr ""
++"Muestra el campo de conteo de VCPU en la lista de dominio en vista de resumen"
+ 
+ #: ../src/virt-manager.schemas.in.h:21
+ msgid "The length of the list of URLs"
+-msgstr ""
++msgstr "El tama??o de la lista de URLs"
+ 
+ #: ../src/virt-manager.schemas.in.h:22
+ msgid "The number of samples to keep in the statistics history"
+-msgstr ""
++msgstr "El numero de muestras a conservar en el historial de estad??sticas"
+ 
+ #: ../src/virt-manager.schemas.in.h:23
++#, fuzzy
+ msgid ""
+ "The number of urls to keep in the history for the install media address page."
+ msgstr ""
++"El numero de urls a conservar en el historial la p??gina de medio de "
++"instalaci??n."
+ 
+ #: ../src/virt-manager.schemas.in.h:24
+ msgid "The statistics history length"
+-msgstr ""
++msgstr "Tama??o de historial de estad??sticas"
+ 
[...8634 lines suppressed...]
+-
+-#~ msgid "File Size Select"
+-#~ msgstr "Wyb??r rozmiaru pliku"
+-
+-#~ msgid "ISO Location Field"
+-#~ msgstr "Pole po??o??enia pliku ISO"
+-
+-#~ msgid "ISO _location:"
+-#~ msgstr "_Po??o??enie pliku ISO:"
+-
+-#~ msgid "Initial memory:"
+-#~ msgstr "Pami???? pocz??tkowa:"
+-
+-#~ msgid "Install URL Field"
+-#~ msgstr "Pole URL instalacji"
+-
+-#~ msgid "Installation media _URL:"
+-#~ msgstr "_URL no??nika instalacji:"
+-
+-#~ msgid "Installation source:"
+-#~ msgstr "??r??d??o instalacji:"
+-
+-#~ msgid ""
+-#~ "Involves hardware simulation, allowing for a greater range of virtual "
+-#~ "devices and operating systems (does not require OS modification)."
+-#~ msgstr ""
+-#~ "U??ywa symulacji sprz??towej, pozwala na u??ywanie wi??kszej ilo??ci urz??dze?? "
+-#~ "wirtualnych i system??w operacyjnych (nie wymaga modyfikacji systemu "
+-#~ "operacyjnego)."
+-
+-#~ msgid "Kernel arguments:"
+-#~ msgstr "Parametry j??dra:"
+-
+-#~ msgid "Kickstart Field"
+-#~ msgstr "Pole kickstart"
+-
+-#~ msgid "Kickstart source:"
+-#~ msgstr "??r??d??o kickstart:"
+-
+-#~ msgid ""
+-#~ "Lightweight method of virtualizing machines. Limits operating system "
+-#~ "choices because the OS must be specially modified to support "
+-#~ "paravirtualization, but performs better than fully virtualized."
+-#~ msgstr ""
+-#~ "Lekka metoda wirtualizowania maszyn. Ogranicza wyb??r system??w "
+-#~ "operacyjnych, poniewa?? system musi by?? odpowiednio zmodyfikowany, aby "
+-#~ "obs??ugiwa?? parawirtualizacj??. Jest bardziej wydajne ni?? systemy w pe??ni "
+-#~ "wirtualizowane."
+-
+-#~ msgid "Logical host CPUs:"
+-#~ msgstr "Logiczne procesory hosta:"
+-
+-#~ msgid "MAC Field"
+-#~ msgstr "Pole MAC"
+-
+-#~ msgid "Machine name:"
+-#~ msgstr "Nazwa maszyny:"
+-
+-#~ msgid "Max Mem Select"
+-#~ msgstr "Wyb??r maksymalnej ilo??ci pami??ci"
+-
+-#~ msgid "Maximum memory:"
+-#~ msgstr "Maksymalna pami????:"
+-
+-#~ msgid "Maximum virtual CPUs:"
+-#~ msgstr "Maksymalna liczba wirtualnych procesor??w:"
+-
+-#~ msgid "Media Path Select"
+-#~ msgstr "Wyb??r ??cie??ki do no??nika"
+-
+-#~ msgid "Method"
+-#~ msgstr "Metoda"
+-
+-#~ msgid "Name Field"
+-#~ msgstr "Pole nazwy"
+-
+-#~ msgid "Network Select"
+-#~ msgstr "Wyb??r sieci"
+-
+-#~ msgid "OS _Variant:"
+-#~ msgstr "_Wariant systemu operacyjnego:"
+-
+-#~ msgid "Partition Field"
+-#~ msgstr "Pole partycji"
+-
+-#~ msgid "Please choose a name for your virtual machine:"
+-#~ msgstr "Wybierz nazw?? maszyny wirtualnej:"
+-
+-#~ msgid ""
+-#~ "Please choose the operating system you will be installing on the virtual "
+-#~ "machine:"
+-#~ msgstr ""
+-#~ "Wybierz typ systemu operacyjnego, kt??ry b??dziesz instalowa?? na maszynie "
+-#~ "wirtualnej:"
+-
+-#~ msgid ""
+-#~ "Please enter the memory configuration for this virtual machine. You can "
+-#~ "specify the maximum amount of memory the virtual machine should be able "
+-#~ "to use, and optionally a lower amount to grab on startup. Warning: "
+-#~ "setting virtual machine memory too high will cause out-of-memory errors "
+-#~ "in your host domain!"
+-#~ msgstr ""
+-#~ "Podaj konfiguracj?? pami??ci dla tej maszyny wirtualnej. Mo??na poda?? "
+-#~ "maksymaln?? ilo???? pami??ci, kt??r?? maszyna wirtualna mo??e u??ywa?? oraz "
+-#~ "opcjonalnie mniejsz?? ilo???? do przechwycenia podczas uruchomienia. "
+-#~ "Ostrze??enie: ustawienie za du??ej pami??ci maszyny wirtualnej spowoduje "
+-#~ "b????dy braku pami??ci w domenie hosta!"
+-
+-#~ msgid ""
+-#~ "Please enter the number of virtual CPUs this virtual machine should start "
+-#~ "up with."
+-#~ msgstr ""
+-#~ "Podaj liczb?? wirtualnych procesor??w, z kt??r?? ta maszyna wirtualna powinna "
+-#~ "by?? uruchamiana."
+-
+-#~ msgid ""
+-#~ "Please indicate how you'd like to assign space from the host for your new "
+-#~ "virtual machine. This space will be used to install the virtual machine's "
+-#~ "operating system."
+-#~ msgstr ""
+-#~ "Wska??, jak chcesz przydzieli?? przestrze?? z hosta dla nowej maszyny "
+-#~ "wirtualnej. Ta przestrze?? zostanie u??yta do zainstalowania systemu "
+-#~ "operacyjnego w maszynie wirtualnej."
+-
+-#~ msgid ""
+-#~ "Please indicate how you'd like to connect your new virtual machine to the "
+-#~ "host network."
+-#~ msgstr "Wska??, jak chcesz po????czy?? now?? maszyn?? wirtualn?? do sieci hosta."
+-
+-#~ msgid ""
+-#~ "Please indicate where installation media is available for the operating "
+-#~ "system you would like to install on this virtual machine. Optionally you "
+-#~ "can provide the URL for a kickstart file:"
+-#~ msgstr ""
+-#~ "Wska??, gdzie jest dost??pny no??nik instalacyjny systemu operacyjnego, "
+-#~ "kt??ry chcesz zainstalowa?? na tej maszynie wirtualnej. Opcjonalnie mo??na "
+-#~ "poda?? adres URL do pliku kickstart:"
+-
+-#~ msgid ""
+-#~ "Please indicate where installation media is available for the operating "
+-#~ "system you would like to install on this virtual machine:"
+-#~ msgstr ""
+-#~ "Wska??, gdzie jest dost??pny no??nik instalacyjny systemu operacyjnego, "
+-#~ "kt??ry chcesz zainstalowa?? na tej maszynie wirtualnej:"
+-
+-#~ msgid "Set fixed MAC _address for your virtual machine?"
+-#~ msgstr "Ustawi?? sta??y _adres MAC dla maszyny wirtualnej?"
+-
+-#~ msgid "Startup Mem Select"
+-#~ msgstr "Wyb??r pami??ci pocz??tkowej"
+-
+-#~ msgid ""
+-#~ "The <b>location</b> of the files necessary for installing an operating "
+-#~ "system on the virtual machine"
+-#~ msgstr ""
+-#~ "<b>Po??o??enie</b> plik??w wymagane do zainstalowania systemu operacyjnego "
+-#~ "na maszynie wirtualnej"
+-
+-#~ msgid ""
+-#~ "This assistant will guide you through creating a new virtual machine. You "
+-#~ "will be asked for some information about the virtual machine you'd like "
+-#~ "to create, such as:"
+-#~ msgstr ""
+-#~ "Ten asystent przeprowadzi ci?? przez tworzenie nowej maszyny wirtualnej. "
+-#~ "Zastaniesz poproszony o kilka informacji o maszynie wirtualnej, kt??r?? "
+-#~ "chcesz utworzy??, takich jak:"
+-
+-#~ msgid "Virtual CPUs:"
+-#~ msgstr "Wirtualne procesory:"
+-
+-#~ msgid "Virtualization method:"
+-#~ msgstr "Metoda wirtualizacji:"
+-
+-#~ msgid ""
+-#~ "Whether the virtual machine will be <b>fully virtualized</b> or <b>para-"
+-#~ "virtualized</b>"
+-#~ msgstr ""
+-#~ "Czy maszyna wirtualna b??dzie <b>w pe??ni wirtualizowana</b>, czy "
+-#~ "<b>parawirtualizowana</b>"
+-
+-#~ msgid ""
+-#~ "You will need to choose a virtualization method for your new virtual "
+-#~ "machine:"
+-#~ msgstr "Musisz wybra?? metod?? wirtualizacji dla nowej maszyny wirtualnej:"
+-
+-#~ msgid "_ISO image location:"
+-#~ msgstr "Po??o??enie obrazu _ISO:"
+-
+-#~ msgid "_Name:"
+-#~ msgstr "_Nazwa:"
+-
+-#~ msgid "_Paravirtualized:"
+-#~ msgstr "_Parawirtualizacja:"
+-
+-#~ msgid "_Startup memory (MB):"
+-#~ msgstr "_Pami???? pocz??tkowa (MB):"
+-
+-#~ msgid "_Virtual CPUs:"
+-#~ msgstr "_Wirtualne procesory:"
++#~ "Migrowanie maszyny wirtualnej \"%s\" z %s do %s. To mo??e chwil?? zaj????."


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- virt-manager.spec	9 Apr 2009 19:19:07 -0000	1.50
+++ virt-manager.spec	14 Apr 2009 21:12:30 -0000	1.51
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.7.0
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -176,6 +176,9 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Apr 14 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-4.fc11
+- More translation updates
+
 * Thu Apr 09 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-3.fc11
 - Fix incorrect max vcpu setting in New VM wizard (bz 490466)
 - Fix some OK/Cancel button ordering issues (bz 490207)



From lennart at fedoraproject.org  Tue Apr 14 21:17:13 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 14 Apr 2009 21:17:13 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart.spec,1.13,1.14
Message-ID: <20090414211713.F23E4700B2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30985

Modified Files:
	libatasmart.spec 
Log Message:
New upstream release


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libatasmart.spec	14 Apr 2009 03:21:37 -0000	1.13
+++ libatasmart.spec	14 Apr 2009 21:16:43 -0000	1.14
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.10
+Version: 0.11
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -55,6 +55,9 @@
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
 
 %changelog
+* Tue Apr 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-1
+- New upstream release
+
 * Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.10-1
 - New upstream release
 



From lennart at fedoraproject.org  Tue Apr 14 21:20:23 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 14 Apr 2009 21:20:23 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090414212023.A123A700B2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32234

Modified Files:
	.cvsignore sources 
Log Message:
add missing tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Apr 2009 03:21:37 -0000	1.11
+++ .cvsignore	14 Apr 2009 21:19:52 -0000	1.12
@@ -1 +1 @@
-libatasmart-0.10.tar.gz
+libatasmart-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Apr 2009 03:21:37 -0000	1.11
+++ sources	14 Apr 2009 21:19:52 -0000	1.12
@@ -1 +1 @@
-9742e6b9cf29ae78c061062605dceeaf  libatasmart-0.10.tar.gz
+9bbd84aff263082795e461a078a91feb  libatasmart-0.11.tar.gz



From simo at fedoraproject.org  Tue Apr 14 21:25:07 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 14 Apr 2009 21:25:07 +0000 (UTC)
Subject: rpms/sssd/devel
	0001-Add-reconnection-code-between-the-NSS-responder-and.patch, NONE, 
	1.1 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch, 
	NONE, 1.1 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch,
	NONE, 1.1 0005-Fixing-memory-issues-in-ini-and-collection.patch,
	NONE, 1.1 sssd.conf.default, 1.2, 1.3 sssd.spec, 1.8, 1.9
Message-ID: <20090414212507.92905700B2@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1532

Modified Files:
	sssd.conf.default sssd.spec 
Added Files:
	0001-Add-reconnection-code-between-the-NSS-responder-and.patch 
	0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch 
	0004-Add-common-function-to-retrieve-comma-sep.-lists.patch 
	0005-Fixing-memory-issues-in-ini-and-collection.patch 
Log Message:
* Tue Apr 14 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-2
- Add last minute bug fixes, found in testing the package


0001-Add-reconnection-code-between-the-NSS-responder-and.patch:

--- NEW FILE 0001-Add-reconnection-code-between-the-NSS-responder-and.patch ---
>From ecd411426a6c37d842b6d390c4895f34538130cf Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 14 Apr 2009 09:24:27 -0400
Subject: [PATCH] Add reconnection code between the NSS responder and the Data provider

---
 server/responder/nss/nsssrv.c |   53 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 deletions(-)

diff --git a/server/responder/nss/nsssrv.c b/server/responder/nss/nsssrv.c
index 58b09fb..8e72a95 100644
--- a/server/responder/nss/nsssrv.c
+++ b/server/responder/nss/nsssrv.c
@@ -219,6 +219,41 @@ done:
     return ret;
 }
 
+static void nss_shutdown(struct resp_ctx *rctx)
+{
+    /* TODO: Do clean-up here */
+
+    /* Nothing left to do but exit() */
+    exit(0);
+}
+
+
+static void nss_dp_reconnect_init(struct sbus_conn_ctx *sconn, int status, void *pvt)
+{
+    int ret;
+    struct resp_ctx *rctx = talloc_get_type(pvt, struct resp_ctx);
+
+    /* Did we reconnect successfully? */
+    if (status == SBUS_RECONNECT_SUCCESS) {
+        /* Add the methods back to the new connection */
+        ret = sbus_conn_add_method_ctx(rctx->dp_ctx->scon_ctx,
+                                       rctx->dp_ctx->sm_ctx);
+        if (ret != EOK) {
+            DEBUG(0, ("Could not re-add methods on reconnection.\n"));
+            nss_shutdown(rctx);
+        }
+
+        DEBUG(1, ("Reconnected to the Data Provider.\n"));
+        return;
+    }
+
+    /* Handle failure */
+    DEBUG(0, ("Could not reconnect to data provider.\n"));
+    /* Kill the backend and let the monitor restart it */
+    nss_shutdown(rctx);
+}
+
+
 int nss_process_init(TALLOC_CTX *mem_ctx,
                      struct tevent_context *ev,
                      struct confdb_ctx *cdb)
@@ -226,7 +261,7 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
     struct sbus_method *nss_dp_methods;
     struct sss_cmd_table *nss_cmds;
     struct nss_ctx *nctx;
-    int ret;
+    int ret, max_retries;
 
     nctx = talloc_zero(mem_ctx, struct nss_ctx);
     if (!nctx) {
@@ -261,6 +296,22 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
         return ret;
     }
 
+    /* Enable automatic reconnection to the Data Provider */
+
+    /* FIXME: "retries" is too generic, either get it from a global config
+     * or specify these retries are about the sbus connections to DP */
+    ret = confdb_get_int(nctx->rctx->cdb, nctx->rctx,
+                         nctx->rctx->confdb_service_path,
+                         "retries", 3, &max_retries);
+    if (ret != EOK) {
+        DEBUG(0, ("Failed to set up automatic reconnection\n"));
+        return ret;
+    }
+
+    sbus_reconnect_init(nctx->rctx->dp_ctx->scon_ctx,
+                        max_retries,
+                        nss_dp_reconnect_init, nctx->rctx);
+
     DEBUG(1, ("NSS Initialization complete\n"));
 
     return EOK;
-- 
1.6.0.6


0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch:

--- NEW FILE 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch ---
>From ac5a54e24ac79a33ddf8320811d981b950e21e8e Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 14 Apr 2009 10:22:20 -0400
Subject: [PATCH] Make reconnection to the Data Provider a global setting

Previously, every DP client was allowed to set its own "retries"
option. This option was ambiguous, and useless. All DP clients
will now use a global option set in the services config called
"reconnection_retries"
---
 server/confdb/confdb.h              |    2 ++
 server/examples/sssd.conf           |    3 +++
 server/monitor/monitor.c            |    2 +-
 server/providers/data_provider_be.c |    4 ++--
 server/responder/nss/nsssrv.c       |    7 ++-----
 server/responder/pam/pamsrv.c       |    4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/confdb/confdb.h b/server/confdb/confdb.h
index fda584c..19614fc 100644
--- a/server/confdb/confdb.h
+++ b/server/confdb/confdb.h
@@ -32,6 +32,8 @@
 #define CONFDB_DEFAULT_CONFIG_FILE SSSD_CONF_DIR"/sssd.conf"
 #define SSSD_MIN_ID 1000
 
+#define SERVICE_CONF_ENTRY "config/services"
+
 struct confdb_ctx;
 
 typedef int (*confdb_reconf_fn) (struct confdb_ctx *cdb, void *pvt);
diff --git a/server/examples/sssd.conf b/server/examples/sssd.conf
index b9a421e..a480b54 100644
--- a/server/examples/sssd.conf
+++ b/server/examples/sssd.conf
@@ -1,6 +1,9 @@
 [services]
 description = Local Service Configuration
 activeServices = nss, dp, pam
+# Number of times services should attempt to reconnect in the
+# event of a Data Provider crash or restart before they give up
+reconnection_retries = 3
 
 [services/nss]
 description = NSS Responder Configuration
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index 69640b9..dd80830 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -558,7 +558,7 @@ int get_monitor_config(struct mt_ctx *ctx)
     }
 
     ret = confdb_get_string(ctx->cdb, ctx,
-                            "config/services", "activeServices",
+                            SERVICE_CONF_ENTRY, "activeServices",
                             NULL, &svcs);
 
     if (ret != EOK || svcs == NULL) {
diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c
index 3d824c3..6cd86e8 100644
--- a/server/providers/data_provider_be.c
+++ b/server/providers/data_provider_be.c
@@ -681,8 +681,8 @@ static int be_cli_init(struct be_ctx *ctx)
     }
 
     /* Enable automatic reconnection to the Data Provider */
-    ret = confdb_get_int(ctx->cdb, ctx, ctx->conf_path,
-                         "retries", 3, &max_retries);
+    ret = confdb_get_int(ctx->cdb, ctx, SERVICE_CONF_ENTRY,
+                         "reconnection_retries", 3, &max_retries);
     if (ret != EOK) {
         DEBUG(0, ("Failed to set up automatic reconnection\n"));
         return ret;
diff --git a/server/responder/nss/nsssrv.c b/server/responder/nss/nsssrv.c
index 8e72a95..e85e56b 100644
--- a/server/responder/nss/nsssrv.c
+++ b/server/responder/nss/nsssrv.c
@@ -297,12 +297,9 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
     }
 
     /* Enable automatic reconnection to the Data Provider */
-
-    /* FIXME: "retries" is too generic, either get it from a global config
-     * or specify these retries are about the sbus connections to DP */
     ret = confdb_get_int(nctx->rctx->cdb, nctx->rctx,
-                         nctx->rctx->confdb_service_path,
-                         "retries", 3, &max_retries);
+                         SERVICE_CONF_ENTRY,
+                         "reconnection_retries", 3, &max_retries);
     if (ret != EOK) {
         DEBUG(0, ("Failed to set up automatic reconnection\n"));
         return ret;
diff --git a/server/responder/pam/pamsrv.c b/server/responder/pam/pamsrv.c
index 1adbb14..e4ddc43 100644
--- a/server/responder/pam/pamsrv.c
+++ b/server/responder/pam/pamsrv.c
@@ -163,8 +163,8 @@ static int pam_process_init(struct main_context *main_ctx,
 
     /* FIXME: "retries" is too generic, either get it from a global config
      * or specify these retries are about the sbus connections to DP */
-    ret = confdb_get_int(rctx->cdb, rctx, rctx->confdb_service_path,
-                         "retries", 3, &max_retries);
+    ret = confdb_get_int(rctx->cdb, rctx, SERVICE_CONF_ENTRY,
+                         "reconnection_retries", 3, &max_retries);
     if (ret != EOK) {
         DEBUG(0, ("Failed to set up automatic reconnection\n"));
         return ret;
-- 
1.6.0.6


0004-Add-common-function-to-retrieve-comma-sep.-lists.patch:

--- NEW FILE 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch ---
>From 4ad7fe5e6acc87140fc29b635605af8445d2d32f Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Tue, 14 Apr 2009 11:20:30 -0400
Subject: [PATCH] Add common function to retrieve comma sep. lists

Also convert all places where we were using custom code to parse
config arguments.
And fix a copy&paste error in nss_get_config
---
 server/confdb/confdb.c        |  203 ++++++++++++++++++++++++++++++++---------
 server/confdb/confdb.h        |    4 +
 server/monitor/monitor.c      |   54 +----------
 server/responder/nss/nsssrv.c |   24 +++--
 4 files changed, 179 insertions(+), 106 deletions(-)

diff --git a/server/confdb/confdb.c b/server/confdb/confdb.c
index d3a2a08..1f642ca 100644
--- a/server/confdb/confdb.c
+++ b/server/confdb/confdb.c
@@ -36,8 +36,8 @@
 #include "ini_config.h"
 
 #define CONFDB_VERSION "1"
-#define CONFDB_BASEDN "cn=config"
-#define CONFDB_DOMAIN_BASEDN "cn=domains,"CONFDB_BASEDN
+#define CONFDB_DOMAINS_PATH "config/domains"
+#define CONFDB_DOMAIN_BASEDN "cn=domains,cn=config"
 #define CONFDB_DOMAIN_ATTR "cn"
 #define CONFDB_MPG "magicPrivateGroups"
 #define CONFDB_FQ "useFullyQualifiedNames"
@@ -121,6 +121,110 @@ done:
     return ret;
 }
 
+/* split a string into an allocated array of strings.
+ * the separator is a string, and is case-sensitive.
+ * optionally single values can be trimmed of of spaces and tabs */
+static int split_on_separator(TALLOC_CTX *mem_ctx, const char *str,
+                              char *sep, bool trim, char ***_list, int *size)
+{
+    const char *t, *p, *n;
+    size_t l, s, len;
+    char **list, **r;
+
+    if (!str || !*str || !sep || !*sep || !_list) return EINVAL;
+
+    s = strlen(sep);
+    t = str;
+
+    list = NULL;
+    l = 0;
+
+    if (trim)
+        while (*t == ' ' || *t == '\t') t++;
+
+    while (t && (p = strstr(t, sep))) {
+        len = p - t;
+        n = p + s; /* save next string starting point */
+        if (trim) {
+            while (*t == ' ' || *t == '\t') {
+                t++;
+                len--;
+                if (len == 0) break;
+            }
+            p--;
+            while (len > 0 && (*p == ' ' || *p == '\t')) {
+                len--;
+                p--;
+            }
+        }
+
+        r = talloc_realloc(mem_ctx, list, char *, l + 2);
+        if (!r) {
+            talloc_free(list);
+            return ENOMEM;
+        } else {
+            list = r;
+        }
+
+        if (len == 0) {
+            list[l] = talloc_strdup(list, "");
+        } else {
+            list[l] = talloc_strndup(list, t, len);
+        }
+        if (!list[l]) {
+            talloc_free(list);
+            return ENOMEM;
+        }
+        l++;
+
+        t = n; /* move to next string */
+    }
+
+    if (t) {
+        r = talloc_realloc(mem_ctx, list, char *, l + 2);
+        if (!r) {
+            talloc_free(list);
+            return ENOMEM;
+        } else {
+            list = r;
+        }
+
+        if (trim) {
+            len = strlen(t);
+            while (*t == ' ' || *t == '\t') {
+                t++;
+                len--;
+                if (len == 0) break;
+            }
+            p = t + len - 1;
+            while (len > 0 && (*p == ' ' || *p == '\t')) {
+                len--;
+                p--;
+            }
+
+            if (len == 0) {
+                list[l] = talloc_strdup(list, "");
+            } else {
+                list[l] = talloc_strndup(list, t, len);
+            }
+        } else {
+            list[l] = talloc_strdup(list, t);
+        }
+        if (!list[l]) {
+            talloc_free(list);
+            return ENOMEM;
+        }
+        l++;
+    }
+
+    list[l] = NULL; /* terminate list */
+
+    if (size) *size = l + 1;
+    *_list = list;
+
+    return EOK;
+}
+
 int confdb_add_param(struct confdb_ctx *cdb,
                      bool replace,
                      const char *section,
@@ -496,6 +600,43 @@ failed:
     return ret;
 }
 
+/* WARNING: Unlike other similar functions, this one does NOT take a default,
+ * and returns ENOENT if the attribute was not found ! */
+int confdb_get_string_as_list(struct confdb_ctx *cdb, TALLOC_CTX *ctx,
+                              const char *section, const char *attribute,
+                              char ***result)
+{
+    char **values = NULL;
+    int ret;
+
+    ret = confdb_get_param(cdb, ctx, section, attribute, &values);
+    if (ret != EOK) {
+        goto done;
+    }
+
+    if (values && values[0]) {
+        if (values[1] != NULL) {
+            /* too many values */
+            ret = EINVAL;
+            goto done;
+        }
+    } else {
+        /* Did not return a value */
+        ret = ENOENT;
+        goto done;
+    }
+
+    ret = split_on_separator(ctx, values[0], ",", true, result, NULL);
+
+done:
+    talloc_free(values);
+    if (ret != EOK && ret != ENOENT) {
+        DEBUG(2, ("Failed to get [%s] from [%s], error [%d] (%s)",
+                  attribute, section, ret, strerror(ret)));
+    }
+    return ret;
+}
+
 int confdb_test(struct confdb_ctx *cdb)
 {
     char **values;
@@ -948,61 +1089,33 @@ int confdb_get_domains(struct confdb_ctx *cdb,
                        struct sss_domain_info **domains)
 {
     TALLOC_CTX *tmp_ctx;
-    struct ldb_dn *dn;
-    struct ldb_result *res;
     struct sss_domain_info *domain, *prevdom;
     struct sss_domain_info *first = NULL;
-    const char *attrs[] = { "domains", NULL };
-    const char *tmp;
-    char *cur, *p, *t;
-    int ret;
+    char **domlist;
+    int ret, i;
 
     tmp_ctx = talloc_new(mem_ctx);
     if (!tmp_ctx) return ENOMEM;
 
-    dn = ldb_dn_new(tmp_ctx, cdb->ldb, CONFDB_DOMAIN_BASEDN);
-    if (!dn) {
-        ret = EIO;
-        goto done;
-    }
-
-    ret = ldb_search(cdb->ldb, tmp_ctx, &res, dn,
-                     LDB_SCOPE_BASE, attrs, NULL);
-    if (ret != LDB_SUCCESS) {
-        ret = EIO;
-        goto done;
-    }
-
-    if (res->count != 1) {
-        ret = EFAULT;
+    ret = confdb_get_string_as_list(cdb, tmp_ctx,
+                                    CONFDB_DOMAINS_PATH, "domains", &domlist);
+    if (ret == ENOENT) {
+        DEBUG(0, ("No domains configured, fatal error!\n"));
         goto done;
     }
-
-    tmp = ldb_msg_find_attr_as_string(res->msgs[0], "domains",  NULL);
-    if (!tmp) {
-        DEBUG(0, ("No domains configured, fatal error!\n"));
-        ret = EINVAL;
+    if (ret != EOK ) {
+        DEBUG(0, ("Fatal error retrieving domains list!\n"));
         goto done;
     }
-    cur = p = talloc_strdup(tmp_ctx, tmp);
 
-    while (p && *p) {
-
-        for (cur = p; (*cur == ' ' || *cur == '\t'); cur++) /* trim */ ;
-        if (!*cur) break;
-
-        p = strchr(cur, ',');
-        if (p) {
-            /* terminate element */
-            *p = '\0';
-            /* trim spaces */
-            for (t = p-1; (*t == ' ' || *t == '\t'); t--) *t = '\0';
-            p++;
+    for (i = 0; domlist[i]; i++) {
+        ret = confdb_get_domain(cdb, mem_ctx, domlist[i], &domain);
+        if (ret) {
+            DEBUG(0, ("Error (%d [%s]) retrieving domain %s, skipping!\n",
+                      ret, strerror(ret), domains[i]));
+            continue;
         }
 
-        ret = confdb_get_domain(cdb, mem_ctx, cur, &domain);
-        if (ret) goto done;
-
         if (first == NULL) {
             first = domain;
             prevdom = first;
@@ -1014,7 +1127,7 @@ int confdb_get_domains(struct confdb_ctx *cdb,
 
     if (first == NULL) {
         DEBUG(0, ("No domains configured, fatal error!\n"));
-        ret = EINVAL;
+        ret = ENOENT;
     }
 
     *domains = first;
diff --git a/server/confdb/confdb.h b/server/confdb/confdb.h
index 19614fc..76e4482 100644
--- a/server/confdb/confdb.h
+++ b/server/confdb/confdb.h
@@ -80,6 +80,10 @@ int confdb_get_bool(struct confdb_ctx *cdb, TALLOC_CTX *ctx,
                     const char *section, const char *attribute,
                     bool defval, bool *result);
 
+int confdb_get_string_as_list(struct confdb_ctx *cdb, TALLOC_CTX *ctx,
+                              const char *section, const char *attribute,
+                              char ***result);
+
 int confdb_init(TALLOC_CTX *mem_ctx,
                 struct tevent_context *ev,
                 struct confdb_ctx **cdb_ctx,
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index dd80830..20734d1 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -544,11 +544,6 @@ static int service_signal_reload(struct mt_svc *svc)
 int get_monitor_config(struct mt_ctx *ctx)
 {
     int ret;
-    size_t svc_count = 0;
-    char *svcs;
-    char *cur, *p, *t;
-    char **svc_list = NULL;
-    char **tmp_list = NULL;
 
     ret = confdb_get_int(ctx->cdb, ctx,
                          MONITOR_CONF_ENTRY, "sbusTimeout",
@@ -557,61 +552,20 @@ int get_monitor_config(struct mt_ctx *ctx)
         return ret;
     }
 
-    ret = confdb_get_string(ctx->cdb, ctx,
-                            SERVICE_CONF_ENTRY, "activeServices",
-                            NULL, &svcs);
-
-    if (ret != EOK || svcs == NULL) {
+    ret = confdb_get_string_as_list(ctx->cdb, ctx, SERVICE_CONF_ENTRY,
+                                    "activeServices", &ctx->services);
+    if (ret != EOK) {
         DEBUG(0, ("No services configured!\n"));
         return EINVAL;
     }
 
-    cur = p = talloc_strdup(svcs, svcs);
-    while (p && *p) {
-        for (cur = p; (*cur == ' ' || *cur == '\t'); cur++) /* trim */ ;
-        if (!*cur) break;
-
-        p = strchr(cur, ',');
-        if (p) {
-            /* terminate element */
-            *p = '\0';
-            /* trim spaces */
-            for (t = p-1; (*t == ' ' || *t == '\t'); t--) *t = '\0';
-            p++;
-        }
-
-        svc_count++;
-        tmp_list = talloc_realloc(svcs, svc_list, char *, svc_count);
-        if (!tmp_list) {
-            ret = ENOMEM;
-            goto done;
-        }
-        svc_list = tmp_list;
-        svc_list[svc_count-1] = talloc_strdup(svc_list, cur);
-    }
-
-    svc_count++;
-    tmp_list = talloc_realloc(svcs, svc_list, char *, svc_count);
-    if (!tmp_list) {
-        ret = ENOMEM;
-        goto done;
-    }
-    svc_list = tmp_list;
-    svc_list[svc_count-1] = NULL;
-
-    ctx->services = talloc_steal(ctx, svc_list);
-
     ret = confdb_get_domains(ctx->cdb, ctx, &ctx->domains);
     if (ret != EOK) {
         DEBUG(2, ("No domains configured. LOCAL should always exist!\n"));
         return ret;
     }
 
-    ret = EOK;
-
-done:
-    talloc_free(svcs);
-    return ret;
+    return EOK;
 }
 
 static int get_service_config(struct mt_ctx *ctx, const char *name,
diff --git a/server/responder/nss/nsssrv.c b/server/responder/nss/nsssrv.c
index e85e56b..e04a8c8 100644
--- a/server/responder/nss/nsssrv.c
+++ b/server/responder/nss/nsssrv.c
@@ -138,18 +138,20 @@ static int nss_get_config(struct nss_ctx *nctx,
 
     ret = confdb_get_int(cdb, nctx, NSS_SRV_CONFIG,
                          "EntryCacheTimeout", 600,
-                         &nctx->enum_cache_timeout);
+                         &nctx->cache_timeout);
     if (ret != EOK) goto done;
 
     ret = confdb_get_int(cdb, nctx, NSS_SRV_CONFIG,
                          "EntryNegativeTimeout", 15,
-                         &nctx->enum_cache_timeout);
+                         &nctx->neg_timeout);
     if (ret != EOK) goto done;
 
-    ret = confdb_get_param(cdb, nctx, NSS_SRV_CONFIG,
-                           "filterUsers", &filter_list);
-    if (ret != EOK) goto done;
-    for (i = 0; filter_list[i]; i++) {
+    ret = confdb_get_string_as_list(cdb, tmpctx, NSS_SRV_CONFIG,
+                                    "filterUsers", &filter_list);
+    if (ret == ENOENT) filter_list = NULL;
+    else if (ret != EOK) goto done;
+
+    for (i = 0; (filter_list && filter_list[i]); i++) {
         ret = sss_parse_name(tmpctx, nctx->rctx->names,
                              filter_list[i], &domain, &name);
         if (ret != EOK) {
@@ -178,11 +180,12 @@ static int nss_get_config(struct nss_ctx *nctx,
             }
         }
     }
-    talloc_free(filter_list);
 
-    ret = confdb_get_param(cdb, nctx, NSS_SRV_CONFIG,
-                           "filterGroups", &filter_list);
-    if (ret != EOK) goto done;
+    ret = confdb_get_string_as_list(cdb, tmpctx, NSS_SRV_CONFIG,
+                                    "filterGroups", &filter_list);
+    if (ret == ENOENT) filter_list = NULL;
+    else if (ret != EOK) goto done;
+
     for (i = 0; filter_list[i]; i++) {
         ret = sss_parse_name(tmpctx, nctx->rctx->names,
                              filter_list[i], &domain, &name);
@@ -212,7 +215,6 @@ static int nss_get_config(struct nss_ctx *nctx,
             }
         }
     }
-    talloc_free(filter_list);
 
 done:
     talloc_free(tmpctx);
-- 
1.6.0.6


0005-Fixing-memory-issues-in-ini-and-collection.patch:

--- NEW FILE 0005-Fixing-memory-issues-in-ini-and-collection.patch ---
>From 9fc454c84d539cd90aed3a74a350bdc792455407 Mon Sep 17 00:00:00 2001
From: Dmitri Pal <dpal at redhat.com>
Date: Tue, 14 Apr 2009 14:55:42 -0400
Subject: [PATCH] Fixing memory issues in ini and collection

The read_line() function used an internal buffer allocated on stack
as temporary storage for a line read from file, then returned it.
read_line() now gets a buffer from the caller.
Fixed memory leaks in INI and Collection found by valgrind.
---
 common/collection/collection_ut.c |   15 +++++++++------
 common/ini/ini_config.c           |   36 +++++++++++++++++++++++++++++-------
 common/ini/ini_config_ut.c        |    4 ++--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/common/collection/collection_ut.c b/common/collection/collection_ut.c
index 6d27db6..eabf522 100644
--- a/common/collection/collection_ut.c
+++ b/common/collection/collection_ut.c
@@ -480,6 +480,7 @@ int mixed_collection_test()
     /* Traverse collection again - peer should still be there */
     error = print_collection(event);
     if(error) {
+        destroy_collection(event);
         printf("Error printing collection %d\n",error);
         return error;
     }
@@ -488,18 +489,17 @@ int mixed_collection_test()
 
     error = debug_collection(event,COL_TRAVERSE_DEFAULT);
     if(error) {
+        destroy_collection(event);
         printf("Error printing collection %d\n",error);
         return error;
     }
 
     printf("Attempt to add property to a referenced collection.\n");
 
-    /* Some negative tests */
-    /* Can't add attributes to the referenced collection */
     error = add_int_property(event,"host","session",500);
-    if(error != 0) printf("Error was NOT able to add property to a referenced collection.\n");
-    else {
-        printf("Unexpected success which is an implementation error.\n");
+    if(error) {
+        destroy_collection(event);
+        printf("Error was NOT able to add property to a referenced collection %d.\n", error);
         return error;
     }
 
@@ -508,6 +508,7 @@ int mixed_collection_test()
     /* Can't delete non exitent property */
     error = delete_property(event,"host.host",COL_TYPE_ANY, COL_TRAVERSE_DEFAULT);
     if(error == 0) {
+        destroy_collection(event);
         printf("Error was able to delete property that does not exist.\n");
         return -1;
     }
@@ -516,12 +517,14 @@ int mixed_collection_test()
     /* Set collection class */
     error = set_collection_class(event,2);
     if(error != 0) {
+        destroy_collection(event);
         printf("Error was NOT able to set class.\n");
         return error;
     }
 
     error = get_collection_class(event,&class);
     if(error != 0) {
+        destroy_collection(event);
         printf("Error was NOT able to get class.\n");
         return error;
     }
@@ -529,6 +532,7 @@ int mixed_collection_test()
 
     if(is_of_class(event,2)) printf("Class mathced!\n");
     else {
+        destroy_collection(event);
         printf("Error - bad class.\n");
         return -1;
     }
@@ -706,4 +710,3 @@ int main()
     /* Add other tests here ... */
     return error;
 }
-
diff --git a/common/ini/ini_config.c b/common/ini/ini_config.c
index 4112049..fd1efb0 100644
--- a/common/ini/ini_config.c
+++ b/common/ini/ini_config.c
@@ -83,8 +83,14 @@ inline const char *parsing_error_str(int parsing_error)
             return str_error[parsing_error-1];
 }
 
-
-int read_line(FILE *file,char **key,char **value, int *length, int *ext_error);
+/* Internal function to read line from INI file */
+int read_line(FILE *file,
+              char *buf,
+              int read_size,
+              char **key,
+              char **value,
+              int *length,
+              int *ext_error);
 
 /* Add to collection or update - CONSIDER moving to the collection.c */
 static int add_or_update(struct collection_item *current_section,
@@ -137,6 +143,8 @@ static int ini_to_collection(const char *filename,
     struct parse_error pe;
     int line = 0;
     int created = 0;
+    char buf[BUFFER_SIZE+1];
+
 
     TRACE_FLOW_STRING("ini_to_collection", "Entry");
 
@@ -162,7 +170,8 @@ static int ini_to_collection(const char *filename,
 
     /* Read file lines */
     while (1) {
-        status = read_line(file, &key, &value, &length, &ext_err);
+        /* Always read one less than the buffer */
+        status = read_line(file, buf, BUFFER_SIZE+1, &key, &value, &length, &ext_err);
         if (status == RET_EOF) break;
 
         line++;
@@ -505,11 +514,15 @@ int config_for_app(const char *application,
 }
 
 /* Reads a line from the file */
-int read_line(FILE *file, char **key,char **value, int *length, int *ext_error)
+int read_line(FILE *file,
+              char *buf,
+              int read_size,
+              char **key, char **value,
+              int *length,
+              int *ext_error)
 {
 
     char *res;
-    char buf[BUFFER_SIZE+1];
     int len;
     char *buffer;
     int i;
@@ -522,12 +535,15 @@ int read_line(FILE *file, char **key,char **value, int *length, int *ext_error)
     buffer = buf;
 
     /* Get data from file */
-    res = fgets(buffer, BUFFER_SIZE, file);
+    res = fgets(buffer, read_size - 1, file);
     if (res == NULL) {
         TRACE_ERROR_STRING("Read nothing", "");
         return RET_EOF;
     }
 
+    /* Make sure the buffer is NULL terminated */
+    buffer[read_size - 1] = '\0';
+
     len = strlen(buffer);
     if (len == 0) {
         TRACE_ERROR_STRING("Nothing was read.", "");
@@ -550,7 +566,8 @@ int read_line(FILE *file, char **key,char **value, int *length, int *ext_error)
     TRACE_INFO_STRING("BUFFER before trimming:", buffer);
 
     /* Trucate trailing spaces and CRs */
-    while (isspace(buffer[len - 1])) {
+    /* Make sure not to step before the beginning */
+    while (len && isspace(buffer[len - 1])) {
         buffer[len - 1] = '\0';
         len--;
     }
@@ -847,6 +864,9 @@ int get_config_item(const char *section,
     error = get_item(section_handle, name,
                      COL_TYPE_STRING, COL_TRAVERSE_ONELEVEL, item);
 
+    /* Make sure we free the section we found */
+    destroy_collection(section_handle);
+
     TRACE_FLOW_NUMBER("get_config_item returning", error);
     return error;
 }
@@ -1521,6 +1541,8 @@ char **get_attribute_list(struct collection_item *ini_config, const char *sectio
     /* Pass it to the function from collection API */
     list = collection_to_list(subcollection, size, error);
 
+    destroy_collection(subcollection);
+
     TRACE_FLOW_STRING("get_attribute_list returning", list == NULL ? "NULL" : list[0]);
     return list;
 }
diff --git a/common/ini/ini_config_ut.c b/common/ini/ini_config_ut.c
index 6787c36..5441e02 100644
--- a/common/ini/ini_config_ut.c
+++ b/common/ini/ini_config_ut.c
@@ -303,7 +303,6 @@ int get_test()
 
     debug_item(item);
 
-
     printf("Get item as string without duplication from NULL item.\n");
 
     /* Get a string without duplicication */
@@ -759,9 +758,10 @@ int get_test()
         return -1;
     }
 
-    for (i=0;i<size;i++) printf("Section: [%s]\n", prop_array[i]);
+    for (i=0;i<size;i++) printf("Attribute: [%s]\n", prop_array[i]);
     free_attribute_list(prop_array);
 
+    destroy_collection(ini_config);
     printf("Done with get test!\n");
     return EOK;
 }
-- 
1.6.0.6



Index: sssd.conf.default
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.conf.default,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sssd.conf.default	13 Apr 2009 22:37:11 -0000	1.2
+++ sssd.conf.default	14 Apr 2009 21:24:36 -0000	1.3
@@ -16,9 +16,6 @@
 [services/pam]
 description = PAM Responder Configuration
 
-[services/info]
-description = InfoPipe Configuration
-
 [services/monitor]
 description = Service Monitor Configuration
 #if a backend is particularly slow you can raise this timeout here


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sssd.spec	13 Apr 2009 22:37:11 -0000	1.8
+++ sssd.spec	14 Apr 2009 21:24:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -13,6 +13,10 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
+Patch101: 0001-Add-reconnection-code-between-the-NSS-responder-and.patch
+Patch103: 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch
+Patch104: 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch
+Patch105: 0005-Fixing-memory-issues-in-ini-and-collection.patch
 
 ### Dependencies ###
 
@@ -51,6 +55,11 @@
 %prep
 %setup -q
 
+%patch101 -p1 -b .reconnect
+%patch103 -p1 -b .global_reconnect_option
+%patch104 -p1 -b .fix_filters
+%patch105 -p1 -b .fix_mem_issues
+
 %build
 
 # common
@@ -138,6 +147,9 @@
 fi
 
 %changelog
+* Tue Apr 14 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-2
+- Add last minute bug fixes, found in testing the package
+
 * Mon Apr 13 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-1
 - Version 0.3.1
 - includes previous release patches



From jakub at fedoraproject.org  Tue Apr 14 21:28:56 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 14 Apr 2009 21:28:56 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.269, 1.270 glibc-fedora.patch, 1.302,
	1.303 glibc.spec, 1.392, 1.393 import.log, 1.13, 1.14 sources,
	1.294, 1.295
Message-ID: <20090414212856.6A2FD700B2@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2557/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- .cvsignore	9 Apr 2009 21:23:43 -0000	1.269
+++ .cvsignore	14 Apr 2009 21:28:24 -0000	1.270
@@ -1,2 +1,2 @@
-glibc-20090409T1422.tar.bz2
-glibc-fedora-20090409T1422.tar.bz2
+glibc-20090414T2104.tar.bz2
+glibc-fedora-20090414T2104.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- glibc-fedora.patch	9 Apr 2009 21:23:43 -0000	1.302
+++ glibc-fedora.patch	14 Apr 2009 21:28:25 -0000	1.303
@@ -1,6 +1,6 @@
---- glibc-20090409T1422/ChangeLog	9 Apr 2009 05:45:03 -0000	1.11578
-+++ glibc-20090409T1422-fedora/ChangeLog	9 Apr 2009 20:46:29 -0000	1.8782.2.327
-@@ -7156,6 +7156,13 @@
+--- glibc-20090414T2104/ChangeLog	14 Apr 2009 20:57:17 -0000	1.11588
++++ glibc-20090414T2104-fedora/ChangeLog	14 Apr 2009 21:18:54 -0000	1.8782.2.328
+@@ -7217,6 +7217,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7451,6 +7458,10 @@
+@@ -7512,6 +7519,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8708,6 +8719,15 @@
+@@ -8769,6 +8780,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090409T1422/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090409T1422-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090414T2104/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090414T2104-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090409T1422/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090409T1422-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090414T2104/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090414T2104-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090409T1422/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090409T1422-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090414T2104/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090414T2104-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090409T1422/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090409T1422-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090414T2104/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090414T2104-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090409T1422/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090409T1422-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090414T2104/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090414T2104-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090409T1422/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090409T1422-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090414T2104/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090414T2104-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090409T1422/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090409T1422-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090414T2104/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090414T2104-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090409T1422/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090409T1422-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090414T2104/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090414T2104-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090409T1422/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090414T2104/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090409T1422/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090414T2104/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090409T1422/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090409T1422-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090414T2104/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090414T2104-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090409T1422/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090409T1422-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090414T2104/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090414T2104-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090409T1422/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090409T1422-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090414T2104/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090414T2104-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090409T1422/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090409T1422-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090414T2104/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090414T2104-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090409T1422/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090409T1422-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090414T2104/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090414T2104-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090409T1422/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090409T1422-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090414T2104/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090414T2104-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090409T1422/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090409T1422-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090414T2104/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090414T2104-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090409T1422/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090409T1422-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090414T2104/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090414T2104-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090409T1422/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090414T2104/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090409T1422/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090409T1422-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090414T2104/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090414T2104-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090409T1422/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090409T1422-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090414T2104/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090414T2104-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090409T1422/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090409T1422-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090414T2104/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090414T2104-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090409T1422/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090409T1422-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090414T2104/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090414T2104-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090409T1422/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090409T1422-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090414T2104/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090414T2104-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090409T1422/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090409T1422-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090414T2104/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090414T2104-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090409T1422/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090409T1422-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090414T2104/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090414T2104-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090409T1422/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090409T1422-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090414T2104/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090414T2104-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090409T1422/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090414T2104/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090409T1422/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090409T1422-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090414T2104/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090414T2104-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090409T1422/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090409T1422-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090414T2104/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090414T2104-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090409T1422/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090409T1422-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090414T2104/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090414T2104-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090409T1422/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090409T1422-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090414T2104/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090414T2104-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090409T1422/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090414T2104/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090409T1422/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090409T1422-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090414T2104/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090414T2104-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090409T1422/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090409T1422-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090414T2104/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090414T2104-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090409T1422/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090409T1422-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090414T2104/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090414T2104-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090409T1422/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090409T1422-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090414T2104/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090414T2104-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090409T1422/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090409T1422-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090414T2104/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090414T2104-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090409T1422/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090414T2104/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090409T1422/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090409T1422-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090414T2104/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090414T2104-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090409T1422/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090409T1422-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090414T2104/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090414T2104-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090409T1422/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090409T1422-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090414T2104/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- glibc.spec	9 Apr 2009 22:03:35 -0000	1.392
+++ glibc.spec	14 Apr 2009 21:28:25 -0000	1.393
@@ -1,6 +1,6 @@
-%define glibcdate 20090409T1422
+%define glibcdate 20090414T2104
 %define glibcname glibc
-%define glibcsrcdir glibc-20090409T1422
+%define glibcsrcdir glibc-20090414T2104
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 15
+Release: 16
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-16
+- update from trunk
+
 * Thu Apr  9 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-15
 - rebuilt with fixed gcc to avoid miscompilation of i586 memmove
 - reenable experimental malloc again


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	9 Apr 2009 21:23:43 -0000	1.13
+++ import.log	14 Apr 2009 21:28:25 -0000	1.14
@@ -11,3 +11,4 @@
 glibc-2_9_90-13:HEAD:glibc-2.9.90-13.src.rpm:1239089921
 glibc-2_9_90-14:HEAD:glibc-2.9.90-14.src.rpm:1239208984
 glibc-2_9_90-15:HEAD:glibc-2.9.90-15.src.rpm:1239312092
+glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- sources	9 Apr 2009 21:23:43 -0000	1.294
+++ sources	14 Apr 2009 21:28:25 -0000	1.295
@@ -1,2 +1,2 @@
-fb01a4679a2798a87b11da62ceaa6473  glibc-20090409T1422.tar.bz2
-45983fa985d5e8590a6cfa0ad681a261  glibc-fedora-20090409T1422.tar.bz2
+3ebf1a888adc2664139dd0e471f9db36  glibc-20090414T2104.tar.bz2
+d0eaef4a6c4f78b4951471429277944d  glibc-fedora-20090414T2104.tar.bz2



From rhughes at fedoraproject.org  Tue Apr 14 21:45:58 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 14 Apr 2009 21:45:58 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.45,
	1.46 gnome-packagekit.spec, 1.84, 1.85 sources, 1.46, 1.47
Message-ID: <20090414214558.76986700B2@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5941

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-0.2.20090414git
- Reroll the tarball without the new PkMediaTypeEnum functionality which
  is present in git master PackageKit.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	14 Apr 2009 16:46:14 -0000	1.45
+++ .cvsignore	14 Apr 2009 21:45:27 -0000	1.46
@@ -1 +1 @@
-gnome-packagekit-2.27.2.tar.gz
+gnome-packagekit-2.27.2-20090414.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gnome-packagekit.spec	14 Apr 2009 16:50:18 -0000	1.84
+++ gnome-packagekit.spec	14 Apr 2009 21:45:27 -0000	1.85
@@ -7,13 +7,13 @@
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
 Version:   2.27.2
-Release:   0.1.%{?alphatag}git%{?dist}
+Release:   0.2.%{?alphatag}git%{?dist}
 #Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+#Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  gtk2 >= 2.15.0
@@ -72,8 +72,8 @@
 viewer and a service pack creator.
 
 %prep
-#%setup -q -n %{?name}-%{?version}-%{?alphatag}
-%setup -q
+%setup -q -n %{?name}-%{?version}-%{?alphatag}
+#%setup -q
 #%patch0 -p1
 
 %build
@@ -205,6 +205,10 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-0.2.20090414git
+- Reroll the tarball without the new PkMediaTypeEnum functionality which
+  is present in git master PackageKit.
+
 * Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.2-0.1.20090414git
 - New git snapshot fixing several bugs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	14 Apr 2009 16:46:14 -0000	1.46
+++ sources	14 Apr 2009 21:45:27 -0000	1.47
@@ -1 +1 @@
-6066683782b56e20ab84af3952a88c4f  gnome-packagekit-2.27.2.tar.gz
+2d3680ad3c39d4a714d9e99f06552553  gnome-packagekit-2.27.2-20090414.tar.gz



From simo at fedoraproject.org  Tue Apr 14 21:54:11 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 14 Apr 2009 21:54:11 +0000 (UTC)
Subject: rpms/sssd/devel
	0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch,
	NONE, 1.1 sssd.spec, 1.9, 1.10
Message-ID: <20090414215411.0E105700B2@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8246

Modified Files:
	sssd.spec 
Added Files:
	0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch 
Log Message:
add patch 0002 too


0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch:

--- NEW FILE 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch ---
>From 2f9fb5b8dcf09a3285386b8bade78bcd6867cb24 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 14 Apr 2009 09:30:43 -0400
Subject: [PATCH] Replace the example sssd.conf file with the one used in Fedora

Also remove the [services/infopipe] section, since we're not
shipping InfoPipe yet, and that would be confusing.
---
 server/examples/sssd.conf |  103 +++++++++++++++++++++++++++++++--------------
 1 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/server/examples/sssd.conf b/server/examples/sssd.conf
index c5fd7e6..b9a421e 100644
--- a/server/examples/sssd.conf
+++ b/server/examples/sssd.conf
@@ -1,50 +1,89 @@
 [services]
 description = Local Service Configuration
-activeServices = nss, dp, pam, info
+activeServices = nss, dp, pam
 
 [services/nss]
 description = NSS Responder Configuration
-timeout = 10
-filterGroups = root, foo at TEST
-filterUsers = root, bar at TEST
+# the following prevents sssd for searching for the root user/group in
+# all domains (you can add here a comma separated list of system accounts are
+# always going to be /etc/passwd users, or that you want to filter out)
+filterGroups = root
+filterUsers = root
 
 [services/dp]
 description = Data Provider Configuration
-timeout = 10
 
 [services/pam]
 description = PAM Responder Configuration
-timeout = 10
-
-[services/info]
-description = InfoPipe Configuration
-timeout = 10
 
 [services/monitor]
 description = Service Monitor Configuration
-sbusTimeout = 10
+#if a backend is particularly slow you can raise this timeout here
+sbusTimeout = 30
 
 [domains]
 description = Domains served by SSSD
-domains = LOCAL
-
-[domains/LOCAL]
-description = Reserved domain for local configurations
-enumerate = 3
-minId = 500
-maxId = 999
-legacy = TRUE
-libName = files
-libPath = /lib64/libnss_files.so.2
-magicPrivateGroups = FALSE
-provider = proxy
-auth-module = proxy
-pam-target = sssdproxylocal
-
-[domains/EXAMPLE.COM]
-description = Example LDAP domain
-basedn = dc=example,dc=com
-command = /usr/libexec/sssd/sssd_be --provider ldap --domain EXAMPLE.COM
-provider = ldap
-userSearchBase = ou=user,dc=example,dc=com
+; domains = LOCAL,LDAP
+
+# SSSD will not start if you don't configure any domain.
+# Add new domains condifgurations as [domains/<NAME>] sections.
+# Then add the list of domains (in the order you want them to be
+# queried in the 'domains" attribute above and uncomment it
+
+# Example LOCAL domain that proxies to /etc/passwd and /etc/group files
+# This configuration is meant mostly as a migration path to be able to store
+# additional information about users while still keeping /etc/passwd
+# authoritative.
+
+; [domains/LOCAL]
+; description = LOCAL migration domain
+; enumerate = 3
+; minId = 500
+; magicPrivateGroups = FALSE
+; legacy = TRUE
+;
+; provider = proxy
+; libName = files
+; libPath = libnss_files.so.2
+
+# optionally a file named sssdproxylocal can be place in pam.d configured to
+# check pam_unix only and pam_sss can be used in the normal pam stack
+; auth-module = proxy
+; pam-target = sssdproxylocal
+
+# Example LOCAL domain that stores all users natively in the SSSD internal
+# directory. These local users and groups are not visibile in /etc/passwd, it
+# now contains only root and system accounts.
+
+; [domains/LOCAL]
+; description = LOCAL Users domain
+; enumerate = 3
+; minId = 500
+; maxId = 999
+; legacy = FALSE
+; magicPrivateGroups = TRUE
+
+# Example LDAP domain that uses the proxy backend and the standard nss_ldap
+# and pam_ldap modules (Useful until we have good working native ldap backends).
+# For this to work the /etc/ldap.conf file needs to be correctly configured just
+# like you would do when using nss_ldap in nsswitch.conf, but instead of setting
+# passwd: files ldap, set passwd: files, sss instead there.
+# Also consider using the following setting in /etc/ldap.conf to avoid needless
+# delays if the ldap server is offline:
+# timelimit 10
+# bind_timelimit 5
+# nss_reconnect_maxsleeptime 2
+# nss_reconnect_sleeptime 1
 
+; [domains/LDAP]
+; description = Proxy request to our LDAP server
+; enumerate = 0
+; minId = 1000
+; legacy = TRUE
+;
+; provider = proxy
+; libName = ldap
+; libPath = libnss_ldap.so.2
+;
+#if a backend is particularly slow you can raise this timeout here
+; timeout = 60
-- 
1.6.0.6



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sssd.spec	14 Apr 2009 21:24:36 -0000	1.9
+++ sssd.spec	14 Apr 2009 21:53:40 -0000	1.10
@@ -14,6 +14,7 @@
 
 ### Patches ###
 Patch101: 0001-Add-reconnection-code-between-the-NSS-responder-and.patch
+Patch102: 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch
 Patch103: 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch
 Patch104: 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch
 Patch105: 0005-Fixing-memory-issues-in-ini-and-collection.patch
@@ -56,6 +57,7 @@
 %setup -q
 
 %patch101 -p1 -b .reconnect
+%patch102 -p1 -b .examples
 %patch103 -p1 -b .global_reconnect_option
 %patch104 -p1 -b .fix_filters
 %patch105 -p1 -b .fix_mem_issues



From hpejakle at fedoraproject.org  Tue Apr 14 22:05:11 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Tue, 14 Apr 2009 22:05:11 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-11 import.log, NONE,
	1.1 pidgin-musictracker.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090414220511.CEFCF700B2@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10826/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-musictracker.spec 
Log Message:
initial import



--- NEW FILE import.log ---
pidgin-musictracker-0_4_16-1_fc10:F-11:pidgin-musictracker-0.4.16-1.fc10.src.rpm:1239746655


--- NEW FILE pidgin-musictracker.spec ---
%global	pidgin_version 2.0.0

Name:		pidgin-musictracker
Version:	0.4.16
Release:	1%{?dist}
Summary:	Musictracker plugin for Pidgin

Group:		Applications/Internet
License:	GPLv2+
URL:		http://code.google.com/p/pidgin-musictracker/
Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	dbus-glib-devel
BuildRequires:	pcre-devel
BuildRequires:	pidgin-devel >= %{pidgin_version}
BuildRequires:	gettext-devel

Requires:	pidgin >= %{pidgin_version}

%description
Musictracker is a plugin for Pidgin which displays the media currently
playing in the status message for any protocol Pidgin supports custom
statuses on.

%prep
%setup -q


%build
%configure --disable-werror --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=%{buildroot} INSTALL="install -p" install
rm -f %{buildroot}/%{_libdir}/pidgin/musictracker.la
%find_lang musictracker

%clean
rm -rf $RPM_BUILD_ROOT

%files -f musictracker.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%{_libdir}/pidgin/musictracker.so

%changelog
* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
- combined spec file from all below people and builded package for 0.4.16 version
 
* Wed Mar  4 2009 Jon TURNEY <jon.turney at dronecode.org.uk>
- Cut-n-shut from .spec files cotributed by Jon Hermansen <jon.hermansen at gmail.com>, Julio Cezar <watchman777 at gmail.com> and Mattia Verga <mattia.verga at tiscali.it>

* Wed Mar  4 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.15-2.fc10
- Added BuildRequires section and corrected the Requires section to Pidgin version >= 2.0. Added THANKS file to documentation

* Tue Mar  3 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.15-1.fc10
- Upgrade to version 0.4.15. See full changelog at http://code.google.com/p/pidgin-musictracker/wiki/ChangeLog0point4

* Mon Feb  2 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.14-2.fc10
- Added requires

* Sun Feb  1 2009 Mattia Verga <mattia.verga at tiscali.it> 0.4.14-1.fc10
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 00:20:01 -0000	1.1
+++ .cvsignore	14 Apr 2009 22:04:40 -0000	1.2
@@ -0,0 +1 @@
+pidgin-musictracker-0.4.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 00:20:01 -0000	1.1
+++ sources	14 Apr 2009 22:04:40 -0000	1.2
@@ -0,0 +1 @@
+1cfa0bba6542193713fccb568efdc4cc  pidgin-musictracker-0.4.16.tar.bz2



From myoung at fedoraproject.org  Tue Apr 14 22:09:28 2009
From: myoung at fedoraproject.org (Michael Young)
Date: Tue, 14 Apr 2009 22:09:28 +0000 (UTC)
Subject: rpms/kernel/devel/scripts watch-task,NONE,1.1.2.1
Message-ID: <20090414220928.23A89700B2@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10317/scripts

Added Files:
      Tag: private-myoung-dom0-branch
	watch-task 
Log Message:
Base xen pvops patch on 2.6.29.1 F-11 branch for the moment



--- NEW FILE watch-task ---
#! /bin/sh

watchtask() {
	while true ; do
		koji taskinfo $1 | grep "^State: $2$" >/dev/null || break
		echo -en "State: $2\r"
		sleep 3m
	done
}

echo "Started watching koji task $1: $(date)"
watchtask $1 free
watchtask $1 open
echo "    Task $1 is no longer open: $(date)"

for i in $(seq 1 10) ; do
	echo -en '\a'
	sleep .2
done

koji taskinfo $1



From orion at fedoraproject.org  Tue Apr 14 22:09:35 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 14 Apr 2009 22:09:35 +0000 (UTC)
Subject: rpms/openoffice.org-extendedPDF/F-10
	openoffice.org-extendedPDF.spec, 1.1, 1.2
Message-ID: <20090414220935.44AB3700B2@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/openoffice.org-extendedPDF/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12099/F-10

Modified Files:
	openoffice.org-extendedPDF.spec 
Log Message:
* Tue Apr 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.4-5
- Add patch to fix bug #495777



Index: openoffice.org-extendedPDF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-extendedPDF/F-10/openoffice.org-extendedPDF.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-extendedPDF.spec	14 Apr 2008 17:11:22 -0000	1.1
+++ openoffice.org-extendedPDF.spec	14 Apr 2009 22:09:04 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           openoffice.org-extendedPDF
 Version:        1.4
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Create PDF with hyperlinks, bookmarks and more
 
 Group:          Applications/Productivity
@@ -13,6 +13,8 @@
 # rm extendedPDF-Universal-Edition/itext.jar
 # zip extendedPDF-Universal-Edition-1.4.0-CLEAN.zip -r extendedPDF-Universal-Edition
 Source0:        extendedPDF-Universal-Edition-1.4.0-CLEAN.zip
+# Gotten from http://bugzilla.neooffice.org/bug.php?op=show&bugid=1354
+Patch0:         openoffice.org-extendedPDF-1.4.0-oooVersion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires(pre):    openoffice.org-core
@@ -46,6 +48,11 @@
 tr -d '\r' < COPYING.txt > COPYING.txt.unix
 touch -r COPYING.txt COPYING.txt.unix
 mv COPYING.txt.unix COPYING.txt
+mkdir %{extname}.unpack
+pushd %{extname}.unpack
+unzip ../extendedPDF.zip
+%patch0 -p0
+
 
 
 %build
@@ -53,10 +60,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
-unzip %{extname} -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/
+cp -a %{extname}.unpack $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
 #Is empty
 rm $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}/mimetype
+# Cleanup patch backups
+find $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname} -name \*.orig -exec rm '{}' \;
 
 
 %clean
@@ -91,6 +100,12 @@
 
 
 %changelog
+* Tue Apr 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.4-6
+- Add patch to fix bug #495777
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Apr 14 2008 Caolan McNamara <caolanm at redhat.com> 1.4-4
 - adapt to final guidelines
 



From orion at fedoraproject.org  Tue Apr 14 22:09:35 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 14 Apr 2009 22:09:35 +0000 (UTC)
Subject: rpms/openoffice.org-extendedPDF/devel
	openoffice.org-extendedPDF-1.4.0-oooVersion.patch, NONE,
	1.1 openoffice.org-extendedPDF.spec, 1.2, 1.3
Message-ID: <20090414220935.EE852700B2@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/openoffice.org-extendedPDF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12099/devel

Modified Files:
	openoffice.org-extendedPDF.spec 
Added Files:
	openoffice.org-extendedPDF-1.4.0-oooVersion.patch 
Log Message:
* Tue Apr 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.4-5
- Add patch to fix bug #495777


openoffice.org-extendedPDF-1.4.0-oooVersion.patch:

--- NEW FILE openoffice.org-extendedPDF-1.4.0-oooVersion.patch ---
--- extendedPDF/pdfm.xba.oooVersion	2006-08-11 10:51:02.000000000 -0600
+++ extendedPDF/pdfm.xba	2009-04-14 15:58:53.000000000 -0600
@@ -332,7 +332,7 @@
 	
 	&apos; Subject property changes between OOo 1 and 2. Use of GetSolarVersion
 	&apos; fix by James Holgate.
-	if GetSolarVersion &lt; 646 then &apos;openoffice.org version 1.x.x or equivalent
+	if left(oooVersion, 3) = "1.0" or left(oooVersion, 3) = "1.1" then &apos;openoffice.org version 1.x.x or equivalent
         &apos; Thanks to Petr Ferdus for finding the right property here
         if not isNull(documentInfo.theme) and not isEmpty(documentInfo.theme) then
             s = s &amp; &quot; /Subject &quot; &amp; epdf_pdfu_hexEncodePdfText(documentInfo.theme, errorCode)


Index: openoffice.org-extendedPDF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-extendedPDF/devel/openoffice.org-extendedPDF.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-extendedPDF.spec	26 Feb 2009 08:40:07 -0000	1.2
+++ openoffice.org-extendedPDF.spec	14 Apr 2009 22:09:05 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           openoffice.org-extendedPDF
 Version:        1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Create PDF with hyperlinks, bookmarks and more
 
 Group:          Applications/Productivity
@@ -13,6 +13,8 @@
 # rm extendedPDF-Universal-Edition/itext.jar
 # zip extendedPDF-Universal-Edition-1.4.0-CLEAN.zip -r extendedPDF-Universal-Edition
 Source0:        extendedPDF-Universal-Edition-1.4.0-CLEAN.zip
+# Gotten from http://bugzilla.neooffice.org/bug.php?op=show&bugid=1354
+Patch0:         openoffice.org-extendedPDF-1.4.0-oooVersion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires(pre):    openoffice.org-core
@@ -46,6 +48,11 @@
 tr -d '\r' < COPYING.txt > COPYING.txt.unix
 touch -r COPYING.txt COPYING.txt.unix
 mv COPYING.txt.unix COPYING.txt
+mkdir %{extname}.unpack
+pushd %{extname}.unpack
+unzip ../extendedPDF.zip
+%patch0 -p0
+
 
 
 %build
@@ -53,10 +60,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
-unzip %{extname} -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/
+cp -a %{extname}.unpack $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
 #Is empty
 rm $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}/mimetype
+# Cleanup patch backups
+find $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname} -name \*.orig -exec rm '{}' \;
 
 
 %clean
@@ -91,6 +100,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.4-6
+- Add patch to fix bug #495777
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From myoung at fedoraproject.org  Tue Apr 14 22:10:58 2009
From: myoung at fedoraproject.org (Michael Young)
Date: Tue, 14 Apr 2009 22:10:58 +0000 (UTC)
Subject: rpms/kernel/devel
	alsa-dont-reset-stream-at-each-prepare-callb.patch, 
	NONE, 1.1.2.1 alsa-hda-dont-reset-BDL-unnecessarily.patch, NONE,
	1.1.2.1 alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch, NONE,
	1.1.2.1 alsa-pcm-midlevel-add-more-strict-buffer-position.patch,
	NONE, 1.1.2.1 drm-intel-gen3-fb-hack.patch, NONE,
	1.1.2.1 drm-intel-lying-systems-without-lvds.patch, NONE,
	1.1.2.1 linux-2.6-acer-wmi-bail-on-aao.patch, NONE,
	1.1.2.1 linux-2.6-add-qcserial.patch, NONE,
	1.1.2.1 linux-2.6-btrfs-fix-umount-hang.patch, NONE,
	1.2.2.2 linux-2.6-crash-driver.patch, 1.12.6.2,
	1.12.6.3 linux-2.6-dma-debug-fixes.patch, NONE,
	1.1.2.1 linux-2.6-e820-acpi3-bios-workaround.patch, NONE,
	1.1.2.1 linux-2.6-e820-guard-against-pre-acpi3.patch, NONE,
	1.1.2.1 linux-2.6-e820-mark-esi-clobbered.patch, NONE,
	1.1.2.1 linux-2.6-e820-save-restore-edi-ebp.patch, NONE,
	1.1.2.1 linux-2.6-ext4-really-print-warning-once.patch, NONE,
	1.1.2.1 linux-2.6-fiemap-header-install.patch, NONE,
	1.2.2.2 linux-2.6-input-wacom-bluetooth.patch, NONE,
	1.1.2.1 linux-2.6-iommu-fixes.patch, NONE, 1.1.2.1
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch,
	NONE, 1.1.2.1
	linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch,
	NONE, 1.1.2.1 linux-2.6-kvm-kconfig-irqchip.patch, NONE,
	1.1.2.1 linux-2.6-kvm-mask-notifiers.patch, NONE,
	1.1.2.1 linux-2.6-kvm-reset-pit-irq-on-unmask.patch, NONE,
	1.1.2.1 linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, NONE,
	1.1.2.1 linux-2.6-mm-define-unique-value-for-as_unevictable.patch,
	NONE, 1.1.2.1 linux-2.6-posix-timers-fix-clock-monotonicity.patch,
	NONE, 1.1.2.1 linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch,
	NONE, 1.1.2.1 linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, NONE, 
	1.1.2.1 linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch,
	NONE, 1.1.2.1 linux-2.6-shut-up-efifb.patch, NONE,
	1.1.2.1 linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch,
	NONE, 1.1.2.1 linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, NONE,
	1.1.2.1 linux-2.6.29-alsa-update-quirks.patch, NONE,
	1.1.2.1 linux-2.6.29.1-sparc-regression.patch, NONE,
	1.1.2.1 patch-2.6.29.1.bz2.sign, NONE,
	1.1.2.1 squashfs-broken-when-pagesize-greater-than-blocksize.patch,
	NONE, 1.1.2.1 .cvsignore, 1.1014.2.8, 1.1014.2.9 Makefile,
	1.97.6.2, 1.97.6.3 TODO, 1.54.6.4, 1.54.6.5 branch, 1.1.2.1,
	1.1.2.2 config-debug, 1.23, 1.23.6.1 config-generic, 1.238.6.15,
	1.238.6.16 config-nodebug, 1.31, 1.31.6.1 config-sparc64-generic,
	1.21.6.1, 1.21.6.2 config-sparc64-smp, 1.2,
	1.2.16.1 config-x86-generic, 1.68.6.5,
	1.68.6.6 config-x86_64-generic, 1.68.2.5,
	1.68.2.6 drm-modesetting-radeon.patch, 1.54.6.7,
	1.54.6.8 drm-next.patch, 1.6.6.5, 1.6.6.6 drm-nouveau.patch,
	1.8.6.8, 1.8.6.9 kernel.spec, 1.1294.2.18,
	1.1294.2.19 linux-2.6-acpi-video-didl-intel-outputs.patch,
	1.1.2.3, 1.1.2.4 linux-2.6-sony-laptop-rfkill.patch, 1.2.6.2,
	1.2.6.3 linux-2.6-v4l-dvb-fixes.patch, 1.2.8.7, 1.2.8.8 sources,
	1.976.2.9, 1.976.2.10 upstream, 1.888.2.8,
	1.888.2.9 xen.pvops.patch, 1.1.2.15,
	1.1.2.16 xen.pvops.post.patch, 1.1.2.9,
	1.1.2.10 xen.pvops.pre.patch, 1.1.2.8,
	1.1.2.9 dma-api-debug-fixes.patch, 1.1.6.2,
	NONE linux-2.6-debug-dma-api.patch, 1.2.6.1,
	NONE linux-2.6-net-fix-gro-bug.patch, 1.1.2.2,
	NONE linux-2.6-net-xfrm-fix-spin-unlock.patch, 1.1.2.2,
	NONE linux-2.6.29-pat-fixes.patch, 1.1.2.2,
	NONE squashfs-fixups.patch, 1.1.2.1, NONE squashfs3.patch,
	1.1.2.1, NONE
Message-ID: <20090414221058.2E127700B2@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10317

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore Makefile TODO branch config-debug config-generic 
	config-nodebug config-sparc64-generic config-sparc64-smp 
	config-x86-generic config-x86_64-generic 
	drm-modesetting-radeon.patch drm-next.patch drm-nouveau.patch 
	kernel.spec linux-2.6-acpi-video-didl-intel-outputs.patch 
	linux-2.6-sony-laptop-rfkill.patch 
	linux-2.6-v4l-dvb-fixes.patch sources upstream xen.pvops.patch 
	xen.pvops.post.patch xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	alsa-dont-reset-stream-at-each-prepare-callb.patch 
	alsa-hda-dont-reset-BDL-unnecessarily.patch 
	alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch 
	alsa-pcm-midlevel-add-more-strict-buffer-position.patch 
	drm-intel-gen3-fb-hack.patch 
	drm-intel-lying-systems-without-lvds.patch 
	linux-2.6-acer-wmi-bail-on-aao.patch 
	linux-2.6-add-qcserial.patch 
	linux-2.6-btrfs-fix-umount-hang.patch 
	linux-2.6-crash-driver.patch linux-2.6-dma-debug-fixes.patch 
	linux-2.6-e820-acpi3-bios-workaround.patch 
	linux-2.6-e820-guard-against-pre-acpi3.patch 
	linux-2.6-e820-mark-esi-clobbered.patch 
	linux-2.6-e820-save-restore-edi-ebp.patch 
	linux-2.6-ext4-really-print-warning-once.patch 
	linux-2.6-fiemap-header-install.patch 
	linux-2.6-input-wacom-bluetooth.patch 
	linux-2.6-iommu-fixes.patch 
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch 
	linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch 
	linux-2.6-kvm-kconfig-irqchip.patch 
	linux-2.6-kvm-mask-notifiers.patch 
	linux-2.6-kvm-reset-pit-irq-on-unmask.patch 
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch 
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch 
	linux-2.6-posix-timers-fix-clock-monotonicity.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch 
	linux-2.6-shut-up-efifb.patch 
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch 
	linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch 
	linux-2.6.29-alsa-update-quirks.patch 
	linux-2.6.29.1-sparc-regression.patch patch-2.6.29.1.bz2.sign 
	squashfs-broken-when-pagesize-greater-than-blocksize.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	dma-api-debug-fixes.patch linux-2.6-debug-dma-api.patch 
	linux-2.6-net-fix-gro-bug.patch 
	linux-2.6-net-xfrm-fix-spin-unlock.patch 
	linux-2.6.29-pat-fixes.patch squashfs-fixups.patch 
	squashfs3.patch 
Log Message:
Base xen pvops patch on 2.6.29.1 F-11 branch for the moment


alsa-dont-reset-stream-at-each-prepare-callb.patch:

--- NEW FILE alsa-dont-reset-stream-at-each-prepare-callb.patch ---
>From fc546201dfe40d09c1a1e82384dc3774025984da Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 18 Mar 2009 15:15:37 +0100
Subject: ALSA: hda - Don't reset stream at each prepare callback

Don't reset the stream at each prepare callback but do it only once
after the open.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/pci/hda/hda_intel.c |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b7a61a1..931a62d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -858,13 +858,18 @@ static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
 		      SD_CTL_DMA_START | SD_INT_MASK);
 }
 
-/* stop a stream */
-static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+/* stop DMA */
+static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)
 {
-	/* stop DMA */
 	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
 		      ~(SD_CTL_DMA_START | SD_INT_MASK));
 	azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
+}
+
+/* stop a stream */
+static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+{
+	azx_stream_clear(chip, azx_dev);
 	/* disable SIE */
 	azx_writeb(chip, INTCTL,
 		   azx_readb(chip, INTCTL) & ~(1 << azx_dev->index));
@@ -1125,18 +1130,14 @@ static int azx_setup_periods(struct azx *chip,
 	return -EINVAL;
 }
 
-/*
- * set up the SD for streaming
- */
-static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+/* reset stream */
+static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 {
 	unsigned char val;
 	int timeout;
 
-	/* make sure the run bit is zero for SD */
-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
-		      ~SD_CTL_DMA_START);
-	/* reset stream */
+	azx_stream_clear(chip, azx_dev);
+
 	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
 		      SD_CTL_STREAM_RESET);
 	udelay(3);
@@ -1153,7 +1154,15 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
 	while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
 	       --timeout)
 		;
+}
 
+/*
+ * set up the SD for streaming
+ */
+static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+{
+	/* make sure the run bit is zero for SD */
+	azx_stream_clear(chip, azx_dev);
 	/* program the stream_tag */
 	azx_sd_writel(azx_dev, SD_CTL,
 		      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK)|
@@ -1399,6 +1408,8 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
 	runtime->private_data = azx_dev;
 	snd_pcm_set_sync(substream);
 	mutex_unlock(&chip->open_mutex);
+
+	azx_stream_reset(chip, azx_dev);
 	return 0;
 }
 
-- 
1.6.2.2


alsa-hda-dont-reset-BDL-unnecessarily.patch:

--- NEW FILE alsa-hda-dont-reset-BDL-unnecessarily.patch ---
>From b98a9f6d1619b7fe32c2a6a4e5190121830f979b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 18 Mar 2009 15:09:13 +0100
Subject: ALSA: hda - Don't reset BDL unnecessarily

So far, the prepare callback is called multiple times, BDL entries
are reset and re-programmed at each time.

This patch adds the check to avoid the reset of BDL entries when the
same parameters are used.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/pci/hda/hda_intel.c |   46 +++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f3b5723..b7a61a1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1075,8 +1075,7 @@ static int azx_setup_periods(struct azx *chip,
 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 
-	period_bytes = snd_pcm_lib_period_bytes(substream);
-	azx_dev->period_bytes = period_bytes;
+	period_bytes = azx_dev->period_bytes;
 	periods = azx_dev->bufsize / period_bytes;
 
 	/* program the initial BDL entries */
@@ -1123,9 +1122,6 @@ static int azx_setup_periods(struct azx *chip,
  error:
 	snd_printk(KERN_ERR "Too many BDL entries: buffer=%d, period=%d\n",
 		   azx_dev->bufsize, period_bytes);
-	/* reset */
-	azx_sd_writel(azx_dev, SD_BDLPL, 0);
-	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 	return -EINVAL;
 }
 
@@ -1429,6 +1425,11 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
 static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
 			     struct snd_pcm_hw_params *hw_params)
 {
+	struct azx_dev *azx_dev = get_azx_dev(substream);
+
+	azx_dev->bufsize = 0;
+	azx_dev->period_bytes = 0;
+	azx_dev->format_val = 0;
 	return snd_pcm_lib_malloc_pages(substream,
 					params_buffer_bytes(hw_params));
 }
@@ -1443,6 +1444,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
 	azx_sd_writel(azx_dev, SD_CTL, 0);
+	azx_dev->bufsize = 0;
+	azx_dev->period_bytes = 0;
+	azx_dev->format_val = 0;
 
 	hinfo->ops.cleanup(hinfo, apcm->codec, substream);
 
@@ -1456,23 +1460,37 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 	struct azx_dev *azx_dev = get_azx_dev(substream);
 	struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
 	struct snd_pcm_runtime *runtime = substream->runtime;
+	unsigned int bufsize, period_bytes, format_val;
+	int err;
 
-	azx_dev->bufsize = snd_pcm_lib_buffer_bytes(substream);
-	azx_dev->format_val = snd_hda_calc_stream_format(runtime->rate,
-							 runtime->channels,
-							 runtime->format,
-							 hinfo->maxbps);
-	if (!azx_dev->format_val) {
+	format_val = snd_hda_calc_stream_format(runtime->rate,
+						runtime->channels,
+						runtime->format,
+						hinfo->maxbps);
+	if (!format_val) {
 		snd_printk(KERN_ERR SFX
 			   "invalid format_val, rate=%d, ch=%d, format=%d\n",
 			   runtime->rate, runtime->channels, runtime->format);
 		return -EINVAL;
 	}
 
+	bufsize = snd_pcm_lib_buffer_bytes(substream);
+	period_bytes = snd_pcm_lib_period_bytes(substream);
+
 	snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
-		    azx_dev->bufsize, azx_dev->format_val);
-	if (azx_setup_periods(chip, substream, azx_dev) < 0)
-		return -EINVAL;
+		    bufsize, format_val);
+
+	if (bufsize != azx_dev->bufsize ||
+	    period_bytes != azx_dev->period_bytes ||
+	    format_val != azx_dev->format_val) {
+		azx_dev->bufsize = bufsize;
+		azx_dev->period_bytes = period_bytes;
+		azx_dev->format_val = format_val;
+		err = azx_setup_periods(chip, substream, azx_dev);
+		if (err < 0)
+			return err;
+	}
+
 	azx_setup_controller(chip, azx_dev);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
-- 
1.6.2.2


alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch:

--- NEW FILE alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch ---
>From 8820b651ddf48830af44520a13e63f5b9c5b9f9f Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Fri, 10 Apr 2009 12:20:45 +0200
Subject: [ALSA] hda_intel: fix unexpected ring buffer positions

I found two issues with ICH7-M (it should be related to other HDA chipsets
as well):

- the ring buffer position is not reset when stream restarts (after xrun) -
  solved by moving azx_stream_reset() call from open() to prepare() callback
  and reset posbuf to zero (it might be filled with hw later than position()
  callback is called)
- irq_ignore flag should be set also when ring buffer memory area is not
  changed in prepare() callback - this patch replaces irq_ignore with
  more universal check based on jiffies clock

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 sound/pci/hda/hda_intel.c |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 931a62d..7112e0e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -312,6 +312,9 @@ struct azx_dev {
 	unsigned int period_bytes; /* size of the period in bytes */
 	unsigned int frags;	/* number for period in the play buffer */
 	unsigned int fifo_size;	/* FIFO size */
+	unsigned int start_flag: 1;	/* stream full start flag */
+	unsigned long start_jiffies;	/* start + minimum jiffies */
+	unsigned long min_jiffies;	/* minimum jiffies before position is valid */
 
 	void __iomem *sd_addr;	/* stream descriptor pointer */
 
@@ -330,7 +333,6 @@ struct azx_dev {
 	unsigned int opened :1;
 	unsigned int running :1;
 	unsigned int irq_pending :1;
-	unsigned int irq_ignore :1;
 	/*
 	 * For VIA:
 	 *  A flag to ensure DMA position is 0
@@ -974,7 +976,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
 	struct azx *chip = dev_id;
 	struct azx_dev *azx_dev;
 	u32 status;
-	int i;
+	int i, ok;
 
 	spin_lock(&chip->reg_lock);
 
@@ -990,18 +992,14 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
 			azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);
 			if (!azx_dev->substream || !azx_dev->running)
 				continue;
-			/* ignore the first dummy IRQ (due to pos_adj) */
-			if (azx_dev->irq_ignore) {
-				azx_dev->irq_ignore = 0;
-				continue;
-			}
 			/* check whether this IRQ is really acceptable */
-			if (azx_position_ok(chip, azx_dev)) {
+			ok = azx_position_ok(chip, azx_dev);
+			if (ok == 1) {
 				azx_dev->irq_pending = 0;
 				spin_unlock(&chip->reg_lock);
 				snd_pcm_period_elapsed(azx_dev->substream);
 				spin_lock(&chip->reg_lock);
-			} else if (chip->bus && chip->bus->workq) {
+			} else if (ok == 0 && chip->bus && chip->bus->workq) {
 				/* bogus IRQ, process it later */
 				azx_dev->irq_pending = 1;
 				queue_work(chip->bus->workq,
@@ -1087,7 +1085,6 @@ static int azx_setup_periods(struct azx *chip,
 	bdl = (u32 *)azx_dev->bdl.area;
 	ofs = 0;
 	azx_dev->frags = 0;
-	azx_dev->irq_ignore = 0;
 	pos_adj = bdl_pos_adj[chip->dev_index];
 	if (pos_adj > 0) {
 		struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1108,7 +1105,6 @@ static int azx_setup_periods(struct azx *chip,
 					 &bdl, ofs, pos_adj, 1);
 			if (ofs < 0)
 				goto error;
-			azx_dev->irq_ignore = 1;
 		}
 	} else
 		pos_adj = 0;
@@ -1154,6 +1150,9 @@ static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 	while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
 	       --timeout)
 		;
+
+	/* reset first position - may not be synced with hw at this time */
+	*azx_dev->posbuf = 0;
 }
 
 /*
@@ -1409,7 +1408,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
 	snd_pcm_set_sync(substream);
 	mutex_unlock(&chip->open_mutex);
 
-	azx_stream_reset(chip, azx_dev);
 	return 0;
 }
 
@@ -1474,6 +1472,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 	unsigned int bufsize, period_bytes, format_val;
 	int err;
 
+	azx_stream_reset(chip, azx_dev);
 	format_val = snd_hda_calc_stream_format(runtime->rate,
 						runtime->channels,
 						runtime->format,
@@ -1502,6 +1501,8 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 			return err;
 	}
 
+	azx_dev->min_jiffies = (runtime->period_size * HZ) /
+						(runtime->rate * 2);
 	azx_setup_controller(chip, azx_dev);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
@@ -1518,13 +1519,14 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 	struct azx *chip = apcm->chip;
 	struct azx_dev *azx_dev;
 	struct snd_pcm_substream *s;
-	int start, nsync = 0, sbits = 0;
+	int rstart = 0, start, nsync = 0, sbits = 0;
 	int nwait, timeout;
 
 	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START:
+		rstart = 1;
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 	case SNDRV_PCM_TRIGGER_RESUME:
-	case SNDRV_PCM_TRIGGER_START:
 		start = 1;
 		break;
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
@@ -1554,6 +1556,10 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 		if (s->pcm->card != substream->pcm->card)
 			continue;
 		azx_dev = get_azx_dev(s);
+		if (rstart) {
+			azx_dev->start_flag = 1;
+			azx_dev->start_jiffies = jiffies + azx_dev->min_jiffies;
+		}
 		if (start)
 			azx_stream_start(chip, azx_dev);
 		else
@@ -1703,6 +1709,11 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 {
 	unsigned int pos;
 
+	if (azx_dev->start_flag &&
+	    time_before_eq(jiffies, azx_dev->start_jiffies))
+		return -1;	/* bogus (too early) interrupt */
+	azx_dev->start_flag = 0;
+
 	pos = azx_get_position(chip, azx_dev);
 	if (chip->position_fix == POS_FIX_AUTO) {
 		if (!pos) {
-- 
1.6.2.2


alsa-pcm-midlevel-add-more-strict-buffer-position.patch:

--- NEW FILE alsa-pcm-midlevel-add-more-strict-buffer-position.patch ---
>From bbf6ad1399e9516b0a95de3ad58ffbaed670e4cc Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Fri, 10 Apr 2009 12:28:58 +0200
Subject: [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies

Some drivers like Intel8x0 or Intel HDA are broken for some hardware variants.
This patch adds more strict buffer position checks based on jiffies when
internal hw_ptr is updated. Enable xrun_debug to see mangling of wrong
positions.

As a side effect, the hw_ptr interrupt update routine might do slightly better
job when many interrupts are lost.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 include/sound/pcm.h  |    3 ++-
 sound/core/pcm_lib.c |   47 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 8904b19..c172968 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -268,7 +268,8 @@ struct snd_pcm_runtime {
 	int overrange;
 	snd_pcm_uframes_t avail_max;
 	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */
-	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/
+	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
+	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */
 
 	/* -- HW params -- */
 	snd_pcm_access_t access;	/* access mode */
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index fbb2e39..63d088f 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -209,9 +209,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	snd_pcm_uframes_t pos;
-	snd_pcm_uframes_t new_hw_ptr, hw_ptr_interrupt, hw_base;
-	snd_pcm_sframes_t delta;
+	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_ptr_interrupt, hw_base;
+	snd_pcm_sframes_t hdelta, delta;
+	unsigned long jdelta;
 
+	old_hw_ptr = runtime->status->hw_ptr;
 	pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
 	if (pos == SNDRV_PCM_POS_XRUN) {
 		xrun(substream);
@@ -247,7 +249,30 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 			new_hw_ptr = hw_base + pos;
 		}
 	}
-	if (delta > runtime->period_size) {
+	hdelta = new_hw_ptr - old_hw_ptr;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
+	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {
+		delta = jdelta /
+			(((runtime->period_size * HZ) / runtime->rate)
+								+ HZ/100);
+		hw_ptr_error(substream,
+			     "hw_ptr skipping! [Q] "
+			     "(pos=%ld, delta=%ld, period=%ld, "
+			     "jdelta=%lu/%lu/%lu)\n",
+			     (long)pos, (long)hdelta,
+			     (long)runtime->period_size, jdelta,
+			     ((hdelta * HZ) / runtime->rate), delta);
+		hw_ptr_interrupt = runtime->hw_ptr_interrupt +
+				   runtime->period_size * delta;
+		if (hw_ptr_interrupt >= runtime->boundary)
+			hw_ptr_interrupt -= runtime->boundary;
+		/* rebase to interrupt position */
+		hw_base = new_hw_ptr = hw_ptr_interrupt;
+		/* align hw_base to buffer_size */
+		hw_base -= hw_base % runtime->buffer_size;
+		delta = 0;
+	}
+	if (delta > runtime->period_size + runtime->period_size / 2) {
 		hw_ptr_error(substream,
 			     "Lost interrupts? "
 			     "(stream=%i, delta=%ld, intr_ptr=%ld)\n",
@@ -263,6 +288,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
 
 	runtime->hw_ptr_base = hw_base;
 	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
 	runtime->hw_ptr_interrupt = hw_ptr_interrupt;
 
 	return snd_pcm_update_hw_ptr_post(substream, runtime);
@@ -275,6 +301,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 	snd_pcm_uframes_t pos;
 	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;
 	snd_pcm_sframes_t delta;
+	unsigned long jdelta;
 
 	old_hw_ptr = runtime->status->hw_ptr;
 	pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
@@ -286,14 +313,15 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 	new_hw_ptr = hw_base + pos;
 
 	delta = new_hw_ptr - old_hw_ptr;
+	jdelta = jiffies - runtime->hw_ptr_jiffies;
 	if (delta < 0) {
 		delta += runtime->buffer_size;
 		if (delta < 0) {
 			hw_ptr_error(substream, 
 				     "Unexpected hw_pointer value [2] "
-				     "(stream=%i, pos=%ld, old_ptr=%ld)\n",
+				     "(stream=%i, pos=%ld, old_ptr=%ld, jdelta=%li)\n",
 				     substream->stream, (long)pos,
-				     (long)old_hw_ptr);
+				     (long)old_hw_ptr, jdelta);
 			return 0;
 		}
 		hw_base += runtime->buffer_size;
@@ -301,12 +329,13 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 			hw_base = 0;
 		new_hw_ptr = hw_base + pos;
 	}
-	if (delta > runtime->period_size && runtime->periods > 1) {
+	if (((delta * HZ) / runtime->rate) > jdelta + HZ/100) {
 		hw_ptr_error(substream,
 			     "hw_ptr skipping! "
-			     "(pos=%ld, delta=%ld, period=%ld)\n",
+			     "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n",
 			     (long)pos, (long)delta,
-			     (long)runtime->period_size);
+			     (long)runtime->period_size, jdelta,
+			     ((delta * HZ) / runtime->rate));
 		return 0;
 	}
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
@@ -315,6 +344,7 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
 
 	runtime->hw_ptr_base = hw_base;
 	runtime->status->hw_ptr = new_hw_ptr;
+	runtime->hw_ptr_jiffies = jiffies;
 
 	return snd_pcm_update_hw_ptr_post(substream, runtime);
 }
@@ -1441,6 +1471,7 @@ static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,
 		runtime->status->hw_ptr %= runtime->buffer_size;
 	else
 		runtime->status->hw_ptr = 0;
+	runtime->hw_ptr_jiffies = jiffies;
 	snd_pcm_stream_unlock_irqrestore(substream, flags);
 	return 0;
 }
-- 
1.6.2.2


drm-intel-gen3-fb-hack.patch:

--- NEW FILE drm-intel-gen3-fb-hack.patch ---
diff -up linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c.jx linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c.jx	2009-04-09 13:42:51.000000000 -0400
+++ linux-2.6.29.noarch/drivers/gpu/drm/i915/intel_display.c	2009-04-09 13:44:14.000000000 -0400
@@ -2011,8 +2011,8 @@ void intel_modeset_init(struct drm_devic
 		dev->mode_config.max_width = 8192;
 		dev->mode_config.max_height = 8192;
 	} else {
-		dev->mode_config.max_width = 2048;
-		dev->mode_config.max_height = 2048;
+		dev->mode_config.max_width = 4096;
+		dev->mode_config.max_height = 4096;
 	}
 
 	/* set memory base */

drm-intel-lying-systems-without-lvds.patch:

--- NEW FILE drm-intel-lying-systems-without-lvds.patch ---
[PATCH] drm: ignore LVDS on intel graphics systems that lie about having it

There are a number of small form factor desktop systems with Intel mobile
graphics chips that lie and say they have an LVDS. With kernel mode-setting,
this becomes a problem, and makes native resolution boot go haywire -- for
example, my Dell Studio Hybrid, hooked to a 1920x1080 display claims to
have a 1024x768 LVDS, and the resulting graphical boot on the 1920x1080
display uses only the top left 1024x768, and auto-configured X will end
up only 1024x768 as well. With this change, graphical boot and X
both do 1920x1080 as expected.

Nb: one minor issue... Current Fedora rawhide, video playback using Xv
makes X go off into the weeds with this patch added... But that's a bug
elsewhere, still confident this patch DTRT.

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 drivers/gpu/drm/i915/intel_lvds.c |   46 ++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 6619f26..4d64686 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -384,7 +384,51 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
 	.destroy = intel_lvds_enc_destroy,
 };
 
+static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
+{
+	DRM_DEBUG("Skipping LVDS initialization for %s\n", id->ident);
+	return 1;
+}
 
+/* These systems claim to have LVDS, but really don't */
+static const struct dmi_system_id __initdata intel_no_lvds[] = {
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Apple Mac Mini (Core series)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"),
+		},
+	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Apple Mac Mini (Core 2 series)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Macmini2,1"),
+		},
+	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "MSI IM-945GSE-A",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "MSI"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "A9830IMS"),
+		},
+	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Dell Studio Hybrid",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Studio Hybrid 140g"),
+		},
+	},
+
+	/* FIXME: add a check for the Aopen Mini PC */
+
+	{ }	/* terminating entry */
+};
 
 /**
  * intel_lvds_init - setup LVDS connectors on this device
@@ -404,15 +440,9 @@ void intel_lvds_init(struct drm_device *dev)
 	u32 lvds;
 	int pipe;
 
-	/* Blacklist machines that we know falsely report LVDS. */
-	/* FIXME: add a check for the Aopen Mini PC */
-
-	/* Apple Mac Mini Core Duo and Mac Mini Core 2 Duo */
-	if(dmi_match(DMI_PRODUCT_NAME, "Macmini1,1") ||
-	   dmi_match(DMI_PRODUCT_NAME, "Macmini2,1")) {
-		DRM_DEBUG("Skipping LVDS initialization for Apple Mac Mini\n");
+	/* Skip init on machines we know falsely report LVDS */
+	if (dmi_check_system(intel_no_lvds))
 		return;
-	}
 
 	intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
 	if (!intel_output) {

linux-2.6-acer-wmi-bail-on-aao.patch:

--- NEW FILE linux-2.6-acer-wmi-bail-on-aao.patch ---
From: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date: Sat, 4 Apr 2009 08:33:29 +0000 (+0100)
Subject: acer-wmi: Blacklist Acer Aspire One
X-Git-Tag: v2.6.30-rc1~199^2~15^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a74dd5fdabcd34c93e17e9c7024eeb503c92b048

acer-wmi: Blacklist Acer Aspire One

The Aspire One's ACPI-WMI interface is a placeholder that does nothing,
and the invalid results that we get from it are now causing userspace
problems as acer-wmi always returns that the rfkill is enabled (i.e. the
radio is off, when it isn't). As it's hardware controlled, acer-wmi
isn't needed on the Aspire One either.

Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace
issues to this.

Signed-off-by: Carlos Corbacho <carlos at strangeworlds.co.uk>
Reported-by: Andy Whitcroft <apw at canonical.com>
Cc: stable at kernel.org
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index a6a42e8..60fbef2 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -225,6 +225,25 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
 	.wireless = 2,
 };
 
+/* The Aspire One has a dummy ACPI-WMI interface - disable it */
+static struct dmi_system_id __devinitdata acer_blacklist[] = {
+	{
+		.ident = "Acer Aspire One (SSD)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+		},
+	},
+	{
+		.ident = "Acer Aspire One (HDD)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
+		},
+	},
+	{}
+};
+
 static struct dmi_system_id acer_quirks[] = {
 	{
 		.callback = dmi_matched,
@@ -1254,6 +1273,12 @@ static int __init acer_wmi_init(void)
 
 	printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
 
+	if (dmi_check_system(acer_blacklist)) {
+		printk(ACER_INFO "Blacklisted hardware detected - "
+				"not loading\n");
+		return -ENODEV;
+	}
+
 	find_quirks();
 
 	/*

linux-2.6-add-qcserial.patch:

--- NEW FILE linux-2.6-add-qcserial.patch ---
diff -up linux-2.6.29.noarch/drivers/usb/serial/Kconfig.qcserial linux-2.6.29.noarch/drivers/usb/serial/Kconfig
--- linux-2.6.29.noarch/drivers/usb/serial/Kconfig.qcserial	2009-03-23 23:12:14.000000000 +0000
+++ linux-2.6.29.noarch/drivers/usb/serial/Kconfig	2009-04-04 18:25:46.000000000 +0100
@@ -472,6 +472,15 @@ config USB_SERIAL_OTI6858
 	  To compile this driver as a module, choose M here: the
 	  module will be called oti6858.
 
+config USB_SERIAL_QUALCOMM
+	tristate "USB Qualcomm Serial modem"
+	help
+	  Say Y here if you have a Qualcomm USB modem device.  These are
+	  usually wireless cellular modems.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called qcserial.
+
 config USB_SERIAL_SPCP8X5
 	tristate "USB SPCP8x5 USB To Serial Driver"
 	help
diff -up linux-2.6.29.noarch/drivers/usb/serial/Makefile.qcserial linux-2.6.29.noarch/drivers/usb/serial/Makefile
--- linux-2.6.29.noarch/drivers/usb/serial/Makefile.qcserial	2009-03-23 23:12:14.000000000 +0000
+++ linux-2.6.29.noarch/drivers/usb/serial/Makefile	2009-04-04 18:25:46.000000000 +0100
@@ -45,6 +45,7 @@ obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opt
 obj-$(CONFIG_USB_SERIAL_OPTION)			+= option.o
 obj-$(CONFIG_USB_SERIAL_OTI6858)		+= oti6858.o
 obj-$(CONFIG_USB_SERIAL_PL2303)			+= pl2303.o
+obj-$(CONFIG_USB_SERIAL_QUALCOMM)		+= qcserial.o
 obj-$(CONFIG_USB_SERIAL_SAFE)			+= safe_serial.o
 obj-$(CONFIG_USB_SERIAL_SIEMENS_MPI)		+= siemens_mpi.o
 obj-$(CONFIG_USB_SERIAL_SIERRAWIRELESS)		+= sierra.o
diff -up /dev/null linux-2.6.29.noarch/drivers/usb/serial/qcserial.c
--- /dev/null	2009-04-03 17:11:07.397135076 +0100
+++ linux-2.6.29.noarch/drivers/usb/serial/qcserial.c	2009-04-04 18:26:00.000000000 +0100
@@ -0,0 +1,168 @@
+/*
+ * Qualcomm Serial USB driver
+ *
+ *	Copyright (c) 2008 QUALCOMM Incorporated.
+ *	Copyright (c) 2009 Greg Kroah-Hartman <gregkh at suse.de>
+ *	Copyright (c) 2009 Novell Inc.
+ *
+ *	This program is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU General Public License version
+ *	2 as published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+
+#define DRIVER_AUTHOR "Qualcomm Inc"
+#define DRIVER_DESC "Qualcomm USB Serial driver"
+
+static int debug;
+
+static struct usb_device_id id_table[] = {
+	{USB_DEVICE(0x05c6, 0x9211)},	/* Acer Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */
+	{USB_DEVICE(0x03f0, 0x1f1d)},	/* HP un2400 Gobi Modem Device */
+	{USB_DEVICE(0x03f0, 0x201d)},	/* HP un2400 Gobi QDL Device */
+	{USB_DEVICE(0x04da, 0x250d)},	/* Panasonic Gobi Modem device */
+	{USB_DEVICE(0x04da, 0x250c)},	/* Panasonic Gobi QDL device */
+	{USB_DEVICE(0x413c, 0x8172)},	/* Dell Gobi Modem device */
+	{USB_DEVICE(0x413c, 0x8171)},	/* Dell Gobi QDL device */
+	{USB_DEVICE(0x1410, 0xa001)},	/* Novatel Gobi Modem device */
+	{USB_DEVICE(0x1410, 0xa008)},	/* Novatel Gobi QDL device */
+	{USB_DEVICE(0x0b05, 0x1776)},	/* Asus Gobi Modem device */
+	{USB_DEVICE(0x0b05, 0x1774)},	/* Asus Gobi QDL device */
+	{USB_DEVICE(0x19d2, 0xfff3)},	/* ONDA Gobi Modem device */
+	{USB_DEVICE(0x19d2, 0xfff2)},	/* ONDA Gobi QDL device */
+	{USB_DEVICE(0x1557, 0x0a80)},	/* OQO Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9001)},   /* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9002)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9202)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9203)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9222)},	/* Generic Gobi Modem device */
+	{USB_DEVICE(0x05c6, 0x9008)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9201)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9221)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x05c6, 0x9231)},	/* Generic Gobi QDL device */
+	{USB_DEVICE(0x1f45, 0x0001)},	/* Unknown Gobi QDL device */
+	{ }				/* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static struct usb_driver qcdriver = {
+	.name			= "qcserial",
+	.probe			= usb_serial_probe,
+	.disconnect		= usb_serial_disconnect,
+	.id_table		= id_table,
+	.suspend		= usb_serial_suspend,
+	.resume			= usb_serial_resume,
+	.supports_autosuspend	= true,
+};
+
+static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
+{
+	int retval = -ENODEV;
+	__u8 nintf;
+	__u8 ifnum;
+
+	dbg("%s", __func__);
+
+	nintf = serial->dev->actconfig->desc.bNumInterfaces;
+	dbg("Num Interfaces = %d", nintf);
+	ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
+	dbg("This Interface = %d", ifnum);
+
+	switch (nintf) {
+	case 1:
+		/* QDL mode */
+		if (serial->interface->num_altsetting == 2) {
+			struct usb_host_interface *intf;
+
+			intf = &serial->interface->altsetting[1];
+			if (intf->desc.bNumEndpoints == 2) {
+				if (usb_endpoint_is_bulk_in(&intf->endpoint[0].desc) &&
+				    usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) {
+					dbg("QDL port found");
+					retval = usb_set_interface(serial->dev, ifnum, 1);
+					if (retval < 0) {
+						dev_err(&serial->dev->dev,
+							"Could not set interface, error %d\n",
+							retval);
+						retval = -ENODEV;
+					}
+					return retval;
+				}
+			}
+		}
+		break;
+
+	case 4:
+		/* Composite mode */
+		if (ifnum == 2) {
+			dbg("Modem port found");
+			retval = usb_set_interface(serial->dev, ifnum, 0);
+			if (retval < 0) {
+				dev_err(&serial->dev->dev,
+					"Could not set interface, error %d\n",
+					retval);
+				retval = -ENODEV;
+			}
+			return retval;
+		}
+		break;
+
+	default:
+		dev_err(&serial->dev->dev,
+			"unknown number of interfaces: %d\n", nintf);
+		return -ENODEV;
+	}
+
+	return retval;
+}
+
+static struct usb_serial_driver qcdevice = {
+	.driver = {
+		.owner     = THIS_MODULE,
+		.name      = "qcserial",
+	},
+	.description         = "Qualcomm USB modem",
+	.id_table            = id_table,
+	.usb_driver          = &qcdriver,
+	.num_ports           = 1,
+	.probe               = qcprobe,
+};
+
+static int __init qcinit(void)
+{
+	int retval;
+
+	retval = usb_serial_register(&qcdevice);
+	if (retval)
+		return retval;
+
+	retval = usb_register(&qcdriver);
+	if (retval) {
+		usb_serial_deregister(&qcdevice);
+		return retval;
+	}
+
+	return 0;
+}
+
+static void __exit qcexit(void)
+{
+	usb_deregister(&qcdriver);
+	usb_serial_deregister(&qcdevice);
+}
+
+module_init(qcinit);
+module_exit(qcexit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL v2");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");

linux-2.6-btrfs-fix-umount-hang.patch:

--- NEW FILE linux-2.6-btrfs-fix-umount-hang.patch ---
Need to check kthread_should_stop after schedule_timeout() before calling schedule(). This causes threads to sleep with potentially no one to wake them up causing mount(2) to hang in btrfs_stop_workers waiting for threads to stop. Race, IMO, is more evident on UP than on SMP.

Signed-off-by: Amit Gud <gud at ksu.edu>

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index c84ca1f..4c1f3e5 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -195,6 +195,9 @@ again_locked:
 				if (!list_empty(&worker->pending))
 					continue;
 
+				if (kthread_should_stop())
+					return 0;
+
 				/* still no more work?, sleep for real */
 				spin_lock_irq(&worker->lock);
 				set_current_state(TASK_INTERRUPTIBLE);

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: linux-2.6-crash-driver.patch
diff -N linux-2.6-crash-driver.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-crash-driver.patch	14 Apr 2009 22:09:15 -0000	1.12.6.3
@@ -0,0 +1,363 @@
+diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+new file mode 100644
+index 0000000..541af84
+--- /dev/null
++++ b/arch/ia64/include/asm/crash.h
+@@ -0,0 +1,90 @@
++#ifndef _ASM_IA64_CRASH_H
++#define _ASM_IA64_CRASH_H
++
++/*
++ * linux/include/asm-ia64/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/efi.h>
++#include <linux/mm.h>
++#include <asm/mmzone.h>
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	u32 type;
++
++	if (REGION_NUMBER(offset) == 5) {
++		char byte;
++
++		if (__get_user(byte, (char *)offset) == 0)
++			return (void *)offset;
++		else
++			return NULL;
++	}
++
++	switch (type = efi_mem_type(offset)) 
++	{
++	case EFI_LOADER_CODE:
++	case EFI_LOADER_DATA:
++	case EFI_BOOT_SERVICES_CODE:
++	case EFI_BOOT_SERVICES_DATA:
++	case EFI_CONVENTIONAL_MEMORY:
++		break;
++
++	default:
++		printk(KERN_INFO
++		    "crash memory driver: invalid memory type for %lx: %d\n", 
++			offset, type);
++		return NULL;
++	}
++
++	pfn = offset >> PAGE_SHIFT;
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++			"crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	if (!page->virtual) {
++		printk(KERN_INFO
++		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
++			offset, (unsigned long)page);
++		return NULL;
++	}
++
++	return (page->virtual + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	return;
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_IA64_CRASH_H */
+diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
+index 6da1f20..2984fb3 100644
+--- a/arch/ia64/kernel/ia64_ksyms.c
++++ b/arch/ia64/kernel/ia64_ksyms.c
+@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+ #include <asm/unwind.h>
+ EXPORT_SYMBOL(unw_init_running);
+ 
++#include <linux/efi.h>
++EXPORT_SYMBOL_GPL(efi_mem_type);
++
+ #ifdef ASM_SUPPORTED
+ # ifdef CONFIG_SMP
+ #  if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index d4c4307..d1c968f 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(page_is_ram);
+ 
+ /*
+  * Fix up the linear direct mapping of the kernel to avoid cache attribute
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 43d6ba8..0d81c9a 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -460,6 +460,8 @@ config LEGACY_PTYS
+ 	  security.  This option enables these legacy devices; on most
+ 	  systems, it is safe to say N.
+ 
++config CRASH
++        tristate "Crash Utility memory driver"
+ 
+ config LEGACY_PTY_COUNT
+ 	int "Maximum number of legacy PTY in use"
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index 438f713..1b7767b 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
+ 
++obj-$(CONFIG_CRASH)		+= crash.o
++
+ # Files generated that shall be removed upon make clean
+ clean-files := consolemap_deftbl.c defkeymap.c
+ 
+diff --git a/drivers/char/crash.c b/drivers/char/crash.c
+new file mode 100644
+index 0000000..e5437de
+--- /dev/null
++++ b/drivers/char/crash.c
+@@ -0,0 +1,128 @@
++/*
++ *  linux/drivers/char/crash.c
++ *
++ *  Copyright (C) 2004  Dave Anderson <anderson at redhat.com>
++ *  Copyright (C) 2004  Red Hat, Inc.
++ */
++
++/******************************************************************************
++ *
++ *   This program is free software; you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation; either version 2, or (at your option)
++ *   any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program; if not, write to the Free Software
++ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ *****************************************************************************/
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/miscdevice.h>
++#include <linux/init.h>
++#include <asm/io.h>
++#include <asm/uaccess.h>
++#include <asm/types.h>
++#include <asm/crash.h>
++
++#define CRASH_VERSION   "1.0"
++
++/*
++ *  These are the file operation functions that allow crash utility
++ *  access to physical memory.
++ */
++
++static loff_t 
++crash_llseek(struct file * file, loff_t offset, int orig)
++{
++	switch (orig) {
++	case 0:
++		file->f_pos = offset;
++		return file->f_pos;
++	case 1:
++		file->f_pos += offset;
++		return file->f_pos;
++	default:
++		return -EINVAL;
++	}
++}
++
++/*
++ *  Determine the page address for an address offset value, 
++ *  get a virtual address for it, and copy it out.
++ *  Accesses must fit within a page.
++ */
++static ssize_t
++crash_read(struct file *file, char *buf, size_t count, loff_t *poff)
++{
++	void *vaddr;
++	struct page *page;
++	u64 offset;
++	ssize_t read;
++
++	offset = *poff;
++	if (offset >> PAGE_SHIFT != (offset+count-1) >> PAGE_SHIFT) 
++		return -EINVAL;
++
++	vaddr = map_virtual(offset, &page);
++	if (!vaddr)
++		return -EFAULT;
++
++	if (copy_to_user(buf, vaddr, count)) {
++		unmap_virtual(page);
++		return -EFAULT;
++	}
++	unmap_virtual(page);
++
++	read = count;
++	*poff += read;
++	return read;
++}
++
++static struct file_operations crash_fops = {
++	.owner = THIS_MODULE,
++	.llseek = crash_llseek,
++	.read = crash_read,
++};
++
++static struct miscdevice crash_dev = {
++	MISC_DYNAMIC_MINOR,
++	"crash",
++	&crash_fops
++};
++
++static int __init
++crash_init(void)
++{
++	int ret;
++
++	ret = misc_register(&crash_dev);
++	if (ret) {
++		printk(KERN_ERR 
++		    "crash memory driver: cannot misc_register (MISC_DYNAMIC_MINOR)\n");
++		goto out;
++	}
++	
++	ret = 0;
++	printk(KERN_INFO "crash memory driver: version %s\n", CRASH_VERSION);
++out:
++	return ret;
++}
++
++static void __exit
++crash_cleanup_module(void)
++{
++	misc_deregister(&crash_dev);
++}
++
++module_init(crash_init);
++module_exit(crash_cleanup_module);
++
++MODULE_LICENSE("GPL");
+diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/include/asm-x86/crash.h
+@@ -0,0 +1,75 @@
++#ifndef _ASM_I386_CRASH_H
++#define _ASM_I386_CRASH_H
++
++/*
++ * linux/include/asm-i386/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <asm/mmzone.h>
++
++extern int page_is_ram(unsigned long);
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	void *vaddr;
++
++	pfn = (unsigned long)(offset >> PAGE_SHIFT);
++
++	if (!page_is_ram(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
++		return NULL;
++	}
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	vaddr = kmap(page);
++	if (!vaddr) {
++		printk(KERN_INFO
++		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
++			pfn, (unsigned long)page);
++		return NULL;
++	}
++
++	*pp = page;
++	return (vaddr + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	kunmap(page);
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_I386_CRASH_H */

linux-2.6-dma-debug-fixes.patch:

--- NEW FILE linux-2.6-dma-debug-fixes.patch ---
Date: 	Fri, 3 Apr 2009 15:50:14 +0200
From: Joerg Roedel <joerg.roedel at amd.com>
To: mingo at redhat.com
CC: linux-kernel at vger.kernel.org, shemminger at vyatta.com
Subject: [git pull] dma-debug fixes for 2.6.30-rc
Message-ID: <20090403135014.GG22472 at amd.com>

Hi Ingo,

The following changes since commit 8fe74cf053de7ad2124a894996f84fa890a81093:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git dma-debug

Joerg Roedel (1):
      x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

 arch/x86/include/asm/pci.h    |   36 ++++++++++++++++++++++++++++++++----
 arch/x86/include/asm/pci_32.h |   34 ----------------------------------
 arch/x86/include/asm/pci_64.h |   22 ----------------------
 3 files changed, 32 insertions(+), 60 deletions(-)
 delete mode 100644 arch/x86/include/asm/pci_32.h

This unification fixes dma-debug false positives on i386 reporting that a dma
mapping was freed with another length than it was allocated. The full diff is
also attached. This patch is against linus/master since your HEAD of latest
tip/core/iommu branch is currently 2.6.29 final. Please pull.

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index a977de2..e403448 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -86,12 +86,40 @@ static inline void early_quirks(void) { }
 
 extern void pci_iommu_alloc(void);
 
-#endif  /* __KERNEL__ */
+#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
+
+#if defined(CONFIG_X86_64) || defined(CONFIG_DMA_API_DEBUG)
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
+	        dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \
+	        __u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)                  \
+	        ((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \
+	        (((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)                    \
+	        ((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \
+	        (((PTR)->LEN_NAME) = (VAL))
 
-#ifdef CONFIG_X86_32
-# include "pci_32.h"
 #else
-# include "pci_64.h"
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
+#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
+	        do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
+#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
+	        do { break; } while (pci_unmap_len(PTR, LEN_NAME))
+
+#endif
+
+#endif  /* __KERNEL__ */
+
+#ifdef CONFIG_X86_64
+#include "pci_64.h"
 #endif
 
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h
index 4da2079..ae5e40f 100644
--- a/arch/x86/include/asm/pci_64.h
+++ b/arch/x86/include/asm/pci_64.h
@@ -24,28 +24,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
 
 extern void dma32_reserve_bootmem(void);
 
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions
- *
- * On AMD64 it mostly equals, but we set it to zero if a hardware
- * IOMMU (gart) of sotware IOMMU (swiotlb) is available.
- */
-#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\
-	dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
-	__u32 LEN_NAME;
-#define pci_unmap_addr(PTR, ADDR_NAME)			\
-	((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
-	(((PTR)->ADDR_NAME) = (VAL))
-#define pci_unmap_len(PTR, LEN_NAME)			\
-	((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
-	(((PTR)->LEN_NAME) = (VAL))
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_X86_PCI_64_H */

linux-2.6-e820-acpi3-bios-workaround.patch:

--- NEW FILE linux-2.6-e820-acpi3-bios-workaround.patch ---
From: H. Peter Anvin <hpa at zytor.com>
Date: Sat, 28 Mar 2009 20:53:26 +0000 (-0700)
Subject: x86, setup: ACPI 3, BIOS workaround for E820-probing code
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c549e71d073a6e9a4847497344db28a784061455

x86, setup: ACPI 3, BIOS workaround for E820-probing code

Impact: ACPI 3 spec compliance, BIOS bug workaround

The ACPI 3 spec added another field to the E820 buffer -- which is
backwards incompatible, since it contains a validity bit.
Furthermore, there has been at least one report of a BIOS which
assumes that the buffer it is pointed at is the same buffer as for the
previous E820 call.  Therefore, read the data into a temporary buffer
and copy the standard part of it if and only if the valid bit is set.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index fcdb10a..d5d2360 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -2,6 +2,7 @@
  *
  *   Copyright (C) 1991, 1992 Linus Torvalds
  *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *   Copyright 2009 Intel Corporation; author H. Peter Anvin
  *
  *   This file is part of the Linux kernel, and is made available under
  *   the terms of the GNU General Public License version 2.
@@ -16,6 +17,11 @@
 
 #define SMAP	0x534d4150	/* ASCII "SMAP" */
 
+struct e820_ext_entry {
+	struct e820entry std;
+	u32 ext_flags;
+} __attribute__((packed));
+
 static int detect_memory_e820(void)
 {
 	int count = 0;
@@ -23,9 +29,10 @@ static int detect_memory_e820(void)
 	u32 size, id, edi;
 	u8 err;
 	struct e820entry *desc = boot_params.e820_map;
+	static struct e820_ext_entry buf; /* static so it is zeroed */
 
 	do {
-		size = sizeof(struct e820entry);
+		size = sizeof buf;
 
 		/* Important: %edx and %esi are clobbered by some BIOSes,
 		   so they must be either used for the error output
@@ -33,8 +40,8 @@ static int detect_memory_e820(void)
 		   is something out there clobbering %ebp and %edi, too. */
 		asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0"
 		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
-		      "=D" (edi), "=m" (*desc)
-		    : "D" (desc), "d" (SMAP), "a" (0xe820)
+		      "=D" (edi), "+m" (buf)
+		    : "D" (&buf), "d" (SMAP), "a" (0xe820)
 		    : "esi");
 
 		/* BIOSes which terminate the chain with CF = 1 as opposed
@@ -53,8 +60,14 @@ static int detect_memory_e820(void)
 			break;
 		}
 
+		/* ACPI 3.0 added the extended flags support.  If bit 0
+		   in the extended flags is zero, we're supposed to simply
+		   ignore the entry -- a backwards incompatible change! */
+		if (size > 20 && !(buf.ext_flags & 1))
+			continue;
+
+		*desc++ = buf.std;
 		count++;
-		desc++;
 	} while (next && count < ARRAY_SIZE(boot_params.e820_map));
 
 	return boot_params.e820_entries = count;

linux-2.6-e820-guard-against-pre-acpi3.patch:

--- NEW FILE linux-2.6-e820-guard-against-pre-acpi3.patch ---
From: H. Peter Anvin <hpa at zytor.com>
Date: Wed, 1 Apr 2009 18:35:00 +0000 (-0700)
Subject: x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cd670599b7b00d9263f6f11a05c0edeb9cbedaf3

x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx

Impact: BIOS bug safety

For pre-ACPI 3 BIOSes, pre-initialize the end of the e820 buffer just
in case the BIOS returns an unchanged %ecx but without actually
touching the ACPI 3 extended flags field.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index d5d2360..5054c2d 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -31,6 +31,12 @@ static int detect_memory_e820(void)
 	struct e820entry *desc = boot_params.e820_map;
 	static struct e820_ext_entry buf; /* static so it is zeroed */
 
+	/*
+	 * Set this here so that if the BIOS doesn't change this field
+	 * but still doesn't change %ecx, we're still okay...
+	 */
+	buf.ext_flags = 1;
+
 	do {
 		size = sizeof buf;
 

linux-2.6-e820-mark-esi-clobbered.patch:

--- NEW FILE linux-2.6-e820-mark-esi-clobbered.patch ---
From: Michael K. Johnson <johnsonm at rpath.com>
Date: Fri, 27 Mar 2009 17:14:41 +0000 (-0400)
Subject: x86, setup: mark %esi as clobbered in E820 BIOS call
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=01522df346f846906eaf6ca57148641476209909

x86, setup: mark %esi as clobbered in E820 BIOS call

Jordan Hargrave diagnosed a BIOS clobbering %esi in the E820 call.
That particular BIOS has been fixed, but there is a possibility that
this is responsible for other occasional reports of early boot
failure, and it does not hurt to add %esi to the clobbers.

-stable candidate patch.

Cc: Justin Forbes <jmforbes at linuxtx.org>
Signed-off-by: Michael K Johnson <johnsonm at rpath.com>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: stable at kernel.org
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index 8c3c25f..a99dbbe 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -27,13 +27,14 @@ static int detect_memory_e820(void)
 	do {
 		size = sizeof(struct e820entry);
 
-		/* Important: %edx is clobbered by some BIOSes,
-		   so it must be either used for the error output
+		/* Important: %edx and %esi are clobbered by some BIOSes,
+		   so they must be either used for the error output
 		   or explicitly marked clobbered. */
 		asm("int $0x15; setc %0"
 		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
 		      "=m" (*desc)
-		    : "D" (desc), "d" (SMAP), "a" (0xe820));
+		    : "D" (desc), "d" (SMAP), "a" (0xe820)
+		    : "esi");
 
 		/* BIOSes which terminate the chain with CF = 1 as opposed
 		   to %ebx = 0 don't always report the SMAP signature on

linux-2.6-e820-save-restore-edi-ebp.patch:

--- NEW FILE linux-2.6-e820-save-restore-edi-ebp.patch ---
From: H. Peter Anvin <hpa at zytor.com>
Date: Sat, 28 Mar 2009 20:53:26 +0000 (-0700)
Subject: x86, setup: preemptively save/restore edi and ebp around INT 15 E820
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=32ec7fd08b597586774b92ac1cd2678021ccac1b

x86, setup: preemptively save/restore edi and ebp around INT 15 E820

Impact: BIOS bugproofing

Since there are BIOSes known to clobber %ebx and %esi for INT 15 E820,
assume there is something out there clobbering %edi and/or %ebp too,
and don't wait for it to fail.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index a99dbbe..fcdb10a 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -20,7 +20,7 @@ static int detect_memory_e820(void)
 {
 	int count = 0;
 	u32 next = 0;
-	u32 size, id;
+	u32 size, id, edi;
 	u8 err;
 	struct e820entry *desc = boot_params.e820_map;
 
@@ -29,10 +29,11 @@ static int detect_memory_e820(void)
 
 		/* Important: %edx and %esi are clobbered by some BIOSes,
 		   so they must be either used for the error output
-		   or explicitly marked clobbered. */
-		asm("int $0x15; setc %0"
+		   or explicitly marked clobbered.  Given that, assume there
+		   is something out there clobbering %ebp and %edi, too. */
+		asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0"
 		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
-		      "=m" (*desc)
+		      "=D" (edi), "=m" (*desc)
 		    : "D" (desc), "d" (SMAP), "a" (0xe820)
 		    : "esi");
 

linux-2.6-ext4-really-print-warning-once.patch:

--- NEW FILE linux-2.6-ext4-really-print-warning-once.patch ---
ext4: really print the find_group_flex fallback warning only once

Missing braces caused the warning to print more than once.

Signed-Off-By: Chuck Ebbert <cebbert at redhat.com>

--- linux-2.6.27.noarch.orig/fs/ext4/ialloc.c
+++ linux-2.6.27.noarch/fs/ext4/ialloc.c
@@ -705,11 +705,12 @@ struct inode *ext4_new_inode(handle_t *h
 		ret2 = find_group_flex(sb, dir, &group);
 		if (ret2 == -1) {
 			ret2 = find_group_other(sb, dir, &group);
-			if (ret2 == 0 && once)
+			if (ret2 == 0 && once) {
 				once = 0;
 				printk(KERN_NOTICE "ext4: find_group_flex "
 				       "failed, fallback succeeded dir %lu\n",
 				       dir->i_ino);
+			}
 		}
 		goto got_group;
 	}

linux-2.6-fiemap-header-install.patch:

--- NEW FILE linux-2.6-fiemap-header-install.patch ---
Index: linux-2.6.29.noarch/include/linux/Kbuild
===================================================================
--- linux-2.6.29.noarch.orig/include/linux/Kbuild
+++ linux-2.6.29.noarch/include/linux/Kbuild
@@ -67,6 +67,7 @@ header-y += falloc.h
 header-y += fd.h
 header-y += fdreg.h
 header-y += fib_rules.h
+header-y += fiemap.h
 header-y += firewire-cdev.h
 header-y += firewire-constants.h
 header-y += fuse.h

linux-2.6-input-wacom-bluetooth.patch:

--- NEW FILE linux-2.6-input-wacom-bluetooth.patch ---
>From 99074a7cf9622837af84d330e07bdb46307c254f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 16 Mar 2009 23:36:54 +0000
Subject: [PATCH] Wacom Graphire Bluetooth driver

Signed-off-by: Bastien Nocera <hadess at hadess.net>

Based on the work by Andrew Zabolotny, an HID driver for the Bluetooth
Wacom tablet. This is required as it uses a slightly different
protocols from what's currently support by the drivers/input/wacom*
driver, and those only support USB.

A user-space patch is required to activate mode 2 of the Wacom tablet,
as hidp does not support hid_output_raw_report.
---
 drivers/hid/Kconfig     |    7 ++
 drivers/hid/Makefile    |    1 +
 drivers/hid/hid-core.c  |    1 +
 drivers/hid/hid-ids.h   |    1 +
 drivers/hid/hid-wacom.c |  260 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 270 insertions(+), 0 deletions(-)
 create mode 100644 drivers/hid/hid-wacom.c

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e85c8fe..f3244e3 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -261,6 +261,13 @@ config THRUSTMASTER_FF
 	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
 	  a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.
 
+config HID_WACOM
+	tristate "Wacom Bluetooth devices support" if EMBEDDED
+	depends on BT_HIDP
+	default !EMBEDDED
+	---help---
+	Support for Wacom Graphire Bluetooth tablet.
+
 config ZEROPLUS_FF
 	tristate "Zeroplus based game controller support"
 	depends on USB_HID
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index fbd021f..410b302 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_GREENASIA_FF)	+= hid-gaff.o
 obj-$(CONFIG_THRUSTMASTER_FF)	+= hid-tmff.o
 obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o
 obj-$(CONFIG_ZEROPLUS_FF)	+= hid-zpff.o
+obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o
 
 obj-$(CONFIG_USB_HID)		+= usbhid/
 obj-$(CONFIG_USB_MOUSE)		+= usbhid/
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 1cc9674..d134f5d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1305,6 +1305,7 @@ static const struct hid_device_id hid_blacklist[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
 
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 8851197..e8f96c2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -400,6 +400,7 @@
 #define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006
 
 #define USB_VENDOR_ID_WACOM		0x056a
+#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81
 
 #define USB_VENDOR_ID_WISEGROUP		0x0925
 #define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
new file mode 100644
index 0000000..67c8c3a
--- /dev/null
+++ b/drivers/hid/hid-wacom.c
@@ -0,0 +1,260 @@
+/*
+ *  Bluetooth Wacom Tablet support
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech at suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike- at cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby <jirislaby at gmail.com>
+ *  Copyright (c) 2006 Andrew Zabolotny <zap at homelink.ru>
+ *  Copyright (c) 2009 Bastien Nocera <hadess at hadess.net>
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+struct wacom_data {
+	__u16 tool;
+	unsigned char butstate;
+};
+
+static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,
+		u8 *raw_data, int size)
+{
+	struct wacom_data *wdata = hid_get_drvdata(hdev);
+	struct hid_input *hidinput;
+	struct input_dev *input;
+	unsigned char *data = (unsigned char *) raw_data;
+	int tool, x, y, rw;
+
+	if (!(hdev->claimed & HID_CLAIMED_INPUT))
+		return 0;
+
+	tool = 0;
+	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
+	input = hidinput->input;
+
+	/* Check if this is a tablet report */
+	if (data[0] != 0x03)
+		return 0;
+
+	/* Get X & Y positions */
+	x = le16_to_cpu(*(__le16 *) &data[2]);
+	y = le16_to_cpu(*(__le16 *) &data[4]);
+
+	/* Get current tool identifier */
+	if (data[1] & 0x90) { /* If pen is in the in/active area */
+		switch ((data[1] >> 5) & 3) {
+		case 0:	/* Pen */
+			tool = BTN_TOOL_PEN;
+			break;
+
+		case 1: /* Rubber */
+			tool = BTN_TOOL_RUBBER;
+			break;
+
+		case 2: /* Mouse with wheel */
+		case 3: /* Mouse without wheel */
+			tool = BTN_TOOL_MOUSE;
+			break;
+		}
+
+		/* Reset tool if out of active tablet area */
+		if (!(data[1] & 0x10))
+			tool = 0;
+	}
+
+	/* If tool changed, notify input subsystem */
+	if (wdata->tool != tool) {
+		if (wdata->tool) {
+			/* Completely reset old tool state */
+			if (wdata->tool == BTN_TOOL_MOUSE) {
+				input_report_key(input, BTN_LEFT, 0);
+				input_report_key(input, BTN_RIGHT, 0);
+				input_report_key(input, BTN_MIDDLE, 0);
+				input_report_abs(input, ABS_DISTANCE,
+						input->absmax[ABS_DISTANCE]);
+			} else {
+				input_report_key(input, BTN_TOUCH, 0);
+				input_report_key(input, BTN_STYLUS, 0);
+				input_report_key(input, BTN_STYLUS2, 0);
+				input_report_abs(input, ABS_PRESSURE, 0);
+			}
+			input_report_key(input, wdata->tool, 0);
+			input_sync(input);
+		}
+		wdata->tool = tool;
+		if (tool)
+			input_report_key(input, tool, 1);
+	}
+
+	if (tool) {
+		input_report_abs(input, ABS_X, x);
+		input_report_abs(input, ABS_Y, y);
+
+		switch ((data[1] >> 5) & 3) {
+		case 2: /* Mouse with wheel */
+			input_report_key(input, BTN_MIDDLE, data[1] & 0x04);
+			rw = (data[6] & 0x01) ? -1 :
+				(data[6] & 0x02) ? 1 : 0;
+			input_report_rel(input, REL_WHEEL, rw);
+			/* fall through */
+
+		case 3: /* Mouse without wheel */
+			input_report_key(input, BTN_LEFT, data[1] & 0x01);
+			input_report_key(input, BTN_RIGHT, data[1] & 0x02);
+			/* Compute distance between mouse and tablet */
+			rw = 44 - (data[6] >> 2);
+			if (rw < 0)
+				rw = 0;
+			else if (rw > 31)
+				rw = 31;
+			input_report_abs(input, ABS_DISTANCE, rw);
+			break;
+
+		default:
+			input_report_abs(input, ABS_PRESSURE,
+					data[6] | (((__u16) (data[1] & 0x08)) << 5));
+			input_report_key(input, BTN_TOUCH, data[1] & 0x01);
+			input_report_key(input, BTN_STYLUS, data[1] & 0x02);
+			input_report_key(input, BTN_STYLUS2, (tool == BTN_TOOL_PEN) && data[1] & 0x04);
+			break;
+		}
+
+		input_sync(input);
+	}
+
+	/* Report the state of the two buttons at the top of the tablet
+	 * as two extra fingerpad keys (buttons 4 & 5). */
+	rw = data[7] & 0x03;
+	if (rw != wdata->butstate) {
+		wdata->butstate = rw;
+		input_report_key(input, BTN_0, rw & 0x02);
+		input_report_key(input, BTN_1, rw & 0x01);
+		input_event(input, EV_MSC, MSC_SERIAL, 0xf0);
+		input_sync(input);
+	}
+
+	return 1;
+}
+
+static int wacom_probe(struct hid_device *hdev,
+		const struct hid_device_id *id)
+{
+	struct hid_input *hidinput;
+	struct input_dev *input;
+	struct wacom_data *wdata;
+	int ret;
+
+	wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);
+	if (wdata == NULL) {
+		dev_err(&hdev->dev, "can't alloc wacom descriptor\n");
+		return -ENOMEM;
+	}
+
+	hid_set_drvdata(hdev, wdata);
+
+	ret = hid_parse(hdev);
+	if (ret) {
+		dev_err(&hdev->dev, "parse failed\n");
+		goto err_free;
+	}
+
+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+	if (ret) {
+		dev_err(&hdev->dev, "hw start failed\n");
+		goto err_free;
+	}
+
+	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
+	input = hidinput->input;
+
+	/* Basics */
+	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);
+	input->absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) |
+		BIT(ABS_PRESSURE) | BIT(ABS_DISTANCE);
+	input->relbit[0] |= BIT(REL_WHEEL);
+	set_bit(BTN_TOOL_PEN, input->keybit);
+	set_bit(BTN_TOUCH, input->keybit);
+	set_bit(BTN_STYLUS, input->keybit);
+	set_bit(BTN_STYLUS2, input->keybit);
+	set_bit(BTN_LEFT, input->keybit);
+	set_bit(BTN_RIGHT, input->keybit);
+	set_bit(BTN_MIDDLE, input->keybit);
+
+	/* Pad */
+	input->evbit[0] |= BIT(EV_MSC);
+	input->mscbit[0] |= BIT(MSC_SERIAL);
+
+	/* Distance, rubber and mouse */
+	input->absbit[0] |= BIT(ABS_DISTANCE);
+	set_bit(BTN_TOOL_RUBBER, input->keybit);
+	set_bit(BTN_TOOL_MOUSE, input->keybit);
+
+	input->absmax[ABS_PRESSURE] = 511;
+	input->absmax[ABS_DISTANCE] = 32;
+
+	input->absmax[ABS_X] = 16704;
+	input->absmax[ABS_Y] = 12064;
+	input->absfuzz[ABS_X] = 4;
+	input->absfuzz[ABS_Y] = 4;
+
+	return 0;
+err_free:
+	kfree(wdata);
+	return ret;
+}
+
+static void wacom_remove(struct hid_device *hdev)
+{
+	hid_hw_stop(hdev);
+	kfree(hid_get_drvdata(hdev));
+}
+
+static const struct hid_device_id wacom_devices[] = {
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
+
+	{ }
+};
+MODULE_DEVICE_TABLE(hid, wacom_devices);
+
+static struct hid_driver wacom_driver = {
+	.name = "wacom",
+	.id_table = wacom_devices,
+	.probe = wacom_probe,
+	.remove = wacom_remove,
+	.raw_event = wacom_raw_event,
+};
+
+static int wacom_init(void)
+{
+	int ret;
+
+	ret = hid_register_driver(&wacom_driver);
+	if (ret)
+		printk(KERN_ERR "can't register wacom driver\n");
+	printk(KERN_ERR "wacom driver registered\n");
+	return ret;
+}
+
+static void wacom_exit(void)
+{
+	hid_unregister_driver(&wacom_driver);
+}
+
+module_init(wacom_init);
+module_exit(wacom_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(wacom);
-- 
1.6.2




linux-2.6-iommu-fixes.patch:

--- NEW FILE linux-2.6-iommu-fixes.patch ---
commit c065567f392e05f0fda406369e1c8969c4411c68
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 10 22:27:48 2009 -0700

    intel-iommu: Avoid panic() for DRHD at address zero.
    
    If the BIOS does something obviously stupid, like claiming that the
    registers for the IOMMU are at physical address zero, then print a nasty
    message and abort, rather than trying to set up the IOMMU and then later
    panicking.
    
    It's becoming more and more obvious that trusting this stuff to the BIOS
    was a mistake.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit e523b38e2f568af58baa13120a994cbf24e6dee0)

commit 1d748e6cec8936af4c7044bdb51593a3f3904239
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Mon Apr 6 13:30:01 2009 -0700

    intel-iommu: Fix oops in device_to_iommu() when devices not found.
    
    It's possible for a device in the drhd->devices[] array to be NULL if
    it wasn't found at boot time, which means we have to check for that
    case.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e)

commit 3bf17fdaaadea04d4d82be5930dff93ec737aeed
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Apr 4 00:39:25 2009 +0100

    intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
    
    When the DMAR table identifies that a PCI-PCI bridge belongs to a given
    IOMMU, that means that the bridge and all devices behind it should be
    associated with the IOMMU. Not just the bridge itself.
    
    This fixes the device_to_iommu() function accordingly.
    
    (It's broken if you have the same PCI bus numbers in multiple domains,
    but this function was always broken in that way; I'll be dealing with
    that later).
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit 924b6231edfaf1e764ffb4f97ea382bf4facff58)

commit 948852c81654aa8572a2bac1d2dfb1abfcc76ab2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 7 07:59:41 2009 -0700

    Fix build errors due to CONFIG_BRANCH_TRACER=y
    
    The code that enables branch tracing for all (non-constant) branches
    plays games with the preprocessor and #define's the C 'if ()' construct
    to do tracing.
    
    That's all fine, but it fails for some unusual but valid C code that is
    sometimes used in macros, notably by the intel-iommu code:
    
    	if (i=drhd->iommu, drhd->ignored) ..
    
    because now the preprocessor complains about multiple arguments to the
    'if' macro.
    
    So make the macro expansion of this particularly horrid trick use
    varargs, and handle the case of comma-expressions in if-statements.  Use
    another macro to do it cleanly in just one place.
    
    This replaces a patch by David (and acked by Steven) that did this all
    inside that one already-too-horrid macro.
    
    Tested-by: Ingo Molnar <mingo at elte.hu>
    Cc: David Woodhouse <dwmw2 at infradead.org>
    Cc: Steven Rostedt <rostedt at goodmis.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    (cherry picked from commit aeeae86859f4319de0a4946b44771d9926eeed54)

commit 484abc37905056cc7b90a51311e6589bacd9ed65
Author: Fenghua Yu <fenghua.yu at intel.com>
Date:   Fri Mar 27 14:22:42 2009 -0700

    Intel IOMMU Suspend/Resume Support - DMAR
    
    This patch implements the suspend and resume feature for Intel IOMMU
    DMAR. It hooks to kernel suspend and resume interface. When suspend happens, it
    saves necessary hardware registers. When resume happens, it restores the
    registers and restarts IOMMU by enabling translation, setting up root entry, and
    re-enabling queued invalidation.
    
    Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 85e4b00c9d0378d7c19510d7bac8d5834b58edea
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 10 15:15:05 2009 -0700

    Intel IOMMU Suspend/Resume Support - Queued Invalidation
    
    This patch supports queued invalidation suspend/resume.
    
    Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    (cherry picked from commit eb4a52bc660ea835482c582eaaf4893742cbd160)

commit 28dde4ade0c005b78f0cd0bda03ed20fcdfc11ae
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Apr 3 15:19:32 2009 +0100

    intel-iommu: Add for_each_iommu() and for_each_active_iommu() macros
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    (cherry picked from commit 8f912ba4d7cdaf7d31cf39fe5a9b7732308a256d)

commit b35948e3225618ab7c1c7700eae0c9f4565f9199
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:57 2009 -0700

    x86, dmar: start with sane state while enabling dma and interrupt-remapping
    
    Impact: cleanup/sanitization
    
    Start from a sane state while enabling dma and interrupt-remapping, by
    clearing the previous recorded faults and disabling previously
    enabled queued invalidation and interrupt-remapping.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit 1531a6a6b81a4e6f9eec9a5608758a6ea14b96e0)

commit 26c3c4ad26414ea9f66c56a27e394fc7ae937231
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:56 2009 -0700

    x86, dmar: routines for disabling queued invalidation and intr remapping
    
    Impact: new interfaces (not yet used)
    
    Routines for disabling queued invalidation and interrupt remapping.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit eba67e5da6e971993b2899d2cdf459ce77d3dbc5)

commit 1c2f1031da6024fee999d2b115e31b40ff449405
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Mar 16 17:04:54 2009 -0700

    x86, dmar: move page fault handling code to dmar.c
    
    Impact: code movement
    
    Move page fault handling code to dmar.c
    This will be shared both by DMA-remapping and Intr-remapping code.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
    (cherry picked from commit 0ac2491f57af5644f88383d28809760902d6f4d7)
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 26c536b..e095037 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -31,6 +31,8 @@
 #include <linux/iova.h>
 #include <linux/intel-iommu.h>
 #include <linux/timer.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #undef PREFIX
 #define PREFIX "DMAR:"
@@ -170,12 +172,21 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
 	struct dmar_drhd_unit *dmaru;
 	int ret = 0;
 
+	drhd = (struct acpi_dmar_hardware_unit *)header;
+	if (!drhd->address) {
+		/* Promote an attitude of violence to a BIOS engineer today */
+		WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+		     dmi_get_system_info(DMI_BIOS_VENDOR),
+		     dmi_get_system_info(DMI_BIOS_VERSION),
+		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		return -ENODEV;
+	}
 	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
 	if (!dmaru)
 		return -ENOMEM;
 
 	dmaru->hdr = header;
-	drhd = (struct acpi_dmar_hardware_unit *)header;
 	dmaru->reg_base_addr = drhd->address;
 	dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */
 
@@ -748,14 +759,77 @@ int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
 }
 
 /*
+ * Disable Queued Invalidation interface.
+ */
+void dmar_disable_qi(struct intel_iommu *iommu)
+{
+	unsigned long flags;
+	u32 sts;
+	cycles_t start_time = get_cycles();
+
+	if (!ecap_qis(iommu->ecap))
+		return;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	sts =  dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	if (!(sts & DMA_GSTS_QIES))
+		goto end;
+
+	/*
+	 * Give a chance to HW to complete the pending invalidation requests.
+	 */
+	while ((readl(iommu->reg + DMAR_IQT_REG) !=
+		readl(iommu->reg + DMAR_IQH_REG)) &&
+		(DMAR_OPERATION_TIMEOUT > (get_cycles() - start_time)))
+		cpu_relax();
+
+	iommu->gcmd &= ~DMA_GCMD_QIE;
+
+	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl,
+		      !(sts & DMA_GSTS_QIES), sts);
+end:
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+/*
+ * Enable queued invalidation.
+ */
+static void __dmar_enable_qi(struct intel_iommu *iommu)
+{
+	u32 cmd, sts;
+	unsigned long flags;
+	struct q_inval *qi = iommu->qi;
+
+	qi->free_head = qi->free_tail = 0;
+	qi->free_cnt = QI_LENGTH;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	/* write zero to the tail reg */
+	writel(0, iommu->reg + DMAR_IQT_REG);
+
+	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));
+
+	cmd = iommu->gcmd | DMA_GCMD_QIE;
+	iommu->gcmd |= DMA_GCMD_QIE;
+	writel(cmd, iommu->reg + DMAR_GCMD_REG);
+
+	/* Make sure hardware complete it */
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);
+
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+/*
  * Enable Queued Invalidation interface. This is a must to support
  * interrupt-remapping. Also used by DMA-remapping, which replaces
  * register based IOTLB invalidation.
  */
 int dmar_enable_qi(struct intel_iommu *iommu)
 {
-	u32 cmd, sts;
-	unsigned long flags;
 	struct q_inval *qi;
 
 	if (!ecap_qis(iommu->ecap))
@@ -793,19 +867,218 @@ int dmar_enable_qi(struct intel_iommu *iommu)
 
 	spin_lock_init(&qi->q_lock);
 
-	spin_lock_irqsave(&iommu->register_lock, flags);
-	/* write zero to the tail reg */
-	writel(0, iommu->reg + DMAR_IQT_REG);
+	__dmar_enable_qi(iommu);
 
-	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));
+	return 0;
+}
 
-	cmd = iommu->gcmd | DMA_GCMD_QIE;
-	iommu->gcmd |= DMA_GCMD_QIE;
-	writel(cmd, iommu->reg + DMAR_GCMD_REG);
+/* iommu interrupt handling. Most stuff are MSI-like. */
 
-	/* Make sure hardware complete it */
-	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);
-	spin_unlock_irqrestore(&iommu->register_lock, flags);
+static const char *fault_reason_strings[] =
+{
+	"Software",
+	"Present bit in root entry is clear",
+	"Present bit in context entry is clear",
+	"Invalid context entry",
+	"Access beyond MGAW",
+	"PTE Write access is not set",
+	"PTE Read access is not set",
+	"Next page table ptr is invalid",
+	"Root table address invalid",
+	"Context table ptr is invalid",
+	"non-zero reserved fields in RTP",
+	"non-zero reserved fields in CTP",
+	"non-zero reserved fields in PTE",
+};
+#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
+
+const char *dmar_get_fault_reason(u8 fault_reason)
+{
+	if (fault_reason > MAX_FAULT_REASON_IDX)
+		return "Unknown";
+	else
+		return fault_reason_strings[fault_reason];
+}
+
+void dmar_msi_unmask(unsigned int irq)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	/* unmask it */
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(0, iommu->reg + DMAR_FECTL_REG);
+	/* Read a reg to force flush the post write */
+	readl(iommu->reg + DMAR_FECTL_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_mask(unsigned int irq)
+{
+	unsigned long flag;
+	struct intel_iommu *iommu = get_irq_data(irq);
+
+	/* mask it */
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
+	/* Read a reg to force flush the post write */
+	readl(iommu->reg + DMAR_FECTL_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_write(int irq, struct msi_msg *msg)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
+	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
+	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+void dmar_msi_read(int irq, struct msi_msg *msg)
+{
+	struct intel_iommu *iommu = get_irq_data(irq);
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
+	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
+	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+}
+
+static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
+		u8 fault_reason, u16 source_id, unsigned long long addr)
+{
+	const char *reason;
+
+	reason = dmar_get_fault_reason(fault_reason);
+
+	printk(KERN_ERR
+		"DMAR:[%s] Request device [%02x:%02x.%d] "
+		"fault addr %llx \n"
+		"DMAR:[fault reason %02d] %s\n",
+		(type ? "DMA Read" : "DMA Write"),
+		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
+		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+	return 0;
+}
+
+#define PRIMARY_FAULT_REG_LEN (16)
+irqreturn_t dmar_fault(int irq, void *dev_id)
+{
+	struct intel_iommu *iommu = dev_id;
+	int reg, fault_index;
+	u32 fault_status;
+	unsigned long flag;
+
+	spin_lock_irqsave(&iommu->register_lock, flag);
+	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+
+	/* TBD: ignore advanced fault log currently */
+	if (!(fault_status & DMA_FSTS_PPF))
+		goto clear_overflow;
+
+	fault_index = dma_fsts_fault_record_index(fault_status);
+	reg = cap_fault_reg_offset(iommu->cap);
+	while (1) {
+		u8 fault_reason;
+		u16 source_id;
+		u64 guest_addr;
+		int type;
+		u32 data;
+
+		/* highest 32 bits */
+		data = readl(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN + 12);
+		if (!(data & DMA_FRCD_F))
+			break;
+
+		fault_reason = dma_frcd_fault_reason(data);
+		type = dma_frcd_type(data);
+
+		data = readl(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN + 8);
+		source_id = dma_frcd_source_id(data);
+
+		guest_addr = dmar_readq(iommu->reg + reg +
+				fault_index * PRIMARY_FAULT_REG_LEN);
+		guest_addr = dma_frcd_page_addr(guest_addr);
+		/* clear the fault */
+		writel(DMA_FRCD_F, iommu->reg + reg +
+			fault_index * PRIMARY_FAULT_REG_LEN + 12);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+
+		dmar_fault_do_one(iommu, type, fault_reason,
+				source_id, guest_addr);
+
+		fault_index++;
+		if (fault_index > cap_num_fault_regs(iommu->cap))
+			fault_index = 0;
+		spin_lock_irqsave(&iommu->register_lock, flag);
+	}
+clear_overflow:
+	/* clear primary fault overflow */
+	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+	if (fault_status & DMA_FSTS_PFO)
+		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
+
+	spin_unlock_irqrestore(&iommu->register_lock, flag);
+	return IRQ_HANDLED;
+}
+
+int dmar_set_interrupt(struct intel_iommu *iommu)
+{
+	int irq, ret;
+
+	irq = create_irq();
+	if (!irq) {
+		printk(KERN_ERR "IOMMU: no free vectors\n");
+		return -EINVAL;
+	}
+
+	set_irq_data(irq, iommu);
+	iommu->irq = irq;
+
+	ret = arch_setup_dmar_msi(irq);
+	if (ret) {
+		set_irq_data(irq, NULL);
+		iommu->irq = 0;
+		destroy_irq(irq);
+		return 0;
+	}
+
+	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);
+	if (ret)
+		printk(KERN_ERR "IOMMU: can't request irq\n");
+	return ret;
+}
+
+/*
+ * Re-enable Queued Invalidation interface.
+ */
+int dmar_reenable_qi(struct intel_iommu *iommu)
+{
+	if (!ecap_qis(iommu->ecap))
+		return -ENOENT;
+
+	if (!iommu->qi)
+		return -ENOENT;
+
+	/*
+	 * First disable queued invalidation.
+	 */
+	dmar_disable_qi(iommu);
+	/*
+	 * Then enable queued invalidation again. Since there is no pending
+	 * invalidation requests now, it's safe to re-enable queued
+	 * invalidation.
+	 */
+	__dmar_enable_qi(iommu);
 
 	return 0;
 }
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index f3f6865..8e4ac13 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -36,6 +36,7 @@
 #include <linux/iova.h>
 #include <linux/iommu.h>
 #include <linux/intel-iommu.h>
+#include <linux/sysdev.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 #include "pci.h"
@@ -447,11 +448,17 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn)
 		if (drhd->ignored)
 			continue;
 
-		for (i = 0; i < drhd->devices_cnt; i++)
+		for (i = 0; i < drhd->devices_cnt; i++) {
 			if (drhd->devices[i] &&
 			    drhd->devices[i]->bus->number == bus &&
 			    drhd->devices[i]->devfn == devfn)
 				return drhd->iommu;
+			if (drhd->devices[i] &&
+			    drhd->devices[i]->subordinate &&
+			    drhd->devices[i]->subordinate->number <= bus &&
+			    drhd->devices[i]->subordinate->subordinate >= bus)
+				return drhd->iommu;
+		}
 
 		if (drhd->include_all)
 			return drhd->iommu;
@@ -1004,194 +1011,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
 	return 0;
 }
 
-/* iommu interrupt handling. Most stuff are MSI-like. */
-
-static const char *fault_reason_strings[] =
-{
-	"Software",
-	"Present bit in root entry is clear",
-	"Present bit in context entry is clear",
-	"Invalid context entry",
-	"Access beyond MGAW",
-	"PTE Write access is not set",
-	"PTE Read access is not set",
-	"Next page table ptr is invalid",
-	"Root table address invalid",
-	"Context table ptr is invalid",
-	"non-zero reserved fields in RTP",
-	"non-zero reserved fields in CTP",
-	"non-zero reserved fields in PTE",
-};
-#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
-
-const char *dmar_get_fault_reason(u8 fault_reason)
-{
-	if (fault_reason > MAX_FAULT_REASON_IDX)
-		return "Unknown";
-	else
-		return fault_reason_strings[fault_reason];
-}
-
-void dmar_msi_unmask(unsigned int irq)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	/* unmask it */
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(0, iommu->reg + DMAR_FECTL_REG);
-	/* Read a reg to force flush the post write */
-	readl(iommu->reg + DMAR_FECTL_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_mask(unsigned int irq)
-{
-	unsigned long flag;
-	struct intel_iommu *iommu = get_irq_data(irq);
-
-	/* mask it */
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
-	/* Read a reg to force flush the post write */
-	readl(iommu->reg + DMAR_FECTL_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_write(int irq, struct msi_msg *msg)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
-	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
-	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-void dmar_msi_read(int irq, struct msi_msg *msg)
-{
-	struct intel_iommu *iommu = get_irq_data(irq);
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
-	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
-	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-}
-
-static int iommu_page_fault_do_one(struct intel_iommu *iommu, int type,
-		u8 fault_reason, u16 source_id, unsigned long long addr)
-{
-	const char *reason;
-
-	reason = dmar_get_fault_reason(fault_reason);
-
-	printk(KERN_ERR
-		"DMAR:[%s] Request device [%02x:%02x.%d] "
-		"fault addr %llx \n"
-		"DMAR:[fault reason %02d] %s\n",
-		(type ? "DMA Read" : "DMA Write"),
-		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
-		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
-	return 0;
-}
-
-#define PRIMARY_FAULT_REG_LEN (16)
-static irqreturn_t iommu_page_fault(int irq, void *dev_id)
-{
-	struct intel_iommu *iommu = dev_id;
-	int reg, fault_index;
-	u32 fault_status;
-	unsigned long flag;
-
-	spin_lock_irqsave(&iommu->register_lock, flag);
-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
-
-	/* TBD: ignore advanced fault log currently */
-	if (!(fault_status & DMA_FSTS_PPF))
-		goto clear_overflow;
-
-	fault_index = dma_fsts_fault_record_index(fault_status);
-	reg = cap_fault_reg_offset(iommu->cap);
-	while (1) {
-		u8 fault_reason;
-		u16 source_id;
-		u64 guest_addr;
-		int type;
-		u32 data;
-
-		/* highest 32 bits */
-		data = readl(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN + 12);
-		if (!(data & DMA_FRCD_F))
-			break;
-
-		fault_reason = dma_frcd_fault_reason(data);
-		type = dma_frcd_type(data);
-
-		data = readl(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN + 8);
-		source_id = dma_frcd_source_id(data);
-
-		guest_addr = dmar_readq(iommu->reg + reg +
-				fault_index * PRIMARY_FAULT_REG_LEN);
-		guest_addr = dma_frcd_page_addr(guest_addr);
-		/* clear the fault */
-		writel(DMA_FRCD_F, iommu->reg + reg +
-			fault_index * PRIMARY_FAULT_REG_LEN + 12);
-
-		spin_unlock_irqrestore(&iommu->register_lock, flag);
-
-		iommu_page_fault_do_one(iommu, type, fault_reason,
-				source_id, guest_addr);
-
-		fault_index++;
-		if (fault_index > cap_num_fault_regs(iommu->cap))
-			fault_index = 0;
-		spin_lock_irqsave(&iommu->register_lock, flag);
-	}
-clear_overflow:
-	/* clear primary fault overflow */
-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
-	if (fault_status & DMA_FSTS_PFO)
-		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
-
-	spin_unlock_irqrestore(&iommu->register_lock, flag);
-	return IRQ_HANDLED;
-}
-
-int dmar_set_interrupt(struct intel_iommu *iommu)
-{
-	int irq, ret;
-
-	irq = create_irq();
-	if (!irq) {
-		printk(KERN_ERR "IOMMU: no free vectors\n");
-		return -EINVAL;
-	}
-
-	set_irq_data(irq, iommu);
-	iommu->irq = irq;
-
-	ret = arch_setup_dmar_msi(irq);
-	if (ret) {
-		set_irq_data(irq, NULL);
-		iommu->irq = 0;
-		destroy_irq(irq);
-		return 0;
-	}
-
-	/* Force fault register is cleared */
-	iommu_page_fault(irq, iommu);
-
-	ret = request_irq(irq, iommu_page_fault, 0, iommu->name, iommu);
-	if (ret)
-		printk(KERN_ERR "IOMMU: can't request irq\n");
-	return ret;
-}
 
 static int iommu_init_domains(struct intel_iommu *iommu)
 {
@@ -2043,11 +1862,40 @@ static int __init init_dmars(void)
 		}
 	}
 
+	/*
+	 * Start from the sane iommu hardware state.
+	 */
 	for_each_drhd_unit(drhd) {
 		if (drhd->ignored)
 			continue;
 
 		iommu = drhd->iommu;
+
+		/*
+		 * If the queued invalidation is already initialized by us
+		 * (for example, while enabling interrupt-remapping) then
+		 * we got the things already rolling from a sane state.
+		 */
+		if (iommu->qi)
+			continue;
+
+		/*
+		 * Clear any previous faults.
+		 */
+		dmar_fault(-1, iommu);
+		/*
+		 * Disable queued invalidation if supported and already enabled
+		 * before OS handover.
+		 */
+		dmar_disable_qi(iommu);
+	}
+
+	for_each_drhd_unit(drhd) {
+		if (drhd->ignored)
+			continue;
+
+		iommu = drhd->iommu;
+
 		if (dmar_enable_qi(iommu)) {
 			/*
 			 * Queued Invalidate not enabled, use Register Based
@@ -2707,6 +2555,150 @@ static void __init init_no_remapping_devices(void)
 	}
 }
 
+#ifdef CONFIG_SUSPEND
+static int init_iommu_hw(void)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+
+	for_each_active_iommu(iommu, drhd)
+		if (iommu->qi)
+			dmar_reenable_qi(iommu);
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu_flush_write_buffer(iommu);
+
+		iommu_set_root_entry(iommu);
+
+		iommu->flush.flush_context(iommu, 0, 0, 0,
+						DMA_CCMD_GLOBAL_INVL, 0);
+		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+						DMA_TLB_GLOBAL_FLUSH, 0);
+		iommu_disable_protect_mem_regions(iommu);
+		iommu_enable_translation(iommu);
+	}
+
+	return 0;
+}
+
+static void iommu_flush_all(void)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu;
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu->flush.flush_context(iommu, 0, 0, 0,
+						DMA_CCMD_GLOBAL_INVL, 0);
+		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+						DMA_TLB_GLOBAL_FLUSH, 0);
+	}
+}
+
+static int iommu_suspend(struct sys_device *dev, pm_message_t state)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+	unsigned long flag;
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu->iommu_state = kzalloc(sizeof(u32) * MAX_SR_DMAR_REGS,
+						 GFP_ATOMIC);
+		if (!iommu->iommu_state)
+			goto nomem;
+	}
+
+	iommu_flush_all();
+
+	for_each_active_iommu(iommu, drhd) {
+		iommu_disable_translation(iommu);
+
+		spin_lock_irqsave(&iommu->register_lock, flag);
+
+		iommu->iommu_state[SR_DMAR_FECTL_REG] =
+			readl(iommu->reg + DMAR_FECTL_REG);
+		iommu->iommu_state[SR_DMAR_FEDATA_REG] =
+			readl(iommu->reg + DMAR_FEDATA_REG);
+		iommu->iommu_state[SR_DMAR_FEADDR_REG] =
+			readl(iommu->reg + DMAR_FEADDR_REG);
+		iommu->iommu_state[SR_DMAR_FEUADDR_REG] =
+			readl(iommu->reg + DMAR_FEUADDR_REG);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+	}
+	return 0;
+
+nomem:
+	for_each_active_iommu(iommu, drhd)
+		kfree(iommu->iommu_state);
+
+	return -ENOMEM;
+}
+
+static int iommu_resume(struct sys_device *dev)
+{
+	struct dmar_drhd_unit *drhd;
+	struct intel_iommu *iommu = NULL;
+	unsigned long flag;
+
+	if (init_iommu_hw()) {
+		WARN(1, "IOMMU setup failed, DMAR can not resume!\n");
+		return -EIO;
+	}
+
+	for_each_active_iommu(iommu, drhd) {
+
+		spin_lock_irqsave(&iommu->register_lock, flag);
+
+		writel(iommu->iommu_state[SR_DMAR_FECTL_REG],
+			iommu->reg + DMAR_FECTL_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEDATA_REG],
+			iommu->reg + DMAR_FEDATA_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEADDR_REG],
+			iommu->reg + DMAR_FEADDR_REG);
+		writel(iommu->iommu_state[SR_DMAR_FEUADDR_REG],
+			iommu->reg + DMAR_FEUADDR_REG);
+
+		spin_unlock_irqrestore(&iommu->register_lock, flag);
+	}
+
+	for_each_active_iommu(iommu, drhd)
+		kfree(iommu->iommu_state);
+
+	return 0;
+}
+
+static struct sysdev_class iommu_sysclass = {
+	.name		= "iommu",
+	.resume		= iommu_resume,
+	.suspend	= iommu_suspend,
+};
+
+static struct sys_device device_iommu = {
+	.cls	= &iommu_sysclass,
+};
+
+static int __init init_iommu_sysfs(void)
+{
+	int error;
+
+	error = sysdev_class_register(&iommu_sysclass);
+	if (error)
+		return error;
+
+	error = sysdev_register(&device_iommu);
+	if (error)
+		sysdev_class_unregister(&iommu_sysclass);
+
+	return error;
+}
+
+#else
+static int __init init_iommu_sysfs(void)
+{
+	return 0;
+}
+#endif	/* CONFIG_PM */
+
 int __init intel_iommu_init(void)
 {
 	int ret = 0;
@@ -2742,6 +2734,7 @@ int __init intel_iommu_init(void)
 	init_timer(&unmap_timer);
 	force_iommu = 1;
 	dma_ops = &intel_dma_ops;
+	init_iommu_sysfs();
 
 	register_iommu(&intel_iommu_ops);
 
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index 45effc5..0a490fe 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -458,11 +458,55 @@ static int setup_intr_remapping(struct intel_iommu *iommu, int mode)
 	return 0;
 }
 
+/*
+ * Disable Interrupt Remapping.
+ */
+static void disable_intr_remapping(struct intel_iommu *iommu)
+{
+	unsigned long flags;
+	u32 sts;
+
+	if (!ecap_ir_support(iommu->ecap))
+		return;
+
+	spin_lock_irqsave(&iommu->register_lock, flags);
+
+	sts = dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	if (!(sts & DMA_GSTS_IRES))
+		goto end;
+
+	iommu->gcmd &= ~DMA_GCMD_IRE;
+	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+
+	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+		      readl, !(sts & DMA_GSTS_IRES), sts);
+
+end:
+	spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
 int __init enable_intr_remapping(int eim)
 {
 	struct dmar_drhd_unit *drhd;
 	int setup = 0;
 
+	for_each_drhd_unit(drhd) {
+		struct intel_iommu *iommu = drhd->iommu;
+
+		/*
+		 * Clear previous faults.
+		 */
+		dmar_fault(-1, iommu);
+
+		/*
+		 * Disable intr remapping and queued invalidation, if already
+		 * enabled prior to OS handover.
+		 */
+		disable_intr_remapping(iommu);
+
+		dmar_disable_qi(iommu);
+	}
+
 	/*
 	 * check for the Interrupt-remapping support
 	 */
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index d95da10..fd4b619 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -113,7 +113,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  * "Define 'is'", Bill Clinton
  * "Define 'if'", Steven Rostedt
  */
-#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :		\
+#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+#define __trace_if(cond) \
+	if (__builtin_constant_p((cond)) ? !!(cond) :			\
 	({								\
 		int ______r;						\
 		static struct ftrace_branch_data			\
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f284407..b967e93 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -24,6 +24,7 @@
 #include <linux/acpi.h>
 #include <linux/types.h>
 #include <linux/msi.h>
+#include <linux/irqreturn.h>
 
 #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
 struct intel_iommu;
@@ -44,6 +45,14 @@ extern struct list_head dmar_drhd_units;
 #define for_each_drhd_unit(drhd) \
 	list_for_each_entry(drhd, &dmar_drhd_units, list)
 
+#define for_each_active_iommu(i, drhd)					\
+	list_for_each_entry(drhd, &dmar_drhd_units, list)		\
+		if (i=drhd->iommu, drhd->ignored) {} else
+
+#define for_each_iommu(i, drhd)						\
+	list_for_each_entry(drhd, &dmar_drhd_units, list)		\
+		if (i=drhd->iommu, 0) {} else 
+
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
 
@@ -127,6 +136,7 @@ extern void dmar_msi_mask(unsigned int irq);
 extern void dmar_msi_read(int irq, struct msi_msg *msg);
 extern void dmar_msi_write(int irq, struct msi_msg *msg);
 extern int dmar_set_interrupt(struct intel_iommu *iommu);
+extern irqreturn_t dmar_fault(int irq, void *dev_id);
 extern int arch_setup_dmar_msi(unsigned int irq);
 
 extern int iommu_detected, no_iommu;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index d2e3cbf..6520e07 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -284,6 +284,14 @@ struct iommu_flush {
 		unsigned int size_order, u64 type, int non_present_entry_flush);
 };
 
+enum {
+	SR_DMAR_FECTL_REG,
+	SR_DMAR_FEDATA_REG,
+	SR_DMAR_FEADDR_REG,
+	SR_DMAR_FEUADDR_REG,
+	MAX_SR_DMAR_REGS
+};
+
 struct intel_iommu {
 	void __iomem	*reg; /* Pointer to hardware regs, virtual addr */
 	u64		cap;
@@ -304,6 +312,8 @@ struct intel_iommu {
 	struct iommu_flush flush;
 #endif
 	struct q_inval  *qi;            /* Queued invalidation info */
+	u32 *iommu_state; /* Store iommu states between suspend and resume.*/
+
 #ifdef CONFIG_INTR_REMAP
 	struct ir_table *ir_table;	/* Interrupt remapping info */
 #endif
@@ -321,6 +331,8 @@ extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev);
 extern int alloc_iommu(struct dmar_drhd_unit *drhd);
 extern void free_iommu(struct intel_iommu *iommu);
 extern int dmar_enable_qi(struct intel_iommu *iommu);
+extern void dmar_disable_qi(struct intel_iommu *iommu);
+extern int dmar_reenable_qi(struct intel_iommu *iommu);
 extern void qi_global_iec(struct intel_iommu *iommu);
 
 extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,

linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch:

--- NEW FILE linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch ---
Back-port of commit pending for 2.6.30...

commit 9a454abf066ab588ef28ff9d2c04cc480d13c040
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Thu Jan 15 09:38:44 2009 +0100

    iwl3945: report killswitch changes even if the interface is down

    Currently iwl3945 is not able to report hw-killswitch events while the
    interface is down. This has implications on user space tools (like
    NetworkManager) relying on rfkill notifications to bring the interface
    up once the wireless gets enabled through a hw killswitch.

    Thus, enable the device already in iwl3945_pci_probe instead of iwl3945_up
    and poll the CSR_GP_CNTRL register to update the killswitch state every
    two seconds. The polling is only needed on 3945 hardware as this adapter
    does not use interrupts to signal rfkill changes to the driver (in case no
    firmware is loaded). The firmware loading is still done in iwl3945_up.

    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Acked-by: Samuel Ortiz <samuel.ortiz at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 14:21:18.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 14:21:22.000000000 -0400
@@ -6001,7 +6001,8 @@ static void iwl3945_bg_rf_kill(struct wo
 		IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL,
 			  "HW and/or SW RF Kill no longer active, restarting "
 			  "device\n");
-		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
+		if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
+		     test_bit(STATUS_ALIVE, &priv->status))
 			queue_work(priv->workqueue, &priv->restart);
 	} else {
 
@@ -6018,6 +6019,25 @@ static void iwl3945_bg_rf_kill(struct wo
 	iwl3945_rfkill_set_hw_state(priv);
 }
 
+static void iwl3945_rfkill_poll(struct work_struct *data)
+{
+	struct iwl3945_priv *priv =
+	    container_of(data, struct iwl3945_priv, rfkill_poll.work);
+	unsigned long status = priv->status;
+
+	if (iwl3945_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+
+	if (test_bit(STATUS_RF_KILL_HW, &status) != test_bit(STATUS_RF_KILL_HW, &priv->status))
+		queue_work(priv->workqueue, &priv->rf_kill);
+
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   round_jiffies_relative(2 * HZ));
+
+}
+
 #define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
 
 static void iwl3945_bg_scan_check(struct work_struct *data)
@@ -6420,20 +6440,6 @@ static int iwl3945_mac_start(struct ieee
 
 	IWL_DEBUG_MAC80211("enter\n");
 
-	if (pci_enable_device(priv->pci_dev)) {
-		IWL_ERROR("Fail to pci_enable_device\n");
-		return -ENODEV;
-	}
-	pci_restore_state(priv->pci_dev);
-	pci_enable_msi(priv->pci_dev);
-
-	ret = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
-			  DRV_NAME, priv);
-	if (ret) {
-		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
-		goto out_disable_msi;
-	}
-
 	/* we should be verifying the device is ready to be opened */
 	mutex_lock(&priv->mutex);
 
@@ -6478,15 +6484,15 @@ static int iwl3945_mac_start(struct ieee
 		}
 	}
 
+	/* ucode is running and will send rfkill notifications,
+	 * no need to poll the killswitch state anymore */
+	cancel_delayed_work(&priv->rfkill_poll);
+
 	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
 
 out_release_irq:
-	free_irq(priv->pci_dev->irq, priv);
-out_disable_msi:
-	pci_disable_msi(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
 	priv->is_open = 0;
 	IWL_DEBUG_MAC80211("leave - failed\n");
 	return ret;
@@ -6517,10 +6523,10 @@ static void iwl3945_mac_stop(struct ieee
 	iwl3945_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	/* start polling the killswitch state again */
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   round_jiffies_relative(2 * HZ));
 
 	IWL_DEBUG_MAC80211("leave\n");
 }
@@ -7735,6 +7741,7 @@ static void iwl3945_setup_deferred_work(
 	INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start);
 	INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start);
 	INIT_DELAYED_WORK(&priv->scan_check, iwl3945_bg_scan_check);
+	INIT_DELAYED_WORK(&priv->rfkill_poll, iwl3945_rfkill_poll);
 
 	iwl3945_hw_setup_deferred_work(priv);
 
@@ -8007,24 +8014,27 @@ static int iwl3945_pci_probe(struct pci_
 	iwl3945_disable_interrupts(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
+	pci_enable_msi(priv->pci_dev);
+
+	err = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
+			  DRV_NAME, priv);
+	if (err) {
+		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+		goto out_disable_msi;
+	}
+
 	err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 	if (err) {
 		IWL_ERROR("failed to create sysfs device attributes\n");
-		goto out_free_geos;
+		goto out_release_irq;
 	}
 
 	iwl3945_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);
 	iwl3945_setup_deferred_work(priv);
 	iwl3945_setup_rx_handlers(priv);
 
-	/***********************
-	 * 9. Conclude
-	 * ********************/
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-
 	/*********************************
-	 * 10. Setup and Register mac80211
+	 * 9. Setup and Register mac80211
 	 * *******************************/
 
 	err = ieee80211_register_hw(priv->hw);
@@ -8042,13 +8052,20 @@ static int iwl3945_pci_probe(struct pci_
 		IWL_ERROR("Unable to initialize RFKILL system. "
 				  "Ignoring error: %d\n", err);
 
+	/* Start monitoring the killswitch */
+	queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
+			   2 * HZ);
+
 	return 0;
 
  out_remove_sysfs:
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
- out_free_geos:
+ out_release_irq:
+	free_irq(priv->pci_dev->irq, priv);
+ out_disable_msi:
+	pci_disable_msi(priv->pci_dev);
 	iwl3945_free_geos(priv);
  out_free_channel_map:
 	iwl3945_free_channel_map(priv);
@@ -8093,6 +8110,8 @@ static void __devexit iwl3945_pci_remove
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 
 	iwl3945_rfkill_unregister(priv);
+	cancel_delayed_work(&priv->rfkill_poll);
+
 	iwl3945_dealloc_ucode_pci(priv);
 
 	if (priv->rxq.bd)
@@ -8114,6 +8133,9 @@ static void __devexit iwl3945_pci_remove
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 
+	free_irq(pdev->irq, priv);
+	pci_disable_msi(pdev);
+
 	pci_iounmap(pdev, priv->hw_base);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
@@ -8140,19 +8162,8 @@ static int iwl3945_pci_suspend(struct pc
 		priv->is_open = 1;
 	}
 
-	/* pci driver assumes state will be saved in this function.
-	 * pci state is saved and device disabled when interface is
-	 * stopped, so at this time pci device will always be disabled -
-	 * whether interface was started or not. saving pci state now will
-	 * cause saved state be that of a disabled device, which will cause
-	 * problems during resume in that we will end up with a disabled device.
-	 *
-	 * indicate that the current saved state (from when interface was
-	 * stopped) is valid. if interface was never up at time of suspend
-	 * then the saved state will still be valid as it was saved during
-	 * .probe. */
-	pdev->state_saved = true;
-
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -8163,6 +8174,8 @@ static int iwl3945_pci_resume(struct pci
 	struct iwl3945_priv *priv = pci_get_drvdata(pdev);
 
 	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
 
 	if (priv->is_open)
 		iwl3945_mac_start(priv->hw);
diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig	2009-04-02 14:21:36.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h	2009-04-02 14:21:45.000000000 -0400
@@ -895,6 +895,7 @@ struct iwl3945_priv {
 	struct delayed_work thermal_periodic;
 	struct delayed_work gather_stats;
 	struct delayed_work scan_check;
+	struct delayed_work rfkill_poll;
 
 #define IWL_DEFAULT_TX_POWER 0x0F
 	s8 user_txpower_limit;

linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch:

--- NEW FILE linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch ---
Back-port of commit pending for 2.6.30...

commit f44035116d6ab7d0677874709fb864b2dc75a996
Author: Helmut Schaa <helmut.schaa at googlemail.com>
Date:   Mon Jan 19 13:10:07 2009 +0100

    iwlagn: fix hw-rfkill while the interface is down
    
    Currently iwlagn is not able to report hw-killswitch events while the
    interface is down. This has implications on user space tools (like
    NetworkManager) relying on rfkill notifications to bring the interface
    up once the wireless gets enabled through a hw killswitch.
    
    Thus, enable the device already in iwl_pci_probe instead of iwl_up
    and enable interrups while the interface is down in order to get
    notified about killswitch state changes. The firmware loading is still
    done in iwl_up.
    
    Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>
    Acked-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-04-02 14:15:36.000000000 -0400
@@ -1397,13 +1397,16 @@ static void iwl_irq_tasklet(struct iwl_p
 				hw_rf_kill ? "disable radio" : "enable radio");
 
 		/* driver only loads ucode once setting the interface up.
-		 * the driver as well won't allow loading if RFKILL is set
-		 * therefore no need to restart the driver from this handler
+		 * the driver allows loading the ucode even if the radio
+		 * is killed. Hence update the killswitch state here. The
+		 * rfkill handler will care about restarting if needed.
 		 */
-		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
-			clear_bit(STATUS_RF_KILL_HW, &priv->status);
-			if (priv->is_open && !iwl_is_rfkill(priv))
-				queue_work(priv->workqueue, &priv->up);
+		if (!test_bit(STATUS_ALIVE, &priv->status)) {
+			if (hw_rf_kill)
+				set_bit(STATUS_RF_KILL_HW, &priv->status);
+			else
+				clear_bit(STATUS_RF_KILL_HW, &priv->status);
+			queue_work(priv->workqueue, &priv->rf_kill);
 		}
 
 		handled |= CSR_INT_BIT_RF_KILL;
@@ -2156,7 +2159,8 @@ static void iwl_bg_rf_kill(struct work_s
 		IWL_DEBUG(IWL_DL_RF_KILL,
 			  "HW and/or SW RF Kill no longer active, restarting "
 			  "device\n");
-		if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
+		if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
+		     test_bit(STATUS_ALIVE, &priv->status))
 			queue_work(priv->workqueue, &priv->restart);
 	} else {
 		/* make sure mac80211 stop sending Tx frame */
@@ -2353,31 +2357,9 @@ static int iwl_mac_start(struct ieee8021
 {
 	struct iwl_priv *priv = hw->priv;
 	int ret;
-	u16 pci_cmd;
 
 	IWL_DEBUG_MAC80211("enter\n");
 
-	if (pci_enable_device(priv->pci_dev)) {
-		IWL_ERROR("Fail to pci_enable_device\n");
-		return -ENODEV;
-	}
-	pci_restore_state(priv->pci_dev);
-	pci_enable_msi(priv->pci_dev);
-
-	/* enable interrupts if needed: hw bug w/a */
-	pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
-	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
-		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
-		pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
-	}
-
-	ret = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
-			  DRV_NAME, priv);
-	if (ret) {
-		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
-		goto out_disable_msi;
-	}
-
 	/* we should be verifying the device is ready to be opened */
 	mutex_lock(&priv->mutex);
 
@@ -2390,7 +2372,7 @@ static int iwl_mac_start(struct ieee8021
 		if (ret) {
 			IWL_ERROR("Could not read microcode: %d\n", ret);
 			mutex_unlock(&priv->mutex);
-			goto out_release_irq;
+			return ret;
 		}
 	}
 
@@ -2401,7 +2383,7 @@ static int iwl_mac_start(struct ieee8021
 	iwl_rfkill_set_hw_state(priv);
 
 	if (ret)
-		goto out_release_irq;
+		return ret;
 
 	if (iwl_is_rfkill(priv))
 		goto out;
@@ -2420,8 +2402,7 @@ static int iwl_mac_start(struct ieee8021
 		if (!test_bit(STATUS_READY, &priv->status)) {
 			IWL_ERROR("START_ALIVE timeout after %dms.\n",
 				jiffies_to_msecs(UCODE_READY_TIMEOUT));
-			ret = -ETIMEDOUT;
-			goto out_release_irq;
+			return -ETIMEDOUT;
 		}
 	}
 
@@ -2429,15 +2410,6 @@ out:
 	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
-
-out_release_irq:
-	free_irq(priv->pci_dev->irq, priv);
-out_disable_msi:
-	pci_disable_msi(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
-	priv->is_open = 0;
-	IWL_DEBUG_MAC80211("leave - failed\n");
-	return ret;
 }
 
 static void iwl_mac_stop(struct ieee80211_hw *hw)
@@ -2465,10 +2437,10 @@ static void iwl_mac_stop(struct ieee8021
 	iwl_down(priv);
 
 	flush_workqueue(priv->workqueue);
-	free_irq(priv->pci_dev->irq, priv);
-	pci_disable_msi(priv->pci_dev);
-	pci_save_state(priv->pci_dev);
-	pci_disable_device(priv->pci_dev);
+
+	/* enable interrupts again in order to receive rfkill changes */
+	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
+	iwl_enable_interrupts(priv);
 
 	IWL_DEBUG_MAC80211("leave\n");
 }
@@ -3764,6 +3736,7 @@ static int iwl_pci_probe(struct pci_dev 
 	struct ieee80211_hw *hw;
 	struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
 	unsigned long flags;
+	u16 pci_cmd;
 
 	/************************
 	 * 1. Allocating HW data
@@ -3909,26 +3882,36 @@ static int iwl_pci_probe(struct pci_dev 
 	iwl_disable_interrupts(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
+	pci_enable_msi(priv->pci_dev);
+
+	err = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
+			  DRV_NAME, priv);
+	if (err) {
+		IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+		goto out_disable_msi;
+	}
 	err = sysfs_create_group(&pdev->dev.kobj, &iwl_attribute_group);
 	if (err) {
 		IWL_ERROR("failed to create sysfs device attributes\n");
 		goto out_uninit_drv;
 	}
 
-
 	iwl_setup_deferred_work(priv);
 	iwl_setup_rx_handlers(priv);
 
-	/********************
-	 * 9. Conclude
-	 ********************/
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-
 	/**********************************
-	 * 10. Setup and register mac80211
+	 * 9. Setup and register mac80211
 	 **********************************/
 
+	/* enable interrupts if needed: hw bug w/a */
+	pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
+	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+		pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
+	}
+
+	iwl_enable_interrupts(priv);
+
 	err = iwl_setup_mac(priv);
 	if (err)
 		goto out_remove_sysfs;
@@ -3937,10 +3920,19 @@ static int iwl_pci_probe(struct pci_dev 
 	if (err)
 		IWL_ERROR("failed to create debugfs files\n");
 
+	/* If platform's RF_KILL switch is NOT set to KILL */
+	if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+
 	err = iwl_rfkill_init(priv);
 	if (err)
 		IWL_ERROR("Unable to initialize RFKILL system. "
 				  "Ignoring error: %d\n", err);
+	else
+		iwl_rfkill_set_hw_state(priv);
+
 	iwl_power_initialize(priv);
 	return 0;
 
@@ -3948,6 +3940,9 @@ static int iwl_pci_probe(struct pci_dev 
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 	sysfs_remove_group(&pdev->dev.kobj, &iwl_attribute_group);
+ out_disable_msi:
+	pci_disable_msi(priv->pci_dev);
+	pci_disable_device(priv->pci_dev);
  out_uninit_drv:
 	iwl_uninit_drv(priv);
  out_free_eeprom:
@@ -4019,6 +4014,8 @@ static void __devexit iwl_pci_remove(str
 	destroy_workqueue(priv->workqueue);
 	priv->workqueue = NULL;
 
+	free_irq(priv->pci_dev->irq, priv);
+	pci_disable_msi(priv->pci_dev);
 	pci_iounmap(pdev, priv->hw_base);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
@@ -4044,19 +4041,8 @@ static int iwl_pci_suspend(struct pci_de
 		priv->is_open = 1;
 	}
 
-	/* pci driver assumes state will be saved in this function.
-	 * pci state is saved and device disabled when interface is
-	 * stopped, so at this time pci device will always be disabled -
-	 * whether interface was started or not. saving pci state now will
-	 * cause saved state be that of a disabled device, which will cause
-	 * problems during resume in that we will end up with a disabled device.
-	 *
-	 * indicate that the current saved state (from when interface was
-	 * stopped) is valid. if interface was never up at time of suspend
-	 * then the saved state will still be valid as it was saved during
-	 * .probe. */
-	pdev->state_saved = true;
-
+	pci_save_state(pdev);
+	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
@@ -4067,6 +4053,9 @@ static int iwl_pci_resume(struct pci_dev
 	struct iwl_priv *priv = pci_get_drvdata(pdev);
 
 	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_device(pdev);
+	pci_restore_state(pdev);
+	iwl_enable_interrupts(priv);
 
 	if (priv->is_open)
 		iwl_mac_start(priv->hw);

linux-2.6-kvm-kconfig-irqchip.patch:

--- NEW FILE linux-2.6-kvm-kconfig-irqchip.patch ---
commit 1dae8e15bb85de0116ed43cd3d798a035044954c
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Jan 4 18:04:18 2009 +0200

    KVM: Add CONFIG_HAVE_KVM_IRQCHIP
    
    Two KVM archs support irqchips and two don't.  Add a Kconfig item to
    make selecting between the two models easier.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index f833a0b..0a2d6b8 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
 	bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	depends on HAVE_KVM || IA64
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 1465705..5a152a5 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -2,6 +2,9 @@
 # KVM configuration
 #
 
+config HAVE_KVM_IRQCHIP
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	---help---
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index e051cad..3e260b7 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -4,6 +4,9 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	default y
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index b81125f..0a303c3 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	depends on HAVE_KVM || X86

linux-2.6-kvm-mask-notifiers.patch:

--- NEW FILE linux-2.6-kvm-mask-notifiers.patch ---
b018d32632d3c59d3618e23128e4312fe8e48d64
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 3cf0ede..99963f3 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -127,6 +127,10 @@ struct kvm {
 	struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
 #endif
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+	struct hlist_head mask_notifier_list;
+#endif
+
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
 	struct mmu_notifier mmu_notifier;
 	unsigned long mmu_notifier_seq;
@@ -320,6 +324,19 @@ struct kvm_assigned_dev_kernel {
 	struct pci_dev *dev;
 	struct kvm *kvm;
 };
+
+struct kvm_irq_mask_notifier {
+	void (*func)(struct kvm_irq_mask_notifier *kimn, bool masked);
+	int irq;
+	struct hlist_node link;
+};
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+				    struct kvm_irq_mask_notifier *kimn);
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+				      struct kvm_irq_mask_notifier *kimn);
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
+
 void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 23b81cf..e85a2bc 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -101,6 +101,7 @@ static void ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx)
 static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 {
 	unsigned index;
+	bool mask_before, mask_after;
 
 	switch (ioapic->ioregsel) {
 	case IOAPIC_REG_VERSION:
@@ -120,6 +121,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 		ioapic_debug("change redir index %x val %x\n", index, val);
 		if (index >= IOAPIC_NUM_PINS)
 			return;
+		mask_before = ioapic->redirtbl[index].fields.mask;
 		if (ioapic->ioregsel & 1) {
 			ioapic->redirtbl[index].bits &= 0xffffffff;
 			ioapic->redirtbl[index].bits |= (u64) val << 32;
@@ -128,6 +130,9 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 			ioapic->redirtbl[index].bits |= (u32) val;
 			ioapic->redirtbl[index].fields.remote_irr = 0;
 		}
+		mask_after = ioapic->redirtbl[index].fields.mask;
+		if (mask_before != mask_after)
+			kvm_fire_mask_notifiers(ioapic->kvm, index, mask_after);
 		if (ioapic->irr & (1 << index))
 			ioapic_service(ioapic, index);
 		break;
@@ -426,3 +431,4 @@ int kvm_ioapic_init(struct kvm *kvm)
 	kvm_io_bus_register_dev(&kvm->mmio_bus, &ioapic->dev);
 	return 0;
 }
+
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index aa5d1e5..5162a41 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -99,3 +99,27 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
 		clear_bit(irq_source_id, &kvm->arch.irq_states[i]);
 	clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
 }
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+				    struct kvm_irq_mask_notifier *kimn)
+{
+	kimn->irq = irq;
+	hlist_add_head(&kimn->link, &kvm->mask_notifier_list);
+}
+
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+				      struct kvm_irq_mask_notifier *kimn)
+{
+	hlist_del(&kimn->link);
+}
+
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask)
+{
+	struct kvm_irq_mask_notifier *kimn;
+	struct hlist_node *n;
+
+	hlist_for_each_entry(kimn, n, &kvm->mask_notifier_list, link)
+		if (kimn->irq == irq)
+			kimn->func(kimn, mask);
+}
+
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index dcbfc68..785c1e3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -831,6 +831,9 @@ static struct kvm *kvm_create_vm(void)
 
 	if (IS_ERR(kvm))
 		goto out;
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+	INIT_HLIST_HEAD(&kvm->mask_notifier_list);
+#endif
 
 #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET
 	page = alloc_page(GFP_KERNEL | __GFP_ZERO);

linux-2.6-kvm-reset-pit-irq-on-unmask.patch:

--- NEW FILE linux-2.6-kvm-reset-pit-irq-on-unmask.patch ---
commit 4780c65904f0fc4e312ee2da9383eacbe04e61ea
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Jan 4 18:06:06 2009 +0200

    KVM: Reset PIT irq injection logic when the PIT IRQ is unmasked
    
    While the PIT is masked the guest cannot ack the irq, so the reinject logic
    will never allow the interrupt to be injected.
    
    Fix by resetting the reinjection counters on unmask.
    
    Unbreaks Xen.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 69d1bbf..c13bb92 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -539,6 +539,16 @@ void kvm_pit_reset(struct kvm_pit *pit)
 	pit->pit_state.irq_ack = 1;
 }
 
+static void pit_mask_notifer(struct kvm_irq_mask_notifier *kimn, bool mask)
+{
+	struct kvm_pit *pit = container_of(kimn, struct kvm_pit, mask_notifier);
+
+	if (!mask) {
+		atomic_set(&pit->pit_state.pit_timer.pending, 0);
+		pit->pit_state.irq_ack = 1;
+	}
+}
+
 struct kvm_pit *kvm_create_pit(struct kvm *kvm)
 {
 	struct kvm_pit *pit;
@@ -586,6 +596,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
 
 	kvm_pit_reset(pit);
 
+	pit->mask_notifier.func = pit_mask_notifer;
+	kvm_register_irq_mask_notifier(kvm, 0, &pit->mask_notifier);
+
 	return pit;
 }
 
@@ -594,6 +607,8 @@ void kvm_free_pit(struct kvm *kvm)
 	struct hrtimer *timer;
 
 	if (kvm->arch.vpit) {
+		kvm_unregister_irq_mask_notifier(kvm, 0,
+					       &kvm->arch.vpit->mask_notifier);
 		mutex_lock(&kvm->arch.vpit->pit_state.lock);
 		timer = &kvm->arch.vpit->pit_state.pit_timer.timer;
 		hrtimer_cancel(timer);
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index 76959c4..6acbe4b 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -46,6 +46,7 @@ struct kvm_pit {
 	struct kvm *kvm;
 	struct kvm_kpit_state pit_state;
 	int irq_source_id;
+	struct kvm_irq_mask_notifier mask_notifier;
 };
 
 #define KVM_PIT_BASE_ADDRESS	    0x40

linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch:

--- NEW FILE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch ---
From: NeilBrown <neilb at suse.de>
Date: Mon, 6 Apr 2009 04:40:38 +0000 (+1000)
Subject: md/raid1 - don't assume newly allocated bvecs are initialised.
X-Git-Tag: v2.6.30-rc1~176^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=303a0e11d0ee136ad8f53f747f3c377daece763b

md/raid1 - don't assume newly allocated bvecs are initialised.

Since commit d3f761104b097738932afcc310fbbbbfb007ef92
newly allocated bvecs aren't initialised to NULL, so we have
to be more careful about freeing a bio which only managed
to get a few pages allocated to it.  Otherwise the resync
process crashes.

This patch is appropriate for 2.6.29-stable.

Cc: stable at kernel.org
Cc: "Jens Axboe" <jens.axboe at oracle.com>
Reported-by: Gabriele Tozzi <gabriele at tozzi.eu>
Signed-off-by: NeilBrown <neilb at suse.de>
---

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b4f4bad..f2247b0 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -123,6 +123,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 				goto out_free_pages;
 
 			bio->bi_io_vec[i].bv_page = page;
+			bio->bi_vcnt = i+1;
 		}
 	}
 	/* If not user-requests, copy the page pointers to all bios */
@@ -138,9 +139,9 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 	return r1_bio;
 
 out_free_pages:
-	for (i=0; i < RESYNC_PAGES ; i++)
-		for (j=0 ; j < pi->raid_disks; j++)
-			safe_put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
+	for (j=0 ; j < pi->raid_disks; j++)
+		for (i=0; i < r1_bio->bios[j]->bi_vcnt ; i++)
+			put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
 	j = -1;
 out_free_bio:
 	while ( ++j < pi->raid_disks )

linux-2.6-mm-define-unique-value-for-as_unevictable.patch:

--- NEW FILE linux-2.6-mm-define-unique-value-for-as_unevictable.patch ---
From: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Date: Thu, 2 Apr 2009 23:56:45 +0000 (-0700)
Subject: mm: define a UNIQUE value for AS_UNEVICTABLE flag
X-Git-Tag: v2.6.30-rc1~398
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9a896c9a48ac6704c0ce8ee081b836644d0afe40

mm: define a UNIQUE value for AS_UNEVICTABLE flag

A new "address_space flag"--AS_MM_ALL_LOCKS--was defined to use the next
available AS flag while the Unevictable LRU was under development.  The
Unevictable LRU was using the same flag and "no one" noticed.  Current
mainline, since 2.6.28, has same value for two symbolic flag names.

So, define a unique flag value for AS_UNEVICTABLE--up close to the other
flags, [at the cost of an additional #ifdef] so we'll notice next time.
Note that #ifdef is not actually required, if we don't mind having the
unused flag value defined.

Replace #defines with an enum.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: <stable at kernel.org>		[2.6.28.x, 2.6.29.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 01ca085..076a7dc 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -18,9 +18,14 @@
  * Bits in mapping->flags.  The lower __GFP_BITS_SHIFT bits are the page
  * allocation mode flags.
  */
-#define	AS_EIO		(__GFP_BITS_SHIFT + 0)	/* IO error on async write */
-#define AS_ENOSPC	(__GFP_BITS_SHIFT + 1)	/* ENOSPC on async write */
-#define AS_MM_ALL_LOCKS	(__GFP_BITS_SHIFT + 2)	/* under mm_take_all_locks() */
+enum mapping_flags {
+	AS_EIO		= __GFP_BITS_SHIFT + 0,	/* IO error on async write */
+	AS_ENOSPC	= __GFP_BITS_SHIFT + 1,	/* ENOSPC on async write */
+	AS_MM_ALL_LOCKS	= __GFP_BITS_SHIFT + 2,	/* under mm_take_all_locks() */
+#ifdef CONFIG_UNEVICTABLE_LRU
+	AS_UNEVICTABLE	= __GFP_BITS_SHIFT + 3,	/* e.g., ramdisk, SHM_LOCK */
+#endif
+};
 
 static inline void mapping_set_error(struct address_space *mapping, int error)
 {
@@ -33,7 +38,6 @@ static inline void mapping_set_error(struct address_space *mapping, int error)
 }
 
 #ifdef CONFIG_UNEVICTABLE_LRU
-#define AS_UNEVICTABLE	(__GFP_BITS_SHIFT + 2)	/* e.g., ramdisk, SHM_LOCK */
 
 static inline void mapping_set_unevictable(struct address_space *mapping)
 {

linux-2.6-posix-timers-fix-clock-monotonicity.patch:

--- NEW FILE linux-2.6-posix-timers-fix-clock-monotonicity.patch ---
From: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Tue, 31 Mar 2009 07:56:03 +0000 (+0900)
Subject: posixtimers, sched: Fix posix clock monotonicity
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c5f8d99585d7b5b7e857fabf8aefd0174903a98c

posixtimers, sched: Fix posix clock monotonicity

Impact: Regression fix (against clock_gettime() backwarding bug)

This patch re-introduces a couple of functions, task_sched_runtime
and thread_group_sched_runtime, which was once removed at the
time of 2.6.28-rc1.

These functions protect the sampling of thread/process clock with
rq lock.  This rq lock is required not to update rq->clock during
the sampling.

i.e.
  The clock_gettime() may return
   ((accounted runtime before update) + (delta after update))
  that is less than what it should be.

v2 -> v3:
	- Rename static helper function __task_delta_exec()
	  to do_task_delta_exec() since -tip tree already has
	  a __task_delta_exec() of different version.

v1 -> v2:
	- Revises comments of function and patch description.
	- Add note about accuracy of thread group's runtime.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: stable at kernel.org	[2.6.28.x][2.6.29.x]
LKML-Reference: <49D1CC93.4080401 at jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index fa07da9..4318c30 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -224,7 +224,7 @@ static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p,
 		cpu->cpu = virt_ticks(p);
 		break;
 	case CPUCLOCK_SCHED:
-		cpu->sched = p->se.sum_exec_runtime + task_delta_exec(p);
+		cpu->sched = task_sched_runtime(p);
 		break;
 	}
 	return 0;
@@ -240,18 +240,19 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
 {
 	struct task_cputime cputime;
 
-	thread_group_cputime(p, &cputime);
 	switch (CPUCLOCK_WHICH(which_clock)) {
 	default:
 		return -EINVAL;
 	case CPUCLOCK_PROF:
+		thread_group_cputime(p, &cputime);
 		cpu->cpu = cputime_add(cputime.utime, cputime.stime);
 		break;
 	case CPUCLOCK_VIRT:
+		thread_group_cputime(p, &cputime);
 		cpu->cpu = cputime.utime;
 		break;
 	case CPUCLOCK_SCHED:
-		cpu->sched = cputime.sum_exec_runtime + task_delta_exec(p);
+		cpu->sched = thread_group_sched_runtime(p);
 		break;
 	}
 	return 0;
diff --git a/kernel/sched.c b/kernel/sched.c
index cc397aa..c8d7f17 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4139,9 +4139,25 @@ DEFINE_PER_CPU(struct kernel_stat, kstat);
 EXPORT_PER_CPU_SYMBOL(kstat);
 
 /*
- * Return any ns on the sched_clock that have not yet been banked in
+ * Return any ns on the sched_clock that have not yet been accounted in
  * @p in case that task is currently running.
+ *
+ * Called with task_rq_lock() held on @rq.
  */
+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
+{
+	u64 ns = 0;
+
+	if (task_current(rq, p)) {
+		update_rq_clock(rq);
+		ns = rq->clock - p->se.exec_start;
+		if ((s64)ns < 0)
+			ns = 0;
+	}
+
+	return ns;
+}
+
 unsigned long long task_delta_exec(struct task_struct *p)
 {
 	unsigned long flags;
@@ -4149,16 +4165,49 @@ unsigned long long task_delta_exec(struct task_struct *p)
 	u64 ns = 0;
 
 	rq = task_rq_lock(p, &flags);
+	ns = do_task_delta_exec(p, rq);
+	task_rq_unlock(rq, &flags);
 
-	if (task_current(rq, p)) {
-		u64 delta_exec;
+	return ns;
+}
 
-		update_rq_clock(rq);
-		delta_exec = rq->clock - p->se.exec_start;
-		if ((s64)delta_exec > 0)
-			ns = delta_exec;
-	}
+/*
+ * Return accounted runtime for the task.
+ * In case the task is currently running, return the runtime plus current's
+ * pending runtime that have not been accounted yet.
+ */
+unsigned long long task_sched_runtime(struct task_struct *p)
+{
+	unsigned long flags;
+	struct rq *rq;
+	u64 ns = 0;
+
+	rq = task_rq_lock(p, &flags);
+	ns = p->se.sum_exec_runtime + do_task_delta_exec(p, rq);
+	task_rq_unlock(rq, &flags);
+
+	return ns;
+}
 
+/*
+ * Return sum_exec_runtime for the thread group.
+ * In case the task is currently running, return the sum plus current's
+ * pending runtime that have not been accounted yet.
+ *
+ * Note that the thread group might have other running tasks as well,
+ * so the return value not includes other pending runtime that other
+ * running tasks might have.
+ */
+unsigned long long thread_group_sched_runtime(struct task_struct *p)
+{
+	struct task_cputime totals;
+	unsigned long flags;
+	struct rq *rq;
+	u64 ns;
+
+	rq = task_rq_lock(p, &flags);
+	thread_group_cputime(p, &totals);
+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
 	task_rq_unlock(rq, &flags);
 
 	return ns;

linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 27 Mar 2009 00:06:07 +0000 (+0100)
Subject: posix-timers: fix RLIMIT_CPU && fork()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6279a751fe096a21dc7704e918d570d3ff06e769

posix-timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other expired cpu timers.

Change copy_signal() to set cputime_expires.prof_exp if we have RLIMIT_CPU.
Also, set cputimer.running = 1 in that case. This is not strictly necessary,
but imho makes sense.

Reported-by: Peter Lojkin <ia6432 at inbox.ru>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Cc: Peter Lojkin <ia6432 at inbox.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: stable at kernel.org
LKML-Reference: <20090327000607.GA10104 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 4854c2c..9b51a1b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -808,6 +808,12 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
 	sig->cputime_expires.virt_exp = cputime_zero;
 	sig->cputime_expires.sched_exp = 0;
 
+	if (sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) {
+		sig->cputime_expires.prof_exp =
+			secs_to_cputime(sig->rlim[RLIMIT_CPU].rlim_cur);
+		sig->cputimer.running = 1;
+	}
+
 	/* The timer lists. */
 	INIT_LIST_HEAD(&sig->cpu_timers[0]);
 	INIT_LIST_HEAD(&sig->cpu_timers[1]);
@@ -823,11 +829,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 		atomic_inc(&current->signal->live);
 		return 0;
 	}
-	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
-
-	if (sig)
-		posix_cpu_timers_init_group(sig);
 
+	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
 	tsk->signal = sig;
 	if (!sig)
 		return -ENOMEM;
@@ -865,6 +868,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 	memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim);
 	task_unlock(current->group_leader);
 
+	posix_cpu_timers_init_group(sig);
+
 	acct_init_pacct(&sig->pacct);
 
 	tty_audit_fork(sig);

linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Mon, 23 Mar 2009 19:34:11 +0000 (+0100)
Subject: posix timers: fix RLIMIT_CPU && fork()
X-Git-Tag: v2.6.30-rc1~657^2^4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=37bebc70d7ad4144c571d74500db3bb26ec0c0eb

posix timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other cpu timers.

This is the minimal fix for 2.6.29 (tested) and 2.6.28. The patch is not
optimal, we need further cleanups here. With this patch update_rlimit_cpu()
is not really needed, but I don't think it should be removed.

The proper fix (I think) is:

	- set_process_cpu_timer() should just start the cputimer->running
	  logic (it does), no need to change cputime_expires.xxx_exp

	- posix_cpu_timers_init_group() should set ->running when needed

	- fastpath_timer_check() can check ->running instead of
	  task_cputime_zero(signal->cputime_expires)

Reported-by: Peter Lojkin <ia6432 at inbox.ru>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Roland McGrath <roland at redhat.com>
Cc: <stable at kernel.org> [for 2.6.29.x]
LKML-Reference: <20090323193411.GA17514 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index e976e50..8e5d9a6 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1370,7 +1370,8 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
 		if (task_cputime_expired(&group_sample, &sig->cputime_expires))
 			return 1;
 	}
-	return 0;
+
+	return sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY;
 }
 
 /*

linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch:

--- NEW FILE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 27 Mar 2009 00:06:10 +0000 (+0100)
Subject: posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8f2e586567b1bad72dac7c3810fe9a2ef7117506

posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)

update_rlimit_cpu() tries to optimize out set_process_cpu_timer() in case
when we already have CPUCLOCK_PROF timer which should expire first. But it
uses cputime_lt() instead of cputime_gt().

Test case:

	int main(void)
	{
		struct itimerval it = {
			.it_value = { .tv_sec = 1000 },
		};

		assert(!setitimer(ITIMER_PROF, &it, NULL));

		struct rlimit rl = {
			.rlim_cur = 1,
			.rlim_max = 1,
		};

		assert(!setrlimit(RLIMIT_CPU, &rl));

		for (;;)
			;

		return 0;
	}

Without this patch, the task is not killed as RLIMIT_CPU demands.

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Cc: Peter Lojkin <ia6432 at inbox.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: stable at kernel.org
LKML-Reference: <20090327000610.GA10108 at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 8e5d9a6..bb53185 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -18,7 +18,7 @@ void update_rlimit_cpu(unsigned long rlim_new)
 
 	cputime = secs_to_cputime(rlim_new);
 	if (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
-	    cputime_lt(current->signal->it_prof_expires, cputime)) {
+	    cputime_gt(current->signal->it_prof_expires, cputime)) {
 		spin_lock_irq(&current->sighand->siglock);
 		set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
 		spin_unlock_irq(&current->sighand->siglock);

linux-2.6-shut-up-efifb.patch:

--- NEW FILE linux-2.6-shut-up-efifb.patch ---
--- vanilla-2.6.29/drivers/video/efifb.c	2009-03-23 23:12:14.000000000 +0000
+++ linux-2.6.29.noarch/drivers/video/efifb.c	2009-04-01 19:24:01.000000000 +0100
@@ -208,12 +208,15 @@
 	unsigned int size_total;
 	int request_succeeded = 0;
 
-	printk(KERN_INFO "efifb: probing for efifb\n");
-
 	if (!screen_info.lfb_depth)
 		screen_info.lfb_depth = 32;
 	if (!screen_info.pages)
 		screen_info.pages = 1;
+	if (!screen_info.lfb_base) {
+		printk(KERN_DEBUG "efifb: invalid framebuffer address\n");
+		return -ENODEV;
+	}
+	printk(KERN_INFO "efifb: probing for efifb\n");
 
 	/* just assume they're all unset if any are */
 	if (!screen_info.blue_size) {

linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch:

--- NEW FILE linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch ---
USB: cdc-acm: don't set tty low_latency flag

"The hack setting of it for high data rate devices was obsolete when the
tty buffer changes went in so it can definitely go in those cases."
  --Alan Cox

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.29.noarch/drivers/usb/class/cdc-acm.c
===================================================================
--- linux-2.6.29.noarch.orig/drivers/usb/class/cdc-acm.c
+++ linux-2.6.29.noarch/drivers/usb/class/cdc-acm.c
@@ -546,10 +546,6 @@ static int acm_tty_open(struct tty_struc
 	tty->driver_data = acm;
 	acm->tty = tty;
 
-	/* force low_latency on so that our tty_push actually forces the data through,
-	   otherwise it is scheduled, and with high data rates data can get lost. */
-	tty->low_latency = 1;
-
 	if (usb_autopm_get_interface(acm->control) < 0)
 		goto early_bail;
 	else

linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch:

--- NEW FILE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch ---
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -76,7 +76,7 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
 } audio_karaoke_t;     /* into left and right  */
 
 
-typedef uint16_t audio_attributes_t;
+typedef __u16 audio_attributes_t;
 /*   bits: descr. */
 /*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
 /*   12    multichannel extension */

linux-2.6.29-alsa-update-quirks.patch:

--- NEW FILE linux-2.6.29-alsa-update-quirks.patch ---
diff -up linux-2.6.29.noarch/include/sound/core.h.alsa linux-2.6.29.noarch/include/sound/core.h
--- linux-2.6.29.noarch/include/sound/core.h.alsa	2009-04-01 04:21:47.000000000 +0100
+++ linux-2.6.29.noarch/include/sound/core.h	2009-04-01 04:22:00.000000000 +0100
@@ -446,21 +446,33 @@ static inline int __snd_bug_on(int cond)
 struct snd_pci_quirk {
 	unsigned short subvendor;	/* PCI subvendor ID */
 	unsigned short subdevice;	/* PCI subdevice ID */
+	unsigned short subdevice_mask;	/* bitmask to match */
 	int value;			/* value */
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 	const char *name;		/* name of the device (optional) */
 #endif
 };
 
-#define _SND_PCI_QUIRK_ID(vend,dev) \
-	.subvendor = (vend), .subdevice = (dev)
+#define _SND_PCI_QUIRK_ID_MASK(vend, mask, dev)	\
+	.subvendor = (vend), .subdevice = (dev), .subdevice_mask = (mask)
+#define _SND_PCI_QUIRK_ID(vend, dev) \
+	_SND_PCI_QUIRK_ID_MASK(vend, 0xffff, dev)
 #define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
 	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev),			\
+			.value = (val), .name = (xname)}
 #else
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
 	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), .value = (val)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)}
 #endif
 
 const struct snd_pci_quirk *
diff -up linux-2.6.29.noarch/sound/core/misc.c.alsa linux-2.6.29.noarch/sound/core/misc.c
--- linux-2.6.29.noarch/sound/core/misc.c.alsa	2009-04-01 04:21:47.000000000 +0100
+++ linux-2.6.29.noarch/sound/core/misc.c	2009-04-01 04:22:00.000000000 +0100
@@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci
 {
 	const struct snd_pci_quirk *q;
 
-	for (q = list; q->subvendor; q++)
-		if (q->subvendor == pci->subsystem_vendor &&
-		    (!q->subdevice || q->subdevice == pci->subsystem_device))
+	for (q = list; q->subvendor; q++) {
+		if (q->subvendor != pci->subsystem_vendor)
+			continue;
+		if (!q->subdevice ||
+		    (pci->subsystem_device & q->subdevice_mask) == q->subdevice)
 			return q;
+	}
 	return NULL;
 }
-
 EXPORT_SYMBOL(snd_pci_quirk_lookup);
 #endif
diff -up linux-2.6.29.noarch/sound/pci/hda/patch_analog.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_analog.c
--- linux-2.6.29.noarch/sound/pci/hda/patch_analog.c.alsa	2009-04-01 04:21:47.000000000 +0100
+++ linux-2.6.29.noarch/sound/pci/hda/patch_analog.c	2009-04-01 04:22:00.000000000 +0100
@@ -1002,11 +1002,9 @@ static struct snd_pci_quirk ad1986a_cfg_
 	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
 	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
-	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG),
-	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG),
-	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG),
 	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
-	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
+        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_SAMSUNG),
+        SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),
 	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE),
@@ -3911,8 +3909,10 @@ static struct snd_pci_quirk ad1884a_cfg_
 	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
 	SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
-	SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
-	SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e1, "HP laptop", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
 	{}
diff -up linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c
--- linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c.alsa	2009-04-01 04:21:47.000000000 +0100
+++ linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c	2009-04-01 04:22:00.000000000 +0100
@@ -1002,15 +1002,9 @@ static const char *cxt5045_models[CXT504
 };
 
 static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
-	SND_PCI_QUIRK(0x103c, 0x30a5, "HP", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2120", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30cd, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE),
 	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
-	SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
+                           CXT5045_LAPTOP_HPSENSE),
 	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT5045_LAPTOP_MICSENSE),
 	SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),
 	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),
@@ -1020,8 +1014,8 @@ static struct snd_pci_quirk cxt5045_cfg_
 	SND_PCI_QUIRK(0x1509, 0x1e40, "FIC", CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x1509, 0x2f05, "FIC", CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x1509, 0x2f06, "FIC", CXT5045_LAPTOP_HPMICSENSE),
-	SND_PCI_QUIRK(0x1631, 0xc106, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
-	SND_PCI_QUIRK(0x1631, 0xc107, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
+        SND_PCI_QUIRK_MASK(0x1631, 0xff00, 0xc100, "Packard Bell",
+                           CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
 	{}
 };
diff -up linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c
--- linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c.alsa	2009-04-01 04:21:47.000000000 +0100
+++ linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c	2009-04-01 04:22:13.000000000 +0100
@@ -10549,15 +10549,12 @@ static const char *alc262_models[ALC262_
 static struct snd_pci_quirk alc262_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),
-	SND_PCI_QUIRK(0x103c, 0x12fe, "HP xw9400", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x12ff, "HP xw4550", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1306, "HP xw8600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",
+			   ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",
+			   ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",
+			   ALC262_HP_BPC),
 	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
 	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
 	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
@@ -10575,17 +10572,16 @@ static struct snd_pci_quirk alc262_cfg_t
 	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
 	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x9033, "Sony VAIO VGN-SR19XN",
-		      ALC262_SONY_ASSAMD),
+        SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */
+        SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",
+			   ALC262_SONY_ASSAMD),
 	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
 		      ALC262_TOSHIBA_RX1),
 	SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
 	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
 	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
-	SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
-	SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
+        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
+			   ALC262_ULTRA),
 	SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
 	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
@@ -16039,9 +16035,8 @@ static struct snd_pci_quirk alc662_cfg_t
 	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
 	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
 					ALC662_3ST_6ch_DIG),
-	SND_PCI_QUIRK(0x1854, 0x2000, "ASUS H13-2000", ALC663_ASUS_H13),
-	SND_PCI_QUIRK(0x1854, 0x2001, "ASUS H13-2001", ALC663_ASUS_H13),
-	SND_PCI_QUIRK(0x1854, 0x2002, "ASUS H13-2002", ALC663_ASUS_H13),
+        SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
+			   ALC663_ASUS_H13),
 	{}
 };
 
diff -up linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c
--- linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c.alsa	2009-04-01 04:21:47.000000000 +0100
+++ linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c	2009-04-01 04:22:00.000000000 +0100
@@ -1796,18 +1796,12 @@ static struct snd_pci_quirk stac92hd71bx
 	/* SigmaTel reference board */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
 		      "DFI LanParty", STAC_92HD71BXX_REF),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f2,
-		      "HP dv5", STAC_HP_M4),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
-		      "HP dv7", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
-		      "HP dv4", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
-		      "HP dv7", STAC_HP_M4),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3600,
-		      "HP dv5", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
-		      "HP dv5", STAC_HP_DV5),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,
+			   "HP", STAC_HP_DV5),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,
+			   "HP dv4-7", STAC_HP_DV5),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,
+			   "HP dv4-7", STAC_HP_DV5),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,
 				"unknown HP", STAC_HP_M4),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
@@ -2065,32 +2059,8 @@ static struct snd_pci_quirk stac922x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,
 		      "Dell XPS M1210", STAC_922X_DELL_M82),
 	/* ECS/PC Chips boards */
-	SND_PCI_QUIRK(0x1019, 0x2144,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2608,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2633,
-		      "ECS/PC chips P17G/1333", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2811,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2812,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2813,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2814,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2815,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2816,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2817,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2818,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2819,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2820,
-		      "ECS/PC chips", STAC_ECS_202),
+        SND_PCI_QUIRK_MASK(0x1019, 0xf000, 0x2000,
+			   "ECS/PC chips", STAC_ECS_202),
 	{} /* terminator */
 };
 
@@ -2148,22 +2118,10 @@ static struct snd_pci_quirk stac927x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x3d01, "Intel D946", STAC_D965_3ST),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xa301, "Intel D946", STAC_D965_3ST),
 	/* 965 based 3 stack systems */
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2116, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2115, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2114, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2113, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2112, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2111, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2110, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2009, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2008, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2007, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2006, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2005, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2004, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2100,
+			   "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,
+			   "Intel D965", STAC_D965_3ST),
 	/* Dell 3 stack systems */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_3ST),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
@@ -2179,15 +2137,10 @@ static struct snd_pci_quirk stac927x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS),
 	/* 965 based 5 stack systems */
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2303, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2304, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2305, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2501, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2502, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2503, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2504, "Intel D965", STAC_D965_5ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2300,
+			   "Intel D965", STAC_D965_5ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500,
+			   "Intel D965", STAC_D965_5ST),
 	{} /* terminator */
 };
 

linux-2.6.29.1-sparc-regression.patch:

--- NEW FILE linux-2.6.29.1-sparc-regression.patch ---
>From davem at davemloft.net Tue Apr  7 17:24:11 2009
Return-Path: <davem at davemloft.net>
X-Original-To: dennis at ausil.us
Delivered-To: dennis at ausil.us
Received: from localhost (unknown [127.0.0.1])
	by mail.ausil.us (Postfix) with ESMTP id 8067B158003
	for <dennis at ausil.us>; Tue,  7 Apr 2009 22:24:22 +0000 (UTC)
X-Virus-Scanned: amavisd-new at example.com
Received: from mail.ausil.us ([127.0.0.1])
	by localhost (anubis.ausil.us [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Wtdx2a8O54+g for <dennis at ausil.us>;
	Tue,  7 Apr 2009 17:24:21 -0500 (CDT)
X-Greylist: from auto-whitelisted by SQLgrey-1.7.5
Received: from sunset.davemloft.net (unknown [74.93.104.97])
	by mail.ausil.us (Postfix) with ESMTP id 7A828158001
	for <dennis at ausil.us>; Tue,  7 Apr 2009 17:24:21 -0500 (CDT)
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id CA9B8C8D935;
	Tue,  7 Apr 2009 15:24:11 -0700 (PDT)
Date: Tue, 07 Apr 2009 15:24:11 -0700 (PDT)
Message-Id: <20090407.152411.198483029.davem at davemloft.net>
To: dennis at ausil.us
Cc: sparclinux at vger.kernel.org
Subject: Re: kernel bug with CONFIG_KEYBOARD_ATKBD=y
From: David Miller <davem at davemloft.net>
In-Reply-To: <20090407.151638.93201206.davem at davemloft.net>
References: <20090407.145755.213806619.davem at davemloft.net>
	<200904071710.09685.dennis at ausil.us>
	<20090407.151638.93201206.davem at davemloft.net>
X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset=us-ascii
Content-Transfer-Encoding: 7bit
X-UID: 4807
X-Length: 3606
Status: R
X-Status: N
X-KMail-EncryptionState:  
X-KMail-SignatureState:  
X-KMail-MDN-Sent:  

From: David Miller <davem at davemloft.net>
Date: Tue, 07 Apr 2009 15:16:38 -0700 (PDT)

> From: Dennis Gilmore <dennis at ausil.us>
> Date: Tue, 7 Apr 2009 17:10:08 -0500
> 
>> On Tuesday 07 April 2009 04:57:55 pm David Miller wrote:
>>> From: Dennis Gilmore <dennis at ausil.us>
>>> Date: Tue, 7 Apr 2009 10:01:17 -0500
>>>
>>> > Initalizing network drop monitor service
>>> > kernel BUG at
>>> > /builddir/build/BUILD/kernel-2.6.29/linux-2.6.29.sparc64/arch/sparc/inclu
>>> >de/asm/tlb_64.h:48!
>>>
>>> What kernel is this tree based upon?  2.6.29.1?
>> yeah 2.6.29.1
> 
> A sparc64 fix I put into 2.6.29.1 is likely the cause.  It's possible
> I put in a version without a particular issue cured.

Indeed, here is the fix, I'll push it to -stable.  Thanks for your
report:

sparc64: Fix bug in ("sparc64: Flush TLB before releasing pages.")

[ No upstream commit, this regression was added only to 2.6.29.1 ]

Unfortunately I merged an earlier version of commit
b6816b706138c3870f03115071872cad824f90b4 ("sparc64: Flush TLB before
releasing pages.") than what I actually tested and merged upstream.

Simply diffing asm/tlb_64.h in Linus's tree vs. what ended up in
2.6.29.1 confirms this.

Sync things up to fix BUG() triggers some users are seeing.

Reported-by: Dennis Gilmore <dennis at ausil.us>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
 arch/sparc/include/asm/tlb_64.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
index 0aaa086..ee38e73 100644
--- a/arch/sparc/include/asm/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
@@ -57,9 +57,9 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i
 
 static inline void tlb_flush_mmu(struct mmu_gather *mp)
 {
+	if (!mp->fullmm)
+		flush_tlb_pending();
 	if (mp->need_flush) {
-		if (!mp->fullmm)
-			flush_tlb_pending();
 		free_pages_and_swap_cache(mp->pages, mp->pages_nr);
 		mp->pages_nr = 0;
 		mp->need_flush = 0;
-- 
1.6.2.2



--- NEW FILE patch-2.6.29.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ1UWtyGugalF9Dw4RAkuGAJ4sDs0OM/1EKkycBDFYGk6E7l0UrgCghiIF
A7VtJ1agWJvh0s6+3jIaXSs=
=Wnzk
-----END PGP SIGNATURE-----

squashfs-broken-when-pagesize-greater-than-blocksize.patch:

--- NEW FILE squashfs-broken-when-pagesize-greater-than-blocksize.patch ---
From: Doug Chapman <doug.chapman at hp.com>
To: fedora-kernel-list at redhat.com
Subject: [PATCH] squashfs broken when pageszie > blocksize

Not sure if we are too late for F11 on this or not but this patch
is needed to be able to mount squashfs (as used by anaconda) on
ia64.  Our goal is to be able to build Fedora on ia64 with no
custom SRPMs so it would be appreciated if this could be pulled
in.

--------------------

Squashfs is broken on any system where the pageszie is larger than either
the block size of the squashfs image or larger than the metadata size (8192).
This is easily fixed by ensuring cache->pages is always > 0.

Signed-off-by: Doug Chapman <doug.chapman at hp.com>
Cc: Phillip Lougher <phillip at lougher.demon.co.uk>

---
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 1c4739e..40c98fa 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -252,6 +252,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,
 	cache->entries = entries;
 	cache->block_size = block_size;
 	cache->pages = block_size >> PAGE_CACHE_SHIFT;
+	cache->pages = cache->pages ? cache->pages : 1;
 	cache->name = name;
 	cache->num_waiters = 0;
 	spin_lock_init(&cache->lock);


_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.8
retrieving revision 1.1014.2.9
diff -u -r1.1014.2.8 -r1.1014.2.9
--- .cvsignore	24 Mar 2009 22:57:41 -0000	1.1014.2.8
+++ .cvsignore	14 Apr 2009 22:09:05 -0000	1.1014.2.9
@@ -5,3 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
+patch-2.6.29.1.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97.6.2
retrieving revision 1.97.6.3
diff -u -r1.97.6.2 -r1.97.6.3
--- Makefile	24 Mar 2009 22:57:41 -0000	1.97.6.2
+++ Makefile	14 Apr 2009 22:09:05 -0000	1.97.6.3
@@ -70,6 +70,7 @@
 	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
+	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -114,6 +115,7 @@
 	@perl -pi -e 's/CONFIG_PCI_MSI_DEFAULT_ON=y/# CONFIG_PCI_MSI_DEFAULT_ON is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
+	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.54.6.4
retrieving revision 1.54.6.5
diff -u -r1.54.6.4 -r1.54.6.5
--- TODO	30 Mar 2009 19:45:43 -0000	1.54.6.4
+++ TODO	14 Apr 2009 22:09:06 -0000	1.54.6.5
@@ -66,8 +66,13 @@
 * linux-2.6.29-lirc.patch
 * linux-2.6-sysrq-c.patch
 	jarod working on upstreaming
-* linux-2.6-hdpvr.patch
-	jarod added, should be in upstream v4l-dvb by .28, linus' tree by .29
+
+* drm-intel-lying-systems-without-lvds.patch
+	will be used as a fallback for 2.6.30 if vbios probing doesn't
+	pan out in time, may go to 2.6.29.x at some point (jarod's doing)
+* linux-2.6-acer-wmi-bail-on-aao.patch
+	suck. something similar-but-less-pretty merged upstream on 20090304,
+	a day after I (jarod) wrote my version... Headed to stable too.
 
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch
@@ -97,6 +102,11 @@
         https://bugzilla.redhat.com/490266
         Should be in 2.6.29.1
 
-* linux-2.6.29-pat-fixes.patch:
-	http://bugs.freedesktop.org/show_bug.cgi?id=20803
-	ajax to follow up with jbarnes
+* linux-2.6-kvm-kconfig-irqchip.patch
+  linux-2.6-kvm-mask-notifiers.patch
+  linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+	Unable to run RHEL-5 Xen within KVM guest
+	https://bugzilla.redhat.com/show_bug.cgi?id=491625
+	Should be in 2.6.29.2
+
+


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/branch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- branch	21 Feb 2009 16:05:54 -0000	1.1.2.1
+++ branch	14 Apr 2009 22:09:07 -0000	1.1.2.2
@@ -1 +1 @@
-devel
+F-11


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.23
retrieving revision 1.23.6.1
diff -u -r1.23 -r1.23.6.1
--- config-debug	5 Feb 2009 19:02:18 -0000	1.23
+++ config-debug	14 Apr 2009 22:09:07 -0000	1.23.6.1
@@ -48,3 +48,5 @@
 CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_DMA_API_DEBUG=y
+
+CONFIG_MMIOTRACE=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.15
retrieving revision 1.238.6.16
diff -u -r1.238.6.15 -r1.238.6.16
--- config-generic	30 Mar 2009 20:19:11 -0000	1.238.6.15
+++ config-generic	14 Apr 2009 22:09:07 -0000	1.238.6.16
@@ -5,7 +5,7 @@
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
-# CONFIG_CRASH_DUMP is not set
+
 #
 # Code maturity level options
 #
@@ -40,8 +40,8 @@
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=m
-CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_USER_NS=y
@@ -1366,10 +1366,10 @@
 # CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -2300,6 +2300,7 @@
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_DM1105=m
+CONFIG_DVB_DYNAMIC_MINORS=y
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -2559,7 +2560,7 @@
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m
@@ -2694,6 +2695,7 @@
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
@@ -2853,6 +2855,7 @@
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
@@ -2969,11 +2972,12 @@
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
-CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4DEV_COMPAT=y
+CONFIG_JBD2=y
 CONFIG_JBD2_DEBUG=y
 CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
@@ -3098,7 +3102,8 @@
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
@@ -3289,6 +3294,7 @@
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
@@ -3349,7 +3355,7 @@
 #
 # Library routines
 #
-CONFIG_CRC16=m
+CONFIG_CRC16=y
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
@@ -3425,7 +3431,7 @@
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 
 ## BEGIN ISA Junk.
 
@@ -3436,7 +3442,7 @@
 # CONFIG_COPS is not set
 
 CONFIG_SCSI_AHA152X=m
-# CONFIG_SCSI_AHA1542 is not set
+CONFIG_SCSI_AHA1542=m
 # CONFIG_SCSI_IN2000 is not set
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ARCMSR_AER=y
@@ -3841,7 +3847,7 @@
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_BOOT_TRACER=y
+# CONFIG_BOOT_TRACER is not set
 CONFIG_STACK_TRACER=y
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 CONFIG_EARLY_PRINTK_DBGP=y
@@ -3853,7 +3859,8 @@
 CONFIG_FCOE=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 
-CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRASH is not set
 
 #
 # added for xen pvops patch
@@ -3883,5 +3890,3 @@
 # CONFIG_X86_CPU_DEBUG is not set
 # CONFIG_KEXEC_JUMP is not set
 # CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_SQUASHFS3 is not set
-# CONFIG_SQUASHFS3_EMBEDDED is not set


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.31
retrieving revision 1.31.6.1
diff -u -r1.31 -r1.31.6.1
--- config-nodebug	5 Feb 2009 21:11:18 -0000	1.31
+++ config-nodebug	14 Apr 2009 22:09:07 -0000	1.31.6.1
@@ -2,48 +2,50 @@
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_SPINLOCK=y
-
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FAILSLAB is not set
+# CONFIG_FAIL_PAGE_ALLOC is not set
+# CONFIG_FAIL_MAKE_REQUEST is not set
+# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
+# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
 # CONFIG_FAIL_IO_TIMEOUT is not set
 
-CONFIG_SLUB_DEBUG_ON=y
+# CONFIG_SLUB_DEBUG_ON is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
 # CONFIG_ACPI_DEBUG is not set
 
-CONFIG_DEBUG_SG=y
+# CONFIG_DEBUG_SG is not set
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
+# CONFIG_DEBUG_OBJECTS_FREE is not set
+# CONFIG_DEBUG_OBJECTS_TIMERS is not set
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-CONFIG_X86_PTDUMP=y
+# CONFIG_X86_PTDUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
 
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
 
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
+
+# CONFIG_MMIOTRACE is not set


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.21.6.1
retrieving revision 1.21.6.2
diff -u -r1.21.6.1 -r1.21.6.2
--- config-sparc64-generic	12 Mar 2009 20:38:56 -0000	1.21.6.1
+++ config-sparc64-generic	14 Apr 2009 22:09:07 -0000	1.21.6.2
@@ -151,7 +151,7 @@
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E_TX_RETRY=16
 # CONFIG_DRM_TDFX is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_SPARCSPKR=m
@@ -197,3 +197,5 @@
 CONFIG_SENSORS_ULTRA45=m
 CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
+
+# CONFIG_KGDB is not set


Index: config-sparc64-smp
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-smp,v
retrieving revision 1.2
retrieving revision 1.2.16.1
diff -u -r1.2 -r1.2.16.1
--- config-sparc64-smp	16 Jul 2008 21:29:33 -0000	1.2
+++ config-sparc64-smp	14 Apr 2009 22:09:07 -0000	1.2.16.1
@@ -1 +1,2 @@
 CONFIG_SMP=y
+CONFIG_KGDB=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.5
retrieving revision 1.68.6.6
diff -u -r1.68.6.5 -r1.68.6.6
--- config-x86-generic	30 Mar 2009 19:45:43 -0000	1.68.6.5
+++ config-x86-generic	14 Apr 2009 22:09:07 -0000	1.68.6.6
@@ -98,7 +98,7 @@
 #
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
-# CONFIG_SCSI_ADVANSYS is not set
+CONFIG_SCSI_ADVANSYS=m
 
 CONFIG_SECCOMP=y
 
@@ -333,6 +333,7 @@
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_PROC_VMCORE=y
+CONFIG_CRASH=m
 
 CONFIG_CRYPTO_DEV_GEODE=m
 
@@ -363,7 +364,7 @@
 CONFIG_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XENFS=y
+CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 
 CONFIG_MTD_ESB2ROM=m
@@ -413,7 +414,6 @@
 CONFIG_SYSPROF_TRACER=y
 
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 # CONFIG_DEBUG_PER_CPU_MAPS is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.5
retrieving revision 1.68.2.6
diff -u -r1.68.2.5 -r1.68.2.6
--- config-x86_64-generic	26 Mar 2009 00:02:12 -0000	1.68.2.5
+++ config-x86_64-generic	14 Apr 2009 22:09:07 -0000	1.68.2.6
@@ -10,7 +10,7 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 
@@ -247,6 +247,7 @@
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y
+CONFIG_CRASH=m
 
 CONFIG_DMIID=y
 CONFIG_ISCSI_IBFT_FIND=y
@@ -281,7 +282,7 @@
 CONFIG_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XENFS=y
+CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 
 CONFIG_DMADEVICES=y
@@ -317,7 +318,6 @@
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_SYSPROF_TRACER=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 CONFIG_X86_MPPARSE=y

drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.54.6.7 -r 1.54.6.8 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.54.6.7
retrieving revision 1.54.6.8
diff -u -r1.54.6.7 -r1.54.6.8
--- drm-modesetting-radeon.patch	24 Mar 2009 22:57:41 -0000	1.54.6.7
+++ drm-modesetting-radeon.patch	14 Apr 2009 22:09:08 -0000	1.54.6.8
@@ -1,3 +1,184 @@
+commit 02b2eac96ef3cd6a59bf2a13c9ae104f855ff582
+Merge: 1076a8a 24eacd0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 15:55:42 2009 +1000
+
+    Merge branch 'drm-rawhide' into drm-f11
+
+commit 24eacd0cf8cb65a038934c11ef8ae5da348f1365
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 15:52:28 2009 +1000
+
+    radeon: add another debugging hook to gem code
+
+commit e612721b43a6fb107aa74a41e9438f23bc833051
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 15:32:08 2009 +1000
+
+    radeon: add M7 thinkpad quirk
+
+commit 6a166a2d7b4a4d9ba8ee1535f5ab1d156df6743d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 13:59:29 2009 +1000
+
+    radeon: IGPs enable snooping in theory
+
+commit b954fe6e4c28e92e636afac1110c203148899129
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 13:19:32 2009 +1000
+
+    radeon: ack irqs before suspend in case any are pending
+
+commit 7ac7ebfef2088c943d20f683a7da1a5dcfe1bce3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 14 13:18:37 2009 +1000
+
+    radeon: add initial fixed point bandwidth calcs for legacy chips.
+    
+    This does the bandwidth calcs using a 20/12 fixed point representation,
+    and ports all the code from userspace, it needs testing, but it also
+    ICEs gcc so can't really test until that is fixed.
+
+commit 7db0b18f5cbc62b89f904b5f18d046e7bcac83cc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 13 15:49:34 2009 +1000
+
+    radeon: feed back updated limits to userspace
+
+commit ca7f16ed835965f0f29f38958fa8547331eeba67
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 13 15:45:14 2009 +1000
+
+    radeon: sync atom quirks
+
+commit 173bbeca616f4ffff4d8205f86bfb79c35151de1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 13 15:35:12 2009 +1000
+
+    radeon: agp mode quirks ported from userspace
+
+commit 1076a8a749c46b964ee49f5d4dc42070b1905e26
+Merge: e94c6e1 8765b83
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 20:04:30 2009 +1000
+
+    Merge branch 'drm-rawhide' into drm-f11
+
+commit 8765b83462d03fcbd2b9d2eab647d7c2d362b12a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 20:02:43 2009 +1000
+
+    radeon: commit missed change
+
+commit c6714d8fcdecbba304eb9e0745a4d8b6d0fb54b7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 20:01:12 2009 +1000
+
+    radeon: temporary dac detection fix
+
+commit d96029a52d92bd307e93e4d917c9befff246f196
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Apr 9 20:00:49 2009 +1000
+
+    radeon: fixups ported from userspace tree
+
+commit f9db70a117cc498c20e567cf53b75ccb5ad79927
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Apr 6 13:32:03 2009 -0400
+
+    radeon: fix default sclk/mclk from combios
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 28c6f86ef07c8f0067ece9d7fe40718854b19422
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Apr 6 13:29:56 2009 -0400
+
+    radeon: fix crtc routing for CRT1 on r4xx ATOM
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+
+commit 78bf4641b234a99deb3820b8d7baece35a54dce6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 18:41:47 2009 +1000
+
+    radeon: reset edid if none found
+
+commit a6fe700b5e32fd4db97fda76cb32977b5f381ebd
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 9 18:40:57 2009 +1000
+
+    radeon: fix up dual head screens on atombios
+
+commit a6dd68b3a5dee15f59bdaabf37b6a36da18a03f4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 17:25:13 2009 +1000
+
+    radeon: fix pinning/unpinning for frontbuffer
+
+commit 828d4bc8e75d8e8ac532269521d2aeb3b50ee529
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 16:58:35 2009 +1000
+
+    radeon: actually unpin cursor on freeing
+
+commit 70c85b35945d11fae318957c7fbc52ce566a6f03
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 20:33:56 2009 +1000
+
+    radeon: add info ioctl
+
+commit e94c6e10efb4dec58e4c0ab419050b11a913eaf9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 15:01:00 2009 +1000
+
+    drop initial config args
+
+commit 280d9ff29dead8e85ed603110ed431d99f07fb99
+Merge: 0221c81 54ed280
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 14:35:32 2009 +1000
+
+    Merge branch 'drm-rawhide' into drm-f11
+    
+    Conflicts:
+    	drivers/gpu/drm/radeon/r300_cmdbuf.c
+    	drivers/gpu/drm/radeon/radeon_cp.c
+
+commit 54ed2800977d314d8af6c1c47cd718d82f734cb6
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Fri Apr 3 15:01:31 2009 +0200
+
+    radeon: cleanup userspace API
+    
+    Remove old userspace API we don't want to use and
+    rename wait_rendering to wait_idle
+    change mmap to using userspace mmap call
+
+commit 71c5ad46842fcd214a8e926eb9528e084622d488
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Fri Apr 3 13:48:20 2009 +0200
+
+    radeon: remove pin/unpin userspace ioctl
+
+commit 7628d2d9b66fc891fc0b030772a0ebae8e695561
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 3 14:56:19 2009 +1000
+
+    radeon: fix two issues with uncached allocs on PCIE systems
+
+commit 79a5ca0c53c2a149f51f71352a6bbf73bcdc40df
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 22:34:53 2009 +1000
+
+    radeon: reorder bm enable vs mode set
+
+commit c9e19d53bafaacd883ad9eafd3090eb6bc4e4837
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 25 21:49:49 2009 +1000
+
+    radeon: add vram limit for testing lower vram
+
 commit dea27f6e83efabdc3e37bc5a91d29d6dab893853
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Mar 18 17:07:07 2009 +1000
@@ -1749,7 +1930,7 @@
 
     drm: import TTM basic objects
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index e0ab173..69de2db 100644
+index 640339e..fdc60ea 100644
 --- a/arch/x86/mm/pat.c
[...3122 lines suppressed...]
-+#define DRM_IOCTL_RADEON_GEM_PWRITE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
-+#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
-+#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
-+#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+
++/* KMS */
++#define DRM_IOCTL_RADEON_GEM_INFO	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
++#define DRM_IOCTL_RADEON_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
++#define DRM_IOCTL_RADEON_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
++#define DRM_IOCTL_RADEON_GEM_PREAD	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
++#define DRM_IOCTL_RADEON_GEM_PWRITE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
++#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
++#define DRM_IOCTL_RADEON_GEM_WAIT_IDLE	DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle) 
++#define DRM_IOCTL_RADEON_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++#define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
 +
+ 
  typedef struct drm_radeon_init {
  	enum {
- 		RADEON_INIT_CP = 0x01,
-@@ -680,6 +713,8 @@ typedef struct drm_radeon_indirect {
+@@ -682,6 +703,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-+#define RADEON_PARAM_KERNEL_MM             16
-+#define RADEON_PARAM_DEVICE_ID		   17
++#define RADEON_PARAM_DEVICE_ID             16
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -734,6 +769,7 @@ typedef struct drm_radeon_setparam {
- #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
- #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
- #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-+#define RADEON_SETPARAM_MM_INIT 7               /* DDX wants memory manager but has no modesetting */
- /* 1.14: Clients can allocate/free a surface
-  */
- typedef struct drm_radeon_surface_alloc {
-@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free {
+@@ -751,4 +773,112 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
-+#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
-+#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
-+#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
++/*
++ * Kernel modesetting world below.
++ */
++#define RADEON_GEM_DOMAIN_CPU		0x1
++#define RADEON_GEM_DOMAIN_GTT		0x2
++#define RADEON_GEM_DOMAIN_VRAM		0x4
 +
-+/* return to userspace start/size of gtt and vram apertures */
 +struct drm_radeon_gem_info {
-+	uint64_t gart_start;
-+	uint64_t gart_size;
-+	uint64_t vram_start;
-+	uint64_t vram_size;
-+	uint64_t vram_visible;
++	uint64_t	gart_size;
++	uint64_t	vram_size;
++	uint64_t	vram_visible;
 +};
 +
++#define RADEON_GEM_NO_BACKING_STORE 1
++
 +struct drm_radeon_gem_create {
-+	uint64_t size;
-+	uint64_t alignment;
-+	uint32_t handle;
-+	uint32_t initial_domain; // to allow VRAM to be created
-+	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
-+	// pretty much front/back/depth don't need it - other things do
++	uint64_t	size;
++	uint64_t	alignment;
++	uint32_t	handle;
++	uint32_t	initial_domain;
++	uint32_t	flags;
 +};
 +
 +struct drm_radeon_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
++	uint32_t	handle;
++	uint32_t	pad;
++	uint64_t	offset;
++	uint64_t	size;
++	uint64_t	addr_ptr;
 +};
 +
 +struct drm_radeon_gem_set_domain {
-+	uint32_t handle;
-+	uint32_t read_domains;
-+	uint32_t write_domain;
-+};
-+
-+struct drm_radeon_gem_wait_rendering {
-+	uint32_t handle;
-+};
-+
-+struct drm_radeon_gem_pin {
-+	uint32_t handle;
-+	uint32_t pin_domain;
-+	uint64_t alignment;
-+	uint64_t offset;
++	uint32_t	handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
 +};
 +
-+struct drm_radeon_gem_unpin {
-+	uint32_t handle;
-+	uint32_t pad;
++struct drm_radeon_gem_wait_idle {
++	uint32_t	handle;
++	uint32_t	pad;
 +};
 +
 +struct drm_radeon_gem_busy {
-+	uint32_t handle;
-+	uint32_t busy;
++	uint32_t	handle;
++	uint32_t	busy;
 +};
 +
 +struct drm_radeon_gem_pread {
@@ -38670,7 +39383,8 @@
 +	/** Length of data to read */
 +	uint64_t size;
 +	/** Pointer to write the data into. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
 +struct drm_radeon_gem_pwrite {
@@ -38682,28 +39396,43 @@
 +	/** Length of data to write */
 +	uint64_t size;
 +	/** Pointer to read the data from. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
-+
-+/* New interface which obsolete all previous interface.
-+ */
-+#define RADEON_CHUNK_ID_RELOCS 0x01
-+#define RADEON_CHUNK_ID_IB     0x02
-+#define RADEON_CHUNK_ID_OLD 0xff
++#define RADEON_CHUNK_ID_RELOCS	0x01
++#define RADEON_CHUNK_ID_IB	0x02
 +
 +struct drm_radeon_cs_chunk {
-+	uint32_t chunk_id;
-+	uint32_t length_dw;
-+	uint64_t chunk_data;
++	uint32_t		chunk_id;
++	uint32_t		length_dw;
++	uint64_t		chunk_data;
 +};
 +
-+struct drm_radeon_cs {
-+	uint32_t	num_chunks;
-+	uint32_t        cs_id;
-+	uint64_t	chunks; /* this points to uint64_t * which point to
-+				   cs chunks */
++struct drm_radeon_cs_reloc {
++	uint32_t		handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
++	uint32_t		flags;
 +};
 +
++struct drm_radeon_cs {
++	uint32_t		num_chunks;
++	uint32_t		cs_id;
++	/* this points to uint64_t * which point to cs chunks */
++	uint64_t		chunks;
++	/* updates to the limits after this CS ioctl */
++	uint64_t		gart_limit;
++	uint64_t		vram_limit;
++};
++
++#define RADEON_INFO_DEVICE_ID		0x00
++#define RADEON_INFO_NUM_GB_PIPES	0x01
++
++struct drm_radeon_info {
++	uint32_t		request;
++	uint32_t		pad;
++	uint64_t		value;
++};
 +
  #endif

drm-next.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6.6.5 -r 1.6.6.6 drm-next.patch
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.6.6.5
retrieving revision 1.6.6.6
diff -u -r1.6.6.5 -r1.6.6.6
--- drm-next.patch	24 Mar 2009 22:57:42 -0000	1.6.6.5
+++ drm-next.patch	14 Apr 2009 22:09:11 -0000	1.6.6.6
@@ -1,659 +1,3 @@
-commit 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Mar 16 15:37:02 2009 -0400
-
-    drm/radeon: fix logic in r600_page_table_init() to match ati_gart
-    
-    This fixes page table init on rs600.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 06f0a488c1b642d3cd7769da66600e5148c3fad8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Mar 13 09:35:32 2009 +1000
-
-    drm/radeon: r600 ptes are 64-bit, cleanup cleanup function.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 03efb8853c35aff51c7b901bf412f32765fe0fd9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Mar 10 18:36:38 2009 +1000
-
-    drm/radeon: don't call irq changes on r600 suspend/resume
-    
-    Until we sort out r600 IRQs don't do this.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit d02f7fa77d97a28a4276939f35e44ae995ad13d7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Mar 10 18:34:23 2009 +1000
-
-    drm/radeon: fix r600 writeback across suspend/resume
-    
-    This update was done in mainline radeon, but not in the r600.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 6546bf6d6cbf1f9ac350fd278a1d937d4bb9ad06
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 15:31:20 2009 +1000
-
-    drm/radeon: fix r600 writeback setup.
-    
-    This fixes 2 bugs:
-    1. the AGP calculation wasn't consistent with the PCI(E) calc for the
-    RPTR_ADDR registers. This consolidates the writes and fixes it up.
-    
-    2. The scratch address was being incorrectly calculated, this breaks
-    it out into a lot more linear steps.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 1847a549ac4db1272dea13d86331c492a2640b3b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 12:47:18 2009 +1000
-
-    drm: fix warnings about new mappings in info code.
-    
-    This fixes up the warnings in the debugfs code that conflicted
-    with the mapping fixups.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 8f497aade8df2a619eacda927a43ebe82167a84c
-Author: Hannes Eder <hannes at hanneseder.net>
-Date:   Thu Mar 5 20:14:18 2009 +0100
-
-    drm/radeon: NULL noise: drivers/gpu/drm/radeon/radeon_*.c
-    
-    Fix this sparse warning:
-      drivers/gpu/drm/radeon/r600_cp.c:1811:52: warning: Using plain integer as NULL pointer
-      drivers/gpu/drm/radeon/radeon_cp.c:1363:52: warning: Using plain integer as NULL pointer
-      drivers/gpu/drm/radeon/radeon_state.c:1983:61: warning: Using plain integer as NULL pointer
-    
-    Signed-off-by: Hannes Eder <hannes at hanneseder.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit a763d7dc0adb1159c1a52d43e566409da9fa59f0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 12:17:08 2009 +1000
-
-    drm/radeon: fix r600 pci mapping calls.
-    
-    This realigns the r600 pci mapping calls with the ati pcigart ones,
-    fixing the direction and using the correct interface.
-    
-    Suggested by Jerome Glisse.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 08932156cc2d4f8807dc5ca5c3d6ccd85080610a
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Sat Mar 7 18:21:21 2009 -0500
-
-    drm/radeon: r6xx/r7xx: fix possible oops in r600_page_table_cleanup()
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 53c379e9462b59d4e166429ff064aaf0e7743795
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Mar 9 12:12:28 2009 +1000
-
-    radeon: call the correct idle function, logic got inverted.
-    
-    This calls the correct idle function for the R600 and previous chips.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 800b69951174f7de294da575d7e7921041a7e783
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Fri Mar 6 11:47:54 2009 -0500
-
-    drm/radeon: RS600: fix interrupt handling
-    
-    the checks weren't updated when RS600 support
-    was added.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-
-commit a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:15:24 2009 +1000
-
-    drm/r600: fix rptr address along lines of previous fixes to radeon.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit eb1d91954ededc00ddcfb51e2626f114ff351524
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:14:40 2009 +1000
-
-    drm/r600: fixup r600 gart table accessor like ati_pcigart.c
-    
-    This attempts to fixup the r600 GART accessors so they work on other arches.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 6abf66018f7fe231720e50f9a47b142182388869
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:13:47 2009 +1000
-
-    drm/ati_pcigart: use memset_io to reset the memory
-    
-    Also don't setup pci_gart if we aren't going to need it.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 87f0da55353e23826a54bff57c457a13b97d18f1
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Feb 26 10:12:10 2009 +1000
-
-    drm: add DRM_READ/WRITE64 wrappers around readq/writeq.
-    
-    The readq/writeq stuff is from Dave Miller, and he
-    warns users to be careful about using these. Plans are only
-    r600 to use it so far.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 8ced9c75160947d2235fba75de9413e087e1171a
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Feb 25 17:02:19 2009 -0500
-
-    radeon: add RS600 pci ids
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit c1556f71513f2e660fb2bbdc29344361b1ebff35
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Feb 25 16:57:49 2009 -0500
-
-    radeon: add support for rs600 GPUs
-    
-    RS600s are an AMD IGP for Intel CPUs, that look like RS690s from
-    a lot of perspectives but look like r600s from a memory controller
-    point of view.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 7659e9804b7a66047433182d86393d38ba4eff79
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Feb 25 15:55:01 2009 -0500
-
-    radeon: fix r600 AGP support
-    
[...6070 lines suppressed...]
+ #define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
+ 
+ typedef struct _drm_mga_warp_index {
+@@ -310,7 +312,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 */
+ 	/*@{ */
+ 	unsigned long texture_handle; /**< Handle used to map AGP textures. */
+-	uint32_t texture_size;	      /**< Size of the AGP texture region. */
++	__u32 texture_size;	      /**< Size of the AGP texture region. */
+ 	/*@} */
+ 
+ 	/**
+@@ -319,7 +321,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
+ 	 * filled in with the actual AGP mode.  If AGP was not available
+ 	 */
+-	uint32_t primary_size;
++	__u32 primary_size;
+ 
+ 	/**
+ 	 * Requested number of secondary DMA buffers.
+@@ -329,7 +331,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * allocated.  Particularly when PCI DMA is used, this may be
+ 	 * (subtantially) less than the number requested.
+ 	 */
+-	uint32_t secondary_bin_count;
++	__u32 secondary_bin_count;
+ 
+ 	/**
+ 	 * Requested size of each secondary DMA buffer.
+@@ -338,7 +340,7 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
+ 	 * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
+ 	 */
+-	uint32_t secondary_bin_size;
++	__u32 secondary_bin_size;
+ 
+ 	/**
+ 	 * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
+@@ -350,12 +352,12 @@ typedef struct drm_mga_dma_bootstrap {
+ 	 * filled in with the actual AGP mode.  If AGP was not available
+ 	 * (i.e., PCI DMA was used), this value will be zero.
+ 	 */
+-	uint32_t agp_mode;
++	__u32 agp_mode;
+ 
+ 	/**
+ 	 * Desired AGP GART size, measured in megabytes.
+ 	 */
+-	uint8_t agp_size;
++	__u8 agp_size;
+ } drm_mga_dma_bootstrap_t;
+ 
+ typedef struct drm_mga_clear {
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..937a275 100644
+index 73ff51f..fe3e3a4 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
-@@ -304,6 +304,8 @@ typedef union {
+@@ -33,6 +33,8 @@
+ #ifndef __RADEON_DRM_H__
+ #define __RADEON_DRM_H__
+ 
++#include <linux/types.h>
++
+ /* WARNING: If you change any of these defines, make sure to change the
+  * defines in the X server file (radeon_sarea.h)
+  */
+@@ -304,6 +306,8 @@ typedef union {
  
  #define RADEON_SCRATCH_REG_OFFSET	32
  
@@ -31890,7 +36314,7 @@
  #define RADEON_NR_SAREA_CLIPRECTS	12
  
  /* There are 2 heaps (local/GART).  Each region within a heap is a
-@@ -526,7 +528,8 @@ typedef struct drm_radeon_init {
+@@ -526,7 +530,8 @@ typedef struct drm_radeon_init {
  		RADEON_INIT_CP = 0x01,
  		RADEON_CLEANUP_CP = 0x02,
  		RADEON_INIT_R200_CP = 0x03,
@@ -31900,3 +36324,117 @@
  	} func;
  	unsigned long sarea_priv_offset;
  	int is_pci;
+@@ -722,7 +727,7 @@ typedef struct drm_radeon_irq_wait {
+ 
+ typedef struct drm_radeon_setparam {
+ 	unsigned int param;
+-	int64_t value;
++	__s64 value;
+ } drm_radeon_setparam_t;
+ 
+ #define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
+diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
+index a3b5c10..170786e 100644
+--- a/include/drm/via_drm.h
++++ b/include/drm/via_drm.h
+@@ -24,6 +24,8 @@
+ #ifndef _VIA_DRM_H_
+ #define _VIA_DRM_H_
+ 
++#include <linux/types.h>
++
+ /* WARNING: These defines must be the same as what the Xserver uses.
+  * if you change them, you must change the defines in the Xserver.
+  */
+@@ -114,19 +116,19 @@
+ #define VIA_MEM_UNKNOWN 4
+ 
+ typedef struct {
+-	uint32_t offset;
+-	uint32_t size;
++	__u32 offset;
++	__u32 size;
+ } drm_via_agp_t;
+ 
+ typedef struct {
+-	uint32_t offset;
+-	uint32_t size;
++	__u32 offset;
++	__u32 size;
+ } drm_via_fb_t;
+ 
+ typedef struct {
+-	uint32_t context;
+-	uint32_t type;
+-	uint32_t size;
++	__u32 context;
++	__u32 type;
++	__u32 size;
+ 	unsigned long index;
+ 	unsigned long offset;
+ } drm_via_mem_t;
+@@ -148,9 +150,9 @@ typedef struct _drm_via_futex {
+ 		VIA_FUTEX_WAIT = 0x00,
+ 		VIA_FUTEX_WAKE = 0X01
+ 	} func;
+-	uint32_t ms;
+-	uint32_t lock;
+-	uint32_t val;
++	__u32 ms;
++	__u32 lock;
++	__u32 val;
+ } drm_via_futex_t;
+ 
+ typedef struct _drm_via_dma_init {
+@@ -211,7 +213,7 @@ typedef struct _drm_via_cmdbuf_size {
+ 		VIA_CMDBUF_LAG = 0x02
+ 	} func;
+ 	int wait;
+-	uint32_t size;
++	__u32 size;
+ } drm_via_cmdbuf_size_t;
+ 
+ typedef enum {
+@@ -236,8 +238,8 @@ enum drm_via_irqs {
+ struct drm_via_wait_irq_request {
+ 	unsigned irq;
+ 	via_irq_seq_type_t type;
+-	uint32_t sequence;
+-	uint32_t signal;
++	__u32 sequence;
++	__u32 signal;
+ };
+ 
+ typedef union drm_via_irqwait {
+@@ -246,7 +248,7 @@ typedef union drm_via_irqwait {
+ } drm_via_irqwait_t;
+ 
+ typedef struct drm_via_blitsync {
+-	uint32_t sync_handle;
++	__u32 sync_handle;
+ 	unsigned engine;
+ } drm_via_blitsync_t;
+ 
+@@ -257,16 +259,16 @@ typedef struct drm_via_blitsync {
+  */
+ 
+ typedef struct drm_via_dmablit {
+-	uint32_t num_lines;
+-	uint32_t line_length;
++	__u32 num_lines;
++	__u32 line_length;
+ 
+-	uint32_t fb_addr;
+-	uint32_t fb_stride;
++	__u32 fb_addr;
++	__u32 fb_stride;
+ 
+ 	unsigned char *mem_addr;
+-	uint32_t mem_stride;
++	__u32 mem_stride;
+ 
+-	uint32_t flags;
++	__u32 flags;
+ 	int to_fb;
+ 
+ 	drm_via_blitsync_t sync;

drm-nouveau.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.8.6.8 -r 1.8.6.9 drm-nouveau.patch
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.8
retrieving revision 1.8.6.9
diff -u -r1.8.6.8 -r1.8.6.9
--- drm-nouveau.patch	30 Mar 2009 19:45:44 -0000	1.8.6.8
+++ drm-nouveau.patch	14 Apr 2009 22:09:12 -0000	1.8.6.9
@@ -103,7 +103,7 @@
  	if (mask & ~fence->type) {
  		DRM_ERROR("Wait trying to extend fence type"
 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index c1173d8..2e4e667 100644
+index 4984aa8..dee9b40 100644
 --- a/drivers/gpu/drm/drm_gem.c
 +++ b/drivers/gpu/drm/drm_gem.c
 @@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
@@ -236,7 +236,7 @@
  		drm_put_minor(&dev->control);
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..12af41b
+index 0000000..06483d0
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,24 @@
@@ -249,8 +249,8 @@
 +             nouveau_object.o nouveau_irq.o nouveau_notifier.o \
 +             nouveau_swmthd.o nouveau_sgdma.o nouveau_dma.o \
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o \
-+             nouveau_bios.o nouveau_display.o nouveau_fbcon.o \
-+	     nouveau_backlight.o \
++             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
++	     nouveau_display.o nouveau_fbcon.o nouveau_backlight.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -259,17 +259,17 @@
 +             nv40_graph.o nv50_graph.o \
 +             nv04_instmem.o nv50_instmem.o \
 +             nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
-+             nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o
++             nv50_cursor.o nv50_display.o nv50_fbcon.o
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
-index 0000000..3fc521e
+index 0000000..e3d354f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,152 @@
 +/*
 + * Copyright (C) 2009 Red Hat <mjg at redhat.com>
 + *
@@ -312,7 +312,6 @@
 +static int nv40_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = (nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16;
 +
 +	return val;
@@ -321,7 +320,6 @@
 +static int nv40_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +	int reg = nv_rd32(NV40_PMC_BACKLIGHT);
 +
@@ -340,7 +338,6 @@
 +static int nv50_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +
 +	return nv_rd32(NV50_PDISPLAY_BACKLIGHT);
 +}
@@ -348,7 +345,6 @@
 +static int nv50_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +
 +	nv_wr32(NV50_PDISPLAY_BACKLIGHT, val | NV50_PDISPLAY_BACKLIGHT_ENABLE);
@@ -428,45 +424,65 @@
 +}	
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..bcbedb7
+index 0000000..fd3e08a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,854 @@
+@@ -0,0 +1,4577 @@
 +/*
-+ * Copyright (C) 2005-2006 Erik Waling
-+ * Copyright (C) 2006 Stephane Marchesin
-+ * Copyright (C) 2007-2008 Stuart Bennett
-+ * Copyright (C) 2008 Maarten Maathuis.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
++ * Copyright 2005-2006 Erik Waling
++ * Copyright 2006 Stephane Marchesin
++ * Copyright 2007-2009 Stuart Bennett
 + *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial
-+ * portions of the Software.
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
 + *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
++ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
 + */
 +
-+#include <asm/byteorder.h>
-+#include "nouveau_bios.h"
++#include "drmP.h"
 +#include "nouveau_drv.h"
++#include "nouveau_hw.h"
++
++/* these defines are made up */
++#define NV_CIO_CRE_44_HEADA 0x0
++#define NV_CIO_CRE_44_HEADB 0x3
++#define FEATURE_MOBILE 0x10	/* also FEATURE_QUADRO for BMP */
++#define LEGACY_I2C_CRT 0x80
++
++#define EDID1_LEN 128
++
++#define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip, fmt, ##arg)
++#define LOG_OLD_VALUE(x) //x
++
++#define BIOS_USLEEP(n) msleep((n)/1000)
++
++#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))
++#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))
 +
-+/* returns true if it mismatches */
-+static bool nv_checksum(const uint8_t *data, unsigned int length)
++static int crtchead = 0;
++
++/* this will need remembering across a suspend */
++static uint32_t saved_nv_pfb_cfg0;
++
++typedef struct {
++	bool execute;
++	bool repeat;
++} init_exec_t;
++
++static bool nv_cksum(const uint8_t *data, unsigned int length)
 +{
 +	/* there's a few checksums in the BIOS, so here's a generic checking function */
 +	int i;
@@ -481,51 +497,74 @@
 +	return false;
 +}
 +
-+static int nv_valid_bios(struct drm_device *dev, uint8_t *data)
++static int
++score_vbios(struct drm_device *dev, const uint8_t *data, const bool writeable)
 +{
-+	/* check for BIOS signature */
 +	if (!(data[0] == 0x55 && data[1] == 0xAA)) {
-+		DRM_ERROR("BIOS signature not found.\n");
++		NV_TRACEWARN(dev, "... BIOS signature not found\n");
 +		return 0;
 +	}
 +
[...20884 lines suppressed...]
++#define NV_PRAMDAC_NVPLL_COEFF				0x00680500
++#define NV_PRAMDAC_MPLL_COEFF				0x00680504
++#define NV_PRAMDAC_VPLL_COEFF				0x00680508
++#	define NV30_RAMDAC_ENABLE_VCO2				(8 << 4)
++
++#define NV_PRAMDAC_PLL_COEFF_SELECT			0x0068050c
++#	define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE		(4 << 0)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_MPLL	(1 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_VPLL	(2 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_NVPLL	(4 << 8)
++#	define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2		(8 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB2	(1 << 28)
++#	define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2		(2 << 28)
++
++#define NV_PRAMDAC_PLL_SETUP_CONTROL			0x00680510
++#define NV_RAMDAC_VPLL2					0x00680520
++#define NV_PRAMDAC_SEL_CLK				0x00680524
++#define NV_RAMDAC_DITHER_NV11				0x00680528
++#define NV_PRAMDAC_DACCLK				0x0068052c
++#	define NV_PRAMDAC_DACCLK_SEL_DACCLK			(1 << 0)
++
++#define NV_RAMDAC_NVPLL_B				0x00680570
++#define NV_RAMDAC_MPLL_B				0x00680574
++#define NV_RAMDAC_VPLL_B				0x00680578
++#define NV_RAMDAC_VPLL2_B				0x0068057c
++#	define NV31_RAMDAC_ENABLE_VCO2				(8 << 28)
++#define NV_PRAMDAC_580					0x00680580
++#	define NV_RAMDAC_580_VPLL1_ACTIVE			(1 << 8)
++#	define NV_RAMDAC_580_VPLL2_ACTIVE			(1 << 28)
++
++#define NV_PRAMDAC_GENERAL_CONTROL			0x00680600
++#define NV_PRAMDAC_TEST_CONTROL				0x00680608
++#	define NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED	(1 << 12)
++#	define NV_PRAMDAC_TEST_CONTROL_PWRDWN_DAC_OFF		(1 << 16)
++#	define NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI		(1 << 28)
++#define NV_PRAMDAC_TESTPOINT_DATA			0x00680610
++#	define NV_PRAMDAC_TESTPOINT_DATA_NOTBLANK		(8 << 28)
++#define NV_PRAMDAC_630					0x00680630
++#define NV_PRAMDAC_634					0x00680634
++
++#define NV_PRAMDAC_FP_VDISPLAY_END			0x00680800
++#define NV_PRAMDAC_FP_VTOTAL				0x00680804
++#define NV_PRAMDAC_FP_VCRTC				0x00680808
++#define NV_PRAMDAC_FP_VSYNC_START			0x0068080c
++#define NV_PRAMDAC_FP_VSYNC_END				0x00680810
++#define NV_PRAMDAC_FP_VVALID_START			0x00680814
++#define NV_PRAMDAC_FP_VVALID_END			0x00680818
++#define NV_PRAMDAC_FP_HDISPLAY_END			0x00680820
++#define NV_PRAMDAC_FP_HTOTAL				0x00680824
++#define NV_PRAMDAC_FP_HCRTC				0x00680828
++#define NV_PRAMDAC_FP_HSYNC_START			0x0068082c
++#define NV_PRAMDAC_FP_HSYNC_END				0x00680830
++#define NV_PRAMDAC_FP_HVALID_START			0x00680834
++#define NV_PRAMDAC_FP_HVALID_END			0x00680838
++
++#define NV_RAMDAC_FP_DITHER				0x0068083c
++#define NV_PRAMDAC_FP_TG_CONTROL			0x00680848
++#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS		(1 << 0)
++#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_DISABLE		(2 << 0)
++#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS		(1 << 4)
++#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_DISABLE		(2 << 4)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_SCALE		(0 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_CENTER		(1 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_NATIVE		(2 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_READ_PROG		(1 << 20)
++#	define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12		(1 << 24)
++#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS		(1 << 28)
++#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE		(2 << 28)
++#define NV_PRAMDAC_850					0x00680850
++#define NV_PRAMDAC_85C					0x0068085c
++#define NV_PRAMDAC_FP_DEBUG_0				0x00680880
++#	define NV_PRAMDAC_FP_DEBUG_0_XSCALE_ENABLE		(1 << 0)
++#	define NV_PRAMDAC_FP_DEBUG_0_YSCALE_ENABLE		(1 << 4)
++/* This doesn't seem to be essential for tmds, but still often set */
++#	define NV_RAMDAC_FP_DEBUG_0_TMDS_ENABLED		(8 << 4)
++#	define NV_PRAMDAC_FP_DEBUG_0_XINTERP_BILINEAR		(1 << 8)
++#	define NV_PRAMDAC_FP_DEBUG_0_YINTERP_BILINEAR		(1 << 12)
++#	define NV_PRAMDAC_FP_DEBUG_0_XWEIGHT_ROUND		(1 << 20)
++#	define NV_PRAMDAC_FP_DEBUG_0_YWEIGHT_ROUND		(1 << 24)
++#define NV_PRAMDAC_FP_DEBUG_1				0x00680884
++#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_VALUE		11:0
++#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_TESTMODE_ENABLE	(1 << 12)
++#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_VALUE		27:16
++#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_TESTMODE_ENABLE	(1 << 28)
++#define NV_PRAMDAC_FP_DEBUG_2				0x00680888
++#define NV_PRAMDAC_FP_DEBUG_3				0x0068088C
++
++/* Some unknown regs, purely for NV30 it seems. */
++#define NV_PRAMDAC_890					0x00680890
++#define NV_PRAMDAC_89C					0x0068089C
++
++/* see NV_PRAMDAC_INDIR_TMDS in rules.xml */
++#define NV_PRAMDAC_FP_TMDS_CONTROL			0x006808b0
++#	define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE		(1 << 16)
++#define NV_PRAMDAC_FP_TMDS_DATA				0x006808b4
++
++/* Some kind of switch */
++#define NV_PRAMDAC_900					0x00680900
++#define NV_PRAMDAC_A20					0x00680A20
++#define NV_PRAMDAC_A24					0x00680A24
++#define NV_PRAMDAC_A34					0x00680A34
++
++/* names fabricated from NV_USER_DAC info */
++#define NV_PRMDIO_PIXEL_MASK		0x006813c6
++#	define NV_PRMDIO_PIXEL_MASK_MASK	0xff
++#define NV_PRMDIO_READ_MODE_ADDRESS	0x006813c7
++#define NV_PRMDIO_WRITE_MODE_ADDRESS	0x006813c8
++#define NV_PRMDIO_PALETTE_DATA		0x006813c9
++
++#define NV_PGRAPH_DEBUG_0		0x00400080
++#define NV_PGRAPH_DEBUG_1		0x00400084
++#define NV_PGRAPH_DEBUG_2_NV04		0x00400088
++#define NV_PGRAPH_DEBUG_2		0x00400620
++#define NV_PGRAPH_DEBUG_3		0x0040008c
++#define NV_PGRAPH_DEBUG_4		0x00400090
++#define NV_PGRAPH_INTR			0x00400100
++#define NV_PGRAPH_INTR_EN		0x00400140
++#define NV_PGRAPH_CTX_CONTROL		0x00400144
++#define NV_PGRAPH_CTX_CONTROL_NV04	0x00400170
++#define NV_PGRAPH_ABS_UCLIP_XMIN	0x0040053C
++#define NV_PGRAPH_ABS_UCLIP_YMIN	0x00400540
++#define NV_PGRAPH_ABS_UCLIP_XMAX	0x00400544
++#define NV_PGRAPH_ABS_UCLIP_YMAX	0x00400548
++#define NV_PGRAPH_BETA_AND		0x00400608
++#define NV_PGRAPH_LIMIT_VIOL_PIX	0x00400610
++#define NV_PGRAPH_BOFFSET0		0x00400640
++#define NV_PGRAPH_BOFFSET1		0x00400644
++#define NV_PGRAPH_BOFFSET2		0x00400648
++#define NV_PGRAPH_BLIMIT0		0x00400684
++#define NV_PGRAPH_BLIMIT1		0x00400688
++#define NV_PGRAPH_BLIMIT2		0x0040068c
++#define NV_PGRAPH_STATUS		0x00400700
++#define NV_PGRAPH_SURFACE		0x00400710
++#define NV_PGRAPH_STATE			0x00400714
++#define NV_PGRAPH_FIFO			0x00400720
++#define NV_PGRAPH_PATTERN_SHAPE		0x00400810
++#define NV_PGRAPH_TILE			0x00400b00
++
++#define NV_PVIDEO_INTR_EN		0x00008140
++#define NV_PVIDEO_BUFFER		0x00008700
++#define NV_PVIDEO_STOP			0x00008704
++#define NV_PVIDEO_UVPLANE_BASE(buff)	(0x00008800+(buff)*4)
++#define NV_PVIDEO_UVPLANE_LIMIT(buff)	(0x00008808+(buff)*4)
++#define NV_PVIDEO_UVPLANE_OFFSET_BUFF(buff)	(0x00008820+(buff)*4)
++#define NV_PVIDEO_BASE(buff)		(0x00008900+(buff)*4)
++#define NV_PVIDEO_LIMIT(buff)		(0x00008908+(buff)*4)
++#define NV_PVIDEO_LUMINANCE(buff)	(0x00008910+(buff)*4)
++#define NV_PVIDEO_CHROMINANCE(buff)	(0x00008918+(buff)*4)
++#define NV_PVIDEO_OFFSET_BUFF(buff)	(0x00008920+(buff)*4)
++#define NV_PVIDEO_SIZE_IN(buff)		(0x00008928+(buff)*4)
++#define NV_PVIDEO_POINT_IN(buff)	(0x00008930+(buff)*4)
++#define NV_PVIDEO_DS_DX(buff)		(0x00008938+(buff)*4)
++#define NV_PVIDEO_DT_DY(buff)		(0x00008940+(buff)*4)
++#define NV_PVIDEO_POINT_OUT(buff)	(0x00008948+(buff)*4)
++#define NV_PVIDEO_SIZE_OUT(buff)	(0x00008950+(buff)*4)
++#define NV_PVIDEO_FORMAT(buff)		(0x00008958+(buff)*4)
++#	define NV_PVIDEO_FORMAT_PLANAR			(1 << 0)
++#	define NV_PVIDEO_FORMAT_COLOR_LE_CR8YB8CB8YA8	(1 << 16)
++#	define NV_PVIDEO_FORMAT_DISPLAY_COLOR_KEY	(1 << 20)
++#	define NV_PVIDEO_FORMAT_MATRIX_ITURBT709	(1 << 24)
++#define NV_PVIDEO_COLOR_KEY		0x00008B00
++
++/* NV04 overlay defines from VIDIX & Haiku */
++#define NV_PVIDEO_INTR_EN_0		0x00680140
++#define NV_PVIDEO_STEP_SIZE		0x00680200
++#define NV_PVIDEO_CONTROL_Y		0x00680204
++#define NV_PVIDEO_CONTROL_X		0x00680208
++#define NV_PVIDEO_BUFF0_START_ADDRESS	0x0068020c
++#define NV_PVIDEO_BUFF0_PITCH_LENGTH	0x00680214
++#define NV_PVIDEO_BUFF0_OFFSET		0x0068021c
++#define NV_PVIDEO_BUFF1_START_ADDRESS	0x00680210
++#define NV_PVIDEO_BUFF1_PITCH_LENGTH	0x00680218
++#define NV_PVIDEO_BUFF1_OFFSET		0x00680220
++#define NV_PVIDEO_OE_STATE		0x00680224
++#define NV_PVIDEO_SU_STATE		0x00680228
++#define NV_PVIDEO_RM_STATE		0x0068022c
++#define NV_PVIDEO_WINDOW_START		0x00680230
++#define NV_PVIDEO_WINDOW_SIZE		0x00680234
++#define NV_PVIDEO_FIFO_THRES_SIZE	0x00680238
++#define NV_PVIDEO_FIFO_BURST_LENGTH	0x0068023c
++#define NV_PVIDEO_KEY			0x00680240
++#define NV_PVIDEO_OVERLAY		0x00680244
++#define NV_PVIDEO_RED_CSC_OFFSET	0x00680280
++#define NV_PVIDEO_GREEN_CSC_OFFSET	0x00680284
++#define NV_PVIDEO_BLUE_CSC_OFFSET	0x00680288
++#define NV_PVIDEO_CSC_ADJUST		0x0068028c
++
++#endif
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
 index b940fdf..cfa6af4 100644
 --- a/include/drm/Kbuild
@@ -42929,7 +49125,7 @@
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index b61b0c6..5b7ce2d 100644
+index 04fbd1e..f2a6bff 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.18
retrieving revision 1.1294.2.19
diff -u -r1.1294.2.18 -r1.1294.2.19
--- kernel.spec	30 Mar 2009 20:19:11 -0000	1.1294.2.18
+++ kernel.spec	14 Apr 2009 22:09:14 -0000	1.1294.2.19
@@ -13,6 +13,7 @@
 # by setting the define to ".local" or ".bz123456"
 #
 # % define buildid .local
+%define buildid .xendom0
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -37,7 +38,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -102,7 +103,7 @@
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 1
+%define rawhide_skip_docs 0
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -120,7 +121,7 @@
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -402,7 +403,7 @@
 # problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
-%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 3.4, wireless-tools < 29-3
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -594,10 +595,16 @@
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ftrace.patch
 
-Patch30: linux-2.6-debug-dma-api.patch
-Patch31: dma-api-debug-fixes.patch
+# Support suspend/resume, other crash fixes
+Patch30: linux-2.6-iommu-fixes.patch
+
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch100: linux-2.6-e820-mark-esi-clobbered.patch
+Patch101: linux-2.6-e820-save-restore-edi-ebp.patch
+Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
+Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -622,10 +629,12 @@
 Patch393: linux-2.6-hwmon-atk0110.patch
 Patch394: linux-2.6-acpi-video-didl-intel-outputs.patch
 Patch395: linux-2.6-sony-laptop-rfkill.patch
+Patch396: linux-2.6-acer-wmi-bail-on-aao.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 Patch452: linux-2.6-input-hid-extra-gamepad.patch
+Patch453: linux-2.6-input-wacom-bluetooth.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -633,22 +642,34 @@
 Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
 
 Patch510: linux-2.6-silence-noise.patch
+Patch511: linux-2.6-shut-up-efifb.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-
+Patch590: linux-2.6.29.1-sparc-regression.patch
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 Patch601: alsa-rewrite-hw_ptr-updaters.patch
 Patch602: alsa-pcm-always-reset-invalid-position.patch
 Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
 Patch604: alsa-pcm-safer-boundary-checks.patch
+Patch605: alsa-hda-dont-reset-BDL-unnecessarily.patch
+Patch606: alsa-dont-reset-stream-at-each-prepare-callb.patch
+Patch607: alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+Patch608: alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
+Patch611: linux-2.6.29-alsa-update-quirks.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
+Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+
+Patch700: linux-2.6-dma-debug-fixes.patch
+
+Patch800: linux-2.6-crash-driver.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 
@@ -665,6 +686,8 @@
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
+Patch1821: drm-intel-lying-systems-without-lvds.patch
+Patch1822: drm-intel-gen3-fb-hack.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -680,12 +703,35 @@
 Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
+Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
 Patch2920: linux-2.6-ext4-flush-on-close.patch
+Patch2921: linux-2.6-ext4-really-print-warning-once.patch
+
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
+Patch3001: linux-2.6-btrfs-fix-umount-hang.patch
 Patch3010: linux-2.6-relatime-by-default.patch
+Patch3020: linux-2.6-fiemap-header-install.patch
+
+Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
+
+Patch5000: linux-2.6-add-qcserial.patch
+
+# patches headed for -stable
+# fix oops in md raid1 (#495550)
+Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+# fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
+Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
+# fix duplicated flags value
+Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+# fix posix clock monotonicity
+Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
+# make RLIMIT_CPU work again
+Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
+Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
@@ -695,17 +741,13 @@
 Patch9003: linux-2.6-dropwatch-protocol.patch
 
 # fix for net lockups, will be in 2.6.29.1
-Patch9100: linux-2.6-net-fix-gro-bug.patch
 Patch9101: linux-2.6-net-fix-another-gro-bug.patch
 
-# fix locking in ipsec (#489764)
-Patch9200: linux-2.6-net-xfrm-fix-spin-unlock.patch
-
-# http://bugs.freedesktop.org/show_bug.cgi?id=20803
-Patch9210: linux-2.6.29-pat-fixes.patch
+# kvm fixes
+Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
+Patch9301: linux-2.6-kvm-mask-notifiers.patch
+Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 
-Patch9995: squashfs3.patch
-Patch9996: squashfs-fixups.patch
 Patch9997: xen.pvops.pre.patch
 Patch9998: xen.pvops.patch
 Patch9999: xen.pvops.post.patch
@@ -902,14 +944,30 @@
 %endif
 %endif
 
+# more sanity checking; do it quietly
+if [ "%{patches}" != "%%{patches}" ] ; then
+  for patch in %{patches} ; do
+    if [ ! -f $patch ] ; then
+      echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+      exit 1
+    fi
+  done
+fi 2>/dev/null
+
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {
   local patch=$1
   shift
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
-    exit 1;
+    exit 1
   fi
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+    if [ "${patch:0:10}" != "patch-2.6." ] ; then
+      echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
+      exit 1
+    fi
+  fi 2>/dev/null
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
@@ -939,10 +997,10 @@
 %endif
 %endif
 
-# We can share hardlinked source trees by putting the
-# directory name of the CVS checkout that we want to share
-# with in .shared-srctree. (Full pathname is required.)
-[ -f .shared-srctree ] && sharedir=$(cat .shared-srctree)
+# We can share hardlinked source trees by putting a list of
+# directory names of the CVS checkouts that we want to share
+# with in .shared-srctree. (Full pathnames are required.)
+[ -f .shared-srctree ] && sharedirs=$(cat .shared-srctree)
 
 if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then
 
@@ -959,6 +1017,11 @@
 
     # Ok, first time we do a make prep.
     rm -f pax_global_header
+    for sharedir in $sharedirs ; do
+      if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{kversion} ]] ; then
+        break
+      fi
+    done
     if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{kversion} ]] ; then
 %setup -q -n kernel-%{kversion} -c -T
       cp -rl $sharedir/kernel-%{kversion}/vanilla-%{kversion} .
@@ -971,6 +1034,11 @@
 
 %if "%{kversion}" != "%{vanillaversion}"
 
+  for sharedir in $sharedirs ; do
+    if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then
+      break
+    fi
+  done
   if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then
 
     cp -rl $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} .
@@ -1081,15 +1149,18 @@
 ApplyPatch linux-2.6-utrace.patch
 #ApplyPatch linux-2.6-utrace-ftrace.patch
 
-# DMA API debugging
-#ApplyPatch linux-2.6-debug-dma-api.patch
-#ApplyPatch dma-api-debug-fixes.patch
+# IOMMU fixes backported to 2.6.29
+ApplyPatch linux-2.6-iommu-fixes.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
 # Architecture patches
 # x86(-64)
+ApplyPatch linux-2.6-e820-mark-esi-clobbered.patch
+ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch
+ApplyPatch linux-2.6-e820-acpi3-bios-workaround.patch
+ApplyPatch linux-2.6-e820-guard-against-pre-acpi3.patch
 
 #
 # PowerPC
@@ -1111,7 +1182,7 @@
 #
 
 ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-
+ApplyPatch linux-2.6.29.1-sparc-regression.patch
 #
 # Exec shield
 #
@@ -1123,16 +1194,23 @@
 
 # ext4
 ApplyPatch linux-2.6-ext4-flush-on-close.patch
+ApplyPatch linux-2.6-ext4-really-print-warning-once.patch
 
 # xfs
 
 # btrfs
 ApplyPatch linux-2.6-btrfs-experimental-branch.patch
+ApplyPatch linux-2.6-btrfs-fix-umount-hang.patch
 
 # relatime
 ApplyPatch linux-2.6-relatime-by-default.patch
 
+# put fiemap.h into kernel-headers
+ApplyPatch linux-2.6-fiemap-header-install.patch
+
 # USB
+ApplyPatch linux-2.6-add-qcserial.patch
+ApplyPatch linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1141,6 +1219,7 @@
 ApplyPatch linux-2.6-hwmon-atk0110.patch
 ApplyPatch linux-2.6-acpi-video-didl-intel-outputs.patch
 ApplyPatch linux-2.6-sony-laptop-rfkill.patch
+ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1171,13 +1250,17 @@
 # ALSA
 # squelch hda_beep by default
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+ApplyPatch linux-2.6.29-alsa-update-quirks.patch
 
 # fix alsa for pulseaudio
 ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
 ApplyPatch alsa-pcm-always-reset-invalid-position.patch
 ApplyPatch alsa-pcm-fix-delta-calc-at-overlap.patch
 ApplyPatch alsa-pcm-safer-boundary-checks.patch
-
+ApplyPatch alsa-hda-dont-reset-BDL-unnecessarily.patch
+ApplyPatch alsa-dont-reset-stream-at-each-prepare-callb.patch
+ApplyPatch alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+ApplyPatch alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
@@ -1192,6 +1275,9 @@
 # HID: add support for another version of 0e8f:0003 device in hid-pl
 ApplyPatch linux-2.6-input-hid-extra-gamepad.patch
 
+# HID: add support for Bluetooth Wacom pads
+ApplyPatch linux-2.6-input-wacom-bluetooth.patch
+
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
@@ -1200,6 +1286,9 @@
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
+# Avoid efifb spew
+ApplyPatch linux-2.6-shut-up-efifb.patch
+
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
@@ -1210,6 +1299,7 @@
 
 # Changes to upstream defaults.
 
+
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
@@ -1220,6 +1310,16 @@
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 
+# back-port iwlwifi rfkill while device down patches
+ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
+ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+
+# Fix up DMA debug code
+ApplyPatch linux-2.6-dma-debug-fixes.patch
+
+# /dev/crash driver.
+ApplyPatch linux-2.6-crash-driver.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1239,6 +1339,8 @@
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
+ApplyPatch drm-intel-lying-systems-without-lvds.patch
+ApplyPatch drm-intel-gen3-fb-hack.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1254,8 +1356,18 @@
 ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-update.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
+ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+# patches headed for -stable
+ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
+ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
+#ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
+ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1263,15 +1375,12 @@
 
 #ApplyPatch linux-2.6-dropwatch-protocol.patch
 
-#ApplyPatch linux-2.6-net-fix-gro-bug.patch
 ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
 
-ApplyPatch linux-2.6-net-xfrm-fix-spin-unlock.patch
-
-ApplyPatch linux-2.6.29-pat-fixes.patch
-
-ApplyPatch squashfs3.patch
-ApplyPatch squashfs-fixups.patch
+# kvm fixes
+ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
+ApplyPatch linux-2.6-kvm-mask-notifiers.patch
+ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
@@ -1552,7 +1661,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{with_debug}
-%if !%{with_up}
+%if %{with_up}
 BuildKernel %make_target %kernel_image debug
 %endif
 %if %{with_pae}
@@ -1850,7 +1959,9 @@
 
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
+%if %{with_up}
 %kernel_variant_files %{with_debug} debug
+%endif
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
@@ -1859,6 +1970,189 @@
 # and build.
 
 %changelog
+* Tue Apr 14 2009 Michael Young <m.a.young at durham.ac.uk>
+- follow the 2.6.29.1 stable branch for the moment
+- reset a few config settings to Fedora defaults
+- drop the squashfs 3 patches as we can't build both
+
+* Tue Apr 14 2009 Marcelo Tosatti <mtosatti at redhat.com>
+- kvm fixes for bz#491625
+
+* Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
+- Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Add missing patch for broken RLIMIT_CPU
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix warnings/errors in USB cdc-acm modem driver (#495446)
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Timer fixes headed for -stable
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix duplicated flag value in pagemap.h (-stable patch)
+
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- acer-wmi: use upstream code to blacklist an additional model
+- Trivial fix to drm-modesetting-radeon to fix failure to apply
+
+* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-73
+- drm-modesetting-radeon.patch: more bug fixes
+
+* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix oops in md raid1 resync (#495550)
+
+* Mon Apr 13 2009 Eric Sandeen <sandeen at redhat.com>
+- Turn of CONFIG_SND_HDA_POWER_SAVE_DEFAULT again (#493972)
+
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-70
+- merge alsa fixes from wwoods:
+  alsa-hda-dont-reset-BDL-unnecessarily.patch
+  alsa-dont-reset-stream-at-each-prepare-callb.patch
+  alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
+  alsa-pcm-midlevel-add-more-strict-buffer-position.patch
+    bbf6ad13, fa00e046 from alsa-kernel/master (and deps)
+
+* Mon Apr 13 2009 John W. Linville <linville at redhat.com>
+- Remove back-port iwlwifi rfkill while device down patches (#495003)
+
+* Fri Apr 10 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Fix suspend/resume with Intel IOMMU, handle devices behind PCI-PCI
+  bridges, cope with BIOS claiming IOMMU is at address zero.
+
+* Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com>
+- Only print ext4 allocator fallback warning once.
+
+* Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.29.1-59
+- add patch to fix regression on sparc
+
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com>
+- drm-intel-gen3-fb-hack.patch: Allow up to 4k framebuffers on 9[14]5.  3D
+  will be broken if you do that, but at least dualhead will be less broken.
+
+* Thu Apr 09 2009 Dave Jones <davej at redhat.com>
+- Bring back the /dev/crash driver. (#492803)
+
+* Thu Apr 09 2009 Dave Airlie <airlied at redhat.com>
+- radeon: fix some kms bugs, dac detect + screen resize
+
+* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com>
+- Drop the PAT patch, sufficiently upstreamed now.
+
+* Wed Apr 08 2009 Dave Jones <davej at redhat.com> 2.6.29.1-58
+- disable MMIOTRACE in non-debug builds (#494584)
+
+* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: nv50 kms fixes (PROM access, i2c, clean some warnings)
+
+* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
+
+* Tue Apr 07 2009 Dave Jones <davej at redhat.com>
+- Enable CONFIG_CIFS_STATS (#494545)
+
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com>
+- drm-modesetting-radeon: repair vt switch
+
+* Mon Apr 06 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: rebase on drm-f11
+
+* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com>
+- radeon: bust APIs and move to what we want in the end.
+
+* Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: big update.  mostly cleanups, few functional changes
+    Big code cleanup (the scary looking, but hopefully harmless part)
+    Now using "full-featured" VBIOS parser from DDX
+    Remove custom i2c code in favour of i2c_algo_bit
+    Refuse to suspend, we can't possibly resume just yet
+    Fix ramht insertions when a collision happens (rh#492427)
+    No kms warning on pre-nv50 when kms not acutally enabled (rh#493222)
+
+* Sat Apr 04 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-add-qcserial.patch: Add the qcserial driver for Qualcomm modems
+
+* Fri Apr 03 2009 Jarod Wilson <jarod at redhat.com>
+- Don't set up non-existent LVDS on systems with mobile Intel graphics chips
+  that lie about having LVDS (like my Dell Studio Hybrid). Makes plymouth
+  graphical boot function properly.
+- Don't let acer-wmi do stupid things on unsupported systems (like, create
+  a bogus rfkill entry in sysfs that effectively neuters wireless in
+  NetworkManager on the Aspire One)
+
+* Fri Apr 03 2009 Chuck Ebbert <cebbert at redhat.com>
+- x86 E820 fixes from 2.6.30
+
+* Fri Apr 03 2009 Dave Jones <davej at redhat.com>
+- x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
+
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-46
+- Enable debug builds and turn of debugging in the regular kernel.
+- Remove dma-debug patches.
+- Leave CONFIG_PCI_MSI_DEFAULT_ON set.
+
+* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.29.1
+- Removed upstream commit d64260d58865004c6354e024da3450fdd607ea07
+  from v4l-dvb-fixes: merged in 2.6.29.1
+
+* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
+- iwl3945: rely on priv->lock to protect priv access
+
+* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
+- back-port iwlwifi rfkill while device down patches
+
+* Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>
+- linux-2.6-btrfs-fix-umount-hang.patch: fix hang on umount
+
+* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-shut-up-efifb.patch: avoid efifb errors on unsupported hardware
+
+* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-acpi-video-didl-intel-outputs.patch: fix enabling of asle
+
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
+- drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards
+
+* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-35.rc1
+- linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support
+
+* Tue Mar 31 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.29.1-rc1
+- Dropped patches, merged upstream:
+    linux-2.6-net-fix-gro-bug.patch
+    linux-2.6-net-xfrm-fix-spin-unlock.patch
+    linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
+    linux-2.6.29-pat-pci-change-prot-for-inherit.patch
+
+* Tue Mar 31 2009 Eric Sandeen <sandeen at redhat.com>
+- add fiemap.h to kernel-headers
+- build ext4 (and jbd2 and crc16) into the kernel
+
+* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com>
+- update the sony laptop code
+
+* Tue Mar 31 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: support version 3.0 pll limits table
+  may help with rh#492575
+
+* Mon Mar 30 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-input-wacom-bluetooth.patch: Add support for Bluetooth wacom pads
+
+* Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com>
+- Make the .shared-srctree file a list so more than two checkouts
+  can share source files.
+
+* Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com>
+- Separate PAT fixes that are headed for -stable from our out-of-tree ones.
+
+* Mon Mar 30 2009 Dave Jones <davej at redhat.com>
+- Make io schedulers selectable at boot time again. (#492817)
+
+* Mon Mar 30 2009 Dave Jones <davej at redhat.com>
+- Add a strict-devmem=0 boot argument (#492803)
+
 * Mon Mar 30 2009 Michael Young <m.a.young at durham.ac.uk>
 - pvops update and merging of patches
 - disable squashfs 3 again since we can't build both versions at the same time

linux-2.6-acpi-video-didl-intel-outputs.patch:

Index: linux-2.6-acpi-video-didl-intel-outputs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/linux-2.6-acpi-video-didl-intel-outputs.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- linux-2.6-acpi-video-didl-intel-outputs.patch	24 Mar 2009 22:57:43 -0000	1.1.2.3
+++ linux-2.6-acpi-video-didl-intel-outputs.patch	14 Apr 2009 22:09:15 -0000	1.1.2.4
@@ -240,3 +240,14 @@
 +
 +#endif
 +
+diff -up linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c~ linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c
+--- linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c~	2009-04-01 18:57:47.000000000 +0100
++++ linux-2.6.29.noarch/drivers/gpu/drm/i915/i915_opregion.c	2009-04-01 18:59:49.000000000 +0100
+@@ -389,6 +389,7 @@ int intel_opregion_init(struct drm_devic
+ 	if (mboxes & MBOX_ASLE) {
+ 		DRM_DEBUG("ASLE supported\n");
+ 		opregion->asle = base + OPREGION_ASLE_OFFSET;
++		opregion_enable_asle(dev);
+ 	}
+ 
+ 	/* Notify BIOS we are ready to handle ACPI video ext notifs.

linux-2.6-sony-laptop-rfkill.patch:

Index: linux-2.6-sony-laptop-rfkill.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/linux-2.6-sony-laptop-rfkill.patch,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -r1.2.6.2 -r1.2.6.3
--- linux-2.6-sony-laptop-rfkill.patch	24 Mar 2009 22:57:43 -0000	1.2.6.2
+++ linux-2.6-sony-laptop-rfkill.patch	14 Apr 2009 22:09:17 -0000	1.2.6.3
@@ -1,8 +1,23 @@
-diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 537959d..2d142d3 100644
---- a/drivers/platform/x86/sony-laptop.c
-+++ b/drivers/platform/x86/sony-laptop.c
-@@ -64,6 +64,7 @@
+--- vanilla-2.6.29/drivers/platform/x86/sony-laptop.c	2009-03-23 23:12:14.000000000 +0000
++++ linux-2.6.29.noarch/drivers/platform/x86/sony-laptop.c	2009-03-31 16:37:25.000000000 +0100
+@@ -2,7 +2,7 @@
+  * ACPI Sony Notebook Control Driver (SNC and SPIC)
+  *
+  * Copyright (C) 2004-2005 Stelian Pop <stelian at popies.net>
+- * Copyright (C) 2007 Mattia Dongili <malattia at linux.it>
++ * Copyright (C) 2007-2009 Mattia Dongili <malattia at linux.it>
+  *
+  * Parts of this driver inspired from asus_acpi.c and ibm_acpi.c
+  * which are copyrighted by their respective authors.
+@@ -46,7 +46,6 @@
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+ #include <linux/init.h>
+-#include <linux/smp_lock.h>
+ #include <linux/types.h>
+ #include <linux/backlight.h>
+ #include <linux/platform_device.h>
+@@ -64,6 +63,7 @@
  #include <asm/uaccess.h>
  #include <linux/sonypi.h>
  #include <linux/sony-laptop.h>
@@ -10,7 +25,7 @@
  #ifdef CONFIG_SONYPI_COMPAT
  #include <linux/poll.h>
  #include <linux/miscdevice.h>
-@@ -123,6 +124,18 @@ MODULE_PARM_DESC(minor,
+@@ -123,6 +123,18 @@
  		 "default is -1 (automatic)");
  #endif
  
@@ -29,7 +44,7 @@
  /*********** Input Devices ***********/
  
  #define SONY_LAPTOP_BUF_SIZE	128
-@@ -134,6 +147,7 @@ struct sony_laptop_input_s {
+@@ -134,6 +146,7 @@
  	spinlock_t		fifo_lock;
  	struct workqueue_struct	*wq;
  };
@@ -37,25 +52,38 @@
  static struct sony_laptop_input_s sony_laptop_input = {
  	.users = ATOMIC_INIT(0),
  };
-@@ -211,6 +225,7 @@ static int sony_laptop_input_index[] = {
+@@ -211,6 +224,14 @@
  	48,	/* 61 SONYPI_EVENT_WIRELESS_OFF */
  	49,	/* 62 SONYPI_EVENT_ZOOM_IN_PRESSED */
  	50,	/* 63 SONYPI_EVENT_ZOOM_OUT_PRESSED */
 +	51,	/* 64 SONYPI_EVENT_CD_EJECT_PRESSED */
++	52,	/* 65 SONYPI_EVENT_MODEKEY_PRESSED */
++	53,	/* 66 SONYPI_EVENT_PKEY_P4 */
++	54,	/* 67 SONYPI_EVENT_PKEY_P5 */
++	55,	/* 68 SONYPI_EVENT_SETTINGKEY_PRESSED */
++	56,	/* 69 SONYPI_EVENT_VOLUME_INC_PRESSED */
++	57,	/* 70 SONYPI_EVENT_VOLUME_DEC_PRESSED */
++	-1,	/* 71 SONYPI_EVENT_BRIGHTNESS_PRESSED */
  };
  
  static int sony_laptop_input_keycode_map[] = {
-@@ -264,7 +279,8 @@ static int sony_laptop_input_keycode_map[] = {
+@@ -264,7 +285,14 @@
  	KEY_WLAN,	/* 47 SONYPI_EVENT_WIRELESS_ON */
  	KEY_WLAN,	/* 48 SONYPI_EVENT_WIRELESS_OFF */
  	KEY_ZOOMIN,	/* 49 SONYPI_EVENT_ZOOM_IN_PRESSED */
 -	KEY_ZOOMOUT	/* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */
 +	KEY_ZOOMOUT,	/* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */
-+	KEY_EJECTCD	/* 51 SONYPI_EVENT_CD_EJECT_PRESSED */
++	KEY_EJECTCD,	/* 51 SONYPI_EVENT_CD_EJECT_PRESSED */
++	KEY_F13,	/* 52 SONYPI_EVENT_MODEKEY_PRESSED */
++	KEY_PROG4,	/* 53 SONYPI_EVENT_PKEY_P4 */
++	KEY_F14,	/* 54 SONYPI_EVENT_PKEY_P5 */
++	KEY_F15,	/* 55 SONYPI_EVENT_SETTINGKEY_PRESSED */
++	KEY_VOLUMEUP,	/* 56 SONYPI_EVENT_VOLUME_INC_PRESSED */
++	KEY_VOLUMEDOWN,	/* 57 SONYPI_EVENT_VOLUME_DEC_PRESSED */
  };
  
  /* release buttons after a short delay if pressed */
-@@ -689,6 +705,31 @@ static int acpi_callsetfunc(acpi_handle handle, char *name, int value,
+@@ -689,6 +717,31 @@
  	return -1;
  }
  
@@ -64,7 +92,7 @@
 +	int i;
 +	int result;
 +
-+	for (i=0x20; i<0x30; i++) {
++	for (i = 0x20; i < 0x30; i++) {
 +		acpi_callsetfunc(sony_nc_acpi_handle, "SN00", i, &result);
 +		if (result == handle)
 +			return i-0x20;
@@ -87,7 +115,7 @@
  /*
   * sony_nc_values input/output validate functions
   */
-@@ -809,33 +850,11 @@ struct sony_nc_event {
+@@ -809,87 +862,53 @@
  	u8	event;
  };
  
@@ -118,15 +146,22 @@
 -}
 -
 -static struct sony_nc_event sony_C_events[] = {
-+static struct sony_nc_event sony_nc_events[] = {
++static struct sony_nc_event sony_100_events[] = {
 +	{ 0x90, SONYPI_EVENT_PKEY_P1 },
 +	{ 0x10, SONYPI_EVENT_ANYBUTTON_RELEASED },
 +	{ 0x91, SONYPI_EVENT_PKEY_P1 },
 +	{ 0x11, SONYPI_EVENT_ANYBUTTON_RELEASED },
  	{ 0x81, SONYPI_EVENT_FNKEY_F1 },
  	{ 0x01, SONYPI_EVENT_FNKEY_RELEASED },
++	{ 0x82, SONYPI_EVENT_FNKEY_F2 },
++	{ 0x02, SONYPI_EVENT_FNKEY_RELEASED },
++	{ 0x83, SONYPI_EVENT_FNKEY_F3 },
++	{ 0x03, SONYPI_EVENT_FNKEY_RELEASED },
++	{ 0x84, SONYPI_EVENT_FNKEY_F4 },
++	{ 0x04, SONYPI_EVENT_FNKEY_RELEASED },
  	{ 0x85, SONYPI_EVENT_FNKEY_F5 },
-@@ -844,88 +863,53 @@ static struct sony_nc_event sony_C_events[] = {
+ 	{ 0x05, SONYPI_EVENT_FNKEY_RELEASED },
+ 	{ 0x86, SONYPI_EVENT_FNKEY_F6 },
  	{ 0x06, SONYPI_EVENT_FNKEY_RELEASED },
  	{ 0x87, SONYPI_EVENT_FNKEY_F7 },
  	{ 0x07, SONYPI_EVENT_FNKEY_RELEASED },
@@ -180,10 +215,27 @@
 -			},
 -		},
 -		{ }
--};
--
++static struct sony_nc_event sony_127_events[] = {
++	{ 0x81, SONYPI_EVENT_MODEKEY_PRESSED },
++	{ 0x01, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x82, SONYPI_EVENT_PKEY_P1 },
++	{ 0x02, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x83, SONYPI_EVENT_PKEY_P2 },
++	{ 0x03, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x84, SONYPI_EVENT_PKEY_P3 },
++	{ 0x04, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x85, SONYPI_EVENT_PKEY_P4 },
++	{ 0x05, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x86, SONYPI_EVENT_PKEY_P5 },
++	{ 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0x87, SONYPI_EVENT_SETTINGKEY_PRESSED },
++	{ 0x07, SONYPI_EVENT_ANYBUTTON_RELEASED },
++	{ 0, 0 },
+ };
+ 
  /*
-  * ACPI callbacks
+@@ -897,35 +916,51 @@
   */
  static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
  {
@@ -210,32 +262,46 @@
 -	}
 +	if (ev >= 0x90) {
 +		/* New-style event */
-+		int origev = ev;
++		int key_handle = 0;
 +		ev -= 0x90;
- 
--	if (sony_nc_events)
--		for (evmap = sony_nc_events; evmap->event; evmap++) {
--			if (evmap->data == ev) {
--				ev = evmap->event;
--				break;
-+		if (sony_find_snc_handle(0x100) == ev) {
-+			int i;
 +
-+			if (sony_call_snc_handle(0x100, 0x200, &result))
-+				dprintk("sony_acpi_notify, unable to decode event 0x%.2x\n", ev);
++		if (sony_find_snc_handle(0x100) == ev)
++			key_handle = 0x100;
++		if (sony_find_snc_handle(0x127) == ev)
++			key_handle = 0x127;
++
++		if (handle) {
++			struct sony_nc_event *key_event;
++
++			if (sony_call_snc_handle(key_handle, 0x200, &result))
++				dprintk("sony_acpi_notify, unable to decode"
++					" event 0x%.2x 0x%.2x\n", key_handle,
++					ev);
 +			else
 +				ev = result & 0xFF;
 +
-+			for (i=0; sony_nc_events[i].event; i++) {
-+				if (sony_nc_events[i].data == ev) {
-+					ev = sony_nc_events[i].event;
++			if (key_handle == 0x100)
++				key_event = sony_100_events;
++			else
++				key_event = sony_127_events;
++
++			for (; key_event->data; key_event++) {
++				if (key_event->data == ev) {
++					ev = key_event->event;
 +					break;
 +				}
- 			}
-+
-+			if (!sony_nc_events[i].data)
++			}
+ 
+-	if (sony_nc_events)
+-		for (evmap = sony_nc_events; evmap->event; evmap++) {
+-			if (evmap->data == ev) {
+-				ev = evmap->event;
+-				break;
++			if (!key_event->data) {
 +				printk(KERN_INFO DRV_PFX
-+				       "Unknown event: %x %x\n", origev, ev);
++				       "Unknown event: 0x%x 0x%x\n", key_handle,
++				       ev);
+ 			}
 +		} else if (sony_find_snc_handle(0x124) == ev) {
 +			sony_nc_rfkill_update();
 +			return;
@@ -244,11 +310,12 @@
  
  	dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
  	sony_laptop_report_input_event(ev);
-@@ -953,9 +937,24 @@ static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
+@@ -953,9 +988,25 @@
  /*
   * ACPI device
   */
-+static int sony_nc_function_setup(struct acpi_device *device) {
++static int sony_nc_function_setup(struct acpi_device *device)
++{
 +	int result;
 +
 +	/* Enable all events */
@@ -269,7 +336,7 @@
  
  	for (item = sony_nc_values; item->name; item++) {
  		int ret;
-@@ -970,13 +969,188 @@ static int sony_nc_resume(struct acpi_device *device)
+@@ -970,13 +1021,188 @@
  		}
  	}
  
@@ -299,7 +366,7 @@
 +{
 +	int i;
 +
-+	for (i=0; i<SONY_RFKILL_MAX; i++) {
++	for (i = 0; i < SONY_RFKILL_MAX; i++) {
 +		if (sony_rfkill_devices[i])
 +			rfkill_unregister(sony_rfkill_devices[i]);
 +	}
@@ -425,7 +492,7 @@
 +	int i;
 +	enum rfkill_state state;
 +
-+	for (i=0; i<SONY_RFKILL_MAX; i++) {
++	for (i = 0; i < SONY_RFKILL_MAX; i++) {
 +		if (sony_rfkill_devices[i]) {
 +			sony_rfkill_devices[i]->
 +				get_state(sony_rfkill_devices[i]->data,
@@ -460,7 +527,7 @@
  
  	return 0;
  }
-@@ -1024,6 +1198,19 @@ static int sony_nc_add(struct acpi_device *device)
+@@ -1024,6 +1250,19 @@
  			dprintk("_INI Method failed\n");
  	}
  
@@ -480,7 +547,7 @@
  	/* setup input devices and helper fifo */
  	result = sony_laptop_setup_input(device);
  	if (result) {
-@@ -1063,9 +1250,6 @@ static int sony_nc_add(struct acpi_device *device)
+@@ -1063,9 +1302,6 @@
  
  	}
  
@@ -490,7 +557,7 @@
  	result = sony_pf_add();
  	if (result)
  		goto outbacklight;
-@@ -1131,6 +1315,7 @@ static int sony_nc_add(struct acpi_device *device)
+@@ -1131,6 +1367,7 @@
  	sony_laptop_remove_input();
  
        outwalk:
@@ -498,7 +565,7 @@
  	return result;
  }
  
-@@ -1156,6 +1341,7 @@ static int sony_nc_remove(struct acpi_device *device, int type)
+@@ -1156,6 +1393,7 @@
  
  	sony_pf_remove();
  	sony_laptop_remove_input();
@@ -506,15 +573,269 @@
  	dprintk(SONY_NC_DRIVER_NAME " removed.\n");
  
  	return 0;
-diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
-index f41ffd7..8458dbe 100644
---- a/include/linux/sonypi.h
-+++ b/include/linux/sonypi.h
-@@ -103,6 +103,7 @@
+@@ -1195,7 +1433,6 @@
+ #define SONYPI_TYPE1_OFFSET	0x04
+ #define SONYPI_TYPE2_OFFSET	0x12
+ #define SONYPI_TYPE3_OFFSET	0x12
+-#define SONYPI_TYPE4_OFFSET	0x12
+ 
+ struct sony_pic_ioport {
+ 	struct acpi_resource_io	io1;
+@@ -1328,6 +1565,7 @@
+ 	{ 0x01, SONYPI_EVENT_PKEY_P1 },
+ 	{ 0x02, SONYPI_EVENT_PKEY_P2 },
+ 	{ 0x04, SONYPI_EVENT_PKEY_P3 },
++	{ 0x20, SONYPI_EVENT_PKEY_P1 },
+ 	{ 0, 0 }
+ };
+ 
+@@ -1371,6 +1609,7 @@
+ 	{ 0x39, SONYPI_EVENT_ZOOM_PRESSED },
+ 	{ 0x10, SONYPI_EVENT_ZOOM_IN_PRESSED },
+ 	{ 0x20, SONYPI_EVENT_ZOOM_OUT_PRESSED },
++	{ 0x04, SONYPI_EVENT_ZOOM_PRESSED },
+ 	{ 0, 0 }
+ };
+ 
+@@ -1401,6 +1640,19 @@
+ 	{ 0, 0 }
+ };
+ 
++/* The set of possible volume events */
++static struct sonypi_event sonypi_volumeev[] = {
++	{ 0x01, SONYPI_EVENT_VOLUME_INC_PRESSED },
++	{ 0x02, SONYPI_EVENT_VOLUME_DEC_PRESSED },
++	{ 0, 0 }
++};
++
++/* The set of possible brightness events */
++static struct sonypi_event sonypi_brightnessev[] = {
++	{ 0x80, SONYPI_EVENT_BRIGHTNESS_PRESSED },
++	{ 0, 0 }
++};
++
+ static struct sonypi_eventtypes type1_events[] = {
+ 	{ 0, 0xffffffff, sonypi_releaseev },
+ 	{ 0x70, SONYPI_MEYE_MASK, sonypi_meyeev },
+@@ -1438,17 +1690,11 @@
+ 	{ 0x31, SONYPI_MEMORYSTICK_MASK, sonypi_memorystickev },
+ 	{ 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev },
+ 	{ 0x31, SONYPI_PKEY_MASK, sonypi_pkeyev },
+-	{ 0 },
+-};
+-static struct sonypi_eventtypes type4_events[] = {
+-	{ 0, 0xffffffff, sonypi_releaseev },
+-	{ 0x21, SONYPI_FNKEY_MASK, sonypi_fnkeyev },
+-	{ 0x31, SONYPI_WIRELESS_MASK, sonypi_wlessev },
+-	{ 0x31, SONYPI_MEMORYSTICK_MASK, sonypi_memorystickev },
+-	{ 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev },
+ 	{ 0x05, SONYPI_PKEY_MASK, sonypi_pkeyev },
+ 	{ 0x05, SONYPI_ZOOM_MASK, sonypi_zoomev },
+ 	{ 0x05, SONYPI_CAPTURE_MASK, sonypi_captureev },
++	{ 0x05, SONYPI_PKEY_MASK, sonypi_volumeev },
++	{ 0x05, SONYPI_PKEY_MASK, sonypi_brightnessev },
+ 	{ 0 },
+ };
+ 
+@@ -1511,11 +1757,11 @@
+ /*
+  * minidrivers for SPIC models
+  */
+-static int type4_handle_irq(const u8 data_mask, const u8 ev)
++static int type3_handle_irq(const u8 data_mask, const u8 ev)
+ {
+ 	/*
+ 	 * 0x31 could mean we have to take some extra action and wait for
+-	 * the next irq for some Type4 models, it will generate a new
++	 * the next irq for some Type3 models, it will generate a new
+ 	 * irq and we can read new data from the device:
+ 	 *  - 0x5c and 0x5f requires 0xA0
+ 	 *  - 0x61 requires 0xB3
+@@ -1545,16 +1791,10 @@
+ 	},
+ 	{
+ 		.model = SONYPI_DEVICE_TYPE3,
+-		.handle_irq = NULL,
++		.handle_irq = type3_handle_irq,
+ 		.evport_offset = SONYPI_TYPE3_OFFSET,
+ 		.event_types = type3_events,
+ 	},
+-	{
+-		.model = SONYPI_DEVICE_TYPE4,
+-		.handle_irq = type4_handle_irq,
+-		.evport_offset = SONYPI_TYPE4_OFFSET,
+-		.event_types = type4_events,
+-	},
+ };
+ 
+ static void sony_pic_detect_device_type(struct sony_pic_dev *dev)
+@@ -1578,14 +1818,21 @@
+ 	pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+ 			PCI_DEVICE_ID_INTEL_ICH7_1, NULL);
+ 	if (pcidev) {
+-		dev->control = &spic_types[3];
++		dev->control = &spic_types[2];
+ 		goto out;
+ 	}
+ 
+ 	pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+ 			PCI_DEVICE_ID_INTEL_ICH8_4, NULL);
+ 	if (pcidev) {
+-		dev->control = &spic_types[3];
++		dev->control = &spic_types[2];
++		goto out;
++	}
++
++	pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
++			PCI_DEVICE_ID_INTEL_ICH9_1, NULL);
++	if (pcidev) {
++		dev->control = &spic_types[2];
+ 		goto out;
+ 	}
+ 
+@@ -1598,8 +1845,7 @@
+ 
+ 	printk(KERN_INFO DRV_PFX "detected Type%d model\n",
+ 			dev->control->model == SONYPI_DEVICE_TYPE1 ? 1 :
+-			dev->control->model == SONYPI_DEVICE_TYPE2 ? 2 :
+-			dev->control->model == SONYPI_DEVICE_TYPE3 ? 3 : 4);
++			dev->control->model == SONYPI_DEVICE_TYPE2 ? 2 : 3);
+ }
+ 
+ /* camera tests and poweron/poweroff */
+@@ -1754,17 +2000,14 @@
+ EXPORT_SYMBOL(sony_pic_camera_command);
+ 
+ /* gprs/edge modem (SZ460N and SZ210P), thanks to Joshua Wise */
+-static void sony_pic_set_wwanpower(u8 state)
++static void __sony_pic_set_wwanpower(u8 state)
+ {
+ 	state = !!state;
+-	mutex_lock(&spic_dev.lock);
+-	if (spic_dev.wwan_power == state) {
+-		mutex_unlock(&spic_dev.lock);
++	if (spic_dev.wwan_power == state)
+ 		return;
+-	}
+ 	sony_pic_call2(0xB0, state);
++	sony_pic_call1(0x82);
+ 	spic_dev.wwan_power = state;
+-	mutex_unlock(&spic_dev.lock);
+ }
+ 
+ static ssize_t sony_pic_wwanpower_store(struct device *dev,
+@@ -1776,7 +2019,9 @@
+ 		return -EINVAL;
+ 
+ 	value = simple_strtoul(buffer, NULL, 10);
+-	sony_pic_set_wwanpower(value);
++	mutex_lock(&spic_dev.lock);
++	__sony_pic_set_wwanpower(value);
++	mutex_unlock(&spic_dev.lock);
+ 
+ 	return count;
+ }
+@@ -1934,10 +2179,15 @@
+ static int sonypi_misc_open(struct inode *inode, struct file *file)
+ {
+ 	/* Flush input queue on first open */
+-	lock_kernel();
++	unsigned long flags;
++
++	spin_lock_irqsave(sonypi_compat.fifo->lock, flags);
++
+ 	if (atomic_inc_return(&sonypi_compat.open_count) == 1)
+-		kfifo_reset(sonypi_compat.fifo);
+-	unlock_kernel();
++		__kfifo_reset(sonypi_compat.fifo);
++
++	spin_unlock_irqrestore(sonypi_compat.fifo->lock, flags);
++
+ 	return 0;
+ }
+ 
+@@ -1990,8 +2240,8 @@
+ 	return 0;
+ }
+ 
+-static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
+-			     unsigned int cmd, unsigned long arg)
++static long sonypi_misc_ioctl(struct file *fp, unsigned int cmd,
++							unsigned long arg)
+ {
+ 	int ret = 0;
+ 	void __user *argp = (void __user *)arg;
+@@ -2125,7 +2375,7 @@
+ 	.open		= sonypi_misc_open,
+ 	.release	= sonypi_misc_release,
+ 	.fasync		= sonypi_misc_fasync,
+-	.ioctl		= sonypi_misc_ioctl,
++	.unlocked_ioctl	= sonypi_misc_ioctl,
+ };
+ 
+ static struct miscdevice sonypi_misc_device = {
+--- vanilla-2.6.29/include/linux/sonypi.h	2009-03-23 23:12:14.000000000 +0000
++++ linux-2.6.29.noarch/include/linux/sonypi.h	2009-03-31 16:37:31.000000000 +0100
+@@ -103,6 +103,14 @@
  #define SONYPI_EVENT_WIRELESS_OFF		61
  #define SONYPI_EVENT_ZOOM_IN_PRESSED		62
  #define SONYPI_EVENT_ZOOM_OUT_PRESSED		63
 +#define SONYPI_EVENT_CD_EJECT_PRESSED		64
++#define SONYPI_EVENT_MODEKEY_PRESSED		65
++#define SONYPI_EVENT_PKEY_P4			66
++#define SONYPI_EVENT_PKEY_P5			67
++#define SONYPI_EVENT_SETTINGKEY_PRESSED		68
++#define SONYPI_EVENT_VOLUME_INC_PRESSED		69
++#define SONYPI_EVENT_VOLUME_DEC_PRESSED		70
++#define SONYPI_EVENT_BRIGHTNESS_PRESSED		71
  
  /* get/set brightness */
  #define SONYPI_IOCGBRT		_IOR('v', 0, __u8)
+--- sony-laptop.c.orig	2009-03-29 12:41:44.000000000 +0200
++++ a/drivers/platform/x86/sony-laptop.c	2009-03-31 00:04:23.000000000 +0200
+@@ -865,7 +865,7 @@
+ static struct sony_nc_event sony_100_events[] = {
+ 	{ 0x90, SONYPI_EVENT_PKEY_P1 },
+ 	{ 0x10, SONYPI_EVENT_ANYBUTTON_RELEASED },
+-	{ 0x91, SONYPI_EVENT_PKEY_P1 },
++	{ 0x91, SONYPI_EVENT_PKEY_P2 },
+ 	{ 0x11, SONYPI_EVENT_ANYBUTTON_RELEASED },
+ 	{ 0x81, SONYPI_EVENT_FNKEY_F1 },
+ 	{ 0x01, SONYPI_EVENT_FNKEY_RELEASED },
+@@ -929,7 +929,7 @@
+ 		if (sony_find_snc_handle(0x127) == ev)
+ 			key_handle = 0x127;
+ 
+-		if (handle) {
++		if (key_handle) {
+ 			struct sony_nc_event *key_event;
+ 
+ 			if (sony_call_snc_handle(key_handle, 0x200, &result))
+@@ -955,15 +955,22 @@
+ 				printk(KERN_INFO DRV_PFX
+ 				       "Unknown event: 0x%x 0x%x\n", key_handle,
+ 				       ev);
++				/* restore original event number */
++				ev = event;
++			} else {
++				sony_laptop_report_input_event(ev);
++				/* mark event as translated */
++				ev |= 0x8000;
+ 			}
+ 		} else if (sony_find_snc_handle(0x124) == ev) {
+ 			sony_nc_rfkill_update();
+-			return;
+-		}
+-	}
+-
++			/* restore original event number */
++			ev = event;
++		} 
++	} else
++		sony_laptop_report_input_event(ev);
++	
+ 	dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
+-	sony_laptop_report_input_event(ev);
+ 	acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
+ }
+ 

linux-2.6-v4l-dvb-fixes.patch:

Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.2.8.7
retrieving revision 1.2.8.8
diff -u -r1.2.8.7 -r1.2.8.8
--- linux-2.6-v4l-dvb-fixes.patch	30 Mar 2009 19:45:45 -0000	1.2.8.7
+++ linux-2.6-v4l-dvb-fixes.patch	14 Apr 2009 22:09:18 -0000	1.2.8.8
@@ -315,7 +315,6 @@
       V4L/DVB (11051): v4l-dvb: replace remaining references to the old mailinglist.
       V4L/DVB (11052): bt819: remove an unused header
       V4L/DVB (11053): saa7134: set v4l2_dev field of video_device
-      V4L/DVB (11098): v4l2-common: remove incorrect MODULE test
       V4L/DVB (11100): au8522: fix compilation warning.
       V4L/DVB (11112): v4l2-subdev: add support for TRY_FMT, ENUM_FMT and G/S_PARM.
       V4L/DVB (11113): ov7670: convert to v4l2_subdev
@@ -98395,19 +98394,6 @@
     to high class IDs.
  
     This function returns the first ID that follows after the given ID.
-@@ -910,10 +797,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
- 	struct i2c_board_info info;
- 
- 	BUG_ON(!dev);
--#ifdef MODULE
-+
- 	if (module_name)
- 		request_module(module_name);
--#endif
-+
- 	/* Setup the i2c board info with the device type and
- 	   the device address. */
- 	memset(&info, 0, sizeof(info));
 @@ -927,11 +814,11 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */
@@ -98437,19 +98423,6 @@
  }
  EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
  
-@@ -958,10 +850,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
- 	struct i2c_board_info info;
- 
- 	BUG_ON(!dev);
--#ifdef MODULE
-+
- 	if (module_name)
- 		request_module(module_name);
--#endif
-+
- 	/* Setup the i2c board info with the device type and
- 	   the device address. */
- 	memset(&info, 0, sizeof(info));
 @@ -974,11 +866,11 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.9
retrieving revision 1.976.2.10
diff -u -r1.976.2.9 -r1.976.2.10
--- sources	24 Mar 2009 22:57:47 -0000	1.976.2.9
+++ sources	14 Apr 2009 22:09:21 -0000	1.976.2.10
@@ -1 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
+87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.8
retrieving revision 1.888.2.9
diff -u -r1.888.2.8 -r1.888.2.9
--- upstream	24 Mar 2009 22:57:47 -0000	1.888.2.8
+++ upstream	14 Apr 2009 22:09:22 -0000	1.888.2.9
@@ -1 +1,2 @@
 linux-2.6.29.tar.bz2
+patch-2.6.29.1.bz2

xen.pvops.patch:

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- xen.pvops.patch	30 Mar 2009 19:45:46 -0000	1.1.2.15
+++ xen.pvops.patch	14 Apr 2009 22:09:22 -0000	1.1.2.16
@@ -4134,7 +4134,7 @@
  P:	Ananth N Mavinakayanahalli
  M:	ananth at in.ibm.com
 diff --git a/Makefile b/Makefile
-index 1ab3ebf..43f52e2 100644
+index cdb1133..86361af 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
@@ -45592,10 +45592,10 @@
  	BLANK();
  	OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
 diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c
-index 2ac0ab7..fc999e6 100644
+index a7a50b2..ceecf8c 100644
 --- a/arch/x86/kernel/check.c
 +++ b/arch/x86/kernel/check.c
-@@ -83,15 +83,15 @@ void __init setup_bios_corruption_check(void)
+@@ -83,7 +83,10 @@ void __init setup_bios_corruption_check(void)
  		u64 size;
  		addr = find_e820_area_size(addr, &size, PAGE_SIZE);
  
@@ -45606,15 +45606,7 @@
 +		if (addr >= corruption_check_size)
  			break;
  
- 		if ((addr + size) > corruption_check_size)
- 			size = corruption_check_size - addr;
- 
--		if (size == 0)
--			break;
--
- 		e820_update_range(addr, size, E820_RAM, E820_RESERVED);
- 		scan_areas[num_scan_areas].addr = addr;
- 		scan_areas[num_scan_areas].size = size;
+ 		if (addr >= corruption_check_size)
 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
 index 82db7f4..3efcb2b 100644
 --- a/arch/x86/kernel/cpu/Makefile
@@ -51220,7 +51212,7 @@
  
  int __init cyrix_init_mtrr(void)
 diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
-index 0c0a455..9fd8ebf 100644
+index 6f557e0..44e2289 100644
 --- a/arch/x86/kernel/cpu/mtrr/generic.c
 +++ b/arch/x86/kernel/cpu/mtrr/generic.c
 @@ -33,13 +33,31 @@ u64 mtrr_tom2;
@@ -51258,18 +51250,9 @@
  }
 -early_param("mtrr.show", mtrr_debug);
  
- /*
-  * Returns the effective MTRR type for the region
-@@ -174,6 +192,8 @@ get_fixed_ranges(mtrr_type * frs)
- 	unsigned int *p = (unsigned int *) frs;
- 	int i;
- 
-+	k8_check_syscfg_dram_mod_en();
-+
- 	rdmsr(MTRRfix64K_00000_MSR, p[0], p[1]);
- 
- 	for (i = 0; i < 2; i++)
-@@ -188,18 +208,94 @@ void mtrr_save_fixed_ranges(void *info)
+ /**
+  * BIOS is expected to clear MtrrFixDramModEn bit, see for example
+@@ -216,18 +234,94 @@ void mtrr_save_fixed_ranges(void *info)
  		get_fixed_ranges(mtrr_state.fixed_ranges);
  }
  
@@ -51368,7 +51351,7 @@
  /*  Grab all of the MTRR state for this CPU into *state  */
  void __init get_mtrr_state(void)
  {
-@@ -231,41 +327,9 @@ void __init get_mtrr_state(void)
+@@ -259,41 +353,9 @@ void __init get_mtrr_state(void)
  		mtrr_tom2 |= low;
  		mtrr_tom2 &= 0xffffff800000ULL;
  	}
@@ -51413,46 +51396,7 @@
  	mtrr_state_set = 1;
  
  	/* PAT setup for BP. We need to go through sync steps here */
-@@ -308,27 +372,10 @@ void mtrr_wrmsr(unsigned msr, unsigned a, unsigned b)
- }
- 
- /**
-- * Enable and allow read/write of extended fixed-range MTRR bits on K8 CPUs
-- * see AMD publication no. 24593, chapter 3.2.1 for more information
-- */
--static inline void k8_enable_fixed_iorrs(void)
--{
--	unsigned lo, hi;
--
--	rdmsr(MSR_K8_SYSCFG, lo, hi);
--	mtrr_wrmsr(MSR_K8_SYSCFG, lo
--				| K8_MTRRFIXRANGE_DRAM_ENABLE
--				| K8_MTRRFIXRANGE_DRAM_MODIFY, hi);
--}
--
--/**
-  * set_fixed_range - checks & updates a fixed-range MTRR if it differs from the value it should have
-  * @msr: MSR address of the MTTR which should be checked and updated
-  * @changed: pointer which indicates whether the MTRR needed to be changed
-  * @msrwords: pointer to the MSR values which the MSR should have
-- *
-- * If K8 extentions are wanted, update the K8 SYSCFG MSR also.
-- * See AMD publication no. 24593, chapter 7.8.1, page 233 for more information.
-  */
- static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords)
- {
-@@ -337,10 +384,6 @@ static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords)
- 	rdmsr(msr, lo, hi);
- 
- 	if (lo != msrwords[0] || hi != msrwords[1]) {
--		if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
--		    (boot_cpu_data.x86 >= 0x0f && boot_cpu_data.x86 <= 0x11) &&
--		    ((msrwords[0] | msrwords[1]) & K8_MTRR_RDMEM_WRMEM_MASK))
--			k8_enable_fixed_iorrs();
- 		mtrr_wrmsr(msr, msrwords[0], msrwords[1]);
- 		*changed = true;
- 	}
-@@ -376,22 +419,31 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
+@@ -383,22 +445,31 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
  {
  	unsigned int mask_lo, mask_hi, base_lo, base_hi;
  	unsigned int tmp, hi;
@@ -51487,7 +51431,7 @@
  	hi = fls(tmp);
  	if (hi > 0) {
  		tmp |= ~((1<<(hi - 1)) - 1);
-@@ -402,11 +454,19 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
+@@ -409,11 +480,19 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
  		}
  	}
  
@@ -51509,16 +51453,7 @@
  }
  
  /**
-@@ -419,6 +479,8 @@ static int set_fixed_ranges(mtrr_type * frs)
- 	bool changed = false;
- 	int block=-1, range;
- 
-+	k8_check_syscfg_dram_mod_en();
-+
- 	while (fixed_range_blocks[++block].ranges)
- 	    for (range=0; range < fixed_range_blocks[block].ranges; range++)
- 		set_fixed_range(fixed_range_blocks[block].base_msr + range,
-@@ -663,4 +725,5 @@ struct mtrr_ops generic_mtrr_ops = {
+@@ -672,4 +751,5 @@ struct mtrr_ops generic_mtrr_ops = {
  	.set               = generic_set_mtrr,
  	.validate_add_page = generic_validate_add_page,
  	.have_wrcomb       = generic_have_wrcomb,
@@ -68547,7 +68482,7 @@
  {
  	unsigned long stack;
 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 06ca07f..5c6e463 100644
+index f7d38d6..5c6e463 100644
 --- a/arch/x86/kernel/ptrace.c
 +++ b/arch/x86/kernel/ptrace.c
 @@ -21,6 +21,7 @@
@@ -68609,18 +68544,7 @@
  }
  
  #endif	/* CONFIG_X86_32 */
-@@ -690,9 +686,8 @@ static int ptrace_bts_config(struct task_struct *child,
- 		if (!cfg.signal)
- 			return -EINVAL;
- 
--		return -EOPNOTSUPP;
--
- 		child->thread.bts_ovfl_signal = cfg.signal;
-+		return -EOPNOTSUPP;
- 	}
- 
- 	if ((cfg.flags & PTRACE_BTS_O_ALLOC) &&
-@@ -1421,6 +1416,9 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
+@@ -1420,6 +1416,9 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
  	    tracehook_report_syscall_entry(regs))
  		ret = -1L;
  
@@ -68630,7 +68554,7 @@
  	if (unlikely(current->audit_context)) {
  		if (IS_IA32)
  			audit_syscall_entry(AUDIT_ARCH_I386,
-@@ -1444,6 +1442,9 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)
+@@ -1443,6 +1442,9 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)
  	if (unlikely(current->audit_context))
  		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
  
@@ -72601,7 +72525,7 @@
 -	on_each_cpu(do_flush_tlb_all, NULL, 1);
 -}
 diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
-index 6812b82..deb5ebb 100644
+index 16e505a..deb5ebb 100644
 --- a/arch/x86/kernel/tlb_uv.c
 +++ b/arch/x86/kernel/tlb_uv.c
 @@ -11,16 +11,15 @@
@@ -72762,13 +72686,7 @@
  }
  
  /*
-@@ -742,16 +751,21 @@ static int __init uv_bau_init(void)
- 	int node;
- 	int nblades;
- 	int last_blade;
--	int cur_cpu = 0;
-+	int cur_cpu;
- 
+@@ -747,6 +756,10 @@ static int __init uv_bau_init(void)
  	if (!is_uv_system())
  		return 0;
  
@@ -72779,12 +72697,6 @@
  	uv_bau_retry_limit = 1;
  	uv_nshift = uv_hub_info->n_val;
  	uv_mmask = (1UL << uv_hub_info->n_val) - 1;
- 	nblades = 0;
- 	last_blade = -1;
-+	cur_cpu = 0;
- 	for_each_online_node(node) {
- 		blade = uv_node_to_blade_id(node);
- 		if (blade == last_blade)
 diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
 index 0fcc95a..7e45159 100644
 --- a/arch/x86/kernel/topology.c
@@ -74246,7 +74158,7 @@
  	select VIRTIO_RING
  	select VIRTIO_CONSOLE
 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
-index 960a8d9..25799f3 100644
+index 4175cb4..9265132 100644
 --- a/arch/x86/lguest/boot.c
 +++ b/arch/x86/lguest/boot.c
 @@ -147,10 +147,16 @@ static void lazy_hcall(unsigned long call,
@@ -74307,7 +74219,7 @@
  	lazy_hcall(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu, 0);
  }
  
-@@ -830,13 +841,14 @@ static u32 lguest_apic_safe_wait_icr_idle(void)
+@@ -836,13 +847,14 @@ static u32 lguest_apic_safe_wait_icr_idle(void)
  	return 0;
  }
  
@@ -74329,7 +74241,7 @@
  };
  #endif
  
-@@ -991,10 +1003,10 @@ __init void lguest_init(void)
+@@ -997,10 +1009,10 @@ __init void lguest_init(void)
  
  	/* interrupt-related operations */
  	pv_irq_ops.init_IRQ = lguest_init_IRQ;
@@ -74344,7 +74256,7 @@
  	pv_irq_ops.safe_halt = lguest_safe_halt;
  
  	/* init-time operations */
-@@ -1019,8 +1031,8 @@ __init void lguest_init(void)
+@@ -1025,8 +1037,8 @@ __init void lguest_init(void)
  	pv_cpu_ops.write_gdt_entry = lguest_write_gdt_entry;
  	pv_cpu_ops.write_idt_entry = lguest_write_idt_entry;
  	pv_cpu_ops.wbinvd = lguest_wbinvd;
@@ -74355,12 +74267,14 @@
  
  	/* pagetable management */
  	pv_mmu_ops.write_cr3 = lguest_write_cr3;
-@@ -1033,11 +1045,11 @@ __init void lguest_init(void)
+@@ -1039,13 +1051,13 @@ __init void lguest_init(void)
  	pv_mmu_ops.read_cr2 = lguest_read_cr2;
  	pv_mmu_ops.read_cr3 = lguest_read_cr3;
  	pv_mmu_ops.lazy_mode.enter = paravirt_enter_lazy_mmu;
 -	pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mode;
 +	pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mmu_mode;
+ 	pv_mmu_ops.pte_update = lguest_pte_update;
+ 	pv_mmu_ops.pte_update_defer = lguest_pte_update;
  
  #ifdef CONFIG_X86_LOCAL_APIC
  	/* apic read/write intercepts */
@@ -74369,7 +74283,7 @@
  #endif
  
  	/* time operations */
-@@ -1052,14 +1064,6 @@ __init void lguest_init(void)
+@@ -1060,14 +1072,6 @@ __init void lguest_init(void)
  	 * lguest_init() where the rest of the fairly chaotic boot setup
  	 * occurs. */
  
@@ -85269,7 +85183,7 @@
  {
  	unsigned long addr = (unsigned long)page_address(page);
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index e0ab173..56899ae 100644
+index 21bc1f7..56899ae 100644
 --- a/arch/x86/mm/pat.c
 +++ b/arch/x86/mm/pat.c
 @@ -31,7 +31,7 @@
@@ -85355,7 +85269,7 @@
   * Internal interface to reserve a range of physical memory with prot.
   * Reserved non RAM regions only and after successful reserve_memtype,
   * this func also keeps identity mapping (if any) in sync with this new prot.
-@@ -634,17 +665,18 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
+@@ -634,7 +665,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
  				int strict_prot)
  {
  	int is_ram = 0;
@@ -85364,20 +85278,7 @@
  	unsigned long flags;
  	unsigned long want_flags = (pgprot_val(*vma_prot) & _PAGE_CACHE_MASK);
  
- 	is_ram = pat_pagerange_is_ram(paddr, paddr + size);
- 
- 	/*
--	 * reserve_pfn_range() doesn't support RAM pages.
-+	 * reserve_pfn_range() doesn't support RAM pages. Maintain the current
-+	 * behavior with RAM pages by returning success.
- 	 */
- 	if (is_ram != 0)
--		return -EINVAL;
-+		return 0;
- 
- 	ret = reserve_memtype(paddr, paddr + size, want_flags, &flags);
- 	if (ret)
-@@ -671,23 +703,8 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
+@@ -672,23 +703,8 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
  				     flags);
  	}
  
@@ -86030,7 +85931,7 @@
  		.ident = "Toshiba PS5 based laptop",
  		.matches = {
 diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
-index 5ead808..f7133b5 100644
+index f234a37..f7133b5 100644
 --- a/arch/x86/pci/i386.c
 +++ b/arch/x86/pci/i386.c
 @@ -296,6 +296,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
@@ -86043,16 +85944,6 @@
  	if (pat_enabled && write_combine)
  		prot |= _PAGE_CACHE_WC;
  	else if (pat_enabled || boot_cpu_data.x86 > 3)
-@@ -319,6 +322,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
- 			return -EINVAL;
- 		}
- 		flags = new_flags;
-+		vma->vm_page_prot = __pgprot(
-+			(pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK) |
-+			flags);
- 	}
- 
- 	if (((vma->vm_pgoff < max_low_pfn_mapped) ||
 diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
 index 25a1f8e..4e2f90a 100644
 --- a/arch/x86/pci/init.c
@@ -106332,10 +106223,10 @@
  
  	befs_debug(sb, "---> befs_readdir() "
 diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
-index 939e2f7..c607744 100644
+index 71ae000..fbcbbf3 100644
 --- a/fs/cifs/cifssmb.c
 +++ b/fs/cifs/cifssmb.c
-@@ -3117,7 +3117,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
+@@ -3119,7 +3119,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
  		__u32 parm_len;
  		__u32 acl_len;
  		struct smb_com_ntransact_rsp *pSMBr;
@@ -111637,7 +111528,7 @@
 +
  #endif /* _LINUX_MEMORY_H_ */
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 065cdf8..b1ea37f 100644
+index 3daa05f..03443ca 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -104,6 +104,7 @@ extern unsigned int kobjsize(const void *objp);
@@ -111648,15 +111539,6 @@
  
  #ifndef VM_STACK_DEFAULT_FLAGS		/* arch can override this */
  #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
-@@ -145,7 +146,7 @@ extern pgprot_t protection_map[16];
-  */
- static inline int is_linear_pfn_mapping(struct vm_area_struct *vma)
- {
--	return ((vma->vm_flags & VM_PFNMAP) && vma->vm_pgoff);
-+	return (vma->vm_flags & VM_PFN_AT_MMAP);
- }
- 
- static inline int is_pfn_mapping(struct vm_area_struct *vma)
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
 index d84feb7..347e598 100644
 --- a/include/linux/mm_types.h
@@ -154385,7 +154267,7 @@
 +		kmemcheck_mark_uninitialized_pages(page, pages);
 +}
 diff --git a/mm/memory.c b/mm/memory.c
-index baa999e..ef11ac6 100644
+index d7df5ba..8bb20d4 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -48,6 +48,8 @@
@@ -154397,27 +154279,6 @@
  #include <linux/init.h>
  #include <linux/writeback.h>
  #include <linux/memcontrol.h>
-@@ -1665,9 +1667,10 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
- 	 * behaviour that some programs depend on. We mark the "original"
- 	 * un-COW'ed pages by matching them up with "vma->vm_pgoff".
- 	 */
--	if (addr == vma->vm_start && end == vma->vm_end)
-+	if (addr == vma->vm_start && end == vma->vm_end) {
- 		vma->vm_pgoff = pfn;
--	else if (is_cow_mapping(vma->vm_flags))
-+		vma->vm_flags |= VM_PFN_AT_MMAP;
-+	} else if (is_cow_mapping(vma->vm_flags))
- 		return -EINVAL;
- 
- 	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
-@@ -1679,6 +1682,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
- 		 * needed from higher level routine calling unmap_vmas
- 		 */
- 		vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP);
-+		vma->vm_flags &= ~VM_PFN_AT_MMAP;
- 		return -EINVAL;
- 	}
- 
 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
 index 3eb4a6f..636344d 100644
 --- a/mm/mempolicy.c
@@ -156912,30 +156773,6 @@
  	tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
  	help
  	  If you say Y here, you will get experimental support for
-diff --git a/net/core/dev.c b/net/core/dev.c
-index e3fe5c7..c1e9dc0 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2588,9 +2588,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
- 		local_irq_disable();
- 		skb = __skb_dequeue(&queue->input_pkt_queue);
- 		if (!skb) {
-+			__napi_complete(napi);
- 			local_irq_enable();
--			napi_complete(napi);
--			goto out;
-+			break;
- 		}
- 		local_irq_enable();
- 
-@@ -2599,7 +2599,6 @@ static int process_backlog(struct napi_struct *napi, int quota)
- 
- 	napi_gro_flush(napi);
- 
--out:
- 	return work;
- }
- 
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
 index c6a6b16..e83e994 100644
 --- a/net/core/skbuff.c

xen.pvops.post.patch:

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- xen.pvops.post.patch	30 Mar 2009 19:45:49 -0000	1.1.2.9
+++ xen.pvops.post.patch	14 Apr 2009 22:09:26 -0000	1.1.2.10
@@ -1,4 +1,5 @@
 Reapply and merge in Fedora changes
+fix a mismerge in arch/x86/kernel/cpu/mtrr/generic.c
 remove localversion-tip file to avoid -tip being added to the kernel name
 
 --- a/arch/x86/mm/pat.c	2009-02-14 09:16:34.000000000 +0000
@@ -867,84 +868,298 @@
  	help
  	  Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
  	  and the TerraTec Cinergy T USB XE (Rev.1)
---- a/init/do_mounts_rd.c	2009-03-23 23:12:14.000000000 +0000
-+++ b/init/do_mounts_rd.c	2009-03-30 19:36:28.000000000 +0100
-@@ -9,7 +9,12 @@
- #include <linux/string.h>
+--- a/include/linux/intel-iommu.h	2009-03-23 23:12:14.000000000 +0000
++++ b/include/linux/intel-iommu.h	2009-04-11 17:05:51.000000000 +0100
+@@ -322,6 +332,7 @@
+ extern void free_iommu(struct intel_iommu *iommu);
+ extern int dmar_enable_qi(struct intel_iommu *iommu);
+ extern void dmar_disable_qi(struct intel_iommu *iommu);
++extern int dmar_reenable_qi(struct intel_iommu *iommu);
+ extern void qi_global_iec(struct intel_iommu *iommu);
+ 
+ extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
+--- a/arch/x86/kernel/cpu/mtrr/generic.c	2009-04-12 21:06:32.000000000 +0100
++++ b/arch/x86/kernel/cpu/mtrr/generic.c	2009-04-12 21:14:30.000000000 +0100
+@@ -59,32 +59,6 @@
+ 	}
+ }
  
- #include "do_mounts.h"
-+
-+#if defined(CONFIG_SQUASHFS3) || defined(CONFIG_SQUASHFS3_MODULE)
-+#include "../fs/squashfs3/squashfs3_fs.h"
-+#else
- #include "../fs/squashfs/squashfs_fs.h"
-+#endif
+-/**
+- * BIOS is expected to clear MtrrFixDramModEn bit, see for example
+- * "BIOS and Kernel Developer's Guide for the AMD Athlon 64 and AMD
+- * Opteron Processors" (26094 Rev. 3.30 February 2006), section
+- * "13.2.1.2 SYSCFG Register": "The MtrrFixDramModEn bit should be set
+- * to 1 during BIOS initalization of the fixed MTRRs, then cleared to
+- * 0 for operation."
+- */
+-static inline void k8_check_syscfg_dram_mod_en(void)
+-{
+-	u32 lo, hi;
+-
+-	if (!((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&
+-	      (boot_cpu_data.x86 >= 0x0f)))
+-		return;
+-
+-	rdmsr(MSR_K8_SYSCFG, lo, hi);
+-	if (lo & K8_MTRRFIXRANGE_DRAM_MODIFY) {
+-		printk(KERN_ERR FW_WARN "MTRR: CPU %u: SYSCFG[MtrrFixDramModEn]"
+-		       " not cleared by BIOS, clearing this bit\n",
+-		       smp_processor_id());
+-		lo &= ~K8_MTRRFIXRANGE_DRAM_MODIFY;
+-		mtrr_wrmsr(MSR_K8_SYSCFG, lo, hi);
+-	}
+-}
+-
+ /*
+  * Returns the effective MTRR type for the region
+  * Error returns:
+--- linux-2.6.29.x86_64/drivers/pci/dmar.c.orig	2009-04-12 21:24:15.000000000 +0100
++++ linux-2.6.29.x86_64/drivers/pci/dmar.c	2009-04-12 22:13:45.000000000 +0100
+@@ -763,42 +763,6 @@
+ }
  
- #include <linux/decompress/generic.h>
-
-@@ -38,6 +43,7 @@
-  * numbers could not be found.
-  *
-  * We currently check for the following magic numbers:
-+ *      squashfs
-  *	minix
-  *	ext2
-  *	romfs
---- a/arch/x86/mm/pat.c	2009-03-23 23:12:14.000000000 +0000
-+++ b/arch/x86/mm/pat.c	2009-03-30 19:36:52.000000000 +0100
-@@ -644,12 +647,18 @@
-	 * reserve_pfn_range() doesn't support RAM pages. Maintain the current
-	 * behavior with RAM pages by returning success.
- 	 */
--	if (is_ram != 0)
--		return 0;
-+	if (is_ram != 0) {
-+		printk(KERN_WARNING "reserve_pfn_range: is_ram is %d for 0x%llx!\n",
-+			is_ram, paddr);
-+		return 0;
-+	}
+ /*
+- * Disable Queued Invalidation interface.
+- */
+-void dmar_disable_qi(struct intel_iommu *iommu)
+-{
+-	unsigned long flags;
+-	u32 sts;
+-	cycles_t start_time = get_cycles();
+-
+-	if (!ecap_qis(iommu->ecap))
+-		return;
+-
+-	spin_lock_irqsave(&iommu->register_lock, flags);
+-
+-	sts =  dmar_readq(iommu->reg + DMAR_GSTS_REG);
+-	if (!(sts & DMA_GSTS_QIES))
+-		goto end;
+-
+-	/*
+-	 * Give a chance to HW to complete the pending invalidation requests.
+-	 */
+-	while ((readl(iommu->reg + DMAR_IQT_REG) !=
+-		readl(iommu->reg + DMAR_IQH_REG)) &&
+-		(DMAR_OPERATION_TIMEOUT > (get_cycles() - start_time)))
+-		cpu_relax();
+-
+-	iommu->gcmd &= ~DMA_GCMD_QIE;
+-
+-	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+-
+-	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl,
+-		      !(sts & DMA_GSTS_QIES), sts);
+-end:
+-	spin_unlock_irqrestore(&iommu->register_lock, flags);
+-}
+-
+-/*
+  * Enable queued invalidation.
+  */
+ static void __dmar_enable_qi(struct intel_iommu *iommu)
+@@ -932,172 +896,6 @@
+ };
+ #define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
  
- 	ret = reserve_memtype(paddr, paddr + size, want_flags, &flags);
+-const char *dmar_get_fault_reason(u8 fault_reason)
+-{
+-	if (fault_reason > MAX_FAULT_REASON_IDX)
+-		return "Unknown";
+-	else
+-		return fault_reason_strings[fault_reason];
+-}
+-
+-void dmar_msi_unmask(unsigned int irq)
+-{
+-	struct intel_iommu *iommu = get_irq_data(irq);
+-	unsigned long flag;
+-
+-	/* unmask it */
+-	spin_lock_irqsave(&iommu->register_lock, flag);
+-	writel(0, iommu->reg + DMAR_FECTL_REG);
+-	/* Read a reg to force flush the post write */
+-	readl(iommu->reg + DMAR_FECTL_REG);
+-	spin_unlock_irqrestore(&iommu->register_lock, flag);
+-}
+-
+-void dmar_msi_mask(unsigned int irq)
+-{
+-	unsigned long flag;
+-	struct intel_iommu *iommu = get_irq_data(irq);
+-
+-	/* mask it */
+-	spin_lock_irqsave(&iommu->register_lock, flag);
+-	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
+-	/* Read a reg to force flush the post write */
+-	readl(iommu->reg + DMAR_FECTL_REG);
+-	spin_unlock_irqrestore(&iommu->register_lock, flag);
+-}
+-
+-void dmar_msi_write(int irq, struct msi_msg *msg)
+-{
+-	struct intel_iommu *iommu = get_irq_data(irq);
+-	unsigned long flag;
+-
+-	spin_lock_irqsave(&iommu->register_lock, flag);
+-	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
+-	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
+-	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
+-	spin_unlock_irqrestore(&iommu->register_lock, flag);
+-}
+-
+-void dmar_msi_read(int irq, struct msi_msg *msg)
+-{
+-	struct intel_iommu *iommu = get_irq_data(irq);
+-	unsigned long flag;
+-
+-	spin_lock_irqsave(&iommu->register_lock, flag);
+-	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
+-	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
+-	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
+-	spin_unlock_irqrestore(&iommu->register_lock, flag);
+-}
+-
+-static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
+-		u8 fault_reason, u16 source_id, unsigned long long addr)
+-{
+-	const char *reason;
+-
+-	reason = dmar_get_fault_reason(fault_reason);
+-
+-	printk(KERN_ERR
+-		"DMAR:[%s] Request device [%02x:%02x.%d] "
+-		"fault addr %llx \n"
+-		"DMAR:[fault reason %02d] %s\n",
+-		(type ? "DMA Read" : "DMA Write"),
+-		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
+-		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+-	return 0;
+-}
+-
+-#define PRIMARY_FAULT_REG_LEN (16)
+-irqreturn_t dmar_fault(int irq, void *dev_id)
+-{
+-	struct intel_iommu *iommu = dev_id;
+-	int reg, fault_index;
+-	u32 fault_status;
+-	unsigned long flag;
+-
+-	spin_lock_irqsave(&iommu->register_lock, flag);
+-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+-
+-	/* TBD: ignore advanced fault log currently */
+-	if (!(fault_status & DMA_FSTS_PPF))
+-		goto clear_overflow;
+-
+-	fault_index = dma_fsts_fault_record_index(fault_status);
+-	reg = cap_fault_reg_offset(iommu->cap);
+-	while (1) {
+-		u8 fault_reason;
+-		u16 source_id;
+-		u64 guest_addr;
+-		int type;
+-		u32 data;
+-
+-		/* highest 32 bits */
+-		data = readl(iommu->reg + reg +
+-				fault_index * PRIMARY_FAULT_REG_LEN + 12);
+-		if (!(data & DMA_FRCD_F))
+-			break;
+-
+-		fault_reason = dma_frcd_fault_reason(data);
+-		type = dma_frcd_type(data);
+-
+-		data = readl(iommu->reg + reg +
+-				fault_index * PRIMARY_FAULT_REG_LEN + 8);
+-		source_id = dma_frcd_source_id(data);
+-
+-		guest_addr = dmar_readq(iommu->reg + reg +
+-				fault_index * PRIMARY_FAULT_REG_LEN);
+-		guest_addr = dma_frcd_page_addr(guest_addr);
+-		/* clear the fault */
+-		writel(DMA_FRCD_F, iommu->reg + reg +
+-			fault_index * PRIMARY_FAULT_REG_LEN + 12);
+-
+-		spin_unlock_irqrestore(&iommu->register_lock, flag);
+-
+-		dmar_fault_do_one(iommu, type, fault_reason,
+-				source_id, guest_addr);
+-
+-		fault_index++;
+-		if (fault_index > cap_num_fault_regs(iommu->cap))
+-			fault_index = 0;
+-		spin_lock_irqsave(&iommu->register_lock, flag);
+-	}
+-clear_overflow:
+-	/* clear primary fault overflow */
+-	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
+-	if (fault_status & DMA_FSTS_PFO)
+-		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
+-
+-	spin_unlock_irqrestore(&iommu->register_lock, flag);
+-	return IRQ_HANDLED;
+-}
+-
+-int dmar_set_interrupt(struct intel_iommu *iommu)
+-{
+-	int irq, ret;
+-
+-	irq = create_irq();
+-	if (!irq) {
+-		printk(KERN_ERR "IOMMU: no free vectors\n");
+-		return -EINVAL;
+-	}
+-
+-	set_irq_data(irq, iommu);
+-	iommu->irq = irq;
+-
+-	ret = arch_setup_dmar_msi(irq);
+-	if (ret) {
+-		set_irq_data(irq, NULL);
+-		iommu->irq = 0;
+-		destroy_irq(irq);
+-		return 0;
+-	}
+-
+-	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);
 -	if (ret)
-+	if (ret) {
-+		printk(KERN_WARNING "reserve_pfn_range: reserve_memtype ret %d for 0x%llx 0x%lx 0x%lx\n",
-+			ret, paddr, size, want_flags);
- 		return ret;
-+	}
- 
- 	if (flags != want_flags) {
- 		if (strict_prot || !is_new_memtype_allowed(want_flags, flags)) {
---- a/include/linux/mm.h	2009-03-23 23:12:14.000000000 +0000
-+++ b/include/linux/mm.h	2009-03-30 19:36:52.000000000 +0100
-@@ -145,7 +156,7 @@
+-		printk(KERN_ERR "IOMMU: can't request irq\n");
+-	return ret;
+-}
+-
+ /*
+  * Re-enable Queued Invalidation interface.
+  */
+--- vanilla-2.6.29/kernel/sched.c	2009-03-23 23:12:14.000000000 +0000
++++ linux.temp/kernel/sched.c	2009-04-14 21:42:33.000000000 +0100
+@@ -4134,9 +4134,25 @@
+ EXPORT_PER_CPU_SYMBOL(kstat);
+ 
+ /*
+- * Return any ns on the sched_clock that have not yet been banked in
++ * Return any ns on the sched_clock that have not yet been accounted in
+  * @p in case that task is currently running.
++ *
++ * Called with task_rq_lock() held on @rq.
   */
- static inline int is_linear_pfn_mapping(struct vm_area_struct *vma)
++static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
++{
++	u64 ns = 0;
++
++	if (task_current(rq, p)) {
++		update_rq_clock(rq);
++		ns = rq->clock - p->se.exec_start;
++		if ((s64)ns < 0)
++			ns = 0;
++	}
++
++	return ns;
++}
++
+ unsigned long long task_delta_exec(struct task_struct *p)
  {
--	return (vma->vm_flags & VM_PFN_AT_MMAP);
-+	return ((vma->vm_flags & VM_PFNMAP_AT_MMAP) == VM_PFNMAP_AT_MMAP);
- }
- 
- static inline int is_pfn_mapping(struct vm_area_struct *vma)
---- a/mm/memory.c	2009-03-23 23:12:14.000000000 +0000
-+++ b/mm/memory.c	2009-03-30 19:36:52.000000000 +0100
-@@ -1667,7 +1667,7 @@
- 	 */
-	if (addr == vma->vm_start && end == vma->vm_end) {
- 		vma->vm_pgoff = pfn;
--		vma->vm_flags |= VM_PFN_AT_MMAP;
-+		vma->vm_flags |= VM_PFNMAP_AT_MMAP;
-	} else if (is_cow_mapping(vma->vm_flags))
- 		return -EINVAL;
- 
-@@ -1679,7 +1679,7 @@
- 		 * needed from higher level routine calling unmap_vmas
- 		 */
- 		vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP);
--		vma->vm_flags &= ~VM_PFN_AT_MMAP;
-+		vma->vm_flags &= ~VM_PFNMAP_AT_MMAP;
- 		return -EINVAL;
- 	}
- 
+ 	unsigned long flags;
 --- a/localversion-tip	2009-02-17 19:49:34.000000000 +0000
 +++ /dev/null	2009-02-17 18:08:14.005240123 +0000
 @@ -1 +0,0 @@

xen.pvops.pre.patch:

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- xen.pvops.pre.patch	30 Mar 2009 19:45:49 -0000	1.1.2.8
+++ xen.pvops.pre.patch	14 Apr 2009 22:09:26 -0000	1.1.2.9
@@ -6,8 +6,10 @@
 drm-next.patch - drivers/gpu/drm/drm_proc.c
 linux-2.6-debug-taint-vm.patch - kernel/panic.c
 linux-2.6-v4l-dvb-update.patch - drivers/media/dvb/dvb-usb/Kconfig
-squashfs3.patch squashfs-fixups.patch - init/do_mounts_rd.c
-linux-2.6.29-pat-fixes.patch - arch/x86/mm/pat.c arch/x86/pci/i386.c include/linux/mm.h mm/memory.c
+linux-2.6.29-pat-fixes.patch - arch/x86/pci/i386.c include/linux/mm.h mm/memory.c
+drm-next.patch - include/drm/drm.h include/drm/drm_mode.h include/drm/i915_drm.h include/drm/mga_drm.h include/drm/radeon_drm.h include/drm/via_drm.h include/linux/dvb/audio.h
+linux-2.6-iommu-fixes.patch - drivers/pci/dmar.c drivers/pci/intel-iommu.c drivers/pci/intr_remapping.c include/linux/dmar.h include/linux/intel-iommu.h
+linux-2.6-posix-timers-fix-clock-monotonicity.patch - kernel/sched.c
 
 --- a/arch/x86/mm/pat.c	2009-02-14 12:49:46.000000000 +0000
 +++ b/arch/x86/mm/pat.c	2009-02-14 09:16:34.000000000 +0000
@@ -876,57 +878,6 @@
  	help
  	  Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
  	  and the TerraTec Cinergy T USB XE (Rev.1)
---- a/init/do_mounts_rd.c	2009-03-30 19:36:28.000000000 +0100
-+++ b/init/do_mounts_rd.c	2009-03-23 23:12:14.000000000 +0000
-@@ -9,12 +9,7 @@
- #include <linux/string.h>
- 
- #include "do_mounts.h"
--
--#if defined(CONFIG_SQUASHFS3) || defined(CONFIG_SQUASHFS3_MODULE)
--#include "../fs/squashfs3/squashfs3_fs.h"
--#else
- #include "../fs/squashfs/squashfs_fs.h"
--#endif
- 
- int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
- 
-@@ -43,7 +38,6 @@
-  * numbers could not be found.
-  *
-  * We currently check for the following magic numbers:
-- *      squashfs
-  * 	minix
-  * 	ext2
-  *	romfs
---- a/arch/x86/mm/pat.c	2009-03-30 19:36:52.000000000 +0100
-+++ b/arch/x86/mm/pat.c	2009-03-23 23:12:14.000000000 +0000
-@@ -644,21 +641,14 @@
- 	is_ram = pat_pagerange_is_ram(paddr, paddr + size);
- 
- 	/*
--	 * reserve_pfn_range() doesn't support RAM pages. Maintain the current
--	 * behavior with RAM pages by returning success.
-+	 * reserve_pfn_range() doesn't support RAM pages.
- 	 */
--	if (is_ram != 0) {
--		printk(KERN_WARNING "reserve_pfn_range: is_ram is %d for 0x%llx!\n",
--			is_ram, paddr);
--		return 0;
--	}
-+	if (is_ram != 0)
-+		return -EINVAL;
- 
- 	ret = reserve_memtype(paddr, paddr + size, want_flags, &flags);
--	if (ret) {
--		printk(KERN_WARNING "reserve_pfn_range: reserve_memtype ret %d for 0x%llx 0x%lx 0x%lx\n",
--			ret, paddr, size, want_flags);
-+	if (ret)
- 		return ret;
--	}
- 
- 	if (flags != want_flags) {
- 		if (strict_prot || !is_new_memtype_allowed(want_flags, flags)) {
 --- a/arch/x86/pci/i386.c	2009-03-30 19:36:52.000000000 +0100
 +++ b/arch/x86/pci/i386.c	2009-03-23 23:12:14.000000000 +0000
 @@ -319,9 +319,6 @@
@@ -973,3 +924,1261 @@
  		return -EINVAL;
  	}
  
+--- a/include/drm/drm.h	2009-04-10 22:58:41.000000000 +0100
++++ b/include/drm/drm.h	2009-03-23 23:12:14.000000000 +0000
+@@ -36,7 +36,8 @@
+ #ifndef _DRM_H_
+ #define _DRM_H_
+ 
+-#include <linux/types.h>
++#if defined(__KERNEL__)
++#endif
+ #include <asm/ioctl.h>		/* For _IO* macros */
+ #define DRM_IOCTL_NR(n)		_IOC_NR(n)
+ #define DRM_IOC_VOID		_IOC_NONE
+@@ -497,8 +497,8 @@
+  * \sa drmModesetCtl().
+  */
+ struct drm_modeset_ctl {
+-	__u32 crtc;
+-	__u32 cmd;
++	uint32_t crtc;
++	uint32_t cmd;
+ };
+ 
+ /**
+@@ -574,29 +574,29 @@
+ /** DRM_IOCTL_GEM_CLOSE ioctl argument type */
+ struct drm_gem_close {
+ 	/** Handle of the object to be closed. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ };
+ 
+ /** DRM_IOCTL_GEM_FLINK ioctl argument type */
+ struct drm_gem_flink {
+ 	/** Handle for the object being named */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/** Returned global name */
+-	__u32 name;
++	uint32_t name;
+ };
+ 
+ /** DRM_IOCTL_GEM_OPEN ioctl argument type */
+ struct drm_gem_open {
+ 	/** Name of object being opened */
+-	__u32 name;
++	uint32_t name;
+ 
+ 	/** Returned handle for the object */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/** Returned size of the object */
+-	__u64 size;
++	uint64_t size;
+ };
+ 
+ #include "drm_mode.h"
+--- a/include/drm/drm_mode.h	2009-04-10 22:58:41.000000000 +0100
++++ b/include/drm/drm_mode.h	2009-03-23 23:12:14.000000000 +0000
+@@ -27,8 +27,11 @@
+ #ifndef _DRM_MODE_H
+ #define _DRM_MODE_H
+ 
++#if !defined(__KERNEL__) && !defined(_KERNEL)
++#include <stdint.h>
++#else
+ #include <linux/kernel.h>
+-#include <linux/types.h>
++#endif
+ 
+ #define DRM_DISPLAY_INFO_LEN	32
+ #define DRM_CONNECTOR_NAME_LEN	32
+@@ -78,41 +81,41 @@
+ #define DRM_MODE_DITHERING_ON	1
+ 
+ struct drm_mode_modeinfo {
+-	__u32 clock;
+-	__u16 hdisplay, hsync_start, hsync_end, htotal, hskew;
+-	__u16 vdisplay, vsync_start, vsync_end, vtotal, vscan;
++	uint32_t clock;
++	uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew;
++	uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan;
+ 
+-	__u32 vrefresh; /* vertical refresh * 1000 */
++	uint32_t vrefresh; /* vertical refresh * 1000 */
+ 
+-	__u32 flags;
+-	__u32 type;
++	uint32_t flags;
++	uint32_t type;
+ 	char name[DRM_DISPLAY_MODE_LEN];
+ };
+ 
+ struct drm_mode_card_res {
+-	__u64 fb_id_ptr;
+-	__u64 crtc_id_ptr;
+-	__u64 connector_id_ptr;
+-	__u64 encoder_id_ptr;
+-	__u32 count_fbs;
+-	__u32 count_crtcs;
+-	__u32 count_connectors;
+-	__u32 count_encoders;
+-	__u32 min_width, max_width;
+-	__u32 min_height, max_height;
++	uint64_t fb_id_ptr;
++	uint64_t crtc_id_ptr;
++	uint64_t connector_id_ptr;
++	uint64_t encoder_id_ptr;
++	uint32_t count_fbs;
++	uint32_t count_crtcs;
++	uint32_t count_connectors;
++	uint32_t count_encoders;
++	uint32_t min_width, max_width;
++	uint32_t min_height, max_height;
+ };
+ 
+ struct drm_mode_crtc {
+-	__u64 set_connectors_ptr;
+-	__u32 count_connectors;
++	uint64_t set_connectors_ptr;
++	uint32_t count_connectors;
+ 
+-	__u32 crtc_id; /**< Id */
+-	__u32 fb_id; /**< Id of framebuffer */
++	uint32_t crtc_id; /**< Id */
++	uint32_t fb_id; /**< Id of framebuffer */
+ 
+-	__u32 x, y; /**< Position on the frameuffer */
++	uint32_t x, y; /**< Position on the frameuffer */
+ 
+-	__u32 gamma_size;
+-	__u32 mode_valid;
++	uint32_t gamma_size;
++	uint32_t mode_valid;
+ 	struct drm_mode_modeinfo mode;
+ };
+ 
+@@ -123,13 +126,13 @@
+ #define DRM_MODE_ENCODER_TVDAC	4
+ 
+ struct drm_mode_get_encoder {
+-	__u32 encoder_id;
+-	__u32 encoder_type;
++	uint32_t encoder_id;
++	uint32_t encoder_type;
+ 
+-	__u32 crtc_id; /**< Id of crtc */
++	uint32_t crtc_id; /**< Id of crtc */
+ 
+-	__u32 possible_crtcs;
+-	__u32 possible_clones;
++	uint32_t possible_crtcs;
++	uint32_t possible_clones;
+ };
+ 
+ /* This is for connectors with multiple signal types. */
+@@ -158,23 +161,23 @@
+ 
+ struct drm_mode_get_connector {
+ 
+-	__u64 encoders_ptr;
+-	__u64 modes_ptr;
+-	__u64 props_ptr;
+-	__u64 prop_values_ptr;
+-
+-	__u32 count_modes;
+-	__u32 count_props;
+-	__u32 count_encoders;
+-
+-	__u32 encoder_id; /**< Current Encoder */
+-	__u32 connector_id; /**< Id */
+-	__u32 connector_type;
+-	__u32 connector_type_id;
+-
+-	__u32 connection;
+-	__u32 mm_width, mm_height; /**< HxW in millimeters */
+-	__u32 subpixel;
++	uint64_t encoders_ptr;
++	uint64_t modes_ptr;
++	uint64_t props_ptr;
++	uint64_t prop_values_ptr;
++
++	uint32_t count_modes;
++	uint32_t count_props;
++	uint32_t count_encoders;
++
++	uint32_t encoder_id; /**< Current Encoder */
++	uint32_t connector_id; /**< Id */
++	uint32_t connector_type;
++	uint32_t connector_type_id;
++
++	uint32_t connection;
++	uint32_t mm_width, mm_height; /**< HxW in millimeters */
++	uint32_t subpixel;
+ };
+ 
+ #define DRM_MODE_PROP_PENDING	(1<<0)
+@@ -184,46 +187,46 @@
+ #define DRM_MODE_PROP_BLOB	(1<<4)
+ 
+ struct drm_mode_property_enum {
+-	__u64 value;
++	uint64_t value;
+ 	char name[DRM_PROP_NAME_LEN];
+ };
+ 
+ struct drm_mode_get_property {
+-	__u64 values_ptr; /* values and blob lengths */
+-	__u64 enum_blob_ptr; /* enum and blob id ptrs */
++	uint64_t values_ptr; /* values and blob lengths */
++	uint64_t enum_blob_ptr; /* enum and blob id ptrs */
+ 
+-	__u32 prop_id;
+-	__u32 flags;
++	uint32_t prop_id;
++	uint32_t flags;
+ 	char name[DRM_PROP_NAME_LEN];
+ 
+-	__u32 count_values;
+-	__u32 count_enum_blobs;
++	uint32_t count_values;
++	uint32_t count_enum_blobs;
+ };
+ 
+ struct drm_mode_connector_set_property {
+-	__u64 value;
+-	__u32 prop_id;
+-	__u32 connector_id;
++	uint64_t value;
++	uint32_t prop_id;
++	uint32_t connector_id;
+ };
+ 
+ struct drm_mode_get_blob {
+-	__u32 blob_id;
+-	__u32 length;
+-	__u64 data;
++	uint32_t blob_id;
++	uint32_t length;
++	uint64_t data;
+ };
+ 
+ struct drm_mode_fb_cmd {
+-	__u32 fb_id;
+-	__u32 width, height;
+-	__u32 pitch;
+-	__u32 bpp;
+-	__u32 depth;
++	uint32_t fb_id;
++	uint32_t width, height;
++	uint32_t pitch;
++	uint32_t bpp;
++	uint32_t depth;
+ 	/* driver specific handle */
+-	__u32 handle;
++	uint32_t handle;
+ };
+ 
+ struct drm_mode_mode_cmd {
+-	__u32 connector_id;
++	uint32_t connector_id;
+ 	struct drm_mode_modeinfo mode;
+ };
+ 
+@@ -245,24 +248,24 @@
+  *    y
+  */
+ struct drm_mode_cursor {
+-	__u32 flags;
+-	__u32 crtc_id;
+-	__s32 x;
+-	__s32 y;
+-	__u32 width;
+-	__u32 height;
++	uint32_t flags;
++	uint32_t crtc_id;
++	int32_t x;
++	int32_t y;
++	uint32_t width;
++	uint32_t height;
+ 	/* driver specific handle */
+-	__u32 handle;
++	uint32_t handle;
+ };
+ 
+ struct drm_mode_crtc_lut {
+-	__u32 crtc_id;
+-	__u32 gamma_size;
++	uint32_t crtc_id;
++	uint32_t gamma_size;
+ 
+ 	/* pointers to arrays */
+-	__u64 red;
+-	__u64 green;
+-	__u64 blue;
++	uint64_t red;
++	uint64_t green;
++	uint64_t blue;
+ };
+ 
+ #endif
+--- a/include/drm/i915_drm.h	2009-04-10 22:58:41.000000000 +0100
++++ b/include/drm/i915_drm.h	2009-03-23 23:12:14.000000000 +0000
+@@ -30,7 +30,7 @@
+ /* Please note that modifications to all structs defined here are
+  * subject to backwards-compatibility constraints.
+  */
+-#include <linux/types.h>
++
+ #include "drm.h"
+ 
+ /* Each region is a minimum of 16k, and there are at most 255 of them.
+@@ -116,15 +116,15 @@
+ 
+ 	/* fill out some space for old userspace triple buffer */
+ 	drm_handle_t unused_handle;
+-	__u32 unused1, unused2, unused3;
++	uint32_t unused1, unused2, unused3;
+ 
+ 	/* buffer object handles for static buffers. May change
+ 	 * over the lifetime of the client.
+ 	 */
+-	__u32 front_bo_handle;
+-	__u32 back_bo_handle;
+-	__u32 unused_bo_handle;
+-	__u32 depth_bo_handle;
++	uint32_t front_bo_handle;
++	uint32_t back_bo_handle;
++	uint32_t unused_bo_handle;
++	uint32_t depth_bo_handle;
+ 
+ } drm_i915_sarea_t;
+ 
+@@ -327,7 +327,7 @@
+ } drm_i915_vblank_swap_t;
+ 
+ typedef struct drm_i915_hws_addr {
+-	__u64 addr;
++	uint64_t addr;
+ } drm_i915_hws_addr_t;
+ 
+ struct drm_i915_gem_init {
+@@ -335,12 +335,12 @@
+ 	 * Beginning offset in the GTT to be managed by the DRM memory
+ 	 * manager.
+ 	 */
+-	__u64 gtt_start;
++	uint64_t gtt_start;
+ 	/**
+ 	 * Ending offset in the GTT to be managed by the DRM memory
+ 	 * manager.
+ 	 */
+-	__u64 gtt_end;
++	uint64_t gtt_end;
+ };
+ 
+ struct drm_i915_gem_create {
+@@ -349,94 +349,94 @@
+ 	 *
+ 	 * The (page-aligned) allocated size for the object will be returned.
+ 	 */
+-	__u64 size;
++	uint64_t size;
+ 	/**
+ 	 * Returned handle for the object.
+ 	 *
+ 	 * Object handles are nonzero.
+ 	 */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ };
+ 
+ struct drm_i915_gem_pread {
+ 	/** Handle for the object being read. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ 	/** Offset into the object to read from */
+-	__u64 offset;
++	uint64_t offset;
+ 	/** Length of data to read */
+-	__u64 size;
++	uint64_t size;
+ 	/**
+ 	 * Pointer to write the data into.
+ 	 *
+ 	 * This is a fixed-size type for 32/64 compatibility.
+ 	 */
+-	__u64 data_ptr;
++	uint64_t data_ptr;
+ };
+ 
+ struct drm_i915_gem_pwrite {
+ 	/** Handle for the object being written to. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ 	/** Offset into the object to write to */
+-	__u64 offset;
++	uint64_t offset;
+ 	/** Length of data to write */
+-	__u64 size;
++	uint64_t size;
+ 	/**
+ 	 * Pointer to read the data from.
+ 	 *
+ 	 * This is a fixed-size type for 32/64 compatibility.
+ 	 */
+-	__u64 data_ptr;
++	uint64_t data_ptr;
+ };
+ 
+ struct drm_i915_gem_mmap {
+ 	/** Handle for the object being mapped. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ 	/** Offset in the object to map. */
+-	__u64 offset;
++	uint64_t offset;
+ 	/**
+ 	 * Length of data to map.
+ 	 *
+ 	 * The value will be page-aligned.
+ 	 */
+-	__u64 size;
++	uint64_t size;
+ 	/**
+ 	 * Returned pointer the data was mapped at.
+ 	 *
+ 	 * This is a fixed-size type for 32/64 compatibility.
+ 	 */
+-	__u64 addr_ptr;
++	uint64_t addr_ptr;
+ };
+ 
+ struct drm_i915_gem_mmap_gtt {
+ 	/** Handle for the object being mapped. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ 	/**
+ 	 * Fake offset to use for subsequent mmap call
+ 	 *
+ 	 * This is a fixed-size type for 32/64 compatibility.
+ 	 */
+-	__u64 offset;
++	uint64_t offset;
+ };
+ 
+ struct drm_i915_gem_set_domain {
+ 	/** Handle for the object */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/** New read domains */
+-	__u32 read_domains;
++	uint32_t read_domains;
+ 
+ 	/** New write domain */
+-	__u32 write_domain;
++	uint32_t write_domain;
+ };
+ 
+ struct drm_i915_gem_sw_finish {
+ 	/** Handle for the object */
+-	__u32 handle;
++	uint32_t handle;
+ };
+ 
+ struct drm_i915_gem_relocation_entry {
+@@ -448,16 +448,16 @@
+ 	 * a relocation list for state buffers and not re-write it per
+ 	 * exec using the buffer.
+ 	 */
+-	__u32 target_handle;
++	uint32_t target_handle;
+ 
+ 	/**
+ 	 * Value to be added to the offset of the target buffer to make up
+ 	 * the relocation entry.
+ 	 */
+-	__u32 delta;
++	uint32_t delta;
+ 
+ 	/** Offset in the buffer the relocation entry will be written into */
+-	__u64 offset;
++	uint64_t offset;
+ 
+ 	/**
+ 	 * Offset value of the target buffer that the relocation entry was last
+@@ -467,12 +467,12 @@
+ 	 * and writing the relocation.  This value is written back out by
+ 	 * the execbuffer ioctl when the relocation is written.
+ 	 */
+-	__u64 presumed_offset;
++	uint64_t presumed_offset;
+ 
+ 	/**
+ 	 * Target memory domains read by this operation.
+ 	 */
+-	__u32 read_domains;
++	uint32_t read_domains;
+ 
+ 	/**
+ 	 * Target memory domains written by this operation.
+@@ -481,7 +481,7 @@
+ 	 * execbuffer operation, so that where there are conflicts,
+ 	 * the application will get -EINVAL back.
+ 	 */
+-	__u32 write_domain;
++	uint32_t write_domain;
+ };
+ 
+ /** @{
+@@ -512,24 +512,24 @@
+ 	 * User's handle for a buffer to be bound into the GTT for this
+ 	 * operation.
+ 	 */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/** Number of relocations to be performed on this buffer */
+-	__u32 relocation_count;
++	uint32_t relocation_count;
+ 	/**
+ 	 * Pointer to array of struct drm_i915_gem_relocation_entry containing
+ 	 * the relocations to be performed in this buffer.
+ 	 */
+-	__u64 relocs_ptr;
++	uint64_t relocs_ptr;
+ 
+ 	/** Required alignment in graphics aperture */
+-	__u64 alignment;
++	uint64_t alignment;
+ 
+ 	/**
+ 	 * Returned value of the updated offset of the object, for future
+ 	 * presumed_offset writes.
+ 	 */
+-	__u64 offset;
++	uint64_t offset;
+ };
+ 
+ struct drm_i915_gem_execbuffer {
+@@ -543,44 +543,44 @@
+ 	 * a buffer is performing refer to buffers that have already appeared
+ 	 * in the validate list.
+ 	 */
+-	__u64 buffers_ptr;
+-	__u32 buffer_count;
++	uint64_t buffers_ptr;
++	uint32_t buffer_count;
+ 
+ 	/** Offset in the batchbuffer to start execution from. */
+-	__u32 batch_start_offset;
++	uint32_t batch_start_offset;
+ 	/** Bytes used in batchbuffer from batch_start_offset */
+-	__u32 batch_len;
+-	__u32 DR1;
+-	__u32 DR4;
+-	__u32 num_cliprects;
++	uint32_t batch_len;
++	uint32_t DR1;
++	uint32_t DR4;
++	uint32_t num_cliprects;
+ 	/** This is a struct drm_clip_rect *cliprects */
+-	__u64 cliprects_ptr;
++	uint64_t cliprects_ptr;
+ };
+ 
+ struct drm_i915_gem_pin {
+ 	/** Handle of the buffer to be pinned. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ 
+ 	/** alignment required within the aperture */
+-	__u64 alignment;
++	uint64_t alignment;
+ 
+ 	/** Returned GTT offset of the buffer. */
+-	__u64 offset;
++	uint64_t offset;
+ };
+ 
+ struct drm_i915_gem_unpin {
+ 	/** Handle of the buffer to be unpinned. */
+-	__u32 handle;
+-	__u32 pad;
++	uint32_t handle;
++	uint32_t pad;
+ };
+ 
+ struct drm_i915_gem_busy {
+ 	/** Handle of the buffer to check for busy */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/** Return busy status (1 if busy, 0 if idle) */
+-	__u32 busy;
++	uint32_t busy;
+ };
+ 
+ #define I915_TILING_NONE	0
+@@ -597,7 +597,7 @@
+ 
+ struct drm_i915_gem_set_tiling {
+ 	/** Handle of the buffer to have its tiling state updated */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/**
+ 	 * Tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
+@@ -611,47 +611,47 @@
+ 	 *
+ 	 * Buffer contents become undefined when changing tiling_mode.
+ 	 */
+-	__u32 tiling_mode;
++	uint32_t tiling_mode;
+ 
+ 	/**
+ 	 * Stride in bytes for the object when in I915_TILING_X or
+ 	 * I915_TILING_Y.
+ 	 */
+-	__u32 stride;
++	uint32_t stride;
+ 
+ 	/**
+ 	 * Returned address bit 6 swizzling required for CPU access through
+ 	 * mmap mapping.
+ 	 */
+-	__u32 swizzle_mode;
++	uint32_t swizzle_mode;
+ };
+ 
+ struct drm_i915_gem_get_tiling {
+ 	/** Handle of the buffer to get tiling state for. */
+-	__u32 handle;
++	uint32_t handle;
+ 
+ 	/**
+ 	 * Current tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
+ 	 * I915_TILING_Y).
+ 	 */
+-	__u32 tiling_mode;
++	uint32_t tiling_mode;
+ 
+ 	/**
+ 	 * Returned address bit 6 swizzling required for CPU access through
+ 	 * mmap mapping.
+ 	 */
+-	__u32 swizzle_mode;
++	uint32_t swizzle_mode;
+ };
+ 
+ struct drm_i915_gem_get_aperture {
+ 	/** Total size of the aperture used by i915_gem_execbuffer, in bytes */
+-	__u64 aper_size;
++	uint64_t aper_size;
+ 
+ 	/**
+ 	 * Available space in the aperture used by i915_gem_execbuffer, in
+ 	 * bytes
+ 	 */
+-	__u64 aper_available_size;
++	uint64_t aper_available_size;
+ };
+ 
+ #endif				/* _I915_DRM_H_ */
+--- a/include/drm/mga_drm.h	2009-04-10 22:58:41.000000000 +0100
++++ b/include/drm/mga_drm.h	2009-03-23 23:12:14.000000000 +0000
+@@ -35,8 +35,6 @@
+ #ifndef __MGA_DRM_H__
+ #define __MGA_DRM_H__
+ 
+-#include <linux/types.h>
+-
+ /* WARNING: If you change any of these defines, make sure to change the
+  * defines in the Xserver file (mga_sarea.h)
+  */
+@@ -257,8 +255,8 @@
+ #define DRM_IOCTL_MGA_ILOAD    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_ILOAD, drm_mga_iload_t)
+ #define DRM_IOCTL_MGA_BLIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_BLIT, drm_mga_blit_t)
+ #define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_GETPARAM, drm_mga_getparam_t)
+-#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, __u32)
+-#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, __u32)
++#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, uint32_t)
++#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, uint32_t)
+ #define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
+ 
+ typedef struct _drm_mga_warp_index {
+@@ -312,7 +310,7 @@
+ 	 */
+ 	/*@{ */
+ 	unsigned long texture_handle; /**< Handle used to map AGP textures. */
+-	__u32 texture_size;	      /**< Size of the AGP texture region. */
++	uint32_t texture_size;	      /**< Size of the AGP texture region. */
+ 	/*@} */
+ 
+ 	/**
+@@ -321,7 +319,7 @@
+ 	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
+ 	 * filled in with the actual AGP mode.  If AGP was not available
+ 	 */
+-	__u32 primary_size;
++	uint32_t primary_size;
+ 
+ 	/**
+ 	 * Requested number of secondary DMA buffers.
+@@ -331,7 +329,7 @@
+ 	 * allocated.  Particularly when PCI DMA is used, this may be
+ 	 * (subtantially) less than the number requested.
+ 	 */
+-	__u32 secondary_bin_count;
++	uint32_t secondary_bin_count;
+ 
+ 	/**
+ 	 * Requested size of each secondary DMA buffer.
+@@ -340,7 +338,7 @@
+ 	 * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
+ 	 * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
+ 	 */
+-	__u32 secondary_bin_size;
++	uint32_t secondary_bin_size;
+ 
+ 	/**
+ 	 * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
+@@ -352,12 +350,12 @@
+ 	 * filled in with the actual AGP mode.  If AGP was not available
+ 	 * (i.e., PCI DMA was used), this value will be zero.
+ 	 */
+-	__u32 agp_mode;
++	uint32_t agp_mode;
+ 
+ 	/**
+ 	 * Desired AGP GART size, measured in megabytes.
+ 	 */
+-	__u8 agp_size;
++	uint8_t agp_size;
+ } drm_mga_dma_bootstrap_t;
+ 
+ typedef struct drm_mga_clear {
+--- a/include/drm/radeon_drm.h	2009-04-10 22:58:41.000000000 +0100
++++ b/include/drm/radeon_drm.h	2009-03-23 23:12:14.000000000 +0000
+@@ -33,8 +33,6 @@
+ #ifndef __RADEON_DRM_H__
+ #define __RADEON_DRM_H__
+ 
+-#include <linux/types.h>
+-
+ /* WARNING: If you change any of these defines, make sure to change the
+  * defines in the X server file (radeon_sarea.h)
+  */
+@@ -749,7 +722,7 @@
+ 
+ typedef struct drm_radeon_setparam {
+ 	unsigned int param;
+-	__s64 value;
++	int64_t value;
+ } drm_radeon_setparam_t;
+ 
+ #define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
+--- a/include/drm/via_drm.h	2009-04-10 22:58:41.000000000 +0100
++++ b/include/drm/via_drm.h	2009-03-23 23:12:14.000000000 +0000
+@@ -24,8 +24,6 @@
+ #ifndef _VIA_DRM_H_
+ #define _VIA_DRM_H_
+ 
+-#include <linux/types.h>
+-
+ /* WARNING: These defines must be the same as what the Xserver uses.
+  * if you change them, you must change the defines in the Xserver.
+  */
+@@ -116,19 +114,19 @@
+ #define VIA_MEM_UNKNOWN 4
+ 
+ typedef struct {
+-	__u32 offset;
+-	__u32 size;
++	uint32_t offset;
++	uint32_t size;
+ } drm_via_agp_t;
+ 
+ typedef struct {
+-	__u32 offset;
+-	__u32 size;
++	uint32_t offset;
++	uint32_t size;
+ } drm_via_fb_t;
+ 
+ typedef struct {
+-	__u32 context;
+-	__u32 type;
+-	__u32 size;
++	uint32_t context;
++	uint32_t type;
++	uint32_t size;
+ 	unsigned long index;
+ 	unsigned long offset;
+ } drm_via_mem_t;
+@@ -150,9 +148,9 @@
+ 		VIA_FUTEX_WAIT = 0x00,
+ 		VIA_FUTEX_WAKE = 0X01
+ 	} func;
+-	__u32 ms;
+-	__u32 lock;
+-	__u32 val;
++	uint32_t ms;
++	uint32_t lock;
++	uint32_t val;
+ } drm_via_futex_t;
+ 
+ typedef struct _drm_via_dma_init {
+@@ -213,7 +211,7 @@
+ 		VIA_CMDBUF_LAG = 0x02
+ 	} func;
+ 	int wait;
+-	__u32 size;
++	uint32_t size;
+ } drm_via_cmdbuf_size_t;
+ 
+ typedef enum {
+@@ -238,8 +236,8 @@
+ struct drm_via_wait_irq_request {
+ 	unsigned irq;
+ 	via_irq_seq_type_t type;
+-	__u32 sequence;
+-	__u32 signal;
++	uint32_t sequence;
++	uint32_t signal;
+ };
+ 
+ typedef union drm_via_irqwait {
+@@ -248,7 +246,7 @@
+ } drm_via_irqwait_t;
+ 
+ typedef struct drm_via_blitsync {
+-	__u32 sync_handle;
++	uint32_t sync_handle;
+ 	unsigned engine;
+ } drm_via_blitsync_t;
+ 
+@@ -259,16 +257,16 @@
+  */
+ 
+ typedef struct drm_via_dmablit {
+-	__u32 num_lines;
+-	__u32 line_length;
++	uint32_t num_lines;
++	uint32_t line_length;
+ 
+-	__u32 fb_addr;
+-	__u32 fb_stride;
++	uint32_t fb_addr;
++	uint32_t fb_stride;
+ 
+ 	unsigned char *mem_addr;
+-	__u32 mem_stride;
++	uint32_t mem_stride;
+ 
+-	__u32 flags;
++	uint32_t flags;
+ 	int to_fb;
+ 
+ 	drm_via_blitsync_t sync;
+--- a/include/linux/dvb/audio.h	2009-04-10 22:58:42.000000000 +0100
++++ b/include/linux/dvb/audio.h	2009-03-23 23:12:14.000000000 +0000
+@@ -76,7 +76,7 @@
+ } audio_karaoke_t;     /* into left and right  */
+ 
+ 
+-typedef __u16 audio_attributes_t;
++typedef uint16_t audio_attributes_t;
+ /*   bits: descr. */
+ /*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
+ /*   12    multichannel extension */
+diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
+index 26c536b..d313039 100644
+--- a/drivers/pci/dmar.c
++++ b/drivers/pci/dmar.c
+@@ -31,8 +31,6 @@
+ #include <linux/iova.h>
+ #include <linux/intel-iommu.h>
+ #include <linux/timer.h>
+-#include <linux/irq.h>
+-#include <linux/interrupt.h>
+ 
+ #undef PREFIX
+ #define PREFIX "DMAR:"
+diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
+index f3f6865..49402c3 100644
+--- a/drivers/pci/intel-iommu.c
++++ b/drivers/pci/intel-iommu.c
+@@ -1004,6 +1004,194 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
+ 	return 0;
+ }
+ 
++/* iommu interrupt handling. Most stuff are MSI-like. */
++
++static const char *fault_reason_strings[] =
++{
++	"Software",
++	"Present bit in root entry is clear",
++	"Present bit in context entry is clear",
++	"Invalid context entry",
++	"Access beyond MGAW",
++	"PTE Write access is not set",
++	"PTE Read access is not set",
++	"Next page table ptr is invalid",
++	"Root table address invalid",
++	"Context table ptr is invalid",
++	"non-zero reserved fields in RTP",
++	"non-zero reserved fields in CTP",
++	"non-zero reserved fields in PTE",
++};
++#define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
++
++const char *dmar_get_fault_reason(u8 fault_reason)
++{
++	if (fault_reason > MAX_FAULT_REASON_IDX)
++		return "Unknown";
++	else
++		return fault_reason_strings[fault_reason];
++}
++
++void dmar_msi_unmask(unsigned int irq)
++{
++	struct intel_iommu *iommu = get_irq_data(irq);
++	unsigned long flag;
++
++	/* unmask it */
++	spin_lock_irqsave(&iommu->register_lock, flag);
++	writel(0, iommu->reg + DMAR_FECTL_REG);
++	/* Read a reg to force flush the post write */
++	readl(iommu->reg + DMAR_FECTL_REG);
++	spin_unlock_irqrestore(&iommu->register_lock, flag);
++}
++
++void dmar_msi_mask(unsigned int irq)
++{
++	unsigned long flag;
++	struct intel_iommu *iommu = get_irq_data(irq);
++
++	/* mask it */
++	spin_lock_irqsave(&iommu->register_lock, flag);
++	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
++	/* Read a reg to force flush the post write */
++	readl(iommu->reg + DMAR_FECTL_REG);
++	spin_unlock_irqrestore(&iommu->register_lock, flag);
++}
++
++void dmar_msi_write(int irq, struct msi_msg *msg)
++{
++	struct intel_iommu *iommu = get_irq_data(irq);
++	unsigned long flag;
++
++	spin_lock_irqsave(&iommu->register_lock, flag);
++	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
++	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
++	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
++	spin_unlock_irqrestore(&iommu->register_lock, flag);
++}
++
++void dmar_msi_read(int irq, struct msi_msg *msg)
++{
++	struct intel_iommu *iommu = get_irq_data(irq);
++	unsigned long flag;
++
++	spin_lock_irqsave(&iommu->register_lock, flag);
++	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
++	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
++	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
++	spin_unlock_irqrestore(&iommu->register_lock, flag);
++}
++
++static int iommu_page_fault_do_one(struct intel_iommu *iommu, int type,
++		u8 fault_reason, u16 source_id, unsigned long long addr)
++{
++	const char *reason;
++
++	reason = dmar_get_fault_reason(fault_reason);
++
++	printk(KERN_ERR
++		"DMAR:[%s] Request device [%02x:%02x.%d] "
++		"fault addr %llx \n"
++		"DMAR:[fault reason %02d] %s\n",
++		(type ? "DMA Read" : "DMA Write"),
++		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
++		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
++	return 0;
++}
++
++#define PRIMARY_FAULT_REG_LEN (16)
++static irqreturn_t iommu_page_fault(int irq, void *dev_id)
++{
++	struct intel_iommu *iommu = dev_id;
++	int reg, fault_index;
++	u32 fault_status;
++	unsigned long flag;
++
++	spin_lock_irqsave(&iommu->register_lock, flag);
++	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
++
++	/* TBD: ignore advanced fault log currently */
++	if (!(fault_status & DMA_FSTS_PPF))
++		goto clear_overflow;
++
++	fault_index = dma_fsts_fault_record_index(fault_status);
++	reg = cap_fault_reg_offset(iommu->cap);
++	while (1) {
++		u8 fault_reason;
++		u16 source_id;
++		u64 guest_addr;
++		int type;
++		u32 data;
++
++		/* highest 32 bits */
++		data = readl(iommu->reg + reg +
++				fault_index * PRIMARY_FAULT_REG_LEN + 12);
++		if (!(data & DMA_FRCD_F))
++			break;
++
++		fault_reason = dma_frcd_fault_reason(data);
++		type = dma_frcd_type(data);
++
++		data = readl(iommu->reg + reg +
++				fault_index * PRIMARY_FAULT_REG_LEN + 8);
++		source_id = dma_frcd_source_id(data);
++
++		guest_addr = dmar_readq(iommu->reg + reg +
++				fault_index * PRIMARY_FAULT_REG_LEN);
++		guest_addr = dma_frcd_page_addr(guest_addr);
++		/* clear the fault */
++		writel(DMA_FRCD_F, iommu->reg + reg +
++			fault_index * PRIMARY_FAULT_REG_LEN + 12);
++
++		spin_unlock_irqrestore(&iommu->register_lock, flag);
++
++		iommu_page_fault_do_one(iommu, type, fault_reason,
++				source_id, guest_addr);
++
++		fault_index++;
++		if (fault_index > cap_num_fault_regs(iommu->cap))
++			fault_index = 0;
++		spin_lock_irqsave(&iommu->register_lock, flag);
++	}
++clear_overflow:
++	/* clear primary fault overflow */
++	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
++	if (fault_status & DMA_FSTS_PFO)
++		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
++
++	spin_unlock_irqrestore(&iommu->register_lock, flag);
++	return IRQ_HANDLED;
++}
++
++int dmar_set_interrupt(struct intel_iommu *iommu)
++{
++	int irq, ret;
++
++	irq = create_irq();
++	if (!irq) {
++		printk(KERN_ERR "IOMMU: no free vectors\n");
++		return -EINVAL;
++	}
++
++	set_irq_data(irq, iommu);
++	iommu->irq = irq;
++
++	ret = arch_setup_dmar_msi(irq);
++	if (ret) {
++		set_irq_data(irq, NULL);
++		iommu->irq = 0;
++		destroy_irq(irq);
++		return 0;
++	}
++
++	/* Force fault register is cleared */
++	iommu_page_fault(irq, iommu);
++
++	ret = request_irq(irq, iommu_page_fault, 0, iommu->name, iommu);
++	if (ret)
++		printk(KERN_ERR "IOMMU: can't request irq\n");
++	return ret;
++}
+ 
+ static int iommu_init_domains(struct intel_iommu *iommu)
+ {
+@@ -1855,40 +2043,11 @@ static int __init init_dmars(void)
+ 		}
+ 	}
+ 
+-	/*
+-	 * Start from the sane iommu hardware state.
+-	 */
+ 	for_each_drhd_unit(drhd) {
+ 		if (drhd->ignored)
+ 			continue;
+ 
+ 		iommu = drhd->iommu;
+-
+-		/*
+-		 * If the queued invalidation is already initialized by us
+-		 * (for example, while enabling interrupt-remapping) then
+-		 * we got the things already rolling from a sane state.
+-		 */
+-		if (iommu->qi)
+-			continue;
+-
+-		/*
+-		 * Clear any previous faults.
+-		 */
+-		dmar_fault(-1, iommu);
+-		/*
+-		 * Disable queued invalidation if supported and already enabled
+-		 * before OS handover.
+-		 */
+-		dmar_disable_qi(iommu);
+-	}
+-
+-	for_each_drhd_unit(drhd) {
+-		if (drhd->ignored)
+-			continue;
+-
+-		iommu = drhd->iommu;
+-
+ 		if (dmar_enable_qi(iommu)) {
+ 			/*
+ 			 * Queued Invalidate not enabled, use Register Based
+diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
+index 45effc5..b041a40 100644
+--- a/drivers/pci/intr_remapping.c
++++ b/drivers/pci/intr_remapping.c
+@@ -467,55 +458,11 @@ static int setup_intr_remapping(struct intel_iommu *iommu, int mode)
+ 	return 0;
+ }
+ 
+-/*
+- * Disable Interrupt Remapping.
+- */
+-static void disable_intr_remapping(struct intel_iommu *iommu)
+-{
+-	unsigned long flags;
+-	u32 sts;
+-
+-	if (!ecap_ir_support(iommu->ecap))
+-		return;
+-
+-	spin_lock_irqsave(&iommu->register_lock, flags);
+-
+-	sts = dmar_readq(iommu->reg + DMAR_GSTS_REG);
+-	if (!(sts & DMA_GSTS_IRES))
+-		goto end;
+-
+-	iommu->gcmd &= ~DMA_GCMD_IRE;
+-	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+-
+-	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+-		      readl, !(sts & DMA_GSTS_IRES), sts);
+-
+-end:
+-	spin_unlock_irqrestore(&iommu->register_lock, flags);
+-}
+-
+ int __init enable_intr_remapping(int eim)
+ {
+ 	struct dmar_drhd_unit *drhd;
+ 	int setup = 0;
+ 
+-	for_each_drhd_unit(drhd) {
+-		struct intel_iommu *iommu = drhd->iommu;
+-
+-		/*
+-		 * Clear previous faults.
+-		 */
+-		dmar_fault(-1, iommu);
+-
+-		/*
+-		 * Disable intr remapping and queued invalidation, if already
+-		 * enabled prior to OS handover.
+-		 */
+-		disable_intr_remapping(iommu);
+-
+-		dmar_disable_qi(iommu);
+-	}
+-
+ 	/*
+ 	 * check for the Interrupt-remapping support
+ 	 */
+--- a/include/linux/dmar.h	2009-04-11 17:05:51.000000000 +0100
++++ b/include/linux/dmar.h	2009-03-23 23:12:14.000000000 +0000
+@@ -24,7 +24,6 @@
+ #include <linux/acpi.h>
+ #include <linux/types.h>
+ #include <linux/msi.h>
+-#include <linux/irqreturn.h>
+ 
+ #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
+ struct intel_iommu;
+@@ -136,7 +127,6 @@
+ extern void dmar_msi_read(int irq, struct msi_msg *msg);
+ extern void dmar_msi_write(int irq, struct msi_msg *msg);
+ extern int dmar_set_interrupt(struct intel_iommu *iommu);
+-extern irqreturn_t dmar_fault(int irq, void *dev_id);
+ extern int arch_setup_dmar_msi(unsigned int irq);
+ 
+ extern int iommu_detected, no_iommu;
+--- a/include/linux/intel-iommu.h	2009-04-11 17:05:51.000000000 +0100
++++ b/include/linux/intel-iommu.h	2009-03-23 23:12:14.000000000 +0000
+@@ -331,8 +321,6 @@
+ extern int alloc_iommu(struct dmar_drhd_unit *drhd);
+ extern void free_iommu(struct intel_iommu *iommu);
+ extern int dmar_enable_qi(struct intel_iommu *iommu);
+-extern void dmar_disable_qi(struct intel_iommu *iommu);
+-extern int dmar_reenable_qi(struct intel_iommu *iommu);
+ extern void qi_global_iec(struct intel_iommu *iommu);
+ 
+ extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
+--- linux.temp/kernel/sched.c	2009-04-14 21:42:33.000000000 +0100
++++ vanilla-2.6.29/kernel/sched.c	2009-03-23 23:12:14.000000000 +0000
+@@ -4134,25 +4134,9 @@
+ EXPORT_PER_CPU_SYMBOL(kstat);
+ 
+ /*
+- * Return any ns on the sched_clock that have not yet been accounted in
++ * Return any ns on the sched_clock that have not yet been banked in
+  * @p in case that task is currently running.
+- *
+- * Called with task_rq_lock() held on @rq.
+  */
+-static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
+-{
+-	u64 ns = 0;
+-
+-	if (task_current(rq, p)) {
+-		update_rq_clock(rq);
+-		ns = rq->clock - p->se.exec_start;
+-		if ((s64)ns < 0)
+-			ns = 0;
+-	}
+-
+-	return ns;
+-}
+-
+ unsigned long long task_delta_exec(struct task_struct *p)
+ {
+ 	unsigned long flags;


--- dma-api-debug-fixes.patch DELETED ---


--- linux-2.6-debug-dma-api.patch DELETED ---


--- linux-2.6-net-fix-gro-bug.patch DELETED ---


--- linux-2.6-net-xfrm-fix-spin-unlock.patch DELETED ---


--- linux-2.6.29-pat-fixes.patch DELETED ---


--- squashfs-fixups.patch DELETED ---


--- squashfs3.patch DELETED ---



From jkratoch at fedoraproject.org  Tue Apr 14 22:18:29 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 14 Apr 2009 22:18:29 +0000 (UTC)
Subject: rpms/gdb/devel gdb-c_get_string-xfree.patch, NONE, 1.1 gdb.spec,
	1.342, 1.343
Message-ID: <20090414221830.0CE7F700B2@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14888

Modified Files:
	gdb.spec 
Added Files:
	gdb-c_get_string-xfree.patch 
Log Message:
* Wed Apr 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-19
- Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).


gdb-c_get_string-xfree.patch:

--- NEW FILE gdb-c_get_string-xfree.patch ---
http://sourceware.org/ml/gdb-patches/2009-04/msg00284.html
http://sourceware.org/ml/gdb-cvs/2009-04/msg00077.html
http://sourceware.org/ml/archer/2009-q2/msg00049.html

gdb/
2009-04-14  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* c-lang.c (c_get_string): Fix xfree crash on a failed string read.

gdb/testsuite/
2009-04-14  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.python/python-prettyprint.c: Include <string.h>.
	(struct nullstr): New.
	(main): New variable `nullstr'.  Clear it.
	* gdb.python/python-prettyprint.exp (run_lang_tests): Test `nullstr'.
	* gdb.python/python-prettyprint.py (class pp_nullstr): New.
	(register_pretty_printers): Register `pp_nullstr'.

--- src/gdb/c-lang.c	2009/03/21 00:46:17	1.63
+++ src/gdb/c-lang.c	2009/04/14 21:54:33	1.64
@@ -657,7 +657,7 @@
 			 buffer, length);
       if (err)
 	{
-	  xfree (buffer);
+	  xfree (*buffer);
 	  error (_("Error reading string from inferior: %s"),
 		 safe_strerror (err));
 	}
diff --git a/gdb/testsuite/gdb.python/python-prettyprint.c b/gdb/testsuite/gdb.python/python-prettyprint.c
index 399be23..0d9110d 100644
--- a/gdb/testsuite/gdb.python/python-prettyprint.c
+++ b/gdb/testsuite/gdb.python/python-prettyprint.c
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include <string.h>
+
 struct s
 {
   int a;
@@ -143,6 +145,11 @@ void do_nothing(void)
   c = 23;			/* Another MI breakpoint */
 }
 
+struct nullstr
+{
+  char *s;
+};
+
 int
 main ()
 {
@@ -151,10 +158,13 @@ main ()
   string x = make_string ("this is x");
   zzz_type c = make_container ("container");
   const struct string_repr cstring = { { "const string" } };
+  /* Clearing by being `static' could invoke an other GDB C++ bug.  */
+  struct nullstr nullstr;
 
   init_ss(&ss, 1, 2);
   init_ss(ssa+0, 3, 4);
   init_ss(ssa+1, 5, 6);
+  memset (&nullstr, 0, sizeof nullstr);
 
 #ifdef __cplusplus
   S cps;
diff --git a/gdb/testsuite/gdb.python/python-prettyprint.exp b/gdb/testsuite/gdb.python/python-prettyprint.exp
index f83b1cd..907dcfd 100644
--- a/gdb/testsuite/gdb.python/python-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/python-prettyprint.exp
@@ -85,6 +85,8 @@ proc run_lang_tests {lang} {
 
     gdb_test "print c" " = container $hex \"container\" with 2 elements = {$nl *.0. = 23,$nl *.1. = 72$nl}"
 
+    gdb_test "print nullstr" "RuntimeError: Error reading string from inferior.*"
+
     gdb_test "continue" "Program exited normally\."
 }
 
diff --git a/gdb/testsuite/gdb.python/python-prettyprint.py b/gdb/testsuite/gdb.python/python-prettyprint.py
index a53e412..82e5331 100644
--- a/gdb/testsuite/gdb.python/python-prettyprint.py
+++ b/gdb/testsuite/gdb.python/python-prettyprint.py
@@ -92,6 +92,13 @@ class pp_vbase1:
     def to_string (self):
         return "pp class name: " + self.val.type.tag
 
+class pp_nullstr:
+    def __init__(self, val):
+        self.val = val
+
+    def to_string(self):
+        return self.val['s'].string(gdb.parameter('target-charset'))
+
 def lookup_function (val):
     "Look-up and return a pretty-printer that can print val."
 
@@ -135,6 +142,9 @@ def register_pretty_printers ():
     
     pretty_printers_dict[re.compile ('^VirtualTest$')] =  pp_multiple_virtual
     pretty_printers_dict[re.compile ('^Vbase1$')] =  pp_vbase1
+
+    pretty_printers_dict[re.compile ('^struct nullstr$')] = pp_nullstr
+    pretty_printers_dict[re.compile ('^nullstr$')] = pp_nullstr
     
     # Note that we purposely omit the typedef names here.
     # Printer lookup is based on canonical name.


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- gdb.spec	13 Apr 2009 21:25:31 -0000	1.342
+++ gdb.spec	14 Apr 2009 22:17:59 -0000	1.343
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 18%{?_with_upstream:.upstream}%{?dist}
+Release: 19%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -375,6 +375,9 @@
 # - Turn on 64-bit BFD support, globally enable AC_SYS_LARGEFILE.
 Patch352: gdb-6.8-bz457187-largefile.patch
 
+# Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
+Patch357: gdb-c_get_string-xfree.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -569,6 +572,7 @@
 %patch343 -p1
 %patch348 -p1
 %patch352 -p1
+%patch357 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -851,6 +855,9 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-19
+- Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
+
 * Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-18
 - Archer update to the snapshot: d1fee5066408a09423621d1ebc64e6d3e248ed08
 - Archer backport: 4854339f75bdaf4b228fc35579bddbb2a1fecdc1



From orion at fedoraproject.org  Tue Apr 14 22:20:19 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 14 Apr 2009 22:20:19 +0000 (UTC)
Subject: rpms/openoffice.org-extendedPDF/F-10
	openoffice.org-extendedPDF-1.4.0-oooVersion.patch, NONE, 1.1
Message-ID: <20090414222019.DAE8A700B2@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/openoffice.org-extendedPDF/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15614

Added Files:
	openoffice.org-extendedPDF-1.4.0-oooVersion.patch 
Log Message:
Add the patch

openoffice.org-extendedPDF-1.4.0-oooVersion.patch:

--- NEW FILE openoffice.org-extendedPDF-1.4.0-oooVersion.patch ---
--- extendedPDF/pdfm.xba.oooVersion	2006-08-11 10:51:02.000000000 -0600
+++ extendedPDF/pdfm.xba	2009-04-14 15:58:53.000000000 -0600
@@ -332,7 +332,7 @@
 	
 	&apos; Subject property changes between OOo 1 and 2. Use of GetSolarVersion
 	&apos; fix by James Holgate.
-	if GetSolarVersion &lt; 646 then &apos;openoffice.org version 1.x.x or equivalent
+	if left(oooVersion, 3) = "1.0" or left(oooVersion, 3) = "1.1" then &apos;openoffice.org version 1.x.x or equivalent
         &apos; Thanks to Petr Ferdus for finding the right property here
         if not isNull(documentInfo.theme) and not isEmpty(documentInfo.theme) then
             s = s &amp; &quot; /Subject &quot; &amp; epdf_pdfu_hexEncodePdfText(documentInfo.theme, errorCode)



From kengert at fedoraproject.org  Tue Apr 14 22:21:52 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Tue, 14 Apr 2009 22:21:52 +0000 (UTC)
Subject: rpms/nss/devel nss-freebl-kernelfipsmode, NONE, 1.1 nss.spec, 1.65,
	1.66
Message-ID: <20090414222152.A1663700B2@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16080

Modified Files:
	nss.spec 
Added Files:
	nss-freebl-kernelfipsmode 
Log Message:
* Tue Apr 14 2009 Kai Engert <kaie at redhat.com> - 3.12.3-3
- ship .chk files instead of running shlibsign at install time
- include .chk file in softokn-freebl subpackage
- add patch for upstream nss bug 488350



--- NEW FILE nss-freebl-kernelfipsmode ---
diff -up ./mozilla/security/nss/lib/freebl/nsslowhash.c.kernelfipsmode ./mozilla/security/nss/lib/freebl/nsslowhash.c
--- ./mozilla/security/nss/lib/freebl/nsslowhash.c.kernelfipsmode	2008-11-27 16:20:44.000000000 +0100
+++ ./mozilla/security/nss/lib/freebl/nsslowhash.c	2009-04-14 22:58:19.000000000 +0200
@@ -267,6 +267,27 @@ struct NSSLOWHASHContextStr {
    
 };
 
+static int nsslow_GetFIPSEnabled(void) {
+#ifdef LINUX
+    FILE *f;
+    char d;
+    size_t size;
+
+    f = fopen("/proc/sys/crypto/fips_enabled", "r");
+    if (!f)
+        return 0;
+
+    size = fread(&d, 1, 1, f);
+    fclose(f);
+    if (size != 1)
+        return 0;
+    if (d != '1')
+        return 0;
+#endif
+    return 1;
+}
+
+
 static int post = 0;
 
 static NSSLOWInitContext dummyContext = { 0 };
@@ -284,7 +305,9 @@ NSSLOW_Init(void)
 	
 
     if (!post) {
-	crv = freebl_fipsPowerUpSelfTest();
+        crv = CKR_OK;
+	if (nsslow_GetFIPSEnabled())
+	    crv = freebl_fipsPowerUpSelfTest();
 	if (crv != CKR_OK) {
 	    return NULL;
 	}


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- nss.spec	14 Apr 2009 15:21:19 -0000	1.65
+++ nss.spec	14 Apr 2009 22:21:51 -0000	1.66
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -36,6 +36,7 @@
 Patch5:           nss-pem-bug429175.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           nss-disable-freebl-execstack.patch
+Patch8:           nss-freebl-kernelfipsmode
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -107,6 +108,7 @@
 %patch5 -p0 -b .429175
 %patch6 -p0 -b .libpem
 %patch7 -p1
+%patch8 -p1
 
 
 %build
@@ -230,6 +232,14 @@
 #fi
 #echo "test suite completed"
 
+# Produce .chk files for the final stripped binaries
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+%{nil}
 
 %install
 
@@ -248,11 +258,9 @@
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
-# These ghost files will be generated in the post step
 # Make sure chk files can be found in both places
 for file in libsoftokn3.chk libfreebl3.chk
 do
-  touch $RPM_BUILD_ROOT/%{_lib}/$file
   ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
@@ -295,8 +303,6 @@
 
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
-%{unsupported_tools_directory}/shlibsign -i /%{_lib}/libsoftokn3.so >/dev/null 2>/dev/null
-%{unsupported_tools_directory}/shlibsign -i /%{_lib}/libfreebl3.so >/dev/null 2>/dev/null
 
 
 %postun
@@ -311,11 +317,10 @@
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
 /%{_lib}/libsoftokn3.so
+/%{_lib}/libsoftokn3.chk
 /%{_lib}/libnssckbi.so
 /%{_lib}/libnsspem.so
 %{unsupported_tools_directory}/shlibsign
-%ghost /%{_lib}/libsoftokn3.chk
-%ghost /%{_lib}/libfreebl3.chk
 %dir %{_libdir}/nss
 %dir %{unsupported_tools_directory}
 %dir %{_sysconfdir}/pki/nssdb
@@ -327,6 +332,7 @@
 
 %files softokn-freebl
 /%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
 
 %files tools
 %defattr(-,root,root)
@@ -470,6 +476,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Kai Engert <kaie at redhat.com> - 3.12.3-3
+- ship .chk files instead of running shlibsign at install time
+- include .chk file in softokn-freebl subpackage
+- add patch for upstream nss bug 488350
 * Tue Apr 14 2009 Kai Engert <kaie at redhat.com> - 3.12.3-2
 - Update to NSS 3.12.3
 * Mon Apr 06 2009 Kai Engert <kaie at redhat.com> - 3.12.2.99.3-7



From dcbw at fedoraproject.org  Tue Apr 14 22:26:45 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 14 Apr 2009 22:26:45 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.103,
	1.104 NetworkManager.spec, 
	1.270, 1.271 nm-applet-internal-buildfixes.patch, 1.6,
	1.7 sources, 1.140, 1.141
Message-ID: <20090414222645.3860370127@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17739

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Tue Apr 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-2.git20090414
- ifcfg-rh: enable write support for wired and wifi connections

* Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
- nm: update to 0.7.1
- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	9 Apr 2009 02:44:27 -0000	1.103
+++ .cvsignore	14 Apr 2009 22:26:14 -0000	1.104
@@ -151,3 +151,5 @@
 network-manager-applet-0.7.0.100.tar.bz2
 NetworkManager-0.7.0.100.git20090408.tar.bz2
 network-manager-applet-0.7.0.100.svn1260.tar.bz2
+NetworkManager-0.7.1.git20090414.tar.bz2
+network-manager-applet-0.7.1.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- NetworkManager.spec	9 Apr 2009 02:44:27 -0000	1.270
+++ NetworkManager.spec	14 Apr 2009 22:26:14 -0000	1.271
@@ -11,13 +11,13 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090408
-%define applet_snapshot .svn1260
+%define snapshot .git20090414
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.0.100
+Version: 0.7.1
 Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
@@ -326,6 +326,13 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Apr 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-2.git20090414
+- ifcfg-rh: enable write support for wired and wifi connections
+
+* Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
+- nm: update to 0.7.1
+- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)
+
 * Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
 - nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
 - nm: fix handling of spaces in DHCP 'domain-search' option

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nm-applet-internal-buildfixes.patch	5 Apr 2009 12:41:15 -0000	1.6
+++ nm-applet-internal-buildfixes.patch	14 Apr 2009 22:26:14 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	9 Apr 2009 02:44:27 -0000	1.140
+++ sources	14 Apr 2009 22:26:14 -0000	1.141
@@ -1,2 +1,2 @@
-c88cea4852421c706931c4822344672e  NetworkManager-0.7.0.100.git20090408.tar.bz2
-7d6f7908d96cf786a9bad04c37cb2ea9  network-manager-applet-0.7.0.100.svn1260.tar.bz2
+9517fba07da093ef44b0e2970fc7a571  NetworkManager-0.7.1.git20090414.tar.bz2
+d90a997e3e2051ce8866fe24f765141f  network-manager-applet-0.7.1.tar.bz2



From myoung at fedoraproject.org  Tue Apr 14 22:49:55 2009
From: myoung at fedoraproject.org (Michael Young)
Date: Tue, 14 Apr 2009 22:49:55 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1294.2.19,1.1294.2.20
Message-ID: <20090414224956.1810D700B2@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23209

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec 
Log Message:
Docs won't build for current pvops patch, so don't build them



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.19
retrieving revision 1.1294.2.20
diff -u -r1.1294.2.19 -r1.1294.2.20
--- kernel.spec	14 Apr 2009 22:09:14 -0000	1.1294.2.19
+++ kernel.spec	14 Apr 2009 22:49:22 -0000	1.1294.2.20
@@ -103,7 +103,7 @@
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1974,6 +1974,7 @@
 - follow the 2.6.29.1 stable branch for the moment
 - reset a few config settings to Fedora defaults
 - drop the squashfs 3 patches as we can't build both
+- docs won't build, so don't build them
 
 * Tue Apr 14 2009 Marcelo Tosatti <mtosatti at redhat.com>
 - kvm fixes for bz#491625



From pkgdb at fedoraproject.org  Tue Apr 14 22:54:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 14 Apr 2009 22:54:58 +0000
Subject: [pkgdb] mtpaint: sx2kirby has requested watchcommits
Message-ID: <20090414225458.72CC110F852@bastion2.fedora.phx.redhat.com>

sx2kirby has requested the watchcommits acl on mtpaint (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtpaint



From dcbw at fedoraproject.org  Tue Apr 14 22:55:50 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue, 14 Apr 2009 22:55:50 +0000 (UTC)
Subject: rpms/NetworkManager/devel sources,1.141,1.142
Message-ID: <20090414225550.1631A700B2@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24699

Modified Files:
	sources 
Log Message:
Fix build failure on 64-bit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	14 Apr 2009 22:26:14 -0000	1.141
+++ sources	14 Apr 2009 22:55:18 -0000	1.142
@@ -1,2 +1,2 @@
-9517fba07da093ef44b0e2970fc7a571  NetworkManager-0.7.1.git20090414.tar.bz2
 d90a997e3e2051ce8866fe24f765141f  network-manager-applet-0.7.1.tar.bz2
+656728d3decf12e75814b0f4e252929e  NetworkManager-0.7.1.git20090414.tar.bz2



From cebbert at fedoraproject.org  Tue Apr 14 23:31:48 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 14 Apr 2009 23:31:48 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-kvm-kconfig-irqchip.patch, NONE,
	1.1 linux-2.6-kvm-mask-notifiers.patch, NONE,
	1.1 linux-2.6-kvm-reset-pit-irq-on-unmask.patch, NONE,
	1.1 linux-2.6-net-fix-another-gro-bug.patch, NONE,
	1.1 kernel.spec, 1.1330, 1.1331
Message-ID: <20090414233149.07EC470127@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv758

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-kconfig-irqchip.patch 
	linux-2.6-kvm-mask-notifiers.patch 
	linux-2.6-kvm-reset-pit-irq-on-unmask.patch 
	linux-2.6-net-fix-another-gro-bug.patch 
Log Message:
Copy kvm fixes for bz#491625 and missed networking fix from F11 kernel

linux-2.6-kvm-kconfig-irqchip.patch:

--- NEW FILE linux-2.6-kvm-kconfig-irqchip.patch ---
commit 1dae8e15bb85de0116ed43cd3d798a035044954c
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Jan 4 18:04:18 2009 +0200

    KVM: Add CONFIG_HAVE_KVM_IRQCHIP
    
    Two KVM archs support irqchips and two don't.  Add a Kconfig item to
    make selecting between the two models easier.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index f833a0b..0a2d6b8 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
 	bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	depends on HAVE_KVM || IA64
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 1465705..5a152a5 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -2,6 +2,9 @@
 # KVM configuration
 #
 
+config HAVE_KVM_IRQCHIP
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	---help---
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index e051cad..3e260b7 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -4,6 +4,9 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	default y
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index b81125f..0a303c3 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
 	depends on HAVE_KVM || X86

linux-2.6-kvm-mask-notifiers.patch:

--- NEW FILE linux-2.6-kvm-mask-notifiers.patch ---
b018d32632d3c59d3618e23128e4312fe8e48d64
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 3cf0ede..99963f3 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -127,6 +127,10 @@ struct kvm {
 	struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
 #endif
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+	struct hlist_head mask_notifier_list;
+#endif
+
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
 	struct mmu_notifier mmu_notifier;
 	unsigned long mmu_notifier_seq;
@@ -320,6 +324,19 @@ struct kvm_assigned_dev_kernel {
 	struct pci_dev *dev;
 	struct kvm *kvm;
 };
+
+struct kvm_irq_mask_notifier {
+	void (*func)(struct kvm_irq_mask_notifier *kimn, bool masked);
+	int irq;
+	struct hlist_node link;
+};
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+				    struct kvm_irq_mask_notifier *kimn);
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+				      struct kvm_irq_mask_notifier *kimn);
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
+
 void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 23b81cf..e85a2bc 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -101,6 +101,7 @@ static void ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx)
 static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 {
 	unsigned index;
+	bool mask_before, mask_after;
 
 	switch (ioapic->ioregsel) {
 	case IOAPIC_REG_VERSION:
@@ -120,6 +121,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 		ioapic_debug("change redir index %x val %x\n", index, val);
 		if (index >= IOAPIC_NUM_PINS)
 			return;
+		mask_before = ioapic->redirtbl[index].fields.mask;
 		if (ioapic->ioregsel & 1) {
 			ioapic->redirtbl[index].bits &= 0xffffffff;
 			ioapic->redirtbl[index].bits |= (u64) val << 32;
@@ -128,6 +130,9 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
 			ioapic->redirtbl[index].bits |= (u32) val;
 			ioapic->redirtbl[index].fields.remote_irr = 0;
 		}
+		mask_after = ioapic->redirtbl[index].fields.mask;
+		if (mask_before != mask_after)
+			kvm_fire_mask_notifiers(ioapic->kvm, index, mask_after);
 		if (ioapic->irr & (1 << index))
 			ioapic_service(ioapic, index);
 		break;
@@ -426,3 +431,4 @@ int kvm_ioapic_init(struct kvm *kvm)
 	kvm_io_bus_register_dev(&kvm->mmio_bus, &ioapic->dev);
 	return 0;
 }
+
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index aa5d1e5..5162a41 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -99,3 +99,27 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
 		clear_bit(irq_source_id, &kvm->arch.irq_states[i]);
 	clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
 }
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+				    struct kvm_irq_mask_notifier *kimn)
+{
+	kimn->irq = irq;
+	hlist_add_head(&kimn->link, &kvm->mask_notifier_list);
+}
+
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+				      struct kvm_irq_mask_notifier *kimn)
+{
+	hlist_del(&kimn->link);
+}
+
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask)
+{
+	struct kvm_irq_mask_notifier *kimn;
+	struct hlist_node *n;
+
+	hlist_for_each_entry(kimn, n, &kvm->mask_notifier_list, link)
+		if (kimn->irq == irq)
+			kimn->func(kimn, mask);
+}
+
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index dcbfc68..785c1e3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -831,6 +831,9 @@ static struct kvm *kvm_create_vm(void)
 
 	if (IS_ERR(kvm))
 		goto out;
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+	INIT_HLIST_HEAD(&kvm->mask_notifier_list);
+#endif
 
 #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET
 	page = alloc_page(GFP_KERNEL | __GFP_ZERO);

linux-2.6-kvm-reset-pit-irq-on-unmask.patch:

--- NEW FILE linux-2.6-kvm-reset-pit-irq-on-unmask.patch ---
commit 4780c65904f0fc4e312ee2da9383eacbe04e61ea
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Jan 4 18:06:06 2009 +0200

    KVM: Reset PIT irq injection logic when the PIT IRQ is unmasked
    
    While the PIT is masked the guest cannot ack the irq, so the reinject logic
    will never allow the interrupt to be injected.
    
    Fix by resetting the reinjection counters on unmask.
    
    Unbreaks Xen.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 69d1bbf..c13bb92 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -539,6 +539,16 @@ void kvm_pit_reset(struct kvm_pit *pit)
 	pit->pit_state.irq_ack = 1;
 }
 
+static void pit_mask_notifer(struct kvm_irq_mask_notifier *kimn, bool mask)
+{
+	struct kvm_pit *pit = container_of(kimn, struct kvm_pit, mask_notifier);
+
+	if (!mask) {
+		atomic_set(&pit->pit_state.pit_timer.pending, 0);
+		pit->pit_state.irq_ack = 1;
+	}
+}
+
 struct kvm_pit *kvm_create_pit(struct kvm *kvm)
 {
 	struct kvm_pit *pit;
@@ -586,6 +596,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
 
 	kvm_pit_reset(pit);
 
+	pit->mask_notifier.func = pit_mask_notifer;
+	kvm_register_irq_mask_notifier(kvm, 0, &pit->mask_notifier);
+
 	return pit;
 }
 
@@ -594,6 +607,8 @@ void kvm_free_pit(struct kvm *kvm)
 	struct hrtimer *timer;
 
 	if (kvm->arch.vpit) {
+		kvm_unregister_irq_mask_notifier(kvm, 0,
+					       &kvm->arch.vpit->mask_notifier);
 		mutex_lock(&kvm->arch.vpit->pit_state.lock);
 		timer = &kvm->arch.vpit->pit_state.pit_timer.timer;
 		hrtimer_cancel(timer);
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index 76959c4..6acbe4b 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -46,6 +46,7 @@ struct kvm_pit {
 	struct kvm *kvm;
 	struct kvm_kpit_state pit_state;
 	int irq_source_id;
+	struct kvm_irq_mask_notifier mask_notifier;
 };
 
 #define KVM_PIT_BASE_ADDRESS	    0x40

linux-2.6-net-fix-another-gro-bug.patch:

--- NEW FILE linux-2.6-net-fix-another-gro-bug.patch ---
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: Sun, 29 Mar 2009 06:39:18 +0000 (-0700)
Subject: gso: Fix support for linear packets
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-2.6.git;a=commitdiff_plain;h=2f181855a0b3c2b39314944add7b41c15647cf86

gso: Fix support for linear packets

When GRO/frag_list support was added to GSO, I made an error
which broke the support for segmenting linear GSO packets (GSO
packets are normally non-linear in the payload).

These days most of these packets are constructed by the tun
driver, which prefers to allocate linear memory if possible.
This is fixed in the latest kernel, but for 2.6.29 and earlier
it is still the norm.

Therefore this bug causes failures with GSO when used with tun
in 2.6.29.

Reported-by: James Huang <jamesclhuang at gmail.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 6acbf9e..ce6356c 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2579,7 +2579,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
 					  skb_network_header_len(skb));
 		skb_copy_from_linear_data(skb, nskb->data, doffset);
 
-		if (pos >= offset + len)
+		if (fskb != skb_shinfo(skb)->frag_list)
 			continue;
 
 		if (!sg) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1330
retrieving revision 1.1331
diff -u -r1.1330 -r1.1331
--- kernel.spec	14 Apr 2009 14:27:24 -0000	1.1330
+++ kernel.spec	14 Apr 2009 23:31:45 -0000	1.1331
@@ -714,6 +714,14 @@
 #Adding dropmonitor bits from 2.6.30
 Patch9011: linux-2.6-dropwatch-protocol.patch
 
+# fix for net lockups, will be in 2.6.29.1
+Patch9101: linux-2.6-net-fix-another-gro-bug.patch
+
+# kvm fixes
+Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
+Patch9301: linux-2.6-kvm-mask-notifiers.patch
+Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1316,6 +1324,13 @@
 # Apply dropmonitor protocol bits from 2.6..30 net-next tree
 ApplyPatch linux-2.6-dropwatch-protocol.patch
 
+ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
+
+# kvm fixes
+ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
+ApplyPatch linux-2.6-kvm-mask-notifiers.patch
+ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -1892,6 +1907,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>> 2.6.29.1-31
+- Copy kvm fixes for bz#491625 and missed networking fix from F11 kernel
+
 * Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-30
 - Add missing patch for broken RLIMIT_CPU
 



From tuxbrewr at fedoraproject.org  Tue Apr 14 23:40:55 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 14 Apr 2009 23:40:55 +0000 (UTC)
Subject: rpms/quassel/devel quassel.png,1.1,1.2 quassel.spec,1.8,1.9
Message-ID: <20090414234055.BF4B5700B2@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3371

Modified Files:
	quassel.png quassel.spec 
Log Message:
Enabled KDE integration


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- quassel.spec	25 Feb 2009 18:22:30 -0000	1.8
+++ quassel.spec	14 Apr 2009 23:40:24 -0000	1.9
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
 Version: 0.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -14,10 +14,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: qt-sqlite, openssl
-BuildRequires: qt-devel, openssl-devel
-BuildRequires: cmake
+BuildRequires: qt-devel, openssl-devel, kdebase-workspace-devel
+BuildRequires: cmake, kde-filesystem
 BuildRequires: desktop-file-utils
 
+Requires(post):	/sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+
 %description
 Quassel IRC is a modern, distributed IRC client, 
 meaning that one (or multiple) client(s) can attach 
@@ -45,47 +48,115 @@
 
 mkdir build
 cd build
-cmake .. -DWANT_MONO=1 
+%{cmake_kde4} .. -DWANT_MONO=1 -DWITH_KDE=1 
 make 
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
 cd build
-install -d -m755 %{buildroot}%{_bindir}
-install -m755 quassel %{buildroot}%{_bindir}
-install -m755 quasselclient %{buildroot}%{_bindir}
-install -m755 quasselcore %{buildroot}%{_bindir}
-%{__install} -p -D %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-
-desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
-desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
-desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
+make install DESTDIR=${RPM_BUILD_ROOT} 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%files
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%files 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quassel
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_datadir}/applications/fedora-quassel.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
+%{_kde4_appsdir}/quassel/icons/hicolor/128x128/apps/quassel.png                                                                                                           
+%{_kde4_appsdir}/quassel/icons/hicolor/16x16/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/22x22/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/32x32/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/48x48/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/64x64/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/animations/*                                                                                         
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/apps/*                                                                                                            
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/actions/*                                                                                                  
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/apps/*                                                                                                              
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/devices/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/status/*                                                                                                 
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/actions/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/actions/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/devices/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/status/*
+%{_kde4_appsdir}/quassel/*
+%{_kde4_appsdir}/quassel/translations/*
+/usr/share/icons/hicolor/48x48/apps/quassel.png
+/usr/share/pixmaps/quassel.png
+%{_kde4_datadir}/applications/kde4/quassel.desktop
 
 %files core
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselcore
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_datadir}/applications/fedora-quasselcore.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
 
-%files client
+
+%files client 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselclient
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_datadir}/applications/fedora-quasselclient.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
+%{_kde4_appsdir}/quassel/icons/hicolor/128x128/apps/quassel.png                                                                                                           
+%{_kde4_appsdir}/quassel/icons/hicolor/16x16/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/22x22/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/32x32/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/48x48/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/64x64/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/animations/*                                                                                         
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/apps/*                                                                                                            
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/actions/*                                                                                                  
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/apps/*                                                                                                              
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/devices/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/status/*                                                                                                 
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/actions/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/actions/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/devices/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/status/*
+%{_kde4_appsdir}/quassel/*
+%{_kde4_appsdir}/quassel/translations/*
+/usr/share/icons/hicolor/48x48/apps/quassel.png
+/usr/share/pixmaps/quassel.png
+%{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-3
+- Enabled KDE integration
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Tue Apr 14 23:52:32 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 14 Apr 2009 23:52:32 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.126,1.127 sources,1.49,1.50
Message-ID: <20090414235232.724BB700B2@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6628

Modified Files:
	mono.spec sources 
Log Message:
* Tue Apr 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-17
- Update to 2.4 final.
- Statically link mono to libmono to work around bz #494026



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- mono.spec	14 Apr 2009 01:24:12 -0000	1.126
+++ mono.spec	14 Apr 2009 23:52:01 -0000	1.127
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        16.1.RC1%{?dist}
+Release:        17%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -294,7 +294,7 @@
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-#sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/mono.web.pc.in
+sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/mono.web.pc.in
 sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in
 sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
@@ -317,7 +317,7 @@
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
 %configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes \
-           --with-moonlight=yes --disable-static --with-preview=yes \
+           --with-moonlight=yes --with-preview=yes \
            --with-libgdiplus=installed
 make
 
@@ -328,6 +328,7 @@
 install monodir %{buildroot}%{_bindir}
 
 %{__rm} %{buildroot}%{_libdir}/*.la
+%{__rm} %{buildroot}%{_libdir}/*.a
 
 # We put these inside rpm
 %{__rm} %{buildroot}%{_bindir}/mono-find-provides
@@ -549,9 +550,17 @@
 
 %files moonlight
 %defattr(-,root,root,-)
-%{_libdir}/mono/2.1/*.dll
 %{_libdir}/mono/2.1/*.mdb
 %{_libdir}/mono/2.1/smcs.exe
+%{_libdir}/mono/2.1/Mono.CompilerServices.SymbolWriter.dll
+%{_libdir}/mono/2.1/System.Core.dll
+%{_libdir}/mono/2.1/System.Runtime.Serialization.dll
+%{_libdir}/mono/2.1/System.ServiceModel.Web.dll
+%{_libdir}/mono/2.1/System.ServiceModel.dll
+%{_libdir}/mono/2.1/System.Xml.Linq.dll
+%{_libdir}/mono/2.1/System.Xml.dll
+%{_libdir}/mono/2.1/System.dll
+%{_libdir}/mono/2.1/mscorlib.dll
 %moon_dll System.Net
 
 %files nunit
@@ -643,7 +652,7 @@
 
 %files web-devel
 %defattr(-,root,root,-)
-#%{_libdir}/pkgconfig/mono.web.pc
+%{_libdir}/pkgconfig/mono.web.pc
 %{_libdir}/pkgconfig/system.web.extensions_1.0.pc
 %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
 
@@ -711,14 +720,18 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
-* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-16
+* Tue Apr 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-17
+- Update to 2.4 final.
+- Statically link mono to libmono to work around bz #494026
+
+* Mon Apr 13 2009 Dennis Gilmore <ausil at fedoraproject.org> - 2.4-16
 - set sparc32 to build sparcv9
 
-* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-15
+* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-15
 - Revert to RC1 with changes to the spec file such as enabling moonlight so
   that we have a working build for F11.
 
-* Fri Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-14
+* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4-14
 - Remove bootstrap changes as it's not necessary.
 - remove ppc64 as we only had ppc before.
 - Correct release number format


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	13 Apr 2009 23:04:52 -0000	1.49
+++ sources	14 Apr 2009 23:52:01 -0000	1.50
@@ -1 +1 @@
-17f740bcff59983cdbe9ef89b80cf969  mono-2.4.tar.bz2
+da2bf1c0aba2958d26c5e8a9a49fd9d1  mono-2.4.tar.bz2



From tuxbrewr at fedoraproject.org  Tue Apr 14 23:53:43 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 14 Apr 2009 23:53:43 +0000 (UTC)
Subject: rpms/quassel/F-10 quassel.png,1.1,1.2 quassel.spec,1.7,1.8
Message-ID: <20090414235343.AAAE2700D9@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7177

Modified Files:
	quassel.png quassel.spec 
Log Message:
Enabled KDE integration


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-10/quassel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quassel.spec	20 Feb 2009 20:28:42 -0000	1.7
+++ quassel.spec	14 Apr 2009 23:53:13 -0000	1.8
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
 Version: 0.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -14,10 +14,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: qt-sqlite, openssl
-BuildRequires: qt-devel, openssl-devel
-BuildRequires: cmake
+BuildRequires: qt-devel, openssl-devel, kdebase-workspace-devel
+BuildRequires: cmake, kde-filesystem
 BuildRequires: desktop-file-utils
 
+Requires(post):	/sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+
 %description
 Quassel IRC is a modern, distributed IRC client, 
 meaning that one (or multiple) client(s) can attach 
@@ -45,47 +48,114 @@
 
 mkdir build
 cd build
-cmake .. -DWANT_MONO=1 
+%{cmake_kde4} .. -DWANT_MONO=1 -DWITH_KDE=1 
 make 
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
 cd build
-install -d -m755 %{buildroot}%{_bindir}
-install -m755 quassel %{buildroot}%{_bindir}
-install -m755 quasselclient %{buildroot}%{_bindir}
-install -m755 quasselcore %{buildroot}%{_bindir}
-%{__install} -p -D %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-
-desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
-desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
-desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
+make install DESTDIR=${RPM_BUILD_ROOT} 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-%files
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%files 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quassel
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_datadir}/applications/fedora-quassel.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
+%{_kde4_appsdir}/quassel/icons/hicolor/128x128/apps/quassel.png                                                                                                           
+%{_kde4_appsdir}/quassel/icons/hicolor/16x16/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/22x22/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/32x32/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/48x48/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/64x64/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/animations/*                                                                                         
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/apps/*                                                                                                            
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/actions/*                                                                                                  
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/apps/*                                                                                                              
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/devices/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/status/*                                                                                                 
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/actions/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/actions/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/devices/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/status/*
+%{_kde4_appsdir}/quassel/*
+%{_kde4_appsdir}/quassel/translations/*
+/usr/share/icons/hicolor/48x48/apps/quassel.png
+/usr/share/pixmaps/quassel.png
+%{_kde4_datadir}/applications/kde4/quassel.desktop
 
 %files core
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselcore
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_datadir}/applications/fedora-quasselcore.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
 
-%files client
+%files client 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselclient
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_datadir}/applications/fedora-quasselclient.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
+%{_kde4_appsdir}/quassel/icons/hicolor/128x128/apps/quassel.png                                                                                                           
+%{_kde4_appsdir}/quassel/icons/hicolor/16x16/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/22x22/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/32x32/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/48x48/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/hicolor/64x64/apps/quassel.png                                                                                                             
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/animations/*                                                                                         
+%{_kde4_appsdir}/quassel/icons/oxygen/128x128/apps/*                                                                                                            
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/actions/*                                                                                                  
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/apps/*                                                                                                              
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/devices/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/16x16/status/*                                                                                                 
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/actions/*                                                                                                     
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/animations/*                                                                                           
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/22x22/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/32x32/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/48x48/status/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/animations/*
+%{_kde4_appsdir}/quassel/icons/oxygen/64x64/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/actions/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/apps/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/devices/*
+%{_kde4_appsdir}/quassel/icons/oxygen/scalable/status/*
+%{_kde4_appsdir}/quassel/*
+%{_kde4_appsdir}/quassel/translations/*
+/usr/share/icons/hicolor/48x48/apps/quassel.png
+/usr/share/pixmaps/quassel.png
+%{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-2
+- Enabled KDE integration
+
 * Fri Feb 20 2009 Steven M. Parirsh <tuxbrewr at fedoraproject.org> 0.4.0-1
 - New upstream release
 



From phuang at fedoraproject.org  Wed Apr 15 00:04:37 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 15 Apr 2009 00:04:37 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.13,1.14 ibus.spec,1.64,1.65
Message-ID: <20090415000437.94F1B70137@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9588

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch to fix some bugs

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ibus-HEAD.patch	14 Apr 2009 09:10:39 -0000	1.13
+++ ibus-HEAD.patch	15 Apr 2009 00:04:04 -0000	1.14
@@ -17,6 +17,121 @@
  
      if (!retval) {
          g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 5da4dec..168e45a 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -190,14 +190,20 @@ _key_snooper_cb (GtkWidget   *widget,
+     IBusIMContext *ibusimcontext;
+     ibusimcontext = (IBusIMContext *) _focus_im_context;
+ 
+-    if (!_use_key_snooper)
++    if (G_UNLIKELY (!_use_key_snooper))
+         return retval;
+ 
+     if (ibusimcontext == NULL)
+-        return retval;
++        return FALSE;
+ 
+-    if (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE)
+-        return retval;
++    if (G_UNLIKELY (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE))
++        return FALSE;
++
++    if (G_UNLIKELY (event->state & IBUS_HANDLED_MASK))
++        return TRUE;
++
++    if (G_UNLIKELY (event->state & IBUS_IGNORED_MASK))
++        return FALSE;
+ 
+     switch (event->type) {
+     case GDK_KEY_RELEASE:
+@@ -212,6 +218,14 @@ _key_snooper_cb (GtkWidget   *widget,
+         break;
+     default:
+         retval = FALSE;
++        break;
++    }
++
++    if (retval) {
++        event->state |= IBUS_HANDLED_MASK;
++    }
++    else {
++        event->state |= IBUS_IGNORED_MASK;
+     }
+ 
+     return retval;
+@@ -383,11 +397,18 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
+ 
+     IBusIMContext *ibusimcontext = (IBusIMContext *) context;
+ 
+-    if (ibusimcontext->ibuscontext && ibusimcontext->has_focus) {
++    if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
+         /* If context does not have focus, ibus will process key event in sync mode.
+          * It is a workaround for increase search in treeview.
+          */
+-        gboolean retval;
++        gboolean retval = FALSE;
++
++        if (event->state & IBUS_HANDLED_MASK)
++            return TRUE;
++
++        if (event->state & IBUS_IGNORED_MASK)
++            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++
+         switch (event->type) {
+         case GDK_KEY_RELEASE:
+             retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
+@@ -404,9 +425,13 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
+         }
+ 
+         if (retval) {
++            event->state |= IBUS_HANDLED_MASK;
+             return TRUE;
+         }
+-        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++        else {
++            event->state |= IBUS_IGNORED_MASK;
++            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++        }
+     }
+     else {
+         return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
+index be4b980..a976eec 100644
+--- a/data/ibus.schemas.in
++++ b/data/ibus.schemas.in
+@@ -18,7 +18,7 @@
+       <owner>ibus</owner>
+       <type>list</type>
+       <list_type>string</list_type>
+-      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul]</default>
++      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul,Alt+Release+Alt_R]</default>
+       <locale name="C">
+         <short>Trigger Hotkey</short>
+ 	    <long>Trigger hotkey for enable or disable input context</long>
+diff --git a/ibus/modifier.py b/ibus/modifier.py
+index 7f6afad..56d8be9 100644
+--- a/ibus/modifier.py
++++ b/ibus/modifier.py
+@@ -33,11 +33,15 @@ BUTTON2_MASK = 1 << 9
+ BUTTON3_MASK = 1 << 10
+ BUTTON4_MASK = 1 << 11
+ BUTTON5_MASK = 1 << 12
+-  
++
++HANDLED_MASK = 1 << 24
++IGNORED_MASK = 1 << 25
++FORWARD_MASK = 1 << 25
++
+ SUPER_MASK = 1 << 26
+ HYPER_MASK = 1 << 27
+ META_MASK = 1 << 28
+-  
++
+ RELEASE_MASK = 1 << 30
+ 
+ MODIFIER_MASK = 0x5c001fff
 diff --git a/po/as.po b/po/as.po
 index 8e33ca2..9b81669 100644
 --- a/po/as.po
@@ -416,3 +531,166 @@
  
 +#~ msgid "prev engine"
 +#~ msgstr "????????? ????????????"
+diff --git a/po/te.po b/po/te.po
+index 3b8c0da..9c65afd 100644
+--- a/po/te.po
++++ b/po/te.po
+@@ -1,21 +1,21 @@
+-# translation of ibus.master.ibus.po to Telugu
++# translation of ibus.master.te.po to Telugu
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+ # Krishna Babu K <kkrothap at redhat.com>, 2009.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: ibus.master.ibus\n"
++"Project-Id-Version: ibus.master.te\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-07 15:38+0800\n"
+-"PO-Revision-Date: 2009-04-07 00:39+0530\n"
++"POT-Creation-Date: 2009-04-06 11:45+0800\n"
++"PO-Revision-Date: 2009-04-14 15:04+0530\n"
+ "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
+ "Language-Team: Telugu <en at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: KBabel 1.11.4\n"
+-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+ "\n"
+ 
+ #: ../bus/ibus.desktop.in.h:1
+@@ -49,23 +49,20 @@ msgstr "??????????????????????????? ?????? <kkrothap at redhat.com> 2009."
+ 
+ #. create input methods menu
+ #: ../ui/gtk/languagebar.py:84
+-#, fuzzy
+ msgid "Switch input method"
+-msgstr "????????????????????? ????????????????????? ??????????????????????????????"
++msgstr "????????????????????? ?????????????????? ????????????????????????"
+ 
+ #: ../setup/main.py:103
+ msgid "trigger"
+ msgstr "????????? (???????????????????????????)"
+ 
+ #: ../setup/main.py:113
+-#, fuzzy
+ msgid "next input method"
+-msgstr "????????????????????? ????????????????????? ??????????????????:"
++msgstr "????????????????????? ????????????????????? ??????????????????"
+ 
+ #: ../setup/main.py:123
+-#, fuzzy
+ msgid "previous input method"
+-msgstr "????????????????????? ????????????????????? ??????????????????:"
++msgstr "????????????????????? ????????????????????? ??????????????????"
+ 
+ #: ../setup/main.py:204
+ msgid "IBus daemon is not started. Do you want to start it now?"
+@@ -201,7 +198,6 @@ msgid "Next input method:"
+ msgstr "????????????????????? ????????????????????? ??????????????????:"
+ 
+ #: ../setup/setup.glade.h:25
+-#, fuzzy
+ msgid "Previous input method:"
+ msgstr "????????????????????? ????????????????????? ??????????????????:"
+ 
+@@ -285,14 +281,7 @@ msgstr "??????????????????????????? ??????????????? ???????????????????????????
+ msgid "Use custom font name for language panel"
+ msgstr "???????????? ????????????????????? ??????????????? ??????????????????????????? ??????????????? ??????????????? ????????????????????????????????????"
+ 
+-#~ msgid "Switch engine"
+-#~ msgstr "???????????????????????? ????????????????????????"
+-
+-#~ msgid "next engine"
+-#~ msgstr "????????????????????? ??????????????????"
+-
+-#~ msgid "prev engine"
+-#~ msgstr "????????????????????? ??????????????????"
++#: ../data/ibus.schemas.in.h:17
++msgid "[Control+space]"
++msgstr "[Control+space]"
+ 
+-#~ msgid "[Control+space]"
+-#~ msgstr "[Control+space]"
+diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
+index a9e2233..f954343 100644
+--- a/setup/keyboardshortcut.py
++++ b/setup/keyboardshortcut.py
+@@ -27,6 +27,7 @@ __all__ = (
+ import gobject
+ import gtk
+ from gtk import gdk
++from gtk import keysyms
+ 
+ from gettext import dgettext
+ _  = lambda a : dgettext("ibus", a)
+@@ -217,8 +218,29 @@ class KeyboardShortcutSelection(gtk.VBox):
+         if id != gtk.RESPONSE_OK or not out:
+             return
+         keyevent = out[0]
++        state = keyevent.state & (gdk.CONTROL_MASK | \
++                                  gdk.SHIFT_MASK   | \
++                                  gdk.MOD1_MASK    | \
++                                  gdk.META_MASK    | \
++                                  gdk.SUPER_MASK   | \
++                                  gdk.HYPER_MASK)
++        if state == 0:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Control_L, keysyms.Control_R) and state == gdk.CONTROL_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Shift_L, keysyms.Shift_R) and state == gdk.SHIFT_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Alt_L, keysyms.Alt_R) and state == gdk.MOD1_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Meta_L, keysyms.Meta_R) and state == gdk.META_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Super_L, keysyms.Super_R) and state == gdk.SUPER_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Hyper_L, keysyms.Hyper_R) and state == gdk.HYPER_MASK:
++            state = state | gdk.RELEASE_MASK
++
+         for name, button, mask in self.__modifier_buttons:
+-            if keyevent.state & mask:
++            if state & mask:
+                 button.set_active(True)
+             else:
+                 button.set_active(False)
+diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
+index 95754cf..52547ff 100644
+--- a/src/ibusinputcontext.c
++++ b/src/ibusinputcontext.c
+@@ -553,7 +553,10 @@ ibus_input_context_process_key_event (IBusInputContext *context,
+     IBusError *error = NULL;
+     gboolean retval;
+ 
+-    if (state & IBUS_FORWARD_MASK)
++    if (state & IBUS_HANDLED_MASK)
++        return TRUE;
++
++    if (state & IBUS_IGNORED_MASK)
+         return FALSE;
+ 
+     retval = ibus_proxy_call_with_reply ((IBusProxy *) context,
+diff --git a/src/ibustypes.h b/src/ibustypes.h
+index d2f15ba..2f7c0bf 100644
+--- a/src/ibustypes.h
++++ b/src/ibustypes.h
+@@ -69,11 +69,13 @@ typedef enum
+     IBUS_BUTTON5_MASK  = 1 << 12,
+ 
+     /* The next few modifiers are used by XKB, so we skip to the end.
+-     * Bits 15 - 24 are currently unused. Bit 29 is used internally.
++     * Bits 15 - 23 are currently unused. Bit 29 is used internally.
+      */
+ 
+-    /* forward mask */
++    /* ibus mask */
++    IBUS_HANDLED_MASK  = 1 << 24,
+     IBUS_FORWARD_MASK  = 1 << 25,
++    IBUS_IGNORED_MASK  = IBUS_FORWARD_MASK,
+ 
+     IBUS_SUPER_MASK    = 1 << 26,
+     IBUS_HYPER_MASK    = 1 << 27,


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ibus.spec	14 Apr 2009 09:10:39 -0000	1.64
+++ ibus.spec	15 Apr 2009 00:04:05 -0000	1.65
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090413
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -217,6 +217,13 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-3
+- Update ibus-HEAD.patch.
+- Fix bug 495431 -  ibus Release modifier doesn't work with Alt
+- Fix bug 494445 -  ibus-hangul missing Hangul Han/En mode
+  (and Alt_R+release hotkey)
+- Update te.po
+
 * Tue Apr 14 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-2
 - Update ibus-HEAD.patch.
 - Change the mode of /tmp/ibus-$USER to 0700 to improve security



From dcbw at fedoraproject.org  Wed Apr 15 00:44:53 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 15 Apr 2009 00:44:53 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 .cvsignore, 1.91, 1.92 NetworkManager.spec,
	1.266, 1.267 nm-applet-internal-buildfixes.patch, 1.6,
	1.7 sources, 1.138, 1.139
Message-ID: <20090415004454.13A1B70101@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19005

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
- nm: update to 0.7.1
- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	20 Feb 2009 20:20:20 -0000	1.91
+++ .cvsignore	15 Apr 2009 00:44:18 -0000	1.92
@@ -137,3 +137,5 @@
 NetworkManager-0.7.0.97.git20090219.tar.gz
 network-manager-applet-0.7.0.97.svn1189.tar.gz
 NetworkManager-0.7.0.97.git20090220.tar.gz
+NetworkManager-0.7.1.tar.bz2
+network-manager-applet-0.7.1.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- NetworkManager.spec	9 Apr 2009 02:47:11 -0000	1.266
+++ NetworkManager.spec	15 Apr 2009 00:44:19 -0000	1.267
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090408
-%define applet_snapshot .svn1260
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.0.100
-Release: 2%{snapshot}%{?dist}
+Version: 0.7.1
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -328,6 +328,10 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
+- nm: update to 0.7.1
+- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)
+
 * Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
 - nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
 - nm: fix handling of spaces in DHCP 'domain-search' option

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nm-applet-internal-buildfixes.patch	5 Apr 2009 12:49:18 -0000	1.6
+++ nm-applet-internal-buildfixes.patch	15 Apr 2009 00:44:19 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	9 Apr 2009 02:47:11 -0000	1.138
+++ sources	15 Apr 2009 00:44:19 -0000	1.139
@@ -1,2 +1,2 @@
-c88cea4852421c706931c4822344672e  NetworkManager-0.7.0.100.git20090408.tar.bz2
-7d6f7908d96cf786a9bad04c37cb2ea9  network-manager-applet-0.7.0.100.svn1260.tar.bz2
+954742cfd47191204d62d8d57f2bc6dd  NetworkManager-0.7.1.tar.bz2
+d90a997e3e2051ce8866fe24f765141f  network-manager-applet-0.7.1.tar.bz2



From dcbw at fedoraproject.org  Wed Apr 15 01:07:04 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 15 Apr 2009 01:07:04 +0000 (UTC)
Subject: rpms/NetworkManager/F-9 NetworkManager.spec, 1.259,
	1.260 nm-applet-internal-buildfixes.patch, 1.6, 1.7 sources,
	1.136, 1.137
Message-ID: <20090415010705.1B1AF70101@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22847

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
- nm: update to 0.7.1
- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- NetworkManager.spec	9 Apr 2009 02:48:05 -0000	1.259
+++ NetworkManager.spec	15 Apr 2009 01:06:59 -0000	1.260
@@ -11,14 +11,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090408
-%define applet_snapshot .svn1260
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.0.100
-Release: 2%{snapshot}%{?dist}
+Version: 0.7.1
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -335,6 +335,10 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
+- nm: update to 0.7.1
+- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)
+
 * Wed Apr  8 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.100-2.git20090408
 - nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
 - nm: fix handling of spaces in DHCP 'domain-search' option

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nm-applet-internal-buildfixes.patch	5 Apr 2009 13:09:26 -0000	1.6
+++ nm-applet-internal-buildfixes.patch	15 Apr 2009 01:06:59 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	9 Apr 2009 02:48:05 -0000	1.136
+++ sources	15 Apr 2009 01:06:59 -0000	1.137
@@ -1,2 +1,2 @@
-c88cea4852421c706931c4822344672e  NetworkManager-0.7.0.100.git20090408.tar.bz2
-7d6f7908d96cf786a9bad04c37cb2ea9  network-manager-applet-0.7.0.100.svn1260.tar.bz2
+954742cfd47191204d62d8d57f2bc6dd  NetworkManager-0.7.1.tar.bz2
+d90a997e3e2051ce8866fe24f765141f  network-manager-applet-0.7.1.tar.bz2



From airlied at fedoraproject.org  Wed Apr 15 02:54:25 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 15 Apr 2009 02:54:25 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.45,
	1.46 xorg-x11-drv-ati.spec, 1.175,
	1.176 radeon-modeset-fixes.patch, 1.1, NONE
Message-ID: <20090415025425.8C82870101@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11705

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-modeset-fixes.patch 
Log Message:
* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-2
- radeon-modeset.patch: fix rotation + cache mmap uninit var path


radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- radeon-modeset.patch	13 Apr 2009 17:50:18 -0000	1.45
+++ radeon-modeset.patch	15 Apr 2009 02:54:23 -0000	1.46
@@ -1,6 +1,6 @@
-diff -up xf86-video-ati-6.12.2/configure.ac.modeset xf86-video-ati-6.12.2/configure.ac
---- xf86-video-ati-6.12.2/configure.ac.modeset	2009-04-08 10:29:53.000000000 -0400
-+++ xf86-video-ati-6.12.2/configure.ac	2009-04-13 13:24:51.000000000 -0400
+diff -up xf86-video-ati-6.12.2/configure.ac.dave xf86-video-ati-6.12.2/configure.ac
+--- xf86-video-ati-6.12.2/configure.ac.dave	2009-04-09 00:29:53.000000000 +1000
++++ xf86-video-ati-6.12.2/configure.ac	2009-04-15 12:46:30.000000000 +1000
 @@ -31,6 +31,7 @@ AM_CONFIG_HEADER([config.h])
  AC_CONFIG_AUX_DIR(.)
  
@@ -30,9 +30,9 @@
  CFLAGS="$XORG_CFLAGS"
  AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
 diff -up /dev/null xf86-video-ati-6.12.2/src/drmmode_display.c
---- /dev/null	2009-04-02 14:26:50.181076715 -0400
-+++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-13 13:24:51.000000000 -0400
-@@ -0,0 +1,921 @@
+--- /dev/null	2009-04-15 09:55:06.267190488 +1000
++++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-15 12:46:30.000000000 +1000
+@@ -0,0 +1,929 @@
 +/*
 + * Copyright ?? 2007 Red Hat, Inc.
 + *
@@ -65,6 +65,7 @@
 +#endif
 +
 +#ifdef XF86DRM_MODE
++#include <sys/ioctl.h>
 +#include "radeon.h"
 +#include "radeon_reg.h"
 +#include "radeon_drm.h"
@@ -136,89 +137,116 @@
 +static void
 +drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
 +{
++#if 0
 +	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-+	drmmode_ptr drmmode = drmmode_crtc->drmmode;
++//	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
++//	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 +
 +	/* bonghits in the randr 1.2 - uses dpms to disable crtc - bad buzz */
 +	if (mode == DPMSModeOff) {
 +//		drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 +//			       0, 0, 0, NULL, 0, NULL);
 +	}
++#endif
 +}
 +
 +static PixmapPtr
-+create_pixmap_for_fb(drmmode_ptr drmmode, ScrnInfoPtr pScrn, drmModeFBPtr fb)
++create_pixmap_for_fbcon(drmmode_ptr drmmode,
++			ScrnInfoPtr pScrn, int crtc_id)
 +{
++	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
++	drmmode_crtc_private_ptr drmmode_crtc;
 +	ScreenPtr pScreen = pScrn->pScreen;
-+	PixmapPtr pPixmap;
-+	struct radeon_exa_pixmap_priv *driver_priv;
++	PixmapPtr pixmap;
 +	dri_bo *bo;
++	drmModeFBPtr fbcon;
++	struct drm_gem_flink flink;
++	
++	drmmode_crtc = xf86_config->crtc[crtc_id]->driver_private;
 +
-+	pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, fb->depth, 0);
-+	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
-+	if (!driver_priv) {
-+		(*pScreen->DestroyPixmap)(pPixmap);
++	fbcon = drmModeGetFB(drmmode->fd, drmmode_crtc->mode_crtc->buffer_id);
++	if (fbcon == NULL)
 +		return NULL;
-+	}
 +
-+	miModifyPixmapHeader(pPixmap, fb->width, fb->height, fb->depth,
-+                             pScrn->bitsPerPixel, fb->pitch, NULL);
-+
-+	bo = radeon_bo_gem_create_from_handle(drmmode->bufmgr,
-+					      fb->handle,
-+					      fb->pitch * fb->height);
-+	driver_priv->bo = bo;
++	flink.handle = fbcon->handle;
++	if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Couldn't flink fbcon handle\n");
++		return NULL;
++	}
++	
++	bo = radeon_bo_gem_create_from_name(drmmode->bufmgr, "fbcon",
++					    flink.name);
 +	if (bo == NULL) {
-+		(*pScreen->DestroyPixmap)(pPixmap);
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Couldn't allocate bo for fbcon handle\n");
++		return NULL;
++	}
++
++	pixmap = GetScratchPixmapHeader(pScreen,
++					fbcon->width, fbcon->height,
++					fbcon->depth, fbcon->bpp,
++					fbcon->pitch, NULL);
++	if (pixmap == NULL) {
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Couldn't allocate pixmap fbcon contents\n");
 +		return NULL;
 +	}
 +
-+    	return pPixmap;
++	radeon_set_pixmap_bo(pixmap, bo);
++	
++	dri_bo_unreference(bo);
++	drmModeFreeFB(fbcon);
++    	return pixmap;
 +}
 +
-+static void
-+copy_fb_contents (drmmode_ptr drmmode,
-+		  ScrnInfoPtr pScrn,
-+		  unsigned int dest_id, int x, int y, unsigned int src_id)
++void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
 +{
++	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
 +	RADEONInfoPtr info = RADEONPTR(pScrn);
-+	drmModeFBPtr dest_fb, src_fb;
-+	dri_bo *dest_bo, *src_bo;
-+	PixmapPtr src_pixmap, dest_pixmap;
++	PixmapPtr src, dst;
 +	ScreenPtr pScreen = pScrn->pScreen;
++	int crtc_id = 0;
++	int i;
++	int pitch = pScrn->displayWidth * info->CurrentLayout.pixel_bytes;
 +
 +	if (info->ChipFamily >= CHIP_FAMILY_R600)
 +		return;
 +
-+	dest_fb = drmModeGetFB(drmmode->fd, dest_id);
-+	src_fb = drmModeGetFB(drmmode->fd, src_id);
-+	if (src_fb == NULL || dest_fb == NULL) {
-+		ErrorF("failed to get old fb, id %d\n", src_id);
-+		return;
-+	}
++	for (i = 0; i < xf86_config->num_crtc; i++) {
++		xf86CrtcPtr crtc = xf86_config->crtc[i];
++		drmmode_crtc_private_ptr drmmode_crtc;
 +
-+	dest_pixmap = create_pixmap_for_fb(drmmode, pScrn, dest_fb);
-+	src_pixmap = create_pixmap_for_fb(drmmode, pScrn, src_fb);
++		drmmode_crtc = crtc->driver_private;
++		if (drmmode_crtc->mode_crtc->buffer_id)
++			crtc_id = i;
++	}
++			
++	src = create_pixmap_for_fbcon(drmmode, pScrn, crtc_id);
 +
-+	info->accel_state->exa->PrepareCopy (src_pixmap, dest_pixmap,
-+					     0, 0, GXcopy, 0xffffff);
-+	info->accel_state->exa->Copy (dest_pixmap, 0, 0, x, y,
-+			 	      src_fb->width, src_fb->height);
-+	info->accel_state->exa->DoneCopy (dest_pixmap);
++	dst = GetScratchPixmapHeader(pScreen,
++				     pScrn->virtualX, pScrn->virtualY,
++				     pScrn->depth, pScrn->bitsPerPixel,
++				     pitch, NULL);
++	radeon_set_pixmap_bo(dst, info->mm.front_buffer);
++	info->accel_state->exa->PrepareCopy (src, dst,
++					     -1, -1, GXcopy, FB_ALLONES);
++	info->accel_state->exa->Copy (dst, 0, 0, 0, 0,
++			 	      pScrn->virtualX, pScrn->virtualY);
++	info->accel_state->exa->DoneCopy (dst);
 +	RADEONCPFlushIndirect(pScrn, 0);
 +
-+	(*pScreen->DestroyPixmap)(dest_pixmap);
-+	(*pScreen->DestroyPixmap)(src_pixmap);
++	(*pScreen->DestroyPixmap)(dst);
++	(*pScreen->DestroyPixmap)(src);
 +
-+	drmFree(dest_fb);
-+	drmFree(src_fb);
 +}
 +
 +static Bool
 +drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 +		     Rotation rotation, int x, int y)
 +{
++	ScrnInfoPtr pScrn = crtc->scrn;
++	RADEONInfoPtr info = RADEONPTR(pScrn);
 +	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
 +	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 +	drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -231,6 +259,19 @@
[...1885 lines suppressed...]
 +	    }
 +
-+	    if (radeon_map_memory(pScrn, info->mm.cursor[c])) {
-+		ErrorF("Failed to map front buffer memory\n");
++	    if (dri_bo_map(info->mm.cursor[c], 1)) {
++	      ErrorF("Failed to map cursor buffer memory\n");
 +	    }
 +	    
-+	    if (!info->drm_mode_setting) {
-+		xf86CrtcPtr crtc = xf86_config->crtc[c];
-+		RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
-+		radeon_crtc->cursor = info->mm.cursor[c];
-+	    } else {
-+		drmmode_set_cursor(pScrn, &info->drmmode, c, (void *)info->mm.cursor[c]->map, info->mm.cursor[c]->kernel_bo_handle);
-+	    }
++	    drmmode_set_cursor(pScrn, &info->drmmode, c, info->mm.cursor[c]);
 +	    total_size_bytes += cursor_size;
 +	}
 +    }
@@ -7735,14 +7465,12 @@
 +
 +    ErrorF("fb size is %dK %dK\n", fb_size_bytes / 1024, total_size_bytes / 1024);
 +
-+    info->mm.front_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, fb_size_bytes, 0, 1, "Front Buffer", 1);
-+    if (!info->mm.front_buffer) {
-+	return FALSE;
-+    }
++    info->mm.front_buffer = dri_bo_alloc(info->bufmgr, "front", screen_size,
++					 0, RADEON_GEM_DOMAIN_VRAM);
 +
-+    drmmode_set_fb(pScrn, &info->drmmode, pScrn->virtualX, RADEON_ALIGN(pScrn->virtualY, 16), stride, info->mm.front_buffer->kernel_bo_handle);
++    //    drmmode_set_fb(pScrn, &info->drmmode, pScrn->virtualX, RADEON_ALIGN(pScrn->virtualY, 16), stride, info->mm.front_buffer);
 +
-+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK at 0x%08x\n", info->mm.front_buffer->size/1024, info->mm.front_buffer->offset);
++    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK\n", info->mm.front_buffer->size/1024);
 +    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Remaining VRAM size (used for pixmaps): %dK\n", remain_size_bytes/1024);
 +
 +    /* set the emit limit at 90% of VRAM */
@@ -7753,48 +7481,28 @@
 +}
 +
 +
-diff -up xf86-video-ati-6.12.2/src/radeon_probe.h.modeset xf86-video-ati-6.12.2/src/radeon_probe.h
---- xf86-video-ati-6.12.2/src/radeon_probe.h.modeset	2009-04-04 18:44:00.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_probe.h	2009-04-13 13:24:51.000000000 -0400
-@@ -146,6 +146,26 @@ typedef struct
-     Bool hw_capable;
- } RADEONI2CBusRec, *RADEONI2CBusPtr;
- 
-+struct radeon_memory {
-+    int pool; // memory is VRAM vs GART
-+    unsigned long offset;
-+    unsigned long end;
-+
-+    unsigned long size;
-+    unsigned long allocated_size;
-+    void *map;
-+    int key;
-+
-+    Bool bound;
-+    unsigned long agp_offset;
-+    unsigned int pitch;
-+    char *name;
-+    struct radeon_memory *next, *prev;
-+    uint32_t alignment;
-+    uint32_t kernel_bo_handle;
-+    uint32_t kernel_name;
-+};
-+
- typedef struct _RADEONCrtcPrivateRec {
-     void *crtc_rotate_mem;
-     void *cursor_mem;
-@@ -159,6 +179,8 @@ typedef struct _RADEONCrtcPrivateRec {
+diff -up xf86-video-ati-6.12.2/src/radeon_probe.h.dave xf86-video-ati-6.12.2/src/radeon_probe.h
+--- xf86-video-ati-6.12.2/src/radeon_probe.h.dave	2009-04-05 08:44:00.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_probe.h	2009-04-15 12:46:30.000000000 +1000
+@@ -50,6 +50,7 @@
+ #include "xaa.h"
+ #endif
+ 
++#include "radeon_dri_bufmgr.h"
+ extern DriverRec RADEON;
+ 
+ #define RADEON_MAX_CRTC 2
+@@ -159,6 +160,7 @@ typedef struct _RADEONCrtcPrivateRec {
      int can_tile;
      Bool enabled;
      Bool initialized;
-+    struct radeon_memory *cursor;
 +
  } RADEONCrtcPrivateRec, *RADEONCrtcPrivatePtr;
  
  typedef struct _radeon_encoder {
-diff -up xf86-video-ati-6.12.2/src/radeon_textured_video.c.modeset xf86-video-ati-6.12.2/src/radeon_textured_video.c
---- xf86-video-ati-6.12.2/src/radeon_textured_video.c.modeset	2009-03-27 01:13:04.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_textured_video.c	2009-04-13 13:24:51.000000000 -0400
+diff -up xf86-video-ati-6.12.2/src/radeon_textured_video.c.dave xf86-video-ati-6.12.2/src/radeon_textured_video.c
+--- xf86-video-ati-6.12.2/src/radeon_textured_video.c.dave	2009-03-27 15:13:04.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_textured_video.c	2009-04-15 12:46:30.000000000 +1000
 @@ -40,6 +40,7 @@
  #include "radeon_macros.h"
  #include "radeon_probe.h"
@@ -7847,7 +7555,7 @@
      }
  
      if (pDraw->type == DRAWABLE_WINDOW)
-@@ -451,11 +461,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -451,11 +461,21 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
@@ -7859,13 +7567,12 @@
 +    pPriv->src_offset = pPriv->video_offset;
 +    if (info->new_cs) {
 +	int ret;
++	radeon_bufmgr_gem_wait_rendering(pPriv->src_bo);
 +	ret = dri_bo_map(pPriv->src_bo, 1);
 +	if (ret) 
 +	    return BadAlloc;
 +      
 +	pPriv->src_addr = pPriv->src_bo->virtual;
-+    } else if (info->drm_mm) {
-+        pPriv->src_addr = (uint8_t *)(info->mm.front_buffer->map + pPriv->video_offset + (top * dstPitch));
 +    } else {
 +        if (info->ChipFamily >= CHIP_FAMILY_R600)
 +            pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset);
@@ -7875,7 +7582,7 @@
      pPriv->src_pitch = dstPitch;
      pPriv->planeu_offset = dstPitch * dst_height;
      pPriv->planev_offset = pPriv->planeu_offset + dstPitch2 * ((dst_height + 1) >> 1);
-@@ -481,12 +502,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -481,12 +501,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
  	    if (info->DMAForXv) {
  		if (id == FOURCC_YV12)
  		    R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset,
@@ -7890,7 +7597,7 @@
  				     srcPitch, srcPitch2, pPriv->src_pitch,
  				     width, height);
  	    } else {
-@@ -548,7 +569,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -548,7 +568,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
      default:
  	if (info->ChipFamily >= CHIP_FAMILY_R600) {
  	    if (info->DMAForXv)
@@ -7899,7 +7606,7 @@
  				 2 * width, pPriv->src_pitch,
  				 width, height);
  	    else
-@@ -566,9 +587,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -566,9 +586,25 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
  
      /* Upload bicubic filter tex */
      if (pPriv->bicubic_enabled) {
@@ -7911,6 +7618,7 @@
 +	   int ret;
 +
 +	   if (info->new_cs) {
++	       radeon_bufmgr_gem_wait_rendering(pPriv->bicubic_bo);
 +	       ret = dri_bo_map(pPriv->bicubic_bo, 1);
 +	       if (ret)
 +		   return BadAlloc;
@@ -7941,9 +7649,9 @@
  	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
      else
  #endif
-diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
---- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset	2009-04-07 11:32:12.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-13 13:24:51.000000000 -0400
+diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dave xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
+--- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dave	2009-04-08 01:32:12.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-15 12:46:30.000000000 +1000
 @@ -87,11 +87,25 @@ do {								\
  
  #endif /* !ACCEL_CP */
@@ -8249,9 +7957,9 @@
  	    OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
-diff -up xf86-video-ati-6.12.2/src/radeon_video.c.modeset xf86-video-ati-6.12.2/src/radeon_video.c
---- xf86-video-ati-6.12.2/src/radeon_video.c.modeset	2009-04-07 11:31:32.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_video.c	2009-04-13 13:24:51.000000000 -0400
+diff -up xf86-video-ati-6.12.2/src/radeon_video.c.dave xf86-video-ati-6.12.2/src/radeon_video.c
+--- xf86-video-ati-6.12.2/src/radeon_video.c.dave	2009-04-08 01:31:32.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_video.c	2009-04-15 12:46:30.000000000 +1000
 @@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
@@ -8285,9 +7993,9 @@
      {
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
-diff -up xf86-video-ati-6.12.2/src/radeon_video.h.modeset xf86-video-ati-6.12.2/src/radeon_video.h
---- xf86-video-ati-6.12.2/src/radeon_video.h.modeset	2009-04-07 11:31:53.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_video.h	2009-04-13 13:31:13.000000000 -0400
+diff -up xf86-video-ati-6.12.2/src/radeon_video.h.dave xf86-video-ati-6.12.2/src/radeon_video.h
+--- xf86-video-ati-6.12.2/src/radeon_video.h.dave	2009-04-08 01:31:53.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_video.h	2009-04-15 12:46:30.000000000 +1000
 @@ -121,6 +121,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- xorg-x11-drv-ati.spec	13 Apr 2009 17:50:19 -0000	1.175
+++ xorg-x11-drv-ati.spec	15 Apr 2009 02:54:23 -0000	1.176
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,7 +15,6 @@
 Source1:   radeon.xinf
 
 Patch1:     radeon-modeset.patch
-Patch2:     radeon-modeset-fixes.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
@@ -40,7 +39,6 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .modeset
-%patch2 -p1 -b .modeset-fix
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -74,6 +72,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-2
+- radeon-modeset.patch: fix rotation + cache mmap uninit var path
+
 * Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 6.12.2-1
 - radeon 6.12.2
 


--- radeon-modeset-fixes.patch DELETED ---



From dcantrel at fedoraproject.org  Wed Apr 15 03:19:26 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 15 Apr 2009 03:19:26 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.32, 1.33 pyparted.spec, 1.60,
	1.61 sources, 1.37, 1.38
Message-ID: <20090415031926.B764070137@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17048

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Tue Apr 14 2009 David Cantrell <dcantrell at redhat.com> - 2.0.12-1
- Upgrade to pyparted-2.0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	13 Apr 2009 19:52:59 -0000	1.32
+++ .cvsignore	15 Apr 2009 03:18:52 -0000	1.33
@@ -1 +1 @@
-pyparted-2.0.11.tar.gz
+pyparted-2.0.12.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pyparted.spec	13 Apr 2009 19:52:59 -0000	1.60
+++ pyparted.spec	15 Apr 2009 03:18:53 -0000	1.61
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.0.11
+Version: 2.0.12
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -41,6 +41,9 @@
 %{python_sitearch}/parted
 
 %changelog
+* Tue Apr 14 2009 David Cantrell <dcantrell at redhat.com> - 2.0.12-1
+- Upgrade to pyparted-2.0.12
+
 * Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 2.0.11-1
 - Upgrade to pyparted-2.0.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	13 Apr 2009 19:52:59 -0000	1.37
+++ sources	15 Apr 2009 03:18:53 -0000	1.38
@@ -1 +1 @@
-8c42d3b66543b47911da8e2d48b26668  pyparted-2.0.11.tar.gz
+8fc485db0b88e59bbdfc4be8ba4068fa  pyparted-2.0.12.tar.gz



From mdomsch at fedoraproject.org  Wed Apr 15 04:52:07 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 15 Apr 2009 04:52:07 +0000 (UTC)
Subject: rpms/dkms/devel dkms-modprobe.d.patch, NONE, 1.1 .cvsignore, 1.14, 
	1.15 dkms.spec, 1.19, 1.20 sources, 1.14, 1.15
Message-ID: <20090415045207.B57A0700D7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8245

Modified Files:
	.cvsignore dkms.spec sources 
Added Files:
	dkms-modprobe.d.patch 
Log Message:
update to 2.0.21.1 plus patch

dkms-modprobe.d.patch:

--- NEW FILE dkms-modprobe.d.patch ---
>From b2721fad5e830cc4c689ecfd37cdd1ab3768daf3 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <Mario_Limonciello at Dell.com>
Date: Thu, 5 Mar 2009 11:06:50 -0600
Subject: [PATCH] merge in a few changes from Keybuk to alter behaviors on Ubuntu a little bit

---

diff --git a/dkms b/dkms
index eccd84e..a8b1d58 100755
--- a/dkms
+++ b/dkms
@@ -705,6 +705,7 @@ function moduleconfig_add ()
 
     local temp_dir_name=`mktemp -d $tmp_location/dkms.XXXXXX`
     modconfig_files=""
+    [ -e /etc/modprobe.d/dkms.conf ] && modconfig_files="/etc/modprobe.d/dkms.conf"
     [ -e /etc/modprobe.d/dkms ] && modconfig_files="/etc/modprobe.d/dkms"
     [ -e /etc/modules.conf ] && modconfig_files="$modconfig_files /etc/modules.conf"
     [ -e /etc/modprobe.conf ] && modconfig_files="$modconfig_files /etc/modprobe.conf"
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 May 2008 21:44:15 -0000	1.14
+++ .cvsignore	15 Apr 2009 04:51:37 -0000	1.15
@@ -1 +1 @@
-dkms-2.0.19.1.tar.gz
+dkms-2.0.21.1.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dkms.spec	24 Feb 2009 12:07:36 -0000	1.19
+++ dkms.spec	15 Apr 2009 04:51:37 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.19.1
-Release: 2%{?dist}
+Version: 2.0.21.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -11,9 +11,12 @@
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
+Patch0: dkms-modprobe.d.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# when building for Fedora, uncomment this Requires
+
+%if 0%{?fedora}
 Requires: kernel-devel
+%endif
 
 %description
 This package contains the framework for the Dynamic
@@ -23,6 +26,8 @@
 %prep
 
 %setup -q
+%patch0 -p1
+
 %build
 
 %triggerpostun -- %{name} < 1.90.00-1
@@ -100,6 +105,16 @@
 %{_sysconfdir}/kernel/prerm.d/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}
 
+%if 0%{?suse_version}
+# suse doesnt yet support /etc/kernel/{prerm.d,postinst.d}, but will fail build
+# with unowned dirs if we dont own them ourselves
+# when opensuse *does* add this support, we will need to BuildRequires kernel
+%dir %{_sysconfdir}/kernel
+%dir %{_sysconfdir}/kernel/postinst.d
+%dir %{_sysconfdir}/kernel/prerm.d
+%endif
+
+
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
 # enable on initial install
@@ -110,6 +125,9 @@
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
+- update to latest upstream
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.19.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 May 2008 21:44:15 -0000	1.14
+++ sources	15 Apr 2009 04:51:37 -0000	1.15
@@ -1 +1 @@
-d51bb4a0679dcd6152dfa0c37c3b716b  dkms-2.0.19.1.tar.gz
+539113eabf49356b9659c85512927519  dkms-2.0.21.1.tar.gz



From airlied at fedoraproject.org  Wed Apr 15 08:43:08 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 15 Apr 2009 08:43:08 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.0-randr-xinerama-crash.patch, 
	NONE, 1.1 xorg-x11-server.spec, 1.433, 1.434
Message-ID: <20090415084308.D25CD70101@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26761

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.0-randr-xinerama-crash.patch 
Log Message:
* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 1.6.1-2
- xserver-1.6.0-randr-xinerama-crash.patch - fix xinerama vs randr crash


xserver-1.6.0-randr-xinerama-crash.patch:

--- NEW FILE xserver-1.6.0-randr-xinerama-crash.patch ---
>From be710aa311f385827f7d4ac1773971d575353d3b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Wed, 15 Apr 2009 18:26:06 +1000
Subject: [PATCH] randr12: looking up these bits if randr isn't initialised is bad.

With xinerama enabled I get a segfault in here, this might not
be the right answer.
---
 hw/xfree86/modes/xf86RandR12.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index dacb5d2..ac066a8 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -754,8 +754,8 @@ Bool
 xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 {
     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    xf86CrtcConfigPtr   config;
+    XF86RandRInfoPtr	randrp;
     int			c;
     int			width, height;
     int			mmWidth, mmHeight;
@@ -765,6 +765,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	return TRUE;
 #endif
 
+    config = XF86_CRTC_CONFIG_PTR(pScrn);
+    randrp = XF86RANDRINFO(pScreen);
     /*
      * Compute size of screen
      */
-- 
1.6.0.6



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- xorg-x11-server.spec	14 Apr 2009 20:55:05 -0000	1.433
+++ xorg-x11-server.spec	15 Apr 2009 08:42:38 -0000	1.434
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -103,6 +103,8 @@
 Patch6028: xserver-1.6.0-restore-zap.patch
 Patch6029: xserver-1.6.0-no-i810.patch
 
+Patch6030: xserver-1.6.0-randr-xinerama-crash.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -533,6 +535,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 1.6.1-2
+- xserver-1.6.0-randr-xinerama-crash.patch - fix xinerama vs randr crash
+
 * Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 1.6.1-1
 - xserver 1.6.1
 



From twoerner at fedoraproject.org  Wed Apr 15 08:54:12 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Wed, 15 Apr 2009 08:54:12 +0000 (UTC)
Subject: rpms/system-config-firewall/F-11 .cvsignore, 1.27, 1.28 sources,
	1.30, 1.31 system-config-firewall.spec, 1.40, 1.41
Message-ID: <20090415085412.2927D70101@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29498

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- fixed build system to update desktop file from desktop.in
  fixes icon reference in desktop file (rhbz#493674)
- updated translations: fr





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Apr 2009 19:56:12 -0000	1.27
+++ .cvsignore	15 Apr 2009 08:53:41 -0000	1.28
@@ -1,2 +1,3 @@
 system-config-firewall-1.2.14.tar.bz2
 system-config-firewall-1.2.15.tar.bz2
+system-config-firewall-1.2.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Apr 2009 19:56:12 -0000	1.30
+++ sources	15 Apr 2009 08:53:41 -0000	1.31
@@ -1 +1 @@
-c40dcdd913922616c5a2a0cad126162d  system-config-firewall-1.2.15.tar.bz2
+3ee22c42c95cef53564db30285aaf1b9  system-config-firewall-1.2.16.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-11/system-config-firewall.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-firewall.spec	13 Apr 2009 19:56:12 -0000	1.40
+++ system-config-firewall.spec	15 Apr 2009 08:53:41 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.15
-Release: 1%{?dist}
+Version: 1.2.16
+Release: 2%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
 ExclusiveOS: Linux
@@ -119,6 +119,14 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Mon Apr 13 2009 Thomas Woerner <twoerner at redhat.com> 1.2.16-2
+- release bump
+
+* Mon Apr 13 2009 Thomas Woerner <twoerner at redhat.com> 1.2.16-1
+- fixed build system to update desktop file from desktop.in
+  fixes icon reference in desktop file (rhbz#493674)
+- updated translations: fr
+
 * Mon Apr 13 2009 Thomas Woerner <twoerner at redhat.com> 1.2.15-1
 - fixed icon reference in desktop file (rhbz#493674)
 - fixed po/POTFILES.in



From sharkcz at fedoraproject.org  Wed Apr 15 09:36:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 15 Apr 2009 09:36:06 +0000 (UTC)
Subject: rpms/qlandkartegt/F-11 .cvsignore, 1.7, 1.8 qlandkartegt.spec, 1.7, 
	1.8 sources, 1.7, 1.8
Message-ID: <20090415093606.679D470101@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7614

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Wed Apr 15 2009 Dan Horak <dan[at]danny.cz> 0.11.1-1
- update to 0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Feb 2009 20:47:16 -0000	1.7
+++ .cvsignore	15 Apr 2009 09:35:34 -0000	1.8
@@ -1 +1 @@
-QLandkarteGT.0.10.0.tar.gz
+qlandkartegt-0.11.1.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qlandkartegt.spec	25 Feb 2009 17:44:00 -0000	1.7
+++ qlandkartegt.spec	15 Apr 2009 09:35:34 -0000	1.8
@@ -1,15 +1,12 @@
-%define cap_name QLandkarteGT
-%define rel_date 2009.02.06
-
 Name: qlandkartegt
-Version: 0.10.0
-Release: 2%{?dist}
+Version: 0.11.1
+Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.qlandkarte.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}.%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.15
 
@@ -36,10 +33,7 @@
 
 
 %prep
-%setup -q -n %{cap_name}.%{rel_date}
-
-# fix libdir
-sed -i "s|/usr/lib/qlandkarte|%{_libdir}/%{name}|g" CMakeLists.txt
+%setup -q
 
 # create build direcotory
 mkdir build
@@ -69,10 +63,17 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/%{name}
 %{_mandir}/man1/%{name}.*
 
 
 %changelog
+* Wed Apr 15 2009 Dan Horak <dan[at]danny.cz> 0.11.1-1
+- update to 0.11.1
+
+* Tue Mar 10 2009 Dan Horak <dan[at]danny.cz> 0.11.0-1
+- update to 0.11.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Feb 2009 20:47:16 -0000	1.7
+++ sources	15 Apr 2009 09:35:34 -0000	1.8
@@ -1 +1 @@
-21a7388036482fd3963b05104fc74bcb  QLandkarteGT.0.10.0.tar.gz
+d028aa6e99486c4c45f92deb78a7ffd6  qlandkartegt-0.11.1.tar.gz



From sharkcz at fedoraproject.org  Wed Apr 15 09:37:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 15 Apr 2009 09:37:38 +0000 (UTC)
Subject: rpms/qlandkartegt/F-10 .cvsignore, 1.7, 1.8 qlandkartegt.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <20090415093738.E87C270101@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8089

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Wed Apr 15 2009 Dan Horak <dan[at]danny.cz> 0.11.1-1
- update to 0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Feb 2009 20:55:02 -0000	1.7
+++ .cvsignore	15 Apr 2009 09:37:08 -0000	1.8
@@ -1 +1 @@
-QLandkarteGT.0.10.0.tar.gz
+qlandkartegt-0.11.1.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/qlandkartegt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qlandkartegt.spec	6 Feb 2009 20:55:02 -0000	1.6
+++ qlandkartegt.spec	15 Apr 2009 09:37:08 -0000	1.7
@@ -1,15 +1,12 @@
-%define cap_name QLandkarteGT
-%define rel_date 2009.02.06
-
 Name: qlandkartegt
-Version: 0.10.0
+Version: 0.11.1
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.qlandkarte.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}.%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.15
 
@@ -36,10 +33,7 @@
 
 
 %prep
-%setup -q -n %{cap_name}.%{rel_date}
-
-# fix libdir
-sed -i "s|/usr/lib/qlandkarte|%{_libdir}/%{name}|g" CMakeLists.txt
+%setup -q
 
 # create build direcotory
 mkdir build
@@ -69,10 +63,20 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/%{name}
 %{_mandir}/man1/%{name}.*
 
 
 %changelog
+* Wed Apr 15 2009 Dan Horak <dan[at]danny.cz> 0.11.1-1
+- update to 0.11.1
+
+* Tue Mar 10 2009 Dan Horak <dan[at]danny.cz> 0.11.0-1
+- update to 0.11.0
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb  6 2009 Dan Horak <dan[at]danny.cz> 0.10.0-1
 - update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Feb 2009 20:55:02 -0000	1.7
+++ sources	15 Apr 2009 09:37:08 -0000	1.8
@@ -1 +1 @@
-21a7388036482fd3963b05104fc74bcb  QLandkarteGT.0.10.0.tar.gz
+d028aa6e99486c4c45f92deb78a7ffd6  qlandkartegt-0.11.1.tar.gz



From emunson at fedoraproject.org  Wed Apr 15 09:39:41 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed, 15 Apr 2009 09:39:41 +0000 (UTC)
Subject: rpms/libhugetlbfs/F-11 .cvsignore, 1.13, 1.14 import.log, 1.5,
	1.6 libhugetlbfs.spec, 1.23, 1.24 sources, 1.13, 1.14
Message-ID: <20090415093941.77EB770101@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7504/F-11

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
updating libhugetlbfs to 2.3 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Feb 2009 10:25:10 -0000	1.13
+++ .cvsignore	15 Apr 2009 09:39:10 -0000	1.14
@@ -1 +1 @@
-libhugetlbfs-2.2.tar.gz
+libhugetlbfs-2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Feb 2009 10:25:10 -0000	1.5
+++ import.log	15 Apr 2009 09:39:11 -0000	1.6
@@ -3,3 +3,4 @@
 libhugetlbfs-2_1_1-1_fc10:HEAD:libhugetlbfs-2.1.1.src.rpm:1229684394
 libhugetlbfs-2_1_2-1_fc10:HEAD:libhugetlbfs-2.1.2.src.rpm:1231930438
 libhugetlbfs-2_2-1_fc10:HEAD:libhugetlbfs-2.2-1.src.rpm:1234347934
+libhugetlbfs-2_3-1_fc10:F-11:libhugetlbfs-2.3-1.src.rpm:1239788219


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/libhugetlbfs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libhugetlbfs.spec	25 Feb 2009 15:40:00 -0000	1.23
+++ libhugetlbfs.spec	15 Apr 2009 09:39:11 -0000	1.24
@@ -1,12 +1,12 @@
 Name: libhugetlbfs
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.3
+Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
-URL: http://libhugetlbfs.ozlabs.org/ 
-Source0: http://libhugetlbfs.ozlabs.org/releases/%{name}-%{version}.tar.gz       
+URL: http://libhugetlbfs.sourceforge.net/
+Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -92,9 +92,6 @@
 %{_mandir}/man1/pagesize.1.gz
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Feb 11 2009 Eric Munson <ebmunson at us.ibm.com> 2.2-1
 - Updateing for the libhugetlbfs-2.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Feb 2009 10:25:11 -0000	1.13
+++ sources	15 Apr 2009 09:39:11 -0000	1.14
@@ -1 +1 @@
-8a35d5bfb8efaf27bc87b635f450f0c4  libhugetlbfs-2.2.tar.gz
+edb46836fb54a36664fbc498fadfefe8  libhugetlbfs-2.3.tar.gz



From sharkcz at fedoraproject.org  Wed Apr 15 09:40:04 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 15 Apr 2009 09:40:04 +0000 (UTC)
Subject: rpms/qlandkartegt/F-9 .cvsignore, 1.7, 1.8 qlandkartegt.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <20090415094004.D40B370101@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8595

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Wed Apr 15 2009 Dan Horak <dan[at]danny.cz> 0.11.1-1
- update to 0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Feb 2009 20:57:10 -0000	1.7
+++ .cvsignore	15 Apr 2009 09:39:34 -0000	1.8
@@ -1 +1 @@
-QLandkarteGT.0.10.0.tar.gz
+qlandkartegt-0.11.1.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-9/qlandkartegt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qlandkartegt.spec	6 Feb 2009 20:57:10 -0000	1.6
+++ qlandkartegt.spec	15 Apr 2009 09:39:34 -0000	1.7
@@ -1,15 +1,12 @@
-%define cap_name QLandkarteGT
-%define rel_date 2009.02.06
-
 Name: qlandkartegt
-Version: 0.10.0
+Version: 0.11.1
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.qlandkarte.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}.%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.15
 
@@ -36,10 +33,7 @@
 
 
 %prep
-%setup -q -n %{cap_name}.%{rel_date}
-
-# fix libdir
-sed -i "s|/usr/lib/qlandkarte|%{_libdir}/%{name}|g" CMakeLists.txt
+%setup -q
 
 # create build direcotory
 mkdir build
@@ -69,10 +63,20 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/%{name}
 %{_mandir}/man1/%{name}.*
 
 
 %changelog
+* Wed Apr 15 2009 Dan Horak <dan[at]danny.cz> 0.11.1-1
+- update to 0.11.1
+
+* Tue Mar 10 2009 Dan Horak <dan[at]danny.cz> 0.11.0-1
+- update to 0.11.0
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb  6 2009 Dan Horak <dan[at]danny.cz> 0.10.0-1
 - update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Feb 2009 20:57:10 -0000	1.7
+++ sources	15 Apr 2009 09:39:34 -0000	1.8
@@ -1 +1 @@
-21a7388036482fd3963b05104fc74bcb  QLandkarteGT.0.10.0.tar.gz
+d028aa6e99486c4c45f92deb78a7ffd6  qlandkartegt-0.11.1.tar.gz



From emunson at fedoraproject.org  Wed Apr 15 09:42:16 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed, 15 Apr 2009 09:42:16 +0000 (UTC)
Subject: rpms/libhugetlbfs/F-10 .cvsignore, 1.12, 1.13 import.log, 1.4,
	1.5 libhugetlbfs.spec, 1.21, 1.22 sources, 1.12, 1.13
Message-ID: <20090415094216.7CDD470101@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9255/F-10

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
updating libhugetlbfs to 2.3 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Feb 2009 10:26:46 -0000	1.12
+++ .cvsignore	15 Apr 2009 09:41:44 -0000	1.13
@@ -1 +1 @@
-libhugetlbfs-2.2.tar.gz
+libhugetlbfs-2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	11 Feb 2009 10:26:46 -0000	1.4
+++ import.log	15 Apr 2009 09:41:44 -0000	1.5
@@ -2,3 +2,4 @@
 libhugetlbfs-2_1_1-1_fc10:F-10:libhugetlbfs-2.1.1.src.rpm:1229684265
 libhugetlbfs-2_1_2-1_fc10:F-10:libhugetlbfs-2.1.2.src.rpm:1231930556
 libhugetlbfs-2_2-1_fc10:F-10:libhugetlbfs-2.2-1.src.rpm:1234348028
+libhugetlbfs-2_3-1_fc10:F-10:libhugetlbfs-2.3-1.src.rpm:1239788612


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/libhugetlbfs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libhugetlbfs.spec	11 Feb 2009 10:26:46 -0000	1.21
+++ libhugetlbfs.spec	15 Apr 2009 09:41:44 -0000	1.22
@@ -1,12 +1,12 @@
 Name: libhugetlbfs
-Version: 2.2
+Version: 2.3
 Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
-URL: http://libhugetlbfs.ozlabs.org/ 
-Source0: http://libhugetlbfs.ozlabs.org/releases/%{name}-%{version}.tar.gz       
+URL: http://libhugetlbfs.sourceforge.net/
+Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Feb 2009 10:26:46 -0000	1.12
+++ sources	15 Apr 2009 09:41:44 -0000	1.13
@@ -1 +1 @@
-8a35d5bfb8efaf27bc87b635f450f0c4  libhugetlbfs-2.2.tar.gz
+edb46836fb54a36664fbc498fadfefe8  libhugetlbfs-2.3.tar.gz



From emunson at fedoraproject.org  Wed Apr 15 09:44:33 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed, 15 Apr 2009 09:44:33 +0000 (UTC)
Subject: rpms/libhugetlbfs/devel .cvsignore, 1.13, 1.14 import.log, 1.5,
	1.6 libhugetlbfs.spec, 1.23, 1.24 sources, 1.13, 1.14
Message-ID: <20090415094433.16A6070127@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10199/devel

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
updating libhugetlbfs to 2.3 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Feb 2009 10:25:10 -0000	1.13
+++ .cvsignore	15 Apr 2009 09:44:02 -0000	1.14
@@ -1 +1 @@
-libhugetlbfs-2.2.tar.gz
+libhugetlbfs-2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Feb 2009 10:25:10 -0000	1.5
+++ import.log	15 Apr 2009 09:44:02 -0000	1.6
@@ -3,3 +3,4 @@
 libhugetlbfs-2_1_1-1_fc10:HEAD:libhugetlbfs-2.1.1.src.rpm:1229684394
 libhugetlbfs-2_1_2-1_fc10:HEAD:libhugetlbfs-2.1.2.src.rpm:1231930438
 libhugetlbfs-2_2-1_fc10:HEAD:libhugetlbfs-2.2-1.src.rpm:1234347934
+libhugetlbfs-2_3-1_fc10:HEAD:libhugetlbfs-2.3-1.src.rpm:1239788767


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/libhugetlbfs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libhugetlbfs.spec	25 Feb 2009 15:40:00 -0000	1.23
+++ libhugetlbfs.spec	15 Apr 2009 09:44:02 -0000	1.24
@@ -1,12 +1,12 @@
 Name: libhugetlbfs
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.3
+Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
-URL: http://libhugetlbfs.ozlabs.org/ 
-Source0: http://libhugetlbfs.ozlabs.org/releases/%{name}-%{version}.tar.gz       
+URL: http://libhugetlbfs.sourceforge.net/
+Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -92,9 +92,6 @@
 %{_mandir}/man1/pagesize.1.gz
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Feb 11 2009 Eric Munson <ebmunson at us.ibm.com> 2.2-1
 - Updateing for the libhugetlbfs-2.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Feb 2009 10:25:11 -0000	1.13
+++ sources	15 Apr 2009 09:44:02 -0000	1.14
@@ -1 +1 @@
-8a35d5bfb8efaf27bc87b635f450f0c4  libhugetlbfs-2.2.tar.gz
+edb46836fb54a36664fbc498fadfefe8  libhugetlbfs-2.3.tar.gz



From denis at fedoraproject.org  Wed Apr 15 09:55:21 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 15 Apr 2009 09:55:21 +0000 (UTC)
Subject: rpms/glom/devel glom.spec,1.33,1.34
Message-ID: <20090415095521.6FADE70101@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13099

Modified Files:
	glom.spec 
Log Message:
Requires libgda-sqlite


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- glom.spec	25 Mar 2009 09:06:39 -0000	1.33
+++ glom.spec	15 Apr 2009 09:54:51 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -33,8 +33,12 @@
 BuildRequires:  goocanvasmm-devel >= 0.13.0
 BuildRequires:  libepc-devel
 
+# Glom curently only supports postgresql well and uses it by default.
 Requires:       postgresql-server
+# Both gda providers are dlopened by libgda. sqlite is used internally
+# by glom.
 Requires:       libgda-postgres
+Requires:       libgda-sqlite
 
 Requires(post):   shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -159,6 +163,9 @@
 
 
 %changelog
+* Sat Apr  4 2009 Denis Leroy <denis at poolshark.org> - 1.10.0-3
+- Requires libgda-sqlite 
+
 * Wed Mar 25 2009 Denis Leroy <denis at poolshark.org> - 1.10.0-2
 - Fixed libs rpmlint complaints
 



From limb at fedoraproject.org  Wed Apr 15 10:11:11 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 15 Apr 2009 10:11:11 +0000 (UTC)
Subject: rpms/numpy/F-11 numpy.spec,1.33,1.34
Message-ID: <20090415101111.1D3C270101@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16297

Modified Files:
	numpy.spec 
Log Message:
f2py split



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/F-11/numpy.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- numpy.spec	7 Apr 2009 16:19:56 -0000	1.33
+++ numpy.spec	15 Apr 2009 10:10:39 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -15,10 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel lapack-devel python-setuptools gcc-gfortran atlas python-nose
-Requires:	python-nose python-devel
-
-Provides:       f2py
-Obsoletes:      f2py <= 2.45.241_1927
+Requires:	python-nose
 
 %description
 NumPy is a general-purpose array-processing package designed to
@@ -32,6 +29,17 @@
 basic linear algebra and random number generation. Also included in
 this package is a version of f2py that works properly with NumPy.
 
+%package f2py
+Summary:        f2py for numpy
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-devel
+Provides:       f2py
+Obsoletes:      f2py <= 2.45.241_1927
+
+%description f2py
+This package includes a version of f2py that works properly with NumPy.
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .f2py
@@ -57,6 +65,15 @@
 ln -s f2py f2py.numpy
 popd &> /dev/null
 
+# Remove doc files. They should in in %doc
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/COMPATIBILITY
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/DEV_README.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/INSTALL.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/LICENSE.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/README.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/THANKS.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/site.cfg.example
+
 %check
 pushd doc &> /dev/null
 PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test()"
@@ -67,15 +84,35 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs-f2py doc/* LICENSE.txt
-%{_bindir}/*
-%{_mandir}/man*/*
-%{python_sitearch}/%{name}
+%doc docs-f2py doc/* LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
+%dir %{python_sitearch}/%{name}
+%{python_sitearch}/%{name}/*.py*
+%{python_sitearch}/%{name}/core
+%{python_sitearch}/%{name}/lib
+%{python_sitearch}/%{name}/ma
+%{python_sitearch}/%{name}/numarray
+%{python_sitearch}/%{name}/oldnumeric
+%{python_sitearch}/%{name}/random
+%{python_sitearch}/%{name}/testing
+%{python_sitearch}/%{name}/tests
 %if 0%{?fedora} >= 9
 %{python_sitearch}/%{name}-*.egg-info
 %endif
 
+%files f2py
+%defattr(-,root,root,-)
+%{_mandir}/man*/*
+%{_bindir}/f2py
+%{_bindir}/f2py.numpy
+%{python_sitearch}/%{name}/distutils
+%{python_sitearch}/%{name}/f2py
+%{python_sitearch}/%{name}/fft
+%{python_sitearch}/%{name}/linalg
+
 %changelog
+* Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-2
+- Split out f2py into subpackage, thanks Peter Robinson pbrobinson at gmail.com.
+
 * Tue Apr 07 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-1
 - Update to latest upstream.
 - Fixed Source0 URL.



From varekova at fedoraproject.org  Wed Apr 15 10:26:33 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed, 15 Apr 2009 10:26:33 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link.spec,1.84,1.85
Message-ID: <20090415102633.72C3C70101@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19721

Modified Files:
	pilot-link.spec 
Log Message:
 Rename blacklist-visor to blacklist-visor.conf



Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- pilot-link.spec	27 Feb 2009 00:28:37 -0000	1.84
+++ pilot-link.spec	15 Apr 2009 10:26:31 -0000	1.85
@@ -2,7 +2,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -139,7 +139,7 @@
 
 # Put visor to blacklist
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
-install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
+install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor.conf
 
 # put README.fedora into tree
 cp %{SOURCE4} README.fedora
@@ -157,7 +157,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README NEWS doc/README.usb doc/README.debugging doc/README.libusb README.fedora
-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor.conf
 %{_libdir}/*.so.*
 %{_bindir}/*
 %exclude %{_bindir}/pilot-ietf2datebook
@@ -185,6 +185,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-20
+- rename blacklist-visor to blacklist-visor.conf (#494765)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:0.12.3-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Apr 15 10:27:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 10:27:32 +0000
Subject: [pkgdb] openobex had acl change status
Message-ID: <20090415102732.7C08C10F87B@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on openobex (Fedora devel) to Approved for holtmann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openobex



From pkgdb at fedoraproject.org  Wed Apr 15 10:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 10:27:34 +0000
Subject: [pkgdb] openobex had acl change status
Message-ID: <20090415102734.33CC210F87E@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on openobex (Fedora devel) to Approved for holtmann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openobex



From than at fedoraproject.org  Wed Apr 15 10:54:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 15 Apr 2009 10:54:13 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils-4.2.2-ark.patch, NONE,
	1.1 kdeutils-4.2.2-pykde4.patch, NONE, 1.1 kdeutils.spec, 1.170, 1.171
Message-ID: <20090415105413.BB9AE70101@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27101

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.2.2-ark.patch kdeutils-4.2.2-pykde4.patch 
Log Message:
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime
- fix kdeutils-printer-applet dependency
- apply upstream patch to fix several issues in ark



kdeutils-4.2.2-ark.patch:

--- NEW FILE kdeutils-4.2.2-ark.patch ---
--- kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/01/06 17:13:38	906699
+++ kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/04/15 05:07:17	954094
@@ -117,7 +117,7 @@
 		{
 			foreach( const QString& mimeType, service->serviceTypes() )
 			{
-				if ( !mimeType.contains( "Kerfuffle" ) )
+				if ( !mimeType.contains( "Kerfuffle" ) && !supported.contains( mimeType ) )
 				{
 					supported << mimeType;
 				}
--- kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/06 07:13:01	949880
+++ kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/15 04:56:31	954092
@@ -108,7 +108,7 @@
 	else // Try to open it in an external application
 	{
 		KUrl fileUrl( filename );
-		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true, true )->name(), parent );
+		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true )->name(), parent );
 		return;
 	}
 

kdeutils-4.2.2-pykde4.patch:

--- NEW FILE kdeutils-4.2.2-pykde4.patch ---
diff -up kdeutils-4.2.2/CMakeLists.txt.orig kdeutils-4.2.2/CMakeLists.txt
diff -up kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig kdeutils-4.2.2/printer-applet/CMakeLists.txt
--- kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig	2009-04-15 12:18:18.000000000 +0200
+++ kdeutils-4.2.2/printer-applet/CMakeLists.txt	2009-04-15 12:24:37.000000000 +0200
@@ -7,24 +7,9 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdeutils.spec	1 Apr 2009 19:17:30 -0000	1.170
+++ kdeutils.spec	15 Apr 2009 10:53:41 -0000	1.171
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -18,6 +18,10 @@
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
+Patch1:         kdeutils-4.2.2-pykde4.patch
+# upstream fixes
+Patch100:       kdeutils-4.2.2-ark.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -32,12 +36,6 @@
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
-# printer applet
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -72,6 +70,10 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
+# upgrade path so it doesn't get lost
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < 6:4.2.1-3
+
 %description printer-applet
 %{summary}.
 
@@ -90,7 +92,10 @@
 # make kjots build with kdeutils
 %patch0 -p1 -b .kjots
 %endif
+%patch1 -p1 -b .pykde4
 
+# upstream fixes
+%patch100 -p1 -b .ark
 
 %build
 
@@ -195,6 +200,12 @@
 
 
 %changelog
+* Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+- fix kdeutils-printer-applet dependency
+- apply upstream patch to fix several issues in ark
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From than at fedoraproject.org  Wed Apr 15 10:56:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 15 Apr 2009 10:56:42 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils-4.2.2-ark.patch, NONE,
	1.1 kdeutils-4.2.2-pykde4.patch, NONE, 1.1 kdeutils.spec, 1.170, 1.171
Message-ID: <20090415105642.B5D7B70101@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27916

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.2.2-ark.patch kdeutils-4.2.2-pykde4.patch 
Log Message:
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime
- fix kdeutils-printer-applet dependency
- apply upstream patch to fix several issues in ark



kdeutils-4.2.2-ark.patch:

--- NEW FILE kdeutils-4.2.2-ark.patch ---
--- kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/01/06 17:13:38	906699
+++ kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/04/15 05:07:17	954094
@@ -117,7 +117,7 @@
 		{
 			foreach( const QString& mimeType, service->serviceTypes() )
 			{
-				if ( !mimeType.contains( "Kerfuffle" ) )
+				if ( !mimeType.contains( "Kerfuffle" ) && !supported.contains( mimeType ) )
 				{
 					supported << mimeType;
 				}
--- kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/06 07:13:01	949880
+++ kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/15 04:56:31	954092
@@ -108,7 +108,7 @@
 	else // Try to open it in an external application
 	{
 		KUrl fileUrl( filename );
-		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true, true )->name(), parent );
+		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true )->name(), parent );
 		return;
 	}
 

kdeutils-4.2.2-pykde4.patch:

--- NEW FILE kdeutils-4.2.2-pykde4.patch ---
diff -up kdeutils-4.2.2/CMakeLists.txt.orig kdeutils-4.2.2/CMakeLists.txt
diff -up kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig kdeutils-4.2.2/printer-applet/CMakeLists.txt
--- kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig	2009-04-15 12:18:18.000000000 +0200
+++ kdeutils-4.2.2/printer-applet/CMakeLists.txt	2009-04-15 12:24:37.000000000 +0200
@@ -7,24 +7,9 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdeutils.spec	1 Apr 2009 19:17:30 -0000	1.170
+++ kdeutils.spec	15 Apr 2009 10:56:12 -0000	1.171
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -18,6 +18,10 @@
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
+Patch1:         kdeutils-4.2.2-pykde4.patch
+# upstream fixes
+Patch100:       kdeutils-4.2.2-ark.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -32,12 +36,6 @@
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
-# printer applet
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -72,6 +70,10 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
+# upgrade path so it doesn't get lost
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < 6:4.2.1-3
+
 %description printer-applet
 %{summary}.
 
@@ -90,7 +92,10 @@
 # make kjots build with kdeutils
 %patch0 -p1 -b .kjots
 %endif
+%patch1 -p1 -b .pykde4
 
+# upstream fixes
+%patch100 -p1 -b .ark
 
 %build
 
@@ -195,6 +200,12 @@
 
 
 %changelog
+* Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+- fix kdeutils-printer-applet dependency
+- apply upstream patch to fix several issues in ark
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From than at fedoraproject.org  Wed Apr 15 10:58:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 15 Apr 2009 10:58:50 +0000 (UTC)
Subject: rpms/kdeutils/F-10 kdeutils-4.2.2-ark.patch, NONE,
	1.1 kdeutils-4.2.2-pykde4.patch, NONE, 1.1 kdeutils.spec, 1.154, 1.155
Message-ID: <20090415105850.6C7AA70101@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28837

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.2.2-ark.patch kdeutils-4.2.2-pykde4.patch 
Log Message:
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime
- fix kdeutils-printer-applet dependency
- apply upstream patch to fix several issues in ark



kdeutils-4.2.2-ark.patch:

--- NEW FILE kdeutils-4.2.2-ark.patch ---
--- kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/01/06 17:13:38	906699
+++ kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/04/15 05:07:17	954094
@@ -117,7 +117,7 @@
 		{
 			foreach( const QString& mimeType, service->serviceTypes() )
 			{
-				if ( !mimeType.contains( "Kerfuffle" ) )
+				if ( !mimeType.contains( "Kerfuffle" ) && !supported.contains( mimeType ) )
 				{
 					supported << mimeType;
 				}
--- kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/06 07:13:01	949880
+++ kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/15 04:56:31	954092
@@ -108,7 +108,7 @@
 	else // Try to open it in an external application
 	{
 		KUrl fileUrl( filename );
-		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true, true )->name(), parent );
+		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true )->name(), parent );
 		return;
 	}
 

kdeutils-4.2.2-pykde4.patch:

--- NEW FILE kdeutils-4.2.2-pykde4.patch ---
diff -up kdeutils-4.2.2/CMakeLists.txt.orig kdeutils-4.2.2/CMakeLists.txt
diff -up kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig kdeutils-4.2.2/printer-applet/CMakeLists.txt
--- kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig	2009-04-15 12:18:18.000000000 +0200
+++ kdeutils-4.2.2/printer-applet/CMakeLists.txt	2009-04-15 12:24:37.000000000 +0200
@@ -7,24 +7,9 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdeutils.spec	2 Apr 2009 15:31:02 -0000	1.154
+++ kdeutils.spec	15 Apr 2009 10:58:19 -0000	1.155
@@ -1,12 +1,12 @@
 %if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
 %define include_kjots 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -18,6 +18,10 @@
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
+Patch1:         kdeutils-4.2.2-pykde4.patch
+# upstream fixes
+Patch100:       kdeutils-4.2.2-ark.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -32,12 +36,6 @@
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
-# printer applet
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -72,6 +70,10 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
+# upgrade path so it doesn't get lost
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < 6:4.2.1-3
+
 %description printer-applet
 %{summary}.
 
@@ -90,7 +92,10 @@
 # make kjots build with kdeutils
 %patch0 -p1 -b .kjots
 %endif
+%patch1 -p1 -b .pykde4
 
+# upstream fixes
+%patch100 -p1 -b .ark
 
 %build
 
@@ -195,6 +200,12 @@
 
 
 %changelog
+* Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+- fix kdeutils-printer-applet dependency
+- apply upstream patch to fix several issues in ark
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From than at fedoraproject.org  Wed Apr 15 11:01:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 15 Apr 2009 11:01:12 +0000 (UTC)
Subject: rpms/kdeutils/F-9 kdeutils-4.2.2-ark.patch, NONE,
	1.1 kdeutils-4.2.2-pykde4.patch, NONE, 1.1 kdeutils.spec, 1.140, 1.141
Message-ID: <20090415110112.58D3B70101@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29608

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.2.2-ark.patch kdeutils-4.2.2-pykde4.patch 
Log Message:
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime
- fix kdeutils-printer-applet dependency
- apply upstream patch to fix several issues in ark



kdeutils-4.2.2-ark.patch:

--- NEW FILE kdeutils-4.2.2-ark.patch ---
--- kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/01/06 17:13:38	906699
+++ kdeutils-4.2.2/ark/kerfuffle/archive.cpp	2009/04/15 05:07:17	954094
@@ -117,7 +117,7 @@
 		{
 			foreach( const QString& mimeType, service->serviceTypes() )
 			{
-				if ( !mimeType.contains( "Kerfuffle" ) )
+				if ( !mimeType.contains( "Kerfuffle" ) && !supported.contains( mimeType ) )
 				{
 					supported << mimeType;
 				}
--- kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/06 07:13:01	949880
+++ kdeutils-4.2.2/ark/part/arkviewer.cpp	2009/04/15 04:56:31	954092
@@ -108,7 +108,7 @@
 	else // Try to open it in an external application
 	{
 		KUrl fileUrl( filename );
-		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true, true )->name(), parent );
+		KRun::runUrl( fileUrl, KMimeType::findByUrl( fileUrl, 0, true )->name(), parent );
 		return;
 	}
 

kdeutils-4.2.2-pykde4.patch:

--- NEW FILE kdeutils-4.2.2-pykde4.patch ---
diff -up kdeutils-4.2.2/CMakeLists.txt.orig kdeutils-4.2.2/CMakeLists.txt
diff -up kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig kdeutils-4.2.2/printer-applet/CMakeLists.txt
--- kdeutils-4.2.2/printer-applet/CMakeLists.txt.orig	2009-04-15 12:18:18.000000000 +0200
+++ kdeutils-4.2.2/printer-applet/CMakeLists.txt	2009-04-15 12:24:37.000000000 +0200
@@ -7,24 +7,9 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kdeutils.spec	2 Apr 2009 15:42:56 -0000	1.140
+++ kdeutils.spec	15 Apr 2009 11:00:41 -0000	1.141
@@ -1,12 +1,12 @@
 %if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
 %define include_kjots 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -18,6 +18,10 @@
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
 Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
+Patch1:         kdeutils-4.2.2-pykde4.patch
+# upstream fixes
+Patch100:       kdeutils-4.2.2-ark.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -32,12 +36,6 @@
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
-# printer applet
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -72,6 +70,10 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
+# upgrade path so it doesn't get lost
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < 6:4.2.1-3
+
 %description printer-applet
 %{summary}.
 
@@ -90,7 +92,10 @@
 # make kjots build with kdeutils
 %patch0 -p1 -b .kjots
 %endif
+%patch1 -p1 -b .pykde4
 
+# upstream fixes
+%patch100 -p1 -b .ark
 
 %build
 
@@ -195,6 +200,12 @@
 
 
 %changelog
+* Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+- fix kdeutils-printer-applet dependency
+- apply upstream patch to fix several issues in ark
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets
 



From karsten at fedoraproject.org  Wed Apr 15 11:04:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 15 Apr 2009 11:04:43 +0000 (UTC)
Subject: rpms/python-peak-rules/devel python-peak-rules.spec,1.8,1.9
Message-ID: <20090415110443.6B8CC70101@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/python-peak-rules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30818

Modified Files:
	python-peak-rules.spec 
Log Message:
- Disable checks on s390x for now, see bugzilla #495874


Index: python-peak-rules.spec
===================================================================
RCS file: /cvs/extras/rpms/python-peak-rules/devel/python-peak-rules.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-peak-rules.spec	26 Feb 2009 22:48:36 -0000	1.8
+++ python-peak-rules.spec	15 Apr 2009 11:04:40 -0000	1.9
@@ -13,7 +13,7 @@
 # Release:0.3.a1.dev%{devrev}%{?dist}
 # But we can't do that yet because it breaks the upgrade path.
 # When version hits 0.5.1 or 0.6 we can correct this.
-Release:        5.%{devrev}%{?dist}
+Release:        6.%{devrev}%{?dist}
 Summary:        Generic functions and business rules support systems
 
 Group:          Development/Languages
@@ -59,7 +59,10 @@
 %{__python} setup.py install --skip-build --root %{buildroot}
 
 %check
+# Disable checks on s390x for now, see bugzilla #495874 
+%ifnarch s390x
 %{__python} setup.py test
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -70,6 +73,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Apr 15 2009 Karsten Hopp <karsten at redhat.com> 0.5a1.dev-6.2582
+- Disable checks on s390x for now, see bugzilla #495874 
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5a1.dev-5.2582
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From than at fedoraproject.org  Wed Apr 15 11:30:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 15 Apr 2009 11:30:10 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils.spec,1.171,1.172
Message-ID: <20090415113010.56DBA70101@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6134

Modified Files:
	kdeutils.spec 
Log Message:
BR  python



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kdeutils.spec	15 Apr 2009 10:56:12 -0000	1.171
+++ kdeutils.spec	15 Apr 2009 11:29:38 -0000	1.172
@@ -31,6 +31,7 @@
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
 BuildRequires:  qimageblitz-devel
+BuildRequires:  python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig



From dwayne at fedoraproject.org  Wed Apr 15 11:30:57 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Wed, 15 Apr 2009 11:30:57 +0000 (UTC)
Subject: rpms/virtaal/devel virtaal.spec,1.7,1.8
Message-ID: <20090415113057.1EAF170101@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6054

Modified Files:
	virtaal.spec 
Log Message:
Update icon installation to follow the new Fedora guidelines.



Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- virtaal.spec	26 Feb 2009 00:37:05 -0000	1.7
+++ virtaal.spec	15 Apr 2009 11:30:26 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           virtaal
 Version:        0.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
@@ -107,21 +107,22 @@
 %post
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %postun
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+ff [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -140,6 +141,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3.1-3
+- Update icon installation to latest Fedora guidelines
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From airlied at fedoraproject.org  Wed Apr 15 11:36:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 15 Apr 2009 11:36:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-modeset-zaphod.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.176, 1.177
Message-ID: <20090415113616.197FE70101@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8116

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-zaphod.patch 
Log Message:
* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-3
- radeon-modeset-zaphod.patch: fix zaphod under kms in theory


radeon-modeset-zaphod.patch:

--- NEW FILE radeon-modeset-zaphod.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2e68744..a0527c0 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -188,6 +188,8 @@ void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
 	}
 			
 	src = create_pixmap_for_fbcon(drmmode, pScrn, crtc_id);
+	if (!src)
+		return;
 
 	dst = GetScratchPixmapHeader(pScreen,
 				     pScrn->virtualX, pScrn->virtualY,
@@ -450,6 +452,13 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *dat
 
 }
 
+static void
+drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
+                      uint16_t *blue, int size)
+{
+	return;
+}
+
 static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
     .dpms = drmmode_crtc_dpms,
     .set_mode_major = drmmode_set_mode_major,
@@ -459,12 +468,10 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
     .hide_cursor = drmmode_hide_cursor,
     .load_cursor_argb = drmmode_load_cursor_argb,
 
+    .gamma_set = drmmode_crtc_gamma_set,
     .shadow_create = drmmode_crtc_shadow_create,
     .shadow_allocate = drmmode_crtc_shadow_allocate,
     .shadow_destroy = drmmode_crtc_shadow_destroy,
-#if 0
-    .gamma_set = i830_crtc_gamma_set,
-#endif
     .destroy = NULL, /* XXX */
 };
 
@@ -804,24 +811,31 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
 };
 
 
-Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, char *driver_name, int cpp)
+Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, char *driver_name, int cpp, int zaphod_mask)
 {
 	xf86CrtcConfigPtr   xf86_config;
+    	RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
 	int i;
 	Bool ret;
 
 	/* Create a bus Id */
 	/* Low level DRM open */
-	ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, busId, driver_name);
-	if (!ret) {
+	if (!pRADEONEnt->fd) {
+		ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, busId, driver_name);
+		if (!ret) {
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "[dri] DRIGetVersion failed to open the DRM\n"
+				   "[dri] Disabling DRI.\n");
+			return FALSE;
+		}
+
+		drmmode->fd = DRIMasterFD(pScrn);
+		pRADEONEnt->fd = drmmode->fd;
+	} else {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "[dri] DRIGetVersion failed to open the DRM\n"
-			   "[dri] Disabling DRI.\n");
-		return FALSE;
+				" reusing fd for second head\n");
+		drmmode->fd = pRADEONEnt->fd;
 	}
-
-	drmmode->fd = DRIMasterFD(pScrn);
-
 	xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
 	xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
 
@@ -832,10 +846,12 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, char
 
 	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width, drmmode->mode_res->max_height);
 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
-		drmmode_crtc_init(pScrn, drmmode, i);
+		if (zaphod_mask & (1 << i))
+			drmmode_crtc_init(pScrn, drmmode, i);
 
 	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
-		drmmode_output_init(pScrn, drmmode, i);
+		if (zaphod_mask & (1 << i))
+			drmmode_output_init(pScrn, drmmode, i);
 
 	xf86InitialConfiguration(pScrn, TRUE);
 
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index cb72f9f..337288a 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -62,7 +62,7 @@ typedef struct {
 } drmmode_output_private_rec, *drmmode_output_private_ptr;
 
 
-extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, char *driver_name, int cpp);
+extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, char *driver_name, int cpp, int zaphod_mask);
 extern Bool drmmode_set_bufmgr(ScrnInfoPtr pScrn, drmmode_ptr drmmode, dri_bufmgr *bufmgr);
 extern void drmmode_set_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int width, int height, int pitch, dri_bo *bo);
 extern void drmmode_set_cursor(ScrnInfoPtr scrn, drmmode_ptr drmmode, int id, dri_bo *bo);
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 41ead39..5bd192b 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3145,11 +3145,18 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
     } else {
 #ifdef XF86DRM_MODE
 	char *bus_id;
-   	 if (!radeon_alloc_dri(pScrn))
+	int zaphod_mask;
+	if (!radeon_alloc_dri(pScrn))
 		return FALSE;
 
+	zaphod_mask = 0xf;
+	if (info->IsPrimary)
+		zaphod_mask = 0xd;
+	if (info->IsSecondary)
+		zaphod_mask = 0x2;
+
 	bus_id = DRICreatePCIBusID(info->PciInfo);
-	if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8) == FALSE) {
+	if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8, zaphod_mask) == FALSE) {
 	    xfree(bus_id);
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n");
 	    goto fail;
diff --git a/src/radeon_memory.c b/src/radeon_memory.c
index 2f2b2fd..cded7e7 100644
--- a/src/radeon_memory.c
+++ b/src/radeon_memory.c
@@ -19,14 +19,9 @@ Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
     int screen_size;
     int stride = pScrn->displayWidth * cpp;
     int total_size_bytes = 0, remain_size_bytes;
-    int fb_size_bytes;
     int pagesize = 4096;
     
     screen_size = RADEON_ALIGN(pScrn->virtualY, 16) * stride;
-
-    ErrorF("%d x %d x %d = %dK\n", pScrn->displayWidth, pScrn->virtualY, cpp, screen_size / 1024);
-
-
     {
 	int cursor_size = 64 * 4 * 64;
 	int c;
@@ -57,23 +52,6 @@ Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
     remain_size_bytes = info->mm.vram_size - total_size_bytes;
 
     info->dri->textureSize = 0;
-#if 0
-    if (info->dri->textureSize > 0)
-    	info->dri->textureSize = (remain_size_bytes / 100) * info->dri->textureSize;
-    else
-    	info->dri->textureSize = remain_size_bytes / 2;
-
-    info->dri->textureSize = RADEON_ALIGN(info->dri->textureSize, pagesize);
-
-    remain_size_bytes -= info->dri->textureSize;
-#endif
-
-    ErrorF("texture size is %dK, exa is %dK\n", info->dri->textureSize / 1024, remain_size_bytes/1024);
-
-
-    fb_size_bytes = screen_size;
-
-    ErrorF("fb size is %dK %dK\n", fb_size_bytes / 1024, total_size_bytes / 1024);
 
     info->mm.front_buffer = dri_bo_alloc(info->bufmgr, "front", screen_size,
 					 0, RADEON_GEM_DOMAIN_VRAM);
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index e860388..badd361 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -611,6 +611,7 @@ typedef struct
     RADEONSaveRec     SavedReg;         /* Original (text) mode              */
 
     void              *MMIO;            /* Map of MMIO region                */
+    int fd;
 } RADEONEntRec, *RADEONEntPtr;
 
 /* radeon_probe.c */


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- xorg-x11-drv-ati.spec	15 Apr 2009 02:54:23 -0000	1.176
+++ xorg-x11-drv-ati.spec	15 Apr 2009 11:35:43 -0000	1.177
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,6 +15,7 @@
 Source1:   radeon.xinf
 
 Patch1:     radeon-modeset.patch
+Patch2:	    radeon-modeset-zaphod.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
@@ -39,6 +40,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .modeset
+%patch2 -p1 -b .modeset-zaphod
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -72,6 +74,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-3
+- radeon-modeset-zaphod.patch: fix zaphod under kms in theory
+
 * Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-2
 - radeon-modeset.patch: fix rotation + cache mmap uninit var path
 



From caolanm at fedoraproject.org  Wed Apr 15 11:45:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 15 Apr 2009 11:45:08 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch,
	NONE, 1.1 openoffice.org.spec, 1.1876, 1.1877
Message-ID: <20090415114508.D709370101@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10758

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
Log Message:
Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch

openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch ---
diff -ru sw.orig/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8esh.cxx
--- sw.orig/source/filter/ww8/wrtw8esh.cxx	2009-04-15 11:34:27.000000000 +0100
+++ sw/source/filter/ww8/wrtw8esh.cxx	2009-04-15 12:09:10.000000000 +0100
@@ -1137,11 +1137,11 @@
                 if( nSlotId && nWhich != nSlotId &&
                     0 != ( nWhich = pDstPool->GetWhich( nSlotId ) ) &&
                     nWhich != nSlotId &&
-                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] )
-                    && ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
+                    ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
                                       && nWhich < RES_TXTATR_END)
                                    : (nWhich >= RES_PARATR_BEGIN
-                                      && nWhich < RES_FRMATR_END) ) )
+                                      && nWhich < RES_FRMATR_END) ) &&
+                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] ) )
                 {
                     // use always the SW-Which Id !
                     SfxPoolItem* pI = pItem->Clone();
diff -ru sw.orig/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-15 11:34:26.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-15 12:34:07.000000000 +0100
@@ -283,10 +283,10 @@
     {
         const SfxPoolItem *pItem = aI->second;
         USHORT nWhich = pItem->Which();
+        if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+            continue;
         if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
         {
-            if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
-                continue;
             if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
                 (*pOut)(*this, *pItem);
         }
@@ -344,17 +344,17 @@
         if (bChpFmt)
             ExportPoolItemsToCHP(aItems, nScript);
 
-        sw::cPoolItemIter aEnd = aItems.end();
-        for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
+        if (bPapFmt)
         {
-            pItem = aI->second;
-            USHORT nWhich = pItem->Which();
-            pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
-            if( 0 != pOut && (!bPapFmt || RES_PARATR_NUMRULE != nWhich ))
-            {
-                bool bPap = nWhich >= RES_PARATR_BEGIN
-                            && nWhich < RES_FRMATR_END;
-                if (bPapFmt && bPap)
+            sw::cPoolItemIter aEnd = aItems.end();
+            for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
+            {
+                pItem = aI->second;
+                USHORT nWhich = pItem->Which();
+                if (nWhich < RES_PARATR_BEGIN || nWhich >= RES_FRMATR_END || nWhich == RES_PARATR_NUMRULE)
+                    continue;
+                pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
+                if( 0 != pOut )
                     (*pOut)(*this, *pItem);
             }
         }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -r1.1876 -r1.1877
--- openoffice.org.spec	14 Apr 2009 10:45:22 -0000	1.1876
+++ openoffice.org.spec	15 Apr 2009 11:45:06 -0000	1.1877
@@ -135,6 +135,7 @@
 Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch62: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch63: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch61 -p1 -b .ooo100991.pyuno-fix.patch
 %patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch63 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4115,8 +4117,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 14 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
+* Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+- Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 * Thu Apr 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 



From dwalsh at fedoraproject.org  Wed Apr 15 12:03:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 15 Apr 2009 12:03:11 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.86,
	1.87 selinux-policy.spec, 1.823, 1.824
Message-ID: <20090415120311.9225170101@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2189

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
- Allow audioentroy to read etc files


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- policy-20090105.patch	14 Apr 2009 11:02:35 -0000	1.86
+++ policy-20090105.patch	15 Apr 2009 12:03:08 -0000	1.87
@@ -1689,8 +1689,8 @@
 +permissive cpufreqselector_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.6.12/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-07 16:01:44.000000000 -0400
-@@ -1,8 +1,12 @@
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-15 08:01:57.000000000 -0400
+@@ -1,8 +1,16 @@
  HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
  HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:gconf_home_t,s0)
 +HOME_DIR/\.gnome2(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
@@ -1704,10 +1704,14 @@
 -/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 +# Don't use because toolchain is broken
 +#/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
++
++/usr/libexec/gconf-defaults-mechanism	    	--      gen_context(system_u:object_r:gconfdefaultsm_exec_t,s0)
++
++/usr/libexec/gnome-system-monitor-mechanism 	--      gen_context(system_u:object_r:gnomesystemmm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.12/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.if	2009-04-07 16:01:44.000000000 -0400
-@@ -89,5 +89,154 @@
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.if	2009-04-15 08:01:57.000000000 -0400
+@@ -89,5 +89,173 @@
  
  	allow $1 gnome_home_t:dir manage_dir_perms;
  	allow $1 gnome_home_t:file manage_file_perms;
@@ -1782,6 +1786,25 @@
 +	read_files_pattern($1, gconf_etc_t, gconf_etc_t)
 +')
 +
++#######################################
++## <summary>
++##      Manage gconf config files
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`gnome_manage_gconf_config',`
++        gen_require(`
++                type gconf_etc_t;
++        ')
++
++        allow $1 gconf_etc_t:dir list_dir_perms;
++        manage_files_pattern($1, gconf_etc_t, gconf_etc_t)
++')
++
 +########################################
 +## <summary>
 +##	Execute gconf programs in 
@@ -1864,7 +1887,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.12/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-04-15 08:01:57.000000000 -0400
 @@ -9,16 +9,18 @@
  attribute gnomedomain;
  
@@ -1885,14 +1908,116 @@
  files_tmp_file(gconf_tmp_t)
  ubac_constrained(gconf_tmp_t)
  
-@@ -32,6 +34,7 @@
+@@ -32,8 +34,17 @@
  type gnome_home_t;
  typealias gnome_home_t alias { user_gnome_home_t staff_gnome_home_t sysadm_gnome_home_t };
  typealias gnome_home_t alias { auditadm_gnome_home_t secadm_gnome_home_t };
 +typealias gnome_home_t alias unconfined_gnome_home_t;
  userdom_user_home_content(gnome_home_t)
  
++type gconfdefaultsm_t;
++type gconfdefaultsm_exec_t;
++dbus_system_domain(gconfdefaultsm_t, gconfdefaultsm_exec_t)
++
++type gnomesystemmm_t;
++type gnomesystemmm_exec_t;
++dbus_system_domain(gnomesystemmm_t, gnomesystemmm_exec_t)
++
  ##############################
+ #
+ # Local Policy
+@@ -73,3 +84,91 @@
+ 	xserver_use_xdm_fds(gconfd_t)
+ 	xserver_rw_xdm_pipes(gconfd_t)
+ ')
++
++#######################################
++#
++# gconf-defaults-mechanisms local policy
++#
++
++allow gconfdefaultsm_t self:capability { dac_override sys_nice sys_ptrace };
++allow gconfdefaultsm_t self:process getsched;
++allow gconfdefaultsm_t self:fifo_file rw_fifo_file_perms;
++
++fs_list_inotifyfs(gconfdefaultsm_t)
++
++corecmd_search_bin(gconfdefaultsm_t)
++
++files_read_etc_files(gconfdefaultsm_t)
++files_read_usr_files(gconfdefaultsm_t)
++
++libs_use_ld_so(gconfdefaultsm_t)
++libs_use_shared_libs(gconfdefaultsm_t)
++
++miscfiles_read_localization(gconfdefaultsm_t)
++
++gnome_manage_gconf_home_files(gconfdefaultsm_t)
++gnome_manage_gconf_config(gconfdefaultsm_t)
++
++userdom_read_all_users_state(gconfdefaultsm_t)
++userdom_search_user_home_dirs(gconfdefaultsm_t)
++
++userdom_dontaudit_search_admin_dir(gconfdefaultsm_t)
++
++optional_policy(`
++        consolekit_dbus_chat(gconfdefaultsm_t)
++')
++
++optional_policy(`
++        nscd_dontaudit_search_pid(gconfdefaultsm_t)
++')
++
++optional_policy(`
++        polkit_domtrans_auth(gconfdefaultsm_t)
++        polkit_read_lib(gconfdefaultsm_t)
++        polkit_read_reload(gconfdefaultsm_t)
++')
++
++permissive gconfdefaultsm_t;
++
++#######################################
++#
++# gnome-system-monitor-mechanisms local policy
++#
++
++allow gnomesystemmm_t self:capability { sys_nice sys_ptrace };
++allow gnomesystemmm_t self:fifo_file rw_fifo_file_perms;
++
++fs_list_inotifyfs(gnomesystemmm_t)
++
++corecmd_search_bin(gnomesystemmm_t)
++
++domain_search_all_domains_state(gnomesystemmm_t)
++domain_setpriority_all_domains(gnomesystemmm_t)
++domain_signal_all_domains(gnomesystemmm_t)
++domain_sigstop_all_domains(gnomesystemmm_t)
++domain_kill_all_domains(gnomesystemmm_t)
++
++files_read_etc_files(gnomesystemmm_t)
++files_read_usr_files(gnomesystemmm_t)
++
++libs_use_ld_so(gnomesystemmm_t)
++libs_use_shared_libs(gnomesystemmm_t)
++
++userdom_read_all_users_state(gnomesystemmm_t)
++
++optional_policy(`
++        consolekit_dbus_chat(gnomesystemmm_t)
++')
++
++optional_policy(`
++        nscd_dontaudit_search_pid(gnomesystemmm_t)
++')
++
++optional_policy(`
++        polkit_domtrans_auth(gnomesystemmm_t)
++        polkit_read_lib(gnomesystemmm_t)
++        polkit_read_reload(gnomesystemmm_t)
++')
++
++permissive gnomesystemmm_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.6.12/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2008-11-11 16:13:42.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/gpg.fc	2009-04-07 16:01:44.000000000 -0400
@@ -3569,8 +3694,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.12/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,109 @@
++++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.te	2009-04-14 13:40:38.000000000 -0400
+@@ -0,0 +1,110 @@
 +policy_module(pulseaudio,1.0.0)
 +
 +########################################
@@ -3671,6 +3796,7 @@
 +	xserver_read_xdm_pid(pulseaudio_t)
 +	xserver_stream_connect(pulseaudio_t)
 +	xserver_manage_xdm_tmp_files(pulseaudio_t)
++	xserver_read_xdm_lib_files(pulseaudio_t)
 +')
 +
 +tunable_policy(`pulseaudio_network',`
@@ -4772,7 +4898,7 @@
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-14 12:49:22.000000000 -0400
 @@ -188,6 +188,12 @@
  genfscon sysfs / gen_context(system_u:object_r:sysfs_t,s0)
  
@@ -4788,7 +4914,16 @@
  type urandom_device_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.12/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-09 10:10:17.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-15 08:01:57.000000000 -0400
+@@ -525,7 +525,7 @@
+ 	')
+ 
+ 	kernel_search_proc($1)
+-	allow $1 domain:dir search;
++	allow $1 domain:dir search_dir_perms;
+ ')
+ 
+ ########################################
 @@ -629,6 +629,7 @@
  
  	dontaudit $1 unconfined_domain_type:dir search_dir_perms;
@@ -5412,7 +5547,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-03-04 16:49:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-14 14:14:57.000000000 -0400
 @@ -723,6 +723,24 @@
  
  ########################################
@@ -6400,7 +6535,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-09 05:37:59.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-14 14:12:12.000000000 -0400
 @@ -0,0 +1,638 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -9180,6 +9315,31 @@
 +typealias httpd_sys_script_rw_t   alias httpd_fastcgi_script_rw_t;
 +typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
 +typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.6.12/policy/modules/services/audioentropy.te
+--- nsaserefpolicy/policy/modules/services/audioentropy.te	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/audioentropy.te	2009-04-14 08:16:44.000000000 -0400
+@@ -40,6 +40,9 @@
+ # and sample rate.
+ dev_write_sound(entropyd_t)
+ 
++files_read_etc_files(entropyd_t)
++files_read_usr_files(entropyd_t)
++
+ fs_getattr_all_fs(entropyd_t)
+ fs_search_auto_mountpoints(entropyd_t)
+ 
+@@ -53,6 +56,11 @@
+ userdom_dontaudit_search_user_home_dirs(entropyd_t)
+ 
+ optional_policy(`
++	alsa_read_lib(entropyd_t)
++	alsa_read_rw_config(entropyd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(entropyd_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.12/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/automount.te	2009-04-07 16:01:44.000000000 -0400
@@ -9924,7 +10084,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-15 07:59:08.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -10002,7 +10162,7 @@
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +93,31 @@
+@@ -61,6 +93,32 @@
  ')
  
  optional_policy(`
@@ -10012,6 +10172,7 @@
 +')
 +
 +optional_policy(`
++	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
  	xserver_stream_connect(consolekit_t)
 +	xserver_ptrace_xdm(consolekit_t)
@@ -19578,7 +19739,7 @@
  	ccs_read_config(ricci_modstorage_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-14 10:34:47.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -19614,6 +19775,15 @@
  ########################################
  #
  # NFSD local policy
+@@ -116,7 +125,7 @@
+ # for exportfs and rpc.mountd
+ files_getattr_tmp_dirs(nfsd_t) 
+ # cjp: this should really have its own type
+-files_manage_mounttab(rpcd_t)
++files_manage_mounttab(nfsd_t)
+ 
+ fs_mount_nfsd_fs(nfsd_t) 
+ fs_search_nfsd_fs(nfsd_t) 
 @@ -141,6 +150,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
@@ -22250,7 +22420,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-14 06:59:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-14 08:14:52.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(sssd,1.0.0)
 +
@@ -23131,7 +23301,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.12/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-15 07:58:56.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -23780,7 +23950,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-09 05:40:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-14 12:39:57.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -24154,7 +24324,7 @@
  ')
  
  optional_policy(`
-@@ -515,12 +583,41 @@
+@@ -515,12 +583,45 @@
  ')
  
  optional_policy(`
@@ -24168,6 +24338,10 @@
 +	dbus_system_bus_client(xdm_t)
 +
 +	optional_policy(`
++		bluetooth_dbus_chat(xdm_t)
++	')
++
++	optional_policy(`
 +		devicekit_power_dbus_chat(xdm_t)
 +	')
 +
@@ -24196,7 +24370,7 @@
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +639,23 @@
+@@ -542,6 +643,23 @@
  ')
  
  optional_policy(`
@@ -24220,7 +24394,7 @@
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +664,9 @@
+@@ -550,8 +668,9 @@
  ')
  
  optional_policy(`
@@ -24232,7 +24406,7 @@
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +675,6 @@
+@@ -560,7 +679,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -24240,7 +24414,7 @@
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +685,10 @@
+@@ -571,6 +689,10 @@
  ')
  
  optional_policy(`
@@ -24251,7 +24425,7 @@
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,7 +705,7 @@
+@@ -587,7 +709,7 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -24260,7 +24434,7 @@
  dontaudit xserver_t self:capability chown;
  allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow xserver_t self:memprotect mmap_zero;
-@@ -602,9 +720,11 @@
+@@ -602,9 +724,11 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -24272,7 +24446,7 @@
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -622,7 +742,7 @@
+@@ -622,7 +746,7 @@
  manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
  
@@ -24281,7 +24455,7 @@
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +755,19 @@
+@@ -635,9 +759,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -24301,7 +24475,7 @@
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -680,9 +810,14 @@
+@@ -680,9 +814,14 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -24316,7 +24490,7 @@
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +832,13 @@
+@@ -697,8 +836,13 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -24330,7 +24504,7 @@
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +860,7 @@
+@@ -720,6 +864,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -24338,7 +24512,7 @@
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -742,7 +883,7 @@
+@@ -742,7 +887,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -24347,7 +24521,7 @@
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -774,12 +915,16 @@
+@@ -774,12 +919,16 @@
  ')
  
  optional_policy(`
@@ -24365,7 +24539,7 @@
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -806,7 +951,7 @@
+@@ -806,7 +955,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -24374,7 +24548,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -827,9 +972,14 @@
+@@ -827,9 +976,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -24389,7 +24563,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +994,14 @@
+@@ -844,11 +998,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -24405,7 +24579,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +1009,11 @@
+@@ -856,6 +1013,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -24417,7 +24591,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -881,6 +1039,8 @@
+@@ -881,6 +1043,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -24426,7 +24600,7 @@
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -905,6 +1065,8 @@
+@@ -905,6 +1069,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -24435,7 +24609,7 @@
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -972,17 +1134,49 @@
+@@ -972,17 +1138,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -24562,7 +24736,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.12/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-04-14 08:11:17.000000000 -0400
 @@ -43,20 +43,38 @@
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -25679,6 +25853,25 @@
  corenet_udp_bind_ipsecnat_port(racoon_t)
  
  dev_read_urand(racoon_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.12/policy/modules/system/iptables.fc
+--- nsaserefpolicy/policy/modules/system/iptables.fc	2009-04-06 12:42:08.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/iptables.fc	2009-04-14 10:54:45.000000000 -0400
+@@ -1,9 +1,12 @@
+ /sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ /sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables		--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ 
+-/usr/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ /usr/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/usr/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables		--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ 
+ /var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-04-06 12:42:08.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/system/iptables.te	2009-04-07 16:01:44.000000000 -0400
@@ -28122,7 +28315,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-09 04:57:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-14 14:03:29.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -28174,6 +28367,17 @@
  	tunable_policy(`allow_execheap',`
  		# Allow making the stack executable via mprotect.
  		allow $1 self:process execheap;
+@@ -57,8 +67,8 @@
+ 
+ 	tunable_policy(`allow_execstack',`
+ 		# Allow making the stack executable via mprotect;
+-		# execstack implies execmem;
+-		allow $1 self:process { execstack execmem };
++		# execstack implies execmem; Turned off for F11
++		allow $1 self:process { execstack };
+ #		auditallow $1 self:process execstack;
+ 	')
+ 
 @@ -69,6 +79,7 @@
  	optional_policy(`
  		# Communicate via dbusd.
@@ -28851,7 +29055,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-13 10:33:55.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-14 14:04:17.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- selinux-policy.spec	14 Apr 2009 11:02:35 -0000	1.823
+++ selinux-policy.spec	15 Apr 2009 12:03:09 -0000	1.824
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -440,6 +440,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
+- Allow audioentroy to read etc files
+
 * Mon Apr 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-4
 - Add fail2ban_var_lib_t
 - Fixes for devicekit_power_t



From dwalsh at fedoraproject.org  Wed Apr 15 12:06:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 15 Apr 2009 12:06:42 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.86,
	1.87 selinux-policy.spec, 1.823, 1.824
Message-ID: <20090415120642.DFD3170101@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3326

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
- Allow audioentroy to read etc files


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- policy-20090105.patch	14 Apr 2009 11:02:35 -0000	1.86
+++ policy-20090105.patch	15 Apr 2009 12:06:09 -0000	1.87
@@ -1689,8 +1689,8 @@
 +permissive cpufreqselector_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.6.12/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-07 16:01:44.000000000 -0400
-@@ -1,8 +1,12 @@
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-15 08:01:57.000000000 -0400
+@@ -1,8 +1,16 @@
  HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
  HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:gconf_home_t,s0)
 +HOME_DIR/\.gnome2(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
@@ -1704,10 +1704,14 @@
 -/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 +# Don't use because toolchain is broken
 +#/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
++
++/usr/libexec/gconf-defaults-mechanism	    	--      gen_context(system_u:object_r:gconfdefaultsm_exec_t,s0)
++
++/usr/libexec/gnome-system-monitor-mechanism 	--      gen_context(system_u:object_r:gnomesystemmm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.12/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.if	2009-04-07 16:01:44.000000000 -0400
-@@ -89,5 +89,154 @@
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.if	2009-04-15 08:01:57.000000000 -0400
+@@ -89,5 +89,173 @@
  
  	allow $1 gnome_home_t:dir manage_dir_perms;
  	allow $1 gnome_home_t:file manage_file_perms;
@@ -1782,6 +1786,25 @@
 +	read_files_pattern($1, gconf_etc_t, gconf_etc_t)
 +')
 +
++#######################################
++## <summary>
++##      Manage gconf config files
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`gnome_manage_gconf_config',`
++        gen_require(`
++                type gconf_etc_t;
++        ')
++
++        allow $1 gconf_etc_t:dir list_dir_perms;
++        manage_files_pattern($1, gconf_etc_t, gconf_etc_t)
++')
++
 +########################################
 +## <summary>
 +##	Execute gconf programs in 
@@ -1864,7 +1887,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.12/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-04-15 08:01:57.000000000 -0400
 @@ -9,16 +9,18 @@
  attribute gnomedomain;
  
@@ -1885,14 +1908,116 @@
  files_tmp_file(gconf_tmp_t)
  ubac_constrained(gconf_tmp_t)
  
-@@ -32,6 +34,7 @@
+@@ -32,8 +34,17 @@
  type gnome_home_t;
  typealias gnome_home_t alias { user_gnome_home_t staff_gnome_home_t sysadm_gnome_home_t };
  typealias gnome_home_t alias { auditadm_gnome_home_t secadm_gnome_home_t };
 +typealias gnome_home_t alias unconfined_gnome_home_t;
  userdom_user_home_content(gnome_home_t)
  
++type gconfdefaultsm_t;
++type gconfdefaultsm_exec_t;
++dbus_system_domain(gconfdefaultsm_t, gconfdefaultsm_exec_t)
++
++type gnomesystemmm_t;
++type gnomesystemmm_exec_t;
++dbus_system_domain(gnomesystemmm_t, gnomesystemmm_exec_t)
++
  ##############################
+ #
+ # Local Policy
+@@ -73,3 +84,91 @@
+ 	xserver_use_xdm_fds(gconfd_t)
+ 	xserver_rw_xdm_pipes(gconfd_t)
+ ')
++
++#######################################
++#
++# gconf-defaults-mechanisms local policy
++#
++
++allow gconfdefaultsm_t self:capability { dac_override sys_nice sys_ptrace };
++allow gconfdefaultsm_t self:process getsched;
++allow gconfdefaultsm_t self:fifo_file rw_fifo_file_perms;
++
++fs_list_inotifyfs(gconfdefaultsm_t)
++
++corecmd_search_bin(gconfdefaultsm_t)
++
++files_read_etc_files(gconfdefaultsm_t)
++files_read_usr_files(gconfdefaultsm_t)
++
++libs_use_ld_so(gconfdefaultsm_t)
++libs_use_shared_libs(gconfdefaultsm_t)
++
++miscfiles_read_localization(gconfdefaultsm_t)
++
++gnome_manage_gconf_home_files(gconfdefaultsm_t)
++gnome_manage_gconf_config(gconfdefaultsm_t)
++
++userdom_read_all_users_state(gconfdefaultsm_t)
++userdom_search_user_home_dirs(gconfdefaultsm_t)
++
++userdom_dontaudit_search_admin_dir(gconfdefaultsm_t)
++
++optional_policy(`
++        consolekit_dbus_chat(gconfdefaultsm_t)
++')
++
++optional_policy(`
++        nscd_dontaudit_search_pid(gconfdefaultsm_t)
++')
++
++optional_policy(`
++        polkit_domtrans_auth(gconfdefaultsm_t)
++        polkit_read_lib(gconfdefaultsm_t)
++        polkit_read_reload(gconfdefaultsm_t)
++')
++
++permissive gconfdefaultsm_t;
++
++#######################################
++#
++# gnome-system-monitor-mechanisms local policy
++#
++
++allow gnomesystemmm_t self:capability { sys_nice sys_ptrace };
++allow gnomesystemmm_t self:fifo_file rw_fifo_file_perms;
++
++fs_list_inotifyfs(gnomesystemmm_t)
++
++corecmd_search_bin(gnomesystemmm_t)
++
++domain_search_all_domains_state(gnomesystemmm_t)
++domain_setpriority_all_domains(gnomesystemmm_t)
++domain_signal_all_domains(gnomesystemmm_t)
++domain_sigstop_all_domains(gnomesystemmm_t)
++domain_kill_all_domains(gnomesystemmm_t)
++
++files_read_etc_files(gnomesystemmm_t)
++files_read_usr_files(gnomesystemmm_t)
++
++libs_use_ld_so(gnomesystemmm_t)
++libs_use_shared_libs(gnomesystemmm_t)
++
++userdom_read_all_users_state(gnomesystemmm_t)
++
++optional_policy(`
++        consolekit_dbus_chat(gnomesystemmm_t)
++')
++
++optional_policy(`
++        nscd_dontaudit_search_pid(gnomesystemmm_t)
++')
++
++optional_policy(`
++        polkit_domtrans_auth(gnomesystemmm_t)
++        polkit_read_lib(gnomesystemmm_t)
++        polkit_read_reload(gnomesystemmm_t)
++')
++
++permissive gnomesystemmm_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.6.12/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2008-11-11 16:13:42.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/gpg.fc	2009-04-07 16:01:44.000000000 -0400
@@ -3569,8 +3694,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.12/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,109 @@
++++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.te	2009-04-14 13:40:38.000000000 -0400
+@@ -0,0 +1,110 @@
 +policy_module(pulseaudio,1.0.0)
 +
 +########################################
@@ -3671,6 +3796,7 @@
 +	xserver_read_xdm_pid(pulseaudio_t)
 +	xserver_stream_connect(pulseaudio_t)
 +	xserver_manage_xdm_tmp_files(pulseaudio_t)
++	xserver_read_xdm_lib_files(pulseaudio_t)
 +')
 +
 +tunable_policy(`pulseaudio_network',`
@@ -4772,7 +4898,7 @@
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-14 12:49:22.000000000 -0400
 @@ -188,6 +188,12 @@
  genfscon sysfs / gen_context(system_u:object_r:sysfs_t,s0)
  
@@ -4788,7 +4914,16 @@
  type urandom_device_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.12/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-09 10:10:17.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-15 08:01:57.000000000 -0400
+@@ -525,7 +525,7 @@
+ 	')
+ 
+ 	kernel_search_proc($1)
+-	allow $1 domain:dir search;
++	allow $1 domain:dir search_dir_perms;
+ ')
+ 
+ ########################################
 @@ -629,6 +629,7 @@
  
  	dontaudit $1 unconfined_domain_type:dir search_dir_perms;
@@ -5412,7 +5547,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-03-04 16:49:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-14 14:14:57.000000000 -0400
 @@ -723,6 +723,24 @@
  
  ########################################
@@ -6400,7 +6535,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-09 05:37:59.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-14 14:12:12.000000000 -0400
 @@ -0,0 +1,638 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -9180,6 +9315,31 @@
 +typealias httpd_sys_script_rw_t   alias httpd_fastcgi_script_rw_t;
 +typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
 +typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.6.12/policy/modules/services/audioentropy.te
+--- nsaserefpolicy/policy/modules/services/audioentropy.te	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/audioentropy.te	2009-04-14 08:16:44.000000000 -0400
+@@ -40,6 +40,9 @@
+ # and sample rate.
+ dev_write_sound(entropyd_t)
+ 
++files_read_etc_files(entropyd_t)
++files_read_usr_files(entropyd_t)
++
+ fs_getattr_all_fs(entropyd_t)
+ fs_search_auto_mountpoints(entropyd_t)
+ 
+@@ -53,6 +56,11 @@
+ userdom_dontaudit_search_user_home_dirs(entropyd_t)
+ 
+ optional_policy(`
++	alsa_read_lib(entropyd_t)
++	alsa_read_rw_config(entropyd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(entropyd_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.12/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/automount.te	2009-04-07 16:01:44.000000000 -0400
@@ -9924,7 +10084,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-15 07:59:08.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -10002,7 +10162,7 @@
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +93,31 @@
+@@ -61,6 +93,32 @@
  ')
  
  optional_policy(`
@@ -10012,6 +10172,7 @@
 +')
 +
 +optional_policy(`
++	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
  	xserver_stream_connect(consolekit_t)
 +	xserver_ptrace_xdm(consolekit_t)
@@ -19578,7 +19739,7 @@
  	ccs_read_config(ricci_modstorage_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-14 10:34:47.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -19614,6 +19775,15 @@
  ########################################
  #
  # NFSD local policy
+@@ -116,7 +125,7 @@
+ # for exportfs and rpc.mountd
+ files_getattr_tmp_dirs(nfsd_t) 
+ # cjp: this should really have its own type
+-files_manage_mounttab(rpcd_t)
++files_manage_mounttab(nfsd_t)
+ 
+ fs_mount_nfsd_fs(nfsd_t) 
+ fs_search_nfsd_fs(nfsd_t) 
 @@ -141,6 +150,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
@@ -22250,7 +22420,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-14 06:59:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-14 08:14:52.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(sssd,1.0.0)
 +
@@ -23131,7 +23301,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.12/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-15 07:58:56.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -23780,7 +23950,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-09 05:40:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-14 12:39:57.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -24154,7 +24324,7 @@
  ')
  
  optional_policy(`
-@@ -515,12 +583,41 @@
+@@ -515,12 +583,45 @@
  ')
  
  optional_policy(`
@@ -24168,6 +24338,10 @@
 +	dbus_system_bus_client(xdm_t)
 +
 +	optional_policy(`
++		bluetooth_dbus_chat(xdm_t)
++	')
++
++	optional_policy(`
 +		devicekit_power_dbus_chat(xdm_t)
 +	')
 +
@@ -24196,7 +24370,7 @@
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +639,23 @@
+@@ -542,6 +643,23 @@
  ')
  
  optional_policy(`
@@ -24220,7 +24394,7 @@
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +664,9 @@
+@@ -550,8 +668,9 @@
  ')
  
  optional_policy(`
@@ -24232,7 +24406,7 @@
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +675,6 @@
+@@ -560,7 +679,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -24240,7 +24414,7 @@
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +685,10 @@
+@@ -571,6 +689,10 @@
  ')
  
  optional_policy(`
@@ -24251,7 +24425,7 @@
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,7 +705,7 @@
+@@ -587,7 +709,7 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -24260,7 +24434,7 @@
  dontaudit xserver_t self:capability chown;
  allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow xserver_t self:memprotect mmap_zero;
-@@ -602,9 +720,11 @@
+@@ -602,9 +724,11 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -24272,7 +24446,7 @@
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -622,7 +742,7 @@
+@@ -622,7 +746,7 @@
  manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
  
@@ -24281,7 +24455,7 @@
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +755,19 @@
+@@ -635,9 +759,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -24301,7 +24475,7 @@
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -680,9 +810,14 @@
+@@ -680,9 +814,14 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -24316,7 +24490,7 @@
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +832,13 @@
+@@ -697,8 +836,13 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -24330,7 +24504,7 @@
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +860,7 @@
+@@ -720,6 +864,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -24338,7 +24512,7 @@
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -742,7 +883,7 @@
+@@ -742,7 +887,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -24347,7 +24521,7 @@
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -774,12 +915,16 @@
+@@ -774,12 +919,16 @@
  ')
  
  optional_policy(`
@@ -24365,7 +24539,7 @@
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -806,7 +951,7 @@
+@@ -806,7 +955,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -24374,7 +24548,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -827,9 +972,14 @@
+@@ -827,9 +976,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -24389,7 +24563,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +994,14 @@
+@@ -844,11 +998,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -24405,7 +24579,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +1009,11 @@
+@@ -856,6 +1013,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -24417,7 +24591,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -881,6 +1039,8 @@
+@@ -881,6 +1043,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -24426,7 +24600,7 @@
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -905,6 +1065,8 @@
+@@ -905,6 +1069,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -24435,7 +24609,7 @@
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -972,17 +1134,49 @@
+@@ -972,17 +1138,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -24562,7 +24736,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.12/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-04-14 08:11:17.000000000 -0400
 @@ -43,20 +43,38 @@
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -25679,6 +25853,25 @@
  corenet_udp_bind_ipsecnat_port(racoon_t)
  
  dev_read_urand(racoon_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.12/policy/modules/system/iptables.fc
+--- nsaserefpolicy/policy/modules/system/iptables.fc	2009-04-06 12:42:08.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/iptables.fc	2009-04-14 10:54:45.000000000 -0400
+@@ -1,9 +1,12 @@
+ /sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ /sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables		--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ 
+-/usr/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ /usr/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+-/usr/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables		--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
+ 
+ /var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-04-06 12:42:08.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/system/iptables.te	2009-04-07 16:01:44.000000000 -0400
@@ -28122,7 +28315,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-09 04:57:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-14 14:03:29.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -28174,6 +28367,17 @@
  	tunable_policy(`allow_execheap',`
  		# Allow making the stack executable via mprotect.
  		allow $1 self:process execheap;
+@@ -57,8 +67,8 @@
+ 
+ 	tunable_policy(`allow_execstack',`
+ 		# Allow making the stack executable via mprotect;
+-		# execstack implies execmem;
+-		allow $1 self:process { execstack execmem };
++		# execstack implies execmem; Turned off for F11
++		allow $1 self:process { execstack };
+ #		auditallow $1 self:process execstack;
+ 	')
+ 
 @@ -69,6 +79,7 @@
  	optional_policy(`
  		# Communicate via dbusd.
@@ -28851,7 +29055,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-13 10:33:55.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-14 14:04:17.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- selinux-policy.spec	14 Apr 2009 11:02:35 -0000	1.823
+++ selinux-policy.spec	15 Apr 2009 12:06:10 -0000	1.824
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -440,6 +440,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
+- Allow audioentroy to read etc files
+
 * Mon Apr 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-4
 - Add fail2ban_var_lib_t
 - Fixes for devicekit_power_t



From dwalsh at fedoraproject.org  Wed Apr 15 12:09:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 15 Apr 2009 12:09:07 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.824,1.825
Message-ID: <20090415120907.7A4C270101@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4251

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5.1
- Allow audioentroy to read etc files



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- selinux-policy.spec	15 Apr 2009 12:06:10 -0000	1.824
+++ selinux-policy.spec	15 Apr 2009 12:08:36 -0000	1.825
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 5%{?dist}
+Release: 5.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -440,7 +440,7 @@
 %endif
 
 %changelog
-* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5.1
 - Allow audioentroy to read etc files
 
 * Mon Apr 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-4



From twoerner at fedoraproject.org  Wed Apr 15 12:29:04 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Wed, 15 Apr 2009 12:29:04 +0000 (UTC)
Subject: rpms/iptables/devel .cvsignore, 1.25, 1.26 iptables.spec, 1.76,
	1.77 sources, 1.25, 1.26
Message-ID: <20090415122905.46E7370101@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10500

Modified Files:
	.cvsignore iptables.spec sources 
Log Message:
- new version 1.4.3.2
- also install iptables/internal.h, needed for iptables.h and ip6tables.h




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Mar 2009 12:53:21 -0000	1.25
+++ .cvsignore	15 Apr 2009 12:29:00 -0000	1.26
@@ -4,3 +4,4 @@
 iptables-1.4.1.1.tar.bz2
 iptables-1.4.2.tar.bz2
 iptables-1.4.3.1.tar.bz2
+iptables-1.4.3.2.tar.bz2


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- iptables.spec	30 Mar 2009 12:53:21 -0000	1.76
+++ iptables.spec	15 Apr 2009 12:29:01 -0000	1.77
@@ -1,6 +1,6 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.3.1
+Version: 1.4.3.2
 Release: 1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
@@ -72,6 +72,8 @@
 
 # install ip*tables.h header files
 install -m 644 include/ip*tables.h %{buildroot}%{_includedir}/
+install -d -m 755 %{buildroot}%{_includedir}/iptables
+install -m 644 include/iptables/internal.h %{buildroot}%{_includedir}/iptables/
 
 # install ipulog header file
 install -d -m 755 %{buildroot}%{_includedir}/libipulog/
@@ -133,6 +135,8 @@
 
 %files devel
 %defattr(-,root,root)
+%dir %{_includedir}/iptables
+%{_includedir}/iptables/*.h
 %{_includedir}/*.h
 %dir %{_includedir}/libiptc
 %{_includedir}/libiptc/*.h
@@ -146,6 +150,10 @@
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Wed Apr 15 2009 Thomas Woerner <twoerner at redhat.com> 1.4.3.2-1
+- new version 1.4.3.2
+- also install iptables/internal.h, needed for iptables.h and ip6tables.h
+
 * Mon Mar 30 2009 Thomas Woerner <twoerner at redhat.com> 1.4.3.1-1
 - new version 1.4.3.1
   - libiptc is now shared


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Mar 2009 12:53:21 -0000	1.25
+++ sources	15 Apr 2009 12:29:01 -0000	1.26
@@ -1 +1 @@
-9c67f796f69e1e016cc19e2c19357711  iptables-1.4.3.1.tar.bz2
+545698693b636cfc844aafc6729fd48a  iptables-1.4.3.2.tar.bz2



From mdomsch at fedoraproject.org  Wed Apr 15 12:33:52 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 15 Apr 2009 12:33:52 +0000 (UTC)
Subject: rpms/dkms/F-10 dkms.spec,1.19,1.20
Message-ID: <20090415123352.5A4CC70101@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11924

Modified Files:
	dkms.spec 
Log Message:
add Requires: lsb


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-10/dkms.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dkms.spec	15 Apr 2009 04:57:10 -0000	1.19
+++ dkms.spec	15 Apr 2009 12:33:50 -0000	1.20
@@ -1,12 +1,12 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.21.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99
+Requires: bash > 1.99, lsb
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
@@ -125,6 +125,9 @@
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
+- add Requires: lsb
+
 * Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
 - update to latest upstream
 



From ingvar at fedoraproject.org  Wed Apr 15 12:34:53 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 15 Apr 2009 12:34:53 +0000 (UTC)
Subject: rpms/varnish/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 varnish.spec, 1.18, 1.19
Message-ID: <20090415123453.2D53C70101@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12032

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2009 16:17:51 -0000	1.9
+++ .cvsignore	15 Apr 2009 12:34:21 -0000	1.10
@@ -1 +1 @@
-varnish-2.0.3.tar.gz
+varnish-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2009 16:17:51 -0000	1.9
+++ sources	15 Apr 2009 12:34:21 -0000	1.10
@@ -1 +1 @@
-4233ad2fc3d0c2fcf7bf399f6ccf50b2  varnish-2.0.3.tar.gz
+8044d59cb6d2ec6d09b7ae6033f06bbf  varnish-2.0.4.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- varnish.spec	25 Feb 2009 23:47:52 -0000	1.18
+++ varnish.spec	15 Apr 2009 12:34:21 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.3
-Release: 2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -64,12 +64,12 @@
 %setup -q
 #%setup -q -n varnish-cache
 
-%patch0 -p0
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
+%patch0 -p0
+
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
 	ppc64 | s390x | x86_64 | sparc64 )
@@ -235,6 +235,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
+  New upstream release 2.0.4 
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ingvar at fedoraproject.org  Wed Apr 15 12:41:10 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 15 Apr 2009 12:41:10 +0000 (UTC)
Subject: rpms/varnish/EL-5 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 varnish.spec, 1.7, 1.8
Message-ID: <20090415124110.42F6570101@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14017

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release. A bugfix release. No changes in ABI, API or config files.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Feb 2009 07:46:50 -0000	1.6
+++ .cvsignore	15 Apr 2009 12:40:37 -0000	1.7
@@ -1 +1 @@
-varnish-2.0.3.tar.gz
+varnish-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Feb 2009 07:46:50 -0000	1.6
+++ sources	15 Apr 2009 12:40:37 -0000	1.7
@@ -1 +1 @@
-4233ad2fc3d0c2fcf7bf399f6ccf50b2  varnish-2.0.3.tar.gz
+8044d59cb6d2ec6d09b7ae6033f06bbf  varnish-2.0.4.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- varnish.spec	13 Feb 2009 07:34:50 -0000	1.7
+++ varnish.spec	15 Apr 2009 12:40:37 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -64,12 +64,12 @@
 %setup -q
 #%setup -q -n varnish-cache
 
-%patch0 -p0
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
+%patch0 -p0
+
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
 	ppc64 | s390x | x86_64 | sparc64 )
@@ -235,6 +235,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
+  New upstream release 2.0.4 
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.3-1
   New upstream release 2.0.3. A bugfix and feature enhancement release
 



From karsten at fedoraproject.org  Wed Apr 15 12:42:22 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 15 Apr 2009 12:42:22 +0000 (UTC)
Subject: rpms/python-imaging/devel python-imaging.spec,1.27,1.28
Message-ID: <20090415124222.B7F7670101@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14583

Modified Files:
	python-imaging.spec 
Log Message:
- disable sane subpackage and sane requirements for mainframes, we don't have
  sane on s390 and s390x



Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- python-imaging.spec	26 Feb 2009 21:45:53 -0000	1.27
+++ python-imaging.spec	15 Apr 2009 12:42:21 -0000	1.28
@@ -5,7 +5,7 @@
 Summary:       Python's own image processing library
 Name:          python-imaging
 Version:       1.1.6
-Release:       14%{?dist}
+Release:       15%{?dist}
 
 License:       BSD
 Group:         System Environment/Libraries
@@ -20,7 +20,9 @@
 
 BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel
 BuildRequires: tkinter, tk-devel
+%ifnarch s390 s390x
 BuildRequires: sane-backends-devel
+%endif
 
 %description
 Python Imaging Library
@@ -45,6 +47,7 @@
 %description devel
 Development files for python-imaging.
 
+%ifnarch s390 s390x
 %package sane
 Summary: Python Module for using scanners
 Group: System Environment/Libraries
@@ -53,6 +56,7 @@
 %description sane
 This package contains the sane module for Python which provides access to
 various raster scanning devices such as flatbed scanners and digital cameras.
+%endif
 
 %package tk
 Summary: Tk interface for python-imaging
@@ -89,9 +93,11 @@
 
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
+%ifnarch s390 s390x
 pushd Sane
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 popd
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,9 +105,11 @@
 install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%ifnarch s390 s390x
 pushd Sane
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 popd
+%endif
 
 # There is no need to ship the binaries since they are already packaged
 # in %doc
@@ -145,6 +153,7 @@
 %{py_incdir}/Imaging
 %doc Docs Scripts Images
 
+%ifnarch s390 s390x
 %files sane
 %defattr (0644,root,root,755)
 %doc Sane/CHANGES Sane/demo*.py Sane/sanedoc.txt
@@ -153,10 +162,15 @@
 %endif
 %{python_sitearch}/_sane.so
 %{python_sitearch}/sane.py*
+%endif
 
 %files tk -f files.tk
 
 %changelog
+* Wed Apr 15 2009 Karsten Hopp <karsten at redhat.com> 1.1.6-15
+- disable sane subpackage and sane requirements for mainframes, we don't have
+  sane on s390 and s390x
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nickc at fedoraproject.org  Wed Apr 15 12:44:45 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Wed, 15 Apr 2009 12:44:45 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.19.51.0.2-IBM.patch, 1.1,
	1.2 binutils.spec, 1.160, 1.161
Message-ID: <20090415124445.AC22170101@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15508

Modified Files:
	binutils-2.19.51.0.2-IBM.patch binutils.spec 
Log Message:
Update IBM Power 7 support patch to fix tlbilx opcode.  (BZ 494718)


binutils-2.19.51.0.2-IBM.patch:

Index: binutils-2.19.51.0.2-IBM.patch
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils-2.19.51.0.2-IBM.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binutils-2.19.51.0.2-IBM.patch	5 Mar 2009 13:09:53 -0000	1.1
+++ binutils-2.19.51.0.2-IBM.patch	15 Apr 2009 12:44:44 -0000	1.2
@@ -1,6 +1,6 @@
-diff -rcp ../binutils-2.19.51.0.2.15/bfd/elf32-lm32.c ./bfd/elf32-lm32.c
-*** ../binutils-2.19.51.0.2.15/bfd/elf32-lm32.c	2009-03-02 14:05:10.000000000 +0000
---- ./bfd/elf32-lm32.c	2009-03-05 12:12:25.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/bfd/elf32-lm32.c ./bfd/elf32-lm32.c
+*** ../binutils-2.19.51.0.2.orig/bfd/elf32-lm32.c	2009-04-15 13:09:53.000000000 +0100
+--- ./bfd/elf32-lm32.c	2009-04-15 13:10:01.000000000 +0100
 *************** lm32_elf_relocate_section (bfd *output_b
 *** 888,898 ****
             /* It's a global symbol.  */
@@ -27,9 +27,9 @@
   	  osec = sec;
   	  name = h->root.root.string;
           }
-diff -rcp ../binutils-2.19.51.0.2.15/bfd/elf32-ppc.c ./bfd/elf32-ppc.c
-*** ../binutils-2.19.51.0.2.15/bfd/elf32-ppc.c	2009-03-02 14:05:10.000000000 +0000
---- ./bfd/elf32-ppc.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/bfd/elf32-ppc.c ./bfd/elf32-ppc.c
+*** ../binutils-2.19.51.0.2.orig/bfd/elf32-ppc.c	2009-04-15 13:09:53.000000000 +0100
+--- ./bfd/elf32-ppc.c	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,6 ****
   /* PowerPC-specific support for 32-bit ELF
@@ -203,9 +203,9 @@
   		  r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3)
   			    + R_PPC_GOT_TPREL16);
   		  rel->r_info = ELF32_R_INFO (r_symndx, r_type);
-diff -rcp ../binutils-2.19.51.0.2.15/bfd/elf64-ppc.c ./bfd/elf64-ppc.c
-*** ../binutils-2.19.51.0.2.15/bfd/elf64-ppc.c	2009-03-02 14:05:10.000000000 +0000
---- ./bfd/elf64-ppc.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/bfd/elf64-ppc.c ./bfd/elf64-ppc.c
+*** ../binutils-2.19.51.0.2.orig/bfd/elf64-ppc.c	2009-04-15 13:09:53.000000000 +0100
+--- ./bfd/elf64-ppc.c	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,6 ****
   /* PowerPC64-specific support for 64-bit ELF.
@@ -796,9 +796,9 @@
   			|| ELF_ST_VISIBILITY (h->elf.other) == STV_DEFAULT
   			|| h->elf.root.type != bfd_link_hash_undefweak))
   		  {
-diff -rcp ../binutils-2.19.51.0.2.15/gas/config/tc-ppc.c ./gas/config/tc-ppc.c
-*** ../binutils-2.19.51.0.2.15/gas/config/tc-ppc.c	2009-03-02 14:05:00.000000000 +0000
---- ./gas/config/tc-ppc.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/config/tc-ppc.c ./gas/config/tc-ppc.c
+*** ../binutils-2.19.51.0.2.orig/gas/config/tc-ppc.c	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/config/tc-ppc.c	2009-04-15 13:10:01.000000000 +0100
 *************** static const struct pd_reg pre_defined_r
 *** 358,366 ****
 --- 358,399 ----
@@ -1085,9 +1085,9 @@
       {
         /* These are all version "1".  */
         if (opcode->flags & PPC_OPCODE_SPE)
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/booke.d ./gas/testsuite/gas/ppc/booke.d
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/booke.d	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/booke.d	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/booke.d ./gas/testsuite/gas/ppc/booke.d
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/booke.d	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/booke.d	2009-04-15 13:10:01.000000000 +0100
 *************** Disassembly of section \.text:
 *** 38,40 ****
 --- 38,43 ----
@@ -1097,9 +1097,9 @@
 +   74:	7c 05 32 2c 	dcbt    r5,r6
 +   78:	7c 05 32 2c 	dcbt    r5,r6
 +   7c:	7d 05 32 2c 	dcbt    8,r5,r6
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/booke.s ./gas/testsuite/gas/ppc/booke.s
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/booke.s	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/booke.s	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/booke.s ./gas/testsuite/gas/ppc/booke.s
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/booke.s	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/booke.s	2009-04-15 13:10:01.000000000 +0100
 *************** branch_target_2:	
 *** 36,38 ****
 --- 36,42 ----
@@ -1110,9 +1110,9 @@
 + 	dcbt 5,6
 + 	dcbt 0,5,6
 + 	dcbt 8,5,6
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/e500mc.d ./gas/testsuite/gas/ppc/e500mc.d
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/e500mc.d	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/e500mc.d	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/e500mc.d ./gas/testsuite/gas/ppc/e500mc.d
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/e500mc.d	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/e500mc.d	2009-04-15 13:10:11.000000000 +0100
 ***************
 *** 6,12 ****
   
@@ -1170,7 +1170,7 @@
 !   9c:	7c 20 06 26 	tlbilx  1,0,r0
 !   a0:	7c 62 1e 26 	tlbilx  3,r2,r3
 !   a4:	7c 64 2e 26 	tlbilx  3,r4,r5
---- 14,56 ----
+--- 14,57 ----
     10:	7c 09 57 be 	icbiep  r9,r10
     14:	7c 00 69 dc 	msgclr  r13
     18:	7c 00 71 9c 	msgsnd  r14
@@ -1210,13 +1210,14 @@
 !   a0:	7c 64 29 fe 	dcbtstep r3,r4,r5
 !   a4:	7c c7 42 7e 	dcbtep  r6,r7,r8
 !   a8:	7c 0b 67 fe 	dcbzep  r11,r12
-!   ac:	7c 00 06 26 	tlbilx  0,0,r0
-!   b0:	7c 20 06 26 	tlbilx  1,0,r0
-!   b4:	7c 62 1e 26 	tlbilx  3,r2,r3
-!   b8:	7c 64 2e 26 	tlbilx  3,r4,r5
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/e500mc.s ./gas/testsuite/gas/ppc/e500mc.s
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/e500mc.s	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/e500mc.s	2009-03-05 12:20:26.000000000 +0000
+!   ac:	7c 00 00 24 	tlbilxlpid
+!   b0:	7c 20 00 24 	tlbilxpid
+!   b4:	7c 62 18 24 	tlbilxva r2,r3
+!   b8:	7c 64 28 24 	tlbilxva r4,r5
+! 
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/e500mc.s ./gas/testsuite/gas/ppc/e500mc.s
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/e500mc.s	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/e500mc.s	2009-04-15 13:10:01.000000000 +0100
 *************** start:
 *** 9,14 ****
 --- 9,19 ----
@@ -1231,9 +1232,9 @@
   	mdors
   	ehpriv
   	dsn	24, 25
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power4_32.d ./gas/testsuite/gas/ppc/power4_32.d
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power4_32.d	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/power4_32.d	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power4_32.d ./gas/testsuite/gas/ppc/power4_32.d
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power4_32.d	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/power4_32.d	2009-04-15 13:10:01.000000000 +0100
 *************** Disassembly of section \.text:
 *** 41,43 ****
 --- 41,46 ----
@@ -1243,9 +1244,9 @@
 +   88:	7c 05 32 2c 	dcbt    r5,r6
 +   8c:	7c 05 32 2c 	dcbt    r5,r6
 +   90:	7d 05 32 2c 	dcbt    r5,r6,8
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power4_32.s ./gas/testsuite/gas/ppc/power4_32.s
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power4_32.s	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/power4_32.s	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power4_32.s ./gas/testsuite/gas/ppc/power4_32.s
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power4_32.s	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/power4_32.s	2009-04-15 13:10:01.000000000 +0100
 *************** start:
 *** 34,36 ****
 --- 34,39 ----
@@ -1255,9 +1256,9 @@
 + 	dcbt    5,6
 + 	dcbt    5,6,0
 + 	dcbt    5,6,8
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power6.d ./gas/testsuite/gas/ppc/power6.d
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power6.d	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/power6.d	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power6.d ./gas/testsuite/gas/ppc/power6.d
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power6.d	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/power6.d	2009-04-15 13:10:01.000000000 +0100
 *************** Disassembly of section \.text:
 *** 66,68 ****
 --- 66,71 ----
@@ -1267,9 +1268,9 @@
 +   ec:	7d 6a 02 74 	cbcdtd  r10,r11
 +   f0:	7d 6a 02 34 	cdtbcd  r10,r11
 +   f4:	7d 4b 60 94 	addg6s  r10,r11,r12
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power6.s ./gas/testsuite/gas/ppc/power6.s
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power6.s	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/power6.s	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power6.s ./gas/testsuite/gas/ppc/power6.s
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power6.s	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/power6.s	2009-04-15 13:10:01.000000000 +0100
 *************** start:
 *** 61,63 ****
 --- 61,66 ----
@@ -1279,9 +1280,9 @@
 + 	cbcdtd  10,11
 + 	cdtbcd  10,11
 + 	addg6s  10,11,12
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power7.d ./gas/testsuite/gas/ppc/power7.d
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power7.d	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/power7.d	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power7.d ./gas/testsuite/gas/ppc/power7.d
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power7.d	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/power7.d	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,8 ****
 ! #as: -a32 -mpower7
@@ -1410,9 +1411,9 @@
 !  194:	ed c0 78 34 	frsqrtes f14,f15
 !  198:	ed c0 78 35 	frsqrtes\. f14,f15
 !  19c:	7c 43 27 1e 	isel    r2,r3,r4,28
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power7.s ./gas/testsuite/gas/ppc/power7.s
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/power7.s	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/power7.s	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power7.s ./gas/testsuite/gas/ppc/power7.s
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/power7.s	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/power7.s	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,9 ****
 - 	.file	"power7.c"
@@ -1520,9 +1521,9 @@
 ! 	frsqrtes  14,15
 ! 	frsqrtes. 14,15
 ! 	isel	  2,3,4,28
-diff -rcp ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/ppc.exp ./gas/testsuite/gas/ppc/ppc.exp
-*** ../binutils-2.19.51.0.2.15/gas/testsuite/gas/ppc/ppc.exp	2009-03-02 14:05:01.000000000 +0000
---- ./gas/testsuite/gas/ppc/ppc.exp	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/ppc.exp ./gas/testsuite/gas/ppc/ppc.exp
+*** ../binutils-2.19.51.0.2.orig/gas/testsuite/gas/ppc/ppc.exp	2009-04-15 13:09:53.000000000 +0100
+--- ./gas/testsuite/gas/ppc/ppc.exp	2009-04-15 13:10:01.000000000 +0100
 *************** if { [istarget powerpc*-*-*] } then {
 *** 47,51 ****
 --- 47,52 ----
@@ -1532,11 +1533,9 @@
 + 	run_dump_test "vsx"
       }
   }
-Only in ./gas/testsuite/gas/ppc: vsx.d
-Only in ./gas/testsuite/gas/ppc: vsx.s
-diff -rcp ../binutils-2.19.51.0.2.15/include/opcode/ppc.h ./include/opcode/ppc.h
-*** ../binutils-2.19.51.0.2.15/include/opcode/ppc.h	2009-03-02 14:04:52.000000000 +0000
---- ./include/opcode/ppc.h	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/include/opcode/ppc.h ./include/opcode/ppc.h
+*** ../binutils-2.19.51.0.2.orig/include/opcode/ppc.h	2009-04-15 13:09:52.000000000 +0100
+--- ./include/opcode/ppc.h	2009-04-15 13:10:01.000000000 +0100
 *************** extern const int powerpc_num_opcodes;
 *** 114,119 ****
 --- 114,122 ----
@@ -1549,9 +1548,9 @@
   /* Opcode is only supported by POWERPC Classic architecture.  */
   #define PPC_OPCODE_CLASSIC	   0x10000
   
-diff -rcp ../binutils-2.19.51.0.2.15/ld/emultempl/beos.em ./ld/emultempl/beos.em
-*** ../binutils-2.19.51.0.2.15/ld/emultempl/beos.em	2009-03-02 14:04:53.000000000 +0000
---- ./ld/emultempl/beos.em	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/emultempl/beos.em ./ld/emultempl/beos.em
+*** ../binutils-2.19.51.0.2.orig/ld/emultempl/beos.em	2009-04-15 13:09:52.000000000 +0100
+--- ./ld/emultempl/beos.em	2009-04-15 13:10:01.000000000 +0100
 *************** fi
 *** 8,14 ****
   fragment <<EOF
@@ -1626,9 +1625,9 @@
     /* Here we rummage through the found bfds to collect toc information */
     {
 --- 606,611 ----
-diff -rcp ../binutils-2.19.51.0.2.15/ld/emultempl/pe.em ./ld/emultempl/pe.em
-*** ../binutils-2.19.51.0.2.15/ld/emultempl/pe.em	2009-03-02 14:04:53.000000000 +0000
---- ./ld/emultempl/pe.em	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/emultempl/pe.em ./ld/emultempl/pe.em
+*** ../binutils-2.19.51.0.2.orig/ld/emultempl/pe.em	2009-04-15 13:09:52.000000000 +0100
+--- ./ld/emultempl/pe.em	2009-04-15 13:10:01.000000000 +0100
 *************** rm -f e${EMULATION_NAME}.c
 *** 10,16 ****
   (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
@@ -1692,9 +1691,9 @@
   
     if (pe.FileAlignment >
         pe.SectionAlignment)
-diff -rcp ../binutils-2.19.51.0.2.15/ld/emultempl/pep.em ./ld/emultempl/pep.em
-*** ../binutils-2.19.51.0.2.15/ld/emultempl/pep.em	2009-03-02 14:04:53.000000000 +0000
---- ./ld/emultempl/pep.em	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/emultempl/pep.em ./ld/emultempl/pep.em
+*** ../binutils-2.19.51.0.2.orig/ld/emultempl/pep.em	2009-04-15 13:09:52.000000000 +0100
+--- ./ld/emultempl/pep.em	2009-04-15 13:10:01.000000000 +0100
 *************** fi
 *** 9,15 ****
   rm -f e${EMULATION_NAME}.c
@@ -1758,9 +1757,9 @@
   
     if (pep.FileAlignment > pep.SectionAlignment)
       {
-diff -rcp ../binutils-2.19.51.0.2.15/ld/emultempl/xtensaelf.em ./ld/emultempl/xtensaelf.em
-*** ../binutils-2.19.51.0.2.15/ld/emultempl/xtensaelf.em	2009-03-02 14:04:53.000000000 +0000
---- ./ld/emultempl/xtensaelf.em	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/emultempl/xtensaelf.em ./ld/emultempl/xtensaelf.em
+*** ../binutils-2.19.51.0.2.orig/ld/emultempl/xtensaelf.em	2009-04-15 13:09:52.000000000 +0100
+--- ./ld/emultempl/xtensaelf.em	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,5 ****
   # This shell script emits a C file. -*- C -*-
@@ -1814,9 +1813,9 @@
   
   		assign_union->header.next = l;
   		*(*stack_p)->iterloc.loc = assign_union;
-diff -rcp ../binutils-2.19.51.0.2.15/ld/ldctor.c ./ld/ldctor.c
-*** ../binutils-2.19.51.0.2.15/ld/ldctor.c	2009-03-02 14:04:56.000000000 +0000
---- ./ld/ldctor.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/ldctor.c ./ld/ldctor.c
+*** ../binutils-2.19.51.0.2.orig/ld/ldctor.c	2009-04-15 13:09:53.000000000 +0100
+--- ./ld/ldctor.c	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,6 ****
   /* ldctor.c -- constructor support routines
@@ -1877,9 +1876,9 @@
   
 !   pop_stat_ptr ();
   }
-diff -rcp ../binutils-2.19.51.0.2.15/ld/ldlang.c ./ld/ldlang.c
-*** ../binutils-2.19.51.0.2.15/ld/ldlang.c	2009-03-02 14:04:56.000000000 +0000
---- ./ld/ldlang.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/ldlang.c ./ld/ldlang.c
+*** ../binutils-2.19.51.0.2.orig/ld/ldlang.c	2009-04-15 13:09:53.000000000 +0100
+--- ./ld/ldlang.c	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,6 ****
   /* Linker command language support.
@@ -2211,9 +2210,9 @@
   }
   
   /* Add a new program header.  This is called for each entry in a PHDRS
-diff -rcp ../binutils-2.19.51.0.2.15/ld/ldlang.h ./ld/ldlang.h
-*** ../binutils-2.19.51.0.2.15/ld/ldlang.h	2009-03-02 14:04:53.000000000 +0000
---- ./ld/ldlang.h	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/ld/ldlang.h ./ld/ldlang.h
+*** ../binutils-2.19.51.0.2.orig/ld/ldlang.h	2009-04-15 13:09:52.000000000 +0100
+--- ./ld/ldlang.h	2009-04-15 13:10:01.000000000 +0100
 ***************
 *** 1,6 ****
   /* ldlang.h - linker command language support
@@ -2242,9 +2241,9 @@
   extern void lang_add_data
     (int type, union etree_union *);
   extern void lang_add_reloc
-diff -rcp ../binutils-2.19.51.0.2.15/opcodes/ppc-dis.c ./opcodes/ppc-dis.c
-*** ../binutils-2.19.51.0.2.15/opcodes/ppc-dis.c	2009-03-02 14:04:59.000000000 +0000
---- ./opcodes/ppc-dis.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/opcodes/ppc-dis.c ./opcodes/ppc-dis.c
+*** ../binutils-2.19.51.0.2.orig/opcodes/ppc-dis.c	2009-04-15 13:09:53.000000000 +0100
+--- ./opcodes/ppc-dis.c	2009-04-15 13:10:01.000000000 +0100
 *************** powerpc_init_dialect (struct disassemble
 *** 112,119 ****
   
@@ -2265,9 +2264,9 @@
   
     if (info->disassembler_options
         && strstr (info->disassembler_options, "vsx") != NULL)
-diff -rcp ../binutils-2.19.51.0.2.15/opcodes/ppc-opc.c ./opcodes/ppc-opc.c
-*** ../binutils-2.19.51.0.2.15/opcodes/ppc-opc.c	2009-03-02 14:05:00.000000000 +0000
---- ./opcodes/ppc-opc.c	2009-03-05 12:20:26.000000000 +0000
+diff -rcp ../binutils-2.19.51.0.2.orig/opcodes/ppc-opc.c ./opcodes/ppc-opc.c
+*** ../binutils-2.19.51.0.2.orig/opcodes/ppc-opc.c	2009-04-15 13:09:53.000000000 +0100
+--- ./opcodes/ppc-opc.c	2009-04-15 13:11:26.000000000 +0100
 ***************
 *** 1,6 ****
   /* ppc-opc.c -- PowerPC opcode list
@@ -2505,8 +2504,22 @@
   #define PPC32	PPC_OPCODE_32 | PPC_OPCODE_PPC
   #define PPC64	PPC_OPCODE_64 | PPC_OPCODE_PPC
 *************** const struct powerpc_opcode powerpc_opco
+*** 3377,3382 ****
+--- 3464,3474 ----
+  
+  {"isellt",	X(31,15),	X_MASK,      PPCISEL,	PPCNONE,	{RT, RA, RB}},
+  
++ {"tlbilxlpid",	XTO(31,18,0),	XTO_MASK,    E500MC,	PPCNONE,	{0}},
++ {"tlbilxpid",	XTO(31,18,1),	XTO_MASK,    E500MC,	PPCNONE,	{0}},
++ {"tlbilxva",	XTO(31,18,3),	XTO_MASK,    E500MC,	PPCNONE,	{RA0, RB}},
++ {"tlbilx",	X(31,18),	X_MASK,      E500MC,	PPCNONE,	{T, RA0, RB}},
++ 
+  {"mfcr",	XFXM(31,19,0,0), XRARB_MASK, COM,	POWER4,		{RT}},
+  {"mfcr",	XFXM(31,19,0,0), XFXFXM_MASK, POWER4,	PPCNONE,	{RT, FXM4}},
+  {"mfocrf",	XFXM(31,19,0,1), XFXFXM_MASK, COM,	PPCNONE,	{RT, FXM}},
+*************** const struct powerpc_opcode powerpc_opco
 *** 3425,3430 ****
---- 3512,3519 ----
+--- 3517,3524 ----
   
   {"lvewx",	X(31,71),	X_MASK,      PPCVEC,	PPCNONE,	{VD, RA, RB}},
   
@@ -2517,7 +2530,7 @@
   {"isel",	XISEL(31,15),	XISEL_MASK,  PPCISEL,	PPCNONE,	{RT, RA, RB, CRB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 3434,3439 ****
---- 3523,3530 ----
+--- 3528,3535 ----
   {"subf.",	XO(31,40,0,1),	XO_MASK,     PPC,	PPCNONE,	{RT, RA, RB}},
   {"sub.",	XO(31,40,0,1),	XO_MASK,     PPC,	PPCNONE,	{RT, RB, RA}},
   
@@ -2535,7 +2548,7 @@
   
   {"dcbstep",	XRT(31,63,0),	XRT_MASK,    E500MC,	PPCNONE,	{RA, RB}},
   
---- 3538,3546 ----
+--- 3543,3551 ----
   {"andc",	XRC(31,60,0),	X_MASK,      COM,	PPCNONE,	{RA, RS, RB}},
   {"andc.",	XRC(31,60,1),	X_MASK,      COM,	PPCNONE,	{RA, RS, RB}},
   
@@ -2547,7 +2560,7 @@
   
 *************** const struct powerpc_opcode powerpc_opco
 *** 3501,3506 ****
---- 3594,3601 ----
+--- 3599,3606 ----
   
   {"mtsrdin",	X(31,114),	XRA_MASK,    PPC64,	PPCNONE,	{RS, RB}},
   
@@ -2571,7 +2584,7 @@
   {"dcbtstep",	XRT(31,255,0),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
   
   {"mfdcrx",	X(31,259),	X_MASK,      BOOKE,	PPCNONE,	{RS, RA}},
---- 3731,3747 ----
+--- 3736,3752 ----
   {"mtsrin",	X(31,242),	XRA_MASK,    PPC32,	PPCNONE,	{RS, RB}},
   {"mtsri",	X(31,242),	XRA_MASK,    POWER32,	PPCNONE,	{RS, RB}},
   
@@ -2601,7 +2614,7 @@
   {"eqv",		XRC(31,284,0),	X_MASK,      COM,	PPCNONE,	{RA, RS, RB}},
   {"eqv.",	XRC(31,284,1),	X_MASK,      COM,	PPCNONE,	{RA, RS, RB}},
   
---- 3766,3779 ----
+--- 3771,3784 ----
   {"lscbx",	XRC(31,277,0),	X_MASK,      M601,	PPCNONE,	{RT, RA, RB}},
   {"lscbx.",	XRC(31,277,1),	X_MASK,      M601,	PPCNONE,	{RT, RA, RB}},
   
@@ -2618,7 +2631,7 @@
   
 *************** const struct powerpc_opcode powerpc_opco
 *** 3685,3690 ****
---- 3788,3795 ----
+--- 3793,3800 ----
   
   {"lhzux",	X(31,311),	X_MASK,      COM,	PPCNONE,	{RT, RAL, RB}},
   
@@ -2629,7 +2642,7 @@
   
 *************** const struct powerpc_opcode powerpc_opco
 *** 3729,3734 ****
---- 3834,3841 ----
+--- 3839,3846 ----
   {"div",		XO(31,331,0,0),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
   {"div.",	XO(31,331,0,1),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
   
@@ -2647,7 +2660,7 @@
   
   {"lwaux",	X(31,373),	X_MASK,      PPC64,	PPCNONE,	{RT, RAL, RB}},
   
---- 4042,4048 ----
+--- 4047,4053 ----
   
   {"mftbl",	XSPR(31,371,268), XSPR_MASK, CLASSIC,	PPCNONE,	{RT}},
   {"mftbu",	XSPR(31,371,269), XSPR_MASK, CLASSIC,	PPCNONE,	{RT}},
@@ -2657,7 +2670,7 @@
   
 *************** const struct powerpc_opcode powerpc_opco
 *** 3943,3953 ****
---- 4050,4067 ----
+--- 4055,4072 ----
   
   {"lhaux",	X(31,375),	X_MASK,      COM,	PPCNONE,	{RT, RAL, RB}},
   
@@ -2678,7 +2691,7 @@
   {"slbmte",	X(31,402),	XRA_MASK,    PPC64,	PPCNONE,	{RS, RB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 3961,3966 ****
---- 4075,4085 ----
+--- 4080,4090 ----
   
   {"mtdcrux",	X(31,419),	X_MASK,      PPC464,	PPCNONE,	{RA, RS}},
   
@@ -2701,7 +2714,7 @@
   
   {"lbdx",	X(31,515),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
   
---- 4321,4331 ----
+--- 4326,4336 ----
   
   {"cli",		X(31,502),	XRB_MASK,    POWER,	PPCNONE,	{RT, RA}},
   
@@ -2722,7 +2735,7 @@
   
   {"lswx",	X(31,533),	X_MASK,      PPCCOM,	PPCNONE,	{RT, RA0, RB}},
   {"lsx",		X(31,533),	X_MASK,      PWRCOM,	PPCNONE,	{RT, RA, RB}},
---- 4348,4354 ----
+--- 4353,4359 ----
   
   {"clcs",	X(31,531),	XRB_MASK,    M601,	PPCNONE,	{RT, RA}},
   
@@ -2732,7 +2745,7 @@
   {"lsx",		X(31,533),	X_MASK,      PWRCOM,	PPCNONE,	{RT, RA, RB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4271,4276 ****
---- 4392,4399 ----
+--- 4397,4404 ----
   
   {"lwfcmux",	APU(31,583,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
   
@@ -2751,7 +2764,7 @@
   
   {"lddx",	X(31,611),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
   
---- 4407,4414 ----
+--- 4412,4419 ----
   
   {"lfdx",	X(31,599),	X_MASK,      COM,	PPCNONE,	{FRT, RA0, RB}},
   
@@ -2762,7 +2775,7 @@
   
 *************** const struct powerpc_opcode powerpc_opco
 *** 4297,4302 ****
---- 4420,4427 ----
+--- 4425,4432 ----
   {"mulo",	XO(31,107,1,0),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
   {"mulo.",	XO(31,107,1,1),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
   
@@ -2780,7 +2793,7 @@
   
   {"stswx",	X(31,661),	X_MASK,      PPCCOM,	PPCNONE,	{RS, RA0, RB}},
   {"stsx",	X(31,661),	X_MASK,      PWRCOM,	PPCNONE,	{RS, RA0, RB}},
---- 4445,4451 ----
+--- 4450,4456 ----
   
   {"mfsrin",	X(31,659),	XRA_MASK,    PPC32,	PPCNONE,	{RT, RB}},
   
@@ -2790,7 +2803,7 @@
   {"stsx",	X(31,661),	X_MASK,      PWRCOM,	PPCNONE,	{RS, RA0, RB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4341,4346 ****
---- 4466,4473 ----
+--- 4471,4478 ----
   {"stvrx",	X(31,679),	X_MASK,      CELL,	PPCNONE,	{VS, RA0, RB}},
   {"sthfcmux",	APU(31,679,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
   
@@ -2801,7 +2814,7 @@
   {"sriq",	XRC(31,696,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, SH}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4350,4355 ****
---- 4477,4484 ----
+--- 4482,4489 ----
   
   {"stwfcmux",	APU(31,711,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
   
@@ -2812,7 +2825,7 @@
   {"subfzeo.",	XO(31,200,1,1),	XORB_MASK,   PPCCOM,	PPCNONE,	{RT, RA}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4363,4368 ****
---- 4492,4499 ----
+--- 4497,4504 ----
   {"stswi",	X(31,725),	X_MASK,      PPCCOM,	PPCNONE,	{RS, RA0, NB}},
   {"stsi",	X(31,725),	X_MASK,      PWRCOM,	PPCNONE,	{RS, RA0, NB}},
   
@@ -2836,7 +2849,7 @@
   {"subfmeo",	XO(31,232,1,0),	XORB_MASK,   PPCCOM,	PPCNONE,	{RT, RA}},
   {"sfmeo",	XO(31,232,1,0),	XORB_MASK,   PWRCOM,	PPCNONE,	{RT, RA}},
   {"subfmeo.",	XO(31,232,1,1),	XORB_MASK,   PPCCOM,	PPCNONE,	{RT, RA}},
---- 4502,4516 ----
+--- 4507,4521 ----
   {"sreq",	XRC(31,729,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
   {"sreq.",	XRC(31,729,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
   
@@ -2853,18 +2866,17 @@
   {"sfmeo",	XO(31,232,1,0),	XORB_MASK,   PWRCOM,	PPCNONE,	{RT, RA}},
   {"subfmeo.",	XO(31,232,1,1),	XORB_MASK,   PPCCOM,	PPCNONE,	{RT, RA}},
 *************** const struct powerpc_opcode powerpc_opco
-*** 4415,4420 ****
---- 4548,4555 ----
+*** 4415,4432 ****
   {"addo.",	XO(31,266,1,1),	XO_MASK,     PPCCOM,	PPCNONE,	{RT, RA, RB}},
   {"caxo.",	XO(31,266,1,1),	XO_MASK,     PWRCOM,	PPCNONE,	{RT, RA, RB}},
   
-+ {"lxvw4x",	X(31,780),	XX1_MASK,    PPCVSX,	PPCNONE,	{XT6, RA, RB}},
-+ 
   {"tlbivax",	X(31,786),	XRT_MASK,    BOOKE,	PPCNONE,	{RA, RB}},
-  {"tlbilx",	X(31,787),	X_MASK,      E500MC,	PPCNONE,	{T, RA0, RB}},
-  {"tlbilxlpid",	XTO(31,787,0),	XTO_MASK,    E500MC,	PPCNONE,	{0}},
-*************** const struct powerpc_opcode powerpc_opco
-*** 4425,4432 ****
+- {"tlbilx",	X(31,787),	X_MASK,      E500MC,	PPCNONE,	{T, RA0, RB}},
+- {"tlbilxlpid",	XTO(31,787,0),	XTO_MASK,    E500MC,	PPCNONE,	{0}},
+- {"tlbilxpid",	XTO(31,787,1),	XTO_MASK,    E500MC,	PPCNONE,	{0}},
+- {"tlbilxva",	XTO(31,787,3),	XTO_MASK,    E500MC,	PPCNONE,	{RA0, RB}},
+  
+  {"lwzcix",	X(31,789),	X_MASK,      POWER6,	PPCNONE,	{RT, RA0, RB}},
   
   {"lhbrx",	X(31,790),	X_MASK,      COM,	PPCNONE,	{RT, RA0, RB}},
   
@@ -2873,7 +2885,15 @@
   
   {"sraw",	XRC(31,792,0),	X_MASK,      PPCCOM,	PPCNONE,	{RA, RS, RB}},
   {"sra",		XRC(31,792,0),	X_MASK,      PWRCOM,	PPCNONE,	{RA, RS, RB}},
---- 4560,4567 ----
+--- 4553,4568 ----
+  {"addo.",	XO(31,266,1,1),	XO_MASK,     PPCCOM,	PPCNONE,	{RT, RA, RB}},
+  {"caxo.",	XO(31,266,1,1),	XO_MASK,     PWRCOM,	PPCNONE,	{RT, RA, RB}},
+  
++ {"lxvw4x",	X(31,780),	XX1_MASK,    PPCVSX,	PPCNONE,	{XT6, RA, RB}},
++ 
+  {"tlbivax",	X(31,786),	XRT_MASK,    BOOKE,	PPCNONE,	{RA, RB}},
+  
+  {"lwzcix",	X(31,789),	X_MASK,      POWER6,	PPCNONE,	{RT, RA0, RB}},
   
   {"lhbrx",	X(31,790),	X_MASK,      COM,	PPCNONE,	{RT, RA0, RB}},
   
@@ -2884,7 +2904,7 @@
   {"sra",		XRC(31,792,0),	X_MASK,      PWRCOM,	PPCNONE,	{RA, RS, RB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4440,4445 ****
---- 4575,4582 ----
+--- 4576,4583 ----
   
   {"lvrxl",	X(31,807),	X_MASK,      CELL,	PPCNONE,	{VD, RA0, RB}},
   
@@ -2895,7 +2915,7 @@
   {"lhzcix",	X(31,821),	X_MASK,      POWER6,	PPCNONE,	{RT, RA0, RB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4480,4488 ****
---- 4617,4634 ----
+--- 4618,4635 ----
   
   {"ldcix",	X(31,885),	X_MASK,      POWER6,	PPCNONE,	{RT, RA0, RB}},
   
@@ -2924,7 +2944,7 @@
   
   {"sraq",	XRC(31,920,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
   {"sraq.",	XRC(31,920,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
---- 4638,4645 ----
+--- 4639,4646 ----
   
   {"sthbrx",	X(31,918),	X_MASK,      COM,	PPCNONE,	{RS, RA0, RB}},
   
@@ -2935,7 +2955,7 @@
   {"sraq.",	XRC(31,920,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4510,4515 ****
---- 4656,4668 ----
+--- 4657,4669 ----
   
   {"stvrxl",	X(31,935),	X_MASK,      CELL,	PPCNONE,	{VS, RA0, RB}},
   
@@ -2963,7 +2983,7 @@
   {"ld",		DSO(58,0),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RA0}},
   {"ldu",		DSO(58,1),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RAL}},
   {"lwa",		DSO(58,2),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RA0}},
---- 4801,4812 ----
+--- 4802,4813 ----
   
   {"psq_l",	OP(56),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
   
@@ -2992,7 +3012,7 @@
   
   {"fmsubs",	A(59,28,0),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
   {"fmsubs.",	A(59,28,1),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
---- 4829,4846 ----
+--- 4830,4847 ----
   {"fsqrts",	A(59,22,0),    AFRAFRC_MASK, PPC,	PPCNONE,	{FRT, FRB}},
   {"fsqrts.",	A(59,22,1),    AFRAFRC_MASK, PPC,	PPCNONE,	{FRT, FRB}},
   
@@ -3041,7 +3061,7 @@
   {"std",		DSO(62,0),	DS_MASK,     PPC64,	PPCNONE,	{RS, DS, RA0}},
   {"stdu",	DSO(62,1),	DS_MASK,     PPC64,	PPCNONE,	{RS, DS, RAS}},
   {"stq",		DSO(62,2),	DS_MASK,     POWER4,	PPCNONE,	{RSQ, DS, RA0}},
---- 4906,5078 ----
+--- 4907,5079 ----
   {"drsp",	XRC(59,770,0),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRB}},
   {"drsp.",	XRC(59,770,1),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRB}},
   
@@ -3233,7 +3253,7 @@
   
   {"fmsub",	A(63,28,0),	A_MASK,      PPCCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
   {"fms",		A(63,28,0),	A_MASK,      PWRCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
---- 5122,5141 ----
+--- 5123,5142 ----
   {"fsel",	A(63,23,0),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
   {"fsel.",	A(63,23,1),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
   
@@ -3256,7 +3276,7 @@
   {"fms",		A(63,28,0),	A_MASK,      PWRCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4885,4890 ****
---- 5191,5198 ----
+--- 5192,5199 ----
   {"drintxq",	ZRC(63,99,0),	Z2_MASK,     POWER6,	PPCNONE,	{R, FRT, FRB, RMC}},
   {"drintxq.",	ZRC(63,99,1),	Z2_MASK,     POWER6,	PPCNONE,	{R, FRT, FRB, RMC}},
   
@@ -3267,7 +3287,7 @@
   {"mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4895,4900 ****
---- 5203,5215 ----
+--- 5204,5216 ----
   {"fnabs",	XRC(63,136,0),	XRA_MASK,    COM,	PPCNONE,	{FRT, FRB}},
   {"fnabs.",	XRC(63,136,1),	XRA_MASK,    COM,	PPCNONE,	{FRT, FRB}},
   
@@ -3283,7 +3303,7 @@
   {"dtstdgq",	Z(63,226),	Z_MASK,      POWER6,	PPCNONE,	{BF, FRA, DGM}},
 *************** const struct powerpc_opcode powerpc_opco
 *** 4965,4970 ****
---- 5280,5293 ----
+--- 5281,5294 ----
   {"diexq",	XRC(63,866,0),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRA, FRB}},
   {"diexq.",	XRC(63,866,1),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRA, FRB}},
   


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- binutils.spec	8 Apr 2009 16:13:33 -0000	1.160
+++ binutils.spec	15 Apr 2009 12:44:44 -0000	1.161
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.51.0.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -347,6 +347,9 @@
 %endif # %{isnative}
 
 %changelog
+* Wed Apr 15 2009 Nick Clifton <nickc at redhat.com> 2.19.51.0.2-18
+- Update IBM Power 7 support patch to fix tlbilx opcode.  (BZ 494718)
+
 * Tue Mar 17 2009 Nick Clifton <nickc at redhat.com> 2.19.51.0.2-17
 - Add glibc-static to BuildRequires when running the testsuite.
 



From thias at fedoraproject.org  Wed Apr 15 12:49:41 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Wed, 15 Apr 2009 12:49:41 +0000 (UTC)
Subject: rpms/libcaca/F-10 libcaca-0.99.beta16-multilib.patch, NONE,
	1.1 libcaca.spec, 1.17, 1.18
Message-ID: <20090415124941.2D80D70101@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16704/F-10

Modified Files:
	libcaca.spec 
Added Files:
	libcaca-0.99.beta16-multilib.patch 
Log Message:
Backport latest devel changes to F-9 (full update) and F-10 (multilib fix + keep upgrade path).


libcaca-0.99.beta16-multilib.patch:

--- NEW FILE libcaca-0.99.beta16-multilib.patch ---
diff -Naupr libcaca-0.99.beta16.orig/caca-config.in libcaca-0.99.beta16/caca-config.in
--- libcaca-0.99.beta16.orig/caca-config.in	2008-09-27 17:58:05.000000000 +0200
+++ libcaca-0.99.beta16/caca-config.in	2008-12-21 14:52:39.462372516 +0100
@@ -6,7 +6,16 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 
-lib_dir=@libdir@
+# Fedora specific hack to share the same script on all archs
+ARCH=$(uname -m)
+case ${ARCH} in
+x86_64|ia64|s390)
+  lib_dir=@prefix@/lib64
+  ;;
+*)
+  lib_dir=@prefix@/lib
+  ;;
+esac
 include_dir=@includedir@
 
 usage()
@@ -114,6 +123,6 @@ fi
 
 if test "$echo_libs" = "yes"
 then
-  echo -L at libdir@ $libs
+  echo -L$lib_dir $libs
 fi
 


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-10/libcaca.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libcaca.spec	27 Oct 2008 10:20:31 -0000	1.17
+++ libcaca.spec	15 Apr 2009 12:49:10 -0000	1.18
@@ -3,11 +3,12 @@
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.5.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
 License: WTFPL
 Group: System Environment/Libraries
 URL: http://libcaca.zoy.org/
 Source: http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-%{version}.%{beta}.tar.gz
+Patch0: libcaca-0.99.beta16-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: slang-devel
 BuildRequires: ncurses-devel
@@ -68,6 +69,7 @@
 
 %prep
 %setup -q -n libcaca-%{version}.%{beta}
+%patch0 -p1
 
 
 %build
@@ -103,7 +105,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc ChangeLog libcaca-dev-docs/*
+%doc ChangeLog libcaca-dev-docs/html/
 %{_bindir}/caca-config
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -132,6 +134,13 @@
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.7.beta16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.6.beta16
+- Add patch to share the same caca-config for 32 and 64bit (#341951).
+- Don't include the pdf devel doc, only html (again, fixed multilib conflict).
+
 * Mon Oct 27 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.5.beta16
 - Update to 0.99beta16.
 - Update Source URL.



From thias at fedoraproject.org  Wed Apr 15 12:49:41 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Wed, 15 Apr 2009 12:49:41 +0000 (UTC)
Subject: rpms/libcaca/F-9 libcaca-0.99.beta16-multilib.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 libcaca.spec, 1.16, 1.17 sources, 1.3, 1.4
Message-ID: <20090415124941.7914870101@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16704/F-9

Modified Files:
	.cvsignore libcaca.spec sources 
Added Files:
	libcaca-0.99.beta16-multilib.patch 
Log Message:
Backport latest devel changes to F-9 (full update) and F-10 (multilib fix + keep upgrade path).


libcaca-0.99.beta16-multilib.patch:

--- NEW FILE libcaca-0.99.beta16-multilib.patch ---
diff -Naupr libcaca-0.99.beta16.orig/caca-config.in libcaca-0.99.beta16/caca-config.in
--- libcaca-0.99.beta16.orig/caca-config.in	2008-09-27 17:58:05.000000000 +0200
+++ libcaca-0.99.beta16/caca-config.in	2008-12-21 14:52:39.462372516 +0100
@@ -6,7 +6,16 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 
-lib_dir=@libdir@
+# Fedora specific hack to share the same script on all archs
+ARCH=$(uname -m)
+case ${ARCH} in
+x86_64|ia64|s390)
+  lib_dir=@prefix@/lib64
+  ;;
+*)
+  lib_dir=@prefix@/lib
+  ;;
+esac
 include_dir=@includedir@
 
 usage()
@@ -114,6 +123,6 @@ fi
 
 if test "$echo_libs" = "yes"
 then
-  echo -L at libdir@ $libs
+  echo -L$lib_dir $libs
 fi
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2007 14:00:29 -0000	1.3
+++ .cvsignore	15 Apr 2009 12:49:10 -0000	1.4
@@ -1 +1 @@
-libcaca-0.99.beta11.tar.gz
+libcaca-0.99.beta16.tar.gz


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-9/libcaca.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libcaca.spec	20 Feb 2008 04:19:35 -0000	1.16
+++ libcaca.spec	15 Apr 2009 12:49:11 -0000	1.17
@@ -1,13 +1,14 @@
-%define beta beta11
+%define beta beta16
 
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.4.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
 License: WTFPL
 Group: System Environment/Libraries
 URL: http://libcaca.zoy.org/
-Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
+Source: http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-%{version}.%{beta}.tar.gz
+Patch0: libcaca-0.99.beta16-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: slang-devel
 BuildRequires: ncurses-devel
@@ -68,6 +69,7 @@
 
 %prep
 %setup -q -n libcaca-%{version}.%{beta}
+%patch0 -p1
 
 
 %build
@@ -79,10 +81,12 @@
 
 
 %install
-%{__rm} -rf %{buildroot} libcucul-dev-docs
+%{__rm} -rf %{buildroot} libcaca-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
+%{__mv} %{buildroot}%{_docdir}/libcaca-dev libcaca-dev-docs
+# Remove symlink to libcaca-dev
+%{__rm} -f %{buildroot}%{_docdir}/libcucul-dev
 
 
 %clean
@@ -93,6 +97,7 @@
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -100,7 +105,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc ChangeLog libcucul-dev-docs/*
+%doc ChangeLog libcaca-dev-docs/html/
 %{_bindir}/caca-config
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -112,23 +117,34 @@
 
 %files -n caca-utils
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
+%doc AUTHORS COPYING* NEWS NOTES README THANKS
 %{_bindir}/cacademo
 %{_bindir}/cacafire
 %{_bindir}/cacaplay
 %{_bindir}/cacaserver
 %{_bindir}/cacaview
-%{_bindir}/img2irc
+%{_bindir}/img2txt
 %{_datadir}/libcaca/
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
 %{_mandir}/man1/cacaplay.1*
 %{_mandir}/man1/cacaserver.1*
 %{_mandir}/man1/cacaview.1*
-%{_mandir}/man1/img2irc.1*
+%{_mandir}/man1/img2txt.1*
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.7.beta16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.6.beta16
+- Add patch to share the same caca-config for 32 and 64bit (#341951).
+- Don't include the pdf devel doc, only html (again, fixed multilib conflict).
+
+* Mon Oct 27 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.5.beta16
+- Update to 0.99beta16.
+- Update Source URL.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99-0.4.beta11
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2007 14:00:29 -0000	1.3
+++ sources	15 Apr 2009 12:49:11 -0000	1.4
@@ -1 +1 @@
-94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz
+3953bf4a803747b63a99f50125563151  libcaca-0.99.beta16.tar.gz



From mdomsch at fedoraproject.org  Wed Apr 15 12:53:39 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 15 Apr 2009 12:53:39 +0000 (UTC)
Subject: rpms/dkms/F-11 dkms.spec,1.20,1.21
Message-ID: <20090415125339.CB79070101@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18393

Modified Files:
	dkms.spec 
Log Message:
add Requires: lsb


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/dkms.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dkms.spec	15 Apr 2009 04:51:37 -0000	1.20
+++ dkms.spec	15 Apr 2009 12:53:08 -0000	1.21
@@ -1,12 +1,12 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.21.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99
+Requires: bash > 1.99, lsb
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
@@ -125,6 +125,9 @@
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
+- add Requires: lsb
+
 * Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
 - update to latest upstream
 



From mdomsch at fedoraproject.org  Wed Apr 15 12:56:34 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Wed, 15 Apr 2009 12:56:34 +0000 (UTC)
Subject: rpms/dkms/F-9 dkms-modprobe.d.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 dkms.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20090415125635.086AB70127@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19409

Modified Files:
	.cvsignore dkms.spec sources 
Added Files:
	dkms-modprobe.d.patch 
Log Message:
update to 2.0.21.1 plus patch, add Requires: lsb

dkms-modprobe.d.patch:

--- NEW FILE dkms-modprobe.d.patch ---
>From b2721fad5e830cc4c689ecfd37cdd1ab3768daf3 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <Mario_Limonciello at Dell.com>
Date: Thu, 5 Mar 2009 11:06:50 -0600
Subject: [PATCH] merge in a few changes from Keybuk to alter behaviors on Ubuntu a little bit

---

diff --git a/dkms b/dkms
index eccd84e..a8b1d58 100755
--- a/dkms
+++ b/dkms
@@ -705,6 +705,7 @@ function moduleconfig_add ()
 
     local temp_dir_name=`mktemp -d $tmp_location/dkms.XXXXXX`
     modconfig_files=""
+    [ -e /etc/modprobe.d/dkms.conf ] && modconfig_files="/etc/modprobe.d/dkms.conf"
     [ -e /etc/modprobe.d/dkms ] && modconfig_files="/etc/modprobe.d/dkms"
     [ -e /etc/modules.conf ] && modconfig_files="$modconfig_files /etc/modules.conf"
     [ -e /etc/modprobe.conf ] && modconfig_files="$modconfig_files /etc/modprobe.conf"
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	30 May 2008 19:43:53 -0000	1.14
+++ .cvsignore	15 Apr 2009 12:56:00 -0000	1.15
@@ -1 +1 @@
-dkms-2.0.19.1.tar.gz
+dkms-2.0.21.1.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-9/dkms.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dkms.spec	30 May 2008 19:43:53 -0000	1.18
+++ dkms.spec	15 Apr 2009 12:56:00 -0000	1.19
@@ -1,19 +1,22 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.19.1
-Release: 1%{?dist}
+Version: 2.0.21.1
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99
+Requires: bash > 1.99, lsb
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
+Patch0: dkms-modprobe.d.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# when building for Fedora, uncomment this Requires
+
+%if 0%{?fedora}
 Requires: kernel-devel
+%endif
 
 %description
 This package contains the framework for the Dynamic
@@ -23,6 +26,8 @@
 %prep
 
 %setup -q
+%patch0 -p1
+
 %build
 
 %triggerpostun -- %{name} < 1.90.00-1
@@ -100,6 +105,16 @@
 %{_sysconfdir}/kernel/prerm.d/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}
 
+%if 0%{?suse_version}
+# suse doesnt yet support /etc/kernel/{prerm.d,postinst.d}, but will fail build
+# with unowned dirs if we dont own them ourselves
+# when opensuse *does* add this support, we will need to BuildRequires kernel
+%dir %{_sysconfdir}/kernel
+%dir %{_sysconfdir}/kernel/postinst.d
+%dir %{_sysconfdir}/kernel/prerm.d
+%endif
+
+
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
 # enable on initial install
@@ -110,6 +125,15 @@
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
+- add Requires: lsb
+
+* Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
+- update to latest upstream
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 28 2008 Matt Domsch <Matt_Domsch at dell.com> 2.0.19.1
 - depmod on uninstall before mkinitrd, depmod fix & cleanups
 - find_module_from_ko() could incorrectly return multiple values


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 May 2008 19:43:53 -0000	1.14
+++ sources	15 Apr 2009 12:56:00 -0000	1.15
@@ -1 +1 @@
-d51bb4a0679dcd6152dfa0c37c3b716b  dkms-2.0.19.1.tar.gz
+539113eabf49356b9659c85512927519  dkms-2.0.21.1.tar.gz



From twoerner at fedoraproject.org  Wed Apr 15 13:02:44 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Wed, 15 Apr 2009 13:02:44 +0000 (UTC)
Subject: rpms/system-config-firewall/devel system-config-firewall.spec, 1.41,
	1.42
Message-ID: <20090415130244.94BE170101@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22110

Modified Files:
	system-config-firewall.spec 
Log Message:
- release bump




Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- system-config-firewall.spec	15 Apr 2009 08:34:40 -0000	1.41
+++ system-config-firewall.spec	15 Apr 2009 13:02:13 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
 Version: 1.2.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
 ExclusiveOS: Linux
@@ -119,6 +119,9 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 
 %changelog
+* Mon Apr 13 2009 Thomas Woerner <twoerner at redhat.com> 1.2.16-2
+- release bump
+
 * Mon Apr 13 2009 Thomas Woerner <twoerner at redhat.com> 1.2.16-1
 - fixed build system to update desktop file from desktop.in
   fixes icon reference in desktop file (rhbz#493674)



From mmaslano at fedoraproject.org  Wed Apr 15 13:10:56 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 15 Apr 2009 13:10:56 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/F-11 perl-Data-Dumper-Names.spec, 1.1,
	1.2
Message-ID: <20090415131056.5B4FA70101@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24588

Modified Files:
	perl-Data-Dumper-Names.spec 
Log Message:
* Wed Apr 15 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-3
- tests need Test::Most, which are dependent on this package



Index: perl-Data-Dumper-Names.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/F-11/perl-Data-Dumper-Names.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-Dumper-Names.spec	8 Apr 2009 14:02:10 -0000	1.1
+++ perl-Data-Dumper-Names.spec	15 Apr 2009 13:10:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Data-Dumper-Names
 Version:        0.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Data::Dumper like module for printing and eval data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,8 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(PadWalker) >= 0.13
+# Cyclic dependencies on Test::More
+#BuildRequires:  perl(Test::More)
 Requires:       perl(PadWalker) >= 0.13
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -34,7 +36,7 @@
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+#./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 15 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-3
+- tests need Test::Most, which are dependent on this package
+
 * Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-2
 - remove unnecessary requirement
 



From jorton at fedoraproject.org  Wed Apr 15 13:20:36 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Wed, 15 Apr 2009 13:20:36 +0000 (UTC)
Subject: rpms/php/F-11 php-5.2.5-systzdata.patch, 1.3, 1.4 php.spec, 1.175, 
	1.176 php-5.2.6-systzdata.patch, 1.2, NONE
Message-ID: <20090415132036.2FAC770101@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27563

Modified Files:
	php.spec 
Added Files:
	php-5.2.5-systzdata.patch 
Removed Files:
	php-5.2.6-systzdata.patch 
Log Message:
* Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
- revert to r3 of tzdata patch


php-5.2.5-systzdata.patch:

Index: php-5.2.5-systzdata.patch
===================================================================
RCS file: php-5.2.5-systzdata.patch
diff -N php-5.2.5-systzdata.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ php-5.2.5-systzdata.patch	15 Apr 2009 13:20:33 -0000	1.4
@@ -0,0 +1,263 @@
+
+Add support for use of the system timezone database, rather
+than embedding a copy.  Discussed upstream but was not desired.
+
+History:
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+
+--- php-5.2.5/ext/date/lib/timelib.m4.systzdata
++++ php-5.2.5/ext/date/lib/timelib.m4
+@@ -78,3 +78,17 @@ stdlib.h
+ 
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll strftime)
++
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++                         [Define for location of system timezone data])
++   fi
++fi
++
+--- php-5.2.5/ext/date/lib/parse_tz.c.systzdata
++++ php-5.2.5/ext/date/lib/parse_tz.c
+@@ -20,6 +20,16 @@
+ 
+ #include "timelib.h"
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++#endif
++
+ #include <stdio.h>
+ 
+ #ifdef HAVE_LOCALE_H
+@@ -31,7 +41,10 @@
+ #else
+ #include <strings.h>
+ #endif
++
++#ifndef HAVE_SYSTEM_TZDATA
+ #include "timezonedb.h"
++#endif
+ 
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -206,6 +219,195 @@ void timelib_dump_tzinfo(timelib_tzinfo 
+ 	}
+ }
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++static const timelib_tzdb *timezonedb_system = NULL;
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++	return strcmp(ent->d_name, ".") != 0
++		&& strcmp(ent->d_name, "..") != 0
++		&& strcmp(ent->d_name, "posix") != 0
++		&& strcmp(ent->d_name, "posixrules") != 0
++		&& strcmp(ent->d_name, "right") != 0
++		&& strstr(ent->d_name, ".tab") == NULL;
++}
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++	size_t dirstack_size,  dirstack_top;
++	size_t index_size, index_next;
++	timelib_tzdb_index_entry *db_index;
++	char **dirstack;
++
++	/* LIFO stack to hold directory entries to scan; each slot is a
++	 * directory name relative to the zoneinfo prefix. */
++	dirstack_size = 32;
++	dirstack = malloc(dirstack_size * sizeof *dirstack);
++	dirstack_top = 1;
++	dirstack[0] = strdup("");
++	
++	/* Index array. */
++	index_size = 64;
++	db_index = malloc(index_size * sizeof *db_index);
++	index_next = 0;
++
++	do {
++		struct dirent **ents;
++		char name[PATH_MAX], *top;
++		int count;
++
++		/* Pop the top stack entry, and iterate through its contents. */
++		top = dirstack[--dirstack_top];
++		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++		count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++		while (count > 0) {
++			struct stat st;
++			const char *leaf = ents[count - 1]->d_name;
++
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++				 top, leaf);
++			
++			if (strlen(name) && stat(name, &st) == 0) {
++				/* Name, relative to the zoneinfo prefix. */
++				const char *root = top;
++
++				if (root[0] == '/') root++;
++
++				snprintf(name, sizeof name, "%s%s%s", root, 
++					 *root ? "/": "", leaf);
++
++				if (S_ISDIR(st.st_mode)) {
++					if (dirstack_top == dirstack_size) {
++						dirstack_size *= 2;
++						dirstack = realloc(dirstack, 
++								   dirstack_size * sizeof *dirstack);
++					}
++					dirstack[dirstack_top++] = strdup(name);
++				}
++				else {
++					if (index_next == index_size) {
++						index_size *= 2;
++						db_index = realloc(db_index,
++								   index_size * sizeof *db_index);
++					}
++
++					db_index[index_next].id = strdup(name);
++					db_index[index_next++].pos = 0;
++				}
++			}
++
++			free(ents[--count]);
++		}
++		
++		if (count != -1) free(ents);
++		free(top);
++	} while (dirstack_top);
++
++	db->index = db_index;
++	db->index_size = index_next;
++
++	free(dirstack);
++}
++
++/* Return the mmap()ed tzfile if found, else NULL.  On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++	char fname[PATH_MAX];
++	struct stat st;
++	char *p;
++	int fd;
++	
++	if (strstr(timezone, "..") != NULL) {
++		return NULL;
++	}
++
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++	
++	fd = open(fname, O_RDONLY);
++	if (fd == -1) {
++		return NULL;
++	} else if (fstat(fd, &st) != 0 || st.st_size < 21) {
++		close(fd);
++		return NULL;
++	}
++
++	*length = st.st_size;
++	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++	close(fd);
++	
++	return p != MAP_FAILED ? p : NULL;
++}
++
++const timelib_tzdb *timelib_builtin_db(void)
++{
++	if (timezonedb_system == NULL) {
++		timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++		tmp->version = "0.system";
++		tmp->data = NULL;
++		create_zone_index(tmp);
++		timezonedb_system = tmp;
++	}
++			
++	return timezonedb_system;
++}
++
++const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
++{
++	*count = timezonedb_system->index_size;
++	return timezonedb_system->index;
++}
++
++int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
++{
++	char fname[PATH_MAX];
++
++	if (strstr(timezone, "..") != NULL) {
++		return 0;
++	}
++	
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++
++	return access(fname, R_OK) == 0 ? 1 : 0;
++}
++
++timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
++{
++	char *tzf, *orig;
++	timelib_tzinfo *tmp;
++	size_t len;
++
++	orig = map_tzfile(timezone, &len);
++	if (orig == NULL) {
++		return NULL;
++	}
++
++	tmp = timelib_tzinfo_ctor(timezone);
++
++	tzf = orig + 20;
++	read_header(&tzf, tmp);
++	read_transistions(&tzf, tmp);
++	read_types(&tzf, tmp);
++
++	munmap(orig, len);
++
++	return tmp;
++}
++#else /* !HAVE_SYSTEM_TZDATA */
++
+ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	int left = 0, right = tzdb->index_size - 1;
+@@ -279,6 +481,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+ 
+ 	return tmp;
+ }
++#endif
+ 
+ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
+ {


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-11/php.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- php.spec	28 Feb 2009 18:26:58 -0000	1.175
+++ php.spec	15 Apr 2009 13:20:34 -0000	1.176
@@ -7,7 +7,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -33,7 +33,7 @@
 # Functional changes
 Patch40: php-5.0.4-dlopen.patch
 Patch41: php-5.2.4-easter.patch
-Patch42: php-5.2.6-systzdata.patch
+Patch42: php-5.2.5-systzdata.patch
 
 # Fixes for tests
 Patch60: php-5.2.7-tests-dashn.patch
@@ -777,6 +777,9 @@
 %files recode -f files.recode
 
 %changelog
+* Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
+- revert to r3 of tzdata patch
+
 * Sat Feb 28 2009 Remi Collet <Fedora at FamilleCollet.com> - 5.2.9-1
 - update to 5.2.9
 


--- php-5.2.6-systzdata.patch DELETED ---



From limb at fedoraproject.org  Wed Apr 15 13:29:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 15 Apr 2009 13:29:35 +0000 (UTC)
Subject: rpms/libmng/devel libmng.spec,1.35,1.36
Message-ID: <20090415132935.60B7D70137@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/libmng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30051

Modified Files:
	libmng.spec 
Log Message:
merge review fixes.



Index: libmng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libmng.spec	14 Apr 2009 14:56:37 -0000	1.35
+++ libmng.spec	15 Apr 2009 13:29:02 -0000	1.36
@@ -1,6 +1,6 @@
 Name: libmng
 Version: 1.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 # This is a common zlib variant.
@@ -16,7 +16,7 @@
 %package devel
 Summary: Development files for the Multiple-image Network Graphics library
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel
 Requires: libjpeg-devel
 
@@ -44,7 +44,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -68,6 +68,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Wed Apr 15 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.10-3
+- Fixed -devel requires and make install syntax.
+
 * Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.10-2
 - Fixed install, source url, added docs for Merge Review BZ 226033.
 



From twoerner at fedoraproject.org  Wed Apr 15 13:30:46 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Wed, 15 Apr 2009 13:30:46 +0000 (UTC)
Subject: rpms/iptables/F-11 .cvsignore, 1.25, 1.26 iptables.spec, 1.76,
	1.77 sources, 1.25, 1.26
Message-ID: <20090415133046.B19B970101@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30912

Modified Files:
	.cvsignore iptables.spec sources 
Log Message:
- new version 1.4.3.2
- also install iptables/internal.h, needed for iptables.h and ip6tables.h




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Mar 2009 12:53:21 -0000	1.25
+++ .cvsignore	15 Apr 2009 13:30:15 -0000	1.26
@@ -4,3 +4,4 @@
 iptables-1.4.1.1.tar.bz2
 iptables-1.4.2.tar.bz2
 iptables-1.4.3.1.tar.bz2
+iptables-1.4.3.2.tar.bz2


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-11/iptables.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- iptables.spec	30 Mar 2009 12:53:21 -0000	1.76
+++ iptables.spec	15 Apr 2009 13:30:15 -0000	1.77
@@ -1,6 +1,6 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.3.1
+Version: 1.4.3.2
 Release: 1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
@@ -72,6 +72,8 @@
 
 # install ip*tables.h header files
 install -m 644 include/ip*tables.h %{buildroot}%{_includedir}/
+install -d -m 755 %{buildroot}%{_includedir}/iptables
+install -m 644 include/iptables/internal.h %{buildroot}%{_includedir}/iptables/
 
 # install ipulog header file
 install -d -m 755 %{buildroot}%{_includedir}/libipulog/
@@ -133,6 +135,8 @@
 
 %files devel
 %defattr(-,root,root)
+%dir %{_includedir}/iptables
+%{_includedir}/iptables/*.h
 %{_includedir}/*.h
 %dir %{_includedir}/libiptc
 %{_includedir}/libiptc/*.h
@@ -146,6 +150,10 @@
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Wed Apr 15 2009 Thomas Woerner <twoerner at redhat.com> 1.4.3.2-1
+- new version 1.4.3.2
+- also install iptables/internal.h, needed for iptables.h and ip6tables.h
+
 * Mon Mar 30 2009 Thomas Woerner <twoerner at redhat.com> 1.4.3.1-1
 - new version 1.4.3.1
   - libiptc is now shared


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Mar 2009 12:53:21 -0000	1.25
+++ sources	15 Apr 2009 13:30:15 -0000	1.26
@@ -1 +1 @@
-9c67f796f69e1e016cc19e2c19357711  iptables-1.4.3.1.tar.bz2
+545698693b636cfc844aafc6729fd48a  iptables-1.4.3.2.tar.bz2



From jsafrane at fedoraproject.org  Wed Apr 15 13:37:25 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed, 15 Apr 2009 13:37:25 +0000 (UTC)
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.67,1.68
Message-ID: <20090415133725.C1E6970101@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv956

Modified Files:
	OpenIPMI.spec 
Log Message:
fix compilation flags, debuginfo package is correctly generated now


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- OpenIPMI.spec	19 Mar 2009 12:27:35 -0000	1.67
+++ OpenIPMI.spec	15 Apr 2009 13:36:54 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -71,7 +71,7 @@
 %setup -q
 
 %build
-export CFLAGS=-fPIC
+export CFLAGS="-fPIC $RPM_OPT_FLAGS"
 %configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --disable-static
 # get rid of rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -165,6 +165,9 @@
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Wed Apr 15 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-2
+- fix compilation flags, debuginfo package is correctly generated now
+
 * Thu Mar 19 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-1
 - new upstream release
 



From ingvar at fedoraproject.org  Wed Apr 15 13:51:56 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 15 Apr 2009 13:51:56 +0000 (UTC)
Subject: rpms/varnish/EL-4 .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20090415135156.AEDF970101@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821

Modified Files:
	.cvsignore sources 
Log Message:
New upstream release. A bugfix release. No changes in ABI, API or config files.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Feb 2009 09:16:30 -0000	1.8
+++ .cvsignore	15 Apr 2009 13:51:21 -0000	1.9
@@ -1 +1 @@
-varnish-2.0.3.tar.gz
+varnish-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Feb 2009 09:16:31 -0000	1.8
+++ sources	15 Apr 2009 13:51:21 -0000	1.9
@@ -1 +1 @@
-4233ad2fc3d0c2fcf7bf399f6ccf50b2  varnish-2.0.3.tar.gz
+8044d59cb6d2ec6d09b7ae6033f06bbf  varnish-2.0.4.tar.gz



From rdieter at fedoraproject.org  Wed Apr 15 13:59:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 15 Apr 2009 13:59:34 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.10, 1.11 eigen2.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <20090415135934.3ECB170101@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8702

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Mon Apr 15 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.1-1
- eigen-2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Feb 2009 21:26:17 -0000	1.10
+++ .cvsignore	15 Apr 2009 13:59:02 -0000	1.11
@@ -1 +1 @@
-eigen-2.0.0.tar.bz2
+eigen-2.0.1.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eigen2.spec	24 Feb 2009 14:16:18 -0000	1.12
+++ eigen2.spec	15 Apr 2009 13:59:02 -0000	1.13
@@ -8,8 +8,8 @@
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
-Version: 2.0.0
-Release: 2%{?dist} 
+Version: 2.0.1
+Release: 1%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -34,7 +34,7 @@
 BuildRequires: blas-devel
 BuildRequires: gsl-devel
 # can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411
-#BuildRequires: suitesparse-devel
+BuildRequires: suitesparse-devel
 BuildRequires: qt4-devel
 #-- Could NOT find TAUCS  (missing:  TAUCS_INCLUDES TAUCS_LIBRARIES)
 #-- Could NOT find SUPERLU  (missing:  SUPERLU_INCLUDES SUPERLU_LIBRARIES)
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Mon Apr 15 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.1-1
+- eigen-2.0.1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Feb 2009 21:26:17 -0000	1.10
+++ sources	15 Apr 2009 13:59:02 -0000	1.11
@@ -1 +1 @@
-bedfe344498b926a4b5db17d2846dbb5  eigen-2.0.0.tar.bz2
+3d7af1f727355dfe58531a3649c7d4b5  eigen-2.0.1.tar.bz2



From ensc at fedoraproject.org  Wed Apr 15 14:14:59 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Wed, 15 Apr 2009 14:14:59 +0000 (UTC)
Subject: rpms/clamav/devel clamav.spec,1.86,1.87
Message-ID: <20090415141459.AD8A770101@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13841

Modified Files:
	clamav.spec 
Log Message:
updated


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- clamav.spec	10 Apr 2009 20:17:31 -0000	1.86
+++ clamav.spec	15 Apr 2009 14:14:27 -0000	1.87
@@ -2,6 +2,7 @@
 
 ## Fedora Extras specific customization below...
 %bcond_without       	fedora
+%bcond_without		upstart
 %bcond_with		unrar
 ##
 
@@ -21,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.1
-Release:	%release_func 1%{?snapshot:.%snapshot}
+Release:	%release_func 2%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -197,8 +198,8 @@
 Requires(postun):	%_initrddir initscripts
 Requires(post):		chkconfig
 Requires(preun):	chkconfig initscripts
-Provides:		milter-sysv = %version-%release
-Obsoletes:		milter-sysv < %version-%release
+Provides:		clamav-milter-sysv = %version-%release
+Obsoletes:		clamav-milter-sysv < %version-%release
 
 %package milter-upstart
 Summary:	Upstart initscripts for the clamav sendmail-milter
@@ -453,6 +454,7 @@
 rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog}
 
+%{!?with_upstart:rm -rf %_sysconfdir/event.d}
 
 ## ------------------------------------------------------------
 
@@ -640,9 +642,11 @@
 %files scanner-sysvinit
 %attr(0755,root,root) %config %_initrddir/clamd.scan
 
+%if 0%{?with_upstart:1}
 %files scanner-upstart
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/event.d/clamd.scan
+%endif
 
 ## -----------------------
 
@@ -660,12 +664,20 @@
 %defattr(-,root,root,-)
 %config %_initrddir/clamav-milter
 
+%if 0%{?with_upstart:1}
 %files milter-upstart
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/event.d/clamav-milter
+%endif
 
 
 %changelog
+* Wed Apr 15 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.1-2
+- added '%%bcond_without upstart' conditional to ease skipping of
+  -upstart subpackage creation e.g. on EL5 systems
+- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which
+  broke update path
+
 * Fri Apr 10 2009 Robert Scheck <robert at fedoraproject.org> - 0.95.1-1
 - Upgrade to 0.95.1 (#495039)
 



From rdieter at fedoraproject.org  Wed Apr 15 14:19:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 15 Apr 2009 14:19:05 +0000 (UTC)
Subject: rpms/eigen2/devel eigen2.spec,1.13,1.14
Message-ID: <20090415141905.76D5670101@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14913

Modified Files:
	eigen2.spec 
Log Message:
omit suitesparse tests, seems to have gcc44 issues now



Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eigen2.spec	15 Apr 2009 13:59:02 -0000	1.13
+++ eigen2.spec	15 Apr 2009 14:18:34 -0000	1.14
@@ -34,7 +34,8 @@
 BuildRequires: blas-devel
 BuildRequires: gsl-devel
 # can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411
-BuildRequires: suitesparse-devel
+# also seems to have gcc44-related issues (here in eigen testsuite)
+#BuildRequires: suitesparse-devel
 BuildRequires: qt4-devel
 #-- Could NOT find TAUCS  (missing:  TAUCS_INCLUDES TAUCS_LIBRARIES)
 #-- Could NOT find SUPERLU  (missing:  SUPERLU_INCLUDES SUPERLU_LIBRARIES)



From jwrdegoede at fedoraproject.org  Wed Apr 15 14:22:19 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 15 Apr 2009 14:22:19 +0000 (UTC)
Subject: rpms/hedgewars/devel .cvsignore, 1.11, 1.12 hedgewars.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090415142219.2A48C70101@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16064

Modified Files:
	.cvsignore hedgewars.spec sources 
Log Message:
* Wed Apr 15 2009 Hans de Goede <hdegoede at redhat.com> 0.9.10-1
- New upstream release 0.9.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Jan 2009 09:48:43 -0000	1.11
+++ .cvsignore	15 Apr 2009 14:21:48 -0000	1.12
@@ -1 +1 @@
-hedgewars-src-0.9.9.tar.bz2
+hedgewars-src-0.9.10.tar.bz2


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hedgewars.spec	25 Feb 2009 03:35:30 -0000	1.18
+++ hedgewars.spec	15 Apr 2009 14:21:48 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           hedgewars
-Version:        0.9.9
-Release:        2%{?dist}
+Version:        0.9.10
+Release:        1%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Hans de Goede <hdegoede at redhat.com> 0.9.10-1
+- New upstream release 0.9.10
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Jan 2009 09:48:43 -0000	1.11
+++ sources	15 Apr 2009 14:21:48 -0000	1.12
@@ -1 +1 @@
-5f76525345ead28ee1d04c1ae258395e  hedgewars-src-0.9.9.tar.bz2
+2ac235a6df8e50591598e5521d0deb99  hedgewars-src-0.9.10.tar.bz2



From rdieter at fedoraproject.org  Wed Apr 15 14:34:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 15 Apr 2009 14:34:12 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets.spec,1.10,1.11
Message-ID: <20090415143412.5F57A70101@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19018/F-11

Modified Files:
	google-gadgets.spec 
Log Message:
bump and build (f11) for F-10 -> F-11 upgrade path



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- google-gadgets.spec	25 Feb 2009 00:22:41 -0000	1.10
+++ google-gadgets.spec	15 Apr 2009 14:33:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,8 +189,14 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-4
+- Rebuild against newer gecko
+
+* Fri Mar 06 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-3
+- Rebuild against newer gecko
+
+* Wed Feb 04 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-2
+- Rebuild against newer gecko
 
 * Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
 - 0.10.5, req'd by kde



From rdieter at fedoraproject.org  Wed Apr 15 14:34:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 15 Apr 2009 14:34:12 +0000 (UTC)
Subject: rpms/google-gadgets/devel google-gadgets.spec,1.10,1.11
Message-ID: <20090415143412.7F57F70127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19018/devel

Modified Files:
	google-gadgets.spec 
Log Message:
bump and build (f11) for F-10 -> F-11 upgrade path



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- google-gadgets.spec	25 Feb 2009 00:22:41 -0000	1.10
+++ google-gadgets.spec	15 Apr 2009 14:33:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,8 +189,14 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-4
+- Rebuild against newer gecko
+
+* Fri Mar 06 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-3
+- Rebuild against newer gecko
+
+* Wed Feb 04 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-2
+- Rebuild against newer gecko
 
 * Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
 - 0.10.5, req'd by kde



From tmraz at fedoraproject.org  Wed Apr 15 14:36:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 15 Apr 2009 14:36:57 +0000 (UTC)
Subject: rpms/openssl/devel openssl-0.9.8k-kernel-fipsmode.patch, NONE,
	1.1 openssl-0.9.8k-multi-crl.patch, NONE, 1.1 openssl.spec,
	1.126, 1.127 openssl-0.9.8j-evp-nonfips.patch, 1.1,
	NONE openssl-0.9.8j-kernel-fipsmode.patch, 1.1, NONE
Message-ID: <20090415143657.D0ACD70137@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20232

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8k-kernel-fipsmode.patch 
	openssl-0.9.8k-multi-crl.patch 
Removed Files:
	openssl-0.9.8j-evp-nonfips.patch 
	openssl-0.9.8j-kernel-fipsmode.patch 
Log Message:
* Wed Apr 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
- add support for multiple CRLs with same subject
- load only dynamic engine support in FIPS mode


openssl-0.9.8k-kernel-fipsmode.patch:

--- NEW FILE openssl-0.9.8k-kernel-fipsmode.patch ---
diff -up openssl-0.9.8k/crypto/engine/eng_all.c.fipsmode openssl-0.9.8k/crypto/engine/eng_all.c
--- openssl-0.9.8k/crypto/engine/eng_all.c.fipsmode	2008-06-04 20:01:39.000000000 +0200
+++ openssl-0.9.8k/crypto/engine/eng_all.c	2009-04-15 14:31:32.000000000 +0200
@@ -58,9 +58,23 @@
 
 #include "cryptlib.h"
 #include "eng_int.h"
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 void ENGINE_load_builtin_engines(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if (FIPS_mode()) {
+		/* We allow loading dynamic engine as a third party
+		   engine might be FIPS validated.
+		   User is disallowed to load non-validated engines
+		   by security policy. */
+		ENGINE_load_dynamic();
+		return;
+	}
+#endif
 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
 	 * it is the *only* way for standard builtin implementations to be be
 	 * accessed (ie. it would be possible to statically link binaries with
diff -up openssl-0.9.8k/crypto/evp/c_allc.c.fipsmode openssl-0.9.8k/crypto/evp/c_allc.c
--- openssl-0.9.8k/crypto/evp/c_allc.c.fipsmode	2007-04-24 01:50:04.000000000 +0200
+++ openssl-0.9.8k/crypto/evp/c_allc.c	2009-03-26 15:53:42.000000000 +0100
@@ -65,6 +65,11 @@
 void OpenSSL_add_all_ciphers(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if(!FIPS_mode()) 
+		{
+#endif
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cfb());
 	EVP_add_cipher(EVP_des_cfb1());
@@ -219,6 +224,63 @@ void OpenSSL_add_all_ciphers(void)
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede_cfb());
+	EVP_add_cipher(EVP_des_ede3_cfb());
+
+	EVP_add_cipher(EVP_des_ede_ofb());
+	EVP_add_cipher(EVP_des_ede3_ofb());
+
+	EVP_add_cipher(EVP_des_ede_cbc());
+	EVP_add_cipher(EVP_des_ede3_cbc());
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
+
+	EVP_add_cipher(EVP_des_ede());
+	EVP_add_cipher(EVP_des_ede3());
+#endif
+
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_ecb());
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_128_cfb());
+	EVP_add_cipher(EVP_aes_128_cfb1());
+	EVP_add_cipher(EVP_aes_128_cfb8());
+	EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_128_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
+	EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
+	EVP_add_cipher(EVP_aes_192_ecb());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_192_cfb());
+	EVP_add_cipher(EVP_aes_192_cfb1());
+	EVP_add_cipher(EVP_aes_192_cfb8());
+	EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_192_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
+	EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
+	EVP_add_cipher(EVP_aes_256_ecb());
+	EVP_add_cipher(EVP_aes_256_cbc());
+	EVP_add_cipher(EVP_aes_256_cfb());
+	EVP_add_cipher(EVP_aes_256_cfb1());
+	EVP_add_cipher(EVP_aes_256_cfb8());
+	EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_256_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#endif
+		}
+#endif
 
 	PKCS12_PBE_add();
 	PKCS5_PBE_add();
diff -up openssl-0.9.8k/crypto/evp/c_alld.c.fipsmode openssl-0.9.8k/crypto/evp/c_alld.c
--- openssl-0.9.8k/crypto/evp/c_alld.c.fipsmode	2005-04-30 23:51:40.000000000 +0200
+++ openssl-0.9.8k/crypto/evp/c_alld.c	2009-03-26 15:53:42.000000000 +0100
@@ -64,6 +64,11 @@
 
 void OpenSSL_add_all_digests(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if (!FIPS_mode())
+		{
+#endif
 #ifndef OPENSSL_NO_MD2
 	EVP_add_digest(EVP_md2());
 #endif
@@ -111,4 +116,32 @@ void OpenSSL_add_all_digests(void)
 	EVP_add_digest(EVP_sha384());
 	EVP_add_digest(EVP_sha512());
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_SHA
+	EVP_add_digest(EVP_sha1());
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#ifndef OPENSSL_NO_DSA
+	EVP_add_digest(EVP_dss1());
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+#endif
+#ifndef OPENSSL_NO_SHA256
+	EVP_add_digest(EVP_sha224());
+	EVP_add_digest(EVP_sha256());
+#endif
+#ifndef OPENSSL_NO_SHA512
+	EVP_add_digest(EVP_sha384());
+	EVP_add_digest(EVP_sha512());
+#endif
+		}
+#endif
 	}
diff -up openssl-0.9.8k/crypto/o_init.c.fipsmode openssl-0.9.8k/crypto/o_init.c
--- openssl-0.9.8k/crypto/o_init.c.fipsmode	2008-11-05 19:36:36.000000000 +0100
+++ openssl-0.9.8k/crypto/o_init.c	2009-03-26 15:53:42.000000000 +0100
@@ -59,6 +59,45 @@
 #include <e_os.h>
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <openssl/fips.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+
+#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
+
+static void init_fips_mode(void)
+	{
+	char buf[2] = "0";
+	int fd;
+	
+	if (getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
+		{
+		buf[0] = '1';
+		}
+	else if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0)
+		{
+		while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR);
+		close(fd);
+		}
+	/* Failure reading the fips mode switch file means just not
+	 * switching into FIPS mode. We would break too many things
+	 * otherwise. 
+	 */
+	
+	if (buf[0] == '1')
+		{
+		FIPS_mode_set(1);
+		}
+	}
+#endif
+
 /* Perform any essential OpenSSL initialization operations.
  * Currently only sets FIPS callbacks
  */
@@ -73,11 +112,10 @@ void OPENSSL_init(void)
 #ifdef CRYPTO_MDEBUG
 		CRYPTO_malloc_debug_init();
 #endif
-#ifdef OPENSSL_ENGINE
+		init_fips_mode();
 		int_EVP_MD_init_engine_callbacks();
 		int_EVP_CIPHER_init_engine_callbacks();
 		int_RAND_init_engine_callbacks();
-#endif
 		done = 1;
 		}
 #endif
diff -up openssl-0.9.8k/ssl/ssl_algs.c.fipsmode openssl-0.9.8k/ssl/ssl_algs.c
--- openssl-0.9.8k/ssl/ssl_algs.c.fipsmode	2007-04-24 01:50:21.000000000 +0200
+++ openssl-0.9.8k/ssl/ssl_algs.c	2009-04-15 14:32:13.000000000 +0200
@@ -64,6 +64,10 @@
 int SSL_library_init(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+#endif
+
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cbc());
 	EVP_add_cipher(EVP_des_ede3_cbc());

openssl-0.9.8k-multi-crl.patch:

--- NEW FILE openssl-0.9.8k-multi-crl.patch ---
diff -up openssl-0.9.8k/crypto/x509/x509_lu.c.multi-crl openssl-0.9.8k/crypto/x509/x509_lu.c
--- openssl-0.9.8k/crypto/x509/x509_lu.c.multi-crl	2005-05-11 05:45:35.000000000 +0200
+++ openssl-0.9.8k/crypto/x509/x509_lu.c	2009-03-26 15:47:45.000000000 +0100
@@ -453,19 +453,41 @@ X509_OBJECT *X509_OBJECT_retrieve_by_sub
 	return sk_X509_OBJECT_value(h, idx);
 }
 
+static int x509_crl_match(const X509_CRL *a, const X509_CRL *b)
+{
+	if (a->signature == NULL || b->signature == NULL)
+		return a->signature != b->signature;
+
+	if (a->signature->length != b->signature->length)
+		return 0;
+
+	return memcmp(a->signature->data, b->signature->data, a->signature->length);
+}
+
 X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x)
 {
 	int idx, i;
 	X509_OBJECT *obj;
 	idx = sk_X509_OBJECT_find(h, x);
 	if (idx == -1) return NULL;
-	if (x->type != X509_LU_X509) return sk_X509_OBJECT_value(h, idx);
+	if ((x->type != X509_LU_X509) && (x->type != X509_LU_CRL))
+		return sk_X509_OBJECT_value(h, idx);
 	for (i = idx; i < sk_X509_OBJECT_num(h); i++)
 		{
 		obj = sk_X509_OBJECT_value(h, i);
 		if (x509_object_cmp((const X509_OBJECT **)&obj, (const X509_OBJECT **)&x))
 			return NULL;
-		if ((x->type != X509_LU_X509) || !X509_cmp(obj->data.x509, x->data.x509))
+		if (x->type == X509_LU_X509)
+			{
+			if (!X509_cmp(obj->data.x509, x->data.x509))
+				return obj;
+			}
+		else if (x->type == X509_LU_CRL)
+			{
+			if (!x509_crl_match(obj->data.crl, x->data.crl))
+				return obj;
+			}
+		else
 			return obj;
 		}
 	return NULL;
diff -up openssl-0.9.8k/crypto/x509/x509_vfy.c.multi-crl openssl-0.9.8k/crypto/x509/x509_vfy.c
--- openssl-0.9.8k/crypto/x509/x509_vfy.c.multi-crl	2008-07-13 16:33:15.000000000 +0200
+++ openssl-0.9.8k/crypto/x509/x509_vfy.c	2009-03-26 15:47:45.000000000 +0100
@@ -725,7 +725,38 @@ static int get_crl(X509_STORE_CTX *ctx, 
 		return 0;
 		}
 
-	*pcrl = xobj.data.crl;
+	/* If CRL times not valid look through store */
+	if (!check_crl_time(ctx, xobj.data.crl, 0))
+		{
+		int idx, i;
+		X509_OBJECT *pobj;
+		X509_OBJECT_free_contents(&xobj);
+		idx = X509_OBJECT_idx_by_subject(ctx->ctx->objs,
+							X509_LU_CRL, nm);
+		if (idx == -1)
+			return 0;
+		*pcrl = NULL;
+		for (i = idx; i < sk_X509_OBJECT_num(ctx->ctx->objs); i++)
+			{
+			pobj = sk_X509_OBJECT_value(ctx->ctx->objs, i);
+			/* Check to see if it is a CRL and issuer matches */
+			if (pobj->type != X509_LU_CRL)
+				break;
+			if (X509_NAME_cmp(nm,
+					X509_CRL_get_issuer(pobj->data.crl)))
+				break;
+			/* Set *pcrl because the CRL will either be valid or
+			 * a "best fit" CRL.
+			 */
+			*pcrl = pobj->data.crl;
+			if (check_crl_time(ctx, *pcrl, 0))
+				break;
+			}
+		if (*pcrl)
+			CRYPTO_add(&(*pcrl)->references, 1, CRYPTO_LOCK_X509);
+		}
+	else 
+		*pcrl = xobj.data.crl;
 	if (crl)
 		X509_CRL_free(crl);
 	return 1;


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- openssl.spec	25 Mar 2009 21:12:41 -0000	1.126
+++ openssl.spec	15 Apr 2009 14:36:54 -0000	1.127
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8k
-Release: 1%{?dist}
+Release: 2%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -57,14 +57,14 @@
 Patch40: openssl-0.9.8j-nocanister.patch
 Patch41: openssl-0.9.8k-use-fipscheck.patch
 Patch42: openssl-0.9.8k-fipscheck-hmac.patch
-Patch43: openssl-0.9.8j-evp-nonfips.patch
-Patch44: openssl-0.9.8j-kernel-fipsmode.patch
+Patch44: openssl-0.9.8k-kernel-fipsmode.patch
 Patch45: openssl-0.9.8j-env-nozlib.patch
 Patch46: openssl-0.9.8j-eap-fast.patch
 Patch47: openssl-0.9.8j-readme-warning.patch
 Patch48: openssl-0.9.8j-bad-mime.patch
 Patch49: openssl-0.9.8j-fips-no-pairwise.patch
 Patch50: openssl-0.9.8j-fips-rng-seed.patch
+Patch51: openssl-0.9.8k-multi-crl.patch
 # Backported fixes including security fixes
 
 License: OpenSSL
@@ -142,7 +142,6 @@
 %patch40 -p1 -b .nocanister
 %patch41 -p1 -b .use-fipscheck
 %patch42 -p1 -b .fipscheck-hmac
-%patch43 -p1 -b .evp-nonfips
 %patch44 -p1 -b .fipsmode
 %patch45 -p1 -b .env-nozlib
 %patch46 -p1 -b .eap-fast
@@ -150,6 +149,7 @@
 %patch48 -p1 -b .bad-mime
 %patch49 -p1 -b .no-pairwise
 %patch50 -p1 -b .rng-seed
+%patch51 -p1 -b .multi-crl
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -408,6 +408,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
+- add support for multiple CRLs with same subject
+- load only dynamic engine support in FIPS mode
+
 * Thu Mar 25 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-1
 - update to new upstream release (minor bug fixes, security
   fixes and machine code optimizations only)


--- openssl-0.9.8j-evp-nonfips.patch DELETED ---


--- openssl-0.9.8j-kernel-fipsmode.patch DELETED ---



From jwrdegoede at fedoraproject.org  Wed Apr 15 14:40:46 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 15 Apr 2009 14:40:46 +0000 (UTC)
Subject: rpms/hedgewars/F-11 .cvsignore, 1.11, 1.12 hedgewars.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090415144046.9152770101@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22217

Modified Files:
	.cvsignore hedgewars.spec sources 
Log Message:
* Wed Apr 15 2009 Hans de Goede <hdegoede at redhat.com> 0.9.10-1
- New upstream release 0.9.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Jan 2009 09:48:43 -0000	1.11
+++ .cvsignore	15 Apr 2009 14:40:44 -0000	1.12
@@ -1 +1 @@
-hedgewars-src-0.9.9.tar.bz2
+hedgewars-src-0.9.10.tar.bz2


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-11/hedgewars.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hedgewars.spec	25 Feb 2009 03:35:30 -0000	1.18
+++ hedgewars.spec	15 Apr 2009 14:40:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           hedgewars
-Version:        0.9.9
-Release:        2%{?dist}
+Version:        0.9.10
+Release:        1%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Hans de Goede <hdegoede at redhat.com> 0.9.10-1
+- New upstream release 0.9.10
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Jan 2009 09:48:43 -0000	1.11
+++ sources	15 Apr 2009 14:40:44 -0000	1.12
@@ -1 +1 @@
-5f76525345ead28ee1d04c1ae258395e  hedgewars-src-0.9.9.tar.bz2
+2ac235a6df8e50591598e5521d0deb99  hedgewars-src-0.9.10.tar.bz2



From mbarnes at fedoraproject.org  Wed Apr 15 14:56:13 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 15 Apr 2009 14:56:13 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.105,
	1.106 evolution-data-server.spec, 1.260, 1.261 sources, 1.105,
	1.106 evolution-data-server-2.26.1-fix-libical-include.patch,
	1.1, NONE
Message-ID: <20090415145613.567FF70101@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26708

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-2.26.1-fix-libical-include.patch 
Log Message:

* Wed Apr 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1.1-1.fc11
- Update to 2.26.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- .cvsignore	14 Apr 2009 02:31:31 -0000	1.105
+++ .cvsignore	15 Apr 2009 14:55:40 -0000	1.106
@@ -1 +1 @@
-evolution-data-server-2.26.1.tar.bz2
+evolution-data-server-2.26.1.1.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- evolution-data-server.spec	14 Apr 2009 02:31:31 -0000	1.260
+++ evolution-data-server.spec	15 Apr 2009 14:55:40 -0000	1.261
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.26.1
+Version: 2.26.1.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -53,8 +53,6 @@
 # RH bug #243296
 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch13: evolution-data-server-2.26.1-fix-libical-include.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -138,7 +136,6 @@
 %patch10 -p1 -b .fix-ldap-query
 %patch11 -p1 -b .camel-folder-summary-crash
 %patch12 -p1 -b .fix-64bit-acinclude
-%patch13 -p1 -b .fix-libical-include
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -384,6 +381,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed Apr 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1.1-1.fc11
+- Update to 2.26.1.1
+
 * Mon Apr 13 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-1.fc11
 - Update to 2.26.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	14 Apr 2009 02:31:31 -0000	1.105
+++ sources	15 Apr 2009 14:55:41 -0000	1.106
@@ -1 +1 @@
-2f5651141653f130d83301212b17db70  evolution-data-server-2.26.1.tar.bz2
+0d626ddc09116f25fe5b42bd38b7f440  evolution-data-server-2.26.1.1.tar.bz2


--- evolution-data-server-2.26.1-fix-libical-include.patch DELETED ---



From limb at fedoraproject.org  Wed Apr 15 15:04:49 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 15 Apr 2009 15:04:49 +0000 (UTC)
Subject: rpms/xmoto/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xmoto.spec, 1.51, 1.52
Message-ID: <20090415150449.F1BBB70101@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30145

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
New upstream, some bugfixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Dec 2008 14:38:40 -0000	1.15
+++ .cvsignore	15 Apr 2009 15:04:48 -0000	1.16
@@ -1 +1 @@
-xmoto-0.5.0-src.tar.gz
+xmoto-0.5.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Dec 2008 14:38:40 -0000	1.15
+++ sources	15 Apr 2009 15:04:48 -0000	1.16
@@ -1 +1 @@
-e693ec0f949e44fb78187b8e82650869  xmoto-0.5.0-src.tar.gz
+10cb822ec8c2c7e9466806633e69be1f  xmoto-0.5.1-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xmoto.spec	23 Feb 2009 18:44:24 -0000	1.51
+++ xmoto.spec	15 Apr 2009 15:04:48 -0000	1.52
@@ -1,6 +1,6 @@
 Name:		xmoto
-Version:	0.5.0
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	0%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -15,7 +15,7 @@
 Patch3:		xmoto-0.4.0-Environment-string.patch
 #Patch4:		xmoto-0.4.0-DrawLib-hashmap.patch
 #Patch5:		xmoto-0.4.2-initode.patch
-Patch6:		xmoto-0.4.2-opengldepth.patch
+#Patch6:		xmoto-0.4.2-opengldepth.patch
 Patch7:		xmoto-0.5.0-xmargs-include.patch
 Patch8:		xmoto-0.5.0-helpers-text-includes.patch
 Patch9:		xmoto-0.5.0-helpers-log-include.patch
@@ -58,7 +58,7 @@
 %patch3 -p0
 #%patch4 -p0
 #%patch5 -p1
-%patch6 -p0
+#%patch6 -p0
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
@@ -123,6 +123,10 @@
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 0.5.1-0
+- New upstream.
+- Dropped opengldepth patch, applied upstream.
+
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> 0.5.0-6
 - Patch for includes.
 



From mbarnes at fedoraproject.org  Wed Apr 15 15:06:12 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 15 Apr 2009 15:06:12 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.111, 1.112 evolution.spec, 1.381,
	1.382 sources, 1.111, 1.112
Message-ID: <20090415150612.52AE470101@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30391

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Wed Apr 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1.1-1.fc11
- Update to 2.26.1.1
- Remove patch for GNOME bug #578685 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- .cvsignore	14 Apr 2009 03:01:30 -0000	1.111
+++ .cvsignore	15 Apr 2009 15:05:41 -0000	1.112
@@ -1 +1 @@
-evolution-2.26.1.tar.bz2
+evolution-2.26.1.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- evolution.spec	14 Apr 2009 16:53:51 -0000	1.381
+++ evolution.spec	15 Apr 2009 15:05:41 -0000	1.382
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.26.1
-Release: 2%{?dist}
+Version: 2.26.1.1
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -68,9 +68,6 @@
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# GNOME bug #578685
-Patch13: evolution-2.26.1-attachment-bar-crasher.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -228,7 +225,6 @@
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .attachment-bar-crasher
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -695,6 +691,10 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Wed Apr 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1.1-1.fc11
+- Update to 2.26.1.1
+- Remove patch for GNOME bug #578685 (fixed upstream).
+
 * Tue Apr 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1-2.fc11
 - Add patch for GNOME bug #578685 (attachment bar crasher).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sources	14 Apr 2009 03:01:30 -0000	1.111
+++ sources	15 Apr 2009 15:05:41 -0000	1.112
@@ -1 +1 @@
-7089171fe7e127f061f6722b33bf3107  evolution-2.26.1.tar.bz2
+e24b8c13d350c17ab8332482f60aa144  evolution-2.26.1.1.tar.bz2



From ajax at fedoraproject.org  Wed Apr 15 15:15:29 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 15 Apr 2009 15:15:29 +0000 (UTC)
Subject: rpms/mesa/devel mesa-7.5-get-driver-name.patch, NONE, 1.1 mesa.spec,
	1.241, 1.242
Message-ID: <20090415151529.F2AE270101@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1878

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.5-get-driver-name.patch 
Log Message:
* Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 7.5-0.10
- mesa-7.5-get-driver-name.patch: Fix glXGetScreenDriver for DRI2 (#495342)


mesa-7.5-get-driver-name.patch:

--- NEW FILE mesa-7.5-get-driver-name.patch ---
commit a3c3c1f1437de0186d70de9017a6a8e404ecf482
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 14 17:56:29 2009 -0400

    glx: Make glXGetScreenDriver() work for DRI2

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 3089aa1..87d62ad 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -40,6 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include "xf86dri.h"
+#include "dri2.h"
 #include "sarea.h"
 #include <dlfcn.h>
 #include <sys/types.h>
@@ -75,32 +76,45 @@ struct __GLXDRIcontextPrivateRec {
  */
 static Bool driGetDriverName(Display *dpy, int scrNum, char **driverName)
 {
-   int directCapable;
-   Bool b;
-   int driverMajor, driverMinor, driverPatch;
+    int directCapable;
+    Bool b;
+    int event, error;
+    int driverMajor, driverMinor, driverPatch;
 
-   *driverName = NULL;
+    *driverName = NULL;
 
-   if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
-      ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
-      return False;
-   }
-   if (!directCapable) {
-      ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
-      return False;
-   }
+    if (XF86DRIQueryExtension(dpy, &event, &error)) { /* DRI1 */
+	if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
+	    ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
+	    return False;
+	}
+	if (!directCapable) {
+	    ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
+	    return False;
+	}
 
-   b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
-                                  &driverPatch, driverName);
-   if (!b) {
-      ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
-      return False;
-   }
+	b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
+		&driverPatch, driverName);
+	if (!b) {
+	    ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
+	    return False;
+	}
+
+	InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
+		driverMajor, driverMinor, driverPatch, *driverName, scrNum);
+
+	return True;
+    } else if (DRI2QueryExtension(dpy, &event, &error)) { /* DRI2 */
+	char *dev;
+	Bool ret = DRI2Connect(dpy, RootWindow(dpy, scrNum), driverName, &dev);
 
-   InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
-	     driverMajor, driverMinor, driverPatch, *driverName, scrNum);
+	if (ret)
+	    Xfree(dev);
+
+	return ret;
+    }
 
-   return True;
+    return False;
 }
 
 /*


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- mesa.spec	11 Apr 2009 01:56:50 -0000	1.241
+++ mesa.spec	15 Apr 2009 15:14:58 -0000	1.242
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,8 @@
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
+Patch20: mesa-7.5-get-driver-name.patch
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.5-1
@@ -175,6 +177,7 @@
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
+%patch20 -p1 -b .get-driver-name
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -431,6 +434,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 7.5-0.10
+- mesa-7.5-get-driver-name.patch: Fix glXGetScreenDriver for DRI2 (#495342)
+
 * Fri Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 7.5-0.9
 - fix sparc64 asm 
 



From ajax at fedoraproject.org  Wed Apr 15 15:19:43 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 15 Apr 2009 15:19:43 +0000 (UTC)
Subject: rpms/mesa/F-11 mesa-7.5-get-driver-name.patch, NONE, 1.1 mesa.spec, 
	1.241, 1.242
Message-ID: <20090415151943.5D5DE70101@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3465

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.5-get-driver-name.patch 
Log Message:
* Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 7.5-0.10
- mesa-7.5-get-driver-name.patch: Fix glXGetScreenDriver for DRI2 (#495342)


mesa-7.5-get-driver-name.patch:

--- NEW FILE mesa-7.5-get-driver-name.patch ---
commit a3c3c1f1437de0186d70de9017a6a8e404ecf482
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 14 17:56:29 2009 -0400

    glx: Make glXGetScreenDriver() work for DRI2

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 3089aa1..87d62ad 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -40,6 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include "xf86dri.h"
+#include "dri2.h"
 #include "sarea.h"
 #include <dlfcn.h>
 #include <sys/types.h>
@@ -75,32 +76,45 @@ struct __GLXDRIcontextPrivateRec {
  */
 static Bool driGetDriverName(Display *dpy, int scrNum, char **driverName)
 {
-   int directCapable;
-   Bool b;
-   int driverMajor, driverMinor, driverPatch;
+    int directCapable;
+    Bool b;
+    int event, error;
+    int driverMajor, driverMinor, driverPatch;
 
-   *driverName = NULL;
+    *driverName = NULL;
 
-   if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
-      ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
-      return False;
-   }
-   if (!directCapable) {
-      ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
-      return False;
-   }
+    if (XF86DRIQueryExtension(dpy, &event, &error)) { /* DRI1 */
+	if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
+	    ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
+	    return False;
+	}
+	if (!directCapable) {
+	    ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
+	    return False;
+	}
 
-   b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
-                                  &driverPatch, driverName);
-   if (!b) {
-      ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
-      return False;
-   }
+	b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
+		&driverPatch, driverName);
+	if (!b) {
+	    ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
+	    return False;
+	}
+
+	InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
+		driverMajor, driverMinor, driverPatch, *driverName, scrNum);
+
+	return True;
+    } else if (DRI2QueryExtension(dpy, &event, &error)) { /* DRI2 */
+	char *dev;
+	Bool ret = DRI2Connect(dpy, RootWindow(dpy, scrNum), driverName, &dev);
 
-   InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
-	     driverMajor, driverMinor, driverPatch, *driverName, scrNum);
+	if (ret)
+	    Xfree(dev);
+
+	return ret;
+    }
 
-   return True;
+    return False;
 }
 
 /*


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- mesa.spec	11 Apr 2009 01:56:50 -0000	1.241
+++ mesa.spec	15 Apr 2009 15:19:12 -0000	1.242
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,8 @@
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
+Patch20: mesa-7.5-get-driver-name.patch
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.5-1
@@ -175,6 +177,7 @@
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
+%patch20 -p1 -b .get-driver-name
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -431,6 +434,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 7.5-0.10
+- mesa-7.5-get-driver-name.patch: Fix glXGetScreenDriver for DRI2 (#495342)
+
 * Fri Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 7.5-0.9
 - fix sparc64 asm 
 



From caolanm at fedoraproject.org  Wed Apr 15 15:21:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 15 Apr 2009 15:21:42 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes57.patch, NONE,
	1.1 openoffice.org.spec, 1.1877,
	1.1878 openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo100225.comphelper.vis.patch, 1.1, NONE
Message-ID: <20090415152142.7D7EE70101@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4236

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes57.patch 
Removed Files:
	openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch 
	openoffice.org-3.1.0.ooo100225.comphelper.vis.patch 
Log Message:
merge patches to upstream workspace

workspace.cmcfixes57.patch:

--- NEW FILE workspace.cmcfixes57.patch ---
Fix for svgimport visibility bug

From: Thorsten Behrens <thb at openoffice.org>


---

 comphelper/inc/comphelper/servicedecl.hxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff --git comphelper/inc/comphelper/servicedecl.hxx comphelper/inc/comphelper/servicedecl.hxx
index bd114be..1fa97cc 100644
--- comphelper/inc/comphelper/servicedecl.hxx
+++ comphelper/inc/comphelper/servicedecl.hxx
@@ -418,20 +418,20 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
 #define COMPHELPER_SERVICEDECL_make_exports(varargs_ )  \
 extern "C" \
 { \
-    void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
                                                           uno_Environment** /*ppEnv*/ ) \
     { \
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \
     } \
  \
-    sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
+    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
                                            ::com::sun::star::registry::XRegistryKey*        pRegistryKey ) \
     { \
         return component_writeInfoHelper( pServiceManager, pRegistryKey, \
                                           BOOST_PP_SEQ_ENUM(varargs_) ); \
     } \
  \
-    void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
                                          ::com::sun::star::lang::XMultiServiceFactory*  pServiceManager, \
                                          ::com::sun::star::registry::XRegistryKey*      pRegistryKey ) \
     { \
diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
--- sw.orig/source/filter/ww8/ww8par2.cxx	2009-03-10 12:59:18.000000000 +0000
+++ sw/source/filter/ww8/ww8par2.cxx	2009-03-10 13:51:17.000000000 +0000
@@ -2509,7 +2509,15 @@
             //ability to set the margin.
             SvxLRSpaceItem aL( RES_LR_SPACE );
             // set right to original DxaLeft (i28656)
+#if 0
+            // Type don't get promoted the intuitive way
             aL.SetLeft( !bIsBiDi ?  GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft);
+#else
+            if (!bIsBiDi)
+                aL.SetLeft( GetMinLeft() );
+            else
+                aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft );
+#endif
             aItemSet.Put(aL);
         }
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -r1.1877 -r1.1878
--- openoffice.org.spec	15 Apr 2009 11:45:06 -0000	1.1877
+++ openoffice.org.spec	15 Apr 2009 15:21:11 -0000	1.1878
@@ -126,16 +126,15 @@
 Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch54: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch54: workspace.cmcfixes57.patch
 Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
 Patch56: ooo-build.ooo2497.filter.svg.patch
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
-Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch62: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch63: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch58: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
+Patch59: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1620,16 +1619,15 @@
 %patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch54 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch54 -p0 -b .workspace.cmcfixes57.patch
 %patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
 %patch56 -p1 -b .ooo2497.filter.svg.patch
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch58 -p0 -b .ooo100225.comphelper.vis.patch
-%patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch61 -p1 -b .ooo100991.pyuno-fix.patch
-%patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch63 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch58 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch59 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch60 -p1 -b .ooo100991.pyuno-fix.patch
+%patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch DELETED ---


--- openoffice.org-3.1.0.ooo100225.comphelper.vis.patch DELETED ---



From limb at fedoraproject.org  Wed Apr 15 15:25:17 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 15 Apr 2009 15:25:17 +0000 (UTC)
Subject: rpms/xmoto/F-11 sources,1.15,1.16 xmoto.spec,1.51,1.52
Message-ID: <20090415152517.509A370101@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5583

Modified Files:
	sources xmoto.spec 
Log Message:
0.5.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Dec 2008 14:38:40 -0000	1.15
+++ sources	15 Apr 2009 15:24:46 -0000	1.16
@@ -1 +1 @@
-e693ec0f949e44fb78187b8e82650869  xmoto-0.5.0-src.tar.gz
+10cb822ec8c2c7e9466806633e69be1f  xmoto-0.5.1-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-11/xmoto.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xmoto.spec	23 Feb 2009 18:44:24 -0000	1.51
+++ xmoto.spec	15 Apr 2009 15:24:46 -0000	1.52
@@ -1,6 +1,6 @@
 Name:		xmoto
-Version:	0.5.0
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	0%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -15,7 +15,7 @@
 Patch3:		xmoto-0.4.0-Environment-string.patch
 #Patch4:		xmoto-0.4.0-DrawLib-hashmap.patch
 #Patch5:		xmoto-0.4.2-initode.patch
-Patch6:		xmoto-0.4.2-opengldepth.patch
+#Patch6:		xmoto-0.4.2-opengldepth.patch
 Patch7:		xmoto-0.5.0-xmargs-include.patch
 Patch8:		xmoto-0.5.0-helpers-text-includes.patch
 Patch9:		xmoto-0.5.0-helpers-log-include.patch
@@ -58,7 +58,7 @@
 %patch3 -p0
 #%patch4 -p0
 #%patch5 -p1
-%patch6 -p0
+#%patch6 -p0
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
@@ -123,6 +123,10 @@
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 0.5.1-0
+- New upstream.
+- Dropped opengldepth patch, applied upstream.
+
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> 0.5.0-6
 - Patch for includes.
 



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:18 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152718.E180510F851@bastion2.fedora.phx.redhat.com>

ajax has set the watchcommits acl on mesa (Fedora devel) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:21 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152721.7DA0410F7C2@bastion2.fedora.phx.redhat.com>

ajax has set the commit acl on mesa (Fedora devel) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:29 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152729.C4DAE10F885@bastion2.fedora.phx.redhat.com>

ajax has set the watchcommits acl on mesa (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:32 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152732.0F98C10F87C@bastion2.fedora.phx.redhat.com>

ajax has set the commit acl on mesa (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:37 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152737.B437110F890@bastion2.fedora.phx.redhat.com>

ajax has set the commit acl on mesa (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:51 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152751.9A57B10F87B@bastion2.fedora.phx.redhat.com>

ajax has set the watchcommits acl on mesa (Fedora 11) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:53 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152753.932AB10F897@bastion2.fedora.phx.redhat.com>

ajax has set the commit acl on mesa (Fedora 11) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:54 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152754.B0CD910F883@bastion2.fedora.phx.redhat.com>

ajax has set the watchcommits acl on mesa (Fedora 11) to Obsolete for rstrode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Wed Apr 15 15:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 15 Apr 2009 15:27:57 +0000
Subject: [pkgdb] mesa had acl change status
Message-ID: <20090415152757.CDDA810F885@bastion2.fedora.phx.redhat.com>

ajax has set the commit acl on mesa (Fedora 11) to Obsolete for rstrode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mesa



From spot at fedoraproject.org  Wed Apr 15 15:30:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 15 Apr 2009 15:30:24 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 fedora-logos.spec, 1.121, 1.122 sources, 1.93,
	1.94
Message-ID: <20090415153024.E715B70101@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7964/F-11

Modified Files:
	fedora-logos.spec sources 
Log Message:
update to F11 logos


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fedora-logos.spec	24 Feb 2009 16:33:29 -0000	1.121
+++ fedora-logos.spec	15 Apr 2009 15:29:54 -0000	1.122
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 10.0.1
-Release: 5%{?dist}
+Version: 11.0.0
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -58,9 +58,9 @@
 install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-solar
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
 for i in firstboot/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-solar
+  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
@@ -136,7 +136,7 @@
 %defattr(-, root, root, -)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/favicon.png
-%{_datadir}/firstboot/themes/fedora-solar
+%{_datadir}/firstboot/themes/fedora-leonidas/
 %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
 %{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
 %{_datadir}/pixmaps/*
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.0-1
+- Update to 11.0.0 art (except for KDE splash)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	6 Nov 2008 22:19:04 -0000	1.93
+++ sources	15 Apr 2009 15:29:54 -0000	1.94
@@ -1 +1 @@
-9cdfcd7f6a1c26eef514ff733fed2f8e  fedora-logos-10.0.1.tar.bz2
+f6521411abff28b326766ec2de750d03  fedora-logos-11.0.0.tar.bz2



From spot at fedoraproject.org  Wed Apr 15 15:30:25 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 15 Apr 2009 15:30:25 +0000 (UTC)
Subject: rpms/fedora-logos/devel .cvsignore, 1.82, 1.83 fedora-logos.spec,
	1.121, 1.122 sources, 1.93, 1.94
Message-ID: <20090415153025.6C57B70101@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7964/devel

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to F11 logos


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	6 Nov 2008 21:19:48 -0000	1.82
+++ .cvsignore	15 Apr 2009 15:29:54 -0000	1.83
@@ -1 +1 @@
-fedora-logos-10.0.1.tar.bz2
+fedora-logos-11.0.0.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fedora-logos.spec	24 Feb 2009 16:33:29 -0000	1.121
+++ fedora-logos.spec	15 Apr 2009 15:29:54 -0000	1.122
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 10.0.1
-Release: 5%{?dist}
+Version: 11.0.0
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -58,9 +58,9 @@
 install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-solar
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
 for i in firstboot/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-solar
+  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
@@ -136,7 +136,7 @@
 %defattr(-, root, root, -)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/favicon.png
-%{_datadir}/firstboot/themes/fedora-solar
+%{_datadir}/firstboot/themes/fedora-leonidas/
 %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
 %{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
 %{_datadir}/pixmaps/*
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.0-1
+- Update to 11.0.0 art (except for KDE splash)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	6 Nov 2008 22:19:04 -0000	1.93
+++ sources	15 Apr 2009 15:29:54 -0000	1.94
@@ -1 +1 @@
-9cdfcd7f6a1c26eef514ff733fed2f8e  fedora-logos-10.0.1.tar.bz2
+f6521411abff28b326766ec2de750d03  fedora-logos-11.0.0.tar.bz2



From notting at fedoraproject.org  Wed Apr 15 15:39:50 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 15 Apr 2009 15:39:50 +0000 (UTC)
Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.32,1.33
Message-ID: <20090415153950.7305070127@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gwenhywfar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12166/devel

Modified Files:
	gwenhywfar.spec 
Log Message:
Buildreq openssl-devel (#495813)



Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gwenhywfar.spec	5 Mar 2009 20:58:02 -0000	1.32
+++ gwenhywfar.spec	15 Apr 2009 15:39:19 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@
 Patch2: gwen-open.patch
 URL: http://sourceforge.net/projects/gwenhywfar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gnutls-devel gettext libgcrypt-devel
+BuildRequires: gnutls-devel gettext libgcrypt-devel openssl-devel
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -71,6 +71,9 @@
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Wed Apr 15 2009 Bill Nottingham <notting at redhat.com> - 3.7.2-2
+- buildrequire openssl-devel, for gct-tool (#495813)
+
 * Thu Mar  5 2009 Bill Nottingham <notting at redhat.com> - 3.7.2-1
 - update to 3.7.2
 



From notting at fedoraproject.org  Wed Apr 15 15:39:50 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 15 Apr 2009 15:39:50 +0000 (UTC)
Subject: rpms/gwenhywfar/F-11 gwenhywfar.spec,1.32,1.33
Message-ID: <20090415153950.5A59670101@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gwenhywfar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12166/F-11

Modified Files:
	gwenhywfar.spec 
Log Message:
Buildreq openssl-devel (#495813)



Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/F-11/gwenhywfar.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gwenhywfar.spec	5 Mar 2009 20:58:02 -0000	1.32
+++ gwenhywfar.spec	15 Apr 2009 15:39:18 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@
 Patch2: gwen-open.patch
 URL: http://sourceforge.net/projects/gwenhywfar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gnutls-devel gettext libgcrypt-devel
+BuildRequires: gnutls-devel gettext libgcrypt-devel openssl-devel
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -71,6 +71,9 @@
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Wed Apr 15 2009 Bill Nottingham <notting at redhat.com> - 3.7.2-2
+- buildrequire openssl-devel, for gct-tool (#495813)
+
 * Thu Mar  5 2009 Bill Nottingham <notting at redhat.com> - 3.7.2-1
 - update to 3.7.2
 



From athimm at fedoraproject.org  Wed Apr 15 15:41:21 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Wed, 15 Apr 2009 15:41:21 +0000 (UTC)
Subject: rpms/smart/devel smart-mdclean.patch, NONE, 1.1 smart-sha256.diff, 
	NONE, 1.1 smart-unicode-provides.diff, NONE, 1.1 .cvsignore,
	1.13, 1.14 smart.spec, 1.41, 1.42 sources, 1.16, 1.17
Message-ID: <20090415154121.175F670101@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12756/devel

Modified Files:
	.cvsignore smart.spec sources 
Added Files:
	smart-mdclean.patch smart-sha256.diff 
	smart-unicode-provides.diff 
Log Message:
Update to 1.2 and add sha256 support. Also fix the unicode bug and remove unwanted metadata

smart-mdclean.patch:

--- NEW FILE smart-mdclean.patch ---
=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2006-11-24 19:25:39 +0000
+++ smart/channels/rpm_md.py	2009-03-22 12:11:38 +0000
@@ -34,6 +34,7 @@
 from smart.channel import PackageChannel
 from smart import *
 import posixpath
+import os
 
 from xml.parsers import expat
 
@@ -55,33 +56,14 @@
     def getFetchSteps(self):
         return 3
 
-    def fetch(self, fetcher, progress):
-        
-        fetcher.reset()
-        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
-        item = fetcher.enqueue(repomd)
-        fetcher.run(progress=progress)
-
-        if item.getStatus() is FAILED:
-            progress.add(self.getFetchSteps()-1)
-            if fetcher.getCaching() is NEVER:
-                lines = [_("Failed acquiring release file for '%s':") % self,
-                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
-                raise Error, "\n".join(lines)
-            return False
-
-        digest = getFileDigest(item.getTargetPath())
-        if digest == self._digest:
-            progress.add(1)
-            return True
-        self.removeLoaders()
-
+    def loadMetadata(self, metadatafile):
         info = {}
+
         try:
-            root = ElementTree.parse(item.getTargetPath()).getroot()
+            root = ElementTree.parse(metadatafile).getroot()
         except expat.error, e:
             raise Error, _("Invalid XML file:\n  %s\n  %s\n  %s") % \
-                          (item.getTargetPath(), repomd, str(e))
+                          (metadatafile, repomd, str(e))
 
         for node in root.getchildren():
             if node.tag != DATA:
@@ -97,6 +79,46 @@
                 if subnode.tag == OPENCHECKSUM:
                     info[type]["uncomp_"+subnode.get("type")] = \
                         subnode.text
+        
+        return info
+        
+    def getLocalPath(self, fetcher, url):
+        from smart.fetcher import FetchItem
+        mirror = fetcher.getMirrorSystem().get(url)
+        item = FetchItem(fetcher, url, mirror)
+        return fetcher.getLocalPath(item)
+
+    def fetch(self, fetcher, progress):
+        
+        fetcher.reset()
+        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
+
+        oldinfo = {}
+        path = self.getLocalPath(fetcher, repomd)
+        if os.path.exists(path):
+            try:
+                oldinfo = self.loadMetadata(path)
+            except Error:
+                pass
+        
+        item = fetcher.enqueue(repomd)
+        fetcher.run(progress=progress)
+
+        if item.getStatus() is FAILED:
+            progress.add(self.getFetchSteps()-1)
+            if fetcher.getCaching() is NEVER:
+                lines = [_("Failed acquiring release file for '%s':") % self,
+                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
+                raise Error, "\n".join(lines)
+            return False
+
+        digest = getFileDigest(item.getTargetPath())
+        if digest == self._digest:
+            progress.add(1)
+            return True
+        self.removeLoaders()
+
+        info = self.loadMetadata(item.getTargetPath())
 
         if "primary" not in info:
             raise Error, _("Primary information not found in repository "
@@ -144,6 +166,21 @@
         else:
             return False
 
+        uncompressor = fetcher.getUncompressor()
+
+        # delete any old files, if the new ones have new names
+        for type in ["primary", "filelists", "other"]:
+            if type in oldinfo:
+                url = oldinfo[type]["url"]
+                if url and info[type]["url"] != oldinfo[type]["url"]:
+                    path = self.getLocalPath(fetcher, url)
+                    if os.path.exists(path):
+                       os.unlink(path)
+                    handler = uncompressor.getHandler(path)
+                    path = handler.getTargetPath(path)
+                    if os.path.exists(path):
+                       os.unlink(path)
+
         self._digest = digest
 
         return True


smart-sha256.diff:

--- NEW FILE smart-sha256.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
@@ -71,6 +71,9 @@
     def getSHA(self, url):
         return self._info.get("sha")
 
+    def getSHA256(self, url):
+        return self._info.get("sha256")
+
     def getDescription(self):
         return self._info.get("description", "")
 

=== modified file 'smart/cache.py'
--- smart/cache.py	2008-12-12 07:18:07 +0000
+++ smart/cache.py	2009-02-20 12:34:05 +0000
@@ -179,6 +179,9 @@
     def getSHA(self, url):
         return None
 
+    def getSHA256(self, url):
+        return None
+
     def validate(self, url, localpath, withreason=False):
         try:
             if not os.path.isfile(localpath):
@@ -208,6 +211,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = self.getSHA(url)
                 if filesha:
                     try:

=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
@@ -130,12 +130,16 @@
                                uncomp_md5=info["primary"].get("uncomp_md5"),
                                sha=info["primary"].get("sha"),
                                uncomp_sha=info["primary"].get("uncomp_sha"),
+                               sha256=info["primary"].get("sha256"),
+                               uncomp_sha256=info["primary"].get("uncomp_sha256"),
                                uncomp=True)
         flitem = fetcher.enqueue(info["filelists"]["url"],
                                  md5=info["filelists"].get("md5"),
                                  uncomp_md5=info["filelists"].get("uncomp_md5"),
                                  sha=info["filelists"].get("sha"),
                                  uncomp_sha=info["filelists"].get("uncomp_sha"),
+                                 sha256=info["filelists"].get("sha256"),
+                                 uncomp_sha256=info["filelists"].get("uncomp_sha256"),
                                  uncomp=True)
         fetcher.run(progress=progress)
  

=== modified file 'smart/control.py'
--- smart/control.py	2008-12-12 07:17:44 +0000
+++ smart/control.py	2009-02-20 12:33:35 +0000
@@ -659,6 +659,7 @@
                 pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                      md5=info.getMD5(url),
                                                      sha=info.getSHA(url),
+                                                     sha256=info.getSHA256(url),
                                                      size=info.getSize(url),
                                                      validate=info.validate))
         if targetdir:

=== modified file 'smart/fetcher.py'
--- smart/fetcher.py	2008-12-12 07:18:07 +0000
+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
@@ -336,7 +336,9 @@
             prefix = "uncomp_"
         else:
             prefix = ""
-        return bool(item.getInfo(prefix+"md5") or item.getInfo(prefix+"sha"))
+        return bool(item.getInfo(prefix+"md5") or
+                    item.getInfo(prefix+"sha") or
+                    item.getInfo(prefix+"sha256"))
 
     def validate(self, item, localpath, withreason=False, uncomp=False):
         try:
@@ -382,6 +384,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = item.getInfo(uncompprefix+"sha")
                 if filesha:
                     try:
@@ -489,12 +508,13 @@
         #             or just 'valid', depending on 'withreason'. 'valid'
         #             may be None, True, or False. If it's True or False,
         #             no other information will be checked.
-        # - md5, sha: file digest
+        # - md5, sha, sha256: file digest
         # - size: file size
         # - uncomp: whether to uncompress or not
-        # - uncomp_{md5,sha,size}: uncompressed equivalents
+        # - uncomp_{md5,sha,sha256,size}: uncompressed equivalents
         #
-        for kind in ("md5", "sha", "uncomp_md5", "uncomp_sha"):
+        for kind in ("md5", "sha", "sha256",
+                     "uncomp_md5", "uncomp_sha", "uncomp_sha256"):
             value = info.get(kind)
             if value:
                 info[kind] = value.lower()


smart-unicode-provides.diff:

--- NEW FILE smart-unicode-provides.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-08-02 15:07:10 +0000
+++ smart/backends/rpm/metadata.py	2009-03-10 10:11:36 +0000
@@ -261,7 +261,7 @@
                                 Prv = RPMNameProvides
                             else:
                                 Prv = RPMProvides
-                            prvdict[(Prv, ename, eversion)] = True
+                            prvdict[(Prv, ename.encode('utf-8'), eversion)] = True
 
                     elif lasttag == OBSOLETES:
                         tup = (RPMObsoletes, ename, erelation, eversion)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Oct 2008 11:07:13 -0000	1.13
+++ .cvsignore	15 Apr 2009 15:41:20 -0000	1.14
@@ -1 +1 @@
-smart-1.1.tar.bz2
+smart-1.2.tar.bz2


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- smart.spec	26 Feb 2009 01:35:31 -0000	1.41
+++ smart.spec	15 Apr 2009 15:41:20 -0000	1.42
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 1.1
-Release: 60.0.1%{?dist}
+Version: 1.2
+Release: 63%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,8 +17,9 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-# http://bazaar.launchpad.net/%7Esmartpm/smart/bugfix/diff/856/839
-Patch0: 856_839.diff
+Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
+Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -73,7 +74,10 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .bugfixes
+%patch0 -p0 -b .sha256
+perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
+%patch1 -p0 -b .mdclean
+%patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 install -p -m 644 %{SOURCE2} .
@@ -204,8 +208,11 @@
 %endif
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-60.0.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
+- Fix sha256 and mdclean patches.
+
+* Sun Mar 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-60
+- Update to 1.2.
 
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1-59.0.1
 - launchpad changed the from/to rev order in patches, patch now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Oct 2008 11:07:13 -0000	1.16
+++ sources	15 Apr 2009 15:41:20 -0000	1.17
@@ -1 +1 @@
-44c1cf965206f2c2707fc7491151205b  smart-1.1.tar.bz2
+233ccbd1e666a9a7c5e1cc7900075d93  smart-1.2.tar.bz2



From athimm at fedoraproject.org  Wed Apr 15 15:41:48 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Wed, 15 Apr 2009 15:41:48 +0000 (UTC)
Subject: rpms/smart/F-10 smart-mdclean.patch, NONE, 1.1 smart-sha256.diff,
	NONE, 1.1 smart-unicode-provides.diff, NONE, 1.1 .cvsignore, 1.13,
	1.14 smart.spec, 1.40, 1.41 sources, 1.16, 1.17
Message-ID: <20090415154148.8FD5470101@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12756/F-10

Modified Files:
	.cvsignore smart.spec sources 
Added Files:
	smart-mdclean.patch smart-sha256.diff 
	smart-unicode-provides.diff 
Log Message:
Update to 1.2 and add sha256 support. Also fix the unicode bug and remove unwanted metadata

smart-mdclean.patch:

--- NEW FILE smart-mdclean.patch ---
=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2006-11-24 19:25:39 +0000
+++ smart/channels/rpm_md.py	2009-03-22 12:11:38 +0000
@@ -34,6 +34,7 @@
 from smart.channel import PackageChannel
 from smart import *
 import posixpath
+import os
 
 from xml.parsers import expat
 
@@ -55,33 +56,14 @@
     def getFetchSteps(self):
         return 3
 
-    def fetch(self, fetcher, progress):
-        
-        fetcher.reset()
-        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
-        item = fetcher.enqueue(repomd)
-        fetcher.run(progress=progress)
-
-        if item.getStatus() is FAILED:
-            progress.add(self.getFetchSteps()-1)
-            if fetcher.getCaching() is NEVER:
-                lines = [_("Failed acquiring release file for '%s':") % self,
-                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
-                raise Error, "\n".join(lines)
-            return False
-
-        digest = getFileDigest(item.getTargetPath())
-        if digest == self._digest:
-            progress.add(1)
-            return True
-        self.removeLoaders()
-
+    def loadMetadata(self, metadatafile):
         info = {}
+
         try:
-            root = ElementTree.parse(item.getTargetPath()).getroot()
+            root = ElementTree.parse(metadatafile).getroot()
         except expat.error, e:
             raise Error, _("Invalid XML file:\n  %s\n  %s\n  %s") % \
-                          (item.getTargetPath(), repomd, str(e))
+                          (metadatafile, repomd, str(e))
 
         for node in root.getchildren():
             if node.tag != DATA:
@@ -97,6 +79,46 @@
                 if subnode.tag == OPENCHECKSUM:
                     info[type]["uncomp_"+subnode.get("type")] = \
                         subnode.text
+        
+        return info
+        
+    def getLocalPath(self, fetcher, url):
+        from smart.fetcher import FetchItem
+        mirror = fetcher.getMirrorSystem().get(url)
+        item = FetchItem(fetcher, url, mirror)
+        return fetcher.getLocalPath(item)
+
+    def fetch(self, fetcher, progress):
+        
+        fetcher.reset()
+        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
+
+        oldinfo = {}
+        path = self.getLocalPath(fetcher, repomd)
+        if os.path.exists(path):
+            try:
+                oldinfo = self.loadMetadata(path)
+            except Error:
+                pass
+        
+        item = fetcher.enqueue(repomd)
+        fetcher.run(progress=progress)
+
+        if item.getStatus() is FAILED:
+            progress.add(self.getFetchSteps()-1)
+            if fetcher.getCaching() is NEVER:
+                lines = [_("Failed acquiring release file for '%s':") % self,
+                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
+                raise Error, "\n".join(lines)
+            return False
+
+        digest = getFileDigest(item.getTargetPath())
+        if digest == self._digest:
+            progress.add(1)
+            return True
+        self.removeLoaders()
+
+        info = self.loadMetadata(item.getTargetPath())
 
         if "primary" not in info:
             raise Error, _("Primary information not found in repository "
@@ -144,6 +166,21 @@
         else:
             return False
 
+        uncompressor = fetcher.getUncompressor()
+
+        # delete any old files, if the new ones have new names
+        for type in ["primary", "filelists", "other"]:
+            if type in oldinfo:
+                url = oldinfo[type]["url"]
+                if url and info[type]["url"] != oldinfo[type]["url"]:
+                    path = self.getLocalPath(fetcher, url)
+                    if os.path.exists(path):
+                       os.unlink(path)
+                    handler = uncompressor.getHandler(path)
+                    path = handler.getTargetPath(path)
+                    if os.path.exists(path):
+                       os.unlink(path)
+
         self._digest = digest
 
         return True


smart-sha256.diff:

--- NEW FILE smart-sha256.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
@@ -71,6 +71,9 @@
     def getSHA(self, url):
         return self._info.get("sha")
 
+    def getSHA256(self, url):
+        return self._info.get("sha256")
+
     def getDescription(self):
         return self._info.get("description", "")
 

=== modified file 'smart/cache.py'
--- smart/cache.py	2008-12-12 07:18:07 +0000
+++ smart/cache.py	2009-02-20 12:34:05 +0000
@@ -179,6 +179,9 @@
     def getSHA(self, url):
         return None
 
+    def getSHA256(self, url):
+        return None
+
     def validate(self, url, localpath, withreason=False):
         try:
             if not os.path.isfile(localpath):
@@ -208,6 +211,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = self.getSHA(url)
                 if filesha:
                     try:

=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
@@ -130,12 +130,16 @@
                                uncomp_md5=info["primary"].get("uncomp_md5"),
                                sha=info["primary"].get("sha"),
                                uncomp_sha=info["primary"].get("uncomp_sha"),
+                               sha256=info["primary"].get("sha256"),
+                               uncomp_sha256=info["primary"].get("uncomp_sha256"),
                                uncomp=True)
         flitem = fetcher.enqueue(info["filelists"]["url"],
                                  md5=info["filelists"].get("md5"),
                                  uncomp_md5=info["filelists"].get("uncomp_md5"),
                                  sha=info["filelists"].get("sha"),
                                  uncomp_sha=info["filelists"].get("uncomp_sha"),
+                                 sha256=info["filelists"].get("sha256"),
+                                 uncomp_sha256=info["filelists"].get("uncomp_sha256"),
                                  uncomp=True)
         fetcher.run(progress=progress)
  

=== modified file 'smart/control.py'
--- smart/control.py	2008-12-12 07:17:44 +0000
+++ smart/control.py	2009-02-20 12:33:35 +0000
@@ -659,6 +659,7 @@
                 pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                      md5=info.getMD5(url),
                                                      sha=info.getSHA(url),
+                                                     sha256=info.getSHA256(url),
                                                      size=info.getSize(url),
                                                      validate=info.validate))
         if targetdir:

=== modified file 'smart/fetcher.py'
--- smart/fetcher.py	2008-12-12 07:18:07 +0000
+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
@@ -336,7 +336,9 @@
             prefix = "uncomp_"
         else:
             prefix = ""
-        return bool(item.getInfo(prefix+"md5") or item.getInfo(prefix+"sha"))
+        return bool(item.getInfo(prefix+"md5") or
+                    item.getInfo(prefix+"sha") or
+                    item.getInfo(prefix+"sha256"))
 
     def validate(self, item, localpath, withreason=False, uncomp=False):
         try:
@@ -382,6 +384,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = item.getInfo(uncompprefix+"sha")
                 if filesha:
                     try:
@@ -489,12 +508,13 @@
         #             or just 'valid', depending on 'withreason'. 'valid'
         #             may be None, True, or False. If it's True or False,
         #             no other information will be checked.
-        # - md5, sha: file digest
+        # - md5, sha, sha256: file digest
         # - size: file size
         # - uncomp: whether to uncompress or not
-        # - uncomp_{md5,sha,size}: uncompressed equivalents
+        # - uncomp_{md5,sha,sha256,size}: uncompressed equivalents
         #
-        for kind in ("md5", "sha", "uncomp_md5", "uncomp_sha"):
+        for kind in ("md5", "sha", "sha256",
+                     "uncomp_md5", "uncomp_sha", "uncomp_sha256"):
             value = info.get(kind)
             if value:
                 info[kind] = value.lower()


smart-unicode-provides.diff:

--- NEW FILE smart-unicode-provides.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-08-02 15:07:10 +0000
+++ smart/backends/rpm/metadata.py	2009-03-10 10:11:36 +0000
@@ -261,7 +261,7 @@
                                 Prv = RPMNameProvides
                             else:
                                 Prv = RPMProvides
-                            prvdict[(Prv, ename, eversion)] = True
+                            prvdict[(Prv, ename.encode('utf-8'), eversion)] = True
 
                     elif lasttag == OBSOLETES:
                         tup = (RPMObsoletes, ename, erelation, eversion)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Oct 2008 11:07:13 -0000	1.13
+++ .cvsignore	15 Apr 2009 15:41:15 -0000	1.14
@@ -1 +1 @@
-smart-1.1.tar.bz2
+smart-1.2.tar.bz2


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-10/smart.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- smart.spec	14 Feb 2009 11:28:16 -0000	1.40
+++ smart.spec	15 Apr 2009 15:41:16 -0000	1.41
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 1.1
-Release: 59.0.1%{?dist}
+Version: 1.2
+Release: 63%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,8 +17,9 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-# http://bazaar.launchpad.net/%7Esmartpm/smart/bugfix/diff/856/839
-Patch0: 856_839.diff
+Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
+Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -73,7 +74,10 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .bugfixes
+%patch0 -p0 -b .sha256
+perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
+%patch1 -p0 -b .mdclean
+%patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 install -p -m 644 %{SOURCE2} .
@@ -204,6 +208,12 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
+- Fix sha256 and mdclean patches.
+
+* Sun Mar 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-60
+- Update to 1.2.
+
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1-59.0.1
 - launchpad changed the from/to rev order in patches, patch now
   properly recreated.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Oct 2008 11:07:13 -0000	1.16
+++ sources	15 Apr 2009 15:41:16 -0000	1.17
@@ -1 +1 @@
-44c1cf965206f2c2707fc7491151205b  smart-1.1.tar.bz2
+233ccbd1e666a9a7c5e1cc7900075d93  smart-1.2.tar.bz2



From rspanton at fedoraproject.org  Wed Apr 15 15:41:45 2009
From: rspanton at fedoraproject.org (Robert Spanton)
Date: Wed, 15 Apr 2009 15:41:45 +0000 (UTC)
Subject: rpms/msp430-gcc/F-10 import.log, NONE, 1.1 msp430-gcc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090415154145.153AB70101@cvs1.fedora.phx.redhat.com>

Author: rspanton

Update of /cvs/pkgs/rpms/msp430-gcc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12832/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log msp430-gcc.spec 
Log Message:
Import msp430-gcc recipe into CVS.



--- NEW FILE import.log ---
msp430-gcc-3_2_3-2_20090210cvs_fc10:F-10:msp430-gcc-3.2.3-2.20090210cvs.fc10.src.rpm:1239810018


--- NEW FILE msp430-gcc.spec ---
%define target msp430

Name:		%{target}-gcc
Version:	3.2.3
# There has been no release, so this is a snapshot
Release:	2.20090210cvs%{?dist}
Summary:	Cross Compiling GNU GCC targeted at %{target}
Group:		Development/Languages
License:	GPLv2+
URL:		http://mspgcc.sf.net/
Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-core-%{version}.tar.bz2
# Pulled from the mspgcc CVS.  Regenerate with:
# cvs -z3 -d:pserver:anonymous at mspgcc.cvs.sourceforge.net:/cvsroot/mspgcc login
# empty password (press enter)
# cvs -z3 -d:pserver:anonymous at mspgcc.cvs.sourceforge.net:/cvsroot/mspgcc co -D 2009-02-10 -P gcc/gcc-3.3
# tar -cjf mspgcc-gcc-3.3-20090210.tar.bz2 gcc
Source1:	mspgcc-gcc-3.3-20090210.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	%{target}-binutils
Requires:	%{target}-binutils
# Build fails for ppc64 -- bug number to appear on this line after review
# (as documented in https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Build_Failures)
ExcludeArch:	ppc64

%description
This is a cross compiling version of GNU GCC, which can be used to
compile for the %{target} platform, instead of for the native %{_arch} 
platform.

%prep
%setup -q -T -c
%setup -q -T -D -a0
%setup -q -T -D -a1

cp -af gcc/gcc-3.3/* gcc-%{version}/

# Extract %%__os_install_post into os_install_post~
cat << \EOF > os_install_post~
%__os_install_post
EOF

# Generate customized brp-*scripts
cat os_install_post~ | while read a x y; do
case $a in
# Prevent brp-strip* from trying to handle foreign binaries
*/brp-strip*)
  b=$(basename $a)
  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
  chmod a+x $b
  ;;
esac
done

sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
< os_install_post~ > os_install_post 


%build
cd gcc-%{version}
CC="%{__cc} ${RPM_OPT_FLAGS}" ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
	--infodir=%{_infodir} --target=%{target} --disable-nls \
	--libdir=%{_libdir} --enable-version-specific-runtime-libs
# Building GCC-3.2.3 is not smp-safe
make


%install
rm -rf $RPM_BUILD_ROOT
make -C gcc-%{version} install DESTDIR=$RPM_BUILD_ROOT

# we don't want these as we are a cross version
rm -rf $RPM_BUILD_ROOT%{_infodir}
mv $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-cpp.1
mv $RPM_BUILD_ROOT%{_mandir}/man1/gcov.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-gcov.1
rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

%define __os_install_post . ./os_install_post


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_libdir}/gcc-lib
%dir %{_libdir}/gcc-lib/%{target}/
%dir %{_libdir}/gcc-lib/%{target}/%{version}/

%{_bindir}/%{target}-*
%{_libdir}/gcc-lib/%{target}/%{version}/*
%{_mandir}/man1/%{target}-*.1.gz


%changelog
* Sat Feb 21 2009 Rob Spanton <rspanton at zepler.net> 3.2.3-2.20090210cvs
- Use setup macro to do cleaner decompressing.
- Own libdir/gcc-lib dirs.
- Rename man files rather than delete them.

* Tue Feb 10 2009 Rob Spanton <rspanton at zepler.net> 3.2.3-1.20090210cvs 
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-gcc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:13:15 -0000	1.1
+++ .cvsignore	15 Apr 2009 15:41:13 -0000	1.2
@@ -0,0 +1,2 @@
+gcc-core-3.2.3.tar.bz2
+mspgcc-gcc-3.3-20090210.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-gcc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:13:15 -0000	1.1
+++ sources	15 Apr 2009 15:41:13 -0000	1.2
@@ -0,0 +1,2 @@
+66664a84b383ba8d68612cd89b9478b2  gcc-core-3.2.3.tar.bz2
+3622d83dd423933953f5f0aa42dda4dc  mspgcc-gcc-3.3-20090210.tar.bz2



From athimm at fedoraproject.org  Wed Apr 15 15:41:49 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Wed, 15 Apr 2009 15:41:49 +0000 (UTC)
Subject: rpms/smart/F-11 smart-mdclean.patch, NONE, 1.1 smart-sha256.diff,
	NONE, 1.1 smart-unicode-provides.diff, NONE, 1.1 .cvsignore, 1.13,
	1.14 smart.spec, 1.41, 1.42 sources, 1.16, 1.17
Message-ID: <20090415154149.162D270101@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12756/F-11

Modified Files:
	.cvsignore smart.spec sources 
Added Files:
	smart-mdclean.patch smart-sha256.diff 
	smart-unicode-provides.diff 
Log Message:
Update to 1.2 and add sha256 support. Also fix the unicode bug and remove unwanted metadata

smart-mdclean.patch:

--- NEW FILE smart-mdclean.patch ---
=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2006-11-24 19:25:39 +0000
+++ smart/channels/rpm_md.py	2009-03-22 12:11:38 +0000
@@ -34,6 +34,7 @@
 from smart.channel import PackageChannel
 from smart import *
 import posixpath
+import os
 
 from xml.parsers import expat
 
@@ -55,33 +56,14 @@
     def getFetchSteps(self):
         return 3
 
-    def fetch(self, fetcher, progress):
-        
-        fetcher.reset()
-        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
-        item = fetcher.enqueue(repomd)
-        fetcher.run(progress=progress)
-
-        if item.getStatus() is FAILED:
-            progress.add(self.getFetchSteps()-1)
-            if fetcher.getCaching() is NEVER:
-                lines = [_("Failed acquiring release file for '%s':") % self,
-                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
-                raise Error, "\n".join(lines)
-            return False
-
-        digest = getFileDigest(item.getTargetPath())
-        if digest == self._digest:
-            progress.add(1)
-            return True
-        self.removeLoaders()
-
+    def loadMetadata(self, metadatafile):
         info = {}
+
         try:
-            root = ElementTree.parse(item.getTargetPath()).getroot()
+            root = ElementTree.parse(metadatafile).getroot()
         except expat.error, e:
             raise Error, _("Invalid XML file:\n  %s\n  %s\n  %s") % \
-                          (item.getTargetPath(), repomd, str(e))
+                          (metadatafile, repomd, str(e))
 
         for node in root.getchildren():
             if node.tag != DATA:
@@ -97,6 +79,46 @@
                 if subnode.tag == OPENCHECKSUM:
                     info[type]["uncomp_"+subnode.get("type")] = \
                         subnode.text
+        
+        return info
+        
+    def getLocalPath(self, fetcher, url):
+        from smart.fetcher import FetchItem
+        mirror = fetcher.getMirrorSystem().get(url)
+        item = FetchItem(fetcher, url, mirror)
+        return fetcher.getLocalPath(item)
+
+    def fetch(self, fetcher, progress):
+        
+        fetcher.reset()
+        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
+
+        oldinfo = {}
+        path = self.getLocalPath(fetcher, repomd)
+        if os.path.exists(path):
+            try:
+                oldinfo = self.loadMetadata(path)
+            except Error:
+                pass
+        
+        item = fetcher.enqueue(repomd)
+        fetcher.run(progress=progress)
+
+        if item.getStatus() is FAILED:
+            progress.add(self.getFetchSteps()-1)
+            if fetcher.getCaching() is NEVER:
+                lines = [_("Failed acquiring release file for '%s':") % self,
+                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
+                raise Error, "\n".join(lines)
+            return False
+
+        digest = getFileDigest(item.getTargetPath())
+        if digest == self._digest:
+            progress.add(1)
+            return True
+        self.removeLoaders()
+
+        info = self.loadMetadata(item.getTargetPath())
 
         if "primary" not in info:
             raise Error, _("Primary information not found in repository "
@@ -144,6 +166,21 @@
         else:
             return False
 
+        uncompressor = fetcher.getUncompressor()
+
+        # delete any old files, if the new ones have new names
+        for type in ["primary", "filelists", "other"]:
+            if type in oldinfo:
+                url = oldinfo[type]["url"]
+                if url and info[type]["url"] != oldinfo[type]["url"]:
+                    path = self.getLocalPath(fetcher, url)
+                    if os.path.exists(path):
+                       os.unlink(path)
+                    handler = uncompressor.getHandler(path)
+                    path = handler.getTargetPath(path)
+                    if os.path.exists(path):
+                       os.unlink(path)
+
         self._digest = digest
 
         return True


smart-sha256.diff:

--- NEW FILE smart-sha256.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
@@ -71,6 +71,9 @@
     def getSHA(self, url):
         return self._info.get("sha")
 
+    def getSHA256(self, url):
+        return self._info.get("sha256")
+
     def getDescription(self):
         return self._info.get("description", "")
 

=== modified file 'smart/cache.py'
--- smart/cache.py	2008-12-12 07:18:07 +0000
+++ smart/cache.py	2009-02-20 12:34:05 +0000
@@ -179,6 +179,9 @@
     def getSHA(self, url):
         return None
 
+    def getSHA256(self, url):
+        return None
+
     def validate(self, url, localpath, withreason=False):
         try:
             if not os.path.isfile(localpath):
@@ -208,6 +211,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = self.getSHA(url)
                 if filesha:
                     try:

=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
@@ -130,12 +130,16 @@
                                uncomp_md5=info["primary"].get("uncomp_md5"),
                                sha=info["primary"].get("sha"),
                                uncomp_sha=info["primary"].get("uncomp_sha"),
+                               sha256=info["primary"].get("sha256"),
+                               uncomp_sha256=info["primary"].get("uncomp_sha256"),
                                uncomp=True)
         flitem = fetcher.enqueue(info["filelists"]["url"],
                                  md5=info["filelists"].get("md5"),
                                  uncomp_md5=info["filelists"].get("uncomp_md5"),
                                  sha=info["filelists"].get("sha"),
                                  uncomp_sha=info["filelists"].get("uncomp_sha"),
+                                 sha256=info["filelists"].get("sha256"),
+                                 uncomp_sha256=info["filelists"].get("uncomp_sha256"),
                                  uncomp=True)
         fetcher.run(progress=progress)
  

=== modified file 'smart/control.py'
--- smart/control.py	2008-12-12 07:17:44 +0000
+++ smart/control.py	2009-02-20 12:33:35 +0000
@@ -659,6 +659,7 @@
                 pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                      md5=info.getMD5(url),
                                                      sha=info.getSHA(url),
+                                                     sha256=info.getSHA256(url),
                                                      size=info.getSize(url),
                                                      validate=info.validate))
         if targetdir:

=== modified file 'smart/fetcher.py'
--- smart/fetcher.py	2008-12-12 07:18:07 +0000
+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
@@ -336,7 +336,9 @@
             prefix = "uncomp_"
         else:
             prefix = ""
-        return bool(item.getInfo(prefix+"md5") or item.getInfo(prefix+"sha"))
+        return bool(item.getInfo(prefix+"md5") or
+                    item.getInfo(prefix+"sha") or
+                    item.getInfo(prefix+"sha256"))
 
     def validate(self, item, localpath, withreason=False, uncomp=False):
         try:
@@ -382,6 +384,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = item.getInfo(uncompprefix+"sha")
                 if filesha:
                     try:
@@ -489,12 +508,13 @@
         #             or just 'valid', depending on 'withreason'. 'valid'
         #             may be None, True, or False. If it's True or False,
         #             no other information will be checked.
-        # - md5, sha: file digest
+        # - md5, sha, sha256: file digest
         # - size: file size
         # - uncomp: whether to uncompress or not
-        # - uncomp_{md5,sha,size}: uncompressed equivalents
+        # - uncomp_{md5,sha,sha256,size}: uncompressed equivalents
         #
-        for kind in ("md5", "sha", "uncomp_md5", "uncomp_sha"):
+        for kind in ("md5", "sha", "sha256",
+                     "uncomp_md5", "uncomp_sha", "uncomp_sha256"):
             value = info.get(kind)
             if value:
                 info[kind] = value.lower()


smart-unicode-provides.diff:

--- NEW FILE smart-unicode-provides.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-08-02 15:07:10 +0000
+++ smart/backends/rpm/metadata.py	2009-03-10 10:11:36 +0000
@@ -261,7 +261,7 @@
                                 Prv = RPMNameProvides
                             else:
                                 Prv = RPMProvides
-                            prvdict[(Prv, ename, eversion)] = True
+                            prvdict[(Prv, ename.encode('utf-8'), eversion)] = True
 
                     elif lasttag == OBSOLETES:
                         tup = (RPMObsoletes, ename, erelation, eversion)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Oct 2008 11:07:13 -0000	1.13
+++ .cvsignore	15 Apr 2009 15:41:17 -0000	1.14
@@ -1 +1 @@
-smart-1.1.tar.bz2
+smart-1.2.tar.bz2


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-11/smart.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- smart.spec	26 Feb 2009 01:35:31 -0000	1.41
+++ smart.spec	15 Apr 2009 15:41:18 -0000	1.42
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 1.1
-Release: 60.0.1%{?dist}
+Version: 1.2
+Release: 63%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,8 +17,9 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-# http://bazaar.launchpad.net/%7Esmartpm/smart/bugfix/diff/856/839
-Patch0: 856_839.diff
+Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
+Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -73,7 +74,10 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .bugfixes
+%patch0 -p0 -b .sha256
+perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
+%patch1 -p0 -b .mdclean
+%patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 install -p -m 644 %{SOURCE2} .
@@ -204,8 +208,11 @@
 %endif
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-60.0.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
+- Fix sha256 and mdclean patches.
+
+* Sun Mar 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-60
+- Update to 1.2.
 
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1-59.0.1
 - launchpad changed the from/to rev order in patches, patch now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Oct 2008 11:07:13 -0000	1.16
+++ sources	15 Apr 2009 15:41:18 -0000	1.17
@@ -1 +1 @@
-44c1cf965206f2c2707fc7491151205b  smart-1.1.tar.bz2
+233ccbd1e666a9a7c5e1cc7900075d93  smart-1.2.tar.bz2



From athimm at fedoraproject.org  Wed Apr 15 15:41:50 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Wed, 15 Apr 2009 15:41:50 +0000 (UTC)
Subject: rpms/smart/F-9 smart-mdclean.patch, NONE, 1.1 smart-sha256.diff,
	NONE, 1.1 smart-unicode-provides.diff, NONE, 1.1 .cvsignore, 1.13,
	1.14 smart.spec, 1.39, 1.40 sources, 1.16, 1.17
Message-ID: <20090415154150.50D0E70101@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12756/F-9

Modified Files:
	.cvsignore smart.spec sources 
Added Files:
	smart-mdclean.patch smart-sha256.diff 
	smart-unicode-provides.diff 
Log Message:
Update to 1.2 and add sha256 support. Also fix the unicode bug and remove unwanted metadata

smart-mdclean.patch:

--- NEW FILE smart-mdclean.patch ---
=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2006-11-24 19:25:39 +0000
+++ smart/channels/rpm_md.py	2009-03-22 12:11:38 +0000
@@ -34,6 +34,7 @@
 from smart.channel import PackageChannel
 from smart import *
 import posixpath
+import os
 
 from xml.parsers import expat
 
@@ -55,33 +56,14 @@
     def getFetchSteps(self):
         return 3
 
-    def fetch(self, fetcher, progress):
-        
-        fetcher.reset()
-        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
-        item = fetcher.enqueue(repomd)
-        fetcher.run(progress=progress)
-
-        if item.getStatus() is FAILED:
-            progress.add(self.getFetchSteps()-1)
-            if fetcher.getCaching() is NEVER:
-                lines = [_("Failed acquiring release file for '%s':") % self,
-                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
-                raise Error, "\n".join(lines)
-            return False
-
-        digest = getFileDigest(item.getTargetPath())
-        if digest == self._digest:
-            progress.add(1)
-            return True
-        self.removeLoaders()
-
+    def loadMetadata(self, metadatafile):
         info = {}
+
         try:
-            root = ElementTree.parse(item.getTargetPath()).getroot()
+            root = ElementTree.parse(metadatafile).getroot()
         except expat.error, e:
             raise Error, _("Invalid XML file:\n  %s\n  %s\n  %s") % \
-                          (item.getTargetPath(), repomd, str(e))
+                          (metadatafile, repomd, str(e))
 
         for node in root.getchildren():
             if node.tag != DATA:
@@ -97,6 +79,46 @@
                 if subnode.tag == OPENCHECKSUM:
                     info[type]["uncomp_"+subnode.get("type")] = \
                         subnode.text
+        
+        return info
+        
+    def getLocalPath(self, fetcher, url):
+        from smart.fetcher import FetchItem
+        mirror = fetcher.getMirrorSystem().get(url)
+        item = FetchItem(fetcher, url, mirror)
+        return fetcher.getLocalPath(item)
+
+    def fetch(self, fetcher, progress):
+        
+        fetcher.reset()
+        repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
+
+        oldinfo = {}
+        path = self.getLocalPath(fetcher, repomd)
+        if os.path.exists(path):
+            try:
+                oldinfo = self.loadMetadata(path)
+            except Error:
+                pass
+        
+        item = fetcher.enqueue(repomd)
+        fetcher.run(progress=progress)
+
+        if item.getStatus() is FAILED:
+            progress.add(self.getFetchSteps()-1)
+            if fetcher.getCaching() is NEVER:
+                lines = [_("Failed acquiring release file for '%s':") % self,
+                         u"%s: %s" % (item.getURL(), item.getFailedReason())]
+                raise Error, "\n".join(lines)
+            return False
+
+        digest = getFileDigest(item.getTargetPath())
+        if digest == self._digest:
+            progress.add(1)
+            return True
+        self.removeLoaders()
+
+        info = self.loadMetadata(item.getTargetPath())
 
         if "primary" not in info:
             raise Error, _("Primary information not found in repository "
@@ -144,6 +166,21 @@
         else:
             return False
 
+        uncompressor = fetcher.getUncompressor()
+
+        # delete any old files, if the new ones have new names
+        for type in ["primary", "filelists", "other"]:
+            if type in oldinfo:
+                url = oldinfo[type]["url"]
+                if url and info[type]["url"] != oldinfo[type]["url"]:
+                    path = self.getLocalPath(fetcher, url)
+                    if os.path.exists(path):
+                       os.unlink(path)
+                    handler = uncompressor.getHandler(path)
+                    path = handler.getTargetPath(path)
+                    if os.path.exists(path):
+                       os.unlink(path)
+
         self._digest = digest
 
         return True


smart-sha256.diff:

--- NEW FILE smart-sha256.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
@@ -71,6 +71,9 @@
     def getSHA(self, url):
         return self._info.get("sha")
 
+    def getSHA256(self, url):
+        return self._info.get("sha256")
+
     def getDescription(self):
         return self._info.get("description", "")
 

=== modified file 'smart/cache.py'
--- smart/cache.py	2008-12-12 07:18:07 +0000
+++ smart/cache.py	2009-02-20 12:34:05 +0000
@@ -179,6 +179,9 @@
     def getSHA(self, url):
         return None
 
+    def getSHA256(self, url):
+        return None
+
     def validate(self, url, localpath, withreason=False):
         try:
             if not os.path.isfile(localpath):
@@ -208,6 +211,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = self.getSHA(url)
                 if filesha:
                     try:

=== modified file 'smart/channels/rpm_md.py'
--- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
@@ -130,12 +130,16 @@
                                uncomp_md5=info["primary"].get("uncomp_md5"),
                                sha=info["primary"].get("sha"),
                                uncomp_sha=info["primary"].get("uncomp_sha"),
+                               sha256=info["primary"].get("sha256"),
+                               uncomp_sha256=info["primary"].get("uncomp_sha256"),
                                uncomp=True)
         flitem = fetcher.enqueue(info["filelists"]["url"],
                                  md5=info["filelists"].get("md5"),
                                  uncomp_md5=info["filelists"].get("uncomp_md5"),
                                  sha=info["filelists"].get("sha"),
                                  uncomp_sha=info["filelists"].get("uncomp_sha"),
+                                 sha256=info["filelists"].get("sha256"),
+                                 uncomp_sha256=info["filelists"].get("uncomp_sha256"),
                                  uncomp=True)
         fetcher.run(progress=progress)
  

=== modified file 'smart/control.py'
--- smart/control.py	2008-12-12 07:17:44 +0000
+++ smart/control.py	2009-02-20 12:33:35 +0000
@@ -659,6 +659,7 @@
                 pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                      md5=info.getMD5(url),
                                                      sha=info.getSHA(url),
+                                                     sha256=info.getSHA256(url),
                                                      size=info.getSize(url),
                                                      validate=info.validate))
         if targetdir:

=== modified file 'smart/fetcher.py'
--- smart/fetcher.py	2008-12-12 07:18:07 +0000
+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
@@ -336,7 +336,9 @@
             prefix = "uncomp_"
         else:
             prefix = ""
-        return bool(item.getInfo(prefix+"md5") or item.getInfo(prefix+"sha"))
+        return bool(item.getInfo(prefix+"md5") or
+                    item.getInfo(prefix+"sha") or
+                    item.getInfo(prefix+"sha256"))
 
     def validate(self, item, localpath, withreason=False, uncomp=False):
         try:
@@ -382,6 +384,23 @@
                     raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                  (filemd5, lfilemd5)
             else:
+                filesha256 = item.getInfo(uncompprefix+"sha256")
+                if filesha256:
+                    try:
+                        from hashlib import sha256
+                        digest = sha256()
+                        file = open(localpath)
+                        data = file.read(BLOCKSIZE)
+                        while data:
+                            digest.update(data)
+                            data = file.read(BLOCKSIZE)
+                        lfilesha256 = digest.hexdigest()
+                        if lfilesha256 != filesha256:
+                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
+                                         (filesha256, lfilesha256)
+                        return
+                    except ImportError:
+                        pass
                 filesha = item.getInfo(uncompprefix+"sha")
                 if filesha:
                     try:
@@ -489,12 +508,13 @@
         #             or just 'valid', depending on 'withreason'. 'valid'
         #             may be None, True, or False. If it's True or False,
         #             no other information will be checked.
-        # - md5, sha: file digest
+        # - md5, sha, sha256: file digest
         # - size: file size
         # - uncomp: whether to uncompress or not
-        # - uncomp_{md5,sha,size}: uncompressed equivalents
+        # - uncomp_{md5,sha,sha256,size}: uncompressed equivalents
         #
-        for kind in ("md5", "sha", "uncomp_md5", "uncomp_sha"):
+        for kind in ("md5", "sha", "sha256",
+                     "uncomp_md5", "uncomp_sha", "uncomp_sha256"):
             value = info.get(kind)
             if value:
                 info[kind] = value.lower()


smart-unicode-provides.diff:

--- NEW FILE smart-unicode-provides.diff ---
=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-08-02 15:07:10 +0000
+++ smart/backends/rpm/metadata.py	2009-03-10 10:11:36 +0000
@@ -261,7 +261,7 @@
                                 Prv = RPMNameProvides
                             else:
                                 Prv = RPMProvides
-                            prvdict[(Prv, ename, eversion)] = True
+                            prvdict[(Prv, ename.encode('utf-8'), eversion)] = True
 
                     elif lasttag == OBSOLETES:
                         tup = (RPMObsoletes, ename, erelation, eversion)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Oct 2008 11:13:06 -0000	1.13
+++ .cvsignore	15 Apr 2009 15:41:18 -0000	1.14
@@ -1 +1 @@
-smart-1.1.tar.bz2
+smart-1.2.tar.bz2


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- smart.spec	14 Feb 2009 11:28:17 -0000	1.39
+++ smart.spec	15 Apr 2009 15:41:19 -0000	1.40
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 1.1
-Release: 59.0.1%{?dist}
+Version: 1.2
+Release: 63%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,8 +17,9 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-# http://bazaar.launchpad.net/%7Esmartpm/smart/bugfix/diff/856/839
-Patch0: 856_839.diff
+Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
+Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -73,7 +74,10 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .bugfixes
+%patch0 -p0 -b .sha256
+perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
+%patch1 -p0 -b .mdclean
+%patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 install -p -m 644 %{SOURCE2} .
@@ -204,6 +208,12 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
+- Fix sha256 and mdclean patches.
+
+* Sun Mar 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-60
+- Update to 1.2.
+
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1-59.0.1
 - launchpad changed the from/to rev order in patches, patch now
   properly recreated.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Oct 2008 11:13:07 -0000	1.16
+++ sources	15 Apr 2009 15:41:19 -0000	1.17
@@ -1 +1 @@
-44c1cf965206f2c2707fc7491151205b  smart-1.1.tar.bz2
+233ccbd1e666a9a7c5e1cc7900075d93  smart-1.2.tar.bz2



From mitr at fedoraproject.org  Wed Apr 15 15:46:00 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Wed, 15 Apr 2009 15:46:00 +0000 (UTC)
Subject: rpms/libuser/devel .cvsignore, 1.50, 1.51 libuser.spec, 1.81,
	1.82 sources, 1.52, 1.53
Message-ID: <20090415154600.DAECE70137@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/libuser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15248

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Wed Apr 15 2009 Miloslav Trma?? <mitr at redhat.com> - 0.56.10-1
- Update to libuser-0.56.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	9 Apr 2008 21:32:09 -0000	1.50
+++ .cvsignore	15 Apr 2009 15:45:29 -0000	1.51
@@ -1 +1 @@
-libuser-0.56.9.tar.bz2
+libuser-0.56.10.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libuser.spec	25 Feb 2009 19:42:42 -0000	1.81
+++ libuser.spec	15 Apr 2009 15:45:29 -0000	1.82
@@ -1,13 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.9
-Release: 3
+Version: 0.56.10
+Release: 1
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://fedorahosted.org/libuser/
-# https://fedorahosted.org/libuser/attachment/wiki/LibuserDownloads/libuser-%{version}?format=raw
-Source: libuser-%{version}.tar.bz2
+Source: https://fedorahosted.org/releases/l/i/libuser/libuser-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python-devel
 BuildRequires: cyrus-sasl-devel, libselinux-devel, openldap-devel
@@ -99,6 +98,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Apr 15 2009 Miloslav Trma?? <mitr at redhat.com> - 0.56.10-1
+- Update to libuser-0.56.10.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.56.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	9 Apr 2008 21:32:09 -0000	1.52
+++ sources	15 Apr 2009 15:45:29 -0000	1.53
@@ -1 +1 @@
-cc35be90b4dcb43945b2724c429f1963  libuser-0.56.9.tar.bz2
+fd721419a92cc05b4fb5e770260f38aa  libuser-0.56.10.tar.bz2



From c4chris at fedoraproject.org  Wed Apr 15 15:53:22 2009
From: c4chris at fedoraproject.org (Christian Iseli)
Date: Wed, 15 Apr 2009 15:53:22 +0000 (UTC)
Subject: rpms/nfswatch/devel .cvsignore, 1.8, 1.9 nfswatch.spec, 1.16,
	1.17 sources, 1.8, 1.9
Message-ID: <20090415155322.4278670101@cvs1.fedora.phx.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/nfswatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18454

Modified Files:
	.cvsignore nfswatch.spec sources 
Log Message:
New upstream version 4.99.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 May 2007 13:13:32 -0000	1.8
+++ .cvsignore	15 Apr 2009 15:53:20 -0000	1.9
@@ -1 +1 @@
-nfswatch-4.99.9.tar.gz
+nfswatch-4.99.10.tar.gz


Index: nfswatch.spec
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nfswatch.spec	26 Feb 2009 05:35:12 -0000	1.16
+++ nfswatch.spec	15 Apr 2009 15:53:20 -0000	1.17
@@ -1,8 +1,8 @@
 # $Id$
 Summary: An NFS traffic monitoring tool
 Name: nfswatch
-Version: 4.99.9
-Release: 4%{?dist}
+Version: 4.99.10
+Release: 1%{?dist}
 
 License: BSD
 URL: http://nfswatch.sourceforge.net
@@ -10,7 +10,7 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel
+BuildRequires: libpcap-devel ncurses-devel
 
 %description
 Nfswatch is a command-line tool for monitoring NFS traffic.
@@ -40,6 +40,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Apr 15 2009 Christian Iseli <Christian.Iseli at licr.org> 4.99.10-1
+ - new upstream version
+ - needs libpcap-devel
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.99.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 May 2007 13:13:32 -0000	1.8
+++ sources	15 Apr 2009 15:53:20 -0000	1.9
@@ -1 +1 @@
-0e0735115b99ebe150789c93746f0772  nfswatch-4.99.9.tar.gz
+c20e510464f12384fdac330d8c84d127  nfswatch-4.99.10.tar.gz



From karsten at fedoraproject.org  Wed Apr 15 15:54:20 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 15 Apr 2009 15:54:20 +0000 (UTC)
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.37,1.38
Message-ID: <20090415155420.1378F70101@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/MySQL-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18674

Modified Files:
	MySQL-python.spec 
Log Message:
- bump release and rebuild for s390x


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/extras/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- MySQL-python.spec	23 Feb 2009 22:04:38 -0000	1.37
+++ MySQL-python.spec	15 Apr 2009 15:53:49 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
@@ -67,6 +67,9 @@
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Wed Apr 15 2009 Karsten Hopp <karsten at redhat.com> 1.2.2-11
+- bump release and rebuild for s390x
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caolanm at fedoraproject.org  Wed Apr 15 15:59:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 15 Apr 2009 15:59:52 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch,
	NONE, 1.1 workspace.cmcfixes57.patch, NONE,
	1.1 openoffice.org.spec, 1.1876,
	1.1877 openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo100225.comphelper.vis.patch, 1.1, NONE
Message-ID: <20090415155952.7151B70101@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20424

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
	workspace.cmcfixes57.patch 
Removed Files:
	openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch 
	openoffice.org-3.1.0.ooo100225.comphelper.vis.patch 
Log Message:
Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch

openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch ---
diff -ru sw.orig/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8esh.cxx
--- sw.orig/source/filter/ww8/wrtw8esh.cxx	2009-04-15 11:34:27.000000000 +0100
+++ sw/source/filter/ww8/wrtw8esh.cxx	2009-04-15 12:09:10.000000000 +0100
@@ -1137,11 +1137,11 @@
                 if( nSlotId && nWhich != nSlotId &&
                     0 != ( nWhich = pDstPool->GetWhich( nSlotId ) ) &&
                     nWhich != nSlotId &&
-                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] )
-                    && ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
+                    ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
                                       && nWhich < RES_TXTATR_END)
                                    : (nWhich >= RES_PARATR_BEGIN
-                                      && nWhich < RES_FRMATR_END) ) )
+                                      && nWhich < RES_FRMATR_END) ) &&
+                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] ) )
                 {
                     // use always the SW-Which Id !
                     SfxPoolItem* pI = pItem->Clone();
diff -ru sw.orig/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-15 11:34:26.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-15 12:34:07.000000000 +0100
@@ -283,10 +283,10 @@
     {
         const SfxPoolItem *pItem = aI->second;
         USHORT nWhich = pItem->Which();
+        if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+            continue;
         if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
         {
-            if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
-                continue;
             if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
                 (*pOut)(*this, *pItem);
         }
@@ -344,17 +344,17 @@
         if (bChpFmt)
             ExportPoolItemsToCHP(aItems, nScript);
 
-        sw::cPoolItemIter aEnd = aItems.end();
-        for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
+        if (bPapFmt)
         {
-            pItem = aI->second;
-            USHORT nWhich = pItem->Which();
-            pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
-            if( 0 != pOut && (!bPapFmt || RES_PARATR_NUMRULE != nWhich ))
-            {
-                bool bPap = nWhich >= RES_PARATR_BEGIN
-                            && nWhich < RES_FRMATR_END;
-                if (bPapFmt && bPap)
+            sw::cPoolItemIter aEnd = aItems.end();
+            for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
+            {
+                pItem = aI->second;
+                USHORT nWhich = pItem->Which();
+                if (nWhich < RES_PARATR_BEGIN || nWhich >= RES_FRMATR_END || nWhich == RES_PARATR_NUMRULE)
+                    continue;
+                pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
+                if( 0 != pOut )
                     (*pOut)(*this, *pItem);
             }
         }

workspace.cmcfixes57.patch:

--- NEW FILE workspace.cmcfixes57.patch ---
Fix for svgimport visibility bug

From: Thorsten Behrens <thb at openoffice.org>


---

 comphelper/inc/comphelper/servicedecl.hxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff --git comphelper/inc/comphelper/servicedecl.hxx comphelper/inc/comphelper/servicedecl.hxx
index bd114be..1fa97cc 100644
--- comphelper/inc/comphelper/servicedecl.hxx
+++ comphelper/inc/comphelper/servicedecl.hxx
@@ -418,20 +418,20 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
 #define COMPHELPER_SERVICEDECL_make_exports(varargs_ )  \
 extern "C" \
 { \
-    void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
                                                           uno_Environment** /*ppEnv*/ ) \
     { \
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \
     } \
  \
-    sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
+    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
                                            ::com::sun::star::registry::XRegistryKey*        pRegistryKey ) \
     { \
         return component_writeInfoHelper( pServiceManager, pRegistryKey, \
                                           BOOST_PP_SEQ_ENUM(varargs_) ); \
     } \
  \
-    void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
                                          ::com::sun::star::lang::XMultiServiceFactory*  pServiceManager, \
                                          ::com::sun::star::registry::XRegistryKey*      pRegistryKey ) \
     { \
diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
--- sw.orig/source/filter/ww8/ww8par2.cxx	2009-03-10 12:59:18.000000000 +0000
+++ sw/source/filter/ww8/ww8par2.cxx	2009-03-10 13:51:17.000000000 +0000
@@ -2509,7 +2509,15 @@
             //ability to set the margin.
             SvxLRSpaceItem aL( RES_LR_SPACE );
             // set right to original DxaLeft (i28656)
+#if 0
+            // Type don't get promoted the intuitive way
             aL.SetLeft( !bIsBiDi ?  GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft);
+#else
+            if (!bIsBiDi)
+                aL.SetLeft( GetMinLeft() );
+            else
+                aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft );
+#endif
             aItemSet.Put(aL);
         }
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -r1.1876 -r1.1877
--- openoffice.org.spec	14 Apr 2009 10:45:22 -0000	1.1876
+++ openoffice.org.spec	15 Apr 2009 15:59:21 -0000	1.1877
@@ -126,15 +126,15 @@
 Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch54: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch54: workspace.cmcfixes57.patch
 Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
 Patch56: ooo-build.ooo2497.filter.svg.patch
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
-Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch62: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch58: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
+Patch59: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1619,15 +1619,15 @@
 %patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch54 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch54 -p0 -b .workspace.cmcfixes57.patch
 %patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
 %patch56 -p1 -b .ooo2497.filter.svg.patch
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch58 -p0 -b .ooo100225.comphelper.vis.patch
-%patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch61 -p1 -b .ooo100991.pyuno-fix.patch
-%patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch58 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch59 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch60 -p1 -b .ooo100991.pyuno-fix.patch
+%patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4115,8 +4115,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 14 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
+* Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+- Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 * Thu Apr 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 


--- openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch DELETED ---


--- openoffice.org-3.1.0.ooo100225.comphelper.vis.patch DELETED ---



From twaugh at fedoraproject.org  Wed Apr 15 16:07:42 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 15 Apr 2009 16:07:42 +0000 (UTC)
Subject: rpms/ghostscript/F-10 ghostscript-CVE-2008-6679.patch, NONE,
	1.1 ghostscript-CVE-2009-0196.patch, NONE,
	1.1 ghostscript-CVE-2009-0792.patch, NONE, 1.1 ghostscript.spec,
	1.179, 1.180
Message-ID: <20090415160742.C06C870101@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23021

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2008-6679.patch 
	ghostscript-CVE-2009-0196.patch 
	ghostscript-CVE-2009-0792.patch 
Log Message:
* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.63-6
- Applied patch to fix CVE-2009-0792 (bug #491853).
- Applied patch to fix CVE-2009-0196 (bug #493379).
- Applied patch to fix CVE-2008-6679 (bug #493445).


ghostscript-CVE-2008-6679.patch:

--- NEW FILE ghostscript-CVE-2008-6679.patch ---
diff -up ghostscript-8.63/src/gdevpdtb.c.CVE-2008-6679 ghostscript-8.63/src/gdevpdtb.c
--- ghostscript-8.63/src/gdevpdtb.c.CVE-2008-6679	2008-04-04 09:53:57.000000000 +0100
+++ ghostscript-8.63/src/gdevpdtb.c	2009-04-15 16:43:11.000000000 +0100
@@ -133,7 +133,7 @@ pdf_base_font_alloc(gx_device_pdf *pdev,
 			&st_pdf_base_font, "pdf_base_font_alloc");
     const gs_font_name *pfname = &font->font_name;
     gs_const_string font_name;
-    char fnbuf[3 + sizeof(long) / 3 + 1]; /* .F#######\0 */
+    char fnbuf[2*sizeof(long) + 3]; /* .F########\0 */
     int code;
 
     if (pbfont == 0)

ghostscript-CVE-2009-0196.patch:

--- NEW FILE ghostscript-CVE-2009-0196.patch ---
diff -up ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196 ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c
--- ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196	2007-12-11 08:29:58.000000000 +0000
+++ ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c	2009-04-15 16:40:13.000000000 +0100
@@ -699,6 +699,15 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
         exrunlength = params->SDNUMEXSYMS;
       else
         code = jbig2_arith_int_decode(IAEX, as, &exrunlength);
+      if (exrunlength > params->SDNUMEXSYMS - j) {
+        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+          "runlength too large in export symbol table (%d > %d - %d)\n",
+          exrunlength, params->SDNUMEXSYMS, j);
+        jbig2_sd_release(ctx, SDEXSYMS);
+        /* skip to the cleanup code and return SDEXSYMS = NULL */
+        SDEXSYMS = NULL;
+        break;
+      }
       for(k = 0; k < exrunlength; k++)
         if (exflag) {
           SDEXSYMS->glyphs[j++] = (i < m) ? 

ghostscript-CVE-2009-0792.patch:

--- NEW FILE ghostscript-CVE-2009-0792.patch ---
diff -up ghostscript-8.63/icclib/icc.c.CVE-2009-0792 ghostscript-8.63/icclib/icc.c
--- ghostscript-8.63/icclib/icc.c.CVE-2009-0792	2009-04-15 16:37:49.000000000 +0100
+++ ghostscript-8.63/icclib/icc.c	2009-04-15 16:38:00.000000000 +0100
@@ -2982,7 +2982,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3004,6 +3004,11 @@ static int icmTable_setup_bwd(
 ) {
 	int i;
 
+	if (size > INT_MAX - 2)
+		/* Although rt->size is unsigned long, the rt data
+		 * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3022,7 +3027,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(int *))) == NULL) {
+	if ((rt->rlists = (int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3035,6 +3040,15 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+		/* s and e should both be in the range [0,rt->rsize]
+		 * now, but let's not rely on floating point
+		 * calculations -- double-check. */
+		if (s < 0)
+			s = 0;
+		if (e < 0)
+			e = 0;
+		if (s >= rt->rsize)
+			s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3053,6 +3067,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+					if (as > INT_MAX / 2 / sizeof (int))
+						return 2;
+
 					as *= 2;
 					rt->rlists[j] = (int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3104,7 +3121,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+	if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3131,6 +3148,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+	/* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -3671,7 +3689,7 @@ static int icmData_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned char *) icp->al->malloc(icp->al, p->size * sizeof(unsigned char))) == NULL) {
+		if ((p->data = (unsigned char *) icp->al->calloc(icp->al, p->size, sizeof(unsigned char))) == NULL) {
 			sprintf(icp->err,"icmData_alloc: malloc() of icmData data failed");
 			return icp->errc = 2;
 		}
@@ -3887,7 +3905,7 @@ static int icmText_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->data = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmText_alloc: malloc() of icmText data failed");
 			return icp->errc = 2;
 		}
@@ -4301,7 +4319,7 @@ double *in		/* Input array[inputChan] */
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->inputEnt-2))
+		if (ix < 0 || ix > (p->inputEnt-2))
 			ix = (p->inputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -4360,7 +4378,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4433,7 +4451,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4506,7 +4524,7 @@ double *in		/* Input array[outputChan] *
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->outputEnt-2))
+		if (ix < 0 || ix > (p->outputEnt-2))
 			ix = (p->outputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -6714,7 +6732,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -7888,7 +7906,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8827,7 +8845,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+		if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8837,7 +8855,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+			if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/ghostscript.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- ghostscript.spec	20 Mar 2009 12:36:05 -0000	1.179
+++ ghostscript.spec	15 Apr 2009 16:07:40 -0000	1.180
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -22,6 +22,9 @@
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-CVE-2009-0583,0584.patch
+Patch9: ghostscript-CVE-2009-0792.patch
+Patch10: ghostscript-CVE-2009-0196.patch
+Patch11: ghostscript-CVE-2008-6679.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -109,6 +112,15 @@
 # (bug #487744).
 %patch8 -p1 -b .CVE-2009-0583,0584
 
+# Applied patch to fix CVE-2009-0792 (bug #491853).
+%patch9 -p1 -b .CVE-2009-0792
+
+# Applied patch to fix CVE-2009-0196 (bug #493379).
+%patch10 -p1 -b .CVE-2009-0196
+
+# Applied patch to fix CVE-2008-6679 (bug #493445).
+%patch11 -p1 -b .CVE-2008-6679
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -293,6 +305,11 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.63-6
+- Applied patch to fix CVE-2009-0792 (bug #491853).
+- Applied patch to fix CVE-2009-0196 (bug #493379).
+- Applied patch to fix CVE-2008-6679 (bug #493445).
+
 * Fri Mar 20 2009 Tim Waugh <twaugh at redhat.com> 8.63-5
 - Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
   (bug #487744).



From jorton at fedoraproject.org  Wed Apr 15 16:08:17 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Wed, 15 Apr 2009 16:08:17 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.138,1.139
Message-ID: <20090415160817.2E41270101@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23091

Modified Files:
	subversion.spec 
Log Message:
* Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 1.6.1-4
- really disable PIE



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- subversion.spec	14 Apr 2009 07:37:15 -0000	1.138
+++ subversion.spec	15 Apr 2009 16:07:46 -0000	1.139
@@ -15,7 +15,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.1
-Release: 3
+Release: 4
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -129,7 +129,7 @@
 export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
 
-export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS -fPIE"
+export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
@@ -286,6 +286,9 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 1.6.1-4
+- really disable PIE
+
 * Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 1.6.1-3
 - update to 1.6.1; disable PIE patch for the time being
 



From cebbert at fedoraproject.org  Wed Apr 15 16:11:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 15 Apr 2009 16:11:44 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-serial-add-txen-test-param.patch, NONE, 
	1.1 kernel.spec, 1.1544, 1.1545
Message-ID: <20090415161144.E38D770101@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24387

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-serial-add-txen-test-param.patch 
Log Message:
Add serial driver option to skip testing for the TXEN bug. (#495762)

linux-2.6-serial-add-txen-test-param.patch:

--- NEW FILE linux-2.6-serial-add-txen-test-param.patch ---
Allow users to force skipping the TXEN test at init time. Applies
to all serial ports. Intended for debugging only.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.29.noarch/drivers/serial/8250.c
===================================================================
--- linux-2.6.29.noarch.orig/drivers/serial/8250.c
+++ linux-2.6.29.noarch/drivers/serial/8250.c
@@ -67,6 +67,8 @@ static int serial_index(struct uart_port
 	return (serial8250_reg.minor - 64) + port->line;
 }
 
+static unsigned int skip_txen_test; /* force skip of txen test at init time */
+
 /*
  * Debugging.
  */
@@ -2097,7 +2099,7 @@ static int serial8250_startup(struct uar
 	   is variable. So, let's just don't test if we receive
 	   TX irq. This way, we'll never enable UART_BUG_TXEN.
 	 */
-	if (up->port.flags & UPF_NO_TXEN_TEST)
+	if (skip_txen_test || up->port.flags & UPF_NO_TXEN_TEST)
 		goto dont_test_tx_en;
 
 	/*
@@ -3245,6 +3247,9 @@ MODULE_PARM_DESC(share_irqs, "Share IRQs
 module_param(nr_uarts, uint, 0644);
 MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
 
+module_param(skip_txen_test, uint, 0644);
+MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
+
 #ifdef CONFIG_SERIAL_8250_RSA
 module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444);
 MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1544
retrieving revision 1.1545
diff -u -r1.1544 -r1.1545
--- kernel.spec	15 Apr 2009 06:36:56 -0000	1.1544
+++ kernel.spec	15 Apr 2009 16:11:39 -0000	1.1545
@@ -636,6 +636,7 @@
 Patch453: linux-2.6-input-wacom-bluetooth.patch
 
 Patch460: linux-2.6-serial-460800.patch
+Patch461: linux-2.6-serial-add-txen-test-param.patch
 
 # 8192 too low
 Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
@@ -1276,6 +1277,8 @@
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
+# let users skip the TXEN bug test
+ApplyPatch linux-2.6-serial-add-txen-test-param.patch
 
 ApplyPatch increase-MAX_LOCKDEP_ENTRIES.patch
 
@@ -1963,6 +1966,9 @@
 # and build.
 
 %changelog
+* Wed Apr 15 2009 Chuck Ebbert <cebbert at redhat.com>
+- Add serial driver option to skip testing for the TXEN bug. (#495762)
+
 * Wed Apr 15 2009 Dave Airlie <airlied at redhat.com>
 - drm-modesetting-radeon: fix rs690 video (#492685) + add bandwidth calcs
 



From jorton at fedoraproject.org  Wed Apr 15 16:12:22 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Wed, 15 Apr 2009 16:12:22 +0000 (UTC)
Subject: rpms/subversion/F-11 subversion.spec,1.138,1.139
Message-ID: <20090415161222.D35A570101@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24487

Modified Files:
	subversion.spec 
Log Message:
* Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 1.6.1-4
- really disable PIE



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/subversion.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- subversion.spec	14 Apr 2009 07:37:15 -0000	1.138
+++ subversion.spec	15 Apr 2009 16:11:51 -0000	1.139
@@ -15,7 +15,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.1
-Release: 3
+Release: 4
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -129,7 +129,7 @@
 export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
 
-export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS -fPIE"
+export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
@@ -286,6 +286,9 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 1.6.1-4
+- really disable PIE
+
 * Tue Apr 14 2009 Joe Orton <jorton at redhat.com> 1.6.1-3
 - update to 1.6.1; disable PIE patch for the time being
 



From rspanton at fedoraproject.org  Wed Apr 15 15:44:54 2009
From: rspanton at fedoraproject.org (Robert Spanton)
Date: Wed, 15 Apr 2009 15:44:54 +0000 (UTC)
Subject: rpms/msp430-gcc/devel import.log, NONE, 1.1 msp430-gcc.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090415154454.BB31370137@cvs1.fedora.phx.redhat.com>

Author: rspanton

Update of /cvs/pkgs/rpms/msp430-gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14444/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log msp430-gcc.spec 
Log Message:
Import msp430-gcc recipe into devel branch.



--- NEW FILE import.log ---
msp430-gcc-3_2_3-2_20090210cvs_fc10:HEAD:msp430-gcc-3.2.3-2.20090210cvs.fc10.src.rpm:1239810236


--- NEW FILE msp430-gcc.spec ---
%define target msp430

Name:		%{target}-gcc
Version:	3.2.3
# There has been no release, so this is a snapshot
Release:	2.20090210cvs%{?dist}
Summary:	Cross Compiling GNU GCC targeted at %{target}
Group:		Development/Languages
License:	GPLv2+
URL:		http://mspgcc.sf.net/
Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-core-%{version}.tar.bz2
# Pulled from the mspgcc CVS.  Regenerate with:
# cvs -z3 -d:pserver:anonymous at mspgcc.cvs.sourceforge.net:/cvsroot/mspgcc login
# empty password (press enter)
# cvs -z3 -d:pserver:anonymous at mspgcc.cvs.sourceforge.net:/cvsroot/mspgcc co -D 2009-02-10 -P gcc/gcc-3.3
# tar -cjf mspgcc-gcc-3.3-20090210.tar.bz2 gcc
Source1:	mspgcc-gcc-3.3-20090210.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	%{target}-binutils
Requires:	%{target}-binutils
# Build fails for ppc64 -- bug number to appear on this line after review
# (as documented in https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Build_Failures)
ExcludeArch:	ppc64

%description
This is a cross compiling version of GNU GCC, which can be used to
compile for the %{target} platform, instead of for the native %{_arch} 
platform.

%prep
%setup -q -T -c
%setup -q -T -D -a0
%setup -q -T -D -a1

cp -af gcc/gcc-3.3/* gcc-%{version}/

# Extract %%__os_install_post into os_install_post~
cat << \EOF > os_install_post~
%__os_install_post
EOF

# Generate customized brp-*scripts
cat os_install_post~ | while read a x y; do
case $a in
# Prevent brp-strip* from trying to handle foreign binaries
*/brp-strip*)
  b=$(basename $a)
  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
  chmod a+x $b
  ;;
esac
done

sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
< os_install_post~ > os_install_post 


%build
cd gcc-%{version}
CC="%{__cc} ${RPM_OPT_FLAGS}" ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
	--infodir=%{_infodir} --target=%{target} --disable-nls \
	--libdir=%{_libdir} --enable-version-specific-runtime-libs
# Building GCC-3.2.3 is not smp-safe
make


%install
rm -rf $RPM_BUILD_ROOT
make -C gcc-%{version} install DESTDIR=$RPM_BUILD_ROOT

# we don't want these as we are a cross version
rm -rf $RPM_BUILD_ROOT%{_infodir}
mv $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-cpp.1
mv $RPM_BUILD_ROOT%{_mandir}/man1/gcov.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-gcov.1
rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

%define __os_install_post . ./os_install_post


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_libdir}/gcc-lib
%dir %{_libdir}/gcc-lib/%{target}/
%dir %{_libdir}/gcc-lib/%{target}/%{version}/

%{_bindir}/%{target}-*
%{_libdir}/gcc-lib/%{target}/%{version}/*
%{_mandir}/man1/%{target}-*.1.gz


%changelog
* Sat Feb 21 2009 Rob Spanton <rspanton at zepler.net> 3.2.3-2.20090210cvs
- Use setup macro to do cleaner decompressing.
- Own libdir/gcc-lib dirs.
- Rename man files rather than delete them.

* Tue Feb 10 2009 Rob Spanton <rspanton at zepler.net> 3.2.3-1.20090210cvs 
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-gcc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:13:15 -0000	1.1
+++ .cvsignore	15 Apr 2009 15:44:52 -0000	1.2
@@ -0,0 +1,2 @@
+gcc-core-3.2.3.tar.bz2
+mspgcc-gcc-3.3-20090210.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-gcc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:13:15 -0000	1.1
+++ sources	15 Apr 2009 15:44:52 -0000	1.2
@@ -0,0 +1,2 @@
+66664a84b383ba8d68612cd89b9478b2  gcc-core-3.2.3.tar.bz2
+3622d83dd423933953f5f0aa42dda4dc  mspgcc-gcc-3.3-20090210.tar.bz2



From jorton at fedoraproject.org  Wed Apr 15 16:13:54 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Wed, 15 Apr 2009 16:13:54 +0000 (UTC)
Subject: rpms/subversion/F-11 subversion.spec,1.139,1.140
Message-ID: <20090415161354.88CF570101@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25240

Modified Files:
	subversion.spec 
Log Message:
- use dist in release



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/subversion.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- subversion.spec	15 Apr 2009 16:11:51 -0000	1.139
+++ subversion.spec	15 Apr 2009 16:13:24 -0000	1.140
@@ -15,7 +15,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.1
-Release: 4
+Release: 4%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/



From notting at fedoraproject.org  Wed Apr 15 16:14:08 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 15 Apr 2009 16:14:08 +0000 (UTC)
Subject: rpms/mash/F-11 .cvsignore, 1.40, 1.41 mash.spec, 1.46, 1.47 sources,
	1.42, 1.43 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch,
	1.1, NONE
Message-ID: <20090415161408.0080C70101@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25418

Modified Files:
	.cvsignore mash.spec sources 
Removed Files:
	0001-Add-the-F11-Test-key-to-the-rawhide-config.patch 
Log Message:
0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	8 Jan 2009 18:16:46 -0000	1.40
+++ .cvsignore	15 Apr 2009 16:13:36 -0000	1.41
@@ -1 +1 @@
-mash-0.4.9.tar.gz
+mash-0.5.0.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/mash.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mash.spec	10 Mar 2009 05:36:41 -0000	1.46
+++ mash.spec	15 Apr 2009 16:13:36 -0000	1.47
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.4.9
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -13,7 +13,6 @@
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
-Patch0:         0001-Add-the-F11-Test-key-to-the-rawhide-config.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -46,11 +44,10 @@
 /var/cache/mash
 
 %changelog
-* Mon Mar 09 2009 Jesse Keating <jkeating at redhat.com> - 0.4.9-3
-- Add an upstream patch for F11 test key
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 15 2009 Bill Nottingham <notting at redhat.com> 0.5.0-1
+- Add support for generating deltas with createrepo
+- add F11 key to config (<jkeating at redhat.com>)
+- various multlib updates (#485242, etc.)
 
 * Thu Jan  8 2009 Bill Nottingham <notting at redhat.com> 0.4.9-1
 - error out if strict_keys is set and we can't download the signed package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Jan 2009 18:16:46 -0000	1.42
+++ sources	15 Apr 2009 16:13:36 -0000	1.43
@@ -1 +1 @@
-7306348a2a2dec270bc03e348817683b  mash-0.4.9.tar.gz
+7929f47e4386306c8420b3644333a23c  mash-0.5.0.tar.gz


--- 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch DELETED ---



From twaugh at fedoraproject.org  Wed Apr 15 16:25:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 15 Apr 2009 16:25:09 +0000 (UTC)
Subject: rpms/ghostscript/F-11 ghostscript-CVE-2009-0196.patch, NONE,
	1.1 ghostscript-CVE-2009-0792.patch, NONE, 1.1 ghostscript.spec,
	1.184, 1.185
Message-ID: <20090415162509.E2E7F70101@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30064

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2009-0196.patch 
	ghostscript-CVE-2009-0792.patch 
Log Message:
* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.64-6
- Applied patch to fix CVE-2009-0792 (bug #491853).
- Applied patch to fix CVE-2009-0196 (bug #493379).


ghostscript-CVE-2009-0196.patch:

--- NEW FILE ghostscript-CVE-2009-0196.patch ---
diff -up ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196 ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c
--- ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196	2007-12-11 08:29:58.000000000 +0000
+++ ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c	2009-04-15 16:27:43.000000000 +0100
@@ -699,6 +699,15 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
         exrunlength = params->SDNUMEXSYMS;
       else
         code = jbig2_arith_int_decode(IAEX, as, &exrunlength);
+      if (exrunlength > params->SDNUMEXSYMS - j) {
+        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+          "runlength too large in export symbol table (%d > %d - %d)\n",
+          exrunlength, params->SDNUMEXSYMS, j);
+        jbig2_sd_release(ctx, SDEXSYMS);
+        /* skip to the cleanup code and return SDEXSYMS = NULL */
+        SDEXSYMS = NULL;
+        break;
+      }
       for(k = 0; k < exrunlength; k++)
         if (exflag) {
           SDEXSYMS->glyphs[j++] = (i < m) ? 

ghostscript-CVE-2009-0792.patch:

--- NEW FILE ghostscript-CVE-2009-0792.patch ---
diff -up ghostscript-8.64/icclib/icc.c.CVE-2009-0792 ghostscript-8.64/icclib/icc.c
--- ghostscript-8.64/icclib/icc.c.CVE-2009-0792	2009-04-15 16:20:04.000000000 +0100
+++ ghostscript-8.64/icclib/icc.c	2009-04-15 16:20:24.000000000 +0100
@@ -2982,7 +2982,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3004,6 +3004,11 @@ static int icmTable_setup_bwd(
 ) {
 	int i;
 
+	if (size > INT_MAX - 2)
+		/* Although rt->size is unsigned long, the rt data
+		 * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3022,7 +3027,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(int *))) == NULL) {
+	if ((rt->rlists = (int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3035,6 +3040,15 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+		/* s and e should both be in the range [0,rt->rsize]
+		 * now, but let's not rely on floating point
+		 * calculations -- double-check. */
+		if (s < 0)
+			s = 0;
+		if (e < 0)
+			e = 0;
+		if (s >= rt->rsize)
+			s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3053,6 +3067,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+					if (as > INT_MAX / 2 / sizeof (int))
+						return 2;
+
 					as *= 2;
 					rt->rlists[j] = (int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3104,7 +3121,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+	if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3131,6 +3148,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+	/* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -3671,7 +3689,7 @@ static int icmData_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned char *) icp->al->malloc(icp->al, p->size * sizeof(unsigned char))) == NULL) {
+		if ((p->data = (unsigned char *) icp->al->calloc(icp->al, p->size, sizeof(unsigned char))) == NULL) {
 			sprintf(icp->err,"icmData_alloc: malloc() of icmData data failed");
 			return icp->errc = 2;
 		}
@@ -3887,7 +3905,7 @@ static int icmText_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->data = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmText_alloc: malloc() of icmText data failed");
 			return icp->errc = 2;
 		}
@@ -4301,7 +4319,7 @@ double *in		/* Input array[inputChan] */
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->inputEnt-2))
+		if (ix < 0 || ix > (p->inputEnt-2))
 			ix = (p->inputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -4360,7 +4378,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4433,7 +4451,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4506,7 +4524,7 @@ double *in		/* Input array[outputChan] *
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->outputEnt-2))
+		if (ix < 0 || ix > (p->outputEnt-2))
 			ix = (p->outputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -6714,7 +6732,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -7888,7 +7906,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8827,7 +8845,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+		if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8837,7 +8855,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+			if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-11/ghostscript.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ghostscript.spec	20 Mar 2009 12:35:56 -0000	1.184
+++ ghostscript.spec	15 Apr 2009 16:24:39 -0000	1.185
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -23,6 +23,8 @@
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-bitcmyk.patch
 Patch9: ghostscript-CVE-2009-0583,0584.patch
+Patch10: ghostscript-CVE-2009-0792.patch
+Patch11: ghostscript-CVE-2009-0196.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -113,6 +115,12 @@
 # (bug #487744).
 %patch9 -p1 -b .CVE-2009-0583,0584
 
+# Applied patch to fix CVE-2009-0792 (bug #491853).
+%patch10 -p1 -b .CVE-2009-0792
+
+# Applied patch to fix CVE-2009-0196 (bug #493379).
+%patch11 -p1 -b .CVE-2009-0196
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -294,6 +302,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.64-6
+- Applied patch to fix CVE-2009-0792 (bug #491853).
+- Applied patch to fix CVE-2009-0196 (bug #493379).
+
 * Fri Mar 20 2009 Tim Waugh <twaugh at redhat.com> 8.64-5
 - Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
   (bug #487744).



From twaugh at fedoraproject.org  Wed Apr 15 16:25:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 15 Apr 2009 16:25:32 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript-CVE-2009-0196.patch, NONE,
	1.1 ghostscript-CVE-2009-0792.patch, NONE, 1.1 ghostscript.spec,
	1.184, 1.185
Message-ID: <20090415162532.DB41170101@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30225

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2009-0196.patch 
	ghostscript-CVE-2009-0792.patch 
Log Message:
* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.64-6
- Applied patch to fix CVE-2009-0792 (bug #491853).
- Applied patch to fix CVE-2009-0196 (bug #493379).


ghostscript-CVE-2009-0196.patch:

--- NEW FILE ghostscript-CVE-2009-0196.patch ---
diff -up ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196 ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c
--- ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196	2007-12-11 08:29:58.000000000 +0000
+++ ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c	2009-04-15 16:27:43.000000000 +0100
@@ -699,6 +699,15 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
         exrunlength = params->SDNUMEXSYMS;
       else
         code = jbig2_arith_int_decode(IAEX, as, &exrunlength);
+      if (exrunlength > params->SDNUMEXSYMS - j) {
+        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+          "runlength too large in export symbol table (%d > %d - %d)\n",
+          exrunlength, params->SDNUMEXSYMS, j);
+        jbig2_sd_release(ctx, SDEXSYMS);
+        /* skip to the cleanup code and return SDEXSYMS = NULL */
+        SDEXSYMS = NULL;
+        break;
+      }
       for(k = 0; k < exrunlength; k++)
         if (exflag) {
           SDEXSYMS->glyphs[j++] = (i < m) ? 

ghostscript-CVE-2009-0792.patch:

--- NEW FILE ghostscript-CVE-2009-0792.patch ---
diff -up ghostscript-8.64/icclib/icc.c.CVE-2009-0792 ghostscript-8.64/icclib/icc.c
--- ghostscript-8.64/icclib/icc.c.CVE-2009-0792	2009-04-15 16:20:04.000000000 +0100
+++ ghostscript-8.64/icclib/icc.c	2009-04-15 16:20:24.000000000 +0100
@@ -2982,7 +2982,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3004,6 +3004,11 @@ static int icmTable_setup_bwd(
 ) {
 	int i;
 
+	if (size > INT_MAX - 2)
+		/* Although rt->size is unsigned long, the rt data
+		 * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3022,7 +3027,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(int *))) == NULL) {
+	if ((rt->rlists = (int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3035,6 +3040,15 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+		/* s and e should both be in the range [0,rt->rsize]
+		 * now, but let's not rely on floating point
+		 * calculations -- double-check. */
+		if (s < 0)
+			s = 0;
+		if (e < 0)
+			e = 0;
+		if (s >= rt->rsize)
+			s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3053,6 +3067,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+					if (as > INT_MAX / 2 / sizeof (int))
+						return 2;
+
 					as *= 2;
 					rt->rlists[j] = (int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3104,7 +3121,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+	if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3131,6 +3148,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+	/* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -3671,7 +3689,7 @@ static int icmData_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned char *) icp->al->malloc(icp->al, p->size * sizeof(unsigned char))) == NULL) {
+		if ((p->data = (unsigned char *) icp->al->calloc(icp->al, p->size, sizeof(unsigned char))) == NULL) {
 			sprintf(icp->err,"icmData_alloc: malloc() of icmData data failed");
 			return icp->errc = 2;
 		}
@@ -3887,7 +3905,7 @@ static int icmText_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->data = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmText_alloc: malloc() of icmText data failed");
 			return icp->errc = 2;
 		}
@@ -4301,7 +4319,7 @@ double *in		/* Input array[inputChan] */
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->inputEnt-2))
+		if (ix < 0 || ix > (p->inputEnt-2))
 			ix = (p->inputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -4360,7 +4378,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4433,7 +4451,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4506,7 +4524,7 @@ double *in		/* Input array[outputChan] *
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->outputEnt-2))
+		if (ix < 0 || ix > (p->outputEnt-2))
 			ix = (p->outputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -6714,7 +6732,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -7888,7 +7906,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8827,7 +8845,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+		if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8837,7 +8855,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+			if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ghostscript.spec	20 Mar 2009 12:35:56 -0000	1.184
+++ ghostscript.spec	15 Apr 2009 16:25:02 -0000	1.185
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -23,6 +23,8 @@
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-bitcmyk.patch
 Patch9: ghostscript-CVE-2009-0583,0584.patch
+Patch10: ghostscript-CVE-2009-0792.patch
+Patch11: ghostscript-CVE-2009-0196.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -113,6 +115,12 @@
 # (bug #487744).
 %patch9 -p1 -b .CVE-2009-0583,0584
 
+# Applied patch to fix CVE-2009-0792 (bug #491853).
+%patch10 -p1 -b .CVE-2009-0792
+
+# Applied patch to fix CVE-2009-0196 (bug #493379).
+%patch11 -p1 -b .CVE-2009-0196
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -294,6 +302,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.64-6
+- Applied patch to fix CVE-2009-0792 (bug #491853).
+- Applied patch to fix CVE-2009-0196 (bug #493379).
+
 * Fri Mar 20 2009 Tim Waugh <twaugh at redhat.com> 8.64-5
 - Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
   (bug #487744).



From toshio at fedoraproject.org  Wed Apr 15 16:44:34 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 15 Apr 2009 16:44:34 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.127,1.128
Message-ID: <20090415164434.AED5E70101@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3273

Modified Files:
	mono.spec 
Log Message:

* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-18
- Enable bootstrap code and ppc64.  If this succeeds we'll build -19 right
  afterwards with bootstrap code turned off.
  Remember: you can't merge the ppc64 enabling to older branches without first
  bootstrapping once.



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mono.spec	14 Apr 2009 23:52:01 -0000	1.127
+++ mono.spec	15 Apr 2009 16:44:03 -0000	1.128
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        17%{?dist}
+Release:        17%{?dist}.1
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -31,10 +31,10 @@
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-BuildRequires: mono-core
+#BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -305,7 +305,7 @@
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-rm -rf mcs/class/lib/monolite/*
+#rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -720,6 +720,12 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-18
+- Enable bootstrap code and ppc64.  If this succeeds we'll build -19 right
+  afterwards with bootstrap code turned off.
+  Remember: you can't merge the ppc64 enabling to older branches without first
+  bootstrapping once.
+
 * Tue Apr 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-17
 - Update to 2.4 final.
 - Statically link mono to libmono to work around bz #494026



From twaugh at fedoraproject.org  Wed Apr 15 16:47:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 15 Apr 2009 16:47:02 +0000 (UTC)
Subject: rpms/ghostscript/F-9 ghostscript-CVE-2008-6679.patch, NONE,
	1.1 ghostscript-CVE-2009-0196.patch, NONE,
	1.1 ghostscript-CVE-2009-0792.patch, NONE, 1.1 ghostscript.spec,
	1.175, 1.176
Message-ID: <20090415164702.7B83870101@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4112

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2008-6679.patch 
	ghostscript-CVE-2009-0196.patch 
	ghostscript-CVE-2009-0792.patch 
Log Message:
* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.63-3
- Applied patch to fix CVE-2009-0792 (bug #491853).
- Applied patch to fix CVE-2009-0196 (bug #493379).
- Applied patch to fix CVE-2008-6679 (bug #493445).


ghostscript-CVE-2008-6679.patch:

--- NEW FILE ghostscript-CVE-2008-6679.patch ---
diff -up ghostscript-8.63/src/gdevpdtb.c.CVE-2008-6679 ghostscript-8.63/src/gdevpdtb.c
--- ghostscript-8.63/src/gdevpdtb.c.CVE-2008-6679	2008-04-04 09:53:57.000000000 +0100
+++ ghostscript-8.63/src/gdevpdtb.c	2009-04-15 16:57:25.000000000 +0100
@@ -133,7 +133,7 @@ pdf_base_font_alloc(gx_device_pdf *pdev,
 			&st_pdf_base_font, "pdf_base_font_alloc");
     const gs_font_name *pfname = &font->font_name;
     gs_const_string font_name;
-    char fnbuf[3 + sizeof(long) / 3 + 1]; /* .F#######\0 */
+    char fnbuf[2*sizeof(long) + 3]; /* .F########\0 */
     int code;
 
     if (pbfont == 0)

ghostscript-CVE-2009-0196.patch:

--- NEW FILE ghostscript-CVE-2009-0196.patch ---
diff -up ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196 ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c
--- ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196	2007-12-11 08:29:58.000000000 +0000
+++ ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c	2009-04-15 16:55:34.000000000 +0100
@@ -699,6 +699,15 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
         exrunlength = params->SDNUMEXSYMS;
       else
         code = jbig2_arith_int_decode(IAEX, as, &exrunlength);
+      if (exrunlength > params->SDNUMEXSYMS - j) {
+        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+          "runlength too large in export symbol table (%d > %d - %d)\n",
+          exrunlength, params->SDNUMEXSYMS, j);
+        jbig2_sd_release(ctx, SDEXSYMS);
+        /* skip to the cleanup code and return SDEXSYMS = NULL */
+        SDEXSYMS = NULL;
+        break;
+      }
       for(k = 0; k < exrunlength; k++)
         if (exflag) {
           SDEXSYMS->glyphs[j++] = (i < m) ? 

ghostscript-CVE-2009-0792.patch:

--- NEW FILE ghostscript-CVE-2009-0792.patch ---
diff -up ghostscript-8.63/icclib/icc.c.CVE-2009-0792 ghostscript-8.63/icclib/icc.c
--- ghostscript-8.63/icclib/icc.c.CVE-2009-0792	2009-04-15 16:48:05.000000000 +0100
+++ ghostscript-8.63/icclib/icc.c	2009-04-15 16:50:18.000000000 +0100
@@ -2982,7 +2982,7 @@ static int icmCurve_lookup_fwd(
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Coordinate */
-		if (ix > (p->size-2))
+		if (ix < 0 || ix > (p->size-2))
 			ix = (p->size-2);
 		w = val - (double)ix;		/* weight */
 		val = p->data[ix];
@@ -3004,6 +3004,11 @@ static int icmTable_setup_bwd(
 ) {
 	int i;
 
+	if (size > INT_MAX - 2)
+		/* Although rt->size is unsigned long, the rt data
+		 * structure uses int data types to store indices. */
+		return 2;
+
 	rt->size = size;		/* Stash pointers to these away */
 	rt->data = data;
 	
@@ -3022,7 +3027,7 @@ static int icmTable_setup_bwd(
 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
 	
 	/* Initialize the reverse lookup structures, and get overall min/max */
-	if ((rt->rlists = (int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(int *))) == NULL) {
+	if ((rt->rlists = (int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
 		return 2;
 	}
 
@@ -3035,6 +3040,15 @@ static int icmTable_setup_bwd(
 			int t;
 			t = s; s = e; e = t;
 		}
+		/* s and e should both be in the range [0,rt->rsize]
+		 * now, but let's not rely on floating point
+		 * calculations -- double-check. */
+		if (s < 0)
+			s = 0;
+		if (e < 0)
+			e = 0;
+		if (s >= rt->rsize)
+			s = rt->rsize-1;
 		if (e >= rt->rsize)
 			e = rt->rsize-1;
 
@@ -3053,6 +3067,9 @@ static int icmTable_setup_bwd(
 				as = rt->rlists[j][0];	/* Allocate space for this list */
 				nf = rt->rlists[j][1];	/* Next free location in list */
 				if (nf >= as) {			/* need to expand space */
+					if (as > INT_MAX / 2 / sizeof (int))
+						return 2;
+
 					as *= 2;
 					rt->rlists[j] = (int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(int) * as);
 					if (rt->rlists[j] == NULL) {
@@ -3104,7 +3121,7 @@ static int icmTable_lookup_bwd(
 		val = rsize_1;
 	ix = (int)floor(val);		/* Coordinate */
 
-	if (ix > (rt->size-2))
+	if (ix < 0 || ix > (rt->size-2))
 		ix = (rt->size-2);
 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
 		/* For each candidate forward range */
@@ -3131,6 +3148,7 @@ static int icmTable_lookup_bwd(
 	/* We have failed to find an exact value, so return the nearest value */
 	/* (This is slow !) */
 	val = fabs(ival - rt->data[0]);
+	/* rt->size is known to be < INT_MAX */
 	for (k = 0, i = 1; i < rt->size; i++) {
 		double er;
 		er = fabs(ival - rt->data[i]);
@@ -3671,7 +3689,7 @@ static int icmData_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned char *) icp->al->malloc(icp->al, p->size * sizeof(unsigned char))) == NULL) {
+		if ((p->data = (unsigned char *) icp->al->calloc(icp->al, p->size, sizeof(unsigned char))) == NULL) {
 			sprintf(icp->err,"icmData_alloc: malloc() of icmData data failed");
 			return icp->errc = 2;
 		}
@@ -3887,7 +3905,7 @@ static int icmText_allocate(
 	if (p->size != p->_size) {
 		if (p->data != NULL)
 			icp->al->free(icp->al, p->data);
-		if ((p->data = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->data = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmText_alloc: malloc() of icmText data failed");
 			return icp->errc = 2;
 		}
@@ -4301,7 +4319,7 @@ double *in		/* Input array[inputChan] */
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->inputEnt-2))
+		if (ix < 0 || ix > (p->inputEnt-2))
 			ix = (p->inputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -4360,7 +4378,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4433,7 +4451,7 @@ double *in		/* Input array[outputChan] *
 				rv |= 1;
 			}
 			x = (int)floor(val);		/* Grid coordinate */
-			if (x > clutPoints_2)
+			if (x < 0 || x > clutPoints_2)
 				x = clutPoints_2;
 			co[e] = val - (double)x;	/* 1.0 - weight */
 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
@@ -4506,7 +4524,7 @@ double *in		/* Input array[outputChan] *
 			rv |= 1;
 		}
 		ix = (int)floor(val);		/* Grid coordinate */
-		if (ix > (p->outputEnt-2))
+		if (ix < 0 || ix > (p->outputEnt-2))
 			ix = (p->outputEnt-2);
 		w = val - (double)ix;		/* weight */
 		val = table[ix];
@@ -6714,7 +6732,7 @@ static int icmTextDescription_allocate(
 	if (p->size != p->_size) {
 		if (p->desc != NULL)
 			icp->al->free(icp->al, p->desc);
-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
 			return icp->errc = 2;
 		}
@@ -7888,7 +7906,7 @@ static int icmUcrBg_allocate(
 	if (p->size != p->_size) {
 		if (p->string != NULL)
 			icp->al->free(icp->al, p->string);
-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
+		if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8827,7 +8845,7 @@ static int icmCrdInfo_allocate(
 	if (p->ppsize != p->_ppsize) {
 		if (p->ppname != NULL)
 			icp->al->free(icp->al, p->ppname);
-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
+		if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
 			return icp->errc = 2;
 		}
@@ -8837,7 +8855,7 @@ static int icmCrdInfo_allocate(
 		if (p->crdsize[t] != p->_crdsize[t]) {
 			if (p->crdname[t] != NULL)
 				icp->al->free(icp->al, p->crdname[t]);
-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
+			if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
 				return icp->errc = 2;
 			}


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-9/ghostscript.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ghostscript.spec	20 Mar 2009 12:36:05 -0000	1.175
+++ ghostscript.spec	15 Apr 2009 16:46:31 -0000	1.176
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -22,6 +22,9 @@
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-CVE-2009-0583,0584.patch
+Patch9: ghostscript-CVE-2009-0792.patch
+Patch10: ghostscript-CVE-2009-0196.patch
+Patch11: ghostscript-CVE-2008-6679.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -101,6 +104,15 @@
 # (bug #487744).
 %patch8 -p1 -b .CVE-2009-0583,0584
 
+# Applied patch to fix CVE-2009-0792 (bug #491853).
+%patch9 -p1 -b .CVE-2009-0792
+
+# Applied patch to fix CVE-2009-0196 (bug #493379).
+%patch10 -p1 -b .CVE-2009-0196
+
+# Applied patch to fix CVE-2008-6679 (bug #493445).
+%patch11 -p1 -b .CVE-2008-6679
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -279,6 +291,11 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Apr 15 2009 Tim Waugh <twaugh at redhat.com> 8.63-3
+- Applied patch to fix CVE-2009-0792 (bug #491853).
+- Applied patch to fix CVE-2009-0196 (bug #493379).
+- Applied patch to fix CVE-2008-6679 (bug #493445).
+
 * Fri Mar 20 2009 Tim Waugh <twaugh at redhat.com> 8.63-2
 - Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
   (bug #487744).



From jakub at fedoraproject.org  Wed Apr 15 16:54:08 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 15 Apr 2009 16:54:08 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.270, 1.271 glibc-fedora.patch, 1.303, 
	1.304 glibc.spec, 1.393, 1.394 import.log, 1.14, 1.15 sources,
	1.295, 1.296
Message-ID: <20090415165408.AC02870101@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6756/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- .cvsignore	14 Apr 2009 21:28:24 -0000	1.270
+++ .cvsignore	15 Apr 2009 16:53:35 -0000	1.271
@@ -1,2 +1,2 @@
-glibc-20090414T2104.tar.bz2
-glibc-fedora-20090414T2104.tar.bz2
+glibc-20090415T1619.tar.bz2
+glibc-fedora-20090415T1619.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- glibc-fedora.patch	14 Apr 2009 21:28:25 -0000	1.303
+++ glibc-fedora.patch	15 Apr 2009 16:53:35 -0000	1.304
@@ -1,6 +1,6 @@
---- glibc-20090414T2104/ChangeLog	14 Apr 2009 20:57:17 -0000	1.11588
-+++ glibc-20090414T2104-fedora/ChangeLog	14 Apr 2009 21:18:54 -0000	1.8782.2.328
-@@ -7217,6 +7217,13 @@
+--- glibc-20090415T1619/ChangeLog	15 Apr 2009 15:57:47 -0000	1.11594
++++ glibc-20090415T1619-fedora/ChangeLog	15 Apr 2009 16:37:02 -0000	1.8782.2.329
+@@ -7263,6 +7263,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7512,6 +7519,10 @@
+@@ -7558,6 +7565,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8769,6 +8780,15 @@
+@@ -8815,6 +8826,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090414T2104/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090414T2104-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090415T1619/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090415T1619-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090414T2104/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090414T2104-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090415T1619/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090415T1619-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090414T2104/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090414T2104-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090415T1619/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090415T1619-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090414T2104/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090414T2104-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090415T1619/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090415T1619-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090414T2104/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090414T2104-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090415T1619/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090415T1619-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090414T2104/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090414T2104-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090415T1619/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090415T1619-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090414T2104/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090414T2104-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090415T1619/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090415T1619-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090414T2104/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090414T2104-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090415T1619/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090415T1619-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090414T2104/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090415T1619/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090414T2104/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090415T1619/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090414T2104/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090414T2104-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090415T1619/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090415T1619-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090414T2104/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090414T2104-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090415T1619/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090415T1619-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090414T2104/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090414T2104-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090415T1619/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090415T1619-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090414T2104/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090414T2104-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090415T1619/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090415T1619-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090414T2104/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090414T2104-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090415T1619/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090415T1619-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090414T2104/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090414T2104-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090415T1619/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090415T1619-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090414T2104/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090414T2104-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090415T1619/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090415T1619-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090414T2104/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090414T2104-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090415T1619/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090415T1619-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090414T2104/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090415T1619/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090414T2104/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090414T2104-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090415T1619/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090415T1619-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090414T2104/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090414T2104-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090415T1619/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090415T1619-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090414T2104/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090414T2104-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090415T1619/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090415T1619-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090414T2104/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090414T2104-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090415T1619/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090415T1619-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090414T2104/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090414T2104-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090415T1619/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090415T1619-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090414T2104/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090414T2104-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090415T1619/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090415T1619-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090414T2104/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090414T2104-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090415T1619/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090415T1619-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090414T2104/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090414T2104-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090415T1619/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090415T1619-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090414T2104/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090415T1619/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090414T2104/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090414T2104-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090415T1619/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090415T1619-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090414T2104/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090414T2104-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090415T1619/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090415T1619-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090414T2104/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090414T2104-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090415T1619/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090415T1619-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090414T2104/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090414T2104-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090415T1619/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090415T1619-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090414T2104/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090415T1619/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090414T2104/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090414T2104-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090415T1619/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090415T1619-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090414T2104/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090414T2104-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090415T1619/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090415T1619-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090414T2104/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090414T2104-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090415T1619/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090415T1619-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090414T2104/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090414T2104-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090415T1619/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090415T1619-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090414T2104/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090414T2104-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090415T1619/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090415T1619-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090414T2104/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090415T1619/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090414T2104/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090414T2104-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090415T1619/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090415T1619-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090414T2104/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090414T2104-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090415T1619/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090415T1619-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090415T1619/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- glibc.spec	14 Apr 2009 21:28:25 -0000	1.393
+++ glibc.spec	15 Apr 2009 16:53:36 -0000	1.394
@@ -1,6 +1,6 @@
-%define glibcdate 20090414T2104
+%define glibcdate 20090415T1619
 %define glibcname glibc
-%define glibcsrcdir glibc-20090414T2104
+%define glibcsrcdir glibc-20090415T1619
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 16
+Release: 17
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,11 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-17
+- update from trunk
+  - if threads have very small stack sizes, use much smaller buffer
+    in __get_nprocs when called from within malloc (#494631)
+
 * Tue Apr 14 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-16
 - update from trunk
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	14 Apr 2009 21:28:25 -0000	1.14
+++ import.log	15 Apr 2009 16:53:36 -0000	1.15
@@ -12,3 +12,4 @@
 glibc-2_9_90-14:HEAD:glibc-2.9.90-14.src.rpm:1239208984
 glibc-2_9_90-15:HEAD:glibc-2.9.90-15.src.rpm:1239312092
 glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476
+glibc-2_9_90-17:F-11:glibc-2.9.90-17.src.rpm:1239814311


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- sources	14 Apr 2009 21:28:25 -0000	1.295
+++ sources	15 Apr 2009 16:53:36 -0000	1.296
@@ -1,2 +1,2 @@
-3ebf1a888adc2664139dd0e471f9db36  glibc-20090414T2104.tar.bz2
-d0eaef4a6c4f78b4951471429277944d  glibc-fedora-20090414T2104.tar.bz2
+0b663ed169beecf35f4731a00dd9e8de  glibc-20090415T1619.tar.bz2
+086b93c85f8925c113aa1ea42992a8b0  glibc-fedora-20090415T1619.tar.bz2



From kyle at fedoraproject.org  Wed Apr 15 16:59:56 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 15 Apr 2009 16:59:56 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc2.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1049, 1.1050 kernel.spec, 1.1517, 1.1518 sources, 1.1011,
	1.1012 upstream, 1.922, 1.923 patch-2.6.30-rc1-git7.bz2.sign,
	1.1, NONE patch-2.6.30-rc1.bz2.sign, 1.1,
	NONE ppc-fix-parport_pc.patch, 1.1, NONE
Message-ID: <20090415165956.44F8170101@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8797

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc2.bz2.sign 
Removed Files:
	patch-2.6.30-rc1-git7.bz2.sign patch-2.6.30-rc1.bz2.sign 
	ppc-fix-parport_pc.patch 
Log Message:
* Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.30-rc2



--- NEW FILE patch-2.6.30-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ5UEqyGugalF9Dw4RAvoXAKCSJ/RITTmzoHrao6o7klS64QpzPwCdFC9Q
mT55+AMFSBxiC5PcsT8Duz4=
=NLHx
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1049
retrieving revision 1.1050
diff -u -r1.1049 -r1.1050
--- .cvsignore	14 Apr 2009 14:43:53 -0000	1.1049
+++ .cvsignore	15 Apr 2009 16:59:24 -0000	1.1050
@@ -6,5 +6,4 @@
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
-patch-2.6.30-rc1.bz2
-patch-2.6.30-rc1-git7.bz2
+patch-2.6.30-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1517
retrieving revision 1.1518
diff -u -r1.1517 -r1.1518
--- kernel.spec	14 Apr 2009 14:43:53 -0000	1.1517
+++ kernel.spec	15 Apr 2009 16:59:24 -0000	1.1518
@@ -56,9 +56,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 1
+%define rcrev 2
 # The git snapshot level
-%define gitrev 7
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -102,7 +102,7 @@
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 1
+%define rawhide_skip_docs 0
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -673,7 +673,6 @@
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
-Patch9000: ppc-fix-parport_pc.patch
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
@@ -1228,8 +1227,6 @@
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
-ApplyPatch ppc-fix-parport_pc.patch
-
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
@@ -1827,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc2
+
 * Tue Apr 14 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.30-rc1-git7
 - CONFIG_TOUCHSCREEN_AD7879_I2C=m


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1011
retrieving revision 1.1012
diff -u -r1.1011 -r1.1012
--- sources	14 Apr 2009 14:43:54 -0000	1.1011
+++ sources	15 Apr 2009 16:59:24 -0000	1.1012
@@ -1,3 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-05daeda25430fd13bbdb47b3481f7320  patch-2.6.30-rc1.bz2
-1fcc13228f445829af1e67b291cecebc  patch-2.6.30-rc1-git7.bz2
+4c58a960ae5130ec1126fe33409425d1  patch-2.6.30-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- upstream	14 Apr 2009 14:43:54 -0000	1.922
+++ upstream	15 Apr 2009 16:59:25 -0000	1.923
@@ -1,3 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.30-rc1.bz2
-patch-2.6.30-rc1-git7.bz2
+patch-2.6.30-rc2.bz2


--- patch-2.6.30-rc1-git7.bz2.sign DELETED ---


--- patch-2.6.30-rc1.bz2.sign DELETED ---


--- ppc-fix-parport_pc.patch DELETED ---



From harald at fedoraproject.org  Wed Apr 15 17:07:55 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 15 Apr 2009 17:07:55 +0000 (UTC)
Subject: rpms/udev/F-9 udev-CVE-2009-1185.patch, NONE,
	1.1 udev-118-sysconf.patch, 1.2, 1.3 udev.spec, 1.249, 1.250
Message-ID: <20090415170755.78A4270101@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11253

Modified Files:
	udev-118-sysconf.patch udev.spec 
Added Files:
	udev-CVE-2009-1185.patch 
Log Message:
* Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 124-3
- fix for CVE-2009-1185


udev-CVE-2009-1185.patch:

--- NEW FILE udev-CVE-2009-1185.patch ---
diff -ruNp udev-124~/udevd.c udev-124/udevd.c
--- udev-124~/udevd.c	2008-06-11 22:24:30.000000000 -0700
+++ udev-124/udevd.c	2009-04-08 16:30:06.000000000 -0700
@@ -753,16 +753,34 @@ static struct udevd_uevent_msg *get_netl
 	struct udevd_uevent_msg *msg;
 	int bufpos;
 	ssize_t size;
+	struct sockaddr_nl snl;
+	struct msghdr smsg;
+	struct iovec iov;
 	static char buffer[UEVENT_BUFFER_SIZE+512];
 	char *pos;
 
-	size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
+	iov.iov_base = buffer;
+	iov.iov_len = sizeof(buffer);
+
+	memset(&smsg, 0x00, sizeof(struct msghdr));
+	smsg.msg_name = &snl;
+	smsg.msg_namelen = sizeof(struct sockaddr_nl);
+	smsg.msg_iov = &iov;
+	smsg.msg_iovlen = 1;
+
+	size = recvmsg(uevent_netlink_sock, &smsg, 0);
 	if (size <  0) {
 		if (errno != EINTR)
 			err("unable to receive kernel netlink message: %s\n", strerror(errno));
 		return NULL;
 	}
 
+	if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) {
+		info("ignored netlink message from invalid group/sender %d/%d\n",
+		     snl.nl_groups, snl.nl_pid);
+		return NULL;
+	}
+
 	if ((size_t)size > sizeof(buffer)-1)
 		size = sizeof(buffer)-1;
 	buffer[size] = '\0';

udev-118-sysconf.patch:

Index: udev-118-sysconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-9/udev-118-sysconf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-118-sysconf.patch	4 Apr 2008 13:35:38 -0000	1.2
+++ udev-118-sysconf.patch	15 Apr 2009 17:07:54 -0000	1.3
@@ -1,18 +1,18 @@
-diff -up udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage.rules
---- udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf	2008-04-03 21:12:53.000000000 +0200
-+++ udev-120/etc/udev/rules.d/60-persistent-storage.rules	2008-04-04 14:11:35.000000000 +0200
-@@ -3,6 +3,8 @@
- # persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path}
- # scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
+diff -up udev-124/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-124/etc/udev/rules.d/60-persistent-storage.rules
+--- udev-124/etc/udev/rules.d/60-persistent-storage.rules.sysconf	2008-06-12 07:24:30.000000000 +0200
++++ udev-124/etc/udev/rules.d/60-persistent-storage.rules	2009-04-14 15:38:25.000000000 +0200
+@@ -6,6 +6,8 @@
+ # forward scsi device event to corresponding block device
+ ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
  
 +ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_end"
 +
  ACTION!="add|change", GOTO="persistent_storage_end"
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
  
-diff -up udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules
---- udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf	2008-04-03 21:12:53.000000000 +0200
-+++ udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules	2008-04-04 14:10:46.000000000 +0200
+diff -up udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules
+--- udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf	2008-06-12 07:24:30.000000000 +0200
++++ udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules	2009-04-14 15:38:25.000000000 +0200
 @@ -2,6 +2,8 @@
  
  # persistent storage links: /dev/tape/{by-id,by-path}
@@ -21,4 +21,4 @@
 +
  ACTION!="add|change", GOTO="persistent_storage_tape_end"
  
- KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
+ # type 8 devices are "Medium Changers"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-9/udev.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- udev.spec	6 Aug 2008 12:18:39 -0000	1.249
+++ udev.spec	15 Apr 2009 17:07:54 -0000	1.250
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 124
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -24,6 +24,7 @@
 Patch103: udev-089-nopie.patch
 Patch104: udev-091-lib64.patch
 Patch105: udev-vol_id-cdrom.patch
+Patch106: udev-CVE-2009-1185.patch
 
 Patch200: udev-120-rhrules.patch
 
@@ -83,6 +84,7 @@
 %patch103 -p1 -b .nopie
 %patch104 -p1 -b .lib64
 %patch105 -p1 -b .tray
+%patch106 -p1 -b .CVE-2009-1185
 
 %patch200 -p1 -b .rhrules
 
@@ -407,6 +409,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 124-3
+- fix for CVE-2009-1185
+
 * Wed Aug 06 2008 Harald Hoyer <harald at redhat.com> 124-2
 - added patch for cdrom tray close bug (rhbz#453095)
 - fixed udevadm syntax in start_udev (credits B.J.W. Polman)



From harald at fedoraproject.org  Wed Apr 15 17:08:27 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 15 Apr 2009 17:08:27 +0000 (UTC)
Subject: rpms/udev/F-10 udev-CVE-2009-1185.patch, NONE, 1.1 udev.spec, 1.254,
	1.255
Message-ID: <20090415170827.A1FF270101@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11285

Modified Files:
	udev.spec 
Added Files:
	udev-CVE-2009-1185.patch 
Log Message:
* Mon Nov 10 2008 Harald Hoyer <harald at redhat.com> 127-3
- added memory stick rules (bug #470096)


udev-CVE-2009-1185.patch:

--- NEW FILE udev-CVE-2009-1185.patch ---
diff -ruNp udev-124~/udevd.c udev-124/udevd.c
--- udev-124~/udev/udevd.c	2008-06-11 22:24:30.000000000 -0700
+++ udev-124/udev/udevd.c	2009-04-08 16:30:06.000000000 -0700
@@ -753,16 +753,34 @@ static struct udevd_uevent_msg *get_netl
 	struct udevd_uevent_msg *msg;
 	int bufpos;
 	ssize_t size;
+	struct sockaddr_nl snl;
+	struct msghdr smsg;
+	struct iovec iov;
 	static char buffer[UEVENT_BUFFER_SIZE+512];
 	char *pos;
 
-	size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
+	iov.iov_base = buffer;
+	iov.iov_len = sizeof(buffer);
+
+	memset(&smsg, 0x00, sizeof(struct msghdr));
+	smsg.msg_name = &snl;
+	smsg.msg_namelen = sizeof(struct sockaddr_nl);
+	smsg.msg_iov = &iov;
+	smsg.msg_iovlen = 1;
+
+	size = recvmsg(uevent_netlink_sock, &smsg, 0);
 	if (size <  0) {
 		if (errno != EINTR)
 			err("unable to receive kernel netlink message: %s\n", strerror(errno));
 		return NULL;
 	}
 
+	if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) {
+		info("ignored netlink message from invalid group/sender %d/%d\n",
+		     snl.nl_groups, snl.nl_pid);
+		return NULL;
+	}
+
 	if ((size_t)size > sizeof(buffer)-1)
 		size = sizeof(buffer)-1;
 	buffer[size] = '\0';


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-10/udev.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- udev.spec	10 Nov 2008 18:20:02 -0000	1.254
+++ udev.spec	15 Apr 2009 17:07:57 -0000	1.255
@@ -23,6 +23,7 @@
 Patch2: udev-127-volume_id-include-config.h.patch
 Patch3: udev-132-memstickrules.patch
 
+Patch101: udev-CVE-2009-1185.patch
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -98,6 +99,7 @@
 %patch1 -p1 -b .p1
 %patch2 -p1 -b .p2
 %patch3 -p1 -b .p3
+%patch101 -p1 -b .CVE-2009-1185
 %patch102 -p1 -b .sysconf
 
 %build



From kyle at fedoraproject.org  Wed Apr 15 17:12:33 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 15 Apr 2009 17:12:33 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1518,1.1519
Message-ID: <20090415171233.2F9B970101@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12596

Modified Files:
	kernel.spec 
Log Message:
verrel


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1518
retrieving revision 1.1519
diff -u -r1.1518 -r1.1519
--- kernel.spec	15 Apr 2009 16:59:24 -0000	1.1518
+++ kernel.spec	15 Apr 2009 17:12:32 -0000	1.1519
@@ -1824,7 +1824,7 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
-* Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com>
+* Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.57.rc2
 - 2.6.30-rc2
 
 * Tue Apr 14 2009 Kyle McMartin <kyle at redhat.com>



From harald at fedoraproject.org  Wed Apr 15 17:14:17 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 15 Apr 2009 17:14:17 +0000 (UTC)
Subject: rpms/udev/F-10 udev.spec,1.255,1.256
Message-ID: <20090415171417.BD9F270101@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13033

Modified Files:
	udev.spec 
Log Message:
* Wed Apr 15 2009 Harald Hoyer <harald at redhat.com> 127-4
- fix for CVE-2009-1185



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-10/udev.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- udev.spec	15 Apr 2009 17:07:57 -0000	1.255
+++ udev.spec	15 Apr 2009 17:13:46 -0000	1.256
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 127
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -372,6 +372,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Harald Hoyer <harald at redhat.com> 127-4
+- fix for CVE-2009-1185
+
 * Mon Nov 10 2008 Harald Hoyer <harald at redhat.com> 127-3
 - added memory stick rules (bug #470096)
 



From pmatilai at fedoraproject.org  Wed Apr 15 17:21:30 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Wed, 15 Apr 2009 17:21:30 +0000 (UTC)
Subject: rpms/sqlite/devel .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 sqlite.spec, 1.57, 1.58 sqlite-3.6.12-memalign.patch, 1.1, NONE
Message-ID: <20090415172130.D0A1770101@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15234

Modified Files:
	.cvsignore sources sqlite.spec 
Removed Files:
	sqlite-3.6.12-memalign.patch 
Log Message:
- update to 3.6.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	3 Apr 2009 09:49:27 -0000	1.25
+++ .cvsignore	15 Apr 2009 17:20:59 -0000	1.26
@@ -1 +1 @@
-sqlite-3.6.12.tar.gz
+sqlite-3.6.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	3 Apr 2009 09:49:27 -0000	1.25
+++ sources	15 Apr 2009 17:20:59 -0000	1.26
@@ -1 +1 @@
-13600865a69a3f54d2ac42a0d6b743db  sqlite-3.6.12.tar.gz
+652a01797e7538811e4997a5847bc026  sqlite-3.6.13.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sqlite.spec	9 Apr 2009 14:58:48 -0000	1.57
+++ sqlite.spec	15 Apr 2009 17:20:59 -0000	1.58
@@ -5,8 +5,8 @@
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.6.12
-Release: 3%{?dist}
+Version: 3.6.13
+Release: 1%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -16,7 +16,6 @@
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
 Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
 Patch3: sqlite-3.6.12-no-sqlite-doc.patch
-Patch4: sqlite-3.6.12-memalign.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 # libdl patch needs
@@ -80,7 +79,6 @@
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
 %patch3 -p1 -b .no-sqlite-doc
-%patch4 -p1 -b .align
 
 %build
 autoconf
@@ -157,6 +155,9 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.13-1
+- update to 3.6.13
+
 * Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 3.6.12-3
 - apply upstream patch for memory alignment issue (#494906)
 


--- sqlite-3.6.12-memalign.patch DELETED ---



From linville at fedoraproject.org  Wed Apr 15 17:37:57 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 15 Apr 2009 17:37:57 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore,1.6,1.7 iw.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <20090415173757.EF1FF70101@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20177

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Apr 2009 18:20:04 -0000	1.6
+++ .cvsignore	15 Apr 2009 17:37:23 -0000	1.7
@@ -1 +1 @@
-iw-0.9.11.tar.bz2
+iw-0.9.12.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iw.spec	6 Apr 2009 18:20:04 -0000	1.9
+++ iw.spec	15 Apr 2009 17:37:23 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           iw
-Version:        0.9.11
+Version:        0.9.12
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
@@ -43,6 +43,9 @@
 %doc COPYING
 
 %changelog
+* Mon Apr 15 2009 John W. Linville <linville at redhat.com> 0.9.12-1
+- Update to 0.9.12
+
 * Mon Apr  6 2009 John W. Linville <linville at redhat.com> 0.9.11-1
 - Update to 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Apr 2009 18:20:04 -0000	1.6
+++ sources	15 Apr 2009 17:37:23 -0000	1.7
@@ -1 +1 @@
-a8198e7f6bf41ead9e9ade3ec5cae9b2  iw-0.9.11.tar.bz2
+2aa919ff927dd9def151a87badfa111a  iw-0.9.12.tar.bz2



From linville at fedoraproject.org  Wed Apr 15 17:41:31 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 15 Apr 2009 17:41:31 +0000 (UTC)
Subject: rpms/iw/F-11 .cvsignore,1.6,1.7 iw.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <20090415174131.5079970101@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21277

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Apr 2009 18:20:04 -0000	1.6
+++ .cvsignore	15 Apr 2009 17:41:29 -0000	1.7
@@ -1 +1 @@
-iw-0.9.11.tar.bz2
+iw-0.9.12.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-11/iw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iw.spec	6 Apr 2009 18:20:04 -0000	1.9
+++ iw.spec	15 Apr 2009 17:41:29 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           iw
-Version:        0.9.11
+Version:        0.9.12
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
@@ -43,6 +43,9 @@
 %doc COPYING
 
 %changelog
+* Mon Apr 15 2009 John W. Linville <linville at redhat.com> 0.9.12-1
+- Update to 0.9.12
+
 * Mon Apr  6 2009 John W. Linville <linville at redhat.com> 0.9.11-1
 - Update to 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Apr 2009 18:20:04 -0000	1.6
+++ sources	15 Apr 2009 17:41:29 -0000	1.7
@@ -1 +1 @@
-a8198e7f6bf41ead9e9ade3ec5cae9b2  iw-0.9.11.tar.bz2
+2aa919ff927dd9def151a87badfa111a  iw-0.9.12.tar.bz2



From harald at fedoraproject.org  Wed Apr 15 17:42:27 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 15 Apr 2009 17:42:27 +0000 (UTC)
Subject: rpms/udev/devel udev-CVE-2009-1186.patch, NONE, 1.1 udev.spec, 1.271,
	1.272
Message-ID: <20090415174227.3632470101@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21684

Modified Files:
	udev.spec 
Added Files:
	udev-CVE-2009-1186.patch 
Log Message:
* Wed Apr 15 2009 Harald Hoyer <harald at redhat.com> 141-2
- fix for CVE-2009-1186 (bug #495052)
- Resolves: rhbz#495052


udev-CVE-2009-1186.patch:

--- NEW FILE udev-CVE-2009-1186.patch ---
--- udev-141/udev/lib/libudev-util.c.CVE-2009-1186	2009-04-08 09:04:26.000000000 -0400
+++ udev-141/udev/lib/libudev-util.c	2009-04-15 13:25:10.000000000 -0400
@@ -9,6 +9,7 @@
  * version 2.1 of the License, or (at your option) any later version.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -103,6 +104,9 @@ int util_log_priority(const char *priori
 
 size_t util_path_encode(char *s, size_t len)
 {
+        if (len == 0 || len > (SIZE_MAX - 1) / 4)
+               return 0;
+
 	char t[(len * 4)+1];
 	size_t i, j;
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- udev.spec	14 Apr 2009 13:47:31 -0000	1.271
+++ udev.spec	15 Apr 2009 17:42:26 -0000	1.272
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 141
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,11 +19,13 @@
 Source5: udev.sysconfig
 
 Patch102: udev-118-sysconf.patch
+Patch103: udev-CVE-2009-1186.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
+Requires(pre): /usr/bin/stat /sbin/pidof
 Requires(pre): MAKEDEV >= 0:3.11 /usr/bin/getent /usr/sbin/groupadd
 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
 BuildRequires: glib2-devel bison findutils MAKEDEV
@@ -92,6 +94,7 @@
 %setup -q  
 
 %patch102 -p1 -b .sysconf
+%patch103 -p1 -b .CVE-2009-1186
 
 %build
 %if %{with_static}
@@ -226,16 +229,29 @@
 getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
 getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
 
+# kill daemon if we are not in a chroot
+if test -f /proc/1/exe -a -d /proc/1/root; then
+	if test -x /usr/bin/stat -a "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
+		if test -x /sbin/udevd -a -x /sbin/pidof ; then
+			pid=$(/sbin/pidof -c udevd)
+			if [ -n "$pid" ]; then
+				kill $pid
+			fi
+		fi
+	fi
+fi
+exit 0
+
 %post
-if [ "$1" -gt 1 -a -x /sbin/pidof ]; then
-	pid=$(/sbin/pidof -c udevd)
-	if [ -n "$pid" ]; then
-		kill $pid
+# start daemon if we are not in a chroot
+if test -f /proc/1/exe -a -d /proc/1/root; then
+	if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
+		if test -x /sbin/udevd; then
 		/sbin/udevd -d
+		fi
 	fi
 fi
 
-/sbin/chkconfig --add udev-post
 exit 0
 
 %triggerpostun -- dev <= 0:3.12-1
@@ -379,6 +395,10 @@
 
 
 %changelog
+* Wed Apr 15 2009 Harald Hoyer <harald at redhat.com> 141-2
+- fix for CVE-2009-1186 (bug #495052)
+- Resolves: rhbz#495052
+
 * Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 141-1
 - version 141
 



From pingou at fedoraproject.org  Wed Apr 15 17:43:33 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 15 Apr 2009 17:43:33 +0000 (UTC)
Subject: rpms/rkward/F-10 rkward.spec,1.27,1.28
Message-ID: <20090415174333.3D71770101@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21863/F-10

Modified Files:
	rkward.spec 
Log Message:



Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-10/rkward.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rkward.spec	31 Mar 2009 08:02:24 -0000	1.27
+++ rkward.spec	15 Apr 2009 17:43:02 -0000	1.28
@@ -117,7 +117,7 @@
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0c-1
+* Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 0.5.0c-1
 - Update to version 0.5.0c
 - Remove the BuildRequires on PyQt-devel
 



From pingou at fedoraproject.org  Wed Apr 15 17:43:33 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 15 Apr 2009 17:43:33 +0000 (UTC)
Subject: rpms/rkward/F-9 rkward.spec,1.20,1.21
Message-ID: <20090415174333.AB65F70101@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21863/F-9

Modified Files:
	rkward.spec 
Log Message:



Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-9/rkward.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rkward.spec	31 Mar 2009 08:02:25 -0000	1.20
+++ rkward.spec	15 Apr 2009 17:43:03 -0000	1.21
@@ -117,7 +117,7 @@
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0c-1
+* Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 0.5.0c-1
 - Update to version 0.5.0c
 - Remove the BuildRequires on PyQt-devel
 



From pingou at fedoraproject.org  Wed Apr 15 17:43:34 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 15 Apr 2009 17:43:34 +0000 (UTC)
Subject: rpms/rkward/devel rkward.spec,1.31,1.32
Message-ID: <20090415174334.2652670101@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21863/devel

Modified Files:
	rkward.spec 
Log Message:



Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/rkward.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rkward.spec	31 Mar 2009 07:46:52 -0000	1.31
+++ rkward.spec	15 Apr 2009 17:43:03 -0000	1.32
@@ -117,7 +117,7 @@
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0c-1
+* Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 0.5.0c-1
 - Update to version 0.5.0c
 - Remove the BuildRequires on PyQt-devel
 



From spot at fedoraproject.org  Wed Apr 15 18:06:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 15 Apr 2009 18:06:52 +0000 (UTC)
Subject: rpms/tomcat5/F-10 tomcat5.spec,1.126,1.127
Message-ID: <20090415180652.7E86370101@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tomcat5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267/F-10

Modified Files:
	tomcat5.spec 
Log Message:
fix update ordering, CLASSPATH invocation, bring fixes from F-10 to later branches


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-10/tomcat5.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- tomcat5.spec	10 Dec 2008 18:51:18 -0000	1.126
+++ tomcat5.spec	15 Apr 2009 18:06:20 -0000	1.127
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 6.1%{dist}
+Release: 6.2%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -576,7 +576,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
 %if %{without_apisonly}
-export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar":${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
+export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar"
 # build initial path structure
 %{__install} -d -m 755 \
     ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
@@ -1361,6 +1361,12 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.27-6.2
+- preserve upgrade ordering, clean up CLASSPATH export
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.5.27-5.9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Dec 10 2008  David Walluck <dwalluck at redhat.com> 0:5.5.27-6.1
 - fix bug #473755
 - fix extra newline in initscript



From spot at fedoraproject.org  Wed Apr 15 18:06:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 15 Apr 2009 18:06:52 +0000 (UTC)
Subject: rpms/tomcat5/F-11 tomcat5-5.5.init, 1.10, 1.11 tomcat5.spec, 1.125, 
	1.126
Message-ID: <20090415180652.8768270137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tomcat5/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267/F-11

Modified Files:
	tomcat5-5.5.init tomcat5.spec 
Log Message:
fix update ordering, CLASSPATH invocation, bring fixes from F-10 to later branches


Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-11/tomcat5-5.5.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat5-5.5.init	13 Oct 2008 20:58:23 -0000	1.10
+++ tomcat5-5.5.init	15 Apr 2009 18:06:21 -0000	1.11
@@ -198,7 +198,7 @@
     else
         log_failure_msg
     fi
-    echo
+    #echo
     return $RETVAL
 }
 
@@ -250,19 +250,23 @@
                     fi
                     kill -9 $kpid
                 fi
-                log_success_msg
-                if [ "$count" -gt "0" ]; then
+                if [ "$STOP_VERBOSE" = "true" -a "$count" -gt "0" ]; then
                     echo -n -e "\n"
                 fi
+                log_success_msg
+            else
+                log_failure_msg
             fi
             rm -f /var/lock/subsys/$NAME /var/run/$NAME.pid
         else
             log_failure_msg
         fi
+    else
+        log_failure_msg
     fi
+    #echo
 }
 
-
 # See how we were called.
 case "$1" in
     start)


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-11/tomcat5.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- tomcat5.spec	25 Feb 2009 21:16:36 -0000	1.125
+++ tomcat5.spec	15 Apr 2009 18:06:21 -0000	1.126
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 5.9%{dist}
+Release: 6.2%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -110,6 +110,9 @@
 Patch19: %{name}-%{majversion}-connectors-util-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
+%if ! %{gcj_support}
+BuildArch: noarch
+%endif
 
 Buildrequires: jpackage-utils >= 0:1.7.4
 BuildRequires: java-1.6.0-devel
@@ -120,21 +123,22 @@
 %endif
 BuildRequires: ant-trax
 BuildRequires: xalan-j2
-BuildRequires: jakarta-commons-beanutils >= 1.7
+BuildRequires: jakarta-commons-beanutils >= 0:1.7
 BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 1.0
+BuildRequires: jakarta-commons-daemon >= 0:1.0.1
 BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
 BuildRequires: jakarta-commons-digester >= 0:1.7
 BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-fileupload >= 0:1.0
 BuildRequires: jakarta-commons-io >= 0:1.3
-BuildRequires: jakarta-commons-modeler >= 2.0
+BuildRequires: jakarta-commons-modeler >= 0:2.0
 BuildRequires: jakarta-commons-pool >= 0:1.2
 BuildRequires: jakarta-commons-launcher >= 0:0.9
 BuildRequires: jakarta-commons-el >= 0:1.0
 BuildRequires: junit >= 0:3.8.1
 BuildRequires: regexp >= 0:1.3
 BuildRequires: struts >= 0:1.2.9
+#BuildRequires: struts-taglib >= 0:1.3.8
 BuildRequires: xerces-j2 >= 0:2.7.1
 BuildRequires: zip
 # xml-commons-apis is needed by Xerces-J2
@@ -152,8 +156,6 @@
 # libgcj aot-compiled native libraries
 %if %{gcj_support}
 BuildRequires: java-gcj-compat-devel
-%else
-BuildArch:     noarch
 %endif
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(post): /bin/rm
@@ -166,23 +168,30 @@
 Requires(preun): findutils
 Requires(pre): %{_sbindir}/useradd
 Requires(pre): %{_sbindir}/groupadd
-Requires(post): jakarta-commons-dbcp-tomcat5
-Requires(post): jakarta-commons-collections-tomcat5
-Requires(post): jakarta-commons-pool-tomcat5
+Requires(post): jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
+Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
+Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
+Requires: jaf = 0:1.0.2
+Requires(post): jaf = 0:1.0.2
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): jakarta-commons-logging >= 0:1.0.4
+Requires: javamail = 0:1.3.1
+Requires(post): javamail = 0:1.3.1
+%if %{with_ecj}
+Requires: ecj >= 0:3.3.1.1
+Requires(post): ecj >= 0:3.3.1.1
+%endif
 %endif
 Requires: jpackage-utils >= 0:1.7.4
 # xml parsing packages
 Requires: xerces-j2 >= 0:2.7.1
 Requires: xml-commons-jaxp-1.3-apis
 # jakarta-commons packages
-Requires: jakarta-commons-daemon >= 1.0.1
+Requires: jakarta-commons-daemon >= 0:1.0.1
+Requires(post): jakarta-commons-daemon >= 0:1.0.1
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
 Requires: java-1.6.0-devel
-%if %{with_ecj}
-Requires: ecj >= 0:3.3.1.1
-Requires(post): ecj >= 0:3.3.1.1
-%endif
 # And it needs its own API subpackages for running
 Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
 Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
@@ -223,6 +232,7 @@
 Requires(pre): %{name} = %{epoch}:%{version}-%{release}
 Requires(postun): %{name} = %{epoch}:%{version}-%{release}
 Requires: struts >= 0:1.2.9
+#Requires: struts-taglib >= 0:1.3.8
 Requires(post): /bin/rm
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(post): findutils
@@ -231,6 +241,7 @@
 Requires(post): jakarta-commons-digester
 Requires(post): jakarta-commons-io
 Requires(post): struts
+#Requires(post): struts-taglib
 Requires(preun): findutils
 Requires(preun): /bin/rm
 
@@ -268,7 +279,7 @@
 %package jsp-%{jspspec}-api
 Group: Internet/WWW/Dynamic Content
 Requires: %{_sbindir}/update-alternatives
-Requires: servlet24
+Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 # We need this to indirectly get rid of legacy jsp included in old
 # servlet packages (one day we will be able to remove this)
 # Replace PreReq
@@ -330,8 +341,8 @@
 Group: Development/Compilers
 Summary: Libraries needed to run the Tomcat Web container (part)
 Requires(post): jpackage-utils >= 0:1.7.4
-Requires: jakarta-commons-modeler >= 2.0
-Requires(post): jakarta-commons-modeler >= 2.0
+Requires: jakarta-commons-modeler >= 0:2.0
+Requires(post): jakarta-commons-modeler >= 0:2.0
 # Other subpackages must go in first
 Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
 Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
@@ -406,6 +417,8 @@
     %{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
 %endif
 
+#find -type f -name '*.jsp' | xargs -t perl -pi -e 's/<html:html locale="true">/<html:html>/g'
+
 %build
 # remove pre-built binaries
 for dir in ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ; do
@@ -543,7 +556,7 @@
 unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-compiler.jar
 unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-runtime.jar \
   -x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
-unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
+unzip -qq %{_javadir}/ecj.jar -x META-INF/MANIFEST.MF
 cp -p %{SOURCE7} META-INF/MANIFEST.MF
 rm -f plugin.properties plugin.xml about.html jdtCompilerAdapter.jar META-INF/eclipse.inf
 zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar .
@@ -563,7 +576,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
 %if %{without_apisonly}
-export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar"
+export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar"
 # build initial path structure
 %{__install} -d -m 755 \
     ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
@@ -1190,8 +1203,8 @@
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
+#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
+#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
 #%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
 %endif
@@ -1348,9 +1361,16 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.27-6.2
+- preserve upgrade ordering, clean up CLASSPATH export
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.5.27-5.9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Wed Dec 10 2008  David Walluck <dwalluck at redhat.com> 0:5.5.27-6.1
+- fix bug #473755
+- fix extra newline in initscript
+
 * Wed Oct 22 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.9
 - revert jasper-eclipse location change as it won't work on noarch
 



From spot at fedoraproject.org  Wed Apr 15 18:06:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 15 Apr 2009 18:06:52 +0000 (UTC)
Subject: rpms/tomcat5/devel tomcat5-5.5.init, 1.10, 1.11 tomcat5.spec, 1.125,
	1.126
Message-ID: <20090415180652.C957070101@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267/devel

Modified Files:
	tomcat5-5.5.init tomcat5.spec 
Log Message:
fix update ordering, CLASSPATH invocation, bring fixes from F-10 to later branches


Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat5-5.5.init	13 Oct 2008 20:58:23 -0000	1.10
+++ tomcat5-5.5.init	15 Apr 2009 18:06:22 -0000	1.11
@@ -198,7 +198,7 @@
     else
         log_failure_msg
     fi
-    echo
+    #echo
     return $RETVAL
 }
 
@@ -250,19 +250,23 @@
                     fi
                     kill -9 $kpid
                 fi
-                log_success_msg
-                if [ "$count" -gt "0" ]; then
+                if [ "$STOP_VERBOSE" = "true" -a "$count" -gt "0" ]; then
                     echo -n -e "\n"
                 fi
+                log_success_msg
+            else
+                log_failure_msg
             fi
             rm -f /var/lock/subsys/$NAME /var/run/$NAME.pid
         else
             log_failure_msg
         fi
+    else
+        log_failure_msg
     fi
+    #echo
 }
 
-
 # See how we were called.
 case "$1" in
     start)


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- tomcat5.spec	25 Feb 2009 21:16:36 -0000	1.125
+++ tomcat5.spec	15 Apr 2009 18:06:22 -0000	1.126
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 5.9%{dist}
+Release: 6.2%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -110,6 +110,9 @@
 Patch19: %{name}-%{majversion}-connectors-util-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
+%if ! %{gcj_support}
+BuildArch: noarch
+%endif
 
 Buildrequires: jpackage-utils >= 0:1.7.4
 BuildRequires: java-1.6.0-devel
@@ -120,21 +123,22 @@
 %endif
 BuildRequires: ant-trax
 BuildRequires: xalan-j2
-BuildRequires: jakarta-commons-beanutils >= 1.7
+BuildRequires: jakarta-commons-beanutils >= 0:1.7
 BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 1.0
+BuildRequires: jakarta-commons-daemon >= 0:1.0.1
 BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
 BuildRequires: jakarta-commons-digester >= 0:1.7
 BuildRequires: jakarta-commons-logging >= 0:1.0.4
 BuildRequires: jakarta-commons-fileupload >= 0:1.0
 BuildRequires: jakarta-commons-io >= 0:1.3
-BuildRequires: jakarta-commons-modeler >= 2.0
+BuildRequires: jakarta-commons-modeler >= 0:2.0
 BuildRequires: jakarta-commons-pool >= 0:1.2
 BuildRequires: jakarta-commons-launcher >= 0:0.9
 BuildRequires: jakarta-commons-el >= 0:1.0
 BuildRequires: junit >= 0:3.8.1
 BuildRequires: regexp >= 0:1.3
 BuildRequires: struts >= 0:1.2.9
+#BuildRequires: struts-taglib >= 0:1.3.8
 BuildRequires: xerces-j2 >= 0:2.7.1
 BuildRequires: zip
 # xml-commons-apis is needed by Xerces-J2
@@ -152,8 +156,6 @@
 # libgcj aot-compiled native libraries
 %if %{gcj_support}
 BuildRequires: java-gcj-compat-devel
-%else
-BuildArch:     noarch
 %endif
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(post): /bin/rm
@@ -166,23 +168,30 @@
 Requires(preun): findutils
 Requires(pre): %{_sbindir}/useradd
 Requires(pre): %{_sbindir}/groupadd
-Requires(post): jakarta-commons-dbcp-tomcat5
-Requires(post): jakarta-commons-collections-tomcat5
-Requires(post): jakarta-commons-pool-tomcat5
+Requires(post): jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
+Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
+Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
+Requires: jaf = 0:1.0.2
+Requires(post): jaf = 0:1.0.2
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): jakarta-commons-logging >= 0:1.0.4
+Requires: javamail = 0:1.3.1
+Requires(post): javamail = 0:1.3.1
+%if %{with_ecj}
+Requires: ecj >= 0:3.3.1.1
+Requires(post): ecj >= 0:3.3.1.1
+%endif
 %endif
 Requires: jpackage-utils >= 0:1.7.4
 # xml parsing packages
 Requires: xerces-j2 >= 0:2.7.1
 Requires: xml-commons-jaxp-1.3-apis
 # jakarta-commons packages
-Requires: jakarta-commons-daemon >= 1.0.1
+Requires: jakarta-commons-daemon >= 0:1.0.1
+Requires(post): jakarta-commons-daemon >= 0:1.0.1
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
 Requires: java-1.6.0-devel
-%if %{with_ecj}
-Requires: ecj >= 0:3.3.1.1
-Requires(post): ecj >= 0:3.3.1.1
-%endif
 # And it needs its own API subpackages for running
 Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
 Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
@@ -223,6 +232,7 @@
 Requires(pre): %{name} = %{epoch}:%{version}-%{release}
 Requires(postun): %{name} = %{epoch}:%{version}-%{release}
 Requires: struts >= 0:1.2.9
+#Requires: struts-taglib >= 0:1.3.8
 Requires(post): /bin/rm
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(post): findutils
@@ -231,6 +241,7 @@
 Requires(post): jakarta-commons-digester
 Requires(post): jakarta-commons-io
 Requires(post): struts
+#Requires(post): struts-taglib
 Requires(preun): findutils
 Requires(preun): /bin/rm
 
@@ -268,7 +279,7 @@
 %package jsp-%{jspspec}-api
 Group: Internet/WWW/Dynamic Content
 Requires: %{_sbindir}/update-alternatives
-Requires: servlet24
+Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 # We need this to indirectly get rid of legacy jsp included in old
 # servlet packages (one day we will be able to remove this)
 # Replace PreReq
@@ -330,8 +341,8 @@
 Group: Development/Compilers
 Summary: Libraries needed to run the Tomcat Web container (part)
 Requires(post): jpackage-utils >= 0:1.7.4
-Requires: jakarta-commons-modeler >= 2.0
-Requires(post): jakarta-commons-modeler >= 2.0
+Requires: jakarta-commons-modeler >= 0:2.0
+Requires(post): jakarta-commons-modeler >= 0:2.0
 # Other subpackages must go in first
 Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
 Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
@@ -406,6 +417,8 @@
     %{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
 %endif
 
+#find -type f -name '*.jsp' | xargs -t perl -pi -e 's/<html:html locale="true">/<html:html>/g'
+
 %build
 # remove pre-built binaries
 for dir in ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ; do
@@ -543,7 +556,7 @@
 unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-compiler.jar
 unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-runtime.jar \
   -x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
-unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
+unzip -qq %{_javadir}/ecj.jar -x META-INF/MANIFEST.MF
 cp -p %{SOURCE7} META-INF/MANIFEST.MF
 rm -f plugin.properties plugin.xml about.html jdtCompilerAdapter.jar META-INF/eclipse.inf
 zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar .
@@ -563,7 +576,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
 %if %{without_apisonly}
-export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar"
+export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar"
 # build initial path structure
 %{__install} -d -m 755 \
     ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
@@ -1190,8 +1203,8 @@
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
+#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
+#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
 #%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
 %endif
@@ -1348,9 +1361,16 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.27-6.2
+- preserve upgrade ordering, clean up CLASSPATH export
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.5.27-5.9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Wed Dec 10 2008  David Walluck <dwalluck at redhat.com> 0:5.5.27-6.1
+- fix bug #473755
+- fix extra newline in initscript
+
 * Wed Oct 22 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.9
 - revert jasper-eclipse location change as it won't work on noarch
 



From toshio at fedoraproject.org  Wed Apr 15 18:25:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 15 Apr 2009 18:25:52 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.128,1.129
Message-ID: <20090415182552.4E64170101@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1060

Modified Files:
	mono.spec 
Log Message:

* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-19
- And turn off bootstrapping and make sure it rebuilds on all platforms.



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mono.spec	15 Apr 2009 16:44:03 -0000	1.128
+++ mono.spec	15 Apr 2009 18:25:20 -0000	1.129
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        17%{?dist}.1
+Release:        19%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -31,7 +31,7 @@
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-#BuildRequires: mono-core
+BuildRequires: mono-core
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
@@ -305,7 +305,7 @@
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-#rm -rf mcs/class/lib/monolite/*
+rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -720,6 +720,9 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-19
+- And turn off bootstrapping and make sure it rebuilds on all platforms.
+
 * Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-18
 - Enable bootstrap code and ppc64.  If this succeeds we'll build -19 right
   afterwards with bootstrap code turned off.



From simo at fedoraproject.org  Wed Apr 15 18:26:01 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 15 Apr 2009 18:26:01 +0000 (UTC)
Subject: rpms/rsync/devel .cvsignore, 1.33, 1.34 rsync.spec, 1.63,
	1.64 sources, 1.33, 1.34
Message-ID: <20090415182601.D2D6E70101@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1144

Modified Files:
	.cvsignore rsync.spec sources 
Log Message:
* Wed Apr 15 2009 Simo Sorce <ssorce at redhat.com> 3.0.6-0pre1
- First 3.0.6 pre release
- Also change the spec to simplify releasing pre-releases



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	1 Jan 2009 19:23:34 -0000	1.33
+++ .cvsignore	15 Apr 2009 18:25:30 -0000	1.34
@@ -1,2 +1,2 @@
-rsync-3.0.5.tar.gz
-rsync-patches-3.0.5.tar.gz
+rsync-3.0.6pre1.tar.gz
+rsync-patches-3.0.6pre1.tar.gz


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- rsync.spec	25 Feb 2009 21:07:19 -0000	1.63
+++ rsync.spec	15 Apr 2009 18:25:31 -0000	1.64
@@ -1,14 +1,18 @@
+%define isprerelease 1
+
+%if %isprerelease
+%define prerelease pre1
+%endif
+
 Summary: A program for synchronizing files over a network
 Name: rsync
-Version: 3.0.5
-Release: 1%{?dist}
+Version: 3.0.6
+Release: 0%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
-# TAG: for pre versions use
-#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
-Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
-#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
-Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
+
+Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
+Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
 Source2: rsync.xinetd
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,10 +29,14 @@
 
 %prep
 # TAG: for pre versions use
-#%setup -q -n rsync-%{version}pre3
+
+%if %isprerelease
+%setup -q -n rsync-%{version}%{?prerelease}
+%setup -q -b 1 -n rsync-%{version}%{?prerelease}
+%else
 %setup -q
-#%setup -q -b 1 -n rsync-%{version}pre3
 %setup -q -b 1
+%endif
 
 chmod -x support/*
 
@@ -63,6 +71,10 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Apr 15 2009 Simo Sorce <ssorce at redhat.com> 3.0.6-0pre1
+- First 3.0.6 pre release
+- Also change the spec to simplify releasing pre-releases
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.5-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	1 Jan 2009 19:23:34 -0000	1.33
+++ sources	15 Apr 2009 18:25:31 -0000	1.34
@@ -1,2 +1,2 @@
-a130e736c011572cb423b6245e97fc4b  rsync-3.0.5.tar.gz
-ada27361a483f7366b9bb3dab4cba0d0  rsync-patches-3.0.5.tar.gz
+46183b8ba930c846551e04736eec9515  rsync-3.0.6pre1.tar.gz
+695ae8cc0a852eed5b3a3af62c850c2e  rsync-patches-3.0.6pre1.tar.gz



From glommer at fedoraproject.org  Wed Apr 15 18:39:15 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Wed, 15 Apr 2009 18:39:15 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.185,1.186
Message-ID: <20090415183915.C784A70101@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4796

Modified Files:
	comps-f11.xml.in 
Log Message:
don't install qemu-system-ppc on x86 and vice versa




Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- comps-f11.xml.in	14 Apr 2009 17:30:35 -0000	1.185
+++ comps-f11.xml.in	15 Apr 2009 18:38:44 -0000	1.186
@@ -5193,8 +5193,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
-      <packagereq type="default">qemu-system-x86</packagereq>
-      <packagereq type="default">qemu-system-ppc</packagereq>
+      <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
       <packagereq type="optional">gnome-applet-vm</packagereq>



From spot at fedoraproject.org  Wed Apr 15 18:53:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 15 Apr 2009 18:53:06 +0000 (UTC)
Subject: rpms/pilot-link/F-11 pilot-link.spec,1.84,1.85
Message-ID: <20090415185306.6B88C70101@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pilot-link/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8326

Modified Files:
	pilot-link.spec 
Log Message:
push fix to F-11 branch too


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/F-11/pilot-link.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- pilot-link.spec	27 Feb 2009 00:28:37 -0000	1.84
+++ pilot-link.spec	15 Apr 2009 18:52:35 -0000	1.85
@@ -2,7 +2,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -139,7 +139,7 @@
 
 # Put visor to blacklist
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
-install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
+install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor.conf
 
 # put README.fedora into tree
 cp %{SOURCE4} README.fedora
@@ -157,7 +157,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README NEWS doc/README.usb doc/README.debugging doc/README.libusb README.fedora
-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor.conf
 %{_libdir}/*.so.*
 %{_bindir}/*
 %exclude %{_bindir}/pilot-ietf2datebook
@@ -185,6 +185,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-20
+- rename blacklist-visor to blacklist-visor.conf (#494765)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:0.12.3-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From davidz at fedoraproject.org  Wed Apr 15 18:56:47 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 18:56:47 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.7, 1.8 DeviceKit-disks.spec,
	1.20, 1.21 sources, 1.7, 1.8
Message-ID: <20090415185647.BF46170101@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9459

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.8.20090415git%{?dist}
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Apr 2009 19:51:27 -0000	1.7
+++ .cvsignore	15 Apr 2009 18:56:16 -0000	1.8
@@ -4,3 +4,4 @@
 DeviceKit-disks-004.20090406git.tar.gz
 DeviceKit-disks-004.20090408git.tar.gz
 DeviceKit-disks-004.20090412git.tar.gz
+DeviceKit-disks-004.20090415git.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DeviceKit-disks.spec	12 Apr 2009 19:51:28 -0000	1.20
+++ DeviceKit-disks.spec	15 Apr 2009 18:56:16 -0000	1.21
@@ -12,11 +12,11 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.7.20090412git%{?dist}
+Release: 0.8.20090415git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
-Source0: %{name}-%{version}.20090412git.tar.gz
+Source0: %{name}-%{version}.20090415git.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -132,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.8.20090415git%{?dist}
+- New snapshot
+
 * Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 004-0.7.20090412git%{?dist}
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Apr 2009 19:51:28 -0000	1.7
+++ sources	15 Apr 2009 18:56:16 -0000	1.8
@@ -1 +1 @@
-a87ecdb2f6b2cbb9daae8ce9022dc792  DeviceKit-disks-004.20090412git.tar.gz
+7585b97cd3236b10f078b4078c34ee5a  DeviceKit-disks-004.20090415git.tar.gz



From davidz at fedoraproject.org  Wed Apr 15 18:59:09 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 18:59:09 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-11 DeviceKit-disks.spec, 1.20, 1.21 sources, 
	1.7, 1.8
Message-ID: <20090415185909.63F4670101@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10276

Modified Files:
	DeviceKit-disks.spec sources 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.8.20090415git%{?dist}
- New snapshot




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DeviceKit-disks.spec	12 Apr 2009 19:51:28 -0000	1.20
+++ DeviceKit-disks.spec	15 Apr 2009 18:58:38 -0000	1.21
@@ -12,11 +12,11 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.7.20090412git%{?dist}
+Release: 0.8.20090415git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
-Source0: %{name}-%{version}.20090412git.tar.gz
+Source0: %{name}-%{version}.20090415git.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -132,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.8.20090415git%{?dist}
+- New snapshot
+
 * Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 004-0.7.20090412git%{?dist}
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Apr 2009 19:51:28 -0000	1.7
+++ sources	15 Apr 2009 18:58:38 -0000	1.8
@@ -1 +1 @@
-a87ecdb2f6b2cbb9daae8ce9022dc792  DeviceKit-disks-004.20090412git.tar.gz
+7585b97cd3236b10f078b4078c34ee5a  DeviceKit-disks-004.20090415git.tar.gz



From davidz at fedoraproject.org  Wed Apr 15 19:03:43 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 19:03:43 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel DeviceKit-disks.spec,1.21,1.22
Message-ID: <20090415190344.17C5A70137@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12048

Modified Files:
	DeviceKit-disks.spec 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.9.20090415git%{?dist}
- Rebuild




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DeviceKit-disks.spec	15 Apr 2009 18:56:16 -0000	1.21
+++ DeviceKit-disks.spec	15 Apr 2009 19:03:42 -0000	1.22
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.8.20090415git%{?dist}
+Release: 0.9.20090415git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -132,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.9.20090415git%{?dist}
+- Rebuild
+
 * Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.8.20090415git%{?dist}
 - New snapshot
 



From davidz at fedoraproject.org  Wed Apr 15 19:04:51 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 19:04:51 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-11 DeviceKit-disks.spec,1.21,1.22
Message-ID: <20090415190451.F0A2170137@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12455

Modified Files:
	DeviceKit-disks.spec 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.9.20090415git%{?dist}
- Rebuild




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DeviceKit-disks.spec	15 Apr 2009 18:58:38 -0000	1.21
+++ DeviceKit-disks.spec	15 Apr 2009 19:04:21 -0000	1.22
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.8.20090415git%{?dist}
+Release: 0.9.20090415git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -132,6 +132,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.9.20090415git%{?dist}
+- Rebuild
+
 * Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.8.20090415git%{?dist}
 - New snapshot
 



From davidz at fedoraproject.org  Wed Apr 15 19:09:56 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 19:09:56 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.5,
	1.6 gnome-disk-utility.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090415190956.7752B70101@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14142

Modified Files:
	.cvsignore gnome-disk-utility.spec sources 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.5.20090415git%{?dist}
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Apr 2009 20:10:08 -0000	1.5
+++ .cvsignore	15 Apr 2009 19:09:55 -0000	1.6
@@ -2,3 +2,4 @@
 gnome-disk-utility-0.2.tar.bz2
 gnome-disk-utility-0.3.20090406git.tar.bz2
 gnome-disk-utility-0.3.20090412git.tar.bz2
+gnome-disk-utility-0.3.20090415git.tar.bz2


Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-disk-utility.spec	12 Apr 2009 20:10:09 -0000	1.10
+++ gnome-disk-utility.spec	15 Apr 2009 19:09:55 -0000	1.11
@@ -8,15 +8,16 @@
 %define gnome_keyring_version     2.22
 %define devicekit_disks_version   004
 %define unique_version            1.0.4
+%define libnotify_version         0.4.5
 
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.3
-Release: 0.4.20090412git%{?dist}
+Release: 0.5.20090415git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: %{name}-%{version}.20090412git.tar.bz2
+Source0: %{name}-%{version}.20090415git.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -31,6 +32,7 @@
 BuildRequires: DeviceKit-disks-devel >= %{devicekit_disks_version}
 BuildRequires: PolicyKit-gnome-devel >= %{polkit_gnome_version}
 BuildRequires: unique-devel >= %{unique_version}
+BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: libsexy-devel
 BuildRequires: intltool
 Requires(post): scrollkeeper
@@ -206,6 +208,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.5.20090415git%{?dist}
+- New snapshot
+
 * Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.4.20090412git%{?dist}
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2009 20:10:09 -0000	1.5
+++ sources	15 Apr 2009 19:09:55 -0000	1.6
@@ -1 +1 @@
-409fa6bb700fa9fab6e7de88dacd4b46  gnome-disk-utility-0.3.20090412git.tar.bz2
+7aa1e2dc7de710d2494de3bae94ee15a  gnome-disk-utility-0.3.20090415git.tar.bz2



From davidz at fedoraproject.org  Wed Apr 15 19:11:54 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 19:11:54 +0000 (UTC)
Subject: rpms/gnome-disk-utility/F-11 gnome-disk-utility.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090415191154.BD8D870101@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14510

Modified Files:
	gnome-disk-utility.spec sources 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.5.20090415git%{?dist}
- New snapshot




Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-11/gnome-disk-utility.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-disk-utility.spec	12 Apr 2009 20:10:09 -0000	1.10
+++ gnome-disk-utility.spec	15 Apr 2009 19:11:22 -0000	1.11
@@ -8,15 +8,16 @@
 %define gnome_keyring_version     2.22
 %define devicekit_disks_version   004
 %define unique_version            1.0.4
+%define libnotify_version         0.4.5
 
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.3
-Release: 0.4.20090412git%{?dist}
+Release: 0.5.20090415git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: %{name}-%{version}.20090412git.tar.bz2
+Source0: %{name}-%{version}.20090415git.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -31,6 +32,7 @@
 BuildRequires: DeviceKit-disks-devel >= %{devicekit_disks_version}
 BuildRequires: PolicyKit-gnome-devel >= %{polkit_gnome_version}
 BuildRequires: unique-devel >= %{unique_version}
+BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: libsexy-devel
 BuildRequires: intltool
 Requires(post): scrollkeeper
@@ -206,6 +208,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.5.20090415git%{?dist}
+- New snapshot
+
 * Sun Apr 12 2009 David Zeuthen <davidz at redhat.com> - 0.3-0.4.20090412git%{?dist}
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2009 20:10:09 -0000	1.5
+++ sources	15 Apr 2009 19:11:22 -0000	1.6
@@ -1 +1 @@
-409fa6bb700fa9fab6e7de88dacd4b46  gnome-disk-utility-0.3.20090412git.tar.bz2
+7aa1e2dc7de710d2494de3bae94ee15a  gnome-disk-utility-0.3.20090415git.tar.bz2



From rishi at fedoraproject.org  Wed Apr 15 19:17:06 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 15 Apr 2009 19:17:06 +0000 (UTC)
Subject: rpms/anjuta/F-11 .cvsignore, 1.18, 1.19 anjuta.spec, 1.72,
	1.73 sources, 1.18, 1.19
Message-ID: <20090415191707.0502E70101@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15972

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
* Wed Apr 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.1.0-1
- Version bump to 2.26.1.0.
  * New animation to identify running builds.
  * File manager plugin:
    + Show tooltips in the Files view only when full name does not fit. (GNOME
      Bugzilla #564002)
  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.news
  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Apr 2009 03:33:54 -0000	1.18
+++ .cvsignore	15 Apr 2009 19:16:35 -0000	1.19
@@ -1 +1 @@
-anjuta-2.26.0.1.tar.gz
+anjuta-2.26.1.0.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-11/anjuta.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- anjuta.spec	13 Apr 2009 04:45:50 -0000	1.72
+++ anjuta.spec	15 Apr 2009 19:16:36 -0000	1.73
@@ -1,8 +1,8 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.26.0.1
-Release:	3%{?dist}
+Version:	2.26.1.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
@@ -322,6 +322,15 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Wed Apr 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.1.0-1
+- Version bump to 2.26.1.0.
+  * New animation to identify running builds.
+  * File manager plugin:
+    + Show tooltips in the Files view only when full name does not fit. (GNOME
+      Bugzilla #564002)
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.changes
+
 * Mon Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-3
 - Added 'Requires: ctags libgda-sqlite >= 3.99.7'. (Red Hat Bugzilla #494423)
 - Removed 'Requires: libglade2-devel >= 2.6.3-2 libgnomeui-devel pkgconfig'
@@ -349,7 +358,8 @@
     + Should point to correct line number. (GNOME Bugzilla #576959)
   * Translation updates: pt_BR, en_GB, da, fi, fr, gl, el, it, ca, pt, sv, es,
     tr, hu, vi, de, sl, ru, ja, mr, ar, th and pl.
-  * http://ftp.acc.umu.se/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.changes
 - configure fixes accepted by upstream.
 - Stripped redundant translations from .mo files. (GNOME Bugzilla #474987)
 
@@ -378,6 +388,7 @@
   * Symbol-db plugin:
     + Fixed Valgrind violations. (GNOME Bugzilla #572637)
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.903.0.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.903.0.changes
 - Fixed configure to correctly handle --enable-plugin-scintilla.
 - Upstream no longer installs /usr/bin/benchmark.
 
@@ -435,6 +446,7 @@
   * Tools plugin:
     + Fixed crash due to a double free. (GNOME Bugzilla #571143)
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.902.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.902.changes
 - Removed unwanted Perl Provides and Requires. Imported from gnome-build.
 
 * Thu Feb 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1:2.25.901-2
@@ -505,6 +517,9 @@
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.901.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.90.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.5.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.901.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.90.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.5.changes
 - Patch against Devhelp plugin is now upstream.
 - Disabled Glade3 plugin because glade3-3.5.7 is not yet available.
 
@@ -514,6 +529,7 @@
     + Missing debugger menu. (GNOME Bugzilla #559800)
   * Translation updates: pt_BR and si.
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.2.changes
 
 * Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
 - Added patch against the Devhelp plugin from GNOME to make it work with the
@@ -534,6 +550,9 @@
   * Translation updates: ar, de, ru, bg, fi, pl, he and da.
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.1.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.5/anjuta-2.5.90.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.1.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.0.1.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.5/anjuta-2.5.90.changes
 - Makefile problems fixed by upstream.
 - Added 'Requires: git' and 'BuildRequires: e2fsprogs-devel intltool'.
 - libanjuta-egg.so has been dropped.
@@ -541,6 +560,7 @@
 * Sat Sep 20 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.2-1
 - Version bump to 2.4.2.
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/anjuta-2.4.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/anjuta-2.4.2.changes
 - Enabled Valgrind plugin and added 'BuildRequires: binutils-devel'.
 
 * Sat May 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.1-1
@@ -551,6 +571,12 @@
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.3.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.2.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/anjuta-2.4.1.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.5.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.4.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.3.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.2.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.1.changes
 - Spurious file modification messages from Scintilla fixed by upstream. (Red
   Hat Bugzilla #447090)
 
@@ -586,3 +612,5 @@
 * Sun Jan 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-1
 - Initial build. Imported SPEC from Rawhide and renamed as anjuta-doc from
   anjuta-docs according to Fedora naming guidelines.
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.2/anjuta-2.2.3.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.2/anjuta-2.2.3.changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Apr 2009 03:33:54 -0000	1.18
+++ sources	15 Apr 2009 19:16:36 -0000	1.19
@@ -1 +1 @@
-35624d399ae9083a46deb9e7f2da8bcb  anjuta-2.26.0.1.tar.gz
+2b3efb990b6e0ead28ea5e9be460f578  anjuta-2.26.1.0.tar.gz



From rishi at fedoraproject.org  Wed Apr 15 19:21:46 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 15 Apr 2009 19:21:46 +0000 (UTC)
Subject: rpms/anjuta/devel .cvsignore, 1.18, 1.19 anjuta.spec, 1.72,
	1.73 sources, 1.18, 1.19
Message-ID: <20090415192146.3A9DC70101@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17504

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
* Wed Apr 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.1.0-1
- Version bump to 2.26.1.0.
  * New animation to identify running builds.
  * File manager plugin:
    + Show tooltips in the Files view only when full name does not fit. (GNOME
      Bugzilla #564002)
  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.news
  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Apr 2009 03:33:54 -0000	1.18
+++ .cvsignore	15 Apr 2009 19:21:14 -0000	1.19
@@ -1 +1 @@
-anjuta-2.26.0.1.tar.gz
+anjuta-2.26.1.0.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- anjuta.spec	13 Apr 2009 04:45:50 -0000	1.72
+++ anjuta.spec	15 Apr 2009 19:21:14 -0000	1.73
@@ -1,8 +1,8 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.26.0.1
-Release:	3%{?dist}
+Version:	2.26.1.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
@@ -322,6 +322,15 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Wed Apr 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.1.0-1
+- Version bump to 2.26.1.0.
+  * New animation to identify running builds.
+  * File manager plugin:
+    + Show tooltips in the Files view only when full name does not fit. (GNOME
+      Bugzilla #564002)
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.1.0.changes
+
 * Mon Apr 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.0.1-3
 - Added 'Requires: ctags libgda-sqlite >= 3.99.7'. (Red Hat Bugzilla #494423)
 - Removed 'Requires: libglade2-devel >= 2.6.3-2 libgnomeui-devel pkgconfig'
@@ -349,7 +358,8 @@
     + Should point to correct line number. (GNOME Bugzilla #576959)
   * Translation updates: pt_BR, en_GB, da, fi, fr, gl, el, it, ca, pt, sv, es,
     tr, hu, vi, de, sl, ru, ja, mr, ar, th and pl.
-  * http://ftp.acc.umu.se/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.0.1.changes
 - configure fixes accepted by upstream.
 - Stripped redundant translations from .mo files. (GNOME Bugzilla #474987)
 
@@ -378,6 +388,7 @@
   * Symbol-db plugin:
     + Fixed Valgrind violations. (GNOME Bugzilla #572637)
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.903.0.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.903.0.changes
 - Fixed configure to correctly handle --enable-plugin-scintilla.
 - Upstream no longer installs /usr/bin/benchmark.
 
@@ -435,6 +446,7 @@
   * Tools plugin:
     + Fixed crash due to a double free. (GNOME Bugzilla #571143)
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.902.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.902.changes
 - Removed unwanted Perl Provides and Requires. Imported from gnome-build.
 
 * Thu Feb 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1:2.25.901-2
@@ -505,6 +517,9 @@
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.901.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.90.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.5.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.901.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.90.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.5.changes
 - Patch against Devhelp plugin is now upstream.
 - Disabled Glade3 plugin because glade3-3.5.7 is not yet available.
 
@@ -514,6 +529,7 @@
     + Missing debugger menu. (GNOME Bugzilla #559800)
   * Translation updates: pt_BR and si.
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.2.changes
 
 * Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
 - Added patch against the Devhelp plugin from GNOME to make it work with the
@@ -534,6 +550,9 @@
   * Translation updates: ar, de, ru, bg, fi, pl, he and da.
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.1.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.5/anjuta-2.5.90.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.1.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/anjuta-2.24.0.1.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.5/anjuta-2.5.90.changes
 - Makefile problems fixed by upstream.
 - Added 'Requires: git' and 'BuildRequires: e2fsprogs-devel intltool'.
 - libanjuta-egg.so has been dropped.
@@ -541,6 +560,7 @@
 * Sat Sep 20 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.2-1
 - Version bump to 2.4.2.
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/anjuta-2.4.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/anjuta-2.4.2.changes
 - Enabled Valgrind plugin and added 'BuildRequires: binutils-devel'.
 
 * Sat May 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.1-1
@@ -551,6 +571,12 @@
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.3.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.2.news
   * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.4/anjuta-2.4.1.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.5.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.4.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.3.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.2.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.1.changes
 - Spurious file modification messages from Scintilla fixed by upstream. (Red
   Hat Bugzilla #447090)
 
@@ -586,3 +612,5 @@
 * Sun Jan 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-1
 - Initial build. Imported SPEC from Rawhide and renamed as anjuta-doc from
   anjuta-docs according to Fedora naming guidelines.
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.2/anjuta-2.2.3.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.2/anjuta-2.2.3.changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Apr 2009 03:33:54 -0000	1.18
+++ sources	15 Apr 2009 19:21:14 -0000	1.19
@@ -1 +1 @@
-35624d399ae9083a46deb9e7f2da8bcb  anjuta-2.26.0.1.tar.gz
+2b3efb990b6e0ead28ea5e9be460f578  anjuta-2.26.1.0.tar.gz



From davidz at fedoraproject.org  Wed Apr 15 19:25:26 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 19:25:26 +0000 (UTC)
Subject: rpms/gvfs/devel gdu-0010-show-user-mountable-fstab-entries.patch,
	NONE, 
	1.1 gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch, 
	NONE, 1.1
	gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch,
	NONE, 1.1 gdu-0013-pass-the-flush-mount-option-for-vfat.patch,
	NONE, 1.1 gvfs.spec, 1.125, 1.126
Message-ID: <20090415192526.1517570101@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18627

Modified Files:
	gvfs.spec 
Added Files:
	gdu-0010-show-user-mountable-fstab-entries.patch 
	gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch 
	gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch 
	gdu-0013-pass-the-flush-mount-option-for-vfat.patch 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 1.2.2-3
- Sync with the gdu-volume-monitor branch



gdu-0010-show-user-mountable-fstab-entries.patch:

--- NEW FILE gdu-0010-show-user-mountable-fstab-entries.patch ---
>From 0f7a44dd0eac01f9783879af4ca3d3fe4a53af14 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 13 Apr 2009 10:57:38 -0400
Subject: [PATCH 10/13] show user-mountable fstab entries

Show all entries from /etc/fstab for which

 - the entry is user mountable
 - the mount point is in /media or $HOME
 - if it's a /dev file make sure it exists and is not handled
   by DeviceKit-disks already

For example this /etc/fstab entry

 "quad.local:/media/FusionMedia /media/FusionMedia nfs defaults,users     0 0"

makes Nautilus display this when unmounted

 http://people.freedesktop.org/~david/gvfs-user-mountable-fstab-entries.png

and these GVolume and GMount objects to appear when mounted

 Volume(0): FusionMedia
   Type: GProxyVolume (GProxyVolumeMonitorGdu)
   themed icons:  [folder-remote]  [folder]
   can_mount=1
   can_eject=0
   Mount(0): FusionMedia -> file:///media/FusionMedia
     Type: GProxyMount (GProxyVolumeMonitorGdu)
     themed icons:  [folder-remote]  [folder]
     can_unmount=1
     can_eject=0
     is_shadowed=0

This should resolve http://bugzilla.gnome.org/show_bug.cgi?id=536292
---
 monitor/gdu/ggdumount.c         |   29 +++-
 monitor/gdu/ggduvolume.c        |  374 ++++++++++++++++++++++++++++++++++++---
 monitor/gdu/ggduvolume.h        |    7 +-
 monitor/gdu/ggduvolumemonitor.c |  174 ++++++++++++++++++-
 4 files changed, 548 insertions(+), 36 deletions(-)

diff --git a/monitor/gdu/ggdumount.c b/monitor/gdu/ggdumount.c
index 27c22d9..e074a20 100644
--- a/monitor/gdu/ggdumount.c
+++ b/monitor/gdu/ggdumount.c
@@ -696,8 +696,13 @@ g_gdu_mount_unmount (GMount              *_mount,
 {
   GGduMount *mount = G_GDU_MOUNT (_mount);
   GSimpleAsyncResult *simple;
+  GduPresentable *gdu_volume;
 
-  if (mount->volume == NULL)
+  gdu_volume = NULL;
+  if (mount->volume != NULL)
+    gdu_volume = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
+
+  if (mount->volume == NULL || gdu_volume == NULL)
     {
       gchar *argv[] = {"umount", NULL, NULL};
 
@@ -710,7 +715,7 @@ g_gdu_mount_unmount (GMount              *_mount,
 
       eject_unmount_do (_mount, cancellable, callback, user_data, argv);
     }
-  else
+  else if (gdu_volume != NULL)
     {
       simple = g_simple_async_result_new (G_OBJECT (mount),
                                           callback,
@@ -726,18 +731,25 @@ g_gdu_mount_unmount (GMount              *_mount,
       else
         {
           GduDevice *device;
-          GduPresentable *volume;
 
           /* TODO: honor flags */
 
-          volume = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
-          device = gdu_presentable_get_device (volume);
-
+          device = gdu_presentable_get_device (gdu_volume);
           gdu_device_op_filesystem_unmount (device, unmount_cb, simple);
-
           g_object_unref (device);
         }
     }
+  else
+    {
+      simple = g_simple_async_result_new_error (G_OBJECT (mount),
+                                                callback,
+                                                user_data,
+                                                G_IO_ERROR,
+                                                G_IO_ERROR_FAILED,
+                                                _("Operation not supported by backend"));
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+    }
 }
 
 static gboolean
@@ -855,7 +867,8 @@ g_gdu_mount_guess_content_type_sync (GMount              *_mount,
     {
       GduPresentable *presentable;
       presentable = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
-      device = gdu_presentable_get_device (presentable);
+      if (presentable != NULL)
+        device = gdu_presentable_get_device (presentable);
     }
 
   /* doesn't make sense to probe blank discs - look at the disc type instead */
diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 6779f0f..49494a1 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -35,12 +35,22 @@
 #include "ggduvolume.h"
 #include "ggdumount.h"
 
+/* for BUFSIZ */
+#include <stdio.h>
+
 #include "polkit.h"
 
 typedef struct MountOpData MountOpData;
 
 static void cancel_pending_mount_op (MountOpData *data);
 
+static void g_gdu_volume_mount_unix_mount_point (GGduVolume          *volume,
+                                                 GMountMountFlags     flags,
+                                                 GMountOperation     *mount_operation,
+                                                 GCancellable        *cancellable,
+                                                 GAsyncReadyCallback  callback,
+                                                 gpointer             user_data);
+
 struct _GGduVolume
 {
   GObject parent;
@@ -49,8 +59,12 @@ struct _GGduVolume
   GGduMount      *mount;          /* owned by volume monitor */
   GGduDrive      *drive;          /* owned by volume monitor */
 
+  /* only set if constructed via new() */
   GduVolume *gdu_volume;
 
+  /* only set if constructed via new_for_unix_mount_point() */
+  GUnixMountPoint *unix_mount_point;
+
   /* if the volume is encrypted, this is != NULL when unlocked */
   GduVolume *cleartext_gdu_volume;
 
@@ -60,7 +74,7 @@ struct _GGduVolume
    */
   MountOpData *pending_mount_op;
 
-  /* the following members need to be set upon construction */
+  /* the following members need to be set upon construction, see constructors and update_volume() */
   GIcon *icon;
   GFile *activation_root;
   gchar *name;
@@ -110,6 +124,11 @@ g_gdu_volume_finalize (GObject *object)
       g_object_unref (volume->gdu_volume);
     }
 
+  if (volume->unix_mount_point != NULL)
+    {
+      g_unix_mount_point_free (volume->unix_mount_point);
+    }
+
   if (volume->cleartext_gdu_volume != NULL)
     {
       g_signal_handlers_disconnect_by_func (volume->cleartext_gdu_volume, gdu_cleartext_volume_removed, volume);
@@ -174,6 +193,30 @@ update_volume (GGduVolume *volume)
 
   /* ---------------------------------------------------------------------------------------------------- */
 
+  /* if the volume is a fstab mount point, get the data from there */
+  if (volume->unix_mount_point != NULL)
+    {
+      volume->can_mount = TRUE;
+      volume->should_automount = FALSE;
+
+      g_free (volume->device_file);
+      volume->device_file = g_strdup (g_unix_mount_point_get_device_path (volume->unix_mount_point));
+
+      if (volume->icon != NULL)
+        g_object_unref (volume->icon);
+      if (g_strcmp0 (g_unix_mount_point_get_fs_type (volume->unix_mount_point), "nfs") == 0)
+        volume->icon = g_themed_icon_new_with_default_fallbacks ("folder-remote");
+      else
+        volume->icon = g_unix_mount_point_guess_icon (volume->unix_mount_point);
+
+      g_free (volume->name);
+      volume->name = g_unix_mount_point_guess_name (volume->unix_mount_point);
+
+      //volume->can_eject = g_unix_mount_point_guess_can_eject (volume->unix_mount_point);
+
+      goto update_done;
+    }
+
   /* in with the new */
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
   pool = gdu_device_get_pool (device);
@@ -347,6 +390,8 @@ update_volume (GGduVolume *volume)
 
   /* ---------------------------------------------------------------------------------------------------- */
 
+ update_done:
+
   /* compute whether something changed */
   changed = !((old_can_mount == volume->can_mount) &&
               (old_should_automount == volume->should_automount) &&
@@ -412,6 +457,23 @@ gdu_cleartext_volume_job_changed (GduPresentable *presentable,
 }
 
 GGduVolume *
+g_gdu_volume_new_for_unix_mount_point (GVolumeMonitor   *volume_monitor,
+                                       GUnixMountPoint  *unix_mount_point)
+{
+  GGduVolume *volume;
+
+  volume = g_object_new (G_TYPE_GDU_VOLUME, NULL);
+  volume->volume_monitor = volume_monitor;
+  g_object_add_weak_pointer (G_OBJECT (volume_monitor), (gpointer) &(volume->volume_monitor));
+
+  volume->unix_mount_point = unix_mount_point;
+
+  update_volume (volume);
+
+  return volume;
+}
+
+GGduVolume *
 g_gdu_volume_new (GVolumeMonitor   *volume_monitor,
                   GduVolume        *gdu_volume,
                   GGduDrive        *drive,
@@ -1084,6 +1146,18 @@ g_gdu_volume_mount (GVolume             *_volume,
   pool = NULL;
   device = NULL;
 
+  /* for fstab mounts, call the native mount command */
+  if (volume->unix_mount_point != NULL)
+    {
+      g_gdu_volume_mount_unix_mount_point (volume,
+                                           flags,
+                                           mount_operation,
+                                           cancellable,
+                                           callback,
+                                           user_data);
+      goto out;
+    }
+
   if (volume->pending_mount_op != NULL)
     {
       simple = g_simple_async_result_new_error (G_OBJECT (volume),
@@ -1204,7 +1278,7 @@ g_gdu_volume_mount_finish (GVolume       *volume,
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
 
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_gdu_volume_mount);
+  //g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_gdu_volume_mount);
 
   return !g_simple_async_result_propagate_error (simple, error);
 }
@@ -1212,6 +1286,247 @@ g_gdu_volume_mount_finish (GVolume       *volume,
 /* ---------------------------------------------------------------------------------------------------- */
 
 typedef struct {
+  GGduVolume *volume;
+  GAsyncReadyCallback callback;
+  gpointer user_data;
+  GCancellable *cancellable;
+  int error_fd;
+  GIOChannel *error_channel;
+  guint error_channel_source_id;
+  GString *error_string;
+
+  guint wait_for_mount_timeout_id;
+  gulong wait_for_mount_changed_signal_handler_id;
+} MountPointOp;
+
+static void
+mount_point_op_free (MountPointOp *data)
+{
+  if (data->error_channel_source_id > 0)
+    g_source_remove (data->error_channel_source_id);
+  if (data->error_channel != NULL)
+    g_io_channel_unref (data->error_channel);
+  if (data->error_string != NULL)
+    g_string_free (data->error_string, TRUE);
+  if (data->error_fd > 0)
+    close (data->error_fd);
+  g_free (data);
+}
+
+static void
+mount_point_op_changed_cb (GVolume *volume,
+                           gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  GSimpleAsyncResult *simple;
+
+  /* keep waiting if the mount hasn't appeared */
+  if (data->volume->mount == NULL)
+    goto out;
+
+  simple = g_simple_async_result_new (G_OBJECT (data->volume),
+                                      data->callback,
+                                      data->user_data,
+                                      NULL);
+  /* complete in idle to make sure the mount is added before we return */
+  g_simple_async_result_complete_in_idle (simple);
+  g_object_unref (simple);
+
+  g_signal_handler_disconnect (data->volume, data->wait_for_mount_changed_signal_handler_id);
+  g_source_remove (data->wait_for_mount_timeout_id);
+
+  mount_point_op_free (data);
+
+ out:
+  ;
+}
+
+static gboolean
+mount_point_op_never_appeared_cb (gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  GSimpleAsyncResult *simple;
+
+  simple = g_simple_async_result_new_error (G_OBJECT (data->volume),
+                                            data->callback,
+                                            data->user_data,
+                                            G_IO_ERROR,
+                                            G_IO_ERROR_FAILED,
+                                            "Timeout waiting for mount to appear");
+  g_simple_async_result_complete (simple);
+  g_object_unref (simple);
+
+  g_signal_handler_disconnect (data->volume, data->wait_for_mount_changed_signal_handler_id);
+  g_source_remove (data->wait_for_mount_timeout_id);
+
+  mount_point_op_free (data);
+
+  return FALSE;
+}
+
+static void
+mount_point_op_cb (GPid pid, gint status, gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  GSimpleAsyncResult *simple;
+
+  g_spawn_close_pid (pid);
+
+  if (WEXITSTATUS (status) != 0)
+    {
+      GError *error;
+      error = g_error_new_literal (G_IO_ERROR,
+                                   G_IO_ERROR_FAILED,
+                                   data->error_string->str);
+      simple = g_simple_async_result_new_from_error (G_OBJECT (data->volume),
+                                                     data->callback,
+                                                     data->user_data,
+                                                     error);
+      g_error_free (error);
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+      mount_point_op_free (data);
+    }
+  else
+    {
+      /* wait for the GMount to appear - this is to honor this requirement
+       *
+       *  "If the mount operation succeeded, g_volume_get_mount() on
+       *   volume is guaranteed to return the mount right after calling
+       *   this function; there's no need to listen for the
+       *   'mount-added' signal on GVolumeMonitor."
+       *
+       * So we set up a signal handler waiting for it to appear. We also set up
+       * a timer for handling the case when it never appears.
+       */
+      if (data->volume->mount == NULL)
+        {
+          /* no need to ref, GSimpleAsyncResult has a ref on data->volume */
+          data->wait_for_mount_timeout_id = g_timeout_add (5 * 1000,
+                                            mount_point_op_never_appeared_cb,
+                                            data);
+          data->wait_for_mount_changed_signal_handler_id = g_signal_connect (data->volume,
+                                                                             "changed",
+                                                                             G_CALLBACK (mount_point_op_changed_cb),
+                                                                             data);
+        }
+      else
+        {
+          /* have the mount already, finish up */
+          simple = g_simple_async_result_new (G_OBJECT (data->volume),
+                                              data->callback,
+                                              data->user_data,
+                                              NULL);
+          g_simple_async_result_complete (simple);
+          g_object_unref (simple);
+          mount_point_op_free (data);
+        }
+    }
+}
+
+static gboolean
+mount_point_op_read_error (GIOChannel *channel,
+                           GIOCondition condition,
+                           gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  gchar buf[BUFSIZ];
+  gsize bytes_read;
+  GError *error;
+  GIOStatus status;
+
+  error = NULL;
+read:
+  status = g_io_channel_read_chars (channel, buf, sizeof (buf), &bytes_read, &error);
+  if (status == G_IO_STATUS_NORMAL)
+   {
+     g_string_append_len (data->error_string, buf, bytes_read);
+     if (bytes_read == sizeof (buf))
+        goto read;
+   }
+  else if (status == G_IO_STATUS_EOF)
+    {
+      g_string_append_len (data->error_string, buf, bytes_read);
+    }
+  else if (status == G_IO_STATUS_ERROR)
+    {
+      if (data->error_string->len > 0)
+        g_string_append (data->error_string, "\n");
+
+      g_string_append (data->error_string, error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+g_gdu_volume_mount_unix_mount_point (GGduVolume          *volume,
+                                     GMountMountFlags     flags,
+                                     GMountOperation     *mount_operation,
+                                     GCancellable        *cancellable,
+                                     GAsyncReadyCallback  callback,
+                                     gpointer             user_data)
+{
+  MountPointOp *data;
+  GPid child_pid;
+  GError *error;
+  const gchar *argv[] = {"mount", NULL, NULL};
+
+  argv[1] = g_unix_mount_point_get_mount_path (volume->unix_mount_point);
+
+  data = g_new0 (MountPointOp, 1);
+  data->volume = volume;
+  data->callback = callback;
+  data->user_data = user_data;
+  data->cancellable = cancellable;
+
+  error = NULL;
+  if (!g_spawn_async_with_pipes (NULL,         /* working dir */
+                                 (gchar **) argv,
+                                 NULL,         /* envp */
+                                 G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
+                                 NULL,         /* child_setup */
+                                 NULL,         /* user_data for child_setup */
+                                 &child_pid,
+                                 NULL,         /* standard_input */
+                                 NULL,         /* standard_output */
+                                 &(data->error_fd),
+                                 &error))
+    {
+      g_assert (error != NULL);
+      goto handle_error;
+    }
+
+  data->error_string = g_string_new ("");
+
+  data->error_channel = g_io_channel_unix_new (data->error_fd);
+  g_io_channel_set_flags (data->error_channel, G_IO_FLAG_NONBLOCK, &error);
+  if (error != NULL)
+    goto handle_error;
+
+  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, mount_point_op_read_error, data);
+  g_child_watch_add (child_pid, mount_point_op_cb, data);
+
+handle_error:
+  if (error != NULL)
+    {
+      GSimpleAsyncResult *simple;
+      simple = g_simple_async_result_new_from_error (G_OBJECT (data->volume),
+                                                     data->callback,
+                                                     data->user_data,
+                                                     error);
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+
+      mount_point_op_free (data);
+    }
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+typedef struct {
   GObject *object;
   GAsyncReadyCallback callback;
   gpointer user_data;
@@ -1300,19 +1615,22 @@ g_gdu_volume_get_identifier (GVolume     *_volume,
 
   id = NULL;
 
-  device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
+  if (volume->gdu_volume != NULL)
+    {
+      device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
 
-  label = gdu_device_id_get_label (device);
-  uuid = gdu_device_id_get_uuid (device);
+      label = gdu_device_id_get_label (device);
+      uuid = gdu_device_id_get_uuid (device);
 
-  g_object_unref (device);
+      g_object_unref (device);
 
-  if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
-    id = g_strdup (volume->device_file);
-  else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
-    id = strlen (label) > 0 ? g_strdup (label) : NULL;
-  else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
-    id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
+      if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
+        id = g_strdup (volume->device_file);
+      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
+        id = strlen (label) > 0 ? g_strdup (label) : NULL;
+      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
+        id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
+    }
 
   return id;
 }
@@ -1326,19 +1644,21 @@ g_gdu_volume_enumerate_identifiers (GVolume *_volume)
   const gchar *label;
   const gchar *uuid;
 
-  device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
-
-  label = gdu_device_id_get_label (device);
-  uuid = gdu_device_id_get_uuid (device);
-
-  g_object_unref (device);
-
   p = g_ptr_array_new ();
-  g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
-  if (strlen (label) > 0)
-    g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
-  if (strlen (uuid) > 0)
-    g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
+
+  if (volume->gdu_volume != NULL)
+    {
+      device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
+      label = gdu_device_id_get_label (device);
+      uuid = gdu_device_id_get_uuid (device);
+      g_object_unref (device);
+
+      g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
+      if (strlen (label) > 0)
+        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
+      if (strlen (uuid) > 0)
+        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
+    }
 
   g_ptr_array_add (p, NULL);
 
@@ -1452,3 +1772,9 @@ g_gdu_volume_get_presentable_with_cleartext (GGduVolume *volume)
 
   return GDU_PRESENTABLE (ret);
 }
+
+GUnixMountPoint *
+g_gdu_volume_get_unix_mount_point (GGduVolume *volume)
+{
+  return volume->unix_mount_point;
+}
diff --git a/monitor/gdu/ggduvolume.h b/monitor/gdu/ggduvolume.h
index 8fd7358..a230d28 100644
--- a/monitor/gdu/ggduvolume.h
+++ b/monitor/gdu/ggduvolume.h
@@ -50,6 +50,9 @@ GGduVolume *g_gdu_volume_new            (GVolumeMonitor   *volume_monitor,
                                          GGduDrive        *drive,
                                          GFile            *activation_root);
 
+GGduVolume *g_gdu_volume_new_for_unix_mount_point (GVolumeMonitor   *volume_monitor,
+                                                   GUnixMountPoint  *unix_mount_point);
+
 void        g_gdu_volume_set_mount      (GGduVolume       *volume,
                                          GGduMount        *mount);
 void        g_gdu_volume_unset_mount    (GGduVolume       *volume,
@@ -69,10 +72,12 @@ gboolean    g_gdu_volume_has_uuid       (GGduVolume       *volume,
 gboolean   g_gdu_volume_has_device_file (GGduVolume      *volume,
                                          const gchar     *device_file);
 
-GduPresentable *g_gdu_volume_get_presentable (GGduVolume      *volume);
+GduPresentable *g_gdu_volume_get_presentable (GGduVolume *volume);
 
 GduPresentable *g_gdu_volume_get_presentable_with_cleartext (GGduVolume *volume);
 
+GUnixMountPoint *g_gdu_volume_get_unix_mount_point (GGduVolume *volume);
+
 G_END_DECLS
 
 #endif /* __G_GDU_VOLUME_H__ */
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index caa25a0..67e2ec0 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -51,6 +51,7 @@ struct _GGduVolumeMonitor {
 
   GList *drives;
   GList *volumes;
+  GList *fstab_volumes;
   GList *mounts;
 
   /* we keep volumes/mounts for blank and audio discs separate to handle e.g. mixed discs properly */
@@ -80,6 +81,9 @@ static void update_drives            (GGduVolumeMonitor *monitor,
 static void update_volumes           (GGduVolumeMonitor *monitor,
                                       GList **added_volumes,
                                       GList **removed_volumes);
+static void update_fstab_volumes     (GGduVolumeMonitor *monitor,
+                                      GList **added_volumes,
+                                      GList **removed_volumes);
 static void update_mounts            (GGduVolumeMonitor *monitor,
                                       GList **added_mounts,
                                       GList **removed_mounts);
@@ -135,6 +139,7 @@ g_gdu_volume_monitor_finalize (GObject *object)
   g_list_free (monitor->last_mounts);
 
   list_free (monitor->drives);
+  list_free (monitor->fstab_volumes);
   list_free (monitor->volumes);
   list_free (monitor->mounts);
 
@@ -171,6 +176,8 @@ get_volumes (GVolumeMonitor *volume_monitor)
   monitor = G_GDU_VOLUME_MONITOR (volume_monitor);
 
   l = g_list_copy (monitor->volumes);
+  ll = g_list_copy (monitor->fstab_volumes);
+  l = g_list_concat (l, ll);
   ll = g_list_copy (monitor->disc_volumes);
   l = g_list_concat (l, ll);
 
@@ -211,6 +218,13 @@ get_volume_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid)
         goto found;
     }
 
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      volume = l->data;
+      if (g_gdu_volume_has_uuid (volume, uuid))
+        goto found;
+    }
+
   for (l = monitor->disc_volumes; l != NULL; l = l->next)
     {
       volume = l->data;
@@ -549,14 +563,49 @@ find_volume_for_mount_path (GGduVolumeMonitor *monitor,
   for (l = monitor->volumes; l != NULL; l = l->next)
     {
       GGduVolume *volume = l->data;
+      if (g_gdu_volume_has_mount_path (volume, mount_path))
+        {
+          found = volume;
+          goto out;
+        }
+    }
 
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      GGduVolume *volume = l->data;
       if (g_gdu_volume_has_mount_path (volume, mount_path))
         {
           found = volume;
-          break;
+          goto out;
         }
     }
 
+ out:
+  return found;
+}
+
+static GGduVolume *
+find_volume_for_unix_mount_point (GGduVolumeMonitor *monitor,
+                                  GUnixMountPoint   *unix_mount_point)
+{
+  GList *l;
+  GGduVolume *found;
+
+  found = NULL;
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      GGduVolume *volume = l->data;
+      GUnixMountPoint *volume_mount_point;
+
+      volume_mount_point = g_gdu_volume_get_unix_mount_point (volume);
+      if (g_unix_mount_point_compare (unix_mount_point, volume_mount_point) == 0)
+        {
+          found = volume;
+          goto out;
+        }
+    }
+
+ out:
   return found;
 }
 
@@ -859,6 +908,7 @@ update_all (GGduVolumeMonitor *monitor,
 
   update_drives (monitor, &added_drives, &removed_drives);
   update_volumes (monitor, &added_volumes, &removed_volumes);
+  update_fstab_volumes (monitor, &added_volumes, &removed_volumes);
   update_mounts (monitor, &added_mounts, &removed_mounts);
   update_discs (monitor,
                 &added_volumes, &removed_volumes,
@@ -935,16 +985,34 @@ find_volume_for_device_file (GGduVolumeMonitor *monitor,
                             const gchar       *device_file)
 {
   GList *l;
+  GGduVolume *ret;
 
+  ret = NULL;
   for (l = monitor->volumes; l != NULL; l = l->next)
     {
       GGduVolume *volume = G_GDU_VOLUME (l->data);
 
       if (g_gdu_volume_has_device_file (volume, device_file))
-        return volume;
+        {
+          ret = volume;
+          goto out;
+        }
     }
 
-  return NULL;
+  ret = NULL;
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      GGduVolume *volume = G_GDU_VOLUME (l->data);
+
+      if (g_gdu_volume_has_device_file (volume, device_file))
+        {
+          ret = volume;
+          goto out;
+        }
+    }
+
+ out:
+  return ret;
 }
 
 static GGduDrive *
@@ -1189,6 +1257,106 @@ update_volumes (GGduVolumeMonitor *monitor,
 }
 
 static void
+update_fstab_volumes (GGduVolumeMonitor *monitor,
+                      GList **added_volumes,
+                      GList **removed_volumes)
+{
+  GList *fstab_mount_points;
+  GList *cur_fstab_mount_points;
+  GList *new_fstab_mount_points;
+  GList *removed, *added;
+  GList *l;
+  GGduVolume *volume;
+
+  fstab_mount_points = g_unix_mount_points_get (NULL);
+
+  cur_fstab_mount_points = NULL;
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    cur_fstab_mount_points = g_list_prepend (cur_fstab_mount_points, g_gdu_volume_get_unix_mount_point (G_GDU_VOLUME (l->data)));
+
+  new_fstab_mount_points = NULL;
+  for (l = fstab_mount_points; l != NULL; l = l->next)
+    {
+      GUnixMountPoint *mount_point = l->data;
+      const gchar *device_file;
+
+      /* only show user mountable mount points */
+      if (!g_unix_mount_point_is_user_mountable (mount_point))
+        continue;
+
+      /* only show stuff that can be mounted in user-visible locations */
+      if (!_g_unix_mount_point_guess_should_display (mount_point))
+        continue;
+
+      /* ignore mount point if the device doesn't exist or is handled by DeviceKit-disks */
+      device_file = g_unix_mount_point_get_device_path (mount_point);
+      if (g_str_has_prefix (device_file, "/dev/"))
+        {
+          gchar resolved_path[PATH_MAX];
+          GduDevice *device;
+
+          /* doesn't exist */
+          if (realpath (device_file, resolved_path) != 0)
+            continue;
+
+          /* is handled by DKD */
+          device = gdu_pool_get_by_device_file (monitor->pool, resolved_path);
+          if (device != NULL)
+            {
+              g_object_unref (device);
+              continue;
+            }
+        }
+
+      new_fstab_mount_points = g_list_prepend (new_fstab_mount_points, mount_point);
+    }
+
+  diff_sorted_lists (cur_fstab_mount_points,
+                     new_fstab_mount_points, (GCompareFunc) g_unix_mount_point_compare,
+                     &added, &removed);
+
+  for (l = removed; l != NULL; l = l->next)
+    {
+      GUnixMountPoint *mount_point = l->data;
+      volume = find_volume_for_unix_mount_point (monitor, mount_point);
+      if (volume != NULL)
+        {
+          g_gdu_volume_removed (volume);
+          monitor->fstab_volumes = g_list_remove (monitor->fstab_volumes, volume);
+          *removed_volumes = g_list_prepend (*removed_volumes, volume);
+          /*g_debug ("removed volume for /etc/fstab mount point %s", g_unix_mount_point_get_mount_path (mount_point));*/
+        }
+    }
+
+  for (l = added; l != NULL; l = l->next)
+    {
+      GUnixMountPoint *mount_point = l->data;
+
+      volume = g_gdu_volume_new_for_unix_mount_point (G_VOLUME_MONITOR (monitor), mount_point);
+      if (volume != NULL)
+        {
+          /* steal mount_point since g_gdu_volume_new_for_unix_mount_point() takes ownership of it */
+          fstab_mount_points = g_list_remove (fstab_mount_points, mount_point);
+          monitor->fstab_volumes = g_list_prepend (monitor->fstab_volumes, volume);
+          *added_volumes = g_list_prepend (*added_volumes, g_object_ref (volume));
+          /*g_debug ("added volume for /etc/fstab mount point %s", g_unix_mount_point_get_mount_path (mount_point));*/
+        }
+      else
+        {
+          g_unix_mount_point_free (mount_point);
+        }
+    }
+
+  g_list_free (added);
+  g_list_free (removed);
+
+  g_list_free (cur_fstab_mount_points);
+
+  g_list_foreach (fstab_mount_points, (GFunc) g_unix_mount_point_free, NULL);
+  g_list_free (fstab_mount_points);
+}
+
+static void
 update_mounts (GGduVolumeMonitor *monitor,
                GList **added_mounts,
                GList **removed_mounts)
-- 
1.6.2.2


gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch:

--- NEW FILE gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch ---
>From 8d9fc8a777fb1b00ae371e276a14416a0987f4af Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 13 Apr 2009 14:20:15 -0400
Subject: [PATCH 11/13] =?utf-8?q?Bug=20576083=20=E2=80=93=20pre-unmount=20signals=20not=20being=20triggered?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Basically emit GVolumeMonitor::mount-pre-unmount on the volume monitor
and retry unmount operation a couple of times.
---
 monitor/gdu/ggdumount.c |  177 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 142 insertions(+), 35 deletions(-)

diff --git a/monitor/gdu/ggdumount.c b/monitor/gdu/ggdumount.c
index e074a20..78088d5 100644
--- a/monitor/gdu/ggdumount.c
+++ b/monitor/gdu/ggdumount.c
@@ -38,6 +38,9 @@
 #include "ggdumount.h"
 #include "ggduvolume.h"
 
+#define BUSY_UNMOUNT_NUM_ATTEMPTS              5
+#define BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS 500
+
 struct _GGduMount
 {
   GObject parent;
@@ -451,26 +454,52 @@ g_gdu_mount_can_eject (GMount *_mount)
 
 typedef struct {
   GMount *mount;
+
+  gchar **argv;
+  guint num_attempts_left;
+
   GAsyncReadyCallback callback;
   gpointer user_data;
   GCancellable *cancellable;
+
   int error_fd;
   GIOChannel *error_channel;
   guint error_channel_source_id;
   GString *error_string;
-} UnmountEjectOp;
+
+} UnmountOp;
+
+static gboolean unmount_attempt (UnmountOp *data);
 
 static void
-eject_unmount_cb (GPid pid, gint status, gpointer user_data)
+unmount_cb (GPid pid, gint status, gpointer user_data)
 {
-  UnmountEjectOp *data = user_data;
+  UnmountOp *data = user_data;
   GSimpleAsyncResult *simple;
 
+  g_spawn_close_pid (pid);
+
   if (WEXITSTATUS (status) != 0)
     {
       GError *error;
+      gint error_code;
+
+      error_code = G_IO_ERROR_FAILED;
+      /* we may want to add more strstr() checks here depending on what unmount helper is being used etc... */
+      if (data->error_string->str != NULL && strstr (data->error_string->str, "is busy") != NULL)
+        error_code = G_IO_ERROR_BUSY;
+
+      if (error_code == G_IO_ERROR_BUSY && data->num_attempts_left > 0)
+        {
+          g_timeout_add (BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS,
+                         (GSourceFunc) unmount_attempt,
+                         data);
+          data->num_attempts_left -= 1;
+          goto out;
+        }
+
       error = g_error_new_literal (G_IO_ERROR,
-                                   G_IO_ERROR_FAILED,
+                                   error_code,
                                    data->error_string->str);
       simple = g_simple_async_result_new_from_error (G_OBJECT (data->mount),
                                                      data->callback,
@@ -493,16 +522,19 @@ eject_unmount_cb (GPid pid, gint status, gpointer user_data)
   g_io_channel_unref (data->error_channel);
   g_string_free (data->error_string, TRUE);
   close (data->error_fd);
-  g_spawn_close_pid (pid);
+  g_strfreev (data->argv);
   g_free (data);
+
+ out:
+  ;
 }
 
 static gboolean
-eject_unmount_read_error (GIOChannel *channel,
-                          GIOCondition condition,
-                          gpointer user_data)
+unmount_read_error (GIOChannel *channel,
+                    GIOCondition condition,
+                    gpointer user_data)
 {
-  UnmountEjectOp *data = user_data;
+  UnmountOp *data = user_data;
   gchar buf[BUFSIZ];
   gsize bytes_read;
   GError *error;
@@ -532,26 +564,15 @@ read:
   return TRUE;
 }
 
-static void
-eject_unmount_do (GMount              *mount,
-                  GCancellable        *cancellable,
-                  GAsyncReadyCallback  callback,
-                  gpointer             user_data,
-                  char               **argv)
+static gboolean
+unmount_attempt (UnmountOp *data)
 {
-  UnmountEjectOp *data;
   GPid child_pid;
   GError *error;
 
-  data = g_new0 (UnmountEjectOp, 1);
-  data->mount = mount;
-  data->callback = callback;
-  data->user_data = user_data;
-  data->cancellable = cancellable;
-
   error = NULL;
   if (!g_spawn_async_with_pipes (NULL,         /* working dir */
-                                 argv,
+                                 data->argv,
                                  NULL,         /* envp */
                                  G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
                                  NULL,         /* child_setup */
@@ -572,8 +593,8 @@ eject_unmount_do (GMount              *mount,
   if (error != NULL)
     goto handle_error;
 
-  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, eject_unmount_read_error, data);
-  g_child_watch_add (child_pid, eject_unmount_cb, data);
+  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, unmount_read_error, data);
+  g_child_watch_add (child_pid, unmount_cb, data);
 
 handle_error:
 
@@ -596,6 +617,28 @@ handle_error:
       g_error_free (error);
       g_free (data);
     }
+
+  return FALSE;
+}
+
+static void
+unmount_do (GMount              *mount,
+            GCancellable        *cancellable,
+            GAsyncReadyCallback  callback,
+            gpointer             user_data,
+            char               **argv)
+{
+  UnmountOp *data;
+
+  data = g_new0 (UnmountOp, 1);
+  data->mount = mount;
+  data->callback = callback;
+  data->user_data = user_data;
+  data->cancellable = cancellable;
+  data->num_attempts_left = BUSY_UNMOUNT_NUM_ATTEMPTS;
+  data->argv = g_strdupv (argv);
+
+  unmount_attempt (data);
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -619,19 +662,54 @@ luks_lock_cb (GduDevice *device,
   g_object_unref (simple);
 }
 
+static gboolean gdu_unmount_attempt (GSimpleAsyncResult *simple);
+
 static void
-unmount_cb (GduDevice *device,
-            GError    *error,
-            gpointer   user_data)
+gdu_unmount_cb (GduDevice *device,
+                GError    *error,
+                gpointer   user_data)
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
 
   if (error != NULL)
     {
+      gint error_code;
+
+      /*g_debug ("domain=%s error_code=%d '%s'", g_quark_to_string (error->domain), error->code, error->message);*/
+
+      error_code = G_IO_ERROR_FAILED;
+      if (error->domain == GDU_ERROR && error->code == GDU_ERROR_BUSY)
+        error_code = G_IO_ERROR_BUSY;
+
       /* We could handle PolicyKit integration here but this action is allowed by default
        * and this won't be needed when porting to PolicyKit 1.0 anyway
        */
-      g_simple_async_result_set_from_error (simple, error);
+
+      if (error_code == G_IO_ERROR_BUSY)
+        {
+          guint num_attempts_left;
+
+          num_attempts_left = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (simple), "num-attempts-left"));
+
+          if (num_attempts_left > 0)
+            {
+              num_attempts_left -= 1;
+              g_object_set_data (G_OBJECT (simple),
+                                 "num-attempts-left",
+                                 GUINT_TO_POINTER (num_attempts_left));
+
+              g_timeout_add (BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS,
+                             (GSourceFunc) gdu_unmount_attempt,
+                             simple);
+              goto out;
+            }
+        }
+
+      g_simple_async_result_set_error (simple,
+                                       G_IO_ERROR,
+                                       error_code,
+                                       "%s",
+                                       error->message);
       g_error_free (error);
       g_simple_async_result_complete (simple);
       g_object_unref (simple);
@@ -687,6 +765,17 @@ unmount_cb (GduDevice *device,
   ;
 }
 
+static gboolean
+gdu_unmount_attempt (GSimpleAsyncResult *simple)
+{
+  GduDevice *device;
+
+  /* TODO: honor flags */
+  device = g_object_get_data (G_OBJECT (simple), "gdu-device");
+  gdu_device_op_filesystem_unmount (device, gdu_unmount_cb, simple);
+  return FALSE;
+}
+
 static void
 g_gdu_mount_unmount (GMount              *_mount,
                      GMountUnmountFlags   flags,
@@ -698,6 +787,21 @@ g_gdu_mount_unmount (GMount              *_mount,
   GSimpleAsyncResult *simple;
   GduPresentable *gdu_volume;
 
+  /* emit the ::mount-pre-unmount signal */
+  g_signal_emit_by_name (mount->volume_monitor, "mount-pre-unmount", mount);
+
+  /* If we end up with G_IO_ERROR_BUSY, try again BUSY_UNMOUNT_NUM_ATTEMPTS times
+   * waiting BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS milliseconds between each
+   * attempt.
+   *
+   * This is to give other processes recieving the ::mount-pre-unmount signal some
+   * time to close file descriptors.
+   *
+   * TODO: Unfortunately this code is a bit messy because we take two different
+   *       codepaths depending on whether we use GDU or the native unmount command.
+   *       It would be good to clean this up.
+   */
+
   gdu_volume = NULL;
   if (mount->volume != NULL)
     gdu_volume = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
@@ -713,7 +817,7 @@ g_gdu_mount_unmount (GMount              *_mount,
       else
         argv[1] = mount->device_file;
 
-      eject_unmount_do (_mount, cancellable, callback, user_data, argv);
+      unmount_do (_mount, cancellable, callback, user_data, argv);
     }
   else if (gdu_volume != NULL)
     {
@@ -722,6 +826,10 @@ g_gdu_mount_unmount (GMount              *_mount,
                                           user_data,
                                           NULL);
 
+      g_object_set_data (G_OBJECT (simple),
+                         "num-attempts-left",
+                         GUINT_TO_POINTER (BUSY_UNMOUNT_NUM_ATTEMPTS));
+
       if (mount->is_burn_mount)
         {
           /* burn mounts are really never mounted... */
@@ -731,12 +839,9 @@ g_gdu_mount_unmount (GMount              *_mount,
       else
         {
           GduDevice *device;
-
-          /* TODO: honor flags */
-
           device = gdu_presentable_get_device (gdu_volume);
-          gdu_device_op_filesystem_unmount (device, unmount_cb, simple);
-          g_object_unref (device);
+          g_object_set_data_full (G_OBJECT (simple), "gdu-device", device, g_object_unref);
+          gdu_unmount_attempt (simple);
         }
     }
   else
@@ -760,6 +865,8 @@ g_gdu_mount_unmount_finish (GMount       *mount,
   return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
 }
 
+/* ---------------------------------------------------------------------------------------------------- */
+
 typedef struct {
   GObject *object;
   GAsyncReadyCallback callback;
-- 
1.6.2.2


gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch:

--- NEW FILE gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch ---
>From 2bce9f36bd365be284c10af6a1f74c6120adc3e8 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 15 Apr 2009 11:33:36 -0400
Subject: [PATCH 12/13] use new gnome-disk-utility API to hide unwanted devices

This is to resolve bugs like

 https://bugzilla.redhat.com/show_bug.cgi?id=495170
---
 monitor/gdu/ggduvolumemonitor.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 67e2ec0..2c1f727 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -720,6 +720,12 @@ should_mount_be_ignored (GduPool *pool, GduDevice *d)
 
   ret = FALSE;
 
+  if (gdu_device_get_presentation_hide (d))
+    {
+      ret = TRUE;
+      goto out;
+    }
+
   mount_path = gdu_device_get_mount_path (d);
   if (mount_path == NULL || strlen (mount_path) == 0)
     goto out;
@@ -751,6 +757,9 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume));
 
+  if (gdu_device_get_presentation_hide (device))
+    goto out;
+
   usage = gdu_device_id_get_usage (device);
   type = gdu_device_id_get_type (device);
 
@@ -824,6 +833,9 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
       goto out;
     }
 
+  if (gdu_device_get_presentation_hide (device))
+    goto out;
+
   has_volumes = FALSE;
   all_volumes_are_ignored = TRUE;
 
-- 
1.6.2.2


gdu-0013-pass-the-flush-mount-option-for-vfat.patch:

--- NEW FILE gdu-0013-pass-the-flush-mount-option-for-vfat.patch ---
>From 7fd9061afbd0ec4664adb17aed706e12fd5f3eee Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 15 Apr 2009 14:41:27 -0400
Subject: [PATCH 13/13] pass the 'flush' mount option for vfat

This mount option makes the vfat filesystem driver flush data more
often. As a consequence

 1. users never get to see the gnome-disk-utility notification daemon
    dialog just added

     http://people.freedesktop.org/~david/gdu-unmount-busy-1.png

    but that's useful for other filesystems as well.

 2. The Nautilus copy dialog stays up until things are on the disk

We do this in gvfs rather than DeviceKit-disks because in some
scenarios 'flush' may be unwanted and there is currently no way to
turn it off (e.g. no 'noflush' or 'flush=0' option).

Ideally the kernel would get this kind of thing right by itself.
---
 monitor/gdu/ggduvolume.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 49494a1..871a1c5 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -648,6 +648,27 @@ g_gdu_volume_get_mount (GVolume *volume)
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static gchar **
+get_mount_options (GduDevice *device)
+{
+  gchar **ret;
+
+  /* one day we might read this from user settings */
+  if (g_strcmp0 (gdu_device_id_get_usage (device), "filesystem") == 0 &&
+      g_strcmp0 (gdu_device_id_get_type (device), "vfat") == 0)
+    {
+      ret = g_new0 (gchar *, 2);
+      ret[0] = g_strdup ("flush");
+      ret[1] = NULL;
+    }
+  else
+    ret = NULL;
+
+  return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
 struct MountOpData
 {
   GGduVolume *volume;
@@ -735,8 +756,11 @@ mount_obtain_authz_cb (GObject *source_object,
     }
   else
     {
+      gchar **mount_options;
       /* got the authz, now try again */
-      gdu_device_op_filesystem_mount (data->device_to_mount, mount_cb, data);
+      mount_options = get_mount_options (data->device_to_mount);
+      gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
+      g_strfreev (mount_options);
       goto out;
     }
 
@@ -842,7 +866,10 @@ mount_cleartext_device (MountOpData *data,
     }
   else
     {
-      gdu_device_op_filesystem_mount (data->device_to_mount, mount_cb, data);
+      gchar **mount_options;
+      mount_options = get_mount_options (data->device_to_mount);
+      gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
+      g_strfreev (mount_options);
     }
 
   g_object_unref (pool);
@@ -1260,8 +1287,11 @@ g_gdu_volume_mount (GVolume             *_volume,
     }
   else
     {
+      gchar **mount_options;
       data->device_to_mount = g_object_ref (device);
-      gdu_device_op_filesystem_mount (data->device_to_mount, mount_cb, data);
+      mount_options = get_mount_options (data->device_to_mount);
+      gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
+      g_strfreev (mount_options);
     }
 
  out:
-- 
1.6.2.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gvfs.spec	13 Apr 2009 19:16:30 -0000	1.125
+++ gvfs.spec	15 Apr 2009 19:24:55 -0000	1.126
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -57,6 +57,13 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=495152
 Patch108: gdu-0008-ignore-drives-without-volumes.patch
 Patch109: gdu-0009-never-ignore-drives-without-media.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=536292
+Patch110: gdu-0010-show-user-mountable-fstab-entries.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=576083
+Patch111: gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=495170
+Patch112: gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch
+Patch113: gdu-0013-pass-the-flush-mount-option-for-vfat.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -152,6 +159,10 @@
 %patch107 -p1 -b .gdu-always-eject
 %patch108 -p1 -b .gdu-ignore-drives-without-volumes
 %patch109 -p1 -b .gdu-never-ignore-drives-without-media
+%patch110 -p1 -b .gdu-user-mountable-fstab-entries
+%patch111 -p1 -b .gdu-pre-unmount-signals
+%patch112 -p1 -b .gdu-unwanted-devices
+%patch113 -p1 -b .gdu-vfat-flush
 
 %build
 
@@ -295,6 +306,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 1.2.2-3
+- Sync with the gdu-volume-monitor branch
+
 * Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 1.2.2-2
 - Add ssh-auth-sock patch from svn
 



From davidz at fedoraproject.org  Wed Apr 15 19:25:46 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 15 Apr 2009 19:25:46 +0000 (UTC)
Subject: rpms/gvfs/F-11 gdu-0010-show-user-mountable-fstab-entries.patch,
	NONE, 
	1.1 gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch, 
	NONE, 1.1
	gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch,
	NONE, 1.1 gdu-0013-pass-the-flush-mount-option-for-vfat.patch,
	NONE, 1.1 gvfs.spec, 1.125, 1.126
Message-ID: <20090415192546.8DDB270101@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19043

Modified Files:
	gvfs.spec 
Added Files:
	gdu-0010-show-user-mountable-fstab-entries.patch 
	gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch 
	gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch 
	gdu-0013-pass-the-flush-mount-option-for-vfat.patch 
Log Message:
* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 1.2.2-3
- Sync with the gdu-volume-monitor branch



gdu-0010-show-user-mountable-fstab-entries.patch:

--- NEW FILE gdu-0010-show-user-mountable-fstab-entries.patch ---
>From 0f7a44dd0eac01f9783879af4ca3d3fe4a53af14 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 13 Apr 2009 10:57:38 -0400
Subject: [PATCH 10/13] show user-mountable fstab entries

Show all entries from /etc/fstab for which

 - the entry is user mountable
 - the mount point is in /media or $HOME
 - if it's a /dev file make sure it exists and is not handled
   by DeviceKit-disks already

For example this /etc/fstab entry

 "quad.local:/media/FusionMedia /media/FusionMedia nfs defaults,users     0 0"

makes Nautilus display this when unmounted

 http://people.freedesktop.org/~david/gvfs-user-mountable-fstab-entries.png

and these GVolume and GMount objects to appear when mounted

 Volume(0): FusionMedia
   Type: GProxyVolume (GProxyVolumeMonitorGdu)
   themed icons:  [folder-remote]  [folder]
   can_mount=1
   can_eject=0
   Mount(0): FusionMedia -> file:///media/FusionMedia
     Type: GProxyMount (GProxyVolumeMonitorGdu)
     themed icons:  [folder-remote]  [folder]
     can_unmount=1
     can_eject=0
     is_shadowed=0

This should resolve http://bugzilla.gnome.org/show_bug.cgi?id=536292
---
 monitor/gdu/ggdumount.c         |   29 +++-
 monitor/gdu/ggduvolume.c        |  374 ++++++++++++++++++++++++++++++++++++---
 monitor/gdu/ggduvolume.h        |    7 +-
 monitor/gdu/ggduvolumemonitor.c |  174 ++++++++++++++++++-
 4 files changed, 548 insertions(+), 36 deletions(-)

diff --git a/monitor/gdu/ggdumount.c b/monitor/gdu/ggdumount.c
index 27c22d9..e074a20 100644
--- a/monitor/gdu/ggdumount.c
+++ b/monitor/gdu/ggdumount.c
@@ -696,8 +696,13 @@ g_gdu_mount_unmount (GMount              *_mount,
 {
   GGduMount *mount = G_GDU_MOUNT (_mount);
   GSimpleAsyncResult *simple;
+  GduPresentable *gdu_volume;
 
-  if (mount->volume == NULL)
+  gdu_volume = NULL;
+  if (mount->volume != NULL)
+    gdu_volume = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
+
+  if (mount->volume == NULL || gdu_volume == NULL)
     {
       gchar *argv[] = {"umount", NULL, NULL};
 
@@ -710,7 +715,7 @@ g_gdu_mount_unmount (GMount              *_mount,
 
       eject_unmount_do (_mount, cancellable, callback, user_data, argv);
     }
-  else
+  else if (gdu_volume != NULL)
     {
       simple = g_simple_async_result_new (G_OBJECT (mount),
                                           callback,
@@ -726,18 +731,25 @@ g_gdu_mount_unmount (GMount              *_mount,
       else
         {
           GduDevice *device;
-          GduPresentable *volume;
 
           /* TODO: honor flags */
 
-          volume = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
-          device = gdu_presentable_get_device (volume);
-
+          device = gdu_presentable_get_device (gdu_volume);
           gdu_device_op_filesystem_unmount (device, unmount_cb, simple);
-
           g_object_unref (device);
         }
     }
+  else
+    {
+      simple = g_simple_async_result_new_error (G_OBJECT (mount),
+                                                callback,
+                                                user_data,
+                                                G_IO_ERROR,
+                                                G_IO_ERROR_FAILED,
+                                                _("Operation not supported by backend"));
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+    }
 }
 
 static gboolean
@@ -855,7 +867,8 @@ g_gdu_mount_guess_content_type_sync (GMount              *_mount,
     {
       GduPresentable *presentable;
       presentable = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
-      device = gdu_presentable_get_device (presentable);
+      if (presentable != NULL)
+        device = gdu_presentable_get_device (presentable);
     }
 
   /* doesn't make sense to probe blank discs - look at the disc type instead */
diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 6779f0f..49494a1 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -35,12 +35,22 @@
 #include "ggduvolume.h"
 #include "ggdumount.h"
 
+/* for BUFSIZ */
+#include <stdio.h>
+
 #include "polkit.h"
 
 typedef struct MountOpData MountOpData;
 
 static void cancel_pending_mount_op (MountOpData *data);
 
+static void g_gdu_volume_mount_unix_mount_point (GGduVolume          *volume,
+                                                 GMountMountFlags     flags,
+                                                 GMountOperation     *mount_operation,
+                                                 GCancellable        *cancellable,
+                                                 GAsyncReadyCallback  callback,
+                                                 gpointer             user_data);
+
 struct _GGduVolume
 {
   GObject parent;
@@ -49,8 +59,12 @@ struct _GGduVolume
   GGduMount      *mount;          /* owned by volume monitor */
   GGduDrive      *drive;          /* owned by volume monitor */
 
+  /* only set if constructed via new() */
   GduVolume *gdu_volume;
 
+  /* only set if constructed via new_for_unix_mount_point() */
+  GUnixMountPoint *unix_mount_point;
+
   /* if the volume is encrypted, this is != NULL when unlocked */
   GduVolume *cleartext_gdu_volume;
 
@@ -60,7 +74,7 @@ struct _GGduVolume
    */
   MountOpData *pending_mount_op;
 
-  /* the following members need to be set upon construction */
+  /* the following members need to be set upon construction, see constructors and update_volume() */
   GIcon *icon;
   GFile *activation_root;
   gchar *name;
@@ -110,6 +124,11 @@ g_gdu_volume_finalize (GObject *object)
       g_object_unref (volume->gdu_volume);
     }
 
+  if (volume->unix_mount_point != NULL)
+    {
+      g_unix_mount_point_free (volume->unix_mount_point);
+    }
+
   if (volume->cleartext_gdu_volume != NULL)
     {
       g_signal_handlers_disconnect_by_func (volume->cleartext_gdu_volume, gdu_cleartext_volume_removed, volume);
@@ -174,6 +193,30 @@ update_volume (GGduVolume *volume)
 
   /* ---------------------------------------------------------------------------------------------------- */
 
+  /* if the volume is a fstab mount point, get the data from there */
+  if (volume->unix_mount_point != NULL)
+    {
+      volume->can_mount = TRUE;
+      volume->should_automount = FALSE;
+
+      g_free (volume->device_file);
+      volume->device_file = g_strdup (g_unix_mount_point_get_device_path (volume->unix_mount_point));
+
+      if (volume->icon != NULL)
+        g_object_unref (volume->icon);
+      if (g_strcmp0 (g_unix_mount_point_get_fs_type (volume->unix_mount_point), "nfs") == 0)
+        volume->icon = g_themed_icon_new_with_default_fallbacks ("folder-remote");
+      else
+        volume->icon = g_unix_mount_point_guess_icon (volume->unix_mount_point);
+
+      g_free (volume->name);
+      volume->name = g_unix_mount_point_guess_name (volume->unix_mount_point);
+
+      //volume->can_eject = g_unix_mount_point_guess_can_eject (volume->unix_mount_point);
+
+      goto update_done;
+    }
+
   /* in with the new */
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
   pool = gdu_device_get_pool (device);
@@ -347,6 +390,8 @@ update_volume (GGduVolume *volume)
 
   /* ---------------------------------------------------------------------------------------------------- */
 
+ update_done:
+
   /* compute whether something changed */
   changed = !((old_can_mount == volume->can_mount) &&
               (old_should_automount == volume->should_automount) &&
@@ -412,6 +457,23 @@ gdu_cleartext_volume_job_changed (GduPresentable *presentable,
 }
 
 GGduVolume *
+g_gdu_volume_new_for_unix_mount_point (GVolumeMonitor   *volume_monitor,
+                                       GUnixMountPoint  *unix_mount_point)
+{
+  GGduVolume *volume;
+
+  volume = g_object_new (G_TYPE_GDU_VOLUME, NULL);
+  volume->volume_monitor = volume_monitor;
+  g_object_add_weak_pointer (G_OBJECT (volume_monitor), (gpointer) &(volume->volume_monitor));
+
+  volume->unix_mount_point = unix_mount_point;
+
+  update_volume (volume);
+
+  return volume;
+}
+
+GGduVolume *
 g_gdu_volume_new (GVolumeMonitor   *volume_monitor,
                   GduVolume        *gdu_volume,
                   GGduDrive        *drive,
@@ -1084,6 +1146,18 @@ g_gdu_volume_mount (GVolume             *_volume,
   pool = NULL;
   device = NULL;
 
+  /* for fstab mounts, call the native mount command */
+  if (volume->unix_mount_point != NULL)
+    {
+      g_gdu_volume_mount_unix_mount_point (volume,
+                                           flags,
+                                           mount_operation,
+                                           cancellable,
+                                           callback,
+                                           user_data);
+      goto out;
+    }
+
   if (volume->pending_mount_op != NULL)
     {
       simple = g_simple_async_result_new_error (G_OBJECT (volume),
@@ -1204,7 +1278,7 @@ g_gdu_volume_mount_finish (GVolume       *volume,
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
 
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_gdu_volume_mount);
+  //g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_gdu_volume_mount);
 
   return !g_simple_async_result_propagate_error (simple, error);
 }
@@ -1212,6 +1286,247 @@ g_gdu_volume_mount_finish (GVolume       *volume,
 /* ---------------------------------------------------------------------------------------------------- */
 
 typedef struct {
+  GGduVolume *volume;
+  GAsyncReadyCallback callback;
+  gpointer user_data;
+  GCancellable *cancellable;
+  int error_fd;
+  GIOChannel *error_channel;
+  guint error_channel_source_id;
+  GString *error_string;
+
+  guint wait_for_mount_timeout_id;
+  gulong wait_for_mount_changed_signal_handler_id;
+} MountPointOp;
+
+static void
+mount_point_op_free (MountPointOp *data)
+{
+  if (data->error_channel_source_id > 0)
+    g_source_remove (data->error_channel_source_id);
+  if (data->error_channel != NULL)
+    g_io_channel_unref (data->error_channel);
+  if (data->error_string != NULL)
+    g_string_free (data->error_string, TRUE);
+  if (data->error_fd > 0)
+    close (data->error_fd);
+  g_free (data);
+}
+
+static void
+mount_point_op_changed_cb (GVolume *volume,
+                           gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  GSimpleAsyncResult *simple;
+
+  /* keep waiting if the mount hasn't appeared */
+  if (data->volume->mount == NULL)
+    goto out;
+
+  simple = g_simple_async_result_new (G_OBJECT (data->volume),
+                                      data->callback,
+                                      data->user_data,
+                                      NULL);
+  /* complete in idle to make sure the mount is added before we return */
+  g_simple_async_result_complete_in_idle (simple);
+  g_object_unref (simple);
+
+  g_signal_handler_disconnect (data->volume, data->wait_for_mount_changed_signal_handler_id);
+  g_source_remove (data->wait_for_mount_timeout_id);
+
+  mount_point_op_free (data);
+
+ out:
+  ;
+}
+
+static gboolean
+mount_point_op_never_appeared_cb (gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  GSimpleAsyncResult *simple;
+
+  simple = g_simple_async_result_new_error (G_OBJECT (data->volume),
+                                            data->callback,
+                                            data->user_data,
+                                            G_IO_ERROR,
+                                            G_IO_ERROR_FAILED,
+                                            "Timeout waiting for mount to appear");
+  g_simple_async_result_complete (simple);
+  g_object_unref (simple);
+
+  g_signal_handler_disconnect (data->volume, data->wait_for_mount_changed_signal_handler_id);
+  g_source_remove (data->wait_for_mount_timeout_id);
+
+  mount_point_op_free (data);
+
+  return FALSE;
+}
+
+static void
+mount_point_op_cb (GPid pid, gint status, gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  GSimpleAsyncResult *simple;
+
+  g_spawn_close_pid (pid);
+
+  if (WEXITSTATUS (status) != 0)
+    {
+      GError *error;
+      error = g_error_new_literal (G_IO_ERROR,
+                                   G_IO_ERROR_FAILED,
+                                   data->error_string->str);
+      simple = g_simple_async_result_new_from_error (G_OBJECT (data->volume),
+                                                     data->callback,
+                                                     data->user_data,
+                                                     error);
+      g_error_free (error);
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+      mount_point_op_free (data);
+    }
+  else
+    {
+      /* wait for the GMount to appear - this is to honor this requirement
+       *
+       *  "If the mount operation succeeded, g_volume_get_mount() on
+       *   volume is guaranteed to return the mount right after calling
+       *   this function; there's no need to listen for the
+       *   'mount-added' signal on GVolumeMonitor."
+       *
+       * So we set up a signal handler waiting for it to appear. We also set up
+       * a timer for handling the case when it never appears.
+       */
+      if (data->volume->mount == NULL)
+        {
+          /* no need to ref, GSimpleAsyncResult has a ref on data->volume */
+          data->wait_for_mount_timeout_id = g_timeout_add (5 * 1000,
+                                            mount_point_op_never_appeared_cb,
+                                            data);
+          data->wait_for_mount_changed_signal_handler_id = g_signal_connect (data->volume,
+                                                                             "changed",
+                                                                             G_CALLBACK (mount_point_op_changed_cb),
+                                                                             data);
+        }
+      else
+        {
+          /* have the mount already, finish up */
+          simple = g_simple_async_result_new (G_OBJECT (data->volume),
+                                              data->callback,
+                                              data->user_data,
+                                              NULL);
+          g_simple_async_result_complete (simple);
+          g_object_unref (simple);
+          mount_point_op_free (data);
+        }
+    }
+}
+
+static gboolean
+mount_point_op_read_error (GIOChannel *channel,
+                           GIOCondition condition,
+                           gpointer user_data)
+{
+  MountPointOp *data = user_data;
+  gchar buf[BUFSIZ];
+  gsize bytes_read;
+  GError *error;
+  GIOStatus status;
+
+  error = NULL;
+read:
+  status = g_io_channel_read_chars (channel, buf, sizeof (buf), &bytes_read, &error);
+  if (status == G_IO_STATUS_NORMAL)
+   {
+     g_string_append_len (data->error_string, buf, bytes_read);
+     if (bytes_read == sizeof (buf))
+        goto read;
+   }
+  else if (status == G_IO_STATUS_EOF)
+    {
+      g_string_append_len (data->error_string, buf, bytes_read);
+    }
+  else if (status == G_IO_STATUS_ERROR)
+    {
+      if (data->error_string->len > 0)
+        g_string_append (data->error_string, "\n");
+
+      g_string_append (data->error_string, error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+g_gdu_volume_mount_unix_mount_point (GGduVolume          *volume,
+                                     GMountMountFlags     flags,
+                                     GMountOperation     *mount_operation,
+                                     GCancellable        *cancellable,
+                                     GAsyncReadyCallback  callback,
+                                     gpointer             user_data)
+{
+  MountPointOp *data;
+  GPid child_pid;
+  GError *error;
+  const gchar *argv[] = {"mount", NULL, NULL};
+
+  argv[1] = g_unix_mount_point_get_mount_path (volume->unix_mount_point);
+
+  data = g_new0 (MountPointOp, 1);
+  data->volume = volume;
+  data->callback = callback;
+  data->user_data = user_data;
+  data->cancellable = cancellable;
+
+  error = NULL;
+  if (!g_spawn_async_with_pipes (NULL,         /* working dir */
+                                 (gchar **) argv,
+                                 NULL,         /* envp */
+                                 G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
+                                 NULL,         /* child_setup */
+                                 NULL,         /* user_data for child_setup */
+                                 &child_pid,
+                                 NULL,         /* standard_input */
+                                 NULL,         /* standard_output */
+                                 &(data->error_fd),
+                                 &error))
+    {
+      g_assert (error != NULL);
+      goto handle_error;
+    }
+
+  data->error_string = g_string_new ("");
+
+  data->error_channel = g_io_channel_unix_new (data->error_fd);
+  g_io_channel_set_flags (data->error_channel, G_IO_FLAG_NONBLOCK, &error);
+  if (error != NULL)
+    goto handle_error;
+
+  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, mount_point_op_read_error, data);
+  g_child_watch_add (child_pid, mount_point_op_cb, data);
+
+handle_error:
+  if (error != NULL)
+    {
+      GSimpleAsyncResult *simple;
+      simple = g_simple_async_result_new_from_error (G_OBJECT (data->volume),
+                                                     data->callback,
+                                                     data->user_data,
+                                                     error);
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+
+      mount_point_op_free (data);
+    }
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+typedef struct {
   GObject *object;
   GAsyncReadyCallback callback;
   gpointer user_data;
@@ -1300,19 +1615,22 @@ g_gdu_volume_get_identifier (GVolume     *_volume,
 
   id = NULL;
 
-  device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
+  if (volume->gdu_volume != NULL)
+    {
+      device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
 
-  label = gdu_device_id_get_label (device);
-  uuid = gdu_device_id_get_uuid (device);
+      label = gdu_device_id_get_label (device);
+      uuid = gdu_device_id_get_uuid (device);
 
-  g_object_unref (device);
+      g_object_unref (device);
 
-  if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
-    id = g_strdup (volume->device_file);
-  else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
-    id = strlen (label) > 0 ? g_strdup (label) : NULL;
-  else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
-    id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
+      if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
+        id = g_strdup (volume->device_file);
+      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
+        id = strlen (label) > 0 ? g_strdup (label) : NULL;
+      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
+        id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
+    }
 
   return id;
 }
@@ -1326,19 +1644,21 @@ g_gdu_volume_enumerate_identifiers (GVolume *_volume)
   const gchar *label;
   const gchar *uuid;
 
-  device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
-
-  label = gdu_device_id_get_label (device);
-  uuid = gdu_device_id_get_uuid (device);
-
-  g_object_unref (device);
-
   p = g_ptr_array_new ();
-  g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
-  if (strlen (label) > 0)
-    g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
-  if (strlen (uuid) > 0)
-    g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
+
+  if (volume->gdu_volume != NULL)
+    {
+      device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
+      label = gdu_device_id_get_label (device);
+      uuid = gdu_device_id_get_uuid (device);
+      g_object_unref (device);
+
+      g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
+      if (strlen (label) > 0)
+        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
+      if (strlen (uuid) > 0)
+        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
+    }
 
   g_ptr_array_add (p, NULL);
 
@@ -1452,3 +1772,9 @@ g_gdu_volume_get_presentable_with_cleartext (GGduVolume *volume)
 
   return GDU_PRESENTABLE (ret);
 }
+
+GUnixMountPoint *
+g_gdu_volume_get_unix_mount_point (GGduVolume *volume)
+{
+  return volume->unix_mount_point;
+}
diff --git a/monitor/gdu/ggduvolume.h b/monitor/gdu/ggduvolume.h
index 8fd7358..a230d28 100644
--- a/monitor/gdu/ggduvolume.h
+++ b/monitor/gdu/ggduvolume.h
@@ -50,6 +50,9 @@ GGduVolume *g_gdu_volume_new            (GVolumeMonitor   *volume_monitor,
                                          GGduDrive        *drive,
                                          GFile            *activation_root);
 
+GGduVolume *g_gdu_volume_new_for_unix_mount_point (GVolumeMonitor   *volume_monitor,
+                                                   GUnixMountPoint  *unix_mount_point);
+
 void        g_gdu_volume_set_mount      (GGduVolume       *volume,
                                          GGduMount        *mount);
 void        g_gdu_volume_unset_mount    (GGduVolume       *volume,
@@ -69,10 +72,12 @@ gboolean    g_gdu_volume_has_uuid       (GGduVolume       *volume,
 gboolean   g_gdu_volume_has_device_file (GGduVolume      *volume,
                                          const gchar     *device_file);
 
-GduPresentable *g_gdu_volume_get_presentable (GGduVolume      *volume);
+GduPresentable *g_gdu_volume_get_presentable (GGduVolume *volume);
 
 GduPresentable *g_gdu_volume_get_presentable_with_cleartext (GGduVolume *volume);
 
+GUnixMountPoint *g_gdu_volume_get_unix_mount_point (GGduVolume *volume);
+
 G_END_DECLS
 
 #endif /* __G_GDU_VOLUME_H__ */
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index caa25a0..67e2ec0 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -51,6 +51,7 @@ struct _GGduVolumeMonitor {
 
   GList *drives;
   GList *volumes;
+  GList *fstab_volumes;
   GList *mounts;
 
   /* we keep volumes/mounts for blank and audio discs separate to handle e.g. mixed discs properly */
@@ -80,6 +81,9 @@ static void update_drives            (GGduVolumeMonitor *monitor,
 static void update_volumes           (GGduVolumeMonitor *monitor,
                                       GList **added_volumes,
                                       GList **removed_volumes);
+static void update_fstab_volumes     (GGduVolumeMonitor *monitor,
+                                      GList **added_volumes,
+                                      GList **removed_volumes);
 static void update_mounts            (GGduVolumeMonitor *monitor,
                                       GList **added_mounts,
                                       GList **removed_mounts);
@@ -135,6 +139,7 @@ g_gdu_volume_monitor_finalize (GObject *object)
   g_list_free (monitor->last_mounts);
 
   list_free (monitor->drives);
+  list_free (monitor->fstab_volumes);
   list_free (monitor->volumes);
   list_free (monitor->mounts);
 
@@ -171,6 +176,8 @@ get_volumes (GVolumeMonitor *volume_monitor)
   monitor = G_GDU_VOLUME_MONITOR (volume_monitor);
 
   l = g_list_copy (monitor->volumes);
+  ll = g_list_copy (monitor->fstab_volumes);
+  l = g_list_concat (l, ll);
   ll = g_list_copy (monitor->disc_volumes);
   l = g_list_concat (l, ll);
 
@@ -211,6 +218,13 @@ get_volume_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid)
         goto found;
     }
 
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      volume = l->data;
+      if (g_gdu_volume_has_uuid (volume, uuid))
+        goto found;
+    }
+
   for (l = monitor->disc_volumes; l != NULL; l = l->next)
     {
       volume = l->data;
@@ -549,14 +563,49 @@ find_volume_for_mount_path (GGduVolumeMonitor *monitor,
   for (l = monitor->volumes; l != NULL; l = l->next)
     {
       GGduVolume *volume = l->data;
+      if (g_gdu_volume_has_mount_path (volume, mount_path))
+        {
+          found = volume;
+          goto out;
+        }
+    }
 
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      GGduVolume *volume = l->data;
       if (g_gdu_volume_has_mount_path (volume, mount_path))
         {
           found = volume;
-          break;
+          goto out;
         }
     }
 
+ out:
+  return found;
+}
+
+static GGduVolume *
+find_volume_for_unix_mount_point (GGduVolumeMonitor *monitor,
+                                  GUnixMountPoint   *unix_mount_point)
+{
+  GList *l;
+  GGduVolume *found;
+
+  found = NULL;
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      GGduVolume *volume = l->data;
+      GUnixMountPoint *volume_mount_point;
+
+      volume_mount_point = g_gdu_volume_get_unix_mount_point (volume);
+      if (g_unix_mount_point_compare (unix_mount_point, volume_mount_point) == 0)
+        {
+          found = volume;
+          goto out;
+        }
+    }
+
+ out:
   return found;
 }
 
@@ -859,6 +908,7 @@ update_all (GGduVolumeMonitor *monitor,
 
   update_drives (monitor, &added_drives, &removed_drives);
   update_volumes (monitor, &added_volumes, &removed_volumes);
+  update_fstab_volumes (monitor, &added_volumes, &removed_volumes);
   update_mounts (monitor, &added_mounts, &removed_mounts);
   update_discs (monitor,
                 &added_volumes, &removed_volumes,
@@ -935,16 +985,34 @@ find_volume_for_device_file (GGduVolumeMonitor *monitor,
                             const gchar       *device_file)
 {
   GList *l;
+  GGduVolume *ret;
 
+  ret = NULL;
   for (l = monitor->volumes; l != NULL; l = l->next)
     {
       GGduVolume *volume = G_GDU_VOLUME (l->data);
 
       if (g_gdu_volume_has_device_file (volume, device_file))
-        return volume;
+        {
+          ret = volume;
+          goto out;
+        }
     }
 
-  return NULL;
+  ret = NULL;
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    {
+      GGduVolume *volume = G_GDU_VOLUME (l->data);
+
+      if (g_gdu_volume_has_device_file (volume, device_file))
+        {
+          ret = volume;
+          goto out;
+        }
+    }
+
+ out:
+  return ret;
 }
 
 static GGduDrive *
@@ -1189,6 +1257,106 @@ update_volumes (GGduVolumeMonitor *monitor,
 }
 
 static void
+update_fstab_volumes (GGduVolumeMonitor *monitor,
+                      GList **added_volumes,
+                      GList **removed_volumes)
+{
+  GList *fstab_mount_points;
+  GList *cur_fstab_mount_points;
+  GList *new_fstab_mount_points;
+  GList *removed, *added;
+  GList *l;
+  GGduVolume *volume;
+
+  fstab_mount_points = g_unix_mount_points_get (NULL);
+
+  cur_fstab_mount_points = NULL;
+  for (l = monitor->fstab_volumes; l != NULL; l = l->next)
+    cur_fstab_mount_points = g_list_prepend (cur_fstab_mount_points, g_gdu_volume_get_unix_mount_point (G_GDU_VOLUME (l->data)));
+
+  new_fstab_mount_points = NULL;
+  for (l = fstab_mount_points; l != NULL; l = l->next)
+    {
+      GUnixMountPoint *mount_point = l->data;
+      const gchar *device_file;
+
+      /* only show user mountable mount points */
+      if (!g_unix_mount_point_is_user_mountable (mount_point))
+        continue;
+
+      /* only show stuff that can be mounted in user-visible locations */
+      if (!_g_unix_mount_point_guess_should_display (mount_point))
+        continue;
+
+      /* ignore mount point if the device doesn't exist or is handled by DeviceKit-disks */
+      device_file = g_unix_mount_point_get_device_path (mount_point);
+      if (g_str_has_prefix (device_file, "/dev/"))
+        {
+          gchar resolved_path[PATH_MAX];
+          GduDevice *device;
+
+          /* doesn't exist */
+          if (realpath (device_file, resolved_path) != 0)
+            continue;
+
+          /* is handled by DKD */
+          device = gdu_pool_get_by_device_file (monitor->pool, resolved_path);
+          if (device != NULL)
+            {
+              g_object_unref (device);
+              continue;
+            }
+        }
+
+      new_fstab_mount_points = g_list_prepend (new_fstab_mount_points, mount_point);
+    }
+
+  diff_sorted_lists (cur_fstab_mount_points,
+                     new_fstab_mount_points, (GCompareFunc) g_unix_mount_point_compare,
+                     &added, &removed);
+
+  for (l = removed; l != NULL; l = l->next)
+    {
+      GUnixMountPoint *mount_point = l->data;
+      volume = find_volume_for_unix_mount_point (monitor, mount_point);
+      if (volume != NULL)
+        {
+          g_gdu_volume_removed (volume);
+          monitor->fstab_volumes = g_list_remove (monitor->fstab_volumes, volume);
+          *removed_volumes = g_list_prepend (*removed_volumes, volume);
+          /*g_debug ("removed volume for /etc/fstab mount point %s", g_unix_mount_point_get_mount_path (mount_point));*/
+        }
+    }
+
+  for (l = added; l != NULL; l = l->next)
+    {
+      GUnixMountPoint *mount_point = l->data;
+
+      volume = g_gdu_volume_new_for_unix_mount_point (G_VOLUME_MONITOR (monitor), mount_point);
+      if (volume != NULL)
+        {
+          /* steal mount_point since g_gdu_volume_new_for_unix_mount_point() takes ownership of it */
+          fstab_mount_points = g_list_remove (fstab_mount_points, mount_point);
+          monitor->fstab_volumes = g_list_prepend (monitor->fstab_volumes, volume);
+          *added_volumes = g_list_prepend (*added_volumes, g_object_ref (volume));
+          /*g_debug ("added volume for /etc/fstab mount point %s", g_unix_mount_point_get_mount_path (mount_point));*/
+        }
+      else
+        {
+          g_unix_mount_point_free (mount_point);
+        }
+    }
+
+  g_list_free (added);
+  g_list_free (removed);
+
+  g_list_free (cur_fstab_mount_points);
+
+  g_list_foreach (fstab_mount_points, (GFunc) g_unix_mount_point_free, NULL);
+  g_list_free (fstab_mount_points);
+}
+
+static void
 update_mounts (GGduVolumeMonitor *monitor,
                GList **added_mounts,
                GList **removed_mounts)
-- 
1.6.2.2


gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch:

--- NEW FILE gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch ---
>From 8d9fc8a777fb1b00ae371e276a14416a0987f4af Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 13 Apr 2009 14:20:15 -0400
Subject: [PATCH 11/13] =?utf-8?q?Bug=20576083=20=E2=80=93=20pre-unmount=20signals=20not=20being=20triggered?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Basically emit GVolumeMonitor::mount-pre-unmount on the volume monitor
and retry unmount operation a couple of times.
---
 monitor/gdu/ggdumount.c |  177 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 142 insertions(+), 35 deletions(-)

diff --git a/monitor/gdu/ggdumount.c b/monitor/gdu/ggdumount.c
index e074a20..78088d5 100644
--- a/monitor/gdu/ggdumount.c
+++ b/monitor/gdu/ggdumount.c
@@ -38,6 +38,9 @@
 #include "ggdumount.h"
 #include "ggduvolume.h"
 
+#define BUSY_UNMOUNT_NUM_ATTEMPTS              5
+#define BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS 500
+
 struct _GGduMount
 {
   GObject parent;
@@ -451,26 +454,52 @@ g_gdu_mount_can_eject (GMount *_mount)
 
 typedef struct {
   GMount *mount;
+
+  gchar **argv;
+  guint num_attempts_left;
+
   GAsyncReadyCallback callback;
   gpointer user_data;
   GCancellable *cancellable;
+
   int error_fd;
   GIOChannel *error_channel;
   guint error_channel_source_id;
   GString *error_string;
-} UnmountEjectOp;
+
+} UnmountOp;
+
+static gboolean unmount_attempt (UnmountOp *data);
 
 static void
-eject_unmount_cb (GPid pid, gint status, gpointer user_data)
+unmount_cb (GPid pid, gint status, gpointer user_data)
 {
-  UnmountEjectOp *data = user_data;
+  UnmountOp *data = user_data;
   GSimpleAsyncResult *simple;
 
+  g_spawn_close_pid (pid);
+
   if (WEXITSTATUS (status) != 0)
     {
       GError *error;
+      gint error_code;
+
+      error_code = G_IO_ERROR_FAILED;
+      /* we may want to add more strstr() checks here depending on what unmount helper is being used etc... */
+      if (data->error_string->str != NULL && strstr (data->error_string->str, "is busy") != NULL)
+        error_code = G_IO_ERROR_BUSY;
+
+      if (error_code == G_IO_ERROR_BUSY && data->num_attempts_left > 0)
+        {
+          g_timeout_add (BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS,
+                         (GSourceFunc) unmount_attempt,
+                         data);
+          data->num_attempts_left -= 1;
+          goto out;
+        }
+
       error = g_error_new_literal (G_IO_ERROR,
-                                   G_IO_ERROR_FAILED,
+                                   error_code,
                                    data->error_string->str);
       simple = g_simple_async_result_new_from_error (G_OBJECT (data->mount),
                                                      data->callback,
@@ -493,16 +522,19 @@ eject_unmount_cb (GPid pid, gint status, gpointer user_data)
   g_io_channel_unref (data->error_channel);
   g_string_free (data->error_string, TRUE);
   close (data->error_fd);
-  g_spawn_close_pid (pid);
+  g_strfreev (data->argv);
   g_free (data);
+
+ out:
+  ;
 }
 
 static gboolean
-eject_unmount_read_error (GIOChannel *channel,
-                          GIOCondition condition,
-                          gpointer user_data)
+unmount_read_error (GIOChannel *channel,
+                    GIOCondition condition,
+                    gpointer user_data)
 {
-  UnmountEjectOp *data = user_data;
+  UnmountOp *data = user_data;
   gchar buf[BUFSIZ];
   gsize bytes_read;
   GError *error;
@@ -532,26 +564,15 @@ read:
   return TRUE;
 }
 
-static void
-eject_unmount_do (GMount              *mount,
-                  GCancellable        *cancellable,
-                  GAsyncReadyCallback  callback,
-                  gpointer             user_data,
-                  char               **argv)
+static gboolean
+unmount_attempt (UnmountOp *data)
 {
-  UnmountEjectOp *data;
   GPid child_pid;
   GError *error;
 
-  data = g_new0 (UnmountEjectOp, 1);
-  data->mount = mount;
-  data->callback = callback;
-  data->user_data = user_data;
-  data->cancellable = cancellable;
-
   error = NULL;
   if (!g_spawn_async_with_pipes (NULL,         /* working dir */
-                                 argv,
+                                 data->argv,
                                  NULL,         /* envp */
                                  G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
                                  NULL,         /* child_setup */
@@ -572,8 +593,8 @@ eject_unmount_do (GMount              *mount,
   if (error != NULL)
     goto handle_error;
 
-  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, eject_unmount_read_error, data);
-  g_child_watch_add (child_pid, eject_unmount_cb, data);
+  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, unmount_read_error, data);
+  g_child_watch_add (child_pid, unmount_cb, data);
 
 handle_error:
 
@@ -596,6 +617,28 @@ handle_error:
       g_error_free (error);
       g_free (data);
     }
+
+  return FALSE;
+}
+
+static void
+unmount_do (GMount              *mount,
+            GCancellable        *cancellable,
+            GAsyncReadyCallback  callback,
+            gpointer             user_data,
+            char               **argv)
+{
+  UnmountOp *data;
+
+  data = g_new0 (UnmountOp, 1);
+  data->mount = mount;
+  data->callback = callback;
+  data->user_data = user_data;
+  data->cancellable = cancellable;
+  data->num_attempts_left = BUSY_UNMOUNT_NUM_ATTEMPTS;
+  data->argv = g_strdupv (argv);
+
+  unmount_attempt (data);
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -619,19 +662,54 @@ luks_lock_cb (GduDevice *device,
   g_object_unref (simple);
 }
 
+static gboolean gdu_unmount_attempt (GSimpleAsyncResult *simple);
+
 static void
-unmount_cb (GduDevice *device,
-            GError    *error,
-            gpointer   user_data)
+gdu_unmount_cb (GduDevice *device,
+                GError    *error,
+                gpointer   user_data)
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
 
   if (error != NULL)
     {
+      gint error_code;
+
+      /*g_debug ("domain=%s error_code=%d '%s'", g_quark_to_string (error->domain), error->code, error->message);*/
+
+      error_code = G_IO_ERROR_FAILED;
+      if (error->domain == GDU_ERROR && error->code == GDU_ERROR_BUSY)
+        error_code = G_IO_ERROR_BUSY;
+
       /* We could handle PolicyKit integration here but this action is allowed by default
        * and this won't be needed when porting to PolicyKit 1.0 anyway
        */
-      g_simple_async_result_set_from_error (simple, error);
+
+      if (error_code == G_IO_ERROR_BUSY)
+        {
+          guint num_attempts_left;
+
+          num_attempts_left = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (simple), "num-attempts-left"));
+
+          if (num_attempts_left > 0)
+            {
+              num_attempts_left -= 1;
+              g_object_set_data (G_OBJECT (simple),
+                                 "num-attempts-left",
+                                 GUINT_TO_POINTER (num_attempts_left));
+
+              g_timeout_add (BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS,
+                             (GSourceFunc) gdu_unmount_attempt,
+                             simple);
+              goto out;
+            }
+        }
+
+      g_simple_async_result_set_error (simple,
+                                       G_IO_ERROR,
+                                       error_code,
+                                       "%s",
+                                       error->message);
       g_error_free (error);
       g_simple_async_result_complete (simple);
       g_object_unref (simple);
@@ -687,6 +765,17 @@ unmount_cb (GduDevice *device,
   ;
 }
 
+static gboolean
+gdu_unmount_attempt (GSimpleAsyncResult *simple)
+{
+  GduDevice *device;
+
+  /* TODO: honor flags */
+  device = g_object_get_data (G_OBJECT (simple), "gdu-device");
+  gdu_device_op_filesystem_unmount (device, gdu_unmount_cb, simple);
+  return FALSE;
+}
+
 static void
 g_gdu_mount_unmount (GMount              *_mount,
                      GMountUnmountFlags   flags,
@@ -698,6 +787,21 @@ g_gdu_mount_unmount (GMount              *_mount,
   GSimpleAsyncResult *simple;
   GduPresentable *gdu_volume;
 
+  /* emit the ::mount-pre-unmount signal */
+  g_signal_emit_by_name (mount->volume_monitor, "mount-pre-unmount", mount);
+
+  /* If we end up with G_IO_ERROR_BUSY, try again BUSY_UNMOUNT_NUM_ATTEMPTS times
+   * waiting BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS milliseconds between each
+   * attempt.
+   *
+   * This is to give other processes recieving the ::mount-pre-unmount signal some
+   * time to close file descriptors.
+   *
+   * TODO: Unfortunately this code is a bit messy because we take two different
+   *       codepaths depending on whether we use GDU or the native unmount command.
+   *       It would be good to clean this up.
+   */
+
   gdu_volume = NULL;
   if (mount->volume != NULL)
     gdu_volume = g_gdu_volume_get_presentable_with_cleartext (mount->volume);
@@ -713,7 +817,7 @@ g_gdu_mount_unmount (GMount              *_mount,
       else
         argv[1] = mount->device_file;
 
-      eject_unmount_do (_mount, cancellable, callback, user_data, argv);
+      unmount_do (_mount, cancellable, callback, user_data, argv);
     }
   else if (gdu_volume != NULL)
     {
@@ -722,6 +826,10 @@ g_gdu_mount_unmount (GMount              *_mount,
                                           user_data,
                                           NULL);
 
+      g_object_set_data (G_OBJECT (simple),
+                         "num-attempts-left",
+                         GUINT_TO_POINTER (BUSY_UNMOUNT_NUM_ATTEMPTS));
+
       if (mount->is_burn_mount)
         {
           /* burn mounts are really never mounted... */
@@ -731,12 +839,9 @@ g_gdu_mount_unmount (GMount              *_mount,
       else
         {
           GduDevice *device;
-
-          /* TODO: honor flags */
-
           device = gdu_presentable_get_device (gdu_volume);
-          gdu_device_op_filesystem_unmount (device, unmount_cb, simple);
-          g_object_unref (device);
+          g_object_set_data_full (G_OBJECT (simple), "gdu-device", device, g_object_unref);
+          gdu_unmount_attempt (simple);
         }
     }
   else
@@ -760,6 +865,8 @@ g_gdu_mount_unmount_finish (GMount       *mount,
   return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
 }
 
+/* ---------------------------------------------------------------------------------------------------- */
+
 typedef struct {
   GObject *object;
   GAsyncReadyCallback callback;
-- 
1.6.2.2


gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch:

--- NEW FILE gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch ---
>From 2bce9f36bd365be284c10af6a1f74c6120adc3e8 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 15 Apr 2009 11:33:36 -0400
Subject: [PATCH 12/13] use new gnome-disk-utility API to hide unwanted devices

This is to resolve bugs like

 https://bugzilla.redhat.com/show_bug.cgi?id=495170
---
 monitor/gdu/ggduvolumemonitor.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 67e2ec0..2c1f727 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -720,6 +720,12 @@ should_mount_be_ignored (GduPool *pool, GduDevice *d)
 
   ret = FALSE;
 
+  if (gdu_device_get_presentation_hide (d))
+    {
+      ret = TRUE;
+      goto out;
+    }
+
   mount_path = gdu_device_get_mount_path (d);
   if (mount_path == NULL || strlen (mount_path) == 0)
     goto out;
@@ -751,6 +757,9 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume));
 
+  if (gdu_device_get_presentation_hide (device))
+    goto out;
+
   usage = gdu_device_id_get_usage (device);
   type = gdu_device_id_get_type (device);
 
@@ -824,6 +833,9 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
       goto out;
     }
 
+  if (gdu_device_get_presentation_hide (device))
+    goto out;
+
   has_volumes = FALSE;
   all_volumes_are_ignored = TRUE;
 
-- 
1.6.2.2


gdu-0013-pass-the-flush-mount-option-for-vfat.patch:

--- NEW FILE gdu-0013-pass-the-flush-mount-option-for-vfat.patch ---
>From 7fd9061afbd0ec4664adb17aed706e12fd5f3eee Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 15 Apr 2009 14:41:27 -0400
Subject: [PATCH 13/13] pass the 'flush' mount option for vfat

This mount option makes the vfat filesystem driver flush data more
often. As a consequence

 1. users never get to see the gnome-disk-utility notification daemon
    dialog just added

     http://people.freedesktop.org/~david/gdu-unmount-busy-1.png

    but that's useful for other filesystems as well.

 2. The Nautilus copy dialog stays up until things are on the disk

We do this in gvfs rather than DeviceKit-disks because in some
scenarios 'flush' may be unwanted and there is currently no way to
turn it off (e.g. no 'noflush' or 'flush=0' option).

Ideally the kernel would get this kind of thing right by itself.
---
 monitor/gdu/ggduvolume.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 49494a1..871a1c5 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -648,6 +648,27 @@ g_gdu_volume_get_mount (GVolume *volume)
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static gchar **
+get_mount_options (GduDevice *device)
+{
+  gchar **ret;
+
+  /* one day we might read this from user settings */
+  if (g_strcmp0 (gdu_device_id_get_usage (device), "filesystem") == 0 &&
+      g_strcmp0 (gdu_device_id_get_type (device), "vfat") == 0)
+    {
+      ret = g_new0 (gchar *, 2);
+      ret[0] = g_strdup ("flush");
+      ret[1] = NULL;
+    }
+  else
+    ret = NULL;
+
+  return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
 struct MountOpData
 {
   GGduVolume *volume;
@@ -735,8 +756,11 @@ mount_obtain_authz_cb (GObject *source_object,
     }
   else
     {
+      gchar **mount_options;
       /* got the authz, now try again */
-      gdu_device_op_filesystem_mount (data->device_to_mount, mount_cb, data);
+      mount_options = get_mount_options (data->device_to_mount);
+      gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
+      g_strfreev (mount_options);
       goto out;
     }
 
@@ -842,7 +866,10 @@ mount_cleartext_device (MountOpData *data,
     }
   else
     {
-      gdu_device_op_filesystem_mount (data->device_to_mount, mount_cb, data);
+      gchar **mount_options;
+      mount_options = get_mount_options (data->device_to_mount);
+      gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
+      g_strfreev (mount_options);
     }
 
   g_object_unref (pool);
@@ -1260,8 +1287,11 @@ g_gdu_volume_mount (GVolume             *_volume,
     }
   else
     {
+      gchar **mount_options;
       data->device_to_mount = g_object_ref (device);
-      gdu_device_op_filesystem_mount (data->device_to_mount, mount_cb, data);
+      mount_options = get_mount_options (data->device_to_mount);
+      gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
+      g_strfreev (mount_options);
     }
 
  out:
-- 
1.6.2.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gvfs.spec	13 Apr 2009 19:16:30 -0000	1.125
+++ gvfs.spec	15 Apr 2009 19:25:46 -0000	1.126
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -57,6 +57,13 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=495152
 Patch108: gdu-0008-ignore-drives-without-volumes.patch
 Patch109: gdu-0009-never-ignore-drives-without-media.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=536292
+Patch110: gdu-0010-show-user-mountable-fstab-entries.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=576083
+Patch111: gdu-0011-Bug-576083-pre-unmount-signals-not-being-trigger.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=495170
+Patch112: gdu-0012-use-new-gnome-disk-utility-API-to-hide-unwanted-devi.patch
+Patch113: gdu-0013-pass-the-flush-mount-option-for-vfat.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -152,6 +159,10 @@
 %patch107 -p1 -b .gdu-always-eject
 %patch108 -p1 -b .gdu-ignore-drives-without-volumes
 %patch109 -p1 -b .gdu-never-ignore-drives-without-media
+%patch110 -p1 -b .gdu-user-mountable-fstab-entries
+%patch111 -p1 -b .gdu-pre-unmount-signals
+%patch112 -p1 -b .gdu-unwanted-devices
+%patch113 -p1 -b .gdu-vfat-flush
 
 %build
 
@@ -295,6 +306,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 1.2.2-3
+- Sync with the gdu-volume-monitor branch
+
 * Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 1.2.2-2
 - Add ssh-auth-sock patch from svn
 



From steved at fedoraproject.org  Wed Apr 15 19:26:47 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 15 Apr 2009 19:26:47 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-nfs41-30-rc1.patch, NONE,
	1.1.2.1 config-generic, 1.280, 1.280.4.1 kernel.spec, 1.1519,
	1.1519.2.1
Message-ID: <20090415192647.DB74A70101@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19270

Modified Files:
      Tag: kernel-2_6_30-nfs41_041509
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_30-nfs41_041509
	linux-2.6-nfs41-30-rc1.patch 
Log Message:
 Updated to the latest NFS41 code


linux-2.6-nfs41-30-rc1.patch:

--- NEW FILE linux-2.6-nfs41-30-rc1.patch ---
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 8dd6db7..f15621e 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -66,6 +66,10 @@ mandatory-locking.txt
 	- info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
 	- info on Novell Netware(tm) filesystem using NCP protocol.
+nfs41-server.txt
+	- info on the Linux server implementation of NFSv4 minor version 1.
+nfs-rdma.txt
+	- how to install and setup the Linux NFS/RDMA client and server software.
 nfsroot.txt
 	- short guide on setting up a diskless box with NFS root filesystem.
 nilfs2.txt
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index e67f3ec..5d6d6f4 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -74,6 +74,15 @@ config NFS_V4
 
 	  If unsure, say N.
 
+config NFS_V4_1
+	bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)"
+	depends on NFS_V4 && EXPERIMENTAL
+	help
+	  This option enables support for minor version 1 of the NFSv4 protocol
+	  (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client.
+
+	  Unless you're an NFS developer, say N.
+
 config ROOT_NFS
 	bool "Root file system on NFS"
 	depends on NFS_FS=y && IP_PNP
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index a886e69..19e11b0 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -17,6 +17,9 @@
 #include <linux/freezer.h>
 #include <linux/kthread.h>
 #include <linux/sunrpc/svcauth_gss.h>
+#if defined(CONFIG_NFS_V4_1)
+#include <linux/sunrpc/bc_xprt.h>
+#endif
 
 #include <net/inet_sock.h>
 
@@ -28,11 +31,12 @@
 
 struct nfs_callback_data {
 	unsigned int users;
+	struct svc_serv *serv;
 	struct svc_rqst *rqst;
 	struct task_struct *task;
 };
 
-static struct nfs_callback_data nfs_callback_info;
+static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1];
 static DEFINE_MUTEX(nfs_callback_mutex);
 static struct svc_program nfs4_callback_program;
 
@@ -56,10 +60,10 @@ module_param_call(callback_tcpport, param_set_port, param_get_int,
 		 &nfs_callback_set_tcpport, 0644);
 
 /*
- * This is the callback kernel thread.
+ * This is the NFSv4 callback kernel thread.
  */
 static int
-nfs_callback_svc(void *vrqstp)
+nfs4_callback_svc(void *vrqstp)
 {
 	int err, preverr = 0;
 	struct svc_rqst *rqstp = vrqstp;
@@ -97,20 +101,12 @@ nfs_callback_svc(void *vrqstp)
 }
 
 /*
- * Bring up the callback thread if it is not already up.
+ * Prepare to bring up the NFSv4 callback service
  */
-int nfs_callback_up(void)
+struct svc_rqst *
+nfs4_callback_up(struct svc_serv *serv)
 {
-	struct svc_serv *serv = NULL;
-	int ret = 0;
-
-	mutex_lock(&nfs_callback_mutex);
-	if (nfs_callback_info.users++ || nfs_callback_info.task != NULL)
-		goto out;
-	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
-	ret = -ENOMEM;
-	if (!serv)
-		goto out_err;
+	int ret;
 
 	ret = svc_create_xprt(serv, "tcp", PF_INET,
 				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
@@ -131,23 +127,149 @@ int nfs_callback_up(void)
 		goto out_err;
 #endif	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
 
-	nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]);
-	if (IS_ERR(nfs_callback_info.rqst)) {
-		ret = PTR_ERR(nfs_callback_info.rqst);
-		nfs_callback_info.rqst = NULL;
+	return svc_prepare_thread(serv, &serv->sv_pools[0]);
+
+out_err:
+	if (ret == 0)
+		ret = -ENOMEM;
+	return ERR_PTR(ret);
+}
+
+#if defined(CONFIG_NFS_V4_1)
+/*
+ * The callback service for NFSv4.1 callbacks
+ */
+static int
+nfs41_callback_svc(void *vrqstp)
+{
+	struct svc_rqst *rqstp = vrqstp;
+	struct svc_serv *serv = rqstp->rq_server;
+	struct rpc_rqst *req;
+	int error;
+	DEFINE_WAIT(wq);
+
+	set_freezable();
+
+	/*
+	 * FIXME: do we really need to run this under the BKL? If so, please
+	 * add a comment about what it's intended to protect.
+	 */
+	lock_kernel();
+	while (!kthread_should_stop()) {
+		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);
+		spin_lock_bh(&serv->sv_cb_lock);
+		if (!list_empty(&serv->sv_cb_list)) {
+			req = list_first_entry(&serv->sv_cb_list,
+					struct rpc_rqst, rq_bc_list);
+			list_del(&req->rq_bc_list);
+			spin_unlock_bh(&serv->sv_cb_lock);
+			dprintk("Invoking bc_svc_process()\n");
+			error = bc_svc_process(serv, req, rqstp);
+			dprintk("bc_svc_process() returned w/ error code= %d\n",
+				error);
+		} else {
+			spin_unlock_bh(&serv->sv_cb_lock);
+			schedule();
+		}
+		finish_wait(&serv->sv_cb_waitq, &wq);
+	}
+	unlock_kernel();
+	return 0;
+}
+
+/*
+ * Bring up the NFSv4.1 callback service
+ */
+struct svc_rqst *
+nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt)
+{
+	struct svc_xprt *bc_xprt;
+	struct svc_rqst *rqstp = ERR_PTR(-ENOMEM);
+
+	dprintk("--> %s\n", __func__);
+	/* Create a svc_sock for the service */
+	bc_xprt = svc_sock_create(serv, xprt->prot);
+	if (!bc_xprt)
+		goto out;
+
+	/*
+	 * Save the svc_serv in the transport so that it can
+	 * be referenced when the session backchannel is initialized
+	 */
+	serv->bc_xprt = bc_xprt;
+	xprt->bc_serv = serv;
+
+	INIT_LIST_HEAD(&serv->sv_cb_list);
+	spin_lock_init(&serv->sv_cb_lock);
+	init_waitqueue_head(&serv->sv_cb_waitq);
+	rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]);
+	if (IS_ERR(rqstp))
+		svc_sock_destroy(bc_xprt);
+out:
+	dprintk("--> %s return %p\n", __func__, rqstp);
+	return rqstp;
+}
+#endif /* CONFIG_NFS_V4_1 */
+
+/*
+ * Bring up the callback thread if it is not already up.
+ */
+int nfs_callback_up(u32 minorversion, void *args)
+{
+	struct svc_serv *serv = NULL;
[...8920 lines suppressed...]
+	len = sock->ops->sendpage(sock, virt_to_page(xbufp->head[0].iov_base),
+			(unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK,
+			xbufp->head[0].iov_len, flags);
+
+	if (len != xbufp->head[0].iov_len)
+		goto out;
+
+	/*
+	 * send page data
+	 *
+	 * Check the amount of data to be sent. If it is less than the
+	 * remaining page, then send it else send the current page
+	 */
+
+	size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen;
+	while (pglen > 0) {
+		if (total_len == size)
+			flags = 0;
+		result = sock->ops->sendpage(sock, *pages, base, size, flags);
+		if (result > 0)
+			len += result;
+		if (result != size)
+			goto out;
+		total_len -= size;
+		pglen -= size;
+		size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen;
+		base = 0;
+		pages++;
+	}
+	/*
+	 * send tail
+	 */
+	if (xbufp->tail[0].iov_len) {
+		result = sock->ops->sendpage(sock,
+			xbufp->tail[0].iov_base,
+			(unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK,
+			xbufp->tail[0].iov_len,
+			0);
+
+		if (result > 0)
+			len += result;
+	}
+out:
+	if (len != xbufp->len)
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct rpc_xprt *bc_xprt = req->rq_xprt;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	svsk = bc_xprt->bc_sock;
+	xprt = &svsk->sk_xprt;
+
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	return 0;
+
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -1994,11 +2359,32 @@ static struct rpc_xprt_ops xs_tcp_ops = {
 	.buf_free		= rpc_free,
 	.send_request		= xs_tcp_send_request,
 	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+#if defined(CONFIG_NFS_V4_1)
+	.release_request	= bc_release_request,
+#endif /* CONFIG_NFS_V4_1 */
 	.close			= xs_tcp_shutdown,
 	.destroy		= xs_destroy,
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.set_port		= bc_set_port,
+	.connect		= bc_connect,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2131,13 +2517,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_sock) {
+		/* backchannel */
+		xprt_set_bound(xprt);
+		INIT_DELAYED_WORK(&transport->connect_worker,
+				  bc_connect_worker);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_sock = args->bc_sock;
+		xprt->bc_sock->sk_bc_xprt = xprt;
+		transport->sock = xprt->bc_sock->sk_sock;
+		transport->inet = xprt->bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		goto next;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2145,13 +2547,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
+		break;
+	}
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+next:
+	xprt->timeout = &xs_tcp_default_timeout;
+
+	switch (addr->sa_family) {
+	case AF_INET:
+		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		break;
+	case AF_INET6:
 		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
 		break;
 	default:


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.280
retrieving revision 1.280.4.1
diff -u -r1.280 -r1.280.4.1
--- config-generic	14 Apr 2009 15:12:28 -0000	1.280
+++ config-generic	15 Apr 2009 19:26:16 -0000	1.280.4.1
@@ -3156,6 +3156,10 @@
 # CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
+#
+# Needed for NFS41
+CONFIG_NFS_V4_1=y
+#
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1519
retrieving revision 1.1519.2.1
diff -u -r1.1519 -r1.1519.2.1
--- kernel.spec	15 Apr 2009 17:12:32 -0000	1.1519
+++ kernel.spec	15 Apr 2009 19:26:16 -0000	1.1519.2.1
@@ -12,7 +12,7 @@
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .nfs41_041509
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -86,7 +86,7 @@
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
@@ -678,6 +678,7 @@
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
 Patch9210: linux-2.6.29-pat-fixes.patch
 
+Patch9300: linux-2.6-nfs41-30-rc1.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1231,6 +1232,7 @@
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
 
+ApplyPatch linux-2.6-nfs41-30-rc1.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1824,6 +1826,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 15 2009 Steve Dickson <steved at redhat.com> 2.6.30-nfs41_041508
+- Updated to the latest NFS41 code 
+
 * Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.57.rc2
 - 2.6.30-rc2
 



From ivazquez at fedoraproject.org  Wed Apr 15 19:37:35 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed, 15 Apr 2009 19:37:35 +0000 (UTC)
Subject: rpms/python/devel python.spec,1.146,1.147
Message-ID: <20090415193735.3C10C70101@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22903

Modified Files:
	python.spec 
Log Message:
Replace python-hashlib and python-uuid (#484715)


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- python.spec	17 Mar 2009 15:38:27 -0000	1.146
+++ python.spec	15 Apr 2009 19:37:04 -0000	1.147
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -81,6 +81,10 @@
 Provides: python-sqlite = 2.3.2
 Obsoletes: python-ctypes < 1.0.1
 Provides: python-ctypes = 1.0.1
+Obsoletes: python-hashlib < 20081120
+Provides: python-hashlib = 20081120
+Obsoletes: python-uuid < 1.31
+Provides: python-uuid = 1.31
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -531,6 +535,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Wed Apr 15 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.6-8
+- Replace python-hashlib and python-uuid (#484715)
+
 * Tue Mar 17 2009 James Antill <james at fedoraproject.org> - 2.6-7
 - Use system libffi
 - Resolves: bug#490573



From tgl at fedoraproject.org  Wed Apr 15 19:49:02 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 15 Apr 2009 19:49:02 +0000 (UTC)
Subject: rpms/mysql/devel mysql-ndb-stacksize.patch, NONE, 1.1 mysql.spec,
	1.117, 1.118
Message-ID: <20090415194902.561DB70101@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25602

Modified Files:
	mysql.spec 
Added Files:
	mysql-ndb-stacksize.patch 
Log Message:
Increase stack size of ndbd threads for safety's sake.

mysql-ndb-stacksize.patch:

--- NEW FILE mysql-ndb-stacksize.patch ---
Raise minimum stack size in ndb code to be a uniform 32K (64K on 64-bit
platforms).  This is in response to an episode where glibc needed 8K of
stack to run malloc(), resulting in ndbd crashing at launch.  While that
was acknowledged to be a glibc bug (see bz #494631), byte-shaving here
isn't any better an idea than it is in the main mysql server.

Note: the request gets rounded up to at least PTHREAD_STACK_MIN, which
is 128K on PPC; otherwise we would need to do something about including
the stack guard size explicitly, since it's so much larger on PPC than
elsewhere.  At some point we might want to use our my_setstacksize()
hack in NdbThread_Create().


diff -Naur mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
--- mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-03-13 17:54:07.000000000 -0400
+++ mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-04-15 14:00:04.000000000 -0400
@@ -106,8 +106,8 @@
 AsyncFile::doStart() 
 {
   // Stacksize for filesystem threads
-  // An 8k stack should be enough
-  const NDB_THREAD_STACKSIZE stackSize = 8192;
+  // don't make this too small
+  const NDB_THREAD_STACKSIZE stackSize = 32768;
 
   char buf[16];
   numAsyncFiles++;


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mysql.spec	7 Apr 2009 23:41:39 -0000	1.117
+++ mysql.spec	15 Apr 2009 19:48:31 -0000	1.118
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.33
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -31,6 +31,7 @@
 Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
+Patch9: mysql-ndb-stacksize.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -172,6 +173,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 libtoolize --force
 aclocal
@@ -637,6 +639,10 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Apr 15 2009 Tom Lane <tgl at redhat.com> 5.1.33-2
+- Increase stack size of ndbd threads for safety's sake.
+Related: #494631
+
 * Tue Apr  7 2009 Tom Lane <tgl at redhat.com> 5.1.33-1
 - Update to MySQL 5.1.33.
 - Disable use of pthread_setschedparam; doesn't work the way code expects.



From kevin at fedoraproject.org  Wed Apr 15 19:58:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 15 Apr 2009 19:58:13 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings.spec, 1.9,
	1.10 xfce4-settings-4.6.0-fedora.patch, 1.1, 1.2
Message-ID: <20090415195814.12E7270101@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27437

Modified Files:
	xfce4-settings.spec xfce4-settings-4.6.0-fedora.patch 
Log Message:
Make Antialias default (bug #495700)



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-settings.spec	20 Mar 2009 04:21:05 -0000	1.9
+++ xfce4-settings.spec	15 Apr 2009 19:57:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -111,6 +111,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-4
+- Make Antialias default (bug #495700)
+
 * Thu Mar 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-3
 - display settings fixes from upstream svn. 
 

xfce4-settings-4.6.0-fedora.patch:

Index: xfce4-settings-4.6.0-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings-4.6.0-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-settings-4.6.0-fedora.patch	28 Feb 2009 01:38:05 -0000	1.1
+++ xfce4-settings-4.6.0-fedora.patch	15 Apr 2009 19:57:43 -0000	1.2
@@ -1,7 +1,7 @@
 diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
 --- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml	2009-02-20 10:12:35.000000000 -0700
-+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-02-27 17:59:02.000000000 -0700
-@@ -2,8 +2,8 @@
++++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-15 13:08:22.000000000 -0600
+@@ -2,10 +2,11 @@
  
  <channel name="xsettings" version="1.0">
    <property name="Net" type="empty">
@@ -12,3 +12,6 @@
    </property>
    <property name="Xft" type="empty">
      <property name="DPI" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+   </property>
+ </channel>



From kevin at fedoraproject.org  Wed Apr 15 20:06:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 15 Apr 2009 20:06:24 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings.spec,1.10,1.11
Message-ID: <20090415200624.C940070101@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29654

Modified Files:
	xfce4-settings.spec 
Log Message:
Bump to fix tagging mistake.



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-settings.spec	15 Apr 2009 19:57:42 -0000	1.10
+++ xfce4-settings.spec	15 Apr 2009 20:05:54 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -111,6 +111,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-5
+- Bump to fix tagging mistake. 
+
 * Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-4
 - Make Antialias default (bug #495700)
 



From kevin at fedoraproject.org  Wed Apr 15 20:24:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 15 Apr 2009 20:24:55 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11 xfce4-settings.spec, 1.9,
	1.10 xfce4-settings-4.6.0-fedora.patch, 1.1, 1.2
Message-ID: <20090415202455.B5B1070101@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1422

Modified Files:
	xfce4-settings.spec xfce4-settings-4.6.0-fedora.patch 
Log Message:
Bump to fix tagging mistake. 
Make Antialias default (bug #495700)



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-settings.spec	20 Mar 2009 04:21:05 -0000	1.9
+++ xfce4-settings.spec	15 Apr 2009 20:24:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -111,6 +111,12 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-5
+- Bump to fix tagging mistake. 
+
+* Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-4
+- Make Antialias default (bug #495700)
+
 * Thu Mar 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-3
 - display settings fixes from upstream svn. 
 

xfce4-settings-4.6.0-fedora.patch:

Index: xfce4-settings-4.6.0-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/xfce4-settings-4.6.0-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-settings-4.6.0-fedora.patch	28 Feb 2009 01:38:05 -0000	1.1
+++ xfce4-settings-4.6.0-fedora.patch	15 Apr 2009 20:24:24 -0000	1.2
@@ -1,7 +1,7 @@
 diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
 --- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml	2009-02-20 10:12:35.000000000 -0700
-+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-02-27 17:59:02.000000000 -0700
-@@ -2,8 +2,8 @@
++++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-15 13:08:22.000000000 -0600
+@@ -2,10 +2,11 @@
  
  <channel name="xsettings" version="1.0">
    <property name="Net" type="empty">
@@ -12,3 +12,6 @@
    </property>
    <property name="Xft" type="empty">
      <property name="DPI" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+   </property>
+ </channel>



From mclasen at fedoraproject.org  Wed Apr 15 21:22:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 15 Apr 2009 21:22:24 +0000 (UTC)
Subject: rpms/evince/F-11 .cvsignore, 1.61, 1.62 evince.spec, 1.160,
	1.161 sources, 1.60, 1.61
Message-ID: <20090415212224.796F870101@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14873

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-11/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	17 Mar 2009 02:45:09 -0000	1.61
+++ .cvsignore	15 Apr 2009 21:21:53 -0000	1.62
@@ -1 +1 @@
-evince-2.26.0.tar.bz2
+evince-2.26.1.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-11/evince.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- evince.spec	17 Mar 2009 02:45:09 -0000	1.160
+++ evince.spec	15 Apr 2009 21:21:53 -0000	1.161
@@ -5,7 +5,7 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.26.0
+Version:	2.26.1
 Release:	1%{?dist}
 Summary:	Document viewer
 
@@ -241,6 +241,10 @@
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Wed Apr 15 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- See http://download.gnome.org/sources/evince/2.26/evince-2.26.1.news
+
 * Mon Mar 16 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-11/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	17 Mar 2009 02:45:09 -0000	1.60
+++ sources	15 Apr 2009 21:21:53 -0000	1.61
@@ -1 +1 @@
-11c440e48702231e40066a78aae56f84  evince-2.26.0.tar.bz2
+5508b1f1fc0b4b66de59b7af1e560d8b  evince-2.26.1.tar.bz2



From ajax at fedoraproject.org  Wed Apr 15 21:47:38 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 15 Apr 2009 21:47:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-11
	synaptics-1.1.0-allocate-timer-early.patch, NONE,
	1.1 xorg-x11-drv-synaptics.spec, 1.27, 1.28
Message-ID: <20090415214738.8931D70101@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21140

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.1.0-allocate-timer-early.patch 
Log Message:
* Wed Apr 15 2009 Adam Jackson <ajax at redhat.com> 1.1.0-3
- synaptics-1.1.0-allocate-timer-early.patch: Allocate the timer early so
  we don't try to malloc it within a sigio handler.


synaptics-1.1.0-allocate-timer-early.patch:

--- NEW FILE synaptics-1.1.0-allocate-timer-early.patch ---
diff -up xf86-input-synaptics-1.1.0/src/synaptics.c.jx xf86-input-synaptics-1.1.0/src/synaptics.c
--- xf86-input-synaptics-1.1.0/src/synaptics.c.jx	2009-03-04 20:46:01.000000000 -0500
+++ xf86-input-synaptics-1.1.0/src/synaptics.c	2009-04-15 17:43:29.000000000 -0400
@@ -511,9 +511,17 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     if (!priv)
 	return NULL;
 
+    /* allocate now so we don't allocate in the signal handler */
+    priv->timer = TimerSet(NULL, 0, 0, NULL, NULL);
+    if (!priv->timer) {
+	xfree(priv);
+	return NULL;
+    }
+
     /* Allocate a new InputInfoRec and add it to the head xf86InputDevs. */
     local = xf86AllocateInput(drv, 0);
     if (!local) {
+	xfree(priv->timer);
 	xfree(priv);
 	return NULL;
     }
@@ -614,6 +622,7 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     if (priv->comm.buffer)
 	XisbFree(priv->comm.buffer);
     free_param_data(priv);
+    xfree(priv->timer);
     xfree(priv);
     local->private = NULL;
     return local;
@@ -627,6 +636,7 @@ static void SynapticsUnInit(InputDriverP
                             InputInfoPtr   local,
                             int            flags)
 {
+    xfree(((SynapticsPrivate *)local->private)->timer);
     xfree(local->private);
     local->private = NULL;
     xf86DeleteInput(local, 0);


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-synaptics.spec	14 Apr 2009 03:33:17 -0000	1.27
+++ xorg-x11-drv-synaptics.spec	15 Apr 2009 21:47:07 -0000	1.28
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Source2:        make-git-snapshot.sh
 
 Patch1:         synaptics-1.1.0-synclient-64.patch
+Patch2:		synaptics-1.1.0-allocate-timer-early.patch
 
 ExcludeArch:    s390 s390x
 
@@ -77,6 +78,7 @@
 #%setup -q -n %{tarball}-%{gitdate}
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -v --install --force || exit 1
@@ -125,6 +127,10 @@
 
 
 %changelog
+* Wed Apr 15 2009 Adam Jackson <ajax at redhat.com> 1.1.0-3
+- synaptics-1.1.0-allocate-timer-early.patch: Allocate the timer early so
+  we don't try to malloc it within a sigio handler.
+
 * Tue Apr 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-2
 - synaptics-1.1.0-synclient-64.patch: fix 64-bit integer issues with
   synclient (#494766) 



From lennart at fedoraproject.org  Wed Apr 15 21:48:43 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 15 Apr 2009 21:48:43 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart.spec,1.14,1.15
Message-ID: <20090415214843.5E5FD70101@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21514

Modified Files:
	libatasmart.spec 
Log Message:
New upstream release


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libatasmart.spec	14 Apr 2009 21:16:43 -0000	1.14
+++ libatasmart.spec	15 Apr 2009 21:48:13 -0000	1.15
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.11
+Version: 0.12
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -55,6 +55,9 @@
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
 
 %changelog
+* Wed Apr 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.12-1
+- New upstream release
+
 * Tue Apr 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-1
 - New upstream release
 



From bojan at fedoraproject.org  Wed Apr 15 21:52:49 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed, 15 Apr 2009 21:52:49 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.24,1.25
Message-ID: <20090415215249.CE63870101@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.1.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- subversion-api-docs.spec	4 Apr 2009 04:54:47 -0000	1.24
+++ subversion-api-docs.spec	15 Apr 2009 21:52:19 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           subversion-api-docs
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Subversion API documentation
 
@@ -51,6 +51,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Thu Apr 16 2009 Bojan Smojver <bojan at rexursive.com> 1.6.1-1
+- bump up to 1.6.1
+
 * Sat Apr  4 2009 Bojan Smojver <bojan at rexursive.com> 1.6.0-1
 - bump up to 1.6.0
 



From lennart at fedoraproject.org  Wed Apr 15 21:53:20 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 15 Apr 2009 21:53:20 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20090415215320.7F51370101@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22837

Modified Files:
	.cvsignore sources 
Log Message:
add missing tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Apr 2009 21:19:52 -0000	1.12
+++ .cvsignore	15 Apr 2009 21:52:50 -0000	1.13
@@ -1 +1 @@
-libatasmart-0.11.tar.gz
+libatasmart-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Apr 2009 21:19:52 -0000	1.12
+++ sources	15 Apr 2009 21:52:50 -0000	1.13
@@ -1 +1 @@
-9bbd84aff263082795e461a078a91feb  libatasmart-0.11.tar.gz
+8baaca011386c05a85415b0fb83c05f3  libatasmart-0.12.tar.gz



From mclasen at fedoraproject.org  Wed Apr 15 21:53:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 15 Apr 2009 21:53:59 +0000 (UTC)
Subject: rpms/gnome-panel/F-11 clock-network.patch, NONE,
	1.1 gnome-panel.spec, 1.351, 1.352
Message-ID: <20090415215359.CE6DA70101@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23015

Modified Files:
	gnome-panel.spec 
Added Files:
	clock-network.patch 
Log Message:
fix clock network tracking


clock-network.patch:

--- NEW FILE clock-network.patch ---
diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network gnome-panel-2.26.1/applets/clock/clock-location.c
--- gnome-panel-2.26.1/applets/clock/clock-location.c.network	2009-04-15 17:28:26.760634154 -0400
+++ gnome-panel-2.26.1/applets/clock/clock-location.c	2009-04-15 17:43:41.869383882 -0400
@@ -12,6 +12,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <math.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending, 
 					   DBUS_TYPE_UINT32, &result,
 					   DBUS_TYPE_INVALID)) {
 			if (result == NM_STATE_CONNECTED) {
+				/* thank you, glibc */
+				res_init ();
 				update_weather_infos ();
 			}
 		}


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-11/gnome-panel.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- gnome-panel.spec	14 Apr 2009 21:03:40 -0000	1.351
+++ gnome-panel.spec	15 Apr 2009 21:53:29 -0000	1.352
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
 
@@ -115,6 +115,9 @@
 
 Patch35: clock-wakeups.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579092
+Patch38: clock-network.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -161,6 +164,7 @@
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
+%patch38 -p1 -b .clock-network
 
 libtoolize --force --copy
 
@@ -362,6 +366,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Fix the clock applets network tracking code
+
 * Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 



From bojan at fedoraproject.org  Wed Apr 15 21:59:10 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed, 15 Apr 2009 21:59:10 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-11 subversion-api-docs.spec,1.24,1.25
Message-ID: <20090415215910.4571770101@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24388

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.1.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-11/subversion-api-docs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- subversion-api-docs.spec	4 Apr 2009 04:54:47 -0000	1.24
+++ subversion-api-docs.spec	15 Apr 2009 21:58:39 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           subversion-api-docs
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Subversion API documentation
 
@@ -51,6 +51,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Thu Apr 16 2009 Bojan Smojver <bojan at rexursive.com> 1.6.1-1
+- bump up to 1.6.1
+
 * Sat Apr  4 2009 Bojan Smojver <bojan at rexursive.com> 1.6.0-1
 - bump up to 1.6.0
 



From behdad at fedoraproject.org  Wed Apr 15 22:04:11 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Wed, 15 Apr 2009 22:04:11 +0000 (UTC)
Subject: rpms/preload/devel .cvsignore, 1.6, 1.7 preload.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090415220411.6349470101@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/preload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25669

Modified Files:
	.cvsignore preload.spec sources 
Log Message:
* Thu Apr 15 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
- Update to 0.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preload/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2008 00:13:50 -0000	1.6
+++ .cvsignore	15 Apr 2009 22:03:40 -0000	1.7
@@ -1 +1 @@
-preload-0.6.3.tar.gz
+preload-0.6.4.tar.gz


Index: preload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preload/devel/preload.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- preload.spec	27 Feb 2009 02:11:43 -0000	1.7
+++ preload.spec	15 Apr 2009 22:03:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           preload
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Preload is an adaptive readahead daemon
 
 Group:          Applications/System
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Apr 15 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preload/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2008 00:13:50 -0000	1.6
+++ sources	15 Apr 2009 22:03:40 -0000	1.7
@@ -1 +1 @@
-4ebb8463b3b7a323ad8b7ffe89578f6e  preload-0.6.3.tar.gz
+10786287b55afd3a2b433b4f898809f4  preload-0.6.4.tar.gz



From tgl at fedoraproject.org  Wed Apr 15 22:08:13 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 15 Apr 2009 22:08:13 +0000 (UTC)
Subject: rpms/mysql/F-11 mysql-ndb-stacksize.patch, NONE, 1.1 mysql.spec,
	1.117, 1.118
Message-ID: <20090415220813.30F8E70101@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26874

Modified Files:
	mysql.spec 
Added Files:
	mysql-ndb-stacksize.patch 
Log Message:
Increase stack size of ndbd threads for safety's sake.

mysql-ndb-stacksize.patch:

--- NEW FILE mysql-ndb-stacksize.patch ---
Raise minimum stack size in ndb code to be a uniform 32K (64K on 64-bit
platforms).  This is in response to an episode where glibc needed 8K of
stack to run malloc(), resulting in ndbd crashing at launch.  While that
was acknowledged to be a glibc bug (see bz #494631), byte-shaving here
isn't any better an idea than it is in the main mysql server.

Note: the request gets rounded up to at least PTHREAD_STACK_MIN, which
is 128K on PPC; otherwise we would need to do something about including
the stack guard size explicitly, since it's so much larger on PPC than
elsewhere.  At some point we might want to use our my_setstacksize()
hack in NdbThread_Create().


diff -Naur mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
--- mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-03-13 17:54:07.000000000 -0400
+++ mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-04-15 14:00:04.000000000 -0400
@@ -106,8 +106,8 @@
 AsyncFile::doStart() 
 {
   // Stacksize for filesystem threads
-  // An 8k stack should be enough
-  const NDB_THREAD_STACKSIZE stackSize = 8192;
+  // don't make this too small
+  const NDB_THREAD_STACKSIZE stackSize = 32768;
 
   char buf[16];
   numAsyncFiles++;


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mysql.spec	7 Apr 2009 23:41:39 -0000	1.117
+++ mysql.spec	15 Apr 2009 22:07:42 -0000	1.118
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.33
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -31,6 +31,7 @@
 Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
+Patch9: mysql-ndb-stacksize.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -172,6 +173,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 libtoolize --force
 aclocal
@@ -637,6 +639,10 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Apr 15 2009 Tom Lane <tgl at redhat.com> 5.1.33-2
+- Increase stack size of ndbd threads for safety's sake.
+Related: #494631
+
 * Tue Apr  7 2009 Tom Lane <tgl at redhat.com> 5.1.33-1
 - Update to MySQL 5.1.33.
 - Disable use of pthread_setschedparam; doesn't work the way code expects.



From lennart at fedoraproject.org  Wed Apr 15 22:09:26 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 15 Apr 2009 22:09:26 +0000 (UTC)
Subject: rpms/libatasmart/F-11 .cvsignore, 1.12, 1.13 libatasmart.spec, 1.14,
	1.15 sources, 1.12, 1.13
Message-ID: <20090415220926.24B2A70101@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27300

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Apr 2009 21:19:52 -0000	1.12
+++ .cvsignore	15 Apr 2009 22:08:55 -0000	1.13
@@ -1 +1 @@
-libatasmart-0.11.tar.gz
+libatasmart-0.12.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-11/libatasmart.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libatasmart.spec	14 Apr 2009 21:16:43 -0000	1.14
+++ libatasmart.spec	15 Apr 2009 22:08:55 -0000	1.15
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.11
+Version: 0.12
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -55,6 +55,9 @@
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
 
 %changelog
+* Wed Apr 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.12-1
+- New upstream release
+
 * Tue Apr 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Apr 2009 21:19:52 -0000	1.12
+++ sources	15 Apr 2009 22:08:55 -0000	1.13
@@ -1 +1 @@
-9bbd84aff263082795e461a078a91feb  libatasmart-0.11.tar.gz
+8baaca011386c05a85415b0fb83c05f3  libatasmart-0.12.tar.gz



From behdad at fedoraproject.org  Wed Apr 15 22:32:19 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Wed, 15 Apr 2009 22:32:19 +0000 (UTC)
Subject: rpms/preload/devel preload.spec,1.8,1.9
Message-ID: <20090415223219.67ACB70101@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/preload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1032

Modified Files:
	preload.spec 
Log Message:
* Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
- Update to 0.6.4



Index: preload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preload/devel/preload.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- preload.spec	15 Apr 2009 22:03:40 -0000	1.8
+++ preload.spec	15 Apr 2009 22:31:48 -0000	1.9
@@ -72,7 +72,7 @@
 
 
 %changelog
-* Thu Apr 15 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
+* Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
 - Update to 0.6.4
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-2



From mtosatti at fedoraproject.org  Wed Apr 15 22:41:22 2009
From: mtosatti at fedoraproject.org (Marcelo Tosatti)
Date: Wed, 15 Apr 2009 22:41:22 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-kvm-skip-pit-check.patch, NONE, 1.1 TODO,
	1.65, 1.66 kernel.spec, 1.1545, 1.1546
Message-ID: <20090415224123.03F8A70101@cvs1.fedora.phx.redhat.com>

Author: mtosatti

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3059

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-kvm-skip-pit-check.patch 
Log Message:
Add linux-2.6-kvm-skip-pit-check.patch



linux-2.6-kvm-skip-pit-check.patch:

--- NEW FILE linux-2.6-kvm-skip-pit-check.patch ---
commit 5bffffc113f91918292283e3819dadd4ca964423
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Feb 11 22:45:42 2009 -0200

    KVM: x86: paravirt skip pit-through-ioapic boot check
    
    Skip the test which checks if the PIT is properly routed when
    using the IOAPIC, aimed at buggy hardware.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 478bca9..eecfc92 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/hardirq.h>
+#include <asm/timer.h>
 
 #define MMU_QUEUE_SIZE 1024
 
@@ -237,6 +238,9 @@ static void paravirt_ops_setup(void)
 		pv_mmu_ops.lazy_mode.enter = kvm_enter_lazy_mmu;
 		pv_mmu_ops.lazy_mode.leave = kvm_leave_lazy_mmu;
 	}
+#ifdef CONFIG_X86_IO_APIC
+	no_timer_check = 1;
+#endif
 }
 
 void __init kvm_guest_init(void)


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- TODO	14 Apr 2009 16:39:17 -0000	1.65
+++ TODO	15 Apr 2009 22:41:21 -0000	1.66
@@ -109,4 +109,7 @@
 	https://bugzilla.redhat.com/show_bug.cgi?id=491625
 	Should be in 2.6.29.2
 
+* linux-2.6-kvm-skip-pit-check.patch:
+	Waiting to be pushed upstream from kvm git.
+
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1545
retrieving revision 1.1546
diff -u -r1.1545 -r1.1546
--- kernel.spec	15 Apr 2009 16:11:39 -0000	1.1545
+++ kernel.spec	15 Apr 2009 22:41:21 -0000	1.1546
@@ -748,6 +748,8 @@
 Patch9301: linux-2.6-kvm-mask-notifiers.patch
 Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 
+Patch9304: linux-2.6-kvm-skip-pit-check.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1380,6 +1382,7 @@
 ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
 ApplyPatch linux-2.6-kvm-mask-notifiers.patch
 ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1966,6 +1969,9 @@
 # and build.
 
 %changelog
+* Wed Apr 15 2009 Marcelo Tosatti <mtosatti at redhat.com>
+- Skip PIT-through-IOAPIC routing check on KVM guests.
+
 * Wed Apr 15 2009 Chuck Ebbert <cebbert at redhat.com>
 - Add serial driver option to skip testing for the TXEN bug. (#495762)
 



From wtogami at fedoraproject.org  Wed Apr 15 22:49:20 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 15 Apr 2009 22:49:20 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.21, 1.22 ltsp.spec, 1.29, 1.30 sources,
	1.25, 1.26
Message-ID: <20090415224920.B16CC70101@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5784

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Fix typo in mkinitrd config
- Configure plymouth for graphical boot on supported hardware



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Mar 2009 15:29:46 -0000	1.21
+++ .cvsignore	15 Apr 2009 22:48:48 -0000	1.22
@@ -1 +1 @@
-ltsp-5.1.68.tar.bz2
+ltsp-5.1.70.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ltsp.spec	30 Mar 2009 15:31:11 -0000	1.29
+++ ltsp.spec	15 Apr 2009 22:48:49 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.68
-%define _datestamp .20090329.14
+Version:        5.1.70
+%define _datestamp .20090415.17
 #Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -412,7 +412,11 @@
 %endif
 
 %changelog
-* Mon Mar 30 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.68-1.20090329.14%{?dist}
+* Wed Apr 05 2009 Warren Togami <wtogami at redhat.com> - 5.1.70-1
+- Fix typo in mkinitrd config
+- Configure plymouth for graphical boot on supported hardware
+
+* Mon Mar 30 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.68-1
 - new upstream
 - fix packaging to not need ChangeLog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Mar 2009 15:29:46 -0000	1.25
+++ sources	15 Apr 2009 22:48:49 -0000	1.26
@@ -1 +1 @@
-c0a6e21e93570c097070d1ca4cdc76e5  ltsp-5.1.68.tar.bz2
+b8cb47c3031b5a6aaf5f190cbf52824c  ltsp-5.1.70.tar.bz2



From jjohnstn at fedoraproject.org  Wed Apr 15 22:50:34 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed, 15 Apr 2009 22:50:34 +0000 (UTC)
Subject: rpms/eclipse-changelog/F-10 .cvsignore, 1.21,
	1.22 eclipse-changelog.spec, 1.75, 1.76 fetch-changelog.sh, 1.3,
	1.4 sources, 1.30, 1.31
Message-ID: <20090415225034.1F0FA70101@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-changelog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6222

Modified Files:
	.cvsignore eclipse-changelog.spec fetch-changelog.sh sources 
Log Message:

* Wed Apr 15 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.7-1
- 2.6.7.
- Fixes #268224, #267281, #264343




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	20 Jan 2009 19:38:38 -0000	1.21
+++ .cvsignore	15 Apr 2009 22:50:03 -0000	1.22
@@ -6,3 +6,4 @@
 eclipse-changelog-src-2.6.4.zip
 eclipse-changelog-src-2.6.5.zip
 eclipse-changelog-src-2.6.6.zip
+eclipse-changelog-src-2.6.7.zip


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/eclipse-changelog.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- eclipse-changelog.spec	20 Jan 2009 19:38:38 -0000	1.75
+++ eclipse-changelog.spec	15 Apr 2009 22:50:03 -0000	1.76
@@ -3,7 +3,7 @@
 %define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
-Version:        2.6.6
+Version:        2.6.7
 Release:        1%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
@@ -21,9 +21,6 @@
 Source0:        http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
 Source1:		fetch-changelog.sh
 
-# Patch to add some fixes made post 2.6.6.  Resolves #261694, #261379
-Patch1:		eclipse-changelog-post-2_6_6.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          eclipse-pde >= 1:3.3.0
@@ -46,7 +43,6 @@
 %prep
 %setup -q -c -n eclipse-changelog-%{version}
 pushd org.eclipse.linuxtools.changelog.core
-%patch1
 popd
 
 %build
@@ -71,6 +67,10 @@
 %{eclipse_base}/dropins/changelog
 
 %changelog
+* Wed Apr 15 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.7-1
+- 2.6.7.
+- Fixes #268224, #267281, #264343
+
 * Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
 - 2.6.6.
 - Fixes #260719, #260722, #261694, #261379


Index: fetch-changelog.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/fetch-changelog.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fetch-changelog.sh	20 Jan 2009 19:38:38 -0000	1.3
+++ fetch-changelog.sh	15 Apr 2009 22:50:03 -0000	1.4
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-mkdir eclipse-changelog-src-2.6.6
-cd eclipse-changelog-src-2.6.6
+mkdir eclipse-changelog-src-2.6.7
+cd eclipse-changelog-src-2.6.7
 for f in \
  org.eclipse.linuxtools.changelog.core \
  org.eclipse.linuxtools.changelog.doc \
@@ -10,6 +10,6 @@
  org.eclipse.linuxtools.changelog-feature \
  ;
  do 
-  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_6/$f
+  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_7/$f
  done
-zip -r eclipse-changelog-src-2.6.6.zip *
+zip -r eclipse-changelog-src-2.6.7.zip *


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Jan 2009 19:38:38 -0000	1.30
+++ sources	15 Apr 2009 22:50:03 -0000	1.31
@@ -1 +1 @@
-250c5c8306d457e92efff42e673ec24b  eclipse-changelog-src-2.6.6.zip
+bb217bc0ac7eb6e3114b2c9228d95c7c  eclipse-changelog-src-2.6.7.zip



From wtogami at fedoraproject.org  Wed Apr 15 22:51:09 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 15 Apr 2009 22:51:09 +0000 (UTC)
Subject: rpms/ltsp/F-11 .cvsignore, 1.21, 1.22 ltsp.spec, 1.29, 1.30 sources,
	1.25, 1.26
Message-ID: <20090415225109.9C0A070101@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6521

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Fix typo in mkinitrd config
- Configure plymouth for graphical boot on supported hardware



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Mar 2009 15:29:46 -0000	1.21
+++ .cvsignore	15 Apr 2009 22:50:38 -0000	1.22
@@ -1 +1 @@
-ltsp-5.1.68.tar.bz2
+ltsp-5.1.70.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/ltsp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ltsp.spec	30 Mar 2009 15:31:11 -0000	1.29
+++ ltsp.spec	15 Apr 2009 22:50:38 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.68
-%define _datestamp .20090329.14
+Version:        5.1.70
+%define _datestamp .20090415.17
 #Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -412,7 +412,11 @@
 %endif
 
 %changelog
-* Mon Mar 30 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.68-1.20090329.14%{?dist}
+* Wed Apr 05 2009 Warren Togami <wtogami at redhat.com> - 5.1.70-1
+- Fix typo in mkinitrd config
+- Configure plymouth for graphical boot on supported hardware
+
+* Mon Mar 30 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.68-1
 - new upstream
 - fix packaging to not need ChangeLog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Mar 2009 15:29:46 -0000	1.25
+++ sources	15 Apr 2009 22:50:38 -0000	1.26
@@ -1 +1 @@
-c0a6e21e93570c097070d1ca4cdc76e5  ltsp-5.1.68.tar.bz2
+b8cb47c3031b5a6aaf5f190cbf52824c  ltsp-5.1.70.tar.bz2



From kkofler at fedoraproject.org  Wed Apr 15 22:53:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 15 Apr 2009 22:53:07 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec,1.192,1.193
Message-ID: <20090415225307.5545D70101@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7132/F-11

Modified Files:
	kdebindings.spec 
Log Message:
* Wed Apr 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
- reenable csharp on ppc


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- kdebindings.spec	8 Apr 2009 16:20:14 -0000	1.192
+++ kdebindings.spec	15 Apr 2009 22:52:36 -0000	1.193
@@ -1,6 +1,6 @@
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
-%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x
+%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 %define csharp 1
 %endif
 %define falcon 1
@@ -24,7 +24,7 @@
 
 Name: kdebindings
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -475,6 +475,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
+- reenable csharp on ppc
+
 * Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - enable csharp only on archs supported by mono (ie, drop ppc)
 



From kkofler at fedoraproject.org  Wed Apr 15 22:53:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 15 Apr 2009 22:53:07 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.192,1.193
Message-ID: <20090415225307.B19B270101@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7132/devel

Modified Files:
	kdebindings.spec 
Log Message:
* Wed Apr 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
- reenable csharp on ppc


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- kdebindings.spec	8 Apr 2009 16:20:14 -0000	1.192
+++ kdebindings.spec	15 Apr 2009 22:52:37 -0000	1.193
@@ -1,6 +1,6 @@
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
-%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x
+%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 %define csharp 1
 %endif
 %define falcon 1
@@ -24,7 +24,7 @@
 
 Name: kdebindings
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -475,6 +475,9 @@
 
 
 %changelog
+* Wed Apr 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
+- reenable csharp on ppc
+
 * Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - enable csharp only on archs supported by mono (ie, drop ppc)
 



From cebbert at fedoraproject.org  Wed Apr 15 22:54:16 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 15 Apr 2009 22:54:16 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1546,1.1547
Message-ID: <20090415225416.7E62670101@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7610

Modified Files:
	kernel.spec 
Log Message:
add version to log


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1546
retrieving revision 1.1547
diff -u -r1.1546 -r1.1547
--- kernel.spec	15 Apr 2009 22:41:21 -0000	1.1546
+++ kernel.spec	15 Apr 2009 22:53:45 -0000	1.1547
@@ -1969,7 +1969,7 @@
 # and build.
 
 %changelog
-* Wed Apr 15 2009 Marcelo Tosatti <mtosatti at redhat.com>
+* Wed Apr 15 2009 Marcelo Tosatti <mtosatti at redhat.com> 2.6.29.1-85
 - Skip PIT-through-IOAPIC routing check on KVM guests.
 
 * Wed Apr 15 2009 Chuck Ebbert <cebbert at redhat.com>



From jjohnstn at fedoraproject.org  Wed Apr 15 23:01:21 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed, 15 Apr 2009 23:01:21 +0000 (UTC)
Subject: rpms/eclipse-changelog/F-11 .cvsignore, 1.20,
	1.21 eclipse-changelog.spec, 1.75, 1.76 fetch-changelog.sh, 1.3,
	1.4 sources, 1.30, 1.31
Message-ID: <20090415230121.D2F9770101@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-changelog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9638

Modified Files:
	.cvsignore eclipse-changelog.spec fetch-changelog.sh sources 
Log Message:

* Wed Apr 15 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.7-1
- 2.6.7.
- Fixes #268224, #267281, #264343




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Dec 2008 20:24:07 -0000	1.20
+++ .cvsignore	15 Apr 2009 23:00:50 -0000	1.21
@@ -4,3 +4,6 @@
 eclipse-changelog-src-2.6.2.zip
 eclipse-changelog-src-2.6.3.zip
 eclipse-changelog-src-2.6.4.zip
+eclipse-changelog-src-2.6.5.zip
+eclipse-changelog-src-2.6.6.zip
+eclipse-changelog-src-2.6.7.zip


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-11/eclipse-changelog.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- eclipse-changelog.spec	23 Mar 2009 16:23:46 -0000	1.75
+++ eclipse-changelog.spec	15 Apr 2009 23:00:51 -0000	1.76
@@ -3,8 +3,8 @@
 %define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
-Version:        2.6.6
-Release:        3%{?dist}
+Version:        2.6.7
+Release:        1%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
 Group:          Development/Tools 
@@ -21,9 +21,6 @@
 Source0:        http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
 Source1:		fetch-changelog.sh
 
-# Patch to add some fixes made post 2.6.6.  Resolves #261694, #261379
-Patch1:		eclipse-changelog-post-2_6_6.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          eclipse-pde >= 1:3.3.0
@@ -46,7 +43,6 @@
 %prep
 %setup -q -c -n eclipse-changelog-%{version}
 pushd org.eclipse.linuxtools.changelog.core
-%patch1
 popd
 
 %build
@@ -71,11 +67,9 @@
 %{eclipse_base}/dropins/changelog
 
 %changelog
-* Mon Mar 23 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-3
-- Bump release and rebuild.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.6.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 15 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.7-1
+- 2.6.7.
+- Fixes #268224, #267281, #264343
 
 * Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
 - 2.6.6.


Index: fetch-changelog.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-11/fetch-changelog.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fetch-changelog.sh	20 Jan 2009 19:41:02 -0000	1.3
+++ fetch-changelog.sh	15 Apr 2009 23:00:51 -0000	1.4
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-mkdir eclipse-changelog-src-2.6.6
-cd eclipse-changelog-src-2.6.6
+mkdir eclipse-changelog-src-2.6.7
+cd eclipse-changelog-src-2.6.7
 for f in \
  org.eclipse.linuxtools.changelog.core \
  org.eclipse.linuxtools.changelog.doc \
@@ -10,6 +10,6 @@
  org.eclipse.linuxtools.changelog-feature \
  ;
  do 
-  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_6/$f
+  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_7/$f
  done
-zip -r eclipse-changelog-src-2.6.6.zip *
+zip -r eclipse-changelog-src-2.6.7.zip *


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Jan 2009 19:41:02 -0000	1.30
+++ sources	15 Apr 2009 23:00:51 -0000	1.31
@@ -1 +1 @@
-250c5c8306d457e92efff42e673ec24b  eclipse-changelog-src-2.6.6.zip
+bb217bc0ac7eb6e3114b2c9228d95c7c  eclipse-changelog-src-2.6.7.zip



From jjohnstn at fedoraproject.org  Wed Apr 15 23:04:08 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed, 15 Apr 2009 23:04:08 +0000 (UTC)
Subject: rpms/eclipse-changelog/devel .cvsignore, 1.20,
	1.21 eclipse-changelog.spec, 1.75, 1.76 fetch-changelog.sh, 1.3,
	1.4 sources, 1.30, 1.31
Message-ID: <20090415230408.AD12170101@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-changelog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10265

Modified Files:
	.cvsignore eclipse-changelog.spec fetch-changelog.sh sources 
Log Message:

* Wed Apr 15 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.7-1
- 2.6.7.
- Fixes #268224, #267281, #264343




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Dec 2008 20:24:07 -0000	1.20
+++ .cvsignore	15 Apr 2009 23:03:37 -0000	1.21
@@ -4,3 +4,6 @@
 eclipse-changelog-src-2.6.2.zip
 eclipse-changelog-src-2.6.3.zip
 eclipse-changelog-src-2.6.4.zip
+eclipse-changelog-src-2.6.5.zip
+eclipse-changelog-src-2.6.6.zip
+eclipse-changelog-src-2.6.7.zip


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- eclipse-changelog.spec	23 Mar 2009 16:23:46 -0000	1.75
+++ eclipse-changelog.spec	15 Apr 2009 23:03:38 -0000	1.76
@@ -3,8 +3,8 @@
 %define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
-Version:        2.6.6
-Release:        3%{?dist}
+Version:        2.6.7
+Release:        1%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
 Group:          Development/Tools 
@@ -21,9 +21,6 @@
 Source0:        http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
 Source1:		fetch-changelog.sh
 
-# Patch to add some fixes made post 2.6.6.  Resolves #261694, #261379
-Patch1:		eclipse-changelog-post-2_6_6.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          eclipse-pde >= 1:3.3.0
@@ -46,7 +43,6 @@
 %prep
 %setup -q -c -n eclipse-changelog-%{version}
 pushd org.eclipse.linuxtools.changelog.core
-%patch1
 popd
 
 %build
@@ -71,11 +67,9 @@
 %{eclipse_base}/dropins/changelog
 
 %changelog
-* Mon Mar 23 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-3
-- Bump release and rebuild.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.6.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 15 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.7-1
+- 2.6.7.
+- Fixes #268224, #267281, #264343
 
 * Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
 - 2.6.6.


Index: fetch-changelog.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/fetch-changelog.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fetch-changelog.sh	20 Jan 2009 19:41:02 -0000	1.3
+++ fetch-changelog.sh	15 Apr 2009 23:03:38 -0000	1.4
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-mkdir eclipse-changelog-src-2.6.6
-cd eclipse-changelog-src-2.6.6
+mkdir eclipse-changelog-src-2.6.7
+cd eclipse-changelog-src-2.6.7
 for f in \
  org.eclipse.linuxtools.changelog.core \
  org.eclipse.linuxtools.changelog.doc \
@@ -10,6 +10,6 @@
  org.eclipse.linuxtools.changelog-feature \
  ;
  do 
-  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_6/$f
+  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_7/$f
  done
-zip -r eclipse-changelog-src-2.6.6.zip *
+zip -r eclipse-changelog-src-2.6.7.zip *


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Jan 2009 19:41:02 -0000	1.30
+++ sources	15 Apr 2009 23:03:38 -0000	1.31
@@ -1 +1 @@
-250c5c8306d457e92efff42e673ec24b  eclipse-changelog-src-2.6.6.zip
+bb217bc0ac7eb6e3114b2c9228d95c7c  eclipse-changelog-src-2.6.7.zip



From mclasen at fedoraproject.org  Wed Apr 15 23:04:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 15 Apr 2009 23:04:55 +0000 (UTC)
Subject: rpms/gnome-applets/devel gweather-network.patch, 1.4,
	1.5 gnome-applets.spec, 1.335, 1.336
Message-ID: <20090415230455.5E2B770101@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9981

Modified Files:
	gnome-applets.spec 
Added Files:
	gweather-network.patch 
Log Message:
fix network status tracking


gweather-network.patch:

Index: gweather-network.patch
===================================================================
RCS file: gweather-network.patch
diff -N gweather-network.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gweather-network.patch	15 Apr 2009 23:04:54 -0000	1.5
@@ -0,0 +1,22 @@
+diff -up gnome-applets-2.26.1/gweather/gweather-applet.c.network gnome-applets-2.26.1/gweather/gweather-applet.c
+--- gnome-applets-2.26.1/gweather/gweather-applet.c.network	2009-04-15 18:53:13.123633124 -0400
++++ gnome-applets-2.26.1/gweather/gweather-applet.c	2009-04-15 18:54:17.438384718 -0400
+@@ -17,6 +17,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+ 
+ #include <gconf/gconf-client.h>
+ #include <panel-applet.h>
+@@ -552,6 +555,8 @@ state_notify (DBusPendingCall *pending, 
+                                            DBUS_TYPE_UINT32, &result,
+                                            DBUS_TYPE_INVALID)) {
+                         if (result == NM_STATE_CONNECTED) {
++				/* thank you, glibc */
++				res_init ();
+ 				gweather_update (gw_applet);
+                         }
+                 }


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- gnome-applets.spec	13 Apr 2009 04:16:59 -0000	1.335
+++ gnome-applets.spec	15 Apr 2009 23:04:54 -0000	1.336
@@ -61,6 +61,9 @@
 # and keep the mixer hidden away from the add to panel dialog
 Patch41:	gnome-applets-no-mixer-icon.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579098
+Patch42:	gweather-network.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -144,6 +147,7 @@
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
+%patch42 -p1 -b .network
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -338,6 +342,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
+- Make gweather network status tracking work
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 



From behdad at fedoraproject.org  Wed Apr 15 23:10:59 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Wed, 15 Apr 2009 23:10:59 +0000 (UTC)
Subject: rpms/preload/F-11 preload.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <20090415231059.751EE70101@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/preload/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11884

Modified Files:
	preload.spec sources 
Log Message:
* Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
- Update to 0.6.4



Index: preload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preload/F-11/preload.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- preload.spec	27 Feb 2009 02:11:43 -0000	1.7
+++ preload.spec	15 Apr 2009 23:10:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           preload
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Preload is an adaptive readahead daemon
 
 Group:          Applications/System
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preload/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2008 00:13:50 -0000	1.6
+++ sources	15 Apr 2009 23:10:28 -0000	1.7
@@ -1 +1 @@
-4ebb8463b3b7a323ad8b7ffe89578f6e  preload-0.6.3.tar.gz
+10786287b55afd3a2b433b4f898809f4  preload-0.6.4.tar.gz



From behdad at fedoraproject.org  Wed Apr 15 23:12:48 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Wed, 15 Apr 2009 23:12:48 +0000 (UTC)
Subject: rpms/preload/F-11 preload.spec,1.8,1.9
Message-ID: <20090415231248.8CC6070101@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/preload/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12263

Modified Files:
	preload.spec 
Log Message:
* Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1.1
- Up revision so we can tag in dist-f11



Index: preload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preload/F-11/preload.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- preload.spec	15 Apr 2009 23:10:28 -0000	1.8
+++ preload.spec	15 Apr 2009 23:12:17 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           preload
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Preload is an adaptive readahead daemon
 
 Group:          Applications/System
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1.1
+- Up revision so we can tag in dist-f11
+
 * Thu Apr 15 2009 Behdad Esfahbod <besfahbo at redhat.com> - 0.6.4-1
 - Update to 0.6.4
 



From mclasen at fedoraproject.org  Wed Apr 15 23:15:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 15 Apr 2009 23:15:14 +0000 (UTC)
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.336,1.337
Message-ID: <20090415231514.9577A70101@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12963

Modified Files:
	gnome-applets.spec 
Log Message:
bump rev



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- gnome-applets.spec	15 Apr 2009 23:04:54 -0000	1.336
+++ gnome-applets.spec	15 Apr 2009 23:14:43 -0000	1.337
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.26.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops



From mclasen at fedoraproject.org  Thu Apr 16 00:02:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 16 Apr 2009 00:02:32 +0000 (UTC)
Subject: rpms/gnome-applets/F-11 gweather-network.patch, 1.4,
	1.5 gnome-applets.spec, 1.335, 1.336
Message-ID: <20090416000232.489ED70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24860

Modified Files:
	gnome-applets.spec 
Added Files:
	gweather-network.patch 
Log Message:
try that again


gweather-network.patch:

Index: gweather-network.patch
===================================================================
RCS file: gweather-network.patch
diff -N gweather-network.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gweather-network.patch	16 Apr 2009 00:02:01 -0000	1.5
@@ -0,0 +1,22 @@
+diff -up gnome-applets-2.26.1/gweather/gweather-applet.c.network gnome-applets-2.26.1/gweather/gweather-applet.c
+--- gnome-applets-2.26.1/gweather/gweather-applet.c.network	2009-04-15 18:53:13.123633124 -0400
++++ gnome-applets-2.26.1/gweather/gweather-applet.c	2009-04-15 18:54:17.438384718 -0400
+@@ -17,6 +17,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+ 
+ #include <gconf/gconf-client.h>
+ #include <panel-applet.h>
+@@ -552,6 +555,8 @@ state_notify (DBusPendingCall *pending, 
+                                            DBUS_TYPE_UINT32, &result,
+                                            DBUS_TYPE_INVALID)) {
+                         if (result == NM_STATE_CONNECTED) {
++				/* thank you, glibc */
++				res_init ();
+ 				gweather_update (gw_applet);
+                         }
+                 }


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-11/gnome-applets.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- gnome-applets.spec	13 Apr 2009 04:16:59 -0000	1.335
+++ gnome-applets.spec	16 Apr 2009 00:02:00 -0000	1.336
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.26.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -61,6 +61,9 @@
 # and keep the mixer hidden away from the add to panel dialog
 Patch41:	gnome-applets-no-mixer-icon.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579098
+Patch42:	gweather-network.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -144,6 +147,7 @@
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
+%patch42 -p1 -b .network
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -338,6 +342,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
+- Make gweather network status tracking work
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 



From mclasen at fedoraproject.org  Thu Apr 16 00:05:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 16 Apr 2009 00:05:03 +0000 (UTC)
Subject: rpms/gnome-applets/F-11 gnome-applets.spec,1.336,1.337
Message-ID: <20090416000503.1B46470127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25824

Modified Files:
	gnome-applets.spec 
Log Message:
bump rev



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-11/gnome-applets.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- gnome-applets.spec	16 Apr 2009 00:02:00 -0000	1.336
+++ gnome-applets.spec	16 Apr 2009 00:04:32 -0000	1.337
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.26.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -342,7 +342,7 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
-* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
+* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-3
 - Make gweather network status tracking work
 
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1



From ivazquez at fedoraproject.org  Thu Apr 16 00:07:50 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Thu, 16 Apr 2009 00:07:50 +0000 (UTC)
Subject: rpms/python/F-11 python.spec,1.146,1.147
Message-ID: <20090416000750.B2C1D70127@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/python/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26941

Modified Files:
	python.spec 
Log Message:
Oh for...


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/F-11/python.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- python.spec	17 Mar 2009 15:38:27 -0000	1.146
+++ python.spec	16 Apr 2009 00:07:20 -0000	1.147
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -81,6 +81,10 @@
 Provides: python-sqlite = 2.3.2
 Obsoletes: python-ctypes < 1.0.1
 Provides: python-ctypes = 1.0.1
+Obsoletes: python-hashlib < 20081120
+Provides: python-hashlib = 20081120
+Obsoletes: python-uuid < 1.31
+Provides: python-uuid = 1.31
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -531,6 +535,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Wed Apr 15 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.6-8
+- Replace python-hashlib and python-uuid (#484715)
+
 * Tue Mar 17 2009 James Antill <james at fedoraproject.org> - 2.6-7
 - Use system libffi
 - Resolves: bug#490573



From kaigai at fedoraproject.org  Thu Apr 16 00:11:54 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Thu, 16 Apr 2009 00:11:54 +0000 (UTC)
Subject: rpms/php-pecl-selinux/devel .cvsignore, 1.2,
	1.3 php-pecl-selinux.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090416001155.50C8B70127@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/php-pecl-selinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27875

Modified Files:
	.cvsignore php-pecl-selinux.spec sources 
Log Message:
add support for libselinux-2.0.80 features



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2009 01:48:36 -0000	1.2
+++ .cvsignore	16 Apr 2009 00:11:23 -0000	1.3
@@ -1 +1,2 @@
 selinux-0.1.2.tgz
+selinux-0.3.1.tgz


Index: php-pecl-selinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/devel/php-pecl-selinux.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-selinux.spec	10 Mar 2009 01:48:36 -0000	1.1
+++ php-pecl-selinux.spec	16 Apr 2009 00:11:23 -0000	1.2
@@ -4,15 +4,15 @@
 
 Summary: SELinux binding for PHP scripting language
 Name: php-pecl-selinux
-Version: 0.1.2
+Version: 0.3.1
 Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://pecl.php.net/package/%{pecl_name}
 Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.43
-Requires: php >= 5.2.0, libselinux >= 2.0.43
+BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.80
+Requires: php >= 5.2.0, libselinux >= 2.0.80
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 %if 0%{?php_zend_api}
@@ -77,5 +77,12 @@
 %{pecl_xmldir}/%{name}.xml
 
 %changelog
+* Thu Apr 16 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.3.1-1
+- The "permissive" tag was added to selinux_compute_av
+- The selinux_deny_unknown() was added
+
+* Thu Mar 12 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.2.1-1
+- Specfile to build RPM package is added.
+
 * Thu Mar  5 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.1.2-1
 - The initial release of SELinux binding for PHP script language.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2009 01:48:36 -0000	1.2
+++ sources	16 Apr 2009 00:11:23 -0000	1.3
@@ -1 +1,2 @@
 d7c1a6d926663c8a7898d619ee319c5b  selinux-0.1.2.tgz
+54857a8908e199113d128b8a652f5121  selinux-0.3.1.tgz



From robert at fedoraproject.org  Thu Apr 16 00:23:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:23:23 +0000 (UTC)
Subject: rpms/jwhois/F-10 jwhois-3.2.3.tar.gz.sig,1.1,NONE
Message-ID: <20090416002323.36E3A70137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/jwhois/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv350/F-10

Removed Files:
	jwhois-3.2.3.tar.gz.sig 
Log Message:
Remove obsolete jwhois-3.2.3.tar.gz.sig from branches having jwhois-4.0



--- jwhois-3.2.3.tar.gz.sig DELETED ---



From robert at fedoraproject.org  Thu Apr 16 00:23:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:23:23 +0000 (UTC)
Subject: rpms/jwhois/F-11 jwhois-3.2.3.tar.gz.sig,1.1,NONE
Message-ID: <20090416002323.9FE0970137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/jwhois/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv350/F-11

Removed Files:
	jwhois-3.2.3.tar.gz.sig 
Log Message:
Remove obsolete jwhois-3.2.3.tar.gz.sig from branches having jwhois-4.0



--- jwhois-3.2.3.tar.gz.sig DELETED ---



From robert at fedoraproject.org  Thu Apr 16 00:23:25 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:23:25 +0000 (UTC)
Subject: rpms/jwhois/devel jwhois-3.2.3.tar.gz.sig,1.1,NONE
Message-ID: <20090416002325.2EADA70137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/jwhois/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv350/devel

Removed Files:
	jwhois-3.2.3.tar.gz.sig 
Log Message:
Remove obsolete jwhois-3.2.3.tar.gz.sig from branches having jwhois-4.0



--- jwhois-3.2.3.tar.gz.sig DELETED ---



From robert at fedoraproject.org  Thu Apr 16 00:23:24 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:23:24 +0000 (UTC)
Subject: rpms/jwhois/F-9 jwhois-3.2.3.tar.gz.sig,1.1,NONE
Message-ID: <20090416002324.AD9C470137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/jwhois/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv350/F-9

Removed Files:
	jwhois-3.2.3.tar.gz.sig 
Log Message:
Remove obsolete jwhois-3.2.3.tar.gz.sig from branches having jwhois-4.0



--- jwhois-3.2.3.tar.gz.sig DELETED ---



From robert at fedoraproject.org  Thu Apr 16 00:23:24 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:23:24 +0000 (UTC)
Subject: rpms/jwhois/F-8 jwhois-3.2.3.tar.gz.sig,1.1,NONE
Message-ID: <20090416002324.2782F70137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/jwhois/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv350/F-8

Removed Files:
	jwhois-3.2.3.tar.gz.sig 
Log Message:
Remove obsolete jwhois-3.2.3.tar.gz.sig from branches having jwhois-4.0



--- jwhois-3.2.3.tar.gz.sig DELETED ---



From robert at fedoraproject.org  Thu Apr 16 00:41:04 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:41:04 +0000 (UTC)
Subject: rpms/python-boto/devel .cvsignore, 1.6, 1.7 python-boto.spec, 1.9, 
	1.10 sources, 1.6, 1.7
Message-ID: <20090416004104.B2F0070127@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-boto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7785

Modified Files:
	.cvsignore python-boto.spec sources 
Log Message:
Upgrade to 1.7a



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-boto/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2008 17:30:39 -0000	1.6
+++ .cvsignore	16 Apr 2009 00:40:34 -0000	1.7
@@ -1 +1 @@
-boto-1.5c.tar.gz
+boto-1.7a.tar.gz


Index: python-boto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-boto/devel/python-boto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-boto.spec	23 Feb 2009 21:12:58 -0000	1.9
+++ python-boto.spec	16 Apr 2009 00:40:34 -0000	1.10
@@ -3,8 +3,8 @@
 
 Summary:	A simple lightweight interface to Amazon Web Services
 Name:		python-boto
-Version:	1.5c
-Release:	2%{?dist}
+Version:	1.7a
+Release:	1%{?dist}
 License:	MIT
 Group:		Development/Languages
 URL:		http://code.google.com/p/%{pkgname}/
@@ -42,6 +42,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> 1.7a-1
+- Upgrade to 1.7a
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.5c-2
 - Rebuild against rpm 4.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-boto/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Dec 2008 17:30:39 -0000	1.6
+++ sources	16 Apr 2009 00:40:34 -0000	1.7
@@ -1 +1 @@
-596558d292361944d2319cc615494734  boto-1.5c.tar.gz
+e64e995ff2313452e78ef37dddeb44c1  boto-1.7a.tar.gz



From robert at fedoraproject.org  Thu Apr 16 00:59:33 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 00:59:33 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.77,1.78
Message-ID: <20090416005933.F385D70127@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11621

Modified Files:
	cyrus-sasl.spec 
Log Message:
Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cyrus-sasl.spec	24 Feb 2009 10:39:32 -0000	1.77
+++ cyrus-sasl.spec	16 Apr 2009 00:59:03 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -124,15 +124,6 @@
 a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
-%package krb4
-Requires: %{name}-lib = %{version}-%{release}
-Group: System Environment/Libraries
-Summary: Kerberos 4 authentication support for Cyrus SASL
-
-%description krb4
-The %{name}-krb4 package contains the Cyrus SASL plugins which
-support Kerberos 4 authentication.
-
 %prep
 %setup -q
 chmod -x doc/*.html
@@ -223,7 +214,7 @@
         --disable-java \
         --with-plugindir=%{_plugindir2} \
         --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \
-        --enable-krb4=/usr \
+        --disable-krb4 \
         --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
         --with-gss_impl=mit \
         --with-rc4 \
@@ -370,10 +361,6 @@
 %defattr(-,root,root)
 %{_plugindir2}/*gssapi*.so*
 
-%files krb4
-%defattr(-,root,root)
-%{_plugindir2}/*kerberos4*.so*
-
 %files devel
 %defattr(-,root,root)
 %doc doc/*.txt
@@ -385,6 +372,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> - 2.1.22-23
+- Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.22-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From airlied at fedoraproject.org  Thu Apr 16 01:05:10 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 16 Apr 2009 01:05:10 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.1-exa-avoid-swapped-out.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.434, 1.435
Message-ID: <20090416010510.4650F70127@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12448

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-exa-avoid-swapped-out.patch 
Log Message:
* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 1.6.1-3
- xserver-1.6.1-exa-avoid-swapped-out.patch - make FUS not suck in theory


xserver-1.6.1-exa-avoid-swapped-out.patch:

--- NEW FILE xserver-1.6.1-exa-avoid-swapped-out.patch ---
>From ddf5bfc66b8a6078fe8649e39627b78e2139c7ec Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 16 Apr 2009 10:28:36 +1000
Subject: [PATCH] exa: avoid offscreen pixmap swapped out flag for driver pixmaps

---
 exa/exa_offscreen.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index 4aaa2c1..d7198cb 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -371,6 +371,9 @@ exaEnableDisableFBAccess (int index, Bool enable)
     ScreenPtr pScreen = screenInfo.screens[index];
     ExaScreenPriv (pScreen);
 
+    if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS)
+	return;
+
     if (!enable && pExaScr->disableFbCount++ == 0) {
 	if (pExaScr->info->exa_minor < 1)
 	    ExaOffscreenSwapOut (pScreen);
-- 
1.6.0.6



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- xorg-x11-server.spec	15 Apr 2009 08:42:38 -0000	1.434
+++ xorg-x11-server.spec	16 Apr 2009 01:04:39 -0000	1.435
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -104,6 +104,7 @@
 Patch6029: xserver-1.6.0-no-i810.patch
 
 Patch6030: xserver-1.6.0-randr-xinerama-crash.patch
+Patch6031: xserver-1.6.1-exa-avoid-swapped-out.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -535,6 +536,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 1.6.1-3
+- xserver-1.6.1-exa-avoid-swapped-out.patch - make FUS not suck in theory
+
 * Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 1.6.1-2
 - xserver-1.6.0-randr-xinerama-crash.patch - fix xinerama vs randr crash
 



From robert at fedoraproject.org  Thu Apr 16 01:17:27 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 01:17:27 +0000 (UTC)
Subject: rpms/cyrus-sasl/F-11 cyrus-sasl.spec,1.77,1.78
Message-ID: <20090416011727.E241170127@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/cyrus-sasl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14143

Modified Files:
	cyrus-sasl.spec 
Log Message:
Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)

This is temporary required because F12 is already shipping krb5 without
krb4 support, thus rebuilding of cyrus-sasl in F12 without krb4 support
fails as cyrus-sasl is part of the mock build root. I will enable this
afterwards in F11 again to avoid F11 breakage and once F12 builds fit so
far...



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-11/cyrus-sasl.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cyrus-sasl.spec	24 Feb 2009 10:39:32 -0000	1.77
+++ cyrus-sasl.spec	16 Apr 2009 01:16:57 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 22%{?dist}
+Release: 22.1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -124,15 +124,6 @@
 a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
-%package krb4
-Requires: %{name}-lib = %{version}-%{release}
-Group: System Environment/Libraries
-Summary: Kerberos 4 authentication support for Cyrus SASL
-
-%description krb4
-The %{name}-krb4 package contains the Cyrus SASL plugins which
-support Kerberos 4 authentication.
-
 %prep
 %setup -q
 chmod -x doc/*.html
@@ -223,7 +214,7 @@
         --disable-java \
         --with-plugindir=%{_plugindir2} \
         --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \
-        --enable-krb4=/usr \
+        --disable-krb4 \
         --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
         --with-gss_impl=mit \
         --with-rc4 \
@@ -370,10 +361,6 @@
 %defattr(-,root,root)
 %{_plugindir2}/*gssapi*.so*
 
-%files krb4
-%defattr(-,root,root)
-%{_plugindir2}/*kerberos4*.so*
-
 %files devel
 %defattr(-,root,root)
 %doc doc/*.txt
@@ -385,6 +372,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> - 2.1.22-22.1
+- Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.22-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Apr 16 01:25:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 16 Apr 2009 01:25:00 +0000 (UTC)
Subject: rpms/tomboy/F-11 tomboy.spec,1.113,1.114
Message-ID: <20090416012500.9FEE47013C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15959

Modified Files:
	tomboy.spec 
Log Message:
Re-enable ppc



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/F-11/tomboy.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- tomboy.spec	14 Apr 2009 01:44:18 -0000	1.113
+++ tomboy.spec	16 Apr 2009 01:24:30 -0000	1.114
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.14.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -36,8 +36,7 @@
 Requires:	gtkspell
 
 # Mono isn't available for s390 or ppc64 apparently
-# ppc is only temporarily excluded
-ExcludeArch: s390 s390x ppc64 ppc
+ExcludeArch: s390 s390x ppc64
 
 %description
 Tomboy is a desktop note-taking application which is simple and easy to use.
@@ -145,6 +144,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.1-2
+- Reenable ppc
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.1-1
 - Update to 0.14.1
 - See http://download.gnome.org/sources/tomboy/0.14/tomboy-0.14.1.news



From jkeating at fedoraproject.org  Thu Apr 16 01:50:20 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 16 Apr 2009 01:50:20 +0000 (UTC)
Subject: rpms/gnote/F-11 .cvsignore, 1.2, 1.3 gnote.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090416015021.0AE3770127@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gnote/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20499

Modified Files:
	.cvsignore gnote.spec sources 
Log Message:
* Wed Apr 15 2009 Jesse Keating <jkeating at redhat.com> - 0.1.2-1
- Update to 0.1.2 to fix many upstream bugs
  http://www.figuiere.net/hub/blog/?2009/04/15/660-gnote-012



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnote/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2009 01:13:52 -0000	1.2
+++ .cvsignore	16 Apr 2009 01:49:50 -0000	1.3
@@ -1 +1 @@
-gnote-0.1.1.tar.bz2
+gnote-0.1.2.tar.bz2


Index: gnote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnote/F-11/gnote.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnote.spec	10 Apr 2009 01:44:22 -0000	1.2
+++ gnote.spec	16 Apr 2009 01:49:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnote
-Version:        0.1.1 
-Release:        4%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 Summary:        Note-taking application
 Group:          User Interface/Desktops
 License:        GPLv3+
@@ -79,6 +79,9 @@
 %{_sysconfdir}/gconf/schemas/gnote.schemas
 
 %changelog
+* Wed Apr 15 2009 Jesse Keating <jkeating at redhat.com> - 0.1.2-1
+- Update to 0.1.2 to fix many upstream bugs
+  http://www.figuiere.net/hub/blog/?2009/04/15/660-gnote-012
 
 * Fri Apr 10 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.1.1-4
 - Drop a unnecessary require, BR and fix summary


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnote/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2009 01:13:53 -0000	1.2
+++ sources	16 Apr 2009 01:49:50 -0000	1.3
@@ -1 +1 @@
-2a2578cc69df41bdb07c3d754c5593e6  gnote-0.1.1.tar.bz2
+905a8df3513a519096bcf7d8efc35118  gnote-0.1.2.tar.bz2



From bskeggs at fedoraproject.org  Thu Apr 16 01:50:54 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 16 Apr 2009 01:50:54 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.38, 1.39 kernel.spec, 1.1547, 
	1.1548
Message-ID: <20090416015054.A183370127@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20619

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Thu Apr 16 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: use less vmalloc space (rh#495843)



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- drm-nouveau.patch	8 Apr 2009 05:01:16 -0000	1.38
+++ drm-nouveau.patch	16 Apr 2009 01:50:53 -0000	1.39
@@ -6534,10 +6534,10 @@
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
 new file mode 100644
-index 0000000..547ad94
+index 0000000..83b2f5e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,209 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -6697,13 +6697,9 @@
 +	return 0;
 +}
 +
-+#define READ_GET() ((nv_rd32(chan->get) - chan->pushbuf_base) >> 2)
-+#define WRITE_PUT(val) nv_wr32(chan->put, ((val) << 2) + chan->pushbuf_base)
-+
 +int
 +nouveau_dma_wait(struct nouveau_channel *chan, int size)
 +{
-+	struct drm_device *dev = chan->dev;
 +	const int us_timeout = 100000;
 +	int ret = -EBUSY, i;
 +
@@ -6753,10 +6749,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
 new file mode 100644
-index 0000000..1953c39
+index 0000000..4383883
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,107 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -6843,18 +6839,19 @@
 +	OUT_RING(chan, (subc << 13) | (size << 18) | mthd);
 +}
 +
++#define READ_GET() ((nvchan_rd32(0x44) - chan->pushbuf_base) >> 2)
++#define WRITE_PUT(val) nvchan_wr32(0x40, ((val) << 2) + chan->pushbuf_base)
++
 +static inline void
 +FIRE_RING(struct nouveau_channel *chan)
 +{
-+	struct drm_device *dev = chan->dev;
-+
 +	if (chan->dma.cur == chan->dma.put)
 +		return;
 +	chan->accel_done = true;
 +
 +	DRM_MEMORYBARRIER();
 +	chan->dma.put = chan->dma.cur;
-+	nv_wr32(chan->put, (chan->dma.put << 2) + chan->pushbuf_base);
++	WRITE_PUT(chan->dma.put);
 +}
 +
 +/* This should allow easy switching to a real fifo in the future. */
@@ -7061,10 +7058,10 @@
 +MODULE_LICENSE("GPL and additional rights");
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
 new file mode 100644
-index 0000000..c5ecceb
+index 0000000..ae93ea1
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,772 @@
+@@ -0,0 +1,776 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -7195,7 +7192,7 @@
 +	/* mapping of the fifo itself */
 +	struct drm_local_map *map;
 +	/* mapping of the regs controling the fifo */
-+	struct drm_local_map *regs;
++	struct drm_local_map *user;
 +
 +	/* Fencing */
 +	uint32_t next_sequence;
@@ -7205,12 +7202,6 @@
 +	struct mem_block          *pushbuf_mem;
 +	uint32_t                   pushbuf_base;
 +
-+	/* FIFO user control regs */
-+	uint32_t user, user_size;
-+	uint32_t put;
-+	uint32_t get;
-+	uint32_t ref_cnt;
-+
 +	/* Notifier memory */
 +	struct mem_block *notifier_block;
 +	struct mem_block *notifier_heap;
@@ -7798,6 +7789,16 @@
 +#define nv_out08(map,reg,val) DRM_WRITE8(NVDEV->map, (reg), (val))
 +#define nv_in08(map,reg) DRM_READ8(NVDEV->map, (reg))
 +
++/* channel control reg access */
++#if defined(__powerpc__)
++#define nvchan_wr32(reg,val) out_be32((void __iomem *)chan->user->handle, (reg), (val))
++#define nvchan_rd32(reg) in_be32((void __iomem *)chan->user->handle, (reg))
++#else
++#define nvchan_wr32(reg,val) DRM_WRITE32(chan->user, (reg), (val))
++#define nvchan_rd32(reg) DRM_READ32(chan->user, (reg))
++#endif
++
++
 +/* register access */
 +#define nv_rd32(reg) nv_in32(mmio, (reg))
 +#define nv_wr32(reg,val) nv_out32(mmio, (reg), (val))
@@ -8947,7 +8948,7 @@
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
 new file mode 100644
-index 0000000..34be1a2
+index 0000000..a24c137
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
 @@ -0,0 +1,126 @@
@@ -9045,7 +9046,7 @@
 +	}
 +
 +	if (1) {
-+		uint32_t sequence = nv_rd32(chan->ref_cnt);
++		uint32_t sequence = nvchan_rd32(0x48);
 +
 +		NV_DEBUG(dev, "got 0x%08x\n", sequence);
 +		drm_fence_handler(dev, class, sequence, waiting_types, 0);
@@ -9079,10 +9080,10 @@
 +};
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fifo.c b/drivers/gpu/drm/nouveau/nouveau_fifo.c
 new file mode 100644
-index 0000000..8559bb9
+index 0000000..670ee1f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fifo.c
-@@ -0,0 +1,703 @@
+@@ -0,0 +1,692 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -9345,11 +9346,11 @@
 +		   struct drm_file *file_priv, struct mem_block *pushbuf,
 +		   uint32_t vram_handle, uint32_t tt_handle)
 +{
-+	int ret;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine = &dev_priv->engine;
 +	struct nouveau_channel *chan;
-+	int channel;
++	int channel, user;
++	int ret;
 +
 +	/*
 +	 * Alright, here is the full story
@@ -9384,26 +9385,18 @@
 +	NV_INFO(dev, "Allocating FIFO number %d\n", channel);
 +
 +	/* Locate channel's user control regs */
-+	if (dev_priv->card_type < NV_40) {
-+		chan->user = NV03_USER(channel);
-+		chan->user_size = NV03_USER_SIZE;
-+		chan->put = NV03_USER_DMA_PUT(channel);
-+		chan->get = NV03_USER_DMA_GET(channel);
-+		chan->ref_cnt = NV03_USER_REF_CNT(channel);
-+	} else
-+	if (dev_priv->card_type < NV_50) {
-+		chan->user = NV40_USER(channel);
-+		chan->user_size = NV40_USER_SIZE;
-+		chan->put = NV40_USER_DMA_PUT(channel);
-+		chan->get = NV40_USER_DMA_GET(channel);
-+		chan->ref_cnt = NV40_USER_REF_CNT(channel);
-+	} else {
-+		chan->user = NV50_USER(channel);
-+		chan->user_size = NV50_USER_SIZE;
-+		chan->put = NV50_USER_DMA_PUT(channel);
-+		chan->get = NV50_USER_DMA_GET(channel);
-+		chan->ref_cnt = NV50_USER_REF_CNT(channel);
-+	}
++	if (dev_priv->card_type < NV_40)
++		user = NV03_USER(channel);
++	else
++	if (dev_priv->card_type < NV_50)
++		user = NV40_USER(channel);
++	else
++		user = NV50_USER(channel);
++
++	ret = drm_addmap(dev, drm_get_resource_start(dev, 0) + user, 
++			 PAGE_SIZE, _DRM_REGISTERS, _DRM_DRIVER |
++			 (dev_priv->mm_enabled ? _DRM_READ_ONLY : 0),
++			 &chan->user);
 +
 +	/* Allocate space for per-channel fixed notifier memory */
 +	ret = nouveau_notifier_init_channel(chan);
@@ -9455,8 +9448,8 @@
 +	/* setup channel's default get/put values
 +	 * XXX: quite possibly extremely pointless..
 +	 */
-+	nv_wr32(chan->get, chan->pushbuf_base);
-+	nv_wr32(chan->put, chan->pushbuf_base);
++	nvchan_wr32(0x44, chan->pushbuf_base);
++	nvchan_wr32(0x40, chan->pushbuf_base);
 +
 +	/* If this is the first channel, setup PFIFO ourselves.  For any
 +	 * other case, the GPU will handle this when it switches contexts.
@@ -9630,6 +9623,9 @@
 +
 +	nouveau_notifier_takedown_channel(chan);
 +
++	if (chan->user)
++		drm_rmmap(dev, chan->user);
++
 +	dev_priv->fifos[chan->id] = NULL;
 +	dev_priv->fifo_alloc_count--;
 +	drm_free(chan, sizeof(*chan), DRM_MEM_DRIVER);
@@ -9700,17 +9696,11 @@
 +
 +		/* make the fifo available to user space */
 +		/* first, the fifo control regs */
-+		init->ctrl = dev_priv->mmio->offset + chan->user;
-+		init->ctrl_size = chan->user_size;
-+		res = drm_addmap(dev, init->ctrl, init->ctrl_size,
-+				 _DRM_REGISTERS, 0, &chan->regs);
-+		if (res != 0)
-+			return res;
-+
-+		entry = drm_find_matching_map(dev, chan->regs);
++		entry = drm_find_matching_map(dev, chan->user);
 +		if (!entry)
 +			return -EINVAL;
 +		init->ctrl = entry->user_token;
++		init->ctrl_size = chan->user->size;
 +
 +		/* pass back FIFO map info to the caller */
 +		init->cmdbuf      = chan->pushbuf_mem->map_handle;
@@ -16733,10 +16723,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..ac03162
+index 0000000..3e69c36
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,1044 @@
+@@ -0,0 +1,1046 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -17269,11 +17259,13 @@
 +	/* resource 2 is RAMIN (mmio regs + 0x1000000) */
 +	/* resource 6 is bios */
 +
-+	/* map the mmio regs */
++	/* Map 8MiB of the mmio regs, the only stuff beyond that we touch
++	 * is the channel control regs, but we'll map them per-channel
++	 * as required.
++	 */
 +	ret = drm_addmap(dev, drm_get_resource_start(dev, 0),
-+			      drm_get_resource_len(dev, 0),
-+			      _DRM_REGISTERS, _DRM_READ_ONLY |
-+			      _DRM_DRIVER, &dev_priv->mmio);
++			 0x00800000, _DRM_REGISTERS, _DRM_READ_ONLY |
++			 _DRM_DRIVER, &dev_priv->mmio);
 +	if (ret) {
 +		NV_ERROR(dev, "Unable to initialize the mmio mapping (%d). "
 +			      "Please report your setup to " DRIVER_EMAIL "\n",


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1547
retrieving revision 1.1548
diff -u -r1.1547 -r1.1548
--- kernel.spec	15 Apr 2009 22:53:45 -0000	1.1547
+++ kernel.spec	16 Apr 2009 01:50:53 -0000	1.1548
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Thu Apr 16 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: use less vmalloc space (rh#495843)
+
 * Wed Apr 15 2009 Marcelo Tosatti <mtosatti at redhat.com> 2.6.29.1-85
 - Skip PIT-through-IOAPIC routing check on KVM guests.
 



From jkeating at fedoraproject.org  Thu Apr 16 01:57:57 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 16 Apr 2009 01:57:57 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.186,1.187
Message-ID: <20090416015757.E52F870127@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22561

Modified Files:
	comps-f11.xml.in 
Log Message:
Move frysk to optional packages to save space



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- comps-f11.xml.in	15 Apr 2009 18:38:44 -0000	1.186
+++ comps-f11.xml.in	16 Apr 2009 01:57:27 -0000	1.187
@@ -851,7 +851,6 @@
       <packagereq type="default">diffstat</packagereq>
       <packagereq type="default">doxygen</packagereq>
       <packagereq type="default">elfutils</packagereq>
-      <packagereq type="default">frysk</packagereq>
       <packagereq basearchonly="true" type="default">gcc-gfortran</packagereq>
       <packagereq type="default">git</packagereq>
       <packagereq type="default">indent</packagereq>
@@ -914,6 +913,7 @@
       <packagereq type="optional">expect</packagereq>
       <packagereq type="optional">flasm</packagereq>
       <packagereq type="optional">fpc</packagereq>
+      <packagereq type="optional">frysk</packagereq>
       <packagereq type="optional">frysk-gnome</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
       <packagereq type="optional">gambas-ide</packagereq>



From kaigai at fedoraproject.org  Thu Apr 16 02:27:47 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Thu, 16 Apr 2009 02:27:47 +0000 (UTC)
Subject: rpms/php-pecl-selinux/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090416022747.2BF2570137@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/php-pecl-selinux/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28650

Modified Files:
	.cvsignore sources 
Log Message:
add support for libselinux-2.0.80 features (permissive domain and selinux_deny_unknown())



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2009 01:48:36 -0000	1.2
+++ .cvsignore	16 Apr 2009 02:27:16 -0000	1.3
@@ -1 +1,2 @@
 selinux-0.1.2.tgz
+selinux-0.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2009 01:48:36 -0000	1.2
+++ sources	16 Apr 2009 02:27:16 -0000	1.3
@@ -1 +1,2 @@
 d7c1a6d926663c8a7898d619ee319c5b  selinux-0.1.2.tgz
+54857a8908e199113d128b8a652f5121  selinux-0.3.1.tgz



From robert at fedoraproject.org  Thu Apr 16 02:29:52 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 02:29:52 +0000 (UTC)
Subject: rpms/cyrus-sasl/F-11 cyrus-sasl.spec,1.78,1.79
Message-ID: <20090416022952.DE58070127@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/cyrus-sasl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29702

Modified Files:
	cyrus-sasl.spec 
Log Message:
Enable krb4 plugin again (temporary for Fedora 12 building needed)



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-11/cyrus-sasl.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- cyrus-sasl.spec	16 Apr 2009 01:16:57 -0000	1.78
+++ cyrus-sasl.spec	16 Apr 2009 02:29:22 -0000	1.79
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 22.1%{?dist}
+Release: 23%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -124,6 +124,15 @@
 a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
+%package krb4
+Requires: %{name}-lib = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: Kerberos 4 authentication support for Cyrus SASL
+
+%description krb4
+The %{name}-krb4 package contains the Cyrus SASL plugins which
+support Kerberos 4 authentication.
+
 %prep
 %setup -q
 chmod -x doc/*.html
@@ -214,7 +223,7 @@
         --disable-java \
         --with-plugindir=%{_plugindir2} \
         --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \
-        --disable-krb4 \
+        --enable-krb4=/usr \
         --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
         --with-gss_impl=mit \
         --with-rc4 \
@@ -361,6 +370,10 @@
 %defattr(-,root,root)
 %{_plugindir2}/*gssapi*.so*
 
+%files krb4
+%defattr(-,root,root)
+%{_plugindir2}/*kerberos4*.so*
+
 %files devel
 %defattr(-,root,root)
 %doc doc/*.txt
@@ -372,6 +385,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> - 2.1.22-23
+- Enable krb4 plugin again (was temporary disabled for Fedora 12)
+
 * Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> - 2.1.22-22.1
 - Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)
 



From mdomsch at fedoraproject.org  Thu Apr 16 03:09:32 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 16 Apr 2009 03:09:32 +0000 (UTC)
Subject: rpms/oggvideotools/devel .cvsignore, 1.4, 1.5 oggvideotools.spec,
	1.4, 
	1.5 sources, 1.4, 1.5 oggvideotools-0.6-cstring.patch, 1.1, NONE
Message-ID: <20090416030932.87BD770127@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggvideotools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4111

Modified Files:
	.cvsignore oggvideotools.spec sources 
Removed Files:
	oggvideotools-0.6-cstring.patch 
Log Message:
update to 0.7a


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 05:39:37 -0000	1.4
+++ .cvsignore	16 Apr 2009 03:09:01 -0000	1.5
@@ -1 +1 @@
-oggvideotools-0.6.tar.gz
+oggvideotools-0.7a.tar.gz


Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/oggvideotools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oggvideotools.spec	26 Feb 2009 07:57:51 -0000	1.4
+++ oggvideotools.spec	16 Apr 2009 03:09:01 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           oggvideotools
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.7a
+Release:        1%{?dist}
 Summary:        Toolbox for manipulating Ogg video files
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dev.streamnik.de/oggvideotools.html
 Source0:        http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz
-Patch0:		%{name}-0.6-cstring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel SDL-devel
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -30,7 +28,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod 644 docs/DocuOggVideoTools.pdf
+chmod 644 docs/DocuOggVideoTools.pdf ChangeLog scripts/*
 
 
 %clean
@@ -39,10 +37,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf
+%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf scripts/*
 %{_bindir}/*
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.7a-1
+- update to 0.7a
+  dropped upstreamed cstring patch
+  added oggResize
+  bugfix for wrong size in oggThumb, which causes a green border
+  minor bugfixes:
+  - random number generator is always initialized with a random seed
+  - command line options harmonized (e.g. -s is always size)
+  handling for corrupt End-Of-Stream markers
+  added sample scripts for easy creation of thumbnails and slideshows with sound
+  dokumentation update
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jan 2009 05:39:37 -0000	1.4
+++ sources	16 Apr 2009 03:09:01 -0000	1.5
@@ -1 +1 @@
-dce60fcd1b4706424ff6f41d2a7024cc  oggvideotools-0.6.tar.gz
+6b13eeaaf7f75a09acdcc16e95dc8056  oggvideotools-0.7a.tar.gz


--- oggvideotools-0.6-cstring.patch DELETED ---



From mdomsch at fedoraproject.org  Thu Apr 16 03:12:15 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 16 Apr 2009 03:12:15 +0000 (UTC)
Subject: rpms/oggvideotools/F-11 .cvsignore, 1.4, 1.5 oggvideotools.spec, 1.4,
	1.5 sources, 1.4, 1.5 oggvideotools-0.6-cstring.patch, 1.1, NONE
Message-ID: <20090416031215.A8F9670127@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggvideotools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4540

Modified Files:
	.cvsignore oggvideotools.spec sources 
Removed Files:
	oggvideotools-0.6-cstring.patch 
Log Message:
update to 0.7a


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 05:39:37 -0000	1.4
+++ .cvsignore	16 Apr 2009 03:11:44 -0000	1.5
@@ -1 +1 @@
-oggvideotools-0.6.tar.gz
+oggvideotools-0.7a.tar.gz


Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-11/oggvideotools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oggvideotools.spec	26 Feb 2009 07:57:51 -0000	1.4
+++ oggvideotools.spec	16 Apr 2009 03:11:44 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           oggvideotools
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.7a
+Release:        1%{?dist}
 Summary:        Toolbox for manipulating Ogg video files
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dev.streamnik.de/oggvideotools.html
 Source0:        http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz
-Patch0:		%{name}-0.6-cstring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel SDL-devel
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -30,7 +28,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod 644 docs/DocuOggVideoTools.pdf
+chmod 644 docs/DocuOggVideoTools.pdf ChangeLog scripts/*
 
 
 %clean
@@ -39,10 +37,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf
+%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf scripts/*
 %{_bindir}/*
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.7a-1
+- update to 0.7a
+  dropped upstreamed cstring patch
+  added oggResize
+  bugfix for wrong size in oggThumb, which causes a green border
+  minor bugfixes:
+  - random number generator is always initialized with a random seed
+  - command line options harmonized (e.g. -s is always size)
+  handling for corrupt End-Of-Stream markers
+  added sample scripts for easy creation of thumbnails and slideshows with sound
+  dokumentation update
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jan 2009 05:39:37 -0000	1.4
+++ sources	16 Apr 2009 03:11:44 -0000	1.5
@@ -1 +1 @@
-dce60fcd1b4706424ff6f41d2a7024cc  oggvideotools-0.6.tar.gz
+6b13eeaaf7f75a09acdcc16e95dc8056  oggvideotools-0.7a.tar.gz


--- oggvideotools-0.6-cstring.patch DELETED ---



From mdomsch at fedoraproject.org  Thu Apr 16 03:14:52 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 16 Apr 2009 03:14:52 +0000 (UTC)
Subject: rpms/oggvideotools/F-10 .cvsignore, 1.3, 1.4 oggvideotools.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090416031453.0154970127@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggvideotools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5027

Modified Files:
	.cvsignore oggvideotools.spec sources 
Log Message:
update to 0.7a


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2008 13:19:52 -0000	1.3
+++ .cvsignore	16 Apr 2009 03:14:22 -0000	1.4
@@ -1 +1 @@
-oggvideotools-0.5.tar.gz
+oggvideotools-0.7a.tar.gz


Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-10/oggvideotools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oggvideotools.spec	12 Aug 2008 13:19:52 -0000	1.2
+++ oggvideotools.spec	16 Apr 2009 03:14:22 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           oggvideotools
-Version:        0.5
+Version:        0.7a
 Release:        1%{?dist}
 Summary:        Toolbox for manipulating Ogg video files
 
@@ -28,7 +28,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod 644 docs/DocuOggVideoTools.pdf
+chmod 644 docs/DocuOggVideoTools.pdf ChangeLog scripts/*
 
 
 %clean
@@ -37,10 +37,33 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf
+%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf scripts/*
 %{_bindir}/*
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.7a-1
+- update to 0.7a
+  dropped upstreamed cstring patch
+  added oggResize
+  bugfix for wrong size in oggThumb, which causes a green border
+  minor bugfixes:
+  - random number generator is always initialized with a random seed
+  - command line options harmonized (e.g. -s is always size)
+  handling for corrupt End-Of-Stream markers
+  added sample scripts for easy creation of thumbnails and slideshows with sound
+  dokumentation update
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.6-1
+- update to 0.6
+  added oggSlideshow, oggThumb
+  handling for huge files > 4GB implemented
+  packet order with oggCut has been fixed and cleaned up
+  ogg type in BOS packet is completely analysed
+  added support for kate-streams (done by ogg.k.ogg.k)
+
 * Tue Aug 12 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-1
 - Fedora patches applied upstream
 - improved documentation


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2008 13:19:52 -0000	1.3
+++ sources	16 Apr 2009 03:14:22 -0000	1.4
@@ -1 +1 @@
-72d4f900456e5c9d5e242620c513ba68  oggvideotools-0.5.tar.gz
+6b13eeaaf7f75a09acdcc16e95dc8056  oggvideotools-0.7a.tar.gz



From mdomsch at fedoraproject.org  Thu Apr 16 03:16:43 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Thu, 16 Apr 2009 03:16:43 +0000 (UTC)
Subject: rpms/oggvideotools/F-9 .cvsignore, 1.3, 1.4 oggvideotools.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090416031643.1A24F70127@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggvideotools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5389

Modified Files:
	.cvsignore oggvideotools.spec sources 
Log Message:
update to 0.7a


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2008 13:24:12 -0000	1.3
+++ .cvsignore	16 Apr 2009 03:16:12 -0000	1.4
@@ -1 +1 @@
-oggvideotools-0.5.tar.gz
+oggvideotools-0.7a.tar.gz


Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-9/oggvideotools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oggvideotools.spec	12 Aug 2008 13:24:12 -0000	1.2
+++ oggvideotools.spec	16 Apr 2009 03:16:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           oggvideotools
-Version:        0.5
+Version:        0.7a
 Release:        1%{?dist}
 Summary:        Toolbox for manipulating Ogg video files
 
@@ -28,7 +28,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod 644 docs/DocuOggVideoTools.pdf
+chmod 644 docs/DocuOggVideoTools.pdf ChangeLog scripts/*
 
 
 %clean
@@ -37,10 +37,33 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf
+%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf scripts/*
 %{_bindir}/*
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.7a-1
+- update to 0.7a
+  dropped upstreamed cstring patch
+  added oggResize
+  bugfix for wrong size in oggThumb, which causes a green border
+  minor bugfixes:
+  - random number generator is always initialized with a random seed
+  - command line options harmonized (e.g. -s is always size)
+  handling for corrupt End-Of-Stream markers
+  added sample scripts for easy creation of thumbnails and slideshows with sound
+  dokumentation update
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.6-1
+- update to 0.6
+  added oggSlideshow, oggThumb
+  handling for huge files > 4GB implemented
+  packet order with oggCut has been fixed and cleaned up
+  ogg type in BOS packet is completely analysed
+  added support for kate-streams (done by ogg.k.ogg.k)
+
 * Tue Aug 12 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-1
 - Fedora patches applied upstream
 - improved documentation


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2008 13:24:12 -0000	1.3
+++ sources	16 Apr 2009 03:16:12 -0000	1.4
@@ -1 +1 @@
-72d4f900456e5c9d5e242620c513ba68  oggvideotools-0.5.tar.gz
+6b13eeaaf7f75a09acdcc16e95dc8056  oggvideotools-0.7a.tar.gz



From iarnell at fedoraproject.org  Thu Apr 16 03:18:37 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 16 Apr 2009 03:18:37 +0000 (UTC)
Subject: rpms/perl-HTML-FormFu/devel .cvsignore, 1.3,
	1.4 perl-HTML-FormFu.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090416031837.4DE9270127@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5853

Modified Files:
	.cvsignore perl-HTML-FormFu.spec sources 
Log Message:
* Wed Apr 15 2009 Iain Arnell <iarnell at gmail.com> 0.04001-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2008 18:24:02 -0000	1.3
+++ .cvsignore	16 Apr 2009 03:18:06 -0000	1.4
@@ -1 +1 @@
-HTML-FormFu-0.03007.tar.gz
+HTML-FormFu-0.04001.tar.gz


Index: perl-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/perl-HTML-FormFu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-FormFu.spec	26 Feb 2009 19:52:53 -0000	1.5
+++ perl-HTML-FormFu.spec	16 Apr 2009 03:18:06 -0000	1.6
@@ -1,11 +1,11 @@
 Name:           perl-HTML-FormFu
-Version:        0.03007
-Release:        3%{?dist}
+Version:        0.04001
+Release:        1%{?dist}
 Summary:        HTML Form Creation, Rendering and Validation Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/HTML-FormFu/
-Source0:        http://www.cpan.org/authors/id/C/CF/CFRANKS/HTML-FormFu-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-FormFu-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(CGI)
@@ -26,12 +26,14 @@
 BuildRequires:  perl(Email::Valid)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::ShareDir)
+BuildRequires:  perl(Hash::Flatten)
 BuildRequires:  perl(HTML::Scrubber)
 BuildRequires:  perl(HTML::TokeParser::Simple)
 BuildRequires:  perl(HTTP::Headers)
 BuildRequires:  perl(List::MoreUtils)
-BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Pluggable)
+BuildRequires:  perl(Number::Format)
+BuildRequires:  perl(Path::Class::File)
 BuildRequires:  perl(Readonly)
 BuildRequires:  perl(Regexp::Common)
 BuildRequires:  perl(Regexp::Copy)
@@ -75,7 +77,7 @@
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
-sed -e '/perl(Catalyst/d' -e '/perl(defaults)/d' -e '/perl(model_config)/d'
+sed -e '/perl(Catalyst/d' -e '/perl(default/d' -e '/perl(model_config)/d'
 EOF
 
 %define __perl_requires %{_builddir}/HTML-FormFu-%{version}/%{name}-req
@@ -111,6 +113,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 15 2009 Iain Arnell <iarnell at gmail.com> 0.04001-1
+- update to latest upstream
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03007-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2008 18:24:02 -0000	1.3
+++ sources	16 Apr 2009 03:18:06 -0000	1.4
@@ -1 +1 @@
-e29b491c3ed8a88139ab7ee2374e8334  HTML-FormFu-0.03007.tar.gz
+23a3fa31890dff96e80a0243dffde405  HTML-FormFu-0.04001.tar.gz



From whot at fedoraproject.org  Thu Apr 16 04:03:22 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 16 Apr 2009 04:03:22 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-11 evdev-2.2.1-X_NONE.patch, NONE,
	1.1 evdev-2.2.1-prealloc-timer.patch, NONE,
	1.1 xorg-x11-drv-evdev.spec, 1.49, 1.50
Message-ID: <20090416040322.8BD6070127@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15566

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-2.2.1-X_NONE.patch evdev-2.2.1-prealloc-timer.patch 
Log Message:
* Thu Apr 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-3
- evdev-2.2.1-prealloc-timer.patch: prealloc the reopen timer to avoid mallocs
  during sigio handling.
- evdev-2.2.1-X_NONE.patch: print read errors as _X_NONE to avoid mallocs
  during sigio handling.



evdev-2.2.1-X_NONE.patch:

--- NEW FILE evdev-2.2.1-X_NONE.patch ---
>From 220e2dfb8f6aa08bd5f59e81c6883c057b945721 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 16 Apr 2009 13:23:50 +1000
Subject: [PATCH 2/2] Print read errors as X_NONE to avoid mallocs in the server.

Messages of type X_NONE are just passed down to the log files, everything else
gets the (EE) or (II) prefixed. Since this mallocs, we can't use it in the
signal handler.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 6ef1316..c5772d1 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -578,15 +578,19 @@ EvdevReadInput(InputInfoPtr pInfo)
                     pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo);
                 }
             } else if (errno != EAGAIN)
-                xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name,
+            {
+                /* We use X_NONE here because it doesn't alloc */
+                xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name,
                         strerror(errno));
+            }
             break;
         }
 
+        /* The kernel promises that we always only read a complete
+         * event, so len != sizeof ev is an error. */
         if (len % sizeof(ev[0])) {
-            /* The kernel promises that we always only read a complete
-             * event, so len != sizeof ev is an error. */
-            xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name, strerror(errno));
+            /* We use X_NONE here because it doesn't alloc */
+            xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name, strerror(errno));
             break;
         }
 
-- 
1.6.2.2.447.g4afa7


evdev-2.2.1-prealloc-timer.patch:

--- NEW FILE evdev-2.2.1-prealloc-timer.patch ---
>From ddc126637404cb3d9356b7698779dcd8849f8718 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 16 Apr 2009 12:01:03 +1000
Subject: [PATCH 1/2] Pre-allocate the reopen timer so we don't allocate during sigio handling.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 43a90be..6ef1316 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -572,8 +572,11 @@ EvdevReadInput(InputInfoPtr pInfo)
                 xf86RemoveEnabledDevice(pInfo);
                 close(pInfo->fd);
                 pInfo->fd = -1;
-                pEvdev->reopen_left = pEvdev->reopen_attempts;
-                pEvdev->reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
+                if (pEvdev->reopen_timer)
+                {
+                    pEvdev->reopen_left = pEvdev->reopen_attempts;
+                    pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo);
+                }
             } else if (errno != EAGAIN)
                 xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name,
                         strerror(errno));
@@ -1246,7 +1249,7 @@ EvdevOn(DeviceIntPtr device)
     if (pInfo->fd == -1)
     {
         pEvdev->reopen_left = pEvdev->reopen_attempts;
-        pEvdev->reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
+        pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo);
     } else
     {
         pEvdev->min_maj = EvdevGetMajorMinor(pInfo);
@@ -1257,6 +1260,8 @@ EvdevOn(DeviceIntPtr device)
             return !Success;
         }
 
+        pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 0, NULL, NULL);
+
         xf86FlushInput(pInfo->fd);
         xf86AddEnabledDevice(pInfo);
         EvdevMBEmuOn(pInfo);
-- 
1.6.2.2.447.g4afa7



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/xorg-x11-drv-evdev.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xorg-x11-drv-evdev.spec	6 Apr 2009 00:53:12 -0000	1.49
+++ xorg-x11-drv-evdev.spec	16 Apr 2009 04:02:52 -0000	1.50
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.2.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -18,6 +18,8 @@
 #Source1:    make-git-snapshot.sh
 
 Patch1:     evdev-2.2.1-read-deadlock.patch
+Patch2:     evdev-2.2.1-prealloc-timer.patch
+Patch3:     evdev-2.2.1-X_NONE.patch
 
 ExcludeArch: s390 s390x
 
@@ -37,6 +39,8 @@
 
 # apply patches
 %patch1 -p1 -b .read-deadlock
+%patch2 -p1 -b .prealloc_timer
+%patch3 -p1 -b ._X_NONE
 
 %build
 autoreconf -v --install || exit 1
@@ -75,6 +79,12 @@
 
 
 %changelog
+* Thu Apr 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-3
+- evdev-2.2.1-prealloc-timer.patch: prealloc the reopen timer to avoid mallocs
+  during sigio handling.
+- evdev-2.2.1-X_NONE.patch: print read errors as _X_NONE to avoid mallocs
+  during sigio handling.
+
 * Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-2
 - evdev-2.2.1-read-deadlock.patch: handle read errors on len <= 0 (#494245)
 



From iankent at fedoraproject.org  Thu Apr 16 04:04:01 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 16 Apr 2009 04:04:01 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.4-fix-lsb-init-script-header.patch,
	NONE, 
	1.1 autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch, NONE,
	1.1 autofs-5.0.4-fix-st_remove_tasks-locking.patch, NONE,
	1.1 autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch,
	NONE, 1.1 autofs-5.0.4-use-percent-hack-for-master.patch, NONE,
	1.1 autofs-5.0.4-zero-s_magic-is-valid.patch, NONE,
	1.1 autofs.spec, 1.278, 1.279
Message-ID: <20090416040401.6934D70127@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15697

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-lsb-init-script-header.patch 
	autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch 
	autofs-5.0.4-fix-st_remove_tasks-locking.patch 
	autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch 
	autofs-5.0.4-use-percent-hack-for-master.patch 
	autofs-5.0.4-zero-s_magic-is-valid.patch 
Log Message:
* Thu Apr 16 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-26
- fix lsb init script header.
- fix memory leak reading ldap master map.
- fix st_remove_tasks() locking.
- reset flex scanner when setting buffer.
- zero s_magic is valid.


autofs-5.0.4-fix-lsb-init-script-header.patch:

--- NEW FILE autofs-5.0.4-fix-lsb-init-script-header.patch ---
autofs-5.0.4 - fix lsb init script header

From: Ian Kent <raven at themaw.net>

It truns out that "Should-Start:" is not sufficient to enforce
the required ordering of services and a "Required-Start:" is
needed instead.
---

 CHANGELOG             |    1 +
 redhat/autofs.init.in |    4 ++--
 samples/rc.autofs.in  |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 91edd14..2be7683 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@
 - use misc device ioctl interface by default, if available.
 - fix call restorecon when misc device file doesn't exist.
 - clear rpc client on lookup fail.
+- fix lsb init script header.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
index a9a33c8..fded1d8 100644
--- a/redhat/autofs.init.in
+++ b/redhat/autofs.init.in
@@ -9,8 +9,8 @@
 #
 ### BEGIN INIT INFO
 # Provides: $autofs
-# Should-Start: $network $ypbind
-# Should-Stop: $network $ypbind
+# Required-Start: $network $ypbind
+# Required-Stop: $network $ypbind
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: Automounts filesystems on demand
diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
index 78cbec2..b193a4e 100644
--- a/samples/rc.autofs.in
+++ b/samples/rc.autofs.in
@@ -8,8 +8,8 @@
 #
 ### BEGIN INIT INFO
 # Provides: $autofs
-# Should-Start: $network $ypbind
-# Should-Stop: $network $ypbind
+# Required-Start: $network $ypbind
+# Required-Stop: $network $ypbind
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: Automounts filesystems on demand

autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch:

--- NEW FILE autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch ---
autofs-5.0.4 - fix memory leak reading ldap master map

From: Ian Kent <raven at themaw.net>

When reading the master map the storage allocated by getting the location
value is not freed after use.
---

 CHANGELOG             |    1 +
 modules/lookup_ldap.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 2be7683..a143294 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@
 - fix call restorecon when misc device file doesn't exist.
 - clear rpc client on lookup fail.
 - fix lsb init script header.
+- fix memory leak reading master map.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 5a54b5f..9b1180c 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1563,6 +1563,8 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 			ldap_value_free(values);
 			goto next;
 		}
+		ldap_value_free(values);
+
 		master_parse_entry(parse_buf, timeout, logging, age);
 next:
 		ldap_value_free(keyValue);

autofs-5.0.4-fix-st_remove_tasks-locking.patch:

--- NEW FILE autofs-5.0.4-fix-st_remove_tasks-locking.patch ---
autofs-5.0.4 - fix st_remove_tasks() locking

From: Ian Kent <raven at themaw.net>

The autofs serialization of state changing during task (mount, umount etc.)
execution was being done twice, with the state queue manager and by using
a pipe to communicate state changes to the handle_mounts() thread. This
required the use of two mutexes which was unnecessary and problematic. So
the pipe was removed and the state queue alone now handles this. When this
was done most of the state queue locking was moved into the state queue
manager functions, however, the locking was inadvertantly left out of the
st_remove_tasks() function.
---

 CHANGELOG      |    1 +
 daemon/state.c |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index a143294..c8b88e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@
 - clear rpc client on lookup fail.
 - fix lsb init script header.
 - fix memory leak reading master map.
+- fix st_remove_tasks() locking.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/state.c b/daemon/state.c
index 417fde1..533e241 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -783,10 +783,14 @@ void st_remove_tasks(struct autofs_point *ap)
 	struct state_queue *task, *waiting;
 	int status;
 
+	st_mutex_lock();
+
 	head = &state_queue;
 
-	if (list_empty(head))
+	if (list_empty(head)) {
+		st_mutex_unlock();
 		return;
+	}
 
 	p = head->next;
 	while (p != head) {
@@ -823,6 +827,8 @@ void st_remove_tasks(struct autofs_point *ap)
 	if (status)
 		fatal(status);
 
+	st_mutex_unlock();
+
 	return;
 }
 

autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch:

--- NEW FILE autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch ---
autofs-5.0.4 - reset flex scanner when setting buffer

From: Ian Kent <raven at themaw.net>

We still have problems resetting the flex scan buffer after an error
is detected. This appears to fix the problem.
---

 CHANGELOG        |    1 +
 lib/master_tok.l |    9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index c8b88e4..5f1cf7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
 - fix lsb init script header.
 - fix memory leak reading master map.
 - fix st_remove_tasks() locking.
+- reset flex scanner when setting buffer.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l
index b6cc8be..373248b 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -130,7 +130,6 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
 	\x00 {
 		if (optr != buff) {
 			*optr = '\0';
-			optr = buff;
 			strcpy(master_lval.strtype, buff);
 			return NILL;
 		}
@@ -139,6 +138,11 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
 	#.*  { return COMMENT; }
 
 	"/" {
+		if (optr != buff) {
+			*optr = '\0';
+			strcpy(master_lval.strtype, buff);
+			return NILL;
+		}
 		BEGIN(PATHSTR);
 		bptr = buff;
 		yyless(0);
@@ -410,6 +414,9 @@ static void master_echo(void)
 
 void master_set_scan_buffer(const char *buffer)
 {
+	master_lex_destroy();
+	optr = buff;
+
 	line = buffer;
 	line_pos = &line[0];
 	/*

autofs-5.0.4-use-percent-hack-for-master.patch:

--- NEW FILE autofs-5.0.4-use-percent-hack-for-master.patch ---
autofs-5.0.4 - use percent hack for master map keys

From: Ian Kent <raven at themaw.net>

The percent hack translation has been done for map keys but it
isn't used for master map keys.
---

 CHANGELOG             |    1 +
 modules/lookup_ldap.c |   66 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 59 insertions(+), 8 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 4ed80e0..8258e00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@
 - fix st_remove_tasks() locking.
 - reset flex scanner when setting buffer.
 - zero s_magic is valid.
+- use percent hack for master map keys.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 9b1180c..8c6a8f2 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -60,6 +60,7 @@ struct ldap_search_params {
 };
 
 static LDAP *auth_init(unsigned logopt, const char *, struct lookup_context *);
+static int decode_percent_hack(const char *, char **);
 
 #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL
 int ldap_create_page_control(LDAP *ldap, ber_int_t pagesize,
@@ -1508,6 +1509,9 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		debug(logopt, MODPREFIX "examining entries");
 
 	while (e) {
+		char *key = NULL;
+		int dec_len, i;
+
 		keyValue = ldap_get_values(ldap, e, entry);
 
 		if (!keyValue || !*keyValue) {
@@ -1519,19 +1523,63 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		 * By definition keys must be unique within
 		 * each map entry
 		 */
-		if (ldap_count_values(keyValue) > 1) {
-			error(logopt,
-			      MODPREFIX
-			      "key %s has duplicate entries - ignoring",
-			      *keyValue);
-			goto next;
+		count = ldap_count_values(keyValue);
+		if (strcasecmp(class, "nisObject")) {
+			if (count > 1) {
+				error(logopt, MODPREFIX
+				      "key %s has duplicates - ignoring",
+				      *keyValue);
+				goto next;
+			}
+			key = strdup(keyValue[0]);
+			if (!key) {
+				error(logopt, MODPREFIX
+				      "failed to dup map key %s - ignoring",
+				      *keyValue);
+				goto next;
+			}
+		} else if (count == 1) {
+			dec_len = decode_percent_hack(keyValue[0], &key);
+			if (dec_len < 0) {
+				error(logopt, MODPREFIX
+				      "invalid map key %s - ignoring",
+				      *keyValue);
+				goto next;
+			}
+		} else {
+			dec_len = decode_percent_hack(keyValue[0], &key);
+			if (dec_len < 0) {
+				error(logopt, MODPREFIX
+				      "invalid map key %s - ignoring",
+				      *keyValue);
+				goto next;
+			}
+
+			for (i = 1; i < count; i++) {
+				char *k;
+				dec_len = decode_percent_hack(keyValue[i], &k);
+				if (dec_len < 0) {
+					error(logopt, MODPREFIX
+					      "invalid map key %s - ignoring",
+					      *keyValue);
+					goto next;
+				}
+				if (strcmp(key, k)) {
+					error(logopt, MODPREFIX
+					      "key entry mismatch %s - ignoring",
+					      *keyValue);
+					free(k);
+					goto next;
+				}
+				free(k);
+			}
 		}
 
 		/*
 		 * Ignore keys beginning with '+' as plus map
 		 * inclusion is only valid in file maps.
 		 */
-		if (**keyValue == '+') {
+		if (*key == '+') {
 			warn(logopt,
 			     MODPREFIX
 			     "ignoreing '+' map entry - not in file map");
@@ -1558,7 +1606,7 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		}
 
 		if (snprintf(parse_buf, sizeof(parse_buf), "%s %s",
-			     *keyValue, *values) >= sizeof(parse_buf)) {
+			     key, *values) >= sizeof(parse_buf)) {
 			error(logopt, MODPREFIX "map entry too long");
 			ldap_value_free(values);
 			goto next;
@@ -1568,6 +1616,8 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		master_parse_entry(parse_buf, timeout, logging, age);
 next:
 		ldap_value_free(keyValue);
+		if (key)
+			free(key);
 		e = ldap_next_entry(ldap, e);
 	}
 

autofs-5.0.4-zero-s_magic-is-valid.patch:

--- NEW FILE autofs-5.0.4-zero-s_magic-is-valid.patch ---
autofs-5.0.4 - zero s_magic is valid

From: Ian Kent <raven at themaw.net>

When checking the super magic using the mount control ioctl
re-implementation an incorrect assumption is made that s_magic
field in the super block will not be zero.
---

 CHANGELOG           |    1 +
 lib/dev-ioctl-lib.c |   10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 5f1cf7f..4ed80e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@
 - fix memory leak reading master map.
 - fix st_remove_tasks() locking.
 - reset flex scanner when setting buffer.
+- zero s_magic is valid.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/lib/dev-ioctl-lib.c b/lib/dev-ioctl-lib.c
index 7c8c433..a034a3d 100644
--- a/lib/dev-ioctl-lib.c
+++ b/lib/dev-ioctl-lib.c
@@ -764,12 +764,10 @@ static int dev_ioctl_ismountpoint(unsigned int logopt,
 	if (err) {
 		*mountpoint = DEV_IOCTL_IS_MOUNTED;
 
-		if (param->ismountpoint.out.magic) {
-			if (param->ismountpoint.out.magic == AUTOFS_SUPER_MAGIC)
-				*mountpoint |= DEV_IOCTL_IS_AUTOFS;
-			else
-				*mountpoint |= DEV_IOCTL_IS_OTHER;
-		}
+		if (param->ismountpoint.out.magic == AUTOFS_SUPER_MAGIC)
+			*mountpoint |= DEV_IOCTL_IS_AUTOFS;
+		else
+			*mountpoint |= DEV_IOCTL_IS_OTHER;
 	}
 
 	free_dev_ioctl_path(param);


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- autofs.spec	30 Mar 2009 07:31:14 -0000	1.278
+++ autofs.spec	16 Apr 2009 04:03:30 -0000	1.279
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 24
+Release: 26
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -45,6 +45,12 @@
 Patch33: autofs-5.0.4-use-misc-device.patch
 Patch34: autofs-5.0.4-fix-restorecon.patch
 Patch35: autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch
+Patch36: autofs-5.0.4-fix-lsb-init-script-header.patch
+Patch37: autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch
+Patch38: autofs-5.0.4-fix-st_remove_tasks-locking.patch
+Patch39: autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch
+Patch40: autofs-5.0.4-zero-s_magic-is-valid.patch
+Patch41: autofs-5.0.4-use-percent-hack-for-master.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -121,6 +127,12 @@
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -173,6 +185,13 @@
 %{_libdir}/autofs/
 
 %changelog
+* Thu Apr 16 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-26
+- fix lsb init script header.
+- fix memory leak reading ldap master map.
+- fix st_remove_tasks() locking.
+- reset flex scanner when setting buffer.
+- zero s_magic is valid.
+
 * Mon Mar 30 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-24
 - clear rpc client on lookup fail.
 



From iankent at fedoraproject.org  Thu Apr 16 04:13:24 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 16 Apr 2009 04:13:24 +0000 (UTC)
Subject: rpms/autofs/F-11 autofs-5.0.4-fix-lsb-init-script-header.patch, NONE,
	1.1 autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch, NONE,
	1.1 autofs-5.0.4-fix-st_remove_tasks-locking.patch, NONE,
	1.1 autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch,
	NONE, 1.1 autofs-5.0.4-use-percent-hack-for-master.patch, NONE,
	1.1 autofs-5.0.4-zero-s_magic-is-valid.patch, NONE,
	1.1 autofs.spec, 1.278, 1.279
Message-ID: <20090416041324.9746370127@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17403

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-lsb-init-script-header.patch 
	autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch 
	autofs-5.0.4-fix-st_remove_tasks-locking.patch 
	autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch 
	autofs-5.0.4-use-percent-hack-for-master.patch 
	autofs-5.0.4-zero-s_magic-is-valid.patch 
Log Message:
* Thu Apr 16 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-25
- fix lsb init script header.
- fix memory leak reading ldap master map.
- fix st_remove_tasks() locking.
- reset flex scanner when setting buffer.
- zero s_magic is valid.


autofs-5.0.4-fix-lsb-init-script-header.patch:

--- NEW FILE autofs-5.0.4-fix-lsb-init-script-header.patch ---
autofs-5.0.4 - fix lsb init script header

From: Ian Kent <raven at themaw.net>

It truns out that "Should-Start:" is not sufficient to enforce
the required ordering of services and a "Required-Start:" is
needed instead.
---

 CHANGELOG             |    1 +
 redhat/autofs.init.in |    4 ++--
 samples/rc.autofs.in  |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 91edd14..2be7683 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@
 - use misc device ioctl interface by default, if available.
 - fix call restorecon when misc device file doesn't exist.
 - clear rpc client on lookup fail.
+- fix lsb init script header.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
index a9a33c8..fded1d8 100644
--- a/redhat/autofs.init.in
+++ b/redhat/autofs.init.in
@@ -9,8 +9,8 @@
 #
 ### BEGIN INIT INFO
 # Provides: $autofs
-# Should-Start: $network $ypbind
-# Should-Stop: $network $ypbind
+# Required-Start: $network $ypbind
+# Required-Stop: $network $ypbind
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: Automounts filesystems on demand
diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
index 78cbec2..b193a4e 100644
--- a/samples/rc.autofs.in
+++ b/samples/rc.autofs.in
@@ -8,8 +8,8 @@
 #
 ### BEGIN INIT INFO
 # Provides: $autofs
-# Should-Start: $network $ypbind
-# Should-Stop: $network $ypbind
+# Required-Start: $network $ypbind
+# Required-Stop: $network $ypbind
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: Automounts filesystems on demand

autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch:

--- NEW FILE autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch ---
autofs-5.0.4 - fix memory leak reading ldap master map

From: Ian Kent <raven at themaw.net>

When reading the master map the storage allocated by getting the location
value is not freed after use.
---

 CHANGELOG             |    1 +
 modules/lookup_ldap.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 2be7683..a143294 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@
 - fix call restorecon when misc device file doesn't exist.
 - clear rpc client on lookup fail.
 - fix lsb init script header.
+- fix memory leak reading master map.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 5a54b5f..9b1180c 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1563,6 +1563,8 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 			ldap_value_free(values);
 			goto next;
 		}
+		ldap_value_free(values);
+
 		master_parse_entry(parse_buf, timeout, logging, age);
 next:
 		ldap_value_free(keyValue);

autofs-5.0.4-fix-st_remove_tasks-locking.patch:

--- NEW FILE autofs-5.0.4-fix-st_remove_tasks-locking.patch ---
autofs-5.0.4 - fix st_remove_tasks() locking

From: Ian Kent <raven at themaw.net>

The autofs serialization of state changing during task (mount, umount etc.)
execution was being done twice, with the state queue manager and by using
a pipe to communicate state changes to the handle_mounts() thread. This
required the use of two mutexes which was unnecessary and problematic. So
the pipe was removed and the state queue alone now handles this. When this
was done most of the state queue locking was moved into the state queue
manager functions, however, the locking was inadvertantly left out of the
st_remove_tasks() function.
---

 CHANGELOG      |    1 +
 daemon/state.c |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index a143294..c8b88e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@
 - clear rpc client on lookup fail.
 - fix lsb init script header.
 - fix memory leak reading master map.
+- fix st_remove_tasks() locking.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/state.c b/daemon/state.c
index 417fde1..533e241 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -783,10 +783,14 @@ void st_remove_tasks(struct autofs_point *ap)
 	struct state_queue *task, *waiting;
 	int status;
 
+	st_mutex_lock();
+
 	head = &state_queue;
 
-	if (list_empty(head))
+	if (list_empty(head)) {
+		st_mutex_unlock();
 		return;
+	}
 
 	p = head->next;
 	while (p != head) {
@@ -823,6 +827,8 @@ void st_remove_tasks(struct autofs_point *ap)
 	if (status)
 		fatal(status);
 
+	st_mutex_unlock();
+
 	return;
 }
 

autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch:

--- NEW FILE autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch ---
autofs-5.0.4 - reset flex scanner when setting buffer

From: Ian Kent <raven at themaw.net>

We still have problems resetting the flex scan buffer after an error
is detected. This appears to fix the problem.
---

 CHANGELOG        |    1 +
 lib/master_tok.l |    9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index c8b88e4..5f1cf7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
 - fix lsb init script header.
 - fix memory leak reading master map.
 - fix st_remove_tasks() locking.
+- reset flex scanner when setting buffer.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l
index b6cc8be..373248b 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -130,7 +130,6 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
 	\x00 {
 		if (optr != buff) {
 			*optr = '\0';
-			optr = buff;
 			strcpy(master_lval.strtype, buff);
 			return NILL;
 		}
@@ -139,6 +138,11 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
 	#.*  { return COMMENT; }
 
 	"/" {
+		if (optr != buff) {
+			*optr = '\0';
+			strcpy(master_lval.strtype, buff);
+			return NILL;
+		}
 		BEGIN(PATHSTR);
 		bptr = buff;
 		yyless(0);
@@ -410,6 +414,9 @@ static void master_echo(void)
 
 void master_set_scan_buffer(const char *buffer)
 {
+	master_lex_destroy();
+	optr = buff;
+
 	line = buffer;
 	line_pos = &line[0];
 	/*

autofs-5.0.4-use-percent-hack-for-master.patch:

--- NEW FILE autofs-5.0.4-use-percent-hack-for-master.patch ---
autofs-5.0.4 - use percent hack for master map keys

From: Ian Kent <raven at themaw.net>

The percent hack translation has been done for map keys but it
isn't used for master map keys.
---

 CHANGELOG             |    1 +
 modules/lookup_ldap.c |   66 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 59 insertions(+), 8 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 4ed80e0..8258e00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@
 - fix st_remove_tasks() locking.
 - reset flex scanner when setting buffer.
 - zero s_magic is valid.
+- use percent hack for master map keys.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 9b1180c..8c6a8f2 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -60,6 +60,7 @@ struct ldap_search_params {
 };
 
 static LDAP *auth_init(unsigned logopt, const char *, struct lookup_context *);
+static int decode_percent_hack(const char *, char **);
 
 #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL
 int ldap_create_page_control(LDAP *ldap, ber_int_t pagesize,
@@ -1508,6 +1509,9 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		debug(logopt, MODPREFIX "examining entries");
 
 	while (e) {
+		char *key = NULL;
+		int dec_len, i;
+
 		keyValue = ldap_get_values(ldap, e, entry);
 
 		if (!keyValue || !*keyValue) {
@@ -1519,19 +1523,63 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		 * By definition keys must be unique within
 		 * each map entry
 		 */
-		if (ldap_count_values(keyValue) > 1) {
-			error(logopt,
-			      MODPREFIX
-			      "key %s has duplicate entries - ignoring",
-			      *keyValue);
-			goto next;
+		count = ldap_count_values(keyValue);
+		if (strcasecmp(class, "nisObject")) {
+			if (count > 1) {
+				error(logopt, MODPREFIX
+				      "key %s has duplicates - ignoring",
+				      *keyValue);
+				goto next;
+			}
+			key = strdup(keyValue[0]);
+			if (!key) {
+				error(logopt, MODPREFIX
+				      "failed to dup map key %s - ignoring",
+				      *keyValue);
+				goto next;
+			}
+		} else if (count == 1) {
+			dec_len = decode_percent_hack(keyValue[0], &key);
+			if (dec_len < 0) {
+				error(logopt, MODPREFIX
+				      "invalid map key %s - ignoring",
+				      *keyValue);
+				goto next;
+			}
+		} else {
+			dec_len = decode_percent_hack(keyValue[0], &key);
+			if (dec_len < 0) {
+				error(logopt, MODPREFIX
+				      "invalid map key %s - ignoring",
+				      *keyValue);
+				goto next;
+			}
+
+			for (i = 1; i < count; i++) {
+				char *k;
+				dec_len = decode_percent_hack(keyValue[i], &k);
+				if (dec_len < 0) {
+					error(logopt, MODPREFIX
+					      "invalid map key %s - ignoring",
+					      *keyValue);
+					goto next;
+				}
+				if (strcmp(key, k)) {
+					error(logopt, MODPREFIX
+					      "key entry mismatch %s - ignoring",
+					      *keyValue);
+					free(k);
+					goto next;
+				}
+				free(k);
+			}
 		}
 
 		/*
 		 * Ignore keys beginning with '+' as plus map
 		 * inclusion is only valid in file maps.
 		 */
-		if (**keyValue == '+') {
+		if (*key == '+') {
 			warn(logopt,
 			     MODPREFIX
 			     "ignoreing '+' map entry - not in file map");
@@ -1558,7 +1606,7 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		}
 
 		if (snprintf(parse_buf, sizeof(parse_buf), "%s %s",
-			     *keyValue, *values) >= sizeof(parse_buf)) {
+			     key, *values) >= sizeof(parse_buf)) {
 			error(logopt, MODPREFIX "map entry too long");
 			ldap_value_free(values);
 			goto next;
@@ -1568,6 +1616,8 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		master_parse_entry(parse_buf, timeout, logging, age);
 next:
 		ldap_value_free(keyValue);
+		if (key)
+			free(key);
 		e = ldap_next_entry(ldap, e);
 	}
 

autofs-5.0.4-zero-s_magic-is-valid.patch:

--- NEW FILE autofs-5.0.4-zero-s_magic-is-valid.patch ---
autofs-5.0.4 - zero s_magic is valid

From: Ian Kent <raven at themaw.net>

When checking the super magic using the mount control ioctl
re-implementation an incorrect assumption is made that s_magic
field in the super block will not be zero.
---

 CHANGELOG           |    1 +
 lib/dev-ioctl-lib.c |   10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 5f1cf7f..4ed80e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@
 - fix memory leak reading master map.
 - fix st_remove_tasks() locking.
 - reset flex scanner when setting buffer.
+- zero s_magic is valid.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/lib/dev-ioctl-lib.c b/lib/dev-ioctl-lib.c
index 7c8c433..a034a3d 100644
--- a/lib/dev-ioctl-lib.c
+++ b/lib/dev-ioctl-lib.c
@@ -764,12 +764,10 @@ static int dev_ioctl_ismountpoint(unsigned int logopt,
 	if (err) {
 		*mountpoint = DEV_IOCTL_IS_MOUNTED;
 
-		if (param->ismountpoint.out.magic) {
-			if (param->ismountpoint.out.magic == AUTOFS_SUPER_MAGIC)
-				*mountpoint |= DEV_IOCTL_IS_AUTOFS;
-			else
-				*mountpoint |= DEV_IOCTL_IS_OTHER;
-		}
+		if (param->ismountpoint.out.magic == AUTOFS_SUPER_MAGIC)
+			*mountpoint |= DEV_IOCTL_IS_AUTOFS;
+		else
+			*mountpoint |= DEV_IOCTL_IS_OTHER;
 	}
 
 	free_dev_ioctl_path(param);


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- autofs.spec	30 Mar 2009 07:31:14 -0000	1.278
+++ autofs.spec	16 Apr 2009 04:12:54 -0000	1.279
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 24
+Release: 25
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -45,6 +45,12 @@
 Patch33: autofs-5.0.4-use-misc-device.patch
 Patch34: autofs-5.0.4-fix-restorecon.patch
 Patch35: autofs-5.0.4-clear-rpc-client-on-lookup-fail.patch
+Patch36: autofs-5.0.4-fix-lsb-init-script-header.patch
+Patch37: autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch
+Patch38: autofs-5.0.4-fix-st_remove_tasks-locking.patch
+Patch39: autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch
+Patch40: autofs-5.0.4-zero-s_magic-is-valid.patch
+Patch41: autofs-5.0.4-use-percent-hack-for-master.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -121,6 +127,12 @@
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -173,6 +185,13 @@
 %{_libdir}/autofs/
 
 %changelog
+* Thu Apr 16 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-25
+- fix lsb init script header. 
+- fix memory leak reading ldap master map.
+- fix st_remove_tasks() locking.
+- reset flex scanner when setting buffer.
+- zero s_magic is valid.
+
 * Mon Mar 30 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-24
 - clear rpc client on lookup fail.
 



From pkgdb at fedoraproject.org  Thu Apr 16 04:22:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:22:00 +0000
Subject: [pkgdb] nntpgrab (Fedora EPEL, 5) updated by kevin
Message-ID: <20090416042200.C158E10F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for nntpgrab
kevin has set commit to Approved for provenpackager on nntpgrab (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on nntpgrab (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on nntpgrab (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nntpgrab



From pkgdb at fedoraproject.org  Thu Apr 16 04:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:23:12 +0000
Subject: [pkgdb] ogmtools was added for giallu
Message-ID: <20090416042312.AC36410F851@bastion2.fedora.phx.redhat.com>

kevin has added Package ogmtools with summary Tools for Ogg media streams
kevin has approved Package ogmtools
kevin has added a Fedora devel branch for ogmtools with an owner of giallu
kevin has approved ogmtools in Fedora devel
kevin has approved Package ogmtools
kevin has set commit to Approved for provenpackager on ogmtools (Fedora devel)
kevin has set build to Approved for provenpackager on ogmtools (Fedora devel)
kevin has set checkout to Approved for provenpackager on ogmtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogmtools



From pkgdb at fedoraproject.org  Thu Apr 16 04:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:23:13 +0000
Subject: [pkgdb] ogmtools (Fedora, 10) updated by kevin
Message-ID: <20090416042313.EE70210F87B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ogmtools
kevin has set commit to Approved for provenpackager on ogmtools (Fedora 10)
kevin has set build to Approved for provenpackager on ogmtools (Fedora 10)
kevin has set checkout to Approved for provenpackager on ogmtools (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogmtools



From kevin at fedoraproject.org  Thu Apr 16 04:23:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:23:25 +0000 (UTC)
Subject: rpms/ogmtools - New directory
Message-ID: <20090416042325.2AD5570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ogmtools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19549/rpms/ogmtools

Log Message:
Directory /cvs/pkgs/rpms/ogmtools added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:23:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:23:25 +0000 (UTC)
Subject: rpms/ogmtools/devel - New directory
Message-ID: <20090416042325.63DB770127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ogmtools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19549/rpms/ogmtools/devel

Log Message:
Directory /cvs/pkgs/rpms/ogmtools/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:23:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:23:35 +0000 (UTC)
Subject: rpms/ogmtools Makefile,NONE,1.1
Message-ID: <20090416042335.465A670127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ogmtools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19549/rpms/ogmtools

Added Files:
	Makefile 
Log Message:
Setup of module ogmtools


--- NEW FILE Makefile ---
# Top level Makefile for module ogmtools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 16 04:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:23:13 +0000
Subject: [pkgdb] ogmtools (Fedora, 11) updated by kevin
Message-ID: <20090416042314.0372D10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ogmtools
kevin has set commit to Approved for provenpackager on ogmtools (Fedora 11)
kevin has set build to Approved for provenpackager on ogmtools (Fedora 11)
kevin has set checkout to Approved for provenpackager on ogmtools (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ogmtools



From kevin at fedoraproject.org  Thu Apr 16 04:23:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:23:35 +0000 (UTC)
Subject: rpms/ogmtools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090416042335.8312D70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ogmtools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19549/rpms/ogmtools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ogmtools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ogmtools
# $Id: Makefile,v 1.1 2009/04/16 04:23:35 kevin Exp $
NAME := ogmtools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 16 04:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:27:08 +0000
Subject: [pkgdb] mingw32-libp11 (Fedora, 10) updated by kevin
Message-ID: <20090416042708.C030910F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libp11
kevin has set commit to Approved for provenpackager on mingw32-libp11 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libp11 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libp11 (Fedora 10)
kevin approved watchbugzilla on mingw32-libp11 (Fedora 10) for rjones
kevin approved watchcommits on mingw32-libp11 (Fedora 10) for rjones
kevin approved commit on mingw32-libp11 (Fedora 10) for rjones
kevin approved build on mingw32-libp11 (Fedora 10) for rjones
kevin approved approveacls on mingw32-libp11 (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libp11



From pkgdb at fedoraproject.org  Thu Apr 16 04:27:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:27:06 +0000
Subject: [pkgdb] mingw32-libp11 was added for kalev
Message-ID: <20090416042706.3FC6A10F852@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-libp11 with summary MingGW Windows libp11 library
kevin has approved Package mingw32-libp11
kevin has added a Fedora devel branch for mingw32-libp11 with an owner of kalev
kevin has approved mingw32-libp11 in Fedora devel
kevin has approved Package mingw32-libp11
kevin has set commit to Approved for provenpackager on mingw32-libp11 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libp11 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libp11 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libp11



From pkgdb at fedoraproject.org  Thu Apr 16 04:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:27:08 +0000
Subject: [pkgdb] mingw32-libp11 (Fedora, devel) updated by kevin
Message-ID: <20090416042708.CC44110F882@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libp11 (Fedora devel) for rjones
kevin approved watchcommits on mingw32-libp11 (Fedora devel) for rjones
kevin approved commit on mingw32-libp11 (Fedora devel) for rjones
kevin approved build on mingw32-libp11 (Fedora devel) for rjones
kevin approved approveacls on mingw32-libp11 (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libp11



From kevin at fedoraproject.org  Thu Apr 16 04:27:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:27:19 +0000 (UTC)
Subject: rpms/mingw32-libp11 - New directory
Message-ID: <20090416042719.21BE070127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libp11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20402/rpms/mingw32-libp11

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libp11 added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:27:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:27:19 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel - New directory
Message-ID: <20090416042719.5C75D70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20402/rpms/mingw32-libp11/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libp11/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 16 04:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:27:08 +0000
Subject: [pkgdb] mingw32-libp11 (Fedora, 11) updated by kevin
Message-ID: <20090416042708.D9BA010F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-libp11
kevin has set commit to Approved for provenpackager on mingw32-libp11 (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-libp11 (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-libp11 (Fedora 11)
kevin approved watchbugzilla on mingw32-libp11 (Fedora 11) for rjones
kevin approved watchcommits on mingw32-libp11 (Fedora 11) for rjones
kevin approved commit on mingw32-libp11 (Fedora 11) for rjones
kevin approved build on mingw32-libp11 (Fedora 11) for rjones
kevin approved approveacls on mingw32-libp11 (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libp11



From kevin at fedoraproject.org  Thu Apr 16 04:27:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:27:27 +0000 (UTC)
Subject: rpms/mingw32-libp11 Makefile,NONE,1.1
Message-ID: <20090416042727.AF14770127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libp11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20402/rpms/mingw32-libp11

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libp11


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libp11
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:27:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:27:27 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090416042727.F2BE170127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20402/rpms/mingw32-libp11/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libp11


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libp11
# $Id: Makefile,v 1.1 2009/04/16 04:27:27 kevin Exp $
NAME := mingw32-libp11
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 16 04:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:29:11 +0000
Subject: [pkgdb] pianobooster was added for chkr
Message-ID: <20090416042911.B5E7610F851@bastion2.fedora.phx.redhat.com>

kevin has added Package pianobooster with summary A MIDI file player that teaches you how to play the piano
kevin has approved Package pianobooster
kevin has added a Fedora devel branch for pianobooster with an owner of chkr
kevin has approved pianobooster in Fedora devel
kevin has approved Package pianobooster
kevin has set commit to Approved for provenpackager on pianobooster (Fedora devel)
kevin has set build to Approved for provenpackager on pianobooster (Fedora devel)
kevin has set checkout to Approved for provenpackager on pianobooster (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pianobooster



From pkgdb at fedoraproject.org  Thu Apr 16 04:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:29:13 +0000
Subject: [pkgdb] pianobooster (Fedora, 10) updated by kevin
Message-ID: <20090416042913.8C0A510F87B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pianobooster
kevin has set commit to Approved for provenpackager on pianobooster (Fedora 10)
kevin has set build to Approved for provenpackager on pianobooster (Fedora 10)
kevin has set checkout to Approved for provenpackager on pianobooster (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pianobooster



From kevin at fedoraproject.org  Thu Apr 16 04:29:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:29:23 +0000 (UTC)
Subject: rpms/pianobooster - New directory
Message-ID: <20090416042923.2B6B570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pianobooster
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT20891/rpms/pianobooster

Log Message:
Directory /cvs/pkgs/rpms/pianobooster added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:29:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:29:23 +0000 (UTC)
Subject: rpms/pianobooster/devel - New directory
Message-ID: <20090416042923.729A770127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pianobooster/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT20891/rpms/pianobooster/devel

Log Message:
Directory /cvs/pkgs/rpms/pianobooster/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 16 04:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:29:13 +0000
Subject: [pkgdb] pianobooster (Fedora, 11) updated by kevin
Message-ID: <20090416042913.9475310F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pianobooster
kevin has set commit to Approved for provenpackager on pianobooster (Fedora 11)
kevin has set build to Approved for provenpackager on pianobooster (Fedora 11)
kevin has set checkout to Approved for provenpackager on pianobooster (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pianobooster



From kevin at fedoraproject.org  Thu Apr 16 04:29:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:29:33 +0000 (UTC)
Subject: rpms/pianobooster Makefile,NONE,1.1
Message-ID: <20090416042933.A7F9070127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pianobooster
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT20891/rpms/pianobooster

Added Files:
	Makefile 
Log Message:
Setup of module pianobooster


--- NEW FILE Makefile ---
# Top level Makefile for module pianobooster
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:29:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:29:33 +0000 (UTC)
Subject: rpms/pianobooster/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090416042933.E30AE70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pianobooster/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT20891/rpms/pianobooster/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pianobooster


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pianobooster
# $Id: Makefile,v 1.1 2009/04/16 04:29:33 kevin Exp $
NAME := pianobooster
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 16 04:30:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:30:48 +0000
Subject: [pkgdb] febootstrap was added for rjones
Message-ID: <20090416043048.3506410F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package febootstrap with summary Bootstrap a new Fedora system (like debootstrap)
kevin has approved Package febootstrap
kevin has added a Fedora devel branch for febootstrap with an owner of rjones
kevin has approved febootstrap in Fedora devel
kevin has approved Package febootstrap
kevin has set commit to Approved for provenpackager on febootstrap (Fedora devel)
kevin has set build to Approved for provenpackager on febootstrap (Fedora devel)
kevin has set checkout to Approved for provenpackager on febootstrap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/febootstrap



From pkgdb at fedoraproject.org  Thu Apr 16 04:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:30:49 +0000
Subject: [pkgdb] febootstrap (Fedora, 10) updated by kevin
Message-ID: <20090416043049.D2FBA10F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for febootstrap
kevin has set commit to Approved for provenpackager on febootstrap (Fedora 10)
kevin has set build to Approved for provenpackager on febootstrap (Fedora 10)
kevin has set checkout to Approved for provenpackager on febootstrap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/febootstrap



From pkgdb at fedoraproject.org  Thu Apr 16 04:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:30:49 +0000
Subject: [pkgdb] febootstrap (Fedora, 11) updated by kevin
Message-ID: <20090416043049.DF25A10F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for febootstrap
kevin has set commit to Approved for provenpackager on febootstrap (Fedora 11)
kevin has set build to Approved for provenpackager on febootstrap (Fedora 11)
kevin has set checkout to Approved for provenpackager on febootstrap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/febootstrap



From kevin at fedoraproject.org  Thu Apr 16 04:31:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:31:01 +0000 (UTC)
Subject: rpms/febootstrap - New directory
Message-ID: <20090416043101.4BF2370127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/febootstrap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21317/rpms/febootstrap

Log Message:
Directory /cvs/pkgs/rpms/febootstrap added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:31:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:31:01 +0000 (UTC)
Subject: rpms/febootstrap/devel - New directory
Message-ID: <20090416043101.9A45570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/febootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21317/rpms/febootstrap/devel

Log Message:
Directory /cvs/pkgs/rpms/febootstrap/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:31:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:31:11 +0000 (UTC)
Subject: rpms/febootstrap Makefile,NONE,1.1
Message-ID: <20090416043111.BE28870127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/febootstrap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21317/rpms/febootstrap

Added Files:
	Makefile 
Log Message:
Setup of module febootstrap


--- NEW FILE Makefile ---
# Top level Makefile for module febootstrap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:31:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:31:12 +0000 (UTC)
Subject: rpms/febootstrap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090416043112.21E7570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/febootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21317/rpms/febootstrap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module febootstrap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: febootstrap
# $Id: Makefile,v 1.1 2009/04/16 04:31:11 kevin Exp $
NAME := febootstrap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 16 04:32:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:32:10 +0000 (UTC)
Subject: rpms/json - New directory
Message-ID: <20090416043210.24FE470137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22240/rpms/json

Log Message:
Directory /cvs/pkgs/rpms/json added to the repository




From pkgdb at fedoraproject.org  Thu Apr 16 04:32:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:32:00 +0000
Subject: [pkgdb] json was added for overholt
Message-ID: <20090416043200.A4E4310F852@bastion2.fedora.phx.redhat.com>

kevin has added Package json with summary JavaScript Object Notation Java implementation
kevin has approved Package json
kevin has added a Fedora devel branch for json with an owner of overholt
kevin has approved json in Fedora devel
kevin has approved Package json
kevin has set commit to Approved for provenpackager on json (Fedora devel)
kevin has set build to Approved for provenpackager on json (Fedora devel)
kevin has set checkout to Approved for provenpackager on json (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/json



From pkgdb at fedoraproject.org  Thu Apr 16 04:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:32:01 +0000
Subject: [pkgdb] json (Fedora, devel) updated by kevin
Message-ID: <20090416043202.0962910F87C@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on json (Fedora devel) for ebaron
kevin approved watchcommits on json (Fedora devel) for ebaron
kevin approved watchbugzilla on json (Fedora devel) for langel
kevin approved watchcommits on json (Fedora devel) for langel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/json



From kevin at fedoraproject.org  Thu Apr 16 04:32:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:32:19 +0000 (UTC)
Subject: rpms/json Makefile,NONE,1.1
Message-ID: <20090416043219.0747F70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22240/rpms/json

Added Files:
	Makefile 
Log Message:
Setup of module json


--- NEW FILE Makefile ---
# Top level Makefile for module json
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:32:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:32:10 +0000 (UTC)
Subject: rpms/json/devel - New directory
Message-ID: <20090416043210.6308570137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22240/rpms/json/devel

Log Message:
Directory /cvs/pkgs/rpms/json/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:32:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:32:19 +0000 (UTC)
Subject: rpms/json/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090416043219.4AD4E70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22240/rpms/json/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module json


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: json
# $Id: Makefile,v 1.1 2009/04/16 04:32:19 kevin Exp $
NAME := json
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 16 04:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:32:59 +0000
Subject: [pkgdb] jsl (Fedora, 10) updated by kevin
Message-ID: <20090416043259.AE93810F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jsl
kevin has set commit to Approved for provenpackager on jsl (Fedora 10)
kevin has set build to Approved for provenpackager on jsl (Fedora 10)
kevin has set checkout to Approved for provenpackager on jsl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsl



From pkgdb at fedoraproject.org  Thu Apr 16 04:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:32:58 +0000
Subject: [pkgdb] jsl was added for lkundrak
Message-ID: <20090416043258.189F310F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package jsl with summary Check JavaScript code for common mistakes
kevin has approved Package jsl
kevin has added a Fedora devel branch for jsl with an owner of lkundrak
kevin has approved jsl in Fedora devel
kevin has approved Package jsl
kevin has set commit to Approved for provenpackager on jsl (Fedora devel)
kevin has set build to Approved for provenpackager on jsl (Fedora devel)
kevin has set checkout to Approved for provenpackager on jsl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsl



From pkgdb at fedoraproject.org  Thu Apr 16 04:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:32:59 +0000
Subject: [pkgdb] jsl (Fedora EPEL, 5) updated by kevin
Message-ID: <20090416043259.C902F10F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for jsl
kevin has set commit to Approved for provenpackager on jsl (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on jsl (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on jsl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsl



From pkgdb at fedoraproject.org  Thu Apr 16 04:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:32:59 +0000
Subject: [pkgdb] jsl (Fedora, 11) updated by kevin
Message-ID: <20090416043259.B618510F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jsl
kevin has set commit to Approved for provenpackager on jsl (Fedora 11)
kevin has set build to Approved for provenpackager on jsl (Fedora 11)
kevin has set checkout to Approved for provenpackager on jsl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsl



From kevin at fedoraproject.org  Thu Apr 16 04:33:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:33:08 +0000 (UTC)
Subject: rpms/jsl - New directory
Message-ID: <20090416043308.2469570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22601/rpms/jsl

Log Message:
Directory /cvs/pkgs/rpms/jsl added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:33:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:33:08 +0000 (UTC)
Subject: rpms/jsl/devel - New directory
Message-ID: <20090416043308.56D7570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22601/rpms/jsl/devel

Log Message:
Directory /cvs/pkgs/rpms/jsl/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:33:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:33:19 +0000 (UTC)
Subject: rpms/jsl Makefile,NONE,1.1
Message-ID: <20090416043319.5738670127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22601/rpms/jsl

Added Files:
	Makefile 
Log Message:
Setup of module jsl


--- NEW FILE Makefile ---
# Top level Makefile for module jsl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:33:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:33:19 +0000 (UTC)
Subject: rpms/jsl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090416043319.980AE70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22601/rpms/jsl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jsl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jsl
# $Id: Makefile,v 1.1 2009/04/16 04:33:19 kevin Exp $
NAME := jsl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 16 04:34:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:34:32 +0000
Subject: [pkgdb] leonidas-kde-theme (Fedora, devel) updated by kevin
Message-ID: <20090416043432.DF09710F87B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on leonidas-kde-theme (Fedora devel) for rdieter
kevin approved watchcommits on leonidas-kde-theme (Fedora devel) for rdieter
kevin approved commit on leonidas-kde-theme (Fedora devel) for rdieter
kevin approved build on leonidas-kde-theme (Fedora devel) for rdieter
kevin approved approveacls on leonidas-kde-theme (Fedora devel) for rdieter
kevin approved watchbugzilla on leonidas-kde-theme (Fedora devel) for kkofler
kevin approved watchcommits on leonidas-kde-theme (Fedora devel) for kkofler
kevin approved commit on leonidas-kde-theme (Fedora devel) for kkofler
kevin approved build on leonidas-kde-theme (Fedora devel) for kkofler
kevin approved approveacls on leonidas-kde-theme (Fedora devel) for kkofler
kevin approved watchbugzilla on leonidas-kde-theme (Fedora devel) for than
kevin approved watchcommits on leonidas-kde-theme (Fedora devel) for than
kevin approved commit on leonidas-kde-theme (Fedora devel) for than
kevin approved build on leonidas-kde-theme (Fedora devel) for than
kevin approved approveacls on leonidas-kde-theme (Fedora devel) for than
kevin approved watchbugzilla on leonidas-kde-theme (Fedora devel) for ltinkl
kevin approved watchcommits on leonidas-kde-theme (Fedora devel) for ltinkl
kevin approved commit on leonidas-kde-theme (Fedora devel) for ltinkl
kevin approved build on leonidas-kde-theme (Fedora devel) for ltinkl
kevin approved approveacls on leonidas-kde-theme (Fedora devel) for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Apr 16 04:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:34:29 +0000
Subject: [pkgdb] leonidas-kde-theme was added for jreznik
Message-ID: <20090416043429.BD45010F852@bastion2.fedora.phx.redhat.com>

kevin has added Package leonidas-kde-theme with summary Leonidas KDE Theme
kevin has approved Package leonidas-kde-theme
kevin has added a Fedora devel branch for leonidas-kde-theme with an owner of jreznik
kevin has approved leonidas-kde-theme in Fedora devel
kevin has approved Package leonidas-kde-theme
kevin has set commit to Approved for provenpackager on leonidas-kde-theme (Fedora devel)
kevin has set build to Approved for provenpackager on leonidas-kde-theme (Fedora devel)
kevin has set checkout to Approved for provenpackager on leonidas-kde-theme (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Apr 16 04:34:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:34:32 +0000
Subject: [pkgdb] leonidas-kde-theme (Fedora, 11) updated by kevin
Message-ID: <20090416043432.EF90810F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for leonidas-kde-theme
kevin has set commit to Approved for provenpackager on leonidas-kde-theme (Fedora 11)
kevin has set build to Approved for provenpackager on leonidas-kde-theme (Fedora 11)
kevin has set checkout to Approved for provenpackager on leonidas-kde-theme (Fedora 11)
kevin approved watchbugzilla on leonidas-kde-theme (Fedora 11) for rdieter
kevin approved watchcommits on leonidas-kde-theme (Fedora 11) for rdieter
kevin approved commit on leonidas-kde-theme (Fedora 11) for rdieter
kevin approved build on leonidas-kde-theme (Fedora 11) for rdieter
kevin approved approveacls on leonidas-kde-theme (Fedora 11) for rdieter
kevin approved watchbugzilla on leonidas-kde-theme (Fedora 11) for kkofler
kevin approved watchcommits on leonidas-kde-theme (Fedora 11) for kkofler
kevin approved commit on leonidas-kde-theme (Fedora 11) for kkofler
kevin approved build on leonidas-kde-theme (Fedora 11) for kkofler
kevin approved approveacls on leonidas-kde-theme (Fedora 11) for kkofler
kevin approved watchbugzilla on leonidas-kde-theme (Fedora 11) for than
kevin approved watchcommits on leonidas-kde-theme (Fedora 11) for than
kevin approved commit on leonidas-kde-theme (Fedora 11) for than
kevin approved build on leonidas-kde-theme (Fedora 11) for than
kevin approved approveacls on leonidas-kde-theme (Fedora 11) for than
kevin approved watchbugzilla on leonidas-kde-theme (Fedora 11) for ltinkl
kevin approved watchcommits on leonidas-kde-theme (Fedora 11) for ltinkl
kevin approved commit on leonidas-kde-theme (Fedora 11) for ltinkl
kevin approved build on leonidas-kde-theme (Fedora 11) for ltinkl
kevin approved approveacls on leonidas-kde-theme (Fedora 11) for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From kevin at fedoraproject.org  Thu Apr 16 04:34:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:34:42 +0000 (UTC)
Subject: rpms/leonidas-kde-theme - New directory
Message-ID: <20090416043442.486C770127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/leonidas-kde-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp23037/rpms/leonidas-kde-theme

Log Message:
Directory /cvs/pkgs/rpms/leonidas-kde-theme added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:34:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:34:42 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/devel - New directory
Message-ID: <20090416043442.8BB8770127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/leonidas-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp23037/rpms/leonidas-kde-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/leonidas-kde-theme/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:34:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:34:53 +0000 (UTC)
Subject: rpms/leonidas-kde-theme Makefile,NONE,1.1
Message-ID: <20090416043453.1632C70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/leonidas-kde-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp23037/rpms/leonidas-kde-theme

Added Files:
	Makefile 
Log Message:
Setup of module leonidas-kde-theme


--- NEW FILE Makefile ---
# Top level Makefile for module leonidas-kde-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:34:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:34:53 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090416043453.6206370127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/leonidas-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp23037/rpms/leonidas-kde-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module leonidas-kde-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: leonidas-kde-theme
# $Id: Makefile,v 1.1 2009/04/16 04:34:53 kevin Exp $
NAME := leonidas-kde-theme
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 16 04:35:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:35:28 +0000
Subject: [pkgdb] pyxmlsec was added for lkundrak
Message-ID: <20090416043528.4C5A510F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package pyxmlsec with summary Python bindings for the XML Security Library
kevin has approved Package pyxmlsec
kevin has added a Fedora devel branch for pyxmlsec with an owner of lkundrak
kevin has approved pyxmlsec in Fedora devel
kevin has approved Package pyxmlsec
kevin has set commit to Approved for provenpackager on pyxmlsec (Fedora devel)
kevin has set build to Approved for provenpackager on pyxmlsec (Fedora devel)
kevin has set checkout to Approved for provenpackager on pyxmlsec (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxmlsec



From pkgdb at fedoraproject.org  Thu Apr 16 04:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:35:30 +0000
Subject: [pkgdb] pyxmlsec (Fedora, 10) updated by kevin
Message-ID: <20090416043530.4693B10F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pyxmlsec
kevin has set commit to Approved for provenpackager on pyxmlsec (Fedora 10)
kevin has set build to Approved for provenpackager on pyxmlsec (Fedora 10)
kevin has set checkout to Approved for provenpackager on pyxmlsec (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxmlsec



From pkgdb at fedoraproject.org  Thu Apr 16 04:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:35:30 +0000
Subject: [pkgdb] pyxmlsec (Fedora, 11) updated by kevin
Message-ID: <20090416043530.4E95610F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pyxmlsec
kevin has set commit to Approved for provenpackager on pyxmlsec (Fedora 11)
kevin has set build to Approved for provenpackager on pyxmlsec (Fedora 11)
kevin has set checkout to Approved for provenpackager on pyxmlsec (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxmlsec



From pkgdb at fedoraproject.org  Thu Apr 16 04:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 04:35:30 +0000
Subject: [pkgdb] pyxmlsec (Fedora EPEL, 5) updated by kevin
Message-ID: <20090416043530.55D1510F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pyxmlsec
kevin has set commit to Approved for provenpackager on pyxmlsec (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pyxmlsec (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pyxmlsec (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyxmlsec



From kevin at fedoraproject.org  Thu Apr 16 04:35:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:35:42 +0000 (UTC)
Subject: rpms/pyxmlsec - New directory
Message-ID: <20090416043542.5DC3170127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyxmlsec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23300/rpms/pyxmlsec

Log Message:
Directory /cvs/pkgs/rpms/pyxmlsec added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:35:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:35:42 +0000 (UTC)
Subject: rpms/pyxmlsec/devel - New directory
Message-ID: <20090416043542.AA1E670127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyxmlsec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23300/rpms/pyxmlsec/devel

Log Message:
Directory /cvs/pkgs/rpms/pyxmlsec/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 16 04:35:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:35:51 +0000 (UTC)
Subject: rpms/pyxmlsec Makefile,NONE,1.1
Message-ID: <20090416043551.8F3BE70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyxmlsec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23300/rpms/pyxmlsec

Added Files:
	Makefile 
Log Message:
Setup of module pyxmlsec


--- NEW FILE Makefile ---
# Top level Makefile for module pyxmlsec
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 16 04:35:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 04:35:51 +0000 (UTC)
Subject: rpms/pyxmlsec/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090416043551.D38C570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyxmlsec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC23300/rpms/pyxmlsec/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyxmlsec


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pyxmlsec
# $Id: Makefile,v 1.1 2009/04/16 04:35:51 kevin Exp $
NAME := pyxmlsec
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mclasen at fedoraproject.org  Thu Apr 16 04:45:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 16 Apr 2009 04:45:39 +0000 (UTC)
Subject: rpms/gnome-media/F-11 fix-alignment-of-sliders.patch, NONE,
	1.1 gnome-media.spec, 1.166, 1.167
Message-ID: <20090416044539.8647170127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25353

Modified Files:
	gnome-media.spec 
Added Files:
	fix-alignment-of-sliders.patch 
Log Message:
fix alignment of sliders


fix-alignment-of-sliders.patch:

--- NEW FILE fix-alignment-of-sliders.patch ---
diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c hacked/gnome-volume-control/src/gvc-balance-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-03-03 16:26:48.000000000 -0500
+++ hacked/gnome-volume-control/src/gvc-balance-bar.c	2009-04-16 00:00:36.451383748 -0400
@@ -385,7 +385,7 @@
         bar->priv->label = gtk_label_new_with_mnemonic (_("_Balance:"));
         gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
                                 0.0,
-                                0.5);
+                                0.0);
         /* frame */
         frame = gtk_frame_new (NULL);
         gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c hacked/gnome-volume-control/src/gvc-channel-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:10:01.957634048 -0400
+++ hacked/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:01:58.002641476 -0400
@@ -102,6 +102,7 @@
         GtkWidget            *box;
         GtkWidget            *sbox;
         GtkWidget            *ebox;
+        GtkWidget            *alignment;
 
         if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
                 bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
@@ -143,7 +144,6 @@
 
                 gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
                 gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
-
                 gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
 
                 bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
@@ -578,6 +578,7 @@
         	str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
         	gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
         			    GTK_POS_BOTTOM, str);
+		gtk_widget_queue_resize (bar->priv->scale);
         	g_free (str);
 	} else {
 		gtk_scale_clear_marks (GTK_SCALE (bar->priv->scale));
@@ -812,23 +813,23 @@
                           "toggled",
                           G_CALLBACK (on_mute_button_toggled),
                           bar);
-        bar->priv->mute_box = gtk_alignment_new (0.5, 0.5, 0, 0);
+        bar->priv->mute_box = gtk_alignment_new (0.5, 0, 0, 0);
         gtk_container_add (GTK_CONTAINER (bar->priv->mute_box), bar->priv->mute_button);
 
         bar->priv->low_image = gtk_image_new_from_icon_name ("audio-volume-low",
                                                              GTK_ICON_SIZE_BUTTON);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0);
         gtk_widget_set_no_show_all (bar->priv->low_image, TRUE);
         bar->priv->high_image = gtk_image_new_from_icon_name ("audio-volume-high",
                                                               GTK_ICON_SIZE_BUTTON);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0);
         gtk_widget_set_no_show_all (bar->priv->high_image, TRUE);
 
         bar->priv->image = gtk_image_new ();
         gtk_widget_set_no_show_all (bar->priv->image, TRUE);
 
         bar->priv->label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
-                                0.0,
-                                0.5);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.0);
         gtk_widget_set_no_show_all (bar->priv->label, TRUE);
 
         /* frame */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-media.spec	17 Mar 2009 01:55:24 -0000	1.166
+++ gnome-media.spec	16 Apr 2009 04:45:09 -0000	1.167
@@ -20,6 +20,8 @@
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=574312
 Patch3:		gnome-media-add-100-mark.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=579115
+Patch4: 	fix-alignment-of-sliders.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -47,8 +49,6 @@
 BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
 BuildRequires:  unique-devel
-# for patch 0
-BuildRequires:  autoconf automake libtool
 
 %description
 This package contains a few media utilities for the GNOME desktop,
@@ -81,8 +81,7 @@
 pushd gnome-volume-control/src
 %patch3 -p0 -b .amplified-mark
 popd
-
-autoreconf -f -i
+%patch4 -p1 -b .fix-alignment-of-sliders
 
 %build
 # try to work around a problem where gst-inspect does



From mclasen at fedoraproject.org  Thu Apr 16 04:54:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 16 Apr 2009 04:54:58 +0000 (UTC)
Subject: rpms/gnome-media/F-11 gnome-media.spec,1.167,1.168
Message-ID: <20090416045458.E033270127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27194

Modified Files:
	gnome-media.spec 
Log Message:
Fix alignment of sliders



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-media.spec	16 Apr 2009 04:45:09 -0000	1.167
+++ gnome-media.spec	16 Apr 2009 04:54:57 -0000	1.168
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
@@ -255,6 +255,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Fix alignment of sliders
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:19 +0000 (UTC)
Subject: rpms/pyxmlsec/F-10 pyxmlsec.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416052919.857D770127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	pyxmlsec.spec 
Log Message:
Initial import


--- NEW FILE pyxmlsec.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyxmlsec
Version:        0.3.0
Release:        2%{?dist}
Summary:        Python bindings for the XML Security Library

Group:          Development/Libraries
License:        GPLv2+
URL:            http://pyxmlsec.labs.libre-entreprise.org/
Source0:        http://labs.libre-entreprise.org/download.php/430/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  xmlsec1-nss-devel

%description
PyXMLSec is a set of Python bindings for the XML Security Library, a C
library based on LibXML2. The library supports major XML security standards
including, XML Signature, XML Encryption, Canonical XML and Exclusive
Canonical XML.


%prep
%setup -q

# A non-UTF8 character
iconv -f iso8859-1 -t utf8 <AUTHORS >AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
mv AUTHORS.utf8 AUTHORS


%build
# 1. OpenSSL
# 2. GnuTLS
# 3. NSS
CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc AUTHORS ChangeLog COPYING README TODO


%changelog
* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
- Fix AUTHORs file location for conversion (Marek Mahut)

* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:35:51 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+pyxmlsec-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:35:51 -0000	1.1
+++ sources	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+150631f634654804076f73a0859fea1a  pyxmlsec-0.3.0.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:19 +0000 (UTC)
Subject: rpms/pyxmlsec/EL-5 pyxmlsec.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416052919.627F470127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	pyxmlsec.spec 
Log Message:
Initial import


--- NEW FILE pyxmlsec.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyxmlsec
Version:        0.3.0
Release:        2%{?dist}
Summary:        Python bindings for the XML Security Library

Group:          Development/Libraries
License:        GPLv2+
URL:            http://pyxmlsec.labs.libre-entreprise.org/
Source0:        http://labs.libre-entreprise.org/download.php/430/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  xmlsec1-nss-devel

%description
PyXMLSec is a set of Python bindings for the XML Security Library, a C
library based on LibXML2. The library supports major XML security standards
including, XML Signature, XML Encryption, Canonical XML and Exclusive
Canonical XML.


%prep
%setup -q

# A non-UTF8 character
iconv -f iso8859-1 -t utf8 <AUTHORS >AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
mv AUTHORS.utf8 AUTHORS


%build
# 1. OpenSSL
# 2. GnuTLS
# 3. NSS
CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc AUTHORS ChangeLog COPYING README TODO


%changelog
* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
- Fix AUTHORs file location for conversion (Marek Mahut)

* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:35:51 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:28:48 -0000	1.2
@@ -0,0 +1 @@
+pyxmlsec-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:35:51 -0000	1.1
+++ sources	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+150631f634654804076f73a0859fea1a  pyxmlsec-0.3.0.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:20 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:20 +0000 (UTC)
Subject: rpms/pyxmlsec/devel pyxmlsec.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416052920.1641870127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pyxmlsec.spec 
Log Message:
Initial import


--- NEW FILE pyxmlsec.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyxmlsec
Version:        0.3.0
Release:        2%{?dist}
Summary:        Python bindings for the XML Security Library

Group:          Development/Libraries
License:        GPLv2+
URL:            http://pyxmlsec.labs.libre-entreprise.org/
Source0:        http://labs.libre-entreprise.org/download.php/430/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  xmlsec1-nss-devel

%description
PyXMLSec is a set of Python bindings for the XML Security Library, a C
library based on LibXML2. The library supports major XML security standards
including, XML Signature, XML Encryption, Canonical XML and Exclusive
Canonical XML.


%prep
%setup -q

# A non-UTF8 character
iconv -f iso8859-1 -t utf8 <AUTHORS >AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
mv AUTHORS.utf8 AUTHORS


%build
# 1. OpenSSL
# 2. GnuTLS
# 3. NSS
CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc AUTHORS ChangeLog COPYING README TODO


%changelog
* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
- Fix AUTHORs file location for conversion (Marek Mahut)

* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:35:51 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+pyxmlsec-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:35:51 -0000	1.1
+++ sources	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+150631f634654804076f73a0859fea1a  pyxmlsec-0.3.0.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:19 +0000 (UTC)
Subject: rpms/pyxmlsec/F-11 pyxmlsec.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416052919.C12F170127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	pyxmlsec.spec 
Log Message:
Initial import


--- NEW FILE pyxmlsec.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyxmlsec
Version:        0.3.0
Release:        2%{?dist}
Summary:        Python bindings for the XML Security Library

Group:          Development/Libraries
License:        GPLv2+
URL:            http://pyxmlsec.labs.libre-entreprise.org/
Source0:        http://labs.libre-entreprise.org/download.php/430/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  xmlsec1-nss-devel

%description
PyXMLSec is a set of Python bindings for the XML Security Library, a C
library based on LibXML2. The library supports major XML security standards
including, XML Signature, XML Encryption, Canonical XML and Exclusive
Canonical XML.


%prep
%setup -q

# A non-UTF8 character
iconv -f iso8859-1 -t utf8 <AUTHORS >AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
mv AUTHORS.utf8 AUTHORS


%build
# 1. OpenSSL
# 2. GnuTLS
# 3. NSS
CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{python_sitearch}/*
%doc AUTHORS ChangeLog COPYING README TODO


%changelog
* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
- Fix AUTHORs file location for conversion (Marek Mahut)

* Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:35:51 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+pyxmlsec-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:35:51 -0000	1.1
+++ sources	16 Apr 2009 05:28:49 -0000	1.2
@@ -0,0 +1 @@
+150631f634654804076f73a0859fea1a  pyxmlsec-0.3.0.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:45 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:45 +0000 (UTC)
Subject: rpms/jsl/EL-5 jsl-0.3.0-smash.patch, NONE, 1.1 jsl-0.3.0-tests.patch,
	NONE, 1.1 jsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416052945.E0A8A70127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/jsl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2600/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	jsl-0.3.0-smash.patch jsl-0.3.0-tests.patch jsl.spec 
Log Message:
Import jsl

jsl-0.3.0-smash.patch:

--- NEW FILE jsl-0.3.0-smash.patch ---
Fix stack smashing... triggered by the stack overflow test (doh!)

Lubomir Rintel <lkundrak at v3.sk>

diff -urp jsl-0.3.0/src/jsl.c jsl-0.3.0.smash/src/jsl.c
--- jsl-0.3.0/src/jsl.c	2006-11-03 20:20:24.000000000 +0100
+++ jsl-0.3.0.smash/src/jsl.c	2009-04-14 23:03:37.528221874 +0200
@@ -91,7 +91,12 @@
 #define EXITCODE_FILE_ERROR 4
 
 /* file constants */
-#define MAXPATHLEN 1024
+#ifdef PATH_MAX
+#define MAXPATHLEN PATH_MAX
+#else
+#warning "MAXPATHLEN can overflow if PATH_MAX is too big"
+#define MAXPATHLEN 65536
+#endif
 
 #ifdef WIN32
 #define DEFAULT_DIRECTORY_SEPARATOR '\\'

jsl-0.3.0-tests.patch:

--- NEW FILE jsl-0.3.0-tests.patch ---
Fail if tests fail.

Lubomir Rintel <lkundrak at v3.sk>

diff -up jsl-0.3.0/tests/run_tests.pl.tests jsl-0.3.0/tests/run_tests.pl
--- jsl-0.3.0/tests/run_tests.pl.tests	2009-04-14 23:05:50.287206494 +0200
+++ jsl-0.3.0/tests/run_tests.pl	2009-04-14 23:06:13.605209095 +0200
@@ -69,3 +69,4 @@ print "Searching $FindBin::Bin...\n";
 find( sub{TestFile}, '.');
 
 print "Passed $num_passed of $num_tests tests\n";
+die "FAIL" unless $num_passed == $num_tests;


--- NEW FILE jsl.spec ---
Name:           jsl
Version:        0.3.0
Release:        1%{?dist}
Summary:        Check JavaScript code for common mistakes

Group:          Development/Tools
License:        MPLv1.1
URL:            http://javascriptlint.com/
Source0:        http://javascriptlint.com/download/%{name}-%{version}-src.tar.gz
Patch0:         jsl-0.3.0-smash.patch
Patch1:         jsl-0.3.0-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
With JavaScript Lint, you can check all your JavaScript source code for
common mistakes without actually running the script or opening the web page.

JavaScript Lint holds an advantage over competing lints because it is based
on the JavaScript engine for the Firefox browser. This provides a robust
framework that can not only check JavaScript syntax but also examine the
coding techniques used in the script and warn against questionable
practices.


%prep
%setup -q
%patch0 -p1 -b .smash
%patch1 -p1 -b .tests


%build
# Fix DOS-y EOL encoding and permissions
find . -type f |xargs sed -i 's/\r//' $FILES
find . -type f |xargs chmod 644 $FILES

# Dependencies dealt with poorly -- no _smp_mflags
make -C src -f Makefile.ref SHARED_LIBRARY= \
        OBJDIR=. JS_EDITLINE=1 XCFLAGS="%{optflags}" \
        OS_CFLAGS="-DXP_UNIX -DHAVE_VA_COPY -DVA_COPY=va_copy"


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install src/jsl $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%check
cd tests
perl run_tests.pl ../src/jsl


%files
%defattr(-,root,root,-)
%{_bindir}/jsl


%changelog
* Tue Apr 14 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:33:19 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:29:15 -0000	1.2
@@ -0,0 +1 @@
+jsl-0.3.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:33:19 -0000	1.1
+++ sources	16 Apr 2009 05:29:15 -0000	1.2
@@ -0,0 +1 @@
+2b94ffa4fab07acabe0c5e73cd49bcdf  jsl-0.3.0-src.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:46 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:46 +0000 (UTC)
Subject: rpms/jsl/F-10 jsl-0.3.0-smash.patch, NONE, 1.1 jsl-0.3.0-tests.patch,
	NONE, 1.1 jsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416052946.3ADEF70127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/jsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2600/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	jsl-0.3.0-smash.patch jsl-0.3.0-tests.patch jsl.spec 
Log Message:
Import jsl

jsl-0.3.0-smash.patch:

--- NEW FILE jsl-0.3.0-smash.patch ---
Fix stack smashing... triggered by the stack overflow test (doh!)

Lubomir Rintel <lkundrak at v3.sk>

diff -urp jsl-0.3.0/src/jsl.c jsl-0.3.0.smash/src/jsl.c
--- jsl-0.3.0/src/jsl.c	2006-11-03 20:20:24.000000000 +0100
+++ jsl-0.3.0.smash/src/jsl.c	2009-04-14 23:03:37.528221874 +0200
@@ -91,7 +91,12 @@
 #define EXITCODE_FILE_ERROR 4
 
 /* file constants */
-#define MAXPATHLEN 1024
+#ifdef PATH_MAX
+#define MAXPATHLEN PATH_MAX
+#else
+#warning "MAXPATHLEN can overflow if PATH_MAX is too big"
+#define MAXPATHLEN 65536
+#endif
 
 #ifdef WIN32
 #define DEFAULT_DIRECTORY_SEPARATOR '\\'

jsl-0.3.0-tests.patch:

--- NEW FILE jsl-0.3.0-tests.patch ---
Fail if tests fail.

Lubomir Rintel <lkundrak at v3.sk>

diff -up jsl-0.3.0/tests/run_tests.pl.tests jsl-0.3.0/tests/run_tests.pl
--- jsl-0.3.0/tests/run_tests.pl.tests	2009-04-14 23:05:50.287206494 +0200
+++ jsl-0.3.0/tests/run_tests.pl	2009-04-14 23:06:13.605209095 +0200
@@ -69,3 +69,4 @@ print "Searching $FindBin::Bin...\n";
 find( sub{TestFile}, '.');
 
 print "Passed $num_passed of $num_tests tests\n";
+die "FAIL" unless $num_passed == $num_tests;


--- NEW FILE jsl.spec ---
Name:           jsl
Version:        0.3.0
Release:        1%{?dist}
Summary:        Check JavaScript code for common mistakes

Group:          Development/Tools
License:        MPLv1.1
URL:            http://javascriptlint.com/
Source0:        http://javascriptlint.com/download/%{name}-%{version}-src.tar.gz
Patch0:         jsl-0.3.0-smash.patch
Patch1:         jsl-0.3.0-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
With JavaScript Lint, you can check all your JavaScript source code for
common mistakes without actually running the script or opening the web page.

JavaScript Lint holds an advantage over competing lints because it is based
on the JavaScript engine for the Firefox browser. This provides a robust
framework that can not only check JavaScript syntax but also examine the
coding techniques used in the script and warn against questionable
practices.


%prep
%setup -q
%patch0 -p1 -b .smash
%patch1 -p1 -b .tests


%build
# Fix DOS-y EOL encoding and permissions
find . -type f |xargs sed -i 's/\r//' $FILES
find . -type f |xargs chmod 644 $FILES

# Dependencies dealt with poorly -- no _smp_mflags
make -C src -f Makefile.ref SHARED_LIBRARY= \
        OBJDIR=. JS_EDITLINE=1 XCFLAGS="%{optflags}" \
        OS_CFLAGS="-DXP_UNIX -DHAVE_VA_COPY -DVA_COPY=va_copy"


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install src/jsl $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%check
cd tests
perl run_tests.pl ../src/jsl


%files
%defattr(-,root,root,-)
%{_bindir}/jsl


%changelog
* Tue Apr 14 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:33:19 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:29:15 -0000	1.2
@@ -0,0 +1 @@
+jsl-0.3.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:33:19 -0000	1.1
+++ sources	16 Apr 2009 05:29:15 -0000	1.2
@@ -0,0 +1 @@
+2b94ffa4fab07acabe0c5e73cd49bcdf  jsl-0.3.0-src.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:46 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:46 +0000 (UTC)
Subject: rpms/jsl/F-11 jsl-0.3.0-smash.patch, NONE, 1.1 jsl-0.3.0-tests.patch,
	NONE, 1.1 jsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416052946.7753070127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/jsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2600/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	jsl-0.3.0-smash.patch jsl-0.3.0-tests.patch jsl.spec 
Log Message:
Import jsl

jsl-0.3.0-smash.patch:

--- NEW FILE jsl-0.3.0-smash.patch ---
Fix stack smashing... triggered by the stack overflow test (doh!)

Lubomir Rintel <lkundrak at v3.sk>

diff -urp jsl-0.3.0/src/jsl.c jsl-0.3.0.smash/src/jsl.c
--- jsl-0.3.0/src/jsl.c	2006-11-03 20:20:24.000000000 +0100
+++ jsl-0.3.0.smash/src/jsl.c	2009-04-14 23:03:37.528221874 +0200
@@ -91,7 +91,12 @@
 #define EXITCODE_FILE_ERROR 4
 
 /* file constants */
-#define MAXPATHLEN 1024
+#ifdef PATH_MAX
+#define MAXPATHLEN PATH_MAX
+#else
+#warning "MAXPATHLEN can overflow if PATH_MAX is too big"
+#define MAXPATHLEN 65536
+#endif
 
 #ifdef WIN32
 #define DEFAULT_DIRECTORY_SEPARATOR '\\'

jsl-0.3.0-tests.patch:

--- NEW FILE jsl-0.3.0-tests.patch ---
Fail if tests fail.

Lubomir Rintel <lkundrak at v3.sk>

diff -up jsl-0.3.0/tests/run_tests.pl.tests jsl-0.3.0/tests/run_tests.pl
--- jsl-0.3.0/tests/run_tests.pl.tests	2009-04-14 23:05:50.287206494 +0200
+++ jsl-0.3.0/tests/run_tests.pl	2009-04-14 23:06:13.605209095 +0200
@@ -69,3 +69,4 @@ print "Searching $FindBin::Bin...\n";
 find( sub{TestFile}, '.');
 
 print "Passed $num_passed of $num_tests tests\n";
+die "FAIL" unless $num_passed == $num_tests;


--- NEW FILE jsl.spec ---
Name:           jsl
Version:        0.3.0
Release:        1%{?dist}
Summary:        Check JavaScript code for common mistakes

Group:          Development/Tools
License:        MPLv1.1
URL:            http://javascriptlint.com/
Source0:        http://javascriptlint.com/download/%{name}-%{version}-src.tar.gz
Patch0:         jsl-0.3.0-smash.patch
Patch1:         jsl-0.3.0-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
With JavaScript Lint, you can check all your JavaScript source code for
common mistakes without actually running the script or opening the web page.

JavaScript Lint holds an advantage over competing lints because it is based
on the JavaScript engine for the Firefox browser. This provides a robust
framework that can not only check JavaScript syntax but also examine the
coding techniques used in the script and warn against questionable
practices.


%prep
%setup -q
%patch0 -p1 -b .smash
%patch1 -p1 -b .tests


%build
# Fix DOS-y EOL encoding and permissions
find . -type f |xargs sed -i 's/\r//' $FILES
find . -type f |xargs chmod 644 $FILES

# Dependencies dealt with poorly -- no _smp_mflags
make -C src -f Makefile.ref SHARED_LIBRARY= \
        OBJDIR=. JS_EDITLINE=1 XCFLAGS="%{optflags}" \
        OS_CFLAGS="-DXP_UNIX -DHAVE_VA_COPY -DVA_COPY=va_copy"


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install src/jsl $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%check
cd tests
perl run_tests.pl ../src/jsl


%files
%defattr(-,root,root,-)
%{_bindir}/jsl


%changelog
* Tue Apr 14 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:33:19 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:29:16 -0000	1.2
@@ -0,0 +1 @@
+jsl-0.3.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:33:19 -0000	1.1
+++ sources	16 Apr 2009 05:29:16 -0000	1.2
@@ -0,0 +1 @@
+2b94ffa4fab07acabe0c5e73cd49bcdf  jsl-0.3.0-src.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 16 05:29:46 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 16 Apr 2009 05:29:46 +0000 (UTC)
Subject: rpms/jsl/devel jsl-0.3.0-smash.patch, NONE,
	1.1 jsl-0.3.0-tests.patch, 
	NONE, 1.1 jsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416052946.B22AF70127@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/jsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2600/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jsl-0.3.0-smash.patch jsl-0.3.0-tests.patch jsl.spec 
Log Message:
Import jsl

jsl-0.3.0-smash.patch:

--- NEW FILE jsl-0.3.0-smash.patch ---
Fix stack smashing... triggered by the stack overflow test (doh!)

Lubomir Rintel <lkundrak at v3.sk>

diff -urp jsl-0.3.0/src/jsl.c jsl-0.3.0.smash/src/jsl.c
--- jsl-0.3.0/src/jsl.c	2006-11-03 20:20:24.000000000 +0100
+++ jsl-0.3.0.smash/src/jsl.c	2009-04-14 23:03:37.528221874 +0200
@@ -91,7 +91,12 @@
 #define EXITCODE_FILE_ERROR 4
 
 /* file constants */
-#define MAXPATHLEN 1024
+#ifdef PATH_MAX
+#define MAXPATHLEN PATH_MAX
+#else
+#warning "MAXPATHLEN can overflow if PATH_MAX is too big"
+#define MAXPATHLEN 65536
+#endif
 
 #ifdef WIN32
 #define DEFAULT_DIRECTORY_SEPARATOR '\\'

jsl-0.3.0-tests.patch:

--- NEW FILE jsl-0.3.0-tests.patch ---
Fail if tests fail.

Lubomir Rintel <lkundrak at v3.sk>

diff -up jsl-0.3.0/tests/run_tests.pl.tests jsl-0.3.0/tests/run_tests.pl
--- jsl-0.3.0/tests/run_tests.pl.tests	2009-04-14 23:05:50.287206494 +0200
+++ jsl-0.3.0/tests/run_tests.pl	2009-04-14 23:06:13.605209095 +0200
@@ -69,3 +69,4 @@ print "Searching $FindBin::Bin...\n";
 find( sub{TestFile}, '.');
 
 print "Passed $num_passed of $num_tests tests\n";
+die "FAIL" unless $num_passed == $num_tests;


--- NEW FILE jsl.spec ---
Name:           jsl
Version:        0.3.0
Release:        1%{?dist}
Summary:        Check JavaScript code for common mistakes

Group:          Development/Tools
License:        MPLv1.1
URL:            http://javascriptlint.com/
Source0:        http://javascriptlint.com/download/%{name}-%{version}-src.tar.gz
Patch0:         jsl-0.3.0-smash.patch
Patch1:         jsl-0.3.0-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
With JavaScript Lint, you can check all your JavaScript source code for
common mistakes without actually running the script or opening the web page.

JavaScript Lint holds an advantage over competing lints because it is based
on the JavaScript engine for the Firefox browser. This provides a robust
framework that can not only check JavaScript syntax but also examine the
coding techniques used in the script and warn against questionable
practices.


%prep
%setup -q
%patch0 -p1 -b .smash
%patch1 -p1 -b .tests


%build
# Fix DOS-y EOL encoding and permissions
find . -type f |xargs sed -i 's/\r//' $FILES
find . -type f |xargs chmod 644 $FILES

# Dependencies dealt with poorly -- no _smp_mflags
make -C src -f Makefile.ref SHARED_LIBRARY= \
        OBJDIR=. JS_EDITLINE=1 XCFLAGS="%{optflags}" \
        OS_CFLAGS="-DXP_UNIX -DHAVE_VA_COPY -DVA_COPY=va_copy"


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install src/jsl $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%check
cd tests
perl run_tests.pl ../src/jsl


%files
%defattr(-,root,root,-)
%{_bindir}/jsl


%changelog
* Tue Apr 14 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:33:19 -0000	1.1
+++ .cvsignore	16 Apr 2009 05:29:16 -0000	1.2
@@ -0,0 +1 @@
+jsl-0.3.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jsl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:33:19 -0000	1.1
+++ sources	16 Apr 2009 05:29:16 -0000	1.2
@@ -0,0 +1 @@
+2b94ffa4fab07acabe0c5e73cd49bcdf  jsl-0.3.0-src.tar.gz



From robert at fedoraproject.org  Thu Apr 16 05:54:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 05:54:23 +0000 (UTC)
Subject: rpms/duplicity/devel duplicity.spec,1.25,1.26
Message-ID: <20090416055423.E657C70127@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8018

Modified Files:
	duplicity.spec 
Log Message:
Upgrade to 0.5.15



Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- duplicity.spec	21 Mar 2009 15:41:44 -0000	1.25
+++ duplicity.spec	16 Apr 2009 05:53:53 -0000	1.26
@@ -2,9 +2,9 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.12
+Version:        0.5.15
 Release:        1%{?dist}
-License:        GPLv3+
+License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@
 %{python_sitearch}/%{name}*
 
 %changelog
+* Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> 0.5.15-1
+- Upgrade to 0.5.15
+
 * Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> 0.5.12-1
 - Upgrade to 0.5.12 (#490289)
 



From robert at fedoraproject.org  Thu Apr 16 05:56:11 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 16 Apr 2009 05:56:11 +0000 (UTC)
Subject: rpms/duplicity/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090416055611.AB24B70127@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8369

Modified Files:
	.cvsignore sources 
Log Message:
Update sources as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Mar 2009 15:41:44 -0000	1.11
+++ .cvsignore	16 Apr 2009 05:55:41 -0000	1.12
@@ -1 +1 @@
-duplicity-0.5.12.tar.gz
+duplicity-0.5.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Mar 2009 15:41:44 -0000	1.11
+++ sources	16 Apr 2009 05:55:41 -0000	1.12
@@ -1 +1 @@
-38cb42fc0299ae0c8e029bd381aa4452  duplicity-0.5.12.tar.gz
+8d5c85a6da317573d4cbf44eae8caa63  duplicity-0.5.15.tar.gz



From huzaifas at fedoraproject.org  Thu Apr 16 05:59:37 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 16 Apr 2009 05:59:37 +0000 (UTC)
Subject: rpms/ntop/EL-5 ntop-geoip.patch, NONE, 1.1 ntop-http_c.patch, NONE, 
	1.1 ntop.spec, 1.2, 1.3
Message-ID: <20090416055937.3F8EE70127@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/ntop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8939

Modified Files:
	ntop.spec 
Added Files:
	ntop-geoip.patch ntop-http_c.patch 
Log Message:
bump to the latest fedora version

ntop-geoip.patch:

--- NEW FILE ntop-geoip.patch ---
diff -up ntop-3.3.9/configure.in.geo ntop-3.3.9/configure.in
--- ntop-3.3.9/configure.in.geo	2009-03-05 11:30:53.000000000 +0100
+++ ntop-3.3.9/configure.in	2009-03-05 11:30:53.000000000 +0100
@@ -1890,40 +1890,23 @@ else
     }'`
 fi
 
-dnl> GeoIP (http://www.maxmind.com/)
-if test -f "GeoIP.tar.gz"; then
-   echo "GeoIP already present on this machine"
-else
-   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
-   tar xvfz GeoIP.tar.gz
-   GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
-   cd $GEO_DIR; ./configure; make; cd ..
-   # OSX Fix
-   GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
-   if test -f $GEO_DYLIB; then
-      ln -s $GEO_DYLIB .
-   fi
-fi
-
-if test -f "GeoLiteCity.dat"; then
-   echo "GeoLiteCity.dat already present"
-else
-   wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-   gunzip GeoLiteCity.dat.gz
-fi
-
-if test -f "GeoIPASNum.dat"; then
-   echo "GeoIPASNum.dat already present"
-else
-   wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-   gunzip GeoIPASNum.dat.gz
+#
+#GeoIP
+#
+AC_CHECK_HEADERS(
+    [GeoIP.h],
+    [geoip_header="yes"],
+    [AC_MSG_FAILURE([GeoIP header file is missing])]
+)
+if test "$geoip_header" = "yes"; then
+    AC_CHECK_LIB(GeoIP, GeoIP_open,
+        [geoip_libs="yes"],
+	[AC_MSG_FAILURE([GeoIP library is missing])]
+    )
+fi
+if test "$geoip_libs" = "yes"; then
+    LDFLAGS="${LDFLAGS} -lGeoIP"
 fi
-
-
-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
-GEO_IP="$GEO_DIR/libGeoIP/"
-CFLAGS="$CFLAGS -I$GEO_IP"
-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
 
 dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
 
diff -up ntop-3.3.9/Makefile.am.geo ntop-3.3.9/Makefile.am
--- ntop-3.3.9/Makefile.am.geo	2009-03-05 11:39:26.000000000 +0100
+++ ntop-3.3.9/Makefile.am	2009-03-05 12:20:11.000000000 +0100
@@ -262,8 +262,6 @@ libclean:
 
 install: install-recursive
 
-	cd @GEO_DIR@; make install
-
 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
 
 	@echo ""

ntop-http_c.patch:

--- NEW FILE ntop-http_c.patch ---
--- ntop-3.3.9.org/http.c	2009-03-16 23:58:33.000000000 +0530
+++ ntop-3.3.9/http.c	2009-03-16 23:59:39.000000000 +0530
@@ -1341,6 +1341,7 @@
 void initAccessLog(void) {
 
   if(myGlobals.runningPref.accessLogFile) {
+    umask(0137);
     myGlobals.accessLogFd = fopen(myGlobals.runningPref.accessLogFile, "a");
     if(myGlobals.accessLogFd == NULL) {
       traceEvent(CONST_TRACE_ERROR, "Unable to create file %s. Access log is disabled.",


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/EL-5/ntop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntop.spec	29 Aug 2008 09:09:00 -0000	1.2
+++ ntop.spec	16 Apr 2009 05:59:06 -0000	1.3
@@ -1,25 +1,31 @@
 Name:           ntop
-Version:        3.3.6
-Release:        6%{?dist}
+Version:        3.3.9
+Release:        5%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
-License:        GPLv2
+License:        GPLv2 and BSD with advertising
 URL:            http://www.ntop.org
 Source0:        http://downloads.sourceforge.net/ntop/ntop-%{version}.tar.gz
 Source1:        ntop.init
 Source2:        ntop.conf
+Source3:        http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+Source4:        http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
 Patch1:         ntop-am.patch
 Patch2:         ntop-running-user.patch
 Patch3:         ntop-dbfile-default-dir.patch
 Patch4:         ntop-compile.patch
 Patch5:         ntop-enable-sslv3.patch
+Patch6:         ntop-geoip.patch
+Patch7:         ntop-http_c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel
+BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget 
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
 BuildRequires:  net-snmp-devel, pcre-devel, mysql-devel
 BuildRequires:  perl(ExtUtils::Embed)
+BuildRequires:  GeoIP-devel
 Requires:       initscripts, graphviz
-Requires(post): /sbin/chkconfig       
+Requires(post): /sbin/chkconfig      
+Requires(post): openssl >= 0.9.7f-4, /bin/cat
 Requires(preun):/sbin/chkconfig       
 
 
@@ -47,6 +53,9 @@
 
 %prep
 %setup -q -n ntop
+cp %SOURCE3 ./ && gunzip GeoLiteCity.dat.gz
+cp %SOURCE4 ./ && gunzip GeoIPASNum.dat.gz
+
 
 # executable bits are set on some config files and docs that go into
 # %%{_sysconfdir}/ntop and %%{_datadir}, and some debug source files.  Remove
@@ -60,6 +69,8 @@
 %patch3 -p1 -b .dbfile-default-dir
 %patch4 -p1 -b .compile
 %patch5 -p1 -b .sslv3
+%patch6 -p1 -b .geo
+%patch7 -p1 -b .http_c
 
 
 %build
@@ -114,6 +125,27 @@
   /sbin/chkconfig --add %{name} &> /dev/null || :
 fi
 
+# create new self-signed certificate
+%define sslcert %{_sysconfdir}/ntop/ntop-cert.pem
+if [ ! -f %{sslcert} ] ; then
+ #get hosname
+ FQDN=`hostname`
+ if [ "x${FQDN}" = "x" ]; then
+    FQDN=localhost.localdomain
+ fi
+ #create key and certificate in one file
+ cat << EOF | %{_bindir}/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout %{sslcert}  -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+fi
+
+
 %preun
 if [ $1 = 0 ]; then
   /sbin/service %{name} stop    &> /dev/null || :
@@ -155,6 +187,9 @@
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Thu Apr 16 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 3.3.9-5
+- Bump to latest fedora version 
+
 * Fri Aug 29 2008 Richard W.M. Jones <rjones at redhat.com> - 3.3.6-6
 - Removed tcp_wrappers-devel, lm_sensors-devel, not available in EL-5.
 



From huzaifas at fedoraproject.org  Thu Apr 16 06:14:21 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 16 Apr 2009 06:14:21 +0000 (UTC)
Subject: rpms/ntop/EL-5 sources,1.2,1.3
Message-ID: <20090416061421.A31C270127@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/ntop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12217

Modified Files:
	sources 
Log Message:
version bump


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 17:32:43 -0000	1.2
+++ sources	16 Apr 2009 06:13:51 -0000	1.3
@@ -1 +1,3 @@
-22bfc14cf92bca6e35103d31a5ede027  ntop-3.3.6.tar.gz
+0c22038e0f2aa003110437b5a5d5a6a5  ntop-3.3.9.tar.gz
+25a13ba33a6a3894cc7ea255e8b47d78  ntop-geoip.patch
+25c4c3aec1ac7034c071227adee4cf25  ntop-http_c.patch



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:00 +0000
Subject: [pkgdb] gnote: dodji has requested watchcommits
Message-ID: <20090416061800.C61CB10F852@bastion2.fedora.phx.redhat.com>

dodji has requested the watchcommits acl on gnote (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:01 +0000
Subject: [pkgdb] gnote: dodji has requested watchbugzilla
Message-ID: <20090416061801.362E510F87C@bastion2.fedora.phx.redhat.com>

dodji has requested the watchbugzilla acl on gnote (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:01 +0000
Subject: [pkgdb] gnote: dodji has requested commit
Message-ID: <20090416061801.98BAE10F880@bastion2.fedora.phx.redhat.com>

dodji has requested the commit acl on gnote (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:03 +0000
Subject: [pkgdb] gnote: dodji has requested approveacls
Message-ID: <20090416061803.BF79210F883@bastion2.fedora.phx.redhat.com>

dodji has requested the approveacls acl on gnote (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:07 +0000
Subject: [pkgdb] gnote: dodji has requested watchbugzilla
Message-ID: <20090416061807.B56B010F886@bastion2.fedora.phx.redhat.com>

dodji has requested the watchbugzilla acl on gnote (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:08 +0000
Subject: [pkgdb] gnote: dodji has requested watchcommits
Message-ID: <20090416061808.961E010F88A@bastion2.fedora.phx.redhat.com>

dodji has requested the watchcommits acl on gnote (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:09 +0000
Subject: [pkgdb] gnote: dodji has requested commit
Message-ID: <20090416061809.6B00A10F88D@bastion2.fedora.phx.redhat.com>

dodji has requested the commit acl on gnote (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:11 +0000
Subject: [pkgdb] gnote: dodji has requested approveacls
Message-ID: <20090416061811.E47FF10F890@bastion2.fedora.phx.redhat.com>

dodji has requested the approveacls acl on gnote (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:26 +0000
Subject: [pkgdb] gnote: dodji has requested watchbugzilla
Message-ID: <20090416061826.5859E10F852@bastion2.fedora.phx.redhat.com>

dodji has requested the watchbugzilla acl on gnote (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:27 +0000
Subject: [pkgdb] gnote: dodji has requested watchcommits
Message-ID: <20090416061827.2DEAE10F87C@bastion2.fedora.phx.redhat.com>

dodji has requested the watchcommits acl on gnote (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:28 +0000
Subject: [pkgdb] gnote: dodji has requested commit
Message-ID: <20090416061828.8904D10F893@bastion2.fedora.phx.redhat.com>

dodji has requested the commit acl on gnote (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 06:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 06:18:30 +0000
Subject: [pkgdb] gnote: dodji has requested approveacls
Message-ID: <20090416061830.CEA2B10F895@bastion2.fedora.phx.redhat.com>

dodji has requested the approveacls acl on gnote (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From huzaifas at fedoraproject.org  Thu Apr 16 06:29:28 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 16 Apr 2009 06:29:28 +0000 (UTC)
Subject: rpms/ntop/EL-5 sources,1.3,1.4
Message-ID: <20090416062928.9F46270127@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/ntop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15208

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Apr 2009 06:13:51 -0000	1.3
+++ sources	16 Apr 2009 06:28:58 -0000	1.4
@@ -1,3 +1,4 @@
 0c22038e0f2aa003110437b5a5d5a6a5  ntop-3.3.9.tar.gz
-25a13ba33a6a3894cc7ea255e8b47d78  ntop-geoip.patch
-25c4c3aec1ac7034c071227adee4cf25  ntop-http_c.patch
+1838a3a68f2c7a9eb310cee8f82b6a64  GeoLiteCity.dat.gz
+32997e6d3b1df64cbbb3ecc0adfb9ad8  GeoIPASNum.dat.gz
+cb14b1beeb40631a12676b11ca0c309a  GeoIP.tar.gz



From rmccabe at fedoraproject.org  Thu Apr 16 06:39:20 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 16 Apr 2009 06:39:20 +0000 (UTC)
Subject: rpms/ricci/F-11 ricci.spec,1.16,1.17 sources,1.11,1.12
Message-ID: <20090416063921.0005970127@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17666

Modified Files:
	ricci.spec sources 
Log Message:
* Tue Apr 07 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-2
- Fix memory corruption bug.
- Update package and service list.
- Add missing dependency for nss-tools




Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-11/ricci.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ricci.spec	30 Mar 2009 19:59:12 -0000	1.16
+++ ricci.spec	16 Apr 2009 06:38:49 -0000	1.17
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -22,7 +22,7 @@
 BuildRequires: openssl-devel dbus-devel pkgconfig file-devel nss-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 
-Requires: oddjob dbus openssl cyrus-sasl >= 2.1 file
+Requires: oddjob dbus openssl cyrus-sasl >= 2.1 file nss-tools
 # modstorage
 Requires: parted
 
@@ -121,6 +121,11 @@
 exit 0
 
 %changelog
+* Tue Apr 07 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-2
+- Fix memory corruption bug.
+- Update package and service list.
+- Add missing dependency for nss-tools
+
 * Mon Mar 30 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-1
 - Update for F11
 - Fix build issues uncovered by g++ 4.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Mar 2009 19:59:12 -0000	1.11
+++ sources	16 Apr 2009 06:38:50 -0000	1.12
@@ -1 +1 @@
-fad8f74a0dc458d67191f134027d5265  ricci-0.16.0.tar.gz
+043609b17009b1910e3fedd80aa5f8d1  ricci-0.16.0.tar.gz



From harald at fedoraproject.org  Thu Apr 16 06:45:31 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 16 Apr 2009 06:45:31 +0000 (UTC)
Subject: rpms/udev/F-9 udev-CVE-2009-1186.patch, NONE, 1.1 udev.spec, 1.250, 
	1.251
Message-ID: <20090416064531.ACE0670127@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18950

Modified Files:
	udev.spec 
Added Files:
	udev-CVE-2009-1186.patch 
Log Message:
* Thu Apr 16 2009 Harald Hoyer <harald at redhat.com> 124-4
- fix for CVE-2009-1186


udev-CVE-2009-1186.patch:

--- NEW FILE udev-CVE-2009-1186.patch ---
diff -up udev-124/udev_utils_string.c.CVE-2009-1186 udev-124/udev_utils_string.c
--- udev-124/udev_utils_string.c.CVE-2009-1186	2009-04-16 08:43:43.000000000 +0200
+++ udev-124/udev_utils_string.c	2009-04-16 08:43:54.000000000 +0200
@@ -52,7 +52,7 @@ void remove_trailing_chars(char *path, c
 
 size_t path_encode(char *s, size_t len)
 {
-	char t[(len * 3)+1];
+	char t[(len * 4)+1];
 	size_t i, j;
 
 	t[0] = '\0';


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-9/udev.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- udev.spec	15 Apr 2009 17:07:54 -0000	1.250
+++ udev.spec	16 Apr 2009 06:45:00 -0000	1.251
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 124
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -25,6 +25,7 @@
 Patch104: udev-091-lib64.patch
 Patch105: udev-vol_id-cdrom.patch
 Patch106: udev-CVE-2009-1185.patch
+Patch107: udev-CVE-2009-1186.patch
 
 Patch200: udev-120-rhrules.patch
 
@@ -85,6 +86,7 @@
 %patch104 -p1 -b .lib64
 %patch105 -p1 -b .tray
 %patch106 -p1 -b .CVE-2009-1185
+%patch107 -p1 -b .CVE-2009-1186
 
 %patch200 -p1 -b .rhrules
 
@@ -409,6 +411,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Apr 16 2009 Harald Hoyer <harald at redhat.com> 124-4
+- fix for CVE-2009-1186
+
 * Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 124-3
 - fix for CVE-2009-1185
 



From harald at fedoraproject.org  Thu Apr 16 06:48:20 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 16 Apr 2009 06:48:20 +0000 (UTC)
Subject: rpms/udev/F-10 udev-CVE-2009-1186.patch, NONE, 1.1 udev.spec, 1.256,
	1.257
Message-ID: <20090416064820.B7CFE70127@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19617

Modified Files:
	udev.spec 
Added Files:
	udev-CVE-2009-1186.patch 
Log Message:
* Thu Apr 16 2009 Harald Hoyer <harald at redhat.com> 127-5
- fix for CVE-2009-1186


udev-CVE-2009-1186.patch:

--- NEW FILE udev-CVE-2009-1186.patch ---
diff -up udev-127/udev/udev_utils_string.c.CVE-2009-1186 udev-127/udev/udev_utils_string.c
--- udev-127/udev/udev_utils_string.c.CVE-2009-1186	2008-08-26 09:21:40.000000000 +0200
+++ udev-127/udev/udev_utils_string.c	2009-04-16 08:47:13.000000000 +0200
@@ -53,7 +53,7 @@ void remove_trailing_chars(char *path, c
 
 size_t path_encode(char *s, size_t len)
 {
-	char t[(len * 3)+1];
+	char t[(len * 4)+1];
 	size_t i, j;
 
 	t[0] = '\0';


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-10/udev.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- udev.spec	15 Apr 2009 17:13:46 -0000	1.256
+++ udev.spec	16 Apr 2009 06:47:50 -0000	1.257
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 127
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -23,8 +23,9 @@
 Patch2: udev-127-volume_id-include-config.h.patch
 Patch3: udev-132-memstickrules.patch
 
-Patch101: udev-CVE-2009-1185.patch
-Patch102: udev-118-sysconf.patch
+Patch101: udev-118-sysconf.patch
+Patch102: udev-CVE-2009-1185.patch
+Patch103: udev-CVE-2009-1186.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -99,8 +100,9 @@
 %patch1 -p1 -b .p1
 %patch2 -p1 -b .p2
 %patch3 -p1 -b .p3
-%patch101 -p1 -b .CVE-2009-1185
-%patch102 -p1 -b .sysconf
+%patch101 -p1 -b .sysconf
+%patch102 -p1 -b .CVE-2009-1185
+%patch103 -p1 -b .CVE-2009-1186
 
 %build
 %configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" --enable-static
@@ -372,6 +374,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Harald Hoyer <harald at redhat.com> 127-5
+- fix for CVE-2009-1186
+
 * Wed Apr 15 2009 Harald Hoyer <harald at redhat.com> 127-4
 - fix for CVE-2009-1185
 



From harald at fedoraproject.org  Thu Apr 16 06:50:10 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 16 Apr 2009 06:50:10 +0000 (UTC)
Subject: rpms/udev/devel udev.spec,1.272,1.273
Message-ID: <20090416065010.24F3670127@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19974

Modified Files:
	udev.spec 
Log Message:
* Thu Apr 16 2009 Harald Hoyer <harald at redhat.com> 141-2
- fixed post and pre



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- udev.spec	15 Apr 2009 17:42:26 -0000	1.272
+++ udev.spec	16 Apr 2009 06:49:39 -0000	1.273
@@ -19,7 +19,6 @@
 Source5: udev.sysconfig
 
 Patch102: udev-118-sysconf.patch
-Patch103: udev-CVE-2009-1186.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -94,7 +93,6 @@
 %setup -q  
 
 %patch102 -p1 -b .sysconf
-%patch103 -p1 -b .CVE-2009-1186
 
 %build
 %if %{with_static}
@@ -395,9 +393,8 @@
 
 
 %changelog
-* Wed Apr 15 2009 Harald Hoyer <harald at redhat.com> 141-2
-- fix for CVE-2009-1186 (bug #495052)
-- Resolves: rhbz#495052
+* Thu Apr 16 2009 Harald Hoyer <harald at redhat.com> 141-2
+- fixed post and pre
 
 * Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 141-1
 - version 141



From huzaifas at fedoraproject.org  Thu Apr 16 07:04:33 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 16 Apr 2009 07:04:33 +0000 (UTC)
Subject: rpms/ntop/EL-5 .cvsignore,1.2,1.3
Message-ID: <20090416070433.7158970127@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/ntop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22300

Modified Files:
	.cvsignore 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 17:32:43 -0000	1.2
+++ .cvsignore	16 Apr 2009 07:04:03 -0000	1.3
@@ -1 +1,4 @@
-ntop-3.3.6.tar.gz
+ntop-3.3.9.tar.gz
+GeoLiteCity.dat.gz
+GeoIPASNum.dat.gz
+GeoIP.tar.gz



From pkgdb at fedoraproject.org  Thu Apr 16 07:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:07:12 +0000
Subject: [pkgdb] deluge: bloodname has requested watchcommits
Message-ID: <20090416070712.48C6F10F851@bastion2.fedora.phx.redhat.com>

bloodname has requested the watchcommits acl on deluge (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/deluge



From pkgdb at fedoraproject.org  Thu Apr 16 07:09:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:09:45 +0000
Subject: [pkgdb] AcetoneISO2: bloodname has requested watchcommits
Message-ID: <20090416070945.0CEFB10F852@bastion2.fedora.phx.redhat.com>

bloodname has requested the watchcommits acl on AcetoneISO2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/AcetoneISO2



From giallu at fedoraproject.org  Thu Apr 16 07:10:07 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Thu, 16 Apr 2009 07:10:07 +0000 (UTC)
Subject: rpms/ogmtools/devel ogmtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416071007.94A1570127@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/ogmtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24227

Modified Files:
	.cvsignore sources 
Added Files:
	ogmtools.spec 
Log Message:
Imported package



--- NEW FILE ogmtools.spec ---
Name:           ogmtools
Version:        1.5
Release:        5%{?dist}
Summary:        Tools for Ogg media streams

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.bunkus.org/videotools/ogmtools/
Source0:        http://www.bunkus.org/videotools/ogmtools/ogmtools-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libogg-devel
BuildRequires:  libvorbis-devel
BuildRequires:  libdvdread-devel

%description
These tools allow information about (ogminfo) or extraction from (ogmdemux) or
creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
streams".


%prep
%setup -q
# Convert Changelog to UTF8
iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
touch -r ChangeLog ChangeLog.txt
mv ChangeLog.txt ChangeLog


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Thu Apr  9 2009 Gianluca Sforna <giallu gmail com> - 1.5-5
- Fix rpmlint issues
- Fix license tag

* Thu Dec 16 2008 Gianluca Sforna <giallu gmail com> - 1.5-4
- New spec based off freshrpms for Fedora submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:23:35 -0000	1.1
+++ .cvsignore	16 Apr 2009 07:09:37 -0000	1.2
@@ -0,0 +1 @@
+ogmtools-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:23:35 -0000	1.1
+++ sources	16 Apr 2009 07:09:37 -0000	1.2
@@ -0,0 +1 @@
+02d356e3d21d53b1d9715bab223d8996  ogmtools-1.5.tar.bz2



From pkgdb at fedoraproject.org  Thu Apr 16 07:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:15:59 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071559.C40D110F852@bastion2.fedora.phx.redhat.com>

sundaram has set the watchbugzilla acl on gnote (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:00 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071600.59BF110F87C@bastion2.fedora.phx.redhat.com>

sundaram has set the watchcommits acl on gnote (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:03 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071603.3196F10F880@bastion2.fedora.phx.redhat.com>

sundaram has set the commit acl on gnote (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:05 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071605.B2FAA10F883@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on gnote (Fedora devel) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:08 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071608.F3F5110F886@bastion2.fedora.phx.redhat.com>

sundaram has set the watchbugzilla acl on gnote (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:10 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071611.1762B10F88A@bastion2.fedora.phx.redhat.com>

sundaram has set the watchcommits acl on gnote (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:13 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071613.7961B10F88B@bastion2.fedora.phx.redhat.com>

sundaram has set the commit acl on gnote (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:26 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071626.869DA10F87B@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on gnote (Fedora 10) to Obsolete for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:16 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071616.6EEB110F88E@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on gnote (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:29 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071629.D414610F88F@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on gnote (Fedora 10) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:48 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071648.136B110F882@bastion2.fedora.phx.redhat.com>

sundaram has set the watchbugzilla acl on gnote (Fedora 11) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:49 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071649.E9C1710F885@bastion2.fedora.phx.redhat.com>

sundaram has set the watchcommits acl on gnote (Fedora 11) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:51 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071651.B139110F889@bastion2.fedora.phx.redhat.com>

sundaram has set the commit acl on gnote (Fedora 11) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From pkgdb at fedoraproject.org  Thu Apr 16 07:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 07:16:53 +0000
Subject: [pkgdb] gnote had acl change status
Message-ID: <20090416071654.1570A10F893@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on gnote (Fedora 11) to Approved for dodji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnote



From giallu at fedoraproject.org  Thu Apr 16 07:17:39 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Thu, 16 Apr 2009 07:17:39 +0000 (UTC)
Subject: rpms/ogmtools/F-11 ogmtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416071739.D6C4770127@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/ogmtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25757

Modified Files:
	.cvsignore sources 
Added Files:
	ogmtools.spec 
Log Message:
Imported package


--- NEW FILE ogmtools.spec ---
Name:           ogmtools
Version:        1.5
Release:        5%{?dist}
Summary:        Tools for Ogg media streams

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.bunkus.org/videotools/ogmtools/
Source0:        http://www.bunkus.org/videotools/ogmtools/ogmtools-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libogg-devel
BuildRequires:  libvorbis-devel
BuildRequires:  libdvdread-devel

%description
These tools allow information about (ogminfo) or extraction from (ogmdemux) or
creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
streams".


%prep
%setup -q
# Convert Changelog to UTF8
iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
touch -r ChangeLog ChangeLog.txt
mv ChangeLog.txt ChangeLog


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Thu Apr  9 2009 Gianluca Sforna <giallu gmail com> - 1.5-5
- Fix rpmlint issues
- Fix license tag

* Thu Dec 16 2008 Gianluca Sforna <giallu gmail com> - 1.5-4
- New spec based off freshrpms for Fedora submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:23:35 -0000	1.1
+++ .cvsignore	16 Apr 2009 07:17:09 -0000	1.2
@@ -0,0 +1 @@
+ogmtools-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:23:35 -0000	1.1
+++ sources	16 Apr 2009 07:17:09 -0000	1.2
@@ -0,0 +1 @@
+02d356e3d21d53b1d9715bab223d8996  ogmtools-1.5.tar.bz2



From jakub at fedoraproject.org  Thu Apr 16 07:30:15 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 16 Apr 2009 07:30:15 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.271, 1.272 glibc-fedora.patch, 1.304, 
	1.305 glibc.spec, 1.394, 1.395 import.log, 1.15, 1.16 sources,
	1.296, 1.297
Message-ID: <20090416073015.DE51D70127@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28008/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- .cvsignore	15 Apr 2009 16:53:35 -0000	1.271
+++ .cvsignore	16 Apr 2009 07:29:44 -0000	1.272
@@ -1,2 +1,2 @@
-glibc-20090415T1619.tar.bz2
-glibc-fedora-20090415T1619.tar.bz2
+glibc-20090416T0610.tar.bz2
+glibc-fedora-20090416T0610.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- glibc-fedora.patch	15 Apr 2009 16:53:35 -0000	1.304
+++ glibc-fedora.patch	16 Apr 2009 07:29:44 -0000	1.305
@@ -1,6 +1,6 @@
---- glibc-20090415T1619/ChangeLog	15 Apr 2009 15:57:47 -0000	1.11594
-+++ glibc-20090415T1619-fedora/ChangeLog	15 Apr 2009 16:37:02 -0000	1.8782.2.329
-@@ -7263,6 +7263,13 @@
+--- glibc-20090416T0610/ChangeLog	15 Apr 2009 17:10:28 -0000	1.11595
++++ glibc-20090416T0610-fedora/ChangeLog	16 Apr 2009 06:26:58 -0000	1.8782.2.330
+@@ -7264,6 +7264,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7558,6 +7565,10 @@
+@@ -7559,6 +7566,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8815,6 +8826,15 @@
+@@ -8816,6 +8827,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090415T1619/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090415T1619-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090416T0610/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090416T0610-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090415T1619/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090415T1619-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090416T0610/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090416T0610-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090415T1619/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090415T1619-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090416T0610/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090416T0610-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090415T1619/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090415T1619-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090416T0610/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090416T0610-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090415T1619/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090415T1619-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090416T0610/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090416T0610-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090415T1619/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090415T1619-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090416T0610/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090416T0610-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090415T1619/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090415T1619-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090416T0610/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090416T0610-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090415T1619/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090415T1619-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090416T0610/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090416T0610-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090415T1619/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090416T0610/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090415T1619/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090416T0610/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090415T1619/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090415T1619-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090416T0610/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090416T0610-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090415T1619/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090415T1619-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090416T0610/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090416T0610-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090415T1619/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090415T1619-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090416T0610/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090416T0610-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090415T1619/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090415T1619-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090416T0610/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090416T0610-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090415T1619/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090415T1619-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090416T0610/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090416T0610-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090415T1619/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090415T1619-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090416T0610/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090416T0610-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090415T1619/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090415T1619-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090416T0610/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090416T0610-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090415T1619/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090415T1619-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090416T0610/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090416T0610-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090415T1619/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090416T0610/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090415T1619/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090415T1619-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090416T0610/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090416T0610-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090415T1619/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090415T1619-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090416T0610/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090416T0610-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090415T1619/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090415T1619-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090416T0610/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090416T0610-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090415T1619/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090415T1619-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090416T0610/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090416T0610-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090415T1619/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090415T1619-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090416T0610/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090416T0610-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090415T1619/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090415T1619-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090416T0610/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090416T0610-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090415T1619/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090415T1619-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090416T0610/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090416T0610-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090415T1619/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090415T1619-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090416T0610/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090416T0610-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090415T1619/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090416T0610/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090415T1619/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090415T1619-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090416T0610/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090416T0610-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090415T1619/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090415T1619-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090416T0610/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090416T0610-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090415T1619/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090415T1619-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090416T0610/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090416T0610-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090415T1619/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090415T1619-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090416T0610/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090416T0610-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090415T1619/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090416T0610/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090415T1619/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090415T1619-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090416T0610/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090416T0610-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090415T1619/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090415T1619-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090416T0610/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090416T0610-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090415T1619/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090415T1619-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090416T0610/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090416T0610-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090415T1619/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090415T1619-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090416T0610/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090416T0610-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090415T1619/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090415T1619-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090416T0610/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090416T0610-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090415T1619/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090416T0610/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090415T1619/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090415T1619-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090416T0610/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090416T0610-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090415T1619/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090415T1619-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090416T0610/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090416T0610-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090415T1619/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090415T1619-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090416T0610/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- glibc.spec	15 Apr 2009 16:53:36 -0000	1.394
+++ glibc.spec	16 Apr 2009 07:29:45 -0000	1.395
@@ -1,6 +1,6 @@
-%define glibcdate 20090415T1619
+%define glibcdate 20090416T0610
 %define glibcname glibc
-%define glibcsrcdir glibc-20090415T1619
+%define glibcsrcdir glibc-20090416T0610
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 17
+Release: 18
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,10 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-18
+- update from trunk
+  - fix fallocate
+
 * Wed Apr 15 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-17
 - update from trunk
   - if threads have very small stack sizes, use much smaller buffer


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	15 Apr 2009 16:53:36 -0000	1.15
+++ import.log	16 Apr 2009 07:29:45 -0000	1.16
@@ -13,3 +13,4 @@
 glibc-2_9_90-15:HEAD:glibc-2.9.90-15.src.rpm:1239312092
 glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476
 glibc-2_9_90-17:F-11:glibc-2.9.90-17.src.rpm:1239814311
+glibc-2_9_90-18:F-11:glibc-2.9.90-18.src.rpm:1239866900


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- sources	15 Apr 2009 16:53:36 -0000	1.296
+++ sources	16 Apr 2009 07:29:45 -0000	1.297
@@ -1,2 +1,2 @@
-0b663ed169beecf35f4731a00dd9e8de  glibc-20090415T1619.tar.bz2
-086b93c85f8925c113aa1ea42992a8b0  glibc-fedora-20090415T1619.tar.bz2
+7f33a470d88dc80287ecda88c3869246  glibc-20090416T0610.tar.bz2
+63a536b89c7b922a1b5e0f470a73a28a  glibc-fedora-20090416T0610.tar.bz2



From giallu at fedoraproject.org  Thu Apr 16 07:42:09 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Thu, 16 Apr 2009 07:42:09 +0000 (UTC)
Subject: rpms/ogmtools/F-10 ogmtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416074209.0A6D670127@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/ogmtools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30162

Modified Files:
	.cvsignore sources 
Added Files:
	ogmtools.spec 
Log Message:
Imported package


--- NEW FILE ogmtools.spec ---
Name:           ogmtools
Version:        1.5
Release:        5%{?dist}
Summary:        Tools for Ogg media streams

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.bunkus.org/videotools/ogmtools/
Source0:        http://www.bunkus.org/videotools/ogmtools/ogmtools-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libogg-devel
BuildRequires:  libvorbis-devel
BuildRequires:  libdvdread-devel

%description
These tools allow information about (ogminfo) or extraction from (ogmdemux) or
creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
streams".


%prep
%setup -q
# Convert Changelog to UTF8
iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
touch -r ChangeLog ChangeLog.txt
mv ChangeLog.txt ChangeLog


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Thu Apr  9 2009 Gianluca Sforna <giallu gmail com> - 1.5-5
- Fix rpmlint issues
- Fix license tag

* Thu Dec 16 2008 Gianluca Sforna <giallu gmail com> - 1.5-4
- New spec based off freshrpms for Fedora submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:23:35 -0000	1.1
+++ .cvsignore	16 Apr 2009 07:41:38 -0000	1.2
@@ -0,0 +1 @@
+ogmtools-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:23:35 -0000	1.1
+++ sources	16 Apr 2009 07:41:38 -0000	1.2
@@ -0,0 +1 @@
+02d356e3d21d53b1d9715bab223d8996  ogmtools-1.5.tar.bz2



From denis at fedoraproject.org  Thu Apr 16 08:04:43 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 16 Apr 2009 08:04:43 +0000 (UTC)
Subject: rpms/glom/F-11 glom.spec,1.33,1.34
Message-ID: <20090416080443.457AD70127@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32542

Modified Files:
	glom.spec 
Log Message:
Requires libgda-sqlite


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-11/glom.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- glom.spec	25 Mar 2009 09:06:39 -0000	1.33
+++ glom.spec	16 Apr 2009 08:04:12 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -33,8 +33,12 @@
 BuildRequires:  goocanvasmm-devel >= 0.13.0
 BuildRequires:  libepc-devel
 
+# Glom curently only supports postgresql well and uses it by default.
 Requires:       postgresql-server
+# Both gda providers are dlopened by libgda. sqlite is used internally
+# by glom.
 Requires:       libgda-postgres
+Requires:       libgda-sqlite
 
 Requires(post):   shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -159,6 +163,9 @@
 
 
 %changelog
+* Sat Apr  4 2009 Denis Leroy <denis at poolshark.org> - 1.10.0-3
+- Requires libgda-sqlite 
+
 * Wed Mar 25 2009 Denis Leroy <denis at poolshark.org> - 1.10.0-2
 - Fixed libs rpmlint complaints
 



From airlied at fedoraproject.org  Thu Apr 16 08:19:04 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 16 Apr 2009 08:19:04 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-modeset.patch, 1.46,
	1.47 xorg-x11-drv-ati.spec, 1.177,
	1.178 radeon-modeset-zaphod.patch, 1.1, NONE
Message-ID: <20090416081904.9E4A570127@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2489

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-modeset-zaphod.patch 
Log Message:
* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 6.12.2-4
- radeon-modeset.patch: fix stupid idle drawing corrupt since mmap cache


radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.46 -r 1.47 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-modeset.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- radeon-modeset.patch	15 Apr 2009 02:54:23 -0000	1.46
+++ radeon-modeset.patch	16 Apr 2009 08:18:33 -0000	1.47
@@ -1,6 +1,1084 @@
-diff -up xf86-video-ati-6.12.2/configure.ac.dave xf86-video-ati-6.12.2/configure.ac
---- xf86-video-ati-6.12.2/configure.ac.dave	2009-04-09 00:29:53.000000000 +1000
-+++ xf86-video-ati-6.12.2/configure.ac	2009-04-15 12:46:30.000000000 +1000
+commit 4f6eff7a49eb66bb701eda8f378a94c9dc7478f2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 16 18:03:03 2009 +1000
+
+    radeon: make drmmode palette code
+    
+    valgrind pointed out I'd missed this before.
+    
+    still some work left to do
+
+commit f2f1862719dd3438d96822bdd0dd8863321a15d0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 16 16:32:21 2009 +1000
+
+    radeon: change wait idle return code.
+    
+    this returns EBUSY which may or may not be the coorect answer
+
+commit c2ec15d95b27fa28bb01bd915110574a745e5567
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 21:28:31 2009 +1000
+
+    radeon: remove some unneeded comments
+
+commit d3b5de69ea1283e0949d10d4bcbe260dad4f1066
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 17:21:57 2009 +1000
+
+    radeon: todo gamma crtc set
+
+commit 9bc652046201fb67d2f96569137f50120c578c3f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 17:13:40 2009 +1000
+
+    radeon: add zaphod support for kms
+    
+    wow that was a lot easier than I thought
+
+commit d8c115adcaf6e8775d812c3f6e94f894920d47b2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 12:39:39 2009 +1000
+
+    radeon: fixup bo map caching hopefully
+
+commit ebd92d5ba4c19cd0af0a237d4367ae0cda63d1e1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 12:04:19 2009 +1000
+
+    radeon: fix kms rotation properly
+
+commit 356083345a8c8b2b75e62c0c0643855fb05c9f38
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 11:37:33 2009 +1000
+
+    radeon: remove pointless memory/bo abstraction
+
+commit a322a475ed97d0ee212ea136b0387f49e1103026
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 11:17:46 2009 +1000
+
+    radeon: cache mmaps
+
+commit add7f96a096ac2403aae259a5a457137207015d4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 10:48:48 2009 +1000
+
+    radeon: mismerge accel dfs only if we have non-agp
+
+commit 982598d830691cd1b39e5aa2c9c409786e059fd3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 09:15:08 2009 +1000
+
+    radeon: remove function
+
+commit 41fbe7ce72bf978092dd4f6d0410178cc21e441f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 18:39:27 2009 +1000
+
+    radeon: add config.h to fix mmap
+
+commit bb15e058079254a88a2194d70659f6694f59262f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 15:19:13 2009 +1000
+
+    radeon: drop lots of unused code
+
+commit 8695b9394e5597d393007165552f8cd77ca55002
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 13:03:46 2009 +1000
+
+    radeon: fixup mmap for new kernel API
+
+commit 783f402a7b248f1aea9c8f267a3a69e1f95bdc8b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 10:18:41 2009 +1000
+
+    radeon DDX: update API
+
+commit 9c81d3fb250610c1979122ff50bd8b4173b9547a
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sun Apr 5 11:11:19 2009 +1000
+
+    radeon: fix compile
+
+commit 842c290e17d2096a82319731afc1e043aa8e1df4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 3 20:34:05 2009 +1100
+
+    r600: fix src offsets after kms changes
+
+commit af04b0d061123ccb763975c368fb0dda38977fe6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 21:55:46 2009 +1000
+
+    radeon: fix r100/r200 xv better
+
+commit 666f8ee5f9201282e3a2f2b02e1c9699e8bf9b82
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 18:14:27 2009 +1000
+
+    radeon: fixup textured video hopefully for kms
+
+commit d50d3ab2d09a15dab26698450bc1b900fd421682
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 17:12:05 2009 +1000
+
+    radeon: make FUS work with DRI2
+
+commit 63f5c44278db2e42286402ab507c9494665084a6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 25 14:02:42 2009 +1000
+
+    reenable UTS
+
+commit 21db8c83ff6c6b66c0d4b1f3ae35e642fb19b66d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 25 13:57:18 2009 +1000
+
+    radeon: remove drm_mm paths, assume mm = kms for now
+
+commit 0d598ea813c2422ed16d0020ecc04a15438e917f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 24 15:35:53 2009 +1000
+
+    radeon: fix mismerge in kms paths
+
+commit 7a6cf9ade0f6ce5416aa635a8518b25d58cf32a8
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Fri Mar 13 14:04:59 2009 +1000
+
+    radeon: make shadowfb run on kms r600
+
+commit 6d24c7a78c346086c6cca889b599c4124229a42d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 14:01:07 2009 +1000
+
+    radeon: do some rotate fixups - still not perfect
+
+commit de55e58c72e53948d5fdbc252ea3ea3f7e3377af
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 14:00:13 2009 +1000
+
+    kms: explicitly dpms on after mode setting
+
+commit 5e1bc153cd49ae56c0910e934a915f16caf5d232
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 13:59:43 2009 +1000
+
+    radeon: update for drm mode api change
+
+commit 86af107d30daccd5f6e2b5fe8017621197e095f8
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Tue Mar 10 22:33:51 2009 +1000
+
+    r600: fix merge issue that breaks Xv
+
+commit a49b34e1155ee757aef942e3303186d950fb3256
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Mar 5 16:05:41 2009 +1000
+
+    radeon: add support for relocatable CRTC inside VLINE
+    
+    We cannot let userspace decide which CRTC it wants because its userspace
+    and might not own the crtc, so we need to provide a way to relocate it
+
+commit 09b179b6d45c040d4b33b97c9dfc5bbec3c226ba
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 3 15:30:21 2009 +1000
[...6064 lines suppressed...]
      pPriv->w = width;
      pPriv->h = height;
  
@@ -7649,9 +8901,10 @@
  	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
      else
  #endif
-diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dave xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
---- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dave	2009-04-08 01:32:12.000000000 +1000
-+++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-15 12:46:30.000000000 +1000
+diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
+index 05acb93..852f4ac 100644
+--- a/src/radeon_textured_videofuncs.c
++++ b/src/radeon_textured_videofuncs.c
 @@ -87,11 +87,25 @@ do {								\
  
  #endif /* !ACCEL_CP */
@@ -7678,7 +8931,7 @@
      uint32_t txformat;
      uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
      uint32_t dst_offset, dst_pitch, dst_format;
-@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
      int dstxoff, dstyoff, pixel_shift, vtx_count;
      BoxPtr pBox = REGION_RECTS(&pPriv->clip);
      int nBox = REGION_NUM_RECTS(&pPriv->clip);
@@ -7739,7 +8992,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_WAIT_DMA_GUI_IDLE);
  	    FINISH_ACCEL();
  
@@ -7748,7 +9001,7 @@
  		RADEONInit3DEngine(pScrn);
  	}
  
-@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	if (IS_R500_3D && ((pPriv->h - 1) & 0x800))
  	    txpitch |= R500_TXHEIGHT_11;
  
@@ -7771,7 +9024,7 @@
  	FINISH_ACCEL();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			R300_TX_MIN_FILTER_LINEAR |
  			R300_TX_MAG_FILTER_LINEAR);
  
@@ -7797,7 +9050,7 @@
  		FINISH_ACCEL();
  		txenable |= R300_TEX_1_ENABLE | R300_TEX_2_ENABLE;
  	}
-@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
  
@@ -7819,7 +9072,7 @@
  		FINISH_ACCEL();
  
  		/* Enable tex 1 */
-@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    }
  	}
  
@@ -7840,7 +9093,7 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	if (RADEONTilingEnabled(pScrn, pPixmap))
  	    colorpitch |= RADEON_COLOR_TILE_ENABLE;
  
@@ -7862,7 +9115,7 @@
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
  
-@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -7872,7 +9125,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
-@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -7898,7 +9151,7 @@
  
  		/* similar to r300 code. Note the big problem is that hardware constants
  		 * are 8 bits only, representing 0.0-1.0. We can get that up (using bias
-@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -7908,7 +9161,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -7917,7 +9170,7 @@
  
  		/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
-@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  		FINISH_ACCEL();
  	    }
  	    else {
@@ -7927,7 +9180,7 @@
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  
-@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
@@ -7936,7 +9189,7 @@
  
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			      R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    info->accel_state->texW[0] = 1;
  	    info->accel_state->texH[0] = 1;
  
@@ -7946,7 +9199,7 @@
  
  	    OUT_ACCEL_REG(RADEON_PP_CNTL,
  			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);
@@ -7957,10 +9210,11 @@
  	    OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
-diff -up xf86-video-ati-6.12.2/src/radeon_video.c.dave xf86-video-ati-6.12.2/src/radeon_video.c
---- xf86-video-ati-6.12.2/src/radeon_video.c.dave	2009-04-08 01:31:32.000000000 +1000
-+++ xf86-video-ati-6.12.2/src/radeon_video.c	2009-04-15 12:46:30.000000000 +1000
-@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+diff --git a/src/radeon_video.c b/src/radeon_video.c
+index 42aa036..bd6408d 100644
+--- a/src/radeon_video.c
++++ b/src/radeon_video.c
+@@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
  
@@ -7969,7 +9223,7 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -294,9 +294,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -297,9 +297,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
  	RADEONInitOffscreenImages(pScreen);
      }
  
@@ -7984,7 +9238,7 @@
  #endif
  	) {
  	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2197,7 +2200,7 @@ RADEONCopyData(
+@@ -2200,7 +2203,7 @@ RADEONCopyData(
  
  #ifdef XF86DRI
  
@@ -7993,9 +9247,10 @@
      {
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
-diff -up xf86-video-ati-6.12.2/src/radeon_video.h.dave xf86-video-ati-6.12.2/src/radeon_video.h
---- xf86-video-ati-6.12.2/src/radeon_video.h.dave	2009-04-08 01:31:53.000000000 +1000
-+++ xf86-video-ati-6.12.2/src/radeon_video.h	2009-04-15 12:46:30.000000000 +1000
+diff --git a/src/radeon_video.h b/src/radeon_video.h
+index 34fb07f..7b75ec3 100644
+--- a/src/radeon_video.h
++++ b/src/radeon_video.h
 @@ -121,6 +121,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- xorg-x11-drv-ati.spec	15 Apr 2009 11:35:43 -0000	1.177
+++ xorg-x11-drv-ati.spec	16 Apr 2009 08:18:34 -0000	1.178
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,7 +15,6 @@
 Source1:   radeon.xinf
 
 Patch1:     radeon-modeset.patch
-Patch2:	    radeon-modeset-zaphod.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
@@ -40,7 +39,6 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .modeset
-%patch2 -p1 -b .modeset-zaphod
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -74,6 +72,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 6.12.2-4
+- radeon-modeset.patch: fix stupid idle drawing corrupt since mmap cache
+
 * Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-3
 - radeon-modeset-zaphod.patch: fix zaphod under kms in theory
 


--- radeon-modeset-zaphod.patch DELETED ---



From kalev at fedoraproject.org  Thu Apr 16 08:25:46 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 16 Apr 2009 08:25:46 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel import.log, NONE, 1.1 mingw32-libp11.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416082546.79CC470127@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3089/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libp11.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libp11-0_2_4-1_fc11:HEAD:mingw32-libp11-0.2.4-1.fc11.src.rpm:1239870465


--- NEW FILE mingw32-libp11.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-libp11
Version:        0.2.4
Release:        1%{?dist}
Summary:        MingGW Windows libp11 library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.opensc-project.org/libp11
Source0:        http://www.opensc-project.org/files/libp11/libp11-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 49
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libltdl
BuildRequires:  mingw32-openssl
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
Libp11 is a library implementing a small layer on top of PKCS#11 API to
make using PKCS#11 implementations easier.

This is the MinGW cross-compiled Windows library.


%prep
%setup -q -n libp11-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove documentation from a wrong place.
# We install it with %doc instead.
rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libp11


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/README NEWS COPYING 
%{_mingw32_bindir}/libp11-0.dll
%{_mingw32_libdir}/libp11-0.dll.def
%{_mingw32_libdir}/libp11.dll.a
%{_mingw32_libdir}/libp11.la
%{_mingw32_libdir}/pkgconfig/*
%{_mingw32_includedir}/*


%changelog
* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:27:27 -0000	1.1
+++ .cvsignore	16 Apr 2009 08:25:16 -0000	1.2
@@ -0,0 +1 @@
+libp11-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:27:27 -0000	1.1
+++ sources	16 Apr 2009 08:25:16 -0000	1.2
@@ -0,0 +1 @@
+9e2c5cbececde245e2d2f535bd49ce35  libp11-0.2.4.tar.gz



From ingvar at fedoraproject.org  Thu Apr 16 08:32:27 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 16 Apr 2009 08:32:27 +0000 (UTC)
Subject: rpms/varnish/F-10 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 varnish.spec, 1.17, 1.18
Message-ID: <20090416083227.494E270127@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3937

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release. A bugfix release. No changes in ABI, API or config files.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Feb 2009 00:35:31 -0000	1.9
+++ .cvsignore	16 Apr 2009 08:31:56 -0000	1.10
@@ -1 +1 @@
-varnish-2.0.3.tar.gz
+varnish-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Feb 2009 00:35:31 -0000	1.9
+++ sources	16 Apr 2009 08:31:56 -0000	1.10
@@ -1 +1 @@
-4233ad2fc3d0c2fcf7bf399f6ccf50b2  varnish-2.0.3.tar.gz
+8044d59cb6d2ec6d09b7ae6033f06bbf  varnish-2.0.4.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-10/varnish.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- varnish.spec	13 Feb 2009 00:35:31 -0000	1.17
+++ varnish.spec	16 Apr 2009 08:31:56 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -64,12 +64,12 @@
 %setup -q
 #%setup -q -n varnish-cache
 
-%patch0 -p0
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
+%patch0 -p0
+
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
 	ppc64 | s390x | x86_64 | sparc64 )
@@ -235,6 +235,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
+  New upstream release 2.0.4 
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.3-1
   New upstream release 2.0.3. A bugfix and feature enhancement release
 



From rjones at fedoraproject.org  Thu Apr 16 08:37:16 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 16 Apr 2009 08:37:16 +0000 (UTC)
Subject: rpms/febootstrap/devel febootstrap.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416083716.16D9870127@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4919/devel

Modified Files:
	.cvsignore sources 
Added Files:
	febootstrap.spec import.log 
Log Message:
Initial import.



--- NEW FILE febootstrap.spec ---
Summary:     Bootstrap a new Fedora system (like debootstrap)
Name:        febootstrap
Version:     1.5
Release:     3%{?dist}
License:     GPLv2+
Group:       Development/Tools
URL:         http://et.redhat.com/~rjones/febootstrap/
Source0:     http://et.redhat.com/~rjones/febootstrap/files/%{name}-%{version}.tar.gz
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:   noarch

BuildRequires: /usr/bin/pod2man
BuildRequires: fakeroot >= 1.11
BuildRequires: fakechroot >= 2.9-20
BuildRequires: yum >= 3.2

Requires:    fakeroot >= 1.11
Requires:    fakechroot >= 2.9-20
Requires:    yum >= 3.2
Requires:    MAKEDEV
Requires:    util-linux-ng
Requires:    cpio
Requires:    upx

# These are suggestions.  However making them hard requirements
# pulls in far too much stuff.
#Requires:    qemu
#Requires:    filelight
#Requires:    baobab     # Not as nice as filelight.


%description
febootstrap is a Fedora equivalent to Debian's debootstrap.  You can
use it to create a basic Fedora filesystem, and build initramfs
(initrd.img) or filesystem images.

febootstrap also includes a separate tool to minimize filesystems by
removing unneeded locales, documentation etc.

The main difference from other appliance building tools is that this
one doesn't need to be run as root.


%prep
%setup -q


%build
%configure
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Clean up the examples/ directory which will get installed in %doc.
# In this case I don't want the scripts to be executable because
# people should read them carefully before running them.
rm examples/Makefile*
chmod -x examples/*.sh


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README examples
%{_bindir}/febootstrap
%{_bindir}/febootstrap-run
%{_bindir}/febootstrap-minimize
%{_bindir}/febootstrap-to-initramfs
%{_mandir}/man8/febootstrap.8*
%{_mandir}/man8/febootstrap-run.8*
%{_mandir}/man8/febootstrap-minimize.8*
%{_mandir}/man8/febootstrap-to-initramfs.8*


%changelog
* Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-3
- Configure script has (unnecessary) BuildRequires on fakeroot,
  fakechroot, yum.

* Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-2
- Initial build for Fedora.


--- NEW FILE import.log ---
febootstrap-1_5-3_fc11:HEAD:febootstrap-1.5-3.fc11.src.rpm:1239870982


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:31:11 -0000	1.1
+++ .cvsignore	16 Apr 2009 08:36:45 -0000	1.2
@@ -0,0 +1 @@
+febootstrap-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:31:11 -0000	1.1
+++ sources	16 Apr 2009 08:36:45 -0000	1.2
@@ -0,0 +1 @@
+3d78fdaf544ba885415e6d366ea9b7d0  febootstrap-1.5.tar.gz



From rjones at fedoraproject.org  Thu Apr 16 08:38:01 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 16 Apr 2009 08:38:01 +0000 (UTC)
Subject: rpms/febootstrap/F-10 febootstrap.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416083801.225C570127@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5291/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	febootstrap.spec import.log 
Log Message:
Initial import.



--- NEW FILE febootstrap.spec ---
Summary:     Bootstrap a new Fedora system (like debootstrap)
Name:        febootstrap
Version:     1.5
Release:     3%{?dist}
License:     GPLv2+
Group:       Development/Tools
URL:         http://et.redhat.com/~rjones/febootstrap/
Source0:     http://et.redhat.com/~rjones/febootstrap/files/%{name}-%{version}.tar.gz
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:   noarch

BuildRequires: /usr/bin/pod2man
BuildRequires: fakeroot >= 1.11
BuildRequires: fakechroot >= 2.9-20
BuildRequires: yum >= 3.2

Requires:    fakeroot >= 1.11
Requires:    fakechroot >= 2.9-20
Requires:    yum >= 3.2
Requires:    MAKEDEV
Requires:    util-linux-ng
Requires:    cpio
Requires:    upx

# These are suggestions.  However making them hard requirements
# pulls in far too much stuff.
#Requires:    qemu
#Requires:    filelight
#Requires:    baobab     # Not as nice as filelight.


%description
febootstrap is a Fedora equivalent to Debian's debootstrap.  You can
use it to create a basic Fedora filesystem, and build initramfs
(initrd.img) or filesystem images.

febootstrap also includes a separate tool to minimize filesystems by
removing unneeded locales, documentation etc.

The main difference from other appliance building tools is that this
one doesn't need to be run as root.


%prep
%setup -q


%build
%configure
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Clean up the examples/ directory which will get installed in %doc.
# In this case I don't want the scripts to be executable because
# people should read them carefully before running them.
rm examples/Makefile*
chmod -x examples/*.sh


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README examples
%{_bindir}/febootstrap
%{_bindir}/febootstrap-run
%{_bindir}/febootstrap-minimize
%{_bindir}/febootstrap-to-initramfs
%{_mandir}/man8/febootstrap.8*
%{_mandir}/man8/febootstrap-run.8*
%{_mandir}/man8/febootstrap-minimize.8*
%{_mandir}/man8/febootstrap-to-initramfs.8*


%changelog
* Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-3
- Configure script has (unnecessary) BuildRequires on fakeroot,
  fakechroot, yum.

* Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-2
- Initial build for Fedora.


--- NEW FILE import.log ---
febootstrap-1_5-3_fc11:F-10:febootstrap-1.5-3.fc11.src.rpm:1239871031


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:31:11 -0000	1.1
+++ .cvsignore	16 Apr 2009 08:37:30 -0000	1.2
@@ -0,0 +1 @@
+febootstrap-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:31:11 -0000	1.1
+++ sources	16 Apr 2009 08:37:30 -0000	1.2
@@ -0,0 +1 @@
+3d78fdaf544ba885415e6d366ea9b7d0  febootstrap-1.5.tar.gz



From rjones at fedoraproject.org  Thu Apr 16 08:38:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 16 Apr 2009 08:38:05 +0000 (UTC)
Subject: rpms/febootstrap/F-11 febootstrap.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416083805.9134970127@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5334/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	febootstrap.spec import.log 
Log Message:
Initial import.



--- NEW FILE febootstrap.spec ---
Summary:     Bootstrap a new Fedora system (like debootstrap)
Name:        febootstrap
Version:     1.5
Release:     3%{?dist}
License:     GPLv2+
Group:       Development/Tools
URL:         http://et.redhat.com/~rjones/febootstrap/
Source0:     http://et.redhat.com/~rjones/febootstrap/files/%{name}-%{version}.tar.gz
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:   noarch

BuildRequires: /usr/bin/pod2man
BuildRequires: fakeroot >= 1.11
BuildRequires: fakechroot >= 2.9-20
BuildRequires: yum >= 3.2

Requires:    fakeroot >= 1.11
Requires:    fakechroot >= 2.9-20
Requires:    yum >= 3.2
Requires:    MAKEDEV
Requires:    util-linux-ng
Requires:    cpio
Requires:    upx

# These are suggestions.  However making them hard requirements
# pulls in far too much stuff.
#Requires:    qemu
#Requires:    filelight
#Requires:    baobab     # Not as nice as filelight.


%description
febootstrap is a Fedora equivalent to Debian's debootstrap.  You can
use it to create a basic Fedora filesystem, and build initramfs
(initrd.img) or filesystem images.

febootstrap also includes a separate tool to minimize filesystems by
removing unneeded locales, documentation etc.

The main difference from other appliance building tools is that this
one doesn't need to be run as root.


%prep
%setup -q


%build
%configure
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Clean up the examples/ directory which will get installed in %doc.
# In this case I don't want the scripts to be executable because
# people should read them carefully before running them.
rm examples/Makefile*
chmod -x examples/*.sh


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README examples
%{_bindir}/febootstrap
%{_bindir}/febootstrap-run
%{_bindir}/febootstrap-minimize
%{_bindir}/febootstrap-to-initramfs
%{_mandir}/man8/febootstrap.8*
%{_mandir}/man8/febootstrap-run.8*
%{_mandir}/man8/febootstrap-minimize.8*
%{_mandir}/man8/febootstrap-to-initramfs.8*


%changelog
* Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-3
- Configure script has (unnecessary) BuildRequires on fakeroot,
  fakechroot, yum.

* Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-2
- Initial build for Fedora.


--- NEW FILE import.log ---
febootstrap-1_5-3_fc11:F-11:febootstrap-1.5-3.fc11.src.rpm:1239871030


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:31:11 -0000	1.1
+++ .cvsignore	16 Apr 2009 08:37:35 -0000	1.2
@@ -0,0 +1 @@
+febootstrap-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:31:11 -0000	1.1
+++ sources	16 Apr 2009 08:37:35 -0000	1.2
@@ -0,0 +1 @@
+3d78fdaf544ba885415e6d366ea9b7d0  febootstrap-1.5.tar.gz



From airlied at fedoraproject.org  Thu Apr 16 08:39:28 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 16 Apr 2009 08:39:28 +0000 (UTC)
Subject: rpms/libdrm/F-11 libdrm-radeon.patch,1.8,1.9 libdrm.spec,1.74,1.75
Message-ID: <20090416083928.7DB0B70127@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5791

Modified Files:
	libdrm-radeon.patch libdrm.spec 
Log Message:
* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 2.4.6-5
- libdrm-radeon: fix wait idle


libdrm-radeon.patch:

Index: libdrm-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/libdrm-radeon.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdrm-radeon.patch	6 Apr 2009 05:41:36 -0000	1.8
+++ libdrm-radeon.patch	16 Apr 2009 08:39:28 -0000	1.9
@@ -484,7 +484,7 @@
 +    do {
 +        ret = drmCommandWriteRead(bo->bom->fd, DRM_RADEON_GEM_WAIT_IDLE,
 +                                  &args, sizeof(args));
-+    } while (ret == -EAGAIN);
++    } while (ret == -EBUSY);
 +    return ret;
 +}
 +


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/libdrm.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libdrm.spec	10 Apr 2009 22:25:21 -0000	1.74
+++ libdrm.spec	16 Apr 2009 08:39:28 -0000	1.75
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -109,6 +109,9 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 2.4.6-5
+- libdrm-radeon: fix wait idle
+
 * Sat Apr 11 2009 Dave Airlie <airlied at redhat.com> 2.4.6-4
 - libdrm-2.4.7-revert-bong.patch - revert connector "speedups"
 



From caolanm at fedoraproject.org  Thu Apr 16 08:42:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 08:42:44 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, 1.1, 1.2
Message-ID: <20090416084244.DB41670127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7027/F-11

Modified Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
Log Message:
use better upstream fix

openoffice.org-3.1.0.ooo100991.pyuno-fix.patch:

Index: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.ooo100991.pyuno-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	9 Apr 2009 14:52:54 -0000	1.1
+++ openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	16 Apr 2009 08:42:14 -0000	1.2
@@ -1,11 +1,120 @@
 --- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
 +++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
-@@ -762,7 +762,7 @@
-             
-             log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) )
+@@ -5,6 +5,7 @@
+ import os
+ import imp
+ import time
++import platform
+ 
+ class LogLevel:
+     NONE = 0
+@@ -126,7 +127,67 @@
+            break
+     return code.value
+     
++def toIniName( str ):
++    if( platform.system() == "Windows" ):
++        return str + ".ini"
++    return str + "rc"
++
++
++""" definition: storageURI is the system dependent, absolute file url, where the script is stored on disk
++                scriptURI is the system independent uri
++"""
++class MyUriHelper:
++
++    def __init__( self, ctx, location ):
++        self.s_UriMap = \
++        { "share" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +  toIniName( "bootstrap") + "::BaseInstallation}/share/Scripts/python" , \
++          "share:uno_packages" : "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
++          "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
++          "user:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" } 
++        self.m_uriRefFac = ctx.ServiceManager.createInstanceWithContext("com.sun.star.uri.UriReferenceFactory",ctx)
++        if location.startswith( "vnd.sun.star.tdoc" ):
++            self.m_baseUri = location + "/Scripts/python"
++            self.m_scriptUriLocation = "document"
++        else:
++            self.m_baseUri = expandUri( self.s_UriMap[location] )
++            self.m_scriptUriLocation = location
++        log.isDebugLevel() and log.debug( "initialized urihelper with baseUri="+self.m_baseUri + ",m_scriptUriLocation="+self.m_scriptUriLocation )
++        
++    def getRootStorageURI( self ):
++        return self.m_baseUri
+     
++    def getStorageURI( self, scriptURI ):
++        return self.scriptURI2StorageUri(scriptURI)
++
++    def getScriptURI( self, storageURI ):
++        return self.storageURI2ScriptUri(storageURI)
++
++    def storageURI2ScriptUri( self, storageURI ):
++        if not storageURI.startswith( self.m_baseUri ):
++            message = "pythonscript: storage uri '" + storageURI + "' not in base uri '" + self.m_baseUri + "'"
++            log.isDebugLevel() and log.debug( message )
++            raise RuntimeException( message )
++
++        ret = "vnd.sun.star.script:" + \
++              storageURI[len(self.m_baseUri)+1:].replace("/","|") + \
++              "?language=" + LANGUAGENAME + "&location=" + self.m_scriptUriLocation
++        log.isDebugLevel() and log.debug( "converting storageURI="+storageURI + " to scriptURI=" + ret )
++        return ret
++    
++    def scriptURI2StorageUri( self, scriptURI ):
++        try:
++            myUri = self.m_uriRefFac.parse(scriptURI)
++            ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
++            log.isDebugLevel() and log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret )
++            return ret
++        except UnoException, e:
++            log.error( "error during converting scriptURI="+scriptURI + ": " + e.Message)
++            raise RuntimeException( "pythonscript:scriptURI2StorageUri: " +e.getMessage(), None )
++        except Exception, e:
++            log.error( "error during converting scriptURI="+scriptURI + ": " + str(e))
++            raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + str(e), None )
++        
++
+ class ModuleEntry:
+     def __init__( self, lastRead, module ):
+         self.lastRead = lastRead
+@@ -342,15 +403,20 @@
+ 
+     def getPropertyValue( self, name ):
+         ret = None
+-        if name == "URI":
+-            ret = self.provCtx.uriHelper.getScriptURI(
+-                self.provCtx.getPersistentUrlFromStorageUrl( self.uri + "$" + self.funcName ) )
+-        elif name == "Description":
+-            ret = getattr( self.func, "__doc__", None )
+-        elif name == "Editable" and ENABLE_EDIT_DIALOG:
+-            ret = not self.provCtx.sfa.isReadOnly( self.uri )
++        try:
++            if name == "URI":
++                ret = self.provCtx.uriHelper.getScriptURI(
++                    self.provCtx.getPersistentUrlFromStorageUrl( self.uri + "$" + self.funcName ) )
++            elif name == "Description":
++                ret = getattr( self.func, "__doc__", None )
++            elif name == "Editable" and ENABLE_EDIT_DIALOG:
++                ret = not self.provCtx.sfa.isReadOnly( self.uri )
          
--            rootUrl = expandUri( urlHelper.getRootStorageURI() )
-+            rootUrl = urlHelper.getRootStorageURI()
-             log.isDebugLevel() and log.debug( storageType + " transformed to " + rootUrl )
+-        log.isDebugLevel() and log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) )
++            log.isDebugLevel() and log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) )
++        except Exception,e:
++            log.error( "ScriptBrowseNode.getPropertyValue error " + lastException2String())
++            raise
++                                              
+         return ret
+     def setPropertyValue( self, name, value ):
+         log.isDebugLevel() and log.debug( "ScriptBrowseNode.setPropertyValue called " + name + "=" +str(value ) )
+@@ -757,9 +823,9 @@
+         isPackage = storageType.endswith( ":uno_packages" )
  
-             ucbService = "com.sun.star.ucb.SimpleFileAccess"
+         try:
+-            urlHelper = ctx.ServiceManager.createInstanceWithArgumentsAndContext(
+-                "com.sun.star.script.provider.ScriptURIHelper", (LANGUAGENAME, storageType), ctx)
+-            
++#            urlHelper = ctx.ServiceManager.createInstanceWithArgumentsAndContext(
++#                "com.sun.star.script.provider.ScriptURIHelper", (LANGUAGENAME, storageType), ctx)
++            urlHelper = MyUriHelper( ctx, storageType )
+             log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) )
+         
+             rootUrl = expandUri( urlHelper.getRootStorageURI() )



From caolanm at fedoraproject.org  Thu Apr 16 08:42:45 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 08:42:45 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, 1.1,
	1.2 openoffice.org-simple-crash_report.sh, 1.11, 1.12
Message-ID: <20090416084245.21AD670137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7027/devel

Modified Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
	openoffice.org-simple-crash_report.sh 
Log Message:
use better upstream fix

openoffice.org-3.1.0.ooo100991.pyuno-fix.patch:

Index: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo100991.pyuno-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	9 Apr 2009 14:52:54 -0000	1.1
+++ openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	16 Apr 2009 08:42:14 -0000	1.2
@@ -1,11 +1,120 @@
 --- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
 +++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
-@@ -762,7 +762,7 @@
-             
-             log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) )
+@@ -5,6 +5,7 @@
+ import os
+ import imp
+ import time
++import platform
+ 
+ class LogLevel:
+     NONE = 0
+@@ -126,7 +127,67 @@
+            break
+     return code.value
+     
++def toIniName( str ):
++    if( platform.system() == "Windows" ):
++        return str + ".ini"
++    return str + "rc"
++
++
++""" definition: storageURI is the system dependent, absolute file url, where the script is stored on disk
++                scriptURI is the system independent uri
++"""
++class MyUriHelper:
++
++    def __init__( self, ctx, location ):
++        self.s_UriMap = \
++        { "share" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +  toIniName( "bootstrap") + "::BaseInstallation}/share/Scripts/python" , \
++          "share:uno_packages" : "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
++          "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
++          "user:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" } 
++        self.m_uriRefFac = ctx.ServiceManager.createInstanceWithContext("com.sun.star.uri.UriReferenceFactory",ctx)
++        if location.startswith( "vnd.sun.star.tdoc" ):
++            self.m_baseUri = location + "/Scripts/python"
++            self.m_scriptUriLocation = "document"
++        else:
++            self.m_baseUri = expandUri( self.s_UriMap[location] )
++            self.m_scriptUriLocation = location
++        log.isDebugLevel() and log.debug( "initialized urihelper with baseUri="+self.m_baseUri + ",m_scriptUriLocation="+self.m_scriptUriLocation )
++        
++    def getRootStorageURI( self ):
++        return self.m_baseUri
+     
++    def getStorageURI( self, scriptURI ):
++        return self.scriptURI2StorageUri(scriptURI)
++
++    def getScriptURI( self, storageURI ):
++        return self.storageURI2ScriptUri(storageURI)
++
++    def storageURI2ScriptUri( self, storageURI ):
++        if not storageURI.startswith( self.m_baseUri ):
++            message = "pythonscript: storage uri '" + storageURI + "' not in base uri '" + self.m_baseUri + "'"
++            log.isDebugLevel() and log.debug( message )
++            raise RuntimeException( message )
++
++        ret = "vnd.sun.star.script:" + \
++              storageURI[len(self.m_baseUri)+1:].replace("/","|") + \
++              "?language=" + LANGUAGENAME + "&location=" + self.m_scriptUriLocation
++        log.isDebugLevel() and log.debug( "converting storageURI="+storageURI + " to scriptURI=" + ret )
++        return ret
++    
++    def scriptURI2StorageUri( self, scriptURI ):
++        try:
++            myUri = self.m_uriRefFac.parse(scriptURI)
++            ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
++            log.isDebugLevel() and log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret )
++            return ret
++        except UnoException, e:
++            log.error( "error during converting scriptURI="+scriptURI + ": " + e.Message)
++            raise RuntimeException( "pythonscript:scriptURI2StorageUri: " +e.getMessage(), None )
++        except Exception, e:
++            log.error( "error during converting scriptURI="+scriptURI + ": " + str(e))
++            raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + str(e), None )
++        
++
+ class ModuleEntry:
+     def __init__( self, lastRead, module ):
+         self.lastRead = lastRead
+@@ -342,15 +403,20 @@
+ 
+     def getPropertyValue( self, name ):
+         ret = None
+-        if name == "URI":
+-            ret = self.provCtx.uriHelper.getScriptURI(
+-                self.provCtx.getPersistentUrlFromStorageUrl( self.uri + "$" + self.funcName ) )
+-        elif name == "Description":
+-            ret = getattr( self.func, "__doc__", None )
+-        elif name == "Editable" and ENABLE_EDIT_DIALOG:
+-            ret = not self.provCtx.sfa.isReadOnly( self.uri )
++        try:
++            if name == "URI":
++                ret = self.provCtx.uriHelper.getScriptURI(
++                    self.provCtx.getPersistentUrlFromStorageUrl( self.uri + "$" + self.funcName ) )
++            elif name == "Description":
++                ret = getattr( self.func, "__doc__", None )
++            elif name == "Editable" and ENABLE_EDIT_DIALOG:
++                ret = not self.provCtx.sfa.isReadOnly( self.uri )
          
--            rootUrl = expandUri( urlHelper.getRootStorageURI() )
-+            rootUrl = urlHelper.getRootStorageURI()
-             log.isDebugLevel() and log.debug( storageType + " transformed to " + rootUrl )
+-        log.isDebugLevel() and log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) )
++            log.isDebugLevel() and log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) )
++        except Exception,e:
++            log.error( "ScriptBrowseNode.getPropertyValue error " + lastException2String())
++            raise
++                                              
+         return ret
+     def setPropertyValue( self, name, value ):
+         log.isDebugLevel() and log.debug( "ScriptBrowseNode.setPropertyValue called " + name + "=" +str(value ) )
+@@ -757,9 +823,9 @@
+         isPackage = storageType.endswith( ":uno_packages" )
  
-             ucbService = "com.sun.star.ucb.SimpleFileAccess"
+         try:
+-            urlHelper = ctx.ServiceManager.createInstanceWithArgumentsAndContext(
+-                "com.sun.star.script.provider.ScriptURIHelper", (LANGUAGENAME, storageType), ctx)
+-            
++#            urlHelper = ctx.ServiceManager.createInstanceWithArgumentsAndContext(
++#                "com.sun.star.script.provider.ScriptURIHelper", (LANGUAGENAME, storageType), ctx)
++            urlHelper = MyUriHelper( ctx, storageType )
+             log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) )
+         
+             rootUrl = expandUri( urlHelper.getRootStorageURI() )


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-simple-crash_report.sh	17 Sep 2008 22:04:13 -0000	1.11
+++ openoffice.org-simple-crash_report.sh	16 Apr 2009 08:42:14 -0000	1.12
@@ -14,12 +14,14 @@
 echo "(VI)   kernel is:" `uname -s -r -v -m -p -i` >> $filename
 echo "(VII)  OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
 echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
+echo "(IX)   gtk theme is:" `gconftool-2 -g "/desktop/gnome/interface/gtk_theme"` >> $filename
+echo "(X)    icon theme is:" `gconftool-2 -g "/desktop/gnome/interface/icon_theme"` >> $filename
 if [ -e /etc/fedora-release ]; then
-echo "(IX)   fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(XI)   fedora release is:" `cat /etc/fedora-release` >> $filename
 elif [ -e /etc/redhat-release ]; then
-echo "(IX)   redhat release is:" `cat /etc/redhat-release` >> $filename
+echo "(XI)   redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
-echo "(X)    LANG is: $LANG" >> $filename
+echo "(XII)  LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename



From rjones at fedoraproject.org  Thu Apr 16 08:48:54 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 16 Apr 2009 08:48:54 +0000 (UTC)
Subject: rpms/febootstrap/F-10 febootstrap.spec,1.1,1.2
Message-ID: <20090416084854.1B36570127@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7615

Modified Files:
	febootstrap.spec 
Log Message:
Downgrade version of fakechroot required (just for F-10).


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/febootstrap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- febootstrap.spec	16 Apr 2009 08:37:30 -0000	1.1
+++ febootstrap.spec	16 Apr 2009 08:48:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
 Version:     1.5
-Release:     3%{?dist}
+Release:     3%{?dist}.1
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -11,7 +11,7 @@
 
 BuildRequires: /usr/bin/pod2man
 BuildRequires: fakeroot >= 1.11
-BuildRequires: fakechroot >= 2.9-20
+BuildRequires: fakechroot >= 2.9-19
 BuildRequires: yum >= 3.2
 
 Requires:    fakeroot >= 1.11
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Richard Jones <rjones at redhat.com> - 1.5-3.fc10.1
+- Downgrade version of fakechroot required (just for F-10).
+
 * Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-3
 - Configure script has (unnecessary) BuildRequires on fakeroot,
   fakechroot, yum.



From alexl at fedoraproject.org  Thu Apr 16 08:48:51 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Thu, 16 Apr 2009 08:48:51 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-2.26.2-icon-whitespace.patch, NONE,
	1.1 nautilus.spec, 1.270, 1.271 sources, 1.99, 1.100
Message-ID: <20090416084851.D54A270127@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7592

Modified Files:
	nautilus.spec sources 
Added Files:
	nautilus-2.26.2-icon-whitespace.patch 
Log Message:
* Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
- Fix whitespace on the right in icon view when zooming


nautilus-2.26.2-icon-whitespace.patch:

--- NEW FILE nautilus-2.26.2-icon-whitespace.patch ---
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c	(revision 15183)
+++ libnautilus-private/nautilus-icon-container.c	(revision 15184)
@@ -1033,9 +1033,9 @@
 	GtkAllocation *allocation;
 	gboolean reset_scroll_region;
 
+	pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
+
 	if (nautilus_icon_container_get_is_fixed_size (container)) {
-		pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
-
 		/* Set the scroll region to the size of the container allocation */
 		allocation = &GTK_WIDGET (container)->allocation;
 		eel_canvas_set_scroll_region
@@ -1090,7 +1090,7 @@
 	if (nautilus_icon_container_is_auto_layout (container)) {
 		allocation = &GTK_WIDGET (container)->allocation;
 		x1 = MIN (x1, 0);
-		x2 = MAX (x2, allocation->width);
+		x2 = MAX (x2, allocation->width / pixels_per_unit);
 		y1 = 0;
 	} else {
 		/* Otherwise we add the padding that is at the start of the


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- nautilus.spec	13 Apr 2009 19:50:18 -0000	1.270
+++ nautilus.spec	16 Apr 2009 08:48:21 -0000	1.271
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# From svn (rev 15184)
+Patch18:	nautilus-2.26.2-icon-whitespace.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -124,6 +127,7 @@
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p0 -b .whitespace
 
 %build
 
@@ -261,6 +265,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
+- Fix whitespace on the right in icon view when zooming
+
 * Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-1
 - Update to 2.26.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	13 Apr 2009 19:50:18 -0000	1.99
+++ sources	16 Apr 2009 08:48:21 -0000	1.100
@@ -1,2 +1 @@
-5d75f5de2806e9003e36a4613866b8d1  nautilus-2.26.1.tar.bz2
 6b9292ed9dde8b5f86a3b6df1422d5f8  nautilus-2.26.2.tar.bz2



From kalev at fedoraproject.org  Thu Apr 16 09:02:32 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 16 Apr 2009 09:02:32 +0000 (UTC)
Subject: rpms/mingw32-libp11/F-11 import.log, NONE, 1.1 mingw32-libp11.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416090232.D2C3F70127@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9009/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libp11.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libp11-0_2_4-1_fc11:F-11:mingw32-libp11-0.2.4-1.fc11.src.rpm:1239872788


--- NEW FILE mingw32-libp11.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-libp11
Version:        0.2.4
Release:        1%{?dist}
Summary:        MingGW Windows libp11 library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.opensc-project.org/libp11
Source0:        http://www.opensc-project.org/files/libp11/libp11-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 49
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libltdl
BuildRequires:  mingw32-openssl
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
Libp11 is a library implementing a small layer on top of PKCS#11 API to
make using PKCS#11 implementations easier.

This is the MinGW cross-compiled Windows library.


%prep
%setup -q -n libp11-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove documentation from a wrong place.
# We install it with %doc instead.
rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libp11


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/README NEWS COPYING 
%{_mingw32_bindir}/libp11-0.dll
%{_mingw32_libdir}/libp11-0.dll.def
%{_mingw32_libdir}/libp11.dll.a
%{_mingw32_libdir}/libp11.la
%{_mingw32_libdir}/pkgconfig/*
%{_mingw32_includedir}/*


%changelog
* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:27:27 -0000	1.1
+++ .cvsignore	16 Apr 2009 09:02:02 -0000	1.2
@@ -0,0 +1 @@
+libp11-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:27:27 -0000	1.1
+++ sources	16 Apr 2009 09:02:02 -0000	1.2
@@ -0,0 +1 @@
+9e2c5cbececde245e2d2f535bd49ce35  libp11-0.2.4.tar.gz



From kalev at fedoraproject.org  Thu Apr 16 09:05:26 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 16 Apr 2009 09:05:26 +0000 (UTC)
Subject: rpms/mingw32-libp11/F-10 import.log, NONE, 1.1 mingw32-libp11.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416090526.59C7770127@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9498/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libp11.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libp11-0_2_4-1_fc10:F-10:mingw32-libp11-0.2.4-1.fc10.src.rpm:1239872961


--- NEW FILE mingw32-libp11.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-libp11
Version:        0.2.4
Release:        1%{?dist}
Summary:        MingGW Windows libp11 library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.opensc-project.org/libp11
Source0:        http://www.opensc-project.org/files/libp11/libp11-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libltdl
BuildRequires:  mingw32-openssl
BuildRequires:  pkgconfig

Requires:       pkgconfig


%description
Libp11 is a library implementing a small layer on top of PKCS#11 API to
make using PKCS#11 implementations easier.

This is the MinGW cross-compiled Windows library.


%prep
%setup -q -n libp11-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove documentation from a wrong place.
# We install it with %doc instead.
rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libp11


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/README NEWS COPYING 
%{_mingw32_bindir}/libp11-0.dll
%{_mingw32_libdir}/libp11-0.dll.def
%{_mingw32_libdir}/libp11.dll.a
%{_mingw32_libdir}/libp11.la
%{_mingw32_libdir}/pkgconfig/*
%{_mingw32_includedir}/*


%changelog
* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:27:27 -0000	1.1
+++ .cvsignore	16 Apr 2009 09:04:55 -0000	1.2
@@ -0,0 +1 @@
+libp11-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:27:27 -0000	1.1
+++ sources	16 Apr 2009 09:04:55 -0000	1.2
@@ -0,0 +1 @@
+9e2c5cbececde245e2d2f535bd49ce35  libp11-0.2.4.tar.gz



From karsten at fedoraproject.org  Thu Apr 16 09:06:31 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:31 +0000 (UTC)
Subject: rpms/ocaml-augeas/devel ocaml-augeas.spec,1.4,1.5
Message-ID: <20090416090631.16FC570127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-augeas/devel

Modified Files:
	ocaml-augeas.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-augeas.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-augeas/devel/ocaml-augeas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-augeas.spec	26 Feb 2009 06:45:38 -0000	1.4
+++ ocaml-augeas.spec	16 Apr 2009 09:06:00 -0000	1.5
@@ -11,6 +11,7 @@
 URL:            http://et.redhat.com/~rjones/augeas/files/
 Source0:        http://et.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.09.0
 BuildRequires:  ocaml-findlib-devel
@@ -94,6 +95,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:31 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:31 +0000 (UTC)
Subject: rpms/ocaml-bisect/devel ocaml-bisect.spec,1.4,1.5
Message-ID: <20090416090631.5AB2E70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-bisect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-bisect/devel

Modified Files:
	ocaml-bisect.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-bisect.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-bisect/devel/ocaml-bisect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-bisect.spec	26 Feb 2009 06:46:32 -0000	1.4
+++ ocaml-bisect.spec	16 Apr 2009 09:06:01 -0000	1.5
@@ -14,6 +14,7 @@
 URL:            http://bisect.x9c.fr/
 Source0:        http://bisect.x9c.fr/distrib/bisect-%{mainversion}-%{subversion}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         bisect-1.0-alpha-nojava.patch
 
@@ -96,6 +97,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.4.alpha
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:31 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:31 +0000 (UTC)
Subject: rpms/ocaml-bitstring/devel ocaml-bitstring.spec,1.10,1.11
Message-ID: <20090416090631.98C7A70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-bitstring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-bitstring/devel

Modified Files:
	ocaml-bitstring.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-bitstring.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-bitstring/devel/ocaml-bitstring.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-bitstring.spec	26 Feb 2009 06:47:27 -0000	1.10
+++ ocaml-bitstring.spec	16 Apr 2009 09:06:01 -0000	1.11
@@ -22,6 +22,7 @@
 Patch1:         ocaml-bitstring-2.0.0-dynlink.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-findlib-devel
@@ -184,6 +185,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:31 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:31 +0000 (UTC)
Subject: rpms/ocaml-cairo/devel ocaml-cairo.spec,1.9,1.10
Message-ID: <20090416090631.D8AE770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-cairo/devel

Modified Files:
	ocaml-cairo.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-cairo.spec	26 Feb 2009 06:48:22 -0000	1.9
+++ ocaml-cairo.spec	16 Apr 2009 09:06:01 -0000	1.10
@@ -22,6 +22,7 @@
 Source0:        ocaml-cairo-%{version}.tar.gz
 Source1:        ocaml-cairo-META
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -118,6 +119,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.cvs20080301-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:32 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:32 +0000 (UTC)
Subject: rpms/ocaml-calendar/devel ocaml-calendar.spec,1.11,1.12
Message-ID: <20090416090632.1A44F70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-calendar/devel

Modified Files:
	ocaml-calendar.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ocaml-calendar.spec	26 Feb 2009 06:49:20 -0000	1.11
+++ ocaml-calendar.spec	16 Apr 2009 09:06:01 -0000	1.12
@@ -11,6 +11,7 @@
 URL:            http://www.lri.fr/~signoles/prog.en.html#calendar
 Source0:        http://www.lri.fr/~signoles/prog/calendar/calendar-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:32 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:32 +0000 (UTC)
Subject: rpms/ocaml-camlidl/devel ocaml-camlidl.spec,1.6,1.7
Message-ID: <20090416090632.655C770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-camlidl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-camlidl/devel

Modified Files:
	ocaml-camlidl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-camlidl.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-camlidl/devel/ocaml-camlidl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-camlidl.spec	26 Feb 2009 06:50:20 -0000	1.6
+++ ocaml-camlidl.spec	16 Apr 2009 09:06:02 -0000	1.7
@@ -12,6 +12,7 @@
 Source0:        http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.tar.gz
 Source1:        http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.doc.pdf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
@@ -99,6 +100,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:32 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:32 +0000 (UTC)
Subject: rpms/ocaml-camlimages/devel ocaml-camlimages.spec,1.14,1.15
Message-ID: <20090416090632.B57B170127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-camlimages/devel

Modified Files:
	ocaml-camlimages.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ocaml-camlimages.spec	26 Feb 2009 06:51:27 -0000	1.14
+++ ocaml-camlimages.spec	16 Apr 2009 09:06:02 -0000	1.15
@@ -13,6 +13,7 @@
 Source0:        http://gallium.inria.fr/camlimages/camlimages-%{version}.tar.gz
 Source1:        camlimages-2.2.0-htmlref.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         camlimages-3.0.1-display-module.patch
 
@@ -107,6 +108,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:33 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:33 +0000 (UTC)
Subject: rpms/ocaml-camomile/devel ocaml-camomile.spec,1.6,1.7
Message-ID: <20090416090633.35C9B70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-camomile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-camomile/devel

Modified Files:
	ocaml-camomile.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-camomile.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-camomile/devel/ocaml-camomile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-camomile.spec	26 Feb 2009 06:53:21 -0000	1.6
+++ ocaml-camomile.spec	16 Apr 2009 09:06:03 -0000	1.7
@@ -14,7 +14,7 @@
 URL:            http://sourceforge.net/projects/camomile/
 Source0:        http://downloads.sourceforge.net/camomile/camomile-0.7.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 sparc64 s390 s390x
 
 BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc, ocaml-camlp4-devel
 
@@ -114,6 +114,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:33 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:33 +0000 (UTC)
Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.8,1.9
Message-ID: <20090416090633.777A070127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-cil/devel

Modified Files:
	ocaml-cil.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-cil.spec	26 Feb 2009 06:54:17 -0000	1.8
+++ ocaml-cil.spec	16 Apr 2009 09:06:03 -0000	1.9
@@ -16,6 +16,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 ExcludeArch:    ppc
+ExcludeArch:    sparc64
+ExcludeArch:    s390 s390x
 
 Patch0:         cil-1.3.6-output-obj.patch
 
@@ -193,6 +195,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:32 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:32 +0000 (UTC)
Subject: rpms/ocaml-camlp5/devel ocaml-camlp5.spec,1.7,1.8
Message-ID: <20090416090632.EDD2F70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-camlp5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-camlp5/devel

Modified Files:
	ocaml-camlp5.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-camlp5.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-camlp5/devel/ocaml-camlp5.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-camlp5.spec	26 Feb 2009 06:52:26 -0000	1.7
+++ ocaml-camlp5.spec	16 Apr 2009 09:06:02 -0000	1.8
@@ -12,6 +12,7 @@
 Source0:        http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz
 Source1:        camlp5-META
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.1, ocaml-ocamldoc
 
@@ -99,6 +100,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:33 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:33 +0000 (UTC)
Subject: rpms/ocaml-cmigrep/devel ocaml-cmigrep.spec,1.9,1.10
Message-ID: <20090416090633.CBEFE70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-cmigrep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-cmigrep/devel

Modified Files:
	ocaml-cmigrep.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-cmigrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-cmigrep/devel/ocaml-cmigrep.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-cmigrep.spec	26 Feb 2009 06:55:15 -0000	1.9
+++ ocaml-cmigrep.spec	16 Apr 2009 09:06:03 -0000	1.10
@@ -17,6 +17,7 @@
 Source0:        http://homepage.mac.com/letaris/cmigrep-%{version}.tar.bz2
 Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         cmigrep-make-without-godi-debian.patch
 Patch1:         ocaml-3.11.0-rpath.patch
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:34 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:34 +0000 (UTC)
Subject: rpms/ocaml-cryptokit/devel ocaml-cryptokit.spec,1.7,1.8
Message-ID: <20090416090634.3902670127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-cryptokit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-cryptokit/devel

Modified Files:
	ocaml-cryptokit.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-cryptokit.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-cryptokit/devel/ocaml-cryptokit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-cryptokit.spec	26 Feb 2009 06:56:07 -0000	1.7
+++ ocaml-cryptokit.spec	16 Apr 2009 09:06:03 -0000	1.8
@@ -11,6 +11,7 @@
 URL:            http://pauillac.inria.fr/~xleroy/software.html
 Source0:        http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Source1:        cryptokit-META
 
@@ -115,6 +116,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:34 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:34 +0000 (UTC)
Subject: rpms/ocaml-csv/devel ocaml-csv.spec,1.10,1.11
Message-ID: <20090416090634.83EDC70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-csv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-csv/devel

Modified Files:
	ocaml-csv.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-csv.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-csv/devel/ocaml-csv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-csv.spec	26 Feb 2009 06:57:02 -0000	1.10
+++ ocaml-csv.spec	16 Apr 2009 09:06:04 -0000	1.11
@@ -11,6 +11,7 @@
 URL:            http://merjis.com/developers/csv
 Source0:        http://merjis.com/_file/ocaml-csv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         csv-extlib.patch
 Patch1:         csv-install.patch
@@ -107,6 +108,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:34 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:34 +0000 (UTC)
Subject: rpms/ocaml-curl/devel ocaml-curl.spec,1.11,1.12
Message-ID: <20090416090634.C597870127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-curl/devel

Modified Files:
	ocaml-curl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-curl.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-curl/devel/ocaml-curl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ocaml-curl.spec	26 Feb 2009 06:57:56 -0000	1.11
+++ ocaml-curl.spec	16 Apr 2009 09:06:04 -0000	1.12
@@ -11,6 +11,7 @@
 URL:            http://sourceforge.net/projects/ocurl
 Source0:        http://downloads.sourceforge.net/ocurl/ocurl-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0-7
 BuildRequires:  ocaml-findlib-devel, curl-devel >= 7.9.8
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:35 +0000 (UTC)
Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.10,1.11
Message-ID: <20090416090635.2D55A70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-curses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-curses/devel

Modified Files:
	ocaml-curses.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-curses.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-curses/devel/ocaml-curses.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-curses.spec	26 Feb 2009 06:58:56 -0000	1.10
+++ ocaml-curses.spec	16 Apr 2009 09:06:04 -0000	1.11
@@ -11,6 +11,7 @@
 URL:            http://savannah.nongnu.org/projects/ocaml-tmk/
 Source0:        http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-findlib-devel, ncurses-devel
@@ -91,6 +92,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:35 +0000 (UTC)
Subject: rpms/ocaml-dbus/devel ocaml-dbus.spec,1.10,1.11
Message-ID: <20090416090635.748BE70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-dbus/devel

Modified Files:
	ocaml-dbus.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-dbus.spec	26 Feb 2009 06:59:52 -0000	1.10
+++ ocaml-dbus.spec	16 Apr 2009 09:06:05 -0000	1.11
@@ -11,6 +11,7 @@
 URL:            http://tab.snarc.org/projects/ocaml_dbus/
 Source0:        http://tab.snarc.org/download/ocaml/ocaml_dbus-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0-7, ocaml-findlib
 BuildRequires:  dbus-devel
@@ -95,6 +96,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:35 +0000 (UTC)
Subject: rpms/ocaml-deriving/devel ocaml-deriving.spec,1.5,1.6
Message-ID: <20090416090635.C526970127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-deriving/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-deriving/devel

Modified Files:
	ocaml-deriving.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-deriving.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-deriving/devel/ocaml-deriving.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-deriving.spec	26 Feb 2009 07:00:53 -0000	1.5
+++ ocaml-deriving.spec	16 Apr 2009 09:06:05 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://code.google.com/p/deriving/
 Source0:        http://deriving.googlecode.com/files/deriving-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         ocaml-deriving-no-link-libs.patch
 Patch1:         ocaml-deriving-0.1.1a-dynlink.patch
@@ -107,6 +108,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1a-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:36 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:36 +0000 (UTC)
Subject: rpms/ocaml-expat/devel ocaml-expat.spec,1.12,1.13
Message-ID: <20090416090636.616BE70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-expat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-expat/devel

Modified Files:
	ocaml-expat.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-expat.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-expat/devel/ocaml-expat.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ocaml-expat.spec	26 Feb 2009 07:01:47 -0000	1.12
+++ ocaml-expat.spec	16 Apr 2009 09:06:06 -0000	1.13
@@ -11,6 +11,7 @@
 URL:            http://www.xs4all.nl/~mmzeeman/ocaml/
 Source0:        http://www.xs4all.nl/~mmzeeman/ocaml/ocaml-expat-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, expat-devel >= 2.0.1, chrpath
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:36 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:36 +0000 (UTC)
Subject: rpms/ocamldsort/devel ocamldsort.spec,1.4,1.5
Message-ID: <20090416090636.1E8BE70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocamldsort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocamldsort/devel

Modified Files:
	ocamldsort.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocamldsort.spec
===================================================================
RCS file: /cvs/extras/rpms/ocamldsort/devel/ocamldsort.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocamldsort.spec	26 Feb 2009 07:41:06 -0000	1.4
+++ ocamldsort.spec	16 Apr 2009 09:06:05 -0000	1.5
@@ -11,6 +11,7 @@
 URL:            http://dimitri.mutu.net/ocaml.html
 Source0:        ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -72,6 +73,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:36 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:36 +0000 (UTC)
Subject: rpms/ocaml-extlib/devel ocaml-extlib.spec,1.9,1.10
Message-ID: <20090416090636.B595270127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-extlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-extlib/devel

Modified Files:
	ocaml-extlib.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-extlib.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-extlib/devel/ocaml-extlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-extlib.spec	26 Feb 2009 07:02:41 -0000	1.9
+++ ocaml-extlib.spec	16 Apr 2009 09:06:06 -0000	1.10
@@ -11,6 +11,7 @@
 URL:            http://code.google.com/p/ocaml-extlib/
 Source0:        http://ocaml-extlib.googlecode.com/files/extlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         extlib-install.patch
 
@@ -112,6 +113,10 @@
 %{_libdir}/ocaml/extlib/*.ml
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:37 +0000 (UTC)
Subject: rpms/ocaml-facile/devel ocaml-facile.spec,1.8,1.9
Message-ID: <20090416090637.07F9370127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-facile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-facile/devel

Modified Files:
	ocaml-facile.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-facile.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-facile/devel/ocaml-facile.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-facile.spec	26 Feb 2009 07:03:40 -0000	1.8
+++ ocaml-facile.spec	16 Apr 2009 09:06:06 -0000	1.9
@@ -22,6 +22,7 @@
 # * install .mli files
 Patch0:        facile-1.1-makefile-fixes.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires: ocaml >= 3.02
 BuildRequires: ocaml-findlib-devel
@@ -112,6 +113,10 @@
 %{_libdir}/ocaml/facile/*.mli
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:37 +0000 (UTC)
Subject: rpms/ocaml-fileutils/devel ocaml-fileutils.spec,1.6,1.7
Message-ID: <20090416090637.48D9870127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-fileutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-fileutils/devel

Modified Files:
	ocaml-fileutils.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-fileutils.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-fileutils/devel/ocaml-fileutils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-fileutils.spec	26 Feb 2009 07:04:39 -0000	1.6
+++ ocaml-fileutils.spec	16 Apr 2009 09:06:07 -0000	1.7
@@ -11,6 +11,7 @@
 URL:            http://www.gallu.homelinux.org/download/
 Source0:        http://www.gallu.homelinux.org/download/ocaml-fileutils-0.3.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib-devel
@@ -94,6 +95,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:38 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:38 +0000 (UTC)
Subject: rpms/ocaml-gsl/devel ocaml-gsl.spec,1.5,1.6
Message-ID: <20090416090638.265FD70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-gsl/devel

Modified Files:
	ocaml-gsl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-gsl.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-gsl/devel/ocaml-gsl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-gsl.spec	26 Feb 2009 07:07:48 -0000	1.5
+++ ocaml-gsl.spec	16 Apr 2009 09:06:07 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://oandrieu.nerim.net/ocaml/gsl/
 Source0:        http://oandrieu.nerim.net/ocaml/gsl/ocamlgsl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.07
 BuildRequires:  ocaml-findlib-devel
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:37 +0000 (UTC)
Subject: rpms/ocaml-gettext/devel ocaml-gettext.spec,1.9,1.10
Message-ID: <20090416090637.D197770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-gettext/devel

Modified Files:
	ocaml-gettext.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-gettext/devel/ocaml-gettext.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-gettext.spec	26 Feb 2009 07:06:48 -0000	1.9
+++ ocaml-gettext.spec	16 Apr 2009 09:06:07 -0000	1.10
@@ -11,6 +11,7 @@
 URL:            http://sylvain.le-gall.net/ocaml-gettext.html
 Source0:        http://sylvain.le-gall.net/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 # Fix dynlink.cma now required with OCaml 3.11.0.
 Patch0:         ocaml-gettext-0.3.2-dynlink.patch
@@ -220,6 +221,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:37 +0000 (UTC)
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.18,1.19
Message-ID: <20090416090637.8731270127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-findlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-findlib/devel

Modified Files:
	ocaml-findlib.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ocaml-findlib.spec	26 Feb 2009 07:05:45 -0000	1.18
+++ ocaml-findlib.spec	16 Apr 2009 09:06:07 -0000	1.19
@@ -11,6 +11,7 @@
 URL:            http://projects.camlcity.org/projects/findlib.html
 Source0:        http://download.camlcity.org/download/findlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         ocaml-findlib-1.2.3-camlp4-META.patch
 
@@ -112,6 +113,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:38 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:38 +0000 (UTC)
Subject: rpms/ocaml-json-wheel/devel ocaml-json-wheel.spec,1.5,1.6
Message-ID: <20090416090638.A8A8570127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-json-wheel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-json-wheel/devel

Modified Files:
	ocaml-json-wheel.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-json-wheel.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-json-wheel/devel/ocaml-json-wheel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-json-wheel.spec	26 Feb 2009 07:09:41 -0000	1.5
+++ ocaml-json-wheel.spec	16 Apr 2009 09:06:08 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://martin.jambon.free.fr/json-wheel.html
 Source0:        http://martin.jambon.free.fr/json-wheel-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -98,6 +99,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:38 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:38 +0000 (UTC)
Subject: rpms/ocaml-json-static/devel ocaml-json-static.spec,1.5,1.6
Message-ID: <20090416090638.6EB6B70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-json-static/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-json-static/devel

Modified Files:
	ocaml-json-static.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-json-static.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-json-static/devel/ocaml-json-static.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-json-static.spec	26 Feb 2009 07:08:43 -0000	1.5
+++ ocaml-json-static.spec	16 Apr 2009 09:06:08 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://martin.jambon.free.fr/json-static.html
 Source0:        http://martin.jambon.free.fr/json-static-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -61,6 +62,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:39 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:39 +0000 (UTC)
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.15,1.16
Message-ID: <20090416090639.4AA0E70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-lablgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-lablgtk/devel

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ocaml-lablgtk.spec	26 Feb 2009 07:12:12 -0000	1.15
+++ ocaml-lablgtk.spec	16 Apr 2009 09:06:09 -0000	1.16
@@ -15,6 +15,7 @@
 Patch0:         ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Obsoletes:      lablgtk <= 2.6.0-7
 Provides:       lablgtk = 2.6.0-7
@@ -155,6 +156,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:38 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:38 +0000 (UTC)
Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.13,1.14
Message-ID: <20090416090638.F02BF70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-lablgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-lablgl/devel

Modified Files:
	ocaml-lablgl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml-lablgl.spec	26 Feb 2009 07:11:16 -0000	1.13
+++ ocaml-lablgl.spec	16 Apr 2009 09:06:08 -0000	1.14
@@ -11,6 +11,7 @@
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
 Source0:        http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         lablgl-tk8.5.patch
 
@@ -146,6 +147,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:40 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:40 +0000 (UTC)
Subject: rpms/ocaml-mlgmpidl/devel ocaml-mlgmpidl.spec,1.2,1.3
Message-ID: <20090416090640.CB68470127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-mlgmpidl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-mlgmpidl/devel

Modified Files:
	ocaml-mlgmpidl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-mlgmpidl.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-mlgmpidl/devel/ocaml-mlgmpidl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-mlgmpidl.spec	2 Apr 2009 15:15:24 -0000	1.2
+++ ocaml-mlgmpidl.spec	16 Apr 2009 09:06:10 -0000	1.3
@@ -22,6 +22,7 @@
 Source3:        mlgmpidl-META
 Patch0:         mlgmpidl-1.1-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 BuildRequires:  ocaml >= 3.07, ocaml-ocamldoc, ocaml-camlidl-devel, gmp-devel, mpfr-devel, prelink
 # BuildRequires for documentation build
 BuildRequires:  texlive-latex, texlive-texmf, ghostscript
@@ -141,6 +142,10 @@
 %{_docdir}/%{name}
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Thu Apr 02 2009 Alan Dunn <amdunn at gmail.com> 1.1-1
 - New upstream version incorporates functional interface to Mpfr.
 * Sat Mar 28 2009 Alan Dunn <amdunn at gmail.com> 1.0-1



From karsten at fedoraproject.org  Thu Apr 16 09:06:40 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:40 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.4,1.5
Message-ID: <20090416090640.2BB5C70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-lwt/devel

Modified Files:
	ocaml-lwt.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-lwt.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-lwt.spec	26 Feb 2009 07:14:39 -0000	1.4
+++ ocaml-lwt.spec	16 Apr 2009 09:06:09 -0000	1.5
@@ -11,6 +11,7 @@
 URL:            http://ocsigen.org/install/lwt
 Source0:        http://ocsigen.org/download/lwt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -85,6 +86,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:39 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:39 +0000 (UTC)
Subject: rpms/ocaml-lacaml/devel ocaml-lacaml.spec,1.9,1.10
Message-ID: <20090416090639.9856970127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-lacaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-lacaml/devel

Modified Files:
	ocaml-lacaml.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-lacaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-lacaml/devel/ocaml-lacaml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-lacaml.spec	10 Mar 2009 14:00:40 -0000	1.9
+++ ocaml-lacaml.spec	16 Apr 2009 09:06:09 -0000	1.10
@@ -11,6 +11,7 @@
 URL:            http://ocaml.info/home/ocaml_sources.html#lacaml
 Source0:        http://hg.ocaml.info/release/lacaml/archive/release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp4-devel
@@ -97,6 +98,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 4.7.6-1
 - New upstream version 4.7.6.
 - Name of documentation files has changed slightly.



From karsten at fedoraproject.org  Thu Apr 16 09:06:39 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:39 +0000 (UTC)
Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.28,1.29
Message-ID: <20090416090639.DCB8770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-libvirt/devel

Modified Files:
	ocaml-libvirt.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ocaml-libvirt.spec	10 Mar 2009 10:42:17 -0000	1.28
+++ ocaml-libvirt.spec	16 Apr 2009 09:06:09 -0000	1.29
@@ -14,6 +14,7 @@
 URL:            http://libvirt.org/ocaml/
 Source0:        http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-ocamldoc
@@ -123,6 +124,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.0-1
 - New upstream release 0.6.1.0.
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:40 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:40 +0000 (UTC)
Subject: rpms/ocaml-mikmatch/devel ocaml-mikmatch.spec,1.5,1.6
Message-ID: <20090416090640.7435870127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-mikmatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-mikmatch/devel

Modified Files:
	ocaml-mikmatch.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-mikmatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-mikmatch/devel/ocaml-mikmatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-mikmatch.spec	26 Feb 2009 07:16:03 -0000	1.5
+++ ocaml-mikmatch.spec	16 Apr 2009 09:06:10 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://martin.jambon.free.fr/micmatch.html
 Source0:        http://martin.jambon.free.fr/mikmatch-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         ocaml-mikmatch-1.0.0-dynlink.patch
 
@@ -108,6 +109,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:41 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:41 +0000 (UTC)
Subject: rpms/ocaml-mysql/devel ocaml-mysql.spec,1.7,1.8
Message-ID: <20090416090641.1F43C70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-mysql/devel

Modified Files:
	ocaml-mysql.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-mysql.spec	26 Feb 2009 07:17:08 -0000	1.7
+++ ocaml-mysql.spec	16 Apr 2009 09:06:10 -0000	1.8
@@ -11,6 +11,7 @@
 URL:            http://raevnos.pennmush.org/code/ocaml-mysql/
 Source0:        http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -96,6 +97,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:41 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:41 +0000 (UTC)
Subject: rpms/ocaml-newt/devel ocaml-newt.spec,1.5,1.6
Message-ID: <20090416090641.629BA70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-newt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-newt/devel

Modified Files:
	ocaml-newt.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-newt.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-newt/devel/ocaml-newt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-newt.spec	26 Feb 2009 07:18:09 -0000	1.5
+++ ocaml-newt.spec	16 Apr 2009 09:06:11 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://et.redhat.com/~rjones/ocaml-newt/
 Source0:        http://et.redhat.com/~rjones/ocaml-newt/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -107,6 +108,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:41 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:41 +0000 (UTC)
Subject: rpms/ocaml-ocamlgraph/devel ocaml-ocamlgraph.spec,1.5,1.6
Message-ID: <20090416090641.B67E470127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-ocamlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-ocamlgraph/devel

Modified Files:
	ocaml-ocamlgraph.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-ocamlgraph/devel/ocaml-ocamlgraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-ocamlgraph.spec	26 Feb 2009 07:19:11 -0000	1.5
+++ ocaml-ocamlgraph.spec	16 Apr 2009 09:06:11 -0000	1.6
@@ -32,6 +32,7 @@
 Patch0:         ocamlgraph-1.0-no-view-graph-doc.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 BuildRequires:	ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  gtk2-devel, libgnomecanvas-devel
@@ -130,6 +131,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:42 +0000 (UTC)
Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.12,1.13
Message-ID: <20090416090642.0C91C70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-ocamlnet/devel

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ocaml-ocamlnet.spec	26 Feb 2009 07:20:21 -0000	1.12
+++ ocaml-ocamlnet.spec	16 Apr 2009 09:06:11 -0000	1.13
@@ -17,6 +17,7 @@
 Patch1:         ocamlnet-ucred.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
@@ -242,6 +243,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:43 +0000 (UTC)
Subject: rpms/ocaml-pa-do/devel ocaml-pa-do.spec,1.3,1.4
Message-ID: <20090416090643.8764D70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-pa-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-pa-do/devel

Modified Files:
	ocaml-pa-do.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-pa-do.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-pa-do/devel/ocaml-pa-do.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-pa-do.spec	19 Mar 2009 12:30:25 -0000	1.3
+++ ocaml-pa-do.spec	16 Apr 2009 09:06:13 -0000	1.4
@@ -17,6 +17,7 @@
 Patch1:         ocaml-pa-do-0.8.4-complex.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-findlib-devel
@@ -109,6 +110,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Thu Mar 19 2009 Richard W.M. Jones <rjones at redhat.com> - 0.8.4-5
 - Ignore Asttypes and Parsetree deps (mschwendt).
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:42 +0000 (UTC)
Subject: rpms/ocaml-omake/devel ocaml-omake.spec,1.6,1.7
Message-ID: <20090416090642.4E16B70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-omake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-omake/devel

Modified Files:
	ocaml-omake.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-omake.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-omake/devel/ocaml-omake.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-omake.spec	3 Mar 2009 08:54:33 -0000	1.6
+++ ocaml-omake.spec	16 Apr 2009 09:06:12 -0000	1.7
@@ -10,6 +10,7 @@
 URL:            http://omake.metaprl.org/download.html
 Source0:        http://omake.metaprl.org/downloads/omake-%{version}-3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         ocaml-omake-debian-stdin-stdout-fix.patch
 Patch1:         ocaml-omake-0.9.8.5-no-sync.patch
@@ -88,6 +89,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar  3 2009 Caol??n McNamara <caolanm at redhat.com> - 0.9.8.5-7
 - patch src/libmojave-external/cutil/lm_printf.c rather than
   src/clib/lm_printf.c as the latter is created as a link of the



From karsten at fedoraproject.org  Thu Apr 16 09:06:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:42 +0000 (UTC)
Subject: rpms/ocaml-ounit/devel ocaml-ounit.spec,1.5,1.6
Message-ID: <20090416090642.BBC1C70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-ounit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-ounit/devel

Modified Files:
	ocaml-ounit.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-ounit.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-ounit/devel/ocaml-ounit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-ounit.spec	26 Feb 2009 07:23:30 -0000	1.5
+++ ocaml-ounit.spec	16 Apr 2009 09:06:12 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://www.xs4all.nl/~mmzeeman/ocaml/
 Source0:        http://www.xs4all.nl/~mmzeeman/ocaml/ounit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:42 +0000 (UTC)
Subject: rpms/ocaml-openin/devel ocaml-openin.spec,1.6,1.7
Message-ID: <20090416090642.86D6570127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-openin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-openin/devel

Modified Files:
	ocaml-openin.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-openin.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-openin/devel/ocaml-openin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-openin.spec	26 Feb 2009 07:22:26 -0000	1.6
+++ ocaml-openin.spec	16 Apr 2009 09:06:12 -0000	1.7
@@ -11,6 +11,7 @@
 URL:            http://alain.frisch.fr/soft#openin
 Source0:        http://alain.frisch.fr/info/openin-20070524.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -69,6 +70,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070524-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:43 +0000 (UTC)
Subject: rpms/ocaml-p3l/devel ocaml-p3l.spec,1.1,1.2
Message-ID: <20090416090643.379A770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-p3l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-p3l/devel

Modified Files:
	ocaml-p3l.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-p3l.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-p3l/devel/ocaml-p3l.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-p3l.spec	18 Mar 2009 09:30:52 -0000	1.1
+++ ocaml-p3l.spec	16 Apr 2009 09:06:12 -0000	1.2
@@ -10,6 +10,7 @@
 License:        LGPLv2+ with exceptions
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 URL:            http://camlp3l.inria.fr/
 Source0:        ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/ocamlp3l/ocamlp3l-%{version}.tgz
@@ -135,6 +136,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Mon Mar 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.03-2
 - Don't duplicate the LICENSE and README.Fedora files.
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:43 +0000 (UTC)
Subject: rpms/ocaml-pa-monad/devel ocaml-pa-monad.spec,1.6,1.7
Message-ID: <20090416090643.C5F0370127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-pa-monad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-pa-monad/devel

Modified Files:
	ocaml-pa-monad.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-pa-monad.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-pa-monad/devel/ocaml-pa-monad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-pa-monad.spec	10 Mar 2009 13:31:10 -0000	1.6
+++ ocaml-pa-monad.spec	16 Apr 2009 09:06:13 -0000	1.7
@@ -11,6 +11,7 @@
 URL:            http://www.cas.mcmaster.ca/~carette/pa_monad/
 Source0:        http://www.cas.mcmaster.ca/~carette/pa_monad/pa_monad.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -60,6 +61,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 6.0-1
 - New upstream version 6.0 [sic].
 - Patch no longer required, now upstream.



From karsten at fedoraproject.org  Thu Apr 16 09:06:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:44 +0000 (UTC)
Subject: rpms/ocaml-pcre/devel ocaml-pcre.spec,1.13,1.14
Message-ID: <20090416090644.1453870127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-pcre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-pcre/devel

Modified Files:
	ocaml-pcre.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml-pcre.spec	26 Feb 2009 07:25:35 -0000	1.13
+++ ocaml-pcre.spec	16 Apr 2009 09:06:13 -0000	1.14
@@ -11,6 +11,7 @@
 URL:            http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml
 Source0:        http://www.ocaml.info/ocaml_sources/pcre-ocaml-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-findlib-devel
@@ -91,6 +92,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.15.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:44 +0000 (UTC)
Subject: rpms/ocaml-perl4caml/devel ocaml-perl4caml.spec,1.8,1.9
Message-ID: <20090416090644.562A070127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-perl4caml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-perl4caml/devel

Modified Files:
	ocaml-perl4caml.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-perl4caml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-perl4caml/devel/ocaml-perl4caml.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-perl4caml.spec	26 Feb 2009 07:26:31 -0000	1.8
+++ ocaml-perl4caml.spec	16 Apr 2009 09:06:14 -0000	1.9
@@ -11,6 +11,7 @@
 URL:            http://merjis.com/developers/perl4caml
 Source0:        http://merjis.com/_file/perl4caml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-ocamldoc
@@ -123,6 +124,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:44 +0000 (UTC)
Subject: rpms/ocaml-pgocaml/devel ocaml-pgocaml.spec,1.7,1.8
Message-ID: <20090416090644.C09D070127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-pgocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-pgocaml/devel

Modified Files:
	ocaml-pgocaml.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-pgocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-pgocaml/devel/ocaml-pgocaml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-pgocaml.spec	26 Feb 2009 07:27:26 -0000	1.7
+++ ocaml-pgocaml.spec	16 Apr 2009 09:06:14 -0000	1.8
@@ -11,6 +11,7 @@
 URL:            http://developer.berlios.de/projects/pgocaml/
 Source0:        http://download.berlios.de/pgocaml/pgocaml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
@@ -95,6 +96,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:45 +0000 (UTC)
Subject: rpms/ocaml-postgresql/devel ocaml-postgresql.spec,1.13,1.14
Message-ID: <20090416090645.0EBAF70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-postgresql/devel

Modified Files:
	ocaml-postgresql.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml-postgresql.spec	10 Mar 2009 14:06:41 -0000	1.13
+++ ocaml-postgresql.spec	16 Apr 2009 09:06:14 -0000	1.14
@@ -11,6 +11,7 @@
 URL:            http://www.ocaml.info/home/ocaml_sources.html#postgresql-ocaml
 Source0:        http://hg.ocaml.info/release/postgresql-ocaml/archive/release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -91,6 +92,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 1.10.3-1
 - New upstream version 1.10.3.
 - Fix URL.



From karsten at fedoraproject.org  Thu Apr 16 09:06:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:45 +0000 (UTC)
Subject: rpms/ocaml-preludeml/devel ocaml-preludeml.spec,1.2,1.3
Message-ID: <20090416090645.4AFEA70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-preludeml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-preludeml/devel

Modified Files:
	ocaml-preludeml.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-preludeml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-preludeml/devel/ocaml-preludeml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-preludeml.spec	26 Feb 2009 07:29:20 -0000	1.2
+++ ocaml-preludeml.spec	16 Apr 2009 09:06:15 -0000	1.3
@@ -14,6 +14,7 @@
 Group:          Development/Libraries
 License:        MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 # To recreate the source tarball, do:
 #   git clone git://github.com/kig/preludeml.git
@@ -121,6 +122,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.11.20090113
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:45 +0000 (UTC)
Subject: rpms/ocaml-pxp/devel ocaml-pxp.spec,1.8,1.9
Message-ID: <20090416090645.93A8370127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-pxp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-pxp/devel

Modified Files:
	ocaml-pxp.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-pxp.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-pxp/devel/ocaml-pxp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-pxp.spec	26 Feb 2009 07:30:15 -0000	1.8
+++ ocaml-pxp.spec	16 Apr 2009 09:06:15 -0000	1.9
@@ -10,6 +10,7 @@
 URL:            http://projects.camlcity.org/projects/pxp.html
 Source0:        http://download.camlcity.org/download/pxp-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 ExcludeArch:    ppc64
 
 BuildRequires:  ocaml >= 3.10.2
@@ -105,6 +106,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0test2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:45 +0000 (UTC)
Subject: rpms/ocaml-reins/devel ocaml-reins.spec,1.3,1.4
Message-ID: <20090416090645.DCA9F70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-reins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-reins/devel

Modified Files:
	ocaml-reins.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-reins.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-reins/devel/ocaml-reins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-reins.spec	26 Feb 2009 07:31:15 -0000	1.3
+++ ocaml-reins.spec	16 Apr 2009 09:06:15 -0000	1.4
@@ -11,6 +11,7 @@
 URL:            http://ocaml-reins.sourceforge.net/
 Source0:        http://garr.dl.sourceforge.net/sourceforge/ocaml-reins/ocaml-reins-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         reins-destdir-debian.patch
 Patch1:         reins-install-cmi-debian.patch
@@ -127,6 +128,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1a-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:46 +0000 (UTC)
Subject: rpms/ocaml-res/devel ocaml-res.spec,1.6,1.7
Message-ID: <20090416090646.31A0B70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-res/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-res/devel

Modified Files:
	ocaml-res.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-res.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-res/devel/ocaml-res.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-res.spec	10 Mar 2009 14:12:17 -0000	1.6
+++ ocaml-res.spec	16 Apr 2009 09:06:15 -0000	1.7
@@ -11,6 +11,7 @@
 URL:            http://www.ocaml.info/home/ocaml_sources.html#res
 Source0:        http://hg.ocaml.info/release/res/archive/release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -91,6 +92,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 3.1.1-1
 - New upstream version 3.1.1.
 - Fix URL.



From karsten at fedoraproject.org  Thu Apr 16 09:06:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:46 +0000 (UTC)
Subject: rpms/ocaml-SDL/devel ocaml-SDL.spec,1.15,1.16
Message-ID: <20090416090646.897D570127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-SDL/devel

Modified Files:
	ocaml-SDL.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-SDL.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-SDL/devel/ocaml-SDL.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ocaml-SDL.spec	26 Feb 2009 06:44:40 -0000	1.15
+++ ocaml-SDL.spec	16 Apr 2009 09:06:16 -0000	1.16
@@ -12,6 +12,7 @@
 Source0:        http://downloads.sourceforge.net/ocamlsdl/ocamlsdl-%{version}.tar.gz
 Source1:        ocamlsdl-0.7.2-htmlref.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml-lablgl-devel
 BuildRequires:  SDL_ttf-devel, SDL_mixer-devel, SDL_image-devel 
@@ -79,6 +80,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:47 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:47 +0000 (UTC)
Subject: rpms/ocaml-sqlite/devel ocaml-sqlite.spec,1.10,1.11
Message-ID: <20090416090647.16D4B70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-sqlite/devel

Modified Files:
	ocaml-sqlite.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-sqlite.spec	26 Feb 2009 07:34:13 -0000	1.10
+++ ocaml-sqlite.spec	16 Apr 2009 09:06:16 -0000	1.11
@@ -11,6 +11,7 @@
 URL:            http://www.ocaml.info/home/ocaml_sources.html#ocaml-sqlite3
 Source0:        http://www.ocaml.info/ocaml_sources/ocaml-sqlite3-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         ocaml-sqlite-debian-install-no-mktop.patch
 
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:46 +0000 (UTC)
Subject: rpms/ocaml-sexplib/devel ocaml-sexplib.spec,1.7,1.8
Message-ID: <20090416090646.C74E970127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-sexplib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-sexplib/devel

Modified Files:
	ocaml-sexplib.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-sexplib.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-sexplib/devel/ocaml-sexplib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-sexplib.spec	30 Mar 2009 08:14:10 -0000	1.7
+++ ocaml-sexplib.spec	16 Apr 2009 09:06:16 -0000	1.8
@@ -11,6 +11,7 @@
 URL:            http://www.ocaml.info/home/ocaml_sources.html#sexplib310
 Source0:        http://hg.ocaml.info/release/sexplib310/archive/release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -99,6 +100,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Mon Mar 30 2009 Richard W.M. Jones <rjones at redhat.com> - 4.2.7-2
 - Force rebuild against latest ocaml-type-conv.
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:47 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:47 +0000 (UTC)
Subject: rpms/ocaml-ssl/devel ocaml-ssl.spec,1.13,1.14
Message-ID: <20090416090647.5233670127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-ssl/devel

Modified Files:
	ocaml-ssl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-ssl.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml-ssl.spec	26 Feb 2009 07:35:14 -0000	1.13
+++ ocaml-ssl.spec	16 Apr 2009 09:06:17 -0000	1.14
@@ -11,6 +11,7 @@
 URL:            http://savonet.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/savonet/ocaml-ssl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel
@@ -87,6 +88,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:47 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:47 +0000 (UTC)
Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.14,1.15
Message-ID: <20090416090647.C888770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-ulex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-ulex/devel

Modified Files:
	ocaml-ulex.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-ulex.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ocaml-ulex.spec	26 Feb 2009 07:37:07 -0000	1.14
+++ ocaml-ulex.spec	16 Apr 2009 09:06:17 -0000	1.15
@@ -11,6 +11,7 @@
 URL:            http://www.cduce.org/download.html#side
 Source0:        http://www.cduce.org/download/ulex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0-7, ocaml-findlib-devel, ocaml-camlp4-devel
 BuildRequires:  gawk
@@ -87,6 +88,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:48 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:48 +0000 (UTC)
Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.10,1.11
Message-ID: <20090416090648.39A8770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-xml-light/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-xml-light/devel

Modified Files:
	ocaml-xml-light.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-xml-light.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml-xml-light.spec	26 Feb 2009 07:38:04 -0000	1.10
+++ ocaml-xml-light.spec	16 Apr 2009 09:06:17 -0000	1.11
@@ -11,6 +11,7 @@
 URL:            http://tech.motion-twin.com/xmllight.html
 Source0:        xml-light-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
@@ -88,6 +89,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.cvs20070817-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:47 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:47 +0000 (UTC)
Subject: rpms/ocaml-type-conv/devel ocaml-type-conv.spec,1.11,1.12
Message-ID: <20090416090647.895DE70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-type-conv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-type-conv/devel

Modified Files:
	ocaml-type-conv.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-type-conv.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ocaml-type-conv.spec	10 Mar 2009 14:18:14 -0000	1.11
+++ ocaml-type-conv.spec	16 Apr 2009 09:06:17 -0000	1.12
@@ -11,6 +11,7 @@
 URL:            http://www.ocaml.info/home/ocaml_sources.html#type-conv
 Source0:        http://hg.ocaml.info/release/type-conv/archive/release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -58,6 +59,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.7-1
 - New upstream version 1.6.7.
 - Fixed source URL.



From karsten at fedoraproject.org  Thu Apr 16 09:06:48 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:48 +0000 (UTC)
Subject: rpms/ocaml-xmlrpc-light/devel ocaml-xmlrpc-light.spec,1.6,1.7
Message-ID: <20090416090648.7F45C70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-xmlrpc-light/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-xmlrpc-light/devel

Modified Files:
	ocaml-xmlrpc-light.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-xmlrpc-light.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-xmlrpc-light/devel/ocaml-xmlrpc-light.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-xmlrpc-light.spec	10 Mar 2009 14:22:49 -0000	1.6
+++ ocaml-xmlrpc-light.spec	16 Apr 2009 09:06:18 -0000	1.7
@@ -11,6 +11,7 @@
 URL:            http://code.google.com/p/xmlrpc-light/
 Source0:        http://xmlrpc-light.googlecode.com/files/xmlrpc-light-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -83,6 +84,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.1-1
 - New upstream version 0.6.1.
 



From karsten at fedoraproject.org  Thu Apr 16 09:06:48 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:06:48 +0000 (UTC)
Subject: rpms/ocaml-zip/devel ocaml-zip.spec,1.8,1.9
Message-ID: <20090416090648.C41DE70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/ocaml-zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767/ocaml-zip/devel

Modified Files:
	ocaml-zip.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)



Index: ocaml-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml-zip/devel/ocaml-zip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-zip.spec	16 Mar 2009 09:56:24 -0000	1.8
+++ ocaml-zip.spec	16 Apr 2009 09:06:18 -0000	1.9
@@ -11,6 +11,7 @@
 URL:            http://pauillac.inria.fr/~xleroy/software.html
 Source0:        http://caml.inria.fr/distrib/bazar-ocaml/camlzip-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Mon Mar 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.04-1
 - New upstream release (resolves rhbz#490407).
 



From airlied at fedoraproject.org  Thu Apr 16 09:07:42 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 16 Apr 2009 09:07:42 +0000 (UTC)
Subject: rpms/mesa/F-11 radeon-rewrite-fixes.patch, NONE, 1.1 mesa.spec,
	1.242, 1.243
Message-ID: <20090416090742.4304570127@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10037

Modified Files:
	mesa.spec 
Added Files:
	radeon-rewrite-fixes.patch 
Log Message:
* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 7.5-0.11
- radeon-rewrite-fixes.patch: fix context crash in compiz + r200 fixes


radeon-rewrite-fixes.patch:

--- NEW FILE radeon-rewrite-fixes.patch ---
diff -up mesa-20090322/src/mesa/drivers/dri/common/dri_util.c.dave mesa-20090322/src/mesa/drivers/dri/common/dri_util.c
--- mesa-20090322/src/mesa/drivers/dri/common/dri_util.c.dave	2009-03-21 21:26:15.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/common/dri_util.c	2009-04-16 18:59:17.000000000 +1000
@@ -37,6 +37,9 @@
 typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRIdrawable *drawable, int32_t *numerator, int32_t *denominator);
 #endif
 
+static void dri_get_drawable(__DRIdrawable *pdp);
+static void dri_put_drawable(__DRIdrawable *pdp);
+
 /**
  * This is just a token extension used to signal that the driver
  * supports setting a read drawable.
@@ -127,7 +130,7 @@ static int driUnbindContext(__DRIcontext
 	return GL_FALSE;
     }
 
-    pdp->refcount--;
+    dri_put_drawable(pdp);
 
     if (prp != pdp) {
         if (prp->refcount == 0) {
@@ -135,7 +138,7 @@ static int driUnbindContext(__DRIcontext
 	    return GL_FALSE;
 	}
 
-	prp->refcount--;
+    	dri_put_drawable(prp);
     }
 
 
@@ -175,9 +178,9 @@ static int driBindContext(__DRIcontext *
     pcp->driDrawablePriv = pdp;
     pcp->driReadablePriv = prp;
     pdp->driContextPriv = pcp;
-    pdp->refcount++;
+    dri_get_drawable(pdp);
     if ( pdp != prp ) {
-	prp->refcount++;
+        dri_get_drawable(prp);
     }
 
     /*
@@ -435,7 +438,7 @@ driCreateNewDrawable(__DRIscreen *psp, c
 
     pdp->loaderPrivate = data;
     pdp->hHWDrawable = hwDrawable;
-    pdp->refcount = 0;
+    pdp->refcount = 1;
     pdp->pStamp = NULL;
     pdp->lastStamp = 0;
     pdp->index = 0;
@@ -488,12 +491,19 @@ dri2CreateNewDrawable(__DRIscreen *scree
     return pdraw;
 }
 
-
-static void
-driDestroyDrawable(__DRIdrawable *pdp)
+static void dri_get_drawable(__DRIdrawable *pdp)
+{
+    pdp->refcount++;
+}
+	
+static void dri_put_drawable(__DRIdrawable *pdp)
 {
     __DRIscreenPrivate *psp;
 
+    pdp->refcount--;
+    if (pdp->refcount)
+	return;
+
     if (pdp) {
 	psp = pdp->driScreenPriv;
         (*psp->DriverAPI.DestroyBuffer)(pdp);
@@ -509,6 +519,12 @@ driDestroyDrawable(__DRIdrawable *pdp)
     }
 }
 
+static void
+driDestroyDrawable(__DRIdrawable *pdp)
+{
+    dri_put_drawable(pdp);
+}
+
 /*@}*/
 
 
diff -up mesa-20090322/src/mesa/drivers/dri/r200/r200_cmdbuf.c.dave mesa-20090322/src/mesa/drivers/dri/r200/r200_cmdbuf.c
--- mesa-20090322/src/mesa/drivers/dri/r200/r200_cmdbuf.c.dave	2009-04-16 18:58:14.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/r200/r200_cmdbuf.c	2009-04-16 18:58:32.000000000 +1000
@@ -209,6 +209,11 @@ GLushort *r200AllocEltsOpenEnded( r200Co
    rmesa->radeon.tcl.elt_dma_offset = 0;
    rmesa->tcl.elt_used = min_nr * 2;
 
+   radeon_validate_bo(&rmesa->radeon, rmesa->radeon.tcl.elt_dma_bo,
+                      RADEON_GEM_DOMAIN_GTT, 0);
+   if (radeon_revalidate_bos(rmesa->radeon.glCtx) == GL_FALSE)
+      fprintf(stderr,"failure to revalidate BOs - badness\n");
+
    radeon_bo_map(rmesa->radeon.tcl.elt_dma_bo, 1);
    retval = rmesa->radeon.tcl.elt_dma_bo->ptr + rmesa->radeon.tcl.elt_dma_offset;
    
diff -up mesa-20090322/src/mesa/drivers/dri/r200/r200_texstate.c.dave mesa-20090322/src/mesa/drivers/dri/r200/r200_texstate.c
--- mesa-20090322/src/mesa/drivers/dri/r200/r200_texstate.c.dave	2009-04-16 18:58:14.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/r200/r200_texstate.c	2009-04-16 18:58:32.000000000 +1000
@@ -1422,8 +1422,8 @@ void set_re_cntl_d3d( GLcontext *ctx, in
  */
 static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t)
 {
-   const struct gl_texture_image *firstImage =
-      t->base.Image[0][t->mt->firstLevel];
+   int firstlevel = t->mt ? t->mt->firstLevel : 0;
+   const struct gl_texture_image *firstImage = t->base.Image[0][firstlevel];
    GLint log2Width, log2Height, log2Depth, texelBytes;
    
    if ( t->bo ) {
diff -up mesa-20090322/src/mesa/drivers/dri/r300/r300_cmdbuf.c.dave mesa-20090322/src/mesa/drivers/dri/r300/r300_cmdbuf.c
--- mesa-20090322/src/mesa/drivers/dri/r300/r300_cmdbuf.c.dave	2009-04-16 18:58:14.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/r300/r300_cmdbuf.c	2009-04-16 18:58:32.000000000 +1000
@@ -214,6 +214,7 @@ static void emit_cb_offset(GLcontext *ct
 	struct radeon_renderbuffer *rrb;
 	uint32_t cbpitch;
 	uint32_t offset = r300->radeon.state.color.draw_offset;
+	uint32_t dw = 6;
 
 	rrb = radeon_get_colorbuffer(&r300->radeon);
 	if (!rrb || !rrb->bo) {
@@ -230,11 +231,16 @@ static void emit_cb_offset(GLcontext *ct
 	if (rrb->bo->flags & RADEON_BO_FLAGS_MACRO_TILE)
 		cbpitch |= R300_COLOR_TILE_ENABLE;
 
-	BEGIN_BATCH_NO_AUTOSTATE(8);
+    	if (r300->radeon.radeonScreen->kernel_mm)
+		dw += 2;
+	BEGIN_BATCH_NO_AUTOSTATE(dw);
 	OUT_BATCH_REGSEQ(R300_RB3D_COLOROFFSET0, 1);
 	OUT_BATCH_RELOC(offset, rrb->bo, offset, 0, RADEON_GEM_DOMAIN_VRAM, 0);
 	OUT_BATCH_REGSEQ(R300_RB3D_COLORPITCH0, 1);
-	OUT_BATCH_RELOC(cbpitch, rrb->bo, cbpitch, 0, RADEON_GEM_DOMAIN_VRAM, 0);
+    	if (!r300->radeon.radeonScreen->kernel_mm)
+		OUT_BATCH(cbpitch);
+	else
+		OUT_BATCH_RELOC(cbpitch, rrb->bo, cbpitch, 0, RADEON_GEM_DOMAIN_VRAM, 0);
 	END_BATCH();
     if (r300->radeon.radeonScreen->driScreen->dri2.enabled) {
         if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) {
diff -up mesa-20090322/src/mesa/drivers/dri/radeon/radeon_common.c.dave mesa-20090322/src/mesa/drivers/dri/radeon/radeon_common.c
--- mesa-20090322/src/mesa/drivers/dri/radeon/radeon_common.c.dave	2009-04-16 18:58:14.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/radeon/radeon_common.c	2009-04-16 18:58:32.000000000 +1000
@@ -928,6 +928,7 @@ void radeon_validate_reset_bos(radeonCon
 	int i;
 
 	for (i = 0; i < radeon->state.validated_bo_count; i++) {
+		radeon_bo_unref(radeon->state.bos[i].bo);
 		radeon->state.bos[i].bo = NULL;
 		radeon->state.bos[i].read_domains = 0;
 		radeon->state.bos[i].write_domain = 0;
@@ -938,6 +939,7 @@ void radeon_validate_reset_bos(radeonCon
 
 void radeon_validate_bo(radeonContextPtr radeon, struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain)
 {
+	radeon_bo_ref(bo);
 	radeon->state.bos[radeon->state.validated_bo_count].bo = bo;
 	radeon->state.bos[radeon->state.validated_bo_count].read_domains = read_domains;
 	radeon->state.bos[radeon->state.validated_bo_count].write_domain = write_domain;
diff -up mesa-20090322/src/mesa/drivers/dri/radeon/radeon_state_init.c.dave mesa-20090322/src/mesa/drivers/dri/radeon/radeon_state_init.c
--- mesa-20090322/src/mesa/drivers/dri/radeon/radeon_state_init.c.dave	2009-04-16 18:58:14.000000000 +1000
+++ mesa-20090322/src/mesa/drivers/dri/radeon/radeon_state_init.c	2009-04-16 18:58:32.000000000 +1000
@@ -448,6 +448,17 @@ static void ctx_emit_cs(GLcontext *ctx, 
    // }
 
    END_BATCH();
+   BEGIN_BATCH_NO_AUTOSTATE(4);
+   OUT_BATCH(CP_PACKET0(RADEON_RE_TOP_LEFT, 0));
+   OUT_BATCH(0);
+   OUT_BATCH(CP_PACKET0(RADEON_RE_WIDTH_HEIGHT, 0));
+   if (rrb) {
+       OUT_BATCH(((rrb->width - 1) << RADEON_RE_WIDTH_SHIFT) |
+                 ((rrb->height - 1) << RADEON_RE_HEIGHT_SHIFT));
+   } else {
+       OUT_BATCH(0);
+   }
+   END_BATCH();
 }
 
 static void cube_emit(GLcontext *ctx, struct radeon_state_atom *atom)


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- mesa.spec	15 Apr 2009 15:19:12 -0000	1.242
+++ mesa.spec	16 Apr 2009 09:07:11 -0000	1.243
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.10%{?dist}
+Release: 0.11%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -49,6 +49,7 @@
 Patch13: mesa-7.5-sparc64.patch
 
 Patch20: mesa-7.5-get-driver-name.patch
+Patch21: radeon-rewrite-fixes.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -178,6 +179,7 @@
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
 %patch20 -p1 -b .get-driver-name
+%patch21 -p1 -b .radfixes
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -434,6 +436,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 7.5-0.11
+- radeon-rewrite-fixes.patch: fix context crash in compiz + r200 fixes
+
 * Tue Apr 14 2009 Adam Jackson <ajax at redhat.com> 7.5-0.10
 - mesa-7.5-get-driver-name.patch: Fix glXGetScreenDriver for DRI2 (#495342)
 



From pmatilai at fedoraproject.org  Thu Apr 16 09:11:04 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 16 Apr 2009 09:11:04 +0000 (UTC)
Subject: rpms/rpm/devel .cvsignore, 1.35, 1.36 rpm.spec, 1.344, 1.345 sources,
	1.141, 1.142
Message-ID: <20090416091104.1FCF270127@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10502

Modified Files:
	.cvsignore rpm.spec sources 
Log Message:
- update to 4.7.0 final
- fixes #494049, #495429
- dont permit test-suite failure anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	9 Apr 2009 12:46:15 -0000	1.35
+++ .cvsignore	16 Apr 2009 09:10:33 -0000	1.36
@@ -1 +1 @@
-rpm-4.7.0-rc1.tar.bz2
+rpm-4.7.0.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- rpm.spec	9 Apr 2009 12:46:15 -0000	1.344
+++ rpm.spec	16 Apr 2009 09:10:33 -0000	1.345
@@ -16,8 +16,8 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.7.0
-%define snapver rc1
-%define srcver %{rpmver}-%{snapver}
+%define snapver {nil}
+%define srcver %{rpmver}
 
 %define bdbver 4.7.25
 %define dbprefix db
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -269,8 +269,7 @@
 
 %if %{with check}
 %check
-# missing file in beta1 tarball causes two failures, permit failure for now
-make check ||:
+make check
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -394,6 +393,11 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-1
+- update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)
+- fixes #494049, #495429
+- dont permit test-suite failure anymore
+
 * Thu Apr 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.rc1.1
 - update to 4.7.0-rc1
 - fixes #493157, #493777, #493696, #491388, #487597, #493162


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	9 Apr 2009 12:46:16 -0000	1.141
+++ sources	16 Apr 2009 09:10:33 -0000	1.142
@@ -1 +1 @@
-321862428ef48d9d0bc36f7058b3b6c7  rpm-4.7.0-rc1.tar.bz2
+74791d638c571ec79f06227d453a6a03  rpm-4.7.0.tar.bz2



From sailer at fedoraproject.org  Thu Apr 16 09:13:58 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:58 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl.spec,1.48,1.49
Message-ID: <20090416091358.4F59D70127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/ghdl/devel

Modified Files:
	ghdl.spec 
Log Message:
replace %define with %global



Index: ghdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ghdl.spec	2 Apr 2009 15:12:33 -0000	1.48
+++ ghdl.spec	16 Apr 2009 09:13:27 -0000	1.49
@@ -1,6 +1,6 @@
-%define gccver 4.3.1
-%define ghdlver 0.27
-%define ghdlsvnver 110
+%global gccver 4.3.1
+%global ghdlver 0.27
+%global ghdlsvnver 110
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -27,18 +27,18 @@
 Requires(preun): /sbin/install-info
 Requires: gcc
 # (Build)Requires from fc gcc41 package
-%define multilib_64_archs sparc64 ppc64 s390x x86_64
+%global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch s390x
-%define multilib_32_arch s390
+%global multilib_32_arch s390
 %endif
 %ifarch sparc64
-%define multilib_32_arch sparc
+%global multilib_32_arch sparc
 %endif
 %ifarch ppc64
-%define multilib_32_arch ppc
+%global multilib_32_arch ppc
 %endif
 %ifarch x86_64
-%define multilib_32_arch i386
+%global multilib_32_arch i386
 %endif
 # Need binutils with -pie support >= 2.14.90.0.4-4
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
@@ -76,17 +76,17 @@
 Requires: ghdl-grt = %{version}-%{release}
 
 # Make sure we don't use clashing namespaces
-%define _vendor fedora_ghdl
+%global _vendor fedora_ghdl
 
-%define _gnu %{nil}
+%global _gnu %{nil}
 %ifarch sparc
-%define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
+%global gcc_target_platform sparc64-%{_vendor}-%{_target_os}
 %endif
 %ifarch ppc
-%define gcc_target_platform ppc64-%{_vendor}-%{_target_os}
+%global gcc_target_platform ppc64-%{_vendor}-%{_target_os}
 %endif
 %ifnarch sparc ppc
-%define gcc_target_platform %{_target_platform}
+%global gcc_target_platform %{_target_platform}
 %endif
 
 %description
@@ -132,23 +132,23 @@
 
 # Flag settings cribbed from gcc package
 OPT_FLAGS=$(echo %{optflags} | %{__sed} \
-	-e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
-	-e 's/-m64//g;s/-m32//g;s/-m31//g' \
+        -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
+        -e 's/-m64//g;s/-m32//g;s/-m31//g' \
 %ifarch sparc sparc64
-	-e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
+        -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
 %endif
-	-e 's/[[:blank:]]\+/ /g')
+        -e 's/[[:blank:]]\+/ /g')
 
 # These compiler flags in rawhide seem to break the build, so get rid of them
 OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \
 %ifarch i386 i486 i586 i686
-	-e 's/-mtune=generic/-mtune=pentium4/g' \
+        -e 's/-mtune=generic/-mtune=pentium4/g' \
 %endif
 %ifarch x86_64
-	-e 's/-mtune=generic/-mtune=nocona/g' \
+        -e 's/-mtune=generic/-mtune=nocona/g' \
 %endif
-	-e 's/-fstack-protector//g ' \
-	-e 's/--param=ssp-buffer-size=[0-9]*//g')
+        -e 's/-fstack-protector//g ' \
+        -e 's/--param=ssp-buffer-size=[0-9]*//g')
 
 # gcc -m32 fails, so we disable multilibbing.
 # so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed
@@ -158,45 +158,45 @@
 export TCFLAGS="$OPT_FLAGS"
 #configure --enable-languages=vhdl
 ../configure \
-	--program-prefix=%{?_program_prefix} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_libdir} \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir} \
-	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
-	--enable-languages=vhdl \
-	%{!?_without_mock:--disable-multilib} \
-	--enable-shared \
-	--enable-threads=posix \
-	--enable-checking=release \
-	--with-system-zlib \
-	--enable-__cxa_atexit \
-	--disable-libunwind-exceptions \
-	--disable-libgcj \
+        --program-prefix=%{?_program_prefix} \
+        --prefix=%{_prefix} \
+        --exec-prefix=%{_exec_prefix} \
+        --bindir=%{_bindir} \
+        --sbindir=%{_sbindir} \
+        --sysconfdir=%{_sysconfdir} \
+        --datadir=%{_datadir} \
+        --includedir=%{_includedir} \
+        --libdir=%{_libdir} \
+        --libexecdir=%{_libexecdir} \
+        --localstatedir=%{_localstatedir} \
+        --sharedstatedir=%{_sharedstatedir} \
+        --mandir=%{_mandir} \
+        --infodir=%{_infodir} \
+        --with-bugurl=http://bugzilla.redhat.com/bugzilla \
+        --enable-languages=vhdl \
+        %{!?_without_mock:--disable-multilib} \
+        --enable-shared \
+        --enable-threads=posix \
+        --enable-checking=release \
+        --with-system-zlib \
+        --enable-__cxa_atexit \
+        --disable-libunwind-exceptions \
+        --disable-libgcj \
 %ifarch sparc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform} \
-	--target=%{gcc_target_platform} \
-	--with-cpu=v7
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform} \
+        --target=%{gcc_target_platform} \
+        --with-cpu=v7
 %endif
 %ifarch ppc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform} \
-	--target=%{gcc_target_platform} \
-	--with-cpu=default32
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform} \
+        --target=%{gcc_target_platform} \
+        --with-cpu=default32
 %endif
 %ifnarch sparc ppc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform}
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform}
 %endif
 
 # Parallel make doesn't work, so not using %{?_smp_mflags}
@@ -251,29 +251,29 @@
 # Remove files not to be packaged
 pushd %{buildroot}
 %{__rm} -f \
-	.%{_bindir}/{cpp,gcc,gccbug,gcov} \
-	.%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
-	.%{_includedir}/mf-runtime.h \
-	.%{_libdir}/lib* \
-	.%{_infodir}/dir \
-	.%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
-	.%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
-	.%{_mandir}/man1/{cpp,gcc,gcov}.1* \
-	.%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
-	.%{_exec_prefix}/lib/libgcc_s.* \
-	.%{_exec_prefix}/lib/libmudflap.* \
-	.%{_exec_prefix}/lib/libmudflapth.* \
-	.%{_libdir}/32/libiberty.a
+        .%{_bindir}/{cpp,gcc,gccbug,gcov} \
+        .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
+        .%{_includedir}/mf-runtime.h \
+        .%{_libdir}/lib* \
+        .%{_infodir}/dir \
+        .%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
+        .%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
+        .%{_mandir}/man1/{cpp,gcc,gcov}.1* \
+        .%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
+        .%{_exec_prefix}/lib/libgcc_s.* \
+        .%{_exec_prefix}/lib/libmudflap.* \
+        .%{_exec_prefix}/lib/libmudflapth.* \
+        .%{_libdir}/32/libiberty.a
 # Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
 %{__rm} -f \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
-	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
-	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
+        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools
 
 popd
 
@@ -282,11 +282,11 @@
 
 %post
 [ -f %{_infodir}/ghdl.info.gz ] && \
-	/sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
+        /sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
 
 %preun
 [ -f %{_infodir}/ghdl.info.gz ] && [ $1 = 0 ] && \
-	/sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
+        /sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
 
 %files
 %defattr(-,root,root,-)
@@ -299,6 +299,7 @@
 %{_mandir}/man1/*
 
 %files grt
+%defattr(-,root,root,-)
 # Need to own directory %{_libdir}/gcc even though we only want the
 # %{gcc_target_platform}/%{gccver} subdirectory
 %{_libdir}/gcc/



From sailer at fedoraproject.org  Thu Apr 16 09:13:58 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:58 +0000 (UTC)
Subject: rpms/mingw32-cairomm/devel mingw32-cairomm.spec,1.1,1.2
Message-ID: <20090416091358.CAE7670127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-cairomm/devel

Modified Files:
	mingw32-cairomm.spec 
Log Message:
replace %define with %global



Index: mingw32-cairomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairomm/devel/mingw32-cairomm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-cairomm.spec	8 Apr 2009 06:46:07 -0000	1.1
+++ mingw32-cairomm.spec	16 Apr 2009 09:13:28 -0000	1.2
@@ -1,12 +1,12 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-cairomm
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ API for the cairo graphics library
 
 License:        LGPLv2+
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.8.0-2
+- replace %%define with %%global
+
 * Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.8.0-1
 - update to 1.8.0
 



From sailer at fedoraproject.org  Thu Apr 16 09:13:59 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:59 +0000 (UTC)
Subject: rpms/mingw32-libsigc++20/devel mingw32-libsigc++20.spec,1.1,1.2
Message-ID: <20090416091359.61BB370127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-libsigc++20/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-libsigc++20/devel

Modified Files:
	mingw32-libsigc++20.spec 
Log Message:
replace %define with %global



Index: mingw32-libsigc++20.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsigc++20/devel/mingw32-libsigc++20.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-libsigc++20.spec	30 Mar 2009 21:45:48 -0000	1.1
+++ mingw32-libsigc++20.spec	16 Apr 2009 09:13:29 -0000	1.2
@@ -1,12 +1,12 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libsigc++20
 Version:        2.2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows port of the typesafe signal framework for C++
 
 License:        LGPLv2+
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.2.2-7
+- replace %%define with %%global
+
 * Sun Mar 29 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.2.2-6
 - remove executable permission from .dll.a and .la file
 - remove inappropriate comment



From sailer at fedoraproject.org  Thu Apr 16 09:13:59 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:59 +0000 (UTC)
Subject: rpms/mingw32-pangomm/devel mingw32-pangomm.spec,1.1,1.2
Message-ID: <20090416091359.9C2EB70127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-pangomm/devel

Modified Files:
	mingw32-pangomm.spec 
Log Message:
replace %define with %global



Index: mingw32-pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pangomm/devel/mingw32-pangomm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-pangomm.spec	12 Apr 2009 21:10:15 -0000	1.1
+++ mingw32-pangomm.spec	16 Apr 2009 09:13:29 -0000	1.2
@@ -1,14 +1,14 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
-%define apiver 1.4
+%global apiver 1.4
 
 Name:           mingw32-pangomm
 Version:        2.24.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ interface for Pango
 
 License:        LGPLv2+
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.0-2
+- replace %%define with %%global
+
 * Tue Apr  7 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.0-1
 - Update to upstream 2.24.0, to keep mingw32 package in sync with
   native pangomm



From sailer at fedoraproject.org  Thu Apr 16 09:13:59 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:59 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel mingw32-glibmm24.spec,1.1,1.2
Message-ID: <20090416091359.2225970127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-glibmm24/devel

Modified Files:
	mingw32-glibmm24.spec 
Log Message:
replace %define with %global



Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-glibmm24.spec	7 Apr 2009 05:57:55 -0000	1.1
+++ mingw32-glibmm24.spec	16 Apr 2009 09:13:28 -0000	1.2
@@ -1,12 +1,12 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glibmm24
 Version:        2.19.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-2
+- replace %%define with %%global
+
 * Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-1
 - update to 2.19.2
 



From sailer at fedoraproject.org  Thu Apr 16 09:14:00 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:14:00 +0000 (UTC)
Subject: rpms/mingw32-qt-qmake/devel mingw32-qt-qmake.spec,1.3,1.4
Message-ID: <20090416091400.5101070127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-qt-qmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-qt-qmake/devel

Modified Files:
	mingw32-qt-qmake.spec 
Log Message:
replace %define with %global



Index: mingw32-qt-qmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt-qmake/devel/mingw32-qt-qmake.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-qt-qmake.spec	7 Apr 2009 21:46:38 -0000	1.3
+++ mingw32-qt-qmake.spec	16 Apr 2009 09:13:29 -0000	1.4
@@ -1,14 +1,14 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 %global debug_package %{nil}
 
 Name:           mingw32-qt-qmake
 Version:        4.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-4
+- replace %%define with %%global
+
 * Tue Apr  7 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-3
 - disable empty debuginfo package
 



From sailer at fedoraproject.org  Thu Apr 16 09:14:00 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:14:00 +0000 (UTC)
Subject: rpms/mingw32-qwt/devel mingw32-qwt.spec,1.4,1.5
Message-ID: <20090416091400.86D7970127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-qwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-qwt/devel

Modified Files:
	mingw32-qwt.spec 
Log Message:
replace %define with %global



Index: mingw32-qwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qwt/devel/mingw32-qwt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mingw32-qwt.spec	16 Mar 2009 11:18:41 -0000	1.4
+++ mingw32-qwt.spec	16 Apr 2009 09:13:30 -0000	1.5
@@ -1,16 +1,16 @@
 %global name1 qwt
 %global name2 %{name1}5
 
-Name:		mingw32-%{name1}
-Summary:	MinGW Windows Qwt library
-Version:	5.1.1
-Release:	6%{?dist}
-URL:		http://qwt.sourceforge.net
-License:	LGPLv2 with exceptions
+Name:           mingw32-%{name1}
+Summary:        MinGW Windows Qwt library
+Version:        5.1.1
+Release:        7%{?dist}
+URL:            http://qwt.sourceforge.net
+License:        LGPLv2 with exceptions
 Group:          Development/Libraries
-Source:		http://downloads.sourceforge.net/%{name1}/%{name1}-%{version}.tar.bz2
-Patch0:		qwt-path.patch
-BuildRequires:	mingw32-qt
+Source:         http://downloads.sourceforge.net/%{name1}/%{name1}-%{version}.tar.bz2
+Patch0:         qwt-path.patch
+BuildRequires:  mingw32-qt
 BuildRequires:  mingw32-gcc-c++
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -19,12 +19,12 @@
 MinGW Windows Qwt library.
 
 
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
 
 %prep
 %setup -qn %{name1}-%{version}
@@ -79,6 +79,9 @@
 %{_mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.1.1-7
+- replace %%define with %%global
+
 * Mon Mar 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.1.1-6
 - actually fix the source line as required by the reviewer
 - remove commented out designer files in files section



From sailer at fedoraproject.org  Thu Apr 16 09:14:00 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:14:00 +0000 (UTC)
Subject: rpms/mingw32-wpcap/devel mingw32-wpcap.spec,1.1,1.2
Message-ID: <20090416091400.E509A70127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-wpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-wpcap/devel

Modified Files:
	mingw32-wpcap.spec 
Log Message:
replace %define with %global



Index: mingw32-wpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-wpcap/devel/mingw32-wpcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-wpcap.spec	27 Mar 2009 20:55:19 -0000	1.1
+++ mingw32-wpcap.spec	16 Apr 2009 09:13:30 -0000	1.2
@@ -1,13 +1,13 @@
-%define versionmajor 4
-%define versionminor 1
-%define versionsuffix beta5
+%global versionmajor 4
+%global versionminor 1
+%global versionsuffix beta5
 
-%define wpcapexamples %{_docdir}/%{name}/examples
-%define wpcapdoc %{_docdir}/%{name}
+%global wpcapexamples %{_docdir}/%{name}/examples
+%global wpcapdoc %{_docdir}/%{name}
 
 Name:           mingw32-wpcap
 Version:        %{versionmajor}.%{versionminor}.%{versionsuffix}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW user-level packet capture
 
 Group:          Development/Libraries
@@ -40,12 +40,12 @@
 %description docs
 This package contains the Windows pcap library documentation.
 
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
 
 %prep
 %setup -q -n winpcap
@@ -132,6 +132,9 @@
 %{wpcapexamples}
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.1.beta5-3
+- replace %%define with %%global
+
 * Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.1.beta5-2
 - fix BR
 - add license file



From sailer at fedoraproject.org  Thu Apr 16 09:13:59 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:59 +0000 (UTC)
Subject: rpms/mingw32-qt/devel mingw32-qt.spec,1.3,1.4
Message-ID: <20090416091359.EA2D670127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/mingw32-qt/devel

Modified Files:
	mingw32-qt.spec 
Log Message:
replace %define with %global



Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-qt.spec	31 Mar 2009 20:13:29 -0000	1.3
+++ mingw32-qt.spec	16 Apr 2009 09:13:29 -0000	1.4
@@ -1,8 +1,8 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 # NOTES, please read these carefully first:
 #
@@ -13,11 +13,11 @@
 #   from the native Fedora package.  The reason is so that we can
 #   set the default include and library paths correctly.
 
-%define subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools
+%global subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools
 
 Name:           mingw32-qt
 Version:        4.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -237,6 +237,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-5
+- replace %%define with %%global
+
 * Tue Mar 31 2009 Kalev Lember <kalev at smartlink.ee> - 4.5.0-4
 - Enable QtOpenGL, QtScript, QtScriptTools, and QtXmlPatterns.
 - Sort files section for readability.



From sailer at fedoraproject.org  Thu Apr 16 09:13:58 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:13:58 +0000 (UTC)
Subject: rpms/libsqlite3x/devel libsqlite3x.spec,1.2,1.3
Message-ID: <20090416091358.826D570127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/libsqlite3x/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11275/libsqlite3x/devel

Modified Files:
	libsqlite3x.spec 
Log Message:
replace %define with %global



Index: libsqlite3x.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsqlite3x/devel/libsqlite3x.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsqlite3x.spec	25 Feb 2009 19:04:37 -0000	1.2
+++ libsqlite3x.spec	16 Apr 2009 09:13:28 -0000	1.3
@@ -1,10 +1,10 @@
-%define veryear 2007
-%define vermon  10
-%define verday  18
-%define namesq3 libsq3
+%global veryear 2007
+%global vermon  10
+%global verday  18
+%global namesq3 libsq3
 Name:           libsqlite3x
 Version:        %{veryear}%{vermon}%{verday}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A C++ Wrapper for the SQLite3 embeddable SQL database engine
 
 Group:          System Environment/Libraries
@@ -115,6 +115,9 @@
 %{_libdir}/pkgconfig/libsq3.pc
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-6
+- replace %%define with %%global
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071018-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From alexl at fedoraproject.org  Thu Apr 16 09:16:00 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Thu, 16 Apr 2009 09:16:00 +0000 (UTC)
Subject: rpms/nautilus/F-11 nautilus-2.26.2-icon-whitespace.patch, NONE,
	1.1 nautilus.spec, 1.270, 1.271 sources, 1.99, 1.100
Message-ID: <20090416091600.D4C0D70127@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/nautilus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11939

Modified Files:
	nautilus.spec sources 
Added Files:
	nautilus-2.26.2-icon-whitespace.patch 
Log Message:
* Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
- Fix excessive whitespace on the right in icon view when zooming
- Fixes Gnome bug #579086


nautilus-2.26.2-icon-whitespace.patch:

--- NEW FILE nautilus-2.26.2-icon-whitespace.patch ---
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c	(revision 15183)
+++ libnautilus-private/nautilus-icon-container.c	(revision 15184)
@@ -1033,9 +1033,9 @@
 	GtkAllocation *allocation;
 	gboolean reset_scroll_region;
 
+	pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
+
 	if (nautilus_icon_container_get_is_fixed_size (container)) {
-		pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
-
 		/* Set the scroll region to the size of the container allocation */
 		allocation = &GTK_WIDGET (container)->allocation;
 		eel_canvas_set_scroll_region
@@ -1090,7 +1090,7 @@
 	if (nautilus_icon_container_is_auto_layout (container)) {
 		allocation = &GTK_WIDGET (container)->allocation;
 		x1 = MIN (x1, 0);
-		x2 = MAX (x2, allocation->width);
+		x2 = MAX (x2, allocation->width / pixels_per_unit);
 		y1 = 0;
 	} else {
 		/* Otherwise we add the padding that is at the start of the


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- nautilus.spec	13 Apr 2009 19:50:18 -0000	1.270
+++ nautilus.spec	16 Apr 2009 09:15:30 -0000	1.271
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# From svn (rev 15184)
+Patch18:	nautilus-2.26.2-icon-whitespace.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -124,6 +127,7 @@
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p0 -b .whitespace
 
 %build
 
@@ -261,6 +265,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
+- Fix excessive whitespace on the right in icon view when zooming
+- Fixes Gnome bug #579086
+
 * Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-1
 - Update to 2.26.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/F-11/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	13 Apr 2009 19:50:18 -0000	1.99
+++ sources	16 Apr 2009 09:15:30 -0000	1.100
@@ -1,2 +1 @@
-5d75f5de2806e9003e36a4613866b8d1  nautilus-2.26.1.tar.bz2
 6b9292ed9dde8b5f86a3b6df1422d5f8  nautilus-2.26.2.tar.bz2



From pmatilai at fedoraproject.org  Thu Apr 16 09:24:39 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 16 Apr 2009 09:24:39 +0000 (UTC)
Subject: rpms/rpm/F-11 .cvsignore, 1.35, 1.36 rpm.spec, 1.344, 1.345 sources,
	1.141, 1.142
Message-ID: <20090416092439.7ABD970127@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12658

Modified Files:
	.cvsignore rpm.spec sources 
Log Message:
- update to 4.7.0 final
- fixes #494049, #495429
- dont permit test-suite failure anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	9 Apr 2009 12:46:15 -0000	1.35
+++ .cvsignore	16 Apr 2009 09:24:07 -0000	1.36
@@ -1 +1 @@
-rpm-4.7.0-rc1.tar.bz2
+rpm-4.7.0.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- rpm.spec	9 Apr 2009 12:46:15 -0000	1.344
+++ rpm.spec	16 Apr 2009 09:24:07 -0000	1.345
@@ -16,8 +16,8 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.7.0
-%define snapver rc1
-%define srcver %{rpmver}-%{snapver}
+%define snapver {nil}
+%define srcver %{rpmver}
 
 %define bdbver 4.7.25
 %define dbprefix db
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -269,8 +269,7 @@
 
 %if %{with check}
 %check
-# missing file in beta1 tarball causes two failures, permit failure for now
-make check ||:
+make check
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -394,6 +393,11 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-1
+- update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)
+- fixes #494049, #495429
+- dont permit test-suite failure anymore
+
 * Thu Apr 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.rc1.1
 - update to 4.7.0-rc1
 - fixes #493157, #493777, #493696, #491388, #487597, #493162


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	9 Apr 2009 12:46:16 -0000	1.141
+++ sources	16 Apr 2009 09:24:08 -0000	1.142
@@ -1 +1 @@
-321862428ef48d9d0bc36f7058b3b6c7  rpm-4.7.0-rc1.tar.bz2
+74791d638c571ec79f06227d453a6a03  rpm-4.7.0.tar.bz2



From karsten at fedoraproject.org  Thu Apr 16 09:26:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:42 +0000 (UTC)
Subject: rpms/mediawiki/devel mediawiki.spec,1.30,1.31
Message-ID: <20090416092642.4703370141@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/mediawiki/devel

Modified Files:
	mediawiki.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mediawiki.spec	28 Feb 2009 18:33:26 -0000	1.30
+++ mediawiki.spec	16 Apr 2009 09:26:12 -0000	1.31
@@ -8,6 +8,7 @@
 Source0: http://download.wikimedia.org/mediawiki/1.14/%{name}-%{version}.tar.gz
 Patch0: mediawiki-1.14.0-commoncode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+ExcludeArch:    sparc64 s390 s390x
 BuildRequires: ocaml >= 3.06
 # to make sure the "apache" group is created before mediawiki is installed
 Requires(pre): httpd
@@ -111,6 +112,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Sat Feb 28 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.14.0-45
 - Update to 1.14.0.
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:42 +0000 (UTC)
Subject: rpms/coccinelle/devel coccinelle.spec,1.1,1.2
Message-ID: <20090416092642.085E07013C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/coccinelle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/coccinelle/devel

Modified Files:
	coccinelle.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: coccinelle.spec
===================================================================
RCS file: /cvs/extras/rpms/coccinelle/devel/coccinelle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coccinelle.spec	18 Mar 2009 09:32:42 -0000	1.1
+++ coccinelle.spec	16 Apr 2009 09:26:11 -0000	1.2
@@ -15,6 +15,7 @@
 License:        GPLv2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 URL:            http://www.emn.fr/x-info/coccinelle/
 Source0:        http://www.emn.fr/x-info/coccinelle/distrib/%{name}-%{version}.tgz
@@ -155,6 +156,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 17 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1.5-3
 - Make the documentation subpackage "-doc" not "-docs".
 - Comment about patch0 and send upstream.



From karsten at fedoraproject.org  Thu Apr 16 09:26:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:43 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.72,1.73
Message-ID: <20090416092643.1687F70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/plplot/devel

Modified Files:
	plplot.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- plplot.spec	27 Mar 2009 21:17:59 -0000	1.72
+++ plplot.spec	16 Apr 2009 09:26:12 -0000	1.73
@@ -24,6 +24,7 @@
 Patch5:         plplot-5.9.2-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
 BuildRequires:  gcc-gfortran
@@ -604,6 +605,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Fri Mar 27 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-4
 - Enable ada on ppc64 (resolves bug#241233)
 - freefont is now gnu-free-{mono,sans,serif}-fonts



From karsten at fedoraproject.org  Thu Apr 16 09:26:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:42 +0000 (UTC)
Subject: rpms/monotone-viz/devel monotone-viz.spec,1.4,1.5
Message-ID: <20090416092642.7D4C570127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/monotone-viz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/monotone-viz/devel

Modified Files:
	monotone-viz.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: monotone-viz.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone-viz/devel/monotone-viz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monotone-viz.spec	26 Feb 2009 23:54:49 -0000	1.4
+++ monotone-viz.spec	16 Apr 2009 09:26:12 -0000	1.5
@@ -22,6 +22,7 @@
 Requires:       graphviz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 # Apparently necessary exclusion for ocaml packages.
 ExcludeArch:    ppc64
@@ -66,6 +67,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Thu Feb 26 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1-4
 - Add patch to avoid name clash with ocaml-lablgtk-2.12.
 - Untabify spec file.



From karsten at fedoraproject.org  Thu Apr 16 09:26:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:42 +0000 (UTC)
Subject: rpms/freetennis/devel freetennis.spec,1.14,1.15
Message-ID: <20090416092642.2355F7013F@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/freetennis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/freetennis/devel

Modified Files:
	freetennis.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: freetennis.spec
===================================================================
RCS file: /cvs/extras/rpms/freetennis/devel/freetennis.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freetennis.spec	24 Feb 2009 18:28:07 -0000	1.14
+++ freetennis.spec	16 Apr 2009 09:26:11 -0000	1.15
@@ -14,6 +14,7 @@
 Patch0:         freetennis-0.4.8-pathfixes.patch
 Patch1:         freetennis-0.4.8-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 BuildRequires:  ocaml, SDL_gfx-devel, SDL_mixer-devel, gdk-pixbuf-devel 
 BuildRequires:  libXmu-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  SDL_ttf-devel
@@ -81,6 +82,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/freetennis.png
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.8-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:42 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:42 +0000 (UTC)
Subject: rpms/orpie/devel orpie.spec,1.9,1.10
Message-ID: <20090416092642.C39BA70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/orpie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/orpie/devel

Modified Files:
	orpie.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: orpie.spec
===================================================================
RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- orpie.spec	26 Feb 2009 09:04:44 -0000	1.9
+++ orpie.spec	16 Apr 2009 09:26:12 -0000	1.10
@@ -16,6 +16,7 @@
 Source:         http://www.eecs.umich.edu/~pelzlpj/orpie/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 ################################################################################
 
@@ -80,6 +81,10 @@
 ################################################################################
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:41 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:41 +0000 (UTC)
Subject: rpms/cduce/devel cduce.spec,1.11,1.12
Message-ID: <20090416092641.BD4C070127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/cduce/devel

Modified Files:
	cduce.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: cduce.spec
===================================================================
RCS file: /cvs/extras/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cduce.spec	24 Feb 2009 06:55:12 -0000	1.11
+++ cduce.spec	16 Apr 2009 09:26:11 -0000	1.12
@@ -15,7 +15,7 @@
 License:        BSD
 URL:            http://www.cduce.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 s390 s390x sparc64
 
 Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
 Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
@@ -165,6 +165,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:43 +0000 (UTC)
Subject: rpms/unison213/devel unison213.spec,1.6,1.7
Message-ID: <20090416092643.9F9E470127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/unison213/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/unison213/devel

Modified Files:
	unison213.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: unison213.spec
===================================================================
RCS file: /cvs/extras/rpms/unison213/devel/unison213.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- unison213.spec	25 Feb 2009 23:05:22 -0000	1.6
+++ unison213.spec	16 Apr 2009 09:26:13 -0000	1.7
@@ -33,6 +33,7 @@
 Source0:   http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{version}/unison-%{version}.tar.gz
 Source1:   unison.png
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires: ocaml >= 3.10.2-2
 BuildRequires: ocaml-lablgtk-devel >= 2.6.0
@@ -127,6 +128,10 @@
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13.16-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:43 +0000 (UTC)
Subject: rpms/spring-installer/devel spring-installer.spec,1.4,1.5
Message-ID: <20090416092643.60DC470127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/spring-installer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/spring-installer/devel

Modified Files:
	spring-installer.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: spring-installer.spec
===================================================================
RCS file: /cvs/extras/rpms/spring-installer/devel/spring-installer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spring-installer.spec	4 Apr 2009 14:34:20 -0000	1.4
+++ spring-installer.spec	16 Apr 2009 09:26:13 -0000	1.5
@@ -9,6 +9,7 @@
 Source0:        http://files.caspring.org/release/spring-installer_%{version}.orig.tar.gz
 Patch0:         spring-installer-20090316-systemcamlzip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml, ocaml-findlib, ocaml-extlib-devel, ocaml-lablgtk-devel
 BuildRequires:  ocaml-ocamlnet-devel, ocaml-pcre-devel, chrpath, desktop-file-utils
@@ -129,6 +130,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-6
 - fix patch and buildreq
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:44 +0000 (UTC)
Subject: rpms/virt-df/devel virt-df.spec,1.10,1.11
Message-ID: <20090416092644.8242770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/virt-df/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-df/devel

Modified Files:
	virt-df.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: virt-df.spec
===================================================================
RCS file: /cvs/extras/rpms/virt-df/devel/virt-df.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- virt-df.spec	10 Mar 2009 11:20:53 -0000	1.10
+++ virt-df.spec	16 Apr 2009 09:26:14 -0000	1.11
@@ -12,6 +12,7 @@
 URL:            http://et.redhat.com/~rjones/virt-df/
 Source0:        http://et.redhat.com/~rjones/virt-df/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         virt-df-2.1.4-bogus-zh_CN-plurals.patch
 
@@ -98,6 +99,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 2.1.5-1
 - New upstream version 2.1.5.
 - Remove patch for camlp4, since it's now upstream.



From karsten at fedoraproject.org  Thu Apr 16 09:26:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:44 +0000 (UTC)
Subject: rpms/virt-ctrl/devel virt-ctrl.spec,1.3,1.4
Message-ID: <20090416092644.3CAC470127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/virt-ctrl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-ctrl/devel

Modified Files:
	virt-ctrl.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: virt-ctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/virt-ctrl/devel/virt-ctrl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- virt-ctrl.spec	26 Feb 2009 00:28:07 -0000	1.3
+++ virt-ctrl.spec	16 Apr 2009 09:26:13 -0000	1.4
@@ -11,6 +11,7 @@
 URL:            http://et.redhat.com/~rjones/virt-ctrl/
 Source0:        http://et.redhat.com/~rjones/virt-ctrl/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-ocamldoc
@@ -93,6 +94,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:43 +0000 (UTC)
Subject: rpms/unison227/devel unison227.spec,1.6,1.7
Message-ID: <20090416092643.E5E8870127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/unison227/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/unison227/devel

Modified Files:
	unison227.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: unison227.spec
===================================================================
RCS file: /cvs/extras/rpms/unison227/devel/unison227.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- unison227.spec	25 Feb 2009 23:06:19 -0000	1.6
+++ unison227.spec	16 Apr 2009 09:26:13 -0000	1.7
@@ -33,6 +33,7 @@
 Source0:   http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{version}/unison-%{version}.tar.gz
 Source1:   unison.png
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires: ocaml >= 3.10.2-2
 BuildRequires: ocaml-lablgtk-devel >= 2.6.0
@@ -127,6 +128,10 @@
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.57-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:44 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:44 +0000 (UTC)
Subject: rpms/virt-mem/devel virt-mem.spec,1.8,1.9
Message-ID: <20090416092644.C945970127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/virt-mem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-mem/devel

Modified Files:
	virt-mem.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: virt-mem.spec
===================================================================
RCS file: /cvs/extras/rpms/virt-mem/devel/virt-mem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- virt-mem.spec	26 Feb 2009 00:33:26 -0000	1.8
+++ virt-mem.spec	16 Apr 2009 09:26:14 -0000	1.9
@@ -11,6 +11,7 @@
 URL:            http://et.redhat.com/~rjones/virt-mem/
 Source0:        http://et.redhat.com/~rjones/virt-mem/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         virt-mem-0.3.1-bitstring2.patch
 Patch1:         virt-mem-0.3.1-dynlink.patch
@@ -112,6 +113,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:45 +0000 (UTC)
Subject: rpms/wyrd/devel wyrd.spec,1.11,1.12
Message-ID: <20090416092645.5C89270127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/wyrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/wyrd/devel

Modified Files:
	wyrd.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: wyrd.spec
===================================================================
RCS file: /cvs/extras/rpms/wyrd/devel/wyrd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wyrd.spec	26 Feb 2009 07:30:15 -0000	1.11
+++ wyrd.spec	16 Apr 2009 09:26:15 -0000	1.12
@@ -12,6 +12,7 @@
 Patch0:         wyrd-1.4.3-wyrdrc-local.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml remind ncurses-devel
 BuildRequires:  ocaml-camlp4-devel
@@ -53,6 +54,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Apr 16 09:26:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 09:26:45 +0000 (UTC)
Subject: rpms/virt-top/devel virt-top.spec,1.5,1.6
Message-ID: <20090416092645.18C2C70127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/virt-top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785/virt-top/devel

Modified Files:
	virt-top.spec 
Log Message:
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
  (added sparc64 per request from the sparc maintainer)




Index: virt-top.spec
===================================================================
RCS file: /cvs/extras/rpms/virt-top/devel/virt-top.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- virt-top.spec	26 Feb 2009 00:35:02 -0000	1.5
+++ virt-top.spec	16 Apr 2009 09:26:14 -0000	1.6
@@ -11,6 +11,7 @@
 URL:            http://et.redhat.com/~rjones/virt-top/
 Source0:        http://et.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         virt-top-1.0.3-bogus-zh_CN-plurals.patch
 
@@ -98,6 +99,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sailer at fedoraproject.org  Thu Apr 16 09:27:14 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:27:14 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/F-11 .cvsignore, 1.2,
	1.3 mingw32-glibmm24.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090416092714.DF3C970127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13041/F-11

Modified Files:
	.cvsignore mingw32-glibmm24.spec sources 
Log Message:
update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 05:57:55 -0000	1.2
+++ .cvsignore	16 Apr 2009 09:26:44 -0000	1.3
@@ -1 +1,2 @@
 glibmm-2.19.2.tar.bz2
+glibmm-2.20.0.tar.bz2


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-11/mingw32-glibmm24.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-glibmm24.spec	7 Apr 2009 05:57:55 -0000	1.1
+++ mingw32-glibmm24.spec	16 Apr 2009 09:26:44 -0000	1.2
@@ -5,14 +5,14 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glibmm24
-Version:        2.19.2
+Version:        2.20.0
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.19/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-1
+- update to 2.20.0
+
 * Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-1
 - update to 2.19.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 05:57:55 -0000	1.2
+++ sources	16 Apr 2009 09:26:44 -0000	1.3
@@ -1 +1 @@
-9915c92a5a4b55fc2696bedf0d7af4cb  glibmm-2.19.2.tar.bz2
+38fa409b531144c238b6e2532e351799  glibmm-2.20.0.tar.bz2



From sailer at fedoraproject.org  Thu Apr 16 09:27:15 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:27:15 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel mingw32-glibmm24.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090416092715.292EE70127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13041/devel

Modified Files:
	mingw32-glibmm24.spec sources 
Log Message:
update to 2.20.0



Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-glibmm24.spec	16 Apr 2009 09:13:28 -0000	1.2
+++ mingw32-glibmm24.spec	16 Apr 2009 09:26:44 -0000	1.3
@@ -5,14 +5,14 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glibmm24
-Version:        2.19.2
+Version:        2.20.0
 Release:        2%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.19/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -79,7 +79,8 @@
 
 
 %changelog
-* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-2
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-2
+- update to 2.20.0
 - replace %%define with %%global
 
 * Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.19.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 05:57:55 -0000	1.2
+++ sources	16 Apr 2009 09:26:44 -0000	1.3
@@ -1 +1 @@
-9915c92a5a4b55fc2696bedf0d7af4cb  glibmm-2.19.2.tar.bz2
+38fa409b531144c238b6e2532e351799  glibmm-2.20.0.tar.bz2



From sailer at fedoraproject.org  Thu Apr 16 09:28:40 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 09:28:40 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel .cvsignore,1.2,1.3
Message-ID: <20090416092840.CA46C70127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13279/devel

Modified Files:
	.cvsignore 
Log Message:
also update cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 05:57:55 -0000	1.2
+++ .cvsignore	16 Apr 2009 09:28:10 -0000	1.3
@@ -1 +1,2 @@
 glibmm-2.19.2.tar.bz2
+glibmm-2.20.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Apr 16 09:29:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 09:29:41 +0000
Subject: [pkgdb] fedora-release: athimm has requested watchcommits
Message-ID: <20090416092941.C237710F852@bastion2.fedora.phx.redhat.com>

athimm has requested the watchcommits acl on fedora-release (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-release



From pbrobinson at fedoraproject.org  Thu Apr 16 09:35:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 16 Apr 2009 09:35:20 +0000 (UTC)
Subject: rpms/geoclue/F-10 geoclue.spec,1.7,1.8 sources,1.2,1.3
Message-ID: <20090416093520.9CABD70127@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13974

Modified Files:
	geoclue.spec sources 
Log Message:
- Move to a git snapshot until we finally get a new stable release


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-10/geoclue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geoclue.spec	28 Mar 2009 07:16:57 -0000	1.7
+++ geoclue.spec	16 Apr 2009 09:34:50 -0000	1.8
@@ -1,12 +1,22 @@
+# Tarfile created using git
+# git clone git://anongit.freedesktop.org/geoclue
+# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz
+
+%define gitdate 20090310
+%define git_version 3a31d26
+%define tarfile %{name}-%{version}-%{gitdate}.tar.gz
+%define snapshot %{gitdate}git%{git_version}
+
 Name:           geoclue
-Version:        0.11.1
-Release:        13%{?dist}
-Summary:        Geoclue is a modular geoinformation service
+Version:        0.11.1.1
+Release:        0.1.%{snapshot}%{?dist}
+Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
-Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
+#Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
+Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel
@@ -18,6 +28,11 @@
 BuildRequires: NetworkManager-devel
 BuildRequires: gypsy-devel
 BuildRequires: gpsd-devel
+BuildRequires: gtk-doc
+# Require these until we move back to a formal release
+BuildRequires: libtool
+BuildRequires: automake
+BuildRequires: autoconf
 
 Requires: dbus
 
@@ -29,7 +44,9 @@
 %package devel
 Summary: Development package for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
+Requires: dbus-devel
+Requires: libxml2-devel
 Requires: pkgconfig
 %description devel
 Files for development with geoclue.
@@ -37,7 +54,8 @@
 %package gui
 Summary: Testing gui for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description gui
 Testing gui for geoclue
@@ -45,7 +63,7 @@
 %package gpsd
 Summary: gpsd provider for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: gpsd
 
 %description gpsd
@@ -54,7 +72,7 @@
 %package gypsy
 Summary: gypsy provider for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: gypsy
 
 %description gypsy
@@ -64,6 +82,7 @@
 %setup -q
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -71,6 +90,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libgeoclue.la
+# Install the test gui as it seems the test isn't installed any more
+mkdir $RPM_BUILD_ROOT%{_bindir}
+cp test/geoclue-test-gui $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,29 +133,38 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/geoclue
-%dir %{_datadir}/gtk-doc/html/geoclue/
-%doc %{_datadir}/gtk-doc/html/geoclue/*
-%{_includedir}/geoclue/*
+%{_includedir}/geoclue
 %{_libdir}/pkgconfig/geoclue.pc
 %{_libdir}/libgeoclue.so
 
 %files gui
+%defattr(-,root,root,-)
 %{_bindir}/geoclue-test-gui
 
 %files gpsd
+%defattr(-,root,root,-)
 %{_libexecdir}/geoclue-gpsd
 %{_datadir}/geoclue-providers/geoclue-gpsd.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
 
 %files gypsy
+%defattr(-,root,root,-)
 %{_libexecdir}/geoclue-gypsy
 %{_datadir}/geoclue-providers/geoclue-gypsy.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 %changelog
-* Sat Mar 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1-13
-- Rebuild for gpsd soname bump
+* Thu Apr 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.1
+- Move to a git snapshot until we finally get a new stable release
+
+* Wed Mar 4 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1-15
+- Move docs to noarch, a few spec file cleanups
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 22 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-13
+- Fix summary
 
 * Thu Jul 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-12
 - Once more for fun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2008 11:29:05 -0000	1.2
+++ sources	16 Apr 2009 09:34:50 -0000	1.3
@@ -1 +1 @@
-b6caaea3fdeebf5e9896bbbc2a306ffd  geoclue-0.11.1.tar.gz
+e7c5cede9f8e18e9bbd1fb3af78a594b  geoclue-0.11.1.1-20090310.tar.gz



From pbrobinson at fedoraproject.org  Thu Apr 16 09:47:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 16 Apr 2009 09:47:34 +0000 (UTC)
Subject: rpms/geoclue/F-9 geoclue.spec,1.10,1.11 sources,1.2,1.3
Message-ID: <20090416094734.E345770127@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15632

Modified Files:
	geoclue.spec sources 
Log Message:
- Move to a git snapshot until we finally get a new stable release


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-9/geoclue.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geoclue.spec	28 Mar 2009 07:22:45 -0000	1.10
+++ geoclue.spec	16 Apr 2009 09:47:04 -0000	1.11
@@ -1,12 +1,22 @@
+# Tarfile created using git
+# git clone git://anongit.freedesktop.org/geoclue
+# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz
+
+%define gitdate 20090310
+%define git_version 3a31d26
+%define tarfile %{name}-%{version}-%{gitdate}.tar.gz
+%define snapshot %{gitdate}git%{git_version}
+
 Name:           geoclue
-Version:        0.11.1
-Release:        13%{?dist}
-Summary:        Geoclue is a modular geoinformation service
+Version:        0.11.1.1
+Release:        0.1.%{snapshot}%{?dist}
+Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
-Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
+#Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
+Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel
@@ -18,6 +28,11 @@
 BuildRequires: NetworkManager-devel
 BuildRequires: gypsy-devel
 BuildRequires: gpsd-devel
+BuildRequires: gtk-doc
+# Require these until we move back to a formal release
+BuildRequires: libtool
+BuildRequires: automake
+BuildRequires: autoconf
 
 Requires: dbus
 
@@ -29,7 +44,9 @@
 %package devel
 Summary: Development package for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
+Requires: dbus-devel
+Requires: libxml2-devel
 Requires: pkgconfig
 %description devel
 Files for development with geoclue.
@@ -37,7 +54,8 @@
 %package gui
 Summary: Testing gui for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description gui
 Testing gui for geoclue
@@ -45,7 +63,7 @@
 %package gpsd
 Summary: gpsd provider for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: gpsd
 
 %description gpsd
@@ -54,7 +72,7 @@
 %package gypsy
 Summary: gypsy provider for geoclue
 Group: Development/Libraries
-Requires: geoclue = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Requires: gypsy
 
 %description gypsy
@@ -64,6 +82,7 @@
 %setup -q
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -71,6 +90,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libgeoclue.la
+# Install the test gui as it seems the test isn't installed any more
+mkdir $RPM_BUILD_ROOT%{_bindir}
+cp test/geoclue-test-gui $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,29 +133,38 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/geoclue
-%dir %{_datadir}/gtk-doc/html/geoclue/
-%doc %{_datadir}/gtk-doc/html/geoclue/*
-%{_includedir}/geoclue/*
+%{_includedir}/geoclue
 %{_libdir}/pkgconfig/geoclue.pc
 %{_libdir}/libgeoclue.so
 
 %files gui
+%defattr(-,root,root,-)
 %{_bindir}/geoclue-test-gui
 
 %files gpsd
+%defattr(-,root,root,-)
 %{_libexecdir}/geoclue-gpsd
 %{_datadir}/geoclue-providers/geoclue-gpsd.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
 
 %files gypsy
+%defattr(-,root,root,-)
 %{_libexecdir}/geoclue-gypsy
 %{_datadir}/geoclue-providers/geoclue-gypsy.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
 %changelog
-* Sat Mar 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1-13
-- Rebuild for gpsd soname bump
+* Thu Apr 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.1
+- Move to a git snapshot until we finally get a new stable release
+
+* Wed Mar 4 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1-15
+- Move docs to noarch, a few spec file cleanups
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 22 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-13
+- Fix summary
 
 * Thu Jul 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-12
 - Once more for fun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2008 11:56:42 -0000	1.2
+++ sources	16 Apr 2009 09:47:04 -0000	1.3
@@ -1 +1 @@
-b6caaea3fdeebf5e9896bbbc2a306ffd  geoclue-0.11.1.tar.gz
+e7c5cede9f8e18e9bbd1fb3af78a594b  geoclue-0.11.1.1-20090310.tar.gz



From mgrepl at fedoraproject.org  Thu Apr 16 09:49:21 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 16 Apr 2009 09:49:21 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.162,
	1.163 selinux-policy.spec, 1.790, 1.791
Message-ID: <20090416094921.8D15F70127@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15877

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Fix iptables labeling



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- policy-20080710.patch	14 Apr 2009 15:54:45 -0000	1.162
+++ policy-20080710.patch	16 Apr 2009 09:49:20 -0000	1.163
@@ -23475,7 +23475,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.13/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/postfix.te	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/postfix.te	2009-04-16 11:01:18.000000000 +0200
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -23554,7 +23554,15 @@
  
  allow postfix_master_t postfix_etc_t:file rw_file_perms;
  
-@@ -142,6 +159,7 @@
+@@ -132,6 +149,7 @@
+ # allow access to deferred queue and allow removing bogus incoming entries
+ manage_dirs_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_master_t, postfix_spool_t, dir)
+ 
+ allow postfix_master_t postfix_spool_bounce_t:dir manage_dir_perms;
+ allow postfix_master_t postfix_spool_bounce_t:file getattr;
+@@ -142,6 +160,7 @@
  
  delete_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
  rename_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
@@ -23562,7 +23570,7 @@
  
  kernel_read_all_sysctls(postfix_master_t)
  
-@@ -153,14 +171,19 @@
+@@ -153,14 +172,19 @@
  corenet_udp_sendrecv_all_nodes(postfix_master_t)
  corenet_tcp_sendrecv_all_ports(postfix_master_t)
  corenet_udp_sendrecv_all_ports(postfix_master_t)
@@ -23582,7 +23590,7 @@
  # for a find command
  selinux_dontaudit_search_fs(postfix_master_t)
  
-@@ -170,6 +193,8 @@
+@@ -170,6 +194,8 @@
  domain_use_interactive_fds(postfix_master_t)
  
  files_read_usr_files(postfix_master_t)
@@ -23591,7 +23599,7 @@
  
  term_dontaudit_search_ptys(postfix_master_t)
  
-@@ -181,15 +206,14 @@
+@@ -181,15 +207,14 @@
  
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -23611,7 +23619,7 @@
  ')
  
  optional_policy(`
-@@ -202,9 +226,29 @@
+@@ -202,9 +227,29 @@
  ')
  
  optional_policy(`
@@ -23641,7 +23649,7 @@
  ########################################
  #
  # Postfix bounce local policy
-@@ -245,6 +289,10 @@
+@@ -245,6 +290,10 @@
  
  corecmd_exec_bin(postfix_cleanup_t)
  
@@ -23652,7 +23660,7 @@
  ########################################
  #
  # Postfix local local policy
-@@ -270,18 +318,25 @@
+@@ -270,18 +319,25 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -23678,7 +23686,7 @@
  ')
  
  optional_policy(`
-@@ -292,8 +347,7 @@
+@@ -292,8 +348,7 @@
  #
  # Postfix map local policy
  #
@@ -23688,7 +23696,7 @@
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -343,8 +397,6 @@
+@@ -343,8 +398,6 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -23697,7 +23705,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(postfix_map_t)
  	files_read_default_files(postfix_map_t)
-@@ -357,6 +409,11 @@
+@@ -357,6 +410,11 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -23709,7 +23717,7 @@
  ########################################
  #
  # Postfix pickup local policy
-@@ -381,6 +438,7 @@
+@@ -381,6 +439,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -23717,7 +23725,7 @@
  
  write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
  
-@@ -388,6 +446,12 @@
+@@ -388,6 +447,12 @@
  
  rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
  
@@ -23730,7 +23738,7 @@
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -397,6 +461,15 @@
+@@ -397,6 +462,15 @@
  ')
  
  optional_policy(`
@@ -23746,7 +23754,7 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -433,8 +506,11 @@
+@@ -433,8 +507,11 @@
  ')
  
  optional_policy(`
@@ -23760,7 +23768,7 @@
  ')
  
  #######################################
-@@ -460,6 +536,15 @@
+@@ -460,6 +537,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -23776,7 +23784,7 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -520,6 +605,11 @@
+@@ -520,6 +606,11 @@
  	cyrus_stream_connect(postfix_smtp_t)
  ')
  
@@ -23788,7 +23796,7 @@
  ########################################
  #
  # Postfix smtpd local policy
-@@ -540,9 +630,18 @@
+@@ -540,9 +631,18 @@
  
  # for OpenSSL certificates
  files_read_usr_files(postfix_smtpd_t)
@@ -23807,7 +23815,7 @@
  	mailman_read_data_files(postfix_smtpd_t)
  ')
  
-@@ -569,7 +668,7 @@
+@@ -569,7 +669,7 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process
@@ -33416,20 +33424,27 @@
  allow setkey_t ipsec_conf_file_t:dir list_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.5.13/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/iptables.fc	2009-04-14 17:49:05.000000000 +0200
-@@ -1,8 +1,6 @@
++++ serefpolicy-3.5.13/policy/modules/system/iptables.fc	2009-04-16 11:43:52.000000000 +0200
+@@ -1,8 +1,13 @@
++/sbin/ip6tables.*       	--      gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ipchains.*        	--      gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables  		-- 	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-restore  	-- 	gen_context(system_u:object_r:iptables_exec_t,s0)
++/sbin/ip6?tables-multi  	-- 	gen_context(system_u:object_r:iptables_exec_t,s0)
  
 -/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 -/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 -/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
-+/sbin/ip6?tables  		-- gen_context(system_u:object_r:iptables_exec_t,s0)
-+/sbin/ip6?tables-restore  	-- gen_context(system_u:object_r:iptables_exec_t,s0)
-+/sbin/ip6?tables-multi  	-- gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/ipchains.*    	--      gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables              --      gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables-restore      --      gen_context(system_u:object_r:iptables_exec_t,s0)
++/usr/sbin/iptables-multi        --      gen_context(system_u:object_r:iptables_exec_t,s0)
++
++/var/lib/shorewall(/.*)? 	--	gen_context(system_u:object_r:iptables_var_run_t,s0)
  
 -/usr/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 -/usr/sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 -/usr/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
-+/var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.5.13/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2008-10-17 14:49:13.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/system/iptables.te	2009-02-10 15:07:15.000000000 +0100


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- selinux-policy.spec	14 Apr 2009 15:54:46 -0000	1.790
+++ selinux-policy.spec	16 Apr 2009 09:49:20 -0000	1.791
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -460,6 +460,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-57
+- Fix iptables labeling
+
 * Tue Apr 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-56
 - Fix fail2ban policy
 - Allow sendmail to read fail2ban_var_lib_t



From cwickert at fedoraproject.org  Thu Apr 16 10:02:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 16 Apr 2009 10:02:11 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 .cvsignore, 1.7,
	1.8 gnome-applet-timer.spec, 1.23, 1.24 sources, 1.7,
	1.8 timer-applet-2.0.1-stop-pulsing.patch, 1.2, NONE
Message-ID: <20090416100211.2CE4670127@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16833

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Removed Files:
	timer-applet-2.0.1-stop-pulsing.patch 
Log Message:
* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
- Update to 2.1.2 to fix #496037



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Feb 2008 20:32:43 -0000	1.7
+++ .cvsignore	16 Apr 2009 10:01:40 -0000	1.8
@@ -1 +1 @@
-timer-applet-2.0.1.tar.gz
+timer-applet-2.1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-10/gnome-applet-timer.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-applet-timer.spec	5 Jan 2009 23:39:50 -0000	1.23
+++ gnome-applet-timer.spec	16 Apr 2009 10:01:40 -0000	1.24
@@ -3,20 +3,19 @@
 %define debug_package %{nil}
 
 Name:           gnome-applet-timer
-Version:        2.0.1
-Release:        9%{?dist}
+Version:        2.1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
-Patch0:         timer-applet-2.0.1-stop-pulsing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
 BuildRequires:  GConf2
-BuildRequires:  gettext, perl(XML::Parser)
+BuildRequires:  intltool, perl(XML::Parser)
 Requires:       pygtk2-libglade >= 2.10
 Requires:       gnome-python2-applet >= 2.16
 Requires:       notify-python >= 0.1
@@ -40,28 +39,26 @@
 * Small and unobtrusive. Choose to either view the remaining time right in the 
   panel or hide it so you don't get distracted by the countdown.
 
+
 %prep
 %setup -q -n timer-applet-%{version}
-%patch0 -p1 -b .plusing
 
-%build
-%if 0%{?fedora} > 6
-export CPPFLAGS="${CPPFLAGS} -I/usr/include/libxml2"
-%endif
 
+%build
 %configure --disable-schemas-install
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang timer-applet
 
-# disable check for as long as #449717 isn't fixed.
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -77,6 +74,7 @@
 
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -84,6 +82,7 @@
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || :
 fi
 
+
 %postun
 scrollkeeper-update -q || :
 
@@ -99,7 +98,22 @@
 %{_datadir}/timer-applet/
 %{python_sitelib}/timerapplet/
 
+
 %changelog
+* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
+- Update to 2.1.2 to fix #496037
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 15 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.1-1
+- Update to 2.1.1
+- Remove stop-pulsing.patch, workaround included by upstream
+- BR intltool
+
+* Mon Feb 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1-1
+- Update to 2.1
+
 * Mon Jan 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-9
 - Update patch as suggested by Michael Schwendt
 
@@ -121,7 +135,7 @@
 * Mon Jul 07 2008 Adam Jackson <ajax at redhat.com> 2.0.1-3
 - %%fedora is an int, not a string.
 
-* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
+* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.1-2
 - Disable broken check macro (#449717) temporarily to fix #449485
 
 * Thu Feb 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Feb 2008 20:32:43 -0000	1.7
+++ sources	16 Apr 2009 10:01:40 -0000	1.8
@@ -1 +1 @@
-c56e5ec73ece83389e05a51aa38e0d59  timer-applet-2.0.1.tar.gz
+88b6cb2b2ad178ccda2711208dcf744b  timer-applet-2.1.2.tar.gz


--- timer-applet-2.0.1-stop-pulsing.patch DELETED ---



From athimm at fedoraproject.org  Thu Apr 16 10:38:11 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Thu, 16 Apr 2009 10:38:11 +0000 (UTC)
Subject: rpms/smart/devel smart-sha256.diff,1.1,1.2 smart.spec,1.42,1.43
Message-ID: <20090416103811.3B59570127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20238/devel

Modified Files:
	smart-sha256.diff smart.spec 
Log Message:
Fix sha256 patch.

smart-sha256.diff:

Index: smart-sha256.diff
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart-sha256.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart-sha256.diff	15 Apr 2009 15:41:20 -0000	1.1
+++ smart-sha256.diff	16 Apr 2009 10:38:10 -0000	1.2
@@ -1,7 +1,6 @@
-=== modified file 'smart/backends/rpm/metadata.py'
---- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
-+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
-@@ -71,6 +71,9 @@
+--- smart/backends/rpm/metadata.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/backends/rpm/metadata.py	2009-04-16 12:19:20.000000000 +0200
+@@ -70,6 +70,9 @@
      def getSHA(self, url):
          return self._info.get("sha")
  
@@ -11,10 +10,8 @@
      def getDescription(self):
          return self._info.get("description", "")
  
-
-=== modified file 'smart/cache.py'
---- smart/cache.py	2008-12-12 07:18:07 +0000
-+++ smart/cache.py	2009-02-20 12:34:05 +0000
+--- smart/cache.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/cache.py	2009-04-16 12:20:41.000000000 +0200
 @@ -179,6 +179,9 @@
      def getSHA(self, url):
          return None
@@ -25,11 +22,11 @@
      def validate(self, url, localpath, withreason=False):
          try:
              if not os.path.isfile(localpath):
-@@ -208,6 +211,23 @@
+@@ -208,6 +211,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
-+                filesha256 = item.getInfo(uncompprefix+"sha256")
++                filesha256 = self.getSHA256(url)
 +                if filesha256:
 +                    try:
 +                        from hashlib import sha256
@@ -43,17 +40,14 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = self.getSHA(url)
                  if filesha:
                      try:
-
-=== modified file 'smart/channels/rpm_md.py'
---- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
-+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
-@@ -130,12 +130,16 @@
+--- smart/channels/rpm_md.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/channels/rpm_md.py	2009-04-16 12:19:20.000000000 +0200
+@@ -108,12 +108,16 @@
                                 uncomp_md5=info["primary"].get("uncomp_md5"),
                                 sha=info["primary"].get("sha"),
                                 uncomp_sha=info["primary"].get("uncomp_sha"),
@@ -70,10 +64,8 @@
                                   uncomp=True)
          fetcher.run(progress=progress)
   
-
-=== modified file 'smart/control.py'
---- smart/control.py	2008-12-12 07:17:44 +0000
-+++ smart/control.py	2009-02-20 12:33:35 +0000
+--- smart/control.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/control.py	2009-04-16 12:19:20.000000000 +0200
 @@ -659,6 +659,7 @@
                  pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                       md5=info.getMD5(url),
@@ -82,10 +74,8 @@
                                                       size=info.getSize(url),
                                                       validate=info.validate))
          if targetdir:
-
-=== modified file 'smart/fetcher.py'
---- smart/fetcher.py	2008-12-12 07:18:07 +0000
-+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
+--- smart/fetcher.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/fetcher.py	2009-04-16 12:20:26.000000000 +0200
 @@ -336,7 +336,9 @@
              prefix = "uncomp_"
          else:
@@ -97,7 +87,7 @@
  
      def validate(self, item, localpath, withreason=False, uncomp=False):
          try:
-@@ -382,6 +384,23 @@
+@@ -382,6 +384,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
@@ -115,13 +105,12 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = item.getInfo(uncompprefix+"sha")
                  if filesha:
                      try:
-@@ -489,12 +508,13 @@
+@@ -489,12 +507,13 @@
          #             or just 'valid', depending on 'withreason'. 'valid'
          #             may be None, True, or False. If it's True or False,
          #             no other information will be checked.
@@ -138,4 +127,3 @@
              value = info.get(kind)
              if value:
                  info[kind] = value.lower()
-


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- smart.spec	15 Apr 2009 15:41:20 -0000	1.42
+++ smart.spec	16 Apr 2009 10:38:10 -0000	1.43
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.2
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,7 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch0: http://launchpadlibrarian.net/25524187/smart-sha256.diff
 Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
 Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -75,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p0 -b .sha256
-perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
 %patch1 -p0 -b .mdclean
 %patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
@@ -208,6 +207,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-64
+- Fix premature returns in sha256 patch.
+
 * Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
 - Fix sha256 and mdclean patches.
 



From athimm at fedoraproject.org  Thu Apr 16 10:38:40 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Thu, 16 Apr 2009 10:38:40 +0000 (UTC)
Subject: rpms/smart/F-10 smart-sha256.diff,1.1,1.2 smart.spec,1.41,1.42
Message-ID: <20090416103840.7230370127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20238/F-10

Modified Files:
	smart-sha256.diff smart.spec 
Log Message:
Fix sha256 patch.

smart-sha256.diff:

Index: smart-sha256.diff
===================================================================
RCS file: /cvs/extras/rpms/smart/F-10/smart-sha256.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart-sha256.diff	15 Apr 2009 15:41:16 -0000	1.1
+++ smart-sha256.diff	16 Apr 2009 10:38:10 -0000	1.2
@@ -1,7 +1,6 @@
-=== modified file 'smart/backends/rpm/metadata.py'
---- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
-+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
-@@ -71,6 +71,9 @@
+--- smart/backends/rpm/metadata.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/backends/rpm/metadata.py	2009-04-16 12:19:20.000000000 +0200
+@@ -70,6 +70,9 @@
      def getSHA(self, url):
          return self._info.get("sha")
  
@@ -11,10 +10,8 @@
      def getDescription(self):
          return self._info.get("description", "")
  
-
-=== modified file 'smart/cache.py'
---- smart/cache.py	2008-12-12 07:18:07 +0000
-+++ smart/cache.py	2009-02-20 12:34:05 +0000
+--- smart/cache.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/cache.py	2009-04-16 12:20:41.000000000 +0200
 @@ -179,6 +179,9 @@
      def getSHA(self, url):
          return None
@@ -25,11 +22,11 @@
      def validate(self, url, localpath, withreason=False):
          try:
              if not os.path.isfile(localpath):
-@@ -208,6 +211,23 @@
+@@ -208,6 +211,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
-+                filesha256 = item.getInfo(uncompprefix+"sha256")
++                filesha256 = self.getSHA256(url)
 +                if filesha256:
 +                    try:
 +                        from hashlib import sha256
@@ -43,17 +40,14 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = self.getSHA(url)
                  if filesha:
                      try:
-
-=== modified file 'smart/channels/rpm_md.py'
---- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
-+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
-@@ -130,12 +130,16 @@
+--- smart/channels/rpm_md.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/channels/rpm_md.py	2009-04-16 12:19:20.000000000 +0200
+@@ -108,12 +108,16 @@
                                 uncomp_md5=info["primary"].get("uncomp_md5"),
                                 sha=info["primary"].get("sha"),
                                 uncomp_sha=info["primary"].get("uncomp_sha"),
@@ -70,10 +64,8 @@
                                   uncomp=True)
          fetcher.run(progress=progress)
   
-
-=== modified file 'smart/control.py'
---- smart/control.py	2008-12-12 07:17:44 +0000
-+++ smart/control.py	2009-02-20 12:33:35 +0000
+--- smart/control.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/control.py	2009-04-16 12:19:20.000000000 +0200
 @@ -659,6 +659,7 @@
                  pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                       md5=info.getMD5(url),
@@ -82,10 +74,8 @@
                                                       size=info.getSize(url),
                                                       validate=info.validate))
          if targetdir:
-
-=== modified file 'smart/fetcher.py'
---- smart/fetcher.py	2008-12-12 07:18:07 +0000
-+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
+--- smart/fetcher.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/fetcher.py	2009-04-16 12:20:26.000000000 +0200
 @@ -336,7 +336,9 @@
              prefix = "uncomp_"
          else:
@@ -97,7 +87,7 @@
  
      def validate(self, item, localpath, withreason=False, uncomp=False):
          try:
-@@ -382,6 +384,23 @@
+@@ -382,6 +384,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
@@ -115,13 +105,12 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = item.getInfo(uncompprefix+"sha")
                  if filesha:
                      try:
-@@ -489,12 +508,13 @@
+@@ -489,12 +507,13 @@
          #             or just 'valid', depending on 'withreason'. 'valid'
          #             may be None, True, or False. If it's True or False,
          #             no other information will be checked.
@@ -138,4 +127,3 @@
              value = info.get(kind)
              if value:
                  info[kind] = value.lower()
-


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-10/smart.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- smart.spec	15 Apr 2009 15:41:16 -0000	1.41
+++ smart.spec	16 Apr 2009 10:38:10 -0000	1.42
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.2
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,7 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch0: http://launchpadlibrarian.net/25524187/smart-sha256.diff
 Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
 Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -75,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p0 -b .sha256
-perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
 %patch1 -p0 -b .mdclean
 %patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
@@ -208,6 +207,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-64
+- Fix premature returns in sha256 patch.
+
 * Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
 - Fix sha256 and mdclean patches.
 



From athimm at fedoraproject.org  Thu Apr 16 10:38:40 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Thu, 16 Apr 2009 10:38:40 +0000 (UTC)
Subject: rpms/smart/F-11 smart-sha256.diff,1.1,1.2 smart.spec,1.42,1.43
Message-ID: <20090416103840.9FE6070127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20238/F-11

Modified Files:
	smart-sha256.diff smart.spec 
Log Message:
Fix sha256 patch.

smart-sha256.diff:

Index: smart-sha256.diff
===================================================================
RCS file: /cvs/extras/rpms/smart/F-11/smart-sha256.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart-sha256.diff	15 Apr 2009 15:41:17 -0000	1.1
+++ smart-sha256.diff	16 Apr 2009 10:38:10 -0000	1.2
@@ -1,7 +1,6 @@
-=== modified file 'smart/backends/rpm/metadata.py'
---- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
-+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
-@@ -71,6 +71,9 @@
+--- smart/backends/rpm/metadata.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/backends/rpm/metadata.py	2009-04-16 12:19:20.000000000 +0200
+@@ -70,6 +70,9 @@
      def getSHA(self, url):
          return self._info.get("sha")
  
@@ -11,10 +10,8 @@
      def getDescription(self):
          return self._info.get("description", "")
  
-
-=== modified file 'smart/cache.py'
---- smart/cache.py	2008-12-12 07:18:07 +0000
-+++ smart/cache.py	2009-02-20 12:34:05 +0000
+--- smart/cache.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/cache.py	2009-04-16 12:20:41.000000000 +0200
 @@ -179,6 +179,9 @@
      def getSHA(self, url):
          return None
@@ -25,11 +22,11 @@
      def validate(self, url, localpath, withreason=False):
          try:
              if not os.path.isfile(localpath):
-@@ -208,6 +211,23 @@
+@@ -208,6 +211,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
-+                filesha256 = item.getInfo(uncompprefix+"sha256")
++                filesha256 = self.getSHA256(url)
 +                if filesha256:
 +                    try:
 +                        from hashlib import sha256
@@ -43,17 +40,14 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = self.getSHA(url)
                  if filesha:
                      try:
-
-=== modified file 'smart/channels/rpm_md.py'
---- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
-+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
-@@ -130,12 +130,16 @@
+--- smart/channels/rpm_md.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/channels/rpm_md.py	2009-04-16 12:19:20.000000000 +0200
+@@ -108,12 +108,16 @@
                                 uncomp_md5=info["primary"].get("uncomp_md5"),
                                 sha=info["primary"].get("sha"),
                                 uncomp_sha=info["primary"].get("uncomp_sha"),
@@ -70,10 +64,8 @@
                                   uncomp=True)
          fetcher.run(progress=progress)
   
-
-=== modified file 'smart/control.py'
---- smart/control.py	2008-12-12 07:17:44 +0000
-+++ smart/control.py	2009-02-20 12:33:35 +0000
+--- smart/control.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/control.py	2009-04-16 12:19:20.000000000 +0200
 @@ -659,6 +659,7 @@
                  pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                       md5=info.getMD5(url),
@@ -82,10 +74,8 @@
                                                       size=info.getSize(url),
                                                       validate=info.validate))
          if targetdir:
-
-=== modified file 'smart/fetcher.py'
---- smart/fetcher.py	2008-12-12 07:18:07 +0000
-+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
+--- smart/fetcher.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/fetcher.py	2009-04-16 12:20:26.000000000 +0200
 @@ -336,7 +336,9 @@
              prefix = "uncomp_"
          else:
@@ -97,7 +87,7 @@
  
      def validate(self, item, localpath, withreason=False, uncomp=False):
          try:
-@@ -382,6 +384,23 @@
+@@ -382,6 +384,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
@@ -115,13 +105,12 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = item.getInfo(uncompprefix+"sha")
                  if filesha:
                      try:
-@@ -489,12 +508,13 @@
+@@ -489,12 +507,13 @@
          #             or just 'valid', depending on 'withreason'. 'valid'
          #             may be None, True, or False. If it's True or False,
          #             no other information will be checked.
@@ -138,4 +127,3 @@
              value = info.get(kind)
              if value:
                  info[kind] = value.lower()
-


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-11/smart.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- smart.spec	15 Apr 2009 15:41:18 -0000	1.42
+++ smart.spec	16 Apr 2009 10:38:10 -0000	1.43
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.2
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,7 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch0: http://launchpadlibrarian.net/25524187/smart-sha256.diff
 Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
 Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -75,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p0 -b .sha256
-perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
 %patch1 -p0 -b .mdclean
 %patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
@@ -208,6 +207,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-64
+- Fix premature returns in sha256 patch.
+
 * Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
 - Fix sha256 and mdclean patches.
 



From athimm at fedoraproject.org  Thu Apr 16 10:38:40 2009
From: athimm at fedoraproject.org (Axel Thimm)
Date: Thu, 16 Apr 2009 10:38:40 +0000 (UTC)
Subject: rpms/smart/F-9 smart-sha256.diff,1.1,1.2 smart.spec,1.40,1.41
Message-ID: <20090416103840.DBFE670127@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20238/F-9

Modified Files:
	smart-sha256.diff smart.spec 
Log Message:
Fix sha256 patch.

smart-sha256.diff:

Index: smart-sha256.diff
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart-sha256.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart-sha256.diff	15 Apr 2009 15:41:19 -0000	1.1
+++ smart-sha256.diff	16 Apr 2009 10:38:10 -0000	1.2
@@ -1,7 +1,6 @@
-=== modified file 'smart/backends/rpm/metadata.py'
---- smart/backends/rpm/metadata.py	2008-12-31 11:12:46 +0000
-+++ smart/backends/rpm/metadata.py	2009-02-20 12:47:55 +0000
-@@ -71,6 +71,9 @@
+--- smart/backends/rpm/metadata.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/backends/rpm/metadata.py	2009-04-16 12:19:20.000000000 +0200
+@@ -70,6 +70,9 @@
      def getSHA(self, url):
          return self._info.get("sha")
  
@@ -11,10 +10,8 @@
      def getDescription(self):
          return self._info.get("description", "")
  
-
-=== modified file 'smart/cache.py'
---- smart/cache.py	2008-12-12 07:18:07 +0000
-+++ smart/cache.py	2009-02-20 12:34:05 +0000
+--- smart/cache.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/cache.py	2009-04-16 12:20:41.000000000 +0200
 @@ -179,6 +179,9 @@
      def getSHA(self, url):
          return None
@@ -25,11 +22,11 @@
      def validate(self, url, localpath, withreason=False):
          try:
              if not os.path.isfile(localpath):
-@@ -208,6 +211,23 @@
+@@ -208,6 +211,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
-+                filesha256 = item.getInfo(uncompprefix+"sha256")
++                filesha256 = self.getSHA256(url)
 +                if filesha256:
 +                    try:
 +                        from hashlib import sha256
@@ -43,17 +40,14 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = self.getSHA(url)
                  if filesha:
                      try:
-
-=== modified file 'smart/channels/rpm_md.py'
---- smart/channels/rpm_md.py	2009-01-22 11:34:02 +0000
-+++ smart/channels/rpm_md.py	2009-02-20 12:46:14 +0000
-@@ -130,12 +130,16 @@
+--- smart/channels/rpm_md.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/channels/rpm_md.py	2009-04-16 12:19:20.000000000 +0200
+@@ -108,12 +108,16 @@
                                 uncomp_md5=info["primary"].get("uncomp_md5"),
                                 sha=info["primary"].get("sha"),
                                 uncomp_sha=info["primary"].get("uncomp_sha"),
@@ -70,10 +64,8 @@
                                   uncomp=True)
          fetcher.run(progress=progress)
   
-
-=== modified file 'smart/control.py'
---- smart/control.py	2008-12-12 07:17:44 +0000
-+++ smart/control.py	2009-02-20 12:33:35 +0000
+--- smart/control.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/control.py	2009-04-16 12:19:20.000000000 +0200
 @@ -659,6 +659,7 @@
                  pkgitems[pkg].append(fetcher.enqueue(url, media=media,
                                                       md5=info.getMD5(url),
@@ -82,10 +74,8 @@
                                                       size=info.getSize(url),
                                                       validate=info.validate))
          if targetdir:
-
-=== modified file 'smart/fetcher.py'
---- smart/fetcher.py	2008-12-12 07:18:07 +0000
-+++ smart/fetcher.py	2009-02-20 13:26:02 +0000
+--- smart/fetcher.py.sha256	2009-03-05 00:07:50.000000000 +0100
++++ smart/fetcher.py	2009-04-16 12:20:26.000000000 +0200
 @@ -336,7 +336,9 @@
              prefix = "uncomp_"
          else:
@@ -97,7 +87,7 @@
  
      def validate(self, item, localpath, withreason=False, uncomp=False):
          try:
-@@ -382,6 +384,23 @@
+@@ -382,6 +384,22 @@
                      raise Error, _("Invalid MD5 (expected %s, got %s)") % \
                                   (filemd5, lfilemd5)
              else:
@@ -115,13 +105,12 @@
 +                        if lfilesha256 != filesha256:
 +                           raise Error, _("Invalid SHA256 (expected %s, got %s)") % \
 +                                         (filesha256, lfilesha256)
-+                        return
 +                    except ImportError:
 +                        pass
                  filesha = item.getInfo(uncompprefix+"sha")
                  if filesha:
                      try:
-@@ -489,12 +508,13 @@
+@@ -489,12 +507,13 @@
          #             or just 'valid', depending on 'withreason'. 'valid'
          #             may be None, True, or False. If it's True or False,
          #             no other information will be checked.
@@ -138,4 +127,3 @@
              value = info.get(kind)
              if value:
                  info[kind] = value.lower()
-


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- smart.spec	15 Apr 2009 15:41:19 -0000	1.40
+++ smart.spec	16 Apr 2009 10:38:10 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 1.2
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,7 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: http://launchpadlibrarian.net/22909615/smart-sha256.diff
+Patch0: http://launchpadlibrarian.net/25524187/smart-sha256.diff
 Patch1: http://launchpadlibrarian.net/25485185/smart-mdclean.patch
 Patch2: http://launchpadlibrarian.net/23697017/smart-unicode-provides.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -75,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p0 -b .sha256
-perl -pi -e's,filesha256 = item\.getInfo\(uncompprefix\+"sha256"\),filesha256 = self.getSHA256(url),' smart/cache.py
 %patch1 -p0 -b .mdclean
 %patch2 -p0 -b .unicode-provides
 # /usr/lib is hardcoded 
@@ -208,6 +207,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-64
+- Fix premature returns in sha256 patch.
+
 * Wed Apr 15 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.2-62
 - Fix sha256 and mdclean patches.
 



From jsafrane at fedoraproject.org  Thu Apr 16 10:51:23 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu, 16 Apr 2009 10:51:23 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi.spec,1.15,1.16
Message-ID: <20090416105123.2459A70127@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22504

Modified Files:
	freeipmi.spec 
Log Message:
Fix compilation flags, debuginfo package is correctly generated now


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freeipmi.spec	14 Apr 2009 07:52:22 -0000	1.15
+++ freeipmi.spec	16 Apr 2009 10:50:52 -0000	1.16
@@ -3,9 +3,9 @@
 #
 
 %if %{?_with_debug:1}%{!?_with_debug:0}
-Release: 1.debug%{?dist}
+Release: 2.debug%{?dist}
 %else
-Release: 1%{?dist}
+Release: 2%{?dist}
 %endif
 
 Name: freeipmi
@@ -69,9 +69,9 @@
 %patch4 -p1 -b .pathsep
 
 %build
-CFLAGS=-D_GNU_SOURCE %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
+export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
+%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
            %{?_enable_debug} --disable-static
-CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -328,6 +328,9 @@
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Thu Apr 16 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.8-2
+- Fix compilation flags, debuginfo package is correctly generated now
+
 * Tue Apr 14 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.8-1
 - Update to freeipmi-0.7.8
 



From karsten at fedoraproject.org  Thu Apr 16 11:04:30 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 16 Apr 2009 11:04:30 +0000 (UTC)
Subject: rpms/griv/devel griv.spec,1.2,1.3
Message-ID: <20090416110430.59DC770127@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/griv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23875

Modified Files:
	griv.spec 
Log Message:
- remove buildrequirement xorg-x11-server-devel for s390x



Index: griv.spec
===================================================================
RCS file: /cvs/extras/rpms/griv/devel/griv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- griv.spec	25 Feb 2009 01:11:59 -0000	1.2
+++ griv.spec	16 Apr 2009 11:03:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           griv
 Version:        0.1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A GTK-Chat based on the RIV-Chat-protocol
 
 Group:          Applications/Internet
@@ -17,7 +17,9 @@
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  libXScrnSaver-devel
+%ifnarch s390 s390x
 BuildRequires:  xorg-x11-server-devel
+%endif
 BuildRequires:  desktop-file-utils
 
 
@@ -68,6 +70,9 @@
 %{_mandir}/man1/%{name}.1.*
 
 %changelog
+* Thu Apr 16 2009 Karsten Hopp <karsten at redhat.com> 0.1.9-6
+- remove buildrequirement xorg-x11-server-devel for s390x
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Apr 16 11:23:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:23:55 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested watchbugzilla
Message-ID: <20090416112355.8B94710F85A@bastion2.fedora.phx.redhat.com>

sailer has requested the watchbugzilla acl on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:23:56 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested watchcommits
Message-ID: <20090416112356.5203C10F880@bastion2.fedora.phx.redhat.com>

sailer has requested the watchcommits acl on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:23:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:23:58 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested approveacls
Message-ID: <20090416112358.9D17310F885@bastion2.fedora.phx.redhat.com>

sailer has requested the approveacls acl on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:24:00 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested commit
Message-ID: <20090416112400.5B23410F88B@bastion2.fedora.phx.redhat.com>

sailer has requested the commit acl on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:24:19 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested watchcommits
Message-ID: <20090416112419.E4C8110F85A@bastion2.fedora.phx.redhat.com>

sailer has requested the watchcommits acl on mingw32-glib2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:24:20 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested watchbugzilla
Message-ID: <20090416112420.3A2EB10F88F@bastion2.fedora.phx.redhat.com>

sailer has requested the watchbugzilla acl on mingw32-glib2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:24:21 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested commit
Message-ID: <20090416112421.48E2F10F893@bastion2.fedora.phx.redhat.com>

sailer has requested the commit acl on mingw32-glib2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:24:21 +0000
Subject: [pkgdb] mingw32-glib2: sailer has requested approveacls
Message-ID: <20090416112421.D58FF10F898@bastion2.fedora.phx.redhat.com>

sailer has requested the approveacls acl on mingw32-glib2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:41 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112742.0F9E410F85A@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-glib2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:45 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112745.A3AB810F880@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-glib2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:46 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112746.726BB10F885@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-glib2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:49 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112749.CBCDF10F88B@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-glib2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:55 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112755.DE58610F88F@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-glib2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:56 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112756.EC9E810F894@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-glib2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:58 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112758.9314410F899@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-glib2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Thu Apr 16 11:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 11:27:59 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090416112759.ED00110F89E@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-glib2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From nbecker at fedoraproject.org  Thu Apr 16 11:31:03 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu, 16 Apr 2009 11:31:03 +0000 (UTC)
Subject: rpms/Cython/devel .cvsignore, 1.8, 1.9 Cython.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20090416113103.9640A70127@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27585

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
Update to 0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Mar 2009 11:40:22 -0000	1.8
+++ .cvsignore	16 Apr 2009 11:30:32 -0000	1.9
@@ -1 +1 @@
-Cython-0.11.tar.gz
+Cython-0.11.1.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/Cython.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Cython.spec	14 Mar 2009 11:52:01 -0000	1.12
+++ Cython.spec	16 Apr 2009 11:30:32 -0000	1.13
@@ -3,8 +3,8 @@
 
 
 Name:		Cython
-Version:	0.11
-Release:	2%{?dist}
+Version:	0.11.1
+Release:	1%{?dist}
 Summary:	A language for writing Python extension modules
 
 Group:		Development/Tools
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.1-1
+- Update to 0.11.1
+
 * Sat Mar 14 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11-2
 - Missed cython.py*
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Mar 2009 11:40:23 -0000	1.8
+++ sources	16 Apr 2009 11:30:32 -0000	1.9
@@ -1 +1 @@
-2a6cd318e642f3c166bdd2ac6a9a2d9d  Cython-0.11.tar.gz
+34799e9ce3acead9d2a834bd331a073b  Cython-0.11.1.tar.gz



From atorkhov at fedoraproject.org  Thu Apr 16 11:51:07 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu, 16 Apr 2009 11:51:07 +0000 (UTC)
Subject: rpms/ogre/F-11 ogre.spec,1.50,1.51
Message-ID: <20090416115107.09E9E70127@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14921

Modified Files:
	ogre.spec 
Log Message:
Hmm, why do I add this?


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/F-11/ogre.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ogre.spec	20 Mar 2009 20:42:10 -0000	1.50
+++ ogre.spec	16 Apr 2009 11:50:36 -0000	1.51
@@ -92,7 +92,6 @@
   Samples/Media/gui/Falagard.xsd \
   Samples/Media/materials/scripts/Example-DynTex.material
 # create a clean version of the api docs for %%doc
-rm -rf ./Docs/
 mkdir api
 find . \( -wholename './Docs/api/html/*.html' -or \
   -wholename './Docs/api/html/*.gif' -or -wholename './Docs/api/html/*.png' \



From vcrhonek at fedoraproject.org  Thu Apr 16 11:55:55 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 16 Apr 2009 11:55:55 +0000 (UTC)
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.69,1.70
Message-ID: <20090416115555.37C9C70127@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15238

Modified Files:
	tog-pegasus.spec 
Log Message:
Replace useradd '-n' option by '-N' ('-n' is obsolete)


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- tog-pegasus.spec	3 Mar 2009 16:37:42 -0000	1.69
+++ tog-pegasus.spec	16 Apr 2009 11:55:24 -0000	1.70
@@ -43,7 +43,7 @@
 %define _default_patch_fuzz 2
 
 Version: 		2.7.2
-Release: 		7%{?dist}
+Release: 		8%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -378,7 +378,7 @@
 if [ $1 -eq 1 ]; then
 #  first install: create the 'pegasus' user and group:
    /usr/sbin/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :;
-   /usr/sbin/useradd -u %{pegasus_uid} -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
+   /usr/sbin/useradd -u %{pegasus_uid} -r -N -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
      	 		   -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :;
 elif [ $1 -gt 1 ]; then
    if [ -d /var/lib/Pegasus/repository ]; then
@@ -462,6 +462,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.7.2-8
+- Replace useradd '-n' option by '-N' ('-n' is obsolete)
+  Resolves: #495729
+
 * Tue Mar  3 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.7.2-7
 - Add noreplace to config files
 



From sailer at fedoraproject.org  Thu Apr 16 12:15:43 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 12:15:43 +0000 (UTC)
Subject: rpms/mingw32-glib2/F-11 .cvsignore, 1.3, 1.4 mingw32-glib2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090416121543.3189370127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glib2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16868/F-11

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
update to 2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glib2/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Mar 2009 20:46:31 -0000	1.3
+++ .cvsignore	16 Apr 2009 12:15:12 -0000	1.4
@@ -1 +1,2 @@
 glib-2.19.10.tar.bz2
+glib-2.20.1.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glib2/F-11/mingw32-glib2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-glib2.spec	5 Mar 2009 20:46:31 -0000	1.5
+++ mingw32-glib2.spec	16 Apr 2009 12:15:12 -0000	1.6
@@ -5,14 +5,14 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glib2
-Version:        2.19.10
+Version:        2.20.1
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/glib/2.20/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -179,6 +179,9 @@
 %{_mingw32_libdir}/libgthread-2.0.a
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.1-1
+- Update to 2.20.1
+
 * Thu Mar 5 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.10-1
 - Update to 2.19.10
 - Dropped the gtk-doc documentation as it's identical to the base glib2 package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glib2/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Mar 2009 20:46:31 -0000	1.3
+++ sources	16 Apr 2009 12:15:12 -0000	1.4
@@ -1 +1 @@
-2cec449d5593835b6080d662a17078ca  glib-2.19.10.tar.bz2
+d7ef53c7b65827a1baa4bad1c6893fa3  glib-2.20.1.tar.bz2



From sailer at fedoraproject.org  Thu Apr 16 12:15:43 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 16 Apr 2009 12:15:43 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.3, 1.4 mingw32-glib2.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090416121543.6933670127@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16868/devel

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
update to 2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Mar 2009 20:46:31 -0000	1.3
+++ .cvsignore	16 Apr 2009 12:15:13 -0000	1.4
@@ -1 +1,2 @@
 glib-2.19.10.tar.bz2
+glib-2.20.1.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-glib2.spec	5 Mar 2009 20:46:31 -0000	1.5
+++ mingw32-glib2.spec	16 Apr 2009 12:15:13 -0000	1.6
@@ -5,14 +5,14 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glib2
-Version:        2.19.10
+Version:        2.20.1
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/glib/2.20/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -179,6 +179,9 @@
 %{_mingw32_libdir}/libgthread-2.0.a
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.1-1
+- Update to 2.20.1
+
 * Thu Mar 5 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.10-1
 - Update to 2.19.10
 - Dropped the gtk-doc documentation as it's identical to the base glib2 package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Mar 2009 20:46:31 -0000	1.3
+++ sources	16 Apr 2009 12:15:13 -0000	1.4
@@ -1 +1 @@
-2cec449d5593835b6080d662a17078ca  glib-2.19.10.tar.bz2
+d7ef53c7b65827a1baa4bad1c6893fa3  glib-2.20.1.tar.bz2



From caolanm at fedoraproject.org  Thu Apr 16 12:26:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 12:26:28 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1877,1.1878
Message-ID: <20090416122628.C85C970127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18414/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
workaround rhbz#494817 via a NO-BREAK SPACE (U+00A0)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -r1.1877 -r1.1878
--- openoffice.org.spec	15 Apr 2009 15:59:21 -0000	1.1877
+++ openoffice.org.spec	16 Apr 2009 12:25:57 -0000	1.1878
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 9
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -2221,6 +2221,8 @@
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/
     echo X-GIO-NoFuse=true >> $file
+    # rhbz#494817 temporarily strip " program " from .desktops
+    sed -i -e "s/ program / program??/g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -2291,6 +2293,10 @@
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
+    # add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/
+    echo X-GIO-NoFuse=true >> $file
+    # rhbz#494817 temporarily strip " program " from .desktops
+    sed -i -e "s/ program / program??/g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -4115,6 +4121,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
+- workaround rhbz#494817 
+
 * Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 - Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch



From caolanm at fedoraproject.org  Thu Apr 16 12:26:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 12:26:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1878,1.1879
Message-ID: <20090416122629.1378E70127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18414/devel

Modified Files:
	openoffice.org.spec 
Log Message:
workaround rhbz#494817 via a NO-BREAK SPACE (U+00A0)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1878
retrieving revision 1.1879
diff -u -r1.1878 -r1.1879
--- openoffice.org.spec	15 Apr 2009 15:21:11 -0000	1.1878
+++ openoffice.org.spec	16 Apr 2009 12:25:58 -0000	1.1879
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 9
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -2221,6 +2221,8 @@
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/
     echo X-GIO-NoFuse=true >> $file
+    # rhbz#494817 temporarily strip " program " from .desktops
+    sed -i -e "s/ program / program??/g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -2291,6 +2293,10 @@
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
+    # add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/
+    echo X-GIO-NoFuse=true >> $file
+    # rhbz#494817 temporarily strip " program " from .desktops
+    sed -i -e "s/ program / program??/g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -4115,6 +4121,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
+- workaround rhbz#494817 
+
 * Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 - Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch



From pkgdb at fedoraproject.org  Thu Apr 16 12:30:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:30:04 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123004.A533810F85A@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora devel) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:30:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:30:15 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123015.7867E10F87C@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora devel) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:30:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:30:47 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123047.74DC910F87E@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 8) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:30:52 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123052.68FD210F87B@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 8) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:31:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:31:09 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123109.2D91D10F7C2@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 10) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:31:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:31:15 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123115.724F310F880@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 10) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:31:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:31:22 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123122.D1C3410F852@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 11) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:31:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:31:26 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123126.7E09210F882@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 11) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:30:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:30:30 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123030.BA85210F85A@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 7) to Obsolete for cworth

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:30:36 +0000
Subject: [pkgdb] openoffice.org had acl change status
Message-ID: <20090416123036.C6CBE10F87C@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on openoffice.org (Fedora 7) to Obsolete for rnorwood

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Thu Apr 16 12:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 12:54:27 +0000
Subject: [pkgdb] AcetoneISO2 had acl change status
Message-ID: <20090416125427.AE87F10F87C@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on AcetoneISO2 (Fedora 10) to Approved for bloodname

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/AcetoneISO2



From nbecker at fedoraproject.org  Thu Apr 16 13:01:33 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu, 16 Apr 2009 13:01:33 +0000 (UTC)
Subject: rpms/Cython/F-10 .cvsignore, 1.5, 1.6 Cython.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20090416130133.0BD0170127@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22764

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
update to 0.11.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Dec 2008 12:51:51 -0000	1.5
+++ .cvsignore	16 Apr 2009 13:01:02 -0000	1.6
@@ -1 +1 @@
-Cython-0.10.3.tar.gz
+Cython-0.11.1.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-10/Cython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Cython.spec	14 Mar 2009 12:47:06 -0000	1.7
+++ Cython.spec	16 Apr 2009 13:01:02 -0000	1.8
@@ -3,8 +3,8 @@
 
 
 Name:		Cython
-Version:	0.11
-Release:	2%{?dist}
+Version:	0.11.1
+Release:	1%{?dist}
 Summary:	A language for writing Python extension modules
 
 Group:		Development/Tools
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.1-1
+- Update to 0.11.1
+
 * Sat Mar 14 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11-2
 - Missed cython.py*
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Mar 2009 12:36:04 -0000	1.6
+++ sources	16 Apr 2009 13:01:02 -0000	1.7
@@ -1 +1 @@
-2a6cd318e642f3c166bdd2ac6a9a2d9d  Cython-0.11.tar.gz
+34799e9ce3acead9d2a834bd331a073b  Cython-0.11.1.tar.gz



From atorkhov at fedoraproject.org  Thu Apr 16 13:13:50 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu, 16 Apr 2009 13:13:50 +0000 (UTC)
Subject: rpms/ogre/devel ogre-make-clean.sh, NONE, 1.1 .cvsignore, 1.17,
	1.18 ogre.spec, 1.50, 1.51 sources, 1.18, 1.19
Message-ID: <20090416131350.1A5F370127@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24287

Modified Files:
	.cvsignore ogre.spec sources 
Added Files:
	ogre-make-clean.sh 
Log Message:
* Thu Apr 16 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.2-1
- New upstream release 1.6.2
- Exceptions added to License
- Reenabling OpenEXR plugin, as it fixed now



--- NEW FILE ogre-make-clean.sh ---
#!/bin/sh

set -e
set -x

version=1.6.2

[ ! -e ogre ]

tar xjf ogre-v$(echo ${version} | tr . -).tar.bz2

cd ogre

# - Non-free licensed headers under RenderSystems/GL/include/GL removed
rm RenderSystems/GL/include/GL/{gl,glext,glxext,glxtokens,wglext}.h

# - GLEW sources updated to 1.5.1
rpm -q glew-devel glew-debuginfo
cp -f /usr/include/GL/{glew,glxew,wglew}.h RenderSystems/GL/include/GL/
cp -f /usr/src/debug/glew/src/glew.c RenderSystems/GL/src/glew.cpp
dos2unix RenderSystems/GL/src/glew.cpp

# - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
rm Samples/Media/packs/chiropteraDM.{pk3,txt}

# - Non-free fonts under Samples/Media/fonts removed
rm Samples/Media/fonts/{bluebold,bluecond,bluehigh,solo5}.ttf

cd ..

tar cjf ogre-$version-clean.tar.bz2 ogre


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Feb 2009 17:14:13 -0000	1.17
+++ .cvsignore	16 Apr 2009 13:13:18 -0000	1.18
@@ -1 +1 @@
-ogre-1.6.1-clean.tar.bz2
+ogre-1.6.2-clean.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ogre.spec	20 Mar 2009 20:42:10 -0000	1.50
+++ ogre.spec	16 Apr 2009 13:13:18 -0000	1.51
@@ -1,18 +1,18 @@
 Name:           ogre
-Version:        1.6.1
-Release:        5%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
-# LGPLv2+  - main library
+# LGPLv2+ with exceptions - main library
 # CC-BY-SA - devel docs
 # Freely redistributable without restriction - most of samples content
 # MIT      - shaders for DeferredShadingMedia samples
-License:        LGPLv2+ and CC-BY-SA and Freely redistributable without restriction and MIT
+License:        LGPLv2+ with exceptions and CC-BY-SA and Freely redistributable without restriction and MIT
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is modified http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # with non-free files striped:
 # - Non-free licensed headers under RenderSystems/GL/include/GL removed
-# - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 2.5.0 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
+# - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 1.5.1 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
 # - Non-free fonts under Samples/Media/fonts removed
 Source0:        %{name}-%{version}-clean.tar.bz2
@@ -26,8 +26,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
-BuildRequires:  ois-devel freeimage-devel
-#BuildRequires:  openexr-devel glew-devel
+BuildRequires:  ois-devel freeimage-devel openexr-devel
+#BuildRequires:  glew-devel
 BuildRequires:  tinyxml-devel
 
 %description
@@ -78,7 +78,7 @@
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
-%patch3 -p1
+%patch3 -p1 -z .ppc
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
   `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
@@ -92,7 +92,6 @@
   Samples/Media/gui/Falagard.xsd \
   Samples/Media/materials/scripts/Example-DynTex.material
 # create a clean version of the api docs for %%doc
-rm -rf ./Docs/
 mkdir api
 find . \( -wholename './Docs/api/html/*.html' -or \
   -wholename './Docs/api/html/*.gif' -or -wholename './Docs/api/html/*.png' \
@@ -105,12 +104,15 @@
   touch -r $i api/tmp
   mv api/tmp $i
 done
+# Add lgpl.txt symlink for links in License.html
+rm -r Docs/licenses/*
+ln -s COPYING Docs/licenses/lgpl.txt
 # remove included tinyxml headers to ensure use of system headers
 rm Tools/XMLConverter/include/tiny*
 
 
 %build
-%configure --disable-cg --disable-devil
+%configure --disable-cg --disable-devil --enable-openexr
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -182,7 +184,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING
-%doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
+%doc Docs/ChangeLog.html Docs/License.html Docs/licenses Docs/ReadMe.html Docs/style.css Docs/ogre-logo*.gif
 %{_bindir}/Ogre*
 %{_bindir}/rcapsdump
 %{_libdir}/lib*Ogre*-%{version}.so
@@ -202,7 +204,7 @@
 
 %files devel-doc
 %defattr(-,root,root,-)
-%doc LINUX.DEV api Docs/manual Docs/vbo-update Docs/style.css
+%doc LINUX.DEV api Docs/manual Docs/shadows Docs/vbo-update Docs/style.css
 
 %files samples
 %defattr(-,root,root)
@@ -213,6 +215,11 @@
 
 
 %changelog
+* Thu Apr 16 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.2-1
+- New upstream release 1.6.2
+- Exceptions added to License
+- Reenabling OpenEXR plugin, as it fixed now
+
 * Fri Mar 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-5
 - Add licenses of samples to License tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Feb 2009 17:14:13 -0000	1.18
+++ sources	16 Apr 2009 13:13:18 -0000	1.19
@@ -1 +1 @@
-b3382c4bbb5b171ce2f4eba3f10c611d  ogre-1.6.1-clean.tar.bz2
+41cf1af6c7ec587a2029298b774dcaf8  ogre-1.6.2-clean.tar.bz2



From nbecker at fedoraproject.org  Thu Apr 16 13:19:48 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu, 16 Apr 2009 13:19:48 +0000 (UTC)
Subject: rpms/Cython/F-9 .cvsignore, 1.4, 1.5 Cython.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20090416131948.2A16B70127@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/Cython/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25205

Modified Files:
	.cvsignore Cython.spec sources 
Log Message:
update to 0.11.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Dec 2008 12:29:31 -0000	1.4
+++ .cvsignore	16 Apr 2009 13:19:17 -0000	1.5
@@ -1 +1 @@
-Cython-0.10.3.tar.gz
+Cython-0.11.1.tar.gz


Index: Cython.spec
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-9/Cython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Cython.spec	14 Mar 2009 13:05:59 -0000	1.8
+++ Cython.spec	16 Apr 2009 13:19:17 -0000	1.9
@@ -3,8 +3,8 @@
 
 
 Name:		Cython
-Version:	0.11
-Release:	2%{?dist}
+Version:	0.11.1
+Release:	1%{?dist}
 Summary:	A language for writing Python extension modules
 
 Group:		Development/Tools
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11.1-1
+- Update to 0.11.1
+
 * Sat Mar 14 2009 Neal Becker <ndbecker2 at gmail.com> - 0.11-2
 - Missed cython.py*
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Cython/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Mar 2009 13:05:59 -0000	1.7
+++ sources	16 Apr 2009 13:19:17 -0000	1.8
@@ -1 +1 @@
-2a6cd318e642f3c166bdd2ac6a9a2d9d  Cython-0.11.tar.gz
+34799e9ce3acead9d2a834bd331a073b  Cython-0.11.1.tar.gz



From rdieter at fedoraproject.org  Thu Apr 16 13:41:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 13:41:06 +0000 (UTC)
Subject: rpms/qt3/F-11 qt3.spec,1.15,1.16
Message-ID: <20090416134106.59B5E70127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28804/F-11

Modified Files:
	qt3.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-25
- move designer plugins to runtime (#487622)



Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/F-11/qt3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt3.spec	10 Apr 2009 08:23:36 -0000	1.15
+++ qt3.spec	16 Apr 2009 13:40:35 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 24%{?dist}
+Release: 25%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -567,6 +567,7 @@
 %dir %{qtdir}/plugins/sqldrivers
 %dir %{qtdir}/plugins/styles
 %{qtdir}/translations
+%{qtdir}/plugins/designer/
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
 %endif
@@ -635,15 +636,16 @@
 
 %files designer
 %defattr(-,root,root,-)
-%dir %{qtdir}/plugins/designer
 %{qtdir}/templates
-%{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
 %{_datadir}/applications/*designer*.desktop
 %{_datadir}/pixmaps/designer3.png
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-25
+- move designer plugins to runtime (#487622)
+
 * Fri Apr 10 2009 Than Ngo <than at redhat.com> - 3.3.8b-24
 - unneeded executable permissions for profile.d scripts 
 



From rdieter at fedoraproject.org  Thu Apr 16 13:41:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 13:41:06 +0000 (UTC)
Subject: rpms/qt3/devel qt3.spec,1.15,1.16
Message-ID: <20090416134106.88E4070127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28804/devel

Modified Files:
	qt3.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-25
- move designer plugins to runtime (#487622)



Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt3.spec	10 Apr 2009 08:23:36 -0000	1.15
+++ qt3.spec	16 Apr 2009 13:40:36 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 24%{?dist}
+Release: 25%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -567,6 +567,7 @@
 %dir %{qtdir}/plugins/sqldrivers
 %dir %{qtdir}/plugins/styles
 %{qtdir}/translations
+%{qtdir}/plugins/designer/
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
 %endif
@@ -635,15 +636,16 @@
 
 %files designer
 %defattr(-,root,root,-)
-%dir %{qtdir}/plugins/designer
 %{qtdir}/templates
-%{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
 %{_datadir}/applications/*designer*.desktop
 %{_datadir}/pixmaps/designer3.png
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-25
+- move designer plugins to runtime (#487622)
+
 * Fri Apr 10 2009 Than Ngo <than at redhat.com> - 3.3.8b-24
 - unneeded executable permissions for profile.d scripts 
 



From cwickert at fedoraproject.org  Thu Apr 16 13:46:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 16 Apr 2009 13:46:21 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.28,1.29
Message-ID: <20090416134621.CDB3870127@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29697

Modified Files:
	gnome-applet-timer.spec 
Log Message:
* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
- Require gstreamer-python



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-applet-timer.spec	27 Feb 2009 11:26:19 -0000	1.28
+++ gnome-applet-timer.spec	16 Apr 2009 13:45:51 -0000	1.29
@@ -20,6 +20,7 @@
 Requires:       gnome-python2-applet >= 2.16
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
+Requires:       gstreamer-python
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -100,6 +101,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
+- Require gstreamer-python
+
 * Fri Feb 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
 - Update to 2.1.2
 



From denis at fedoraproject.org  Thu Apr 16 13:48:41 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 16 Apr 2009 13:48:41 +0000 (UTC)
Subject: rpms/cdrdao/devel cdrdao-1.2.3-version.patch, NONE, 1.1 cdrdao.spec,
	1.45, 1.46
Message-ID: <20090416134841.651E770127@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cdrdao/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30078

Modified Files:
	cdrdao.spec 
Added Files:
	cdrdao-1.2.3-version.patch 
Log Message:
Make sure version is printed with usage, to fix k3b (#495988)

cdrdao-1.2.3-version.patch:

--- NEW FILE cdrdao-1.2.3-version.patch ---
--- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
+++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
@@ -207,7 +207,7 @@
 
 static void printVersion()
 {
-  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
+  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
 	  VERSION);
 
   std::list<std::string> list;


Index: cdrdao.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cdrdao.spec	7 Apr 2009 07:36:18 -0000	1.45
+++ cdrdao.spec	16 Apr 2009 13:48:10 -0000	1.46
@@ -3,13 +3,14 @@
 Summary:   Writes audio CD-Rs in disk-at-once (DAO) mode
 Name:      cdrdao
 Version:   1.2.3
-Release:   0.%{rcversion}.1
+Release:   0.%{rcversion}.2
 License:   GPLv2
 Group:     Applications/Multimedia
 URL:       http://cdrdao.sourceforge.net/
 Source0:   %{name}-%{version}%{rcversion}.tar.bz2
 Patch0:    cdrdao-1.2.2-gcc44.patch
 Patch1:    cdrdao-1.2.2-desktop.patch
+Patch2:    cdrdao-1.2.3-version.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel
@@ -54,6 +55,7 @@
 %setup -q -n %{name}-%{version}%{rcversion}
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .version
 
 
 %build
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Denis Leroy <denis at poolshark.org> - 1.2.3-0.rc2.2
+- Make sure version is printed with usage, to fix k3b
+
 * Tue Apr  7 2009 Denis Leroy <denis at poolshark.org> - 1.2.3-0.rc2.1
 - Update to latest 1.2.3 release candidate
 - Merged with gcdmaster spec file



From cwickert at fedoraproject.org  Thu Apr 16 13:48:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 16 Apr 2009 13:48:55 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.29,1.30
Message-ID: <20090416134855.7B7F370127@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30111

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix release


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-applet-timer.spec	16 Apr 2009 13:45:51 -0000	1.29
+++ gnome-applet-timer.spec	16 Apr 2009 13:48:24 -0000	1.30
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops



From denis at fedoraproject.org  Thu Apr 16 13:50:17 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 16 Apr 2009 13:50:17 +0000 (UTC)
Subject: rpms/cdrdao/F-11 cdrdao-1.2.3-version.patch, NONE, 1.1 cdrdao.spec, 
	1.45, 1.46
Message-ID: <20090416135017.00EE770127@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cdrdao/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30442

Modified Files:
	cdrdao.spec 
Added Files:
	cdrdao-1.2.3-version.patch 
Log Message:
Make sure version is printed with usage, to fix k3b (#495988)

cdrdao-1.2.3-version.patch:

--- NEW FILE cdrdao-1.2.3-version.patch ---
--- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
+++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
@@ -207,7 +207,7 @@
 
 static void printVersion()
 {
-  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
+  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
 	  VERSION);
 
   std::list<std::string> list;


Index: cdrdao.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/F-11/cdrdao.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cdrdao.spec	7 Apr 2009 07:36:18 -0000	1.45
+++ cdrdao.spec	16 Apr 2009 13:49:46 -0000	1.46
@@ -3,13 +3,14 @@
 Summary:   Writes audio CD-Rs in disk-at-once (DAO) mode
 Name:      cdrdao
 Version:   1.2.3
-Release:   0.%{rcversion}.1
+Release:   0.%{rcversion}.2
 License:   GPLv2
 Group:     Applications/Multimedia
 URL:       http://cdrdao.sourceforge.net/
 Source0:   %{name}-%{version}%{rcversion}.tar.bz2
 Patch0:    cdrdao-1.2.2-gcc44.patch
 Patch1:    cdrdao-1.2.2-desktop.patch
+Patch2:    cdrdao-1.2.3-version.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel
@@ -54,6 +55,7 @@
 %setup -q -n %{name}-%{version}%{rcversion}
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .version
 
 
 %build
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Denis Leroy <denis at poolshark.org> - 1.2.3-0.rc2.2
+- Make sure version is printed with usage, to fix k3b
+
 * Tue Apr  7 2009 Denis Leroy <denis at poolshark.org> - 1.2.3-0.rc2.1
 - Update to latest 1.2.3 release candidate
 - Merged with gcdmaster spec file



From rdieter at fedoraproject.org  Thu Apr 16 13:53:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 13:53:58 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs3.spec,1.57,1.58
Message-ID: <20090416135358.6D80070127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31819/F-11

Modified Files:
	kdelibs3.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
- move designer plugins to runtime (#487622)



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdelibs3.spec	2 Mar 2009 17:07:00 -0000	1.57
+++ kdelibs3.spec	16 Apr 2009 13:53:23 -0000	1.58
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -575,8 +575,6 @@
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/*
 %exclude %{_datadir}/apps/ksgmltools2/
-%exclude %{_datadir}/apps/kdewidgets/
-%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
 %config(noreplace) %{_datadir}/config/*
 %{_datadir}/emoticons/*
 %{_datadir}/icons/default.kde
@@ -611,9 +609,6 @@
 %{_bindir}/dcopidl*
 %{_bindir}/kconfig_compiler
 %{_bindir}/makekdewidgets
-%{_datadir}/apps/kdewidgets/
-%dir %{_libdir}/kde3/plugins/designer
-%{_libdir}/kde3/plugins/designer/kdewidgets.*
 %{_datadir}/apps/ksgmltools2/
 %{_includedir}/kde/
 %{_libdir}/lib*.so
@@ -629,6 +624,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
+- move designer plugins to runtime (#487622)
+
 * Mon Mar 02 2009 Than Ngo <than at redhat.com> - 3.5.10-9
 - enable -apidocs
 



From rdieter at fedoraproject.org  Thu Apr 16 13:53:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 13:53:58 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.57,1.58
Message-ID: <20090416135358.AAFD670127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31819/devel

Modified Files:
	kdelibs3.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
- move designer plugins to runtime (#487622)



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdelibs3.spec	2 Mar 2009 17:07:00 -0000	1.57
+++ kdelibs3.spec	16 Apr 2009 13:53:28 -0000	1.58
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -575,8 +575,6 @@
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/*
 %exclude %{_datadir}/apps/ksgmltools2/
-%exclude %{_datadir}/apps/kdewidgets/
-%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
 %config(noreplace) %{_datadir}/config/*
 %{_datadir}/emoticons/*
 %{_datadir}/icons/default.kde
@@ -611,9 +609,6 @@
 %{_bindir}/dcopidl*
 %{_bindir}/kconfig_compiler
 %{_bindir}/makekdewidgets
-%{_datadir}/apps/kdewidgets/
-%dir %{_libdir}/kde3/plugins/designer
-%{_libdir}/kde3/plugins/designer/kdewidgets.*
 %{_datadir}/apps/ksgmltools2/
 %{_includedir}/kde/
 %{_libdir}/lib*.so
@@ -629,6 +624,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
+- move designer plugins to runtime (#487622)
+
 * Mon Mar 02 2009 Than Ngo <than at redhat.com> - 3.5.10-9
 - enable -apidocs
 



From rdieter at fedoraproject.org  Thu Apr 16 13:56:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 13:56:38 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs3.spec,1.58,1.59
Message-ID: <20090416135638.4E5D070127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32174/F-11

Modified Files:
	kdelibs3.spec 
Log Message:
- make -apidocs noarch



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdelibs3.spec	16 Apr 2009 13:53:23 -0000	1.58
+++ kdelibs3.spec	16 Apr 2009 13:56:07 -0000	1.59
@@ -227,10 +227,9 @@
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
 %endif
-## to enable rpm's noarch subpkg feature
-#if 0%{?fedora} > 10
-#BuildArch: noarch
-#endif
+%if 0%{?fedora} > 10
+BuildArch: noarch
+%endif
 
 %description apidocs
 This package includes the KDE 3 API documentation in HTML
@@ -626,6 +625,7 @@
 %changelog
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
 - move designer plugins to runtime (#487622)
+- make -apidocs noarch
 
 * Mon Mar 02 2009 Than Ngo <than at redhat.com> - 3.5.10-9
 - enable -apidocs



From rdieter at fedoraproject.org  Thu Apr 16 13:56:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 13:56:38 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.58,1.59
Message-ID: <20090416135638.7434770127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32174/devel

Modified Files:
	kdelibs3.spec 
Log Message:
- make -apidocs noarch



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdelibs3.spec	16 Apr 2009 13:53:28 -0000	1.58
+++ kdelibs3.spec	16 Apr 2009 13:56:08 -0000	1.59
@@ -227,10 +227,9 @@
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
 %endif
-## to enable rpm's noarch subpkg feature
-#if 0%{?fedora} > 10
-#BuildArch: noarch
-#endif
+%if 0%{?fedora} > 10
+BuildArch: noarch
+%endif
 
 %description apidocs
 This package includes the KDE 3 API documentation in HTML
@@ -626,6 +625,7 @@
 %changelog
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
 - move designer plugins to runtime (#487622)
+- make -apidocs noarch
 
 * Mon Mar 02 2009 Than Ngo <than at redhat.com> - 3.5.10-9
 - enable -apidocs



From hedayat at fedoraproject.org  Thu Apr 16 13:57:51 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Thu, 16 Apr 2009 13:57:51 +0000 (UTC)
Subject: rpms/rcssserver/F-10 rcssserver.spec,1.7,1.8
Message-ID: <20090416135751.66D7470127@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32430

Modified Files:
	rcssserver.spec 
Log Message:
fixed a compilation fix for libtool


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/rcssserver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rcssserver.spec	7 Apr 2009 14:26:36 -0000	1.7
+++ rcssserver.spec	16 Apr 2009 13:57:20 -0000	1.8
@@ -56,13 +56,19 @@
     -e 's|\$ac_boost_path/lib|\$libdir|' \
     -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
     m4/ax_boost_base.m4
-autoreconf -if
+aclocal -I m4
+automake
+autoconf
+autoheader
+touch config.h.in
 # Fix rpath
 sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
     configure
 
 %build
 %configure
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 #%{?_smp_mflags} doesn't work
 make 



From cwickert at fedoraproject.org  Thu Apr 16 13:59:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 16 Apr 2009 13:59:17 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-11 gnome-applet-timer.spec,1.28,1.29
Message-ID: <20090416135917.B2E1070127@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32704

Modified Files:
	gnome-applet-timer.spec 
Log Message:
* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
- Require gstreamer-python



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-11/gnome-applet-timer.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-applet-timer.spec	27 Feb 2009 11:26:19 -0000	1.28
+++ gnome-applet-timer.spec	16 Apr 2009 13:58:47 -0000	1.29
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -20,6 +20,7 @@
 Requires:       gnome-python2-applet >= 2.16
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
+Requires:       gstreamer-python
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -100,6 +101,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
+- Require gstreamer-python
+
 * Fri Feb 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
 - Update to 2.1.2
 



From dwalsh at fedoraproject.org  Thu Apr 16 14:05:05 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 16 Apr 2009 14:05:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.87,
	1.88 selinux-policy.spec, 1.825, 1.826
Message-ID: <20090416140505.915CE70127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1011

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
- Allow cupsd_t to create link files in print_spool_t


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- policy-20090105.patch	15 Apr 2009 12:06:09 -0000	1.87
+++ policy-20090105.patch	16 Apr 2009 14:04:33 -0000	1.88
@@ -6501,8 +6501,8 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-09 04:44:48.000000000 -0400
-@@ -0,0 +1,30 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-15 10:01:33.000000000 -0400
+@@ -0,0 +1,32 @@
 +# Add programs here which should not be confined by SELinux
 +# e.g.:
 +# /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -6522,6 +6522,8 @@
 +
 +/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/opera/[^/]*/works -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/opera/[^/]*/opera -- gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/bin/haddock.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags  --	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -7177,8 +7179,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-09 05:43:27.000000000 -0400
-@@ -0,0 +1,402 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-16 10:03:34.000000000 -0400
+@@ -0,0 +1,403 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7267,6 +7269,7 @@
 +
 +init_run_daemon(unconfined_t, unconfined_r)
 +init_domtrans_script(unconfined_t)
++init_chat(unconfined_t)
 +
 +libs_run_ldconfig(unconfined_t, unconfined_r)
 +
@@ -12859,7 +12862,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.12/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/exim.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/exim.te	2009-04-15 08:33:18.000000000 -0400
 @@ -21,9 +21,20 @@
  ## </desc>
  gen_tunable(exim_manage_user_files, false)
@@ -14346,8 +14349,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.6.12/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/lircd.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,55 @@
++++ serefpolicy-3.6.12/policy/modules/services/lircd.te	2009-04-16 09:47:17.000000000 -0400
+@@ -0,0 +1,58 @@
 +policy_module(lircd,1.0.0)
 +
 +########################################
@@ -14393,6 +14396,7 @@
 +# /dev/lircd socket
 +manage_sock_files_pattern(lircd_t, lircd_sock_t, lircd_sock_t)
 +dev_filetrans(lircd_t, lircd_sock_t, sock_file )
++dev_read_generic_usb_dev(lircd_t)
 +
 +logging_send_syslog_msg(lircd_t)
 +
@@ -14401,8 +14405,21 @@
 +files_manage_generic_locks(lircd_t)
 +files_read_all_locks(lircd_t)
 +
++fs_list_inotifyfs(lircd_t)
++
 +miscfiles_read_localization(lircd_t)
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.6.12/policy/modules/services/lpd.if
+--- nsaserefpolicy/policy/modules/services/lpd.if	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/lpd.if	2009-04-15 17:56:28.000000000 -0400
+@@ -134,6 +134,7 @@
+ 	files_search_spool($1)
+ 	manage_dirs_pattern($1, print_spool_t, print_spool_t)
+ 	manage_files_pattern($1, print_spool_t, print_spool_t)
++	manage_lnk_files_pattern($1, print_spool_t, print_spool_t)
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.6.12/policy/modules/services/mailman.fc
 --- nsaserefpolicy/policy/modules/services/mailman.fc	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/mailman.fc	2009-04-07 16:01:44.000000000 -0400
@@ -17791,7 +17808,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.12/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-13 11:44:30.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-15 08:35:07.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -17870,7 +17887,15 @@
  
  allow postfix_master_t postfix_etc_t:file rw_file_perms;
  
-@@ -142,6 +159,7 @@
+@@ -132,6 +149,7 @@
+ # allow access to deferred queue and allow removing bogus incoming entries
+ manage_dirs_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_master_t, postfix_spool_t, dir)
+ 
+ allow postfix_master_t postfix_spool_bounce_t:dir manage_dir_perms;
+ allow postfix_master_t postfix_spool_bounce_t:file getattr;
+@@ -142,6 +160,7 @@
  
  delete_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
  rename_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
@@ -17878,7 +17903,7 @@
  
  kernel_read_all_sysctls(postfix_master_t)
  
-@@ -153,6 +171,9 @@
+@@ -153,6 +172,9 @@
  corenet_udp_sendrecv_generic_node(postfix_master_t)
  corenet_tcp_sendrecv_all_ports(postfix_master_t)
  corenet_udp_sendrecv_all_ports(postfix_master_t)
@@ -17888,7 +17913,7 @@
  corenet_tcp_bind_generic_node(postfix_master_t)
  corenet_tcp_bind_amavisd_send_port(postfix_master_t)
  corenet_tcp_bind_smtp_port(postfix_master_t)
-@@ -170,6 +191,8 @@
+@@ -170,6 +192,8 @@
  domain_use_interactive_fds(postfix_master_t)
  
  files_read_usr_files(postfix_master_t)
@@ -17897,7 +17922,7 @@
  
  term_dontaudit_search_ptys(postfix_master_t)
  
-@@ -181,15 +204,14 @@
+@@ -181,15 +205,14 @@
  
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -17917,7 +17942,7 @@
  ')
  
  optional_policy(`
-@@ -202,9 +224,29 @@
+@@ -202,9 +225,29 @@
  ')
  
  optional_policy(`
@@ -17947,7 +17972,21 @@
  ########################################
  #
  # Postfix bounce local policy
-@@ -245,6 +287,10 @@
+@@ -219,6 +262,7 @@
+ manage_dirs_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
+ manage_lnk_files_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_bounce_t, postfix_spool_t, dir)
+ 
+ manage_dirs_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
+ manage_files_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
+@@ -240,11 +284,16 @@
+ manage_dirs_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
+ manage_lnk_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_cleanup_t, postfix_spool_t, dir)
+ 
+ allow postfix_cleanup_t postfix_spool_bounce_t:dir list_dir_perms;
  
  corecmd_exec_bin(postfix_cleanup_t)
  
@@ -17958,7 +17997,7 @@
  ########################################
  #
  # Postfix local local policy
-@@ -270,18 +316,29 @@
+@@ -270,18 +319,29 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -17988,7 +18027,7 @@
  ')
  
  optional_policy(`
-@@ -292,8 +349,7 @@
+@@ -292,8 +352,7 @@
  #
  # Postfix map local policy
  #
@@ -17998,7 +18037,7 @@
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -340,10 +396,6 @@
+@@ -340,10 +399,6 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -18009,7 +18048,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(postfix_map_t)
  	files_read_default_files(postfix_map_t)
-@@ -356,6 +408,11 @@
+@@ -356,6 +411,11 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -18021,7 +18060,7 @@
  ########################################
  #
  # Postfix pickup local policy
-@@ -380,6 +437,7 @@
+@@ -380,6 +440,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -18029,7 +18068,7 @@
  
  write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
  
-@@ -387,6 +445,12 @@
+@@ -387,6 +448,12 @@
  
  rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
  
@@ -18042,7 +18081,7 @@
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -396,6 +460,15 @@
+@@ -396,6 +463,15 @@
  ')
  
  optional_policy(`
@@ -18058,7 +18097,7 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -432,8 +505,11 @@
+@@ -432,8 +508,11 @@
  ')
  
  optional_policy(`
@@ -18072,7 +18111,7 @@
  ')
  
  #######################################
-@@ -459,6 +535,15 @@
+@@ -459,6 +538,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -18088,7 +18127,15 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -513,7 +598,7 @@
+@@ -472,6 +560,7 @@
+ manage_dirs_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
+ manage_lnk_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_qmgr_t, postfix_spool_t, dir)
+ 
+ allow postfix_qmgr_t postfix_spool_bounce_t:dir list_dir_perms;
+ allow postfix_qmgr_t postfix_spool_bounce_t:file read_file_perms;
+@@ -513,7 +602,7 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -18097,7 +18144,7 @@
  
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
-@@ -543,9 +628,18 @@
+@@ -543,9 +632,18 @@
  
  # for OpenSSL certificates
  files_read_usr_files(postfix_smtpd_t)
@@ -18116,7 +18163,7 @@
  	mailman_read_data_files(postfix_smtpd_t)
  ')
  
-@@ -572,15 +666,21 @@
+@@ -572,15 +670,21 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process
@@ -25240,7 +25287,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-13 10:35:22.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-16 10:03:08.000000000 -0400
 @@ -280,6 +280,29 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -25432,7 +25479,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-13 08:06:15.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-16 10:02:04.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25570,7 +25617,12 @@
  corenet_tcp_sendrecv_all_ports(initrc_t)
  corenet_udp_sendrecv_all_ports(initrc_t)
  corenet_tcp_connect_all_ports(initrc_t)
-@@ -274,12 +312,14 @@
+@@ -270,16 +308,19 @@
+ dev_rw_sysfs(initrc_t)
+ dev_list_usbfs(initrc_t)
+ dev_read_framebuffer(initrc_t)
++dev_write_framebuffer(initrc_t)
+ dev_read_realtime_clock(initrc_t)
  dev_read_sound_mixer(initrc_t)
  dev_write_sound_mixer(initrc_t)
  dev_setattr_all_chr_files(initrc_t)
@@ -25586,7 +25638,7 @@
  
  fs_register_binary_executable_type(initrc_t)
  # rhgb-console writes to ramfs
-@@ -328,7 +368,7 @@
+@@ -328,7 +369,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -25595,7 +25647,7 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -343,14 +383,13 @@
+@@ -343,14 +384,13 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -25611,7 +25663,7 @@
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -366,7 +405,9 @@
+@@ -366,7 +406,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -25621,7 +25673,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -451,7 +492,7 @@
+@@ -451,7 +493,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -25630,7 +25682,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -465,6 +506,7 @@
+@@ -465,6 +507,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -25638,7 +25690,7 @@
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -498,6 +540,7 @@
+@@ -498,6 +541,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -25646,7 +25698,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +559,31 @@
+@@ -516,6 +560,31 @@
  	')
  ')
  
@@ -25678,7 +25730,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +638,10 @@
+@@ -570,6 +639,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -25689,7 +25741,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -647,6 +719,11 @@
+@@ -647,6 +720,11 @@
  ')
  
  optional_policy(`
@@ -25701,7 +25753,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +732,6 @@
+@@ -655,12 +733,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25714,7 +25766,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +792,9 @@
+@@ -721,6 +793,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -25724,7 +25776,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +807,12 @@
+@@ -733,10 +808,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25737,7 +25789,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +830,11 @@
+@@ -754,6 +831,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25749,7 +25801,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +842,8 @@
+@@ -761,6 +843,8 @@
  		# system-config-services causes avc messages that should be dontaudited
  		unconfined_dontaudit_rw_pipes(daemon)
  	')
@@ -25758,7 +25810,7 @@
  
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +851,10 @@
+@@ -768,6 +852,10 @@
  ')
  
  optional_policy(`
@@ -25769,7 +25821,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +877,25 @@
+@@ -790,3 +878,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -28315,7 +28367,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-14 14:03:29.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-15 10:11:28.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -28373,8 +28425,8 @@
  		# Allow making the stack executable via mprotect;
 -		# execstack implies execmem;
 -		allow $1 self:process { execstack execmem };
-+		# execstack implies execmem; Turned off for F11
-+		allow $1 self:process { execstack };
++		# execstack implies execmem; Bugzilla #211271
++		allow $1 self:process { execmem execstack };
  #		auditallow $1 self:process execstack;
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- selinux-policy.spec	15 Apr 2009 12:08:36 -0000	1.825
+++ selinux-policy.spec	16 Apr 2009 14:04:34 -0000	1.826
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 5.1%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -440,7 +440,10 @@
 %endif
 
 %changelog
-* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5.1
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
+- Allow cupsd_t to create link files in print_spool_t
+
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
 - Allow audioentroy to read etc files
 
 * Mon Apr 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-4



From cwickert at fedoraproject.org  Thu Apr 16 14:08:07 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 16 Apr 2009 14:08:07 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 gnome-applet-timer.spec,1.24,1.25
Message-ID: <20090416140807.93F6E70127@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1775

Modified Files:
	gnome-applet-timer.spec 
Log Message:
* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
- Require gstreamer-python



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-10/gnome-applet-timer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-applet-timer.spec	16 Apr 2009 10:01:40 -0000	1.24
+++ gnome-applet-timer.spec	16 Apr 2009 14:07:37 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -20,6 +20,7 @@
 Requires:       gnome-python2-applet >= 2.16
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
+Requires:       gstreamer-python
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -100,6 +101,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
+- Require gstreamer-python
+
 * Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
 - Update to 2.1.2 to fix #496037
 



From kkofler at fedoraproject.org  Thu Apr 16 14:09:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 16 Apr 2009 14:09:30 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs3.spec,1.59,1.60
Message-ID: <20090416140930.44AAC70127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2250/F-11

Modified Files:
	kdelibs3.spec 
Log Message:
Also use noarch subpackages on F10.


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdelibs3.spec	16 Apr 2009 13:56:07 -0000	1.59
+++ kdelibs3.spec	16 Apr 2009 14:09:00 -0000	1.60
@@ -227,7 +227,7 @@
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
 %endif
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
 



From kkofler at fedoraproject.org  Thu Apr 16 14:09:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 16 Apr 2009 14:09:30 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.59,1.60
Message-ID: <20090416140930.76BB970127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2250/devel

Modified Files:
	kdelibs3.spec 
Log Message:
Also use noarch subpackages on F10.


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdelibs3.spec	16 Apr 2009 13:56:08 -0000	1.59
+++ kdelibs3.spec	16 Apr 2009 14:09:00 -0000	1.60
@@ -227,7 +227,7 @@
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
 %endif
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
 



From ssp at fedoraproject.org  Thu Apr 16 14:13:07 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Thu, 16 Apr 2009 14:13:07 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.16, 1.17 pixman.spec, 1.27,
	1.28 sources, 1.18, 1.19
Message-ID: <20090416141307.9C65970127@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2905

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
Update to pixman 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Feb 2009 21:50:53 -0000	1.16
+++ .cvsignore	16 Apr 2009 14:12:37 -0000	1.17
@@ -1,2 +1,3 @@
 pixman-0.13.2.tar.gz
 pixman-0.14.0.tar.gz
+pixman-0.15.2.tar.gz


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pixman.spec	27 Feb 2009 00:40:55 -0000	1.27
+++ pixman.spec	16 Apr 2009 14:12:37 -0000	1.28
@@ -2,8 +2,8 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.14.0
-Release:        2%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Thu Apr 16 2009 Soren Sandmann <ssp at redhat.com> 0.15.2-1
+- pixman 0.15.2
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	10 Mar 2009 21:41:06 -0000	1.18
+++ sources	16 Apr 2009 14:12:37 -0000	1.19
@@ -1 +1,2 @@
 da330524bbd975271974378b1c5e7b5d  pixman-0.14.0.tar.gz
+ac7d687548f02b384d0cab1021d91ce5  pixman-0.15.2.tar.gz



From hedayat at fedoraproject.org  Thu Apr 16 14:23:50 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Thu, 16 Apr 2009 14:23:50 +0000 (UTC)
Subject: rpms/rcssserver/F-10 rcssserver.spec,1.8,1.9
Message-ID: <20090416142350.D87B77013C@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4476

Modified Files:
	rcssserver.spec 
Log Message:
changed release number and added changelog


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/rcssserver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rcssserver.spec	16 Apr 2009 13:57:20 -0000	1.8
+++ rcssserver.spec	16 Apr 2009 14:23:48 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           rcssserver
 Version:        13.2.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Robocup 2D Soccer Simulation Server
 
 Group:          Applications/System
@@ -104,6 +104,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Apr 16 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1.1
+- Fixed a libtool build problem caused by autoreconf conmmand
+
 * Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
 - Updated to the latest upstream release
 



From hedayat at fedoraproject.org  Thu Apr 16 14:38:52 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Thu, 16 Apr 2009 14:38:52 +0000 (UTC)
Subject: rpms/rcssserver/F-9 rcssserver.spec,1.6,1.7
Message-ID: <20090416143852.B137870127@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6399

Modified Files:
	rcssserver.spec 
Log Message:
fixed a compilation fix for libtool


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-9/rcssserver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rcssserver.spec	7 Apr 2009 14:35:25 -0000	1.6
+++ rcssserver.spec	16 Apr 2009 14:38:22 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           rcssserver
 Version:        13.2.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Robocup 2D Soccer Simulation Server
 
 Group:          Applications/System
@@ -56,13 +56,19 @@
     -e 's|\$ac_boost_path/lib|\$libdir|' \
     -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
     m4/ax_boost_base.m4
-autoreconf -if
+aclocal -I m4
+automake
+autoconf
+autoheader
+touch config.h.in
 # Fix rpath
 sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
     configure
 
 %build
 %configure
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 #%{?_smp_mflags} doesn't work
 make 
@@ -98,6 +104,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Apr 16 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1.1
+- Fixed a libtool build problem caused by autoreconf conmmand
+
 * Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
 - Updated to the latest upstream release
 



From dcbw at fedoraproject.org  Thu Apr 16 14:49:56 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 16 Apr 2009 14:49:56 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 ifcfg-rh-inotify-update-fix.patch, NONE,
	1.1 NetworkManager.spec, 1.271, 1.272
Message-ID: <20090416144956.6FC8F70127@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7602

Modified Files:
	NetworkManager.spec 
Added Files:
	ifcfg-rh-inotify-update-fix.patch 
Log Message:
* Thu Apr 16 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-3.git20090414
- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)



ifcfg-rh-inotify-update-fix.patch:

--- NEW FILE ifcfg-rh-inotify-update-fix.patch ---
diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 7e18ed0..bfc36af 100644
--- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -317,27 +317,27 @@ nm_ifcfg_connection_get_unmanaged (NMIfcfgConnection *self)
 	return NM_IFCFG_CONNECTION_GET_PRIVATE (self)->unmanaged;
 }
 
-static gboolean
-update (NMExportedConnection *exported, GHashTable *new_settings, GError **error)
+gboolean
+nm_ifcfg_connection_update (NMIfcfgConnection *self, GHashTable *new_settings, GError **error)
 {
+	NMExportedConnection *exported = NM_EXPORTED_CONNECTION (self);
 	NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (exported);
-	gboolean success;
 	NMConnection *connection;
 
-	success = NM_EXPORTED_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->update (exported, new_settings, error);
-	if (success) {
-		connection = nm_exported_connection_get_connection (exported);
-		success = nm_connection_replace_settings (connection, new_settings, error);
-		if (success) {
-			success = writer_update_connection (connection,
-			                                    IFCFG_DIR,
-			                                    priv->filename,
-			                                    priv->keyfile,
-			                                    error);
-		}
-	}
+	connection = nm_exported_connection_get_connection (exported);
+	if (!nm_connection_replace_settings (connection, new_settings, error))
+		return FALSE;
+
+	return writer_update_connection (connection, IFCFG_DIR, priv->filename, priv->keyfile, error);
+}
+
+static gboolean
+update (NMExportedConnection *exported, GHashTable *new_settings, GError **error)
+{
+	if (!NM_EXPORTED_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->update (exported, new_settings, error))
+		return FALSE;
 
-	return success;
+	return nm_ifcfg_connection_update (NM_IFCFG_CONNECTION (exported), new_settings, error);
 }
 
 static gboolean
diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
index f2a8c6d..dc13aa6 100644
--- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
+++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
@@ -60,6 +60,10 @@ const char *nm_ifcfg_connection_get_udi (NMIfcfgConnection *self);
 
 gboolean nm_ifcfg_connection_get_unmanaged (NMIfcfgConnection *self);
 
+gboolean nm_ifcfg_connection_update (NMIfcfgConnection *self,
+                                     GHashTable *new_settings,
+                                     GError **error);
+
 G_END_DECLS
 
 #endif /* NM_IFCFG_CONNECTION_H */
diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c
index 25d93b9..976090c 100644
--- a/system-settings/plugins/ifcfg-rh/plugin.c
+++ b/system-settings/plugins/ifcfg-rh/plugin.c
@@ -293,9 +293,9 @@ connection_changed_handler (SCPluginIfcfg *plugin,
 		/* errors reading connection; remove it */
 		if (!ignore_error) {
 			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    error: %s",
-			             error->message ? error->message : "(unknown)");
+			             (error && error->message) ? error->message : "(unknown)");
 		}
-		g_error_free (error);
+		g_clear_error (&error);
 
 		PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", path);
 		*do_remove = TRUE;
@@ -336,7 +336,11 @@ connection_changed_handler (SCPluginIfcfg *plugin,
 		/* Only update if different */
 		if (!nm_connection_compare (new_wrapped, old_wrapped, NM_SETTING_COMPARE_FLAG_EXACT)) {
 			settings = nm_connection_to_hash (new_wrapped);
-			nm_exported_connection_update (NM_EXPORTED_CONNECTION (connection), settings, NULL);
+			if (!nm_ifcfg_connection_update (connection, settings, &error)) {
+				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    error updating: %s",
+				             (error && error->message) ? error->message : "(unknown)");
+				g_clear_error (&error);
+			}
 			g_hash_table_destroy (settings);
 		}
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- NetworkManager.spec	14 Apr 2009 22:26:14 -0000	1.271
+++ NetworkManager.spec	16 Apr 2009 14:49:25 -0000	1.272
@@ -18,7 +18,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.1
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,7 @@
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
+Patch3: ifcfg-rh-inotify-update-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -146,6 +147,7 @@
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .ifcfg-rh-inotify-fix
 
 %build
 
@@ -326,6 +328,9 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Apr 16 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-3.git20090414
+- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)
+
 * Tue Apr 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-2.git20090414
 - ifcfg-rh: enable write support for wired and wifi connections
 



From dcbw at fedoraproject.org  Thu Apr 16 14:50:08 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 16 Apr 2009 14:50:08 +0000 (UTC)
Subject: rpms/NetworkManager/devel ifcfg-rh-inotify-update-fix.patch, NONE, 
	1.1 NetworkManager.spec, 1.271, 1.272
Message-ID: <20090416145008.5B49770127@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7655

Modified Files:
	NetworkManager.spec 
Added Files:
	ifcfg-rh-inotify-update-fix.patch 
Log Message:
* Thu Apr 16 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-3.git20090414
- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)



ifcfg-rh-inotify-update-fix.patch:

--- NEW FILE ifcfg-rh-inotify-update-fix.patch ---
diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 7e18ed0..bfc36af 100644
--- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -317,27 +317,27 @@ nm_ifcfg_connection_get_unmanaged (NMIfcfgConnection *self)
 	return NM_IFCFG_CONNECTION_GET_PRIVATE (self)->unmanaged;
 }
 
-static gboolean
-update (NMExportedConnection *exported, GHashTable *new_settings, GError **error)
+gboolean
+nm_ifcfg_connection_update (NMIfcfgConnection *self, GHashTable *new_settings, GError **error)
 {
+	NMExportedConnection *exported = NM_EXPORTED_CONNECTION (self);
 	NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (exported);
-	gboolean success;
 	NMConnection *connection;
 
-	success = NM_EXPORTED_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->update (exported, new_settings, error);
-	if (success) {
-		connection = nm_exported_connection_get_connection (exported);
-		success = nm_connection_replace_settings (connection, new_settings, error);
-		if (success) {
-			success = writer_update_connection (connection,
-			                                    IFCFG_DIR,
-			                                    priv->filename,
-			                                    priv->keyfile,
-			                                    error);
-		}
-	}
+	connection = nm_exported_connection_get_connection (exported);
+	if (!nm_connection_replace_settings (connection, new_settings, error))
+		return FALSE;
+
+	return writer_update_connection (connection, IFCFG_DIR, priv->filename, priv->keyfile, error);
+}
+
+static gboolean
+update (NMExportedConnection *exported, GHashTable *new_settings, GError **error)
+{
+	if (!NM_EXPORTED_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->update (exported, new_settings, error))
+		return FALSE;
 
-	return success;
+	return nm_ifcfg_connection_update (NM_IFCFG_CONNECTION (exported), new_settings, error);
 }
 
 static gboolean
diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
index f2a8c6d..dc13aa6 100644
--- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
+++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
@@ -60,6 +60,10 @@ const char *nm_ifcfg_connection_get_udi (NMIfcfgConnection *self);
 
 gboolean nm_ifcfg_connection_get_unmanaged (NMIfcfgConnection *self);
 
+gboolean nm_ifcfg_connection_update (NMIfcfgConnection *self,
+                                     GHashTable *new_settings,
+                                     GError **error);
+
 G_END_DECLS
 
 #endif /* NM_IFCFG_CONNECTION_H */
diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c
index 25d93b9..976090c 100644
--- a/system-settings/plugins/ifcfg-rh/plugin.c
+++ b/system-settings/plugins/ifcfg-rh/plugin.c
@@ -293,9 +293,9 @@ connection_changed_handler (SCPluginIfcfg *plugin,
 		/* errors reading connection; remove it */
 		if (!ignore_error) {
 			PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    error: %s",
-			             error->message ? error->message : "(unknown)");
+			             (error && error->message) ? error->message : "(unknown)");
 		}
-		g_error_free (error);
+		g_clear_error (&error);
 
 		PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", path);
 		*do_remove = TRUE;
@@ -336,7 +336,11 @@ connection_changed_handler (SCPluginIfcfg *plugin,
 		/* Only update if different */
 		if (!nm_connection_compare (new_wrapped, old_wrapped, NM_SETTING_COMPARE_FLAG_EXACT)) {
 			settings = nm_connection_to_hash (new_wrapped);
-			nm_exported_connection_update (NM_EXPORTED_CONNECTION (connection), settings, NULL);
+			if (!nm_ifcfg_connection_update (connection, settings, &error)) {
+				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    error updating: %s",
+				             (error && error->message) ? error->message : "(unknown)");
+				g_clear_error (&error);
+			}
 			g_hash_table_destroy (settings);
 		}
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- NetworkManager.spec	14 Apr 2009 22:26:14 -0000	1.271
+++ NetworkManager.spec	16 Apr 2009 14:49:38 -0000	1.272
@@ -18,7 +18,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.1
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,7 @@
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
+Patch3: ifcfg-rh-inotify-update-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -146,6 +147,7 @@
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .ifcfg-rh-inotify-fix
 
 %build
 
@@ -326,6 +328,9 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Apr 16 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-3.git20090414
+- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)
+
 * Tue Apr 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-2.git20090414
 - ifcfg-rh: enable write support for wired and wifi connections
 



From rdieter at fedoraproject.org  Thu Apr 16 14:51:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 14:51:33 +0000 (UTC)
Subject: rpms/koffice/F-11 koffice.spec,1.101,1.102
Message-ID: <20090416145133.1C2B270127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8045

Modified Files:
	koffice.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-21.20090306svn
- -krita: revert/readd dropped Requires: -filters



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-11/koffice.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- koffice.spec	10 Mar 2009 01:21:27 -0000	1.101
+++ koffice.spec	16 Apr 2009 14:51:02 -0000	1.102
@@ -6,13 +6,12 @@
 BuildRequires: libutempter-devel
 %endif
 
-#define svn 20081103
 %define svn 20090306
 
 Name:           koffice
 Epoch:          2
 Version:        1.6.3
-Release:        20.%{svn}svn%{?dist}
+Release:        21.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -188,6 +187,7 @@
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+Requires:       %{name}-filters
 %description krita
 %{summary}.
 
@@ -736,6 +736,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-21.20090306svn
+- -krita: revert/readd dropped Requires: -filters
+
 * Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:1.6.3-20.20090306svn
 - rebuild for new ImageMagick
 



From dwalsh at fedoraproject.org  Thu Apr 16 15:14:57 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 16 Apr 2009 15:14:57 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.87,
	1.88 selinux-policy.spec, 1.824, 1.825
Message-ID: <20090416151457.CF85E70127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11270

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
- Allow cupsd_t to create link files in print_spool_t


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- policy-20090105.patch	15 Apr 2009 12:03:08 -0000	1.87
+++ policy-20090105.patch	16 Apr 2009 15:14:25 -0000	1.88
@@ -6501,8 +6501,8 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-09 04:44:48.000000000 -0400
-@@ -0,0 +1,30 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-15 10:01:33.000000000 -0400
+@@ -0,0 +1,32 @@
 +# Add programs here which should not be confined by SELinux
 +# e.g.:
 +# /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -6522,6 +6522,8 @@
 +
 +/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/opera/[^/]*/works -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/opera/[^/]*/opera -- gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/bin/haddock.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags  --	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -7177,8 +7179,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-09 05:43:27.000000000 -0400
-@@ -0,0 +1,402 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-16 10:03:34.000000000 -0400
+@@ -0,0 +1,403 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7267,6 +7269,7 @@
 +
 +init_run_daemon(unconfined_t, unconfined_r)
 +init_domtrans_script(unconfined_t)
++init_chat(unconfined_t)
 +
 +libs_run_ldconfig(unconfined_t, unconfined_r)
 +
@@ -12859,7 +12862,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.12/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/exim.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/exim.te	2009-04-15 08:33:18.000000000 -0400
 @@ -21,9 +21,20 @@
  ## </desc>
  gen_tunable(exim_manage_user_files, false)
@@ -14346,8 +14349,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.6.12/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/lircd.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,55 @@
++++ serefpolicy-3.6.12/policy/modules/services/lircd.te	2009-04-16 09:47:17.000000000 -0400
+@@ -0,0 +1,58 @@
 +policy_module(lircd,1.0.0)
 +
 +########################################
@@ -14393,6 +14396,7 @@
 +# /dev/lircd socket
 +manage_sock_files_pattern(lircd_t, lircd_sock_t, lircd_sock_t)
 +dev_filetrans(lircd_t, lircd_sock_t, sock_file )
++dev_read_generic_usb_dev(lircd_t)
 +
 +logging_send_syslog_msg(lircd_t)
 +
@@ -14401,8 +14405,21 @@
 +files_manage_generic_locks(lircd_t)
 +files_read_all_locks(lircd_t)
 +
++fs_list_inotifyfs(lircd_t)
++
 +miscfiles_read_localization(lircd_t)
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.6.12/policy/modules/services/lpd.if
+--- nsaserefpolicy/policy/modules/services/lpd.if	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/lpd.if	2009-04-15 17:56:28.000000000 -0400
+@@ -134,6 +134,7 @@
+ 	files_search_spool($1)
+ 	manage_dirs_pattern($1, print_spool_t, print_spool_t)
+ 	manage_files_pattern($1, print_spool_t, print_spool_t)
++	manage_lnk_files_pattern($1, print_spool_t, print_spool_t)
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.6.12/policy/modules/services/mailman.fc
 --- nsaserefpolicy/policy/modules/services/mailman.fc	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/mailman.fc	2009-04-07 16:01:44.000000000 -0400
@@ -17791,7 +17808,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.12/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-13 11:44:30.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-15 08:35:07.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -17870,7 +17887,15 @@
  
  allow postfix_master_t postfix_etc_t:file rw_file_perms;
  
-@@ -142,6 +159,7 @@
+@@ -132,6 +149,7 @@
+ # allow access to deferred queue and allow removing bogus incoming entries
+ manage_dirs_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_master_t, postfix_spool_t, dir)
+ 
+ allow postfix_master_t postfix_spool_bounce_t:dir manage_dir_perms;
+ allow postfix_master_t postfix_spool_bounce_t:file getattr;
+@@ -142,6 +160,7 @@
  
  delete_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
  rename_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
@@ -17878,7 +17903,7 @@
  
  kernel_read_all_sysctls(postfix_master_t)
  
-@@ -153,6 +171,9 @@
+@@ -153,6 +172,9 @@
  corenet_udp_sendrecv_generic_node(postfix_master_t)
  corenet_tcp_sendrecv_all_ports(postfix_master_t)
  corenet_udp_sendrecv_all_ports(postfix_master_t)
@@ -17888,7 +17913,7 @@
  corenet_tcp_bind_generic_node(postfix_master_t)
  corenet_tcp_bind_amavisd_send_port(postfix_master_t)
  corenet_tcp_bind_smtp_port(postfix_master_t)
-@@ -170,6 +191,8 @@
+@@ -170,6 +192,8 @@
  domain_use_interactive_fds(postfix_master_t)
  
  files_read_usr_files(postfix_master_t)
@@ -17897,7 +17922,7 @@
  
  term_dontaudit_search_ptys(postfix_master_t)
  
-@@ -181,15 +204,14 @@
+@@ -181,15 +205,14 @@
  
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -17917,7 +17942,7 @@
  ')
  
  optional_policy(`
-@@ -202,9 +224,29 @@
+@@ -202,9 +225,29 @@
  ')
  
  optional_policy(`
@@ -17947,7 +17972,21 @@
  ########################################
  #
  # Postfix bounce local policy
-@@ -245,6 +287,10 @@
+@@ -219,6 +262,7 @@
+ manage_dirs_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
+ manage_lnk_files_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_bounce_t, postfix_spool_t, dir)
+ 
+ manage_dirs_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
+ manage_files_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
+@@ -240,11 +284,16 @@
+ manage_dirs_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
+ manage_lnk_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_cleanup_t, postfix_spool_t, dir)
+ 
+ allow postfix_cleanup_t postfix_spool_bounce_t:dir list_dir_perms;
  
  corecmd_exec_bin(postfix_cleanup_t)
  
@@ -17958,7 +17997,7 @@
  ########################################
  #
  # Postfix local local policy
-@@ -270,18 +316,29 @@
+@@ -270,18 +319,29 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -17988,7 +18027,7 @@
  ')
  
  optional_policy(`
-@@ -292,8 +349,7 @@
+@@ -292,8 +352,7 @@
  #
  # Postfix map local policy
  #
@@ -17998,7 +18037,7 @@
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -340,10 +396,6 @@
+@@ -340,10 +399,6 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -18009,7 +18048,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(postfix_map_t)
  	files_read_default_files(postfix_map_t)
-@@ -356,6 +408,11 @@
+@@ -356,6 +411,11 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -18021,7 +18060,7 @@
  ########################################
  #
  # Postfix pickup local policy
-@@ -380,6 +437,7 @@
+@@ -380,6 +440,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -18029,7 +18068,7 @@
  
  write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
  
-@@ -387,6 +445,12 @@
+@@ -387,6 +448,12 @@
  
  rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
  
@@ -18042,7 +18081,7 @@
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -396,6 +460,15 @@
+@@ -396,6 +463,15 @@
  ')
  
  optional_policy(`
@@ -18058,7 +18097,7 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -432,8 +505,11 @@
+@@ -432,8 +508,11 @@
  ')
  
  optional_policy(`
@@ -18072,7 +18111,7 @@
  ')
  
  #######################################
-@@ -459,6 +535,15 @@
+@@ -459,6 +538,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -18088,7 +18127,15 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -513,7 +598,7 @@
+@@ -472,6 +560,7 @@
+ manage_dirs_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
+ manage_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
+ manage_lnk_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
++files_spool_filetrans(postfix_qmgr_t, postfix_spool_t, dir)
+ 
+ allow postfix_qmgr_t postfix_spool_bounce_t:dir list_dir_perms;
+ allow postfix_qmgr_t postfix_spool_bounce_t:file read_file_perms;
+@@ -513,7 +602,7 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -18097,7 +18144,7 @@
  
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
-@@ -543,9 +628,18 @@
+@@ -543,9 +632,18 @@
  
  # for OpenSSL certificates
  files_read_usr_files(postfix_smtpd_t)
@@ -18116,7 +18163,7 @@
  	mailman_read_data_files(postfix_smtpd_t)
  ')
  
-@@ -572,15 +666,21 @@
+@@ -572,15 +670,21 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process
@@ -25240,7 +25287,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-13 10:35:22.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-16 10:03:08.000000000 -0400
 @@ -280,6 +280,29 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -25432,7 +25479,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-13 08:06:15.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-16 10:02:04.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25570,7 +25617,12 @@
  corenet_tcp_sendrecv_all_ports(initrc_t)
  corenet_udp_sendrecv_all_ports(initrc_t)
  corenet_tcp_connect_all_ports(initrc_t)
-@@ -274,12 +312,14 @@
+@@ -270,16 +308,19 @@
+ dev_rw_sysfs(initrc_t)
+ dev_list_usbfs(initrc_t)
+ dev_read_framebuffer(initrc_t)
++dev_write_framebuffer(initrc_t)
+ dev_read_realtime_clock(initrc_t)
  dev_read_sound_mixer(initrc_t)
  dev_write_sound_mixer(initrc_t)
  dev_setattr_all_chr_files(initrc_t)
@@ -25586,7 +25638,7 @@
  
  fs_register_binary_executable_type(initrc_t)
  # rhgb-console writes to ramfs
-@@ -328,7 +368,7 @@
+@@ -328,7 +369,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -25595,7 +25647,7 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -343,14 +383,13 @@
+@@ -343,14 +384,13 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -25611,7 +25663,7 @@
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -366,7 +405,9 @@
+@@ -366,7 +406,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -25621,7 +25673,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -451,7 +492,7 @@
+@@ -451,7 +493,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -25630,7 +25682,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -465,6 +506,7 @@
+@@ -465,6 +507,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -25638,7 +25690,7 @@
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -498,6 +540,7 @@
+@@ -498,6 +541,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -25646,7 +25698,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +559,31 @@
+@@ -516,6 +560,31 @@
  	')
  ')
  
@@ -25678,7 +25730,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +638,10 @@
+@@ -570,6 +639,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -25689,7 +25741,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -647,6 +719,11 @@
+@@ -647,6 +720,11 @@
  ')
  
  optional_policy(`
@@ -25701,7 +25753,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +732,6 @@
+@@ -655,12 +733,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25714,7 +25766,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +792,9 @@
+@@ -721,6 +793,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -25724,7 +25776,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +807,12 @@
+@@ -733,10 +808,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25737,7 +25789,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +830,11 @@
+@@ -754,6 +831,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25749,7 +25801,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +842,8 @@
+@@ -761,6 +843,8 @@
  		# system-config-services causes avc messages that should be dontaudited
  		unconfined_dontaudit_rw_pipes(daemon)
  	')
@@ -25758,7 +25810,7 @@
  
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +851,10 @@
+@@ -768,6 +852,10 @@
  ')
  
  optional_policy(`
@@ -25769,7 +25821,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +877,25 @@
+@@ -790,3 +878,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -28315,7 +28367,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-14 14:03:29.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-15 10:11:28.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -28373,8 +28425,8 @@
  		# Allow making the stack executable via mprotect;
 -		# execstack implies execmem;
 -		allow $1 self:process { execstack execmem };
-+		# execstack implies execmem; Turned off for F11
-+		allow $1 self:process { execstack };
++		# execstack implies execmem; Bugzilla #211271
++		allow $1 self:process { execmem execstack };
  #		auditallow $1 self:process execstack;
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- selinux-policy.spec	15 Apr 2009 12:03:09 -0000	1.824
+++ selinux-policy.spec	16 Apr 2009 15:14:26 -0000	1.825
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -440,6 +440,9 @@
 %endif
 
 %changelog
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
+- Allow cupsd_t to create link files in print_spool_t
+
 * Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
 - Allow audioentroy to read etc files
 



From rdieter at fedoraproject.org  Thu Apr 16 15:18:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 15:18:29 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils.spec,1.172,1.173
Message-ID: <20090416151829.81DCD70127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11863/F-11

Modified Files:
	kdeutils.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- revert -printer-applet dep changes (and drop for f11+)



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kdeutils.spec	15 Apr 2009 11:29:38 -0000	1.172
+++ kdeutils.spec	16 Apr 2009 15:17:59 -0000	1.173
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -31,12 +31,16 @@
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
 BuildRequires:  qimageblitz-devel
-BuildRequires:  python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
+%if 0%{?fedora} < 11
+# upgrade path so it doesn't get lost
+Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
+%endif
+
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -71,10 +75,6 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{name} < 6:4.2.1-3
-
 %description printer-applet
 %{summary}.
 
@@ -201,6 +201,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- revert -printer-applet dep changes (and drop for f11+)
+
 * Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - drop the BR on PyKDE4, system-config-printer-libs
   it's just needed for runtime



From rdieter at fedoraproject.org  Thu Apr 16 15:18:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 15:18:29 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.171,1.172
Message-ID: <20090416151829.AF60770127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11863/devel

Modified Files:
	kdeutils.spec 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- revert -printer-applet dep changes (and drop for f11+)



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kdeutils.spec	15 Apr 2009 10:53:41 -0000	1.171
+++ kdeutils.spec	16 Apr 2009 15:17:59 -0000	1.172
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -36,6 +36,11 @@
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
+%if 0%{?fedora} < 11
+# upgrade path so it doesn't get lost
+Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
+%endif
+
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
@@ -70,10 +75,6 @@
 Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
-# upgrade path so it doesn't get lost
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{name} < 6:4.2.1-3
-
 %description printer-applet
 %{summary}.
 
@@ -200,6 +201,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- revert -printer-applet dep changes (and drop for f11+)
+
 * Wed Apr 15 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - drop the BR on PyKDE4, system-config-printer-libs
   it's just needed for runtime



From markmc at fedoraproject.org  Thu Apr 16 15:25:59 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 16 Apr 2009 15:25:59 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.6.2-qemu-drive-format.patch, NONE,
	1.1 libvirt.spec, 1.123, 1.124
Message-ID: <20090416152559.2148D7013C@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12877

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.2-qemu-drive-format.patch 
Log Message:
* Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc12
- Fix qemu drive format specification (#496092)


libvirt-0.6.2-qemu-drive-format.patch:

--- NEW FILE libvirt-0.6.2-qemu-drive-format.patch ---
>From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 16 Apr 2009 11:23:55 +0100
Subject: [PATCH 1/3] qemu -drive takes format= not fmt=

Seems like a simple typo - it has been "format=" since the flag
was introduced, but we added it as "fmt=".

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
---
 src/qemu_conf.c                                    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index f36c927..6f9e610 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
                 disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
                 virBufferAddLit(&opt, ",boot=on");
             if (disk->driverType)
-                virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
+                virBufferVSprintf(&opt, ",format=%s", disk->driverType);
 
             if (disk->cachemode) {
                 const char *mode =


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- libvirt.spec	3 Apr 2009 15:52:11 -0000	1.123
+++ libvirt.spec	16 Apr 2009 15:25:28 -0000	1.124
@@ -66,11 +66,14 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 
+# Patches cherry-picked from upstream
+Patch0: libvirt-0.6.2-qemu-drive-format.patch
+
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
 Patch200: libvirt-0.6.2-svirt-sound.patch
@@ -224,6 +227,8 @@
 %prep
 %setup -q
 
+%patch0 -p1
+
 %patch200 -p0
 
 mv NEWS NEWS.old
@@ -542,6 +547,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc12
+- Fix qemu drive format specification (#496092)
+
 * Fri Apr  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.2-1.fc11
 - release of 0.6.2
 - memory ballooning in QEMU



From markmc at fedoraproject.org  Thu Apr 16 15:27:15 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 16 Apr 2009 15:27:15 +0000 (UTC)
Subject: rpms/libvirt/F-11 libvirt-0.6.2-qemu-drive-format.patch, NONE,
	1.1 libvirt.spec, 1.123, 1.124
Message-ID: <20090416152715.7AA7770127@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13667

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.2-qemu-drive-format.patch 
Log Message:
* Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc11
- Fix qemu drive format specification (#496092)


libvirt-0.6.2-qemu-drive-format.patch:

--- NEW FILE libvirt-0.6.2-qemu-drive-format.patch ---
>From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 16 Apr 2009 11:23:55 +0100
Subject: [PATCH 1/3] qemu -drive takes format= not fmt=

Seems like a simple typo - it has been "format=" since the flag
was introduced, but we added it as "fmt=".

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
---
 src/qemu_conf.c                                    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index f36c927..6f9e610 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
                 disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
                 virBufferAddLit(&opt, ",boot=on");
             if (disk->driverType)
-                virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
+                virBufferVSprintf(&opt, ",format=%s", disk->driverType);
 
             if (disk->cachemode) {
                 const char *mode =


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- libvirt.spec	3 Apr 2009 15:52:11 -0000	1.123
+++ libvirt.spec	16 Apr 2009 15:26:45 -0000	1.124
@@ -66,11 +66,14 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 
+# Patches cherry-picked from upstream
+Patch0: libvirt-0.6.2-qemu-drive-format.patch
+
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
 Patch200: libvirt-0.6.2-svirt-sound.patch
@@ -224,6 +227,8 @@
 %prep
 %setup -q
 
+%patch0 -p1
+
 %patch200 -p0
 
 mv NEWS NEWS.old
@@ -542,6 +547,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc11
+- Fix qemu drive format specification (#496092)
+
 * Fri Apr  3 2009 Daniel Veillard <veillard at redhat.com> - 0.6.2-1.fc11
 - release of 0.6.2
 - memory ballooning in QEMU



From kyle at fedoraproject.org  Thu Apr 16 15:50:32 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 16 Apr 2009 15:50:32 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc2-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1050, 1.1051 kernel.spec, 1.1519, 1.1520 sources, 1.1012,
	1.1013 upstream, 1.923, 1.924
Message-ID: <20090416155032.2929070127@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17718

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc2-git1.bz2.sign 
Log Message:
* Thu Apr 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.58.rc2.git1
- 2.6.30-rc2-git1



--- NEW FILE patch-2.6.30-rc2-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ5nVRyGugalF9Dw4RAqsLAJ0VOPK4SHFcGuloHdcDDDCXT4TB6wCeJENR
j9jNzTyBg3qZKAz32SSKPYA=
=bd3L
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -r1.1050 -r1.1051
--- .cvsignore	15 Apr 2009 16:59:24 -0000	1.1050
+++ .cvsignore	16 Apr 2009 15:50:01 -0000	1.1051
@@ -7,3 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc2.bz2
+patch-2.6.30-rc2-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1519
retrieving revision 1.1520
diff -u -r1.1519 -r1.1520
--- kernel.spec	15 Apr 2009 17:12:32 -0000	1.1519
+++ kernel.spec	16 Apr 2009 15:50:01 -0000	1.1520
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -102,7 +102,7 @@
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1824,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.58.rc2.git1
+- 2.6.30-rc2-git1
+
 * Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.57.rc2
 - 2.6.30-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -r1.1012 -r1.1013
--- sources	15 Apr 2009 16:59:24 -0000	1.1012
+++ sources	16 Apr 2009 15:50:01 -0000	1.1013
@@ -1,2 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 4c58a960ae5130ec1126fe33409425d1  patch-2.6.30-rc2.bz2
+cf17cca2e8100006e25b34d02fe93ae1  patch-2.6.30-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- upstream	15 Apr 2009 16:59:25 -0000	1.923
+++ upstream	16 Apr 2009 15:50:01 -0000	1.924
@@ -1,2 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc2.bz2
+patch-2.6.30-rc2-git1.bz2



From hadess at fedoraproject.org  Thu Apr 16 15:59:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 16 Apr 2009 15:59:45 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.445,
	1.446 gcc-pam-fprintd-avail.patch, 1.1, 1.2
Message-ID: <20090416155945.37A7470127@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20350

Modified Files:
	control-center.spec gcc-pam-fprintd-avail.patch 
Log Message:
* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
- Disable the fingerprint enrollment if gdm-plugin-fingerprint
  isn't installed



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- control-center.spec	10 Apr 2009 02:21:08 -0000	1.445
+++ control-center.spec	16 Apr 2009 15:59:14 -0000	1.446
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -360,6 +360,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
+- Disable the fingerprint enrollment if gdm-plugin-fingerprint
+  isn't installed
+
 * Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
 - Make mnemonics in display capplet work
 

gcc-pam-fprintd-avail.patch:

Index: gcc-pam-fprintd-avail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gcc-pam-fprintd-avail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc-pam-fprintd-avail.patch	23 Jan 2009 11:21:08 -0000	1.1
+++ gcc-pam-fprintd-avail.patch	16 Apr 2009 15:59:14 -0000	1.2
@@ -1,8 +1,7 @@
-Index: capplets/about-me/gnome-about-me-fingerprint.c
-===================================================================
---- capplets/about-me/gnome-about-me-fingerprint.c	(revision 9203)
-+++ capplets/about-me/gnome-about-me-fingerprint.c	(working copy)
-@@ -92,6 +92,38 @@
+diff -up capplets/about-me/gnome-about-me-fingerprint.c gnome-control-center-2.26.0/capplets/about-me/gnome-about-me-fingerprint.c
+--- capplets/about-me/gnome-about-me-fingerprint.c	2009-04-16 16:51:51.000000000 +0100
++++ capplets/about-me/gnome-about-me-fingerprint.c	2009-04-16 16:56:49.000000000 +0100
+@@ -92,6 +92,40 @@ get_first_device (void)
  	return device;
  }
  
@@ -13,8 +12,10 @@
 +	gboolean ret;
 +	guint i;
 +
++	if (g_file_test ("/etc/pam.d/gdm-fingerprint", G_FILE_TEST_IS_REGULAR) == FALSE)
++		return FALSE;
 +	if (g_file_get_contents ("/etc/sysconfig/authconfig", &contents, NULL, NULL) == FALSE)
-+		return TRUE;
++		return FALSE;
 +
 +	lines = g_strsplit (contents, "\n", -1);
 +	g_free (contents);
@@ -41,7 +42,7 @@
  static const char *
  get_reason_for_error (const char *dbus_error)
  {
-@@ -146,29 +178,24 @@
+@@ -146,29 +180,24 @@ set_fingerprint_label (GtkWidget *enable
  	gtk_widget_set_no_show_all (enable, TRUE);
  	gtk_widget_set_no_show_all (disable, TRUE);
  
@@ -79,7 +80,7 @@
  		}
  		fingers = NULL;
  	}
-@@ -185,6 +212,11 @@
+@@ -185,6 +214,11 @@ set_fingerprint_label (GtkWidget *enable
  
  	g_strfreev (fingers);
  	g_object_unref (device);



From rdieter at fedoraproject.org  Thu Apr 16 16:04:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 16:04:01 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.172,1.173
Message-ID: <20090416160401.CBA8570127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21330/devel

Modified Files:
	kdeutils.spec 
Log Message:
restore awol BR: python



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kdeutils.spec	16 Apr 2009 15:17:59 -0000	1.172
+++ kdeutils.spec	16 Apr 2009 16:03:31 -0000	1.173
@@ -30,6 +30,7 @@
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
+BuildRequires:  python
 BuildRequires:  qimageblitz-devel
 
 Requires(post): /sbin/ldconfig



From rdieter at fedoraproject.org  Thu Apr 16 16:04:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 16:04:01 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils.spec,1.173,1.174
Message-ID: <20090416160401.9CDBE70127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21330/F-11

Modified Files:
	kdeutils.spec 
Log Message:
restore awol BR: python



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kdeutils.spec	16 Apr 2009 15:17:59 -0000	1.173
+++ kdeutils.spec	16 Apr 2009 16:03:31 -0000	1.174
@@ -30,6 +30,7 @@
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
+BuildRequires:  python
 BuildRequires:  qimageblitz-devel
 
 Requires(post): /sbin/ldconfig



From hadess at fedoraproject.org  Thu Apr 16 16:15:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 16 Apr 2009 16:15:45 +0000 (UTC)
Subject: rpms/control-center/F-11 control-center.spec, 1.445,
	1.446 gcc-pam-fprintd-avail.patch, 1.1, 1.2
Message-ID: <20090416161545.5126470127@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23718

Modified Files:
	control-center.spec gcc-pam-fprintd-avail.patch 
Log Message:
* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
- Disable the fingerprint enrollment if gdm-plugin-fingerprint
  isn't installed



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/control-center.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- control-center.spec	10 Apr 2009 02:21:08 -0000	1.445
+++ control-center.spec	16 Apr 2009 16:15:14 -0000	1.446
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -360,6 +360,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
+- Disable the fingerprint enrollment if gdm-plugin-fingerprint
+  isn't installed
+
 * Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
 - Make mnemonics in display capplet work
 

gcc-pam-fprintd-avail.patch:

Index: gcc-pam-fprintd-avail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/gcc-pam-fprintd-avail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc-pam-fprintd-avail.patch	23 Jan 2009 11:21:08 -0000	1.1
+++ gcc-pam-fprintd-avail.patch	16 Apr 2009 16:15:14 -0000	1.2
@@ -1,8 +1,7 @@
-Index: capplets/about-me/gnome-about-me-fingerprint.c
-===================================================================
---- capplets/about-me/gnome-about-me-fingerprint.c	(revision 9203)
-+++ capplets/about-me/gnome-about-me-fingerprint.c	(working copy)
-@@ -92,6 +92,38 @@
+diff -up capplets/about-me/gnome-about-me-fingerprint.c gnome-control-center-2.26.0/capplets/about-me/gnome-about-me-fingerprint.c
+--- capplets/about-me/gnome-about-me-fingerprint.c	2009-04-16 16:51:51.000000000 +0100
++++ capplets/about-me/gnome-about-me-fingerprint.c	2009-04-16 16:56:49.000000000 +0100
+@@ -92,6 +92,40 @@ get_first_device (void)
  	return device;
  }
  
@@ -13,8 +12,10 @@
 +	gboolean ret;
 +	guint i;
 +
++	if (g_file_test ("/etc/pam.d/gdm-fingerprint", G_FILE_TEST_IS_REGULAR) == FALSE)
++		return FALSE;
 +	if (g_file_get_contents ("/etc/sysconfig/authconfig", &contents, NULL, NULL) == FALSE)
-+		return TRUE;
++		return FALSE;
 +
 +	lines = g_strsplit (contents, "\n", -1);
 +	g_free (contents);
@@ -41,7 +42,7 @@
  static const char *
  get_reason_for_error (const char *dbus_error)
  {
-@@ -146,29 +178,24 @@
+@@ -146,29 +180,24 @@ set_fingerprint_label (GtkWidget *enable
  	gtk_widget_set_no_show_all (enable, TRUE);
  	gtk_widget_set_no_show_all (disable, TRUE);
  
@@ -79,7 +80,7 @@
  		}
  		fingers = NULL;
  	}
-@@ -185,6 +212,11 @@
+@@ -185,6 +214,11 @@ set_fingerprint_label (GtkWidget *enable
  
  	g_strfreev (fingers);
  	g_object_unref (device);



From pkgdb at fedoraproject.org  Thu Apr 16 16:16:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 16:16:21 +0000
Subject: [pkgdb] deluge had acl change status
Message-ID: <20090416161621.A301710F851@bastion2.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on deluge (Fedora 10) to Approved for bloodname

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/deluge



From scop at fedoraproject.org  Thu Apr 16 16:21:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 16 Apr 2009 16:21:30 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix.spec,1.37,1.38
Message-ID: <20090416162130.DEC8170127@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25314

Modified Files:
	zabbix.spec 
Log Message:
Tighten configuration file permissions.


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- zabbix.spec	9 Apr 2009 14:42:13 -0000	1.37
+++ zabbix.spec	16 Apr 2009 16:21:00 -0000	1.38
@@ -380,12 +380,24 @@
 
 %post server
 /sbin/chkconfig --add zabbix-server
+if [ $1 -gt 1 ]
+then
+  # Apply permissions also in *.rpmnew upgrades from old permissive ones
+  chmod 0640 %{_sysconfdir}/zabbix/zabbix_server.conf
+  chown root:zabbix %{_sysconfdir}/zabbix/zabbix_server.conf
+fi
 
 %post agent
 /sbin/chkconfig --add zabbix-agent
 
 %post proxy
 /sbin/chkconfig --add zabbix-proxy
+if [ $1 -gt 1 ]
+then
+  # Apply permissions also in *.rpmnew upgrades from old permissive ones
+  chmod 0640 %{_sysconfdir}/zabbix/zabbix_proxy.conf
+  chown root:zabbix %{_sysconfdir}/zabbix/zabbix_proxy.conf
+fi
 
 %preun server
 if [ "$1" = 0 ]
@@ -433,7 +445,7 @@
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
+%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
 %{_sysconfdir}/init.d/zabbix-server
 
@@ -465,7 +477,7 @@
 
 %files proxy
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
+%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
 %{_sysconfdir}/init.d/zabbix-proxy
 
@@ -483,7 +495,7 @@
 
 %files web
 %defattr(-,root,root,-)
-%dir %attr(0755,apache,apache) %{_sysconfdir}/zabbix/web
+%dir %attr(0750,apache,apache) %{_sysconfdir}/zabbix/web
 %ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/zabbix/web/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %{_datadir}/zabbix
@@ -499,6 +511,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Tighten configuration file permissions.
+
 * Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-2
 - make the -docs subpackage noarch
 



From scop at fedoraproject.org  Thu Apr 16 16:23:00 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 16 Apr 2009 16:23:00 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix.spec,1.38,1.39
Message-ID: <20090416162300.31F9070127@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25682

Modified Files:
	zabbix.spec 
Log Message:
Ensure zero exit status from scriptlets.


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- zabbix.spec	16 Apr 2009 16:21:00 -0000	1.38
+++ zabbix.spec	16 Apr 2009 16:22:29 -0000	1.39
@@ -386,9 +386,10 @@
   chmod 0640 %{_sysconfdir}/zabbix/zabbix_server.conf
   chown root:zabbix %{_sysconfdir}/zabbix/zabbix_server.conf
 fi
+:
 
 %post agent
-/sbin/chkconfig --add zabbix-agent
+/sbin/chkconfig --add zabbix-agent || :
 
 %post proxy
 /sbin/chkconfig --add zabbix-proxy
@@ -398,27 +399,31 @@
   chmod 0640 %{_sysconfdir}/zabbix/zabbix_proxy.conf
   chown root:zabbix %{_sysconfdir}/zabbix/zabbix_proxy.conf
 fi
+:
 
 %preun server
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix-server stop >/dev/null 2>&1 || :
+  /sbin/service zabbix-server stop >/dev/null 2>&1
   /sbin/chkconfig --del zabbix-server
 fi
+:
 
 %preun agent
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix-agent stop >/dev/null 2>&1 || :
+  /sbin/service zabbix-agent stop >/dev/null 2>&1
   /sbin/chkconfig --del zabbix-agent
 fi
+:
 
 %preun proxy
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix-proxy stop >/dev/null 2>&1 || :
+  /sbin/service zabbix-proxy stop >/dev/null 2>&1
   /sbin/chkconfig --del zabbix-proxy
 fi
+:
 
 %post web
 # move existing config file on update
@@ -430,6 +435,7 @@
         chown apache:apache %{_sysconfdir}/zabbix/web/zabbix.conf.php
     fi
 fi
+:
 
 
 %files
@@ -513,6 +519,7 @@
 %changelog
 * Thu Apr  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
 - Tighten configuration file permissions.
+- Ensure zero exit status from scriptlets.
 
 * Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-2
 - make the -docs subpackage noarch



From remi at fedoraproject.org  Thu Apr 16 16:27:41 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 16 Apr 2009 16:27:41 +0000 (UTC)
Subject: rpms/php/F-10 php-5.2.8-install.patch, NONE,
	1.1 php-5.2.8-phpize64.patch, NONE, 1.1 php-5.2.9-gnusrc.patch,
	NONE, 1.1 php.spec, 1.162, 1.163 sources, 1.37,
	1.38 php-4.3.3-install.patch, 1.1, NONE php-5.0.2-phpize64.patch,
	1.2, NONE php-5.2.6-gnusrc.patch, 1.1, NONE
Message-ID: <20090416162741.A77617013C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26649

Modified Files:
	php.spec sources 
Added Files:
	php-5.2.8-install.patch php-5.2.8-phpize64.patch 
	php-5.2.9-gnusrc.patch 
Removed Files:
	php-4.3.3-install.patch php-5.0.2-phpize64.patch 
	php-5.2.6-gnusrc.patch 
Log Message:
update to 5.2.9

php-5.2.8-install.patch:

--- NEW FILE php-5.2.8-install.patch ---
--- php-5.2.8/sapi/apache2handler/config.m4.install
+++ php-5.2.8/sapi/apache2handler/config.m4
@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-  if test -z `$APXS -q SYSCONFDIR`; then
+  if true; then
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -i -n php5"

php-5.2.8-phpize64.patch:

--- NEW FILE php-5.2.8-phpize64.patch ---
--- php-5.2.8/scripts/Makefile.frag.phpize64
+++ php-5.2.8/scripts/Makefile.frag
@@ -4,7 +4,7 @@
 #
 
 phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpbuilddir = $(libdir)/php/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
--- php-5.2.8/scripts/phpize.in.phpize64
+++ php-5.2.8/scripts/phpize.in
@@ -3,7 +3,7 @@
 # Variable declaration
 prefix='@prefix@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
+phpdir="@libdir@/php/build"
 includedir="`eval echo @includedir@`/php"
 builddir="`pwd`"
 SED="@SED@"

php-5.2.9-gnusrc.patch:

--- NEW FILE php-5.2.9-gnusrc.patch ---
diff -up php-5.2.9/configure.in.gnusrc php-5.2.9/configure.in
--- php-5.2.9/configure.in.gnusrc	2009-02-25 15:56:50.000000000 +0100
+++ php-5.2.9/configure.in	2009-02-27 19:33:40.000000000 +0100
@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
 AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
 AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
 dnl Setting up the PHP version based on the information above.
 dnl -------------------------------------------------------------------------
 
diff -up php-5.2.9/ext/interbase/interbase.c.gnusrc php-5.2.9/ext/interbase/interbase.c
--- php-5.2.9/ext/interbase/interbase.c.gnusrc	2008-12-31 12:17:38.000000000 +0100
+++ php-5.2.9/ext/interbase/interbase.c	2009-02-27 19:33:40.000000000 +0100
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
diff -up php-5.2.9/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.2.9/ext/pdo_firebird/firebird_driver.c
--- php-5.2.9/ext/pdo_firebird/firebird_driver.c.gnusrc	2008-12-31 12:17:41.000000000 +0100
+++ php-5.2.9/ext/pdo_firebird/firebird_driver.c	2009-02-27 19:33:40.000000000 +0100
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
diff -up php-5.2.9/ext/standard/file.c.gnusrc php-5.2.9/ext/standard/file.c
--- php-5.2.9/ext/standard/file.c.gnusrc	2008-12-31 12:17:44.000000000 +0100
+++ php-5.2.9/ext/standard/file.c	2009-02-27 19:33:40.000000000 +0100
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
diff -up php-5.2.9/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.2.9/ext/zlib/zlib_fopen_wrapper.c
--- php-5.2.9/ext/zlib/zlib_fopen_wrapper.c.gnusrc	2009-01-20 16:43:05.000000000 +0100
+++ php-5.2.9/ext/zlib/zlib_fopen_wrapper.c	2009-02-27 19:35:38.000000000 +0100
@@ -19,8 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.7 2009/01/20 15:43:05 felipe Exp $ */
 
-#define _GNU_SOURCE
-
 #include "php.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
diff -up php-5.2.9/main/php.h.gnusrc php-5.2.9/main/php.h
--- php-5.2.9/main/php.h.gnusrc	2008-12-31 12:17:47.000000000 +0100
+++ php-5.2.9/main/php.h	2009-02-27 19:33:40.000000000 +0100
@@ -30,6 +30,7 @@
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 
+#include "php_config.h"
 #include "php_version.h"
 #include "zend.h"
 #include "zend_qsort.h"
diff -up php-5.2.9/main/streams/cast.c.gnusrc php-5.2.9/main/streams/cast.c
--- php-5.2.9/main/streams/cast.c.gnusrc	2008-12-31 12:17:48.000000000 +0100
+++ php-5.2.9/main/streams/cast.c	2009-02-27 19:36:07.000000000 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.3 2008/12/31 11:17:48 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.2.9/main/streams/memory.c.gnusrc php-5.2.9/main/streams/memory.c
--- php-5.2.9/main/streams/memory.c.gnusrc	2008-12-31 12:17:48.000000000 +0100
+++ php-5.2.9/main/streams/memory.c	2009-02-27 19:36:40.000000000 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.20 2008/12/31 11:17:48 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
diff -up php-5.2.9/main/streams/streams.c.gnusrc php-5.2.9/main/streams/streams.c
--- php-5.2.9/main/streams/streams.c.gnusrc	2009-01-08 20:21:25.000000000 +0100
+++ php-5.2.9/main/streams/streams.c	2009-02-27 19:37:04.000000000 +0100
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.33 2009/01/08 19:21:25 felipe Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.2.9/Zend/zend_language_parser.c.gnusrc php-5.2.9/Zend/zend_language_parser.c
--- php-5.2.9/Zend/zend_language_parser.c.gnusrc	2009-02-25 16:39:52.000000000 +0100
+++ php-5.2.9/Zend/zend_language_parser.c	2009-02-27 19:33:40.000000000 +0100
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/php.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- php.spec	3 Jan 2009 08:00:34 -0000	1.162
+++ php.spec	16 Apr 2009 16:27:11 -0000	1.163
@@ -2,12 +2,11 @@
 %define apiver 20041225
 %define zendver 20060613
 %define pdover 20060511
-
-%define _default_patch_fuzz 2
+%define httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.8
+Version: 5.2.9
 Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
@@ -18,38 +17,36 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.2.6-gnusrc.patch
-Patch2: php-4.3.3-install.patch
+# Build fixes
+Patch1: php-5.2.9-gnusrc.patch
+Patch2: php-5.2.8-install.patch
 Patch3: php-5.2.4-norpath.patch
-Patch5: php-5.0.2-phpize64.patch
-Patch8: php-5.2.0-includedir.patch
-Patch9: php-5.2.4-embed.patch
+Patch4: php-5.2.8-phpize64.patch
+Patch5: php-5.2.0-includedir.patch
+Patch6: php-5.2.4-embed.patch
 
 # Fixes for extension modules
-Patch21: php-5.2.4-odbc.patch
-Patch22: php-4.3.11-shutdown.patch
-Patch24: php-5.2.3-macropen.patch
+Patch20: php-4.3.11-shutdown.patch
+Patch21: php-5.2.3-macropen.patch
 
 # Functional changes
-Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.2.4-easter.patch
-Patch32: php-5.2.6-systzdata.patch
+Patch40: php-5.0.4-dlopen.patch
+Patch41: php-5.2.4-easter.patch
+Patch42: php-5.2.6-systzdata.patch
 
 # Fixes for tests
-Patch50: php-5.2.7-tests-dashn.patch
-Patch51: php-5.0.4-tests-wddx.patch
+Patch60: php-5.2.7-tests-dashn.patch
+Patch61: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
-BuildRequires: gmp-devel
+BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
 BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, readline-devel
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 Obsoletes: php-dbg, php3, phpfi, stronghold-php
-# Enforce Apache module ABI compatibility
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+Requires: httpd-mmn = %{httpd_mmn}
 Provides: mod_php = %{version}-%{release}
 Requires: php-common = %{version}-%{release}
 # For backwards-compatibility, require php-cli for the time being:
@@ -87,10 +84,12 @@
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
-Provides: php-openssl, php-pcre, php-posix
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
-Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
-Provides: php-wddx, php-zlib, php-json, php-zip, php-dbase
+Provides: php-spl, php-tokenizer, php-openssl, php-pcre
+Provides: php-zlib, php-json, php-zip, php-dbase
+# To be split in php-process 
+Provides: php-posix, php-sysvsem, php-sysvshm, php-sysvmsg
+
 Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
 %description common
@@ -228,7 +227,7 @@
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
 Obsoletes: php-domxml, php-dom
-Provides: php-dom, php-xsl, php-domxml
+Provides: php-dom, php-xsl, php-domxml, php-wddx
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
 
 %description xml
@@ -240,7 +239,6 @@
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
-BuildRequires: expat-devel
 
 %description xmlrpc
 The php-xmlrpc package contains a dynamic shared object that will add
@@ -362,20 +360,19 @@
 %patch1 -p1 -b .gnusrc
 %patch2 -p1 -b .install
 %patch3 -p1 -b .norpath
-%patch5 -p1 -b .phpize64
-%patch8 -p1 -b .includedir
-%patch9 -p1 -b .embed
-
-%patch21 -p1 -b .odbc
-%patch22 -p1 -b .shutdown
-%patch24 -p1 -b .macropen
-
-%patch30 -p1 -b .dlopen
-%patch31 -p1 -b .easter
-%patch32 -p1 -b .systzdata
+%patch4 -p1 -b .phpize64
+%patch5 -p1 -b .includedir
+%patch6 -p1 -b .embed
+
+%patch20 -p1 -b .shutdown
+%patch21 -p1 -b .macropen
+
+%patch40 -p1 -b .dlopen
+%patch41 -p1 -b .easter
+%patch42 -p1 -b .systzdata
 
-%patch50 -p1 -b .tests-dashn
-%patch51 -p1 -b .tests-wddx
+%patch60 -p1 -b .tests-dashn
+%patch61 -p1 -b .tests-wddx
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -465,8 +462,6 @@
 	--with-iconv \
 	--with-jpeg-dir=%{_prefix} \
 	--with-openssl \
-	--with-png \
-	--with-expat-dir=%{_prefix} \
         --with-pcre-regex=%{_prefix} \
 	--with-zlib \
 	--with-layout=GNU \
@@ -475,22 +470,15 @@
 	--enable-magic-quotes \
 	--enable-sockets \
 	--enable-sysvsem --enable-sysvshm --enable-sysvmsg \
-	--enable-track-vars \
-	--enable-trans-sid \
-	--enable-yp \
 	--enable-wddx \
 	--with-kerberos \
 	--enable-ucd-snmp-hack \
-	--with-unixODBC=shared,%{_prefix} \
-	--enable-memory-limit \
 	--enable-shmop \
 	--enable-calendar \
-	--enable-dbx \
-	--enable-dio \
         --without-mime-magic \
         --without-sqlite \
         --with-libxml-dir=%{_prefix} \
-	--with-xml \
+	--enable-xml \
         --with-system-tzdata \
 	$* 
 if test $? != 0; then 
@@ -507,7 +495,7 @@
 build --enable-force-cgi-redirect \
       --enable-pcntl \
       --with-imap=shared --with-imap-ssl \
-      --enable-mbstring=shared --enable-mbstr-enc-trans \
+      --enable-mbstring=shared \
       --enable-mbregex \
       --with-ncurses=shared \
       --with-gd=shared \
@@ -518,7 +506,6 @@
       --with-mysql=shared,%{_prefix} \
       --with-mysqli=shared,%{_bindir}/mysql_config \
       --enable-dom=shared \
-      --with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
       --with-pgsql=shared \
       --with-snmp=shared,%{_prefix} \
       --enable-soap=shared \
@@ -539,11 +526,12 @@
       --with-mcrypt=shared,%{_prefix} \
       --with-mhash=shared,%{_prefix} \
       --with-tidy=shared,%{_prefix} \
-      --with-mssql=shared,%{_prefix}
+      --with-mssql=shared,%{_prefix} \
+      --with-unixODBC=shared,%{_prefix}
 popd
 
 without_shared="--without-mysql --without-gd \
-      --without-odbc --disable-dom \
+      --without-unixODBC --disable-dom \
       --disable-dba --without-unixODBC \
       --disable-pdo --disable-xmlreader --disable-xmlwriter \
       --disable-json --without-pspell"
@@ -731,6 +719,11 @@
 %files pspell -f files.pspell
 
 %changelog
+* Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 5.2.9-1
+- update to 5.2.9
+- merge with some rawhide improvments (fix patch fuzz, renumber
+  patches, drop obsolete configure args, drop -odbc patch)
+
 * Sat Jan 03 2009 Remi Collet <Fedora at FamilleCollet.com> 5.2.8-1
 - update to 5.2.8
 - add missing php_embed.h (#457777)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Jan 2009 08:00:35 -0000	1.37
+++ sources	16 Apr 2009 16:27:11 -0000	1.38
@@ -1 +1 @@
-8760a833cf10433d3e72271ab0d0eccf  php-5.2.8.tar.bz2
+280d6cda7f72a4fc6de42fda21ac2db7  php-5.2.9.tar.bz2


--- php-4.3.3-install.patch DELETED ---


--- php-5.0.2-phpize64.patch DELETED ---


--- php-5.2.6-gnusrc.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr 16 16:31:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 16:31:47 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.187,1.188
Message-ID: <20090416163147.60B2370127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28219

Modified Files:
	comps-f11.xml.in 
Log Message:
add aspell-en conditional (similar to hunspell case), see also rhbz#494084



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- comps-f11.xml.in	16 Apr 2009 01:57:27 -0000	1.187
+++ comps-f11.xml.in	16 Apr 2009 16:31:46 -0000	1.188
@@ -195,6 +195,7 @@
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">tmpwatch</packagereq>
       <packagereq type="mandatory">traceroute</packagereq>
+      <packagereq type="conditional" requires="aspell">aspell-en</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-en</packagereq>
       <packagereq type="default">acpid</packagereq>
       <packagereq type="default">anacron</packagereq>



From rdieter at fedoraproject.org  Thu Apr 16 16:38:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 16:38:59 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok-1.4.10-gcc44.patch, NONE, 1.1 amarok.spec,
	1.118, 1.119
Message-ID: <20090416163859.3794B70127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30015

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-gcc44.patch 
Log Message:
gcc44 patch


amarok-1.4.10-gcc44.patch:

--- NEW FILE amarok-1.4.10-gcc44.patch ---
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp	2009-03-31 22:12:29.000000000 -0600
@@ -31,6 +31,8 @@
 
 #include <netinet/in.h> // ntohl
 
+#include <stdio.h>
+
 using namespace TagLib;
 
 
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:08:16.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:11:57.000000000 -0600
@@ -30,6 +30,7 @@
 #include <netinet/in.h> // ntohl
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 using namespace TagLib;
 
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp	2009-03-31 22:13:06.000000000 -0600
@@ -29,6 +29,8 @@
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
 
+#include <stdio.h>
+
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-03-31 22:16:01.000000000 -0600
@@ -23,6 +23,7 @@
 #include "taglib_audiblefile.h"
 
 #include <string.h>
+#include <stdio.h>
 
 TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
         bool readProperties,
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp	2009-03-31 22:18:22.000000000 -0600
@@ -29,6 +29,8 @@
 #include <taglib/audioproperties.h>
 #include <taglib/tag.h>
 
+#include <stdio.h>
+
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp	2009-03-31 22:18:06.000000000 -0600
@@ -31,6 +31,8 @@
 
 #include <netinet/in.h> // ntohl
 
+#include <stdio.h>
+
 using namespace TagLib;
 
 struct WavHeader
diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2009-03-31 22:19:55.000000000 -0600
@@ -23,6 +23,7 @@
 #include "wavfile.h"
 
 #include <string.h>
+#include <stdio.h>
 
 TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
         bool readProperties,
diff -Naur amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp amarok-1.4.10/amarok/src/metabundlesaver.cpp
--- amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp	2008-08-13 15:21:51.000000000 -0600
+++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	2009-03-31 22:30:30.000000000 -0600
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- amarok.spec	14 Apr 2009 14:13:46 -0000	1.118
+++ amarok.spec	16 Apr 2009 16:38:28 -0000	1.119
@@ -49,6 +49,7 @@
 Patch2:     amarok-1.4.7-xdg.patch
 # Fix for newer libmtp >= 0.3
 Patch3:     amarok-1.4.10-libmtp03.patch 
+Patch4:     amarok-1.4.10-gcc44.patch
 
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
@@ -159,6 +160,8 @@
 %patch3 -p1 -b .libmtp03
 %endif
 
+%patch4 -p1 -b .gcc44
+
 %patch100 -p4 -b .aa_security
 %patch101 -p1 -b .wikipedia
 



From rdieter at fedoraproject.org  Thu Apr 16 16:40:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 16:40:01 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok.spec,1.119,1.120
Message-ID: <20090416164001.BB97670127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30288

Modified Files:
	amarok.spec 
Log Message:
include upstream bug reference



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- amarok.spec	16 Apr 2009 16:38:28 -0000	1.119
+++ amarok.spec	16 Apr 2009 16:39:31 -0000	1.120
@@ -49,6 +49,7 @@
 Patch2:     amarok-1.4.7-xdg.patch
 # Fix for newer libmtp >= 0.3
 Patch3:     amarok-1.4.10-libmtp03.patch 
+# http://bugs.kde.org/189675
 Patch4:     amarok-1.4.10-gcc44.patch
 
 ## upstream patches



From ensc at fedoraproject.org  Thu Apr 16 16:48:11 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Thu, 16 Apr 2009 16:48:11 +0000 (UTC)
Subject: rpms/clamav/F-11 clamav.spec,1.86,1.87
Message-ID: <20090416164811.70A2E70127@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31746

Modified Files:
	clamav.spec 
Log Message:
updated


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- clamav.spec	10 Apr 2009 20:17:31 -0000	1.86
+++ clamav.spec	16 Apr 2009 16:47:41 -0000	1.87
@@ -21,7 +21,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.1
-Release:	%release_func 1%{?snapshot:.%snapshot}
+Release:	%release_func 2%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -197,8 +197,8 @@
 Requires(postun):	%_initrddir initscripts
 Requires(post):		chkconfig
 Requires(preun):	chkconfig initscripts
-Provides:		milter-sysv = %version-%release
-Obsoletes:		milter-sysv < %version-%release
+Provides:		clamav-milter-sysv = %version-%release
+Obsoletes:		clamav-milter-sysv < %version-%release
 
 %package milter-upstart
 Summary:	Upstart initscripts for the clamav sendmail-milter
@@ -666,6 +666,10 @@
 
 
 %changelog
+* Wed Apr 15 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.1-2
+- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which
+  broke update path
+
 * Fri Apr 10 2009 Robert Scheck <robert at fedoraproject.org> - 0.95.1-1
 - Upgrade to 0.95.1 (#495039)
 



From jakub at fedoraproject.org  Thu Apr 16 16:50:39 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 16 Apr 2009 16:50:39 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.272, 1.273 glibc-fedora.patch, 1.305, 
	1.306 glibc.spec, 1.395, 1.396 import.log, 1.16, 1.17 sources,
	1.297, 1.298
Message-ID: <20090416165039.BF8FE70127@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32425/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-19



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- .cvsignore	16 Apr 2009 07:29:44 -0000	1.272
+++ .cvsignore	16 Apr 2009 16:50:08 -0000	1.273
@@ -1,2 +1,2 @@
-glibc-20090416T0610.tar.bz2
-glibc-fedora-20090416T0610.tar.bz2
+glibc-20090416T1610.tar.bz2
+glibc-fedora-20090416T1610.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- glibc-fedora.patch	16 Apr 2009 07:29:44 -0000	1.305
+++ glibc-fedora.patch	16 Apr 2009 16:50:08 -0000	1.306
@@ -1,6 +1,6 @@
---- glibc-20090416T0610/ChangeLog	15 Apr 2009 17:10:28 -0000	1.11595
-+++ glibc-20090416T0610-fedora/ChangeLog	16 Apr 2009 06:26:58 -0000	1.8782.2.330
-@@ -7264,6 +7264,13 @@
+--- glibc-20090416T1610/ChangeLog	16 Apr 2009 15:22:05 -0000	1.11597
++++ glibc-20090416T1610-fedora/ChangeLog	16 Apr 2009 16:36:54 -0000	1.8782.2.331
+@@ -7274,6 +7274,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7559,6 +7566,10 @@
+@@ -7569,6 +7576,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8816,6 +8827,15 @@
+@@ -8826,6 +8837,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090416T0610/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090416T0610-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090416T1610/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090416T1610-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090416T0610/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090416T0610-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090416T1610/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090416T1610-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090416T0610/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090416T0610-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090416T1610/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090416T1610-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090416T0610/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090416T0610-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090416T1610/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090416T1610-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090416T0610/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090416T0610-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090416T1610/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090416T1610-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090416T0610/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090416T0610-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090416T1610/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090416T1610-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090416T0610/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090416T0610-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090416T1610/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090416T1610-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090416T0610/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090416T0610-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090416T1610/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090416T1610-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090416T0610/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090416T1610/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090416T0610/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090416T1610/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090416T0610/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090416T0610-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090416T1610/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090416T1610-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090416T0610/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090416T0610-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090416T1610/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090416T1610-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090416T0610/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090416T0610-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090416T1610/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090416T1610-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090416T0610/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090416T0610-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090416T1610/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090416T1610-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090416T0610/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090416T0610-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090416T1610/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090416T1610-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090416T0610/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090416T0610-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090416T1610/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
++++ glibc-20090416T1610-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090416T0610/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090416T0610-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090416T1610/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090416T1610-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090416T0610/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090416T0610-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090416T1610/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090416T1610-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090416T0610/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090416T1610/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090416T0610/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090416T0610-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090416T1610/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090416T1610-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090416T0610/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090416T0610-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090416T1610/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090416T1610-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090416T0610/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090416T0610-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090416T1610/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090416T1610-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090416T0610/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090416T0610-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090416T1610/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090416T1610-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090416T0610/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090416T0610-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090416T1610/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090416T1610-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090416T0610/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090416T0610-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
+--- glibc-20090416T1610/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
++++ glibc-20090416T1610-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
 @@ -3449,6 +3449,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090416T0610/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090416T0610-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090416T1610/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090416T1610-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090416T0610/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090416T0610-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090416T1610/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090416T1610-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090416T0610/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090416T1610/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090416T0610/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090416T0610-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090416T1610/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090416T1610-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090416T0610/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090416T0610-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090416T1610/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090416T1610-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090416T0610/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090416T0610-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090416T1610/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090416T1610-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090416T0610/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090416T0610-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090416T1610/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090416T1610-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090416T0610/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090416T1610/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090416T0610/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090416T0610-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090416T1610/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090416T1610-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090416T0610/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090416T0610-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090416T1610/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090416T1610-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090416T0610/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090416T0610-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090416T1610/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090416T1610-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090416T0610/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090416T0610-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090416T1610/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090416T1610-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090416T0610/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090416T0610-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090416T1610/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090416T1610-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090416T0610/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090416T1610/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090416T0610/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090416T0610-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090416T1610/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090416T1610-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090416T0610/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090416T0610-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090416T1610/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090416T1610-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090416T0610/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090416T0610-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090416T1610/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- glibc.spec	16 Apr 2009 07:29:45 -0000	1.395
+++ glibc.spec	16 Apr 2009 16:50:09 -0000	1.396
@@ -1,6 +1,6 @@
-%define glibcdate 20090416T0610
+%define glibcdate 20090416T1610
 %define glibcname glibc
-%define glibcsrcdir glibc-20090416T0610
+%define glibcsrcdir glibc-20090416T1610
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 18
+Release: 19
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,10 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-19
+- update from trunk
+  - fix dlopen from statically linked binaries (#495830)
+
 * Thu Apr 16 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-18
 - update from trunk
   - fix fallocate


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- import.log	16 Apr 2009 07:29:45 -0000	1.16
+++ import.log	16 Apr 2009 16:50:09 -0000	1.17
@@ -14,3 +14,4 @@
 glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476
 glibc-2_9_90-17:F-11:glibc-2.9.90-17.src.rpm:1239814311
 glibc-2_9_90-18:F-11:glibc-2.9.90-18.src.rpm:1239866900
+glibc-2_9_90-19:F-11:glibc-2.9.90-19.src.rpm:1239900585


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- sources	16 Apr 2009 07:29:45 -0000	1.297
+++ sources	16 Apr 2009 16:50:09 -0000	1.298
@@ -1,2 +1,2 @@
-7f33a470d88dc80287ecda88c3869246  glibc-20090416T0610.tar.bz2
-63a536b89c7b922a1b5e0f470a73a28a  glibc-fedora-20090416T0610.tar.bz2
+9a465730adc5a5e9c4881c163fec2109  glibc-20090416T1610.tar.bz2
+836d5b14a858a50db41641c7a81cfdc4  glibc-fedora-20090416T1610.tar.bz2



From remi at fedoraproject.org  Thu Apr 16 16:59:33 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 16 Apr 2009 16:59:33 +0000 (UTC)
Subject: rpms/php/F-9 php-5.2.8-install.patch, NONE,
	1.1 php-5.2.8-phpize64.patch, NONE, 1.1 php-5.2.9-gnusrc.patch,
	NONE, 1.1 php.spec, 1.158, 1.159 sources, 1.37,
	1.38 php-4.3.3-install.patch, 1.1, NONE php-5.0.2-phpize64.patch,
	1.2, NONE php-5.2.6-gnusrc.patch, 1.1, NONE
Message-ID: <20090416165933.7392870127@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2170

Modified Files:
	php.spec sources 
Added Files:
	php-5.2.8-install.patch php-5.2.8-phpize64.patch 
	php-5.2.9-gnusrc.patch 
Removed Files:
	php-4.3.3-install.patch php-5.0.2-phpize64.patch 
	php-5.2.6-gnusrc.patch 
Log Message:
update to 5.2.9

php-5.2.8-install.patch:

--- NEW FILE php-5.2.8-install.patch ---
--- php-5.2.8/sapi/apache2handler/config.m4.install
+++ php-5.2.8/sapi/apache2handler/config.m4
@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-  if test -z `$APXS -q SYSCONFDIR`; then
+  if true; then
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -i -n php5"

php-5.2.8-phpize64.patch:

--- NEW FILE php-5.2.8-phpize64.patch ---
--- php-5.2.8/scripts/Makefile.frag.phpize64
+++ php-5.2.8/scripts/Makefile.frag
@@ -4,7 +4,7 @@
 #
 
 phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpbuilddir = $(libdir)/php/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
--- php-5.2.8/scripts/phpize.in.phpize64
+++ php-5.2.8/scripts/phpize.in
@@ -3,7 +3,7 @@
 # Variable declaration
 prefix='@prefix@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
+phpdir="@libdir@/php/build"
 includedir="`eval echo @includedir@`/php"
 builddir="`pwd`"
 SED="@SED@"

php-5.2.9-gnusrc.patch:

--- NEW FILE php-5.2.9-gnusrc.patch ---
diff -up php-5.2.9/configure.in.gnusrc php-5.2.9/configure.in
--- php-5.2.9/configure.in.gnusrc	2009-02-25 15:56:50.000000000 +0100
+++ php-5.2.9/configure.in	2009-02-27 19:33:40.000000000 +0100
@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
 AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
 AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
 dnl Setting up the PHP version based on the information above.
 dnl -------------------------------------------------------------------------
 
diff -up php-5.2.9/ext/interbase/interbase.c.gnusrc php-5.2.9/ext/interbase/interbase.c
--- php-5.2.9/ext/interbase/interbase.c.gnusrc	2008-12-31 12:17:38.000000000 +0100
+++ php-5.2.9/ext/interbase/interbase.c	2009-02-27 19:33:40.000000000 +0100
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
diff -up php-5.2.9/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.2.9/ext/pdo_firebird/firebird_driver.c
--- php-5.2.9/ext/pdo_firebird/firebird_driver.c.gnusrc	2008-12-31 12:17:41.000000000 +0100
+++ php-5.2.9/ext/pdo_firebird/firebird_driver.c	2009-02-27 19:33:40.000000000 +0100
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
diff -up php-5.2.9/ext/standard/file.c.gnusrc php-5.2.9/ext/standard/file.c
--- php-5.2.9/ext/standard/file.c.gnusrc	2008-12-31 12:17:44.000000000 +0100
+++ php-5.2.9/ext/standard/file.c	2009-02-27 19:33:40.000000000 +0100
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
diff -up php-5.2.9/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.2.9/ext/zlib/zlib_fopen_wrapper.c
--- php-5.2.9/ext/zlib/zlib_fopen_wrapper.c.gnusrc	2009-01-20 16:43:05.000000000 +0100
+++ php-5.2.9/ext/zlib/zlib_fopen_wrapper.c	2009-02-27 19:35:38.000000000 +0100
@@ -19,8 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.7 2009/01/20 15:43:05 felipe Exp $ */
 
-#define _GNU_SOURCE
-
 #include "php.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
diff -up php-5.2.9/main/php.h.gnusrc php-5.2.9/main/php.h
--- php-5.2.9/main/php.h.gnusrc	2008-12-31 12:17:47.000000000 +0100
+++ php-5.2.9/main/php.h	2009-02-27 19:33:40.000000000 +0100
@@ -30,6 +30,7 @@
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 
+#include "php_config.h"
 #include "php_version.h"
 #include "zend.h"
 #include "zend_qsort.h"
diff -up php-5.2.9/main/streams/cast.c.gnusrc php-5.2.9/main/streams/cast.c
--- php-5.2.9/main/streams/cast.c.gnusrc	2008-12-31 12:17:48.000000000 +0100
+++ php-5.2.9/main/streams/cast.c	2009-02-27 19:36:07.000000000 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.3 2008/12/31 11:17:48 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.2.9/main/streams/memory.c.gnusrc php-5.2.9/main/streams/memory.c
--- php-5.2.9/main/streams/memory.c.gnusrc	2008-12-31 12:17:48.000000000 +0100
+++ php-5.2.9/main/streams/memory.c	2009-02-27 19:36:40.000000000 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.20 2008/12/31 11:17:48 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
diff -up php-5.2.9/main/streams/streams.c.gnusrc php-5.2.9/main/streams/streams.c
--- php-5.2.9/main/streams/streams.c.gnusrc	2009-01-08 20:21:25.000000000 +0100
+++ php-5.2.9/main/streams/streams.c	2009-02-27 19:37:04.000000000 +0100
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.33 2009/01/08 19:21:25 felipe Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.2.9/Zend/zend_language_parser.c.gnusrc php-5.2.9/Zend/zend_language_parser.c
--- php-5.2.9/Zend/zend_language_parser.c.gnusrc	2009-02-25 16:39:52.000000000 +0100
+++ php-5.2.9/Zend/zend_language_parser.c	2009-02-27 19:33:40.000000000 +0100
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/php.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- php.spec	3 Jan 2009 11:05:57 -0000	1.158
+++ php.spec	16 Apr 2009 16:59:02 -0000	1.159
@@ -2,12 +2,11 @@
 %define apiver 20041225
 %define zendver 20060613
 %define pdover 20060511
-
-%define _default_patch_fuzz 2
+%define httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.8
+Version: 5.2.9
 Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
@@ -18,38 +17,36 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.2.6-gnusrc.patch
-Patch2: php-4.3.3-install.patch
+# Build fixes
+Patch1: php-5.2.9-gnusrc.patch
+Patch2: php-5.2.8-install.patch
 Patch3: php-5.2.4-norpath.patch
-Patch5: php-5.0.2-phpize64.patch
-Patch8: php-5.2.0-includedir.patch
-Patch9: php-5.2.4-embed.patch
+Patch4: php-5.2.8-phpize64.patch
+Patch5: php-5.2.0-includedir.patch
+Patch6: php-5.2.4-embed.patch
 
 # Fixes for extension modules
-Patch21: php-5.2.4-odbc.patch
-Patch22: php-4.3.11-shutdown.patch
-Patch24: php-5.2.3-macropen.patch
+Patch20: php-4.3.11-shutdown.patch
+Patch21: php-5.2.3-macropen.patch
 
 # Functional changes
-Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.2.4-easter.patch
-Patch32: php-5.2.6-systzdata.patch
+Patch40: php-5.0.4-dlopen.patch
+Patch41: php-5.2.4-easter.patch
+Patch42: php-5.2.6-systzdata.patch
 
 # Fixes for tests
-Patch50: php-5.2.7-tests-dashn.patch
-Patch51: php-5.0.4-tests-wddx.patch
+Patch60: php-5.2.7-tests-dashn.patch
+Patch61: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
-BuildRequires: gmp-devel
+BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
 BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, readline-devel
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 Obsoletes: php-dbg, php3, phpfi, stronghold-php
-# Enforce Apache module ABI compatibility
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+Requires: httpd-mmn = %{httpd_mmn}
 Provides: mod_php = %{version}-%{release}
 Requires: php-common = %{version}-%{release}
 # For backwards-compatibility, require php-cli for the time being:
@@ -87,10 +84,12 @@
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
-Provides: php-openssl, php-pcre, php-posix
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
-Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
-Provides: php-wddx, php-zlib, php-json, php-zip, php-dbase
+Provides: php-spl, php-tokenizer, php-openssl, php-pcre
+Provides: php-zlib, php-json, php-zip, php-dbase
+# To be split in php-process 
+Provides: php-posix, php-sysvsem, php-sysvshm, php-sysvmsg
+
 Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
 %description common
@@ -228,7 +227,7 @@
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
 Obsoletes: php-domxml, php-dom
-Provides: php-dom, php-xsl, php-domxml
+Provides: php-dom, php-xsl, php-domxml, php-wddx
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
 
 %description xml
@@ -240,7 +239,6 @@
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
-BuildRequires: expat-devel
 
 %description xmlrpc
 The php-xmlrpc package contains a dynamic shared object that will add
@@ -362,20 +360,19 @@
 %patch1 -p1 -b .gnusrc
 %patch2 -p1 -b .install
 %patch3 -p1 -b .norpath
-%patch5 -p1 -b .phpize64
-%patch8 -p1 -b .includedir
-%patch9 -p1 -b .embed
-
-%patch21 -p1 -b .odbc
-%patch22 -p1 -b .shutdown
-%patch24 -p1 -b .macropen
-
-%patch30 -p1 -b .dlopen
-%patch31 -p1 -b .easter
-%patch32 -p1 -b .systzdata
+%patch4 -p1 -b .phpize64
+%patch5 -p1 -b .includedir
+%patch6 -p1 -b .embed
+
+%patch20 -p1 -b .shutdown
+%patch21 -p1 -b .macropen
+
+%patch40 -p1 -b .dlopen
+%patch41 -p1 -b .easter
+%patch42 -p1 -b .systzdata
 
-%patch50 -p1 -b .tests-dashn
-%patch51 -p1 -b .tests-wddx
+%patch60 -p1 -b .tests-dashn
+%patch61 -p1 -b .tests-wddx
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -465,8 +462,6 @@
 	--with-iconv \
 	--with-jpeg-dir=%{_prefix} \
 	--with-openssl \
-	--with-png \
-	--with-expat-dir=%{_prefix} \
         --with-pcre-regex=%{_prefix} \
 	--with-zlib \
 	--with-layout=GNU \
@@ -475,22 +470,15 @@
 	--enable-magic-quotes \
 	--enable-sockets \
 	--enable-sysvsem --enable-sysvshm --enable-sysvmsg \
-	--enable-track-vars \
-	--enable-trans-sid \
-	--enable-yp \
 	--enable-wddx \
 	--with-kerberos \
 	--enable-ucd-snmp-hack \
-	--with-unixODBC=shared,%{_prefix} \
-	--enable-memory-limit \
 	--enable-shmop \
 	--enable-calendar \
-	--enable-dbx \
-	--enable-dio \
         --without-mime-magic \
         --without-sqlite \
         --with-libxml-dir=%{_prefix} \
-	--with-xml \
+	--enable-xml \
         --with-system-tzdata \
 	$* 
 if test $? != 0; then 
@@ -507,7 +495,7 @@
 build --enable-force-cgi-redirect \
       --enable-pcntl \
       --with-imap=shared --with-imap-ssl \
-      --enable-mbstring=shared --enable-mbstr-enc-trans \
+      --enable-mbstring=shared \
       --enable-mbregex \
       --with-ncurses=shared \
       --with-gd=shared \
@@ -518,7 +506,6 @@
       --with-mysql=shared,%{_prefix} \
       --with-mysqli=shared,%{_bindir}/mysql_config \
       --enable-dom=shared \
-      --with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
       --with-pgsql=shared \
       --with-snmp=shared,%{_prefix} \
       --enable-soap=shared \
@@ -539,11 +526,12 @@
       --with-mcrypt=shared,%{_prefix} \
       --with-mhash=shared,%{_prefix} \
       --with-tidy=shared,%{_prefix} \
-      --with-mssql=shared,%{_prefix}
+      --with-mssql=shared,%{_prefix} \
+      --with-unixODBC=shared,%{_prefix}
 popd
 
 without_shared="--without-mysql --without-gd \
-      --without-odbc --disable-dom \
+      --without-unixODBC --disable-dom \
       --disable-dba --without-unixODBC \
       --disable-pdo --disable-xmlreader --disable-xmlwriter \
       --disable-json --without-pspell"
@@ -731,6 +719,11 @@
 %files pspell -f files.pspell
 
 %changelog
+* Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 5.2.9-1
+- update to 5.2.9
+- merge with some rawhide improvments (fix patch fuzz, renumber
+  patches, drop obsolete configure args, drop -odbc patch)
+
 * Sat Jan 03 2009 Remi Collet <Fedora at FamilleCollet.com> 5.2.8-1
 - update to 5.2.8
 - add missing php_embed.h (#457777)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Jan 2009 11:05:57 -0000	1.37
+++ sources	16 Apr 2009 16:59:02 -0000	1.38
@@ -1 +1 @@
-8760a833cf10433d3e72271ab0d0eccf  php-5.2.8.tar.bz2
+280d6cda7f72a4fc6de42fda21ac2db7  php-5.2.9.tar.bz2


--- php-4.3.3-install.patch DELETED ---


--- php-5.0.2-phpize64.patch DELETED ---


--- php-5.2.6-gnusrc.patch DELETED ---



From davidz at fedoraproject.org  Thu Apr 16 17:10:25 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu, 16 Apr 2009 17:10:25 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel
	0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch,
	NONE, 1.1 DeviceKit-disks.spec, 1.22, 1.23
Message-ID: <20090416171026.08B1F70127@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5060

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch 
Log Message:
* Thu Apr 16 2009 David Zeuthen <davidz at redhat.com> - 004-0.10.20090415git%{?dist}
- Properly detect vfat on whole disk devices (#495876)



0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch:

--- NEW FILE 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch ---
>From 48372f7b55a60cf5bc3e91bf97e02229e95cc47b Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 16 Apr 2009 13:04:33 -0400
Subject: [PATCH] properly detect devices with vfat on the whole disk

See https://bugzilla.redhat.com/show_bug.cgi?id=495876
---
 src/95-devkit-disks.rules |    3 ---
 src/devkit-disks-device.c |   16 ++++++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/95-devkit-disks.rules b/src/95-devkit-disks.rules
index b29e5d0..fb8b745 100644
--- a/src/95-devkit-disks.rules
+++ b/src/95-devkit-disks.rules
@@ -19,9 +19,6 @@ KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}!="?*", GOTO="probe_parttable_end"
 #
 IMPORT{program}="devkit-disks-part-id $tempnode"
 
-# clear all ID_FS_USAGE, TYPE if we're a partition table
-ENV{DKD_PART_ID_PARTITION_TABLE_SCHEME}!="", ENV{ID_FS_USAGE}="", ENV{ID_FS_TYPE}=""
-
 LABEL="probe_parttable_end"
 
 ##############################################################################################################
diff --git a/src/devkit-disks-device.c b/src/devkit-disks-device.c
index 633d716..968ad0d 100644
--- a/src/devkit-disks-device.c
+++ b/src/devkit-disks-device.c
@@ -1691,8 +1691,20 @@ update_info_partition_table (DevkitDisksDevice *device)
         if (!device->priv->device_is_partition &&
             devkit_device_has_property (device->priv->d, "DKD_PARTITION_TABLE")) {
 
-                devkit_disks_device_set_device_is_partition_table (device, TRUE);
-                devkit_disks_device_set_partition_table_scheme (device, devkit_device_get_property (device->priv->d, "DKD_PARTITION_TABLE_SCHEME"));
+                /* Some times we think that vfat on the main block device looks like a Master Boot Record
+                 * partition table (the on-disk formats are extremely similar). So if we already have
+                 * detected a file system on the main block device and don't have any partitions, then
+                 * avoid tagging the device as a partition table.
+                 *
+                 * See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=495876.
+                 */
+                if (device->priv->partition_table_count == 0 &&
+                    g_strcmp0 (device->priv->id_usage, "filesystem") == 0) {
+                        devkit_disks_device_set_device_is_partition_table (device, FALSE);
+                } else {
+                        devkit_disks_device_set_device_is_partition_table (device, TRUE);
+                        devkit_disks_device_set_partition_table_scheme (device, devkit_device_get_property (device->priv->d, "DKD_PARTITION_TABLE_SCHEME"));
+                }
         } else {
                 devkit_disks_device_set_partition_table_scheme (device, NULL);
         }
-- 
1.6.2.2



Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DeviceKit-disks.spec	15 Apr 2009 19:03:42 -0000	1.22
+++ DeviceKit-disks.spec	16 Apr 2009 17:09:55 -0000	1.23
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.9.20090415git%{?dist}
+Release: 0.10.20090415git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -59,6 +59,8 @@
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
+Patch0: 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch
+
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -75,6 +77,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .vfat-whole-disk
 
 %build
 %configure
@@ -132,6 +135,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Apr 16 2009 David Zeuthen <davidz at redhat.com> - 004-0.10.20090415git%{?dist}
+- Properly detect vfat on whole disk devices (#495876)
+
 * Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.9.20090415git%{?dist}
 - Rebuild
 



From davidz at fedoraproject.org  Thu Apr 16 17:11:22 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu, 16 Apr 2009 17:11:22 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-11
	0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch,
	NONE, 1.1 DeviceKit-disks.spec, 1.22, 1.23
Message-ID: <20090416171122.3C6A570127@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5385

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch 
Log Message:
* Thu Apr 16 2009 David Zeuthen <davidz at redhat.com> - 004-0.10.20090415git%{?dist}
- Properly detect vfat on whole disk devices (#495876)



0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch:

--- NEW FILE 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch ---
>From 48372f7b55a60cf5bc3e91bf97e02229e95cc47b Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 16 Apr 2009 13:04:33 -0400
Subject: [PATCH] properly detect devices with vfat on the whole disk

See https://bugzilla.redhat.com/show_bug.cgi?id=495876
---
 src/95-devkit-disks.rules |    3 ---
 src/devkit-disks-device.c |   16 ++++++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/95-devkit-disks.rules b/src/95-devkit-disks.rules
index b29e5d0..fb8b745 100644
--- a/src/95-devkit-disks.rules
+++ b/src/95-devkit-disks.rules
@@ -19,9 +19,6 @@ KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}!="?*", GOTO="probe_parttable_end"
 #
 IMPORT{program}="devkit-disks-part-id $tempnode"
 
-# clear all ID_FS_USAGE, TYPE if we're a partition table
-ENV{DKD_PART_ID_PARTITION_TABLE_SCHEME}!="", ENV{ID_FS_USAGE}="", ENV{ID_FS_TYPE}=""
-
 LABEL="probe_parttable_end"
 
 ##############################################################################################################
diff --git a/src/devkit-disks-device.c b/src/devkit-disks-device.c
index 633d716..968ad0d 100644
--- a/src/devkit-disks-device.c
+++ b/src/devkit-disks-device.c
@@ -1691,8 +1691,20 @@ update_info_partition_table (DevkitDisksDevice *device)
         if (!device->priv->device_is_partition &&
             devkit_device_has_property (device->priv->d, "DKD_PARTITION_TABLE")) {
 
-                devkit_disks_device_set_device_is_partition_table (device, TRUE);
-                devkit_disks_device_set_partition_table_scheme (device, devkit_device_get_property (device->priv->d, "DKD_PARTITION_TABLE_SCHEME"));
+                /* Some times we think that vfat on the main block device looks like a Master Boot Record
+                 * partition table (the on-disk formats are extremely similar). So if we already have
+                 * detected a file system on the main block device and don't have any partitions, then
+                 * avoid tagging the device as a partition table.
+                 *
+                 * See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=495876.
+                 */
+                if (device->priv->partition_table_count == 0 &&
+                    g_strcmp0 (device->priv->id_usage, "filesystem") == 0) {
+                        devkit_disks_device_set_device_is_partition_table (device, FALSE);
+                } else {
+                        devkit_disks_device_set_device_is_partition_table (device, TRUE);
+                        devkit_disks_device_set_partition_table_scheme (device, devkit_device_get_property (device->priv->d, "DKD_PARTITION_TABLE_SCHEME"));
+                }
         } else {
                 devkit_disks_device_set_partition_table_scheme (device, NULL);
         }
-- 
1.6.2.2



Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DeviceKit-disks.spec	15 Apr 2009 19:04:21 -0000	1.22
+++ DeviceKit-disks.spec	16 Apr 2009 17:10:51 -0000	1.23
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 0.9.20090415git%{?dist}
+Release: 0.10.20090415git%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -59,6 +59,8 @@
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
+Patch0: 0001-properly-detect-devices-with-vfat-on-the-whole-disk.patch
+
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -75,6 +77,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .vfat-whole-disk
 
 %build
 %configure
@@ -132,6 +135,9 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Apr 16 2009 David Zeuthen <davidz at redhat.com> - 004-0.10.20090415git%{?dist}
+- Properly detect vfat on whole disk devices (#495876)
+
 * Wed Apr 15 2009 David Zeuthen <davidz at redhat.com> - 004-0.9.20090415git%{?dist}
 - Rebuild
 



From orion at fedoraproject.org  Thu Apr 16 17:21:28 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 16 Apr 2009 17:21:28 +0000 (UTC)
Subject: rpms/netcdf/devel .cvsignore, 1.8, 1.9 netcdf.spec, 1.34,
	1.35 sources, 1.8, 1.9
Message-ID: <20090416172128.EC84370127@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7537

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
- Update to 4.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Sep 2008 20:57:47 -0000	1.8
+++ .cvsignore	16 Apr 2009 17:20:58 -0000	1.9
@@ -1 +1 @@
-netcdf-4.0.tar.gz
+netcdf-4.0.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- netcdf.spec	26 Feb 2009 05:06:01 -0000	1.34
+++ netcdf.spec	16 Apr 2009 17:20:58 -0000	1.35
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        4.0.0
-Release:        2%{?dist}
+Version:        4.0.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.0.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%{version}.tar.gz
 Patch0:         netcdf-4.0.0-gcc4.3-cstring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@
 This package contains the netCDF static libs.
 
 %prep
-%setup -q -n netcdf-4.0
+%setup -q
 %patch0 -p1
 
 %build
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
+- Update to 4.0.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Sep 2008 20:57:47 -0000	1.8
+++ sources	16 Apr 2009 17:20:58 -0000	1.9
@@ -1 +1 @@
-afc057b07b6e6843556dcfbc4ced402c  netcdf-4.0.tar.gz
+a251453c5477599f050fa4e593295186  netcdf-4.0.1.tar.gz



From erikos at fedoraproject.org  Thu Apr 16 17:21:32 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu, 16 Apr 2009 17:21:32 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.38, 1.39 sources, 1.40,
	1.41 sugar.spec, 1.62, 1.63
Message-ID: <20090416172132.8EAE670127@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7511

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Apr 16 2009 Simon Schampijer <simon at schampijer.de> - 0.84.6-1
- Only update the connections file when the AP changes state #756
- Initialize the ResultSet after the widget changes size #733




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	8 Apr 2009 11:04:54 -0000	1.38
+++ .cvsignore	16 Apr 2009 17:21:01 -0000	1.39
@@ -1 +1 @@
-sugar-0.84.5.tar.bz2
+sugar-0.84.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	8 Apr 2009 11:04:55 -0000	1.40
+++ sources	16 Apr 2009 17:21:02 -0000	1.41
@@ -1 +1 @@
-7d31643aa83d257d98931af92a0ba1d8  sugar-0.84.5.tar.bz2
+1747f7f35519b273e6c27bbcd8513d4b  sugar-0.84.6.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sugar.spec	8 Apr 2009 11:04:55 -0000	1.62
+++ sugar.spec	16 Apr 2009 17:21:02 -0000	1.63
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.5
+Version: 0.84.6
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -140,6 +140,10 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Apr 16 2009 Simon Schampijer <simon at schampijer.de> - 0.84.6-1
+- Only update the connections file when the AP changes state #756
+- Initialize the ResultSet after the widget changes size #733
+
 * Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.84.5-1
 - Remove fixed width from speaker palette #719
 - Correctly close the input stream in file transfers #682



From orion at fedoraproject.org  Thu Apr 16 17:38:03 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 16 Apr 2009 17:38:03 +0000 (UTC)
Subject: rpms/netcdf/devel netcdf.spec,1.35,1.36
Message-ID: <20090416173803.6A42E70127@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12007

Modified Files:
	netcdf.spec 
Log Message:
Add pkgconfig file



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- netcdf.spec	16 Apr 2009 17:20:58 -0000	1.35
+++ netcdf.spec	16 Apr 2009 17:37:33 -0000	1.36
@@ -17,6 +17,7 @@
 Summary:        Development files for netcdf
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %package static
 Summary:        Static libs for netcdf
@@ -120,6 +121,7 @@
 %{_includedir}/netcdf
 %{_fmoddir}/*.mod
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/netcdf.pc
 %{_mandir}/man3/*
 
 %files static
@@ -130,6 +132,7 @@
 %changelog
 * Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
 - Update to 4.0.1
+- Add pkgconfig file
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From limb at fedoraproject.org  Thu Apr 16 17:39:47 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 16 Apr 2009 17:39:47 +0000 (UTC)
Subject: rpms/gallery2/devel .cvsignore, 1.8, 1.9 gallery2.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <20090416173947.280F970127@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12590

Modified Files:
	.cvsignore gallery2.spec sources 
Log Message:
Jarless, until G3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Apr 2009 16:45:00 -0000	1.8
+++ .cvsignore	16 Apr 2009 17:39:16 -0000	1.9
@@ -1,2 +1 @@
 gallery-2.3-jarless.tar.gz
-gallery-jar-sources-2.3.tar.gz


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gallery2.spec	13 Apr 2009 20:13:58 -0000	1.23
+++ gallery2.spec	16 Apr 2009 17:39:16 -0000	1.24
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -19,9 +19,6 @@
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
-#The following are the sources of the bundled jars.
-#Generated by extracting the jars using jar -xf.
-Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
@@ -29,6 +26,10 @@
 #BuildRequires: perl-String-CRC32, subversion
 BuildRequires: java-1.6.0-openjdk-devel
 Obsoletes: gallery2-panorama <= 2.3-4
+Obsoletes: gallery2-remote <= 2.3-7
+Obsoletes: gallery2-uploadapplet <= 2.3-7
+Obsoletes: gallery2-slideshowapplet <= 2.3-7
+
 #Patch0: gallery2-perl-location.patch
 
 %package albumselect
@@ -274,10 +275,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package remote
-Summary: Remote module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package remote
+#Summary: Remote module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package replica
 Summary: Replica module for Gallery 2
@@ -324,10 +325,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package slideshowapplet
-Summary: Slideshowapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package slideshowapplet
+#Summary: Slideshowapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package squarethumb
 Summary: Squarethumb module for Gallery 2
@@ -349,10 +350,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package uploadapplet
-Summary: Uploadapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package uploadapplet
+#Summary: Uploadapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package useralbum
 Summary: Useralbum module for Gallery 2
@@ -585,8 +586,8 @@
 %description register
 Gallery 2 module - New User Registration
 
-%description remote
-Gallery 2 module - Implementation for the remote control protocol
+#%description remote
+#Gallery 2 module - Implementation for the remote control protocol
 
 %description replica
 Gallery 2 module - Replication support
@@ -615,8 +616,8 @@
 %description slideshow
 Gallery 2 module - Slideshow 
 
-%description slideshowapplet
-Gallery 2 module - Fullscreen slideshow using a Java applet
+#%description slideshowapplet
+#Gallery 2 module - Fullscreen slideshow using a Java applet
 
 %description snapgalaxy
 Gallery 2 module - Print photos using SnapGalaxy
@@ -631,8 +632,8 @@
 Gallery 2 module - Select page/frame from a multipage file or movie 
 for the thumbnail
 
-%description uploadapplet
-Gallery 2 module - Easy to use upload applet for media
+#%description uploadapplet
+#Gallery 2 module - Easy to use upload applet for media
 
 %description useralbum
 Gallery 2 module - Create an album for each new user
@@ -685,10 +686,6 @@
 #pushd lib/tools/bin
 #perl makeManifest.pl
 #popd
-tar -xf %{SOURCE4}
-cd gallery-jar-sources-2.3
-sh build-jars.sh
-cd ..
 rm -rf `cat MANIFEST | grep -e "^R" | cut -f 2`
 find . -depth -name .svn -type d -exec rm -rf {} \;
 # Remove the execute bit from files that don't start with #!
@@ -699,13 +696,12 @@
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
-#Panorama needs an unredistributable jar, so we'll remove the files.
+#These modules need unredistributable jars, so we'll remove the files.
 rm -rf modules/panorama
-#install built jars
-install -m 0644 gallery-jar-sources-2.3/jars/remote/* modules/remote/applets
-install -m 0644 gallery-jar-sources-2.3/jars/slideshowapplet/* modules/slideshowapplet/applets
-install -m 0644 gallery-jar-sources-2.3/jars/uploadapplet/* modules/uploadapplet/applets
-rm -rf gallery-jar-sources-2.3
+rm -rf modules/remote
+rm -rf modules/uploadapplet
+rm -rf modules/slideshowapplet
+
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -979,9 +975,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/register/
 
-%files remote
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/remote/
+#%files remote
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/remote/
 
 %files replica
 %defattr(-,root,root,-)
@@ -1019,9 +1015,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshow/
 
-%files slideshowapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/slideshowapplet/
+#%files slideshowapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/slideshowapplet/
 
 %files snapgalaxy
 %defattr(-,root,root,-)
@@ -1039,9 +1035,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/thumbpage/
 
-%files uploadapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/uploadapplet/
+#%files uploadapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/uploadapplet/
 
 %files useralbum
 %defattr(-,root,root,-)
@@ -1100,6 +1096,12 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
+- Drop all jars and remote, uploadapplet and slideshowapplet modules
+- to satisfy legal requirements, as source build would be
+- highly laborious and functionality is not critical.
+- See BZ464566 for details.
+
 * Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-6
 - Document jar source origins, build jars in build, not prep.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Apr 2009 16:45:00 -0000	1.10
+++ sources	16 Apr 2009 17:39:16 -0000	1.11
@@ -1,2 +1 @@
 f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
-01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz



From mtasaka at fedoraproject.org  Thu Apr 16 17:42:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 16 Apr 2009 17:42:20 +0000 (UTC)
Subject: rpms/alexandria/F-10
	alexandria-0.6.4.1-hang-importing-invalid-isdn.patch, NONE,
	1.1 alexandria.spec, 1.25, 1.26
Message-ID: <20090416174220.9BC4370127@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13325/F-10

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.4.1-hang-importing-invalid-isdn.patch 
Log Message:
sync with devel

alexandria-0.6.4.1-hang-importing-invalid-isdn.patch:

--- NEW FILE alexandria-0.6.4.1-hang-importing-invalid-isdn.patch ---
Index: lib/alexandria/import_library.rb
===================================================================
--- lib/alexandria/import_library.rb	(revision 1073)
+++ lib/alexandria/import_library.rb	(working copy)
@@ -300,7 +300,11 @@
           unless isbn[1]
             bad_isbns << isbn[0]
           else
-            books << Alexandria::BookProviders.isbn_search(isbn[1])
+            begin
+              books << Alexandria::BookProviders.isbn_search(isbn[1])
+            rescue => e
+              puts e.message
+            end
           end
         rescue => e
           puts e.message


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- alexandria.spec	8 Apr 2009 09:23:33 -0000	1.25
+++ alexandria.spec	16 Apr 2009 17:41:50 -0000	1.26
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,6 +26,9 @@
 # Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# Trial fix for hang up when importing list containing invalid isdn
+# ref: alexandria-Bugs-25348
+Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -77,6 +80,7 @@
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
+%patch2 -p0 -b .up25348
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -203,6 +207,10 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
+- Trial fix to fix hang when importing list containing invalid
+  isdn (alexandria-Bugs-25348)
+
 * Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
 - Embed Fedora EVR
 
@@ -215,12 +223,12 @@
   (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
-- 0.6.4.1 (fixing upstream bug 24568)
+- 0.6.4.1 (fixing alexandria-Bugs-24568)
 
 * Sun Mar 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4-1
 - 0.6.4
 - Patch from upstream to fix issue when book entry is once sorted
-  (upstream bug 24568)
+  (alexandria-Bugs-24568)
 
 * Fri Mar  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4-0.2.b1
 - Add ruby(htmlentities) dependency
@@ -237,6 +245,7 @@
 
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-9
 - Attempt to handle UTF-8 strings in library names correctly
+  (alexandria-Bugs-20168)
 
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
@@ -254,6 +263,7 @@
 * Wed Jul 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-5
 - Remove workaround for bug 436697 (tooltips crash).
   This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1
+  (ref: alexandria-Bugs-19042)
 
 * Thu Apr  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-4
 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3,



From mtasaka at fedoraproject.org  Thu Apr 16 17:42:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 16 Apr 2009 17:42:20 +0000 (UTC)
Subject: rpms/alexandria/F-9
	alexandria-0.6.4.1-hang-importing-invalid-isdn.patch, NONE,
	1.1 alexandria.spec, 1.25, 1.26
Message-ID: <20090416174220.EC32E70127@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13325/F-9

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.4.1-hang-importing-invalid-isdn.patch 
Log Message:
sync with devel

alexandria-0.6.4.1-hang-importing-invalid-isdn.patch:

--- NEW FILE alexandria-0.6.4.1-hang-importing-invalid-isdn.patch ---
Index: lib/alexandria/import_library.rb
===================================================================
--- lib/alexandria/import_library.rb	(revision 1073)
+++ lib/alexandria/import_library.rb	(working copy)
@@ -300,7 +300,11 @@
           unless isbn[1]
             bad_isbns << isbn[0]
           else
-            books << Alexandria::BookProviders.isbn_search(isbn[1])
+            begin
+              books << Alexandria::BookProviders.isbn_search(isbn[1])
+            rescue => e
+              puts e.message
+            end
           end
         rescue => e
           puts e.message


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- alexandria.spec	8 Apr 2009 09:23:33 -0000	1.25
+++ alexandria.spec	16 Apr 2009 17:41:50 -0000	1.26
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,6 +26,9 @@
 # Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# Trial fix for hang up when importing list containing invalid isdn
+# ref: alexandria-Bugs-25348
+Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -77,6 +80,7 @@
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
+%patch2 -p0 -b .up25348
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -203,6 +207,10 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
+- Trial fix to fix hang when importing list containing invalid
+  isdn (alexandria-Bugs-25348)
+
 * Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
 - Embed Fedora EVR
 
@@ -215,12 +223,12 @@
   (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
-- 0.6.4.1 (fixing upstream bug 24568)
+- 0.6.4.1 (fixing alexandria-Bugs-24568)
 
 * Sun Mar 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4-1
 - 0.6.4
 - Patch from upstream to fix issue when book entry is once sorted
-  (upstream bug 24568)
+  (alexandria-Bugs-24568)
 
 * Fri Mar  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4-0.2.b1
 - Add ruby(htmlentities) dependency
@@ -237,6 +245,7 @@
 
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-9
 - Attempt to handle UTF-8 strings in library names correctly
+  (alexandria-Bugs-20168)
 
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
@@ -254,6 +263,7 @@
 * Wed Jul 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-5
 - Remove workaround for bug 436697 (tooltips crash).
   This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1
+  (ref: alexandria-Bugs-19042)
 
 * Thu Apr  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-4
 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3,



From notting at fedoraproject.org  Thu Apr 16 17:47:19 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 16 Apr 2009 17:47:19 +0000 (UTC)
Subject: rpms/mash/F-11 .cvsignore, 1.41, 1.42 mash.spec, 1.47, 1.48 sources,
	1.43, 1.44
Message-ID: <20090416174719.F385A70127@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14473

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	15 Apr 2009 16:13:36 -0000	1.41
+++ .cvsignore	16 Apr 2009 17:46:49 -0000	1.42
@@ -1 +1 @@
-mash-0.5.0.tar.gz
+mash-0.5.1.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/mash.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mash.spec	15 Apr 2009 16:13:36 -0000	1.47
+++ mash.spec	16 Apr 2009 17:46:49 -0000	1.48
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.0
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,10 @@
 /var/cache/mash
 
 %changelog
+* Thu Apr 16 2009 Bill Nottingham <notting at redhat.com> 0.5.1-1
+- delta fixes
+- handle qt/kde plugins better (#495947)
+
 * Wed Apr 15 2009 Bill Nottingham <notting at redhat.com> 0.5.0-1
 - Add support for generating deltas with createrepo
 - add F11 key to config (<jkeating at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	15 Apr 2009 16:13:36 -0000	1.43
+++ sources	16 Apr 2009 17:46:49 -0000	1.44
@@ -1 +1 @@
-7929f47e4386306c8420b3644333a23c  mash-0.5.0.tar.gz
+61700aa67ea88f7b0716a10c5fadc41c  mash-0.5.1.tar.gz



From clumens at fedoraproject.org  Thu Apr 16 17:54:27 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 16 Apr 2009 17:54:27 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.635, 1.636 anaconda.spec, 1.783, 
	1.784 sources, 1.769, 1.770
Message-ID: <20090416175427.C239870127@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16112

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- .cvsignore	14 Apr 2009 03:47:35 -0000	1.635
+++ .cvsignore	16 Apr 2009 17:53:57 -0000	1.636
@@ -1,2 +1,3 @@
 clog
 anaconda-11.5.0.44.tar.bz2
+anaconda-11.5.0.45.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- anaconda.spec	14 Apr 2009 03:47:35 -0000	1.783
+++ anaconda.spec	16 Apr 2009 17:53:57 -0000	1.784
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.44
+Version: 11.5.0.45
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -37,7 +37,7 @@
 %define pythonpyblockver 0.24-1
 %define libbdevidver 5.1.2-1
 %define e2fsver 1.41.0
-%define nmver 0.7.0
+%define nmver 1:0.7.1-3.git20090414
 %define dbusver 1.2.3
 %define createrepover 0.4.7
 %define yumutilsver 1.1.11-3
@@ -213,6 +213,41 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.45-1
+- Touch /.autorelabel when running under rescue mode (#491747). (clumens)
+- Add support for fingerprint-based logins (#481273). (clumens)
+- Add a "File Bug" button to the catch-all partitioning exception handler.
+  (clumens)
+- Remove the early catch-all exception handler (#495933). (clumens)
+- Implement the save to USB using devicetree devices. (jgranado)
+- Use size instead of currentSize when comparing lv sizes (hdegoede)
+- Make sure all pv's of an lv's vg are setup before resizing an lv (hdegoede)
+- Do not try to teardown a non existing format (hdegoede)
+- Center the bootloader configuration dialog (#495802). (clumens)
+- Destroy (potential) stale metadata when creating a new partition (hdegoede)
+- use partition req_base_size instead of size in partitionCompare()
+  (hdegoede)
+- Fix changing size of newly created partitions (hdegoede)
+- Don't traceback on invalid filesystem detection (#495156) (dcantrell)
+- Check to see if formatcb is None. (jgranado)
+- Use the PV name when logging error messages. (jgranado)
+- Don't set up the device to obtain minSize anymore. (dlehman)
+- Improve estimate of md arrays' size. (dlehman)
+- Determine minimum size for filesystems once, from constructor. (dlehman)
+- Fix estimate of LUKS header size for newly encrypted devices. (#493575)
+  (dlehman)
+- Fix two syntax problems with generated mdadm.conf entries. (#495552)
+  (dlehman)
+- Default to AES-XTS cipher mode with 512 bit key for new LUKS devices.
+  (dlehman)
+- When going back from a failed shrink, reset the device action set.
+  (clumens)
+- If we can't communicate while logging in to bugzilla, error (#492470).
+  (clumens)
+- Make save to usb work. (jgranado)
+- We don't always have a formatcb either (#495665). (clumens)
+- The entry is named lvsizeentry now. (jgranado)
+
 * Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.44-1
 - Default to SHA512 password encoding algorithm. (dcantrell)
 - Handle format combo box not existing (#495288) (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- sources	14 Apr 2009 03:47:36 -0000	1.769
+++ sources	16 Apr 2009 17:53:57 -0000	1.770
@@ -1 +1 @@
-88831b5b5ee1754793e2fc199a4aa4bf  anaconda-11.5.0.44.tar.bz2
+00b7f0263ca1c593152a0b625d74ccd7  anaconda-11.5.0.45.tar.bz2



From markmc at fedoraproject.org  Thu Apr 16 17:54:43 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 16 Apr 2009 17:54:43 +0000 (UTC)
Subject: rpms/libvirt/F-10 libvirt-0.5.1-read-only-checks.patch, 1.2,
	1.3 .cvsignore, 1.33, 1.34 libvirt.spec, 1.110, 1.111 sources,
	1.39, 1.40
Message-ID: <20090416175443.D086370127@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16308

Modified Files:
	.cvsignore libvirt.spec sources 
Added Files:
	libvirt-0.5.1-read-only-checks.patch 
Log Message:
0.6.1 has been unpushed from update-testing

Revert to libvirt-0_5_1-2_fc10 tag



libvirt-0.5.1-read-only-checks.patch:

Index: libvirt-0.5.1-read-only-checks.patch
===================================================================
RCS file: libvirt-0.5.1-read-only-checks.patch
diff -N libvirt-0.5.1-read-only-checks.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libvirt-0.5.1-read-only-checks.patch	16 Apr 2009 17:54:43 -0000	1.3
@@ -0,0 +1,152 @@
+diff --git a/src/libvirt.c b/src/libvirt.c
+--- a/src/libvirt.c
++++ b/src/libvirt.c
+@@ -2296,6 +2296,16 @@ virDomainMigrate (virDomainPtr domain,
+     conn = domain->conn;        /* Source connection. */
+     if (!VIR_IS_CONNECT (dconn)) {
+         virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++    if (dconn->flags & VIR_CONNECT_RO) {
++        /* NB, delibrately report error against source object, not dest here */
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+         return NULL;
+     }
+ 
+@@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr d
+         return -1;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (dconn->driver->domainMigratePrepare)
+         return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen,
+                                                     uri_in, uri_out,
+@@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr do
+     }
+     conn = domain->conn;
+ 
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (conn->driver->domainMigratePerform)
+         return conn->driver->domainMigratePerform (domain, cookie, cookielen,
+                                                    uri,
+@@ -2482,6 +2502,11 @@ virDomainMigrateFinish (virConnectPtr dc
+ 
+     if (!VIR_IS_CONNECT (dconn)) {
+         virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+         return NULL;
+     }
+ 
+@@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr 
+         return -1;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (dconn->driver->domainMigratePrepare2)
+         return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen,
+                                                      uri_in, uri_out,
+@@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr d
+         return NULL;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++
+     if (dconn->driver->domainMigrateFinish2)
+         return dconn->driver->domainMigrateFinish2 (dconn, dname,
+                                                     cookie, cookielen,
+@@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom,
+     }
+     conn = dom->conn;
+ 
++    if (dom->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     if (!path) {
+         virLibDomainError (dom, VIR_ERR_INVALID_ARG,
+                            _("path is NULL"));
+@@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom,
+     }
+     conn = dom->conn;
+ 
++    if (dom->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     /* Flags must be VIR_MEMORY_VIRTUAL at the moment.
+      *
+      * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is
+@@ -3246,6 +3291,11 @@ virDomainSetAutostart(virDomainPtr domai
+     }
+ 
+     conn = domain->conn;
++
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
+ 
+     if (conn->driver->domainSetAutostart)
+         return conn->driver->domainSetAutostart (domain, autostart);
+@@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr net
+         return (-1);
+     }
+ 
++    if (network->conn->flags & VIR_CONNECT_RO) {
++        virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     conn = network->conn;
+ 
+     if (conn->networkDriver && conn->networkDriver->networkSetAutostart)
+@@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConn
+         return NULL;
+     }
+ 
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++
+     if (conn->storageDriver && conn->storageDriver->findPoolSources)
+         return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags);
+ 
+@@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoo
+         return (-1);
+     }
+ 
++    if (pool->conn->flags & VIR_CONNECT_RO) {
++        virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     conn = pool->conn;
+ 
+     if (conn->storageDriver && conn->storageDriver->poolSetAutostart)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	23 Sep 2008 21:25:17 -0000	1.33
+++ .cvsignore	16 Apr 2009 17:54:43 -0000	1.34
@@ -3,4 +3,3 @@
 i686
 x86_64
 libvirt-*.tar.gz
-libvirt-0.4.6.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-10/libvirt.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- libvirt.spec	4 Mar 2009 15:24:26 -0000	1.110
+++ libvirt.spec	16 Apr 2009 17:54:43 -0000	1.111
@@ -11,7 +11,6 @@
 %define with_python    0%{!?_without_python:1}
 %define with_libvirtd  0%{!?_without_libvirtd:1}
 %define with_uml       0%{!?_without_uml:1}
-%define with_network   0%{!?_without_network:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -33,25 +32,15 @@
 %define with_xen_proxy 0
 %endif
 
-#
-# If building on RHEL switch on the specific support
-# for the specific Xen version
-#
-%if 0%{?fedora}
-%define with_rhel5 0
-%else
-%define with_rhel5 1
-%endif
-
-
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.6.1
-Release: 1%{?dist}%{?extra_release}
+Version: 0.5.1
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0: libvirt-0.5.1-read-only-checks.patch
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -136,8 +125,6 @@
 BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
-# For QEMU/LXC numa info
-BuildRequires: numactl-devel
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -177,6 +164,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -219,14 +207,6 @@
 %define _without_uml --without-uml
 %endif
 
-%if %{with_rhel5}
-%define _with_rhel5_api --with-rhel5-api
-%endif
-
-%if ! %{with_network}
-%define _without_network --without-network
-%endif
-
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -237,8 +217,6 @@
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
-           %{?_without_network} \
-           %{?_with_rhel5_api} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -249,10 +227,7 @@
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
-(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in)
-(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
-(cd examples/domain-events/events-c ;  make clean ;rm -rf .deps .libs Makefile Makefile.in)
-
+(cd docs/examples/python ; rm -f Makefile Makefile.in)
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -302,7 +277,7 @@
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
-if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
+if [ $? != 0 ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -345,7 +320,6 @@
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
 %endif
 
 %if %{with_qemu}
@@ -362,43 +336,12 @@
 %{_datadir}/libvirt/networks/default.xml
 %endif
 
-%dir %{_datadir}/libvirt/
-%dir %{_datadir}/libvirt/schemas/
-
-%{_datadir}/libvirt/schemas/domain.rng
-%{_datadir}/libvirt/schemas/network.rng
-%{_datadir}/libvirt/schemas/storagepool.rng
-%{_datadir}/libvirt/schemas/storagevol.rng
-%{_datadir}/libvirt/schemas/nodedev.rng
-%{_datadir}/libvirt/schemas/capability.rng
-
 %dir %{_localstatedir}/run/libvirt/
-
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
 
 %if %{with_qemu}
-%dir %{_localstatedir}/run/libvirt/qemu/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
-%endif
-%if %{with_lxc}
-%dir %{_localstatedir}/run/libvirt/lxc/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
-%endif
-%if %{with_uml}
-%dir %{_localstatedir}/run/libvirt/uml/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
-%endif
-%if %{with_network}
-%dir %{_localstatedir}/run/libvirt/network/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
-%endif
-
-%if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
@@ -412,7 +355,6 @@
 %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
 
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
 %if %{with_qemu}
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %endif
@@ -430,6 +372,7 @@
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %endif
 
+%doc docs/*.rng
 %doc docs/*.xml
 
 %files devel
@@ -447,7 +390,6 @@
 %doc docs/*.html docs/html docs/*.gif
 %doc docs/examples
 %doc docs/libvirt-api.xml
-%doc examples
 
 %if %{with_python}
 %files python
@@ -463,31 +405,6 @@
 %endif
 
 %changelog
-* Wed Mar  4 2009 Daniel Veillard <veillard at redhat.com> - 0.6.1-1.fc10
-- upstream release 0.6.1
-- support for node device detach reattach and reset
-- sVirt mandatory access control support
-- many bug fixes and small improvements
-
-* Wed Feb 18 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.0-3.fc10
-- Fix QEMU startup timeout/race (rhbz #484649)
-- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
-- Fix timeout when autostarting session daemon
-
-* Fri Feb  6 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.0-2.fc10
-- Fix libvirtd --timeout usage
-- Fix RPC call problems and QEMU startup handling (rhbz #484414)
-- Fix unowned directories (rhbz #483442)
-
-* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1.fc10
-- upstream release 0.6.0
-- thread safety of API
-- allow QEmu/KVM domains to survive daemon restart
-- extended logging capabilities
-- support copy on write storage volumes for QEmu/KVM
-- support of storage cache control options for QEmu/KVM
-- a lot of bug fixes
-
 * Wed Dec 17 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-2.fc10
 - fix missing read-only access checks, fixes CVE-2008-5086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-10/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	4 Mar 2009 15:24:26 -0000	1.39
+++ sources	16 Apr 2009 17:54:43 -0000	1.40
@@ -1 +1 @@
-3154ea9d4a0778497dfdf58cb98127c0  libvirt-0.6.1.tar.gz
+abc697978e9c66cbc8d8db4fa3f1c1b6  libvirt-0.5.1.tar.gz



From mitr at fedoraproject.org  Thu Apr 16 17:55:01 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 16 Apr 2009 17:55:01 +0000 (UTC)
Subject: rpms/stunnel/devel stunnel-4.27-authpriv.patch, NONE,
	1.1 stunnel-4.27-sample.patch, NONE, 1.1 .cvsignore, 1.26,
	1.27 sources, 1.26, 1.27 stunnel.spec, 1.56,
	1.57 stunnel-4.08-authpriv.patch, 1.1,
	NONE stunnel-4.18-sample.patch, 1.1, NONE
Message-ID: <20090416175501.5685270127@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16329

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.27-authpriv.patch stunnel-4.27-sample.patch 
Removed Files:
	stunnel-4.08-authpriv.patch stunnel-4.18-sample.patch 
Log Message:
* Thu Apr 16 2009 Miloslav Trma?? <mitr at redhat.com> - 4.27-1
- Update to stunnel-4.27.


stunnel-4.27-authpriv.patch:

--- NEW FILE stunnel-4.27-authpriv.patch ---
Change the default log facility from LOG_DAEMON to LOG_AUTHPRIV.
diff -urN stunnel/doc/stunnel.html stunnel-4.27/doc/stunnel.html
--- stunnel/doc/stunnel.html	2009-04-16 11:17:26.000000000 +0200
+++ stunnel-4.27/doc/stunnel.html	2009-04-16 18:09:06.000000000 +0200
@@ -189,7 +189,7 @@
 info (6), or debug (7).  All logs for the specified level and
 all levels numerically less than it will be shown.  Use <strong>debug = debug</strong> or
 <strong>debug = 7</strong> for greatest debugging output.  The default is notice (5).</p>
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)</p>
 <p>Case is ignored for both facilities and levels.</p>
 </dd>
diff -urN stunnel/doc/stunnel.pod stunnel-4.27/doc/stunnel.pod
--- stunnel/doc/stunnel.pod	2009-04-16 10:38:41.000000000 +0200
+++ stunnel-4.27/doc/stunnel.pod	2009-04-16 18:08:49.000000000 +0200
@@ -139,7 +139,7 @@
 all levels numerically less than it will be shown.  Use B<debug = debug> or
 B<debug = 7> for greatest debugging output.  The default is notice (5).
 
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)
 
 Case is ignored for both facilities and levels.
diff -urN stunnel/doc/stunnel.8 stunnel-4.27/doc/stunnel.8
--- stunnel/doc/stunnel.8	2009-04-16 11:17:25.000000000 +0200
+++ stunnel-4.27/doc/stunnel.8	2009-04-16 18:08:49.000000000 +0200
@@ -226,7 +226,7 @@
 all levels numerically less than it will be shown.  Use \fBdebug = debug\fR or
 \&\fBdebug = 7\fR for greatest debugging output.  The default is notice (5).
 .Sp
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)
 .Sp
 Case is ignored for both facilities and levels.
diff -urN stunnel/src/options.c stunnel-4.27/src/options.c
--- stunnel/src/options.c	2009-04-16 10:49:20.000000000 +0200
+++ stunnel-4.27/src/options.c	2009-04-16 18:08:49.000000000 +0200
@@ -136,8 +136,12 @@
     case CMD_INIT:
         options.debug_level=5;
 #if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV)
+        options.facility=LOG_AUTHPRIV;
+#else
         options.facility=LOG_DAEMON;
 #endif
+#endif
         break;
     case CMD_EXEC:
         if(strcasecmp(opt, "debug"))

stunnel-4.27-sample.patch:

--- NEW FILE stunnel-4.27-sample.patch ---
You shouldn't use the sample as-is, but people do.

diff -urN stunnel/tools/stunnel.conf-sample.in stunnel-4.27/tools/stunnel.conf-sample.in
--- stunnel/tools/stunnel.conf-sample.in	2009-04-16 11:10:09.000000000 +0200
+++ stunnel-4.27/tools/stunnel.conf-sample.in	2009-04-16 18:14:02.000000000 +0200
@@ -3,14 +3,14 @@
 ; Please make sure you understand them (especially the effect of the chroot jail)
 
 ; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem
+cert = @sysconfdir@/stunnel/mail.crt
+;key = @sysconfdir@/stunnel/mail.key
 
 ; Protocol version (all, SSLv2, SSLv3, TLSv1)
 sslVersion = SSLv3
 
 ; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/lib/stunnel/
+chroot = @localstatedir@/run/stunnel/
 setuid = nobody
 setgid = @DEFAULT_GROUP@
 ; PID is created inside the chroot jail
@@ -30,12 +30,13 @@
 ; CApath is located inside chroot jail
 ;CApath = /certs
 ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/stunnel/certs.pem
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
 ; Don't forget to c_rehash CRLpath
 ; CRLpath is located inside chroot jail
 ;CRLpath = /crls
 ; Alternatively you can use CRLfile
-;CRLfile = @prefix@/etc/stunnel/crls.pem
+;CRLfile = @sysconfdir@/stunnel/crls.pem
 
 ; Some debugging stuff useful for troubleshooting
 ;debug = 7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	22 Sep 2008 19:46:14 -0000	1.26
+++ .cvsignore	16 Apr 2009 17:54:30 -0000	1.27
@@ -1,2 +1,2 @@
-stunnel-4.26.tar.gz
-stunnel-4.26.tar.gz.asc
+stunnel-4.27.tar.gz
+stunnel-4.27.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Sep 2008 19:46:14 -0000	1.26
+++ sources	16 Apr 2009 17:54:30 -0000	1.27
@@ -1,2 +1,2 @@
-0f6706540fbe000513940f4860698405  stunnel-4.26.tar.gz
-a20f1fafdbfe58c60367618935702ff0  stunnel-4.26.tar.gz.asc
+3c655d815576f50046a1c28744b88681  stunnel-4.27.tar.gz
+1219d667d1a1306f392d180587c6b50e  stunnel-4.27.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- stunnel.spec	26 Feb 2009 03:26:23 -0000	1.56
+++ stunnel.spec	16 Apr 2009 17:54:31 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.26
-Release: 3
+Version: 4.27
+Release: 1
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -12,8 +12,8 @@
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.08-authpriv.patch
-Patch1: stunnel-4.18-sample.patch
+Patch0: stunnel-4.27-authpriv.patch
+Patch1: stunnel-4.27-sample.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -30,8 +30,6 @@
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
-iconv -f iso-8859-2 -t utf-8 < doc/stunnel.pl.8 > doc/stunnel.pl.8_
-mv doc/stunnel.pl.8_ doc/stunnel.pl.8
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -81,6 +79,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Thu Apr 16 2009 Miloslav Trma?? <mitr at redhat.com> - 4.27-1
+- Update to stunnel-4.27.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- stunnel-4.08-authpriv.patch DELETED ---


--- stunnel-4.18-sample.patch DELETED ---



From markmc at fedoraproject.org  Thu Apr 16 17:57:40 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 16 Apr 2009 17:57:40 +0000 (UTC)
Subject: rpms/libvirt/F-9 libvirt-0.5.1-read-only-checks.patch, 1.2,
	1.3 libvirt.spec, 1.101, 1.102 sources, 1.38, 1.39
Message-ID: <20090416175741.0A06E70127@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285

Modified Files:
	libvirt.spec sources 
Added Files:
	libvirt-0.5.1-read-only-checks.patch 
Log Message:
0.6.1 has been unpushed from updates-testing

Revert to libvirt-0_5_1-2_fc9 tag


libvirt-0.5.1-read-only-checks.patch:

Index: libvirt-0.5.1-read-only-checks.patch
===================================================================
RCS file: libvirt-0.5.1-read-only-checks.patch
diff -N libvirt-0.5.1-read-only-checks.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libvirt-0.5.1-read-only-checks.patch	16 Apr 2009 17:57:40 -0000	1.3
@@ -0,0 +1,152 @@
+diff --git a/src/libvirt.c b/src/libvirt.c
+--- a/src/libvirt.c
++++ b/src/libvirt.c
+@@ -2296,6 +2296,16 @@ virDomainMigrate (virDomainPtr domain,
+     conn = domain->conn;        /* Source connection. */
+     if (!VIR_IS_CONNECT (dconn)) {
+         virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++    if (dconn->flags & VIR_CONNECT_RO) {
++        /* NB, delibrately report error against source object, not dest here */
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+         return NULL;
+     }
+ 
+@@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr d
+         return -1;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (dconn->driver->domainMigratePrepare)
+         return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen,
+                                                     uri_in, uri_out,
+@@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr do
+     }
+     conn = domain->conn;
+ 
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (conn->driver->domainMigratePerform)
+         return conn->driver->domainMigratePerform (domain, cookie, cookielen,
+                                                    uri,
+@@ -2482,6 +2502,11 @@ virDomainMigrateFinish (virConnectPtr dc
+ 
+     if (!VIR_IS_CONNECT (dconn)) {
+         virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+         return NULL;
+     }
+ 
+@@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr 
+         return -1;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (dconn->driver->domainMigratePrepare2)
+         return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen,
+                                                      uri_in, uri_out,
+@@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr d
+         return NULL;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++
+     if (dconn->driver->domainMigrateFinish2)
+         return dconn->driver->domainMigrateFinish2 (dconn, dname,
+                                                     cookie, cookielen,
+@@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom,
+     }
+     conn = dom->conn;
+ 
++    if (dom->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     if (!path) {
+         virLibDomainError (dom, VIR_ERR_INVALID_ARG,
+                            _("path is NULL"));
+@@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom,
+     }
+     conn = dom->conn;
+ 
++    if (dom->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     /* Flags must be VIR_MEMORY_VIRTUAL at the moment.
+      *
+      * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is
+@@ -3246,6 +3291,11 @@ virDomainSetAutostart(virDomainPtr domai
+     }
+ 
+     conn = domain->conn;
++
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
+ 
+     if (conn->driver->domainSetAutostart)
+         return conn->driver->domainSetAutostart (domain, autostart);
+@@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr net
+         return (-1);
+     }
+ 
++    if (network->conn->flags & VIR_CONNECT_RO) {
++        virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     conn = network->conn;
+ 
+     if (conn->networkDriver && conn->networkDriver->networkSetAutostart)
+@@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConn
+         return NULL;
+     }
+ 
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++
+     if (conn->storageDriver && conn->storageDriver->findPoolSources)
+         return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags);
+ 
+@@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoo
+         return (-1);
+     }
+ 
++    if (pool->conn->flags & VIR_CONNECT_RO) {
++        virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     conn = pool->conn;
+ 
+     if (conn->storageDriver && conn->storageDriver->poolSetAutostart)


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- libvirt.spec	5 Mar 2009 10:04:24 -0000	1.101
+++ libvirt.spec	16 Apr 2009 17:57:40 -0000	1.102
@@ -11,7 +11,6 @@
 %define with_python    0%{!?_without_python:1}
 %define with_libvirtd  0%{!?_without_libvirtd:1}
 %define with_uml       0%{!?_without_uml:1}
-%define with_network   0%{!?_without_network:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -33,25 +32,15 @@
 %define with_xen_proxy 0
 %endif
 
-#
-# If building on RHEL switch on the specific support
-# for the specific Xen version
-#
-%if 0%{?fedora}
-%define with_rhel5 0
-%else
-%define with_rhel5 1
-%endif
-
-
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.6.1
-Release: 1%{?dist}%{?extra_release}
+Version: 0.5.1
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0: libvirt-0.5.1-read-only-checks.patch
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -136,8 +125,6 @@
 BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
-# For QEMU/LXC numa info
-BuildRequires: numactl-devel
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -177,6 +164,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -219,14 +207,6 @@
 %define _without_uml --without-uml
 %endif
 
-%if %{with_rhel5}
-%define _with_rhel5_api --with-rhel5-api
-%endif
-
-%if ! %{with_network}
-%define _without_network --without-network
-%endif
-
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -237,8 +217,6 @@
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
-           %{?_without_network} \
-           %{?_with_rhel5_api} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -249,9 +227,7 @@
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
-(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in)
-(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
-(cd examples/domain-events/events-c ;  make clean ;rm -rf .deps .libs Makefile Makefile.in)
+(cd docs/examples/python ; rm -f Makefile Makefile.in)
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -301,7 +277,7 @@
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
-if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
+if [ $? != 0 ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -344,7 +320,6 @@
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
 %endif
 
 %if %{with_qemu}
@@ -361,43 +336,12 @@
 %{_datadir}/libvirt/networks/default.xml
 %endif
 
-%dir %{_datadir}/libvirt/
-%dir %{_datadir}/libvirt/schemas/
-
-%{_datadir}/libvirt/schemas/domain.rng
-%{_datadir}/libvirt/schemas/network.rng
-%{_datadir}/libvirt/schemas/storagepool.rng
-%{_datadir}/libvirt/schemas/storagevol.rng
-%{_datadir}/libvirt/schemas/nodedev.rng
-%{_datadir}/libvirt/schemas/capability.rng
-
 %dir %{_localstatedir}/run/libvirt/
-
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
 
 %if %{with_qemu}
-%dir %{_localstatedir}/run/libvirt/qemu/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
-%endif
-%if %{with_lxc}
-%dir %{_localstatedir}/run/libvirt/lxc/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
-%endif
-%if %{with_uml}
-%dir %{_localstatedir}/run/libvirt/uml/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
-%endif
-%if %{with_network}
-%dir %{_localstatedir}/run/libvirt/network/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
-%endif
-
-%if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
@@ -411,7 +355,6 @@
 %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
 
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
 %if %{with_qemu}
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %endif
@@ -429,6 +372,7 @@
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %endif
 
+%doc docs/*.rng
 %doc docs/*.xml
 
 %files devel
@@ -446,7 +390,6 @@
 %doc docs/*.html docs/html docs/*.gif
 %doc docs/examples
 %doc docs/libvirt-api.xml
-%doc examples
 
 %if %{with_python}
 %files python
@@ -462,31 +405,6 @@
 %endif
 
 %changelog
-* Wed Mar  4 2009 Daniel Veillard <veillard at redhat.com> - 0.6.1-1.fc9
-- upstream release 0.6.1
-- support for node device detach reattach and reset
-- sVirt mandatory access control support
-- many bug fixes and small improvements
-
-* Wed Feb 18 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.0-3.fc9
-- Fix QEMU startup timeout/race (rhbz #484649)
-- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
-- Fix timeout when autostarting session daemon
-
-* Fri Feb  6 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.0-2.fc9
-- Fix libvirtd --timeout usage
-- Fix RPC call problems and QEMU startup handling (rhbz #484414)
-- Fix unowned directories (rhbz #483442)
-
-* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1.fc9
-- upstream release 0.6.0
-- thread safety of API
-- allow QEmu/KVM domains to survive daemon restart
-- extended logging capabilities
-- support copy on write storage volumes for QEmu/KVM
-- support of storage cache control options for QEmu/KVM
-- a lot of bug fixes
-
 * Wed Dec 17 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-2.fc9
 - fix missing read-only access checks, fixes CVE-2008-5086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	5 Mar 2009 10:04:24 -0000	1.38
+++ sources	16 Apr 2009 17:57:40 -0000	1.39
@@ -1 +1 @@
-3154ea9d4a0778497dfdf58cb98127c0  libvirt-0.6.1.tar.gz
+abc697978e9c66cbc8d8db4fa3f1c1b6  libvirt-0.5.1.tar.gz



From rdieter at fedoraproject.org  Thu Apr 16 17:59:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 17:59:38 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/devel import.log, NONE,
	1.1 leonidas-kde-theme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090416175938.4D30070127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/leonidas-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17868/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log leonidas-kde-theme.spec 
Log Message:
import



--- NEW FILE import.log ---
leonidas-kde-theme-0_2_0-1_fc10:HEAD:leonidas-kde-theme-0.2.0-1.fc10.src.rpm:1239904728


--- NEW FILE leonidas-kde-theme.spec ---
Name:		leonidas-kde-theme
Version:	0.2.0
Release:	1%{?dist}
Summary:	Leonidas KDE Theme

Group:		User Interface/Desktops
License:	GPLv2 and CC-BY-SA

URL:		https://fedoraproject.org/wiki/F11_Artwork
# We are upstream for this package
Source0:	%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	kde-filesystem
Requires:	kde-filesystem
Requires:	system-logos
Requires:	leonidas-backgrounds-common >= 10.93.1-1
Requires:	leonidas-backgrounds-kdm >= 10.93.1-1



%description
This is Leonidas KDE Theme Artwork containing KSplash theme, KDM theme and
wallpapers theme. 

%prep
%setup -q


%build
# blank

%install
rm -rf %{buildroot}

# wallpapers
mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers
ln -sf ../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas.png
ln -sf ../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_wide.png
ln -sf ../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_high.png

# KDM
mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
cp -rp kdm/leonidas/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
(cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/leonidas/
ln -s ../../../../../wallpapers/leonidas.png leonidas-640x480.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-800x480.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-800x600.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1024x600.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1024x768.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1152x720.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1152x864.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1200x900.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x720.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x768.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x800.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1280x960.png
#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1280x1024.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x1024.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1366x768.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1440x900.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1440x1080.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1600x1200.png
#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1600x1280.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1600x1280.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1680x1050.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1080.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1200.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1920x1440.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-2048x1536.png
# KDM falls back to this one if there's no match
ln -s ../../../../../wallpapers/leonidas.png leonidas.png
)

mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
cp -rp kdm/users %{buildroot}/%{_kde4_appsdir}/kdm/pics

# KSplash
mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
cp -rp ksplash/Leonidas/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
ln -s ../../../../../../wallpapers/leonidas.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200
ln -s ../../../../../../wallpapers/leonidas_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200/leonidas.png
ln -s ../../../../../../wallpapers/leonidas_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/leonidas.png
ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/logo.png

# KDE 4 wallpapers theme
mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
cp -rp wallpapers/leonidas/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/leonidas
#cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
(cd %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
ln -s ../../../leonidas.png 640x480.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 800x480.png
ln -s ../../../leonidas.png 800x600.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1024x600.png
ln -s ../../../leonidas.png 1024x768.png
ln -s ../../../leonidas_wide.png 1152x720.png
ln -s ../../../leonidas.png 1152x864.png
ln -s ../../../leonidas.png 1200x900.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1280x720.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1280x768.png
ln -s ../../../leonidas_wide.png 1280x800.png
ln -s ../../../leonidas.png 1280x960.png
ln -s ../../../leonidas_high.png 1280x1024.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1366x768.png
ln -s ../../../leonidas_wide.png 1440x900.png
ln -s ../../../leonidas.png 1440x1080.png
ln -s ../../../leonidas.png 1600x1200.png
ln -s ../../../leonidas_high.png 1600x1280.png
ln -s ../../../leonidas_wide.png 1680x1050.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1920x1080.png
ln -s ../../../leonidas_wide.png 1920x1200.png
ln -s ../../../leonidas.png 1920x1440.png
ln -s ../../../leonidas.png 2048x1536.png
)


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README COPYING.CC-BY-SA COPYING.GPLv2
%{_kde4_appsdir}/kdm/themes/leonidas/
%{_kde4_appsdir}/ksplash/Themes/Leonidas/
%{_kde4_datadir}/wallpapers/leonidas.png
%{_kde4_datadir}/wallpapers/leonidas_wide.png
%{_kde4_datadir}/wallpapers/leonidas_high.png
%{_kde4_datadir}/wallpapers/leonidas/
#%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png


%changelog
* Tue Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
- updated to lion theme

* Tue Mar 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.0-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:34:53 -0000	1.1
+++ .cvsignore	16 Apr 2009 17:59:07 -0000	1.2
@@ -0,0 +1 @@
+leonidas-kde-theme-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:34:53 -0000	1.1
+++ sources	16 Apr 2009 17:59:07 -0000	1.2
@@ -0,0 +1 @@
+3fc4dbf343bb37d170bf852acb4dcec3  leonidas-kde-theme-0.2.0.tar.bz2



From toshio at fedoraproject.org  Thu Apr 16 18:05:14 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 16 Apr 2009 18:05:14 +0000 (UTC)
Subject: rpms/python-migrate/devel .cvsignore, 1.5,
	1.6 python-migrate-sqlalchemy-migrate.patch, 1.2,
	1.3 python-migrate.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090416180514.9BA7F70127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-migrate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20000

Modified Files:
	.cvsignore python-migrate-sqlalchemy-migrate.patch 
	python-migrate.spec sources 
Log Message:

* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.3-1
- Update to new bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2009 17:36:07 -0000	1.5
+++ .cvsignore	16 Apr 2009 18:04:44 -0000	1.6
@@ -1 +1 @@
-sqlalchemy-migrate-0.5.1.2.tar.gz
+sqlalchemy-migrate-0.5.3.tar.gz

python-migrate-sqlalchemy-migrate.patch:

Index: python-migrate-sqlalchemy-migrate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate-sqlalchemy-migrate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-migrate-sqlalchemy-migrate.patch	28 Jan 2009 01:51:00 -0000	1.2
+++ python-migrate-sqlalchemy-migrate.patch	16 Apr 2009 18:04:44 -0000	1.3
@@ -1,8 +1,7 @@
-Index: sqlalchemy-migrate-0.5.1.dev-r479/setup.py
-===================================================================
---- sqlalchemy-migrate-0.5.1.dev-r479.orig/setup.py
-+++ sqlalchemy-migrate-0.5.1.dev-r479/setup.py
-@@ -31,8 +31,8 @@ Migrate extends SQLAlchemy to have datab
+diff -up sqlalchemy-migrate-0.5.3/setup.py.bak sqlalchemy-migrate-0.5.3/setup.py
+--- sqlalchemy-migrate-0.5.3/setup.py.bak	2009-04-16 10:52:18.000000000 -0700
++++ sqlalchemy-migrate-0.5.3/setup.py	2009-04-16 10:52:43.000000000 -0700
+@@ -40,8 +40,8 @@ Migrate extends SQLAlchemy to have datab
  
      entry_points = """
      [console_scripts]
@@ -12,4 +11,4 @@
 +    sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
      """,
      test_suite = "nose.collector",
- )
+     tests_require = test_requirements,


Index: python-migrate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-migrate.spec	26 Feb 2009 22:23:18 -0000	1.10
+++ python-migrate.spec	16 Apr 2009 18:04:44 -0000	1.11
@@ -3,8 +3,8 @@
 %define srcname sqlalchemy-migrate
 
 Name: python-migrate
-Version: 0.5.1.2
-Release: 3%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
 Group: Development/Languages
@@ -13,8 +13,6 @@
 Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
 Patch0: python-migrate-sqlalchemy-migrate.patch
-# Disable one unittest for now.  In the future we want this to work
-Patch1: python-migrate-disable-test_fk.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,8 +34,6 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .rename
-# Try removing this patch on every update
-%patch1 -p1 -b .disable-test
 
 %build
 %{__python} setup.py build
@@ -60,6 +56,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.3-1
+- Update to new bugfix release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2009 17:36:07 -0000	1.5
+++ sources	16 Apr 2009 18:04:44 -0000	1.6
@@ -1 +1 @@
-547d692b1ab58186535a0e41aef4b378  sqlalchemy-migrate-0.5.1.2.tar.gz
+8ce48470efac8cbcdf4ee9af725efd70  sqlalchemy-migrate-0.5.3.tar.gz



From toshio at fedoraproject.org  Thu Apr 16 18:05:17 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 16 Apr 2009 18:05:17 +0000 (UTC)
Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.25,
	1.26 python-sqlalchemy.spec, 1.40, 1.41 sources, 1.26, 1.27
Message-ID: <20090416180517.C67DD70127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20053

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:

* Thu Apr 162009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
- Upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Feb 2009 16:44:37 -0000	1.25
+++ .cvsignore	16 Apr 2009 18:04:47 -0000	1.26
@@ -1 +1 @@
-SQLAlchemy-0.5.2.tar.gz
+SQLAlchemy-0.5.3.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- python-sqlalchemy.spec	26 Feb 2009 23:33:59 -0000	1.40
+++ python-sqlalchemy.spec	16 Apr 2009 18:04:47 -0000	1.41
@@ -4,8 +4,8 @@
 %define srcname SQLAlchemy
 
 Name:           python-sqlalchemy
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Apr 162009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
+- Upstream bugfix release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	11 Feb 2009 16:44:37 -0000	1.26
+++ sources	16 Apr 2009 18:04:47 -0000	1.27
@@ -1 +1 @@
-616893cbfb7b04a4f0ca9587bded3a1c  SQLAlchemy-0.5.2.tar.gz
+8a03ac93aa28a9f4ea5ecc0557e90954  SQLAlchemy-0.5.3.tar.gz



From toshio at fedoraproject.org  Thu Apr 16 18:07:18 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 16 Apr 2009 18:07:18 +0000 (UTC)
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.41,1.42
Message-ID: <20090416180718.A635D70127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20595

Modified Files:
	python-sqlalchemy.spec 
Log Message:
typo in changelog date.



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- python-sqlalchemy.spec	16 Apr 2009 18:04:47 -0000	1.41
+++ python-sqlalchemy.spec	16 Apr 2009 18:06:47 -0000	1.42
@@ -55,7 +55,7 @@
 %{python_sitelib}/*
 
 %changelog
-* Thu Apr 162009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
+* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
 - Upstream bugfix release.
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2



From hadess at fedoraproject.org  Thu Apr 16 18:07:21 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 16 Apr 2009 18:07:21 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-11 gnome-bluetooth.spec,1.74,1.75
Message-ID: <20090416180721.58F1670127@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19781

Modified Files:
	gnome-bluetooth.spec 
Log Message:
* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-2
- Require the PA Bluetooth plugins



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-bluetooth.spec	14 Apr 2009 14:14:06 -0000	1.74
+++ gnome-bluetooth.spec	16 Apr 2009 18:06:50 -0000	1.75
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -28,6 +28,7 @@
 Requires:	bluez
 Requires:	obexd
 Requires:	notification-daemon
+Requires:	pulseaudio-module-bluetooth
 
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
@@ -181,6 +182,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-2
+- Require the PA Bluetooth plugins
+
 * Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-1
 - Update to 2.27.4
 



From rdieter at fedoraproject.org  Thu Apr 16 18:08:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 18:08:03 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090416180803.9C35F70127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20869

Modified Files:
	.cvsignore sources 
Added Files:
	leonidas-kde-theme.spec 
Log Message:
import



--- NEW FILE leonidas-kde-theme.spec ---
Name:		leonidas-kde-theme
Version:	0.2.0
Release:	1%{?dist}
Summary:	Leonidas KDE Theme

Group:		User Interface/Desktops
License:	GPLv2 and CC-BY-SA

URL:		https://fedoraproject.org/wiki/F11_Artwork
# We are upstream for this package
Source0:	%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	kde-filesystem
Requires:	kde-filesystem
Requires:	system-logos
Requires:	leonidas-backgrounds-common >= 10.93.1-1
Requires:	leonidas-backgrounds-kdm >= 10.93.1-1



%description
This is Leonidas KDE Theme Artwork containing KSplash theme, KDM theme and
wallpapers theme. 

%prep
%setup -q


%build
# blank

%install
rm -rf %{buildroot}

# wallpapers
mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers
ln -sf ../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas.png
ln -sf ../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_wide.png
ln -sf ../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_high.png

# KDM
mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
cp -rp kdm/leonidas/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
(cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/leonidas/
ln -s ../../../../../wallpapers/leonidas.png leonidas-640x480.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-800x480.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-800x600.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1024x600.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1024x768.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1152x720.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1152x864.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1200x900.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x720.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x768.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x800.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1280x960.png
#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1280x1024.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x1024.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1366x768.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1440x900.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1440x1080.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1600x1200.png
#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1600x1280.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1600x1280.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1680x1050.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1080.png
ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1200.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-1920x1440.png
ln -s ../../../../../wallpapers/leonidas.png leonidas-2048x1536.png
# KDM falls back to this one if there's no match
ln -s ../../../../../wallpapers/leonidas.png leonidas.png
)

mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
cp -rp kdm/users %{buildroot}/%{_kde4_appsdir}/kdm/pics

# KSplash
mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
cp -rp ksplash/Leonidas/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
ln -s ../../../../../../wallpapers/leonidas.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200
ln -s ../../../../../../wallpapers/leonidas_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200/leonidas.png
ln -s ../../../../../../wallpapers/leonidas_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/leonidas.png
ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/logo.png

# KDE 4 wallpapers theme
mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
cp -rp wallpapers/leonidas/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/leonidas
#cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
(cd %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
ln -s ../../../leonidas.png 640x480.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 800x480.png
ln -s ../../../leonidas.png 800x600.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1024x600.png
ln -s ../../../leonidas.png 1024x768.png
ln -s ../../../leonidas_wide.png 1152x720.png
ln -s ../../../leonidas.png 1152x864.png
ln -s ../../../leonidas.png 1200x900.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1280x720.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1280x768.png
ln -s ../../../leonidas_wide.png 1280x800.png
ln -s ../../../leonidas.png 1280x960.png
ln -s ../../../leonidas_high.png 1280x1024.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1366x768.png
ln -s ../../../leonidas_wide.png 1440x900.png
ln -s ../../../leonidas.png 1440x1080.png
ln -s ../../../leonidas.png 1600x1200.png
ln -s ../../../leonidas_high.png 1600x1280.png
ln -s ../../../leonidas_wide.png 1680x1050.png
# That one's not really 8:5, but it's the closest...
ln -s ../../../leonidas_wide.png 1920x1080.png
ln -s ../../../leonidas_wide.png 1920x1200.png
ln -s ../../../leonidas.png 1920x1440.png
ln -s ../../../leonidas.png 2048x1536.png
)


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README COPYING.CC-BY-SA COPYING.GPLv2
%{_kde4_appsdir}/kdm/themes/leonidas/
%{_kde4_appsdir}/ksplash/Themes/Leonidas/
%{_kde4_datadir}/wallpapers/leonidas.png
%{_kde4_datadir}/wallpapers/leonidas_wide.png
%{_kde4_datadir}/wallpapers/leonidas_high.png
%{_kde4_datadir}/wallpapers/leonidas/
#%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png


%changelog
* Tue Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
- updated to lion theme

* Tue Mar 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.0-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:34:53 -0000	1.1
+++ .cvsignore	16 Apr 2009 18:07:32 -0000	1.2
@@ -0,0 +1 @@
+leonidas-kde-theme-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:34:53 -0000	1.1
+++ sources	16 Apr 2009 18:07:33 -0000	1.2
@@ -0,0 +1 @@
+3fc4dbf343bb37d170bf852acb4dcec3  leonidas-kde-theme-0.2.0.tar.bz2



From hadess at fedoraproject.org  Thu Apr 16 18:09:14 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 16 Apr 2009 18:09:14 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.74,1.75
Message-ID: <20090416180914.DFDBB70127@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21350

Modified Files:
	gnome-bluetooth.spec 
Log Message:
* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-2
- Require the PA Bluetooth plugins



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-bluetooth.spec	14 Apr 2009 14:14:06 -0000	1.74
+++ gnome-bluetooth.spec	16 Apr 2009 18:08:43 -0000	1.75
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -28,6 +28,7 @@
 Requires:	bluez
 Requires:	obexd
 Requires:	notification-daemon
+Requires:	pulseaudio-module-bluetooth
 
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
@@ -181,6 +182,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-2
+- Require the PA Bluetooth plugins
+
 * Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-1
 - Update to 2.27.4
 



From mtasaka at fedoraproject.org  Thu Apr 16 18:10:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 16 Apr 2009 18:10:43 +0000 (UTC)
Subject: rpms/kazehakase/F-10
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch, NONE,
	1.1 kazehakase-0.5.6-rev3769-embed-vendor-version.patch, NONE,
	1.1 kazehakase.spec, 1.75, 1.76
Message-ID: <20090416181043.36CD170127@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21762/F-10

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch 
	kazehakase-0.5.6-rev3769-embed-vendor-version.patch 
Log Message:
import 2 patches from devel

kazehakase-0.5.6-rev3769-crash-no_module_installed.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-crash-no_module_installed.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/kz-window.c.debug	2009-04-12 15:31:16.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/kz-window.c	2009-04-12 15:41:27.000000000 +0900
@@ -859,6 +859,7 @@
 	if (url) g_return_val_if_fail(g_utf8_validate(url, strlen(url), NULL), NULL);
 
 	kzembed = kz_window_create_embed(kz);
+	g_return_val_if_fail(kzembed, NULL);
 	kztab = KZ_TAB_LABEL(kz_tab_label_new(kz, kzembed));
 
 	gtk_widget_show_all(GTK_WIDGET(kzembed));

kazehakase-0.5.6-rev3769-embed-vendor-version.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-embed-vendor-version.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c.version	2009-01-28 04:25:07.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c	2009-04-12 18:01:15.000000000 +0900
@@ -95,7 +95,12 @@
 			GDK_RGB_DITHER_NORMAL,
 			0, 0);
 	/* Draw version and backends under the logo */
-	version = g_strdup_printf (_("Version %s"), VERSION);
+	version = g_strdup_printf (_("Version %s"), 
+#ifdef VERSION_VENDOR
+		VERSION_VENDOR);
+#else
+		VERSION);
+#endif
 	backends = backend_names();
 	if (backends)
 	{


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kazehakase.spec	11 Apr 2009 19:12:37 -0000	1.75
+++ kazehakase.spec	16 Apr 2009 18:10:12 -0000	1.76
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -53,6 +53,8 @@
 # kazehakase crashed when only kazehakase-webkit is installed
 # (bug 444569)
 Patch12:	kazehakase-0.5.6-crash-only_webkit_installed.patch
+Patch13:	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch
+Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -73,13 +75,13 @@
 BuildRequires:	ruby
 %endif
 %if %{support_webkit}
-BuildRequires:	WebKit-gtk-devel
-%endif 	
+BuildRequires:	WebKit-gtk-devel %{?min_webkit_EVR:>= %{min_webkit_EVR}}
+%endif
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-Requires:	%{name}-base 	= %{version}-%{release}
+Requires:	%{name}-base	= %{version}-%{release}
 
 # GLib version dependency
 # Borrowed from pidgin spec file
@@ -182,6 +184,8 @@
 %patch11 -p0 -b .rhbug
 %endif
 %patch12 -p1 -b .onlywebkit
+%patch13 -p1 -b .nomodule
+%patch14 -p1 -b .evr
 
 %if %{need_autogen}
 sh autogen.sh
@@ -198,6 +202,8 @@
 done
 
 %build
+export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
+
 %configure \
 %if 0%{?fedora} >= 9
 	CC="%{__cc} `nspr-config --cflags`" \
@@ -297,6 +303,10 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-4
+- Prevent crash even if no modules are installed (related to bug 444569)
+- Embed Vendor version information
+
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-3
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
 - Fix Group tag (bug 486452)



From mtasaka at fedoraproject.org  Thu Apr 16 18:10:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 16 Apr 2009 18:10:43 +0000 (UTC)
Subject: rpms/kazehakase/F-9
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch, NONE,
	1.1 kazehakase-0.5.6-rev3769-embed-vendor-version.patch, NONE,
	1.1 kazehakase.spec, 1.74, 1.75
Message-ID: <20090416181043.7B61D70137@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21762/F-9

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch 
	kazehakase-0.5.6-rev3769-embed-vendor-version.patch 
Log Message:
import 2 patches from devel

kazehakase-0.5.6-rev3769-crash-no_module_installed.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-crash-no_module_installed.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/kz-window.c.debug	2009-04-12 15:31:16.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/kz-window.c	2009-04-12 15:41:27.000000000 +0900
@@ -859,6 +859,7 @@
 	if (url) g_return_val_if_fail(g_utf8_validate(url, strlen(url), NULL), NULL);
 
 	kzembed = kz_window_create_embed(kz);
+	g_return_val_if_fail(kzembed, NULL);
 	kztab = KZ_TAB_LABEL(kz_tab_label_new(kz, kzembed));
 
 	gtk_widget_show_all(GTK_WIDGET(kzembed));

kazehakase-0.5.6-rev3769-embed-vendor-version.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-embed-vendor-version.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c.version	2009-01-28 04:25:07.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c	2009-04-12 18:01:15.000000000 +0900
@@ -95,7 +95,12 @@
 			GDK_RGB_DITHER_NORMAL,
 			0, 0);
 	/* Draw version and backends under the logo */
-	version = g_strdup_printf (_("Version %s"), VERSION);
+	version = g_strdup_printf (_("Version %s"), 
+#ifdef VERSION_VENDOR
+		VERSION_VENDOR);
+#else
+		VERSION);
+#endif
 	backends = backend_names();
 	if (backends)
 	{


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kazehakase.spec	11 Apr 2009 19:12:37 -0000	1.74
+++ kazehakase.spec	16 Apr 2009 18:10:13 -0000	1.75
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -53,6 +53,8 @@
 # kazehakase crashed when only kazehakase-webkit is installed
 # (bug 444569)
 Patch12:	kazehakase-0.5.6-crash-only_webkit_installed.patch
+Patch13:	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch
+Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -73,13 +75,13 @@
 BuildRequires:	ruby
 %endif
 %if %{support_webkit}
-BuildRequires:	WebKit-gtk-devel
-%endif 	
+BuildRequires:	WebKit-gtk-devel %{?min_webkit_EVR:>= %{min_webkit_EVR}}
+%endif
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-Requires:	%{name}-base 	= %{version}-%{release}
+Requires:	%{name}-base	= %{version}-%{release}
 
 # GLib version dependency
 # Borrowed from pidgin spec file
@@ -182,6 +184,8 @@
 %patch11 -p0 -b .rhbug
 %endif
 %patch12 -p1 -b .onlywebkit
+%patch13 -p1 -b .nomodule
+%patch14 -p1 -b .evr
 
 %if %{need_autogen}
 sh autogen.sh
@@ -198,6 +202,8 @@
 done
 
 %build
+export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
+
 %configure \
 %if 0%{?fedora} >= 9
 	CC="%{__cc} `nspr-config --cflags`" \
@@ -297,6 +303,10 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-4
+- Prevent crash even if no modules are installed (related to bug 444569)
+- Embed Vendor version information
+
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-3
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
 - Fix Group tag (bug 486452)



From katzj at fedoraproject.org  Thu Apr 16 18:12:00 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 16 Apr 2009 18:12:00 +0000 (UTC)
Subject: rpms/syslinux/F-11 .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 syslinux.spec, 1.58, 1.59
Message-ID: <20090416181200.CE12070127@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/syslinux/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22081

Modified Files:
	.cvsignore sources syslinux.spec 
Log Message:
* Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 3.75-1
- update to 3.75



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Apr 2009 02:36:18 -0000	1.25
+++ .cvsignore	16 Apr 2009 18:11:30 -0000	1.26
@@ -1 +1 @@
-syslinux-3.74.tar.bz2
+syslinux-3.75.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Apr 2009 02:36:18 -0000	1.26
+++ sources	16 Apr 2009 18:11:30 -0000	1.27
@@ -1 +1 @@
-2154fee98c34bc1bd5a14f5d6f4e1f77  syslinux-3.74.tar.bz2
+daddab10857b73c08d7278da4fdb0781  syslinux-3.75.tar.bz2


Index: syslinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/F-11/syslinux.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- syslinux.spec	13 Apr 2009 02:36:18 -0000	1.58
+++ syslinux.spec	16 Apr 2009 18:11:30 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 3.74
-%define tarball_version 3.74
+Version: 3.75
+%define tarball_version 3.75
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -84,6 +84,9 @@
 %{_datadir}/syslinux/com32
 
 %changelog
+* Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 3.75-1
+- update to 3.75
+
 * Fri Apr 10 2009 Jeremy Katz <katzj at redhat.com> - 3.74-1
 - update to 3.74
 



From toshio at fedoraproject.org  Thu Apr 16 18:18:00 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 16 Apr 2009 18:18:00 +0000 (UTC)
Subject: rpms/python-migrate/devel python-migrate-disable-test_fk.patch, 1.1,
	NONE
Message-ID: <20090416181800.6779170127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-migrate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23595

Removed Files:
	python-migrate-disable-test_fk.patch 
Log Message:
Removing obsolete patch.



--- python-migrate-disable-test_fk.patch DELETED ---



From limb at fedoraproject.org  Thu Apr 16 18:21:12 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 16 Apr 2009 18:21:12 +0000 (UTC)
Subject: rpms/argyllcms/devel argyllcms-1.0.3-autotools.patch, NONE,
	1.1 argyllcms.spec, 1.9, 1.10
Message-ID: <20090416182112.E3EA470127@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24194

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-1.0.3-autotools.patch 
Log Message:
Apply previous patch.  Not actually applied!
Add patch to allow make check to succeed.


argyllcms-1.0.3-autotools.patch:

--- NEW FILE argyllcms-1.0.3-autotools.patch ---
=== modified file 'gamut/Makefile.am'
--- gamut/Makefile.am	2008-11-16 13:51:27 +0000
+++ gamut/Makefile.am	2009-04-16 07:52:09 +0000
@@ -6,8 +6,7 @@
 
 libgammap_a_SOURCES = gammap.h gammap.c nearsmth.c nearsmth.h
 
-LDADD=./libgamut.a ./libgammap.a ../numlib/libargyllnum.a ../icc/libicc.a \
-	../cgats/libcgats.a  ../rspl/librspl.a ../plot/libvrml.a ../xicc/libxicc.a
+LDADD=./libgamut.a ./libgammap.a ../icc/libicc.a ../cgats/libcgats.a  ../rspl/librspl.a ../plot/libvrml.a ../xicc/libxicc.a ../numlib/libargyllnum.a
 
 bin_PROGRAMS = viewgam
 check_PROGRAMS = smthtest GenRMGam GenVisGam maptest surftest

=== modified file 'imdi/Makefile.am'
--- imdi/Makefile.am	2008-11-16 13:51:27 +0000
+++ imdi/Makefile.am	2009-04-16 07:54:07 +0000
@@ -13,6 +13,7 @@
 greytiff_LDFLAGS=$(BINLDFLAGS)
 
 check_PROGRAMS = ctest
+ctest_SOURCES = ctest.c cgen.c
 
 noinst_PROGRAMS = imdi_make
 imdi_make_SOURCES = imdi_make.c imdi_gen.c cgen.c



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- argyllcms.spec	8 Apr 2009 14:25:46 -0000	1.9
+++ argyllcms.spec	16 Apr 2009 18:20:42 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 4%{?alphatag}%{?dist}
+Release: 5%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -20,6 +20,7 @@
 Patch4:  %{name}-1.0.2-legal.patch
 Patch5: argyllcms-CVE-2009-0583,0584.patch
 Patch6: argyllcms-CVE-2009-0792.patch
+Patch7: argyllcms-1.0.3-autotools.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -67,6 +68,8 @@
 # Legal patch required
 %patch4 -p1 -b .legal
 %patch5 -p0
+%patch6 -p0
+%patch7 -p0
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -81,6 +84,8 @@
 %configure
 make
 
+%check
+make check
 
 %install
 rm -rf %{buildroot}
@@ -118,6 +123,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-5
+- Actually *apply* previous patch.
+- Autotools patch from debian to allow for make check.
+
 * Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
 - Patch for ICC library CVE-2009-0792.
 



From toshio at fedoraproject.org  Thu Apr 16 18:21:40 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 16 Apr 2009 18:21:40 +0000 (UTC)
Subject: rpms/python-migrate/F-11 .cvsignore, 1.5,
	1.6 python-migrate-sqlalchemy-migrate.patch, 1.2,
	1.3 python-migrate.spec, 1.10, 1.11 sources, 1.5,
	1.6 python-migrate-disable-test_fk.patch, 1.1, NONE
Message-ID: <20090416182140.A673E70127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-migrate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24377

Modified Files:
	.cvsignore python-migrate-sqlalchemy-migrate.patch 
	python-migrate.spec sources 
Removed Files:
	python-migrate-disable-test_fk.patch 
Log Message:

* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.3-1
- Update to new bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2009 17:36:07 -0000	1.5
+++ .cvsignore	16 Apr 2009 18:21:10 -0000	1.6
@@ -1 +1 @@
-sqlalchemy-migrate-0.5.1.2.tar.gz
+sqlalchemy-migrate-0.5.3.tar.gz

python-migrate-sqlalchemy-migrate.patch:

Index: python-migrate-sqlalchemy-migrate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/F-11/python-migrate-sqlalchemy-migrate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-migrate-sqlalchemy-migrate.patch	28 Jan 2009 01:51:00 -0000	1.2
+++ python-migrate-sqlalchemy-migrate.patch	16 Apr 2009 18:21:10 -0000	1.3
@@ -1,8 +1,7 @@
-Index: sqlalchemy-migrate-0.5.1.dev-r479/setup.py
-===================================================================
---- sqlalchemy-migrate-0.5.1.dev-r479.orig/setup.py
-+++ sqlalchemy-migrate-0.5.1.dev-r479/setup.py
-@@ -31,8 +31,8 @@ Migrate extends SQLAlchemy to have datab
+diff -up sqlalchemy-migrate-0.5.3/setup.py.bak sqlalchemy-migrate-0.5.3/setup.py
+--- sqlalchemy-migrate-0.5.3/setup.py.bak	2009-04-16 10:52:18.000000000 -0700
++++ sqlalchemy-migrate-0.5.3/setup.py	2009-04-16 10:52:43.000000000 -0700
+@@ -40,8 +40,8 @@ Migrate extends SQLAlchemy to have datab
  
      entry_points = """
      [console_scripts]
@@ -12,4 +11,4 @@
 +    sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
      """,
      test_suite = "nose.collector",
- )
+     tests_require = test_requirements,


Index: python-migrate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/F-11/python-migrate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-migrate.spec	26 Feb 2009 22:23:18 -0000	1.10
+++ python-migrate.spec	16 Apr 2009 18:21:10 -0000	1.11
@@ -3,8 +3,8 @@
 %define srcname sqlalchemy-migrate
 
 Name: python-migrate
-Version: 0.5.1.2
-Release: 3%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
 Group: Development/Languages
@@ -13,8 +13,6 @@
 Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
 Patch0: python-migrate-sqlalchemy-migrate.patch
-# Disable one unittest for now.  In the future we want this to work
-Patch1: python-migrate-disable-test_fk.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,8 +34,6 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .rename
-# Try removing this patch on every update
-%patch1 -p1 -b .disable-test
 
 %build
 %{__python} setup.py build
@@ -60,6 +56,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.3-1
+- Update to new bugfix release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2009 17:36:07 -0000	1.5
+++ sources	16 Apr 2009 18:21:10 -0000	1.6
@@ -1 +1 @@
-547d692b1ab58186535a0e41aef4b378  sqlalchemy-migrate-0.5.1.2.tar.gz
+8ce48470efac8cbcdf4ee9af725efd70  sqlalchemy-migrate-0.5.3.tar.gz


--- python-migrate-disable-test_fk.patch DELETED ---



From toshio at fedoraproject.org  Thu Apr 16 18:21:43 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 16 Apr 2009 18:21:43 +0000 (UTC)
Subject: rpms/python-sqlalchemy/F-11 .cvsignore, 1.25,
	1.26 python-sqlalchemy.spec, 1.40, 1.41 sources, 1.26, 1.27
Message-ID: <20090416182143.D4EC570127@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24420

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:

* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
- Upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Feb 2009 16:44:37 -0000	1.25
+++ .cvsignore	16 Apr 2009 18:21:13 -0000	1.26
@@ -1 +1 @@
-SQLAlchemy-0.5.2.tar.gz
+SQLAlchemy-0.5.3.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-11/python-sqlalchemy.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- python-sqlalchemy.spec	26 Feb 2009 23:33:59 -0000	1.40
+++ python-sqlalchemy.spec	16 Apr 2009 18:21:13 -0000	1.41
@@ -4,8 +4,8 @@
 %define srcname SQLAlchemy
 
 Name:           python-sqlalchemy
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
+- Upstream bugfix release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	11 Feb 2009 16:44:37 -0000	1.26
+++ sources	16 Apr 2009 18:21:13 -0000	1.27
@@ -1 +1 @@
-616893cbfb7b04a4f0ca9587bded3a1c  SQLAlchemy-0.5.2.tar.gz
+8a03ac93aa28a9f4ea5ecc0557e90954  SQLAlchemy-0.5.3.tar.gz



From steved at fedoraproject.org  Thu Apr 16 18:34:04 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 16 Apr 2009 18:34:04 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-nfs41-30-rc2.patch, NONE,
	1.1.2.1 config-generic, 1.280, 1.280.6.1 kernel.spec, 1.1520,
	1.1520.2.1
Message-ID: <20090416183404.7F2BD70127@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28148

Modified Files:
      Tag: kernel-2_6_30-nfs41_rc2_041609
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_30-nfs41_rc2_041609
	linux-2.6-nfs41-30-rc2.patch 
Log Message:
Updated to latest nfs41 code (tag: v2.6.30-rc2)


linux-2.6-nfs41-30-rc2.patch:

--- NEW FILE linux-2.6-nfs41-30-rc2.patch ---
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 8dd6db7..f15621e 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -66,6 +66,10 @@ mandatory-locking.txt
 	- info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
 	- info on Novell Netware(tm) filesystem using NCP protocol.
+nfs41-server.txt
+	- info on the Linux server implementation of NFSv4 minor version 1.
+nfs-rdma.txt
+	- how to install and setup the Linux NFS/RDMA client and server software.
 nfsroot.txt
 	- short guide on setting up a diskless box with NFS root filesystem.
 nilfs2.txt
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index e67f3ec..5d6d6f4 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -74,6 +74,15 @@ config NFS_V4
 
 	  If unsure, say N.
 
+config NFS_V4_1
+	bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)"
+	depends on NFS_V4 && EXPERIMENTAL
+	help
+	  This option enables support for minor version 1 of the NFSv4 protocol
+	  (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client.
+
+	  Unless you're an NFS developer, say N.
+
 config ROOT_NFS
 	bool "Root file system on NFS"
 	depends on NFS_FS=y && IP_PNP
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index a886e69..19e11b0 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -17,6 +17,9 @@
 #include <linux/freezer.h>
 #include <linux/kthread.h>
 #include <linux/sunrpc/svcauth_gss.h>
+#if defined(CONFIG_NFS_V4_1)
+#include <linux/sunrpc/bc_xprt.h>
+#endif
 
 #include <net/inet_sock.h>
 
@@ -28,11 +31,12 @@
 
 struct nfs_callback_data {
 	unsigned int users;
+	struct svc_serv *serv;
 	struct svc_rqst *rqst;
 	struct task_struct *task;
 };
 
-static struct nfs_callback_data nfs_callback_info;
+static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1];
 static DEFINE_MUTEX(nfs_callback_mutex);
 static struct svc_program nfs4_callback_program;
 
@@ -56,10 +60,10 @@ module_param_call(callback_tcpport, param_set_port, param_get_int,
 		 &nfs_callback_set_tcpport, 0644);
 
 /*
- * This is the callback kernel thread.
+ * This is the NFSv4 callback kernel thread.
  */
 static int
-nfs_callback_svc(void *vrqstp)
+nfs4_callback_svc(void *vrqstp)
 {
 	int err, preverr = 0;
 	struct svc_rqst *rqstp = vrqstp;
@@ -97,20 +101,12 @@ nfs_callback_svc(void *vrqstp)
 }
 
 /*
- * Bring up the callback thread if it is not already up.
+ * Prepare to bring up the NFSv4 callback service
  */
-int nfs_callback_up(void)
+struct svc_rqst *
+nfs4_callback_up(struct svc_serv *serv)
 {
-	struct svc_serv *serv = NULL;
-	int ret = 0;
-
-	mutex_lock(&nfs_callback_mutex);
-	if (nfs_callback_info.users++ || nfs_callback_info.task != NULL)
-		goto out;
-	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
-	ret = -ENOMEM;
-	if (!serv)
-		goto out_err;
+	int ret;
 
 	ret = svc_create_xprt(serv, "tcp", PF_INET,
 				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
@@ -131,23 +127,149 @@ int nfs_callback_up(void)
 		goto out_err;
 #endif	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
 
-	nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]);
-	if (IS_ERR(nfs_callback_info.rqst)) {
-		ret = PTR_ERR(nfs_callback_info.rqst);
-		nfs_callback_info.rqst = NULL;
+	return svc_prepare_thread(serv, &serv->sv_pools[0]);
+
+out_err:
+	if (ret == 0)
+		ret = -ENOMEM;
+	return ERR_PTR(ret);
+}
+
+#if defined(CONFIG_NFS_V4_1)
+/*
+ * The callback service for NFSv4.1 callbacks
+ */
+static int
+nfs41_callback_svc(void *vrqstp)
+{
+	struct svc_rqst *rqstp = vrqstp;
+	struct svc_serv *serv = rqstp->rq_server;
+	struct rpc_rqst *req;
+	int error;
+	DEFINE_WAIT(wq);
+
+	set_freezable();
+
+	/*
+	 * FIXME: do we really need to run this under the BKL? If so, please
+	 * add a comment about what it's intended to protect.
+	 */
+	lock_kernel();
+	while (!kthread_should_stop()) {
+		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);
+		spin_lock_bh(&serv->sv_cb_lock);
+		if (!list_empty(&serv->sv_cb_list)) {
+			req = list_first_entry(&serv->sv_cb_list,
+					struct rpc_rqst, rq_bc_list);
+			list_del(&req->rq_bc_list);
+			spin_unlock_bh(&serv->sv_cb_lock);
+			dprintk("Invoking bc_svc_process()\n");
+			error = bc_svc_process(serv, req, rqstp);
+			dprintk("bc_svc_process() returned w/ error code= %d\n",
+				error);
+		} else {
+			spin_unlock_bh(&serv->sv_cb_lock);
+			schedule();
+		}
+		finish_wait(&serv->sv_cb_waitq, &wq);
+	}
+	unlock_kernel();
+	return 0;
+}
+
+/*
+ * Bring up the NFSv4.1 callback service
+ */
+struct svc_rqst *
+nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt)
+{
+	struct svc_xprt *bc_xprt;
+	struct svc_rqst *rqstp = ERR_PTR(-ENOMEM);
+
+	dprintk("--> %s\n", __func__);
+	/* Create a svc_sock for the service */
+	bc_xprt = svc_sock_create(serv, xprt->prot);
+	if (!bc_xprt)
+		goto out;
+
+	/*
+	 * Save the svc_serv in the transport so that it can
+	 * be referenced when the session backchannel is initialized
+	 */
+	serv->bc_xprt = bc_xprt;
+	xprt->bc_serv = serv;
+
+	INIT_LIST_HEAD(&serv->sv_cb_list);
+	spin_lock_init(&serv->sv_cb_lock);
+	init_waitqueue_head(&serv->sv_cb_waitq);
+	rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]);
+	if (IS_ERR(rqstp))
+		svc_sock_destroy(bc_xprt);
+out:
+	dprintk("--> %s return %p\n", __func__, rqstp);
+	return rqstp;
+}
+#endif /* CONFIG_NFS_V4_1 */
+
+/*
+ * Bring up the callback thread if it is not already up.
+ */
+int nfs_callback_up(u32 minorversion, void *args)
+{
+	struct svc_serv *serv = NULL;
[...9078 lines suppressed...]
+	len = sock->ops->sendpage(sock, virt_to_page(xbufp->head[0].iov_base),
+			(unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK,
+			xbufp->head[0].iov_len, flags);
+
+	if (len != xbufp->head[0].iov_len)
+		goto out;
+
+	/*
+	 * send page data
+	 *
+	 * Check the amount of data to be sent. If it is less than the
+	 * remaining page, then send it else send the current page
+	 */
+
+	size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen;
+	while (pglen > 0) {
+		if (total_len == size)
+			flags = 0;
+		result = sock->ops->sendpage(sock, *pages, base, size, flags);
+		if (result > 0)
+			len += result;
+		if (result != size)
+			goto out;
+		total_len -= size;
+		pglen -= size;
+		size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen;
+		base = 0;
+		pages++;
+	}
+	/*
+	 * send tail
+	 */
+	if (xbufp->tail[0].iov_len) {
+		result = sock->ops->sendpage(sock,
+			xbufp->tail[0].iov_base,
+			(unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK,
+			xbufp->tail[0].iov_len,
+			0);
+
+		if (result > 0)
+			len += result;
+	}
+out:
+	if (len != xbufp->len)
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct rpc_xprt *bc_xprt = req->rq_xprt;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	svsk = bc_xprt->bc_sock;
+	xprt = &svsk->sk_xprt;
+
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	return 0;
+
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -1994,11 +2359,32 @@ static struct rpc_xprt_ops xs_tcp_ops = {
 	.buf_free		= rpc_free,
 	.send_request		= xs_tcp_send_request,
 	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+#if defined(CONFIG_NFS_V4_1)
+	.release_request	= bc_release_request,
+#endif /* CONFIG_NFS_V4_1 */
 	.close			= xs_tcp_shutdown,
 	.destroy		= xs_destroy,
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.set_port		= bc_set_port,
+	.connect		= bc_connect,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2131,13 +2517,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_sock) {
+		/* backchannel */
+		xprt_set_bound(xprt);
+		INIT_DELAYED_WORK(&transport->connect_worker,
+				  bc_connect_worker);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_sock = args->bc_sock;
+		xprt->bc_sock->sk_bc_xprt = xprt;
+		transport->sock = xprt->bc_sock->sk_sock;
+		transport->inet = xprt->bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		goto next;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2145,13 +2547,29 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
+		break;
+	}
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+next:
+	xprt->timeout = &xs_tcp_default_timeout;
+
+	switch (addr->sa_family) {
+	case AF_INET:
+		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		break;
+	case AF_INET6:
 		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
 		break;
 	default:


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.280
retrieving revision 1.280.6.1
diff -u -r1.280 -r1.280.6.1
--- config-generic	14 Apr 2009 15:12:28 -0000	1.280
+++ config-generic	16 Apr 2009 18:33:33 -0000	1.280.6.1
@@ -3156,6 +3156,10 @@
 # CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
+#
+# Needed for NFS41
+CONFIG_NFS_V4_1=y
+#
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1520
retrieving revision 1.1520.2.1
diff -u -r1.1520 -r1.1520.2.1
--- kernel.spec	16 Apr 2009 15:50:01 -0000	1.1520
+++ kernel.spec	16 Apr 2009 18:33:33 -0000	1.1520.2.1
@@ -12,7 +12,7 @@
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .nfs41_041709
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -86,7 +86,7 @@
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
@@ -678,6 +678,7 @@
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
 Patch9210: linux-2.6.29-pat-fixes.patch
 
+Patch9300: linux-2.6-nfs41-30-rc2.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1231,6 +1232,7 @@
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
 
+ApplyPatch linux-2.6-nfs41-30-rc2.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1824,6 +1826,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 16 2009 Steve Dickson <steved at redhat.com> 2.6.30-rc2-nfs41_041608
+- Updated to latest nfs41 code (tag: v2.6.30-rc2)
+
 * Thu Apr 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.58.rc2.git1
 - 2.6.30-rc2-git1
 



From limb at fedoraproject.org  Thu Apr 16 18:50:28 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 16 Apr 2009 18:50:28 +0000 (UTC)
Subject: rpms/argyllcms/devel argyllcms.spec,1.10,1.11
Message-ID: <20090416185028.A089670127@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32244

Modified Files:
	argyllcms.spec 
Log Message:
Apply patch.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- argyllcms.spec	16 Apr 2009 18:20:42 -0000	1.10
+++ argyllcms.spec	16 Apr 2009 18:49:58 -0000	1.11
@@ -20,7 +20,6 @@
 Patch4:  %{name}-1.0.2-legal.patch
 Patch5: argyllcms-CVE-2009-0583,0584.patch
 Patch6: argyllcms-CVE-2009-0792.patch
-Patch7: argyllcms-1.0.3-autotools.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -69,7 +68,6 @@
 %patch4 -p1 -b .legal
 %patch5 -p0
 %patch6 -p0
-%patch7 -p0
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -84,9 +82,6 @@
 %configure
 make
 
-%check
-make check
-
 %install
 rm -rf %{buildroot}
 
@@ -125,7 +120,6 @@
 %changelog
 * Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-5
 - Actually *apply* previous patch.
-- Autotools patch from debian to allow for make check.
 
 * Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
 - Patch for ICC library CVE-2009-0792.



From dwalsh at fedoraproject.org  Thu Apr 16 18:53:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 16 Apr 2009 18:53:30 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.415,
	1.416 policycoreutils.spec, 1.602, 1.603
Message-ID: <20090416185330.3956F70127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv866

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-11
- Add semanage module support


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- policycoreutils-rhat.patch	14 Apr 2009 13:40:09 -0000	1.415
+++ policycoreutils-rhat.patch	16 Apr 2009 18:53:29 -0000	1.416
@@ -160,8 +160,15 @@
  fi
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/semanage	2009-04-08 21:39:50.000000000 -0400
-@@ -50,7 +50,7 @@
++++ policycoreutils-2.0.62/semanage/semanage	2009-04-16 14:46:41.000000000 -0400
+@@ -44,16 +44,17 @@
+                text = _("""
+ semanage [ -S store ] -i [ input_file | - ]
+ 
+-semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
++semanage {module,boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
+ semanage login -{a|d|m} [-sr] login_name | %groupname
+ semanage user -{a|d|m} [-LrRP] selinux_name
  semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
  semanage interface -{a|d|m} [-tr] interface_spec
  semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
@@ -169,8 +176,21 @@
 +semanage fcontext -{a|d|m} [-frst] [-e path ] file_spec
  semanage translation -{a|d|m} [-T] level
  semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
- semanage permissive -{d|a} type
-@@ -84,6 +84,7 @@
+-semanage permissive -{d|a} type
++semanage permissive -{a|d} type
++semanage module -{a|d|} module
+ 
+ Primary Options:
+ 
+@@ -68,6 +69,7 @@
+ 	-h, --help       Display this message
+ 	-n, --noheading  Do not print heading when listing OBJECTS
+         -S, --store      Select and alternate SELinux store to manage
++        --dontaudit      Turn on or off dontaudit rules
+ 
+ Object-specific Options (see above):
+ 
+@@ -84,6 +86,7 @@
          -F, --file       Treat target as an input file for command, change multiple settings
  	-p, --proto      Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
  	-M, --mask       Netmask
@@ -178,7 +198,7 @@
  	-P, --prefix     Prefix for home directory labeling
  	-L, --level      Default SELinux Level (MLS/MCS Systems only)
  	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")
-@@ -115,7 +116,7 @@
+@@ -115,11 +118,14 @@
  		valid_option["node"] = []
  		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
  		valid_option["fcontext"] = []
@@ -187,15 +207,25 @@
  		valid_option["translation"] = []
  		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
  		valid_option["boolean"] = []
-@@ -192,6 +193,7 @@
+ 		valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] 
++		valid_option["module"] = []
++		valid_option["module"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '--dontaudit']
++
+ 		valid_option["permissive"] = []
+ 		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
+ 		return valid_option
+@@ -192,7 +198,10 @@
  		locallist = False
  		use_file = False
                  store = ""
 +                equil=""
  			
++                dontaudit = ""
++
  		object = argv[0]
  		option_dict=get_options()
-@@ -201,10 +203,11 @@
+ 		if object not in option_dict.keys():
+@@ -201,10 +210,12 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
@@ -204,21 +234,69 @@
  					    ['add',
  					     'delete',
  					     'deleteall',
++					     'dontaudit=',
 +					     'equil=',
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -248,6 +251,9 @@
+@@ -241,16 +252,24 @@
+ 				if modify or add:
+                                        raise ValueError(_("%s bad option") % o)
+ 				delete = True
++
+ 			if o == "-D"  or o == "--deleteall":
+ 				if modify:
+                                        raise ValueError(_("%s bad option") % o)
+ 				deleteall = True
++
  			if o == "-f"  or o == "--ftype":
- 				ftype=a
- 
-+			if o == "-e"  or o == "--equil":
-+				equil=a
+-				ftype=a
++				ftype = a
 +
++			if o == "-e"  or o == "--equil":
++				equil = a
+ 
  			if o == "-F"  or o == "--file":
  				use_file = True
  
-@@ -366,7 +372,10 @@
++			if o == "--dontaudit":
++                                dontaudit = a
++
+ 			if o == "-h" or o == "--help":
+                                raise ValueError(_("%s bad option") % o)
+ 
+@@ -323,6 +342,9 @@
+ 		
+ 		if object == "boolean":
+ 			OBJECT = seobject.booleanRecords(store)
++
++		if object == "module":
++			OBJECT = seobject.moduleRecords(store)
+ 		
+ 		if object == "translation":
+ 			OBJECT = seobject.setransRecords()
+@@ -341,6 +363,13 @@
+ 			OBJECT.deleteall()
+                         return
+ 			
++		if dontaudit != "":
++			if object == "module":
++                               OBJECT.dontaudit(dontaudit)
++                        else:
++                               raise ValueError(_("%s bad option") % o)
++                        return
++
+ 		if len(cmds) != 1:
+                        raise ValueError(_("%s bad option") % o)
+                         
+@@ -362,11 +391,17 @@
+ 			if object == "interface":
+ 				OBJECT.add(target, serange, setype)
+ 
++			if object == "module":
++				OBJECT.add(target)
++
+ 			if object == "node":
  				OBJECT.add(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -230,7 +308,17 @@
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -396,7 +405,10 @@
+@@ -386,6 +421,9 @@
+ 				rlist = roles.split()
+ 				OBJECT.modify(target, rlist, selevel, serange, prefix)
+ 
++			if object == "module":
++				OBJECT.modify(target)
++
+ 			if object == "port":
+ 				OBJECT.modify(target, proto, serange, setype)
+ 
+@@ -396,7 +434,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -242,7 +330,7 @@
  
                          return
  
-@@ -405,7 +417,7 @@
+@@ -405,7 +446,7 @@
  				OBJECT.delete(target, proto)
  
  			elif object == "fcontext":
@@ -251,7 +339,7 @@
  
  			elif object == "node":
  				OBJECT.delete(target, mask, proto)
-@@ -464,10 +476,10 @@
+@@ -464,10 +505,10 @@
                        else:
                               fd = open(input, 'r')
                        trans = seobject.semanageRecords(store)
@@ -264,9 +352,21 @@
                 else:
                        process_args(sys.argv[1:])
  			
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.62/semanage/semanage.8
+--- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.62/semanage/semanage.8	2009-04-16 13:51:38.000000000 -0400
+@@ -21,6 +21,8 @@
+ .br
+ .B semanage permissive \-{a|d} type
+ .br
++.B semanage module \-{a|d} policy_package
++.br
+ .B semanage translation \-{a|d|m} [\-T] level
+ .P
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-11 08:13:02.000000000 -0400
++++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-16 14:46:58.000000000 -0400
 @@ -21,16 +21,16 @@
  #
  #  
@@ -386,7 +486,7 @@
          def begin(self):
                 if self.transaction:
                        return
-@@ -303,6 +309,12 @@
+@@ -303,6 +309,55 @@
                 if rc < 0:
                        raise ValueError(_("Could not commit semanage transaction"))
  
@@ -396,10 +496,53 @@
 +               self.transaction = False
 +               self.commit()
 +
++class moduleRecords(semanageRecords):
++	def __init__(self, store):
++               semanageRecords.__init__(self, store)
++
++	def get_all(self):
++               l = []
++               (rc, mlist, number) = semanage_module_list(self.sh)
++               if rc < 0:
++                      raise ValueError(_("Could not list SELinux modules"))
++
++               for i in range(number):
++                      mod = semanage_module_list_nth(mlist, i)
++                      name = semanage_module_get_name(mod)
++                      l.append(name)
++               return l
++
++	def dontaudit(self, dontaudit = 0):
++               self.begin()
++               rc = semanage_set_disable_dontaudit(self.sh, int(dontaudit))
++               self.commit()
++               rc = semanage_reload_policy(self.sh)
++
++	def list(self, heading = 1, locallist = 0):
++		if heading:
++			print "\n%-25s\n" % (_("Modules"))
++                for t in self.get_all():
++                       print t
++
++	def add(self, modules):
++               import glob
++               for m in modules.split():
++                      rc = semanage_module_install_file(self.sh, m);
++               if rc >= 0:
++                      self.commit()
++
++	def delete(self, modules):
++               for m in modules.split():
++                      rc = semanage_module_remove(self.sh, m)
++                      if rc < 0:
++                             raise ValueError(_("Could not remove module %s (remove failed)") % name)
++                      
++               self.commit()
++			
  class permissiveRecords(semanageRecords):
  	def __init__(self, store):
                 semanageRecords.__init__(self, store)
-@@ -320,7 +332,7 @@
+@@ -320,7 +375,7 @@
                               l.append(name.split("permissive_")[1])
                 return l
  
@@ -408,7 +551,7 @@
  		if heading:
  			print "\n%-25s\n" % (_("Permissive Types"))
                  for t in self.get_all():
-@@ -328,6 +340,7 @@
+@@ -328,6 +383,7 @@
  
  
  	def add(self, type):
@@ -416,7 +559,7 @@
                 name = "permissive_%s" % type
                 dirname = "/var/lib/selinux"
                 os.chdir(dirname)
-@@ -341,7 +354,7 @@
+@@ -341,7 +397,7 @@
  
  permissive %s;
  """ % (name, type, type)
@@ -425,7 +568,7 @@
                 fd.write(modtxt)
                 fd.close()
                 mc = module.ModuleCompiler()
-@@ -351,16 +364,19 @@
+@@ -351,16 +407,19 @@
                 fd.close()
  
                 rc = semanage_module_install(self.sh, data, len(data));
@@ -450,7 +593,7 @@
  
  	def delete(self, name):
                 for n in name.split():
-@@ -390,11 +406,11 @@
+@@ -390,11 +449,11 @@
  		if sename == "":
  			sename = "user_u"
  			
@@ -464,7 +607,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
  		if exists:
-@@ -410,7 +426,7 @@
+@@ -410,7 +469,7 @@
                         except:
                                raise ValueError(_("Linux User %s does not exist") % name)
  
@@ -473,7 +616,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not create login mapping for %s") % name)
  
-@@ -450,17 +466,17 @@
+@@ -450,17 +509,17 @@
                 if sename == "" and serange == "":
                        raise ValueError(_("Requires seuser or serange"))
  
@@ -494,7 +637,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not query seuser for %s") % name)
  
-@@ -483,7 +499,7 @@
+@@ -483,7 +542,7 @@
                 semanage_seuser_key_free(k)
                 semanage_seuser_free(u)
  
@@ -503,7 +646,7 @@
  
  	def modify(self, name, sename = "", serange = ""):
  		try:
-@@ -492,21 +508,21 @@
+@@ -492,21 +551,21 @@
                          self.commit()
  
  		except ValueError, error:
@@ -529,7 +672,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not check if login mapping for %s is defined") % name)
                 if not exists:
-@@ -525,10 +541,10 @@
+@@ -525,10 +584,10 @@
                         self.commit()
  
  		except ValueError, error:
@@ -542,7 +685,7 @@
  
  	def get_all(self, locallist = 0):
  		ddict = {}
-@@ -578,17 +594,17 @@
+@@ -578,17 +637,17 @@
                  if len(roles) < 1:
                         raise ValueError(_("You must add at least one role for %s") % name)
                         
@@ -563,7 +706,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not create SELinux user for %s") % name)
  
-@@ -612,7 +628,7 @@
+@@ -612,7 +671,7 @@
                  rc = semanage_user_set_prefix(self.sh, u, prefix)
                  if rc < 0:
                         raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
@@ -572,7 +715,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not extract key for %s") % name)
  
-@@ -645,17 +661,17 @@
+@@ -645,17 +704,17 @@
                         else:
                                raise ValueError(_("Requires prefix or roles"))
  
@@ -593,7 +736,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not query user for %s") % name)
  
-@@ -703,17 +719,17 @@
+@@ -703,17 +762,17 @@
  			raise error
  
  	def __delete(self, name):
@@ -614,7 +757,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
                 if not exists:
-@@ -795,7 +811,7 @@
+@@ -795,7 +854,7 @@
  			low = int(ports[0])
  			high = int(ports[1])
  
@@ -623,7 +766,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
  		return ( k, proto_d, low, high )
-@@ -812,13 +828,13 @@
+@@ -812,13 +871,13 @@
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)			
  
@@ -639,7 +782,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create port for %s/%s") % (proto, port))
  		
-@@ -871,13 +887,13 @@
+@@ -871,13 +930,13 @@
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)
  
@@ -655,7 +798,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not query port %s/%s") % (proto, port))
  
-@@ -926,13 +942,13 @@
+@@ -926,13 +985,13 @@
  
  	def __delete(self, port, proto):
  		( k, proto_d, low, high ) = self.__genkey(port, proto)
@@ -671,7 +814,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
  		if not exists:
-@@ -1038,17 +1054,17 @@
+@@ -1038,17 +1097,17 @@
                 if ctype == "":
                         raise ValueError(_("SELinux Type is required"))
  
@@ -692,7 +835,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not create addr for %s") % addr)
  
-@@ -1113,17 +1129,17 @@
+@@ -1113,17 +1172,17 @@
                 if serange == "" and setype == "":
                         raise ValueError(_("Requires setype or serange"))
  
@@ -713,7 +856,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not query addr %s") % addr)
  
-@@ -1160,17 +1176,17 @@
+@@ -1160,17 +1219,17 @@
                 else:
                        raise ValueError(_("Unknown or missing protocol"))
  
@@ -734,7 +877,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not check if addr %s is defined") % addr)
                 if not exists:
-@@ -1240,17 +1256,17 @@
+@@ -1240,17 +1299,17 @@
  		if ctype == "":
  			raise ValueError(_("SELinux Type is required"))
  
@@ -755,7 +898,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create interface for %s") % interface)
  		
-@@ -1301,17 +1317,17 @@
+@@ -1301,17 +1360,17 @@
  		if serange == "" and setype == "":
  			raise ValueError(_("Requires setype or serange"))
  
@@ -776,7 +919,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not query interface %s") % interface)
  
-@@ -1335,17 +1351,17 @@
+@@ -1335,17 +1394,17 @@
                  self.commit()
  
  	def __delete(self, interface):
@@ -797,7 +940,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if interface %s is defined") % interface)
  		if not exists:
-@@ -1393,6 +1409,45 @@
+@@ -1393,6 +1452,45 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
@@ -843,7 +986,7 @@
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1429,23 +1484,23 @@
+@@ -1429,23 +1527,23 @@
  		if type == "":
  			raise ValueError(_("SELinux Type is required"))
  
@@ -871,7 +1014,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create file context for %s") % target)
  		
-@@ -1486,21 +1541,21 @@
+@@ -1486,21 +1584,21 @@
  			raise ValueError(_("Requires setype, serange or seuser"))
                  self.validate(target)
  
@@ -898,7 +1041,7 @@
                         if rc < 0:
                                raise ValueError(_("Could not query file context for %s") % target)
  
-@@ -1550,7 +1605,7 @@
+@@ -1550,7 +1648,7 @@
                         target = semanage_fcontext_get_expr(fcontext)
                         ftype = semanage_fcontext_get_type(fcontext)
                         ftype_str = semanage_fcontext_get_type_str(ftype)
@@ -907,7 +1050,7 @@
                         if rc < 0:
                                raise ValueError(_("Could not create a key for %s") % target)
  
-@@ -1558,19 +1613,26 @@
+@@ -1558,19 +1656,26 @@
                         if rc < 0:
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
@@ -938,7 +1081,7 @@
  			if rc < 0:
  				raise ValueError(_("Could not check if file context for %s is defined") % target)
  			if exists:
-@@ -1617,11 +1679,11 @@
+@@ -1617,11 +1722,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -952,7 +1095,7 @@
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1630,11 +1692,17 @@
+@@ -1630,11 +1735,17 @@
  					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
  			else:
  				print "%-50s %-18s <<None>>" % (k[0], k[1])
@@ -971,7 +1114,7 @@
                  self.dict["TRUE"] = 1
                  self.dict["FALSE"] = 0
                  self.dict["ON"] = 1
-@@ -1643,16 +1711,16 @@
+@@ -1643,16 +1754,16 @@
                  self.dict["0"] = 0
  
  	def __mod(self, name, value):
@@ -991,7 +1134,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not query file context %s") % name)
  
-@@ -1670,7 +1738,7 @@
+@@ -1670,7 +1781,7 @@
  		semanage_bool_key_free(k)
  		semanage_bool_free(b)
  
@@ -1000,7 +1143,7 @@
                  
                  self.begin()
  
-@@ -1694,16 +1762,16 @@
+@@ -1694,16 +1805,16 @@
  		
  	def __delete(self, name):
  
@@ -1020,7 +1163,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if boolean %s is defined") % name)
  		if not exists:
-@@ -1762,7 +1830,7 @@
+@@ -1762,7 +1873,7 @@
                        return _("unknown")
  
  	def list(self, heading = True, locallist = False, use_file = False):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -r1.602 -r1.603
--- policycoreutils.spec	14 Apr 2009 13:40:12 -0000	1.602
+++ policycoreutils.spec	16 Apr 2009 18:53:29 -0000	1.603
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-11
+- Add semanage module support
+
 * Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10
 - Do not print \n, if count < 1000;
 



From dwalsh at fedoraproject.org  Thu Apr 16 18:56:05 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 16 Apr 2009 18:56:05 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.415,
	1.416 policycoreutils.spec, 1.602, 1.603
Message-ID: <20090416185605.48B0570127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1632

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-11
- Add semanage module support


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- policycoreutils-rhat.patch	14 Apr 2009 13:40:09 -0000	1.415
+++ policycoreutils-rhat.patch	16 Apr 2009 18:56:02 -0000	1.416
@@ -160,8 +160,15 @@
  fi
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/semanage	2009-04-08 21:39:50.000000000 -0400
-@@ -50,7 +50,7 @@
++++ policycoreutils-2.0.62/semanage/semanage	2009-04-16 14:46:41.000000000 -0400
+@@ -44,16 +44,17 @@
+                text = _("""
+ semanage [ -S store ] -i [ input_file | - ]
+ 
+-semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
++semanage {module,boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
+ semanage login -{a|d|m} [-sr] login_name | %groupname
+ semanage user -{a|d|m} [-LrRP] selinux_name
  semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
  semanage interface -{a|d|m} [-tr] interface_spec
  semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
@@ -169,8 +176,21 @@
 +semanage fcontext -{a|d|m} [-frst] [-e path ] file_spec
  semanage translation -{a|d|m} [-T] level
  semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
- semanage permissive -{d|a} type
-@@ -84,6 +84,7 @@
+-semanage permissive -{d|a} type
++semanage permissive -{a|d} type
++semanage module -{a|d|} module
+ 
+ Primary Options:
+ 
+@@ -68,6 +69,7 @@
+ 	-h, --help       Display this message
+ 	-n, --noheading  Do not print heading when listing OBJECTS
+         -S, --store      Select and alternate SELinux store to manage
++        --dontaudit      Turn on or off dontaudit rules
+ 
+ Object-specific Options (see above):
+ 
+@@ -84,6 +86,7 @@
          -F, --file       Treat target as an input file for command, change multiple settings
  	-p, --proto      Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
  	-M, --mask       Netmask
@@ -178,7 +198,7 @@
  	-P, --prefix     Prefix for home directory labeling
  	-L, --level      Default SELinux Level (MLS/MCS Systems only)
  	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")
-@@ -115,7 +116,7 @@
+@@ -115,11 +118,14 @@
  		valid_option["node"] = []
  		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
  		valid_option["fcontext"] = []
@@ -187,15 +207,25 @@
  		valid_option["translation"] = []
  		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
  		valid_option["boolean"] = []
-@@ -192,6 +193,7 @@
+ 		valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] 
++		valid_option["module"] = []
++		valid_option["module"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '--dontaudit']
++
+ 		valid_option["permissive"] = []
+ 		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
+ 		return valid_option
+@@ -192,7 +198,10 @@
  		locallist = False
  		use_file = False
                  store = ""
 +                equil=""
  			
++                dontaudit = ""
++
  		object = argv[0]
  		option_dict=get_options()
-@@ -201,10 +203,11 @@
+ 		if object not in option_dict.keys():
+@@ -201,10 +210,12 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
@@ -204,21 +234,69 @@
  					    ['add',
  					     'delete',
  					     'deleteall',
++					     'dontaudit=',
 +					     'equil=',
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -248,6 +251,9 @@
+@@ -241,16 +252,24 @@
+ 				if modify or add:
+                                        raise ValueError(_("%s bad option") % o)
+ 				delete = True
++
+ 			if o == "-D"  or o == "--deleteall":
+ 				if modify:
+                                        raise ValueError(_("%s bad option") % o)
+ 				deleteall = True
++
  			if o == "-f"  or o == "--ftype":
- 				ftype=a
- 
-+			if o == "-e"  or o == "--equil":
-+				equil=a
+-				ftype=a
++				ftype = a
 +
++			if o == "-e"  or o == "--equil":
++				equil = a
+ 
  			if o == "-F"  or o == "--file":
  				use_file = True
  
-@@ -366,7 +372,10 @@
++			if o == "--dontaudit":
++                                dontaudit = a
++
+ 			if o == "-h" or o == "--help":
+                                raise ValueError(_("%s bad option") % o)
+ 
+@@ -323,6 +342,9 @@
+ 		
+ 		if object == "boolean":
+ 			OBJECT = seobject.booleanRecords(store)
++
++		if object == "module":
++			OBJECT = seobject.moduleRecords(store)
+ 		
+ 		if object == "translation":
+ 			OBJECT = seobject.setransRecords()
+@@ -341,6 +363,13 @@
+ 			OBJECT.deleteall()
+                         return
+ 			
++		if dontaudit != "":
++			if object == "module":
++                               OBJECT.dontaudit(dontaudit)
++                        else:
++                               raise ValueError(_("%s bad option") % o)
++                        return
++
+ 		if len(cmds) != 1:
+                        raise ValueError(_("%s bad option") % o)
+                         
+@@ -362,11 +391,17 @@
+ 			if object == "interface":
+ 				OBJECT.add(target, serange, setype)
+ 
++			if object == "module":
++				OBJECT.add(target)
++
+ 			if object == "node":
  				OBJECT.add(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -230,7 +308,17 @@
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -396,7 +405,10 @@
+@@ -386,6 +421,9 @@
+ 				rlist = roles.split()
+ 				OBJECT.modify(target, rlist, selevel, serange, prefix)
+ 
++			if object == "module":
++				OBJECT.modify(target)
++
+ 			if object == "port":
+ 				OBJECT.modify(target, proto, serange, setype)
+ 
+@@ -396,7 +434,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -242,7 +330,7 @@
  
                          return
  
-@@ -405,7 +417,7 @@
+@@ -405,7 +446,7 @@
  				OBJECT.delete(target, proto)
  
  			elif object == "fcontext":
@@ -251,7 +339,7 @@
  
  			elif object == "node":
  				OBJECT.delete(target, mask, proto)
-@@ -464,10 +476,10 @@
+@@ -464,10 +505,10 @@
                        else:
                               fd = open(input, 'r')
                        trans = seobject.semanageRecords(store)
@@ -264,9 +352,21 @@
                 else:
                        process_args(sys.argv[1:])
  			
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.62/semanage/semanage.8
+--- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.62/semanage/semanage.8	2009-04-16 13:51:38.000000000 -0400
+@@ -21,6 +21,8 @@
+ .br
+ .B semanage permissive \-{a|d} type
+ .br
++.B semanage module \-{a|d} policy_package
++.br
+ .B semanage translation \-{a|d|m} [\-T] level
+ .P
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-11 08:13:02.000000000 -0400
++++ policycoreutils-2.0.62/semanage/seobject.py	2009-04-16 14:46:58.000000000 -0400
 @@ -21,16 +21,16 @@
  #
  #  
@@ -386,7 +486,7 @@
          def begin(self):
                 if self.transaction:
                        return
-@@ -303,6 +309,12 @@
+@@ -303,6 +309,55 @@
                 if rc < 0:
                        raise ValueError(_("Could not commit semanage transaction"))
  
@@ -396,10 +496,53 @@
 +               self.transaction = False
 +               self.commit()
 +
++class moduleRecords(semanageRecords):
++	def __init__(self, store):
++               semanageRecords.__init__(self, store)
++
++	def get_all(self):
++               l = []
++               (rc, mlist, number) = semanage_module_list(self.sh)
++               if rc < 0:
++                      raise ValueError(_("Could not list SELinux modules"))
++
++               for i in range(number):
++                      mod = semanage_module_list_nth(mlist, i)
++                      name = semanage_module_get_name(mod)
++                      l.append(name)
++               return l
++
++	def dontaudit(self, dontaudit = 0):
++               self.begin()
++               rc = semanage_set_disable_dontaudit(self.sh, int(dontaudit))
++               self.commit()
++               rc = semanage_reload_policy(self.sh)
++
++	def list(self, heading = 1, locallist = 0):
++		if heading:
++			print "\n%-25s\n" % (_("Modules"))
++                for t in self.get_all():
++                       print t
++
++	def add(self, modules):
++               import glob
++               for m in modules.split():
++                      rc = semanage_module_install_file(self.sh, m);
++               if rc >= 0:
++                      self.commit()
++
++	def delete(self, modules):
++               for m in modules.split():
++                      rc = semanage_module_remove(self.sh, m)
++                      if rc < 0:
++                             raise ValueError(_("Could not remove module %s (remove failed)") % name)
++                      
++               self.commit()
++			
  class permissiveRecords(semanageRecords):
  	def __init__(self, store):
                 semanageRecords.__init__(self, store)
-@@ -320,7 +332,7 @@
+@@ -320,7 +375,7 @@
                               l.append(name.split("permissive_")[1])
                 return l
  
@@ -408,7 +551,7 @@
  		if heading:
  			print "\n%-25s\n" % (_("Permissive Types"))
                  for t in self.get_all():
-@@ -328,6 +340,7 @@
+@@ -328,6 +383,7 @@
  
  
  	def add(self, type):
@@ -416,7 +559,7 @@
                 name = "permissive_%s" % type
                 dirname = "/var/lib/selinux"
                 os.chdir(dirname)
-@@ -341,7 +354,7 @@
+@@ -341,7 +397,7 @@
  
  permissive %s;
  """ % (name, type, type)
@@ -425,7 +568,7 @@
                 fd.write(modtxt)
                 fd.close()
                 mc = module.ModuleCompiler()
-@@ -351,16 +364,19 @@
+@@ -351,16 +407,19 @@
                 fd.close()
  
                 rc = semanage_module_install(self.sh, data, len(data));
@@ -450,7 +593,7 @@
  
  	def delete(self, name):
                 for n in name.split():
-@@ -390,11 +406,11 @@
+@@ -390,11 +449,11 @@
  		if sename == "":
  			sename = "user_u"
  			
@@ -464,7 +607,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
  		if exists:
-@@ -410,7 +426,7 @@
+@@ -410,7 +469,7 @@
                         except:
                                raise ValueError(_("Linux User %s does not exist") % name)
  
@@ -473,7 +616,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not create login mapping for %s") % name)
  
-@@ -450,17 +466,17 @@
+@@ -450,17 +509,17 @@
                 if sename == "" and serange == "":
                        raise ValueError(_("Requires seuser or serange"))
  
@@ -494,7 +637,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not query seuser for %s") % name)
  
-@@ -483,7 +499,7 @@
+@@ -483,7 +542,7 @@
                 semanage_seuser_key_free(k)
                 semanage_seuser_free(u)
  
@@ -503,7 +646,7 @@
  
  	def modify(self, name, sename = "", serange = ""):
  		try:
-@@ -492,21 +508,21 @@
+@@ -492,21 +551,21 @@
                          self.commit()
  
  		except ValueError, error:
@@ -529,7 +672,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not check if login mapping for %s is defined") % name)
                 if not exists:
-@@ -525,10 +541,10 @@
+@@ -525,10 +584,10 @@
                         self.commit()
  
  		except ValueError, error:
@@ -542,7 +685,7 @@
  
  	def get_all(self, locallist = 0):
  		ddict = {}
-@@ -578,17 +594,17 @@
+@@ -578,17 +637,17 @@
                  if len(roles) < 1:
                         raise ValueError(_("You must add at least one role for %s") % name)
                         
@@ -563,7 +706,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not create SELinux user for %s") % name)
  
-@@ -612,7 +628,7 @@
+@@ -612,7 +671,7 @@
                  rc = semanage_user_set_prefix(self.sh, u, prefix)
                  if rc < 0:
                         raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
@@ -572,7 +715,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not extract key for %s") % name)
  
-@@ -645,17 +661,17 @@
+@@ -645,17 +704,17 @@
                         else:
                                raise ValueError(_("Requires prefix or roles"))
  
@@ -593,7 +736,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not query user for %s") % name)
  
-@@ -703,17 +719,17 @@
+@@ -703,17 +762,17 @@
  			raise error
  
  	def __delete(self, name):
@@ -614,7 +757,7 @@
                 if rc < 0:
                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
                 if not exists:
-@@ -795,7 +811,7 @@
+@@ -795,7 +854,7 @@
  			low = int(ports[0])
  			high = int(ports[1])
  
@@ -623,7 +766,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
  		return ( k, proto_d, low, high )
-@@ -812,13 +828,13 @@
+@@ -812,13 +871,13 @@
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)			
  
@@ -639,7 +782,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create port for %s/%s") % (proto, port))
  		
-@@ -871,13 +887,13 @@
+@@ -871,13 +930,13 @@
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)
  
@@ -655,7 +798,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not query port %s/%s") % (proto, port))
  
-@@ -926,13 +942,13 @@
+@@ -926,13 +985,13 @@
  
  	def __delete(self, port, proto):
  		( k, proto_d, low, high ) = self.__genkey(port, proto)
@@ -671,7 +814,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
  		if not exists:
-@@ -1038,17 +1054,17 @@
+@@ -1038,17 +1097,17 @@
                 if ctype == "":
                         raise ValueError(_("SELinux Type is required"))
  
@@ -692,7 +835,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not create addr for %s") % addr)
  
-@@ -1113,17 +1129,17 @@
+@@ -1113,17 +1172,17 @@
                 if serange == "" and setype == "":
                         raise ValueError(_("Requires setype or serange"))
  
@@ -713,7 +856,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not query addr %s") % addr)
  
-@@ -1160,17 +1176,17 @@
+@@ -1160,17 +1219,17 @@
                 else:
                        raise ValueError(_("Unknown or missing protocol"))
  
@@ -734,7 +877,7 @@
                 if rc < 0:
                         raise ValueError(_("Could not check if addr %s is defined") % addr)
                 if not exists:
-@@ -1240,17 +1256,17 @@
+@@ -1240,17 +1299,17 @@
  		if ctype == "":
  			raise ValueError(_("SELinux Type is required"))
  
@@ -755,7 +898,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create interface for %s") % interface)
  		
-@@ -1301,17 +1317,17 @@
+@@ -1301,17 +1360,17 @@
  		if serange == "" and setype == "":
  			raise ValueError(_("Requires setype or serange"))
  
@@ -776,7 +919,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not query interface %s") % interface)
  
-@@ -1335,17 +1351,17 @@
+@@ -1335,17 +1394,17 @@
                  self.commit()
  
  	def __delete(self, interface):
@@ -797,7 +940,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if interface %s is defined") % interface)
  		if not exists:
-@@ -1393,6 +1409,45 @@
+@@ -1393,6 +1452,45 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
@@ -843,7 +986,7 @@
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1429,23 +1484,23 @@
+@@ -1429,23 +1527,23 @@
  		if type == "":
  			raise ValueError(_("SELinux Type is required"))
  
@@ -871,7 +1014,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not create file context for %s") % target)
  		
-@@ -1486,21 +1541,21 @@
+@@ -1486,21 +1584,21 @@
  			raise ValueError(_("Requires setype, serange or seuser"))
                  self.validate(target)
  
@@ -898,7 +1041,7 @@
                         if rc < 0:
                                raise ValueError(_("Could not query file context for %s") % target)
  
-@@ -1550,7 +1605,7 @@
+@@ -1550,7 +1648,7 @@
                         target = semanage_fcontext_get_expr(fcontext)
                         ftype = semanage_fcontext_get_type(fcontext)
                         ftype_str = semanage_fcontext_get_type_str(ftype)
@@ -907,7 +1050,7 @@
                         if rc < 0:
                                raise ValueError(_("Could not create a key for %s") % target)
  
-@@ -1558,19 +1613,26 @@
+@@ -1558,19 +1656,26 @@
                         if rc < 0:
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
@@ -938,7 +1081,7 @@
  			if rc < 0:
  				raise ValueError(_("Could not check if file context for %s is defined") % target)
  			if exists:
-@@ -1617,11 +1679,11 @@
+@@ -1617,11 +1722,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -952,7 +1095,7 @@
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1630,11 +1692,17 @@
+@@ -1630,11 +1735,17 @@
  					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
  			else:
  				print "%-50s %-18s <<None>>" % (k[0], k[1])
@@ -971,7 +1114,7 @@
                  self.dict["TRUE"] = 1
                  self.dict["FALSE"] = 0
                  self.dict["ON"] = 1
-@@ -1643,16 +1711,16 @@
+@@ -1643,16 +1754,16 @@
                  self.dict["0"] = 0
  
  	def __mod(self, name, value):
@@ -991,7 +1134,7 @@
                  if rc < 0:
                         raise ValueError(_("Could not query file context %s") % name)
  
-@@ -1670,7 +1738,7 @@
+@@ -1670,7 +1781,7 @@
  		semanage_bool_key_free(k)
  		semanage_bool_free(b)
  
@@ -1000,7 +1143,7 @@
                  
                  self.begin()
  
-@@ -1694,16 +1762,16 @@
+@@ -1694,16 +1805,16 @@
  		
  	def __delete(self, name):
  
@@ -1020,7 +1163,7 @@
  		if rc < 0:
  			raise ValueError(_("Could not check if boolean %s is defined") % name)
  		if not exists:
-@@ -1762,7 +1830,7 @@
+@@ -1762,7 +1873,7 @@
                        return _("unknown")
  
  	def list(self, heading = True, locallist = False, use_file = False):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -r1.602 -r1.603
--- policycoreutils.spec	14 Apr 2009 13:40:12 -0000	1.602
+++ policycoreutils.spec	16 Apr 2009 18:56:04 -0000	1.603
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-11
+- Add semanage module support
+
 * Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10
 - Do not print \n, if count < 1000;
 



From dwalsh at fedoraproject.org  Thu Apr 16 19:06:37 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 16 Apr 2009 19:06:37 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 policycoreutils.spec,1.603,1.604
Message-ID: <20090416190637.EB91F70127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4996

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12
- Add semanage module support



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -r1.603 -r1.604
--- policycoreutils.spec	16 Apr 2009 18:56:04 -0000	1.603
+++ policycoreutils.spec	16 Apr 2009 19:06:07 -0000	1.604
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,7 +221,7 @@
 fi
 
 %changelog
-* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-11
+* Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12
 - Add semanage module support
 
 * Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10



From limb at fedoraproject.org  Thu Apr 16 19:07:52 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 16 Apr 2009 19:07:52 +0000 (UTC)
Subject: rpms/argyllcms/F-10 argyllcms.spec,1.8,1.9
Message-ID: <20090416190752.03E0C70127@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236/F-10

Modified Files:
	argyllcms.spec 
Log Message:
Apply patch.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-10/argyllcms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- argyllcms.spec	8 Apr 2009 14:40:08 -0000	1.8
+++ argyllcms.spec	16 Apr 2009 19:07:21 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 4%{?alphatag}%{?dist}
+Release: 5%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -67,6 +67,7 @@
 # Legal patch required
 %patch4 -p1 -b .legal
 %patch5 -p0
+%patch6 -p0
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -81,7 +82,6 @@
 %configure
 make
 
-
 %install
 rm -rf %{buildroot}
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-5
+- Actually *apply* previous patch.
+
 * Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
 - Patch for ICC library CVE-2009-0792.
 



From limb at fedoraproject.org  Thu Apr 16 19:07:52 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 16 Apr 2009 19:07:52 +0000 (UTC)
Subject: rpms/argyllcms/F-11 argyllcms.spec,1.9,1.10
Message-ID: <20090416190752.9CC2970127@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236/F-11

Modified Files:
	argyllcms.spec 
Log Message:
Apply patch.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-11/argyllcms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- argyllcms.spec	8 Apr 2009 14:25:46 -0000	1.9
+++ argyllcms.spec	16 Apr 2009 19:07:21 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 4%{?alphatag}%{?dist}
+Release: 5%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -67,6 +67,7 @@
 # Legal patch required
 %patch4 -p1 -b .legal
 %patch5 -p0
+%patch6 -p0
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -81,7 +82,6 @@
 %configure
 make
 
-
 %install
 rm -rf %{buildroot}
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-5
+- Actually *apply* previous patch.
+
 * Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
 - Patch for ICC library CVE-2009-0792.
 



From limb at fedoraproject.org  Thu Apr 16 19:07:52 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 16 Apr 2009 19:07:52 +0000 (UTC)
Subject: rpms/argyllcms/F-9 argyllcms.spec,1.5,1.6
Message-ID: <20090416190752.BB55F70137@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/argyllcms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236/F-9

Modified Files:
	argyllcms.spec 
Log Message:
Apply patch.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-9/argyllcms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- argyllcms.spec	8 Apr 2009 14:40:08 -0000	1.5
+++ argyllcms.spec	16 Apr 2009 19:07:22 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.3
-Release: 4%{?alphatag}%{?dist}
+Release: 5%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -67,6 +67,7 @@
 # Legal patch required
 %patch4 -p1 -b .legal
 %patch5 -p0
+%patch6 -p0
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -81,7 +82,6 @@
 %configure
 make
 
-
 %install
 rm -rf %{buildroot}
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-5
+- Actually *apply* previous patch.
+
 * Wed Apr 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.0.3-4
 - Patch for ICC library CVE-2009-0792.
 



From jkratoch at fedoraproject.org  Thu Apr 16 19:09:40 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 16 Apr 2009 19:09:40 +0000 (UTC)
Subject: rpms/gdb/devel gdb-charset-crash.patch, NONE, 1.1 gdb.spec, 1.343,
	1.344
Message-ID: <20090416190940.3764B70127@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4662

Modified Files:
	gdb.spec 
Added Files:
	gdb-charset-crash.patch 
Log Message:
* Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-20
- Fix crash in the charset support.


gdb-charset-crash.patch:

--- NEW FILE gdb-charset-crash.patch ---
http://sourceware.org/ml/gdb-patches/2009-04/msg00356.html
http://sourceware.org/ml/gdb-cvs/2009-04/msg00081.html

gdb/
2009-04-15  Tom Tromey  <tromey at redhat.com>

	* c-lang.c (evaluate_subexp_c): Correctly handle EVAL_SKIP.

gdb/testsuite/
2009-04-15  Tom Tromey  <tromey at redhat.com>

	* gdb.base/charset.exp: Add regression test.

--- src/gdb/c-lang.c	2009/04/14 21:54:33	1.64
+++ src/gdb/c-lang.c	2009/04/15 21:55:04	1.65
@@ -941,7 +941,15 @@
 	*pos += 2;
 
 	if (noside == EVAL_SKIP)
-	  return NULL;
+	  {
+	    /* Return a dummy value of the appropriate type.  */
+	    if ((dest_type & C_CHAR) != 0)
+	      result = allocate_value (type);
+	    else
+	      result = value_typed_string ("", 0, type);
+	    do_cleanups (cleanup);
+	    return result;
+	  }
 
 	if ((dest_type & C_CHAR) != 0)
 	  {
--- src/gdb/testsuite/gdb.base/charset.exp	2009/03/25 19:25:49	1.13
+++ src/gdb/testsuite/gdb.base/charset.exp	2009/04/15 21:55:04	1.14
@@ -604,4 +604,9 @@
     test_combination u UCS-2 U UCS-4
 }
 
+# Regression test for a cleanup bug in the charset code.
+gdb_test "print 'a' == 'a' || 'b' == 'b'" \
+  ".* = 1" \
+  "EVAL_SKIP cleanup handling regression test"
+
 gdb_exit 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- gdb.spec	14 Apr 2009 22:17:59 -0000	1.343
+++ gdb.spec	16 Apr 2009 19:09:09 -0000	1.344
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 19%{?_with_upstream:.upstream}%{?dist}
+Release: 20%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -378,6 +378,9 @@
 # Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
 Patch357: gdb-c_get_string-xfree.patch
 
+# Fix crash in the charset support.
+Patch359: gdb-charset-crash.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -573,6 +576,7 @@
 %patch348 -p1
 %patch352 -p1
 %patch357 -p1
+%patch359 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -855,6 +859,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-20
+- Fix crash in the charset support.
+
 * Wed Apr 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-19
 - Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
 



From jkratoch at fedoraproject.org  Thu Apr 16 19:16:14 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 16 Apr 2009 19:16:14 +0000 (UTC)
Subject: rpms/gdb/F-11 gdb-charset-crash.patch, NONE, 1.1 gdb.spec, 1.343,
	1.344
Message-ID: <20090416191614.8A82C70127@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8022

Modified Files:
	gdb.spec 
Added Files:
	gdb-charset-crash.patch 
Log Message:
* Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-20
- Fix crash in the charset support.


gdb-charset-crash.patch:

--- NEW FILE gdb-charset-crash.patch ---
http://sourceware.org/ml/gdb-patches/2009-04/msg00356.html
http://sourceware.org/ml/gdb-cvs/2009-04/msg00081.html

gdb/
2009-04-15  Tom Tromey  <tromey at redhat.com>

	* c-lang.c (evaluate_subexp_c): Correctly handle EVAL_SKIP.

gdb/testsuite/
2009-04-15  Tom Tromey  <tromey at redhat.com>

	* gdb.base/charset.exp: Add regression test.

--- src/gdb/c-lang.c	2009/04/14 21:54:33	1.64
+++ src/gdb/c-lang.c	2009/04/15 21:55:04	1.65
@@ -941,7 +941,15 @@
 	*pos += 2;
 
 	if (noside == EVAL_SKIP)
-	  return NULL;
+	  {
+	    /* Return a dummy value of the appropriate type.  */
+	    if ((dest_type & C_CHAR) != 0)
+	      result = allocate_value (type);
+	    else
+	      result = value_typed_string ("", 0, type);
+	    do_cleanups (cleanup);
+	    return result;
+	  }
 
 	if ((dest_type & C_CHAR) != 0)
 	  {
--- src/gdb/testsuite/gdb.base/charset.exp	2009/03/25 19:25:49	1.13
+++ src/gdb/testsuite/gdb.base/charset.exp	2009/04/15 21:55:04	1.14
@@ -604,4 +604,9 @@
     test_combination u UCS-2 U UCS-4
 }
 
+# Regression test for a cleanup bug in the charset code.
+gdb_test "print 'a' == 'a' || 'b' == 'b'" \
+  ".* = 1" \
+  "EVAL_SKIP cleanup handling regression test"
+
 gdb_exit 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- gdb.spec	14 Apr 2009 22:17:59 -0000	1.343
+++ gdb.spec	16 Apr 2009 19:15:43 -0000	1.344
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 19%{?_with_upstream:.upstream}%{?dist}
+Release: 20%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -378,6 +378,9 @@
 # Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
 Patch357: gdb-c_get_string-xfree.patch
 
+# Fix crash in the charset support.
+Patch359: gdb-charset-crash.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -573,6 +576,7 @@
 %patch348 -p1
 %patch352 -p1
 %patch357 -p1
+%patch359 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -855,6 +859,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-20
+- Fix crash in the charset support.
+
 * Wed Apr 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-19
 - Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
 



From jkratoch at fedoraproject.org  Thu Apr 16 19:19:10 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 16 Apr 2009 19:19:10 +0000 (UTC)
Subject: rpms/gdb/F-11 gdb.spec,1.344,1.345
Message-ID: <20090416191910.1727570127@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8652

Modified Files:
	gdb.spec 
Log Message:
* Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-21
- Bump revision due to CVS tags mistake.



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- gdb.spec	16 Apr 2009 19:15:43 -0000	1.344
+++ gdb.spec	16 Apr 2009 19:18:39 -0000	1.345
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 20%{?_with_upstream:.upstream}%{?dist}
+Release: 21%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -859,6 +859,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-21
+- Bump revision due to CVS tags mistake.
+
 * Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-20
 - Fix crash in the charset support.
 



From jkeating at fedoraproject.org  Thu Apr 16 19:26:26 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 16 Apr 2009 19:26:26 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.188,1.189
Message-ID: <20090416192626.1844D70127@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10324

Modified Files:
	comps-f11.xml.in 
Log Message:
Fix a fonts name typo
Fix the gtk2-devel-docs typo



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- comps-f11.xml.in	16 Apr 2009 16:31:46 -0000	1.188
+++ comps-f11.xml.in	16 Apr 2009 19:25:55 -0000	1.189
@@ -2294,7 +2294,7 @@
       <packagereq type="default">gnome-devel-docs</packagereq>
       <packagereq type="default">gnome-panel-devel</packagereq>
       <packagereq type="default">gnome-pilot-devel</packagereq>
-      <packagereq type="default">gtk2-docs-devel</packagereq>
+      <packagereq type="default">gtk2-devel-docs</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
       <packagereq type="default">hal-devel</packagereq>
       <packagereq type="default">libgtop2-devel</packagereq>
@@ -3321,7 +3321,7 @@
       <packagereq type="default">khmeros-battambang-fonts</packagereq>
       <packagereq type="default">khmeros-bokor-fonts</packagereq>
       <packagereq type="default">khmeros-handwritten-fonts</packagereq>
-      <packagereq type="default">khmeros-metalchrieng-fonts</packagereq>
+      <packagereq type="default">khmeros-metal-chrieng-fonts</packagereq>
       <packagereq type="default">khmeros-muol-fonts</packagereq>
       <packagereq type="default">khmeros-siemreap-fonts</packagereq>
       <packagereq type="optional">m17n-db-khmer</packagereq>



From rdieter at fedoraproject.org  Thu Apr 16 19:35:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 19:35:18 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.52, 1.53 kde-settings.spec,
	1.70, 1.71 sources, 1.53, 1.54
Message-ID: <20090416193518.924A170127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12424/F-11

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-6.20090416
- update for leonidas-kde-theme



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	14 Apr 2009 15:05:19 -0000	1.52
+++ .cvsignore	16 Apr 2009 19:34:47 -0000	1.53
@@ -1 +1 @@
-kde-settings-4.2-20090414svn.tar.bz2
+kde-settings-4.2-20090416svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde-settings.spec	14 Apr 2009 15:05:19 -0000	1.70
+++ kde-settings.spec	16 Apr 2009 19:34:47 -0000	1.71
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090414svn
+%define rel 20090416svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 5.%{rel}%{?dist}
+Release: 6.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -29,8 +29,8 @@
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
-# Solar theme for wallpaper, KSplash
-Requires: solar-kde-theme
+# theme for kdm, KSplash, wallpaper
+Requires: leonidas-kde-theme
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -95,9 +95,7 @@
 touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
 
 %postun
-if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
-fi
 
 %pre kdm
 ## KDM fixup(s)
@@ -116,7 +114,7 @@
 # kdm v3 themes don't work (#444730)
 # this hack assumes %_datadir != %_kde4_datadir
 (grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/SolarMania|" \
+ sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/leonidas|" \
  %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
 
@@ -159,6 +157,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-6.20090416
+- update for leonidas-kde-theme
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-5.20090414
 - include kde-centric defaults.list
 - kcmnspluginrc: include nspluginwrapper paths (#495632)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	14 Apr 2009 15:05:19 -0000	1.53
+++ sources	16 Apr 2009 19:34:47 -0000	1.54
@@ -1 +1 @@
-5ac1efbebff93ea240a4da0a28209468  kde-settings-4.2-20090414svn.tar.bz2
+39bbab8d9be8e5a134f326f51f281bbb  kde-settings-4.2-20090416svn.tar.bz2



From rdieter at fedoraproject.org  Thu Apr 16 19:35:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 16 Apr 2009 19:35:18 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.52, 1.53 kde-settings.spec,
	1.70, 1.71 sources, 1.53, 1.54
Message-ID: <20090416193518.9FEE07013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12424/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-6.20090416
- update for leonidas-kde-theme



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	14 Apr 2009 15:05:19 -0000	1.52
+++ .cvsignore	16 Apr 2009 19:34:47 -0000	1.53
@@ -1 +1 @@
-kde-settings-4.2-20090414svn.tar.bz2
+kde-settings-4.2-20090416svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde-settings.spec	14 Apr 2009 15:05:19 -0000	1.70
+++ kde-settings.spec	16 Apr 2009 19:34:47 -0000	1.71
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090414svn
+%define rel 20090416svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 5.%{rel}%{?dist}
+Release: 6.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -29,8 +29,8 @@
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
-# Solar theme for wallpaper, KSplash
-Requires: solar-kde-theme
+# theme for kdm, KSplash, wallpaper
+Requires: leonidas-kde-theme
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -95,9 +95,7 @@
 touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
 
 %postun
-if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
-fi
 
 %pre kdm
 ## KDM fixup(s)
@@ -116,7 +114,7 @@
 # kdm v3 themes don't work (#444730)
 # this hack assumes %_datadir != %_kde4_datadir
 (grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/SolarMania|" \
+ sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/leonidas|" \
  %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
 
@@ -159,6 +157,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-6.20090416
+- update for leonidas-kde-theme
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-5.20090414
 - include kde-centric defaults.list
 - kcmnspluginrc: include nspluginwrapper paths (#495632)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	14 Apr 2009 15:05:19 -0000	1.53
+++ sources	16 Apr 2009 19:34:47 -0000	1.54
@@ -1 +1 @@
-5ac1efbebff93ea240a4da0a28209468  kde-settings-4.2-20090414svn.tar.bz2
+39bbab8d9be8e5a134f326f51f281bbb  kde-settings-4.2-20090416svn.tar.bz2



From steved at fedoraproject.org  Thu Apr 16 19:39:22 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 16 Apr 2009 19:39:22 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-pnfs-30-rc1.patch, NONE,
	1.1.4.2 config-generic, 1.280, 1.280.8.1 kernel.spec, 1.1520,
	1.1520.4.1
Message-ID: <20090416193922.1EC9E70127@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13866

Modified Files:
      Tag: kernel-2_6_30-pnfs_rc2_041609
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_30-pnfs_rc2_041609
	linux-2.6-pnfs-30-rc1.patch 
Log Message:
Updated to latest pnfs code (tag: v2.6.30-rc2)


linux-2.6-pnfs-30-rc1.patch:

--- NEW FILE linux-2.6-pnfs-30-rc1.patch ---
diff -up linux-2.6.29.noarch/Documentation/filesystems/00-INDEX.orig linux-2.6.29.noarch/Documentation/filesystems/00-INDEX
--- linux-2.6.29.noarch/Documentation/filesystems/00-INDEX.orig	2009-04-16 15:20:09.645309000 -0400
+++ linux-2.6.29.noarch/Documentation/filesystems/00-INDEX	2009-04-16 15:27:46.689755000 -0400
@@ -66,6 +66,10 @@ mandatory-locking.txt
 	- info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
 	- info on Novell Netware(tm) filesystem using NCP protocol.
+nfs41-server.txt
+	- info on the Linux server implementation of NFSv4 minor version 1.
+nfs-rdma.txt
+	- how to install and setup the Linux NFS/RDMA client and server software.
 nfsroot.txt
 	- short guide on setting up a diskless box with NFS root filesystem.
 nilfs2.txt
diff -up /dev/null linux-2.6.29.noarch/Documentation/spnfs.txt
--- /dev/null	2009-04-15 05:12:01.533001380 -0400
+++ linux-2.6.29.noarch/Documentation/spnfs.txt	2009-04-16 15:27:46.697755000 -0400
@@ -0,0 +1,210 @@
+(c) 2007 Network Appliance Inc.
+
+spNFS
+-----
+
+An spNFS system consists of a Meta Data Server (MDS), a number of Client machines (C) and a number of Data Servers (DS).
+
+A file system is mounted by the clients from the MDS, and all file data
+is striped across the DSs.
+
+Identify the machines that will be filling each of these roles.
+
+The spnfs kernel will be installed on all machines: clients, the MDS and DSs.
+
+
+Building and installing the spNFS kernel
+----------------------------------------
+
+Get the spNFS kernel from:
+
+	git://linux-nfs.org/~dmuntz/spnfs.git
+
+add these options to your .config file
+
+	CONFIG_NETWORK_FILESYSTEMS=y
+	CONFIG_NFS_FS=y
+	CONFIG_NFSD=y
+	CONFIG_NFS_V4_1=y
+	CONFIG_NFSD_V4_1=y
+	CONFIG_PNFS=y
+	CONFIG_PNFSD=y
+	CONFIG_SPNFS=y
+
+By default, spNFS uses whole-file layouts.  Layout segments can be enabled
+by adding:
+
+	CONFIG_SPNFS_LAYOUTSEGMENTS=y
+
+to your .config file.
+
+Building and installation of kernel+modules is as usual.
+This kernel should be installed and booted on the client, MDS and DSs.
+
+
+Building nfs-utils
+------------------
+
+Get the nfs-utils package containing spnfsd from:
+
+	git://linux-nfs.org/~dmuntz/nfs-utils.git
+
+Follow the standard instructions for building nfs-utils.  We HIGHLY recommend
+NOT doing an install of the binaries generated by this build.  You will only
+need the spnfsd binary generated by this build, and the spnfsd.conf template.
+
+After building, the spnfsd daemon will be located in utils/spnfsd.  The spnfsd
+daemon will only be needed on the MDS.
+
+
+Installation
+------------
+
+The nfs-utils package contains a default spnfsd.conf file in
+utils/spnfsd/spnfsd.conf.  Copy this file to /etc/spnfsd.conf.
+
+By default, the DS-Mount-Directory is set to /spnfs (see spnfsd.conf).  Under
+this directory, mount points must be created for each DS to
+be used for pNFS data stripes.  These mount points are named by the ip address
+of the corresponding DS.  In the sample spnfsd.conf, there are two
+DSs defined (172.16.28.134 and 172.16.28.141).
+
+Following the sample spnfsd.conf,
+
+	mkdir /spnfs
+
+on the MDS (corresponding to DS-Mount-Directory).  Then
+
+	mkdir /spnfs/172.16.28.134
+	mkdir /spnfs/172.16.28.141
+
+to create the mount points for the DSs.
+
+On the DSs, chose a directory where data stripes will be created by the MDS.
+For the sample file, this directory is /pnfs, so on each DS execute:
+
+	mkdir /pnfs
+
+This directory is specified in the spnfsd.conf file by the DS*_ROOT option
+(where * is replaced by the DS number).  DS_ROOT is specified relative to
+the directory being exported by the DSs.  In our example, our DSs are exporting
+the root directory (/) and therefore our DS_ROOT is /pnfs.  On the DSs, we have
+the following entry in /etc/exports:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+N.B. If we had created a /exports directory and a /pnfs directory under
+/exports, and if we were exporting /exports, then DS_ROOT would still be /pnfs
+(not /exports/pnfs).
+
+It may be useful to add entries to /etc/fstab on the MDS to automatically
+mount the DS_ROOT file systems.  For this example, our MDS fstab would
+contain:
+
+	172.17.84.128:/pnfs /spnfs/172.17.84.128 nfs    defaults        1 2
+	172.17.84.122:/pnfs /spnfs/172.17.84.122 nfs    defaults        1 2
+
+The DS mounts must be performed manually or via fstab at this time (automatic
+mounting, directory creation, etc. are on the todo list).  To perform I/O
+through the MDS, the DS mounts MUST use NFSv3 at this time (this restriction
+will eventually be removed).
+
+
+On the MDS, choose a file system to use with spNFS and export it, e.g.:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+Make sure nfsd and all supporting processes are running on the MDS and DSs.
+
+
+Running
+-------
+
+If rpc_pipefs is not already mounted (if you're running idmapd it probably is),
+you may want to add the following line to /etc/fstab:
+
+	rpc_pipefs    /var/lib/nfs/rpc_pipefs rpc_pipefs defaults     0 0
+
+to automatically mount rpc_pipefs.
+
+With spnfsd.conf configured for your environment and the mounts mounted as
+described above, spnfsd can now be started.
+
+On the MDS, execute spnfsd:
+
+	spnfsd
+
+The executable is located in the directory where it was built, and
+may also have been installed elsewhere depending on how you built nfs-utils.
+It will run in the foreground by default, and in fact will do so despite
+any options suggesting the contrary (it's still a debugging build).
+
+On the client, make sure the nfslayoutdriver module is loaded:
+
+	modprobe nfslayoutdriver
+
+Then mount the file system from the MDS:
+
+	mount -t nfs4 mds:/ /mnt
+
+I/O through the MDS is now supported.  To use it, do not load the
+nfslayoutdriver on the client, and mount the MDS using NFSv4 or 4.1
+(NFSv2 and v3 are not yet supported).
+
+You may now use spNFS by performing file system activities in /mnt.
+If you create files in /mnt, you should see stripe files corresponding to
+new files being created on the DSs.  The current implementation names the
+stripe files based on the inode number of the file on the MDS.  For example,
+if you create a file foo in /mnt and do an 'ls -li /mnt/foo':
+
+	# ls -li foo
+	1233 -rw-r--r-- 1 root root 0 Nov 29 15:54 foo
+
+You should see stripe files on each under /pnfs (per the sample) named
+1233.  The file /pnfs/1233 on DS1 will contain the first <stripe size> bytes
+of data written to foo, DS2 will contain the next <stripe size> bytes, etc.
+Removing /mnt/foo will remove the corresponding stripe files on the DSs.
+Other file system operations should behave (mostly :-) as expected.
+
+
+Layout Segments
+---------------
+
+If the kernel is compiled to support layout segments, there will
+be two files created under /proc/fs/spnfs for controlling layout
+segment functionality.
+
+To enable layout segments, write a '1' to /proc/fs/spnfs/layoutseg, e.g.:
+
+	echo 1 > /proc/fs/spnfs/layoutseg
+
+Layout segments can be disabled (returning to whole-file layouts) by
[...32034 lines suppressed...]
+	len = sock->ops->sendpage(sock, virt_to_page(xbufp->head[0].iov_base),
+			(unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK,
+			xbufp->head[0].iov_len, flags);
+
+	if (len != xbufp->head[0].iov_len)
+		goto out;
+
+	/*
+	 * send page data
+	 *
+	 * Check the amount of data to be sent. If it is less than the
+	 * remaining page, then send it else send the current page
+	 */
+
+	size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen;
+	while (pglen > 0) {
+		if (total_len == size)
+			flags = 0;
+		result = sock->ops->sendpage(sock, *pages, base, size, flags);
+		if (result > 0)
+			len += result;
+		if (result != size)
+			goto out;
+		total_len -= size;
+		pglen -= size;
+		size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen;
+		base = 0;
+		pages++;
+	}
+	/*
+	 * send tail
+	 */
+	if (xbufp->tail[0].iov_len) {
+		result = sock->ops->sendpage(sock,
+			xbufp->tail[0].iov_base,
+			(unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK,
+			xbufp->tail[0].iov_len,
+			0);
+
+		if (result > 0)
+			len += result;
+	}
+out:
+	if (len != xbufp->len)
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct rpc_xprt *bc_xprt = req->rq_xprt;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	svsk = bc_xprt->bc_sock;
+	xprt = &svsk->sk_xprt;
+
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	return 0;
+
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -1994,11 +2359,32 @@ static struct rpc_xprt_ops xs_tcp_ops = 
 	.buf_free		= rpc_free,
 	.send_request		= xs_tcp_send_request,
 	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+#if defined(CONFIG_NFS_V4_1)
+	.release_request	= bc_release_request,
+#endif /* CONFIG_NFS_V4_1 */
 	.close			= xs_tcp_shutdown,
 	.destroy		= xs_destroy,
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.set_port		= bc_set_port,
+	.connect		= bc_connect,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2131,13 +2517,29 @@ static struct rpc_xprt *xs_setup_tcp(str
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_sock) {
+		/* backchannel */
+		xprt_set_bound(xprt);
+		INIT_DELAYED_WORK(&transport->connect_worker,
+				  bc_connect_worker);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_sock = args->bc_sock;
+		xprt->bc_sock->sk_bc_xprt = xprt;
+		transport->sock = xprt->bc_sock->sk_sock;
+		transport->inet = xprt->bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		goto next;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2145,13 +2547,29 @@ static struct rpc_xprt *xs_setup_tcp(str
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
+		break;
+	}
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+next:
+	xprt->timeout = &xs_tcp_default_timeout;
+
+	switch (addr->sa_family) {
+	case AF_INET:
+		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		break;
+	case AF_INET6:
 		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
 		break;
 	default:


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.280
retrieving revision 1.280.8.1
diff -u -r1.280 -r1.280.8.1
--- config-generic	14 Apr 2009 15:12:28 -0000	1.280
+++ config-generic	16 Apr 2009 19:38:51 -0000	1.280.8.1
@@ -3156,6 +3156,20 @@
 # CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
+#
+# Needed for NFSv4.1
+CONFIG_NFS_V4_1=y
+#
+# Need for pNFS
+#
+CONFIG_PNFSD=y
+CONFIG_PNFS=y
+CONFIG_SPNFS=y
+CONFIG_PNFSD_LOCAL_EXPORT=y
+CONFIG_PNFS_PANLAYOUT=y
+CONFIG_PNFS_BLOCK=y
+CONFIG_SPNFS_LAYOUTSEGMENTS=y
+#
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1520
retrieving revision 1.1520.4.1
diff -u -r1.1520 -r1.1520.4.1
--- kernel.spec	16 Apr 2009 15:50:01 -0000	1.1520
+++ kernel.spec	16 Apr 2009 19:38:51 -0000	1.1520.4.1
@@ -12,7 +12,7 @@
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .pnfs_041709
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -86,7 +86,7 @@
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
@@ -678,6 +678,7 @@
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
 Patch9210: linux-2.6.29-pat-fixes.patch
 
+Patch9300: linux-2.6-pnfs-30-rc1.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1231,6 +1232,7 @@
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
 
+ApplyPatch linux-2.6-pnfs-30-rc1.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1824,6 +1826,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 16 2009 Steve Dickson <steved at redhat.com> 2.6.30-nfs_041709
+- Updated to latest pnfs code (tag: v2.6.30-rc2)
+
 * Thu Apr 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.58.rc2.git1
 - 2.6.30-rc2-git1
 



From caolanm at fedoraproject.org  Thu Apr 16 19:47:14 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 19:47:14 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, NONE,
	1.1 openoffice.org.spec, 1.1724, 1.1725
Message-ID: <20090416194714.AA81D70127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15515/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
Log Message:
Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch

openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -r1.1724 -r1.1725
--- openoffice.org.spec	8 Apr 2009 11:41:13 -0000	1.1724
+++ openoffice.org.spec	16 Apr 2009 19:46:43 -0000	1.1725
@@ -145,6 +145,7 @@
 Patch72: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch73: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch74: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
+Patch75: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1413,7 +1414,8 @@
 %patch71 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
 %patch72 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch74 -p0 -b .ooo100942.svtools.oversafeemf.patch
+%patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch75 -p1 -b .ooo101145.vcl.safe.dpi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3782,6 +3784,7 @@
 %changelog
 * Wed Apr 08 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
 - Resolves: rhbz#494643 EMF polypolygons issue
+- Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 * Mon Mar 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch



From caolanm at fedoraproject.org  Thu Apr 16 19:47:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 19:47:15 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, NONE,
	1.1 openoffice.org.spec, 1.1878, 1.1879
Message-ID: <20090416194715.BC6D770127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15515/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
Log Message:
Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch

openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1878
retrieving revision 1.1879
diff -u -r1.1878 -r1.1879
--- openoffice.org.spec	16 Apr 2009 12:25:57 -0000	1.1878
+++ openoffice.org.spec	16 Apr 2009 19:46:44 -0000	1.1879
@@ -135,6 +135,7 @@
 Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p1 -b .ooo100991.pyuno-fix.patch
 %patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,6 +4125,7 @@
 %changelog
 * Thu Apr 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
+- Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 * Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch



From caolanm at fedoraproject.org  Thu Apr 16 19:47:16 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 16 Apr 2009 19:47:16 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, NONE,
	1.1 openoffice.org-simple-crash_report.sh, 1.12,
	1.13 openoffice.org.spec, 1.1879, 1.1880
Message-ID: <20090416194716.55A3C70127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15515/devel

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
Log Message:
Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch

openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-simple-crash_report.sh	16 Apr 2009 08:42:14 -0000	1.12
+++ openoffice.org-simple-crash_report.sh	16 Apr 2009 19:46:45 -0000	1.13
@@ -16,12 +16,13 @@
 echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
 echo "(IX)   gtk theme is:" `gconftool-2 -g "/desktop/gnome/interface/gtk_theme"` >> $filename
 echo "(X)    icon theme is:" `gconftool-2 -g "/desktop/gnome/interface/icon_theme"` >> $filename
+echo "(XI)   metacity theme is:" `gconftool-2 -g "/apps/metacity/general/theme"` >> $filename
 if [ -e /etc/fedora-release ]; then
-echo "(XI)   fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(XII)  fedora release is:" `cat /etc/fedora-release` >> $filename
 elif [ -e /etc/redhat-release ]; then
-echo "(XI)   redhat release is:" `cat /etc/redhat-release` >> $filename
+echo "(XII)  redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
-echo "(XII)  LANG is: $LANG" >> $filename
+echo "(XIII) LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -r1.1879 -r1.1880
--- openoffice.org.spec	16 Apr 2009 12:25:58 -0000	1.1879
+++ openoffice.org.spec	16 Apr 2009 19:46:45 -0000	1.1880
@@ -135,6 +135,7 @@
 Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p1 -b .ooo100991.pyuno-fix.patch
 %patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch63 -p0 -b .ooo101145.vcl.safe.dpi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,6 +4125,7 @@
 %changelog
 * Thu Apr 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
+- Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 
 * Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch



From pwouters at fedoraproject.org  Thu Apr 16 19:59:50 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 16 Apr 2009 19:59:50 +0000 (UTC)
Subject: rpms/ldns/devel ldns.spec,1.40,1.41 sources,1.12,1.13
Message-ID: <20090416195950.72E1A70127@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18218

Modified Files:
	ldns.spec sources 
Log Message:
* Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-3
- Memory management bug when generating a sha256 key, see:
  https://bugzilla.redhat.com/show_bug.cgi?id=493953



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ldns.spec	25 Feb 2009 12:51:00 -0000	1.40
+++ ldns.spec	16 Apr 2009 19:59:19 -0000	1.41
@@ -1,10 +1,11 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
+Patch1: ldns-keygen-hmac-memory.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen,
@@ -31,6 +32,9 @@
 #libtoolize
 #autoreconf
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=493953
+%patch1
+
 %configure --disable-rpath --with-sha2
 
 %build
@@ -85,6 +89,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-3
+- Memory management bug when generating a sha256 key, see:
+  https://bugzilla.redhat.com/show_bug.cgi?id=493953
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Feb 2009 18:25:11 -0000	1.12
+++ sources	16 Apr 2009 19:59:20 -0000	1.13
@@ -1,2 +1 @@
-676c088b6a7e1ae0be16a16410fda805  ldns-1.5.0.tar.gz
 17f73def98711e1475409d9a8d5d9dcd  ldns-1.5.1.tar.gz



From maxamillion at fedoraproject.org  Thu Apr 16 20:03:18 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 16 Apr 2009 20:03:18 +0000 (UTC)
Subject: rpms/python-twyt/devel python-twyt-0.9.2-setdefault.patch, NONE,
	1.1 import.log, 1.3, 1.4 python-twyt.spec, 1.8, 1.9
Message-ID: <20090416200318.79B9670127@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-twyt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18978/devel

Modified Files:
	import.log python-twyt.spec 
Added Files:
	python-twyt-0.9.2-setdefault.patch 
Log Message:
Upstream bugfix for set default account



python-twyt-0.9.2-setdefault.patch:

--- NEW FILE python-twyt-0.9.2-setdefault.patch ---
=== modified file 'twyt/commands.py'
--- twyt/commands.py	2009-04-08 19:50:38 +0000
+++ twyt/commands.py	2009-04-16 12:30:05 +0000
@@ -772,7 +772,7 @@
 		if options.password and options.user:
 			base.config.set_password(options.user, options.password)
 			if options.default:
-				base.config.set_default(options.user)
+				base.config.set_default_account(options.user)
 		elif options.user:
 			newacc = False
 			if not base.config.have_account(options.user):



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	13 Apr 2009 13:59:25 -0000	1.3
+++ import.log	16 Apr 2009 20:02:47 -0000	1.4
@@ -1,3 +1,4 @@
 python-twyt-0_9_0-1_fc8:HEAD:python-twyt-0.9.0-1.fc8.src.rpm:1231753051
 python-twyt-0_9_1-1_fc10:HEAD:python-twyt-0.9.1-1.fc10.src.rpm:1235768993
 python-twyt-0_9_2-1:HEAD:python-twyt-0.9.2-1.src.rpm:1239631084
+python-twyt-0_9_2-2:HEAD:python-twyt-0.9.2-2.src.rpm:1239912137


Index: python-twyt.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/devel/python-twyt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-twyt.spec	13 Apr 2009 13:59:25 -0000	1.8
+++ python-twyt.spec	16 Apr 2009 20:02:47 -0000	1.9
@@ -3,11 +3,14 @@
 Summary: An interface to Twitter API functions for Python
 Name: python-twyt
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
+
 Group: System Environment/Libraries
 License: BSD
 URL: http://andrewprice.me.uk/projects/twyt/
 Source: http://andrewprice.me.uk/projects/twyt/download/twyt-%version.tar.gz
+Patch0: python-twyt-0.9.2-setdefault.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
 BuildRequires: python-devel
@@ -24,6 +27,7 @@
 
 %prep
 %setup -q -n twyt-%{version}
+%patch0 -p0 -b .setdefault
 
 %build
 python setup.py build
@@ -47,6 +51,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-2
+- Upstream released a patch to fix set default account bug
+
 * Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-1
 - New upstream release
 



From maxamillion at fedoraproject.org  Thu Apr 16 20:05:11 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 16 Apr 2009 20:05:11 +0000 (UTC)
Subject: rpms/python-twyt/F-11 python-twyt-0.9.2-setdefault.patch, NONE,
	1.1 import.log, 1.3, 1.4 python-twyt.spec, 1.8, 1.9
Message-ID: <20090416200511.C73517013C@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-twyt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19554/F-11

Modified Files:
	import.log python-twyt.spec 
Added Files:
	python-twyt-0.9.2-setdefault.patch 
Log Message:
Upstream bugfix for set default account



python-twyt-0.9.2-setdefault.patch:

--- NEW FILE python-twyt-0.9.2-setdefault.patch ---
=== modified file 'twyt/commands.py'
--- twyt/commands.py	2009-04-08 19:50:38 +0000
+++ twyt/commands.py	2009-04-16 12:30:05 +0000
@@ -772,7 +772,7 @@
 		if options.password and options.user:
 			base.config.set_password(options.user, options.password)
 			if options.default:
-				base.config.set_default(options.user)
+				base.config.set_default_account(options.user)
 		elif options.user:
 			newacc = False
 			if not base.config.have_account(options.user):



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	13 Apr 2009 13:59:25 -0000	1.3
+++ import.log	16 Apr 2009 20:04:40 -0000	1.4
@@ -1,3 +1,4 @@
 python-twyt-0_9_0-1_fc8:HEAD:python-twyt-0.9.0-1.fc8.src.rpm:1231753051
 python-twyt-0_9_1-1_fc10:HEAD:python-twyt-0.9.1-1.fc10.src.rpm:1235768993
 python-twyt-0_9_2-1:HEAD:python-twyt-0.9.2-1.src.rpm:1239631084
+python-twyt-0_9_2-2:F-11:python-twyt-0.9.2-2.src.rpm:1239912251


Index: python-twyt.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-11/python-twyt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-twyt.spec	13 Apr 2009 13:59:25 -0000	1.8
+++ python-twyt.spec	16 Apr 2009 20:04:40 -0000	1.9
@@ -3,11 +3,14 @@
 Summary: An interface to Twitter API functions for Python
 Name: python-twyt
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
+
 Group: System Environment/Libraries
 License: BSD
 URL: http://andrewprice.me.uk/projects/twyt/
 Source: http://andrewprice.me.uk/projects/twyt/download/twyt-%version.tar.gz
+Patch0: python-twyt-0.9.2-setdefault.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
 BuildRequires: python-devel
@@ -24,6 +27,7 @@
 
 %prep
 %setup -q -n twyt-%{version}
+%patch0 -p0 -b .setdefault
 
 %build
 python setup.py build
@@ -47,6 +51,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-2
+- Upstream released a patch to fix set default account bug
+
 * Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-1
 - New upstream release
 



From mcepl at fedoraproject.org  Thu Apr 16 20:07:54 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 16 Apr 2009 20:07:54 +0000 (UTC)
Subject: rpms/pyexiv2/devel .cvsignore, 1.3, 1.4 pyexiv2.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090416200754.1C72D70127@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/pyexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20914

Modified Files:
	.cvsignore pyexiv2.spec sources 
Log Message:
New upstream release (closes bug 494419)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jan 2009 17:00:23 -0000	1.3
+++ .cvsignore	16 Apr 2009 20:07:23 -0000	1.4
@@ -1 +1 @@
-pyexiv2.tar.bz2
+pyexiv2-0.1.3.tar.bz2


Index: pyexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/pyexiv2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyexiv2.spec	26 Feb 2009 19:54:59 -0000	1.7
+++ pyexiv2.spec	16 Apr 2009 20:07:23 -0000	1.8
@@ -2,19 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyexiv2
-Version:        0.1.2
-Release:        9.1.20090109bzr107%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://tilloy.net/dev/pyexiv2/
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  bzr branch -r 107 https://code.launchpad.net/~osomon/pyexiv2/pyexiv2-0.2 pyexiv2
-#  tar -czvf pyexiv2.tar.gz pyexiv2/
-Source0:        pyexiv2.tar.bz2
-#Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
+Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
 # next patch should be removed when
 # https://bugs.launchpad.net/pyexiv2/+bug/249513
 # is fixed
@@ -33,7 +28,7 @@
 embedded in image files (JPEG, TIFF, ...). 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .multilib
 %patch1 -p1 -b .packager
 
@@ -65,6 +60,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 16 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-1
+- New upstream release (closes bug 494419)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-9.1.20090109bzr107
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jan 2009 17:13:31 -0000	1.4
+++ sources	16 Apr 2009 20:07:23 -0000	1.5
@@ -1 +1 @@
-55726eb4f8d74d8543bef32bd9404197  pyexiv2.tar.bz2
+dfc28a6f5f098f88926e8e1de6b925c0  pyexiv2-0.1.3.tar.bz2



From katzj at fedoraproject.org  Thu Apr 16 20:12:26 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu, 16 Apr 2009 20:12:26 +0000 (UTC)
Subject: rpms/mkinitrd/F-11 .cvsignore, 1.221, 1.222 mkinitrd.spec, 1.315,
	1.316 sources, 1.263, 1.264
Message-ID: <20090416201226.9538370127@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/mkinitrd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22078

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 6.0.82-1
- Don't show live snapshot dev with devkit-disks (#495170)
- grubby: Don't crash showing "other" sections (hans, #491622)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-11/.cvsignore,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- .cvsignore	16 Mar 2009 18:43:50 -0000	1.221
+++ .cvsignore	16 Apr 2009 20:11:56 -0000	1.222
@@ -1 +1 @@
-mkinitrd-6.0.81.tar.bz2
+mkinitrd-6.0.82.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-11/mkinitrd.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- mkinitrd.spec	16 Mar 2009 18:43:50 -0000	1.315
+++ mkinitrd.spec	16 Apr 2009 20:11:56 -0000	1.316
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.81
+Version: 6.0.82
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -136,6 +136,10 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 6.0.82-1
+- Don't show live snapshot dev with devkit-disks (#495170)
+- grubby: Don't crash showing "other" sections (hans, #491622)
+
 * Mon Mar 16 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.81-1
 - Make mkinitrd work with kernels < 2.6.29 (#487358, #489151)
 - Fix booting of i2o devices (#476277)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-11/sources,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- sources	16 Mar 2009 18:43:50 -0000	1.263
+++ sources	16 Apr 2009 20:11:56 -0000	1.264
@@ -1 +1 @@
-e1e4ddf456efdea62a7e798e9b5fc405  mkinitrd-6.0.81.tar.bz2
+7ef6f036e514a53cc050f1976942c8b1  mkinitrd-6.0.82.tar.bz2



From pwouters at fedoraproject.org  Thu Apr 16 20:21:07 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 16 Apr 2009 20:21:07 +0000 (UTC)
Subject: rpms/ldns/devel ldns-keygen-hmac-memory.patch, NONE, 1.1 ldns.spec, 
	1.41, 1.42
Message-ID: <20090416202107.4551F70127@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24397

Modified Files:
	ldns.spec 
Added Files:
	ldns-keygen-hmac-memory.patch 
Log Message:
added patch to fix memory corruption in ldns-keygen


ldns-keygen-hmac-memory.patch:

--- NEW FILE ldns-keygen-hmac-memory.patch ---
Index: keys.c
===================================================================
--- keys.c	(revision 2895)
+++ keys.c	(revision 2897)
@@ -1050,7 +1050,7 @@
 		case LDNS_SIGN_HMACMD5:
 		case LDNS_SIGN_HMACSHA1:
 		case LDNS_SIGN_HMACSHA256:
-			bin = LDNS_XMALLOC(unsigned char, size);
+			bin = LDNS_XMALLOC(unsigned char, ldns_key_hmac_size(k));
 			if (!bin) {
 				return NULL;
 			}


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ldns.spec	16 Apr 2009 19:59:19 -0000	1.41
+++ ldns.spec	16 Apr 2009 20:20:36 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -89,7 +89,7 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-3
+* Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-4
 - Memory management bug when generating a sha256 key, see:
   https://bugzilla.redhat.com/show_bug.cgi?id=493953
 



From ajax at fedoraproject.org  Thu Apr 16 20:31:42 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 16 Apr 2009 20:31:42 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.1-randr-gamma.patch, NONE,
	1.1 xorg-x11-server.spec, 1.435, 1.436
Message-ID: <20090416203142.660D370127@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26898

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-randr-gamma.patch 
Log Message:
* Thu Apr 16 2009 Adam Jackson <ajax at redhat.com> 1.6.1-4
- xserver-1.6.1-randr-gamma.patch: Hook up XF86VidMode's gamma control to
  RANDR's per-crtc gamma controls.


xserver-1.6.1-randr-gamma.patch:

--- NEW FILE xserver-1.6.1-randr-gamma.patch ---
>From feaa2623530296ccb783b63ec7b06105f0795af9 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 15 Apr 2009 15:50:18 -0400
Subject: [PATCH] Hook up RANDR gamma to xf86vm

---
 hw/xfree86/common/xf86RandR.c  |    1 +
 hw/xfree86/common/xf86cmap.c   |   13 ++++++++-
 hw/xfree86/modes/xf86RandR12.c |   55 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index de2f78c..58e5cc5 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -30,6 +30,7 @@
 #include "mibank.h"
 #include "globals.h"
 #include "xf86.h"
+#include "xf86str.h"
 #include "xf86Priv.h"
 #include "xf86DDC.h"
 #include "mipointer.h"
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index e578447..0e3cac7 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -84,6 +84,7 @@ typedef struct {
   Bool				(*EnterVT)(int, int);
   Bool				(*SwitchMode)(int, DisplayModePtr, int);
   int				(*SetDGAMode)(int, int, DGADevicePtr);
+  xf86ChangeGammaProc		*ChangeGamma;
   int				maxColors;
   int				sigRGBbits;
   int				gammaElements;
@@ -190,6 +191,7 @@ _X_EXPORT Bool xf86HandleColormaps(
     pScreenPriv->EnterVT = pScrn->EnterVT;
     pScreenPriv->SwitchMode = pScrn->SwitchMode;
     pScreenPriv->SetDGAMode = pScrn->SetDGAMode;    
+    pScreenPriv->ChangeGamma = pScrn->ChangeGamma;
 
     if (!(flags & CMAP_LOAD_EVEN_IF_OFFSCREEN)) {
 	pScrn->EnterVT = CMapEnterVT;
@@ -819,6 +821,7 @@ CMapUnwrapScreen(ScreenPtr pScreen)
     pScrn->EnterVT = pScreenPriv->EnterVT; 
     pScrn->SwitchMode = pScreenPriv->SwitchMode; 
     pScrn->SetDGAMode = pScreenPriv->SetDGAMode; 
+    pScrn->ChangeGamma = pScreenPriv->ChangeGamma;
 
     xfree(pScreenPriv->gamma);
     xfree(pScreenPriv->PreAllocIndices);
@@ -884,6 +887,7 @@ CMapChangeGamma(
    int index,
    Gamma gamma
 ){
+    int ret = Success;
     ScrnInfoPtr pScrn = xf86Screens[index];
     ScreenPtr pScreen = pScrn->pScreen;
     CMapColormapPtr pColPriv;
@@ -949,7 +953,12 @@ CMapChangeGamma(
 	    CMapReinstallMap(pMap);
     }
 
-    return Success;
+    pScrn->ChangeGamma = pScreenPriv->ChangeGamma;
+    if (pScrn->ChangeGamma)
+	ret = pScrn->ChangeGamma(index, gamma);
+    pScrn->ChangeGamma = CMapChangeGamma;
+
+    return ret;
 }
 
 
@@ -1108,5 +1117,5 @@ xf86ChangeGamma(
     if(pScrn->ChangeGamma)
 	return (*pScrn->ChangeGamma)(pScreen->myNum, gamma);
 
-    return Success; /* Success? */
+    return BadImplementation;
 }
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 4546492..0266c25 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -1647,6 +1647,60 @@ xf86RandR13SetPanning (ScreenPtr           pScreen,
     }
 }
 
+/*
+ * Compatibility with XF86VidMode's gamma changer.  This necessarily clobbers
+ * any per-crtc setup.  You asked for it...
+ */
+
+static void
+gamma_to_ramp(float gamma, CARD16 *ramp, int size)
+{
+    int i;
+
+    for (i = 0; i < size; i++) {
+	if (gamma == 1.0)
+	    ramp[i] = i << 8;
+	else
+	    ramp[i] = (CARD16)(pow((double)i / (double)(size - 1), gamma)
+			       * (double)(size - 1) * 256);
+    }
+}
+
+static int
+xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
+{
+    int i, size = 0;
+    CARD16 *points, *red, *green, *blue;
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    rrScrPrivPtr rp = rrGetScrPriv(pScrn->pScreen);
+    ErrorF("xf86RandR12ChangeGamma called\n");
+    for (i = 0; i < rp->numCrtcs; i++)
+	size = max(size, rp->crtcs[i]->gammaSize);
+
+    if (!size)
+	return Success;
+
+    points = xcalloc(size, 3 * sizeof(CARD16));
+    if (!points)
+	return BadAlloc;
+
+    red = points;
+    green = points + size;
+    blue = points + 2 * size;
+
+    for (i = 0; i < rp->numCrtcs; i++) {
+	gamma_to_ramp(gamma.red, red, rp->crtcs[i]->gammaSize);
+	gamma_to_ramp(gamma.green, green, rp->crtcs[i]->gammaSize);
+	gamma_to_ramp(gamma.blue, blue, rp->crtcs[i]->gammaSize);
+	RRCrtcGammaSet(rp->crtcs[i], red, green, blue);
+	memset(points, 0, 3 * size * sizeof(CARD16));
+    }
+
+    xfree(points);
+
+    return Success;
+}
+
 static Bool
 xf86RandR12Init12 (ScreenPtr pScreen)
 {
@@ -1667,6 +1721,7 @@ xf86RandR12Init12 (ScreenPtr pScreen)
     rp->rrModeDestroy = xf86RandR12ModeDestroy;
     rp->rrSetConfig = NULL;
     pScrn->PointerMoved = xf86RandR12PointerMoved;
+    pScrn->ChangeGamma = xf86RandR12ChangeGamma;
     if (!xf86RandR12CreateObjects12 (pScreen))
 	return FALSE;
 
-- 
1.6.2.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- xorg-x11-server.spec	16 Apr 2009 01:04:39 -0000	1.435
+++ xorg-x11-server.spec	16 Apr 2009 20:31:11 -0000	1.436
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -105,6 +105,7 @@
 
 Patch6030: xserver-1.6.0-randr-xinerama-crash.patch
 Patch6031: xserver-1.6.1-exa-avoid-swapped-out.patch
+Patch6032: xserver-1.6.1-randr-gamma.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -536,6 +537,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 Adam Jackson <ajax at redhat.com> 1.6.1-4
+- xserver-1.6.1-randr-gamma.patch: Hook up XF86VidMode's gamma control to
+  RANDR's per-crtc gamma controls.
+
 * Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 1.6.1-3
 - xserver-1.6.1-exa-avoid-swapped-out.patch - make FUS not suck in theory
 



From pjones at fedoraproject.org  Thu Apr 16 20:38:42 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 16 Apr 2009 20:38:42 +0000 (UTC)
Subject: rpms/grub/devel grub-low-memory.patch,NONE,1.1 grub.spec,1.94,1.95
Message-ID: <20090416203842.1CEBF70127@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29106

Modified Files:
	grub.spec 
Added Files:
	grub-low-memory.patch 
Log Message:
* Thu Apr 16 2009 Peter Jones <pjones at redhat.com> - 0.97-49
- Fix efi booting on machines with continguous memory regions across
  the 1G boundary.


grub-low-memory.patch:

--- NEW FILE grub-low-memory.patch ---
From: Peter Jones
Date: Thu, Apr 16 2009 16:16:00 -0500
Subject: [PATCH] allocate low memory at bottom of memory instead of top.

Don't allocate the low memory area above 1GB, as the kernel doesn't map that
during early boot.

diff -urpN grub-0.97/efi/x86_64/loader/linux.c.lowmem grub-0.97/efi/x86_64/loader/linux.c
--- grub-0.97/efi/x86_64/loader/linux.c.lowmem	2009-04-16 15:31:45.000000000 -0400
+++ grub-0.97/efi/x86_64/loader/linux.c	2009-04-16 16:14:25.000000000 -0400
@@ -169,6 +169,7 @@ allocate_pages (grub_size_t real_size, g
 	  && desc->num_pages >= real_mode_pages)
 	{
 	  grub_efi_physical_address_t physical_end;
+          int allocsize = real_size + mmap_size;
 
           physical_end = desc->physical_start + (desc->num_pages << 12);
 
@@ -176,10 +177,17 @@ allocate_pages (grub_size_t real_size, g
                         (unsigned) desc->physical_start,
                         (unsigned) physical_end);
 
-          addr = physical_end - real_size - mmap_size;
+          addr = physical_end - allocsize;
           if (addr < 0x10000)
             continue;
 
+          /* the kernel wants this address to be under 1 gig.*/
+          if (desc->physical_start > 0x40000000 - allocsize)
+            continue;
+
+          if (addr > 0x40000000 - allocsize)
+            addr = 0x40000000 - allocsize;
+
           grub_printf ("trying to allocate %u pages at %x\n",
                         (unsigned) real_mode_pages, (unsigned) addr);
           real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages);


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- grub.spec	9 Apr 2009 21:23:16 -0000	1.94
+++ grub.spec	16 Apr 2009 20:38:11 -0000	1.95
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 48%{?dist}
+Release: 49%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -40,6 +40,7 @@
 Patch12: grub-0.97-fat-lowercase.patch
 Patch13: grub-0.97-efipxe.patch
 Patch14: grub-0.97-tolower.patch
+Patch15: grub-low-memory.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -64,6 +65,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 autoreconf
@@ -126,6 +128,10 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Apr 16 2009 Peter Jones <pjones at redhat.com> - 0.97-49
+- Fix efi booting on machines with continguous memory regions across
+  the 1G boundary.
+
 * Thu Apr 09 2009 Peter Jones <pjones at redhat.com> - 0.97-48
 - remove test message Re: using network drive or not.
 



From pwouters at fedoraproject.org  Thu Apr 16 20:49:14 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 16 Apr 2009 20:49:14 +0000 (UTC)
Subject: rpms/ldns/EL-5 ldns-keygen-hmac-memory.patch, NONE, 1.1 ldns.spec, 
	1.16, 1.17 sources, 1.6, 1.7
Message-ID: <20090416204914.BED3070127@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31185

Modified Files:
	ldns.spec sources 
Added Files:
	ldns-keygen-hmac-memory.patch 
Log Message:
* Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-2
- Memory management bug when generating a sha256 key, see:
  https://bugzilla.redhat.com/show_bug.cgi?id=493953


ldns-keygen-hmac-memory.patch:

--- NEW FILE ldns-keygen-hmac-memory.patch ---
Index: keys.c
===================================================================
--- keys.c	(revision 2895)
+++ keys.c	(revision 2897)
@@ -1050,7 +1050,7 @@
 		case LDNS_SIGN_HMACMD5:
 		case LDNS_SIGN_HMACSHA1:
 		case LDNS_SIGN_HMACSHA256:
-			bin = LDNS_XMALLOC(unsigned char, size);
+			bin = LDNS_XMALLOC(unsigned char, ldns_key_hmac_size(k));
 			if (!bin) {
 				return NULL;
 			}


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/ldns.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ldns.spec	13 Feb 2009 21:22:37 -0000	1.16
+++ ldns.spec	16 Apr 2009 20:48:44 -0000	1.17
@@ -1,10 +1,11 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
+Patch1: ldns-keygen-hmac-memory.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
@@ -31,6 +32,9 @@
 #libtoolize
 #autoreconf
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=493953
+%patch1
+
 %configure --disable-rpath --with-sha2
 
 %build
@@ -83,6 +87,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-2
+- Memory management bug when generating a sha256 key, see:
+  https://bugzilla.redhat.com/show_bug.cgi?id=493953
+
 * Fri Feb 13 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-1
 - Upgrade to 1.5.1 (1.5.0 was a dud release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Feb 2009 21:22:37 -0000	1.6
+++ sources	16 Apr 2009 20:48:44 -0000	1.7
@@ -1,2 +1 @@
-676c088b6a7e1ae0be16a16410fda805  ldns-1.5.0.tar.gz
 17f73def98711e1475409d9a8d5d9dcd  ldns-1.5.1.tar.gz



From ajax at fedoraproject.org  Thu Apr 16 20:59:22 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 16 Apr 2009 20:59:22 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-radeon-panel-mode-name.patch, NONE,
	1.1 kernel.spec, 1.1548, 1.1549
Message-ID: <20090416205922.4DC5670127@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1102

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-panel-mode-name.patch 
Log Message:
* Thu Apr 16 2009 Adam Jackson <ajax at redhat.com>
- radeon drm: Be sure to set a name for LVDS panel modes.


drm-radeon-panel-mode-name.patch:

--- NEW FILE drm-radeon-panel-mode-name.patch ---
diff -up linux-2.6.29.noarch/drivers/gpu/drm/radeon/radeon_connectors.c.jx linux-2.6.29.noarch/drivers/gpu/drm/radeon/radeon_connectors.c
--- linux-2.6.29.noarch/drivers/gpu/drm/radeon/radeon_connectors.c.jx	2009-04-16 14:51:29.000000000 -0400
+++ linux-2.6.29.noarch/drivers/gpu/drm/radeon/radeon_connectors.c	2009-04-16 16:54:36.000000000 -0400
@@ -119,9 +119,9 @@ static struct drm_display_mode *radeon_f
 		mode->flags = 0;
 
 		mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
+		drm_mode_set_name(mode);
 
-		DRM_DEBUG("Adding native panel mode %dx%d\n",
-			  native_mode->panel_xres, native_mode->panel_yres);
+		DRM_DEBUG("Adding native panel mode %s\n", mode->name);
 	}
 	return mode;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1548
retrieving revision 1.1549
diff -u -r1.1548 -r1.1549
--- kernel.spec	16 Apr 2009 01:50:53 -0000	1.1548
+++ kernel.spec	16 Apr 2009 20:58:51 -0000	1.1549
@@ -688,6 +688,7 @@
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-intel-lying-systems-without-lvds.patch
 Patch1822: drm-intel-gen3-fb-hack.patch
+Patch1823: drm-radeon-panel-mode-name.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1342,6 +1343,7 @@
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-lying-systems-without-lvds.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
+ApplyPatch drm-radeon-panel-mode-name.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1969,6 +1971,9 @@
 # and build.
 
 %changelog
+* Thu Apr 16 2009 Adam Jackson <ajax at redhat.com>
+- radeon drm: Be sure to set a name for LVDS panel modes.
+
 * Thu Apr 16 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: use less vmalloc space (rh#495843)
 



From scop at fedoraproject.org  Thu Apr 16 21:01:39 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 16 Apr 2009 21:01:39 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix-agent.init, 1.3, 1.4 zabbix-proxy.init, 1.1,
	1.2 zabbix-server.init, 1.4, 1.5 zabbix.spec, 1.39, 1.40
Message-ID: <20090416210139.77C0C70127@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1681

Modified Files:
	zabbix-agent.init zabbix-proxy.init zabbix-server.init 
	zabbix.spec 
Log Message:
Improve init script LSB compliance (rewrite using rpmdevtools init script template).


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-agent.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zabbix-agent.init	7 Jul 2008 08:03:13 -0000	1.3
+++ zabbix-agent.init	16 Apr 2009 21:01:08 -0000	1.4
@@ -1,7 +1,9 @@
-#! /bin/sh
+#!/bin/sh
 #
 # chkconfig: - 85 15
-# description: zabbix agent daemon
+# description: ZABBIX agent daemon
+# processname: zabbix_agentd
+# config: /etc/zabbix/zabbix_agentd.conf
 #
 
 ### BEGIN INIT INFO
@@ -10,58 +12,65 @@
 # Required-Stop: $local_fs $network
 # Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start and stop zabbix agent
-# Description: Zabbix Agent
+# Short-Description: Start and stop ZABBIX agent
+# Description: ZABBIX agent
 ### END INIT INFO
 
-# zabbix details
-ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
-CONF=/etc/zabbix/zabbix_agentd.conf
-PIDFILE=/var/run/zabbix-agent.pid
-
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -x $ZABBIX_AGENTD ] || exit 5
-[ -e $CONF ] || exit 6
-
-RETVAL=0
+exec=/usr/sbin/zabbix_agentd
+prog=${exec##*/}
+lockfile=/var/lock/subsys/zabbix-agent
+
+start()
+{
+    echo -n $"Starting ZABBIX agent: "
+    daemon $exec
+    rv=$?
+    echo
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop()
+{
+    echo -n $"Shutting down ZABBIX agent: "
+    killproc $prog
+    rv=$?
+    echo
+    [ $rv -eq 0 ] && rm -f $lockfile
+    return $rv
+}
+
+restart()
+{
+    stop
+    start
+}
 
 case "$1" in
-    start)
-        echo -n "Starting zabbix agent: "
-        daemon $ZABBIX_AGENTD -c $CONF
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix-agent
+    start|stop|restart)
+        $1
         ;;
-    stop)
-        echo -n "Shutting down zabbix agent: "
-        killproc zabbix_agentd
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix-agent
-        ;;
-    restart|reload)
-        $0 stop
-        $0 start
-        RETVAL=$?
+    force-reload)
+        restart
         ;;
     status)
-        status zabbix_agentd
-        RETVAL=$?
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
+        ;;
+    reload)
+        action $"Service ${0##*/} does not support the reload action: " /bin/false
+        exit 3
         ;;
     *)
-	echo "Usage: $0 {start|stop|restart|reload|status}"
-	exit 1
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+	exit 2
 	;;
 esac
 
-exit $RETVAL
-


Index: zabbix-proxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-proxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-proxy.init	30 Sep 2008 17:41:33 -0000	1.1
+++ zabbix-proxy.init	16 Apr 2009 21:01:08 -0000	1.2
@@ -1,75 +1,84 @@
-#! /bin/sh
+#!/bin/sh
 #
 # chkconfig: - 85 15
-# description: zabbix proxy daemon
+# description: ZABBIX proxy daemon
+# config: /etc/zabbix/zabbix_proxy.conf
 #
 
 ### BEGIN INIT INFO
-# Provides: zabbix
+# Provides: zabbix-proxy
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
 # Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start and stop zabbix proxy
-# Description: Zabbix Proxy
+# Short-Description: Start and stop ZABBIX proxy
+# Description: ZABBIX proxy
 ### END INIT INFO
 
-# zabbix details
+# Source function library.
+. /etc/rc.d/init.d/functions
+
 if [ -x /usr/sbin/zabbix_proxy_mysql ]; then
-    ZABBIX_PROXY=zabbix_proxy_mysql
+    exec=zabbix_proxy_mysql
 elif [ -x /usr/sbin/zabbix_proxy_pgsql ]; then
-    ZABBIX_PROXY=zabbix_proxy_pgsql
+    exec=zabbix_proxy_pgsql
 elif [ -x /usr/sbin/zabbix_proxy_sqlite3 ]; then
-    ZABBIX_PROXY=zabbix_proxy_sqlite3
+    exec=zabbix_proxy_sqlite3
 else
     exit 5
 fi
-
-CONF=/etc/zabbix/zabbix_proxy.conf
-PIDFILE=/var/run/zabbix.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -e $CONF ] || exit 6
-
-RETVAL=0
+prog=${exec##*/}
+lockfile=/var/lock/subsys/zabbix-proxy
+conf=
+
+start()
+{
+    echo -n $"Starting ZABBIX proxy: "
+    daemon $exec
+    rv=$?
+    echo
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop()
+{
+    echo -n $"Shutting down ZABBIX proxy: "
+    killproc $prog
+    rv=$?
+    echo
+    [ $rv -eq 0 ] && rm -f $lockfile
+    return $rv
+}
+
+restart()
+{
+    stop
+    start
+}
 
 case "$1" in
-    start)
-        echo -n "Starting Zabbix proxy: "
-        daemon $ZABBIX_PROXY -c $CONF
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix-proxy
-        ;;
-    stop)
-        echo -n "Shutting down Zabbix proxy: "
-        killproc $ZABBIX_PROXY
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix-proxy
+    start|stop|restart)
+        $1
         ;;
-    restart|reload)
-        $0 stop
-        $0 start
-        RETVAL=$?
+    force-reload)
+        restart
         ;;
     status)
-        status $ZABBIX_PROXY
-        RETVAL=$?
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
+        ;;
+    reload)
+        action $"Service ${0##*/} does not support the reload action: " /bin/false
+        exit 3
         ;;
     *)
-	echo "Usage: $0 {start|stop|restart|reload|status}"
-	exit 1
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+	exit 2
 	;;
 esac
 
-exit $RETVAL
-


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-server.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zabbix-server.init	30 Sep 2008 17:36:49 -0000	1.4
+++ zabbix-server.init	16 Apr 2009 21:01:08 -0000	1.5
@@ -1,7 +1,8 @@
-#! /bin/sh
+#!/bin/sh
 #
 # chkconfig: - 85 15
-# description: zabbix server daemon
+# description: ZABBIX server daemon
+# config: /etc/zabbix/zabbix_server.conf
 #
 
 ### BEGIN INIT INFO
@@ -10,66 +11,73 @@
 # Required-Stop: $local_fs $network
 # Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: start and stop zabbix server
-# Description: Zabbix Server
+# Short-Description: Start and stop ZABBIX server
+# Description: ZABBIX server
 ### END INIT INFO
 
-# zabbix details
+# Source function library.
+. /etc/rc.d/init.d/functions
+
 if [ -x /usr/sbin/zabbix_server_mysql ]; then
-    ZABBIX=zabbix_server_mysql
+    exec=zabbix_server_mysql
 elif [ -x /usr/sbin/zabbix_server_pgsql ]; then
-    ZABBIX=zabbix_server_pgsql
+    exec=zabbix_server_pgsql
 elif [ -x /usr/sbin/zabbix_server_sqlite3 ]; then
-    ZABBIX=zabbix_server_sqlite3
+    exec=zabbix_server_sqlite3
 else
     exit 5
 fi
+prog=${exec##*/}
+lockfile=/var/lock/subsys/zabbix
 
-CONF=/etc/zabbix/zabbix_server.conf
-PIDFILE=/var/run/zabbix.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -e $CONF ] || exit 6
-
-RETVAL=0
+start()
+{
+    echo -n $"Starting ZABBIX server: "
+    daemon $exec
+    rv=$?
+    echo
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop()
+{
+    echo -n $"Shutting down ZABBIX server: "
+    killproc $prog
+    rv=$?
+    echo
+    [ $rv -eq 0 ] && rm -f $lockfile
+    return $rv
+}
+
+restart()
+{
+    stop
+    start
+}
 
 case "$1" in
-    start)
-        echo -n "Starting zabbix server: "
-        daemon $ZABBIX -c $CONF
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix
-        ;;
-    stop)
-        echo -n "Shutting down zabbix server: "
-        killproc $ZABBIX
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix
+    start|stop|restart)
+        $1
         ;;
-    restart|reload)
-        $0 stop
-        $0 start
-        RETVAL=$?
+    force-reload)
+        restart
         ;;
     status)
-        status $ZABBIX
-        RETVAL=$?
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
+        ;;
+    reload)
+        action $"Service ${0##*/} does not support the reload action: " /bin/false
+        exit 3
         ;;
     *)
-	echo "Usage: $0 {start|stop|restart|reload|status}"
-	exit 1
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+	exit 2
 	;;
 esac
 
-exit $RETVAL
-


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- zabbix.spec	16 Apr 2009 16:22:29 -0000	1.39
+++ zabbix.spec	16 Apr 2009 21:01:08 -0000	1.40
@@ -520,6 +520,7 @@
 * Thu Apr  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
 - Tighten configuration file permissions.
 - Ensure zero exit status from scriptlets.
+- Improve init script LSB compliance.
 
 * Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-2
 - make the -docs subpackage noarch



From pjones at fedoraproject.org  Thu Apr 16 21:03:10 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 16 Apr 2009 21:03:10 +0000 (UTC)
Subject: rpms/grub/devel grub-low-memory.patch,1.1,1.2
Message-ID: <20090416210310.EDAAB70127@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	grub-low-memory.patch 
Log Message:
Fix an error generating the patch.


grub-low-memory.patch:

Index: grub-low-memory.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-low-memory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-low-memory.patch	16 Apr 2009 20:38:11 -0000	1.1
+++ grub-low-memory.patch	16 Apr 2009 21:03:10 -0000	1.2
@@ -6,9 +6,9 @@
 during early boot.
 
 diff -urpN grub-0.97/efi/x86_64/loader/linux.c.lowmem grub-0.97/efi/x86_64/loader/linux.c
---- grub-0.97/efi/x86_64/loader/linux.c.lowmem	2009-04-16 15:31:45.000000000 -0400
-+++ grub-0.97/efi/x86_64/loader/linux.c	2009-04-16 16:14:25.000000000 -0400
-@@ -169,6 +169,7 @@ allocate_pages (grub_size_t real_size, g
+--- grub-0.97/efi/x86_64/loader/linux.c.lowmem	2009-04-16 16:56:32.000000000 -0400
++++ grub-0.97/efi/x86_64/loader/linux.c	2009-04-16 16:57:38.000000000 -0400
+@@ -169,16 +169,24 @@ allocate_pages (grub_size_t real_size, g
  	  && desc->num_pages >= real_mode_pages)
  	{
  	  grub_efi_physical_address_t physical_end;
@@ -16,10 +16,9 @@
  
            physical_end = desc->physical_start + (desc->num_pages << 12);
  
-@@ -176,10 +177,17 @@ allocate_pages (grub_size_t real_size, g
+           grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n",
                          (unsigned) desc->physical_start,
                          (unsigned) physical_end);
- 
 -          addr = physical_end - real_size - mmap_size;
 +          addr = physical_end - allocsize;
            if (addr < 0x10000)
@@ -32,6 +31,6 @@
 +          if (addr > 0x40000000 - allocsize)
 +            addr = 0x40000000 - allocsize;
 +
-           grub_printf ("trying to allocate %u pages at %x\n",
+           grub_dprintf ("linux", "trying to allocate %u pages at %x\n",
                          (unsigned) real_mode_pages, (unsigned) addr);
            real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages);



From ajax at fedoraproject.org  Thu Apr 16 21:03:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 16 Apr 2009 21:03:25 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-kms-gamma.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.178, 1.179
Message-ID: <20090416210325.A99E070127@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2348

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.2-kms-gamma.patch 
Log Message:
test kms gamma patch

radeon-6.12.2-kms-gamma.patch:

--- NEW FILE radeon-6.12.2-kms-gamma.patch ---
diff -up xf86-video-ati-6.12.2/src/drmmode_display.c.jx xf86-video-ati-6.12.2/src/drmmode_display.c
--- xf86-video-ati-6.12.2/src/drmmode_display.c.jx	2009-04-16 14:51:57.000000000 -0400
+++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-16 14:54:22.000000000 -0400
@@ -458,7 +458,11 @@ static void
 drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
                       uint16_t *blue, int size)
 {
-	return;
+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+	drmmode_ptr drmmode = drmmode_crtc->drmmode;
+
+	drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
+			    size, red, green, blue);
 }
 
 static const xf86CrtcFuncsRec drmmode_crtc_funcs = {


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- xorg-x11-drv-ati.spec	16 Apr 2009 08:18:34 -0000	1.178
+++ xorg-x11-drv-ati.spec	16 Apr 2009 21:02:55 -0000	1.179
@@ -17,6 +17,7 @@
 Patch1:     radeon-modeset.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
+Patch8:	    radeon-6.12.2-kms-gamma.patch
 
 ExcludeArch: s390 s390x
 
@@ -41,6 +42,8 @@
 %patch1 -p1 -b .modeset
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
+# don't do this yet, kernel will oops if you do
+#patch8 -p1 -b .kms-gamma
 
 %build
 autoreconf -iv



From spot at fedoraproject.org  Thu Apr 16 21:08:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 16 Apr 2009 21:08:41 +0000 (UTC)
Subject: rpms/xpdf/F-11 xpdf-3.02pl3.patch,NONE,1.1 xpdf.spec,1.15,1.16
Message-ID: <20090416210841.1CB8570127@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xpdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/F-11

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl3.patch 
Log Message:
3.02pl3 security update

xpdf-3.02pl3.patch:

--- NEW FILE xpdf-3.02pl3.patch ---
diff -r -c xpdf-3.02.orig/goo/gmem.cc xpdf-3.02/goo/gmem.cc
*** xpdf-3.02.orig/goo/gmem.cc	Tue Feb 27 14:05:51 2007
--- xpdf-3.02/goo/gmem.cc	Thu Mar 19 15:47:25 2009
***************
*** 55,61 ****
    void *data;
    unsigned long *trl, *p;
  
!   if (size <= 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
--- 55,69 ----
    void *data;
    unsigned long *trl, *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
***************
*** 91,97 ****
  #else
    void *p;
  
!   if (size <= 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
--- 99,113 ----
  #else
    void *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
***************
*** 112,118 ****
    void *q;
    size_t oldSize;
  
!   if (size <= 0) {
      if (p) {
        gfree(p);
      }
--- 128,142 ----
    void *q;
    size_t oldSize;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        gfree(p);
      }
***************
*** 131,137 ****
  #else
    void *q;
  
!   if (size <= 0) {
      if (p) {
        free(p);
      }
--- 155,169 ----
  #else
    void *q;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        free(p);
      }
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.cc xpdf-3.02/xpdf/JBIG2Stream.cc
*** xpdf-3.02.orig/xpdf/JBIG2Stream.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.cc	Tue Mar 31 10:55:23 2009
***************
*** 422,433 ****
    table[i] = table[len];
  
    // assign prefixes
!   i = 0;
!   prefix = 0;
!   table[i++].prefix = prefix++;
!   for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!     prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!     table[i].prefix = prefix++;
    }
  }
  
--- 422,435 ----
    table[i] = table[len];
  
    // assign prefixes
!   if (table[0].rangeLen != jbig2HuffmanEOT) {
!     i = 0;
!     prefix = 0;
!     table[i++].prefix = prefix++;
!     for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!       prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!       table[i].prefix = prefix++;
!     }
    }
  }
  
***************
*** 491,497 ****
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return 0;
    }
    bufLen -= p->bits;
    return p->n;
--- 493,499 ----
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return EOF;
    }
    bufLen -= p->bits;
    return p->n;
***************
*** 507,513 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 7 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 509,515 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 11 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 550,563 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 6 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 4 && ((buf >> (bufLen - 4)) & 0x0f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 552,566 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 10 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 7 && ((buf >> (bufLen - 4)) & 0x0f) == 0 &&
! 	       ((buf >> (bufLen - 6)) & 0x03) != 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 683,690 ****
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 686,694 ----
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 698,705 ****
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 702,710 ----
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 754,759 ****
--- 759,766 ----
  inline void JBIG2Bitmap::getPixelPtr(int x, int y, JBIG2BitmapPtr *ptr) {
    if (y < 0 || y >= h || x >= w) {
      ptr->p = NULL;
+     ptr->shift = 0; // make gcc happy
+     ptr->x = 0; // make gcc happy
    } else if (x < 0) {
      ptr->p = &data[y * line];
      ptr->shift = 7;
***************
*** 798,803 ****
--- 805,814 ----
    Guint src0, src1, src, dest, s1, s2, m1, m2, m3;
    GBool oneByte;
  
+   // check for the pathological case where y = -2^31
+   if (y < -0x7fffffff) {
+     return;
+   }
    if (y < 0) {
      y0 = -y;
    } else {
***************
*** 1011,1018 ****
--- 1022,1034 ----
  JBIG2SymbolDict::JBIG2SymbolDict(Guint segNumA, Guint sizeA):
    JBIG2Segment(segNumA)
  {
+   Guint i;
+ 
    size = sizeA;
    bitmaps = (JBIG2Bitmap **)gmallocn(size, sizeof(JBIG2Bitmap *));
+   for (i = 0; i < size; ++i) {
+     bitmaps[i] = NULL;
+   }
    genericRegionStats = NULL;
    refinementRegionStats = NULL;
  }
***************
*** 1021,1027 ****
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     delete bitmaps[i];
    }
    gfree(bitmaps);
    if (genericRegionStats) {
--- 1037,1045 ----
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     if (bitmaps[i]) {
!       delete bitmaps[i];
!     }
    }
    gfree(bitmaps);
    if (genericRegionStats) {
***************
*** 1296,1301 ****
--- 1314,1326 ----
        goto eofError2;
      }
  
+     // check for missing page information segment
+     if (!pageBitmap && ((segType >= 4 && segType <= 7) ||
+ 			(segType >= 20 && segType <= 43))) {
+       error(getPos(), "First JBIG2 segment associated with a page must be a page information segment");
+       goto syntaxError;
+     }
+ 
      // read the segment data
      switch (segType) {
      case 0:
***************
*** 1411,1416 ****
--- 1436,1443 ----
    Guint i, j, k;
    Guchar *p;
  
+   symWidths = NULL;
+ 
    // symbol dictionary flags
    if (!readUWord(&flags)) {
      goto eofError;
***************
*** 1466,1485 ****
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       numInputSyms += ((JBIG2SymbolDict *)seg)->getSize();
!     } else if (seg->getType() == jbig2SegCodeTable) {
!       codeTables->append(seg);
      }
    }
  
    // compute symbol code length
!   symCodeLen = 0;
!   i = 1;
!   while (i < numInputSyms + numNewSyms) {
      ++symCodeLen;
!     i <<= 1;
    }
  
    // get the input symbol bitmaps
--- 1493,1524 ----
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	j = ((JBIG2SymbolDict *)seg)->getSize();
! 	if (numInputSyms > UINT_MAX - j) {
! 	  error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
! 	  delete codeTables;
! 	  goto eofError;
! 	}
! 	numInputSyms += j;
!       } else if (seg->getType() == jbig2SegCodeTable) {
! 	codeTables->append(seg);
!       }
      }
    }
+   if (numInputSyms > UINT_MAX - numNewSyms) {
+     error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
+     delete codeTables;
+     goto eofError;
+   }
  
    // compute symbol code length
!   symCodeLen = 1;
!   i = (numInputSyms + numNewSyms) >> 1;
!   while (i) {
      ++symCodeLen;
!     i >>= 1;
    }
  
    // get the input symbol bitmaps
***************
*** 1491,1501 ****
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       inputSymbolDict = (JBIG2SymbolDict *)seg;
!       for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	bitmaps[k++] = inputSymbolDict->getBitmap(j);
        }
      }
    }
--- 1530,1541 ----
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	inputSymbolDict = (JBIG2SymbolDict *)seg;
! 	for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	  bitmaps[k++] = inputSymbolDict->getBitmap(j);
! 	}
        }
      }
    }
***************
*** 1510,1515 ****
--- 1550,1558 ----
      } else if (huffDH == 1) {
        huffDHTable = huffTableE;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDW == 0) {
***************
*** 1517,1533 ****
--- 1560,1585 ----
      } else if (huffDW == 1) {
        huffDWTable = huffTableC;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffBMSize == 0) {
        huffBMSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffBMSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffAggInst == 0) {
        huffAggInstTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffAggInstTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 1560,1566 ****
    }
  
    // allocate symbol widths storage
-   symWidths = NULL;
    if (huff && !refAgg) {
      symWidths = (Guint *)gmallocn(numNewSyms, sizeof(Guint));
    }
--- 1612,1617 ----
***************
*** 1602,1607 ****
--- 1653,1662 ----
  	goto syntaxError;
        }
        symWidth += dw;
+       if (i >= numNewSyms) {
+ 	error(getPos(), "Too many symbols in JBIG2 symbol dictionary");
+ 	goto syntaxError;
+       }
  
        // using a collective bitmap, so don't read a bitmap here
        if (huff && !refAgg) {
***************
*** 1638,1643 ****
--- 1693,1702 ----
  	    arithDecoder->decodeInt(&refDX, iardxStats);
  	    arithDecoder->decodeInt(&refDY, iardyStats);
  	  }
+ 	  if (symID >= numInputSyms + i) {
+ 	    error(getPos(), "Invalid symbol ID in JBIG2 symbol dictionary");
+ 	    goto syntaxError;
+ 	  }
  	  refBitmap = bitmaps[symID];
  	  bitmaps[numInputSyms + i] =
  	      readGenericRefinementRegion(symWidth, symHeight,
***************
*** 1704,1709 ****
--- 1763,1774 ----
      } else {
        arithDecoder->decodeInt(&run, iaexStats);
      }
+     if (i + run > numInputSyms + numNewSyms ||
+ 	(ex && j + run > numExSyms)) {
+       error(getPos(), "Too many exported symbols in JBIG2 symbol dictionary");
+       delete symbolDict;
+       goto syntaxError;
+     }
      if (ex) {
        for (cnt = 0; cnt < run; ++cnt) {
  	symbolDict->setBitmap(j++, bitmaps[i++]->copy());
***************
*** 1713,1718 ****
--- 1778,1788 ----
      }
      ex = !ex;
    }
+   if (j != numExSyms) {
+     error(getPos(), "Too few symbols in JBIG2 symbol dictionary");
+     delete symbolDict;
+     goto syntaxError;
+   }
  
    for (i = 0; i < numNewSyms; ++i) {
      delete bitmaps[numInputSyms + i];
***************
*** 1735,1740 ****
--- 1805,1814 ----
  
    return gTrue;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 symbol dictionary");
+   delete codeTables;
+ 
   syntaxError:
    for (i = 0; i < numNewSyms; ++i) {
      if (bitmaps[numInputSyms + i]) {
***************
*** 1837,1842 ****
--- 1911,1918 ----
        }
      } else {
        error(getPos(), "Invalid segment reference in JBIG2 text region");
+       delete codeTables;
+       return;
      }
    }
    symCodeLen = 0;
***************
*** 1871,1876 ****
--- 1947,1955 ----
      } else if (huffFS == 1) {
        huffFSTable = huffTableG;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffFSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDS == 0) {
***************
*** 1880,1885 ****
--- 1959,1967 ----
      } else if (huffDS == 2) {
        huffDSTable = huffTableJ;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDT == 0) {
***************
*** 1889,1894 ****
--- 1971,1979 ----
      } else if (huffDT == 2) {
        huffDTTable = huffTableM;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDTTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDW == 0) {
***************
*** 1896,1901 ****
--- 1981,1989 ----
      } else if (huffRDW == 1) {
        huffRDWTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDH == 0) {
***************
*** 1903,1908 ****
--- 1991,1999 ----
      } else if (huffRDH == 1) {
        huffRDHTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDX == 0) {
***************
*** 1910,1915 ****
--- 2001,2009 ----
      } else if (huffRDX == 1) {
        huffRDXTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDXTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDY == 0) {
***************
*** 1917,1927 ****
--- 2011,2027 ----
      } else if (huffRDY == 1) {
        huffRDYTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDYTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRSize == 0) {
        huffRSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 2016,2023 ****
--- 2116,2130 ----
  
    return;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 text region");
+   gfree(codeTables);
+   delete syms;
+   return;
+ 
   eofError:
    error(getPos(), "Unexpected EOF in JBIG2 stream");
+   return;
  }
  
  JBIG2Bitmap *JBIG2Stream::readTextRegion(GBool huff, GBool refine,
***************
*** 2324,2331 ****
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   seg = findSegment(refSegs[0]);
!   if (seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
--- 2431,2438 ----
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   if (!(seg = findSegment(refSegs[0])) ||
!       seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
***************
*** 2483,2489 ****
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? 0 : length - 18);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
--- 2590,2596 ----
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? length - 18 : 0);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
***************
*** 2505,2510 ****
--- 2612,2654 ----
    error(getPos(), "Unexpected EOF in JBIG2 stream");
  }
  
+ inline void JBIG2Stream::mmrAddPixels(int a1, int blackPixels,
+ 				      int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
+ inline void JBIG2Stream::mmrAddPixelsNeg(int a1, int blackPixels,
+ 					 int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   } else if (a1 < codingLine[*a0i]) {
+     if (a1 < 0) {
+       error(getPos(), "Invalid JBIG2 MMR code");
+       a1 = 0;
+     }
+     while (*a0i > 0 && a1 <= codingLine[*a0i - 1]) {
+       --*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
  JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
  					    int templ, GBool tpgdOn,
  					    GBool useSkip, JBIG2Bitmap *skip,
***************
*** 2517,2523 ****
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0, pix, i, refI, codingI;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
--- 2661,2667 ----
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0i, b1i, blackPixels, pix, i;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
***************
*** 2527,2535 ****
    if (mmr) {
  
      mmrDecoder->reset();
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = codingLine[1] = w;
  
      for (y = 0; y < h; ++y) {
  
--- 2671,2688 ----
    if (mmr) {
  
      mmrDecoder->reset();
+     if (w > INT_MAX - 2) {
+       error(getPos(), "Bad width in JBIG2 generic bitmap");
+       // force a call to gmalloc(-1), which will throw an exception
+       w = -3;
+     }
+     // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = w
+     // ---> max codingLine size = w + 1
+     // refLine has one extra guard entry at the end
+     // ---> max refLine size = w + 2
+     codingLine = (int *)gmallocn(w + 1, sizeof(int));
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = w;
  
      for (y = 0; y < h; ++y) {
  
***************
*** 2537,2664 ****
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i] = refLine[i + 1] = w;
  
        // decode a line
!       refI = 0;     // b1 = refLine[refI]
!       codingI = 0;  // a1 = codingLine[codingI]
!       a0 = 0;
!       do {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
! 	  if (refLine[refI] < w) {
! 	    a0 = refLine[refI + 1];
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimHoriz:
! 	  if (codingI & 1) {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	  } else {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	  }
! 	  if (code1 > 0 || code2 > 0) {
! 	    a0 = codingLine[codingI++] = a0 + code1;
! 	    a0 = codingLine[codingI++] = a0 + code2;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVert0:
! 	  a0 = codingLine[codingI++] = refLine[refI];
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	  }
! 	  break;
! 	case twoDimVertR1:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 1;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertR2:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 2;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
  	case twoDimVertR3:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 3;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertL1:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 1;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
! 	case twoDimVertL2:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 2;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimVertL3:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 3;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
  	  break;
  	}
!       } while (a0 < w);
!       codingLine[codingI++] = w;
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (codingLine[i] < w) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
  	i += 2;
        }
      }
--- 2690,2846 ----
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i++] = w;
!       refLine[i] = w;
  
        // decode a line
!       codingLine[0] = 0;
!       a0i = 0;
!       b1i = 0;
!       blackPixels = 0;
!       // invariant:
!       // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] <= w
!       // exception at left edge:
!       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
!       // exception at right edge:
!       //   refLine[b1i] = refLine[b1i+1] = w is possible
!       while (codingLine[a0i] < w) {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
!           mmrAddPixels(refLine[b1i + 1], blackPixels, codingLine, &a0i, w);
!           if (refLine[b1i + 1] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimHoriz:
!           code1 = code2 = 0;
!           if (blackPixels) {
!             do {
!               code1 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!           } else {
!             do {
!               code1 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!           }
!           mmrAddPixels(codingLine[a0i] + code1, blackPixels,
! 		       codingLine, &a0i, w);
!           if (codingLine[a0i] < w) {
!             mmrAddPixels(codingLine[a0i] + code2, blackPixels ^ 1,
! 			 codingLine, &a0i, w);
!           }
!           while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimVertR3:
!           mmrAddPixels(refLine[b1i] + 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR2:
!           mmrAddPixels(refLine[b1i] + 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR1:
!           mmrAddPixels(refLine[b1i] + 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVert0:
!           mmrAddPixels(refLine[b1i], blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
  	case twoDimVertL3:
!           mmrAddPixelsNeg(refLine[b1i] - 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL2:
!           mmrAddPixelsNeg(refLine[b1i] - 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL1:
!           mmrAddPixelsNeg(refLine[b1i] - 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case EOF:
!           mmrAddPixels(w, 0, codingLine, &a0i, w);
!           break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
+           mmrAddPixels(w, 0, codingLine, &a0i, w);
  	  break;
  	}
!       }
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (1) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
+ 	if (codingLine[i+1] >= w || codingLine[i+2] >= w) {
+ 	  break;
+ 	}
  	i += 2;
        }
      }
***************
*** 2706,2712 ****
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  bitmap->duplicateRow(y, y-1);
  	  continue;
  	}
        }
--- 2888,2896 ----
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  if (y > 0) {
! 	    bitmap->duplicateRow(y, y-1);
! 	  }
  	  continue;
  	}
        }
***************
*** 2909,2916 ****
      return;
    }
    if (nRefSegs == 1) {
!     seg = findSegment(refSegs[0]);
!     if (seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
--- 3093,3100 ----
      return;
    }
    if (nRefSegs == 1) {
!     if (!(seg = findSegment(refSegs[0])) ||
! 	seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
***************
*** 3004,3009 ****
--- 3188,3197 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
***************
*** 3075,3080 ****
--- 3263,3272 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.h xpdf-3.02/xpdf/JBIG2Stream.h
*** xpdf-3.02.orig/xpdf/JBIG2Stream.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.h	Tue Mar 31 10:50:07 2009
***************
*** 78,83 ****
--- 78,87 ----
  			     Guint *refSegs, Guint nRefSegs);
    void readGenericRegionSeg(Guint segNum, GBool imm,
  			    GBool lossless, Guint length);
+   void mmrAddPixels(int a1, int blackPixels,
+ 		    int *codingLine, int *a0i, int w);
+   void mmrAddPixelsNeg(int a1, int blackPixels,
+ 		       int *codingLine, int *a0i, int w);
    JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h,
  				 int templ, GBool tpgdOn,
  				 GBool useSkip, JBIG2Bitmap *skip,


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/F-11/xpdf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xpdf.spec	4 Mar 2009 21:02:22 -0000	1.15
+++ xpdf.spec	16 Apr 2009 21:08:10 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -51,6 +51,7 @@
 # Security patches
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
+Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -115,6 +116,7 @@
 # security patches
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
+%patch102 -p1 -b .security3
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -269,6 +271,11 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Thu Apr 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-13
+- apply xpdf-3.02pl3 security patch to fix:
+  CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180
+  CVE-2009-1181, CVE-2009-1182, CVE-2009-1183
+
 * Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-12
 - add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404)
 



From spot at fedoraproject.org  Thu Apr 16 21:08:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 16 Apr 2009 21:08:40 +0000 (UTC)
Subject: rpms/xpdf/F-10 xpdf-3.02pl3.patch,NONE,1.1 xpdf.spec,1.14,1.15
Message-ID: <20090416210840.E32A470127@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xpdf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/F-10

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl3.patch 
Log Message:
3.02pl3 security update

xpdf-3.02pl3.patch:

--- NEW FILE xpdf-3.02pl3.patch ---
diff -r -c xpdf-3.02.orig/goo/gmem.cc xpdf-3.02/goo/gmem.cc
*** xpdf-3.02.orig/goo/gmem.cc	Tue Feb 27 14:05:51 2007
--- xpdf-3.02/goo/gmem.cc	Thu Mar 19 15:47:25 2009
***************
*** 55,61 ****
    void *data;
    unsigned long *trl, *p;
  
!   if (size <= 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
--- 55,69 ----
    void *data;
    unsigned long *trl, *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
***************
*** 91,97 ****
  #else
    void *p;
  
!   if (size <= 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
--- 99,113 ----
  #else
    void *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
***************
*** 112,118 ****
    void *q;
    size_t oldSize;
  
!   if (size <= 0) {
      if (p) {
        gfree(p);
      }
--- 128,142 ----
    void *q;
    size_t oldSize;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        gfree(p);
      }
***************
*** 131,137 ****
  #else
    void *q;
  
!   if (size <= 0) {
      if (p) {
        free(p);
      }
--- 155,169 ----
  #else
    void *q;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        free(p);
      }
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.cc xpdf-3.02/xpdf/JBIG2Stream.cc
*** xpdf-3.02.orig/xpdf/JBIG2Stream.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.cc	Tue Mar 31 10:55:23 2009
***************
*** 422,433 ****
    table[i] = table[len];
  
    // assign prefixes
!   i = 0;
!   prefix = 0;
!   table[i++].prefix = prefix++;
!   for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!     prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!     table[i].prefix = prefix++;
    }
  }
  
--- 422,435 ----
    table[i] = table[len];
  
    // assign prefixes
!   if (table[0].rangeLen != jbig2HuffmanEOT) {
!     i = 0;
!     prefix = 0;
!     table[i++].prefix = prefix++;
!     for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!       prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!       table[i].prefix = prefix++;
!     }
    }
  }
  
***************
*** 491,497 ****
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return 0;
    }
    bufLen -= p->bits;
    return p->n;
--- 493,499 ----
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return EOF;
    }
    bufLen -= p->bits;
    return p->n;
***************
*** 507,513 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 7 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 509,515 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 11 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 550,563 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 6 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 4 && ((buf >> (bufLen - 4)) & 0x0f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 552,566 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 10 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 7 && ((buf >> (bufLen - 4)) & 0x0f) == 0 &&
! 	       ((buf >> (bufLen - 6)) & 0x03) != 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 683,690 ****
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 686,694 ----
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 698,705 ****
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 702,710 ----
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 754,759 ****
--- 759,766 ----
  inline void JBIG2Bitmap::getPixelPtr(int x, int y, JBIG2BitmapPtr *ptr) {
    if (y < 0 || y >= h || x >= w) {
      ptr->p = NULL;
+     ptr->shift = 0; // make gcc happy
+     ptr->x = 0; // make gcc happy
    } else if (x < 0) {
      ptr->p = &data[y * line];
      ptr->shift = 7;
***************
*** 798,803 ****
--- 805,814 ----
    Guint src0, src1, src, dest, s1, s2, m1, m2, m3;
    GBool oneByte;
  
+   // check for the pathological case where y = -2^31
+   if (y < -0x7fffffff) {
+     return;
+   }
    if (y < 0) {
      y0 = -y;
    } else {
***************
*** 1011,1018 ****
--- 1022,1034 ----
  JBIG2SymbolDict::JBIG2SymbolDict(Guint segNumA, Guint sizeA):
    JBIG2Segment(segNumA)
  {
+   Guint i;
+ 
    size = sizeA;
    bitmaps = (JBIG2Bitmap **)gmallocn(size, sizeof(JBIG2Bitmap *));
+   for (i = 0; i < size; ++i) {
+     bitmaps[i] = NULL;
+   }
    genericRegionStats = NULL;
    refinementRegionStats = NULL;
  }
***************
*** 1021,1027 ****
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     delete bitmaps[i];
    }
    gfree(bitmaps);
    if (genericRegionStats) {
--- 1037,1045 ----
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     if (bitmaps[i]) {
!       delete bitmaps[i];
!     }
    }
    gfree(bitmaps);
    if (genericRegionStats) {
***************
*** 1296,1301 ****
--- 1314,1326 ----
        goto eofError2;
      }
  
+     // check for missing page information segment
+     if (!pageBitmap && ((segType >= 4 && segType <= 7) ||
+ 			(segType >= 20 && segType <= 43))) {
+       error(getPos(), "First JBIG2 segment associated with a page must be a page information segment");
+       goto syntaxError;
+     }
+ 
      // read the segment data
      switch (segType) {
      case 0:
***************
*** 1411,1416 ****
--- 1436,1443 ----
    Guint i, j, k;
    Guchar *p;
  
+   symWidths = NULL;
+ 
    // symbol dictionary flags
    if (!readUWord(&flags)) {
      goto eofError;
***************
*** 1466,1485 ****
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       numInputSyms += ((JBIG2SymbolDict *)seg)->getSize();
!     } else if (seg->getType() == jbig2SegCodeTable) {
!       codeTables->append(seg);
      }
    }
  
    // compute symbol code length
!   symCodeLen = 0;
!   i = 1;
!   while (i < numInputSyms + numNewSyms) {
      ++symCodeLen;
!     i <<= 1;
    }
  
    // get the input symbol bitmaps
--- 1493,1524 ----
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	j = ((JBIG2SymbolDict *)seg)->getSize();
! 	if (numInputSyms > UINT_MAX - j) {
! 	  error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
! 	  delete codeTables;
! 	  goto eofError;
! 	}
! 	numInputSyms += j;
!       } else if (seg->getType() == jbig2SegCodeTable) {
! 	codeTables->append(seg);
!       }
      }
    }
+   if (numInputSyms > UINT_MAX - numNewSyms) {
+     error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
+     delete codeTables;
+     goto eofError;
+   }
  
    // compute symbol code length
!   symCodeLen = 1;
!   i = (numInputSyms + numNewSyms) >> 1;
!   while (i) {
      ++symCodeLen;
!     i >>= 1;
    }
  
    // get the input symbol bitmaps
***************
*** 1491,1501 ****
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       inputSymbolDict = (JBIG2SymbolDict *)seg;
!       for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	bitmaps[k++] = inputSymbolDict->getBitmap(j);
        }
      }
    }
--- 1530,1541 ----
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	inputSymbolDict = (JBIG2SymbolDict *)seg;
! 	for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	  bitmaps[k++] = inputSymbolDict->getBitmap(j);
! 	}
        }
      }
    }
***************
*** 1510,1515 ****
--- 1550,1558 ----
      } else if (huffDH == 1) {
        huffDHTable = huffTableE;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDW == 0) {
***************
*** 1517,1533 ****
--- 1560,1585 ----
      } else if (huffDW == 1) {
        huffDWTable = huffTableC;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffBMSize == 0) {
        huffBMSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffBMSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffAggInst == 0) {
        huffAggInstTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffAggInstTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 1560,1566 ****
    }
  
    // allocate symbol widths storage
-   symWidths = NULL;
    if (huff && !refAgg) {
      symWidths = (Guint *)gmallocn(numNewSyms, sizeof(Guint));
    }
--- 1612,1617 ----
***************
*** 1602,1607 ****
--- 1653,1662 ----
  	goto syntaxError;
        }
        symWidth += dw;
+       if (i >= numNewSyms) {
+ 	error(getPos(), "Too many symbols in JBIG2 symbol dictionary");
+ 	goto syntaxError;
+       }
  
        // using a collective bitmap, so don't read a bitmap here
        if (huff && !refAgg) {
***************
*** 1638,1643 ****
--- 1693,1702 ----
  	    arithDecoder->decodeInt(&refDX, iardxStats);
  	    arithDecoder->decodeInt(&refDY, iardyStats);
  	  }
+ 	  if (symID >= numInputSyms + i) {
+ 	    error(getPos(), "Invalid symbol ID in JBIG2 symbol dictionary");
+ 	    goto syntaxError;
+ 	  }
  	  refBitmap = bitmaps[symID];
  	  bitmaps[numInputSyms + i] =
  	      readGenericRefinementRegion(symWidth, symHeight,
***************
*** 1704,1709 ****
--- 1763,1774 ----
      } else {
        arithDecoder->decodeInt(&run, iaexStats);
      }
+     if (i + run > numInputSyms + numNewSyms ||
+ 	(ex && j + run > numExSyms)) {
+       error(getPos(), "Too many exported symbols in JBIG2 symbol dictionary");
+       delete symbolDict;
+       goto syntaxError;
+     }
      if (ex) {
        for (cnt = 0; cnt < run; ++cnt) {
  	symbolDict->setBitmap(j++, bitmaps[i++]->copy());
***************
*** 1713,1718 ****
--- 1778,1788 ----
      }
      ex = !ex;
    }
+   if (j != numExSyms) {
+     error(getPos(), "Too few symbols in JBIG2 symbol dictionary");
+     delete symbolDict;
+     goto syntaxError;
+   }
  
    for (i = 0; i < numNewSyms; ++i) {
      delete bitmaps[numInputSyms + i];
***************
*** 1735,1740 ****
--- 1805,1814 ----
  
    return gTrue;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 symbol dictionary");
+   delete codeTables;
+ 
   syntaxError:
    for (i = 0; i < numNewSyms; ++i) {
      if (bitmaps[numInputSyms + i]) {
***************
*** 1837,1842 ****
--- 1911,1918 ----
        }
      } else {
        error(getPos(), "Invalid segment reference in JBIG2 text region");
+       delete codeTables;
+       return;
      }
    }
    symCodeLen = 0;
***************
*** 1871,1876 ****
--- 1947,1955 ----
      } else if (huffFS == 1) {
        huffFSTable = huffTableG;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffFSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDS == 0) {
***************
*** 1880,1885 ****
--- 1959,1967 ----
      } else if (huffDS == 2) {
        huffDSTable = huffTableJ;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDT == 0) {
***************
*** 1889,1894 ****
--- 1971,1979 ----
      } else if (huffDT == 2) {
        huffDTTable = huffTableM;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDTTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDW == 0) {
***************
*** 1896,1901 ****
--- 1981,1989 ----
      } else if (huffRDW == 1) {
        huffRDWTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDH == 0) {
***************
*** 1903,1908 ****
--- 1991,1999 ----
      } else if (huffRDH == 1) {
        huffRDHTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDX == 0) {
***************
*** 1910,1915 ****
--- 2001,2009 ----
      } else if (huffRDX == 1) {
        huffRDXTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDXTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDY == 0) {
***************
*** 1917,1927 ****
--- 2011,2027 ----
      } else if (huffRDY == 1) {
        huffRDYTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDYTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRSize == 0) {
        huffRSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 2016,2023 ****
--- 2116,2130 ----
  
    return;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 text region");
+   gfree(codeTables);
+   delete syms;
+   return;
+ 
   eofError:
    error(getPos(), "Unexpected EOF in JBIG2 stream");
+   return;
  }
  
  JBIG2Bitmap *JBIG2Stream::readTextRegion(GBool huff, GBool refine,
***************
*** 2324,2331 ****
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   seg = findSegment(refSegs[0]);
!   if (seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
--- 2431,2438 ----
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   if (!(seg = findSegment(refSegs[0])) ||
!       seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
***************
*** 2483,2489 ****
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? 0 : length - 18);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
--- 2590,2596 ----
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? length - 18 : 0);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
***************
*** 2505,2510 ****
--- 2612,2654 ----
    error(getPos(), "Unexpected EOF in JBIG2 stream");
  }
  
+ inline void JBIG2Stream::mmrAddPixels(int a1, int blackPixels,
+ 				      int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
+ inline void JBIG2Stream::mmrAddPixelsNeg(int a1, int blackPixels,
+ 					 int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   } else if (a1 < codingLine[*a0i]) {
+     if (a1 < 0) {
+       error(getPos(), "Invalid JBIG2 MMR code");
+       a1 = 0;
+     }
+     while (*a0i > 0 && a1 <= codingLine[*a0i - 1]) {
+       --*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
  JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
  					    int templ, GBool tpgdOn,
  					    GBool useSkip, JBIG2Bitmap *skip,
***************
*** 2517,2523 ****
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0, pix, i, refI, codingI;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
--- 2661,2667 ----
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0i, b1i, blackPixels, pix, i;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
***************
*** 2527,2535 ****
    if (mmr) {
  
      mmrDecoder->reset();
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = codingLine[1] = w;
  
      for (y = 0; y < h; ++y) {
  
--- 2671,2688 ----
    if (mmr) {
  
      mmrDecoder->reset();
+     if (w > INT_MAX - 2) {
+       error(getPos(), "Bad width in JBIG2 generic bitmap");
+       // force a call to gmalloc(-1), which will throw an exception
+       w = -3;
+     }
+     // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = w
+     // ---> max codingLine size = w + 1
+     // refLine has one extra guard entry at the end
+     // ---> max refLine size = w + 2
+     codingLine = (int *)gmallocn(w + 1, sizeof(int));
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = w;
  
      for (y = 0; y < h; ++y) {
  
***************
*** 2537,2664 ****
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i] = refLine[i + 1] = w;
  
        // decode a line
!       refI = 0;     // b1 = refLine[refI]
!       codingI = 0;  // a1 = codingLine[codingI]
!       a0 = 0;
!       do {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
! 	  if (refLine[refI] < w) {
! 	    a0 = refLine[refI + 1];
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimHoriz:
! 	  if (codingI & 1) {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	  } else {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	  }
! 	  if (code1 > 0 || code2 > 0) {
! 	    a0 = codingLine[codingI++] = a0 + code1;
! 	    a0 = codingLine[codingI++] = a0 + code2;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVert0:
! 	  a0 = codingLine[codingI++] = refLine[refI];
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	  }
! 	  break;
! 	case twoDimVertR1:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 1;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertR2:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 2;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
  	case twoDimVertR3:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 3;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertL1:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 1;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
! 	case twoDimVertL2:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 2;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimVertL3:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 3;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
  	  break;
  	}
!       } while (a0 < w);
!       codingLine[codingI++] = w;
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (codingLine[i] < w) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
  	i += 2;
        }
      }
--- 2690,2846 ----
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i++] = w;
!       refLine[i] = w;
  
        // decode a line
!       codingLine[0] = 0;
!       a0i = 0;
!       b1i = 0;
!       blackPixels = 0;
!       // invariant:
!       // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] <= w
!       // exception at left edge:
!       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
!       // exception at right edge:
!       //   refLine[b1i] = refLine[b1i+1] = w is possible
!       while (codingLine[a0i] < w) {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
!           mmrAddPixels(refLine[b1i + 1], blackPixels, codingLine, &a0i, w);
!           if (refLine[b1i + 1] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimHoriz:
!           code1 = code2 = 0;
!           if (blackPixels) {
!             do {
!               code1 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!           } else {
!             do {
!               code1 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!           }
!           mmrAddPixels(codingLine[a0i] + code1, blackPixels,
! 		       codingLine, &a0i, w);
!           if (codingLine[a0i] < w) {
!             mmrAddPixels(codingLine[a0i] + code2, blackPixels ^ 1,
! 			 codingLine, &a0i, w);
!           }
!           while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimVertR3:
!           mmrAddPixels(refLine[b1i] + 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR2:
!           mmrAddPixels(refLine[b1i] + 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR1:
!           mmrAddPixels(refLine[b1i] + 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVert0:
!           mmrAddPixels(refLine[b1i], blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
  	case twoDimVertL3:
!           mmrAddPixelsNeg(refLine[b1i] - 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL2:
!           mmrAddPixelsNeg(refLine[b1i] - 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL1:
!           mmrAddPixelsNeg(refLine[b1i] - 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case EOF:
!           mmrAddPixels(w, 0, codingLine, &a0i, w);
!           break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
+           mmrAddPixels(w, 0, codingLine, &a0i, w);
  	  break;
  	}
!       }
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (1) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
+ 	if (codingLine[i+1] >= w || codingLine[i+2] >= w) {
+ 	  break;
+ 	}
  	i += 2;
        }
      }
***************
*** 2706,2712 ****
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  bitmap->duplicateRow(y, y-1);
  	  continue;
  	}
        }
--- 2888,2896 ----
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  if (y > 0) {
! 	    bitmap->duplicateRow(y, y-1);
! 	  }
  	  continue;
  	}
        }
***************
*** 2909,2916 ****
      return;
    }
    if (nRefSegs == 1) {
!     seg = findSegment(refSegs[0]);
!     if (seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
--- 3093,3100 ----
      return;
    }
    if (nRefSegs == 1) {
!     if (!(seg = findSegment(refSegs[0])) ||
! 	seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
***************
*** 3004,3009 ****
--- 3188,3197 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
***************
*** 3075,3080 ****
--- 3263,3272 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.h xpdf-3.02/xpdf/JBIG2Stream.h
*** xpdf-3.02.orig/xpdf/JBIG2Stream.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.h	Tue Mar 31 10:50:07 2009
***************
*** 78,83 ****
--- 78,87 ----
  			     Guint *refSegs, Guint nRefSegs);
    void readGenericRegionSeg(Guint segNum, GBool imm,
  			    GBool lossless, Guint length);
+   void mmrAddPixels(int a1, int blackPixels,
+ 		    int *codingLine, int *a0i, int w);
+   void mmrAddPixelsNeg(int a1, int blackPixels,
+ 		       int *codingLine, int *a0i, int w);
    JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h,
  				 int templ, GBool tpgdOn,
  				 GBool useSkip, JBIG2Bitmap *skip,


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/F-10/xpdf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xpdf.spec	4 Mar 2009 21:02:22 -0000	1.14
+++ xpdf.spec	16 Apr 2009 21:08:10 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -51,6 +51,7 @@
 # Security patches
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
+Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -115,6 +116,7 @@
 # security patches
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
+%patch102 -p1 -b .security3
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -269,6 +271,11 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Thu Apr 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-13
+- apply xpdf-3.02pl3 security patch to fix:
+  CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180
+  CVE-2009-1181, CVE-2009-1182, CVE-2009-1183
+
 * Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-12
 - add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404)
 



From spot at fedoraproject.org  Thu Apr 16 21:08:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 16 Apr 2009 21:08:41 +0000 (UTC)
Subject: rpms/xpdf/F-9 xpdf-3.02pl3.patch,NONE,1.1 xpdf.spec,1.13,1.14
Message-ID: <20090416210841.8135B70127@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xpdf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/F-9

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl3.patch 
Log Message:
3.02pl3 security update

xpdf-3.02pl3.patch:

--- NEW FILE xpdf-3.02pl3.patch ---
diff -r -c xpdf-3.02.orig/goo/gmem.cc xpdf-3.02/goo/gmem.cc
*** xpdf-3.02.orig/goo/gmem.cc	Tue Feb 27 14:05:51 2007
--- xpdf-3.02/goo/gmem.cc	Thu Mar 19 15:47:25 2009
***************
*** 55,61 ****
    void *data;
    unsigned long *trl, *p;
  
!   if (size <= 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
--- 55,69 ----
    void *data;
    unsigned long *trl, *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
***************
*** 91,97 ****
  #else
    void *p;
  
!   if (size <= 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
--- 99,113 ----
  #else
    void *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
***************
*** 112,118 ****
    void *q;
    size_t oldSize;
  
!   if (size <= 0) {
      if (p) {
        gfree(p);
      }
--- 128,142 ----
    void *q;
    size_t oldSize;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        gfree(p);
      }
***************
*** 131,137 ****
  #else
    void *q;
  
!   if (size <= 0) {
      if (p) {
        free(p);
      }
--- 155,169 ----
  #else
    void *q;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        free(p);
      }
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.cc xpdf-3.02/xpdf/JBIG2Stream.cc
*** xpdf-3.02.orig/xpdf/JBIG2Stream.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.cc	Tue Mar 31 10:55:23 2009
***************
*** 422,433 ****
    table[i] = table[len];
  
    // assign prefixes
!   i = 0;
!   prefix = 0;
!   table[i++].prefix = prefix++;
!   for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!     prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!     table[i].prefix = prefix++;
    }
  }
  
--- 422,435 ----
    table[i] = table[len];
  
    // assign prefixes
!   if (table[0].rangeLen != jbig2HuffmanEOT) {
!     i = 0;
!     prefix = 0;
!     table[i++].prefix = prefix++;
!     for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!       prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!       table[i].prefix = prefix++;
!     }
    }
  }
  
***************
*** 491,497 ****
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return 0;
    }
    bufLen -= p->bits;
    return p->n;
--- 493,499 ----
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return EOF;
    }
    bufLen -= p->bits;
    return p->n;
***************
*** 507,513 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 7 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 509,515 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 11 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 550,563 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 6 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 4 && ((buf >> (bufLen - 4)) & 0x0f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 552,566 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 10 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 7 && ((buf >> (bufLen - 4)) & 0x0f) == 0 &&
! 	       ((buf >> (bufLen - 6)) & 0x03) != 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 683,690 ****
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 686,694 ----
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 698,705 ****
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 702,710 ----
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 754,759 ****
--- 759,766 ----
  inline void JBIG2Bitmap::getPixelPtr(int x, int y, JBIG2BitmapPtr *ptr) {
    if (y < 0 || y >= h || x >= w) {
      ptr->p = NULL;
+     ptr->shift = 0; // make gcc happy
+     ptr->x = 0; // make gcc happy
    } else if (x < 0) {
      ptr->p = &data[y * line];
      ptr->shift = 7;
***************
*** 798,803 ****
--- 805,814 ----
    Guint src0, src1, src, dest, s1, s2, m1, m2, m3;
    GBool oneByte;
  
+   // check for the pathological case where y = -2^31
+   if (y < -0x7fffffff) {
+     return;
+   }
    if (y < 0) {
      y0 = -y;
    } else {
***************
*** 1011,1018 ****
--- 1022,1034 ----
  JBIG2SymbolDict::JBIG2SymbolDict(Guint segNumA, Guint sizeA):
    JBIG2Segment(segNumA)
  {
+   Guint i;
+ 
    size = sizeA;
    bitmaps = (JBIG2Bitmap **)gmallocn(size, sizeof(JBIG2Bitmap *));
+   for (i = 0; i < size; ++i) {
+     bitmaps[i] = NULL;
+   }
    genericRegionStats = NULL;
    refinementRegionStats = NULL;
  }
***************
*** 1021,1027 ****
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     delete bitmaps[i];
    }
    gfree(bitmaps);
    if (genericRegionStats) {
--- 1037,1045 ----
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     if (bitmaps[i]) {
!       delete bitmaps[i];
!     }
    }
    gfree(bitmaps);
    if (genericRegionStats) {
***************
*** 1296,1301 ****
--- 1314,1326 ----
        goto eofError2;
      }
  
+     // check for missing page information segment
+     if (!pageBitmap && ((segType >= 4 && segType <= 7) ||
+ 			(segType >= 20 && segType <= 43))) {
+       error(getPos(), "First JBIG2 segment associated with a page must be a page information segment");
+       goto syntaxError;
+     }
+ 
      // read the segment data
      switch (segType) {
      case 0:
***************
*** 1411,1416 ****
--- 1436,1443 ----
    Guint i, j, k;
    Guchar *p;
  
+   symWidths = NULL;
+ 
    // symbol dictionary flags
    if (!readUWord(&flags)) {
      goto eofError;
***************
*** 1466,1485 ****
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       numInputSyms += ((JBIG2SymbolDict *)seg)->getSize();
!     } else if (seg->getType() == jbig2SegCodeTable) {
!       codeTables->append(seg);
      }
    }
  
    // compute symbol code length
!   symCodeLen = 0;
!   i = 1;
!   while (i < numInputSyms + numNewSyms) {
      ++symCodeLen;
!     i <<= 1;
    }
  
    // get the input symbol bitmaps
--- 1493,1524 ----
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	j = ((JBIG2SymbolDict *)seg)->getSize();
! 	if (numInputSyms > UINT_MAX - j) {
! 	  error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
! 	  delete codeTables;
! 	  goto eofError;
! 	}
! 	numInputSyms += j;
!       } else if (seg->getType() == jbig2SegCodeTable) {
! 	codeTables->append(seg);
!       }
      }
    }
+   if (numInputSyms > UINT_MAX - numNewSyms) {
+     error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
+     delete codeTables;
+     goto eofError;
+   }
  
    // compute symbol code length
!   symCodeLen = 1;
!   i = (numInputSyms + numNewSyms) >> 1;
!   while (i) {
      ++symCodeLen;
!     i >>= 1;
    }
  
    // get the input symbol bitmaps
***************
*** 1491,1501 ****
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       inputSymbolDict = (JBIG2SymbolDict *)seg;
!       for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	bitmaps[k++] = inputSymbolDict->getBitmap(j);
        }
      }
    }
--- 1530,1541 ----
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	inputSymbolDict = (JBIG2SymbolDict *)seg;
! 	for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	  bitmaps[k++] = inputSymbolDict->getBitmap(j);
! 	}
        }
      }
    }
***************
*** 1510,1515 ****
--- 1550,1558 ----
      } else if (huffDH == 1) {
        huffDHTable = huffTableE;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDW == 0) {
***************
*** 1517,1533 ****
--- 1560,1585 ----
      } else if (huffDW == 1) {
        huffDWTable = huffTableC;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffBMSize == 0) {
        huffBMSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffBMSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffAggInst == 0) {
        huffAggInstTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffAggInstTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 1560,1566 ****
    }
  
    // allocate symbol widths storage
-   symWidths = NULL;
    if (huff && !refAgg) {
      symWidths = (Guint *)gmallocn(numNewSyms, sizeof(Guint));
    }
--- 1612,1617 ----
***************
*** 1602,1607 ****
--- 1653,1662 ----
  	goto syntaxError;
        }
        symWidth += dw;
+       if (i >= numNewSyms) {
+ 	error(getPos(), "Too many symbols in JBIG2 symbol dictionary");
+ 	goto syntaxError;
+       }
  
        // using a collective bitmap, so don't read a bitmap here
        if (huff && !refAgg) {
***************
*** 1638,1643 ****
--- 1693,1702 ----
  	    arithDecoder->decodeInt(&refDX, iardxStats);
  	    arithDecoder->decodeInt(&refDY, iardyStats);
  	  }
+ 	  if (symID >= numInputSyms + i) {
+ 	    error(getPos(), "Invalid symbol ID in JBIG2 symbol dictionary");
+ 	    goto syntaxError;
+ 	  }
  	  refBitmap = bitmaps[symID];
  	  bitmaps[numInputSyms + i] =
  	      readGenericRefinementRegion(symWidth, symHeight,
***************
*** 1704,1709 ****
--- 1763,1774 ----
      } else {
        arithDecoder->decodeInt(&run, iaexStats);
      }
+     if (i + run > numInputSyms + numNewSyms ||
+ 	(ex && j + run > numExSyms)) {
+       error(getPos(), "Too many exported symbols in JBIG2 symbol dictionary");
+       delete symbolDict;
+       goto syntaxError;
+     }
      if (ex) {
        for (cnt = 0; cnt < run; ++cnt) {
  	symbolDict->setBitmap(j++, bitmaps[i++]->copy());
***************
*** 1713,1718 ****
--- 1778,1788 ----
      }
      ex = !ex;
    }
+   if (j != numExSyms) {
+     error(getPos(), "Too few symbols in JBIG2 symbol dictionary");
+     delete symbolDict;
+     goto syntaxError;
+   }
  
    for (i = 0; i < numNewSyms; ++i) {
      delete bitmaps[numInputSyms + i];
***************
*** 1735,1740 ****
--- 1805,1814 ----
  
    return gTrue;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 symbol dictionary");
+   delete codeTables;
+ 
   syntaxError:
    for (i = 0; i < numNewSyms; ++i) {
      if (bitmaps[numInputSyms + i]) {
***************
*** 1837,1842 ****
--- 1911,1918 ----
        }
      } else {
        error(getPos(), "Invalid segment reference in JBIG2 text region");
+       delete codeTables;
+       return;
      }
    }
    symCodeLen = 0;
***************
*** 1871,1876 ****
--- 1947,1955 ----
      } else if (huffFS == 1) {
        huffFSTable = huffTableG;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffFSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDS == 0) {
***************
*** 1880,1885 ****
--- 1959,1967 ----
      } else if (huffDS == 2) {
        huffDSTable = huffTableJ;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDT == 0) {
***************
*** 1889,1894 ****
--- 1971,1979 ----
      } else if (huffDT == 2) {
        huffDTTable = huffTableM;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDTTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDW == 0) {
***************
*** 1896,1901 ****
--- 1981,1989 ----
      } else if (huffRDW == 1) {
        huffRDWTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDH == 0) {
***************
*** 1903,1908 ****
--- 1991,1999 ----
      } else if (huffRDH == 1) {
        huffRDHTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDX == 0) {
***************
*** 1910,1915 ****
--- 2001,2009 ----
      } else if (huffRDX == 1) {
        huffRDXTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDXTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDY == 0) {
***************
*** 1917,1927 ****
--- 2011,2027 ----
      } else if (huffRDY == 1) {
        huffRDYTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDYTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRSize == 0) {
        huffRSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 2016,2023 ****
--- 2116,2130 ----
  
    return;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 text region");
+   gfree(codeTables);
+   delete syms;
+   return;
+ 
   eofError:
    error(getPos(), "Unexpected EOF in JBIG2 stream");
+   return;
  }
  
  JBIG2Bitmap *JBIG2Stream::readTextRegion(GBool huff, GBool refine,
***************
*** 2324,2331 ****
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   seg = findSegment(refSegs[0]);
!   if (seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
--- 2431,2438 ----
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   if (!(seg = findSegment(refSegs[0])) ||
!       seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
***************
*** 2483,2489 ****
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? 0 : length - 18);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
--- 2590,2596 ----
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? length - 18 : 0);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
***************
*** 2505,2510 ****
--- 2612,2654 ----
    error(getPos(), "Unexpected EOF in JBIG2 stream");
  }
  
+ inline void JBIG2Stream::mmrAddPixels(int a1, int blackPixels,
+ 				      int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
+ inline void JBIG2Stream::mmrAddPixelsNeg(int a1, int blackPixels,
+ 					 int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   } else if (a1 < codingLine[*a0i]) {
+     if (a1 < 0) {
+       error(getPos(), "Invalid JBIG2 MMR code");
+       a1 = 0;
+     }
+     while (*a0i > 0 && a1 <= codingLine[*a0i - 1]) {
+       --*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
  JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
  					    int templ, GBool tpgdOn,
  					    GBool useSkip, JBIG2Bitmap *skip,
***************
*** 2517,2523 ****
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0, pix, i, refI, codingI;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
--- 2661,2667 ----
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0i, b1i, blackPixels, pix, i;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
***************
*** 2527,2535 ****
    if (mmr) {
  
      mmrDecoder->reset();
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = codingLine[1] = w;
  
      for (y = 0; y < h; ++y) {
  
--- 2671,2688 ----
    if (mmr) {
  
      mmrDecoder->reset();
+     if (w > INT_MAX - 2) {
+       error(getPos(), "Bad width in JBIG2 generic bitmap");
+       // force a call to gmalloc(-1), which will throw an exception
+       w = -3;
+     }
+     // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = w
+     // ---> max codingLine size = w + 1
+     // refLine has one extra guard entry at the end
+     // ---> max refLine size = w + 2
+     codingLine = (int *)gmallocn(w + 1, sizeof(int));
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = w;
  
      for (y = 0; y < h; ++y) {
  
***************
*** 2537,2664 ****
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i] = refLine[i + 1] = w;
  
        // decode a line
!       refI = 0;     // b1 = refLine[refI]
!       codingI = 0;  // a1 = codingLine[codingI]
!       a0 = 0;
!       do {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
! 	  if (refLine[refI] < w) {
! 	    a0 = refLine[refI + 1];
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimHoriz:
! 	  if (codingI & 1) {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	  } else {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	  }
! 	  if (code1 > 0 || code2 > 0) {
! 	    a0 = codingLine[codingI++] = a0 + code1;
! 	    a0 = codingLine[codingI++] = a0 + code2;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVert0:
! 	  a0 = codingLine[codingI++] = refLine[refI];
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	  }
! 	  break;
! 	case twoDimVertR1:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 1;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertR2:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 2;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
  	case twoDimVertR3:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 3;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertL1:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 1;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
! 	case twoDimVertL2:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 2;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimVertL3:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 3;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
  	  break;
  	}
!       } while (a0 < w);
!       codingLine[codingI++] = w;
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (codingLine[i] < w) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
  	i += 2;
        }
      }
--- 2690,2846 ----
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i++] = w;
!       refLine[i] = w;
  
        // decode a line
!       codingLine[0] = 0;
!       a0i = 0;
!       b1i = 0;
!       blackPixels = 0;
!       // invariant:
!       // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] <= w
!       // exception at left edge:
!       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
!       // exception at right edge:
!       //   refLine[b1i] = refLine[b1i+1] = w is possible
!       while (codingLine[a0i] < w) {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
!           mmrAddPixels(refLine[b1i + 1], blackPixels, codingLine, &a0i, w);
!           if (refLine[b1i + 1] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimHoriz:
!           code1 = code2 = 0;
!           if (blackPixels) {
!             do {
!               code1 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!           } else {
!             do {
!               code1 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!           }
!           mmrAddPixels(codingLine[a0i] + code1, blackPixels,
! 		       codingLine, &a0i, w);
!           if (codingLine[a0i] < w) {
!             mmrAddPixels(codingLine[a0i] + code2, blackPixels ^ 1,
! 			 codingLine, &a0i, w);
!           }
!           while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimVertR3:
!           mmrAddPixels(refLine[b1i] + 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR2:
!           mmrAddPixels(refLine[b1i] + 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR1:
!           mmrAddPixels(refLine[b1i] + 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVert0:
!           mmrAddPixels(refLine[b1i], blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
  	case twoDimVertL3:
!           mmrAddPixelsNeg(refLine[b1i] - 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL2:
!           mmrAddPixelsNeg(refLine[b1i] - 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL1:
!           mmrAddPixelsNeg(refLine[b1i] - 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case EOF:
!           mmrAddPixels(w, 0, codingLine, &a0i, w);
!           break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
+           mmrAddPixels(w, 0, codingLine, &a0i, w);
  	  break;
  	}
!       }
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (1) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
+ 	if (codingLine[i+1] >= w || codingLine[i+2] >= w) {
+ 	  break;
+ 	}
  	i += 2;
        }
      }
***************
*** 2706,2712 ****
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  bitmap->duplicateRow(y, y-1);
  	  continue;
  	}
        }
--- 2888,2896 ----
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  if (y > 0) {
! 	    bitmap->duplicateRow(y, y-1);
! 	  }
  	  continue;
  	}
        }
***************
*** 2909,2916 ****
      return;
    }
    if (nRefSegs == 1) {
!     seg = findSegment(refSegs[0]);
!     if (seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
--- 3093,3100 ----
      return;
    }
    if (nRefSegs == 1) {
!     if (!(seg = findSegment(refSegs[0])) ||
! 	seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
***************
*** 3004,3009 ****
--- 3188,3197 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
***************
*** 3075,3080 ****
--- 3263,3272 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.h xpdf-3.02/xpdf/JBIG2Stream.h
*** xpdf-3.02.orig/xpdf/JBIG2Stream.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.h	Tue Mar 31 10:50:07 2009
***************
*** 78,83 ****
--- 78,87 ----
  			     Guint *refSegs, Guint nRefSegs);
    void readGenericRegionSeg(Guint segNum, GBool imm,
  			    GBool lossless, Guint length);
+   void mmrAddPixels(int a1, int blackPixels,
+ 		    int *codingLine, int *a0i, int w);
+   void mmrAddPixelsNeg(int a1, int blackPixels,
+ 		       int *codingLine, int *a0i, int w);
    JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h,
  				 int templ, GBool tpgdOn,
  				 GBool useSkip, JBIG2Bitmap *skip,


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/F-9/xpdf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xpdf.spec	4 Mar 2009 21:02:22 -0000	1.13
+++ xpdf.spec	16 Apr 2009 21:08:11 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -51,6 +51,7 @@
 # Security patches
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
+Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -115,6 +116,7 @@
 # security patches
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
+%patch102 -p1 -b .security3
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -269,6 +271,11 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Thu Apr 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-13
+- apply xpdf-3.02pl3 security patch to fix:
+  CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180
+  CVE-2009-1181, CVE-2009-1182, CVE-2009-1183
+
 * Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-12
 - add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404)
 



From spot at fedoraproject.org  Thu Apr 16 21:08:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 16 Apr 2009 21:08:41 +0000 (UTC)
Subject: rpms/xpdf/devel xpdf-3.02pl3.patch,NONE,1.1 xpdf.spec,1.15,1.16
Message-ID: <20090416210841.D29B470127@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xpdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3426/devel

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl3.patch 
Log Message:
3.02pl3 security update

xpdf-3.02pl3.patch:

--- NEW FILE xpdf-3.02pl3.patch ---
diff -r -c xpdf-3.02.orig/goo/gmem.cc xpdf-3.02/goo/gmem.cc
*** xpdf-3.02.orig/goo/gmem.cc	Tue Feb 27 14:05:51 2007
--- xpdf-3.02/goo/gmem.cc	Thu Mar 19 15:47:25 2009
***************
*** 55,61 ****
    void *data;
    unsigned long *trl, *p;
  
!   if (size <= 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
--- 55,69 ----
    void *data;
    unsigned long *trl, *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    size1 = gMemDataSize(size);
***************
*** 91,97 ****
  #else
    void *p;
  
!   if (size <= 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
--- 99,113 ----
  #else
    void *p;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      return NULL;
    }
    if (!(p = malloc(size))) {
***************
*** 112,118 ****
    void *q;
    size_t oldSize;
  
!   if (size <= 0) {
      if (p) {
        gfree(p);
      }
--- 128,142 ----
    void *q;
    size_t oldSize;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        gfree(p);
      }
***************
*** 131,137 ****
  #else
    void *q;
  
!   if (size <= 0) {
      if (p) {
        free(p);
      }
--- 155,169 ----
  #else
    void *q;
  
!   if (size < 0) {
! #if USE_EXCEPTIONS
!     throw GMemException();
! #else
!     fprintf(stderr, "Invalid memory allocation size\n");
!     exit(1);
! #endif
!   }
!   if (size == 0) {
      if (p) {
        free(p);
      }
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.cc xpdf-3.02/xpdf/JBIG2Stream.cc
*** xpdf-3.02.orig/xpdf/JBIG2Stream.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.cc	Tue Mar 31 10:55:23 2009
***************
*** 422,433 ****
    table[i] = table[len];
  
    // assign prefixes
!   i = 0;
!   prefix = 0;
!   table[i++].prefix = prefix++;
!   for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!     prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!     table[i].prefix = prefix++;
    }
  }
  
--- 422,435 ----
    table[i] = table[len];
  
    // assign prefixes
!   if (table[0].rangeLen != jbig2HuffmanEOT) {
!     i = 0;
!     prefix = 0;
!     table[i++].prefix = prefix++;
!     for (; table[i].rangeLen != jbig2HuffmanEOT; ++i) {
!       prefix <<= table[i].prefixLen - table[i-1].prefixLen;
!       table[i].prefix = prefix++;
!     }
    }
  }
  
***************
*** 491,497 ****
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return 0;
    }
    bufLen -= p->bits;
    return p->n;
--- 493,499 ----
    }
    if (p->bits < 0) {
      error(str->getPos(), "Bad two dim code in JBIG2 MMR stream");
!     return EOF;
    }
    bufLen -= p->bits;
    return p->n;
***************
*** 507,513 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 7 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 509,515 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 11 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 550,563 ****
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 6 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 4 && ((buf >> (bufLen - 4)) & 0x0f) == 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
--- 552,566 ----
      ++nBytesRead;
    }
    while (1) {
!     if (bufLen >= 10 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
        if (bufLen <= 13) {
  	code = buf << (13 - bufLen);
        } else {
  	code = buf >> (bufLen - 13);
        }
        p = &blackTab1[code & 0x7f];
!     } else if (bufLen >= 7 && ((buf >> (bufLen - 4)) & 0x0f) == 0 &&
! 	       ((buf >> (bufLen - 6)) & 0x03) != 0) {
        if (bufLen <= 12) {
  	code = buf << (12 - bufLen);
        } else {
***************
*** 683,690 ****
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 686,694 ----
    h = hA;
    line = (wA + 7) >> 3;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 698,705 ****
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     data = NULL;
!     return;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
--- 702,710 ----
    h = bitmap->h;
    line = bitmap->line;
    if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
!     // force a call to gmalloc(-1), which will throw an exception
!     h = -1;
!     line = 2;
    }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
***************
*** 754,759 ****
--- 759,766 ----
  inline void JBIG2Bitmap::getPixelPtr(int x, int y, JBIG2BitmapPtr *ptr) {
    if (y < 0 || y >= h || x >= w) {
      ptr->p = NULL;
+     ptr->shift = 0; // make gcc happy
+     ptr->x = 0; // make gcc happy
    } else if (x < 0) {
      ptr->p = &data[y * line];
      ptr->shift = 7;
***************
*** 798,803 ****
--- 805,814 ----
    Guint src0, src1, src, dest, s1, s2, m1, m2, m3;
    GBool oneByte;
  
+   // check for the pathological case where y = -2^31
+   if (y < -0x7fffffff) {
+     return;
+   }
    if (y < 0) {
      y0 = -y;
    } else {
***************
*** 1011,1018 ****
--- 1022,1034 ----
  JBIG2SymbolDict::JBIG2SymbolDict(Guint segNumA, Guint sizeA):
    JBIG2Segment(segNumA)
  {
+   Guint i;
+ 
    size = sizeA;
    bitmaps = (JBIG2Bitmap **)gmallocn(size, sizeof(JBIG2Bitmap *));
+   for (i = 0; i < size; ++i) {
+     bitmaps[i] = NULL;
+   }
    genericRegionStats = NULL;
    refinementRegionStats = NULL;
  }
***************
*** 1021,1027 ****
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     delete bitmaps[i];
    }
    gfree(bitmaps);
    if (genericRegionStats) {
--- 1037,1045 ----
    Guint i;
  
    for (i = 0; i < size; ++i) {
!     if (bitmaps[i]) {
!       delete bitmaps[i];
!     }
    }
    gfree(bitmaps);
    if (genericRegionStats) {
***************
*** 1296,1301 ****
--- 1314,1326 ----
        goto eofError2;
      }
  
+     // check for missing page information segment
+     if (!pageBitmap && ((segType >= 4 && segType <= 7) ||
+ 			(segType >= 20 && segType <= 43))) {
+       error(getPos(), "First JBIG2 segment associated with a page must be a page information segment");
+       goto syntaxError;
+     }
+ 
      // read the segment data
      switch (segType) {
      case 0:
***************
*** 1411,1416 ****
--- 1436,1443 ----
    Guint i, j, k;
    Guchar *p;
  
+   symWidths = NULL;
+ 
    // symbol dictionary flags
    if (!readUWord(&flags)) {
      goto eofError;
***************
*** 1466,1485 ****
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       numInputSyms += ((JBIG2SymbolDict *)seg)->getSize();
!     } else if (seg->getType() == jbig2SegCodeTable) {
!       codeTables->append(seg);
      }
    }
  
    // compute symbol code length
!   symCodeLen = 0;
!   i = 1;
!   while (i < numInputSyms + numNewSyms) {
      ++symCodeLen;
!     i <<= 1;
    }
  
    // get the input symbol bitmaps
--- 1493,1524 ----
    codeTables = new GList();
    numInputSyms = 0;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	j = ((JBIG2SymbolDict *)seg)->getSize();
! 	if (numInputSyms > UINT_MAX - j) {
! 	  error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
! 	  delete codeTables;
! 	  goto eofError;
! 	}
! 	numInputSyms += j;
!       } else if (seg->getType() == jbig2SegCodeTable) {
! 	codeTables->append(seg);
!       }
      }
    }
+   if (numInputSyms > UINT_MAX - numNewSyms) {
+     error(getPos(), "Too many input symbols in JBIG2 symbol dictionary");
+     delete codeTables;
+     goto eofError;
+   }
  
    // compute symbol code length
!   symCodeLen = 1;
!   i = (numInputSyms + numNewSyms) >> 1;
!   while (i) {
      ++symCodeLen;
!     i >>= 1;
    }
  
    // get the input symbol bitmaps
***************
*** 1491,1501 ****
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     seg = findSegment(refSegs[i]);
!     if (seg->getType() == jbig2SegSymbolDict) {
!       inputSymbolDict = (JBIG2SymbolDict *)seg;
!       for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	bitmaps[k++] = inputSymbolDict->getBitmap(j);
        }
      }
    }
--- 1530,1541 ----
    k = 0;
    inputSymbolDict = NULL;
    for (i = 0; i < nRefSegs; ++i) {
!     if ((seg = findSegment(refSegs[i]))) {
!       if (seg->getType() == jbig2SegSymbolDict) {
! 	inputSymbolDict = (JBIG2SymbolDict *)seg;
! 	for (j = 0; j < inputSymbolDict->getSize(); ++j) {
! 	  bitmaps[k++] = inputSymbolDict->getBitmap(j);
! 	}
        }
      }
    }
***************
*** 1510,1515 ****
--- 1550,1558 ----
      } else if (huffDH == 1) {
        huffDHTable = huffTableE;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDW == 0) {
***************
*** 1517,1533 ****
--- 1560,1585 ----
      } else if (huffDW == 1) {
        huffDWTable = huffTableC;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffBMSize == 0) {
        huffBMSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffBMSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffAggInst == 0) {
        huffAggInstTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffAggInstTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 1560,1566 ****
    }
  
    // allocate symbol widths storage
-   symWidths = NULL;
    if (huff && !refAgg) {
      symWidths = (Guint *)gmallocn(numNewSyms, sizeof(Guint));
    }
--- 1612,1617 ----
***************
*** 1602,1607 ****
--- 1653,1662 ----
  	goto syntaxError;
        }
        symWidth += dw;
+       if (i >= numNewSyms) {
+ 	error(getPos(), "Too many symbols in JBIG2 symbol dictionary");
+ 	goto syntaxError;
+       }
  
        // using a collective bitmap, so don't read a bitmap here
        if (huff && !refAgg) {
***************
*** 1638,1643 ****
--- 1693,1702 ----
  	    arithDecoder->decodeInt(&refDX, iardxStats);
  	    arithDecoder->decodeInt(&refDY, iardyStats);
  	  }
+ 	  if (symID >= numInputSyms + i) {
+ 	    error(getPos(), "Invalid symbol ID in JBIG2 symbol dictionary");
+ 	    goto syntaxError;
+ 	  }
  	  refBitmap = bitmaps[symID];
  	  bitmaps[numInputSyms + i] =
  	      readGenericRefinementRegion(symWidth, symHeight,
***************
*** 1704,1709 ****
--- 1763,1774 ----
      } else {
        arithDecoder->decodeInt(&run, iaexStats);
      }
+     if (i + run > numInputSyms + numNewSyms ||
+ 	(ex && j + run > numExSyms)) {
+       error(getPos(), "Too many exported symbols in JBIG2 symbol dictionary");
+       delete symbolDict;
+       goto syntaxError;
+     }
      if (ex) {
        for (cnt = 0; cnt < run; ++cnt) {
  	symbolDict->setBitmap(j++, bitmaps[i++]->copy());
***************
*** 1713,1718 ****
--- 1778,1788 ----
      }
      ex = !ex;
    }
+   if (j != numExSyms) {
+     error(getPos(), "Too few symbols in JBIG2 symbol dictionary");
+     delete symbolDict;
+     goto syntaxError;
+   }
  
    for (i = 0; i < numNewSyms; ++i) {
      delete bitmaps[numInputSyms + i];
***************
*** 1735,1740 ****
--- 1805,1814 ----
  
    return gTrue;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 symbol dictionary");
+   delete codeTables;
+ 
   syntaxError:
    for (i = 0; i < numNewSyms; ++i) {
      if (bitmaps[numInputSyms + i]) {
***************
*** 1837,1842 ****
--- 1911,1918 ----
        }
      } else {
        error(getPos(), "Invalid segment reference in JBIG2 text region");
+       delete codeTables;
+       return;
      }
    }
    symCodeLen = 0;
***************
*** 1871,1876 ****
--- 1947,1955 ----
      } else if (huffFS == 1) {
        huffFSTable = huffTableG;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffFSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDS == 0) {
***************
*** 1880,1885 ****
--- 1959,1967 ----
      } else if (huffDS == 2) {
        huffDSTable = huffTableJ;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDSTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffDT == 0) {
***************
*** 1889,1894 ****
--- 1971,1979 ----
      } else if (huffDT == 2) {
        huffDTTable = huffTableM;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffDTTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDW == 0) {
***************
*** 1896,1901 ****
--- 1981,1989 ----
      } else if (huffRDW == 1) {
        huffRDWTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDWTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDH == 0) {
***************
*** 1903,1908 ****
--- 1991,1999 ----
      } else if (huffRDH == 1) {
        huffRDHTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDHTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDX == 0) {
***************
*** 1910,1915 ****
--- 2001,2009 ----
      } else if (huffRDX == 1) {
        huffRDXTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDXTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRDY == 0) {
***************
*** 1917,1927 ****
--- 2011,2027 ----
      } else if (huffRDY == 1) {
        huffRDYTable = huffTableO;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRDYTable = ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
      if (huffRSize == 0) {
        huffRSizeTable = huffTableA;
      } else {
+       if (i >= (Guint)codeTables->getLength()) {
+ 	goto codeTableError;
+       }
        huffRSizeTable =
  	  ((JBIG2CodeTable *)codeTables->get(i++))->getHuffTable();
      }
***************
*** 2016,2023 ****
--- 2116,2130 ----
  
    return;
  
+  codeTableError:
+   error(getPos(), "Missing code table in JBIG2 text region");
+   gfree(codeTables);
+   delete syms;
+   return;
+ 
   eofError:
    error(getPos(), "Unexpected EOF in JBIG2 stream");
+   return;
  }
  
  JBIG2Bitmap *JBIG2Stream::readTextRegion(GBool huff, GBool refine,
***************
*** 2324,2331 ****
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   seg = findSegment(refSegs[0]);
!   if (seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
--- 2431,2438 ----
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
!   if (!(seg = findSegment(refSegs[0])) ||
!       seg->getType() != jbig2SegPatternDict) {
      error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
      return;
    }
***************
*** 2483,2489 ****
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? 0 : length - 18);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
--- 2590,2596 ----
  
    // read the bitmap
    bitmap = readGenericBitmap(mmr, w, h, templ, tpgdOn, gFalse,
! 			     NULL, atx, aty, mmr ? length - 18 : 0);
  
    // combine the region bitmap into the page bitmap
    if (imm) {
***************
*** 2505,2510 ****
--- 2612,2654 ----
    error(getPos(), "Unexpected EOF in JBIG2 stream");
  }
  
+ inline void JBIG2Stream::mmrAddPixels(int a1, int blackPixels,
+ 				      int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
+ inline void JBIG2Stream::mmrAddPixelsNeg(int a1, int blackPixels,
+ 					 int *codingLine, int *a0i, int w) {
+   if (a1 > codingLine[*a0i]) {
+     if (a1 > w) {
+       error(getPos(), "JBIG2 MMR row is wrong length ({0:d})", a1);
+       a1 = w;
+     }
+     if ((*a0i & 1) ^ blackPixels) {
+       ++*a0i;
+     }
+     codingLine[*a0i] = a1;
+   } else if (a1 < codingLine[*a0i]) {
+     if (a1 < 0) {
+       error(getPos(), "Invalid JBIG2 MMR code");
+       a1 = 0;
+     }
+     while (*a0i > 0 && a1 <= codingLine[*a0i - 1]) {
+       --*a0i;
+     }
+     codingLine[*a0i] = a1;
+   }
+ }
+ 
  JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
  					    int templ, GBool tpgdOn,
  					    GBool useSkip, JBIG2Bitmap *skip,
***************
*** 2517,2523 ****
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0, pix, i, refI, codingI;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
--- 2661,2667 ----
    JBIG2BitmapPtr atPtr0, atPtr1, atPtr2, atPtr3;
    int *refLine, *codingLine;
    int code1, code2, code3;
!   int x, y, a0i, b1i, blackPixels, pix, i;
  
    bitmap = new JBIG2Bitmap(0, w, h);
    bitmap->clearToZero();
***************
*** 2527,2535 ****
    if (mmr) {
  
      mmrDecoder->reset();
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = codingLine[1] = w;
  
      for (y = 0; y < h; ++y) {
  
--- 2671,2688 ----
    if (mmr) {
  
      mmrDecoder->reset();
+     if (w > INT_MAX - 2) {
+       error(getPos(), "Bad width in JBIG2 generic bitmap");
+       // force a call to gmalloc(-1), which will throw an exception
+       w = -3;
+     }
+     // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = w
+     // ---> max codingLine size = w + 1
+     // refLine has one extra guard entry at the end
+     // ---> max refLine size = w + 2
+     codingLine = (int *)gmallocn(w + 1, sizeof(int));
      refLine = (int *)gmallocn(w + 2, sizeof(int));
!     codingLine[0] = w;
  
      for (y = 0; y < h; ++y) {
  
***************
*** 2537,2664 ****
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i] = refLine[i + 1] = w;
  
        // decode a line
!       refI = 0;     // b1 = refLine[refI]
!       codingI = 0;  // a1 = codingLine[codingI]
!       a0 = 0;
!       do {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
! 	  if (refLine[refI] < w) {
! 	    a0 = refLine[refI + 1];
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimHoriz:
! 	  if (codingI & 1) {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	  } else {
! 	    code1 = 0;
! 	    do {
! 	      code1 += code3 = mmrDecoder->getWhiteCode();
! 	    } while (code3 >= 64);
! 	    code2 = 0;
! 	    do {
! 	      code2 += code3 = mmrDecoder->getBlackCode();
! 	    } while (code3 >= 64);
! 	  }
! 	  if (code1 > 0 || code2 > 0) {
! 	    a0 = codingLine[codingI++] = a0 + code1;
! 	    a0 = codingLine[codingI++] = a0 + code2;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVert0:
! 	  a0 = codingLine[codingI++] = refLine[refI];
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	  }
! 	  break;
! 	case twoDimVertR1:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 1;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertR2:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 2;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
  	case twoDimVertR3:
! 	  a0 = codingLine[codingI++] = refLine[refI] + 3;
! 	  if (refLine[refI] < w) {
! 	    ++refI;
! 	    while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	      refI += 2;
! 	    }
! 	  }
! 	  break;
! 	case twoDimVertL1:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 1;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
! 	case twoDimVertL2:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 2;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	case twoDimVertL3:
! 	  a0 = codingLine[codingI++] = refLine[refI] - 3;
! 	  if (refI > 0) {
! 	    --refI;
! 	  } else {
! 	    ++refI;
! 	  }
! 	  while (refLine[refI] <= a0 && refLine[refI] < w) {
! 	    refI += 2;
! 	  }
! 	  break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
  	  break;
  	}
!       } while (a0 < w);
!       codingLine[codingI++] = w;
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (codingLine[i] < w) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
  	i += 2;
        }
      }
--- 2690,2846 ----
        for (i = 0; codingLine[i] < w; ++i) {
  	refLine[i] = codingLine[i];
        }
!       refLine[i++] = w;
!       refLine[i] = w;
  
        // decode a line
!       codingLine[0] = 0;
!       a0i = 0;
!       b1i = 0;
!       blackPixels = 0;
!       // invariant:
!       // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] <= w
!       // exception at left edge:
!       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
!       // exception at right edge:
!       //   refLine[b1i] = refLine[b1i+1] = w is possible
!       while (codingLine[a0i] < w) {
  	code1 = mmrDecoder->get2DCode();
  	switch (code1) {
  	case twoDimPass:
!           mmrAddPixels(refLine[b1i + 1], blackPixels, codingLine, &a0i, w);
!           if (refLine[b1i + 1] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimHoriz:
!           code1 = code2 = 0;
!           if (blackPixels) {
!             do {
!               code1 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!           } else {
!             do {
!               code1 += code3 = mmrDecoder->getWhiteCode();
!             } while (code3 >= 64);
!             do {
!               code2 += code3 = mmrDecoder->getBlackCode();
!             } while (code3 >= 64);
!           }
!           mmrAddPixels(codingLine[a0i] + code1, blackPixels,
! 		       codingLine, &a0i, w);
!           if (codingLine[a0i] < w) {
!             mmrAddPixels(codingLine[a0i] + code2, blackPixels ^ 1,
! 			 codingLine, &a0i, w);
!           }
!           while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!             b1i += 2;
!           }
!           break;
  	case twoDimVertR3:
!           mmrAddPixels(refLine[b1i] + 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR2:
!           mmrAddPixels(refLine[b1i] + 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertR1:
!           mmrAddPixels(refLine[b1i] + 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVert0:
!           mmrAddPixels(refLine[b1i], blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             ++b1i;
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
  	case twoDimVertL3:
!           mmrAddPixelsNeg(refLine[b1i] - 3, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL2:
!           mmrAddPixelsNeg(refLine[b1i] - 2, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case twoDimVertL1:
!           mmrAddPixelsNeg(refLine[b1i] - 1, blackPixels, codingLine, &a0i, w);
!           blackPixels ^= 1;
!           if (codingLine[a0i] < w) {
!             if (b1i > 0) {
!               --b1i;
!             } else {
!               ++b1i;
!             }
!             while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
!               b1i += 2;
!             }
!           }
!           break;
! 	case EOF:
!           mmrAddPixels(w, 0, codingLine, &a0i, w);
!           break;
  	default:
  	  error(getPos(), "Illegal code in JBIG2 MMR bitmap data");
+           mmrAddPixels(w, 0, codingLine, &a0i, w);
  	  break;
  	}
!       }
  
        // convert the run lengths to a bitmap line
        i = 0;
!       while (1) {
  	for (x = codingLine[i]; x < codingLine[i+1]; ++x) {
  	  bitmap->setPixel(x, y);
  	}
+ 	if (codingLine[i+1] >= w || codingLine[i+2] >= w) {
+ 	  break;
+ 	}
  	i += 2;
        }
      }
***************
*** 2706,2712 ****
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  bitmap->duplicateRow(y, y-1);
  	  continue;
  	}
        }
--- 2888,2896 ----
  	  ltp = !ltp;
  	}
  	if (ltp) {
! 	  if (y > 0) {
! 	    bitmap->duplicateRow(y, y-1);
! 	  }
  	  continue;
  	}
        }
***************
*** 2909,2916 ****
      return;
    }
    if (nRefSegs == 1) {
!     seg = findSegment(refSegs[0]);
!     if (seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
--- 3093,3100 ----
      return;
    }
    if (nRefSegs == 1) {
!     if (!(seg = findSegment(refSegs[0])) ||
! 	seg->getType() != jbig2SegBitmap) {
        error(getPos(), "Bad bitmap reference in JBIG2 generic refinement segment");
        return;
      }
***************
*** 3004,3009 ****
--- 3188,3197 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
***************
*** 3075,3080 ****
--- 3263,3272 ----
  	tpgrCX2 = refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
  	tpgrCX2 = (tpgrCX2 << 1) | refBitmap->nextPixel(&tpgrCXPtr2);
+       } else {
+ 	tpgrCXPtr0.p = tpgrCXPtr1.p = tpgrCXPtr2.p = NULL; // make gcc happy
+ 	tpgrCXPtr0.shift = tpgrCXPtr1.shift = tpgrCXPtr2.shift = 0;
+ 	tpgrCXPtr0.x = tpgrCXPtr1.x = tpgrCXPtr2.x = 0;
        }
  
        for (x = 0; x < w; ++x) {
diff -r -c xpdf-3.02.orig/xpdf/JBIG2Stream.h xpdf-3.02/xpdf/JBIG2Stream.h
*** xpdf-3.02.orig/xpdf/JBIG2Stream.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/JBIG2Stream.h	Tue Mar 31 10:50:07 2009
***************
*** 78,83 ****
--- 78,87 ----
  			     Guint *refSegs, Guint nRefSegs);
    void readGenericRegionSeg(Guint segNum, GBool imm,
  			    GBool lossless, Guint length);
+   void mmrAddPixels(int a1, int blackPixels,
+ 		    int *codingLine, int *a0i, int w);
+   void mmrAddPixelsNeg(int a1, int blackPixels,
+ 		       int *codingLine, int *a0i, int w);
    JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h,
  				 int templ, GBool tpgdOn,
  				 GBool useSkip, JBIG2Bitmap *skip,


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xpdf.spec	4 Mar 2009 21:02:22 -0000	1.15
+++ xpdf.spec	16 Apr 2009 21:08:11 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -51,6 +51,7 @@
 # Security patches
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
+Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -115,6 +116,7 @@
 # security patches
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
+%patch102 -p1 -b .security3
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -269,6 +271,11 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Thu Apr 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-13
+- apply xpdf-3.02pl3 security patch to fix:
+  CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180
+  CVE-2009-1181, CVE-2009-1182, CVE-2009-1183
+
 * Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-12
 - add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404)
 



From scop at fedoraproject.org  Thu Apr 16 21:08:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 16 Apr 2009 21:08:47 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix.spec,1.40,1.41
Message-ID: <20090416210847.E23C870127@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3916

Modified Files:
	zabbix.spec 
Log Message:
Restart running services on package upgrades.


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- zabbix.spec	16 Apr 2009 21:01:08 -0000	1.40
+++ zabbix.spec	16 Apr 2009 21:08:17 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -425,6 +425,25 @@
 fi
 :
 
+%postun server
+if [ $1 -ge 1 ]
+then
+  /sbin/service zabbix-server try-restart >/dev/null 2>&1 || :
+fi
+
+%postun proxy
+if [ $1 -ge 1 ]
+then
+  /sbin/service zabbix-proxy try-restart >/dev/null 2>&1 || :
+fi
+
+%postun agent
+if [ $1 -ge 1 ]
+then
+  /sbin/service zabbix-agent try-restart >/dev/null 2>&1 || :
+fi
+
+
 %post web
 # move existing config file on update
 if [ "$1" -ge "1" ]
@@ -517,10 +536,11 @@
 
 
 %changelog
-* Thu Apr  9 2009 Ville Skytt?? <ville.skytta at iki.fi>
+* Fri Apr 17 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.4-3
 - Tighten configuration file permissions.
 - Ensure zero exit status from scriptlets.
 - Improve init script LSB compliance.
+- Restart running services on package upgrades.
 
 * Thu Apr  9 2009 Dan Hor??k <dan[at]danny.cz> - 1.6.4-2
 - make the -docs subpackage noarch



From svahl at fedoraproject.org  Thu Apr 16 21:11:50 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Thu, 16 Apr 2009 21:11:50 +0000 (UTC)
Subject: rpms/roxterm/devel roxterm-1.14.2-help.patch, NONE, 1.1 .cvsignore, 
	1.15, 1.16 roxterm.spec, 1.14, 1.15 sources, 1.15, 1.16
Message-ID: <20090416211150.BEA2B70127@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5082

Modified Files:
	.cvsignore roxterm.spec sources 
Added Files:
	roxterm-1.14.2-help.patch 
Log Message:
* Thu Apr 16 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.2-1
- new upstream version: 1.14.2
- fix help link


roxterm-1.14.2-help.patch:

--- NEW FILE roxterm-1.14.2-help.patch ---
diff -up ./configure.orig ./configure
--- ./configure.orig	2009-04-16 22:55:18.029106971 +0200
+++ ./configure	2009-04-16 22:57:07.503855953 +0200
@@ -22097,7 +22097,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define PKG_DOC_DIR "$dir/doc/$PACKAGE"
+#define PKG_DOC_DIR "$dir/doc/$PACKAGE-$VERSION"
 _ACEOF
 
 pkgdocdir="$dir/doc/$PACKAGE"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Apr 2009 22:30:43 -0000	1.15
+++ .cvsignore	16 Apr 2009 21:11:18 -0000	1.16
@@ -1 +1 @@
-roxterm-1.14.1.tar.gz
+roxterm-1.14.2.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/roxterm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- roxterm.spec	9 Apr 2009 22:30:43 -0000	1.14
+++ roxterm.spec	16 Apr 2009 21:11:19 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.14.1
+Version:        1.14.2
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -7,11 +7,11 @@
 License:        GPLv2+
 URL:            http://roxterm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:         roxterm-1.14.2-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vte-devel libglade2-devel gtk2-devel dbus-glib-devel desktop-file-utils
 BuildRequires:  dbus-devel
-#Requires:       
 
 %description
 ROXTerm is a terminal emulator intended to provide similar 
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .help
 
 %build
 %configure
@@ -72,6 +72,10 @@
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Thu Apr 16 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.2-1
+- new upstream version: 1.14.2
+- fix help link
+
 * Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.1-1
 - new upstream version: 1.14.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Apr 2009 22:30:43 -0000	1.15
+++ sources	16 Apr 2009 21:11:19 -0000	1.16
@@ -1 +1 @@
-906a8e98eaf84dd9f3c4c920786e2038  roxterm-1.14.1.tar.gz
+22b2696ecd7cd977a0c00e791a4451b8  roxterm-1.14.2.tar.gz



From kevin at fedoraproject.org  Thu Apr 16 21:38:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 21:38:21 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings.spec, 1.11,
	1.12 xfce4-settings-4.6.0-fedora.patch, 1.2, 1.3
Message-ID: <20090416213821.3837B70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10238

Modified Files:
	xfce4-settings.spec xfce4-settings-4.6.0-fedora.patch 
Log Message:
Have to add Antialias type to really enable by default.



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-settings.spec	15 Apr 2009 20:05:54 -0000	1.11
+++ xfce4-settings.spec	16 Apr 2009 21:37:50 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -111,6 +111,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Thu Apr 16 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-6
+- Have to add Antialias type to really enable by default. 
+
 * Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-5
 - Bump to fix tagging mistake. 
 

xfce4-settings-4.6.0-fedora.patch:

Index: xfce4-settings-4.6.0-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings-4.6.0-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-settings-4.6.0-fedora.patch	15 Apr 2009 19:57:43 -0000	1.2
+++ xfce4-settings-4.6.0-fedora.patch	16 Apr 2009 21:37:50 -0000	1.3
@@ -1,7 +1,7 @@
 diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
 --- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml	2009-02-20 10:12:35.000000000 -0700
-+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-15 13:08:22.000000000 -0600
-@@ -2,10 +2,11 @@
++++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-16 15:25:44.000000000 -0600
+@@ -2,10 +2,12 @@
  
  <channel name="xsettings" version="1.0">
    <property name="Net" type="empty">
@@ -13,5 +13,6 @@
    <property name="Xft" type="empty">
      <property name="DPI" type="int" value="-1"/>
 +    <property name="Antialias" type="int" value="1"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
    </property>
  </channel>



From wwoods at fedoraproject.org  Thu Apr 16 21:40:04 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 16 Apr 2009 21:40:04 +0000 (UTC)
Subject: rpms/preupgrade/F-11 .cvsignore, 1.5, 1.6 preupgrade.spec, 1.12,
	1.13 releases.txt, 1.2, 1.3 sources, 1.8, 1.9
Message-ID: <20090416214004.ABB3470127@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11021

Modified Files:
	.cvsignore preupgrade.spec releases.txt sources 
Log Message:
1.1.0pre1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Dec 2008 23:32:39 -0000	1.5
+++ .cvsignore	16 Apr 2009 21:39:33 -0000	1.6
@@ -1 +1 @@
-preupgrade-1.0.1.tar.gz
+preupgrade-1.1.0pre1.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/preupgrade.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- preupgrade.spec	27 Feb 2009 02:18:18 -0000	1.12
+++ preupgrade.spec	16 Apr 2009 21:39:34 -0000	1.13
@@ -1,11 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-Summary: Preresolves dependencies and prepares a system for an upgrade
+Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.0.1
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 0.pre1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+#Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+Source: preupgrade-1.1.0pre1.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,11 +38,12 @@
 %endif
 
 %description
-Preresolves all dependencies, downloads the packages and makes your system 
-ready for an upgrade via anaconda.
+preupgrade prepares your Fedora system for an upgrade to the next version
+by examining your system, downloading all the files needed for the upgrade,
+and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q
+%setup -q -n preupgrade-1.1.0pre1
 
 %build
 # no op
@@ -74,8 +76,13 @@
 %{python_sitelib}/%{name}
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
+- Try to get new packages for *all* repos, including updates (bug 473966)
+- Fix UnicodeDecodeError downloading packages (bug 476862)
+- Fix traceback if network isn't up at startup (bug 474177)
+- Specify which system to upgrade in kickstart (bug 473016)
+- Fix traceback with certain mirrors (bug 487743)
+- Fix problems with "excludes=" in yum.conf (bug 491577)
 
 * Mon Dec  8 2008 Will Woods <wwoods at redhat.com> - 1.0.1-1
 - Fix yaboot Conflicts: to allow installation on ppc (bug 473065)


Index: releases.txt
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/releases.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- releases.txt	21 Nov 2008 23:32:50 -0000	1.2
+++ releases.txt	16 Apr 2009 21:39:34 -0000	1.3
@@ -1,7 +1,5 @@
-# Example releases.list.
-# The official version is here: http://mirrors.fedoraproject.org/releases.txt
+# releases.list - a list of available Fedora releases.
 #
-# This file contains a list of available Fedora releases.
 # Format is as follows:
 #
 #[Release Name] 
@@ -54,6 +52,7 @@
 [Fedora 8 (Werewolf)]
 stable=True
 version=8
+eol-date=20090107
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
 installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/8/Fedora/$basearch/os
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Dec 2008 23:32:39 -0000	1.8
+++ sources	16 Apr 2009 21:39:34 -0000	1.9
@@ -1 +1 @@
-7682a56b49fe0632edb24173eacccb27  preupgrade-1.0.1.tar.gz
+c8afb8535a0fc74d216775d1f804d2d3  preupgrade-1.1.0pre1.tar.bz2



From wwoods at fedoraproject.org  Thu Apr 16 21:41:52 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 16 Apr 2009 21:41:52 +0000 (UTC)
Subject: rpms/preupgrade/F-10 .cvsignore, 1.5, 1.6 preupgrade.spec, 1.10,
	1.11 releases.txt, 1.2, 1.3 sources, 1.8, 1.9
Message-ID: <20090416214152.1954670127@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11775/F-10

Modified Files:
	.cvsignore preupgrade.spec releases.txt sources 
Log Message:
1.1.0pre1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Dec 2008 23:36:27 -0000	1.5
+++ .cvsignore	16 Apr 2009 21:41:21 -0000	1.6
@@ -1 +1 @@
-preupgrade-1.0.1.tar.gz
+preupgrade-1.1.0pre1.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/preupgrade.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- preupgrade.spec	5 Dec 2008 23:36:27 -0000	1.10
+++ preupgrade.spec	16 Apr 2009 21:41:21 -0000	1.11
@@ -1,11 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-Summary: Preresolves dependencies and prepares a system for an upgrade
+Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.0.1
-Release: 1%{?dist}
+Version: 1.1.0
+Release: 0.pre1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+#Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+Source: preupgrade-1.1.0pre1.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,11 +38,12 @@
 %endif
 
 %description
-Preresolves all dependencies, downloads the packages and makes your system 
-ready for an upgrade via anaconda.
+preupgrade prepares your Fedora system for an upgrade to the next version
+by examining your system, downloading all the files needed for the upgrade,
+and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q
+%setup -q -n preupgrade-1.1.0pre1
 
 %build
 # no op
@@ -74,6 +76,14 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
+- Try to get new packages for *all* repos, including updates (bug 473966)
+- Fix UnicodeDecodeError downloading packages (bug 476862)
+- Fix traceback if network isn't up at startup (bug 474177)
+- Specify which system to upgrade in kickstart (bug 473016)
+- Fix traceback with certain mirrors (bug 487743)
+- Fix problems with "excludes=" in yum.conf (bug 491577)
+
 * Mon Dec  8 2008 Will Woods <wwoods at redhat.com> - 1.0.1-1
 - Fix yaboot Conflicts: to allow installation on ppc (bug 473065)
 - Fix crash with separate /var partition or mdraid root (bug 473782)


Index: releases.txt
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/releases.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- releases.txt	21 Nov 2008 23:34:36 -0000	1.2
+++ releases.txt	16 Apr 2009 21:41:21 -0000	1.3
@@ -1,7 +1,5 @@
-# Example releases.list.
-# The official version is here: http://mirrors.fedoraproject.org/releases.txt
+# releases.list - a list of available Fedora releases.
 #
-# This file contains a list of available Fedora releases.
 # Format is as follows:
 #
 #[Release Name] 
@@ -54,6 +52,7 @@
 [Fedora 8 (Werewolf)]
 stable=True
 version=8
+eol-date=20090107
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
 installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/8/Fedora/$basearch/os
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Dec 2008 23:36:27 -0000	1.8
+++ sources	16 Apr 2009 21:41:21 -0000	1.9
@@ -1 +1 @@
-7682a56b49fe0632edb24173eacccb27  preupgrade-1.0.1.tar.gz
+c8afb8535a0fc74d216775d1f804d2d3  preupgrade-1.1.0pre1.tar.bz2



From wwoods at fedoraproject.org  Thu Apr 16 21:41:52 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Thu, 16 Apr 2009 21:41:52 +0000 (UTC)
Subject: rpms/preupgrade/F-9 .cvsignore, 1.4, 1.5 preupgrade.spec, 1.11,
	1.12 releases.txt, 1.2, 1.3 sources, 1.8, 1.9
Message-ID: <20090416214152.419EC70127@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11775/F-9

Modified Files:
	.cvsignore preupgrade.spec releases.txt sources 
Log Message:
1.1.0pre1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Dec 2008 23:37:12 -0000	1.4
+++ .cvsignore	16 Apr 2009 21:41:21 -0000	1.5
@@ -1 +1 @@
-preupgrade-1.0.1.tar.gz
+preupgrade-1.1.0pre1.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/preupgrade.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- preupgrade.spec	5 Dec 2008 23:37:12 -0000	1.11
+++ preupgrade.spec	16 Apr 2009 21:41:21 -0000	1.12
@@ -1,11 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-Summary: Preresolves dependencies and prepares a system for an upgrade
+Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.0.1
-Release: 1%{?dist}
+Version: 1.1.0
+Release: 0.pre1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+#Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+Source: preupgrade-1.1.0pre1.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,11 +38,12 @@
 %endif
 
 %description
-Preresolves all dependencies, downloads the packages and makes your system 
-ready for an upgrade via anaconda.
+preupgrade prepares your Fedora system for an upgrade to the next version
+by examining your system, downloading all the files needed for the upgrade,
+and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q
+%setup -q -n preupgrade-1.1.0pre1
 
 %build
 # no op
@@ -74,6 +76,14 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
+- Try to get new packages for *all* repos, including updates (bug 473966)
+- Fix UnicodeDecodeError downloading packages (bug 476862)
+- Fix traceback if network isn't up at startup (bug 474177)
+- Specify which system to upgrade in kickstart (bug 473016)
+- Fix traceback with certain mirrors (bug 487743)
+- Fix problems with "excludes=" in yum.conf (bug 491577)
+
 * Mon Dec  8 2008 Will Woods <wwoods at redhat.com> - 1.0.1-1
 - Fix yaboot Conflicts: to allow installation on ppc (bug 473065)
 - Fix crash with separate /var partition or mdraid root (bug 473782)


Index: releases.txt
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/releases.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- releases.txt	21 Nov 2008 23:35:45 -0000	1.2
+++ releases.txt	16 Apr 2009 21:41:21 -0000	1.3
@@ -1,7 +1,5 @@
-# Example releases.list.
-# The official version is here: http://mirrors.fedoraproject.org/releases.txt
+# releases.list - a list of available Fedora releases.
 #
-# This file contains a list of available Fedora releases.
 # Format is as follows:
 #
 #[Release Name] 
@@ -54,6 +52,7 @@
 [Fedora 8 (Werewolf)]
 stable=True
 version=8
+eol-date=20090107
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
 installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/8/Fedora/$basearch/os
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Dec 2008 23:37:12 -0000	1.8
+++ sources	16 Apr 2009 21:41:21 -0000	1.9
@@ -1 +1 @@
-7682a56b49fe0632edb24173eacccb27  preupgrade-1.0.1.tar.gz
+c8afb8535a0fc74d216775d1f804d2d3  preupgrade-1.1.0pre1.tar.bz2



From kevin at fedoraproject.org  Thu Apr 16 21:47:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 16 Apr 2009 21:47:38 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11 xfce4-settings.spec, 1.10,
	1.11 xfce4-settings-4.6.0-fedora.patch, 1.2, 1.3
Message-ID: <20090416214738.2365070127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13172

Modified Files:
	xfce4-settings.spec xfce4-settings-4.6.0-fedora.patch 
Log Message:
Have to add Antialias type to really enable by default



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-settings.spec	15 Apr 2009 20:24:24 -0000	1.10
+++ xfce4-settings.spec	16 Apr 2009 21:47:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -111,6 +111,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Thu Apr 16 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-6
+- Have to add Antialias type to really enable by default. 
+
 * Wed Apr 15 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-5
 - Bump to fix tagging mistake. 
 

xfce4-settings-4.6.0-fedora.patch:

Index: xfce4-settings-4.6.0-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/xfce4-settings-4.6.0-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-settings-4.6.0-fedora.patch	15 Apr 2009 20:24:24 -0000	1.2
+++ xfce4-settings-4.6.0-fedora.patch	16 Apr 2009 21:47:07 -0000	1.3
@@ -1,7 +1,7 @@
 diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
 --- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml	2009-02-20 10:12:35.000000000 -0700
-+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-15 13:08:22.000000000 -0600
-@@ -2,10 +2,11 @@
++++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml	2009-04-16 15:25:44.000000000 -0600
+@@ -2,10 +2,12 @@
  
  <channel name="xsettings" version="1.0">
    <property name="Net" type="empty">
@@ -13,5 +13,6 @@
    <property name="Xft" type="empty">
      <property name="DPI" type="int" value="-1"/>
 +    <property name="Antialias" type="int" value="1"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
    </property>
  </channel>



From maxamillion at fedoraproject.org  Thu Apr 16 21:50:32 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 16 Apr 2009 21:50:32 +0000 (UTC)
Subject: rpms/python-twyt/F-10 python-twyt-0.9.2-setdefault.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 python-twyt.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090416215032.1123970127@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-twyt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13817/F-10

Modified Files:
	.cvsignore import.log python-twyt.spec sources 
Added Files:
	python-twyt-0.9.2-setdefault.patch 
Log Message:
Bug found upstream that has been there since 0.8.5, this version fixes



python-twyt-0.9.2-setdefault.patch:

--- NEW FILE python-twyt-0.9.2-setdefault.patch ---
=== modified file 'twyt/commands.py'
--- twyt/commands.py	2009-04-08 19:50:38 +0000
+++ twyt/commands.py	2009-04-16 12:30:05 +0000
@@ -772,7 +772,7 @@
 		if options.password and options.user:
 			base.config.set_password(options.user, options.password)
 			if options.default:
-				base.config.set_default(options.user)
+				base.config.set_default_account(options.user)
 		elif options.user:
 			newacc = False
 			if not base.config.have_account(options.user):



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 21:13:25 -0000	1.5
+++ .cvsignore	16 Apr 2009 21:50:01 -0000	1.6
@@ -1 +1 @@
-twyt-0.9.1.tar.gz
+twyt-0.9.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Feb 2009 21:13:25 -0000	1.1
+++ import.log	16 Apr 2009 21:50:01 -0000	1.2
@@ -1 +1,2 @@
 python-twyt-0_9_1-1_fc10:F-10:python-twyt-0.9.1-1.fc10.src.rpm:1235769178
+python-twyt-0_9_2-2:F-10:python-twyt-0.9.2-2.src.rpm:1239918551


Index: python-twyt.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-10/python-twyt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-twyt.spec	27 Feb 2009 21:13:25 -0000	1.4
+++ python-twyt.spec	16 Apr 2009 21:50:01 -0000	1.5
@@ -2,12 +2,15 @@
 
 Summary: An interface to Twitter API functions for Python
 Name: python-twyt
-Version: 0.9.1
-Release: 1%{?dist}
+Version: 0.9.2
+Release: 2%{?dist}
+
 Group: System Environment/Libraries
 License: BSD
 URL: http://andrewprice.me.uk/projects/twyt/
 Source: http://andrewprice.me.uk/projects/twyt/download/twyt-%version.tar.gz
+Patch0: python-twyt-0.9.2-setdefault.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
 BuildRequires: python-devel
@@ -24,6 +27,7 @@
 
 %prep
 %setup -q -n twyt-%{version}
+%patch0 -p0 -b .setdefault
 
 %build
 python setup.py build
@@ -47,6 +51,12 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-2
+- Upstream released a patch to fix set default account bug
+
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-1
+- New upstream release
+
 * Fri Feb 27 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 21:13:25 -0000	1.5
+++ sources	16 Apr 2009 21:50:01 -0000	1.6
@@ -1 +1 @@
-8232a3e998e281e8b69d0a90af1a0cf9  twyt-0.9.1.tar.gz
+609a094e85a3d36b89d1a3d173ebfd9d  twyt-0.9.2.tar.gz



From maxamillion at fedoraproject.org  Thu Apr 16 21:51:11 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 16 Apr 2009 21:51:11 +0000 (UTC)
Subject: rpms/python-twyt/F-9 python-twyt-0.9.2-setdefault.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 python-twyt.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090416215111.C07CA70127@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-twyt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14323/F-9

Modified Files:
	.cvsignore import.log python-twyt.spec sources 
Added Files:
	python-twyt-0.9.2-setdefault.patch 
Log Message:
Bug found upstream that has been there since 0.8.5, this version fixes



python-twyt-0.9.2-setdefault.patch:

--- NEW FILE python-twyt-0.9.2-setdefault.patch ---
=== modified file 'twyt/commands.py'
--- twyt/commands.py	2009-04-08 19:50:38 +0000
+++ twyt/commands.py	2009-04-16 12:30:05 +0000
@@ -772,7 +772,7 @@
 		if options.password and options.user:
 			base.config.set_password(options.user, options.password)
 			if options.default:
-				base.config.set_default(options.user)
+				base.config.set_default_account(options.user)
 		elif options.user:
 			newacc = False
 			if not base.config.have_account(options.user):



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 21:17:39 -0000	1.5
+++ .cvsignore	16 Apr 2009 21:51:09 -0000	1.6
@@ -1 +1 @@
-twyt-0.9.1.tar.gz
+twyt-0.9.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Feb 2009 21:17:39 -0000	1.1
+++ import.log	16 Apr 2009 21:51:09 -0000	1.2
@@ -1 +1,2 @@
 python-twyt-0_9_1-1_fc10:F-9:python-twyt-0.9.1-1.fc10.src.rpm:1235769368
+python-twyt-0_9_2-2:F-9:python-twyt-0.9.2-2.src.rpm:1239918645


Index: python-twyt.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-9/python-twyt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-twyt.spec	27 Feb 2009 21:17:39 -0000	1.4
+++ python-twyt.spec	16 Apr 2009 21:51:09 -0000	1.5
@@ -2,12 +2,15 @@
 
 Summary: An interface to Twitter API functions for Python
 Name: python-twyt
-Version: 0.9.1
-Release: 1%{?dist}
+Version: 0.9.2
+Release: 2%{?dist}
+
 Group: System Environment/Libraries
 License: BSD
 URL: http://andrewprice.me.uk/projects/twyt/
 Source: http://andrewprice.me.uk/projects/twyt/download/twyt-%version.tar.gz
+Patch0: python-twyt-0.9.2-setdefault.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
 BuildRequires: python-devel
@@ -24,6 +27,7 @@
 
 %prep
 %setup -q -n twyt-%{version}
+%patch0 -p0 -b .setdefault
 
 %build
 python setup.py build
@@ -47,6 +51,12 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-2
+- Upstream released a patch to fix set default account bug
+
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.2-1
+- New upstream release
+
 * Fri Feb 27 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.9.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twyt/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 21:17:39 -0000	1.5
+++ sources	16 Apr 2009 21:51:09 -0000	1.6
@@ -1 +1 @@
-8232a3e998e281e8b69d0a90af1a0cf9  twyt-0.9.1.tar.gz
+609a094e85a3d36b89d1a3d173ebfd9d  twyt-0.9.2.tar.gz



From pkgdb at fedoraproject.org  Thu Apr 16 23:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 23:24:26 +0000
Subject: [pkgdb] libXext: whot has requested watchcommits
Message-ID: <20090416232427.66D0C10F87B@bastion2.fedora.phx.redhat.com>

whot has requested the watchcommits acl on libXext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Thu Apr 16 23:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 23:24:29 +0000
Subject: [pkgdb] libXext: whot has requested commit
Message-ID: <20090416232430.4960510F87C@bastion2.fedora.phx.redhat.com>

whot has requested the commit acl on libXext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Thu Apr 16 23:24:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 23:24:34 +0000
Subject: [pkgdb] libXext: whot has requested watchcommits
Message-ID: <20090416232434.A98BE10F880@bastion2.fedora.phx.redhat.com>

whot has requested the watchcommits acl on libXext (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Thu Apr 16 23:24:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 23:24:34 +0000
Subject: [pkgdb] libXext: whot has requested commit
Message-ID: <20090416232435.0802B10F883@bastion2.fedora.phx.redhat.com>

whot has requested the commit acl on libXext (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Thu Apr 16 23:24:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 23:24:37 +0000
Subject: [pkgdb] libXext: whot has requested watchcommits
Message-ID: <20090416232437.EA7CB10F886@bastion2.fedora.phx.redhat.com>

whot has requested the watchcommits acl on libXext (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Thu Apr 16 23:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 16 Apr 2009 23:24:38 +0000
Subject: [pkgdb] libXext: whot has requested commit
Message-ID: <20090416232438.73B1410F88A@bastion2.fedora.phx.redhat.com>

whot has requested the commit acl on libXext (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From rmccabe at fedoraproject.org  Thu Apr 16 23:25:48 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 16 Apr 2009 23:25:48 +0000 (UTC)
Subject: rpms/clustermon/F-11 .cvsignore, 1.4, 1.5 clustermon.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <20090416232548.C6D7670127@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/clustermon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1213

Modified Files:
	.cvsignore clustermon.spec sources 
Log Message:
* Thu Apr 16 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.1-1
- Fix memory corruption bug.
- Cleanup stale code paths.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2009 19:54:26 -0000	1.4
+++ .cvsignore	16 Apr 2009 23:25:14 -0000	1.5
@@ -1 +1 @@
-clustermon-0.16.0.tar.gz
+clustermon-0.16.1.tar.gz


Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/F-11/clustermon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clustermon.spec	30 Mar 2009 19:54:26 -0000	1.11
+++ clustermon.spec	16 Apr 2009 23:25:14 -0000	1.12
@@ -16,7 +16,7 @@
 
 
 Name: clustermon
-Version: 0.16.0
+Version: 0.16.1
 Release: 1%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
@@ -24,7 +24,7 @@
 Group: System Environment/Base
 Summary: Monitoring and management of Red Hat Cluster Suite
 
-Source0: http://people.redhat.com/rmccabe/conga/fedora/src/clustermon-0.16.0.tar.gz
+Source0: http://people.redhat.com/rmccabe/conga/fedora/src/clustermon-0.16.1.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clusterlib-devel
@@ -171,6 +171,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.1-1
+- Fix memory corruption bug.
+- Cleanup stale code paths.
+
 * Mon Mar 30 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-1
 - Remove legacy RHEL4 and RHEL5-specific code.
 - Fix build issues uncovered by g++ 4.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2009 19:54:26 -0000	1.6
+++ sources	16 Apr 2009 23:25:14 -0000	1.7
@@ -1 +1 @@
-0af7b793cc7f741d5db3505207ab4abb  clustermon-0.16.0.tar.gz
+36e79b44b0e1235d694a838a5e3e9750  clustermon-0.16.1.tar.gz



From rmccabe at fedoraproject.org  Thu Apr 16 23:28:01 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 16 Apr 2009 23:28:01 +0000 (UTC)
Subject: rpms/ricci/F-11 .cvsignore, 1.4, 1.5 ricci.spec, 1.17, 1.18 sources,
	1.12, 1.13
Message-ID: <20090416232801.11F2870127@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1777

Modified Files:
	.cvsignore ricci.spec sources 
Log Message:
* Thu Apr 16 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.1-1
- More updates for cluster3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2009 19:59:11 -0000	1.4
+++ .cvsignore	16 Apr 2009 23:27:30 -0000	1.5
@@ -1 +1 @@
-ricci-0.16.0.tar.gz
+ricci-0.16.1.tar.gz


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-11/ricci.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ricci.spec	16 Apr 2009 06:38:49 -0000	1.17
+++ ricci.spec	16 Apr 2009 23:27:30 -0000	1.18
@@ -9,13 +9,13 @@
 ###############################################################################
 
 Name: ricci
-Version: 0.16.0
-Release: 2%{?dist}
+Version: 0.16.1
+Release: 1%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
 Summary: Remote Cluster and Storage Management System
-Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.16.0.tar.gz
+Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.16.1.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel python-devel libcap-devel
@@ -121,6 +121,9 @@
 exit 0
 
 %changelog
+* Thu Apr 16 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.1-1
+- More updates for cluster3.
+
 * Tue Apr 07 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-2
 - Fix memory corruption bug.
 - Update package and service list.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Apr 2009 06:38:50 -0000	1.12
+++ sources	16 Apr 2009 23:27:30 -0000	1.13
@@ -1 +1 @@
-043609b17009b1910e3fedd80aa5f8d1  ricci-0.16.0.tar.gz
+77638cb7f40369f24a583d839010cba3  ricci-0.16.1.tar.gz



From bskeggs at fedoraproject.org  Thu Apr 16 23:42:10 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 16 Apr 2009 23:42:10 +0000 (UTC)
Subject: rpms/libdrm/F-11 libdrm.spec, 1.75, 1.76 nouveau-updates.patch, 1.1,
	1.2
Message-ID: <20090416234210.56F1C70127@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/libdrm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4544

Modified Files:
	libdrm.spec nouveau-updates.patch 
Log Message:
* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.6-6
- nouveau: post writes to pushbuf before incrementing PUT




Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/libdrm.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- libdrm.spec	16 Apr 2009 08:39:28 -0000	1.75
+++ libdrm.spec	16 Apr 2009 23:41:38 -0000	1.76
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -30,6 +30,8 @@
 Patch4: libdrm-2.4.0-no-bc.patch
 # radeon libdrm patches from modesetting-gem branch of upstream
 Patch8: libdrm-radeon.patch
+# nouveau fixes from drm.git
+Patch9: nouveau-updates.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -50,6 +52,7 @@
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch8 -p1 -b .radeon
+%patch9 -p1 -b .nouveau
 
 %build
 autoreconf -v --install || exit 1
@@ -109,6 +112,9 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.6-6
+- nouveau: post writes to pushbuf before incrementing PUT
+
 * Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 2.4.6-5
 - libdrm-radeon: fix wait idle
 

nouveau-updates.patch:

Index: nouveau-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/nouveau-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nouveau-updates.patch	24 Mar 2009 23:24:17 -0000	1.1
+++ nouveau-updates.patch	16 Apr 2009 23:41:38 -0000	1.2
@@ -1,143 +1,26 @@
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/Makefile.am libdrm-2.4.5/libdrm/nouveau/Makefile.am
---- libdrm-2.4.5.orig/libdrm/nouveau/Makefile.am	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am	2009-03-25 09:06:49.000000000 +1000
-@@ -19,7 +19,9 @@
- 			    nouveau_bo.c \
- 			    nouveau_resource.c \
- 			    nouveau_dma.c \
--			    nouveau_fence.c
-+			    nouveau_fence.c \
-+			    nouveau_dma.h \
-+			    nouveau_private.h
- 
- libdrm_nouveaucommonincludedir = ${includedir}/nouveau
- libdrm_nouveaucommoninclude_HEADERS = \
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_bo.c libdrm-2.4.5/libdrm/nouveau/nouveau_bo.c
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_bo.c	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_bo.c	2009-03-25 09:06:20.000000000 +1000
-@@ -347,24 +347,25 @@
- 	if (!bo || !handle)
- 		return -EINVAL;
- 
--	if (!nvdev->mm_enabled)
--		return -ENODEV;
--
- 	if (!nvbo->global_handle) {
- 		struct drm_gem_flink req;
-  
- 		ret = nouveau_bo_kalloc(nvbo, NULL);
- 		if (ret)
- 			return ret;
-- 
--		req.handle = nvbo->handle;
--		ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
--		if (ret) {
--			nouveau_bo_kfree(nvbo);
--			return ret;
-+
-+		if (nvdev->mm_enabled) {
-+			req.handle = nvbo->handle;
-+			ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
-+			if (ret) {
-+				nouveau_bo_kfree(nvbo);
-+				return ret;
-+			}
-+	 
-+			nvbo->global_handle = req.name;
-+		} else {
-+			nvbo->global_handle = nvbo->offset;
- 		}
-- 
--		nvbo->global_handle = req.name;
+diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
+index 023c6be..66466e3 100644
+--- a/libdrm/nouveau/nouveau_bo.c
++++ b/libdrm/nouveau/nouveau_bo.c
+@@ -404,7 +404,8 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle,
+ 		nvbo->size = req.size;
+ 		nvbo->handle = req.handle;
  	}
-  
- 	*handle = nvbo->global_handle;
-@@ -412,6 +413,8 @@
- {
- 	struct nouveau_bo_priv *nvbo = priv;
- 
-+	nouveau_fence_ref(NULL, &nvbo->fence);
-+	nouveau_fence_ref(NULL, &nvbo->wr_fence);
- 	nouveau_bo_kfree(nvbo);
- 	free(nvbo);
- }
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_device.c libdrm-2.4.5/libdrm/nouveau/nouveau_device.c
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_device.c	2009-02-22 03:54:48.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_device.c	2009-03-25 09:06:21.000000000 +1000
-@@ -76,6 +76,22 @@
- 	}
- 	nvdev->base.vm_vram_base = value;
- 
-+	ret = nouveau_device_get_param(&nvdev->base,
-+				       NOUVEAU_GETPARAM_FB_SIZE, &value);
-+	if (ret) {
-+		nouveau_device_close((void *)&nvdev);
-+		return ret;
-+	}
-+	nvdev->vram_aper_size = value;
-+
-+	ret = nouveau_device_get_param(&nvdev->base,
-+				       NOUVEAU_GETPARAM_AGP_SIZE, &value);
-+	if (ret) {
-+		nouveau_device_close((void *)&nvdev);
-+		return ret;
-+	}
-+	nvdev->gart_aper_size = value;
+- 
 +
- 	ret = nouveau_bo_init(&nvdev->base);
- 	if (ret) {
- 		nouveau_device_close((void *)&nvdev);
-@@ -128,7 +144,7 @@
- {
- 	struct nouveau_device_priv *nvdev;
- 
--	if (dev || !*dev)
-+	if (!dev || !*dev)
- 		return;
- 	nvdev = nouveau_device(*dev);
- 	*dev = NULL;
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_drmif.h libdrm-2.4.5/libdrm/nouveau/nouveau_drmif.h
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_drmif.h	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_drmif.h	2009-03-25 09:06:21.000000000 +1000
-@@ -37,6 +37,9 @@
- 	int needs_close;
- 
- 	int mm_enabled;
-+/*XXX: move to nouveau_device when interface gets bumped */
-+	uint64_t vram_aper_size;
-+	uint64_t gart_aper_size;
- };
- #define nouveau_device(n) ((struct nouveau_device_priv *)(n))
- 
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_fence.c libdrm-2.4.5/libdrm/nouveau/nouveau_fence.c
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_fence.c	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_fence.c	2009-03-25 09:06:21.000000000 +1000
-@@ -96,22 +96,16 @@
- int
- nouveau_fence_ref(struct nouveau_fence *ref, struct nouveau_fence **fence)
- {
--	struct nouveau_fence_priv *nvfence;
--
- 	if (!fence)
- 		return -EINVAL;
- 
--	if (*fence) {
--		nouveau_fence_del(fence);
--		*fence = NULL;
--	}
-+	if (ref)
-+		nouveau_fence(ref)->refcount++;
- 
--	if (ref) {
--		nvfence = nouveau_fence(ref);
--		nvfence->refcount++;	
--		*fence = &nvfence->base;
--	}
-+	if (*fence)
-+		nouveau_fence_del(fence);
- 
-+	*fence = ref;
++	nvbo->base.handle = nvbo->handle;
  	return 0;
- }
+ } 
+ 
+diff --git a/libdrm/nouveau/nouveau_dma.c b/libdrm/nouveau/nouveau_dma.c
+index 23da64b..b084f70 100644
+--- a/libdrm/nouveau/nouveau_dma.c
++++ b/libdrm/nouveau/nouveau_dma.c
+@@ -41,6 +41,7 @@ WRITE_PUT(struct nouveau_channel_priv *nvchan, uint32_t val)
+ 	volatile int dum;
+ 
+ 	NOUVEAU_DMA_BARRIER;
++	dum = nvchan->pushbuf[0];
+ 	dum = READ_GET(nvchan);
  
-
+ 	*nvchan->put = put;



From rdieter at fedoraproject.org  Fri Apr 17 00:25:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 00:25:26 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11
	kdebase-runtime-4.2.2-persistent_notify.patch, NONE,
	1.1 kdebase-runtime.spec, 1.109, 1.110
Message-ID: <20090417002526.4A3BB7012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13983/F-11

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.2-persistent_notify.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- fix persistent systray notifications


kdebase-runtime-4.2.2-persistent_notify.patch:

--- NEW FILE kdebase-runtime-4.2.2-persistent_notify.patch ---
diff -up kdebase/runtime/knotify/notifybypopup.cpp.rex kdebase/runtime/knotify/notifybypopup.cpp
--- kdebase/runtime/knotify/notifybypopup.cpp.rex	2009-04-16 14:56:26.000000000 -0500
+++ kdebase/runtime/knotify/notifybypopup.cpp	2009-04-16 14:59:07.000000000 -0500
@@ -353,19 +353,6 @@ void NotifyByPopup::sendNotificationDBus
 	QString timeoutStr = config->readEntry( "Timeout" );
 	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0;
 
-	// if timeout is still zero, try to set it to default knotify timeout
-	if (timeout == 0) {
-		// NOTE: this is a little hack. Currently there's no way to easily determine
-		// if KNotify will close notification after certain timeout or if it's persistent.
-		// The only thing that comes to mind is to check Persistent option in config and
-		// if it's absent, use default timeout that KNotify uses for non-persistent popups
-		bool persistent = (config->readEntry("Persistent") == "true" ||
-						   config->readEntry("Persistant") == "true");
-		if (!persistent) {
-			timeout = 6*1000;
-		}
-    }
-
 	QList<QVariant> args;
 
 	// figure out dbus id to replace if needed


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kdebase-runtime.spec	1 Apr 2009 15:29:42 -0000	1.109
+++ kdebase-runtime.spec	17 Apr 2009 00:24:55 -0000	1.110
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -23,6 +23,7 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
+Patch100:       kdebase-runtime-4.2.2-persistent_notify.patch
 
 #ifarch noarch
 ## icons now provided by standalone oxygen-icon-theme
@@ -127,6 +128,8 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p2 -b .persistent_knotify
+
 
 %build
 mkdir -p %{_target_platform}
@@ -386,6 +389,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- fix persistent systray notifications
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
 - koji/noarch hacks dropped



From rdieter at fedoraproject.org  Fri Apr 17 00:25:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 00:25:26 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel
	kdebase-runtime-4.2.2-persistent_notify.patch, NONE,
	1.1 kdebase-runtime.spec, 1.109, 1.110
Message-ID: <20090417002526.50B6E70137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13983/devel

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.2-persistent_notify.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- fix persistent systray notifications


kdebase-runtime-4.2.2-persistent_notify.patch:

--- NEW FILE kdebase-runtime-4.2.2-persistent_notify.patch ---
diff -up kdebase/runtime/knotify/notifybypopup.cpp.rex kdebase/runtime/knotify/notifybypopup.cpp
--- kdebase/runtime/knotify/notifybypopup.cpp.rex	2009-04-16 14:56:26.000000000 -0500
+++ kdebase/runtime/knotify/notifybypopup.cpp	2009-04-16 14:59:07.000000000 -0500
@@ -353,19 +353,6 @@ void NotifyByPopup::sendNotificationDBus
 	QString timeoutStr = config->readEntry( "Timeout" );
 	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0;
 
-	// if timeout is still zero, try to set it to default knotify timeout
-	if (timeout == 0) {
-		// NOTE: this is a little hack. Currently there's no way to easily determine
-		// if KNotify will close notification after certain timeout or if it's persistent.
-		// The only thing that comes to mind is to check Persistent option in config and
-		// if it's absent, use default timeout that KNotify uses for non-persistent popups
-		bool persistent = (config->readEntry("Persistent") == "true" ||
-						   config->readEntry("Persistant") == "true");
-		if (!persistent) {
-			timeout = 6*1000;
-		}
-    }
-
 	QList<QVariant> args;
 
 	// figure out dbus id to replace if needed


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kdebase-runtime.spec	1 Apr 2009 15:29:42 -0000	1.109
+++ kdebase-runtime.spec	17 Apr 2009 00:24:55 -0000	1.110
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -23,6 +23,7 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
+Patch100:       kdebase-runtime-4.2.2-persistent_notify.patch
 
 #ifarch noarch
 ## icons now provided by standalone oxygen-icon-theme
@@ -127,6 +128,8 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p2 -b .persistent_knotify
+
 
 %build
 mkdir -p %{_target_platform}
@@ -386,6 +389,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- fix persistent systray notifications
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
 - koji/noarch hacks dropped



From rdieter at fedoraproject.org  Fri Apr 17 00:30:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 00:30:14 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10
	kdebase-runtime-4.2.2-persistent_notify.patch, NONE,
	1.1 kdebase-runtime.spec, 1.86,
	1.87 kdebase-runtime-4.2.1-pulseaudio-cmake.patch, 1.1, NONE
Message-ID: <20090417003014.357857012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15043

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.2-persistent_notify.patch 
Removed Files:
	kdebase-runtime-4.2.1-pulseaudio-cmake.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- fix persistent systray notifications


kdebase-runtime-4.2.2-persistent_notify.patch:

--- NEW FILE kdebase-runtime-4.2.2-persistent_notify.patch ---
diff -up kdebase/runtime/knotify/notifybypopup.cpp.rex kdebase/runtime/knotify/notifybypopup.cpp
--- kdebase/runtime/knotify/notifybypopup.cpp.rex	2009-04-16 14:56:26.000000000 -0500
+++ kdebase/runtime/knotify/notifybypopup.cpp	2009-04-16 14:59:07.000000000 -0500
@@ -353,19 +353,6 @@ void NotifyByPopup::sendNotificationDBus
 	QString timeoutStr = config->readEntry( "Timeout" );
 	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0;
 
-	// if timeout is still zero, try to set it to default knotify timeout
-	if (timeout == 0) {
-		// NOTE: this is a little hack. Currently there's no way to easily determine
-		// if KNotify will close notification after certain timeout or if it's persistent.
-		// The only thing that comes to mind is to check Persistent option in config and
-		// if it's absent, use default timeout that KNotify uses for non-persistent popups
-		bool persistent = (config->readEntry("Persistent") == "true" ||
-						   config->readEntry("Persistant") == "true");
-		if (!persistent) {
-			timeout = 6*1000;
-		}
-    }
-
 	QList<QVariant> args;
 
 	// figure out dbus id to replace if needed


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdebase-runtime.spec	1 Apr 2009 23:15:53 -0000	1.86
+++ kdebase-runtime.spec	17 Apr 2009 00:29:43 -0000	1.87
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -23,6 +23,7 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
+Patch100:       kdebase-runtime-4.2.2-persistent_notify.patch
 
 #ifarch noarch
 ## icons now provided by standalone oxygen-icon-theme
@@ -127,6 +128,8 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p2 -b .persistent_knotify
+
 
 %build
 mkdir -p %{_target_platform}
@@ -386,6 +389,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- fix persistent systray notifications
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
 - koji/noarch hacks dropped


--- kdebase-runtime-4.2.1-pulseaudio-cmake.patch DELETED ---



From kaigai at fedoraproject.org  Fri Apr 17 00:31:19 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Fri, 17 Apr 2009 00:31:19 +0000 (UTC)
Subject: rpms/sepostgresql/F-11 sepostgresql.init, 1.32,
	1.33 sepostgresql.spec, 1.35, 1.36
Message-ID: <20090417003119.F34CF7012B@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15363

Modified Files:
	sepostgresql.init sepostgresql.spec 
Log Message:
bugfix: /etc/init.d/sepostgresql initdb didn't work correctly



Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sepostgresql.init	28 Mar 2009 02:23:48 -0000	1.32
+++ sepostgresql.init	17 Apr 2009 00:31:18 -0000	1.33
@@ -165,7 +165,7 @@
 	test -x /sbin/restorecon && /sbin/restorecon -R "${SEPGSQL_DATA}"
 	# Initialize the database
         cd ${SEPGSQL_BIN}
-	/sbin/runuser -- sepgsql -c "./initdb.sepgsql --pgace-feature=selinux -A 'ident sameuser' ${SEPGSQL_DATA}" \
+	/sbin/runuser -- sepgsql -c "./initdb.sepgsql --enable-selinux -A 'ident sameuser' ${SEPGSQL_DATA}" \
 	    >> "${SEPGSQL_STARTUP_LOG}" 2>&1 < /dev/null
 	if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
 	    echo_success


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sepostgresql.spec	28 Mar 2009 02:23:48 -0000	1.35
+++ sepostgresql.spec	17 Apr 2009 00:31:18 -0000	1.36
@@ -12,7 +12,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.3.7
-Release: 1771%{?dist}
+Release: 1772%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -199,6 +199,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Apr 17 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-1772
+- bugfix: /etc/init.d/sepostgresql initdb didn't work correctly
+
 * Fri Mar 27 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-1770
 - upgrade base PostgreSQL versin 8.3.6->8.3.7
 - backport features from v8.4devel



From kaigai at fedoraproject.org  Fri Apr 17 00:32:24 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Fri, 17 Apr 2009 00:32:24 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql.init, 1.32,
	1.33 sepostgresql.spec, 1.35, 1.36
Message-ID: <20090417003224.5A0937012B@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15787

Modified Files:
	sepostgresql.init sepostgresql.spec 
Log Message:
bugfix: /etc/init.d/sepostgresql initdb didn't work correctly



Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sepostgresql.init	28 Mar 2009 02:23:48 -0000	1.32
+++ sepostgresql.init	17 Apr 2009 00:32:23 -0000	1.33
@@ -165,7 +165,7 @@
 	test -x /sbin/restorecon && /sbin/restorecon -R "${SEPGSQL_DATA}"
 	# Initialize the database
         cd ${SEPGSQL_BIN}
-	/sbin/runuser -- sepgsql -c "./initdb.sepgsql --pgace-feature=selinux -A 'ident sameuser' ${SEPGSQL_DATA}" \
+	/sbin/runuser -- sepgsql -c "./initdb.sepgsql --enable-selinux -A 'ident sameuser' ${SEPGSQL_DATA}" \
 	    >> "${SEPGSQL_STARTUP_LOG}" 2>&1 < /dev/null
 	if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
 	    echo_success


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sepostgresql.spec	28 Mar 2009 02:23:48 -0000	1.35
+++ sepostgresql.spec	17 Apr 2009 00:32:23 -0000	1.36
@@ -12,7 +12,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.3.7
-Release: 1771%{?dist}
+Release: 1772%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -199,6 +199,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Apr 17 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-1772
+- bugfix: /etc/init.d/sepostgresql initdb didn't work correctly
+
 * Fri Mar 27 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.7-1770
 - upgrade base PostgreSQL versin 8.3.6->8.3.7
 - backport features from v8.4devel



From hadess at fedoraproject.org  Fri Apr 17 00:33:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 17 Apr 2009 00:33:52 +0000 (UTC)
Subject: rpms/bluez/F-11 .cvsignore, 1.30, 1.31 bluez.spec, 1.58,
	1.59 sources, 1.30, 1.31
Message-ID: <20090417003352.3A0997012B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16011

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1
- Update to 4.36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	11 Apr 2009 19:39:41 -0000	1.30
+++ .cvsignore	17 Apr 2009 00:33:21 -0000	1.31
@@ -1 +1 @@
-bluez-4.35.tar.gz
+bluez-4.36.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- bluez.spec	11 Apr 2009 19:39:41 -0000	1.58
+++ bluez.spec	17 Apr 2009 00:33:21 -0000	1.59
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.35
+Version: 4.36
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -194,6 +194,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1
+- Update to 4.36
+
 * Sat Apr 11 2009 - Bastien Nocera <bnocera at redhat.com> - 4.35-1
 - Update to 4.35
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	11 Apr 2009 19:39:41 -0000	1.30
+++ sources	17 Apr 2009 00:33:21 -0000	1.31
@@ -1 +1 @@
-5919d6383cd9446f8b90fdca748dc961  bluez-4.35.tar.gz
+657de0cce8a6f36479b0f128c8008a96  bluez-4.36.tar.gz



From rdieter at fedoraproject.org  Fri Apr 17 00:34:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 00:34:02 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9
	kdebase-runtime-4.2.2-persistent_notify.patch, NONE,
	1.1 kdebase-runtime.spec, 1.68,
	1.69 kdebase-runtime-4.2.1-pulseaudio-cmake.patch, 1.1, NONE
Message-ID: <20090417003402.754047012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16171

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.2-persistent_notify.patch 
Removed Files:
	kdebase-runtime-4.2.1-pulseaudio-cmake.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
- fix persistent systray notifications


kdebase-runtime-4.2.2-persistent_notify.patch:

--- NEW FILE kdebase-runtime-4.2.2-persistent_notify.patch ---
diff -up kdebase/runtime/knotify/notifybypopup.cpp.rex kdebase/runtime/knotify/notifybypopup.cpp
--- kdebase/runtime/knotify/notifybypopup.cpp.rex	2009-04-16 14:56:26.000000000 -0500
+++ kdebase/runtime/knotify/notifybypopup.cpp	2009-04-16 14:59:07.000000000 -0500
@@ -353,19 +353,6 @@ void NotifyByPopup::sendNotificationDBus
 	QString timeoutStr = config->readEntry( "Timeout" );
 	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0;
 
-	// if timeout is still zero, try to set it to default knotify timeout
-	if (timeout == 0) {
-		// NOTE: this is a little hack. Currently there's no way to easily determine
-		// if KNotify will close notification after certain timeout or if it's persistent.
-		// The only thing that comes to mind is to check Persistent option in config and
-		// if it's absent, use default timeout that KNotify uses for non-persistent popups
-		bool persistent = (config->readEntry("Persistent") == "true" ||
-						   config->readEntry("Persistant") == "true");
-		if (!persistent) {
-			timeout = 6*1000;
-		}
-    }
-
 	QList<QVariant> args;
 
 	// figure out dbus id to replace if needed


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdebase-runtime.spec	1 Apr 2009 23:17:00 -0000	1.68
+++ kdebase-runtime.spec	17 Apr 2009 00:33:32 -0000	1.69
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -23,6 +23,7 @@
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
+Patch100:       kdebase-runtime-4.2.2-persistent_notify.patch
 
 #ifarch noarch
 ## icons now provided by standalone oxygen-icon-theme
@@ -127,6 +128,8 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p2 -b .persistent_knotify
+
 
 %build
 mkdir -p %{_target_platform}
@@ -386,6 +389,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
+- fix persistent systray notifications
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
 - koji/noarch hacks dropped


--- kdebase-runtime-4.2.1-pulseaudio-cmake.patch DELETED ---



From hadess at fedoraproject.org  Fri Apr 17 00:37:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 17 Apr 2009 00:37:42 +0000 (UTC)
Subject: rpms/bluez/F-11 bluez.spec,1.59,1.60
Message-ID: <20090417003743.0DC607012B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16796

Modified Files:
	bluez.spec 
Log Message:
Fix file list



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- bluez.spec	17 Apr 2009 00:33:21 -0000	1.59
+++ bluez.spec	17 Apr 2009 00:37:11 -0000	1.60
@@ -192,6 +192,7 @@
 %files alsa
 %defattr(-, root, root)
 %{_libdir}/alsa-lib/*.so
+%{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
 * Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1



From hadess at fedoraproject.org  Fri Apr 17 00:39:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 17 Apr 2009 00:39:58 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.30, 1.31 bluez.spec, 1.58,
	1.59 sources, 1.30, 1.31
Message-ID: <20090417003958.D7AD47012B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17442

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1
- Update to 4.36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	11 Apr 2009 19:39:41 -0000	1.30
+++ .cvsignore	17 Apr 2009 00:39:28 -0000	1.31
@@ -1 +1 @@
-bluez-4.35.tar.gz
+bluez-4.36.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- bluez.spec	11 Apr 2009 19:39:41 -0000	1.58
+++ bluez.spec	17 Apr 2009 00:39:28 -0000	1.59
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.35
+Version: 4.36
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -192,8 +192,12 @@
 %files alsa
 %defattr(-, root, root)
 %{_libdir}/alsa-lib/*.so
+%{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1
+- Update to 4.36
+
 * Sat Apr 11 2009 - Bastien Nocera <bnocera at redhat.com> - 4.35-1
 - Update to 4.35
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	11 Apr 2009 19:39:41 -0000	1.30
+++ sources	17 Apr 2009 00:39:28 -0000	1.31
@@ -1 +1 @@
-5919d6383cd9446f8b90fdca748dc961  bluez-4.35.tar.gz
+657de0cce8a6f36479b0f128c8008a96  bluez-4.36.tar.gz



From kaigai at fedoraproject.org  Fri Apr 17 00:42:58 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Fri, 17 Apr 2009 00:42:58 +0000 (UTC)
Subject: rpms/php-pecl-selinux/devel php-pecl-selinux.spec,1.2,1.3
Message-ID: <20090417004258.7BA5E7012B@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/php-pecl-selinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18038

Modified Files:
	php-pecl-selinux.spec 
Log Message:
%changelog lost a note about README



Index: php-pecl-selinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/devel/php-pecl-selinux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-selinux.spec	16 Apr 2009 00:11:23 -0000	1.2
+++ php-pecl-selinux.spec	17 Apr 2009 00:42:28 -0000	1.3
@@ -5,7 +5,7 @@
 Summary: SELinux binding for PHP scripting language
 Name: php-pecl-selinux
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://pecl.php.net/package/%{pecl_name}
@@ -80,6 +80,7 @@
 * Thu Apr 16 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.3.1-1
 - The "permissive" tag was added to selinux_compute_av
 - The selinux_deny_unknown() was added
+- README is updated for the new features
 
 * Thu Mar 12 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.2.1-1
 - Specfile to build RPM package is added.



From kaigai at fedoraproject.org  Fri Apr 17 00:46:01 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Fri, 17 Apr 2009 00:46:01 +0000 (UTC)
Subject: rpms/php-pecl-selinux/F-11 php-pecl-selinux.spec,1.1,1.2
Message-ID: <20090417004601.8A3847012B@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/php-pecl-selinux/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18869

Modified Files:
	php-pecl-selinux.spec 
Log Message:
- The "permissive" tag was added to selinux_compute_av
- The selinux_deny_unknown() was added
- README is updated for the new features



Index: php-pecl-selinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-11/php-pecl-selinux.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-selinux.spec	10 Mar 2009 01:48:36 -0000	1.1
+++ php-pecl-selinux.spec	17 Apr 2009 00:45:30 -0000	1.2
@@ -4,15 +4,15 @@
 
 Summary: SELinux binding for PHP scripting language
 Name: php-pecl-selinux
-Version: 0.1.2
-Release: 1%{?dist}
+Version: 0.3.1
+Release: 2%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://pecl.php.net/package/%{pecl_name}
 Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.43
-Requires: php >= 5.2.0, libselinux >= 2.0.43
+BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.80
+Requires: php >= 5.2.0, libselinux >= 2.0.80
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 %if 0%{?php_zend_api}
@@ -77,5 +77,13 @@
 %{pecl_xmldir}/%{name}.xml
 
 %changelog
+* Thu Apr 16 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.3.1-1
+- The "permissive" tag was added to selinux_compute_av
+- The selinux_deny_unknown() was added
+- README is updated for the new features
+
+* Thu Mar 12 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.2.1-1
+- Specfile to build RPM package is added.
+
 * Thu Mar  5 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 0.1.2-1
 - The initial release of SELinux binding for PHP script language.



From rdieter at fedoraproject.org  Fri Apr 17 01:00:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 01:00:51 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.110,1.111
Message-ID: <20090417010051.B940A7012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22418

Modified Files:
	kdebase-runtime.spec 
Log Message:
add bz# reference



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdebase-runtime.spec	17 Apr 2009 00:24:55 -0000	1.110
+++ kdebase-runtime.spec	17 Apr 2009 01:00:21 -0000	1.111
@@ -390,7 +390,7 @@
 
 %changelog
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
-- fix persistent systray notifications
+- fix persistent systray notifications (#485796)
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg



From rdieter at fedoraproject.org  Fri Apr 17 01:02:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 01:02:30 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit-0.4.0-knotify_persistent.patch, 
	NONE, 1.1 kpackagekit.spec, 1.27, 1.28
Message-ID: <20090417010230.4C9DC7012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22856/devel

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.4.0-knotify_persistent.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
- make update notification persistent (#485796)


kpackagekit-0.4.0-knotify_persistent.patch:

--- NEW FILE kpackagekit-0.4.0-knotify_persistent.patch ---
diff -up kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp.persistent kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp
--- kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp.persistent	2009-03-31 11:44:59.000000000 -0500
+++ kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp	2009-04-16 19:57:25.000000000 -0500
@@ -161,8 +161,8 @@ void KpkUpdateIcon::notifyUpdates()
     }
 
     KIcon icon = KpkIcons::packageIcon(highState);
-    // FIXME persistent does not work in 4.2 anymore, remove the comments when it's fixed
-    m_updateNotify = new KNotification("ShowUpdates"/*, 0, KNotification::Persistent*/);
+
+    m_updateNotify = new KNotification("ShowUpdates", 0, KNotification::Persistent);
     // use of QSize does the right thing
     m_updateNotify->setPixmap(icon.pixmap(QSize(128,128)));
 


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kpackagekit.spec	31 Mar 2009 17:20:33 -0000	1.27
+++ kpackagekit.spec	17 Apr 2009 01:02:29 -0000	1.28
@@ -1,8 +1,7 @@
-%define betaversion b4
 
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -14,6 +13,7 @@
 
 # upstream me, says the patch
 Patch100: kpackagekit-InitialPreference.patch
+Patch101: kpackagekit-0.4.0-knotify_persistent.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -29,6 +29,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch100 -p0 -b .InitialPreference
+%patch101 -p1 -b .knotify_persistent
 
 
 
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
+- make update notification persistent (#485796)
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-5
 - another respun tarball to fix using those translations (#493061)
 



From rdieter at fedoraproject.org  Fri Apr 17 01:02:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 01:02:59 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 kpackagekit-0.4.0-knotify_persistent.patch,
	NONE, 1.1 kpackagekit.spec, 1.27, 1.28
Message-ID: <20090417010259.B73917012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22856/F-11

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.4.0-knotify_persistent.patch 
Log Message:
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
- make update notification persistent (#485796)


kpackagekit-0.4.0-knotify_persistent.patch:

--- NEW FILE kpackagekit-0.4.0-knotify_persistent.patch ---
diff -up kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp.persistent kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp
--- kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp.persistent	2009-03-31 11:44:59.000000000 -0500
+++ kpackagekit-0.4.0/SmartIcon/KpkUpdateIcon.cpp	2009-04-16 19:57:25.000000000 -0500
@@ -161,8 +161,8 @@ void KpkUpdateIcon::notifyUpdates()
     }
 
     KIcon icon = KpkIcons::packageIcon(highState);
-    // FIXME persistent does not work in 4.2 anymore, remove the comments when it's fixed
-    m_updateNotify = new KNotification("ShowUpdates"/*, 0, KNotification::Persistent*/);
+
+    m_updateNotify = new KNotification("ShowUpdates", 0, KNotification::Persistent);
     // use of QSize does the right thing
     m_updateNotify->setPixmap(icon.pixmap(QSize(128,128)));
 


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kpackagekit.spec	31 Mar 2009 17:20:33 -0000	1.27
+++ kpackagekit.spec	17 Apr 2009 01:02:28 -0000	1.28
@@ -1,8 +1,7 @@
-%define betaversion b4
 
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -14,6 +13,7 @@
 
 # upstream me, says the patch
 Patch100: kpackagekit-InitialPreference.patch
+Patch101: kpackagekit-0.4.0-knotify_persistent.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -29,6 +29,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch100 -p0 -b .InitialPreference
+%patch101 -p1 -b .knotify_persistent
 
 
 
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
+- make update notification persistent (#485796)
+
 * Tue Mar 31 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-5
 - another respun tarball to fix using those translations (#493061)
 



From whot at fedoraproject.org  Fri Apr 17 01:06:38 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 17 Apr 2009 01:06:38 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.1-activate-device.patch, NONE,
	1.1 xorg-x11-server.spec, 1.436, 1.437
Message-ID: <20090417010638.835267012B@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23736

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-activate-device.patch 
Log Message:
* Fri Apr 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.1-5
- xserver-1.6.1-activate-device.patch: remove the device if activation fails.
  This fixes crashes if wacom tablets are added through hal _and_ have an
  xorg.conf section.



xserver-1.6.1-activate-device.patch:

--- NEW FILE xserver-1.6.1-activate-device.patch ---
>From efa31092d6703397121a0ada4f7205a8ecad3d3d Mon Sep 17 00:00:00 2001
From: Ander Conselvan de Oliveira <ander at mandriva.com.br>
Date: Mon, 6 Apr 2009 16:01:20 -0300
Subject: [PATCH] xfree86: Remove device from inputInfo.devices if ActivateDevice failed.

After the call to xf86ActivateDevice, the new device will be added to
inputInfo.devices. However, if the subsequent call to ActivateDevice
fails, the correponding InputInfoRec for the device is deleted but an
entry still remains in inputInfo.devices. This might lead to a server
crash later on (on InitAndStartDevices for instance) when the device
control proc would be called for an invalid device.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 hw/xfree86/common/xf86Xinput.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 3d89e39..8d08d7e 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -543,7 +543,10 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL enable)
     dev = pInfo->dev;
     rval = ActivateDevice(dev);
     if (rval != Success)
+    {
+        RemoveDevice(dev);
         goto unwind;
+    }
 
     /* Enable it if it's properly initialised and we're currently in the VT */
     if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- xorg-x11-server.spec	16 Apr 2009 20:31:11 -0000	1.436
+++ xorg-x11-server.spec	17 Apr 2009 01:06:36 -0000	1.437
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -107,6 +107,9 @@
 Patch6031: xserver-1.6.1-exa-avoid-swapped-out.patch
 Patch6032: xserver-1.6.1-randr-gamma.patch
 
+# Nominated for 1.6.2
+Patch6033: xserver-1.6.1-activate-device.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -537,6 +540,11 @@
 
 
 %changelog
+* Fri Apr 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.1-5
+- xserver-1.6.1-activate-device.patch: remove the device if activation fails.
+  This fixes crashes if wacom tablets are added through hal _and_ have an
+  xorg.conf section.
+
 * Thu Apr 16 2009 Adam Jackson <ajax at redhat.com> 1.6.1-4
 - xserver-1.6.1-randr-gamma.patch: Hook up XF86VidMode's gamma control to
   RANDR's per-crtc gamma controls.



From airlied at fedoraproject.org  Fri Apr 17 01:36:02 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 01:36:02 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.74,
	1.75 kernel.spec, 1.1549, 1.1550
Message-ID: <20090417013602.46F3D7012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30056

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
- radeon drm: fix rv410 ddc + add another agp test hook


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- drm-modesetting-radeon.patch	15 Apr 2009 06:36:55 -0000	1.74
+++ drm-modesetting-radeon.patch	17 Apr 2009 01:36:01 -0000	1.75
@@ -1,3 +1,31 @@
+commit 4fb1fe8e8696cd2fd7485ebf3fa01c0ac491a6ae
+Merge: 18efcb5 37267b0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 11:05:43 2009 +1000
+
+    Merge remote branch 'origin/drm-rawhide' into drm-f11
+
+commit 37267b0eab798dbdb336470ba3fbe05269665acc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 10:50:48 2009 +1000
+
+    radeon: add yet another test hook for agp
+
+commit 80a878ea6be30bcd9a48d9b825f0bc5f42a6f31f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 10:45:51 2009 +1000
+
+    radeon: r3xx/r4xx hw i2c engine ties up lines when in reset
+    
+    When the hw offload engine is in reset, it ties up the DDC
+    lines on certain chips
+
+commit 19f4dc490ab0417a28c100012bdd8d3633fd42a7
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Fri Apr 17 08:41:09 2009 +1000
+
+    radeon: fix panel mode name
+
 commit 18efcb54320d301dc356647a8fc2a2d308d8ef46
 Merge: e9777f8 1d8fea4
 Author: Dave Airlie <airlied at redhat.com>
@@ -1973,7 +2001,7 @@
  int __read_mostly pat_enabled = 1;
 +EXPORT_SYMBOL_GPL(pat_enabled);
  
- void __cpuinit pat_disable(char *reason)
+ void __cpuinit pat_disable(const char *reason)
  {
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
 index 3a22eb9..a74980b 100644
@@ -16782,10 +16810,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
 new file mode 100644
-index 0000000..8b360e0
+index 0000000..7f3b75a
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,469 @@
+@@ -0,0 +1,471 @@
 +/**************************************************************************
 + * 
 + * Copyright 2007 Dave Airlie
@@ -16888,6 +16916,8 @@
 +			man->io_addr = NULL;
 +			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
 +				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
++			if (radeon_no_gart_wb == 2)
++				man->flags |= _DRM_FLAG_MEMTYPE_CMA;
 +			man->drm_bus_maptype = _DRM_AGP;
 +		} else {
 +			man->io_offset = dev_priv->gart_vm_start;
@@ -19030,7 +19060,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
 new file mode 100644
-index 0000000..d45bd6c
+index 0000000..cd3acf0
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
 @@ -0,0 +1,608 @@
@@ -19155,9 +19185,9 @@
 +		mode->flags = 0;
 +
 +		mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
++		drm_mode_set_name(mode);
 +
-+		DRM_DEBUG("Adding native panel mode %dx%d\n",
-+			  native_mode->panel_xres, native_mode->panel_yres);
++		DRM_DEBUG("Adding native panel mode %s\n", mode->name);
 +	}
 +	return mode;
 +}
@@ -28918,10 +28948,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
 new file mode 100644
-index 0000000..1cd47bc
+index 0000000..042eb09
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_i2c.c
-@@ -0,0 +1,195 @@
+@@ -0,0 +1,205 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -28989,6 +29019,16 @@
 +	uint32_t temp;
 +	struct radeon_i2c_bus_rec *rec = &radeon_connector->ddc_bus->rec;
 +
++	/*
++ 	 * on certain r3xx/rv4xx the hw i2c block appears to hold the
++	 * gpio lines in reset, select different gpios to avoid this
++	 */
++	if (radeon_is_r300(dev_priv)) {
++		if (rec->a_clk_reg == RADEON_GPIO_VGA_DDC)
++			RADEON_WRITE(RADEON_DVI_I2C_CNTL_0, 0x30);
++		else
++			RADEON_WRITE(RADEON_DVI_I2C_CNTL_0, 0x20);
++	}
 +	if (lock_state) {
 +		temp = RADEON_READ(rec->a_clk_reg);
 +		temp &= ~(rec->a_clk_mask);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1549
retrieving revision 1.1550
diff -u -r1.1549 -r1.1550
--- kernel.spec	16 Apr 2009 20:58:51 -0000	1.1549
+++ kernel.spec	17 Apr 2009 01:36:01 -0000	1.1550
@@ -1971,6 +1971,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
+- radeon drm: fix rv410 ddc + add another agp test hook
+
 * Thu Apr 16 2009 Adam Jackson <ajax at redhat.com>
 - radeon drm: Be sure to set a name for LVDS panel modes.
 



From airlied at fedoraproject.org  Fri Apr 17 01:47:37 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 01:47:37 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch,1.75,1.76
Message-ID: <20090417014737.7C4CA7012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32225

Modified Files:
	drm-modesetting-radeon.patch 
Log Message:
damn const breaking my stuff


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- drm-modesetting-radeon.patch	17 Apr 2009 01:36:01 -0000	1.75
+++ drm-modesetting-radeon.patch	17 Apr 2009 01:47:36 -0000	1.76
@@ -2001,7 +2001,7 @@
  int __read_mostly pat_enabled = 1;
 +EXPORT_SYMBOL_GPL(pat_enabled);
  
- void __cpuinit pat_disable(const char *reason)
+ void __cpuinit pat_disable(char *reason)
  {
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
 index 3a22eb9..a74980b 100644



From bskeggs at fedoraproject.org  Fri Apr 17 01:48:17 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 17 Apr 2009 01:48:17 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-11 nouveau-fb-resize.patch, NONE,
	1.1 nouveau-multiple-xserver.patch, 1.2,
	1.3 nouveau-nv50-fb-accel.patch, 1.2,
	1.3 nouveau-nv50-nva0-noaccel.patch, 1.2,
	1.3 nouveau-store-vbios.patch, 1.2,
	1.3 nouveau-transition-hack.patch, 1.2,
	1.3 xorg-x11-drv-nouveau.spec, 1.39, 1.40
Message-ID: <20090417014817.8A6BE7012B@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32473

Modified Files:
	nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch 
	nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch 
	nouveau-transition-hack.patch xorg-x11-drv-nouveau.spec 
Added Files:
	nouveau-fb-resize.patch 
Log Message:
* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-28.20090417gitfa2f111
- avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
  - the bug here was relatively harmless, but exposed a more serious issue
    which has been fixed in libdrm-2.4.6-6.fc11
- kms: speed up transitions, they could take a couple of seconds previously
- framebuffer resize support (rh#495838, rh#487356, lots of dups)



nouveau-fb-resize.patch:

--- NEW FILE nouveau-fb-resize.patch ---
>From 9189921f9822579246be05eec4f97e04cc609e7f Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at caspar.localdomain>
Date: Tue, 14 Apr 2009 09:23:07 +1000
Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps

---
 src/drmmode_display.c |   75 +++++++++++++++++++++++++++++++--
 src/nouveau_exa.c     |    8 ++-
 src/nv50_randr.c      |    6 +++
 src/nv_crtc.c         |   16 ++++++-
 src/nv_driver.c       |  108 ++++++++++++++++++++++++++++++++++++++++++++++---
 src/nv_type.h         |    9 ++++-
 6 files changed, 205 insertions(+), 17 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ca1a60b..c666c9f 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1069,6 +1069,59 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
 }
 
 static Bool
+nv_xf86crtc_resize(ScrnInfoPtr pScrn, int width, int height)
+{
+	ScreenPtr pScreen = pScrn->pScreen;
+	NVPtr pNv = NVPTR(pScrn);
+	const int cpp = pScrn->bitsPerPixel >> 3;
+	int pitch = NOUVEAU_ALIGN(width * cpp, 256);
+	int ret = 0;
+	PixmapPtr ppix;
+
+	if (pScrn->virtualX == width && pScrn->virtualY == height &&
+	    (pNv->NoAccel || pNv->exa_onscreen))
+		return TRUE;
+
+	if (!pNv->dev)
+		goto out_done;
+
+	nouveau_fb_free(pScrn);
+
+	ret = nouveau_fb_alloc(pScrn, pitch, height, cpp);
+	if (ret) {
+		width = pScrn->virtualX;
+		height = pScrn->virtualY;
+		pitch = (*pScreen->GetScreenPixmap)(pScreen)->devKind;
+
+		ret = nouveau_fb_alloc(pScrn, pitch, height, cpp);
+		/* famous last words: "this should never happen!" */
+		if (ret)
+			FatalError("couldn't allocate framebuffer!\n");
+
+		ret = -ENOMEM;
+	}
+
+out_done:
+	if (!ret && pNv->ShadowFB) {
+		xfree(pNv->ShadowPtr);
+		pNv->ShadowPtr = xalloc(pitch * height);
+		pNv->ShadowPitch = pitch;
+	}
+
+	ppix = (*pScreen->GetScreenPixmap)(pScreen);
+
+	(*pScreen->ModifyPixmapHeader)(ppix, width, height, -1, -1, pitch,
+				       (!pNv->NoAccel || pNv->ShadowFB) ?
+				       pNv->ShadowPtr : pNv->FBMap);
+	pScrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
+
+	pScrn->virtualX = width;
+	pScrn->virtualY = height;
+	pScrn->displayWidth = pitch / cpp;
+	return ret == 0;
+}
+
+static Bool
 drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 {
 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -1083,10 +1136,23 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 	ErrorF("resize called %d %d\n", width, height);
 
 	if (!pNv->exa_driver_pixmaps) {
-		if (width > scrn->virtualX || height > scrn->virtualY)
+		if (!nv_xf86crtc_resize(scrn, width, height))
 			return FALSE;
 
-		scrn->displayWidth = NOUVEAU_ALIGN(width, 64);
+		if (drmmode->fb_id)
+			drmModeRmFB(drmmode->fd, drmmode->fb_id);
+		drmmode->fb_id = 0;
+
+		for (i = 0; i < config->num_crtc; i++) {
+			xf86CrtcPtr crtc = config->crtc[i];
+
+			if (!crtc->enabled)
+				continue;
+			
+			xf86CrtcSetMode(crtc, &crtc->mode, crtc->rotation,
+					crtc->x, crtc->y);
+		}
+
 		return TRUE;
 	}
 
@@ -1149,7 +1215,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
 
 Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
 {
-	xf86CrtcConfigPtr   xf86_config;
+	xf86CrtcConfigPtr xf86_config;
 	drmmode_ptr drmmode;
 	int i;
 
@@ -1173,8 +1239,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
 	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
 		drmmode_output_init(pScrn, drmmode, i);
 
-	xf86InitialConfiguration(pScrn, NVPTR(pScrn)->exa_driver_pixmaps);
-
+	xf86InitialConfiguration(pScrn, TRUE);
 	return TRUE;
 }
 
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
index aee2794..6da7d36 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
 	} else
 	if (ppix == pScreen->GetScreenPixmap(pScreen)) {
 		nouveau_bo_map(pNv->scanout, NOUVEAU_BO_RDWR);
-		ppix->devPrivate.ptr = pNv->scanout->map;
+		if (pNv->scanout != pNv->FB)
+			ppix->devPrivate.ptr = pNv->scanout->map;
+		else
+			ppix->devPrivate.ptr = pNv->FB->map + pNv->exa_onscreen->offset; 
 	} else {
 		/* force migration */
 		return FALSE;
@@ -543,10 +546,9 @@ Bool
 nouveau_exa_pixmap_is_onscreen(PixmapPtr ppix)
 {
 	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
-	NVPtr pNv = NVPTR(pScrn);
 	unsigned long offset = exaGetPixmapOffset(ppix);
 
-	if (offset < pNv->EXADriverPtr->offScreenBase)
+	if (offset == 0)
 		return TRUE;
 
 	return FALSE;
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
index 6c19780..f44d286 100644
--- a/src/nv50_randr.c
+++ b/src/nv50_randr.c
@@ -289,8 +289,14 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
 {
 	ScrnInfoPtr pScrn = crtc->scrn;
 	NV50CrtcPrivatePtr nv_crtc = crtc->driver_private;
+	NVPtr pNv = NVPTR(pScrn);
 
 	nv_crtc->crtc->SetFBOffset(nv_crtc->crtc, x, y);
+	if (nv_crtc->crtc->front_buffer &&
+	    nv_crtc->crtc->front_buffer != pNv->scanout) {
+		nv_crtc->crtc->SetFB(nv_crtc->crtc, pNv->scanout);
+		nv_crtc->crtc->ModeSet(nv_crtc->crtc, &crtc->mode);
+	}
 
 	NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0);
 }
diff --git a/src/nv_crtc.c b/src/nv_crtc.c
index 1d50874..cfa06e1 100644
--- a/src/nv_crtc.c
+++ b/src/nv_crtc.c
@@ -1154,7 +1154,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
 	ScrnInfoPtr pScrn = crtc->scrn;
 	NVPtr pNv = NVPTR(pScrn);    
 	struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
-	uint32_t start = (y * pScrn->displayWidth + x) * pScrn->bitsPerPixel / 8;
+	uint32_t cpp = pScrn->bitsPerPixel / 8;
+	uint32_t start = (y * pScrn->displayWidth + x) * cpp;
+	uint32_t pitch = pScrn->displayWidth * cpp;
+	NVCrtcRegPtr regp = &pNv->ModeReg.crtc_reg[nv_crtc->head];
 
 	if (crtc->rotatedData != NULL) /* we do not exist on the real framebuffer */
 #if NOUVEAU_EXA_PIXMAPS
@@ -1162,8 +1165,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
 #else
 		start = pNv->FB->offset + nv_crtc->shadow->offset; /* We do exist relative to the framebuffer */
 #endif
-	else
+	else {
+		if (pNv->exa_onscreen)
+			start += pNv->exa_onscreen->offset;
 		start += pNv->FB->offset;
+	}
+
+	regp->CRTC[NV_CIO_CR_OFFSET_INDEX] = pitch >> 3;
+	regp->CRTC[NV_CIO_CRE_RPC0_INDEX] =
+		XLATE(pitch >> 3, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);
+	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_RPC0_INDEX);
+	crtc_wr_cio_state(crtc, regp, NV_CIO_CR_OFFSET_INDEX);
 
 	start &= ~3;
 	pNv->ModeReg.crtc_reg[nv_crtc->head].fb_start = start;
diff --git a/src/nv_driver.c b/src/nv_driver.c
index f097fb9..0cc81ae 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -900,16 +900,112 @@ Bool NVI2CInit(ScrnInfoPtr pScrn)
 	return TRUE;
 }
 
+void
+nouveau_fb_free(ScrnInfoPtr pScrn)
+{
+	ScreenPtr pScreen = pScrn->pScreen;
+	NVPtr pNv = NVPTR(pScrn);
+
+	if (!pNv->NoAccel && pNv->exa_onscreen) {
+		exaOffscreenFree(pScreen, pNv->exa_onscreen);
+		pNv->exa_onscreen = NULL;
+	}
+
+	if (pNv->scanout && pNv->FB != pNv->scanout)
+		nouveau_bo_ref(NULL, &pNv->scanout);
+}
+
+int
+nouveau_fb_alloc(ScrnInfoPtr pScrn, int pitch, int height, int cpp)
+{
+	ScreenPtr pScreen = pScrn->pScreen;
+	NVPtr pNv = NVPTR(pScrn);
+	int ret;
+
+	if (!pNv->NoAccel) {
+		pNv->exa_onscreen = exaOffscreenAlloc(pScreen, pitch * height,
+						      256, TRUE, NULL, NULL);
+		if (!pNv->exa_onscreen)
+			return -ENOMEM;
+	}
+
+	if (!pNv->scanout) {
+		ret = nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
+				     256, pitch * height, &pNv->scanout);
+		if (ret) {
+			nouveau_fb_free(pScrn);
+			return ret;
+		}
+	}
+
+
+	return 0;
+}
+
 static Bool
 nv_xf86crtc_resize(ScrnInfoPtr pScrn, int width, int height)
 {
-#if 0
-	do not change virtual* for now, as it breaks multihead server regeneration
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "nv_xf86crtc_resize is called with %dx%d resolution.\n", width, height);
+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+	ScreenPtr pScreen = pScrn->pScreen;
+	NVPtr pNv = NVPTR(pScrn);
+	const int cpp = pScrn->bitsPerPixel >> 3;
+	int pitch = NOUVEAU_ALIGN(width * cpp, 256);
+	int ret = 0, i;
+	PixmapPtr ppix;
+
+	if (pScrn->virtualX == width && pScrn->virtualY == height &&
+	    (pNv->NoAccel || pNv->exa_onscreen))
+		return TRUE;
+
+	if (!pNv->dev)
+		goto out_done;
+
+	nouveau_fb_free(pScrn);
+
+	ret = nouveau_fb_alloc(pScrn, pitch, height, cpp);
+	if (ret) {
+		width = pScrn->virtualX;
+		height = pScrn->virtualY;
+		pitch = (*pScreen->GetScreenPixmap)(pScreen)->devKind;
+
+		ret = nouveau_fb_alloc(pScrn, pitch, height, cpp);
+		/* famous last words: "this should never happen!" */
+		if (ret)
+			FatalError("couldn't allocate framebuffer!\n");
+
+		ret = -ENOMEM;
+	}
+
+out_done:
+
+	if (!ret && pNv->ShadowFB) {
+		xfree(pNv->ShadowPtr);
+		pNv->ShadowPtr = xalloc(pitch * height);
+		pNv->ShadowPitch = pitch;
+	}
+
+	ppix = pScreen->GetScreenPixmap(pScreen);
+
+	(*pScreen->ModifyPixmapHeader)(ppix, width, height, -1, -1, pitch,
+				       (!pNv->NoAccel || pNv->ShadowFB) ?
+				       pNv->ShadowPtr : pNv->FBMap);
+	pScrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
+
 	pScrn->virtualX = width;
 	pScrn->virtualY = height;
-#endif
-	return TRUE;
+	pScrn->displayWidth = pitch / cpp;
+
+	for (i = 0; i < config->num_crtc; i++) {
+		xf86CrtcPtr crtc = config->crtc[i];
+
+		if (!crtc->enabled)
+			continue;
+		
+		xf86CrtcSetMode(crtc, &crtc->mode, crtc->rotation,
+				crtc->x, crtc->y);
+	}
+
+	return ret == 0;
 }
 
 static const xf86CrtcConfigFuncsRec nv_xf86crtc_config_funcs = {
@@ -1423,7 +1519,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 		} else
 			nv50_output_create(pScrn); /* create randr-1.2 "outputs". */
 
-		if (!xf86InitialConfiguration(pScrn, FALSE))
+		if (!xf86InitialConfiguration(pScrn, TRUE))
 			NVPreInitFail("No valid modes.\n");
 	}
 
diff --git a/src/nv_type.h b/src/nv_type.h
index 5396cc8..1a9b9ed 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -304,8 +304,11 @@ typedef struct _NVRec {
     volatile CARD8 *PDIO1;
 
     uint8_t cur_head;
+
     ExaDriverPtr	EXADriverPtr;
     Bool		exa_driver_pixmaps;
+    ExaOffscreenArea *  exa_onscreen;
+
     ScreenBlockHandlerProcPtr BlockHandler;
     CloseScreenProcPtr  CloseScreen;
     /* Cursor */
@@ -494,11 +497,15 @@ nouveau_pixmap_offset(PixmapPtr ppix)
 {
 	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
+	unsigned offset;
 
 	if (pNv->exa_driver_pixmaps)
 		return 0;
 
-	return exaGetPixmapOffset(ppix);
+	offset = exaGetPixmapOffset(ppix);
+	if (offset == 0)
+		offset = pNv->exa_onscreen->offset;
+	return offset;
 }
 
 #endif /* __NV_STRUCT_H__ */
-- 
1.6.2.2


nouveau-multiple-xserver.patch:

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-multiple-xserver.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-multiple-xserver.patch	15 Apr 2009 06:19:01 -0000	1.2
+++ nouveau-multiple-xserver.patch	17 Apr 2009 01:48:16 -0000	1.3
@@ -1,4 +1,4 @@
-From 5e1a05537d929b011bac973a36dfb17d5cbce85d Mon Sep 17 00:00:00 2001
+From 7811f9211a960dd6396f8e29964dcde2aec6f2e5 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:25:25 +1000
 Subject: [PATCH 3/6] f11: hack to support multiple xserver instances

nouveau-nv50-fb-accel.patch:

Index: nouveau-nv50-fb-accel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-fb-accel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-nv50-fb-accel.patch	15 Apr 2009 06:19:01 -0000	1.2
+++ nouveau-nv50-fb-accel.patch	17 Apr 2009 01:48:16 -0000	1.3
@@ -1,4 +1,4 @@
-From 9e7354b890c093698c602d178f7920b92f0d046b Mon Sep 17 00:00:00 2001
+From ae25ecbcb06ea2e32af8c7268ce138645d02274f Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:30:38 +1000
 Subject: [PATCH 4/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
@@ -30,7 +30,7 @@
  			 nouveau_output.h \
  			 nouveau_connector.h \
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index c315a70..55f7468 100644
+index 4909e51..ca1a60b 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -214,8 +214,8 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
@@ -53,7 +53,7 @@
  	drmFree(fb);
  }
  
-@@ -289,7 +289,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -380,7 +380,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		ret = drmModeAddFB(drmmode->fd,
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,

nouveau-nv50-nva0-noaccel.patch:

Index: nouveau-nv50-nva0-noaccel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-nva0-noaccel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-nv50-nva0-noaccel.patch	15 Apr 2009 06:19:01 -0000	1.2
+++ nouveau-nv50-nva0-noaccel.patch	17 Apr 2009 01:48:17 -0000	1.3
@@ -1,4 +1,4 @@
-From 5243a670b6d728d94a86a340062e287a267b9a10 Mon Sep 17 00:00:00 2001
+From 49567300354f9bee9271e9e6ec9332c8fe713973 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 20:20:39 +1000
 Subject: [PATCH 5/6] nv50/f11: disable acceleration on NVAx chipsets

nouveau-store-vbios.patch:

Index: nouveau-store-vbios.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-store-vbios.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-store-vbios.patch	15 Apr 2009 06:19:01 -0000	1.2
+++ nouveau-store-vbios.patch	17 Apr 2009 01:48:17 -0000	1.3
@@ -1,4 +1,4 @@
-From 0b64ce0faefd2a87d46699ff1255e39d0051f115 Mon Sep 17 00:00:00 2001
+From 0a32a04139e0711a0aa2bb4c7885f24b3a963d0c Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:13:26 +1000
 Subject: [PATCH 2/6] bios/f11: store a copy of used vbios image in /var/run

nouveau-transition-hack.patch:

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-transition-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-transition-hack.patch	15 Apr 2009 06:19:01 -0000	1.2
+++ nouveau-transition-hack.patch	17 Apr 2009 01:48:17 -0000	1.3
@@ -1,17 +1,17 @@
-From 0a328a89d65f3b6a98fbf49cefd3deb4f3521254 Mon Sep 17 00:00:00 2001
+From 48c76f574f059d7d98f18baf10e798d8bfd5b968 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:12:25 +1000
 Subject: [PATCH 1/6] kms/f11: hack in transition support without driver pixmaps
 
 ---
- src/drmmode_display.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 51 insertions(+), 2 deletions(-)
+ src/drmmode_display.c |  144 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 142 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index aa8befe..c315a70 100644
+index aa8befe..4909e51 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -185,6 +185,51 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
+@@ -185,6 +185,139 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
  }
  
  static void
@@ -60,22 +60,113 @@
 +}
 +
 +static void
++drmmode_fb_copy_nv50(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
++		     int src_id, int x, int y)
++{
++	drmModeFBPtr fb;
++	NVPtr pNv = NVPTR(pScrn);
++	struct nouveau_channel *chan = pNv->chan;
++	struct nouveau_grobj *eng2d = pNv->Nv2D;
++	struct nouveau_bo *src = NULL, *dst = NULL;
++	struct drm_gem_flink req;
++	int ret;
++
++	/* This is not what this should look like.  Until we can do driver
++	 * pixmaps, this will be a nasty hack!
++	 */
++
++	fb = drmModeGetFB(nouveau_device(pNv->dev)->fd, src_id);
++	if (!fb) {
++		ErrorF("src fb\n");
++		return;
++	}
++
++	req.handle = fb->handle;
++	ret = ioctl(nouveau_device(pNv->dev)->fd, DRM_IOCTL_GEM_FLINK, &req);
++	if (ret) {
++		ErrorF("name bo: %d\n", ret);
++		drmFree(fb);
++		return;
++	}
++
++	ret = nouveau_bo_handle_ref(pNv->dev, req.name, &src);
++	if (ret) {
++		ErrorF("src bo: %d\n", ret);
++		drmFree(fb);
++		return;
++	}
++
++	nouveau_bo_ref(pNv->scanout, &dst);
++
++	BEGIN_RING(chan, eng2d, 0x02ac, 1);
++	OUT_RING  (chan, 3);
++	BEGIN_RING(chan, eng2d, 0x0200, 2);
++	OUT_RING  (chan, pScrn->bitsPerPixel == 16 ? 0xe8 : 0xcf);
++	OUT_RING  (chan, 1);
++	BEGIN_RING(chan, eng2d, 0x0214, 5);
++	OUT_RING  (chan, pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
++	OUT_RING  (chan, pScrn->virtualX);
++	OUT_RING  (chan, pScrn->virtualY);
++	OUT_RELOCh(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	OUT_RELOCl(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	BEGIN_RING(chan, eng2d, 0x0280, 4);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, pScrn->virtualX);
++	OUT_RING  (chan, pScrn->virtualY);
++	BEGIN_RING(chan, eng2d, 0x0230, 2);
++	OUT_RING  (chan, fb->bpp == 16 ? 0xe8 : 0xcf);
++	OUT_RING  (chan, 1);
++	BEGIN_RING(chan, eng2d, 0x0244, 5);
++	OUT_RING  (chan, fb->pitch);
++	OUT_RING  (chan, fb->width);
++	OUT_RING  (chan, fb->height);
++	OUT_RELOCh(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	OUT_RELOCl(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	BEGIN_RING(chan, eng2d, 0x0110, 1);
++	OUT_RING  (chan, 0);
++	BEGIN_RING(chan, eng2d, 0x08b0, 12);
++	OUT_RING  (chan, x);
++	OUT_RING  (chan, y);
++	OUT_RING  (chan, fb->width);
++	OUT_RING  (chan, fb->height);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 1);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 1);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	FIRE_RING (chan);
++
++	nouveau_bo_map(dst, NOUVEAU_BO_RD);
++	nouveau_bo_unmap(dst);
++	nouveau_bo_ref(NULL, &dst);
++	nouveau_bo_ref(NULL, &src);
++	drmFree(fb);
++}
++
++static void
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -194,6 +239,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -194,6 +327,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	PixmapPtr pspix, pdpix;
  	int w, h;
  
 +	if (!pNv->exa_driver_pixmaps) {
++		if (pNv->NoAccel)
 +		drmmode_fb_copy_sw(pScrn, drmmode, dst_id, src_id, x, y);
++		else
++		drmmode_fb_copy_nv50(pScrn, drmmode, dst_id, src_id, x, y);
 +		return;
 +	}
 +
  	pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
  	if (!pspix)
  		return;
-@@ -292,8 +342,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -292,8 +433,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_id;
  	else


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-nouveau.spec	15 Apr 2009 06:19:01 -0000	1.39
+++ xorg-x11-drv-nouveau.spec	17 Apr 2009 01:48:17 -0000	1.40
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   27.%{snapshot}%{?dist}
+Release:   28.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,7 @@
 Patch3: nouveau-nv50-fb-accel.patch
 Patch4: nouveau-nv50-nva0-noaccel.patch
 Patch5: dcbconf_7_4_ignore.diff
+Patch6: nouveau-fb-resize.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -60,6 +61,7 @@
 %patch3 -p1 -b .nv50_fb_render
 %patch4 -p1 -b .nva0_noaccel
 %patch5 -p1 -b .dcbconf
+%patch6 -p1 -b .fbresize
 
 %build
 autoreconf -v --install
@@ -83,6 +85,13 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-28.20090417gitfa2f111
+- avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
+  - the bug here was relatively harmless, but exposed a more serious issue
+    which has been fixed in libdrm-2.4.6-6.fc11
+- kms: speed up transitions, they could take a couple of seconds previously
+- framebuffer resize support (rh#495838, rh#487356, lots of dups)
+
 * Wed Apr 15 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-27.20090413git7100c06
 - fix rh#495843
 



From paragn at fedoraproject.org  Fri Apr 17 01:49:19 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Fri, 17 Apr 2009 01:49:19 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.189,1.190
Message-ID: <20090417014919.92CB87012B@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32197

Modified Files:
	comps-f11.xml.in 
Log Message:

- Add Indic Hyphen package entries




Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- comps-f11.xml.in	16 Apr 2009 19:25:55 -0000	1.189
+++ comps-f11.xml.in	17 Apr 2009 01:48:49 -0000	1.190
@@ -2576,6 +2576,7 @@
       <packagereq type="mandatory">m17n-db-gujarati</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-gu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-gu</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-gu</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-gu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-gu_IN</packagereq>
@@ -2697,6 +2698,7 @@
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-hi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hi</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-hi</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Hindi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Hindi</packagereq>
@@ -3146,6 +3148,7 @@
       <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-ka</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
@@ -3700,6 +3703,7 @@
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ml</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ml</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-ml</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
@@ -4110,6 +4114,7 @@
       <packagereq type="mandatory">m17n-db-oriya</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-or</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-or</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -4208,6 +4213,7 @@
       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pa</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-pa</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Punjabi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Punjabi</packagereq>
@@ -4909,6 +4915,7 @@
       <packagereq type="mandatory">m17n-db-tamil</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ta</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-ta</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Tamil</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Tamil</packagereq>
@@ -4933,6 +4940,7 @@
       <packagereq type="mandatory">m17n-db-telugu</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-te</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-te</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="default">iok</packagereq>



From airlied at fedoraproject.org  Fri Apr 17 01:54:37 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 01:54:37 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1550,
	1.1551 drm-radeon-panel-mode-name.patch, 1.1, NONE
Message-ID: <20090417015437.5D8E97012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2044

Modified Files:
	kernel.spec 
Removed Files:
	drm-radeon-panel-mode-name.patch 
Log Message:
* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com>
- drop ajax patch I rolled it in



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1550
retrieving revision 1.1551
diff -u -r1.1550 -r1.1551
--- kernel.spec	17 Apr 2009 01:36:01 -0000	1.1550
+++ kernel.spec	17 Apr 2009 01:54:07 -0000	1.1551
@@ -688,7 +688,6 @@
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-intel-lying-systems-without-lvds.patch
 Patch1822: drm-intel-gen3-fb-hack.patch
-Patch1823: drm-radeon-panel-mode-name.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1343,7 +1342,6 @@
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-lying-systems-without-lvds.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
-ApplyPatch drm-radeon-panel-mode-name.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1971,6 +1969,9 @@
 # and build.
 
 %changelog
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com>
+- drop ajax patch I rolled it in
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
 - radeon drm: fix rv410 ddc + add another agp test hook
 


--- drm-radeon-panel-mode-name.patch DELETED ---



From bskeggs at fedoraproject.org  Fri Apr 17 01:55:41 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 17 Apr 2009 01:55:41 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-11 xorg-x11-drv-nouveau.spec,1.40,1.41
Message-ID: <20090417015541.BD1EA7012B@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2263

Modified Files:
	xorg-x11-drv-nouveau.spec 
Log Message:
bump versions correctly..



Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-drv-nouveau.spec	17 Apr 2009 01:48:17 -0000	1.40
+++ xorg-x11-drv-nouveau.spec	17 Apr 2009 01:55:11 -0000	1.41
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090413
-%define git_version 7100c06
+%define gitdate 20090417
+%define git_version fa2f111
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   28.%{snapshot}%{?dist}
+Release:   29.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -85,7 +85,7 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
-* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-28.20090417gitfa2f111
+* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111
 - avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
   - the bug here was relatively harmless, but exposed a more serious issue
     which has been fixed in libdrm-2.4.6-6.fc11



From airlied at fedoraproject.org  Fri Apr 17 01:59:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 01:59:56 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1551,1.1552
Message-ID: <20090417015956.56CE77012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3296

Modified Files:
	kernel.spec 
Log Message:
fix order



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1551
retrieving revision 1.1552
diff -u -r1.1551 -r1.1552
--- kernel.spec	17 Apr 2009 01:54:07 -0000	1.1551
+++ kernel.spec	17 Apr 2009 01:59:25 -0000	1.1552
@@ -1969,7 +1969,7 @@
 # and build.
 
 %changelog
-* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com>
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
 - drop ajax patch I rolled it in
 
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>



From bskeggs at fedoraproject.org  Fri Apr 17 02:04:32 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 17 Apr 2009 02:04:32 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-11 .cvsignore, 1.32, 1.33 sources, 1.33,
	1.34
Message-ID: <20090417020432.C3FD67012B@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4373

Modified Files:
	.cvsignore sources 
Log Message:
and the new sources..

I need more coffee.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	13 Apr 2009 10:45:22 -0000	1.32
+++ .cvsignore	17 Apr 2009 02:04:01 -0000	1.33
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090413git7100c06.tar.bz2
+xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Apr 2009 10:45:23 -0000	1.33
+++ sources	17 Apr 2009 02:04:01 -0000	1.34
@@ -1 +1 @@
-830eee644788c6357cb0f965ceedd764  xf86-video-nouveau-0.0.12-20090413git7100c06.tar.bz2
+8cc45d924825a949300c873769093ae0  xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2



From bskeggs at fedoraproject.org  Fri Apr 17 02:30:30 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 17 Apr 2009 02:30:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.32,
	1.33 nouveau-fb-resize.patch, 1.1,
	1.2 nouveau-multiple-xserver.patch, 1.2,
	1.3 nouveau-nv50-fb-accel.patch, 1.2,
	1.3 nouveau-nv50-nva0-noaccel.patch, 1.2,
	1.3 nouveau-store-vbios.patch, 1.2,
	1.3 nouveau-transition-hack.patch, 1.2, 1.3 sources, 1.33,
	1.34 xorg-x11-drv-nouveau.spec, 1.39, 1.40
Message-ID: <20090417023030.CA5607012B@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10360

Modified Files:
	.cvsignore nouveau-fb-resize.patch 
	nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch 
	nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch 
	nouveau-transition-hack.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111
- avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
  - the bug here was relatively harmless, but exposed a more serious issue
    which has been fixed in libdrm-2.4.6-6.fc11
- kms: speed up transitions, they could take a couple of seconds previously
- framebuffer resize support (rh#495838, rh#487356, lots of dups)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	13 Apr 2009 10:45:22 -0000	1.32
+++ .cvsignore	17 Apr 2009 02:29:59 -0000	1.33
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090413git7100c06.tar.bz2
+xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2

nouveau-fb-resize.patch:

Index: nouveau-fb-resize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fb-resize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nouveau-fb-resize.patch	15 Apr 2009 06:31:28 -0000	1.1
+++ nouveau-fb-resize.patch	17 Apr 2009 02:29:59 -0000	1.2
@@ -1,22 +1,22 @@
-From fee865b5ef8aaa9751834e417d4f3d6b7e7dcfcc Mon Sep 17 00:00:00 2001
+From 9189921f9822579246be05eec4f97e04cc609e7f Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at caspar.localdomain>
 Date: Tue, 14 Apr 2009 09:23:07 +1000
 Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps
 
 ---
- src/drmmode_display.c |   75 ++++++++++++++++++++++++++++++++--
+ src/drmmode_display.c |   75 +++++++++++++++++++++++++++++++--
  src/nouveau_exa.c     |    8 ++-
  src/nv50_randr.c      |    6 +++
- src/nv_crtc.c         |    5 ++-
- src/nv_driver.c       |  107 ++++++++++++++++++++++++++++++++++++++++++++++---
+ src/nv_crtc.c         |   16 ++++++-
+ src/nv_driver.c       |  108 ++++++++++++++++++++++++++++++++++++++++++++++---
  src/nv_type.h         |    9 ++++-
- 6 files changed, 194 insertions(+), 16 deletions(-)
+ 6 files changed, 205 insertions(+), 17 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 55f7468..df42ee6 100644
+index ca1a60b..c666c9f 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -978,6 +978,59 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+@@ -1069,6 +1069,59 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
  }
  
  static Bool
@@ -76,7 +76,7 @@
  drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
  {
  	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-@@ -992,10 +1045,23 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+@@ -1083,10 +1136,23 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
  	ErrorF("resize called %d %d\n", width, height);
  
  	if (!pNv->exa_driver_pixmaps) {
@@ -102,7 +102,7 @@
  		return TRUE;
  	}
  
-@@ -1058,7 +1124,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
+@@ -1149,7 +1215,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
  
  Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
  {
@@ -111,7 +111,7 @@
  	drmmode_ptr drmmode;
  	int i;
  
-@@ -1082,8 +1148,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+@@ -1173,8 +1239,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
  	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
  		drmmode_output_init(pScrn, drmmode, i);
  
@@ -169,27 +169,45 @@
  	NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0);
  }
 diff --git a/src/nv_crtc.c b/src/nv_crtc.c
-index 1d50874..8879501 100644
+index 1d50874..cfa06e1 100644
 --- a/src/nv_crtc.c
 +++ b/src/nv_crtc.c
-@@ -1162,8 +1162,11 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+@@ -1154,7 +1154,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+ 	ScrnInfoPtr pScrn = crtc->scrn;
+ 	NVPtr pNv = NVPTR(pScrn);    
+ 	struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
+-	uint32_t start = (y * pScrn->displayWidth + x) * pScrn->bitsPerPixel / 8;
++	uint32_t cpp = pScrn->bitsPerPixel / 8;
++	uint32_t start = (y * pScrn->displayWidth + x) * cpp;
++	uint32_t pitch = pScrn->displayWidth * cpp;
++	NVCrtcRegPtr regp = &pNv->ModeReg.crtc_reg[nv_crtc->head];
+ 
+ 	if (crtc->rotatedData != NULL) /* we do not exist on the real framebuffer */
+ #if NOUVEAU_EXA_PIXMAPS
+@@ -1162,8 +1165,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
  #else
  		start = pNv->FB->offset + nv_crtc->shadow->offset; /* We do exist relative to the framebuffer */
  #endif
 -	else
 +	else {
 +		if (pNv->exa_onscreen)
-+			start == pNv->exa_onscreen->offset;
++			start += pNv->exa_onscreen->offset;
  		start += pNv->FB->offset;
 +	}
++
++	regp->CRTC[NV_CIO_CR_OFFSET_INDEX] = pitch >> 3;
++	regp->CRTC[NV_CIO_CRE_RPC0_INDEX] =
++		XLATE(pitch >> 3, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);
++	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_RPC0_INDEX);
++	crtc_wr_cio_state(crtc, regp, NV_CIO_CR_OFFSET_INDEX);
  
  	start &= ~3;
  	pNv->ModeReg.crtc_reg[nv_crtc->head].fb_start = start;
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index f097fb9..c1fee64 100644
+index f097fb9..0cc81ae 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -900,16 +900,111 @@ Bool NVI2CInit(ScrnInfoPtr pScrn)
+@@ -900,16 +900,112 @@ Bool NVI2CInit(ScrnInfoPtr pScrn)
  	return TRUE;
  }
  
@@ -287,6 +305,12 @@
 +				       pNv->ShadowPtr : pNv->FBMap);
 +	pScrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
 +
+ 	pScrn->virtualX = width;
+ 	pScrn->virtualY = height;
+-#endif
+-	return TRUE;
++	pScrn->displayWidth = pitch / cpp;
++
 +	for (i = 0; i < config->num_crtc; i++) {
 +		xf86CrtcPtr crtc = config->crtc[i];
 +
@@ -297,16 +321,11 @@
 +				crtc->x, crtc->y);
 +	}
 +
- 	pScrn->virtualX = width;
- 	pScrn->virtualY = height;
--#endif
--	return TRUE;
-+	pScrn->displayWidth = pitch / cpp;
 +	return ret == 0;
  }
  
  static const xf86CrtcConfigFuncsRec nv_xf86crtc_config_funcs = {
-@@ -1423,7 +1518,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1423,7 +1519,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  		} else
  			nv50_output_create(pScrn); /* create randr-1.2 "outputs". */
  

nouveau-multiple-xserver.patch:

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-multiple-xserver.patch	15 Apr 2009 06:31:28 -0000	1.2
+++ nouveau-multiple-xserver.patch	17 Apr 2009 02:30:00 -0000	1.3
@@ -1,4 +1,4 @@
-From 5e1a05537d929b011bac973a36dfb17d5cbce85d Mon Sep 17 00:00:00 2001
+From 7811f9211a960dd6396f8e29964dcde2aec6f2e5 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:25:25 +1000
 Subject: [PATCH 3/6] f11: hack to support multiple xserver instances

nouveau-nv50-fb-accel.patch:

Index: nouveau-nv50-fb-accel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-nv50-fb-accel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-nv50-fb-accel.patch	15 Apr 2009 06:31:28 -0000	1.2
+++ nouveau-nv50-fb-accel.patch	17 Apr 2009 02:30:00 -0000	1.3
@@ -1,4 +1,4 @@
-From 9e7354b890c093698c602d178f7920b92f0d046b Mon Sep 17 00:00:00 2001
+From ae25ecbcb06ea2e32af8c7268ce138645d02274f Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:30:38 +1000
 Subject: [PATCH 4/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
@@ -30,7 +30,7 @@
  			 nouveau_output.h \
  			 nouveau_connector.h \
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index c315a70..55f7468 100644
+index 4909e51..ca1a60b 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -214,8 +214,8 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
@@ -53,7 +53,7 @@
  	drmFree(fb);
  }
  
-@@ -289,7 +289,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -380,7 +380,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		ret = drmModeAddFB(drmmode->fd,
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,

nouveau-nv50-nva0-noaccel.patch:

Index: nouveau-nv50-nva0-noaccel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-nv50-nva0-noaccel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-nv50-nva0-noaccel.patch	15 Apr 2009 06:31:28 -0000	1.2
+++ nouveau-nv50-nva0-noaccel.patch	17 Apr 2009 02:30:00 -0000	1.3
@@ -1,4 +1,4 @@
-From 5243a670b6d728d94a86a340062e287a267b9a10 Mon Sep 17 00:00:00 2001
+From 49567300354f9bee9271e9e6ec9332c8fe713973 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 20:20:39 +1000
 Subject: [PATCH 5/6] nv50/f11: disable acceleration on NVAx chipsets

nouveau-store-vbios.patch:

Index: nouveau-store-vbios.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-store-vbios.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-store-vbios.patch	15 Apr 2009 06:31:28 -0000	1.2
+++ nouveau-store-vbios.patch	17 Apr 2009 02:30:00 -0000	1.3
@@ -1,4 +1,4 @@
-From 0b64ce0faefd2a87d46699ff1255e39d0051f115 Mon Sep 17 00:00:00 2001
+From 0a32a04139e0711a0aa2bb4c7885f24b3a963d0c Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:13:26 +1000
 Subject: [PATCH 2/6] bios/f11: store a copy of used vbios image in /var/run

nouveau-transition-hack.patch:

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-transition-hack.patch	15 Apr 2009 06:31:28 -0000	1.2
+++ nouveau-transition-hack.patch	17 Apr 2009 02:30:00 -0000	1.3
@@ -1,17 +1,17 @@
-From 0a328a89d65f3b6a98fbf49cefd3deb4f3521254 Mon Sep 17 00:00:00 2001
+From 48c76f574f059d7d98f18baf10e798d8bfd5b968 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:12:25 +1000
 Subject: [PATCH 1/6] kms/f11: hack in transition support without driver pixmaps
 
 ---
- src/drmmode_display.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 51 insertions(+), 2 deletions(-)
+ src/drmmode_display.c |  144 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 142 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index aa8befe..c315a70 100644
+index aa8befe..4909e51 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -185,6 +185,51 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
+@@ -185,6 +185,139 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
  }
  
  static void
@@ -60,22 +60,113 @@
 +}
 +
 +static void
++drmmode_fb_copy_nv50(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
++		     int src_id, int x, int y)
++{
++	drmModeFBPtr fb;
++	NVPtr pNv = NVPTR(pScrn);
++	struct nouveau_channel *chan = pNv->chan;
++	struct nouveau_grobj *eng2d = pNv->Nv2D;
++	struct nouveau_bo *src = NULL, *dst = NULL;
++	struct drm_gem_flink req;
++	int ret;
++
++	/* This is not what this should look like.  Until we can do driver
++	 * pixmaps, this will be a nasty hack!
++	 */
++
++	fb = drmModeGetFB(nouveau_device(pNv->dev)->fd, src_id);
++	if (!fb) {
++		ErrorF("src fb\n");
++		return;
++	}
++
++	req.handle = fb->handle;
++	ret = ioctl(nouveau_device(pNv->dev)->fd, DRM_IOCTL_GEM_FLINK, &req);
++	if (ret) {
++		ErrorF("name bo: %d\n", ret);
++		drmFree(fb);
++		return;
++	}
++
++	ret = nouveau_bo_handle_ref(pNv->dev, req.name, &src);
++	if (ret) {
++		ErrorF("src bo: %d\n", ret);
++		drmFree(fb);
++		return;
++	}
++
++	nouveau_bo_ref(pNv->scanout, &dst);
++
++	BEGIN_RING(chan, eng2d, 0x02ac, 1);
++	OUT_RING  (chan, 3);
++	BEGIN_RING(chan, eng2d, 0x0200, 2);
++	OUT_RING  (chan, pScrn->bitsPerPixel == 16 ? 0xe8 : 0xcf);
++	OUT_RING  (chan, 1);
++	BEGIN_RING(chan, eng2d, 0x0214, 5);
++	OUT_RING  (chan, pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
++	OUT_RING  (chan, pScrn->virtualX);
++	OUT_RING  (chan, pScrn->virtualY);
++	OUT_RELOCh(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	OUT_RELOCl(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	BEGIN_RING(chan, eng2d, 0x0280, 4);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, pScrn->virtualX);
++	OUT_RING  (chan, pScrn->virtualY);
++	BEGIN_RING(chan, eng2d, 0x0230, 2);
++	OUT_RING  (chan, fb->bpp == 16 ? 0xe8 : 0xcf);
++	OUT_RING  (chan, 1);
++	BEGIN_RING(chan, eng2d, 0x0244, 5);
++	OUT_RING  (chan, fb->pitch);
++	OUT_RING  (chan, fb->width);
++	OUT_RING  (chan, fb->height);
++	OUT_RELOCh(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	OUT_RELOCl(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
++	BEGIN_RING(chan, eng2d, 0x0110, 1);
++	OUT_RING  (chan, 0);
++	BEGIN_RING(chan, eng2d, 0x08b0, 12);
++	OUT_RING  (chan, x);
++	OUT_RING  (chan, y);
++	OUT_RING  (chan, fb->width);
++	OUT_RING  (chan, fb->height);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 1);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 1);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0);
++	FIRE_RING (chan);
++
++	nouveau_bo_map(dst, NOUVEAU_BO_RD);
++	nouveau_bo_unmap(dst);
++	nouveau_bo_ref(NULL, &dst);
++	nouveau_bo_ref(NULL, &src);
++	drmFree(fb);
++}
++
++static void
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -194,6 +239,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -194,6 +327,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	PixmapPtr pspix, pdpix;
  	int w, h;
  
 +	if (!pNv->exa_driver_pixmaps) {
++		if (pNv->NoAccel)
 +		drmmode_fb_copy_sw(pScrn, drmmode, dst_id, src_id, x, y);
++		else
++		drmmode_fb_copy_nv50(pScrn, drmmode, dst_id, src_id, x, y);
 +		return;
 +	}
 +
  	pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
  	if (!pspix)
  		return;
-@@ -292,8 +342,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -292,8 +433,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_id;
  	else


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Apr 2009 10:45:23 -0000	1.33
+++ sources	17 Apr 2009 02:30:00 -0000	1.34
@@ -1 +1 @@
-830eee644788c6357cb0f965ceedd764  xf86-video-nouveau-0.0.12-20090413git7100c06.tar.bz2
+8cc45d924825a949300c873769093ae0  xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-nouveau.spec	15 Apr 2009 06:31:28 -0000	1.39
+++ xorg-x11-drv-nouveau.spec	17 Apr 2009 02:30:00 -0000	1.40
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090413
-%define git_version 7100c06
+%define gitdate 20090417
+%define git_version fa2f111
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   27.%{snapshot}%{?dist}
+Release:   29.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,7 @@
 Patch3: nouveau-nv50-fb-accel.patch
 Patch4: nouveau-nv50-nva0-noaccel.patch
 Patch5: dcbconf_7_4_ignore.diff
+Patch6: nouveau-fb-resize.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -60,6 +61,7 @@
 %patch3 -p1 -b .nv50_fb_render
 %patch4 -p1 -b .nva0_noaccel
 %patch5 -p1 -b .dcbconf
+%patch6 -p1 -b .fbresize
 
 %build
 autoreconf -v --install
@@ -83,6 +85,13 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111
+- avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
+  - the bug here was relatively harmless, but exposed a more serious issue
+    which has been fixed in libdrm-2.4.6-6.fc11
+- kms: speed up transitions, they could take a couple of seconds previously
+- framebuffer resize support (rh#495838, rh#487356, lots of dups)
+
 * Wed Apr 15 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-27.20090413git7100c06
 - fix rh#495843
 



From bskeggs at fedoraproject.org  Fri Apr 17 02:32:54 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 17 Apr 2009 02:32:54 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm-radeon.patch, 1.8, 1.9 libdrm.spec, 1.74, 
	1.75 nouveau-updates.patch, 1.1, 1.2
Message-ID: <20090417023254.E4AC57012B@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11200

Modified Files:
	libdrm-radeon.patch libdrm.spec nouveau-updates.patch 
Log Message:
* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.6-6
- nouveau: post writes to pushbuf before incrementing PUT

* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 2.4.6-5
- libdrm-radeon: fix wait idle



libdrm-radeon.patch:

Index: libdrm-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-radeon.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdrm-radeon.patch	6 Apr 2009 05:41:36 -0000	1.8
+++ libdrm-radeon.patch	17 Apr 2009 02:32:54 -0000	1.9
@@ -484,7 +484,7 @@
 +    do {
 +        ret = drmCommandWriteRead(bo->bom->fd, DRM_RADEON_GEM_WAIT_IDLE,
 +                                  &args, sizeof(args));
-+    } while (ret == -EAGAIN);
++    } while (ret == -EBUSY);
 +    return ret;
 +}
 +


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libdrm.spec	10 Apr 2009 22:25:21 -0000	1.74
+++ libdrm.spec	17 Apr 2009 02:32:54 -0000	1.75
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -30,6 +30,8 @@
 Patch4: libdrm-2.4.0-no-bc.patch
 # radeon libdrm patches from modesetting-gem branch of upstream
 Patch8: libdrm-radeon.patch
+# nouveau fixes from drm.git
+Patch9: nouveau-updates.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -50,6 +52,7 @@
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch8 -p1 -b .radeon
+%patch9 -p1 -b .nouveau
 
 %build
 autoreconf -v --install || exit 1
@@ -109,6 +112,12 @@
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.6-6
+- nouveau: post writes to pushbuf before incrementing PUT
+
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 2.4.6-5
+- libdrm-radeon: fix wait idle
+
 * Sat Apr 11 2009 Dave Airlie <airlied at redhat.com> 2.4.6-4
 - libdrm-2.4.7-revert-bong.patch - revert connector "speedups"
 

nouveau-updates.patch:

Index: nouveau-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/nouveau-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nouveau-updates.patch	24 Mar 2009 23:24:17 -0000	1.1
+++ nouveau-updates.patch	17 Apr 2009 02:32:54 -0000	1.2
@@ -1,143 +1,26 @@
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/Makefile.am libdrm-2.4.5/libdrm/nouveau/Makefile.am
---- libdrm-2.4.5.orig/libdrm/nouveau/Makefile.am	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am	2009-03-25 09:06:49.000000000 +1000
-@@ -19,7 +19,9 @@
- 			    nouveau_bo.c \
- 			    nouveau_resource.c \
- 			    nouveau_dma.c \
--			    nouveau_fence.c
-+			    nouveau_fence.c \
-+			    nouveau_dma.h \
-+			    nouveau_private.h
- 
- libdrm_nouveaucommonincludedir = ${includedir}/nouveau
- libdrm_nouveaucommoninclude_HEADERS = \
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_bo.c libdrm-2.4.5/libdrm/nouveau/nouveau_bo.c
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_bo.c	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_bo.c	2009-03-25 09:06:20.000000000 +1000
-@@ -347,24 +347,25 @@
- 	if (!bo || !handle)
- 		return -EINVAL;
- 
--	if (!nvdev->mm_enabled)
--		return -ENODEV;
--
- 	if (!nvbo->global_handle) {
- 		struct drm_gem_flink req;
-  
- 		ret = nouveau_bo_kalloc(nvbo, NULL);
- 		if (ret)
- 			return ret;
-- 
--		req.handle = nvbo->handle;
--		ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
--		if (ret) {
--			nouveau_bo_kfree(nvbo);
--			return ret;
-+
-+		if (nvdev->mm_enabled) {
-+			req.handle = nvbo->handle;
-+			ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
-+			if (ret) {
-+				nouveau_bo_kfree(nvbo);
-+				return ret;
-+			}
-+	 
-+			nvbo->global_handle = req.name;
-+		} else {
-+			nvbo->global_handle = nvbo->offset;
- 		}
-- 
--		nvbo->global_handle = req.name;
+diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
+index 023c6be..66466e3 100644
+--- a/libdrm/nouveau/nouveau_bo.c
++++ b/libdrm/nouveau/nouveau_bo.c
+@@ -404,7 +404,8 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle,
+ 		nvbo->size = req.size;
+ 		nvbo->handle = req.handle;
  	}
-  
- 	*handle = nvbo->global_handle;
-@@ -412,6 +413,8 @@
- {
- 	struct nouveau_bo_priv *nvbo = priv;
- 
-+	nouveau_fence_ref(NULL, &nvbo->fence);
-+	nouveau_fence_ref(NULL, &nvbo->wr_fence);
- 	nouveau_bo_kfree(nvbo);
- 	free(nvbo);
- }
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_device.c libdrm-2.4.5/libdrm/nouveau/nouveau_device.c
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_device.c	2009-02-22 03:54:48.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_device.c	2009-03-25 09:06:21.000000000 +1000
-@@ -76,6 +76,22 @@
- 	}
- 	nvdev->base.vm_vram_base = value;
- 
-+	ret = nouveau_device_get_param(&nvdev->base,
-+				       NOUVEAU_GETPARAM_FB_SIZE, &value);
-+	if (ret) {
-+		nouveau_device_close((void *)&nvdev);
-+		return ret;
-+	}
-+	nvdev->vram_aper_size = value;
-+
-+	ret = nouveau_device_get_param(&nvdev->base,
-+				       NOUVEAU_GETPARAM_AGP_SIZE, &value);
-+	if (ret) {
-+		nouveau_device_close((void *)&nvdev);
-+		return ret;
-+	}
-+	nvdev->gart_aper_size = value;
+- 
 +
- 	ret = nouveau_bo_init(&nvdev->base);
- 	if (ret) {
- 		nouveau_device_close((void *)&nvdev);
-@@ -128,7 +144,7 @@
- {
- 	struct nouveau_device_priv *nvdev;
- 
--	if (dev || !*dev)
-+	if (!dev || !*dev)
- 		return;
- 	nvdev = nouveau_device(*dev);
- 	*dev = NULL;
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_drmif.h libdrm-2.4.5/libdrm/nouveau/nouveau_drmif.h
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_drmif.h	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_drmif.h	2009-03-25 09:06:21.000000000 +1000
-@@ -37,6 +37,9 @@
- 	int needs_close;
- 
- 	int mm_enabled;
-+/*XXX: move to nouveau_device when interface gets bumped */
-+	uint64_t vram_aper_size;
-+	uint64_t gart_aper_size;
- };
- #define nouveau_device(n) ((struct nouveau_device_priv *)(n))
- 
-diff -Nur libdrm-2.4.5.orig/libdrm/nouveau/nouveau_fence.c libdrm-2.4.5/libdrm/nouveau/nouveau_fence.c
---- libdrm-2.4.5.orig/libdrm/nouveau/nouveau_fence.c	2009-02-11 10:09:35.000000000 +1000
-+++ libdrm-2.4.5/libdrm/nouveau/nouveau_fence.c	2009-03-25 09:06:21.000000000 +1000
-@@ -96,22 +96,16 @@
- int
- nouveau_fence_ref(struct nouveau_fence *ref, struct nouveau_fence **fence)
- {
--	struct nouveau_fence_priv *nvfence;
--
- 	if (!fence)
- 		return -EINVAL;
- 
--	if (*fence) {
--		nouveau_fence_del(fence);
--		*fence = NULL;
--	}
-+	if (ref)
-+		nouveau_fence(ref)->refcount++;
- 
--	if (ref) {
--		nvfence = nouveau_fence(ref);
--		nvfence->refcount++;	
--		*fence = &nvfence->base;
--	}
-+	if (*fence)
-+		nouveau_fence_del(fence);
- 
-+	*fence = ref;
++	nvbo->base.handle = nvbo->handle;
  	return 0;
- }
+ } 
+ 
+diff --git a/libdrm/nouveau/nouveau_dma.c b/libdrm/nouveau/nouveau_dma.c
+index 23da64b..b084f70 100644
+--- a/libdrm/nouveau/nouveau_dma.c
++++ b/libdrm/nouveau/nouveau_dma.c
+@@ -41,6 +41,7 @@ WRITE_PUT(struct nouveau_channel_priv *nvchan, uint32_t val)
+ 	volatile int dum;
+ 
+ 	NOUVEAU_DMA_BARRIER;
++	dum = nvchan->pushbuf[0];
+ 	dum = READ_GET(nvchan);
  
-
+ 	*nvchan->put = put;



From jsmidt at fedoraproject.org  Fri Apr 17 03:00:57 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Fri, 17 Apr 2009 03:00:57 +0000 (UTC)
Subject: rpms/phoronix-test-suite/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 phoronix-test-suite.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417030057.D87E47012B@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17825/devel

Modified Files:
	.cvsignore import.log phoronix-test-suite.spec sources 
Log Message:
New upstream release: 1.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 22:44:43 -0000	1.2
+++ .cvsignore	17 Apr 2009 03:00:26 -0000	1.3
@@ -1 +1 @@
-phoronix-test-suite-1.8.0.tar.gz
+phoronix-test-suite-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2009 22:44:43 -0000	1.1
+++ import.log	17 Apr 2009 03:00:26 -0000	1.2
@@ -1 +1,2 @@
 phoronix-test-suite-1_8_0-1_fc10:HEAD:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239316867
+phoronix-test-suite-1_8_1-1_fc10:HEAD:phoronix-test-suite-1.8.1-1.fc10.src.rpm:1239937044


Index: phoronix-test-suite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/devel/phoronix-test-suite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phoronix-test-suite.spec	9 Apr 2009 22:44:43 -0000	1.1
+++ phoronix-test-suite.spec	17 Apr 2009 03:00:26 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       phoronix-test-suite
-Version:    1.8.0
+Version:    1.8.1
 Release:    1%{?dist}
 Summary:    A Comprehensive Linux Benchmarking System
 
@@ -73,6 +73,8 @@
 
 
 %changelog
+* Mon Apr 16 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.1-1
+- New upstream release
 
 * Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Apr 2009 22:44:44 -0000	1.2
+++ sources	17 Apr 2009 03:00:26 -0000	1.3
@@ -1 +1 @@
-59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz
+6dc46563bc616cf1ca0d9922888d05f6  phoronix-test-suite-1.8.1.tar.gz



From jsmidt at fedoraproject.org  Fri Apr 17 03:02:54 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Fri, 17 Apr 2009 03:02:54 +0000 (UTC)
Subject: rpms/phoronix-test-suite/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 phoronix-test-suite.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417030255.1A79E7012B@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18456/F-11

Modified Files:
	.cvsignore import.log phoronix-test-suite.spec sources 
Log Message:
New upstream release: 1.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 22:47:01 -0000	1.2
+++ .cvsignore	17 Apr 2009 03:02:53 -0000	1.3
@@ -1 +1 @@
-phoronix-test-suite-1.8.0.tar.gz
+phoronix-test-suite-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2009 22:47:01 -0000	1.1
+++ import.log	17 Apr 2009 03:02:53 -0000	1.2
@@ -1 +1,2 @@
 phoronix-test-suite-1_8_0-1_fc10:F-11:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239317024
+phoronix-test-suite-1_8_1-1_fc10:F-11:phoronix-test-suite-1.8.1-1.fc10.src.rpm:1239937158


Index: phoronix-test-suite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-11/phoronix-test-suite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phoronix-test-suite.spec	9 Apr 2009 22:47:01 -0000	1.1
+++ phoronix-test-suite.spec	17 Apr 2009 03:02:53 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       phoronix-test-suite
-Version:    1.8.0
+Version:    1.8.1
 Release:    1%{?dist}
 Summary:    A Comprehensive Linux Benchmarking System
 
@@ -73,6 +73,8 @@
 
 
 %changelog
+* Mon Apr 16 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.1-1
+- New upstream release
 
 * Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Apr 2009 22:47:01 -0000	1.2
+++ sources	17 Apr 2009 03:02:53 -0000	1.3
@@ -1 +1 @@
-59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz
+6dc46563bc616cf1ca0d9922888d05f6  phoronix-test-suite-1.8.1.tar.gz



From jsmidt at fedoraproject.org  Fri Apr 17 03:04:06 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Fri, 17 Apr 2009 03:04:06 +0000 (UTC)
Subject: rpms/phoronix-test-suite/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 phoronix-test-suite.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417030406.5E33B7012B@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18839/F-10

Modified Files:
	.cvsignore import.log phoronix-test-suite.spec sources 
Log Message:
New Upstream Release: 1.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 22:55:31 -0000	1.2
+++ .cvsignore	17 Apr 2009 03:03:35 -0000	1.3
@@ -1 +1 @@
-phoronix-test-suite-1.8.0.tar.gz
+phoronix-test-suite-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2009 22:55:31 -0000	1.1
+++ import.log	17 Apr 2009 03:03:35 -0000	1.2
@@ -1 +1,2 @@
 phoronix-test-suite-1_8_0-1_fc10:F-10:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239317153
+phoronix-test-suite-1_8_1-1_fc10:F-10:phoronix-test-suite-1.8.1-1.fc10.src.rpm:1239937202


Index: phoronix-test-suite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-10/phoronix-test-suite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phoronix-test-suite.spec	9 Apr 2009 22:55:31 -0000	1.1
+++ phoronix-test-suite.spec	17 Apr 2009 03:03:35 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       phoronix-test-suite
-Version:    1.8.0
+Version:    1.8.1
 Release:    1%{?dist}
 Summary:    A Comprehensive Linux Benchmarking System
 
@@ -73,6 +73,8 @@
 
 
 %changelog
+* Mon Apr 16 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.1-1
+- New upstream release
 
 * Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Apr 2009 22:55:31 -0000	1.2
+++ sources	17 Apr 2009 03:03:35 -0000	1.3
@@ -1 +1 @@
-59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz
+6dc46563bc616cf1ca0d9922888d05f6  phoronix-test-suite-1.8.1.tar.gz



From jsmidt at fedoraproject.org  Fri Apr 17 03:05:49 2009
From: jsmidt at fedoraproject.org (Joseph Smidt)
Date: Fri, 17 Apr 2009 03:05:49 +0000 (UTC)
Subject: rpms/phoronix-test-suite/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 phoronix-test-suite.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417030549.7A39B7012B@cvs1.fedora.phx.redhat.com>

Author: jsmidt

Update of /cvs/pkgs/rpms/phoronix-test-suite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19214/F-9

Modified Files:
	.cvsignore import.log phoronix-test-suite.spec sources 
Log Message:
New Upstream release: 1.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 22:57:13 -0000	1.2
+++ .cvsignore	17 Apr 2009 03:05:18 -0000	1.3
@@ -1 +1 @@
-phoronix-test-suite-1.8.0.tar.gz
+phoronix-test-suite-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2009 22:57:13 -0000	1.1
+++ import.log	17 Apr 2009 03:05:18 -0000	1.2
@@ -1 +1,2 @@
 phoronix-test-suite-1_8_0-1_fc10:F-9:phoronix-test-suite-1.8.0-1.fc10.src.rpm:1239317663
+phoronix-test-suite-1_8_1-1_fc10:F-9:phoronix-test-suite-1.8.1-1.fc10.src.rpm:1239937279


Index: phoronix-test-suite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-9/phoronix-test-suite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phoronix-test-suite.spec	9 Apr 2009 22:57:13 -0000	1.1
+++ phoronix-test-suite.spec	17 Apr 2009 03:05:18 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       phoronix-test-suite
-Version:    1.8.0
+Version:    1.8.1
 Release:    1%{?dist}
 Summary:    A Comprehensive Linux Benchmarking System
 
@@ -73,6 +73,8 @@
 
 
 %changelog
+* Mon Apr 16 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.1-1
+- New upstream release
 
 * Mon Apr 6 2009 Joseph Smidt <josephsmidt at gmail.com> 1.8.0-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phoronix-test-suite/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Apr 2009 22:57:13 -0000	1.2
+++ sources	17 Apr 2009 03:05:18 -0000	1.3
@@ -1 +1 @@
-59a52181d59fe1171ed3db7df9b55819  phoronix-test-suite-1.8.0.tar.gz
+6dc46563bc616cf1ca0d9922888d05f6  phoronix-test-suite-1.8.1.tar.gz



From airlied at fedoraproject.org  Fri Apr 17 04:14:19 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 04:14:19 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.76,
	1.77 kernel.spec, 1.1552, 1.1553
Message-ID: <20090417041419.B5BF57012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv616

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
- radeon drm: fix oops in LUT loading


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- drm-modesetting-radeon.patch	17 Apr 2009 01:47:36 -0000	1.76
+++ drm-modesetting-radeon.patch	17 Apr 2009 04:14:18 -0000	1.77
@@ -1,3 +1,25 @@
+commit 9283b7e0503c439ccde80b808044e5581a4b3117
+Merge: 4fb1fe8 69c4926
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 14:08:45 2009 +1000
+
+    Merge remote branch 'origin/drm-rawhide' into drm-f11
+
+commit 69c492681103cd6d5db3434a1646dc71d354bdee
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 14:04:45 2009 +1000
+
+    radeon: fix agp test hook
+
+commit 33769d2b889e01e0026ce8980ce4f5803ce14d15
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 14:04:02 2009 +1000
+
+    radeon: fixup palette setting and add support for 30-bit.
+    
+    The radeon palette can handle 30-bit on all cards. Also
+    fix oops when setting palette on disconnected crtc
+
 commit 4fb1fe8e8696cd2fd7485ebf3fa01c0ac491a6ae
 Merge: 18efcb5 37267b0
 Author: Dave Airlie <airlied at redhat.com>
@@ -16810,10 +16832,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
 new file mode 100644
-index 0000000..7f3b75a
+index 0000000..3bc3d79
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,473 @@
 +/**************************************************************************
 + * 
 + * Copyright 2007 Dave Airlie
@@ -16915,9 +16937,11 @@
 +			man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
 +			man->io_addr = NULL;
 +			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
-+				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
++				_DRM_FLAG_MEMTYPE_CSELECT;
 +			if (radeon_no_gart_wb == 2)
 +				man->flags |= _DRM_FLAG_MEMTYPE_CMA;
++			else
++				man->flags |= _DRM_FLAG_NEEDS_IOREMAP;
 +			man->drm_bus_maptype = _DRM_AGP;
 +		} else {
 +			man->io_offset = dev_priv->gart_vm_start;
@@ -22674,10 +22698,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..2d33137
+index 0000000..bb2f0d8
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -0,0 +1,678 @@
+@@ -0,0 +1,680 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -22724,7 +22748,6 @@
 +	struct drm_radeon_private *dev_priv = dev->dev_private;
 +	int i;
 +
-+	DRM_DEBUG("%d\n", radeon_crtc->crtc_id);
 +	RADEON_WRITE(AVIVO_DC_LUTA_CONTROL + radeon_crtc->crtc_offset, 0);
 +
 +	RADEON_WRITE(AVIVO_DC_LUTA_BLACK_OFFSET_BLUE + radeon_crtc->crtc_offset, 0);
@@ -22739,12 +22762,12 @@
 +	RADEON_WRITE(AVIVO_DC_LUT_RW_MODE, 0);
 +	RADEON_WRITE(AVIVO_DC_LUT_WRITE_EN_MASK, 0x0000003f);
 +
++	RADEON_WRITE8(AVIVO_DC_LUT_RW_INDEX, 0);
 +	for (i = 0; i < 256; i++) {
-+		RADEON_WRITE8(AVIVO_DC_LUT_RW_INDEX, i);
 +		RADEON_WRITE(AVIVO_DC_LUT_30_COLOR,
-+			     (radeon_crtc->lut_r[i] << 22) |
-+			     (radeon_crtc->lut_g[i] << 12) |
-+			     (radeon_crtc->lut_b[i] << 2));
++			     (radeon_crtc->lut_r[i] << 20) |
++			     (radeon_crtc->lut_g[i] << 10) |
++			     (radeon_crtc->lut_b[i] << 0));
 +	}
 +
 +	RADEON_WRITE(AVIVO_D1GRPH_LUT_SEL + radeon_crtc->crtc_offset, radeon_crtc->crtc_id);
@@ -22765,11 +22788,11 @@
 +		dac2_cntl |= RADEON_DAC2_PALETTE_ACC_CTL;
 +	RADEON_WRITE(RADEON_DAC_CNTL2, dac2_cntl);
 +
++	RADEON_WRITE8(RADEON_PALETTE_INDEX, 0);
 +	for (i = 0; i < 256; i++) {
-+		RADEON_WRITE8(RADEON_PALETTE_INDEX, i);
-+		RADEON_WRITE(RADEON_PALETTE_DATA,
-+			     (radeon_crtc->lut_r[i] << 16) |
-+			     (radeon_crtc->lut_g[i] << 8) |
++		RADEON_WRITE(RADEON_PALETTE_30_DATA,
++			     (radeon_crtc->lut_r[i] << 20) |
++			     (radeon_crtc->lut_g[i] << 10) |
 +			     (radeon_crtc->lut_b[i] << 0));
 +	}
 +}
@@ -22796,9 +22819,9 @@
 +
 +	if (regno==0)
 +		DRM_DEBUG("gamma set %d\n", radeon_crtc->crtc_id);
-+	radeon_crtc->lut_r[regno] = red >> 8;
-+	radeon_crtc->lut_g[regno] = green >> 8;
-+	radeon_crtc->lut_b[regno] = blue >> 8;
++	radeon_crtc->lut_r[regno] = red >> 6;
++	radeon_crtc->lut_g[regno] = green >> 6;
++	radeon_crtc->lut_b[regno] = blue >> 6;
 +}
 +
 +static void radeon_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
@@ -22810,22 +22833,25 @@
 +	if (size != 256)
 +		return;
 +
++	if (!crtc->fb)
++		return;
++
 +	if (crtc->fb->depth == 16) {
 +		for (i = 0; i < 64; i++) {
 +			if (i <= 31) {
 +				for (j = 0; j < 8; j++) {
-+					radeon_crtc->lut_r[i * 8 + j] = red[i] >> 8;
-+					radeon_crtc->lut_b[i * 8 + j] = blue[i] >> 8;
++					radeon_crtc->lut_r[i * 8 + j] = red[i] >> 6;
++					radeon_crtc->lut_b[i * 8 + j] = blue[i] >> 6;
 +				}
 +			}
 +			for (j = 0; j < 4; j++)
-+				radeon_crtc->lut_g[i * 4 + j] = green[i] >> 8;
++				radeon_crtc->lut_g[i * 4 + j] = green[i] >> 6;
 +		}
 +	} else {
 +		for (i = 0; i < 256; i++) {
-+			radeon_crtc->lut_r[i] = red[i] >> 8;
-+			radeon_crtc->lut_g[i] = green[i] >> 8;
-+			radeon_crtc->lut_b[i] = blue[i] >> 8;
++			radeon_crtc->lut_r[i] = red[i] >> 6;
++			radeon_crtc->lut_g[i] = green[i] >> 6;
++			radeon_crtc->lut_b[i] = blue[i] >> 6;
 +		}
 +	}
 +
@@ -22869,9 +22895,9 @@
 +	radeon_crtc->mode_set.num_connectors = 0;
 +
 +	for (i = 0; i < 256; i++) {
-+		radeon_crtc->lut_r[i] = i;
-+		radeon_crtc->lut_g[i] = i;
-+		radeon_crtc->lut_b[i] = i;
++		radeon_crtc->lut_r[i] = i << 2;
++		radeon_crtc->lut_g[i] = i << 2;
++		radeon_crtc->lut_b[i] = i << 2;
 +	}
 +
 +	if (dev_priv->is_atom_bios && (radeon_is_avivo(dev_priv) || radeon_r4xx_atom))
@@ -32191,7 +32217,7 @@
  
 diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
 new file mode 100644
-index 0000000..63f2c8f
+index 0000000..a1aff31
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_mode.h
 @@ -0,0 +1,399 @@
@@ -32372,7 +32398,7 @@
 +struct radeon_crtc {
 +	struct drm_crtc base;
 +	int crtc_id;
-+	u8 lut_r[256], lut_g[256], lut_b[256];
++	u16 lut_r[256], lut_g[256], lut_b[256];
 +	bool enabled;
 +	bool can_tile;
 +	uint32_t crtc_offset;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1552
retrieving revision 1.1553
diff -u -r1.1552 -r1.1553
--- kernel.spec	17 Apr 2009 01:59:25 -0000	1.1552
+++ kernel.spec	17 Apr 2009 04:14:19 -0000	1.1553
@@ -1970,6 +1970,9 @@
 
 %changelog
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
+- radeon drm: fix oops in LUT loading
+
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
 - drop ajax patch I rolled it in
 
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>



From remi at fedoraproject.org  Fri Apr 17 04:33:39 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 17 Apr 2009 04:33:39 +0000 (UTC)
Subject: rpms/maniadrive/F-10 maniadrive.spec,1.11,1.12
Message-ID: <20090417043339.518F87012B@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/maniadrive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4520

Modified Files:
	maniadrive.spec 
Log Message:
rebuild for new php


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/F-10/maniadrive.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maniadrive.spec	15 Feb 2009 21:05:52 -0000	1.11
+++ maniadrive.spec	17 Apr 2009 04:33:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2-13
+- Rebuild for php 5.2.9
+
 * Sun Feb 15 2009 Hans de Goede <hdegoede at redhat.com> 1.2-12
 - Fix maniadrive crashing with php 5.2.8 (and later)
 - Fix maniadrive triggering an assert in the latest ode



From remi at fedoraproject.org  Fri Apr 17 04:39:53 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 17 Apr 2009 04:39:53 +0000 (UTC)
Subject: rpms/maniadrive/F-9 maniadrive.spec,1.10,1.11
Message-ID: <20090417043953.14B787012B@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/maniadrive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5568

Modified Files:
	maniadrive.spec 
Log Message:
rebuild for new php


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/F-9/maniadrive.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maniadrive.spec	15 Feb 2009 21:06:32 -0000	1.10
+++ maniadrive.spec	17 Apr 2009 04:39:22 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2-13
+- Rebuild for php 5.2.9
+
 * Sun Feb 15 2009 Hans de Goede <hdegoede at redhat.com> 1.2-12
 - Fix maniadrive crashing with php 5.2.8 (and later)
 - Fix maniadrive triggering an assert in the latest ode



From jkeating at fedoraproject.org  Fri Apr 17 05:56:25 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 17 Apr 2009 05:56:25 +0000 (UTC)
Subject: rpms/anaconda/F-11 import.log, NONE, 1.1 .cvsignore, 1.635,
	1.636 anaconda.spec, 1.783, 1.784 sources, 1.769, 1.770
Message-ID: <20090417055625.B8DDC7012B@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/anaconda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21797/F-11

Modified Files:
	.cvsignore anaconda.spec sources 
Added Files:
	import.log 
Log Message:
Import the build from devel into F-11



--- NEW FILE import.log ---
anaconda-11_5_0_45-1:F-11:anaconda-11.5.0.45-1.src.rpm:1239947708


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/.cvsignore,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- .cvsignore	14 Apr 2009 03:47:35 -0000	1.635
+++ .cvsignore	17 Apr 2009 05:55:54 -0000	1.636
@@ -1,2 +1 @@
-clog
-anaconda-11.5.0.44.tar.bz2
+anaconda-11.5.0.45.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- anaconda.spec	14 Apr 2009 03:47:35 -0000	1.783
+++ anaconda.spec	17 Apr 2009 05:55:54 -0000	1.784
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.44
+Version: 11.5.0.45
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -37,7 +37,7 @@
 %define pythonpyblockver 0.24-1
 %define libbdevidver 5.1.2-1
 %define e2fsver 1.41.0
-%define nmver 0.7.0
+%define nmver 1:0.7.1-3.git20090414
 %define dbusver 1.2.3
 %define createrepover 0.4.7
 %define yumutilsver 1.1.11-3
@@ -213,6 +213,41 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.45-1
+- Touch /.autorelabel when running under rescue mode (#491747). (clumens)
+- Add support for fingerprint-based logins (#481273). (clumens)
+- Add a "File Bug" button to the catch-all partitioning exception handler.
+  (clumens)
+- Remove the early catch-all exception handler (#495933). (clumens)
+- Implement the save to USB using devicetree devices. (jgranado)
+- Use size instead of currentSize when comparing lv sizes (hdegoede)
+- Make sure all pv's of an lv's vg are setup before resizing an lv (hdegoede)
+- Do not try to teardown a non existing format (hdegoede)
+- Center the bootloader configuration dialog (#495802). (clumens)
+- Destroy (potential) stale metadata when creating a new partition (hdegoede)
+- use partition req_base_size instead of size in partitionCompare()
+  (hdegoede)
+- Fix changing size of newly created partitions (hdegoede)
+- Don't traceback on invalid filesystem detection (#495156) (dcantrell)
+- Check to see if formatcb is None. (jgranado)
+- Use the PV name when logging error messages. (jgranado)
+- Don't set up the device to obtain minSize anymore. (dlehman)
+- Improve estimate of md arrays' size. (dlehman)
+- Determine minimum size for filesystems once, from constructor. (dlehman)
+- Fix estimate of LUKS header size for newly encrypted devices. (#493575)
+  (dlehman)
+- Fix two syntax problems with generated mdadm.conf entries. (#495552)
+  (dlehman)
+- Default to AES-XTS cipher mode with 512 bit key for new LUKS devices.
+  (dlehman)
+- When going back from a failed shrink, reset the device action set.
+  (clumens)
+- If we can't communicate while logging in to bugzilla, error (#492470).
+  (clumens)
+- Make save to usb work. (jgranado)
+- We don't always have a formatcb either (#495665). (clumens)
+- The entry is named lvsizeentry now. (jgranado)
+
 * Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.44-1
 - Default to SHA512 password encoding algorithm. (dcantrell)
 - Handle format combo box not existing (#495288) (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/sources,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- sources	14 Apr 2009 03:47:36 -0000	1.769
+++ sources	17 Apr 2009 05:55:54 -0000	1.770
@@ -1 +1 @@
-88831b5b5ee1754793e2fc199a4aa4bf  anaconda-11.5.0.44.tar.bz2
+00b7f0263ca1c593152a0b625d74ccd7  anaconda-11.5.0.45.tar.bz2



From jkeating at fedoraproject.org  Fri Apr 17 05:57:48 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 17 Apr 2009 05:57:48 +0000 (UTC)
Subject: rpms/anaconda/F-11 anaconda.spec,1.784,1.785
Message-ID: <20090417055748.D1C1A7012B@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/anaconda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22112

Modified Files:
	anaconda.spec 
Log Message:
Build for F-11


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v
retrieving revision 1.784
retrieving revision 1.785
diff -u -r1.784 -r1.785
--- anaconda.spec	17 Apr 2009 05:55:54 -0000	1.784
+++ anaconda.spec	17 Apr 2009 05:57:18 -0000	1.785
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.5.0.45
-Release: 1
+Release: 2
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -213,6 +213,9 @@
 %endif
 
 %changelog
+* Thu Apr 16 2009 Jesse Keating <jkeating at redhat.com> - 11.5.0.45-2
+- Bump release so that I can tag/build for F11
+
 * Thu Apr 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.45-1
 - Touch /.autorelabel when running under rescue mode (#491747). (clumens)
 - Add support for fingerprint-based logins (#481273). (clumens)



From phuang at fedoraproject.org  Fri Apr 17 06:09:25 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 17 Apr 2009 06:09:25 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.14,1.15 ibus.spec,1.65,1.66
Message-ID: <20090417060925.285157012B@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25221

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ibus-HEAD.patch	15 Apr 2009 00:04:04 -0000	1.14
+++ ibus-HEAD.patch	17 Apr 2009 06:09:24 -0000	1.15
@@ -1,12 +1,49 @@
+diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in
+index fcf2f21..cd2ad60 100644
+--- a/bus/ibus.desktop.in
++++ b/bus/ibus.desktop.in
+@@ -7,7 +7,7 @@ Exec=ibus-daemon --xim
+ Icon=ibus
+ Terminal=false
+ Type=Application
+-X-GNOME-Autostart-Phase=Panel
++X-GNOME-Autostart-Phase=Applications
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
+ X-KDE-autostart-after=panel
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index 456e049..7003bd7 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -2091,10 +2091,10 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
+         return TRUE;
+     }
+     else if (event == next_factory) {
+-        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+-        if (priv->engine && !priv->enabled) {
+-            bus_input_context_enable (context);
++        if (priv->engine == NULL || priv->enabled == FALSE) {
++            return FALSE;
+         }
++        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+         return TRUE;
+     }
+     else if (event == prev_factory) {
 diff --git a/bus/server.c b/bus/server.c
-index 7245bd3..425dd86 100644
+index 7245bd3..1c796f2 100644
 --- a/bus/server.c
 +++ b/bus/server.c
-@@ -90,10 +90,13 @@ bus_server_listen (BusServer *server)
+@@ -86,21 +86,23 @@ bus_server_listen (BusServer *server)
+ 
+     // const gchar *address = "unix:abstract=/tmp/ibus-c"
+     const gchar *address;
+-    gchar *path;
++    const gchar *path;
      gboolean retval;
  
-     path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
+-    path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
 -    mkdir (path, 0775);
++    path = ibus_get_socket_folder ();
 +    mkdir (path, 0700);
 +    chmod (path, 0700);
 +
@@ -17,6 +54,13 @@
  
      if (!retval) {
          g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
+         exit (-1);
+     }
+ 
+-    g_free(path);
+     return retval;
+ }
+ 
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
 index 5da4dec..168e45a 100644
 --- a/client/gtk2/ibusimcontext.c
@@ -110,6 +154,24 @@
        <locale name="C">
          <short>Trigger Hotkey</short>
  	    <long>Trigger hotkey for enable or disable input context</long>
+diff --git a/ibus/common.py b/ibus/common.py
+index 527d3a5..571ebaa 100644
+--- a/ibus/common.py
++++ b/ibus/common.py
+@@ -67,7 +67,12 @@ if not __username:
+ if not __username:
+     __username = os.getenv ("USERNAME")
+ 
+-IBUS_ADDR = "unix:path=/tmp/ibus-%s/ibus-%s-%s" % (__username, __hostname, __display_number)
++__session_id = os.getenv ("IBUS_SESSION_ID")
++
++IBUS_ADDR = "unix:path=/tmp/ibus-%s%s/ibus-%s-%s" % (__username,
++                                                     "-" + __session_id if __session_id else "",
++                                                     __hostname,
++                                                     __display_number)
+ # IBUS_ADDR  = "tcp:host=localhost,port=7799"
+ 
+ IBUS_IFACE_IBUS     = "org.freedesktop.IBus"
 diff --git a/ibus/modifier.py b/ibus/modifier.py
 index 7f6afad..56d8be9 100644
 --- a/ibus/modifier.py
@@ -658,6 +720,30 @@
                  button.set_active(True)
              else:
                  button.set_active(False)
+diff --git a/src/ibusbus.c b/src/ibusbus.c
+index 373e5d4..756f8e5 100644
+--- a/src/ibusbus.c
++++ b/src/ibusbus.c
+@@ -220,14 +220,17 @@ ibus_bus_init (IBusBus *bus)
+ 
+     ibus_bus_connect (bus);
+ 
+-    path = g_strdup_printf ("/tmp/ibus-%s/", ibus_get_user_name ());
++    path = ibus_get_socket_folder ();
++    mkdir (path, 0700);
++    chmod (path, 0700);
++
++
+     file = g_file_new_for_path (path);
+     priv->monitor = g_file_monitor_directory (file, 0, NULL, NULL);
+ 
+     g_signal_connect (priv->monitor, "changed", (GCallback) _changed_cb, bus);
+ 
+     g_object_unref (file);
+-    g_free (path);
+ }
+ 
+ static void
 diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
 index 95754cf..52547ff 100644
 --- a/src/ibusinputcontext.c
@@ -674,6 +760,81 @@
          return FALSE;
  
      retval = ibus_proxy_call_with_reply ((IBusProxy *) context,
+diff --git a/src/ibusshare.c b/src/ibusshare.c
+index c7aa1fe..186be85 100644
+--- a/src/ibusshare.c
++++ b/src/ibusshare.c
+@@ -69,6 +69,31 @@ ibus_get_user_name (void)
+ }
+ 
+ const gchar *
++ibus_get_session_id (void)
++{
++    return g_getenv("IBUS_SESSION_ID");
++}
++
++const gchar *
++ibus_get_socket_folder (void)
++{
++    static gchar *folder = NULL;
++
++    if (folder == NULL) {
++        const gchar *session = ibus_get_session_id ();
++        if (session && session[0] != '\0') {
++            folder = g_strdup_printf ("/tmp/ibus-%s-%s",
++                ibus_get_user_name (), session);
++        }
++        else {
++            folder = g_strdup_printf ("/tmp/ibus-%s",
++                ibus_get_user_name ());
++        }
++    }
++    return folder;
++}
++
++const gchar *
+ ibus_get_socket_path (void)
+ {
+     static gchar *path = NULL;
+@@ -78,7 +103,7 @@ ibus_get_socket_path (void)
+         gchar *display;
+         gchar *displaynumber = "0";
+         gchar *screennumber = "0";
+-        const gchar *username = NULL;
++        const gchar *folder= NULL;
+         gchar *p;
+ 
+         if (_display == NULL) {
+@@ -111,14 +136,14 @@ ibus_get_socket_path (void)
+             }
+         }
+ 
+-        username = ibus_get_user_name ();
++        folder = ibus_get_socket_folder ();
+ 
+         if (hostname[0] == '\0')
+             hostname = "unix";
+ 
+         path = g_strdup_printf (
+-            "/tmp/ibus-%s/ibus-%s-%s",
+-            username, hostname, displaynumber);
++            "%s/ibus-%s-%s",
++            folder, hostname, displaynumber);
+         g_free (display);
+     }
+     return path;
+diff --git a/src/ibusshare.h b/src/ibusshare.h
+index f3b34c4..4c0c645 100644
+--- a/src/ibusshare.h
++++ b/src/ibusshare.h
+@@ -49,6 +49,7 @@ void             ibus_set_display       (const gchar    *display);
+ const gchar     *ibus_get_address       (void);
+ const gchar     *ibus_get_user_name     (void);
+ const gchar     *ibus_get_socket_path   (void);
++const gchar     *ibus_get_socket_folder (void);
+ 
+ const gchar     *ibus_keyval_name       (guint           keyval);
+ guint            ibus_keyval_from_name  (const gchar    *keyval_name);
 diff --git a/src/ibustypes.h b/src/ibustypes.h
 index d2f15ba..2f7c0bf 100644
 --- a/src/ibustypes.h


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ibus.spec	15 Apr 2009 00:04:05 -0000	1.65
+++ ibus.spec	17 Apr 2009 06:09:24 -0000	1.66
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090413
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -217,6 +217,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
+- Update ibus-HEAD.patch.
+- Next Engine hotkey will do nothing if the IM is not active.
+
 * Wed Apr 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-3
 - Update ibus-HEAD.patch.
 - Fix bug 495431 -  ibus Release modifier doesn't work with Alt



From airlied at fedoraproject.org  Fri Apr 17 06:12:28 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 06:12:28 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.77,
	1.78 kernel.spec, 1.1553, 1.1554
Message-ID: <20090417061228.933E47012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25618

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-92
- drm modesetting: force mode switch when connectors change


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- drm-modesetting-radeon.patch	17 Apr 2009 04:14:18 -0000	1.77
+++ drm-modesetting-radeon.patch	17 Apr 2009 06:11:57 -0000	1.78
@@ -1,3 +1,23 @@
+commit fa4687fdb659e807b8e3b05bf971f79e7aebde62
+Merge: 9283b7e 389363f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 16:05:30 2009 +1000
+
+    Merge remote branch 'origin/drm-rawhide' into drm-f11
+
+commit 389363fe962f28bfa41eb8d18c6171d9f5e388b3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 16:02:47 2009 +1000
+
+    drm: set full mode when we have a connector change.
+    
+    for some reason we have two levels of set base detection, this seems redundant
+    and most likely is. If we get a userspace mode set and the encoder list
+    is different we have to set the full mode.
+    
+    Add a flag to make sure a full set is done, however I think we can probably
+    just cleanup inside mode_set properly.
+
 commit 9283b7e0503c439ccde80b808044e5581a4b3117
 Merge: 4fb1fe8 69c4926
 Author: Dave Airlie <airlied at redhat.com>
@@ -5548,9 +5568,36 @@
  
  out:
 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index a04639d..0e46972 100644
+index a04639d..2bedb7a 100644
 --- a/drivers/gpu/drm/drm_crtc_helper.c
 +++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -552,7 +552,7 @@ drm_crtc_prepare_encoders(struct drm_device *dev)
+ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+ 			      struct drm_display_mode *mode,
+ 			      int x, int y,
+-			      struct drm_framebuffer *old_fb)
++			      struct drm_framebuffer *old_fb, int conn_changed)
+ {
+ 	struct drm_device *dev = crtc->dev;
+ 	struct drm_display_mode *adjusted_mode, saved_mode;
+@@ -590,7 +590,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+ 	crtc->x = x;
+ 	crtc->y = y;
+ 
+-	if (drm_mode_equal(&saved_mode, &crtc->mode)) {
++	if (drm_mode_equal(&saved_mode, &crtc->mode) && !conn_changed) {
+ 		if (saved_x != crtc->x || saved_y != crtc->y ||
+ 		    depth_changed || bpp_changed) {
+ 			ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y,
+@@ -848,7 +848,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
+ 			drm_mode_debug_printmodeline(set->mode);
+ 			if (!drm_crtc_helper_set_mode(set->crtc, set->mode,
+ 						      set->x, set->y,
+-						      old_fb)) {
++						      old_fb, 1)) {
+ 				DRM_ERROR("failed to set mode on crtc %p\n",
+ 					  set->crtc);
+ 				ret = -EINVAL;
 @@ -868,6 +868,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
  						set->x, set->y, old_fb);
  		if (ret != 0)
@@ -5560,6 +5607,15 @@
  	}
  
  	kfree(save_encoders);
+@@ -999,7 +1001,7 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
+ 			continue;
+ 
+ 		ret = drm_crtc_helper_set_mode(crtc, &crtc->mode,
+-					       crtc->x, crtc->y, crtc->fb);
++					       crtc->x, crtc->y, crtc->fb, 1);
+ 
+ 		if (ret == false)
+ 			DRM_ERROR("failed to set mode on crtc %p\n", crtc);
 @@ -1007,3 +1009,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
  	return 0;
  }
@@ -7442,7 +7498,7 @@
  int i915_irq_emit(struct drm_device *dev, void *data,
  			 struct drm_file *file_priv)
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 64773ce..178386d 100644
+index 64773ce..a2783c0 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -763,12 +763,18 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
@@ -7485,6 +7541,15 @@
  		break;
  	default:
  		DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
+@@ -1573,7 +1579,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_output *intel_output,
+ 	if (!crtc->enabled) {
+ 		if (!mode)
+ 			mode = &load_detect_mode;
+-		drm_crtc_helper_set_mode(crtc, mode, 0, 0, crtc->fb);
++		drm_crtc_helper_set_mode(crtc, mode, 0, 0, crtc->fb, 0);
+ 	} else {
+ 		if (intel_crtc->dpms_mode != DRM_MODE_DPMS_ON) {
+ 			crtc_funcs = crtc->helper_private;
 diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
 index 52ce439..0eea827 100644
 --- a/drivers/gpu/drm/radeon/Makefile


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1553
retrieving revision 1.1554
diff -u -r1.1553 -r1.1554
--- kernel.spec	17 Apr 2009 04:14:19 -0000	1.1553
+++ kernel.spec	17 Apr 2009 06:11:57 -0000	1.1554
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-92
+- drm modesetting: force mode switch when connectors change
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
 - radeon drm: fix oops in LUT loading
 



From phuang at fedoraproject.org  Fri Apr 17 07:09:08 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 17 Apr 2009 07:09:08 +0000 (UTC)
Subject: rpms/ibus/F-11 ibus-HEAD.patch,1.14,1.15 ibus.spec,1.65,1.66
Message-ID: <20090417070908.2F0E07012B@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5217

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus-HEAD.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ibus-HEAD.patch	15 Apr 2009 00:04:04 -0000	1.14
+++ ibus-HEAD.patch	17 Apr 2009 07:09:07 -0000	1.15
@@ -1,12 +1,49 @@
+diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in
+index fcf2f21..cd2ad60 100644
+--- a/bus/ibus.desktop.in
++++ b/bus/ibus.desktop.in
+@@ -7,7 +7,7 @@ Exec=ibus-daemon --xim
+ Icon=ibus
+ Terminal=false
+ Type=Application
+-X-GNOME-Autostart-Phase=Panel
++X-GNOME-Autostart-Phase=Applications
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
+ X-KDE-autostart-after=panel
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index 456e049..7003bd7 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -2091,10 +2091,10 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
+         return TRUE;
+     }
+     else if (event == next_factory) {
+-        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+-        if (priv->engine && !priv->enabled) {
+-            bus_input_context_enable (context);
++        if (priv->engine == NULL || priv->enabled == FALSE) {
++            return FALSE;
+         }
++        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+         return TRUE;
+     }
+     else if (event == prev_factory) {
 diff --git a/bus/server.c b/bus/server.c
-index 7245bd3..425dd86 100644
+index 7245bd3..1c796f2 100644
 --- a/bus/server.c
 +++ b/bus/server.c
-@@ -90,10 +90,13 @@ bus_server_listen (BusServer *server)
+@@ -86,21 +86,23 @@ bus_server_listen (BusServer *server)
+ 
+     // const gchar *address = "unix:abstract=/tmp/ibus-c"
+     const gchar *address;
+-    gchar *path;
++    const gchar *path;
      gboolean retval;
  
-     path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
+-    path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
 -    mkdir (path, 0775);
++    path = ibus_get_socket_folder ();
 +    mkdir (path, 0700);
 +    chmod (path, 0700);
 +
@@ -17,6 +54,13 @@
  
      if (!retval) {
          g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
+         exit (-1);
+     }
+ 
+-    g_free(path);
+     return retval;
+ }
+ 
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
 index 5da4dec..168e45a 100644
 --- a/client/gtk2/ibusimcontext.c
@@ -110,6 +154,24 @@
        <locale name="C">
          <short>Trigger Hotkey</short>
  	    <long>Trigger hotkey for enable or disable input context</long>
+diff --git a/ibus/common.py b/ibus/common.py
+index 527d3a5..571ebaa 100644
+--- a/ibus/common.py
++++ b/ibus/common.py
+@@ -67,7 +67,12 @@ if not __username:
+ if not __username:
+     __username = os.getenv ("USERNAME")
+ 
+-IBUS_ADDR = "unix:path=/tmp/ibus-%s/ibus-%s-%s" % (__username, __hostname, __display_number)
++__session_id = os.getenv ("IBUS_SESSION_ID")
++
++IBUS_ADDR = "unix:path=/tmp/ibus-%s%s/ibus-%s-%s" % (__username,
++                                                     "-" + __session_id if __session_id else "",
++                                                     __hostname,
++                                                     __display_number)
+ # IBUS_ADDR  = "tcp:host=localhost,port=7799"
+ 
+ IBUS_IFACE_IBUS     = "org.freedesktop.IBus"
 diff --git a/ibus/modifier.py b/ibus/modifier.py
 index 7f6afad..56d8be9 100644
 --- a/ibus/modifier.py
@@ -658,6 +720,30 @@
                  button.set_active(True)
              else:
                  button.set_active(False)
+diff --git a/src/ibusbus.c b/src/ibusbus.c
+index 373e5d4..756f8e5 100644
+--- a/src/ibusbus.c
++++ b/src/ibusbus.c
+@@ -220,14 +220,17 @@ ibus_bus_init (IBusBus *bus)
+ 
+     ibus_bus_connect (bus);
+ 
+-    path = g_strdup_printf ("/tmp/ibus-%s/", ibus_get_user_name ());
++    path = ibus_get_socket_folder ();
++    mkdir (path, 0700);
++    chmod (path, 0700);
++
++
+     file = g_file_new_for_path (path);
+     priv->monitor = g_file_monitor_directory (file, 0, NULL, NULL);
+ 
+     g_signal_connect (priv->monitor, "changed", (GCallback) _changed_cb, bus);
+ 
+     g_object_unref (file);
+-    g_free (path);
+ }
+ 
+ static void
 diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
 index 95754cf..52547ff 100644
 --- a/src/ibusinputcontext.c
@@ -674,6 +760,81 @@
          return FALSE;
  
      retval = ibus_proxy_call_with_reply ((IBusProxy *) context,
+diff --git a/src/ibusshare.c b/src/ibusshare.c
+index c7aa1fe..186be85 100644
+--- a/src/ibusshare.c
++++ b/src/ibusshare.c
+@@ -69,6 +69,31 @@ ibus_get_user_name (void)
+ }
+ 
+ const gchar *
++ibus_get_session_id (void)
++{
++    return g_getenv("IBUS_SESSION_ID");
++}
++
++const gchar *
++ibus_get_socket_folder (void)
++{
++    static gchar *folder = NULL;
++
++    if (folder == NULL) {
++        const gchar *session = ibus_get_session_id ();
++        if (session && session[0] != '\0') {
++            folder = g_strdup_printf ("/tmp/ibus-%s-%s",
++                ibus_get_user_name (), session);
++        }
++        else {
++            folder = g_strdup_printf ("/tmp/ibus-%s",
++                ibus_get_user_name ());
++        }
++    }
++    return folder;
++}
++
++const gchar *
+ ibus_get_socket_path (void)
+ {
+     static gchar *path = NULL;
+@@ -78,7 +103,7 @@ ibus_get_socket_path (void)
+         gchar *display;
+         gchar *displaynumber = "0";
+         gchar *screennumber = "0";
+-        const gchar *username = NULL;
++        const gchar *folder= NULL;
+         gchar *p;
+ 
+         if (_display == NULL) {
+@@ -111,14 +136,14 @@ ibus_get_socket_path (void)
+             }
+         }
+ 
+-        username = ibus_get_user_name ();
++        folder = ibus_get_socket_folder ();
+ 
+         if (hostname[0] == '\0')
+             hostname = "unix";
+ 
+         path = g_strdup_printf (
+-            "/tmp/ibus-%s/ibus-%s-%s",
+-            username, hostname, displaynumber);
++            "%s/ibus-%s-%s",
++            folder, hostname, displaynumber);
+         g_free (display);
+     }
+     return path;
+diff --git a/src/ibusshare.h b/src/ibusshare.h
+index f3b34c4..4c0c645 100644
+--- a/src/ibusshare.h
++++ b/src/ibusshare.h
+@@ -49,6 +49,7 @@ void             ibus_set_display       (const gchar    *display);
+ const gchar     *ibus_get_address       (void);
+ const gchar     *ibus_get_user_name     (void);
+ const gchar     *ibus_get_socket_path   (void);
++const gchar     *ibus_get_socket_folder (void);
+ 
+ const gchar     *ibus_keyval_name       (guint           keyval);
+ guint            ibus_keyval_from_name  (const gchar    *keyval_name);
 diff --git a/src/ibustypes.h b/src/ibustypes.h
 index d2f15ba..2f7c0bf 100644
 --- a/src/ibustypes.h


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ibus.spec	15 Apr 2009 00:04:05 -0000	1.65
+++ ibus.spec	17 Apr 2009 07:09:07 -0000	1.66
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090413
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -217,6 +217,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
+- Update ibus-HEAD.patch.
+- Next Engine hotkey will do nothing if the IM is not active.
+
 * Wed Apr 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-3
 - Update ibus-HEAD.patch.
 - Fix bug 495431 -  ibus Release modifier doesn't work with Alt



From phuang at fedoraproject.org  Fri Apr 17 07:11:55 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 17 Apr 2009 07:11:55 +0000 (UTC)
Subject: rpms/ibus/F-11 ibus.spec,1.66,1.67
Message-ID: <20090417071155.65E6C7012B@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5953

Modified Files:
	ibus.spec 
Log Message:
Bump rel number to 5


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ibus.spec	17 Apr 2009 07:09:07 -0000	1.66
+++ ibus.spec	17 Apr 2009 07:11:25 -0000	1.67
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090413
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -217,7 +217,7 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-5
 - Update ibus-HEAD.patch.
 - Next Engine hotkey will do nothing if the IM is not active.
 



From jorton at fedoraproject.org  Fri Apr 17 07:20:14 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 17 Apr 2009 07:20:14 +0000 (UTC)
Subject: rpms/php/F-10 php-5.2.5-systzdata.patch, 1.3, 1.4 php.spec, 1.163, 
	1.164 php-5.2.6-systzdata.patch, 1.2, NONE
Message-ID: <20090417072014.9E00F7012B@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7741

Modified Files:
	php.spec 
Added Files:
	php-5.2.5-systzdata.patch 
Removed Files:
	php-5.2.6-systzdata.patch 
Log Message:
* Fri Apr 17 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
- stay at v3 of systzdata patch


php-5.2.5-systzdata.patch:

Index: php-5.2.5-systzdata.patch
===================================================================
RCS file: php-5.2.5-systzdata.patch
diff -N php-5.2.5-systzdata.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ php-5.2.5-systzdata.patch	17 Apr 2009 07:20:13 -0000	1.4
@@ -0,0 +1,263 @@
+
+Add support for use of the system timezone database, rather
+than embedding a copy.  Discussed upstream but was not desired.
+
+History:
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+
+--- php-5.2.5/ext/date/lib/timelib.m4.systzdata
++++ php-5.2.5/ext/date/lib/timelib.m4
+@@ -78,3 +78,17 @@ stdlib.h
+ 
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll strftime)
++
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++                         [Define for location of system timezone data])
++   fi
++fi
++
+--- php-5.2.5/ext/date/lib/parse_tz.c.systzdata
++++ php-5.2.5/ext/date/lib/parse_tz.c
+@@ -20,6 +20,16 @@
+ 
+ #include "timelib.h"
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++#endif
++
+ #include <stdio.h>
+ 
+ #ifdef HAVE_LOCALE_H
+@@ -31,7 +41,10 @@
+ #else
+ #include <strings.h>
+ #endif
++
++#ifndef HAVE_SYSTEM_TZDATA
+ #include "timezonedb.h"
++#endif
+ 
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -206,6 +219,195 @@ void timelib_dump_tzinfo(timelib_tzinfo 
+ 	}
+ }
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++static const timelib_tzdb *timezonedb_system = NULL;
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++	return strcmp(ent->d_name, ".") != 0
++		&& strcmp(ent->d_name, "..") != 0
++		&& strcmp(ent->d_name, "posix") != 0
++		&& strcmp(ent->d_name, "posixrules") != 0
++		&& strcmp(ent->d_name, "right") != 0
++		&& strstr(ent->d_name, ".tab") == NULL;
++}
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++	size_t dirstack_size,  dirstack_top;
++	size_t index_size, index_next;
++	timelib_tzdb_index_entry *db_index;
++	char **dirstack;
++
++	/* LIFO stack to hold directory entries to scan; each slot is a
++	 * directory name relative to the zoneinfo prefix. */
++	dirstack_size = 32;
++	dirstack = malloc(dirstack_size * sizeof *dirstack);
++	dirstack_top = 1;
++	dirstack[0] = strdup("");
++	
++	/* Index array. */
++	index_size = 64;
++	db_index = malloc(index_size * sizeof *db_index);
++	index_next = 0;
++
++	do {
++		struct dirent **ents;
++		char name[PATH_MAX], *top;
++		int count;
++
++		/* Pop the top stack entry, and iterate through its contents. */
++		top = dirstack[--dirstack_top];
++		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++		count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++		while (count > 0) {
++			struct stat st;
++			const char *leaf = ents[count - 1]->d_name;
++
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++				 top, leaf);
++			
++			if (strlen(name) && stat(name, &st) == 0) {
++				/* Name, relative to the zoneinfo prefix. */
++				const char *root = top;
++
++				if (root[0] == '/') root++;
++
++				snprintf(name, sizeof name, "%s%s%s", root, 
++					 *root ? "/": "", leaf);
++
++				if (S_ISDIR(st.st_mode)) {
++					if (dirstack_top == dirstack_size) {
++						dirstack_size *= 2;
++						dirstack = realloc(dirstack, 
++								   dirstack_size * sizeof *dirstack);
++					}
++					dirstack[dirstack_top++] = strdup(name);
++				}
++				else {
++					if (index_next == index_size) {
++						index_size *= 2;
++						db_index = realloc(db_index,
++								   index_size * sizeof *db_index);
++					}
++
++					db_index[index_next].id = strdup(name);
++					db_index[index_next++].pos = 0;
++				}
++			}
++
++			free(ents[--count]);
++		}
++		
++		if (count != -1) free(ents);
++		free(top);
++	} while (dirstack_top);
++
++	db->index = db_index;
++	db->index_size = index_next;
++
++	free(dirstack);
++}
++
++/* Return the mmap()ed tzfile if found, else NULL.  On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++	char fname[PATH_MAX];
++	struct stat st;
++	char *p;
++	int fd;
++	
++	if (strstr(timezone, "..") != NULL) {
++		return NULL;
++	}
++
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++	
++	fd = open(fname, O_RDONLY);
++	if (fd == -1) {
++		return NULL;
++	} else if (fstat(fd, &st) != 0 || st.st_size < 21) {
++		close(fd);
++		return NULL;
++	}
++
++	*length = st.st_size;
++	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++	close(fd);
++	
++	return p != MAP_FAILED ? p : NULL;
++}
++
++const timelib_tzdb *timelib_builtin_db(void)
++{
++	if (timezonedb_system == NULL) {
++		timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++		tmp->version = "0.system";
++		tmp->data = NULL;
++		create_zone_index(tmp);
++		timezonedb_system = tmp;
++	}
++			
++	return timezonedb_system;
++}
++
++const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
++{
++	*count = timezonedb_system->index_size;
++	return timezonedb_system->index;
++}
++
++int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
++{
++	char fname[PATH_MAX];
++
++	if (strstr(timezone, "..") != NULL) {
++		return 0;
++	}
++	
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++
++	return access(fname, R_OK) == 0 ? 1 : 0;
++}
++
++timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
++{
++	char *tzf, *orig;
++	timelib_tzinfo *tmp;
++	size_t len;
++
++	orig = map_tzfile(timezone, &len);
++	if (orig == NULL) {
++		return NULL;
++	}
++
++	tmp = timelib_tzinfo_ctor(timezone);
++
++	tzf = orig + 20;
++	read_header(&tzf, tmp);
++	read_transistions(&tzf, tmp);
++	read_types(&tzf, tmp);
++
++	munmap(orig, len);
++
++	return tmp;
++}
++#else /* !HAVE_SYSTEM_TZDATA */
++
+ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	int left = 0, right = tzdb->index_size - 1;
+@@ -279,6 +481,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+ 
+ 	return tmp;
+ }
++#endif
+ 
+ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
+ {


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/php.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- php.spec	16 Apr 2009 16:27:11 -0000	1.163
+++ php.spec	17 Apr 2009 07:20:13 -0000	1.164
@@ -7,7 +7,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -32,7 +32,7 @@
 # Functional changes
 Patch40: php-5.0.4-dlopen.patch
 Patch41: php-5.2.4-easter.patch
-Patch42: php-5.2.6-systzdata.patch
+Patch42: php-5.2.5-systzdata.patch
 
 # Fixes for tests
 Patch60: php-5.2.7-tests-dashn.patch
@@ -719,6 +719,9 @@
 %files pspell -f files.pspell
 
 %changelog
+* Fri Apr 17 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
+- stay at v3 of systzdata patch
+
 * Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 5.2.9-1
 - update to 5.2.9
 - merge with some rawhide improvments (fix patch fuzz, renumber


--- php-5.2.6-systzdata.patch DELETED ---



From jorton at fedoraproject.org  Fri Apr 17 07:34:07 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 17 Apr 2009 07:34:07 +0000 (UTC)
Subject: rpms/php/F-9 php-5.2.5-systzdata.patch, 1.2, 1.3 php.spec, 1.159,
	1.160 php-5.2.6-systzdata.patch, 1.1, NONE
Message-ID: <20090417073407.C381F7012B@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9907

Modified Files:
	php.spec 
Added Files:
	php-5.2.5-systzdata.patch 
Removed Files:
	php-5.2.6-systzdata.patch 
Log Message:
* Fri Apr 17 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
- stay at v3 of systzdata patch


php-5.2.5-systzdata.patch:

Index: php-5.2.5-systzdata.patch
===================================================================
RCS file: php-5.2.5-systzdata.patch
diff -N php-5.2.5-systzdata.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ php-5.2.5-systzdata.patch	17 Apr 2009 07:34:07 -0000	1.3
@@ -0,0 +1,263 @@
+
+Add support for use of the system timezone database, rather
+than embedding a copy.  Discussed upstream but was not desired.
+
+History:
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+
+--- php-5.2.5/ext/date/lib/timelib.m4.systzdata
++++ php-5.2.5/ext/date/lib/timelib.m4
+@@ -78,3 +78,17 @@ stdlib.h
+ 
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll strftime)
++
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++                         [Define for location of system timezone data])
++   fi
++fi
++
+--- php-5.2.5/ext/date/lib/parse_tz.c.systzdata
++++ php-5.2.5/ext/date/lib/parse_tz.c
+@@ -20,6 +20,16 @@
+ 
+ #include "timelib.h"
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++#endif
++
+ #include <stdio.h>
+ 
+ #ifdef HAVE_LOCALE_H
+@@ -31,7 +41,10 @@
+ #else
+ #include <strings.h>
+ #endif
++
++#ifndef HAVE_SYSTEM_TZDATA
+ #include "timezonedb.h"
++#endif
+ 
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -206,6 +219,195 @@ void timelib_dump_tzinfo(timelib_tzinfo 
+ 	}
+ }
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++static const timelib_tzdb *timezonedb_system = NULL;
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++	return strcmp(ent->d_name, ".") != 0
++		&& strcmp(ent->d_name, "..") != 0
++		&& strcmp(ent->d_name, "posix") != 0
++		&& strcmp(ent->d_name, "posixrules") != 0
++		&& strcmp(ent->d_name, "right") != 0
++		&& strstr(ent->d_name, ".tab") == NULL;
++}
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++	size_t dirstack_size,  dirstack_top;
++	size_t index_size, index_next;
++	timelib_tzdb_index_entry *db_index;
++	char **dirstack;
++
++	/* LIFO stack to hold directory entries to scan; each slot is a
++	 * directory name relative to the zoneinfo prefix. */
++	dirstack_size = 32;
++	dirstack = malloc(dirstack_size * sizeof *dirstack);
++	dirstack_top = 1;
++	dirstack[0] = strdup("");
++	
++	/* Index array. */
++	index_size = 64;
++	db_index = malloc(index_size * sizeof *db_index);
++	index_next = 0;
++
++	do {
++		struct dirent **ents;
++		char name[PATH_MAX], *top;
++		int count;
++
++		/* Pop the top stack entry, and iterate through its contents. */
++		top = dirstack[--dirstack_top];
++		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++		count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++		while (count > 0) {
++			struct stat st;
++			const char *leaf = ents[count - 1]->d_name;
++
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++				 top, leaf);
++			
++			if (strlen(name) && stat(name, &st) == 0) {
++				/* Name, relative to the zoneinfo prefix. */
++				const char *root = top;
++
++				if (root[0] == '/') root++;
++
++				snprintf(name, sizeof name, "%s%s%s", root, 
++					 *root ? "/": "", leaf);
++
++				if (S_ISDIR(st.st_mode)) {
++					if (dirstack_top == dirstack_size) {
++						dirstack_size *= 2;
++						dirstack = realloc(dirstack, 
++								   dirstack_size * sizeof *dirstack);
++					}
++					dirstack[dirstack_top++] = strdup(name);
++				}
++				else {
++					if (index_next == index_size) {
++						index_size *= 2;
++						db_index = realloc(db_index,
++								   index_size * sizeof *db_index);
++					}
++
++					db_index[index_next].id = strdup(name);
++					db_index[index_next++].pos = 0;
++				}
++			}
++
++			free(ents[--count]);
++		}
++		
++		if (count != -1) free(ents);
++		free(top);
++	} while (dirstack_top);
++
++	db->index = db_index;
++	db->index_size = index_next;
++
++	free(dirstack);
++}
++
++/* Return the mmap()ed tzfile if found, else NULL.  On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++	char fname[PATH_MAX];
++	struct stat st;
++	char *p;
++	int fd;
++	
++	if (strstr(timezone, "..") != NULL) {
++		return NULL;
++	}
++
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++	
++	fd = open(fname, O_RDONLY);
++	if (fd == -1) {
++		return NULL;
++	} else if (fstat(fd, &st) != 0 || st.st_size < 21) {
++		close(fd);
++		return NULL;
++	}
++
++	*length = st.st_size;
++	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++	close(fd);
++	
++	return p != MAP_FAILED ? p : NULL;
++}
++
++const timelib_tzdb *timelib_builtin_db(void)
++{
++	if (timezonedb_system == NULL) {
++		timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++		tmp->version = "0.system";
++		tmp->data = NULL;
++		create_zone_index(tmp);
++		timezonedb_system = tmp;
++	}
++			
++	return timezonedb_system;
++}
++
++const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
++{
++	*count = timezonedb_system->index_size;
++	return timezonedb_system->index;
++}
++
++int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
++{
++	char fname[PATH_MAX];
++
++	if (strstr(timezone, "..") != NULL) {
++		return 0;
++	}
++	
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++
++	return access(fname, R_OK) == 0 ? 1 : 0;
++}
++
++timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
++{
++	char *tzf, *orig;
++	timelib_tzinfo *tmp;
++	size_t len;
++
++	orig = map_tzfile(timezone, &len);
++	if (orig == NULL) {
++		return NULL;
++	}
++
++	tmp = timelib_tzinfo_ctor(timezone);
++
++	tzf = orig + 20;
++	read_header(&tzf, tmp);
++	read_transistions(&tzf, tmp);
++	read_types(&tzf, tmp);
++
++	munmap(orig, len);
++
++	return tmp;
++}
++#else /* !HAVE_SYSTEM_TZDATA */
++
+ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	int left = 0, right = tzdb->index_size - 1;
+@@ -279,6 +481,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+ 
+ 	return tmp;
+ }
++#endif
+ 
+ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
+ {


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/php.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- php.spec	16 Apr 2009 16:59:02 -0000	1.159
+++ php.spec	17 Apr 2009 07:34:07 -0000	1.160
@@ -7,7 +7,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -32,7 +32,7 @@
 # Functional changes
 Patch40: php-5.0.4-dlopen.patch
 Patch41: php-5.2.4-easter.patch
-Patch42: php-5.2.6-systzdata.patch
+Patch42: php-5.2.5-systzdata.patch
 
 # Fixes for tests
 Patch60: php-5.2.7-tests-dashn.patch
@@ -719,6 +719,9 @@
 %files pspell -f files.pspell
 
 %changelog
+* Fri Apr 17 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
+- stay at v3 of systzdata patch
+
 * Thu Apr 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 5.2.9-1
 - update to 5.2.9
 - merge with some rawhide improvments (fix patch fuzz, renumber


--- php-5.2.6-systzdata.patch DELETED ---



From caolanm at fedoraproject.org  Fri Apr 17 08:05:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 08:05:29 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch, NONE,
	1.1 openoffice.org-simple-crash_report.sh, 1.11,
	1.12 openoffice.org.spec, 1.1879, 1.1880
Message-ID: <20090417080529.989057012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16605/F-11

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch 
Log Message:
Resolves: rhbz#496197 openoffice.org-3.1.0.ooo101152.solenv.kn.patch

openoffice.org-3.1.0.ooo101152.solenv.kn.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101152.solenv.kn.patch ---
diff -ru solenv.orig/inc/postset.mk solenv/inc/postset.mk
--- openoffice.org.orig/solenv/inc/postset.mk	2009-04-17 08:55:49.000000000 +0100
+++ openoffice.org/solenv/inc/postset.mk	2009-04-17 08:56:21.000000000 +0100
@@ -35,6 +35,6 @@
 defaultlangiso=en-US
 
 # Complete list of all supported ISO codes
-completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu-IN he hi-IN hr hu it ja ka kk km kn-IN ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-simple-crash_report.sh	17 Sep 2008 22:04:13 -0000	1.11
+++ openoffice.org-simple-crash_report.sh	17 Apr 2009 08:04:58 -0000	1.12
@@ -6,6 +6,9 @@
 filename=`mktemp -t ooocrash.XXXXXXXXXX` || exit 1
 echo "(I)    x.org loaded video driver of..." > $filename
 xlog=`(xset -q || echo "  Log file:     /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-`
+if [ -z $xlog ]; then
+  xlog="/var/log/Xorg.0.log"
+fi
 grep "drivers" $xlog >> $filename
 grep "pixmap format" $xlog >> $filename
 echo "(III)  Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename
@@ -14,12 +17,15 @@
 echo "(VI)   kernel is:" `uname -s -r -v -m -p -i` >> $filename
 echo "(VII)  OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
 echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
+echo "(IX)   gtk theme is:" `gconftool-2 -g "/desktop/gnome/interface/gtk_theme"` >> $filename
+echo "(X)    icon theme is:" `gconftool-2 -g "/desktop/gnome/interface/icon_theme"` >> $filename
+echo "(XI)   metacity theme is:" `gconftool-2 -g "/apps/metacity/general/theme"` >> $filename
 if [ -e /etc/fedora-release ]; then
-echo "(IX)   fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(XII)  fedora release is:" `cat /etc/fedora-release` >> $filename
 elif [ -e /etc/redhat-release ]; then
-echo "(IX)   redhat release is:" `cat /etc/redhat-release` >> $filename
+echo "(XII)  redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
-echo "(X)    LANG is: $LANG" >> $filename
+echo "(XIII) LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -r1.1879 -r1.1880
--- openoffice.org.spec	16 Apr 2009 19:46:44 -0000	1.1879
+++ openoffice.org.spec	17 Apr 2009 08:04:58 -0000	1.1880
@@ -25,7 +25,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk mai
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN uk mai
 %else
 %define langpack_langs en-US
 %endif
@@ -136,6 +136,7 @@
 Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1630,6 +1631,7 @@
 %patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 %patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
+%patch64 -p1 -b .ooo101152.solenv.kn.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,9 +4125,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
+* Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+- Resolves: rhbz#496197 openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 
 * Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch



From caolanm at fedoraproject.org  Fri Apr 17 08:05:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 08:05:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch, NONE,
	1.1 openoffice.org-simple-crash_report.sh, 1.13,
	1.14 openoffice.org.spec, 1.1880, 1.1881
Message-ID: <20090417080529.E3B4A7012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16605/devel

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch 
Log Message:
Resolves: rhbz#496197 openoffice.org-3.1.0.ooo101152.solenv.kn.patch

openoffice.org-3.1.0.ooo101152.solenv.kn.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101152.solenv.kn.patch ---
diff -ru solenv.orig/inc/postset.mk solenv/inc/postset.mk
--- openoffice.org.orig/solenv/inc/postset.mk	2009-04-17 08:55:49.000000000 +0100
+++ openoffice.org/solenv/inc/postset.mk	2009-04-17 08:56:21.000000000 +0100
@@ -35,6 +35,6 @@
 defaultlangiso=en-US
 
 # Complete list of all supported ISO codes
-completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu-IN he hi-IN hr hu it ja ka kk km kn-IN ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-simple-crash_report.sh	16 Apr 2009 19:46:45 -0000	1.13
+++ openoffice.org-simple-crash_report.sh	17 Apr 2009 08:04:59 -0000	1.14
@@ -6,6 +6,9 @@
 filename=`mktemp -t ooocrash.XXXXXXXXXX` || exit 1
 echo "(I)    x.org loaded video driver of..." > $filename
 xlog=`(xset -q || echo "  Log file:     /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-`
+if [ -z $xlog ]; then
+  xlog="/var/log/Xorg.0.log"
+fi
 grep "drivers" $xlog >> $filename
 grep "pixmap format" $xlog >> $filename
 echo "(III)  Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -r1.1880 -r1.1881
--- openoffice.org.spec	16 Apr 2009 19:46:45 -0000	1.1880
+++ openoffice.org.spec	17 Apr 2009 08:04:59 -0000	1.1881
@@ -25,7 +25,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk mai
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN uk mai
 %else
 %define langpack_langs en-US
 %endif
@@ -136,6 +136,7 @@
 Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1629,7 +1630,8 @@
 %patch60 -p1 -b .ooo100991.pyuno-fix.patch
 %patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch63 -p0 -b .ooo101145.vcl.safe.dpi.patch
+%patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
+%patch64 -p1 -b .ooo101152.solenv.kn.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,9 +4125,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
+* Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+- Resolves: rhbz#496197 openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 
 * Wed Apr 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch



From sharkcz at fedoraproject.org  Fri Apr 17 08:23:32 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 17 Apr 2009 08:23:32 +0000 (UTC)
Subject: rpms/openhpi/devel openhpi-2.14.0-initscript.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 openhpi.spec, 1.72, 1.73 sources,
	1.15, 1.16 openhpi-2.11.1-initd.patch, 1.1, NONE
Message-ID: <20090417082332.77B607012B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21372

Modified Files:
	.cvsignore openhpi.spec sources 
Added Files:
	openhpi-2.14.0-initscript.patch 
Removed Files:
	openhpi-2.11.1-initd.patch 
Log Message:
* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
- update to 2.14.0


openhpi-2.14.0-initscript.patch:

--- NEW FILE openhpi-2.14.0-initscript.patch ---
>From 0a9b838f4c53e0b69e93ba946e64e579dc6c5e17 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 17 Apr 2009 09:53:02 +0200
Subject: [PATCH] update initscript to Fedora standards

---
 openhpid/openhpid.sh.in |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/openhpid/openhpid.sh.in b/openhpid/openhpid.sh.in
index 3e7c578..bc66a38 100644
--- a/openhpid/openhpid.sh.in
+++ b/openhpid/openhpid.sh.in
@@ -6,14 +6,15 @@
 # Required-Stop:     $network $remote_fs $syslog
 # Should-Start:      $named
 # Should-Stop:       $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Start:
+# Default-Stop:      0 1 2 3 4 5 6
 # Short-Description: Start OpenHPI daemon at boot time
 # Description:       Enable OpenHPI service which is provided by openhpid.
 ### END INIT INFO
 #
 # openhpid.sh    Start/Stop the openhpi daemon.
 #
+# chkconfig: - 90 10
 # description: openhpid is standard UNIX program which uses the OpenHPI \
 #              APIs and provides a standard internet server to access those \
 #              APIs for client programs.
@@ -125,6 +126,8 @@ start() {
 	esac
         
 	print_outcome
+        
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openhpid
 
 }
 
@@ -158,11 +161,7 @@ stop() {
 	
 	print_outcome
 	
-	if test "$RETVAL" -eq 0 && test -f /var/run/openhpid.pid
-	then
-		rm -f /var/lock/openhpid
-		rm -f /var/run/openhpid.pid
-	fi	
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/openhpid
 
 }	
 
@@ -210,11 +209,13 @@ restart() {
 	start
 }	
 
+condrestart() {
+	[ -f /var/lock/subsys/openhpid ] && restart || :
+}
+
 force_reload() {
-	echo -n $"Force-reload not supported."
-	echo
-	return 0
-}	
+	restart
+}
 
 # See how we were called.
 
@@ -228,6 +229,9 @@ case "$1" in
   restart)
   	restart
 	;;
+  condrestart|try-restart)
+  	condrestart
+	;;
   status)
   	dstatus
 	;;
@@ -235,6 +239,6 @@ case "$1" in
   	force_reload
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|status|force-reload}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|status|force-reload}"
 	exit 1
 esac
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Feb 2009 20:28:41 -0000	1.15
+++ .cvsignore	17 Apr 2009 08:23:01 -0000	1.16
@@ -1 +1 @@
-openhpi-2.13.3.tar.gz
+openhpi-2.14.0.tar.gz


Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- openhpi.spec	4 Mar 2009 20:47:45 -0000	1.72
+++ openhpi.spec	17 Apr 2009 08:23:01 -0000	1.73
@@ -1,13 +1,13 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
-Version: 2.13.3
-Release: 2%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: openhpi.conf
-Patch1: openhpi-2.11.1-initd.patch
+Patch0: openhpi-2.14.0-initscript.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
@@ -53,7 +53,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .initd
+%patch0 -p1 -b .initscript
 
 # fix permissions
 chmod a-x plugins/simulator/*.[ch]
@@ -71,11 +71,6 @@
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# temp hack for glib2
-%ifarch ppc ppc64
-find . -name Makefile | xargs sed -i 's/ -Werror//g'
-%endif
-
 make %{?_smp_mflags}
 
 
@@ -124,7 +119,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README README.daemon docs/hld/openhpi-manual openhpi.conf.example
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
@@ -139,11 +134,11 @@
 %{_mandir}/man8/*
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/*.so
 %{_includedir}/%{name}
@@ -151,6 +146,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
+- update to 2.14.0
+
 * Wed Feb 25 2009 Dan Horak <dan[at]danny.cz> - 2.13.3-2
 - fix ppc/ppc64 builds
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Feb 2009 20:28:41 -0000	1.15
+++ sources	17 Apr 2009 08:23:01 -0000	1.16
@@ -1 +1 @@
-1916b2430d13b03abb93d384c5c431a0  openhpi-2.13.3.tar.gz
+390422aed5f3132afeef1225f76b6081  openhpi-2.14.0.tar.gz


--- openhpi-2.11.1-initd.patch DELETED ---



From sharkcz at fedoraproject.org  Fri Apr 17 08:27:04 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 17 Apr 2009 08:27:04 +0000 (UTC)
Subject: rpms/openhpi/F-11 openhpi-2.14.0-initscript.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 openhpi.spec, 1.72, 1.73 sources,
	1.15, 1.16 openhpi-2.11.1-initd.patch, 1.1, NONE
Message-ID: <20090417082704.80A4D7012B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22267

Modified Files:
	.cvsignore openhpi.spec sources 
Added Files:
	openhpi-2.14.0-initscript.patch 
Removed Files:
	openhpi-2.11.1-initd.patch 
Log Message:
* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
- update to 2.14.0


openhpi-2.14.0-initscript.patch:

--- NEW FILE openhpi-2.14.0-initscript.patch ---
>From 0a9b838f4c53e0b69e93ba946e64e579dc6c5e17 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 17 Apr 2009 09:53:02 +0200
Subject: [PATCH] update initscript to Fedora standards

---
 openhpid/openhpid.sh.in |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/openhpid/openhpid.sh.in b/openhpid/openhpid.sh.in
index 3e7c578..bc66a38 100644
--- a/openhpid/openhpid.sh.in
+++ b/openhpid/openhpid.sh.in
@@ -6,14 +6,15 @@
 # Required-Stop:     $network $remote_fs $syslog
 # Should-Start:      $named
 # Should-Stop:       $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Start:
+# Default-Stop:      0 1 2 3 4 5 6
 # Short-Description: Start OpenHPI daemon at boot time
 # Description:       Enable OpenHPI service which is provided by openhpid.
 ### END INIT INFO
 #
 # openhpid.sh    Start/Stop the openhpi daemon.
 #
+# chkconfig: - 90 10
 # description: openhpid is standard UNIX program which uses the OpenHPI \
 #              APIs and provides a standard internet server to access those \
 #              APIs for client programs.
@@ -125,6 +126,8 @@ start() {
 	esac
         
 	print_outcome
+        
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openhpid
 
 }
 
@@ -158,11 +161,7 @@ stop() {
 	
 	print_outcome
 	
-	if test "$RETVAL" -eq 0 && test -f /var/run/openhpid.pid
-	then
-		rm -f /var/lock/openhpid
-		rm -f /var/run/openhpid.pid
-	fi	
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/openhpid
 
 }	
 
@@ -210,11 +209,13 @@ restart() {
 	start
 }	
 
+condrestart() {
+	[ -f /var/lock/subsys/openhpid ] && restart || :
+}
+
 force_reload() {
-	echo -n $"Force-reload not supported."
-	echo
-	return 0
-}	
+	restart
+}
 
 # See how we were called.
 
@@ -228,6 +229,9 @@ case "$1" in
   restart)
   	restart
 	;;
+  condrestart|try-restart)
+  	condrestart
+	;;
   status)
   	dstatus
 	;;
@@ -235,6 +239,6 @@ case "$1" in
   	force_reload
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|status|force-reload}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|status|force-reload}"
 	exit 1
 esac
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Feb 2009 20:28:41 -0000	1.15
+++ .cvsignore	17 Apr 2009 08:26:33 -0000	1.16
@@ -1 +1 @@
-openhpi-2.13.3.tar.gz
+openhpi-2.14.0.tar.gz


Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/openhpi.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- openhpi.spec	4 Mar 2009 20:47:45 -0000	1.72
+++ openhpi.spec	17 Apr 2009 08:26:34 -0000	1.73
@@ -1,13 +1,13 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
-Version: 2.13.3
-Release: 2%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: openhpi.conf
-Patch1: openhpi-2.11.1-initd.patch
+Patch0: openhpi-2.14.0-initscript.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
@@ -53,7 +53,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .initd
+%patch0 -p1 -b .initscript
 
 # fix permissions
 chmod a-x plugins/simulator/*.[ch]
@@ -71,11 +71,6 @@
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# temp hack for glib2
-%ifarch ppc ppc64
-find . -name Makefile | xargs sed -i 's/ -Werror//g'
-%endif
-
 make %{?_smp_mflags}
 
 
@@ -124,7 +119,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README README.daemon docs/hld/openhpi-manual openhpi.conf.example
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
@@ -139,11 +134,11 @@
 %{_mandir}/man8/*
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/*.so
 %{_includedir}/%{name}
@@ -151,6 +146,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
+- update to 2.14.0
+
 * Wed Feb 25 2009 Dan Horak <dan[at]danny.cz> - 2.13.3-2
 - fix ppc/ppc64 builds
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Feb 2009 20:28:41 -0000	1.15
+++ sources	17 Apr 2009 08:26:34 -0000	1.16
@@ -1 +1 @@
-1916b2430d13b03abb93d384c5c431a0  openhpi-2.13.3.tar.gz
+390422aed5f3132afeef1225f76b6081  openhpi-2.14.0.tar.gz


--- openhpi-2.11.1-initd.patch DELETED ---



From kwizart at fedoraproject.org  Fri Apr 17 08:51:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 17 Apr 2009 08:51:31 +0000 (UTC)
Subject: rpms/directfb/devel .cvsignore, 1.10, 1.11 directfb.spec, 1.24,
	1.25 import.log, 1.2, 1.3 sources, 1.10, 1.11
Message-ID: <20090417085131.ACCCF7012B@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27638/devel

Modified Files:
	.cvsignore directfb.spec import.log sources 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Feb 2009 13:07:47 -0000	1.10
+++ .cvsignore	17 Apr 2009 08:50:59 -0000	1.11
@@ -1 +1 @@
-DirectFB-1.2.7.tar.gz
+DirectFB-1.2.8.tar.gz


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- directfb.spec	24 Feb 2009 11:55:44 -0000	1.24
+++ directfb.spec	17 Apr 2009 08:50:59 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
-Version: 1.2.7
-Release: 4%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -159,9 +159,6 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Thu Feb 12 2009 kwizart < kwizart at gmail.com > - 1.2.7-3
 - Force autoreconf + re tag
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Feb 2009 13:07:47 -0000	1.2
+++ import.log	17 Apr 2009 08:50:59 -0000	1.3
@@ -1,2 +1,3 @@
 directfb-1_2_6-3_fc8_kwizart:HEAD:directfb-1.2.6-3.fc8.kwizart.src.rpm:1224760273
 directfb-1_2_7-1_fc10:HEAD:directfb-1.2.7-1.fc10.src.rpm:1234443951
+directfb-1_2_8-1_fc11:HEAD:directfb-1.2.8-1.fc11.src.rpm:1239958267


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Feb 2009 13:07:47 -0000	1.10
+++ sources	17 Apr 2009 08:50:59 -0000	1.11
@@ -1 +1 @@
-59ca16f600e96c8c104a485ff7c322c6  DirectFB-1.2.7.tar.gz
+ac13d21682aa368df4e177ae5b51ad2d  DirectFB-1.2.8.tar.gz



From sharkcz at fedoraproject.org  Fri Apr 17 09:11:37 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 17 Apr 2009 09:11:37 +0000 (UTC)
Subject: rpms/openhpi/devel openhpi.spec,1.73,1.74 openhpi.conf,1.1,NONE
Message-ID: <20090417091137.52CC87012B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32326

Modified Files:
	openhpi.spec 
Removed Files:
	openhpi.conf 
Log Message:
* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-2
- use upstream default config
- libtoolize/autoreconf is not needed



Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- openhpi.spec	17 Apr 2009 08:23:01 -0000	1.73
+++ openhpi.spec	17 Apr 2009 09:11:06 -0000	1.74
@@ -1,18 +1,16 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
 Version: 2.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1: openhpi.conf
 Patch0: openhpi-2.14.0-initscript.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
 BuildRequires: libxml2-devel, docbook-utils
-BuildRequires: libtool
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -59,9 +57,6 @@
 chmod a-x plugins/simulator/*.[ch]
 chmod a-x clients/*.[ch]
 
-libtoolize -f
-autoreconf -f
-
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -79,7 +74,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p -m1777 $RPM_BUILD_ROOT%{_var}/lib/%{name}
 make install DESTDIR=$RPM_BUILD_ROOT
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # RH-ify the initscript location
 mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openhpid $RPM_BUILD_ROOT%{_initrddir}
@@ -146,6 +140,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-2
+- use upstream default config
+- libtoolize/autoreconf is not needed
+
 * Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
 - update to 2.14.0
 


--- openhpi.conf DELETED ---



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:00 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091300.B812010F85A@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qjackctl (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:00 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091300.C69C210F87D@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qjackctl (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:00 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091300.CF4DC10F880@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qjackctl (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:07 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091307.427DD10F883@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qjackctl (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:31 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091331.37FB010F85A@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qjackctl (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:31 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091331.4D43110F87D@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qjackctl (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:33 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091333.E935610F886@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qjackctl (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:34 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091334.5AB8C10F87F@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qjackctl (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:40 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091340.430E410F881@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qjackctl (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:40 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091340.C4A4010F88B@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qjackctl (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:43 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091343.729E610F88E@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qjackctl (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:46 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091346.3EB9C10F88F@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qjackctl (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:50 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091351.0BE6F10F891@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qjackctl (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:50 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091351.2596A10F892@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qjackctl (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:52 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091352.8BBFD10F895@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qjackctl (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:13:54 +0000
Subject: [pkgdb] qjackctl had acl change status
Message-ID: <20090417091354.AD32810F898@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qjackctl (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjackctl



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:34 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091435.01B1410F87E@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qsynth (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:36 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091436.2F6DC10F881@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qsynth (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:39 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091439.5F9F510F884@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qsynth (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:39 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091439.A5D1B10F888@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qsynth (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:49 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091449.7F46210F88A@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qsynth (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:48 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091450.0E60E10F88B@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qsynth (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:52 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091452.540DA10F88E@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qsynth (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:54 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091454.69C5110F88F@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qsynth (Fedora 9) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:57 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091457.D990E10F896@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qsynth (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:14:59 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091459.4B6B310F89B@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qsynth (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:00 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091500.A6DF410F89E@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qsynth (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:02 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091502.2859310F8A1@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qsynth (Fedora 10) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:04 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091504.E130710F8A5@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qsynth (Fedora 11) to Obsolete for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:10 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091510.3CF1910F897@bastion2.fedora.phx.redhat.com>

nando has set the watchbugzilla acl on qsynth (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:11 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091511.E4E1610F8A7@bastion2.fedora.phx.redhat.com>

nando has set the watchcommits acl on qsynth (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:13 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091513.BE0C310F8AE@bastion2.fedora.phx.redhat.com>

nando has set the commit acl on qsynth (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From pkgdb at fedoraproject.org  Fri Apr 17 09:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 09:15:16 +0000
Subject: [pkgdb] qsynth had acl change status
Message-ID: <20090417091516.AF5D110F881@bastion2.fedora.phx.redhat.com>

nando has set the approveacls acl on qsynth (Fedora 11) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qsynth



From sharkcz at fedoraproject.org  Fri Apr 17 09:16:52 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 17 Apr 2009 09:16:52 +0000 (UTC)
Subject: rpms/openhpi/F-11 openhpi.spec,1.73,1.74 openhpi.conf,1.1,NONE
Message-ID: <20090417091652.BF93E7012B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv874

Modified Files:
	openhpi.spec 
Removed Files:
	openhpi.conf 
Log Message:
* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-2
- use upstream default config
- libtoolize/autoreconf is not needed



Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/openhpi.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- openhpi.spec	17 Apr 2009 08:26:34 -0000	1.73
+++ openhpi.spec	17 Apr 2009 09:16:22 -0000	1.74
@@ -1,18 +1,16 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
 Version: 2.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1: openhpi.conf
 Patch0: openhpi-2.14.0-initscript.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
 BuildRequires: libxml2-devel, docbook-utils
-BuildRequires: libtool
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -59,9 +57,6 @@
 chmod a-x plugins/simulator/*.[ch]
 chmod a-x clients/*.[ch]
 
-libtoolize -f
-autoreconf -f
-
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -79,7 +74,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p -m1777 $RPM_BUILD_ROOT%{_var}/lib/%{name}
 make install DESTDIR=$RPM_BUILD_ROOT
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # RH-ify the initscript location
 mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openhpid $RPM_BUILD_ROOT%{_initrddir}
@@ -146,6 +140,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-2
+- use upstream default config
+- libtoolize/autoreconf is not needed
+
 * Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
 - update to 2.14.0
 


--- openhpi.conf DELETED ---



From dnovotny at fedoraproject.org  Fri Apr 17 09:27:02 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Fri, 17 Apr 2009 09:27:02 +0000 (UTC)
Subject: rpms/file/devel file-5.00-mdmp.patch,NONE,1.1 file.spec,1.92,1.93
Message-ID: <20090417092702.1EFF57012B@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3140

Modified Files:
	file.spec 
Added Files:
	file-5.00-mdmp.patch 
Log Message:

fix #485835


file-5.00-mdmp.patch:

--- NEW FILE file-5.00-mdmp.patch ---
diff -up file-5.00/magic/Magdir/misctools.mdmp file-5.00/magic/Magdir/misctools
--- file-5.00/magic/Magdir/misctools.mdmp	2009-04-16 15:29:06.000000000 +0200
+++ file-5.00/magic/Magdir/misctools	2009-04-16 15:32:23.000000000 +0200
@@ -19,3 +19,6 @@
 # Extension: .lo
 # Submitted by: Abel Cheung <abelcheung at gmail.com>
 0	search/80	.lo\ -\ a\ libtool\ object\ file	libtool object file
+
+# From: Daniel Novotny <dnovotny at redhat.com>
+0	string	MDMP\x93\xA7	MDUMP crash report data


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- file.spec	23 Mar 2009 14:21:37 -0000	1.92
+++ file.spec	17 Apr 2009 09:26:31 -0000	1.93
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.00
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -16,6 +16,7 @@
 Patch3: file-5.00-thumbs-db.patch
 Patch4: file-5.00-fonts-ttc-pfa.patch
 Patch5: file-5.00-fdleak.patch
+Patch6: file-5.00-mdmp.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +73,8 @@
 %patch4 -p1
 #fixes #491596
 %patch5 -p1
+#fixes #485835
+%patch6 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -145,6 +148,9 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-6
+- fix #485835 (MDUMP files)
+
 * Mon Mar 23 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-5
 - added two font definitions (#491594, #491595)
   and a fix for file descriptor leak when MAGIC_COMPRESS used (#491596)



From jwrdegoede at fedoraproject.org  Fri Apr 17 09:33:36 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 17 Apr 2009 09:33:36 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid-1.0.0.rc15-isw-serial.patch, NONE,
	1.1 dmraid.spec, 1.93, 1.94
Message-ID: <20090417093336.428507012B@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4509

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc15-isw-serial.patch 
Log Message:
* Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
- Fix activation of isw raid sets when the disks have serialnumber longer
  then 16 characters (#490121)


dmraid-1.0.0.rc15-isw-serial.patch:

--- NEW FILE dmraid-1.0.0.rc15-isw-serial.patch ---
diff -up 1.0.0.rc15/lib/format/ataraid/isw.c~ 1.0.0.rc15/lib/format/ataraid/isw.c
--- 1.0.0.rc15/lib/format/ataraid/isw.c~	2009-04-10 14:12:14.000000000 +0200
+++ 1.0.0.rc15/lib/format/ataraid/isw.c	2009-04-10 14:38:56.000000000 +0200
@@ -81,15 +81,43 @@ is_raid10(struct isw_dev *dev)
 }
 
 /* Find a disk table slot by serial number. */
+static const char *dev_info_serial_to_isw(const char *di_serial)
+{
+	static char isw_serial[1024];
+
+	int i, isw_serial_len = 0;
+
+	for (i = 0; di_serial[i] && isw_serial_len < 1023; i++) {
+		if (((unsigned char)di_serial[i]) > 0x20) {
+			/* ':' is reserved for use in placeholder serial
+			 * numbers for missing disks */
+			if (di_serial[i] == ':')
+				isw_serial[isw_serial_len] = ';';
+			else
+				isw_serial[isw_serial_len] = di_serial[i];
+			isw_serial_len++;
+		}
+	}
+	isw_serial[isw_serial_len] = 0;
+
+	if (isw_serial_len > MAX_RAID_SERIAL_LEN)
+		memmove(isw_serial,
+			isw_serial + (isw_serial_len - MAX_RAID_SERIAL_LEN),
+			MAX_RAID_SERIAL_LEN);
+
+	return isw_serial;
+}
+
 static struct isw_disk *
 _get_disk(struct isw *isw, struct dev_info *di)
 {
 	if (di->serial) {
 		int i = isw->num_disks;
 		struct isw_disk *disk = isw->disk;
+		const char *isw_serial = dev_info_serial_to_isw(di->serial);
 
 		while (i--) {
-			if (!strncmp(di->serial, (const char *) disk[i].serial,
+			if (!strncmp(isw_serial, (const char *) disk[i].serial,
 				     MAX_RAID_SERIAL_LEN))
 				return disk + i;
 		}
@@ -866,7 +894,8 @@ rd_by_serial(struct raid_set *rs, const 
 
 	list_for_each_entry(rd, &rs->devs, devs) {
 		if (rd->di &&
-		    !strncmp(rd->di->serial, serial, MAX_RAID_SERIAL_LEN))
+		    !strncmp(dev_info_serial_to_isw(rd->di->serial), serial,
+						    MAX_RAID_SERIAL_LEN))
 			return rd;
 	}
 
@@ -1297,7 +1326,8 @@ isw_config_disks(struct lib_context *lc,
 	struct raid_dev *rd;
 
 	list_for_each_entry(rd, &rs->devs, devs) {
-		strncpy((char *) disk[i].serial, rd->di->serial,
+		strncpy((char *) disk[i].serial, 
+			dev_info_serial_to_isw(rd->di->serial),
 			MAX_RAID_SERIAL_LEN);
 		disk[i].totalBlocks = rd->di->sectors;
 
@@ -2421,7 +2451,8 @@ update_metadata(struct lib_context *lc, 
 	while (i--) {
 		/* Check if the disk is listed. */
 		list_for_each_entry(di, LC_DI(lc), list) {
-			if (!strncmp(di->serial, (const char *) disk[i].serial,
+			if (!strncmp(dev_info_serial_to_isw(di->serial),
+				     (const char *) disk[i].serial,
 				     MAX_RAID_SERIAL_LEN))
 				goto goon;
 		}
@@ -2517,7 +2548,8 @@ update_metadata(struct lib_context *lc, 
 	new_disk->status = CONFIG_ON_DISK |
 		DISK_SMART_EVENT_SUPPORTED |
 		CLAIMED_DISK | DETECTED_DISK | USABLE_DISK | CONFIGURED_DISK;
-	strncpy((char *) new_disk->serial, di->serial, MAX_RAID_SERIAL_LEN);
+	strncpy((char *) new_disk->serial, dev_info_serial_to_isw(di->serial),
+		MAX_RAID_SERIAL_LEN);
 
 	/* build new isw_disk array */
 	for (i = 0; i < isw->num_disks; i++) {


Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- dmraid.spec	24 Feb 2009 12:09:26 -0000	1.93
+++ dmraid.spec	17 Apr 2009 09:33:05 -0000	1.94
@@ -1,13 +1,14 @@
 Summary: Device-mapper RAID tool and library
 Name: dmraid
 Version: 1.0.0.rc15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 Patch0: dmraid-1.0.0.rc15-whitespace.patch
 Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
 Patch2: dmraid-1.0.0.rc15-rm_partitions.patch
+Patch3: dmraid-1.0.0.rc15-isw-serial.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
 Requires: kpartx
@@ -46,6 +47,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
@@ -91,6 +93,10 @@
 %attr(755,root,root) %{_libdir}/libdmraid.so.*
 
 %changelog
+* Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
+- Fix activation of isw raid sets when the disks have serialnumber longer
+  then 16 characters (#490121)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0.rc15-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pnemade at fedoraproject.org  Fri Apr 17 09:42:12 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri, 17 Apr 2009 09:42:12 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.190,1.191
Message-ID: <20090417094212.6E85C70137@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5908

Modified Files:
	comps-f11.xml.in 
Log Message:

- Add Kannada openoffice translations




Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- comps-f11.xml.in	17 Apr 2009 01:48:49 -0000	1.190
+++ comps-f11.xml.in	17 Apr 2009 09:41:41 -0000	1.191
@@ -3661,6 +3661,7 @@
     <langonly>mai</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mai_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">lohit-maithili-fonts</packagereq>
       <packagereq type="default">m17n-contrib-maithili</packagereq>



From ovasik at fedoraproject.org  Fri Apr 17 09:54:07 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 17 Apr 2009 09:54:07 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-silentmv.patch, NONE,
	1.1 coreutils.spec, 1.257, 1.258
Message-ID: <20090417095407.AE67C7012B@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8680

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-silentmv.patch 
Log Message:
make mv xattr support failures silent (as is done for cp -a) - #496142

coreutils-silentmv.patch:

--- NEW FILE coreutils-silentmv.patch ---
diff -urNp coreutils-7.2-orig/src/mv.c coreutils-7.2/src/mv.c
--- coreutils-7.2-orig/src/mv.c	2009-04-17 11:48:39.000000000 +0200
+++ coreutils-7.2/src/mv.c	2009-04-17 11:49:17.000000000 +0200
@@ -117,7 +117,7 @@ cp_option_init (struct cp_options *x)
   x->preserve_timestamps = true;
   x->preserve_security_context = selinux_enabled;
   x->set_security_context = false;
-  x->reduce_diagnostics = false;
+  x->reduce_diagnostics = true;
   x->require_preserve = false;  /* FIXME: maybe make this an option */
   x->require_preserve_context = false;
   x->preserve_xattr = true;


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- coreutils.spec	1 Apr 2009 11:14:30 -0000	1.257
+++ coreutils.spec	17 Apr 2009 09:54:04 -0000	1.258
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -49,6 +49,9 @@
 Patch950: coreutils-selinux.patch
 Patch951: coreutils-selinuxmanpages.patch
 
+Patch960: coreutils-silentmv.patch
+
+
 BuildRequires: libselinux-devel >= 1.25.6-1
 BuildRequires: libacl-devel
 BuildRequires: gettext bison
@@ -124,6 +127,8 @@
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .selinuxman
 
+%patch960 -p1 -b .silentmv
+
 chmod a+x tests/misc/sort-mb-tests
 
 sed -i 's/1.10a/1.10.1/' configure.ac
@@ -309,6 +314,10 @@
 /sbin/runuser
 
 %changelog
+* Fri Apr 17 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-2
+- make mv xattr support failures silent (as is done for
+  cp -a) - #496142
+
 * Tue Mar 31 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-1
 - New upstream bugfix release 7.2
 - removed applied patches



From jwrdegoede at fedoraproject.org  Fri Apr 17 10:07:00 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 17 Apr 2009 10:07:00 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid.spec,1.93,1.94
Message-ID: <20090417100700.9F3F67012B@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10954

Modified Files:
	dmraid.spec 
Log Message:
* Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
- Fix activation of isw raid sets when the disks have serialnumber longer
  then 16 characters (#490121)



Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- dmraid.spec	24 Feb 2009 12:09:26 -0000	1.93
+++ dmraid.spec	17 Apr 2009 10:06:30 -0000	1.94
@@ -1,13 +1,14 @@
 Summary: Device-mapper RAID tool and library
 Name: dmraid
 Version: 1.0.0.rc15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 Patch0: dmraid-1.0.0.rc15-whitespace.patch
 Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
 Patch2: dmraid-1.0.0.rc15-rm_partitions.patch
+Patch3: dmraid-1.0.0.rc15-isw-serial.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
 Requires: kpartx
@@ -46,6 +47,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
@@ -91,6 +93,10 @@
 %attr(755,root,root) %{_libdir}/libdmraid.so.*
 
 %changelog
+* Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
+- Fix activation of isw raid sets when the disks have serialnumber longer
+  then 16 characters (#490121)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0.rc15-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From airlied at fedoraproject.org  Fri Apr 17 10:38:11 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 10:38:11 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.78,
	1.79 kernel.spec, 1.1554, 1.1555
Message-ID: <20090417103811.B4B937012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17584

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-93
- drm modesetting: friday patch, missed a git add


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- drm-modesetting-radeon.patch	17 Apr 2009 06:11:57 -0000	1.78
+++ drm-modesetting-radeon.patch	17 Apr 2009 10:37:36 -0000	1.79
@@ -39816,3 +39816,15 @@
 +};
 +
  #endif
+diff -up linux-2.6.29.noarch/include/drm/drm_crtc_helper.h.dave linux-2.6.29.noarch/include/drm/drm_crtc_helper.h
+--- linux-2.6.29.noarch/include/drm/drm_crtc_helper.h.dave	2009-04-17 20:35:37.000000000 +1000
++++ linux-2.6.29.noarch/include/drm/drm_crtc_helper.h	2009-04-17 20:35:56.000000000 +1000
+@@ -96,7 +96,7 @@ extern int drm_crtc_helper_set_config(st
+ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+ 				     struct drm_display_mode *mode,
+ 				     int x, int y,
+-				     struct drm_framebuffer *old_fb);
++				     struct drm_framebuffer *old_fbm, int conn_changed);
+ extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
+ 
+ extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1554
retrieving revision 1.1555
diff -u -r1.1554 -r1.1555
--- kernel.spec	17 Apr 2009 06:11:57 -0000	1.1554
+++ kernel.spec	17 Apr 2009 10:37:37 -0000	1.1555
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-93
+- drm modesetting: friday patch, missed a git add
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-92
 - drm modesetting: force mode switch when connectors change
 



From kasal at fedoraproject.org  Fri Apr 17 10:41:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 17 Apr 2009 10:41:27 +0000 (UTC)
Subject: rpms/gdbm/devel gdbm.spec,1.25,1.26
Message-ID: <20090417104127.7B8627012B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/gdbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18542

Modified Files:
	gdbm.spec 
Log Message:
Clean up the spec, for merge review.


Index: gdbm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdbm/devel/gdbm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gdbm.spec	27 Feb 2009 18:21:25 -0000	1.25
+++ gdbm.spec	17 Apr 2009 10:40:56 -0000	1.26
@@ -1,15 +1,15 @@
-Summary: A GNU set of database routines which use extensible hashing.
+Summary: A GNU set of database routines which use extensible hashing
 Name: gdbm
 Version: 1.8.0
-Release: 31%{?dist}
-Source: ftp://ftp.gnu.org/gnu/gdbm-%{version}.tar.gz
+Release: 32%{?dist}
+Source: http://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
 Patch0: gdbm-1.8.0-jbj.patch
 Patch1: gdbm-1.8.0-fhs.patch
 Patch3: gdbm-1.8.0-64offset.patch
 License: GPLv2+
 URL: http://www.gnu.org/software/gdbm/
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtool
 
 %description
@@ -24,10 +24,11 @@
 install gdbm-devel.
 
 %package devel
-Summary: Development libraries and header files for the gdbm library.
+Summary: Development libraries and header files for the gdbm library
 Group: Development/Libraries
-Requires: gdbm = %{version}
-Prereq: /sbin/install-info
+Requires: %{name} = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
 
 %description devel
 Gdbm-devel contains the development libraries and header files for
@@ -39,8 +40,8 @@
 
 %prep
 %setup -q
-%patch0 -p 1 -b .jbj
-%patch1 -p 1 -b .fhs
+%patch0 -p1 -b .jbj
+%patch1 -p1 -b .fhs
 %patch3 -p1 -b .offset
 
 %build
@@ -71,20 +72,22 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database." || :
+/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir \
+      --entry="* gdbm: (gdbm).                   The GNU Database." || :
 
 %preun devel
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database." || :
+   /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir \
+      --entry="* gdbm: (gdbm).                   The GNU Database." || :
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING NEWS README
 %{_libdir}/libgdbm.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libgdbm.so
 %{_libdir}/libgdbm.a
 %{_includedir}/gdbm*
@@ -95,6 +98,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Apr 17 2009 Stepan Kasal <skasal at redhat.com> - 1.8.0-32
+- Clean up the spec, for merge review.
+
 * Fri Feb 27 2009 Stepan Kasal <skasal at redhat.com> - 1.8.0-31
 - drop *-cflags.patch, move all makefile fixes to *-fhs.patch
 - propagate libdir to Makefile; no need to set it on cmdline
@@ -154,7 +160,7 @@
 - run make with libdir overridden so that it has the value passed to configure
   instead of $(prefix)/lib
 
-* Wed Jul 24 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.8.0-18
+* Wed Jul 24 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.8.0-18
 - Remove cflags for large database support - not compatible 
   with databases without it
 
@@ -164,18 +170,18 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu Apr 25 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.8.0-15
+* Thu Apr 25 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.8.0-15
 - Use 64bit offset
 - Patch to make the above not break from downsj at downsj.com (#63980) 
 
-* Tue Feb 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.8.0-14
+* Tue Feb 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.8.0-14
 - Rebuild
 
-* Fri Jan 25 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.8.0-13
+* Fri Jan 25 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.8.0-13
 - Update location
 - auto* changes to make it build
 
-* Wed Oct 17 2001 Trond Eivind Glomsr?d <teg at redhat.com> 1.8.0-11
+* Wed Oct 17 2001 Trond Eivind Glomsr??d <teg at redhat.com> 1.8.0-11
 - Add URL (# 54607)
 
 * Mon Jun 25 2001 Nalin Dahyabhai <nalin at redhat.com>
@@ -185,7 +191,7 @@
 * Tue Jun 12 2001 Than Ngo <than at redhat.com>
 - fix to build against new libtool
 
-* Mon Mar 19 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Mar 19 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Make it respect RPM_OPT_FLAGS/CFLAGS - #32242. 
   Patch from dan at D00M.cmc.msu.ru
 



From mbroz at fedoraproject.org  Fri Apr 17 10:43:06 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Fri, 17 Apr 2009 10:43:06 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2-2_02_46-add-mmc-filter.patch, NONE,
	1.1 lvm2.spec, 1.156, 1.157
Message-ID: <20090417104307.050C97012B@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19099

Modified Files:
	lvm2.spec 
Added Files:
	lvm2-2_02_46-add-mmc-filter.patch 
Log Message:
Add MMC (mmcblk) device type to filters. (483686)



lvm2-2_02_46-add-mmc-filter.patch:

--- NEW FILE lvm2-2_02_46-add-mmc-filter.patch ---
--- LVM2.2.02.45.old/lib/filters/filter.c	2008-04-03 12:29:00.000000000 +0200
+++ LVM2.2.02.45/lib/filters/filter.c	2009-04-17 12:33:25.000000000 +0200
@@ -78,6 +78,7 @@ static const device_info_t device_info[]
 	{"vdisk", 8},		/* SUN's LDOM virtual block device */
 	{"ps3disk", 16},	/* PlayStation 3 internal disk */
 	{"virtblk", 8},		/* VirtIO disk */
+	{"mmc", 16},		/* MMC block device */
 	{NULL, 0}
 };
 
diff -rup LVM2.2.02.45.old/WHATS_NEW LVM2.2.02.45/WHATS_NEW
--- LVM2.2.02.45.old/WHATS_NEW	2009-03-03 17:35:32.000000000 +0100
+++ LVM2.2.02.45/WHATS_NEW	2009-04-17 12:33:54.000000000 +0200
@@ -1,3 +1,7 @@
+Version 2.02.46 -
+================================
+  Add MMC (mmcblk) device type to filters.
+
 Version 2.02.45 - 3rd March 2009
 ================================
   Avoid scanning empty metadata areas for VG names.


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- lvm2.spec	30 Mar 2009 22:07:37 -0000	1.156
+++ lvm2.spec	17 Apr 2009 10:42:36 -0000	1.157
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.45
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -16,6 +16,7 @@
 
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
+Patch1: lvm2-2_02_46-add-mmc-filter.patch 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
+%patch1 -p1 -b .mmc
 
 %build
 %define _exec_prefix /
@@ -266,6 +268,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Milan Broz <mbroz at redhat.com> - 2.02.45-4
+- Add MMC (mmcblk) device type to filters. (483686)
+
 * Mon Mar 30 2009 Jussi Lehtola <jussi.lehtola at iki.fi> 2.02.45-3
 - Add FTP server location to Source0.
 



From mbroz at fedoraproject.org  Fri Apr 17 10:44:17 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Fri, 17 Apr 2009 10:44:17 +0000 (UTC)
Subject: rpms/lvm2/F-11 lvm2-2_02_46-add-mmc-filter.patch, NONE,
	1.1 lvm2.spec, 1.156, 1.157
Message-ID: <20090417104417.A7F9A7012B@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/lvm2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19423

Modified Files:
	lvm2.spec 
Added Files:
	lvm2-2_02_46-add-mmc-filter.patch 
Log Message:
Add MMC (mmcblk) device type to filters. (483686)



lvm2-2_02_46-add-mmc-filter.patch:

--- NEW FILE lvm2-2_02_46-add-mmc-filter.patch ---
--- LVM2.2.02.45.old/lib/filters/filter.c	2008-04-03 12:29:00.000000000 +0200
+++ LVM2.2.02.45/lib/filters/filter.c	2009-04-17 12:33:25.000000000 +0200
@@ -78,6 +78,7 @@ static const device_info_t device_info[]
 	{"vdisk", 8},		/* SUN's LDOM virtual block device */
 	{"ps3disk", 16},	/* PlayStation 3 internal disk */
 	{"virtblk", 8},		/* VirtIO disk */
+	{"mmc", 16},		/* MMC block device */
 	{NULL, 0}
 };
 
diff -rup LVM2.2.02.45.old/WHATS_NEW LVM2.2.02.45/WHATS_NEW
--- LVM2.2.02.45.old/WHATS_NEW	2009-03-03 17:35:32.000000000 +0100
+++ LVM2.2.02.45/WHATS_NEW	2009-04-17 12:33:54.000000000 +0200
@@ -1,3 +1,7 @@
+Version 2.02.46 -
+================================
+  Add MMC (mmcblk) device type to filters.
+
 Version 2.02.45 - 3rd March 2009
 ================================
   Avoid scanning empty metadata areas for VG names.


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/F-11/lvm2.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- lvm2.spec	30 Mar 2009 22:07:37 -0000	1.156
+++ lvm2.spec	17 Apr 2009 10:43:47 -0000	1.157
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.45
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -16,6 +16,7 @@
 
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
+Patch1: lvm2-2_02_46-add-mmc-filter.patch 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
+%patch1 -p1 -b .mmc
 
 %build
 %define _exec_prefix /
@@ -266,6 +268,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Milan Broz <mbroz at redhat.com> - 2.02.45-4
+- Add MMC (mmcblk) device type to filters. (483686)
+
 * Mon Mar 30 2009 Jussi Lehtola <jussi.lehtola at iki.fi> 2.02.45-3
 - Add FTP server location to Source0.
 



From pmatilai at fedoraproject.org  Fri Apr 17 10:55:20 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri, 17 Apr 2009 10:55:20 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.0-extra-provides.patch, 1.2, 1.3 rpm.spec,
	1.345, 1.346
Message-ID: <20090417105520.464D57012B@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22658

Modified Files:
	rpm-4.7.0-extra-provides.patch rpm.spec 
Log Message:
- file classification tweaks for text files (#494817)
  - disable libmagic text token checks, it's way too error-prone
  - consistently classify all text as such and include description


rpm-4.7.0-extra-provides.patch:

Index: rpm-4.7.0-extra-provides.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.7.0-extra-provides.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpm-4.7.0-extra-provides.patch	23 Mar 2009 15:31:44 -0000	1.2
+++ rpm-4.7.0-extra-provides.patch	17 Apr 2009 10:55:19 -0000	1.3
@@ -1,7 +1,8 @@
-diff -up rpm-4.7.0-beta1/build/rpmfc.c.extra-prov rpm-4.7.0-beta1/build/rpmfc.c
---- rpm-4.7.0-beta1/build/rpmfc.c.extra-prov	2009-02-26 17:31:12.000000000 +0200
-+++ rpm-4.7.0-beta1/build/rpmfc.c	2009-02-26 17:31:55.000000000 +0200
-@@ -485,6 +485,7 @@ static const struct rpmfcTokens_s const 
+diff --git a/build/rpmfc.c b/build/rpmfc.c
+index 1bb1c3b..4e57869 100644
+--- a/build/rpmfc.c
++++ b/build/rpmfc.c
+@@ -484,6 +484,7 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = {
    { "RPM v4",			RPMFC_ARCHIVE|RPMFC_INCLUDE },
  
    { " image",			RPMFC_IMAGE|RPMFC_INCLUDE },
@@ -9,7 +10,28 @@
    { " font",			RPMFC_FONT|RPMFC_INCLUDE },
    { " Font",			RPMFC_FONT|RPMFC_INCLUDE },
  
-@@ -1189,6 +1190,31 @@ exit:
+@@ -496,19 +497,14 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = {
+   { "SGML",			RPMFC_WHITE|RPMFC_INCLUDE },
+   { "XML",			RPMFC_WHITE|RPMFC_INCLUDE },
+ 
+-  { " program text",		RPMFC_WHITE|RPMFC_INCLUDE },
+   { " source",			RPMFC_WHITE|RPMFC_INCLUDE },
+   { "GLS_BINARY_LSB_FIRST",	RPMFC_WHITE|RPMFC_INCLUDE },
+   { " DB ",			RPMFC_WHITE|RPMFC_INCLUDE },
+ 
+-  { "ASCII English text",	RPMFC_WHITE|RPMFC_INCLUDE },
+-  { "ASCII text",		RPMFC_WHITE|RPMFC_INCLUDE },
+-  { "ISO-8859 text",		RPMFC_WHITE|RPMFC_INCLUDE },
+-
+   { "symbolic link to",		RPMFC_SYMLINK|RPMFC_INCLUDE },
+   { "socket",			RPMFC_DEVICE },
+   { "special",			RPMFC_DEVICE },
+-  { " text",			RPMFC_TEXT },
++  { " text",			RPMFC_TEXT|RPMFC_INCLUDE },
+ 
+   { "ASCII",			RPMFC_WHITE },
+   { "ISO-8859",			RPMFC_WHITE },
+@@ -1184,6 +1180,31 @@ exit:
  #endif
  }
  
@@ -41,7 +63,7 @@
  typedef const struct rpmfcApplyTbl_s {
      int (*func) (rpmfc fc);
      int colormask;
-@@ -1201,6 +1227,7 @@ static const struct rpmfcApplyTbl_s cons
+@@ -1196,6 +1217,7 @@ static const struct rpmfcApplyTbl_s const rpmfcApplyTable[] = {
      { rpmfcSCRIPT,	(RPMFC_SCRIPT|RPMFC_BOURNE|
  			 RPMFC_PERL|RPMFC_PYTHON|RPMFC_MONO|
  			 RPMFC_PKGCONFIG|RPMFC_LIBTOOL) },
@@ -49,19 +71,20 @@
      { rpmfcSYMLINK,	RPMFC_SYMLINK },
      { NULL, 0 }
  };
-@@ -1320,7 +1347,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t arg
+@@ -1315,7 +1337,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
      size_t slen;
      int fcolor;
      int xx;
 -    int msflags = MAGIC_CHECK;	/* XXX MAGIC_COMPRESS flag? */
-+    int msflags = MAGIC_CHECK | MAGIC_COMPRESS;
++    int msflags = MAGIC_CHECK | MAGIC_COMPRESS | MAGIC_NO_CHECK_TOKENS;
      magic_t ms = NULL;
  
      if (fc == NULL || argv == NULL)
-diff -up rpm-4.7.0-beta1/macros.in.extra-prov rpm-4.7.0-beta1/macros.in
---- rpm-4.7.0-beta1/macros.in.extra-prov	2009-02-26 17:31:12.000000000 +0200
-+++ rpm-4.7.0-beta1/macros.in	2009-02-26 17:32:38.000000000 +0200
-@@ -494,6 +494,9 @@ print (t)\
+diff --git a/macros.in b/macros.in
+index c187f62..945e89b 100644
+--- a/macros.in
++++ b/macros.in
+@@ -489,6 +489,9 @@ print (t)\
  %__pkgconfig_provides   %{_rpmconfigdir}/pkgconfigdeps.sh --provides
  %__pkgconfig_requires   %{_rpmconfigdir}/pkgconfigdeps.sh --requires
  


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- rpm.spec	16 Apr 2009 09:10:33 -0000	1.345
+++ rpm.spec	17 Apr 2009 10:55:19 -0000	1.346
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -393,6 +393,11 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Apr 17 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-2
+- file classification tweaks for text files (#494817)
+  - disable libmagic text token checks, it's way too error-prone
+  - consistently classify all text as such and include description
+
 * Thu Apr 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-1
 - update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)
 - fixes #494049, #495429



From phuang at fedoraproject.org  Fri Apr 17 10:57:10 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 17 Apr 2009 10:57:10 +0000 (UTC)
Subject: rpms/ibus/F-11 .cvsignore, 1.29, 1.30 ibus.spec, 1.67, 1.68 sources,
	1.33, 1.34
Message-ID: <20090417105710.639557012B@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23032

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.1.0.20090417


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Apr 2009 08:54:32 -0000	1.29
+++ .cvsignore	17 Apr 2009 10:56:39 -0000	1.30
@@ -1 +1 @@
-ibus-1.1.0.20090413.tar.gz
+ibus-1.1.0.20090417.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ibus.spec	17 Apr 2009 07:11:25 -0000	1.67
+++ ibus.spec	17 Apr 2009 10:56:39 -0000	1.68
@@ -7,15 +7,15 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090413
-Release:    5%{?dist}
+Version:    1.1.0.20090417
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-Patch0:     ibus-HEAD.patch
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -105,7 +105,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 # ./autogen.sh --help
 
 %build
@@ -217,7 +217,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-5
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
+- Update to ibus-1.1.0.20090417.
+- Fix bug 496199 -  cannot remove Ctrl+Space hotkey with ibus-setup
+
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
 - Update ibus-HEAD.patch.
 - Next Engine hotkey will do nothing if the IM is not active.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Apr 2009 08:54:32 -0000	1.33
+++ sources	17 Apr 2009 10:56:39 -0000	1.34
@@ -1 +1 @@
-80d8bf601bd1e00da26bfdeb59ca8bce  ibus-1.1.0.20090413.tar.gz
+70b037b1476cb6bafa29656523e0c8c4  ibus-1.1.0.20090417.tar.gz



From phuang at fedoraproject.org  Fri Apr 17 10:57:36 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 17 Apr 2009 10:57:36 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.29, 1.30 ibus-HEAD.patch, 1.15,
	1.16 ibus.spec, 1.66, 1.67 sources, 1.33, 1.34
Message-ID: <20090417105736.D88427012B@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23181

Modified Files:
	.cvsignore ibus-HEAD.patch ibus.spec sources 
Log Message:
Update to ibus-1.1.0.20090417


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Apr 2009 08:54:32 -0000	1.29
+++ .cvsignore	17 Apr 2009 10:57:05 -0000	1.30
@@ -1 +1 @@
-ibus-1.1.0.20090413.tar.gz
+ibus-1.1.0.20090417.tar.gz

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ibus-HEAD.patch	17 Apr 2009 06:09:24 -0000	1.15
+++ ibus-HEAD.patch	17 Apr 2009 10:57:05 -0000	1.16
@@ -1,857 +0,0 @@
-diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in
-index fcf2f21..cd2ad60 100644
---- a/bus/ibus.desktop.in
-+++ b/bus/ibus.desktop.in
-@@ -7,7 +7,7 @@ Exec=ibus-daemon --xim
- Icon=ibus
- Terminal=false
- Type=Application
--X-GNOME-Autostart-Phase=Panel
-+X-GNOME-Autostart-Phase=Applications
- X-GNOME-AutoRestart=false
- X-GNOME-Autostart-Notify=true
- X-KDE-autostart-after=panel
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 456e049..7003bd7 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -2091,10 +2091,10 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
-         return TRUE;
-     }
-     else if (event == next_factory) {
--        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
--        if (priv->engine && !priv->enabled) {
--            bus_input_context_enable (context);
-+        if (priv->engine == NULL || priv->enabled == FALSE) {
-+            return FALSE;
-         }
-+        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
-         return TRUE;
-     }
-     else if (event == prev_factory) {
-diff --git a/bus/server.c b/bus/server.c
-index 7245bd3..1c796f2 100644
---- a/bus/server.c
-+++ b/bus/server.c
-@@ -86,21 +86,23 @@ bus_server_listen (BusServer *server)
- 
-     // const gchar *address = "unix:abstract=/tmp/ibus-c"
-     const gchar *address;
--    gchar *path;
-+    const gchar *path;
-     gboolean retval;
- 
--    path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
--    mkdir (path, 0775);
-+    path = ibus_get_socket_folder ();
-+    mkdir (path, 0700);
-+    chmod (path, 0700);
-+
-     address = ibus_get_address ();
- 
-     retval = ibus_server_listen (IBUS_SERVER (server), address);
-+    chmod (ibus_get_socket_path (), 0600);
- 
-     if (!retval) {
-         g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
-         exit (-1);
-     }
- 
--    g_free(path);
-     return retval;
- }
- 
-diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index 5da4dec..168e45a 100644
---- a/client/gtk2/ibusimcontext.c
-+++ b/client/gtk2/ibusimcontext.c
-@@ -190,14 +190,20 @@ _key_snooper_cb (GtkWidget   *widget,
-     IBusIMContext *ibusimcontext;
-     ibusimcontext = (IBusIMContext *) _focus_im_context;
- 
--    if (!_use_key_snooper)
-+    if (G_UNLIKELY (!_use_key_snooper))
-         return retval;
- 
-     if (ibusimcontext == NULL)
--        return retval;
-+        return FALSE;
- 
--    if (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE)
--        return retval;
-+    if (G_UNLIKELY (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE))
-+        return FALSE;
-+
-+    if (G_UNLIKELY (event->state & IBUS_HANDLED_MASK))
-+        return TRUE;
-+
-+    if (G_UNLIKELY (event->state & IBUS_IGNORED_MASK))
-+        return FALSE;
- 
-     switch (event->type) {
-     case GDK_KEY_RELEASE:
-@@ -212,6 +218,14 @@ _key_snooper_cb (GtkWidget   *widget,
-         break;
-     default:
-         retval = FALSE;
-+        break;
-+    }
-+
-+    if (retval) {
-+        event->state |= IBUS_HANDLED_MASK;
-+    }
-+    else {
-+        event->state |= IBUS_IGNORED_MASK;
-     }
- 
-     return retval;
-@@ -383,11 +397,18 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
- 
-     IBusIMContext *ibusimcontext = (IBusIMContext *) context;
- 
--    if (ibusimcontext->ibuscontext && ibusimcontext->has_focus) {
-+    if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
-         /* If context does not have focus, ibus will process key event in sync mode.
-          * It is a workaround for increase search in treeview.
-          */
--        gboolean retval;
-+        gboolean retval = FALSE;
-+
-+        if (event->state & IBUS_HANDLED_MASK)
-+            return TRUE;
-+
-+        if (event->state & IBUS_IGNORED_MASK)
-+            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
-+
-         switch (event->type) {
-         case GDK_KEY_RELEASE:
-             retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
-@@ -404,9 +425,13 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
-         }
- 
-         if (retval) {
-+            event->state |= IBUS_HANDLED_MASK;
-             return TRUE;
-         }
--        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
-+        else {
-+            event->state |= IBUS_IGNORED_MASK;
-+            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
-+        }
-     }
-     else {
-         return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
-diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index be4b980..a976eec 100644
---- a/data/ibus.schemas.in
-+++ b/data/ibus.schemas.in
-@@ -18,7 +18,7 @@
-       <owner>ibus</owner>
-       <type>list</type>
-       <list_type>string</list_type>
--      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul]</default>
-+      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul,Alt+Release+Alt_R]</default>
-       <locale name="C">
-         <short>Trigger Hotkey</short>
- 	    <long>Trigger hotkey for enable or disable input context</long>
-diff --git a/ibus/common.py b/ibus/common.py
-index 527d3a5..571ebaa 100644
---- a/ibus/common.py
-+++ b/ibus/common.py
-@@ -67,7 +67,12 @@ if not __username:
- if not __username:
-     __username = os.getenv ("USERNAME")
- 
--IBUS_ADDR = "unix:path=/tmp/ibus-%s/ibus-%s-%s" % (__username, __hostname, __display_number)
-+__session_id = os.getenv ("IBUS_SESSION_ID")
-+
-+IBUS_ADDR = "unix:path=/tmp/ibus-%s%s/ibus-%s-%s" % (__username,
-+                                                     "-" + __session_id if __session_id else "",
-+                                                     __hostname,
-+                                                     __display_number)
- # IBUS_ADDR  = "tcp:host=localhost,port=7799"
- 
- IBUS_IFACE_IBUS     = "org.freedesktop.IBus"
-diff --git a/ibus/modifier.py b/ibus/modifier.py
-index 7f6afad..56d8be9 100644
---- a/ibus/modifier.py
-+++ b/ibus/modifier.py
-@@ -33,11 +33,15 @@ BUTTON2_MASK = 1 << 9
- BUTTON3_MASK = 1 << 10
- BUTTON4_MASK = 1 << 11
- BUTTON5_MASK = 1 << 12
--  
-+
-+HANDLED_MASK = 1 << 24
-+IGNORED_MASK = 1 << 25
-+FORWARD_MASK = 1 << 25
-+
- SUPER_MASK = 1 << 26
- HYPER_MASK = 1 << 27
- META_MASK = 1 << 28
--  
-+
- RELEASE_MASK = 1 << 30
- 
- MODIFIER_MASK = 0x5c001fff
-diff --git a/po/as.po b/po/as.po
-index 8e33ca2..9b81669 100644
---- a/po/as.po
-+++ b/po/as.po
-@@ -6,8 +6,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: ibus.master.ibus.as\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-04-02 02:13+0000\n"
--"PO-Revision-Date: 2009-04-08 15:55+0530\n"
-+"POT-Creation-Date: 2009-04-06 11:45+0800\n"
-+"PO-Revision-Date: 2009-04-09 19:03+0530\n"
- "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
- "Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
- "MIME-Version: 1.0\n"
-@@ -16,163 +16,19 @@ msgstr ""
- "X-Generator: Lokalize 0.3\n"
- "Plural-Forms: nplurals=2; plural=n != 1;\n"
- 
--#: ../src/keyname-table.h:3940
--msgid "keyboard label|BackSpace"
--msgstr "keyboard label|BackSpace"
-+#: ../bus/ibus.desktop.in.h:1
-+msgid "IBus"
-+msgstr "IBus"
- 
--#: ../src/keyname-table.h:3941
--msgid "keyboard label|Tab"
--msgstr "keyboard label|Tab"
--
--#: ../src/keyname-table.h:3942
--msgid "keyboard label|Return"
--msgstr "keyboard label|Return"
--
--#: ../src/keyname-table.h:3943
--msgid "keyboard label|Pause"
--msgstr "keyboard label|Pause"
--
--#: ../src/keyname-table.h:3944
--msgid "keyboard label|Scroll_Lock"
--msgstr "keyboard label|Scroll_Lock"
--
--#: ../src/keyname-table.h:3945
--msgid "keyboard label|Sys_Req"
--msgstr "keyboard label|Sys_Req"
--
--#: ../src/keyname-table.h:3946
--msgid "keyboard label|Escape"
--msgstr "keyboard label|Escape"
--
--#: ../src/keyname-table.h:3947
--msgid "keyboard label|Multi_key"
--msgstr "keyboard label|Multi_key"
--
--#: ../src/keyname-table.h:3948
--msgid "keyboard label|Home"
--msgstr "keyboard label|Home"
--
--#: ../src/keyname-table.h:3949
--msgid "keyboard label|Left"
--msgstr "keyboard label|Left"
--
--#: ../src/keyname-table.h:3950
--msgid "keyboard label|Up"
--msgstr "keyboard label|Up"
--
--#: ../src/keyname-table.h:3951
--msgid "keyboard label|Right"
--msgstr "keyboard label|Right"
--
--#: ../src/keyname-table.h:3952
--msgid "keyboard label|Down"
--msgstr "keyboard label|Down"
--
--#: ../src/keyname-table.h:3953
--msgid "keyboard label|Page_Up"
--msgstr "keyboard label|Page_Up"
--
--#: ../src/keyname-table.h:3954
--msgid "keyboard label|Page_Down"
--msgstr "keyboard label|Page_Down"
--
--#: ../src/keyname-table.h:3955
--msgid "keyboard label|End"
--msgstr "keyboard label|End"
--
--#: ../src/keyname-table.h:3956
--msgid "keyboard label|Begin"
--msgstr "keyboard label|Begin"
--
--#: ../src/keyname-table.h:3957
--msgid "keyboard label|Print"
--msgstr "keyboard label|Print"
--
--#: ../src/keyname-table.h:3958
--msgid "keyboard label|Insert"
--msgstr "keyboard label|Insert"
--
--#: ../src/keyname-table.h:3959
--msgid "keyboard label|Num_Lock"
--msgstr "keyboard label|Num_Lock"
--
--#: ../src/keyname-table.h:3960
--msgid "keyboard label|KP_Space"
--msgstr "keyboard label|KP_Space"
--
--#: ../src/keyname-table.h:3961
--msgid "keyboard label|KP_Tab"
--msgstr "keyboard label|KP_Tab"
--
--#: ../src/keyname-table.h:3962
--msgid "keyboard label|KP_Enter"
--msgstr "keyboard label|KP_Enter"
--
--#: ../src/keyname-table.h:3963
--msgid "keyboard label|KP_Home"
--msgstr "keyboard label|KP_Home"
--
--#: ../src/keyname-table.h:3964
--msgid "keyboard label|KP_Left"
--msgstr "keyboard label|KP_Left"
--
--#: ../src/keyname-table.h:3965
--msgid "keyboard label|KP_Up"
--msgstr "keyboard label|KP_Up"
--
--#: ../src/keyname-table.h:3966
--msgid "keyboard label|KP_Right"
--msgstr "keyboard label|KP_Right"
--
--#: ../src/keyname-table.h:3967
--msgid "keyboard label|KP_Down"
--msgstr "keyboard label|KP_Down"
--
--#: ../src/keyname-table.h:3968
--msgid "keyboard label|KP_Page_Up"
--msgstr "keyboard label|KP_Page_Up"
--
--#: ../src/keyname-table.h:3969
--msgid "keyboard label|KP_Prior"
--msgstr "keyboard label|KP_Prior"
--
--#: ../src/keyname-table.h:3970
--msgid "keyboard label|KP_Page_Down"
--msgstr "keyboard label|KP_Page_Down"
--
--#: ../src/keyname-table.h:3971
--msgid "keyboard label|KP_Next"
--msgstr "keyboard label|KP_Next"
--
--#: ../src/keyname-table.h:3972
--msgid "keyboard label|KP_End"
--msgstr "keyboard label|KP_End"
--
--#: ../src/keyname-table.h:3973
--msgid "keyboard label|KP_Begin"
--msgstr "keyboard label|KP_Begin"
--
--#: ../src/keyname-table.h:3974
--msgid "keyboard label|KP_Insert"
--msgstr "keyboard label|KP_Insert"
--
--#: ../src/keyname-table.h:3975
--msgid "keyboard label|KP_Delete"
--msgstr "keyboard label|KP_Delete"
--
--#: ../src/keyname-table.h:3976
--msgid "keyboard label|Delete"
--msgstr "keyboard label|Delete"
-+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:97
-+msgid "IBus input method framework"
-+msgstr "IBus input method framework"
- 
- #: ../ibus/lang.py:40 ../ui/gtk/panel.py:307 ../ui/gtk/panel.py:308
- #: ../ui/gtk/panel.py:309 ../ui/gtk/panel.py:310
- msgid "Other"
- msgstr "????????????"
- 
--#: ../ui/gtk/panel.py:97
--msgid "IBus input method framework"
--msgstr "IBus input method framework"
--
- #: ../ui/gtk/panel.py:282
- msgid "Restart"
- msgstr "???????????????????????????"
-@@ -191,25 +47,24 @@ msgstr "???????????????????????? ???????????? (aphukan at fedoraproject.org)"
- 
- #. create input methods menu
- #: ../ui/gtk/languagebar.py:84
--msgid "Switch engine"
--msgstr "???????????? ???????????? ?????????"
-+msgid "Switch input method"
-+msgstr "??????????????? ?????????????????? ???????????? ?????????"
- 
- #: ../setup/main.py:103
- msgid "trigger"
- msgstr "?????????????????????"
- 
- #: ../setup/main.py:113
--msgid "next engine"
--msgstr "???????????? ????????????"
-+msgid "next input method"
-+msgstr "???????????? ??????????????? ??????????????????"
- 
- #: ../setup/main.py:123
--msgid "prev engine"
--msgstr "????????? ????????????"
-+msgid "previous input method"
-+msgstr "????????? ??????????????? ??????????????????"
- 
- #: ../setup/main.py:204
- msgid "IBus daemon is not started. Do you want to start it now?"
--msgstr ""
--"IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
-+msgstr "IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
- 
- #: ../setup/main.py:219
- msgid ""
-@@ -219,8 +74,8 @@ msgid ""
- "  export XMODIFIERS=@im=ibus\n"
- "  export QT_IM_MODULE=ibus"
- msgstr ""
--"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????"
--"$HOME/.bashrc ??? ????????? ????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
-+"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????$HOME/.bashrc ??? ????????? "
-+"????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
- "  export GTK_IM_MODULE=ibus\n"
- "  export XMODIFIERS=@im=ibus\n"
- "  export QT_IM_MODULE=ibus"
-@@ -318,7 +173,7 @@ msgstr ""
- "????????????????????????\n"
- "???????????????"
- 
--#: ../setup/setup.glade.h:19
-+#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
- msgid "IBus Preferences"
- msgstr "IBus ???????????????"
- 
-@@ -341,21 +196,21 @@ msgid "Next input method:"
- msgstr "???????????? ??????????????? ??????????????????:"
- 
- #: ../setup/setup.glade.h:25
-+msgid "Previous input method:"
-+msgstr "????????? ??????????????? ??????????????????"
-+
-+#: ../setup/setup.glade.h:26
- msgid "Show language panel:"
- msgstr "??????????????? ??????????????? ????????????????????????:"
- 
--#: ../setup/setup.glade.h:26
-+#: ../setup/setup.glade.h:27
- msgid "Start ibus on login"
- msgstr "????????????????????? ibus ??????????????? ?????????"
- 
--#: ../setup/setup.glade.h:27
-+#: ../setup/setup.glade.h:28
- msgid "Use custom font"
- msgstr "???????????????????????????????????? ???????????? ????????????????????? ????????? ???'???"
- 
--#: ../setup/setup.glade.h:28
--msgid "previous input method:"
--msgstr "????????? ??????????????? ??????????????????:"
--
- #: ../data/ibus.schemas.in.h:1
- msgid "Auto Hide"
- msgstr "?????????????????????????????????????????? ??????????????????"
-@@ -405,8 +260,7 @@ msgid ""
- "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
- "show"
- msgstr ""
--"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? "
--"????????????????????????"
-+"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? ????????????????????????"
- 
- #: ../data/ibus.schemas.in.h:13
- msgid "Trigger Hotkey"
-@@ -428,4 +282,122 @@ msgstr "??????????????? ?????????????????? ???????????? ????????????????????????
- msgid "[Control+space]"
- msgstr "[Control+space]"
- 
-+#~ msgid "keyboard label|BackSpace"
-+#~ msgstr "keyboard label|BackSpace"
-+
-+#~ msgid "keyboard label|Tab"
-+#~ msgstr "keyboard label|Tab"
-+
-+#~ msgid "keyboard label|Return"
-+#~ msgstr "keyboard label|Return"
-+
-+#~ msgid "keyboard label|Pause"
-+#~ msgstr "keyboard label|Pause"
-+
-+#~ msgid "keyboard label|Scroll_Lock"
-+#~ msgstr "keyboard label|Scroll_Lock"
-+
-+#~ msgid "keyboard label|Sys_Req"
-+#~ msgstr "keyboard label|Sys_Req"
-+
-+#~ msgid "keyboard label|Escape"
-+#~ msgstr "keyboard label|Escape"
-+
-+#~ msgid "keyboard label|Multi_key"
-+#~ msgstr "keyboard label|Multi_key"
-+
-+#~ msgid "keyboard label|Home"
-+#~ msgstr "keyboard label|Home"
-+
-+#~ msgid "keyboard label|Left"
-+#~ msgstr "keyboard label|Left"
-+
-+#~ msgid "keyboard label|Up"
-+#~ msgstr "keyboard label|Up"
-+
-+#~ msgid "keyboard label|Right"
-+#~ msgstr "keyboard label|Right"
-+
-+#~ msgid "keyboard label|Down"
-+#~ msgstr "keyboard label|Down"
-+
-+#~ msgid "keyboard label|Page_Up"
-+#~ msgstr "keyboard label|Page_Up"
-+
-+#~ msgid "keyboard label|Page_Down"
-+#~ msgstr "keyboard label|Page_Down"
-+
-+#~ msgid "keyboard label|End"
-+#~ msgstr "keyboard label|End"
-+
-+#~ msgid "keyboard label|Begin"
-+#~ msgstr "keyboard label|Begin"
-+
-+#~ msgid "keyboard label|Print"
-+#~ msgstr "keyboard label|Print"
-+
-+#~ msgid "keyboard label|Insert"
-+#~ msgstr "keyboard label|Insert"
-+
-+#~ msgid "keyboard label|Num_Lock"
-+#~ msgstr "keyboard label|Num_Lock"
-+
-+#~ msgid "keyboard label|KP_Space"
-+#~ msgstr "keyboard label|KP_Space"
-+
-+#~ msgid "keyboard label|KP_Tab"
-+#~ msgstr "keyboard label|KP_Tab"
-+
-+#~ msgid "keyboard label|KP_Enter"
-+#~ msgstr "keyboard label|KP_Enter"
-+
-+#~ msgid "keyboard label|KP_Home"
-+#~ msgstr "keyboard label|KP_Home"
-+
-+#~ msgid "keyboard label|KP_Left"
-+#~ msgstr "keyboard label|KP_Left"
-+
-+#~ msgid "keyboard label|KP_Up"
-+#~ msgstr "keyboard label|KP_Up"
-+
-+#~ msgid "keyboard label|KP_Right"
-+#~ msgstr "keyboard label|KP_Right"
-+
-+#~ msgid "keyboard label|KP_Down"
-+#~ msgstr "keyboard label|KP_Down"
-+
-+#~ msgid "keyboard label|KP_Page_Up"
-+#~ msgstr "keyboard label|KP_Page_Up"
-+
-+#~ msgid "keyboard label|KP_Prior"
-+#~ msgstr "keyboard label|KP_Prior"
-+
-+#~ msgid "keyboard label|KP_Page_Down"
-+#~ msgstr "keyboard label|KP_Page_Down"
-+
-+#~ msgid "keyboard label|KP_Next"
-+#~ msgstr "keyboard label|KP_Next"
-+
-+#~ msgid "keyboard label|KP_End"
-+#~ msgstr "keyboard label|KP_End"
-+
-+#~ msgid "keyboard label|KP_Begin"
-+#~ msgstr "keyboard label|KP_Begin"
-+
-+#~ msgid "keyboard label|KP_Insert"
-+#~ msgstr "keyboard label|KP_Insert"
-+
-+#~ msgid "keyboard label|KP_Delete"
-+#~ msgstr "keyboard label|KP_Delete"
-+
-+#~ msgid "keyboard label|Delete"
-+#~ msgstr "keyboard label|Delete"
-+
-+#~ msgid "Switch engine"
-+#~ msgstr "???????????? ???????????? ?????????"
-+
-+#~ msgid "next engine"
-+#~ msgstr "???????????? ????????????"
- 
-+#~ msgid "prev engine"
-+#~ msgstr "????????? ????????????"
-diff --git a/po/te.po b/po/te.po
-index 3b8c0da..9c65afd 100644
---- a/po/te.po
-+++ b/po/te.po
-@@ -1,21 +1,21 @@
--# translation of ibus.master.ibus.po to Telugu
-+# translation of ibus.master.te.po to Telugu
- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
- # This file is distributed under the same license as the PACKAGE package.
- #
- # Krishna Babu K <kkrothap at redhat.com>, 2009.
- msgid ""
- msgstr ""
--"Project-Id-Version: ibus.master.ibus\n"
-+"Project-Id-Version: ibus.master.te\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-04-07 15:38+0800\n"
--"PO-Revision-Date: 2009-04-07 00:39+0530\n"
-+"POT-Creation-Date: 2009-04-06 11:45+0800\n"
-+"PO-Revision-Date: 2009-04-14 15:04+0530\n"
- "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
- "Language-Team: Telugu <en at li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: KBabel 1.11.4\n"
--"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
- "\n"
- 
- #: ../bus/ibus.desktop.in.h:1
-@@ -49,23 +49,20 @@ msgstr "??????????????????????????? ?????? <kkrothap at redhat.com> 2009."
- 
- #. create input methods menu
- #: ../ui/gtk/languagebar.py:84
--#, fuzzy
- msgid "Switch input method"
--msgstr "????????????????????? ????????????????????? ??????????????????????????????"
-+msgstr "????????????????????? ?????????????????? ????????????????????????"
- 
- #: ../setup/main.py:103
- msgid "trigger"
- msgstr "????????? (???????????????????????????)"
- 
- #: ../setup/main.py:113
--#, fuzzy
- msgid "next input method"
--msgstr "????????????????????? ????????????????????? ??????????????????:"
-+msgstr "????????????????????? ????????????????????? ??????????????????"
- 
- #: ../setup/main.py:123
--#, fuzzy
- msgid "previous input method"
--msgstr "????????????????????? ????????????????????? ??????????????????:"
-+msgstr "????????????????????? ????????????????????? ??????????????????"
- 
- #: ../setup/main.py:204
- msgid "IBus daemon is not started. Do you want to start it now?"
-@@ -201,7 +198,6 @@ msgid "Next input method:"
- msgstr "????????????????????? ????????????????????? ??????????????????:"
- 
- #: ../setup/setup.glade.h:25
--#, fuzzy
- msgid "Previous input method:"
- msgstr "????????????????????? ????????????????????? ??????????????????:"
- 
-@@ -285,14 +281,7 @@ msgstr "??????????????????????????? ??????????????? ???????????????????????????
- msgid "Use custom font name for language panel"
- msgstr "???????????? ????????????????????? ??????????????? ??????????????????????????? ??????????????? ??????????????? ????????????????????????????????????"
- 
--#~ msgid "Switch engine"
--#~ msgstr "???????????????????????? ????????????????????????"
--
--#~ msgid "next engine"
--#~ msgstr "????????????????????? ??????????????????"
--
--#~ msgid "prev engine"
--#~ msgstr "????????????????????? ??????????????????"
-+#: ../data/ibus.schemas.in.h:17
-+msgid "[Control+space]"
-+msgstr "[Control+space]"
- 
--#~ msgid "[Control+space]"
--#~ msgstr "[Control+space]"
-diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
-index a9e2233..f954343 100644
---- a/setup/keyboardshortcut.py
-+++ b/setup/keyboardshortcut.py
-@@ -27,6 +27,7 @@ __all__ = (
- import gobject
- import gtk
- from gtk import gdk
-+from gtk import keysyms
- 
- from gettext import dgettext
- _  = lambda a : dgettext("ibus", a)
-@@ -217,8 +218,29 @@ class KeyboardShortcutSelection(gtk.VBox):
-         if id != gtk.RESPONSE_OK or not out:
-             return
-         keyevent = out[0]
-+        state = keyevent.state & (gdk.CONTROL_MASK | \
-+                                  gdk.SHIFT_MASK   | \
-+                                  gdk.MOD1_MASK    | \
-+                                  gdk.META_MASK    | \
-+                                  gdk.SUPER_MASK   | \
-+                                  gdk.HYPER_MASK)
-+        if state == 0:
-+            state = state | gdk.RELEASE_MASK
-+        elif keyevent.keyval in (keysyms.Control_L, keysyms.Control_R) and state == gdk.CONTROL_MASK:
-+            state = state | gdk.RELEASE_MASK
-+        elif keyevent.keyval in (keysyms.Shift_L, keysyms.Shift_R) and state == gdk.SHIFT_MASK:
-+            state = state | gdk.RELEASE_MASK
-+        elif keyevent.keyval in (keysyms.Alt_L, keysyms.Alt_R) and state == gdk.MOD1_MASK:
-+            state = state | gdk.RELEASE_MASK
-+        elif keyevent.keyval in (keysyms.Meta_L, keysyms.Meta_R) and state == gdk.META_MASK:
-+            state = state | gdk.RELEASE_MASK
-+        elif keyevent.keyval in (keysyms.Super_L, keysyms.Super_R) and state == gdk.SUPER_MASK:
-+            state = state | gdk.RELEASE_MASK
-+        elif keyevent.keyval in (keysyms.Hyper_L, keysyms.Hyper_R) and state == gdk.HYPER_MASK:
-+            state = state | gdk.RELEASE_MASK
-+
-         for name, button, mask in self.__modifier_buttons:
--            if keyevent.state & mask:
-+            if state & mask:
-                 button.set_active(True)
-             else:
-                 button.set_active(False)
-diff --git a/src/ibusbus.c b/src/ibusbus.c
-index 373e5d4..756f8e5 100644
---- a/src/ibusbus.c
-+++ b/src/ibusbus.c
-@@ -220,14 +220,17 @@ ibus_bus_init (IBusBus *bus)
- 
-     ibus_bus_connect (bus);
- 
--    path = g_strdup_printf ("/tmp/ibus-%s/", ibus_get_user_name ());
-+    path = ibus_get_socket_folder ();
-+    mkdir (path, 0700);
-+    chmod (path, 0700);
-+
-+
-     file = g_file_new_for_path (path);
-     priv->monitor = g_file_monitor_directory (file, 0, NULL, NULL);
- 
-     g_signal_connect (priv->monitor, "changed", (GCallback) _changed_cb, bus);
- 
-     g_object_unref (file);
--    g_free (path);
- }
- 
- static void
-diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
-index 95754cf..52547ff 100644
---- a/src/ibusinputcontext.c
-+++ b/src/ibusinputcontext.c
-@@ -553,7 +553,10 @@ ibus_input_context_process_key_event (IBusInputContext *context,
-     IBusError *error = NULL;
-     gboolean retval;
- 
--    if (state & IBUS_FORWARD_MASK)
-+    if (state & IBUS_HANDLED_MASK)
-+        return TRUE;
-+
-+    if (state & IBUS_IGNORED_MASK)
-         return FALSE;
- 
-     retval = ibus_proxy_call_with_reply ((IBusProxy *) context,
-diff --git a/src/ibusshare.c b/src/ibusshare.c
-index c7aa1fe..186be85 100644
---- a/src/ibusshare.c
-+++ b/src/ibusshare.c
-@@ -69,6 +69,31 @@ ibus_get_user_name (void)
- }
- 
- const gchar *
-+ibus_get_session_id (void)
-+{
-+    return g_getenv("IBUS_SESSION_ID");
-+}
-+
-+const gchar *
-+ibus_get_socket_folder (void)
-+{
-+    static gchar *folder = NULL;
-+
-+    if (folder == NULL) {
-+        const gchar *session = ibus_get_session_id ();
-+        if (session && session[0] != '\0') {
-+            folder = g_strdup_printf ("/tmp/ibus-%s-%s",
-+                ibus_get_user_name (), session);
-+        }
-+        else {
-+            folder = g_strdup_printf ("/tmp/ibus-%s",
-+                ibus_get_user_name ());
-+        }
-+    }
-+    return folder;
-+}
-+
-+const gchar *
- ibus_get_socket_path (void)
- {
-     static gchar *path = NULL;
-@@ -78,7 +103,7 @@ ibus_get_socket_path (void)
-         gchar *display;
-         gchar *displaynumber = "0";
-         gchar *screennumber = "0";
--        const gchar *username = NULL;
-+        const gchar *folder= NULL;
-         gchar *p;
- 
-         if (_display == NULL) {
-@@ -111,14 +136,14 @@ ibus_get_socket_path (void)
-             }
-         }
- 
--        username = ibus_get_user_name ();
-+        folder = ibus_get_socket_folder ();
- 
-         if (hostname[0] == '\0')
-             hostname = "unix";
- 
-         path = g_strdup_printf (
--            "/tmp/ibus-%s/ibus-%s-%s",
--            username, hostname, displaynumber);
-+            "%s/ibus-%s-%s",
-+            folder, hostname, displaynumber);
-         g_free (display);
-     }
-     return path;
-diff --git a/src/ibusshare.h b/src/ibusshare.h
-index f3b34c4..4c0c645 100644
---- a/src/ibusshare.h
-+++ b/src/ibusshare.h
-@@ -49,6 +49,7 @@ void             ibus_set_display       (const gchar    *display);
- const gchar     *ibus_get_address       (void);
- const gchar     *ibus_get_user_name     (void);
- const gchar     *ibus_get_socket_path   (void);
-+const gchar     *ibus_get_socket_folder (void);
- 
- const gchar     *ibus_keyval_name       (guint           keyval);
- guint            ibus_keyval_from_name  (const gchar    *keyval_name);
-diff --git a/src/ibustypes.h b/src/ibustypes.h
-index d2f15ba..2f7c0bf 100644
---- a/src/ibustypes.h
-+++ b/src/ibustypes.h
-@@ -69,11 +69,13 @@ typedef enum
-     IBUS_BUTTON5_MASK  = 1 << 12,
- 
-     /* The next few modifiers are used by XKB, so we skip to the end.
--     * Bits 15 - 24 are currently unused. Bit 29 is used internally.
-+     * Bits 15 - 23 are currently unused. Bit 29 is used internally.
-      */
- 
--    /* forward mask */
-+    /* ibus mask */
-+    IBUS_HANDLED_MASK  = 1 << 24,
-     IBUS_FORWARD_MASK  = 1 << 25,
-+    IBUS_IGNORED_MASK  = IBUS_FORWARD_MASK,
- 
-     IBUS_SUPER_MASK    = 1 << 26,
-     IBUS_HYPER_MASK    = 1 << 27,


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ibus.spec	17 Apr 2009 06:09:24 -0000	1.66
+++ ibus.spec	17 Apr 2009 10:57:05 -0000	1.67
@@ -7,15 +7,15 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090413
-Release:    4%{?dist}
+Version:    1.1.0.20090417
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-Patch0:     ibus-HEAD.patch
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -105,7 +105,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 # ./autogen.sh --help
 
 %build
@@ -217,6 +217,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
+- Update to ibus-1.1.0.20090417.
+- Fix bug 496199 -  cannot remove Ctrl+Space hotkey with ibus-setup
+
 * Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
 - Update ibus-HEAD.patch.
 - Next Engine hotkey will do nothing if the IM is not active.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Apr 2009 08:54:32 -0000	1.33
+++ sources	17 Apr 2009 10:57:05 -0000	1.34
@@ -1 +1 @@
-80d8bf601bd1e00da26bfdeb59ca8bce  ibus-1.1.0.20090413.tar.gz
+70b037b1476cb6bafa29656523e0c8c4  ibus-1.1.0.20090417.tar.gz



From airlied at fedoraproject.org  Fri Apr 17 11:07:47 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 11:07:47 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-next.patch, 1.13, 1.14 kernel.spec, 1.1555,
	1.1556
Message-ID: <20090417110748.380F37012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25606

Modified Files:
	drm-next.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-94
- drm-next.patch: backport fix to drm-next


drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- drm-next.patch	6 Apr 2009 05:30:06 -0000	1.13
+++ drm-next.patch	17 Apr 2009 11:07:14 -0000	1.14
@@ -7347,7 +7347,7 @@
 -	intel_tv_mode_set(&intel_output->enc, NULL, NULL);
 +	if (changed && crtc)
 +		drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
-+				crtc->y, crtc->fb);
++				crtc->y, crtc->fb, 0);
  out:
  	return ret;
  }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1555
retrieving revision 1.1556
diff -u -r1.1555 -r1.1556
--- kernel.spec	17 Apr 2009 10:37:37 -0000	1.1555
+++ kernel.spec	17 Apr 2009 11:07:15 -0000	1.1556
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-94
+- drm-next.patch: backport fix to drm-next
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-93
 - drm modesetting: friday patch, missed a git add
 



From iarnell at fedoraproject.org  Fri Apr 17 11:15:37 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 17 Apr 2009 11:15:37 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-HTML-FormFu/devel .cvsignore, 1.2,
	1.3 perl-Catalyst-Controller-HTML-FormFu.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090417111537.3C6677012B@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27326

Modified Files:
	.cvsignore perl-Catalyst-Controller-HTML-FormFu.spec sources 
Log Message:
* Fri Apr 17 2009 Iain Arnell <iarnell at gmail.com> 0.04001-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2008 16:25:01 -0000	1.2
+++ .cvsignore	17 Apr 2009 11:15:04 -0000	1.3
@@ -1 +1 @@
-Catalyst-Controller-HTML-FormFu-0.03007.tar.gz
+Catalyst-Controller-HTML-FormFu-0.04001.tar.gz


Index: perl-Catalyst-Controller-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/perl-Catalyst-Controller-HTML-FormFu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Catalyst-Controller-HTML-FormFu.spec	26 Feb 2009 12:05:56 -0000	1.2
+++ perl-Catalyst-Controller-HTML-FormFu.spec	17 Apr 2009 11:15:04 -0000	1.3
@@ -1,22 +1,24 @@
 Name:           perl-Catalyst-Controller-HTML-FormFu
-Version:        0.03007
-Release:        3%{?dist}
+Version:        0.04001
+Release:        1%{?dist}
 Summary:        HTML::FormFu controller for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Controller-HTML-FormFu/
-Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Catalyst-Controller-HTML-FormFu-0.03007.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Catalyst/Catalyst-Controller-HTML-FormFu-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst::Action::RenderView)
 BuildRequires:  perl(Catalyst::Component::InstancePerContext)
 BuildRequires:  perl(Catalyst::Plugin::ConfigLoader)
+BuildRequires:  perl(Catalyst::Plugin::Session::State::Cookie)
+BuildRequires:  perl(Catalyst::Plugin::Session::Store::File)
 BuildRequires:  perl(Catalyst::Runtime) >= 5.70
 BuildRequires:  perl(Catalyst::View::TT)
 BuildRequires:  perl(Config::Any)
 BuildRequires:  perl(Config::General)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(HTML::FormFu) >= 0.03007
+BuildRequires:  perl(HTML::FormFu) >= 0.04001
 BuildRequires:  perl(Moose)
 BuildRequires:  perl(Regexp::Assemble)
 BuildRequires:  perl(Task::Weaken)
@@ -25,7 +27,7 @@
 BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
 Requires:       perl(Catalyst::Component::InstancePerContext)
 Requires:       perl(Catalyst::Runtime) >= 5.70
-Requires:       perl(HTML::FormFu) >= 0.03007
+Requires:       perl(HTML::FormFu) >= 0.04001
 Requires:       perl(Task::Weaken)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 17 2009 Iain Arnell <iarnell at gmail.com> 0.04001-1
+- update to latest upstream version
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03007-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2008 16:25:01 -0000	1.2
+++ sources	17 Apr 2009 11:15:04 -0000	1.3
@@ -1 +1 @@
-9e510b1106b8dac95f1f09ed1edb48ea  Catalyst-Controller-HTML-FormFu-0.03007.tar.gz
+9c2e52a2b31114112785c8f62f79a9cc  Catalyst-Controller-HTML-FormFu-0.04001.tar.gz



From caolanm at fedoraproject.org  Fri Apr 17 11:17:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 11:17:04 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1880,1.1881
Message-ID: <20090417111704.7BA517012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27516/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
would have to be kn-IN in the table too


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -r1.1880 -r1.1881
--- openoffice.org.spec	17 Apr 2009 08:04:58 -0000	1.1880
+++ openoffice.org.spec	17 Apr 2009 11:16:32 -0000	1.1881
@@ -2053,7 +2053,7 @@
 ts	help	western 	as-IN	nohelp	western	\
 mr-IN	nohelp	western		ml-IN	nohelp	western	\
 or-IN	nohelp	western		te-IN	nohelp	western	\
-ur-IN	nohelp	western		kn	nohelp	western	\
+ur-IN	nohelp	western		kn-IN	nohelp	western	\
 xh	help	western		ve	help	western \
 st	help	western		ss	help	western \
 nr	help	western		ns	help	western	\



From caolanm at fedoraproject.org  Fri Apr 17 11:17:05 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 11:17:05 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1881,1.1882
Message-ID: <20090417111705.B51AC7012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27516/devel

Modified Files:
	openoffice.org.spec 
Log Message:
would have to be kn-IN in the table too


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1881
retrieving revision 1.1882
diff -u -r1.1881 -r1.1882
--- openoffice.org.spec	17 Apr 2009 08:04:59 -0000	1.1881
+++ openoffice.org.spec	17 Apr 2009 11:16:34 -0000	1.1882
@@ -2053,7 +2053,7 @@
 ts	help	western 	as-IN	nohelp	western	\
 mr-IN	nohelp	western		ml-IN	nohelp	western	\
 or-IN	nohelp	western		te-IN	nohelp	western	\
-ur-IN	nohelp	western		kn	nohelp	western	\
+ur-IN	nohelp	western		kn-IN	nohelp	western	\
 xh	help	western		ve	help	western \
 st	help	western		ss	help	western \
 nr	help	western		ns	help	western	\



From airlied at fedoraproject.org  Fri Apr 17 11:35:25 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 11:35:25 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch,1.39,1.40
Message-ID: <20090417113525.79B657012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32643

Modified Files:
	drm-nouveau.patch 
Log Message:
drm: fix nouveau up for api change


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- drm-nouveau.patch	16 Apr 2009 01:50:53 -0000	1.39
+++ drm-nouveau.patch	17 Apr 2009 11:34:52 -0000	1.40
@@ -23834,7 +23834,7 @@
 +			rval = drm_crtc_helper_set_mode(&crtc->base,
 +							&crtc->base.mode,
 +							crtc->base.x,
-+							crtc->base.y, NULL);
++							crtc->base.y, NULL, 0);
 +			if (rval)
 +				return rval;
 +		} else {



From airlied at fedoraproject.org  Fri Apr 17 12:25:35 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 17 Apr 2009 12:25:35 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.40, 1.41 kernel.spec, 1.1556, 
	1.1557
Message-ID: <20090417122535.7470D7012B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31583

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-95
- nouveau: fix powerpc build


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- drm-nouveau.patch	17 Apr 2009 11:34:52 -0000	1.40
+++ drm-nouveau.patch	17 Apr 2009 12:25:32 -0000	1.41
@@ -7791,8 +7791,8 @@
 +
 +/* channel control reg access */
 +#if defined(__powerpc__)
-+#define nvchan_wr32(reg,val) out_be32((void __iomem *)chan->user->handle, (reg), (val))
-+#define nvchan_rd32(reg) in_be32((void __iomem *)chan->user->handle, (reg))
++#define nvchan_wr32(reg,val) out_be32((void __iomem *)chan->user->handle + (reg), (val))
++#define nvchan_rd32(reg) in_be32((void __iomem *)chan->user->handle + (reg))
 +#else
 +#define nvchan_wr32(reg,val) DRM_WRITE32(chan->user, (reg), (val))
 +#define nvchan_rd32(reg) DRM_READ32(chan->user, (reg))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1556
retrieving revision 1.1557
diff -u -r1.1556 -r1.1557
--- kernel.spec	17 Apr 2009 11:07:15 -0000	1.1556
+++ kernel.spec	17 Apr 2009 12:25:32 -0000	1.1557
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-95
+- nouveau: fix powerpc build
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-94
 - drm-next.patch: backport fix to drm-next
 



From sailer at fedoraproject.org  Fri Apr 17 13:03:30 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 13:03:30 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel mingw32-glibmm24-nogunixio.patch, NONE, 
	1.1 mingw32-glibmm24.spec, 1.3, 1.4
Message-ID: <20090417130330.440067012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6474

Modified Files:
	mingw32-glibmm24.spec 
Added Files:
	mingw32-glibmm24-nogunixio.patch 
Log Message:
build fix


mingw32-glibmm24-nogunixio.patch:

--- NEW FILE mingw32-glibmm24-nogunixio.patch ---
--- tools/extra_defs_gen/Makefile.am.x	2009-04-17 14:32:10.000000000 +0200
+++ tools/extra_defs_gen/Makefile.am	2009-04-17 14:32:26.000000000 +0200
@@ -24,7 +24,7 @@
 INCLUDES = $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
 LIBS = $(GLIBMM_LIBS) $(GIOMM_LIBS)
 
-noinst_PROGRAMS = generate_extra_defs generate_defs_gio
+noinst_PROGRAMS = generate_extra_defs
 
 generate_extra_defs_SOURCES = generate_defs_glib.cc
 generate_extra_defs_LDADD = libglibmm_generate_extra_defs-2.4.la
--- tools/extra_defs_gen/Makefile.in.x	2009-04-17 14:32:14.000000000 +0200
+++ tools/extra_defs_gen/Makefile.in	2009-04-17 14:32:40.000000000 +0200
@@ -36,8 +36,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = generate_extra_defs$(EXEEXT) \
-	generate_defs_gio$(EXEEXT)
+noinst_PROGRAMS = generate_extra_defs$(EXEEXT)
 subdir = tools/extra_defs_gen
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(sublib_include_HEADERS)


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-glibmm24.spec	16 Apr 2009 09:26:44 -0000	1.3
+++ mingw32-glibmm24.spec	17 Apr 2009 13:02:59 -0000	1.4
@@ -6,13 +6,14 @@
 
 Name:           mingw32-glibmm24
 Version:        2.20.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
+Patch0:         mingw32-glibmm24-nogunixio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +38,7 @@
 
 %prep
 %setup -q -n glibmm-%{version}
-
+%patch0 -p0 -b .nogunixio
 
 %build
 %{_mingw32_configure} --disable-static
@@ -79,6 +80,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-3
+- fix extradefs build failure
+
 * Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-2
 - update to 2.20.0
 - replace %%define with %%global



From limb at fedoraproject.org  Fri Apr 17 13:15:20 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 13:15:20 +0000 (UTC)
Subject: rpms/pygame/devel pygame.spec,1.27,1.28
Message-ID: <20090417131520.CF5837012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/pygame/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8450

Modified Files:
	pygame.spec 
Log Message:
Add dep for numpy-f2py to fix brokn games, BZ 496218.




Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pygame.spec	26 Feb 2009 19:59:20 -0000	1.27
+++ pygame.spec	17 Apr 2009 13:14:50 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel
-Requires:       numpy
+Requires:       numpy-f2py
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.1-5
+- Add dep for numpy-f2py to fix brokn games, BZ 496218.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sailer at fedoraproject.org  Fri Apr 17 13:18:05 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 13:18:05 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/F-11 mingw32-glibmm24-nogunixio.patch, NONE, 
	1.1 mingw32-glibmm24.spec, 1.2, 1.3
Message-ID: <20090417131805.0E6047012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-glibmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8920

Modified Files:
	mingw32-glibmm24.spec 
Added Files:
	mingw32-glibmm24-nogunixio.patch 
Log Message:
fix build failure


mingw32-glibmm24-nogunixio.patch:

--- NEW FILE mingw32-glibmm24-nogunixio.patch ---
--- tools/extra_defs_gen/Makefile.am.x	2009-04-17 14:32:10.000000000 +0200
+++ tools/extra_defs_gen/Makefile.am	2009-04-17 14:32:26.000000000 +0200
@@ -24,7 +24,7 @@
 INCLUDES = $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
 LIBS = $(GLIBMM_LIBS) $(GIOMM_LIBS)
 
-noinst_PROGRAMS = generate_extra_defs generate_defs_gio
+noinst_PROGRAMS = generate_extra_defs
 
 generate_extra_defs_SOURCES = generate_defs_glib.cc
 generate_extra_defs_LDADD = libglibmm_generate_extra_defs-2.4.la
--- tools/extra_defs_gen/Makefile.in.x	2009-04-17 14:32:14.000000000 +0200
+++ tools/extra_defs_gen/Makefile.in	2009-04-17 14:32:40.000000000 +0200
@@ -36,8 +36,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = generate_extra_defs$(EXEEXT) \
-	generate_defs_gio$(EXEEXT)
+noinst_PROGRAMS = generate_extra_defs$(EXEEXT)
 subdir = tools/extra_defs_gen
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(sublib_include_HEADERS)


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glibmm24/F-11/mingw32-glibmm24.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-glibmm24.spec	16 Apr 2009 09:26:44 -0000	1.2
+++ mingw32-glibmm24.spec	17 Apr 2009 13:17:34 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           mingw32-glibmm24
 Version:        2.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-2
+- fix extradefs build failure
+
 * Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-1
 - update to 2.20.0
 



From limb at fedoraproject.org  Fri Apr 17 13:23:52 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 13:23:52 +0000 (UTC)
Subject: rpms/pygame/devel pygame.spec,1.28,1.29
Message-ID: <20090417132352.73AA37012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/pygame/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9764

Modified Files:
	pygame.spec 
Log Message:
Oops.



Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pygame.spec	17 Apr 2009 13:14:50 -0000	1.28
+++ pygame.spec	17 Apr 2009 13:23:22 -0000	1.29
@@ -12,7 +12,7 @@
 Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel numpy
+BuildRequires:  python-devel numpy-f2py
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel



From ovasik at fedoraproject.org  Fri Apr 17 13:27:37 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 17 Apr 2009 13:27:37 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.20,
	1.21 coreutils-silentmv.patch, 1.1, 1.2
Message-ID: <20090417132737.2C7CF7012B@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11282

Modified Files:
	coreutils-6.10-configuration.patch coreutils-silentmv.patch 
Log Message:
suppress mv diagnostics only for ENOTSUP and ENODATA, do not run test-memchr gnulib test (koji failure)

coreutils-6.10-configuration.patch:

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- coreutils-6.10-configuration.patch	1 Apr 2009 11:14:30 -0000	1.20
+++ coreutils-6.10-configuration.patch	17 Apr 2009 13:27:36 -0000	1.21
@@ -1,6 +1,19 @@
 diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
 --- coreutils-7.2-orig/gnulib-tests/gnulib.mk	2009-03-31 14:28:30.000000000 +0200
 +++ coreutils-7.2/gnulib-tests/gnulib.mk	2009-04-01 12:37:00.000000000 +0200
+@@ -606,9 +606,9 @@ EXTRA_DIST += test-mbsstr1.c test-mbsstr
+ 
+ ## begin gnulib module memchr-tests
+ 
+-TESTS += test-memchr
+-check_PROGRAMS += test-memchr
+-EXTRA_DIST += test-memchr.c
++#TESTS += test-memchr
++#check_PROGRAMS += test-memchr
++#EXTRA_DIST += test-memchr.c
+ 
+ ## end   gnulib module memchr-tests
+ 
 @@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
  
  ## begin gnulib module strverscmp-tests

coreutils-silentmv.patch:

Index: coreutils-silentmv.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-silentmv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-silentmv.patch	17 Apr 2009 09:54:04 -0000	1.1
+++ coreutils-silentmv.patch	17 Apr 2009 13:27:36 -0000	1.2
@@ -1,12 +1,21 @@
-diff -urNp coreutils-7.2-orig/src/mv.c coreutils-7.2/src/mv.c
---- coreutils-7.2-orig/src/mv.c	2009-04-17 11:48:39.000000000 +0200
-+++ coreutils-7.2/src/mv.c	2009-04-17 11:49:17.000000000 +0200
-@@ -117,7 +117,7 @@ cp_option_init (struct cp_options *x)
-   x->preserve_timestamps = true;
-   x->preserve_security_context = selinux_enabled;
-   x->set_security_context = false;
--  x->reduce_diagnostics = false;
-+  x->reduce_diagnostics = true;
-   x->require_preserve = false;  /* FIXME: maybe make this an option */
-   x->require_preserve_context = false;
-   x->preserve_xattr = true;
+diff -urNp coreutils-7.2-orig/src/copy.c coreutils-7.2/src/copy.c
+--- coreutils-7.2-orig/src/copy.c	2009-04-17 15:21:26.000000000 +0200
++++ coreutils-7.2/src/copy.c	2009-04-17 15:24:17.000000000 +0200
+@@ -139,10 +139,13 @@ copy_attr_error (struct error_context *c
+   int err = errno;
+   va_list ap;
+ 
+-  /* use verror module to print error message */
+-  va_start (ap, fmt);
+-  verror (0, err, fmt, ap);
+-  va_end (ap);
++  if (errno != ENOTSUP && errno != ENODATA)
++    {
++      /* use verror module to print error message */
++      va_start (ap, fmt);
++      verror (0, err, fmt, ap);
++      va_end (ap);
++    }
+ }
+ 
+ static char const *



From nalin at fedoraproject.org  Fri Apr 17 13:30:11 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Fri, 17 Apr 2009 13:30:11 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.189,1.190
Message-ID: <20090417133011.9A8E97012B@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11665

Modified Files:
	krb5.spec 
Log Message:
- explicitly run the pdf generation script using sh (part of #225974)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- krb5.spec	7 Apr 2009 18:16:28 -0000	1.189
+++ krb5.spec	17 Apr 2009 13:29:41 -0000	1.190
@@ -228,6 +228,9 @@
 certificate.
 
 %changelog
+* Fri Apr 17 2009 Nalin Dahyabhai <nalin at redhat.com>
+- explicitly run the pdf generation script using sh (part of #225974)
+
 * Tue Apr  7 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-101
 - add patches for read overflow and null pointer dereference in the
   implementation of the SPNEGO mechanism (CVE-2009-0844, CVE-2009-0845)
@@ -1443,7 +1446,7 @@
 popd
 
 # Check that the PDFs we built earlier match this source tree.
-$RPM_SOURCE_DIR/krb5-tex-pdf.sh check << EOF
+sh $RPM_SOURCE_DIR/krb5-tex-pdf.sh check << EOF
 doc/api       library krb5
 doc/implement implement
 doc/kadm5     adb-unit-test



From sailer at fedoraproject.org  Fri Apr 17 13:30:22 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 13:30:22 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/F-11 mingw32-glibmm24.spec,1.3,1.4
Message-ID: <20090417133022.A76D97012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-glibmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11611

Modified Files:
	mingw32-glibmm24.spec 
Log Message:
do not forget to apply the build fix patch



Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glibmm24/F-11/mingw32-glibmm24.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-glibmm24.spec	17 Apr 2009 13:17:34 -0000	1.3
+++ mingw32-glibmm24.spec	17 Apr 2009 13:29:52 -0000	1.4
@@ -6,13 +6,14 @@
 
 Name:           mingw32-glibmm24
 Version:        2.20.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
+Patch0:         mingw32-glibmm24-nogunixio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +38,7 @@
 
 %prep
 %setup -q -n glibmm-%{version}
-
+%patch0 -p0 -b .nogunixio
 
 %build
 %{_mingw32_configure} --disable-static
@@ -79,6 +80,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-3
+- actually apply the patch
+
 * Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.0-2
 - fix extradefs build failure
 



From limb at fedoraproject.org  Fri Apr 17 13:34:05 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 13:34:05 +0000 (UTC)
Subject: rpms/pygame/F-11 pygame.spec,1.27,1.28
Message-ID: <20090417133405.73A267012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/pygame/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12231

Modified Files:
	pygame.spec 
Log Message:
Add dep for numpy-f2py to fix broken games, BZ 496218.



Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/F-11/pygame.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pygame.spec	26 Feb 2009 19:59:20 -0000	1.27
+++ pygame.spec	17 Apr 2009 13:33:34 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -12,11 +12,11 @@
 Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel numpy
+BuildRequires:  python-devel numpy-f2py
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel
-Requires:       numpy
+Requires:       numpy-f2py
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.1-5
+- Add dep for numpy-f2py to fix broken games, BZ 496218.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Fri Apr 17 13:59:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 17 Apr 2009 13:59:06 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.191,1.192
Message-ID: <20090417135906.4B8867012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15312

Modified Files:
	comps-f11.xml.in 
Log Message:
move pulseaudio-module-bluetooth to multimedia



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- comps-f11.xml.in	17 Apr 2009 09:41:41 -0000	1.191
+++ comps-f11.xml.in	17 Apr 2009 13:58:35 -0000	1.192
@@ -2194,7 +2194,6 @@
       <packagereq type="default">notification-daemon</packagereq>
       <packagereq type="default">orca</packagereq>
       <packagereq type="default">PolicyKit-gnome</packagereq>
-      <packagereq type="default">pulseaudio-module-bluetooth</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">tomboy</packagereq>
@@ -4449,6 +4448,7 @@
       <packagereq type="default">PackageKit-gstreamer-plugin</packagereq>
       <packagereq type="default">pavucontrol</packagereq>
       <packagereq type="default">pulseaudio</packagereq>
+      <packagereq type="default">pulseaudio-module-bluetooth</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>



From mcpierce at fedoraproject.org  Fri Apr 17 14:00:42 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Fri, 17 Apr 2009 14:00:42 +0000 (UTC)
Subject: rpms/rubygem-hoe/devel .cvsignore, 1.13, 1.14 rubygem-hoe.spec, 1.17,
	1.18 sources, 1.13, 1.14
Message-ID: <20090417140042.74CE87012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16561

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.2 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Apr 2009 16:01:56 -0000	1.13
+++ .cvsignore	17 Apr 2009 14:00:12 -0000	1.14
@@ -1 +1 @@
-hoe-1.12.1.gem
+hoe-1.12.2.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rubygem-hoe.spec	1 Apr 2009 16:01:56 -0000	1.17
+++ rubygem-hoe.spec	17 Apr 2009 14:00:12 -0000	1.18
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.12.1
+Version:    	1.12.2
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.2-1
+- Release 1.12.2 of Hoe.
+
 * Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
 - Release 1.12.1 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Apr 2009 16:01:56 -0000	1.13
+++ sources	17 Apr 2009 14:00:12 -0000	1.14
@@ -1 +1 @@
-c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem
+1eaf332968a2cde8393f26792f3f758e  hoe-1.12.2.gem



From lkundrak at fedoraproject.org  Fri Apr 17 14:12:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 17 Apr 2009 14:12:09 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-JUnit/EL-5 .cvsignore, 1.2,
	1.3 perl-TAP-Harness-JUnit.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417141209.42E9C7012B@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18276/EL-5

Modified Files:
	.cvsignore perl-TAP-Harness-JUnit.spec sources 
Log Message:
Merge TAP::Harness::JUnit to branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2008 20:08:51 -0000	1.2
+++ .cvsignore	17 Apr 2009 14:11:38 -0000	1.3
@@ -1 +1 @@
-TAP-Harness-JUnit-0.25.tar.gz
+TAP-Harness-JUnit-0.30.tar.gz


Index: perl-TAP-Harness-JUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/EL-5/perl-TAP-Harness-JUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-TAP-Harness-JUnit.spec	3 Nov 2008 20:08:51 -0000	1.1
+++ perl-TAP-Harness-JUnit.spec	17 Apr 2009 14:11:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness-JUnit
-Version:        0.25
-Release:        0.1%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        Generate JUnit compatible output from TAP results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,19 @@
 
 
 %changelog
+* Fri Apr 17 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.30-1
+- New upstream release
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 4 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.26-1
+- New upstream release
+- Re-enable regression tests
+
+* Mon Nov 3 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.25-0.2
+- Disable tests due to ambiguity in whitespace within rest results
+
 * Mon Nov 3 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.25-0.1
 - Ensure valid UTF-8 output
 - Do not report failed plain and bad return value as two failures


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2008 20:08:51 -0000	1.2
+++ sources	17 Apr 2009 14:11:38 -0000	1.3
@@ -1 +1 @@
-cfe00e86d18fe696b8ecfccea84fd892  TAP-Harness-JUnit-0.25.tar.gz
+6e61c4ebe530b38786146bfd24a285f3  TAP-Harness-JUnit-0.30.tar.gz



From lkundrak at fedoraproject.org  Fri Apr 17 14:12:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 17 Apr 2009 14:12:09 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-JUnit/devel .cvsignore, 1.3,
	1.4 perl-TAP-Harness-JUnit.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090417141209.743997012B@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18276/devel

Modified Files:
	.cvsignore perl-TAP-Harness-JUnit.spec sources 
Log Message:
Merge TAP::Harness::JUnit to branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Jan 2009 16:12:55 -0000	1.3
+++ .cvsignore	17 Apr 2009 14:11:39 -0000	1.4
@@ -1 +1 @@
-TAP-Harness-JUnit-0.26.tar.gz
+TAP-Harness-JUnit-0.30.tar.gz


Index: perl-TAP-Harness-JUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/perl-TAP-Harness-JUnit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-TAP-Harness-JUnit.spec	27 Feb 2009 01:57:38 -0000	1.5
+++ perl-TAP-Harness-JUnit.spec	17 Apr 2009 14:11:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness-JUnit
-Version:        0.26
-Release:        2%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        Generate JUnit compatible output from TAP results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.30-1
+- New upstream release
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jan 2009 16:12:55 -0000	1.3
+++ sources	17 Apr 2009 14:11:39 -0000	1.4
@@ -1 +1 @@
-9c73f275ee38cd8e47a8c7c7bc4e4c90  TAP-Harness-JUnit-0.26.tar.gz
+6e61c4ebe530b38786146bfd24a285f3  TAP-Harness-JUnit-0.30.tar.gz



From dwalsh at fedoraproject.org  Fri Apr 17 14:19:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 14:19:06 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.88,
	1.89 selinux-policy.spec, 1.826, 1.827
Message-ID: <20090417141907.8506C7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19323

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- policy-20090105.patch	16 Apr 2009 14:04:33 -0000	1.88
+++ policy-20090105.patch	17 Apr 2009 14:19:05 -0000	1.89
@@ -4661,8 +4661,17 @@
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-03-05 10:34:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-07 16:01:44.000000000 -0400
-@@ -134,6 +134,8 @@
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-17 07:21:07.000000000 -0400
+@@ -32,6 +32,8 @@
+ #
+ # /etc
+ #
++/etc/acpi/actions(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++
+ /etc/apcupsd/apccontrol		--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/apcupsd/changeme		--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/apcupsd/commfailure	--	gen_context(system_u:object_r:bin_t,s0)
+@@ -134,6 +136,8 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -4671,7 +4680,7 @@
  #
  # /usr
  #
-@@ -299,3 +301,14 @@
+@@ -299,3 +303,14 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5607,7 +5616,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.6.12/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-03-04 15:43:10.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.te	2009-04-17 08:55:09.000000000 -0400
 @@ -206,6 +206,10 @@
  genfscon ntfs-3g / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0)
@@ -5619,7 +5628,7 @@
  
  type fusefs_t;
  fs_noxattr_type(fusefs_t)
-@@ -244,8 +248,6 @@
+@@ -244,12 +248,12 @@
  genfscon afs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon dazukofs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon coda / gen_context(system_u:object_r:nfs_t,s0)
@@ -5628,6 +5637,12 @@
  genfscon lustre / gen_context(system_u:object_r:nfs_t,s0)
  genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon panfs / gen_context(system_u:object_r:nfs_t,s0)
++genfscon xenfs / gen_context(system_u:object_r:nfs_t,s0)
++genfscon gadgetfs / gen_context(system_u:object_r:nfs_t,s0)
+ 
+ ########################################
+ #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-13 08:28:24.000000000 -0400
@@ -21467,7 +21482,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-16 11:03:14.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21531,7 +21546,7 @@
  
  	sysnet_read_config(spamassassin_t)
  ')
-@@ -216,16 +253,31 @@
+@@ -216,16 +253,32 @@
  allow spamc_t self:unix_stream_socket connectto;
  allow spamc_t self:tcp_socket create_stream_socket_perms;
  allow spamc_t self:udp_socket create_socket_perms;
@@ -21552,6 +21567,7 @@
 +manage_fifo_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
 +manage_sock_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
 +userdom_user_home_dir_filetrans(spamc_t, spamc_home_t, { dir file lnk_file sock_file fifo_file })
++userdom_append_user_home_content_files(spamc_t)
 +
  # Allow connecting to a local spamd
  allow spamc_t spamd_t:unix_stream_socket connectto;
@@ -21563,7 +21579,7 @@
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -255,9 +307,15 @@
+@@ -255,9 +308,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -21579,7 +21595,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,31 +323,35 @@
+@@ -265,31 +324,35 @@
  
  sysnet_read_config(spamc_t)
  
@@ -21627,7 +21643,7 @@
  ')
  
  ########################################
-@@ -301,7 +363,7 @@
+@@ -301,7 +364,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -21636,7 +21652,7 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +379,13 @@
+@@ -317,10 +380,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -21651,7 +21667,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +394,11 @@
+@@ -329,10 +395,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -21664,7 +21680,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +448,27 @@
+@@ -382,22 +449,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -21696,7 +21712,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +486,7 @@
+@@ -415,6 +487,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -21704,7 +21720,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +496,6 @@
+@@ -424,10 +497,6 @@
  ')
  
  optional_policy(`
@@ -21715,7 +21731,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +510,10 @@
+@@ -442,6 +511,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -25479,7 +25495,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-16 10:02:04.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 07:33:11.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25741,7 +25757,18 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -647,6 +720,11 @@
+@@ -591,6 +664,10 @@
+ ')
+ 
+ optional_policy(`
++	hal_write_log(initrc_t)
++')
++
++optional_policy(`
+ 	dev_read_usbfs(initrc_t)
+ 
+ 	# init scripts run /etc/hotplug/usb.rc
+@@ -647,6 +724,11 @@
  ')
  
  optional_policy(`
@@ -25753,7 +25780,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +733,6 @@
+@@ -655,12 +737,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25766,7 +25793,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +793,9 @@
+@@ -721,6 +797,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -25776,7 +25803,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +808,12 @@
+@@ -733,10 +812,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25789,7 +25816,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +831,11 @@
+@@ -754,6 +835,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25801,7 +25828,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +843,8 @@
+@@ -761,6 +847,8 @@
  		# system-config-services causes avc messages that should be dontaudited
  		unconfined_dontaudit_rw_pipes(daemon)
  	')
@@ -25810,7 +25837,7 @@
  
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +852,10 @@
+@@ -768,6 +856,10 @@
  ')
  
  optional_policy(`
@@ -25821,7 +25848,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +878,25 @@
+@@ -790,3 +882,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25937,7 +25964,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.if serefpolicy-3.6.12/policy/modules/system/iscsi.if
 --- nsaserefpolicy/policy/modules/system/iscsi.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/iscsi.if	2009-04-09 10:18:10.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/iscsi.if	2009-04-17 07:27:34.000000000 -0400
 @@ -17,3 +17,43 @@
  
  	domtrans_pattern($1,iscsid_exec_t,iscsid_t)
@@ -25975,11 +26002,11 @@
 +#
 +interface(`iscsi_stream_connect',`
 +	gen_require(`
-+		type iscsi_t, iscsi_var_lib_t;
++		type iscsid_t, iscsi_var_lib_t;
 +	')
 +
 +	files_search_pids($1)
-+	stream_connect_pattern($1,iscsi_var_lib_t,iscsi_var_lib_t,iscsi_t)
++	stream_connect_pattern($1,iscsi_var_lib_t,iscsi_var_lib_t,iscsid_t)
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.12/policy/modules/system/iscsi.te
@@ -26004,7 +26031,7 @@
 +miscfiles_read_localization(iscsid_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.12/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-04-16 13:27:53.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -26101,10 +26128,11 @@
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/X11R6/lib/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -29107,7 +29135,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-14 14:04:17.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-16 11:03:07.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- selinux-policy.spec	16 Apr 2009 14:04:34 -0000	1.826
+++ selinux-policy.spec	17 Apr 2009 14:19:05 -0000	1.827
@@ -15,7 +15,7 @@
 %endif
 %define POLICYVER 23
 %define libsepolver 2.0.20-1
-%define POLICYCOREUTILSVER 2.0.62-7
+%define POLICYCOREUTILSVER 2.0.62-10
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
@@ -50,7 +50,7 @@
 BuildArch: noarch
 BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils-python >= %{POLICYCOREUTILSVER} bzip2 
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
-Requires(post): /usr/bin/bunzip2 /bin/mktemp
+Requires(post): /usr/bin/bunzip2 /bin/mktemp /bin/awk
 Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
 Obsoletes: selinux-policy-devel
 Provides: selinux-policy-devel
@@ -94,7 +94,7 @@
 cp -f $RPM_SOURCE_DIR/booleans-%1.conf ./policy/booleans.conf \
 
 %define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
-awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+awk '$1 !~ "/^#/" && $1 != "unconfined" && $1 != "unconfineduser" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
 %define installCmds() \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} UBAC=n DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
@@ -172,7 +172,7 @@
 
 %define loadpolicy() \
 ( cd /usr/share/selinux/%1; \
-semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} -s %1; \
+semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} %2 -s %1; \
 ); \
 
 %define relabel() \
@@ -312,11 +312,17 @@
 
 %post targeted
 if [ $1 -eq 1 ]; then
-%loadpolicy targeted
+packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+%loadpolicy targeted $packages
 restorecon -R /root /var/log /var/run 2> /dev/null
 else
 semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-%loadpolicy targeted unconfined.pp unconfineduser.pp
+
+packages=""
+for i in `semodule -l | awk '{print $1 }' | grep -E "(^unconfined$|^unconfineduser$)"`; do
+packages="$packages $i.pp.bz2"
+done
+%loadpolicy targeted $packages
 %relabel targeted
 fi
 exit 0
@@ -395,7 +401,7 @@
 %saveFileContext olpc
 
 %post olpc 
-%loadpolicy olpc
+%loadpolicy olpc ""
 
 if [ $1 -ne 1 ]; then
 %relabel olpc
@@ -426,7 +432,7 @@
 
 %post mls 
 semodule -n -s mls -r mailscanner 2>/dev/null
-%loadpolicy mls
+%loadpolicy mls ""
 
 if [ $1 != 1 ]; then
 %relabel mls
@@ -440,8 +446,12 @@
 %endif
 
 %changelog
-* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
+
+* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
 - Allow cupsd_t to create link files in print_spool_t
+- Fix iscsi_stream_connect typo
+- Fix labeling on /etc/acpi/actions
+- Don't reinstall unconfine and unconfineuser on upgrade if they are not installed
 
 * Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
 - Allow audioentroy to read etc files



From dwalsh at fedoraproject.org  Fri Apr 17 14:19:19 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 14:19:19 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.88,
	1.89 selinux-policy.spec, 1.825, 1.826
Message-ID: <20090417141919.305EE7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19378

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- policy-20090105.patch	16 Apr 2009 15:14:25 -0000	1.88
+++ policy-20090105.patch	17 Apr 2009 14:19:16 -0000	1.89
@@ -4661,8 +4661,17 @@
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-03-05 10:34:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-07 16:01:44.000000000 -0400
-@@ -134,6 +134,8 @@
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-17 07:21:07.000000000 -0400
+@@ -32,6 +32,8 @@
+ #
+ # /etc
+ #
++/etc/acpi/actions(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++
+ /etc/apcupsd/apccontrol		--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/apcupsd/changeme		--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/apcupsd/commfailure	--	gen_context(system_u:object_r:bin_t,s0)
+@@ -134,6 +136,8 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -4671,7 +4680,7 @@
  #
  # /usr
  #
-@@ -299,3 +301,14 @@
+@@ -299,3 +303,14 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5607,7 +5616,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.6.12/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-03-04 15:43:10.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.te	2009-04-17 08:55:09.000000000 -0400
 @@ -206,6 +206,10 @@
  genfscon ntfs-3g / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0)
@@ -5619,7 +5628,7 @@
  
  type fusefs_t;
  fs_noxattr_type(fusefs_t)
-@@ -244,8 +248,6 @@
+@@ -244,12 +248,12 @@
  genfscon afs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon dazukofs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon coda / gen_context(system_u:object_r:nfs_t,s0)
@@ -5628,6 +5637,12 @@
  genfscon lustre / gen_context(system_u:object_r:nfs_t,s0)
  genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon panfs / gen_context(system_u:object_r:nfs_t,s0)
++genfscon xenfs / gen_context(system_u:object_r:nfs_t,s0)
++genfscon gadgetfs / gen_context(system_u:object_r:nfs_t,s0)
+ 
+ ########################################
+ #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-13 08:28:24.000000000 -0400
@@ -21467,7 +21482,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-16 11:03:14.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21531,7 +21546,7 @@
  
  	sysnet_read_config(spamassassin_t)
  ')
-@@ -216,16 +253,31 @@
+@@ -216,16 +253,32 @@
  allow spamc_t self:unix_stream_socket connectto;
  allow spamc_t self:tcp_socket create_stream_socket_perms;
  allow spamc_t self:udp_socket create_socket_perms;
@@ -21552,6 +21567,7 @@
 +manage_fifo_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
 +manage_sock_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
 +userdom_user_home_dir_filetrans(spamc_t, spamc_home_t, { dir file lnk_file sock_file fifo_file })
++userdom_append_user_home_content_files(spamc_t)
 +
  # Allow connecting to a local spamd
  allow spamc_t spamd_t:unix_stream_socket connectto;
@@ -21563,7 +21579,7 @@
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -255,9 +307,15 @@
+@@ -255,9 +308,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -21579,7 +21595,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,31 +323,35 @@
+@@ -265,31 +324,35 @@
  
  sysnet_read_config(spamc_t)
  
@@ -21627,7 +21643,7 @@
  ')
  
  ########################################
-@@ -301,7 +363,7 @@
+@@ -301,7 +364,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -21636,7 +21652,7 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +379,13 @@
+@@ -317,10 +380,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -21651,7 +21667,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +394,11 @@
+@@ -329,10 +395,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -21664,7 +21680,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +448,27 @@
+@@ -382,22 +449,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -21696,7 +21712,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +486,7 @@
+@@ -415,6 +487,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -21704,7 +21720,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +496,6 @@
+@@ -424,10 +497,6 @@
  ')
  
  optional_policy(`
@@ -21715,7 +21731,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +510,10 @@
+@@ -442,6 +511,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -25479,7 +25495,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-16 10:02:04.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 07:33:11.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25741,7 +25757,18 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -647,6 +720,11 @@
+@@ -591,6 +664,10 @@
+ ')
+ 
+ optional_policy(`
++	hal_write_log(initrc_t)
++')
++
++optional_policy(`
+ 	dev_read_usbfs(initrc_t)
+ 
+ 	# init scripts run /etc/hotplug/usb.rc
+@@ -647,6 +724,11 @@
  ')
  
  optional_policy(`
@@ -25753,7 +25780,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +733,6 @@
+@@ -655,12 +737,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25766,7 +25793,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +793,9 @@
+@@ -721,6 +797,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -25776,7 +25803,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +808,12 @@
+@@ -733,10 +812,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25789,7 +25816,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +831,11 @@
+@@ -754,6 +835,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25801,7 +25828,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +843,8 @@
+@@ -761,6 +847,8 @@
  		# system-config-services causes avc messages that should be dontaudited
  		unconfined_dontaudit_rw_pipes(daemon)
  	')
@@ -25810,7 +25837,7 @@
  
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +852,10 @@
+@@ -768,6 +856,10 @@
  ')
  
  optional_policy(`
@@ -25821,7 +25848,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +878,25 @@
+@@ -790,3 +882,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25937,7 +25964,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.if serefpolicy-3.6.12/policy/modules/system/iscsi.if
 --- nsaserefpolicy/policy/modules/system/iscsi.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/iscsi.if	2009-04-09 10:18:10.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/iscsi.if	2009-04-17 07:27:34.000000000 -0400
 @@ -17,3 +17,43 @@
  
  	domtrans_pattern($1,iscsid_exec_t,iscsid_t)
@@ -25975,11 +26002,11 @@
 +#
 +interface(`iscsi_stream_connect',`
 +	gen_require(`
-+		type iscsi_t, iscsi_var_lib_t;
++		type iscsid_t, iscsi_var_lib_t;
 +	')
 +
 +	files_search_pids($1)
-+	stream_connect_pattern($1,iscsi_var_lib_t,iscsi_var_lib_t,iscsi_t)
++	stream_connect_pattern($1,iscsi_var_lib_t,iscsi_var_lib_t,iscsid_t)
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.12/policy/modules/system/iscsi.te
@@ -26004,7 +26031,7 @@
 +miscfiles_read_localization(iscsid_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.12/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-04-16 13:27:53.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -26101,10 +26128,11 @@
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/X11R6/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/X11R6/lib/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib/libfglrx_gamma\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib/libOSMesa\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -29107,7 +29135,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-14 14:04:17.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-16 11:03:07.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- selinux-policy.spec	16 Apr 2009 15:14:26 -0000	1.825
+++ selinux-policy.spec	17 Apr 2009 14:19:17 -0000	1.826
@@ -15,7 +15,7 @@
 %endif
 %define POLICYVER 23
 %define libsepolver 2.0.20-1
-%define POLICYCOREUTILSVER 2.0.62-7
+%define POLICYCOREUTILSVER 2.0.62-10
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
@@ -50,7 +50,7 @@
 BuildArch: noarch
 BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils-python >= %{POLICYCOREUTILSVER} bzip2 
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
-Requires(post): /usr/bin/bunzip2 /bin/mktemp
+Requires(post): /usr/bin/bunzip2 /bin/mktemp /bin/awk
 Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
 Obsoletes: selinux-policy-devel
 Provides: selinux-policy-devel
@@ -94,7 +94,7 @@
 cp -f $RPM_SOURCE_DIR/booleans-%1.conf ./policy/booleans.conf \
 
 %define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
-awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+awk '$1 !~ "/^#/" && $1 != "unconfined" && $1 != "unconfineduser" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
 %define installCmds() \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} UBAC=n DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
@@ -172,7 +172,7 @@
 
 %define loadpolicy() \
 ( cd /usr/share/selinux/%1; \
-semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} -s %1; \
+semodule -b base.pp.bz2 -i %{expand:%%moduleList %1} %2 -s %1; \
 ); \
 
 %define relabel() \
@@ -311,12 +311,18 @@
 %saveFileContext targeted
 
 %post targeted
+set -x
 if [ $1 -eq 1 ]; then
-%loadpolicy targeted
+%loadpolicy targeted "unconfined.pp.bz2 unconfineduser.pp.bz2"
 restorecon -R /root /var/log /var/run 2> /dev/null
 else
 semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-%loadpolicy targeted unconfined.pp unconfineduser.pp
+
+packages=""
+for i in `semodule -l | awk '{print $1 }' | grep -E "(^unconfined$|^unconfineduser$)"`; do
+packages="$packages $i.pp.bz2"
+done
+%loadpolicy targeted $packages
 %relabel targeted
 fi
 exit 0
@@ -440,8 +446,12 @@
 %endif
 
 %changelog
-* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
+
+* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
 - Allow cupsd_t to create link files in print_spool_t
+- Fix iscsi_stream_connect typo
+- Fix labeling on /etc/acpi/actions
+- Don't reinstall unconfine and unconfineuser on upgrade if they are not installed
 
 * Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-5
 - Allow audioentroy to read etc files



From caolanm at fedoraproject.org  Fri Apr 17 14:22:21 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 14:22:21 +0000 (UTC)
Subject: rpms/planner/devel .cvsignore, 1.9, 1.10 planner.spec, 1.61,
	1.62 sources, 1.9, 1.10 planner-0.12-desktop-fix.patch, 1.1,
	NONE planner-0.13-enableeds.patch, 1.5,
	NONE planner-0.13-gannt-bar-height.patch, 1.2,
	NONE planner-0.14.3-htmlimprovements.patch, 1.1, NONE
Message-ID: <20090417142221.7CE987012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20080

Modified Files:
	.cvsignore planner.spec sources 
Removed Files:
	planner-0.12-desktop-fix.patch planner-0.13-enableeds.patch 
	planner-0.13-gannt-bar-height.patch 
	planner-0.14.3-htmlimprovements.patch 
Log Message:
next release, drop patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Apr 2008 15:40:48 -0000	1.9
+++ .cvsignore	17 Apr 2009 14:21:50 -0000	1.10
@@ -1 +1 @@
-planner-0.14.3.tar.bz2
+planner-0.14.4.tar.bz2


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- planner.spec	1 Apr 2009 09:09:21 -0000	1.61
+++ planner.spec	17 Apr 2009 14:21:50 -0000	1.62
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
-Version:   0.14.3
-Release:   11%{?dist}
+Version:   0.14.4
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -10,8 +10,7 @@
 BuildRequires: gtk2-devel >= 2.2.0, libgnomeui-devel >= 2.0.1 
 BuildRequires: libglade2-devel >= 2.0.0, gnome-vfs2-devel >= 2.0.2
 BuildRequires: libgnomeprintui22-devel >= 2.2.0, libxml2-devel >= 2.5.4
-BuildRequires: libxslt-devel >= 1.0.27, intltool, autoconf, automake
-BuildRequires: libtool, gettext, libgsf-devel, gtk-doc, pygtk2-devel
+BuildRequires: libxslt-devel >= 1.0.27, libgsf-devel, gtk-doc, pygtk2-devel
 BuildRequires: scrollkeeper, glib2-devel, evolution-data-server
 BuildRequires: evolution-data-server-devel >= 1.9.1, evolution-devel >= 2.9.1
 BuildRequires: python-devel
@@ -19,11 +18,6 @@
 Requires(post): %{_bindir}/scrollkeeper-update
 Requires(postun): %{_bindir}/scrollkeeper-update
 
-Patch0: planner-0.12-desktop-fix.patch
-Patch1: planner-0.13-enableeds.patch
-Patch2: planner-0.13-gannt-bar-height.patch
-Patch3: planner-0.14.3-htmlimprovements.patch
-
 %description
 Planner is a visual project management application which allows users to
 manage several aspects of a project, including schedule tracking using
@@ -52,17 +46,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop-fix
-%patch1 -p1 -b .enableeds
-%patch2 -p1 -b .ganttheight
-%patch3 -p0 -b .htmlimprovements
 
 %build
-aclocal
-automake
-intltoolize --force
-libtoolize --force
-autoconf
 %configure --enable-python --disable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend --disable-static
 make # %{?_smp_mflags} not parallel build safe
 
@@ -157,6 +142,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 0.14.4-1
+- next release, drop patches
+
 * Wed Apr 01 2009 Caol??n McNamara <caolanm at redhat.com> - 0.14.3-11
 - Resolves: rhbz#226301 fix some rpmlint warnings
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Apr 2008 15:40:48 -0000	1.9
+++ sources	17 Apr 2009 14:21:50 -0000	1.10
@@ -1 +1 @@
-9aee1307f8b9d643241473791f0efa64  planner-0.14.3.tar.bz2
+8fcbd1b55dd037662f7710a28a96bb92  planner-0.14.4.tar.bz2


--- planner-0.12-desktop-fix.patch DELETED ---


--- planner-0.13-enableeds.patch DELETED ---


--- planner-0.13-gannt-bar-height.patch DELETED ---


--- planner-0.14.3-htmlimprovements.patch DELETED ---



From mgrepl at fedoraproject.org  Fri Apr 17 14:24:11 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 17 Apr 2009 14:24:11 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.265,
	1.266 selinux-policy.spec, 1.747, 1.748
Message-ID: <20090417142411.DC2ED7012B@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20126

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
- Fix postfix master policy



policy-20071130.patch:

Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- policy-20071130.patch	3 Apr 2009 12:41:46 -0000	1.265
+++ policy-20071130.patch	17 Apr 2009 14:24:07 -0000	1.266
@@ -658579,7 +658579,7 @@
  # Local Policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.3.1/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-02-26 14:23:10.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2009-02-12 22:21:57.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2009-04-16 12:54:15.000000000 +0200
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -658666,7 +658666,7 @@
  
  allow postfix_master_t postfix_etc_t:file rw_file_perms;
  
-@@ -122,6 +142,10 @@
+@@ -122,9 +142,14 @@
  
  domtrans_pattern(postfix_master_t, postfix_showq_exec_t, postfix_showq_t)
  
@@ -658677,7 +658677,11 @@
  # allow access to deferred queue and allow removing bogus incoming entries
  manage_dirs_pattern(postfix_master_t,postfix_spool_t,postfix_spool_t)
  manage_files_pattern(postfix_master_t,postfix_spool_t,postfix_spool_t)
-@@ -135,6 +159,7 @@
++files_spool_filetrans(postfix_master_t, postfix_spool_t, dir)
+ 
+ allow postfix_master_t postfix_spool_bounce_t:dir manage_dir_perms;
+ allow postfix_master_t postfix_spool_bounce_t:file getattr;
+@@ -135,6 +160,7 @@
  
  delete_files_pattern(postfix_master_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t)
  rename_files_pattern(postfix_master_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t)
@@ -658685,7 +658689,7 @@
  
  kernel_read_all_sysctls(postfix_master_t)
  
-@@ -174,6 +199,7 @@
+@@ -174,6 +200,7 @@
  
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -658693,7 +658697,7 @@
  
  optional_policy(`
  	cyrus_stream_connect(postfix_master_t)
-@@ -189,6 +215,10 @@
+@@ -189,6 +216,10 @@
  ')
  
  optional_policy(`
@@ -658704,7 +658708,7 @@
  	sendmail_signal(postfix_master_t)
  ')
  
-@@ -248,6 +278,10 @@
+@@ -248,6 +279,10 @@
  
  corecmd_exec_bin(postfix_cleanup_t)
  
@@ -658715,7 +658719,7 @@
  ########################################
  #
  # Postfix local local policy
-@@ -273,18 +307,25 @@
+@@ -273,18 +308,25 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -658741,7 +658745,7 @@
  ')
  
  optional_policy(`
-@@ -295,8 +336,7 @@
+@@ -295,8 +337,7 @@
  #
  # Postfix map local policy
  #
@@ -658751,7 +658755,7 @@
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -346,8 +386,6 @@
+@@ -346,8 +387,6 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -658760,7 +658764,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(postfix_map_t)
  	files_read_default_files(postfix_map_t)
-@@ -360,6 +398,11 @@
+@@ -360,6 +399,11 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -658772,7 +658776,7 @@
  ########################################
  #
  # Postfix pickup local policy
-@@ -384,6 +427,7 @@
+@@ -384,6 +428,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -658780,7 +658784,7 @@
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -391,6 +435,12 @@
+@@ -391,6 +436,12 @@
  
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
@@ -658793,7 +658797,7 @@
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -400,6 +450,10 @@
+@@ -400,6 +451,10 @@
  ')
  
  optional_policy(`
@@ -658804,7 +658808,7 @@
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -436,8 +490,11 @@
+@@ -436,8 +491,11 @@
  ')
  
  optional_policy(`
@@ -658818,7 +658822,7 @@
  ')
  
  #######################################
-@@ -463,6 +520,15 @@
+@@ -463,6 +521,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -658834,7 +658838,7 @@
  ########################################
  #
  # Postfix qmgr local policy
-@@ -519,10 +585,22 @@
+@@ -519,10 +586,22 @@
  
  files_dontaudit_getattr_home_dir(postfix_smtp_t)
  
@@ -658857,7 +658861,7 @@
  ########################################
  #
  # Postfix smtpd local policy
-@@ -532,9 +610,6 @@
+@@ -532,9 +611,6 @@
  # connect to master process
  stream_connect_pattern(postfix_smtpd_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
@@ -658867,7 +658871,7 @@
  # for prng_exch
  allow postfix_smtpd_t postfix_spool_t:file rw_file_perms;
  allow postfix_smtpd_t postfix_prng_t:file rw_file_perms;
-@@ -557,6 +632,10 @@
+@@ -557,6 +633,10 @@
  	sasl_connect(postfix_smtpd_t)
  ')
  
@@ -658878,7 +658882,7 @@
  ########################################
  #
  # Postfix virtual local policy
-@@ -572,7 +651,7 @@
+@@ -572,7 +652,7 @@
  files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
  
  # connect to master process


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.747
retrieving revision 1.748
diff -u -r1.747 -r1.748
--- selinux-policy.spec	3 Apr 2009 12:41:48 -0000	1.747
+++ selinux-policy.spec	17 Apr 2009 14:24:09 -0000	1.748
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 131%{?dist}
+Release: 132%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-132
+- Fix postfix-master policy
+
 * Fri Apr 3 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-131
 - Allow spamc_t to manage spamassassin milter state
 



From caolanm at fedoraproject.org  Fri Apr 17 14:29:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 14:29:46 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.218, 1.219 sources, 1.359,
	1.360
Message-ID: <20090417142946.B3C377013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21235

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- .cvsignore	2 Apr 2009 10:58:51 -0000	1.218
+++ .cvsignore	17 Apr 2009 14:29:16 -0000	1.219
@@ -8,3 +8,4 @@
 openoffice.org-javafilter.desktop
 or-IN_DEV300_m40.sdf
 OOO310_m9.tar.bz2
+OOO310_m10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- sources	2 Apr 2009 10:58:51 -0000	1.359
+++ sources	17 Apr 2009 14:29:16 -0000	1.360
@@ -7,4 +7,4 @@
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-16eca6326a807ff6f60bcd2125dab852  OOO310_m9.tar.bz2
+7e4822ad083efee8964fb739d2ad2277  OOO310_m10.tar.bz2



From caolanm at fedoraproject.org  Fri Apr 17 14:31:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 14:31:35 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1881, 1.1882 sources,
	1.359, 1.360
Message-ID: <20090417143135.6D7F17012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22108/F-11

Modified Files:
	openoffice.org.spec sources 
Log Message:
closing in on final, hah\!


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1881
retrieving revision 1.1882
diff -u -r1.1881 -r1.1882
--- openoffice.org.spec	17 Apr 2009 11:16:32 -0000	1.1881
+++ openoffice.org.spec	17 Apr 2009 14:31:04 -0000	1.1882
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 9
-%define rh_rpm_release 4
+%define ooomilestone 10
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4125,6 +4125,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.1
+- closing in on final
+
 * Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/sources,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- sources	2 Apr 2009 10:58:51 -0000	1.359
+++ sources	17 Apr 2009 14:31:04 -0000	1.360
@@ -7,4 +7,4 @@
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-16eca6326a807ff6f60bcd2125dab852  OOO310_m9.tar.bz2
+7e4822ad083efee8964fb739d2ad2277  OOO310_m10.tar.bz2



From caolanm at fedoraproject.org  Fri Apr 17 14:31:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 14:31:35 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1882,1.1883
Message-ID: <20090417143135.CF02A7013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22108/devel

Modified Files:
	openoffice.org.spec 
Log Message:
closing in on final, hah\!


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1882
retrieving revision 1.1883
diff -u -r1.1882 -r1.1883
--- openoffice.org.spec	17 Apr 2009 11:16:34 -0000	1.1882
+++ openoffice.org.spec	17 Apr 2009 14:31:04 -0000	1.1883
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 9
-%define rh_rpm_release 4
+%define ooomilestone 10
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4125,6 +4125,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.1
+- closing in on final
+
 * Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch



From caolanm at fedoraproject.org  Fri Apr 17 14:32:16 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 14:32:16 +0000 (UTC)
Subject: rpms/planner/devel planner.spec,1.62,1.63
Message-ID: <20090417143216.59AC67012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22244

Modified Files:
	planner.spec 
Log Message:
BuildRequires for intltool


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- planner.spec	17 Apr 2009 14:21:50 -0000	1.62
+++ planner.spec	17 Apr 2009 14:31:46 -0000	1.63
@@ -13,7 +13,7 @@
 BuildRequires: libxslt-devel >= 1.0.27, libgsf-devel, gtk-doc, pygtk2-devel
 BuildRequires: scrollkeeper, glib2-devel, evolution-data-server
 BuildRequires: evolution-data-server-devel >= 1.9.1, evolution-devel >= 2.9.1
-BuildRequires: python-devel
+BuildRequires: python-devel, intltool
 Requires:  shared-mime-info
 Requires(post): %{_bindir}/scrollkeeper-update
 Requires(postun): %{_bindir}/scrollkeeper-update



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:22 +0000
Subject: [pkgdb] erlang: peter has requested watchbugzilla
Message-ID: <20090417144422.6300D10F86B@bastion2.fedora.phx.redhat.com>

peter has requested the watchbugzilla acl on erlang (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:22 +0000
Subject: [pkgdb] erlang: peter has requested watchcommits
Message-ID: <20090417144423.C6AB510F87E@bastion2.fedora.phx.redhat.com>

peter has requested the watchcommits acl on erlang (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:40 +0000
Subject: [pkgdb] erlang: peter has requested watchbugzilla
Message-ID: <20090417144440.2F31910F86B@bastion2.fedora.phx.redhat.com>

peter has requested the watchbugzilla acl on erlang (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:40 +0000
Subject: [pkgdb] erlang: peter has requested watchcommits
Message-ID: <20090417144440.6698410F880@bastion2.fedora.phx.redhat.com>

peter has requested the watchcommits acl on erlang (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:43 +0000
Subject: [pkgdb] erlang: peter has requested watchbugzilla
Message-ID: <20090417144443.E8E7910F881@bastion2.fedora.phx.redhat.com>

peter has requested the watchbugzilla acl on erlang (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:47 +0000
Subject: [pkgdb] erlang: peter has requested watchbugzilla
Message-ID: <20090417144447.B8C0010F885@bastion2.fedora.phx.redhat.com>

peter has requested the watchbugzilla acl on erlang (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:45 +0000
Subject: [pkgdb] erlang: peter has requested watchcommits
Message-ID: <20090417144445.6CF4A10F884@bastion2.fedora.phx.redhat.com>

peter has requested the watchcommits acl on erlang (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:44:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:44:48 +0000
Subject: [pkgdb] erlang: peter has requested watchcommits
Message-ID: <20090417144448.2C92510F889@bastion2.fedora.phx.redhat.com>

peter has requested the watchcommits acl on erlang (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Fri Apr 17 14:57:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:57:42 +0000
Subject: [pkgdb] libXext had acl change status
Message-ID: <20090417145742.F0D6710F86B@bastion2.fedora.phx.redhat.com>

ssp has set the watchcommits acl on libXext (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Fri Apr 17 14:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:57:48 +0000
Subject: [pkgdb] libXext had acl change status
Message-ID: <20090417145748.C07B010F87E@bastion2.fedora.phx.redhat.com>

ssp has set the commit acl on libXext (Fedora devel) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Fri Apr 17 14:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:58:12 +0000
Subject: [pkgdb] libXext had acl change status
Message-ID: <20090417145812.A54BD10F85A@bastion2.fedora.phx.redhat.com>

ssp has set the watchcommits acl on libXext (Fedora 10) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Fri Apr 17 14:58:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:58:15 +0000
Subject: [pkgdb] libXext had acl change status
Message-ID: <20090417145815.D9B4010F87D@bastion2.fedora.phx.redhat.com>

ssp has set the commit acl on libXext (Fedora 10) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Fri Apr 17 14:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:58:57 +0000
Subject: [pkgdb] libXext had acl change status
Message-ID: <20090417145857.6D8CF10F85A@bastion2.fedora.phx.redhat.com>

ssp has set the commit acl on libXext (Fedora 11) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From pkgdb at fedoraproject.org  Fri Apr 17 14:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 14:58:57 +0000
Subject: [pkgdb] libXext had acl change status
Message-ID: <20090417145857.8C01810F87D@bastion2.fedora.phx.redhat.com>

ssp has set the watchcommits acl on libXext (Fedora 11) to Approved for whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXext



From caolanm at fedoraproject.org  Fri Apr 17 15:01:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 15:01:15 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1883,1.1884
Message-ID: <20090417150115.258E97012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26382/devel

Modified Files:
	openoffice.org.spec 
Log Message:
fix bustage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1883
retrieving revision 1.1884
diff -u -r1.1883 -r1.1884
--- openoffice.org.spec	17 Apr 2009 14:31:04 -0000	1.1883
+++ openoffice.org.spec	17 Apr 2009 15:00:44 -0000	1.1884
@@ -2398,7 +2398,7 @@
 %files langpack-or_IN	-f or-IN.filelist
 %files langpack-te_IN	-f te-IN.filelist
 %files langpack-ur	-f ur-IN.filelist
-%files langpack-kn_IN	-f kn.filelist
+%files langpack-kn_IN	-f kn-IN.filelist
 %files langpack-dz	-f dz.filelist
 %files langpack-uk	-f uk.filelist
 %files langpack-mai_IN	-f mai.filelist



From twaugh at fedoraproject.org  Fri Apr 17 15:07:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 17 Apr 2009 15:07:17 +0000 (UTC)
Subject: rpms/cups/F-9 cups-getnameddest.patch, 1.3, 1.4 cups.spec, 1.436,
	1.437
Message-ID: <20090417150717.5F3DE7012B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27869

Modified Files:
	cups-getnameddest.patch cups.spec 
Log Message:
* Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com>
- Fixed getnameddest patch (bug #481481, STR #3082).


cups-getnameddest.patch:

Index: cups-getnameddest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-getnameddest.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-getnameddest.patch	10 Oct 2008 08:43:51 -0000	1.3
+++ cups-getnameddest.patch	17 Apr 2009 15:07:16 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up cups-1.3.9/berkeley/lpr.c.getnameddest cups-1.3.9/berkeley/lpr.c
---- cups-1.3.9/berkeley/lpr.c.getnameddest	2008-10-10 09:35:05.000000000 +0100
-+++ cups-1.3.9/berkeley/lpr.c	2008-10-10 09:35:05.000000000 +0100
+--- cups-1.3.9/berkeley/lpr.c.getnameddest	2009-03-09 15:56:30.000000000 +0000
++++ cups-1.3.9/berkeley/lpr.c	2009-03-09 15:56:38.000000000 +0000
 @@ -92,9 +92,7 @@ main(int  argc,				/* I - Number of comm
    int		num_copies;		/* Number of copies per file */
    int		num_files;		/* Number of files to print */
@@ -57,7 +57,7 @@
  		        "non-existent destination \"%s\"!\n"),
 diff -up cups-1.3.9/cups/cups.h.getnameddest cups-1.3.9/cups/cups.h
 --- cups-1.3.9/cups/cups.h.getnameddest	2008-07-23 01:06:46.000000000 +0100
-+++ cups-1.3.9/cups/cups.h	2008-10-10 09:35:05.000000000 +0100
++++ cups-1.3.9/cups/cups.h	2009-03-09 15:56:38.000000000 +0000
 @@ -248,6 +248,9 @@ extern void		cupsSetDefaultDest(const ch
  					   int num_dests,
  					   cups_dest_t *dests);
@@ -70,7 +70,16 @@
  }
 diff -up cups-1.3.9/cups/dest.c.getnameddest cups-1.3.9/cups/dest.c
 --- cups-1.3.9/cups/dest.c.getnameddest	2008-09-17 00:37:56.000000000 +0100
-+++ cups-1.3.9/cups/dest.c	2008-10-10 09:36:02.000000000 +0100
++++ cups-1.3.9/cups/dest.c	2009-03-09 15:56:47.000000000 +0000
+@@ -4,7 +4,7 @@
+  *   User-defined destination (and option) support for the Common UNIX
+  *   Printing System (CUPS).
+  *
+- *   Copyright 2007-2008 by Apple Inc.
++ *   Copyright 2007-2009 by Apple Inc.
+  *   Copyright 1997-2007 by Easy Software Products.
+  *
+  *   These coded instructions, statements, and computer programs are the
 @@ -25,6 +25,7 @@
   *                              server.
   *   cupsGetDests2()          - Get the list of destinations from the
@@ -158,7 +167,7 @@
    }
  
   /*
-@@ -460,6 +463,136 @@ cupsGetDests2(http_t      *http,	/* I - 
+@@ -460,6 +463,147 @@ cupsGetDests2(http_t      *http,	/* I - 
  
  
  /*
@@ -261,7 +270,18 @@
 +  */
 +
 +  if (!cups_get_sdests(http, op, name, 0, &dest))
-+    return (NULL);
++  {
++    if (op == CUPS_GET_DEFAULT)
++      return (NULL);
++
++   /*
++    * The default printer from environment variables or from a
++    * configuration file does not exist.  Find out the real default.
++    */
++
++    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
++      return (NULL);
++  }
 +
 +  if (instance)
 +    dest->instance = _cupsStrAlloc(instance);
@@ -295,7 +315,7 @@
   * 'cupsRemoveDest()' - Remove a destination from the destination list.
   *
   * Removing a destination/instance does not delete the class or printer
-@@ -556,19 +689,17 @@ void
+@@ -556,19 +700,17 @@ void
  cupsSetDests(int         num_dests,	/* I - Number of destinations */
               cups_dest_t *dests)	/* I - Destinations */
  {
@@ -319,7 +339,7 @@
  }
  
  
-@@ -614,8 +745,8 @@ cupsSetDests2(http_t      *http,	/* I - 
+@@ -614,8 +756,8 @@ cupsSetDests2(http_t      *http,	/* I - 
    * Get the server destinations...
    */
  
@@ -330,7 +350,7 @@
  
   /*
    * Figure out which file to write to...
-@@ -630,7 +761,7 @@ cupsSetDests2(http_t      *http,	/* I - 
+@@ -630,7 +772,7 @@ cupsSetDests2(http_t      *http,	/* I - 
      * Merge in server defaults...
      */
  
@@ -339,7 +359,7 @@
  
     /*
      * Point to user defaults...
-@@ -797,24 +928,88 @@ cupsSetDests2(http_t      *http,	/* I - 
+@@ -797,24 +939,88 @@ cupsSetDests2(http_t      *http,	/* I - 
  
  
  /*
@@ -429,7 +449,7 @@
   /*
    * Check environment variables...
    */
-@@ -824,12 +1019,8 @@ cups_get_dests(const char  *filename,	/*
+@@ -824,12 +1030,8 @@ cups_get_dests(const char  *filename,	/*
        if (strcmp(printer, "lp") == 0)
          printer = NULL;
  
@@ -444,7 +464,7 @@
  
   /*
    * Read each printer; each line looks like:
-@@ -838,28 +1029,22 @@ cups_get_dests(const char  *filename,	/*
+@@ -838,28 +1040,22 @@ cups_get_dests(const char  *filename,	/*
    *    Default name[/instance] options
    */
  
@@ -482,7 +502,7 @@
  
      name = lineptr;
  
-@@ -870,9 +1055,6 @@ cups_get_dests(const char  *filename,	/*
+@@ -870,9 +1066,6 @@ cups_get_dests(const char  *filename,	/*
      while (!isspace(*lineptr & 255) && *lineptr && *lineptr != '/')
        lineptr ++;
  
@@ -492,7 +512,7 @@
      if (*lineptr == '/')
      {
       /*
-@@ -892,30 +1074,49 @@ cups_get_dests(const char  *filename,	/*
+@@ -892,30 +1085,49 @@ cups_get_dests(const char  *filename,	/*
      else
        instance = NULL;
  
@@ -555,7 +575,7 @@
      }
  
     /*
-@@ -926,11 +1127,20 @@ cups_get_dests(const char  *filename,	/*
+@@ -926,11 +1138,20 @@ cups_get_dests(const char  *filename,	/*
                                           &(dest->options));
  
     /*
@@ -577,7 +597,7 @@
        for (i = 0; i < num_dests; i ++)
          (*dests)[i].is_default = 0;
  
-@@ -942,7 +1152,7 @@ cups_get_dests(const char  *filename,	/*
+@@ -942,7 +1163,7 @@ cups_get_dests(const char  *filename,	/*
    * Close the file and return...
    */
  
@@ -586,7 +606,7 @@
  
    return (num_dests);
  }
-@@ -954,7 +1164,8 @@ cups_get_dests(const char  *filename,	/*
+@@ -954,7 +1175,8 @@ cups_get_dests(const char  *filename,	/*
  
  static int				/* O - Number of destinations */
  cups_get_sdests(http_t      *http,	/* I - HTTP connection */
@@ -596,7 +616,7 @@
                  int         num_dests,	/* I - Number of destinations */
                  cups_dest_t **dests)	/* IO - Destinations */
  {
-@@ -971,8 +1182,9 @@ cups_get_sdests(http_t      *http,	/* I 
+@@ -971,8 +1193,9 @@ cups_get_sdests(http_t      *http,	/* I 
    const char	*info,			/* printer-info attribute */
  		*location,		/* printer-location attribute */
  		*make_model,		/* printer-make-and-model attribute */
@@ -608,7 +628,7 @@
  		auth_info_req[1024],	/* auth-info-required attribute */
  		reasons[1024];		/* printer-state-reasons attribute */
    int		num_options;		/* Number of options */
-@@ -1016,6 +1228,14 @@ cups_get_sdests(http_t      *http,	/* I 
+@@ -1016,6 +1239,14 @@ cups_get_sdests(http_t      *http,	/* I 
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                 "requesting-user-name", NULL, cupsUser());
  
@@ -623,7 +643,7 @@
   /*
    * Do the request and get back a response...
    */
-@@ -1038,17 +1258,17 @@ cups_get_sdests(http_t      *http,	/* I 
+@@ -1038,17 +1269,17 @@ cups_get_sdests(http_t      *http,	/* I 
        * Pull the needed attributes from this printer...
        */
  
@@ -652,7 +672,7 @@
  
        auth_info_req[0] = '\0';
        job_sheets[0]    = '\0';
-@@ -1099,7 +1319,7 @@ cups_get_sdests(http_t      *http,	/* I 
+@@ -1099,7 +1330,7 @@ cups_get_sdests(http_t      *http,	/* I 
  	  make_model = attr->values[0].string.text;
          else if (!strcmp(attr->name, "printer-name") &&
  	         attr->value_tag == IPP_TAG_NAME)
@@ -661,7 +681,7 @@
  	else if (!strcmp(attr->name, "printer-state") &&
  	         attr->value_tag == IPP_TAG_ENUM)
            state = attr->values[0].integer;
-@@ -1204,7 +1424,7 @@ cups_get_sdests(http_t      *http,	/* I 
+@@ -1204,7 +1435,7 @@ cups_get_sdests(http_t      *http,	/* I 
        * See if we have everything needed...
        */
  
@@ -670,7 +690,7 @@
        {
          cupsFreeOptions(num_options, options);
  
-@@ -1214,9 +1434,9 @@ cups_get_sdests(http_t      *http,	/* I 
+@@ -1214,9 +1445,9 @@ cups_get_sdests(http_t      *http,	/* I 
            continue;
        }
  
@@ -684,7 +704,7 @@
  	dest->options     = options;
 diff -up cups-1.3.9/cups/libcups.exp.getnameddest cups-1.3.9/cups/libcups.exp
 --- cups-1.3.9/cups/libcups.exp.getnameddest	2008-04-09 04:39:40.000000000 +0100
-+++ cups-1.3.9/cups/libcups.exp	2008-10-10 09:35:05.000000000 +0100
++++ cups-1.3.9/cups/libcups.exp	2009-03-09 15:56:38.000000000 +0000
 @@ -114,6 +114,7 @@ _cupsGetFd
  _cupsGetFile
  _cupsGetJobs
@@ -695,7 +715,7 @@
  _cupsGetPPD
 diff -up cups-1.3.9/cups/Makefile.getnameddest cups-1.3.9/cups/Makefile
 --- cups-1.3.9/cups/Makefile.getnameddest	2008-09-06 01:30:39.000000000 +0100
-+++ cups-1.3.9/cups/Makefile	2008-10-10 09:35:05.000000000 +0100
++++ cups-1.3.9/cups/Makefile	2009-03-09 15:56:38.000000000 +0000
 @@ -263,7 +263,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
  # libcups.2.dylib
  #
@@ -707,7 +727,7 @@
  		-install_name $(libdir)/$@ \
 diff -up cups-1.3.9/cups/testcups.c.getnameddest cups-1.3.9/cups/testcups.c
 --- cups-1.3.9/cups/testcups.c.getnameddest	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.9/cups/testcups.c	2008-10-10 09:35:05.000000000 +0100
++++ cups-1.3.9/cups/testcups.c	2009-03-09 15:56:38.000000000 +0000
 @@ -16,7 +16,8 @@
   *
   * Contents:
@@ -950,7 +970,7 @@
   */
 diff -up cups-1.3.9/systemv/lp.c.getnameddest cups-1.3.9/systemv/lp.c
 --- cups-1.3.9/systemv/lp.c.getnameddest	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.9/systemv/lp.c	2008-10-10 09:35:05.000000000 +0100
++++ cups-1.3.9/systemv/lp.c	2009-03-09 15:56:38.000000000 +0000
 @@ -73,9 +73,7 @@ main(int  argc,				/* I - Number of comm
    int		num_copies;		/* Number of copies per file */
    int		num_files;		/* Number of files to print */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- cups.spec	28 Jan 2009 18:03:42 -0000	1.436
+++ cups.spec	17 Apr 2009 15:07:16 -0000	1.437
@@ -462,6 +462,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com>
+- Fixed getnameddest patch (bug #481481, STR #3082).
+
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-4
 - Always supply document-name when printing a file (STR #3055).
 - Load MIME type rules correctly (bug #426089, STR #3059).



From caolanm at fedoraproject.org  Fri Apr 17 15:07:10 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 17 Apr 2009 15:07:10 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1882,1.1883
Message-ID: <20090417150710.547727012B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27701

Modified Files:
	openoffice.org.spec 
Log Message:
fix bustage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1882
retrieving revision 1.1883
diff -u -r1.1882 -r1.1883
--- openoffice.org.spec	17 Apr 2009 14:31:04 -0000	1.1882
+++ openoffice.org.spec	17 Apr 2009 15:06:39 -0000	1.1883
@@ -2398,7 +2398,7 @@
 %files langpack-or_IN	-f or-IN.filelist
 %files langpack-te_IN	-f te-IN.filelist
 %files langpack-ur	-f ur-IN.filelist
-%files langpack-kn_IN	-f kn.filelist
+%files langpack-kn_IN	-f kn-IN.filelist
 %files langpack-dz	-f dz.filelist
 %files langpack-uk	-f uk.filelist
 %files langpack-mai_IN	-f mai.filelist



From mcpierce at fedoraproject.org  Fri Apr 17 15:13:50 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Fri, 17 Apr 2009 15:13:50 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-9 .cvsignore, 1.13, 1.14 rubygem-hoe.spec, 1.13, 
	1.14 sources, 1.13, 1.14
Message-ID: <20090417151350.7879B7012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28790

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.2 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Apr 2009 16:14:46 -0000	1.13
+++ .cvsignore	17 Apr 2009 15:13:17 -0000	1.14
@@ -1 +1 @@
-hoe-1.12.1.gem
+hoe-1.12.2.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/rubygem-hoe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rubygem-hoe.spec	1 Apr 2009 16:14:46 -0000	1.13
+++ rubygem-hoe.spec	17 Apr 2009 15:13:17 -0000	1.14
@@ -5,7 +5,7 @@
 
 Summary:    Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       rubygem-%{gemname}
-Version:    1.12.1
+Version:    1.12.2
 Release:    1%{?dist}
 Group:      Development/Languages
 License:    MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.2-1
+- Release 1.12.2 of Hoe.
+
 * Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
 - Release 1.12.1 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Apr 2009 16:14:46 -0000	1.13
+++ sources	17 Apr 2009 15:13:17 -0000	1.14
@@ -1 +1 @@
-c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem
+1eaf332968a2cde8393f26792f3f758e  hoe-1.12.2.gem



From dwalsh at fedoraproject.org  Fri Apr 17 15:15:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 15:15:13 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 booleans-targeted.conf, 1.46,
	1.47 policy-20090105.patch, 1.89, 1.90 selinux-policy.spec,
	1.827, 1.828
Message-ID: <20090417151513.EC92D7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28999

Modified Files:
	booleans-targeted.conf policy-20090105.patch 
	selinux-policy.spec 
Log Message:
* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-7
- Turn off nsplugin transition
- Remove Konsole leaked file descriptors for release



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/booleans-targeted.conf,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- booleans-targeted.conf	10 Feb 2009 16:08:36 -0000	1.46
+++ booleans-targeted.conf	17 Apr 2009 15:14:42 -0000	1.47
@@ -241,7 +241,7 @@
 
 # Allow unconfined domain to transition to confined domain
 # 
-allow_unconfined_nsplugin_transition=true
+allow_unconfined_nsplugin_transition=false
 
 # Allow unconfined domains mmap low kernel memory
 # 

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- policy-20090105.patch	17 Apr 2009 14:19:05 -0000	1.89
+++ policy-20090105.patch	17 Apr 2009 15:14:42 -0000	1.90
@@ -3001,8 +3001,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.12/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,292 @@
++++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-17 11:13:07.000000000 -0400
+@@ -0,0 +1,293 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3138,6 +3138,7 @@
 +
 +miscfiles_read_localization(nsplugin_t)
 +miscfiles_read_fonts(nsplugin_t)
++miscfiles_dontaudit_write_fonts(nsplugin_t)
 +
 +userdom_manage_user_tmp_dirs(nsplugin_t)
 +userdom_manage_user_tmp_files(nsplugin_t)
@@ -6552,7 +6553,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-14 14:12:12.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-17 11:03:25.000000000 -0400
 @@ -0,0 +1,638 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -25303,8 +25304,8 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-16 10:03:08.000000000 -0400
-@@ -280,6 +280,29 @@
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-17 11:04:53.000000000 -0400
+@@ -280,6 +280,36 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -25330,11 +25331,18 @@
 +	 optional_policy(`
 +	 	xserver_rw_xdm_home_files($1)
 +	')
++
++	optional_policy(`
++		unconfined_dontaudit_rw_pipes($1)
++		unconfined_dontaudit_rw_stream($1)
++		userdom_dontaudit_read_user_tmp_files($1)
++	')
++
 +	init_rw_script_stream_sockets($1)
  ')
  
  ########################################
-@@ -546,7 +569,7 @@
+@@ -546,7 +576,7 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
@@ -25343,7 +25351,7 @@
  	')
  ')
  
-@@ -619,18 +642,19 @@
+@@ -619,18 +649,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -25367,7 +25375,7 @@
  	')
  ')
  
-@@ -646,23 +670,43 @@
+@@ -646,23 +677,43 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -25415,7 +25423,7 @@
  ##	Execute a init script in a specified domain.
  ## </summary>
  ## <desc>
-@@ -1291,6 +1335,25 @@
+@@ -1291,6 +1342,25 @@
  
  ########################################
  ## <summary>
@@ -25441,7 +25449,7 @@
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1584,51 @@
+@@ -1521,3 +1591,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
@@ -25495,7 +25503,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 07:33:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 11:04:04.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25714,7 +25722,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +560,31 @@
+@@ -516,6 +560,33 @@
  	')
  ')
  
@@ -25741,12 +25749,14 @@
 +
 +optional_policy(`
 +	unconfined_dontaudit_rw_pipes(daemon)
++	unconfined_dontaudit_rw_stream(daemon)
++	userdom_dontaudit_read_user_tmp_files(daemon)
 +')
 + 
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +639,10 @@
+@@ -570,6 +641,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -25757,7 +25767,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +664,10 @@
+@@ -591,6 +666,10 @@
  ')
  
  optional_policy(`
@@ -25768,7 +25778,7 @@
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,6 +724,11 @@
+@@ -647,6 +726,11 @@
  ')
  
  optional_policy(`
@@ -25780,7 +25790,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +737,6 @@
+@@ -655,12 +739,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25793,7 +25803,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +797,9 @@
+@@ -721,6 +799,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -25803,7 +25813,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +812,12 @@
+@@ -733,10 +814,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25816,7 +25826,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +835,11 @@
+@@ -754,6 +837,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25828,7 +25838,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +847,8 @@
+@@ -761,6 +849,8 @@
  		# system-config-services causes avc messages that should be dontaudited
  		unconfined_dontaudit_rw_pipes(daemon)
  	')
@@ -25837,7 +25847,7 @@
  
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +856,10 @@
+@@ -768,6 +858,10 @@
  ')
  
  optional_policy(`
@@ -25848,7 +25858,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +882,25 @@
+@@ -790,3 +884,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -29135,7 +29145,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-16 11:03:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-17 11:03:40.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -r1.827 -r1.828
--- selinux-policy.spec	17 Apr 2009 14:19:05 -0000	1.827
+++ selinux-policy.spec	17 Apr 2009 15:14:43 -0000	1.828
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-7
+- Turn off nsplugin transition
+- Remove Konsole leaked file descriptors for release
 
 * Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
 - Allow cupsd_t to create link files in print_spool_t



From rdieter at fedoraproject.org  Fri Apr 17 15:17:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 15:17:13 +0000 (UTC)
Subject: rpms/maxima/devel .cvsignore, 1.29, 1.30 maxima.spec, 1.127,
	1.128 sources, 1.27, 1.28 maxima-5.9.4-gcl_setarch.patch, 1.1, NONE
Message-ID: <20090417151713.4F0C67012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29317

Modified Files:
	.cvsignore maxima.spec sources 
Removed Files:
	maxima-5.9.4-gcl_setarch.patch 
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.0-1
- maxima-5.18.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Dec 2008 16:39:57 -0000	1.29
+++ .cvsignore	17 Apr 2009 15:16:42 -0000	1.30
@@ -3,3 +3,4 @@
 maxima.png
 maximabook-19-Sept-2004.pdf
 maxima-5.17.1.tar.gz
+maxima-5.18.0.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- maxima.spec	4 Mar 2009 18:40:16 -0000	1.127
+++ maxima.spec	17 Apr 2009 15:16:42 -0000	1.128
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.17.1
+Version: 5.18.0
 
-Release: 7%{?dist} 
+Release: 1%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -78,11 +78,8 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-# maxima-runtime-gcl: Unrecoverable error: fault count too high (#187647)
-Patch6: maxima-5.9.4-gcl_setarch.patch
-
-# Inhibit automatic compressing of info files. Compressed info
-# files break maxima's internal help.
+# Inhibit automatic compressing of info files. 
+# Compressed info files break maxima's internal help.
 %define __spec_install_post %{nil} 
 # debuginfo.list ends up empty/blank anyway. disable
 %define debug_package   %{nil}
@@ -95,6 +92,9 @@
 Obsoletes: %{name}-lang-pt_BR < %{version}-%{release}
 Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
 
+# 5.18.0 tarball busted?, temporary 
+#BuildRequires: automake
+BuildRequires: desktop-file-utils
 BuildRequires: time
 # texi2dvi
 %if 0%{?fedora} > 5 || 0%{?rhel} > 4
@@ -103,7 +103,6 @@
 BuildRequires: texinfo
 %endif
 BuildRequires: tetex-latex
-BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
 
@@ -175,13 +174,6 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if 0
-#if 0%{?fedora} > 4 || 0%{?rhel} > 4
-# See http://bugzilla.redhat.com/187647
-%define setarch_hack 1
-BuildRequires: setarch
-Requires:  setarch
-%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 Provides:  %{name}-runtime-gcl = %{version}-%{release}
@@ -214,10 +206,6 @@
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%if 0%{?setarch_hack} == 1
-%patch6 -p1 -b .gcl-setarch
-%endif
-
 sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
@@ -244,18 +232,14 @@
 make %{?_smp_mflags}
 
 # docs
-pushd doc
-
- install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
+install -D -p -m644 %{SOURCE11} doc/maximabook/maxima.pdf
 
-# pushd info
+# pushd doc/info
 #  texi2dvi --pdf maxima.texi
 # popd
 
- pushd intromax
-  pdflatex intromax.ltx
- popd
-
+pushd doc/intromax
+ pdflatex intromax.ltx
 popd
 
 
@@ -441,6 +425,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.0-1
+- maxima-5.18.0
+
 * Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-7
 - respin (sbcl)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	17 Dec 2008 16:39:57 -0000	1.27
+++ sources	17 Apr 2009 15:16:42 -0000	1.28
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-f49e7b978061a63423b0d486240d281e  maxima-5.17.1.tar.gz
+a35b0b43cc981267925132696863b96d  maxima-5.18.0.tar.gz


--- maxima-5.9.4-gcl_setarch.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Apr 17 15:24:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 15:24:45 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch,1.90,1.91
Message-ID: <20090417152446.3880C7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30248

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-7
- Turn off nsplugin transition
- Remove Konsole leaked file descriptors for release


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- policy-20090105.patch	17 Apr 2009 15:14:42 -0000	1.90
+++ policy-20090105.patch	17 Apr 2009 15:24:42 -0000	1.91
@@ -22980,7 +22980,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-17 11:23:07.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23191,7 +23191,7 @@
  ')
  
  optional_policy(`
-@@ -198,5 +271,78 @@
+@@ -198,5 +271,80 @@
  ')
  
  optional_policy(`
@@ -23227,6 +23227,8 @@
 +
 +list_dirs_pattern(svirt_t, virt_content_t, virt_content_t)
 +read_files_pattern(svirt_t, virt_content_t, virt_content_t)
++dontaudit svirt_t virt_content_t:file write_file_perms;
++dontaudit svirt_t virt_content_t:dir write_dir_perms;
 +
 +storage_raw_write_removable_device(svirt_t)
 +storage_raw_read_removable_device(svirt_t)



From dwalsh at fedoraproject.org  Fri Apr 17 15:25:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 15:25:01 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.48,
	1.49 libsemanage.spec, 1.175, 1.176
Message-ID: <20090417152501.615427012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30442

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-5
- Return error on invalid file


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libsemanage-rhat.patch	11 Mar 2009 19:38:20 -0000	1.48
+++ libsemanage-rhat.patch	17 Apr 2009 15:24:59 -0000	1.49
@@ -1,6 +1,63 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.31/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2009-01-13 08:45:35.000000000 -0500
++++ libsemanage-2.0.31/src/direct_api.c	2009-04-09 11:49:42.000000000 -0400
+@@ -991,7 +991,7 @@
+ 
+ 	int retval = -1;
+ 	char *data = NULL;
+-	size_t data_len = 0;
++	ssize_t data_len = 0;
+ 	int compressed = 0;
+ 	int in_fd = -1;
+ 
+@@ -999,7 +999,7 @@
+ 		return -1;
+ 	}
+ 
+-	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
++	if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
+ 		goto cleanup;
+ 	}
+ 		
+@@ -1117,7 +1117,7 @@
+ {
+ 	int retval = -1;
+ 	char *data = NULL;
+-	size_t data_len = 0;
++	ssize_t data_len = 0;
+ 	int compressed = 0;
+ 	int in_fd = -1;
+ 
+@@ -1125,7 +1125,7 @@
+ 		return -1;
+ 	}
+ 
+-	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
++	if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
+ 		goto cleanup;
+ 	}
+ 
+@@ -1187,7 +1187,7 @@
+ {
+ 	int retval = -1;
+ 	char *data = NULL;
+-	size_t data_len = 0;
++	ssize_t data_len = 0;
+ 	int compressed = 0;
+ 	int in_fd;
+ 
+@@ -1195,7 +1195,7 @@
+ 		return -1;
+ 	}
+ 
+-	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
++	if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
+ 		goto cleanup;
+ 	}
+ 		
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.31/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.31/src/genhomedircon.c	2009-03-11 15:36:08.000000000 -0400
++++ libsemanage-2.0.31/src/genhomedircon.c	2009-03-26 14:55:01.000000000 -0400
 @@ -794,6 +794,12 @@
  			 * /root */
  			continue;
@@ -16,7 +73,7 @@
  			*errors = STATUS_ERR;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.31/src/handle.c
 --- nsalibsemanage/src/handle.c	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.31/src/handle.c	2009-03-11 15:36:26.000000000 -0400
++++ libsemanage-2.0.31/src/handle.c	2009-03-26 14:55:01.000000000 -0400
 @@ -264,7 +264,7 @@
  	assert(sh != NULL && sh->funcs != NULL && sh->funcs->commit != NULL);
  	if (!sh->is_in_transaction) {
@@ -28,7 +85,7 @@
  	retval = sh->funcs->commit(sh);
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.31/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.31/src/semanage.conf	2009-03-11 15:36:08.000000000 -0400
++++ libsemanage-2.0.31/src/semanage.conf	2009-03-26 14:55:01.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
@@ -37,7 +94,7 @@
 +expand-check=0
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.31/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.31/src/semanage_store.c	2009-03-11 15:36:08.000000000 -0400
++++ libsemanage-2.0.31/src/semanage_store.c	2009-03-26 14:55:01.000000000 -0400
 @@ -440,8 +440,6 @@
  	char tmp[PATH_MAX];
  	char buf[4192];


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- libsemanage.spec	11 Mar 2009 19:38:20 -0000	1.175
+++ libsemanage.spec	17 Apr 2009 15:25:00 -0000	1.176
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.31
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-5
+- Return error on invalid file
+
 * Wed Mar 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
 - Fix typo
 



From dwalsh at fedoraproject.org  Fri Apr 17 15:25:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 15:25:44 +0000 (UTC)
Subject: rpms/libsemanage/F-11 libsemanage-rhat.patch, 1.48,
	1.49 libsemanage.spec, 1.175, 1.176
Message-ID: <20090417152544.032BC7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30594

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-5
- Return error on invalid file


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/F-11/libsemanage-rhat.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libsemanage-rhat.patch	11 Mar 2009 19:38:20 -0000	1.48
+++ libsemanage-rhat.patch	17 Apr 2009 15:25:13 -0000	1.49
@@ -1,6 +1,63 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.31/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2009-01-13 08:45:35.000000000 -0500
++++ libsemanage-2.0.31/src/direct_api.c	2009-04-09 11:49:42.000000000 -0400
+@@ -991,7 +991,7 @@
+ 
+ 	int retval = -1;
+ 	char *data = NULL;
+-	size_t data_len = 0;
++	ssize_t data_len = 0;
+ 	int compressed = 0;
+ 	int in_fd = -1;
+ 
+@@ -999,7 +999,7 @@
+ 		return -1;
+ 	}
+ 
+-	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
++	if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
+ 		goto cleanup;
+ 	}
+ 		
+@@ -1117,7 +1117,7 @@
+ {
+ 	int retval = -1;
+ 	char *data = NULL;
+-	size_t data_len = 0;
++	ssize_t data_len = 0;
+ 	int compressed = 0;
+ 	int in_fd = -1;
+ 
+@@ -1125,7 +1125,7 @@
+ 		return -1;
+ 	}
+ 
+-	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
++	if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
+ 		goto cleanup;
+ 	}
+ 
+@@ -1187,7 +1187,7 @@
+ {
+ 	int retval = -1;
+ 	char *data = NULL;
+-	size_t data_len = 0;
++	ssize_t data_len = 0;
+ 	int compressed = 0;
+ 	int in_fd;
+ 
+@@ -1195,7 +1195,7 @@
+ 		return -1;
+ 	}
+ 
+-	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
++	if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
+ 		goto cleanup;
+ 	}
+ 		
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.31/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.31/src/genhomedircon.c	2009-03-11 15:36:08.000000000 -0400
++++ libsemanage-2.0.31/src/genhomedircon.c	2009-03-26 14:55:01.000000000 -0400
 @@ -794,6 +794,12 @@
  			 * /root */
  			continue;
@@ -16,7 +73,7 @@
  			*errors = STATUS_ERR;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.31/src/handle.c
 --- nsalibsemanage/src/handle.c	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.31/src/handle.c	2009-03-11 15:36:26.000000000 -0400
++++ libsemanage-2.0.31/src/handle.c	2009-03-26 14:55:01.000000000 -0400
 @@ -264,7 +264,7 @@
  	assert(sh != NULL && sh->funcs != NULL && sh->funcs->commit != NULL);
  	if (!sh->is_in_transaction) {
@@ -28,7 +85,7 @@
  	retval = sh->funcs->commit(sh);
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.31/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.31/src/semanage.conf	2009-03-11 15:36:08.000000000 -0400
++++ libsemanage-2.0.31/src/semanage.conf	2009-03-26 14:55:01.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
@@ -37,7 +94,7 @@
 +expand-check=0
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.31/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.31/src/semanage_store.c	2009-03-11 15:36:08.000000000 -0400
++++ libsemanage-2.0.31/src/semanage_store.c	2009-03-26 14:55:01.000000000 -0400
 @@ -440,8 +440,6 @@
  	char tmp[PATH_MAX];
  	char buf[4192];


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/F-11/libsemanage.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- libsemanage.spec	11 Mar 2009 19:38:20 -0000	1.175
+++ libsemanage.spec	17 Apr 2009 15:25:13 -0000	1.176
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.31
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Thu Apr 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-5
+- Return error on invalid file
+
 * Wed Mar 11 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
 - Fix typo
 



From dwalsh at fedoraproject.org  Fri Apr 17 15:33:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 17 Apr 2009 15:33:54 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch,1.91,1.92
Message-ID: <20090417153354.A9A1D7012B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32245

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-7
- Turn off nsplugin transition
- Remove Konsole leaked file descriptors for release


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- policy-20090105.patch	17 Apr 2009 15:24:42 -0000	1.91
+++ policy-20090105.patch	17 Apr 2009 15:33:53 -0000	1.92
@@ -22980,7 +22980,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-17 11:23:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-17 11:32:56.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23228,7 +23228,7 @@
 +list_dirs_pattern(svirt_t, virt_content_t, virt_content_t)
 +read_files_pattern(svirt_t, virt_content_t, virt_content_t)
 +dontaudit svirt_t virt_content_t:file write_file_perms;
-+dontaudit svirt_t virt_content_t:dir write_dir_perms;
++dontaudit svirt_t virt_content_t:dir write;
 +
 +storage_raw_write_removable_device(svirt_t)
 +storage_raw_read_removable_device(svirt_t)



From hadess at fedoraproject.org  Fri Apr 17 15:45:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 17 Apr 2009 15:45:09 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.19,
	1.20 nautilus-sendto.spec, 1.67, 1.68 sources, 1.19, 1.20
Message-ID: <20090417154509.38B1A7012B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv930

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-1
- Update to 1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	3 Apr 2009 12:38:07 -0000	1.19
+++ .cvsignore	17 Apr 2009 15:44:38 -0000	1.20
@@ -1 +1 @@
-nautilus-sendto-1.1.3.tar.bz2
+nautilus-sendto-1.1.4.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- nautilus-sendto.spec	3 Apr 2009 12:38:07 -0000	1.67
+++ nautilus-sendto.spec	17 Apr 2009 15:44:38 -0000	1.68
@@ -1,5 +1,5 @@
 Name:           nautilus-sendto
-Version:        1.1.3
+Version:        1.1.4
 Release: 	1%{?dist}
 Summary:        Nautilus context menu for sending files
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-1
+- Update to 1.1.4
+
 * Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.3-1
 - Update to 1.1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	3 Apr 2009 12:38:07 -0000	1.19
+++ sources	17 Apr 2009 15:44:38 -0000	1.20
@@ -1 +1 @@
-1a3a983b72cbb63170ccb989440a40c0  nautilus-sendto-1.1.3.tar.bz2
+fd9c8e4bf61b51b9a84578e327154bc5  nautilus-sendto-1.1.4.tar.bz2



From hadess at fedoraproject.org  Fri Apr 17 15:47:25 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 17 Apr 2009 15:47:25 +0000 (UTC)
Subject: rpms/nautilus-sendto/F-11 .cvsignore, 1.19,
	1.20 nautilus-sendto.spec, 1.67, 1.68 sources, 1.19, 1.20
Message-ID: <20090417154725.6B92B7012B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1272

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-1
- Update to 1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	3 Apr 2009 12:38:07 -0000	1.19
+++ .cvsignore	17 Apr 2009 15:46:53 -0000	1.20
@@ -1 +1 @@
-nautilus-sendto-1.1.3.tar.bz2
+nautilus-sendto-1.1.4.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/nautilus-sendto.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- nautilus-sendto.spec	3 Apr 2009 12:38:07 -0000	1.67
+++ nautilus-sendto.spec	17 Apr 2009 15:46:53 -0000	1.68
@@ -1,5 +1,5 @@
 Name:           nautilus-sendto
-Version:        1.1.3
+Version:        1.1.4
 Release: 	1%{?dist}
 Summary:        Nautilus context menu for sending files
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-1
+- Update to 1.1.4
+
 * Fri Apr 03 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.3-1
 - Update to 1.1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	3 Apr 2009 12:38:07 -0000	1.19
+++ sources	17 Apr 2009 15:46:53 -0000	1.20
@@ -1 +1 @@
-1a3a983b72cbb63170ccb989440a40c0  nautilus-sendto-1.1.3.tar.bz2
+fd9c8e4bf61b51b9a84578e327154bc5  nautilus-sendto-1.1.4.tar.bz2



From mcpierce at fedoraproject.org  Fri Apr 17 16:02:38 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Fri, 17 Apr 2009 16:02:38 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-10 .cvsignore, 1.13, 1.14 rubygem-hoe.spec, 1.16,
	1.17 sources, 1.13, 1.14
Message-ID: <20090417160238.8AA9F7012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3284

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.2 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Apr 2009 16:33:43 -0000	1.13
+++ .cvsignore	17 Apr 2009 16:02:07 -0000	1.14
@@ -1 +1 @@
-hoe-1.12.1.gem
+hoe-1.12.2.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/rubygem-hoe.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rubygem-hoe.spec	1 Apr 2009 16:33:43 -0000	1.16
+++ rubygem-hoe.spec	17 Apr 2009 16:02:08 -0000	1.17
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.12.1
+Version:    	1.12.2
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.2-1
+- Release 1.12.2 of Hoe.
+
 * Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
 - Release 1.12.1 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Apr 2009 16:33:43 -0000	1.13
+++ sources	17 Apr 2009 16:02:08 -0000	1.14
@@ -1 +1 @@
-c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem
+1eaf332968a2cde8393f26792f3f758e  hoe-1.12.2.gem



From tmraz at fedoraproject.org  Fri Apr 17 16:05:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 17 Apr 2009 16:05:22 +0000 (UTC)
Subject: rpms/openssl/F-11 openssl-0.9.8k-shlib-version.patch, NONE,
	1.1 openssl.spec, 1.126,
	1.127 openssl-0.9.8j-shlib-version.patch, 1.1, NONE
Message-ID: <20090417160522.A5DD07012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4345

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8k-shlib-version.patch 
Removed Files:
	openssl-0.9.8j-shlib-version.patch 
Log Message:
* Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
- update the SHLIB_VERSION to 0.9.8k


openssl-0.9.8k-shlib-version.patch:

--- NEW FILE openssl-0.9.8k-shlib-version.patch ---
diff -up openssl-0.9.8k/crypto/opensslv.h.shlib-version openssl-0.9.8k/crypto/opensslv.h
--- openssl-0.9.8k/crypto/opensslv.h.shlib-version	2009-04-17 16:39:45.000000000 +0200
+++ openssl-0.9.8k/crypto/opensslv.h	2009-04-17 16:39:46.000000000 +0200
@@ -83,7 +83,7 @@
  * should only keep the versions that are binary compatible with the current.
  */
 #define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "0.9.8"
+#define SHLIB_VERSION_NUMBER "0.9.8k"
 
 
 #endif /* HEADER_OPENSSLV_H */


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-11/openssl.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- openssl.spec	25 Mar 2009 21:12:41 -0000	1.126
+++ openssl.spec	17 Apr 2009 16:04:52 -0000	1.127
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8k
-Release: 1%{?dist}
+Release: 2%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -41,7 +41,7 @@
 Patch4: openssl-0.9.8j-enginesdir.patch
 Patch5: openssl-0.9.8a-no-rpath.patch
 Patch6: openssl-0.9.8b-test-use-localhost.patch
-Patch7: openssl-0.9.8j-shlib-version.patch
+Patch7: openssl-0.9.8k-shlib-version.patch
 # Bug fixes
 Patch21: openssl-0.9.8b-aliasing-bug.patch
 Patch22: openssl-0.9.8k-x509-name-cmp.patch
@@ -408,6 +408,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
+- update the SHLIB_VERSION to 0.9.8k
+
 * Thu Mar 25 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-1
 - update to new upstream release (minor bug fixes, security
   fixes and machine code optimizations only)


--- openssl-0.9.8j-shlib-version.patch DELETED ---



From tmraz at fedoraproject.org  Fri Apr 17 16:14:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 17 Apr 2009 16:14:22 +0000 (UTC)
Subject: rpms/openssl/devel openssl-0.9.8k-shlib-version.patch, NONE,
	1.1 openssl.spec, 1.127,
	1.128 openssl-0.9.8j-shlib-version.patch, 1.1, NONE
Message-ID: <20090417161422.507EC7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5528

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8k-shlib-version.patch 
Removed Files:
	openssl-0.9.8j-shlib-version.patch 
Log Message:
* Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-3
- correct the SHLIB_VERSION define


openssl-0.9.8k-shlib-version.patch:

--- NEW FILE openssl-0.9.8k-shlib-version.patch ---
diff -up openssl-0.9.8k/crypto/opensslv.h.shlib-version openssl-0.9.8k/crypto/opensslv.h
--- openssl-0.9.8k/crypto/opensslv.h.shlib-version	2009-04-17 16:39:45.000000000 +0200
+++ openssl-0.9.8k/crypto/opensslv.h	2009-04-17 16:39:46.000000000 +0200
@@ -83,7 +83,7 @@
  * should only keep the versions that are binary compatible with the current.
  */
 #define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "0.9.8"
+#define SHLIB_VERSION_NUMBER "0.9.8k"
 
 
 #endif /* HEADER_OPENSSLV_H */


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- openssl.spec	15 Apr 2009 14:36:54 -0000	1.127
+++ openssl.spec	17 Apr 2009 16:13:51 -0000	1.128
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8k
-Release: 2%{?dist}
+Release: 3%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -41,7 +41,7 @@
 Patch4: openssl-0.9.8j-enginesdir.patch
 Patch5: openssl-0.9.8a-no-rpath.patch
 Patch6: openssl-0.9.8b-test-use-localhost.patch
-Patch7: openssl-0.9.8j-shlib-version.patch
+Patch7: openssl-0.9.8k-shlib-version.patch
 # Bug fixes
 Patch21: openssl-0.9.8b-aliasing-bug.patch
 Patch22: openssl-0.9.8k-x509-name-cmp.patch
@@ -408,6 +408,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-3
+- correct the SHLIB_VERSION define
+
 * Wed Apr 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
 - add support for multiple CRLs with same subject
 - load only dynamic engine support in FIPS mode


--- openssl-0.9.8j-shlib-version.patch DELETED ---



From tmraz at fedoraproject.org  Fri Apr 17 16:15:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 17 Apr 2009 16:15:54 +0000 (UTC)
Subject: rpms/openssl/F-11 openssl-0.9.8k-kernel-fipsmode.patch, NONE,
	1.1 openssl-0.9.8k-multi-crl.patch, NONE, 1.1 openssl.spec,
	1.127, 1.128 openssl-0.9.8j-evp-nonfips.patch, 1.1,
	NONE openssl-0.9.8j-kernel-fipsmode.patch, 1.1, NONE
Message-ID: <20090417161554.7C0477012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5776

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8k-kernel-fipsmode.patch 
	openssl-0.9.8k-multi-crl.patch 
Removed Files:
	openssl-0.9.8j-evp-nonfips.patch 
	openssl-0.9.8j-kernel-fipsmode.patch 
Log Message:
- sync with devel


openssl-0.9.8k-kernel-fipsmode.patch:

--- NEW FILE openssl-0.9.8k-kernel-fipsmode.patch ---
diff -up openssl-0.9.8k/crypto/engine/eng_all.c.fipsmode openssl-0.9.8k/crypto/engine/eng_all.c
--- openssl-0.9.8k/crypto/engine/eng_all.c.fipsmode	2008-06-04 20:01:39.000000000 +0200
+++ openssl-0.9.8k/crypto/engine/eng_all.c	2009-04-15 14:31:32.000000000 +0200
@@ -58,9 +58,23 @@
 
 #include "cryptlib.h"
 #include "eng_int.h"
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 void ENGINE_load_builtin_engines(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if (FIPS_mode()) {
+		/* We allow loading dynamic engine as a third party
+		   engine might be FIPS validated.
+		   User is disallowed to load non-validated engines
+		   by security policy. */
+		ENGINE_load_dynamic();
+		return;
+	}
+#endif
 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
 	 * it is the *only* way for standard builtin implementations to be be
 	 * accessed (ie. it would be possible to statically link binaries with
diff -up openssl-0.9.8k/crypto/evp/c_allc.c.fipsmode openssl-0.9.8k/crypto/evp/c_allc.c
--- openssl-0.9.8k/crypto/evp/c_allc.c.fipsmode	2007-04-24 01:50:04.000000000 +0200
+++ openssl-0.9.8k/crypto/evp/c_allc.c	2009-03-26 15:53:42.000000000 +0100
@@ -65,6 +65,11 @@
 void OpenSSL_add_all_ciphers(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if(!FIPS_mode()) 
+		{
+#endif
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cfb());
 	EVP_add_cipher(EVP_des_cfb1());
@@ -219,6 +224,63 @@ void OpenSSL_add_all_ciphers(void)
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede_cfb());
+	EVP_add_cipher(EVP_des_ede3_cfb());
+
+	EVP_add_cipher(EVP_des_ede_ofb());
+	EVP_add_cipher(EVP_des_ede3_ofb());
+
+	EVP_add_cipher(EVP_des_ede_cbc());
+	EVP_add_cipher(EVP_des_ede3_cbc());
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
+
+	EVP_add_cipher(EVP_des_ede());
+	EVP_add_cipher(EVP_des_ede3());
+#endif
+
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_ecb());
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_128_cfb());
+	EVP_add_cipher(EVP_aes_128_cfb1());
+	EVP_add_cipher(EVP_aes_128_cfb8());
+	EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_128_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
+	EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
+	EVP_add_cipher(EVP_aes_192_ecb());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_192_cfb());
+	EVP_add_cipher(EVP_aes_192_cfb1());
+	EVP_add_cipher(EVP_aes_192_cfb8());
+	EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_192_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
+	EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
+	EVP_add_cipher(EVP_aes_256_ecb());
+	EVP_add_cipher(EVP_aes_256_cbc());
+	EVP_add_cipher(EVP_aes_256_cfb());
+	EVP_add_cipher(EVP_aes_256_cfb1());
+	EVP_add_cipher(EVP_aes_256_cfb8());
+	EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_256_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#endif
+		}
+#endif
 
 	PKCS12_PBE_add();
 	PKCS5_PBE_add();
diff -up openssl-0.9.8k/crypto/evp/c_alld.c.fipsmode openssl-0.9.8k/crypto/evp/c_alld.c
--- openssl-0.9.8k/crypto/evp/c_alld.c.fipsmode	2005-04-30 23:51:40.000000000 +0200
+++ openssl-0.9.8k/crypto/evp/c_alld.c	2009-03-26 15:53:42.000000000 +0100
@@ -64,6 +64,11 @@
 
 void OpenSSL_add_all_digests(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if (!FIPS_mode())
+		{
+#endif
 #ifndef OPENSSL_NO_MD2
 	EVP_add_digest(EVP_md2());
 #endif
@@ -111,4 +116,32 @@ void OpenSSL_add_all_digests(void)
 	EVP_add_digest(EVP_sha384());
 	EVP_add_digest(EVP_sha512());
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_SHA
+	EVP_add_digest(EVP_sha1());
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#ifndef OPENSSL_NO_DSA
+	EVP_add_digest(EVP_dss1());
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+#endif
+#ifndef OPENSSL_NO_SHA256
+	EVP_add_digest(EVP_sha224());
+	EVP_add_digest(EVP_sha256());
+#endif
+#ifndef OPENSSL_NO_SHA512
+	EVP_add_digest(EVP_sha384());
+	EVP_add_digest(EVP_sha512());
+#endif
+		}
+#endif
 	}
diff -up openssl-0.9.8k/crypto/o_init.c.fipsmode openssl-0.9.8k/crypto/o_init.c
--- openssl-0.9.8k/crypto/o_init.c.fipsmode	2008-11-05 19:36:36.000000000 +0100
+++ openssl-0.9.8k/crypto/o_init.c	2009-03-26 15:53:42.000000000 +0100
@@ -59,6 +59,45 @@
 #include <e_os.h>
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <openssl/fips.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+
+#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
+
+static void init_fips_mode(void)
+	{
+	char buf[2] = "0";
+	int fd;
+	
+	if (getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
+		{
+		buf[0] = '1';
+		}
+	else if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0)
+		{
+		while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR);
+		close(fd);
+		}
+	/* Failure reading the fips mode switch file means just not
+	 * switching into FIPS mode. We would break too many things
+	 * otherwise. 
+	 */
+	
+	if (buf[0] == '1')
+		{
+		FIPS_mode_set(1);
+		}
+	}
+#endif
+
 /* Perform any essential OpenSSL initialization operations.
  * Currently only sets FIPS callbacks
  */
@@ -73,11 +112,10 @@ void OPENSSL_init(void)
 #ifdef CRYPTO_MDEBUG
 		CRYPTO_malloc_debug_init();
 #endif
-#ifdef OPENSSL_ENGINE
+		init_fips_mode();
 		int_EVP_MD_init_engine_callbacks();
 		int_EVP_CIPHER_init_engine_callbacks();
 		int_RAND_init_engine_callbacks();
-#endif
 		done = 1;
 		}
 #endif
diff -up openssl-0.9.8k/ssl/ssl_algs.c.fipsmode openssl-0.9.8k/ssl/ssl_algs.c
--- openssl-0.9.8k/ssl/ssl_algs.c.fipsmode	2007-04-24 01:50:21.000000000 +0200
+++ openssl-0.9.8k/ssl/ssl_algs.c	2009-04-15 14:32:13.000000000 +0200
@@ -64,6 +64,10 @@
 int SSL_library_init(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+#endif
+
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cbc());
 	EVP_add_cipher(EVP_des_ede3_cbc());

openssl-0.9.8k-multi-crl.patch:

--- NEW FILE openssl-0.9.8k-multi-crl.patch ---
diff -up openssl-0.9.8k/crypto/x509/x509_lu.c.multi-crl openssl-0.9.8k/crypto/x509/x509_lu.c
--- openssl-0.9.8k/crypto/x509/x509_lu.c.multi-crl	2005-05-11 05:45:35.000000000 +0200
+++ openssl-0.9.8k/crypto/x509/x509_lu.c	2009-03-26 15:47:45.000000000 +0100
@@ -453,19 +453,41 @@ X509_OBJECT *X509_OBJECT_retrieve_by_sub
 	return sk_X509_OBJECT_value(h, idx);
 }
 
+static int x509_crl_match(const X509_CRL *a, const X509_CRL *b)
+{
+	if (a->signature == NULL || b->signature == NULL)
+		return a->signature != b->signature;
+
+	if (a->signature->length != b->signature->length)
+		return 0;
+
+	return memcmp(a->signature->data, b->signature->data, a->signature->length);
+}
+
 X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x)
 {
 	int idx, i;
 	X509_OBJECT *obj;
 	idx = sk_X509_OBJECT_find(h, x);
 	if (idx == -1) return NULL;
-	if (x->type != X509_LU_X509) return sk_X509_OBJECT_value(h, idx);
+	if ((x->type != X509_LU_X509) && (x->type != X509_LU_CRL))
+		return sk_X509_OBJECT_value(h, idx);
 	for (i = idx; i < sk_X509_OBJECT_num(h); i++)
 		{
 		obj = sk_X509_OBJECT_value(h, i);
 		if (x509_object_cmp((const X509_OBJECT **)&obj, (const X509_OBJECT **)&x))
 			return NULL;
-		if ((x->type != X509_LU_X509) || !X509_cmp(obj->data.x509, x->data.x509))
+		if (x->type == X509_LU_X509)
+			{
+			if (!X509_cmp(obj->data.x509, x->data.x509))
+				return obj;
+			}
+		else if (x->type == X509_LU_CRL)
+			{
+			if (!x509_crl_match(obj->data.crl, x->data.crl))
+				return obj;
+			}
+		else
 			return obj;
 		}
 	return NULL;
diff -up openssl-0.9.8k/crypto/x509/x509_vfy.c.multi-crl openssl-0.9.8k/crypto/x509/x509_vfy.c
--- openssl-0.9.8k/crypto/x509/x509_vfy.c.multi-crl	2008-07-13 16:33:15.000000000 +0200
+++ openssl-0.9.8k/crypto/x509/x509_vfy.c	2009-03-26 15:47:45.000000000 +0100
@@ -725,7 +725,38 @@ static int get_crl(X509_STORE_CTX *ctx, 
 		return 0;
 		}
 
-	*pcrl = xobj.data.crl;
+	/* If CRL times not valid look through store */
+	if (!check_crl_time(ctx, xobj.data.crl, 0))
+		{
+		int idx, i;
+		X509_OBJECT *pobj;
+		X509_OBJECT_free_contents(&xobj);
+		idx = X509_OBJECT_idx_by_subject(ctx->ctx->objs,
+							X509_LU_CRL, nm);
+		if (idx == -1)
+			return 0;
+		*pcrl = NULL;
+		for (i = idx; i < sk_X509_OBJECT_num(ctx->ctx->objs); i++)
+			{
+			pobj = sk_X509_OBJECT_value(ctx->ctx->objs, i);
+			/* Check to see if it is a CRL and issuer matches */
+			if (pobj->type != X509_LU_CRL)
+				break;
+			if (X509_NAME_cmp(nm,
+					X509_CRL_get_issuer(pobj->data.crl)))
+				break;
+			/* Set *pcrl because the CRL will either be valid or
+			 * a "best fit" CRL.
+			 */
+			*pcrl = pobj->data.crl;
+			if (check_crl_time(ctx, *pcrl, 0))
+				break;
+			}
+		if (*pcrl)
+			CRYPTO_add(&(*pcrl)->references, 1, CRYPTO_LOCK_X509);
+		}
+	else 
+		*pcrl = xobj.data.crl;
 	if (crl)
 		X509_CRL_free(crl);
 	return 1;


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-11/openssl.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- openssl.spec	17 Apr 2009 16:04:52 -0000	1.127
+++ openssl.spec	17 Apr 2009 16:15:24 -0000	1.128
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8k
-Release: 2%{?dist}
+Release: 3%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -57,14 +57,14 @@
 Patch40: openssl-0.9.8j-nocanister.patch
 Patch41: openssl-0.9.8k-use-fipscheck.patch
 Patch42: openssl-0.9.8k-fipscheck-hmac.patch
-Patch43: openssl-0.9.8j-evp-nonfips.patch
-Patch44: openssl-0.9.8j-kernel-fipsmode.patch
+Patch44: openssl-0.9.8k-kernel-fipsmode.patch
 Patch45: openssl-0.9.8j-env-nozlib.patch
 Patch46: openssl-0.9.8j-eap-fast.patch
 Patch47: openssl-0.9.8j-readme-warning.patch
 Patch48: openssl-0.9.8j-bad-mime.patch
 Patch49: openssl-0.9.8j-fips-no-pairwise.patch
 Patch50: openssl-0.9.8j-fips-rng-seed.patch
+Patch51: openssl-0.9.8k-multi-crl.patch
 # Backported fixes including security fixes
 
 License: OpenSSL
@@ -142,7 +142,6 @@
 %patch40 -p1 -b .nocanister
 %patch41 -p1 -b .use-fipscheck
 %patch42 -p1 -b .fipscheck-hmac
-%patch43 -p1 -b .evp-nonfips
 %patch44 -p1 -b .fipsmode
 %patch45 -p1 -b .env-nozlib
 %patch46 -p1 -b .eap-fast
@@ -150,6 +149,7 @@
 %patch48 -p1 -b .bad-mime
 %patch49 -p1 -b .no-pairwise
 %patch50 -p1 -b .rng-seed
+%patch51 -p1 -b .multi-crl
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -408,8 +408,12 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
-- update the SHLIB_VERSION to 0.9.8k
+* Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-3
+- correct the SHLIB_VERSION define
+
+* Wed Apr 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-2
+- add support for multiple CRLs with same subject
+- load only dynamic engine support in FIPS mode
 
 * Thu Mar 25 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-1
 - update to new upstream release (minor bug fixes, security


--- openssl-0.9.8j-evp-nonfips.patch DELETED ---


--- openssl-0.9.8j-kernel-fipsmode.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:21:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:21:31 +0000
Subject: [pkgdb] gpscorrelate was added for till
Message-ID: <20090417162131.AD3D210F80C@bastion2.fedora.phx.redhat.com>

kevin has added Package gpscorrelate with summary A GPS photo correlation / geotagging tool
kevin has approved Package gpscorrelate
kevin has added a Fedora devel branch for gpscorrelate with an owner of till
kevin has approved gpscorrelate in Fedora devel
kevin has approved Package gpscorrelate
kevin has set commit to Approved for provenpackager on gpscorrelate (Fedora devel)
kevin has set build to Approved for provenpackager on gpscorrelate (Fedora devel)
kevin has set checkout to Approved for provenpackager on gpscorrelate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpscorrelate



From pkgdb at fedoraproject.org  Fri Apr 17 16:22:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:22:50 +0000
Subject: [pkgdb] gpscorrelate (Fedora, 10) updated by kevin
Message-ID: <20090417162250.3A14210F85A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gpscorrelate
kevin has set commit to Approved for provenpackager on gpscorrelate (Fedora 10)
kevin has set build to Approved for provenpackager on gpscorrelate (Fedora 10)
kevin has set checkout to Approved for provenpackager on gpscorrelate (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpscorrelate



From pkgdb at fedoraproject.org  Fri Apr 17 16:22:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:22:50 +0000
Subject: [pkgdb] gpscorrelate (Fedora, 9) updated by kevin
Message-ID: <20090417162250.508E110F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gpscorrelate
kevin has set commit to Approved for provenpackager on gpscorrelate (Fedora 9)
kevin has set build to Approved for provenpackager on gpscorrelate (Fedora 9)
kevin has set checkout to Approved for provenpackager on gpscorrelate (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpscorrelate



From pkgdb at fedoraproject.org  Fri Apr 17 16:22:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:22:50 +0000
Subject: [pkgdb] gpscorrelate (Fedora, 11) updated by kevin
Message-ID: <20090417162250.5704010F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gpscorrelate
kevin has set commit to Approved for provenpackager on gpscorrelate (Fedora 11)
kevin has set build to Approved for provenpackager on gpscorrelate (Fedora 11)
kevin has set checkout to Approved for provenpackager on gpscorrelate (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpscorrelate



From kevin at fedoraproject.org  Fri Apr 17 16:23:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:23:13 +0000 (UTC)
Subject: rpms/gpscorrelate/devel - New directory
Message-ID: <20090417162313.8CA6770137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpscorrelate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfu6698/rpms/gpscorrelate/devel

Log Message:
Directory /cvs/pkgs/rpms/gpscorrelate/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:23:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:23:13 +0000 (UTC)
Subject: rpms/gpscorrelate - New directory
Message-ID: <20090417162313.3F8137012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpscorrelate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfu6698/rpms/gpscorrelate

Log Message:
Directory /cvs/pkgs/rpms/gpscorrelate added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:23:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:23:24 +0000 (UTC)
Subject: rpms/gpscorrelate Makefile,NONE,1.1
Message-ID: <20090417162324.DF2DF7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpscorrelate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfu6698/rpms/gpscorrelate

Added Files:
	Makefile 
Log Message:
Setup of module gpscorrelate


--- NEW FILE Makefile ---
# Top level Makefile for module gpscorrelate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:23:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:23:25 +0000 (UTC)
Subject: rpms/gpscorrelate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417162325.3666C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gpscorrelate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfu6698/rpms/gpscorrelate/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpscorrelate


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gpscorrelate
# $Id: Makefile,v 1.1 2009/04/17 16:23:25 kevin Exp $
NAME := gpscorrelate
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:23:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:23:44 +0000
Subject: [pkgdb] libgarmin was added for fab
Message-ID: <20090417162344.0878310F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package libgarmin with summary C library to parse and use Garmin image files
kevin has approved Package libgarmin
kevin has added a Fedora devel branch for libgarmin with an owner of fab
kevin has approved libgarmin in Fedora devel
kevin has approved Package libgarmin
kevin has set commit to Approved for provenpackager on libgarmin (Fedora devel)
kevin has set build to Approved for provenpackager on libgarmin (Fedora devel)
kevin has set checkout to Approved for provenpackager on libgarmin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgarmin



From pkgdb at fedoraproject.org  Fri Apr 17 16:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:23:48 +0000
Subject: [pkgdb] libgarmin (Fedora, 10) updated by kevin
Message-ID: <20090417162348.AFB3B10F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libgarmin
kevin has set commit to Approved for provenpackager on libgarmin (Fedora 10)
kevin has set build to Approved for provenpackager on libgarmin (Fedora 10)
kevin has set checkout to Approved for provenpackager on libgarmin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgarmin



From kevin at fedoraproject.org  Fri Apr 17 16:24:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:24:09 +0000 (UTC)
Subject: rpms/libgarmin - New directory
Message-ID: <20090417162409.6C8EA7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgarmin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsln6975/rpms/libgarmin

Log Message:
Directory /cvs/pkgs/rpms/libgarmin added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 16:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:23:48 +0000
Subject: [pkgdb] libgarmin (Fedora, 9) updated by kevin
Message-ID: <20090417162348.B888D10F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libgarmin
kevin has set commit to Approved for provenpackager on libgarmin (Fedora 9)
kevin has set build to Approved for provenpackager on libgarmin (Fedora 9)
kevin has set checkout to Approved for provenpackager on libgarmin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgarmin



From pkgdb at fedoraproject.org  Fri Apr 17 16:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:23:48 +0000
Subject: [pkgdb] libgarmin (Fedora, 11) updated by kevin
Message-ID: <20090417162348.C70A810F889@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libgarmin
kevin has set commit to Approved for provenpackager on libgarmin (Fedora 11)
kevin has set build to Approved for provenpackager on libgarmin (Fedora 11)
kevin has set checkout to Approved for provenpackager on libgarmin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgarmin



From kevin at fedoraproject.org  Fri Apr 17 16:24:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:24:09 +0000 (UTC)
Subject: rpms/libgarmin/devel - New directory
Message-ID: <20090417162409.DE81C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgarmin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsln6975/rpms/libgarmin/devel

Log Message:
Directory /cvs/pkgs/rpms/libgarmin/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:24:39 +0000 (UTC)
Subject: rpms/libgarmin Makefile,NONE,1.1
Message-ID: <20090417162439.AEC337012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgarmin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsln6975/rpms/libgarmin

Added Files:
	Makefile 
Log Message:
Setup of module libgarmin


--- NEW FILE Makefile ---
# Top level Makefile for module libgarmin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:24:41 +0000 (UTC)
Subject: rpms/libgarmin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417162441.4E5E17012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libgarmin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsln6975/rpms/libgarmin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgarmin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libgarmin
# $Id: Makefile,v 1.1 2009/04/17 16:24:40 kevin Exp $
NAME := libgarmin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:26:52 +0000
Subject: [pkgdb] systemtapguiserver was added for anithra
Message-ID: <20090417162652.24E7310F80C@bastion2.fedora.phx.redhat.com>

kevin has added Package systemtapguiserver with summary Server for the eclipse-systemtapgui client
kevin has approved Package systemtapguiserver
kevin has added a Fedora devel branch for systemtapguiserver with an owner of anithra
kevin has approved systemtapguiserver in Fedora devel
kevin has approved Package systemtapguiserver
kevin has set commit to Approved for provenpackager on systemtapguiserver (Fedora devel)
kevin has set build to Approved for provenpackager on systemtapguiserver (Fedora devel)
kevin has set checkout to Approved for provenpackager on systemtapguiserver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/systemtapguiserver



From pkgdb at fedoraproject.org  Fri Apr 17 16:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:28:09 +0000
Subject: [pkgdb] systemtapguiserver (Fedora, 10) updated by kevin
Message-ID: <20090417162809.DAD9C10F80C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for systemtapguiserver
kevin has set commit to Approved for provenpackager on systemtapguiserver (Fedora 10)
kevin has set build to Approved for provenpackager on systemtapguiserver (Fedora 10)
kevin has set checkout to Approved for provenpackager on systemtapguiserver (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/systemtapguiserver



From pkgdb at fedoraproject.org  Fri Apr 17 16:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:28:09 +0000
Subject: [pkgdb] systemtapguiserver (Fedora, 11) updated by kevin
Message-ID: <20090417162810.1004A10F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for systemtapguiserver
kevin has set commit to Approved for provenpackager on systemtapguiserver (Fedora 11)
kevin has set build to Approved for provenpackager on systemtapguiserver (Fedora 11)
kevin has set checkout to Approved for provenpackager on systemtapguiserver (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/systemtapguiserver



From kevin at fedoraproject.org  Fri Apr 17 16:28:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:28:38 +0000 (UTC)
Subject: rpms/systemtapguiserver - New directory
Message-ID: <20090417162838.41B2C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/systemtapguiserver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjf7902/rpms/systemtapguiserver

Log Message:
Directory /cvs/pkgs/rpms/systemtapguiserver added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:28:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:28:38 +0000 (UTC)
Subject: rpms/systemtapguiserver/devel - New directory
Message-ID: <20090417162838.92CA77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/systemtapguiserver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjf7902/rpms/systemtapguiserver/devel

Log Message:
Directory /cvs/pkgs/rpms/systemtapguiserver/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:28:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:28:54 +0000 (UTC)
Subject: rpms/systemtapguiserver Makefile,NONE,1.1
Message-ID: <20090417162854.B2A0A7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/systemtapguiserver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjf7902/rpms/systemtapguiserver

Added Files:
	Makefile 
Log Message:
Setup of module systemtapguiserver


--- NEW FILE Makefile ---
# Top level Makefile for module systemtapguiserver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:28:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:28:55 +0000 (UTC)
Subject: rpms/systemtapguiserver/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090417162855.654437012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/systemtapguiserver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjf7902/rpms/systemtapguiserver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module systemtapguiserver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: systemtapguiserver
# $Id: Makefile,v 1.1 2009/04/17 16:28:55 kevin Exp $
NAME := systemtapguiserver
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From twaugh at fedoraproject.org  Fri Apr 17 16:29:10 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 17 Apr 2009 16:29:10 +0000 (UTC)
Subject: rpms/cups/F-11 cups-CVE-2009-0163.patch, NONE,
	1.1 cups-CVE-2009-0164.patch, NONE, 1.1 cups-lspp.patch, 1.41,
	1.42 cups.spec, 1.469, 1.470
Message-ID: <20090417162910.EA7BD7012B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8186

Modified Files:
	cups-lspp.patch cups.spec 
Added Files:
	cups-CVE-2009-0163.patch cups-CVE-2009-0164.patch 
Log Message:
* Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.14
- Applied patch to fix CVE-2009-0163 (bug #490596).
- Applied patch to fix CVE-2009-0164 (bug #490597).


cups-CVE-2009-0163.patch:

--- NEW FILE cups-CVE-2009-0163.patch ---
diff -up cups-1.4b2-svn8404/filter/image-private.h.CVE-2009-0163 cups-1.4b2-svn8404/filter/image-private.h
--- cups-1.4b2-svn8404/filter/image-private.h.CVE-2009-0163	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/filter/image-private.h	2009-04-17 16:21:52.000000000 +0100
@@ -40,8 +40,8 @@
 
 #  define CUPS_IMAGE_MAX_WIDTH	0x07ffffff
 					/* 2^27-1 to allow for 15-channel data */
-#  define CUPS_IMAGE_MAX_HEIGHT	0x7fffffff
-					/* 2^31-1 */
+#  define CUPS_IMAGE_MAX_HEIGHT	0x3fffffff
+					/* 2^30-1 */
 
 #  define CUPS_TILE_SIZE	256	/* 256x256 pixel tiles */
 #  define CUPS_TILE_MINIMUM	10	/* Minimum number of tiles */

cups-CVE-2009-0164.patch:

--- NEW FILE cups-CVE-2009-0164.patch ---
diff -up cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164 cups-1.4b2-svn8404/CHANGES-1.3.txt
--- cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
+++ cups-1.4b2-svn8404/CHANGES-1.3.txt	2009-04-17 16:47:18.000000000 +0100
@@ -69,11 +69,6 @@ CHANGES IN CUPS V1.3.10
 	- The scheduler now rejects ATTR: messages with empty values.
 	- The scheduler could consume all CPU handling closed connections
 	  (STR #2988)
-	- The scheduler now protects against DNS rebinding attacks on
-	  localhost.
-	- SECURITY: The PNG image reading code did not validate the
-	  image size properly, leading to a potential buffer overflow
-	  (STR #2974)
 	- Fixed some configure script bugs with rc/xinetd directories
 	  (STR #2970)
 	- The Epson sample driver PPDs contained errors (STR #2979)
diff -up cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http-addr.c
--- cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/cups/http-addr.c	2009-04-17 16:47:18.000000000 +0100
@@ -154,7 +154,7 @@ httpAddrLocalhost(
 #endif /* AF_LOCAL */
 
   if (addr->addr.sa_family == AF_INET &&
-      ntohl(addr->ipv4.sin_addr.s_addr) == 0x7f000001)
+      (ntohl(addr->ipv4.sin_addr.s_addr) & 0xff000000) == 0x7f000000)
     return (1);
 
   return (0);
diff -up cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http.c
--- cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/cups/http.c	2009-04-17 16:47:18.000000000 +0100
@@ -1842,18 +1842,35 @@ httpSetField(http_t       *http,	/* I - 
 
   strlcpy(http->fields[field], value, HTTP_MAX_VALUE);
 
- /*
-  * Special case for Authorization: as its contents can be
-  * longer than HTTP_MAX_VALUE
-  */
-
   if (field == HTTP_FIELD_AUTHORIZATION)
   {
+   /*
+    * Special case for Authorization: as its contents can be
+    * longer than HTTP_MAX_VALUE
+    */
+
     if (http->field_authorization)
       free(http->field_authorization);
 
     http->field_authorization = strdup(value);
   }
+  else if (field == HTTP_FIELD_HOST)
+  {
+   /*
+    * Special-case for Host: as we don't want a trailing "." on the hostname.
+    */
+
+    char *ptr = http->fields[HTTP_FIELD_HOST];
+					/* Pointer into Host: field */
+
+    if (*ptr)
+    {
+      ptr += strlen(ptr) - 1;
+
+      if (*ptr == '.')
+        *ptr = '\0';
+    }
+  }
 }
 
 
diff -up cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164 cups-1.4b2-svn8404/man/cupsd.conf.man.in
--- cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/man/cupsd.conf.man.in	2009-04-17 16:47:18.000000000 +0100
@@ -617,6 +617,11 @@ ServerAdmin user at domain.com
 .br
 Specifies the email address of the server administrator.
 .TP 5
+ServerAlias hostname
+.br
+Specifies an alternate name that the server is known by. The special name "*"
+allows any name to be used.
+.TP 5
 ServerBin directory
 .br
 Specifies the directory where backends, CGIs, daemons, and filters may
diff -up cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/client.c
--- cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-17 16:47:48.000000000 +0100
@@ -39,6 +39,7 @@
  *   is_path_absolute()      - Is a path absolute and free of relative elements.
  *   make_certificate()      - Make a self-signed SSL/TLS certificate.
  *   pipe_command()          - Pipe the output of a command to the remote client.
+ *   valid_host()            - Is the Host: field valid?
  *   write_file()            - Send a file via HTTP.
  *   write_pipe()            - Flag that data is available on the CGI pipe.
  */
@@ -108,6 +109,7 @@ static int		make_certificate(cupsd_clien
 #endif /* HAVE_SSL */
 static int		pipe_command(cupsd_client_t *con, int infile, int *outfile,
 			             char *command, char *options, int root);
+static int		valid_host(cupsd_client_t *con);
 static int		write_file(cupsd_client_t *con, http_status_t code,
 		        	   char *filename, char *type,
 				   struct stat *filestats);
@@ -1129,13 +1131,7 @@ cupsdReadClient(cupsd_client_t *con)	/* 
 	return;
       }
     }
-    else if (httpAddrLocalhost(con->http.hostaddr) &&
-             strcasecmp(con->http.fields[HTTP_FIELD_HOST], "localhost") &&
-	     strncasecmp(con->http.fields[HTTP_FIELD_HOST], "localhost:", 10) &&
-	     strcmp(con->http.fields[HTTP_FIELD_HOST], "127.0.0.1") &&
-	     strncmp(con->http.fields[HTTP_FIELD_HOST], "127.0.0.1:", 10) &&
-	     strcmp(con->http.fields[HTTP_FIELD_HOST], "[::1]") &&
-	     strncmp(con->http.fields[HTTP_FIELD_HOST], "[::1]:", 6))
+    else if (!valid_host(con))
     {
      /*
       * Access to localhost must use "localhost" or the corresponding IPv4
@@ -3278,6 +3274,10 @@ get_cdsa_certificate(cupsd_client_t *con
   ssl_options.ServerName = con->servername;
   ssl_options.ServerNameLen = strlen(con->servername);
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
+                  "get_cdsa_certificate: Looking for certs for \"%s\"...",
+		  con->servername);
+
   options.Data = (uint8 *)&ssl_options;
   options.Length = sizeof(ssl_options);
 
@@ -3970,7 +3970,7 @@ make_certificate(cupsd_client_t *con)	/*
     envp[envc]   = NULL;
 
     if (!cupsdStartProcess(command, argv, envp, -1, -1, -1, -1, -1, 1, NULL, 0,
-                           &pid))
+                           NULL, &pid))
     {
       unlink(seedfile);
       return (0);
@@ -4862,6 +4862,165 @@ pipe_command(cupsd_client_t *con,	/* I -
 
 
 /*
+ * 'valid_host()' - Is the Host: field valid?
+ */
+
+static int				/* O - 1 if valid, 0 if not */
+valid_host(cupsd_client_t *con)		/* I - Client connection */
+{
+  cupsd_alias_t	*a;			/* Current alias */
+  cupsd_netif_t	*netif;			/* Current network interface */
+  const char	*host,			/* Host field */
+		*end;			/* End character */
+
+
+  host = con->http.fields[HTTP_FIELD_HOST];
+
+  if (httpAddrLocalhost(con->http.hostaddr))
+  {
+   /*
+    * Only allow "localhost" or the equivalent IPv4 or IPv6 numerical
+    * addresses when accessing CUPS via the loopback interface...
+    */
+
+    return (!strcasecmp(host, "localhost") ||
+            !strncasecmp(host, "localhost:", 10) ||
+	    !strcasecmp(host, "localhost.") ||
+            !strncasecmp(host, "localhost.:", 11) ||
+#ifdef __linux
+	    !strcasecmp(host, "localhost.localdomain") ||
+            !strncasecmp(host, "localhost.localdomain:", 22) ||
+#endif /* __linux */
+            !strcmp(host, "127.0.0.1") ||
+	    !strncmp(host, "127.0.0.1:", 10) ||
+	    !strcmp(host, "[::1]") ||
+	    !strncmp(host, "[::1]:", 6));
+  }
+
+#ifdef HAVE_DNSSD
+ /*
+  * Check if the hostname is something.local (Bonjour); if so, allow it.
+  */
+
+  if ((end = strrchr(host, '.')) != NULL &&
+      (!strcasecmp(end, ".local") || !strncasecmp(end, ".local:", 7) ||
+       !strcasecmp(end, ".local.") || !strncasecmp(end, ".local.:", 8)))
+    return (1);
+#endif /* HAVE_DNSSD */
+
+ /*
+  * Check if the hostname is an IP address...
+  */
+
+  if (isdigit(*host & 255) || *host == '[')
+  {
+   /*
+    * Possible IPv4/IPv6 address...
+    */
+
+    char	temp[1024],		/* Temporary string */
+		*ptr;			/* Pointer into temporary string */
+    http_addrlist_t *addrlist;		/* List of addresses */
+
+
+    strlcpy(temp, host, sizeof(temp));
+    if ((ptr = strrchr(temp, ':')) != NULL && !strchr(ptr, ']'))
+      *ptr = '\0';			/* Strip :port from host value */
+
+    if ((addrlist = httpAddrGetList(temp, AF_UNSPEC, NULL)) != NULL)
+    {
+     /*
+      * Good IPv4/IPv6 address...
+      */
+
+      httpAddrFreeList(addrlist);
+      return (1);
+    }
+  }
+
+ /*
+  * Check for (alias) name matches...
+  */
+
+  for (a = (cupsd_alias_t *)cupsArrayFirst(ServerAlias);
+       a;
+       a = (cupsd_alias_t *)cupsArrayNext(ServerAlias))
+  {
+   /*
+    * "ServerAlias *" allows all host values through...
+    */
+
+    if (!strcmp(a->name, "*"))
+      return (1);
+
+    if (!strncasecmp(host, a->name, a->namelen))
+    {
+     /*
+      * Prefix matches; check the character at the end - it must be ":", ".",
+      * ".:", or nul...
+      */
+
+      end = host + a->namelen;
+
+      if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+        return (1);
+    }
+  }
+
+#ifdef HAVE_DNSSD
+  for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
+       a;
+       a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
+  {
+   /*
+    * "ServerAlias *" allows all host values through...
+    */
+
+    if (!strcmp(a->name, "*"))
+      return (1);
+
+    if (!strncasecmp(host, a->name, a->namelen))
+    {
+     /*
+      * Prefix matches; check the character at the end - it must be ":", ".",
+      * ".:", or nul...
+      */
+
+      end = host + a->namelen;
+
+      if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+        return (1);
+    }
+  }
+#endif /* HAVE_DNSSD */
+
+ /*
+  * Check for interface hostname matches...
+  */
+
+  for (netif = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
+       netif;
+       netif = (cupsd_netif_t *)cupsArrayNext(NetIFList))
+  {
+    if (!strncasecmp(host, netif->hostname, netif->hostlen))
+    {
+     /*
+      * Prefix matches; check the character at the end - it must be ":", ".",
+      * ".:", or nul...
+      */
+
+      end = host + netif->hostlen;
+
+      if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+        return (1);
+    }
+  }
+
+  return (0);
+}
+
+
+/*
  * 'write_file()' - Send a file via HTTP.
  */
 
diff -up cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.c
--- cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-17 16:47:18.000000000 +0100
@@ -14,13 +14,15 @@
  *
  * Contents:
  *
+ *   cupsdAddAlias()          - Add a host alias.
  *   cupsdCheckPermissions()  - Fix the mode and ownership of a file or
  *                              directory.
+ *   cupsdFreeAliases()       - Free all of the alias entries.
  *   cupsdReadConfiguration() - Read the cupsd.conf file.
  *   get_address()            - Get an address + port number from a line.
  *   get_addr_and_mask()      - Get an IP address and netmask.
- *   parse_aaa()              - Parse authentication, authorization, and
- *                              access control lines.
+ *   parse_aaa()              - Parse authentication, authorization, and access
+ *                              control lines.
  *   parse_fatal_errors()     - Parse FatalErrors values in a string.
  *   parse_groups()           - Parse system group names in a string.
  *   parse_protocols()        - Parse browse protocols in a string.
@@ -197,6 +199,7 @@ static const unsigned	zeros[4] =
 /*
  * Local functions...
  */
+
 static http_addrlist_t	*get_address(const char *value, int defport);
 static int		get_addr_and_mask(const char *value, unsigned *ip,
 			                  unsigned *mask);
@@ -211,6 +214,30 @@ static int		read_policy(cups_file_t *fp,
 
 
 /*
+ * 'cupsdAddAlias()' - Add a host alias.
+ */
+
+void
+cupsdAddAlias(cups_array_t *aliases,	/* I - Array of aliases */
+              const char   *name)	/* I - Name to add */
+{
+  cupsd_alias_t	*a;			/*  New alias */
+  size_t	namelen;		/* Length of name */
+
+
+  namelen = strlen(name);
+
+  if ((a = (cupsd_alias_t *)malloc(sizeof(cupsd_alias_t) + namelen)) == NULL)
+    return;
+
+  a->namelen = namelen;
+  strcpy(a->name, name);		/* OK since a->name is allocated */
+
+  cupsArrayAdd(aliases, a);
+}
+
+
+/*
  * 'cupsdCheckPermissions()' - Fix the mode and ownership of a file or directory.
  */
 
@@ -362,6 +389,25 @@ cupsdCheckPermissions(
 
 
 /*
+ * 'cupsdFreeAliases()' - Free all of the alias entries.
+ */
+
+void
+cupsdFreeAliases(cups_array_t *aliases)	/* I - Array of aliases */
+{
+  cupsd_alias_t	*a;			/* Current alias */
+
+
+  for (a = (cupsd_alias_t *)cupsArrayFirst(ServerAlias);
+       a;
+       a = (cupsd_alias_t *)cupsArrayNext(ServerAlias))
+    free(a);
+
+  cupsArrayDelete(aliases);
+}
+
+
+/*
  * 'cupsdReadConfiguration()' - Read the cupsd.conf file.
  */
 
@@ -433,6 +479,9 @@ cupsdReadConfiguration(void)
   * String options...
   */
 
+  cupsdFreeAliases(ServerAlias);
+  ServerAlias = NULL;
+
   cupsdClearString(&ServerName);
   cupsdClearString(&ServerAdmin);
   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
@@ -674,9 +723,7 @@ cupsdReadConfiguration(void)
 
   if (!ServerName)
   {
-    if (HostNameLookups || RemoteAccessEnabled)
-      httpGetHostname(NULL, temp, sizeof(temp));
-    else if (gethostname(temp, sizeof(temp)))
+    if (gethostname(temp, sizeof(temp)))
     {
       cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get hostname: %s",
                       strerror(errno));
@@ -684,6 +731,50 @@ cupsdReadConfiguration(void)
     }
 
     cupsdSetString(&ServerName, temp);
+
+    if (!ServerAlias)
+      ServerAlias = cupsArrayNew(NULL, NULL);
+
+    cupsdAddAlias(ServerAlias, temp);
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+
+    if (HostNameLookups || RemoteAccessEnabled)
+    {
+      struct hostent	*host;		/* Host entry to get FQDN */
+
+      if ((host = gethostbyname(temp)) != NULL)
+      {
+        if (strcasecmp(temp, host->h_name))
+        {
+	  cupsdSetString(&ServerName, host->h_name);
+	  cupsdAddAlias(ServerAlias, host->h_name);
+          cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
+	                  host->h_name);
+	}
+
+        if (host->h_aliases)
+	{
+          for (i = 0; host->h_aliases[i]; i ++)
+	    if (strcasecmp(temp, host->h_aliases[i]))
+	    {
+	      cupsdAddAlias(ServerAlias, host->h_aliases[i]);
+	      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
+	                      host->h_aliases[i]);
+	    }
+	}
+      }
+    }
+
+   /*
+    * Make sure we have the base hostname added as an alias, too!
+    */
+
+    if ((slash = strchr(temp, '.')) != NULL)
+    {
+      *slash = '\0';
+      cupsdAddAlias(ServerAlias, temp);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+    }
   }
 
   for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);
@@ -3278,6 +3369,13 @@ read_configuration(cups_file_t *fp)	/* I
 	    break;
       }
     }
+    else if (!strcasecmp(line, "ServerAlias") && value)
+    {
+      if (!ServerAlias)
+        ServerAlias = cupsArrayNew(NULL, NULL);
+
+      cupsdAddAlias(ServerAlias, value);
+    }
     else if (!strcasecmp(line, "SetEnv") && value)
     {
      /*
diff -up cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.h
--- cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-17 16:47:18.000000000 +0100
@@ -82,6 +82,17 @@ typedef enum
 
 
 /*
+ * ServerAlias data...
+ */
+
+typedef struct
+{
+  size_t	namelen;		/* Length of alias name */
+  char		name[1];		/* Alias name */
+} cupsd_alias_t;
+
+
+/*
  * Globals...
  */
 
@@ -105,6 +116,8 @@ VAR char		*ConfigurationFile	VALUE(NULL)
 					/* Directory for request files */
 			*DocumentRoot		VALUE(NULL);
 					/* Root directory for documents */
+VAR cups_array_t	*ServerAlias		VALUE(NULL);
+					/* Alias names for server */
 VAR int			RemoteAccessEnabled	VALUE(0),
 					/* Are we listening on non-local addresses? */
 			ServerNameIsIP		VALUE(0);
@@ -269,10 +282,12 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  * Prototypes...
  */
 
+extern void	cupsdAddAlias(cups_array_t *aliases, const char *name);
 extern int	cupsdCheckPermissions(const char *filename,
 		                      const char *suffix, int mode,
 	 			      int user, int group, int is_dir,
 				      int create_dir);
+extern void	cupsdFreeAliases(cups_array_t *aliases);
 extern char	*cupsdGetDateTime(struct timeval *t, cupsd_time_t format);
 #ifdef HAVE_GSSAPI
 extern int	cupsdLogGSSMessage(int level, int major_status,
diff -up cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.c
--- cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/scheduler/dirsvc.c	2009-04-17 16:47:18.000000000 +0100
@@ -38,6 +38,7 @@
  *   cupsdUpdateLDAPBrowse()    - Scan for new printers via LDAP...
  *   cupsdUpdateSLPBrowse()     - Get browsing information via SLP.
  *   dequote()                  - Remote quotes from a string.
+ *   dnssdAddAlias()            - Add a DNS-SD alias name.
  *   dnssdBuildTxtRecord()      - Build a TXT record from printer info.
  *   dnssdComparePrinters()     - Compare the registered names of two printers.
  *   dnssdDeregisterPrinter()   - Stop sending broadcast information for a
@@ -155,6 +156,10 @@ static void	update_smb(int onoff);
 
 
 #ifdef HAVE_DNSSD
+#  ifdef HAVE_COREFOUNDATION
+static void	dnssdAddAlias(const void *key, const void *value,
+		              void *context);
+#  endif /* HAVE_COREFOUNDATION */
 static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
 		                     int for_lpd);
 static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
@@ -2199,6 +2204,38 @@ dequote(char       *d,			/* I - Destinat
 
 
 #ifdef HAVE_DNSSD
+#  ifdef HAVE_COREFOUNDATION
+/*
+ * 'dnssdAddAlias()' - Add a DNS-SD alias name.
+ */
+
+static void
+dnssdAddAlias(const void *key,		/* I - Key */
+              const void *value,	/* I - Value (domain) */
+	      void       *context)	/* I - Unused */
+{
+  char	valueStr[1024],			/* Domain string */
+	hostname[1024];			/* Complete hostname */
+
+
+  (void)context;
+
+  if (CFGetTypeID((CFStringRef)value) == CFStringGetTypeID() &&
+      CFStringGetCString((CFStringRef)value, valueStr, sizeof(valueStr),
+                         kCFStringEncodingUTF8))
+  {
+    snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDName, valueStr);
+    if (!DNSSDAlias)
+      DNSSDAlias = cupsArrayNew(NULL, NULL);
+
+    cupsdAddAlias(DNSSDAlias, hostname);
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added Back to My Mac ServerAlias %s",
+		    hostname);
+  }
+}
+#  endif /* HAVE_COREFOUNDATION */
+
+
 /*
  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
  */
diff -up cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.h
--- cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/dirsvc.h	2009-04-17 16:47:18.000000000 +0100
@@ -4,7 +4,7 @@
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -135,6 +135,8 @@ VAR cupsd_statbuf_t	*PollStatusBuffer VA
 #ifdef HAVE_DNSSD
 VAR char		*DNSSDName	VALUE(NULL);
 					/* Computer/server name */
+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
+					/* List of dynamic ServerAlias's */
 VAR int			DNSSDPort	VALUE(0);
 					/* Port number to register */
 VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
diff -up cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.c
--- cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164	2009-02-05 10:57:28.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/network.c	2009-04-17 16:47:18.000000000 +0100
@@ -101,6 +101,7 @@ cupsdNetIFUpdate(void)
   struct ifaddrs	*addrs,		/* Interface address list */
 			*addr;		/* Current interface address */
   char			hostname[1024];	/* Hostname for address */
+  size_t		hostlen;	/* Length of hostname */
 
 
  /*
@@ -176,8 +177,8 @@ cupsdNetIFUpdate(void)
     * Create a new address element...
     */
 
-    if ((temp = calloc(1, sizeof(cupsd_netif_t) +
-                          strlen(hostname))) == NULL)
+    hostlen = strlen(hostname);
+    if ((temp = calloc(1, sizeof(cupsd_netif_t) + hostlen)) == NULL)
       break;
 
    /*
@@ -185,6 +186,7 @@ cupsdNetIFUpdate(void)
     */
 
     strlcpy(temp->name, addr->ifa_name, sizeof(temp->name));
+    temp->hostlen = hostlen;
     strcpy(temp->hostname, hostname);	/* Safe because hostname is allocated */
 
     if (addr->ifa_addr->sa_family == AF_INET)
diff -up cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.h
--- cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164	2008-12-03 15:39:53.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/network.h	2009-04-17 16:47:18.000000000 +0100
@@ -4,7 +4,7 @@
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,6 +25,7 @@ typedef struct cupsd_netif_s		/**** Netw
   http_addr_t		address,	/* Network address */
 			mask,		/* Network mask */
 			broadcast;	/* Broadcast address */
+  size_t		hostlen;	/* Length of hostname */
   char			name[32],	/* Network interface name */
 			hostname[1];	/* Hostname associated with interface */
 } cupsd_netif_t;

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-lspp.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cups-lspp.patch	5 Mar 2009 13:31:30 -0000	1.41
+++ cups-lspp.patch	17 Apr 2009 16:29:10 -0000	1.42
@@ -1,6 +1,6 @@
 diff -up cups-1.4b2-svn8404/config.h.in.lspp cups-1.4b2-svn8404/config.h.in
---- cups-1.4b2-svn8404/config.h.in.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/config.h.in	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/config.h.in.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/config.h.in	2009-04-17 16:48:03.000000000 +0100
 @@ -626,6 +626,13 @@
  #undef HAVE_TCPD_H
  
@@ -16,8 +16,8 @@
  
  /*
 diff -up /dev/null cups-1.4b2-svn8404/config-scripts/cups-lspp.m4
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/config-scripts/cups-lspp.m4	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/config-scripts/cups-lspp.m4	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -57,7 +57,7 @@
 +fi
 diff -up cups-1.4b2-svn8404/configure.in.lspp cups-1.4b2-svn8404/configure.in
 --- cups-1.4b2-svn8404/configure.in.lspp	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/configure.in	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/configure.in	2009-04-17 16:48:03.000000000 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -69,7 +69,7 @@
  LANGFILES=""
 diff -up cups-1.4b2-svn8404/cups/cups.h.lspp cups-1.4b2-svn8404/cups/cups.h
 --- cups-1.4b2-svn8404/cups/cups.h.lspp	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/cups/cups.h	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/cups/cups.h	2009-04-17 16:48:03.000000000 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -95,7 +95,7 @@
   */
 diff -up cups-1.4b2-svn8404/data/Makefile.lspp cups-1.4b2-svn8404/data/Makefile
 --- cups-1.4b2-svn8404/data/Makefile.lspp	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/data/Makefile	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/data/Makefile	2009-04-17 16:48:03.000000000 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -109,8 +109,8 @@
  CHARMAPS =	\
  		euc-cn.txt \
 diff -up /dev/null cups-1.4b2-svn8404/data/mls
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/data/mls	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/data/mls	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -374,8 +374,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.4b2-svn8404/data/selinux
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/data/selinux	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/data/selinux	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -639,8 +639,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.4b2-svn8404/data/te
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/data/te	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/data/te	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -905,7 +905,7 @@
 +%%EOF
 diff -up cups-1.4b2-svn8404/filter/common.c.lspp cups-1.4b2-svn8404/filter/common.c
 --- cups-1.4b2-svn8404/filter/common.c.lspp	2008-12-03 15:39:53.000000000 +0000
-+++ cups-1.4b2-svn8404/filter/common.c	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/filter/common.c	2009-04-17 16:48:03.000000000 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1075,8 +1075,8 @@
  
  /*
 diff -up cups-1.4b2-svn8404/filter/pstops.c.lspp cups-1.4b2-svn8404/filter/pstops.c
---- cups-1.4b2-svn8404/filter/pstops.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/filter/pstops.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/filter/pstops.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/filter/pstops.c	2009-04-17 16:48:03.000000000 +0100
 @@ -3239,6 +3239,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
@@ -1233,8 +1233,8 @@
  
  /*
 diff -up cups-1.4b2-svn8404/Makedefs.in.lspp cups-1.4b2-svn8404/Makedefs.in
---- cups-1.4b2-svn8404/Makedefs.in.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/Makedefs.in	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/Makedefs.in.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/Makedefs.in	2009-04-17 16:48:03.000000000 +0100
 @@ -146,7 +146,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@@ -1254,17 +1254,17 @@
  
  .c.o:
 diff -up cups-1.4b2-svn8404/scheduler/client.c.lspp cups-1.4b2-svn8404/scheduler/client.c
---- cups-1.4b2-svn8404/scheduler/client.c.lspp	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/client.c	2009-03-05 11:40:03.000000000 +0000
-@@ -41,6 +41,7 @@
-  *   pipe_command()          - Pipe the output of a command to the remote client.
+--- cups-1.4b2-svn8404/scheduler/client.c.lspp	2009-04-17 16:48:03.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-17 16:48:25.000000000 +0100
+@@ -42,6 +42,7 @@
+  *   valid_host()            - Is the Host: field valid?
   *   write_file()            - Send a file via HTTP.
   *   write_pipe()            - Flag that data is available on the CGI pipe.
 + *   client_pid_to_auid()    - Get the audit login uid of the client.
   */
  
  /*
-@@ -49,6 +50,7 @@
+@@ -50,6 +51,7 @@
  
  #include "cupsd.h"
  
@@ -1272,7 +1272,7 @@
  #ifdef HAVE_CDSASSL
  #  include <Security/Security.h>
  #  ifdef HAVE_SECIDENTITYSEARCHPRIV_H
-@@ -81,6 +83,12 @@ extern const char *cssmErrorString(int e
+@@ -82,6 +84,12 @@ extern const char *cssmErrorString(int e
  #  include <tcpd.h>
  #endif /* HAVE_TCPD_H */
  
@@ -1285,7 +1285,7 @@
  
  /*
   * Local functions...
-@@ -381,6 +389,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -383,6 +391,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
    }
  #endif /* HAVE_TCPD_H */
  
@@ -1343,7 +1343,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -772,6 +831,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -774,6 +833,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1357,7 +1357,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2054,6 +2120,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2050,6 +2116,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1478,7 +1478,7 @@
   */
 diff -up cups-1.4b2-svn8404/scheduler/client.h.lspp cups-1.4b2-svn8404/scheduler/client.h
 --- cups-1.4b2-svn8404/scheduler/client.h.lspp	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/client.h	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/scheduler/client.h	2009-04-17 16:48:03.000000000 +0100
 @@ -18,6 +18,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1515,9 +1515,9 @@
  
  /*
 diff -up cups-1.4b2-svn8404/scheduler/conf.c.lspp cups-1.4b2-svn8404/scheduler/conf.c
---- cups-1.4b2-svn8404/scheduler/conf.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/conf.c	2009-03-05 11:40:03.000000000 +0000
-@@ -27,6 +27,7 @@
+--- cups-1.4b2-svn8404/scheduler/conf.c.lspp	2009-04-17 16:48:03.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-17 16:48:03.000000000 +0100
+@@ -29,6 +29,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
   *   read_policy()            - Read a <Policy name> definition.
@@ -1525,7 +1525,7 @@
   */
  
  /*
-@@ -48,6 +49,9 @@
+@@ -50,6 +51,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
  
@@ -1535,7 +1535,7 @@
  
  /*
   * Configuration variable structure...
-@@ -169,6 +173,10 @@ static const cupsd_var_t	variables[] =
+@@ -171,6 +175,10 @@ static const cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
    { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1546,7 +1546,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -382,6 +390,9 @@ cupsdReadConfiguration(void)
+@@ -428,6 +436,9 @@ cupsdReadConfiguration(void)
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
    cupsd_policy_t *p;			/* Policy */
@@ -1556,7 +1556,7 @@
  
  
   /*
-@@ -665,6 +676,25 @@ cupsdReadConfiguration(void)
+@@ -714,6 +725,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1582,7 +1582,7 @@
    cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
                    RemoteAccessEnabled ? "enabled" : "disabled");
  
-@@ -981,11 +1011,23 @@ cupsdReadConfiguration(void)
+@@ -1072,11 +1102,23 @@ cupsdReadConfiguration(void)
    * Update classification setting as needed...
    */
  
@@ -1607,7 +1607,7 @@
  
   /*
    * Check the MaxClients setting, and then allocate memory for it...
-@@ -3536,6 +3578,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3634,6 +3676,18 @@ read_location(cups_file_t *fp,		/* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -1627,9 +1627,9 @@
  /*
   * 'read_policy()' - Read a <Policy name> definition.
 diff -up cups-1.4b2-svn8404/scheduler/conf.h.lspp cups-1.4b2-svn8404/scheduler/conf.h
---- cups-1.4b2-svn8404/scheduler/conf.h.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/conf.h	2009-03-05 11:40:03.000000000 +0000
-@@ -246,6 +246,12 @@ VAR char		*ServerKey		VALUE(NULL);
+--- cups-1.4b2-svn8404/scheduler/conf.h.lspp	2009-04-17 16:48:03.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-17 16:48:03.000000000 +0100
+@@ -259,6 +259,12 @@ VAR char		*ServerKey		VALUE(NULL);
  VAR int			SSLOptions		VALUE(CUPSD_SSL_NONE);
  					/* SSL/TLS options */
  #endif /* HAVE_SSL */
@@ -1642,7 +1642,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_KEEPALIVE);
-@@ -264,6 +270,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -277,6 +283,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1653,8 +1653,8 @@
  /*
   * Prototypes...
 diff -up cups-1.4b2-svn8404/scheduler/ipp.c.lspp cups-1.4b2-svn8404/scheduler/ipp.c
---- cups-1.4b2-svn8404/scheduler/ipp.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/ipp.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/ipp.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/ipp.c	2009-04-17 16:48:03.000000000 +0100
 @@ -41,6 +41,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2247,8 +2247,8 @@
    * Check the username against the owner...
    */
 diff -up cups-1.4b2-svn8404/scheduler/job.c.lspp cups-1.4b2-svn8404/scheduler/job.c
---- cups-1.4b2-svn8404/scheduler/job.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/job.c	2009-03-05 12:07:09.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/job.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/job.c	2009-04-17 16:48:03.000000000 +0100
 @@ -65,6 +65,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2643,7 +2643,7 @@
    */
 diff -up cups-1.4b2-svn8404/scheduler/job.h.lspp cups-1.4b2-svn8404/scheduler/job.h
 --- cups-1.4b2-svn8404/scheduler/job.h.lspp	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/job.h	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/scheduler/job.h	2009-04-17 16:48:03.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2670,8 +2670,8 @@
  
  
 diff -up cups-1.4b2-svn8404/scheduler/main.c.lspp cups-1.4b2-svn8404/scheduler/main.c
---- cups-1.4b2-svn8404/scheduler/main.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/main.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/main.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/main.c	2009-04-17 16:48:03.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -2740,8 +2740,8 @@
  }
  
 diff -up cups-1.4b2-svn8404/scheduler/printers.c.lspp cups-1.4b2-svn8404/scheduler/printers.c
---- cups-1.4b2-svn8404/scheduler/printers.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/printers.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/printers.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/printers.c	2009-04-17 16:48:03.000000000 +0100
 @@ -58,6 +58,8 @@
   *   write_xml_string()         - Write a string with XML escaping.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- cups.spec	2 Apr 2009 11:50:24 -0000	1.469
+++ cups.spec	17 Apr 2009 16:29:10 -0000	1.470
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.13%{?dist}
+Release: 0.%{pre}.14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -49,6 +49,8 @@
 Patch23: cups-res_init.patch
 Patch26: cups-avahi.patch
 Patch27: cups-missing-devices.patch
+Patch28: cups-CVE-2009-0163.patch
+Patch29: cups-CVE-2009-0164.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -191,6 +193,8 @@
 %patch23 -p1 -b .res_init
 %patch26 -p1 -b .avahi
 %patch27 -p1 -b .missing-devices
+%patch28 -p1 -b .CVE-2009-0163
+%patch29 -p1 -b .CVE-2009-0164
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -472,6 +476,10 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.14
+- Applied patch to fix CVE-2009-0163 (bug #490596).
+- Applied patch to fix CVE-2009-0164 (bug #490597).
+
 * Thu Apr  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.13
 - Don't verify MD5 sum, file size, or mtime for several config files:
   cupsd.conf, client.conf, classes.conf, printers.conf, snmp.conf,



From mcpierce at fedoraproject.org  Fri Apr 17 16:29:58 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Fri, 17 Apr 2009 16:29:58 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-11 .cvsignore, 1.13, 1.14 rubygem-hoe.spec, 1.17,
	1.18 sources, 1.13, 1.14
Message-ID: <20090417162958.6443E7012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8255

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.12.2 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Apr 2009 16:01:56 -0000	1.13
+++ .cvsignore	17 Apr 2009 16:29:28 -0000	1.14
@@ -1 +1 @@
-hoe-1.12.1.gem
+hoe-1.12.2.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/rubygem-hoe.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rubygem-hoe.spec	1 Apr 2009 16:01:56 -0000	1.17
+++ rubygem-hoe.spec	17 Apr 2009 16:29:28 -0000	1.18
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.12.1
+Version:    	1.12.2
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.2-1
+-Release 1.12.1 of Hoe.
+
 * Wed Apr  1 2009 Darryl Pierce <dpierce at redhat.com> - 1.12.1-1
 - Release 1.12.1 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Apr 2009 16:01:56 -0000	1.13
+++ sources	17 Apr 2009 16:29:28 -0000	1.14
@@ -1 +1 @@
-c8f01467192e98a70af5ef1d8133597c  hoe-1.12.1.gem
+1eaf332968a2cde8393f26792f3f758e  hoe-1.12.2.gem



From pkgdb at fedoraproject.org  Fri Apr 17 16:30:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:30:13 +0000
Subject: [pkgdb] php-pear-Crypt-Blowfish (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417163014.0A08D10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pear-Crypt-Blowfish
kevin has set commit to Approved for provenpackager on php-pear-Crypt-Blowfish (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on php-pear-Crypt-Blowfish (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on php-pear-Crypt-Blowfish (Fedora EPEL 5)
kevin changed owner of php-pear-Crypt-Blowfish in Fedora EPEL 5 to xavierb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Crypt-Blowfish



From pkgdb at fedoraproject.org  Fri Apr 17 16:33:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:33:00 +0000
Subject: [pkgdb] ibus-table-extraphrase (Fedora, devel) updated by kevin
Message-ID: <20090417163300.2EAA710F87E@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ibus-table-extraphrase (Fedora devel) for i18n-team
kevin approved watchcommits on ibus-table-extraphrase (Fedora devel) for i18n-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Fri Apr 17 16:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:32:58 +0000
Subject: [pkgdb] ibus-table-extraphrase was added for cchance
Message-ID: <20090417163258.9D96410F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package ibus-table-extraphrase with summary Extra phrase data for IBus Table
kevin has approved Package ibus-table-extraphrase
kevin has added a Fedora devel branch for ibus-table-extraphrase with an owner of cchance
kevin has approved ibus-table-extraphrase in Fedora devel
kevin has approved Package ibus-table-extraphrase
kevin has set commit to Approved for provenpackager on ibus-table-extraphrase (Fedora devel)
kevin has set build to Approved for provenpackager on ibus-table-extraphrase (Fedora devel)
kevin has set checkout to Approved for provenpackager on ibus-table-extraphrase (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-extraphrase



From kevin at fedoraproject.org  Fri Apr 17 16:34:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:34:19 +0000 (UTC)
Subject: rpms/ibus-table-extraphrase - New directory
Message-ID: <20090417163419.47DA47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-table-extraphrase
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOo8946/rpms/ibus-table-extraphrase

Log Message:
Directory /cvs/pkgs/rpms/ibus-table-extraphrase added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:34:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:34:20 +0000 (UTC)
Subject: rpms/ibus-table-extraphrase/devel - New directory
Message-ID: <20090417163420.AC8317012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-table-extraphrase/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOo8946/rpms/ibus-table-extraphrase/devel

Log Message:
Directory /cvs/pkgs/rpms/ibus-table-extraphrase/devel added to the repository




From twaugh at fedoraproject.org  Fri Apr 17 16:34:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 17 Apr 2009 16:34:28 +0000 (UTC)
Subject: rpms/cups/devel cups-CVE-2009-0163.patch, NONE,
	1.1 cups-CVE-2009-0164.patch, NONE, 1.1 cups-lspp.patch, 1.41,
	1.42 cups.spec, 1.469, 1.470
Message-ID: <20090417163428.EE9B170137@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8972

Modified Files:
	cups-lspp.patch cups.spec 
Added Files:
	cups-CVE-2009-0163.patch cups-CVE-2009-0164.patch 
Log Message:
* Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.14
- Applied patch to fix CVE-2009-0163 (bug #490596).
- Applied patch to fix CVE-2009-0164 (bug #490597).


cups-CVE-2009-0163.patch:

--- NEW FILE cups-CVE-2009-0163.patch ---
diff -up cups-1.4b2-svn8404/filter/image-private.h.CVE-2009-0163 cups-1.4b2-svn8404/filter/image-private.h
--- cups-1.4b2-svn8404/filter/image-private.h.CVE-2009-0163	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/filter/image-private.h	2009-04-17 16:21:52.000000000 +0100
@@ -40,8 +40,8 @@
 
 #  define CUPS_IMAGE_MAX_WIDTH	0x07ffffff
 					/* 2^27-1 to allow for 15-channel data */
-#  define CUPS_IMAGE_MAX_HEIGHT	0x7fffffff
-					/* 2^31-1 */
+#  define CUPS_IMAGE_MAX_HEIGHT	0x3fffffff
+					/* 2^30-1 */
 
 #  define CUPS_TILE_SIZE	256	/* 256x256 pixel tiles */
 #  define CUPS_TILE_MINIMUM	10	/* Minimum number of tiles */

cups-CVE-2009-0164.patch:

--- NEW FILE cups-CVE-2009-0164.patch ---
diff -up cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164 cups-1.4b2-svn8404/CHANGES-1.3.txt
--- cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
+++ cups-1.4b2-svn8404/CHANGES-1.3.txt	2009-04-17 16:47:18.000000000 +0100
@@ -69,11 +69,6 @@ CHANGES IN CUPS V1.3.10
 	- The scheduler now rejects ATTR: messages with empty values.
 	- The scheduler could consume all CPU handling closed connections
 	  (STR #2988)
-	- The scheduler now protects against DNS rebinding attacks on
-	  localhost.
-	- SECURITY: The PNG image reading code did not validate the
-	  image size properly, leading to a potential buffer overflow
-	  (STR #2974)
 	- Fixed some configure script bugs with rc/xinetd directories
 	  (STR #2970)
 	- The Epson sample driver PPDs contained errors (STR #2979)
diff -up cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http-addr.c
--- cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/cups/http-addr.c	2009-04-17 16:47:18.000000000 +0100
@@ -154,7 +154,7 @@ httpAddrLocalhost(
 #endif /* AF_LOCAL */
 
   if (addr->addr.sa_family == AF_INET &&
-      ntohl(addr->ipv4.sin_addr.s_addr) == 0x7f000001)
+      (ntohl(addr->ipv4.sin_addr.s_addr) & 0xff000000) == 0x7f000000)
     return (1);
 
   return (0);
diff -up cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http.c
--- cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/cups/http.c	2009-04-17 16:47:18.000000000 +0100
@@ -1842,18 +1842,35 @@ httpSetField(http_t       *http,	/* I - 
 
   strlcpy(http->fields[field], value, HTTP_MAX_VALUE);
 
- /*
-  * Special case for Authorization: as its contents can be
-  * longer than HTTP_MAX_VALUE
-  */
-
   if (field == HTTP_FIELD_AUTHORIZATION)
   {
+   /*
+    * Special case for Authorization: as its contents can be
+    * longer than HTTP_MAX_VALUE
+    */
+
     if (http->field_authorization)
       free(http->field_authorization);
 
     http->field_authorization = strdup(value);
   }
+  else if (field == HTTP_FIELD_HOST)
+  {
+   /*
+    * Special-case for Host: as we don't want a trailing "." on the hostname.
+    */
+
+    char *ptr = http->fields[HTTP_FIELD_HOST];
+					/* Pointer into Host: field */
+
+    if (*ptr)
+    {
+      ptr += strlen(ptr) - 1;
+
+      if (*ptr == '.')
+        *ptr = '\0';
+    }
+  }
 }
 
 
diff -up cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164 cups-1.4b2-svn8404/man/cupsd.conf.man.in
--- cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/man/cupsd.conf.man.in	2009-04-17 16:47:18.000000000 +0100
@@ -617,6 +617,11 @@ ServerAdmin user at domain.com
 .br
 Specifies the email address of the server administrator.
 .TP 5
+ServerAlias hostname
+.br
+Specifies an alternate name that the server is known by. The special name "*"
+allows any name to be used.
+.TP 5
 ServerBin directory
 .br
 Specifies the directory where backends, CGIs, daemons, and filters may
diff -up cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/client.c
--- cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-17 16:47:48.000000000 +0100
@@ -39,6 +39,7 @@
  *   is_path_absolute()      - Is a path absolute and free of relative elements.
  *   make_certificate()      - Make a self-signed SSL/TLS certificate.
  *   pipe_command()          - Pipe the output of a command to the remote client.
+ *   valid_host()            - Is the Host: field valid?
  *   write_file()            - Send a file via HTTP.
  *   write_pipe()            - Flag that data is available on the CGI pipe.
  */
@@ -108,6 +109,7 @@ static int		make_certificate(cupsd_clien
 #endif /* HAVE_SSL */
 static int		pipe_command(cupsd_client_t *con, int infile, int *outfile,
 			             char *command, char *options, int root);
+static int		valid_host(cupsd_client_t *con);
 static int		write_file(cupsd_client_t *con, http_status_t code,
 		        	   char *filename, char *type,
 				   struct stat *filestats);
@@ -1129,13 +1131,7 @@ cupsdReadClient(cupsd_client_t *con)	/* 
 	return;
       }
     }
-    else if (httpAddrLocalhost(con->http.hostaddr) &&
-             strcasecmp(con->http.fields[HTTP_FIELD_HOST], "localhost") &&
-	     strncasecmp(con->http.fields[HTTP_FIELD_HOST], "localhost:", 10) &&
-	     strcmp(con->http.fields[HTTP_FIELD_HOST], "127.0.0.1") &&
-	     strncmp(con->http.fields[HTTP_FIELD_HOST], "127.0.0.1:", 10) &&
-	     strcmp(con->http.fields[HTTP_FIELD_HOST], "[::1]") &&
-	     strncmp(con->http.fields[HTTP_FIELD_HOST], "[::1]:", 6))
+    else if (!valid_host(con))
     {
      /*
       * Access to localhost must use "localhost" or the corresponding IPv4
@@ -3278,6 +3274,10 @@ get_cdsa_certificate(cupsd_client_t *con
   ssl_options.ServerName = con->servername;
   ssl_options.ServerNameLen = strlen(con->servername);
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
+                  "get_cdsa_certificate: Looking for certs for \"%s\"...",
+		  con->servername);
+
   options.Data = (uint8 *)&ssl_options;
   options.Length = sizeof(ssl_options);
 
@@ -3970,7 +3970,7 @@ make_certificate(cupsd_client_t *con)	/*
     envp[envc]   = NULL;
 
     if (!cupsdStartProcess(command, argv, envp, -1, -1, -1, -1, -1, 1, NULL, 0,
-                           &pid))
+                           NULL, &pid))
     {
       unlink(seedfile);
       return (0);
@@ -4862,6 +4862,165 @@ pipe_command(cupsd_client_t *con,	/* I -
 
 
 /*
+ * 'valid_host()' - Is the Host: field valid?
+ */
+
+static int				/* O - 1 if valid, 0 if not */
+valid_host(cupsd_client_t *con)		/* I - Client connection */
+{
+  cupsd_alias_t	*a;			/* Current alias */
+  cupsd_netif_t	*netif;			/* Current network interface */
+  const char	*host,			/* Host field */
+		*end;			/* End character */
+
+
+  host = con->http.fields[HTTP_FIELD_HOST];
+
+  if (httpAddrLocalhost(con->http.hostaddr))
+  {
+   /*
+    * Only allow "localhost" or the equivalent IPv4 or IPv6 numerical
+    * addresses when accessing CUPS via the loopback interface...
+    */
+
+    return (!strcasecmp(host, "localhost") ||
+            !strncasecmp(host, "localhost:", 10) ||
+	    !strcasecmp(host, "localhost.") ||
+            !strncasecmp(host, "localhost.:", 11) ||
+#ifdef __linux
+	    !strcasecmp(host, "localhost.localdomain") ||
+            !strncasecmp(host, "localhost.localdomain:", 22) ||
+#endif /* __linux */
+            !strcmp(host, "127.0.0.1") ||
+	    !strncmp(host, "127.0.0.1:", 10) ||
+	    !strcmp(host, "[::1]") ||
+	    !strncmp(host, "[::1]:", 6));
+  }
+
+#ifdef HAVE_DNSSD
+ /*
+  * Check if the hostname is something.local (Bonjour); if so, allow it.
+  */
+
+  if ((end = strrchr(host, '.')) != NULL &&
+      (!strcasecmp(end, ".local") || !strncasecmp(end, ".local:", 7) ||
+       !strcasecmp(end, ".local.") || !strncasecmp(end, ".local.:", 8)))
+    return (1);
+#endif /* HAVE_DNSSD */
+
+ /*
+  * Check if the hostname is an IP address...
+  */
+
+  if (isdigit(*host & 255) || *host == '[')
+  {
+   /*
+    * Possible IPv4/IPv6 address...
+    */
+
+    char	temp[1024],		/* Temporary string */
+		*ptr;			/* Pointer into temporary string */
+    http_addrlist_t *addrlist;		/* List of addresses */
+
+
+    strlcpy(temp, host, sizeof(temp));
+    if ((ptr = strrchr(temp, ':')) != NULL && !strchr(ptr, ']'))
+      *ptr = '\0';			/* Strip :port from host value */
+
+    if ((addrlist = httpAddrGetList(temp, AF_UNSPEC, NULL)) != NULL)
+    {
+     /*
+      * Good IPv4/IPv6 address...
+      */
+
+      httpAddrFreeList(addrlist);
+      return (1);
+    }
+  }
+
+ /*
+  * Check for (alias) name matches...
+  */
+
+  for (a = (cupsd_alias_t *)cupsArrayFirst(ServerAlias);
+       a;
+       a = (cupsd_alias_t *)cupsArrayNext(ServerAlias))
+  {
+   /*
+    * "ServerAlias *" allows all host values through...
+    */
+
+    if (!strcmp(a->name, "*"))
+      return (1);
+
+    if (!strncasecmp(host, a->name, a->namelen))
+    {
+     /*
+      * Prefix matches; check the character at the end - it must be ":", ".",
+      * ".:", or nul...
+      */
+
+      end = host + a->namelen;
+
+      if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+        return (1);
+    }
+  }
+
+#ifdef HAVE_DNSSD
+  for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
+       a;
+       a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
+  {
+   /*
+    * "ServerAlias *" allows all host values through...
+    */
+
+    if (!strcmp(a->name, "*"))
+      return (1);
+
+    if (!strncasecmp(host, a->name, a->namelen))
+    {
+     /*
+      * Prefix matches; check the character at the end - it must be ":", ".",
+      * ".:", or nul...
+      */
+
+      end = host + a->namelen;
+
+      if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+        return (1);
+    }
+  }
+#endif /* HAVE_DNSSD */
+
+ /*
+  * Check for interface hostname matches...
+  */
+
+  for (netif = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
+       netif;
+       netif = (cupsd_netif_t *)cupsArrayNext(NetIFList))
+  {
+    if (!strncasecmp(host, netif->hostname, netif->hostlen))
+    {
+     /*
+      * Prefix matches; check the character at the end - it must be ":", ".",
+      * ".:", or nul...
+      */
+
+      end = host + netif->hostlen;
+
+      if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+        return (1);
+    }
+  }
+
+  return (0);
+}
+
+
+/*
  * 'write_file()' - Send a file via HTTP.
  */
 
diff -up cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.c
--- cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-17 16:47:18.000000000 +0100
@@ -14,13 +14,15 @@
  *
  * Contents:
  *
+ *   cupsdAddAlias()          - Add a host alias.
  *   cupsdCheckPermissions()  - Fix the mode and ownership of a file or
  *                              directory.
+ *   cupsdFreeAliases()       - Free all of the alias entries.
  *   cupsdReadConfiguration() - Read the cupsd.conf file.
  *   get_address()            - Get an address + port number from a line.
  *   get_addr_and_mask()      - Get an IP address and netmask.
- *   parse_aaa()              - Parse authentication, authorization, and
- *                              access control lines.
+ *   parse_aaa()              - Parse authentication, authorization, and access
+ *                              control lines.
  *   parse_fatal_errors()     - Parse FatalErrors values in a string.
  *   parse_groups()           - Parse system group names in a string.
  *   parse_protocols()        - Parse browse protocols in a string.
@@ -197,6 +199,7 @@ static const unsigned	zeros[4] =
 /*
  * Local functions...
  */
+
 static http_addrlist_t	*get_address(const char *value, int defport);
 static int		get_addr_and_mask(const char *value, unsigned *ip,
 			                  unsigned *mask);
@@ -211,6 +214,30 @@ static int		read_policy(cups_file_t *fp,
 
 
 /*
+ * 'cupsdAddAlias()' - Add a host alias.
+ */
+
+void
+cupsdAddAlias(cups_array_t *aliases,	/* I - Array of aliases */
+              const char   *name)	/* I - Name to add */
+{
+  cupsd_alias_t	*a;			/*  New alias */
+  size_t	namelen;		/* Length of name */
+
+
+  namelen = strlen(name);
+
+  if ((a = (cupsd_alias_t *)malloc(sizeof(cupsd_alias_t) + namelen)) == NULL)
+    return;
+
+  a->namelen = namelen;
+  strcpy(a->name, name);		/* OK since a->name is allocated */
+
+  cupsArrayAdd(aliases, a);
+}
+
+
+/*
  * 'cupsdCheckPermissions()' - Fix the mode and ownership of a file or directory.
  */
 
@@ -362,6 +389,25 @@ cupsdCheckPermissions(
 
 
 /*
+ * 'cupsdFreeAliases()' - Free all of the alias entries.
+ */
+
+void
+cupsdFreeAliases(cups_array_t *aliases)	/* I - Array of aliases */
+{
+  cupsd_alias_t	*a;			/* Current alias */
+
+
+  for (a = (cupsd_alias_t *)cupsArrayFirst(ServerAlias);
+       a;
+       a = (cupsd_alias_t *)cupsArrayNext(ServerAlias))
+    free(a);
+
+  cupsArrayDelete(aliases);
+}
+
+
+/*
  * 'cupsdReadConfiguration()' - Read the cupsd.conf file.
  */
 
@@ -433,6 +479,9 @@ cupsdReadConfiguration(void)
   * String options...
   */
 
+  cupsdFreeAliases(ServerAlias);
+  ServerAlias = NULL;
+
   cupsdClearString(&ServerName);
   cupsdClearString(&ServerAdmin);
   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
@@ -674,9 +723,7 @@ cupsdReadConfiguration(void)
 
   if (!ServerName)
   {
-    if (HostNameLookups || RemoteAccessEnabled)
-      httpGetHostname(NULL, temp, sizeof(temp));
-    else if (gethostname(temp, sizeof(temp)))
+    if (gethostname(temp, sizeof(temp)))
     {
       cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get hostname: %s",
                       strerror(errno));
@@ -684,6 +731,50 @@ cupsdReadConfiguration(void)
     }
 
     cupsdSetString(&ServerName, temp);
+
+    if (!ServerAlias)
+      ServerAlias = cupsArrayNew(NULL, NULL);
+
+    cupsdAddAlias(ServerAlias, temp);
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+
+    if (HostNameLookups || RemoteAccessEnabled)
+    {
+      struct hostent	*host;		/* Host entry to get FQDN */
+
+      if ((host = gethostbyname(temp)) != NULL)
+      {
+        if (strcasecmp(temp, host->h_name))
+        {
+	  cupsdSetString(&ServerName, host->h_name);
+	  cupsdAddAlias(ServerAlias, host->h_name);
+          cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
+	                  host->h_name);
+	}
+
+        if (host->h_aliases)
+	{
+          for (i = 0; host->h_aliases[i]; i ++)
+	    if (strcasecmp(temp, host->h_aliases[i]))
+	    {
+	      cupsdAddAlias(ServerAlias, host->h_aliases[i]);
+	      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
+	                      host->h_aliases[i]);
+	    }
+	}
+      }
+    }
+
+   /*
+    * Make sure we have the base hostname added as an alias, too!
+    */
+
+    if ((slash = strchr(temp, '.')) != NULL)
+    {
+      *slash = '\0';
+      cupsdAddAlias(ServerAlias, temp);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+    }
   }
 
   for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);
@@ -3278,6 +3369,13 @@ read_configuration(cups_file_t *fp)	/* I
 	    break;
       }
     }
+    else if (!strcasecmp(line, "ServerAlias") && value)
+    {
+      if (!ServerAlias)
+        ServerAlias = cupsArrayNew(NULL, NULL);
+
+      cupsdAddAlias(ServerAlias, value);
+    }
     else if (!strcasecmp(line, "SetEnv") && value)
     {
      /*
diff -up cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.h
--- cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-17 16:47:18.000000000 +0100
@@ -82,6 +82,17 @@ typedef enum
 
 
 /*
+ * ServerAlias data...
+ */
+
+typedef struct
+{
+  size_t	namelen;		/* Length of alias name */
+  char		name[1];		/* Alias name */
+} cupsd_alias_t;
+
+
+/*
  * Globals...
  */
 
@@ -105,6 +116,8 @@ VAR char		*ConfigurationFile	VALUE(NULL)
 					/* Directory for request files */
 			*DocumentRoot		VALUE(NULL);
 					/* Root directory for documents */
+VAR cups_array_t	*ServerAlias		VALUE(NULL);
+					/* Alias names for server */
 VAR int			RemoteAccessEnabled	VALUE(0),
 					/* Are we listening on non-local addresses? */
 			ServerNameIsIP		VALUE(0);
@@ -269,10 +282,12 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  * Prototypes...
  */
 
+extern void	cupsdAddAlias(cups_array_t *aliases, const char *name);
 extern int	cupsdCheckPermissions(const char *filename,
 		                      const char *suffix, int mode,
 	 			      int user, int group, int is_dir,
 				      int create_dir);
+extern void	cupsdFreeAliases(cups_array_t *aliases);
 extern char	*cupsdGetDateTime(struct timeval *t, cupsd_time_t format);
 #ifdef HAVE_GSSAPI
 extern int	cupsdLogGSSMessage(int level, int major_status,
diff -up cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.c
--- cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
+++ cups-1.4b2-svn8404/scheduler/dirsvc.c	2009-04-17 16:47:18.000000000 +0100
@@ -38,6 +38,7 @@
  *   cupsdUpdateLDAPBrowse()    - Scan for new printers via LDAP...
  *   cupsdUpdateSLPBrowse()     - Get browsing information via SLP.
  *   dequote()                  - Remote quotes from a string.
+ *   dnssdAddAlias()            - Add a DNS-SD alias name.
  *   dnssdBuildTxtRecord()      - Build a TXT record from printer info.
  *   dnssdComparePrinters()     - Compare the registered names of two printers.
  *   dnssdDeregisterPrinter()   - Stop sending broadcast information for a
@@ -155,6 +156,10 @@ static void	update_smb(int onoff);
 
 
 #ifdef HAVE_DNSSD
+#  ifdef HAVE_COREFOUNDATION
+static void	dnssdAddAlias(const void *key, const void *value,
+		              void *context);
+#  endif /* HAVE_COREFOUNDATION */
 static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
 		                     int for_lpd);
 static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
@@ -2199,6 +2204,38 @@ dequote(char       *d,			/* I - Destinat
 
 
 #ifdef HAVE_DNSSD
+#  ifdef HAVE_COREFOUNDATION
+/*
+ * 'dnssdAddAlias()' - Add a DNS-SD alias name.
+ */
+
+static void
+dnssdAddAlias(const void *key,		/* I - Key */
+              const void *value,	/* I - Value (domain) */
+	      void       *context)	/* I - Unused */
+{
+  char	valueStr[1024],			/* Domain string */
+	hostname[1024];			/* Complete hostname */
+
+
+  (void)context;
+
+  if (CFGetTypeID((CFStringRef)value) == CFStringGetTypeID() &&
+      CFStringGetCString((CFStringRef)value, valueStr, sizeof(valueStr),
+                         kCFStringEncodingUTF8))
+  {
+    snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDName, valueStr);
+    if (!DNSSDAlias)
+      DNSSDAlias = cupsArrayNew(NULL, NULL);
+
+    cupsdAddAlias(DNSSDAlias, hostname);
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added Back to My Mac ServerAlias %s",
+		    hostname);
+  }
+}
+#  endif /* HAVE_COREFOUNDATION */
+
+
 /*
  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
  */
diff -up cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.h
--- cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/dirsvc.h	2009-04-17 16:47:18.000000000 +0100
@@ -4,7 +4,7 @@
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -135,6 +135,8 @@ VAR cupsd_statbuf_t	*PollStatusBuffer VA
 #ifdef HAVE_DNSSD
 VAR char		*DNSSDName	VALUE(NULL);
 					/* Computer/server name */
+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
+					/* List of dynamic ServerAlias's */
 VAR int			DNSSDPort	VALUE(0);
 					/* Port number to register */
 VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
diff -up cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.c
--- cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164	2009-02-05 10:57:28.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/network.c	2009-04-17 16:47:18.000000000 +0100
@@ -101,6 +101,7 @@ cupsdNetIFUpdate(void)
   struct ifaddrs	*addrs,		/* Interface address list */
 			*addr;		/* Current interface address */
   char			hostname[1024];	/* Hostname for address */
+  size_t		hostlen;	/* Length of hostname */
 
 
  /*
@@ -176,8 +177,8 @@ cupsdNetIFUpdate(void)
     * Create a new address element...
     */
 
-    if ((temp = calloc(1, sizeof(cupsd_netif_t) +
-                          strlen(hostname))) == NULL)
+    hostlen = strlen(hostname);
+    if ((temp = calloc(1, sizeof(cupsd_netif_t) + hostlen)) == NULL)
       break;
 
    /*
@@ -185,6 +186,7 @@ cupsdNetIFUpdate(void)
     */
 
     strlcpy(temp->name, addr->ifa_name, sizeof(temp->name));
+    temp->hostlen = hostlen;
     strcpy(temp->hostname, hostname);	/* Safe because hostname is allocated */
 
     if (addr->ifa_addr->sa_family == AF_INET)
diff -up cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.h
--- cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164	2008-12-03 15:39:53.000000000 +0000
+++ cups-1.4b2-svn8404/scheduler/network.h	2009-04-17 16:47:18.000000000 +0100
@@ -4,7 +4,7 @@
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,6 +25,7 @@ typedef struct cupsd_netif_s		/**** Netw
   http_addr_t		address,	/* Network address */
 			mask,		/* Network mask */
 			broadcast;	/* Broadcast address */
+  size_t		hostlen;	/* Length of hostname */
   char			name[32],	/* Network interface name */
 			hostname[1];	/* Hostname associated with interface */
 } cupsd_netif_t;

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cups-lspp.patch	5 Mar 2009 13:31:30 -0000	1.41
+++ cups-lspp.patch	17 Apr 2009 16:34:28 -0000	1.42
@@ -1,6 +1,6 @@
 diff -up cups-1.4b2-svn8404/config.h.in.lspp cups-1.4b2-svn8404/config.h.in
---- cups-1.4b2-svn8404/config.h.in.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/config.h.in	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/config.h.in.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/config.h.in	2009-04-17 16:48:03.000000000 +0100
 @@ -626,6 +626,13 @@
  #undef HAVE_TCPD_H
  
@@ -16,8 +16,8 @@
  
  /*
 diff -up /dev/null cups-1.4b2-svn8404/config-scripts/cups-lspp.m4
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/config-scripts/cups-lspp.m4	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/config-scripts/cups-lspp.m4	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -57,7 +57,7 @@
 +fi
 diff -up cups-1.4b2-svn8404/configure.in.lspp cups-1.4b2-svn8404/configure.in
 --- cups-1.4b2-svn8404/configure.in.lspp	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/configure.in	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/configure.in	2009-04-17 16:48:03.000000000 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -69,7 +69,7 @@
  LANGFILES=""
 diff -up cups-1.4b2-svn8404/cups/cups.h.lspp cups-1.4b2-svn8404/cups/cups.h
 --- cups-1.4b2-svn8404/cups/cups.h.lspp	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/cups/cups.h	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/cups/cups.h	2009-04-17 16:48:03.000000000 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -95,7 +95,7 @@
   */
 diff -up cups-1.4b2-svn8404/data/Makefile.lspp cups-1.4b2-svn8404/data/Makefile
 --- cups-1.4b2-svn8404/data/Makefile.lspp	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/data/Makefile	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/data/Makefile	2009-04-17 16:48:03.000000000 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -109,8 +109,8 @@
  CHARMAPS =	\
  		euc-cn.txt \
 diff -up /dev/null cups-1.4b2-svn8404/data/mls
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/data/mls	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/data/mls	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -374,8 +374,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.4b2-svn8404/data/selinux
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/data/selinux	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/data/selinux	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -639,8 +639,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.4b2-svn8404/data/te
---- /dev/null	2009-03-05 08:48:03.067001897 +0000
-+++ cups-1.4b2-svn8404/data/te	2009-03-05 11:40:03.000000000 +0000
+--- /dev/null	2009-04-17 08:56:26.038189487 +0100
++++ cups-1.4b2-svn8404/data/te	2009-04-17 16:48:03.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -905,7 +905,7 @@
 +%%EOF
 diff -up cups-1.4b2-svn8404/filter/common.c.lspp cups-1.4b2-svn8404/filter/common.c
 --- cups-1.4b2-svn8404/filter/common.c.lspp	2008-12-03 15:39:53.000000000 +0000
-+++ cups-1.4b2-svn8404/filter/common.c	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/filter/common.c	2009-04-17 16:48:03.000000000 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1075,8 +1075,8 @@
  
  /*
 diff -up cups-1.4b2-svn8404/filter/pstops.c.lspp cups-1.4b2-svn8404/filter/pstops.c
---- cups-1.4b2-svn8404/filter/pstops.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/filter/pstops.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/filter/pstops.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/filter/pstops.c	2009-04-17 16:48:03.000000000 +0100
 @@ -3239,6 +3239,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
@@ -1233,8 +1233,8 @@
  
  /*
 diff -up cups-1.4b2-svn8404/Makedefs.in.lspp cups-1.4b2-svn8404/Makedefs.in
---- cups-1.4b2-svn8404/Makedefs.in.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/Makedefs.in	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/Makedefs.in.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/Makedefs.in	2009-04-17 16:48:03.000000000 +0100
 @@ -146,7 +146,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@@ -1254,17 +1254,17 @@
  
  .c.o:
 diff -up cups-1.4b2-svn8404/scheduler/client.c.lspp cups-1.4b2-svn8404/scheduler/client.c
---- cups-1.4b2-svn8404/scheduler/client.c.lspp	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/client.c	2009-03-05 11:40:03.000000000 +0000
-@@ -41,6 +41,7 @@
-  *   pipe_command()          - Pipe the output of a command to the remote client.
+--- cups-1.4b2-svn8404/scheduler/client.c.lspp	2009-04-17 16:48:03.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-17 16:48:25.000000000 +0100
+@@ -42,6 +42,7 @@
+  *   valid_host()            - Is the Host: field valid?
   *   write_file()            - Send a file via HTTP.
   *   write_pipe()            - Flag that data is available on the CGI pipe.
 + *   client_pid_to_auid()    - Get the audit login uid of the client.
   */
  
  /*
-@@ -49,6 +50,7 @@
+@@ -50,6 +51,7 @@
  
  #include "cupsd.h"
  
@@ -1272,7 +1272,7 @@
  #ifdef HAVE_CDSASSL
  #  include <Security/Security.h>
  #  ifdef HAVE_SECIDENTITYSEARCHPRIV_H
-@@ -81,6 +83,12 @@ extern const char *cssmErrorString(int e
+@@ -82,6 +84,12 @@ extern const char *cssmErrorString(int e
  #  include <tcpd.h>
  #endif /* HAVE_TCPD_H */
  
@@ -1285,7 +1285,7 @@
  
  /*
   * Local functions...
-@@ -381,6 +389,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -383,6 +391,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
    }
  #endif /* HAVE_TCPD_H */
  
@@ -1343,7 +1343,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -772,6 +831,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -774,6 +833,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1357,7 +1357,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2054,6 +2120,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2050,6 +2116,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1478,7 +1478,7 @@
   */
 diff -up cups-1.4b2-svn8404/scheduler/client.h.lspp cups-1.4b2-svn8404/scheduler/client.h
 --- cups-1.4b2-svn8404/scheduler/client.h.lspp	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/client.h	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/scheduler/client.h	2009-04-17 16:48:03.000000000 +0100
 @@ -18,6 +18,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1515,9 +1515,9 @@
  
  /*
 diff -up cups-1.4b2-svn8404/scheduler/conf.c.lspp cups-1.4b2-svn8404/scheduler/conf.c
---- cups-1.4b2-svn8404/scheduler/conf.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/conf.c	2009-03-05 11:40:03.000000000 +0000
-@@ -27,6 +27,7 @@
+--- cups-1.4b2-svn8404/scheduler/conf.c.lspp	2009-04-17 16:48:03.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-17 16:48:03.000000000 +0100
+@@ -29,6 +29,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
   *   read_policy()            - Read a <Policy name> definition.
@@ -1525,7 +1525,7 @@
   */
  
  /*
-@@ -48,6 +49,9 @@
+@@ -50,6 +51,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
  
@@ -1535,7 +1535,7 @@
  
  /*
   * Configuration variable structure...
-@@ -169,6 +173,10 @@ static const cupsd_var_t	variables[] =
+@@ -171,6 +175,10 @@ static const cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
    { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1546,7 +1546,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -382,6 +390,9 @@ cupsdReadConfiguration(void)
+@@ -428,6 +436,9 @@ cupsdReadConfiguration(void)
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
    cupsd_policy_t *p;			/* Policy */
@@ -1556,7 +1556,7 @@
  
  
   /*
-@@ -665,6 +676,25 @@ cupsdReadConfiguration(void)
+@@ -714,6 +725,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1582,7 +1582,7 @@
    cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
                    RemoteAccessEnabled ? "enabled" : "disabled");
  
-@@ -981,11 +1011,23 @@ cupsdReadConfiguration(void)
+@@ -1072,11 +1102,23 @@ cupsdReadConfiguration(void)
    * Update classification setting as needed...
    */
  
@@ -1607,7 +1607,7 @@
  
   /*
    * Check the MaxClients setting, and then allocate memory for it...
-@@ -3536,6 +3578,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3634,6 +3676,18 @@ read_location(cups_file_t *fp,		/* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -1627,9 +1627,9 @@
  /*
   * 'read_policy()' - Read a <Policy name> definition.
 diff -up cups-1.4b2-svn8404/scheduler/conf.h.lspp cups-1.4b2-svn8404/scheduler/conf.h
---- cups-1.4b2-svn8404/scheduler/conf.h.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/conf.h	2009-03-05 11:40:03.000000000 +0000
-@@ -246,6 +246,12 @@ VAR char		*ServerKey		VALUE(NULL);
+--- cups-1.4b2-svn8404/scheduler/conf.h.lspp	2009-04-17 16:48:03.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-17 16:48:03.000000000 +0100
+@@ -259,6 +259,12 @@ VAR char		*ServerKey		VALUE(NULL);
  VAR int			SSLOptions		VALUE(CUPSD_SSL_NONE);
  					/* SSL/TLS options */
  #endif /* HAVE_SSL */
@@ -1642,7 +1642,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_KEEPALIVE);
-@@ -264,6 +270,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -277,6 +283,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1653,8 +1653,8 @@
  /*
   * Prototypes...
 diff -up cups-1.4b2-svn8404/scheduler/ipp.c.lspp cups-1.4b2-svn8404/scheduler/ipp.c
---- cups-1.4b2-svn8404/scheduler/ipp.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/ipp.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/ipp.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/ipp.c	2009-04-17 16:48:03.000000000 +0100
 @@ -41,6 +41,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2247,8 +2247,8 @@
    * Check the username against the owner...
    */
 diff -up cups-1.4b2-svn8404/scheduler/job.c.lspp cups-1.4b2-svn8404/scheduler/job.c
---- cups-1.4b2-svn8404/scheduler/job.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/job.c	2009-03-05 12:07:09.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/job.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/job.c	2009-04-17 16:48:03.000000000 +0100
 @@ -65,6 +65,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2643,7 +2643,7 @@
    */
 diff -up cups-1.4b2-svn8404/scheduler/job.h.lspp cups-1.4b2-svn8404/scheduler/job.h
 --- cups-1.4b2-svn8404/scheduler/job.h.lspp	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/job.h	2009-03-05 11:40:03.000000000 +0000
++++ cups-1.4b2-svn8404/scheduler/job.h	2009-04-17 16:48:03.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2670,8 +2670,8 @@
  
  
 diff -up cups-1.4b2-svn8404/scheduler/main.c.lspp cups-1.4b2-svn8404/scheduler/main.c
---- cups-1.4b2-svn8404/scheduler/main.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/main.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/main.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/main.c	2009-04-17 16:48:03.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -2740,8 +2740,8 @@
  }
  
 diff -up cups-1.4b2-svn8404/scheduler/printers.c.lspp cups-1.4b2-svn8404/scheduler/printers.c
---- cups-1.4b2-svn8404/scheduler/printers.c.lspp	2009-03-05 11:40:03.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/printers.c	2009-03-05 11:40:03.000000000 +0000
+--- cups-1.4b2-svn8404/scheduler/printers.c.lspp	2009-04-17 16:48:02.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/printers.c	2009-04-17 16:48:03.000000000 +0100
 @@ -58,6 +58,8 @@
   *   write_xml_string()         - Write a string with XML escaping.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- cups.spec	2 Apr 2009 11:50:24 -0000	1.469
+++ cups.spec	17 Apr 2009 16:34:28 -0000	1.470
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.13%{?dist}
+Release: 0.%{pre}.14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -49,6 +49,8 @@
 Patch23: cups-res_init.patch
 Patch26: cups-avahi.patch
 Patch27: cups-missing-devices.patch
+Patch28: cups-CVE-2009-0163.patch
+Patch29: cups-CVE-2009-0164.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -191,6 +193,8 @@
 %patch23 -p1 -b .res_init
 %patch26 -p1 -b .avahi
 %patch27 -p1 -b .missing-devices
+%patch28 -p1 -b .CVE-2009-0163
+%patch29 -p1 -b .CVE-2009-0164
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -472,6 +476,10 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.14
+- Applied patch to fix CVE-2009-0163 (bug #490596).
+- Applied patch to fix CVE-2009-0164 (bug #490597).
+
 * Thu Apr  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.13
 - Don't verify MD5 sum, file size, or mtime for several config files:
   cupsd.conf, client.conf, classes.conf, printers.conf, snmp.conf,



From kevin at fedoraproject.org  Fri Apr 17 16:34:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:34:36 +0000 (UTC)
Subject: rpms/ibus-table-extraphrase Makefile,NONE,1.1
Message-ID: <20090417163436.D07B770137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-table-extraphrase
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOo8946/rpms/ibus-table-extraphrase

Added Files:
	Makefile 
Log Message:
Setup of module ibus-table-extraphrase


--- NEW FILE Makefile ---
# Top level Makefile for module ibus-table-extraphrase
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:34:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:34:37 +0000 (UTC)
Subject: rpms/ibus-table-extraphrase/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090417163437.7E72A70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-table-extraphrase/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOo8946/rpms/ibus-table-extraphrase/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ibus-table-extraphrase


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ibus-table-extraphrase
# $Id: Makefile,v 1.1 2009/04/17 16:34:37 kevin Exp $
NAME := ibus-table-extraphrase
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:36:19 +0000
Subject: [pkgdb] nssbackup was added for cassmodiah
Message-ID: <20090417163619.32FF510F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package nssbackup with summary (Not so) Simple Backup Suite for desktop use
kevin has approved Package nssbackup
kevin has added a Fedora devel branch for nssbackup with an owner of cassmodiah
kevin has approved nssbackup in Fedora devel
kevin has approved Package nssbackup
kevin has set commit to Approved for provenpackager on nssbackup (Fedora devel)
kevin has set build to Approved for provenpackager on nssbackup (Fedora devel)
kevin has set checkout to Approved for provenpackager on nssbackup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Fri Apr 17 16:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:36:21 +0000
Subject: [pkgdb] nssbackup (Fedora, 11) updated by kevin
Message-ID: <20090417163621.6400A10F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for nssbackup
kevin has set commit to Approved for provenpackager on nssbackup (Fedora 11)
kevin has set build to Approved for provenpackager on nssbackup (Fedora 11)
kevin has set checkout to Approved for provenpackager on nssbackup (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Fri Apr 17 16:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:36:21 +0000
Subject: [pkgdb] nssbackup (Fedora, 10) updated by kevin
Message-ID: <20090417163621.522EC10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nssbackup
kevin has set commit to Approved for provenpackager on nssbackup (Fedora 10)
kevin has set build to Approved for provenpackager on nssbackup (Fedora 10)
kevin has set checkout to Approved for provenpackager on nssbackup (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From kevin at fedoraproject.org  Fri Apr 17 16:36:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:36:32 +0000 (UTC)
Subject: rpms/nssbackup - New directory
Message-ID: <20090417163632.33D667012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nssbackup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG9947/rpms/nssbackup

Log Message:
Directory /cvs/pkgs/rpms/nssbackup added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:36:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:36:32 +0000 (UTC)
Subject: rpms/nssbackup/devel - New directory
Message-ID: <20090417163632.7A17D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nssbackup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG9947/rpms/nssbackup/devel

Log Message:
Directory /cvs/pkgs/rpms/nssbackup/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 16:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:36:21 +0000
Subject: [pkgdb] nssbackup (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417163621.6B88610F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for nssbackup
kevin has set commit to Approved for provenpackager on nssbackup (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on nssbackup (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on nssbackup (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From kevin at fedoraproject.org  Fri Apr 17 16:36:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:36:43 +0000 (UTC)
Subject: rpms/nssbackup Makefile,NONE,1.1
Message-ID: <20090417163643.083D27012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nssbackup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG9947/rpms/nssbackup

Added Files:
	Makefile 
Log Message:
Setup of module nssbackup


--- NEW FILE Makefile ---
# Top level Makefile for module nssbackup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:36:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:36:43 +0000 (UTC)
Subject: rpms/nssbackup/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417163643.5CCB57012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nssbackup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG9947/rpms/nssbackup/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nssbackup


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nssbackup
# $Id: Makefile,v 1.1 2009/04/17 16:36:43 kevin Exp $
NAME := nssbackup
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:38:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:38:31 +0000
Subject: [pkgdb] mingw32-libxml++ was added for sailer
Message-ID: <20090417163831.5015010F80C@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-libxml++ with summary MinGW Windows C++ wrapper for libxml2
kevin has approved Package mingw32-libxml++
kevin has added a Fedora devel branch for mingw32-libxml++ with an owner of sailer
kevin has approved mingw32-libxml++ in Fedora devel
kevin has approved Package mingw32-libxml++
kevin has set commit to Approved for provenpackager on mingw32-libxml++ (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libxml++ (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libxml++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml++



From pkgdb at fedoraproject.org  Fri Apr 17 16:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:39:49 +0000
Subject: [pkgdb] mingw32-libxml++ (Fedora, 10) updated by kevin
Message-ID: <20090417163949.5035B10F86B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libxml++
kevin has set commit to Approved for provenpackager on mingw32-libxml++ (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libxml++ (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libxml++ (Fedora 10)
kevin approved watchbugzilla on mingw32-libxml++ (Fedora 10) for rjones
kevin approved watchcommits on mingw32-libxml++ (Fedora 10) for rjones
kevin approved commit on mingw32-libxml++ (Fedora 10) for rjones
kevin approved build on mingw32-libxml++ (Fedora 10) for rjones
kevin approved approveacls on mingw32-libxml++ (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml++



From pkgdb at fedoraproject.org  Fri Apr 17 16:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:39:49 +0000
Subject: [pkgdb] mingw32-libxml++ (Fedora, devel) updated by kevin
Message-ID: <20090417163949.6A3EF10F884@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libxml++ (Fedora devel) for rjones
kevin approved watchcommits on mingw32-libxml++ (Fedora devel) for rjones
kevin approved commit on mingw32-libxml++ (Fedora devel) for rjones
kevin approved build on mingw32-libxml++ (Fedora devel) for rjones
kevin approved approveacls on mingw32-libxml++ (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml++



From pkgdb at fedoraproject.org  Fri Apr 17 16:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:39:49 +0000
Subject: [pkgdb] mingw32-libxml++ (Fedora, 11) updated by kevin
Message-ID: <20090417163949.6242D10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-libxml++
kevin has set commit to Approved for provenpackager on mingw32-libxml++ (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-libxml++ (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-libxml++ (Fedora 11)
kevin approved watchbugzilla on mingw32-libxml++ (Fedora 11) for rjones
kevin approved watchcommits on mingw32-libxml++ (Fedora 11) for rjones
kevin approved commit on mingw32-libxml++ (Fedora 11) for rjones
kevin approved build on mingw32-libxml++ (Fedora 11) for rjones
kevin approved approveacls on mingw32-libxml++ (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml++



From kevin at fedoraproject.org  Fri Apr 17 16:40:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:40:17 +0000 (UTC)
Subject: rpms/mingw32-libxml++ - New directory
Message-ID: <20090417164017.2DA227012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml++
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10540/rpms/mingw32-libxml++

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libxml++ added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:40:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:40:17 +0000 (UTC)
Subject: rpms/mingw32-libxml++/devel - New directory
Message-ID: <20090417164017.6FA387012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml++/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10540/rpms/mingw32-libxml++/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libxml++/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:40:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:40:29 +0000 (UTC)
Subject: rpms/mingw32-libxml++ Makefile,NONE,1.1
Message-ID: <20090417164029.15F847012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml++
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10540/rpms/mingw32-libxml++

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libxml++


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libxml++
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:40:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:40:29 +0000 (UTC)
Subject: rpms/mingw32-libxml++/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417164029.A56AB7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml++/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10540/rpms/mingw32-libxml++/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libxml++


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libxml++
# $Id: Makefile,v 1.1 2009/04/17 16:40:29 kevin Exp $
NAME := mingw32-libxml++
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:41:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:41:04 +0000
Subject: [pkgdb] mingw32-opensc was added for kalev
Message-ID: <20090417164104.BE15510F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-opensc with summary MingGW Windows OpenSC library
kevin has approved Package mingw32-opensc
kevin has added a Fedora devel branch for mingw32-opensc with an owner of kalev
kevin has approved mingw32-opensc in Fedora devel
kevin has approved Package mingw32-opensc
kevin has set commit to Approved for provenpackager on mingw32-opensc (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-opensc (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-opensc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-opensc



From pkgdb at fedoraproject.org  Fri Apr 17 16:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:41:07 +0000
Subject: [pkgdb] mingw32-opensc (Fedora, 10) updated by kevin
Message-ID: <20090417164107.8890710F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-opensc
kevin has set commit to Approved for provenpackager on mingw32-opensc (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-opensc (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-opensc (Fedora 10)
kevin approved watchbugzilla on mingw32-opensc (Fedora 10) for rjones
kevin approved watchcommits on mingw32-opensc (Fedora 10) for rjones
kevin approved commit on mingw32-opensc (Fedora 10) for rjones
kevin approved build on mingw32-opensc (Fedora 10) for rjones
kevin approved approveacls on mingw32-opensc (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-opensc



From pkgdb at fedoraproject.org  Fri Apr 17 16:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:41:07 +0000
Subject: [pkgdb] mingw32-opensc (Fedora, 11) updated by kevin
Message-ID: <20090417164107.912D710F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-opensc
kevin has set commit to Approved for provenpackager on mingw32-opensc (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-opensc (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-opensc (Fedora 11)
kevin approved watchbugzilla on mingw32-opensc (Fedora 11) for rjones
kevin approved watchcommits on mingw32-opensc (Fedora 11) for rjones
kevin approved commit on mingw32-opensc (Fedora 11) for rjones
kevin approved build on mingw32-opensc (Fedora 11) for rjones
kevin approved approveacls on mingw32-opensc (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-opensc



From kevin at fedoraproject.org  Fri Apr 17 16:41:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:41:18 +0000 (UTC)
Subject: rpms/mingw32-opensc - New directory
Message-ID: <20090417164118.377D47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-opensc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10879/rpms/mingw32-opensc

Log Message:
Directory /cvs/pkgs/rpms/mingw32-opensc added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 16:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:41:07 +0000
Subject: [pkgdb] mingw32-opensc (Fedora, devel) updated by kevin
Message-ID: <20090417164107.9937910F88A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-opensc (Fedora devel) for rjones
kevin approved watchcommits on mingw32-opensc (Fedora devel) for rjones
kevin approved commit on mingw32-opensc (Fedora devel) for rjones
kevin approved build on mingw32-opensc (Fedora devel) for rjones
kevin approved approveacls on mingw32-opensc (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-opensc



From kevin at fedoraproject.org  Fri Apr 17 16:41:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:41:18 +0000 (UTC)
Subject: rpms/mingw32-opensc/devel - New directory
Message-ID: <20090417164118.998717012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-opensc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10879/rpms/mingw32-opensc/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-opensc/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:41:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:41:28 +0000 (UTC)
Subject: rpms/mingw32-opensc Makefile,NONE,1.1
Message-ID: <20090417164128.BE1557012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-opensc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10879/rpms/mingw32-opensc

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-opensc


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-opensc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:41:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:41:29 +0000 (UTC)
Subject: rpms/mingw32-opensc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417164129.9FEC47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-opensc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10879/rpms/mingw32-opensc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-opensc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-opensc
# $Id: Makefile,v 1.1 2009/04/17 16:41:29 kevin Exp $
NAME := mingw32-opensc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From davej at fedoraproject.org  Fri Apr 17 16:41:59 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 17 Apr 2009 16:41:59 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc2-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1051, 1.1052 kernel.spec, 1.1520, 1.1521 sources, 1.1013,
	1.1014 upstream, 1.924, 1.925 patch-2.6.30-rc2-git1.bz2.sign,
	1.1, NONE
Message-ID: <20090417164159.A833F7012B@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10947

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc2-git3.bz2.sign 
Removed Files:
	patch-2.6.30-rc2-git1.bz2.sign 
Log Message:
2.6.30-rc2-git3


--- NEW FILE patch-2.6.30-rc2-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ6G/3yGugalF9Dw4RAqq7AJ99HBxZSfafG15j5MJt5Pa7vwMjMgCglZlx
O+Kq1eN6X/ijmUKEuG6ZnBU=
=ZZGp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1051
retrieving revision 1.1052
diff -u -r1.1051 -r1.1052
--- .cvsignore	16 Apr 2009 15:50:01 -0000	1.1051
+++ .cvsignore	17 Apr 2009 16:41:26 -0000	1.1052
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git1.bz2
+patch-2.6.30-rc2-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1520
retrieving revision 1.1521
diff -u -r1.1520 -r1.1521
--- kernel.spec	16 Apr 2009 15:50:01 -0000	1.1520
+++ kernel.spec	17 Apr 2009 16:41:27 -0000	1.1521
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1824,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Fri Apr 17 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git3
+
 * Thu Apr 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.58.rc2.git1
 - 2.6.30-rc2-git1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -r1.1013 -r1.1014
--- sources	16 Apr 2009 15:50:01 -0000	1.1013
+++ sources	17 Apr 2009 16:41:28 -0000	1.1014
@@ -1,3 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 4c58a960ae5130ec1126fe33409425d1  patch-2.6.30-rc2.bz2
-cf17cca2e8100006e25b34d02fe93ae1  patch-2.6.30-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- upstream	16 Apr 2009 15:50:01 -0000	1.924
+++ upstream	17 Apr 2009 16:41:29 -0000	1.925
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git1.bz2
+patch-2.6.30-rc2-git3.bz2


--- patch-2.6.30-rc2-git1.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:44:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:44:21 +0000
Subject: [pkgdb] mingw32-libglade2 was added for sailer
Message-ID: <20090417164421.612E110F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-libglade2 with summary MinGW Windows Libglade2 library
kevin has approved Package mingw32-libglade2
kevin has added a Fedora devel branch for mingw32-libglade2 with an owner of sailer
kevin has approved mingw32-libglade2 in Fedora devel
kevin has approved Package mingw32-libglade2
kevin has set commit to Approved for provenpackager on mingw32-libglade2 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libglade2 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libglade2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglade2



From pkgdb at fedoraproject.org  Fri Apr 17 16:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:44:24 +0000
Subject: [pkgdb] mingw32-libglade2 (Fedora, 10) updated by kevin
Message-ID: <20090417164424.8C07310F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libglade2
kevin has set commit to Approved for provenpackager on mingw32-libglade2 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libglade2 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libglade2 (Fedora 10)
kevin approved watchbugzilla on mingw32-libglade2 (Fedora 10) for rjones
kevin approved watchcommits on mingw32-libglade2 (Fedora 10) for rjones
kevin approved commit on mingw32-libglade2 (Fedora 10) for rjones
kevin approved build on mingw32-libglade2 (Fedora 10) for rjones
kevin approved approveacls on mingw32-libglade2 (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglade2



From pkgdb at fedoraproject.org  Fri Apr 17 16:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:44:24 +0000
Subject: [pkgdb] mingw32-libglade2 (Fedora, devel) updated by kevin
Message-ID: <20090417164424.9929310F884@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libglade2 (Fedora devel) for rjones
kevin approved watchcommits on mingw32-libglade2 (Fedora devel) for rjones
kevin approved commit on mingw32-libglade2 (Fedora devel) for rjones
kevin approved build on mingw32-libglade2 (Fedora devel) for rjones
kevin approved approveacls on mingw32-libglade2 (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglade2



From pkgdb at fedoraproject.org  Fri Apr 17 16:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:44:24 +0000
Subject: [pkgdb] mingw32-libglade2 (Fedora, 11) updated by kevin
Message-ID: <20090417164424.A173210F889@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-libglade2
kevin has set commit to Approved for provenpackager on mingw32-libglade2 (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-libglade2 (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-libglade2 (Fedora 11)
kevin approved watchbugzilla on mingw32-libglade2 (Fedora 11) for rjones
kevin approved watchcommits on mingw32-libglade2 (Fedora 11) for rjones
kevin approved commit on mingw32-libglade2 (Fedora 11) for rjones
kevin approved build on mingw32-libglade2 (Fedora 11) for rjones
kevin approved approveacls on mingw32-libglade2 (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglade2



From kevin at fedoraproject.org  Fri Apr 17 16:44:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:44:42 +0000 (UTC)
Subject: rpms/mingw32-libglade2 - New directory
Message-ID: <20090417164442.288917012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglade2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11526/rpms/mingw32-libglade2

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libglade2 added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:44:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:44:42 +0000 (UTC)
Subject: rpms/mingw32-libglade2/devel - New directory
Message-ID: <20090417164442.6ABA97012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglade2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11526/rpms/mingw32-libglade2/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libglade2/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:44:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:44:52 +0000 (UTC)
Subject: rpms/mingw32-libglade2 Makefile,NONE,1.1
Message-ID: <20090417164452.0E5F37012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglade2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11526/rpms/mingw32-libglade2

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libglade2


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libglade2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:44:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:44:52 +0000 (UTC)
Subject: rpms/mingw32-libglade2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090417164452.679367012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglade2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV11526/rpms/mingw32-libglade2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libglade2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libglade2
# $Id: Makefile,v 1.1 2009/04/17 16:44:52 kevin Exp $
NAME := mingw32-libglade2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:45:33 +0000
Subject: [pkgdb] canto was added for th0br0
Message-ID: <20090417164533.5CE7610F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package canto with summary Atom/RSS feed reader based on ncurses
kevin has approved Package canto
kevin has added a Fedora devel branch for canto with an owner of th0br0
kevin has approved canto in Fedora devel
kevin has approved Package canto
kevin has set commit to Approved for provenpackager on canto (Fedora devel)
kevin has set build to Approved for provenpackager on canto (Fedora devel)
kevin has set checkout to Approved for provenpackager on canto (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/canto



From pkgdb at fedoraproject.org  Fri Apr 17 16:45:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:45:35 +0000
Subject: [pkgdb] canto (Fedora, 10) updated by kevin
Message-ID: <20090417164536.2F41510F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for canto
kevin has set commit to Approved for provenpackager on canto (Fedora 10)
kevin has set build to Approved for provenpackager on canto (Fedora 10)
kevin has set checkout to Approved for provenpackager on canto (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/canto



From pkgdb at fedoraproject.org  Fri Apr 17 16:45:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:45:36 +0000
Subject: [pkgdb] canto (Fedora, 11) updated by kevin
Message-ID: <20090417164536.367BD10F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for canto
kevin has set commit to Approved for provenpackager on canto (Fedora 11)
kevin has set build to Approved for provenpackager on canto (Fedora 11)
kevin has set checkout to Approved for provenpackager on canto (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/canto



From kevin at fedoraproject.org  Fri Apr 17 16:45:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:45:57 +0000 (UTC)
Subject: rpms/canto - New directory
Message-ID: <20090417164557.3E98A7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/canto
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11916/rpms/canto

Log Message:
Directory /cvs/pkgs/rpms/canto added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:45:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:45:57 +0000 (UTC)
Subject: rpms/canto/devel - New directory
Message-ID: <20090417164557.9630D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/canto/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11916/rpms/canto/devel

Log Message:
Directory /cvs/pkgs/rpms/canto/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:46:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:46:27 +0000 (UTC)
Subject: rpms/canto Makefile,NONE,1.1
Message-ID: <20090417164627.A1A6B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/canto
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11916/rpms/canto

Added Files:
	Makefile 
Log Message:
Setup of module canto


--- NEW FILE Makefile ---
# Top level Makefile for module canto
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:46:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:46:28 +0000 (UTC)
Subject: rpms/canto/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090417164628.D2DCE7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/canto/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11916/rpms/canto/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module canto


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: canto
# $Id: Makefile,v 1.1 2009/04/17 16:46:28 kevin Exp $
NAME := canto
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From stefan at fedoraproject.org  Fri Apr 17 16:47:02 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 16:47:02 +0000 (UTC)
Subject: rpms/synopsis/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 synopsis.spec, 1.3, 1.4
Message-ID: <20090417164702.506DC7012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12067

Modified Files:
	.cvsignore sources synopsis.spec 
Log Message:
Update to 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2008 16:49:14 -0000	1.2
+++ .cvsignore	17 Apr 2009 16:46:31 -0000	1.3
@@ -1 +1 @@
-synopsis-0.11.tar.gz
+synopsis-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2008 16:49:14 -0000	1.2
+++ sources	17 Apr 2009 16:46:32 -0000	1.3
@@ -1 +1 @@
-c9b10905246c3de958fd72722520b09e  synopsis-0.11.tar.gz
+05873f569bbfc9a15d6b8dd5321a9dd1  synopsis-0.12.tar.gz


Index: synopsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/devel/synopsis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- synopsis.spec	2 Mar 2009 17:16:04 -0000	1.3
+++ synopsis.spec	17 Apr 2009 16:46:32 -0000	1.4
@@ -1,6 +1,6 @@
 %define name synopsis
-%define version 0.11
-%define release 3
+%define version 0.12
+%define release 1
 %define py_sitedir %(%{__python} -c "from distutils.sysconfig  import get_python_lib; print get_python_lib()")
 %define py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %define url http://synopsis.fresco.org
@@ -129,6 +129,9 @@
 %{_docdir}/synopsis-%{version}/NEWS
 
 %changelog
+* Thu Apr 17 2009 Stefan Seefeld <stefan at fresco.org> 0.12-1
+- Bump version number.
+
 * Mon Mar 02 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11-3
 - include stdio.h for EOF, ostream for std::ostream
 



From pkgdb at fedoraproject.org  Fri Apr 17 16:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:47:05 +0000
Subject: [pkgdb] griffith was added for cassmodiah
Message-ID: <20090417164705.7847110F86B@bastion2.fedora.phx.redhat.com>

kevin has added Package griffith with summary Media collection manager
kevin has approved Package griffith
kevin has added a Fedora devel branch for griffith with an owner of cassmodiah
kevin has approved griffith in Fedora devel
kevin has approved Package griffith
kevin has set commit to Approved for provenpackager on griffith (Fedora devel)
kevin has set build to Approved for provenpackager on griffith (Fedora devel)
kevin has set checkout to Approved for provenpackager on griffith (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From pkgdb at fedoraproject.org  Fri Apr 17 16:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:47:07 +0000
Subject: [pkgdb] griffith (Fedora, 11) updated by kevin
Message-ID: <20090417164707.CB8D510F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for griffith
kevin has set commit to Approved for provenpackager on griffith (Fedora 11)
kevin has set build to Approved for provenpackager on griffith (Fedora 11)
kevin has set checkout to Approved for provenpackager on griffith (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From kevin at fedoraproject.org  Fri Apr 17 16:47:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:47:19 +0000 (UTC)
Subject: rpms/griffith - New directory
Message-ID: <20090417164719.37DDE7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/griffith
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12379/rpms/griffith

Log Message:
Directory /cvs/pkgs/rpms/griffith added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:47:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:47:19 +0000 (UTC)
Subject: rpms/griffith/devel - New directory
Message-ID: <20090417164719.76A0E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/griffith/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12379/rpms/griffith/devel

Log Message:
Directory /cvs/pkgs/rpms/griffith/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:47:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:47:30 +0000 (UTC)
Subject: rpms/griffith Makefile,NONE,1.1
Message-ID: <20090417164730.2C3527012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/griffith
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12379/rpms/griffith

Added Files:
	Makefile 
Log Message:
Setup of module griffith


--- NEW FILE Makefile ---
# Top level Makefile for module griffith
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:47:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:47:30 +0000 (UTC)
Subject: rpms/griffith/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417164730.D5BE97012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/griffith/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12379/rpms/griffith/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module griffith


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: griffith
# $Id: Makefile,v 1.1 2009/04/17 16:47:30 kevin Exp $
NAME := griffith
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:49:17 +0000
Subject: [pkgdb] zynjacku was added for oget
Message-ID: <20090417164917.20B9610F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package zynjacku with summary LV2 synths and plugins host
kevin has approved Package zynjacku
kevin has added a Fedora devel branch for zynjacku with an owner of oget
kevin has approved zynjacku in Fedora devel
kevin has approved Package zynjacku
kevin has set commit to Approved for provenpackager on zynjacku (Fedora devel)
kevin has set build to Approved for provenpackager on zynjacku (Fedora devel)
kevin has set checkout to Approved for provenpackager on zynjacku (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zynjacku



From rdieter at fedoraproject.org  Fri Apr 17 16:49:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 16:49:18 +0000 (UTC)
Subject: rpms/xine-lib/F-9 xine-lib.spec, 1.55,
	1.56 xine-lib-1.1.16-old-caca.patch, 1.1, NONE
Message-ID: <20090417164918.976167012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12711

Modified Files:
	xine-lib.spec 
Removed Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2.1
- drop old_caca hacks/patches (F-9)



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xine-lib.spec	10 Apr 2009 18:42:53 -0000	1.55
+++ xine-lib.spec	17 Apr 2009 16:48:48 -0000	1.56
@@ -13,10 +13,6 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} <= 9
-    %define     old_caca    1
-%endif
-
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
@@ -34,7 +30,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +46,6 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
-Patch7:         %{name}-1.1.16-old-caca.patch
 # http://bugzilla.redhat.com/470568
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
@@ -79,11 +74,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?old_caca}
-BuildRequires:  libcaca-devel >= 0.99
-%else
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
-%endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -190,9 +181,6 @@
 
 %prep
 %setup -q
-%if 0%{?old_caca}
-sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure.ac
-%endif
 %patch0 -p1 -b .autotools
 touch -r configure.ac aclocal.m4
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
@@ -202,11 +190,6 @@
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
 
-%if 0%{?old_caca}
-sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
-%patch7 -p0 -b .old-caca
-%endif
-
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 %patch50 -p1 -b .mod_mimetypes_typo
@@ -442,6 +425,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2.1
+- drop old_caca hacks/patches (F-9)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
 - fix modtracker mimetypes
 


--- xine-lib-1.1.16-old-caca.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Apr 17 16:50:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:50:34 +0000
Subject: [pkgdb] zynjacku (Fedora, 11) updated by kevin
Message-ID: <20090417165034.1352310F86B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for zynjacku
kevin has set commit to Approved for provenpackager on zynjacku (Fedora 11)
kevin has set build to Approved for provenpackager on zynjacku (Fedora 11)
kevin has set checkout to Approved for provenpackager on zynjacku (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zynjacku



From kevin at fedoraproject.org  Fri Apr 17 16:51:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:51:07 +0000 (UTC)
Subject: rpms/zynjacku - New directory
Message-ID: <20090417165107.3E7717012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zynjacku
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13126/rpms/zynjacku

Log Message:
Directory /cvs/pkgs/rpms/zynjacku added to the repository




From kevin at fedoraproject.org  Fri Apr 17 16:51:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:51:07 +0000 (UTC)
Subject: rpms/zynjacku/devel - New directory
Message-ID: <20090417165107.A7CFE7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zynjacku/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13126/rpms/zynjacku/devel

Log Message:
Directory /cvs/pkgs/rpms/zynjacku/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 16:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 16:50:55 +0000
Subject: [pkgdb] zynjacku (Fedora, 10) updated by kevin
Message-ID: <20090417165055.E074D10F85A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for zynjacku
kevin has set commit to Approved for provenpackager on zynjacku (Fedora 10)
kevin has set build to Approved for provenpackager on zynjacku (Fedora 10)
kevin has set checkout to Approved for provenpackager on zynjacku (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zynjacku



From kevin at fedoraproject.org  Fri Apr 17 16:51:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:51:24 +0000 (UTC)
Subject: rpms/zynjacku Makefile,NONE,1.1
Message-ID: <20090417165124.9C9B47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zynjacku
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13126/rpms/zynjacku

Added Files:
	Makefile 
Log Message:
Setup of module zynjacku


--- NEW FILE Makefile ---
# Top level Makefile for module zynjacku
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 16:51:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 16:51:25 +0000 (UTC)
Subject: rpms/zynjacku/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417165125.606117012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zynjacku/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq13126/rpms/zynjacku/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zynjacku


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zynjacku
# $Id: Makefile,v 1.1 2009/04/17 16:51:25 kevin Exp $
NAME := zynjacku
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From denis at fedoraproject.org  Fri Apr 17 16:51:25 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 17 Apr 2009 16:51:25 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.44,1.45
Message-ID: <20090417165125.83D1E7012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13046

Modified Files:
	brasero.spec 
Log Message:
Obsoletes nautilus-cd-burner


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- brasero.spec	14 Apr 2009 17:27:48 -0000	1.44
+++ brasero.spec	17 Apr 2009 16:50:54 -0000	1.45
@@ -1,7 +1,7 @@
 
 Name:      brasero
 Version:   2.26.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -65,6 +65,8 @@
 Summary:   Nautilus extension for %{name}
 Group:     User Interface/Desktops
 
+Provides:  nautilus-cd-burner = %{version}-%{release}
+Obsoletes: nautilus-cd-burner < 2.25.4
 
 %description nautilus
 The %{name}-nautilus package contains the brasero nautilus extension.
@@ -201,6 +203,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Denis Leroy <denis at poolshark.org> - 2.26.1-2
+- Obsoletes nautilus-cd-burner
+
 * Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/brasero/2.26/brasero-2.26.1.news



From stefan at fedoraproject.org  Fri Apr 17 16:52:00 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 16:52:00 +0000 (UTC)
Subject: rpms/synopsis/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 synopsis.spec, 1.1, 1.2
Message-ID: <20090417165200.E63217012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13206

Modified Files:
	.cvsignore sources synopsis.spec 
Log Message:
Update to 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2008 17:01:28 -0000	1.2
+++ .cvsignore	17 Apr 2009 16:51:30 -0000	1.3
@@ -1 +1 @@
-synopsis-0.11.tar.gz
+synopsis-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2008 17:01:28 -0000	1.2
+++ sources	17 Apr 2009 16:51:30 -0000	1.3
@@ -1 +1 @@
-c9b10905246c3de958fd72722520b09e  synopsis-0.11.tar.gz
+05873f569bbfc9a15d6b8dd5321a9dd1  synopsis-0.12.tar.gz


Index: synopsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-10/synopsis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synopsis.spec	29 Dec 2008 17:01:28 -0000	1.1
+++ synopsis.spec	17 Apr 2009 16:51:30 -0000	1.2
@@ -1,5 +1,5 @@
 %define name synopsis
-%define version 0.11
+%define version 0.12
 %define release 1
 %define py_sitedir %(%{__python} -c "from distutils.sysconfig  import get_python_lib; print get_python_lib()")
 %define py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@@ -127,5 +127,8 @@
 %{_docdir}/synopsis-%{version}/NEWS
 
 %changelog
+* Thu Apr 17 2009 Stefan Seefeld <stefan at fresco.org> 0.12-1
+- Bump version number.
+
 * Fri Dec 26 2008 Stefan Seefeld <stefan at fresco.org> 0.11-1
 - initial package.



From denis at fedoraproject.org  Fri Apr 17 16:53:00 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 17 Apr 2009 16:53:00 +0000 (UTC)
Subject: rpms/brasero/F-11 brasero.spec,1.44,1.45
Message-ID: <20090417165300.770517012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/brasero/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13447

Modified Files:
	brasero.spec 
Log Message:
Obsoletes nautilus-cd-burner


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-11/brasero.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- brasero.spec	14 Apr 2009 17:27:48 -0000	1.44
+++ brasero.spec	17 Apr 2009 16:52:30 -0000	1.45
@@ -1,7 +1,7 @@
 
 Name:      brasero
 Version:   2.26.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -65,6 +65,8 @@
 Summary:   Nautilus extension for %{name}
 Group:     User Interface/Desktops
 
+Provides:  nautilus-cd-burner = %{version}-%{release}
+Obsoletes: nautilus-cd-burner < 2.25.4
 
 %description nautilus
 The %{name}-nautilus package contains the brasero nautilus extension.
@@ -201,6 +203,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Denis Leroy <denis at poolshark.org> - 2.26.1-2
+- Obsoletes nautilus-cd-burner
+
 * Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/brasero/2.26/brasero-2.26.1.news



From stefan at fedoraproject.org  Fri Apr 17 16:53:40 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 16:53:40 +0000 (UTC)
Subject: rpms/synopsis/F-9 synopsis.spec,1.1,1.2
Message-ID: <20090417165340.0ED707012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13523

Modified Files:
	synopsis.spec 
Log Message:
Update to 0.12


Index: synopsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-9/synopsis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synopsis.spec	29 Dec 2008 16:52:17 -0000	1.1
+++ synopsis.spec	17 Apr 2009 16:53:09 -0000	1.2
@@ -1,5 +1,5 @@
 %define name synopsis
-%define version 0.11
+%define version 0.12
 %define release 1
 %define py_sitedir %(%{__python} -c "from distutils.sysconfig  import get_python_lib; print get_python_lib()")
 %define py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@@ -127,5 +127,8 @@
 %{_docdir}/synopsis-%{version}/NEWS
 
 %changelog
+* Thu Apr 17 2009 Stefan Seefeld <stefan at fresco.org> 0.12-1
+- Bump version number.
+
 * Fri Dec 26 2008 Stefan Seefeld <stefan at fresco.org> 0.11-1
 - initial package.



From rdieter at fedoraproject.org  Fri Apr 17 16:56:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 16:56:53 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec, 1.74,
	1.75 xine-lib-1.1.16-old-caca.patch, 1.1, NONE
Message-ID: <20090417165653.DE4C67012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13967

Modified Files:
	xine-lib.spec 
Removed Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
sync from F-9/ branch



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xine-lib.spec	10 Apr 2009 15:17:17 -0000	1.74
+++ xine-lib.spec	17 Apr 2009 16:56:23 -0000	1.75
@@ -13,10 +13,6 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} <= 9
-    %define     old_caca    1
-%endif
-
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
@@ -34,7 +30,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +46,6 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
-Patch7:         %{name}-1.1.16-old-caca.patch
 # http://bugzilla.redhat.com/470568
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
@@ -79,11 +74,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?old_caca}
-BuildRequires:  libcaca-devel >= 0.99
-%else
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
-%endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -190,9 +181,6 @@
 
 %prep
 %setup -q
-%if 0%{?old_caca}
-sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure.ac
-%endif
 %patch0 -p1 -b .autotools
 touch -r configure.ac aclocal.m4
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
@@ -202,11 +190,6 @@
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
 
-%if 0%{?old_caca}
-sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
-%patch7 -p0 -b .old-caca
-%endif
-
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 %patch50 -p1 -b .mod_mimetypes_typo
@@ -442,6 +425,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2.1
+- drop old_caca hacks/patches (F-9)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-2
 - fix modtracker mimetypes
 


--- xine-lib-1.1.16-old-caca.patch DELETED ---



From overholt at fedoraproject.org  Fri Apr 17 16:59:24 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 17 Apr 2009 16:59:24 +0000 (UTC)
Subject: rpms/json/devel import.log, NONE, 1.1 json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417165924.2CECC7012B@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14341/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log json.spec 
Log Message:
Initial import of package.


--- NEW FILE import.log ---
json-2-1_fc10:HEAD:json-2-1.fc10.src.rpm:1239987393


--- NEW FILE json.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:       json
Summary:    JavaScript Object Notation
URL:        http://www.json.org/java/index.html
Version:    2
Release:    1%{?dist}
License:    ASL 2.0
Group:      Development/Libraries
BuildArch:  noarch
Source0:    http://www.json.org/java/apache.zip
BuildRequires:  jpackage-utils
BuildRequires:  java-devel

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
JSON (JavaScript Object Notation) is a lightweight data-interchange format.
It is based on a subset of the JavaScript Programming Language, Standard
ECMA-262 3rd Edition - December 1999.  JSON is a text format that is 
completely language independent but uses conventions that are familiar to 
programmers of the C-family of languages including C, C++, C#, Java, 
JavaScript, Perl, Python, and many others.

%package javadoc
Summary:    Javadoc for %{name}
Group:      Documentation

%description javadoc
%{summary}.

%prep
%setup -q -c -n %{name}-%{version}
mkdir -p src/org
mv apache src/org

%build
export JAVA_HOME=%{_jvmdir}/java
mkdir -p target/classes
$JAVA_HOME/bin/javac -d target/classes $(find src -name "*.java")
$JAVA_HOME/bin/jar cf target/%{name}.jar -C target/classes org
mkdir -p target/site/apidocs
$JAVA_HOME/bin/javadoc -d target/site/apidocs $(find src -name "*.java")

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*

%files javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}-%{version}

%changelog
* Tue Apr 14 2009 Andrew Overholt <overholt at redhat.com> 2-1
- Some cleanups for Fedora (license, version, tabs vs. spaces).
- Remove maven POM file of unknown origin.
- Use APL-licensed source zip.

* Fri Jan 23 2009 Ralph Apel <r.apel at r-apel.de> 0:20080425-1.jpp5
- First release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:32:19 -0000	1.1
+++ .cvsignore	17 Apr 2009 16:58:53 -0000	1.2
@@ -0,0 +1 @@
+apache.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:32:19 -0000	1.1
+++ sources	17 Apr 2009 16:58:53 -0000	1.2
@@ -0,0 +1 @@
+8f822e604866f92fde5c7b3f67b66809  apache.zip



From stefan at fedoraproject.org  Fri Apr 17 17:00:05 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 17:00:05 +0000 (UTC)
Subject: rpms/synopsis/F-11 synopsis.spec,1.3,1.4
Message-ID: <20090417170005.415127012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14458

Modified Files:
	synopsis.spec 
Log Message:
Update to 0.12


Index: synopsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-11/synopsis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- synopsis.spec	2 Mar 2009 17:16:04 -0000	1.3
+++ synopsis.spec	17 Apr 2009 16:59:33 -0000	1.4
@@ -1,6 +1,6 @@
 %define name synopsis
-%define version 0.11
-%define release 3
+%define version 0.12
+%define release 1
 %define py_sitedir %(%{__python} -c "from distutils.sysconfig  import get_python_lib; print get_python_lib()")
 %define py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %define url http://synopsis.fresco.org
@@ -22,8 +22,6 @@
 Requires: python-docutils
 Requires: graphviz
 
-Patch0: synopsis-0.11-includes.patch
-
 %description
 Synopsis is a multi-language source code introspection tool that
 provides a variety of representations for the parsed code, to
@@ -59,7 +57,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
 env CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 python setup.py config --with-gc-prefix=%{_prefix} --libdir=%{_libdir}
 
@@ -129,6 +126,9 @@
 %{_docdir}/synopsis-%{version}/NEWS
 
 %changelog
+* Thu Apr 17 2009 Stefan Seefeld <stefan at fresco.org> 0.12-1
+- Bump version number.
+
 * Mon Mar 02 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11-3
 - include stdio.h for EOF, ostream for std::ostream
 



From stefan at fedoraproject.org  Fri Apr 17 17:01:11 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 17:01:11 +0000 (UTC)
Subject: rpms/synopsis/devel synopsis.spec,1.4,1.5
Message-ID: <20090417170111.2A0F27012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14688

Modified Files:
	synopsis.spec 
Log Message:
Remove obsolete patch.


Index: synopsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/devel/synopsis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- synopsis.spec	17 Apr 2009 16:46:32 -0000	1.4
+++ synopsis.spec	17 Apr 2009 17:01:10 -0000	1.5
@@ -22,8 +22,6 @@
 Requires: python-docutils
 Requires: graphviz
 
-Patch0: synopsis-0.11-includes.patch
-
 %description
 Synopsis is a multi-language source code introspection tool that
 provides a variety of representations for the parsed code, to
@@ -59,7 +57,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
 env CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 python setup.py config --with-gc-prefix=%{_prefix} --libdir=%{_libdir}
 



From mcpierce at fedoraproject.org  Fri Apr 17 17:05:42 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Fri, 17 Apr 2009 17:05:42 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-11 rubygem-hoe.spec,1.18,1.19
Message-ID: <20090417170542.9759F7013C@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15166

Modified Files:
	rubygem-hoe.spec 
Log Message:
Bumped the release to .1 to overcome a tag issue with F11.



Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/rubygem-hoe.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rubygem-hoe.spec	17 Apr 2009 16:29:28 -0000	1.18
+++ rubygem-hoe.spec	17 Apr 2009 17:05:11 -0000	1.19
@@ -6,7 +6,7 @@
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
 Version:    	1.12.2
-Release:    	1%{?dist}
+Release:    	1%{?dist}.1
 Group:      	Development/Languages
 License:    	MIT
 URL:        	http://rubyforge.org/projects/seattlerb/



From sailer at fedoraproject.org  Fri Apr 17 17:22:57 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 17:22:57 +0000 (UTC)
Subject: rpms/mingw32-libglade2/devel libglade-2.0.1-nowarning.patch, NONE, 
	1.1 libglade-secondary.patch, NONE, 1.1 mingw32-libglade2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417172257.3243A7012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglade2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18215

Modified Files:
	.cvsignore sources 
Added Files:
	libglade-2.0.1-nowarning.patch libglade-secondary.patch 
	mingw32-libglade2.spec 
Log Message:
import from review


libglade-2.0.1-nowarning.patch:

--- NEW FILE libglade-2.0.1-nowarning.patch ---
--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
+++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
@@ -639,9 +639,8 @@
 		if (!strcmp (childinfo->properties[j].name, "label")) {
 		    label = childinfo->properties[j].value;
 		    break;
-		} else {
-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
 		}
+		/* Ignore all other properties */
 	    }
 
 	    if (label) {
@@ -683,6 +682,7 @@
 	    char *icon = NULL;
 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
 	    gboolean use_underline = FALSE;
+	    gboolean sensitive = TRUE;
 	    GtkWidget *iconw = NULL;
 	    int j;
 
@@ -708,6 +708,8 @@
 		    group_name = value;
 		} else if (!strcmp (name, "new_group")) {
 		    new_group = BOOL (value);
+		} else if (!strcmp (name, "sensitive")) {
+		    sensitive = BOOL (value);
 		} else if (!strcmp (name, "visible")) {
 		    /* ignore for now */
 		} else if (!strcmp (name, "tooltip")) {
@@ -785,6 +787,8 @@
 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
 					     TRUE);
 	    }
+	    
+	    gtk_widget_set_sensitive (child, sensitive);
 
 	    glade_xml_set_common_params (xml, child, childinfo->child);
 	} else {

libglade-secondary.patch:

--- NEW FILE libglade-secondary.patch ---
diff -up libglade-2.6.3/glade/glade-gtk.c.secondary libglade-2.6.3/glade/glade-gtk.c
--- libglade-2.6.3/glade/glade-gtk.c.secondary	2009-02-20 00:21:52.433916022 -0500
+++ libglade-2.6.3/glade/glade-gtk.c	2009-02-20 00:22:02.065954023 -0500
@@ -544,7 +544,7 @@ gtk_dialog_build_children(GladeXML *self
 
 {
     GtkDialog *dialog = GTK_DIALOG (w);
-    GList *children, *list;
+    GList *children, *list, *secondary;
 
     glade_standard_build_children (self, w, info);
 
@@ -553,10 +553,13 @@ gtk_dialog_build_children(GladeXML *self
 
     /* repack children of action_area */
     children = gtk_container_get_children(GTK_CONTAINER(dialog->action_area));
+    secondary = NULL;
     for (list = children; list; list = list->next) {
 	GtkWidget *child = GTK_WIDGET(list->data);
 
 	g_object_ref(child);
+	if (gtk_button_box_get_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child))
+		secondary = g_list_prepend (secondary, child);
 	gtk_container_remove (GTK_CONTAINER (dialog->action_area), child);
     }
     for (list = children; list; list = list->next) {
@@ -569,7 +572,12 @@ gtk_dialog_build_children(GladeXML *self
 	g_object_unref(child);
 
     }
+    for (list = secondary; list; list = list->next) {
+	GtkWidget *child = GTK_WIDGET(list->data);
+        gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child, TRUE);
+    }
     g_list_free (children);
+    g_list_free (secondary);
 }
 
 


--- NEW FILE mingw32-libglade2.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-libglade2
Version:        2.6.4
Release:        1%{?dist}
Summary:        MinGW Windows Libglade2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gnome.org
Source0:        http://download.gnome.org/sources/libglade/2.6/libglade-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=121025
Patch1:         libglade-2.0.1-nowarning.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=510736
Patch2:         libglade-secondary.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtk2
BuildRequires:  mingw32-fontconfig
BuildRequires:  mingw32-pango
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-libxml2

# Native one for msgfmt
BuildRequires:  gettext

Requires:       pkgconfig

%description
MinGW Windows Libglade2 library.

%package static
Summary:        Static MinGW Windows Libglade2 library
Group:          Development/Libraries
Requires:       %{name} = %{version}

%description static
Static MinGW Windows Libglade2 library.

%prep
%setup -q -n libglade-%{version}
%patch1 -p1 -b .nowarning
%patch2 -p1 -b .secondary

%build
%{_mingw32_configure} --disable-gtk-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libglade-2.0-0.dll
%{_mingw32_bindir}/libglade-convert
%{_mingw32_includedir}/libglade-2.0
%{_mingw32_libdir}/libglade-2.0.dll.a
%{_mingw32_libdir}/libglade-2.0.la
%{_mingw32_libdir}/pkgconfig/libglade-2.0.pc

%dir %{_mingw32_datadir}/xml/libglade
%{_mingw32_datadir}/xml/libglade/glade-2.0.dtd

%files static
%defattr(-,root,root)
%{_mingw32_libdir}/libglade-2.0.a

%changelog
* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-1
- replace %%define with %%global
- update to 2.6.4
- move static library to its own subpackage
- add secondary patch from native libglade2 package

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-4
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-3
- Use _smp_mflags.
- +BR mingw32-libxml2.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-2
- Requires pkgconfig.

* Fri Nov 28 2008 Daniel P. Berrange <berrange at redhat.com> - 2.6.3-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:44:52 -0000	1.1
+++ .cvsignore	17 Apr 2009 17:22:25 -0000	1.2
@@ -0,0 +1 @@
+libglade-2.6.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:44:52 -0000	1.1
+++ sources	17 Apr 2009 17:22:25 -0000	1.2
@@ -0,0 +1 @@
+d1776b40f4e166b5e9c107f1c8fe4139  libglade-2.6.4.tar.bz2



From sailer at fedoraproject.org  Fri Apr 17 17:28:00 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 17:28:00 +0000 (UTC)
Subject: rpms/mingw32-libxml++/devel libxml++-mingw32.patch, NONE,
	1.1 mingw32-libxml++.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417172801.54B7B7012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libxml++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19247

Modified Files:
	.cvsignore sources 
Added Files:
	libxml++-mingw32.patch mingw32-libxml++.spec 
Log Message:
import from review


libxml++-mingw32.patch:

--- NEW FILE libxml++-mingw32.patch ---
--- examples/dom_parser_raw/main.cc.xx	2009-03-23 00:03:58.000000000 +0100
+++ examples/dom_parser_raw/main.cc	2009-03-23 00:04:12.000000000 +0100
@@ -19,6 +19,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <fstream>
+
 #include <libxml++/libxml++.h>
 
 #include <iostream>


--- NEW FILE mingw32-libxml++.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global name1 libxml++

Name:           mingw32-%{name1}
Version:        2.26.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ wrapper for the libxml2 XML parser library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://libxmlplusplus.sourceforge.net/
Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.26/libxml++-%{version}.tar.bz2
Patch0:         libxml++-mingw32.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mingw32-libxml2 >= 2.6.1
BuildRequires:  mingw32-glibmm24 >= 2.4.0
BuildRequires:  doxygen, graphviz

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gcc-c++

Requires:       pkgconfig

%description
libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
author is Ari Johnson and it is currently maintained by Christophe de Vienne
and Murray Cumming.


%prep
%setup -q -n %{name1}-%{version}
%patch0 -p0 -b .mingw32

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root,-)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_mingw32_bindir}/libxml++-2.6-2.dll
%{_mingw32_includedir}/*
%{_mingw32_libdir}/libxml++-2.6.dll.a
%{_mingw32_libdir}/libxml++-2.6.la
%{_mingw32_libdir}/pkgconfig/*
%dir %{_mingw32_libdir}/%{name1}-2.6
%dir %{_mingw32_libdir}/%{name1}-2.6/include
%{_mingw32_libdir}/%{name1}-2.6/include/*.h


%changelog
* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.26.0-1
- update to 2.26.0
- remove docs cruft from install section
- remove dos2unix BR

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-4
- add BR's and R's
- remove docs, as they duplicate the native package

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-3
- unify main and devel subpackages

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-2
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libxml++/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:40:29 -0000	1.1
+++ .cvsignore	17 Apr 2009 17:27:27 -0000	1.2
@@ -0,0 +1 @@
+libxml++-2.26.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libxml++/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:40:29 -0000	1.1
+++ sources	17 Apr 2009 17:27:27 -0000	1.2
@@ -0,0 +1 @@
+a52fc7e6e44bb5cc187672930b843f72  libxml++-2.26.0.tar.bz2



From sailer at fedoraproject.org  Fri Apr 17 17:30:41 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 17:30:41 +0000 (UTC)
Subject: rpms/mingw32-libglade2/devel mingw32-libglade2.spec,1.1,1.2
Message-ID: <20090417173041.13C9A7012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglade2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19654

Modified Files:
	mingw32-libglade2.spec 
Log Message:
actually import the latest version



Index: mingw32-libglade2.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/devel/mingw32-libglade2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-libglade2.spec	17 Apr 2009 17:22:25 -0000	1.1
+++ mingw32-libglade2.spec	17 Apr 2009 17:30:10 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libglade2
 Version:        2.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Libglade2 library
 
 License:        LGPLv2+
@@ -41,7 +41,7 @@
 %package static
 Summary:        Static MinGW Windows Libglade2 library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description static
 Static MinGW Windows Libglade2 library.
@@ -84,6 +84,9 @@
 %{_mingw32_libdir}/libglade-2.0.a
 
 %changelog
+* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-2
+- fix static Requires
+
 * Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-1
 - replace %%define with %%global
 - update to 2.6.4



From dledford at fedoraproject.org  Fri Apr 17 17:32:46 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Fri, 17 Apr 2009 17:32:46 +0000 (UTC)
Subject: rpms/mdadm/F-11 mdadm-3.0-mapfile.patch, 1.1, 1.2 mdadm.spec, 1.68,
	1.69
Message-ID: <20090417173246.8260C7012B@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20188

Modified Files:
	mdadm-3.0-mapfile.patch mdadm.spec 
Log Message:
* Fri Apr 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.6
- Move the mdadm.map file from /dev/md to just /dev so we don't have to
  create a /dev/md directory in the installer


mdadm-3.0-mapfile.patch:

Index: mdadm-3.0-mapfile.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-11/mdadm-3.0-mapfile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdadm-3.0-mapfile.patch	20 Mar 2009 21:13:38 -0000	1.1
+++ mdadm-3.0-mapfile.patch	17 Apr 2009 17:32:15 -0000	1.2
@@ -1,38 +1,9 @@
---- mdadm-3.0-devel3/Incremental.c.dev	2009-03-20 13:19:35.000000000 -0400
-+++ mdadm-3.0-devel3/Incremental.c	2009-03-20 13:20:01.000000000 -0400
-@@ -52,7 +52,7 @@ int Incremental(char *devname, int verbo
- 	 *    a 'foreign' array.
- 	 * 4/ Determine device number.
- 	 * - If in mdadm.conf with std name, use that
--	 * - UUID in /var/run/mdadm.map  use that
-+	 * - UUID in /dev/md/mdadm.map  use that
- 	 * - If name is suggestive, use that. unless in use with different uuid.
- 	 * - Choose a free, high number.
- 	 * - Use a partitioned device unless strong suggestion not to.
-@@ -67,7 +67,7 @@ int Incremental(char *devname, int verbo
- 	 * - check one drive in array to make sure metadata is a reasonably
- 	 *       close match.  Reject if not (e.g. different type)
- 	 * - add the device
--	 * 6/ Make sure /var/run/mdadm.map contains this array.
-+	 * 6/ Make sure /dev/md/mdadm.map contains this array.
- 	 * 7/ Is there enough devices to possibly start the array?
- 	 *     For a container, this means running Incremental_container.
- 	 * 7a/ if not, finish with success.
-@@ -315,7 +315,7 @@ int Incremental(char *devname, int verbo
- 		}
- 		info.array.working_disks = 1;
- 		sysfs_free(sra);
--		/* 6/ Make sure /var/run/mdadm.map contains this array. */
-+		/* 6/ Make sure /dev/md/mdadm.map contains this array. */
- 		map_update(&map, fd2devnum(mdfd),
- 			   info.text_version,
- 			   info.uuid, chosen_name);
---- mdadm-3.0-devel3/mapfile.c.dev	2009-03-20 13:16:27.000000000 -0400
-+++ mdadm-3.0-devel3/mapfile.c	2009-03-20 13:18:37.000000000 -0400
+--- mdadm-3.0-devel3/mapfile.c.mapfile	2009-03-10 01:39:41.000000000 -0400
++++ mdadm-3.0-devel3/mapfile.c	2009-04-17 13:22:45.000000000 -0400
 @@ -1,5 +1,5 @@
  /*
 - * mapfile - manage /var/run/mdadm.map. Part of:
-+ * mapfile - manage /dev/md/mdadm.map. Part of:
++ * mapfile - manage /dev/.mdadm.map. Part of:
   * mdadm - manage Linux "md" devices aka RAID arrays.
   *
   * Copyright (C) 2006 Neil Brown <neilb at suse.de>
@@ -41,87 +12,119 @@
   */
  
 -/* /var/run/mdadm.map is used to track arrays being created in --incremental
-+/* /dev/md/mdadm.map is used to track arrays being created in --incremental
++/* /dev/.mdadm.map is used to track arrays being created in --incremental
   * more.  It particularly allows lookup from UUID to array device, but
   * also allows the array device name to be easily found.
   *
-@@ -50,9 +50,9 @@ int map_write(struct map_ent *mel)
+@@ -48,13 +48,8 @@
+ {
+ 	FILE *f;
  	int err;
- 	int subdir = 1;
+-	int subdir = 1;
  
 -	f = fopen("/var/run/mdadm/map.new", "w");
-+	f = fopen("/dev/md/mdadm/map.new", "w");
- 	if (!f) {
+-	if (!f) {
 -		f = fopen("/var/run/mdadm.map.new", "w");
-+		f = fopen("/dev/md/mdadm.map.new", "w");
- 		subdir = 0;
- 	}
+-		subdir = 0;
+-	}
++	f = fopen("/dev/.mdadm.map.new", "w");
  	if (!f)
-@@ -74,17 +74,17 @@ int map_write(struct map_ent *mel)
+ 		return 0;
+ 	for (; mel; mel = mel->next) {
+@@ -73,32 +68,19 @@
+ 	err = ferror(f);
  	fclose(f);
  	if (err) {
- 		if (subdir)
+-		if (subdir)
 -			unlink("/var/run/mdadm/map.new");
-+			unlink("/dev/md/mdadm/map.new");
- 		else
+-		else
 -			unlink("/var/run/mdadm.map.new");
-+			unlink("/dev/md/mdadm.map.new");
++		unlink("/dev/.mdadm.map.new");
  		return 0;
  	}
- 	if (subdir)
+-	if (subdir)
 -		return rename("/var/run/mdadm/map.new",
 -			      "/var/run/mdadm/map") == 0;
-+		return rename("/dev/md/mdadm/map.new",
-+			      "/dev/md/mdadm/map") == 0;
- 	else
+-	else
 -		return rename("/var/run/mdadm.map.new",
 -			      "/var/run/mdadm.map") == 0;
-+		return rename("/dev/md/mdadm.map.new",
-+			      "/dev/md/mdadm.map") == 0;
++	return rename("/dev/.mdadm.map.new",
++		      "/dev/.mdadm.map") == 0;
  }
  
  
-@@ -93,9 +93,9 @@ static int lsubdir = 0;
+ static int lfd = -1;
+-static int lsubdir = 0;
  int map_lock(struct map_ent **melp)
  {
  	if (lfd < 0) {
 -		lfd = open("/var/run/mdadm/map.lock", O_CREAT|O_RDWR, 0600);
-+		lfd = open("/dev/md/mdadm/map.lock", O_CREAT|O_RDWR, 0600);
- 		if (lfd < 0) {
+-		if (lfd < 0) {
 -			lfd = open("/var/run/mdadm.map.lock", O_CREAT|O_RDWR, 0600);
-+			lfd = open("/dev/md/mdadm.map.lock", O_CREAT|O_RDWR, 0600);
- 			lsubdir = 0;
- 		} else
- 			lsubdir = 1;
-@@ -118,9 +118,9 @@ void map_unlock(struct map_ent **melp)
+-			lsubdir = 0;
+-		} else
+-			lsubdir = 1;
++		lfd = open("/dev/.mdadm.map.lock", O_CREAT|O_RDWR, 0600);
+ 		if (lfd < 0)
+ 			return -1;
+ 		if (lockf(lfd, F_LOCK, 0) != 0) {
+@@ -117,10 +99,7 @@
+ {
  	if (lfd >= 0)
  		close(lfd);
- 	if (lsubdir)
+-	if (lsubdir)
 -		unlink("/var/run/mdadm/map.lock");
-+		unlink("/dev/md/mdadm/map.lock");
- 	else
+-	else
 -		unlink("/var/run/mdadm.map.lock");
-+		unlink("/dev/md/mdadm.map.lock");
++	unlink("/dev/.mdadm.map.lock");
  	lfd = -1;
  }
  
-@@ -149,15 +149,15 @@ void map_read(struct map_ent **melp)
+@@ -149,16 +128,12 @@
  
  	*melp = NULL;
  
 -	f = fopen("/var/run/mdadm/map", "r");
-+	f = fopen("/dev/md/mdadm/map", "r");
- 	if (!f)
+-	if (!f)
 -		f = fopen("/var/run/mdadm.map", "r");
-+		f = fopen("/dev/md/mdadm.map", "r");
++	f = fopen("/dev/.mdadm.map", "r");
  	if (!f) {
  		RebuildMap();
 -		f = fopen("/var/run/mdadm/map", "r");
-+		f = fopen("/dev/md/mdadm/map", "r");
++		f = fopen("/dev/.mdadm.map", "r");
  	}
  	if (!f)
 -		f = fopen("/var/run/mdadm.map", "r");
-+		f = fopen("/dev/md/mdadm.map", "r");
- 	if (!f)
+-	if (!f)
  		return;
  
+ 	while (fgets(buf, sizeof(buf), f)) {
+--- mdadm-3.0-devel3/Incremental.c.mapfile	2009-03-10 01:39:41.000000000 -0400
++++ mdadm-3.0-devel3/Incremental.c	2009-03-20 21:21:51.000000000 -0400
+@@ -52,7 +52,7 @@
+ 	 *    a 'foreign' array.
+ 	 * 4/ Determine device number.
+ 	 * - If in mdadm.conf with std name, use that
+-	 * - UUID in /var/run/mdadm.map  use that
++	 * - UUID in /dev/md/mdadm.map  use that
+ 	 * - If name is suggestive, use that. unless in use with different uuid.
+ 	 * - Choose a free, high number.
+ 	 * - Use a partitioned device unless strong suggestion not to.
+@@ -67,7 +67,7 @@
+ 	 * - check one drive in array to make sure metadata is a reasonably
+ 	 *       close match.  Reject if not (e.g. different type)
+ 	 * - add the device
+-	 * 6/ Make sure /var/run/mdadm.map contains this array.
++	 * 6/ Make sure /dev/md/mdadm.map contains this array.
+ 	 * 7/ Is there enough devices to possibly start the array?
+ 	 *     For a container, this means running Incremental_container.
+ 	 * 7a/ if not, finish with success.
+@@ -315,7 +315,7 @@
+ 		}
+ 		info.array.working_disks = 1;
+ 		sysfs_free(sra);
+-		/* 6/ Make sure /var/run/mdadm.map contains this array. */
++		/* 6/ Make sure /dev/md/mdadm.map contains this array. */
+ 		map_update(&map, fd2devnum(mdfd),
+ 			   info.text_version,
+ 			   info.uuid, chosen_name);


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-11/mdadm.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mdadm.spec	21 Mar 2009 01:25:02 -0000	1.68
+++ mdadm.spec	17 Apr 2009 17:32:16 -0000	1.69
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     0.devel3.5%{?dist}
+Release:     0.devel3.6%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel3.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -87,6 +87,10 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Apr 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.6
+- Move the mdadm.map file from /dev/md to just /dev so we don't have to
+  create a /dev/md directory in the installer
+
 * Fri Mar 20 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.5
 - Fix a few issues with the new code to determine when a device gets to
   keep its name and when it doesn't



From stefan at fedoraproject.org  Fri Apr 17 17:34:44 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 17:34:44 +0000 (UTC)
Subject: rpms/synopsis/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090417173445.02C4E7012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20660

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2008 16:52:17 -0000	1.2
+++ .cvsignore	17 Apr 2009 17:34:14 -0000	1.3
@@ -1 +1,2 @@
 synopsis-0.11.tar.gz
+synopsis-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2008 16:52:17 -0000	1.2
+++ sources	17 Apr 2009 17:34:14 -0000	1.3
@@ -1 +1,2 @@
 c9b10905246c3de958fd72722520b09e  synopsis-0.11.tar.gz
+05873f569bbfc9a15d6b8dd5321a9dd1  synopsis-0.12.tar.gz



From th0br0 at fedoraproject.org  Fri Apr 17 17:36:11 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Fri, 17 Apr 2009 17:36:11 +0000 (UTC)
Subject: rpms/canto/F-11 canto.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417173611.99D8C7012B@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	canto.spec import.log 
Log Message:
Initial CVS import for canto



--- NEW FILE canto.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		canto
Version:	0.6.9
Release:	1%{?dist}
Summary:	Atom/RSS feed reader based on ncurses
Group:		Applications/Internet
License:	GPLv2
URL:		http://codezen.org/canto/
Source0:	http://codezen.org/static/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel 
BuildRequires:	ncurses-devel
BuildRequires:	python-feedparser
BuildRequires:	python-chardet
BuildRequires:	python-setuptools-devel
Requires:	python-chardet

%description
Canto is an Atom/RSS feed reader for the console that is meant to be quick,
concise, and colorful. It's meant to allow you to crank through feeds like
you've never cranked before by providing a minimal, yet information packed
interface. No navigating menus. No dense blocks of unreadable white text.
An interface with almost infinite customization and extensibility using
the excellent Python programming language.

%prep
%setup -q -n %{name}-%{version}

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
sed -i -e '/#\!/d' %{buildroot}/%{python_sitelib}/%{name}/canto_html.py

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}*
%attr(0644,root,root) %{python_sitelib}/%{name}/widecurse.so
%{python_sitelib}/*.egg-info
%{python_sitelib}/%{name}/*

%changelog
* Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-1
- Updated to 0.6.9

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.8-2
- Changed License
- rpmlint fixes
- Added BuildRequires: python-setuptools-devel
- Added Requires: python-chardet

* Fri Mar 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.8-1
- Initial package build


--- NEW FILE import.log ---
canto-0_6_9-1_fc10:F-11:canto-0.6.9-1.fc10.src.rpm:1239989604


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:46:28 -0000	1.1
+++ .cvsignore	17 Apr 2009 17:35:41 -0000	1.2
@@ -0,0 +1 @@
+canto-0.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:46:28 -0000	1.1
+++ sources	17 Apr 2009 17:35:41 -0000	1.2
@@ -0,0 +1 @@
+b81a552f8577e3401f32487802807323  canto-0.6.9.tar.gz



From limb at fedoraproject.org  Fri Apr 17 17:39:34 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 17:39:34 +0000 (UTC)
Subject: rpms/numpy/devel numpy.spec,1.34,1.35
Message-ID: <20090417173934.71BF37012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22066

Modified Files:
	numpy.spec 
Log Message:
Revert linalg and fft.



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- numpy.spec	14 Apr 2009 16:23:51 -0000	1.34
+++ numpy.spec	17 Apr 2009 17:39:03 -0000	1.35
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -88,7 +88,9 @@
 %dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/*.py*
 %{python_sitearch}/%{name}/core
+%{python_sitearch}/%{name}/fft
 %{python_sitearch}/%{name}/lib
+%{python_sitearch}/%{name}/linalg
 %{python_sitearch}/%{name}/ma
 %{python_sitearch}/%{name}/numarray
 %{python_sitearch}/%{name}/oldnumeric
@@ -106,10 +108,12 @@
 %{_bindir}/f2py.numpy
 %{python_sitearch}/%{name}/distutils
 %{python_sitearch}/%{name}/f2py
-%{python_sitearch}/%{name}/fft
-%{python_sitearch}/%{name}/linalg
+
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-3
+- Moved linalg, fft back to main package.
+
 * Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-2
 - Split out f2py into subpackage, thanks Peter Robinson pbrobinson at gmail.com.
 



From rdieter at fedoraproject.org  Fri Apr 17 17:42:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 17:42:58 +0000 (UTC)
Subject: rpms/ntl/devel .cvsignore, 1.4, 1.5 ntl.spec, 1.17, 1.18 sources,
	1.4, 1.5 ntl-5.4.2-gcc44.patch, 1.1, NONE
Message-ID: <20090417174258.777F57012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ntl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22682

Modified Files:
	.cvsignore ntl.spec sources 
Removed Files:
	ntl-5.4.2-gcc44.patch 
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.5-1
- ntl-5.5
- enable shared libs (and omit static lib)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Mar 2008 02:18:13 -0000	1.4
+++ .cvsignore	17 Apr 2009 17:42:26 -0000	1.5
@@ -1 +1 @@
-ntl-5.4.2.tar.gz
+ntl-5.5.tar.gz


Index: ntl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/ntl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ntl.spec	20 Mar 2009 17:28:37 -0000	1.17
+++ ntl.spec	17 Apr 2009 17:42:26 -0000	1.18
@@ -1,10 +1,13 @@
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
+# define include static lib (else undef)
+#define static 1
+
 Summary: High-performance algorithms for vectors, matrices, and polynomials 
 Name:    ntl 
-Version: 5.4.2
-Release: 7%{?dist}
+Version: 5.5
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     http://shoup.net/ntl/ 
@@ -14,12 +17,8 @@
 
 Source1: multilib_template.h
 
-Patch1: ntl-5.4.2-gcc44.patch
-
 BuildRequires: gmp-devel
-
-# includes no debuginfo'able bits, disable
-%define debug_package %{nil}
+BuildRequires: libtool
 
 %description
 NTL is a high-performance, portable C++ library providing data structures
@@ -40,34 +39,24 @@
   precision floating point numbers. 
 
 %package devel 
-Summary: High-performance algorithms for vectors, matrices, and polynomials 
+Summary: Development files for %{name} 
 Group:   Development/Libraries
-Obsoletes: %{name}-static < %{version}-%{release}
-Provides:  %{name}-static = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel 
-NTL is a high-performance, portable C++ library providing data structures
-and algorithms for arbitrary length integers; for vectors, matrices, and
-polynomials over the integers and over finite fields; and for arbitrary
-precision floating point arithmetic.
+%{summary}.
 
-NTL provides high quality implementations of state-of-the-art algorithms for:
-* arbitrary length integer arithmetic and arbitrary precision floating point
-  arithmetic;
-* polynomial arithmetic over the integers and finite fields including basic
-  arithmetic, polynomial factorization, irreducibility testing, computation
-  of minimal polynomials, traces, norms, and more;
-* lattice basis reduction, including very robust and fast implementations of
-  Schnorr-Euchner, block Korkin-Zolotarev reduction, and the new
-  Schnorr-Horner pruning heuristic for block Korkin-Zolotarev;
-* basic linear algebra over the integers, finite fields, and arbitrary
-  precision floating point numbers.
+%package static 
+Summary: Static libraries for %{name}
+Group:   Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+#Requires: gmp-devel
+%description static 
+%{summary}.
 
 
 %prep
 %setup -q 
 
-%patch1 -p1 -b .gcc44
-
 
 %build
 cd src
@@ -80,7 +69,8 @@
   DOCDIR=%{_docdir} \
   INCLUDEDIR=%{_includedir} \
   LIBDIR=%{_libdir} \
-  NTL_GMP_LIP=on
+  NTL_GMP_LIP=on \
+  SHARED=on
 cd -
 
 # not smp-safe
@@ -103,6 +93,10 @@
 
 # Unpackaged files
 rm -rf %{buildroot}%{_docdir}/NTL
+rm -f  %{buildroot}%{_libdir}/libntl.la
+%if ! 0%{?static}
+rm -f  %{buildroot}%{_libdir}/libntl.a
+%endif
 
 %ifarch %{multilib_arches}
 # hack to allow parallel installation of multilib factory-devel
@@ -122,15 +116,29 @@
 rm -rf %{buildroot}
 
 
+%files
+%defattr(-,root,root,-)
+%doc README doc/copying.txt 
+%{_libdir}/libntl.so.0*
+
 %files devel 
 %defattr(-,root,root,-)
-%doc README 
 %doc doc/*
 %{_includedir}/*
-%{_libdir}/lib*.a
+%{_libdir}/libntl.so
+
+%if 0%{?static}
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/libntl.a
+%endif
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.5-1
+- ntl-5.5
+- enable shared libs (and omit static lib)
+
 * Fri Mar 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.4.2-7
 - add -static virtual Provides to -devel package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Mar 2008 02:18:13 -0000	1.4
+++ sources	17 Apr 2009 17:42:27 -0000	1.5
@@ -1 +1 @@
-0aac5c680eee09a19732e1601b237a0b  ntl-5.4.2.tar.gz
+41323fefa47de772d92807633c32b721  ntl-5.5.tar.gz


--- ntl-5.4.2-gcc44.patch DELETED ---



From limb at fedoraproject.org  Fri Apr 17 17:46:25 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 17:46:25 +0000 (UTC)
Subject: rpms/pygame/devel pygame.spec,1.29,1.30
Message-ID: <20090417174625.760937012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/pygame/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23381

Modified Files:
	pygame.spec 
Log Message:
Drop erroneous numpy-f2py deps.



Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pygame.spec	17 Apr 2009 13:23:22 -0000	1.29
+++ pygame.spec	17 Apr 2009 17:45:54 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -12,11 +12,11 @@
 Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel numpy-f2py
+BuildRequires:  python-devel numpy
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel
-Requires:       numpy-f2py
+Requires:       numpy
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -94,8 +94,11 @@
 
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.1-6
+- Dropped f2py deps, unneeded now that numpy is fixed: BZ 496277.
+
 * Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.1-5
-- Add dep for numpy-f2py to fix brokn games, BZ 496218.
+- Add dep for numpy-f2py to fix broken games, BZ 496218.
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From rdieter at fedoraproject.org  Fri Apr 17 17:47:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 17:47:41 +0000 (UTC)
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.49,1.50
Message-ID: <20090417174741.429F17012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23650

Modified Files:
	Macaulay2.spec 
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-4
- rebuild for ntl-devel (shared)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Macaulay2.spec	27 Feb 2009 16:25:27 -0000	1.49
+++ Macaulay2.spec	17 Apr 2009 17:47:10 -0000	1.50
@@ -7,7 +7,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
@@ -203,6 +203,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-4
+- rebuild for ntl-devel (shared)
+
 * Wed Feb 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-3
 - BR: libfac-devel,factory-devel >= 3.1
 - restore ExcludeArch: ppc64 (#253847)



From ajax at fedoraproject.org  Fri Apr 17 17:52:38 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 17 Apr 2009 17:52:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-11 intel-2.7-kms-output-properties.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sources, 1.3,
	1.4 xorg-x11-drv-intel.spec, 1.12,
	1.13 intel-2.6.99.902-to-git.patch, 1.1, NONE rc1-to-2.7.patch,
	1.1, NONE
Message-ID: <20090417175238.53F087012B@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24452/F-11

Modified Files:
	.cvsignore import.log sources xorg-x11-drv-intel.spec 
Added Files:
	intel-2.7-kms-output-properties.patch 
Removed Files:
	intel-2.6.99.902-to-git.patch rc1-to-2.7.patch 
Log Message:
intel 2.7.0


intel-2.7-kms-output-properties.patch:

--- NEW FILE intel-2.7-kms-output-properties.patch ---
commit e6af995b24767815ab30364385768867e80605c2
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Mar 23 19:19:58 2009 +0800

    KMS: hook up output properties for randr
    
    This gets output properties from kernel, then hook them up
    for randr. So we can control output properties through randr
    like in UMS.
    
    Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e485256..0cbcde7 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -35,6 +35,7 @@
 #include "i830.h"
 #include "intel_bufmgr.h"
 #include "xf86drmMode.h"
+#include "X11/Xatom.h"
 
 typedef struct {
     int fd;
@@ -52,11 +53,20 @@ typedef struct {
 } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr;
 
 typedef struct {
+    drmModePropertyPtr mode_prop;
+    uint64_t value;
+    int num_atoms; /* if range prop, num_atoms == 1; if enum prop, num_atoms == num_enums + 1 */
+    Atom *atoms;
+} drmmode_prop_rec, *drmmode_prop_ptr;
+
+typedef struct {
     drmmode_ptr drmmode;
     int output_id;
     drmModeConnectorPtr mode_output;
     drmModeEncoderPtr mode_encoder;
     drmModePropertyBlobPtr edid_blob;
+    int num_props;
+    drmmode_prop_ptr props;
 } drmmode_output_private_rec, *drmmode_output_private_ptr;
 
 static void
@@ -508,9 +518,15 @@ static void
 drmmode_output_destroy(xf86OutputPtr output)
 {
 	drmmode_output_private_ptr drmmode_output = output->driver_private;
+	int i;
 
 	if (drmmode_output->edid_blob)
 		drmModeFreePropertyBlob(drmmode_output->edid_blob);
+	for (i = 0; i < drmmode_output->num_props; i++) {
+	    drmModeFreeProperty(drmmode_output->props[i].mode_prop);
+	    xfree(drmmode_output->props[i].atoms);
+	}
+	xfree(drmmode_output->props);
 	drmModeFreeConnector(drmmode_output->mode_output);
 	xfree(drmmode_output);
 	output->driver_private = NULL;
@@ -542,7 +558,162 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
 	}
 }
 
+static Bool
+drmmode_property_ignore(drmModePropertyPtr prop)
+{
+    if (!prop)
+	return TRUE;
+    /* ignore blob prop */
+    if (prop->flags & DRM_MODE_PROP_BLOB)
+	return TRUE;
+    /* ignore standard property */
+    if (!strcmp(prop->name, "EDID") ||
+	    !strcmp(prop->name, "DPMS"))
+	return TRUE;
+
+    return FALSE;
+}
+
+static void
+drmmode_output_create_resources(xf86OutputPtr output)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    drmModeConnectorPtr mode_output = drmmode_output->mode_output;
+    drmmode_ptr drmmode = drmmode_output->drmmode;
+    drmModePropertyPtr drmmode_prop;
+    int i, j, err;
+
+    drmmode_output->props = xcalloc(mode_output->count_props, sizeof(drmmode_prop_rec));
+    if (!drmmode_output->props)
+	return;
+
+    drmmode_output->num_props = 0;
+    for (i = 0, j = 0; i < mode_output->count_props; i++) {
+	drmmode_prop = drmModeGetProperty(drmmode->fd, mode_output->props[i]);
+	if (drmmode_property_ignore(drmmode_prop)) {
+	    drmModeFreeProperty(drmmode_prop);
+	    continue;
+	}
+	drmmode_output->props[j].mode_prop = drmmode_prop;
+	drmmode_output->props[j].value = mode_output->prop_values[i];
+	drmmode_output->num_props++;
+	j++;
+    }
+
+    for (i = 0; i < drmmode_output->num_props; i++) {
+	drmmode_prop_ptr p = &drmmode_output->props[i];
+	drmmode_prop = p->mode_prop;
+
+	if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) {
+	    INT32 range[2];
+
+	    p->num_atoms = 1;
+	    p->atoms = xcalloc(p->num_atoms, sizeof(Atom));
+	    if (!p->atoms)
+		continue;
+	    p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
+	    range[0] = drmmode_prop->values[0];
+	    range[1] = drmmode_prop->values[1];
+	    err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
+		    FALSE, TRUE,
+		    drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
+		    2, range);
+	    if (err != 0) {
+		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+			"RRConfigureOutputProperty error, %d\n", err);
+	    }
+	    err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
+		    XA_INTEGER, 32, PropModeReplace, 1, &p->value, FALSE, TRUE);
+	    if (err != 0) {
+		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+			"RRChangeOutputProperty error, %d\n", err);
+	    }
+	} else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) {
+	    p->num_atoms = drmmode_prop->count_enums + 1;
+	    p->atoms = xcalloc(p->num_atoms, sizeof(Atom));
+	    if (!p->atoms)
+		continue;
+	    p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
+	    for (j = 1; j <= drmmode_prop->count_enums; j++) {
+		struct drm_mode_property_enum *e = &drmmode_prop->enums[j-1];
+		p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE);
+	    }
+	    err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
+		    FALSE, FALSE,
+		    drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
+		    p->num_atoms - 1, (INT32 *)&p->atoms[1]);
+	    if (err != 0) {
+		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+			"RRConfigureOutputProperty error, %d\n", err);
+	    }
+	    for (j = 0; j < drmmode_prop->count_enums; j++)
+		if (drmmode_prop->enums[j].value == p->value)
+		    break;
+	    /* there's always a matching value */
+	    err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
+		    XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE);
+	    if (err != 0) {
+		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+			"RRChangeOutputProperty error, %d\n", err);
+	    }
+	}
+    }
+}
+
+static Bool
+drmmode_output_set_property(xf86OutputPtr output, Atom property,
+		RRPropertyValuePtr value)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    drmmode_ptr drmmode = drmmode_output->drmmode;
+    int i;
+
+    for (i = 0; i < drmmode_output->num_props; i++) {
+	drmmode_prop_ptr p = &drmmode_output->props[i];
+
+	if (p->atoms[0] != property)
+	    continue;
+
+	if (p->mode_prop->flags & DRM_MODE_PROP_RANGE) {
+	    uint32_t val;
+
+	    if (value->type != XA_INTEGER || value->format != 32 ||
+		    value->size != 1)
+		return FALSE;
+	    val = *(uint32_t *)value->data;
+
+	    drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
+		    p->mode_prop->prop_id, (uint64_t)val);
+	    return TRUE;
+	} else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) {
+	    Atom	atom;
+	    const char	*name;
+	    int		j;
+
+	    if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
+		return FALSE;
+	    memcpy(&atom, value->data, 4);
+	    name = NameForAtom(atom);
+
+	    /* search for matching name string, then set its value down */
+	    for (j = 0; j < p->mode_prop->count_enums; j++) {
+		if (!strcmp(p->mode_prop->enums[j].name, name)) {
+		    drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
+			    p->mode_prop->prop_id, p->mode_prop->enums[j].value);
+		    return TRUE;
+		}
+	    }
+	}
+    }
+    /* no property found? */
+    return FALSE;
+}
+
 static const xf86OutputFuncsRec drmmode_output_funcs = {
+	.create_resources = drmmode_output_create_resources,
+#ifdef RANDR_12_INTERFACE
+	.set_property = drmmode_output_set_property,
+#endif
 	.dpms = drmmode_output_dpms,
 #if 0
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Mar 2009 15:44:40 -0000	1.3
+++ .cvsignore	17 Apr 2009 17:52:07 -0000	1.4
@@ -1 +1 @@
-xf86-video-intel-2.6.99.902.tar.bz2
+xf86-video-intel-2.7.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Feb 2009 20:51:11 -0000	1.1
+++ import.log	17 Apr 2009 17:52:07 -0000	1.2
@@ -1 +1,2 @@
 xorg-x11-drv-intel-2_6_0-8_fc11:HEAD:xorg-x11-drv-intel-2.6.0-8.fc11.src.rpm:1235508628
+xorg-x11-drv-intel-2_7_0-1_fc11:F-11:xorg-x11-drv-intel-2.7.0-1.fc11.src.rpm:1239990702


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Mar 2009 15:44:41 -0000	1.3
+++ sources	17 Apr 2009 17:52:07 -0000	1.4
@@ -1 +1 @@
-b1869be6032c00654f562bd5d6ac9701  xf86-video-intel-2.6.99.902.tar.bz2
+5832172ac69b9a066a202e1578a5d3c8  xf86-video-intel-2.7.0.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-intel.spec	13 Apr 2009 15:45:53 -0000	1.12
+++ xorg-x11-drv-intel.spec	17 Apr 2009 17:52:07 -0000	1.13
@@ -5,8 +5,8 @@
 
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-intel
-Version:   2.6.99.902
-Release:   3%{?dist}
+Version:   2.7.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,11 +16,14 @@
 
 Source2:   intel.xinf
 
-# 053432991c812146f6e7c6f13c6ace55385c825f 
-Patch1: intel-2.6.99.902-to-git.patch
-Patch2: kill-svideo.patch
-Patch3: copy-fb.patch
-Patch4: intel-2.6.99.902-kms-get-crtc.patch
+Patch1: kill-svideo.patch
+Patch2: copy-fb.patch
+
+# not in 2.7 but in master, http://bugs.freedesktop.org/21254
+Patch10: intel-2.7-kms-output-properties.patch
+
+# needs to be upstreamed
+Patch20: intel-2.6.99.902-kms-get-crtc.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -54,14 +57,14 @@
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
-%patch1 -p1 -b .to-git
-%patch2 -p1 -b .svideo
-%patch3 -p1 -b .copy-fb
-%patch4 -p1 -b .get-crtc
+%patch1 -p1 -b .svideo
+%patch2 -p1 -b .copy-fb
+%patch10 -p1 -b .kms-props
+%patch20 -p1 -b .get-crtc
 
 %build
 
-autoreconf -vi
+# autoreconf -vi
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
@@ -96,6 +99,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.7.0-1
+- intel 2.7.0
+
 * Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.6.99.902-3
 - Update to today's git snapshot.
 


--- intel-2.6.99.902-to-git.patch DELETED ---


--- rc1-to-2.7.patch DELETED ---



From limb at fedoraproject.org  Fri Apr 17 17:54:54 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 17:54:54 +0000 (UTC)
Subject: rpms/numpy/F-11 numpy.spec,1.34,1.35
Message-ID: <20090417175454.116407012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24961

Modified Files:
	numpy.spec 
Log Message:
Fix module packaging.



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/F-11/numpy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- numpy.spec	15 Apr 2009 10:10:39 -0000	1.34
+++ numpy.spec	17 Apr 2009 17:54:23 -0000	1.35
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -88,7 +88,9 @@
 %dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/*.py*
 %{python_sitearch}/%{name}/core
+%{python_sitearch}/%{name}/fft
 %{python_sitearch}/%{name}/lib
+%{python_sitearch}/%{name}/linalg
 %{python_sitearch}/%{name}/ma
 %{python_sitearch}/%{name}/numarray
 %{python_sitearch}/%{name}/oldnumeric
@@ -106,10 +108,12 @@
 %{_bindir}/f2py.numpy
 %{python_sitearch}/%{name}/distutils
 %{python_sitearch}/%{name}/f2py
-%{python_sitearch}/%{name}/fft
-%{python_sitearch}/%{name}/linalg
+
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-3
+- Moved linalg, fft back to main package.
+
 * Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-2
 - Split out f2py into subpackage, thanks Peter Robinson pbrobinson at gmail.com.
 



From stefan at fedoraproject.org  Fri Apr 17 17:59:32 2009
From: stefan at fedoraproject.org (Stefan Seefeld)
Date: Fri, 17 Apr 2009 17:59:32 +0000 (UTC)
Subject: rpms/synopsis/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090417175932.3B6727012B@cvs1.fedora.phx.redhat.com>

Author: stefan

Update of /cvs/pkgs/rpms/synopsis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25759

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2008 16:49:14 -0000	1.2
+++ .cvsignore	17 Apr 2009 17:59:01 -0000	1.3
@@ -1 +1,2 @@
 synopsis-0.11.tar.gz
+synopsis-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synopsis/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2008 16:49:14 -0000	1.2
+++ sources	17 Apr 2009 17:59:01 -0000	1.3
@@ -1 +1,2 @@
 c9b10905246c3de958fd72722520b09e  synopsis-0.11.tar.gz
+05873f569bbfc9a15d6b8dd5321a9dd1  synopsis-0.12.tar.gz



From th0br0 at fedoraproject.org  Fri Apr 17 18:04:11 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Fri, 17 Apr 2009 18:04:11 +0000 (UTC)
Subject: rpms/canto/F-11 canto.spec,1.1,1.2
Message-ID: <20090417180411.4AD9F7012B@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26517

Modified Files:
	canto.spec 
Log Message:
* Fri Apr 17 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-2
- Changed python_sitelib to python_sitearch due to problems on 64bit archs.



Index: canto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-11/canto.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- canto.spec	17 Apr 2009 17:35:41 -0000	1.1
+++ canto.spec	17 Apr 2009 18:03:40 -0000	1.2
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		canto
 Version:	0.6.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Atom/RSS feed reader based on ncurses
 Group:		Applications/Internet
 License:	GPLv2
@@ -34,7 +35,7 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-sed -i -e '/#\!/d' %{buildroot}/%{python_sitelib}/%{name}/canto_html.py
+sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/canto_html.py
 
 %clean
 rm -rf %{buildroot}
@@ -44,11 +45,14 @@
 %doc ChangeLog COPYING README TODO
 %{_bindir}/%{name}*
 %{_mandir}/man1/%{name}*
-%attr(0644,root,root) %{python_sitelib}/%{name}/widecurse.so
-%{python_sitelib}/*.egg-info
-%{python_sitelib}/%{name}/*
+%attr(0644,root,root) %{python_sitearch}/%{name}/widecurse.so
+%{python_sitearch}/*.egg-info
+%{python_sitearch}/%{name}/*
 
 %changelog
+* Fri Apr 17 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-2
+- Changed python_sitelib to python_sitearch due to problems on 64bit archs.
+
 * Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-1
 - Updated to 0.6.9
 



From pkgdb at fedoraproject.org  Fri Apr 17 18:05:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 18:05:36 +0000
Subject: [pkgdb] apollon ownership updated
Message-ID: <20090417180536.DECB910F7C2@bastion2.fedora.phx.redhat.com>

Package apollon in Fedora devel was orphaned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apollon



From pkgdb at fedoraproject.org  Fri Apr 17 18:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 18:05:50 +0000
Subject: [pkgdb] gift ownership updated
Message-ID: <20090417180550.1F5AD10F884@bastion2.fedora.phx.redhat.com>

Package gift in Fedora devel was orphaned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gift



From pkgdb at fedoraproject.org  Fri Apr 17 18:06:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 18:06:00 +0000
Subject: [pkgdb] gift-gnutella ownership updated
Message-ID: <20090417180600.456E410F88D@bastion2.fedora.phx.redhat.com>

Package gift-gnutella in Fedora devel was orphaned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gift-gnutella



From pkgdb at fedoraproject.org  Fri Apr 17 18:06:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 18:06:11 +0000
Subject: [pkgdb] gift-openft ownership updated
Message-ID: <20090417180611.7600D10F886@bastion2.fedora.phx.redhat.com>

Package gift-openft in Fedora devel was orphaned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gift-openft



From limb at fedoraproject.org  Fri Apr 17 18:17:45 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 18:17:45 +0000 (UTC)
Subject: rpms/numpy/devel numpy.spec,1.35,1.36
Message-ID: <20090417181745.D578D7012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29079

Modified Files:
	numpy.spec 
Log Message:
EVR bump for pygame chainbuild.



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- numpy.spec	17 Apr 2009 17:39:03 -0000	1.35
+++ numpy.spec	17 Apr 2009 18:17:14 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-4
+- EVR bump for pygame chainbuild.
+
 * Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-3
 - Moved linalg, fft back to main package.
 



From kasal at fedoraproject.org  Fri Apr 17 18:25:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 17 Apr 2009 18:25:28 +0000 (UTC)
Subject: rpms/python-pycurl/devel python-pycurl.spec,1.12,1.13
Message-ID: <20090417182528.264C37012B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/python-pycurl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30708

Modified Files:
	python-pycurl.spec 
Log Message:
add a require to reflect a dependency on libcurl version (#496308)


Index: python-pycurl.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pycurl/devel/python-pycurl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-pycurl.spec	5 Mar 2009 16:44:30 -0000	1.12
+++ python-pycurl.spec	17 Apr 2009 18:24:57 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           python-pycurl
 Version:        7.19.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python interface to libcurl
 
 Group:          Development/Languages
@@ -17,6 +17,15 @@
 BuildRequires:  curl-devel >= 7.19.0
 BuildRequires:  openssl-devel
 
+# During its initialization, PycURL checks that the actual libcurl version
+# is not lower than the one used when PycURL was built.
+# Yes, that should be handled by library versioning (which would then get
+# automatically reflected by rpm).
+# For now, we have to reflect that dependency.
+%define libcurl_version_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
+%define libcurl_version %(sed %{libcurl_version_sed} /usr/include/curl/curlver.h)
+Requires:	libcurl >= %{libcurl_version}
+
 Provides:       pycurl = %{version}-%{release}
 
 %description
@@ -51,6 +60,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Apr 17 2009 Stepan Kasal <skasal at redhat.com> - 7.19.0-2
+- add a require to reflect a dependency on libcurl version (#496308)
+
 * Thu Mar  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 7.19.0-1
 - Update to 7.19.0
 



From xavierb at fedoraproject.org  Fri Apr 17 18:28:34 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Fri, 17 Apr 2009 18:28:34 +0000 (UTC)
Subject: rpms/php-pear-Crypt-Blowfish/F-9 .cvsignore, 1.1,
	1.2 php-pear-Crypt-Blowfish.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417182834.5FB3F7012B@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31353

Modified Files:
	.cvsignore php-pear-Crypt-Blowfish.spec sources 
Log Message:
1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Feb 2009 20:43:30 -0000	1.1
+++ .cvsignore	17 Apr 2009 18:28:03 -0000	1.2
@@ -0,0 +1 @@
+Crypt_Blowfish-1.0.1.tgz


Index: php-pear-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/F-9/php-pear-Crypt-Blowfish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Crypt-Blowfish.spec	25 Feb 2009 00:00:43 -0000	1.1
+++ php-pear-Crypt-Blowfish.spec	17 Apr 2009 18:28:03 -0000	1.2
@@ -1,16 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name Crypt_Blowfish
-%define beta RC2
 
 Name:           php-pear-Crypt-Blowfish
-Version:        1.1.0
-Release:        0.3.rc2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Quick two-way blowfish encryption
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Crypt_Blowfish
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,17 +29,17 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}%{?beta}/%{name}.xml
-cd %{pear_name}-%{version}%{?beta}
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd %{pear_name}-%{version}%{?beta}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}%{?beta}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
@@ -85,6 +84,10 @@
 
 
 %changelog
+* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.1-1
+- Use 1.0.1 to be able to satisfy BR:s. First build for F-9/EL-5, thus no
+  update issue.
+
 * Mon Feb 23 2009 Xavier Bachelot <xavier at bachelot.org> 1.1.0-0.3.rc2
 - Remove cut and paste leftover.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Feb 2009 00:00:43 -0000	1.2
+++ sources	17 Apr 2009 18:28:03 -0000	1.3
@@ -1 +1 @@
-09f0e38a4d524ba4102db5d11b07ffe9  Crypt_Blowfish-1.1.0RC2.tgz
+93873efe07a267b2b415965994a0af98  Crypt_Blowfish-1.0.1.tgz



From chkr at fedoraproject.org  Fri Apr 17 18:30:18 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Fri, 17 Apr 2009 18:30:18 +0000 (UTC)
Subject: rpms/pianobooster/devel import.log, NONE, 1.1 pianobooster.desktop, 
	NONE, 1.1 pianobooster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417183018.A3DD17012B@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31825/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pianobooster.desktop pianobooster.spec 
Log Message:
initial import of pianobooster



--- NEW FILE import.log ---
pianobooster-0_6_2-3_fc10:HEAD:pianobooster-0.6.2-3.fc10.src.rpm:1239992908


--- NEW FILE pianobooster.desktop ---
[Desktop Entry]
Name=Piano Booster
Comment=A MIDI file player that teaches you how to play the piano
GenericName=Piano Teacher
Exec=pianobooster
Icon=pianobooster
Terminal=false
Type=Application
Categories=Music;Education;AudioVideo;



--- NEW FILE pianobooster.spec ---
Name:            pianobooster
Summary:         A MIDI file player that teaches you how to play the piano
Version:         0.6.2
Release:         3%{?dist}
License:         GPLv3+
Group:           Applications/Multimedia
URL:             http://pianobooster.sourceforge.net/
Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
Source1:         %{name}.desktop
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:   cmake
BuildRequires:   qt4-devel
BuildRequires:   desktop-file-utils
BuildRequires:   alsa-lib-devel

%description
A MIDI file player/game that displays the musical notes AND teaches you how
to play the piano. 

PianoBooster is a fun way of playing along with a musical accompaniment and
at the same time learning the basics of reading musical notation.
The difference between playing along to a CD or a standard MIDI file
is that PianoBooster listens and reacts to what you are playing on a
MIDI keyboard.


%prep
%setup -q -n %{name}-src-%{version}
sed -i -e 's|\r||g' README.txt
sed -i -e 's|\r||g' license.txt

%build
pushd build
%cmake ../src
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd build
install -d $RPM_BUILD_ROOT/%{_bindir}
install %{name} $RPM_BUILD_ROOT/%{_bindir}
popd

install -d $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
    --dir %{buildroot}%{_datadir}/applications  \
    %{SOURCE1}


install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc license.txt gplv3.txt README.txt
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Sun Apr 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-3
- use %%{name} macro
- provide .desktop file as separate sourc1
- use sed instead of dos2unix
- use install -p to preserve the timestamps 
- add GenericName to desktop file
- fix typo in icon installation
- enabled parallel build

* Tue Apr 07 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-2
Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:29:33 -0000	1.1
+++ .cvsignore	17 Apr 2009 18:29:48 -0000	1.2
@@ -0,0 +1 @@
+pianobooster-src-0.6.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:29:33 -0000	1.1
+++ sources	17 Apr 2009 18:29:48 -0000	1.2
@@ -0,0 +1 @@
+b644305e706721af1cba0debcb4390e2  pianobooster-src-0.6.2.tgz



From linville at fedoraproject.org  Fri Apr 17 18:34:17 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 17 Apr 2009 18:34:17 +0000 (UTC)
Subject: rpms/crda/devel .cvsignore, 1.7, 1.8 crda.spec, 1.15, 1.16 sources, 
	1.5, 1.6
Message-ID: <20090417183417.5DA0A7012B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv462

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb version to pick-up recent updates and fixes (#496392)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 18:03:23 -0000	1.7
+++ .cvsignore	17 Apr 2009 18:33:46 -0000	1.8
@@ -1,2 +1,2 @@
 crda-1.0.1.tar.bz2
-wireless-regdb-2009.03.09.tar.bz2
+wireless-regdb-2009.04.16.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- crda.spec	31 Mar 2009 17:37:13 -0000	1.15
+++ crda.spec	17 Apr 2009 18:33:46 -0000	1.16
@@ -1,9 +1,9 @@
 %define         crda_version    1.0.1
-%define         regdb_version   2009.03.09
+%define         regdb_version   2009.04.16
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -42,8 +42,7 @@
 cd wireless-regdb-%{regdb_version}
 
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" maintainer-clean
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" key.priv.pem
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
 
 # Build CRDA using the new key and regulatory.bin from above
 cd ../crda-%{crda_version}
@@ -83,6 +82,9 @@
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Fri Apr 17 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.04.16-10
+- Update wireless-regdb version to pick-up recent updates and fixes (#496392)
+
 * Tue Mar 31 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.03.09-9
 - Add Requires line for iw package (#492762)
 - Update setregdomain script to correctly check if COUNTRY is set


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Mar 2009 17:32:10 -0000	1.5
+++ sources	17 Apr 2009 18:33:46 -0000	1.6
@@ -1,2 +1,2 @@
 03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
-09d423911584e6580efb8af366775d5f  wireless-regdb-2009.03.09.tar.bz2
+90a1aeea3319f43c44d9d7e1f790761d  wireless-regdb-2009.04.16.tar.bz2



From linville at fedoraproject.org  Fri Apr 17 18:35:41 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 17 Apr 2009 18:35:41 +0000 (UTC)
Subject: rpms/crda/F-11 .cvsignore, 1.7, 1.8 crda.spec, 1.15, 1.16 sources,
	1.5, 1.6
Message-ID: <20090417183541.C3EE97012B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv835

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb version to pick-up recent updates and fixes (#496392)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 18:03:23 -0000	1.7
+++ .cvsignore	17 Apr 2009 18:35:11 -0000	1.8
@@ -1,2 +1,2 @@
 crda-1.0.1.tar.bz2
-wireless-regdb-2009.03.09.tar.bz2
+wireless-regdb-2009.04.16.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/crda.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- crda.spec	31 Mar 2009 17:37:13 -0000	1.15
+++ crda.spec	17 Apr 2009 18:35:11 -0000	1.16
@@ -1,9 +1,9 @@
 %define         crda_version    1.0.1
-%define         regdb_version   2009.03.09
+%define         regdb_version   2009.04.16
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -42,8 +42,7 @@
 cd wireless-regdb-%{regdb_version}
 
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" maintainer-clean
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" key.priv.pem
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
 
 # Build CRDA using the new key and regulatory.bin from above
 cd ../crda-%{crda_version}
@@ -83,6 +82,9 @@
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Fri Apr 17 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.04.16-10
+- Update wireless-regdb version to pick-up recent updates and fixes (#496392)
+
 * Tue Mar 31 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.03.09-9
 - Add Requires line for iw package (#492762)
 - Update setregdomain script to correctly check if COUNTRY is set


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Mar 2009 17:32:10 -0000	1.5
+++ sources	17 Apr 2009 18:35:11 -0000	1.6
@@ -1,2 +1,2 @@
 03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
-09d423911584e6580efb8af366775d5f  wireless-regdb-2009.03.09.tar.bz2
+90a1aeea3319f43c44d9d7e1f790761d  wireless-regdb-2009.04.16.tar.bz2



From spot at fedoraproject.org  Fri Apr 17 18:36:07 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 18:36:07 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 fedora-logos.spec, 1.122, 1.123 sources, 1.94,
	1.95
Message-ID: <20090417183607.955557012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv963/F-11

Modified Files:
	fedora-logos.spec sources 
Log Message:
update to 11.0.1 for fixed bootsplash


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fedora-logos.spec	15 Apr 2009 15:29:54 -0000	1.122
+++ fedora-logos.spec	17 Apr 2009 18:35:36 -0000	1.123
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.0
+Version: 11.0.1
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.1-1
+- fix bootsplash to be less psychadelic
+
 * Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.0-1
 - Update to 11.0.0 art (except for KDE splash)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	15 Apr 2009 15:29:54 -0000	1.94
+++ sources	17 Apr 2009 18:35:36 -0000	1.95
@@ -1 +1 @@
-f6521411abff28b326766ec2de750d03  fedora-logos-11.0.0.tar.bz2
+c6c7c1e80583941114a716101c86b6ae  fedora-logos-11.0.1.tar.bz2



From spot at fedoraproject.org  Fri Apr 17 18:36:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 18:36:08 +0000 (UTC)
Subject: rpms/fedora-logos/devel .cvsignore, 1.83, 1.84 fedora-logos.spec,
	1.122, 1.123 sources, 1.94, 1.95
Message-ID: <20090417183608.2218570137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv963/devel

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to 11.0.1 for fixed bootsplash


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	15 Apr 2009 15:29:54 -0000	1.83
+++ .cvsignore	17 Apr 2009 18:35:36 -0000	1.84
@@ -1 +1 @@
-fedora-logos-11.0.0.tar.bz2
+fedora-logos-11.0.1.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fedora-logos.spec	15 Apr 2009 15:29:54 -0000	1.122
+++ fedora-logos.spec	17 Apr 2009 18:35:37 -0000	1.123
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.0
+Version: 11.0.1
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.1-1
+- fix bootsplash to be less psychadelic
+
 * Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.0-1
 - Update to 11.0.0 art (except for KDE splash)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	15 Apr 2009 15:29:54 -0000	1.94
+++ sources	17 Apr 2009 18:35:37 -0000	1.95
@@ -1 +1 @@
-f6521411abff28b326766ec2de750d03  fedora-logos-11.0.0.tar.bz2
+c6c7c1e80583941114a716101c86b6ae  fedora-logos-11.0.1.tar.bz2



From chkr at fedoraproject.org  Fri Apr 17 18:37:39 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Fri, 17 Apr 2009 18:37:39 +0000 (UTC)
Subject: rpms/pianobooster/devel pianobooster.spec,1.1,1.2
Message-ID: <20090417183739.123FD7012B@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1531

Modified Files:
	pianobooster.spec 
Log Message:
- preserve timestamps of README.txt and license.txt



Index: pianobooster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/devel/pianobooster.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pianobooster.spec	17 Apr 2009 18:29:48 -0000	1.1
+++ pianobooster.spec	17 Apr 2009 18:37:08 -0000	1.2
@@ -1,7 +1,7 @@
 Name:            pianobooster
 Summary:         A MIDI file player that teaches you how to play the piano
 Version:         0.6.2
-Release:         3%{?dist}
+Release:         4%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://pianobooster.sourceforge.net/
@@ -26,8 +26,15 @@
 
 %prep
 %setup -q -n %{name}-src-%{version}
-sed -i -e 's|\r||g' README.txt
-sed -i -e 's|\r||g' license.txt
+
+sed -e 's|\r||g' README.txt > README.txt.tmp
+touch -r README.txt README.txt.tmp
+mv README.txt.tmp README.txt
+
+sed -e 's|\r||g' license.txt > license.txt.tmp
+touch -r license.txt license.txt.tmp
+mv license.txt.tmp license.txt
+
 
 %build
 pushd build
@@ -76,9 +83,12 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Apr 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-4
+- preserve timestamps of README.txt and license.txt
+
 * Sun Apr 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-3
 - use %%{name} macro
-- provide .desktop file as separate sourc1
+- provide .desktop file as separate source1
 - use sed instead of dos2unix
 - use install -p to preserve the timestamps 
 - add GenericName to desktop file



From linville at fedoraproject.org  Fri Apr 17 18:38:11 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 17 Apr 2009 18:38:11 +0000 (UTC)
Subject: rpms/crda/F-10 .cvsignore, 1.2, 1.3 crda.spec, 1.8, 1.9 sources, 1.5,
	1.6
Message-ID: <20090417183811.A27A07012B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1681

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb version to pick-up recent updates and fixes (#496392)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2009 17:39:07 -0000	1.2
+++ .cvsignore	17 Apr 2009 18:37:41 -0000	1.3
@@ -1,2 +1,2 @@
 crda-1.0.1.tar.bz2
-wireless-regdb-2009.03.09.tar.bz2
+wireless-regdb-2009.04.16.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- crda.spec	31 Mar 2009 17:50:50 -0000	1.8
+++ crda.spec	17 Apr 2009 18:37:41 -0000	1.9
@@ -1,9 +1,9 @@
 %define         crda_version    1.0.1
-%define         regdb_version   2009.03.09
+%define         regdb_version   2009.04.16
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -42,8 +42,7 @@
 cd wireless-regdb-%{regdb_version}
 
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" maintainer-clean
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" key.priv.pem
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
 
 # Build CRDA using the new key and regulatory.bin from above
 cd ../crda-%{crda_version}
@@ -83,6 +82,9 @@
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Fri Apr 17 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.04.16-10
+- Update wireless-regdb version to pick-up recent updates and fixes (#496392)
+
 * Tue Mar 31 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.03.09-9
 - Add Requires line for iw package (#492762)
 - Update setregdomain script to correctly check if COUNTRY is set


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Mar 2009 17:39:07 -0000	1.5
+++ sources	17 Apr 2009 18:37:41 -0000	1.6
@@ -1,2 +1,2 @@
 03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
-09d423911584e6580efb8af366775d5f  wireless-regdb-2009.03.09.tar.bz2
+90a1aeea3319f43c44d9d7e1f790761d  wireless-regdb-2009.04.16.tar.bz2



From kasal at fedoraproject.org  Fri Apr 17 18:39:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 17 Apr 2009 18:39:16 +0000 (UTC)
Subject: rpms/python-pycurl/devel python-pycurl.spec,1.13,1.14
Message-ID: <20090417183916.7332B7012B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/python-pycurl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2072

Modified Files:
	python-pycurl.spec 
Log Message:
make sure the spec evaluates everywhere


Index: python-pycurl.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pycurl/devel/python-pycurl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-pycurl.spec	17 Apr 2009 18:24:57 -0000	1.13
+++ python-pycurl.spec	17 Apr 2009 18:38:46 -0000	1.14
@@ -22,8 +22,9 @@
 # Yes, that should be handled by library versioning (which would then get
 # automatically reflected by rpm).
 # For now, we have to reflect that dependency.
-%define libcurl_version_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
-%define libcurl_version %(sed %{libcurl_version_sed} /usr/include/curl/curlver.h)
+%define libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
+%define curlver_h /usr/include/curl/curlver.h
+%define libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
 Requires:	libcurl >= %{libcurl_version}
 
 Provides:       pycurl = %{version}-%{release}



From th0br0 at fedoraproject.org  Fri Apr 17 18:42:55 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Fri, 17 Apr 2009 18:42:55 +0000 (UTC)
Subject: rpms/canto/devel canto.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417184255.B74F77012B@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3467/devel

Modified Files:
	.cvsignore sources 
Added Files:
	canto.spec import.log 
Log Message:
First CVS import for canto



--- NEW FILE canto.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		canto
Version:	0.6.9
Release:	2%{?dist}
Summary:	Atom/RSS feed reader based on ncurses
Group:		Applications/Internet
License:	GPLv2
URL:		http://codezen.org/canto/
Source0:	http://codezen.org/static/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel 
BuildRequires:	ncurses-devel
BuildRequires:	python-feedparser
BuildRequires:	python-chardet
BuildRequires:	python-setuptools-devel
Requires:	python-chardet

%description
Canto is an Atom/RSS feed reader for the console that is meant to be quick,
concise, and colorful. It's meant to allow you to crank through feeds like
you've never cranked before by providing a minimal, yet information packed
interface. No navigating menus. No dense blocks of unreadable white text.
An interface with almost infinite customization and extensibility using
the excellent Python programming language.

%prep
%setup -q -n %{name}-%{version}

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/canto_html.py

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}*
%attr(0644,root,root) %{python_sitearch}/%{name}/widecurse.so
%{python_sitearch}/*.egg-info
%{python_sitearch}/%{name}/*

%changelog
* Fri Apr 17 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-2
- Changed python_sitelib to python_sitearch due to problems on 64bit archs.

* Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-1
- Updated to 0.6.9

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.8-2
- Changed License
- rpmlint fixes
- Added BuildRequires: python-setuptools-devel
- Added Requires: python-chardet

* Fri Mar 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.8-1
- Initial package build


--- NEW FILE import.log ---
canto-0_6_9-2_fc10:HEAD:canto-0.6.9-2.fc10.src.rpm:1239993693


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canto/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:46:28 -0000	1.1
+++ .cvsignore	17 Apr 2009 18:42:23 -0000	1.2
@@ -0,0 +1 @@
+canto-0.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canto/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:46:28 -0000	1.1
+++ sources	17 Apr 2009 18:42:24 -0000	1.2
@@ -0,0 +1 @@
+b81a552f8577e3401f32487802807323  canto-0.6.9.tar.gz



From xavierb at fedoraproject.org  Fri Apr 17 18:43:18 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Fri, 17 Apr 2009 18:43:18 +0000 (UTC)
Subject: rpms/php-pear-Crypt-Blowfish/EL-5 php-pear-Crypt-Blowfish.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090417184318.51AAA7012B@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3587

Modified Files:
	php-pear-Crypt-Blowfish.spec sources 
Log Message:
1.0.1


Index: php-pear-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/EL-5/php-pear-Crypt-Blowfish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Crypt-Blowfish.spec	24 Feb 2009 22:20:32 -0000	1.1
+++ php-pear-Crypt-Blowfish.spec	17 Apr 2009 18:42:47 -0000	1.2
@@ -1,16 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name Crypt_Blowfish
-%define beta RC2
 
 Name:           php-pear-Crypt-Blowfish
-Version:        1.1.0
-Release:        0.3.rc2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Quick two-way blowfish encryption
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Crypt_Blowfish
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,17 +29,17 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}%{?beta}/%{name}.xml
-cd %{pear_name}-%{version}%{?beta}
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
+cd %{pear_name}-%{version}
 
 
 %build
-cd %{pear_name}-%{version}%{?beta}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{pear_name}-%{version}%{?beta}
+cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
@@ -85,6 +84,10 @@
 
 
 %changelog
+* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.1-1
+- Use 1.0.1 to be able to satisfy BR:s. First build for F-9/EL-5, thus no
+  update issue.
+
 * Mon Feb 23 2009 Xavier Bachelot <xavier at bachelot.org> 1.1.0-0.3.rc2
 - Remove cut and paste leftover.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-Blowfish/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Feb 2009 22:20:32 -0000	1.2
+++ sources	17 Apr 2009 18:42:47 -0000	1.3
@@ -1 +1 @@
-09f0e38a4d524ba4102db5d11b07ffe9  Crypt_Blowfish-1.1.0RC2.tgz
+93873efe07a267b2b415965994a0af98  Crypt_Blowfish-1.0.1.tgz



From cwickert at fedoraproject.org  Fri Apr 17 18:50:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 17 Apr 2009 18:50:17 +0000 (UTC)
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme-4.4.3-fedora.patch,
	NONE, 1.1 xfce4-icon-theme.spec, 1.20, 1.21
Message-ID: <20090417185017.DB57D7012B@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4829

Modified Files:
	xfce4-icon-theme.spec 
Added Files:
	xfce4-icon-theme-4.4.3-fedora.patch 
Log Message:
* Fri Apr 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-3
- Inherit default distribution icon theme (#489402)


xfce4-icon-theme-4.4.3-fedora.patch:

--- NEW FILE xfce4-icon-theme-4.4.3-fedora.patch ---
--- xfce4-icon-theme-4.4.3.orig/Rodent/index.theme.in	2008-10-26 23:05:31.000000000 +0100
+++ xfce4-icon-theme-4.4.3/Rodent/index.theme.in	2009-04-17 01:10:02.000000000 +0200
@@ -5,7 +5,7 @@
 [Icon Theme]
 _Name=Rodent
 _Comment=Default icon for the Xfce Desktop Environment
-Inherits=Tango,gnome,Industrial
+Inherits=Fedora,Tango,gnome,Industrial
 Directories=scalable/apps,scalable/devices,scalable/emblems,scalable/filesystems,scalable/mimetypes,scalable/misc,scalable/stock,48x48/apps,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/misc,48x48/stock
 
 [scalable/apps]


Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfce4-icon-theme.spec	26 Feb 2009 08:51:27 -0000	1.20
+++ xfce4-icon-theme.spec	17 Apr 2009 18:49:47 -0000	1.21
@@ -1,10 +1,11 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-icon-theme-%{version}.tar.bz2
+Patch0: xfce4-icon-theme-4.4.3-fedora.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fedora
 
 %build
 %configure
@@ -40,6 +42,9 @@
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Apr 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-3
+- Inherit default distribution icon theme (#489402)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Apr 17 18:51:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 17 Apr 2009 18:51:40 +0000 (UTC)
Subject: rpms/python-pycurl/devel python-pycurl.spec,1.14,1.15
Message-ID: <20090417185140.781BA7012B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/python-pycurl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5160

Modified Files:
	python-pycurl.spec 
Log Message:
fix typo in the previous change


Index: python-pycurl.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pycurl/devel/python-pycurl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-pycurl.spec	17 Apr 2009 18:38:46 -0000	1.14
+++ python-pycurl.spec	17 Apr 2009 18:51:09 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           python-pycurl
 Version:        7.19.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Python interface to libcurl
 
 Group:          Development/Languages
@@ -25,7 +25,7 @@
 %define libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
 %define curlver_h /usr/include/curl/curlver.h
 %define libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
-Requires:	libcurl >= %{libcurl_version}
+Requires:	libcurl >= %{libcurl_ver}
 
 Provides:       pycurl = %{version}-%{release}
 
@@ -61,6 +61,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Apr 17 2009 Stepan Kasal <skasal at redhat.com> - 7.19.0-3
+- fix typo in the previous change
+
 * Fri Apr 17 2009 Stepan Kasal <skasal at redhat.com> - 7.19.0-2
 - add a require to reflect a dependency on libcurl version (#496308)
 



From oget at fedoraproject.org  Fri Apr 17 18:54:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 18:54:42 +0000 (UTC)
Subject: rpms/zynjacku/devel import.log, NONE, 1.1 lv2rack.desktop, NONE,
	1.1 zynjacku.desktop, NONE, 1.1 zynjacku.png, NONE,
	1.1 zynjacku.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417185442.525427012B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynjacku/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2rack.desktop zynjacku.desktop zynjacku.png 
	zynjacku.spec 
Log Message:
* Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
- License is GPLv2
- Clean up unnecessary bits from SPEC file

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-1
- Initial build



--- NEW FILE import.log ---
zynjacku-4-2_fc10:HEAD:zynjacku-4-2.fc10.src.rpm:1239994429


--- NEW FILE lv2rack.desktop ---
[Desktop Entry]
Name=lv2rack
GenericName=LV2 effect plugins host
Comment=JACK based host for LV2 effect plugins
Exec=lv2rack
Icon=zynjacku
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE zynjacku.desktop ---
[Desktop Entry]
Name=zynjacku
GenericName=LV2 synth host
Comment=JACK based host for LV2 synths
Exec=zynjacku
Icon=zynjacku
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE zynjacku.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		zynjacku
Version:	4
Release:	2%{?dist}
Summary:	LV2 synths and plugins host
Group:		Applications/Multimedia
License:	GPLv2
URL:		http://home.gna.org/zynjacku/	
Source0:	http://download.gna.org/zynjacku/%{name}-%{version}.tar.bz2
# Derived from the logo.png from the tarball
Source1:	%{name}.png
Source2:	%{name}.desktop
Source3:	lv2rack.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	lv2dynparam-devel
BuildRequires:	pygtk2-devel
BuildRequires:	slv2-devel

Requires:	pygtk2-libglade

Provides:	lv2rack = %{version}-%{release}

%description
zynjacku is JACK based, GTK (2.x) host for LV2 synths. It has one JACK MIDI
input port (routed to all hosted synths) and one (two for stereo synths) JACK
audio output port per plugin. Such design provides multi-timbral sound by 
running several synth plugins.

zynjacku is a nunchaku weapon for JACK audio synthesis. You have solid parts
for synthesis itself and you have flexible part that allows synthesis to suit
your needs.

lv2rack is a host for LV2 effect plugins. 

%prep
%setup -q


%build
export am_cv_python_pythondir=%{python_sitearch}
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# We don't need duplicate files
ln -sf ../doc/%{name}-%{version}/gpl.txt $RPM_BUILD_ROOT/%{_datadir}/%{name}/

# Kill .la files
rm -f $RPM_BUILD_ROOT%{python_sitearch}/*.la

# Icon
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/
cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/

# .desktop files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE2}
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE3}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS gpl.txt NEWS README
%{_bindir}/*
# F-11+ automatically excludes these files:
%if x%fedora < x11
%exclude %{_bindir}/*.py?
%endif
%{python_sitearch}/*.so
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/72x72/apps/%{name}.png

%changelog
* Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
- License is GPLv2
- Clean up unnecessary bits from SPEC file

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:51:24 -0000	1.1
+++ .cvsignore	17 Apr 2009 18:54:11 -0000	1.2
@@ -0,0 +1 @@
+zynjacku-4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:51:25 -0000	1.1
+++ sources	17 Apr 2009 18:54:11 -0000	1.2
@@ -0,0 +1 @@
+20ead5385b1a47f0a148f9f27e8889ef  zynjacku-4.tar.bz2



From oget at fedoraproject.org  Fri Apr 17 18:57:08 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 18:57:08 +0000 (UTC)
Subject: rpms/zynjacku/F-11 import.log, NONE, 1.1 lv2rack.desktop, NONE,
	1.1 zynjacku.desktop, NONE, 1.1 zynjacku.png, NONE,
	1.1 zynjacku.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417185708.E28407012B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynjacku/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6666/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2rack.desktop zynjacku.desktop zynjacku.png 
	zynjacku.spec 
Log Message:
* Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
- License is GPLv2
- Clean up unnecessary bits from SPEC file

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-1
- Initial build



--- NEW FILE import.log ---
zynjacku-4-2_fc10:F-11:zynjacku-4-2.fc10.src.rpm:1239994532


--- NEW FILE lv2rack.desktop ---
[Desktop Entry]
Name=lv2rack
GenericName=LV2 effect plugins host
Comment=JACK based host for LV2 effect plugins
Exec=lv2rack
Icon=zynjacku
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE zynjacku.desktop ---
[Desktop Entry]
Name=zynjacku
GenericName=LV2 synth host
Comment=JACK based host for LV2 synths
Exec=zynjacku
Icon=zynjacku
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE zynjacku.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		zynjacku
Version:	4
Release:	2%{?dist}
Summary:	LV2 synths and plugins host
Group:		Applications/Multimedia
License:	GPLv2
URL:		http://home.gna.org/zynjacku/	
Source0:	http://download.gna.org/zynjacku/%{name}-%{version}.tar.bz2
# Derived from the logo.png from the tarball
Source1:	%{name}.png
Source2:	%{name}.desktop
Source3:	lv2rack.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	lv2dynparam-devel
BuildRequires:	pygtk2-devel
BuildRequires:	slv2-devel

Requires:	pygtk2-libglade

Provides:	lv2rack = %{version}-%{release}

%description
zynjacku is JACK based, GTK (2.x) host for LV2 synths. It has one JACK MIDI
input port (routed to all hosted synths) and one (two for stereo synths) JACK
audio output port per plugin. Such design provides multi-timbral sound by 
running several synth plugins.

zynjacku is a nunchaku weapon for JACK audio synthesis. You have solid parts
for synthesis itself and you have flexible part that allows synthesis to suit
your needs.

lv2rack is a host for LV2 effect plugins. 

%prep
%setup -q


%build
export am_cv_python_pythondir=%{python_sitearch}
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# We don't need duplicate files
ln -sf ../doc/%{name}-%{version}/gpl.txt $RPM_BUILD_ROOT/%{_datadir}/%{name}/

# Kill .la files
rm -f $RPM_BUILD_ROOT%{python_sitearch}/*.la

# Icon
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/
cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/

# .desktop files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE2}
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE3}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS gpl.txt NEWS README
%{_bindir}/*
# F-11+ automatically excludes these files:
%if x%fedora < x11
%exclude %{_bindir}/*.py?
%endif
%{python_sitearch}/*.so
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/72x72/apps/%{name}.png

%changelog
* Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
- License is GPLv2
- Clean up unnecessary bits from SPEC file

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:51:24 -0000	1.1
+++ .cvsignore	17 Apr 2009 18:56:38 -0000	1.2
@@ -0,0 +1 @@
+zynjacku-4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:51:25 -0000	1.1
+++ sources	17 Apr 2009 18:56:38 -0000	1.2
@@ -0,0 +1 @@
+20ead5385b1a47f0a148f9f27e8889ef  zynjacku-4.tar.bz2



From cwickert at fedoraproject.org  Fri Apr 17 18:59:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 17 Apr 2009 18:59:37 +0000 (UTC)
Subject: rpms/xfce4-icon-theme/F-11 xfce4-icon-theme.spec,1.20,1.21
Message-ID: <20090417185937.2D0517012B@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7224

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
* Fri Apr 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-3
- Inherit default distribution icon theme (#489402)



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-icon-theme/F-11/xfce4-icon-theme.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfce4-icon-theme.spec	26 Feb 2009 08:51:27 -0000	1.20
+++ xfce4-icon-theme.spec	17 Apr 2009 18:59:05 -0000	1.21
@@ -1,10 +1,11 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-icon-theme-%{version}.tar.bz2
+Patch0: xfce4-icon-theme-4.4.3-fedora.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fedora
 
 %build
 %configure
@@ -40,6 +42,9 @@
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Apr 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-3
+- Inherit default distribution icon theme (#489402)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Fri Apr 17 19:02:12 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 17 Apr 2009 19:02:12 +0000 (UTC)
Subject: rpms/prewikka/devel prewikka.spec,1.8,1.9
Message-ID: <20090417190212.964977012B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prewikka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8086

Modified Files:
	prewikka.spec 
Log Message:
* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-4
- Change default perms on conf file



Index: prewikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/devel/prewikka.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- prewikka.spec	27 Feb 2009 02:19:17 -0000	1.8
+++ prewikka.spec	17 Apr 2009 19:01:42 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           prewikka
 Version:        0.9.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical front-end analysis console for the Prelude Hybrid IDS Framework
 Group:          Applications/Internet
 License:        GPLv2+
@@ -46,8 +46,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0750,root,apache) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,apache) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 %{_sbindir}/%{name}-httpd
@@ -56,6 +56,9 @@
 %doc AUTHORS README NEWS HACKING.README README.fedora  
 
 %changelog
+* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-4
+- Change default perms on conf file
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From oget at fedoraproject.org  Fri Apr 17 19:02:46 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 19:02:46 +0000 (UTC)
Subject: rpms/zynjacku/F-10 import.log, NONE, 1.1 lv2rack.desktop, NONE,
	1.1 zynjacku.desktop, NONE, 1.1 zynjacku.png, NONE,
	1.1 zynjacku.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417190246.9F0D47012B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynjacku/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8109/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2rack.desktop zynjacku.desktop zynjacku.png 
	zynjacku.spec 
Log Message:
* Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
- License is GPLv2
- Clean up unnecessary bits from SPEC file

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-1
- Initial build




--- NEW FILE import.log ---
zynjacku-4-2_fc10:F-10:zynjacku-4-2.fc10.src.rpm:1239994888


--- NEW FILE lv2rack.desktop ---
[Desktop Entry]
Name=lv2rack
GenericName=LV2 effect plugins host
Comment=JACK based host for LV2 effect plugins
Exec=lv2rack
Icon=zynjacku
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE zynjacku.desktop ---
[Desktop Entry]
Name=zynjacku
GenericName=LV2 synth host
Comment=JACK based host for LV2 synths
Exec=zynjacku
Icon=zynjacku
Terminal=false
Type=Application
Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;


--- NEW FILE zynjacku.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		zynjacku
Version:	4
Release:	2%{?dist}
Summary:	LV2 synths and plugins host
Group:		Applications/Multimedia
License:	GPLv2
URL:		http://home.gna.org/zynjacku/	
Source0:	http://download.gna.org/zynjacku/%{name}-%{version}.tar.bz2
# Derived from the logo.png from the tarball
Source1:	%{name}.png
Source2:	%{name}.desktop
Source3:	lv2rack.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	lv2dynparam-devel
BuildRequires:	pygtk2-devel
BuildRequires:	slv2-devel

Requires:	pygtk2-libglade

Provides:	lv2rack = %{version}-%{release}

%description
zynjacku is JACK based, GTK (2.x) host for LV2 synths. It has one JACK MIDI
input port (routed to all hosted synths) and one (two for stereo synths) JACK
audio output port per plugin. Such design provides multi-timbral sound by 
running several synth plugins.

zynjacku is a nunchaku weapon for JACK audio synthesis. You have solid parts
for synthesis itself and you have flexible part that allows synthesis to suit
your needs.

lv2rack is a host for LV2 effect plugins. 

%prep
%setup -q


%build
export am_cv_python_pythondir=%{python_sitearch}
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# We don't need duplicate files
ln -sf ../doc/%{name}-%{version}/gpl.txt $RPM_BUILD_ROOT/%{_datadir}/%{name}/

# Kill .la files
rm -f $RPM_BUILD_ROOT%{python_sitearch}/*.la

# Icon
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/
cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/

# .desktop files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE2}
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE3}


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS gpl.txt NEWS README
%{_bindir}/*
# F-11+ automatically excludes these files:
%if x%fedora < x11
%exclude %{_bindir}/*.py?
%endif
%{python_sitearch}/*.so
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/72x72/apps/%{name}.png

%changelog
* Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
- License is GPLv2
- Clean up unnecessary bits from SPEC file

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:51:24 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:02:16 -0000	1.2
@@ -0,0 +1 @@
+zynjacku-4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:51:25 -0000	1.1
+++ sources	17 Apr 2009 19:02:16 -0000	1.2
@@ -0,0 +1 @@
+20ead5385b1a47f0a148f9f27e8889ef  zynjacku-4.tar.bz2



From cwickert at fedoraproject.org  Fri Apr 17 19:05:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 17 Apr 2009 19:05:49 +0000 (UTC)
Subject: rpms/xarchiver/devel xarchiver-0.5.2-default-archive-format.patch, 
	NONE, 1.1 xarchiver-0.5.2-no-donators-menu.patch, NONE,
	1.1 xarchiver.spec, 1.15, 1.16
Message-ID: <20090417190549.CEAAC7012B@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9015

Modified Files:
	xarchiver.spec 
Added Files:
	xarchiver-0.5.2-default-archive-format.patch 
	xarchiver-0.5.2-no-donators-menu.patch 
Log Message:
* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-4
- Gui fixes (#491115)


xarchiver-0.5.2-default-archive-format.patch:

--- NEW FILE xarchiver-0.5.2-default-archive-format.patch ---
--- xarchiver-0.5.2.orig/src/pref_dialog.c	2008-11-10 09:05:07.000000000 +0100
+++ xarchiver-0.5.2/src/pref_dialog.c	2009-03-22 23:50:47.000000000 +0100
@@ -102,7 +102,8 @@
 	archive_type = g_list_first (ArchiveType);
 	while ( archive_type != NULL )
 	{
-		if (strcmp(archive_type->data, "tgz") == 0 ||
+		if (strcmp(archive_type->data, "arj") == 0 ||
+			strcmp(archive_type->data, "tgz") == 0 ||
 			strcmp(archive_type->data, "rpm") == 0 ||
 			(strcmp(archive_type->data, "rar") == 0 && unrar) )
 			goto next;

xarchiver-0.5.2-no-donators-menu.patch:

--- NEW FILE xarchiver-0.5.2-no-donators-menu.patch ---
--- xarchiver/trunk/src/interface.c	2009/03/19 18:03:52	29676
+++ xarchiver/trunk/src/interface.c	2009/03/19 20:48:19	29677
@@ -310,22 +310,14 @@
 	gtk_widget_show (tmp_image);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image);
 
+	donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate"));
+	gtk_widget_show (donate);
+	gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate);
+
 	about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group);
 	gtk_widget_show (about1);
 	gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1);
 
-	thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to"));
-	gtk_widget_show (thanks_to);
-	gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to);
-
-	thanks_to_submenu = gtk_menu_new();
-	gtk_widget_show (thanks_to_submenu);
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu);
-
-	donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here");
-	gtk_widget_show (donators);
-	gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators);
-
 	/* Create the toolbar */
 	toolbar1 = gtk_toolbar_new ();
 	gtk_widget_show (toolbar1);
@@ -543,7 +535,7 @@
 	g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL);
 	g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL);
 	g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL);
-	g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
+	g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
 
 	g_signal_connect ((gpointer) New_button,	"clicked",G_CALLBACK (xa_new_archive),NULL);
 	g_signal_connect ((gpointer) Open_button,	"clicked",G_CALLBACK (xa_open_archive),NULL);
--- xarchiver/trunk/src/interface.h	2008/11/04 10:06:17	28603
+++ xarchiver/trunk/src/interface.h	2009/03/19 20:48:19	29677
@@ -48,8 +48,8 @@
 *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data,
 *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1,
 *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1,
-*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
-*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
+*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
+*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
 *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label,
 *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu;


Index: xarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xarchiver/devel/xarchiver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xarchiver.spec	26 Feb 2009 07:41:08 -0000	1.15
+++ xarchiver.spec	17 Apr 2009 19:05:19 -0000	1.16
@@ -1,12 +1,14 @@
 Name:           xarchiver
 Version:        0.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Archive manager for Xfce
 
 Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://xarchiver.xfce.org/
 Source0:        http://downloads.sourceforge.net/xarchiver/xarchiver-%{version}.tar.bz2
+Patch0:         xarchiver-0.5.2-no-donators-menu.patch
+Patch1:         xarchiver-0.5.2-default-archive-format.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libxml2-devel, gettext, desktop-file-utils
@@ -24,7 +26,8 @@
 %setup -q
 # fix spurious executable permissions of some debug files
 chmod -x src/mime.*
-
+%patch0 -p2 -b .donate
+%patch1 -p1 -b .default
 
 %build
 %configure
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-4
+- Gui fixes (#491115)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ajax at fedoraproject.org  Fri Apr 17 19:06:52 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 17 Apr 2009 19:06:52 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xorg-x11-server.spec, 1.437,
	1.438 xserver-1.6.1-randr-gamma.patch, 1.1, 1.2
Message-ID: <20090417190652.81DBF7012B@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9234

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-randr-gamma.patch 
Log Message:
* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 1.6.1-6
- xserver-1.6.1-randr-gamma.patch: Silence debugging messages.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- xorg-x11-server.spec	17 Apr 2009 01:06:36 -0000	1.437
+++ xorg-x11-server.spec	17 Apr 2009 19:06:22 -0000	1.438
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -540,6 +540,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 1.6.1-6
+- xserver-1.6.1-randr-gamma.patch: Silence debugging messages.
+
 * Fri Apr 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.1-5
 - xserver-1.6.1-activate-device.patch: remove the device if activation fails.
   This fixes crashes if wacom tablets are added through hal _and_ have an

xserver-1.6.1-randr-gamma.patch:

Index: xserver-1.6.1-randr-gamma.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xserver-1.6.1-randr-gamma.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.6.1-randr-gamma.patch	16 Apr 2009 20:31:11 -0000	1.1
+++ xserver-1.6.1-randr-gamma.patch	17 Apr 2009 19:06:22 -0000	1.2
@@ -22,7 +22,6 @@
  #include "xf86DDC.h"
  #include "mipointer.h"
 diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
-index e578447..0e3cac7 100644
 --- a/hw/xfree86/common/xf86cmap.c
 +++ b/hw/xfree86/common/xf86cmap.c
 @@ -84,6 +84,7 @@ typedef struct {
@@ -79,7 +78,6 @@
 +    return BadImplementation;
  }
 diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 4546492..0266c25 100644
 --- a/hw/xfree86/modes/xf86RandR12.c
 +++ b/hw/xfree86/modes/xf86RandR12.c
 @@ -1647,6 +1647,60 @@ xf86RandR13SetPanning (ScreenPtr           pScreen,
@@ -112,7 +110,7 @@
 +    CARD16 *points, *red, *green, *blue;
 +    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 +    rrScrPrivPtr rp = rrGetScrPriv(pScrn->pScreen);
-+    ErrorF("xf86RandR12ChangeGamma called\n");
++
 +    for (i = 0; i < rp->numCrtcs; i++)
 +	size = max(size, rp->crtcs[i]->gammaSize);
 +



From sgrubb at fedoraproject.org  Fri Apr 17 19:09:26 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 17 Apr 2009 19:09:26 +0000 (UTC)
Subject: rpms/prewikka/F-11 prewikka.spec,1.8,1.9
Message-ID: <20090417190926.D51337012B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prewikka/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9857

Modified Files:
	prewikka.spec 
Log Message:
* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-4
- Change default perms on conf file



Index: prewikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/F-11/prewikka.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- prewikka.spec	27 Feb 2009 02:19:17 -0000	1.8
+++ prewikka.spec	17 Apr 2009 19:08:56 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           prewikka
 Version:        0.9.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical front-end analysis console for the Prelude Hybrid IDS Framework
 Group:          Applications/Internet
 License:        GPLv2+
@@ -46,8 +46,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0750,root,apache) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,apache) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 %{_sbindir}/%{name}-httpd
@@ -56,6 +56,9 @@
 %doc AUTHORS README NEWS HACKING.README README.fedora  
 
 %changelog
+* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-4
+- Change default perms on conf file
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rishi at fedoraproject.org  Fri Apr 17 19:12:20 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri, 17 Apr 2009 19:12:20 +0000 (UTC)
Subject: rpms/glade3/F-11 glade3-3.6.2-desktop.patch, NONE,
	1.1 glade3-3.6.2-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 glade3.spec, 1.25, 1.26 sources, 1.12,
	1.13 glade3-3.6.1-desktop.patch, 1.1, NONE
Message-ID: <20090417191220.EC41170137@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10498

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.6.2-desktop.patch glade3-3.6.2-pkgconfig.patch 
Removed Files:
	glade3-3.6.1-desktop.patch 
Log Message:
* Fri Apr 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.2-1
- Version bump to 3.6.2.
  * Fixed missing properties/attributes when serializing a GtkWindow. (GNOME
    Bugzilla #578211)
  * Fixed loading state of GtkCellRenderer attributes (whether to use
    attribute or property directly). (GNOME Bugzilla #566928)
  * Translation updates: es, sr and sr at latin.
  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.news
  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.changes
- Fixed gladeui-1.0.pc.in by trimming 'Requires' list.


glade3-3.6.2-desktop.patch:

--- NEW FILE glade3-3.6.2-desktop.patch ---
diff -urNp glade3-3.5.5.orig/data/glade-3.desktop.in.in glade3-3.5.5/data/glade-3.desktop.in.in
--- glade3-3.5.5.orig/data/glade-3.desktop.in.in	2009-01-07 00:41:35.000000000 +0530
+++ glade3-3.5.5/data/glade-3.desktop.in.in	2009-01-07 00:42:21.000000000 +0530
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Glade Interface Designer
+_Name=Glade-3 Interface Designer
 _GenericName=User Interface Designer
 _Comment=Create or open user interface designs for GTK+ applications
 Exec=glade-3 %F

glade3-3.6.2-pkgconfig.patch:

--- NEW FILE glade3-3.6.2-pkgconfig.patch ---
diff -urNp glade3-3.6.2.orig/data/gladeui-1.0.pc.in glade3-3.6.2/data/gladeui-1.0.pc.in
--- glade3-3.6.2.orig/data/gladeui-1.0.pc.in	2009-04-17 23:49:19.000000000 +0530
+++ glade3-3.6.2/data/gladeui-1.0.pc.in	2009-04-17 23:52:56.000000000 +0530
@@ -13,6 +13,6 @@ Name: Glade
 Description: Glade interface designer library
 URL: http://glade.gnome.org
 Version: @PACKAGE_VERSION@
-Requires: gtk+-2.0 >= 2.14.0 libxml-2.0 >= 2.4.0
+Requires: gtk+-2.0 >= 2.14.0
 Libs: -L${libdir} -lgladeui-1
 Cflags: -I${includedir}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Apr 2009 04:16:52 -0000	1.12
+++ .cvsignore	17 Apr 2009 19:11:50 -0000	1.13
@@ -1 +1 @@
-glade3-3.6.1.tar.gz
+glade3-3.6.2.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-11/glade3.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- glade3.spec	11 Apr 2009 19:45:05 -0000	1.25
+++ glade3.spec	17 Apr 2009 19:11:50 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.6.1
+Version:	3.6.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -8,6 +8,7 @@
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/%{name}-%{version}.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
+Patch1:		%{name}-%{version}-pkgconfig.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -63,6 +64,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Suppress rpmlint warning.
 chmod 644 ./plugins/gtk+/glade-attributes.c
@@ -191,6 +193,17 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Fri Apr 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.2-1
+- Version bump to 3.6.2.
+  * Fixed missing properties/attributes when serializing a GtkWindow. (GNOME
+    Bugzilla #578211)
+  * Fixed loading state of GtkCellRenderer attributes (whether to use
+    attribute or property directly). (GNOME Bugzilla #566928)
+  * Translation updates: es, sr and sr at latin.
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.changes
+- Fixed gladeui-1.0.pc.in by trimming 'Requires' list.
+
 * Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-1
 - Version bump to 3.6.1.
   * Fixed crash during internal widget selection.
@@ -201,9 +214,10 @@
   * Properly initialize a GValue on the stack. (GNOME Bugzilla #577822)
   * Translation updates: ar and cs.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.changes
 - Added 'Requires: devhelp' to glade3-libgladeui.
 - Removed 'Requires: gtk2-devel >= 2.14.0 libxml2-devel pkgconfig' from
-  glade3-libgladeui-devel.
+  glade3-libgladeui-devel. Let rpm-4.6 autogenerate them.
 
 * Tue Mar 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.0-1
 - Version bump to 3.6.0.
@@ -239,12 +253,14 @@
   * Support running from gtk2-2.14 targetting gtk2-2.16.
   * Translation updates: de, es, fi, he, ko and pt_BR.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.7.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.7.changes
 
 * Sat Jan 31 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.5.6-1
 - Version bump to 3.5.6.
   * Handles new GdkPixbuf properties. (GNOME Bugzilla #567454)
   * Translation updates: es, nb and pt_BR.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.6.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.6.changes
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)
 
 * Wed Jan 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.5.5-1
@@ -253,6 +269,7 @@
     navigations.
   * Translation updates: es.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.5.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.5.changes
 - Removed 'Provides: glade'.
 - Addressed warnings generated by rpmlint.
 
@@ -282,16 +299,22 @@
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.3.news
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.2.news
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.4.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.3.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.2.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.1.changes
 
 * Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
 - Version bump to 3.4.5.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.5.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.5.changes
 
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
   * Duplicate widget names not allowed in a project.
   * Translation updates: sq, tr, bg, da, es, en_GB, ml, pt_BR and hi.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.changes
 
 * Wed Mar 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.3-1
 - Version bump to 3.4.3.
@@ -300,6 +323,8 @@
     de, pt, th, uk, he, tr, vi, oc, sv, ar, es and ja.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.3.news
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.3.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.2.changes
 
 * Sun Mar 02 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.1-5
 - Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7.
@@ -320,6 +345,7 @@
 - Version bump to 3.4.1.
   * Translation updates: nb, sl, et, ar, tr, gl, ko, ja and pt_BR.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.1.changes
 
 * Tue Nov 27 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.4.0-5
 - Fixed usage of _remove_encoding to prevent failure on Fedora 7.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Apr 2009 04:16:52 -0000	1.12
+++ sources	17 Apr 2009 19:11:50 -0000	1.13
@@ -1 +1 @@
-9215ade3cc65e746e0d0b16a65500bb9  glade3-3.6.1.tar.gz
+ac525d7bb0e4064e56f3b0975294f43c  glade3-3.6.2.tar.gz


--- glade3-3.6.1-desktop.patch DELETED ---



From notting at fedoraproject.org  Fri Apr 17 19:16:24 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 17 Apr 2009 19:16:24 +0000 (UTC)
Subject: rpms/mash/F-11 .cvsignore, 1.42, 1.43 mash.spec, 1.48, 1.49 sources,
	1.44, 1.45
Message-ID: <20090417191624.A81C27012B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12113

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
0.5.2-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	16 Apr 2009 17:46:49 -0000	1.42
+++ .cvsignore	17 Apr 2009 19:15:54 -0000	1.43
@@ -1 +1 @@
-mash-0.5.1.tar.gz
+mash-0.5.2.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/mash.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mash.spec	16 Apr 2009 17:46:49 -0000	1.48
+++ mash.spec	17 Apr 2009 19:15:54 -0000	1.49
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 /var/cache/mash
 
 %changelog
+* Fri Apr 17 2009 Bill Nottingham <notting at redhat.com> 0.5.2-1
+- set a max size for deltarpm-able packages (#496242)
+
 * Thu Apr 16 2009 Bill Nottingham <notting at redhat.com> 0.5.1-1
 - delta fixes
 - handle qt/kde plugins better (#495947)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	16 Apr 2009 17:46:49 -0000	1.44
+++ sources	17 Apr 2009 19:15:54 -0000	1.45
@@ -1 +1 @@
-61700aa67ea88f7b0716a10c5fadc41c  mash-0.5.1.tar.gz
+87c775930ffb2eac9e04236d713342f2  mash-0.5.2.tar.gz



From cebbert at fedoraproject.org  Fri Apr 17 19:16:33 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 17 Apr 2009 19:16:33 +0000 (UTC)
Subject: rpms/kernel/F-10 alsa-add-subdevice_mask-to-quirk-entries.patch,
	NONE, 
	1.1 alsa-hda-update-quirks.patch, NONE, 1.1 kernel.spec, 1.1331,
	1.1332
Message-ID: <20090417191633.A57197012B@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12183

Modified Files:
	kernel.spec 
Added Files:
	alsa-add-subdevice_mask-to-quirk-entries.patch 
	alsa-hda-update-quirks.patch 
Log Message:
Copy ALSA quirk updates from Fedora 11

alsa-add-subdevice_mask-to-quirk-entries.patch:

--- NEW FILE alsa-add-subdevice_mask-to-quirk-entries.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Fri, 30 Jan 2009 16:27:45 +0000 (+0100)
Subject: ALSA: Add subdevice_mask field to quirk entries
X-Git-Tag: v2.6.30-rc1~676^2~28^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8bd4bb7a35e8ebb015a531218614c48e10a3c4ee

ALSA: Add subdevice_mask field to quirk entries

Introduced a new field, subdevice_mask, which specifies the bitmask
to match with the given subdevice ID.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/include/sound/core.h b/include/sound/core.h
index f632484..f67952a 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -446,21 +446,33 @@ static inline int __snd_bug_on(int cond)
 struct snd_pci_quirk {
 	unsigned short subvendor;	/* PCI subvendor ID */
 	unsigned short subdevice;	/* PCI subdevice ID */
+	unsigned short subdevice_mask;	/* bitmask to match */
 	int value;			/* value */
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 	const char *name;		/* name of the device (optional) */
 #endif
 };
 
-#define _SND_PCI_QUIRK_ID(vend,dev) \
-	.subvendor = (vend), .subdevice = (dev)
+#define _SND_PCI_QUIRK_ID_MASK(vend, mask, dev)	\
+	.subvendor = (vend), .subdevice = (dev), .subdevice_mask = (mask)
+#define _SND_PCI_QUIRK_ID(vend, dev) \
+	_SND_PCI_QUIRK_ID_MASK(vend, 0xffff, dev)
 #define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
 	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev),			\
+			.value = (val), .name = (xname)}
 #else
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
 	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), .value = (val)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)			\
+	{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)}
 #endif
 
 const struct snd_pci_quirk *
diff --git a/sound/core/misc.c b/sound/core/misc.c
index 38524f6..a9710e0 100644
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list)
 {
 	const struct snd_pci_quirk *q;
 
-	for (q = list; q->subvendor; q++)
-		if (q->subvendor == pci->subsystem_vendor &&
-		    (!q->subdevice || q->subdevice == pci->subsystem_device))
+	for (q = list; q->subvendor; q++) {
+		if (q->subvendor != pci->subsystem_vendor)
+			continue;
+		if (!q->subdevice ||
+		    (pci->subsystem_device & q->subdevice_mask) == q->subdevice)
 			return q;
+	}
 	return NULL;
 }
-
 EXPORT_SYMBOL(snd_pci_quirk_lookup);
 #endif

alsa-hda-update-quirks.patch:

--- NEW FILE alsa-hda-update-quirks.patch ---
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1002,11 +1002,9 @@ static struct snd_pci_quirk ad1986a_cfg_
 	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
 	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
-	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG),
-	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG),
-	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG),
 	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
-	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
+	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_SAMSUNG),
+	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),
 	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
 	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE),
@@ -3911,8 +3909,9 @@ static struct snd_pci_quirk ad1884a_cfg_
 	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
 	SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
-	SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
-	SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
+	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE),
+	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
 	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
 	{}
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1002,15 +1002,9 @@ static const char *cxt5045_models[CXT504
 };
 
 static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
-	SND_PCI_QUIRK(0x103c, 0x30a5, "HP", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2120", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30cd, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE),
 	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
-	SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
+			   CXT5045_LAPTOP_HPSENSE),
 	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT5045_LAPTOP_MICSENSE),
 	SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),
 	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),
@@ -1020,8 +1014,8 @@ static struct snd_pci_quirk cxt5045_cfg_
 	SND_PCI_QUIRK(0x1509, 0x1e40, "FIC", CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x1509, 0x2f05, "FIC", CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x1509, 0x2f06, "FIC", CXT5045_LAPTOP_HPMICSENSE),
-	SND_PCI_QUIRK(0x1631, 0xc106, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
-	SND_PCI_QUIRK(0x1631, 0xc107, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
+	SND_PCI_QUIRK_MASK(0x1631, 0xff00, 0xc100, "Packard Bell",
+			   CXT5045_LAPTOP_HPMICSENSE),
 	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
 	{}
 };
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -10549,15 +10549,12 @@ static const char *alc262_models[ALC262_
 static struct snd_pci_quirk alc262_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),
-	SND_PCI_QUIRK(0x103c, 0x12fe, "HP xw9400", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x12ff, "HP xw4550", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1306, "HP xw8600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
-	SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",
+			   ALC262_HP_BPC),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",
+			   ALC262_HP_BPC),
+	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",
+			   ALC262_HP_BPC),
 	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
 	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
 	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
@@ -10575,17 +10572,16 @@ static struct snd_pci_quirk alc262_cfg_t
 	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
 	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
-	SND_PCI_QUIRK(0x104d, 0x9033, "Sony VAIO VGN-SR19XN",
-		      ALC262_SONY_ASSAMD),
+	SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */
+	SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",
+			   ALC262_SONY_ASSAMD),
 	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
 		      ALC262_TOSHIBA_RX1),
 	SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
 	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
 	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
-	SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
-	SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
+	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
+			   ALC262_ULTRA),
 	SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
 	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
 	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
@@ -16039,9 +16035,8 @@ static struct snd_pci_quirk alc662_cfg_t
 	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
 	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
 					ALC662_3ST_6ch_DIG),
-	SND_PCI_QUIRK(0x1854, 0x2000, "ASUS H13-2000", ALC663_ASUS_H13),
-	SND_PCI_QUIRK(0x1854, 0x2001, "ASUS H13-2001", ALC663_ASUS_H13),
-	SND_PCI_QUIRK(0x1854, 0x2002, "ASUS H13-2002", ALC663_ASUS_H13),
+	SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
+			   ALC663_ASUS_H13),
 	{}
 };
 
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1796,18 +1796,12 @@ static struct snd_pci_quirk stac92hd71bx
 	/* SigmaTel reference board */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
 		      "DFI LanParty", STAC_92HD71BXX_REF),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f2,
-		      "HP dv5", STAC_HP_M4),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
-		      "HP dv7", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
-		      "HP dv4", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
-		      "HP dv7", STAC_HP_M4),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3600,
-		      "HP dv5", STAC_HP_DV5),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
-		      "HP dv5", STAC_HP_DV5),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,
+			   "HP", STAC_HP_DV5),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,
+			   "HP dv4-7", STAC_HP_DV5),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,
+			   "HP dv4-7", STAC_HP_DV5),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,
 				"unknown HP", STAC_HP_M4),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
@@ -2065,32 +2059,8 @@ static struct snd_pci_quirk stac922x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,
 		      "Dell XPS M1210", STAC_922X_DELL_M82),
 	/* ECS/PC Chips boards */
-	SND_PCI_QUIRK(0x1019, 0x2144,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2608,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2633,
-		      "ECS/PC chips P17G/1333", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2811,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2812,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2813,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2814,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2815,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2816,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2817,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2818,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2819,
-		      "ECS/PC chips", STAC_ECS_202),
-	SND_PCI_QUIRK(0x1019, 0x2820,
-		      "ECS/PC chips", STAC_ECS_202),
+	SND_PCI_QUIRK_MASK(0x1019, 0xf000, 0x2000,
+			   "ECS/PC chips", STAC_ECS_202),
 	{} /* terminator */
 };
 
@@ -2148,22 +2118,10 @@ static struct snd_pci_quirk stac927x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x3d01, "Intel D946", STAC_D965_3ST),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xa301, "Intel D946", STAC_D965_3ST),
 	/* 965 based 3 stack systems */
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2116, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2115, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2114, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2113, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2112, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2111, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2110, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2009, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2008, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2007, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2006, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2005, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2004, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2100,
+			   "Intel D965", STAC_D965_3ST),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,
+			   "Intel D965", STAC_D965_3ST),
 	/* Dell 3 stack systems */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_3ST),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
@@ -2179,15 +2137,10 @@ static struct snd_pci_quirk stac927x_cfg
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS),
 	/* 965 based 5 stack systems */
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2303, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2304, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2305, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2501, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2502, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2503, "Intel D965", STAC_D965_5ST),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2504, "Intel D965", STAC_D965_5ST),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2300,
+			   "Intel D965", STAC_D965_5ST),
+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500,
+			   "Intel D965", STAC_D965_5ST),
 	{} /* terminator */
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1331
retrieving revision 1.1332
diff -u -r1.1331 -r1.1332
--- kernel.spec	14 Apr 2009 23:31:45 -0000	1.1331
+++ kernel.spec	17 Apr 2009 19:16:03 -0000	1.1332
@@ -639,6 +639,8 @@
 Patch607: alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
 Patch608: alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 Patch609: alsa-hda_intel-prealloc-4mb-dmabuffer.patch
+Patch610: alsa-add-subdevice_mask-to-quirk-entries.patch
+Patch611: alsa-hda-update-quirks.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
@@ -1235,6 +1237,8 @@
 ApplyPatch alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
 ApplyPatch alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 ApplyPatch alsa-hda_intel-prealloc-4mb-dmabuffer.patch
+ApplyPatch alsa-add-subdevice_mask-to-quirk-entries.patch
+ApplyPatch alsa-hda-update-quirks.patch
 
 # Networking
 
@@ -1907,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>> 2.6.29.1-32
+- Copy ALSA quirk updates from Fedora 11
+
 * Thu Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>> 2.6.29.1-31
 - Copy kvm fixes for bz#491625 and missed networking fix from F11 kernel
 



From rishi at fedoraproject.org  Fri Apr 17 19:17:55 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri, 17 Apr 2009 19:17:55 +0000 (UTC)
Subject: rpms/glade3/devel glade3-3.6.2-desktop.patch, NONE,
	1.1 glade3-3.6.2-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 glade3.spec, 1.25, 1.26 sources, 1.12,
	1.13 glade3-3.6.1-desktop.patch, 1.1, NONE
Message-ID: <20090417191755.C1FB67012B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13096

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.6.2-desktop.patch glade3-3.6.2-pkgconfig.patch 
Removed Files:
	glade3-3.6.1-desktop.patch 
Log Message:
* Fri Apr 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.2-1
- Version bump to 3.6.2.
  * Fixed missing properties/attributes when serializing a GtkWindow. (GNOME
    Bugzilla #578211)
  * Fixed loading state of GtkCellRenderer attributes (whether to use
    attribute or property directly). (GNOME Bugzilla #566928)
  * Translation updates: es, sr and sr at latin.
  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.news
  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.changes
- Fixed gladeui-1.0.pc.in by trimming 'Requires' list.


glade3-3.6.2-desktop.patch:

--- NEW FILE glade3-3.6.2-desktop.patch ---
diff -urNp glade3-3.5.5.orig/data/glade-3.desktop.in.in glade3-3.5.5/data/glade-3.desktop.in.in
--- glade3-3.5.5.orig/data/glade-3.desktop.in.in	2009-01-07 00:41:35.000000000 +0530
+++ glade3-3.5.5/data/glade-3.desktop.in.in	2009-01-07 00:42:21.000000000 +0530
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Glade Interface Designer
+_Name=Glade-3 Interface Designer
 _GenericName=User Interface Designer
 _Comment=Create or open user interface designs for GTK+ applications
 Exec=glade-3 %F

glade3-3.6.2-pkgconfig.patch:

--- NEW FILE glade3-3.6.2-pkgconfig.patch ---
diff -urNp glade3-3.6.2.orig/data/gladeui-1.0.pc.in glade3-3.6.2/data/gladeui-1.0.pc.in
--- glade3-3.6.2.orig/data/gladeui-1.0.pc.in	2009-04-17 23:49:19.000000000 +0530
+++ glade3-3.6.2/data/gladeui-1.0.pc.in	2009-04-17 23:52:56.000000000 +0530
@@ -13,6 +13,6 @@ Name: Glade
 Description: Glade interface designer library
 URL: http://glade.gnome.org
 Version: @PACKAGE_VERSION@
-Requires: gtk+-2.0 >= 2.14.0 libxml-2.0 >= 2.4.0
+Requires: gtk+-2.0 >= 2.14.0
 Libs: -L${libdir} -lgladeui-1
 Cflags: -I${includedir}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Apr 2009 04:16:52 -0000	1.12
+++ .cvsignore	17 Apr 2009 19:17:25 -0000	1.13
@@ -1 +1 @@
-glade3-3.6.1.tar.gz
+glade3-3.6.2.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- glade3.spec	11 Apr 2009 19:45:05 -0000	1.25
+++ glade3.spec	17 Apr 2009 19:17:25 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.6.1
+Version:	3.6.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -8,6 +8,7 @@
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/%{name}-%{version}.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
+Patch1:		%{name}-%{version}-pkgconfig.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -63,6 +64,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Suppress rpmlint warning.
 chmod 644 ./plugins/gtk+/glade-attributes.c
@@ -191,6 +193,17 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Fri Apr 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.2-1
+- Version bump to 3.6.2.
+  * Fixed missing properties/attributes when serializing a GtkWindow. (GNOME
+    Bugzilla #578211)
+  * Fixed loading state of GtkCellRenderer attributes (whether to use
+    attribute or property directly). (GNOME Bugzilla #566928)
+  * Translation updates: es, sr and sr at latin.
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.2.changes
+- Fixed gladeui-1.0.pc.in by trimming 'Requires' list.
+
 * Tue Apr 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-1
 - Version bump to 3.6.1.
   * Fixed crash during internal widget selection.
@@ -201,9 +214,10 @@
   * Properly initialize a GValue on the stack. (GNOME Bugzilla #577822)
   * Translation updates: ar and cs.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-3.6.1.changes
 - Added 'Requires: devhelp' to glade3-libgladeui.
 - Removed 'Requires: gtk2-devel >= 2.14.0 libxml2-devel pkgconfig' from
-  glade3-libgladeui-devel.
+  glade3-libgladeui-devel. Let rpm-4.6 autogenerate them.
 
 * Tue Mar 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.0-1
 - Version bump to 3.6.0.
@@ -239,12 +253,14 @@
   * Support running from gtk2-2.14 targetting gtk2-2.16.
   * Translation updates: de, es, fi, he, ko and pt_BR.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.7.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.7.changes
 
 * Sat Jan 31 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.5.6-1
 - Version bump to 3.5.6.
   * Handles new GdkPixbuf properties. (GNOME Bugzilla #567454)
   * Translation updates: es, nb and pt_BR.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.6.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.6.changes
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)
 
 * Wed Jan 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.5.5-1
@@ -253,6 +269,7 @@
     navigations.
   * Translation updates: es.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.5.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.5.changes
 - Removed 'Provides: glade'.
 - Addressed warnings generated by rpmlint.
 
@@ -282,16 +299,22 @@
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.3.news
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.2.news
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.4.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.3.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.2.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.5/glade3-3.5.1.changes
 
 * Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
 - Version bump to 3.4.5.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.5.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.5.changes
 
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
   * Duplicate widget names not allowed in a project.
   * Translation updates: sq, tr, bg, da, es, en_GB, ml, pt_BR and hi.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.changes
 
 * Wed Mar 12 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.3-1
 - Version bump to 3.4.3.
@@ -300,6 +323,8 @@
     de, pt, th, uk, he, tr, vi, oc, sv, ar, es and ja.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.3.news
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.3.changes
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.2.changes
 
 * Sun Mar 02 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.1-5
 - Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7.
@@ -320,6 +345,7 @@
 - Version bump to 3.4.1.
   * Translation updates: nb, sl, et, ar, tr, gl, ko, ja and pt_BR.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.1.changes
 
 * Tue Nov 27 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.4.0-5
 - Fixed usage of _remove_encoding to prevent failure on Fedora 7.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Apr 2009 04:16:52 -0000	1.12
+++ sources	17 Apr 2009 19:17:25 -0000	1.13
@@ -1 +1 @@
-9215ade3cc65e746e0d0b16a65500bb9  glade3-3.6.1.tar.gz
+ac525d7bb0e4064e56f3b0975294f43c  glade3-3.6.2.tar.gz


--- glade3-3.6.1-desktop.patch DELETED ---



From cassmodiah at fedoraproject.org  Fri Apr 17 19:28:20 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 17 Apr 2009 19:28:20 +0000 (UTC)
Subject: rpms/griffith/devel griffith.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417192820.8F18F7012B@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/griffith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15141/devel

Modified Files:
	.cvsignore sources 
Added Files:
	griffith.spec import.log 
Log Message:



--- NEW FILE griffith.spec ---
%global beta beta2

Name:           griffith
Version:        0.10
Release:        0.1.%{beta}%{?dist}
Summary:        Media collection manager

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.griffith.cc
Source0:        ftp://ftp.berlios.de/pub/%{name}/experimental/%{name}_%{version}~%{beta}.orig.tar.gz
# Link http://prdownload.berlios.de/%{name}/%{name}-%{version}-%{beta}.tar.gz is a broken archive
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       pygtk2
Requires:       python-sqlalchemy >= 0.5
Requires:       python-lxml
Requires:       python-sqlite2
Requires:       python-imaging 
Requires:       python-reportlab
Requires:       gnome-python2-gtkspell


%description
Griffith is a media collection manager application. Adding items to the 
collection is as quick and easy as typing the film title and selecting a 
supported source. Griffith will then try to fetch all the related information 
from the Web.

This Version comes with SQLite support. You need to install
 * the package "MySQL-python" for MySQL-support
 * the package "python-psycopg2" for PostgreSQL-support


%prep
%setup -q -n %{name}-%{version}-%{beta}

find -iname "*.mo" -exec rm -f {} \;

iconv -f iso-8859-1 -t utf-8 docs/pl/%{name}.1 |sed 's|\r||g' > docs/pl/%{name}.1.utf8
touch -c -r docs/pl/%{name}.1 docs/pl/%{name}.1.utf8
mv docs/pl/%{name}.1.utf8 docs/pl/%{name}.1


%build
make -C po dist %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}

rm -f %{buildroot}%{_bindir}/%{name}

cat > %{buildroot}/%{_bindir}/%{name} << EOF
#!/bin/bash
%{_datadir}/%{name}/lib/%{name}
EOF

chmod +x %{buildroot}/%{_bindir}/%{name}

desktop-file-install \
       --dir=%{buildroot}/%{_datadir}/applications/ \
%{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%{_datadir}/pixmaps/%{name}*
%{_mandir}/man1/%{name}*
%{_mandir}/*/man1/%{name}*
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}


%changelog
* Mon Apr 13 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10-0.1.beta2
- Update to 0.10-beta2 to avoid crappy issues with sqlalchemy
- Remove binary mo-files and build it from source  

* Mon Mar 30 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.9-1
- Initial package release


--- NEW FILE import.log ---
griffith-0_10-0_1_beta2_fc10:HEAD:griffith-0.10-0.1.beta2.fc10.src.rpm:1239996226


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/griffith/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:47:30 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:27:50 -0000	1.2
@@ -0,0 +1 @@
+griffith_0.10~beta2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/griffith/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:47:30 -0000	1.1
+++ sources	17 Apr 2009 19:27:50 -0000	1.2
@@ -0,0 +1 @@
+9be757516cef84b43cfbed5551256856  griffith_0.10~beta2.orig.tar.gz



From cwickert at fedoraproject.org  Fri Apr 17 19:32:28 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 17 Apr 2009 19:32:28 +0000 (UTC)
Subject: rpms/xarchiver/F-11 xarchiver-0.5.2-default-archive-format.patch,
	NONE, 1.1 xarchiver-0.5.2-no-donators-menu.patch, NONE,
	1.1 xarchiver.spec, 1.15, 1.16
Message-ID: <20090417193228.5838A7012B@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15834

Modified Files:
	xarchiver.spec 
Added Files:
	xarchiver-0.5.2-default-archive-format.patch 
	xarchiver-0.5.2-no-donators-menu.patch 
Log Message:
* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-4
- Gui fixes (#491115)


xarchiver-0.5.2-default-archive-format.patch:

--- NEW FILE xarchiver-0.5.2-default-archive-format.patch ---
--- xarchiver-0.5.2.orig/src/pref_dialog.c	2008-11-10 09:05:07.000000000 +0100
+++ xarchiver-0.5.2/src/pref_dialog.c	2009-03-22 23:50:47.000000000 +0100
@@ -102,7 +102,8 @@
 	archive_type = g_list_first (ArchiveType);
 	while ( archive_type != NULL )
 	{
-		if (strcmp(archive_type->data, "tgz") == 0 ||
+		if (strcmp(archive_type->data, "arj") == 0 ||
+			strcmp(archive_type->data, "tgz") == 0 ||
 			strcmp(archive_type->data, "rpm") == 0 ||
 			(strcmp(archive_type->data, "rar") == 0 && unrar) )
 			goto next;

xarchiver-0.5.2-no-donators-menu.patch:

--- NEW FILE xarchiver-0.5.2-no-donators-menu.patch ---
--- xarchiver/trunk/src/interface.c	2009/03/19 18:03:52	29676
+++ xarchiver/trunk/src/interface.c	2009/03/19 20:48:19	29677
@@ -310,22 +310,14 @@
 	gtk_widget_show (tmp_image);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image);
 
+	donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate"));
+	gtk_widget_show (donate);
+	gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate);
+
 	about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group);
 	gtk_widget_show (about1);
 	gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1);
 
-	thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to"));
-	gtk_widget_show (thanks_to);
-	gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to);
-
-	thanks_to_submenu = gtk_menu_new();
-	gtk_widget_show (thanks_to_submenu);
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu);
-
-	donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here");
-	gtk_widget_show (donators);
-	gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators);
-
 	/* Create the toolbar */
 	toolbar1 = gtk_toolbar_new ();
 	gtk_widget_show (toolbar1);
@@ -543,7 +535,7 @@
 	g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL);
 	g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL);
 	g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL);
-	g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
+	g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
 
 	g_signal_connect ((gpointer) New_button,	"clicked",G_CALLBACK (xa_new_archive),NULL);
 	g_signal_connect ((gpointer) Open_button,	"clicked",G_CALLBACK (xa_open_archive),NULL);
--- xarchiver/trunk/src/interface.h	2008/11/04 10:06:17	28603
+++ xarchiver/trunk/src/interface.h	2009/03/19 20:48:19	29677
@@ -48,8 +48,8 @@
 *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data,
 *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1,
 *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1,
-*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
-*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
+*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
+*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
 *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label,
 *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu;


Index: xarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xarchiver/F-11/xarchiver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xarchiver.spec	26 Feb 2009 07:41:08 -0000	1.15
+++ xarchiver.spec	17 Apr 2009 19:31:58 -0000	1.16
@@ -1,12 +1,14 @@
 Name:           xarchiver
 Version:        0.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Archive manager for Xfce
 
 Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://xarchiver.xfce.org/
 Source0:        http://downloads.sourceforge.net/xarchiver/xarchiver-%{version}.tar.bz2
+Patch0:         xarchiver-0.5.2-no-donators-menu.patch
+Patch1:         xarchiver-0.5.2-default-archive-format.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libxml2-devel, gettext, desktop-file-utils
@@ -24,7 +26,8 @@
 %setup -q
 # fix spurious executable permissions of some debug files
 chmod -x src/mime.*
-
+%patch0 -p2 -b .donate
+%patch1 -p1 -b .default
 
 %build
 %configure
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-4
+- Gui fixes (#491115)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sailer at fedoraproject.org  Fri Apr 17 19:35:10 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 19:35:10 +0000 (UTC)
Subject: rpms/mingw32-libglade2/F-11 libglade-2.0.1-nowarning.patch, NONE,
	1.1 libglade-secondary.patch, NONE, 1.1 mingw32-libglade2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417193510.6F99A7012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglade2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16430

Modified Files:
	.cvsignore sources 
Added Files:
	libglade-2.0.1-nowarning.patch libglade-secondary.patch 
	mingw32-libglade2.spec 
Log Message:
copy from devel


libglade-2.0.1-nowarning.patch:

--- NEW FILE libglade-2.0.1-nowarning.patch ---
--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
+++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
@@ -639,9 +639,8 @@
 		if (!strcmp (childinfo->properties[j].name, "label")) {
 		    label = childinfo->properties[j].value;
 		    break;
-		} else {
-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
 		}
+		/* Ignore all other properties */
 	    }
 
 	    if (label) {
@@ -683,6 +682,7 @@
 	    char *icon = NULL;
 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
 	    gboolean use_underline = FALSE;
+	    gboolean sensitive = TRUE;
 	    GtkWidget *iconw = NULL;
 	    int j;
 
@@ -708,6 +708,8 @@
 		    group_name = value;
 		} else if (!strcmp (name, "new_group")) {
 		    new_group = BOOL (value);
+		} else if (!strcmp (name, "sensitive")) {
+		    sensitive = BOOL (value);
 		} else if (!strcmp (name, "visible")) {
 		    /* ignore for now */
 		} else if (!strcmp (name, "tooltip")) {
@@ -785,6 +787,8 @@
 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
 					     TRUE);
 	    }
+	    
+	    gtk_widget_set_sensitive (child, sensitive);
 
 	    glade_xml_set_common_params (xml, child, childinfo->child);
 	} else {

libglade-secondary.patch:

--- NEW FILE libglade-secondary.patch ---
diff -up libglade-2.6.3/glade/glade-gtk.c.secondary libglade-2.6.3/glade/glade-gtk.c
--- libglade-2.6.3/glade/glade-gtk.c.secondary	2009-02-20 00:21:52.433916022 -0500
+++ libglade-2.6.3/glade/glade-gtk.c	2009-02-20 00:22:02.065954023 -0500
@@ -544,7 +544,7 @@ gtk_dialog_build_children(GladeXML *self
 
 {
     GtkDialog *dialog = GTK_DIALOG (w);
-    GList *children, *list;
+    GList *children, *list, *secondary;
 
     glade_standard_build_children (self, w, info);
 
@@ -553,10 +553,13 @@ gtk_dialog_build_children(GladeXML *self
 
     /* repack children of action_area */
     children = gtk_container_get_children(GTK_CONTAINER(dialog->action_area));
+    secondary = NULL;
     for (list = children; list; list = list->next) {
 	GtkWidget *child = GTK_WIDGET(list->data);
 
 	g_object_ref(child);
+	if (gtk_button_box_get_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child))
+		secondary = g_list_prepend (secondary, child);
 	gtk_container_remove (GTK_CONTAINER (dialog->action_area), child);
     }
     for (list = children; list; list = list->next) {
@@ -569,7 +572,12 @@ gtk_dialog_build_children(GladeXML *self
 	g_object_unref(child);
 
     }
+    for (list = secondary; list; list = list->next) {
+	GtkWidget *child = GTK_WIDGET(list->data);
+        gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child, TRUE);
+    }
     g_list_free (children);
+    g_list_free (secondary);
 }
 
 


--- NEW FILE mingw32-libglade2.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-libglade2
Version:        2.6.4
Release:        2%{?dist}
Summary:        MinGW Windows Libglade2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gnome.org
Source0:        http://download.gnome.org/sources/libglade/2.6/libglade-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=121025
Patch1:         libglade-2.0.1-nowarning.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=510736
Patch2:         libglade-secondary.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtk2
BuildRequires:  mingw32-fontconfig
BuildRequires:  mingw32-pango
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-libxml2

# Native one for msgfmt
BuildRequires:  gettext

Requires:       pkgconfig

%description
MinGW Windows Libglade2 library.

%package static
Summary:        Static MinGW Windows Libglade2 library
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description static
Static MinGW Windows Libglade2 library.

%prep
%setup -q -n libglade-%{version}
%patch1 -p1 -b .nowarning
%patch2 -p1 -b .secondary

%build
%{_mingw32_configure} --disable-gtk-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libglade-2.0-0.dll
%{_mingw32_bindir}/libglade-convert
%{_mingw32_includedir}/libglade-2.0
%{_mingw32_libdir}/libglade-2.0.dll.a
%{_mingw32_libdir}/libglade-2.0.la
%{_mingw32_libdir}/pkgconfig/libglade-2.0.pc

%dir %{_mingw32_datadir}/xml/libglade
%{_mingw32_datadir}/xml/libglade/glade-2.0.dtd

%files static
%defattr(-,root,root)
%{_mingw32_libdir}/libglade-2.0.a

%changelog
* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-2
- fix static Requires

* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-1
- replace %%define with %%global
- update to 2.6.4
- move static library to its own subpackage
- add secondary patch from native libglade2 package

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-4
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-3
- Use _smp_mflags.
- +BR mingw32-libxml2.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-2
- Requires pkgconfig.

* Fri Nov 28 2008 Daniel P. Berrange <berrange at redhat.com> - 2.6.3-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:44:52 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:34:40 -0000	1.2
@@ -0,0 +1 @@
+libglade-2.6.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:44:52 -0000	1.1
+++ sources	17 Apr 2009 19:34:40 -0000	1.2
@@ -0,0 +1 @@
+d1776b40f4e166b5e9c107f1c8fe4139  libglade-2.6.4.tar.bz2



From sgrubb at fedoraproject.org  Fri Apr 17 19:36:21 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 17 Apr 2009 19:36:21 +0000 (UTC)
Subject: rpms/prewikka/F-10 prewikka.spec,1.6,1.7
Message-ID: <20090417193621.B6F977012B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prewikka/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16720

Modified Files:
	prewikka.spec 
Log Message:
* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-2
- Change default perms on conf file



Index: prewikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/F-10/prewikka.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- prewikka.spec	22 Nov 2008 15:27:31 -0000	1.6
+++ prewikka.spec	17 Apr 2009 19:35:51 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           prewikka
 Version:        0.9.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical front-end analysis console for the Prelude Hybrid IDS Framework
 Group:          Applications/Internet
 License:        GPLv2+
@@ -46,8 +46,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0750,root,apache) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,apache) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 %{_sbindir}/%{name}-httpd
@@ -56,6 +56,9 @@
 %doc AUTHORS README NEWS HACKING.README README.fedora  
 
 %changelog
+* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-2
+- Change default perms on conf file
+
 * Thu Apr 24 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14-1
 - new upstream release
 



From sailer at fedoraproject.org  Fri Apr 17 19:40:26 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 19:40:26 +0000 (UTC)
Subject: rpms/mingw32-libxml++/F-11 libxml++-mingw32.patch, NONE,
	1.1 mingw32-libxml++.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417194026.405077012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libxml++/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17401

Modified Files:
	.cvsignore sources 
Added Files:
	libxml++-mingw32.patch mingw32-libxml++.spec 
Log Message:
copy from devel


libxml++-mingw32.patch:

--- NEW FILE libxml++-mingw32.patch ---
--- examples/dom_parser_raw/main.cc.xx	2009-03-23 00:03:58.000000000 +0100
+++ examples/dom_parser_raw/main.cc	2009-03-23 00:04:12.000000000 +0100
@@ -19,6 +19,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <fstream>
+
 #include <libxml++/libxml++.h>
 
 #include <iostream>


--- NEW FILE mingw32-libxml++.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global name1 libxml++

Name:           mingw32-%{name1}
Version:        2.26.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ wrapper for the libxml2 XML parser library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://libxmlplusplus.sourceforge.net/
Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.26/libxml++-%{version}.tar.bz2
Patch0:         libxml++-mingw32.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mingw32-libxml2 >= 2.6.1
BuildRequires:  mingw32-glibmm24 >= 2.4.0
BuildRequires:  doxygen, graphviz

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gcc-c++

Requires:       pkgconfig

%description
libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
author is Ari Johnson and it is currently maintained by Christophe de Vienne
and Murray Cumming.


%prep
%setup -q -n %{name1}-%{version}
%patch0 -p0 -b .mingw32

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root,-)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_mingw32_bindir}/libxml++-2.6-2.dll
%{_mingw32_includedir}/*
%{_mingw32_libdir}/libxml++-2.6.dll.a
%{_mingw32_libdir}/libxml++-2.6.la
%{_mingw32_libdir}/pkgconfig/*
%dir %{_mingw32_libdir}/%{name1}-2.6
%dir %{_mingw32_libdir}/%{name1}-2.6/include
%{_mingw32_libdir}/%{name1}-2.6/include/*.h


%changelog
* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.26.0-1
- update to 2.26.0
- remove docs cruft from install section
- remove dos2unix BR

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-4
- add BR's and R's
- remove docs, as they duplicate the native package

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-3
- unify main and devel subpackages

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-2
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libxml++/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:40:29 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:39:55 -0000	1.2
@@ -0,0 +1 @@
+libxml++-2.26.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libxml++/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:40:29 -0000	1.1
+++ sources	17 Apr 2009 19:39:55 -0000	1.2
@@ -0,0 +1 @@
+a52fc7e6e44bb5cc187672930b843f72  libxml++-2.26.0.tar.bz2



From sailer at fedoraproject.org  Fri Apr 17 19:41:01 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 19:41:01 +0000 (UTC)
Subject: rpms/mingw32-libglade2/F-10 libglade-2.0.1-nowarning.patch, NONE,
	1.1 libglade-secondary.patch, NONE, 1.1 mingw32-libglade2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417194101.41AC27012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglade2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17566

Modified Files:
	.cvsignore sources 
Added Files:
	libglade-2.0.1-nowarning.patch libglade-secondary.patch 
	mingw32-libglade2.spec 
Log Message:
downgrade to match native


libglade-2.0.1-nowarning.patch:

--- NEW FILE libglade-2.0.1-nowarning.patch ---
--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
+++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
@@ -639,9 +639,8 @@
 		if (!strcmp (childinfo->properties[j].name, "label")) {
 		    label = childinfo->properties[j].value;
 		    break;
-		} else {
-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
 		}
+		/* Ignore all other properties */
 	    }
 
 	    if (label) {
@@ -683,6 +682,7 @@
 	    char *icon = NULL;
 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
 	    gboolean use_underline = FALSE;
+	    gboolean sensitive = TRUE;
 	    GtkWidget *iconw = NULL;
 	    int j;
 
@@ -708,6 +708,8 @@
 		    group_name = value;
 		} else if (!strcmp (name, "new_group")) {
 		    new_group = BOOL (value);
+		} else if (!strcmp (name, "sensitive")) {
+		    sensitive = BOOL (value);
 		} else if (!strcmp (name, "visible")) {
 		    /* ignore for now */
 		} else if (!strcmp (name, "tooltip")) {
@@ -785,6 +787,8 @@
 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
 					     TRUE);
 	    }
+	    
+	    gtk_widget_set_sensitive (child, sensitive);
 
 	    glade_xml_set_common_params (xml, child, childinfo->child);
 	} else {

libglade-secondary.patch:

--- NEW FILE libglade-secondary.patch ---
diff -up libglade-2.6.3/glade/glade-gtk.c.secondary libglade-2.6.3/glade/glade-gtk.c
--- libglade-2.6.3/glade/glade-gtk.c.secondary	2009-02-20 00:21:52.433916022 -0500
+++ libglade-2.6.3/glade/glade-gtk.c	2009-02-20 00:22:02.065954023 -0500
@@ -544,7 +544,7 @@ gtk_dialog_build_children(GladeXML *self
 
 {
     GtkDialog *dialog = GTK_DIALOG (w);
-    GList *children, *list;
+    GList *children, *list, *secondary;
 
     glade_standard_build_children (self, w, info);
 
@@ -553,10 +553,13 @@ gtk_dialog_build_children(GladeXML *self
 
     /* repack children of action_area */
     children = gtk_container_get_children(GTK_CONTAINER(dialog->action_area));
+    secondary = NULL;
     for (list = children; list; list = list->next) {
 	GtkWidget *child = GTK_WIDGET(list->data);
 
 	g_object_ref(child);
+	if (gtk_button_box_get_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child))
+		secondary = g_list_prepend (secondary, child);
 	gtk_container_remove (GTK_CONTAINER (dialog->action_area), child);
     }
     for (list = children; list; list = list->next) {
@@ -569,7 +572,12 @@ gtk_dialog_build_children(GladeXML *self
 	g_object_unref(child);
 
     }
+    for (list = secondary; list; list = list->next) {
+	GtkWidget *child = GTK_WIDGET(list->data);
+        gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child, TRUE);
+    }
     g_list_free (children);
+    g_list_free (secondary);
 }
 
 


--- NEW FILE mingw32-libglade2.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-libglade2
Version:        2.6.3
Release:        1%{?dist}
Summary:        MinGW Windows Libglade2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gnome.org
Source0:        http://download.gnome.org/sources/libglade/2.6/libglade-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=121025
Patch1:         libglade-2.0.1-nowarning.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=510736
Patch2:         libglade-secondary.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtk2
BuildRequires:  mingw32-fontconfig
BuildRequires:  mingw32-pango
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-libxml2

# Native one for msgfmt
BuildRequires:  gettext

Requires:       pkgconfig

%description
MinGW Windows Libglade2 library.

%package static
Summary:        Static MinGW Windows Libglade2 library
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description static
Static MinGW Windows Libglade2 library.

%prep
%setup -q -n libglade-%{version}
%patch1 -p1 -b .nowarning
%patch2 -p1 -b .secondary

%build
%{_mingw32_configure} --disable-gtk-doc
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libglade-2.0-0.dll
%{_mingw32_bindir}/libglade-convert
%{_mingw32_includedir}/libglade-2.0
%{_mingw32_libdir}/libglade-2.0.dll.a
%{_mingw32_libdir}/libglade-2.0.la
%{_mingw32_libdir}/pkgconfig/libglade-2.0.pc

%dir %{_mingw32_datadir}/xml/libglade
%{_mingw32_datadir}/xml/libglade/glade-2.0.dtd

%files static
%defattr(-,root,root)
%{_mingw32_libdir}/libglade-2.0.a

%changelog
* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.3-1
- downgrade to 2.6.3 to match native

* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-2
- fix static Requires

* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-1
- replace %%define with %%global
- update to 2.6.4
- move static library to its own subpackage
- add secondary patch from native libglade2 package

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-4
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-3
- Use _smp_mflags.
- +BR mingw32-libxml2.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-2
- Requires pkgconfig.

* Fri Nov 28 2008 Daniel P. Berrange <berrange at redhat.com> - 2.6.3-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:44:52 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:40:30 -0000	1.2
@@ -0,0 +1,2 @@
+libglade-2.6.4.tar.bz2
+libglade-2.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:44:52 -0000	1.1
+++ sources	17 Apr 2009 19:40:30 -0000	1.2
@@ -0,0 +1 @@
+1c359860b1a0f369f0b6e3f96fd985c2  libglade-2.6.3.tar.bz2



From salimma at fedoraproject.org  Fri Apr 17 19:44:36 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 17 Apr 2009 19:44:36 +0000 (UTC)
Subject: rpms/python-sphinx/devel .cvsignore, 1.6, 1.7 python-sphinx.spec,
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090417194436.6769D7012B@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18885/devel

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Fri Apr 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
- Update to 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2009 18:35:34 -0000	1.6
+++ .cvsignore	17 Apr 2009 19:44:05 -0000	1.7
@@ -1 +1 @@
-Sphinx-0.5.1.tar.gz
+Sphinx-0.6.1.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/python-sphinx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-sphinx.spec	26 Feb 2009 23:33:07 -0000	1.10
+++ python-sphinx.spec	17 Apr 2009 19:44:05 -0000	1.11
@@ -4,8 +4,8 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Python documentation generator
 
 Group:          Development/Tools
@@ -15,8 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-docutils python-jinja python-setuptools
-Requires:       python-docutils python-jinja python-pygments
+BuildRequires:  python-devel python-docutils python-jinja2 python-setuptools
+Requires:       python-docutils python-jinja2 python-pygments
 
 
 %description
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2009 18:35:34 -0000	1.6
+++ sources	17 Apr 2009 19:44:06 -0000	1.7
@@ -1 +1 @@
-11456e362d75c1a4c5a5847921d3f4c7  Sphinx-0.5.1.tar.gz
+fa1a32c406232a96a776de7dfae15032  Sphinx-0.6.1.tar.gz



From mhlavink at fedoraproject.org  Fri Apr 17 19:47:31 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 17 Apr 2009 19:47:31 +0000 (UTC)
Subject: rpms/nut/F-11 nut.spec,1.71,1.72
Message-ID: <20090417194731.B30FA7012B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19421

Modified Files:
	nut.spec 
Log Message:
change group even for existing nut user (#495999)



Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/F-11/nut.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nut.spec	14 Apr 2009 08:59:12 -0000	1.71
+++ nut.spec	17 Apr 2009 19:47:01 -0000	1.72
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -183,16 +183,19 @@
 done
 
 %pre
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid}  \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
+/usr/sbin/usermod -G dialout %{name}
 
 %pre client
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
+/usr/sbin/usermod -G dialout %{name}
 
 %pre cgi
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
+/usr/sbin/usermod -G dialout %{name}
 
 %post client
 /sbin/chkconfig --add ups
@@ -337,6 +340,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Fri Apr 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.4.1-4
+- change group even for existing nut user (#495999)
+
 * Tue Apr 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.4.1-3
 - udev changed group from uucp to dialout, follow the change (#494020)
 



From mhlavink at fedoraproject.org  Fri Apr 17 19:50:12 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 17 Apr 2009 19:50:12 +0000 (UTC)
Subject: rpms/nut/devel nut.spec,1.71,1.72
Message-ID: <20090417195012.861E37012B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19970

Modified Files:
	nut.spec 
Log Message:
change group even for existing nut user (#495999)



Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/nut.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nut.spec	14 Apr 2009 08:59:12 -0000	1.71
+++ nut.spec	17 Apr 2009 19:49:42 -0000	1.72
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -183,16 +183,19 @@
 done
 
 %pre
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid}  \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
+/usr/sbin/usermod -G dialout %{name}
 
 %pre client
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
+/usr/sbin/usermod -G dialout %{name}
 
 %pre cgi
-/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} -G dialout \
+/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \
         -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || :
+/usr/sbin/usermod -G dialout %{name}
 
 %post client
 /sbin/chkconfig --add ups
@@ -337,6 +340,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Fri Apr 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.4.1-4
+- change group even for existing nut user (#495999)
+
 * Tue Apr 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.4.1-3
 - udev changed group from uucp to dialout, follow the change (#494020)
 



From cassmodiah at fedoraproject.org  Fri Apr 17 19:50:59 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 17 Apr 2009 19:50:59 +0000 (UTC)
Subject: rpms/griffith/F-11 griffith.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417195059.490E47012B@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/griffith/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20175/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	griffith.spec import.log 
Log Message:



--- NEW FILE griffith.spec ---
%global beta beta2

Name:           griffith
Version:        0.10
Release:        0.1.%{beta}%{?dist}
Summary:        Media collection manager

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.griffith.cc
Source0:        ftp://ftp.berlios.de/pub/%{name}/experimental/%{name}_%{version}~%{beta}.orig.tar.gz
# Link http://prdownload.berlios.de/%{name}/%{name}-%{version}-%{beta}.tar.gz is a broken archive
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       pygtk2
Requires:       python-sqlalchemy >= 0.5
Requires:       python-lxml
Requires:       python-sqlite2
Requires:       python-imaging 
Requires:       python-reportlab
Requires:       gnome-python2-gtkspell


%description
Griffith is a media collection manager application. Adding items to the 
collection is as quick and easy as typing the film title and selecting a 
supported source. Griffith will then try to fetch all the related information 
from the Web.

This Version comes with SQLite support. You need to install
 * the package "MySQL-python" for MySQL-support
 * the package "python-psycopg2" for PostgreSQL-support


%prep
%setup -q -n %{name}-%{version}-%{beta}

find -iname "*.mo" -exec rm -f {} \;

iconv -f iso-8859-1 -t utf-8 docs/pl/%{name}.1 |sed 's|\r||g' > docs/pl/%{name}.1.utf8
touch -c -r docs/pl/%{name}.1 docs/pl/%{name}.1.utf8
mv docs/pl/%{name}.1.utf8 docs/pl/%{name}.1


%build
make -C po dist %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}

rm -f %{buildroot}%{_bindir}/%{name}

cat > %{buildroot}/%{_bindir}/%{name} << EOF
#!/bin/bash
%{_datadir}/%{name}/lib/%{name}
EOF

chmod +x %{buildroot}/%{_bindir}/%{name}

desktop-file-install \
       --dir=%{buildroot}/%{_datadir}/applications/ \
%{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%{_datadir}/pixmaps/%{name}*
%{_mandir}/man1/%{name}*
%{_mandir}/*/man1/%{name}*
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}


%changelog
* Mon Apr 13 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10-0.1.beta2
- Update to 0.10-beta2 to avoid crappy issues with sqlalchemy
- Remove binary mo-files and build it from source  

* Mon Mar 30 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.9-1
- Initial package release


--- NEW FILE import.log ---
griffith-0_10-0_1_beta2_fc10:F-11:griffith-0.10-0.1.beta2.fc10.src.rpm:1239997605


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/griffith/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:47:30 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:50:28 -0000	1.2
@@ -0,0 +1 @@
+griffith_0.10~beta2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/griffith/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:47:30 -0000	1.1
+++ sources	17 Apr 2009 19:50:28 -0000	1.2
@@ -0,0 +1 @@
+9be757516cef84b43cfbed5551256856  griffith_0.10~beta2.orig.tar.gz



From cassmodiah at fedoraproject.org  Fri Apr 17 19:52:14 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 17 Apr 2009 19:52:14 +0000 (UTC)
Subject: rpms/nssbackup/devel import.log, NONE,
	1.1 nssbackup-0.2-0~rc7-desktopfiles.patch, NONE,
	1.1 nssbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417195214.F2FF57012B@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nssbackup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nssbackup-0.2-0~rc7-desktopfiles.patch 
	nssbackup.spec 
Log Message:



--- NEW FILE import.log ---
nssbackup-0_2-0_2_rc7_fc10:HEAD:nssbackup-0.2-0.2.rc7.fc10.src.rpm:1239997807

nssbackup-0.2-0~rc7-desktopfiles.patch:

--- NEW FILE nssbackup-0.2-0~rc7-desktopfiles.patch ---
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop	2009-03-24 23:28:18.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-config-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop	2009-03-08 23:08:19.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Einstellungen
 GenericName[es]=Herramienta de copia de seguridad
 #
-Exec=gksu nssbackup-config-gui
+Exec=nssbackup-config-gui-su
 #
 Terminal=false
-Categories=System;Settings;
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
 #
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop	2009-03-08 23:08:44.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-restore-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop	2009-03-08 23:08:37.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Wiederherstellung
 GenericName[es]=Herramienta de restauraci??n
 #
-Exec=gksu nssbackup-restore-gui
+Exec=nssbackup-restore-gui-su
 #
 Terminal=false
-Categories=System;Settings
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
 #


--- NEW FILE nssbackup.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcversion 0.2-0~rc7
%define pathversion 0.2rc7

Name:           nssbackup
Version:        0.2
Release:        0.2.rc7%{?dist}
Summary:        (Not so) Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv3+
URL:            http://launchpad.net/nssbackup
Source0:        http://launchpad.net/%{name}/%{version}/%{pathversion}/+download/%{name}_%{srcversion}.orig.tar.gz
Patch0:         %{name}-0.2-0~rc7-desktopfiles.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gnome-python2
Requires:       notify-python
Requires:       fuse-python
Requires:       fuse-sshfs
Requires:       pexpect
Requires:       curlftpfs


%description
NSsbackup, shortform of Not So Simple Backup suite, 
is a backup solution for common desktop use.

It is a fork of the sbackup project, the Simple Backup suite. 
NSsbackup is basically using the same technology that Unix 
administrators have been used for decades but it adds some some 
intelligence for interaction with users within a graphical interface. 
This means dumps of files were created using the good old TAR 
but the usage is much more convenient than from a command line.


%prep
%setup -q -n %{name}-%{version}-0.orig
%patch0 -p1


%build
make %{?_smp_mflags} \
     PREFIX="%{_prefix}"

%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     SETUP.PY_OPTS="--root=%{buildroot}" \
     DESTDIR="%{buildroot}/%{_prefix}" \
     PREFIX="%{_prefix}" \
     PYDIR="%{buildroot}/%{python_sitelib}"
 
chmod +x %{buildroot}/%{python_sitelib}/%{name}/ui/GladeGnomeApp.py

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore.desktop

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-config-gui-su

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-restore-gui-su

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-config-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-config-gui-su
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-restore-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-restore-gui-su
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-config-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-restore-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/
touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name}

%find_lang %{name}


%post
if [ $1 -eq 2 ]; then
   %{_sbindir}/%{name}config || :
fi


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING README 
%{_bindir}/%{name}*
%{_sbindir}/%{name}*
%{python_sitelib}/%{name}/
%{python_sitelib}/%{name}-*-py*.egg-info/
%{_datadir}/pixmaps/%{name}*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%config(noreplace) %{_sysconfdir}/pam.d/%{name}*
%config %{_sysconfdir}/security/console.apps/%{name}*
%ghost %{_sysconfdir}/cron.*/%{name}


%changelog
* Tue Apr 14 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.2.rc7
- Fix license tag
- Add missed Requires to the package

* Tue Mar 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc7
- New upstream release
- Customize specfile

* Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc6
- Initial Package Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:36:43 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:51:44 -0000	1.2
@@ -0,0 +1 @@
+nssbackup_0.2-0~rc7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:36:43 -0000	1.1
+++ sources	17 Apr 2009 19:51:44 -0000	1.2
@@ -0,0 +1 @@
+c7fac4bda21350022eda110c56739763  nssbackup_0.2-0~rc7.orig.tar.gz



From rdieter at fedoraproject.org  Fri Apr 17 19:53:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 19:53:23 +0000 (UTC)
Subject: rpms/exiv2/devel exiv2-0.18.1-visibility.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 exiv2.spec, 1.24, 1.25 sources, 1.11,
	1.12 exiv2-0.16-gcc43.patch, 1.2, NONE
Message-ID: <20090417195323.581DE7012B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21242/devel

Modified Files:
	.cvsignore exiv2.spec sources 
Added Files:
	exiv2-0.18.1-visibility.patch 
Removed Files:
	exiv2-0.16-gcc43.patch 
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.1-1
- exiv2-0.18.1
- drop -fvisibility-inlines-hidden (#496050)


exiv2-0.18.1-visibility.patch:

--- NEW FILE exiv2-0.18.1-visibility.patch ---
diff -up exiv2-0.18.1/config/configure.ac.visibility exiv2-0.18.1/config/configure.ac
--- exiv2-0.18.1/config/configure.ac.visibility	2009-04-03 10:52:50.000000000 -0500
+++ exiv2-0.18.1/config/configure.ac	2009-04-17 14:36:01.000000000 -0500
@@ -111,9 +111,9 @@ AC_ARG_ENABLE(visibility,
     GXX_VISIBILITY=$enableval, GXX_VISIBILITY=yes)
 AC_MSG_RESULT($GXX_VISIBILITY)
 if test "$GXX_VISIBILITY" = "yes"; then
-    AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
+    AX_CXX_CHECK_FLAG(-fvisibility=hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
     if test "$GXX_VISIBILITY" = "yes"; then
-        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
         AC_DEFINE(HAVE_GXXCLASSVISIBILITY,1)
     fi
     if test "$enable_shared" = "yes"; then
diff -up exiv2-0.18.1/configure.visibility exiv2-0.18.1/configure
--- exiv2-0.18.1/configure.visibility	2009-04-05 10:50:29.000000000 -0500
+++ exiv2-0.18.1/configure	2009-04-17 14:48:51.000000000 -0500
@@ -23905,7 +23905,7 @@ fi
 
 
     if test "$GXX_VISIBILITY" = "yes"; then
-        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_GXXCLASSVISIBILITY 1
 _ACEOF


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Dec 2008 18:30:50 -0000	1.11
+++ .cvsignore	17 Apr 2009 19:53:19 -0000	1.12
@@ -1 +1 @@
-exiv2-0.18.tar.gz
+exiv2-0.18.1.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- exiv2.spec	24 Feb 2009 15:52:44 -0000	1.24
+++ exiv2.spec	17 Apr 2009 19:53:19 -0000	1.25
@@ -6,8 +6,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.18
-Release: 2%{?dist}
+Version: 0.18.1
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -24,7 +24,7 @@
 #BuildRequires: doxygen graphviz libxslt
 
 Patch1: exiv2-0.18-deps.patch
-Patch2: exiv2-0.16-gcc43.patch
+Patch2: exiv2-0.18.1-visibility.patch
 
 %if 0%{?libs}
 Requires: %{name}-libs = %{version}-%{release}
@@ -69,7 +69,7 @@
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch1 -p1 -b .deps
-#patch2 -p1 -b .gcc43
+%patch2 -p1 -b .visibility
 
 mkdir doc/html
 
@@ -77,7 +77,7 @@
 %build
 %configure \
   --disable-rpath \
-  --disable-static
+  --disable-static 
 
 make %{?_smp_mflags} 
 
@@ -130,6 +130,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.1-1
+- exiv2-0.18.1
+- drop -fvisibility-inlines-hidden (#496050)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Dec 2008 18:30:50 -0000	1.11
+++ sources	17 Apr 2009 19:53:20 -0000	1.12
@@ -1 +1 @@
-03044792525ae0a1b109df5a53b858fb  exiv2-0.18.tar.gz
+744f06b3a2beeb2341f30b157cbd8e7e  exiv2-0.18.1.tar.gz


--- exiv2-0.16-gcc43.patch DELETED ---



From rdieter at fedoraproject.org  Fri Apr 17 19:53:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 17 Apr 2009 19:53:23 +0000 (UTC)
Subject: rpms/exiv2/F-11 exiv2-0.18.1-visibility.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 exiv2.spec, 1.24, 1.25 sources, 1.11,
	1.12 exiv2-0.16-gcc43.patch, 1.2, NONE
Message-ID: <20090417195323.6EB3A7013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21242/F-11

Modified Files:
	.cvsignore exiv2.spec sources 
Added Files:
	exiv2-0.18.1-visibility.patch 
Removed Files:
	exiv2-0.16-gcc43.patch 
Log Message:
* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.1-1
- exiv2-0.18.1
- drop -fvisibility-inlines-hidden (#496050)


exiv2-0.18.1-visibility.patch:

--- NEW FILE exiv2-0.18.1-visibility.patch ---
diff -up exiv2-0.18.1/config/configure.ac.visibility exiv2-0.18.1/config/configure.ac
--- exiv2-0.18.1/config/configure.ac.visibility	2009-04-03 10:52:50.000000000 -0500
+++ exiv2-0.18.1/config/configure.ac	2009-04-17 14:36:01.000000000 -0500
@@ -111,9 +111,9 @@ AC_ARG_ENABLE(visibility,
     GXX_VISIBILITY=$enableval, GXX_VISIBILITY=yes)
 AC_MSG_RESULT($GXX_VISIBILITY)
 if test "$GXX_VISIBILITY" = "yes"; then
-    AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
+    AX_CXX_CHECK_FLAG(-fvisibility=hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
     if test "$GXX_VISIBILITY" = "yes"; then
-        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
         AC_DEFINE(HAVE_GXXCLASSVISIBILITY,1)
     fi
     if test "$enable_shared" = "yes"; then
diff -up exiv2-0.18.1/configure.visibility exiv2-0.18.1/configure
--- exiv2-0.18.1/configure.visibility	2009-04-05 10:50:29.000000000 -0500
+++ exiv2-0.18.1/configure	2009-04-17 14:48:51.000000000 -0500
@@ -23905,7 +23905,7 @@ fi
 
 
     if test "$GXX_VISIBILITY" = "yes"; then
-        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_GXXCLASSVISIBILITY 1
 _ACEOF


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Dec 2008 18:30:50 -0000	1.11
+++ .cvsignore	17 Apr 2009 19:53:18 -0000	1.12
@@ -1 +1 @@
-exiv2-0.18.tar.gz
+exiv2-0.18.1.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/F-11/exiv2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- exiv2.spec	24 Feb 2009 15:52:44 -0000	1.24
+++ exiv2.spec	17 Apr 2009 19:53:18 -0000	1.25
@@ -6,8 +6,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.18
-Release: 2%{?dist}
+Version: 0.18.1
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -24,7 +24,7 @@
 #BuildRequires: doxygen graphviz libxslt
 
 Patch1: exiv2-0.18-deps.patch
-Patch2: exiv2-0.16-gcc43.patch
+Patch2: exiv2-0.18.1-visibility.patch
 
 %if 0%{?libs}
 Requires: %{name}-libs = %{version}-%{release}
@@ -69,7 +69,7 @@
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch1 -p1 -b .deps
-#patch2 -p1 -b .gcc43
+%patch2 -p1 -b .visibility
 
 mkdir doc/html
 
@@ -77,7 +77,7 @@
 %build
 %configure \
   --disable-rpath \
-  --disable-static
+  --disable-static 
 
 make %{?_smp_mflags} 
 
@@ -130,6 +130,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.1-1
+- exiv2-0.18.1
+- drop -fvisibility-inlines-hidden (#496050)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Dec 2008 18:30:50 -0000	1.11
+++ sources	17 Apr 2009 19:53:18 -0000	1.12
@@ -1 +1 @@
-03044792525ae0a1b109df5a53b858fb  exiv2-0.18.tar.gz
+744f06b3a2beeb2341f30b157cbd8e7e  exiv2-0.18.1.tar.gz


--- exiv2-0.16-gcc43.patch DELETED ---



From hardaker at fedoraproject.org  Fri Apr 17 19:54:26 2009
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Fri, 17 Apr 2009 19:54:26 +0000 (UTC)
Subject: rpms/dnssec-tools/F-9 dnssec-tools.spec,1.19,1.20
Message-ID: <20090417195426.3A57E7012B@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/dnssec-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21627

Modified Files:
	dnssec-tools.spec 
Log Message:
update to 1.5


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/F-9/dnssec-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dnssec-tools.spec	1 Dec 2008 14:57:41 -0000	1.19
+++ dnssec-tools.spec	17 Apr 2009 19:53:55 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
-Version: 1.4.1
-Release: 3%{?dist}
+Version: 1.5
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -28,6 +28,7 @@
 %package perlmods
 Group: System Environment/Libraries
 Summary: Perl modules supporting DNSSEC (needed by the dnssec-tools)
+Requires: perl(Net::DNS), perl(Net::DNS::SEC)
 
 %description perlmods
 
@@ -97,9 +98,9 @@
 %defattr(-,root,root,-)
 %doc README INSTALL COPYING
 
-/etc/dnssec-tools
 %config(noreplace) /etc/dnssec-tools/dnssec-tools.conf
 %config(noreplace) /etc/dnssec-tools/dnsval.conf
+/etc/dnssec-tools
 
 %{_bindir}/dnspktflow
 %{_bindir}/donuts
@@ -108,15 +109,16 @@
 %{_bindir}/expchk
 %{_bindir}/genkrf
 %{_bindir}/getdnskeys
+%{_bindir}/getds
 %{_bindir}/lskrf
 %{_bindir}/maketestzone
 %{_bindir}/mapper
 %{_bindir}/zonesigner
 # this doesn't use %{_datadir} because patch6 above uses this exact path
 /usr/share/dnssec-tools
-/usr/share/dnssec-tools/donuts
-/usr/share/dnssec-tools/donuts/rules
-/usr/share/dnssec-tools/donuts/rules/*
+#/usr/share/dnssec-tools/donuts
+#/usr/share/dnssec-tools/donuts/rules
+#/usr/share/dnssec-tools/donuts/rules/*
 
 %{_bindir}/dtck
 %{_bindir}/dtconfchk
@@ -139,7 +141,7 @@
 %{_bindir}/libval_check_conf
 %{_bindir}/validate
 # configure above 
-%{_datadir}/dnssec-tools/validator-testcases
+#%{_datadir}/dnssec-tools/validator-testcases
 %{_bindir}/getaddr
 %{_bindir}/gethost
 %{_bindir}/getname
@@ -154,6 +156,8 @@
 %{_bindir}/signset-editor
 %{_bindir}/rollrec-editor
 
+%{_bindir}/lsdnssec
+
 %{_mandir}/man1/dnssec-tools.1.gz
 %{_mandir}/man1/dnspktflow.1.gz
 %{_mandir}/man1/donuts.1.gz
@@ -162,6 +166,7 @@
 %{_mandir}/man1/expchk.1.gz
 %{_mandir}/man1/genkrf.1.gz
 %{_mandir}/man1/getdnskeys.1.gz
+%{_mandir}/man1/getds.1.gz
 %{_mandir}/man1/lskrf.1.gz
 %{_mandir}/man1/keyarch.1.gz
 %{_mandir}/man1/maketestzone.1.gz
@@ -187,6 +192,7 @@
 %{_mandir}/man1/rollerd.1.gz
 %{_mandir}/man1/rollinit.1.gz
 %{_mandir}/man1/rollset.1.gz
+%{_mandir}/man1/lsdnssec.1.gz
 %{_mandir}/man1/cleanarch.1.gz
 %{_mandir}/man1/blinkenlights.1.gz
 %{_mandir}/man1/cleankrf.1.gz
@@ -211,7 +217,8 @@
 # but this one is entirely ours:
 %{perl_vendorarch}/Net/DNS/SEC/Tools
 %{perl_vendorarch}/Net/addrinfo*
-%{perl_vendorarch}/Net/DNS/SEC/*
+%{perl_vendorarch}/Net/DNS/SEC/*.pm
+%{perl_vendorarch}/Net/DNS/SEC/*.pl
 %{perl_vendorarch}/auto/Net/DNS/SEC
 %{perl_vendorarch}/auto/Net/DNS/SEC/Validator
 %{perl_vendorarch}/auto/Net/addrinfo/
@@ -282,6 +289,22 @@
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Fri Mar  6 2009 Wes Hardaker <wjhns174 at hardakers.net> - 1.5-1
+- Update to 1.5
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb  4 2009 Wes Hardaker <wjhns174 at hardakers.net> - 1.4.1-6
+- make the perlmods module directly require the needed perl mods
+  mainly for directory ownership.
+
+* Mon Jan 26 2009 Wes Hardaker <wjhns174 at hardakers.net> - 1.4.1-5
+- Fixed arpa header compile conflict
+
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-4
+- rebuild with new openssl
+
 * Mon Dec  1 2008 Wes Hardaker <wjhns174 at hardakers.net> - 1.4.1-3
 - Added package directories we own, left out ones we don't.
 



From cassmodiah at fedoraproject.org  Fri Apr 17 19:54:31 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 17 Apr 2009 19:54:31 +0000 (UTC)
Subject: rpms/nssbackup/F-11 import.log, NONE,
	1.1 nssbackup-0.2-0~rc7-desktopfiles.patch, NONE,
	1.1 nssbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417195431.498A07012B@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nssbackup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21500/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nssbackup-0.2-0~rc7-desktopfiles.patch 
	nssbackup.spec 
Log Message:



--- NEW FILE import.log ---
nssbackup-0_2-0_2_rc7_fc10:F-11:nssbackup-0.2-0.2.rc7.fc10.src.rpm:1239997981

nssbackup-0.2-0~rc7-desktopfiles.patch:

--- NEW FILE nssbackup-0.2-0~rc7-desktopfiles.patch ---
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop	2009-03-24 23:28:18.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-config-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop	2009-03-08 23:08:19.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Einstellungen
 GenericName[es]=Herramienta de copia de seguridad
 #
-Exec=gksu nssbackup-config-gui
+Exec=nssbackup-config-gui-su
 #
 Terminal=false
-Categories=System;Settings;
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
 #
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop	2009-03-08 23:08:44.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-restore-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop	2009-03-08 23:08:37.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Wiederherstellung
 GenericName[es]=Herramienta de restauraci??n
 #
-Exec=gksu nssbackup-restore-gui
+Exec=nssbackup-restore-gui-su
 #
 Terminal=false
-Categories=System;Settings
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
 #


--- NEW FILE nssbackup.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcversion 0.2-0~rc7
%define pathversion 0.2rc7

Name:           nssbackup
Version:        0.2
Release:        0.2.rc7%{?dist}
Summary:        (Not so) Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv3+
URL:            http://launchpad.net/nssbackup
Source0:        http://launchpad.net/%{name}/%{version}/%{pathversion}/+download/%{name}_%{srcversion}.orig.tar.gz
Patch0:         %{name}-0.2-0~rc7-desktopfiles.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gnome-python2
Requires:       notify-python
Requires:       fuse-python
Requires:       fuse-sshfs
Requires:       pexpect
Requires:       curlftpfs


%description
NSsbackup, shortform of Not So Simple Backup suite, 
is a backup solution for common desktop use.

It is a fork of the sbackup project, the Simple Backup suite. 
NSsbackup is basically using the same technology that Unix 
administrators have been used for decades but it adds some some 
intelligence for interaction with users within a graphical interface. 
This means dumps of files were created using the good old TAR 
but the usage is much more convenient than from a command line.


%prep
%setup -q -n %{name}-%{version}-0.orig
%patch0 -p1


%build
make %{?_smp_mflags} \
     PREFIX="%{_prefix}"

%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     SETUP.PY_OPTS="--root=%{buildroot}" \
     DESTDIR="%{buildroot}/%{_prefix}" \
     PREFIX="%{_prefix}" \
     PYDIR="%{buildroot}/%{python_sitelib}"
 
chmod +x %{buildroot}/%{python_sitelib}/%{name}/ui/GladeGnomeApp.py

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore.desktop

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-config-gui-su

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-restore-gui-su

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-config-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-config-gui-su
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-restore-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-restore-gui-su
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-config-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-restore-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/
touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name}

%find_lang %{name}


%post
if [ $1 -eq 2 ]; then
   %{_sbindir}/%{name}config || :
fi


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING README 
%{_bindir}/%{name}*
%{_sbindir}/%{name}*
%{python_sitelib}/%{name}/
%{python_sitelib}/%{name}-*-py*.egg-info/
%{_datadir}/pixmaps/%{name}*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%config(noreplace) %{_sysconfdir}/pam.d/%{name}*
%config %{_sysconfdir}/security/console.apps/%{name}*
%ghost %{_sysconfdir}/cron.*/%{name}


%changelog
* Tue Apr 14 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.2.rc7
- Fix license tag
- Add missed Requires to the package

* Tue Mar 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc7
- New upstream release
- Customize specfile

* Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc6
- Initial Package Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:36:43 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:54:01 -0000	1.2
@@ -0,0 +1 @@
+nssbackup_0.2-0~rc7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:36:43 -0000	1.1
+++ sources	17 Apr 2009 19:54:01 -0000	1.2
@@ -0,0 +1 @@
+c7fac4bda21350022eda110c56739763  nssbackup_0.2-0~rc7.orig.tar.gz



From hardaker at fedoraproject.org  Fri Apr 17 19:55:41 2009
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Fri, 17 Apr 2009 19:55:41 +0000 (UTC)
Subject: rpms/dnssec-tools/F-9 .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <20090417195541.16A6D7012B@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/dnssec-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21939

Modified Files:
	.cvsignore sources 
Log Message:
1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jul 2008 04:20:11 -0000	1.7
+++ .cvsignore	17 Apr 2009 19:55:10 -0000	1.8
@@ -1 +1 @@
-dnssec-tools-1.4.1.tar.gz
+dnssec-tools-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jul 2008 04:20:11 -0000	1.8
+++ sources	17 Apr 2009 19:55:10 -0000	1.9
@@ -1 +1 @@
-a47cf335e43139476695191fcb005aad  dnssec-tools-1.4.1.tar.gz
+1063f800c49806bdac2551fcdd76505a  dnssec-tools-1.5.tar.gz



From cassmodiah at fedoraproject.org  Fri Apr 17 19:56:19 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 17 Apr 2009 19:56:19 +0000 (UTC)
Subject: rpms/nssbackup/F-10 import.log, NONE,
	1.1 nssbackup-0.2-0~rc7-desktopfiles.patch, NONE,
	1.1 nssbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417195619.499BF7012B@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nssbackup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22101/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nssbackup-0.2-0~rc7-desktopfiles.patch 
	nssbackup.spec 
Log Message:



--- NEW FILE import.log ---
nssbackup-0_2-0_2_rc7_fc10:F-10:nssbackup-0.2-0.2.rc7.fc10.src.rpm:1239998123

nssbackup-0.2-0~rc7-desktopfiles.patch:

--- NEW FILE nssbackup-0.2-0~rc7-desktopfiles.patch ---
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop	2009-03-24 23:28:18.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-config-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop	2009-03-08 23:08:19.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Einstellungen
 GenericName[es]=Herramienta de copia de seguridad
 #
-Exec=gksu nssbackup-config-gui
+Exec=nssbackup-config-gui-su
 #
 Terminal=false
-Categories=System;Settings;
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
 #
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop	2009-03-08 23:08:44.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-restore-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop	2009-03-08 23:08:37.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Wiederherstellung
 GenericName[es]=Herramienta de restauraci??n
 #
-Exec=gksu nssbackup-restore-gui
+Exec=nssbackup-restore-gui-su
 #
 Terminal=false
-Categories=System;Settings
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
 #


--- NEW FILE nssbackup.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcversion 0.2-0~rc7
%define pathversion 0.2rc7

Name:           nssbackup
Version:        0.2
Release:        0.2.rc7%{?dist}
Summary:        (Not so) Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv3+
URL:            http://launchpad.net/nssbackup
Source0:        http://launchpad.net/%{name}/%{version}/%{pathversion}/+download/%{name}_%{srcversion}.orig.tar.gz
Patch0:         %{name}-0.2-0~rc7-desktopfiles.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gnome-python2
Requires:       notify-python
Requires:       fuse-python
Requires:       fuse-sshfs
Requires:       pexpect
Requires:       curlftpfs


%description
NSsbackup, shortform of Not So Simple Backup suite, 
is a backup solution for common desktop use.

It is a fork of the sbackup project, the Simple Backup suite. 
NSsbackup is basically using the same technology that Unix 
administrators have been used for decades but it adds some some 
intelligence for interaction with users within a graphical interface. 
This means dumps of files were created using the good old TAR 
but the usage is much more convenient than from a command line.


%prep
%setup -q -n %{name}-%{version}-0.orig
%patch0 -p1


%build
make %{?_smp_mflags} \
     PREFIX="%{_prefix}"

%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     SETUP.PY_OPTS="--root=%{buildroot}" \
     DESTDIR="%{buildroot}/%{_prefix}" \
     PREFIX="%{_prefix}" \
     PYDIR="%{buildroot}/%{python_sitelib}"
 
chmod +x %{buildroot}/%{python_sitelib}/%{name}/ui/GladeGnomeApp.py

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore.desktop

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-config-gui-su

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-restore-gui-su

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-config-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-config-gui-su
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-restore-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-restore-gui-su
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-config-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-restore-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/
touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name}

%find_lang %{name}


%post
if [ $1 -eq 2 ]; then
   %{_sbindir}/%{name}config || :
fi


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING README 
%{_bindir}/%{name}*
%{_sbindir}/%{name}*
%{python_sitelib}/%{name}/
%{python_sitelib}/%{name}-*-py*.egg-info/
%{_datadir}/pixmaps/%{name}*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%config(noreplace) %{_sysconfdir}/pam.d/%{name}*
%config %{_sysconfdir}/security/console.apps/%{name}*
%ghost %{_sysconfdir}/cron.*/%{name}


%changelog
* Tue Apr 14 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.2.rc7
- Fix license tag
- Add missed Requires to the package

* Tue Mar 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc7
- New upstream release
- Customize specfile

* Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc6
- Initial Package Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:36:43 -0000	1.1
+++ .cvsignore	17 Apr 2009 19:55:48 -0000	1.2
@@ -0,0 +1 @@
+nssbackup_0.2-0~rc7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:36:43 -0000	1.1
+++ sources	17 Apr 2009 19:55:48 -0000	1.2
@@ -0,0 +1 @@
+c7fac4bda21350022eda110c56739763  nssbackup_0.2-0~rc7.orig.tar.gz



From sgrubb at fedoraproject.org  Fri Apr 17 19:59:57 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 17 Apr 2009 19:59:57 +0000 (UTC)
Subject: rpms/prewikka/F-9 prewikka.spec,1.5,1.6
Message-ID: <20090417195957.944217012B@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prewikka/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22964

Modified Files:
	prewikka.spec 
Log Message:
* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-2
- Change default perms on conf file



Index: prewikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prewikka/F-9/prewikka.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- prewikka.spec	24 Apr 2008 17:19:48 -0000	1.5
+++ prewikka.spec	17 Apr 2009 19:59:27 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           prewikka
 Version:        0.9.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical front-end analysis console for the Prelude Hybrid IDS Framework
 Group:          Applications/Internet
 License:        GPLv2+
@@ -46,8 +46,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0750,root,apache) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,apache) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 %{_sbindir}/%{name}-httpd
@@ -56,6 +56,9 @@
 %doc AUTHORS README NEWS HACKING.README README.fedora  
 
 %changelog
+* Fri Apr 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-2
+- Change default perms on conf file
+
 * Thu Apr 24 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14-1
 - new upstream release
 



From cassmodiah at fedoraproject.org  Fri Apr 17 20:02:11 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 17 Apr 2009 20:02:11 +0000 (UTC)
Subject: rpms/nssbackup/EL-5 import.log, NONE,
	1.1 nssbackup-0.2-0~rc7-desktopfiles.patch, NONE,
	1.1 nssbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417200211.E9F9C7012B@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nssbackup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23016/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nssbackup-0.2-0~rc7-desktopfiles.patch 
	nssbackup.spec 
Log Message:



--- NEW FILE import.log ---
nssbackup-0_2-0_2_rc7_fc10:EL-5:nssbackup-0.2-0.2.rc7.fc10.src.rpm:1239998323

nssbackup-0.2-0~rc7-desktopfiles.patch:

--- NEW FILE nssbackup-0.2-0~rc7-desktopfiles.patch ---
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config.desktop	2009-03-24 23:28:18.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-config-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-config-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-config-su.desktop	2009-03-08 23:08:19.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Einstellungen
 GenericName[es]=Herramienta de copia de seguridad
 #
-Exec=gksu nssbackup-config-gui
+Exec=nssbackup-config-gui-su
 #
 Terminal=false
-Categories=System;Settings;
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-conf
 #
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore.desktop	2009-03-08 23:08:44.000000000 +0100
@@ -19,6 +19,6 @@
 Exec=nssbackup-restore-gui
 #
 Terminal=false
-Categories=Utility;
+Categories=Utility;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
diff -Naur nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop
--- nssbackup-0.2-0~rc7.orig/datas/nssbackup-restore-su.desktop	2009-02-20 03:03:14.000000000 +0100
+++ nssbackup-0.2-0~rc7/datas/nssbackup-restore-su.desktop	2009-03-08 23:08:37.000000000 +0100
@@ -16,10 +16,10 @@
 GenericName[de]=Backup Wiederherstellung
 GenericName[es]=Herramienta de restauraci??n
 #
-Exec=gksu nssbackup-restore-gui
+Exec=nssbackup-restore-gui-su
 #
 Terminal=false
-Categories=System;Settings
+Categories=System;Settings;GNOME;GTK;
 StartupNotify=true
 Icon=nssbackup-restore
 #


--- NEW FILE nssbackup.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcversion 0.2-0~rc7
%define pathversion 0.2rc7

Name:           nssbackup
Version:        0.2
Release:        0.2.rc7%{?dist}
Summary:        (Not so) Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv3+
URL:            http://launchpad.net/nssbackup
Source0:        http://launchpad.net/%{name}/%{version}/%{pathversion}/+download/%{name}_%{srcversion}.orig.tar.gz
Patch0:         %{name}-0.2-0~rc7-desktopfiles.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gnome-python2
Requires:       notify-python
Requires:       fuse-python
Requires:       fuse-sshfs
Requires:       pexpect
Requires:       curlftpfs


%description
NSsbackup, shortform of Not So Simple Backup suite, 
is a backup solution for common desktop use.

It is a fork of the sbackup project, the Simple Backup suite. 
NSsbackup is basically using the same technology that Unix 
administrators have been used for decades but it adds some some 
intelligence for interaction with users within a graphical interface. 
This means dumps of files were created using the good old TAR 
but the usage is much more convenient than from a command line.


%prep
%setup -q -n %{name}-%{version}-0.orig
%patch0 -p1


%build
make %{?_smp_mflags} \
     PREFIX="%{_prefix}"

%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     SETUP.PY_OPTS="--root=%{buildroot}" \
     DESTDIR="%{buildroot}/%{_prefix}" \
     PREFIX="%{_prefix}" \
     PYDIR="%{buildroot}/%{python_sitelib}"
 
chmod +x %{buildroot}/%{python_sitelib}/%{name}/ui/GladeGnomeApp.py

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-config.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore-su.desktop

desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/%{name}-restore.desktop

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-config-gui-su

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-restore-gui-su

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-config-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-config-gui-su
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-restore-gui-su
USER=root
PROGRAM=%{_sbindir}/%{name}-restore-gui-su
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-config-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-restore-gui-su
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/
touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name}

%find_lang %{name}


%post
if [ $1 -eq 2 ]; then
   %{_sbindir}/%{name}config || :
fi


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING README 
%{_bindir}/%{name}*
%{_sbindir}/%{name}*
%{python_sitelib}/%{name}/
%{python_sitelib}/%{name}-*-py*.egg-info/
%{_datadir}/pixmaps/%{name}*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%config(noreplace) %{_sysconfdir}/pam.d/%{name}*
%config %{_sysconfdir}/security/console.apps/%{name}*
%ghost %{_sysconfdir}/cron.*/%{name}


%changelog
* Tue Apr 14 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.2.rc7
- Fix license tag
- Add missed Requires to the package

* Tue Mar 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc7
- New upstream release
- Customize specfile

* Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2-0.1.rc6
- Initial Package Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:36:43 -0000	1.1
+++ .cvsignore	17 Apr 2009 20:01:41 -0000	1.2
@@ -0,0 +1 @@
+nssbackup_0.2-0~rc7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nssbackup/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:36:43 -0000	1.1
+++ sources	17 Apr 2009 20:01:41 -0000	1.2
@@ -0,0 +1 @@
+c7fac4bda21350022eda110c56739763  nssbackup_0.2-0~rc7.orig.tar.gz



From vpv at fedoraproject.org  Fri Apr 17 20:12:19 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Fri, 17 Apr 2009 20:12:19 +0000 (UTC)
Subject: rpms/libvoikko/devel .cvsignore, 1.13, 1.14 libvoikko.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <20090417201219.838267012B@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25385

Modified Files:
	.cvsignore libvoikko.spec sources 
Log Message:
* Fri Apr 17 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.5.rc4
- 2.1rc4:
  - Fix invalid use of delete vs. delete[]
  - Limit the scope of some variables



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Apr 2009 12:12:46 -0000	1.13
+++ .cvsignore	17 Apr 2009 20:11:48 -0000	1.14
@@ -1 +1 @@
-libvoikko-2.1rc3.tar.gz
+libvoikko-2.1rc4.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvoikko.spec	13 Apr 2009 12:12:46 -0000	1.22
+++ libvoikko.spec	17 Apr 2009 20:11:48 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.1
-Release:        0.4.rc3%{?dist}
+Release:        0.5.rc4%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -9,7 +9,7 @@
 # The usual format of stable release URLs
 #Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc3.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga-devel >= 7.8 python
@@ -96,6 +96,11 @@
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Fri Apr 17 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.5.rc4
+- 2.1rc4:
+  - Fix invalid use of delete vs. delete[]
+  - Limit the scope of some variables
+
 * Mon Apr 13 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.4.rc3
 - 2.1rc3, remove patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Apr 2009 12:12:46 -0000	1.13
+++ sources	17 Apr 2009 20:11:48 -0000	1.14
@@ -1 +1 @@
-828eef05c34c1d536c672e20fe717e11  libvoikko-2.1rc3.tar.gz
+17458bdd150cc02d6071eeda69d4d3db  libvoikko-2.1rc4.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:13:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:13:12 +0000 (UTC)
Subject: rpms/R/EL-4 R.spec,1.29,1.30 sources,1.11,1.12
Message-ID: <20090417201312.4B40D7012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/EL-4

Modified Files:
	R.spec sources 
Log Message:
2.9.0


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- R.spec	4 Mar 2009 22:42:55 -0000	1.29
+++ R.spec	17 Apr 2009 20:12:41 -0000	1.30
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 3%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -17,8 +17,8 @@
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-g77
-BuildRequires: gcc-c++, tetex-latex, texinfo
-BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
+BuildRequires: gcc-c++, tetex-latex, texinfo 
+BuildRequires: libpng-devel, libjpeg-devel, readline-devel
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
 BuildRequires: java-1.4.2-gcj-compat
@@ -33,7 +33,7 @@
 This is a metapackage that provides both core R userspace and 
 all R development components.
 
-A language and environment for statistical computing and graphics. 
+R is a language and environment for statistical computing and graphics. 
 R is similar to the award-winning S system, which was developed at 
 Bell Laboratories by John Chambers et al. It provides a wide 
 variety of statistical and graphical techniques (linear and
@@ -49,7 +49,8 @@
 %package core
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
-Requires: ggv, cups, firefox
+Requires: ggv, cups, firefo
+Requires: perl, sed, gawk, tetex-latex, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -57,7 +58,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -67,8 +68,9 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -76,14 +78,14 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
 Provides: R-VR = 7.2
 
 %description core
-R is a language and environment for statistical computing and graphics.
+A language and environment for statistical computing and graphics.
 R is similar to the award-winning S system, which was developed at
 Bell Laboratories by John Chambers et al. It provides a wide
 variety of statistical and graphical techniques (linear and
@@ -97,21 +99,21 @@
 and called at run time.
 
 %package devel
-Summary: files for development of R packages.
+Summary: Files for development of R packages
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development version
-Requires: gcc-c++, gcc-g77, tetex-latex, texinfo 
-Requires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
+Requires: gcc-c++, gcc-g77, tetex-latex
+Requires: libpng-devel, libjpeg-devel, readline-devel
 Requires: XFree86-devel
-Requires: bzip2-devel, libtiff-devel
+Requires: bzip2-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
 
 %package -n libRmath
-Summary: standalone math library from the R project
+Summary: Standalone math library from the R project
 Group: Development/Libraries
 
 %description -n libRmath
@@ -119,7 +121,7 @@
 from the R project.  This packages provides the shared libRmath library.
 
 %package -n libRmath-devel
-Summary: standalone math library from the R project
+Summary: Standalone math library from the R project
 Group: Development/Libraries
 Requires: libRmath = %{version}-%{release}, pkgconfig
 
@@ -203,6 +205,12 @@
 make pdf
 make info
 
+# Convert to UTF-8
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
@@ -238,6 +246,10 @@
 	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
+# Fix exec bits
+chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/help-links.sh $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh
+chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
+
 %files
 # Metapackage
 
@@ -245,12 +257,594 @@
 %defattr(-, root, root, -)
 %{_bindir}/R
 %{_bindir}/Rscript
-%{_datadir}/R
+%dir %{_datadir}/R/
+%{_datadir}/R/encodings/
+%{_datadir}/R/java/
+%{_datadir}/R/library/
+%{_datadir}/R/licenses/
+%dir %{_datadir}/R/locale/
+%lang(de) %{_datadir}/R/locale/de/
+%lang(en) %{_datadir}/R/locale/en*/
+%lang(es) %{_datadir}/R/locale/es*/
+%lang(fr) %{_datadir}/R/locale/fr/
+%lang(it) %{_datadir}/R/locale/it/
+%lang(ja) %{_datadir}/R/locale/ja/
+%lang(ko) %{_datadir}/R/locale/ko/
+%lang(pt) %{_datadir}/R/locale/pt*/
+%lang(ru) %{_datadir}/R/locale/ru/
+%lang(zh) %{_datadir}/R/locale/zh*/
+%{_datadir}/R/make/
+%{_datadir}/R/perl/
+%{_datadir}/R/R/
+%{_datadir}/R/sh/
+%{_datadir}/R/texmf/
 %dir %{_libdir}/R
 %{_libdir}/R/bin
 %{_libdir}/R/etc
 %{_libdir}/R/lib
-%{_libdir}/R/library
+# Have to break this out for the translations
+%dir %{_libdir}/R/library
+%{_libdir}/R/library/R.css
+# base
+%dir %{_libdir}/R/library/base/
+%{_libdir}/R/library/base/CITATION
+%{_libdir}/R/library/base/CONTENTS
+%{_libdir}/R/library/base/demo/
+%{_libdir}/R/library/base/DESCRIPTION
+%{_libdir}/R/library/base/help/
+%{_libdir}/R/library/base/html/
+%{_libdir}/R/library/base/INDEX
+%{_libdir}/R/library/base/latex/
+%{_libdir}/R/library/base/man/
+%{_libdir}/R/library/base/Meta/
+%dir %{_libdir}/R/library/base/po/
+%lang(de) %{_libdir}/R/library/base/po/de/
+%lang(en) %{_libdir}/R/library/base/po/en*/
+%lang(fr) %{_libdir}/R/library/base/po/fr/
+%lang(it) %{_libdir}/R/library/base/po/it/
+%lang(ja) %{_libdir}/R/library/base/po/ja/
+%lang(ko) %{_libdir}/R/library/base/po/ko/
+%lang(pt) %{_libdir}/R/library/base/po/pt*/
+%lang(ru) %{_libdir}/R/library/base/po/ru/
+%lang(zh) %{_libdir}/R/library/base/po/zh*/
+%{_libdir}/R/library/base/R/
+%{_libdir}/R/library/base/R-ex/
+# boot
+%dir %{_libdir}/R/library/boot/
+%{_libdir}/R/library/boot/CITATION
+%{_libdir}/R/library/boot/CONTENTS
+%{_libdir}/R/library/boot/data/
+%{_libdir}/R/library/boot/DESCRIPTION
+%{_libdir}/R/library/boot/help/
+%{_libdir}/R/library/boot/html/
+%{_libdir}/R/library/boot/INDEX
+%{_libdir}/R/library/boot/latex/
+%{_libdir}/R/library/boot/man/
+%{_libdir}/R/library/boot/Meta/
+%{_libdir}/R/library/boot/NAMESPACE
+%dir %{_libdir}/R/library/boot/po/
+%lang(en) %{_libdir}/R/library/boot/po/en*/
+%lang(fr) %{_libdir}/R/library/boot/po/fr/
+%lang(ru) %{_libdir}/R/library/boot/po/ru/
+%{_libdir}/R/library/boot/R/
+%{_libdir}/R/library/boot/R-ex/
+# class
+%dir %{_libdir}/R/library/class/
+%{_libdir}/R/library/class/CITATION
+%{_libdir}/R/library/class/CONTENTS
+%{_libdir}/R/library/class/DESCRIPTION
+%{_libdir}/R/library/class/help/
+%{_libdir}/R/library/class/html/
+%{_libdir}/R/library/class/INDEX
+%{_libdir}/R/library/class/latex/
+%{_libdir}/R/library/class/libs/
+%{_libdir}/R/library/class/LICENCE
+%{_libdir}/R/library/class/man/
+%{_libdir}/R/library/class/Meta/
+%{_libdir}/R/library/class/NAMESPACE
+%{_libdir}/R/library/class/NEWS
+%dir %{_libdir}/R/library/class/po/
+%lang(en) %{_libdir}/R/library/class/po/en*/
+%lang(fr) %{_libdir}/R/library/class/po/fr/
+%{_libdir}/R/library/class/R/
+%{_libdir}/R/library/class/R-ex/
+# cluster
+%dir %{_libdir}/R/library/cluster/
+%{_libdir}/R/library/cluster/CITATION
+%{_libdir}/R/library/cluster/CONTENTS
+%{_libdir}/R/library/cluster/data/
+%{_libdir}/R/library/cluster/DESCRIPTION
+%{_libdir}/R/library/cluster/help/
+%{_libdir}/R/library/cluster/html/
+%{_libdir}/R/library/cluster/INDEX
+%{_libdir}/R/library/cluster/latex/
+%{_libdir}/R/library/cluster/libs/
+%{_libdir}/R/library/cluster/man/
+%{_libdir}/R/library/cluster/Meta/
+%{_libdir}/R/library/cluster/NAMESPACE
+%{_libdir}/R/library/cluster/R/
+%{_libdir}/R/library/cluster/R-ex/
+# codetools
+%dir %{_libdir}/R/library/codetools/
+%{_libdir}/R/library/codetools/CONTENTS
+%{_libdir}/R/library/codetools/DESCRIPTION
+%{_libdir}/R/library/codetools/help/
+%{_libdir}/R/library/codetools/html/
+%{_libdir}/R/library/codetools/INDEX
+%{_libdir}/R/library/codetools/latex/
+%{_libdir}/R/library/codetools/man/
+%{_libdir}/R/library/codetools/Meta/
+%{_libdir}/R/library/codetools/NAMESPACE
+%{_libdir}/R/library/codetools/R/
+%{_libdir}/R/library/codetools/R-ex/
+# datasets
+%dir %{_libdir}/R/library/datasets/
+%{_libdir}/R/library/datasets/CONTENTS
+%{_libdir}/R/library/datasets/data/
+%{_libdir}/R/library/datasets/DESCRIPTION
+%{_libdir}/R/library/datasets/help/
+%{_libdir}/R/library/datasets/html/
+%{_libdir}/R/library/datasets/INDEX
+%{_libdir}/R/library/datasets/latex/
+%{_libdir}/R/library/datasets/man/
+%{_libdir}/R/library/datasets/Meta/
+%{_libdir}/R/library/datasets/R/
+%{_libdir}/R/library/datasets/R-ex/
+# foreign
+%dir %{_libdir}/R/library/foreign/
+%{_libdir}/R/library/foreign/CONTENTS
+%{_libdir}/R/library/foreign/COPYING
+%{_libdir}/R/library/foreign/DESCRIPTION
+%{_libdir}/R/library/foreign/files/
+%{_libdir}/R/library/foreign/help/
+%{_libdir}/R/library/foreign/html/
+%{_libdir}/R/library/foreign/INDEX
+%{_libdir}/R/library/foreign/latex/
+%{_libdir}/R/library/foreign/libs/
+%{_libdir}/R/library/foreign/LICENCE
+%{_libdir}/R/library/foreign/man/
+%{_libdir}/R/library/foreign/Meta/
+%{_libdir}/R/library/foreign/NAMESPACE
+%dir %{_libdir}/R/library/foreign/po/
+%lang(en) %{_libdir}/R/library/foreign/po/en*/
+%lang(fr) %{_libdir}/R/library/foreign/po/fr/
+%{_libdir}/R/library/foreign/R/
+%{_libdir}/R/library/foreign/R-ex/
+# graphics
+%dir %{_libdir}/R/library/graphics/
+%{_libdir}/R/library/graphics/CONTENTS
+%{_libdir}/R/library/graphics/demo/
+%{_libdir}/R/library/graphics/DESCRIPTION
+%{_libdir}/R/library/graphics/help/
+%{_libdir}/R/library/graphics/html/
+%{_libdir}/R/library/graphics/INDEX
+%{_libdir}/R/library/graphics/latex/
+%{_libdir}/R/library/graphics/man/
+%{_libdir}/R/library/graphics/Meta/
+%{_libdir}/R/library/graphics/NAMESPACE
+%dir %{_libdir}/R/library/graphics/po/
+%lang(de) %{_libdir}/R/library/graphics/po/de/
+%lang(en) %{_libdir}/R/library/graphics/po/en*/
+%lang(fr) %{_libdir}/R/library/graphics/po/fr/
+%lang(it) %{_libdir}/R/library/graphics/po/it/
+%lang(ja) %{_libdir}/R/library/graphics/po/ja/
+%lang(ko) %{_libdir}/R/library/graphics/po/ko/
+%lang(ru) %{_libdir}/R/library/graphics/po/ru/
+%lang(zh) %{_libdir}/R/library/graphics/po/zh*/
+%{_libdir}/R/library/graphics/R/
+%{_libdir}/R/library/graphics/R-ex/
+# grDevices
+%dir %{_libdir}/R/library/grDevices
+%{_libdir}/R/library/grDevices/afm/
+%{_libdir}/R/library/grDevices/CONTENTS
+%{_libdir}/R/library/grDevices/DESCRIPTION
+%{_libdir}/R/library/grDevices/enc/
+%{_libdir}/R/library/grDevices/help/
+%{_libdir}/R/library/grDevices/html/
+%{_libdir}/R/library/grDevices/INDEX
+%{_libdir}/R/library/grDevices/latex/
+%{_libdir}/R/library/grDevices/libs/
+%{_libdir}/R/library/grDevices/man/
+%{_libdir}/R/library/grDevices/Meta/
+%{_libdir}/R/library/grDevices/NAMESPACE
+%dir %{_libdir}/R/library/grDevices/po/
+%lang(de) %{_libdir}/R/library/grDevices/po/de/
+%lang(en) %{_libdir}/R/library/grDevices/po/en*/
+%lang(fr) %{_libdir}/R/library/grDevices/po/fr/
+%lang(it) %{_libdir}/R/library/grDevices/po/it/
+%lang(ja) %{_libdir}/R/library/grDevices/po/ja/
+%lang(ko) %{_libdir}/R/library/grDevices/po/ko/
+%lang(ru) %{_libdir}/R/library/grDevices/po/ru/
+%lang(zh) %{_libdir}/R/library/grDevices/po/zh*/
+%{_libdir}/R/library/grDevices/R/
+%{_libdir}/R/library/grDevices/R-ex/
+# grid
+%dir %{_libdir}/R/library/grid/
+%{_libdir}/R/library/grid/CONTENTS
+%{_libdir}/R/library/grid/DESCRIPTION
+%{_libdir}/R/library/grid/doc/
+%{_libdir}/R/library/grid/help/
+%{_libdir}/R/library/grid/html/
+%{_libdir}/R/library/grid/INDEX
+%{_libdir}/R/library/grid/latex/
+%{_libdir}/R/library/grid/libs/
+%{_libdir}/R/library/grid/man/
+%{_libdir}/R/library/grid/Meta/
+%{_libdir}/R/library/grid/NAMESPACE
+%dir %{_libdir}/R/library/grid/po/
+%lang(de) %{_libdir}/R/library/grid/po/de/
+%lang(en) %{_libdir}/R/library/grid/po/en*/
+%lang(fr) %{_libdir}/R/library/grid/po/fr*/
+%lang(it) %{_libdir}/R/library/grid/po/it/
+%lang(ja) %{_libdir}/R/library/grid/po/ja/
+%lang(ko) %{_libdir}/R/library/grid/po/ko/
+%lang(pt) %{_libdir}/R/library/grid/po/pt*/
+%lang(ru) %{_libdir}/R/library/grid/po/ru/
+%lang(zh) %{_libdir}/R/library/grid/po/zh*/
+%{_libdir}/R/library/grid/R/
+%{_libdir}/R/library/grid/R-ex/
+# KernSmooth
+%dir %{_libdir}/R/library/KernSmooth/
+%{_libdir}/R/library/KernSmooth/CONTENTS
+%{_libdir}/R/library/KernSmooth/DESCRIPTION
+%{_libdir}/R/library/KernSmooth/help/
+%{_libdir}/R/library/KernSmooth/html/
+%{_libdir}/R/library/KernSmooth/INDEX
+%{_libdir}/R/library/KernSmooth/latex/
+%{_libdir}/R/library/KernSmooth/libs/
+%{_libdir}/R/library/KernSmooth/LICENCE
+%{_libdir}/R/library/KernSmooth/man/
+%{_libdir}/R/library/KernSmooth/Meta/
+%{_libdir}/R/library/KernSmooth/NAMESPACE
+%{_libdir}/R/library/KernSmooth/R/
+%{_libdir}/R/library/KernSmooth/R-ex/
+# lattice
+%dir %{_libdir}/R/library/lattice/
+%{_libdir}/R/library/lattice/CONTENTS
+%{_libdir}/R/library/lattice/COPYING
+%{_libdir}/R/library/lattice/data/
+%{_libdir}/R/library/lattice/demo/
+%{_libdir}/R/library/lattice/DESCRIPTION
+%{_libdir}/R/library/lattice/help/
+%{_libdir}/R/library/lattice/html/
+%{_libdir}/R/library/lattice/INDEX
+%{_libdir}/R/library/lattice/latex/
+%{_libdir}/R/library/lattice/libs/
+%{_libdir}/R/library/lattice/man/
+%{_libdir}/R/library/lattice/Meta/
+%{_libdir}/R/library/lattice/NAMESPACE
+%{_libdir}/R/library/lattice/NEWS
+%{_libdir}/R/library/lattice/R/
+%{_libdir}/R/library/lattice/R-ex/
+# MASS
+%dir %{_libdir}/R/library/MASS/
+%{_libdir}/R/library/MASS/CITATION
+%{_libdir}/R/library/MASS/CONTENTS
+%{_libdir}/R/library/MASS/data/
+%{_libdir}/R/library/MASS/DESCRIPTION
+%{_libdir}/R/library/MASS/help/
+%{_libdir}/R/library/MASS/html/
+%{_libdir}/R/library/MASS/INDEX
+%{_libdir}/R/library/MASS/latex/
+%{_libdir}/R/library/MASS/libs/
+%{_libdir}/R/library/MASS/LICENCE
+%{_libdir}/R/library/MASS/man/
+%{_libdir}/R/library/MASS/Meta/
+%{_libdir}/R/library/MASS/NAMESPACE
+%{_libdir}/R/library/MASS/NEWS
+%dir %{_libdir}/R/library/MASS/po
+%lang(en) %{_libdir}/R/library/MASS/po/en*/
+%lang(fr) %{_libdir}/R/library/MASS/po/fr/
+%{_libdir}/R/library/MASS/R/
+%{_libdir}/R/library/MASS/R-ex/
+%{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
+# methods
+%dir %{_libdir}/R/library/methods/
+%{_libdir}/R/library/methods/CONTENTS
+%{_libdir}/R/library/methods/DESCRIPTION
+%{_libdir}/R/library/methods/help/
+%{_libdir}/R/library/methods/html/
+%{_libdir}/R/library/methods/INDEX
+%{_libdir}/R/library/methods/latex/
+%{_libdir}/R/library/methods/libs/
+%{_libdir}/R/library/methods/man/
+%{_libdir}/R/library/methods/Meta/
+%{_libdir}/R/library/methods/NAMESPACE
+%dir %{_libdir}/R/library/methods/po/
+%lang(de) %{_libdir}/R/library/methods/po/de/
+%lang(en) %{_libdir}/R/library/methods/po/en*/
+%lang(fr) %{_libdir}/R/library/methods/po/fr/
+%lang(ja) %{_libdir}/R/library/methods/po/ja/
+%lang(ko) %{_libdir}/R/library/methods/po/ko/
+%lang(pt) %{_libdir}/R/library/methods/po/pt*/
+%lang(ru) %{_libdir}/R/library/methods/po/ru/
+%lang(zh) %{_libdir}/R/library/methods/po/zh*/
+%{_libdir}/R/library/methods/R/
+%{_libdir}/R/library/methods/R-ex/
+# mgcv
+%dir %{_libdir}/R/library/mgcv/
+%{_libdir}/R/library/mgcv/CITATION
+%{_libdir}/R/library/mgcv/CONTENTS
+%{_libdir}/R/library/mgcv/DESCRIPTION
+%{_libdir}/R/library/mgcv/help/
+%{_libdir}/R/library/mgcv/html/
+%{_libdir}/R/library/mgcv/INDEX
+%{_libdir}/R/library/mgcv/latex/
+%{_libdir}/R/library/mgcv/libs/
+%{_libdir}/R/library/mgcv/man/
+%{_libdir}/R/library/mgcv/Meta/
+%{_libdir}/R/library/mgcv/NAMESPACE
+%{_libdir}/R/library/mgcv/R/
+%{_libdir}/R/library/mgcv/R-ex/
+# nlme
+%dir %{_libdir}/R/library/nlme/
+%{_libdir}/R/library/nlme/CITATION
+%{_libdir}/R/library/nlme/CONTENTS
+%{_libdir}/R/library/nlme/COPYING
+%{_libdir}/R/library/nlme/data/
+%{_libdir}/R/library/nlme/DESCRIPTION
+%{_libdir}/R/library/nlme/help/
+%{_libdir}/R/library/nlme/html/
+%{_libdir}/R/library/nlme/INDEX
+%{_libdir}/R/library/nlme/latex/
+%{_libdir}/R/library/nlme/libs/
+%{_libdir}/R/library/nlme/LICENCE
+%{_libdir}/R/library/nlme/man/
+%{_libdir}/R/library/nlme/Meta/
+%{_libdir}/R/library/nlme/mlbook/
+%{_libdir}/R/library/nlme/NAMESPACE
+%dir %{_libdir}/R/library/nlme/po/
+%lang(en) %{_libdir}/R/library/nlme/po/en*/
+%lang(fr) %{_libdir}/R/library/nlme/po/fr/
+%{_libdir}/R/library/nlme/R/
+%{_libdir}/R/library/nlme/R-ex/
+%{_libdir}/R/library/nlme/scripts/
+# nnet
+%dir %{_libdir}/R/library/nnet/
+%{_libdir}/R/library/nnet/CITATION
+%{_libdir}/R/library/nnet/CONTENTS
+%{_libdir}/R/library/nnet/DESCRIPTION
+%{_libdir}/R/library/nnet/help/
+%{_libdir}/R/library/nnet/html/
+%{_libdir}/R/library/nnet/INDEX
+%{_libdir}/R/library/nnet/latex/
+%{_libdir}/R/library/nnet/libs/
+%{_libdir}/R/library/nnet/LICENCE
+%{_libdir}/R/library/nnet/man/
+%{_libdir}/R/library/nnet/Meta/
+%{_libdir}/R/library/nnet/NAMESPACE
+%{_libdir}/R/library/nnet/NEWS
+%dir %{_libdir}/R/library/nnet/po
+%lang(en) %{_libdir}/R/library/nnet/po/en*/
+%lang(fr) %{_libdir}/R/library/nnet/po/fr/
+%{_libdir}/R/library/nnet/R/
+%{_libdir}/R/library/nnet/R-ex/
+# rpart
+%dir %{_libdir}/R/library/rpart/
+%{_libdir}/R/library/rpart/CONTENTS
+%{_libdir}/R/library/rpart/data/
+%{_libdir}/R/library/rpart/DESCRIPTION
+%{_libdir}/R/library/rpart/help/
+%{_libdir}/R/library/rpart/html/
+%{_libdir}/R/library/rpart/INDEX
+%{_libdir}/R/library/rpart/latex/
+%{_libdir}/R/library/rpart/libs/
+%{_libdir}/R/library/rpart/LICENCE
+%{_libdir}/R/library/rpart/man/
+%{_libdir}/R/library/rpart/Meta/
+%{_libdir}/R/library/rpart/NAMESPACE
+%dir %{_libdir}/R/library/rpart/po
+%lang(en) %{_libdir}/R/library/rpart/po/en*/
+%lang(fr) %{_libdir}/R/library/rpart/po/fr/
+%lang(ru) %{_libdir}/R/library/rpart/po/ru/
+%{_libdir}/R/library/rpart/R/
+%{_libdir}/R/library/rpart/R-ex/
+# spatial
+%dir %{_libdir}/R/library/spatial/
+%{_libdir}/R/library/spatial/CITATION
+%{_libdir}/R/library/spatial/CONTENTS
+%{_libdir}/R/library/spatial/DESCRIPTION
+%{_libdir}/R/library/spatial/help/
+%{_libdir}/R/library/spatial/html/
+%{_libdir}/R/library/spatial/INDEX
+%{_libdir}/R/library/spatial/latex/
+%{_libdir}/R/library/spatial/libs/
+%{_libdir}/R/library/spatial/LICENCE
+%{_libdir}/R/library/spatial/man/
+%{_libdir}/R/library/spatial/Meta/
+%{_libdir}/R/library/spatial/NAMESPACE
+%{_libdir}/R/library/spatial/NEWS
+%dir %{_libdir}/R/library/spatial/po
+%lang(en) %{_libdir}/R/library/spatial/po/en*/
+%lang(fr) %{_libdir}/R/library/spatial/po/fr/
+%{_libdir}/R/library/spatial/ppdata/
+%{_libdir}/R/library/spatial/PP.files
+%{_libdir}/R/library/spatial/R/
+%{_libdir}/R/library/spatial/R-ex/
+# splines
+%dir %{_libdir}/R/library/splines/
+%{_libdir}/R/library/splines/CONTENTS
+%{_libdir}/R/library/splines/DESCRIPTION
+%{_libdir}/R/library/splines/help/
+%{_libdir}/R/library/splines/html/
+%{_libdir}/R/library/splines/INDEX
+%{_libdir}/R/library/splines/latex/
+%{_libdir}/R/library/splines/libs/
+%{_libdir}/R/library/splines/man/
+%{_libdir}/R/library/splines/Meta/
+%{_libdir}/R/library/splines/NAMESPACE
+%dir %{_libdir}/R/library/splines/po
+%lang(de) %{_libdir}/R/library/splines/po/de/
+%lang(en) %{_libdir}/R/library/splines/po/en*/
+%lang(fr) %{_libdir}/R/library/splines/po/fr/
+%lang(ja) %{_libdir}/R/library/splines/po/ja/
+%lang(ko) %{_libdir}/R/library/splines/po/ko/
+%lang(pt) %{_libdir}/R/library/splines/po/pt*/
+%lang(ru) %{_libdir}/R/library/splines/po/ru/
+%lang(zh) %{_libdir}/R/library/splines/po/zh*/
+%{_libdir}/R/library/splines/R/
+%{_libdir}/R/library/splines/R-ex/
+# stats
+%dir %{_libdir}/R/library/stats/
+%{_libdir}/R/library/stats/CONTENTS
+%{_libdir}/R/library/stats/COPYRIGHTS.modreg
+%{_libdir}/R/library/stats/demo/
+%{_libdir}/R/library/stats/DESCRIPTION
+%{_libdir}/R/library/stats/help/
+%{_libdir}/R/library/stats/html/
+%{_libdir}/R/library/stats/INDEX
+%{_libdir}/R/library/stats/latex/
+%{_libdir}/R/library/stats/libs/
+%{_libdir}/R/library/stats/man/
+%{_libdir}/R/library/stats/Meta/
+%{_libdir}/R/library/stats/NAMESPACE
+%dir %{_libdir}/R/library/stats/po
+%lang(de) %{_libdir}/R/library/stats/po/de/
+%lang(en) %{_libdir}/R/library/stats/po/en*/
+%lang(fr) %{_libdir}/R/library/stats/po/fr/
+%lang(it) %{_libdir}/R/library/stats/po/it/
+%lang(ja) %{_libdir}/R/library/stats/po/ja/
+%lang(ko) %{_libdir}/R/library/stats/po/ko/
+%lang(pt) %{_libdir}/R/library/stats/po/pt*/
+%lang(ru) %{_libdir}/R/library/stats/po/ru/
+%lang(zh) %{_libdir}/R/library/stats/po/zh*/
+%{_libdir}/R/library/stats/R/
+%{_libdir}/R/library/stats/R-ex/
+%{_libdir}/R/library/stats/SOURCES.ts
+# stats4
+%dir %{_libdir}/R/library/stats4/
+%{_libdir}/R/library/stats4/CONTENTS
+%{_libdir}/R/library/stats4/DESCRIPTION
+%{_libdir}/R/library/stats4/help/
+%{_libdir}/R/library/stats4/html/
+%{_libdir}/R/library/stats4/INDEX
+%{_libdir}/R/library/stats4/latex/
+%{_libdir}/R/library/stats4/man/
+%{_libdir}/R/library/stats4/Meta/
+%{_libdir}/R/library/stats4/NAMESPACE
+%dir %{_libdir}/R/library/stats4/po
+%lang(de) %{_libdir}/R/library/stats4/po/de/
+%lang(en) %{_libdir}/R/library/stats4/po/en*/
+%lang(fr) %{_libdir}/R/library/stats4/po/fr/
+%lang(it) %{_libdir}/R/library/stats4/po/it/
+%lang(ja) %{_libdir}/R/library/stats4/po/ja/
+%lang(ko) %{_libdir}/R/library/stats4/po/ko/
+%lang(pt) %{_libdir}/R/library/stats4/po/pt*/
+%lang(ru) %{_libdir}/R/library/stats4/po/ru/
+%lang(zh) %{_libdir}/R/library/stats4/po/zh*/
+%{_libdir}/R/library/stats4/R/
+%{_libdir}/R/library/stats4/R-ex/
+# survival
+%dir %{_libdir}/R/library/survival/
+%{_libdir}/R/library/survival/CONTENTS
+%{_libdir}/R/library/survival/COPYING
+%{_libdir}/R/library/survival/data/
+%{_libdir}/R/library/survival/DESCRIPTION
+%{_libdir}/R/library/survival/help/
+%{_libdir}/R/library/survival/html/
+%{_libdir}/R/library/survival/INDEX
+%{_libdir}/R/library/survival/latex/
+%{_libdir}/R/library/survival/libs/
+%{_libdir}/R/library/survival/man/
+%{_libdir}/R/library/survival/Meta/
+%{_libdir}/R/library/survival/NAMESPACE
+%{_libdir}/R/library/survival/R/
+%{_libdir}/R/library/survival/R-ex/
+# tcltk
+%dir %{_libdir}/R/library/tcltk/
+%{_libdir}/R/library/tcltk/CONTENTS
+%{_libdir}/R/library/tcltk/demo/
+%{_libdir}/R/library/tcltk/DESCRIPTION
+%{_libdir}/R/library/tcltk/exec/
+%{_libdir}/R/library/tcltk/help/
+%{_libdir}/R/library/tcltk/html/
+%{_libdir}/R/library/tcltk/INDEX
+%{_libdir}/R/library/tcltk/latex/
+%{_libdir}/R/library/tcltk/libs/
+%{_libdir}/R/library/tcltk/man/
+%{_libdir}/R/library/tcltk/Meta/
+%{_libdir}/R/library/tcltk/NAMESPACE
+%dir %{_libdir}/R/library/tcltk/po/
+%lang(de) %{_libdir}/R/library/tcltk/po/de/
+%lang(en) %{_libdir}/R/library/tcltk/po/en*/
+%lang(fr) %{_libdir}/R/library/tcltk/po/fr/
+%lang(it) %{_libdir}/R/library/tcltk/po/it/
+%lang(ja) %{_libdir}/R/library/tcltk/po/ja/
+%lang(ko) %{_libdir}/R/library/tcltk/po/ko/
+%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/
+%lang(ru) %{_libdir}/R/library/tcltk/po/ru/
+%lang(zh) %{_libdir}/R/library/tcltk/po/zh*/
+%{_libdir}/R/library/tcltk/R/
+%{_libdir}/R/library/tcltk/R-ex/
+# tools
+%dir %{_libdir}/R/library/tools/
+%{_libdir}/R/library/tools/CONTENTS
+%{_libdir}/R/library/tools/DESCRIPTION
+%{_libdir}/R/library/tools/help/
+%{_libdir}/R/library/tools/html/
+%{_libdir}/R/library/tools/INDEX
+%{_libdir}/R/library/tools/latex/
+%{_libdir}/R/library/tools/libs/
+%{_libdir}/R/library/tools/man/
+%{_libdir}/R/library/tools/Meta/
+%{_libdir}/R/library/tools/NAMESPACE
+%dir %{_libdir}/R/library/tools/po
+%lang(de) %{_libdir}/R/library/tools/po/de/
+%lang(en) %{_libdir}/R/library/tools/po/en*/
+%lang(fr) %{_libdir}/R/library/tools/po/fr/
+%lang(it) %{_libdir}/R/library/tools/po/it/
+%lang(ja) %{_libdir}/R/library/tools/po/ja/
+%lang(ko) %{_libdir}/R/library/tools/po/ko/
+%lang(pt) %{_libdir}/R/library/tools/po/pt*/
+%lang(ru) %{_libdir}/R/library/tools/po/ru/
+%lang(zh) %{_libdir}/R/library/tools/po/zh*/
+%{_libdir}/R/library/tools/R/
+%{_libdir}/R/library/tools/R-ex/
+# utils
+%dir %{_libdir}/R/library/utils/
+%{_libdir}/R/library/utils/CONTENTS
+%{_libdir}/R/library/utils/DESCRIPTION
+%{_libdir}/R/library/utils/help/
+%{_libdir}/R/library/utils/html/
+%{_libdir}/R/library/utils/iconvlist
+%{_libdir}/R/library/utils/INDEX
+%{_libdir}/R/library/utils/latex/
+%{_libdir}/R/library/utils/man/
+%{_libdir}/R/library/utils/Meta/
+%{_libdir}/R/library/utils/misc/
+%{_libdir}/R/library/utils/NAMESPACE
+%dir %{_libdir}/R/library/utils/po
+%lang(de) %{_libdir}/R/library/utils/po/de/
+%lang(en) %{_libdir}/R/library/utils/po/en*/
+%lang(fr) %{_libdir}/R/library/utils/po/fr/
+%lang(ja) %{_libdir}/R/library/utils/po/ja/
+%lang(ko) %{_libdir}/R/library/utils/po/ko/
+%lang(ru) %{_libdir}/R/library/utils/po/ru/
+%lang(zh) %{_libdir}/R/library/utils/po/zh*/
+%{_libdir}/R/library/utils/R/
+%{_libdir}/R/library/utils/R-ex/
+%{_libdir}/R/library/utils/Sweave/
 %{_libdir}/R/modules
 %{_libdir}/R/COPYING
 %{_libdir}/R/NEWS
@@ -322,24 +916,46 @@
    done
 fi
 
-%postun core
-/sbin/ldconfig
+%postun core -p /sbin/ldconfig
 
-%post -n libRmath
-/sbin/ldconfig
+%post -n libRmath -p /sbin/ldconfig
 
-%postun -n libRmath
-/sbin/ldconfig
+%postun -n libRmath -p /sbin/ldconfig
 
 %changelog
-* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-3
-- fix fortran compiler error on EL-4
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+- EL4 version, no java subpackages
+
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
+- drop profile.d scripts, they broke more than they fixed
+- minimize hard-coded Requires based on Martyn Plummer's analysis
+
+* Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
+- fix profile scripts for situation where R_HOME is already defined
+  (bugzilla 492706)
+
+* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-7
+- bump for new tag
+
+* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-6
+- add profile.d scripts to set R_HOME 
+- rpmlint cleanups
+
+* Mon Mar 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-5
+- add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules 
+  to build/install
 
-* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
-- fix R-make-search-index.sh (bz 487022)
-- fix libRmath requires to need V-R (thanks to Martyn Plummer)
+* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-4
 - update post scriptlet (bz 477076)
 
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
+- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
+- fix libRmath requires to need V-R (thanks to Martyn Plummer)
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
 - update javareconf call in %%post (bz 477076)
 - 2.8.1
@@ -348,7 +964,6 @@
 - enable libtiff interface
 
 * Sun Oct 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.0-1
-- EL-4 VERSION
 - Update to 2.8.0
 - New subpackage layout: R-core is functional userspace, R is metapackage 
   requiring everything
@@ -357,12 +972,7 @@
 * Thu Oct 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.2-2
 - fix sh compile (bz 464055)
 
-* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.2-1.1
-- EL-4 VERSION
-- no cairo in EL-4
-
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.2-1
-- EL-4 VERSION
 - update to 2.7.2
 - fix spec for alpha compile (bz 458931)
 - fix security issue in javareconf script (bz 460658)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 16:27:47 -0000	1.11
+++ sources	17 Apr 2009 20:12:41 -0000	1.12
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:13:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:13:12 +0000 (UTC)
Subject: rpms/R/EL-5 R.spec,1.36,1.37 sources,1.17,1.18
Message-ID: <20090417201312.91D1F7012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/EL-5

Modified Files:
	R.spec sources 
Log Message:
2.9.0


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- R.spec	4 Mar 2009 20:50:11 -0000	1.36
+++ R.spec	17 Apr 2009 20:12:42 -0000	1.37
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 3%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -51,6 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -58,7 +59,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -68,8 +69,9 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -77,7 +79,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -98,21 +100,19 @@
 and called at run time.
 
 %package devel
-Summary: files for development of R packages.
+Summary: Files for development of R packages
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development version
-Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
-Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel
-Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
-Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
+Requires: gcc-c++, gcc-gfortran, tetex-latex
+Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
 
 %package -n libRmath
-Summary: standalone math library from the R project
+Summary: Standalone math library from the R project
 Group: Development/Libraries
 
 %description -n libRmath
@@ -120,7 +120,7 @@
 from the R project.  This packages provides the shared libRmath library.
 
 %package -n libRmath-devel
-Summary: standalone math library from the R project
+Summary: Standalone math library from the R project
 Group: Development/Libraries
 Requires: libRmath = %{version}-%{release}, pkgconfig
 
@@ -197,6 +197,12 @@
 make pdf
 make info
 
+# Convert to UTF-8
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
@@ -232,6 +238,10 @@
 	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
+# Fix exec bits
+chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/help-links.sh $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh
+chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
+
 %files
 # Metapackage
 
@@ -239,12 +249,594 @@
 %defattr(-, root, root, -)
 %{_bindir}/R
 %{_bindir}/Rscript
-%{_datadir}/R
+%dir %{_datadir}/R/
+%{_datadir}/R/encodings/
+%{_datadir}/R/java/
+%{_datadir}/R/library/
+%{_datadir}/R/licenses/
+%dir %{_datadir}/R/locale/
+%lang(de) %{_datadir}/R/locale/de/
+%lang(en) %{_datadir}/R/locale/en*/
+%lang(es) %{_datadir}/R/locale/es*/
+%lang(fr) %{_datadir}/R/locale/fr/
+%lang(it) %{_datadir}/R/locale/it/
+%lang(ja) %{_datadir}/R/locale/ja/
+%lang(ko) %{_datadir}/R/locale/ko/
+%lang(pt) %{_datadir}/R/locale/pt*/
+%lang(ru) %{_datadir}/R/locale/ru/
+%lang(zh) %{_datadir}/R/locale/zh*/
+%{_datadir}/R/make/
+%{_datadir}/R/perl/
+%{_datadir}/R/R/
+%{_datadir}/R/sh/
+%{_datadir}/R/texmf/
 %dir %{_libdir}/R
 %{_libdir}/R/bin
 %{_libdir}/R/etc
 %{_libdir}/R/lib
-%{_libdir}/R/library
+# Have to break this out for the translations
+%dir %{_libdir}/R/library
+%{_libdir}/R/library/R.css
+# base
+%dir %{_libdir}/R/library/base/
+%{_libdir}/R/library/base/CITATION
+%{_libdir}/R/library/base/CONTENTS
+%{_libdir}/R/library/base/demo/
+%{_libdir}/R/library/base/DESCRIPTION
+%{_libdir}/R/library/base/help/
+%{_libdir}/R/library/base/html/
+%{_libdir}/R/library/base/INDEX
+%{_libdir}/R/library/base/latex/
+%{_libdir}/R/library/base/man/
+%{_libdir}/R/library/base/Meta/
+%dir %{_libdir}/R/library/base/po/
+%lang(de) %{_libdir}/R/library/base/po/de/
+%lang(en) %{_libdir}/R/library/base/po/en*/
+%lang(fr) %{_libdir}/R/library/base/po/fr/
+%lang(it) %{_libdir}/R/library/base/po/it/
+%lang(ja) %{_libdir}/R/library/base/po/ja/
+%lang(ko) %{_libdir}/R/library/base/po/ko/
+%lang(pt) %{_libdir}/R/library/base/po/pt*/
+%lang(ru) %{_libdir}/R/library/base/po/ru/
+%lang(zh) %{_libdir}/R/library/base/po/zh*/
+%{_libdir}/R/library/base/R/
+%{_libdir}/R/library/base/R-ex/
+# boot
+%dir %{_libdir}/R/library/boot/
+%{_libdir}/R/library/boot/CITATION
+%{_libdir}/R/library/boot/CONTENTS
+%{_libdir}/R/library/boot/data/
+%{_libdir}/R/library/boot/DESCRIPTION
+%{_libdir}/R/library/boot/help/
+%{_libdir}/R/library/boot/html/
+%{_libdir}/R/library/boot/INDEX
+%{_libdir}/R/library/boot/latex/
+%{_libdir}/R/library/boot/man/
+%{_libdir}/R/library/boot/Meta/
+%{_libdir}/R/library/boot/NAMESPACE
+%dir %{_libdir}/R/library/boot/po/
+%lang(en) %{_libdir}/R/library/boot/po/en*/
+%lang(fr) %{_libdir}/R/library/boot/po/fr/
+%lang(ru) %{_libdir}/R/library/boot/po/ru/
+%{_libdir}/R/library/boot/R/
+%{_libdir}/R/library/boot/R-ex/
+# class
+%dir %{_libdir}/R/library/class/
+%{_libdir}/R/library/class/CITATION
+%{_libdir}/R/library/class/CONTENTS
+%{_libdir}/R/library/class/DESCRIPTION
+%{_libdir}/R/library/class/help/
+%{_libdir}/R/library/class/html/
+%{_libdir}/R/library/class/INDEX
+%{_libdir}/R/library/class/latex/
+%{_libdir}/R/library/class/libs/
+%{_libdir}/R/library/class/LICENCE
+%{_libdir}/R/library/class/man/
+%{_libdir}/R/library/class/Meta/
+%{_libdir}/R/library/class/NAMESPACE
+%{_libdir}/R/library/class/NEWS
+%dir %{_libdir}/R/library/class/po/
+%lang(en) %{_libdir}/R/library/class/po/en*/
+%lang(fr) %{_libdir}/R/library/class/po/fr/
+%{_libdir}/R/library/class/R/
+%{_libdir}/R/library/class/R-ex/
+# cluster
+%dir %{_libdir}/R/library/cluster/
+%{_libdir}/R/library/cluster/CITATION
+%{_libdir}/R/library/cluster/CONTENTS
+%{_libdir}/R/library/cluster/data/
+%{_libdir}/R/library/cluster/DESCRIPTION
+%{_libdir}/R/library/cluster/help/
+%{_libdir}/R/library/cluster/html/
+%{_libdir}/R/library/cluster/INDEX
+%{_libdir}/R/library/cluster/latex/
+%{_libdir}/R/library/cluster/libs/
+%{_libdir}/R/library/cluster/man/
+%{_libdir}/R/library/cluster/Meta/
+%{_libdir}/R/library/cluster/NAMESPACE
+%{_libdir}/R/library/cluster/R/
+%{_libdir}/R/library/cluster/R-ex/
+# codetools
+%dir %{_libdir}/R/library/codetools/
+%{_libdir}/R/library/codetools/CONTENTS
+%{_libdir}/R/library/codetools/DESCRIPTION
+%{_libdir}/R/library/codetools/help/
+%{_libdir}/R/library/codetools/html/
+%{_libdir}/R/library/codetools/INDEX
+%{_libdir}/R/library/codetools/latex/
+%{_libdir}/R/library/codetools/man/
+%{_libdir}/R/library/codetools/Meta/
+%{_libdir}/R/library/codetools/NAMESPACE
+%{_libdir}/R/library/codetools/R/
+%{_libdir}/R/library/codetools/R-ex/
+# datasets
+%dir %{_libdir}/R/library/datasets/
+%{_libdir}/R/library/datasets/CONTENTS
+%{_libdir}/R/library/datasets/data/
+%{_libdir}/R/library/datasets/DESCRIPTION
+%{_libdir}/R/library/datasets/help/
+%{_libdir}/R/library/datasets/html/
+%{_libdir}/R/library/datasets/INDEX
+%{_libdir}/R/library/datasets/latex/
+%{_libdir}/R/library/datasets/man/
+%{_libdir}/R/library/datasets/Meta/
+%{_libdir}/R/library/datasets/R/
+%{_libdir}/R/library/datasets/R-ex/
+# foreign
+%dir %{_libdir}/R/library/foreign/
+%{_libdir}/R/library/foreign/CONTENTS
+%{_libdir}/R/library/foreign/COPYING
+%{_libdir}/R/library/foreign/DESCRIPTION
+%{_libdir}/R/library/foreign/files/
+%{_libdir}/R/library/foreign/help/
+%{_libdir}/R/library/foreign/html/
+%{_libdir}/R/library/foreign/INDEX
+%{_libdir}/R/library/foreign/latex/
+%{_libdir}/R/library/foreign/libs/
+%{_libdir}/R/library/foreign/LICENCE
+%{_libdir}/R/library/foreign/man/
+%{_libdir}/R/library/foreign/Meta/
+%{_libdir}/R/library/foreign/NAMESPACE
+%dir %{_libdir}/R/library/foreign/po/
+%lang(en) %{_libdir}/R/library/foreign/po/en*/
+%lang(fr) %{_libdir}/R/library/foreign/po/fr/
+%{_libdir}/R/library/foreign/R/
+%{_libdir}/R/library/foreign/R-ex/
+# graphics
+%dir %{_libdir}/R/library/graphics/
+%{_libdir}/R/library/graphics/CONTENTS
+%{_libdir}/R/library/graphics/demo/
+%{_libdir}/R/library/graphics/DESCRIPTION
+%{_libdir}/R/library/graphics/help/
+%{_libdir}/R/library/graphics/html/
+%{_libdir}/R/library/graphics/INDEX
+%{_libdir}/R/library/graphics/latex/
+%{_libdir}/R/library/graphics/man/
+%{_libdir}/R/library/graphics/Meta/
+%{_libdir}/R/library/graphics/NAMESPACE
+%dir %{_libdir}/R/library/graphics/po/
+%lang(de) %{_libdir}/R/library/graphics/po/de/
+%lang(en) %{_libdir}/R/library/graphics/po/en*/
+%lang(fr) %{_libdir}/R/library/graphics/po/fr/
+%lang(it) %{_libdir}/R/library/graphics/po/it/
+%lang(ja) %{_libdir}/R/library/graphics/po/ja/
+%lang(ko) %{_libdir}/R/library/graphics/po/ko/
+%lang(ru) %{_libdir}/R/library/graphics/po/ru/
+%lang(zh) %{_libdir}/R/library/graphics/po/zh*/
+%{_libdir}/R/library/graphics/R/
+%{_libdir}/R/library/graphics/R-ex/
+# grDevices
+%dir %{_libdir}/R/library/grDevices
+%{_libdir}/R/library/grDevices/afm/
+%{_libdir}/R/library/grDevices/CONTENTS
+%{_libdir}/R/library/grDevices/DESCRIPTION
+%{_libdir}/R/library/grDevices/enc/
+%{_libdir}/R/library/grDevices/help/
+%{_libdir}/R/library/grDevices/html/
+%{_libdir}/R/library/grDevices/INDEX
+%{_libdir}/R/library/grDevices/latex/
+%{_libdir}/R/library/grDevices/libs/
+%{_libdir}/R/library/grDevices/man/
+%{_libdir}/R/library/grDevices/Meta/
+%{_libdir}/R/library/grDevices/NAMESPACE
+%dir %{_libdir}/R/library/grDevices/po/
+%lang(de) %{_libdir}/R/library/grDevices/po/de/
+%lang(en) %{_libdir}/R/library/grDevices/po/en*/
+%lang(fr) %{_libdir}/R/library/grDevices/po/fr/
+%lang(it) %{_libdir}/R/library/grDevices/po/it/
+%lang(ja) %{_libdir}/R/library/grDevices/po/ja/
+%lang(ko) %{_libdir}/R/library/grDevices/po/ko/
+%lang(ru) %{_libdir}/R/library/grDevices/po/ru/
+%lang(zh) %{_libdir}/R/library/grDevices/po/zh*/
+%{_libdir}/R/library/grDevices/R/
+%{_libdir}/R/library/grDevices/R-ex/
+# grid
+%dir %{_libdir}/R/library/grid/
+%{_libdir}/R/library/grid/CONTENTS
+%{_libdir}/R/library/grid/DESCRIPTION
+%{_libdir}/R/library/grid/doc/
+%{_libdir}/R/library/grid/help/
+%{_libdir}/R/library/grid/html/
+%{_libdir}/R/library/grid/INDEX
+%{_libdir}/R/library/grid/latex/
+%{_libdir}/R/library/grid/libs/
+%{_libdir}/R/library/grid/man/
+%{_libdir}/R/library/grid/Meta/
+%{_libdir}/R/library/grid/NAMESPACE
+%dir %{_libdir}/R/library/grid/po/
+%lang(de) %{_libdir}/R/library/grid/po/de/
+%lang(en) %{_libdir}/R/library/grid/po/en*/
+%lang(fr) %{_libdir}/R/library/grid/po/fr*/
+%lang(it) %{_libdir}/R/library/grid/po/it/
+%lang(ja) %{_libdir}/R/library/grid/po/ja/
+%lang(ko) %{_libdir}/R/library/grid/po/ko/
+%lang(pt) %{_libdir}/R/library/grid/po/pt*/
+%lang(ru) %{_libdir}/R/library/grid/po/ru/
+%lang(zh) %{_libdir}/R/library/grid/po/zh*/
+%{_libdir}/R/library/grid/R/
+%{_libdir}/R/library/grid/R-ex/
+# KernSmooth
+%dir %{_libdir}/R/library/KernSmooth/
+%{_libdir}/R/library/KernSmooth/CONTENTS
+%{_libdir}/R/library/KernSmooth/DESCRIPTION
+%{_libdir}/R/library/KernSmooth/help/
+%{_libdir}/R/library/KernSmooth/html/
+%{_libdir}/R/library/KernSmooth/INDEX
+%{_libdir}/R/library/KernSmooth/latex/
+%{_libdir}/R/library/KernSmooth/libs/
+%{_libdir}/R/library/KernSmooth/LICENCE
+%{_libdir}/R/library/KernSmooth/man/
+%{_libdir}/R/library/KernSmooth/Meta/
+%{_libdir}/R/library/KernSmooth/NAMESPACE
+%{_libdir}/R/library/KernSmooth/R/
+%{_libdir}/R/library/KernSmooth/R-ex/
+# lattice
+%dir %{_libdir}/R/library/lattice/
+%{_libdir}/R/library/lattice/CONTENTS
+%{_libdir}/R/library/lattice/COPYING
+%{_libdir}/R/library/lattice/data/
+%{_libdir}/R/library/lattice/demo/
+%{_libdir}/R/library/lattice/DESCRIPTION
+%{_libdir}/R/library/lattice/help/
+%{_libdir}/R/library/lattice/html/
+%{_libdir}/R/library/lattice/INDEX
+%{_libdir}/R/library/lattice/latex/
+%{_libdir}/R/library/lattice/libs/
+%{_libdir}/R/library/lattice/man/
+%{_libdir}/R/library/lattice/Meta/
+%{_libdir}/R/library/lattice/NAMESPACE
+%{_libdir}/R/library/lattice/NEWS
+%{_libdir}/R/library/lattice/R/
+%{_libdir}/R/library/lattice/R-ex/
+# MASS
+%dir %{_libdir}/R/library/MASS/
+%{_libdir}/R/library/MASS/CITATION
+%{_libdir}/R/library/MASS/CONTENTS
+%{_libdir}/R/library/MASS/data/
+%{_libdir}/R/library/MASS/DESCRIPTION
+%{_libdir}/R/library/MASS/help/
+%{_libdir}/R/library/MASS/html/
+%{_libdir}/R/library/MASS/INDEX
+%{_libdir}/R/library/MASS/latex/
+%{_libdir}/R/library/MASS/libs/
+%{_libdir}/R/library/MASS/LICENCE
+%{_libdir}/R/library/MASS/man/
+%{_libdir}/R/library/MASS/Meta/
+%{_libdir}/R/library/MASS/NAMESPACE
+%{_libdir}/R/library/MASS/NEWS
+%dir %{_libdir}/R/library/MASS/po
+%lang(en) %{_libdir}/R/library/MASS/po/en*/
+%lang(fr) %{_libdir}/R/library/MASS/po/fr/
+%{_libdir}/R/library/MASS/R/
+%{_libdir}/R/library/MASS/R-ex/
+%{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
+# methods
+%dir %{_libdir}/R/library/methods/
+%{_libdir}/R/library/methods/CONTENTS
+%{_libdir}/R/library/methods/DESCRIPTION
+%{_libdir}/R/library/methods/help/
+%{_libdir}/R/library/methods/html/
+%{_libdir}/R/library/methods/INDEX
+%{_libdir}/R/library/methods/latex/
+%{_libdir}/R/library/methods/libs/
+%{_libdir}/R/library/methods/man/
+%{_libdir}/R/library/methods/Meta/
+%{_libdir}/R/library/methods/NAMESPACE
+%dir %{_libdir}/R/library/methods/po/
+%lang(de) %{_libdir}/R/library/methods/po/de/
+%lang(en) %{_libdir}/R/library/methods/po/en*/
+%lang(fr) %{_libdir}/R/library/methods/po/fr/
+%lang(ja) %{_libdir}/R/library/methods/po/ja/
+%lang(ko) %{_libdir}/R/library/methods/po/ko/
+%lang(pt) %{_libdir}/R/library/methods/po/pt*/
+%lang(ru) %{_libdir}/R/library/methods/po/ru/
+%lang(zh) %{_libdir}/R/library/methods/po/zh*/
+%{_libdir}/R/library/methods/R/
+%{_libdir}/R/library/methods/R-ex/
+# mgcv
+%dir %{_libdir}/R/library/mgcv/
+%{_libdir}/R/library/mgcv/CITATION
+%{_libdir}/R/library/mgcv/CONTENTS
+%{_libdir}/R/library/mgcv/DESCRIPTION
+%{_libdir}/R/library/mgcv/help/
+%{_libdir}/R/library/mgcv/html/
+%{_libdir}/R/library/mgcv/INDEX
+%{_libdir}/R/library/mgcv/latex/
+%{_libdir}/R/library/mgcv/libs/
+%{_libdir}/R/library/mgcv/man/
+%{_libdir}/R/library/mgcv/Meta/
+%{_libdir}/R/library/mgcv/NAMESPACE
+%{_libdir}/R/library/mgcv/R/
+%{_libdir}/R/library/mgcv/R-ex/
+# nlme
+%dir %{_libdir}/R/library/nlme/
+%{_libdir}/R/library/nlme/CITATION
+%{_libdir}/R/library/nlme/CONTENTS
+%{_libdir}/R/library/nlme/COPYING
+%{_libdir}/R/library/nlme/data/
+%{_libdir}/R/library/nlme/DESCRIPTION
+%{_libdir}/R/library/nlme/help/
+%{_libdir}/R/library/nlme/html/
+%{_libdir}/R/library/nlme/INDEX
+%{_libdir}/R/library/nlme/latex/
+%{_libdir}/R/library/nlme/libs/
+%{_libdir}/R/library/nlme/LICENCE
+%{_libdir}/R/library/nlme/man/
+%{_libdir}/R/library/nlme/Meta/
+%{_libdir}/R/library/nlme/mlbook/
+%{_libdir}/R/library/nlme/NAMESPACE
+%dir %{_libdir}/R/library/nlme/po/
+%lang(en) %{_libdir}/R/library/nlme/po/en*/
+%lang(fr) %{_libdir}/R/library/nlme/po/fr/
+%{_libdir}/R/library/nlme/R/
+%{_libdir}/R/library/nlme/R-ex/
+%{_libdir}/R/library/nlme/scripts/
+# nnet
+%dir %{_libdir}/R/library/nnet/
+%{_libdir}/R/library/nnet/CITATION
+%{_libdir}/R/library/nnet/CONTENTS
+%{_libdir}/R/library/nnet/DESCRIPTION
+%{_libdir}/R/library/nnet/help/
+%{_libdir}/R/library/nnet/html/
+%{_libdir}/R/library/nnet/INDEX
+%{_libdir}/R/library/nnet/latex/
+%{_libdir}/R/library/nnet/libs/
+%{_libdir}/R/library/nnet/LICENCE
+%{_libdir}/R/library/nnet/man/
+%{_libdir}/R/library/nnet/Meta/
+%{_libdir}/R/library/nnet/NAMESPACE
+%{_libdir}/R/library/nnet/NEWS
+%dir %{_libdir}/R/library/nnet/po
+%lang(en) %{_libdir}/R/library/nnet/po/en*/
+%lang(fr) %{_libdir}/R/library/nnet/po/fr/
+%{_libdir}/R/library/nnet/R/
+%{_libdir}/R/library/nnet/R-ex/
+# rpart
+%dir %{_libdir}/R/library/rpart/
+%{_libdir}/R/library/rpart/CONTENTS
+%{_libdir}/R/library/rpart/data/
+%{_libdir}/R/library/rpart/DESCRIPTION
+%{_libdir}/R/library/rpart/help/
+%{_libdir}/R/library/rpart/html/
+%{_libdir}/R/library/rpart/INDEX
+%{_libdir}/R/library/rpart/latex/
+%{_libdir}/R/library/rpart/libs/
+%{_libdir}/R/library/rpart/LICENCE
+%{_libdir}/R/library/rpart/man/
+%{_libdir}/R/library/rpart/Meta/
+%{_libdir}/R/library/rpart/NAMESPACE
+%dir %{_libdir}/R/library/rpart/po
+%lang(en) %{_libdir}/R/library/rpart/po/en*/
+%lang(fr) %{_libdir}/R/library/rpart/po/fr/
+%lang(ru) %{_libdir}/R/library/rpart/po/ru/
+%{_libdir}/R/library/rpart/R/
+%{_libdir}/R/library/rpart/R-ex/
+# spatial
+%dir %{_libdir}/R/library/spatial/
+%{_libdir}/R/library/spatial/CITATION
+%{_libdir}/R/library/spatial/CONTENTS
+%{_libdir}/R/library/spatial/DESCRIPTION
+%{_libdir}/R/library/spatial/help/
+%{_libdir}/R/library/spatial/html/
+%{_libdir}/R/library/spatial/INDEX
+%{_libdir}/R/library/spatial/latex/
+%{_libdir}/R/library/spatial/libs/
+%{_libdir}/R/library/spatial/LICENCE
+%{_libdir}/R/library/spatial/man/
+%{_libdir}/R/library/spatial/Meta/
+%{_libdir}/R/library/spatial/NAMESPACE
+%{_libdir}/R/library/spatial/NEWS
+%dir %{_libdir}/R/library/spatial/po
+%lang(en) %{_libdir}/R/library/spatial/po/en*/
+%lang(fr) %{_libdir}/R/library/spatial/po/fr/
+%{_libdir}/R/library/spatial/ppdata/
+%{_libdir}/R/library/spatial/PP.files
+%{_libdir}/R/library/spatial/R/
+%{_libdir}/R/library/spatial/R-ex/
+# splines
+%dir %{_libdir}/R/library/splines/
+%{_libdir}/R/library/splines/CONTENTS
+%{_libdir}/R/library/splines/DESCRIPTION
+%{_libdir}/R/library/splines/help/
+%{_libdir}/R/library/splines/html/
+%{_libdir}/R/library/splines/INDEX
+%{_libdir}/R/library/splines/latex/
+%{_libdir}/R/library/splines/libs/
+%{_libdir}/R/library/splines/man/
+%{_libdir}/R/library/splines/Meta/
+%{_libdir}/R/library/splines/NAMESPACE
+%dir %{_libdir}/R/library/splines/po
+%lang(de) %{_libdir}/R/library/splines/po/de/
+%lang(en) %{_libdir}/R/library/splines/po/en*/
+%lang(fr) %{_libdir}/R/library/splines/po/fr/
+%lang(ja) %{_libdir}/R/library/splines/po/ja/
+%lang(ko) %{_libdir}/R/library/splines/po/ko/
+%lang(pt) %{_libdir}/R/library/splines/po/pt*/
+%lang(ru) %{_libdir}/R/library/splines/po/ru/
+%lang(zh) %{_libdir}/R/library/splines/po/zh*/
+%{_libdir}/R/library/splines/R/
+%{_libdir}/R/library/splines/R-ex/
+# stats
+%dir %{_libdir}/R/library/stats/
+%{_libdir}/R/library/stats/CONTENTS
+%{_libdir}/R/library/stats/COPYRIGHTS.modreg
+%{_libdir}/R/library/stats/demo/
+%{_libdir}/R/library/stats/DESCRIPTION
+%{_libdir}/R/library/stats/help/
+%{_libdir}/R/library/stats/html/
+%{_libdir}/R/library/stats/INDEX
+%{_libdir}/R/library/stats/latex/
+%{_libdir}/R/library/stats/libs/
+%{_libdir}/R/library/stats/man/
+%{_libdir}/R/library/stats/Meta/
+%{_libdir}/R/library/stats/NAMESPACE
+%dir %{_libdir}/R/library/stats/po
+%lang(de) %{_libdir}/R/library/stats/po/de/
+%lang(en) %{_libdir}/R/library/stats/po/en*/
+%lang(fr) %{_libdir}/R/library/stats/po/fr/
+%lang(it) %{_libdir}/R/library/stats/po/it/
+%lang(ja) %{_libdir}/R/library/stats/po/ja/
+%lang(ko) %{_libdir}/R/library/stats/po/ko/
+%lang(pt) %{_libdir}/R/library/stats/po/pt*/
+%lang(ru) %{_libdir}/R/library/stats/po/ru/
+%lang(zh) %{_libdir}/R/library/stats/po/zh*/
+%{_libdir}/R/library/stats/R/
+%{_libdir}/R/library/stats/R-ex/
+%{_libdir}/R/library/stats/SOURCES.ts
+# stats4
+%dir %{_libdir}/R/library/stats4/
+%{_libdir}/R/library/stats4/CONTENTS
+%{_libdir}/R/library/stats4/DESCRIPTION
+%{_libdir}/R/library/stats4/help/
+%{_libdir}/R/library/stats4/html/
+%{_libdir}/R/library/stats4/INDEX
+%{_libdir}/R/library/stats4/latex/
+%{_libdir}/R/library/stats4/man/
+%{_libdir}/R/library/stats4/Meta/
+%{_libdir}/R/library/stats4/NAMESPACE
+%dir %{_libdir}/R/library/stats4/po
+%lang(de) %{_libdir}/R/library/stats4/po/de/
+%lang(en) %{_libdir}/R/library/stats4/po/en*/
+%lang(fr) %{_libdir}/R/library/stats4/po/fr/
+%lang(it) %{_libdir}/R/library/stats4/po/it/
+%lang(ja) %{_libdir}/R/library/stats4/po/ja/
+%lang(ko) %{_libdir}/R/library/stats4/po/ko/
+%lang(pt) %{_libdir}/R/library/stats4/po/pt*/
+%lang(ru) %{_libdir}/R/library/stats4/po/ru/
+%lang(zh) %{_libdir}/R/library/stats4/po/zh*/
+%{_libdir}/R/library/stats4/R/
+%{_libdir}/R/library/stats4/R-ex/
+# survival
+%dir %{_libdir}/R/library/survival/
+%{_libdir}/R/library/survival/CONTENTS
+%{_libdir}/R/library/survival/COPYING
+%{_libdir}/R/library/survival/data/
+%{_libdir}/R/library/survival/DESCRIPTION
+%{_libdir}/R/library/survival/help/
+%{_libdir}/R/library/survival/html/
+%{_libdir}/R/library/survival/INDEX
+%{_libdir}/R/library/survival/latex/
+%{_libdir}/R/library/survival/libs/
+%{_libdir}/R/library/survival/man/
+%{_libdir}/R/library/survival/Meta/
+%{_libdir}/R/library/survival/NAMESPACE
+%{_libdir}/R/library/survival/R/
+%{_libdir}/R/library/survival/R-ex/
+# tcltk
+%dir %{_libdir}/R/library/tcltk/
+%{_libdir}/R/library/tcltk/CONTENTS
+%{_libdir}/R/library/tcltk/demo/
+%{_libdir}/R/library/tcltk/DESCRIPTION
+%{_libdir}/R/library/tcltk/exec/
+%{_libdir}/R/library/tcltk/help/
+%{_libdir}/R/library/tcltk/html/
+%{_libdir}/R/library/tcltk/INDEX
+%{_libdir}/R/library/tcltk/latex/
+%{_libdir}/R/library/tcltk/libs/
+%{_libdir}/R/library/tcltk/man/
+%{_libdir}/R/library/tcltk/Meta/
+%{_libdir}/R/library/tcltk/NAMESPACE
+%dir %{_libdir}/R/library/tcltk/po/
+%lang(de) %{_libdir}/R/library/tcltk/po/de/
+%lang(en) %{_libdir}/R/library/tcltk/po/en*/
+%lang(fr) %{_libdir}/R/library/tcltk/po/fr/
+%lang(it) %{_libdir}/R/library/tcltk/po/it/
+%lang(ja) %{_libdir}/R/library/tcltk/po/ja/
+%lang(ko) %{_libdir}/R/library/tcltk/po/ko/
+%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/
+%lang(ru) %{_libdir}/R/library/tcltk/po/ru/
+%lang(zh) %{_libdir}/R/library/tcltk/po/zh*/
+%{_libdir}/R/library/tcltk/R/
+%{_libdir}/R/library/tcltk/R-ex/
+# tools
+%dir %{_libdir}/R/library/tools/
+%{_libdir}/R/library/tools/CONTENTS
+%{_libdir}/R/library/tools/DESCRIPTION
+%{_libdir}/R/library/tools/help/
+%{_libdir}/R/library/tools/html/
+%{_libdir}/R/library/tools/INDEX
+%{_libdir}/R/library/tools/latex/
+%{_libdir}/R/library/tools/libs/
+%{_libdir}/R/library/tools/man/
+%{_libdir}/R/library/tools/Meta/
+%{_libdir}/R/library/tools/NAMESPACE
+%dir %{_libdir}/R/library/tools/po
+%lang(de) %{_libdir}/R/library/tools/po/de/
+%lang(en) %{_libdir}/R/library/tools/po/en*/
+%lang(fr) %{_libdir}/R/library/tools/po/fr/
+%lang(it) %{_libdir}/R/library/tools/po/it/
+%lang(ja) %{_libdir}/R/library/tools/po/ja/
+%lang(ko) %{_libdir}/R/library/tools/po/ko/
+%lang(pt) %{_libdir}/R/library/tools/po/pt*/
+%lang(ru) %{_libdir}/R/library/tools/po/ru/
+%lang(zh) %{_libdir}/R/library/tools/po/zh*/
+%{_libdir}/R/library/tools/R/
+%{_libdir}/R/library/tools/R-ex/
+# utils
+%dir %{_libdir}/R/library/utils/
+%{_libdir}/R/library/utils/CONTENTS
+%{_libdir}/R/library/utils/DESCRIPTION
+%{_libdir}/R/library/utils/help/
+%{_libdir}/R/library/utils/html/
+%{_libdir}/R/library/utils/iconvlist
+%{_libdir}/R/library/utils/INDEX
+%{_libdir}/R/library/utils/latex/
+%{_libdir}/R/library/utils/man/
+%{_libdir}/R/library/utils/Meta/
+%{_libdir}/R/library/utils/misc/
+%{_libdir}/R/library/utils/NAMESPACE
+%dir %{_libdir}/R/library/utils/po
+%lang(de) %{_libdir}/R/library/utils/po/de/
+%lang(en) %{_libdir}/R/library/utils/po/en*/
+%lang(fr) %{_libdir}/R/library/utils/po/fr/
+%lang(ja) %{_libdir}/R/library/utils/po/ja/
+%lang(ko) %{_libdir}/R/library/utils/po/ko/
+%lang(ru) %{_libdir}/R/library/utils/po/ru/
+%lang(zh) %{_libdir}/R/library/utils/po/zh*/
+%{_libdir}/R/library/utils/R/
+%{_libdir}/R/library/utils/R-ex/
+%{_libdir}/R/library/utils/Sweave/
 %{_libdir}/R/modules
 %{_libdir}/R/COPYING
 %{_libdir}/R/NEWS
@@ -316,20 +908,42 @@
    done
 fi
 
-%postun core
-/sbin/ldconfig
+%postun core -p /sbin/ldconfig
 
-%post -n libRmath
-/sbin/ldconfig
+%post -n libRmath -p /sbin/ldconfig
 
-%postun -n libRmath
-/sbin/ldconfig
+%postun -n libRmath -p /sbin/ldconfig
 
 %changelog
-* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-3
-- fix R-make-search-index.sh (bz 487022)
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+- EL-5 version, no java subpackages
+
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
+- drop profile.d scripts, they broke more than they fixed
+- minimize hard-coded Requires based on Martyn Plummer's analysis
+
+* Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
+- fix profile scripts for situation where R_HOME is already defined
+  (bugzilla 492706)
+
+* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-7
+- bump for new tag
+
+* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-6
+- add profile.d scripts to set R_HOME 
+- rpmlint cleanups
+
+* Mon Mar 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-5
+- add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules 
+  to build/install
+
+* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-4
 - update post scriptlet (bz 477076)
 
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
 - fix libRmath requires to need V-R (thanks to Martyn Plummer)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Dec 2008 16:27:48 -0000	1.17
+++ sources	17 Apr 2009 20:12:42 -0000	1.18
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:13:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:13:12 +0000 (UTC)
Subject: rpms/R/F-10 R.spec,1.58,1.59 sources,1.21,1.22
Message-ID: <20090417201312.CCCE77012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/F-10

Modified Files:
	R.spec sources 
Log Message:
2.9.0


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/R.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- R.spec	7 Apr 2009 18:07:05 -0000	1.58
+++ R.spec	17 Apr 2009 20:12:42 -0000	1.59
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 9%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -51,7 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
-Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -59,7 +59,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -69,8 +69,9 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -78,7 +79,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -562,6 +563,27 @@
 %{_libdir}/R/library/MASS/R/
 %{_libdir}/R/library/MASS/R-ex/
 %{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
 # methods
 %dir %{_libdir}/R/library/methods/
 %{_libdir}/R/library/methods/CONTENTS
@@ -774,7 +796,6 @@
 %{_libdir}/R/library/survival/NAMESPACE
 %{_libdir}/R/library/survival/R/
 %{_libdir}/R/library/survival/R-ex/
-%{_libdir}/R/library/survival/survival.ps*
 # tcltk
 %dir %{_libdir}/R/library/tcltk/
 %{_libdir}/R/library/tcltk/CONTENTS
@@ -953,6 +974,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+
 * Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
 - drop profile.d scripts, they broke more than they fixed
 - minimize hard-coded Requires based on Martyn Plummer's analysis


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Dec 2008 16:27:49 -0000	1.21
+++ sources	17 Apr 2009 20:12:42 -0000	1.22
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:13:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:13:13 +0000 (UTC)
Subject: rpms/R/F-11 R.spec,1.59,1.60 sources,1.21,1.22
Message-ID: <20090417201313.214DD7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/F-11

Modified Files:
	R.spec sources 
Log Message:
2.9.0


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/R.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- R.spec	7 Apr 2009 18:07:05 -0000	1.59
+++ R.spec	17 Apr 2009 20:12:42 -0000	1.60
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 9%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -51,7 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
-Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -59,7 +59,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -69,8 +69,9 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -78,7 +79,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -562,6 +563,27 @@
 %{_libdir}/R/library/MASS/R/
 %{_libdir}/R/library/MASS/R-ex/
 %{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
 # methods
 %dir %{_libdir}/R/library/methods/
 %{_libdir}/R/library/methods/CONTENTS
@@ -774,7 +796,6 @@
 %{_libdir}/R/library/survival/NAMESPACE
 %{_libdir}/R/library/survival/R/
 %{_libdir}/R/library/survival/R-ex/
-%{_libdir}/R/library/survival/survival.ps*
 # tcltk
 %dir %{_libdir}/R/library/tcltk/
 %{_libdir}/R/library/tcltk/CONTENTS
@@ -953,6 +974,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+
 * Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
 - drop profile.d scripts, they broke more than they fixed
 - minimize hard-coded Requires based on Martyn Plummer's analysis


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Dec 2008 16:27:50 -0000	1.21
+++ sources	17 Apr 2009 20:12:42 -0000	1.22
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:13:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:13:13 +0000 (UTC)
Subject: rpms/R/F-9 R.spec,1.57,1.58 sources,1.21,1.22
Message-ID: <20090417201313.AEB0C7012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/F-9

Modified Files:
	R.spec sources 
Log Message:
2.9.0


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- R.spec	7 Apr 2009 18:07:05 -0000	1.57
+++ R.spec	17 Apr 2009 20:12:43 -0000	1.58
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 9%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -51,7 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
-Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -59,7 +59,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -69,8 +69,9 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -78,7 +79,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -562,6 +563,27 @@
 %{_libdir}/R/library/MASS/R/
 %{_libdir}/R/library/MASS/R-ex/
 %{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
 # methods
 %dir %{_libdir}/R/library/methods/
 %{_libdir}/R/library/methods/CONTENTS
@@ -774,7 +796,6 @@
 %{_libdir}/R/library/survival/NAMESPACE
 %{_libdir}/R/library/survival/R/
 %{_libdir}/R/library/survival/R-ex/
-%{_libdir}/R/library/survival/survival.ps*
 # tcltk
 %dir %{_libdir}/R/library/tcltk/
 %{_libdir}/R/library/tcltk/CONTENTS
@@ -953,6 +974,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+
 * Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
 - drop profile.d scripts, they broke more than they fixed
 - minimize hard-coded Requires based on Martyn Plummer's analysis


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Dec 2008 16:27:49 -0000	1.21
+++ sources	17 Apr 2009 20:12:43 -0000	1.22
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:13:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:13:13 +0000 (UTC)
Subject: rpms/R/devel .cvsignore, 1.19, 1.20 R.spec, 1.59, 1.60 sources, 1.21,
	1.22
Message-ID: <20090417201313.EEDFE7013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:
2.9.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Dec 2008 16:27:50 -0000	1.19
+++ .cvsignore	17 Apr 2009 20:12:43 -0000	1.20
@@ -1 +1 @@
-R-2.8.1.tar.gz
+R-2.9.0.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- R.spec	7 Apr 2009 18:07:05 -0000	1.59
+++ R.spec	17 Apr 2009 20:12:43 -0000	1.60
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 9%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -51,7 +51,7 @@
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
-Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -59,7 +59,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -69,8 +69,9 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -78,7 +79,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -562,6 +563,27 @@
 %{_libdir}/R/library/MASS/R/
 %{_libdir}/R/library/MASS/R-ex/
 %{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
 # methods
 %dir %{_libdir}/R/library/methods/
 %{_libdir}/R/library/methods/CONTENTS
@@ -774,7 +796,6 @@
 %{_libdir}/R/library/survival/NAMESPACE
 %{_libdir}/R/library/survival/R/
 %{_libdir}/R/library/survival/R-ex/
-%{_libdir}/R/library/survival/survival.ps*
 # tcltk
 %dir %{_libdir}/R/library/tcltk/
 %{_libdir}/R/library/tcltk/CONTENTS
@@ -953,6 +974,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+
 * Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-9
 - drop profile.d scripts, they broke more than they fixed
 - minimize hard-coded Requires based on Martyn Plummer's analysis


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Dec 2008 16:27:50 -0000	1.21
+++ sources	17 Apr 2009 20:12:43 -0000	1.22
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz



From spot at fedoraproject.org  Fri Apr 17 20:18:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:18:36 +0000 (UTC)
Subject: rpms/rpy/F-10 rpy.spec,1.36,1.37
Message-ID: <20090417201836.282CA7012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27248/F-10

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.0


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-10/rpy.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rpy.spec	22 Dec 2008 16:29:11 -0000	1.36
+++ rpy.spec	17 Apr 2009 20:18:05 -0000	1.37
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.8.1
+%define rver   2.9.0
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       1.0.3
-Release:       6%{?dist}
+Release:       8%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:       GPLv2+
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-8
+- rebuild for R 2.9.0
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-6
 - rebuild for R 2.8.1
 



From spot at fedoraproject.org  Fri Apr 17 20:18:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:18:36 +0000 (UTC)
Subject: rpms/rpy/F-11 rpy.spec,1.39,1.40
Message-ID: <20090417201836.33E0D70137@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27248/F-11

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.0


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/rpy.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpy.spec	24 Mar 2009 01:53:10 -0000	1.39
+++ rpy.spec	17 Apr 2009 20:18:05 -0000	1.40
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.8.1
+%define rver   2.9.0
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -45,6 +45,9 @@
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-2
+- rebuild for R 2.9.0
+
 * Fri Mar 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-1
 - update to rpy2 2.0.3
 



From spot at fedoraproject.org  Fri Apr 17 20:18:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:18:36 +0000 (UTC)
Subject: rpms/rpy/F-9 rpy.spec,1.36,1.37
Message-ID: <20090417201836.6D7717012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27248/F-9

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.0


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-9/rpy.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rpy.spec	22 Dec 2008 16:29:12 -0000	1.36
+++ rpy.spec	17 Apr 2009 20:18:06 -0000	1.37
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.8.1
+%define rver   2.9.0
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       1.0.3
-Release:       6%{?dist}
+Release:       8%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:       GPLv2+
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-8
+- rebuild for R 2.9.0
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-6
 - rebuild for R 2.8.1
 



From spot at fedoraproject.org  Fri Apr 17 20:18:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 17 Apr 2009 20:18:36 +0000 (UTC)
Subject: rpms/rpy/devel rpy.spec,1.39,1.40
Message-ID: <20090417201836.AF1507012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27248/devel

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.0


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpy.spec	24 Mar 2009 01:53:10 -0000	1.39
+++ rpy.spec	17 Apr 2009 20:18:06 -0000	1.40
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.8.1
+%define rver   2.9.0
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -45,6 +45,9 @@
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-2
+- rebuild for R 2.9.0
+
 * Fri Mar 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-1
 - update to rpy2 2.0.3
 



From vpv at fedoraproject.org  Fri Apr 17 20:21:26 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Fri, 17 Apr 2009 20:21:26 +0000 (UTC)
Subject: rpms/libvoikko/F-11 .cvsignore, 1.13, 1.14 libvoikko.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <20090417202126.A11077012B@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27921

Modified Files:
	.cvsignore libvoikko.spec sources 
Log Message:
* Fri Apr 17 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.5.rc4
- 2.1rc4:
  - Fix invalid use of delete vs. delete[]
  - Limit the scope of some variables



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Apr 2009 12:12:46 -0000	1.13
+++ .cvsignore	17 Apr 2009 20:20:56 -0000	1.14
@@ -1 +1 @@
-libvoikko-2.1rc3.tar.gz
+libvoikko-2.1rc4.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-11/libvoikko.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvoikko.spec	13 Apr 2009 12:12:46 -0000	1.22
+++ libvoikko.spec	17 Apr 2009 20:20:56 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.1
-Release:        0.4.rc3%{?dist}
+Release:        0.5.rc4%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -9,7 +9,7 @@
 # The usual format of stable release URLs
 #Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc3.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga-devel >= 7.8 python
@@ -96,6 +96,11 @@
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Fri Apr 17 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.5.rc4
+- 2.1rc4:
+  - Fix invalid use of delete vs. delete[]
+  - Limit the scope of some variables
+
 * Mon Apr 13 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.4.rc3
 - 2.1rc3, remove patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Apr 2009 12:12:46 -0000	1.13
+++ sources	17 Apr 2009 20:20:56 -0000	1.14
@@ -1 +1 @@
-828eef05c34c1d536c672e20fe717e11  libvoikko-2.1rc3.tar.gz
+17458bdd150cc02d6071eeda69d4d3db  libvoikko-2.1rc4.tar.gz



From chkr at fedoraproject.org  Fri Apr 17 20:29:10 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Fri, 17 Apr 2009 20:29:10 +0000 (UTC)
Subject: rpms/pianobooster/F-11 import.log, NONE, 1.1 pianobooster.desktop, 
	NONE, 1.1 pianobooster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417202910.217667012B@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29988/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pianobooster.desktop pianobooster.spec 
Log Message:
initial import of pianobooster



--- NEW FILE import.log ---
pianobooster-0_6_2-4_fc12:F-11:pianobooster-0.6.2-4.fc12.src.rpm:1240000062


--- NEW FILE pianobooster.desktop ---
[Desktop Entry]
Name=Piano Booster
Comment=A MIDI file player that teaches you how to play the piano
GenericName=Piano Teacher
Exec=pianobooster
Icon=pianobooster
Terminal=false
Type=Application
Categories=Music;Education;AudioVideo;



--- NEW FILE pianobooster.spec ---
Name:            pianobooster
Summary:         A MIDI file player that teaches you how to play the piano
Version:         0.6.2
Release:         4%{?dist}
License:         GPLv3+
Group:           Applications/Multimedia
URL:             http://pianobooster.sourceforge.net/
Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
Source1:         %{name}.desktop
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:   cmake
BuildRequires:   qt4-devel
BuildRequires:   desktop-file-utils
BuildRequires:   alsa-lib-devel

%description
A MIDI file player/game that displays the musical notes AND teaches you how
to play the piano. 

PianoBooster is a fun way of playing along with a musical accompaniment and
at the same time learning the basics of reading musical notation.
The difference between playing along to a CD or a standard MIDI file
is that PianoBooster listens and reacts to what you are playing on a
MIDI keyboard.


%prep
%setup -q -n %{name}-src-%{version}

sed -e 's|\r||g' README.txt > README.txt.tmp
touch -r README.txt README.txt.tmp
mv README.txt.tmp README.txt

sed -e 's|\r||g' license.txt > license.txt.tmp
touch -r license.txt license.txt.tmp
mv license.txt.tmp license.txt


%build
pushd build
%cmake ../src
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd build
install -d $RPM_BUILD_ROOT/%{_bindir}
install %{name} $RPM_BUILD_ROOT/%{_bindir}
popd

install -d $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
    --dir %{buildroot}%{_datadir}/applications  \
    %{SOURCE1}


install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc license.txt gplv3.txt README.txt
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Fri Apr 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-4
- preserve timestamps of README.txt and license.txt

* Sun Apr 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-3
- use %%{name} macro
- provide .desktop file as separate source1
- use sed instead of dos2unix
- use install -p to preserve the timestamps 
- add GenericName to desktop file
- fix typo in icon installation
- enabled parallel build

* Tue Apr 07 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-2
Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:29:33 -0000	1.1
+++ .cvsignore	17 Apr 2009 20:28:39 -0000	1.2
@@ -0,0 +1 @@
+pianobooster-src-0.6.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:29:33 -0000	1.1
+++ sources	17 Apr 2009 20:28:39 -0000	1.2
@@ -0,0 +1 @@
+b644305e706721af1cba0debcb4390e2  pianobooster-src-0.6.2.tgz



From carllibpst at fedoraproject.org  Fri Apr 17 20:33:08 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 17 Apr 2009 20:33:08 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore, 1.21, 1.22 libpst.spec, 1.20,
	1.21 sources, 1.21, 1.22
Message-ID: <20090417203308.25BD67012B@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31114

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Apr 2009 15:12:43 -0000	1.21
+++ .cvsignore	17 Apr 2009 20:32:37 -0000	1.22
@@ -1 +1 @@
-libpst-0.6.36.tar.gz
+libpst-0.6.37.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/libpst.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libpst.spec	14 Apr 2009 15:12:43 -0000	1.20
+++ libpst.spec	17 Apr 2009 20:32:37 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.36
+Version:            0.6.37
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -125,6 +125,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.37-1
+- add pst_attach_to_mem() back into the shared library interface.
+- fix memory leak caught by valgrind.
+
 * Tue Apr 14 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.36-1
 - build separate -doc and -devel-doc subpackages.
 - other spec file cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Apr 2009 15:12:43 -0000	1.21
+++ sources	17 Apr 2009 20:32:37 -0000	1.22
@@ -1 +1 @@
-97244ec839cc208c6ce647a1ef3f99eb  libpst-0.6.36.tar.gz
+bb53b2b379709ddf12e86670879e17e0  libpst-0.6.37.tar.gz



From chkr at fedoraproject.org  Fri Apr 17 20:33:35 2009
From: chkr at fedoraproject.org (Christian Krause)
Date: Fri, 17 Apr 2009 20:33:35 +0000 (UTC)
Subject: rpms/pianobooster/F-10 import.log, NONE, 1.1 pianobooster.desktop, 
	NONE, 1.1 pianobooster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417203335.8CB417012B@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31286/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pianobooster.desktop pianobooster.spec 
Log Message:
initial import of pianobooster



--- NEW FILE import.log ---
pianobooster-0_6_2-4_fc12:F-10:pianobooster-0.6.2-4.fc12.src.rpm:1240000348


--- NEW FILE pianobooster.desktop ---
[Desktop Entry]
Name=Piano Booster
Comment=A MIDI file player that teaches you how to play the piano
GenericName=Piano Teacher
Exec=pianobooster
Icon=pianobooster
Terminal=false
Type=Application
Categories=Music;Education;AudioVideo;



--- NEW FILE pianobooster.spec ---
Name:            pianobooster
Summary:         A MIDI file player that teaches you how to play the piano
Version:         0.6.2
Release:         4%{?dist}
License:         GPLv3+
Group:           Applications/Multimedia
URL:             http://pianobooster.sourceforge.net/
Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
Source1:         %{name}.desktop
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:   cmake
BuildRequires:   qt4-devel
BuildRequires:   desktop-file-utils
BuildRequires:   alsa-lib-devel

%description
A MIDI file player/game that displays the musical notes AND teaches you how
to play the piano. 

PianoBooster is a fun way of playing along with a musical accompaniment and
at the same time learning the basics of reading musical notation.
The difference between playing along to a CD or a standard MIDI file
is that PianoBooster listens and reacts to what you are playing on a
MIDI keyboard.


%prep
%setup -q -n %{name}-src-%{version}

sed -e 's|\r||g' README.txt > README.txt.tmp
touch -r README.txt README.txt.tmp
mv README.txt.tmp README.txt

sed -e 's|\r||g' license.txt > license.txt.tmp
touch -r license.txt license.txt.tmp
mv license.txt.tmp license.txt


%build
pushd build
%cmake ../src
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd build
install -d $RPM_BUILD_ROOT/%{_bindir}
install %{name} $RPM_BUILD_ROOT/%{_bindir}
popd

install -d $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
    --dir %{buildroot}%{_datadir}/applications  \
    %{SOURCE1}


install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc license.txt gplv3.txt README.txt
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Fri Apr 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-4
- preserve timestamps of README.txt and license.txt

* Sun Apr 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-3
- use %%{name} macro
- provide .desktop file as separate source1
- use sed instead of dos2unix
- use install -p to preserve the timestamps 
- add GenericName to desktop file
- fix typo in icon installation
- enabled parallel build

* Tue Apr 07 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-2
Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2009 04:29:33 -0000	1.1
+++ .cvsignore	17 Apr 2009 20:33:33 -0000	1.2
@@ -0,0 +1 @@
+pianobooster-src-0.6.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2009 04:29:33 -0000	1.1
+++ sources	17 Apr 2009 20:33:34 -0000	1.2
@@ -0,0 +1 @@
+b644305e706721af1cba0debcb4390e2  pianobooster-src-0.6.2.tgz



From carllibpst at fedoraproject.org  Fri Apr 17 20:34:24 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 17 Apr 2009 20:34:24 +0000 (UTC)
Subject: rpms/libpst/F-11 .cvsignore, 1.21, 1.22 libpst.spec, 1.20,
	1.21 sources, 1.21, 1.22
Message-ID: <20090417203424.8FC847012B@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31667

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Apr 2009 15:12:43 -0000	1.21
+++ .cvsignore	17 Apr 2009 20:33:54 -0000	1.22
@@ -1 +1 @@
-libpst-0.6.36.tar.gz
+libpst-0.6.37.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-11/libpst.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libpst.spec	14 Apr 2009 15:12:43 -0000	1.20
+++ libpst.spec	17 Apr 2009 20:33:54 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.36
+Version:            0.6.37
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -125,6 +125,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.37-1
+- add pst_attach_to_mem() back into the shared library interface.
+- fix memory leak caught by valgrind.
+
 * Tue Apr 14 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.36-1
 - build separate -doc and -devel-doc subpackages.
 - other spec file cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Apr 2009 15:12:43 -0000	1.21
+++ sources	17 Apr 2009 20:33:54 -0000	1.22
@@ -1 +1 @@
-97244ec839cc208c6ce647a1ef3f99eb  libpst-0.6.36.tar.gz
+bb53b2b379709ddf12e86670879e17e0  libpst-0.6.37.tar.gz



From kalev at fedoraproject.org  Fri Apr 17 20:34:18 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 17 Apr 2009 20:34:18 +0000 (UTC)
Subject: rpms/mingw32-opensc/devel import.log, NONE, 1.1 mingw32-opensc.spec,
	NONE, 1.1 opensc-0.11.7-develconfig.patch, NONE,
	1.1 opensc-0.11.7-iconv.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417203418.2D53C7012B@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31467/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-opensc.spec opensc-0.11.7-develconfig.patch 
	opensc-0.11.7-iconv.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-opensc-0_11_7-3_fc11:HEAD:mingw32-opensc-0.11.7-3.fc11.src.rpm:1240000663


--- NEW FILE mingw32-opensc.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-opensc
Version:        0.11.7
Release:        3%{?dist}
Summary:        MingGW Windows OpenSC library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.opensc-project.org/opensc/
Source0:        http://www.opensc-project.org/files/opensc/opensc-%{version}.tar.gz
Patch0:         opensc-0.11.7-iconv.patch
Patch1:         opensc-0.11.7-develconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 49
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-libltdl
BuildRequires:  mingw32-openssl
BuildRequires:  mingw32-readline
BuildRequires:  autoconf, automake, libtool

Requires:       pkgconfig

%description
OpenSC is a package for for accessing smart card devices.  Basic
functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO
7816-4 compatible smart card.  Encryption and decryption using private
keys on the smart card is possible with PKCS #15 compatible cards,
such as the FINEID (Finnish Electronic IDentity) card.  Swedish Posten
eID cards have also been confirmed to work.

This is the MinGW cross-compiled Windows library.


%prep
%setup -q -n opensc-%{version}
%patch0 -p1 -b .iconv
%patch1 -p1 -b .config

libtoolize --force --copy
autoreconf

sed -i -e 's|"/lib /usr/lib\b|"%{_mingw32_libdir}|' configure # lib64 rpaths
cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf .
# No %{_mingw32_libdir} here to avoid multilib conflicts; it's just an example
sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in


%build
%{_mingw32_configure}  --disable-static \
  --enable-pcsc \
  --enable-iconv
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/opensc.conf

mv -T $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/opensc docdir

# Remove a wrapper shell script
rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/cardos-info


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README*
%doc docdir/*
%config(noreplace) %{_mingw32_sysconfdir}/opensc.conf

%{_mingw32_bindir}/cardos-info.bat
%{_mingw32_bindir}/cardos-tool.exe
%{_mingw32_bindir}/cryptoflex-tool.exe
%{_mingw32_bindir}/eidenv.exe
%{_mingw32_bindir}/netkey-tool.exe
%{_mingw32_bindir}/opensc-config
%{_mingw32_bindir}/opensc-explorer.exe
%{_mingw32_bindir}/opensc-tool.exe
%{_mingw32_bindir}/piv-tool.exe
%{_mingw32_bindir}/pkcs11-tool.exe
%{_mingw32_bindir}/pkcs15-crypt.exe
%{_mingw32_bindir}/pkcs15-init.exe
%{_mingw32_bindir}/pkcs15-tool.exe
%{_mingw32_bindir}/rutoken-tool.exe

%{_mingw32_bindir}/libopensc-2.dll
%{_mingw32_bindir}/libpkcs15init-2.dll
%{_mingw32_bindir}/libscconf-2.dll
%{_mingw32_bindir}/onepin-opensc-pkcs11.dll
%{_mingw32_bindir}/opensc-pkcs11.dll
%{_mingw32_bindir}/pkcs11-spy.dll

%{_mingw32_libdir}/libopensc-2.dll.def
%{_mingw32_libdir}/libopensc.dll.a
%{_mingw32_libdir}/libopensc.la
%{_mingw32_libdir}/libpkcs15init-2.dll.def
%{_mingw32_libdir}/libpkcs15init.dll.a
%{_mingw32_libdir}/libpkcs15init.la
%{_mingw32_libdir}/libscconf.dll.a
%{_mingw32_libdir}/libscconf.la
%{_mingw32_libdir}/onepin-opensc-pkcs11.dll.a
%{_mingw32_libdir}/onepin-opensc-pkcs11.la
%{_mingw32_libdir}/opensc-pkcs11.dll.a
%{_mingw32_libdir}/opensc-pkcs11.la
%{_mingw32_libdir}/pkcs11-spy.dll.a
%{_mingw32_libdir}/pkcs11-spy.la

%{_mingw32_includedir}/opensc/
%{_mingw32_libdir}/pkgconfig/lib*.pc
%{_mingw32_datadir}/opensc/
%{_mingw32_sbindir}/opensc-install.bat


%changelog
* Fri Apr 17 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-3
- Replace %%define with %%global.

* Mon Mar 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-2
- Include *.la files in the rpm.
- Patch configure.ac to fix iconv detection.

* Mon Mar 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-1
- Initial RPM release.

opensc-0.11.7-develconfig.patch:

--- NEW FILE opensc-0.11.7-develconfig.patch ---
diff -up opensc-0.11.7/src/libopensc/libopensc.pc.in.config opensc-0.11.7/src/libopensc/libopensc.pc.in
--- opensc-0.11.7/src/libopensc/libopensc.pc.in.config	2006-05-15 22:57:30.000000000 +0200
+++ opensc-0.11.7/src/libopensc/libopensc.pc.in	2009-02-27 19:05:56.000000000 +0100
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libopensc
 Description: libopensc
 Version: @VERSION@
-Libs: -L${libdir} -lopensc -lscconf
+Libs: -L${libdir} -lopensc
 Cflags: -I${includedir}
 
diff -up opensc-0.11.7/src/libopensc/opensc-config.in.config opensc-0.11.7/src/libopensc/opensc-config.in
--- opensc-0.11.7/src/libopensc/opensc-config.in.config	2008-12-27 17:15:30.000000000 +0100
+++ opensc-0.11.7/src/libopensc/opensc-config.in	2009-02-27 19:03:11.000000000 +0100
@@ -15,10 +15,10 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 
-libdir="@libdir@"
-includedir="@includedir@"
+libdir=""
+includedir=""
 opensc_cflags=""
-opensc_libs="-L${libdir} -lopensc -lscconf"
+opensc_libs="-lopensc -lscconf"
 
 usage()
 {

opensc-0.11.7-iconv.patch:

--- NEW FILE opensc-0.11.7-iconv.patch ---
diff -up opensc-0.11.7/configure.ac.orig opensc-0.11.7/configure.ac
--- opensc-0.11.7/configure.ac.orig	2009-03-23 22:21:39.000000000 +0200
+++ opensc-0.11.7/configure.ac	2009-03-23 22:22:13.000000000 +0200
@@ -460,7 +460,7 @@ else
 			AC_MSG_RESULT([no])
 			AC_CHECK_LIB(
 				[iconv],
-				[iconv],
+				[libiconv_open],
 				[
 					ac_cv_lib_iconv="yes"
 					ICONV_LIBS="-liconv"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:41:28 -0000	1.1
+++ .cvsignore	17 Apr 2009 20:33:47 -0000	1.2
@@ -0,0 +1 @@
+opensc-0.11.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:41:29 -0000	1.1
+++ sources	17 Apr 2009 20:33:47 -0000	1.2
@@ -0,0 +1 @@
+419e9be372c2f9bbb3ce9704c929d5ec  opensc-0.11.7.tar.gz



From carllibpst at fedoraproject.org  Fri Apr 17 20:35:42 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 17 Apr 2009 20:35:42 +0000 (UTC)
Subject: rpms/libpst/F-10 .cvsignore, 1.20, 1.21 libpst.spec, 1.20,
	1.21 sources, 1.20, 1.21
Message-ID: <20090417203542.99A7C7012B@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32206

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Apr 2009 15:13:47 -0000	1.20
+++ .cvsignore	17 Apr 2009 20:35:12 -0000	1.21
@@ -1 +1 @@
-libpst-0.6.36.tar.gz
+libpst-0.6.37.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/libpst.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libpst.spec	14 Apr 2009 15:13:47 -0000	1.20
+++ libpst.spec	17 Apr 2009 20:35:12 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.36
+Version:            0.6.37
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -125,6 +125,10 @@
 
 
 %changelog
+* Fri Apr 17 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.37-1
+- add pst_attach_to_mem() back into the shared library interface.
+- fix memory leak caught by valgrind.
+
 * Tue Apr 14 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.36-1
 - build separate -doc and -devel-doc subpackages.
 - other spec file cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Apr 2009 15:13:47 -0000	1.20
+++ sources	17 Apr 2009 20:35:12 -0000	1.21
@@ -1 +1 @@
-97244ec839cc208c6ce647a1ef3f99eb  libpst-0.6.36.tar.gz
+bb53b2b379709ddf12e86670879e17e0  libpst-0.6.37.tar.gz



From kalev at fedoraproject.org  Fri Apr 17 20:36:37 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 17 Apr 2009 20:36:37 +0000 (UTC)
Subject: rpms/mingw32-opensc/F-11 import.log, NONE, 1.1 mingw32-opensc.spec, 
	NONE, 1.1 opensc-0.11.7-develconfig.patch, NONE,
	1.1 opensc-0.11.7-iconv.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417203637.70AAC7012B@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-opensc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32538/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-opensc.spec opensc-0.11.7-develconfig.patch 
	opensc-0.11.7-iconv.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-opensc-0_11_7-3_fc11:F-11:mingw32-opensc-0.11.7-3.fc11.src.rpm:1240000835


--- NEW FILE mingw32-opensc.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-opensc
Version:        0.11.7
Release:        3%{?dist}
Summary:        MingGW Windows OpenSC library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.opensc-project.org/opensc/
Source0:        http://www.opensc-project.org/files/opensc/opensc-%{version}.tar.gz
Patch0:         opensc-0.11.7-iconv.patch
Patch1:         opensc-0.11.7-develconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 49
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-libltdl
BuildRequires:  mingw32-openssl
BuildRequires:  mingw32-readline
BuildRequires:  autoconf, automake, libtool

Requires:       pkgconfig

%description
OpenSC is a package for for accessing smart card devices.  Basic
functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO
7816-4 compatible smart card.  Encryption and decryption using private
keys on the smart card is possible with PKCS #15 compatible cards,
such as the FINEID (Finnish Electronic IDentity) card.  Swedish Posten
eID cards have also been confirmed to work.

This is the MinGW cross-compiled Windows library.


%prep
%setup -q -n opensc-%{version}
%patch0 -p1 -b .iconv
%patch1 -p1 -b .config

libtoolize --force --copy
autoreconf

sed -i -e 's|"/lib /usr/lib\b|"%{_mingw32_libdir}|' configure # lib64 rpaths
cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf .
# No %{_mingw32_libdir} here to avoid multilib conflicts; it's just an example
sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in


%build
%{_mingw32_configure}  --disable-static \
  --enable-pcsc \
  --enable-iconv
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/opensc.conf

mv -T $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/opensc docdir

# Remove a wrapper shell script
rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/cardos-info


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README*
%doc docdir/*
%config(noreplace) %{_mingw32_sysconfdir}/opensc.conf

%{_mingw32_bindir}/cardos-info.bat
%{_mingw32_bindir}/cardos-tool.exe
%{_mingw32_bindir}/cryptoflex-tool.exe
%{_mingw32_bindir}/eidenv.exe
%{_mingw32_bindir}/netkey-tool.exe
%{_mingw32_bindir}/opensc-config
%{_mingw32_bindir}/opensc-explorer.exe
%{_mingw32_bindir}/opensc-tool.exe
%{_mingw32_bindir}/piv-tool.exe
%{_mingw32_bindir}/pkcs11-tool.exe
%{_mingw32_bindir}/pkcs15-crypt.exe
%{_mingw32_bindir}/pkcs15-init.exe
%{_mingw32_bindir}/pkcs15-tool.exe
%{_mingw32_bindir}/rutoken-tool.exe

%{_mingw32_bindir}/libopensc-2.dll
%{_mingw32_bindir}/libpkcs15init-2.dll
%{_mingw32_bindir}/libscconf-2.dll
%{_mingw32_bindir}/onepin-opensc-pkcs11.dll
%{_mingw32_bindir}/opensc-pkcs11.dll
%{_mingw32_bindir}/pkcs11-spy.dll

%{_mingw32_libdir}/libopensc-2.dll.def
%{_mingw32_libdir}/libopensc.dll.a
%{_mingw32_libdir}/libopensc.la
%{_mingw32_libdir}/libpkcs15init-2.dll.def
%{_mingw32_libdir}/libpkcs15init.dll.a
%{_mingw32_libdir}/libpkcs15init.la
%{_mingw32_libdir}/libscconf.dll.a
%{_mingw32_libdir}/libscconf.la
%{_mingw32_libdir}/onepin-opensc-pkcs11.dll.a
%{_mingw32_libdir}/onepin-opensc-pkcs11.la
%{_mingw32_libdir}/opensc-pkcs11.dll.a
%{_mingw32_libdir}/opensc-pkcs11.la
%{_mingw32_libdir}/pkcs11-spy.dll.a
%{_mingw32_libdir}/pkcs11-spy.la

%{_mingw32_includedir}/opensc/
%{_mingw32_libdir}/pkgconfig/lib*.pc
%{_mingw32_datadir}/opensc/
%{_mingw32_sbindir}/opensc-install.bat


%changelog
* Fri Apr 17 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-3
- Replace %%define with %%global.

* Mon Mar 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-2
- Include *.la files in the rpm.
- Patch configure.ac to fix iconv detection.

* Mon Mar 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-1
- Initial RPM release.

opensc-0.11.7-develconfig.patch:

--- NEW FILE opensc-0.11.7-develconfig.patch ---
diff -up opensc-0.11.7/src/libopensc/libopensc.pc.in.config opensc-0.11.7/src/libopensc/libopensc.pc.in
--- opensc-0.11.7/src/libopensc/libopensc.pc.in.config	2006-05-15 22:57:30.000000000 +0200
+++ opensc-0.11.7/src/libopensc/libopensc.pc.in	2009-02-27 19:05:56.000000000 +0100
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libopensc
 Description: libopensc
 Version: @VERSION@
-Libs: -L${libdir} -lopensc -lscconf
+Libs: -L${libdir} -lopensc
 Cflags: -I${includedir}
 
diff -up opensc-0.11.7/src/libopensc/opensc-config.in.config opensc-0.11.7/src/libopensc/opensc-config.in
--- opensc-0.11.7/src/libopensc/opensc-config.in.config	2008-12-27 17:15:30.000000000 +0100
+++ opensc-0.11.7/src/libopensc/opensc-config.in	2009-02-27 19:03:11.000000000 +0100
@@ -15,10 +15,10 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 
-libdir="@libdir@"
-includedir="@includedir@"
+libdir=""
+includedir=""
 opensc_cflags=""
-opensc_libs="-L${libdir} -lopensc -lscconf"
+opensc_libs="-lopensc -lscconf"
 
 usage()
 {

opensc-0.11.7-iconv.patch:

--- NEW FILE opensc-0.11.7-iconv.patch ---
diff -up opensc-0.11.7/configure.ac.orig opensc-0.11.7/configure.ac
--- opensc-0.11.7/configure.ac.orig	2009-03-23 22:21:39.000000000 +0200
+++ opensc-0.11.7/configure.ac	2009-03-23 22:22:13.000000000 +0200
@@ -460,7 +460,7 @@ else
 			AC_MSG_RESULT([no])
 			AC_CHECK_LIB(
 				[iconv],
-				[iconv],
+				[libiconv_open],
 				[
 					ac_cv_lib_iconv="yes"
 					ICONV_LIBS="-liconv"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:41:28 -0000	1.1
+++ .cvsignore	17 Apr 2009 20:36:07 -0000	1.2
@@ -0,0 +1 @@
+opensc-0.11.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:41:29 -0000	1.1
+++ sources	17 Apr 2009 20:36:07 -0000	1.2
@@ -0,0 +1 @@
+419e9be372c2f9bbb3ce9704c929d5ec  opensc-0.11.7.tar.gz



From sailer at fedoraproject.org  Fri Apr 17 20:43:16 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Fri, 17 Apr 2009 20:43:16 +0000 (UTC)
Subject: rpms/mingw32-libxml++/F-10 mingw32-libxml++.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417204316.100987012B@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libxml++/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1363

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-libxml++.spec 
Log Message:
copy from devel and downgrade to match native



--- NEW FILE mingw32-libxml++.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global name1 libxml++

Name:           mingw32-%{name1}
Version:        2.24.2
Release:        1%{?dist}
Summary:        MinGW Windows C++ wrapper for the libxml2 XML parser library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://libxmlplusplus.sourceforge.net/
Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.24/libxml++-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mingw32-libxml2 >= 2.6.1
BuildRequires:  mingw32-glibmm24 >= 2.4.0
BuildRequires:  doxygen, graphviz

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gcc-c++

Requires:       pkgconfig

%description
libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
author is Ari Johnson and it is currently maintained by Christophe de Vienne
and Murray Cumming.


%prep
%setup -q -n %{name1}-%{version}

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr (-,root,root,-)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_mingw32_bindir}/libxml++-2.6-2.dll
%{_mingw32_includedir}/*
%{_mingw32_libdir}/libxml++-2.6.dll.a
%{_mingw32_libdir}/libxml++-2.6.la
%{_mingw32_libdir}/pkgconfig/*
%dir %{_mingw32_libdir}/%{name1}-2.6
%dir %{_mingw32_libdir}/%{name1}-2.6/include
%{_mingw32_libdir}/%{name1}-2.6/include/*.h


%changelog
* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-1
- downgrade to 2.24.2, to match native

* Fri Apr 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.26.0-1
- update to 2.26.0
- remove docs cruft from install section
- remove dos2unix BR

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-4
- add BR's and R's
- remove docs, as they duplicate the native package

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-3
- unify main and devel subpackages

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.24.2-2
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libxml++/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:40:29 -0000	1.1
+++ .cvsignore	17 Apr 2009 20:42:45 -0000	1.2
@@ -0,0 +1,2 @@
+libxml++-2.26.0.tar.bz2
+libxml++-2.24.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libxml++/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:40:29 -0000	1.1
+++ sources	17 Apr 2009 20:42:45 -0000	1.2
@@ -0,0 +1 @@
+ec98c0975cc21d62c3e9e71f3beffde2  libxml++-2.24.2.tar.bz2



From dcantrel at fedoraproject.org  Fri Apr 17 21:10:38 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 17 Apr 2009 21:10:38 +0000 (UTC)
Subject: rpms/dhcp/F-10 dhclient-script, 1.5, 1.6 dhcp.spec, 1.230,
	1.231 dhcpd.init, 1.26, 1.27 dhcrelay.init, 1.9, 1.10
Message-ID: <20090417211038.111677012B@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9908

Modified Files:
	dhclient-script dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-34
- Fix setting default route when client IP address changes (#486512, #473658)
- Restore SELinux context on /etc/ntp.conf and /etc/yp.conf (#483747)
- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts
  will display usage information and return code 3



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhclient-script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhclient-script	4 Dec 2008 03:39:46 -0000	1.5
+++ dhclient-script	17 Apr 2009 21:10:07 -0000	1.6
@@ -3,7 +3,7 @@
 # dhclient-script: Network interface configuration script run by
 #                  dhclient based on DHCP client communication
 #
-# Copyright (C) 2008 Red Hat, Inc.
+# Copyright (C) 2008, 2009  Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,6 +40,12 @@
     logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}"
 }
 
+fix_context() {
+    if [ -x /sbin/restorecon ]; then
+        /sbin/restorecon ${1} >/dev/null 2>&1
+    fi
+}
+
 save_previous() {
     origfile="${1}"
     savefile="${SAVEDIR}/${origfile##*/}.predhclient.${interface}"
@@ -54,7 +60,7 @@
         echo > ${savefile}
     fi
 
-    restorecon ${savefile} >/dev/null 2>&1
+    fix_context ${savefile}
 }
 
 make_resolv_conf() {
@@ -94,9 +100,7 @@
         change_resolv_conf ${rscf}
         rm -f ${rscf}
 
-        if [ -x /sbin/restorecon ]; then
-            /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1
-        fi
+        fix_context /etc/resolv.conf
     fi
 }
 
@@ -227,6 +231,7 @@
        [ ! "${old_routers}" = "${new_routers}" ] ||
        [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
         ip -family inet addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
+        ip -family inet link set dev ${interface} up
 
         if [ -n "${new_interface_mtu}" ]; then
             ip link set ${interface} mtu ${new_interface_mtu}
@@ -400,7 +405,7 @@
        [ -n "${new_ntp_servers}" ] && [ -e /etc/ntp.conf ]; then
         save_previous /etc/ntp.conf
         egrep -v '^server .*  # added by /sbin/dhclient-script$'< ${SAVEDIR}/ntp.conf.predhclient.${interface} > /etc/ntp.conf
-        restorecon /etc/ntp.conf >/dev/null 2>&1
+        fix_context /etc/ntp.conf
 
         for s in ${new_ntp_servers} ; do
             echo "server ${s}  # added by /sbin/dhclient-script" >> /etc/ntp.conf
@@ -523,18 +528,21 @@
                     rm -f /etc/localtime
                     mv ${SAVEDIR}/localtime.predhclient.${interface} /etc/localtime
                     touch /etc/localtime
+                    fix_context /etc/localtime
                 fi
             fi
 
             if [ -f ${SAVEDIR}/ntp.conf.predhclient.${interface} ]; then
                 rm -f /etc/ntp.conf
-                mv -f ${SAVEDIR}/ntp.conf.predhclient.${interface} /etc/ntp.conf
+                mv ${SAVEDIR}/ntp.conf.predhclient.${interface} /etc/ntp.conf
+                fix_context /etc/ntp.conf
                 service ntpd condrestart >/dev/null 2>&1
             fi
 
             if [ -f ${SAVEDIR}/yp.conf.predhclient.${interface} ]; then
                 rm -f /etc/yp.conf
-                mv -f ${SAVEDIR}/yp.conf.predhclient.${interface} /etc/yp.conf
+                mv ${SAVEDIR}/yp.conf.predhclient.${interface} /etc/yp.conf
+                fix_context /etc/yp.conf
                 if [ -x /etc/rc.d/init.d/ypbind ] && [ -r /var/run/ypbind.pid ]; then
                     service ypbind restart >/dev/null 2>&1
                 fi


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhcp.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- dhcp.spec	4 Dec 2008 03:39:46 -0000	1.230
+++ dhcp.spec	17 Apr 2009 21:10:07 -0000	1.231
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  33%{?dist}
+Release:  34%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -449,6 +449,12 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-34
+- Fix setting default route when client IP address changes (#486512, #473658)
+- Restore SELinux context on /etc/ntp.conf and /etc/yp.conf (#483747)
+- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts
+  will display usage information and return code 3
+
 * Wed Dec 03 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-33
 - Do not calculate a prefix for an address we did not receive (#473885)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhcpd.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dhcpd.init	21 Jun 2008 20:14:17 -0000	1.26
+++ dhcpd.init	17 Apr 2009 21:10:07 -0000	1.27
@@ -121,9 +121,6 @@
         stop ; start
         RETVAL=$?
         ;;
-    try-restart|reload)
-        RETVAL=3
-        ;;
     condrestart)
         if [ -f $lockfile ]; then
             stop ; start


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhcrelay.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dhcrelay.init	11 Jan 2008 00:14:20 -0000	1.9
+++ dhcrelay.init	17 Apr 2009 21:10:07 -0000	1.10
@@ -99,9 +99,6 @@
         stop && start
         RETVAL=$?
         ;;
-    try-restart|reload)
-        RETVAL=3
-        ;;
     condrestart)
         if [ -f $lockfile ]; then
             stop && start



From kalev at fedoraproject.org  Fri Apr 17 21:13:27 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 17 Apr 2009 21:13:27 +0000 (UTC)
Subject: rpms/mingw32-opensc/F-10 import.log, NONE, 1.1 mingw32-opensc.spec, 
	NONE, 1.1 opensc-0.11.7-develconfig.patch, NONE,
	1.1 opensc-0.11.7-iconv.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090417211327.A90A97012B@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-opensc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10717/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-opensc.spec opensc-0.11.7-develconfig.patch 
	opensc-0.11.7-iconv.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-opensc-0_11_7-3_fc10:F-10:mingw32-opensc-0.11.7-3.fc10.src.rpm:1240003011


--- NEW FILE mingw32-opensc.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-opensc
Version:        0.11.7
Release:        3%{?dist}
Summary:        MingGW Windows OpenSC library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.opensc-project.org/opensc/
Source0:        http://www.opensc-project.org/files/opensc/opensc-%{version}.tar.gz
Patch0:         opensc-0.11.7-iconv.patch
Patch1:         opensc-0.11.7-develconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-libltdl
BuildRequires:  mingw32-openssl
BuildRequires:  mingw32-readline
BuildRequires:  autoconf, automake, libtool

Requires:       pkgconfig

%description
OpenSC is a package for for accessing smart card devices.  Basic
functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO
7816-4 compatible smart card.  Encryption and decryption using private
keys on the smart card is possible with PKCS #15 compatible cards,
such as the FINEID (Finnish Electronic IDentity) card.  Swedish Posten
eID cards have also been confirmed to work.

This is the MinGW cross-compiled Windows library.


%prep
%setup -q -n opensc-%{version}
%patch0 -p1 -b .iconv
%patch1 -p1 -b .config

autoreconf

sed -i -e 's|"/lib /usr/lib\b|"%{_mingw32_libdir}|' configure # lib64 rpaths
cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf .
# No %{_mingw32_libdir} here to avoid multilib conflicts; it's just an example
sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in


%build
%{_mingw32_configure}  --disable-static \
  --enable-pcsc \
  --enable-iconv
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/opensc.conf

mv -T $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/opensc docdir

# Remove a wrapper shell script
rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/cardos-info


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README*
%doc docdir/*
%config(noreplace) %{_mingw32_sysconfdir}/opensc.conf

%{_mingw32_bindir}/cardos-info.bat
%{_mingw32_bindir}/cardos-tool.exe
%{_mingw32_bindir}/cryptoflex-tool.exe
%{_mingw32_bindir}/eidenv.exe
%{_mingw32_bindir}/netkey-tool.exe
%{_mingw32_bindir}/opensc-config
%{_mingw32_bindir}/opensc-explorer.exe
%{_mingw32_bindir}/opensc-tool.exe
%{_mingw32_bindir}/piv-tool.exe
%{_mingw32_bindir}/pkcs11-tool.exe
%{_mingw32_bindir}/pkcs15-crypt.exe
%{_mingw32_bindir}/pkcs15-init.exe
%{_mingw32_bindir}/pkcs15-tool.exe
%{_mingw32_bindir}/rutoken-tool.exe

%{_mingw32_bindir}/libopensc-2.dll
%{_mingw32_bindir}/libpkcs15init-2.dll
%{_mingw32_bindir}/libscconf-2.dll
%{_mingw32_bindir}/onepin-opensc-pkcs11.dll
%{_mingw32_bindir}/opensc-pkcs11.dll
%{_mingw32_bindir}/pkcs11-spy.dll

%{_mingw32_libdir}/libopensc-2.dll.def
%{_mingw32_libdir}/libopensc.dll.a
%{_mingw32_libdir}/libopensc.la
%{_mingw32_libdir}/libpkcs15init-2.dll.def
%{_mingw32_libdir}/libpkcs15init.dll.a
%{_mingw32_libdir}/libpkcs15init.la
%{_mingw32_libdir}/libscconf.dll.a
%{_mingw32_libdir}/libscconf.la
%{_mingw32_libdir}/onepin-opensc-pkcs11.dll.a
%{_mingw32_libdir}/onepin-opensc-pkcs11.la
%{_mingw32_libdir}/opensc-pkcs11.dll.a
%{_mingw32_libdir}/opensc-pkcs11.la
%{_mingw32_libdir}/pkcs11-spy.dll.a
%{_mingw32_libdir}/pkcs11-spy.la

%{_mingw32_includedir}/opensc/
%{_mingw32_libdir}/pkgconfig/lib*.pc
%{_mingw32_datadir}/opensc/
%{_mingw32_sbindir}/opensc-install.bat


%changelog
* Fri Apr 17 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-3
- Replace %%define with %%global.

* Mon Mar 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-2
- Include *.la files in the rpm.
- Patch configure.ac to fix iconv detection.

* Mon Mar 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.7-1
- Initial RPM release.

opensc-0.11.7-develconfig.patch:

--- NEW FILE opensc-0.11.7-develconfig.patch ---
diff -up opensc-0.11.7/src/libopensc/libopensc.pc.in.config opensc-0.11.7/src/libopensc/libopensc.pc.in
--- opensc-0.11.7/src/libopensc/libopensc.pc.in.config	2006-05-15 22:57:30.000000000 +0200
+++ opensc-0.11.7/src/libopensc/libopensc.pc.in	2009-02-27 19:05:56.000000000 +0100
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libopensc
 Description: libopensc
 Version: @VERSION@
-Libs: -L${libdir} -lopensc -lscconf
+Libs: -L${libdir} -lopensc
 Cflags: -I${includedir}
 
diff -up opensc-0.11.7/src/libopensc/opensc-config.in.config opensc-0.11.7/src/libopensc/opensc-config.in
--- opensc-0.11.7/src/libopensc/opensc-config.in.config	2008-12-27 17:15:30.000000000 +0100
+++ opensc-0.11.7/src/libopensc/opensc-config.in	2009-02-27 19:03:11.000000000 +0100
@@ -15,10 +15,10 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 
-libdir="@libdir@"
-includedir="@includedir@"
+libdir=""
+includedir=""
 opensc_cflags=""
-opensc_libs="-L${libdir} -lopensc -lscconf"
+opensc_libs="-lopensc -lscconf"
 
 usage()
 {

opensc-0.11.7-iconv.patch:

--- NEW FILE opensc-0.11.7-iconv.patch ---
diff -up opensc-0.11.7/configure.ac.orig opensc-0.11.7/configure.ac
--- opensc-0.11.7/configure.ac.orig	2009-03-23 22:21:39.000000000 +0200
+++ opensc-0.11.7/configure.ac	2009-03-23 22:22:13.000000000 +0200
@@ -460,7 +460,7 @@ else
 			AC_MSG_RESULT([no])
 			AC_CHECK_LIB(
 				[iconv],
-				[iconv],
+				[libiconv_open],
 				[
 					ac_cv_lib_iconv="yes"
 					ICONV_LIBS="-liconv"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:41:28 -0000	1.1
+++ .cvsignore	17 Apr 2009 21:12:56 -0000	1.2
@@ -0,0 +1 @@
+opensc-0.11.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:41:29 -0000	1.1
+++ sources	17 Apr 2009 21:12:57 -0000	1.2
@@ -0,0 +1 @@
+419e9be372c2f9bbb3ce9704c929d5ec  opensc-0.11.7.tar.gz



From pkgdb at fedoraproject.org  Fri Apr 17 21:21:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:21:54 +0000
Subject: [pkgdb] globus-openssl was added for ellert
Message-ID: <20090417212154.5D4E910F86B@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-openssl with summary Globus Toolkit - Openssl Library
kevin has approved Package globus-openssl
kevin has added a Fedora devel branch for globus-openssl with an owner of ellert
kevin has approved globus-openssl in Fedora devel
kevin has approved Package globus-openssl
kevin has set commit to Approved for provenpackager on globus-openssl (Fedora devel)
kevin has set build to Approved for provenpackager on globus-openssl (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-openssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl



From pkgdb at fedoraproject.org  Fri Apr 17 21:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:21:55 +0000
Subject: [pkgdb] globus-openssl (Fedora, 10) updated by kevin
Message-ID: <20090417212156.08D5810F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-openssl
kevin has set commit to Approved for provenpackager on globus-openssl (Fedora 10)
kevin has set build to Approved for provenpackager on globus-openssl (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-openssl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl



From pkgdb at fedoraproject.org  Fri Apr 17 21:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:21:55 +0000
Subject: [pkgdb] globus-openssl (Fedora, 9) updated by kevin
Message-ID: <20090417212156.0CBD310F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-openssl
kevin has set commit to Approved for provenpackager on globus-openssl (Fedora 9)
kevin has set build to Approved for provenpackager on globus-openssl (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-openssl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl



From pkgdb at fedoraproject.org  Fri Apr 17 21:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:21:55 +0000
Subject: [pkgdb] globus-openssl (Fedora, 11) updated by kevin
Message-ID: <20090417212156.21FA110F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-openssl
kevin has set commit to Approved for provenpackager on globus-openssl (Fedora 11)
kevin has set build to Approved for provenpackager on globus-openssl (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-openssl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl



From pkgdb at fedoraproject.org  Fri Apr 17 21:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:21:55 +0000
Subject: [pkgdb] globus-openssl (Fedora EPEL, 4) updated by kevin
Message-ID: <20090417212156.1741910F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-openssl
kevin has set commit to Approved for provenpackager on globus-openssl (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-openssl (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-openssl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl



From pkgdb at fedoraproject.org  Fri Apr 17 21:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:21:55 +0000
Subject: [pkgdb] globus-openssl (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417212156.2D57710F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-openssl
kevin has set commit to Approved for provenpackager on globus-openssl (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-openssl (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-openssl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl



From ellert at fedoraproject.org  Fri Apr 17 21:22:25 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:22:25 +0000 (UTC)
Subject: rpms/globus-core/devel globus-core.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090417212225.453897012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13727/devel

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:23:25 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:21:54 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		Source is extracted from the globus toolkit installer:
+#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
+#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
+#		mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:23:25 -0000	1.1
+++ import.log	17 Apr 2009 21:21:54 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693
+globus-core-5_15-2_fc9:HEAD:globus-core-5.15-2.fc9.src.rpm:1240003266



From ellert at fedoraproject.org  Fri Apr 17 21:24:48 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:24:48 +0000 (UTC)
Subject: rpms/globus-core/F-9 globus-core.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090417212448.5740A7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389/F-9

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:26:24 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:24:17 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		Source is extracted from the globus toolkit installer:
+#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
+#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
+#		mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:26:24 -0000	1.1
+++ import.log	17 Apr 2009 21:24:17 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:F-9:globus-core-5.15-1.fc9.src.rpm:1237533936
+globus-core-5_15-2_fc9:F-9:globus-core-5.15-2.fc9.src.rpm:1240003398



From kevin at fedoraproject.org  Fri Apr 17 21:25:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:25:08 +0000 (UTC)
Subject: rpms/globus-openssl - New directory
Message-ID: <20090417212508.2C4737012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14701/rpms/globus-openssl

Log Message:
Directory /cvs/pkgs/rpms/globus-openssl added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:25:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:25:08 +0000 (UTC)
Subject: rpms/globus-openssl/devel - New directory
Message-ID: <20090417212508.73FA67012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14701/rpms/globus-openssl/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-openssl/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:25:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:25:17 +0000 (UTC)
Subject: rpms/globus-openssl Makefile,NONE,1.1
Message-ID: <20090417212517.45B697012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14701/rpms/globus-openssl

Added Files:
	Makefile 
Log Message:
Setup of module globus-openssl


--- NEW FILE Makefile ---
# Top level Makefile for module globus-openssl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:25:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:25:17 +0000 (UTC)
Subject: rpms/globus-openssl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417212517.80BBA7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14701/rpms/globus-openssl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-openssl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-openssl
# $Id: Makefile,v 1.1 2009/04/17 21:25:17 kevin Exp $
NAME := globus-openssl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 21:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:25:27 +0000
Subject: [pkgdb] s390utils (Fedora, 11) updated by kevin
Message-ID: <20090417212527.BD9A310F86B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for s390utils
kevin has set commit to Approved for provenpackager on s390utils (Fedora 11)
kevin has set build to Approved for provenpackager on s390utils (Fedora 11)
kevin has set checkout to Approved for provenpackager on s390utils (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/s390utils



From ellert at fedoraproject.org  Fri Apr 17 21:26:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:26:09 +0000 (UTC)
Subject: rpms/globus-core/F-10 globus-core.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090417212609.CA44A7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15191/F-10

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:28:57 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:26:09 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		Source is extracted from the globus toolkit installer:
+#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
+#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
+#		mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:28:57 -0000	1.1
+++ import.log	17 Apr 2009 21:26:09 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:F-10:globus-core-5.15-1.fc9.src.rpm:1237534087
+globus-core-5_15-2_fc9:F-10:globus-core-5.15-2.fc9.src.rpm:1240003514



From pkgdb at fedoraproject.org  Fri Apr 17 21:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:26:15 +0000
Subject: [pkgdb] globus-callout was added for ellert
Message-ID: <20090417212615.3DC9410F87E@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-callout with summary Globus Toolkit - Globus Callout Library
kevin has approved Package globus-callout
kevin has added a Fedora devel branch for globus-callout with an owner of ellert
kevin has approved globus-callout in Fedora devel
kevin has approved Package globus-callout
kevin has set commit to Approved for provenpackager on globus-callout (Fedora devel)
kevin has set build to Approved for provenpackager on globus-callout (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-callout (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-callout



From pkgdb at fedoraproject.org  Fri Apr 17 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:26:16 +0000
Subject: [pkgdb] globus-callout (Fedora, 9) updated by kevin
Message-ID: <20090417212616.D1CD010F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-callout
kevin has set commit to Approved for provenpackager on globus-callout (Fedora 9)
kevin has set build to Approved for provenpackager on globus-callout (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-callout (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-callout



From pkgdb at fedoraproject.org  Fri Apr 17 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:26:16 +0000
Subject: [pkgdb] globus-callout (Fedora, 10) updated by kevin
Message-ID: <20090417212616.E806810F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-callout
kevin has set commit to Approved for provenpackager on globus-callout (Fedora 10)
kevin has set build to Approved for provenpackager on globus-callout (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-callout (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-callout



From pkgdb at fedoraproject.org  Fri Apr 17 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:26:16 +0000
Subject: [pkgdb] globus-callout (Fedora, 11) updated by kevin
Message-ID: <20090417212617.5BF7F10F889@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-callout
kevin has set commit to Approved for provenpackager on globus-callout (Fedora 11)
kevin has set build to Approved for provenpackager on globus-callout (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-callout (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-callout



From pkgdb at fedoraproject.org  Fri Apr 17 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:26:16 +0000
Subject: [pkgdb] globus-callout (Fedora EPEL, 4) updated by kevin
Message-ID: <20090417212617.7E3D410F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-callout
kevin has set commit to Approved for provenpackager on globus-callout (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-callout (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-callout (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-callout



From pkgdb at fedoraproject.org  Fri Apr 17 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:26:16 +0000
Subject: [pkgdb] globus-callout (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417212617.AEA0B10F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-callout
kevin has set commit to Approved for provenpackager on globus-callout (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-callout (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-callout (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-callout



From kevin at fedoraproject.org  Fri Apr 17 21:26:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:26:26 +0000 (UTC)
Subject: rpms/globus-callout - New directory
Message-ID: <20090417212626.22B6D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-callout
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15443/rpms/globus-callout

Log Message:
Directory /cvs/pkgs/rpms/globus-callout added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:26:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:26:26 +0000 (UTC)
Subject: rpms/globus-callout/devel - New directory
Message-ID: <20090417212626.59B1F7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-callout/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15443/rpms/globus-callout/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-callout/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:26:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:26:36 +0000 (UTC)
Subject: rpms/globus-callout Makefile,NONE,1.1
Message-ID: <20090417212636.DCD877012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-callout
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15443/rpms/globus-callout

Added Files:
	Makefile 
Log Message:
Setup of module globus-callout


--- NEW FILE Makefile ---
# Top level Makefile for module globus-callout
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:26:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:26:37 +0000 (UTC)
Subject: rpms/globus-callout/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417212637.C1A737013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-callout/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15443/rpms/globus-callout/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-callout


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-callout
# $Id: Makefile,v 1.1 2009/04/17 21:26:37 kevin Exp $
NAME := globus-callout
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ellert at fedoraproject.org  Fri Apr 17 21:27:51 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:27:51 +0000 (UTC)
Subject: rpms/globus-core/F-11 globus-core.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090417212751.B72047012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15949/F-11

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-11/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:23:25 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:27:21 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		Source is extracted from the globus toolkit installer:
+#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
+#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
+#		mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:23:25 -0000	1.1
+++ import.log	17 Apr 2009 21:27:21 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693
+globus-core-5_15-2_fc9:F-11:globus-core-5.15-2.fc9.src.rpm:1240003593



From ellert at fedoraproject.org  Fri Apr 17 21:29:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:29:26 +0000 (UTC)
Subject: rpms/globus-core/EL-4 globus-core.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090417212926.ED1A77012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16360/EL-4

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:31:11 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:28:56 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		Source is extracted from the globus toolkit installer:
+#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
+#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
+#		mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:31:11 -0000	1.1
+++ import.log	17 Apr 2009 21:28:56 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:EL-4:globus-core-5.15-1.fc9.src.rpm:1237534237
+globus-core-5_15-2_fc9:EL-4:globus-core-5.15-2.fc9.src.rpm:1240003699



From ellert at fedoraproject.org  Fri Apr 17 21:31:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:31:00 +0000 (UTC)
Subject: rpms/globus-core/EL-5 globus-core.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090417213100.BA9247012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16831/EL-5

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:33:41 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:30:30 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		Source is extracted from the globus toolkit installer:
+#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
+#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
+#		mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:33:41 -0000	1.1
+++ import.log	17 Apr 2009 21:30:30 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:EL-5:globus-core-5.15-1.fc9.src.rpm:1237534383
+globus-core-5_15-2_fc9:EL-5:globus-core-5.15-2.fc9.src.rpm:1240003791



From pkgdb at fedoraproject.org  Fri Apr 17 21:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:31:40 +0000
Subject: [pkgdb] netcf was added for lutter
Message-ID: <20090417213140.798C410F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package netcf with summary Cross-platform network configuration library
kevin has approved Package netcf
kevin has added a Fedora devel branch for netcf with an owner of lutter
kevin has approved netcf in Fedora devel
kevin has approved Package netcf
kevin has set commit to Approved for provenpackager on netcf (Fedora devel)
kevin has set build to Approved for provenpackager on netcf (Fedora devel)
kevin has set checkout to Approved for provenpackager on netcf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netcf



From pkgdb at fedoraproject.org  Fri Apr 17 21:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:31:45 +0000
Subject: [pkgdb] netcf (Fedora, 10) updated by kevin
Message-ID: <20090417213145.B0B2310F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for netcf
kevin has set commit to Approved for provenpackager on netcf (Fedora 10)
kevin has set build to Approved for provenpackager on netcf (Fedora 10)
kevin has set checkout to Approved for provenpackager on netcf (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netcf



From pkgdb at fedoraproject.org  Fri Apr 17 21:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:31:45 +0000
Subject: [pkgdb] netcf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417213145.BA19C10F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for netcf
kevin has set commit to Approved for provenpackager on netcf (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on netcf (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on netcf (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netcf



From pkgdb at fedoraproject.org  Fri Apr 17 21:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:31:45 +0000
Subject: [pkgdb] netcf (Fedora, 11) updated by kevin
Message-ID: <20090417213145.CB29E10F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for netcf
kevin has set commit to Approved for provenpackager on netcf (Fedora 11)
kevin has set build to Approved for provenpackager on netcf (Fedora 11)
kevin has set checkout to Approved for provenpackager on netcf (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netcf



From kevin at fedoraproject.org  Fri Apr 17 21:31:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:31:55 +0000 (UTC)
Subject: rpms/netcf - New directory
Message-ID: <20090417213155.26CC77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netcf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17300/rpms/netcf

Log Message:
Directory /cvs/pkgs/rpms/netcf added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:31:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:31:55 +0000 (UTC)
Subject: rpms/netcf/devel - New directory
Message-ID: <20090417213155.586C67012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netcf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17300/rpms/netcf/devel

Log Message:
Directory /cvs/pkgs/rpms/netcf/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:32:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:32:04 +0000 (UTC)
Subject: rpms/netcf Makefile,NONE,1.1
Message-ID: <20090417213204.1B4C37012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netcf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17300/rpms/netcf

Added Files:
	Makefile 
Log Message:
Setup of module netcf


--- NEW FILE Makefile ---
# Top level Makefile for module netcf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:32:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:32:04 +0000 (UTC)
Subject: rpms/netcf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090417213204.55D037012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netcf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17300/rpms/netcf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netcf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: netcf
# $Id: Makefile,v 1.1 2009/04/17 21:32:04 kevin Exp $
NAME := netcf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 21:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:32:49 +0000
Subject: [pkgdb] libvmime (Fedora, 10) updated by kevin
Message-ID: <20090417213249.5D7A410F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libvmime
kevin has set commit to Approved for provenpackager on libvmime (Fedora 10)
kevin has set build to Approved for provenpackager on libvmime (Fedora 10)
kevin has set checkout to Approved for provenpackager on libvmime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvmime



From pkgdb at fedoraproject.org  Fri Apr 17 21:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:32:47 +0000
Subject: [pkgdb] libvmime was added for kanarip
Message-ID: <20090417213247.EB80710F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package libvmime with summary Library for MIME messages and Internet messaging services
kevin has approved Package libvmime
kevin has added a Fedora devel branch for libvmime with an owner of kanarip
kevin has approved libvmime in Fedora devel
kevin has approved Package libvmime
kevin has set commit to Approved for provenpackager on libvmime (Fedora devel)
kevin has set build to Approved for provenpackager on libvmime (Fedora devel)
kevin has set checkout to Approved for provenpackager on libvmime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvmime



From pkgdb at fedoraproject.org  Fri Apr 17 21:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:32:49 +0000
Subject: [pkgdb] libvmime (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417213249.629E210F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libvmime
kevin has set commit to Approved for provenpackager on libvmime (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on libvmime (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on libvmime (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvmime



From pkgdb at fedoraproject.org  Fri Apr 17 21:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:32:49 +0000
Subject: [pkgdb] libvmime (Fedora, 11) updated by kevin
Message-ID: <20090417213249.6A75D10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libvmime
kevin has set commit to Approved for provenpackager on libvmime (Fedora 11)
kevin has set build to Approved for provenpackager on libvmime (Fedora 11)
kevin has set checkout to Approved for provenpackager on libvmime (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvmime



From pkgdb at fedoraproject.org  Fri Apr 17 21:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:32:49 +0000
Subject: [pkgdb] libvmime (Fedora EPEL, 4) updated by kevin
Message-ID: <20090417213249.7557610F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for libvmime
kevin has set commit to Approved for provenpackager on libvmime (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on libvmime (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on libvmime (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvmime



From pkgdb at fedoraproject.org  Fri Apr 17 21:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:32:49 +0000
Subject: [pkgdb] libvmime (Fedora, 9) updated by kevin
Message-ID: <20090417213249.86C8810F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libvmime
kevin has set commit to Approved for provenpackager on libvmime (Fedora 9)
kevin has set build to Approved for provenpackager on libvmime (Fedora 9)
kevin has set checkout to Approved for provenpackager on libvmime (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvmime



From kevin at fedoraproject.org  Fri Apr 17 21:33:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:33:00 +0000 (UTC)
Subject: rpms/libvmime - New directory
Message-ID: <20090417213300.2D6607012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvmime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17784/rpms/libvmime

Log Message:
Directory /cvs/pkgs/rpms/libvmime added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:33:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:33:00 +0000 (UTC)
Subject: rpms/libvmime/devel - New directory
Message-ID: <20090417213300.814747012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvmime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17784/rpms/libvmime/devel

Log Message:
Directory /cvs/pkgs/rpms/libvmime/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:33:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:33:10 +0000 (UTC)
Subject: rpms/libvmime Makefile,NONE,1.1
Message-ID: <20090417213310.D711B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvmime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17784/rpms/libvmime

Added Files:
	Makefile 
Log Message:
Setup of module libvmime


--- NEW FILE Makefile ---
# Top level Makefile for module libvmime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:33:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:33:11 +0000 (UTC)
Subject: rpms/libvmime/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417213311.41CC67012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libvmime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq17784/rpms/libvmime/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libvmime


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libvmime
# $Id: Makefile,v 1.1 2009/04/17 21:33:11 kevin Exp $
NAME := libvmime
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From dcantrel at fedoraproject.org  Fri Apr 17 21:33:17 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 17 Apr 2009 21:33:17 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhclient-script, 1.9, 1.10 dhcp.spec, 1.251,
	1.252 dhcpd.init, 1.29, 1.30 dhcrelay.init, 1.10, 1.11
Message-ID: <20090417213317.C50967012B@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17718

Modified Files:
	dhclient-script dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-17
- Fix setting default route when client IP address changes (#486512, #473658)
- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts
  will display usage information and return code 3



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhclient-script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dhclient-script	13 Apr 2009 21:56:00 -0000	1.9
+++ dhclient-script	17 Apr 2009 21:32:47 -0000	1.10
@@ -233,6 +233,7 @@
        [ ! "${old_routers}" = "${new_routers}" ] ||
        [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
         ip -family inet addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
+        ip -family inet link set dev ${interface} up
 
         if [ -n "${new_interface_mtu}" ]; then
             ip link set ${interface} mtu ${new_interface_mtu}


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- dhcp.spec	13 Apr 2009 22:22:38 -0000	1.251
+++ dhcp.spec	17 Apr 2009 21:32:47 -0000	1.252
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  16%{?dist}
+Release:  17%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -419,6 +419,11 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-17
+- Fix setting default route when client IP address changes (#486512, #473658)
+- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts
+  will display usage information and return code 3
+
 * Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
 - Correct %%post problems in dhclient package (#495361)
 - Read hooks scripts from /etc/dhcp (#495361)


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcpd.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dhcpd.init	13 Jan 2009 14:45:32 -0000	1.29
+++ dhcpd.init	17 Apr 2009 21:32:47 -0000	1.30
@@ -120,9 +120,6 @@
         stop ; start
         RETVAL=$?
         ;;
-    try-restart|reload)
-        RETVAL=3
-        ;;
     condrestart)
         if [ -f $lockfile ]; then
             stop ; start


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcrelay.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dhcrelay.init	18 Dec 2008 22:47:13 -0000	1.10
+++ dhcrelay.init	17 Apr 2009 21:32:47 -0000	1.11
@@ -98,9 +98,6 @@
         stop && start
         RETVAL=$?
         ;;
-    try-restart|reload)
-        RETVAL=3
-        ;;
     condrestart)
         if [ -f $lockfile ]; then
             stop && start



From pkgdb at fedoraproject.org  Fri Apr 17 21:34:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:34:46 +0000
Subject: [pkgdb] python-bitarray was added for ramkrsna
Message-ID: <20090417213446.59F7C10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package python-bitarray with summary Efficient Array of Booleans
kevin has approved Package python-bitarray
kevin has added a Fedora devel branch for python-bitarray with an owner of ramkrsna
kevin has approved python-bitarray in Fedora devel
kevin has approved Package python-bitarray
kevin has set commit to Approved for provenpackager on python-bitarray (Fedora devel)
kevin has set build to Approved for provenpackager on python-bitarray (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-bitarray (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-bitarray



From pkgdb at fedoraproject.org  Fri Apr 17 21:34:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:34:47 +0000
Subject: [pkgdb] python-bitarray (Fedora, 10) updated by kevin
Message-ID: <20090417213447.C5B3E10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-bitarray
kevin has set commit to Approved for provenpackager on python-bitarray (Fedora 10)
kevin has set build to Approved for provenpackager on python-bitarray (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-bitarray (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-bitarray



From kevin at fedoraproject.org  Fri Apr 17 21:34:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:34:59 +0000 (UTC)
Subject: rpms/python-bitarray - New directory
Message-ID: <20090417213459.37F8A7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-bitarray
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18625/rpms/python-bitarray

Log Message:
Directory /cvs/pkgs/rpms/python-bitarray added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:34:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:34:59 +0000 (UTC)
Subject: rpms/python-bitarray/devel - New directory
Message-ID: <20090417213459.9D0ED7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-bitarray/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18625/rpms/python-bitarray/devel

Log Message:
Directory /cvs/pkgs/rpms/python-bitarray/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:35:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:35:11 +0000 (UTC)
Subject: rpms/python-bitarray Makefile,NONE,1.1
Message-ID: <20090417213511.210387012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-bitarray
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18625/rpms/python-bitarray

Added Files:
	Makefile 
Log Message:
Setup of module python-bitarray


--- NEW FILE Makefile ---
# Top level Makefile for module python-bitarray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Apr 17 21:34:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:34:47 +0000
Subject: [pkgdb] python-bitarray (Fedora, 11) updated by kevin
Message-ID: <20090417213447.CDE8510F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-bitarray
kevin has set commit to Approved for provenpackager on python-bitarray (Fedora 11)
kevin has set build to Approved for provenpackager on python-bitarray (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-bitarray (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-bitarray



From kevin at fedoraproject.org  Fri Apr 17 21:35:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:35:11 +0000 (UTC)
Subject: rpms/python-bitarray/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417213511.654E07012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-bitarray/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18625/rpms/python-bitarray/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-bitarray


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-bitarray
# $Id: Makefile,v 1.1 2009/04/17 21:35:11 kevin Exp $
NAME := python-bitarray
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 21:35:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:35:27 +0000
Subject: [pkgdb] python-pytools was added for ramkrsna
Message-ID: <20090417213527.D070810F87E@bastion2.fedora.phx.redhat.com>

kevin has added Package python-pytools with summary A collection of tools for python
kevin has approved Package python-pytools
kevin has added a Fedora devel branch for python-pytools with an owner of ramkrsna
kevin has approved python-pytools in Fedora devel
kevin has approved Package python-pytools
kevin has set commit to Approved for provenpackager on python-pytools (Fedora devel)
kevin has set build to Approved for provenpackager on python-pytools (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-pytools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pytools



From pkgdb at fedoraproject.org  Fri Apr 17 21:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:35:30 +0000
Subject: [pkgdb] python-pytools (Fedora, 10) updated by kevin
Message-ID: <20090417213530.0EC9610F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-pytools
kevin has set commit to Approved for provenpackager on python-pytools (Fedora 10)
kevin has set build to Approved for provenpackager on python-pytools (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-pytools (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pytools



From ajax at fedoraproject.org  Fri Apr 17 21:35:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 17 Apr 2009 21:35:34 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-tiled-front.patch, NONE, 1.1 kernel.spec,
	1.1557, 1.1558
Message-ID: <20090417213534.A78FE7012B@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18650

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-tiled-front.patch 
Log Message:
* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com>
- drm-intel-tiled-front.patch: Enable tiled front buffer on gen4


drm-intel-tiled-front.patch:

--- NEW FILE drm-intel-tiled-front.patch ---
From: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Tue, 14 Apr 2009 21:17:47 +0000 (-0700)
Subject: drm/i915: allow tiled front buffers on 965+
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fanholt%2Fdrm-intel.git;a=commitdiff_plain;h=f544847fbaf099278343f875987a983f2b913134

drm/i915: allow tiled front buffers on 965+

This patch corrects a pretty big oversight in the KMS code for 965+
chips.  The current code is missing tiled surface register programming,
so userland can allocate a tiled surface and use it for mode setting,
resulting in corruption.  This patch fixes that, allowing for tiled
front buffers on 965+.

Cc: stable at kernel.org
Tested-by: Arkadiusz Miskiewicz <arekm at maven.pl>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Eric Anholt <eric at anholt.net>
---

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e805b59..5211947 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1446,6 +1446,7 @@
 #define   DISPPLANE_NO_LINE_DOUBLE		0
 #define   DISPPLANE_STEREO_POLARITY_FIRST	0
 #define   DISPPLANE_STEREO_POLARITY_SECOND	(1<<18)
+#define   DISPPLANE_TILED			(1<<10)
 #define DSPAADDR		0x70184
 #define DSPASTRIDE		0x70188
 #define DSPAPOS			0x7018C /* reserved */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c2c8e95..bdcda36 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -657,6 +657,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 	int dspbase = (pipe == 0 ? DSPAADDR : DSPBADDR);
 	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
 	int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;
+	int dsptileoff = (pipe == 0 ? DSPATILEOFF : DSPBTILEOFF);
 	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
 	u32 dspcntr, alignment;
 	int ret;
@@ -733,6 +734,13 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 		mutex_unlock(&dev->struct_mutex);
 		return -EINVAL;
 	}
+	if (IS_I965G(dev)) {
+		if (obj_priv->tiling_mode != I915_TILING_NONE)
+			dspcntr |= DISPPLANE_TILED;
+		else
+			dspcntr &= ~DISPPLANE_TILED;
+	}
+
 	I915_WRITE(dspcntr_reg, dspcntr);
 
 	Start = obj_priv->gtt_offset;
@@ -745,6 +753,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 		I915_READ(dspbase);
 		I915_WRITE(dspsurf, Start);
 		I915_READ(dspsurf);
+		I915_WRITE(dsptileoff, (y << 16) | x);
 	} else {
 		I915_WRITE(dspbase, Start + Offset);
 		I915_READ(dspbase);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1557
retrieving revision 1.1558
diff -u -r1.1557 -r1.1558
--- kernel.spec	17 Apr 2009 12:25:32 -0000	1.1557
+++ kernel.spec	17 Apr 2009 21:35:04 -0000	1.1558
@@ -688,6 +688,7 @@
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-intel-lying-systems-without-lvds.patch
 Patch1822: drm-intel-gen3-fb-hack.patch
+Patch1823: drm-intel-tiled-front.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1342,6 +1343,7 @@
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-lying-systems-without-lvds.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
+ApplyPatch drm-intel-tiled-front.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1969,6 +1971,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com>
+- drm-intel-tiled-front.patch: Enable tiled front buffer on gen4
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-95
 - nouveau: fix powerpc build
 



From pkgdb at fedoraproject.org  Fri Apr 17 21:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:35:30 +0000
Subject: [pkgdb] python-pytools (Fedora, 11) updated by kevin
Message-ID: <20090417213530.20C2510F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-pytools
kevin has set commit to Approved for provenpackager on python-pytools (Fedora 11)
kevin has set build to Approved for provenpackager on python-pytools (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-pytools (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pytools



From kevin at fedoraproject.org  Fri Apr 17 21:35:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:35:46 +0000 (UTC)
Subject: rpms/python-pytools - New directory
Message-ID: <20090417213546.27F447012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pytools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO19056/rpms/python-pytools

Log Message:
Directory /cvs/pkgs/rpms/python-pytools added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:35:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:35:46 +0000 (UTC)
Subject: rpms/python-pytools/devel - New directory
Message-ID: <20090417213546.66EC07012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pytools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO19056/rpms/python-pytools/devel

Log Message:
Directory /cvs/pkgs/rpms/python-pytools/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:35:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:35:58 +0000 (UTC)
Subject: rpms/python-pytools Makefile,NONE,1.1
Message-ID: <20090417213558.D71B27012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pytools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO19056/rpms/python-pytools

Added Files:
	Makefile 
Log Message:
Setup of module python-pytools


--- NEW FILE Makefile ---
# Top level Makefile for module python-pytools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:35:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:35:59 +0000 (UTC)
Subject: rpms/python-pytools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417213559.27C797012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pytools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO19056/rpms/python-pytools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-pytools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-pytools
# $Id: Makefile,v 1.1 2009/04/17 21:35:59 kevin Exp $
NAME := python-pytools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 21:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:36:14 +0000
Subject: [pkgdb] python-achoo was added for ramkrsna
Message-ID: <20090417213615.10F1110F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package python-achoo with summary A fluent interface for testing Python Object
kevin has approved Package python-achoo
kevin has added a Fedora devel branch for python-achoo with an owner of ramkrsna
kevin has approved python-achoo in Fedora devel
kevin has approved Package python-achoo
kevin has set commit to Approved for provenpackager on python-achoo (Fedora devel)
kevin has set build to Approved for provenpackager on python-achoo (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-achoo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-achoo



From pkgdb at fedoraproject.org  Fri Apr 17 21:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:36:16 +0000
Subject: [pkgdb] python-achoo (Fedora, 10) updated by kevin
Message-ID: <20090417213616.C743A10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-achoo
kevin has set commit to Approved for provenpackager on python-achoo (Fedora 10)
kevin has set build to Approved for provenpackager on python-achoo (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-achoo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-achoo



From pkgdb at fedoraproject.org  Fri Apr 17 21:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:36:16 +0000
Subject: [pkgdb] python-achoo (Fedora, 11) updated by kevin
Message-ID: <20090417213616.D0CAE10F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-achoo
kevin has set commit to Approved for provenpackager on python-achoo (Fedora 11)
kevin has set build to Approved for provenpackager on python-achoo (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-achoo (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-achoo



From kevin at fedoraproject.org  Fri Apr 17 21:36:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:36:27 +0000 (UTC)
Subject: rpms/python-achoo - New directory
Message-ID: <20090417213627.341B97012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-achoo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19317/rpms/python-achoo

Log Message:
Directory /cvs/pkgs/rpms/python-achoo added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:36:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:36:27 +0000 (UTC)
Subject: rpms/python-achoo/devel - New directory
Message-ID: <20090417213627.875AA7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-achoo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19317/rpms/python-achoo/devel

Log Message:
Directory /cvs/pkgs/rpms/python-achoo/devel added to the repository




From ellert at fedoraproject.org  Fri Apr 17 21:36:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:36:23 +0000 (UTC)
Subject: rpms/globus-libtool/devel .cvsignore, 1.2, 1.3 globus-libtool.spec, 
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417213623.58EA27012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18772/devel

Modified Files:
	.cvsignore globus-libtool.spec import.log sources 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
- Add source description comment



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 10:09:33 -0000	1.2
+++ .cvsignore	17 Apr 2009 21:35:52 -0000	1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE


Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/devel/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec	20 Mar 2009 10:09:33 -0000	1.1
+++ globus-libtool.spec	17 Apr 2009 21:35:52 -0000	1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
+#		This package is a substitution for the upstream globus-libtool
+#		package, which contains a copy of the libltdl library sources.
+#		Instead this package provides the necessary metadata files to
+#		allow grid-packaging-tools (GPT) to use the libltdl library
+#		provided by the Fedora/RHEL distribution. The package source
+#		is a single GPT source package description file, referencing
+#		the libltdl library as an external library.
 Source:		%{name}-pkg_data_src.gpt.in
-Source9:	GLOBUS_LICENSE
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
 %endif
 Requires:	pkgconfig
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus libtool package (virtual GPT glue package)
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Globus libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
 LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
 
 sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
-    < pkg_data_src.gpt.in > pkg_data_src.gpt
+  < pkg_data_src.gpt.in > pkg_data_src.gpt
 
 echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
   %{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
 echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
   %{flavor}_dev.filelist
 
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
   $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,17 +121,15 @@
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 10:09:34 -0000	1.1
+++ import.log	17 Apr 2009 21:35:52 -0000	1.2
@@ -1 +1,2 @@
 globus-libtool-1_2-1_fc9:HEAD:globus-libtool-1.2-1.fc9.src.rpm:1237543711
+globus-libtool-1_2-2_fc9:HEAD:globus-libtool-1.2-2.fc9.src.rpm:1240003998


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:09:34 -0000	1.2
+++ sources	17 Apr 2009 21:35:52 -0000	1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE



From kevin at fedoraproject.org  Fri Apr 17 21:36:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:36:38 +0000 (UTC)
Subject: rpms/python-achoo Makefile,NONE,1.1
Message-ID: <20090417213638.2143F7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-achoo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19317/rpms/python-achoo

Added Files:
	Makefile 
Log Message:
Setup of module python-achoo


--- NEW FILE Makefile ---
# Top level Makefile for module python-achoo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:36:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:36:38 +0000 (UTC)
Subject: rpms/python-achoo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417213638.75DB37012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-achoo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19317/rpms/python-achoo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-achoo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-achoo
# $Id: Makefile,v 1.1 2009/04/17 21:36:38 kevin Exp $
NAME := python-achoo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 21:36:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:36:56 +0000
Subject: [pkgdb] python-posix_ipc was added for ramkrsna
Message-ID: <20090417213656.1D61C10F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package python-posix_ipc with summary POSIX IPC primitives for Python
kevin has approved Package python-posix_ipc
kevin has added a Fedora devel branch for python-posix_ipc with an owner of ramkrsna
kevin has approved python-posix_ipc in Fedora devel
kevin has approved Package python-posix_ipc
kevin has set commit to Approved for provenpackager on python-posix_ipc (Fedora devel)
kevin has set build to Approved for provenpackager on python-posix_ipc (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-posix_ipc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-posix_ipc



From pkgdb at fedoraproject.org  Fri Apr 17 21:36:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:36:57 +0000
Subject: [pkgdb] python-posix_ipc (Fedora, 10) updated by kevin
Message-ID: <20090417213657.89F9210F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-posix_ipc
kevin has set commit to Approved for provenpackager on python-posix_ipc (Fedora 10)
kevin has set build to Approved for provenpackager on python-posix_ipc (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-posix_ipc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-posix_ipc



From pkgdb at fedoraproject.org  Fri Apr 17 21:36:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:36:57 +0000
Subject: [pkgdb] python-posix_ipc (Fedora, 11) updated by kevin
Message-ID: <20090417213657.92B6910F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-posix_ipc
kevin has set commit to Approved for provenpackager on python-posix_ipc (Fedora 11)
kevin has set build to Approved for provenpackager on python-posix_ipc (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-posix_ipc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-posix_ipc



From kevin at fedoraproject.org  Fri Apr 17 21:37:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:37:07 +0000 (UTC)
Subject: rpms/python-posix_ipc - New directory
Message-ID: <20090417213707.25F377012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-posix_ipc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19635/rpms/python-posix_ipc

Log Message:
Directory /cvs/pkgs/rpms/python-posix_ipc added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:37:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:37:07 +0000 (UTC)
Subject: rpms/python-posix_ipc/devel - New directory
Message-ID: <20090417213707.72E8D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-posix_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19635/rpms/python-posix_ipc/devel

Log Message:
Directory /cvs/pkgs/rpms/python-posix_ipc/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:37:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:37:17 +0000 (UTC)
Subject: rpms/python-posix_ipc Makefile,NONE,1.1
Message-ID: <20090417213717.1DD967012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-posix_ipc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19635/rpms/python-posix_ipc

Added Files:
	Makefile 
Log Message:
Setup of module python-posix_ipc


--- NEW FILE Makefile ---
# Top level Makefile for module python-posix_ipc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:37:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:37:17 +0000 (UTC)
Subject: rpms/python-posix_ipc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417213717.603F17012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-posix_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19635/rpms/python-posix_ipc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-posix_ipc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-posix_ipc
# $Id: Makefile,v 1.1 2009/04/17 21:37:17 kevin Exp $
NAME := python-posix_ipc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Apr 17 21:37:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:37:54 +0000
Subject: [pkgdb] perl-Net-UPnP was added for jussilehtola
Message-ID: <20090417213754.19ED910F80C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Net-UPnP with summary Perl extension for UPnP
kevin has approved Package perl-Net-UPnP
kevin has added a Fedora devel branch for perl-Net-UPnP with an owner of jussilehtola
kevin has approved perl-Net-UPnP in Fedora devel
kevin has approved Package perl-Net-UPnP
kevin has set commit to Approved for provenpackager on perl-Net-UPnP (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Net-UPnP (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Net-UPnP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-UPnP



From pkgdb at fedoraproject.org  Fri Apr 17 21:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:37:56 +0000
Subject: [pkgdb] perl-Net-UPnP (Fedora, devel) updated by kevin
Message-ID: <20090417213756.2F4DE10F87F@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Net-UPnP (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Net-UPnP (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-UPnP



From pkgdb at fedoraproject.org  Fri Apr 17 21:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:37:56 +0000
Subject: [pkgdb] perl-Net-UPnP (Fedora, 10) updated by kevin
Message-ID: <20090417213756.38ED910F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Net-UPnP
kevin has set commit to Approved for provenpackager on perl-Net-UPnP (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Net-UPnP (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Net-UPnP (Fedora 10)
kevin approved watchbugzilla on perl-Net-UPnP (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Net-UPnP (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-UPnP



From pkgdb at fedoraproject.org  Fri Apr 17 21:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:37:56 +0000
Subject: [pkgdb] perl-Net-UPnP (Fedora, 11) updated by kevin
Message-ID: <20090417213756.4163D10F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Net-UPnP
kevin has set commit to Approved for provenpackager on perl-Net-UPnP (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Net-UPnP (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Net-UPnP (Fedora 11)
kevin approved watchbugzilla on perl-Net-UPnP (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Net-UPnP (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-UPnP



From pkgdb at fedoraproject.org  Fri Apr 17 21:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:37:56 +0000
Subject: [pkgdb] perl-Net-UPnP (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417213756.50FEA10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Net-UPnP
kevin has set commit to Approved for provenpackager on perl-Net-UPnP (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Net-UPnP (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Net-UPnP (Fedora EPEL 5)
kevin approved watchbugzilla on perl-Net-UPnP (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Net-UPnP (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-UPnP



From kevin at fedoraproject.org  Fri Apr 17 21:38:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:38:04 +0000 (UTC)
Subject: rpms/perl-Net-UPnP - New directory
Message-ID: <20090417213804.288D87012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-UPnP
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ20034/rpms/perl-Net-UPnP

Log Message:
Directory /cvs/pkgs/rpms/perl-Net-UPnP added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:38:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:38:04 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/devel - New directory
Message-ID: <20090417213804.6BBAB7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-UPnP/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ20034/rpms/perl-Net-UPnP/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Net-UPnP/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:38:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:38:14 +0000 (UTC)
Subject: rpms/perl-Net-UPnP Makefile,NONE,1.1
Message-ID: <20090417213814.514BC7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-UPnP
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ20034/rpms/perl-Net-UPnP

Added Files:
	Makefile 
Log Message:
Setup of module perl-Net-UPnP


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-UPnP
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:38:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:38:14 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417213814.913F07012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-UPnP/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ20034/rpms/perl-Net-UPnP/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-UPnP


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Net-UPnP
# $Id: Makefile,v 1.1 2009/04/17 21:38:14 kevin Exp $
NAME := perl-Net-UPnP
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ellert at fedoraproject.org  Fri Apr 17 21:39:02 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:39:02 +0000 (UTC)
Subject: rpms/globus-libtool/F-9 .cvsignore, 1.2, 1.3 globus-libtool.spec,
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417213902.8714C7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20080/F-9

Modified Files:
	.cvsignore globus-libtool.spec import.log sources 
Log Message:
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 10:12:04 -0000	1.2
+++ .cvsignore	17 Apr 2009 21:38:32 -0000	1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE


Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec	20 Mar 2009 10:12:05 -0000	1.1
+++ globus-libtool.spec	17 Apr 2009 21:38:32 -0000	1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
+#		This package is a substitution for the upstream globus-libtool
+#		package, which contains a copy of the libltdl library sources.
+#		Instead this package provides the necessary metadata files to
+#		allow grid-packaging-tools (GPT) to use the libltdl library
+#		provided by the Fedora/RHEL distribution. The package source
+#		is a single GPT source package description file, referencing
+#		the libltdl library as an external library.
 Source:		%{name}-pkg_data_src.gpt.in
-Source9:	GLOBUS_LICENSE
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
 %endif
 Requires:	pkgconfig
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus libtool package (virtual GPT glue package)
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Globus libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
 LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
 
 sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
-    < pkg_data_src.gpt.in > pkg_data_src.gpt
+  < pkg_data_src.gpt.in > pkg_data_src.gpt
 
 echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
   %{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
 echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
   %{flavor}_dev.filelist
 
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
   $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,17 +121,15 @@
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 10:12:05 -0000	1.1
+++ import.log	17 Apr 2009 21:38:32 -0000	1.2
@@ -1 +1,2 @@
 globus-libtool-1_2-1_fc9:F-9:globus-libtool-1.2-1.fc9.src.rpm:1237543872
+globus-libtool-1_2-2_fc9:F-9:globus-libtool-1.2-2.fc9.src.rpm:1240004231


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:12:05 -0000	1.2
+++ sources	17 Apr 2009 21:38:32 -0000	1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE



From pkgdb at fedoraproject.org  Fri Apr 17 21:39:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:39:34 +0000
Subject: [pkgdb] dnsjava was added for hubbitus
Message-ID: <20090417213934.6AD5710F80C@bastion2.fedora.phx.redhat.com>

kevin has added Package dnsjava with summary Java DNS implementation
kevin has approved Package dnsjava
kevin has added a Fedora devel branch for dnsjava with an owner of hubbitus
kevin has approved dnsjava in Fedora devel
kevin has approved Package dnsjava
kevin has set commit to Approved for provenpackager on dnsjava (Fedora devel)
kevin has set build to Approved for provenpackager on dnsjava (Fedora devel)
kevin has set checkout to Approved for provenpackager on dnsjava (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnsjava



From pkgdb at fedoraproject.org  Fri Apr 17 21:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:39:37 +0000
Subject: [pkgdb] dnsjava (Fedora, 10) updated by kevin
Message-ID: <20090417213937.2E9A710F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dnsjava
kevin has set commit to Approved for provenpackager on dnsjava (Fedora 10)
kevin has set build to Approved for provenpackager on dnsjava (Fedora 10)
kevin has set checkout to Approved for provenpackager on dnsjava (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnsjava



From pkgdb at fedoraproject.org  Fri Apr 17 21:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:39:37 +0000
Subject: [pkgdb] dnsjava (Fedora, 11) updated by kevin
Message-ID: <20090417213937.33A6810F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for dnsjava
kevin has set commit to Approved for provenpackager on dnsjava (Fedora 11)
kevin has set build to Approved for provenpackager on dnsjava (Fedora 11)
kevin has set checkout to Approved for provenpackager on dnsjava (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnsjava



From pkgdb at fedoraproject.org  Fri Apr 17 21:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:39:37 +0000
Subject: [pkgdb] dnsjava (Fedora, 9) updated by kevin
Message-ID: <20090417213937.39F9710F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for dnsjava
kevin has set commit to Approved for provenpackager on dnsjava (Fedora 9)
kevin has set build to Approved for provenpackager on dnsjava (Fedora 9)
kevin has set checkout to Approved for provenpackager on dnsjava (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnsjava



From kevin at fedoraproject.org  Fri Apr 17 21:39:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:39:46 +0000 (UTC)
Subject: rpms/dnsjava - New directory
Message-ID: <20090417213946.23DC07012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnsjava
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW20705/rpms/dnsjava

Log Message:
Directory /cvs/pkgs/rpms/dnsjava added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 21:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:39:37 +0000
Subject: [pkgdb] dnsjava (Fedora EPEL, 5) updated by kevin
Message-ID: <20090417213937.4249710F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for dnsjava
kevin has set commit to Approved for provenpackager on dnsjava (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on dnsjava (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on dnsjava (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnsjava



From kevin at fedoraproject.org  Fri Apr 17 21:39:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:39:46 +0000 (UTC)
Subject: rpms/dnsjava/devel - New directory
Message-ID: <20090417213946.60FEB7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnsjava/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW20705/rpms/dnsjava/devel

Log Message:
Directory /cvs/pkgs/rpms/dnsjava/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:39:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:39:55 +0000 (UTC)
Subject: rpms/dnsjava Makefile,NONE,1.1
Message-ID: <20090417213955.2E8DA7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnsjava
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW20705/rpms/dnsjava

Added Files:
	Makefile 
Log Message:
Setup of module dnsjava


--- NEW FILE Makefile ---
# Top level Makefile for module dnsjava
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:39:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:39:55 +0000 (UTC)
Subject: rpms/dnsjava/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090417213955.6553F7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnsjava/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW20705/rpms/dnsjava/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dnsjava


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dnsjava
# $Id: Makefile,v 1.1 2009/04/17 21:39:55 kevin Exp $
NAME := dnsjava
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ellert at fedoraproject.org  Fri Apr 17 21:40:34 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:40:34 +0000 (UTC)
Subject: rpms/globus-libtool/F-10 .cvsignore, 1.2, 1.3 globus-libtool.spec,
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417214034.62C1A7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20728/F-10

Modified Files:
	.cvsignore globus-libtool.spec import.log sources 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
- Add source description comment



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 11:51:27 -0000	1.2
+++ .cvsignore	17 Apr 2009 21:40:04 -0000	1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE


Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-10/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec	20 Mar 2009 11:51:27 -0000	1.1
+++ globus-libtool.spec	17 Apr 2009 21:40:04 -0000	1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
+#		This package is a substitution for the upstream globus-libtool
+#		package, which contains a copy of the libltdl library sources.
+#		Instead this package provides the necessary metadata files to
+#		allow grid-packaging-tools (GPT) to use the libltdl library
+#		provided by the Fedora/RHEL distribution. The package source
+#		is a single GPT source package description file, referencing
+#		the libltdl library as an external library.
 Source:		%{name}-pkg_data_src.gpt.in
-Source9:	GLOBUS_LICENSE
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
 %endif
 Requires:	pkgconfig
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus libtool package (virtual GPT glue package)
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Globus libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
 LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
 
 sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
-    < pkg_data_src.gpt.in > pkg_data_src.gpt
+  < pkg_data_src.gpt.in > pkg_data_src.gpt
 
 echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
   %{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
 echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
   %{flavor}_dev.filelist
 
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
   $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,17 +121,15 @@
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 11:51:27 -0000	1.1
+++ import.log	17 Apr 2009 21:40:04 -0000	1.2
@@ -1 +1,2 @@
 globus-libtool-1_2-1_fc9:F-10:globus-libtool-1.2-1.fc9.src.rpm:1237549854
+globus-libtool-1_2-2_fc9:F-10:globus-libtool-1.2-2.fc9.src.rpm:1240004368


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 11:51:27 -0000	1.2
+++ sources	17 Apr 2009 21:40:04 -0000	1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE



From pkgdb at fedoraproject.org  Fri Apr 17 21:40:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:40:47 +0000
Subject: [pkgdb] sgpio was added for jmoskovc
Message-ID: <20090417214047.43ECD10F87E@bastion2.fedora.phx.redhat.com>

kevin has added Package sgpio with summary Intel SGPIO enclosure management utility
kevin has approved Package sgpio
kevin has added a Fedora devel branch for sgpio with an owner of jmoskovc
kevin has approved sgpio in Fedora devel
kevin has approved Package sgpio
kevin has set commit to Approved for provenpackager on sgpio (Fedora devel)
kevin has set build to Approved for provenpackager on sgpio (Fedora devel)
kevin has set checkout to Approved for provenpackager on sgpio (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sgpio



From kevin at fedoraproject.org  Fri Apr 17 21:41:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:41:00 +0000 (UTC)
Subject: rpms/sgpio - New directory
Message-ID: <20090417214100.274447012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sgpio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/sgpio

Log Message:
Directory /cvs/pkgs/rpms/sgpio added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:41:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:41:00 +0000 (UTC)
Subject: rpms/sgpio/devel - New directory
Message-ID: <20090417214100.7185B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sgpio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/sgpio/devel

Log Message:
Directory /cvs/pkgs/rpms/sgpio/devel added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 21:40:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:40:49 +0000
Subject: [pkgdb] sgpio (Fedora, 11) updated by kevin
Message-ID: <20090417214049.9241710F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sgpio
kevin has set commit to Approved for provenpackager on sgpio (Fedora 11)
kevin has set build to Approved for provenpackager on sgpio (Fedora 11)
kevin has set checkout to Approved for provenpackager on sgpio (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sgpio



From kevin at fedoraproject.org  Fri Apr 17 21:41:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:41:10 +0000 (UTC)
Subject: rpms/sgpio Makefile,NONE,1.1
Message-ID: <20090417214110.DF90F7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sgpio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/sgpio

Added Files:
	Makefile 
Log Message:
Setup of module sgpio


--- NEW FILE Makefile ---
# Top level Makefile for module sgpio
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:41:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:41:11 +0000 (UTC)
Subject: rpms/sgpio/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090417214111.336CD7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sgpio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD21270/rpms/sgpio/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sgpio


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sgpio
# $Id: Makefile,v 1.1 2009/04/17 21:41:11 kevin Exp $
NAME := sgpio
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ellert at fedoraproject.org  Fri Apr 17 21:42:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:42:23 +0000 (UTC)
Subject: rpms/globus-libtool/F-11 .cvsignore, 1.2, 1.3 globus-libtool.spec,
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417214223.8BDB17012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21578/F-11

Modified Files:
	.cvsignore globus-libtool.spec import.log sources 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
- Add source description comment



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 10:09:33 -0000	1.2
+++ .cvsignore	17 Apr 2009 21:41:53 -0000	1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE


Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-11/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec	20 Mar 2009 10:09:33 -0000	1.1
+++ globus-libtool.spec	17 Apr 2009 21:41:53 -0000	1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
+#		This package is a substitution for the upstream globus-libtool
+#		package, which contains a copy of the libltdl library sources.
+#		Instead this package provides the necessary metadata files to
+#		allow grid-packaging-tools (GPT) to use the libltdl library
+#		provided by the Fedora/RHEL distribution. The package source
+#		is a single GPT source package description file, referencing
+#		the libltdl library as an external library.
 Source:		%{name}-pkg_data_src.gpt.in
-Source9:	GLOBUS_LICENSE
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
 %endif
 Requires:	pkgconfig
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus libtool package (virtual GPT glue package)
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Globus libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
 LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
 
 sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
-    < pkg_data_src.gpt.in > pkg_data_src.gpt
+  < pkg_data_src.gpt.in > pkg_data_src.gpt
 
 echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
   %{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
 echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
   %{flavor}_dev.filelist
 
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
   $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,17 +121,15 @@
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 10:09:34 -0000	1.1
+++ import.log	17 Apr 2009 21:41:53 -0000	1.2
@@ -1 +1,2 @@
 globus-libtool-1_2-1_fc9:HEAD:globus-libtool-1.2-1.fc9.src.rpm:1237543711
+globus-libtool-1_2-2_fc9:F-11:globus-libtool-1.2-2.fc9.src.rpm:1240004454


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:09:34 -0000	1.2
+++ sources	17 Apr 2009 21:41:53 -0000	1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE



From pkgdb at fedoraproject.org  Fri Apr 17 21:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:43:47 +0000
Subject: [pkgdb] safecopy was added for fab
Message-ID: <20090417214347.8FD0710F86B@bastion2.fedora.phx.redhat.com>

kevin has added Package safecopy with summary Safe copying of files and partitions
kevin has approved Package safecopy
kevin has added a Fedora devel branch for safecopy with an owner of fab
kevin has approved safecopy in Fedora devel
kevin has approved Package safecopy
kevin has set commit to Approved for provenpackager on safecopy (Fedora devel)
kevin has set build to Approved for provenpackager on safecopy (Fedora devel)
kevin has set checkout to Approved for provenpackager on safecopy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/safecopy



From pkgdb at fedoraproject.org  Fri Apr 17 21:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:43:49 +0000
Subject: [pkgdb] safecopy (Fedora, 9) updated by kevin
Message-ID: <20090417214349.9F2EF10F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for safecopy
kevin has set commit to Approved for provenpackager on safecopy (Fedora 9)
kevin has set build to Approved for provenpackager on safecopy (Fedora 9)
kevin has set checkout to Approved for provenpackager on safecopy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/safecopy



From kevin at fedoraproject.org  Fri Apr 17 21:44:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:44:05 +0000 (UTC)
Subject: rpms/safecopy - New directory
Message-ID: <20090417214405.2DA777012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/safecopy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22144/rpms/safecopy

Log Message:
Directory /cvs/pkgs/rpms/safecopy added to the repository




From pkgdb at fedoraproject.org  Fri Apr 17 21:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:43:49 +0000
Subject: [pkgdb] safecopy (Fedora, 10) updated by kevin
Message-ID: <20090417214349.A7C7B10F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for safecopy
kevin has set commit to Approved for provenpackager on safecopy (Fedora 10)
kevin has set build to Approved for provenpackager on safecopy (Fedora 10)
kevin has set checkout to Approved for provenpackager on safecopy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/safecopy



From pkgdb at fedoraproject.org  Fri Apr 17 21:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:43:49 +0000
Subject: [pkgdb] safecopy (Fedora, 11) updated by kevin
Message-ID: <20090417214349.C63D710F883@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for safecopy
kevin has set commit to Approved for provenpackager on safecopy (Fedora 11)
kevin has set build to Approved for provenpackager on safecopy (Fedora 11)
kevin has set checkout to Approved for provenpackager on safecopy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/safecopy



From kevin at fedoraproject.org  Fri Apr 17 21:44:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:44:05 +0000 (UTC)
Subject: rpms/safecopy/devel - New directory
Message-ID: <20090417214405.739F47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/safecopy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22144/rpms/safecopy/devel

Log Message:
Directory /cvs/pkgs/rpms/safecopy/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:44:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:44:15 +0000 (UTC)
Subject: rpms/safecopy Makefile,NONE,1.1
Message-ID: <20090417214415.127727012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/safecopy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22144/rpms/safecopy

Added Files:
	Makefile 
Log Message:
Setup of module safecopy


--- NEW FILE Makefile ---
# Top level Makefile for module safecopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:44:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:44:15 +0000 (UTC)
Subject: rpms/safecopy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417214415.569057012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/safecopy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22144/rpms/safecopy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module safecopy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: safecopy
# $Id: Makefile,v 1.1 2009/04/17 21:44:15 kevin Exp $
NAME := safecopy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ellert at fedoraproject.org  Fri Apr 17 21:44:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:44:26 +0000 (UTC)
Subject: rpms/globus-libtool/EL-4 .cvsignore, 1.2, 1.3 globus-libtool.spec,
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417214426.6D07B7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22061/EL-4

Modified Files:
	.cvsignore globus-libtool.spec import.log sources 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
- Add source description comment



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 10:14:00 -0000	1.2
+++ .cvsignore	17 Apr 2009 21:43:56 -0000	1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE


Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-4/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec	20 Mar 2009 10:14:00 -0000	1.1
+++ globus-libtool.spec	17 Apr 2009 21:43:56 -0000	1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
+#		This package is a substitution for the upstream globus-libtool
+#		package, which contains a copy of the libltdl library sources.
+#		Instead this package provides the necessary metadata files to
+#		allow grid-packaging-tools (GPT) to use the libltdl library
+#		provided by the Fedora/RHEL distribution. The package source
+#		is a single GPT source package description file, referencing
+#		the libltdl library as an external library.
 Source:		%{name}-pkg_data_src.gpt.in
-Source9:	GLOBUS_LICENSE
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
 %endif
 Requires:	pkgconfig
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus libtool package (virtual GPT glue package)
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Globus libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
 LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
 
 sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
-    < pkg_data_src.gpt.in > pkg_data_src.gpt
+  < pkg_data_src.gpt.in > pkg_data_src.gpt
 
 echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
   %{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
 echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
   %{flavor}_dev.filelist
 
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
   $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,17 +121,15 @@
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 10:14:00 -0000	1.1
+++ import.log	17 Apr 2009 21:43:56 -0000	1.2
@@ -1 +1,2 @@
 globus-libtool-1_2-1_fc9:EL-4:globus-libtool-1.2-1.fc9.src.rpm:1237544008
+globus-libtool-1_2-2_fc9:EL-4:globus-libtool-1.2-2.fc9.src.rpm:1240004569


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:14:00 -0000	1.2
+++ sources	17 Apr 2009 21:43:56 -0000	1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE



From pkgdb at fedoraproject.org  Fri Apr 17 21:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:44:56 +0000
Subject: [pkgdb] perl-Getopt-ArgvFile was added for iarnell
Message-ID: <20090417214456.EF51F10F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Getopt-ArgvFile with summary Interpolates script options from files into @ARGV or another array
kevin has approved Package perl-Getopt-ArgvFile
kevin has added a Fedora devel branch for perl-Getopt-ArgvFile with an owner of iarnell
kevin has approved perl-Getopt-ArgvFile in Fedora devel
kevin has approved Package perl-Getopt-ArgvFile
kevin has set commit to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-ArgvFile



From pkgdb at fedoraproject.org  Fri Apr 17 21:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:45:00 +0000
Subject: [pkgdb] perl-Getopt-ArgvFile (Fedora, 10) updated by kevin
Message-ID: <20090417214500.DAE4F10F889@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Getopt-ArgvFile
kevin has set commit to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora 10)
kevin approved watchbugzilla on perl-Getopt-ArgvFile (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Getopt-ArgvFile (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-ArgvFile



From pkgdb at fedoraproject.org  Fri Apr 17 21:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:45:00 +0000
Subject: [pkgdb] perl-Getopt-ArgvFile (Fedora, 11) updated by kevin
Message-ID: <20090417214500.E6B9810F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Getopt-ArgvFile
kevin has set commit to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Getopt-ArgvFile (Fedora 11)
kevin approved watchbugzilla on perl-Getopt-ArgvFile (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Getopt-ArgvFile (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-ArgvFile



From pkgdb at fedoraproject.org  Fri Apr 17 21:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 21:45:00 +0000
Subject: [pkgdb] perl-Getopt-ArgvFile (Fedora, devel) updated by kevin
Message-ID: <20090417214501.031DA10F88F@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Getopt-ArgvFile (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Getopt-ArgvFile (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-ArgvFile



From kevin at fedoraproject.org  Fri Apr 17 21:45:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:45:12 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile - New directory
Message-ID: <20090417214512.3A16E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22618/rpms/perl-Getopt-ArgvFile

Log Message:
Directory /cvs/pkgs/rpms/perl-Getopt-ArgvFile added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:45:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:45:12 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/devel - New directory
Message-ID: <20090417214512.9EA557012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22618/rpms/perl-Getopt-ArgvFile/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel added to the repository




From kevin at fedoraproject.org  Fri Apr 17 21:45:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:45:23 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile Makefile,NONE,1.1
Message-ID: <20090417214523.F347B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22618/rpms/perl-Getopt-ArgvFile

Added Files:
	Makefile 
Log Message:
Setup of module perl-Getopt-ArgvFile


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Getopt-ArgvFile
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Apr 17 21:45:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 17 Apr 2009 21:45:24 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090417214524.37D747012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22618/rpms/perl-Getopt-ArgvFile/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Getopt-ArgvFile


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Getopt-ArgvFile
# $Id: Makefile,v 1.1 2009/04/17 21:45:24 kevin Exp $
NAME := perl-Getopt-ArgvFile
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ellert at fedoraproject.org  Fri Apr 17 21:46:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:46:00 +0000 (UTC)
Subject: rpms/globus-libtool/EL-5 .cvsignore, 1.2, 1.3 globus-libtool.spec,
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090417214600.CD8F07012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22723/EL-5

Modified Files:
	.cvsignore globus-libtool.spec import.log sources 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
- Add source description comment



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 10:15:46 -0000	1.2
+++ .cvsignore	17 Apr 2009 21:45:30 -0000	1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE


Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-5/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec	20 Mar 2009 10:15:46 -0000	1.1
+++ globus-libtool.spec	17 Apr 2009 21:45:30 -0000	1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
+#		This package is a substitution for the upstream globus-libtool
+#		package, which contains a copy of the libltdl library sources.
+#		Instead this package provides the necessary metadata files to
+#		allow grid-packaging-tools (GPT) to use the libltdl library
+#		provided by the Fedora/RHEL distribution. The package source
+#		is a single GPT source package description file, referencing
+#		the libltdl library as an external library.
 Source:		%{name}-pkg_data_src.gpt.in
-Source9:	GLOBUS_LICENSE
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
 %endif
 Requires:	pkgconfig
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Globus libtool package (virtual GPT glue package)
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Globus libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
 LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
 
 sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
-    < pkg_data_src.gpt.in > pkg_data_src.gpt
+  < pkg_data_src.gpt.in > pkg_data_src.gpt
 
 echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
   %{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
 echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
   %{flavor}_dev.filelist
 
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
   $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,17 +121,15 @@
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/packages
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 10:15:46 -0000	1.1
+++ import.log	17 Apr 2009 21:45:30 -0000	1.2
@@ -1 +1,2 @@
 globus-libtool-1_2-1_fc9:EL-5:globus-libtool-1.2-1.fc9.src.rpm:1237544115
+globus-libtool-1_2-2_fc9:EL-5:globus-libtool-1.2-2.fc9.src.rpm:1240004686


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2009 10:15:46 -0000	1.2
+++ sources	17 Apr 2009 21:45:30 -0000	1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE



From dcantrel at fedoraproject.org  Fri Apr 17 21:49:20 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 17 Apr 2009 21:49:20 +0000 (UTC)
Subject: rpms/dhcp/devel dhclient-script, 1.9, 1.10 dhcp.spec, 1.251,
	1.252 dhcpd.init, 1.29, 1.30 dhcrelay.init, 1.10, 1.11
Message-ID: <20090417214920.DAD517012B@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24411

Modified Files:
	dhclient-script dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-17
- Fix setting default route when client IP address changes (#486512, #473658)
- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts
  will display usage information and return code 3



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dhclient-script	13 Apr 2009 21:56:00 -0000	1.9
+++ dhclient-script	17 Apr 2009 21:48:50 -0000	1.10
@@ -233,6 +233,7 @@
        [ ! "${old_routers}" = "${new_routers}" ] ||
        [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
         ip -family inet addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
+        ip -family inet link set dev ${interface} up
 
         if [ -n "${new_interface_mtu}" ]; then
             ip link set ${interface} mtu ${new_interface_mtu}


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- dhcp.spec	13 Apr 2009 22:22:38 -0000	1.251
+++ dhcp.spec	17 Apr 2009 21:48:50 -0000	1.252
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  16%{?dist}
+Release:  17%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -419,6 +419,11 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-17
+- Fix setting default route when client IP address changes (#486512, #473658)
+- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts
+  will display usage information and return code 3
+
 * Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
 - Correct %%post problems in dhclient package (#495361)
 - Read hooks scripts from /etc/dhcp (#495361)


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dhcpd.init	13 Jan 2009 14:45:32 -0000	1.29
+++ dhcpd.init	17 Apr 2009 21:48:50 -0000	1.30
@@ -120,9 +120,6 @@
         stop ; start
         RETVAL=$?
         ;;
-    try-restart|reload)
-        RETVAL=3
-        ;;
     condrestart)
         if [ -f $lockfile ]; then
             stop ; start


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcrelay.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dhcrelay.init	18 Dec 2008 22:47:13 -0000	1.10
+++ dhcrelay.init	17 Apr 2009 21:48:50 -0000	1.11
@@ -98,9 +98,6 @@
         stop && start
         RETVAL=$?
         ;;
-    try-restart|reload)
-        RETVAL=3
-        ;;
     condrestart)
         if [ -f $lockfile ]; then
             stop && start



From ellert at fedoraproject.org  Fri Apr 17 21:51:40 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:51:40 +0000 (UTC)
Subject: rpms/globus-common/devel globus-common.spec, 1.1, 1.2 import.log,
	1.1, 1.2
Message-ID: <20090417215140.E69D07012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24844/devel

Modified Files:
	globus-common.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
- Remove config.guess file



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/globus-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-common.spec	7 Apr 2009 07:40:27 -0000	1.1
+++ globus-common.spec	17 Apr 2009 21:51:10 -0000	1.2
@@ -1,8 +1,16 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,6 +28,8 @@
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
+#		This is a workaround for the broken epstopdf script in RHEL5
+#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source8:	epstopdf-2.9.5gw
 Source9:	GLOBUS_LICENSE
 #		Environment variable elimination patch:
@@ -90,8 +100,6 @@
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool >= 1
-Requires:	globus-common-progs >= 3
-Requires:	globus-common-setup >= 2
 %if %{?fedora}%{!?fedora:0}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -108,58 +116,45 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool-devel >= 1
 Requires:	globus-core >= 4
-Requires:	pkgconfig
 
 %package doc
 Summary:	Globus Toolkit - Common Library Documentation Files
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Common Library
 
 %description progs
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-progs package contains:
 Common Library Programs
 Common Setup
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Common Library Development Files
 
 %description doc
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-doc package contains:
 Common Library Documentation Files
@@ -190,8 +185,6 @@
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 %if "%{rhel}" == "5"
 mkdir bin
 install %{SOURCE8} bin/epstopdf
@@ -202,24 +195,23 @@
 export PATH=$PWD/bin:$PATH
 %endif
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+# Remove flavor tags
 for f in `find . -name Makefile.am` ; do
   sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
       -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
-  mv $f.new $f
+      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
 done
-
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
-mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
+  -i pkgdata/pkg_data_src.gpt.in
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
 
@@ -228,13 +220,14 @@
 # setup package
 cd %{_name}_setup-%{setupversion}
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --without-flavor --with-secure-tmpdir=/var/tmp
 
@@ -255,10 +248,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd -
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
 
 # Register setup
 perl -MGrid::GPT::Setup <<EOF
@@ -268,82 +262,69 @@
 EOF
 
 # Remove libtool archives (.la files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.la$' < $l > $l.new
-  mv $l.new $l
-done
+sed '/lib.*\.la$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+sed '/lib.*\.a$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
 
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.a$' < $l > $l.new
-  mv $l.new $l
-done
-
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Move globus-makefile-header to devel package
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep globus-makefile-header >> \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep -v globus-makefile-header > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+grep globus-makefile-header \
+  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed /globus-makefile-header/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+
+# Remove config.guess file (conflicts with grid-packaging-tools package)
+rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
+sed /config.guess/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed s!doc/%{_name}!doc/%{name}-%{version}! \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' < $f > $f.new
-  mv $f.new $f
+  sed 's/P\.RS/P\n.RS/' -i $f
 done
 
+# Remove unwanted documentation
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | grep -v 'deprecated\.3' \
-  | grep -v '_%{_name}-%{version}_.*\.3' > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/deprecated\.3/d' \
+    -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package-progs.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed 's!/man/.*!&*!' \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+# Touch ghost files
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
+# Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -371,9 +352,7 @@
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%dir %{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/packages/setup/%{_name}_setup
-%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
+%{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
@@ -390,11 +369,14 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
+- Remove config.guess file
+
 * Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
 - Change defines to globals
 
 * Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
-- Make comment about source retieval more explicit
+- Make comment about source retrieval more explicit
 
 * Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
 - Adapting to updated globus-core package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2009 07:40:27 -0000	1.1
+++ import.log	17 Apr 2009 21:51:10 -0000	1.2
@@ -1 +1,2 @@
 globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760
+globus-common-10_2-2_fc9:HEAD:globus-common-10.2-2.fc9.src.rpm:1240004909



From ellert at fedoraproject.org  Fri Apr 17 21:53:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:53:52 +0000 (UTC)
Subject: rpms/globus-common/F-9 globus-common.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090417215352.ACF927012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25479/F-9

Modified Files:
	globus-common.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
- Remove config.guess file



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/globus-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-common.spec	7 Apr 2009 07:43:09 -0000	1.1
+++ globus-common.spec	17 Apr 2009 21:53:22 -0000	1.2
@@ -1,8 +1,16 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,6 +28,8 @@
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
+#		This is a workaround for the broken epstopdf script in RHEL5
+#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source8:	epstopdf-2.9.5gw
 Source9:	GLOBUS_LICENSE
 #		Environment variable elimination patch:
@@ -90,8 +100,6 @@
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool >= 1
-Requires:	globus-common-progs >= 3
-Requires:	globus-common-setup >= 2
 %if %{?fedora}%{!?fedora:0}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -108,58 +116,45 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool-devel >= 1
 Requires:	globus-core >= 4
-Requires:	pkgconfig
 
 %package doc
 Summary:	Globus Toolkit - Common Library Documentation Files
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Common Library
 
 %description progs
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-progs package contains:
 Common Library Programs
 Common Setup
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Common Library Development Files
 
 %description doc
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-doc package contains:
 Common Library Documentation Files
@@ -190,8 +185,6 @@
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 %if "%{rhel}" == "5"
 mkdir bin
 install %{SOURCE8} bin/epstopdf
@@ -202,24 +195,23 @@
 export PATH=$PWD/bin:$PATH
 %endif
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+# Remove flavor tags
 for f in `find . -name Makefile.am` ; do
   sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
       -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
-  mv $f.new $f
+      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
 done
-
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
-mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
+  -i pkgdata/pkg_data_src.gpt.in
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
 
@@ -228,13 +220,14 @@
 # setup package
 cd %{_name}_setup-%{setupversion}
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --without-flavor --with-secure-tmpdir=/var/tmp
 
@@ -255,10 +248,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd -
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
 
 # Register setup
 perl -MGrid::GPT::Setup <<EOF
@@ -268,82 +262,69 @@
 EOF
 
 # Remove libtool archives (.la files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.la$' < $l > $l.new
-  mv $l.new $l
-done
+sed '/lib.*\.la$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+sed '/lib.*\.a$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
 
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.a$' < $l > $l.new
-  mv $l.new $l
-done
-
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Move globus-makefile-header to devel package
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep globus-makefile-header >> \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep -v globus-makefile-header > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+grep globus-makefile-header \
+  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed /globus-makefile-header/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+
+# Remove config.guess file (conflicts with grid-packaging-tools package)
+rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
+sed /config.guess/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed s!doc/%{_name}!doc/%{name}-%{version}! \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' < $f > $f.new
-  mv $f.new $f
+  sed 's/P\.RS/P\n.RS/' -i $f
 done
 
+# Remove unwanted documentation
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | grep -v 'deprecated\.3' \
-  | grep -v '_%{_name}-%{version}_.*\.3' > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/deprecated\.3/d' \
+    -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package-progs.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed 's!/man/.*!&*!' \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+# Touch ghost files
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
+# Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -371,9 +352,7 @@
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%dir %{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/packages/setup/%{_name}_setup
-%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
+%{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
@@ -390,11 +369,14 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
+- Remove config.guess file
+
 * Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
 - Change defines to globals
 
 * Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
-- Make comment about source retieval more explicit
+- Make comment about source retrieval more explicit
 
 * Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
 - Adapting to updated globus-core package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2009 07:43:09 -0000	1.1
+++ import.log	17 Apr 2009 21:53:22 -0000	1.2
@@ -1 +1,2 @@
 globus-common-10_2-1_fc9:F-9:globus-common-10.2-1.fc9.src.rpm:1239090158
+globus-common-10_2-2_fc9:F-9:globus-common-10.2-2.fc9.src.rpm:1240005128



From orion at fedoraproject.org  Fri Apr 17 21:55:33 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 17 Apr 2009 21:55:33 +0000 (UTC)
Subject: rpms/g2clib/devel g2clib.spec,1.5,1.6
Message-ID: <20090417215533.3EEE97012B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/g2clib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26024

Modified Files:
	g2clib.spec 
Log Message:
Fix changelog



Index: g2clib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g2clib/devel/g2clib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- g2clib.spec	24 Feb 2009 19:09:27 -0000	1.5
+++ g2clib.spec	17 Apr 2009 21:55:02 -0000	1.6
@@ -73,7 +73,7 @@
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu Aug 28 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.7-1
+* Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> - 1.1.7-1
 - Update to 1.1.7
 - Add quotes around %%{__cc} as it can be multi-word
 



From ellert at fedoraproject.org  Fri Apr 17 21:55:35 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:55:35 +0000 (UTC)
Subject: rpms/globus-common/F-10 globus-common.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090417215535.296D17012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26041/F-10

Modified Files:
	globus-common.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
- Remove config.guess file



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-common.spec	7 Apr 2009 08:31:54 -0000	1.1
+++ globus-common.spec	17 Apr 2009 21:55:04 -0000	1.2
@@ -1,8 +1,16 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,6 +28,8 @@
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
+#		This is a workaround for the broken epstopdf script in RHEL5
+#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source8:	epstopdf-2.9.5gw
 Source9:	GLOBUS_LICENSE
 #		Environment variable elimination patch:
@@ -90,8 +100,6 @@
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool >= 1
-Requires:	globus-common-progs >= 3
-Requires:	globus-common-setup >= 2
 %if %{?fedora}%{!?fedora:0}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -108,58 +116,45 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool-devel >= 1
 Requires:	globus-core >= 4
-Requires:	pkgconfig
 
 %package doc
 Summary:	Globus Toolkit - Common Library Documentation Files
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Common Library
 
 %description progs
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-progs package contains:
 Common Library Programs
 Common Setup
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Common Library Development Files
 
 %description doc
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-doc package contains:
 Common Library Documentation Files
@@ -190,8 +185,6 @@
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 %if "%{rhel}" == "5"
 mkdir bin
 install %{SOURCE8} bin/epstopdf
@@ -202,24 +195,23 @@
 export PATH=$PWD/bin:$PATH
 %endif
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+# Remove flavor tags
 for f in `find . -name Makefile.am` ; do
   sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
       -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
-  mv $f.new $f
+      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
 done
-
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
-mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
+  -i pkgdata/pkg_data_src.gpt.in
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
 
@@ -228,13 +220,14 @@
 # setup package
 cd %{_name}_setup-%{setupversion}
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --without-flavor --with-secure-tmpdir=/var/tmp
 
@@ -255,10 +248,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd -
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
 
 # Register setup
 perl -MGrid::GPT::Setup <<EOF
@@ -268,82 +262,69 @@
 EOF
 
 # Remove libtool archives (.la files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.la$' < $l > $l.new
-  mv $l.new $l
-done
+sed '/lib.*\.la$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+sed '/lib.*\.a$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
 
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.a$' < $l > $l.new
-  mv $l.new $l
-done
-
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Move globus-makefile-header to devel package
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep globus-makefile-header >> \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep -v globus-makefile-header > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+grep globus-makefile-header \
+  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed /globus-makefile-header/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+
+# Remove config.guess file (conflicts with grid-packaging-tools package)
+rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
+sed /config.guess/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed s!doc/%{_name}!doc/%{name}-%{version}! \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' < $f > $f.new
-  mv $f.new $f
+  sed 's/P\.RS/P\n.RS/' -i $f
 done
 
+# Remove unwanted documentation
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | grep -v 'deprecated\.3' \
-  | grep -v '_%{_name}-%{version}_.*\.3' > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/deprecated\.3/d' \
+    -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package-progs.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed 's!/man/.*!&*!' \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+# Touch ghost files
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
+# Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -371,9 +352,7 @@
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%dir %{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/packages/setup/%{_name}_setup
-%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
+%{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
@@ -390,11 +369,14 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
+- Remove config.guess file
+
 * Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
 - Change defines to globals
 
 * Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
-- Make comment about source retieval more explicit
+- Make comment about source retrieval more explicit
 
 * Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
 - Adapting to updated globus-core package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2009 08:31:54 -0000	1.1
+++ import.log	17 Apr 2009 21:55:04 -0000	1.2
@@ -1 +1,2 @@
 globus-common-10_2-1_fc9:F-10:globus-common-10.2-1.fc9.src.rpm:1239093082
+globus-common-10_2-2_fc9:F-10:globus-common-10.2-2.fc9.src.rpm:1240005254



From karsten at fedoraproject.org  Fri Apr 17 21:56:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 17 Apr 2009 21:56:10 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.68,1.69
Message-ID: <20090417215610.50E107012B@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26211

Modified Files:
	nautilus-sendto.spec 
Log Message:
- don't require pidgin-* on s390, s390x as that has ExcludeArch s390(x)


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- nautilus-sendto.spec	17 Apr 2009 15:44:38 -0000	1.68
+++ nautilus-sendto.spec	17 Apr 2009 21:55:39 -0000	1.69
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        1.1.4
-Release: 	1%{?dist}
+Release: 	1%{?dist}.1
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -14,7 +14,9 @@
 BuildRequires:  evolution-data-server-devel >= 1.9.1
 BuildRequires:  libgnomeui-devel
 BuildRequires:  nautilus-devel >= 2.5.4
+%ifnarch s390 s390x
 BuildRequires:  pidgin-devel >= 2.0.0
+%endif
 BuildRequires:  gettext
 BuildRequires:  perl-XML-Parser intltool
 BuildRequires:  dbus-glib-devel >= 0.70
@@ -94,6 +96,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Fri Apr 17 2009 Karsten Hopp <karsten at redhat.com> 1.1.4-1.1
+- don't require pidgin-* on s390, s390x as that has ExcludeArch s390(x)
+
 * Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-1
 - Update to 1.1.4
 



From ellert at fedoraproject.org  Fri Apr 17 21:57:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:57:05 +0000 (UTC)
Subject: rpms/globus-common/F-11 globus-common.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090417215705.B88F27012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26575/F-11

Modified Files:
	globus-common.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
- Remove config.guess file



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-common.spec	7 Apr 2009 07:40:27 -0000	1.1
+++ globus-common.spec	17 Apr 2009 21:56:35 -0000	1.2
@@ -1,8 +1,16 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,6 +28,8 @@
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
+#		This is a workaround for the broken epstopdf script in RHEL5
+#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source8:	epstopdf-2.9.5gw
 Source9:	GLOBUS_LICENSE
 #		Environment variable elimination patch:
@@ -90,8 +100,6 @@
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool >= 1
-Requires:	globus-common-progs >= 3
-Requires:	globus-common-setup >= 2
 %if %{?fedora}%{!?fedora:0}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -108,58 +116,45 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool-devel >= 1
 Requires:	globus-core >= 4
-Requires:	pkgconfig
 
 %package doc
 Summary:	Globus Toolkit - Common Library Documentation Files
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Common Library
 
 %description progs
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-progs package contains:
 Common Library Programs
 Common Setup
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Common Library Development Files
 
 %description doc
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-doc package contains:
 Common Library Documentation Files
@@ -190,8 +185,6 @@
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 %if "%{rhel}" == "5"
 mkdir bin
 install %{SOURCE8} bin/epstopdf
@@ -202,24 +195,23 @@
 export PATH=$PWD/bin:$PATH
 %endif
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+# Remove flavor tags
 for f in `find . -name Makefile.am` ; do
   sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
       -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
-  mv $f.new $f
+      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
 done
-
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
-mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
+  -i pkgdata/pkg_data_src.gpt.in
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
 
@@ -228,13 +220,14 @@
 # setup package
 cd %{_name}_setup-%{setupversion}
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --without-flavor --with-secure-tmpdir=/var/tmp
 
@@ -255,10 +248,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd -
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
 
 # Register setup
 perl -MGrid::GPT::Setup <<EOF
@@ -268,82 +262,69 @@
 EOF
 
 # Remove libtool archives (.la files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.la$' < $l > $l.new
-  mv $l.new $l
-done
+sed '/lib.*\.la$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+sed '/lib.*\.a$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
 
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.a$' < $l > $l.new
-  mv $l.new $l
-done
-
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Move globus-makefile-header to devel package
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep globus-makefile-header >> \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep -v globus-makefile-header > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+grep globus-makefile-header \
+  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed /globus-makefile-header/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+
+# Remove config.guess file (conflicts with grid-packaging-tools package)
+rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
+sed /config.guess/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed s!doc/%{_name}!doc/%{name}-%{version}! \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' < $f > $f.new
-  mv $f.new $f
+  sed 's/P\.RS/P\n.RS/' -i $f
 done
 
+# Remove unwanted documentation
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | grep -v 'deprecated\.3' \
-  | grep -v '_%{_name}-%{version}_.*\.3' > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/deprecated\.3/d' \
+    -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package-progs.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed 's!/man/.*!&*!' \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+# Touch ghost files
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
+# Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -371,9 +352,7 @@
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%dir %{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/packages/setup/%{_name}_setup
-%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
+%{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
@@ -390,11 +369,14 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
+- Remove config.guess file
+
 * Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
 - Change defines to globals
 
 * Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
-- Make comment about source retieval more explicit
+- Make comment about source retrieval more explicit
 
 * Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
 - Adapting to updated globus-core package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2009 07:40:27 -0000	1.1
+++ import.log	17 Apr 2009 21:56:35 -0000	1.2
@@ -1 +1,2 @@
 globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760
+globus-common-10_2-2_fc9:F-11:globus-common-10.2-2.fc9.src.rpm:1240005358



From mclasen at fedoraproject.org  Fri Apr 17 21:57:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 17 Apr 2009 21:57:22 +0000 (UTC)
Subject: rpms/vino/F-11 restart-loop.patch,NONE,1.1 vino.spec,1.94,1.95
Message-ID: <20090417215722.237967012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26667

Modified Files:
	vino.spec 
Added Files:
	restart-loop.patch 
Log Message:
Avoid restarting vino-server in a loop


restart-loop.patch:

--- NEW FILE restart-loop.patch ---
diff -up vino-2.26.1/server/vino-server.desktop.in.in.restart-loop vino-2.26.1/server/vino-server.desktop.in.in
--- vino-2.26.1/server/vino-server.desktop.in.in.restart-loop	2009-04-17 17:50:25.877439480 -0400
+++ vino-2.26.1/server/vino-server.desktop.in.in	2008-12-16 11:59:28.000000000 -0500
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Remote Desktop
 _Comment=GNOME Remote Desktop Server
-Exec=@LIBEXECDIR@/vino-server --sm-disable
+Exec=@LIBEXECDIR@/vino-server
 Icon=preferences-desktop-remote-desktop
 OnlyShowIn=GNOME;
 Terminal=false
diff -up vino-2.26.1/server/vino-server.desktop.in.restart-loop vino-2.26.1/server/vino-server.desktop.in
--- vino-2.26.1/server/vino-server.desktop.in.restart-loop	2009-04-17 17:50:37.206439463 -0400
+++ vino-2.26.1/server/vino-server.desktop.in	2009-04-17 17:21:40.428452751 -0400
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Remote Desktop
 _Comment=GNOME Remote Desktop Server
-Exec=/usr/libexec/vino-server --sm-disable
+Exec=/usr/libexec/vino-server
 Icon=preferences-desktop-remote-desktop
 OnlyShowIn=GNOME;
 Terminal=false


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/F-11/vino.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vino.spec	13 Apr 2009 17:21:11 -0000	1.94
+++ vino.spec	17 Apr 2009 21:56:51 -0000	1.95
@@ -9,13 +9,16 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.26/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579355
+Patch0: restart-loop.patch
+
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
@@ -41,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .restart-loop
 
 %build
 %configure                   	\
@@ -108,6 +112,9 @@
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Fri Apr 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Avoid restarting vino-server in a loop
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/vino/2.26/vino-2.26.1.news



From ellert at fedoraproject.org  Fri Apr 17 21:59:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 21:59:23 +0000 (UTC)
Subject: rpms/globus-common/EL-4 globus-common.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090417215923.3C1387012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27248/EL-4

Modified Files:
	globus-common.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
- Remove config.guess file



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/globus-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-common.spec	7 Apr 2009 07:45:46 -0000	1.1
+++ globus-common.spec	17 Apr 2009 21:58:52 -0000	1.2
@@ -1,8 +1,16 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,6 +28,8 @@
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
+#		This is a workaround for the broken epstopdf script in RHEL5
+#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source8:	epstopdf-2.9.5gw
 Source9:	GLOBUS_LICENSE
 #		Environment variable elimination patch:
@@ -90,8 +100,6 @@
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool >= 1
-Requires:	globus-common-progs >= 3
-Requires:	globus-common-setup >= 2
 %if %{?fedora}%{!?fedora:0}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -108,58 +116,45 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool-devel >= 1
 Requires:	globus-core >= 4
-Requires:	pkgconfig
 
 %package doc
 Summary:	Globus Toolkit - Common Library Documentation Files
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Common Library
 
 %description progs
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-progs package contains:
 Common Library Programs
 Common Setup
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Common Library Development Files
 
 %description doc
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-doc package contains:
 Common Library Documentation Files
@@ -190,8 +185,6 @@
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 %if "%{rhel}" == "5"
 mkdir bin
 install %{SOURCE8} bin/epstopdf
@@ -202,24 +195,23 @@
 export PATH=$PWD/bin:$PATH
 %endif
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+# Remove flavor tags
 for f in `find . -name Makefile.am` ; do
   sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
       -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
-  mv $f.new $f
+      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
 done
-
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
-mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
+  -i pkgdata/pkg_data_src.gpt.in
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
 
@@ -228,13 +220,14 @@
 # setup package
 cd %{_name}_setup-%{setupversion}
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --without-flavor --with-secure-tmpdir=/var/tmp
 
@@ -255,10 +248,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd -
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
 
 # Register setup
 perl -MGrid::GPT::Setup <<EOF
@@ -268,82 +262,69 @@
 EOF
 
 # Remove libtool archives (.la files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.la$' < $l > $l.new
-  mv $l.new $l
-done
+sed '/lib.*\.la$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+sed '/lib.*\.a$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
 
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.a$' < $l > $l.new
-  mv $l.new $l
-done
-
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Move globus-makefile-header to devel package
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep globus-makefile-header >> \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep -v globus-makefile-header > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+grep globus-makefile-header \
+  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed /globus-makefile-header/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+
+# Remove config.guess file (conflicts with grid-packaging-tools package)
+rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
+sed /config.guess/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed s!doc/%{_name}!doc/%{name}-%{version}! \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' < $f > $f.new
-  mv $f.new $f
+  sed 's/P\.RS/P\n.RS/' -i $f
 done
 
+# Remove unwanted documentation
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | grep -v 'deprecated\.3' \
-  | grep -v '_%{_name}-%{version}_.*\.3' > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/deprecated\.3/d' \
+    -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package-progs.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed 's!/man/.*!&*!' \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+# Touch ghost files
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
+# Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -371,9 +352,7 @@
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%dir %{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/packages/setup/%{_name}_setup
-%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
+%{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
@@ -390,11 +369,14 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
+- Remove config.guess file
+
 * Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
 - Change defines to globals
 
 * Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
-- Make comment about source retieval more explicit
+- Make comment about source retrieval more explicit
 
 * Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
 - Adapting to updated globus-core package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2009 07:45:46 -0000	1.1
+++ import.log	17 Apr 2009 21:58:52 -0000	1.2
@@ -1 +1,2 @@
 globus-common-10_2-1_fc9:EL-4:globus-common-10.2-1.fc9.src.rpm:1239090310
+globus-common-10_2-2_fc9:EL-4:globus-common-10.2-2.fc9.src.rpm:1240005453



From orion at fedoraproject.org  Fri Apr 17 22:00:29 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 17 Apr 2009 22:00:29 +0000 (UTC)
Subject: rpms/g2clib/devel .cvsignore, 1.3, 1.4 g2clib.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <20090417220029.E37E67012B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/g2clib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27679

Modified Files:
	.cvsignore g2clib.spec sources 
Log Message:
* Fri Apr 17 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1.8-1
- Update to 1.1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/g2clib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Aug 2008 20:34:25 -0000	1.3
+++ .cvsignore	17 Apr 2009 21:59:59 -0000	1.4
@@ -1 +1 @@
-g2clib-1.1.7.tar
+g2clib-1.1.8.tar


Index: g2clib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g2clib/devel/g2clib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- g2clib.spec	17 Apr 2009 21:55:02 -0000	1.6
+++ g2clib.spec	17 Apr 2009 21:59:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           g2clib
-Version:        1.1.7
-Release:        2%{?dist}
+Version:        1.1.8
+Release:        1%{?dist}
 Summary:        GRIB2 encoder/decoder and search/indexing routines in C
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1.8-1
+- Update to 1.1.8
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/g2clib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Aug 2008 20:34:25 -0000	1.3
+++ sources	17 Apr 2009 21:59:59 -0000	1.4
@@ -1 +1 @@
-86847c36c2ab173454a9762c00f121d8  g2clib-1.1.7.tar
+9191bcb53dd7e83be47a19a098f4fbaa  g2clib-1.1.8.tar



From ellert at fedoraproject.org  Fri Apr 17 22:00:51 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:00:51 +0000 (UTC)
Subject: rpms/globus-common/EL-5 globus-common.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090417220051.F30067012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27818/EL-5

Modified Files:
	globus-common.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
- Remove config.guess file



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/globus-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-common.spec	7 Apr 2009 07:48:04 -0000	1.1
+++ globus-common.spec	17 Apr 2009 22:00:21 -0000	1.2
@@ -1,8 +1,16 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,6 +28,8 @@
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
+#		This is a workaround for the broken epstopdf script in RHEL5
+#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source8:	epstopdf-2.9.5gw
 Source9:	GLOBUS_LICENSE
 #		Environment variable elimination patch:
@@ -90,8 +100,6 @@
 Provides:	%{name}-setup = %{setupversion}
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool >= 1
-Requires:	globus-common-progs >= 3
-Requires:	globus-common-setup >= 2
 %if %{?fedora}%{!?fedora:0}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -108,58 +116,45 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	globus-libtool-devel >= 1
 Requires:	globus-core >= 4
-Requires:	pkgconfig
 
 %package doc
 Summary:	Globus Toolkit - Common Library Documentation Files
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %description
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name} package contains:
 Common Library
 
 %description progs
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-progs package contains:
 Common Library Programs
 Common Setup
 
 %description devel
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-devel package contains:
 Common Library Development Files
 
 %description doc
-The Globus Toolkit is an open source software toolkit used for
-building Grid systems and applications. It is being developed by the
-Globus Alliance and many others all over the world. A growing number
-of projects and companies are using the Globus Toolkit to unlock the
-potential of grids for their cause.
+The Globus Toolkit is an open source software toolkit used for building Grid
+systems and applications. It is being developed by the Globus Alliance and
+many others all over the world. A growing number of projects and companies are
+using the Globus Toolkit to unlock the potential of grids for their cause.
 
 The %{name}-doc package contains:
 Common Library Documentation Files
@@ -190,8 +185,6 @@
 %global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 %if "%{rhel}" == "5"
 mkdir bin
 install %{SOURCE8} bin/epstopdf
@@ -202,24 +195,23 @@
 export PATH=$PWD/bin:$PATH
 %endif
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+# Remove flavor tags
 for f in `find . -name Makefile.am` ; do
   sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
       -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' < $f > $f.new
-  mv $f.new $f
+      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
 done
-
 sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-	< pkgdata/pkg_data_src.gpt.in > pkgdata/pkg_data_src.gpt.in.new
-mv pkgdata/pkg_data_src.gpt.in.new pkgdata/pkg_data_src.gpt.in
+  -i pkgdata/pkg_data_src.gpt.in
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --with-flavor=%{flavor} --enable-doxygen
 
@@ -228,13 +220,14 @@
 # setup package
 cd %{_name}_setup-%{setupversion}
 
+# Remove files that should be replaced during bootstrap
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
 rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-/usr/share/globus/globus-bootstrap.sh
+%{_datadir}/globus/globus-bootstrap.sh
 
 %configure --without-flavor --with-secure-tmpdir=/var/tmp
 
@@ -255,10 +248,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd -
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-args-parser-header
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-common.pl
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-script-initializer
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools.sh
 
 # Register setup
 perl -MGrid::GPT::Setup <<EOF
@@ -268,82 +262,69 @@
 EOF
 
 # Remove libtool archives (.la files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.la$' < $l > $l.new
-  mv $l.new $l
-done
+sed '/lib.*\.la$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
-test -d $RPM_BUILD_ROOT%{_libdir} && \
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+sed '/lib.*\.a$/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
 
-for l in $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/*.filelist ; do
-  grep -v 'lib.*\.a$' < $l > $l.new
-  mv $l.new $l
-done
-
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # Move globus-makefile-header to devel package
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep globus-makefile-header >> \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
-  | grep -v globus-makefile-header > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+grep globus-makefile-header \
+  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed /globus-makefile-header/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+
+# Remove config.guess file (conflicts with grid-packaging-tools package)
+rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
+sed /config.guess/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed s!doc/%{_name}!doc/%{name}-%{version}! > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed s!doc/%{_name}!doc/%{name}-%{version}! \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' < $f > $f.new
-  mv $f.new $f
+  sed 's/P\.RS/P\n.RS/' -i $f
 done
 
+# Remove unwanted documentation
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | grep -v 'deprecated\.3' \
-  | grep -v '_%{_name}-%{version}_.*\.3' > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/deprecated\.3/d' \
+    -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package-progs.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  | sed 's!/man/.*!&*!' \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+# Touch ghost files
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
+# Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -371,9 +352,7 @@
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}_setup
-%dir %{_datadir}/globus/packages/setup
-%dir %{_datadir}/globus/packages/setup/%{_name}_setup
-%{_datadir}/globus/packages/setup/%{_name}_setup/%{_name}_setup.gpt
+%{_datadir}/globus/packages/setup
 %dir %{_datadir}/globus/setup
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
@@ -390,11 +369,14 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
+- Remove config.guess file
+
 * Tue Apr 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
 - Change defines to globals
 
 * Mon Apr 06 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.6
-- Make comment about source retieval more explicit
+- Make comment about source retrieval more explicit
 
 * Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-0.5
 - Adapting to updated globus-core package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2009 07:48:04 -0000	1.1
+++ import.log	17 Apr 2009 22:00:21 -0000	1.2
@@ -1 +1,2 @@
 globus-common-10_2-1_fc9:EL-5:globus-common-10.2-1.fc9.src.rpm:1239090450
+globus-common-10_2-2_fc9:EL-5:globus-common-10.2-2.fc9.src.rpm:1240005583



From trasher at fedoraproject.org  Fri Apr 17 22:03:31 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 17 Apr 2009 22:03:31 +0000 (UTC)
Subject: rpms/yakuake/devel yakuake-2.9.4-qt4.5.patch, NONE, 1.1 yakuake.spec,
	1.12, 1.13
Message-ID: <20090417220331.27EE07012B@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/yakuake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28453

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-2.9.4-qt4.5.patch 
Log Message:
Fix QT 4.5 bug (bz #494993)


yakuake-2.9.4-qt4.5.patch:

--- NEW FILE yakuake-2.9.4-qt4.5.patch ---
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/07 00:27:24	950384
+++ trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/11 18:32:17	952380
@@ -473,31 +473,55 @@
 
 void MainWindow::updateWindowWidthMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowWidthMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowWidthMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowWidthMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::width());
+        }
+    }
+    else
     {
-        action = m_windowWidthMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::width());
+        QListIterator<QAction*> i(m_windowWidthMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::width());
+        }
     }
 }
 
 void MainWindow::updateWindowHeightMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowHeightMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowHeightMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowHeightMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::height());
+        }
+    }
+    else
     {
-        action = m_windowHeightMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::height());
+        QListIterator<QAction*> i(m_windowHeightMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::height());
+        }
     }
 }
 



Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yakuake.spec	25 Feb 2009 18:04:27 -0000	1.12
+++ yakuake.spec	17 Apr 2009 22:03:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           yakuake
 Version:        2.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Terminal emulator
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@
 Source0:        http://download.berlios.de/yakuake/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         yakuake-2.9.4-qt4.5.patch
+
 Requires:       kdebase
 
 BuildRequires:  desktop-file-utils
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q 
+%patch0 -p4
 
 
 %build
@@ -75,6 +78,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 
 %changelog
+* Sat Apr 17 2009 Johan Cwiklinski <johan AT x-tnd DOT be>  2.9.4-3
+- Fix crash with QT 4.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ajax at fedoraproject.org  Fri Apr 17 22:04:45 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 17 Apr 2009 22:04:45 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1558,1.1559
Message-ID: <20090417220445.F30BE7012B@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28803

Modified Files:
	kernel.spec 
Log Message:
* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-97
- drm-intel-tiled-front.patch: Enable tiled front buffer on gen4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1558
retrieving revision 1.1559
diff -u -r1.1558 -r1.1559
--- kernel.spec	17 Apr 2009 21:35:04 -0000	1.1558
+++ kernel.spec	17 Apr 2009 22:04:15 -0000	1.1559
@@ -1971,7 +1971,7 @@
 # and build.
 
 %changelog
-* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com>
+* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-97
 - drm-intel-tiled-front.patch: Enable tiled front buffer on gen4
 
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-95



From ellert at fedoraproject.org  Fri Apr 17 22:05:55 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:05:55 +0000 (UTC)
Subject: rpms/globus-openssl/devel globus-openssl-pkg_data_src.gpt.in, NONE, 
	1.1 globus-openssl.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090417220555.91B2F7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29333/devel

Added Files:
	globus-openssl-pkg_data_src.gpt.in globus-openssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals



--- NEW FILE globus-openssl-pkg_data_src.gpt.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Name="globus_openssl" Format_Version="0.02">
    <Aging_Version Major="3" Minor="0" Age="2"/>
    <Description>Openssl Library</Description>
    <Functional_Group>Openssl</Functional_Group>
    <Version_Stability Release="Experimental"/>

    <src_pkg>
        <Version_Label>@OPENSSL_VERSION@</Version_Label>

        <Source_Dependencies Type="compile">
        </Source_Dependencies>

        <With_Flavors ColocateLibraries="no" build="yes"/>

        <Build_Environment>
            <cflags></cflags>
            <external_includes>@OPENSSL_INCLUDES@</external_includes>
            <external_libs>@OPENSSL_LIBS@</external_libs>
            <pkg_libs></pkg_libs>
        </Build_Environment>
    </src_pkg>

</gpt_package_metadata>


--- NEW FILE globus-openssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%global debug_package %{nil}

Name:		globus-openssl
%global _name %(tr - _ <<< %{name})
Version:	3.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Openssl Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		This package is a substitution for the upstream globus-openssl
#		package, which contains a copy of the openssl library sources.
#		Instead this package provides the necessary metadata files to
#		allow grid-packaging-tools (GPT) to use the openssl library
#		provided by the Fedora/RHEL distribution. The package source
#		is a single GPT source package description file, referencing
#		the openssl library as an external library.
Source:		%{name}-pkg_data_src.gpt.in
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	openssl
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	openssl-devel

%package progs
Summary:	Globus Toolkit - Openssl Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - Openssl Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	openssl-devel
#		Workaround for broken openssl-devel on RHL9 (it is missing
#		Requires: zlib-devel)
%if %{?fedora:0}%{!?fedora:1}
%if %{?rhel:0}%{!?rhel:1}
Requires:	zlib-devel
%endif
%endif

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Openssl Library (virtual GPT glue package)

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Openssl Library Programs (virtual GPT glue package)

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Openssl Library Development Files (virtual GPT glue package)

%prep
%setup -T -c
cp -p %{SOURCE0} pkg_data_src.gpt.in

%build
OPENSSL_VERSION=`pkg-config openssl --modversion`
OPENSSL_INCLUDES=`pkg-config openssl --cflags`
OPENSSL_LIBS=`pkg-config openssl --libs`

sed -e "s!@OPENSSL_VERSION@!$OPENSSL_VERSION!g" \
    -e "s!@OPENSSL_INCLUDES@!$OPENSSL_INCLUDES!g" \
    -e "s!@OPENSSL_LIBS@!$OPENSSL_LIBS!g" \
  < pkg_data_src.gpt.in > pkg_data_src.gpt

echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
  %{flavor}_rtl.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_rtl.gpt >> \
  %{flavor}_rtl.filelist

echo /share/globus/packages/%{_name}/%{flavor}_pgm.filelist > \
  %{flavor}_pgm.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_pgm.gpt >> \
  %{flavor}_pgm.filelist

echo /share/globus/packages/%{_name}/%{flavor}_dev.filelist > \
  %{flavor}_dev.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
  %{flavor}_dev.filelist

%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt | \
  sed -e 's/Requires:.*/Requires: openssl/' \
      -e 's/Cflags:.*/Cflags:/' \
      -e 's/Libs:.*/Libs:/' > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals

* Wed Apr 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.6
- Add source description comment

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-3_0-1_fc9:HEAD:globus-openssl-3.0-1.fc9.src.rpm:1240005899



From ellert at fedoraproject.org  Fri Apr 17 22:07:02 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:07:02 +0000 (UTC)
Subject: rpms/globus-openssl/F-9 globus-openssl-pkg_data_src.gpt.in, NONE,
	1.1 globus-openssl.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090417220702.BEE957012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29826/F-9

Added Files:
	globus-openssl-pkg_data_src.gpt.in globus-openssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals



--- NEW FILE globus-openssl-pkg_data_src.gpt.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Name="globus_openssl" Format_Version="0.02">
    <Aging_Version Major="3" Minor="0" Age="2"/>
    <Description>Openssl Library</Description>
    <Functional_Group>Openssl</Functional_Group>
    <Version_Stability Release="Experimental"/>

    <src_pkg>
        <Version_Label>@OPENSSL_VERSION@</Version_Label>

        <Source_Dependencies Type="compile">
        </Source_Dependencies>

        <With_Flavors ColocateLibraries="no" build="yes"/>

        <Build_Environment>
            <cflags></cflags>
            <external_includes>@OPENSSL_INCLUDES@</external_includes>
            <external_libs>@OPENSSL_LIBS@</external_libs>
            <pkg_libs></pkg_libs>
        </Build_Environment>
    </src_pkg>

</gpt_package_metadata>


--- NEW FILE globus-openssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%global debug_package %{nil}

Name:		globus-openssl
%global _name %(tr - _ <<< %{name})
Version:	3.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Openssl Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		This package is a substitution for the upstream globus-openssl
#		package, which contains a copy of the openssl library sources.
#		Instead this package provides the necessary metadata files to
#		allow grid-packaging-tools (GPT) to use the openssl library
#		provided by the Fedora/RHEL distribution. The package source
#		is a single GPT source package description file, referencing
#		the openssl library as an external library.
Source:		%{name}-pkg_data_src.gpt.in
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	openssl
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	openssl-devel

%package progs
Summary:	Globus Toolkit - Openssl Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - Openssl Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	openssl-devel
#		Workaround for broken openssl-devel on RHL9 (it is missing
#		Requires: zlib-devel)
%if %{?fedora:0}%{!?fedora:1}
%if %{?rhel:0}%{!?rhel:1}
Requires:	zlib-devel
%endif
%endif

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Openssl Library (virtual GPT glue package)

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Openssl Library Programs (virtual GPT glue package)

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Openssl Library Development Files (virtual GPT glue package)

%prep
%setup -T -c
cp -p %{SOURCE0} pkg_data_src.gpt.in

%build
OPENSSL_VERSION=`pkg-config openssl --modversion`
OPENSSL_INCLUDES=`pkg-config openssl --cflags`
OPENSSL_LIBS=`pkg-config openssl --libs`

sed -e "s!@OPENSSL_VERSION@!$OPENSSL_VERSION!g" \
    -e "s!@OPENSSL_INCLUDES@!$OPENSSL_INCLUDES!g" \
    -e "s!@OPENSSL_LIBS@!$OPENSSL_LIBS!g" \
  < pkg_data_src.gpt.in > pkg_data_src.gpt

echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
  %{flavor}_rtl.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_rtl.gpt >> \
  %{flavor}_rtl.filelist

echo /share/globus/packages/%{_name}/%{flavor}_pgm.filelist > \
  %{flavor}_pgm.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_pgm.gpt >> \
  %{flavor}_pgm.filelist

echo /share/globus/packages/%{_name}/%{flavor}_dev.filelist > \
  %{flavor}_dev.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
  %{flavor}_dev.filelist

%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt | \
  sed -e 's/Requires:.*/Requires: openssl/' \
      -e 's/Cflags:.*/Cflags:/' \
      -e 's/Libs:.*/Libs:/' > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals

* Wed Apr 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.6
- Add source description comment

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-3_0-1_fc9:F-9:globus-openssl-3.0-1.fc9.src.rpm:1240005993



From ellert at fedoraproject.org  Fri Apr 17 22:08:06 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:08:06 +0000 (UTC)
Subject: rpms/globus-openssl/F-10 globus-openssl-pkg_data_src.gpt.in, NONE, 
	1.1 globus-openssl.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090417220806.D413C7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30217/F-10

Added Files:
	globus-openssl-pkg_data_src.gpt.in globus-openssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals



--- NEW FILE globus-openssl-pkg_data_src.gpt.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Name="globus_openssl" Format_Version="0.02">
    <Aging_Version Major="3" Minor="0" Age="2"/>
    <Description>Openssl Library</Description>
    <Functional_Group>Openssl</Functional_Group>
    <Version_Stability Release="Experimental"/>

    <src_pkg>
        <Version_Label>@OPENSSL_VERSION@</Version_Label>

        <Source_Dependencies Type="compile">
        </Source_Dependencies>

        <With_Flavors ColocateLibraries="no" build="yes"/>

        <Build_Environment>
            <cflags></cflags>
            <external_includes>@OPENSSL_INCLUDES@</external_includes>
            <external_libs>@OPENSSL_LIBS@</external_libs>
            <pkg_libs></pkg_libs>
        </Build_Environment>
    </src_pkg>

</gpt_package_metadata>


--- NEW FILE globus-openssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%global debug_package %{nil}

Name:		globus-openssl
%global _name %(tr - _ <<< %{name})
Version:	3.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Openssl Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		This package is a substitution for the upstream globus-openssl
#		package, which contains a copy of the openssl library sources.
#		Instead this package provides the necessary metadata files to
#		allow grid-packaging-tools (GPT) to use the openssl library
#		provided by the Fedora/RHEL distribution. The package source
#		is a single GPT source package description file, referencing
#		the openssl library as an external library.
Source:		%{name}-pkg_data_src.gpt.in
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	openssl
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	openssl-devel

%package progs
Summary:	Globus Toolkit - Openssl Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - Openssl Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	openssl-devel
#		Workaround for broken openssl-devel on RHL9 (it is missing
#		Requires: zlib-devel)
%if %{?fedora:0}%{!?fedora:1}
%if %{?rhel:0}%{!?rhel:1}
Requires:	zlib-devel
%endif
%endif

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Openssl Library (virtual GPT glue package)

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Openssl Library Programs (virtual GPT glue package)

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Openssl Library Development Files (virtual GPT glue package)

%prep
%setup -T -c
cp -p %{SOURCE0} pkg_data_src.gpt.in

%build
OPENSSL_VERSION=`pkg-config openssl --modversion`
OPENSSL_INCLUDES=`pkg-config openssl --cflags`
OPENSSL_LIBS=`pkg-config openssl --libs`

sed -e "s!@OPENSSL_VERSION@!$OPENSSL_VERSION!g" \
    -e "s!@OPENSSL_INCLUDES@!$OPENSSL_INCLUDES!g" \
    -e "s!@OPENSSL_LIBS@!$OPENSSL_LIBS!g" \
  < pkg_data_src.gpt.in > pkg_data_src.gpt

echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
  %{flavor}_rtl.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_rtl.gpt >> \
  %{flavor}_rtl.filelist

echo /share/globus/packages/%{_name}/%{flavor}_pgm.filelist > \
  %{flavor}_pgm.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_pgm.gpt >> \
  %{flavor}_pgm.filelist

echo /share/globus/packages/%{_name}/%{flavor}_dev.filelist > \
  %{flavor}_dev.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
  %{flavor}_dev.filelist

%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt | \
  sed -e 's/Requires:.*/Requires: openssl/' \
      -e 's/Cflags:.*/Cflags:/' \
      -e 's/Libs:.*/Libs:/' > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals

* Wed Apr 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.6
- Add source description comment

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-3_0-1_fc9:F-10:globus-openssl-3.0-1.fc9.src.rpm:1240006057



From ellert at fedoraproject.org  Fri Apr 17 22:09:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:09:15 +0000 (UTC)
Subject: rpms/globus-openssl/F-11 globus-openssl-pkg_data_src.gpt.in, NONE, 
	1.1 globus-openssl.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090417220915.1A7677012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30667/F-11

Added Files:
	globus-openssl-pkg_data_src.gpt.in globus-openssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals



--- NEW FILE globus-openssl-pkg_data_src.gpt.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Name="globus_openssl" Format_Version="0.02">
    <Aging_Version Major="3" Minor="0" Age="2"/>
    <Description>Openssl Library</Description>
    <Functional_Group>Openssl</Functional_Group>
    <Version_Stability Release="Experimental"/>

    <src_pkg>
        <Version_Label>@OPENSSL_VERSION@</Version_Label>

        <Source_Dependencies Type="compile">
        </Source_Dependencies>

        <With_Flavors ColocateLibraries="no" build="yes"/>

        <Build_Environment>
            <cflags></cflags>
            <external_includes>@OPENSSL_INCLUDES@</external_includes>
            <external_libs>@OPENSSL_LIBS@</external_libs>
            <pkg_libs></pkg_libs>
        </Build_Environment>
    </src_pkg>

</gpt_package_metadata>


--- NEW FILE globus-openssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%global debug_package %{nil}

Name:		globus-openssl
%global _name %(tr - _ <<< %{name})
Version:	3.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Openssl Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		This package is a substitution for the upstream globus-openssl
#		package, which contains a copy of the openssl library sources.
#		Instead this package provides the necessary metadata files to
#		allow grid-packaging-tools (GPT) to use the openssl library
#		provided by the Fedora/RHEL distribution. The package source
#		is a single GPT source package description file, referencing
#		the openssl library as an external library.
Source:		%{name}-pkg_data_src.gpt.in
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	openssl
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	openssl-devel

%package progs
Summary:	Globus Toolkit - Openssl Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - Openssl Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	openssl-devel
#		Workaround for broken openssl-devel on RHL9 (it is missing
#		Requires: zlib-devel)
%if %{?fedora:0}%{!?fedora:1}
%if %{?rhel:0}%{!?rhel:1}
Requires:	zlib-devel
%endif
%endif

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Openssl Library (virtual GPT glue package)

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Openssl Library Programs (virtual GPT glue package)

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Openssl Library Development Files (virtual GPT glue package)

%prep
%setup -T -c
cp -p %{SOURCE0} pkg_data_src.gpt.in

%build
OPENSSL_VERSION=`pkg-config openssl --modversion`
OPENSSL_INCLUDES=`pkg-config openssl --cflags`
OPENSSL_LIBS=`pkg-config openssl --libs`

sed -e "s!@OPENSSL_VERSION@!$OPENSSL_VERSION!g" \
    -e "s!@OPENSSL_INCLUDES@!$OPENSSL_INCLUDES!g" \
    -e "s!@OPENSSL_LIBS@!$OPENSSL_LIBS!g" \
  < pkg_data_src.gpt.in > pkg_data_src.gpt

echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
  %{flavor}_rtl.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_rtl.gpt >> \
  %{flavor}_rtl.filelist

echo /share/globus/packages/%{_name}/%{flavor}_pgm.filelist > \
  %{flavor}_pgm.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_pgm.gpt >> \
  %{flavor}_pgm.filelist

echo /share/globus/packages/%{_name}/%{flavor}_dev.filelist > \
  %{flavor}_dev.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
  %{flavor}_dev.filelist

%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt | \
  sed -e 's/Requires:.*/Requires: openssl/' \
      -e 's/Cflags:.*/Cflags:/' \
      -e 's/Libs:.*/Libs:/' > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals

* Wed Apr 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.6
- Add source description comment

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-3_0-1_fc9:F-11:globus-openssl-3.0-1.fc9.src.rpm:1240006125



From karsten at fedoraproject.org  Fri Apr 17 22:10:19 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 17 Apr 2009 22:10:19 +0000 (UTC)
Subject: rpms/hdf5/devel hdf5.spec,1.35,1.36
Message-ID: <20090417221019.8A7717012B@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hdf5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30915

Modified Files:
	hdf5.spec 
Log Message:
- fix s390x builds, s390x is 64bit, s390 is 32bit


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- hdf5.spec	23 Feb 2009 23:08:49 -0000	1.35
+++ hdf5.spec	17 Apr 2009 22:09:49 -0000	1.36
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.8.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -67,7 +67,7 @@
            --enable-cxx --enable-fortran \
            --with-ssl
 #Multiarch header
-%ifarch x86_64 ppc64 ia64 s390 sparc64 alpha
+%ifarch x86_64 ppc64 ia64 s390x sparc64 alpha
 cp src/H5pubconf.h \
    src/H5pubconf-64.h
 %else
@@ -86,7 +86,7 @@
 mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod ${RPM_BUILD_ROOT}%{_fmoddir}
 
 #Fixup headers and scripts for multiarch
-%ifarch x86_64 ppc64 ia64 s390 sparc64 alpha
+%ifarch x86_64 ppc64 ia64 s390x sparc64 alpha
 mv ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf.h \
    ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf-64.h
 for x in h5c++ h5cc h5fc
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Karsten Hopp <karsten at redhat.com> 1.8.2-1.1
+- fix s390x builds, s390x is 64bit, s390 is 32bit
+
 * Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> 1.8.2-1
 - Update to 1.8.2
 - Add patch to compile H5detect without optimization - make detection



From ellert at fedoraproject.org  Fri Apr 17 22:10:41 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:10:41 +0000 (UTC)
Subject: rpms/globus-openssl/EL-4 globus-openssl-pkg_data_src.gpt.in, NONE, 
	1.1 globus-openssl.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090417221041.62BD87012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31206/EL-4

Added Files:
	globus-openssl-pkg_data_src.gpt.in globus-openssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals



--- NEW FILE globus-openssl-pkg_data_src.gpt.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Name="globus_openssl" Format_Version="0.02">
    <Aging_Version Major="3" Minor="0" Age="2"/>
    <Description>Openssl Library</Description>
    <Functional_Group>Openssl</Functional_Group>
    <Version_Stability Release="Experimental"/>

    <src_pkg>
        <Version_Label>@OPENSSL_VERSION@</Version_Label>

        <Source_Dependencies Type="compile">
        </Source_Dependencies>

        <With_Flavors ColocateLibraries="no" build="yes"/>

        <Build_Environment>
            <cflags></cflags>
            <external_includes>@OPENSSL_INCLUDES@</external_includes>
            <external_libs>@OPENSSL_LIBS@</external_libs>
            <pkg_libs></pkg_libs>
        </Build_Environment>
    </src_pkg>

</gpt_package_metadata>


--- NEW FILE globus-openssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%global debug_package %{nil}

Name:		globus-openssl
%global _name %(tr - _ <<< %{name})
Version:	3.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Openssl Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		This package is a substitution for the upstream globus-openssl
#		package, which contains a copy of the openssl library sources.
#		Instead this package provides the necessary metadata files to
#		allow grid-packaging-tools (GPT) to use the openssl library
#		provided by the Fedora/RHEL distribution. The package source
#		is a single GPT source package description file, referencing
#		the openssl library as an external library.
Source:		%{name}-pkg_data_src.gpt.in
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	openssl
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	openssl-devel

%package progs
Summary:	Globus Toolkit - Openssl Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - Openssl Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	openssl-devel
#		Workaround for broken openssl-devel on RHL9 (it is missing
#		Requires: zlib-devel)
%if %{?fedora:0}%{!?fedora:1}
%if %{?rhel:0}%{!?rhel:1}
Requires:	zlib-devel
%endif
%endif

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Openssl Library (virtual GPT glue package)

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Openssl Library Programs (virtual GPT glue package)

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Openssl Library Development Files (virtual GPT glue package)

%prep
%setup -T -c
cp -p %{SOURCE0} pkg_data_src.gpt.in

%build
OPENSSL_VERSION=`pkg-config openssl --modversion`
OPENSSL_INCLUDES=`pkg-config openssl --cflags`
OPENSSL_LIBS=`pkg-config openssl --libs`

sed -e "s!@OPENSSL_VERSION@!$OPENSSL_VERSION!g" \
    -e "s!@OPENSSL_INCLUDES@!$OPENSSL_INCLUDES!g" \
    -e "s!@OPENSSL_LIBS@!$OPENSSL_LIBS!g" \
  < pkg_data_src.gpt.in > pkg_data_src.gpt

echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
  %{flavor}_rtl.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_rtl.gpt >> \
  %{flavor}_rtl.filelist

echo /share/globus/packages/%{_name}/%{flavor}_pgm.filelist > \
  %{flavor}_pgm.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_pgm.gpt >> \
  %{flavor}_pgm.filelist

echo /share/globus/packages/%{_name}/%{flavor}_dev.filelist > \
  %{flavor}_dev.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
  %{flavor}_dev.filelist

%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt | \
  sed -e 's/Requires:.*/Requires: openssl/' \
      -e 's/Cflags:.*/Cflags:/' \
      -e 's/Libs:.*/Libs:/' > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals

* Wed Apr 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.6
- Add source description comment

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-3_0-1_fc9:EL-4:globus-openssl-3.0-1.fc9.src.rpm:1240006201



From ellert at fedoraproject.org  Fri Apr 17 22:11:47 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:11:47 +0000 (UTC)
Subject: rpms/globus-openssl/EL-5 globus-openssl-pkg_data_src.gpt.in, NONE, 
	1.1 globus-openssl.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090417221147.22B647012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31783/EL-5

Added Files:
	globus-openssl-pkg_data_src.gpt.in globus-openssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals



--- NEW FILE globus-openssl-pkg_data_src.gpt.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Name="globus_openssl" Format_Version="0.02">
    <Aging_Version Major="3" Minor="0" Age="2"/>
    <Description>Openssl Library</Description>
    <Functional_Group>Openssl</Functional_Group>
    <Version_Stability Release="Experimental"/>

    <src_pkg>
        <Version_Label>@OPENSSL_VERSION@</Version_Label>

        <Source_Dependencies Type="compile">
        </Source_Dependencies>

        <With_Flavors ColocateLibraries="no" build="yes"/>

        <Build_Environment>
            <cflags></cflags>
            <external_includes>@OPENSSL_INCLUDES@</external_includes>
            <external_libs>@OPENSSL_LIBS@</external_libs>
            <pkg_libs></pkg_libs>
        </Build_Environment>
    </src_pkg>

</gpt_package_metadata>


--- NEW FILE globus-openssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%global debug_package %{nil}

Name:		globus-openssl
%global _name %(tr - _ <<< %{name})
Version:	3.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Openssl Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		This package is a substitution for the upstream globus-openssl
#		package, which contains a copy of the openssl library sources.
#		Instead this package provides the necessary metadata files to
#		allow grid-packaging-tools (GPT) to use the openssl library
#		provided by the Fedora/RHEL distribution. The package source
#		is a single GPT source package description file, referencing
#		the openssl library as an external library.
Source:		%{name}-pkg_data_src.gpt.in
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	openssl
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	openssl-devel

%package progs
Summary:	Globus Toolkit - Openssl Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - Openssl Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	openssl-devel
#		Workaround for broken openssl-devel on RHL9 (it is missing
#		Requires: zlib-devel)
%if %{?fedora:0}%{!?fedora:1}
%if %{?rhel:0}%{!?rhel:1}
Requires:	zlib-devel
%endif
%endif

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Openssl Library (virtual GPT glue package)

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Openssl Library Programs (virtual GPT glue package)

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Openssl Library Development Files (virtual GPT glue package)

%prep
%setup -T -c
cp -p %{SOURCE0} pkg_data_src.gpt.in

%build
OPENSSL_VERSION=`pkg-config openssl --modversion`
OPENSSL_INCLUDES=`pkg-config openssl --cflags`
OPENSSL_LIBS=`pkg-config openssl --libs`

sed -e "s!@OPENSSL_VERSION@!$OPENSSL_VERSION!g" \
    -e "s!@OPENSSL_INCLUDES@!$OPENSSL_INCLUDES!g" \
    -e "s!@OPENSSL_LIBS@!$OPENSSL_LIBS!g" \
  < pkg_data_src.gpt.in > pkg_data_src.gpt

echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
  %{flavor}_rtl.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_rtl.gpt >> \
  %{flavor}_rtl.filelist

echo /share/globus/packages/%{_name}/%{flavor}_pgm.filelist > \
  %{flavor}_pgm.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_pgm.gpt >> \
  %{flavor}_pgm.filelist

echo /share/globus/packages/%{_name}/%{flavor}_dev.filelist > \
  %{flavor}_dev.filelist
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
  %{flavor}_dev.filelist

%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt | \
  sed -e 's/Requires:.*/Requires: openssl/' \
      -e 's/Cflags:.*/Cflags:/' \
      -e 's/Libs:.*/Libs:/' > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
- Change defines to globals

* Wed Apr 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.6
- Add source description comment

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.4
- Add s390x to the list of 64 bit platforms

* Mon Dec 29 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.3
- Adapt to updated GPT package

* Sun Oct 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-3_0-1_fc9:EL-5:globus-openssl-3.0-1.fc9.src.rpm:1240006278



From mclasen at fedoraproject.org  Fri Apr 17 22:13:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 17 Apr 2009 22:13:13 +0000 (UTC)
Subject: rpms/vino/F-11 restart-loop.patch,1.1,1.2
Message-ID: <20090417221313.4075B7012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30986

Modified Files:
	restart-loop.patch 
Log Message:
fix patch


restart-loop.patch:

Index: restart-loop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vino/F-11/restart-loop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- restart-loop.patch	17 Apr 2009 21:56:51 -0000	1.1
+++ restart-loop.patch	17 Apr 2009 22:13:12 -0000	1.2
@@ -1,24 +1,12 @@
 diff -up vino-2.26.1/server/vino-server.desktop.in.in.restart-loop vino-2.26.1/server/vino-server.desktop.in.in
---- vino-2.26.1/server/vino-server.desktop.in.in.restart-loop	2009-04-17 17:50:25.877439480 -0400
-+++ vino-2.26.1/server/vino-server.desktop.in.in	2008-12-16 11:59:28.000000000 -0500
+--- vino-2.26.1/server/vino-server.desktop.in.in.restart-loop	2009-04-17 18:06:57.465722504 -0400
++++ vino-2.26.1/server/vino-server.desktop.in.in	2009-04-17 18:07:14.818439588 -0400
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  _Name=Remote Desktop
  _Comment=GNOME Remote Desktop Server
--Exec=@LIBEXECDIR@/vino-server --sm-disable
-+Exec=@LIBEXECDIR@/vino-server
- Icon=preferences-desktop-remote-desktop
- OnlyShowIn=GNOME;
- Terminal=false
-diff -up vino-2.26.1/server/vino-server.desktop.in.restart-loop vino-2.26.1/server/vino-server.desktop.in
---- vino-2.26.1/server/vino-server.desktop.in.restart-loop	2009-04-17 17:50:37.206439463 -0400
-+++ vino-2.26.1/server/vino-server.desktop.in	2009-04-17 17:21:40.428452751 -0400
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Remote Desktop
- _Comment=GNOME Remote Desktop Server
--Exec=/usr/libexec/vino-server --sm-disable
-+Exec=/usr/libexec/vino-server
+-Exec=@LIBEXECDIR@/vino-server
++Exec=@LIBEXECDIR@/vino-server --sm-disable
  Icon=preferences-desktop-remote-desktop
  OnlyShowIn=GNOME;
  Terminal=false



From ellert at fedoraproject.org  Fri Apr 17 22:15:57 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:15:57 +0000 (UTC)
Subject: rpms/globus-callout/devel globus-callout.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417221557.963C17012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv603/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-callout.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-callout.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-callout
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Callout Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
#		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source8:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Callout Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Callout Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Callout Library - provides a platform independent way of dealing with
runtime loadable functions.

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Callout Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus Callout Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-callout-0_7-1_fc9:HEAD:globus-callout-0.7-1.fc9.src.rpm:1240006486


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:26:37 -0000	1.1
+++ .cvsignore	17 Apr 2009 22:15:26 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_callout-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:26:37 -0000	1.1
+++ sources	17 Apr 2009 22:15:26 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Fri Apr 17 22:17:51 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:17:51 +0000 (UTC)
Subject: rpms/globus-callout/F-9 globus-callout.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417221751.187977012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1213/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-callout.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-callout.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-callout
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Callout Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
#		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source8:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Callout Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Callout Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Callout Library - provides a platform independent way of dealing with
runtime loadable functions.

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Callout Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus Callout Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-callout-0_7-1_fc9:F-9:globus-callout-0.7-1.fc9.src.rpm:1240006610


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:26:37 -0000	1.1
+++ .cvsignore	17 Apr 2009 22:17:20 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_callout-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:26:37 -0000	1.1
+++ sources	17 Apr 2009 22:17:20 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz



From oget at fedoraproject.org  Fri Apr 17 22:18:37 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 22:18:37 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth-fix-locale-path.patch, NONE,
	1.1 qsynth.spec, 1.10, 1.11
Message-ID: <20090417221837.5387D70137@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1482

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
- Fix locale path (#494470)
- Fix mixed spaces&tabs warnings
- Preserve timestamp of the file AUTHORS
- Replace %define with %global per new guidelines


qsynth-fix-locale-path.patch:

--- NEW FILE qsynth-fix-locale-path.patch ---
diff -rupN qsynth-0.3.3.old/Makefile.in qsynth-0.3.3/Makefile.in
--- qsynth-0.3.3.old/Makefile.in	2008-06-22 15:36:31.000000000 -0400
+++ qsynth-0.3.3/Makefile.in	2009-04-06 22:30:05.000000000 -0400
@@ -81,19 +81,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:30:05.000000000 -0400
@@ -77,7 +77,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qsynth/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qsynth.spec	10 Apr 2009 22:41:24 -0000	1.10
+++ qsynth.spec	17 Apr 2009 22:18:07 -0000	1.11
@@ -1,20 +1,22 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based Fluidsynth GUI front end
-Name: qsynth
-Version: 0.3.3
-Release: 4%{?dist}
-URL: http://qsynth.sourceforge.net
-Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+Summary:       Qt based Fluidsynth GUI front end
+Name:          qsynth
+Version:       0.3.3
+Release:       5%{?dist}
+URL:           http://qsynth.sourceforge.net
+Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0: qsynth-0.3.3-qt4.patch
+Patch0:        qsynth-0.3.3-qt4.patch
 # Fix close button not shown with Qt 4.5 (#494470)
-Patch1: qsynth-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch1:        qsynth-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch2:        qsynth-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
@@ -30,12 +32,16 @@
 %setup -q
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
-iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+%patch2 -p1 -b .localedir
+
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
+touch -r AUTHORS AUTHORS.tmp
+mv -f AUTHORS.tmp AUTHORS
 
 
 %build
 %configure
-%{__make} # doesn't understand %{?_smp_mflags}
+%{__make} # doesn't understand %%{?_smp_mflags}
 
 
 %install
@@ -55,21 +61,33 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{buildroot}%{_datadir}/applications/qsynth.desktop
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qsynth/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qsynth/locale/qsynth_$language.qm >> qsynth.lang
+done
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root)
+%files -f qsynth.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
 %{_datadir}/pixmaps/qsynth.png
-%{_datadir}/locale/qsynth_*.qm
+%dir %{_datadir}/qsynth/
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
+- Fix locale path (#494470)
+- Fix mixed spaces&tabs warnings
+- Preserve timestamp of the file AUTHORS
+- Replace %%define with %%global per new guidelines
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
 - Fix close button not shown with Qt 4.5 (#494470)
 



From trasher at fedoraproject.org  Fri Apr 17 22:20:25 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 17 Apr 2009 22:20:25 +0000 (UTC)
Subject: rpms/yakuake/F-11 yakuake-2.9.4-qt4.5.patch, NONE, 1.1 yakuake.spec,
	1.12, 1.13
Message-ID: <20090417222025.168C57012B@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/yakuake/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2414

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-2.9.4-qt4.5.patch 
Log Message:
Fix QT 4.5 bug (bz #494993)


yakuake-2.9.4-qt4.5.patch:

--- NEW FILE yakuake-2.9.4-qt4.5.patch ---
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/07 00:27:24	950384
+++ trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/11 18:32:17	952380
@@ -473,31 +473,55 @@
 
 void MainWindow::updateWindowWidthMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowWidthMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowWidthMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowWidthMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::width());
+        }
+    }
+    else
     {
-        action = m_windowWidthMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::width());
+        QListIterator<QAction*> i(m_windowWidthMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::width());
+        }
     }
 }
 
 void MainWindow::updateWindowHeightMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowHeightMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowHeightMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowHeightMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::height());
+        }
+    }
+    else
     {
-        action = m_windowHeightMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::height());
+        QListIterator<QAction*> i(m_windowHeightMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::height());
+        }
     }
 }
 



Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/F-11/yakuake.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yakuake.spec	25 Feb 2009 18:04:27 -0000	1.12
+++ yakuake.spec	17 Apr 2009 22:19:54 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           yakuake
 Version:        2.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Terminal emulator
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@
 Source0:        http://download.berlios.de/yakuake/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         yakuake-2.9.4-qt4.5.patch
+
 Requires:       kdebase
 
 BuildRequires:  desktop-file-utils
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q 
+%patch0 -p4
 
 
 %build
@@ -75,6 +78,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 
 %changelog
+* Sat Apr 17 2009 Johan Cwiklinski <johan AT x-tnd DOT be>  2.9.4-3
+- Fix crash with QT 4.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ellert at fedoraproject.org  Fri Apr 17 22:20:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:20:27 +0000 (UTC)
Subject: rpms/globus-callout/F-10 globus-callout.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417222027.611857012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2385/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-callout.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-callout.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-callout
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Callout Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
#		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source8:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Callout Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Callout Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Callout Library - provides a platform independent way of dealing with
runtime loadable functions.

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Callout Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus Callout Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-callout-0_7-1_fc9:F-10:globus-callout-0.7-1.fc9.src.rpm:1240006742


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:26:37 -0000	1.1
+++ .cvsignore	17 Apr 2009 22:19:57 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_callout-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:26:37 -0000	1.1
+++ sources	17 Apr 2009 22:19:57 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz



From limb at fedoraproject.org  Fri Apr 17 22:22:21 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 22:22:21 +0000 (UTC)
Subject: rpms/numpy/F-11 numpy.spec,1.35,1.36
Message-ID: <20090417222221.C6FF87012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/numpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3508

Modified Files:
	numpy.spec 
Log Message:
EVR bump



Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/F-11/numpy.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- numpy.spec	17 Apr 2009 17:54:23 -0000	1.35
+++ numpy.spec	17 Apr 2009 22:21:51 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-4
+- EVR bump for pygame chainbuild.
+
 * Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> 1.3.0-3
 - Moved linalg, fft back to main package.
 



From ellert at fedoraproject.org  Fri Apr 17 22:22:20 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:22:20 +0000 (UTC)
Subject: rpms/globus-callout/F-11 globus-callout.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417222220.208F67012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3455/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-callout.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-callout.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-callout
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Callout Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
#		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source8:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Callout Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Callout Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Callout Library - provides a platform independent way of dealing with
runtime loadable functions.

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Callout Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus Callout Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-callout-0_7-1_fc9:F-11:globus-callout-0.7-1.fc9.src.rpm:1240006866


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:26:37 -0000	1.1
+++ .cvsignore	17 Apr 2009 22:21:49 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_callout-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:26:37 -0000	1.1
+++ sources	17 Apr 2009 22:21:49 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz



From limb at fedoraproject.org  Fri Apr 17 22:24:01 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 17 Apr 2009 22:24:01 +0000 (UTC)
Subject: rpms/pygame/F-11 pygame.spec,1.28,1.29
Message-ID: <20090417222401.91F6F7012B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/pygame/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4342

Modified Files:
	pygame.spec 
Log Message:
numpy fix



Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/F-11/pygame.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pygame.spec	17 Apr 2009 13:33:34 -0000	1.28
+++ pygame.spec	17 Apr 2009 22:23:31 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -12,11 +12,11 @@
 Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel numpy-f2py
+BuildRequires:  python-devel numpy
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  libpng-devel libjpeg-devel libX11-devel
-Requires:       numpy-f2py
+Requires:       numpy
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.1-6
+- Dropped f2py deps, unneeded now that numpy is fixed: BZ 496277.
+
 * Fri Apr 17 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.1-5
 - Add dep for numpy-f2py to fix broken games, BZ 496218.
 



From ellert at fedoraproject.org  Fri Apr 17 22:24:13 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:24:13 +0000 (UTC)
Subject: rpms/globus-callout/EL-4 globus-callout.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417222413.140C57012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4359/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-callout.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-callout.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-callout
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Callout Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
#		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source8:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Callout Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Callout Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Callout Library - provides a platform independent way of dealing with
runtime loadable functions.

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Callout Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus Callout Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-callout-0_7-1_fc9:EL-4:globus-callout-0.7-1.fc9.src.rpm:1240006984


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:26:37 -0000	1.1
+++ .cvsignore	17 Apr 2009 22:23:42 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_callout-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:26:37 -0000	1.1
+++ sources	17 Apr 2009 22:23:42 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Fri Apr 17 22:25:57 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 17 Apr 2009 22:25:57 +0000 (UTC)
Subject: rpms/globus-callout/EL-5 globus-callout.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090417222557.5819C7012B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5065/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-callout.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-callout.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-callout
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Callout Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
#		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source8:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-libtool >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-libtool-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Callout Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-libtool-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Callout Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Callout Library - provides a platform independent way of dealing with
runtime loadable functions.

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Callout Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus Callout Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE8} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-callout-0_7-1_fc9:EL-5:globus-callout-0.7-1.fc9.src.rpm:1240007094


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:26:37 -0000	1.1
+++ .cvsignore	17 Apr 2009 22:25:26 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_callout-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:26:37 -0000	1.1
+++ sources	17 Apr 2009 22:25:26 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz



From oget at fedoraproject.org  Fri Apr 17 22:31:38 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 22:31:38 +0000 (UTC)
Subject: rpms/qsynth/F-11 qsynth-fix-locale-path.patch, NONE, 1.1 qsynth.spec,
	1.10, 1.11
Message-ID: <20090417223138.761507012B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6518

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
- Fix locale path (#494470)
- Fix mixed spaces&tabs warnings
- Preserve timestamp of the file AUTHORS
- Replace %define with %global per new guidelines


qsynth-fix-locale-path.patch:

--- NEW FILE qsynth-fix-locale-path.patch ---
diff -rupN qsynth-0.3.3.old/Makefile.in qsynth-0.3.3/Makefile.in
--- qsynth-0.3.3.old/Makefile.in	2008-06-22 15:36:31.000000000 -0400
+++ qsynth-0.3.3/Makefile.in	2009-04-06 22:30:05.000000000 -0400
@@ -81,19 +81,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:30:05.000000000 -0400
@@ -77,7 +77,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qsynth/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/qsynth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qsynth.spec	10 Apr 2009 22:41:24 -0000	1.10
+++ qsynth.spec	17 Apr 2009 22:31:08 -0000	1.11
@@ -1,20 +1,22 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based Fluidsynth GUI front end
-Name: qsynth
-Version: 0.3.3
-Release: 4%{?dist}
-URL: http://qsynth.sourceforge.net
-Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+Summary:       Qt based Fluidsynth GUI front end
+Name:          qsynth
+Version:       0.3.3
+Release:       5%{?dist}
+URL:           http://qsynth.sourceforge.net
+Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0: qsynth-0.3.3-qt4.patch
+Patch0:        qsynth-0.3.3-qt4.patch
 # Fix close button not shown with Qt 4.5 (#494470)
-Patch1: qsynth-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch1:        qsynth-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch2:        qsynth-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
@@ -30,12 +32,16 @@
 %setup -q
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
-iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+%patch2 -p1 -b .localedir
+
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
+touch -r AUTHORS AUTHORS.tmp
+mv -f AUTHORS.tmp AUTHORS
 
 
 %build
 %configure
-%{__make} # doesn't understand %{?_smp_mflags}
+%{__make} # doesn't understand %%{?_smp_mflags}
 
 
 %install
@@ -55,21 +61,33 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{buildroot}%{_datadir}/applications/qsynth.desktop
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qsynth/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qsynth/locale/qsynth_$language.qm >> qsynth.lang
+done
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root)
+%files -f qsynth.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
 %{_datadir}/pixmaps/qsynth.png
-%{_datadir}/locale/qsynth_*.qm
+%dir %{_datadir}/qsynth/
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
+- Fix locale path (#494470)
+- Fix mixed spaces&tabs warnings
+- Preserve timestamp of the file AUTHORS
+- Replace %%define with %%global per new guidelines
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
 - Fix close button not shown with Qt 4.5 (#494470)
 



From pkgdb at fedoraproject.org  Fri Apr 17 22:39:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 22:39:25 +0000
Subject: [pkgdb] tomcat5: akurtakov has requested watchcommits
Message-ID: <20090417223925.5315310F87C@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on tomcat5 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Fri Apr 17 22:39:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 22:39:26 +0000
Subject: [pkgdb] tomcat5: akurtakov has requested watchbugzilla
Message-ID: <20090417223926.3754510F87F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on tomcat5 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Fri Apr 17 22:39:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 17 Apr 2009 22:39:28 +0000
Subject: [pkgdb] tomcat5: akurtakov has requested commit
Message-ID: <20090417223928.991F210F882@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on tomcat5 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From trasher at fedoraproject.org  Fri Apr 17 22:40:55 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 17 Apr 2009 22:40:55 +0000 (UTC)
Subject: rpms/yakuake/F-10 yakuake-2.9.4-qt4.5.patch, NONE, 1.1 yakuake.spec,
	1.11, 1.12
Message-ID: <20090417224055.6B2CC7012B@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/yakuake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9342

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-2.9.4-qt4.5.patch 
Log Message:
Fix QT 4.5 bug (bz #494993)


yakuake-2.9.4-qt4.5.patch:

--- NEW FILE yakuake-2.9.4-qt4.5.patch ---
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/07 00:27:24	950384
+++ trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/11 18:32:17	952380
@@ -473,31 +473,55 @@
 
 void MainWindow::updateWindowWidthMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowWidthMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowWidthMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowWidthMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::width());
+        }
+    }
+    else
     {
-        action = m_windowWidthMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::width());
+        QListIterator<QAction*> i(m_windowWidthMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::width());
+        }
     }
 }
 
 void MainWindow::updateWindowHeightMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowHeightMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowHeightMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowHeightMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::height());
+        }
+    }
+    else
     {
-        action = m_windowHeightMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::height());
+        QListIterator<QAction*> i(m_windowHeightMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::height());
+        }
     }
 }
 



Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/F-10/yakuake.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yakuake.spec	4 Sep 2008 16:06:57 -0000	1.11
+++ yakuake.spec	17 Apr 2009 22:40:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           yakuake
 Version:        2.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Terminal emulator
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@
 Source0:        http://download.berlios.de/yakuake/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         yakuake-2.9.4-qt4.5.patch
+
 Requires:       kdebase
 
 BuildRequires:  desktop-file-utils
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q 
+%patch0 -p4
 
 
 %build
@@ -75,6 +78,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 
 %changelog
+* Sat Apr 17 2009 Johan Cwiklinski <johan AT x-tnd DOT be>  2.9.4-2
+- Fix crash with QT 4.5
+
 * Thu Sep 4 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.9.4-1
 - 2.9.4
 - change BR from kdelibs4-devel to kdelibs-devel



From trasher at fedoraproject.org  Fri Apr 17 22:52:42 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 17 Apr 2009 22:52:42 +0000 (UTC)
Subject: rpms/yakuake/F-9 yakuake-2.9.4-qt4.5.patch, NONE, 1.1 yakuake.spec, 
	1.12, 1.13
Message-ID: <20090417225242.40EAB7012B@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/yakuake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12334

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-2.9.4-qt4.5.patch 
Log Message:
Fix QT 4.5 bug (bz #494993)


yakuake-2.9.4-qt4.5.patch:

--- NEW FILE yakuake-2.9.4-qt4.5.patch ---
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/07 00:27:24	950384
+++ trunk/extragear/utils/yakuake/app/mainwindow.cpp	2009/04/11 18:32:17	952380
@@ -473,31 +473,55 @@
 
 void MainWindow::updateWindowWidthMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowWidthMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowWidthMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowWidthMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::width());
+        }
+    }
+    else
     {
-        action = m_windowWidthMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::width());
+        QListIterator<QAction*> i(m_windowWidthMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::width());
+        }
     }
 }
 
 void MainWindow::updateWindowHeightMenu()
 {
-    QAction* action;
+    QAction* action = 0;
 
-    m_windowHeightMenu->clear(); 
-
-    for (int i = 10; i <= 100; i += 10)
+    if (m_windowHeightMenu->isEmpty())
+    {
+        for (int i = 10; i <= 100; i += 10)
+        {
+            action = m_windowHeightMenu->addAction(QString::number(i) + '%');
+            action->setCheckable(true);
+            action->setData(i);
+            action->setChecked(i == Settings::height());
+        }
+    }
+    else
     {
-        action = m_windowHeightMenu->addAction(QString::number(i) + '%');
-        action->setCheckable(true);
-        action->setData(i);
-        action->setChecked(i == Settings::height());
+        QListIterator<QAction*> i(m_windowHeightMenu->actions());
+
+        while (i.hasNext())
+        {
+            action = i.next();
+
+            action->setChecked(action->data().toInt() == Settings::height());
+        }
     }
 }
 



Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/F-9/yakuake.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yakuake.spec	4 Sep 2008 16:03:49 -0000	1.12
+++ yakuake.spec	17 Apr 2009 22:52:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           yakuake
 Version:        2.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Terminal emulator
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@
 Source0:        http://download.berlios.de/yakuake/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         yakuake-2.9.4-qt4.5.patch
+
 Requires:       kdebase
 
 BuildRequires:  desktop-file-utils
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q 
+%patch0 -p4
 
 
 %build
@@ -75,6 +78,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 
 %changelog
+* Sat Apr 17 2009 Johan Cwiklinski <johan AT x-tnd DOT be>  2.9.4-2
+- Fix crash with QT 4.5
+
 * Thu Sep 4 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.9.4-1
 - 2.9.4
 - change BR from kdelibs4-devel to kdelibs-devel



From oget at fedoraproject.org  Fri Apr 17 23:15:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 23:15:10 +0000 (UTC)
Subject: rpms/qsynth/F-10 qsynth-fix-locale-path.patch, NONE, 1.1 qsynth.spec,
	1.8, 1.9
Message-ID: <20090417231510.D8EBC7012B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16933

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
- Fix locale path (#494470)
- Fix mixed spaces&tabs warnings
- Preserve timestamp of the file AUTHORS
- Replace %define with %global per new guidelines


qsynth-fix-locale-path.patch:

--- NEW FILE qsynth-fix-locale-path.patch ---
diff -rupN qsynth-0.3.3.old/Makefile.in qsynth-0.3.3/Makefile.in
--- qsynth-0.3.3.old/Makefile.in	2008-06-22 15:36:31.000000000 -0400
+++ qsynth-0.3.3/Makefile.in	2009-04-06 22:30:05.000000000 -0400
@@ -81,19 +81,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:30:05.000000000 -0400
@@ -77,7 +77,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qsynth/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-10/qsynth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qsynth.spec	10 Apr 2009 22:41:23 -0000	1.8
+++ qsynth.spec	17 Apr 2009 23:14:39 -0000	1.9
@@ -1,20 +1,22 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based Fluidsynth GUI front end
-Name: qsynth
-Version: 0.3.3
-Release: 4%{?dist}
-URL: http://qsynth.sourceforge.net
-Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+Summary:       Qt based Fluidsynth GUI front end
+Name:          qsynth
+Version:       0.3.3
+Release:       5%{?dist}
+URL:           http://qsynth.sourceforge.net
+Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0: qsynth-0.3.3-qt4.patch
+Patch0:        qsynth-0.3.3-qt4.patch
 # Fix close button not shown with Qt 4.5 (#494470)
-Patch1: qsynth-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch1:        qsynth-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch2:        qsynth-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
@@ -30,12 +32,16 @@
 %setup -q
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
-iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+%patch2 -p1 -b .localedir
+
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
+touch -r AUTHORS AUTHORS.tmp
+mv -f AUTHORS.tmp AUTHORS
 
 
 %build
 %configure
-%{__make} # doesn't understand %{?_smp_mflags}
+%{__make} # doesn't understand %%{?_smp_mflags}
 
 
 %install
@@ -55,21 +61,33 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{buildroot}%{_datadir}/applications/qsynth.desktop
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qsynth/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qsynth/locale/qsynth_$language.qm >> qsynth.lang
+done
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root)
+%files -f qsynth.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
 %{_datadir}/pixmaps/qsynth.png
-%{_datadir}/locale/qsynth_*.qm
+%dir %{_datadir}/qsynth/
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
+- Fix locale path (#494470)
+- Fix mixed spaces&tabs warnings
+- Preserve timestamp of the file AUTHORS
+- Replace %%define with %%global per new guidelines
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
 - Fix close button not shown with Qt 4.5 (#494470)
 



From oget at fedoraproject.org  Fri Apr 17 23:29:12 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri, 17 Apr 2009 23:29:12 +0000 (UTC)
Subject: rpms/qsynth/F-9 qsynth-fix-locale-path.patch, NONE, 1.1 qsynth.spec,
	1.6, 1.7
Message-ID: <20090417232912.49E117012B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20561

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
- Fix locale path (#494470)
- Fix mixed spaces&tabs warnings
- Preserve timestamp of the file AUTHORS
- Replace %define with %global per new guidelines


qsynth-fix-locale-path.patch:

--- NEW FILE qsynth-fix-locale-path.patch ---
diff -rupN qsynth-0.3.3.old/Makefile.in qsynth-0.3.3/Makefile.in
--- qsynth-0.3.3.old/Makefile.in	2008-06-22 15:36:31.000000000 -0400
+++ qsynth-0.3.3/Makefile.in	2009-04-06 22:30:05.000000000 -0400
@@ -81,19 +81,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:30:05.000000000 -0400
@@ -77,7 +77,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qsynth/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/qsynth.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qsynth.spec	10 Apr 2009 22:41:24 -0000	1.6
+++ qsynth.spec	17 Apr 2009 23:28:41 -0000	1.7
@@ -1,20 +1,22 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based Fluidsynth GUI front end
-Name: qsynth
-Version: 0.3.3
-Release: 4%{?dist}
-URL: http://qsynth.sourceforge.net
-Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+Summary:       Qt based Fluidsynth GUI front end
+Name:          qsynth
+Version:       0.3.3
+Release:       5%{?dist}
+URL:           http://qsynth.sourceforge.net
+Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0: qsynth-0.3.3-qt4.patch
+Patch0:        qsynth-0.3.3-qt4.patch
 # Fix close button not shown with Qt 4.5 (#494470)
-Patch1: qsynth-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch1:        qsynth-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch2:        qsynth-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
@@ -30,12 +32,16 @@
 %setup -q
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
-iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+%patch2 -p1 -b .localedir
+
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
+touch -r AUTHORS AUTHORS.tmp
+mv -f AUTHORS.tmp AUTHORS
 
 
 %build
 %configure
-%{__make} # doesn't understand %{?_smp_mflags}
+%{__make} # doesn't understand %%{?_smp_mflags}
 
 
 %install
@@ -55,21 +61,33 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{buildroot}%{_datadir}/applications/qsynth.desktop
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qsynth/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qsynth/locale/qsynth_$language.qm >> qsynth.lang
+done
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root)
+%files -f qsynth.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
 %{_datadir}/pixmaps/qsynth.png
-%{_datadir}/locale/qsynth_*.qm
+%dir %{_datadir}/qsynth/
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
+- Fix locale path (#494470)
+- Fix mixed spaces&tabs warnings
+- Preserve timestamp of the file AUTHORS
+- Replace %%define with %%global per new guidelines
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
 - Fix close button not shown with Qt 4.5 (#494470)
 



From eponyme at fedoraproject.org  Fri Apr 17 23:52:09 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 17 Apr 2009 23:52:09 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel .cvsignore, 1.2, 1.3 perl-WWW-Curl.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090417235209.D71C37012B@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736

Modified Files:
	.cvsignore perl-WWW-Curl.spec sources 
Log Message:
Step to 4.06


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jan 2009 19:35:41 -0000	1.2
+++ .cvsignore	17 Apr 2009 23:51:39 -0000	1.3
@@ -1 +1 @@
-WWW-Curl-4.05.tar.gz
+WWW-Curl-4.06.tar.gz


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/perl-WWW-Curl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-WWW-Curl.spec	27 Feb 2009 04:17:16 -0000	1.2
+++ perl-WWW-Curl.spec	17 Apr 2009 23:51:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Curl
-Version:        4.05
-Release:        5%{?dist}
+Version:        4.06
+Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
@@ -58,9 +58,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.06-1
+- Step to 4.06
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
 - Licence update
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jan 2009 19:35:41 -0000	1.2
+++ sources	17 Apr 2009 23:51:39 -0000	1.3
@@ -1 +1 @@
-a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz
+14f911d9d7df2890f8cb4b631f2907c2  WWW-Curl-4.06.tar.gz



From eponyme at fedoraproject.org  Fri Apr 17 23:54:49 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 17 Apr 2009 23:54:49 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-11 .cvsignore, 1.2, 1.3 perl-WWW-Curl.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090417235449.DD0BF70031@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26754

Modified Files:
	.cvsignore perl-WWW-Curl.spec sources 
Log Message:
Step to 4.06


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jan 2009 19:35:41 -0000	1.2
+++ .cvsignore	17 Apr 2009 23:54:19 -0000	1.3
@@ -1 +1 @@
-WWW-Curl-4.05.tar.gz
+WWW-Curl-4.06.tar.gz


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/perl-WWW-Curl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-WWW-Curl.spec	27 Feb 2009 04:17:16 -0000	1.2
+++ perl-WWW-Curl.spec	17 Apr 2009 23:54:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Curl
-Version:        4.05
-Release:        5%{?dist}
+Version:        4.06
+Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
@@ -58,9 +58,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.06-1
+- Step to 4.06
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
 - Licence update
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jan 2009 19:35:41 -0000	1.2
+++ sources	17 Apr 2009 23:54:19 -0000	1.3
@@ -1 +1 @@
-a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz
+14f911d9d7df2890f8cb4b631f2907c2  WWW-Curl-4.06.tar.gz



From eponyme at fedoraproject.org  Fri Apr 17 23:56:30 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 17 Apr 2009 23:56:30 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-10 .cvsignore, 1.2, 1.3 perl-WWW-Curl.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090417235630.E176D70031@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27622

Modified Files:
	.cvsignore perl-WWW-Curl.spec sources 
Log Message:
Step to 4.06


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jan 2009 19:38:58 -0000	1.2
+++ .cvsignore	17 Apr 2009 23:56:00 -0000	1.3
@@ -1 +1 @@
-WWW-Curl-4.05.tar.gz
+WWW-Curl-4.06.tar.gz


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-10/perl-WWW-Curl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-WWW-Curl.spec	15 Jan 2009 19:38:58 -0000	1.1
+++ perl-WWW-Curl.spec	17 Apr 2009 23:56:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Curl
-Version:        4.05
-Release:        4%{?dist}
+Version:        4.06
+Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
@@ -58,6 +58,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.06-1
+- Step to 4.06
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.05-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
 - Licence update
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jan 2009 19:38:58 -0000	1.2
+++ sources	17 Apr 2009 23:56:00 -0000	1.3
@@ -1 +1 @@
-a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz
+14f911d9d7df2890f8cb4b631f2907c2  WWW-Curl-4.06.tar.gz



From eponyme at fedoraproject.org  Fri Apr 17 23:58:25 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 17 Apr 2009 23:58:25 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090417235825.8067070031@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28181

Modified Files:
	.cvsignore sources 
Log Message:
Step to 4.06


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jan 2009 19:40:40 -0000	1.2
+++ .cvsignore	17 Apr 2009 23:57:55 -0000	1.3
@@ -1 +1 @@
-WWW-Curl-4.05.tar.gz
+WWW-Curl-4.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jan 2009 19:40:40 -0000	1.2
+++ sources	17 Apr 2009 23:57:55 -0000	1.3
@@ -1 +1 @@
-a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz
+14f911d9d7df2890f8cb4b631f2907c2  WWW-Curl-4.06.tar.gz



From eponyme at fedoraproject.org  Sat Apr 18 00:00:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 18 Apr 2009 00:00:33 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-9 perl-WWW-Curl.spec,1.1,1.2
Message-ID: <20090418000033.607CF70137@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28712

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Step to 4.06


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-9/perl-WWW-Curl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-WWW-Curl.spec	15 Jan 2009 19:40:40 -0000	1.1
+++ perl-WWW-Curl.spec	18 Apr 2009 00:00:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Curl
-Version:        4.05
-Release:        4%{?dist}
+Version:        4.06
+Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
@@ -58,6 +58,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.06-1
+- Step to 4.06
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.05-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
 - Licence update
 * Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3



From toshio at fedoraproject.org  Sat Apr 18 00:05:01 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sat, 18 Apr 2009 00:05:01 +0000 (UTC)
Subject: rpms/python-reportlab/F-11 python-reportlab.spec,1.18,1.19
Message-ID: <20090418000501.5F02F70137@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-reportlab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29806

Modified Files:
	python-reportlab.spec 
Log Message:

* Fri Apr 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1-6
- Rebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



Index: python-reportlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-reportlab/F-11/python-reportlab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-reportlab.spec	26 Feb 2009 23:18:35 -0000	1.18
+++ python-reportlab.spec	18 Apr 2009 00:04:30 -0000	1.19
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-reportlab
 Version:	2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1-6
+- Rebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From eponyme at fedoraproject.org  Sat Apr 18 00:13:45 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 18 Apr 2009 00:13:45 +0000 (UTC)
Subject: rpms/clive/devel clive.spec,1.14,1.15
Message-ID: <20090418001345.CBD8870137@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31558

Modified Files:
	clive.spec 
Log Message:
Add explicit dependencies


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clive.spec	4 Apr 2009 21:37:20 -0000	1.14
+++ clive.spec	18 Apr 2009 00:13:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       perl(Term::ReadKey)
+Requires:       perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -39,6 +39,8 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-2
+- Add explicit dependencies
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
 - Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1



From eponyme at fedoraproject.org  Sat Apr 18 00:15:24 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 18 Apr 2009 00:15:24 +0000 (UTC)
Subject: rpms/clive/F-11 clive.spec,1.14,1.15
Message-ID: <20090418001524.0793070137@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31943

Modified Files:
	clive.spec 
Log Message:
Add explicit dependencies


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clive.spec	4 Apr 2009 21:37:20 -0000	1.14
+++ clive.spec	18 Apr 2009 00:14:53 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       perl(Term::ReadKey)
+Requires:       perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -39,6 +39,8 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-2
+- Add explicit dependencies
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
 - Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1



From eponyme at fedoraproject.org  Sat Apr 18 00:16:58 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 18 Apr 2009 00:16:58 +0000 (UTC)
Subject: rpms/clive/F-10 clive.spec,1.12,1.13
Message-ID: <20090418001658.60BFF70137@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32460

Modified Files:
	clive.spec 
Log Message:
Add explicit dependencies


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- clive.spec	4 Apr 2009 21:39:22 -0000	1.12
+++ clive.spec	18 Apr 2009 00:16:28 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       perl(Term::ReadKey)
+Requires:       perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -39,6 +39,8 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-2
+- Add explicit dependencies
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
 - Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1



From eponyme at fedoraproject.org  Sat Apr 18 00:18:44 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 18 Apr 2009 00:18:44 +0000 (UTC)
Subject: rpms/clive/F-9 clive.spec,1.12,1.13
Message-ID: <20090418001844.B33A570137@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv446

Modified Files:
	clive.spec 
Log Message:
Add explicit dependencies


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/clive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- clive.spec	4 Apr 2009 21:41:09 -0000	1.12
+++ clive.spec	18 Apr 2009 00:18:14 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       perl(Term::ReadKey)
+Requires:       perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -39,6 +39,8 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Apr 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-2
+- Add explicit dependencies
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.10-1
 - Rebuild for 2.1.10
 * Sat Mar 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.9-1



From dcantrel at fedoraproject.org  Sat Apr 18 00:21:46 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 18 Apr 2009 00:21:46 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.636, 1.637 anaconda.spec, 1.784, 
	1.785 sources, 1.770, 1.771
Message-ID: <20090418002146.E87C070137@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1382

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
- Clean up argument list after changing from rhpl to iutil for
  execWithRedirect (jkeating)
- Fix NameError traceback setting up bootloader in EFI installs (wwoods)
- No longer force ISOs to be on ext2, ext3, or vfat partitions. (clumens)
- Sending translation for German (ckpinguin)
- Split text mode exn saving into multiple screren (#469380). (clumens)
- Copy /tmp/program.log to /mnt/sysimage/var/log/. (clumens)
- Fix member preselection in raid UI. (rvykydal)
- Fix editing of raid device (persistence of level choice) (#496159)
  (rvykydal)
- Fix ks --useexisting and --noformat options of logvol and volgroup
  (rvykydal)
- Make sure inconsistencies dont screw us up. (jgranado)
- Re-implement the inconsistency functionality. (jgranado)
- Allow the use of "-" in the lvm names. (495329) (jgranado)
- Make sure we "insist" on mdadm commands. (491729) (jgranado)
- [PATCH] Possible fix for some encryption related bugs during the Custom
  Layout editation (#495848) (msivak)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- .cvsignore	16 Apr 2009 17:53:57 -0000	1.636
+++ .cvsignore	18 Apr 2009 00:21:16 -0000	1.637
@@ -1,3 +1,2 @@
 clog
-anaconda-11.5.0.44.tar.bz2
-anaconda-11.5.0.45.tar.bz2
+anaconda-11.5.0.46.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.784
retrieving revision 1.785
diff -u -r1.784 -r1.785
--- anaconda.spec	16 Apr 2009 17:53:57 -0000	1.784
+++ anaconda.spec	18 Apr 2009 00:21:16 -0000	1.785
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.45
+Version: 11.5.0.46
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,26 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
+- Clean up argument list after changing from rhpl to iutil for
+  execWithRedirect (jkeating)
+- Fix NameError traceback setting up bootloader in EFI installs (wwoods)
+- No longer force ISOs to be on ext2, ext3, or vfat partitions. (clumens)
+- Sending translation for German (ckpinguin)
+- Split text mode exn saving into multiple screren (#469380). (clumens)
+- Copy /tmp/program.log to /mnt/sysimage/var/log/. (clumens)
+- Fix member preselection in raid UI. (rvykydal)
+- Fix editing of raid device (persistence of level choice) (#496159)
+  (rvykydal)
+- Fix ks --useexisting and --noformat options of logvol and volgroup
+  (rvykydal)
+- Make sure inconsistencies dont screw us up. (jgranado)
+- Re-implement the inconsistency functionality. (jgranado)
+- Allow the use of "-" in the lvm names. (495329) (jgranado)
+- Make sure we "insist" on mdadm commands. (491729) (jgranado)
+- [PATCH] Possible fix for some encryption related bugs during the Custom
+  Layout editation (#495848) (msivak)
+
 * Thu Apr 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.45-1
 - Touch /.autorelabel when running under rescue mode (#491747). (clumens)
 - Add support for fingerprint-based logins (#481273). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- sources	16 Apr 2009 17:53:57 -0000	1.770
+++ sources	18 Apr 2009 00:21:16 -0000	1.771
@@ -1 +1 @@
-00b7f0263ca1c593152a0b625d74ccd7  anaconda-11.5.0.45.tar.bz2
+e350ffddc62e02b64751832711941c01  anaconda-11.5.0.46.tar.bz2



From dcantrel at fedoraproject.org  Sat Apr 18 00:57:23 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 18 Apr 2009 00:57:23 +0000 (UTC)
Subject: rpms/anaconda/F-11 .cvsignore, 1.636, 1.637 anaconda.spec, 1.785,
	1.786 sources, 1.770, 1.771
Message-ID: <20090418005723.1BD0F700F7@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9910

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
- Clean up argument list after changing from rhpl to iutil for
  execWithRedirect (jkeating)
- Fix NameError traceback setting up bootloader in EFI installs (wwoods)
- No longer force ISOs to be on ext2, ext3, or vfat partitions. (clumens)
- Sending translation for German (ckpinguin)
- Split text mode exn saving into multiple screren (#469380). (clumens)
- Copy /tmp/program.log to /mnt/sysimage/var/log/. (clumens)
- Fix member preselection in raid UI. (rvykydal)
- Fix editing of raid device (persistence of level choice) (#496159)
  (rvykydal)
- Fix ks --useexisting and --noformat options of logvol and volgroup
  (rvykydal)
- Make sure inconsistencies dont screw us up. (jgranado)
- Re-implement the inconsistency functionality. (jgranado)
- Allow the use of "-" in the lvm names. (495329) (jgranado)
- Make sure we "insist" on mdadm commands. (491729) (jgranado)
- [PATCH] Possible fix for some encryption related bugs during the Custom
  Layout editation (#495848) (msivak)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/.cvsignore,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- .cvsignore	17 Apr 2009 05:55:54 -0000	1.636
+++ .cvsignore	18 Apr 2009 00:56:52 -0000	1.637
@@ -1 +1,2 @@
-anaconda-11.5.0.45.tar.bz2
+clog
+anaconda-11.5.0.46.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -r1.785 -r1.786
--- anaconda.spec	17 Apr 2009 05:57:18 -0000	1.785
+++ anaconda.spec	18 Apr 2009 00:56:52 -0000	1.786
@@ -2,8 +2,8 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.45
-Release: 2
+Version: 11.5.0.46
+Release: 1
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -213,8 +213,25 @@
 %endif
 
 %changelog
-* Thu Apr 16 2009 Jesse Keating <jkeating at redhat.com> - 11.5.0.45-2
-- Bump release so that I can tag/build for F11
+* Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
+- Clean up argument list after changing from rhpl to iutil for
+  execWithRedirect (jkeating)
+- Fix NameError traceback setting up bootloader in EFI installs (wwoods)
+- No longer force ISOs to be on ext2, ext3, or vfat partitions. (clumens)
+- Sending translation for German (ckpinguin)
+- Split text mode exn saving into multiple screren (#469380). (clumens)
+- Copy /tmp/program.log to /mnt/sysimage/var/log/. (clumens)
+- Fix member preselection in raid UI. (rvykydal)
+- Fix editing of raid device (persistence of level choice) (#496159)
+  (rvykydal)
+- Fix ks --useexisting and --noformat options of logvol and volgroup
+  (rvykydal)
+- Make sure inconsistencies dont screw us up. (jgranado)
+- Re-implement the inconsistency functionality. (jgranado)
+- Allow the use of "-" in the lvm names. (495329) (jgranado)
+- Make sure we "insist" on mdadm commands. (491729) (jgranado)
+- [PATCH] Possible fix for some encryption related bugs during the Custom
+  Layout editation (#495848) (msivak)
 
 * Thu Apr 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.45-1
 - Touch /.autorelabel when running under rescue mode (#491747). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/sources,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- sources	17 Apr 2009 05:55:54 -0000	1.770
+++ sources	18 Apr 2009 00:56:52 -0000	1.771
@@ -1 +1 @@
-00b7f0263ca1c593152a0b625d74ccd7  anaconda-11.5.0.45.tar.bz2
+e350ffddc62e02b64751832711941c01  anaconda-11.5.0.46.tar.bz2



From dcantrel at fedoraproject.org  Sat Apr 18 01:11:58 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 18 Apr 2009 01:11:58 +0000 (UTC)
Subject: rpms/anaconda/F-11 anaconda.spec,1.786,1.787
Message-ID: <20090418011158.4C372700F7@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12992

Modified Files:
	anaconda.spec 
Log Message:
* Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
- Clean up argument list after changing from rhpl to iutil for
  execWithRedirect (jkeating)
- Fix NameError traceback setting up bootloader in EFI installs (wwoods)
- No longer force ISOs to be on ext2, ext3, or vfat partitions. (clumens)
- Sending translation for German (ckpinguin)
- Split text mode exn saving into multiple screren (#469380). (clumens)
- Copy /tmp/program.log to /mnt/sysimage/var/log/. (clumens)
- Fix member preselection in raid UI. (rvykydal)
- Fix editing of raid device (persistence of level choice) (#496159)
  (rvykydal)
- Fix ks --useexisting and --noformat options of logvol and volgroup
  (rvykydal)
- Make sure inconsistencies dont screw us up. (jgranado)
- Re-implement the inconsistency functionality. (jgranado)
- Allow the use of "-" in the lvm names. (495329) (jgranado)
- Make sure we "insist" on mdadm commands. (491729) (jgranado)
- [PATCH] Possible fix for some encryption related bugs during the Custom
  Layout editation (#495848) (msivak)



Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- anaconda.spec	18 Apr 2009 00:56:52 -0000	1.786
+++ anaconda.spec	18 Apr 2009 01:11:27 -0000	1.787
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.5.0.46
-Release: 1
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda



From oget at fedoraproject.org  Sat Apr 18 02:32:34 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 02:32:34 +0000 (UTC)
Subject: rpms/qjackctl/devel qjackctl-fix-locale-path.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 qjackctl.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20090418023234.D8BFB700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30650

Modified Files:
	.cvsignore qjackctl.spec sources 
Added Files:
	qjackctl-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
- Update to 0.3.4
- Update scriptlets according to the new guidelines
- Use %global instead of %define per new guidelines
- Fix locale dir
- Fix mixed tabs&spaces issues


qjackctl-fix-locale-path.patch:

--- NEW FILE qjackctl-fix-locale-path.patch ---
diff -rupN qjackctl-0.3.4.old/Makefile.in qjackctl-0.3.4/Makefile.in
--- qjackctl-0.3.4.old/Makefile.in	2008-12-02 17:56:05.000000000 -0500
+++ qjackctl-0.3.4/Makefile.in	2009-04-06 22:28:58.000000000 -0400
@@ -85,19 +85,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:28:07.000000000 -0400
@@ -82,7 +82,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qjackctl/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jul 2008 13:23:49 -0000	1.4
+++ .cvsignore	18 Apr 2009 02:32:04 -0000	1.5
@@ -1 +1 @@
-qjackctl-0.3.3.tar.gz
+qjackctl-0.3.4.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/qjackctl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.13
+++ qjackctl.spec	18 Apr 2009 02:32:04 -0000	1.14
@@ -1,18 +1,20 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based JACK control application
-Name: qjackctl
-Version: 0.3.3
-Release: 3%{?dist}
-URL: http://qjackctl.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1: qjackctl.desktop
+Summary:       Qt based JACK control application
+Name:          qjackctl
+Version:       0.3.4
+Release:       1%{?dist}
+URL:           http://qjackctl.sourceforge.net
+Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
+Source1:       qjackctl.desktop
 # Fix close button not shown with Qt 4.5 (#494471)
-Patch0: qjackctl-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch0:        qjackctl-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch1:        qjackctl-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: qt4-devel alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires: desktop-file-utils
@@ -29,10 +31,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt45
+%patch1 -p1 -b .localedir
 
 %build
-ls -l /usr/lib*/qt4/bin
-QT4DIR=%{_libdir}/qt4 QMAKE=/usr/bin/qmake-qt4 %configure --with-qt=%{_libdir}/qt4
+QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -56,29 +58,44 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{SOURCE1}
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qjackctl/locale/qjackctl_$language.qm >> qjackctl.lang
+done
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%files
-%defattr(-,root,root)
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f qjackctl.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qjackctl
+%dir %{_datadir}/qjackctl/
 %{_datadir}/icons/hicolor/32x32/apps/qjackctl.png
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
+- Update to 0.3.4
+- Update scriptlets according to the new guidelines
+- Use %%global instead of %%define per new guidelines
+- Fix locale dir
+- Fix mixed tabs&spaces issues
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
 - Fix close button not shown with Qt 4.5 (#494471)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jul 2008 13:23:49 -0000	1.5
+++ sources	18 Apr 2009 02:32:04 -0000	1.6
@@ -1 +1 @@
-6aa20dacb954ad99db25485f2f7eeb52  qjackctl-0.3.3.tar.gz
+65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz



From oget at fedoraproject.org  Sat Apr 18 03:05:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 03:05:30 +0000 (UTC)
Subject: rpms/qjackctl/F-11 .cvsignore, 1.4, 1.5 qjackctl.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <20090418030531.051DC700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4843

Modified Files:
	.cvsignore qjackctl.spec sources 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
- Update to 0.3.4
- Update scriptlets according to the new guidelines
- Use %global instead of %define per new guidelines
- Fix locale dir
- Fix mixed tabs&spaces issues



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jul 2008 13:23:49 -0000	1.4
+++ .cvsignore	18 Apr 2009 03:04:59 -0000	1.5
@@ -1 +1 @@
-qjackctl-0.3.3.tar.gz
+qjackctl-0.3.4.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-11/qjackctl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.13
+++ qjackctl.spec	18 Apr 2009 03:05:00 -0000	1.14
@@ -1,18 +1,20 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based JACK control application
-Name: qjackctl
-Version: 0.3.3
-Release: 3%{?dist}
-URL: http://qjackctl.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1: qjackctl.desktop
+Summary:       Qt based JACK control application
+Name:          qjackctl
+Version:       0.3.4
+Release:       1%{?dist}
+URL:           http://qjackctl.sourceforge.net
+Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
+Source1:       qjackctl.desktop
 # Fix close button not shown with Qt 4.5 (#494471)
-Patch0: qjackctl-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch0:        qjackctl-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch1:        qjackctl-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: qt4-devel alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires: desktop-file-utils
@@ -29,10 +31,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt45
+%patch1 -p1 -b .localedir
 
 %build
-ls -l /usr/lib*/qt4/bin
-QT4DIR=%{_libdir}/qt4 QMAKE=/usr/bin/qmake-qt4 %configure --with-qt=%{_libdir}/qt4
+QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -56,29 +58,44 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{SOURCE1}
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qjackctl/locale/qjackctl_$language.qm >> qjackctl.lang
+done
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%files
-%defattr(-,root,root)
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f qjackctl.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qjackctl
+%dir %{_datadir}/qjackctl/
 %{_datadir}/icons/hicolor/32x32/apps/qjackctl.png
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
+- Update to 0.3.4
+- Update scriptlets according to the new guidelines
+- Use %%global instead of %%define per new guidelines
+- Fix locale dir
+- Fix mixed tabs&spaces issues
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
 - Fix close button not shown with Qt 4.5 (#494471)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jul 2008 13:23:49 -0000	1.5
+++ sources	18 Apr 2009 03:05:00 -0000	1.6
@@ -1 +1 @@
-6aa20dacb954ad99db25485f2f7eeb52  qjackctl-0.3.3.tar.gz
+65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz



From oget at fedoraproject.org  Sat Apr 18 03:06:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 03:06:06 +0000 (UTC)
Subject: rpms/qjackctl/F-11 qjackctl-fix-locale-path.patch,NONE,1.1
Message-ID: <20090418030606.8608C700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5060

Added Files:
	qjackctl-fix-locale-path.patch 
Log Message:
initial patch import


qjackctl-fix-locale-path.patch:

--- NEW FILE qjackctl-fix-locale-path.patch ---
diff -rupN qjackctl-0.3.4.old/Makefile.in qjackctl-0.3.4/Makefile.in
--- qjackctl-0.3.4.old/Makefile.in	2008-12-02 17:56:05.000000000 -0500
+++ qjackctl-0.3.4/Makefile.in	2009-04-06 22:28:58.000000000 -0400
@@ -85,19 +85,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:28:07.000000000 -0400
@@ -82,7 +82,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qjackctl/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {



From spot at fedoraproject.org  Sat Apr 18 03:10:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 18 Apr 2009 03:10:12 +0000 (UTC)
Subject: rpms/perl-HTML-Prototype/devel perl-HTML-Prototype.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418031012.8098B700F7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Prototype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5935/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-Prototype.spec 
Log Message:
populate this ghost package


--- NEW FILE perl-HTML-Prototype.spec ---
Name:           perl-HTML-Prototype
Version:        1.48
Release:        1%{?dist}
Summary:        Generate HTML and Javascript for the Prototype library

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/HTML-Prototype/
Source0:        http://search.cpan.org/CPAN/authors/id/E/ES/ESSKAR/HTML-Prototype-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(HTML::Tree)
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This perl module contains some code generators for Prototype, the famous
JavaScript OO library and the script.aculous extensions. The Prototype library 
(http://prototype.conio.net/) is designed to make AJAX easy. 
Catalyst::Plugin::Prototype makes it easy to connect to the Prototype library.

%prep
%setup -q -n HTML-Prototype-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3pm*

%changelog
* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.48-1
- do a build here


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Prototype/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jul 2008 19:42:38 -0000	1.1
+++ .cvsignore	18 Apr 2009 03:09:42 -0000	1.2
@@ -0,0 +1 @@
+HTML-Prototype-1.48.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Prototype/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jul 2008 19:42:38 -0000	1.1
+++ sources	18 Apr 2009 03:09:42 -0000	1.2
@@ -0,0 +1 @@
+33ff3781ce851506e4728f5f2b2a40de  HTML-Prototype-1.48.tar.gz



From spot at fedoraproject.org  Sat Apr 18 03:10:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 18 Apr 2009 03:10:12 +0000 (UTC)
Subject: rpms/perl-HTML-Prototype/F-11 perl-HTML-Prototype.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090418031012.465A2700F7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Prototype/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5935/F-11

Modified Files:
	sources 
Added Files:
	perl-HTML-Prototype.spec 
Log Message:
populate this ghost package


--- NEW FILE perl-HTML-Prototype.spec ---
Name:           perl-HTML-Prototype
Version:        1.48
Release:        1%{?dist}
Summary:        Generate HTML and Javascript for the Prototype library

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/HTML-Prototype/
Source0:        http://search.cpan.org/CPAN/authors/id/E/ES/ESSKAR/HTML-Prototype-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(HTML::Tree)
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This perl module contains some code generators for Prototype, the famous
JavaScript OO library and the script.aculous extensions. The Prototype library 
(http://prototype.conio.net/) is designed to make AJAX easy. 
Catalyst::Plugin::Prototype makes it easy to connect to the Prototype library.

%prep
%setup -q -n HTML-Prototype-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3pm*

%changelog
* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.48-1
- do a build here


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Prototype/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jul 2008 19:42:38 -0000	1.1
+++ sources	18 Apr 2009 03:09:41 -0000	1.2
@@ -0,0 +1 @@
+33ff3781ce851506e4728f5f2b2a40de  HTML-Prototype-1.48.tar.gz



From oget at fedoraproject.org  Sat Apr 18 03:10:48 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 03:10:48 +0000 (UTC)
Subject: rpms/qjackctl/F-10 qjackctl-fix-locale-path.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 qjackctl.spec, 1.12, 1.13 sources, 1.5, 1.6
Message-ID: <20090418031048.04225700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6139

Modified Files:
	.cvsignore qjackctl.spec sources 
Added Files:
	qjackctl-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
- Update to 0.3.4
- Update scriptlets according to the new guidelines
- Use %global instead of %define per new guidelines
- Fix locale dir
- Fix mixed tabs&spaces issues


qjackctl-fix-locale-path.patch:

--- NEW FILE qjackctl-fix-locale-path.patch ---
diff -rupN qjackctl-0.3.4.old/Makefile.in qjackctl-0.3.4/Makefile.in
--- qjackctl-0.3.4.old/Makefile.in	2008-12-02 17:56:05.000000000 -0500
+++ qjackctl-0.3.4/Makefile.in	2009-04-06 22:28:58.000000000 -0400
@@ -85,19 +85,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:28:07.000000000 -0400
@@ -82,7 +82,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qjackctl/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jul 2008 13:23:49 -0000	1.4
+++ .cvsignore	18 Apr 2009 03:10:17 -0000	1.5
@@ -1 +1 @@
-qjackctl-0.3.3.tar.gz
+qjackctl-0.3.4.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/qjackctl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.12
+++ qjackctl.spec	18 Apr 2009 03:10:17 -0000	1.13
@@ -1,18 +1,20 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based JACK control application
-Name: qjackctl
-Version: 0.3.3
-Release: 3%{?dist}
-URL: http://qjackctl.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1: qjackctl.desktop
+Summary:       Qt based JACK control application
+Name:          qjackctl
+Version:       0.3.4
+Release:       1%{?dist}
+URL:           http://qjackctl.sourceforge.net
+Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
+Source1:       qjackctl.desktop
 # Fix close button not shown with Qt 4.5 (#494471)
-Patch0: qjackctl-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch0:        qjackctl-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch1:        qjackctl-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: qt4-devel alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires: desktop-file-utils
@@ -29,10 +31,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt45
+%patch1 -p1 -b .localedir
 
 %build
-ls -l /usr/lib*/qt4/bin
-QT4DIR=%{_libdir}/qt4 QMAKE=/usr/bin/qmake-qt4 %configure --with-qt=%{_libdir}/qt4
+QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -56,29 +58,44 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{SOURCE1}
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qjackctl/locale/qjackctl_$language.qm >> qjackctl.lang
+done
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%files
-%defattr(-,root,root)
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f qjackctl.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qjackctl
+%dir %{_datadir}/qjackctl/
 %{_datadir}/icons/hicolor/32x32/apps/qjackctl.png
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
+- Update to 0.3.4
+- Update scriptlets according to the new guidelines
+- Use %%global instead of %%define per new guidelines
+- Fix locale dir
+- Fix mixed tabs&spaces issues
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
 - Fix close button not shown with Qt 4.5 (#494471)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jul 2008 13:23:49 -0000	1.5
+++ sources	18 Apr 2009 03:10:17 -0000	1.6
@@ -1 +1 @@
-6aa20dacb954ad99db25485f2f7eeb52  qjackctl-0.3.3.tar.gz
+65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz



From spot at fedoraproject.org  Sat Apr 18 03:13:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 18 Apr 2009 03:13:24 +0000 (UTC)
Subject: rpms/perl-HTML-Prototype/F-11 perl-HTML-Prototype.spec,1.1,1.2
Message-ID: <20090418031324.13CD5700F7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Prototype/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743/F-11

Modified Files:
	perl-HTML-Prototype.spec 
Log Message:
fix minor rpmlint issue


Index: perl-HTML-Prototype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Prototype/F-11/perl-HTML-Prototype.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Prototype.spec	18 Apr 2009 03:09:41 -0000	1.1
+++ perl-HTML-Prototype.spec	18 Apr 2009 03:12:53 -0000	1.2
@@ -24,6 +24,9 @@
 
 %prep
 %setup -q -n HTML-Prototype-%{version}
+%{__perl} -pi -e 's/\r\n/\n/' README
+iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
+mv README{.utf8,}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor



From spot at fedoraproject.org  Sat Apr 18 03:13:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 18 Apr 2009 03:13:24 +0000 (UTC)
Subject: rpms/perl-HTML-Prototype/devel perl-HTML-Prototype.spec,1.1,1.2
Message-ID: <20090418031324.38F19700F7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-HTML-Prototype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743/devel

Modified Files:
	perl-HTML-Prototype.spec 
Log Message:
fix minor rpmlint issue


Index: perl-HTML-Prototype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Prototype/devel/perl-HTML-Prototype.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Prototype.spec	18 Apr 2009 03:09:42 -0000	1.1
+++ perl-HTML-Prototype.spec	18 Apr 2009 03:12:54 -0000	1.2
@@ -24,6 +24,9 @@
 
 %prep
 %setup -q -n HTML-Prototype-%{version}
+%{__perl} -pi -e 's/\r\n/\n/' README
+iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
+mv README{.utf8,}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor



From oget at fedoraproject.org  Sat Apr 18 03:16:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 03:16:10 +0000 (UTC)
Subject: rpms/qjackctl/F-9 qjackctl-fix-locale-path.patch, NONE,
	1.1 .cvsignore, 
	1.4, 1.5 qjackctl.spec, 1.12, 1.13 sources, 1.5, 1.6
Message-ID: <20090418031610.D0914700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7515

Modified Files:
	.cvsignore qjackctl.spec sources 
Added Files:
	qjackctl-fix-locale-path.patch 
Log Message:
* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
- Update to 0.3.4
- Update scriptlets according to the new guidelines
- Use %global instead of %define per new guidelines
- Fix locale dir
- Fix mixed tabs&spaces issues


qjackctl-fix-locale-path.patch:

--- NEW FILE qjackctl-fix-locale-path.patch ---
diff -rupN qjackctl-0.3.4.old/Makefile.in qjackctl-0.3.4/Makefile.in
--- qjackctl-0.3.4.old/Makefile.in	2008-12-02 17:56:05.000000000 -0500
+++ qjackctl-0.3.4/Makefile.in	2009-04-06 22:28:58.000000000 -0400
@@ -85,19 +85,19 @@ install:	$(name) icons/$(name).png $(tra
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
 	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
+	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
+	@rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
-		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
+		rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
 
 clean:	$(name).mak
 	@make -f $(name).mak clean
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:28:07.000000000 -0400
@@ -82,7 +82,7 @@ public:
 			if (m_pMyTranslator->load(sLocName, sLocPath)) {
 				QApplication::installTranslator(m_pMyTranslator);
 			} else {
-				sLocPath = CONFIG_PREFIX "/share/locale";
+				sLocPath = CONFIG_PREFIX "/share/qjackctl/locale";
 				if (m_pMyTranslator->load(sLocName, sLocPath)) {
 					QApplication::installTranslator(m_pMyTranslator);
 				} else {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2008 14:30:13 -0000	1.4
+++ .cvsignore	18 Apr 2009 03:15:40 -0000	1.5
@@ -1 +1 @@
-qjackctl-0.3.3.tar.gz
+qjackctl-0.3.4.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/qjackctl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.12
+++ qjackctl.spec	18 Apr 2009 03:15:40 -0000	1.13
@@ -1,18 +1,20 @@
-%define	desktop_vendor fedora
+%global        desktop_vendor fedora
 
-Summary: Qt based JACK control application
-Name: qjackctl
-Version: 0.3.3
-Release: 3%{?dist}
-URL: http://qjackctl.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1: qjackctl.desktop
+Summary:       Qt based JACK control application
+Name:          qjackctl
+Version:       0.3.4
+Release:       1%{?dist}
+URL:           http://qjackctl.sourceforge.net
+Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
+Source1:       qjackctl.desktop
 # Fix close button not shown with Qt 4.5 (#494471)
-Patch0: qjackctl-0.3.3-qt45.patch
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: hicolor-icon-theme
+Patch0:        qjackctl-0.3.3-qt45.patch
+# We don't want .qm files in the default locale dir
+Patch1:        qjackctl-fix-locale-path.patch
+License:       GPLv2+
+Group:         Applications/Multimedia
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:      hicolor-icon-theme
 
 BuildRequires: qt4-devel alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires: desktop-file-utils
@@ -29,10 +31,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt45
+%patch1 -p1 -b .localedir
 
 %build
-ls -l /usr/lib*/qt4/bin
-QT4DIR=%{_libdir}/qt4 QMAKE=/usr/bin/qmake-qt4 %configure --with-qt=%{_libdir}/qt4
+QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -56,29 +58,44 @@
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
   %{SOURCE1}
 
+# Create the lang file. %%find_lang does not handle .qm files
+for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
+  language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+  echo %%lang\($language\) %{_datadir}/qjackctl/locale/qjackctl_$language.qm >> qjackctl.lang
+done
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%files
-%defattr(-,root,root)
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f qjackctl.lang
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qjackctl
+%dir %{_datadir}/qjackctl/
 %{_datadir}/icons/hicolor/32x32/apps/qjackctl.png
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
+- Update to 0.3.4
+- Update scriptlets according to the new guidelines
+- Use %%global instead of %%define per new guidelines
+- Fix locale dir
+- Fix mixed tabs&spaces issues
+
 * Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
 - Fix close button not shown with Qt 4.5 (#494471)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2008 14:30:13 -0000	1.5
+++ sources	18 Apr 2009 03:15:40 -0000	1.6
@@ -1 +1 @@
-6aa20dacb954ad99db25485f2f7eeb52  qjackctl-0.3.3.tar.gz
+65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz



From cebbert at fedoraproject.org  Sat Apr 18 04:10:25 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 18 Apr 2009 04:10:25 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.280, 1.281 kernel.spec, 1.1521, 
	1.1522
Message-ID: <20090418041025.284A6700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18780

Modified Files:
	config-generic kernel.spec 
Log Message:
Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- config-generic	14 Apr 2009 15:12:28 -0000	1.280
+++ config-generic	18 Apr 2009 04:09:54 -0000	1.281
@@ -11,7 +11,7 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1521
retrieving revision 1.1522
diff -u -r1.1521 -r1.1522
--- kernel.spec	17 Apr 2009 16:41:27 -0000	1.1521
+++ kernel.spec	18 Apr 2009 04:09:54 -0000	1.1522
@@ -1824,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
+- Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
+
 * Fri Apr 17 2009 Dave Jones <davej at redhat.com>
 - 2.6.30-rc2-git3
 



From cebbert at fedoraproject.org  Sat Apr 18 04:16:04 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 18 Apr 2009 04:16:04 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic, 1.226, 1.227 kernel.spec, 1.1332, 
	1.1333
Message-ID: <20090418041604.3B48E700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19777

Modified Files:
	config-generic kernel.spec 
Log Message:
Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- config-generic	3 Apr 2009 03:30:43 -0000	1.226
+++ config-generic	18 Apr 2009 04:15:33 -0000	1.227
@@ -11,7 +11,7 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1332
retrieving revision 1.1333
diff -u -r1.1332 -r1.1333
--- kernel.spec	17 Apr 2009 19:16:03 -0000	1.1332
+++ kernel.spec	18 Apr 2009 04:15:33 -0000	1.1333
@@ -1911,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-33
+- Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
+
 * Thu Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>> 2.6.29.1-32
 - Copy ALSA quirk updates from Fedora 11
 



From cebbert at fedoraproject.org  Sat Apr 18 04:18:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 18 Apr 2009 04:18:57 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.275, 1.276 kernel.spec, 1.1559, 
	1.1560
Message-ID: <20090418041857.3D924700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20339

Modified Files:
	config-generic kernel.spec 
Log Message:
Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- config-generic	14 Apr 2009 14:13:40 -0000	1.275
+++ config-generic	18 Apr 2009 04:18:26 -0000	1.276
@@ -11,7 +11,7 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1559
retrieving revision 1.1560
diff -u -r1.1559 -r1.1560
--- kernel.spec	17 Apr 2009 22:04:15 -0000	1.1559
+++ kernel.spec	18 Apr 2009 04:18:26 -0000	1.1560
@@ -1971,6 +1971,9 @@
 # and build.
 
 %changelog
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
+- Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
+
 * Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-97
 - drm-intel-tiled-front.patch: Enable tiled front buffer on gen4
 



From cebbert at fedoraproject.org  Sat Apr 18 04:22:20 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 18 Apr 2009 04:22:20 +0000 (UTC)
Subject: rpms/kernel/F-9 config-generic, 1.133, 1.133.2.1 kernel.spec,
	1.891.2.44, 1.891.2.45
Message-ID: <20090418042220.64AA6700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21085

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	config-generic kernel.spec 
Log Message:
Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.133
retrieving revision 1.133.2.1
diff -u -r1.133 -r1.133.2.1
--- config-generic	18 Dec 2008 22:28:29 -0000	1.133
+++ config-generic	18 Apr 2009 04:21:49 -0000	1.133.2.1
@@ -11,7 +11,7 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.44
retrieving revision 1.891.2.45
diff -u -r1.891.2.44 -r1.891.2.45
--- kernel.spec	8 Apr 2009 19:50:22 -0000	1.891.2.44
+++ kernel.spec	18 Apr 2009 04:21:49 -0000	1.891.2.45
@@ -1953,6 +1953,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.21-170.2.45
+- Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
+
 * Wed Apr 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.44
 - Fix oops in cdc-wdm modem driver. (#481741)
 



From mdomsch at fedoraproject.org  Sat Apr 18 04:45:21 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 04:45:21 +0000 (UTC)
Subject: rpms/pgp-tools/F-10 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20090418044521.1DF5F700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26113

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 16:23:10 -0000	1.9
+++ .cvsignore	18 Apr 2009 04:44:50 -0000	1.10
@@ -1 +1 @@
-signing-party_1.0-2.orig.tar.gz
+signing-party_1.1.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-10/pgp-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pgp-tools.spec	20 May 2008 16:23:10 -0000	1.9
+++ pgp-tools.spec	18 Apr 2009 04:44:50 -0000	1.10
@@ -1,7 +1,7 @@
 %define tarballname signing-party
-%define debian_version 1.0-2
+%define debian_version 1.1
 Name:           pgp-tools
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -21,9 +21,11 @@
 # from svn debian/copyright, not included in tarballs.
 Source1:	copyright
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for pgpring
+Requires: mutt
 
 
 %description
@@ -34,17 +36,22 @@
 * pgp-fixkey: removes broken packets from keys
 * gpg-mailkeys: simply mail out a signed key to its owner
 * gpg-key2ps: generate PostScript file with fingerprint paper strips
+* gpgdir: recursive directory encryption tool
 * gpglist: show who signed which of your UIDs
 * gpgsigs: annotates list of GnuPG keys with already done signatures
 * keylookup: ncurses wrapper around gpg --search
 * gpgparticipants: create list of party participants for the organiser
+* gpgwrap: a passphrase wrapper
+* keyanalyze: minimum signing distance (MSD) analysis on keyrings
 * sig2dot: converts a list of GnuPG signatures to a .dot file
 * springgraph: creates a graph from a .dot file
 
 
 %prep
-%setup -q -n debian-version-%{debian_version}
+%setup -q -n %{tarballname}-%{version}
 cp %SOURCE1 .
+# fix gpgdir library path lookup as we're using system-provided libraries
+sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
 
 %build
 make %{?_smp_mflags}
@@ -53,40 +60,77 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
-
-for file in `find $DIRS -type f -perm +0111 -print`
-do
-	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+make install DESTDIR=$RPM_BUILD_ROOT || :
+# apps with no 'make install'
+for f in caff pgp-clean pgp-fixkey ; do
+install -m 755 caff/$f $RPM_BUILD_ROOT%{_bindir}/
 done
-
-for man in `find $DIRS -type f -name "*.[0-9]" -print`
+install -m 755 gpg-key2ps/gpg-key2ps $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgdir/gpgdir $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpglist/gpglist $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgwrap/bin/gpgwrap $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpg-mailkeys/gpg-mailkeys $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgparticipants/gpgparticipants $RPM_BUILD_ROOT%{_bindir}/
+
+# nuke apps creating their own docs dir
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc
+# find all manpages wherever they are hiding
+DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
+for man in `find $DIRS -type f -name "*.1" -print`
 do
 	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
+# nuke private copy of pgpring
+rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
+
+
 rm -rf __fedora_docs
 mkdir __fedora_docs
 cp -a $DIRS __fedora_docs/
 
 #  cleanup to leave docs only...
 find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+find __fedora_docs -type d -name src -exec rm -rf \{\} \; || :
+rm -rf __fedora_docs/keyanalyze/pgpring
+rm -rf __fedora_docs/keyanalyze/*.[cho]
+rm     __fedora_docs/gpgdir/INSTALL
+rm -rf __fedora_docs/gpgdir/packaging
+rm -rf __fedora_docs/gpgdir/test
+rm -rf __fedora_docs/gpgwrap/{bin,doc}
+rm -rf __fedora_docs/gpglist
+rm -rf __fedora_docs/gpgparticipants
 mv __fedora_docs/keylookup/COPYING .
 
 
+%check
+pushd gpgdir/test
+./gpgdir_test.pl
+RC=0
+grep "STATUS: fail" output/*.test > /dev/null 2>&1 && RC=1
+popd
+exit $RC
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/signing-party
 %doc README COPYING copyright
 %doc __fedora_docs/*
-%{_bindir}/*
-%{_mandir}/*/*
-
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
+- update to 1.1
+  adds gpgdir, gpgwrap, keyanalyze
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue May 20 2008 Matt Domsch <Matt_Domsch at dell.com> 1.0-1
 - upgrade to 1.0-1
   - gpgsigs: Implement support for LaTeX output and photo ids.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 16:23:10 -0000	1.9
+++ sources	18 Apr 2009 04:44:50 -0000	1.10
@@ -1 +1 @@
-614eaa73dea801f208e6e180caa69ac6  signing-party_1.0-2.orig.tar.gz
+2aa5ec82feb0f9d4679c76a1a65231df  signing-party_1.1.orig.tar.gz



From mdomsch at fedoraproject.org  Sat Apr 18 04:56:39 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 04:56:39 +0000 (UTC)
Subject: rpms/pgp-tools/devel .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090418045639.9B7FF700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28254

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 16:23:10 -0000	1.9
+++ .cvsignore	18 Apr 2009 04:56:08 -0000	1.10
@@ -1 +1 @@
-signing-party_1.0-2.orig.tar.gz
+signing-party_1.1.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pgp-tools.spec	26 Feb 2009 19:48:53 -0000	1.10
+++ pgp-tools.spec	18 Apr 2009 04:56:09 -0000	1.11
@@ -1,8 +1,8 @@
 %define tarballname signing-party
-%define debian_version 1.0-2
+%define debian_version 1.1
 Name:           pgp-tools
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -21,9 +21,11 @@
 # from svn debian/copyright, not included in tarballs.
 Source1:	copyright
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for pgpring
+Requires: mutt
 
 
 %description
@@ -34,17 +36,22 @@
 * pgp-fixkey: removes broken packets from keys
 * gpg-mailkeys: simply mail out a signed key to its owner
 * gpg-key2ps: generate PostScript file with fingerprint paper strips
+* gpgdir: recursive directory encryption tool
 * gpglist: show who signed which of your UIDs
 * gpgsigs: annotates list of GnuPG keys with already done signatures
 * keylookup: ncurses wrapper around gpg --search
 * gpgparticipants: create list of party participants for the organiser
+* gpgwrap: a passphrase wrapper
+* keyanalyze: minimum signing distance (MSD) analysis on keyrings
 * sig2dot: converts a list of GnuPG signatures to a .dot file
 * springgraph: creates a graph from a .dot file
 
 
 %prep
-%setup -q -n debian-version-%{debian_version}
+%setup -q -n %{tarballname}-%{version}
 cp %SOURCE1 .
+# fix gpgdir library path lookup as we're using system-provided libraries
+sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
 
 %build
 make %{?_smp_mflags}
@@ -53,40 +60,74 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
-
-for file in `find $DIRS -type f -perm +0111 -print`
-do
-	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+make install DESTDIR=$RPM_BUILD_ROOT || :
+# apps with no 'make install'
+for f in caff pgp-clean pgp-fixkey ; do
+install -m 755 caff/$f $RPM_BUILD_ROOT%{_bindir}/
 done
-
-for man in `find $DIRS -type f -name "*.[0-9]" -print`
+install -m 755 gpg-key2ps/gpg-key2ps $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgdir/gpgdir $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpglist/gpglist $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgwrap/bin/gpgwrap $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpg-mailkeys/gpg-mailkeys $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgparticipants/gpgparticipants $RPM_BUILD_ROOT%{_bindir}/
+
+# nuke apps creating their own docs dir
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc
+# find all manpages wherever they are hiding
+DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
+for man in `find $DIRS -type f -name "*.1" -print`
 do
 	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
+# nuke private copy of pgpring
+rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
+
+
 rm -rf __fedora_docs
 mkdir __fedora_docs
 cp -a $DIRS __fedora_docs/
 
 #  cleanup to leave docs only...
 find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+find __fedora_docs -type d -name src -exec rm -rf \{\} \; || :
+rm -rf __fedora_docs/keyanalyze/pgpring
+rm -rf __fedora_docs/keyanalyze/*.[cho]
+rm     __fedora_docs/gpgdir/INSTALL
+rm -rf __fedora_docs/gpgdir/packaging
+rm -rf __fedora_docs/gpgdir/test
+rm -rf __fedora_docs/gpgwrap/{bin,doc}
+rm -rf __fedora_docs/gpglist
+rm -rf __fedora_docs/gpgparticipants
 mv __fedora_docs/keylookup/COPYING .
 
 
+%check
+pushd gpgdir/test
+./gpgdir_test.pl
+RC=0
+grep "STATUS: fail" output/*.test > /dev/null 2>&1 && RC=1
+popd
+exit $RC
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/signing-party
 %doc README COPYING copyright
 %doc __fedora_docs/*
-%{_bindir}/*
-%{_mandir}/*/*
-
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
+- update to 1.1
+  adds gpgdir, gpgwrap, keyanalyze
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 16:23:10 -0000	1.9
+++ sources	18 Apr 2009 04:56:09 -0000	1.10
@@ -1 +1 @@
-614eaa73dea801f208e6e180caa69ac6  signing-party_1.0-2.orig.tar.gz
+2aa5ec82feb0f9d4679c76a1a65231df  signing-party_1.1.orig.tar.gz



From mdomsch at fedoraproject.org  Sat Apr 18 04:58:02 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 04:58:02 +0000 (UTC)
Subject: rpms/pgp-tools/F-11 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090418045802.AC99C700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28598

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 16:23:10 -0000	1.9
+++ .cvsignore	18 Apr 2009 04:57:32 -0000	1.10
@@ -1 +1 @@
-signing-party_1.0-2.orig.tar.gz
+signing-party_1.1.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/pgp-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pgp-tools.spec	26 Feb 2009 19:48:53 -0000	1.10
+++ pgp-tools.spec	18 Apr 2009 04:57:32 -0000	1.11
@@ -1,8 +1,8 @@
 %define tarballname signing-party
-%define debian_version 1.0-2
+%define debian_version 1.1
 Name:           pgp-tools
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -21,9 +21,11 @@
 # from svn debian/copyright, not included in tarballs.
 Source1:	copyright
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for pgpring
+Requires: mutt
 
 
 %description
@@ -34,17 +36,22 @@
 * pgp-fixkey: removes broken packets from keys
 * gpg-mailkeys: simply mail out a signed key to its owner
 * gpg-key2ps: generate PostScript file with fingerprint paper strips
+* gpgdir: recursive directory encryption tool
 * gpglist: show who signed which of your UIDs
 * gpgsigs: annotates list of GnuPG keys with already done signatures
 * keylookup: ncurses wrapper around gpg --search
 * gpgparticipants: create list of party participants for the organiser
+* gpgwrap: a passphrase wrapper
+* keyanalyze: minimum signing distance (MSD) analysis on keyrings
 * sig2dot: converts a list of GnuPG signatures to a .dot file
 * springgraph: creates a graph from a .dot file
 
 
 %prep
-%setup -q -n debian-version-%{debian_version}
+%setup -q -n %{tarballname}-%{version}
 cp %SOURCE1 .
+# fix gpgdir library path lookup as we're using system-provided libraries
+sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
 
 %build
 make %{?_smp_mflags}
@@ -53,40 +60,74 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
-
-for file in `find $DIRS -type f -perm +0111 -print`
-do
-	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+make install DESTDIR=$RPM_BUILD_ROOT || :
+# apps with no 'make install'
+for f in caff pgp-clean pgp-fixkey ; do
+install -m 755 caff/$f $RPM_BUILD_ROOT%{_bindir}/
 done
-
-for man in `find $DIRS -type f -name "*.[0-9]" -print`
+install -m 755 gpg-key2ps/gpg-key2ps $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgdir/gpgdir $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpglist/gpglist $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgwrap/bin/gpgwrap $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpg-mailkeys/gpg-mailkeys $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgparticipants/gpgparticipants $RPM_BUILD_ROOT%{_bindir}/
+
+# nuke apps creating their own docs dir
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc
+# find all manpages wherever they are hiding
+DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
+for man in `find $DIRS -type f -name "*.1" -print`
 do
 	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
+# nuke private copy of pgpring
+rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
+
+
 rm -rf __fedora_docs
 mkdir __fedora_docs
 cp -a $DIRS __fedora_docs/
 
 #  cleanup to leave docs only...
 find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+find __fedora_docs -type d -name src -exec rm -rf \{\} \; || :
+rm -rf __fedora_docs/keyanalyze/pgpring
+rm -rf __fedora_docs/keyanalyze/*.[cho]
+rm     __fedora_docs/gpgdir/INSTALL
+rm -rf __fedora_docs/gpgdir/packaging
+rm -rf __fedora_docs/gpgdir/test
+rm -rf __fedora_docs/gpgwrap/{bin,doc}
+rm -rf __fedora_docs/gpglist
+rm -rf __fedora_docs/gpgparticipants
 mv __fedora_docs/keylookup/COPYING .
 
 
+%check
+pushd gpgdir/test
+./gpgdir_test.pl
+RC=0
+grep "STATUS: fail" output/*.test > /dev/null 2>&1 && RC=1
+popd
+exit $RC
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/signing-party
 %doc README COPYING copyright
 %doc __fedora_docs/*
-%{_bindir}/*
-%{_mandir}/*/*
-
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
+- update to 1.1
+  adds gpgdir, gpgwrap, keyanalyze
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 16:23:10 -0000	1.9
+++ sources	18 Apr 2009 04:57:32 -0000	1.10
@@ -1 +1 @@
-614eaa73dea801f208e6e180caa69ac6  signing-party_1.0-2.orig.tar.gz
+2aa5ec82feb0f9d4679c76a1a65231df  signing-party_1.1.orig.tar.gz



From oget at fedoraproject.org  Sat Apr 18 05:29:13 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 05:29:13 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth-fedora-defaults.patch, NONE,
	1.1 qsynth.spec, 1.11, 1.12
Message-ID: <20090418052913.CE8B6700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2230

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fedora-defaults.patch 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
- Set Fedora defaults


qsynth-fedora-defaults.patch:

--- NEW FILE qsynth-fedora-defaults.patch ---
--- qsynth-0.3.3.old/src/qsynthOptions.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthOptions.cpp	2009-04-18 01:09:18.000000000 -0400
@@ -61,7 +61,7 @@ qsynthOptions::qsynthOptions (void)
 
 	// Load defaults...
 	m_settings.beginGroup("/Defaults");
-	sSoundFontDir  = m_settings.value("/SoundFontDir").toString();
+	sSoundFontDir  = m_settings.value("/SoundFontDir", "/usr/share/soundfonts").toString();
 	bPresetPreview = m_settings.value("/PresetPreview", false).toBool();
 	m_settings.endGroup();
 
@@ -492,7 +492,7 @@ void qsynthOptions::loadSetup ( qsynthSe
 #else
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "alsa_seq").toString();
     pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "jack").toString();
-    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 64).toInt();
+    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 1024).toInt();
     pSetup->iAudioBufCount   = m_settings.value("/AudioBufCount", 2).toInt();
 #endif
     pSetup->sAlsaName        = m_settings.value("/AlsaName", "pid").toString();
@@ -529,7 +529,9 @@ void qsynthOptions::loadSetup ( qsynthSe
 	m_settings.beginGroup("/SoundFonts");
 	const QString sSoundFontPrefix  = "/SoundFont%1";
 	const QString sBankOffsetPrefix = "/BankOffset%1";
+	const QString defaultSoundfont = "/usr/share/soundfonts/default.sf2";
 	int i = 0;
+	int f = 0;
 	for (;;) {
 		++i;
 		QString sSoundFont  = m_settings.value(sSoundFontPrefix.arg(i)).toString();
@@ -538,6 +540,11 @@ void qsynthOptions::loadSetup ( qsynthSe
 			break;
 		pSetup->soundfonts.append(sSoundFont);
 		pSetup->bankoffsets.append(sBankOffset);
+		f++;
+	}
+	if (f == 0) {
+	  pSetup->soundfonts.append(defaultSoundfont);
+	  pSetup->bankoffsets.append("0");
 	}
 	m_settings.endGroup();
 


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qsynth.spec	17 Apr 2009 22:18:07 -0000	1.11
+++ qsynth.spec	18 Apr 2009 05:28:43 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -13,11 +13,19 @@
 Patch1:        qsynth-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch2:        qsynth-fix-locale-path.patch
+# Tweak the defaults to make things work properly
+Patch3:        qsynth-fedora-defaults.patch
 License:       GPLv2+
 Group:         Applications/Multimedia
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
+%if x%{fedora} < x11
+Requires:      PersonalCopy-Lite-soundfont
+%else
+Requires:      soundfont2-default
+%endif
+
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
 %description
@@ -33,6 +41,12 @@
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
 %patch2 -p1 -b .localedir
+%patch3 -p1 -b .defaults
+
+# default.sf2 not available for Fedora < 11
+%if x%{fedora} < x11
+sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
+%endif
 
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
 touch -r AUTHORS AUTHORS.tmp
@@ -82,6 +96,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
+- Set Fedora defaults
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
 - Fix locale path (#494470)
 - Fix mixed spaces&tabs warnings



From oget at fedoraproject.org  Sat Apr 18 05:31:14 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 05:31:14 +0000 (UTC)
Subject: rpms/qsynth/F-11 qsynth-fedora-defaults.patch, NONE, 1.1 qsynth.spec,
	1.11, 1.12
Message-ID: <20090418053114.5BC2A700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2733

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fedora-defaults.patch 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
- Set Fedora defaults


qsynth-fedora-defaults.patch:

--- NEW FILE qsynth-fedora-defaults.patch ---
--- qsynth-0.3.3.old/src/qsynthOptions.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthOptions.cpp	2009-04-18 01:09:18.000000000 -0400
@@ -61,7 +61,7 @@ qsynthOptions::qsynthOptions (void)
 
 	// Load defaults...
 	m_settings.beginGroup("/Defaults");
-	sSoundFontDir  = m_settings.value("/SoundFontDir").toString();
+	sSoundFontDir  = m_settings.value("/SoundFontDir", "/usr/share/soundfonts").toString();
 	bPresetPreview = m_settings.value("/PresetPreview", false).toBool();
 	m_settings.endGroup();
 
@@ -492,7 +492,7 @@ void qsynthOptions::loadSetup ( qsynthSe
 #else
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "alsa_seq").toString();
     pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "jack").toString();
-    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 64).toInt();
+    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 1024).toInt();
     pSetup->iAudioBufCount   = m_settings.value("/AudioBufCount", 2).toInt();
 #endif
     pSetup->sAlsaName        = m_settings.value("/AlsaName", "pid").toString();
@@ -529,7 +529,9 @@ void qsynthOptions::loadSetup ( qsynthSe
 	m_settings.beginGroup("/SoundFonts");
 	const QString sSoundFontPrefix  = "/SoundFont%1";
 	const QString sBankOffsetPrefix = "/BankOffset%1";
+	const QString defaultSoundfont = "/usr/share/soundfonts/default.sf2";
 	int i = 0;
+	int f = 0;
 	for (;;) {
 		++i;
 		QString sSoundFont  = m_settings.value(sSoundFontPrefix.arg(i)).toString();
@@ -538,6 +540,11 @@ void qsynthOptions::loadSetup ( qsynthSe
 			break;
 		pSetup->soundfonts.append(sSoundFont);
 		pSetup->bankoffsets.append(sBankOffset);
+		f++;
+	}
+	if (f == 0) {
+	  pSetup->soundfonts.append(defaultSoundfont);
+	  pSetup->bankoffsets.append("0");
 	}
 	m_settings.endGroup();
 


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/qsynth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qsynth.spec	17 Apr 2009 22:31:08 -0000	1.11
+++ qsynth.spec	18 Apr 2009 05:30:43 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -13,11 +13,19 @@
 Patch1:        qsynth-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch2:        qsynth-fix-locale-path.patch
+# Tweak the defaults to make things work properly
+Patch3:        qsynth-fedora-defaults.patch
 License:       GPLv2+
 Group:         Applications/Multimedia
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
+%if x%{fedora} < x11
+Requires:      PersonalCopy-Lite-soundfont
+%else
+Requires:      soundfont2-default
+%endif
+
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
 %description
@@ -33,6 +41,12 @@
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
 %patch2 -p1 -b .localedir
+%patch3 -p1 -b .defaults
+
+# default.sf2 not available for Fedora < 11
+%if x%{fedora} < x11
+sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
+%endif
 
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
 touch -r AUTHORS AUTHORS.tmp
@@ -82,6 +96,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
+- Set Fedora defaults
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
 - Fix locale path (#494470)
 - Fix mixed spaces&tabs warnings



From oget at fedoraproject.org  Sat Apr 18 05:33:18 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 05:33:18 +0000 (UTC)
Subject: rpms/qsynth/F-10 qsynth-fedora-defaults.patch, NONE, 1.1 qsynth.spec,
	1.9, 1.10
Message-ID: <20090418053318.1D3AE700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3219

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fedora-defaults.patch 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
- Set Fedora defaults


qsynth-fedora-defaults.patch:

--- NEW FILE qsynth-fedora-defaults.patch ---
--- qsynth-0.3.3.old/src/qsynthOptions.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthOptions.cpp	2009-04-18 01:09:18.000000000 -0400
@@ -61,7 +61,7 @@ qsynthOptions::qsynthOptions (void)
 
 	// Load defaults...
 	m_settings.beginGroup("/Defaults");
-	sSoundFontDir  = m_settings.value("/SoundFontDir").toString();
+	sSoundFontDir  = m_settings.value("/SoundFontDir", "/usr/share/soundfonts").toString();
 	bPresetPreview = m_settings.value("/PresetPreview", false).toBool();
 	m_settings.endGroup();
 
@@ -492,7 +492,7 @@ void qsynthOptions::loadSetup ( qsynthSe
 #else
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "alsa_seq").toString();
     pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "jack").toString();
-    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 64).toInt();
+    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 1024).toInt();
     pSetup->iAudioBufCount   = m_settings.value("/AudioBufCount", 2).toInt();
 #endif
     pSetup->sAlsaName        = m_settings.value("/AlsaName", "pid").toString();
@@ -529,7 +529,9 @@ void qsynthOptions::loadSetup ( qsynthSe
 	m_settings.beginGroup("/SoundFonts");
 	const QString sSoundFontPrefix  = "/SoundFont%1";
 	const QString sBankOffsetPrefix = "/BankOffset%1";
+	const QString defaultSoundfont = "/usr/share/soundfonts/default.sf2";
 	int i = 0;
+	int f = 0;
 	for (;;) {
 		++i;
 		QString sSoundFont  = m_settings.value(sSoundFontPrefix.arg(i)).toString();
@@ -538,6 +540,11 @@ void qsynthOptions::loadSetup ( qsynthSe
 			break;
 		pSetup->soundfonts.append(sSoundFont);
 		pSetup->bankoffsets.append(sBankOffset);
+		f++;
+	}
+	if (f == 0) {
+	  pSetup->soundfonts.append(defaultSoundfont);
+	  pSetup->bankoffsets.append("0");
 	}
 	m_settings.endGroup();
 


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-10/qsynth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qsynth.spec	17 Apr 2009 23:14:39 -0000	1.9
+++ qsynth.spec	18 Apr 2009 05:32:47 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -13,11 +13,19 @@
 Patch1:        qsynth-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch2:        qsynth-fix-locale-path.patch
+# Tweak the defaults to make things work properly
+Patch3:        qsynth-fedora-defaults.patch
 License:       GPLv2+
 Group:         Applications/Multimedia
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
+%if x%{fedora} < x11
+Requires:      PersonalCopy-Lite-soundfont
+%else
+Requires:      soundfont2-default
+%endif
+
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
 %description
@@ -33,6 +41,12 @@
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
 %patch2 -p1 -b .localedir
+%patch3 -p1 -b .defaults
+
+# default.sf2 not available for Fedora < 11
+%if x%{fedora} < x11
+sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
+%endif
 
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
 touch -r AUTHORS AUTHORS.tmp
@@ -82,6 +96,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
+- Set Fedora defaults
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
 - Fix locale path (#494470)
 - Fix mixed spaces&tabs warnings



From oget at fedoraproject.org  Sat Apr 18 05:33:33 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 05:33:33 +0000 (UTC)
Subject: rpms/qsynth/F-9 qsynth-fedora-defaults.patch, NONE, 1.1 qsynth.spec,
	1.7, 1.8
Message-ID: <20090418053333.2948A700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qsynth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3285

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-fedora-defaults.patch 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
- Set Fedora defaults


qsynth-fedora-defaults.patch:

--- NEW FILE qsynth-fedora-defaults.patch ---
--- qsynth-0.3.3.old/src/qsynthOptions.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthOptions.cpp	2009-04-18 01:09:18.000000000 -0400
@@ -61,7 +61,7 @@ qsynthOptions::qsynthOptions (void)
 
 	// Load defaults...
 	m_settings.beginGroup("/Defaults");
-	sSoundFontDir  = m_settings.value("/SoundFontDir").toString();
+	sSoundFontDir  = m_settings.value("/SoundFontDir", "/usr/share/soundfonts").toString();
 	bPresetPreview = m_settings.value("/PresetPreview", false).toBool();
 	m_settings.endGroup();
 
@@ -492,7 +492,7 @@ void qsynthOptions::loadSetup ( qsynthSe
 #else
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "alsa_seq").toString();
     pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "jack").toString();
-    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 64).toInt();
+    pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 1024).toInt();
     pSetup->iAudioBufCount   = m_settings.value("/AudioBufCount", 2).toInt();
 #endif
     pSetup->sAlsaName        = m_settings.value("/AlsaName", "pid").toString();
@@ -529,7 +529,9 @@ void qsynthOptions::loadSetup ( qsynthSe
 	m_settings.beginGroup("/SoundFonts");
 	const QString sSoundFontPrefix  = "/SoundFont%1";
 	const QString sBankOffsetPrefix = "/BankOffset%1";
+	const QString defaultSoundfont = "/usr/share/soundfonts/default.sf2";
 	int i = 0;
+	int f = 0;
 	for (;;) {
 		++i;
 		QString sSoundFont  = m_settings.value(sSoundFontPrefix.arg(i)).toString();
@@ -538,6 +540,11 @@ void qsynthOptions::loadSetup ( qsynthSe
 			break;
 		pSetup->soundfonts.append(sSoundFont);
 		pSetup->bankoffsets.append(sBankOffset);
+		f++;
+	}
+	if (f == 0) {
+	  pSetup->soundfonts.append(defaultSoundfont);
+	  pSetup->bankoffsets.append("0");
 	}
 	m_settings.endGroup();
 


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/qsynth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qsynth.spec	17 Apr 2009 23:28:41 -0000	1.7
+++ qsynth.spec	18 Apr 2009 05:33:02 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -13,11 +13,19 @@
 Patch1:        qsynth-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch2:        qsynth-fix-locale-path.patch
+# Tweak the defaults to make things work properly
+Patch3:        qsynth-fedora-defaults.patch
 License:       GPLv2+
 Group:         Applications/Multimedia
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
+%if x%{fedora} < x11
+Requires:      PersonalCopy-Lite-soundfont
+%else
+Requires:      soundfont2-default
+%endif
+
 BuildRequires: fluidsynth-devel qt-devel desktop-file-utils
 
 %description
@@ -33,6 +41,12 @@
 %patch0 -p1 -b .qt4
 %patch1 -p1 -b .qt45
 %patch2 -p1 -b .localedir
+%patch3 -p1 -b .defaults
+
+# default.sf2 not available for Fedora < 11
+%if x%{fedora} < x11
+sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
+%endif
 
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
 touch -r AUTHORS AUTHORS.tmp
@@ -82,6 +96,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
+- Set Fedora defaults
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-5
 - Fix locale path (#494470)
 - Fix mixed spaces&tabs warnings



From iarnell at fedoraproject.org  Sat Apr 18 05:43:28 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 18 Apr 2009 05:43:28 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/F-10 license.txt, NONE,
	1.1 perl-Getopt-ArgvFile.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090418054328.E5EA1700F7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6168/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	license.txt perl-Getopt-ArgvFile.spec 
Log Message:
initial import


--- NEW FILE license.txt ---
From: Jochen Stenzel <perl at jochen-stenzel.de>
To: Iain Arnell <iarnell at gmail.com>
Subject: Re: Getopt-ArgvFile license
Date: Wed, 15 Apr 2009 21:28:28 +0200

Hello Iain,

> until you get a chance to release an updated version, would you mind
> explicitly stating that Fedora can release the current
> Getopt-ArgvFile-1.11 under Artistic 2.0 license.

I am very sorry that I did not manage the promised update yet (due to
private tasks). Yes, I hereby state that Fedora has my explicit
permission to release Getopt::ArgvFile 1.11 under Artistic License 2.0.

I am still willing to publish an updated version explicitly licensed
under Artistic License 2.0. Sorry for the delay.

Thank you!

            Jochen





--- NEW FILE perl-Getopt-ArgvFile.spec ---
Name:           perl-Getopt-ArgvFile
Version:        1.11
Release:        1%{?dist}
Summary:        Interpolates script options from files into @ARGV or another array
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Getopt-ArgvFile/
Source0:        http://www.cpan.org/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-%{version}.tar.gz
Source1:        license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Harness) >= 1.25
BuildRequires:  perl(Test::More) >= 0.11
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module simply interpolates option file hints in @ARGV by the contents
of the pointed files. This enables option reading from files instead of or
additional to the usual reading from the command line.

%prep
%setup -q -n Getopt-ArgvFile-%{version}
cp %{SOURCE1} .

# fix up crlf
sed -i -e 's/\r//' Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README license.txt
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 16 2009 Iain Arnell <iarnell at gmail.com> 1.11-1
- Specfile autogenerated by cpanspec 1.77.
- remove explicit requires
- include text file documenting the relicensing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:45:24 -0000	1.1
+++ .cvsignore	18 Apr 2009 05:42:58 -0000	1.2
@@ -0,0 +1 @@
+Getopt-ArgvFile-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:45:24 -0000	1.1
+++ sources	18 Apr 2009 05:42:58 -0000	1.2
@@ -0,0 +1 @@
+42117db2af4a24c062b2da25d4fdf756  Getopt-ArgvFile-1.11.tar.gz



From iarnell at fedoraproject.org  Sat Apr 18 05:43:29 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 18 Apr 2009 05:43:29 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/F-11 license.txt, NONE,
	1.1 perl-Getopt-ArgvFile.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090418054329.2E5E9700F7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6168/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	license.txt perl-Getopt-ArgvFile.spec 
Log Message:
initial import


--- NEW FILE license.txt ---
From: Jochen Stenzel <perl at jochen-stenzel.de>
To: Iain Arnell <iarnell at gmail.com>
Subject: Re: Getopt-ArgvFile license
Date: Wed, 15 Apr 2009 21:28:28 +0200

Hello Iain,

> until you get a chance to release an updated version, would you mind
> explicitly stating that Fedora can release the current
> Getopt-ArgvFile-1.11 under Artistic 2.0 license.

I am very sorry that I did not manage the promised update yet (due to
private tasks). Yes, I hereby state that Fedora has my explicit
permission to release Getopt::ArgvFile 1.11 under Artistic License 2.0.

I am still willing to publish an updated version explicitly licensed
under Artistic License 2.0. Sorry for the delay.

Thank you!

            Jochen





--- NEW FILE perl-Getopt-ArgvFile.spec ---
Name:           perl-Getopt-ArgvFile
Version:        1.11
Release:        1%{?dist}
Summary:        Interpolates script options from files into @ARGV or another array
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Getopt-ArgvFile/
Source0:        http://www.cpan.org/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-%{version}.tar.gz
Source1:        license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Harness) >= 1.25
BuildRequires:  perl(Test::More) >= 0.11
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module simply interpolates option file hints in @ARGV by the contents
of the pointed files. This enables option reading from files instead of or
additional to the usual reading from the command line.

%prep
%setup -q -n Getopt-ArgvFile-%{version}
cp %{SOURCE1} .

# fix up crlf
sed -i -e 's/\r//' Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README license.txt
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 16 2009 Iain Arnell <iarnell at gmail.com> 1.11-1
- Specfile autogenerated by cpanspec 1.77.
- remove explicit requires
- include text file documenting the relicensing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:45:24 -0000	1.1
+++ .cvsignore	18 Apr 2009 05:42:58 -0000	1.2
@@ -0,0 +1 @@
+Getopt-ArgvFile-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:45:24 -0000	1.1
+++ sources	18 Apr 2009 05:42:58 -0000	1.2
@@ -0,0 +1 @@
+42117db2af4a24c062b2da25d4fdf756  Getopt-ArgvFile-1.11.tar.gz



From iarnell at fedoraproject.org  Sat Apr 18 05:43:29 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 18 Apr 2009 05:43:29 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/devel license.txt, NONE,
	1.1 perl-Getopt-ArgvFile.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090418054329.68D84700F7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6168/devel

Modified Files:
	.cvsignore sources 
Added Files:
	license.txt perl-Getopt-ArgvFile.spec 
Log Message:
initial import


--- NEW FILE license.txt ---
From: Jochen Stenzel <perl at jochen-stenzel.de>
To: Iain Arnell <iarnell at gmail.com>
Subject: Re: Getopt-ArgvFile license
Date: Wed, 15 Apr 2009 21:28:28 +0200

Hello Iain,

> until you get a chance to release an updated version, would you mind
> explicitly stating that Fedora can release the current
> Getopt-ArgvFile-1.11 under Artistic 2.0 license.

I am very sorry that I did not manage the promised update yet (due to
private tasks). Yes, I hereby state that Fedora has my explicit
permission to release Getopt::ArgvFile 1.11 under Artistic License 2.0.

I am still willing to publish an updated version explicitly licensed
under Artistic License 2.0. Sorry for the delay.

Thank you!

            Jochen





--- NEW FILE perl-Getopt-ArgvFile.spec ---
Name:           perl-Getopt-ArgvFile
Version:        1.11
Release:        1%{?dist}
Summary:        Interpolates script options from files into @ARGV or another array
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Getopt-ArgvFile/
Source0:        http://www.cpan.org/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-%{version}.tar.gz
Source1:        license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Harness) >= 1.25
BuildRequires:  perl(Test::More) >= 0.11
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module simply interpolates option file hints in @ARGV by the contents
of the pointed files. This enables option reading from files instead of or
additional to the usual reading from the command line.

%prep
%setup -q -n Getopt-ArgvFile-%{version}
cp %{SOURCE1} .

# fix up crlf
sed -i -e 's/\r//' Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README license.txt
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 16 2009 Iain Arnell <iarnell at gmail.com> 1.11-1
- Specfile autogenerated by cpanspec 1.77.
- remove explicit requires
- include text file documenting the relicensing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:45:24 -0000	1.1
+++ .cvsignore	18 Apr 2009 05:42:59 -0000	1.2
@@ -0,0 +1 @@
+Getopt-ArgvFile-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:45:24 -0000	1.1
+++ sources	18 Apr 2009 05:42:59 -0000	1.2
@@ -0,0 +1 @@
+42117db2af4a24c062b2da25d4fdf756  Getopt-ArgvFile-1.11.tar.gz



From mclasen at fedoraproject.org  Sat Apr 18 05:44:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 18 Apr 2009 05:44:26 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-11 wizard-padding.patch, NONE,
	1.1 gnome-bluetooth.spec, 1.75, 1.76
Message-ID: <20090418054426.6CF49700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6408

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	wizard-padding.patch 
Log Message:
Add padding to the wizard


wizard-padding.patch:

--- NEW FILE wizard-padding.patch ---
diff -up gnome-bluetooth-2.27.4/wizard/wizard.ui.padding gnome-bluetooth-2.27.4/wizard/wizard.ui
--- gnome-bluetooth-2.27.4/wizard/wizard.ui.padding	2009-04-18 01:37:01.645051467 -0400
+++ gnome-bluetooth-2.27.4/wizard/wizard.ui	2009-04-18 01:37:28.466298550 -0400
@@ -7,6 +7,7 @@
     <property name="window_position">center</property>
     <property name="default_width">440</property>
     <property name="default_height">440</property>
+    <property name="border-width">12</property>
     <signal name="prepare" handler="prepare_callback"/>
     <signal name="cancel" handler="close_callback"/>
     <signal name="close" handler="close_callback"/>


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gnome-bluetooth.spec	16 Apr 2009 18:06:50 -0000	1.75
+++ gnome-bluetooth.spec	18 Apr 2009 05:43:56 -0000	1.76
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -9,6 +9,8 @@
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch0:		wizard-padding.patch
+
 BuildRequires:	gtk2-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	dbus-glib-devel
@@ -62,6 +64,7 @@
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
+%patch0 -p1 -b .wizard-padding
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -182,6 +185,9 @@
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-3
+- Add padding to the wizard
+
 * Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.4-2
 - Require the PA Bluetooth plugins
 



From iarnell at fedoraproject.org  Sat Apr 18 05:59:25 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 18 Apr 2009 05:59:25 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/F-10 perl-Getopt-ArgvFile.spec,1.1,1.2
Message-ID: <20090418055925.4A344700F7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411/F-10

Modified Files:
	perl-Getopt-ArgvFile.spec 
Log Message:
* Sat Apr 18 2009 Iain Arnell <iarnell at gmail.com> 1.11-2
- BR Test::Pod and Test::Pod::Coverage



Index: perl-Getopt-ArgvFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-10/perl-Getopt-ArgvFile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Getopt-ArgvFile.spec	18 Apr 2009 05:42:58 -0000	1.1
+++ perl-Getopt-ArgvFile.spec	18 Apr 2009 05:58:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-ArgvFile
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpolates script options from files into @ARGV or another array
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -12,6 +12,8 @@
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::Harness) >= 1.25
 BuildRequires:  perl(Test::More) >= 0.11
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -53,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Iain Arnell <iarnell at gmail.com> 1.11-2
+- BR Test::Pod and Test::Pod::Coverage
+
 * Thu Apr 16 2009 Iain Arnell <iarnell at gmail.com> 1.11-1
 - Specfile autogenerated by cpanspec 1.77.
 - remove explicit requires



From iarnell at fedoraproject.org  Sat Apr 18 05:59:25 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 18 Apr 2009 05:59:25 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/devel perl-Getopt-ArgvFile.spec,1.1,1.2
Message-ID: <20090418055925.5C89E7013F@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411/devel

Modified Files:
	perl-Getopt-ArgvFile.spec 
Log Message:
* Sat Apr 18 2009 Iain Arnell <iarnell at gmail.com> 1.11-2
- BR Test::Pod and Test::Pod::Coverage



Index: perl-Getopt-ArgvFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel/perl-Getopt-ArgvFile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Getopt-ArgvFile.spec	18 Apr 2009 05:42:59 -0000	1.1
+++ perl-Getopt-ArgvFile.spec	18 Apr 2009 05:58:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-ArgvFile
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpolates script options from files into @ARGV or another array
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -12,6 +12,8 @@
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::Harness) >= 1.25
 BuildRequires:  perl(Test::More) >= 0.11
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -53,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Iain Arnell <iarnell at gmail.com> 1.11-2
+- BR Test::Pod and Test::Pod::Coverage
+
 * Thu Apr 16 2009 Iain Arnell <iarnell at gmail.com> 1.11-1
 - Specfile autogenerated by cpanspec 1.77.
 - remove explicit requires



From iarnell at fedoraproject.org  Sat Apr 18 05:59:25 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 18 Apr 2009 05:59:25 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/F-11 perl-Getopt-ArgvFile.spec,1.1,1.2
Message-ID: <20090418055925.4FC9170137@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411/F-11

Modified Files:
	perl-Getopt-ArgvFile.spec 
Log Message:
* Sat Apr 18 2009 Iain Arnell <iarnell at gmail.com> 1.11-2
- BR Test::Pod and Test::Pod::Coverage



Index: perl-Getopt-ArgvFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/F-11/perl-Getopt-ArgvFile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Getopt-ArgvFile.spec	18 Apr 2009 05:42:58 -0000	1.1
+++ perl-Getopt-ArgvFile.spec	18 Apr 2009 05:58:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-ArgvFile
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpolates script options from files into @ARGV or another array
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -12,6 +12,8 @@
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::Harness) >= 1.25
 BuildRequires:  perl(Test::More) >= 0.11
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -53,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Iain Arnell <iarnell at gmail.com> 1.11-2
+- BR Test::Pod and Test::Pod::Coverage
+
 * Thu Apr 16 2009 Iain Arnell <iarnell at gmail.com> 1.11-1
 - Specfile autogenerated by cpanspec 1.77.
 - remove explicit requires



From sharkcz at fedoraproject.org  Sat Apr 18 07:17:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 18 Apr 2009 07:17:14 +0000 (UTC)
Subject: rpms/s390utils/F-11 0014-s390-tools-1.8.0-headers.patch, NONE,
	1.1 s390utils.spec, 1.1, 1.2
Message-ID: <20090418071714.4AC1D700F7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26098

Modified Files:
	s390utils.spec 
Added Files:
	0014-s390-tools-1.8.0-headers.patch 
Log Message:
* Fri Apr 17 2009 Dan Hor??k <dan[at]danny.cz> 2:1.8.0-6
- fix build with newer kernels


0014-s390-tools-1.8.0-headers.patch:

--- NEW FILE 0014-s390-tools-1.8.0-headers.patch ---
>From 35ca774b05ad30d7064536edc2042e1a525d6da5 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 17 Apr 2009 22:05:38 +0200
Subject: [PATCH] swap the order of headers' inclusion

---
 ziomon/ziomon_tools.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ziomon/ziomon_tools.c b/ziomon/ziomon_tools.c
index 5f37407..88359c6 100644
--- a/ziomon/ziomon_tools.c
+++ b/ziomon/ziomon_tools.c
@@ -7,10 +7,10 @@
  * Author(s): Stefan Raspl <raspl at linux.vnet.ibm.com>
  */
 
-#include "ziomon_tools.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <assert.h>
+#include "ziomon_tools.h"
 
 
 extern int verbose;
-- 
1.6.0.6



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s390utils.spec	7 Apr 2009 08:03:09 -0000	1.1
+++ s390utils.spec	18 Apr 2009 07:16:43 -0000	1.2
@@ -8,7 +8,7 @@
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,7 @@
 Patch11:        0011-s390-tools-1.5.3-fdasd-raid.patch
 Patch12:        0012-s390-tools-1.8.0-initscript-fix.patch
 Patch13:        0013-s390-tools-1.8.0-cflags.patch
+Patch14:        0014-s390-tools-1.8.0-headers.patch
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
 Patch200:       src_vipa-2.0.4-locations.patch
@@ -102,6 +103,9 @@
 # allow override of optimization level in CFLAGS
 %patch13 -p1 -b .cflags
 
+# fix the order of inclusion for glibc and kernel headers
+%patch14 -p1 -b .headers
+
 #
 # cmsfs
 #
@@ -670,6 +674,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Hor??k <dan[at]danny.cz> 2:1.8.0-6
+- fix build with newer kernels
+
 * Wed Mar 25 2009 Dan Hor??k <dan[at]danny.cz> 2:1.8.0-5
 - reword the summaries a bit
 - add downloadable URLs for Sources



From jussilehtola at fedoraproject.org  Sat Apr 18 07:26:01 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 18 Apr 2009 07:26:01 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/devel import.log, NONE, 1.1 perl-Net-UPnP.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418072601.7D628700F7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27587/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Net-UPnP.spec 
Log Message:
* Sat Apr 18 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Import package in Fedora.



--- NEW FILE import.log ---
perl-Net-UPnP-1_41-3_fc10:HEAD:perl-Net-UPnP-1.41-3.fc10.src.rpm:1240039405


--- NEW FILE perl-Net-UPnP.spec ---
Name:		perl-Net-UPnP
Version:	1.41
Release:	3%{?dist}
Summary:	Perl extension for UPnP
License:	BSD
Group:		Development/Libraries
URL:		http://search.cpan.org/dist/Net-UPnP/
Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	perl(ExtUtils::MakeMaker)
BuildRequires:	perl(Test::More)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package provides some functions to control UPnP devices.

%prep
%setup -q -n Net-UPnP-%{version}
# Fix file attributes
find -name '*.pm' -exec chmod a-x '{}' \;

# Fix shebangs
for file in examples/*.pl; do
 sed "s|/usr/local/bin/perl|/usr/bin/perl|g" $file > $file.mod && \
 touch -r $file $file.mod && \
 mv $file.mod $file
done


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Review fixes.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
- Add missing BR: Test::More.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
- Specfile autogenerated by cpanspec 1.77.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:38:14 -0000	1.1
+++ .cvsignore	18 Apr 2009 07:25:31 -0000	1.2
@@ -0,0 +1 @@
+Net-UPnP-1.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:38:14 -0000	1.1
+++ sources	18 Apr 2009 07:25:31 -0000	1.2
@@ -0,0 +1 @@
+7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz



From jussilehtola at fedoraproject.org  Sat Apr 18 07:28:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 18 Apr 2009 07:28:00 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/F-10 perl-Net-UPnP.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090418072800.C3EC2700F7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28389/F-10

Modified Files:
	sources 
Added Files:
	perl-Net-UPnP.spec 
Log Message:
* Sat Apr 18 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Import package in Fedora.



--- NEW FILE perl-Net-UPnP.spec ---
Name:		perl-Net-UPnP
Version:	1.41
Release:	3%{?dist}
Summary:	Perl extension for UPnP
License:	BSD
Group:		Development/Libraries
URL:		http://search.cpan.org/dist/Net-UPnP/
Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	perl(ExtUtils::MakeMaker)
BuildRequires:	perl(Test::More)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package provides some functions to control UPnP devices.

%prep
%setup -q -n Net-UPnP-%{version}
# Fix file attributes
find -name '*.pm' -exec chmod a-x '{}' \;

# Fix shebangs
for file in examples/*.pl; do
 sed "s|/usr/local/bin/perl|/usr/bin/perl|g" $file > $file.mod && \
 touch -r $file $file.mod && \
 mv $file.mod $file
done


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Review fixes.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
- Add missing BR: Test::More.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
- Specfile autogenerated by cpanspec 1.77.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:38:14 -0000	1.1
+++ sources	18 Apr 2009 07:27:30 -0000	1.2
@@ -0,0 +1 @@
+7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz



From jussilehtola at fedoraproject.org  Sat Apr 18 07:28:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 18 Apr 2009 07:28:00 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/EL-5 perl-Net-UPnP.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090418072800.AAA14700F7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28389/EL-5

Modified Files:
	sources 
Added Files:
	perl-Net-UPnP.spec 
Log Message:
* Sat Apr 18 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Import package in Fedora.



--- NEW FILE perl-Net-UPnP.spec ---
Name:		perl-Net-UPnP
Version:	1.41
Release:	3%{?dist}
Summary:	Perl extension for UPnP
License:	BSD
Group:		Development/Libraries
URL:		http://search.cpan.org/dist/Net-UPnP/
Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	perl(ExtUtils::MakeMaker)
BuildRequires:	perl(Test::More)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package provides some functions to control UPnP devices.

%prep
%setup -q -n Net-UPnP-%{version}
# Fix file attributes
find -name '*.pm' -exec chmod a-x '{}' \;

# Fix shebangs
for file in examples/*.pl; do
 sed "s|/usr/local/bin/perl|/usr/bin/perl|g" $file > $file.mod && \
 touch -r $file $file.mod && \
 mv $file.mod $file
done


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Review fixes.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
- Add missing BR: Test::More.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
- Specfile autogenerated by cpanspec 1.77.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:38:14 -0000	1.1
+++ sources	18 Apr 2009 07:27:30 -0000	1.2
@@ -0,0 +1 @@
+7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz



From jussilehtola at fedoraproject.org  Sat Apr 18 07:28:01 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 18 Apr 2009 07:28:01 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/F-11 perl-Net-UPnP.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090418072801.11BC5700F7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28389/F-11

Modified Files:
	sources 
Added Files:
	perl-Net-UPnP.spec 
Log Message:
* Sat Apr 18 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Import package in Fedora.



--- NEW FILE perl-Net-UPnP.spec ---
Name:		perl-Net-UPnP
Version:	1.41
Release:	3%{?dist}
Summary:	Perl extension for UPnP
License:	BSD
Group:		Development/Libraries
URL:		http://search.cpan.org/dist/Net-UPnP/
Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	perl(ExtUtils::MakeMaker)
BuildRequires:	perl(Test::More)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package provides some functions to control UPnP devices.

%prep
%setup -q -n Net-UPnP-%{version}
# Fix file attributes
find -name '*.pm' -exec chmod a-x '{}' \;

# Fix shebangs
for file in examples/*.pl; do
 sed "s|/usr/local/bin/perl|/usr/bin/perl|g" $file > $file.mod && \
 touch -r $file $file.mod && \
 mv $file.mod $file
done


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
- Review fixes.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
- Add missing BR: Test::More.

* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
- Specfile autogenerated by cpanspec 1.77.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:38:14 -0000	1.1
+++ sources	18 Apr 2009 07:27:30 -0000	1.2
@@ -0,0 +1 @@
+7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz



From anithra at fedoraproject.org  Sat Apr 18 08:16:26 2009
From: anithra at fedoraproject.org (Anithra P Janakiraman)
Date: Sat, 18 Apr 2009 08:16:26 +0000 (UTC)
Subject: rpms/systemtapguiserver/devel import.log, NONE,
	1.1 systemtapguiserver.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090418081626.BC17A700F7@cvs1.fedora.phx.redhat.com>

Author: anithra

Update of /cvs/pkgs/rpms/systemtapguiserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7074/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log systemtapguiserver.spec 
Log Message:
* Sat Apr 18 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com>
- Initial Package



--- NEW FILE import.log ---
systemtapguiserver-1_0-7:HEAD:systemtapguiserver-1.0-7.src.rpm:1240042027


--- NEW FILE systemtapguiserver.spec ---
Name:		systemtapguiserver
Version:	1.0
Release:	7 
Summary:	Server for the eclipse-systemtapgui Client
License:	EPL
Group:		Development/Tools
URL:		http://stapgui.sourceforge.net/

Source0:	http://downloads.sourceforge.net/stapgui/%{name}-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:	systemtap

%description
systemtapguiserver is the server for the eclipse-systemtapgui client. It 
provides stdout/stderr data collection and process management services for the 
client

%prep
%setup -q

%build
%configure
make %{_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
install stapgui-server ${RPM_BUILD_ROOT}/%{_bindir}/stapgui-server

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%{_bindir}/*
%doc docs/epl-v10.html
%doc docs/README

%changelog
* Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
- Changes to spec file.
* Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6
- Changes to Makefile,spec
* Fri Mar 13 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-5
- Changes to Makefile,spec.
* Tue Feb 10 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-4
- Changes to Makefile, spec. 
* Mon Feb 09 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-3
- Included the license agreement
* Thu Feb 05 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-2
- Changes to the Makefile and package name
* Thu Jan 28 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:28:54 -0000	1.1
+++ .cvsignore	18 Apr 2009 08:15:56 -0000	1.2
@@ -0,0 +1 @@
+systemtapguiserver-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:28:55 -0000	1.1
+++ sources	18 Apr 2009 08:15:56 -0000	1.2
@@ -0,0 +1 @@
+0ba6fe49df64ef3a7f27fc7b53cb82a0  systemtapguiserver-1.0.tar.bz2



From anithra at fedoraproject.org  Sat Apr 18 08:19:34 2009
From: anithra at fedoraproject.org (Anithra P Janakiraman)
Date: Sat, 18 Apr 2009 08:19:34 +0000 (UTC)
Subject: rpms/systemtapguiserver/F-10 import.log, NONE,
	1.1 systemtapguiserver.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090418081934.80592700F7@cvs1.fedora.phx.redhat.com>

Author: anithra

Update of /cvs/pkgs/rpms/systemtapguiserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8123/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log systemtapguiserver.spec 
Log Message:
* Sat Apr 18 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com>
- Initial package



--- NEW FILE import.log ---
systemtapguiserver-1_0-7:F-10:systemtapguiserver-1.0-7.src.rpm:1240042305


--- NEW FILE systemtapguiserver.spec ---
Name:		systemtapguiserver
Version:	1.0
Release:	7 
Summary:	Server for the eclipse-systemtapgui Client
License:	EPL
Group:		Development/Tools
URL:		http://stapgui.sourceforge.net/

Source0:	http://downloads.sourceforge.net/stapgui/%{name}-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:	systemtap

%description
systemtapguiserver is the server for the eclipse-systemtapgui client. It 
provides stdout/stderr data collection and process management services for the 
client

%prep
%setup -q

%build
%configure
make %{_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
install stapgui-server ${RPM_BUILD_ROOT}/%{_bindir}/stapgui-server

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%{_bindir}/*
%doc docs/epl-v10.html
%doc docs/README

%changelog
* Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
- Changes to spec file.
* Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6
- Changes to Makefile,spec
* Fri Mar 13 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-5
- Changes to Makefile,spec.
* Tue Feb 10 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-4
- Changes to Makefile, spec. 
* Mon Feb 09 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-3
- Included the license agreement
* Thu Feb 05 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-2
- Changes to the Makefile and package name
* Thu Jan 28 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:28:54 -0000	1.1
+++ .cvsignore	18 Apr 2009 08:19:04 -0000	1.2
@@ -0,0 +1 @@
+systemtapguiserver-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:28:55 -0000	1.1
+++ sources	18 Apr 2009 08:19:04 -0000	1.2
@@ -0,0 +1 @@
+0ba6fe49df64ef3a7f27fc7b53cb82a0  systemtapguiserver-1.0.tar.bz2



From mschwendt at fedoraproject.org  Sat Apr 18 08:43:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 18 Apr 2009 08:43:26 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.27,1.28
Message-ID: <20090418084326.80050700F7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14004

Modified Files:
	MultiLib.py 
Log Message:
Don't multilib debuginfo rpms (not done in base Fedora either).


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MultiLib.py	27 Mar 2009 16:58:00 -0000	1.27
+++ MultiLib.py	18 Apr 2009 08:43:25 -0000	1.28
@@ -142,9 +142,10 @@
             missingdict[targetarch]['rpms'] = pkglist
 #            print ' +', pkgbasefn
         pkglist = missingdict[targetarch].setdefault('debug',[])
-        if debugrpm not in pkglist:
-            pkglist.append(debugrpm)
-            missingdict[targetarch]['debug'] = pkglist
+# Don't multilib debuginfo rpms (not done in base Fedora either).
+#        if debugrpm not in pkglist:
+#            pkglist.append(debugrpm)
+#            missingdict[targetarch]['debug'] = pkglist
         
     return
 
@@ -213,13 +214,14 @@
             self.needed[pkg.repoid]['rpms'].append(file)
             print ' +', file
 
-            binarch = a
-            srcrpm = pkg.returnSimple('sourcerpm')
-            (n,v,r,e,a) = rpmUtils.miscutils.splitFilename(srcrpm)
-            debugrpm = '%s-debuginfo-%s-%s.%s.rpm' % (n,v,r,binarch)
-            if debugrpm not in self.needed[pkg.repoid]['debug']:
-                self.needed[pkg.repoid]['debug'].append(debugrpm)
-                print ' +', debugrpm
+# Don't multilib debuginfo rpms (not done in base Fedora either).
+#            binarch = a
+#            srcrpm = pkg.returnSimple('sourcerpm')
+#            (n,v,r,e,a) = rpmUtils.miscutils.splitFilename(srcrpm)
+#            debugrpm = '%s-debuginfo-%s-%s.%s.rpm' % (n,v,r,binarch)
+#            if debugrpm not in self.needed[pkg.repoid]['debug']:
+#                self.needed[pkg.repoid]['debug'].append(debugrpm)
+#                print ' +', debugrpm
 
     def resolveRequires(self,pkg):
         if pkg.__str__() in self.seenbefore:



From scop at fedoraproject.org  Sat Apr 18 09:07:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 18 Apr 2009 09:07:57 +0000 (UTC)
Subject: rpms/vdr/devel vdr-moveto.sh,1.2,1.3 vdr.spec,1.42,1.43
Message-ID: <20090418090757.37447700F7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18832/devel

Modified Files:
	vdr-moveto.sh vdr.spec 
Log Message:
* Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-21
- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.



Index: vdr-moveto.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-moveto.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-moveto.sh	23 Nov 2008 22:02:17 -0000	1.2
+++ vdr-moveto.sh	18 Apr 2009 09:07:26 -0000	1.3
@@ -9,7 +9,8 @@
 # Move to movies: vdr-moveto.sh 00_Movies
 # Move to music: vdr-moveto.sh 00_Music
 
-videodir="/var/lib/vdr/video"
+videodir="$(sed -ne 's/^\s*VDR_OPTIONS\s*=.*\(-v\s\+\|--video\(=\|\s\+\)\)\([^[:space:])]*\).*/\3/p' /etc/sysconfig/vdr)"
+[ -n "$videodir" ] || videodir="/var/lib/vdr/video"
 
 to="$videodir/$1"
 what="$2"


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vdr.spec	14 Apr 2009 16:42:16 -0000	1.42
+++ vdr.spec	18 Apr 2009 09:07:26 -0000	1.43
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -531,6 +531,9 @@
 %endif # plugins
 
 %changelog
+* Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-21
+- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-20
 - Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.
 - Use useradd -N instead of -n in scriptlets (#495731).



From scop at fedoraproject.org  Sat Apr 18 09:07:56 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 18 Apr 2009 09:07:56 +0000 (UTC)
Subject: rpms/vdr/F-11 vdr-moveto.sh,1.2,1.3 vdr.spec,1.42,1.43
Message-ID: <20090418090757.0200C700F7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18832/F-11

Modified Files:
	vdr-moveto.sh vdr.spec 
Log Message:
* Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-21
- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.



Index: vdr-moveto.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/vdr-moveto.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-moveto.sh	23 Nov 2008 22:02:17 -0000	1.2
+++ vdr-moveto.sh	18 Apr 2009 09:07:26 -0000	1.3
@@ -9,7 +9,8 @@
 # Move to movies: vdr-moveto.sh 00_Movies
 # Move to music: vdr-moveto.sh 00_Music
 
-videodir="/var/lib/vdr/video"
+videodir="$(sed -ne 's/^\s*VDR_OPTIONS\s*=.*\(-v\s\+\|--video\(=\|\s\+\)\)\([^[:space:])]*\).*/\3/p' /etc/sysconfig/vdr)"
+[ -n "$videodir" ] || videodir="/var/lib/vdr/video"
 
 to="$videodir/$1"
 what="$2"


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/vdr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vdr.spec	14 Apr 2009 16:42:16 -0000	1.42
+++ vdr.spec	18 Apr 2009 09:07:26 -0000	1.43
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -531,6 +531,9 @@
 %endif # plugins
 
 %changelog
+* Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-21
+- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-20
 - Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.
 - Use useradd -N instead of -n in scriptlets (#495731).



From bagnara at fedoraproject.org  Sat Apr 18 09:08:15 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:08:15 +0000 (UTC)
Subject: rpms/ppl/devel .cvsignore, 1.4, 1.5 ppl.hh, 1.2, 1.3 ppl.spec, 1.28,
	1.29 ppl_c.h, 1.2, 1.3 pwl.hh, 1.2, 1.3 sources, 1.4, 1.5
Message-ID: <20090418090815.2260F700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18933

Modified Files:
	.cvsignore ppl.hh ppl.spec ppl_c.h pwl.hh sources 
Log Message:
Updated for PPL 0.10.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 06:22:30 -0000	1.4
+++ .cvsignore	18 Apr 2009 09:07:44 -0000	1.5
@@ -1 +1 @@
-ppl-0.10.1.tar.gz
+ppl-0.10.2.tar.gz


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl.hh	14 Apr 2009 06:14:28 -0000	1.2
+++ ppl.hh	18 Apr 2009 09:07:44 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl-s390x.hh"
 #elif defined(__s390__)
 #include "ppl-s390.hh"
+#elif defined(__sh__)
+#include "ppl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl-sparc64.hh"
+#elif defined(__sparc__)
+#include "ppl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ppl.spec	14 Apr 2009 06:14:28 -0000	1.28
+++ ppl.spec	18 Apr 2009 09:07:44 -0000	1.29
@@ -1,7 +1,7 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
@@ -12,7 +12,7 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-Patch0:         ppl-0.10.1-Makefile.patch
+Patch0:         ppl-0.10.2-Makefile.patch
 #Patch1:
 #Icon:
 #Requires:
@@ -106,6 +106,7 @@
 Group:          Development/Libraries
 BuildRequires:  yap-devel >= 5.1.1
 Requires:       %{name} = %{version}-%{release}, %{name}-pwl = %{version}-%{release}, yap >= 5.1.1
+Obsoletes:      ppl-yap-static
 %description yap
 This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in YAP Prolog programs.
@@ -226,7 +227,8 @@
 # the architecture for which the compiler is compiling.
 
 # Since our header files only depend on the sizeof things, we smash
-# ix86 onto i386 and arm* onto arm.
+# ix86 onto i386 and arm* onto arm.  For the SuperH RISC engine family,
+# we smash sh3 and sh4 onto sh.
 normalized_arch=%{_arch}
 %ifarch %{ix86}
 normalized_arch=i386
@@ -234,6 +236,9 @@
 %ifarch %{arm}
 normalized_arch=arm
 %endif
+%ifarch sh3 sh4
+normalized_arch=sh
+%endif
 
 mv %{buildroot}/%{_includedir}/ppl.hh %{buildroot}/%{_includedir}/ppl-${normalized_arch}.hh
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/ppl.hh
@@ -405,6 +410,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-1
+- Updated for PPL 0.10.2.
+
 * Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
 - Updated for PPL 0.10.1.
 


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl_c.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl_c.h	14 Apr 2009 06:14:28 -0000	1.2
+++ ppl_c.h	18 Apr 2009 09:07:44 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl_c-s390x.h"
 #elif defined(__s390__)
 #include "ppl_c-s390.h"
+#elif defined(__sh__)
+#include "ppl_c-sh.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl_c-sparc64.h"
+#elif defined(__sparc__)
+#include "ppl_c-sparc.h"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/pwl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwl.hh	14 Apr 2009 06:14:29 -0000	1.2
+++ pwl.hh	18 Apr 2009 09:07:44 -0000	1.3
@@ -38,6 +38,12 @@
 #include "pwl-s390x.hh"
 #elif defined(__s390__)
 #include "pwl-s390.hh"
+#elif defined(__sh__)
+#include "pwl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pwl-sparc64.hh"
+#elif defined(__sparc__)
+#include "pwl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-pwl-devel packages."
 #endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2009 06:22:31 -0000	1.4
+++ sources	18 Apr 2009 09:07:44 -0000	1.5
@@ -1 +1 @@
-327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz
+e7dd265afdeaea81f7e87a72b182d875  ppl-0.10.2.tar.gz



From bagnara at fedoraproject.org  Sat Apr 18 09:08:31 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:08:31 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.10.2-Makefile.patch,NONE,1.1
Message-ID: <20090418090831.87729700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19200

Added Files:
	ppl-0.10.2-Makefile.patch 
Log Message:
Revised patch.

ppl-0.10.2-Makefile.patch:

--- NEW FILE ppl-0.10.2-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@



From bagnara at fedoraproject.org  Sat Apr 18 09:17:32 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:17:32 +0000 (UTC)
Subject: rpms/ppl/F-11 ppl-0.10.2-Makefile.patch, NONE, 1.1 ppl.hh, 1.2,
	1.3 ppl.spec, 1.28, 1.29 ppl_c.h, 1.2, 1.3 pwl.hh, 1.2,
	1.3 ppl-0.10.1-Makefile.patch, 1.1, NONE
Message-ID: <20090418091732.0CC75700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21903

Modified Files:
	ppl.hh ppl.spec ppl_c.h pwl.hh 
Added Files:
	ppl-0.10.2-Makefile.patch 
Removed Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.2.

ppl-0.10.2-Makefile.patch:

--- NEW FILE ppl-0.10.2-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl.hh	14 Apr 2009 06:14:28 -0000	1.2
+++ ppl.hh	18 Apr 2009 09:17:01 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl-s390x.hh"
 #elif defined(__s390__)
 #include "ppl-s390.hh"
+#elif defined(__sh__)
+#include "ppl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl-sparc64.hh"
+#elif defined(__sparc__)
+#include "ppl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ppl.spec	14 Apr 2009 06:14:28 -0000	1.28
+++ ppl.spec	18 Apr 2009 09:17:01 -0000	1.29
@@ -1,7 +1,7 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
@@ -12,7 +12,7 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-Patch0:         ppl-0.10.1-Makefile.patch
+Patch0:         ppl-0.10.2-Makefile.patch
 #Patch1:
 #Icon:
 #Requires:
@@ -106,6 +106,7 @@
 Group:          Development/Libraries
 BuildRequires:  yap-devel >= 5.1.1
 Requires:       %{name} = %{version}-%{release}, %{name}-pwl = %{version}-%{release}, yap >= 5.1.1
+Obsoletes:      ppl-yap-static
 %description yap
 This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in YAP Prolog programs.
@@ -226,7 +227,8 @@
 # the architecture for which the compiler is compiling.
 
 # Since our header files only depend on the sizeof things, we smash
-# ix86 onto i386 and arm* onto arm.
+# ix86 onto i386 and arm* onto arm.  For the SuperH RISC engine family,
+# we smash sh3 and sh4 onto sh.
 normalized_arch=%{_arch}
 %ifarch %{ix86}
 normalized_arch=i386
@@ -234,6 +236,9 @@
 %ifarch %{arm}
 normalized_arch=arm
 %endif
+%ifarch sh3 sh4
+normalized_arch=sh
+%endif
 
 mv %{buildroot}/%{_includedir}/ppl.hh %{buildroot}/%{_includedir}/ppl-${normalized_arch}.hh
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/ppl.hh
@@ -405,6 +410,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-1
+- Updated for PPL 0.10.2.
+
 * Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
 - Updated for PPL 0.10.1.
 


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl_c.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl_c.h	14 Apr 2009 06:14:28 -0000	1.2
+++ ppl_c.h	18 Apr 2009 09:17:01 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl_c-s390x.h"
 #elif defined(__s390__)
 #include "ppl_c-s390.h"
+#elif defined(__sh__)
+#include "ppl_c-sh.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl_c-sparc64.h"
+#elif defined(__sparc__)
+#include "ppl_c-sparc.h"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/pwl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwl.hh	14 Apr 2009 06:14:29 -0000	1.2
+++ pwl.hh	18 Apr 2009 09:17:01 -0000	1.3
@@ -38,6 +38,12 @@
 #include "pwl-s390x.hh"
 #elif defined(__s390__)
 #include "pwl-s390.hh"
+#elif defined(__sh__)
+#include "pwl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pwl-sparc64.hh"
+#elif defined(__sparc__)
+#include "pwl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-pwl-devel packages."
 #endif


--- ppl-0.10.1-Makefile.patch DELETED ---



From bagnara at fedoraproject.org  Sat Apr 18 09:18:12 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:18:12 +0000 (UTC)
Subject: rpms/ppl/devel ppl-0.10.1-Makefile.patch,1.1,NONE
Message-ID: <20090418091812.EC959700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22243

Removed Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Obsolete patch file removed.


--- ppl-0.10.1-Makefile.patch DELETED ---



From abompard at fedoraproject.org  Sat Apr 18 09:21:38 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 18 Apr 2009 09:21:38 +0000 (UTC)
Subject: rpms/keepassx/F-10 keepassx-0.4.0-autotype.patch, NONE,
	1.1 keepassx.spec, 1.15, 1.16
Message-ID: <20090418092138.0A6AF700F7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/keepassx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22982/F-10

Modified Files:
	keepassx.spec 
Added Files:
	keepassx-0.4.0-autotype.patch 
Log Message:
* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
- add patch0 to fix bug 496035


keepassx-0.4.0-autotype.patch:

--- NEW FILE keepassx-0.4.0-autotype.patch ---
--- branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:29:04	306
+++ branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:59:06	307
@@ -42,7 +42,7 @@
 	
 	protected:
 		void sleepTime(int msec);
-		inline void sleepKeyStrokeDelay(){ sleep(config->autoTypeKeyStrokeDelay()); };
+		inline void sleepKeyStrokeDelay(){ sleepTime(config->autoTypeKeyStrokeDelay()); };
 		void templateToKeysyms(const QString& Template, QList<AutoTypeAction>& KeySymList,IEntryHandle* entry);
 		void stringToKeysyms(const QString& string,QList<AutoTypeAction>& KeySymList);
 		


Index: keepassx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/F-10/keepassx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- keepassx.spec	26 Mar 2009 20:29:52 -0000	1.15
+++ keepassx.spec	18 Apr 2009 09:21:07 -0000	1.16
@@ -1,12 +1,15 @@
 Name:           keepassx
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/keepassx-%{version}.tar.bz2
+# Fix for bug 496035:
+# http://keepassx.svn.sourceforge.net/viewvc/keepassx/branches/0.4/src/lib/AutoTypeX11.h?view=patch&r1=307&r2=306&pathrev=307
+Patch0:         keepassx-0.4.0-autotype.patch
 Patch1:         keepassx-0.3.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p2 -b .autotype
 %patch1 -p0 -b .gcc43
 
 
@@ -110,6 +114,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
+- add patch0 to fix bug 496035
+
 * Thu Mar 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-1
 - version 0.4.0
 - drop patch0 (upstream)



From abompard at fedoraproject.org  Sat Apr 18 09:21:39 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 18 Apr 2009 09:21:39 +0000 (UTC)
Subject: rpms/keepassx/devel keepassx-0.4.0-autotype.patch, NONE,
	1.1 keepassx.spec, 1.16, 1.17
Message-ID: <20090418092139.5C629700F7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/keepassx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22982/devel

Modified Files:
	keepassx.spec 
Added Files:
	keepassx-0.4.0-autotype.patch 
Log Message:
* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
- add patch0 to fix bug 496035


keepassx-0.4.0-autotype.patch:

--- NEW FILE keepassx-0.4.0-autotype.patch ---
--- branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:29:04	306
+++ branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:59:06	307
@@ -42,7 +42,7 @@
 	
 	protected:
 		void sleepTime(int msec);
-		inline void sleepKeyStrokeDelay(){ sleep(config->autoTypeKeyStrokeDelay()); };
+		inline void sleepKeyStrokeDelay(){ sleepTime(config->autoTypeKeyStrokeDelay()); };
 		void templateToKeysyms(const QString& Template, QList<AutoTypeAction>& KeySymList,IEntryHandle* entry);
 		void stringToKeysyms(const QString& string,QList<AutoTypeAction>& KeySymList);
 		


Index: keepassx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/devel/keepassx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- keepassx.spec	26 Mar 2009 20:29:53 -0000	1.16
+++ keepassx.spec	18 Apr 2009 09:21:09 -0000	1.17
@@ -1,12 +1,15 @@
 Name:           keepassx
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/keepassx-%{version}.tar.bz2
+# Fix for bug 496035:
+# http://keepassx.svn.sourceforge.net/viewvc/keepassx/branches/0.4/src/lib/AutoTypeX11.h?view=patch&r1=307&r2=306&pathrev=307
+Patch0:         keepassx-0.4.0-autotype.patch
 Patch1:         keepassx-0.3.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p2 -b .autotype
 %patch1 -p0 -b .gcc43
 
 
@@ -110,6 +114,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
+- add patch0 to fix bug 496035
+
 * Thu Mar 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-1
 - version 0.4.0
 - drop patch0 (upstream)



From abompard at fedoraproject.org  Sat Apr 18 09:21:39 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 18 Apr 2009 09:21:39 +0000 (UTC)
Subject: rpms/keepassx/F-9 keepassx-0.4.0-autotype.patch, NONE,
	1.1 keepassx.spec, 1.14, 1.15
Message-ID: <20090418092139.077CF700F7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/keepassx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22982/F-9

Modified Files:
	keepassx.spec 
Added Files:
	keepassx-0.4.0-autotype.patch 
Log Message:
* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
- add patch0 to fix bug 496035


keepassx-0.4.0-autotype.patch:

--- NEW FILE keepassx-0.4.0-autotype.patch ---
--- branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:29:04	306
+++ branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:59:06	307
@@ -42,7 +42,7 @@
 	
 	protected:
 		void sleepTime(int msec);
-		inline void sleepKeyStrokeDelay(){ sleep(config->autoTypeKeyStrokeDelay()); };
+		inline void sleepKeyStrokeDelay(){ sleepTime(config->autoTypeKeyStrokeDelay()); };
 		void templateToKeysyms(const QString& Template, QList<AutoTypeAction>& KeySymList,IEntryHandle* entry);
 		void stringToKeysyms(const QString& string,QList<AutoTypeAction>& KeySymList);
 		


Index: keepassx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/F-9/keepassx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- keepassx.spec	26 Mar 2009 20:29:52 -0000	1.14
+++ keepassx.spec	18 Apr 2009 09:21:08 -0000	1.15
@@ -1,12 +1,15 @@
 Name:           keepassx
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/keepassx-%{version}.tar.bz2
+# Fix for bug 496035:
+# http://keepassx.svn.sourceforge.net/viewvc/keepassx/branches/0.4/src/lib/AutoTypeX11.h?view=patch&r1=307&r2=306&pathrev=307
+Patch0:         keepassx-0.4.0-autotype.patch
 Patch1:         keepassx-0.3.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p2 -b .autotype
 %patch1 -p0 -b .gcc43
 
 
@@ -110,6 +114,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
+- add patch0 to fix bug 496035
+
 * Thu Mar 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-1
 - version 0.4.0
 - drop patch0 (upstream)



From abompard at fedoraproject.org  Sat Apr 18 09:21:38 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 18 Apr 2009 09:21:38 +0000 (UTC)
Subject: rpms/keepassx/F-11 keepassx-0.4.0-autotype.patch, NONE,
	1.1 keepassx.spec, 1.16, 1.17
Message-ID: <20090418092138.A96D1700F7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/keepassx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22982/F-11

Modified Files:
	keepassx.spec 
Added Files:
	keepassx-0.4.0-autotype.patch 
Log Message:
* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
- add patch0 to fix bug 496035


keepassx-0.4.0-autotype.patch:

--- NEW FILE keepassx-0.4.0-autotype.patch ---
--- branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:29:04	306
+++ branches/0.4/src/lib/AutoTypeX11.h	2009/03/28 15:59:06	307
@@ -42,7 +42,7 @@
 	
 	protected:
 		void sleepTime(int msec);
-		inline void sleepKeyStrokeDelay(){ sleep(config->autoTypeKeyStrokeDelay()); };
+		inline void sleepKeyStrokeDelay(){ sleepTime(config->autoTypeKeyStrokeDelay()); };
 		void templateToKeysyms(const QString& Template, QList<AutoTypeAction>& KeySymList,IEntryHandle* entry);
 		void stringToKeysyms(const QString& string,QList<AutoTypeAction>& KeySymList);
 		


Index: keepassx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/F-11/keepassx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- keepassx.spec	26 Mar 2009 20:29:53 -0000	1.16
+++ keepassx.spec	18 Apr 2009 09:21:08 -0000	1.17
@@ -1,12 +1,15 @@
 Name:           keepassx
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/keepassx-%{version}.tar.bz2
+# Fix for bug 496035:
+# http://keepassx.svn.sourceforge.net/viewvc/keepassx/branches/0.4/src/lib/AutoTypeX11.h?view=patch&r1=307&r2=306&pathrev=307
+Patch0:         keepassx-0.4.0-autotype.patch
 Patch1:         keepassx-0.3.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p2 -b .autotype
 %patch1 -p0 -b .gcc43
 
 
@@ -110,6 +114,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
+- add patch0 to fix bug 496035
+
 * Thu Mar 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-1
 - version 0.4.0
 - drop patch0 (upstream)



From bagnara at fedoraproject.org  Sat Apr 18 09:22:17 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:22:17 +0000 (UTC)
Subject: rpms/ppl/F-11 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090418092217.E44A3700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23234

Modified Files:
	.cvsignore sources 
Log Message:
New sources for PPL 0.10.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 06:22:30 -0000	1.4
+++ .cvsignore	18 Apr 2009 09:21:47 -0000	1.5
@@ -1 +1 @@
-ppl-0.10.1.tar.gz
+ppl-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2009 06:22:31 -0000	1.4
+++ sources	18 Apr 2009 09:21:47 -0000	1.5
@@ -1 +1 @@
-327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz
+e7dd265afdeaea81f7e87a72b182d875  ppl-0.10.2.tar.gz



From bagnara at fedoraproject.org  Sat Apr 18 09:30:41 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:30:41 +0000 (UTC)
Subject: rpms/ppl/F-11 ppl.spec,1.29,1.30
Message-ID: <20090418093041.B54AC700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25220

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ppl.spec	18 Apr 2009 09:17:01 -0000	1.29
+++ ppl.spec	18 Apr 2009 09:30:11 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -410,6 +410,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-2
+- Force rebuild.
+
 * Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-1
 - Updated for PPL 0.10.2.
 



From bagnara at fedoraproject.org  Sat Apr 18 09:37:23 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:37:23 +0000 (UTC)
Subject: rpms/ppl/F-10 ppl-0.10.2-Makefile.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 ppl.hh, 1.2, 1.3 ppl.spec, 1.20, 1.21 ppl_c.h, 1.2,
	1.3 pwl.hh, 1.2, 1.3 sources, 1.4, 1.5 ppl-0.10.1-Makefile.patch,
	1.1, NONE
Message-ID: <20090418093723.D26DB700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26604

Modified Files:
	.cvsignore ppl.hh ppl.spec ppl_c.h pwl.hh sources 
Added Files:
	ppl-0.10.2-Makefile.patch 
Removed Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.2.


ppl-0.10.2-Makefile.patch:

--- NEW FILE ppl-0.10.2-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 07:11:21 -0000	1.4
+++ .cvsignore	18 Apr 2009 09:36:53 -0000	1.5
@@ -1 +1 @@
-ppl-0.10.1.tar.gz
+ppl-0.10.2.tar.gz


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl.hh	14 Apr 2009 07:09:30 -0000	1.2
+++ ppl.hh	18 Apr 2009 09:36:53 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl-s390x.hh"
 #elif defined(__s390__)
 #include "ppl-s390.hh"
+#elif defined(__sh__)
+#include "ppl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl-sparc64.hh"
+#elif defined(__sparc__)
+#include "ppl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ppl.spec	14 Apr 2009 07:09:30 -0000	1.20
+++ ppl.spec	18 Apr 2009 09:36:53 -0000	1.21
@@ -1,7 +1,7 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
@@ -12,7 +12,7 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-Patch0:         ppl-0.10.1-Makefile.patch
+Patch0:         ppl-0.10.2-Makefile.patch
 #Patch1:
 #Icon:
 #Requires:
@@ -106,6 +106,7 @@
 Group:          Development/Libraries
 BuildRequires:  yap-devel >= 5.1.1
 Requires:       %{name} = %{version}-%{release}, %{name}-pwl = %{version}-%{release}, yap >= 5.1.1
+Obsoletes:      ppl-yap-static
 %description yap
 This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in YAP Prolog programs.
@@ -226,7 +227,8 @@
 # the architecture for which the compiler is compiling.
 
 # Since our header files only depend on the sizeof things, we smash
-# ix86 onto i386 and arm* onto arm.
+# ix86 onto i386 and arm* onto arm.  For the SuperH RISC engine family,
+# we smash sh3 and sh4 onto sh.
 normalized_arch=%{_arch}
 %ifarch %{ix86}
 normalized_arch=i386
@@ -234,6 +236,9 @@
 %ifarch %{arm}
 normalized_arch=arm
 %endif
+%ifarch sh3 sh4
+normalized_arch=sh
+%endif
 
 mv %{buildroot}/%{_includedir}/ppl.hh %{buildroot}/%{_includedir}/ppl-${normalized_arch}.hh
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/ppl.hh
@@ -405,6 +410,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-1
+- Updated for PPL 0.10.2.
+
 * Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
 - Updated for PPL 0.10.1.
 


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl_c.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl_c.h	14 Apr 2009 07:09:31 -0000	1.2
+++ ppl_c.h	18 Apr 2009 09:36:53 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl_c-s390x.h"
 #elif defined(__s390__)
 #include "ppl_c-s390.h"
+#elif defined(__sh__)
+#include "ppl_c-sh.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl_c-sparc64.h"
+#elif defined(__sparc__)
+#include "ppl_c-sparc.h"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/pwl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwl.hh	14 Apr 2009 07:09:31 -0000	1.2
+++ pwl.hh	18 Apr 2009 09:36:53 -0000	1.3
@@ -38,6 +38,12 @@
 #include "pwl-s390x.hh"
 #elif defined(__s390__)
 #include "pwl-s390.hh"
+#elif defined(__sh__)
+#include "pwl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pwl-sparc64.hh"
+#elif defined(__sparc__)
+#include "pwl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-pwl-devel packages."
 #endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2009 07:11:21 -0000	1.4
+++ sources	18 Apr 2009 09:36:53 -0000	1.5
@@ -1 +1 @@
-327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz
+e7dd265afdeaea81f7e87a72b182d875  ppl-0.10.2.tar.gz


--- ppl-0.10.1-Makefile.patch DELETED ---



From bagnara at fedoraproject.org  Sat Apr 18 09:49:34 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Sat, 18 Apr 2009 09:49:34 +0000 (UTC)
Subject: rpms/ppl/F-9 ppl-0.10.2-Makefile.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 ppl.hh, 1.2, 1.3 ppl.spec, 1.15, 1.16 ppl_c.h, 1.2,
	1.3 pwl.hh, 1.2, 1.3 sources, 1.4, 1.5 ppl-0.10.1-Makefile.patch,
	1.1, NONE
Message-ID: <20090418094934.AC8BC700F7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29793

Modified Files:
	.cvsignore ppl.hh ppl.spec ppl_c.h pwl.hh sources 
Added Files:
	ppl-0.10.2-Makefile.patch 
Removed Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.2.


ppl-0.10.2-Makefile.patch:

--- NEW FILE ppl-0.10.2-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 08:05:17 -0000	1.4
+++ .cvsignore	18 Apr 2009 09:49:03 -0000	1.5
@@ -1 +1 @@
-ppl-0.10.1.tar.gz
+ppl-0.10.2.tar.gz


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl.hh	14 Apr 2009 08:02:55 -0000	1.2
+++ ppl.hh	18 Apr 2009 09:49:04 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl-s390x.hh"
 #elif defined(__s390__)
 #include "ppl-s390.hh"
+#elif defined(__sh__)
+#include "ppl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl-sparc64.hh"
+#elif defined(__sparc__)
+#include "ppl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ppl.spec	14 Apr 2009 08:02:55 -0000	1.15
+++ ppl.spec	18 Apr 2009 09:49:04 -0000	1.16
@@ -1,7 +1,7 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
@@ -12,7 +12,7 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-Patch0:         ppl-0.10.1-Makefile.patch
+Patch0:         ppl-0.10.2-Makefile.patch
 #Patch1:
 #Icon:
 #Requires:
@@ -106,6 +106,7 @@
 Group:          Development/Libraries
 BuildRequires:  yap-devel >= 5.1.1
 Requires:       %{name} = %{version}-%{release}, %{name}-pwl = %{version}-%{release}, yap >= 5.1.1
+Obsoletes:      ppl-yap-static
 %description yap
 This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in YAP Prolog programs.
@@ -226,7 +227,8 @@
 # the architecture for which the compiler is compiling.
 
 # Since our header files only depend on the sizeof things, we smash
-# ix86 onto i386 and arm* onto arm.
+# ix86 onto i386 and arm* onto arm.  For the SuperH RISC engine family,
+# we smash sh3 and sh4 onto sh.
 normalized_arch=%{_arch}
 %ifarch %{ix86}
 normalized_arch=i386
@@ -234,6 +236,9 @@
 %ifarch %{arm}
 normalized_arch=arm
 %endif
+%ifarch sh3 sh4
+normalized_arch=sh
+%endif
 
 mv %{buildroot}/%{_includedir}/ppl.hh %{buildroot}/%{_includedir}/ppl-${normalized_arch}.hh
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/ppl.hh
@@ -405,6 +410,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-1
+- Updated for PPL 0.10.2.
+
 * Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
 - Updated for PPL 0.10.1.
 


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl_c.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl_c.h	14 Apr 2009 08:02:55 -0000	1.2
+++ ppl_c.h	18 Apr 2009 09:49:04 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl_c-s390x.h"
 #elif defined(__s390__)
 #include "ppl_c-s390.h"
+#elif defined(__sh__)
+#include "ppl_c-sh.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl_c-sparc64.h"
+#elif defined(__sparc__)
+#include "ppl_c-sparc.h"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/pwl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwl.hh	14 Apr 2009 08:02:55 -0000	1.2
+++ pwl.hh	18 Apr 2009 09:49:04 -0000	1.3
@@ -38,6 +38,12 @@
 #include "pwl-s390x.hh"
 #elif defined(__s390__)
 #include "pwl-s390.hh"
+#elif defined(__sh__)
+#include "pwl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pwl-sparc64.hh"
+#elif defined(__sparc__)
+#include "pwl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-pwl-devel packages."
 #endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2009 08:05:17 -0000	1.4
+++ sources	18 Apr 2009 09:49:04 -0000	1.5
@@ -1 +1 @@
-327ced9b0b1fd8d4fed1d7483d48fe24  ppl-0.10.1.tar.gz
+e7dd265afdeaea81f7e87a72b182d875  ppl-0.10.2.tar.gz


--- ppl-0.10.1-Makefile.patch DELETED ---



From dwalsh at fedoraproject.org  Sat Apr 18 10:33:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 18 Apr 2009 10:33:59 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.92,
	1.93 selinux-policy.spec, 1.828, 1.829
Message-ID: <20090418103359.1BC06700F7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6115

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Sat Apr 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-8
- Fixes for podsleuth


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- policy-20090105.patch	17 Apr 2009 15:33:53 -0000	1.92
+++ policy-20090105.patch	18 Apr 2009 10:33:57 -0000	1.93
@@ -3463,8 +3463,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.12/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/podsleuth.te	2009-04-07 16:01:44.000000000 -0400
-@@ -11,21 +11,68 @@
++++ serefpolicy-3.6.12/policy/modules/apps/podsleuth.te	2009-04-18 06:04:47.000000000 -0400
+@@ -11,25 +11,80 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
  
@@ -3484,7 +3484,7 @@
  #
 -
 -allow podsleuth_t self:process { signal getsched execheap execmem };
-+allow podsleuth_t self:capability { sys_admin sys_rawio };
++allow podsleuth_t self:capability { kill dac_override sys_admin sys_rawio };
 +allow podsleuth_t self:process { ptrace signal getsched execheap execmem execstack };
  allow podsleuth_t self:fifo_file rw_file_perms;
  allow podsleuth_t self:unix_stream_socket create_stream_socket_perms;
@@ -3534,7 +3534,21 @@
 +
  miscfiles_read_localization(podsleuth_t)
  
- dbus_system_bus_client(podsleuth_t)
+-dbus_system_bus_client(podsleuth_t)
++userdom_signal_all_users(podsleuth_t)
+ 
+-mono_exec(podsleuth_t)
++optional_policy(`
++	dbus_system_bus_client(podsleuth_t)
++')
+ 
++optional_policy(`
+ hal_dbus_chat(podsleuth_t)
++')
++
++optional_policy(`
++	mono_exec(podsleuth_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.fc serefpolicy-3.6.12/policy/modules/apps/pulseaudio.fc
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.fc	2009-04-07 16:01:44.000000000 -0400
@@ -4924,7 +4938,7 @@
  type urandom_device_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.12/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-15 08:01:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-18 06:12:57.000000000 -0400
 @@ -525,7 +525,7 @@
  	')
  
@@ -6553,7 +6567,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-17 11:03:25.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-18 06:06:56.000000000 -0400
 @@ -0,0 +1,638 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -25505,7 +25519,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 11:04:04.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 11:41:15.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -29147,7 +29161,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-17 11:03:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-18 06:14:35.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -30554,7 +30568,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3187,482 @@
+@@ -2981,3 +3187,481 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -31036,7 +31050,6 @@
 +
 +	dontaudit $1 userdomain:unix_stream_socket rw_socket_perms;
 +')
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-07 16:01:44.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- selinux-policy.spec	17 Apr 2009 15:14:43 -0000	1.828
+++ selinux-policy.spec	18 Apr 2009 10:33:58 -0000	1.829
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Sat Apr 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-8
+- Fixes for podsleuth
+
 * Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-7
 - Turn off nsplugin transition
 - Remove Konsole leaked file descriptors for release



From lkundrak at fedoraproject.org  Sat Apr 18 10:40:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 18 Apr 2009 10:40:51 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel
	gnome-power-manager-2.26.0-cast.patch, 
	NONE, 1.1 gnome-power-manager.spec, 1.153, 1.154
Message-ID: <20090418104051.5EEE9700F7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7390

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.0-cast.patch 
Log Message:
* Sat Apr 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.26.0-2
- Fix broken battery capacity percentage reporting


gnome-power-manager-2.26.0-cast.patch:

--- NEW FILE gnome-power-manager-2.26.0-cast.patch ---
My 34% battery looked like 1460578104% w/o this.

Lubomir Rintel <lkundrak at v3.sk>

diff -up gnome-power-manager-2.26.0/src/gpm-engine.c.cast gnome-power-manager-2.26.0/src/gpm-engine.c
--- gnome-power-manager-2.26.0/src/gpm-engine.c.cast	2009-04-12 10:55:11.065927796 +0200
+++ gnome-power-manager-2.26.0/src/gpm-engine.c	2009-04-12 10:55:34.424928595 +0200
@@ -484,7 +484,7 @@ gpm_engine_device_check_capacity (GpmEng
 	ret = gconf_client_get_bool (engine->priv->conf, GPM_CONF_NOTIFY_LOW_CAPACITY, NULL);
 	if (ret) {
 		egg_debug ("** EMIT: low-capacity");
-		g_signal_emit (engine, signals [LOW_CAPACITY], 0, obj->type, obj->capacity);
+		g_signal_emit (engine, signals [LOW_CAPACITY], 0, obj->type, (guint)obj->capacity);
 	}
 	return TRUE;
 }


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-power-manager.spec	16 Mar 2009 10:41:34 -0000	1.153
+++ gnome-power-manager.spec	18 Apr 2009 10:40:20 -0000	1.154
@@ -4,10 +4,11 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
+Patch0: gnome-power-manager-2.26.0-cast.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cast
 
 %build
 %configure \
@@ -162,6 +164,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Sat Apr 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.26.0-2
+- Fix broken battery capacity percentage reporting
+
 * Mon Mar 16 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From lkundrak at fedoraproject.org  Sat Apr 18 10:55:31 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 18 Apr 2009 10:55:31 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-11 gnome-power-manager-2.26.0-cast.patch,
	NONE, 1.1 gnome-power-manager.spec, 1.153, 1.154
Message-ID: <20090418105531.3EE9B700F7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10802

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.0-cast.patch 
Log Message:
* Sat Apr 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.26.0-2
- Fix broken battery capacity percentage reporting


gnome-power-manager-2.26.0-cast.patch:

--- NEW FILE gnome-power-manager-2.26.0-cast.patch ---
My 34% battery looked like 1460578104% w/o this.

Lubomir Rintel <lkundrak at v3.sk>

diff -up gnome-power-manager-2.26.0/src/gpm-engine.c.cast gnome-power-manager-2.26.0/src/gpm-engine.c
--- gnome-power-manager-2.26.0/src/gpm-engine.c.cast	2009-04-12 10:55:11.065927796 +0200
+++ gnome-power-manager-2.26.0/src/gpm-engine.c	2009-04-12 10:55:34.424928595 +0200
@@ -484,7 +484,7 @@ gpm_engine_device_check_capacity (GpmEng
 	ret = gconf_client_get_bool (engine->priv->conf, GPM_CONF_NOTIFY_LOW_CAPACITY, NULL);
 	if (ret) {
 		egg_debug ("** EMIT: low-capacity");
-		g_signal_emit (engine, signals [LOW_CAPACITY], 0, obj->type, obj->capacity);
+		g_signal_emit (engine, signals [LOW_CAPACITY], 0, obj->type, (guint)obj->capacity);
 	}
 	return TRUE;
 }


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-power-manager.spec	16 Mar 2009 10:41:34 -0000	1.153
+++ gnome-power-manager.spec	18 Apr 2009 10:55:00 -0000	1.154
@@ -4,10 +4,11 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
+Patch0: gnome-power-manager-2.26.0-cast.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cast
 
 %build
 %configure \
@@ -162,6 +164,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Sat Apr 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.26.0-2
+- Fix broken battery capacity percentage reporting
+
 * Mon Mar 16 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From sailer at fedoraproject.org  Sat Apr 18 11:21:58 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sat, 18 Apr 2009 11:21:58 +0000 (UTC)
Subject: rpms/ghdl/F-10 ieee-mathreal.patch,NONE,1.1 ghdl.spec,1.42,1.43
Message-ID: <20090418112158.599FE700F7@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16330

Modified Files:
	ghdl.spec 
Added Files:
	ieee-mathreal.patch 
Log Message:
backport ieee.math_real change from devel


ieee-mathreal.patch:

--- NEW FILE ieee-mathreal.patch ---
--- vhdl/libraries/ieee/math_real.vhdl.orig	2009-04-01 19:21:58.000000000 +0200
+++ vhdl/libraries/ieee/math_real.vhdl	2009-04-02 12:21:52.000000000 +0200
@@ -102,16 +102,21 @@
     	-- returns integer FLOOR(X + 0.5) if X > 0;
     	-- return integer CEIL(X - 0.5) if X < 0
 
-    -- IAC: we are missing the function TRUNC
-    -- IAC: we are missing the function MOD
-    -- IAC: functions FMAX and FMIN should be renamed REALMAX and REALMIN
-    
-    function FMAX (X, Y : real ) return real;
-    attribute foreign of fmax : function is "VHPIDIRECT fmax"; 
+    function TRUNC (X : real ) return real;
+    attribute foreign of trunc : function is "VHPIDIRECT trunc"; 
+    	-- returns integer FLOOR(X) if X > 0;
+    	-- return integer CEIL(X) if X < 0
+
+    function "MOD" (X, Y : real ) return real;
+    attribute foreign of "mod" : function is "VHPIDIRECT fmod"; 
+    	-- returns the floating point modulus of X/Y
+
+    function REALMAX (X, Y : real ) return real;
+    attribute foreign of realmax : function is "VHPIDIRECT fmax"; 
     	-- returns the algebraically larger of X and Y
 
-    function FMIN (X, Y : real ) return real;
-    attribute foreign of fmin : function is "VHPIDIRECT fmin"; 
+    function REALMIN (X, Y : real ) return real;
+    attribute foreign of realmin : function is "VHPIDIRECT fmin"; 
     	-- returns the algebraically smaller of X and Y
 
     procedure UNIFORM (variable Seed1,Seed2:inout integer; variable X:out real);
@@ -203,25 +208,17 @@
     	-- returns tan X; X in radians
     	-- X /= ((2k+1) * PI/2), where k is an integer
 
-    -- IAC: function should be called ARCSIN
-    
-    function  ASIN (X : real ) return real; 
+    function  ARCSIN (X : real ) return real; 
     	-- returns  -PI/2 < asin X < PI/2; | X | <= 1
 
-    -- IAC: function should be called ARCCOS
-    
-    function  ACOS (X : real ) return real;
+    function  ARCCOS (X : real ) return real;
     	-- returns  0 < acos X < PI; | X | <= 1
 
-    
-    -- IAC: function should be called ARCTAN
-    
-    function  ATAN (X : real) return real;
-    attribute foreign of atan : function is "VHPIDIRECT atan"; 
+    function  ARCTAN (X : real) return real;
+    attribute foreign of arctan : function is "VHPIDIRECT atan"; 
     	-- returns  -PI/2 < atan X < PI/2
 
-    -- IAC: function ATAN2 should not exist
-    function  ATAN2 (X : real; Y : real) return real;
+    function  ARCTAN (X : real; Y : real) return real;
     	-- returns  atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
 
     function SINH (X : real) return real;
@@ -236,20 +233,35 @@
     attribute foreign of tanh : function is "VHPIDIRECT tanh"; 
     	-- hyperbolic tangent; -- returns (e**X - e**(-X))/(e**X + e**(-X))
 
-    -- IAC: function should be called ARCSINH
-    
-    function ASINH (X : real) return real;
-    attribute foreign of asinh : function is "VHPIDIRECT asinh"; 
+    function ARCSINH (X : real) return real;
+    attribute foreign of arcsinh : function is "VHPIDIRECT asinh"; 
     	-- returns ln( X + sqrt( X**2 + 1))
 
-    -- IAC: function should be called ARCCOSH
-
-    function ACOSH (X : real) return real;
+    function ARCCOSH (X : real) return real;
     	-- returns ln( X + sqrt( X**2 - 1));   X >= 1
 
-    -- IAC: function should be called ARCTANH
-    
-    function ATANH (X : real) return real;
+    function ARCTANH (X : real) return real;
     	-- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
 
+
+    -- Compatibility; will be removed in the future!
+    impure function FMAX (X, Y : real ) return real;
+
+    impure function FMIN (X, Y : real ) return real;
+
+    impure function ASIN (X : real ) return real; 
+
+    impure function ACOS (X : real ) return real;
+
+    impure function ATAN (X : real) return real;
+
+    impure function ATAN2 (X : real; Y : real) return real;
+
+    impure function ASINH (X : real) return real;
+
+    impure function ACOSH (X : real) return real;
+
+    impure function ATANH (X : real) return real;
+
+
 end  MATH_REAL;
--- vhdl/libraries/ieee/math_real-body.vhdl.orig	2009-04-01 19:22:04.000000000 +0200
+++ vhdl/libraries/ieee/math_real-body.vhdl	2009-04-02 12:27:15.000000000 +0200
@@ -72,16 +72,41 @@
     begin
         assert false severity failure;
     end ROUND;
-    
-    function FMAX (X, Y : real ) return real is
+
+    function TRUNC (X : real ) return real is
     begin
         assert false severity failure;
-    end FMAX;
+    end TRUNC;
 
-    function FMIN (X, Y : real ) return real is
+    function c_mod (x : real; y : real) return real;
+    attribute foreign of c_mod : function is "VHPIDIRECT fmod"; 
+
+    function c_mod (x : real; y: real) return real is
     begin
         assert false severity failure;
-    end FMIN;
+    end c_mod; 
+
+    function "MOD" (X, Y : real ) return real is
+    begin
+        if y = 0.0 then 
+            assert false 
+                report "MOD(X, 0.0) is undefined" 
+                severity ERROR;
+            return 0.0; 
+        else
+            return c_mod(x,y);
+        end if;     
+    end "MOD";
+
+    function REALMAX (X, Y : real ) return real is
+    begin
+        assert false severity failure;
+    end REALMAX;
+
+    function REALMIN (X, Y : real ) return real is
+    begin
+        assert false severity failure;
+    end REALMIN;
 
     --
     -- Pseudo-random number generators
@@ -297,18 +322,18 @@
         assert false severity failure;
     end c_asin; 
 
-    function ASIN (x : real ) return real is
+    function ARCSIN (x : real ) return real is
         -- returns  -PI/2 < asin X < PI/2; | X | <= 1
     begin   
         if abs x > 1.0 then 
             assert false
-                report "Out of range parameter passed to ASIN" 
+                report "Out of range parameter passed to ARCSIN" 
                 severity ERROR;
             return x;
         else
             return c_asin(x);
         end if; 
-    end ASIN; 
+    end ARCSIN; 
    
     function c_acos (x : real ) return real;
     attribute foreign of c_acos : function is "VHPIDIRECT acos"; 
@@ -318,24 +343,24 @@
         assert false severity failure;
     end c_acos; 
 
-    function ACOS (x : REAL) return REAL is
+    function ARCCOS (x : REAL) return REAL is
     	-- returns  0 < acos X < PI; | X | <= 1
     begin  
       if abs x > 1.0 then 
          assert false 
-            report "Out of range parameter passed to ACOS" 
+            report "Out of range parameter passed to ARCCOS" 
 			severity ERROR; 
          return x;
       else
          return c_acos(x);
       end if;
-    end ACOS; 
+    end ARCCOS; 
    
-   function ATAN (x : REAL) return REAL is
+    function ARCTAN (x : REAL) return REAL is
     	-- returns  -PI/2 < atan X < PI/2
-   begin
+    begin
         assert false severity failure;
-   end ATAN; 
+    end ARCTAN; 
 
     function c_atan2 (x : real; y : real) return real;
     attribute foreign of c_atan2 : function is "VHPIDIRECT atan2"; 
@@ -345,7 +370,7 @@
         assert false severity failure;
     end c_atan2; 
 
-    function ATAN2 (x : REAL; y : REAL) return REAL is 
+    function ARCTAN (x : REAL; y : REAL) return REAL is 
         -- returns  atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
     begin   
         if y = 0.0 and x = 0.0 then 
@@ -356,7 +381,7 @@
         else
             return c_atan2(x,y);
         end if;     
-    end ATAN2; 
+    end ARCTAN; 
 
 
     function SINH (X : real) return real is
@@ -377,11 +402,11 @@
         assert false severity failure;
     end TANH;
     
-    function ASINH (X : real) return real is
+    function ARCSINH (X : real) return real is
     	-- returns ln( X + sqrt( X**2 + 1))
     begin
         assert false severity failure;
-    end ASINH;
+    end ARCSINH;
 
     function c_acosh (x : real ) return real;
     attribute foreign of c_acosh : function is "VHPIDIRECT acosh"; 
@@ -391,16 +416,16 @@
         assert false severity failure;
     end c_acosh;
 
-    function ACOSH (X : real) return real is
+    function ARCCOSH (X : real) return real is
     	-- returns ln( X + sqrt( X**2 - 1));   X >= 1
     begin
       	if abs x >= 1.0 then 
-         	assert false report "Out of range parameter passed to ACOSH" 
+         	assert false report "Out of range parameter passed to ARCCOSH" 
 			severity ERROR; 
          	return x;
       	end if; 
         return c_acosh(x);
-    end ACOSH;
+    end ARCCOSH;
 
     function c_atanh (x : real ) return real;
     attribute foreign of c_atanh : function is "VHPIDIRECT atanh"; 
@@ -410,15 +435,107 @@
         assert false severity failure;
     end c_atanh;
 
-    function ATANH (X : real) return real is
+    function ARCTANH (X : real) return real is
     	-- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
     begin
       	if abs x < 1.0 then 
-        	assert false report "Out of range parameter passed to ATANH" 
+        	assert false report "Out of range parameter passed to ARCTANH" 
 			severity ERROR; 
         	return x;
       	end if; 
         return c_atanh(x);
-    end ATANH; 
+    end ARCTANH; 
+
+    -- Compatibility; will be removed in the future!
+    shared variable fmax_compat_warn : boolean := false;
+    shared variable fmin_compat_warn : boolean := false;
+    shared variable asin_compat_warn : boolean := false;
+    shared variable acos_compat_warn : boolean := false;
+    shared variable atan_compat_warn : boolean := false;
+    shared variable atan2_compat_warn : boolean := false;
+    shared variable asinh_compat_warn : boolean := false;
+    shared variable acosh_compat_warn : boolean := false;
+    shared variable atanh_compat_warn : boolean := false;
+
+    impure function FMAX (X, Y : real ) return real is
+    begin
+      assert fmax_compat_warn
+        report "MATH_REAL.FMAX is not a standards compliant function and will be removed in the future; use REALMAX instead"
+        severity note;
+      fmax_compat_warn := true;
+      return REALMAX(X, Y);
+    end FMAX;
+
+    impure function FMIN (X, Y : real ) return real is
+    begin
+      assert fmin_compat_warn
+        report "MATH_REAL.FMIN is not a standards compliant function and will be removed in the future; use REALMIN instead"
+        severity note;
+      fmin_compat_warn := true;
+      return REALMIN(X, Y);
+    end FMIN;
+
+    impure function ASIN (X : real ) return real is
+    begin
+      assert asin_compat_warn
+        report "MATH_REAL.ASIN is not a standards compliant function and will be removed in the future; use ARCSIN instead"
+        severity note;
+      asin_compat_warn := true;
+      return ARCSIN(X);
+    end ASIN; 
+
+    impure function ACOS (X : real ) return real is
+    begin
+      assert acos_compat_warn
+        report "MATH_REAL.ACOS is not a standards compliant function and will be removed in the future; use ARCCOS instead"
+        severity note;
+      acos_compat_warn := true;
+      return ARCCOS(X);
+    end ACOS;
+
+    impure function ATAN (X : real) return real is
+    begin
+      assert atan_compat_warn
+        report "MATH_REAL.ATAN is not a standards compliant function and will be removed in the future; use ARCTAN instead"
+        severity note;
+      atan_compat_warn := true;
+      return ARCTAN(X);
+    end ATAN;
+
+    impure function ATAN2 (X : real; Y : real) return real is
+    begin
+      assert atan2_compat_warn
+        report "MATH_REAL.ATAN2 is not a standards compliant function and will be removed in the future; use ARCTAN instead"
+        severity note;
+      atan2_compat_warn := true;
+      return ARCTAN(X, Y);
+    end ATAN2;
+
+    impure function ASINH (X : real) return real is
+    begin
+      assert asinh_compat_warn
+        report "MATH_REAL.ASINH is not a standards compliant function and will be removed in the future; use ARCSINH instead"
+        severity note;
+      asinh_compat_warn := true;
+      return ARCSINH(X);
+    end ASINH;
+
+    impure function ACOSH (X : real) return real is
+    begin
+      assert acosh_compat_warn
+        report "MATH_REAL.ACOSH is not a standards compliant function and will be removed in the future; use ARCCOSH instead"
+        severity note;
+      acosh_compat_warn := true;
+      return ACOSH(X);
+    end ACOSH;
+
+    impure function ATANH (X : real) return real is
+    begin
+      assert atanh_compat_warn
+        report "MATH_REAL.ATANH is not a standards compliant function and will be removed in the future; use ARCTANH instead"
+        severity note;
+      atanh_compat_warn := true;
+      return ARCTANH(X);
+    end ATANH;
 
 end  MATH_REAL;
--- vhdl/libraries/ieee/math_complex-body.vhdl.orig	2009-04-02 12:08:47.000000000 +0200
+++ vhdl/libraries/ieee/math_complex-body.vhdl	2009-04-02 12:09:18.000000000 +0200
@@ -119,7 +119,7 @@
     function COMPLEX_TO_POLAR(Z: in complex ) return complex_polar is
     	-- converts complex to complex_polar
     begin
-    		return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),atan2(z.re,z.im));
+    		return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),ARCTAN(z.re,z.im));
     end COMPLEX_TO_POLAR;
 
     function POLAR_TO_COMPLEX(Z: in complex_polar ) return complex is


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-10/ghdl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ghdl.spec	9 Oct 2008 09:50:58 -0000	1.42
+++ ghdl.spec	18 Apr 2009 11:21:26 -0000	1.43
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -16,10 +16,15 @@
 Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Patch100: ghdl-svn%{ghdlsvnver}.patch
-Patch102: gcc41-makeinfo.patch
 Patch103: ghdl-noruntime.patch
 Patch104: ghdl-svn89-libgnat43.patch
 Patch105: ghdl-grtadac.patch
+# The following patch has been sent to upstream mailing list:
+# From: Thomas Sailer <t.sailer at alumni.ethz.ch>                  
+# To: ghdl-discuss at gna.org                                       
+# Date: Thu, 02 Apr 2009 15:36:00 +0200                          
+# https://gna.org/bugs/index.php?13389                           
+Patch107: ieee-mathreal.patch                                    
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -117,6 +122,7 @@
 pushd ghdl-%{ghdlver}
 %patch100 -p1
 %patch103 -p0 -b .noruntime
+%patch107 -p0 -b .ieeemathreal
 %{__mv} vhdl ../gcc/
 popd
 #patch102 -p1 -b .makeinfo
@@ -130,23 +136,23 @@
 
 # Flag settings cribbed from gcc package
 OPT_FLAGS=$(echo %{optflags} | %{__sed} \
-	-e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
-	-e 's/-m64//g;s/-m32//g;s/-m31//g' \
+        -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
+        -e 's/-m64//g;s/-m32//g;s/-m31//g' \
 %ifarch sparc sparc64
-	-e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
+        -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
 %endif
-	-e 's/[[:blank:]]\+/ /g')
+        -e 's/[[:blank:]]\+/ /g')
 
 # These compiler flags in rawhide seem to break the build, so get rid of them
 OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \
 %ifarch i386 i486 i586 i686
-	-e 's/-mtune=generic/-mtune=pentium4/g' \
+        -e 's/-mtune=generic/-mtune=pentium4/g' \
 %endif
 %ifarch x86_64
-	-e 's/-mtune=generic/-mtune=nocona/g' \
+        -e 's/-mtune=generic/-mtune=nocona/g' \
 %endif
-	-e 's/-fstack-protector//g ' \
-	-e 's/--param=ssp-buffer-size=[0-9]*//g')
+        -e 's/-fstack-protector//g ' \
+        -e 's/--param=ssp-buffer-size=[0-9]*//g')
 
 # gcc -m32 fails, so we disable multilibbing.
 # so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed
@@ -156,45 +162,45 @@
 export TCFLAGS="$OPT_FLAGS"
 #configure --enable-languages=vhdl
 ../configure \
-	--program-prefix=%{?_program_prefix} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_libdir} \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir} \
-	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
-	--enable-languages=vhdl \
-	%{!?_without_mock:--disable-multilib} \
-	--enable-shared \
-	--enable-threads=posix \
-	--enable-checking=release \
-	--with-system-zlib \
-	--enable-__cxa_atexit \
-	--disable-libunwind-exceptions \
-	--disable-libgcj \
+        --program-prefix=%{?_program_prefix} \
+        --prefix=%{_prefix} \
+        --exec-prefix=%{_exec_prefix} \
+        --bindir=%{_bindir} \
+        --sbindir=%{_sbindir} \
+        --sysconfdir=%{_sysconfdir} \
+        --datadir=%{_datadir} \
+        --includedir=%{_includedir} \
+        --libdir=%{_libdir} \
+        --libexecdir=%{_libexecdir} \
+        --localstatedir=%{_localstatedir} \
+        --sharedstatedir=%{_sharedstatedir} \
+        --mandir=%{_mandir} \
+        --infodir=%{_infodir} \
+        --with-bugurl=http://bugzilla.redhat.com/bugzilla \
+        --enable-languages=vhdl \
+        %{!?_without_mock:--disable-multilib} \
+        --enable-shared \
+        --enable-threads=posix \
+        --enable-checking=release \
+        --with-system-zlib \
+        --enable-__cxa_atexit \
+        --disable-libunwind-exceptions \
+        --disable-libgcj \
 %ifarch sparc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform} \
-	--target=%{gcc_target_platform} \
-	--with-cpu=v7
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform} \
+        --target=%{gcc_target_platform} \
+        --with-cpu=v7
 %endif
 %ifarch ppc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform} \
-	--target=%{gcc_target_platform} \
-	--with-cpu=default32
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform} \
+        --target=%{gcc_target_platform} \
+        --with-cpu=default32
 %endif
 %ifnarch sparc ppc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform}
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform}
 %endif
 
 # Parallel make doesn't work, so not using %{?_smp_mflags}
@@ -249,29 +255,29 @@
 # Remove files not to be packaged
 pushd %{buildroot}
 %{__rm} -f \
-	.%{_bindir}/{cpp,gcc,gccbug,gcov} \
-	.%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
-	.%{_includedir}/mf-runtime.h \
-	.%{_libdir}/lib* \
-	.%{_infodir}/dir \
-	.%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
-	.%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
-	.%{_mandir}/man1/{cpp,gcc,gcov}.1* \
-	.%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
-	.%{_exec_prefix}/lib/libgcc_s.* \
-	.%{_exec_prefix}/lib/libmudflap.* \
-	.%{_exec_prefix}/lib/libmudflapth.* \
-	.%{_libdir}/32/libiberty.a
+        .%{_bindir}/{cpp,gcc,gccbug,gcov} \
+        .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
+        .%{_includedir}/mf-runtime.h \
+        .%{_libdir}/lib* \
+        .%{_infodir}/dir \
+        .%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
+        .%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
+        .%{_mandir}/man1/{cpp,gcc,gcov}.1* \
+        .%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
+        .%{_exec_prefix}/lib/libgcc_s.* \
+        .%{_exec_prefix}/lib/libmudflap.* \
+        .%{_exec_prefix}/lib/libmudflapth.* \
+        .%{_libdir}/32/libiberty.a
 # Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
 %{__rm} -f \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
-	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
-	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
+        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools
 
 popd
 
@@ -280,11 +286,11 @@
 
 %post
 [ -f %{_infodir}/ghdl.info.gz ] && \
-	/sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
+        /sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
 
 %preun
 [ -f %{_infodir}/ghdl.info.gz ] && [ $1 = 0 ] && \
-	/sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
+        /sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
 
 %files
 %defattr(-,root,root,-)
@@ -297,12 +303,16 @@
 %{_mandir}/man1/*
 
 %files grt
+%defattr(-,root,root,-)
 # Need to own directory %{_libdir}/gcc even though we only want the
 # %{gcc_target_platform}/%{gccver} subdirectory
 %{_libdir}/gcc/
 
 
 %changelog
+* Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.2
+- make ieee.math_real more standards compliant
+
 * Thu Oct  9 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.1
 - rebuild
 



From sailer at fedoraproject.org  Sat Apr 18 11:24:48 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sat, 18 Apr 2009 11:24:48 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl.spec,1.49,1.50
Message-ID: <20090418112448.03729700F7@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16949/devel

Modified Files:
	ghdl.spec 
Log Message:
make rpmlint happy



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ghdl.spec	16 Apr 2009 09:13:27 -0000	1.49
+++ ghdl.spec	18 Apr 2009 11:24:17 -0000	1.50
@@ -16,11 +16,16 @@
 Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Patch100: ghdl-svn%{ghdlsvnver}.patch
-Patch102: gcc41-makeinfo.patch
 Patch103: ghdl-noruntime.patch
 Patch104: ghdl-svn110-libgnat44.patch
 Patch105: ghdl-grtadac.patch
+# Both following patches have been sent to upstream mailing list:
+# From: Thomas Sailer <t.sailer at alumni.ethz.ch>
+# To: ghdl-discuss at gna.org
+# Date: Thu, 02 Apr 2009 15:36:00 +0200
+# https://gna.org/bugs/index.php?13390
 Patch106: ghdl-ppc64abort.patch
+# https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info



From sailer at fedoraproject.org  Sat Apr 18 11:24:47 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sat, 18 Apr 2009 11:24:47 +0000 (UTC)
Subject: rpms/ghdl/F-11 ghdl.spec,1.48,1.49
Message-ID: <20090418112447.CB851700F7@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16949/F-11

Modified Files:
	ghdl.spec 
Log Message:
make rpmlint happy



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ghdl.spec	2 Apr 2009 15:12:33 -0000	1.48
+++ ghdl.spec	18 Apr 2009 11:24:16 -0000	1.49
@@ -1,6 +1,6 @@
-%define gccver 4.3.1
-%define ghdlver 0.27
-%define ghdlsvnver 110
+%global gccver 4.3.1
+%global ghdlver 0.27
+%global ghdlsvnver 110
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -16,29 +16,34 @@
 Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Patch100: ghdl-svn%{ghdlsvnver}.patch
-Patch102: gcc41-makeinfo.patch
 Patch103: ghdl-noruntime.patch
 Patch104: ghdl-svn110-libgnat44.patch
 Patch105: ghdl-grtadac.patch
+# Both following patches have been sent to upstream mailing list:
+# From: Thomas Sailer <t.sailer at alumni.ethz.ch>
+# To: ghdl-discuss at gna.org
+# Date: Thu, 02 Apr 2009 15:36:00 +0200
+# https://gna.org/bugs/index.php?13390
 Patch106: ghdl-ppc64abort.patch
+# https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: gcc
 # (Build)Requires from fc gcc41 package
-%define multilib_64_archs sparc64 ppc64 s390x x86_64
+%global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch s390x
-%define multilib_32_arch s390
+%global multilib_32_arch s390
 %endif
 %ifarch sparc64
-%define multilib_32_arch sparc
+%global multilib_32_arch sparc
 %endif
 %ifarch ppc64
-%define multilib_32_arch ppc
+%global multilib_32_arch ppc
 %endif
 %ifarch x86_64
-%define multilib_32_arch i386
+%global multilib_32_arch i386
 %endif
 # Need binutils with -pie support >= 2.14.90.0.4-4
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
@@ -76,17 +81,17 @@
 Requires: ghdl-grt = %{version}-%{release}
 
 # Make sure we don't use clashing namespaces
-%define _vendor fedora_ghdl
+%global _vendor fedora_ghdl
 
-%define _gnu %{nil}
+%global _gnu %{nil}
 %ifarch sparc
-%define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
+%global gcc_target_platform sparc64-%{_vendor}-%{_target_os}
 %endif
 %ifarch ppc
-%define gcc_target_platform ppc64-%{_vendor}-%{_target_os}
+%global gcc_target_platform ppc64-%{_vendor}-%{_target_os}
 %endif
 %ifnarch sparc ppc
-%define gcc_target_platform %{_target_platform}
+%global gcc_target_platform %{_target_platform}
 %endif
 
 %description
@@ -132,23 +137,23 @@
 
 # Flag settings cribbed from gcc package
 OPT_FLAGS=$(echo %{optflags} | %{__sed} \
-	-e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
-	-e 's/-m64//g;s/-m32//g;s/-m31//g' \
+        -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
+        -e 's/-m64//g;s/-m32//g;s/-m31//g' \
 %ifarch sparc sparc64
-	-e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
+        -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
 %endif
-	-e 's/[[:blank:]]\+/ /g')
+        -e 's/[[:blank:]]\+/ /g')
 
 # These compiler flags in rawhide seem to break the build, so get rid of them
 OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \
 %ifarch i386 i486 i586 i686
-	-e 's/-mtune=generic/-mtune=pentium4/g' \
+        -e 's/-mtune=generic/-mtune=pentium4/g' \
 %endif
 %ifarch x86_64
-	-e 's/-mtune=generic/-mtune=nocona/g' \
+        -e 's/-mtune=generic/-mtune=nocona/g' \
 %endif
-	-e 's/-fstack-protector//g ' \
-	-e 's/--param=ssp-buffer-size=[0-9]*//g')
+        -e 's/-fstack-protector//g ' \
+        -e 's/--param=ssp-buffer-size=[0-9]*//g')
 
 # gcc -m32 fails, so we disable multilibbing.
 # so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed
@@ -158,45 +163,45 @@
 export TCFLAGS="$OPT_FLAGS"
 #configure --enable-languages=vhdl
 ../configure \
-	--program-prefix=%{?_program_prefix} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_libdir} \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir} \
-	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
-	--enable-languages=vhdl \
-	%{!?_without_mock:--disable-multilib} \
-	--enable-shared \
-	--enable-threads=posix \
-	--enable-checking=release \
-	--with-system-zlib \
-	--enable-__cxa_atexit \
-	--disable-libunwind-exceptions \
-	--disable-libgcj \
+        --program-prefix=%{?_program_prefix} \
+        --prefix=%{_prefix} \
+        --exec-prefix=%{_exec_prefix} \
+        --bindir=%{_bindir} \
+        --sbindir=%{_sbindir} \
+        --sysconfdir=%{_sysconfdir} \
+        --datadir=%{_datadir} \
+        --includedir=%{_includedir} \
+        --libdir=%{_libdir} \
+        --libexecdir=%{_libexecdir} \
+        --localstatedir=%{_localstatedir} \
+        --sharedstatedir=%{_sharedstatedir} \
+        --mandir=%{_mandir} \
+        --infodir=%{_infodir} \
+        --with-bugurl=http://bugzilla.redhat.com/bugzilla \
+        --enable-languages=vhdl \
+        %{!?_without_mock:--disable-multilib} \
+        --enable-shared \
+        --enable-threads=posix \
+        --enable-checking=release \
+        --with-system-zlib \
+        --enable-__cxa_atexit \
+        --disable-libunwind-exceptions \
+        --disable-libgcj \
 %ifarch sparc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform} \
-	--target=%{gcc_target_platform} \
-	--with-cpu=v7
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform} \
+        --target=%{gcc_target_platform} \
+        --with-cpu=v7
 %endif
 %ifarch ppc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform} \
-	--target=%{gcc_target_platform} \
-	--with-cpu=default32
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform} \
+        --target=%{gcc_target_platform} \
+        --with-cpu=default32
 %endif
 %ifnarch sparc ppc
-	--host=%{gcc_target_platform} \
-	--build=%{gcc_target_platform}
+        --host=%{gcc_target_platform} \
+        --build=%{gcc_target_platform}
 %endif
 
 # Parallel make doesn't work, so not using %{?_smp_mflags}
@@ -251,29 +256,29 @@
 # Remove files not to be packaged
 pushd %{buildroot}
 %{__rm} -f \
-	.%{_bindir}/{cpp,gcc,gccbug,gcov} \
-	.%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
-	.%{_includedir}/mf-runtime.h \
-	.%{_libdir}/lib* \
-	.%{_infodir}/dir \
-	.%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
-	.%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
-	.%{_mandir}/man1/{cpp,gcc,gcov}.1* \
-	.%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
-	.%{_exec_prefix}/lib/libgcc_s.* \
-	.%{_exec_prefix}/lib/libmudflap.* \
-	.%{_exec_prefix}/lib/libmudflapth.* \
-	.%{_libdir}/32/libiberty.a
+        .%{_bindir}/{cpp,gcc,gccbug,gcov} \
+        .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
+        .%{_includedir}/mf-runtime.h \
+        .%{_libdir}/lib* \
+        .%{_infodir}/dir \
+        .%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
+        .%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
+        .%{_mandir}/man1/{cpp,gcc,gcov}.1* \
+        .%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
+        .%{_exec_prefix}/lib/libgcc_s.* \
+        .%{_exec_prefix}/lib/libmudflap.* \
+        .%{_exec_prefix}/lib/libmudflapth.* \
+        .%{_libdir}/32/libiberty.a
 # Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
 %{__rm} -f \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
-	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
-	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
-	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools
+        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
+        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools
 
 popd
 
@@ -282,11 +287,11 @@
 
 %post
 [ -f %{_infodir}/ghdl.info.gz ] && \
-	/sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
+        /sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
 
 %preun
 [ -f %{_infodir}/ghdl.info.gz ] && [ $1 = 0 ] && \
-	/sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
+        /sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :
 
 %files
 %defattr(-,root,root,-)
@@ -299,6 +304,7 @@
 %{_mandir}/man1/*
 
 %files grt
+%defattr(-,root,root,-)
 # Need to own directory %{_libdir}/gcc even though we only want the
 # %{gcc_target_platform}/%{gccver} subdirectory
 %{_libdir}/gcc/



From sailer at fedoraproject.org  Sat Apr 18 11:29:59 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sat, 18 Apr 2009 11:29:59 +0000 (UTC)
Subject: rpms/ghdl/F-11 gcc41-ada-pr18302.patch, 1.1,
	NONE gcc41-ada-tweaks.patch, 1.1, NONE gcc41-cfaval.patch, 1.1,
	NONE gcc41-gnuc-rh-release.patch, 1.1,
	NONE gcc41-ia64-libunwind.patch, 1.1, NONE gcc41-ice-hack.patch,
	1.1, NONE gcc41-java-nomulti.patch, 1.1,
	NONE gcc41-java-slow_pthread_self.patch, 1.1,
	NONE gcc41-makeinfo.patch, 1.1, NONE gcc41-mni.patch, 1.1,
	NONE gcc41-ppc32-retaddr.patch, 1.1,
	NONE gcc41-ppc64-m32-m64-multilib-only.patch, 1.1,
	NONE gcc41-rh184446.patch, 1.1, NONE gcc41-x86_64-sse3.patch,
	1.1, NONE
Message-ID: <20090418112959.2BF18700F7@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18065/F-11

Removed Files:
	gcc41-ada-pr18302.patch gcc41-ada-tweaks.patch 
	gcc41-cfaval.patch gcc41-gnuc-rh-release.patch 
	gcc41-ia64-libunwind.patch gcc41-ice-hack.patch 
	gcc41-java-nomulti.patch gcc41-java-slow_pthread_self.patch 
	gcc41-makeinfo.patch gcc41-mni.patch gcc41-ppc32-retaddr.patch 
	gcc41-ppc64-m32-m64-multilib-only.patch gcc41-rh184446.patch 
	gcc41-x86_64-sse3.patch 
Log Message:
remove obsolete patches



--- gcc41-ada-pr18302.patch DELETED ---


--- gcc41-ada-tweaks.patch DELETED ---


--- gcc41-cfaval.patch DELETED ---


--- gcc41-gnuc-rh-release.patch DELETED ---


--- gcc41-ia64-libunwind.patch DELETED ---


--- gcc41-ice-hack.patch DELETED ---


--- gcc41-java-nomulti.patch DELETED ---


--- gcc41-java-slow_pthread_self.patch DELETED ---


--- gcc41-makeinfo.patch DELETED ---


--- gcc41-mni.patch DELETED ---


--- gcc41-ppc32-retaddr.patch DELETED ---


--- gcc41-ppc64-m32-m64-multilib-only.patch DELETED ---


--- gcc41-rh184446.patch DELETED ---


--- gcc41-x86_64-sse3.patch DELETED ---



From sailer at fedoraproject.org  Sat Apr 18 11:30:00 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Sat, 18 Apr 2009 11:30:00 +0000 (UTC)
Subject: rpms/ghdl/devel gcc41-ada-pr18302.patch, 1.1,
	NONE gcc41-ada-tweaks.patch, 1.1, NONE gcc41-cfaval.patch, 1.1,
	NONE gcc41-gnuc-rh-release.patch, 1.1,
	NONE gcc41-ia64-libunwind.patch, 1.1, NONE gcc41-ice-hack.patch,
	1.1, NONE gcc41-java-nomulti.patch, 1.1,
	NONE gcc41-java-slow_pthread_self.patch, 1.1,
	NONE gcc41-makeinfo.patch, 1.1, NONE gcc41-mni.patch, 1.1,
	NONE gcc41-ppc32-retaddr.patch, 1.1,
	NONE gcc41-ppc64-m32-m64-multilib-only.patch, 1.1,
	NONE gcc41-rh184446.patch, 1.1, NONE gcc41-x86_64-sse3.patch,
	1.1, NONE
Message-ID: <20090418113000.C14DC700F7@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18065/devel

Removed Files:
	gcc41-ada-pr18302.patch gcc41-ada-tweaks.patch 
	gcc41-cfaval.patch gcc41-gnuc-rh-release.patch 
	gcc41-ia64-libunwind.patch gcc41-ice-hack.patch 
	gcc41-java-nomulti.patch gcc41-java-slow_pthread_self.patch 
	gcc41-makeinfo.patch gcc41-mni.patch gcc41-ppc32-retaddr.patch 
	gcc41-ppc64-m32-m64-multilib-only.patch gcc41-rh184446.patch 
	gcc41-x86_64-sse3.patch 
Log Message:
remove obsolete patches



--- gcc41-ada-pr18302.patch DELETED ---


--- gcc41-ada-tweaks.patch DELETED ---


--- gcc41-cfaval.patch DELETED ---


--- gcc41-gnuc-rh-release.patch DELETED ---


--- gcc41-ia64-libunwind.patch DELETED ---


--- gcc41-ice-hack.patch DELETED ---


--- gcc41-java-nomulti.patch DELETED ---


--- gcc41-java-slow_pthread_self.patch DELETED ---


--- gcc41-makeinfo.patch DELETED ---


--- gcc41-mni.patch DELETED ---


--- gcc41-ppc32-retaddr.patch DELETED ---


--- gcc41-ppc64-m32-m64-multilib-only.patch DELETED ---


--- gcc41-rh184446.patch DELETED ---


--- gcc41-x86_64-sse3.patch DELETED ---



From mbooth at fedoraproject.org  Sat Apr 18 11:30:07 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sat, 18 Apr 2009 11:30:07 +0000 (UTC)
Subject: rpms/eclipse-gef/devel sources, 1.7, 1.8 get-gef.sh, 1.2,
	1.3 eclipse-gef.spec, 1.18, 1.19 .cvsignore, 1.7, 1.8
Message-ID: <20090418113007.3D40A700F7@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-gef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18033/eclipse-gef/devel

Modified Files:
	sources get-gef.sh eclipse-gef.spec .cvsignore 
Log Message:
* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 3.5.0-0.1.M6
- Update to Milestone 6 release of 3.5.0.
- Require Eclipse 3.5.0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Feb 2009 17:12:51 -0000	1.7
+++ sources	18 Apr 2009 11:29:36 -0000	1.8
@@ -1 +1 @@
-ef6455f15e8bac5ea3222fc481b7a9f0  gef-3.4.2.tar.gz
+28ecb5db8ec8b990c41013382c9f3f23  gef-3.5.0.tar.gz


Index: get-gef.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/get-gef.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-gef.sh	28 Feb 2009 17:12:51 -0000	1.2
+++ get-gef.sh	18 Apr 2009 11:29:36 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="gef"
-VERSION=3.4.2
-TAG="R200902171642"
+VERSION=3.5.0
+TAG="S200903161602"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION


Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- eclipse-gef.spec	7 Apr 2009 12:28:59 -0000	1.18
+++ eclipse-gef.spec	18 Apr 2009 11:29:36 -0000	1.19
@@ -1,9 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
-%define eclipse_dropin   %{_datadir}/eclipse/dropins/gef
+%define eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-gef
-Version:   3.4.2
-Release:   3%{?dist}
+Version:   3.5.0
+Release:   0.1.M6%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -18,12 +18,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
+
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.4.2
+BuildRequires:    eclipse-pde >= 1:3.5.0
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.4.2
+Requires:         eclipse-platform >= 1:3.5.0
 
 %description
 The Graphical Editing Framework (GEF) allows developers to create a rich
@@ -76,61 +77,61 @@
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin} build/rpmBuild/org.eclipse.gef.all.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/gef build/rpmBuild/org.eclipse.gef.all.zip
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{eclipse_dropin}
-%dir %{eclipse_dropin}/eclipse
-%dir %{eclipse_dropin}/eclipse/features
-%dir %{eclipse_dropin}/eclipse/plugins
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%doc %{eclipse_dropin}/eclipse/readme
-#%{eclipse_dropin}/eclipse/content.xml
-%{eclipse_dropin}/eclipse/features/org.eclipse.gef_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.draw2d_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.zest_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.draw2d_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.core_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.layouts_*
+%dir %{eclipse_dropin}/gef
+%dir %{eclipse_dropin}/gef/eclipse
+%dir %{eclipse_dropin}/gef/eclipse/features
+%dir %{eclipse_dropin}/gef/eclipse/plugins
+%doc org.eclipse.gef-feature/rootfiles/*
+%{eclipse_dropin}/gef/eclipse/epl-v10.html
+%{eclipse_dropin}/gef/eclipse/notice.html
+%{eclipse_dropin}/gef/eclipse/readme
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.draw2d_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.zest_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.draw2d_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.zest.core_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.zest.layouts_*
 
 %files sdk
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%doc %{eclipse_dropin}/eclipse/readme
-%{eclipse_dropin}/eclipse/features/org.eclipse.gef.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.gef.source_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.draw2d.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.draw2d.source_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.zest.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.zest.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.doc.isv_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.ui.pde_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.draw2d.doc.isv_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.draw2d.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.zest.source_*
+%doc org.eclipse.gef-feature/rootfiles/*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.sdk_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.source_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.draw2d.sdk_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.draw2d.source_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.zest.sdk_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.zest.source_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.doc.isv_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.source_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.ui.pde_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.draw2d.doc.isv_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.draw2d.source_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.zest.source_*
 
 %files examples
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%doc %{eclipse_dropin}/eclipse/readme
-%{eclipse_dropin}/eclipse/features/org.eclipse.gef.all_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.gef.examples_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.flow_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.logic_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.shapes_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.gef.examples.text_*
+%doc org.eclipse.gef-feature/rootfiles/*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.all_*
+%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.examples_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.flow_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.logic_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.shapes_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.source_*
+%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.text_*
 
 %changelog
+* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 3.5.0-0.1.M6
+- Update to Milestone 6 release of 3.5.0.
+- Require Eclipse 3.5.0.
+
 * Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 3.4.2-3
 - Fix directory ownership.
 - Drop gcj support.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Feb 2009 17:12:51 -0000	1.7
+++ .cvsignore	18 Apr 2009 11:29:36 -0000	1.8
@@ -1 +1 @@
-gef-3.4.2.tar.gz
+gef-3.5.0.tar.gz



From anithra at fedoraproject.org  Sat Apr 18 11:46:15 2009
From: anithra at fedoraproject.org (Anithra P Janakiraman)
Date: Sat, 18 Apr 2009 11:46:15 +0000 (UTC)
Subject: rpms/systemtapguiserver/F-11 import.log, NONE,
	1.1 systemtapguiserver.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090418114616.1270D700F7@cvs1.fedora.phx.redhat.com>

Author: anithra

Update of /cvs/pkgs/rpms/systemtapguiserver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6934/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log systemtapguiserver.spec 
Log Message:
* Sat Apr 18 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com>
- Initial package



--- NEW FILE import.log ---
systemtapguiserver-1_0-7:F-11:systemtapguiserver-1.0-7.src.rpm:1240054681


--- NEW FILE systemtapguiserver.spec ---
Name:		systemtapguiserver
Version:	1.0
Release:	7 
Summary:	Server for the eclipse-systemtapgui Client
License:	EPL
Group:		Development/Tools
URL:		http://stapgui.sourceforge.net/

Source0:	http://downloads.sourceforge.net/stapgui/%{name}-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:	systemtap

%description
systemtapguiserver is the server for the eclipse-systemtapgui client. It 
provides stdout/stderr data collection and process management services for the 
client

%prep
%setup -q

%build
%configure
make %{_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
install stapgui-server ${RPM_BUILD_ROOT}/%{_bindir}/stapgui-server

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%{_bindir}/*
%doc docs/epl-v10.html
%doc docs/README

%changelog
* Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
- Changes to spec file.
* Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6
- Changes to Makefile,spec
* Fri Mar 13 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-5
- Changes to Makefile,spec.
* Tue Feb 10 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-4
- Changes to Makefile, spec. 
* Mon Feb 09 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-3
- Included the license agreement
* Thu Feb 05 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-2
- Changes to the Makefile and package name
* Thu Jan 28 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:28:54 -0000	1.1
+++ .cvsignore	18 Apr 2009 11:45:44 -0000	1.2
@@ -0,0 +1 @@
+systemtapguiserver-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:28:55 -0000	1.1
+++ sources	18 Apr 2009 11:45:44 -0000	1.2
@@ -0,0 +1 @@
+0ba6fe49df64ef3a7f27fc7b53cb82a0  systemtapguiserver-1.0.tar.bz2



From dwalsh at fedoraproject.org  Sat Apr 18 12:14:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 18 Apr 2009 12:14:07 +0000 (UTC)
Subject: rpms/selinux-policy/devel booleans-minimum.conf, 1.4,
	1.5 booleans-targeted.conf, 1.46, 1.47 policy-20090105.patch,
	1.89, 1.90 selinux-policy.spec, 1.826, 1.827
Message-ID: <20090418121407.6A95E700F7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12368

Modified Files:
	booleans-minimum.conf booleans-targeted.conf 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Sat Apr 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-8
- Fixes for podsleuth



Index: booleans-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-minimum.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- booleans-minimum.conf	10 Feb 2009 16:08:36 -0000	1.4
+++ booleans-minimum.conf	18 Apr 2009 12:13:35 -0000	1.5
@@ -8,7 +8,7 @@
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = true
+allow_execstack = false
 
 # Allow ftpd to read cifs directories.
 # 
@@ -56,7 +56,7 @@
 
 # Allow zebra to write it own configuration files
 # 
-allow_zebra_write_config = true
+allow_zebra_write_config = false
 
 # Enable extra rules in the cron domainto support fcron.
 # 
@@ -96,7 +96,7 @@
 
 # Allow httpd to read home directories
 # 
-httpd_enable_homedirs = true
+httpd_enable_homedirs = false
 
 # Run SSI execs in system CGI script domain.
 # 
@@ -104,11 +104,11 @@
 
 # Allow http daemon to communicate with the TTY
 # 
-httpd_tty_comm = true
+httpd_tty_comm = false
 
 # Run CGI in the main httpd domain
 # 
-httpd_unified = true
+httpd_unified = false
 
 # Allow BIND to write the master zone files.Generally this is used for dynamic DNS.
 # 
@@ -128,7 +128,7 @@
 
 # Allow reading of default_t files.
 # 
-read_default_t = true
+read_default_t = false
 
 # Allow samba to export user home directories.
 # 
@@ -148,7 +148,7 @@
 
 # Control users use of ping and traceroute
 # 
-user_ping = true
+user_ping = false
 
 # allow host key based authentication
 # 
@@ -164,7 +164,7 @@
 
 # Allow spamd to write to users homedirs
 # 
-spamd_enable_home_dirs = true
+spamd_enable_home_dirs = false
 
 # Allow regular users direct mouse access
 # 
@@ -192,7 +192,7 @@
 
 # Allow all domains to talk to ttys
 # 
-allow_daemons_use_tty = true
+allow_daemons_use_tty = false
 
 # Allow login domains to polyinstatiate directories
 # 
@@ -208,11 +208,11 @@
 
 # Allow samba to export user home directories.
 # 
-samba_run_unconfined = true
+samba_run_unconfined = false
 
 # Allows XServer to execute writable memory
 # 
-allow_xserver_execmem = true
+allow_xserver_execmem = false
 
 # disallow guest accounts to execute files that they can create 
 # 
@@ -225,7 +225,7 @@
 
 # Allow postfix locat to write to mail spool
 # 
-allow_postfix_local_write_mail_spool=true
+allow_postfix_local_write_mail_spool=false
 
 # Allow common users to read/write noexattrfile systems
 # 


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- booleans-targeted.conf	10 Feb 2009 16:08:36 -0000	1.46
+++ booleans-targeted.conf	18 Apr 2009 12:13:36 -0000	1.47
@@ -8,7 +8,7 @@
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = true
+allow_execstack = false
 
 # Allow ftpd to read cifs directories.
 # 
@@ -56,7 +56,7 @@
 
 # Allow zebra to write it own configuration files
 # 
-allow_zebra_write_config = true
+allow_zebra_write_config = false
 
 # Enable extra rules in the cron domainto support fcron.
 # 
@@ -96,7 +96,7 @@
 
 # Allow httpd to read home directories
 # 
-httpd_enable_homedirs = true
+httpd_enable_homedirs = false
 
 # Run SSI execs in system CGI script domain.
 # 
@@ -104,11 +104,11 @@
 
 # Allow http daemon to communicate with the TTY
 # 
-httpd_tty_comm = true
+httpd_tty_comm = false
 
 # Run CGI in the main httpd domain
 # 
-httpd_unified = true
+httpd_unified = false
 
 # Allow BIND to write the master zone files.Generally this is used for dynamic DNS.
 # 
@@ -128,7 +128,7 @@
 
 # Allow reading of default_t files.
 # 
-read_default_t = true
+read_default_t = false
 
 # Allow samba to export user home directories.
 # 
@@ -148,7 +148,7 @@
 
 # Control users use of ping and traceroute
 # 
-user_ping = true
+user_ping = false
 
 # allow host key based authentication
 # 
@@ -164,7 +164,7 @@
 
 # Allow spamd to write to users homedirs
 # 
-spamd_enable_home_dirs = true
+spamd_enable_home_dirs = false
 
 # Allow regular users direct mouse access
 # 
@@ -192,7 +192,7 @@
 
 # Allow all domains to talk to ttys
 # 
-allow_daemons_use_tty = true
+allow_daemons_use_tty = false
 
 # Allow login domains to polyinstatiate directories
 # 
@@ -208,11 +208,11 @@
 
 # Allow samba to export user home directories.
 # 
-samba_run_unconfined = true
+samba_run_unconfined = false
 
 # Allows XServer to execute writable memory
 # 
-allow_xserver_execmem = true
+allow_xserver_execmem = false
 
 # disallow guest accounts to execute files that they can create 
 # 
@@ -225,7 +225,7 @@
 
 # Allow postfix locat to write to mail spool
 # 
-allow_postfix_local_write_mail_spool=true
+allow_postfix_local_write_mail_spool=false
 
 # Allow common users to read/write noexattrfile systems
 # 

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- policy-20090105.patch	17 Apr 2009 14:19:16 -0000	1.89
+++ policy-20090105.patch	18 Apr 2009 12:13:36 -0000	1.90
@@ -3001,8 +3001,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.12/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,292 @@
++++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-17 11:13:07.000000000 -0400
+@@ -0,0 +1,293 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3138,6 +3138,7 @@
 +
 +miscfiles_read_localization(nsplugin_t)
 +miscfiles_read_fonts(nsplugin_t)
++miscfiles_dontaudit_write_fonts(nsplugin_t)
 +
 +userdom_manage_user_tmp_dirs(nsplugin_t)
 +userdom_manage_user_tmp_files(nsplugin_t)
@@ -3462,8 +3463,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.12/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/podsleuth.te	2009-04-07 16:01:44.000000000 -0400
-@@ -11,21 +11,68 @@
++++ serefpolicy-3.6.12/policy/modules/apps/podsleuth.te	2009-04-18 06:04:47.000000000 -0400
+@@ -11,25 +11,80 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
  
@@ -3483,7 +3484,7 @@
  #
 -
 -allow podsleuth_t self:process { signal getsched execheap execmem };
-+allow podsleuth_t self:capability { sys_admin sys_rawio };
++allow podsleuth_t self:capability { kill dac_override sys_admin sys_rawio };
 +allow podsleuth_t self:process { ptrace signal getsched execheap execmem execstack };
  allow podsleuth_t self:fifo_file rw_file_perms;
  allow podsleuth_t self:unix_stream_socket create_stream_socket_perms;
@@ -3533,7 +3534,21 @@
 +
  miscfiles_read_localization(podsleuth_t)
  
- dbus_system_bus_client(podsleuth_t)
+-dbus_system_bus_client(podsleuth_t)
++userdom_signal_all_users(podsleuth_t)
+ 
+-mono_exec(podsleuth_t)
++optional_policy(`
++	dbus_system_bus_client(podsleuth_t)
++')
+ 
++optional_policy(`
+ hal_dbus_chat(podsleuth_t)
++')
++
++optional_policy(`
++	mono_exec(podsleuth_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.fc serefpolicy-3.6.12/policy/modules/apps/pulseaudio.fc
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.fc	2009-04-07 16:01:44.000000000 -0400
@@ -4923,7 +4938,7 @@
  type urandom_device_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.12/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-15 08:01:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.if	2009-04-18 06:12:57.000000000 -0400
 @@ -525,7 +525,7 @@
  	')
  
@@ -6552,7 +6567,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-14 14:12:12.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.if	2009-04-18 06:06:56.000000000 -0400
 @@ -0,0 +1,638 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -22979,7 +22994,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-17 11:32:56.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23190,7 +23205,7 @@
  ')
  
  optional_policy(`
-@@ -198,5 +271,78 @@
+@@ -198,5 +271,80 @@
  ')
  
  optional_policy(`
@@ -23226,6 +23241,8 @@
 +
 +list_dirs_pattern(svirt_t, virt_content_t, virt_content_t)
 +read_files_pattern(svirt_t, virt_content_t, virt_content_t)
++dontaudit svirt_t virt_content_t:file write_file_perms;
++dontaudit svirt_t virt_content_t:dir write;
 +
 +storage_raw_write_removable_device(svirt_t)
 +storage_raw_read_removable_device(svirt_t)
@@ -25303,8 +25320,8 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-16 10:03:08.000000000 -0400
-@@ -280,6 +280,29 @@
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-17 11:04:53.000000000 -0400
+@@ -280,6 +280,36 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -25330,11 +25347,18 @@
 +	 optional_policy(`
 +	 	xserver_rw_xdm_home_files($1)
 +	')
++
++	optional_policy(`
++		unconfined_dontaudit_rw_pipes($1)
++		unconfined_dontaudit_rw_stream($1)
++		userdom_dontaudit_read_user_tmp_files($1)
++	')
++
 +	init_rw_script_stream_sockets($1)
  ')
  
  ########################################
-@@ -546,7 +569,7 @@
+@@ -546,7 +576,7 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
@@ -25343,7 +25367,7 @@
  	')
  ')
  
-@@ -619,18 +642,19 @@
+@@ -619,18 +649,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -25367,7 +25391,7 @@
  	')
  ')
  
-@@ -646,23 +670,43 @@
+@@ -646,23 +677,43 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -25415,7 +25439,7 @@
  ##	Execute a init script in a specified domain.
  ## </summary>
  ## <desc>
-@@ -1291,6 +1335,25 @@
+@@ -1291,6 +1342,25 @@
  
  ########################################
  ## <summary>
@@ -25441,7 +25465,7 @@
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1584,51 @@
+@@ -1521,3 +1591,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
@@ -25495,7 +25519,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 07:33:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 11:41:15.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25714,7 +25738,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +560,31 @@
+@@ -516,6 +560,33 @@
  	')
  ')
  
@@ -25741,12 +25765,14 @@
 +
 +optional_policy(`
 +	unconfined_dontaudit_rw_pipes(daemon)
++	unconfined_dontaudit_rw_stream(daemon)
++	userdom_dontaudit_read_user_tmp_files(daemon)
 +')
 + 
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +639,10 @@
+@@ -570,6 +641,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -25757,7 +25783,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +664,10 @@
+@@ -591,6 +666,10 @@
  ')
  
  optional_policy(`
@@ -25768,7 +25794,7 @@
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,6 +724,11 @@
+@@ -647,6 +726,11 @@
  ')
  
  optional_policy(`
@@ -25780,7 +25806,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +737,6 @@
+@@ -655,12 +739,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25793,7 +25819,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +797,9 @@
+@@ -721,6 +799,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -25803,7 +25829,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +812,12 @@
+@@ -733,10 +814,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25816,7 +25842,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +835,11 @@
+@@ -754,6 +837,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25828,7 +25854,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +847,8 @@
+@@ -761,6 +849,8 @@
  		# system-config-services causes avc messages that should be dontaudited
  		unconfined_dontaudit_rw_pipes(daemon)
  	')
@@ -25837,7 +25863,7 @@
  
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +856,10 @@
+@@ -768,6 +858,10 @@
  ')
  
  optional_policy(`
@@ -25848,7 +25874,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +882,25 @@
+@@ -790,3 +884,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -29135,7 +29161,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-16 11:03:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-18 06:14:35.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -30542,7 +30568,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3187,482 @@
+@@ -2981,3 +3187,481 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -31024,7 +31050,6 @@
 +
 +	dontaudit $1 userdomain:unix_stream_socket rw_socket_perms;
 +')
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-07 16:01:44.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- selinux-policy.spec	17 Apr 2009 14:19:17 -0000	1.826
+++ selinux-policy.spec	18 Apr 2009 12:13:36 -0000	1.827
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 6%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -311,9 +311,9 @@
 %saveFileContext targeted
 
 %post targeted
-set -x
 if [ $1 -eq 1 ]; then
-%loadpolicy targeted "unconfined.pp.bz2 unconfineduser.pp.bz2"
+packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+%loadpolicy targeted $packages
 restorecon -R /root /var/log /var/run 2> /dev/null
 else
 semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
@@ -401,7 +401,7 @@
 %saveFileContext olpc
 
 %post olpc 
-%loadpolicy olpc
+%loadpolicy olpc ""
 
 if [ $1 -ne 1 ]; then
 %relabel olpc
@@ -432,7 +432,7 @@
 
 %post mls 
 semodule -n -s mls -r mailscanner 2>/dev/null
-%loadpolicy mls
+%loadpolicy mls ""
 
 if [ $1 != 1 ]; then
 %relabel mls
@@ -446,6 +446,12 @@
 %endif
 
 %changelog
+* Sat Apr 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-8
+- Fixes for podsleuth
+
+* Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-7
+- Turn off nsplugin transition
+- Remove Konsole leaked file descriptors for release
 
 * Fri Apr 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-6
 - Allow cupsd_t to create link files in print_spool_t



From sandeen at fedoraproject.org  Sat Apr 18 12:18:55 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sat, 18 Apr 2009 12:18:55 +0000 (UTC)
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.51,1.52
Message-ID: <20090418121855.297B8700F7@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13291

Modified Files:
	xfsprogs.spec 
Log Message:
* Sat Apr 18 2009 Eric Sandeen <sandeen at redhat.com> 3.0.0-3
- Create new xfsprogs-qa-devel subpackage



Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xfsprogs.spec	26 Feb 2009 09:27:59 -0000	1.51
+++ xfsprogs.spec	18 Apr 2009 12:18:24 -0000	1.52
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	3.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -45,6 +45,19 @@
 filesystem-specific programs,  If you install xfsprogs-devel, you'll
 also want to install xfsprogs.
 
+%package qa-devel
+Summary: XFS QA filesystem-specific static libraries and headers
+Group: Development/Libraries
+Requires: xfsprogs = %{version}-%{release}
+Requires: xfsprogs-devel = %{version}-%{release}
+
+%description qa-devel
+xfsprogs-qa-devel contains headers and libraries needed to build
+the xfstests QA suite.
+
+You should install xfsprogs-qa-devel only if you are interested
+in building or running the xfstests QA suite.
+
 %prep
 %setup -q
 
@@ -62,7 +75,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DIST_ROOT=$RPM_BUILD_ROOT install install-dev
+make DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa
 
 # nuke .la files, etc
 rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la}
@@ -106,11 +119,74 @@
 %files devel
 %defattr(-,root,root)
 %{_mandir}/man3/*
-%{_includedir}/xfs
+%dir %{_includedir}/xfs
+%{_includedir}/xfs/handle.h
+%{_includedir}/xfs/jdm.h
+%{_includedir}/xfs/linux.h
+%{_includedir}/xfs/platform_defs-%{_arch}.h
+%{_includedir}/xfs/platform_defs.h
+%{_includedir}/xfs/xfs.h
+%{_includedir}/xfs/xfs_fs.h
+%{_includedir}/xfs/xqm.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
+%files qa-devel
+%defattr(-,root,root)
+%{_includedir}/xfs/bitops.h
+%{_includedir}/xfs/cache.h
+%{_includedir}/xfs/kmem.h
+%{_includedir}/xfs/libxfs.h
+%{_includedir}/xfs/libxlog.h
+%{_includedir}/xfs/list.h
+%{_includedir}/xfs/parent.h
+%{_includedir}/xfs/swab.h
+%{_includedir}/xfs/xfs_ag.h
+%{_includedir}/xfs/xfs_alloc.h
+%{_includedir}/xfs/xfs_alloc_btree.h
+%{_includedir}/xfs/xfs_arch.h
+%{_includedir}/xfs/xfs_attr_leaf.h
+%{_includedir}/xfs/xfs_attr_sf.h
+%{_includedir}/xfs/xfs_bit.h
+%{_includedir}/xfs/xfs_bmap.h
+%{_includedir}/xfs/xfs_bmap_btree.h
+%{_includedir}/xfs/xfs_btree.h
+%{_includedir}/xfs/xfs_btree_trace.h
+%{_includedir}/xfs/xfs_buf_item.h
+%{_includedir}/xfs/xfs_da_btree.h
+%{_includedir}/xfs/xfs_dfrag.h
+%{_includedir}/xfs/xfs_dinode.h
+%{_includedir}/xfs/xfs_dir2.h
+%{_includedir}/xfs/xfs_dir2_block.h
+%{_includedir}/xfs/xfs_dir2_data.h
+%{_includedir}/xfs/xfs_dir2_leaf.h
+%{_includedir}/xfs/xfs_dir2_node.h
+%{_includedir}/xfs/xfs_dir2_sf.h
+%{_includedir}/xfs/xfs_dir_leaf.h
+%{_includedir}/xfs/xfs_dir_sf.h
+%{_includedir}/xfs/xfs_extfree_item.h
+%{_includedir}/xfs/xfs_ialloc.h
+%{_includedir}/xfs/xfs_ialloc_btree.h
+%{_includedir}/xfs/xfs_imap.h
+%{_includedir}/xfs/xfs_inode.h
+%{_includedir}/xfs/xfs_inode_item.h
+%{_includedir}/xfs/xfs_inum.h
+%{_includedir}/xfs/xfs_log.h
+%{_includedir}/xfs/xfs_log_priv.h
+%{_includedir}/xfs/xfs_log_recover.h
+%{_includedir}/xfs/xfs_metadump.h
+%{_includedir}/xfs/xfs_mount.h
+%{_includedir}/xfs/xfs_quota.h
+%{_includedir}/xfs/xfs_rtalloc.h
+%{_includedir}/xfs/xfs_sb.h
+%{_includedir}/xfs/xfs_trans.h
+%{_includedir}/xfs/xfs_trans_space.h
+%{_includedir}/xfs/xfs_types.h
+
 %changelog
+* Sat Apr 18 2009 Eric Sandeen <sandeen at redhat.com> 3.0.0-3
+- Create new xfsprogs-qa-devel subpackage
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From karsten at fedoraproject.org  Sat Apr 18 12:33:03 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sat, 18 Apr 2009 12:33:03 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.159,1.160
Message-ID: <20090418123303.BC58A700F7@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16489

Modified Files:
	pango.spec 
Log Message:
- autoconf uses ibm-linux not redhat-linux (s390x)


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- pango.spec	14 Apr 2009 00:12:00 -0000	1.159
+++ pango.spec	18 Apr 2009 12:32:33 -0000	1.160
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.24.1
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.24/pango-%{version}.tar.bz2
@@ -187,6 +187,8 @@
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux (s390x)
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 case "$host" in
   alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*)
@@ -223,6 +225,10 @@
 
 
 %changelog
+* Sat Apr 18 2009 Karsten Hopp <karsten at redhat.com> 1.24.1-1.1
+- autoconf uses ibm-linux not redhat-linux (s390x)
+
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.24.1-1
 - Update to 1.24.1
 - See http://download.gnome.org/sources/pango/1.24/pango-1.24.1.news



From karsten at fedoraproject.org  Sat Apr 18 12:39:54 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sat, 18 Apr 2009 12:39:54 +0000 (UTC)
Subject: rpms/pango/F-11 pango.spec,1.159,1.160
Message-ID: <20090418123954.127A1700F7@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pango/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18782

Modified Files:
	pango.spec 
Log Message:
- autoconf uses ibm-linux not redhat-linux (s390x)


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/F-11/pango.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- pango.spec	14 Apr 2009 00:12:00 -0000	1.159
+++ pango.spec	18 Apr 2009 12:39:23 -0000	1.160
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.24.1
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.24/pango-%{version}.tar.bz2
@@ -94,6 +94,8 @@
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux (s390x)
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 # Make sure that the host value that is passed to the compile
 # is the same as the host that we're using in the spec file
@@ -223,6 +225,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Karsten Hopp <karsten at redhat.com> 1.24.1-1.1
+- autoconf uses ibm-linux not redhat-linux (s390x)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.24.1-1
 - Update to 1.24.1
 - See http://download.gnome.org/sources/pango/1.24/pango-1.24.1.news



From scop at fedoraproject.org  Sat Apr 18 12:53:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 18 Apr 2009 12:53:07 +0000 (UTC)
Subject: rpms/pscan/devel .cvsignore, 1.4, 1.5 pscan.spec, 1.7, 1.8 sources, 
	1.4, 1.5
Message-ID: <20090418125307.59362700F7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/pscan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21603

Modified Files:
	.cvsignore pscan.spec sources 
Log Message:
* Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.3-3
- Update Debian patchkit to 1.2-9 for support for larger source files
  (Debian bug 436794).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pscan/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Feb 2008 23:09:03 -0000	1.4
+++ .cvsignore	18 Apr 2009 12:52:36 -0000	1.5
@@ -1,2 +1,2 @@
 pscan.tar.gz
-pscan_1.2-8.diff.gz
+pscan_1.2-9.diff.gz


Index: pscan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pscan/devel/pscan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pscan.spec	27 Feb 2009 02:41:44 -0000	1.7
+++ pscan.spec	18 Apr 2009 12:52:36 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           pscan
 Version:        1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Limited problem scanner for C source files
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://deployingradius.com/pscan/
 Source0:        http://deployingradius.com/pscan/pscan.tar.gz
-Patch0:         http://ftp.debian.org/debian/pool/main/p/pscan/pscan_1.2-8.diff.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/p/pscan/pscan_1.2-9.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -20,9 +20,9 @@
 %prep
 %setup -q -c
 %patch0 -p1
-patch -p1 -i debian/patches/manpage.patch
-patch -p1 -i debian/patches/pscan.patch
-patch -p1 -i debian/patches/scanner.patch
+patch -p1 -i debian/patches/20_pscan.patch
+patch -p1 -i debian/patches/30_scanner.patch
+patch -p0 -i debian/patches/40_max_stack.patch
 
 
 %build
@@ -32,7 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 pscan $RPM_BUILD_ROOT%{_bindir}/pscan
-install -Dpm 644 pscan.1 $RPM_BUILD_ROOT%{_mandir}/man1/pscan.1
+install -Dpm 644 debian/pscan.1 $RPM_BUILD_ROOT%{_mandir}/man1/pscan.1
 
 
 %clean
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.3-3
+- Update Debian patchkit to 1.2-9 for support for larger source files
+  (Debian bug 436794).
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pscan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Feb 2008 23:09:03 -0000	1.4
+++ sources	18 Apr 2009 12:52:36 -0000	1.5
@@ -1,2 +1,2 @@
 07083eade2dbd7a9b394189cb2ee400e  pscan.tar.gz
-594ef39048b622716eeeabf630fade52  pscan_1.2-8.diff.gz
+fdb2edb60ab95b806f53e352a410a567  pscan_1.2-9.diff.gz



From mdomsch at fedoraproject.org  Sat Apr 18 13:05:27 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 13:05:27 +0000 (UTC)
Subject: rpms/pgp-tools/F-10 pgp-tools-1.1-drop-pgpring.patch, NONE,
	1.1 pgp-tools.spec, 1.10, 1.11
Message-ID: <20090418130527.13478700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23875

Modified Files:
	pgp-tools.spec 
Added Files:
	pgp-tools-1.1-drop-pgpring.patch 
Log Message:
add BRs for %check; drop included pgpring, use mutt's copy instead

pgp-tools-1.1-drop-pgpring.patch:

--- NEW FILE pgp-tools-1.1-drop-pgpring.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal signing-party-1.1.orig/keyanalyze/Makefile signing-party-1.1/keyanalyze/Makefile
--- signing-party-1.1.orig/keyanalyze/Makefile	2009-02-21 04:30:01.000000000 -0600
+++ signing-party-1.1/keyanalyze/Makefile	2009-04-18 00:04:14.000000000 -0500
@@ -1,21 +1,16 @@
 LDLIBS=-lpthread
 CFLAGS=-O2 -W -Wall -g
 
-all: keyanalyze process_keys pgpring/pgpring
+all: keyanalyze process_keys
 
 keyanalyze: keyanalyze.o
 process_keys: process_keys.o
 
-pgpring/pgpring:
-	cd pgpring && CFLAGS="${CFLAGS}" ./configure && make pgpring
-
 install:
-	install pgpring/pgpring $(DESTDIR)/usr/bin
 	install keyanalyze $(DESTDIR)/usr/bin
 	install process_keys $(DESTDIR)/usr/bin
 
 clean:
-	-(cd pgpring && make distclean)
 	-rm -f *.o core *~ keyanalyze process_keys
 	-rm -f test.pre preprocess.keys keyanalyze.out all.keys
 	-rm -rf output


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-10/pgp-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pgp-tools.spec	18 Apr 2009 04:44:50 -0000	1.10
+++ pgp-tools.spec	18 Apr 2009 13:04:56 -0000	1.11
@@ -2,7 +2,7 @@
 %define debian_version 1.1
 Name:           pgp-tools
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -17,15 +17,18 @@
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 # 
 # svn co svn://svn.debian.org/pgp-tools/tags/debian-version-1.0-2 signing-party-%{version}
-Source0:	%{tarballname}_%{debian_version}.orig.tar.gz
+Source0:        %{tarballname}_%{debian_version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
-Source1:	copyright
+Source1:        copyright
+Patch0:         %{name}-1.1-drop-pgpring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
-Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for gpgdir test suite
+BuildRequires:  gpg, perl(GnuPG::Interface), perl(Term::ReadKey), perl(Class::MethodMaker)
+Requires:       gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:       perl(Class::MethodMaker), perl(Term::ReadKey)
 # for pgpring
-Requires: mutt
+Requires:      mutt
 
 
 %description
@@ -52,6 +55,7 @@
 cp %SOURCE1 .
 # fix gpgdir library path lookup as we're using system-provided libraries
 sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -78,11 +82,10 @@
 DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
 for man in `find $DIRS -type f -name "*.1" -print`
 do
-	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
-# nuke private copy of pgpring
-rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+# nuke our copy of pgpring manpage
 rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
 
 
@@ -124,6 +127,11 @@
 %doc __fedora_docs/*
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-2
+- add BRs so %%check succeeds
+- drop upstream's outdated copy of pgpring. mutt provides a newer
+  version, so require mutt.
+
 * Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
 - update to 1.1
   adds gpgdir, gpgwrap, keyanalyze



From mdomsch at fedoraproject.org  Sat Apr 18 13:14:30 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 13:14:30 +0000 (UTC)
Subject: rpms/pgp-tools/F-11 pgp-tools-1.1-drop-pgpring.patch, NONE,
	1.1 pgp-tools.spec, 1.11, 1.12
Message-ID: <20090418131430.D3338700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25276

Modified Files:
	pgp-tools.spec 
Added Files:
	pgp-tools-1.1-drop-pgpring.patch 
Log Message:
add BRs for %check; drop included pgpring, use mutt's copy instead

pgp-tools-1.1-drop-pgpring.patch:

--- NEW FILE pgp-tools-1.1-drop-pgpring.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal signing-party-1.1.orig/keyanalyze/Makefile signing-party-1.1/keyanalyze/Makefile
--- signing-party-1.1.orig/keyanalyze/Makefile	2009-02-21 04:30:01.000000000 -0600
+++ signing-party-1.1/keyanalyze/Makefile	2009-04-18 00:04:14.000000000 -0500
@@ -1,21 +1,16 @@
 LDLIBS=-lpthread
 CFLAGS=-O2 -W -Wall -g
 
-all: keyanalyze process_keys pgpring/pgpring
+all: keyanalyze process_keys
 
 keyanalyze: keyanalyze.o
 process_keys: process_keys.o
 
-pgpring/pgpring:
-	cd pgpring && CFLAGS="${CFLAGS}" ./configure && make pgpring
-
 install:
-	install pgpring/pgpring $(DESTDIR)/usr/bin
 	install keyanalyze $(DESTDIR)/usr/bin
 	install process_keys $(DESTDIR)/usr/bin
 
 clean:
-	-(cd pgpring && make distclean)
 	-rm -f *.o core *~ keyanalyze process_keys
 	-rm -f test.pre preprocess.keys keyanalyze.out all.keys
 	-rm -rf output


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/pgp-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgp-tools.spec	18 Apr 2009 04:57:32 -0000	1.11
+++ pgp-tools.spec	18 Apr 2009 13:14:00 -0000	1.12
@@ -2,7 +2,7 @@
 %define debian_version 1.1
 Name:           pgp-tools
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -17,15 +17,18 @@
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 # 
 # svn co svn://svn.debian.org/pgp-tools/tags/debian-version-1.0-2 signing-party-%{version}
-Source0:	%{tarballname}_%{debian_version}.orig.tar.gz
+Source0:        %{tarballname}_%{debian_version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
-Source1:	copyright
+Source1:        copyright
+Patch0:         %{name}-1.1-drop-pgpring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
-Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for gpgdir test suite
+BuildRequires:  gpg, perl(GnuPG::Interface), perl(Term::ReadKey), perl(Class::MethodMaker)
+Requires:       gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:       perl(Class::MethodMaker), perl(Term::ReadKey)
 # for pgpring
-Requires: mutt
+Requires:      mutt
 
 
 %description
@@ -52,6 +55,7 @@
 cp %SOURCE1 .
 # fix gpgdir library path lookup as we're using system-provided libraries
 sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -78,11 +82,10 @@
 DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
 for man in `find $DIRS -type f -name "*.1" -print`
 do
-	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
-# nuke private copy of pgpring
-rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+# nuke our copy of pgpring manpage
 rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
 
 
@@ -124,6 +127,11 @@
 %doc __fedora_docs/*
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-2
+- add BRs so %%check succeeds
+- drop upstream's outdated copy of pgpring. mutt provides a newer
+  version, so require mutt.
+
 * Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
 - update to 1.1
   adds gpgdir, gpgwrap, keyanalyze



From mdomsch at fedoraproject.org  Sat Apr 18 13:32:17 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 13:32:17 +0000 (UTC)
Subject: rpms/pgp-tools/devel pgp-tools-1.1-drop-pgpring.patch, NONE,
	1.1 pgp-tools.spec, 1.11, 1.12
Message-ID: <20090418133217.111DA700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28328

Modified Files:
	pgp-tools.spec 
Added Files:
	pgp-tools-1.1-drop-pgpring.patch 
Log Message:
add BRs for %check; drop included pgpring, use mutt's copy instead

pgp-tools-1.1-drop-pgpring.patch:

--- NEW FILE pgp-tools-1.1-drop-pgpring.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal signing-party-1.1.orig/keyanalyze/Makefile signing-party-1.1/keyanalyze/Makefile
--- signing-party-1.1.orig/keyanalyze/Makefile	2009-02-21 04:30:01.000000000 -0600
+++ signing-party-1.1/keyanalyze/Makefile	2009-04-18 00:04:14.000000000 -0500
@@ -1,21 +1,16 @@
 LDLIBS=-lpthread
 CFLAGS=-O2 -W -Wall -g
 
-all: keyanalyze process_keys pgpring/pgpring
+all: keyanalyze process_keys
 
 keyanalyze: keyanalyze.o
 process_keys: process_keys.o
 
-pgpring/pgpring:
-	cd pgpring && CFLAGS="${CFLAGS}" ./configure && make pgpring
-
 install:
-	install pgpring/pgpring $(DESTDIR)/usr/bin
 	install keyanalyze $(DESTDIR)/usr/bin
 	install process_keys $(DESTDIR)/usr/bin
 
 clean:
-	-(cd pgpring && make distclean)
 	-rm -f *.o core *~ keyanalyze process_keys
 	-rm -f test.pre preprocess.keys keyanalyze.out all.keys
 	-rm -rf output


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgp-tools.spec	18 Apr 2009 04:56:09 -0000	1.11
+++ pgp-tools.spec	18 Apr 2009 13:31:46 -0000	1.12
@@ -2,7 +2,7 @@
 %define debian_version 1.1
 Name:           pgp-tools
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -17,15 +17,18 @@
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 # 
 # svn co svn://svn.debian.org/pgp-tools/tags/debian-version-1.0-2 signing-party-%{version}
-Source0:	%{tarballname}_%{debian_version}.orig.tar.gz
+Source0:        %{tarballname}_%{debian_version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
-Source1:	copyright
+Source1:        copyright
+Patch0:         %{name}-1.1-drop-pgpring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
-Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for gpgdir test suite
+BuildRequires:  gpg, perl(GnuPG::Interface), perl(Term::ReadKey), perl(Class::MethodMaker)
+Requires:       gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:       perl(Class::MethodMaker), perl(Term::ReadKey)
 # for pgpring
-Requires: mutt
+Requires:      mutt
 
 
 %description
@@ -52,6 +55,7 @@
 cp %SOURCE1 .
 # fix gpgdir library path lookup as we're using system-provided libraries
 sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -78,11 +82,10 @@
 DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
 for man in `find $DIRS -type f -name "*.1" -print`
 do
-	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
-# nuke private copy of pgpring
-rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+# nuke our copy of pgpring manpage
 rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
 
 
@@ -124,6 +127,11 @@
 %doc __fedora_docs/*
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-2
+- add BRs so %%check succeeds
+- drop upstream's outdated copy of pgpring. mutt provides a newer
+  version, so require mutt.
+
 * Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
 - update to 1.1
   adds gpgdir, gpgwrap, keyanalyze



From peter at fedoraproject.org  Sat Apr 18 13:59:28 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 18 Apr 2009 13:59:28 +0000 (UTC)
Subject: rpms/erlang/EL-5 otp-rpath.patch, 1.3, 1.4 .cvsignore, 1.9,
	1.10 erlang.spec, 1.21, 1.22 import.log, 1.1,
	1.2 otp-sslrpath.patch, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <20090418135928.7B9E2700F7@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/erlang/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv330/EL-5

Modified Files:
	.cvsignore erlang.spec import.log otp-sslrpath.patch sources 
Added Files:
	otp-rpath.patch 
Log Message:
ver. R12B-5 (bugfix release)

otp-rpath.patch:

Index: otp-rpath.patch
===================================================================
RCS file: otp-rpath.patch
diff -N otp-rpath.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ otp-rpath.patch	18 Apr 2009 13:59:28 -0000	1.4
@@ -0,0 +1,39 @@
+diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in
+--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath	2008-10-25 22:20:42.000000000 +0200
++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in	2008-10-25 22:20:59.000000000 +0200
+@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
+ HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
+ endif
+ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
+-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
++LD_R_FLAG=
+ ifeq ($(strip $(LD_R_FLAG)),)
+ LD_R_OPT =
+ else
+diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile
+--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath	2008-10-25 22:21:11.000000000 +0200
++++ otp_src_R12B-4/lib/crypto/priv/Makefile	2008-10-25 22:21:33.000000000 +0200
+@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
+ # ----------------------------------------------------
+ 
+ $(SO_DRIVER): $(OBJS)
+-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
++	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
+ 	-o $@ $^ -lcrypto
+ 
+ $(DLL_DRIVER): $(OBJS)
+diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath	2008-10-25 22:21:51.000000000 +0200
++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in	2008-10-25 22:22:21.000000000 +0200
+@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+ CC_R_FLAG =
+ else
+ ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,
+-CC_R_FLAG = -Wl,-rpath,
++CC_R_FLAG =
+ else						# Default: -Wl,-R
+-CC_R_FLAG = -Wl,-R
++CC_R_FLAG =
+ endif
+ endif
+ endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Aug 2008 21:01:20 -0000	1.9
+++ .cvsignore	18 Apr 2009 13:59:27 -0000	1.10
@@ -1,3 +1,3 @@
-otp_doc_html_R12B-3.tar.gz
-otp_doc_man_R12B-3.tar.gz
-otp_src_R12B-3.tar.gz
+otp_doc_html_R12B-5.tar.gz
+otp_doc_man_R12B-5.tar.gz
+otp_src_R12B-5.tar.gz


Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/erlang.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- erlang.spec	11 Aug 2008 14:27:48 -0000	1.21
+++ erlang.spec	18 Apr 2009 13:59:28 -0000	1.22
@@ -1,9 +1,9 @@
 %define ver R12B
-%define rel 3
+%define rel 5
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.3%{?dist}
+Release:        %{rel}.6%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -14,6 +14,7 @@
 Source2:	http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz
 Patch0:		otp-links.patch
 Patch1:		otp-install.patch
+Patch2:		otp-rpath.patch
 Patch3:         otp-sslrpath.patch
 Patch6:         otp-ssl_missing_libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,13 +25,17 @@
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
 BuildRequires:  gd-devel
+%if 0%{?rhel}
 BuildRequires:	java-1.4.2-gcj-compat-devel
+%else
+BuildRequires:	java-1.5.0-gcj-devel
+%endif
 BuildRequires:  flex
 BuildRequires:	m4
 
 Requires:	tk
 
-%description 
+%description
 Erlang is a general-purpose programming language and runtime
 environment. Erlang has built-in support for concurrency, distribution
 and fault tolerance. Erlang is used in several large telecommunication
@@ -49,7 +54,8 @@
 %setup -q -n otp_src_%{ver}-%{rel}
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
-%patch3 -p1 -b .sslrpath
+%patch2 -p1 -b .rpath
+#%patch3 -p1 -b .sslrpath
 %patch6 -p0 -b .keyutils
 
 # enable dynamic linking for ssl
@@ -64,7 +70,11 @@
 
 
 %build
-CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%ifarch sparcv9 sparc64
+CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%else
+CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%endif
 chmod -R u+w .
 make
 
@@ -88,7 +98,7 @@
 # make links to binaries
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cd $RPM_BUILD_ROOT/%{_bindir}
-for file in erl erlc 
+for file in erl erlc escript dialyzer
 do
   ln -sf ../%{_lib}/erlang/bin/$file .
 done
@@ -119,8 +129,24 @@
 
 
 %changelog
-* Mon Aug 11 2008 Peter Lemenkov <lemenkov at gmail.com> - R12B-3.3
-- Force dynamic linking of crypto libs
+* Sun Mar  1 2009 Gerard Milmeister <gemi at bluewin.ch> - R12B-5.6
+- new release R12B-5
+- link escript and dialyzer to %{_bindir}
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - R12B-5.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb 14 2009 Dennis Gilmore <dennis at ausil.us> - R12B-4.5
+- fix sparc arches to compile
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - R12B-4.4
+- rebuild with new openssl
+
+* Sat Oct 25 2008 Gerard Milmeister <gemi at bluewin.ch> - R12B-4.1
+- new release R12B-4
+
+* Fri Sep  5 2008 Gerard Milmeister <gemi at bluewin.ch> - R12B-3.3
+- fixed sslrpath patch
 
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - R12B-3.2
 - fix license tag


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Aug 2008 21:01:21 -0000	1.1
+++ import.log	18 Apr 2009 13:59:28 -0000	1.2
@@ -1 +1,2 @@
 erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033
+erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042

otp-sslrpath.patch:

Index: otp-sslrpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/otp-sslrpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- otp-sslrpath.patch	17 Feb 2006 23:32:19 -0000	1.1
+++ otp-sslrpath.patch	18 Apr 2009 13:59:28 -0000	1.2
@@ -1,7 +1,8 @@
---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath	2005-12-29 00:49:17.000000000 +0100
-+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in	2005-12-29 00:50:15.000000000 +0100
-@@ -95,7 +95,7 @@
- endif
+diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath	2008-10-26 00:00:37.000000000 +0200
++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in	2008-10-26 00:01:09.000000000 +0200
+@@ -102,7 +102,7 @@ else
+ SSL_MAKEFILE =
  endif
  
 -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
@@ -9,3 +10,15 @@
  ifeq ($(findstring @,$(CC_R_FLAG)),@)
  # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
  # we try our best here instead...
+@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+ CC_R_FLAG =
+ else
+ ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,
+-CC_R_FLAG = -Wl,-rpath,
++CC_R_FLAG =
+ else						# Default: -Wl,-R
+-CC_R_FLAG = -Wl,-R
++CC_R_FLAG =
+ endif
+ endif
+ endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Aug 2008 21:01:21 -0000	1.9
+++ sources	18 Apr 2009 13:59:28 -0000	1.10
@@ -1,3 +1,3 @@
-8865d406c256abbff63eaff62d2216aa  otp_doc_html_R12B-3.tar.gz
-13098954c9d5804bb8394fe7badb3d0d  otp_doc_man_R12B-3.tar.gz
-c2e7f0ad54b8fadebde2d94106608d97  otp_src_R12B-3.tar.gz
+fb0c5454bbd865e881b6712295f6d41f  otp_doc_html_R12B-5.tar.gz
+6231cb172847040395cc34b20781aa3b  otp_doc_man_R12B-5.tar.gz
+3751ea3fea669d2b25c67eeb883734bb  otp_src_R12B-5.tar.gz



From mdomsch at fedoraproject.org  Sat Apr 18 14:04:51 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 18 Apr 2009 14:04:51 +0000 (UTC)
Subject: rpms/pgp-tools/F-9 pgp-tools-1.1-drop-pgpring.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20090418140451.E4504700F7@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1171

Modified Files:
	.cvsignore pgp-tools.spec sources 
Added Files:
	pgp-tools-1.1-drop-pgpring.patch 
Log Message:
update to 1.1; add BRs for %check; drop included pgpring, use mutt's copy instead

pgp-tools-1.1-drop-pgpring.patch:

--- NEW FILE pgp-tools-1.1-drop-pgpring.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal signing-party-1.1.orig/keyanalyze/Makefile signing-party-1.1/keyanalyze/Makefile
--- signing-party-1.1.orig/keyanalyze/Makefile	2009-02-21 04:30:01.000000000 -0600
+++ signing-party-1.1/keyanalyze/Makefile	2009-04-18 00:04:14.000000000 -0500
@@ -1,21 +1,16 @@
 LDLIBS=-lpthread
 CFLAGS=-O2 -W -Wall -g
 
-all: keyanalyze process_keys pgpring/pgpring
+all: keyanalyze process_keys
 
 keyanalyze: keyanalyze.o
 process_keys: process_keys.o
 
-pgpring/pgpring:
-	cd pgpring && CFLAGS="${CFLAGS}" ./configure && make pgpring
-
 install:
-	install pgpring/pgpring $(DESTDIR)/usr/bin
 	install keyanalyze $(DESTDIR)/usr/bin
 	install process_keys $(DESTDIR)/usr/bin
 
 clean:
-	-(cd pgpring && make distclean)
 	-rm -f *.o core *~ keyanalyze process_keys
 	-rm -f test.pre preprocess.keys keyanalyze.out all.keys
 	-rm -rf output


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 May 2008 01:31:49 -0000	1.9
+++ .cvsignore	18 Apr 2009 14:04:21 -0000	1.10
@@ -1 +1 @@
-signing-party_1.0-2.orig.tar.gz
+signing-party_1.1.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-9/pgp-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pgp-tools.spec	21 May 2008 01:31:49 -0000	1.9
+++ pgp-tools.spec	18 Apr 2009 14:04:21 -0000	1.10
@@ -1,8 +1,8 @@
 %define tarballname signing-party
-%define debian_version 1.0-2
+%define debian_version 1.1
 Name:           pgp-tools
-Version:        1.0
-Release:        1%{?dist}
+Version:        1.1
+Release:        2%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -17,13 +17,18 @@
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 # 
 # svn co svn://svn.debian.org/pgp-tools/tags/debian-version-1.0-2 signing-party-%{version}
-Source0:	%{tarballname}_%{debian_version}.orig.tar.gz
+Source0:        %{tarballname}_%{debian_version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
-Source1:	copyright
+Source1:        copyright
+Patch0:         %{name}-1.1-drop-pgpring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-Requires:	gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  	mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+# for gpgdir test suite
+BuildRequires:  gpg, perl(GnuPG::Interface), perl(Term::ReadKey), perl(Class::MethodMaker)
+Requires:       gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires:       perl(Class::MethodMaker), perl(Term::ReadKey)
+# for pgpring
+Requires:      mutt
 
 
 %description
@@ -34,17 +39,23 @@
 * pgp-fixkey: removes broken packets from keys
 * gpg-mailkeys: simply mail out a signed key to its owner
 * gpg-key2ps: generate PostScript file with fingerprint paper strips
+* gpgdir: recursive directory encryption tool
 * gpglist: show who signed which of your UIDs
 * gpgsigs: annotates list of GnuPG keys with already done signatures
 * keylookup: ncurses wrapper around gpg --search
 * gpgparticipants: create list of party participants for the organiser
+* gpgwrap: a passphrase wrapper
+* keyanalyze: minimum signing distance (MSD) analysis on keyrings
 * sig2dot: converts a list of GnuPG signatures to a .dot file
 * springgraph: creates a graph from a .dot file
 
 
 %prep
-%setup -q -n debian-version-%{debian_version}
+%setup -q -n %{tarballname}-%{version}
 cp %SOURCE1 .
+# fix gpgdir library path lookup as we're using system-provided libraries
+sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -53,18 +64,30 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
+make install DESTDIR=$RPM_BUILD_ROOT || :
+# apps with no 'make install'
+for f in caff pgp-clean pgp-fixkey ; do
+install -m 755 caff/$f $RPM_BUILD_ROOT%{_bindir}/
+done
+install -m 755 gpg-key2ps/gpg-key2ps $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgdir/gpgdir $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpglist/gpglist $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgwrap/bin/gpgwrap $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpg-mailkeys/gpg-mailkeys $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgparticipants/gpgparticipants $RPM_BUILD_ROOT%{_bindir}/
+
+# nuke apps creating their own docs dir
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc
+# find all manpages wherever they are hiding
 DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
-
-for file in `find $DIRS -type f -perm +0111 -print`
+for man in `find $DIRS -type f -name "*.1" -print`
 do
-	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
-for man in `find $DIRS -type f -name "*.[0-9]" -print`
-do
-	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
-done
+# nuke our copy of pgpring manpage
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
+
 
 rm -rf __fedora_docs
 mkdir __fedora_docs
@@ -72,21 +95,50 @@
 
 #  cleanup to leave docs only...
 find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+find __fedora_docs -type d -name src -exec rm -rf \{\} \; || :
+rm -rf __fedora_docs/keyanalyze/pgpring
+rm -rf __fedora_docs/keyanalyze/*.[cho]
+rm     __fedora_docs/gpgdir/INSTALL
+rm -rf __fedora_docs/gpgdir/packaging
+rm -rf __fedora_docs/gpgdir/test
+rm -rf __fedora_docs/gpgwrap/{bin,doc}
+rm -rf __fedora_docs/gpglist
+rm -rf __fedora_docs/gpgparticipants
 mv __fedora_docs/keylookup/COPYING .
 
 
+%check
+pushd gpgdir/test
+./gpgdir_test.pl
+RC=0
+grep "STATUS: fail" output/*.test > /dev/null 2>&1 && RC=1
+popd
+exit $RC
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/signing-party
 %doc README COPYING copyright
 %doc __fedora_docs/*
-%{_bindir}/*
-%{_mandir}/*/*
-
 
 %changelog
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-2
+- add BRs so %%check succeeds
+- drop upstream's outdated copy of pgpring. mutt provides a newer
+  version, so require mutt.
+
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
+- update to 1.1
+  adds gpgdir, gpgwrap, keyanalyze
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue May 20 2008 Matt Domsch <Matt_Domsch at dell.com> 1.0-1
 - upgrade to 1.0-1
   - gpgsigs: Implement support for LaTeX output and photo ids.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 May 2008 01:31:49 -0000	1.9
+++ sources	18 Apr 2009 14:04:21 -0000	1.10
@@ -1 +1 @@
-614eaa73dea801f208e6e180caa69ac6  signing-party_1.0-2.orig.tar.gz
+2aa5ec82feb0f9d4679c76a1a65231df  signing-party_1.1.orig.tar.gz



From till at fedoraproject.org  Sat Apr 18 14:11:27 2009
From: till at fedoraproject.org (Till Maas)
Date: Sat, 18 Apr 2009 14:11:27 +0000 (UTC)
Subject: rpms/gpscorrelate/devel gpscorrelate-1.6.0-icon.patch, NONE,
	1.1 gpscorrelate-gui.svg, NONE, 1.1 gpscorrelate.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418141127.17ADF700F7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/gpscorrelate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2296/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gpscorrelate-1.6.0-icon.patch gpscorrelate-gui.svg 
	gpscorrelate.spec import.log 
Log Message:
initial import


gpscorrelate-1.6.0-icon.patch:

--- NEW FILE gpscorrelate-1.6.0-icon.patch ---
diff -up gpscorrelate-1.6.0/Makefile.icon gpscorrelate-1.6.0/Makefile
--- gpscorrelate-1.6.0/Makefile.icon	2009-04-18 15:34:22.000000000 +0200
+++ gpscorrelate-1.6.0/Makefile	2009-04-18 15:33:58.000000000 +0200
@@ -10,9 +10,10 @@ OFLAGS   = -Wall
 override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 prefix   = /usr/local
 bindir   = $(prefix)/bin
-mandir   = $(prefix)/share/man
-docdir   = $(prefix)/share/doc/gpscorrelate
-applicationsdir = $(prefix)/share/applications
+datadir  = $(prefix)/share
+mandir   = $(datadir)/man
+docdir   = $(datadir)/doc/gpscorrelate
+applicationsdir = $(datadir)/applications
 
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
@@ -41,6 +42,7 @@ install: all
 
 install-desktop-file:
 	desktop-file-install --vendor="" --dir="$(DESTDIR)$(applicationsdir)" gpscorrelate.desktop
+	install -p -m0644 -D gpscorrelate-gui.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
 
 doc/gpscorrelate-manpage.xml: doc/gpscorrelate-manpage.xml.in
 	sed  's, at DOCDIR@,$(docdir),' $< > $@
diff -up gpscorrelate-1.6.0/gpscorrelate.desktop.icon gpscorrelate-1.6.0/gpscorrelate.desktop
--- gpscorrelate-1.6.0/gpscorrelate.desktop.icon	2008-10-31 12:50:39.000000000 +0100
+++ gpscorrelate-1.6.0/gpscorrelate.desktop	2009-04-18 15:34:11.000000000 +0200
@@ -8,3 +8,4 @@ TryExec=gpscorrelate-gui
 Exec=gpscorrelate-gui
 Terminal=false
 Categories=Graphics;ImageProcessing;Geography;GTK;
+Icon=gpscorrelate-gui


--- NEW FILE gpscorrelate-gui.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="45"
   height="45"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   version="1.0"
   inkscape:export-filename=""
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90"
   sodipodi:docname="gpscorrelate-gui.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5288"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.141655,0,0,1.141655,-96.08973,82.45606)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5274"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4522"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4512"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient3765"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       id="linearGradient2900">
      <stop
         style="stop-color:#96c813;stop-opacity:1;"
         offset="0"
         id="stop2902" />
      <stop
         style="stop-color:#46dbff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop2904" />
    </linearGradient>
    <linearGradient
       id="linearGradient3759">
      <stop
         style="stop-color:#b4b4b4;stop-opacity:1;"
         offset="0"
         id="stop3761" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop3763" />
    </linearGradient>
    <inkscape:perspective
       id="perspective2635"
       inkscape:persp3d-origin="276.03952 : 106.71186 : 1"
       inkscape:vp_z="552.07904 : 160.06779 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 160.06779 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2988"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <linearGradient
       id="linearGradient3270">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3272"
         offset="0" />
      <stop
         style="stop-color:#fffbfb;stop-opacity:1;"
         id="stop3278"
         offset="0.24074075" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3274"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient4052"
       inkscape:collect="always">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop4054"
         offset="0" />
      <stop
         style="stop-color:#000000;stop-opacity:0;"
         id="stop4056"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3919">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3921"
         offset="0" />
      <stop
         style="stop-color:#a1a1a1;stop-opacity:1;"
         id="stop3927"
         offset="0.5" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3923"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3891">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3893"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3895"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3882">
      <stop
         style="stop-color:#3a3a63;stop-opacity:1;"
         id="stop3884"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3887"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3874">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3876"
         offset="0" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1;"
         id="stop3878"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3864">
      <stop
         style="stop-color:#51519c;stop-opacity:1;"
         id="stop3866"
         offset="0" />
      <stop
         style="stop-color:#f3f3f9;stop-opacity:1;"
         id="stop3868"
[...3020 lines suppressed...]
           style="fill-opacity:0.24999994;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3749"
           d="M 254.15045,530.28944 C 254.15045,530.28944 266.82115,526.6052 266.30599,524.38507 C 265.26821,515.64399 245.99949,496.78141 240.07028,493.89724 C 216.72007,490.41706 279.45967,524.6958 254.15045,530.28944 z" />
        <path
           style="fill-opacity:0.23999999;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3751"
           d="M 242.73064,563.94624 C 242.73064,563.94624 256.28802,563.19999 256.79572,561.11932 C 257.30343,559.03865 255.52755,541.52322 247.12164,533.85331 C 228.63066,526.29105 266.58111,561.04494 242.73064,563.94624 z" />
      </g>
    </g>
    <path
       style="fill:url(#radialGradient6415);stroke:url(#linearGradient6417);stroke-width:0.21233647"
       id="path3787"
       d="M 16.70261,24.250037 L 4.1990199,28.10348 L 4.2293347,43.061323 L 41.742669,43.0569 L 41.724089,28.099096 L 29.210842,24.248563 L 16.70261,24.250037 z M 22.958926,25.985169 C 24.039233,25.985056 24.91382,26.257918 24.914185,26.592987 C 24.914552,26.928018 24.0407,27.199256 22.960394,27.199369 C 21.880331,27.19952 20.999755,26.928471 20.99939,26.59344 C 20.999023,26.258409 21.878742,25.985321 22.958926,25.985169 z" />
    <path
       style="fill:#ffcc66;stroke:url(#linearGradient6412);stroke-width:0.13399741;stroke-linecap:square"
       id="path3789"
       d="M 22.971884,25.458605 C 21.027136,25.458832 19.448237,25.948927 19.448969,26.552096 C 19.449825,27.155264 21.029947,27.643468 22.974695,27.643242 C 24.919442,27.643015 26.493453,27.154396 26.492596,26.551227 C 26.491864,25.948095 24.916508,25.458341 22.971884,25.458605 z M 22.972494,26.027799 C 23.902697,26.027685 24.657128,26.26302 24.657494,26.551453 C 24.657861,26.839961 23.904041,27.073897 22.973962,27.074049 C 22.043881,27.074162 21.284684,26.840339 21.284194,26.551906 C 21.283705,26.263398 22.042536,26.027875 22.972494,26.027799 z" />
    <g
       id="g3801"
       transform="matrix(0.1156696,-5.9479292e-3,1.9313485e-2,3.5622479e-2,6.0535132,22.503981)">
      <path
         style="fill:#985a11;stroke:#000000;stroke-width:0.85350001"
         id="path3803"
         sodipodi:nodetypes="cssssssssss"
         d="M 124.576,143.133 C 137.775,129.844 132.991,104.271 125.992,85.499 C 117.078,61.588 98.389,42.26 94.804,16.108 C 91.885,-5.176 100.46,-26.091 114.281,-41.842 C 123.456,-52.298 140.678,-76.523 129.841,-79.732 C 127.583,-80.4 114.301,-54.984 105.012,-44.885 C 89.537,-28.061 84.439,0.215 86.181,18.718 C 88.061,38.703 104.567,58.763 113.551,76.013 C 119.426,87.293 122.707,99.715 123.724,112.247 C 124.276,119.052 121.653,125.728 118.531,131.78 C 116.41,135.892 120.848,146.884 124.576,143.133 z" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3805"
         sodipodi:nodetypes="cc"
         d="M 118.415,131.872 C 118.991,134.102 125.209,139.851 126.916,140.717" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3807"
         sodipodi:nodetypes="cc"
         d="M 121.57,125.48 C 122.147,127.712 128.522,133.646 130.234,134.513" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3809"
         sodipodi:nodetypes="cc"
         d="M 123.149,119.917 C 123.725,122.148 130.1,128.082 131.813,128.95" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3811"
         sodipodi:nodetypes="cc"
         d="M 123.789,112.027 C 124.367,114.26 130.982,120.005 132.695,120.873" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3813"
         sodipodi:nodetypes="cc"
         d="M 122.787,104.805 C 123.894,106.827 130.623,110.879 132.495,111.3" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3815"
         sodipodi:nodetypes="cc"
         d="M 121.607,98.331 C 123.335,99.857 129,102.616 130.903,102.376" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3817"
         sodipodi:nodetypes="cc"
         d="M 120.216,92.687 C 121.944,94.213 127.743,97.239 129.645,96.999" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3819"
         sodipodi:nodetypes="cc"
         d="M 118.213,86.697 C 119.941,88.223 125.565,90.421 127.828,90.181" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3821"
         sodipodi:nodetypes="cc"
         d="M 115.618,80.036 C 117.347,81.562 123.118,83.679 125.021,83.439" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3823"
         sodipodi:nodetypes="cc"
         d="M 112.024,73.233 C 113.753,74.759 120.139,77.09 122.042,76.85" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3825"
         sodipodi:nodetypes="cc"
         d="M 108.368,66.827 C 110.095,68.353 116.91,70.764 118.813,70.524" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3827"
         sodipodi:nodetypes="cc"
         d="M 104.543,60.755 C 106.27,62.28 113.246,63.622 115.15,63.382" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3829"
         sodipodi:nodetypes="cc"
         d="M 100.857,54.657 C 102.585,56.183 109.346,57.071 111.248,56.83" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3831"
         sodipodi:nodetypes="cc"
         d="M 97.06,47.892 C 98.787,49.418 105.763,50.358 107.664,50.119" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3833"
         sodipodi:nodetypes="cc"
         d="M 93.733,41.704 C 95.461,43.23 102.435,44.116 104.338,43.876" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3835"
         sodipodi:nodetypes="cc"
         d="M 90.209,34.386 C 91.937,35.912 98.778,37.12 100.681,36.88" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3837"
         sodipodi:nodetypes="cc"
         d="M 87.694,27.138 C 89.423,28.664 96.183,29.899 98.086,29.659" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3839"
         sodipodi:nodetypes="cc"
         d="M 86.308,20.212 C 88.035,21.737 94.208,23.053 96.111,22.812" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3841"
         sodipodi:nodetypes="cc"
         d="M 85.924,13.729 C 87.652,15.255 92.755,16.275 94.658,16.035" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3843"
         sodipodi:nodetypes="cc"
         d="M 86.108,4.103 C 86.436,6.384 92.367,10.573 94.374,10.847" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3845"
         sodipodi:nodetypes="cc"
         d="M 87.185,-5.084 C 87.514,-2.803 92.508,1.948 94.301,2.409" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3847"
         sodipodi:nodetypes="cc"
         d="M 89.208,-13.609 C 89.537,-11.327 93.889,-6.39 95.494,-5.341" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3849"
         sodipodi:nodetypes="cc"
         d="M 91.5,-21.796 C 91.829,-19.515 96.155,-14.363 97.76,-13.314" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3851"
         sodipodi:nodetypes="cc"
         d="M 94.719,-29.432 C 95.047,-27.15 99.267,-22.186 100.872,-21.137" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3853"
         sodipodi:nodetypes="cc"
         d="M 98.791,-36.347 C 99.12,-34.065 102.698,-28.941 104.303,-27.891" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3855"
         sodipodi:nodetypes="cc"
         d="M 102.713,-42.226 C 103.042,-39.945 106.966,-35.622 108.571,-34.573" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3857"
         sodipodi:nodetypes="cc"
         d="M 107.306,-47.978 C 107.635,-45.697 111.158,-41.187 112.764,-40.138" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3859"
         sodipodi:nodetypes="cc"
         d="M 112.049,-54.197 C 112.377,-51.916 116.222,-47.138 117.828,-46.091" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3861"
         sodipodi:nodetypes="cc"
         d="M 116.575,-60.818 C 116.903,-58.536 120.829,-53.598 122.434,-52.55" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3863"
         sodipodi:nodetypes="cc"
         d="M 120.524,-67.311 C 120.852,-65.03 125.205,-59.851 126.81,-58.802" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3865"
         sodipodi:nodetypes="cc"
         d="M 125.545,-75.016 C 125.873,-72.734 129.183,-66.941 130.789,-65.892" />
    </g>
    <text
       xml:space="preserve"
       style="font-size:7.78418922px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
       x="5.4942575"
       y="34.796379"
       id="text6001"
       sodipodi:linespacing="89.999998%"><tspan
         sodipodi:role="line"
         id="tspan6003"
         x="5.4942575"
         y="34.796379">S 31?? 57'</tspan><tspan
         sodipodi:role="line"
         x="5.4942575"
         y="41.802151"
         id="tspan6005">E 115?? 51'</tspan></text>
  </g>
</svg>


--- NEW FILE gpscorrelate.spec ---
%define docdir_nv %{_docdir}/%{name}-%{version}

Name:           gpscorrelate
Version:        1.6.0
Release:        2%{?dist}
Summary:        A GPS photo correlation / geotagging tool

Group:          Applications/Productivity 
License:        GPLv2+
URL:            http://freefoote.dview.net/linux_gpscorr.html
Source0:        http://freefoote.dview.net/linux/gpscorrelate-%{version}.tar.gz
Source1:        gpscorrelate-gui.svg
Patch0:         gpscorrelate-1.6.0-icon.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  exiv2-devel libxml2-devel gtk2-devel
# For the .desktop file
BuildRequires:  desktop-file-utils
# For the manpage
BuildRequires:  libxslt docbook-style-xsl
# For: %{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
Requires: hicolor-icon-theme


%description
Gpscorrelate adds coordinates to the exif data of jpeg pictures based on a gpx
track file. The correlation is done by comparing the timestamp of the images
with the timestamp of the gps coordinates.


%prep
%setup -q
%patch0 -p1 -b .icon
cp -p %SOURCE1 gpscorrelate-gui.svg


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" OFLAGS="$RPM_OPT_FLAGS" docdir="%{docdir_nv}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} docdir="%{docdir_nv}"
make install-desktop-file DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} 


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING RELEASES doc/*.html doc/*.png
%{_bindir}/%{name}
%{_bindir}/%{name}-gui
%{_datadir}/applications/gpscorrelate.desktop
%{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
%{_mandir}/man1/gpscorrelate.1*


%changelog
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch

* Sun Apr 12 2009 Till Maas <opensource at till.name> - 1.6.0-1
- Update to new upstream release
- Add svg icon using public domain cliparts by najsbajs and Anonymous from
  Open Clip Art Library

* Sun Feb 15 2009 Till Maas <opensource at till.name> - 1.5.8-2
- add RELEASES to %%doc

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 1.5.8-1
- Update to new upstream version
- Remove upstreamed patches

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-2
- add extended manpage based on manpage from debian
- fix help text (--no-write is useful with --verbose, not --show)

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-1
- Update to new version, remove upstreamed patch
- add patch to remove some compiler warnings
- add patch to include desktop file install in makefile

* Wed Aug 13 2008 Till Maas <opensource at till.name> - 1.5.6-2
- add missing desktop file

* Sat Aug 02 2008 Till Maas <opensource at till.name> - 1.5.6-1
- initial version for Fedora


--- NEW FILE import.log ---
gpscorrelate-1_6_0-2_fc10:HEAD:gpscorrelate-1.6.0-2.fc10.src.rpm:1240063563


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:23:25 -0000	1.1
+++ .cvsignore	18 Apr 2009 14:10:56 -0000	1.2
@@ -0,0 +1 @@
+gpscorrelate-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:23:25 -0000	1.1
+++ sources	18 Apr 2009 14:10:56 -0000	1.2
@@ -0,0 +1 @@
+efb02f5f86f8598ac0bd7211a3c90b72  gpscorrelate-1.6.0.tar.gz



From till at fedoraproject.org  Sat Apr 18 14:18:56 2009
From: till at fedoraproject.org (Till Maas)
Date: Sat, 18 Apr 2009 14:18:56 +0000 (UTC)
Subject: rpms/gpscorrelate/F-11 gpscorrelate-1.6.0-icon.patch, NONE,
	1.1 gpscorrelate-gui.svg, NONE, 1.1 gpscorrelate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418141856.CC225700F7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/gpscorrelate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3609

Modified Files:
	.cvsignore sources 
Added Files:
	gpscorrelate-1.6.0-icon.patch gpscorrelate-gui.svg 
	gpscorrelate.spec 
Log Message:
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch


gpscorrelate-1.6.0-icon.patch:

--- NEW FILE gpscorrelate-1.6.0-icon.patch ---
diff -up gpscorrelate-1.6.0/Makefile.icon gpscorrelate-1.6.0/Makefile
--- gpscorrelate-1.6.0/Makefile.icon	2009-04-18 15:34:22.000000000 +0200
+++ gpscorrelate-1.6.0/Makefile	2009-04-18 15:33:58.000000000 +0200
@@ -10,9 +10,10 @@ OFLAGS   = -Wall
 override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 prefix   = /usr/local
 bindir   = $(prefix)/bin
-mandir   = $(prefix)/share/man
-docdir   = $(prefix)/share/doc/gpscorrelate
-applicationsdir = $(prefix)/share/applications
+datadir  = $(prefix)/share
+mandir   = $(datadir)/man
+docdir   = $(datadir)/doc/gpscorrelate
+applicationsdir = $(datadir)/applications
 
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
@@ -41,6 +42,7 @@ install: all
 
 install-desktop-file:
 	desktop-file-install --vendor="" --dir="$(DESTDIR)$(applicationsdir)" gpscorrelate.desktop
+	install -p -m0644 -D gpscorrelate-gui.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
 
 doc/gpscorrelate-manpage.xml: doc/gpscorrelate-manpage.xml.in
 	sed  's, at DOCDIR@,$(docdir),' $< > $@
diff -up gpscorrelate-1.6.0/gpscorrelate.desktop.icon gpscorrelate-1.6.0/gpscorrelate.desktop
--- gpscorrelate-1.6.0/gpscorrelate.desktop.icon	2008-10-31 12:50:39.000000000 +0100
+++ gpscorrelate-1.6.0/gpscorrelate.desktop	2009-04-18 15:34:11.000000000 +0200
@@ -8,3 +8,4 @@ TryExec=gpscorrelate-gui
 Exec=gpscorrelate-gui
 Terminal=false
 Categories=Graphics;ImageProcessing;Geography;GTK;
+Icon=gpscorrelate-gui


--- NEW FILE gpscorrelate-gui.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="45"
   height="45"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   version="1.0"
   inkscape:export-filename=""
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90"
   sodipodi:docname="gpscorrelate-gui.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5288"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.141655,0,0,1.141655,-96.08973,82.45606)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5274"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4522"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4512"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient3765"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       id="linearGradient2900">
      <stop
         style="stop-color:#96c813;stop-opacity:1;"
         offset="0"
         id="stop2902" />
      <stop
         style="stop-color:#46dbff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop2904" />
    </linearGradient>
    <linearGradient
       id="linearGradient3759">
      <stop
         style="stop-color:#b4b4b4;stop-opacity:1;"
         offset="0"
         id="stop3761" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop3763" />
    </linearGradient>
    <inkscape:perspective
       id="perspective2635"
       inkscape:persp3d-origin="276.03952 : 106.71186 : 1"
       inkscape:vp_z="552.07904 : 160.06779 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 160.06779 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2988"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <linearGradient
       id="linearGradient3270">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3272"
         offset="0" />
      <stop
         style="stop-color:#fffbfb;stop-opacity:1;"
         id="stop3278"
         offset="0.24074075" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3274"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient4052"
       inkscape:collect="always">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop4054"
         offset="0" />
      <stop
         style="stop-color:#000000;stop-opacity:0;"
         id="stop4056"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3919">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3921"
         offset="0" />
      <stop
         style="stop-color:#a1a1a1;stop-opacity:1;"
         id="stop3927"
         offset="0.5" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3923"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3891">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3893"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3895"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3882">
      <stop
         style="stop-color:#3a3a63;stop-opacity:1;"
         id="stop3884"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3887"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3874">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3876"
         offset="0" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1;"
         id="stop3878"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3864">
      <stop
         style="stop-color:#51519c;stop-opacity:1;"
         id="stop3866"
         offset="0" />
      <stop
         style="stop-color:#f3f3f9;stop-opacity:1;"
         id="stop3868"
[...3020 lines suppressed...]
           style="fill-opacity:0.24999994;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3749"
           d="M 254.15045,530.28944 C 254.15045,530.28944 266.82115,526.6052 266.30599,524.38507 C 265.26821,515.64399 245.99949,496.78141 240.07028,493.89724 C 216.72007,490.41706 279.45967,524.6958 254.15045,530.28944 z" />
        <path
           style="fill-opacity:0.23999999;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3751"
           d="M 242.73064,563.94624 C 242.73064,563.94624 256.28802,563.19999 256.79572,561.11932 C 257.30343,559.03865 255.52755,541.52322 247.12164,533.85331 C 228.63066,526.29105 266.58111,561.04494 242.73064,563.94624 z" />
      </g>
    </g>
    <path
       style="fill:url(#radialGradient6415);stroke:url(#linearGradient6417);stroke-width:0.21233647"
       id="path3787"
       d="M 16.70261,24.250037 L 4.1990199,28.10348 L 4.2293347,43.061323 L 41.742669,43.0569 L 41.724089,28.099096 L 29.210842,24.248563 L 16.70261,24.250037 z M 22.958926,25.985169 C 24.039233,25.985056 24.91382,26.257918 24.914185,26.592987 C 24.914552,26.928018 24.0407,27.199256 22.960394,27.199369 C 21.880331,27.19952 20.999755,26.928471 20.99939,26.59344 C 20.999023,26.258409 21.878742,25.985321 22.958926,25.985169 z" />
    <path
       style="fill:#ffcc66;stroke:url(#linearGradient6412);stroke-width:0.13399741;stroke-linecap:square"
       id="path3789"
       d="M 22.971884,25.458605 C 21.027136,25.458832 19.448237,25.948927 19.448969,26.552096 C 19.449825,27.155264 21.029947,27.643468 22.974695,27.643242 C 24.919442,27.643015 26.493453,27.154396 26.492596,26.551227 C 26.491864,25.948095 24.916508,25.458341 22.971884,25.458605 z M 22.972494,26.027799 C 23.902697,26.027685 24.657128,26.26302 24.657494,26.551453 C 24.657861,26.839961 23.904041,27.073897 22.973962,27.074049 C 22.043881,27.074162 21.284684,26.840339 21.284194,26.551906 C 21.283705,26.263398 22.042536,26.027875 22.972494,26.027799 z" />
    <g
       id="g3801"
       transform="matrix(0.1156696,-5.9479292e-3,1.9313485e-2,3.5622479e-2,6.0535132,22.503981)">
      <path
         style="fill:#985a11;stroke:#000000;stroke-width:0.85350001"
         id="path3803"
         sodipodi:nodetypes="cssssssssss"
         d="M 124.576,143.133 C 137.775,129.844 132.991,104.271 125.992,85.499 C 117.078,61.588 98.389,42.26 94.804,16.108 C 91.885,-5.176 100.46,-26.091 114.281,-41.842 C 123.456,-52.298 140.678,-76.523 129.841,-79.732 C 127.583,-80.4 114.301,-54.984 105.012,-44.885 C 89.537,-28.061 84.439,0.215 86.181,18.718 C 88.061,38.703 104.567,58.763 113.551,76.013 C 119.426,87.293 122.707,99.715 123.724,112.247 C 124.276,119.052 121.653,125.728 118.531,131.78 C 116.41,135.892 120.848,146.884 124.576,143.133 z" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3805"
         sodipodi:nodetypes="cc"
         d="M 118.415,131.872 C 118.991,134.102 125.209,139.851 126.916,140.717" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3807"
         sodipodi:nodetypes="cc"
         d="M 121.57,125.48 C 122.147,127.712 128.522,133.646 130.234,134.513" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3809"
         sodipodi:nodetypes="cc"
         d="M 123.149,119.917 C 123.725,122.148 130.1,128.082 131.813,128.95" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3811"
         sodipodi:nodetypes="cc"
         d="M 123.789,112.027 C 124.367,114.26 130.982,120.005 132.695,120.873" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3813"
         sodipodi:nodetypes="cc"
         d="M 122.787,104.805 C 123.894,106.827 130.623,110.879 132.495,111.3" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3815"
         sodipodi:nodetypes="cc"
         d="M 121.607,98.331 C 123.335,99.857 129,102.616 130.903,102.376" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3817"
         sodipodi:nodetypes="cc"
         d="M 120.216,92.687 C 121.944,94.213 127.743,97.239 129.645,96.999" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3819"
         sodipodi:nodetypes="cc"
         d="M 118.213,86.697 C 119.941,88.223 125.565,90.421 127.828,90.181" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3821"
         sodipodi:nodetypes="cc"
         d="M 115.618,80.036 C 117.347,81.562 123.118,83.679 125.021,83.439" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3823"
         sodipodi:nodetypes="cc"
         d="M 112.024,73.233 C 113.753,74.759 120.139,77.09 122.042,76.85" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3825"
         sodipodi:nodetypes="cc"
         d="M 108.368,66.827 C 110.095,68.353 116.91,70.764 118.813,70.524" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3827"
         sodipodi:nodetypes="cc"
         d="M 104.543,60.755 C 106.27,62.28 113.246,63.622 115.15,63.382" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3829"
         sodipodi:nodetypes="cc"
         d="M 100.857,54.657 C 102.585,56.183 109.346,57.071 111.248,56.83" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3831"
         sodipodi:nodetypes="cc"
         d="M 97.06,47.892 C 98.787,49.418 105.763,50.358 107.664,50.119" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3833"
         sodipodi:nodetypes="cc"
         d="M 93.733,41.704 C 95.461,43.23 102.435,44.116 104.338,43.876" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3835"
         sodipodi:nodetypes="cc"
         d="M 90.209,34.386 C 91.937,35.912 98.778,37.12 100.681,36.88" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3837"
         sodipodi:nodetypes="cc"
         d="M 87.694,27.138 C 89.423,28.664 96.183,29.899 98.086,29.659" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3839"
         sodipodi:nodetypes="cc"
         d="M 86.308,20.212 C 88.035,21.737 94.208,23.053 96.111,22.812" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3841"
         sodipodi:nodetypes="cc"
         d="M 85.924,13.729 C 87.652,15.255 92.755,16.275 94.658,16.035" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3843"
         sodipodi:nodetypes="cc"
         d="M 86.108,4.103 C 86.436,6.384 92.367,10.573 94.374,10.847" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3845"
         sodipodi:nodetypes="cc"
         d="M 87.185,-5.084 C 87.514,-2.803 92.508,1.948 94.301,2.409" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3847"
         sodipodi:nodetypes="cc"
         d="M 89.208,-13.609 C 89.537,-11.327 93.889,-6.39 95.494,-5.341" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3849"
         sodipodi:nodetypes="cc"
         d="M 91.5,-21.796 C 91.829,-19.515 96.155,-14.363 97.76,-13.314" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3851"
         sodipodi:nodetypes="cc"
         d="M 94.719,-29.432 C 95.047,-27.15 99.267,-22.186 100.872,-21.137" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3853"
         sodipodi:nodetypes="cc"
         d="M 98.791,-36.347 C 99.12,-34.065 102.698,-28.941 104.303,-27.891" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3855"
         sodipodi:nodetypes="cc"
         d="M 102.713,-42.226 C 103.042,-39.945 106.966,-35.622 108.571,-34.573" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3857"
         sodipodi:nodetypes="cc"
         d="M 107.306,-47.978 C 107.635,-45.697 111.158,-41.187 112.764,-40.138" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3859"
         sodipodi:nodetypes="cc"
         d="M 112.049,-54.197 C 112.377,-51.916 116.222,-47.138 117.828,-46.091" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3861"
         sodipodi:nodetypes="cc"
         d="M 116.575,-60.818 C 116.903,-58.536 120.829,-53.598 122.434,-52.55" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3863"
         sodipodi:nodetypes="cc"
         d="M 120.524,-67.311 C 120.852,-65.03 125.205,-59.851 126.81,-58.802" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3865"
         sodipodi:nodetypes="cc"
         d="M 125.545,-75.016 C 125.873,-72.734 129.183,-66.941 130.789,-65.892" />
    </g>
    <text
       xml:space="preserve"
       style="font-size:7.78418922px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
       x="5.4942575"
       y="34.796379"
       id="text6001"
       sodipodi:linespacing="89.999998%"><tspan
         sodipodi:role="line"
         id="tspan6003"
         x="5.4942575"
         y="34.796379">S 31?? 57'</tspan><tspan
         sodipodi:role="line"
         x="5.4942575"
         y="41.802151"
         id="tspan6005">E 115?? 51'</tspan></text>
  </g>
</svg>


--- NEW FILE gpscorrelate.spec ---
%define docdir_nv %{_docdir}/%{name}-%{version}

Name:           gpscorrelate
Version:        1.6.0
Release:        2%{?dist}
Summary:        A GPS photo correlation / geotagging tool

Group:          Applications/Productivity 
License:        GPLv2+
URL:            http://freefoote.dview.net/linux_gpscorr.html
Source0:        http://freefoote.dview.net/linux/gpscorrelate-%{version}.tar.gz
Source1:        gpscorrelate-gui.svg
Patch0:         gpscorrelate-1.6.0-icon.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  exiv2-devel libxml2-devel gtk2-devel
# For the .desktop file
BuildRequires:  desktop-file-utils
# For the manpage
BuildRequires:  libxslt docbook-style-xsl
# For: %{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
Requires: hicolor-icon-theme


%description
Gpscorrelate adds coordinates to the exif data of jpeg pictures based on a gpx
track file. The correlation is done by comparing the timestamp of the images
with the timestamp of the gps coordinates.


%prep
%setup -q
%patch0 -p1 -b .icon
cp -p %SOURCE1 gpscorrelate-gui.svg


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" OFLAGS="$RPM_OPT_FLAGS" docdir="%{docdir_nv}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} docdir="%{docdir_nv}"
make install-desktop-file DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} 


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING RELEASES doc/*.html doc/*.png
%{_bindir}/%{name}
%{_bindir}/%{name}-gui
%{_datadir}/applications/gpscorrelate.desktop
%{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
%{_mandir}/man1/gpscorrelate.1*


%changelog
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch

* Sun Apr 12 2009 Till Maas <opensource at till.name> - 1.6.0-1
- Update to new upstream release
- Add svg icon using public domain cliparts by najsbajs and Anonymous from
  Open Clip Art Library

* Sun Feb 15 2009 Till Maas <opensource at till.name> - 1.5.8-2
- add RELEASES to %%doc

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 1.5.8-1
- Update to new upstream version
- Remove upstreamed patches

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-2
- add extended manpage based on manpage from debian
- fix help text (--no-write is useful with --verbose, not --show)

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-1
- Update to new version, remove upstreamed patch
- add patch to remove some compiler warnings
- add patch to include desktop file install in makefile

* Wed Aug 13 2008 Till Maas <opensource at till.name> - 1.5.6-2
- add missing desktop file

* Sat Aug 02 2008 Till Maas <opensource at till.name> - 1.5.6-1
- initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:23:25 -0000	1.1
+++ .cvsignore	18 Apr 2009 14:18:26 -0000	1.2
@@ -0,0 +1 @@
+gpscorrelate-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:23:25 -0000	1.1
+++ sources	18 Apr 2009 14:18:26 -0000	1.2
@@ -0,0 +1 @@
+efb02f5f86f8598ac0bd7211a3c90b72  gpscorrelate-1.6.0.tar.gz



From till at fedoraproject.org  Sat Apr 18 14:19:59 2009
From: till at fedoraproject.org (Till Maas)
Date: Sat, 18 Apr 2009 14:19:59 +0000 (UTC)
Subject: rpms/gpscorrelate/F-10 gpscorrelate-1.6.0-icon.patch, NONE,
	1.1 gpscorrelate-gui.svg, NONE, 1.1 gpscorrelate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418141959.A5318700F7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/gpscorrelate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3829

Modified Files:
	.cvsignore sources 
Added Files:
	gpscorrelate-1.6.0-icon.patch gpscorrelate-gui.svg 
	gpscorrelate.spec 
Log Message:
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch


gpscorrelate-1.6.0-icon.patch:

--- NEW FILE gpscorrelate-1.6.0-icon.patch ---
diff -up gpscorrelate-1.6.0/Makefile.icon gpscorrelate-1.6.0/Makefile
--- gpscorrelate-1.6.0/Makefile.icon	2009-04-18 15:34:22.000000000 +0200
+++ gpscorrelate-1.6.0/Makefile	2009-04-18 15:33:58.000000000 +0200
@@ -10,9 +10,10 @@ OFLAGS   = -Wall
 override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 prefix   = /usr/local
 bindir   = $(prefix)/bin
-mandir   = $(prefix)/share/man
-docdir   = $(prefix)/share/doc/gpscorrelate
-applicationsdir = $(prefix)/share/applications
+datadir  = $(prefix)/share
+mandir   = $(datadir)/man
+docdir   = $(datadir)/doc/gpscorrelate
+applicationsdir = $(datadir)/applications
 
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
@@ -41,6 +42,7 @@ install: all
 
 install-desktop-file:
 	desktop-file-install --vendor="" --dir="$(DESTDIR)$(applicationsdir)" gpscorrelate.desktop
+	install -p -m0644 -D gpscorrelate-gui.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
 
 doc/gpscorrelate-manpage.xml: doc/gpscorrelate-manpage.xml.in
 	sed  's, at DOCDIR@,$(docdir),' $< > $@
diff -up gpscorrelate-1.6.0/gpscorrelate.desktop.icon gpscorrelate-1.6.0/gpscorrelate.desktop
--- gpscorrelate-1.6.0/gpscorrelate.desktop.icon	2008-10-31 12:50:39.000000000 +0100
+++ gpscorrelate-1.6.0/gpscorrelate.desktop	2009-04-18 15:34:11.000000000 +0200
@@ -8,3 +8,4 @@ TryExec=gpscorrelate-gui
 Exec=gpscorrelate-gui
 Terminal=false
 Categories=Graphics;ImageProcessing;Geography;GTK;
+Icon=gpscorrelate-gui


--- NEW FILE gpscorrelate-gui.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="45"
   height="45"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   version="1.0"
   inkscape:export-filename=""
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90"
   sodipodi:docname="gpscorrelate-gui.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5288"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.141655,0,0,1.141655,-96.08973,82.45606)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5274"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4522"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4512"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient3765"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       id="linearGradient2900">
      <stop
         style="stop-color:#96c813;stop-opacity:1;"
         offset="0"
         id="stop2902" />
      <stop
         style="stop-color:#46dbff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop2904" />
    </linearGradient>
    <linearGradient
       id="linearGradient3759">
      <stop
         style="stop-color:#b4b4b4;stop-opacity:1;"
         offset="0"
         id="stop3761" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop3763" />
    </linearGradient>
    <inkscape:perspective
       id="perspective2635"
       inkscape:persp3d-origin="276.03952 : 106.71186 : 1"
       inkscape:vp_z="552.07904 : 160.06779 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 160.06779 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2988"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <linearGradient
       id="linearGradient3270">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3272"
         offset="0" />
      <stop
         style="stop-color:#fffbfb;stop-opacity:1;"
         id="stop3278"
         offset="0.24074075" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3274"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient4052"
       inkscape:collect="always">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop4054"
         offset="0" />
      <stop
         style="stop-color:#000000;stop-opacity:0;"
         id="stop4056"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3919">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3921"
         offset="0" />
      <stop
         style="stop-color:#a1a1a1;stop-opacity:1;"
         id="stop3927"
         offset="0.5" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3923"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3891">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3893"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3895"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3882">
      <stop
         style="stop-color:#3a3a63;stop-opacity:1;"
         id="stop3884"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3887"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3874">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3876"
         offset="0" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1;"
         id="stop3878"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3864">
      <stop
         style="stop-color:#51519c;stop-opacity:1;"
         id="stop3866"
         offset="0" />
      <stop
         style="stop-color:#f3f3f9;stop-opacity:1;"
         id="stop3868"
[...3020 lines suppressed...]
           style="fill-opacity:0.24999994;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3749"
           d="M 254.15045,530.28944 C 254.15045,530.28944 266.82115,526.6052 266.30599,524.38507 C 265.26821,515.64399 245.99949,496.78141 240.07028,493.89724 C 216.72007,490.41706 279.45967,524.6958 254.15045,530.28944 z" />
        <path
           style="fill-opacity:0.23999999;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3751"
           d="M 242.73064,563.94624 C 242.73064,563.94624 256.28802,563.19999 256.79572,561.11932 C 257.30343,559.03865 255.52755,541.52322 247.12164,533.85331 C 228.63066,526.29105 266.58111,561.04494 242.73064,563.94624 z" />
      </g>
    </g>
    <path
       style="fill:url(#radialGradient6415);stroke:url(#linearGradient6417);stroke-width:0.21233647"
       id="path3787"
       d="M 16.70261,24.250037 L 4.1990199,28.10348 L 4.2293347,43.061323 L 41.742669,43.0569 L 41.724089,28.099096 L 29.210842,24.248563 L 16.70261,24.250037 z M 22.958926,25.985169 C 24.039233,25.985056 24.91382,26.257918 24.914185,26.592987 C 24.914552,26.928018 24.0407,27.199256 22.960394,27.199369 C 21.880331,27.19952 20.999755,26.928471 20.99939,26.59344 C 20.999023,26.258409 21.878742,25.985321 22.958926,25.985169 z" />
    <path
       style="fill:#ffcc66;stroke:url(#linearGradient6412);stroke-width:0.13399741;stroke-linecap:square"
       id="path3789"
       d="M 22.971884,25.458605 C 21.027136,25.458832 19.448237,25.948927 19.448969,26.552096 C 19.449825,27.155264 21.029947,27.643468 22.974695,27.643242 C 24.919442,27.643015 26.493453,27.154396 26.492596,26.551227 C 26.491864,25.948095 24.916508,25.458341 22.971884,25.458605 z M 22.972494,26.027799 C 23.902697,26.027685 24.657128,26.26302 24.657494,26.551453 C 24.657861,26.839961 23.904041,27.073897 22.973962,27.074049 C 22.043881,27.074162 21.284684,26.840339 21.284194,26.551906 C 21.283705,26.263398 22.042536,26.027875 22.972494,26.027799 z" />
    <g
       id="g3801"
       transform="matrix(0.1156696,-5.9479292e-3,1.9313485e-2,3.5622479e-2,6.0535132,22.503981)">
      <path
         style="fill:#985a11;stroke:#000000;stroke-width:0.85350001"
         id="path3803"
         sodipodi:nodetypes="cssssssssss"
         d="M 124.576,143.133 C 137.775,129.844 132.991,104.271 125.992,85.499 C 117.078,61.588 98.389,42.26 94.804,16.108 C 91.885,-5.176 100.46,-26.091 114.281,-41.842 C 123.456,-52.298 140.678,-76.523 129.841,-79.732 C 127.583,-80.4 114.301,-54.984 105.012,-44.885 C 89.537,-28.061 84.439,0.215 86.181,18.718 C 88.061,38.703 104.567,58.763 113.551,76.013 C 119.426,87.293 122.707,99.715 123.724,112.247 C 124.276,119.052 121.653,125.728 118.531,131.78 C 116.41,135.892 120.848,146.884 124.576,143.133 z" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3805"
         sodipodi:nodetypes="cc"
         d="M 118.415,131.872 C 118.991,134.102 125.209,139.851 126.916,140.717" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3807"
         sodipodi:nodetypes="cc"
         d="M 121.57,125.48 C 122.147,127.712 128.522,133.646 130.234,134.513" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3809"
         sodipodi:nodetypes="cc"
         d="M 123.149,119.917 C 123.725,122.148 130.1,128.082 131.813,128.95" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3811"
         sodipodi:nodetypes="cc"
         d="M 123.789,112.027 C 124.367,114.26 130.982,120.005 132.695,120.873" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3813"
         sodipodi:nodetypes="cc"
         d="M 122.787,104.805 C 123.894,106.827 130.623,110.879 132.495,111.3" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3815"
         sodipodi:nodetypes="cc"
         d="M 121.607,98.331 C 123.335,99.857 129,102.616 130.903,102.376" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3817"
         sodipodi:nodetypes="cc"
         d="M 120.216,92.687 C 121.944,94.213 127.743,97.239 129.645,96.999" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3819"
         sodipodi:nodetypes="cc"
         d="M 118.213,86.697 C 119.941,88.223 125.565,90.421 127.828,90.181" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3821"
         sodipodi:nodetypes="cc"
         d="M 115.618,80.036 C 117.347,81.562 123.118,83.679 125.021,83.439" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3823"
         sodipodi:nodetypes="cc"
         d="M 112.024,73.233 C 113.753,74.759 120.139,77.09 122.042,76.85" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3825"
         sodipodi:nodetypes="cc"
         d="M 108.368,66.827 C 110.095,68.353 116.91,70.764 118.813,70.524" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3827"
         sodipodi:nodetypes="cc"
         d="M 104.543,60.755 C 106.27,62.28 113.246,63.622 115.15,63.382" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3829"
         sodipodi:nodetypes="cc"
         d="M 100.857,54.657 C 102.585,56.183 109.346,57.071 111.248,56.83" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3831"
         sodipodi:nodetypes="cc"
         d="M 97.06,47.892 C 98.787,49.418 105.763,50.358 107.664,50.119" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3833"
         sodipodi:nodetypes="cc"
         d="M 93.733,41.704 C 95.461,43.23 102.435,44.116 104.338,43.876" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3835"
         sodipodi:nodetypes="cc"
         d="M 90.209,34.386 C 91.937,35.912 98.778,37.12 100.681,36.88" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3837"
         sodipodi:nodetypes="cc"
         d="M 87.694,27.138 C 89.423,28.664 96.183,29.899 98.086,29.659" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3839"
         sodipodi:nodetypes="cc"
         d="M 86.308,20.212 C 88.035,21.737 94.208,23.053 96.111,22.812" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3841"
         sodipodi:nodetypes="cc"
         d="M 85.924,13.729 C 87.652,15.255 92.755,16.275 94.658,16.035" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3843"
         sodipodi:nodetypes="cc"
         d="M 86.108,4.103 C 86.436,6.384 92.367,10.573 94.374,10.847" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3845"
         sodipodi:nodetypes="cc"
         d="M 87.185,-5.084 C 87.514,-2.803 92.508,1.948 94.301,2.409" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3847"
         sodipodi:nodetypes="cc"
         d="M 89.208,-13.609 C 89.537,-11.327 93.889,-6.39 95.494,-5.341" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3849"
         sodipodi:nodetypes="cc"
         d="M 91.5,-21.796 C 91.829,-19.515 96.155,-14.363 97.76,-13.314" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3851"
         sodipodi:nodetypes="cc"
         d="M 94.719,-29.432 C 95.047,-27.15 99.267,-22.186 100.872,-21.137" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3853"
         sodipodi:nodetypes="cc"
         d="M 98.791,-36.347 C 99.12,-34.065 102.698,-28.941 104.303,-27.891" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3855"
         sodipodi:nodetypes="cc"
         d="M 102.713,-42.226 C 103.042,-39.945 106.966,-35.622 108.571,-34.573" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3857"
         sodipodi:nodetypes="cc"
         d="M 107.306,-47.978 C 107.635,-45.697 111.158,-41.187 112.764,-40.138" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3859"
         sodipodi:nodetypes="cc"
         d="M 112.049,-54.197 C 112.377,-51.916 116.222,-47.138 117.828,-46.091" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3861"
         sodipodi:nodetypes="cc"
         d="M 116.575,-60.818 C 116.903,-58.536 120.829,-53.598 122.434,-52.55" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3863"
         sodipodi:nodetypes="cc"
         d="M 120.524,-67.311 C 120.852,-65.03 125.205,-59.851 126.81,-58.802" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3865"
         sodipodi:nodetypes="cc"
         d="M 125.545,-75.016 C 125.873,-72.734 129.183,-66.941 130.789,-65.892" />
    </g>
    <text
       xml:space="preserve"
       style="font-size:7.78418922px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
       x="5.4942575"
       y="34.796379"
       id="text6001"
       sodipodi:linespacing="89.999998%"><tspan
         sodipodi:role="line"
         id="tspan6003"
         x="5.4942575"
         y="34.796379">S 31?? 57'</tspan><tspan
         sodipodi:role="line"
         x="5.4942575"
         y="41.802151"
         id="tspan6005">E 115?? 51'</tspan></text>
  </g>
</svg>


--- NEW FILE gpscorrelate.spec ---
%define docdir_nv %{_docdir}/%{name}-%{version}

Name:           gpscorrelate
Version:        1.6.0
Release:        2%{?dist}
Summary:        A GPS photo correlation / geotagging tool

Group:          Applications/Productivity 
License:        GPLv2+
URL:            http://freefoote.dview.net/linux_gpscorr.html
Source0:        http://freefoote.dview.net/linux/gpscorrelate-%{version}.tar.gz
Source1:        gpscorrelate-gui.svg
Patch0:         gpscorrelate-1.6.0-icon.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  exiv2-devel libxml2-devel gtk2-devel
# For the .desktop file
BuildRequires:  desktop-file-utils
# For the manpage
BuildRequires:  libxslt docbook-style-xsl
# For: %{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
Requires: hicolor-icon-theme


%description
Gpscorrelate adds coordinates to the exif data of jpeg pictures based on a gpx
track file. The correlation is done by comparing the timestamp of the images
with the timestamp of the gps coordinates.


%prep
%setup -q
%patch0 -p1 -b .icon
cp -p %SOURCE1 gpscorrelate-gui.svg


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" OFLAGS="$RPM_OPT_FLAGS" docdir="%{docdir_nv}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} docdir="%{docdir_nv}"
make install-desktop-file DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} 


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING RELEASES doc/*.html doc/*.png
%{_bindir}/%{name}
%{_bindir}/%{name}-gui
%{_datadir}/applications/gpscorrelate.desktop
%{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
%{_mandir}/man1/gpscorrelate.1*


%changelog
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch

* Sun Apr 12 2009 Till Maas <opensource at till.name> - 1.6.0-1
- Update to new upstream release
- Add svg icon using public domain cliparts by najsbajs and Anonymous from
  Open Clip Art Library

* Sun Feb 15 2009 Till Maas <opensource at till.name> - 1.5.8-2
- add RELEASES to %%doc

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 1.5.8-1
- Update to new upstream version
- Remove upstreamed patches

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-2
- add extended manpage based on manpage from debian
- fix help text (--no-write is useful with --verbose, not --show)

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-1
- Update to new version, remove upstreamed patch
- add patch to remove some compiler warnings
- add patch to include desktop file install in makefile

* Wed Aug 13 2008 Till Maas <opensource at till.name> - 1.5.6-2
- add missing desktop file

* Sat Aug 02 2008 Till Maas <opensource at till.name> - 1.5.6-1
- initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:23:25 -0000	1.1
+++ .cvsignore	18 Apr 2009 14:19:28 -0000	1.2
@@ -0,0 +1 @@
+gpscorrelate-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:23:25 -0000	1.1
+++ sources	18 Apr 2009 14:19:29 -0000	1.2
@@ -0,0 +1 @@
+efb02f5f86f8598ac0bd7211a3c90b72  gpscorrelate-1.6.0.tar.gz



From till at fedoraproject.org  Sat Apr 18 14:21:52 2009
From: till at fedoraproject.org (Till Maas)
Date: Sat, 18 Apr 2009 14:21:52 +0000 (UTC)
Subject: rpms/gpscorrelate/F-9 gpscorrelate-1.6.0-icon.patch, NONE,
	1.1 gpscorrelate-gui.svg, NONE, 1.1 gpscorrelate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418142152.897AD700F7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/gpscorrelate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4225

Modified Files:
	.cvsignore sources 
Added Files:
	gpscorrelate-1.6.0-icon.patch gpscorrelate-gui.svg 
	gpscorrelate.spec 
Log Message:
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch


gpscorrelate-1.6.0-icon.patch:

--- NEW FILE gpscorrelate-1.6.0-icon.patch ---
diff -up gpscorrelate-1.6.0/Makefile.icon gpscorrelate-1.6.0/Makefile
--- gpscorrelate-1.6.0/Makefile.icon	2009-04-18 15:34:22.000000000 +0200
+++ gpscorrelate-1.6.0/Makefile	2009-04-18 15:33:58.000000000 +0200
@@ -10,9 +10,10 @@ OFLAGS   = -Wall
 override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 prefix   = /usr/local
 bindir   = $(prefix)/bin
-mandir   = $(prefix)/share/man
-docdir   = $(prefix)/share/doc/gpscorrelate
-applicationsdir = $(prefix)/share/applications
+datadir  = $(prefix)/share
+mandir   = $(datadir)/man
+docdir   = $(datadir)/doc/gpscorrelate
+applicationsdir = $(datadir)/applications
 
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
@@ -41,6 +42,7 @@ install: all
 
 install-desktop-file:
 	desktop-file-install --vendor="" --dir="$(DESTDIR)$(applicationsdir)" gpscorrelate.desktop
+	install -p -m0644 -D gpscorrelate-gui.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
 
 doc/gpscorrelate-manpage.xml: doc/gpscorrelate-manpage.xml.in
 	sed  's, at DOCDIR@,$(docdir),' $< > $@
diff -up gpscorrelate-1.6.0/gpscorrelate.desktop.icon gpscorrelate-1.6.0/gpscorrelate.desktop
--- gpscorrelate-1.6.0/gpscorrelate.desktop.icon	2008-10-31 12:50:39.000000000 +0100
+++ gpscorrelate-1.6.0/gpscorrelate.desktop	2009-04-18 15:34:11.000000000 +0200
@@ -8,3 +8,4 @@ TryExec=gpscorrelate-gui
 Exec=gpscorrelate-gui
 Terminal=false
 Categories=Graphics;ImageProcessing;Geography;GTK;
+Icon=gpscorrelate-gui


--- NEW FILE gpscorrelate-gui.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="45"
   height="45"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   version="1.0"
   inkscape:export-filename=""
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90"
   sodipodi:docname="gpscorrelate-gui.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5288"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.141655,0,0,1.141655,-96.08973,82.45606)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient5274"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4522"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-45.71429,-194.2857)" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient4512"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       y2="640.43622"
       y1="410.12143"
       xlink:href="#linearGradient3759"
       x2="681.07446"
       x1="36.152538"
       inkscape:collect="always"
       id="linearGradient3765"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       id="linearGradient2900">
      <stop
         style="stop-color:#96c813;stop-opacity:1;"
         offset="0"
         id="stop2902" />
      <stop
         style="stop-color:#46dbff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop2904" />
    </linearGradient>
    <linearGradient
       id="linearGradient3759">
      <stop
         style="stop-color:#b4b4b4;stop-opacity:1;"
         offset="0"
         id="stop3761" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop3763" />
    </linearGradient>
    <inkscape:perspective
       id="perspective2635"
       inkscape:persp3d-origin="276.03952 : 106.71186 : 1"
       inkscape:vp_z="552.07904 : 160.06779 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 160.06779 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2988"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <linearGradient
       id="linearGradient3270">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3272"
         offset="0" />
      <stop
         style="stop-color:#fffbfb;stop-opacity:1;"
         id="stop3278"
         offset="0.24074075" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3274"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient4052"
       inkscape:collect="always">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop4054"
         offset="0" />
      <stop
         style="stop-color:#000000;stop-opacity:0;"
         id="stop4056"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3919">
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3921"
         offset="0" />
      <stop
         style="stop-color:#a1a1a1;stop-opacity:1;"
         id="stop3927"
         offset="0.5" />
      <stop
         style="stop-color:#000000;stop-opacity:1;"
         id="stop3923"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3891">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3893"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3895"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3882">
      <stop
         style="stop-color:#3a3a63;stop-opacity:1;"
         id="stop3884"
         offset="0" />
      <stop
         style="stop-color:#babafd;stop-opacity:1;"
         id="stop3887"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3874">
      <stop
         style="stop-color:#454585;stop-opacity:1;"
         id="stop3876"
         offset="0" />
      <stop
         style="stop-color:#ffffff;stop-opacity:1;"
         id="stop3878"
         offset="1" />
    </linearGradient>
    <linearGradient
       id="linearGradient3864">
      <stop
         style="stop-color:#51519c;stop-opacity:1;"
         id="stop3866"
         offset="0" />
      <stop
         style="stop-color:#f3f3f9;stop-opacity:1;"
         id="stop3868"
[...3020 lines suppressed...]
           style="fill-opacity:0.24999994;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3749"
           d="M 254.15045,530.28944 C 254.15045,530.28944 266.82115,526.6052 266.30599,524.38507 C 265.26821,515.64399 245.99949,496.78141 240.07028,493.89724 C 216.72007,490.41706 279.45967,524.6958 254.15045,530.28944 z" />
        <path
           style="fill-opacity:0.23999999;fill-rule:evenodd;stroke-width:1pt"
           sodipodi:nodetypes="cccc"
           id="path3751"
           d="M 242.73064,563.94624 C 242.73064,563.94624 256.28802,563.19999 256.79572,561.11932 C 257.30343,559.03865 255.52755,541.52322 247.12164,533.85331 C 228.63066,526.29105 266.58111,561.04494 242.73064,563.94624 z" />
      </g>
    </g>
    <path
       style="fill:url(#radialGradient6415);stroke:url(#linearGradient6417);stroke-width:0.21233647"
       id="path3787"
       d="M 16.70261,24.250037 L 4.1990199,28.10348 L 4.2293347,43.061323 L 41.742669,43.0569 L 41.724089,28.099096 L 29.210842,24.248563 L 16.70261,24.250037 z M 22.958926,25.985169 C 24.039233,25.985056 24.91382,26.257918 24.914185,26.592987 C 24.914552,26.928018 24.0407,27.199256 22.960394,27.199369 C 21.880331,27.19952 20.999755,26.928471 20.99939,26.59344 C 20.999023,26.258409 21.878742,25.985321 22.958926,25.985169 z" />
    <path
       style="fill:#ffcc66;stroke:url(#linearGradient6412);stroke-width:0.13399741;stroke-linecap:square"
       id="path3789"
       d="M 22.971884,25.458605 C 21.027136,25.458832 19.448237,25.948927 19.448969,26.552096 C 19.449825,27.155264 21.029947,27.643468 22.974695,27.643242 C 24.919442,27.643015 26.493453,27.154396 26.492596,26.551227 C 26.491864,25.948095 24.916508,25.458341 22.971884,25.458605 z M 22.972494,26.027799 C 23.902697,26.027685 24.657128,26.26302 24.657494,26.551453 C 24.657861,26.839961 23.904041,27.073897 22.973962,27.074049 C 22.043881,27.074162 21.284684,26.840339 21.284194,26.551906 C 21.283705,26.263398 22.042536,26.027875 22.972494,26.027799 z" />
    <g
       id="g3801"
       transform="matrix(0.1156696,-5.9479292e-3,1.9313485e-2,3.5622479e-2,6.0535132,22.503981)">
      <path
         style="fill:#985a11;stroke:#000000;stroke-width:0.85350001"
         id="path3803"
         sodipodi:nodetypes="cssssssssss"
         d="M 124.576,143.133 C 137.775,129.844 132.991,104.271 125.992,85.499 C 117.078,61.588 98.389,42.26 94.804,16.108 C 91.885,-5.176 100.46,-26.091 114.281,-41.842 C 123.456,-52.298 140.678,-76.523 129.841,-79.732 C 127.583,-80.4 114.301,-54.984 105.012,-44.885 C 89.537,-28.061 84.439,0.215 86.181,18.718 C 88.061,38.703 104.567,58.763 113.551,76.013 C 119.426,87.293 122.707,99.715 123.724,112.247 C 124.276,119.052 121.653,125.728 118.531,131.78 C 116.41,135.892 120.848,146.884 124.576,143.133 z" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3805"
         sodipodi:nodetypes="cc"
         d="M 118.415,131.872 C 118.991,134.102 125.209,139.851 126.916,140.717" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3807"
         sodipodi:nodetypes="cc"
         d="M 121.57,125.48 C 122.147,127.712 128.522,133.646 130.234,134.513" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3809"
         sodipodi:nodetypes="cc"
         d="M 123.149,119.917 C 123.725,122.148 130.1,128.082 131.813,128.95" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3811"
         sodipodi:nodetypes="cc"
         d="M 123.789,112.027 C 124.367,114.26 130.982,120.005 132.695,120.873" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3813"
         sodipodi:nodetypes="cc"
         d="M 122.787,104.805 C 123.894,106.827 130.623,110.879 132.495,111.3" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3815"
         sodipodi:nodetypes="cc"
         d="M 121.607,98.331 C 123.335,99.857 129,102.616 130.903,102.376" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3817"
         sodipodi:nodetypes="cc"
         d="M 120.216,92.687 C 121.944,94.213 127.743,97.239 129.645,96.999" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3819"
         sodipodi:nodetypes="cc"
         d="M 118.213,86.697 C 119.941,88.223 125.565,90.421 127.828,90.181" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3821"
         sodipodi:nodetypes="cc"
         d="M 115.618,80.036 C 117.347,81.562 123.118,83.679 125.021,83.439" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3823"
         sodipodi:nodetypes="cc"
         d="M 112.024,73.233 C 113.753,74.759 120.139,77.09 122.042,76.85" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3825"
         sodipodi:nodetypes="cc"
         d="M 108.368,66.827 C 110.095,68.353 116.91,70.764 118.813,70.524" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3827"
         sodipodi:nodetypes="cc"
         d="M 104.543,60.755 C 106.27,62.28 113.246,63.622 115.15,63.382" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3829"
         sodipodi:nodetypes="cc"
         d="M 100.857,54.657 C 102.585,56.183 109.346,57.071 111.248,56.83" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3831"
         sodipodi:nodetypes="cc"
         d="M 97.06,47.892 C 98.787,49.418 105.763,50.358 107.664,50.119" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3833"
         sodipodi:nodetypes="cc"
         d="M 93.733,41.704 C 95.461,43.23 102.435,44.116 104.338,43.876" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3835"
         sodipodi:nodetypes="cc"
         d="M 90.209,34.386 C 91.937,35.912 98.778,37.12 100.681,36.88" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3837"
         sodipodi:nodetypes="cc"
         d="M 87.694,27.138 C 89.423,28.664 96.183,29.899 98.086,29.659" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3839"
         sodipodi:nodetypes="cc"
         d="M 86.308,20.212 C 88.035,21.737 94.208,23.053 96.111,22.812" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3841"
         sodipodi:nodetypes="cc"
         d="M 85.924,13.729 C 87.652,15.255 92.755,16.275 94.658,16.035" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3843"
         sodipodi:nodetypes="cc"
         d="M 86.108,4.103 C 86.436,6.384 92.367,10.573 94.374,10.847" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3845"
         sodipodi:nodetypes="cc"
         d="M 87.185,-5.084 C 87.514,-2.803 92.508,1.948 94.301,2.409" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3847"
         sodipodi:nodetypes="cc"
         d="M 89.208,-13.609 C 89.537,-11.327 93.889,-6.39 95.494,-5.341" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3849"
         sodipodi:nodetypes="cc"
         d="M 91.5,-21.796 C 91.829,-19.515 96.155,-14.363 97.76,-13.314" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3851"
         sodipodi:nodetypes="cc"
         d="M 94.719,-29.432 C 95.047,-27.15 99.267,-22.186 100.872,-21.137" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3853"
         sodipodi:nodetypes="cc"
         d="M 98.791,-36.347 C 99.12,-34.065 102.698,-28.941 104.303,-27.891" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3855"
         sodipodi:nodetypes="cc"
         d="M 102.713,-42.226 C 103.042,-39.945 106.966,-35.622 108.571,-34.573" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3857"
         sodipodi:nodetypes="cc"
         d="M 107.306,-47.978 C 107.635,-45.697 111.158,-41.187 112.764,-40.138" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3859"
         sodipodi:nodetypes="cc"
         d="M 112.049,-54.197 C 112.377,-51.916 116.222,-47.138 117.828,-46.091" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3861"
         sodipodi:nodetypes="cc"
         d="M 116.575,-60.818 C 116.903,-58.536 120.829,-53.598 122.434,-52.55" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3863"
         sodipodi:nodetypes="cc"
         d="M 120.524,-67.311 C 120.852,-65.03 125.205,-59.851 126.81,-58.802" />
      <path
         style="fill:none;stroke:#000000;stroke-width:0.77109998"
         id="path3865"
         sodipodi:nodetypes="cc"
         d="M 125.545,-75.016 C 125.873,-72.734 129.183,-66.941 130.789,-65.892" />
    </g>
    <text
       xml:space="preserve"
       style="font-size:7.78418922px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
       x="5.4942575"
       y="34.796379"
       id="text6001"
       sodipodi:linespacing="89.999998%"><tspan
         sodipodi:role="line"
         id="tspan6003"
         x="5.4942575"
         y="34.796379">S 31?? 57'</tspan><tspan
         sodipodi:role="line"
         x="5.4942575"
         y="41.802151"
         id="tspan6005">E 115?? 51'</tspan></text>
  </g>
</svg>


--- NEW FILE gpscorrelate.spec ---
%define docdir_nv %{_docdir}/%{name}-%{version}

Name:           gpscorrelate
Version:        1.6.0
Release:        2%{?dist}
Summary:        A GPS photo correlation / geotagging tool

Group:          Applications/Productivity 
License:        GPLv2+
URL:            http://freefoote.dview.net/linux_gpscorr.html
Source0:        http://freefoote.dview.net/linux/gpscorrelate-%{version}.tar.gz
Source1:        gpscorrelate-gui.svg
Patch0:         gpscorrelate-1.6.0-icon.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  exiv2-devel libxml2-devel gtk2-devel
# For the .desktop file
BuildRequires:  desktop-file-utils
# For the manpage
BuildRequires:  libxslt docbook-style-xsl
# For: %{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
Requires: hicolor-icon-theme


%description
Gpscorrelate adds coordinates to the exif data of jpeg pictures based on a gpx
track file. The correlation is done by comparing the timestamp of the images
with the timestamp of the gps coordinates.


%prep
%setup -q
%patch0 -p1 -b .icon
cp -p %SOURCE1 gpscorrelate-gui.svg


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" OFLAGS="$RPM_OPT_FLAGS" docdir="%{docdir_nv}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} docdir="%{docdir_nv}"
make install-desktop-file DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} 


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc COPYING RELEASES doc/*.html doc/*.png
%{_bindir}/%{name}
%{_bindir}/%{name}-gui
%{_datadir}/applications/gpscorrelate.desktop
%{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg
%{_mandir}/man1/gpscorrelate.1*


%changelog
* Sat Apr 18 2009 Till Maas <opensource at till.name> - 1.6.0-2
- Move icon installation into Makefile to get upstreamable patch

* Sun Apr 12 2009 Till Maas <opensource at till.name> - 1.6.0-1
- Update to new upstream release
- Add svg icon using public domain cliparts by najsbajs and Anonymous from
  Open Clip Art Library

* Sun Feb 15 2009 Till Maas <opensource at till.name> - 1.5.8-2
- add RELEASES to %%doc

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 1.5.8-1
- Update to new upstream version
- Remove upstreamed patches

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-2
- add extended manpage based on manpage from debian
- fix help text (--no-write is useful with --verbose, not --show)

* Thu Oct 30 2008 Till Maas <opensource at till.name> - 1.5.7-1
- Update to new version, remove upstreamed patch
- add patch to remove some compiler warnings
- add patch to include desktop file install in makefile

* Wed Aug 13 2008 Till Maas <opensource at till.name> - 1.5.6-2
- add missing desktop file

* Sat Aug 02 2008 Till Maas <opensource at till.name> - 1.5.6-1
- initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:23:25 -0000	1.1
+++ .cvsignore	18 Apr 2009 14:21:21 -0000	1.2
@@ -0,0 +1 @@
+gpscorrelate-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:23:25 -0000	1.1
+++ sources	18 Apr 2009 14:21:22 -0000	1.2
@@ -0,0 +1 @@
+efb02f5f86f8598ac0bd7211a3c90b72  gpscorrelate-1.6.0.tar.gz



From mjakubicek at fedoraproject.org  Sat Apr 18 14:23:28 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 18 Apr 2009 14:23:28 +0000 (UTC)
Subject: rpms/kdetv/devel kdetv.spec,1.9,1.10
Message-ID: <20090418142328.0520F700F7@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/kdetv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4556/devel

Modified Files:
	kdetv.spec 
Log Message:
- Fix FTBFS: BR kdebase-workspace-devel and look for KDE4 headers in %%{_incluedir}/kde4




Index: kdetv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetv/devel/kdetv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdetv.spec	25 Feb 2009 10:54:30 -0000	1.9
+++ kdetv.spec	18 Apr 2009 14:22:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kdetv
 Version:        0.8.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        KDE application for watching TV
 Group:          Applications/Multimedia
 # Licensing Notes:
@@ -18,6 +18,7 @@
 BuildRequires:  doxygen
 BuildRequires:  gettext
 BuildRequires:  kdelibs3-devel
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  libGL-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libxml2
@@ -44,7 +45,7 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure --disable-rpath --enable-kdetv-lirc --with-zvbi
+%configure --disable-rpath --enable-kdetv-lirc --with-zvbi --with-extra-includes=%{_includedir}/kde4
 make %{?_smp_mflags}
 
 
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.9-12
+- Fix FTBFS: BR kdebase-workspace-devel and look for KDE4 headers in %%{_incluedir}/kde4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -143,4 +147,4 @@
 - Added zvbi support
 
 * Sun Aug 27 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-1
-- Initial release
\ No newline at end of file
+- Initial release



From mjakubicek at fedoraproject.org  Sat Apr 18 14:23:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 18 Apr 2009 14:23:27 +0000 (UTC)
Subject: rpms/kdetv/F-11 kdetv.spec,1.9,1.10
Message-ID: <20090418142327.BEC35700F7@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/kdetv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4556/F-11

Modified Files:
	kdetv.spec 
Log Message:
- Fix FTBFS: BR kdebase-workspace-devel and look for KDE4 headers in %%{_incluedir}/kde4




Index: kdetv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetv/F-11/kdetv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdetv.spec	25 Feb 2009 10:54:30 -0000	1.9
+++ kdetv.spec	18 Apr 2009 14:22:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kdetv
 Version:        0.8.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        KDE application for watching TV
 Group:          Applications/Multimedia
 # Licensing Notes:
@@ -18,6 +18,7 @@
 BuildRequires:  doxygen
 BuildRequires:  gettext
 BuildRequires:  kdelibs3-devel
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  libGL-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libxml2
@@ -44,7 +45,7 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure --disable-rpath --enable-kdetv-lirc --with-zvbi
+%configure --disable-rpath --enable-kdetv-lirc --with-zvbi --with-extra-includes=%{_includedir}/kde4
 make %{?_smp_mflags}
 
 
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.9-12
+- Fix FTBFS: BR kdebase-workspace-devel and look for KDE4 headers in %%{_incluedir}/kde4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -143,4 +147,4 @@
 - Added zvbi support
 
 * Sun Aug 27 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-1
-- Initial release
\ No newline at end of file
+- Initial release



From rjones at fedoraproject.org  Sat Apr 18 14:29:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 18 Apr 2009 14:29:21 +0000 (UTC)
Subject: rpms/fakechroot/devel fakechroot-2.9-cmdsubst.patch, NONE,
	1.1 fakechroot.spec, 1.11, 1.12
Message-ID: <20090418142921.CA6C3700F7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/fakechroot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6139

Modified Files:
	fakechroot.spec 
Added Files:
	fakechroot-2.9-cmdsubst.patch 
Log Message:
FAKECHROOT_CMD_SUBST patch has now been accepted upstream.

fakechroot-2.9-cmdsubst.patch:

--- NEW FILE fakechroot-2.9-cmdsubst.patch ---
Index: test/cmd-subst-pwd.sh
===================================================================
--- test/cmd-subst-pwd.sh	(revision 0)
+++ test/cmd-subst-pwd.sh	(revision 0)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo substituted

Property changes on: test/cmd-subst-pwd.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: test/cmd-subst.t
===================================================================
--- test/cmd-subst.t	(revision 0)
+++ test/cmd-subst.t	(revision 0)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+. ./tap.sh
+
+plan 5
+
+rm -rf testtree
+
+./testtree.sh testtree
+test "`cat testtree/CHROOT`" = "testtree" || not
+ok "testtree"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "/" || not
+ok "fakechroot pwd is /"
+
+export FAKECHROOT_CMD_SUBST="/bin/pwd=$(pwd)/cmd-subst-pwd.sh"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "substituted" || not
+ok "fakechroot substituted pwd (1)"
+
+export FAKECHROOT_CMD_SUBST="/no/file=foo:/bin/pwd=$(pwd)/cmd-subst-pwd.sh"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "substituted" || not
+ok "fakechroot substituted pwd (2)"
+
+export FAKECHROOT_CMD_SUBST="/no/file=foo:/other/file=bar"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "/" || not
+ok "fakechroot not substituted pwd is /"
+
+rm -rf testtree
+
+end

Property changes on: test/cmd-subst.t
___________________________________________________________________
Added: svn:executable
   + *

Index: test/Makefile.am
===================================================================
--- test/Makefile.am	(revision 323)
+++ test/Makefile.am	(working copy)
@@ -1,6 +1,6 @@
 SUBDIRS = src
 
-TESTS = chroot.t escape-nested-chroot.t pwd.t touch.t
+TESTS = chroot.t cmd-subst.t escape-nested-chroot.t pwd.t touch.t
 
 suffix =
 
Index: src/libfakechroot.c
===================================================================
--- src/libfakechroot.c	(revision 323)
+++ src/libfakechroot.c	(working copy)
@@ -1467,7 +1467,38 @@
     return execve (path, argv, environ);
 }
 
+/* Parse the FAKECHROOT_CMD_SUBST environment variable (the first
+ * parameter) and if there is a match with filename, return the
+ * substitution in cmd_subst.  Returns non-zero if there was a match.
+ *
+ * FAKECHROOT_CMD_SUBST=cmd=subst:cmd=subst:...
+ */
+static int
+try_cmd_subst (char *env, const char *filename, char *cmd_subst)
+{
+    int len = strlen (filename), len2;
+    char *p;
 
+    if (env == NULL) return 0;
+
+    do {
+	p = strchrnul (env, ':');
+
+	if (strncmp (env, filename, len) == 0 && env[len] == '=') {
+	    len2 = p - &env[len+1];
+	    if (len2 >= FAKECHROOT_MAXPATH)
+		len2 = FAKECHROOT_MAXPATH - 1;
+	    strncpy (cmd_subst, &env[len+1], len2);
+	    cmd_subst[len2] = '\0';
+	    return 1;
+	}
+
+	env = p;
+    } while (*env++ != '\0');
+
+    return 0;
+}
+
 /* #include <unistd.h> */
 int execve (const char *filename, char *const argv [], char *const envp[])
 {
@@ -1479,32 +1510,16 @@
     char *env;
     char tmp[FAKECHROOT_MAXPATH], newfilename[FAKECHROOT_MAXPATH], argv0[FAKECHROOT_MAXPATH];
     char *ptr;
-    unsigned int i, j, n, len;
+    unsigned int i, j, n, len, r, newenvppos;
     size_t sizeenvp;
     char c;
     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
     char *envkey[] = { "FAKECHROOT", "FAKECHROOT_BASE",
                        "FAKECHROOT_VERSION", "FAKECHROOT_EXCLUDE_PATH",
+                       "FAKECHROOT_CMD_SUBST",
                        "LD_LIBRARY_PATH", "LD_PRELOAD" };
+    const int nr_envkey = sizeof envkey / sizeof envkey[0];
 
-    strncpy(argv0, filename, FAKECHROOT_MAXPATH);
-
-    expand_chroot_path(filename, fakechroot_path, fakechroot_ptr, fakechroot_buf);
-    strcpy(tmp, filename);
-    filename = tmp;
-
-    if ((file = open(filename, O_RDONLY)) == -1) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    i = read(file, hashbang, FAKECHROOT_MAXPATH-2);
-    close(file);
-    if (i == -1) {
-        errno = ENOENT;
-        return -1;
-    }
-
     if (next_execve == NULL) fakechroot_init();
 
     /* Scan envp and check its size */
@@ -1514,39 +1529,69 @@
     }
 
     /* Copy envp to newenvp */
-    newenvp = malloc( sizeenvp * sizeof (char *) + sizeof(envkey) );
+    newenvp = malloc( (sizeenvp + 1) * sizeof (char *) );
     if (newenvp == NULL) {
         errno = ENOMEM;
         return -1;
     }
-    for (ep = envp, i = 0; *ep != NULL; ++ep) {
-        for (j = 0; j < sizeof (envkey) / sizeof (char *); j++) {
+    for (ep = envp, newenvppos = 0; *ep != NULL; ++ep) {
+        for (j = 0; j < nr_envkey; j++) {
             len = strlen (envkey[j]);
             if (strncmp (*ep, envkey[j], len) == 0 && (*ep)[len] == '=')
                 goto skip;
         }
-        newenvp[i] = *ep;
-        i++;
+        newenvp[newenvppos] = *ep;
+        newenvppos++;
     skip: ;
     }
+    newenvp[newenvppos] = NULL;
 
+    strncpy(argv0, filename, FAKECHROOT_MAXPATH);
+
+    r = try_cmd_subst (getenv ("FAKECHROOT_CMD_SUBST"), filename, tmp);
+    if (r) {
+        filename = tmp;
+
+        /* FAKECHROOT_CMD_SUBST escapes the chroot.  newenvp here does
+         * not contain LD_PRELOAD and the other special environment
+         * variables.
+         */
+        return next_execve(filename, argv, newenvp);
+    }
+
+    expand_chroot_path(filename, fakechroot_path, fakechroot_ptr, fakechroot_buf);
+    strcpy(tmp, filename);
+    filename = tmp;
+
+    if ((file = open(filename, O_RDONLY)) == -1) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    i = read(file, hashbang, FAKECHROOT_MAXPATH-2);
+    close(file);
+    if (i == -1) {
+        errno = ENOENT;
+        return -1;
+    }
+
     /* Add our variables to newenvp */
-    newenvp = realloc( newenvp, i * sizeof(char *) + sizeof(envkey) );
+    newenvp = realloc( newenvp, (newenvppos + nr_envkey + 1) * sizeof(char *) );
     if (newenvp == NULL) {
         errno = ENOMEM;
         return -1;
     }
-    for (j = 0; j < sizeof(envkey) / sizeof(char *); j++) {
+    for (j = 0; j < nr_envkey; j++) {
         env = getenv(envkey[j]);
         if (env != NULL) {
-            newenvp[i] = malloc(strlen(envkey[j]) + strlen(env) + 3);
-            strcpy(newenvp[i], envkey[j]);
-            strcat(newenvp[i], "=");
-            strcat(newenvp[i], env);
-            i++;
+            newenvp[newenvppos] = malloc(strlen(envkey[j]) + strlen(env) + 3);
+            strcpy(newenvp[newenvppos], envkey[j]);
+            strcat(newenvp[newenvppos], "=");
+            strcat(newenvp[newenvppos], env);
+            newenvppos++;
         }
     }
-    newenvp[i] = NULL;
+    newenvp[newenvppos] = NULL;
 
     /* No hashbang in argv */
     if (hashbang[0] != '#' || hashbang[1] != '!')
Index: man/fakechroot.pod
===================================================================
--- man/fakechroot.pod	(revision 323)
+++ man/fakechroot.pod	(working copy)
@@ -139,6 +139,21 @@
 The list of directories which are excluded from being chrooted.  The elements
 of list are separated with colon.
 
+=item B<FAKECHROOT_CMD_SUBST>
+
+A list of command substitutions.  If a program tries to execute one of
+the commands given (path relative to the chroot) then the substitute
+command runs instead (path to substitute command is not chrooted).
+
+For example:
+
+ FAKECHROOT_CMD_SUBST=/sbin/ldconfig=/tmp/ldconfig-wrapper
+
+will substitute C</tmp/ldconfig-wrapper> for C</sbin/ldconfig>.
+
+Give as many substitute commands as you want, separated by C<:>
+(colon) characters.
+
 =item B<LD_LIBRARY_PATH>, B<LD_PRELOAD>
 
 Fakechroot is implemented by wrapping system calls.  This is accomplished by


Index: fakechroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakechroot/devel/fakechroot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fakechroot.spec	14 Apr 2009 20:45:28 -0000	1.11
+++ fakechroot.spec	18 Apr 2009 14:28:51 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
 Version: 2.9
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: LGPLv2+
 Group: Development/Tools
 URL: http://fakechroot.alioth.debian.org/
@@ -15,6 +15,11 @@
 # Fix build problems with recent glibc.  Sent upstream 20090414.
 Patch0: fakechroot-scandir.patch
 
+# Add FAKECHROOT_CMD_SUBST feature.
+# Sent upstream 20090413.  Accepted upstream 20090418.
+# This is a slightly modified patch to backport it to 2.9.
+Patch1: fakechroot-2.9-cmdsubst.patch
+
 %description
 fakechroot runs a command in an environment were is additionally
 possible to use the chroot(8) call without root privileges. This is
@@ -33,6 +38,8 @@
 %setup -q
 
 %patch0 -p0
+%patch1 -p0
+chmod +x test/cmd-subst.t
 
 # Patch0 updates autoconf, so rerun this:
 ./autogen.sh
@@ -48,7 +55,7 @@
 make install DESTDIR=%{buildroot}
 
 %check
-make check
+#make check
 
 %clean
 rm -rf %{buildroot}
@@ -65,6 +72,9 @@
 %{_libdir}/fakechroot/libfakechroot.so
 
 %changelog
+* Sat Apr 18 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-21
+- FAKECHROOT_CMD_SUBST patch has now been accepted upstream.
+
 * Tue Apr 14 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-20
 - Add fakechroot-scandir.patch to fix builds on Rawhide.
 



From robert at fedoraproject.org  Sat Apr 18 14:36:20 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 18 Apr 2009 14:36:20 +0000 (UTC)
Subject: rpms/arj/devel arj-3.10.22-custom-printf.patch, NONE, 1.1 arj.spec, 
	1.7, 1.8
Message-ID: <20090418143620.328AE700F7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6976

Modified Files:
	arj.spec 
Added Files:
	arj-3.10.22-custom-printf.patch 
Log Message:
Added patch to disable the custom printf to avoid conflicting
strnlen definition with glibc headers (thanks to Lubomir Rintel)


arj-3.10.22-custom-printf.patch:

--- NEW FILE arj-3.10.22-custom-printf.patch ---
Patch by Lubomir Rintel <lkundrak at v3.sk> for arj >= 3.10.22, which disables
the custom printf to avoid conflicting strnlen definition with the glibc
headers. By using custom printf (as in the past), we're completely loosing
all the _FORTIFY_SOURCE printf protections.

--- arj-3.10.22/fardata.c		2004-04-17 13:39:42.000000000 +0200
+++ arj-3.10.22/fardata.c.printf	2009-04-18 16:23:52.000000000 +0200
@@ -13,7 +13,6 @@
 /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp
    correctly */
 #if SFX_LEVEL>=ARJ
- #define CUSTOM_PRINTF
  #define CHUNK_SIZE               512    /* Size of the output block */
  #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */
 #endif


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/devel/arj.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- arj.spec	23 Feb 2009 20:32:10 -0000	1.7
+++ arj.spec	18 Apr 2009 14:35:49 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	Archiver for .arj files
 Name:		arj
 Version:	3.10.22
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL+
 Group:		Applications/Archiving
 URL:		http://arj.sourceforge.net/
@@ -11,6 +11,7 @@
 Source2:	unarj.1
 Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
 Patch1:		arj-3.10.22-missing-protos.patch
+Patch2:		arj-3.10.22-custom-printf.patch
 BuildRequires:	autoconf
 Provides:	unarj = %{version}-%{release}
 Obsoletes:	unarj < 3
@@ -26,6 +27,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
@@ -67,6 +69,10 @@
 %{_mandir}/man1/*arj*1.*
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-8
+- Added patch to disable the custom printf to avoid conflicting
+  strnlen definition with glibc headers (thanks to Lubomir Rintel)
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-7
 - Rebuild against gcc 4.4 and rpm 4.6
 



From rjones at fedoraproject.org  Sat Apr 18 14:38:20 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 18 Apr 2009 14:38:20 +0000 (UTC)
Subject: rpms/fakechroot/devel fakechroot-cmd-subst.patch, NONE,
	1.1 fakechroot.spec, 1.12, 1.13 fakechroot-2.9-cmdsubst.patch,
	1.1, NONE
Message-ID: <20090418143820.B1361700F7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/fakechroot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7392

Modified Files:
	fakechroot.spec 
Added Files:
	fakechroot-cmd-subst.patch 
Removed Files:
	fakechroot-2.9-cmdsubst.patch 
Log Message:
My stupid, wrong version of the patch.

fakechroot-cmd-subst.patch:

--- NEW FILE fakechroot-cmd-subst.patch ---
Index: test/t/cmd-subst-pwd.sh
===================================================================
--- test/t/cmd-subst-pwd.sh	(revision 0)
+++ test/t/cmd-subst-pwd.sh	(revision 0)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo substituted

Property changes on: test/t/cmd-subst-pwd.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: test/t/cmd-subst.t
===================================================================
--- test/t/cmd-subst.t	(revision 0)
+++ test/t/cmd-subst.t	(revision 0)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+. ./tap.sh
+
+plan 5
+
+rm -rf testtree
+
+./testtree.sh testtree
+test "`cat testtree/CHROOT`" = "testtree" || not
+ok "testtree"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "/" || not
+ok "fakechroot pwd is /"
+
+export FAKECHROOT_CMD_SUBST="/bin/pwd=$(pwd)/t/cmd-subst-pwd.sh"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "substituted" || not
+ok "fakechroot substituted pwd (1)"
+
+export FAKECHROOT_CMD_SUBST="/no/file=foo:/bin/pwd=$(pwd)/t/cmd-subst-pwd.sh"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "substituted" || not
+ok "fakechroot substituted pwd (2)"
+
+export FAKECHROOT_CMD_SUBST="/no/file=foo:/other/file=bar"
+
+t=`./fakechroot.sh testtree /bin/pwd`
+test "$t" = "/" || not
+ok "fakechroot not substituted pwd is /"
+
+rm -rf testtree
+
+end

Property changes on: test/t/cmd-subst.t
___________________________________________________________________
Added: svn:executable
   + *

Index: test/Makefile.am
===================================================================
--- test/Makefile.am	(revision 334)
+++ test/Makefile.am	(working copy)
@@ -2,6 +2,7 @@
 
 TESTS = \
     t/chroot.t \
+    t/cmd-subst.t \
     t/escape-nested-chroot.t \
     t/pwd.t \
     t/touch.t \
Index: src/libfakechroot.c
===================================================================
--- src/libfakechroot.c	(revision 334)
+++ src/libfakechroot.c	(working copy)
@@ -1467,7 +1467,38 @@
     return execve (path, argv, environ);
 }
 
+/* Parse the FAKECHROOT_CMD_SUBST environment variable (the first
+ * parameter) and if there is a match with filename, return the
+ * substitution in cmd_subst.  Returns non-zero if there was a match.
+ *
+ * FAKECHROOT_CMD_SUBST=cmd=subst:cmd=subst:...
+ */
+static int
+try_cmd_subst (char *env, const char *filename, char *cmd_subst)
+{
+    int len = strlen (filename), len2;
+    char *p;
 
+    if (env == NULL) return 0;
+
+    do {
+	p = strchrnul (env, ':');
+
+	if (strncmp (env, filename, len) == 0 && env[len] == '=') {
+	    len2 = p - &env[len+1];
+	    if (len2 >= FAKECHROOT_MAXPATH)
+		len2 = FAKECHROOT_MAXPATH - 1;
+	    strncpy (cmd_subst, &env[len+1], len2);
+	    cmd_subst[len2] = '\0';
+	    return 1;
+	}
+
+	env = p;
+    } while (*env++ != '\0');
+
+    return 0;
+}
+
 /* #include <unistd.h> */
 int execve (const char *filename, char *const argv [], char *const envp[])
 {
@@ -1479,32 +1510,16 @@
     char *env;
     char tmp[FAKECHROOT_MAXPATH], newfilename[FAKECHROOT_MAXPATH], argv0[FAKECHROOT_MAXPATH];
     char *ptr;
-    unsigned int i, j, n, len;
+    unsigned int i, j, n, len, r, newenvppos;
     size_t sizeenvp;
     char c;
     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
     char *envkey[] = { "FAKECHROOT", "FAKECHROOT_BASE",
                        "FAKECHROOT_VERSION", "FAKECHROOT_EXCLUDE_PATH",
+                       "FAKECHROOT_CMD_SUBST",
                        "LD_LIBRARY_PATH", "LD_PRELOAD" };
+    const int nr_envkey = sizeof envkey / sizeof envkey[0];
 
-    strncpy(argv0, filename, FAKECHROOT_MAXPATH);
-
-    expand_chroot_path(filename, fakechroot_path, fakechroot_ptr, fakechroot_buf);
-    strcpy(tmp, filename);
-    filename = tmp;
-
-    if ((file = open(filename, O_RDONLY)) == -1) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    i = read(file, hashbang, FAKECHROOT_MAXPATH-2);
-    close(file);
-    if (i == -1) {
-        errno = ENOENT;
-        return -1;
-    }
-
     if (next_execve == NULL) fakechroot_init();
 
     /* Scan envp and check its size */
@@ -1514,39 +1529,69 @@
     }
 
     /* Copy envp to newenvp */
-    newenvp = malloc( sizeenvp * sizeof (char *) + sizeof(envkey) );
+    newenvp = malloc( (sizeenvp + 1) * sizeof (char *) );
     if (newenvp == NULL) {
         errno = ENOMEM;
         return -1;
     }
-    for (ep = (char **)envp, i = 0; *ep != NULL; ++ep) {
-        for (j = 0; j < sizeof (envkey) / sizeof (char *); j++) {
+    for (ep = (char **) envp, newenvppos = 0; *ep != NULL; ++ep) {
+        for (j = 0; j < nr_envkey; j++) {
             len = strlen (envkey[j]);
             if (strncmp (*ep, envkey[j], len) == 0 && (*ep)[len] == '=')
                 goto skip;
         }
-        newenvp[i] = *ep;
-        i++;
+        newenvp[newenvppos] = *ep;
+        newenvppos++;
     skip: ;
     }
+    newenvp[newenvppos] = NULL;
 
+    strncpy(argv0, filename, FAKECHROOT_MAXPATH);
+
+    r = try_cmd_subst (getenv ("FAKECHROOT_CMD_SUBST"), filename, tmp);
+    if (r) {
+        filename = tmp;
+
+        /* FAKECHROOT_CMD_SUBST escapes the chroot.  newenvp here does
+         * not contain LD_PRELOAD and the other special environment
+         * variables.
+         */
+        return next_execve(filename, argv, newenvp);
+    }
+
+    expand_chroot_path(filename, fakechroot_path, fakechroot_ptr, fakechroot_buf);
+    strcpy(tmp, filename);
+    filename = tmp;
+
+    if ((file = open(filename, O_RDONLY)) == -1) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    i = read(file, hashbang, FAKECHROOT_MAXPATH-2);
+    close(file);
+    if (i == -1) {
+        errno = ENOENT;
+        return -1;
+    }
+
     /* Add our variables to newenvp */
-    newenvp = realloc( newenvp, i * sizeof(char *) + sizeof(envkey) );
+    newenvp = realloc( newenvp, (newenvppos + nr_envkey + 1) * sizeof(char *) );
     if (newenvp == NULL) {
         errno = ENOMEM;
         return -1;
     }
-    for (j = 0; j < sizeof(envkey) / sizeof(char *); j++) {
+    for (j = 0; j < nr_envkey; j++) {
         env = getenv(envkey[j]);
         if (env != NULL) {
-            newenvp[i] = malloc(strlen(envkey[j]) + strlen(env) + 3);
-            strcpy(newenvp[i], envkey[j]);
-            strcat(newenvp[i], "=");
-            strcat(newenvp[i], env);
-            i++;
+            newenvp[newenvppos] = malloc(strlen(envkey[j]) + strlen(env) + 3);
+            strcpy(newenvp[newenvppos], envkey[j]);
+            strcat(newenvp[newenvppos], "=");
+            strcat(newenvp[newenvppos], env);
+            newenvppos++;
         }
     }
-    newenvp[i] = NULL;
+    newenvp[newenvppos] = NULL;
 
     /* No hashbang in argv */
     if (hashbang[0] != '#' || hashbang[1] != '!')
Index: man/fakechroot.pod
===================================================================
--- man/fakechroot.pod	(revision 334)
+++ man/fakechroot.pod	(working copy)
@@ -139,6 +139,21 @@
 The list of directories which are excluded from being chrooted.  The elements
 of list are separated with colon.
 
+=item B<FAKECHROOT_CMD_SUBST>
+
+A list of command substitutions.  If a program tries to execute one of
+the commands given (path relative to the chroot) then the substitute
+command runs instead (path to substitute command is not chrooted).
+
+For example:
+
+ FAKECHROOT_CMD_SUBST=/sbin/ldconfig=/tmp/ldconfig-wrapper
+
+will substitute C</tmp/ldconfig-wrapper> for C</sbin/ldconfig>.
+
+Give as many substitute commands as you want, separated by C<:>
+(colon) characters.
+
 =item B<LD_LIBRARY_PATH>, B<LD_PRELOAD>
 
 Fakechroot is implemented by wrapping system calls.  This is accomplished by


Index: fakechroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakechroot/devel/fakechroot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fakechroot.spec	18 Apr 2009 14:28:51 -0000	1.12
+++ fakechroot.spec	18 Apr 2009 14:37:50 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
 Version: 2.9
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: LGPLv2+
 Group: Development/Tools
 URL: http://fakechroot.alioth.debian.org/
@@ -17,8 +17,7 @@
 
 # Add FAKECHROOT_CMD_SUBST feature.
 # Sent upstream 20090413.  Accepted upstream 20090418.
-# This is a slightly modified patch to backport it to 2.9.
-Patch1: fakechroot-2.9-cmdsubst.patch
+Patch1: fakechroot-cmd-subst.patch
 
 %description
 fakechroot runs a command in an environment were is additionally
@@ -39,7 +38,6 @@
 
 %patch0 -p0
 %patch1 -p0
-chmod +x test/cmd-subst.t
 
 # Patch0 updates autoconf, so rerun this:
 ./autogen.sh
@@ -72,7 +70,7 @@
 %{_libdir}/fakechroot/libfakechroot.so
 
 %changelog
-* Sat Apr 18 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-21
+* Sat Apr 18 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-22
 - FAKECHROOT_CMD_SUBST patch has now been accepted upstream.
 
 * Tue Apr 14 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-20


--- fakechroot-2.9-cmdsubst.patch DELETED ---



From caolanm at fedoraproject.org  Sat Apr 18 14:52:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 18 Apr 2009 14:52:20 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch, NONE,
	1.1 openoffice.org.spec, 1.1883, 1.1884
Message-ID: <20090418145220.3D5F7700F7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10194/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch 
Log Message:
Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors

openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch ---
diff -ru vcl.orig/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
--- vcl.orig/unx/gtk/app/gtkdata.cxx	2009-04-18 14:24:28.000000000 +0100
+++ vcl/unx/gtk/app/gtkdata.cxx	2009-04-18 15:37:36.000000000 +0100
@@ -126,6 +126,12 @@
     pDisp->screenSizeChanged( pScreen );
 }
 
+void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
+{
+    GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
+    pDisp->monitorsChanged( pScreen );
+}
+
 }
 
 GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
@@ -201,6 +207,31 @@
     }
 }
 
+void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
+{
+    if( pScreen )
+    {
+        int nScreen = gdk_screen_get_number( pScreen );
+        if( nScreen == m_nDefaultScreen ) //To-Do, make m_aXineramaScreens a per-screen thing ?
+        {
+            gint nMonitors = gdk_screen_get_n_monitors(pScreen);
+            m_aXineramaScreens = std::vector<Rectangle>();
+            for (gint i = 0; i < nMonitors; ++i)
+            {
+                GdkRectangle dest;
+                gdk_screen_get_monitor_geometry(pScreen, i, &dest);
+                m_aXineramaScreens.push_back( Rectangle( Point(dest.x,
+                    dest.y ), Size( dest.width, dest.height ) ) );
+            }
+            m_bXinerama = m_aXineramaScreens.size() > 1;
+        }
+        else
+        {
+            DBG_ERROR( "monitors for non-default screen changed, extend-me" );
+        }
+    }
+}
+
 void GtkSalDisplay::initScreen( int nScreen ) const
 {
     if( nScreen < 0 || nScreen >= static_cast<int>(m_aScreens.size()) )
@@ -626,7 +657,10 @@
     {
         GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
         if( pScreen )
+        {
             g_signal_connect( G_OBJECT(pScreen), "size-changed", G_CALLBACK(signalScreenSizeChanged), m_pGtkSalDisplay );
+            g_signal_connect( G_OBJECT(pScreen), "monitors-changed", G_CALLBACK(signalMonitorsChanged), m_pGtkSalDisplay );
+        }
     }
 }
 
diff -ru vcl.orig/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx
--- vcl.orig/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:24:28.000000000 +0100
+++ vcl/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:32:42.000000000 +0100
@@ -85,6 +85,7 @@
     void startupNotificationCompleted() { m_bStartupCompleted = true; }
     
     void screenSizeChanged( GdkScreen* );
+    void monitorsChanged( GdkScreen* );
 };
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1883
retrieving revision 1.1884
diff -u -r1.1883 -r1.1884
--- openoffice.org.spec	17 Apr 2009 15:06:39 -0000	1.1883
+++ openoffice.org.spec	18 Apr 2009 14:51:49 -0000	1.1884
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 10
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 %patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
 %patch64 -p1 -b .ooo101152.solenv.kn.patch
+%patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Apr 18 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
+- Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
+
 * Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.1
 - closing in on final
 



From caolanm at fedoraproject.org  Sat Apr 18 14:52:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 18 Apr 2009 14:52:20 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch, NONE,
	1.1 openoffice.org.spec, 1.1884, 1.1885
Message-ID: <20090418145220.7A111700F7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10194/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch 
Log Message:
Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors

openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch ---
diff -ru vcl.orig/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
--- vcl.orig/unx/gtk/app/gtkdata.cxx	2009-04-18 14:24:28.000000000 +0100
+++ vcl/unx/gtk/app/gtkdata.cxx	2009-04-18 15:37:36.000000000 +0100
@@ -126,6 +126,12 @@
     pDisp->screenSizeChanged( pScreen );
 }
 
+void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
+{
+    GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
+    pDisp->monitorsChanged( pScreen );
+}
+
 }
 
 GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
@@ -201,6 +207,31 @@
     }
 }
 
+void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
+{
+    if( pScreen )
+    {
+        int nScreen = gdk_screen_get_number( pScreen );
+        if( nScreen == m_nDefaultScreen ) //To-Do, make m_aXineramaScreens a per-screen thing ?
+        {
+            gint nMonitors = gdk_screen_get_n_monitors(pScreen);
+            m_aXineramaScreens = std::vector<Rectangle>();
+            for (gint i = 0; i < nMonitors; ++i)
+            {
+                GdkRectangle dest;
+                gdk_screen_get_monitor_geometry(pScreen, i, &dest);
+                m_aXineramaScreens.push_back( Rectangle( Point(dest.x,
+                    dest.y ), Size( dest.width, dest.height ) ) );
+            }
+            m_bXinerama = m_aXineramaScreens.size() > 1;
+        }
+        else
+        {
+            DBG_ERROR( "monitors for non-default screen changed, extend-me" );
+        }
+    }
+}
+
 void GtkSalDisplay::initScreen( int nScreen ) const
 {
     if( nScreen < 0 || nScreen >= static_cast<int>(m_aScreens.size()) )
@@ -626,7 +657,10 @@
     {
         GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
         if( pScreen )
+        {
             g_signal_connect( G_OBJECT(pScreen), "size-changed", G_CALLBACK(signalScreenSizeChanged), m_pGtkSalDisplay );
+            g_signal_connect( G_OBJECT(pScreen), "monitors-changed", G_CALLBACK(signalMonitorsChanged), m_pGtkSalDisplay );
+        }
     }
 }
 
diff -ru vcl.orig/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx
--- vcl.orig/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:24:28.000000000 +0100
+++ vcl/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:32:42.000000000 +0100
@@ -85,6 +85,7 @@
     void startupNotificationCompleted() { m_bStartupCompleted = true; }
     
     void screenSizeChanged( GdkScreen* );
+    void monitorsChanged( GdkScreen* );
 };
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1884
retrieving revision 1.1885
diff -u -r1.1884 -r1.1885
--- openoffice.org.spec	17 Apr 2009 15:00:44 -0000	1.1884
+++ openoffice.org.spec	18 Apr 2009 14:51:50 -0000	1.1885
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 10
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 %patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
 %patch64 -p1 -b .ooo101152.solenv.kn.patch
+%patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Apr 18 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
+- Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
+
 * Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.1
 - closing in on final
 



From pkgdb at fedoraproject.org  Sat Apr 18 15:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 15:35:38 +0000
Subject: [pkgdb] device-mapper-multipath: msnitzer has requested
	watchbugzilla
Message-ID: <20090418153538.5C14510F87B@bastion2.fedora.phx.redhat.com>

msnitzer has requested the watchbugzilla acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Sat Apr 18 15:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 15:35:52 +0000
Subject: [pkgdb] device-mapper-multipath: msnitzer has requested watchcommits
Message-ID: <20090418153552.17A9610F87F@bastion2.fedora.phx.redhat.com>

msnitzer has requested the watchcommits acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Sat Apr 18 15:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 15:35:57 +0000
Subject: [pkgdb] device-mapper-multipath: msnitzer has requested commit
Message-ID: <20090418153557.2443C10F87C@bastion2.fedora.phx.redhat.com>

msnitzer has requested the commit acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Sat Apr 18 15:38:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 15:38:18 +0000
Subject: [pkgdb] lvm2: msnitzer has requested watchbugzilla
Message-ID: <20090418153818.A978C10F87C@bastion2.fedora.phx.redhat.com>

msnitzer has requested the watchbugzilla acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Sat Apr 18 15:38:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 15:38:21 +0000
Subject: [pkgdb] lvm2: msnitzer has requested watchcommits
Message-ID: <20090418153822.0CE0510F881@bastion2.fedora.phx.redhat.com>

msnitzer has requested the watchcommits acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Sat Apr 18 15:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 15:38:30 +0000
Subject: [pkgdb] lvm2: msnitzer has requested commit
Message-ID: <20090418153830.9184610F884@bastion2.fedora.phx.redhat.com>

msnitzer has requested the commit acl on lvm2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From cebbert at fedoraproject.org  Sat Apr 18 17:40:28 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 18 Apr 2009 17:40:28 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic, 1.227, 1.228 kernel.spec, 1.1333, 
	1.1334
Message-ID: <20090418174029.0AEF3700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3641

Modified Files:
	config-generic kernel.spec 
Log Message:
Build in the rfkill and rfkill-input modules (#485322)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- config-generic	18 Apr 2009 04:15:33 -0000	1.227
+++ config-generic	18 Apr 2009 17:39:56 -0000	1.228
@@ -1126,8 +1126,8 @@
 # CONFIG_ATM_IA_DEBUG is not set
 # CONFIG_ATM_SOLOS is not set
 
-CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
 
 #
 # Ethernet (10 or 100Mbit)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1333
retrieving revision 1.1334
diff -u -r1.1333 -r1.1334
--- kernel.spec	18 Apr 2009 04:15:33 -0000	1.1333
+++ kernel.spec	18 Apr 2009 17:39:56 -0000	1.1334
@@ -1911,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-34
+- Build in the rfkill and rfkill-input modules (#485322)
+
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-33
 - Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
 



From cebbert at fedoraproject.org  Sat Apr 18 17:46:17 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 18 Apr 2009 17:46:17 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.276, 1.277 kernel.spec, 1.1560, 
	1.1561
Message-ID: <20090418174617.AAD4E700F7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4398

Modified Files:
	config-generic kernel.spec 
Log Message:
Build in the rfkill and rfkill-input modules (F10#485322)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- config-generic	18 Apr 2009 04:18:26 -0000	1.276
+++ config-generic	18 Apr 2009 17:45:46 -0000	1.277
@@ -1127,8 +1127,8 @@
 # CONFIG_ATM_IA_DEBUG is not set
 # CONFIG_ATM_SOLOS is not set
 
-CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
 
 #
 # Ethernet (10 or 100Mbit)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1560
retrieving revision 1.1561
diff -u -r1.1560 -r1.1561
--- kernel.spec	18 Apr 2009 04:18:26 -0000	1.1560
+++ kernel.spec	18 Apr 2009 17:45:46 -0000	1.1561
@@ -1972,6 +1972,9 @@
 
 %changelog
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
+- Build in the rfkill and rfkill-input modules (F10#485322)
+
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
 - Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
 
 * Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-97



From hubbitus at fedoraproject.org  Sat Apr 18 17:46:55 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 18 Apr 2009 17:46:55 +0000 (UTC)
Subject: rpms/dnsjava/devel dnsjava.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418174655.6C6FC700F7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4493/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dnsjava.spec import.log 
Log Message:
Initial importing dnsjava into Fedora.




--- NEW FILE dnsjava.spec ---
# Test of properly function library need DNS querys. It work perfectly on my machine and pass all tests.
# But internet access is not allowed from mock chroot. So, I need disable it by default. Yo may enable it if you want.
%define do_not_test 1

Name:		dnsjava
Version:		2.0.6
Release:		5%{?dist}
Summary:		Java DNS implementation
License:		BSD and MIT
URL:			http://www.dnsjava.org/
Source0:		http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
Group:		System Environment/Libraries
#Epoch:		0
#Vendor:		JPackage Project
#Distribution:	JPackage
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:	ant, jpackage-utils >= 0:1.5

BuildRequires:	java-devel >= 1.7
Requires:		java >= 1.7
Requires:		jpackage-utils
BuildArch:	noarch

# For tests
BuildRequires:	ant-junit


%description
dnsjava is an implementation of DNS in Java. It supports all of the common
record types and the DNSSEC types. It can be used for queries, zone transfers,
and dynamic updates. It includes a cache which can be used by clients, and a
minimal implementation of a server. It supports TSIG authenticated messages,
partial DNSSEC verification, and EDNS0.

dnsjava provides functionality above and beyond that of the InetAddress class.
Since it is written in pure Java, dnsjava is fully threadable, and in many
cases is faster than using InetAddress.

dnsjava provides both high and low level access to DNS. The high level
functions perform queries for records of a given name, type, and class, and
return an array of records. There is also a clone of InetAddress, which is
even simpler. A cache is used to reduce the number of DNS queries sent. The
low level functions allow direct manipulation of dns messages and records, as
well as allowing additional resolver properties to be set.

A 'dig' clone and a dynamic update program are included, as well as a
primary-only server.

%package		javadoc
Summary:		Javadoc for %{name}
Group:		Documentation

%description	javadoc
Javadoc for %{name}.

%prep
%setup -q
rm -rf doc/

iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp
touch -r Changelog Changelog.tmp
mv -f Changelog.tmp Changelog

%build
export CLASSPATH=%(build-classpath jce)
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean jar docs

%install
rm -rf %{buildroot}

# jars
mkdir -p %{buildroot}%{_javadir}
cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%if 0%{?do_not_test}
%check
export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
%endif

%files
%defattr(-,root,root,-)
%doc Changelog README USAGE examples.html *.java
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
- Continue review.
- As it can't be build by gcj, delete back this stuff from spec.
- Tests made now by conditional. As internet access is not allowed in default mock chroot, it is disabled now.
- Changelog recoded form iso8859-1 (charset is guessed by Orcan 'oget' Ogetbil)

* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-4
- Continue review.
- Delete explicit installation in %%install *.java files.
- License from BSD changed to "BSD and MIT"
- Delete unneeded BR: jce, java-javadoc
- Fix mistake: Add Requires: jpackage-utils and delete listed twice BuildRequires: jpackage-utils
- BR: java-devel >= 1.7, R: java >= 1.7

* Tue Apr 14 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-3
- Review in progress. Thanks to Orcan 'oget' Ogetbil.
- Add *.java examplees into documentation (it is mentioned in USAGE)
- Add testing:
	o Add BuildRequires: ant-junit
	o Add %%check section.
- Group from "Development/Libraries" changed to "System Environment/Libraries" by Orcan 'oget' Ogetbil suggestion.
- rm -rf doc/ in %%prep section.
- Removee listed twice Requires: jpackage-utils

* Mon Apr 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-2
- Issues from review:
	o Add
		. BuildRequires:	java-devel
		. BuildRequires:	jpackage-utils
		. Requires:		java >= specific_version
		. Requires:		jpackage-utils
	o Delete "%%define section free"
	o "%%defattr(0644,root,root,0755)" replaced by "%%defattr(-,root,root,-)" in both packages.
	o Add gcj-related stuff.
	o Remove Javadoc scriptlets

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-1
- Import src.rpm from JPackage - http://ftp.heanet.ie/pub/jpackage/1.6/generic/free/SRPMS/dnsjava-1.5.1-2jpp.src.rpm
- Step to last version 2.0.6
- Reformat spec with tabs.
- In Source0 tag inject %%{name} and %%{version} macroses.
- $RPM_BUILD_ROOT replaced by %%{buildroot}
- Delete (comment out) tags:
	o Epoch:		0
	o Vendor:		JPackage Project
	o Distribution:	JPackage
- Add %%{?dist} into relese instead of "jpp"
- Introduced by rpmlint:
	o Group Development/Libraries/Java changed to simple Development/Libraries
	o Licence changed to BSD
	o javadoc ackage group changed form Development/Documentation to simple Documentation

* Fri Aug 20 2004 Ralph Apel <r.ape at r-apel.de> 0:1.5.1-2jpp
- Build with ant-1.6.2

* Thu Jan 22 2004 David Walluck <david at anti-microsoft.org> 0:1.5.1-1jpp
- 1.5.1
- remove crosslink patch (merged upstream)

* Fri Oct 10 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4.3-1jpp
- Update to 1.4.3.
- Crosslink with local J2SE javadocs.
- Spec cleanups, save in UTF-8.

* Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.3.2-2jpp
- update for JPackage 1.5

* Wed Mar 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.2-1jpp
- Update to 1.3.2.
- Use ant instead of make for building.
- Drop patches, and include DNSSEC/JCE code.
- Use sed instead of bash 2 extension when symlinking jars during build.

* Sat May 11 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.4-1jpp
- updated by Ville Skytt?? <ville.skytta at iki.fi>
 - Updated to 1.2.4.
 - Fixed Vendor, Distribution and Group tags.
 - Updated description.
 - Versioned javadocs.
 - Added -no-debug and -no-jce patches.
 - Doesn't BuildRequire ant.

* Fri Dec 7 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-2jpp
- javadoc into javadoc package

* Fri Nov 2 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-1jpp
- first JPackage release


--- NEW FILE import.log ---
dnsjava-2_0_6-5_fc9:HEAD:dnsjava-2.0.6-5.fc9.src.rpm:1240076737


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:39:55 -0000	1.1
+++ .cvsignore	18 Apr 2009 17:46:25 -0000	1.2
@@ -0,0 +1 @@
+dnsjava-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:39:55 -0000	1.1
+++ sources	18 Apr 2009 17:46:25 -0000	1.2
@@ -0,0 +1 @@
+2e72319525f4d79359064ad46d38c4bd  dnsjava-2.0.6.tar.gz



From james at fedoraproject.org  Sat Apr 18 17:49:58 2009
From: james at fedoraproject.org (James Antill)
Date: Sat, 18 Apr 2009 17:49:58 +0000 (UTC)
Subject: rpms/createrepo/F-11 rawhide-fix.patch, NONE, 1.1 createrepo.spec, 
	1.62, 1.63
Message-ID: <20090418174958.AEF54700F7@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/createrepo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5018

Modified Files:
	createrepo.spec 
Added Files:
	rawhide-fix.patch 
Log Message:
* Sat Apr 18 2009 James Antill <james at fedoraproject.org> - 0.9.7-6
- add patch to fix size limit


rawhide-fix.patch:

--- NEW FILE rawhide-fix.patch ---
diff -ru createrepo-0.9.7/createrepo/__init__.py createrepo-0.9.7-fix/createrepo/__init__.py
--- createrepo-0.9.7/createrepo/__init__.py	2009-04-18 13:47:48.000000000 -0400
+++ createrepo-0.9.7-fix/createrepo/__init__.py	2009-04-18 13:47:33.000000000 -0400
@@ -640,7 +640,7 @@
                 fp = d + '/' + f
                 if int(os.stat(fp)[stat.ST_SIZE]) > self.conf.max_delta_rpm_size:
                     self.callback.log("Skipping %s package " \
-                                      "that is > max_delta_rpm_size"  % pkg)
+                                      "that is > max_delta_rpm_size"  % f)
                     continue
                 if not self._old_package_dict.has_key(d):
                     self._old_package_dict[d] = []
Only in createrepo-0.9.7-fix/createrepo: __init__.py~


Index: createrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/createrepo/F-11/createrepo.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- createrepo.spec	17 Apr 2009 18:59:59 -0000	1.62
+++ createrepo.spec	18 Apr 2009 17:49:28 -0000	1.63
@@ -9,6 +9,7 @@
 Source: %{name}-%{version}.tar.gz
 Patch0: ten-changelog-limit.patch
 Patch1: createrepo-head.patch
+Patch2: rawhide-fix.patch
 URL: http://createrepo.baseurl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -24,6 +25,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -46,6 +48,9 @@
 %{python_sitelib}/createrepo
 
 %changelog
+* Sat Apr 18 2009 James Antill <james at fedoraproject.org> - 0.9.7-6
+- add patch to fix size limit
+
 * Fri Apr 17 2009 Seth Vidal <skvidal at fedoraproject.org> - 0.9.7-5
 - add patch to make sure deltarpm creation doesn't obliterate our compose boxes
 



From hubbitus at fedoraproject.org  Sat Apr 18 17:50:39 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 18 Apr 2009 17:50:39 +0000 (UTC)
Subject: rpms/dnsjava/F-9 dnsjava.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418175039.8B09A700F7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5132/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	dnsjava.spec import.log 
Log Message:
Initial importing dnsjava into Fedora.




--- NEW FILE dnsjava.spec ---
# Test of properly function library need DNS querys. It work perfectly on my machine and pass all tests.
# But internet access is not allowed from mock chroot. So, I need disable it by default. Yo may enable it if you want.
%define do_not_test 1

Name:		dnsjava
Version:		2.0.6
Release:		5%{?dist}
Summary:		Java DNS implementation
License:		BSD and MIT
URL:			http://www.dnsjava.org/
Source0:		http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
Group:		System Environment/Libraries
#Epoch:		0
#Vendor:		JPackage Project
#Distribution:	JPackage
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:	ant, jpackage-utils >= 0:1.5

BuildRequires:	java-devel >= 1.7
Requires:		java >= 1.7
Requires:		jpackage-utils
BuildArch:	noarch

# For tests
BuildRequires:	ant-junit


%description
dnsjava is an implementation of DNS in Java. It supports all of the common
record types and the DNSSEC types. It can be used for queries, zone transfers,
and dynamic updates. It includes a cache which can be used by clients, and a
minimal implementation of a server. It supports TSIG authenticated messages,
partial DNSSEC verification, and EDNS0.

dnsjava provides functionality above and beyond that of the InetAddress class.
Since it is written in pure Java, dnsjava is fully threadable, and in many
cases is faster than using InetAddress.

dnsjava provides both high and low level access to DNS. The high level
functions perform queries for records of a given name, type, and class, and
return an array of records. There is also a clone of InetAddress, which is
even simpler. A cache is used to reduce the number of DNS queries sent. The
low level functions allow direct manipulation of dns messages and records, as
well as allowing additional resolver properties to be set.

A 'dig' clone and a dynamic update program are included, as well as a
primary-only server.

%package		javadoc
Summary:		Javadoc for %{name}
Group:		Documentation

%description	javadoc
Javadoc for %{name}.

%prep
%setup -q
rm -rf doc/

iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp
touch -r Changelog Changelog.tmp
mv -f Changelog.tmp Changelog

%build
export CLASSPATH=%(build-classpath jce)
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean jar docs

%install
rm -rf %{buildroot}

# jars
mkdir -p %{buildroot}%{_javadir}
cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%if 0%{?do_not_test}
%check
export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
%endif

%files
%defattr(-,root,root,-)
%doc Changelog README USAGE examples.html *.java
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
- Continue review.
- As it can't be build by gcj, delete back this stuff from spec.
- Tests made now by conditional. As internet access is not allowed in default mock chroot, it is disabled now.
- Changelog recoded form iso8859-1 (charset is guessed by Orcan 'oget' Ogetbil)

* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-4
- Continue review.
- Delete explicit installation in %%install *.java files.
- License from BSD changed to "BSD and MIT"
- Delete unneeded BR: jce, java-javadoc
- Fix mistake: Add Requires: jpackage-utils and delete listed twice BuildRequires: jpackage-utils
- BR: java-devel >= 1.7, R: java >= 1.7

* Tue Apr 14 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-3
- Review in progress. Thanks to Orcan 'oget' Ogetbil.
- Add *.java examplees into documentation (it is mentioned in USAGE)
- Add testing:
	o Add BuildRequires: ant-junit
	o Add %%check section.
- Group from "Development/Libraries" changed to "System Environment/Libraries" by Orcan 'oget' Ogetbil suggestion.
- rm -rf doc/ in %%prep section.
- Removee listed twice Requires: jpackage-utils

* Mon Apr 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-2
- Issues from review:
	o Add
		. BuildRequires:	java-devel
		. BuildRequires:	jpackage-utils
		. Requires:		java >= specific_version
		. Requires:		jpackage-utils
	o Delete "%%define section free"
	o "%%defattr(0644,root,root,0755)" replaced by "%%defattr(-,root,root,-)" in both packages.
	o Add gcj-related stuff.
	o Remove Javadoc scriptlets

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-1
- Import src.rpm from JPackage - http://ftp.heanet.ie/pub/jpackage/1.6/generic/free/SRPMS/dnsjava-1.5.1-2jpp.src.rpm
- Step to last version 2.0.6
- Reformat spec with tabs.
- In Source0 tag inject %%{name} and %%{version} macroses.
- $RPM_BUILD_ROOT replaced by %%{buildroot}
- Delete (comment out) tags:
	o Epoch:		0
	o Vendor:		JPackage Project
	o Distribution:	JPackage
- Add %%{?dist} into relese instead of "jpp"
- Introduced by rpmlint:
	o Group Development/Libraries/Java changed to simple Development/Libraries
	o Licence changed to BSD
	o javadoc ackage group changed form Development/Documentation to simple Documentation

* Fri Aug 20 2004 Ralph Apel <r.ape at r-apel.de> 0:1.5.1-2jpp
- Build with ant-1.6.2

* Thu Jan 22 2004 David Walluck <david at anti-microsoft.org> 0:1.5.1-1jpp
- 1.5.1
- remove crosslink patch (merged upstream)

* Fri Oct 10 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4.3-1jpp
- Update to 1.4.3.
- Crosslink with local J2SE javadocs.
- Spec cleanups, save in UTF-8.

* Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.3.2-2jpp
- update for JPackage 1.5

* Wed Mar 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.2-1jpp
- Update to 1.3.2.
- Use ant instead of make for building.
- Drop patches, and include DNSSEC/JCE code.
- Use sed instead of bash 2 extension when symlinking jars during build.

* Sat May 11 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.4-1jpp
- updated by Ville Skytt?? <ville.skytta at iki.fi>
 - Updated to 1.2.4.
 - Fixed Vendor, Distribution and Group tags.
 - Updated description.
 - Versioned javadocs.
 - Added -no-debug and -no-jce patches.
 - Doesn't BuildRequire ant.

* Fri Dec 7 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-2jpp
- javadoc into javadoc package

* Fri Nov 2 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-1jpp
- first JPackage release


--- NEW FILE import.log ---
dnsjava-2_0_6-5_fc9:F-9:dnsjava-2.0.6-5.fc9.src.rpm:1240076934


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:39:55 -0000	1.1
+++ .cvsignore	18 Apr 2009 17:50:08 -0000	1.2
@@ -0,0 +1 @@
+dnsjava-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:39:55 -0000	1.1
+++ sources	18 Apr 2009 17:50:09 -0000	1.2
@@ -0,0 +1 @@
+2e72319525f4d79359064ad46d38c4bd  dnsjava-2.0.6.tar.gz



From james at fedoraproject.org  Sat Apr 18 17:50:57 2009
From: james at fedoraproject.org (James Antill)
Date: Sat, 18 Apr 2009 17:50:57 +0000 (UTC)
Subject: rpms/createrepo/F-11 createrepo.spec,1.63,1.64
Message-ID: <20090418175057.CADD0700F7@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/createrepo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5263

Modified Files:
	createrepo.spec 
Log Message:
* Sat Apr 18 2009 James Antill <james at fedoraproject.org> - 0.9.7-6
- add patch to fix size limit



Index: createrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/createrepo/F-11/createrepo.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- createrepo.spec	18 Apr 2009 17:49:28 -0000	1.63
+++ createrepo.spec	18 Apr 2009 17:50:27 -0000	1.64
@@ -3,7 +3,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.9.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz



From pkgdb at fedoraproject.org  Sat Apr 18 18:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:25:29 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested watchbugzilla
Message-ID: <20090418182530.087C610F85A@bastion2.fedora.phx.redhat.com>

sailer has requested the watchbugzilla acl on mingw32-gtk2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:25:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:25:32 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested commit
Message-ID: <20090418182532.66C0F10F87E@bastion2.fedora.phx.redhat.com>

sailer has requested the commit acl on mingw32-gtk2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:25:36 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested watchcommits
Message-ID: <20090418182536.F0EB810F882@bastion2.fedora.phx.redhat.com>

sailer has requested the watchcommits acl on mingw32-gtk2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:25:42 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested approveacls
Message-ID: <20090418182542.9B28210F884@bastion2.fedora.phx.redhat.com>

sailer has requested the approveacls acl on mingw32-gtk2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:29:00 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested watchcommits
Message-ID: <20090418182900.B968410F85A@bastion2.fedora.phx.redhat.com>

sailer has requested the watchcommits acl on mingw32-gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:29:01 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested watchbugzilla
Message-ID: <20090418182901.1B7A410F87E@bastion2.fedora.phx.redhat.com>

sailer has requested the watchbugzilla acl on mingw32-gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:29:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:29:02 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested approveacls
Message-ID: <20090418182902.E50AC10F882@bastion2.fedora.phx.redhat.com>

sailer has requested the approveacls acl on mingw32-gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:29:06 +0000
Subject: [pkgdb] mingw32-gtk2: sailer has requested commit
Message-ID: <20090418182906.6BF7D10F886@bastion2.fedora.phx.redhat.com>

sailer has requested the commit acl on mingw32-gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 18:44:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:44:00 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090418184400.913D110F85A@bastion2.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on device-mapper-multipath (Fedora devel) to Approved for msnitzer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Sat Apr 18 18:44:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:44:07 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090418184407.1ED8010F880@bastion2.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on device-mapper-multipath (Fedora devel) to Approved for msnitzer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Sat Apr 18 18:44:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:44:12 +0000
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <20090418184412.22E7C10F886@bastion2.fedora.phx.redhat.com>

mbroz has set the commit acl on device-mapper-multipath (Fedora devel) to Approved for msnitzer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Sat Apr 18 18:44:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:44:44 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20090418184444.C294910F87D@bastion2.fedora.phx.redhat.com>

mbroz has set the watchbugzilla acl on lvm2 (Fedora devel) to Approved for msnitzer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From pkgdb at fedoraproject.org  Sat Apr 18 18:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:44:49 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20090418184449.9BAAD10F882@bastion2.fedora.phx.redhat.com>

mbroz has set the watchcommits acl on lvm2 (Fedora devel) to Approved for msnitzer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From hubbitus at fedoraproject.org  Sat Apr 18 18:44:50 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 18 Apr 2009 18:44:50 +0000 (UTC)
Subject: rpms/dnsjava/F-10 dnsjava.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418184450.B5195700F7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11078/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	dnsjava.spec import.log 
Log Message:
Initial importing dnsjava into Fedora.




--- NEW FILE dnsjava.spec ---
# Test of properly function library need DNS querys. It work perfectly on my machine and pass all tests.
# But internet access is not allowed from mock chroot. So, I need disable it by default. Yo may enable it if you want.
%define do_not_test 1

Name:		dnsjava
Version:		2.0.6
Release:		5%{?dist}
Summary:		Java DNS implementation
License:		BSD and MIT
URL:			http://www.dnsjava.org/
Source0:		http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
Group:		System Environment/Libraries
#Epoch:		0
#Vendor:		JPackage Project
#Distribution:	JPackage
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:	ant, jpackage-utils >= 0:1.5

BuildRequires:	java-devel >= 1.7
Requires:		java >= 1.7
Requires:		jpackage-utils
BuildArch:	noarch

# For tests
BuildRequires:	ant-junit


%description
dnsjava is an implementation of DNS in Java. It supports all of the common
record types and the DNSSEC types. It can be used for queries, zone transfers,
and dynamic updates. It includes a cache which can be used by clients, and a
minimal implementation of a server. It supports TSIG authenticated messages,
partial DNSSEC verification, and EDNS0.

dnsjava provides functionality above and beyond that of the InetAddress class.
Since it is written in pure Java, dnsjava is fully threadable, and in many
cases is faster than using InetAddress.

dnsjava provides both high and low level access to DNS. The high level
functions perform queries for records of a given name, type, and class, and
return an array of records. There is also a clone of InetAddress, which is
even simpler. A cache is used to reduce the number of DNS queries sent. The
low level functions allow direct manipulation of dns messages and records, as
well as allowing additional resolver properties to be set.

A 'dig' clone and a dynamic update program are included, as well as a
primary-only server.

%package		javadoc
Summary:		Javadoc for %{name}
Group:		Documentation

%description	javadoc
Javadoc for %{name}.

%prep
%setup -q
rm -rf doc/

iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp
touch -r Changelog Changelog.tmp
mv -f Changelog.tmp Changelog

%build
export CLASSPATH=%(build-classpath jce)
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean jar docs

%install
rm -rf %{buildroot}

# jars
mkdir -p %{buildroot}%{_javadir}
cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%if 0%{?do_not_test}
%check
export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
%endif

%files
%defattr(-,root,root,-)
%doc Changelog README USAGE examples.html *.java
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
- Continue review.
- As it can't be build by gcj, delete back this stuff from spec.
- Tests made now by conditional. As internet access is not allowed in default mock chroot, it is disabled now.
- Changelog recoded form iso8859-1 (charset is guessed by Orcan 'oget' Ogetbil)

* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-4
- Continue review.
- Delete explicit installation in %%install *.java files.
- License from BSD changed to "BSD and MIT"
- Delete unneeded BR: jce, java-javadoc
- Fix mistake: Add Requires: jpackage-utils and delete listed twice BuildRequires: jpackage-utils
- BR: java-devel >= 1.7, R: java >= 1.7

* Tue Apr 14 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-3
- Review in progress. Thanks to Orcan 'oget' Ogetbil.
- Add *.java examplees into documentation (it is mentioned in USAGE)
- Add testing:
	o Add BuildRequires: ant-junit
	o Add %%check section.
- Group from "Development/Libraries" changed to "System Environment/Libraries" by Orcan 'oget' Ogetbil suggestion.
- rm -rf doc/ in %%prep section.
- Removee listed twice Requires: jpackage-utils

* Mon Apr 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-2
- Issues from review:
	o Add
		. BuildRequires:	java-devel
		. BuildRequires:	jpackage-utils
		. Requires:		java >= specific_version
		. Requires:		jpackage-utils
	o Delete "%%define section free"
	o "%%defattr(0644,root,root,0755)" replaced by "%%defattr(-,root,root,-)" in both packages.
	o Add gcj-related stuff.
	o Remove Javadoc scriptlets

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-1
- Import src.rpm from JPackage - http://ftp.heanet.ie/pub/jpackage/1.6/generic/free/SRPMS/dnsjava-1.5.1-2jpp.src.rpm
- Step to last version 2.0.6
- Reformat spec with tabs.
- In Source0 tag inject %%{name} and %%{version} macroses.
- $RPM_BUILD_ROOT replaced by %%{buildroot}
- Delete (comment out) tags:
	o Epoch:		0
	o Vendor:		JPackage Project
	o Distribution:	JPackage
- Add %%{?dist} into relese instead of "jpp"
- Introduced by rpmlint:
	o Group Development/Libraries/Java changed to simple Development/Libraries
	o Licence changed to BSD
	o javadoc ackage group changed form Development/Documentation to simple Documentation

* Fri Aug 20 2004 Ralph Apel <r.ape at r-apel.de> 0:1.5.1-2jpp
- Build with ant-1.6.2

* Thu Jan 22 2004 David Walluck <david at anti-microsoft.org> 0:1.5.1-1jpp
- 1.5.1
- remove crosslink patch (merged upstream)

* Fri Oct 10 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4.3-1jpp
- Update to 1.4.3.
- Crosslink with local J2SE javadocs.
- Spec cleanups, save in UTF-8.

* Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.3.2-2jpp
- update for JPackage 1.5

* Wed Mar 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.2-1jpp
- Update to 1.3.2.
- Use ant instead of make for building.
- Drop patches, and include DNSSEC/JCE code.
- Use sed instead of bash 2 extension when symlinking jars during build.

* Sat May 11 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.4-1jpp
- updated by Ville Skytt?? <ville.skytta at iki.fi>
 - Updated to 1.2.4.
 - Fixed Vendor, Distribution and Group tags.
 - Updated description.
 - Versioned javadocs.
 - Added -no-debug and -no-jce patches.
 - Doesn't BuildRequire ant.

* Fri Dec 7 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-2jpp
- javadoc into javadoc package

* Fri Nov 2 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-1jpp
- first JPackage release


--- NEW FILE import.log ---
dnsjava-2_0_6-5_fc9:F-10:dnsjava-2.0.6-5.fc9.src.rpm:1240079996


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:39:55 -0000	1.1
+++ .cvsignore	18 Apr 2009 18:44:20 -0000	1.2
@@ -0,0 +1 @@
+dnsjava-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:39:55 -0000	1.1
+++ sources	18 Apr 2009 18:44:20 -0000	1.2
@@ -0,0 +1 @@
+2e72319525f4d79359064ad46d38c4bd  dnsjava-2.0.6.tar.gz



From pkgdb at fedoraproject.org  Sat Apr 18 18:44:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 18:44:53 +0000
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <20090418184453.E672710F888@bastion2.fedora.phx.redhat.com>

mbroz has set the commit acl on lvm2 (Fedora devel) to Approved for msnitzer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From hubbitus at fedoraproject.org  Sat Apr 18 18:51:54 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 18 Apr 2009 18:51:54 +0000 (UTC)
Subject: rpms/dnsjava/F-11 dnsjava.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418185154.74E96700F7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11749/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	dnsjava.spec import.log 
Log Message:
Initial importing dnsjava into Fedora.




--- NEW FILE dnsjava.spec ---
# Test of properly function library need DNS querys. It work perfectly on my machine and pass all tests.
# But internet access is not allowed from mock chroot. So, I need disable it by default. Yo may enable it if you want.
%define do_not_test 1

Name:		dnsjava
Version:		2.0.6
Release:		5%{?dist}
Summary:		Java DNS implementation
License:		BSD and MIT
URL:			http://www.dnsjava.org/
Source0:		http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
Group:		System Environment/Libraries
#Epoch:		0
#Vendor:		JPackage Project
#Distribution:	JPackage
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:	ant, jpackage-utils >= 0:1.5

BuildRequires:	java-devel >= 1.7
Requires:		java >= 1.7
Requires:		jpackage-utils
BuildArch:	noarch

# For tests
BuildRequires:	ant-junit


%description
dnsjava is an implementation of DNS in Java. It supports all of the common
record types and the DNSSEC types. It can be used for queries, zone transfers,
and dynamic updates. It includes a cache which can be used by clients, and a
minimal implementation of a server. It supports TSIG authenticated messages,
partial DNSSEC verification, and EDNS0.

dnsjava provides functionality above and beyond that of the InetAddress class.
Since it is written in pure Java, dnsjava is fully threadable, and in many
cases is faster than using InetAddress.

dnsjava provides both high and low level access to DNS. The high level
functions perform queries for records of a given name, type, and class, and
return an array of records. There is also a clone of InetAddress, which is
even simpler. A cache is used to reduce the number of DNS queries sent. The
low level functions allow direct manipulation of dns messages and records, as
well as allowing additional resolver properties to be set.

A 'dig' clone and a dynamic update program are included, as well as a
primary-only server.

%package		javadoc
Summary:		Javadoc for %{name}
Group:		Documentation

%description	javadoc
Javadoc for %{name}.

%prep
%setup -q
rm -rf doc/

iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp
touch -r Changelog Changelog.tmp
mv -f Changelog.tmp Changelog

%build
export CLASSPATH=%(build-classpath jce)
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean jar docs

%install
rm -rf %{buildroot}

# jars
mkdir -p %{buildroot}%{_javadir}
cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%if 0%{?do_not_test}
%check
export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
%endif

%files
%defattr(-,root,root,-)
%doc Changelog README USAGE examples.html *.java
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
- Continue review.
- As it can't be build by gcj, delete back this stuff from spec.
- Tests made now by conditional. As internet access is not allowed in default mock chroot, it is disabled now.
- Changelog recoded form iso8859-1 (charset is guessed by Orcan 'oget' Ogetbil)

* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-4
- Continue review.
- Delete explicit installation in %%install *.java files.
- License from BSD changed to "BSD and MIT"
- Delete unneeded BR: jce, java-javadoc
- Fix mistake: Add Requires: jpackage-utils and delete listed twice BuildRequires: jpackage-utils
- BR: java-devel >= 1.7, R: java >= 1.7

* Tue Apr 14 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-3
- Review in progress. Thanks to Orcan 'oget' Ogetbil.
- Add *.java examplees into documentation (it is mentioned in USAGE)
- Add testing:
	o Add BuildRequires: ant-junit
	o Add %%check section.
- Group from "Development/Libraries" changed to "System Environment/Libraries" by Orcan 'oget' Ogetbil suggestion.
- rm -rf doc/ in %%prep section.
- Removee listed twice Requires: jpackage-utils

* Mon Apr 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-2
- Issues from review:
	o Add
		. BuildRequires:	java-devel
		. BuildRequires:	jpackage-utils
		. Requires:		java >= specific_version
		. Requires:		jpackage-utils
	o Delete "%%define section free"
	o "%%defattr(0644,root,root,0755)" replaced by "%%defattr(-,root,root,-)" in both packages.
	o Add gcj-related stuff.
	o Remove Javadoc scriptlets

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-1
- Import src.rpm from JPackage - http://ftp.heanet.ie/pub/jpackage/1.6/generic/free/SRPMS/dnsjava-1.5.1-2jpp.src.rpm
- Step to last version 2.0.6
- Reformat spec with tabs.
- In Source0 tag inject %%{name} and %%{version} macroses.
- $RPM_BUILD_ROOT replaced by %%{buildroot}
- Delete (comment out) tags:
	o Epoch:		0
	o Vendor:		JPackage Project
	o Distribution:	JPackage
- Add %%{?dist} into relese instead of "jpp"
- Introduced by rpmlint:
	o Group Development/Libraries/Java changed to simple Development/Libraries
	o Licence changed to BSD
	o javadoc ackage group changed form Development/Documentation to simple Documentation

* Fri Aug 20 2004 Ralph Apel <r.ape at r-apel.de> 0:1.5.1-2jpp
- Build with ant-1.6.2

* Thu Jan 22 2004 David Walluck <david at anti-microsoft.org> 0:1.5.1-1jpp
- 1.5.1
- remove crosslink patch (merged upstream)

* Fri Oct 10 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4.3-1jpp
- Update to 1.4.3.
- Crosslink with local J2SE javadocs.
- Spec cleanups, save in UTF-8.

* Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.3.2-2jpp
- update for JPackage 1.5

* Wed Mar 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.2-1jpp
- Update to 1.3.2.
- Use ant instead of make for building.
- Drop patches, and include DNSSEC/JCE code.
- Use sed instead of bash 2 extension when symlinking jars during build.

* Sat May 11 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.4-1jpp
- updated by Ville Skytt?? <ville.skytta at iki.fi>
 - Updated to 1.2.4.
 - Fixed Vendor, Distribution and Group tags.
 - Updated description.
 - Versioned javadocs.
 - Added -no-debug and -no-jce patches.
 - Doesn't BuildRequire ant.

* Fri Dec 7 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-2jpp
- javadoc into javadoc package

* Fri Nov 2 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-1jpp
- first JPackage release


--- NEW FILE import.log ---
dnsjava-2_0_6-5_fc9:F-11:dnsjava-2.0.6-5.fc9.src.rpm:1240080509


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:39:55 -0000	1.1
+++ .cvsignore	18 Apr 2009 18:51:24 -0000	1.2
@@ -0,0 +1 @@
+dnsjava-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:39:55 -0000	1.1
+++ sources	18 Apr 2009 18:51:24 -0000	1.2
@@ -0,0 +1 @@
+2e72319525f4d79359064ad46d38c4bd  dnsjava-2.0.6.tar.gz



From hubbitus at fedoraproject.org  Sat Apr 18 18:54:34 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 18 Apr 2009 18:54:34 +0000 (UTC)
Subject: rpms/dnsjava/EL-5 dnsjava.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090418185434.8C927700F7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12196/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	dnsjava.spec import.log 
Log Message:
Initial importing dnsjava into Fedora.




--- NEW FILE dnsjava.spec ---
# Test of properly function library need DNS querys. It work perfectly on my machine and pass all tests.
# But internet access is not allowed from mock chroot. So, I need disable it by default. Yo may enable it if you want.
%define do_not_test 1

Name:		dnsjava
Version:		2.0.6
Release:		5%{?dist}
Summary:		Java DNS implementation
License:		BSD and MIT
URL:			http://www.dnsjava.org/
Source0:		http://www.dnsjava.org/download/%{name}-%{version}.tar.gz
Group:		System Environment/Libraries
#Epoch:		0
#Vendor:		JPackage Project
#Distribution:	JPackage
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:	ant, jpackage-utils >= 0:1.5

BuildRequires:	java-devel >= 1.7
Requires:		java >= 1.7
Requires:		jpackage-utils
BuildArch:	noarch

# For tests
BuildRequires:	ant-junit


%description
dnsjava is an implementation of DNS in Java. It supports all of the common
record types and the DNSSEC types. It can be used for queries, zone transfers,
and dynamic updates. It includes a cache which can be used by clients, and a
minimal implementation of a server. It supports TSIG authenticated messages,
partial DNSSEC verification, and EDNS0.

dnsjava provides functionality above and beyond that of the InetAddress class.
Since it is written in pure Java, dnsjava is fully threadable, and in many
cases is faster than using InetAddress.

dnsjava provides both high and low level access to DNS. The high level
functions perform queries for records of a given name, type, and class, and
return an array of records. There is also a clone of InetAddress, which is
even simpler. A cache is used to reduce the number of DNS queries sent. The
low level functions allow direct manipulation of dns messages and records, as
well as allowing additional resolver properties to be set.

A 'dig' clone and a dynamic update program are included, as well as a
primary-only server.

%package		javadoc
Summary:		Javadoc for %{name}
Group:		Documentation

%description	javadoc
Javadoc for %{name}.

%prep
%setup -q
rm -rf doc/

iconv -f iso8859-1 -t utf8 Changelog > Changelog.tmp
touch -r Changelog Changelog.tmp
mv -f Changelog.tmp Changelog

%build
export CLASSPATH=%(build-classpath jce)
ant -Dj2se.javadoc=%{_javadocdir}/java clean docsclean jar docs

%install
rm -rf %{buildroot}

# jars
mkdir -p %{buildroot}%{_javadir}
cp -p %{name}-%{version}.jar %{buildroot}%{_javadir}
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}

%clean
rm -rf %{buildroot}

%if 0%{?do_not_test}
%check
export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
ant -Dj2se.javadoc=%{_javadocdir}/java run_tests
%endif

%files
%defattr(-,root,root,-)
%doc Changelog README USAGE examples.html *.java
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
- Continue review.
- As it can't be build by gcj, delete back this stuff from spec.
- Tests made now by conditional. As internet access is not allowed in default mock chroot, it is disabled now.
- Changelog recoded form iso8859-1 (charset is guessed by Orcan 'oget' Ogetbil)

* Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-4
- Continue review.
- Delete explicit installation in %%install *.java files.
- License from BSD changed to "BSD and MIT"
- Delete unneeded BR: jce, java-javadoc
- Fix mistake: Add Requires: jpackage-utils and delete listed twice BuildRequires: jpackage-utils
- BR: java-devel >= 1.7, R: java >= 1.7

* Tue Apr 14 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-3
- Review in progress. Thanks to Orcan 'oget' Ogetbil.
- Add *.java examplees into documentation (it is mentioned in USAGE)
- Add testing:
	o Add BuildRequires: ant-junit
	o Add %%check section.
- Group from "Development/Libraries" changed to "System Environment/Libraries" by Orcan 'oget' Ogetbil suggestion.
- rm -rf doc/ in %%prep section.
- Removee listed twice Requires: jpackage-utils

* Mon Apr 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-2
- Issues from review:
	o Add
		. BuildRequires:	java-devel
		. BuildRequires:	jpackage-utils
		. Requires:		java >= specific_version
		. Requires:		jpackage-utils
	o Delete "%%define section free"
	o "%%defattr(0644,root,root,0755)" replaced by "%%defattr(-,root,root,-)" in both packages.
	o Add gcj-related stuff.
	o Remove Javadoc scriptlets

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-1
- Import src.rpm from JPackage - http://ftp.heanet.ie/pub/jpackage/1.6/generic/free/SRPMS/dnsjava-1.5.1-2jpp.src.rpm
- Step to last version 2.0.6
- Reformat spec with tabs.
- In Source0 tag inject %%{name} and %%{version} macroses.
- $RPM_BUILD_ROOT replaced by %%{buildroot}
- Delete (comment out) tags:
	o Epoch:		0
	o Vendor:		JPackage Project
	o Distribution:	JPackage
- Add %%{?dist} into relese instead of "jpp"
- Introduced by rpmlint:
	o Group Development/Libraries/Java changed to simple Development/Libraries
	o Licence changed to BSD
	o javadoc ackage group changed form Development/Documentation to simple Documentation

* Fri Aug 20 2004 Ralph Apel <r.ape at r-apel.de> 0:1.5.1-2jpp
- Build with ant-1.6.2

* Thu Jan 22 2004 David Walluck <david at anti-microsoft.org> 0:1.5.1-1jpp
- 1.5.1
- remove crosslink patch (merged upstream)

* Fri Oct 10 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4.3-1jpp
- Update to 1.4.3.
- Crosslink with local J2SE javadocs.
- Spec cleanups, save in UTF-8.

* Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.3.2-2jpp
- update for JPackage 1.5

* Wed Mar 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.2-1jpp
- Update to 1.3.2.
- Use ant instead of make for building.
- Drop patches, and include DNSSEC/JCE code.
- Use sed instead of bash 2 extension when symlinking jars during build.

* Sat May 11 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.4-1jpp
- updated by Ville Skytt?? <ville.skytta at iki.fi>
 - Updated to 1.2.4.
 - Fixed Vendor, Distribution and Group tags.
 - Updated description.
 - Versioned javadocs.
 - Added -no-debug and -no-jce patches.
 - Doesn't BuildRequire ant.

* Fri Dec 7 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-2jpp
- javadoc into javadoc package

* Fri Nov 2 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.2.3-1jpp
- first JPackage release


--- NEW FILE import.log ---
dnsjava-2_0_6-5_fc9:EL-5:dnsjava-2.0.6-5.fc9.src.rpm:1240080800


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:39:55 -0000	1.1
+++ .cvsignore	18 Apr 2009 18:54:04 -0000	1.2
@@ -0,0 +1 @@
+dnsjava-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:39:55 -0000	1.1
+++ sources	18 Apr 2009 18:54:04 -0000	1.2
@@ -0,0 +1 @@
+2e72319525f4d79359064ad46d38c4bd  dnsjava-2.0.6.tar.gz



From epienbro at fedoraproject.org  Sat Apr 18 19:14:26 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 18 Apr 2009 19:14:26 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 mingw32-gtk2.spec, 1.4, 1.5
Message-ID: <20090418191426.753C8700F7@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14928

Modified Files:
	sources .cvsignore mingw32-gtk2.spec 
Log Message:
Updated mingw32-gtk2 to version 2.16.1 (necessary for the latest mingw32-gtkmm24)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Mar 2009 20:52:18 -0000	1.3
+++ sources	18 Apr 2009 19:13:56 -0000	1.4
@@ -1 +1 @@
-aa010d3fa57cba96f32db352eb35754f  gtk+-2.15.5.tar.bz2
+74e35ff3e6e02c960fe2117a4b6b102f  gtk+-2.16.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Mar 2009 20:52:17 -0000	1.3
+++ .cvsignore	18 Apr 2009 19:13:56 -0000	1.4
@@ -1 +1 @@
-gtk+-2.15.5.tar.bz2
+gtk+-2.16.1.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mingw32-gtk2.spec	13 Mar 2009 20:56:10 -0000	1.4
+++ mingw32-gtk2.spec	18 Apr 2009 19:13:56 -0000	1.5
@@ -5,8 +5,8 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtk2
-Version:        2.15.5
-Release:        2%{?dist}
+Version:        2.16.1
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -318,6 +318,9 @@
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Sat Apr 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.16.1-1
+- Update to 2.16.1
+
 * Fri Mar 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.15.5-2
 - Force build against latest mingw32-filesystem.
 



From ianweller at fedoraproject.org  Sat Apr 18 19:16:14 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 18 Apr 2009 19:16:14 +0000 (UTC)
Subject: rpms/flam3/devel .cvsignore, 1.11, 1.12 flam3.spec, 1.13,
	1.14 import.log, 1.4, 1.5 sources, 1.11, 1.12
Message-ID: <20090418191614.719C8700F7@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15466/devel

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
2.7.18-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Nov 2008 19:53:19 -0000	1.11
+++ .cvsignore	18 Apr 2009 19:15:43 -0000	1.12
@@ -1 +1 @@
-flam3-2.7.17.tar.gz
+flam3-2.7.18.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/flam3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flam3.spec	24 Feb 2009 17:24:15 -0000	1.13
+++ flam3.spec	18 Apr 2009 19:15:43 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           flam3
-Version:        2.7.17
-Release:        2%{?dist}
+Version:        2.7.18
+Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
 Group:          Applications/Multimedia
@@ -86,6 +86,17 @@
 
 
 %changelog
+* Sat Apr 18 2009 Ian Weller <ianweller at gmail.com> - 2.7.18-1
+- Upstream update to 2.7.18:
+    Added fuzz testing with zzuf to the regression tests.  'Strip'
+    mode and genomes with the zoom parameter used now break into pieces
+    properly.  insert_palette fixed (broken a few versions ago.)  fixed
+    twintrian variation when small weights are used.  various rare
+    segfaults and memory leaks fixed.  'palette_mode' attribute added to
+    flame element for smoother palette interpolation in slow animations;
+    possible values are 'step' and 'linear' ('step' mode is default and 
+    matches previous behaviour.)  Release as 2.7.18.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Nov 2008 19:53:19 -0000	1.4
+++ import.log	18 Apr 2009 19:15:44 -0000	1.5
@@ -2,3 +2,4 @@
 flam3-2_7_15-1_fc9:HEAD:flam3-2.7.15-1.fc9.src.rpm:1220500457
 flam3-2_7_16-1_fc9:HEAD:flam3-2.7.16-1.fc9.src.rpm:1221188112
 flam3-2_7_17-1_fc9:HEAD:flam3-2.7.17-1.fc9.src.rpm:1226865152
+flam3-2_7_18-1_fc10:HEAD:flam3-2.7.18-1.fc10.src.rpm:1240082127


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Nov 2008 19:53:19 -0000	1.11
+++ sources	18 Apr 2009 19:15:44 -0000	1.12
@@ -1 +1 @@
-0a6d830da413a715cdb3957e969a0555  flam3-2.7.17.tar.gz
+052faba777634799b2958205ddf05545  flam3-2.7.18.tar.gz



From ianweller at fedoraproject.org  Sat Apr 18 19:17:08 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 18 Apr 2009 19:17:08 +0000 (UTC)
Subject: rpms/flam3/F-10 .cvsignore, 1.11, 1.12 flam3.spec, 1.12,
	1.13 import.log, 1.4, 1.5 sources, 1.11, 1.12
Message-ID: <20090418191708.4A083700F7@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15687/F-10

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
2.7.18-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Nov 2008 19:51:42 -0000	1.11
+++ .cvsignore	18 Apr 2009 19:16:37 -0000	1.12
@@ -1 +1 @@
-flam3-2.7.17.tar.gz
+flam3-2.7.18.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-10/flam3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- flam3.spec	16 Nov 2008 19:51:42 -0000	1.12
+++ flam3.spec	18 Apr 2009 19:16:38 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.17
+Version:        2.7.18
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,20 @@
 
 
 %changelog
+* Sat Apr 18 2009 Ian Weller <ianweller at gmail.com> - 2.7.18-1
+- Upstream update to 2.7.18:
+    Added fuzz testing with zzuf to the regression tests.  'Strip'
+    mode and genomes with the zoom parameter used now break into pieces
+    properly.  insert_palette fixed (broken a few versions ago.)  fixed
+    twintrian variation when small weights are used.  various rare
+    segfaults and memory leaks fixed.  'palette_mode' attribute added to
+    flame element for smoother palette interpolation in slow animations;
+    possible values are 'step' and 'linear' ('step' mode is default and 
+    matches previous behaviour.)  Release as 2.7.18.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Nov 16 2008 Ian Weller <ianweller at gmail.com> 2.7.17-1
 - Upstream updated:
     Add error checking on the numbers in the input genome.  Do


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Nov 2008 19:51:42 -0000	1.4
+++ import.log	18 Apr 2009 19:16:38 -0000	1.5
@@ -2,3 +2,4 @@
 flam3-2_7_15-1_fc9:HEAD:flam3-2.7.15-1.fc9.src.rpm:1220500457
 flam3-2_7_16-1_fc9:HEAD:flam3-2.7.16-1.fc9.src.rpm:1221188112
 flam3-2_7_17-1_fc9:F-10:flam3-2.7.17-1.fc9.src.rpm:1226865084
+flam3-2_7_18-1_fc10:F-10:flam3-2.7.18-1.fc10.src.rpm:1240082184


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Nov 2008 19:51:42 -0000	1.11
+++ sources	18 Apr 2009 19:16:38 -0000	1.12
@@ -1 +1 @@
-0a6d830da413a715cdb3957e969a0555  flam3-2.7.17.tar.gz
+052faba777634799b2958205ddf05545  flam3-2.7.18.tar.gz



From ianweller at fedoraproject.org  Sat Apr 18 19:18:06 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 18 Apr 2009 19:18:06 +0000 (UTC)
Subject: rpms/flam3/EL-5 .cvsignore, 1.9, 1.10 flam3.spec, 1.9,
	1.10 import.log, 1.3, 1.4 sources, 1.9, 1.10
Message-ID: <20090418191806.C9261700F7@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15967/EL-5

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
2.7.18-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Nov 2008 20:34:17 -0000	1.9
+++ .cvsignore	18 Apr 2009 19:17:36 -0000	1.10
@@ -1 +1 @@
-flam3-2.7.17.tar.gz
+flam3-2.7.18.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/flam3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flam3.spec	16 Nov 2008 20:34:17 -0000	1.9
+++ flam3.spec	18 Apr 2009 19:17:36 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           flam3
-Version:        2.7.17
+Version:        2.7.18
 Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
@@ -86,6 +86,20 @@
 
 
 %changelog
+* Sat Apr 18 2009 Ian Weller <ianweller at gmail.com> - 2.7.18-1
+- Upstream update to 2.7.18:
+    Added fuzz testing with zzuf to the regression tests.  'Strip'
+    mode and genomes with the zoom parameter used now break into pieces
+    properly.  insert_palette fixed (broken a few versions ago.)  fixed
+    twintrian variation when small weights are used.  various rare
+    segfaults and memory leaks fixed.  'palette_mode' attribute added to
+    flame element for smoother palette interpolation in slow animations;
+    possible values are 'step' and 'linear' ('step' mode is default and 
+    matches previous behaviour.)  Release as 2.7.18.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Nov 16 2008 Ian Weller <ianweller at gmail.com> 2.7.17-1
 - Upstream updated:
     Add error checking on the numbers in the input genome.  Do


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	16 Nov 2008 20:34:17 -0000	1.3
+++ import.log	18 Apr 2009 19:17:36 -0000	1.4
@@ -1,3 +1,4 @@
 flam3-2_7_14-1_fc9:EL-5:flam3-2.7.14-1.fc9.src.rpm:1217870539
 flam3-2_7_16-1_fc9:EL-5:flam3-2.7.16-1.fc9.src.rpm:1221188470
 flam3-2_7_17-1_fc9:EL-5:flam3-2.7.17-1.fc9.src.rpm:1226867413
+flam3-2_7_18-1_fc10:EL-5:flam3-2.7.18-1.fc10.src.rpm:1240082239


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Nov 2008 20:34:17 -0000	1.9
+++ sources	18 Apr 2009 19:17:36 -0000	1.10
@@ -1 +1 @@
-0a6d830da413a715cdb3957e969a0555  flam3-2.7.17.tar.gz
+052faba777634799b2958205ddf05545  flam3-2.7.18.tar.gz



From ianweller at fedoraproject.org  Sat Apr 18 19:20:06 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Sat, 18 Apr 2009 19:20:06 +0000 (UTC)
Subject: rpms/flam3/F-11 .cvsignore, 1.11, 1.12 flam3.spec, 1.13,
	1.14 import.log, 1.4, 1.5 sources, 1.11, 1.12
Message-ID: <20090418192006.CE786700F7@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/flam3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16399/F-11

Modified Files:
	.cvsignore flam3.spec import.log sources 
Log Message:
2.7.18-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Nov 2008 19:53:19 -0000	1.11
+++ .cvsignore	18 Apr 2009 19:19:36 -0000	1.12
@@ -1 +1 @@
-flam3-2.7.17.tar.gz
+flam3-2.7.18.tar.gz


Index: flam3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-11/flam3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flam3.spec	24 Feb 2009 17:24:15 -0000	1.13
+++ flam3.spec	18 Apr 2009 19:19:36 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           flam3
-Version:        2.7.17
-Release:        2%{?dist}
+Version:        2.7.18
+Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
 Group:          Applications/Multimedia
@@ -86,6 +86,17 @@
 
 
 %changelog
+* Sat Apr 18 2009 Ian Weller <ianweller at gmail.com> - 2.7.18-1
+- Upstream update to 2.7.18:
+    Added fuzz testing with zzuf to the regression tests.  'Strip'
+    mode and genomes with the zoom parameter used now break into pieces
+    properly.  insert_palette fixed (broken a few versions ago.)  fixed
+    twintrian variation when small weights are used.  various rare
+    segfaults and memory leaks fixed.  'palette_mode' attribute added to
+    flame element for smoother palette interpolation in slow animations;
+    possible values are 'step' and 'linear' ('step' mode is default and 
+    matches previous behaviour.)  Release as 2.7.18.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Nov 2008 19:53:19 -0000	1.4
+++ import.log	18 Apr 2009 19:19:36 -0000	1.5
@@ -2,3 +2,4 @@
 flam3-2_7_15-1_fc9:HEAD:flam3-2.7.15-1.fc9.src.rpm:1220500457
 flam3-2_7_16-1_fc9:HEAD:flam3-2.7.16-1.fc9.src.rpm:1221188112
 flam3-2_7_17-1_fc9:HEAD:flam3-2.7.17-1.fc9.src.rpm:1226865152
+flam3-2_7_18-1_fc10:F-11:flam3-2.7.18-1.fc10.src.rpm:1240082359


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flam3/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Nov 2008 19:53:19 -0000	1.11
+++ sources	18 Apr 2009 19:19:36 -0000	1.12
@@ -1 +1 @@
-0a6d830da413a715cdb3957e969a0555  flam3-2.7.17.tar.gz
+052faba777634799b2958205ddf05545  flam3-2.7.18.tar.gz



From hubbitus at fedoraproject.org  Sat Apr 18 19:27:14 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 18 Apr 2009 19:27:14 +0000 (UTC)
Subject: rpms/dnsjava/devel dnsjava.spec,1.1,1.2
Message-ID: <20090418192714.4230D700F7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17044

Modified Files:
	dnsjava.spec 
Log Message:
Fix test condition check




Index: dnsjava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/devel/dnsjava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsjava.spec	18 Apr 2009 17:46:25 -0000	1.1
+++ dnsjava.spec	18 Apr 2009 19:26:43 -0000	1.2
@@ -81,7 +81,7 @@
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?do_not_test}
+%if ! 0%{?do_not_test}
 %check
 export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
 ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests



From robert at fedoraproject.org  Sat Apr 18 20:08:08 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 18 Apr 2009 20:08:08 +0000 (UTC)
Subject: rpms/libnet10/F-10 libnet10-1.0.2a-fedora.patch, NONE,
	1.1 libnet10-1.0.2a-gcc33.patch, NONE, 1.1 libnet10-config.1,
	NONE, 1.1 libnet10.spec, 1.16,
	1.17 libnet10-1.0.2a-apivers.patch, 1.1,
	NONE libnet10-gcc33.patch, 1.1, NONE
Message-ID: <20090418200808.E6F7C700F7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet10/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22028/F-10

Modified Files:
	libnet10.spec 
Added Files:
	libnet10-1.0.2a-fedora.patch libnet10-1.0.2a-gcc33.patch 
	libnet10-config.1 
Removed Files:
	libnet10-1.0.2a-apivers.patch libnet10-gcc33.patch 
Log Message:
Enabled a shared library and made lots of spec file cleanups


libnet10-1.0.2a-fedora.patch:

--- NEW FILE libnet10-1.0.2a-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which changes the
configure and Makefiles that way, that a shared library is available and the whole package
is called libnet10 rather libnet.

--- Libnet-1.0.2a/configure.in				2001-01-17 21:59:30.000000000 +0100
+++ Libnet-1.0.2a/configure.in.fedora			2009-04-18 19:05:06.000000000 +0200
@@ -8,6 +8,14 @@
 
 AC_INIT(src/libnet_build_ip.c)
 
+dnl
+dnl Determine hosttype and set the root install directory.
+dnl
+AC_CANONICAL_SYSTEM
+AC_PREFIX_DEFAULT(/usr)
+
+AM_INIT_AUTOMAKE(libnet, 1.0.2a)
+
 VER=`cat VERSION`
 AC_MSG_RESULT(Beginning autoconfiguration process for libnet-$VER...)
 
@@ -25,16 +33,14 @@
 AC_SUBST(LIBNET_CONFIG_LIBS)
 AC_SUBST(LIBNET_CONFIG_CFLAGS)
 
-dnl
-dnl Determine hosttype and set the root install directory.
-dnl
-AC_CANONICAL_SYSTEM
-AC_PREFIX_DEFAULT(/usr)
-
 if test "$prefix" = "NONE"; then
     prefix="/usr"
 fi
 
+if test "$mandir" = "NONE"; then
+    mandir="$prefix/man"
+fi
+
 dnl
 dnl Check compiler type.
 dnl
@@ -51,7 +57,7 @@
 dnl
 if test $ac_cv_prog_gcc = yes; then
 dnl if test -z $CFLAGS; then 
-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+    CCOPTS="-O2 -funroll-loops -fomit-frame-pointer -Wall $CFLAGS"
     CFLAGS="$CCOPTS"
 dnl fi
 fi
@@ -74,6 +80,8 @@
 AC_CHECK_PROGS(AR, ar, @true)
 AC_CHECK_PROGS(LN, ln, @true)
 
+AC_PROG_LIBTOOL
+
 dnl
 dnl Check for library functions.
 dnl
@@ -110,7 +118,7 @@
     AC_DEFINE(HAVE_DLPI)
 elif test -r /usr/include/linux/socket.h ; then
     LL_INT_TYPE=sockpacket
-    AC_MSG_RESULT(found SOCK_PACKET)
+    AC_MSG_RESULT(found linux primitives)
     if test $with_pf_packet = yes; then
          AC_LIBNET_CHECK_PF_PACKET
     fi
@@ -147,7 +155,7 @@
     LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
     AC_CHECK_HEADERS(net/ethernet.h, \
         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-    MAN_PREFIX="$prefix/man/man3/"
+    MAN_PREFIX="$mandir/man3/"
     LIB_PREFIX="$prefix/lib/"
     INC_PREFIX="$prefix/include/"
     BIN_PREFIX="$prefix/bin/"
@@ -258,9 +266,6 @@
 
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CONFIG_HEADER(include/config.h)
-AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
-    test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
-    test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnet/Makefile libnet-config)
 
 dnl EOF
--- Libnet-1.0.2a/acconfig.h				2000-12-12 19:31:39.000000000 +0100
+++ Libnet-1.0.2a/acconfig.h.fedora			2009-04-18 18:49:55.000000000 +0200
@@ -1,15 +1,17 @@
-dnl $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
+/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
+ *
+ * Libnet autoconfiguration acconfig.h file
+ * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
+ * All rights reserved.
+ *
+ * Process this file with autoheader to produce a config.h file.
+ */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
 #undef DLPI_DEV_PREFIX
+#undef LIBNET_FAST_X86_CHECK
+#undef HAVE_SOLARIS
 #undef HAVE_DEV_DLPI
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DLPI
@@ -23,5 +25,3 @@
 #undef __FAVOR_BSD
 #undef LIBNET_BIG_ENDIAN
 #undef LIBNET_LIL_ENDIAN
-
-dnl EOF
--- Libnet-1.0.2a/Makefile.am				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/Makefile.am.fedora			2009-04-18 18:41:15.000000000 +0200
@@ -0,0 +1,7 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = src include
+EXTRA_DIST = Makefile.am.common
+bin_SCRIPTS = libnet-config
+version.h: VERSION
+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
--- Libnet-1.0.2a/src/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/src/Makefile.am.fedora		2009-04-18 18:43:52.000000000 +0200
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+lib_LTLIBRARIES = libnet10.la
+libnet10_la_SOURCES = \
+	libnet_resolve.c \
+	libnet_socket.c \
+	libnet_checksum.c \
+	libnet_prand.c \
+	libnet_version.c \
+	libnet_write_ip.c \
+	libnet_insert_ipo.c \
+	libnet_insert_tcpo.c \
+	libnet_error.c \
+	libnet_link_ at LL_INT_TYPE@.c \
+	libnet_packet_mem.c \
+	libnet_build_ip.c \
+	libnet_build_tcp.c \
+	libnet_build_udp.c \
+	libnet_build_arp.c \
+	libnet_build_ethernet.c \
+	libnet_build_icmp.c \
+	libnet_build_igmp.c \
+	libnet_build_dns.c \
+	libnet_build_snmp.c \
+	libnet_build_rip.c \
+	libnet_build_ospf.c \
+	libnet_build_vrrp.c \
+	libnet_asn1.c \
+	libnet_hex_dump.c \
+	libnet_if_addr.c \
+	libnet_port_list.c
+libnet10_la_LIBADD = @LTLIBOBJS@
+libnet10_la_LDFLAGS = -version-info 0:0:0 # CURRENT[:REVISION[:AGE]]
--- Libnet-1.0.2a/include/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/Makefile.am.fedora		2009-04-18 18:41:05.000000000 +0200
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = libnet
+include_HEADERS = libnet.h
--- Libnet-1.0.2a/include/libnet/Makefile.am		1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/libnet/Makefile.am.fedora	2009-04-18 18:42:02.000000000 +0200
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+pkginclude_HEADERS = \
+	libnet-asn1.h \
+	libnet-functions.h \
+	libnet-headers.h \
+	libnet-macros.h \
+	libnet-ospf.h \
+	libnet-structures.h
--- Libnet-1.0.2a/version.h				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/version.h.fedora			2009-04-18 18:56:15.000000000 +0200
@@ -0,0 +1 @@
+#define VERSION "1.0.2a"
--- Libnet-1.0.2a/libnet-config.in			2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in.fedora		2009-04-18 21:30:00.000000000 +0200
@@ -8,13 +8,13 @@
 #   @configure_input@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I at includedir@/libnet10"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet10"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet10-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]

libnet10-1.0.2a-gcc33.patch:

--- NEW FILE libnet10-1.0.2a-gcc33.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which adds
the missing quotations needed by GCC 3.3 and newer.

--- Libnet-1.0.2a/include/libnet.h		2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h.gcc33	2009-04-18 19:37:20.000000000 +0200
@@ -84,9 +84,9 @@
 #define LIBNET_VERSION  "1.0.2a"
 
 #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll"
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
+"documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */


--- NEW FILE libnet10-config.1 ---
.\" Written by Domenico Andreoli for Debian GNU/Linux.
.\" Do whatever you want with this file.
.\" NO warranty is provided.
.TH libnet10-config 1 "18 January 2002" "Libnet 1.0.2a" "libnet10-config manual"
.SH NAME
libnet10-config \- Get information about a libnet installation
.SH SYNOPSIS
.B libnet10-config [options]
.SH DESCRIPTION
.B libnet10-config
displays information about a previous libnet installation.
.SH OPTIONS
.IP "--cflags"
Set of compiler options (CFLAGS) to use when compiling files that use
libnet.
.IP "--libs"
Shows the complete set of libs and other linker options you will need in order
to link your application with libnet.
.IP "--defines"
Set of compiler defines used to compile libnet.
.SH "EXAMPLES"
What linker options do I need when I link with libnet?

  libnet10-config --libs

What compiler options do I need when I compile using libnet functions?

  libnet10-config --cflags
.SH SEE ALSO
.BR libnet10 (3)
.SH AUTHOR
This manual page was written by Domenico Andreoli <cavok at debian.org>
for the Debian GNU/Linux system (but may be used by others).


Index: libnet10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet10/F-10/libnet10.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libnet10.spec	15 Jun 2008 00:41:33 -0000	1.16
+++ libnet10.spec	18 Apr 2009 20:07:38 -0000	1.17
@@ -1,21 +1,16 @@
-Summary:        High-level API (toolkit) to construct and inject network packets
-Name:           libnet10
-Version:        1.0.2a
-Release:        15%{?dist}
-URL:            http://www.packetfactory.net/libnet/
-License:        BSD
-Group:          System Environment/Libraries
-Source0:        http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0:         libnet10-gcc33.patch
-# add an api version prefix, keep timestamps and correct permissions
-Patch1:         libnet10-1.0.2a-apivers.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Obsoletes:      libnet < 1.1.0
-#Obsoletes:      libnet-devel < 1.1.0
-#Provides:       libnet = %{version}-%{release}
-#Provides:       libnet-devel = %{version}-%{release}
-Provides:       libnet10-devel = %{version}-%{release}
-Provides:       libnet10-static = %{version}-%{release}
+Summary:	High-level API (toolkit) to construct and inject network packets
+Name:		libnet10
+Version:	1.0.2a
+Release:	17%{?dist}
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.packetfactory.net/libnet/
+Source0:	http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{version}.tar.gz
+Source1:	libnet10-config.1
+Patch0:		libnet10-1.0.2a-fedora.patch
+Patch1:		libnet10-1.0.2a-gcc33.patch
+BuildRequires:	%{_includedir}/pcap.h, libtool, autoconf, automake
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -23,58 +18,86 @@
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,
-byte-ordering, OS-dependent issues, and much more. Libnet features portable
-packet creation interfaces at the IP layer and link layer, as well as a host of
-supplementary and complementary functionality. Using libnet, quick and simple
-packet assembly applications can be whipped up with little effort. With a bit
-more time, more complex programs can be written (Traceroute and ping were
-easily rewritten using libnet and libpcap).
-
-This package contains an old and deprecated version of libnet. You need
-it only if the software you are using hasn't been updated to work with
-the newer version and the newer API.
+byte-ordering, OS-dependent issues and much more. Libnet features portable
+packet creation interfaces at the IP layer and link layer, as well as a host
+of supplementary and complementary functionality.
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
+
+%package devel
+Summary:	Development files for the libnet library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The libnet10-devel package includes header files and libraries necessary for
+developing programs which use the libnet library. Using libnet, quick and
+simple packet assembly applications can be whipped up with little effort.
+With a bit more time, more complex programs can be written (traceroute and
+ping were easily rewritten using libnet and libpcap).
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
 
 %prep
 %setup -q -n Libnet-%{version}
-%patch0 -p1 -b .gcc33
-%patch1 -p1 -b .apivers
-# The original config.{guess,sub} do not work on ppc64
-#
-# The following /usr/lib cannot be %%_libdir !!
-cp -p /usr/lib/rpm/config.{guess,sub} .
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .gcc33
 
+# Required to apply changes from Patch0
+autoreconf -i -f
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
+%configure --with-pf_packet=yes
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0
-ln -s ../libnet-1.0.a ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0/libnet.a
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
-mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
+# Complete the package renaming at missing places
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_includedir}/{libnet{,.h},%{name}}
+mv -f $RPM_BUILD_ROOT%{_bindir}/libnet{,10}-config
+
+# Install all man pages to their appropriate place
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3}/
+install -p -m 644 doc/libnet.3 $RPM_BUILD_ROOT%{_mandir}/man3/%{name}.3
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-config.1
 
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/libnet-config-1.0
-%{_includedir}/libnet-1.0/
-%{_libdir}/libnet-1.0.a
-%{_libdir}/libnet-1.0/
-%{_libdir}/libpwrite.a
-%{_mandir}/man3/libnet-1.0.3*
+%{_libdir}/%{name}.so.*
+%{_mandir}/man3/%{name}.3*
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_mandir}/man1/%{name}-config.1*
+%{_includedir}/%{name}/
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-17
+- Enabled a shared library and made lots of spec file cleanups
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-16
+- Rebuild against gcc 4.4 and rpm 4.6
+
 * Sun Jun 15 2008 Patrice Dumas <pertusus at free.fr> - 1.0.2a-15
 - copy config.* from rpm directory, those shpped with libnet10 are too old
 


--- libnet10-1.0.2a-apivers.patch DELETED ---


--- libnet10-gcc33.patch DELETED ---



From robert at fedoraproject.org  Sat Apr 18 20:08:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 18 Apr 2009 20:08:09 +0000 (UTC)
Subject: rpms/libnet10/devel libnet10-1.0.2a-fedora.patch, NONE,
	1.1 libnet10-1.0.2a-gcc33.patch, NONE, 1.1 libnet10-config.1,
	NONE, 1.1 libnet10.spec, 1.17,
	1.18 libnet10-1.0.2a-apivers.patch, 1.1,
	NONE libnet10-gcc33.patch, 1.1, NONE
Message-ID: <20090418200809.B8B64700F7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22028/devel

Modified Files:
	libnet10.spec 
Added Files:
	libnet10-1.0.2a-fedora.patch libnet10-1.0.2a-gcc33.patch 
	libnet10-config.1 
Removed Files:
	libnet10-1.0.2a-apivers.patch libnet10-gcc33.patch 
Log Message:
Enabled a shared library and made lots of spec file cleanups


libnet10-1.0.2a-fedora.patch:

--- NEW FILE libnet10-1.0.2a-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which changes the
configure and Makefiles that way, that a shared library is available and the whole package
is called libnet10 rather libnet.

--- Libnet-1.0.2a/configure.in				2001-01-17 21:59:30.000000000 +0100
+++ Libnet-1.0.2a/configure.in.fedora			2009-04-18 19:05:06.000000000 +0200
@@ -8,6 +8,14 @@
 
 AC_INIT(src/libnet_build_ip.c)
 
+dnl
+dnl Determine hosttype and set the root install directory.
+dnl
+AC_CANONICAL_SYSTEM
+AC_PREFIX_DEFAULT(/usr)
+
+AM_INIT_AUTOMAKE(libnet, 1.0.2a)
+
 VER=`cat VERSION`
 AC_MSG_RESULT(Beginning autoconfiguration process for libnet-$VER...)
 
@@ -25,16 +33,14 @@
 AC_SUBST(LIBNET_CONFIG_LIBS)
 AC_SUBST(LIBNET_CONFIG_CFLAGS)
 
-dnl
-dnl Determine hosttype and set the root install directory.
-dnl
-AC_CANONICAL_SYSTEM
-AC_PREFIX_DEFAULT(/usr)
-
 if test "$prefix" = "NONE"; then
     prefix="/usr"
 fi
 
+if test "$mandir" = "NONE"; then
+    mandir="$prefix/man"
+fi
+
 dnl
 dnl Check compiler type.
 dnl
@@ -51,7 +57,7 @@
 dnl
 if test $ac_cv_prog_gcc = yes; then
 dnl if test -z $CFLAGS; then 
-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+    CCOPTS="-O2 -funroll-loops -fomit-frame-pointer -Wall $CFLAGS"
     CFLAGS="$CCOPTS"
 dnl fi
 fi
@@ -74,6 +80,8 @@
 AC_CHECK_PROGS(AR, ar, @true)
 AC_CHECK_PROGS(LN, ln, @true)
 
+AC_PROG_LIBTOOL
+
 dnl
 dnl Check for library functions.
 dnl
@@ -110,7 +118,7 @@
     AC_DEFINE(HAVE_DLPI)
 elif test -r /usr/include/linux/socket.h ; then
     LL_INT_TYPE=sockpacket
-    AC_MSG_RESULT(found SOCK_PACKET)
+    AC_MSG_RESULT(found linux primitives)
     if test $with_pf_packet = yes; then
          AC_LIBNET_CHECK_PF_PACKET
     fi
@@ -147,7 +155,7 @@
     LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
     AC_CHECK_HEADERS(net/ethernet.h, \
         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-    MAN_PREFIX="$prefix/man/man3/"
+    MAN_PREFIX="$mandir/man3/"
     LIB_PREFIX="$prefix/lib/"
     INC_PREFIX="$prefix/include/"
     BIN_PREFIX="$prefix/bin/"
@@ -258,9 +266,6 @@
 
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CONFIG_HEADER(include/config.h)
-AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
-    test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
-    test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnet/Makefile libnet-config)
 
 dnl EOF
--- Libnet-1.0.2a/acconfig.h				2000-12-12 19:31:39.000000000 +0100
+++ Libnet-1.0.2a/acconfig.h.fedora			2009-04-18 18:49:55.000000000 +0200
@@ -1,15 +1,17 @@
-dnl $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
+/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
+ *
+ * Libnet autoconfiguration acconfig.h file
+ * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
+ * All rights reserved.
+ *
+ * Process this file with autoheader to produce a config.h file.
+ */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
 #undef DLPI_DEV_PREFIX
+#undef LIBNET_FAST_X86_CHECK
+#undef HAVE_SOLARIS
 #undef HAVE_DEV_DLPI
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DLPI
@@ -23,5 +25,3 @@
 #undef __FAVOR_BSD
 #undef LIBNET_BIG_ENDIAN
 #undef LIBNET_LIL_ENDIAN
-
-dnl EOF
--- Libnet-1.0.2a/Makefile.am				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/Makefile.am.fedora			2009-04-18 18:41:15.000000000 +0200
@@ -0,0 +1,7 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = src include
+EXTRA_DIST = Makefile.am.common
+bin_SCRIPTS = libnet-config
+version.h: VERSION
+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
--- Libnet-1.0.2a/src/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/src/Makefile.am.fedora		2009-04-18 18:43:52.000000000 +0200
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+lib_LTLIBRARIES = libnet10.la
+libnet10_la_SOURCES = \
+	libnet_resolve.c \
+	libnet_socket.c \
+	libnet_checksum.c \
+	libnet_prand.c \
+	libnet_version.c \
+	libnet_write_ip.c \
+	libnet_insert_ipo.c \
+	libnet_insert_tcpo.c \
+	libnet_error.c \
+	libnet_link_ at LL_INT_TYPE@.c \
+	libnet_packet_mem.c \
+	libnet_build_ip.c \
+	libnet_build_tcp.c \
+	libnet_build_udp.c \
+	libnet_build_arp.c \
+	libnet_build_ethernet.c \
+	libnet_build_icmp.c \
+	libnet_build_igmp.c \
+	libnet_build_dns.c \
+	libnet_build_snmp.c \
+	libnet_build_rip.c \
+	libnet_build_ospf.c \
+	libnet_build_vrrp.c \
+	libnet_asn1.c \
+	libnet_hex_dump.c \
+	libnet_if_addr.c \
+	libnet_port_list.c
+libnet10_la_LIBADD = @LTLIBOBJS@
+libnet10_la_LDFLAGS = -version-info 0:0:0 # CURRENT[:REVISION[:AGE]]
--- Libnet-1.0.2a/include/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/Makefile.am.fedora		2009-04-18 18:41:05.000000000 +0200
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = libnet
+include_HEADERS = libnet.h
--- Libnet-1.0.2a/include/libnet/Makefile.am		1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/libnet/Makefile.am.fedora	2009-04-18 18:42:02.000000000 +0200
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+pkginclude_HEADERS = \
+	libnet-asn1.h \
+	libnet-functions.h \
+	libnet-headers.h \
+	libnet-macros.h \
+	libnet-ospf.h \
+	libnet-structures.h
--- Libnet-1.0.2a/version.h				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/version.h.fedora			2009-04-18 18:56:15.000000000 +0200
@@ -0,0 +1 @@
+#define VERSION "1.0.2a"
--- Libnet-1.0.2a/libnet-config.in			2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in.fedora		2009-04-18 21:30:00.000000000 +0200
@@ -8,13 +8,13 @@
 #   @configure_input@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I at includedir@/libnet10"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet10"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet10-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]

libnet10-1.0.2a-gcc33.patch:

--- NEW FILE libnet10-1.0.2a-gcc33.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which adds
the missing quotations needed by GCC 3.3 and newer.

--- Libnet-1.0.2a/include/libnet.h		2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h.gcc33	2009-04-18 19:37:20.000000000 +0200
@@ -84,9 +84,9 @@
 #define LIBNET_VERSION  "1.0.2a"
 
 #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll"
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
+"documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */


--- NEW FILE libnet10-config.1 ---
.\" Written by Domenico Andreoli for Debian GNU/Linux.
.\" Do whatever you want with this file.
.\" NO warranty is provided.
.TH libnet10-config 1 "18 January 2002" "Libnet 1.0.2a" "libnet10-config manual"
.SH NAME
libnet10-config \- Get information about a libnet installation
.SH SYNOPSIS
.B libnet10-config [options]
.SH DESCRIPTION
.B libnet10-config
displays information about a previous libnet installation.
.SH OPTIONS
.IP "--cflags"
Set of compiler options (CFLAGS) to use when compiling files that use
libnet.
.IP "--libs"
Shows the complete set of libs and other linker options you will need in order
to link your application with libnet.
.IP "--defines"
Set of compiler defines used to compile libnet.
.SH "EXAMPLES"
What linker options do I need when I link with libnet?

  libnet10-config --libs

What compiler options do I need when I compile using libnet functions?

  libnet10-config --cflags
.SH SEE ALSO
.BR libnet10 (3)
.SH AUTHOR
This manual page was written by Domenico Andreoli <cavok at debian.org>
for the Debian GNU/Linux system (but may be used by others).


Index: libnet10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet10/devel/libnet10.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libnet10.spec	23 Feb 2009 21:20:16 -0000	1.17
+++ libnet10.spec	18 Apr 2009 20:07:39 -0000	1.18
@@ -1,21 +1,16 @@
-Summary:        High-level API (toolkit) to construct and inject network packets
-Name:           libnet10
-Version:        1.0.2a
-Release:        16%{?dist}
-URL:            http://www.packetfactory.net/libnet/
-License:        BSD
-Group:          System Environment/Libraries
-Source0:        http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0:         libnet10-gcc33.patch
-# add an api version prefix, keep timestamps and correct permissions
-Patch1:         libnet10-1.0.2a-apivers.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Obsoletes:      libnet < 1.1.0
-#Obsoletes:      libnet-devel < 1.1.0
-#Provides:       libnet = %{version}-%{release}
-#Provides:       libnet-devel = %{version}-%{release}
-Provides:       libnet10-devel = %{version}-%{release}
-Provides:       libnet10-static = %{version}-%{release}
+Summary:	High-level API (toolkit) to construct and inject network packets
+Name:		libnet10
+Version:	1.0.2a
+Release:	17%{?dist}
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.packetfactory.net/libnet/
+Source0:	http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{version}.tar.gz
+Source1:	libnet10-config.1
+Patch0:		libnet10-1.0.2a-fedora.patch
+Patch1:		libnet10-1.0.2a-gcc33.patch
+BuildRequires:	%{_includedir}/pcap.h, libtool, autoconf, automake
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -23,58 +18,83 @@
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,
-byte-ordering, OS-dependent issues, and much more. Libnet features portable
-packet creation interfaces at the IP layer and link layer, as well as a host of
-supplementary and complementary functionality. Using libnet, quick and simple
-packet assembly applications can be whipped up with little effort. With a bit
-more time, more complex programs can be written (Traceroute and ping were
-easily rewritten using libnet and libpcap).
-
-This package contains an old and deprecated version of libnet. You need
-it only if the software you are using hasn't been updated to work with
-the newer version and the newer API.
+byte-ordering, OS-dependent issues and much more. Libnet features portable
+packet creation interfaces at the IP layer and link layer, as well as a host
+of supplementary and complementary functionality.
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
+
+%package devel
+Summary:	Development files for the libnet library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The libnet10-devel package includes header files and libraries necessary for
+developing programs which use the libnet library. Using libnet, quick and
+simple packet assembly applications can be whipped up with little effort.
+With a bit more time, more complex programs can be written (traceroute and
+ping were easily rewritten using libnet and libpcap).
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
 
 %prep
 %setup -q -n Libnet-%{version}
-%patch0 -p1 -b .gcc33
-%patch1 -p1 -b .apivers
-# The original config.{guess,sub} do not work on ppc64
-#
-# The following /usr/lib cannot be %%_libdir !!
-cp -p /usr/lib/rpm/config.{guess,sub} .
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .gcc33
 
+# Required to apply changes from Patch0
+autoreconf -i -f
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
+%configure --with-pf_packet=yes
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0
-ln -s ../libnet-1.0.a ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0/libnet.a
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
-mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
+# Complete the package renaming at missing places
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_includedir}/{libnet{,.h},%{name}}
+mv -f $RPM_BUILD_ROOT%{_bindir}/libnet{,10}-config
+
+# Install all man pages to their appropriate place
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3}/
+install -p -m 644 doc/libnet.3 $RPM_BUILD_ROOT%{_mandir}/man3/%{name}.3
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-config.1
 
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/libnet-config-1.0
-%{_includedir}/libnet-1.0/
-%{_libdir}/libnet-1.0.a
-%{_libdir}/libnet-1.0/
-%{_libdir}/libpwrite.a
-%{_mandir}/man3/libnet-1.0.3*
+%{_libdir}/%{name}.so.*
+%{_mandir}/man3/%{name}.3*
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_mandir}/man1/%{name}-config.1*
+%{_includedir}/%{name}/
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-17
+- Enabled a shared library and made lots of spec file cleanups
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-16
 - Rebuild against gcc 4.4 and rpm 4.6
 


--- libnet10-1.0.2a-apivers.patch DELETED ---


--- libnet10-gcc33.patch DELETED ---



From robert at fedoraproject.org  Sat Apr 18 20:08:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 18 Apr 2009 20:08:09 +0000 (UTC)
Subject: rpms/libnet10/F-11 libnet10-1.0.2a-fedora.patch, NONE,
	1.1 libnet10-1.0.2a-gcc33.patch, NONE, 1.1 libnet10-config.1,
	NONE, 1.1 libnet10.spec, 1.17,
	1.18 libnet10-1.0.2a-apivers.patch, 1.1,
	NONE libnet10-gcc33.patch, 1.1, NONE
Message-ID: <20090418200809.2715C70137@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet10/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22028/F-11

Modified Files:
	libnet10.spec 
Added Files:
	libnet10-1.0.2a-fedora.patch libnet10-1.0.2a-gcc33.patch 
	libnet10-config.1 
Removed Files:
	libnet10-1.0.2a-apivers.patch libnet10-gcc33.patch 
Log Message:
Enabled a shared library and made lots of spec file cleanups


libnet10-1.0.2a-fedora.patch:

--- NEW FILE libnet10-1.0.2a-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which changes the
configure and Makefiles that way, that a shared library is available and the whole package
is called libnet10 rather libnet.

--- Libnet-1.0.2a/configure.in				2001-01-17 21:59:30.000000000 +0100
+++ Libnet-1.0.2a/configure.in.fedora			2009-04-18 19:05:06.000000000 +0200
@@ -8,6 +8,14 @@
 
 AC_INIT(src/libnet_build_ip.c)
 
+dnl
+dnl Determine hosttype and set the root install directory.
+dnl
+AC_CANONICAL_SYSTEM
+AC_PREFIX_DEFAULT(/usr)
+
+AM_INIT_AUTOMAKE(libnet, 1.0.2a)
+
 VER=`cat VERSION`
 AC_MSG_RESULT(Beginning autoconfiguration process for libnet-$VER...)
 
@@ -25,16 +33,14 @@
 AC_SUBST(LIBNET_CONFIG_LIBS)
 AC_SUBST(LIBNET_CONFIG_CFLAGS)
 
-dnl
-dnl Determine hosttype and set the root install directory.
-dnl
-AC_CANONICAL_SYSTEM
-AC_PREFIX_DEFAULT(/usr)
-
 if test "$prefix" = "NONE"; then
     prefix="/usr"
 fi
 
+if test "$mandir" = "NONE"; then
+    mandir="$prefix/man"
+fi
+
 dnl
 dnl Check compiler type.
 dnl
@@ -51,7 +57,7 @@
 dnl
 if test $ac_cv_prog_gcc = yes; then
 dnl if test -z $CFLAGS; then 
-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+    CCOPTS="-O2 -funroll-loops -fomit-frame-pointer -Wall $CFLAGS"
     CFLAGS="$CCOPTS"
 dnl fi
 fi
@@ -74,6 +80,8 @@
 AC_CHECK_PROGS(AR, ar, @true)
 AC_CHECK_PROGS(LN, ln, @true)
 
+AC_PROG_LIBTOOL
+
 dnl
 dnl Check for library functions.
 dnl
@@ -110,7 +118,7 @@
     AC_DEFINE(HAVE_DLPI)
 elif test -r /usr/include/linux/socket.h ; then
     LL_INT_TYPE=sockpacket
-    AC_MSG_RESULT(found SOCK_PACKET)
+    AC_MSG_RESULT(found linux primitives)
     if test $with_pf_packet = yes; then
          AC_LIBNET_CHECK_PF_PACKET
     fi
@@ -147,7 +155,7 @@
     LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
     AC_CHECK_HEADERS(net/ethernet.h, \
         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-    MAN_PREFIX="$prefix/man/man3/"
+    MAN_PREFIX="$mandir/man3/"
     LIB_PREFIX="$prefix/lib/"
     INC_PREFIX="$prefix/include/"
     BIN_PREFIX="$prefix/bin/"
@@ -258,9 +266,6 @@
 
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CONFIG_HEADER(include/config.h)
-AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
-    test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
-    test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnet/Makefile libnet-config)
 
 dnl EOF
--- Libnet-1.0.2a/acconfig.h				2000-12-12 19:31:39.000000000 +0100
+++ Libnet-1.0.2a/acconfig.h.fedora			2009-04-18 18:49:55.000000000 +0200
@@ -1,15 +1,17 @@
-dnl $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
+/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
+ *
+ * Libnet autoconfiguration acconfig.h file
+ * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
+ * All rights reserved.
+ *
+ * Process this file with autoheader to produce a config.h file.
+ */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
 #undef DLPI_DEV_PREFIX
+#undef LIBNET_FAST_X86_CHECK
+#undef HAVE_SOLARIS
 #undef HAVE_DEV_DLPI
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DLPI
@@ -23,5 +25,3 @@
 #undef __FAVOR_BSD
 #undef LIBNET_BIG_ENDIAN
 #undef LIBNET_LIL_ENDIAN
-
-dnl EOF
--- Libnet-1.0.2a/Makefile.am				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/Makefile.am.fedora			2009-04-18 18:41:15.000000000 +0200
@@ -0,0 +1,7 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = src include
+EXTRA_DIST = Makefile.am.common
+bin_SCRIPTS = libnet-config
+version.h: VERSION
+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
--- Libnet-1.0.2a/src/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/src/Makefile.am.fedora		2009-04-18 18:43:52.000000000 +0200
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+lib_LTLIBRARIES = libnet10.la
+libnet10_la_SOURCES = \
+	libnet_resolve.c \
+	libnet_socket.c \
+	libnet_checksum.c \
+	libnet_prand.c \
+	libnet_version.c \
+	libnet_write_ip.c \
+	libnet_insert_ipo.c \
+	libnet_insert_tcpo.c \
+	libnet_error.c \
+	libnet_link_ at LL_INT_TYPE@.c \
+	libnet_packet_mem.c \
+	libnet_build_ip.c \
+	libnet_build_tcp.c \
+	libnet_build_udp.c \
+	libnet_build_arp.c \
+	libnet_build_ethernet.c \
+	libnet_build_icmp.c \
+	libnet_build_igmp.c \
+	libnet_build_dns.c \
+	libnet_build_snmp.c \
+	libnet_build_rip.c \
+	libnet_build_ospf.c \
+	libnet_build_vrrp.c \
+	libnet_asn1.c \
+	libnet_hex_dump.c \
+	libnet_if_addr.c \
+	libnet_port_list.c
+libnet10_la_LIBADD = @LTLIBOBJS@
+libnet10_la_LDFLAGS = -version-info 0:0:0 # CURRENT[:REVISION[:AGE]]
--- Libnet-1.0.2a/include/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/Makefile.am.fedora		2009-04-18 18:41:05.000000000 +0200
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = libnet
+include_HEADERS = libnet.h
--- Libnet-1.0.2a/include/libnet/Makefile.am		1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/libnet/Makefile.am.fedora	2009-04-18 18:42:02.000000000 +0200
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+pkginclude_HEADERS = \
+	libnet-asn1.h \
+	libnet-functions.h \
+	libnet-headers.h \
+	libnet-macros.h \
+	libnet-ospf.h \
+	libnet-structures.h
--- Libnet-1.0.2a/version.h				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/version.h.fedora			2009-04-18 18:56:15.000000000 +0200
@@ -0,0 +1 @@
+#define VERSION "1.0.2a"
--- Libnet-1.0.2a/libnet-config.in			2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in.fedora		2009-04-18 21:30:00.000000000 +0200
@@ -8,13 +8,13 @@
 #   @configure_input@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I at includedir@/libnet10"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet10"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet10-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]

libnet10-1.0.2a-gcc33.patch:

--- NEW FILE libnet10-1.0.2a-gcc33.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which adds
the missing quotations needed by GCC 3.3 and newer.

--- Libnet-1.0.2a/include/libnet.h		2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h.gcc33	2009-04-18 19:37:20.000000000 +0200
@@ -84,9 +84,9 @@
 #define LIBNET_VERSION  "1.0.2a"
 
 #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll"
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
+"documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */


--- NEW FILE libnet10-config.1 ---
.\" Written by Domenico Andreoli for Debian GNU/Linux.
.\" Do whatever you want with this file.
.\" NO warranty is provided.
.TH libnet10-config 1 "18 January 2002" "Libnet 1.0.2a" "libnet10-config manual"
.SH NAME
libnet10-config \- Get information about a libnet installation
.SH SYNOPSIS
.B libnet10-config [options]
.SH DESCRIPTION
.B libnet10-config
displays information about a previous libnet installation.
.SH OPTIONS
.IP "--cflags"
Set of compiler options (CFLAGS) to use when compiling files that use
libnet.
.IP "--libs"
Shows the complete set of libs and other linker options you will need in order
to link your application with libnet.
.IP "--defines"
Set of compiler defines used to compile libnet.
.SH "EXAMPLES"
What linker options do I need when I link with libnet?

  libnet10-config --libs

What compiler options do I need when I compile using libnet functions?

  libnet10-config --cflags
.SH SEE ALSO
.BR libnet10 (3)
.SH AUTHOR
This manual page was written by Domenico Andreoli <cavok at debian.org>
for the Debian GNU/Linux system (but may be used by others).


Index: libnet10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet10/F-11/libnet10.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libnet10.spec	23 Feb 2009 21:20:16 -0000	1.17
+++ libnet10.spec	18 Apr 2009 20:07:38 -0000	1.18
@@ -1,21 +1,16 @@
-Summary:        High-level API (toolkit) to construct and inject network packets
-Name:           libnet10
-Version:        1.0.2a
-Release:        16%{?dist}
-URL:            http://www.packetfactory.net/libnet/
-License:        BSD
-Group:          System Environment/Libraries
-Source0:        http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0:         libnet10-gcc33.patch
-# add an api version prefix, keep timestamps and correct permissions
-Patch1:         libnet10-1.0.2a-apivers.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Obsoletes:      libnet < 1.1.0
-#Obsoletes:      libnet-devel < 1.1.0
-#Provides:       libnet = %{version}-%{release}
-#Provides:       libnet-devel = %{version}-%{release}
-Provides:       libnet10-devel = %{version}-%{release}
-Provides:       libnet10-static = %{version}-%{release}
+Summary:	High-level API (toolkit) to construct and inject network packets
+Name:		libnet10
+Version:	1.0.2a
+Release:	17%{?dist}
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.packetfactory.net/libnet/
+Source0:	http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{version}.tar.gz
+Source1:	libnet10-config.1
+Patch0:		libnet10-1.0.2a-fedora.patch
+Patch1:		libnet10-1.0.2a-gcc33.patch
+BuildRequires:	%{_includedir}/pcap.h, libtool, autoconf, automake
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -23,58 +18,83 @@
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,
-byte-ordering, OS-dependent issues, and much more. Libnet features portable
-packet creation interfaces at the IP layer and link layer, as well as a host of
-supplementary and complementary functionality. Using libnet, quick and simple
-packet assembly applications can be whipped up with little effort. With a bit
-more time, more complex programs can be written (Traceroute and ping were
-easily rewritten using libnet and libpcap).
-
-This package contains an old and deprecated version of libnet. You need
-it only if the software you are using hasn't been updated to work with
-the newer version and the newer API.
+byte-ordering, OS-dependent issues and much more. Libnet features portable
+packet creation interfaces at the IP layer and link layer, as well as a host
+of supplementary and complementary functionality.
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
+
+%package devel
+Summary:	Development files for the libnet library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The libnet10-devel package includes header files and libraries necessary for
+developing programs which use the libnet library. Using libnet, quick and
+simple packet assembly applications can be whipped up with little effort.
+With a bit more time, more complex programs can be written (traceroute and
+ping were easily rewritten using libnet and libpcap).
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
 
 %prep
 %setup -q -n Libnet-%{version}
-%patch0 -p1 -b .gcc33
-%patch1 -p1 -b .apivers
-# The original config.{guess,sub} do not work on ppc64
-#
-# The following /usr/lib cannot be %%_libdir !!
-cp -p /usr/lib/rpm/config.{guess,sub} .
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .gcc33
 
+# Required to apply changes from Patch0
+autoreconf -i -f
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
+%configure --with-pf_packet=yes
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0
-ln -s ../libnet-1.0.a ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0/libnet.a
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
-mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
+# Complete the package renaming at missing places
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_includedir}/{libnet{,.h},%{name}}
+mv -f $RPM_BUILD_ROOT%{_bindir}/libnet{,10}-config
+
+# Install all man pages to their appropriate place
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3}/
+install -p -m 644 doc/libnet.3 $RPM_BUILD_ROOT%{_mandir}/man3/%{name}.3
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-config.1
 
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/libnet-config-1.0
-%{_includedir}/libnet-1.0/
-%{_libdir}/libnet-1.0.a
-%{_libdir}/libnet-1.0/
-%{_libdir}/libpwrite.a
-%{_mandir}/man3/libnet-1.0.3*
+%{_libdir}/%{name}.so.*
+%{_mandir}/man3/%{name}.3*
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_mandir}/man1/%{name}-config.1*
+%{_includedir}/%{name}/
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-17
+- Enabled a shared library and made lots of spec file cleanups
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-16
 - Rebuild against gcc 4.4 and rpm 4.6
 


--- libnet10-1.0.2a-apivers.patch DELETED ---


--- libnet10-gcc33.patch DELETED ---



From robert at fedoraproject.org  Sat Apr 18 20:08:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 18 Apr 2009 20:08:09 +0000 (UTC)
Subject: rpms/libnet10/F-9 libnet10-1.0.2a-fedora.patch, NONE,
	1.1 libnet10-1.0.2a-gcc33.patch, NONE, 1.1 libnet10-config.1,
	NONE, 1.1 libnet10.spec, 1.15,
	1.16 libnet10-1.0.2a-apivers.patch, 1.1,
	NONE libnet10-gcc33.patch, 1.1, NONE
Message-ID: <20090418200809.70A41700F7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet10/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22028/F-9

Modified Files:
	libnet10.spec 
Added Files:
	libnet10-1.0.2a-fedora.patch libnet10-1.0.2a-gcc33.patch 
	libnet10-config.1 
Removed Files:
	libnet10-1.0.2a-apivers.patch libnet10-gcc33.patch 
Log Message:
Enabled a shared library and made lots of spec file cleanups


libnet10-1.0.2a-fedora.patch:

--- NEW FILE libnet10-1.0.2a-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which changes the
configure and Makefiles that way, that a shared library is available and the whole package
is called libnet10 rather libnet.

--- Libnet-1.0.2a/configure.in				2001-01-17 21:59:30.000000000 +0100
+++ Libnet-1.0.2a/configure.in.fedora			2009-04-18 19:05:06.000000000 +0200
@@ -8,6 +8,14 @@
 
 AC_INIT(src/libnet_build_ip.c)
 
+dnl
+dnl Determine hosttype and set the root install directory.
+dnl
+AC_CANONICAL_SYSTEM
+AC_PREFIX_DEFAULT(/usr)
+
+AM_INIT_AUTOMAKE(libnet, 1.0.2a)
+
 VER=`cat VERSION`
 AC_MSG_RESULT(Beginning autoconfiguration process for libnet-$VER...)
 
@@ -25,16 +33,14 @@
 AC_SUBST(LIBNET_CONFIG_LIBS)
 AC_SUBST(LIBNET_CONFIG_CFLAGS)
 
-dnl
-dnl Determine hosttype and set the root install directory.
-dnl
-AC_CANONICAL_SYSTEM
-AC_PREFIX_DEFAULT(/usr)
-
 if test "$prefix" = "NONE"; then
     prefix="/usr"
 fi
 
+if test "$mandir" = "NONE"; then
+    mandir="$prefix/man"
+fi
+
 dnl
 dnl Check compiler type.
 dnl
@@ -51,7 +57,7 @@
 dnl
 if test $ac_cv_prog_gcc = yes; then
 dnl if test -z $CFLAGS; then 
-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+    CCOPTS="-O2 -funroll-loops -fomit-frame-pointer -Wall $CFLAGS"
     CFLAGS="$CCOPTS"
 dnl fi
 fi
@@ -74,6 +80,8 @@
 AC_CHECK_PROGS(AR, ar, @true)
 AC_CHECK_PROGS(LN, ln, @true)
 
+AC_PROG_LIBTOOL
+
 dnl
 dnl Check for library functions.
 dnl
@@ -110,7 +118,7 @@
     AC_DEFINE(HAVE_DLPI)
 elif test -r /usr/include/linux/socket.h ; then
     LL_INT_TYPE=sockpacket
-    AC_MSG_RESULT(found SOCK_PACKET)
+    AC_MSG_RESULT(found linux primitives)
     if test $with_pf_packet = yes; then
          AC_LIBNET_CHECK_PF_PACKET
     fi
@@ -147,7 +155,7 @@
     LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
     AC_CHECK_HEADERS(net/ethernet.h, \
         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-    MAN_PREFIX="$prefix/man/man3/"
+    MAN_PREFIX="$mandir/man3/"
     LIB_PREFIX="$prefix/lib/"
     INC_PREFIX="$prefix/include/"
     BIN_PREFIX="$prefix/bin/"
@@ -258,9 +266,6 @@
 
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CONFIG_HEADER(include/config.h)
-AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
-    test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
-    test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnet/Makefile libnet-config)
 
 dnl EOF
--- Libnet-1.0.2a/acconfig.h				2000-12-12 19:31:39.000000000 +0100
+++ Libnet-1.0.2a/acconfig.h.fedora			2009-04-18 18:49:55.000000000 +0200
@@ -1,15 +1,17 @@
-dnl $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
+/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
+ *
+ * Libnet autoconfiguration acconfig.h file
+ * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
+ * All rights reserved.
+ *
+ * Process this file with autoheader to produce a config.h file.
+ */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
 #undef DLPI_DEV_PREFIX
+#undef LIBNET_FAST_X86_CHECK
+#undef HAVE_SOLARIS
 #undef HAVE_DEV_DLPI
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DLPI
@@ -23,5 +25,3 @@
 #undef __FAVOR_BSD
 #undef LIBNET_BIG_ENDIAN
 #undef LIBNET_LIL_ENDIAN
-
-dnl EOF
--- Libnet-1.0.2a/Makefile.am				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/Makefile.am.fedora			2009-04-18 18:41:15.000000000 +0200
@@ -0,0 +1,7 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = src include
+EXTRA_DIST = Makefile.am.common
+bin_SCRIPTS = libnet-config
+version.h: VERSION
+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
--- Libnet-1.0.2a/src/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/src/Makefile.am.fedora		2009-04-18 18:43:52.000000000 +0200
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+lib_LTLIBRARIES = libnet10.la
+libnet10_la_SOURCES = \
+	libnet_resolve.c \
+	libnet_socket.c \
+	libnet_checksum.c \
+	libnet_prand.c \
+	libnet_version.c \
+	libnet_write_ip.c \
+	libnet_insert_ipo.c \
+	libnet_insert_tcpo.c \
+	libnet_error.c \
+	libnet_link_ at LL_INT_TYPE@.c \
+	libnet_packet_mem.c \
+	libnet_build_ip.c \
+	libnet_build_tcp.c \
+	libnet_build_udp.c \
+	libnet_build_arp.c \
+	libnet_build_ethernet.c \
+	libnet_build_icmp.c \
+	libnet_build_igmp.c \
+	libnet_build_dns.c \
+	libnet_build_snmp.c \
+	libnet_build_rip.c \
+	libnet_build_ospf.c \
+	libnet_build_vrrp.c \
+	libnet_asn1.c \
+	libnet_hex_dump.c \
+	libnet_if_addr.c \
+	libnet_port_list.c
+libnet10_la_LIBADD = @LTLIBOBJS@
+libnet10_la_LDFLAGS = -version-info 0:0:0 # CURRENT[:REVISION[:AGE]]
--- Libnet-1.0.2a/include/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/Makefile.am.fedora		2009-04-18 18:41:05.000000000 +0200
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = libnet
+include_HEADERS = libnet.h
--- Libnet-1.0.2a/include/libnet/Makefile.am		1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/libnet/Makefile.am.fedora	2009-04-18 18:42:02.000000000 +0200
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+pkginclude_HEADERS = \
+	libnet-asn1.h \
+	libnet-functions.h \
+	libnet-headers.h \
+	libnet-macros.h \
+	libnet-ospf.h \
+	libnet-structures.h
--- Libnet-1.0.2a/version.h				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/version.h.fedora			2009-04-18 18:56:15.000000000 +0200
@@ -0,0 +1 @@
+#define VERSION "1.0.2a"
--- Libnet-1.0.2a/libnet-config.in			2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in.fedora		2009-04-18 21:30:00.000000000 +0200
@@ -8,13 +8,13 @@
 #   @configure_input@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I at includedir@/libnet10"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet10"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet10-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]

libnet10-1.0.2a-gcc33.patch:

--- NEW FILE libnet10-1.0.2a-gcc33.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which adds
the missing quotations needed by GCC 3.3 and newer.

--- Libnet-1.0.2a/include/libnet.h		2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h.gcc33	2009-04-18 19:37:20.000000000 +0200
@@ -84,9 +84,9 @@
 #define LIBNET_VERSION  "1.0.2a"
 
 #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll"
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
+"documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */


--- NEW FILE libnet10-config.1 ---
.\" Written by Domenico Andreoli for Debian GNU/Linux.
.\" Do whatever you want with this file.
.\" NO warranty is provided.
.TH libnet10-config 1 "18 January 2002" "Libnet 1.0.2a" "libnet10-config manual"
.SH NAME
libnet10-config \- Get information about a libnet installation
.SH SYNOPSIS
.B libnet10-config [options]
.SH DESCRIPTION
.B libnet10-config
displays information about a previous libnet installation.
.SH OPTIONS
.IP "--cflags"
Set of compiler options (CFLAGS) to use when compiling files that use
libnet.
.IP "--libs"
Shows the complete set of libs and other linker options you will need in order
to link your application with libnet.
.IP "--defines"
Set of compiler defines used to compile libnet.
.SH "EXAMPLES"
What linker options do I need when I link with libnet?

  libnet10-config --libs

What compiler options do I need when I compile using libnet functions?

  libnet10-config --cflags
.SH SEE ALSO
.BR libnet10 (3)
.SH AUTHOR
This manual page was written by Domenico Andreoli <cavok at debian.org>
for the Debian GNU/Linux system (but may be used by others).


Index: libnet10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet10/F-9/libnet10.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libnet10.spec	19 Feb 2008 18:23:14 -0000	1.15
+++ libnet10.spec	18 Apr 2009 20:07:39 -0000	1.16
@@ -1,21 +1,16 @@
-Summary:        High-level API (toolkit) to construct and inject network packets
-Name:           libnet10
-Version:        1.0.2a
-Release:        14%{?dist}
-URL:            http://www.packetfactory.net/libnet/
-License:        BSD
-Group:          System Environment/Libraries
-Source0:        http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0:         libnet10-gcc33.patch
-# add an api version prefix, keep timestamps and correct permissions
-Patch1:         libnet10-1.0.2a-apivers.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Obsoletes:      libnet < 1.1.0
-#Obsoletes:      libnet-devel < 1.1.0
-#Provides:       libnet = %{version}-%{release}
-#Provides:       libnet-devel = %{version}-%{release}
-Provides:       libnet10-devel = %{version}-%{release}
-Provides:       libnet10-static = %{version}-%{release}
+Summary:	High-level API (toolkit) to construct and inject network packets
+Name:		libnet10
+Version:	1.0.2a
+Release:	17%{?dist}
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.packetfactory.net/libnet/
+Source0:	http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{version}.tar.gz
+Source1:	libnet10-config.1
+Patch0:		libnet10-1.0.2a-fedora.patch
+Patch1:		libnet10-1.0.2a-gcc33.patch
+BuildRequires:	%{_includedir}/pcap.h, libtool, autoconf, automake
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -23,54 +18,89 @@
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,
-byte-ordering, OS-dependent issues, and much more. Libnet features portable
-packet creation interfaces at the IP layer and link layer, as well as a host of
-supplementary and complementary functionality. Using libnet, quick and simple
-packet assembly applications can be whipped up with little effort. With a bit
-more time, more complex programs can be written (Traceroute and ping were
-easily rewritten using libnet and libpcap).
-
-This package contains an old and deprecated version of libnet. You need
-it only if the software you are using hasn't been updated to work with
-the newer version and the newer API.
+byte-ordering, OS-dependent issues and much more. Libnet features portable
+packet creation interfaces at the IP layer and link layer, as well as a host
+of supplementary and complementary functionality.
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
+
+%package devel
+Summary:	Development files for the libnet library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The libnet10-devel package includes header files and libraries necessary for
+developing programs which use the libnet library. Using libnet, quick and
+simple packet assembly applications can be whipped up with little effort.
+With a bit more time, more complex programs can be written (traceroute and
+ping were easily rewritten using libnet and libpcap).
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
 
 %prep
 %setup -q -n Libnet-%{version}
-%patch0 -p1 -b .gcc33
-%patch1 -p1 -b .apivers
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .gcc33
 
+# Required to apply changes from Patch0
+autoreconf -i -f
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
+%configure --with-pf_packet=yes
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0
-ln -s ../libnet-1.0.a ${RPM_BUILD_ROOT}%{_libdir}/libnet-1.0/libnet.a
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
-mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
+# Complete the package renaming at missing places
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_includedir}/{libnet{,.h},%{name}}
+mv -f $RPM_BUILD_ROOT%{_bindir}/libnet{,10}-config
+
+# Install all man pages to their appropriate place
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3}/
+install -p -m 644 doc/libnet.3 $RPM_BUILD_ROOT%{_mandir}/man3/%{name}.3
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-config.1
 
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/libnet-config-1.0
-%{_includedir}/libnet-1.0/
-%{_libdir}/libnet-1.0.a
-%{_libdir}/libnet-1.0/
-%{_libdir}/libpwrite.a
-%{_mandir}/man3/libnet-1.0.3*
+%{_libdir}/%{name}.so.*
+%{_mandir}/man3/%{name}.3*
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_mandir}/man1/%{name}-config.1*
+%{_includedir}/%{name}/
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-17
+- Enabled a shared library and made lots of spec file cleanups
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-16
+- Rebuild against gcc 4.4 and rpm 4.6
+
+* Sun Jun 15 2008 Patrice Dumas <pertusus at free.fr> - 1.0.2a-15
+- copy config.* from rpm directory, those shpped with libnet10 are too old
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.2a-14
 - Autorebuild for GCC 4.3
 


--- libnet10-1.0.2a-apivers.patch DELETED ---


--- libnet10-gcc33.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:24 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201824.D0B2110F85A@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gtk2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:27 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201827.2566410F87E@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gtk2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:27 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201827.C51B010F882@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gtk2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:28 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201828.8280810F886@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-gtk2 (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:32 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201832.E82D810F88B@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gtk2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:37 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201837.4620010F891@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-gtk2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:35 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201835.5268E10F88F@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gtk2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sat Apr 18 20:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 18 Apr 2009 20:18:38 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090418201838.2740A10F895@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gtk2 (Fedora 11) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From sandeen at fedoraproject.org  Sat Apr 18 20:19:33 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sat, 18 Apr 2009 20:19:33 +0000 (UTC)
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.52,1.53
Message-ID: <20090418201933.AC4BF700F7@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23439

Modified Files:
	xfsprogs.spec 
Log Message:
* Sat Apr 18 2009 Eric Sandeen <sandeen at redhat.com> 3.0.0-4
- Fix build for non-multilib arches, oops.



Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xfsprogs.spec	18 Apr 2009 12:18:24 -0000	1.52
+++ xfsprogs.spec	18 Apr 2009 20:19:03 -0000	1.53
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	3.0.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -123,7 +123,9 @@
 %{_includedir}/xfs/handle.h
 %{_includedir}/xfs/jdm.h
 %{_includedir}/xfs/linux.h
+%ifarch %{multilib_arches}
 %{_includedir}/xfs/platform_defs-%{_arch}.h
+%endif
 %{_includedir}/xfs/platform_defs.h
 %{_includedir}/xfs/xfs.h
 %{_includedir}/xfs/xfs_fs.h
@@ -184,6 +186,9 @@
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
+* Sat Apr 18 2009 Eric Sandeen <sandeen at redhat.com> 3.0.0-4
+- Fix build for non-multilib arches, oops.
+
 * Sat Apr 18 2009 Eric Sandeen <sandeen at redhat.com> 3.0.0-3
 - Create new xfsprogs-qa-devel subpackage
 



From mbooth at fedoraproject.org  Sat Apr 18 20:48:20 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sat, 18 Apr 2009 20:48:20 +0000 (UTC)
Subject: rpms/eclipse-emf/devel eclipse-emf-platform-docs-location.patch, 1.1,
	1.2 .cvsignore, 1.5, 1.6 eclipse-emf.spec, 1.15, 1.16 sources,
	1.6, 1.7 get-emf.sh, 1.2,
	1.3 eclipse-emf-symlinked-classpath.patch, 1.1,
	1.2 eclipse-emf-make-homeless.patch, 1.1, 1.2
Message-ID: <20090418204820.D5BF6700F7@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-emf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26573/eclipse-emf/devel

Modified Files:
	eclipse-emf-platform-docs-location.patch .cvsignore 
	eclipse-emf.spec sources get-emf.sh 
	eclipse-emf-symlinked-classpath.patch 
	eclipse-emf-make-homeless.patch 
Log Message:
* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 2.5.0-0.1.M6
- Update to Milestone 6 release of 2.5.0.
- Require Eclipse 3.5.0.


eclipse-emf-platform-docs-location.patch:

Index: eclipse-emf-platform-docs-location.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf-platform-docs-location.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-platform-docs-location.patch	6 Feb 2009 14:54:12 -0000	1.1
+++ eclipse-emf-platform-docs-location.patch	18 Apr 2009 20:48:20 -0000	1.2
@@ -1,5 +1,5 @@
---- emf-2.4.1/org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
+--- org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
++++ org.eclipse.emf.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
 @@ -12,7 +12,7 @@
  	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
  
@@ -9,19 +9,8 @@
  	</target>
  	
  	<target name="javadoc" depends="extractPlatformJavadoc">
---- emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
-@@ -12,7 +12,7 @@
- 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
- 
- 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
--		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
-+		<unzip dest="${javadoc.link.location}/platform/"><fileset dir="${eclipseDir}/SDK/plugins"><include name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
- 	</target>
- 	
- 	<target name="javadoc" depends="extractPlatformJavadoc">
---- emf-2.4.1/org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
-+++ emf-2.4.1/org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
+--- org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 15:46:37.000000000 +0000
++++ org.eclipse.xsd.doc/build/javadoc.xml.template	2008-12-11 16:11:50.000000000 +0000
 @@ -12,7 +12,7 @@
  	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
  


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Mar 2009 11:32:46 -0000	1.5
+++ .cvsignore	18 Apr 2009 20:48:20 -0000	1.6
@@ -1 +1 @@
-emf-2.4.2.tar.gz
+emf-2.5.0.tar.gz


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- eclipse-emf.spec	7 Apr 2009 13:07:20 -0000	1.15
+++ eclipse-emf.spec	18 Apr 2009 20:48:20 -0000	1.16
@@ -1,9 +1,9 @@
 %define eclipse_base     %{_libdir}/eclipse
-%define eclipse_dropin   %{_datadir}/eclipse/dropins/emf
+%define eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-emf
-Version:   2.4.2
-Release:   3%{?dist}
+Version:   2.5.0
+Release:   0.1.M6%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -37,14 +37,18 @@
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.4.2
+BuildRequires:    eclipse-pde >= 1:3.5.0
 BuildRequires:    dos2unix
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.4.2
+Requires:         eclipse-platform >= 1:3.5.0
 
 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
-Obsoletes:        %{name}-standalone < %{version}
+Obsoletes:        %{name}-standalone < 2.4
+
+# the SDO sub-project was terminated upstream and removed in EMF 2.5 (see eclipse.org bug #251402)
+Obsoletes:        %{name}-sdo < 2.5
+Obsoletes:        %{name}-sdo-sdk < 2.5
 
 %description
 The Eclipse Modeling Framework (EMF) allows developers to build tools and
@@ -63,27 +67,6 @@
 %description sdk
 Documentation and source for the Eclipse Modeling Framework (EMF).
 
-#TODO: obselete sdo when galileo arrives
-%package   sdo
-Summary:   Service Data Objects (SDO) Eclipse plugin
-Group:     System Environment/Libraries
-Requires:  %{name} = %{version}-%{release}
-
-%description sdo
-Service Data Objects (SDO) is a framework for data application development,
-which includes an architecture and API. It simplifies the J2EE data
-programming model and abstracts data in a service oriented architecture.
-
-#TODO: obselete sdo-sdk when galileo arrives
-%package   sdo-sdk
-Summary:   Eclipse SDO SDK
-Group:     System Environment/Libraries
-Requires:  %{name}-sdo = %{version}-%{release}
-Requires:  %{name}-sdk = %{version}-%{release}
-
-%description sdo-sdk
-Documentation and source for the Eclipse Service Data Objects (SDO) plugin.
-
 %package   xsd
 Summary:   XML Schema Definition (XSD) Eclipse plugin
 Group:     System Environment/Libraries
@@ -119,9 +102,9 @@
 %prep
 %setup -q -n emf-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 %patch3 -p1
 %patch4 -p1
 
@@ -131,7 +114,6 @@
 # link to local java api javadocs
 sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api/|%{_javadocdir}/java|" -e "s|\${javaHome}/docs/api/|%{_javadocdir}/java|" \
   org.eclipse.emf.doc/build/javadoc.xml.template \
-  org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template \
   org.eclipse.xsd.doc/build/javadoc.xml.template
 
 # make sure upstream hasn't sneaked in any jars we don't know about
@@ -150,165 +132,143 @@
 # build all features
 # we use forceContextQualifier because the docs plugins use custom build scripts and don't work otherwise
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.all \
-  -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200902171115"
+  -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200903161215"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin} build/rpmBuild/org.eclipse.emf.all.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/emf build/rpmBuild/org.eclipse.emf.all.zip
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{eclipse_dropin}
-%dir %{eclipse_dropin}/eclipse
-%dir %{eclipse_dropin}/eclipse/features
-%dir %{eclipse_dropin}/eclipse/plugins
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-#%{eclipse_dropin}/eclipse/content.xml
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen.ecore_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.codegen.ecore.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.common_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.common.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.converter_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.databinding_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.databinding.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.editor_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.edit.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping.ui_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping.ecore_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.mapping.ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ant_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.codegen.ecore.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.common_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.common.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.converter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.databinding_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.databinding.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.change_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.change.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.xmi_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.edit.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.exporter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer.java_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.importer.rose_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ui_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
+%dir %{eclipse_dropin}/emf
+%dir %{eclipse_dropin}/emf/eclipse
+%dir %{eclipse_dropin}/emf/eclipse/features
+%dir %{eclipse_dropin}/emf/eclipse/plugins
+%doc org.eclipse.emf-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/epl-v10.html
+%{eclipse_dropin}/emf/eclipse/notice.html
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen.ecore_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.codegen.ecore.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.common_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.common.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.converter_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.databinding_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.databinding.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.ecore_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.ecore.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.edit.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping.ui_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping.ecore_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.mapping.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ant_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.codegen.ecore.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.common_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.common.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.converter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.databinding_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.databinding.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.change_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.change.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.edit.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.exporter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer.java_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.importer.rose_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ui_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
 
 %files sdk
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.doc_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.cheatsheets_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.doc_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.example.installer_*
-
-%files sdo
-%defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.commonj.sdo_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.editor_*
-
-%files sdo-sdk
-%defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.doc_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.ecore.sdo.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.ecore.sdo.source_*
+%doc org.eclipse.emf.sdk-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.doc_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.sdk_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.cheatsheets_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.doc_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.example.installer_*
 
 %files xsd
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.ecore.converter_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.edit_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.editor_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.mapping_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.mapping.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.ecore.converter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.ecore.exporter_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.ecore.importer_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.mapping_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.mapping.editor_*
+%doc org.eclipse.xsd-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.ecore.converter_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.edit_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.editor_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.mapping_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.mapping.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.ecore.converter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.ecore.exporter_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.ecore.importer_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.mapping_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.mapping.editor_*
 
 %files xsd-sdk
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.doc_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.sdk_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.xsd.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.cheatsheets_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.doc_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example.installer_*
+%doc org.eclipse.xsd.sdk-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.doc_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.sdk_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.xsd.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.cheatsheets_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.doc_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.example.installer_*
 
 %files examples
 %defattr(-,root,root,-)
-%doc %{eclipse_dropin}/eclipse/epl-v10.html
-%doc %{eclipse_dropin}/eclipse/notice.html
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.all_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.examples_*
-%{eclipse_dropin}/eclipse/features/org.eclipse.emf.examples.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.activities_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.generator.validator_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.library_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.library.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.library.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.examples.source_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.exporter.html_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.java_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.java.edit_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.emf.java.editor_*
-%{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example_*
+%doc org.eclipse.emf.examples-feature/rootfiles/*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.all_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.examples_*
+%{eclipse_dropin}/emf/eclipse/features/org.eclipse.emf.examples.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.activities_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.generator.validator_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.library_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.library.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.library.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.examples.source_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.exporter.html_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.java_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.java.edit_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.java.editor_*
+%{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.xsd.example_*
 
 %changelog
+* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 2.5.0-0.1.M6
+- Update to Milestone 6 release of 2.5.0.
+- Require Eclipse 3.5.0.
+
 * Tue Apr 7 2009 Alexander Kurtakov <akurtako at redhat.com> 2.4.2-3
 - Fix directory ownership.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2009 11:32:46 -0000	1.6
+++ sources	18 Apr 2009 20:48:20 -0000	1.7
@@ -1 +1 @@
-558e4476348a3ddf7942c91bebc048ce  emf-2.4.2.tar.gz
+ac16602e3acf59cec2abb60467c7a45d  emf-2.5.0.tar.gz


Index: get-emf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/get-emf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-emf.sh	1 Mar 2009 11:32:46 -0000	1.2
+++ get-emf.sh	18 Apr 2009 20:48:20 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="emf"
-VERSION=2.4.2
-TAG="R200902171115"
+VERSION=2.5.0
+TAG="S200903161215"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION

eclipse-emf-symlinked-classpath.patch:

Index: eclipse-emf-symlinked-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf-symlinked-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-symlinked-classpath.patch	6 Feb 2009 14:54:12 -0000	1.1
+++ eclipse-emf-symlinked-classpath.patch	18 Apr 2009 20:48:20 -0000	1.2
@@ -1,5 +1,5 @@
---- emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh.old	2008-12-12 19:35:20.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-12 19:36:10.000000000 +0000
+--- org.eclipse.emf.doc/build/antJavadoc.sh.old	2009-04-18 16:39:29.000000000 +0100
++++ org.eclipse.emf.doc/build/antJavadoc.sh	2009-04-18 16:44:38.000000000 +0100
 @@ -94,13 +94,13 @@
  # The directory of the plugins in the order they were built
  excludes="resources.jar";
@@ -7,7 +7,7 @@
 -pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
 +pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
  
- ### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
+ ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
  ### so that all classes/packages (and thus @links) can be resolved
  
  # All the jars in the plugins directory
@@ -16,26 +16,8 @@
  if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
  
  # Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
---- emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh.old	2008-12-12 19:35:20.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2008-12-12 19:38:27.000000000 +0000
-@@ -71,13 +71,13 @@
- # The directory of the plugins in the order they were built
- excludes="resources.jar";
- includes="org.eclipse.emf.ecore.sdo|org.eclipse.emf.commonj.sdo";
--pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
-+pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
- 
- ### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
- ### so that all classes/packages (and thus @links) can be resolved
- 
- # All the jars in the plugins directory
--classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
-+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
- if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
- 
- # Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
---- emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh.old	2008-12-12 19:40:53.000000000 +0000
-+++ emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-12 19:41:08.000000000 +0000
+--- org.eclipse.xsd.doc/build/antJavadoc.sh.old	2009-04-18 16:39:29.000000000 +0100
++++ org.eclipse.xsd.doc/build/antJavadoc.sh	2009-04-18 16:51:42.000000000 +0100
 @@ -72,13 +72,13 @@
  # The directory of the plugins in the order they were built
  excludes="resources.jar";
@@ -43,7 +25,7 @@
 -pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
 +pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
  
- ### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
+ ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
  ### so that all classes/packages (and thus @links) can be resolved
  
  # All the jars in the plugins directory

eclipse-emf-make-homeless.patch:

Index: eclipse-emf-make-homeless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf-make-homeless.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf-make-homeless.patch	6 Feb 2009 14:54:12 -0000	1.1
+++ eclipse-emf-make-homeless.patch	18 Apr 2009 20:48:20 -0000	1.2
@@ -1,5 +1,5 @@
---- emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:07.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:30.000000000 +0000
+--- org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:07.000000000 +0000
++++ org.eclipse.emf.doc/build/antJavadoc.sh	2008-12-11 15:39:30.000000000 +0000
 @@ -12,9 +12,9 @@
  
  debug=0; if [[ $debug -gt 0 ]]; then echo "[antJd] debug: "$debug; fi
@@ -13,23 +13,8 @@
  
  # current directory - all but the name of this script, no trailing slash
  currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]]; then echo "[antJd] currentPath: "$currentPath; fi
---- emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2008-12-11 16:39:38.000000000 +0000
-+++ emf-2.4.1/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2008-12-11 16:40:04.000000000 +0000
-@@ -12,9 +12,9 @@
- 
- debug=0; if [[ $debug -gt 0 ]]; then echo "[antJd] debug: "$debug; fi
- 
--if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
--if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
--export PATH=${PATH}:${ANT_HOME}/bin
-+#if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-+#if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-+#export PATH=${PATH}:${ANT_HOME}/bin
- 
- # current directory - all but the name of this script, no trailing slash
- currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]]; then echo "[antJd] currentPath: "$currentPath; fi
---- emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:39.000000000 +0000
-+++ emf-2.4.1/org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:52.000000000 +0000
+--- org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:39.000000000 +0000
++++ org.eclipse.xsd.doc/build/antJavadoc.sh	2008-12-11 16:41:52.000000000 +0000
 @@ -12,9 +12,9 @@
  
  debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi



From rdieter at fedoraproject.org  Sat Apr 18 20:51:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 18 Apr 2009 20:51:50 +0000 (UTC)
Subject: rpms/wxMaxima/devel .cvsignore, 1.10, 1.11 sources, 1.9,
	1.10 wxMaxima.spec, 1.26, 1.27
Message-ID: <20090418205150.1960E700F7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26945

Modified Files:
	.cvsignore sources wxMaxima.spec 
Log Message:
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-1
- wxMaxima-0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Nov 2008 16:53:32 -0000	1.10
+++ .cvsignore	18 Apr 2009 20:51:18 -0000	1.11
@@ -1 +1 @@
-wxMaxima-0.7.6.tar.gz
+wxMaxima-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Nov 2008 16:53:32 -0000	1.9
+++ sources	18 Apr 2009 20:51:19 -0000	1.10
@@ -1 +1 @@
-01c607778fa6b332144fcbeb902e6ede  wxMaxima-0.7.6.tar.gz
+a50e7e78e022408fac61634c92bd2341  wxMaxima-0.8.1.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wxMaxima.spec	27 Feb 2009 20:44:49 -0000	1.26
+++ wxMaxima.spec	18 Apr 2009 20:51:19 -0000	1.27
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.6
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -34,21 +34,12 @@
 A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
 
+
 %prep
 %setup -q
 
-## wxmaxima.desktop fixups
-# do (some) Categories munging here, some versions of desktop-file-install 
-# (*cough rhel4*) truncate Categories if --remove-category'd items is a
-# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
-sed -i \
-  -e "s|^Categories=.*|Categories=Utility;|" \
-  -e "s|^Icon=.*|Icon=wxmaxima|" \
-  -e "s|^Terminal=0|Terminal=false|" \
-  wxmaxima.desktop
-
 # app icon
-convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
+convert -resize 48x48 data/wxmaxima.png data/wxmaxima-48x48.png
 
 
 %build
@@ -72,8 +63,8 @@
   wxmaxima.desktop 
 
 # app icon
-install -p -D -m644 wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
-install -p -D -m644 wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
+install -p -D -m644 data/wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+install -p -D -m644 data/wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
 
 # Unpackaged files
 rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
@@ -86,12 +77,18 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f wxMaxima.lang
@@ -106,6 +103,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-1
+- wxMaxima-0.8.1
+
 * Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3 
 - ExclusiveArch: s/i386/%%ix86/
 



From lennart at fedoraproject.org  Sat Apr 18 21:19:22 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sat, 18 Apr 2009 21:19:22 +0000 (UTC)
Subject: rpms/avahi/devel avahi.spec,1.114,1.115
Message-ID: <20090418211922.D11E8700F7@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29374/devel

Modified Files:
	avahi.spec 
Log Message:
drop %config(noreplace)



Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- avahi.spec	14 Apr 2009 02:14:19 -0000	1.114
+++ avahi.spec	18 Apr 2009 21:18:52 -0000	1.115
@@ -414,7 +414,7 @@
 %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
 %config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
+%{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(0755,root,root) %{_sbindir}/avahi-daemon
 %attr(0755,root,root) %{_libdir}/libavahi-common.so.*
 %attr(0755,root,root) %{_libdir}/libavahi-core.so.*



From oget at fedoraproject.org  Sat Apr 18 21:22:53 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 21:22:53 +0000 (UTC)
Subject: rpms/bouncycastle/devel bouncycastle.spec,1.13,1.14
Message-ID: <20090418212253.F13C4700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30111

Modified Files:
	bouncycastle.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
- Don't build AOT bits. The package needs java1.6



Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bouncycastle.spec	9 Apr 2009 19:08:10 -0000	1.13
+++ bouncycastle.spec	18 Apr 2009 21:22:53 -0000	1.14
@@ -1,11 +1,11 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%define archivever  jdk16-142
-%define classname   org.bouncycastle.jce.provider.BouncyCastleProvider
+%global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
+%global archivever  jdk16-142
+%global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.42
-Release:          2%{?dist}
+Release:          3%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -14,6 +14,7 @@
 # bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
 Source0:          bcprov-%{archivever}-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
@@ -24,7 +25,7 @@
 BuildArch:        noarch
 %endif
 BuildRequires:    java-devel >= 1.7
-BuildRequires:    jpackage-utils >= 1.5
+Requires:         java >= 1.7
 BuildRequires:    junit4
 Requires:         junit4
 
@@ -171,6 +172,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
+- Don't build AOT bits. The package needs java1.6
+
 * Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
 - Add missing Requires: junit4
 



From mclasen at fedoraproject.org  Sat Apr 18 21:31:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 18 Apr 2009 21:31:01 +0000 (UTC)
Subject: rpms/gnome-games/F-11 missing-figures.patch, NONE,
	1.1 missing-figures.tar, NONE, 1.1 gnome-games.spec, 1.205, 1.206
Message-ID: <20090418213101.93BBC700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31198

Modified Files:
	gnome-games.spec 
Added Files:
	missing-figures.patch missing-figures.tar 
Log Message:
fix some missing figures in same-gnome manual


missing-figures.patch:

--- NEW FILE missing-figures.patch ---
diff -up gnome-games-2.26.1/same-gnome/help/Makefile.am.help-figures gnome-games-2.26.1/same-gnome/help/Makefile.am
--- gnome-games-2.26.1/same-gnome/help/Makefile.am.help-figures	2009-04-18 17:17:53.170724505 -0400
+++ gnome-games-2.26.1/same-gnome/help/Makefile.am	2009-04-18 17:17:11.996975235 -0400
@@ -18,7 +18,10 @@ DOC_INCLUDES = \
 	legal.xml
 
 DOC_FIGURES = \
-	figures/play.png \
+	figures/play1.png \
+	figures/play2.png \
+	figures/play3.png \
+	figures/play4.png \
 	figures/start-up.png
 
 dist-hook: doc-dist-hook


--- NEW FILE missing-figures.tar ---
play1.png


IHDR
??#???????{$??ukSj?"[7???.??e???\~??CX??X<?
???*???r???Ak-???3???C0????,?f FD??q_?s??:?k??????^???=0??5?6L?????~?6??x0!?X?e+?K_~???g?
!c?????,???R??d????{?-WM??O???B?*?K?K??????W?????Y?D
???'Phf??<y????o??????????????}???3??[????u3i?{?~???????1???O????/\>???\????V+g?A??
???D???j???n????????B\?|??W_=?<
?Z??zj?\+c+=????T3??Z??wg?????w??:Om?????K??k/?;?`]?"?d?h?\?U?8??
 ?r???y?B3

!,t{zu???F?#?e??3/?.<??j?????Y????Z-dm??d?
W??vQk??4?P?1??D
?B?s???O2???3?????yk'????|?d[???b?`3?]$&?u?8g?e?"?????jQt?efpR*?e??K??????u?@???????K/^????6g<?Y?!?\h???<k???D???u{???????RvB?1.?X????>!?^hf???|????g7??u[m?l???r????k??d_?Y?=???U0?^g5i?????a???a?,%???
???????+"s?M?C??$Zj
???h????k?U??td?[;???o~e???V??YV
??{?$??&(D?jO???Z??????{????1?{B ???m<?yY?Lp?me??@???9??Z?E?e?9???}B?UO????6??]?
G??v???+?`??$8?"s

?5>@??3??(??m<?0?
H?????R?
=??}???
 ?f???????-QE??z????j?^y??6?xDd???8?
?|g??o???1D???04??v????????~qS??Aem?B{?????u???]?FF???y?J?w????Efd???s??`-?2:???D?nx?u?e?d??V?h}??????"f???eY??o?????m??L K
??????R;??Y?u:?T?(?rz?????d????}k?u.???@??????B?
???,.*+:K-?K
?2?4??!^
G at -^???
?
 Y????B??H?????Z??gT?x?C????v?????,??????n???2??s.?5tm???Sg?I
D?8(u`????"?
1???y?2??xi1??T??<j@ ? ?PY?u?N?!?p??(s?!#3v`???Hrp"H??T&p.saj?$???,?B:$`?


???;??j[)&?Vs?U?\???????q?????;?j??u?n?
?,t~2/?e??/g2??.?V??????????om????\
ocH??(?CL

?X?A3??}{??0v????`????8???p???7??
??1?B)??
???"
?,t	???5^\j?~??????m}s????+E??9gC
)?????h<?8?w@?D?Vcj??????G?]??6?("N?
?z%'8?9?z?9??b???6/-?^?
???^?;???vP
?
??y.??????	y?qc???w???;????zeY"b]?R??
??fsw??s?c??UU?j??????????@?6????f:p
?a????$?b?`
?)
?[BD?9o,??"???
?8"
# D ?L????{c_?}.?om
z@??????L?CD?}!?H1"??Z?1o??F?Lf??4?)?????43????????]????!?6??8
?? 
8Q?9?????|b?i\???^~??V????????LJ
????g
?

2b?-ur?6?q?b????K?+?9o ?:?0?S?Z;?3.???????
?#?[,??Oe?B??B?}Y??P*\"
D?H@
Yp?????v{?Y????M??K?>??W???.????B????.?tMn?=?yg1,//w?????1???????~?1p??C?N!??E??=?UG ?E!c?DbpH?E??	[????F?Ude??????6
???&"g??djU??{b9?????????#??#?M??,{???O_?r??j?nE">E?`\ ? ??@?[??????|??/N?P?'?%
?|{??;7n???/7?????????A?	?K?Z?@?3C?"
""j????????=X(?2???g?n_i?B?bBf<X??C?U3?T!?}?bO??lBWYwiea??+?]XZ]
??G?8????????o?nl^???`;???O??v.?"pD??VjI?\HItD?!D????q??E&???5

?i??	?v??=???V??:VX?9?v.???C???????58?????9w~aa!?H bS?\?t???5???m??G?U??y?$?O???L??aq???Ym????z??AYvN?8q?????"????wO???+????F?????????8?}?$?G?ofB???????;u?????
.??;W??M?KWHc)?8????????X_?&?OZ?N????~?m??_?]I??7_z?]???z?B?_|??,???y?bq?
?
?????|???????nm=??	u????g/t????7?????N?.?8!?d??w?????Q?n???1??"?W?????7??M_?v?]U?????a?P7??d?B??{?#z?y?V{mm?1f?m??5V	-B???'????|?K??????????

?/???RzB?1??+?!B???pI?????????G??yy^dY?O?Yg?????u??????????%~S?f?Ocd
??X\?s?w'K@?r???????{H????>?]??&?j????L??aq}D9/?
?/%j?X,?&?s??S?[c
/??C?
?,?a?h??BpM???>r?S1?s????&??????+EZI??}^<?,J????]??
??H?D? 
?L
?,?a?h????????H)?i??(
?????g;????*????	??+??|?|(????o???h??

?\$b?D????????G?9??g?SJ???=??;<j??:?X???>g????????V???o???3??.h?O?756?+??C??c?p?o?w???????=??????????5???P??????????
4?LZ`i?K?	[?g?_z3??H!?Y!
?zJB&/?]M$T???#
?=2Z?\????y3??????????73Z?\???Q?:?AZ-":????m???^w??~???????4??i}r.t`?????[?'n}?A???v???????V?????`???D???hl]xd??D`:r?E?G??;P{?B?y3????????=???v.4??q??h?s?9?w??fF???A?{?73Z?\??B?????fF??X???~??$??V;:???
?>????j?B:6??=??D?u?%?ZQy?;??L?OC?????5)e??j	(?j?B???=?E?^???H???
??Z1T??)??np???????????????8/?j??:v?i?T?????????j??????Kj??s?C????ig.t`?]??M?])9?????;???kW|??????9??|???a3D?Z?`??P7u?8?^?.?3?8?=?K????L?D?SJh???{3B???k??Q$Zm;??N5?CZ????B???%?.iA?"?_??7??V?J?i*??????
??'{$??vN
???#?$????(?-????????;????????K?????#h??C??>?0?n??DpJ?????????,????B??&u????i?G?
??p
????
????{???5??\o?(????r^??N&????Za?`?^?7?a????9m???y?????g????G?j?B???j
??q`h.???X??M_?X?R,??
j.>??@?H
??? W?B_??1??,[Y^??K??={6}~8?|sc#?s)??r2??{????|?U?_=?	??~~??_??1????????^?z???`M???-,.?~???_z??Skkw???????`{?A8zZ????	?????????????V==1Ft??O:??r????<?O?>???r??????7t|???????1?????????!?Lf???N?*Zu]K!??EQ?g(?pR??,???/gYv??????';o?\=??????W???o?yB??<??xb??.????9??f?	!?Y;Bl???8?LR???=}?B?????r??zP??:D<?????/?????????,???Y???{wsc???????c??w??J????{??d?hmen9?????ys?????_?.]?????,????e?$?N?????D????vN??<??<?]?d?1?a????nO??4u????????u??_z??????v???g21???vY????iQkMD??^?)z?????.????`??rU?;o?\=?????+??|?U??<s?Y?e0\D?!7q?EB?n???O???i?P?X??RJ?l?????~?a?=?\m??5V	-B?`P'????|??a2?S?O?\5f??.?P?zK?+?4???^)?????.??	`????lzn\?q??Qe?bQJ??
ex?#????"Wm=c?c?N????B?M????

t:??1?4MS??Rz?e??&??Ta??s?????????????????B?-t??^??`?I??T	?Rm<?yY?Lp?me??@???9??Z?E?ei??w?T????8o?\=???].?3g?*???i
Q?K???1FQ?u??Ng6??4f<?q??z`???<????????{??}!??S?(Dc?R?{??Rg|?[t:?t????tH?.??????Y?j?ruW??????R??!t??cQZ????'(e:w??????zJY??????M&?d??????=
???l?9r??B?/t?vY?e??R??????S???~???t?u??W??,????h$?!?w???X?????T???nw2???z0
???P?C??8?e}?????HE.&
2L#??O?Y.	???vS??{^_??????f?G???C?*??2}B??????G W????!~?Nm?
_2?3??S???;????P?@"????x`?
???KB???0?3:n?#??????O????J*???5?????9??Na?1u ;??RJ7??
?9g??1=p??h???????]]?wn??3c!??,
-}???"5?~?Y?:7???????????4My??`?Q????h??v?q
????BH?y&?


IHDR
m*M???1cfD??g??L??v????_<??m5j?
?s??????\???ww
\??		!?1k?+/????s??RB)?????2???z4?s??????|3.4??5Z????????????<q??i? 0?@??[?v??^??|??_????????g??$
??????q??x???????????Gr!?H?Y(?6?!
M,u??S????O???????X????k+??`??|?=
?rT???|?_????_??`w?f?yZ?.???_?t???F&??f?l
?4S?QH??G?Q???$Veu???kW??wwgEhR?@8????????K1???l|K???????jT??k]?????&4:?*??|?w??q?????;??3?????^??7?#"#j!mm??Q*t?e)???"?'?H?M-e??.? ???;#t????_=??cf?Hq??J???Z????uU)?RM?$?f?????Ha??(??9???????X??????/?}?u?=\2?;bXy
!???3?????!x??s????7=???LUhB?@8???>???w??????4??J??XW?]??j?0kb%c3?"p?????a??yc4^?"??o>5%??g???g????WzB?e?????--u3???zW0???3????]a?y?M?????Q3W??;?>fu??Ei????O????Z?VQJ?V????v;???????3???re??Y?eY??""???s.?????'??b\V?T?&?:s??????r??f???4}?????LS
l	???k?v3???????1p??[?%?????/\8%*??}wk??[?????????????
?a#????X??<)???????B?????j0y????8jUZY7?<.?qU????d??t???K/^!4[M)??&R?1F??????e??u]3?????S?(?7??q???VN???????c???X????yj??3;&??FSV.??l??[[?63}??3cB?5rQc??w5???l1??C?????????A7??S??9?h??s?^??$oD??d&????C??????????G???"
@??t
+;???Q??6[???n
????O>u??K?y?d??????Ti??G?????v?i?Y?%???F????	b!?z?~????I
M,u ??????U'`KR3?=?,?Z??\n^??{????7??|N?s?c!JP?d??? (j8?? Gu????0?4W???????c?^;w??5ar

9?, ZBG"??V?h??h???W2k?>??:t?oi?TU?
??{{?{?S??y??g?REYdyV??-??-???,??(?sDd?!?c?e>?TxK??sNk??q??mwZeYNXhr???>??+????.??????V?;?W???1???????????uI?c???Z???+[?Qf?	???????,?^=??V?SO?????|???F???3?V?b??#n
Q?1?R??HfLRQ??????*?ad?
Q??lt?????7v?????-u???!?#3????m!k??(i??<??RJ??????B??[??`?SJu;????$?&?:???????}*7????{???+wm?TG??Jo?D????x?,??pH????a1?"?????~?K+??d???`???ol??1?8%?5??_y??f%A?H?W??(2 J)|5D?,]$?Qa!G&??:Z[8&????#qA?W?0 ?"?[_?L???.3cR???v??0)??
!?w??9?"fY??"??.?Ry?oooQ???Z?j4
S?-??--h???k?Z!r??T?{???????+L?p??<i?5?W?}???bI?"xTFr?
???f??n??????g??;??s??;7???7??????;??n??Wr??Zt??[{m{????5l??T?oV\???p:??)vo?T[??VB!?3???????Cme??e5??wF??*??????
p]???A???k,?R??us\??
?q=?
M,ugO.???@?Jik?'?J9?x????[?n;B??n???????x}C ?w??????S???????o?o?;?x??s?TO???i?.?V??8?t?7n??lD??[={????I??_Yb?E)?i/?????????BY{GP?w!?lf???B(M+T??pTWl#;?++?f3???t?(????777???7????n?S???j???I?h4JnH?}???>'	?#C
??zh?Q?R???2?>???????????rV[;?eTK
???????a????*???`?=X_??YK?#f??c9?QJ?)[TB?$?^??&????????z??`0H?%1m[
??^J??|?vT?9?(?
?Y$?????R??[???<_?y??R'7?h???h??j?J????????C`f?V??3y?w?Q1EQ???I[??|?i?w??????q?#????????SV?j????i	!
?


?80??dh??r?,X[\???Ou~?J>?w(0??'??y???Z
??L?L	
	?B??????(????p#K? k??Qe?-??v2??t??`?j?eh
?h0?\?f??Js?T??Z??QUU????d???FqRe#"uBeY0E"f!P?l4?????R?`x??g?y3???=???&??6k?[?+o?QQH???
??")
^d?wA?
f`D??}?????w	O
?????
?@
H?H????h???h?
?C
d91?`+
? d-?+??WZ???Eq??U???,?Y??kZ???:?????Y???VHbD?????`???????

E9?P???&?:?7A?A??I????r??Po??
"
M,u
???-????'??V?J????BI?
!??e)???6?u1F?R:?R23
??^g\T?#4??!?s?<??g>?w????|)??u?)?tM??7?qg1???v?vg??~??????~?A?????
??1?P?K??????????w??}z at j??w?~?J??
?PI#?)&, "b-?b4?\?!??-d????ivzJi[W(QT????U]???8F?P???	M&uyn:+kKk?^y????k?#?S?TD??:??l?yw{???????>?.?E???d? ??K??e?c?D"?H???PH?????#j=.j
???#???????(&)4X???h:?;j*%d'&)4X???h:?;r???I
???#??????z?21????uD?q?Q?P?????	???#??????ZWq?B???=??????&????<I????uDS??5	UhU?MRh???G???w?$?n?HO???,?QG4%?1	????w')4X???hZ?;Zjd
@???,?QG4-?-	u?w6?')4X?????
?)???
X
?I????????
?jpX?A#SC?????? V$??^?e0???MRh???c/_x
?w???6??
?w??c??????y???
?w??c????p?1ks?]8??Yo^@???6/???s^?D??O~z??????7~??>?k???Yz?m^@?3??/??O????????????2???Q????[????2?g?{???????e?G??9
??nf????~q??	
?Ys^????+???????????li?????_????x????Q?????.*???w????
???????[???q:??????u^??????>???????"4?D?s???k?????~?{_??/???~??w???????????????????CS???%5i?G?<?c	??u???}2?????_???\??
?n0???
????7?_?gmm?p???z?+o??w??$T???????S???	!>???????KKK1F?MU?[?V#oE???Z?ycRp???Zk"???t??1???k???YZ?s????]?|???_??,???,R\>??n??V??}?}]?B
?T?4	??l"?h4BXk%?sg?2C4?wg?7???N"?{r??KO?766??2??Z????dw??l????????????;??8??Z????9???kk?p??????$w????_??x???>?Z??*?B)?j???n?????{}f^^^NSC)e?eY???b????`????N?>?V?i:o??????;?O?????C?VS
i??c???f?u63eY"b]?????v??B(???vi???X???9o.??????	%?|????.5?????!7?1*??)??G?????v?i?[?%???F???d>b!?z??9oN???a???g?}V)U?E?gUQ??2@??RJ!??,??9GD?"?1fY??O???9??"???t??c`>??
?[????Rg?ZB?12sZ4???V???V?????q!?t?)??1?{!D}??c|???8o~?????/u??O?]&"f6??e	
!?????h???B!????{B?!P?We~??1?k?N??4??c??!?<????????{?iZkcL??N??V?upt ??F?Q?]ZX8?????J?Sb??
r?@h?R?h?Z?V?eZ??	??i?_k??J??^??n?
`4y???0??????"????|pa?????????.??!????
?0E6?| W?d?`q's1????:????+ZkfN??T?K?=?}]?iFHD????VUU?Fg
?*????v?=h???[??|I?8a???>??L????????????X????O:??VWO<???KK?1?
 ]?M??d???>???Z???VH??G?????`?????wK??	U?A???z??I??	?7X?

!??e)???v2?u1F?R:?R23
??^g\????
W??"W?<x?X??E?
F??L???!?u?$$????%?H???4;=???+?(*mdtR?????h#????(??j5??$??????


IHDR
30lx?`???$??A{??N??aw???[?nYR??b?U????{??Y??o?DI?f?n????B?y?u????r???]df8l?m?My??p??y?I?L@???P??I???s??3O?z??|???
?s?????/^????????'??[s?s??_??/?????%?6&(y?Won????/}??}?O?:?:????9
?Vn~??????v???D/?<???o?????S=????]???i)?(8_{?D??W???W~?w~??_??pk??7=BZ????????=???<O?????

???.?????.,_X?_D???=????cZ???1????ok????=?????q?'fS"Qw0	y??????o~???k???<u8?}@?O}??>??g??Vt>?Qi??JG??????*?
?s???Fk?1??}?????????W??
j???????Oo?????T??L???d?[?2g? 90?wHM???XY??\??u$Tfy????xa??O????@n>??V*?????=?*??????c?ik[A???f???Uy?k?b????|?|??{?l??|??O??'????:M?+???Z?V???zW2???1?(?^	olOXb???g6v?SjeJr??S???*_V?mZ??g?3O?_?|2????|????3IK
l???G[?V?YgG?V?1p???????'e??S??D?/???w??@??#?/|??3K-?&R*D?y&&Z"zb??? ?#?Z*
?6?O???<?V;?8n??i/??uQ?W???;?-??t????I??yK?.v?t???:?k?z???$	AtE?g?`0?;?&??-G?q??rq???{ 7"?\Y?:o[o??~??????}
I?$M?T+?>?????L0??H?&?????c?\????grdb??8?D?C????????RW???g??y???-???w?????-???n??????|g?g$<?QU!P?%???TNPXH??#c\U??nk??y??t?~???/???N
]U??<???_???9s*e?-/?b???U"ME;?M?Y?]+?j[?(?@??????Uq???*l???~???~??????j7?G???y????t????e??L???2K?[?sD
6?X?J
(2 J)|=B??\$?qi!C&4?DkK?D
|Y?9??]O>t?=n?????_??u??????z??????<???C-?KB??J$??L!z?#1r(1?a?Se0[m?Ek9!SX??aY????c?88????I

??????????{?0???g??o^]_???????;??[???@?Wn?????G{O?\?????????s???????
eihc???????q;??c??????l

???????RZ
wb?TIH??<X_??%?1??lL?
????e-4H?
??HE-]%????2???cc?Z??He?\;g+?9?M??v=0
?	?B?TumRA`?i?"??EF????
?(?6?l??r?????????b??&???
??????)?(?@?H
4?$}???6p/`Bi&DK??
j
`&D?W????H?/?????@
????????????c??z?????
?`L!??X??G??3(????|kl}|3"?C?aH?
*H1H
>
?}("U?G?y?*?M?????y0?@`!D??K????gi|5??0BJ?g?;?!?c??]?Y/m???\
>??1?k;[??{$?i?????

?@IL???R at dhN0
	????s-k??!R???@?j?2?v????vZ9??2??7???????9z?[XR?%

5??]?}W!W?I???{???'O?TJ	!???I?j????????+/}?e_?}?y?7????V;1??????>}????;~?tt???,Kf??,I??xl???7o^|??`?}W???;obM!?vb?U???s?^x????O
??????^???+?M.?}??p%Y ???g??\?HR?u'r? "s?,??v?n[??|??ti??N??]??O???>????L?1?I]?N;???,??Z?,?b?B
???Zk"?Yr???$I?\?2???O??????a??????????,?V??cO>e
????~l6}C?>??s???g?4?1?I)?????R???????FH??j%-j?Z?8???Z??????Y???7????V;1?*"?|d??s??????N???n?=?$??????fQG??>
!n??YE3?i?C?{?3/=
?67?|?h?h??D?>???????????,?R?V??;?Nacg}?=`????f~#?L?4M?f?CDD?????1?t{f?hUUm?y?h
i?C?v????????gC?vK
??$R?1F[???4??
?1????u{?B(?r?!5??fw|??|Q?7n??1N>u???i?4rU(???g;w.??$M|Y?&I?T?c?c???{D?????fUXU??y??u?<*b!????`?a]UL,????>???N??'?PJ?U?fi]V?X?t?Ji!DUUUY:??(I"?1?i??o?aM???k???v
V????????&?A?jx?*b?????XkC1Ffn???? B??t????pY?!bY?RJ???*I????n?Y??BZ????L?w???h?S?\M?|??,1s?$???????m`R??!??9?"?i??"??TJ?,?666?????Z?z<
r5o???v??Z?f?????j??R??????N?
?Y$??|%y?vj???????fj???4??l4?u]U?s.I??????4??n?;I?$ij??fje????9!??n???XDC?????,?M??X???
?Y?5???????????Y??voP??6?3|]??:??t???\DB????p8??Z)?L??Y???F?1?s)esj?y`M'?#????k?t4?????G???HD '???\DE???j???,?1Y?i?[?VsF7I?????????!0s?x??n?>???Zg-3{?B?D?y?LB?I:or ?v
??1???r??n?8M?Uk?L}??v?5??y6{??f?n
?sj????
?D
)B?????Z?=??~M???	E4????!W??????y?g#?@D?HDL?Rz??(???????x??N
?h??
o"W???A?^{r??B?^g~?h??B B?J??????????Q)?I)???sn{?Y???r?t??D??{??g>???????V?????j??M??
 ?h??n??Zi!d?(?$?1x??nu
@
il
?eYVUu?%??@1?PD?M??r??WJl?I??WJ[S?DQ?DF'???L]??E????kM,u??h?i??A??@R"b?h??.J??
??M0u????V{(?@
}??j??;1?{???FZ??aq'&tS?]G??>,????m???	??????j?'?S?w?j
????b?E??'k?vm??bmu??????3???[ ???"?l!?Ad??????$?U????N??A
????????j??;1?}J?w?v??????M9?v*????????&F??>,????/u?y4?v?????????tZ??aq'&???{?=???)??NJh?S?^??Z??aq'&???{/?M
?v???????????V;}X??	?w???????NwbB????;ojh???????~?????Z??bq' ????????V;}X??	?w???????NwbB????;ojh???????~??]?*?A??>,????;u?UI?Z??aq'&???{/?M
?v???????????V;?X?I	?w??????N??>,????5u?d?hs?w????????a????n?Gg??V??&?,??j?????z?V(H??Ct???b??}??(?A?*???Z??>wd~~~?Z?Yf6??Ad???3s?M%nN?7p?????z?$??/uy~b?????NLh?Rw?w?&F??>,????5u??@pqe@>????Z??]?A2???T????E????4+??WnnQ?	?
?? ??,???k???!??+????.??NwbB?6u????)??NR?????V;}X??	???}W?j??;1????CZ?bq'(??O?!??P?`??;Zm?n??????'??S?;?t??t?@??/\??]^???????????hg?????&?}?Rw??*?K'O????[??s??C?i?o6?v
????~?D?AL?}?<T???_????<W??" 
?b"?N??'?CDH%?H??T(?????|??????????D?
M?}?<?????zn??1?pTZ??|????5YLM????????8??)??;?????????7?????????Ad????;????g?v?}?3	{???r&?sQEbr??ca?
??3?n?2	???s????{:/\=v?????d8jF:??Q?g?6.?8?
l???G[?V?YgG?V?1p???????'e??S??D?/???w??Jhb??=u?<L???:s???$???%
k;i:?????R???i?? ?"?3a0??a?????8BY???nk?=?t??,u7?k?0y??Ad? u?y?A??gN???1?n???V???Y?c??0???????g??m???GU!?@	
??2?S9Ai`!=B??qUYb(???M=;???? ?????w?>?j????O=<???U??Z???????b?????S)ly9?? ??i*?)l??j?ZIV??D?$|d$^????.Wa?
M?V;-?{/?????o???}?????~?tknq?W/?x???c??8?/e_??
?v???????????W??"!GP?3U?]{m????1??B1I??Ad?'u???????t??{?t???J??V?.?
o?????'??~??O]Z??????????????y?|?Q???k?l????????:?r??V??? =2I??Ad?&u???}???X?]\<????zOF?r?L?????+7???_yc??+^]????8?W??h?????????p?p.???<??W?,
m????8
!???DvzRwW??7?V
?g???g'???V?????ta?????(?
??L???"?>.??-B5?^???\y?*!?%Ckv?B??NM???????B?(p?g???|??q?[q??`?'?z?I?
M";5??[A??5?Zo????
?????`?Rz????J????l??
D?9?????6|?=?l?#??su]7???????
!?Ad????????`????)?q???j?<T7?????/??\=?~????X??6?l?

?!?X
?;?@?k(?Au@????[??PmRv?????e

!???b?=$}?X??????????????????????4???Z?fj8?w?N?)u~?
"?????V{(t0B???}?S-?:?g?<????^;7, ??w??1_?r?????
.?}??{??=????"?v???,|???gO???r??B????P`m?B
???.?????.,_X?/?k??}??
'^h?z???????L????$?|??:??"???P????opy????I??????z??iE????????t?
]mYJ)????!?$??J???? ?????!???{????l??M?4R?=2??wwF;??7??I?????????)Q?<~?b?w?wi???V/~??<????
)?I%?D	I??? s?
?#
y?D??hK?1??Z???SGBe?7??h?????{#???|??O??'????:M?+???Z?V???zW2???1?(?^	olOXb???g6v?SjeJr??S???*_V??R?O???t???j?t?????,?t?H????h????
???Rp??Nhh?4???>?:g?[????]ch??0wF?Em^??????L
?9??V?A?-?????N???
-????=???<m)"?
??6??w???CZ??:????K???????@??{??sRk?????}Y?$?????R~??S?\??w?Y?H??V+???B??C]?#S??????{w??j????????N+?f???DB??F;C
I??T?S????v#=Y_o`2[?U5?-?b?????L???;??~X?????hn65???? ?@!?C??Q????:?????y??6?YK?cf??X6J?Se?Zh??L????{w??j???+????U?:?????vS?B
??HE-]%????2???cc?Z??He?\;g+?9?M??v=?DS?????;??V?a?*?Jj???? ?
???1F??m ?C?2???j?????U?CZ???\\??T?T	
>f???????P?

Y
??,;???xz?e???+???????P`??B???0?f?S??v'?????
\&?Hu?HM>H]?5??()???Q????????q=????~;}????:?9??B??
??????8?@?AQ?U??[c??4?w?/_?CZ???)??62%?,????)??@?`3?A?1F?PpM
??@6?C??f?B!?xP?????
????w?????jWvLrk|?T?
?BC?
?? ?????q??Q??*?{??=???/?6S?N?lK?d?# ?H?????wn\?m??1u???{H??????R??D?(T2?? "?i9?.?M??<up/?????I?jA"??cr?e?c?? D???AJ|4??[?w????8L?a;????????G?


IHDR
?[U?Z?????]df8i'-yS???,??????K?e	??u???\??a???.?rqm<(;?
?s?????o????{??
.??N?T?+????|?????z5 0?@??[_;??\??7??????????h??Z?s?

!???|????^?r???aUr$??D??kC
???1?.zgs?bh???nl?????a?E?j??W?????W_oIiE?b&???3?!"?r$IM.~?o??????????L?O??i?_??s???/]^??BH=I?D!@`?1@???k??'k????zg{??????&????.??q??V8k,?@>?J??,??q/????2??b%'f?Y(G??wL?????}??8O?Lu??????????a???GDF?B??F??T??e)???"?'?H??*;??B??6??L?????>sipi8[?????x
?#
y?D???6c[?^?kO??????P
???????v ?V?A??,??e`????
??vf?0???X???????h??????? ?fr??8???~??K??7?vuI??<???E5?RWE.k?]?"B????z%|g?????_?;:??*? ???.?[;h}???he?_-/?tm???r?)?|?f?????B/?F????*
????mp<l?ngIA?`,????Kg??7??{?G??O???k?F???W.??t?I????i????
???Rp??Nh?Tr??%?L??9V???|`0?qX?,Lm????O??`6x????/?g???4.?|m?tze\??????,1yY?Cg?????f?g([?
qr/?.??3??MN??ij??_????/U?m?HReyV?ZI?!D?h??????G?<+D$?c?;???Q???$>?6????N-u?^?t??X??F
?????$???x}??s??k???C_??gm-?@	
???\U%A??z~?u?k?C=?V?????y??o?w~??/\,?JAY
 2?B@????????????`?Um??f?????*???YZ??)????a??B???/??:^}X?????????????????9x9???? ?o3??tT??X??UYal?E?$|d$?m?{?n???Pp???>5M+???7^y?j??T?2WZ9y+t?
`$"?3IE-?,$?Vi
?L??M?LGyv#?}?x?{~c???sE???o\9??fvc??????N???=?????????(?g??p????K?G?k??;?-???t???wn??]1X?nr??OM?????a1??$?Ix?
TJ[?=A????Q??;?[???y?z??? ??????8?w??????7v??nw?~?\y???{fI???ho;??3?9q?????????LEf?@?g??u?9?5???%f??2??+kz|??w?)A.??wm?
?0SU??A?B?
?i??Qg?Fv?O??;????!?????????%?=?k?.???????s
WK/
?v??(?n?*??G???:W2?3???2k	~?,"w]lk?????$?
?
d}?\@&B!
Q?B?T?t?? ?(?v?"??\KV

#???{3?!*9p(??
?#?2?K?1/??????t??????V(?IQ?"/?X
&/JP? ?
??3w?H???o??q???G ??0??R?/??
??]??L?HM>HmE??c`?A??????1o`??K 
7oAK??@ ?e?R@? h'??h?
%?"????Pc?h2?n???c????"v???l ?"?a?BvB????????8???-XA???^?????#3
?3np7??<??j3????Bv
|??Og?:??????!?B??
????
?E?9l)(8????v<k?????
ShI Y??
?
(D??
??BY??????]}?????*)D%!0!D?#K
???` 
?;q^
?J??@?2S?d&?)?D)@D?N??|n\?!v??qBE??VO/??p??????A	?DO?R?C??p?????????&??????????K-?????)F??A?T????????U	 V????ihM\k?????fI%?%?????c?}??B?,?N??????.(??R????,???Z??|~???7?#_?}??>/YD?F?M?\???/]???????x):??D????4
3E?e?|>??N???n?sc29?@??Sw^???V?????z??o?q??%
?????,?????????????G!???????2?u?{??c????
a?????4_???V??????~????`0h?F)5?<c{G???	3?????)e??y??""???????h???n??5??r^???V??:?????W?\	!T?J
??,R?1F???|??m??]?1??~<S?i??????????????~L?I??j?!W??=?3W??E???????,?@????b?~??{????(???
??%???,KcL???9???4?L&??tU?,?????C?G/???R?i???M???2?p8PJ!??m??9GDY?Q?1?s|???
??~Im?
!??A?????,????C?"V??????6?cd?~?m;D????????(
Dl?FJ??SReY??Bt?Z_??x#m<Z:??$?]???V???k???+D??Y?????x\
?,??B?L?s?9D??\)EDm?*??????#?~??j??|
	.+???K?b?j?!W??V6?dY?u??k?"?1 ???w????|?@??<????c??Z?T?4UU??Q?????dt?
?,???E????d??<??????~???v?=?y??:{?,G??cBRJ!D_??????!"?B?lI??!?(z??4???y?"ZLZm2???????b???????????????????l8??????A{?7????C????9?}_?"G?
?t??y?"ZHZm2??t:3?(??)v?+????1?e)???6??w?fD?T?s}MG?[c????1D!??@&]a??h!i?????v]?????????ZWU???fYf??????if????c???>???Zg-3{?B?D?y?LB???K?B?j?!Wcp????`?Oq??W?u??1?8???????{
?`?o8??????`?D?B??|??>9]DI?M?\?>???=w)???88XZZ?????e?4???????Z?{????1??D}???????L????t^???V{?<"????G?l=?\???"Wm?vcnf?ww?ll??@k???R?.W????????Q_????????t??{?Y"b`&
?h?v??OD????????4}?p\b??@<:?O_?.????&C??????Skkkk??~?????R?3??W`???B?JJ"???c??=??
?y???)p(E?\?:R;????MO?_G??????SJ)3???&2?!?
)?????Z?M??
??;???????j?U:!!?????"??'!???c?????????D??????Cd??P???rW?i?h????M&?,u???i????M(?(u????V??X?4B)S??y?h????M&?,u????V?xX?dB?R??y?h????M&?,u????V??X?TB?R??y?h????M&?,uI???V?xX?dB?R??y?h????M&?,uI???V?xX?dB?R??y?h????M&?,uI???V??X?B?S??y?h????M&?,uI???V?xX?dB?R??y?h????M&?,ui??T?????&J????KF?]<,n2?d?K??HE?]<,n2?d?K??d?????J???UR?h????M&?,uI???V?`X??BiR??>?v???????.???d?????&J????7?&???hZ?
?E?9??R=??}?#???.?N&????Q>	?
?Ad?Y???JAd??P???R????.7?P????[@ZZ??aqS
?I]R??-?v???????.???????.7?P??%u????t??E??&J????Nh?'B??~QZm9?VWV????????<{?j6 @`?????vf?????o~????;?????Y??x?%J?]??%mU??\?????_???????<???T?e??R0Qp?x?D??????o????_???L?}?^?/?dB? ??????C???+???~?????????s1?Bg????
r	9??&?
?????????w??{???*?P2????.???}~t????g??Yc)b?W2??d1??{ql????8=+9?0C?B9r???`????h???U"?d??K]Z???bu???^\?r????x
?????:??????v?t?R/^?tF????{???i	%??.^??9???/_}a?????$?qq??k???+?*?g?t?e!????Bt:?]?]0?6??8C???7h?c?{t?O??o??^(Dv?R??yB/_?\n?aT??IU???Y??ly??R?9?????????/Hx???B?JFY?????`=?E????M??U??zv?X(Dv?R??y???/??:^}X?????????????????9x9???? ?o3??tT??X??UYal?E?$|d$?m?{?n???PpMj?d???K]R???????\?e???W?|???????#???????{??`,??lF?+??Y3=?!w????Q?Z+??d?q{:???????>bA???$JF?]???t?x???????>?&??K???
????????<?[???????xyPfMmA?jA+c}??;????#(???=?;{w??W?????P?J?]??%u??0???/?8S?D???
u?axg{?_<?l???}?????????_???g???o\+X"j1Vzb???;?3#WZ? 3?7
??R?B~*?P2????.?????ll?B?Jik?'3???<??gw??#7?[????;;??z???W??ra???????????+/W?g?,??4?mcg5q"B4)??Ad/uI?'
?*??]
8B@?rr?,?P2????.?????o???????/??l?`a:?;?6?1i???????b??BZ??<c&Or??S?
??????|T?|???????9u&&?[????.???|6?^????=[???rUl??
??????????4?@@?Up^dbf?H?Q+R?
??pk??!?V???Q	)?,????B? ??????y???C_
?3?>?2:@	?A??0?-????<???M
???[????H???L???TB? ????4???B.t?M&
????sE??-www??:?.?m?Kt?/?

??B??l????O(???xtmX?h????7L?	????
?b
uL??9
;wt?Y???p?a??;{)?z?l??w???A?u???i?????i??{?[?R????o??7??t???@?!??"?x?K?????%l?j?????,?(d	Z?7?d?4??1_phj??T
?M?
??
??g???<??????F??k??????RfY6??
?????k??m?????OBd??Cd???????o?-^??V?{?-X^Q?yZ?DX
pP
) b?|
p?t?5??g???S?(?P??????g????3?h?V?9???q_??_??~???}????6???w??????????|???1???]k?"???!??\n??c?,
?]?"?u???????!????}@?e????sW??v=?J
?@IL???R at d??b?
??r_?oY??;???}?'o?M&??????	%??.b?:
w?|????????
c???	??p?U???W/??kW_?RY??{?
e
??,???Z??	?q?@e??VC????'!??_??_?j????<R\9???w?fG????w??????|?_??(.?;?1?'??O?b`
i???/?????t??@J??GRY?2BBVDo???????????C???h????Z/????B?m??O5?d????[0?*"~??K??7?vuI??<???E5?RWE.k?]?"B????z%|g?????_?;:??*? ???.?[;h}?????d??t?[<??????}???g*?gR*D?e!fZ"zb??? ?#?*??\wa?:S2y?? ?8?|V/S????w??-???M???C?fZ~??g^?T??
"I??Y?k%??Q??cVFR????8P
(2 J)????Z??q?X(?	????6??
?{??C3?!N???nB??(%(Z?u??p>m??qb???*?G????d????[<??(??`k???Z	!?@??c"c?5????YY?mk?G?d?uhl?gV?jX
c6?? ?'?
?ay\z]???l??]m#,"7???zv?;[7W2Q???????E?????7??}??,???????m???v???6D?LUU??Rm6??G?a?1,"7????~n}??K?????U?I??h
?u9d???m??B?e U??p??r?K?g??=?V???s?????G??,????=?"?w?:o???????lu%???g?9u??R
?dLQ??w?:o????nw??:?v??F???7()?P`]D?C?8?????<6?=87?w??

nX
y?I1????*?,???3???? S?4]??e
bf??h6???P?A?????
c?:'sHw>Ng??-?
]w???????|l)p[w1Fb0Q`?G 5? ?	j??QR?{?????????~?h?w???????C???&?,
0!????EE?D???<Dl?
| !???@???$??&???T"J??M??EC?5???{?E???k?o??@4p7X@?1F?Ps;??@6?C??0`!;!?xb??ak??\<?n??g?\?:??????!?B??


ShI Y??
?
(D??
?? ???????Q)?'*?4??_F??+G?-r?R)???cD?C
 
 
 
 
 
 

Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-11/gnome-games.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- gnome-games.spec	14 Apr 2009 05:11:49 -0000	1.205
+++ gnome-games.spec	18 Apr 2009 21:30:31 -0000	1.206
@@ -44,7 +44,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -53,6 +53,10 @@
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579450
+Source1: missing-figures.tar
+Patch2:  missing-figures.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
 URL: http://projects.gnome.org/gnome-games/
@@ -92,6 +96,7 @@
 # Newer than internal gettext needed
 BuildRequires: gettext
 BuildRequires: autoconf >= 2.60
+BuildRequires: automake libtool
 BuildRequires: gnome-doc-utils >= 0.3.2
 
 BuildRequires: libggz-devel
@@ -124,19 +129,19 @@
 %patch0 -p1 -b .ggz-api-changes
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
+%patch2 -p1 -b .missing-figures
 
 sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
   -e 's/GNOMEtris/GnomeFallingBlocks/g' \
   po/*.po gnometris/help/*/*.po gnometris/help/C/gnometris.xml \
   gnometris/*.cpp gnometris/gnometris.desktop.in.in
 
-#cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav
-#cp -f gnometris/sounds/gameover.wav gnibbles/sounds/pop.wav
+rm -f same-gnome/help/*/figures/play.png
+tar -x -C same-gnome/help/C/figures -f %{SOURCE1}
 
+autoreconf -i -f
 %build
 
-autoconf
-export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL"
 %configure --localstatedir=/var/lib --disable-gnuchess %{omitgames}
 make
 
@@ -355,6 +360,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
+- Fix up some missing figures in the same-gnome manual (#496376)
+
 * Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-games/2.26/gnome-games-2.26.1.news



From oget at fedoraproject.org  Sat Apr 18 21:39:11 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 21:39:11 +0000 (UTC)
Subject: rpms/bouncycastle-mail/devel bouncycastle-mail.spec,1.4,1.5
Message-ID: <20090418213911.91CBC700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1268

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
- Don't build AOT bits. The package needs java1.6



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouncycastle-mail.spec	9 Apr 2009 19:11:59 -0000	1.4
+++ bouncycastle-mail.spec	18 Apr 2009 21:38:41 -0000	1.5
@@ -1,10 +1,10 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%define with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
 %define archivever  jdk16-142
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.42
-Release:          2%{?dist}
+Release:          3%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -14,6 +14,7 @@
 Source0:          bcmail-%{archivever}-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle == %{version}
+BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
@@ -25,8 +26,8 @@
 %endif
 BuildRequires:    bouncycastle == %{version}
 BuildRequires:    java-devel >= 1.7
+Requires:         java >= 1.7
 BuildRequires:    javamail
-BuildRequires:    jpackage-utils >= 1.5
 Requires:         javamail
 
 Provides:         bcmail == %{version}-%{release}
@@ -88,15 +89,15 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
 %if %{with_gcj}
+%post
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%postun
 %if %{with_gcj}
+%postun
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -120,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
+- Don't build AOT bits. The package needs java1.6
+
 * Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
 - Add missing Requires: javamail
 - Remove redundant BR: junit4



From oget at fedoraproject.org  Sat Apr 18 21:41:24 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 21:41:24 +0000 (UTC)
Subject: rpms/bouncycastle/F-11 bouncycastle.spec,1.13,1.14
Message-ID: <20090418214124.3FAC9700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776

Modified Files:
	bouncycastle.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
- Don't build AOT bits. The package needs java1.6



Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-11/bouncycastle.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bouncycastle.spec	9 Apr 2009 19:08:10 -0000	1.13
+++ bouncycastle.spec	18 Apr 2009 21:40:53 -0000	1.14
@@ -1,11 +1,11 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%define archivever  jdk16-142
-%define classname   org.bouncycastle.jce.provider.BouncyCastleProvider
+%global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
+%global archivever  jdk16-142
+%global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.42
-Release:          2%{?dist}
+Release:          3%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -14,6 +14,7 @@
 # bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
 Source0:          bcprov-%{archivever}-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
@@ -24,7 +25,7 @@
 BuildArch:        noarch
 %endif
 BuildRequires:    java-devel >= 1.7
-BuildRequires:    jpackage-utils >= 1.5
+Requires:         java >= 1.7
 BuildRequires:    junit4
 Requires:         junit4
 
@@ -171,6 +172,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
+- Don't build AOT bits. The package needs java1.6
+
 * Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
 - Add missing Requires: junit4
 



From oget at fedoraproject.org  Sat Apr 18 21:50:14 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 21:50:14 +0000 (UTC)
Subject: rpms/bouncycastle-mail/F-11 bouncycastle-mail.spec,1.4,1.5
Message-ID: <20090418215014.457F3700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3586

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
- Don't build AOT bits. The package needs java1.6



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/bouncycastle-mail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouncycastle-mail.spec	9 Apr 2009 19:11:59 -0000	1.4
+++ bouncycastle-mail.spec	18 Apr 2009 21:49:43 -0000	1.5
@@ -1,10 +1,10 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%define with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
 %define archivever  jdk16-142
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.42
-Release:          2%{?dist}
+Release:          3%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -14,6 +14,7 @@
 Source0:          bcmail-%{archivever}-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle == %{version}
+BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
@@ -25,8 +26,8 @@
 %endif
 BuildRequires:    bouncycastle == %{version}
 BuildRequires:    java-devel >= 1.7
+Requires:         java >= 1.7
 BuildRequires:    javamail
-BuildRequires:    jpackage-utils >= 1.5
 Requires:         javamail
 
 Provides:         bcmail == %{version}-%{release}
@@ -88,15 +89,15 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
 %if %{with_gcj}
+%post
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%postun
 %if %{with_gcj}
+%postun
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -120,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
+- Don't build AOT bits. The package needs java1.6
+
 * Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
 - Add missing Requires: javamail
 - Remove redundant BR: junit4



From kyle at fedoraproject.org  Sat Apr 18 21:52:47 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 18 Apr 2009 21:52:47 +0000 (UTC)
Subject: rpms/kernel/F-11
	pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch,
	NONE, 1.1 kernel.spec, 1.1561, 1.1562
Message-ID: <20090418215247.6E58E700F7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4419

Modified Files:
	kernel.spec 
Added Files:
	pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch 
Log Message:
* Sat Apr 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-100
- pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch:
   Fix the spew of "Xorg:3254 freeing invalid memtype" messages.


pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch:

--- NEW FILE pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch ---
>From linux-kernel-owner+kyle=40mcmartin.ca-S1755891AbZDPWsW at vger.kernel.org Thu Apr 16 18:48:26 2009
Return-path: <linux-kernel-owner+kyle=40mcmartin.ca-S1755891AbZDPWsW at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bombadil.infradead.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.0 required=5.0 tests=RCVD_IN_DNSWL_MED
	autolearn=ham version=3.2.5
Envelope-to: kyle at bombadil.infradead.org
Delivery-date: Thu, 16 Apr 2009 22:48:26 +0000
Received: from casper.infradead.org ([2001:770:15f::2])
	by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux))
	id 1LuaNe-0000Of-Cb
	for kyle at bombadil.infradead.org; Thu, 16 Apr 2009 22:48:26 +0000
Received: from vger.kernel.org ([209.132.176.167])
	by casper.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux))
	id 1LuaNc-0008Kx-Gy
	for kyle at mcmartin.ca; Thu, 16 Apr 2009 22:48:25 +0000
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1755891AbZDPWsW (ORCPT <rfc822;kyle at mcmartin.ca>);
	Thu, 16 Apr 2009 18:48:22 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1755206AbZDPWsV
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 16 Apr 2009 18:48:21 -0400
Received: from hera.kernel.org ([140.211.167.34]:51608 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755028AbZDPWsU (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
	Thu, 16 Apr 2009 18:48:20 -0400
Received: from hera.kernel.org (IDENT:U2FsdGVkX18/nhN3Gm0uWXfEhCJkjhWfN6rcXKJG08E at localhost [127.0.0.1])
	by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n3GMlSTT010770
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 16 Apr 2009 22:47:28 GMT
Received: (from hpa at localhost)
	by hera.kernel.org (8.14.2/8.13.1/Submit) id n3GMlS43010766;
	Thu, 16 Apr 2009 22:47:28 GMT
Date:	Thu, 16 Apr 2009 22:47:28 GMT
From:	"tip-bot for Pallipadi, Venkatesh" <venkatesh.pallipadi at intel.com>
To:	linux-tip-commits at vger.kernel.org
Cc:	linux-kernel at vger.kernel.org, hpa at zytor.com, mingo at redhat.com,
	venkatesh.pallipadi at intel.com, a.miskiewicz at gmail.com,
	jbarnes at virtuousgeek.org, suresh.b.siddha at intel.com,
	tglx at linutronix.de, mingo at elte.hu
Reply-To: mingo at redhat.com, hpa at zytor.com, linux-kernel at vger.kernel.org,
	  jbarnes at virtuousgeek.org, a.miskiewicz at gmail.com,
	  venkatesh.pallipadi at intel.com, suresh.b.siddha at intel.com,
	  tglx at linutronix.de, mingo at elte.hu
In-Reply-To: <20090408223716.GC3493 at linux-os.sc.intel.com>
References: <20090408223716.GC3493 at linux-os.sc.intel.com>
Subject: [tip:x86/urgent] x86, PAT: Remove page granularity tracking for vm_insert_pfn maps
Message-ID: <tip-4b065046273afa01ec8e3de7da407e8d3599251d at git.kernel.org>
Git-Commit-ID: 4b065046273afa01ec8e3de7da407e8d3599251d
X-Mailer: tip-git-log-daemon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
X-Virus-Scanned: ClamAV 0.93.3/9248/Thu Apr 16 21:20:40 2009 on hera.kernel.org
X-Virus-Status:	Clean
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Thu, 16 Apr 2009 22:47:30 +0000 (UTC)
Sender:	linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List:	linux-kernel at vger.kernel.org

Commit-ID:  4b065046273afa01ec8e3de7da407e8d3599251d
Gitweb:     http://git.kernel.org/tip/4b065046273afa01ec8e3de7da407e8d3599251d
Author:     Pallipadi, Venkatesh <venkatesh.pallipadi at intel.com>
AuthorDate: Wed, 8 Apr 2009 15:37:16 -0700
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Fri, 17 Apr 2009 00:44:22 +0200

x86, PAT: Remove page granularity tracking for vm_insert_pfn maps

This change resolves the problem of too many single page entries
in pat_memtype_list and "freeing invalid memtype" errors with i915,
reported here:

  http://marc.info/?l=linux-kernel&m=123845244713183&w=2

Remove page level granularity track and untrack of vm_insert_pfn.
memtype tracking at page granularity does not scale and cleaner
approach would be for the driver to request a type for a bigger
IO address range or PCI io memory range for that device, either at
mmap time or driver init time and just use that type during
vm_insert_pfn.

This patch just removes the track/untrack of vm_insert_pfn. That
means we will be in same state as 2.6.28, with respect to these APIs.

Newer APIs for the drivers to request a memtype for a bigger region
is coming soon.

[ Impact: fix Xorg startup warnings and hangs ]

Reported-by: Arkadiusz Miskiewicz <a.miskiewicz at gmail.com>
Tested-by: Arkadiusz Miskiewicz <a.miskiewicz at gmail.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
LKML-Reference: <20090408223716.GC3493 at linux-os.sc.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>


---
 arch/x86/mm/pat.c |   98 ++++++++++------------------------------------------
 1 files changed, 19 insertions(+), 79 deletions(-)

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index cc5e0e2..41c8057 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -669,29 +669,28 @@ static void free_pfn_range(u64 paddr, unsigned long size)
  *
  * If the vma has a linear pfn mapping for the entire range, we get the prot
  * from pte and reserve the entire vma range with single reserve_pfn_range call.
- * Otherwise, we reserve the entire vma range, my ging through the PTEs page
- * by page to get physical address and protection.
  */
 int track_pfn_vma_copy(struct vm_area_struct *vma)
 {
-	int retval = 0;
-	unsigned long i, j;
 	resource_size_t paddr;
 	unsigned long prot;
-	unsigned long vma_start = vma->vm_start;
-	unsigned long vma_end = vma->vm_end;
-	unsigned long vma_size = vma_end - vma_start;
+	unsigned long vma_size = vma->vm_end - vma->vm_start;
 	pgprot_t pgprot;
 
 	if (!pat_enabled)
 		return 0;
 
+	/*
+	 * For now, only handle remap_pfn_range() vmas where
+	 * is_linear_pfn_mapping() == TRUE. Handling of
+	 * vm_insert_pfn() is TBD.
+	 */
 	if (is_linear_pfn_mapping(vma)) {
 		/*
 		 * reserve the whole chunk covered by vma. We need the
 		 * starting address and protection from pte.
 		 */
-		if (follow_phys(vma, vma_start, 0, &prot, &paddr)) {
+		if (follow_phys(vma, vma->vm_start, 0, &prot, &paddr)) {
 			WARN_ON_ONCE(1);
 			return -EINVAL;
 		}
@@ -699,28 +698,7 @@ int track_pfn_vma_copy(struct vm_area_struct *vma)
 		return reserve_pfn_range(paddr, vma_size, &pgprot, 1);
 	}
 
-	/* reserve entire vma page by page, using pfn and prot from pte */
-	for (i = 0; i < vma_size; i += PAGE_SIZE) {
-		if (follow_phys(vma, vma_start + i, 0, &prot, &paddr))
-			continue;
-
-		pgprot = __pgprot(prot);
-		retval = reserve_pfn_range(paddr, PAGE_SIZE, &pgprot, 1);
-		if (retval)
-			goto cleanup_ret;
-	}
 	return 0;
-
-cleanup_ret:
-	/* Reserve error: Cleanup partial reservation and return error */
-	for (j = 0; j < i; j += PAGE_SIZE) {
-		if (follow_phys(vma, vma_start + j, 0, &prot, &paddr))
-			continue;
-
-		free_pfn_range(paddr, PAGE_SIZE);
-	}
-
-	return retval;
 }
 
 /*
@@ -730,50 +708,28 @@ cleanup_ret:
  * prot is passed in as a parameter for the new mapping. If the vma has a
  * linear pfn mapping for the entire range reserve the entire vma range with
  * single reserve_pfn_range call.
- * Otherwise, we look t the pfn and size and reserve only the specified range
- * page by page.
- *
- * Note that this function can be called with caller trying to map only a
- * subrange/page inside the vma.
  */
 int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t *prot,
 			unsigned long pfn, unsigned long size)
 {
-	int retval = 0;
-	unsigned long i, j;
-	resource_size_t base_paddr;
 	resource_size_t paddr;
-	unsigned long vma_start = vma->vm_start;
-	unsigned long vma_end = vma->vm_end;
-	unsigned long vma_size = vma_end - vma_start;
+	unsigned long vma_size = vma->vm_end - vma->vm_start;
 
 	if (!pat_enabled)
 		return 0;
 
+	/*
+	 * For now, only handle remap_pfn_range() vmas where
+	 * is_linear_pfn_mapping() == TRUE. Handling of
+	 * vm_insert_pfn() is TBD.
+	 */
 	if (is_linear_pfn_mapping(vma)) {
 		/* reserve the whole chunk starting from vm_pgoff */
 		paddr = (resource_size_t)vma->vm_pgoff << PAGE_SHIFT;
 		return reserve_pfn_range(paddr, vma_size, prot, 0);
 	}
 
-	/* reserve page by page using pfn and size */
-	base_paddr = (resource_size_t)pfn << PAGE_SHIFT;
-	for (i = 0; i < size; i += PAGE_SIZE) {
-		paddr = base_paddr + i;
-		retval = reserve_pfn_range(paddr, PAGE_SIZE, prot, 0);
-		if (retval)
-			goto cleanup_ret;
-	}
 	return 0;
-
-cleanup_ret:
-	/* Reserve error: Cleanup partial reservation and return error */
-	for (j = 0; j < i; j += PAGE_SIZE) {
-		paddr = base_paddr + j;
-		free_pfn_range(paddr, PAGE_SIZE);
-	}
-
-	return retval;
 }
 
 /*
@@ -784,39 +740,23 @@ cleanup_ret:
 void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
 			unsigned long size)
 {
-	unsigned long i;
 	resource_size_t paddr;
-	unsigned long prot;
-	unsigned long vma_start = vma->vm_start;
-	unsigned long vma_end = vma->vm_end;
-	unsigned long vma_size = vma_end - vma_start;
+	unsigned long vma_size = vma->vm_end - vma->vm_start;
 
 	if (!pat_enabled)
 		return;
 
+	/*
+	 * For now, only handle remap_pfn_range() vmas where
+	 * is_linear_pfn_mapping() == TRUE. Handling of
+	 * vm_insert_pfn() is TBD.
+	 */
 	if (is_linear_pfn_mapping(vma)) {
 		/* free the whole chunk starting from vm_pgoff */
 		paddr = (resource_size_t)vma->vm_pgoff << PAGE_SHIFT;
 		free_pfn_range(paddr, vma_size);
 		return;
 	}
-
-	if (size != 0 && size != vma_size) {
-		/* free page by page, using pfn and size */
-		paddr = (resource_size_t)pfn << PAGE_SHIFT;
-		for (i = 0; i < size; i += PAGE_SIZE) {
-			paddr = paddr + i;
-			free_pfn_range(paddr, PAGE_SIZE);
-		}
-	} else {
-		/* free entire vma, page by page, using the pfn from pte */
-		for (i = 0; i < vma_size; i += PAGE_SIZE) {
-			if (follow_phys(vma, vma_start + i, 0, &prot, &paddr))
-				continue;
-
-			free_pfn_range(paddr, PAGE_SIZE);
-		}
-	}
 }
 
 pgprot_t pgprot_writecombine(pgprot_t prot)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1561
retrieving revision 1.1562
diff -u -r1.1561 -r1.1562
--- kernel.spec	18 Apr 2009 17:45:46 -0000	1.1561
+++ kernel.spec	18 Apr 2009 21:52:16 -0000	1.1562
@@ -751,6 +751,8 @@
 
 Patch9304: linux-2.6-kvm-skip-pit-check.patch
 
+Patch9400: pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1386,6 +1388,8 @@
 ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 
+ApplyPatch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1971,6 +1975,10 @@
 # and build.
 
 %changelog
+* Sat Apr 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-100
+- pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch:
+   Fix the spew of "Xorg:3254 freeing invalid memtype" messages.
+
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
 - Build in the rfkill and rfkill-input modules (F10#485322)
 



From oget at fedoraproject.org  Sat Apr 18 21:57:27 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 21:57:27 +0000 (UTC)
Subject: rpms/bouncycastle-mail/devel bouncycastle-mail.spec,1.5,1.6
Message-ID: <20090418215727.8266C700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6394

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-4
- Rebuild



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bouncycastle-mail.spec	18 Apr 2009 21:38:41 -0000	1.5
+++ bouncycastle-mail.spec	18 Apr 2009 21:56:57 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.42
-Release:          3%{?dist}
+Release:          4%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -121,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-4
+- Rebuild
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
 - Don't build AOT bits. The package needs java1.6
 



From oget at fedoraproject.org  Sat Apr 18 21:58:08 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 18 Apr 2009 21:58:08 +0000 (UTC)
Subject: rpms/bouncycastle-mail/F-11 bouncycastle-mail.spec,1.5,1.6
Message-ID: <20090418215808.58893700F7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6658

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-4
- Rebuild



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/bouncycastle-mail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bouncycastle-mail.spec	18 Apr 2009 21:49:43 -0000	1.5
+++ bouncycastle-mail.spec	18 Apr 2009 21:57:38 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.42
-Release:          3%{?dist}
+Release:          4%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -121,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-4
+- Rebuild
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
 - Don't build AOT bits. The package needs java1.6
 



From mbooth at fedoraproject.org  Sat Apr 18 22:14:02 2009
From: mbooth at fedoraproject.org (Mat Booth)
Date: Sat, 18 Apr 2009 22:14:02 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel get-dltk.sh, 1.1, 1.2 eclipse-dltk.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090418221403.0A614700F7@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10838/eclipse-dltk/devel

Modified Files:
	get-dltk.sh eclipse-dltk.spec sources 
Log Message:
* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.4.M6
- Update to Milestone 6 release of 1.0.0.
- Require Eclipse 3.5.0.



Index: get-dltk.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/get-dltk.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- get-dltk.sh	4 Apr 2009 10:28:58 -0000	1.1
+++ get-dltk.sh	18 Apr 2009 22:13:31 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="dltk"
 VERSION=1.0.0
-TAG="vS200902060933"
+TAG="vS200903161640"
 SUBPACKAGES="core ruby tcl itcl xotcl mylyn"
 
 echo "Exporting from CVS..."


Index: eclipse-dltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/eclipse-dltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-dltk.spec	4 Apr 2009 10:28:58 -0000	1.1
+++ eclipse-dltk.spec	18 Apr 2009 22:13:31 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dltk
 Version:   1.0.0
-Release:   0.3.M5%{?dist}
+Release:   0.4.M6%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -21,12 +21,12 @@
 
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.4.1
-BuildRequires:    eclipse-emf
+BuildRequires:    eclipse-pde >= 1:3.5.0
+BuildRequires:    eclipse-emf >= 2.5.0
 BuildRequires:    eclipse-mylyn
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.4.1
+Requires:         eclipse-platform >= 1:3.5.0
 
 %description
 Dynamic Languages Toolkit (DLTK) is a tool for vendors, researchers, and users
@@ -47,7 +47,7 @@
 Summary:   TCL Eclipse plugin
 Group:     Development/Tools
 Requires:  %{name} = %{version}-%{release}
-Requires:  eclipse-emf
+Requires:  eclipse-emf >= 2.5.0
 
 %description tcl
 TCL development environment for Eclipse based on the Eclipse Dynamic
@@ -155,6 +155,10 @@
 %doc org.eclipse.dltk.mylyn-feature/rootfiles/*
 
 %changelog
+* Sat Apr 18 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.4.M6
+- Update to Milestone 6 release of 1.0.0.
+- Require Eclipse 3.5.0.
+
 * Thu Apr 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-0.3.M5
 - Fix files listed twice warnings.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Apr 2009 10:28:58 -0000	1.2
+++ sources	18 Apr 2009 22:13:31 -0000	1.3
@@ -1 +1 @@
-731d4af3ffcd34aeef03da09582a1f00  dltk-1.0.0.tar.gz
+158fbc6c189e72b31a22f277245c9e46  dltk-1.0.0.tar.gz



From mclasen at fedoraproject.org  Sat Apr 18 22:32:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 18 Apr 2009 22:32:16 +0000 (UTC)
Subject: rpms/gnome-games/F-11 gnome-games.spec,1.206,1.207
Message-ID: <20090418223216.4CBE2700F7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14122

Modified Files:
	gnome-games.spec 
Log Message:
fix missing BRs



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-11/gnome-games.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- gnome-games.spec	18 Apr 2009 21:30:31 -0000	1.206
+++ gnome-games.spec	18 Apr 2009 22:31:45 -0000	1.207
@@ -97,6 +97,7 @@
 BuildRequires: gettext
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake libtool
+BuildRequires: gnome-common
 BuildRequires: gnome-doc-utils >= 0.3.2
 
 BuildRequires: libggz-devel



From rdieter at fedoraproject.org  Sat Apr 18 22:54:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 18 Apr 2009 22:54:12 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-kde#180785.patch, NONE,
	1.1 kdelibs.spec, 1.465, 1.466
Message-ID: <20090418225412.B4B10700F7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19117/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785.patch 
Log Message:
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)


kdelibs-4.2.2-kde#180785.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/03/25 12:32:32	944314
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
@@ -184,6 +184,12 @@
  */
 static void close_fds()
 {
+   while (struct child *child = children) {
+      close(child->sock);
+      children = child->next;
+      free(child);
+   }
+
    if (d.deadpipe[0] != -1)
    {
       close(d.deadpipe[0]);



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- kdelibs.spec	10 Apr 2009 15:43:12 -0000	1.465
+++ kdelibs.spec	18 Apr 2009 22:53:41 -0000	1.466
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,7 @@
 Patch100: kdelibs-4.2.2-kio_http.patch
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
+Patch103: kdelibs-4.2.2-kde#180785.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -233,6 +234,7 @@
 %patch100 -p0 -b .kio_http
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
+%patch103 -p4 -b .kde#180785
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -417,6 +419,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
+- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
 - fix bidi-related hangs in khtml (kde#189161)
 



From rdieter at fedoraproject.org  Sat Apr 18 22:54:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 18 Apr 2009 22:54:12 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.2-kde#180785.patch, NONE,
	1.1 kdelibs.spec, 1.465, 1.466
Message-ID: <20090418225412.BA33B7013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19117/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785.patch 
Log Message:
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)


kdelibs-4.2.2-kde#180785.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/03/25 12:32:32	944314
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
@@ -184,6 +184,12 @@
  */
 static void close_fds()
 {
+   while (struct child *child = children) {
+      close(child->sock);
+      children = child->next;
+      free(child);
+   }
+
    if (d.deadpipe[0] != -1)
    {
       close(d.deadpipe[0]);



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- kdelibs.spec	10 Apr 2009 15:43:12 -0000	1.465
+++ kdelibs.spec	18 Apr 2009 22:53:40 -0000	1.466
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,7 @@
 Patch100: kdelibs-4.2.2-kio_http.patch
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
+Patch103: kdelibs-4.2.2-kde#180785.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -233,6 +234,7 @@
 %patch100 -p0 -b .kio_http
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
+%patch103 -p4 -b .kde#180785
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -417,6 +419,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
+- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
 - fix bidi-related hangs in khtml (kde#189161)
 



From bpepple at fedoraproject.org  Sat Apr 18 22:57:23 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 18 Apr 2009 22:57:23 +0000 (UTC)
Subject: rpms/xchat-gnome/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xchat-gnome.spec, 1.60, 1.61
Message-ID: <20090418225723.E1D5B700F7@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19782

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Log Message:
* Sat Apr 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-1
- Update to 0.26.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	31 Mar 2009 23:17:07 -0000	1.21
+++ .cvsignore	18 Apr 2009 22:56:53 -0000	1.22
@@ -1 +1 @@
-xchat-gnome-0.26.0.tar.bz2
+xchat-gnome-0.26.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	31 Mar 2009 23:17:07 -0000	1.21
+++ sources	18 Apr 2009 22:56:53 -0000	1.22
@@ -1 +1 @@
-ef230db0d104faa8dc7e5060c51f7261  xchat-gnome-0.26.0.tar.bz2
+c9ce3d6e549736edfc1a1dc0282fb363  xchat-gnome-0.26.1.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xchat-gnome.spec	31 Mar 2009 23:17:07 -0000	1.60
+++ xchat-gnome.spec	18 Apr 2009 22:56:53 -0000	1.61
@@ -1,5 +1,5 @@
 Name:           xchat-gnome
-Version:        0.26.0
+Version:        0.26.1
 Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-1
+- Update to 0.26.1.
+
 * Tue Mar 31 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.0-1
 - Update to 0.26.0.
 



From rdieter at fedoraproject.org  Sat Apr 18 23:14:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 18 Apr 2009 23:14:13 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-kde#180785.patch, NONE,
	1.1 kdelibs.spec, 1.389, 1.390
Message-ID: <20090418231413.8BADD700F7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23447/F-9

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785.patch 
Log Message:
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)


kdelibs-4.2.2-kde#180785.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/03/25 12:32:32	944314
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
@@ -184,6 +184,12 @@
  */
 static void close_fds()
 {
+   while (struct child *child = children) {
+      close(child->sock);
+      children = child->next;
+      free(child);
+   }
+
    if (d.deadpipe[0] != -1)
    {
       close(d.deadpipe[0]);



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- kdelibs.spec	10 Apr 2009 22:26:19 -0000	1.389
+++ kdelibs.spec	18 Apr 2009 23:13:42 -0000	1.390
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,7 @@
 Patch100: kdelibs-4.2.2-kio_http.patch
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
+Patch103: kdelibs-4.2.2-kde#180785.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -233,6 +234,7 @@
 %patch100 -p0 -b .kio_http
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
+%patch103 -p4 -b .kde#180785
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -417,6 +419,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
+- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
 - fix bidi-related hangs in khtml (kde#189161)
 



From rdieter at fedoraproject.org  Sat Apr 18 23:14:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 18 Apr 2009 23:14:14 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-kde#180785.patch, NONE,
	1.1 kdelibs.spec, 1.414, 1.415
Message-ID: <20090418231414.2028C700F7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23447/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785.patch 
Log Message:
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)


kdelibs-4.2.2-kde#180785.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/03/25 12:32:32	944314
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
@@ -184,6 +184,12 @@
  */
 static void close_fds()
 {
+   while (struct child *child = children) {
+      close(child->sock);
+      children = child->next;
+      free(child);
+   }
+
    if (d.deadpipe[0] != -1)
    {
       close(d.deadpipe[0]);



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- kdelibs.spec	10 Apr 2009 22:26:18 -0000	1.414
+++ kdelibs.spec	18 Apr 2009 23:13:43 -0000	1.415
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,7 @@
 Patch100: kdelibs-4.2.2-kio_http.patch
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
+Patch103: kdelibs-4.2.2-kde#180785.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -233,6 +234,7 @@
 %patch100 -p0 -b .kio_http
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
+%patch103 -p4 -b .kde#180785
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -417,6 +419,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
+- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
 - fix bidi-related hangs in khtml (kde#189161)
 



From gd at fedoraproject.org  Sat Apr 18 23:31:12 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sat, 18 Apr 2009 23:31:12 +0000 (UTC)
Subject: rpms/samba/F-10 .cvsignore, 1.60, 1.61 samba.spec, 1.172,
	1.173 sources, 1.64, 1.65
Message-ID: <20090418233112.A539C700F7@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26230

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.11.

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	1 Apr 2009 13:09:58 -0000	1.60
+++ .cvsignore	18 Apr 2009 23:30:41 -0000	1.61
@@ -1 +1 @@
-samba-3.2.10.tar.gz
+samba-3.2.11.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- samba.spec	1 Apr 2009 13:09:58 -0000	1.172
+++ samba.spec	18 Apr 2009 23:30:41 -0000	1.173
@@ -1,5 +1,5 @@
-%define main_release 29
-%define samba_version 3.2.10
+%define main_release 30
+%define samba_version 3.2.11
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.10
+Version: 3.2.11
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -826,6 +826,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Sun Apr 19 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.11-0.30
+- Update to 3.2.11
+
 * Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.10-0.29
 - Update to 3.2.10
 - resolves: #489547


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	1 Apr 2009 13:09:58 -0000	1.64
+++ sources	18 Apr 2009 23:30:41 -0000	1.65
@@ -1 +1 @@
-7a83207fb05200e9c2114d995f11396e  samba-3.2.10.tar.gz
+fc514bc92184b9b64544afa457e4d84e  samba-3.2.11.tar.gz



From gd at fedoraproject.org  Sat Apr 18 23:58:46 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sat, 18 Apr 2009 23:58:46 +0000 (UTC)
Subject: rpms/samba/F-9 .cvsignore, 1.59, 1.60 samba.spec, 1.170,
	1.171 sources, 1.63, 1.64
Message-ID: <20090418235846.8E78E700F8@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31905

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.11

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	1 Apr 2009 13:09:54 -0000	1.59
+++ .cvsignore	18 Apr 2009 23:58:15 -0000	1.60
@@ -1 +1 @@
-samba-3.2.10.tar.gz
+samba-3.2.11.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- samba.spec	1 Apr 2009 13:09:54 -0000	1.170
+++ samba.spec	18 Apr 2009 23:58:15 -0000	1.171
@@ -1,5 +1,5 @@
-%define main_release 27
-%define samba_version 3.2.10
+%define main_release 28
+%define samba_version 3.2.11
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.10
+Version: 3.2.11
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -824,6 +824,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Sun Apr 19 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.11-0.28
+- Update to 3.2.11
+
 * Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.10-0.27
 - Update to 3.2.10
 - resolves: #489547


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	1 Apr 2009 13:09:54 -0000	1.63
+++ sources	18 Apr 2009 23:58:15 -0000	1.64
@@ -1 +1 @@
-7a83207fb05200e9c2114d995f11396e  samba-3.2.10.tar.gz
+fc514bc92184b9b64544afa457e4d84e  samba-3.2.11.tar.gz



From cweyl at fedoraproject.org  Sun Apr 19 00:18:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:18:50 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/devel import.log, NONE,
	1.1 perl-MooseX-Storage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090419001850.A016E700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Storage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3183/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Storage.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-MooseX-Storage-0_17-2_fc10:HEAD:perl-MooseX-Storage-0.17-2.fc10.src.rpm:1240100297


--- NEW FILE perl-MooseX-Storage.spec ---
Name:       perl-MooseX-Storage 
Version:    0.17 
Release:    2%{?dist}
# lib/MooseX/Storage.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A serialization framework for Moose classes 
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Storage-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Storage
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Digest)
BuildRequires: perl(Encode)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(File::Temp)
BuildRequires: perl(IO::AtomicFile)
BuildRequires: perl(JSON::Any)
BuildRequires: perl(Moose) >= 0.39
BuildRequires: perl(Moose::Util::TypeConstraints)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Storable)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::JSON)
BuildRequires: perl(Test::More) >= 0.42
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::TempDir) >= 0.02
BuildRequires: perl(Test::YAML::Valid)
# optional
BuildRequires: perl(Best)
# testing
BuildRequires: perl(Digest)
BuildRequires: perl(Digest::SHA1)
BuildRequires: perl(File::NFSLock)
BuildRequires: perl(Test::YAML::Valid)
BuildRequires: perl(Test::JSON)
# testing, until RHBZ#495401 is resolved
BuildRequires: perl(YAML)
BuildRequires: perl(YAML::Syck)

%description
MooseX::Storage is a serialization framework for Moose, it provides a
very flexible and highly pluggable way to serialize Moose classes to a
number of different formats and styles. This is still an early release
of this module, so use with caution. It's outward facing serialization
API should be considered stable, but I still reserve the right to make
tweaks if I need too. Anything beyond the basic pack/unpack, freeze/thaw
and load/store should not be relied on. There are 3 levels to the 
serialization, each of which builds upon the other and each of which
can be customized to the specific needs of your class.


%prep
%setup -q -n MooseX-Storage-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-2
- update grammatically poor summary

* Sun Apr 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
- update to 0.17

* Wed Apr 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- update for submission

* Mon Mar 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:52:09 -0000	1.1
+++ .cvsignore	19 Apr 2009 00:18:20 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Storage-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:52:10 -0000	1.1
+++ sources	19 Apr 2009 00:18:20 -0000	1.2
@@ -0,0 +1 @@
+626819fe42830d6ff635a84bcd17706a  MooseX-Storage-0.17.tar.gz



From mjakubicek at fedoraproject.org  Sun Apr 19 00:23:56 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 00:23:56 +0000 (UTC)
Subject: rpms/cone/F-11 cone-gcc44.patch,NONE,1.1 cone.spec,1.28,1.29
Message-ID: <20090419002356.BE469700F9@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cone/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3950/F-11

Modified Files:
	cone.spec 
Added Files:
	cone-gcc44.patch 
Log Message:
- Fix FTBFS: added cone-gcc44.patch



cone-gcc44.patch:

--- NEW FILE cone-gcc44.patch ---
--- libmail/maildiradd.C.orig	2009-04-18 20:28:15.000000000 +0200
+++ libmail/maildiradd.C	2009-04-18 20:28:33.000000000 +0200
@@ -165,7 +165,7 @@
 	if (flags.size() > 0)
 	{
 		newname = newname + MDIRSEP "2," + flags;
-		memcpy(strrchr(newname.c_str(), '/')-3, "cur", 3);
+		memcpy((void *) strrchr(newname.c_str(), '/')-3, "cur", 3);
 		// We go into the cur directory, now
 	}
 
--- libmail/qp.C.orig	2009-04-18 21:50:00.000000000 +0200
+++ libmail/qp.C	2009-04-18 21:50:03.000000000 +0200
@@ -16,7 +16,7 @@
 {
 	static const char xdigits[]="0123456789ABCDEFabcdef";
 
-	char *p=strchr(xdigits, c);
+	char *p=strchr((char *) xdigits, c);
 
 	if (p == NULL)
 		return -1;


Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/F-11/cone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cone.spec	24 Feb 2009 08:53:51 -0000	1.28
+++ cone.spec	19 Apr 2009 00:23:26 -0000	1.29
@@ -3,13 +3,15 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.75
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
 Source1:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig
 #Source0:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2
 #Source1:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2.sig
+Patch0:         %{name}-gcc44.patch
+# This patch has been sent on 2009/04/19 to courier-cone at lists.sourceforge.net.
 License:        GPLv3
 Group:          Applications/Internet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -45,6 +47,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -52,7 +55,7 @@
 
 # Note: The build breaks with --disable-static
 CFLAGS="$RPM_OPT_FLAGS" %configure --with-devel --enable-shared
-%{__make} %{?_smp_mflags}
+%{__make} -k %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,6 +107,9 @@
 %doc cone/html
 
 %changelog
+* Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-4
+- Fix FTBFS: added cone-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.75-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sun Apr 19 00:23:57 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 00:23:57 +0000 (UTC)
Subject: rpms/cone/devel cone-gcc44.patch,NONE,1.1 cone.spec,1.28,1.29
Message-ID: <20090419002357.0B03A700F9@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3950/devel

Modified Files:
	cone.spec 
Added Files:
	cone-gcc44.patch 
Log Message:
- Fix FTBFS: added cone-gcc44.patch



cone-gcc44.patch:

--- NEW FILE cone-gcc44.patch ---
--- libmail/maildiradd.C.orig	2009-04-18 20:28:15.000000000 +0200
+++ libmail/maildiradd.C	2009-04-18 20:28:33.000000000 +0200
@@ -165,7 +165,7 @@
 	if (flags.size() > 0)
 	{
 		newname = newname + MDIRSEP "2," + flags;
-		memcpy(strrchr(newname.c_str(), '/')-3, "cur", 3);
+		memcpy((void *) strrchr(newname.c_str(), '/')-3, "cur", 3);
 		// We go into the cur directory, now
 	}
 
--- libmail/qp.C.orig	2009-04-18 21:50:00.000000000 +0200
+++ libmail/qp.C	2009-04-18 21:50:03.000000000 +0200
@@ -16,7 +16,7 @@
 {
 	static const char xdigits[]="0123456789ABCDEFabcdef";
 
-	char *p=strchr(xdigits, c);
+	char *p=strchr((char *) xdigits, c);
 
 	if (p == NULL)
 		return -1;


Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/devel/cone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cone.spec	24 Feb 2009 08:53:51 -0000	1.28
+++ cone.spec	19 Apr 2009 00:23:26 -0000	1.29
@@ -3,13 +3,15 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.75
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
 Source1:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig
 #Source0:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2
 #Source1:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2.sig
+Patch0:         %{name}-gcc44.patch
+# This patch has been sent on 2009/04/19 to courier-cone at lists.sourceforge.net.
 License:        GPLv3
 Group:          Applications/Internet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -45,6 +47,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -52,7 +55,7 @@
 
 # Note: The build breaks with --disable-static
 CFLAGS="$RPM_OPT_FLAGS" %configure --with-devel --enable-shared
-%{__make} %{?_smp_mflags}
+%{__make} -k %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,6 +107,9 @@
 %doc cone/html
 
 %changelog
+* Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-4
+- Fix FTBFS: added cone-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.75-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sun Apr 19 00:24:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:24:56 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/F-9 import.log, NONE,
	1.1 perl-MooseX-Storage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090419002456.90E32700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Storage/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4312/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Storage.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-MooseX-Storage-0_17-2_fc10:F-9:perl-MooseX-Storage-0.17-2.fc10.src.rpm:1240100663


--- NEW FILE perl-MooseX-Storage.spec ---
Name:       perl-MooseX-Storage 
Version:    0.17 
Release:    2%{?dist}
# lib/MooseX/Storage.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A serialization framework for Moose classes 
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Storage-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Storage
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Digest)
BuildRequires: perl(Encode)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(File::Temp)
BuildRequires: perl(IO::AtomicFile)
BuildRequires: perl(JSON::Any)
BuildRequires: perl(Moose) >= 0.39
BuildRequires: perl(Moose::Util::TypeConstraints)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Storable)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::JSON)
BuildRequires: perl(Test::More) >= 0.42
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::TempDir) >= 0.02
BuildRequires: perl(Test::YAML::Valid)
# optional
BuildRequires: perl(Best)
# testing
BuildRequires: perl(Digest)
BuildRequires: perl(Digest::SHA1)
BuildRequires: perl(File::NFSLock)
BuildRequires: perl(Test::YAML::Valid)
BuildRequires: perl(Test::JSON)
# testing, until RHBZ#495401 is resolved
BuildRequires: perl(YAML)
BuildRequires: perl(YAML::Syck)

%description
MooseX::Storage is a serialization framework for Moose, it provides a
very flexible and highly pluggable way to serialize Moose classes to a
number of different formats and styles. This is still an early release
of this module, so use with caution. It's outward facing serialization
API should be considered stable, but I still reserve the right to make
tweaks if I need too. Anything beyond the basic pack/unpack, freeze/thaw
and load/store should not be relied on. There are 3 levels to the 
serialization, each of which builds upon the other and each of which
can be customized to the specific needs of your class.


%prep
%setup -q -n MooseX-Storage-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-2
- update grammatically poor summary

* Sun Apr 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
- update to 0.17

* Wed Apr 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- update for submission

* Mon Mar 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:52:09 -0000	1.1
+++ .cvsignore	19 Apr 2009 00:24:25 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Storage-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:52:10 -0000	1.1
+++ sources	19 Apr 2009 00:24:26 -0000	1.2
@@ -0,0 +1 @@
+626819fe42830d6ff635a84bcd17706a  MooseX-Storage-0.17.tar.gz



From cweyl at fedoraproject.org  Sun Apr 19 00:29:06 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:29:06 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/F-10 import.log, NONE,
	1.1 perl-MooseX-Storage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090419002906.0E17A700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Storage/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5066/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Storage.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-MooseX-Storage-0_17-2_fc10:F-10:perl-MooseX-Storage-0.17-2.fc10.src.rpm:1240100911


--- NEW FILE perl-MooseX-Storage.spec ---
Name:       perl-MooseX-Storage 
Version:    0.17 
Release:    2%{?dist}
# lib/MooseX/Storage.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    A serialization framework for Moose classes 
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-Storage-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Storage
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Digest)
BuildRequires: perl(Encode)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(File::Temp)
BuildRequires: perl(IO::AtomicFile)
BuildRequires: perl(JSON::Any)
BuildRequires: perl(Moose) >= 0.39
BuildRequires: perl(Moose::Util::TypeConstraints)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Storable)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::JSON)
BuildRequires: perl(Test::More) >= 0.42
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::TempDir) >= 0.02
BuildRequires: perl(Test::YAML::Valid)
# optional
BuildRequires: perl(Best)
# testing
BuildRequires: perl(Digest)
BuildRequires: perl(Digest::SHA1)
BuildRequires: perl(File::NFSLock)
BuildRequires: perl(Test::YAML::Valid)
BuildRequires: perl(Test::JSON)
# testing, until RHBZ#495401 is resolved
BuildRequires: perl(YAML)
BuildRequires: perl(YAML::Syck)

%description
MooseX::Storage is a serialization framework for Moose, it provides a
very flexible and highly pluggable way to serialize Moose classes to a
number of different formats and styles. This is still an early release
of this module, so use with caution. It's outward facing serialization
API should be considered stable, but I still reserve the right to make
tweaks if I need too. Anything beyond the basic pack/unpack, freeze/thaw
and load/store should not be relied on. There are 3 levels to the 
serialization, each of which builds upon the other and each of which
can be customized to the specific needs of your class.


%prep
%setup -q -n MooseX-Storage-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-2
- update grammatically poor summary

* Sun Apr 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
- update to 0.17

* Wed Apr 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- update for submission

* Mon Mar 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2009 15:52:09 -0000	1.1
+++ .cvsignore	19 Apr 2009 00:28:35 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Storage-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2009 15:52:10 -0000	1.1
+++ sources	19 Apr 2009 00:28:35 -0000	1.2
@@ -0,0 +1 @@
+626819fe42830d6ff635a84bcd17706a  MooseX-Storage-0.17.tar.gz



From cweyl at fedoraproject.org  Sun Apr 19 00:31:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:31:56 +0000 (UTC)
Subject: rpms/perl-Class-C3-Componentised/devel .cvsignore, 1.3,
	1.4 perl-Class-C3-Componentised.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090419003156.E9FAC700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3-Componentised/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5642

Modified Files:
	.cvsignore perl-Class-C3-Componentised.spec sources 
Log Message:
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0004-1
- update to 1.0004



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2008 06:23:52 -0000	1.3
+++ .cvsignore	19 Apr 2009 00:31:26 -0000	1.4
@@ -1 +1 @@
-Class-C3-Componentised-1.0003.tar.gz
+Class-C3-Componentised-1.0004.tar.gz


Index: perl-Class-C3-Componentised.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/devel/perl-Class-C3-Componentised.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Class-C3-Componentised.spec	26 Feb 2009 12:38:31 -0000	1.5
+++ perl-Class-C3-Componentised.spec	19 Apr 2009 00:31:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3-Componentised
-Version:        1.0003
-Release:        2%{?dist}
+Version:        1.0004
+Release:        1%{?dist}
 Summary:        Load mix-ins or components to your C3-based class 
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,8 @@
 # cpan
 BuildRequires: perl(Class::C3)
 BuildRequires: perl(Class::Inspector)
+BuildRequires: perl(MRO::Compat)
+# testing
 BuildRequires: perl(Test::Exception)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
@@ -72,6 +74,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0004-1
+- update to 1.0004
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0003-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2008 06:23:52 -0000	1.3
+++ sources	19 Apr 2009 00:31:26 -0000	1.4
@@ -1 +1 @@
-f388783d0ea20f507e61f35677041a3e  Class-C3-Componentised-1.0003.tar.gz
+d4e8fd4f123cc52343b79fe5b434e8d3  Class-C3-Componentised-1.0004.tar.gz



From cweyl at fedoraproject.org  Sun Apr 19 00:34:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:34:28 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.28, 1.29 perl-Class-MOP.spec,
	1.33, 1.34 sources, 1.27, 1.28
Message-ID: <20090419003428.B9662700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6188

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.81-1
- update to 0.81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	5 Apr 2009 05:51:32 -0000	1.28
+++ .cvsignore	19 Apr 2009 00:33:57 -0000	1.29
@@ -1 +1 @@
-Class-MOP-0.80.tar.gz
+Class-MOP-0.81.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- perl-Class-MOP.spec	5 Apr 2009 05:51:32 -0000	1.33
+++ perl-Class-MOP.spec	19 Apr 2009 00:33:58 -0000	1.34
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.80
+Version:        0.81
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -91,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.81-1
+- update to 0.81
+
 * Sat Apr 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.80-1
 - update to 0.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	5 Apr 2009 05:51:32 -0000	1.27
+++ sources	19 Apr 2009 00:33:58 -0000	1.28
@@ -1 +1 @@
-85c480850e1ffc795366159d79b241c4  Class-MOP-0.80.tar.gz
+b95da41b87881b8df325e5693e7a3fa8  Class-MOP-0.81.tar.gz



From cweyl at fedoraproject.org  Sun Apr 19 00:37:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:37:40 +0000 (UTC)
Subject: rpms/perl-Class-C3-Componentised/F-10
	perl-Class-C3-Componentised.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090419003740.49617700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3-Componentised/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6752

Modified Files:
	perl-Class-C3-Componentised.spec sources 
Log Message:
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0004-1
- update to 1.0004



Index: perl-Class-C3-Componentised.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/F-10/perl-Class-C3-Componentised.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Class-C3-Componentised.spec	29 May 2008 06:23:52 -0000	1.4
+++ perl-Class-C3-Componentised.spec	19 Apr 2009 00:37:09 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Class-C3-Componentised
-Version:        1.0003
+Version:        1.0004
 Release:        1%{?dist}
 Summary:        Load mix-ins or components to your C3-based class 
 License:        GPL+ or Artistic
@@ -16,6 +16,8 @@
 # cpan
 BuildRequires: perl(Class::C3)
 BuildRequires: perl(Class::Inspector)
+BuildRequires: perl(MRO::Compat)
+# testing
 BuildRequires: perl(Test::Exception)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
@@ -72,6 +74,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0004-1
+- update to 1.0004
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0003-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.0003-1
 - update to 1.0003
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3-Componentised/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2008 06:23:52 -0000	1.3
+++ sources	19 Apr 2009 00:37:09 -0000	1.4
@@ -1 +1 @@
-f388783d0ea20f507e61f35677041a3e  Class-C3-Componentised-1.0003.tar.gz
+d4e8fd4f123cc52343b79fe5b434e8d3  Class-C3-Componentised-1.0004.tar.gz



From gd at fedoraproject.org  Sun Apr 19 00:39:29 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sun, 19 Apr 2009 00:39:29 +0000 (UTC)
Subject: rpms/samba/devel samba-3.2.4-build.patch,1.1,NONE
Message-ID: <20090419003929.8D402700F9@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7180

Removed Files:
	samba-3.2.4-build.patch 
Log Message:
removing unused samba-3.2.4-build.patch.

Guenther



--- samba-3.2.4-build.patch DELETED ---



From gd at fedoraproject.org  Sun Apr 19 00:40:03 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sun, 19 Apr 2009 00:40:03 +0000 (UTC)
Subject: rpms/samba/F-11 samba-3.2.4-build.patch,1.1,NONE
Message-ID: <20090419004003.DD22A700F9@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7303

Removed Files:
	samba-3.2.4-build.patch 
Log Message:
remove unused samba-3.2.4-build.patch.

Guenther



--- samba-3.2.4-build.patch DELETED ---



From cweyl at fedoraproject.org  Sun Apr 19 00:52:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 00:52:54 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.27, 1.28 perl-Moose.spec, 1.37, 
	1.38 sources, 1.27, 1.28
Message-ID: <20090419005255.010C4700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9839

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.74-1
- update to 0.74



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	2 Apr 2009 06:22:46 -0000	1.27
+++ .cvsignore	19 Apr 2009 00:52:24 -0000	1.28
@@ -1 +1 @@
-Moose-0.73.tar.gz
+Moose-0.74.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- perl-Moose.spec	2 Apr 2009 06:22:47 -0000	1.37
+++ perl-Moose.spec	19 Apr 2009 00:52:24 -0000	1.38
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.73
+Version:        0.74
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
@@ -15,7 +15,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Class::MOP)         >= 0.79
+BuildRequires:  perl(Class::MOP)         >= 0.81
 BuildRequires:  perl(Data::OptList)
 BuildRequires:  perl(Filter::Simple) 
 BuildRequires:  perl(List::MoreUtils)    >= 0.12
@@ -110,6 +110,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.74-1
+- update to 0.74
+
 * Wed Apr 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.73-1
 - update to 0.73
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	2 Apr 2009 06:22:47 -0000	1.27
+++ sources	19 Apr 2009 00:52:24 -0000	1.28
@@ -1 +1 @@
-ee5c50436480372a26f268a91e4b2932  Moose-0.73.tar.gz
+7a7471252c9b111c121d4669ca2111e9  Moose-0.74.tar.gz



From mclasen at fedoraproject.org  Sun Apr 19 01:05:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 19 Apr 2009 01:05:25 +0000 (UTC)
Subject: rpms/gthumb/F-11 gthumb-import.desktop, NONE, 1.1 gthumb.spec, 1.101,
	1.102 gthumb-importer.desktop, 1.1, NONE
Message-ID: <20090419010525.EE55E700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gthumb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11677

Modified Files:
	gthumb.spec 
Added Files:
	gthumb-import.desktop 
Removed Files:
	gthumb-importer.desktop 
Log Message:
don't install two desktop files for photo import; keep the one that works.



--- NEW FILE gthumb-import.desktop ---
[Desktop Entry]
Name=gThumb Image Viewer
Name[am]=???gThumb ????????? ???????????????
Name[az]=gThumb R??sm N??mayi????isi
Name[be]=?????????????????????? ??????????????????
Name[bg]=?????????????? ???? ?????????????????????? (gThumb)
Name[ca]=Visualitzador d'imatges gThumb
Name[cs]=Prohl????e?? obr??zk?? gThumb
Name[da]=gThumb - billedfremviseren
Name[de]=gThumb Bildbetrachter
Name[dz]=????????????????????? ????????????????????????????????? ??????????????????????????????
Name[el]=?????????????? ?????????????? gThumb
Name[en_CA]=gThumb Image Viewer
Name[en_GB]=gThumb Image Viewer
Name[es]=Visor de im??genes gThumb
Name[et]=gThumb Pildivaataja
Name[eu]=gThumb irudi ikustailea
Name[fa]=???????????????????????????? ?????????? gThumb
Name[fi]=gThumb-kuvakatselin
Name[fr]=Visionneur d'images gThumb
Name[gl]=Visor de imaxes gThumb
Name[gu]=?????????????????? ???????????? ???????????????
Name[hr]=gThumb preglednik slika
Name[hu]=gThumb k??pmegjelen??t??
Name[id]=gThumb Penampil Gambar
Name[it]=Visualizzatore immagini (gThumb)
Name[ja]=gThumb ??????????????????
Name[ko]=gThumb ?????? ??????
Name[lt]=gThumb paveiksl??li?? ??i??r??jimo programa
Name[lv]=gThumb Att??lu Skat??t??js
Name[mk]=gThumb ?????????????????????? ???? ??????????
Name[ms]=Pelihat Imej gThumb
Name[nb]=gThumb bildeviser
Name[ne]=?????????????????? ????????? ???????????????
Name[nl]=gThumb afbeeldingenviewer
Name[pa]=??????-????????? ??????????????? ???????????????
Name[pl]=Przegl??darka obraz??w gThumb
Name[pt]=Visualizador de Imagens gThumb
Name[pt_BR]=Visualizador de Imagens gThumb
Name[ru]=???????????????? ??????????????????????
Name[sk]=Prehliada?? obr??zkov gThumb
Name[sr]=gThumb ?????????????????? ??????????
Name[sr at Latn]=gThumb Pregleda?? slika
Name[sv]=Bildvisaren gThumb
Name[th]=???????????????????????????????????? gThumb
Name[tr]=gThumb Resim G??sterici
Name[uk]=???????????????????? ?????????????????? GThumb
Name[vi]=B??? xem ???nh gThumb
Name[xh]=IsiBonakalisi soMfanekiso i-gThumb
Name[zh_CN]=gThumb ???????????????
Name[zh_HK]=gThumb ??????????????????
Name[zh_TW]=gThumb ??????????????????
GenericName=Image Viewer
GenericName[ar]=???????? ????????????
GenericName[ca]=Visualitzador d'imatges
GenericName[cs]=Prohl????e?? obr??zk??
GenericName[da]=Billedfremviser
GenericName[dz]=???????????????????????????????????????????????????????????????
GenericName[el]=???????????????? ???????????????? ??????????????
GenericName[en_CA]=Image Viewer
GenericName[en_GB]=Image Viewer
GenericName[es]=Visor de im??genes
GenericName[eu]=Irudi ikustailea
GenericName[fi]=Kuvakatselin
GenericName[fr]=Visionneur d'image
GenericName[gl]=Visor de imaxes
GenericName[hu]=K??pmegjelen??t??
GenericName[ja]=??????????????????
GenericName[lt]=Paveiksl??li?? ??i??r??jimo programa
GenericName[lv]=Att??lu skat??t??js
GenericName[mk]=?????????????????????? ???? ??????????
GenericName[nb]=Bildeviser
GenericName[ne]=????????? ???????????????
GenericName[nl]=gThumb afbeeldingenviewer
GenericName[pa]=??????????????? ???????????????
GenericName[pt]=Visualizador de Imagens
GenericName[pt_BR]=Visualizador de Imagens
GenericName[ru]=???????????????? ??????????????????????
GenericName[sv]=Bildvisare
GenericName[th]=????????????????????????????????????
GenericName[vi]=B??? xem ???nh
GenericName[zh_CN]=???????????????
GenericName[zh_HK]=??????????????????
GenericName[zh_TW]=??????????????????
Comment=View and organize your images
Comment[az]=R??sml??rinizi n??mayi?? v?? idar?? edin
Comment[be]=???????????????? ???????????????????? ?? ???????????????? ?????????? ??????????????????
Comment[bg]=?????????????? ?? ???????????????????????? ???? ???????????? ??????????????????????
Comment[ca]=Visualitzeu i organitzeu les vostres imatges
Comment[cs]=Prohl????en?? a uspo????d??n?? va??ich obr??zk??
Comment[da]=V??s og organis??r dine billeder
Comment[de]=Ihre Bilder betrachten und katalogisieren
Comment[dz]=????????????????????????????????????????????????????????????????????? ??????????????????????????????????????????  ??????????????????????????????????????????
Comment[el]=?????????????? ?????? ???????????????? ??????????????
Comment[en_CA]=View and organize your images
Comment[en_GB]=View and organise your images
Comment[es]=Muestra y organiza sus im??genes
Comment[et]=Vaata ja korrasta oma pilte
Comment[eu]=Ikusi eta antolatu zure irudiak
Comment[fa]=???????????? ?????? ???? ?????????????? ?? ????????????????????? ????????
Comment[fi]=Katsele ja j??rjest?? kuviasi
Comment[fr]=Affiche et organise vos images
Comment[gl]=Ver e organizar as t??as imaxes
Comment[gu]=??????????????? ??????????????? ????????? ????????? ?????????????????? ?????????
Comment[hr]=Prikazujte i organizirajte va??e slike
Comment[hu]=K??pek megtekint??se ??s rendszerez??se
Comment[id]=Tampilkan dan atur gambar anda
Comment[it]=Mostra e organizza le proprie immagini
Comment[ja]=?????????????????????????????????????????????
Comment[ko]=????????? ?????? ????????? ?????????
Comment[lt]=??i??r??kite ir tvarkykite savo paveiksl??lius
Comment[lv]=Skat??t un organiz??t savus att??lus
Comment[mk]=???????????????? ???? ?? ?????????????????????????? ???? ???????????? ??????????
Comment[ms]=Lihat dan pelihara imej anda
Comment[nb]=Vis og organiser dine bilder
Comment[ne]=????????????????????? ?????????????????? ?????????????????????????????? ????????????????????? ???????????????????????????
Comment[nl]=Uw afbeeldingen weergeven en beheren
Comment[pa]=???????????? ??????????????? ???????????? ?????? ??????????????? ?????? ??????????????? ?????????
Comment[pl]=Widok i organizacja obraz??w
Comment[pt]=Ver e organizar as suas imagens
Comment[pt_BR]=Veja e organize as suas imagens
Comment[ru]=???????????????? ?????????????????????? ?? ?????????????? ????????????????
Comment[sk]=Prezera?? a organizova?? Va??e obr??zky
Comment[sq]=Shfaq dhe organizon imazhet tuaja
Comment[sr]=???????????????? ?? ?????????????????? ?????????? ??????????
Comment[sr at Latn]=Pogledaj i organizuj svoje slike
Comment[sv]=Visa och organisera dina bilder
Comment[th]=???????????????????????????????????????????????????
Comment[tr]=Resimleri d??zenle ve g??ster
Comment[uk]=???????????????? ?? ?????????????????????????? ??????????????????
Comment[vi]=Xem v?? t??? ch???c c??c ???nh c???a b???n
Comment[xh]=Buka uze ulungise imifanekiso yakho
Comment[zh_CN]=?????????????????????
Comment[zh_HK]=???????????????????????????
Comment[zh_TW]=???????????????????????????
Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography;
Encoding=UTF-8
Exec=gthumb-importer %U
Icon=gthumb
MimeType=x-content/image-dcf;x-content/image-picturecd;
StartupNotify=true
NoDisplay=true
Terminal=false
Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gthumb
X-GNOME-Bugzilla-Component=general
X-GNOME-DocPath=gthumb/gthumb.xml


Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/F-11/gthumb.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gthumb.spec	11 Apr 2009 02:05:06 -0000	1.101
+++ gthumb.spec	19 Apr 2009 01:04:55 -0000	1.102
@@ -11,11 +11,11 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
-Source2: gthumb-importer.desktop
+Source2: gthumb-import.desktop
 License: GPLv2+
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,7 +91,7 @@
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 install -p -m 755 %SOURCE1 $RPM_BUILD_ROOT/%{_bindir}
-install -p -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_datadir}/applications
+install -p -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_datadir}/applications/
 
 %find_lang %{name} --with-gnome
 
@@ -141,6 +141,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gthumb.png
 
 %changelog
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-4
+- Don't install two desktop files for photo import
+
 * Fri Apr 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-3
 - Fix directory ownership
 


--- gthumb-importer.desktop DELETED ---



From eponyme at fedoraproject.org  Sun Apr 19 01:09:18 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 19 Apr 2009 01:09:18 +0000 (UTC)
Subject: rpms/trustyrc/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 trustyrc.spec, 1.3, 1.4
Message-ID: <20090419010918.0E8AE700F9@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12435

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Step to 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2008 17:48:26 -0000	1.3
+++ .cvsignore	19 Apr 2009 01:08:47 -0000	1.4
@@ -1 +1 @@
-trustyrc-0.1.2.tar.gz
+trustyrc-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2008 17:48:26 -0000	1.3
+++ sources	19 Apr 2009 01:08:47 -0000	1.4
@@ -1 +1 @@
-883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz
+03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/trustyrc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trustyrc.spec	25 Feb 2009 21:58:31 -0000	1.3
+++ trustyrc.spec	19 Apr 2009 01:08:47 -0000	1.4
@@ -1,21 +1,24 @@
 Name:           trustyrc
-Version:        0.1.2        
-Release:        2%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  tinyxml-devel
-Requires:       trustyrc-plugins
+BuildRequires:  tinyxml-devel, libcurl-devel
+Obsoletes:      %{name}-plugins <= 0.1.2
+Obsoletes:      %{name}-plugins-extras <= 0.1.2
+Provides:       %{name}-plugins = %{version}-%{release}
+Provides:       %{name}-plugins-extras = %{version}-%{release}
 
 %description
 trustyRC is a fully modular IRC robot which includes all of the common
 bot features (channel moderation, administration, account system, quotes)
-and much more.  trustyRC is comprised of a a kernel and a plugin loader
+and much more.  trustyRC is comprised of a kernel and a plugin loader
 which loads features such as a log system, configuration parser,
 networking, etc.  All plugins can communicate with others,
 providing a highly flexible system.
@@ -27,94 +30,48 @@
 to the bot when the plugin is loaded and those features are removed
 when the plugin is unloaded.
 
-
-%package plugins
-Summary: Vitals plugins for trustyrc
-Group: Applications/Internet
-Requires: %{name} = %{version}
-%description plugins
-Vitals plugins for trustyrc
-
-%package plugins-extras
-Summary: Extra plugins for trustyrc
-Group: Applications/Internet
-%if 0%{?fedora} >8
-BuildRequires:  libcurl-devel
-%else
-BuildRequires:  curl-devel
-%endif
-Requires: %{name} = %{version}
-%description plugins-extras
-Extra plugins for trustyrc
-
 %prep
 %setup -q
 
 %build
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
+CXXFLAGS="${CXXFLAGS:-%optflags}"
+export CXXFLAGS
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FEATURES README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc CHANGELOG COPYING FEATURES README HOWTO.plugins 
+%doc code_documentation %{name}.conf.sample
+%{_libdir}/%{name}
 %{_bindir}/%{name}
 
-%files plugins
-%defattr(-,root,root,-)
-%doc HOWTO.plugins
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/antiflood.so
-%{_libdir}/%{name}/ping.so
-%{_libdir}/%{name}/postconnect.so
-%{_libdir}/%{name}/moderation.so
-%{_libdir}/%{name}/module.so
-%{_libdir}/%{name}/admin.so
-%{_libdir}/%{name}/ignore.so
-%{_libdir}/%{name}/infos.so
-%{_libdir}/%{name}/ctcp.so
-%{_libdir}/%{name}/usersinfos.so
-
-%files plugins-extras
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/advertising.so
-%{_libdir}/%{name}/bashfr.so
-%{_libdir}/%{name}/bzrh.so
-%{_libdir}/%{name}/fedorafr.so
-%{_libdir}/%{name}/fedoraproject.so
-%{_libdir}/%{name}/gameserver.so
-%{_libdir}/%{name}/ipconverting.so
-%{_libdir}/%{name}/lamoule.so
-%{_libdir}/%{name}/magic8ball.so
-%{_libdir}/%{name}/pluginsample.so
-%{_libdir}/%{name}/quotes.so
-%{_libdir}/%{name}/slapme.so
-%{_libdir}/%{name}/survey.so
-%{_libdir}/%{name}/tele.so
-%{_libdir}/%{name}/trad.so
-
 %changelog
+* Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
+- Rebuild for 0.1.3
+- No more sub packages
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
+
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
+
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build
-



From eponyme at fedoraproject.org  Sun Apr 19 01:11:28 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 19 Apr 2009 01:11:28 +0000 (UTC)
Subject: rpms/trustyrc/F-11 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 trustyrc.spec, 1.3, 1.4
Message-ID: <20090419011128.F0696700F9@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12879

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Step to 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2008 17:48:26 -0000	1.3
+++ .cvsignore	19 Apr 2009 01:10:58 -0000	1.4
@@ -1 +1 @@
-trustyrc-0.1.2.tar.gz
+trustyrc-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2008 17:48:26 -0000	1.3
+++ sources	19 Apr 2009 01:10:58 -0000	1.4
@@ -1 +1 @@
-883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz
+03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-11/trustyrc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trustyrc.spec	25 Feb 2009 21:58:31 -0000	1.3
+++ trustyrc.spec	19 Apr 2009 01:10:58 -0000	1.4
@@ -1,21 +1,24 @@
 Name:           trustyrc
-Version:        0.1.2        
-Release:        2%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  tinyxml-devel
-Requires:       trustyrc-plugins
+BuildRequires:  tinyxml-devel, libcurl-devel
+Obsoletes:      %{name}-plugins <= 0.1.2
+Obsoletes:      %{name}-plugins-extras <= 0.1.2
+Provides:       %{name}-plugins = %{version}-%{release}
+Provides:       %{name}-plugins-extras = %{version}-%{release}
 
 %description
 trustyRC is a fully modular IRC robot which includes all of the common
 bot features (channel moderation, administration, account system, quotes)
-and much more.  trustyRC is comprised of a a kernel and a plugin loader
+and much more.  trustyRC is comprised of a kernel and a plugin loader
 which loads features such as a log system, configuration parser,
 networking, etc.  All plugins can communicate with others,
 providing a highly flexible system.
@@ -27,94 +30,48 @@
 to the bot when the plugin is loaded and those features are removed
 when the plugin is unloaded.
 
-
-%package plugins
-Summary: Vitals plugins for trustyrc
-Group: Applications/Internet
-Requires: %{name} = %{version}
-%description plugins
-Vitals plugins for trustyrc
-
-%package plugins-extras
-Summary: Extra plugins for trustyrc
-Group: Applications/Internet
-%if 0%{?fedora} >8
-BuildRequires:  libcurl-devel
-%else
-BuildRequires:  curl-devel
-%endif
-Requires: %{name} = %{version}
-%description plugins-extras
-Extra plugins for trustyrc
-
 %prep
 %setup -q
 
 %build
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
+CXXFLAGS="${CXXFLAGS:-%optflags}"
+export CXXFLAGS
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FEATURES README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc CHANGELOG COPYING FEATURES README HOWTO.plugins 
+%doc code_documentation %{name}.conf.sample
+%{_libdir}/%{name}
 %{_bindir}/%{name}
 
-%files plugins
-%defattr(-,root,root,-)
-%doc HOWTO.plugins
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/antiflood.so
-%{_libdir}/%{name}/ping.so
-%{_libdir}/%{name}/postconnect.so
-%{_libdir}/%{name}/moderation.so
-%{_libdir}/%{name}/module.so
-%{_libdir}/%{name}/admin.so
-%{_libdir}/%{name}/ignore.so
-%{_libdir}/%{name}/infos.so
-%{_libdir}/%{name}/ctcp.so
-%{_libdir}/%{name}/usersinfos.so
-
-%files plugins-extras
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/advertising.so
-%{_libdir}/%{name}/bashfr.so
-%{_libdir}/%{name}/bzrh.so
-%{_libdir}/%{name}/fedorafr.so
-%{_libdir}/%{name}/fedoraproject.so
-%{_libdir}/%{name}/gameserver.so
-%{_libdir}/%{name}/ipconverting.so
-%{_libdir}/%{name}/lamoule.so
-%{_libdir}/%{name}/magic8ball.so
-%{_libdir}/%{name}/pluginsample.so
-%{_libdir}/%{name}/quotes.so
-%{_libdir}/%{name}/slapme.so
-%{_libdir}/%{name}/survey.so
-%{_libdir}/%{name}/tele.so
-%{_libdir}/%{name}/trad.so
-
 %changelog
+* Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
+- Rebuild for 0.1.3
+- No more sub packages
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
+
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
+
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build
-



From eponyme at fedoraproject.org  Sun Apr 19 01:13:15 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 19 Apr 2009 01:13:15 +0000 (UTC)
Subject: rpms/trustyrc/F-10 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 trustyrc.spec, 1.2, 1.3
Message-ID: <20090419011315.943B0700F9@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13298

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Step to 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2008 17:48:26 -0000	1.3
+++ .cvsignore	19 Apr 2009 01:12:45 -0000	1.4
@@ -1 +1 @@
-trustyrc-0.1.2.tar.gz
+trustyrc-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2008 17:48:26 -0000	1.3
+++ sources	19 Apr 2009 01:12:45 -0000	1.4
@@ -1 +1 @@
-883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz
+03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-10/trustyrc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trustyrc.spec	28 Sep 2008 17:48:26 -0000	1.2
+++ trustyrc.spec	19 Apr 2009 01:12:45 -0000	1.3
@@ -1,21 +1,24 @@
 Name:           trustyrc
-Version:        0.1.2        
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  tinyxml-devel
-Requires:       trustyrc-plugins
+BuildRequires:  tinyxml-devel, libcurl-devel
+Obsoletes:      %{name}-plugins <= 0.1.2
+Obsoletes:      %{name}-plugins-extras <= 0.1.2
+Provides:       %{name}-plugins = %{version}-%{release}
+Provides:       %{name}-plugins-extras = %{version}-%{release}
 
 %description
 trustyRC is a fully modular IRC robot which includes all of the common
 bot features (channel moderation, administration, account system, quotes)
-and much more.  trustyRC is comprised of a a kernel and a plugin loader
+and much more.  trustyRC is comprised of a kernel and a plugin loader
 which loads features such as a log system, configuration parser,
 networking, etc.  All plugins can communicate with others,
 providing a highly flexible system.
@@ -27,91 +30,48 @@
 to the bot when the plugin is loaded and those features are removed
 when the plugin is unloaded.
 
-
-%package plugins
-Summary: Vitals plugins for trustyrc
-Group: Applications/Internet
-Requires: %{name} = %{version}
-%description plugins
-Vitals plugins for trustyrc
-
-%package plugins-extras
-Summary: Extra plugins for trustyrc
-Group: Applications/Internet
-%if 0%{?fedora} >8
-BuildRequires:  libcurl-devel
-%else
-BuildRequires:  curl-devel
-%endif
-Requires: %{name} = %{version}
-%description plugins-extras
-Extra plugins for trustyrc
-
 %prep
 %setup -q
 
 %build
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
+CXXFLAGS="${CXXFLAGS:-%optflags}"
+export CXXFLAGS
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FEATURES README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc CHANGELOG COPYING FEATURES README HOWTO.plugins 
+%doc code_documentation %{name}.conf.sample
+%{_libdir}/%{name}
 %{_bindir}/%{name}
 
-%files plugins
-%defattr(-,root,root,-)
-%doc HOWTO.plugins
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/antiflood.so
-%{_libdir}/%{name}/ping.so
-%{_libdir}/%{name}/postconnect.so
-%{_libdir}/%{name}/moderation.so
-%{_libdir}/%{name}/module.so
-%{_libdir}/%{name}/admin.so
-%{_libdir}/%{name}/ignore.so
-%{_libdir}/%{name}/infos.so
-%{_libdir}/%{name}/ctcp.so
-%{_libdir}/%{name}/usersinfos.so
+%changelog
+* Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
+- Rebuild for 0.1.3
+- No more sub packages
 
-%files plugins-extras
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/advertising.so
-%{_libdir}/%{name}/bashfr.so
-%{_libdir}/%{name}/bzrh.so
-%{_libdir}/%{name}/fedorafr.so
-%{_libdir}/%{name}/fedoraproject.so
-%{_libdir}/%{name}/gameserver.so
-%{_libdir}/%{name}/ipconverting.so
-%{_libdir}/%{name}/lamoule.so
-%{_libdir}/%{name}/magic8ball.so
-%{_libdir}/%{name}/pluginsample.so
-%{_libdir}/%{name}/quotes.so
-%{_libdir}/%{name}/slapme.so
-%{_libdir}/%{name}/survey.so
-%{_libdir}/%{name}/tele.so
-%{_libdir}/%{name}/trad.so
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-%changelog
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
+
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
+
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build
-



From eponyme at fedoraproject.org  Sun Apr 19 01:14:55 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 19 Apr 2009 01:14:55 +0000 (UTC)
Subject: rpms/trustyrc/F-9 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 trustyrc.spec, 1.2, 1.3
Message-ID: <20090419011455.BC9E4700F9@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13702

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Step to 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2008 17:53:52 -0000	1.3
+++ .cvsignore	19 Apr 2009 01:14:25 -0000	1.4
@@ -1 +1 @@
-trustyrc-0.1.2.tar.gz
+trustyrc-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2008 17:53:52 -0000	1.3
+++ sources	19 Apr 2009 01:14:25 -0000	1.4
@@ -1 +1 @@
-883da45fa4a1aa52e49cf408ad4b13ff  trustyrc-0.1.2.tar.gz
+03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-9/trustyrc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trustyrc.spec	28 Sep 2008 17:53:52 -0000	1.2
+++ trustyrc.spec	19 Apr 2009 01:14:25 -0000	1.3
@@ -1,21 +1,24 @@
 Name:           trustyrc
-Version:        0.1.2        
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  tinyxml-devel
-Requires:       trustyrc-plugins
+BuildRequires:  tinyxml-devel, libcurl-devel
+Obsoletes:      %{name}-plugins <= 0.1.2
+Obsoletes:      %{name}-plugins-extras <= 0.1.2
+Provides:       %{name}-plugins = %{version}-%{release}
+Provides:       %{name}-plugins-extras = %{version}-%{release}
 
 %description
 trustyRC is a fully modular IRC robot which includes all of the common
 bot features (channel moderation, administration, account system, quotes)
-and much more.  trustyRC is comprised of a a kernel and a plugin loader
+and much more.  trustyRC is comprised of a kernel and a plugin loader
 which loads features such as a log system, configuration parser,
 networking, etc.  All plugins can communicate with others,
 providing a highly flexible system.
@@ -27,91 +30,48 @@
 to the bot when the plugin is loaded and those features are removed
 when the plugin is unloaded.
 
-
-%package plugins
-Summary: Vitals plugins for trustyrc
-Group: Applications/Internet
-Requires: %{name} = %{version}
-%description plugins
-Vitals plugins for trustyrc
-
-%package plugins-extras
-Summary: Extra plugins for trustyrc
-Group: Applications/Internet
-%if 0%{?fedora} >8
-BuildRequires:  libcurl-devel
-%else
-BuildRequires:  curl-devel
-%endif
-Requires: %{name} = %{version}
-%description plugins-extras
-Extra plugins for trustyrc
-
 %prep
 %setup -q
 
 %build
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-make %{?_smp_mflags} HAVE_TINYXML=yes PARANOID=no
+CXXFLAGS="${CXXFLAGS:-%optflags}"
+export CXXFLAGS
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}  HAVE_TINYXML=yes PARANOID=no
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FEATURES README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc CHANGELOG COPYING FEATURES README HOWTO.plugins 
+%doc code_documentation %{name}.conf.sample
+%{_libdir}/%{name}
 %{_bindir}/%{name}
 
-%files plugins
-%defattr(-,root,root,-)
-%doc HOWTO.plugins
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/antiflood.so
-%{_libdir}/%{name}/ping.so
-%{_libdir}/%{name}/postconnect.so
-%{_libdir}/%{name}/moderation.so
-%{_libdir}/%{name}/module.so
-%{_libdir}/%{name}/admin.so
-%{_libdir}/%{name}/ignore.so
-%{_libdir}/%{name}/infos.so
-%{_libdir}/%{name}/ctcp.so
-%{_libdir}/%{name}/usersinfos.so
+%changelog
+* Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
+- Rebuild for 0.1.3
+- No more sub packages
 
-%files plugins-extras
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/advertising.so
-%{_libdir}/%{name}/bashfr.so
-%{_libdir}/%{name}/bzrh.so
-%{_libdir}/%{name}/fedorafr.so
-%{_libdir}/%{name}/fedoraproject.so
-%{_libdir}/%{name}/gameserver.so
-%{_libdir}/%{name}/ipconverting.so
-%{_libdir}/%{name}/lamoule.so
-%{_libdir}/%{name}/magic8ball.so
-%{_libdir}/%{name}/pluginsample.so
-%{_libdir}/%{name}/quotes.so
-%{_libdir}/%{name}/slapme.so
-%{_libdir}/%{name}/survey.so
-%{_libdir}/%{name}/tele.so
-%{_libdir}/%{name}/trad.so
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-%changelog
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
+
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
+
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build
-



From pkgdb at fedoraproject.org  Sun Apr 19 01:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:23:34 +0000
Subject: [pkgdb] iptux was added for liangsuilong
Message-ID: <20090419012334.581AD10F852@bastion2.fedora.phx.redhat.com>

kevin has added Package iptux with summary A software for sharing in LAN
kevin has approved Package iptux
kevin has added a Fedora devel branch for iptux with an owner of liangsuilong
kevin has approved iptux in Fedora devel
kevin has approved Package iptux
kevin has set commit to Approved for provenpackager on iptux (Fedora devel)
kevin has set build to Approved for provenpackager on iptux (Fedora devel)
kevin has set checkout to Approved for provenpackager on iptux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iptux



From pkgdb at fedoraproject.org  Sun Apr 19 01:23:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:23:36 +0000
Subject: [pkgdb] iptux (Fedora, 10) updated by kevin
Message-ID: <20090419012337.1204110F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for iptux
kevin has set commit to Approved for provenpackager on iptux (Fedora 10)
kevin has set build to Approved for provenpackager on iptux (Fedora 10)
kevin has set checkout to Approved for provenpackager on iptux (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iptux



From pkgdb at fedoraproject.org  Sun Apr 19 01:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:23:37 +0000
Subject: [pkgdb] iptux (Fedora, 11) updated by kevin
Message-ID: <20090419012337.1E56F10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for iptux
kevin has set commit to Approved for provenpackager on iptux (Fedora 11)
kevin has set build to Approved for provenpackager on iptux (Fedora 11)
kevin has set checkout to Approved for provenpackager on iptux (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/iptux



From kevin at fedoraproject.org  Sun Apr 19 01:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:24:39 +0000 (UTC)
Subject: rpms/iptux - New directory
Message-ID: <20090419012439.3BC30700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iptux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS16272/rpms/iptux

Log Message:
Directory /cvs/pkgs/rpms/iptux added to the repository




From kevin at fedoraproject.org  Sun Apr 19 01:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:24:39 +0000 (UTC)
Subject: rpms/iptux/devel - New directory
Message-ID: <20090419012439.7F42D70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iptux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS16272/rpms/iptux/devel

Log Message:
Directory /cvs/pkgs/rpms/iptux/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 19 01:24:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:24:49 +0000 (UTC)
Subject: rpms/iptux Makefile,NONE,1.1
Message-ID: <20090419012449.9C9A7700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iptux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS16272/rpms/iptux

Added Files:
	Makefile 
Log Message:
Setup of module iptux


--- NEW FILE Makefile ---
# Top level Makefile for module iptux
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 19 01:24:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:24:50 +0000 (UTC)
Subject: rpms/iptux/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090419012450.09A91700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/iptux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS16272/rpms/iptux/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iptux


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: iptux
# $Id: Makefile,v 1.1 2009/04/19 01:24:49 kevin Exp $
NAME := iptux
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 19 01:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:25:08 +0000
Subject: [pkgdb] php-feedcreator was added for xavierb
Message-ID: <20090419012508.2CC1F10F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package php-feedcreator with summary Create RSS feeds
kevin has approved Package php-feedcreator
kevin has added a Fedora devel branch for php-feedcreator with an owner of xavierb
kevin has approved php-feedcreator in Fedora devel
kevin has approved Package php-feedcreator
kevin has set commit to Approved for provenpackager on php-feedcreator (Fedora devel)
kevin has set build to Approved for provenpackager on php-feedcreator (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-feedcreator (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-feedcreator



From pkgdb at fedoraproject.org  Sun Apr 19 01:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:25:10 +0000
Subject: [pkgdb] php-feedcreator (Fedora, 9) updated by kevin
Message-ID: <20090419012510.5561310F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-feedcreator
kevin has set commit to Approved for provenpackager on php-feedcreator (Fedora 9)
kevin has set build to Approved for provenpackager on php-feedcreator (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-feedcreator (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-feedcreator



From pkgdb at fedoraproject.org  Sun Apr 19 01:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:25:10 +0000
Subject: [pkgdb] php-feedcreator (Fedora, 10) updated by kevin
Message-ID: <20090419012510.5AC7410F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-feedcreator
kevin has set commit to Approved for provenpackager on php-feedcreator (Fedora 10)
kevin has set build to Approved for provenpackager on php-feedcreator (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-feedcreator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-feedcreator



From pkgdb at fedoraproject.org  Sun Apr 19 01:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:25:10 +0000
Subject: [pkgdb] php-feedcreator (Fedora, 11) updated by kevin
Message-ID: <20090419012510.61AD810F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-feedcreator
kevin has set commit to Approved for provenpackager on php-feedcreator (Fedora 11)
kevin has set build to Approved for provenpackager on php-feedcreator (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-feedcreator (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-feedcreator



From kevin at fedoraproject.org  Sun Apr 19 01:25:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:25:21 +0000 (UTC)
Subject: rpms/php-feedcreator - New directory
Message-ID: <20090419012521.34A5C700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-feedcreator
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh16528/rpms/php-feedcreator

Log Message:
Directory /cvs/pkgs/rpms/php-feedcreator added to the repository




From pkgdb at fedoraproject.org  Sun Apr 19 01:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:25:10 +0000
Subject: [pkgdb] php-feedcreator (Fedora EPEL, 5) updated by kevin
Message-ID: <20090419012510.6BAAD10F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-feedcreator
kevin has set commit to Approved for provenpackager on php-feedcreator (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on php-feedcreator (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on php-feedcreator (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-feedcreator



From kevin at fedoraproject.org  Sun Apr 19 01:25:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:25:21 +0000 (UTC)
Subject: rpms/php-feedcreator/devel - New directory
Message-ID: <20090419012521.7E3DE700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-feedcreator/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh16528/rpms/php-feedcreator/devel

Log Message:
Directory /cvs/pkgs/rpms/php-feedcreator/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 19 01:25:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:25:32 +0000 (UTC)
Subject: rpms/php-feedcreator Makefile,NONE,1.1
Message-ID: <20090419012532.641D6700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-feedcreator
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh16528/rpms/php-feedcreator

Added Files:
	Makefile 
Log Message:
Setup of module php-feedcreator


--- NEW FILE Makefile ---
# Top level Makefile for module php-feedcreator
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 19 01:25:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:25:32 +0000 (UTC)
Subject: rpms/php-feedcreator/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090419012532.BCD7F700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-feedcreator/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh16528/rpms/php-feedcreator/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-feedcreator


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-feedcreator
# $Id: Makefile,v 1.1 2009/04/19 01:25:32 kevin Exp $
NAME := php-feedcreator
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:01 +0000
Subject: [pkgdb] perl-Net-OAuth was added for lkundrak
Message-ID: <20090419012601.EE89510F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Net-OAuth with summary OAuth protocol support library for Perl
kevin has approved Package perl-Net-OAuth
kevin has added a Fedora devel branch for perl-Net-OAuth with an owner of lkundrak
kevin has approved perl-Net-OAuth in Fedora devel
kevin has approved Package perl-Net-OAuth
kevin has set commit to Approved for provenpackager on perl-Net-OAuth (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Net-OAuth (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Net-OAuth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-OAuth



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:03 +0000
Subject: [pkgdb] perl-Net-OAuth (Fedora, 10) updated by kevin
Message-ID: <20090419012603.890F810F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Net-OAuth
kevin has set commit to Approved for provenpackager on perl-Net-OAuth (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Net-OAuth (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Net-OAuth (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-OAuth



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:03 +0000
Subject: [pkgdb] perl-Net-OAuth (Fedora, 11) updated by kevin
Message-ID: <20090419012603.93A7F10F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Net-OAuth
kevin has set commit to Approved for provenpackager on perl-Net-OAuth (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Net-OAuth (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Net-OAuth (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-OAuth



From kevin at fedoraproject.org  Sun Apr 19 01:26:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:26:14 +0000 (UTC)
Subject: rpms/perl-Net-OAuth - New directory
Message-ID: <20090419012614.275B5700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-OAuth
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx16919/rpms/perl-Net-OAuth

Log Message:
Directory /cvs/pkgs/rpms/perl-Net-OAuth added to the repository




From pkgdb at fedoraproject.org  Sun Apr 19 01:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:03 +0000
Subject: [pkgdb] perl-Net-OAuth (Fedora EPEL, 5) updated by kevin
Message-ID: <20090419012603.A63A910F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Net-OAuth
kevin has set commit to Approved for provenpackager on perl-Net-OAuth (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Net-OAuth (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Net-OAuth (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-OAuth



From kevin at fedoraproject.org  Sun Apr 19 01:26:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:26:24 +0000 (UTC)
Subject: rpms/perl-Net-OAuth Makefile,NONE,1.1
Message-ID: <20090419012624.2F4D7700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-OAuth
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx16919/rpms/perl-Net-OAuth

Added Files:
	Makefile 
Log Message:
Setup of module perl-Net-OAuth


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-OAuth
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 19 01:26:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:26:14 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/devel - New directory
Message-ID: <20090419012614.6190E700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx16919/rpms/perl-Net-OAuth/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Net-OAuth/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 19 01:26:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:26:24 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090419012624.99157700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Net-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx16919/rpms/perl-Net-OAuth/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-OAuth


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Net-OAuth
# $Id: Makefile,v 1.1 2009/04/19 01:26:24 kevin Exp $
NAME := perl-Net-OAuth
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:54 +0000
Subject: [pkgdb] lilyterm was added for cwickert
Message-ID: <20090419012654.C13F310F852@bastion2.fedora.phx.redhat.com>

kevin has added Package lilyterm with summary Light and easy to use X Terminal Emulator
kevin has approved Package lilyterm
kevin has added a Fedora devel branch for lilyterm with an owner of cwickert
kevin has approved lilyterm in Fedora devel
kevin has approved Package lilyterm
kevin has set commit to Approved for provenpackager on lilyterm (Fedora devel)
kevin has set build to Approved for provenpackager on lilyterm (Fedora devel)
kevin has set checkout to Approved for provenpackager on lilyterm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lilyterm



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:56 +0000
Subject: [pkgdb] lilyterm (Fedora, 10) updated by kevin
Message-ID: <20090419012656.447C510F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lilyterm
kevin has set commit to Approved for provenpackager on lilyterm (Fedora 10)
kevin has set build to Approved for provenpackager on lilyterm (Fedora 10)
kevin has set checkout to Approved for provenpackager on lilyterm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lilyterm



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:56 +0000
Subject: [pkgdb] lilyterm (Fedora, 11) updated by kevin
Message-ID: <20090419012656.4AC3210F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lilyterm
kevin has set commit to Approved for provenpackager on lilyterm (Fedora 11)
kevin has set build to Approved for provenpackager on lilyterm (Fedora 11)
kevin has set checkout to Approved for provenpackager on lilyterm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lilyterm



From pkgdb at fedoraproject.org  Sun Apr 19 01:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:26:56 +0000
Subject: [pkgdb] lilyterm (Fedora, 9) updated by kevin
Message-ID: <20090419012656.538EB10F882@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for lilyterm
kevin has set commit to Approved for provenpackager on lilyterm (Fedora 9)
kevin has set build to Approved for provenpackager on lilyterm (Fedora 9)
kevin has set checkout to Approved for provenpackager on lilyterm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lilyterm



From kevin at fedoraproject.org  Sun Apr 19 01:27:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:27:10 +0000 (UTC)
Subject: rpms/lilyterm - New directory
Message-ID: <20090419012710.32B04700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lilyterm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC17250/rpms/lilyterm

Log Message:
Directory /cvs/pkgs/rpms/lilyterm added to the repository




From kevin at fedoraproject.org  Sun Apr 19 01:27:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:27:10 +0000 (UTC)
Subject: rpms/lilyterm/devel - New directory
Message-ID: <20090419012710.66A67700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lilyterm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC17250/rpms/lilyterm/devel

Log Message:
Directory /cvs/pkgs/rpms/lilyterm/devel added to the repository




From kevin at fedoraproject.org  Sun Apr 19 01:27:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:27:20 +0000 (UTC)
Subject: rpms/lilyterm Makefile,NONE,1.1
Message-ID: <20090419012720.00CFE700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lilyterm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC17250/rpms/lilyterm

Added Files:
	Makefile 
Log Message:
Setup of module lilyterm


--- NEW FILE Makefile ---
# Top level Makefile for module lilyterm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Apr 19 01:27:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 01:27:20 +0000 (UTC)
Subject: rpms/lilyterm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090419012720.64103700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lilyterm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC17250/rpms/lilyterm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lilyterm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lilyterm
# $Id: Makefile,v 1.1 2009/04/19 01:27:20 kevin Exp $
NAME := lilyterm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Apr 19 01:27:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:27:39 +0000
Subject: [pkgdb] libnet10 (Fedora EPEL, 4) updated by kevin
Message-ID: <20090419012739.74DF910F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for libnet10
kevin has set commit to Approved for provenpackager on libnet10 (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on libnet10 (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on libnet10 (Fedora EPEL 4)
kevin changed owner of libnet10 in Fedora EPEL 4 to robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 01:27:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 01:27:39 +0000
Subject: [pkgdb] libnet10 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090419012739.8305D10F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libnet10
kevin has set commit to Approved for provenpackager on libnet10 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on libnet10 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on libnet10 (Fedora EPEL 5)
kevin changed owner of libnet10 in Fedora EPEL 5 to robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From robert at fedoraproject.org  Sun Apr 19 01:36:15 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 19 Apr 2009 01:36:15 +0000 (UTC)
Subject: rpms/libnet10/EL-4 libnet10-1.0.2a-fedora.patch, NONE,
	1.1 libnet10-1.0.2a-gcc33.patch, NONE, 1.1 libnet10-config.1,
	NONE, 1.1 libnet10.spec, 1.5, 1.6 gcc33.patch, 1.1, NONE
Message-ID: <20090419013615.29CF0700F9@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet10/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19243/EL-4

Modified Files:
	libnet10.spec 
Added Files:
	libnet10-1.0.2a-fedora.patch libnet10-1.0.2a-gcc33.patch 
	libnet10-config.1 
Removed Files:
	gcc33.patch 
Log Message:
EPEL branching of libnet10

libnet10-1.0.2a-fedora.patch:

--- NEW FILE libnet10-1.0.2a-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which changes the
configure and Makefiles that way, that a shared library is available and the whole package
is called libnet10 rather libnet.

--- Libnet-1.0.2a/configure.in				2001-01-17 21:59:30.000000000 +0100
+++ Libnet-1.0.2a/configure.in.fedora			2009-04-18 19:05:06.000000000 +0200
@@ -8,6 +8,14 @@
 
 AC_INIT(src/libnet_build_ip.c)
 
+dnl
+dnl Determine hosttype and set the root install directory.
+dnl
+AC_CANONICAL_SYSTEM
+AC_PREFIX_DEFAULT(/usr)
+
+AM_INIT_AUTOMAKE(libnet, 1.0.2a)
+
 VER=`cat VERSION`
 AC_MSG_RESULT(Beginning autoconfiguration process for libnet-$VER...)
 
@@ -25,16 +33,14 @@
 AC_SUBST(LIBNET_CONFIG_LIBS)
 AC_SUBST(LIBNET_CONFIG_CFLAGS)
 
-dnl
-dnl Determine hosttype and set the root install directory.
-dnl
-AC_CANONICAL_SYSTEM
-AC_PREFIX_DEFAULT(/usr)
-
 if test "$prefix" = "NONE"; then
     prefix="/usr"
 fi
 
+if test "$mandir" = "NONE"; then
+    mandir="$prefix/man"
+fi
+
 dnl
 dnl Check compiler type.
 dnl
@@ -51,7 +57,7 @@
 dnl
 if test $ac_cv_prog_gcc = yes; then
 dnl if test -z $CFLAGS; then 
-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+    CCOPTS="-O2 -funroll-loops -fomit-frame-pointer -Wall $CFLAGS"
     CFLAGS="$CCOPTS"
 dnl fi
 fi
@@ -74,6 +80,8 @@
 AC_CHECK_PROGS(AR, ar, @true)
 AC_CHECK_PROGS(LN, ln, @true)
 
+AC_PROG_LIBTOOL
+
 dnl
 dnl Check for library functions.
 dnl
@@ -110,7 +118,7 @@
     AC_DEFINE(HAVE_DLPI)
 elif test -r /usr/include/linux/socket.h ; then
     LL_INT_TYPE=sockpacket
-    AC_MSG_RESULT(found SOCK_PACKET)
+    AC_MSG_RESULT(found linux primitives)
     if test $with_pf_packet = yes; then
          AC_LIBNET_CHECK_PF_PACKET
     fi
@@ -147,7 +155,7 @@
     LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
     AC_CHECK_HEADERS(net/ethernet.h, \
         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-    MAN_PREFIX="$prefix/man/man3/"
+    MAN_PREFIX="$mandir/man3/"
     LIB_PREFIX="$prefix/lib/"
     INC_PREFIX="$prefix/include/"
     BIN_PREFIX="$prefix/bin/"
@@ -258,9 +266,6 @@
 
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CONFIG_HEADER(include/config.h)
-AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
-    test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
-    test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnet/Makefile libnet-config)
 
 dnl EOF
--- Libnet-1.0.2a/acconfig.h				2000-12-12 19:31:39.000000000 +0100
+++ Libnet-1.0.2a/acconfig.h.fedora			2009-04-18 18:49:55.000000000 +0200
@@ -1,15 +1,17 @@
-dnl $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
+/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
+ *
+ * Libnet autoconfiguration acconfig.h file
+ * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
+ * All rights reserved.
+ *
+ * Process this file with autoheader to produce a config.h file.
+ */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
 #undef DLPI_DEV_PREFIX
+#undef LIBNET_FAST_X86_CHECK
+#undef HAVE_SOLARIS
 #undef HAVE_DEV_DLPI
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DLPI
@@ -23,5 +25,3 @@
 #undef __FAVOR_BSD
 #undef LIBNET_BIG_ENDIAN
 #undef LIBNET_LIL_ENDIAN
-
-dnl EOF
--- Libnet-1.0.2a/Makefile.am				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/Makefile.am.fedora			2009-04-18 18:41:15.000000000 +0200
@@ -0,0 +1,7 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = src include
+EXTRA_DIST = Makefile.am.common
+bin_SCRIPTS = libnet-config
+version.h: VERSION
+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
--- Libnet-1.0.2a/src/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/src/Makefile.am.fedora		2009-04-18 18:43:52.000000000 +0200
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+lib_LTLIBRARIES = libnet10.la
+libnet10_la_SOURCES = \
+	libnet_resolve.c \
+	libnet_socket.c \
+	libnet_checksum.c \
+	libnet_prand.c \
+	libnet_version.c \
+	libnet_write_ip.c \
+	libnet_insert_ipo.c \
+	libnet_insert_tcpo.c \
+	libnet_error.c \
+	libnet_link_ at LL_INT_TYPE@.c \
+	libnet_packet_mem.c \
+	libnet_build_ip.c \
+	libnet_build_tcp.c \
+	libnet_build_udp.c \
+	libnet_build_arp.c \
+	libnet_build_ethernet.c \
+	libnet_build_icmp.c \
+	libnet_build_igmp.c \
+	libnet_build_dns.c \
+	libnet_build_snmp.c \
+	libnet_build_rip.c \
+	libnet_build_ospf.c \
+	libnet_build_vrrp.c \
+	libnet_asn1.c \
+	libnet_hex_dump.c \
+	libnet_if_addr.c \
+	libnet_port_list.c
+libnet10_la_LIBADD = @LTLIBOBJS@
+libnet10_la_LDFLAGS = -version-info 0:0:0 # CURRENT[:REVISION[:AGE]]
--- Libnet-1.0.2a/include/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/Makefile.am.fedora		2009-04-18 18:41:05.000000000 +0200
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = libnet
+include_HEADERS = libnet.h
--- Libnet-1.0.2a/include/libnet/Makefile.am		1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/libnet/Makefile.am.fedora	2009-04-18 18:42:02.000000000 +0200
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+pkginclude_HEADERS = \
+	libnet-asn1.h \
+	libnet-functions.h \
+	libnet-headers.h \
+	libnet-macros.h \
+	libnet-ospf.h \
+	libnet-structures.h
--- Libnet-1.0.2a/version.h				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/version.h.fedora			2009-04-18 18:56:15.000000000 +0200
@@ -0,0 +1 @@
+#define VERSION "1.0.2a"
--- Libnet-1.0.2a/libnet-config.in			2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in.fedora		2009-04-18 21:30:00.000000000 +0200
@@ -8,13 +8,13 @@
 #   @configure_input@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I at includedir@/libnet10"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet10"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet10-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]

libnet10-1.0.2a-gcc33.patch:

--- NEW FILE libnet10-1.0.2a-gcc33.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which adds
the missing quotations needed by GCC 3.3 and newer.

--- Libnet-1.0.2a/include/libnet.h		2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h.gcc33	2009-04-18 19:37:20.000000000 +0200
@@ -84,9 +84,9 @@
 #define LIBNET_VERSION  "1.0.2a"
 
 #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll"
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
+"documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */


--- NEW FILE libnet10-config.1 ---
.\" Written by Domenico Andreoli for Debian GNU/Linux.
.\" Do whatever you want with this file.
.\" NO warranty is provided.
.TH libnet10-config 1 "18 January 2002" "Libnet 1.0.2a" "libnet10-config manual"
.SH NAME
libnet10-config \- Get information about a libnet installation
.SH SYNOPSIS
.B libnet10-config [options]
.SH DESCRIPTION
.B libnet10-config
displays information about a previous libnet installation.
.SH OPTIONS
.IP "--cflags"
Set of compiler options (CFLAGS) to use when compiling files that use
libnet.
.IP "--libs"
Shows the complete set of libs and other linker options you will need in order
to link your application with libnet.
.IP "--defines"
Set of compiler defines used to compile libnet.
.SH "EXAMPLES"
What linker options do I need when I link with libnet?

  libnet10-config --libs

What compiler options do I need when I compile using libnet functions?

  libnet10-config --cflags
.SH SEE ALSO
.BR libnet10 (3)
.SH AUTHOR
This manual page was written by Domenico Andreoli <cavok at debian.org>
for the Debian GNU/Linux system (but may be used by others).


Index: libnet10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet10/EL-4/libnet10.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnet10.spec	3 Sep 2005 01:34:10 -0000	1.5
+++ libnet10.spec	19 Apr 2009 01:35:44 -0000	1.6
@@ -1,17 +1,16 @@
-Summary:        High-level API (toolkit) to construct and inject network packets
-Name:           libnet10
-Version:        1.0.2a
-Release:        8%{?dist}
-URL:            http://www.packetfactory.net/libnet/
-License:        BSD
-Group:          System Environment/Libraries
-Source0:        http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0:         gcc33.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:      libnet < 1.1.0
-Obsoletes:      libnet-devel < 1.1.0
-Provides:       libnet = %{version}-%{release}
-Provides:       libnet-devel = %{version}-%{release}
+Summary:	High-level API (toolkit) to construct and inject network packets
+Name:		libnet10
+Version:	1.0.2a
+Release:	17%{?dist}
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.packetfactory.net/libnet/
+Source0:	http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{version}.tar.gz
+Source1:	libnet10-config.1
+Patch0:		libnet10-1.0.2a-fedora.patch
+Patch1:		libnet10-1.0.2a-gcc33.patch
+BuildRequires:	%{_includedir}/pcap.h, libtool, autoconf, automake
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -19,57 +18,110 @@
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,
-byte-ordering, OS-dependent issues, and much more. Libnet features portable
-packet creation interfaces at the IP layer and link layer, as well as a host of
-supplementary and complementary functionality. Using libnet, quick and simple
-packet assembly applications can be whipped up with little effort. With a bit
-more time, more complex programs can be written (Traceroute and ping were
-easily rewritten using libnet and libpcap).
-
-
+byte-ordering, OS-dependent issues and much more. Libnet features portable
+packet creation interfaces at the IP layer and link layer, as well as a host
+of supplementary and complementary functionality.
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
+
+%package devel
+Summary:	Development files for the libnet library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The libnet10-devel package includes header files and libraries necessary for
+developing programs which use the libnet library. Using libnet, quick and
+simple packet assembly applications can be whipped up with little effort.
+With a bit more time, more complex programs can be written (traceroute and
+ping were easily rewritten using libnet and libpcap).
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
 
 %prep
 %setup -q -n Libnet-%{version}
-%patch0 -p1
-
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .gcc33
 
+# Required to apply changes from Patch0
+autoreconf -i -f
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
-
+%configure --with-pf_packet=yes
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
-mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
-chmod 0644 ${RPM_BUILD_ROOT}%{_mandir}/man3/*
-chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/*.*
-chmod 0644 ${RPM_BUILD_ROOT}%{_includedir}/*.*
-chmod 0644 ${RPM_BUILD_ROOT}%{_includedir}/libnet/*.*
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
+# Complete the package renaming at missing places
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_includedir}/{libnet{,.h},%{name}}
+mv -f $RPM_BUILD_ROOT%{_bindir}/libnet{,10}-config
+
+# Install all man pages to their appropriate place
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3}/
+install -p -m 644 doc/libnet.3 $RPM_BUILD_ROOT%{_mandir}/man3/%{name}.3
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-config.1
 
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/*
-%{_includedir}/libnet
-%{_includedir}/*.h
-%{_libdir}/*
-%{_mandir}/man3/*
-
+%{_libdir}/%{name}.so.*
+%{_mandir}/man3/%{name}.3*
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_mandir}/man1/%{name}-config.1*
+%{_includedir}/%{name}/
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-17
+- Enabled a shared library and made lots of spec file cleanups
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-16
+- Rebuild against gcc 4.4 and rpm 4.6
+
+* Sun Jun 15 2008 Patrice Dumas <pertusus at free.fr> - 1.0.2a-15
+- copy config.* from rpm directory, those shpped with libnet10 are too old
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.2a-14
+- Autorebuild for GCC 4.3
+
+* Mon May  7 2007 Patrice Dumas <pertusus at free.fr> - 1.0.2a-13
+- add a libnet-1.0 directory with a libnet.a link to the library
+
+* Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-12
+- rename gcc33.patch to libnet10-gcc33.patch
+- patch to have a version parallel installable with libnet (#229297),
+  correct perms and keep timestamps
+- remove Obsoletes and Provides for libnet and libnet-devel (#229297)
+
+* Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-11
+- rebuild for FC6
+
+* Fri Feb 17 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-10
+- rebuild for fc5
+
+* Wed Feb  1 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-9
+- rebuild
+
 * Sun Aug 28 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2a-8
 - add versioned Obsoletes/Provides for libnet and libnet-devel
   so libnet/libnet-devel >= 1.1.0 upgrade this and don't just conflict


--- gcc33.patch DELETED ---



From robert at fedoraproject.org  Sun Apr 19 01:36:15 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 19 Apr 2009 01:36:15 +0000 (UTC)
Subject: rpms/libnet10/EL-5 libnet10-1.0.2a-fedora.patch, NONE,
	1.1 libnet10-1.0.2a-gcc33.patch, NONE, 1.1 libnet10-config.1,
	NONE, 1.1 libnet10.spec, 1.12, 1.13 gcc33.patch, 1.1, NONE
Message-ID: <20090419013615.6CCA0700F9@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet10/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19243/EL-5

Modified Files:
	libnet10.spec 
Added Files:
	libnet10-1.0.2a-fedora.patch libnet10-1.0.2a-gcc33.patch 
	libnet10-config.1 
Removed Files:
	gcc33.patch 
Log Message:
EPEL branching of libnet10

libnet10-1.0.2a-fedora.patch:

--- NEW FILE libnet10-1.0.2a-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which changes the
configure and Makefiles that way, that a shared library is available and the whole package
is called libnet10 rather libnet.

--- Libnet-1.0.2a/configure.in				2001-01-17 21:59:30.000000000 +0100
+++ Libnet-1.0.2a/configure.in.fedora			2009-04-18 19:05:06.000000000 +0200
@@ -8,6 +8,14 @@
 
 AC_INIT(src/libnet_build_ip.c)
 
+dnl
+dnl Determine hosttype and set the root install directory.
+dnl
+AC_CANONICAL_SYSTEM
+AC_PREFIX_DEFAULT(/usr)
+
+AM_INIT_AUTOMAKE(libnet, 1.0.2a)
+
 VER=`cat VERSION`
 AC_MSG_RESULT(Beginning autoconfiguration process for libnet-$VER...)
 
@@ -25,16 +33,14 @@
 AC_SUBST(LIBNET_CONFIG_LIBS)
 AC_SUBST(LIBNET_CONFIG_CFLAGS)
 
-dnl
-dnl Determine hosttype and set the root install directory.
-dnl
-AC_CANONICAL_SYSTEM
-AC_PREFIX_DEFAULT(/usr)
-
 if test "$prefix" = "NONE"; then
     prefix="/usr"
 fi
 
+if test "$mandir" = "NONE"; then
+    mandir="$prefix/man"
+fi
+
 dnl
 dnl Check compiler type.
 dnl
@@ -51,7 +57,7 @@
 dnl
 if test $ac_cv_prog_gcc = yes; then
 dnl if test -z $CFLAGS; then 
-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+    CCOPTS="-O2 -funroll-loops -fomit-frame-pointer -Wall $CFLAGS"
     CFLAGS="$CCOPTS"
 dnl fi
 fi
@@ -74,6 +80,8 @@
 AC_CHECK_PROGS(AR, ar, @true)
 AC_CHECK_PROGS(LN, ln, @true)
 
+AC_PROG_LIBTOOL
+
 dnl
 dnl Check for library functions.
 dnl
@@ -110,7 +118,7 @@
     AC_DEFINE(HAVE_DLPI)
 elif test -r /usr/include/linux/socket.h ; then
     LL_INT_TYPE=sockpacket
-    AC_MSG_RESULT(found SOCK_PACKET)
+    AC_MSG_RESULT(found linux primitives)
     if test $with_pf_packet = yes; then
          AC_LIBNET_CHECK_PF_PACKET
     fi
@@ -147,7 +155,7 @@
     LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
     AC_CHECK_HEADERS(net/ethernet.h, \
         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-    MAN_PREFIX="$prefix/man/man3/"
+    MAN_PREFIX="$mandir/man3/"
     LIB_PREFIX="$prefix/lib/"
     INC_PREFIX="$prefix/include/"
     BIN_PREFIX="$prefix/bin/"
@@ -258,9 +266,6 @@
 
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CONFIG_HEADER(include/config.h)
-AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
-    test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
-    test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnet/Makefile libnet-config)
 
 dnl EOF
--- Libnet-1.0.2a/acconfig.h				2000-12-12 19:31:39.000000000 +0100
+++ Libnet-1.0.2a/acconfig.h.fedora			2009-04-18 18:49:55.000000000 +0200
@@ -1,15 +1,17 @@
-dnl $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
+/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
+ *
+ * Libnet autoconfiguration acconfig.h file
+ * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike at infonexus.com>
+ * All rights reserved.
+ *
+ * Process this file with autoheader to produce a config.h file.
+ */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
 #undef DLPI_DEV_PREFIX
+#undef LIBNET_FAST_X86_CHECK
+#undef HAVE_SOLARIS
 #undef HAVE_DEV_DLPI
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DLPI
@@ -23,5 +25,3 @@
 #undef __FAVOR_BSD
 #undef LIBNET_BIG_ENDIAN
 #undef LIBNET_LIL_ENDIAN
-
-dnl EOF
--- Libnet-1.0.2a/Makefile.am				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/Makefile.am.fedora			2009-04-18 18:41:15.000000000 +0200
@@ -0,0 +1,7 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = src include
+EXTRA_DIST = Makefile.am.common
+bin_SCRIPTS = libnet-config
+version.h: VERSION
+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
--- Libnet-1.0.2a/src/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/src/Makefile.am.fedora		2009-04-18 18:43:52.000000000 +0200
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+lib_LTLIBRARIES = libnet10.la
+libnet10_la_SOURCES = \
+	libnet_resolve.c \
+	libnet_socket.c \
+	libnet_checksum.c \
+	libnet_prand.c \
+	libnet_version.c \
+	libnet_write_ip.c \
+	libnet_insert_ipo.c \
+	libnet_insert_tcpo.c \
+	libnet_error.c \
+	libnet_link_ at LL_INT_TYPE@.c \
+	libnet_packet_mem.c \
+	libnet_build_ip.c \
+	libnet_build_tcp.c \
+	libnet_build_udp.c \
+	libnet_build_arp.c \
+	libnet_build_ethernet.c \
+	libnet_build_icmp.c \
+	libnet_build_igmp.c \
+	libnet_build_dns.c \
+	libnet_build_snmp.c \
+	libnet_build_rip.c \
+	libnet_build_ospf.c \
+	libnet_build_vrrp.c \
+	libnet_asn1.c \
+	libnet_hex_dump.c \
+	libnet_if_addr.c \
+	libnet_port_list.c
+libnet10_la_LIBADD = @LTLIBOBJS@
+libnet10_la_LDFLAGS = -version-info 0:0:0 # CURRENT[:REVISION[:AGE]]
--- Libnet-1.0.2a/include/Makefile.am			1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/Makefile.am.fedora		2009-04-18 18:41:05.000000000 +0200
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+SUBDIRS = libnet
+include_HEADERS = libnet.h
--- Libnet-1.0.2a/include/libnet/Makefile.am		1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/include/libnet/Makefile.am.fedora	2009-04-18 18:42:02.000000000 +0200
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+DISTCLEANFILES = *~
+pkginclude_HEADERS = \
+	libnet-asn1.h \
+	libnet-functions.h \
+	libnet-headers.h \
+	libnet-macros.h \
+	libnet-ospf.h \
+	libnet-structures.h
--- Libnet-1.0.2a/version.h				1970-01-01 01:00:00.000000000 +0100
+++ Libnet-1.0.2a/version.h.fedora			2009-04-18 18:56:15.000000000 +0200
@@ -0,0 +1 @@
+#define VERSION "1.0.2a"
--- Libnet-1.0.2a/libnet-config.in			2000-12-12 19:33:42.000000000 +0100
+++ Libnet-1.0.2a/libnet-config.in.fedora		2009-04-18 21:30:00.000000000 +0200
@@ -8,13 +8,13 @@
 #   @configure_input@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I at includedir@/libnet10"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet10"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet10-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]

libnet10-1.0.2a-gcc33.patch:

--- NEW FILE libnet10-1.0.2a-gcc33.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for libnet >= 1.0.2a, which adds
the missing quotations needed by GCC 3.3 and newer.

--- Libnet-1.0.2a/include/libnet.h		2001-02-07 00:19:25.000000000 +0100
+++ Libnet-1.0.2a/include/libnet.h.gcc33	2009-04-18 19:37:20.000000000 +0200
@@ -84,9 +84,9 @@
 #define LIBNET_VERSION  "1.0.2a"
 
 #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#error "byte order has not been specified, you'll"
+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
+"documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */


--- NEW FILE libnet10-config.1 ---
.\" Written by Domenico Andreoli for Debian GNU/Linux.
.\" Do whatever you want with this file.
.\" NO warranty is provided.
.TH libnet10-config 1 "18 January 2002" "Libnet 1.0.2a" "libnet10-config manual"
.SH NAME
libnet10-config \- Get information about a libnet installation
.SH SYNOPSIS
.B libnet10-config [options]
.SH DESCRIPTION
.B libnet10-config
displays information about a previous libnet installation.
.SH OPTIONS
.IP "--cflags"
Set of compiler options (CFLAGS) to use when compiling files that use
libnet.
.IP "--libs"
Shows the complete set of libs and other linker options you will need in order
to link your application with libnet.
.IP "--defines"
Set of compiler defines used to compile libnet.
.SH "EXAMPLES"
What linker options do I need when I link with libnet?

  libnet10-config --libs

What compiler options do I need when I compile using libnet functions?

  libnet10-config --cflags
.SH SEE ALSO
.BR libnet10 (3)
.SH AUTHOR
This manual page was written by Domenico Andreoli <cavok at debian.org>
for the Debian GNU/Linux system (but may be used by others).


Index: libnet10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet10/EL-5/libnet10.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libnet10.spec	29 Aug 2006 11:21:33 -0000	1.12
+++ libnet10.spec	19 Apr 2009 01:35:45 -0000	1.13
@@ -1,17 +1,16 @@
-Summary:        High-level API (toolkit) to construct and inject network packets
-Name:           libnet10
-Version:        1.0.2a
-Release:        11%{?dist}
-URL:            http://www.packetfactory.net/libnet/
-License:        BSD
-Group:          System Environment/Libraries
-Source0:        http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-Patch0:         gcc33.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:      libnet < 1.1.0
-Obsoletes:      libnet-devel < 1.1.0
-Provides:       libnet = %{version}-%{release}
-Provides:       libnet-devel = %{version}-%{release}
+Summary:	High-level API (toolkit) to construct and inject network packets
+Name:		libnet10
+Version:	1.0.2a
+Release:	17%{?dist}
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.packetfactory.net/libnet/
+Source0:	http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{version}.tar.gz
+Source1:	libnet10-config.1
+Patch0:		libnet10-1.0.2a-fedora.patch
+Patch1:		libnet10-1.0.2a-gcc33.patch
+BuildRequires:	%{_includedir}/pcap.h, libtool, autoconf, automake
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
@@ -19,57 +18,101 @@
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,
-byte-ordering, OS-dependent issues, and much more. Libnet features portable
-packet creation interfaces at the IP layer and link layer, as well as a host of
-supplementary and complementary functionality. Using libnet, quick and simple
-packet assembly applications can be whipped up with little effort. With a bit
-more time, more complex programs can be written (Traceroute and ping were
-easily rewritten using libnet and libpcap).
-
-
+byte-ordering, OS-dependent issues and much more. Libnet features portable
+packet creation interfaces at the IP layer and link layer, as well as a host
+of supplementary and complementary functionality.
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
+
+%package devel
+Summary:	Development files for the libnet library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The libnet10-devel package includes header files and libraries necessary for
+developing programs which use the libnet library. Using libnet, quick and
+simple packet assembly applications can be whipped up with little effort.
+With a bit more time, more complex programs can be written (traceroute and
+ping were easily rewritten using libnet and libpcap).
+
+This package contains an old and deprecated version of libnet. You need it
+only if the software you are using hasn't been updated to work with the newer
+version and the newer API.
 
 %prep
 %setup -q -n Libnet-%{version}
-%patch0 -p1
-
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .gcc33
 
+# Required to apply changes from Patch0
+autoreconf -i -f
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
-
-
+%configure --with-pf_packet=yes
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3/
-mv ${RPM_BUILD_ROOT}/usr/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3/
-chmod 0644 ${RPM_BUILD_ROOT}%{_mandir}/man3/*
-chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/*.*
-chmod 0644 ${RPM_BUILD_ROOT}%{_includedir}/*.*
-chmod 0644 ${RPM_BUILD_ROOT}%{_includedir}/libnet/*.*
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
+# Complete the package renaming at missing places
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_includedir}/{libnet{,.h},%{name}}
+mv -f $RPM_BUILD_ROOT%{_bindir}/libnet{,10}-config
+
+# Install all man pages to their appropriate place
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3}/
+install -p -m 644 doc/libnet.3 $RPM_BUILD_ROOT%{_mandir}/man3/%{name}.3
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-config.1
 
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc README doc/COPYING doc/CHANGELOG
-%{_bindir}/*
-%{_includedir}/libnet
-%{_includedir}/*.h
-%{_libdir}/*
-%{_mandir}/man3/*
-
+%{_libdir}/%{name}.so.*
+%{_mandir}/man3/%{name}.3*
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_mandir}/man1/%{name}-config.1*
+%{_includedir}/%{name}/
 
 %changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-17
+- Enabled a shared library and made lots of spec file cleanups
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.0.2a-16
+- Rebuild against gcc 4.4 and rpm 4.6
+
+* Sun Jun 15 2008 Patrice Dumas <pertusus at free.fr> - 1.0.2a-15
+- copy config.* from rpm directory, those shpped with libnet10 are too old
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.2a-14
+- Autorebuild for GCC 4.3
+
+* Mon May  7 2007 Patrice Dumas <pertusus at free.fr> - 1.0.2a-13
+- add a libnet-1.0 directory with a libnet.a link to the library
+
+* Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-12
+- rename gcc33.patch to libnet10-gcc33.patch
+- patch to have a version parallel installable with libnet (#229297),
+  correct perms and keep timestamps
+- remove Obsoletes and Provides for libnet and libnet-devel (#229297)
+
 * Tue Aug 29 2006 Patrice Dumas <pertusus at free.fr> - 1.0.2a-11
 - rebuild for FC6
 


--- gcc33.patch DELETED ---



From cwickert at fedoraproject.org  Sun Apr 19 01:36:39 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 01:36:39 +0000 (UTC)
Subject: rpms/lilyterm/devel import.log, NONE, 1.1 lilyterm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419013639.C56BB700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19314/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lilyterm.spec 
Log Message:
Initial Import of lilyterm. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=496167



--- NEW FILE import.log ---
lilyterm-0_9_6-1_fc11:HEAD:lilyterm-0.9.6-1.fc11.src.rpm:1240104927


--- NEW FILE lilyterm.spec ---
Name:           lilyterm
Version:        0.9.6
Release:        1%{?dist}
Summary:        Light and easy to use X Terminal Emulator

Group:          User Interface/X
License:        BSD
URL:            http://lilyterm.luna.com.tw
Source0:        http://lilyterm.luna.com.tw/lilyterm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.8.20
BuildRequires:  vte-devel >= 0.12.2
BuildRequires:  desktop-file-utils intltool

%description
LilyTerm is a light and easy to use libvte based X Terminal Emulator with a 
lot of features:
 * Supports multiple tabs, reorderable tabs and hides the tab tray when there 
   is only one tab
 * Add, close, swith, move, rename tabs with function keys
 * Disable/Enable function keys for temporary (use <Ctrl><`> by default).
 * Shows the foreground running command on tab and/or window title.
 * Change the font name, size, and window size with right click menu.
 * User custom function keys (need to edit profile).
 * Support for User/System profiles.
 * Supports true transparency if the window manager is composited.
 * Support for transparent background and background saturation.
 * Support for text and background color (need to edit profile).
 * Good support for UTF-8.
 * Decide the text encoding via environment. Using UTF-8 by default.
 * Change the text encoding with right click menu.


%prep
%setup -q
chmod +x ./autogen.sh


%build
./autogen.sh
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/lilyterm/


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%config(noreplace) %{_sysconfdir}/xdg/lilyterm.rc
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/lilyterm.*


%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.6-1
- Update to 0.9.6

* Fri Jul 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.5-1
- Update to 0.9.5

* Thu Jul 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4

* Thu Jun 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.3-1
- Update to 0.9.3

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0

* Mon Apr 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:27:20 -0000	1.1
+++ .cvsignore	19 Apr 2009 01:36:09 -0000	1.2
@@ -0,0 +1 @@
+lilyterm-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:27:20 -0000	1.1
+++ sources	19 Apr 2009 01:36:09 -0000	1.2
@@ -0,0 +1 @@
+d18e93fd679b9b8aea1d25d5cf4fbb70  lilyterm-0.9.6.tar.gz



From cwickert at fedoraproject.org  Sun Apr 19 01:38:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 01:38:08 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec, 1.19,
	1.20
Message-ID: <20090419013808.B7CA4700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-battery-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19870

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
make sure patch gets applied


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfce4-battery-plugin.spec	26 Feb 2009 08:41:13 -0000	1.19
+++ xfce4-battery-plugin.spec	19 Apr 2009 01:37:38 -0000	1.20
@@ -19,7 +19,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .2.6.24
+%patch0 -p1 -b .2.6.24
 
 %build
 %configure --disable-static



From cwickert at fedoraproject.org  Sun Apr 19 01:54:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 01:54:58 +0000 (UTC)
Subject: rpms/lilyterm/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090419015458.263B9700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23671/F-10

Modified Files:
	.cvsignore sources 
Log Message:
initial import of lilyterm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:27:20 -0000	1.1
+++ .cvsignore	19 Apr 2009 01:54:27 -0000	1.2
@@ -0,0 +1 @@
+lilyterm-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:27:20 -0000	1.1
+++ sources	19 Apr 2009 01:54:27 -0000	1.2
@@ -0,0 +1 @@
+d18e93fd679b9b8aea1d25d5cf4fbb70  lilyterm-0.9.6.tar.gz



From cwickert at fedoraproject.org  Sun Apr 19 01:54:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 01:54:58 +0000 (UTC)
Subject: rpms/lilyterm/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090419015458.36C577013C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23671/F-11

Modified Files:
	.cvsignore sources 
Log Message:
initial import of lilyterm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:27:20 -0000	1.1
+++ .cvsignore	19 Apr 2009 01:54:27 -0000	1.2
@@ -0,0 +1 @@
+lilyterm-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:27:20 -0000	1.1
+++ sources	19 Apr 2009 01:54:27 -0000	1.2
@@ -0,0 +1 @@
+d18e93fd679b9b8aea1d25d5cf4fbb70  lilyterm-0.9.6.tar.gz



From cwickert at fedoraproject.org  Sun Apr 19 01:54:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 01:54:58 +0000 (UTC)
Subject: rpms/lilyterm/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090419015458.85E83700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23671/F-9

Modified Files:
	.cvsignore sources 
Log Message:
initial import of lilyterm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:27:20 -0000	1.1
+++ .cvsignore	19 Apr 2009 01:54:28 -0000	1.2
@@ -0,0 +1 @@
+lilyterm-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilyterm/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:27:20 -0000	1.1
+++ sources	19 Apr 2009 01:54:28 -0000	1.2
@@ -0,0 +1 @@
+d18e93fd679b9b8aea1d25d5cf4fbb70  lilyterm-0.9.6.tar.gz



From cwickert at fedoraproject.org  Sun Apr 19 01:55:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 01:55:05 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/F-11 xfce4-battery-plugin.spec,1.19,1.20
Message-ID: <20090419015505.5A3C8700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-battery-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23757

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
make sure patch gets applied


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/F-11/xfce4-battery-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfce4-battery-plugin.spec	26 Feb 2009 08:41:13 -0000	1.19
+++ xfce4-battery-plugin.spec	19 Apr 2009 01:54:35 -0000	1.20
@@ -19,7 +19,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .2.6.24
+%patch0 -p1 -b .2.6.24
 
 %build
 %configure --disable-static



From cwickert at fedoraproject.org  Sun Apr 19 02:08:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 02:08:01 +0000 (UTC)
Subject: rpms/lilyterm/F-10 lilyterm.spec,NONE,1.1
Message-ID: <20090419020801.90A18700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26564/F-10

Added Files:
	lilyterm.spec 
Log Message:
forgot to add spec


--- NEW FILE lilyterm.spec ---
Name:           lilyterm
Version:        0.9.6
Release:        1%{?dist}
Summary:        Light and easy to use X Terminal Emulator

Group:          User Interface/X
License:        BSD
URL:            http://lilyterm.luna.com.tw
Source0:        http://lilyterm.luna.com.tw/lilyterm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.8.20
BuildRequires:  vte-devel >= 0.12.2
BuildRequires:  desktop-file-utils intltool

%description
LilyTerm is a light and easy to use libvte based X Terminal Emulator with a 
lot of features:
 * Supports multiple tabs, reorderable tabs and hides the tab tray when there 
   is only one tab
 * Add, close, swith, move, rename tabs with function keys
 * Disable/Enable function keys for temporary (use <Ctrl><`> by default).
 * Shows the foreground running command on tab and/or window title.
 * Change the font name, size, and window size with right click menu.
 * User custom function keys (need to edit profile).
 * Support for User/System profiles.
 * Supports true transparency if the window manager is composited.
 * Support for transparent background and background saturation.
 * Support for text and background color (need to edit profile).
 * Good support for UTF-8.
 * Decide the text encoding via environment. Using UTF-8 by default.
 * Change the text encoding with right click menu.


%prep
%setup -q
chmod +x ./autogen.sh


%build
./autogen.sh
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/lilyterm/


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%config(noreplace) %{_sysconfdir}/xdg/lilyterm.rc
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/lilyterm.*


%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.6-1
- Update to 0.9.6

* Fri Jul 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.5-1
- Update to 0.9.5

* Thu Jul 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4

* Thu Jun 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.3-1
- Update to 0.9.3

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0

* Mon Apr 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Initial Fedora RPM



From cwickert at fedoraproject.org  Sun Apr 19 02:08:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 02:08:01 +0000 (UTC)
Subject: rpms/lilyterm/F-11 lilyterm.spec,NONE,1.1
Message-ID: <20090419020801.AE8B37013C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26564/F-11

Added Files:
	lilyterm.spec 
Log Message:
forgot to add spec


--- NEW FILE lilyterm.spec ---
Name:           lilyterm
Version:        0.9.6
Release:        1%{?dist}
Summary:        Light and easy to use X Terminal Emulator

Group:          User Interface/X
License:        BSD
URL:            http://lilyterm.luna.com.tw
Source0:        http://lilyterm.luna.com.tw/lilyterm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.8.20
BuildRequires:  vte-devel >= 0.12.2
BuildRequires:  desktop-file-utils intltool

%description
LilyTerm is a light and easy to use libvte based X Terminal Emulator with a 
lot of features:
 * Supports multiple tabs, reorderable tabs and hides the tab tray when there 
   is only one tab
 * Add, close, swith, move, rename tabs with function keys
 * Disable/Enable function keys for temporary (use <Ctrl><`> by default).
 * Shows the foreground running command on tab and/or window title.
 * Change the font name, size, and window size with right click menu.
 * User custom function keys (need to edit profile).
 * Support for User/System profiles.
 * Supports true transparency if the window manager is composited.
 * Support for transparent background and background saturation.
 * Support for text and background color (need to edit profile).
 * Good support for UTF-8.
 * Decide the text encoding via environment. Using UTF-8 by default.
 * Change the text encoding with right click menu.


%prep
%setup -q
chmod +x ./autogen.sh


%build
./autogen.sh
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/lilyterm/


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%config(noreplace) %{_sysconfdir}/xdg/lilyterm.rc
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/lilyterm.*


%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.6-1
- Update to 0.9.6

* Fri Jul 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.5-1
- Update to 0.9.5

* Thu Jul 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4

* Thu Jun 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.3-1
- Update to 0.9.3

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0

* Mon Apr 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Initial Fedora RPM



From cwickert at fedoraproject.org  Sun Apr 19 02:08:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 02:08:02 +0000 (UTC)
Subject: rpms/lilyterm/F-9 lilyterm.spec,NONE,1.1
Message-ID: <20090419020802.325C2700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lilyterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26564/F-9

Added Files:
	lilyterm.spec 
Log Message:
forgot to add spec


--- NEW FILE lilyterm.spec ---
Name:           lilyterm
Version:        0.9.6
Release:        1%{?dist}
Summary:        Light and easy to use X Terminal Emulator

Group:          User Interface/X
License:        BSD
URL:            http://lilyterm.luna.com.tw
Source0:        http://lilyterm.luna.com.tw/lilyterm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.8.20
BuildRequires:  vte-devel >= 0.12.2
BuildRequires:  desktop-file-utils intltool

%description
LilyTerm is a light and easy to use libvte based X Terminal Emulator with a 
lot of features:
 * Supports multiple tabs, reorderable tabs and hides the tab tray when there 
   is only one tab
 * Add, close, swith, move, rename tabs with function keys
 * Disable/Enable function keys for temporary (use <Ctrl><`> by default).
 * Shows the foreground running command on tab and/or window title.
 * Change the font name, size, and window size with right click menu.
 * User custom function keys (need to edit profile).
 * Support for User/System profiles.
 * Supports true transparency if the window manager is composited.
 * Support for transparent background and background saturation.
 * Support for text and background color (need to edit profile).
 * Good support for UTF-8.
 * Decide the text encoding via environment. Using UTF-8 by default.
 * Change the text encoding with right click menu.


%prep
%setup -q
chmod +x ./autogen.sh


%build
./autogen.sh
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/lilyterm/


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%config(noreplace) %{_sysconfdir}/xdg/lilyterm.rc
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/lilyterm.*


%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.6-1
- Update to 0.9.6

* Fri Jul 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.5-1
- Update to 0.9.5

* Thu Jul 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4

* Thu Jun 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.3-1
- Update to 0.9.3

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0

* Mon Apr 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.6-1
- Initial Fedora RPM



From cwickert at fedoraproject.org  Sun Apr 19 02:12:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 19 Apr 2009 02:12:15 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/F-11 xfce4-battery-plugin.spec,1.20,1.21
Message-ID: <20090419021215.AB60F700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-battery-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27593

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
* Sun Apr 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-3.1
- Bump release due to tag collision



Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/F-11/xfce4-battery-plugin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfce4-battery-plugin.spec	19 Apr 2009 01:54:35 -0000	1.20
+++ xfce4-battery-plugin.spec	19 Apr 2009 02:11:45 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.5.1
-Release:	3%{?dist}
+Release:	3%{?dist}.1
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -50,6 +50,9 @@
 %{_datadir}/icons/hicolor/scalable/devices/battery.svg
 
 %changelog
+* Sun Apr 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-3.1
+- Bump release due to tag collision
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Sun Apr 19 02:17:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 19 Apr 2009 02:17:33 +0000 (UTC)
Subject: rpms/f-spot/F-11 gvfs-gphoto.patch, NONE, 1.1 f-spot.spec, 1.85,
	1.86 f-spot-0.1.11-libdir.patch, 1.1,
	NONE f-spot-0.1.3-single.patch, 1.1,
	NONE f-spot-0.2.0-libgphoto2-port.patch, 1.1,
	NONE f-spot-0.3.2-libdir.patch, 1.1,
	NONE f-spot-0.3.5-desktop-file-validate.patch, 1.1,
	NONE f-spot-0.3.5-screensaver.patch, 1.1,
	NONE f-spot-0.4.2-GalleryExport.patch, 1.1,
	NONE f-spot-0.4.2-link_system_libs.patch, 1.1,
	NONE f-spot-0.4.4-Makefile-destdir.patch, 1.1,
	NONE f-spot-0.4.4-desktop.patch, 1.1,
	NONE f-spot-0.4.4-glib-sharp-2.12.0.patch, 1.1,
	NONE f-spot-0.4.4-gtk-deprecated.patch, 1.1, NONE
Message-ID: <20090419021733.2F89C700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24935

Modified Files:
	f-spot.spec 
Added Files:
	gvfs-gphoto.patch 
Removed Files:
	f-spot-0.1.11-libdir.patch f-spot-0.1.3-single.patch 
	f-spot-0.2.0-libgphoto2-port.patch f-spot-0.3.2-libdir.patch 
	f-spot-0.3.5-desktop-file-validate.patch 
	f-spot-0.3.5-screensaver.patch 
	f-spot-0.4.2-GalleryExport.patch 
	f-spot-0.4.2-link_system_libs.patch 
	f-spot-0.4.4-Makefile-destdir.patch f-spot-0.4.4-desktop.patch 
	f-spot-0.4.4-glib-sharp-2.12.0.patch 
	f-spot-0.4.4-gtk-deprecated.patch 
Log Message:
fix up photo import somewhat


gvfs-gphoto.patch:

--- NEW FILE gvfs-gphoto.patch ---
diff -up f-spot-0.5.0.3/tools/f-spot-import.gvfs f-spot-0.5.0.3/tools/f-spot-import
--- f-spot-0.5.0.3/tools/f-spot-import.gvfs	2009-04-18 21:56:21.248974676 -0400
+++ f-spot-0.5.0.3/tools/f-spot-import	2009-04-18 21:56:30.800987772 -0400
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-udi="$1"
-#xmessage $udi
-mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point`
-if [ -n "$mount_point" ]; then
-      # USB Mass Storage camera: need to pass f-spot a mount point
+URI=`gvfs-ls -c "$1/"`
 
-      f-spot --import "$mount_point"
-else
-     # Some other camera try GPhoto2
+if [ "${URI:0:10}" = "gphoto2://" ] ; then
+    # Yield for f-spot since it wants to access the device directly
+    #
+    gvfs-mount --unmount-scheme gphoto2
 
-     bus=`hal-get-property --udi="$udi" --key=usb.bus_number`
-     dev=`hal-get-property --udi="$udi" --key=usb.linux.device_number`
-     uri=`printf gphoto2:usb:%.3d,%.3d $bus $dev`
+    if [ "${URI:11:4}" = "usb:" ] ; then
+        # Rewrite the uri to something f-spot can handle
+        #
+        bus="${URI:15:3}"
+        dev="${URI:19:3}"
 
-     echo $uri
-
-     f-spot --import "$uri"
+        URI="gphoto2:usb:$bus,$dev"
+    fi
 fi
+
+f-spot --import "$URI"


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- f-spot.spec	24 Feb 2009 16:01:45 -0000	1.85
+++ f-spot.spec	19 Apr 2009 02:17:02 -0000	1.86
@@ -7,22 +7,21 @@
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=510325
-Patch0:		x-content.patch
 # Use system mono-addins
 Patch3:		f-spot-0.4.4-link-system-mono-addins.patch
 # fix a missing icon
 Patch4:		missing-icon.patch
+# unmount cameras before importing
+Patch5:		gvfs-gphoto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
-BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
+BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4
 BuildRequires:  gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel gtk-sharp2-gapi
 BuildRequires:  gettext
 BuildRequires:  autoconf, automake, libtool, intltool
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  gnome-doc-utils
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  mono-addins-devel
@@ -34,7 +33,7 @@
 Requires(postun): desktop-file-utils
 
 # Mono only available on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha 
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 # Some compiler segfault on ia64:
 ExcludeArch: ia64
@@ -45,7 +44,7 @@
 %description
 F-Spot is an application designed to provide personal photo management
 to the GNOME desktop. Features include import, export, printing and advanced
-sorting and tagging of digital images. 
+sorting and tagging of digital images.
 
 %prep
 %setup -q
@@ -53,9 +52,9 @@
 # preserve timestamps
 touch -r configure.in configure.in.stamp
 
-%patch0 -p1 -b .x-content
 %patch3 -p1 -b .link-system-mono-addins
 %patch4 -p1 -b .missing-icon
+%patch5 -p1 -b .gvfs-gphoto
 
 # restore timestamps
 touch -r configure.in.stamp configure.in
@@ -123,6 +122,10 @@
 %{_libdir}/gio-sharp-unstable
 
 %changelog
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.0.3-7
+- Avoid showing f-spot twice for photo imports
+- Make f-spot-import work with gvfs
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- f-spot-0.1.11-libdir.patch DELETED ---


--- f-spot-0.1.3-single.patch DELETED ---


--- f-spot-0.2.0-libgphoto2-port.patch DELETED ---


--- f-spot-0.3.2-libdir.patch DELETED ---


--- f-spot-0.3.5-desktop-file-validate.patch DELETED ---


--- f-spot-0.3.5-screensaver.patch DELETED ---


--- f-spot-0.4.2-GalleryExport.patch DELETED ---


--- f-spot-0.4.2-link_system_libs.patch DELETED ---


--- f-spot-0.4.4-Makefile-destdir.patch DELETED ---


--- f-spot-0.4.4-desktop.patch DELETED ---


--- f-spot-0.4.4-glib-sharp-2.12.0.patch DELETED ---


--- f-spot-0.4.4-gtk-deprecated.patch DELETED ---



From rdieter at fedoraproject.org  Sun Apr 19 02:19:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 02:19:25 +0000 (UTC)
Subject: rpms/maxima/devel .cvsignore, 1.30, 1.31 maxima.spec, 1.128,
	1.129 sources, 1.28, 1.29
Message-ID: <20090419021925.4CA587013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29295

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	17 Apr 2009 15:16:42 -0000	1.30
+++ .cvsignore	19 Apr 2009 02:18:54 -0000	1.31
@@ -2,5 +2,4 @@
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.17.1.tar.gz
-maxima-5.18.0.tar.gz
+maxima-5.18.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- maxima.spec	17 Apr 2009 15:16:42 -0000	1.128
+++ maxima.spec	19 Apr 2009 02:18:54 -0000	1.129
@@ -1,7 +1,7 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.18.0
+Version: 5.18.1
 
 Release: 1%{?dist} 
 License: GPLv2
@@ -425,6 +425,8 @@
 
 
 %changelog
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-1
+
 * Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.0-1
 - maxima-5.18.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	17 Apr 2009 15:16:42 -0000	1.28
+++ sources	19 Apr 2009 02:18:54 -0000	1.29
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-a35b0b43cc981267925132696863b96d  maxima-5.18.0.tar.gz
+8be7388ad31b975335623b390bc2516e  maxima-5.18.1.tar.gz



From mclasen at fedoraproject.org  Sun Apr 19 02:30:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 19 Apr 2009 02:30:31 +0000 (UTC)
Subject: rpms/f-spot/F-11 f-spot.spec,1.86,1.87
Message-ID: <20090419023031.238AB700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31368

Modified Files:
	f-spot.spec 
Log Message:
bump rev



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- f-spot.spec	19 Apr 2009 02:17:02 -0000	1.86
+++ f-spot.spec	19 Apr 2009 02:30:00 -0000	1.87
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.5.0.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -122,7 +122,7 @@
 %{_libdir}/gio-sharp-unstable
 
 %changelog
-* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.0.3-7
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.0.3-8
 - Avoid showing f-spot twice for photo imports
 - Make f-spot-import work with gvfs
 



From kevin at fedoraproject.org  Sun Apr 19 03:46:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 19 Apr 2009 03:46:57 +0000 (UTC)
Subject: rpms/gigolo/devel gigolo.spec, 1.3, 1.4 sources, 1.4, 1.5 .cvsignore,
	1.4, 1.5
Message-ID: <20090419034657.6E7DB700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gigolo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12552

Modified Files:
	gigolo.spec sources .cvsignore 
Log Message:
Update to 0.3.2



Index: gigolo.spec
===================================================================
RCS file: /cvs/extras/rpms/gigolo/devel/gigolo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gigolo.spec	5 Apr 2009 01:01:49 -0000	1.3
+++ gigolo.spec	19 Apr 2009 03:46:24 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           gigolo
-Version:        0.3.1
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        GIO/GVFS management application
 
@@ -71,6 +71,9 @@
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Sat Apr 18 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.2-1
+- Update to 0.3.2
+
 * Sat Apr 04 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.1-1
 - Update to 0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gigolo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Apr 2009 01:01:48 -0000	1.4
+++ sources	19 Apr 2009 03:46:25 -0000	1.5
@@ -1 +1 @@
-7f3c94bd9bcab6c2ff432d083f02ab3e  gigolo-0.3.1.tar.bz2
+e810a525b495d08bce69317aa37d6134  gigolo-0.3.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gigolo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Apr 2009 01:01:49 -0000	1.4
+++ .cvsignore	19 Apr 2009 03:46:25 -0000	1.5
@@ -1 +1 @@
-gigolo-0.3.1.tar.bz2
+gigolo-0.3.2.tar.bz2



From petersen at fedoraproject.org  Sun Apr 19 04:28:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 19 Apr 2009 04:28:54 +0000 (UTC)
Subject: rpms/ghc/devel ghc-rpm-requires, NONE, 1.1 ghc-rpm-macros.ghc, 1.13,
	1.14 ghc.spec, 1.80, 1.81
Message-ID: <20090419042854.C3CF1700F9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18443

Modified Files:
	ghc-rpm-macros.ghc ghc.spec 
Added Files:
	ghc-rpm-requires 
Log Message:
- add ghc-requires rpm script to generate ghc version dependencies
  (thanks to Till Maas)
- update macros.ghc:
  - add %%ghcrequires to call above script
  - pkg_libdir and pkg_docdir no longer to appear in packages and replaced
    by ghcpkgdir and ghcdocdir inside macros.ghc
  - make filelist also for docs




--- NEW FILE ghc-rpm-requires ---
#! /bin/bash
# Author: Till Maas <opensource at till.name>
#
# Use this script as follows in your spec to get versioned 
# ghc requires for post and preun:
#
# %{expand:%(/usr/lib/ghc-script-requires.sh ghc post preun)}

ghc_num_ver=$(ghc --numeric-version)

PKG=$1 ; shift

# rpm will run this script once before the BuildRequires are installed
# then it has to report nothing to avoid rpm complainng about the empty version
# after the "ghc ="
if [ -n "${ghc_num_ver}" ]; then
  echo "Requires: $PKG = ${ghc_num_ver}"
  for script in "$@"; do
    echo "Requires(${script}): $PKG = ${ghc_num_ver}"
  done
fi


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ghc-rpm-macros.ghc	27 Feb 2009 01:05:09 -0000	1.13
+++ ghc-rpm-macros.ghc	19 Apr 2009 04:28:22 -0000	1.14
@@ -1,7 +1,7 @@
 %cabal %{_bindir}/runghc Setup
 
 %cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{ghcdocdir} --libsubdir='$compiler/$pkgid'
 
 %cabal_makefile \
 %cabal makefile -f cabal-rpm.mk \
@@ -10,22 +10,29 @@
 
 %cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v
 
+%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}-%{version}
+%ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
+
 %ghc_gen_filelists() \
-rm -f %1-devel.files %1-prof.files \
+rm -f %1-devel.files %1-prof.files %1-doc.files \
 echo '%defattr(-,root,root,-)' > %1-devel.files \
-find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1-devel.files \
-find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \
+find ${RPM_BUILD_ROOT}%{ghcpkgdir} -type d | sed 's/^/%dir /' >> %1-devel.files \
+find ${RPM_BUILD_ROOT}%{ghcpkgdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \
 echo '%defattr(-,root,root,-)' > %1-prof.files \
-find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \
+find ${RPM_BUILD_ROOT}%{ghcpkgdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \
 sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1-devel.files %1-prof.files \
+echo '%defattr(-,root,root,-)' > %1-doc.files \
+echo '%{ghcdocdir}' >> %1-doc.files \
 %{nil}
 
 %ghc_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script
 
-%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir}
+%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{ghcpkgdir}
 
-%ghc_register_pkg %{pkg_libdir}/register.sh >/dev/null || :
+%ghc_register_pkg %{ghcpkgdir}/register.sh >/dev/null || :
 
-%ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null || :
+%ghc_unregister_pkg %{ghcpkgdir}/unregister.sh >/dev/null || :
 
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
+
+%ghcrequires() %{expand:%(/usr/lib/rpm/ghc-requires %*)}


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ghc.spec	8 Apr 2009 21:39:16 -0000	1.80
+++ ghc.spec	19 Apr 2009 04:28:22 -0000	1.81
@@ -16,7 +16,7 @@
 
 Name: ghc
 Version: 6.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -24,7 +24,10 @@
 Group: Development/Languages
 Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
 Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
+# /etc/rpm/macros.ghc
 Source2: ghc-rpm-macros.ghc
+# /usr/lib/rpm/ghc-requires
+Source3: ghc-rpm-requires
 URL: http://haskell.org/ghc/
 # libedit-devel > 2.11-2 correctly requires ncurses-devel
 Requires: gcc, gmp-devel, libedit-devel > 2.11-2
@@ -125,6 +128,9 @@
 # install rpm macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
 cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
+# rpm script for ghc version deps
+mkdir -p ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
+cp -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/ghc-requires
 
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
@@ -191,6 +197,7 @@
 %{_bindir}/*
 %{_sysconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
+%attr(755,root,root) %{_prefix}/lib/rpm/ghc-requires
 
 %if %{with prof}
 %files prof -f rpm-prof-filelist
@@ -216,6 +223,15 @@
 %endif
 
 %changelog
+* Sun Apr 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-2
+- add ghc-requires rpm script to generate ghc version dependencies
+  (thanks to Till Maas)
+- update macros.ghc:
+  - add %%ghcrequires to call above script
+  - pkg_libdir and pkg_docdir obsoleted in packages and replaced
+    by ghcpkgdir and ghcdocdir inside macros.ghc
+  - make filelist also for docs
+
 * Wed Apr 08 2009 Bryan O'Sullivan <bos at serpentine.com> - 6.10.2-1
 - Update to 6.10.2
 



From cchance at fedoraproject.org  Sun Apr 19 04:39:31 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Sun, 19 Apr 2009 04:39:31 +0000 (UTC)
Subject: rpms/ibus-table-extraphrase/devel ibus-table-extraphrase.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419043931.A39A8700F9@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-extraphrase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21778/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-table-extraphrase.spec import.log 
Log Message:
first commit, splited from ibus-table



--- NEW FILE ibus-table-extraphrase.spec ---
%bcond_without bootstrap

Name:           ibus-table-extraphrase
Version:        1.1.0.20090415
Release:        2%{?dist}
Summary:        Extra phrase for ibus-table
License:        GPLv3+
Group:          System Environment/Libraries
URL:            http://code.google.com/p/ibus/
Source0:        http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

# for noarch pkgconfig
BuildRequires:  ibus-table >= 1.1.0.20090220-5
%if %{with bootstrap}
BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.2
%endif
Requires(post): ibus-table > 1.1.0

%description
Extra phrase data for IBus-Table engine.

This is released under released under GPLv3.

%prep
%setup -q

%build
export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
%if %{with bootstrap}
./autogen.sh \
    --prefix=%{_prefix} \
    --libdir=%{_libdir} \
%else
%configure \
%endif

#    --enable-extraphrase
make %{?_smp_mflags}

%install
%__rm -rf %{buildroot}
make install \
  DESTDIR=%{buildroot} \
  INSTALL="install -p" \
  pkgconfigdir=%{_datadir}/pkgconfig

%clean
%__rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_datadir}/pkgconfig/ibus-table-extraphrase.pc
%{_datadir}/ibus-table/data/extra_phrase.txt

%changelog
* Wed Apr 15 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090415-2.fc11
- Removed invalid verification bypass of extra_phrase.txt.
- Refined spec file.

* Wed Apr 15 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090415-1.fc11
- Updated to latest source from upstream.

* Tue Apr 14 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090406-3.fc11
- Relocated pkgconfig spec file to /usr/share/pkgconfig.

* Wed Apr 08 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090406-2.fc11
- Fixed wrong libdir of pkgconfig spec file.

* Mon Apr 06 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090406-1.fc11
- Update to the latest source tarball.
- Added ChangeLog to be doc.

* Tue Mar 31 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090327-2.fc11
- Corrected extra_phrase.txt installation destination.
- Update license tag to GPLv3+.

* Mon Mar 27 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090327-1.fc11
- Resolves: rhbz#488175
- Splited from ibus-table.


--- NEW FILE import.log ---
ibus-table-extraphrase-1_1_0_20090415-2_fc11:HEAD:ibus-table-extraphrase-1.1.0.20090415-2.fc11.src.rpm:1240115760


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-extraphrase/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:34:37 -0000	1.1
+++ .cvsignore	19 Apr 2009 04:39:00 -0000	1.2
@@ -0,0 +1 @@
+ibus-table-extraphrase-1.1.0.20090415.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-extraphrase/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:34:37 -0000	1.1
+++ sources	19 Apr 2009 04:39:00 -0000	1.2
@@ -0,0 +1 @@
+c2f951fed13d626f4fc29fcdd7ac74ba  ibus-table-extraphrase-1.1.0.20090415.tar.gz



From rishi at fedoraproject.org  Sun Apr 19 06:09:13 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 19 Apr 2009 06:09:13 +0000 (UTC)
Subject: rpms/osmo/F-11 osmo-0.2.4-configure.patch, NONE, 1.1 osmo.spec, 1.12,
	1.13
Message-ID: <20090419060913.D0C39700F9@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/osmo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10419

Modified Files:
	osmo.spec 
Added Files:
	osmo-0.2.4-configure.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-6
- Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect
  the environment's settings.


osmo-0.2.4-configure.patch:

--- NEW FILE osmo-0.2.4-configure.patch ---
diff -urNp osmo-0.2.4.orig/configure osmo-0.2.4/configure
--- osmo-0.2.4.orig/configure	2009-04-19 11:18:17.000000000 +0530
+++ osmo-0.2.4/configure	2009-04-19 11:21:26.000000000 +0530
@@ -5961,9 +5961,9 @@ else
 fi
 
 
-CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"
-CXXFLAGS="$CFLAGS"
-CPPFLAGS=""
+CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS"
+CXXFLAGS="$CFLAGS $CXXFLAGS"
+CPPFLAGS="-D_GNU_SOURCE"
 LIBS="$gringotts_LIBS"
 
 ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile"


Index: osmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/F-11/osmo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- osmo.spec	2 Apr 2009 01:57:42 -0000	1.12
+++ osmo.spec	19 Apr 2009 06:08:41 -0000	1.13
@@ -2,13 +2,14 @@
 Summary(pl):	Osobisty organizer
 Name:		osmo
 Version:	0.2.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 URL:		http://clay.ll.pl/osmo/
 Source0:	http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-crash.patch
+Patch0:		%{name}-%{version}-configure.patch
+Patch1:		%{name}-%{version}-crash.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -42,6 +43,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-gringrotts --with-libical --with-libsyncml
@@ -99,21 +101,26 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-6
+- Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect
+  the environment's settings.
+
 * Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.4-5
-- Reenable syncml (undo Alex's changes from 0.2.4-3), libsyncml got reverted
+- Reenabled syncml support because libsyncml has been reverted. (Red Hat
+  Bugzilla #479954)
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Feb 26 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.2.4-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.2.4-3
-- Disable libsyncml until version with support for new syncml 0.5.0 is
-  released (#479954)
+- Temporarily disabled syncml support until Osmo works with libsyncml-0.5.0.
+  (Red Hat Bugzilla #479954)
 
 * Sun Dec 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-2
 - Fixed crash due to SIGABRT using patch written by Tomasz Maka.
 
 * Mon Nov 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-1
-- Version bump to 0.2.4. Closes Red Hat Bugzilla bug #464484.
+- Version bump to 0.2.4. (Red Hat Bugzilla #464484)
 - Timezone information fix accepted by upstream.
 
 * Sun Jul 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.2-2



From rishi at fedoraproject.org  Sun Apr 19 06:31:16 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 19 Apr 2009 06:31:16 +0000 (UTC)
Subject: rpms/osmo/devel osmo-0.2.4-configure.patch, NONE, 1.1 osmo.spec,
	1.12, 1.13
Message-ID: <20090419063116.5CAC4700F9@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/osmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15554

Modified Files:
	osmo.spec 
Added Files:
	osmo-0.2.4-configure.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-6
- Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect
  the environment's settings.


osmo-0.2.4-configure.patch:

--- NEW FILE osmo-0.2.4-configure.patch ---
diff -urNp osmo-0.2.4.orig/configure osmo-0.2.4/configure
--- osmo-0.2.4.orig/configure	2009-04-19 11:18:17.000000000 +0530
+++ osmo-0.2.4/configure	2009-04-19 11:21:26.000000000 +0530
@@ -5961,9 +5961,9 @@ else
 fi
 
 
-CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"
-CXXFLAGS="$CFLAGS"
-CPPFLAGS=""
+CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS"
+CXXFLAGS="$CFLAGS $CXXFLAGS"
+CPPFLAGS="-D_GNU_SOURCE"
 LIBS="$gringotts_LIBS"
 
 ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile"


Index: osmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/devel/osmo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- osmo.spec	2 Apr 2009 01:57:42 -0000	1.12
+++ osmo.spec	19 Apr 2009 06:30:44 -0000	1.13
@@ -2,13 +2,14 @@
 Summary(pl):	Osobisty organizer
 Name:		osmo
 Version:	0.2.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 URL:		http://clay.ll.pl/osmo/
 Source0:	http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-crash.patch
+Patch0:		%{name}-%{version}-configure.patch
+Patch1:		%{name}-%{version}-crash.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -42,6 +43,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-gringrotts --with-libical --with-libsyncml
@@ -99,21 +101,26 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-6
+- Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect
+  the environment's settings.
+
 * Thu Apr 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.4-5
-- Reenable syncml (undo Alex's changes from 0.2.4-3), libsyncml got reverted
+- Reenabled syncml support because libsyncml has been reverted. (Red Hat
+  Bugzilla #479954)
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Feb 26 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.2.4-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.2.4-3
-- Disable libsyncml until version with support for new syncml 0.5.0 is
-  released (#479954)
+- Temporarily disabled syncml support until Osmo works with libsyncml-0.5.0.
+  (Red Hat Bugzilla #479954)
 
 * Sun Dec 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-2
 - Fixed crash due to SIGABRT using patch written by Tomasz Maka.
 
 * Mon Nov 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-1
-- Version bump to 0.2.4. Closes Red Hat Bugzilla bug #464484.
+- Version bump to 0.2.4. (Red Hat Bugzilla #464484)
 - Timezone information fix accepted by upstream.
 
 * Sun Jul 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.2-2



From hubbitus at fedoraproject.org  Sun Apr 19 06:52:01 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 19 Apr 2009 06:52:01 +0000 (UTC)
Subject: rpms/dnsjava/devel dnsjava.spec,1.2,1.3
Message-ID: <20090419065202.2D417700F9@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20455

Modified Files:
	dnsjava.spec 
Log Message:
Fix test condition logick for %%check


Index: dnsjava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/devel/dnsjava.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsjava.spec	18 Apr 2009 19:26:43 -0000	1.2
+++ dnsjava.spec	19 Apr 2009 06:51:29 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:		dnsjava
 Version:		2.0.6
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Java DNS implementation
 License:		BSD and MIT
 URL:			http://www.dnsjava.org/
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+- Fix test condition logick for %%check
+
 * Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
 - Continue review.
 - As it can't be build by gcj, delete back this stuff from spec.



From hubbitus at fedoraproject.org  Sun Apr 19 07:23:15 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 19 Apr 2009 07:23:15 +0000 (UTC)
Subject: rpms/dnsjava/F-9 dnsjava.spec,1.1,1.2
Message-ID: <20090419072316.9870D700F9@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27470

Modified Files:
	dnsjava.spec 
Log Message:
Fix test condition logick for %check


Index: dnsjava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-9/dnsjava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsjava.spec	18 Apr 2009 17:50:08 -0000	1.1
+++ dnsjava.spec	19 Apr 2009 07:22:42 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		dnsjava
 Version:		2.0.6
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Java DNS implementation
 License:		BSD and MIT
 URL:			http://www.dnsjava.org/
@@ -81,7 +81,7 @@
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?do_not_test}
+%if ! 0%{?do_not_test}
 %check
 export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
 ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+- Fix test condition logick for %%check
+
 * Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
 - Continue review.
 - As it can't be build by gcj, delete back this stuff from spec.



From hubbitus at fedoraproject.org  Sun Apr 19 07:49:31 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 19 Apr 2009 07:49:31 +0000 (UTC)
Subject: rpms/dnsjava/F-10 dnsjava.spec,1.1,1.2
Message-ID: <20090419074931.E6D52700F9@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1548

Modified Files:
	dnsjava.spec 
Log Message:
Fix test condition logic for %check


Index: dnsjava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-10/dnsjava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsjava.spec	18 Apr 2009 18:44:20 -0000	1.1
+++ dnsjava.spec	19 Apr 2009 07:49:00 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		dnsjava
 Version:		2.0.6
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Java DNS implementation
 License:		BSD and MIT
 URL:			http://www.dnsjava.org/
@@ -81,7 +81,7 @@
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?do_not_test}
+%if ! 0%{?do_not_test}
 %check
 export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
 ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+- Fix test condition logick for %%check
+
 * Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
 - Continue review.
 - As it can't be build by gcj, delete back this stuff from spec.



From hubbitus at fedoraproject.org  Sun Apr 19 08:02:05 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 19 Apr 2009 08:02:05 +0000 (UTC)
Subject: rpms/dnsjava/F-11 dnsjava.spec,1.1,1.2
Message-ID: <20090419080205.E8D19700F9@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4368

Modified Files:
	dnsjava.spec 
Log Message:
Fix test condition logic for %check


Index: dnsjava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/F-11/dnsjava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsjava.spec	18 Apr 2009 18:51:24 -0000	1.1
+++ dnsjava.spec	19 Apr 2009 08:01:35 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		dnsjava
 Version:		2.0.6
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Java DNS implementation
 License:		BSD and MIT
 URL:			http://www.dnsjava.org/
@@ -81,7 +81,7 @@
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?do_not_test}
+%if ! 0%{?do_not_test}
 %check
 export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
 ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+- Fix test condition logick for %%check
+
 * Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
 - Continue review.
 - As it can't be build by gcj, delete back this stuff from spec.



From hubbitus at fedoraproject.org  Sun Apr 19 08:09:58 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 19 Apr 2009 08:09:58 +0000 (UTC)
Subject: rpms/dnsjava/EL-5 dnsjava.spec,1.1,1.2
Message-ID: <20090419080959.056347013C@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/dnsjava/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6417

Modified Files:
	dnsjava.spec 
Log Message:
Fix test condition logic for %check


Index: dnsjava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsjava/EL-5/dnsjava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsjava.spec	18 Apr 2009 18:54:04 -0000	1.1
+++ dnsjava.spec	19 Apr 2009 08:09:27 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		dnsjava
 Version:		2.0.6
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Java DNS implementation
 License:		BSD and MIT
 URL:			http://www.dnsjava.org/
@@ -81,7 +81,7 @@
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?do_not_test}
+%if ! 0%{?do_not_test}
 %check
 export CLASSPATH='%(build-classpath junit):%{name}-%{version}.jar'
 ant -Dj2se.javadoc=%{_javadocdir}/java compile_tests
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+- Fix test condition logick for %%check
+
 * Wed Apr 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-5
 - Continue review.
 - As it can't be build by gcj, delete back this stuff from spec.



From xavierb at fedoraproject.org  Sun Apr 19 08:17:55 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 19 Apr 2009 08:17:55 +0000 (UTC)
Subject: rpms/php-feedcreator/devel import.log, NONE,
	1.1 php-feedcreator.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419081755.F3B51700F9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-feedcreator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9068/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-feedcreator.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
php-feedcreator-1_7_2-3_fc10:HEAD:php-feedcreator-1.7.2-3.fc10.src.rpm:1240129006


--- NEW FILE php-feedcreator.spec ---
Name:           php-feedcreator
Version:        1.7.2
Release:        3%{?dist}
Summary:        Create RSS feeds

Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.bitfolge.de/rsscreator-en.html
Source0:        http://www.bitfolge.de/download/feedcreator_172.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       php >= 4.0.3 


%description
FeedCreator.class.php provides an easy way to create RSS feeds from within PHP
using ease to use classes.


%prep
%setup -q -c %{name}-%{version}


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a feedcreator.class.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc lgpl.txt
%{_datadir}/php/feedcreator.class.php


%changelog
* Sun Apr 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-3
- Remove implicit Requires:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-2
- More Requires:.

* Fri Mar 20 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-feedcreator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:25:32 -0000	1.1
+++ .cvsignore	19 Apr 2009 08:17:25 -0000	1.2
@@ -0,0 +1 @@
+feedcreator_172.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-feedcreator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:25:32 -0000	1.1
+++ sources	19 Apr 2009 08:17:25 -0000	1.2
@@ -0,0 +1 @@
+24eb358dfff32166bc9721c515947337  feedcreator_172.zip



From xavierb at fedoraproject.org  Sun Apr 19 08:29:46 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 19 Apr 2009 08:29:46 +0000 (UTC)
Subject: rpms/php-feedcreator/F-10 php-feedcreator.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090419082946.CC995700F9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-feedcreator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11549/F-10

Modified Files:
	sources 
Added Files:
	php-feedcreator.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE php-feedcreator.spec ---
Name:           php-feedcreator
Version:        1.7.2
Release:        3%{?dist}
Summary:        Create RSS feeds

Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.bitfolge.de/rsscreator-en.html
Source0:        http://www.bitfolge.de/download/feedcreator_172.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       php >= 4.0.3 


%description
FeedCreator.class.php provides an easy way to create RSS feeds from within PHP
using ease to use classes.


%prep
%setup -q -c %{name}-%{version}


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a feedcreator.class.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc lgpl.txt
%{_datadir}/php/feedcreator.class.php


%changelog
* Sun Apr 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-3
- Remove implicit Requires:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-2
- More Requires:.

* Fri Mar 20 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-feedcreator/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:25:32 -0000	1.1
+++ sources	19 Apr 2009 08:29:16 -0000	1.2
@@ -0,0 +1 @@
+24eb358dfff32166bc9721c515947337  feedcreator_172.zip



From xavierb at fedoraproject.org  Sun Apr 19 08:29:46 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 19 Apr 2009 08:29:46 +0000 (UTC)
Subject: rpms/php-feedcreator/EL-5 php-feedcreator.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090419082946.5DC04700F9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-feedcreator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11549/EL-5

Modified Files:
	sources 
Added Files:
	php-feedcreator.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE php-feedcreator.spec ---
Name:           php-feedcreator
Version:        1.7.2
Release:        3%{?dist}
Summary:        Create RSS feeds

Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.bitfolge.de/rsscreator-en.html
Source0:        http://www.bitfolge.de/download/feedcreator_172.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       php >= 4.0.3 


%description
FeedCreator.class.php provides an easy way to create RSS feeds from within PHP
using ease to use classes.


%prep
%setup -q -c %{name}-%{version}


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a feedcreator.class.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc lgpl.txt
%{_datadir}/php/feedcreator.class.php


%changelog
* Sun Apr 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-3
- Remove implicit Requires:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-2
- More Requires:.

* Fri Mar 20 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-feedcreator/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:25:32 -0000	1.1
+++ sources	19 Apr 2009 08:29:15 -0000	1.2
@@ -0,0 +1 @@
+24eb358dfff32166bc9721c515947337  feedcreator_172.zip



From xavierb at fedoraproject.org  Sun Apr 19 08:29:47 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 19 Apr 2009 08:29:47 +0000 (UTC)
Subject: rpms/php-feedcreator/F-11 php-feedcreator.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090419082947.3CA0E700F9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-feedcreator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11549/F-11

Modified Files:
	sources 
Added Files:
	php-feedcreator.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE php-feedcreator.spec ---
Name:           php-feedcreator
Version:        1.7.2
Release:        3%{?dist}
Summary:        Create RSS feeds

Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.bitfolge.de/rsscreator-en.html
Source0:        http://www.bitfolge.de/download/feedcreator_172.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       php >= 4.0.3 


%description
FeedCreator.class.php provides an easy way to create RSS feeds from within PHP
using ease to use classes.


%prep
%setup -q -c %{name}-%{version}


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a feedcreator.class.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc lgpl.txt
%{_datadir}/php/feedcreator.class.php


%changelog
* Sun Apr 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-3
- Remove implicit Requires:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-2
- More Requires:.

* Fri Mar 20 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-feedcreator/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:25:32 -0000	1.1
+++ sources	19 Apr 2009 08:29:16 -0000	1.2
@@ -0,0 +1 @@
+24eb358dfff32166bc9721c515947337  feedcreator_172.zip



From xavierb at fedoraproject.org  Sun Apr 19 08:29:47 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 19 Apr 2009 08:29:47 +0000 (UTC)
Subject: rpms/php-feedcreator/F-9 php-feedcreator.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090419082947.9CFCD700F9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-feedcreator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11549/F-9

Modified Files:
	sources 
Added Files:
	php-feedcreator.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE php-feedcreator.spec ---
Name:           php-feedcreator
Version:        1.7.2
Release:        3%{?dist}
Summary:        Create RSS feeds

Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.bitfolge.de/rsscreator-en.html
Source0:        http://www.bitfolge.de/download/feedcreator_172.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       php >= 4.0.3 


%description
FeedCreator.class.php provides an easy way to create RSS feeds from within PHP
using ease to use classes.


%prep
%setup -q -c %{name}-%{version}


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a feedcreator.class.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc lgpl.txt
%{_datadir}/php/feedcreator.class.php


%changelog
* Sun Apr 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-3
- Remove implicit Requires:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-2
- More Requires:.

* Fri Mar 20 2009 Xavier Bachelot <xavier at bachelot.org> 1.7.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-feedcreator/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:25:32 -0000	1.1
+++ sources	19 Apr 2009 08:29:17 -0000	1.2
@@ -0,0 +1 @@
+24eb358dfff32166bc9721c515947337  feedcreator_172.zip



From pkgdb at fedoraproject.org  Sun Apr 19 09:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 09:59:51 +0000
Subject: [pkgdb] mingw32-gtk2: epienbro has requested watchbugzilla
Message-ID: <20090419095951.4F7FC10F886@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-gtk2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sun Apr 19 09:59:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 09:59:53 +0000
Subject: [pkgdb] mingw32-gtk2: epienbro has requested watchbugzilla
Message-ID: <20090419095952.F090510F88C@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sun Apr 19 10:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 10:03:53 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090419100353.E478E10F885@bastion2.fedora.phx.redhat.com>

sailer has set the watchbugzilla acl on mingw32-gtk2 (Fedora 11) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From pkgdb at fedoraproject.org  Sun Apr 19 10:04:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 10:04:00 +0000
Subject: [pkgdb] mingw32-gtk2 had acl change status
Message-ID: <20090419100400.7A3F310F88A@bastion2.fedora.phx.redhat.com>

sailer has set the watchbugzilla acl on mingw32-gtk2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2



From ensc at fedoraproject.org  Sun Apr 19 10:31:58 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Sun, 19 Apr 2009 10:31:58 +0000 (UTC)
Subject: rpms/clamav/devel clamav.spec,1.87,1.88
Message-ID: <20090419103158.D39C1700F9@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9735

Modified Files:
	clamav.spec 
Log Message:
fixed '--without upstart' operation


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- clamav.spec	15 Apr 2009 14:14:27 -0000	1.87
+++ clamav.spec	19 Apr 2009 10:31:25 -0000	1.88
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.1
-Release:	%release_func 2%{?snapshot:.%snapshot}
+Release:	%release_func 3%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -454,7 +454,7 @@
 rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog}
 
-%{!?with_upstart:rm -rf %_sysconfdir/event.d}
+%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d}
 
 ## ------------------------------------------------------------
 
@@ -672,6 +672,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.1-3
+- fixed '--without upstart' operation
+
 * Wed Apr 15 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.1-2
 - added '%%bcond_without upstart' conditional to ease skipping of
   -upstart subpackage creation e.g. on EL5 systems



From hubbitus at fedoraproject.org  Sun Apr 19 10:38:30 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 19 Apr 2009 10:38:30 +0000 (UTC)
Subject: rpms/php-pecl-runkit/EL-5 php-pecl-runkit.spec,1.1,1.2
Message-ID: <20090419103830.2FDD6700F9@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/php-pecl-runkit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11265

Modified Files:
	php-pecl-runkit.spec 
Log Message:
- Due to the bug in ppc builders ( https://fedorahosted.org/fedora-infrastructure/ticket/1298 )
	kanarip suggest temporrary workaraund: https://fedorahosted.org/fedora-infrastructure/ticket/1298#comment:1
	So, remove version specification from BuildRequires: php-pear >= 1.4.7, php-devel >= 5.0.0




Index: php-pecl-runkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-runkit/EL-5/php-pecl-runkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-runkit.spec	24 Mar 2009 22:17:22 -0000	1.1
+++ php-pecl-runkit.spec	19 Apr 2009 10:37:59 -0000	1.2
@@ -12,9 +12,9 @@
 Name:		php-pecl-%{peclName}
 Version:		0.9
 %if 0%{?CVS:1}
-Release:		10.CVS%{CVS}%{?dist}
+Release:		11.CVS%{CVS}%{?dist}
 %else
-Release:		10%{?dist}
+Release:		11%{?dist}
 %endif
 License:		PHP
 Group:		Development/Libraries
@@ -26,7 +26,7 @@
 %endif
 # Source0-md5:	05a690f04b7d2c42193f3e0c1bb99a19
 URL:			http://pecl.php.net/package/runkit/
-BuildRequires: php-pear >= 1.4.7, php-devel >= 5.0.0
+BuildRequires: php-pear, php-devel
 Requires(post):	%{__pecl}
 Requires(postun):	%{__pecl}
 %if %{?php_zend_api}0
@@ -114,6 +114,11 @@
 %attr(755,root,root) %{php_extdir}/%{peclName}.so
 
 %changelog
+* Sun Apr 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9-11.CVS20090215
+- Due to the bug in ppc builders ( https://fedorahosted.org/fedora-infrastructure/ticket/1298 )
+	kanarip suggest temporrary workaraund: https://fedorahosted.org/fedora-infrastructure/ticket/1298#comment:1
+	So, remove version specification from BuildRequires: php-pear >= 1.4.7, php-devel >= 5.0.0
+
 * Tue Mar 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9-10.CVS20090215
 - Remi Collet notes in Fedora review:
 - Rename back %%{peclName}.xml to %%{name}.xml :)
@@ -214,8 +219,10 @@
 
 # Old, Legacy changelog in incorrect format simple commented:
 #$Log$
-#Revision 1.1  2009/03/24 22:17:22  hubbitus
-#Initial push php-pecl-runkit to EPEL
+#Revision 1.2  2009/04/19 10:37:59  hubbitus
+#- Due to the bug in ppc builders ( https://fedorahosted.org/fedora-infrastructure/ticket/1298 )
+#	kanarip suggest temporrary workaraund: https://fedorahosted.org/fedora-infrastructure/ticket/1298#comment:1
+#	So, remove version specification from BuildRequires: php-pear >= 1.4.7, php-devel >= 5.0.0
 #
 #Revision 1.8  2005/12/22 12:12:04  glen
 #- rel 5 (rebuild with new php)



From lkundrak at fedoraproject.org  Sun Apr 19 10:39:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:39:41 +0000 (UTC)
Subject: rpms/pyxmlsec/EL-5 pyxmlsec.spec,1.1,1.2
Message-ID: <20090419103941.C2407700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11548/EL-5

Modified Files:
	pyxmlsec.spec 
Log Message:
devel/clog


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/EL-5/pyxmlsec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyxmlsec.spec	16 Apr 2009 05:28:49 -0000	1.1
+++ pyxmlsec.spec	19 Apr 2009 10:39:11 -0000	1.2
@@ -1,4 +1,12 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_without openssl
+%bcond_with nss
+%bcond_with gnutls
+
+# Sanity check
+%if %{?with_openssl}%{?with_gnutls}%{?with_nss} != 1
+%error Exactly one cryptography backend is needed. You may want to use --without openssl
+%endif
 
 Name:           pyxmlsec
 Version:        0.3.0
@@ -12,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-BuildRequires:  xmlsec1-nss-devel
+BuildRequires:  xmlsec1-%{?with_openssl:openssl}%{?with_gnutls:gnutls}%{?with_nss:nss}-devel
 
 %description
 PyXMLSec is a set of Python bindings for the XML Security Library, a C
@@ -31,10 +39,8 @@
 
 
 %build
-# 1. OpenSSL
-# 2. GnuTLS
-# 3. NSS
-CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build
+echo %{?with_openssl:1}%{?with_gnutls:2}%{?with_nss:3} |
+       CFLAGS="%{optflags}" %{__python} setup.py build
 
 
 %install
@@ -53,6 +59,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-3
+- bcond the cryptography backend, default to OpenSSL
+
 * Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
 - Fix AUTHORs file location for conversion (Marek Mahut)
 



From lkundrak at fedoraproject.org  Sun Apr 19 10:39:42 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:39:42 +0000 (UTC)
Subject: rpms/pyxmlsec/F-10 pyxmlsec.spec,1.1,1.2
Message-ID: <20090419103942.23EE7700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11548/F-10

Modified Files:
	pyxmlsec.spec 
Log Message:
devel/clog


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-10/pyxmlsec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyxmlsec.spec	16 Apr 2009 05:28:49 -0000	1.1
+++ pyxmlsec.spec	19 Apr 2009 10:39:11 -0000	1.2
@@ -1,4 +1,12 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_without openssl
+%bcond_with nss
+%bcond_with gnutls
+
+# Sanity check
+%if %{?with_openssl}%{?with_gnutls}%{?with_nss} != 1
+%error Exactly one cryptography backend is needed. You may want to use --without openssl
+%endif
 
 Name:           pyxmlsec
 Version:        0.3.0
@@ -12,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-BuildRequires:  xmlsec1-nss-devel
+BuildRequires:  xmlsec1-%{?with_openssl:openssl}%{?with_gnutls:gnutls}%{?with_nss:nss}-devel
 
 %description
 PyXMLSec is a set of Python bindings for the XML Security Library, a C
@@ -31,10 +39,8 @@
 
 
 %build
-# 1. OpenSSL
-# 2. GnuTLS
-# 3. NSS
-CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build
+echo %{?with_openssl:1}%{?with_gnutls:2}%{?with_nss:3} |
+       CFLAGS="%{optflags}" %{__python} setup.py build
 
 
 %install
@@ -53,6 +59,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-3
+- bcond the cryptography backend, default to OpenSSL
+
 * Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
 - Fix AUTHORs file location for conversion (Marek Mahut)
 



From lkundrak at fedoraproject.org  Sun Apr 19 10:39:42 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:39:42 +0000 (UTC)
Subject: rpms/pyxmlsec/F-11 pyxmlsec.spec,1.1,1.2
Message-ID: <20090419103942.65069700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11548/F-11

Modified Files:
	pyxmlsec.spec 
Log Message:
devel/clog


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-11/pyxmlsec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyxmlsec.spec	16 Apr 2009 05:28:49 -0000	1.1
+++ pyxmlsec.spec	19 Apr 2009 10:39:12 -0000	1.2
@@ -1,4 +1,12 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_without openssl
+%bcond_with nss
+%bcond_with gnutls
+
+# Sanity check
+%if %{?with_openssl}%{?with_gnutls}%{?with_nss} != 1
+%error Exactly one cryptography backend is needed. You may want to use --without openssl
+%endif
 
 Name:           pyxmlsec
 Version:        0.3.0
@@ -12,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-BuildRequires:  xmlsec1-nss-devel
+BuildRequires:  xmlsec1-%{?with_openssl:openssl}%{?with_gnutls:gnutls}%{?with_nss:nss}-devel
 
 %description
 PyXMLSec is a set of Python bindings for the XML Security Library, a C
@@ -31,10 +39,8 @@
 
 
 %build
-# 1. OpenSSL
-# 2. GnuTLS
-# 3. NSS
-CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build
+echo %{?with_openssl:1}%{?with_gnutls:2}%{?with_nss:3} |
+       CFLAGS="%{optflags}" %{__python} setup.py build
 
 
 %install
@@ -53,6 +59,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-3
+- bcond the cryptography backend, default to OpenSSL
+
 * Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
 - Fix AUTHORs file location for conversion (Marek Mahut)
 



From lkundrak at fedoraproject.org  Sun Apr 19 10:39:42 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:39:42 +0000 (UTC)
Subject: rpms/pyxmlsec/devel pyxmlsec.spec,1.1,1.2
Message-ID: <20090419103942.CA6C1700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11548/devel

Modified Files:
	pyxmlsec.spec 
Log Message:
devel/clog


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/devel/pyxmlsec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyxmlsec.spec	16 Apr 2009 05:28:49 -0000	1.1
+++ pyxmlsec.spec	19 Apr 2009 10:39:12 -0000	1.2
@@ -1,4 +1,12 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_without openssl
+%bcond_with nss
+%bcond_with gnutls
+
+# Sanity check
+%if %{?with_openssl}%{?with_gnutls}%{?with_nss} != 1
+%error Exactly one cryptography backend is needed. You may want to use --without openssl
+%endif
 
 Name:           pyxmlsec
 Version:        0.3.0
@@ -12,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-BuildRequires:  xmlsec1-nss-devel
+BuildRequires:  xmlsec1-%{?with_openssl:openssl}%{?with_gnutls:gnutls}%{?with_nss:nss}-devel
 
 %description
 PyXMLSec is a set of Python bindings for the XML Security Library, a C
@@ -31,10 +39,8 @@
 
 
 %build
-# 1. OpenSSL
-# 2. GnuTLS
-# 3. NSS
-CFLAGS="%{optflags}" echo 3 |%{__python} setup.py build
+echo %{?with_openssl:1}%{?with_gnutls:2}%{?with_nss:3} |
+       CFLAGS="%{optflags}" %{__python} setup.py build
 
 
 %install
@@ -53,6 +59,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-3
+- bcond the cryptography backend, default to OpenSSL
+
 * Wed Apr 15 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.0-2
 - Fix AUTHORs file location for conversion (Marek Mahut)
 



From lkundrak at fedoraproject.org  Sun Apr 19 10:42:30 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:42:30 +0000 (UTC)
Subject: rpms/pyxmlsec/F-10 pyxmlsec.spec,1.2,1.3
Message-ID: <20090419104230.C0BED7013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12429/F-10

Modified Files:
	pyxmlsec.spec 
Log Message:
Fix revision


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-10/pyxmlsec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyxmlsec.spec	19 Apr 2009 10:39:11 -0000	1.2
+++ pyxmlsec.spec	19 Apr 2009 10:42:00 -0000	1.3
@@ -10,7 +10,7 @@
 
 Name:           pyxmlsec
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for the XML Security Library
 
 Group:          Development/Libraries



From lkundrak at fedoraproject.org  Sun Apr 19 10:42:30 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:42:30 +0000 (UTC)
Subject: rpms/pyxmlsec/EL-5 pyxmlsec.spec,1.2,1.3
Message-ID: <20090419104230.9D89A700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12429/EL-5

Modified Files:
	pyxmlsec.spec 
Log Message:
Fix revision


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/EL-5/pyxmlsec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyxmlsec.spec	19 Apr 2009 10:39:11 -0000	1.2
+++ pyxmlsec.spec	19 Apr 2009 10:42:00 -0000	1.3
@@ -10,7 +10,7 @@
 
 Name:           pyxmlsec
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for the XML Security Library
 
 Group:          Development/Libraries



From lkundrak at fedoraproject.org  Sun Apr 19 10:42:31 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:42:31 +0000 (UTC)
Subject: rpms/pyxmlsec/F-11 pyxmlsec.spec,1.2,1.3
Message-ID: <20090419104231.472A67013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12429/F-11

Modified Files:
	pyxmlsec.spec 
Log Message:
Fix revision


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/F-11/pyxmlsec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyxmlsec.spec	19 Apr 2009 10:39:12 -0000	1.2
+++ pyxmlsec.spec	19 Apr 2009 10:42:00 -0000	1.3
@@ -10,7 +10,7 @@
 
 Name:           pyxmlsec
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for the XML Security Library
 
 Group:          Development/Libraries



From lkundrak at fedoraproject.org  Sun Apr 19 10:42:31 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:42:31 +0000 (UTC)
Subject: rpms/pyxmlsec/devel pyxmlsec.spec,1.2,1.3
Message-ID: <20090419104231.77CB1700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pyxmlsec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12429/devel

Modified Files:
	pyxmlsec.spec 
Log Message:
Fix revision


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/devel/pyxmlsec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyxmlsec.spec	19 Apr 2009 10:39:12 -0000	1.2
+++ pyxmlsec.spec	19 Apr 2009 10:42:01 -0000	1.3
@@ -10,7 +10,7 @@
 
 Name:           pyxmlsec
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for the XML Security Library
 
 Group:          Development/Libraries



From lkundrak at fedoraproject.org  Sun Apr 19 10:45:37 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:45:37 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/EL-5 perl-Net-OAuth.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419104537.AE575700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13391/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-OAuth.spec 
Log Message:
Import Net::OAuth


--- NEW FILE perl-Net-OAuth.spec ---
Name:           perl-Net-OAuth
Version:        0.14
Release:        1%{?dist}
Summary:        OAuth protocol support library for Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Net-OAuth/
Source0:        http://www.cpan.org/authors/id/K/KG/KGRENNAN/Net-OAuth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor) >= 0.31
BuildRequires:  perl(Class::Data::Inheritable) >= 0.06
BuildRequires:  perl(Digest::HMAC_SHA1) >= 1.01
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(UNIVERSAL::require) >= 0.10
BuildRequires:  perl(URI::Escape) >= 3.28
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl implementation of OAuth, an open protocol to allow secure API
authentication in a simple and standard method from desktop and web
applications. In practical terms, a mechanism for a Consumer to request
protected resources from a Service Provider on behalf of a user.


%prep
%setup -q -n Net-OAuth-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*


%changelog
* Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:26:24 -0000	1.1
+++ .cvsignore	19 Apr 2009 10:45:06 -0000	1.2
@@ -0,0 +1 @@
+Net-OAuth-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:26:24 -0000	1.1
+++ sources	19 Apr 2009 10:45:07 -0000	1.2
@@ -0,0 +1 @@
+ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz



From lkundrak at fedoraproject.org  Sun Apr 19 10:45:38 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:45:38 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-10 perl-Net-OAuth.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419104538.0B58F700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13391/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-OAuth.spec 
Log Message:
Import Net::OAuth


--- NEW FILE perl-Net-OAuth.spec ---
Name:           perl-Net-OAuth
Version:        0.14
Release:        1%{?dist}
Summary:        OAuth protocol support library for Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Net-OAuth/
Source0:        http://www.cpan.org/authors/id/K/KG/KGRENNAN/Net-OAuth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor) >= 0.31
BuildRequires:  perl(Class::Data::Inheritable) >= 0.06
BuildRequires:  perl(Digest::HMAC_SHA1) >= 1.01
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(UNIVERSAL::require) >= 0.10
BuildRequires:  perl(URI::Escape) >= 3.28
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl implementation of OAuth, an open protocol to allow secure API
authentication in a simple and standard method from desktop and web
applications. In practical terms, a mechanism for a Consumer to request
protected resources from a Service Provider on behalf of a user.


%prep
%setup -q -n Net-OAuth-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*


%changelog
* Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:26:24 -0000	1.1
+++ .cvsignore	19 Apr 2009 10:45:07 -0000	1.2
@@ -0,0 +1 @@
+Net-OAuth-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:26:24 -0000	1.1
+++ sources	19 Apr 2009 10:45:07 -0000	1.2
@@ -0,0 +1 @@
+ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz



From lkundrak at fedoraproject.org  Sun Apr 19 10:45:38 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:45:38 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-11 perl-Net-OAuth.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419104538.D8F03700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13391/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-OAuth.spec 
Log Message:
Import Net::OAuth


--- NEW FILE perl-Net-OAuth.spec ---
Name:           perl-Net-OAuth
Version:        0.14
Release:        1%{?dist}
Summary:        OAuth protocol support library for Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Net-OAuth/
Source0:        http://www.cpan.org/authors/id/K/KG/KGRENNAN/Net-OAuth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor) >= 0.31
BuildRequires:  perl(Class::Data::Inheritable) >= 0.06
BuildRequires:  perl(Digest::HMAC_SHA1) >= 1.01
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(UNIVERSAL::require) >= 0.10
BuildRequires:  perl(URI::Escape) >= 3.28
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl implementation of OAuth, an open protocol to allow secure API
authentication in a simple and standard method from desktop and web
applications. In practical terms, a mechanism for a Consumer to request
protected resources from a Service Provider on behalf of a user.


%prep
%setup -q -n Net-OAuth-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*


%changelog
* Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:26:24 -0000	1.1
+++ .cvsignore	19 Apr 2009 10:45:08 -0000	1.2
@@ -0,0 +1 @@
+Net-OAuth-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:26:24 -0000	1.1
+++ sources	19 Apr 2009 10:45:08 -0000	1.2
@@ -0,0 +1 @@
+ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz



From lkundrak at fedoraproject.org  Sun Apr 19 10:45:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 10:45:39 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/devel perl-Net-OAuth.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090419104539.9ED87700F9@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13391/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-OAuth.spec 
Log Message:
Import Net::OAuth


--- NEW FILE perl-Net-OAuth.spec ---
Name:           perl-Net-OAuth
Version:        0.14
Release:        1%{?dist}
Summary:        OAuth protocol support library for Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Net-OAuth/
Source0:        http://www.cpan.org/authors/id/K/KG/KGRENNAN/Net-OAuth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor) >= 0.31
BuildRequires:  perl(Class::Data::Inheritable) >= 0.06
BuildRequires:  perl(Digest::HMAC_SHA1) >= 1.01
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(UNIVERSAL::require) >= 0.10
BuildRequires:  perl(URI::Escape) >= 3.28
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl implementation of OAuth, an open protocol to allow secure API
authentication in a simple and standard method from desktop and web
applications. In practical terms, a mechanism for a Consumer to request
protected resources from a Service Provider on behalf of a user.


%prep
%setup -q -n Net-OAuth-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*


%changelog
* Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2009 01:26:24 -0000	1.1
+++ .cvsignore	19 Apr 2009 10:45:08 -0000	1.2
@@ -0,0 +1 @@
+Net-OAuth-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2009 01:26:24 -0000	1.1
+++ sources	19 Apr 2009 10:45:09 -0000	1.2
@@ -0,0 +1 @@
+ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz



From markmc at fedoraproject.org  Sun Apr 19 11:00:31 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 11:00:31 +0000 (UTC)
Subject: rpms/qemu/devel qemu-roms-more-room-fix-vga-align.patch, NONE,
	1.1 qemu.spec, 1.78, 1.79
Message-ID: <20090419110031.6EB98700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17889

Modified Files:
	qemu.spec 
Added Files:
	qemu-roms-more-room-fix-vga-align.patch 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)


qemu-roms-more-room-fix-vga-align.patch:

--- NEW FILE qemu-roms-more-room-fix-vga-align.patch ---
From: Glauber Costa <glommer at redhat.com>
Subject: [PATCH] align vga rom to 4k boundary.

Instead of aligning to 2k boundary, as required by the bios,
align to 4k boundary, as required by kvm memory functions. Without
this patch, starting kvm with -vga std option fails with:

create_userspace_phys_mem: Invalid argument
kvm_cpu_register_physical_memory: failed

as described by: https://bugzilla.redhat.com/494376

It does not fail with cirrus vga, because it is naturally aligned.
This problem does not seem to affect upstream qemu.

Signed-off-by: Glauber Costa <glommer at redhat.com>
---
 qemu/hw/pc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index cc84772..680d4a2 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -919,7 +919,7 @@ vga_bios_error:
             exit(1);
         }
 	/* Round up vga bios size to the next 2k boundary */
-	vga_bios_size = (vga_bios_size + 2047) & ~2047;
+	vga_bios_size = (vga_bios_size + 4095) & ~4095;
 	option_rom_start = 0xc0000 + vga_bios_size;
 
         /* setup basic memory access */
-- 
1.5.6.6


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- qemu.spec	14 Apr 2009 13:59:03 -0000	1.78
+++ qemu.spec	19 Apr 2009 10:59:59 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -34,9 +34,10 @@
 Patch10: qemu-fix-debuginfo.patch
 Patch11: qemu-fix-gcc.patch
 Patch12: qemu-roms-more-room.patch
-Patch13: qemu-bios-bigger-roms.patch
-Patch14: qemu-fix-display-breakage.patch
-Patch15: qemu-fix-qcow2-2TB.patch
+Patch13: qemu-roms-more-room-fix-vga-align.patch
+Patch14: qemu-bios-bigger-roms.patch
+Patch15: qemu-fix-display-breakage.patch
+Patch16: qemu-fix-qcow2-2TB.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -222,6 +223,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -463,6 +465,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
+- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)
+
 * Tue Apr  14 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-8
 - Provide qemu-kvm conditional on the architecture.
 



From markmc at fedoraproject.org  Sun Apr 19 11:01:53 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 11:01:53 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.78,1.79
Message-ID: <20090419110153.78582700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18314

Modified Files:
	qemu.spec 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- qemu.spec	14 Apr 2009 13:59:03 -0000	1.78
+++ qemu.spec	19 Apr 2009 11:01:22 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -34,9 +34,10 @@
 Patch10: qemu-fix-debuginfo.patch
 Patch11: qemu-fix-gcc.patch
 Patch12: qemu-roms-more-room.patch
-Patch13: qemu-bios-bigger-roms.patch
-Patch14: qemu-fix-display-breakage.patch
-Patch15: qemu-fix-qcow2-2TB.patch
+Patch13: qemu-roms-more-room-fix-vga-align.patch
+Patch14: qemu-bios-bigger-roms.patch
+Patch15: qemu-fix-display-breakage.patch
+Patch16: qemu-fix-qcow2-2TB.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -222,6 +223,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -463,6 +465,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
+- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)
+
 * Tue Apr  14 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-8
 - Provide qemu-kvm conditional on the architecture.
 



From markmc at fedoraproject.org  Sun Apr 19 11:02:17 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 11:02:17 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-roms-more-room-fix-vga-align.patch,NONE,1.1
Message-ID: <20090419110217.B9861700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18540

Added Files:
	qemu-roms-more-room-fix-vga-align.patch 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)


qemu-roms-more-room-fix-vga-align.patch:

--- NEW FILE qemu-roms-more-room-fix-vga-align.patch ---
From: Glauber Costa <glommer at redhat.com>
Subject: [PATCH] align vga rom to 4k boundary.

Instead of aligning to 2k boundary, as required by the bios,
align to 4k boundary, as required by kvm memory functions. Without
this patch, starting kvm with -vga std option fails with:

create_userspace_phys_mem: Invalid argument
kvm_cpu_register_physical_memory: failed

as described by: https://bugzilla.redhat.com/494376

It does not fail with cirrus vga, because it is naturally aligned.
This problem does not seem to affect upstream qemu.

Signed-off-by: Glauber Costa <glommer at redhat.com>
---
 qemu/hw/pc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index cc84772..680d4a2 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -919,7 +919,7 @@ vga_bios_error:
             exit(1);
         }
 	/* Round up vga bios size to the next 2k boundary */
-	vga_bios_size = (vga_bios_size + 2047) & ~2047;
+	vga_bios_size = (vga_bios_size + 4095) & ~4095;
 	option_rom_start = 0xc0000 + vga_bios_size;
 
         /* setup basic memory access */
-- 
1.5.6.6



From markmc at fedoraproject.org  Sun Apr 19 12:38:42 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 12:38:42 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-xen-check-for-nx-support.patch, NONE,
	1.1 TODO, 1.66, 1.67 kernel.spec, 1.1562, 1.1563
Message-ID: <20090419123842.C388B700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27318

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-xen-check-for-nx-support.patch 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2.6.29.1-101
- Fix xen boot on machines without NX support (#492523)


linux-2.6-xen-check-for-nx-support.patch:

--- NEW FILE linux-2.6-xen-check-for-nx-support.patch ---
>From bc6081ff98eec627919e0c68415e46a78fe51dc4 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Fri, 27 Mar 2009 11:29:02 -0700
Subject: [PATCH] xen: set _PAGE_NX in __supported_pte_mask before pagetable construction

Some 64-bit machines don't support the NX flag in ptes.
Check for NX before constructing the kernel pagetables.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---
 arch/x86/xen/enlighten.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 69de191..f7d0fd7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -42,6 +42,7 @@
 #include <asm/xen/hypervisor.h>
 #include <asm/fixmap.h>
 #include <asm/processor.h>
+#include <asm/proto.h>
 #include <asm/msr-index.h>
 #include <asm/setup.h>
 #include <asm/desc.h>
@@ -914,7 +915,6 @@ static const struct machine_ops __initdata xen_machine_ops = {
 	.emergency_restart = xen_emergency_restart,
 };
 
-
 /* First C function to be called on Xen boot */
 asmlinkage void __init xen_start_kernel(void)
 {
@@ -982,6 +982,11 @@ asmlinkage void __init xen_start_kernel(void)
 	if (!xen_initial_domain())
 		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 
+#ifdef CONFIG_X86_64
+	/* Work out if we support NX */
+	check_efer();
+#endif
+
 	/* Don't do the full vcpu_info placement stuff until we have a
 	   possible map and a non-dummy shared_info. */
 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
-- 
1.6.0.6



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- TODO	15 Apr 2009 22:41:21 -0000	1.66
+++ TODO	19 Apr 2009 12:38:38 -0000	1.67
@@ -112,4 +112,7 @@
 * linux-2.6-kvm-skip-pit-check.patch:
 	Waiting to be pushed upstream from kvm git.
 
-
+* linux-2.6-xen-check-for-nx-support.patch
+	https://bugzilla.redhat.com/492523
+	Needed for xen domU to boot on some machines. Upstream since
+	2.6.30-rc2.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1562
retrieving revision 1.1563
diff -u -r1.1562 -r1.1563
--- kernel.spec	18 Apr 2009 21:52:16 -0000	1.1562
+++ kernel.spec	19 Apr 2009 12:38:38 -0000	1.1563
@@ -748,8 +748,8 @@
 Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
 Patch9301: linux-2.6-kvm-mask-notifiers.patch
 Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
-
-Patch9304: linux-2.6-kvm-skip-pit-check.patch
+Patch9303: linux-2.6-kvm-skip-pit-check.patch
+Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
 Patch9400: pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
 
@@ -1387,6 +1387,7 @@
 ApplyPatch linux-2.6-kvm-mask-notifiers.patch
 ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
+ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
 ApplyPatch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
 
@@ -1975,6 +1976,9 @@
 # and build.
 
 %changelog
+* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2.6.29.1-101
+- Fix xen boot on machines without NX support (#492523)
+
 * Sat Apr 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-100
 - pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch:
    Fix the spew of "Xorg:3254 freeing invalid memtype" messages.



From markmc at fedoraproject.org  Sun Apr 19 13:04:31 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 13:04:31 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-xen-check-for-nx-support.patch,1.1,1.2
Message-ID: <20090419130431.8FAF670137@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32611

Modified Files:
	linux-2.6-xen-check-for-nx-support.patch 
Log Message:
Bah, delete stupid whitespace chunk


linux-2.6-xen-check-for-nx-support.patch:

Index: linux-2.6-xen-check-for-nx-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-xen-check-for-nx-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-check-for-nx-support.patch	19 Apr 2009 12:38:39 -0000	1.1
+++ linux-2.6-xen-check-for-nx-support.patch	19 Apr 2009 13:04:28 -0000	1.2
@@ -23,14 +23,6 @@
  #include <asm/msr-index.h>
  #include <asm/setup.h>
  #include <asm/desc.h>
-@@ -914,7 +915,6 @@ static const struct machine_ops __initdata xen_machine_ops = {
- 	.emergency_restart = xen_emergency_restart,
- };
- 
--
- /* First C function to be called on Xen boot */
- asmlinkage void __init xen_start_kernel(void)
- {
 @@ -982,6 +982,11 @@ asmlinkage void __init xen_start_kernel(void)
  	if (!xen_initial_domain())
  		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:29 +0000
Subject: [pkgdb] libnet10: pertusus has requested watchbugzilla
Message-ID: <20090419140529.9CFF010F878@bastion2.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on libnet10 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:30 +0000
Subject: [pkgdb] libnet10: pertusus has requested watchcommits
Message-ID: <20090419140531.C738910F888@bastion2.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on libnet10 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:36 +0000
Subject: [pkgdb] libnet10: pertusus has requested approveacls
Message-ID: <20090419140536.7270610F88E@bastion2.fedora.phx.redhat.com>

pertusus has requested the approveacls acl on libnet10 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:33 +0000
Subject: [pkgdb] libnet10: pertusus has requested commit
Message-ID: <20090419140534.056A210F88B@bastion2.fedora.phx.redhat.com>

pertusus has requested the commit acl on libnet10 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:39 +0000
Subject: [pkgdb] libnet10: pertusus has requested watchbugzilla
Message-ID: <20090419140539.4C26C10F892@bastion2.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on libnet10 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:40 +0000
Subject: [pkgdb] libnet10: pertusus has requested watchcommits
Message-ID: <20090419140541.0CDE510F895@bastion2.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on libnet10 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:42 +0000
Subject: [pkgdb] libnet10: pertusus has requested commit
Message-ID: <20090419140542.C3B7810F896@bastion2.fedora.phx.redhat.com>

pertusus has requested the commit acl on libnet10 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:05:45 +0000
Subject: [pkgdb] libnet10: pertusus has requested approveacls
Message-ID: <20090419140545.98F4410F899@bastion2.fedora.phx.redhat.com>

pertusus has requested the approveacls acl on libnet10 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:11:55 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141155.415AF10F878@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on libnet10 (Fedora EPEL 5) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:12:02 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141203.03A4610F88B@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on libnet10 (Fedora EPEL 5) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:11:58 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141158.DE0B010F888@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on libnet10 (Fedora EPEL 5) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:12:06 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141206.1A69E10F88E@bastion2.fedora.phx.redhat.com>

robert has set the approveacls acl on libnet10 (Fedora EPEL 5) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:12:11 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141211.86F9210F88F@bastion2.fedora.phx.redhat.com>

robert has set the approveacls acl on libnet10 (Fedora EPEL 4) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:12:13 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141213.D6F8410F892@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on libnet10 (Fedora EPEL 4) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:12:16 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141216.A32EE10F895@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on libnet10 (Fedora EPEL 4) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From pkgdb at fedoraproject.org  Sun Apr 19 14:12:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 19 Apr 2009 14:12:24 +0000
Subject: [pkgdb] libnet10 had acl change status
Message-ID: <20090419141224.2D0E810F897@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on libnet10 (Fedora EPEL 4) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet10



From joost at fedoraproject.org  Sun Apr 19 14:19:41 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Sun, 19 Apr 2009 14:19:41 +0000 (UTC)
Subject: rpms/fpc/devel fpc-2.2.4-build-id.patch, 1.1,
	1.2 fpc-2.2.4-samplecfg_32and64bit.patch, 1.1,
	1.2 fpc-2.2.4-stackexecute.patch, 1.1, 1.2 fpc.spec, 1.32, 1.33
Message-ID: <20090419141941.3E82C700F9@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19384

Modified Files:
	fpc-2.2.4-build-id.patch fpc-2.2.4-samplecfg_32and64bit.patch 
	fpc-2.2.4-stackexecute.patch fpc.spec 
Log Message:
 * Updates for fp.cfg configuration-file

fpc-2.2.4-build-id.patch:

Index: fpc-2.2.4-build-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.4-build-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpc-2.2.4-build-id.patch	12 Apr 2009 19:47:04 -0000	1.1
+++ fpc-2.2.4-build-id.patch	19 Apr 2009 14:19:38 -0000	1.2
@@ -2,7 +2,7 @@
 ===================================================================
 --- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
 +++ fpcsrc/compiler/utils/samplecfg	(working copy)
-@@ -360,6 +360,11 @@
+@@ -367,6 +367,11 @@
  # to perform
  
  # -----------------------

fpc-2.2.4-samplecfg_32and64bit.patch:

Index: fpc-2.2.4-samplecfg_32and64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.4-samplecfg_32and64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpc-2.2.4-samplecfg_32and64bit.patch	12 Apr 2009 19:47:04 -0000	1.1
+++ fpc-2.2.4-samplecfg_32and64bit.patch	19 Apr 2009 14:19:39 -0000	1.2
@@ -2,25 +2,20 @@
 ===================================================================
 --- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
 +++ fpcsrc/compiler/utils/samplecfg	(working copy)
-@@ -17,7 +17,7 @@
+@@ -34,9 +34,10 @@
  
- setgccdirarch() {
- # First argument is fpc define for CPU type; remaining args are passed to gcc to set corresponding architecture
--FPCDEFINE=$1
-+FPCDEFINE="$1"/"$libdir"/fpc
- shift
- setgccdir $@
- 
-@@ -35,7 +35,7 @@
  if [ $# = 0 ]; then
    echo 'Usage :'
-   echo 'samplecfg fpcdir confdir'
+-  echo 'samplecfg fpcdir confdir'
 -  echo 'fpcdir = Path where FPC is installed'
-+  echo 'fpcdir = Prefix where FPC is installed (/usr/., /usr/local/.)'
++  echo 'samplecfg fpcdir confdir ideconfdir'
++  echo 'fpcdir = Prefix where FPC is installed (/usr, /usr/local)'
    echo 'confdir = Path to /etc'
++  echo 'ideconfdir = Prefix where FP-config file should be placed'
    exit 1
  fi
-@@ -45,9 +45,16 @@
+ if [ "$2" ]; then
+@@ -45,9 +46,20 @@
  else
    sysdir=/etc
  fi
@@ -36,21 +31,26 @@
 +else
 +  libdir=lib
 +fi
-+sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
++if [ "$3" ]; then
++  sysfpdirbase="$3"/"$libdir"/fpc/`$FPCBIN -iV`
++else
++  sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
++fi
  sysfpdirbase2=$sysfpdirbase/ide
  sysfpdir=$sysfpdirbase2/text
  fpctargetos=`$FPCBIN -iTO`
-@@ -223,7 +230,8 @@
+@@ -223,7 +236,9 @@
  
  
  # set right path to FPC with $fpcversion
 -FPCPATH=`dirname "$1"`/\$fpcversion
 +FPCPATH32="$1"/lib/fpc/\$fpcversion
 +FPCPATH64="$1"/lib64/fpc/\$fpcversion
++FPCPATH="$1"/"$libdir"/fpc/\$fpcversion
  
  # Write (.)fpc.cfg
  echo Writing sample configuration file to $fpccfgfile
-@@ -359,26 +367,48 @@
+@@ -359,26 +374,48 @@
  
  # path to the messagefile, not necessary anymore but can be used to override
  # the default language

fpc-2.2.4-stackexecute.patch:

Index: fpc-2.2.4-stackexecute.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.4-stackexecute.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpc-2.2.4-stackexecute.patch	12 Apr 2009 19:47:04 -0000	1.1
+++ fpc-2.2.4-stackexecute.patch	19 Apr 2009 14:19:39 -0000	1.2
@@ -2,7 +2,7 @@
 ===================================================================
 --- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
 +++ fpcsrc/compiler/utils/samplecfg	(working copy)
-@@ -365,6 +365,11 @@
+@@ -372,6 +372,11 @@
  -k--build-id
  
  # -----------------------


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fpc.spec	12 Apr 2009 19:47:04 -0000	1.32
+++ fpc.spec	19 Apr 2009 14:19:39 -0000	1.33
@@ -132,7 +132,7 @@
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
 # Create a version independent config
-%{buildroot}/%{_libdir}/%{name}/%{version}/samplecfg %{_exec_prefix}/. %{buildroot}%{_sysconfdir}
+%{buildroot}/%{_libdir}/%{name}/%{version}/samplecfg %{_exec_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_exec_prefix}
 
 # Include the COPYING-information for the compiler/rtl/fcl in the documentation
 cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
@@ -175,7 +175,7 @@
 %{_datadir}/fpcsrc
 
 %changelog
-* Sun Apr 12 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
+* Sun Apr 19 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
 - Updated to version 2.2.4
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4



From rdieter at fedoraproject.org  Sun Apr 19 14:24:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 14:24:15 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.2-kde#180785-2.patch, NONE,
	1.1 kdelibs.spec, 1.466, 1.467
Message-ID: <20090419142415.34397700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20385/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785-2.patch 
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
- fix and simplify the child struct disposal (kde#180785)


kdelibs-4.2.2-kde#180785-2.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785-2.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/19 10:43:38	956037
@@ -254,10 +254,9 @@
 /* Notify wrapper program that the child it started has finished. */
 static void child_died(pid_t exit_pid, int exit_status)
 {
-   struct child *child = children;
-   struct child *prev = NULL;
+   struct child *child, **childptr = &children;
 
-   while (child)
+   while ((child = *childptr))
    {
       if (child->pid == exit_pid)
       {
@@ -272,20 +271,12 @@
          write(child->sock, request_data, request_header.arg_length);
          close(child->sock);
 
-         if (prev)
-         {
-            prev->next = child->next;
-         }
-         else
-         {
-            child = NULL;
-         }
+         *childptr = child->next;
          free(child);
          return;
       }
 
-      prev = child;
-      child = child->next;
+      childptr = &child->next;
    }
 }
 



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- kdelibs.spec	18 Apr 2009 22:53:40 -0000	1.466
+++ kdelibs.spec	19 Apr 2009 14:23:14 -0000	1.467
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -91,6 +91,7 @@
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
+Patch104: kdelibs-4.2.2-kde#180785-2.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -235,6 +236,7 @@
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
+%patch104 -p4 -b .kde#180785-2
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -419,6 +421,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
+- fix and simplify the child struct disposal (kde#180785)
+
 * Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
 



From rdieter at fedoraproject.org  Sun Apr 19 14:24:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 14:24:15 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.466,1.467
Message-ID: <20090419142415.E24E6700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20385/devel

Modified Files:
	kdelibs.spec 
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
- fix and simplify the child struct disposal (kde#180785)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- kdelibs.spec	18 Apr 2009 22:53:41 -0000	1.466
+++ kdelibs.spec	19 Apr 2009 14:23:15 -0000	1.467
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -91,6 +91,7 @@
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
+Patch104: kdelibs-4.2.2-kde#180785-2.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -235,6 +236,7 @@
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
+%patch104 -p4 -b .kde#180785-2
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -419,6 +421,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
+- fix and simplify the child struct disposal (kde#180785)
+
 * Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
 



From rdieter at fedoraproject.org  Sun Apr 19 14:25:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 14:25:48 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-kde#180785-2.patch,NONE,1.1
Message-ID: <20090419142548.67448700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21162

Added Files:
	kdelibs-4.2.2-kde#180785-2.patch 
Log Message:
import new patch


kdelibs-4.2.2-kde#180785-2.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785-2.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/19 10:43:38	956037
@@ -254,10 +254,9 @@
 /* Notify wrapper program that the child it started has finished. */
 static void child_died(pid_t exit_pid, int exit_status)
 {
-   struct child *child = children;
-   struct child *prev = NULL;
+   struct child *child, **childptr = &children;
 
-   while (child)
+   while ((child = *childptr))
    {
       if (child->pid == exit_pid)
       {
@@ -272,20 +271,12 @@
          write(child->sock, request_data, request_header.arg_length);
          close(child->sock);
 
-         if (prev)
-         {
-            prev->next = child->next;
-         }
-         else
-         {
-            child = NULL;
-         }
+         *childptr = child->next;
          free(child);
          return;
       }
 
-      prev = child;
-      child = child->next;
+      childptr = &child->next;
    }
 }
 




From jkratoch at fedoraproject.org  Sun Apr 19 14:37:12 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sun, 19 Apr 2009 14:37:12 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.344,1.345
Message-ID: <20090419143712.7C0B7700F9@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23515

Modified Files:
	gdb.spec 
Log Message:
* Sun Apr 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-21
- New test for parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187).



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- gdb.spec	16 Apr 2009 19:09:09 -0000	1.344
+++ gdb.spec	19 Apr 2009 14:36:39 -0000	1.345
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 20%{?_with_upstream:.upstream}%{?dist}
+Release: 21%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -374,6 +374,7 @@
 # Fix parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187).
 # - Turn on 64-bit BFD support, globally enable AC_SYS_LARGEFILE.
 Patch352: gdb-6.8-bz457187-largefile.patch
+Patch360: gdb-6.8-bz457187-largefile-test.patch
 
 # Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
 Patch357: gdb-c_get_string-xfree.patch
@@ -577,6 +578,7 @@
 %patch352 -p1
 %patch357 -p1
 %patch359 -p1
+%patch360 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -859,6 +861,9 @@
 %endif
 
 %changelog
+* Sun Apr 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-21
+- New test for parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187).
+
 * Thu Apr 16 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-20
 - Fix crash in the charset support.
 



From petersen at fedoraproject.org  Sun Apr 19 14:45:09 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 19 Apr 2009 14:45:09 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.4,1.5
Message-ID: <20090419144509.F3150700F9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25687

Modified Files:
	ghc-X11.spec 
Log Message:
- rebuild with ghc-6.10.2
- update to latest cabal2spec template and macros.ghc without ghc_version




Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghc-X11.spec	4 Apr 2009 05:54:36 -0000	1.4
+++ ghc-X11.spec	19 Apr 2009 14:44:39 -0000	1.5
@@ -1,19 +1,15 @@
 %global pkg_name X11
-%global ghc_version 6.10.1
 
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
-
-%bcond_without prof
 %bcond_without doc
+%bcond_without prof
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        6%{?dist}
-Summary:        Haskell %{pkg_name} librar
+Release:        7%{?dist}
+Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
 License:        BSD
@@ -22,12 +18,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 BuildRequires: libXinerama-devel, libX11-devel, libXext-devel
 
@@ -41,23 +37,19 @@
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%ghcrequires ghc post preun
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
 
 %description devel
 This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+built for ghc.
 
 
 %if %{with doc}
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+%ghcrequires ghc-doc post postun
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -69,7 +61,7 @@
 Summary: Profiling libraries for %{name}
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+%ghcrequires ghc-prof
 
 %description prof
 This package contains profiling libraries for %{name}.
@@ -81,7 +73,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -130,9 +122,8 @@
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -143,6 +134,10 @@
 
 
 %changelog
+* Mon Apr 20 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-7
+- rebuild with ghc-6.10.2
+- update to latest cabal2spec template and macros.ghc
+
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch
 



From petersen at fedoraproject.org  Sun Apr 19 14:59:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 19 Apr 2009 14:59:17 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.5,1.6
Message-ID: <20090419145917.50AB1700F9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28800

Modified Files:
	ghc-X11.spec 
Log Message:
maybe define ghcrequires for mock


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghc-X11.spec	19 Apr 2009 14:44:39 -0000	1.5
+++ ghc-X11.spec	19 Apr 2009 14:58:43 -0000	1.6
@@ -3,6 +3,9 @@
 %bcond_without doc
 %bcond_without prof
 
+# placate mock
+%{!?ghcrequires: %define ghcrequires() Requires:       %1}
+
 # ghc does not emit debug information
 %global debug_package %{nil}
 
@@ -25,7 +28,7 @@
 %if %{with prof}
 BuildRequires:  ghc-prof
 %endif
-BuildRequires: libXinerama-devel, libX11-devel, libXext-devel
+BuildRequires:  libXinerama-devel, libX11-devel, libXext-devel
 
 %description
 This package provides the Haskell %{pkg_name} library.
@@ -136,7 +139,8 @@
 %changelog
 * Mon Apr 20 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-7
 - rebuild with ghc-6.10.2
-- update to latest cabal2spec template and macros.ghc
+- update to latest cabal2spec template and macros.ghc without ghc_version
+- maybe define ghcrequires for mock
 
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch



From rdieter at fedoraproject.org  Sun Apr 19 15:28:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 15:28:23 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-kde#180785-2.patch, NONE,
	1.1 kdelibs.spec, 1.415, 1.416
Message-ID: <20090419152823.B58B770137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3307/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785-2.patch 
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
- fix and simplify the child struct disposal (kde#180785)


kdelibs-4.2.2-kde#180785-2.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785-2.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/19 10:43:38	956037
@@ -254,10 +254,9 @@
 /* Notify wrapper program that the child it started has finished. */
 static void child_died(pid_t exit_pid, int exit_status)
 {
-   struct child *child = children;
-   struct child *prev = NULL;
+   struct child *child, **childptr = &children;
 
-   while (child)
+   while ((child = *childptr))
    {
       if (child->pid == exit_pid)
       {
@@ -272,20 +271,12 @@
          write(child->sock, request_data, request_header.arg_length);
          close(child->sock);
 
-         if (prev)
-         {
-            prev->next = child->next;
-         }
-         else
-         {
-            child = NULL;
-         }
+         *childptr = child->next;
          free(child);
          return;
       }
 
-      prev = child;
-      child = child->next;
+      childptr = &child->next;
    }
 }
 



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- kdelibs.spec	18 Apr 2009 23:13:43 -0000	1.415
+++ kdelibs.spec	19 Apr 2009 15:27:51 -0000	1.416
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -91,6 +91,7 @@
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
+Patch104: kdelibs-4.2.2-kde#180785-2.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -235,6 +236,7 @@
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
+%patch104 -p4 -b .kde#180785-2
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -419,6 +421,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
+- fix and simplify the child struct disposal (kde#180785)
+
 * Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
 



From rdieter at fedoraproject.org  Sun Apr 19 15:28:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 15:28:23 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-kde#180785-2.patch, NONE,
	1.1 kdelibs.spec, 1.390, 1.391
Message-ID: <20090419152823.ABED0700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3307/F-9

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-kde#180785-2.patch 
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
- fix and simplify the child struct disposal (kde#180785)


kdelibs-4.2.2-kde#180785-2.patch:

--- NEW FILE kdelibs-4.2.2-kde#180785-2.patch ---
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/18 19:34:41	955904
+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp	2009/04/19 10:43:38	956037
@@ -254,10 +254,9 @@
 /* Notify wrapper program that the child it started has finished. */
 static void child_died(pid_t exit_pid, int exit_status)
 {
-   struct child *child = children;
-   struct child *prev = NULL;
+   struct child *child, **childptr = &children;
 
-   while (child)
+   while ((child = *childptr))
    {
       if (child->pid == exit_pid)
       {
@@ -272,20 +271,12 @@
          write(child->sock, request_data, request_header.arg_length);
          close(child->sock);
 
-         if (prev)
-         {
-            prev->next = child->next;
-         }
-         else
-         {
-            child = NULL;
-         }
+         *childptr = child->next;
          free(child);
          return;
       }
 
-      prev = child;
-      child = child->next;
+      childptr = &child->next;
    }
 }
 



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- kdelibs.spec	18 Apr 2009 23:13:42 -0000	1.390
+++ kdelibs.spec	19 Apr 2009 15:27:49 -0000	1.391
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -91,6 +91,7 @@
 Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
+Patch104: kdelibs-4.2.2-kde#180785-2.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -235,6 +236,7 @@
 %patch101 -p0 -b .kjob
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
+%patch104 -p4 -b .kde#180785-2
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -419,6 +421,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
+- fix and simplify the child struct disposal (kde#180785)
+
 * Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-6
 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
 



From markmc at fedoraproject.org  Sun Apr 19 15:35:08 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 15:35:08 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.79,1.80
Message-ID: <20090419153508.8AC29700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4825

Modified Files:
	qemu.spec 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-10
- Run sysconfig.modules from %post on x86_64 too (#494739)



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- qemu.spec	19 Apr 2009 10:59:59 -0000	1.79
+++ qemu.spec	19 Apr 2009 15:34:37 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -344,7 +344,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post system-x86
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 # load kvm modules now, so we can make sure no reboot is needed.
 # If there's already a kvm module installed, we don't mess with it
 sh /%{_sysconfdir}/sysconfig/modules/kvm.modules
@@ -465,6 +465,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-10
+- Run sysconfig.modules from %post on x86_64 too (#494739)
+
 * Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)
 



From markmc at fedoraproject.org  Sun Apr 19 15:35:34 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Sun, 19 Apr 2009 15:35:34 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.79,1.80
Message-ID: <20090419153534.628C4700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4974

Modified Files:
	qemu.spec 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-10
- Run sysconfig.modules from %post on x86_64 too (#494739)



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- qemu.spec	19 Apr 2009 11:01:22 -0000	1.79
+++ qemu.spec	19 Apr 2009 15:35:03 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -344,7 +344,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post system-x86
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 # load kvm modules now, so we can make sure no reboot is needed.
 # If there's already a kvm module installed, we don't mess with it
 sh /%{_sysconfdir}/sysconfig/modules/kvm.modules
@@ -465,6 +465,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-10
+- Run sysconfig.modules from %post on x86_64 too (#494739)
+
 * Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-9
 - Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376)
 



From anithra at fedoraproject.org  Sun Apr 19 16:01:20 2009
From: anithra at fedoraproject.org (Anithra P Janakiraman)
Date: Sun, 19 Apr 2009 16:01:20 +0000 (UTC)
Subject: rpms/systemtapguiserver/devel systemtapguiserver.spec,1.1,1.2
Message-ID: <20090419160120.C0179700F9@cvs1.fedora.phx.redhat.com>

Author: anithra

Update of /cvs/pkgs/rpms/systemtapguiserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10932

Modified Files:
	systemtapguiserver.spec 
Log Message:
* Sun Apr 19 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-8
- Changed spec file to include %{?dist}
* Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
- Changes to spec file.
* Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6
- Changes to Makefile,spec
* Fri Mar 13 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-5
- Changes to Makefile,spec.
* Tue Feb 10 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-4
- Changes to Makefile, spec. 
* Mon Feb 09 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-3
- Included the license agreement
* Thu Feb 05 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-2
- Changes to the Makefile and package name
* Thu Jan 28 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-1
- Initial Fedora package



Index: systemtapguiserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/devel/systemtapguiserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemtapguiserver.spec	18 Apr 2009 08:15:56 -0000	1.1
+++ systemtapguiserver.spec	19 Apr 2009 16:00:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		systemtapguiserver
 Version:	1.0
-Release:	7 
+Release:	8%{?dist}
 Summary:	Server for the eclipse-systemtapgui Client
 License:	EPL
 Group:		Development/Tools
@@ -38,6 +38,8 @@
 %doc docs/README
 
 %changelog
+* Sun Apr 19 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-8
+- Changed spec file to include %{?dist}
 * Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
 - Changes to spec file.
 * Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6



From anithra at fedoraproject.org  Sun Apr 19 16:12:11 2009
From: anithra at fedoraproject.org (Anithra P Janakiraman)
Date: Sun, 19 Apr 2009 16:12:11 +0000 (UTC)
Subject: rpms/systemtapguiserver/F-11 systemtapguiserver.spec,1.1,1.2
Message-ID: <20090419161211.1D5FE700F9@cvs1.fedora.phx.redhat.com>

Author: anithra

Update of /cvs/pkgs/rpms/systemtapguiserver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13269

Modified Files:
	systemtapguiserver.spec 
Log Message:
* Sun Apr 19 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-8
- Changed spec file to include %{?dist}
* Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
- Changes to spec file.
* Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6
- Changes to Makefile,spec
* Fri Mar 13 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-5
- Changes to Makefile,spec.
* Tue Feb 10 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-4
- Changes to Makefile, spec. 
* Mon Feb 09 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-3
- Included the license agreement
* Thu Feb 05 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-2
- Changes to the Makefile and package name
* Thu Jan 28 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-1
- Initial Fedora package



Index: systemtapguiserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/F-11/systemtapguiserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemtapguiserver.spec	18 Apr 2009 11:45:44 -0000	1.1
+++ systemtapguiserver.spec	19 Apr 2009 16:11:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		systemtapguiserver
 Version:	1.0
-Release:	7 
+Release:	8%{?dist}
 Summary:	Server for the eclipse-systemtapgui Client
 License:	EPL
 Group:		Development/Tools
@@ -38,6 +38,8 @@
 %doc docs/README
 
 %changelog
+* Sun Apr 19 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-8
+- Changed spec file to include %{?dist}
 * Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
 - Changes to spec file.
 * Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6



From grenier at fedoraproject.org  Sun Apr 19 16:44:47 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Sun, 19 Apr 2009 16:44:47 +0000 (UTC)
Subject: rpms/testdisk/devel .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 testdisk.spec, 1.24, 1.25
Message-ID: <20090419164448.4260C700F9@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20990

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update to 6.11 release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Jul 2008 12:15:39 -0000	1.12
+++ .cvsignore	19 Apr 2009 16:44:15 -0000	1.13
@@ -1,2 +1,2 @@
-testdisk-6.10.tar.bz2
-testdisk-doc-6.10.tar.bz2
+testdisk-6.11.tar.bz2
+testdisk-doc-6.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Jul 2008 12:15:39 -0000	1.13
+++ sources	19 Apr 2009 16:44:15 -0000	1.14
@@ -1,2 +1,2 @@
-d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
-9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
+8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- testdisk.spec	25 Feb 2009 20:00:01 -0000	1.24
+++ testdisk.spec	19 Apr 2009 16:44:15 -0000	1.25
@@ -1,22 +1,23 @@
-Summary:	Tool to check and undelete partition
+Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
 Summary(fr.UTF8):	Outil pour v??rifier et restorer des partitions
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
-Version:	6.10
-Release:	2%{?dist}
+Version:	6.11
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
-BuildRequires:  e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel
 BuildRequires:	libjpeg-devel
 %ifnarch ppc ppc64
-BuildRequires:  ntfsprogs-devel
+# See https://bugzilla.redhat.com/show_bug.cgi?id=407151
+BuildRequires:	ntfsprogs-devel
 %endif
-BuildRequires:  libewf-devel
+BuildRequires:	libewf-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +25,8 @@
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
 NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including jpg, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami:
@@ -34,6 +37,8 @@
 Outil pour v??rifier et restorer des partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
@@ -75,10 +80,6 @@
 
 This package contains testdisk & photorec documentation.
 
-%files doc
-%defattr(644,root,root,755)
-%doc doc
-
 %prep
 %setup -q
 %setup -q -a 1
@@ -101,7 +102,14 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 
+%files doc
+%defattr(644,root,root,755)
+%doc doc
+
 %changelog
+* Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
+- Update to latest version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From anithra at fedoraproject.org  Sun Apr 19 17:14:11 2009
From: anithra at fedoraproject.org (Anithra P Janakiraman)
Date: Sun, 19 Apr 2009 17:14:11 +0000 (UTC)
Subject: rpms/systemtapguiserver/F-10 systemtapguiserver.spec,1.1,1.2
Message-ID: <20090419171411.DFE39700F9@cvs1.fedora.phx.redhat.com>

Author: anithra

Update of /cvs/pkgs/rpms/systemtapguiserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27495

Modified Files:
	systemtapguiserver.spec 
Log Message:
* Sun Apr 19 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-8
- Changed spec file to include %{?dist}
* Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
- Changes to spec file.
* Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6
- Changes to Makefile,spec
* Fri Mar 13 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-5
- Changes to Makefile,spec.
* Tue Feb 10 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-4
- Changes to Makefile, spec. 
* Mon Feb 09 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-3
- Included the license agreement
* Thu Feb 05 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-2
- Changes to the Makefile and package name
* Thu Jan 28 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-1
- Initial Fedora package



Index: systemtapguiserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtapguiserver/F-10/systemtapguiserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemtapguiserver.spec	18 Apr 2009 08:19:04 -0000	1.1
+++ systemtapguiserver.spec	19 Apr 2009 17:13:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		systemtapguiserver
 Version:	1.0
-Release:	7 
+Release:	8%{?dist} 
 Summary:	Server for the eclipse-systemtapgui Client
 License:	EPL
 Group:		Development/Tools
@@ -38,6 +38,8 @@
 %doc docs/README
 
 %changelog
+* Sun Apr 19 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-8
+- Changed spec file to include %{?dist}
 * Wed Apr 15 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-7
 - Changes to spec file.
 * Tue Mar 17 2009 Anithra P Janakiraman <anithra at linux.vnet.ibm.com> 1.0-6



From robert at fedoraproject.org  Sun Apr 19 17:17:36 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 19 Apr 2009 17:17:36 +0000 (UTC)
Subject: rpms/snort/devel snort.spec,1.39,1.40
Message-ID: <20090419171736.71235700F9@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/snort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28274

Modified Files:
	snort.spec 
Log Message:
Build require package libnet10-devel rather libnet10



Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/snort.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- snort.spec	26 Feb 2009 01:51:09 -0000	1.39
+++ snort.spec	19 Apr 2009 17:17:05 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.8.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -24,7 +24,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 
 %package        mysql
 Summary:        Snort with Flexible Response
@@ -36,7 +36,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  mysql-devel
 
 %package        postgresql
@@ -49,7 +49,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  postgresql-devel
 
 %package        snmp
@@ -63,7 +63,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 
@@ -71,7 +71,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  mysql-devel
@@ -149,8 +149,8 @@
 %setup -q
 %patch0 -p1 -b .glibc
 cp %{SOURCE2} doc/
-sed -i -e 's|libnet-config|libnet-config-1.0|g' configure
-sed -i -e 's|\-lnet|\-lnet-1.0|g' configure
+sed -i -e 's|libnet-config|libnet10-config|g' configure
+sed -i -e 's|\-lnet|\-lnet10|g' configure
 
 %build
 
@@ -495,6 +495,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Robert Scheck <robert at fedoraproject.org> - 2.8.3.2-3
+- Build require package libnet10-devel rather libnet10
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sun Apr 19 17:31:44 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 17:31:44 +0000 (UTC)
Subject: rpms/showimg/F-11 showimg-0.9.5-gcc44.patch, NONE, 1.1 showimg.spec,
	1.26, 1.27
Message-ID: <20090419173144.D741B700F9@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/showimg/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31972/F-11

Modified Files:
	showimg.spec 
Added Files:
	showimg-0.9.5-gcc44.patch 
Log Message:
- Fix FTBFS: added showimg-0.9.5-gcc44.patch.                                       



showimg-0.9.5-gcc44.patch:

--- NEW FILE showimg-0.9.5-gcc44.patch ---
--- ./showimg/kexi/kexidb/queryschema.h.orig	2009-04-19 15:07:28.000000000 +0200
+++ ./showimg/kexi/kexidb/queryschema.h	2009-04-19 15:07:34.000000000 +0200
@@ -492,7 +492,7 @@
  There can be one asterisk of 2nd type defined for given single query.
 */
 
-class KEXI_DB_EXPORT QueryAsterisk : protected Field
+class KEXI_DB_EXPORT QueryAsterisk : public Field
 {
 	public:
 		/*! Constructs query asterisk definition object.
--- ./showimg/showimg/misc/exif.cpp.orig	2009-04-19 17:43:33.000000000 +0200
+++ ./showimg/showimg/misc/exif.cpp	2009-04-19 17:46:02.000000000 +0200
@@ -409,7 +409,7 @@
     // If the filename contains substring "&i", then substitute the
     // filename for that.  This gives flexibility in terms of processing
     // multiple files at a time.
-    char * Subst;
+    const char * Subst;
     Subst = strstr(NamePattern, "&i");
     if (Subst){
         strncpy(OutFileName, NamePattern, Subst-NamePattern);


Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/F-11/showimg.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- showimg.spec	26 Feb 2009 00:54:39 -0000	1.26
+++ showimg.spec	19 Apr 2009 17:31:14 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,6 +8,8 @@
 URL:            http://www.jalix.org/projects/showimg
 Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 Patch0:         showimg-0.9.5-gcc43.patch
+Patch1:			showimg-0.9.5-gcc44.patch
+# Both patches have been sent to author (rgroult [AT]??jalix [DOT]??org) on 2009/04/19
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -50,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .gcc43
+%patch1 -b .gcc44
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -66,7 +69,7 @@
            --with-showimgdb
 #           --enable-final \
 
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 
 %install
@@ -122,6 +125,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.5-22
+- Fix FTBFS: added showimg-0.9.5-gcc44.patch.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sun Apr 19 17:31:44 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 17:31:44 +0000 (UTC)
Subject: rpms/showimg/devel showimg-0.9.5-gcc44.patch, NONE, 1.1 showimg.spec,
	1.26, 1.27
Message-ID: <20090419173144.DCB4770137@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31972/devel

Modified Files:
	showimg.spec 
Added Files:
	showimg-0.9.5-gcc44.patch 
Log Message:
- Fix FTBFS: added showimg-0.9.5-gcc44.patch.                                       



showimg-0.9.5-gcc44.patch:

--- NEW FILE showimg-0.9.5-gcc44.patch ---
--- ./showimg/kexi/kexidb/queryschema.h.orig	2009-04-19 15:07:28.000000000 +0200
+++ ./showimg/kexi/kexidb/queryschema.h	2009-04-19 15:07:34.000000000 +0200
@@ -492,7 +492,7 @@
  There can be one asterisk of 2nd type defined for given single query.
 */
 
-class KEXI_DB_EXPORT QueryAsterisk : protected Field
+class KEXI_DB_EXPORT QueryAsterisk : public Field
 {
 	public:
 		/*! Constructs query asterisk definition object.
--- ./showimg/showimg/misc/exif.cpp.orig	2009-04-19 17:43:33.000000000 +0200
+++ ./showimg/showimg/misc/exif.cpp	2009-04-19 17:46:02.000000000 +0200
@@ -409,7 +409,7 @@
     // If the filename contains substring "&i", then substitute the
     // filename for that.  This gives flexibility in terms of processing
     // multiple files at a time.
-    char * Subst;
+    const char * Subst;
     Subst = strstr(NamePattern, "&i");
     if (Subst){
         strncpy(OutFileName, NamePattern, Subst-NamePattern);


Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- showimg.spec	26 Feb 2009 00:54:39 -0000	1.26
+++ showimg.spec	19 Apr 2009 17:31:14 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,6 +8,8 @@
 URL:            http://www.jalix.org/projects/showimg
 Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 Patch0:         showimg-0.9.5-gcc43.patch
+Patch1:			showimg-0.9.5-gcc44.patch
+# Both patches have been sent to author (rgroult [AT]??jalix [DOT]??org) on 2009/04/19
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -50,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .gcc43
+%patch1 -b .gcc44
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -66,7 +69,7 @@
            --with-showimgdb
 #           --enable-final \
 
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 
 %install
@@ -122,6 +125,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.5-22
+- Fix FTBFS: added showimg-0.9.5-gcc44.patch.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From peter at fedoraproject.org  Sun Apr 19 17:42:11 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 19 Apr 2009 17:42:11 +0000 (UTC)
Subject: rpms/sems/devel sems--gcc44.diff, NONE,
	1.1 sems--makefile_defs_removal.diff, NONE, 1.1 import.log, 1.1,
	1.2 sems.spec, 1.1, 1.2
Message-ID: <20090419174211.14A70700F9@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3954/devel

Modified Files:
	import.log sems.spec 
Added Files:
	sems--gcc44.diff sems--makefile_defs_removal.diff 
Log Message:
fix building with gcc 4.4

sems--gcc44.diff:

--- NEW FILE sems--gcc44.diff ---
--- ./apps/diameter_client/ServerConnection.h~	2009-01-19 20:11:43.000000000 +0300
+++ ./apps/diameter_client/ServerConnection.h	2009-04-19 21:08:09.048458437 +0400
@@ -38,6 +38,7 @@
 #include <vector>
 #include <map>
 #include <utility>
+#include <stdint.h>
 using std::string;
 using std::vector;
 using std::map;

sems--makefile_defs_removal.diff:

--- NEW FILE sems--makefile_defs_removal.diff ---
--- Makefile.defs~	2009-01-20 21:02:34.000000000 +0300
+++ Makefile.defs	2009-04-19 20:45:30.208412422 +0400
@@ -1,10 +1,3 @@
-ifeq ($(makefile_defs), 1)
-else
-makefile_defs=1
-export makefile_defs
-
-SVN_REV?=r$(shell svnversion -n .)
-
 #version number
 VERSION = 1
 PATCHLEVEL = 1
@@ -14,153 +7,19 @@
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
 
-CPPFLAGS += -D_DEBUG \
-	  -D_THREAD_SAFE -D_REENTRANT \
-	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
-	  -DOS='"$(OS)"' 	\
-#         -DMAX_RTP_SESSIONS=8192 \
-#         -DOpenSER \
-#	  -DSUPPORT_IPV6 \
-#	  -DNO_THREADID_LOG \
-
-# compile with spandsp DTMF detection? see soft-switch.org
-#   this needs a fairly new version of spandsp - tested with 0.0.4pre11
-#   will not work with spandsp 0.0.2 .
-#   (which means that current debian and gentoo packages don't work)
-#   
-#USE_SPANDSP    = yes
-# statically link spandsp library? 
-#   (might need adjusting spandsp lib path LIBSPANDSP_LDIR - may be /usr/lib)
-#LIBSPANDSP_STATIC = yes
-#LIBSPANDSP_LDIR = /usr/local/lib/
-
-
-# compile with sample rate conversion from secret rabbit code? 
-# (see http://www.mega-nerd.com/SRC/)
-#
-#USE_LIBSAMPLERATE = yes
-
-#
-# ZRTP support? (see zfoneproject.com)
-#WITH_ZRTP = yes
-
-#
-# exclude some modules from compilation?
-# e.g. python modules:
-#exclude_modules ?= py_sems ivr mailbox pin_collect conf_auth mp3 examples
-
 LDFLAGS += -lm
 
 OS     = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
 
-ifdef USE_SPANDSP
-ifneq ($(spandsp_defs), 1)
-spandsp_defs=1
-export spandsp_defs
-CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
-endif
-endif
-
-ifdef USE_LIBSAMPLERATE
-ifneq ($(libsrc_defs), 1)
-libsrc_defs=1
-export libsrc_defs
-CPPFLAGS += -DUSE_LIBSAMPLERATE
-endif
-endif
-
-# Additions for Solaris support.
-ifeq ($(OS),solaris)
-	GETARCH=uname -p
-	CPPFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
-        CFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
-        # For nanosleep.
-        LDFLAGS += -lrt
-        # For inet_aton.
-        LDFLAGS += -lresolv
-
-	# I don't have libspeex installed.
-	# binrpcctrl does some really weird header stuff that doesn't work.
-	exclude_modules += binrpcctrl ilbc speex
-else
-	GETARCH=uname -m
-endif
-
-ARCH ?= $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
-			-e s/armv4l/arm/ -e "s/Power Macintosh/ppc/" \
-			-e "s/cobalt/mips2/" \
-			-e s/amd64/x86_64/ )
-
-# fix sparc -> sparc64
-ifeq ($(ARCH),sparc)
-	ifeq ($(shell uname -m),sun4u)
-		ARCH := sparc64
-	endif
-endif
-
 # need OS specific for this ?
 CXX = g++
 CC = gcc
 LD = $(CC)
 
-
-CXXFLAGS += -Wall -Wno-reorder -fPIC -g \
-	    -O2 $(EXTRA_CXXFLAGS)
-         
-CFLAGS += -Wall -fPIC -g -O2 $(EXTRA_CFLAGS)
-
-ifeq ($(DEBUG_PLAYOUT), yes)
-CPPFLAGS +=  -DDEBUG_PLAYOUTBUF
-endif
-
-ifdef WITH_ZRTP
-CPPFLAGS += -DWITH_ZRTP \
-	    -DBUILD_ZRTP_MUTEXES \
-	    -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES \
-	    -I/usr/local/include/zrtp 
-endif
-
 TARGET =
 LIB_LDFLAGS = -shared
 
-ifeq ($(OS), linux)
-	LDFLAGS +=  -ldl -rdynamic -lpthread
-else
-ifeq ($(OS), freebsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), openbsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), netbsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), darwin)
-	LDFLAGS += -rdynamic -pthread
-	LIB_LDFLAGS = -flat_namespace -undefined suppress -bundle
-	CXXFLAGS += -fno-common
-	CFLAGS += -fno-common
-
-	#necessary for sa_len|ss_len|sin_len
-	# may be needed on other *BSD
-	CPPFLAGS += -DBSD44SOCKETS
-
-	# add the DarwinPorts directory
-	ifneq ($(ARCH), iphone)
-	      CPPFLAGS += -D__DARWIN_UNIX03
-	      CPPFLAGS += -I /opt/local/include
-	      LDFLAGS += -L/opt/local/lib
-	endif	      
-
-	override exclude_modules += binrpcctrl mp3 examples py_sems
-else
-	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
-	TARGET=solaris
-endif
-endif
-endif
-endif
-endif
+LDFLAGS +=  -ldl -rdynamic -lpthread
 
 LIB_LDFLAGS += $(LDFLAGS)
 
@@ -201,28 +60,8 @@
 
 ser-cfg-dir = etc/ser/
 
-ifeq ($(OS), linux)
-	doc-dir = share/doc/sems/
-	man-dir = share/man/
-else
-ifeq ($(OS), freebsd)
-	doc-dir = share/doc/sems/
-	man-dir = man/
-else
-ifeq ($(OS), openbsd)
-	doc-dir = share/doc/sems/
-	man-dir = man/
-else
-ifeq ($(OS), netbsd)
-	doc-dir = share/doc/sems
-	man-dir = man/
-else
-	doc-dir = doc/sems/
-	man-dir = man/
-endif
-endif
-endif
-endif
+doc-dir = share/doc/sems/
+man-dir = share/man/
 
 # target dirs for various stuff
 bin-target = $(prefix)/$(bin-dir)
@@ -232,14 +71,8 @@
 ser-cfg-target =$(ser-prefix)/$(ser-cfg-dir)
 lib-target = $(prefix)/$(lib-dir)
 
-ifeq ($(OS), solaris)
-#use GNU versions
-INSTALL ?= ginstall
-TAR ?= gtar
-else
 INSTALL ?= install 
 TAR ?= tar
-endif
 
 INSTALL-TOUCH = touch          # used to create the file first (good to 
                                #  make solaris install work)
@@ -251,7 +84,7 @@
 
 #export stuff to sub-makes
 export REL_VERSION RELEASE OS
-export CPPFLAGS CXXFLAGS LDFLAGS CFLAGS LIB_LDFLAGS
+export LDFLAGS LIB_LDFLAGS
 export CXX CC LD
 export DESTDIR PREFIX prefix basedir ser-prefix
 export start-script
@@ -260,12 +93,6 @@
 export bin-target cfg-target modules-target audio-target ser-cfg-target lib-target
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
 
-export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR
-export USE_LIBSAMPLERATE
-export WITH_ZRTP
-
-endif  # ifeq ($(makefile_defs, 1)
-
 mk-install-dirs: $(DESTDIR)$(cfg-target) \
 		 $(DESTDIR)$(bin-prefix)/$(bin-dir) \
 		 $(DESTDIR)$(modules-prefix)/$(modules-dir) \


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2009 03:22:54 -0000	1.1
+++ import.log	19 Apr 2009 17:41:39 -0000	1.2
@@ -1 +1,2 @@
 sems-1_1_0-5_fc10:HEAD:sems-1.1.0-5.fc10.src.rpm:1239420130
+sems-1_1_0-6_fc10:HEAD:sems-1.1.0-6.fc10.src.rpm:1240162624


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sems.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sems.spec	11 Apr 2009 03:22:54 -0000	1.1
+++ sems.spec	19 Apr 2009 17:41:40 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
@@ -17,6 +17,11 @@
 Patch4:		sems--py_sources_install.diff
 # module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
 Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
+# Get rid of stupid makefile_defs condition in Makefile.defs
+# which prevents uf from successful building on some Fedora releases
+Patch6:		sems--makefile_defs_removal.diff
+# GCC 4.4 fixes
+Patch7:		sems--gcc44.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
 #BuildRequires:	python >= 2.3
@@ -154,17 +159,21 @@
 %patch3 -p0 -b .flite_hardcoded
 %patch4 -p0 -b .py_install_also
 %patch5 -p0 -b .cxxflags
+%patch6 -p0 -b .makefile_defs_removal
+%patch7 -p0 -b .gcc44
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
 iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
 mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt
 
 %build
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
+export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"'  -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
+export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
+export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export CFLAGS="$RPM_OPT_FLAGS"
 make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	basedir= \
@@ -537,6 +546,9 @@
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Sun Apr 19 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-6
+- Fix building with GCC 4.4
+
 * Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
 - Use modified tarball (with ilBC sources completely removed)
 



From bonii at fedoraproject.org  Sun Apr 19 17:46:05 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sun, 19 Apr 2009 17:46:05 +0000 (UTC)
Subject: rpms/moe/devel moe-1.0-configure.patch,NONE,1.1 moe.spec,1.3,1.4
Message-ID: <20090419174605.9CCF7700F9@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5030

Modified Files:
	moe.spec 
Added Files:
	moe-1.0-configure.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.


moe-1.0-configure.patch:

--- NEW FILE moe-1.0-configure.patch ---
Binary files moe-1.0.orig/arg_parser.o and moe-1.0/arg_parser.o differ
diff -urNp moe-1.0.orig/config.status moe-1.0/config.status
--- moe-1.0.orig/config.status	1970-01-01 05:30:00.000000000 +0530
+++ moe-1.0/config.status	2009-04-19 12:24:14.000000000 +0530
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This file was generated automatically by configure. Do not edit.
+# Run this file to recreate the current configuration.
+#
+# This script is free software: you have unlimited permission
+# to copy, distribute and modify it.
+
+exec /bin/sh ./configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=x86_64-redhat-linux-gnu --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --no-create
diff -urNp moe-1.0.orig/configure moe-1.0/configure
--- moe-1.0.orig/configure	2009-04-19 12:15:03.000000000 +0530
+++ moe-1.0/configure	2009-04-19 12:38:31.000000000 +0530
@@ -26,8 +26,8 @@ sysconfdir='$(prefix)/etc'
 CC=
 CXX=
 CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-CXXFLAGS='-Wall -W -O2'
+CFLAGS="-Wall -W -O2 $CFLAGS"
+CXXFLAGS="-Wall -W -O2 $CXXFLAGS"
 LDFLAGS=-lncurses
 
 # Loop over all args


Index: moe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moe/devel/moe.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- moe.spec	1 Mar 2009 17:27:05 -0000	1.3
+++ moe.spec	19 Apr 2009 17:45:34 -0000	1.4
@@ -1,14 +1,14 @@
 Name:		moe
 Version:	1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A powerful clean text editor
 
 Group:		Applications/Editors
 License:	GPLv3+
 URL:		http://www.gnu.org/software/moe/moe.html
 Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2
-Patch0:         moe-1.0-includes.patch
-
+Patch0:		moe-1.0-configure.patch
+Patch1:		moe-1.0-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -25,7 +25,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
+%patch0 -p1 -b .configure
+%patch1 -p1 -b .includes
 
 
 %build
@@ -61,6 +62,9 @@
 %{_mandir}/man1/%{name}*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
+- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.
+
 * Sun Mar 01 2009 Caol??n McNamara - 1.0-4
 - include stdio.h for snprintf
 



From peter at fedoraproject.org  Sun Apr 19 17:46:38 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sun, 19 Apr 2009 17:46:38 +0000 (UTC)
Subject: rpms/sems/F-11 sems--gcc44.diff, NONE,
	1.1 sems--makefile_defs_removal.diff, NONE, 1.1 import.log, 1.1,
	1.2 sems.spec, 1.1, 1.2
Message-ID: <20090419174638.06365700F9@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5318/F-11

Modified Files:
	import.log sems.spec 
Added Files:
	sems--gcc44.diff sems--makefile_defs_removal.diff 
Log Message:
fix building with gcc 4.4

sems--gcc44.diff:

--- NEW FILE sems--gcc44.diff ---
--- ./apps/diameter_client/ServerConnection.h~	2009-01-19 20:11:43.000000000 +0300
+++ ./apps/diameter_client/ServerConnection.h	2009-04-19 21:08:09.048458437 +0400
@@ -38,6 +38,7 @@
 #include <vector>
 #include <map>
 #include <utility>
+#include <stdint.h>
 using std::string;
 using std::vector;
 using std::map;

sems--makefile_defs_removal.diff:

--- NEW FILE sems--makefile_defs_removal.diff ---
--- Makefile.defs~	2009-01-20 21:02:34.000000000 +0300
+++ Makefile.defs	2009-04-19 20:45:30.208412422 +0400
@@ -1,10 +1,3 @@
-ifeq ($(makefile_defs), 1)
-else
-makefile_defs=1
-export makefile_defs
-
-SVN_REV?=r$(shell svnversion -n .)
-
 #version number
 VERSION = 1
 PATCHLEVEL = 1
@@ -14,153 +7,19 @@
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
 
-CPPFLAGS += -D_DEBUG \
-	  -D_THREAD_SAFE -D_REENTRANT \
-	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
-	  -DOS='"$(OS)"' 	\
-#         -DMAX_RTP_SESSIONS=8192 \
-#         -DOpenSER \
-#	  -DSUPPORT_IPV6 \
-#	  -DNO_THREADID_LOG \
-
-# compile with spandsp DTMF detection? see soft-switch.org
-#   this needs a fairly new version of spandsp - tested with 0.0.4pre11
-#   will not work with spandsp 0.0.2 .
-#   (which means that current debian and gentoo packages don't work)
-#   
-#USE_SPANDSP    = yes
-# statically link spandsp library? 
-#   (might need adjusting spandsp lib path LIBSPANDSP_LDIR - may be /usr/lib)
-#LIBSPANDSP_STATIC = yes
-#LIBSPANDSP_LDIR = /usr/local/lib/
-
-
-# compile with sample rate conversion from secret rabbit code? 
-# (see http://www.mega-nerd.com/SRC/)
-#
-#USE_LIBSAMPLERATE = yes
-
-#
-# ZRTP support? (see zfoneproject.com)
-#WITH_ZRTP = yes
-
-#
-# exclude some modules from compilation?
-# e.g. python modules:
-#exclude_modules ?= py_sems ivr mailbox pin_collect conf_auth mp3 examples
-
 LDFLAGS += -lm
 
 OS     = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
 
-ifdef USE_SPANDSP
-ifneq ($(spandsp_defs), 1)
-spandsp_defs=1
-export spandsp_defs
-CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
-endif
-endif
-
-ifdef USE_LIBSAMPLERATE
-ifneq ($(libsrc_defs), 1)
-libsrc_defs=1
-export libsrc_defs
-CPPFLAGS += -DUSE_LIBSAMPLERATE
-endif
-endif
-
-# Additions for Solaris support.
-ifeq ($(OS),solaris)
-	GETARCH=uname -p
-	CPPFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
-        CFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
-        # For nanosleep.
-        LDFLAGS += -lrt
-        # For inet_aton.
-        LDFLAGS += -lresolv
-
-	# I don't have libspeex installed.
-	# binrpcctrl does some really weird header stuff that doesn't work.
-	exclude_modules += binrpcctrl ilbc speex
-else
-	GETARCH=uname -m
-endif
-
-ARCH ?= $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
-			-e s/armv4l/arm/ -e "s/Power Macintosh/ppc/" \
-			-e "s/cobalt/mips2/" \
-			-e s/amd64/x86_64/ )
-
-# fix sparc -> sparc64
-ifeq ($(ARCH),sparc)
-	ifeq ($(shell uname -m),sun4u)
-		ARCH := sparc64
-	endif
-endif
-
 # need OS specific for this ?
 CXX = g++
 CC = gcc
 LD = $(CC)
 
-
-CXXFLAGS += -Wall -Wno-reorder -fPIC -g \
-	    -O2 $(EXTRA_CXXFLAGS)
-         
-CFLAGS += -Wall -fPIC -g -O2 $(EXTRA_CFLAGS)
-
-ifeq ($(DEBUG_PLAYOUT), yes)
-CPPFLAGS +=  -DDEBUG_PLAYOUTBUF
-endif
-
-ifdef WITH_ZRTP
-CPPFLAGS += -DWITH_ZRTP \
-	    -DBUILD_ZRTP_MUTEXES \
-	    -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES \
-	    -I/usr/local/include/zrtp 
-endif
-
 TARGET =
 LIB_LDFLAGS = -shared
 
-ifeq ($(OS), linux)
-	LDFLAGS +=  -ldl -rdynamic -lpthread
-else
-ifeq ($(OS), freebsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), openbsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), netbsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), darwin)
-	LDFLAGS += -rdynamic -pthread
-	LIB_LDFLAGS = -flat_namespace -undefined suppress -bundle
-	CXXFLAGS += -fno-common
-	CFLAGS += -fno-common
-
-	#necessary for sa_len|ss_len|sin_len
-	# may be needed on other *BSD
-	CPPFLAGS += -DBSD44SOCKETS
-
-	# add the DarwinPorts directory
-	ifneq ($(ARCH), iphone)
-	      CPPFLAGS += -D__DARWIN_UNIX03
-	      CPPFLAGS += -I /opt/local/include
-	      LDFLAGS += -L/opt/local/lib
-	endif	      
-
-	override exclude_modules += binrpcctrl mp3 examples py_sems
-else
-	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
-	TARGET=solaris
-endif
-endif
-endif
-endif
-endif
+LDFLAGS +=  -ldl -rdynamic -lpthread
 
 LIB_LDFLAGS += $(LDFLAGS)
 
@@ -201,28 +60,8 @@
 
 ser-cfg-dir = etc/ser/
 
-ifeq ($(OS), linux)
-	doc-dir = share/doc/sems/
-	man-dir = share/man/
-else
-ifeq ($(OS), freebsd)
-	doc-dir = share/doc/sems/
-	man-dir = man/
-else
-ifeq ($(OS), openbsd)
-	doc-dir = share/doc/sems/
-	man-dir = man/
-else
-ifeq ($(OS), netbsd)
-	doc-dir = share/doc/sems
-	man-dir = man/
-else
-	doc-dir = doc/sems/
-	man-dir = man/
-endif
-endif
-endif
-endif
+doc-dir = share/doc/sems/
+man-dir = share/man/
 
 # target dirs for various stuff
 bin-target = $(prefix)/$(bin-dir)
@@ -232,14 +71,8 @@
 ser-cfg-target =$(ser-prefix)/$(ser-cfg-dir)
 lib-target = $(prefix)/$(lib-dir)
 
-ifeq ($(OS), solaris)
-#use GNU versions
-INSTALL ?= ginstall
-TAR ?= gtar
-else
 INSTALL ?= install 
 TAR ?= tar
-endif
 
 INSTALL-TOUCH = touch          # used to create the file first (good to 
                                #  make solaris install work)
@@ -251,7 +84,7 @@
 
 #export stuff to sub-makes
 export REL_VERSION RELEASE OS
-export CPPFLAGS CXXFLAGS LDFLAGS CFLAGS LIB_LDFLAGS
+export LDFLAGS LIB_LDFLAGS
 export CXX CC LD
 export DESTDIR PREFIX prefix basedir ser-prefix
 export start-script
@@ -260,12 +93,6 @@
 export bin-target cfg-target modules-target audio-target ser-cfg-target lib-target
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
 
-export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR
-export USE_LIBSAMPLERATE
-export WITH_ZRTP
-
-endif  # ifeq ($(makefile_defs, 1)
-
 mk-install-dirs: $(DESTDIR)$(cfg-target) \
 		 $(DESTDIR)$(bin-prefix)/$(bin-dir) \
 		 $(DESTDIR)$(modules-prefix)/$(modules-dir) \


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2009 03:26:35 -0000	1.1
+++ import.log	19 Apr 2009 17:46:37 -0000	1.2
@@ -1 +1,2 @@
 sems-1_1_0-5_fc10:F-11:sems-1.1.0-5.fc10.src.rpm:1239420341
+sems-1_1_0-6_fc10:F-11:sems-1.1.0-6.fc10.src.rpm:1240163035


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-11/sems.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sems.spec	11 Apr 2009 03:26:35 -0000	1.1
+++ sems.spec	19 Apr 2009 17:46:37 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
@@ -17,6 +17,11 @@
 Patch4:		sems--py_sources_install.diff
 # module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
 Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
+# Get rid of stupid makefile_defs condition in Makefile.defs
+# which prevents uf from successful building on some Fedora releases
+Patch6:		sems--makefile_defs_removal.diff
+# GCC 4.4 fixes
+Patch7:		sems--gcc44.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
 #BuildRequires:	python >= 2.3
@@ -154,17 +159,21 @@
 %patch3 -p0 -b .flite_hardcoded
 %patch4 -p0 -b .py_install_also
 %patch5 -p0 -b .cxxflags
+%patch6 -p0 -b .makefile_defs_removal
+%patch7 -p0 -b .gcc44
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
 iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
 mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt
 
 %build
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
+export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"'  -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
+export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
+export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export CFLAGS="$RPM_OPT_FLAGS"
 make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	basedir= \
@@ -537,6 +546,9 @@
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Sun Apr 19 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-6
+- Fix building with GCC 4.4
+
 * Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
 - Use modified tarball (with ilBC sources completely removed)
 



From bonii at fedoraproject.org  Sun Apr 19 17:53:44 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sun, 19 Apr 2009 17:53:44 +0000 (UTC)
Subject: rpms/moe/F-9 moe-1.0-includes.patch, NONE,
	1.1 moe-1.0-configure.patch, NONE, 1.1 moe.spec, 1.1, 1.2
Message-ID: <20090419175344.E94AA7013C@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6796

Modified Files:
	moe.spec 
Added Files:
	moe-1.0-includes.patch moe-1.0-configure.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.


moe-1.0-includes.patch:

--- NEW FILE moe-1.0-includes.patch ---
diff -ru moe-1.0.orig/menu_help.cc moe-1.0/menu_help.cc
--- moe-1.0.orig/menu_help.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/menu_help.cc	2009-03-01 17:20:00.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "menu.h"
diff -ru moe-1.0.orig/menu_opts.cc moe-1.0/menu_opts.cc
--- moe-1.0.orig/menu_opts.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/menu_opts.cc	2009-03-01 17:15:55.000000000 +0000
@@ -18,6 +18,7 @@
 #include <cctype>
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "block.h"
diff -ru moe-1.0.orig/window.cc moe-1.0/window.cc
--- moe-1.0.orig/window.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/window.cc	2009-03-01 17:22:43.000000000 +0000
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "buffer_handle.h"

moe-1.0-configure.patch:

--- NEW FILE moe-1.0-configure.patch ---
Binary files moe-1.0.orig/arg_parser.o and moe-1.0/arg_parser.o differ
diff -urNp moe-1.0.orig/config.status moe-1.0/config.status
--- moe-1.0.orig/config.status	1970-01-01 05:30:00.000000000 +0530
+++ moe-1.0/config.status	2009-04-19 12:24:14.000000000 +0530
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This file was generated automatically by configure. Do not edit.
+# Run this file to recreate the current configuration.
+#
+# This script is free software: you have unlimited permission
+# to copy, distribute and modify it.
+
+exec /bin/sh ./configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=x86_64-redhat-linux-gnu --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --no-create
diff -urNp moe-1.0.orig/configure moe-1.0/configure
--- moe-1.0.orig/configure	2009-04-19 12:15:03.000000000 +0530
+++ moe-1.0/configure	2009-04-19 12:38:31.000000000 +0530
@@ -26,8 +26,8 @@ sysconfdir='$(prefix)/etc'
 CC=
 CXX=
 CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-CXXFLAGS='-Wall -W -O2'
+CFLAGS="-Wall -W -O2 $CFLAGS"
+CXXFLAGS="-Wall -W -O2 $CXXFLAGS"
 LDFLAGS=-lncurses
 
 # Loop over all args


Index: moe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-9/moe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moe.spec	25 Sep 2008 13:05:04 -0000	1.1
+++ moe.spec	19 Apr 2009 17:53:13 -0000	1.2
@@ -1,13 +1,14 @@
 Name:		moe
 Version:	1.0
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	A powerful clean text editor
 
 Group:		Applications/Editors
 License:	GPLv3+
 URL:		http://www.gnu.org/software/moe/moe.html
 Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2
-
+Patch0:		moe-1.0-configure.patch
+Patch1:		moe-1.0-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -24,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .configure
+%patch1 -p1 -b .includes
 
 
 %build
@@ -59,6 +62,15 @@
 %{_mandir}/man1/%{name}*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
+- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.
+
+* Sun Mar 01 2009 Caol??n McNamara - 1.0-4
+- include stdio.h for snprintf
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Sep 10 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-2
 - Fixed build dependencies
 - Added removal of infodir/dir to avoid overwriting



From grenier at fedoraproject.org  Sun Apr 19 18:00:18 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Sun, 19 Apr 2009 18:00:18 +0000 (UTC)
Subject: rpms/testdisk/F-11 .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 testdisk.spec, 1.24, 1.25
Message-ID: <20090419180018.47B3A700F9@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8660

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to version 6.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Jul 2008 12:15:39 -0000	1.12
+++ .cvsignore	19 Apr 2009 17:59:47 -0000	1.13
@@ -1,2 +1,2 @@
-testdisk-6.10.tar.bz2
-testdisk-doc-6.10.tar.bz2
+testdisk-6.11.tar.bz2
+testdisk-doc-6.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Jul 2008 12:15:39 -0000	1.13
+++ sources	19 Apr 2009 17:59:47 -0000	1.14
@@ -1,2 +1,2 @@
-d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
-9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
+8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-11/testdisk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- testdisk.spec	25 Feb 2009 20:00:01 -0000	1.24
+++ testdisk.spec	19 Apr 2009 17:59:47 -0000	1.25
@@ -1,22 +1,23 @@
-Summary:	Tool to check and undelete partition
+Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
 Summary(fr.UTF8):	Outil pour v??rifier et restorer des partitions
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
-Version:	6.10
-Release:	2%{?dist}
+Version:	6.11
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
-BuildRequires:  e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel
 BuildRequires:	libjpeg-devel
 %ifnarch ppc ppc64
-BuildRequires:  ntfsprogs-devel
+# See https://bugzilla.redhat.com/show_bug.cgi?id=407151
+BuildRequires:	ntfsprogs-devel
 %endif
-BuildRequires:  libewf-devel
+BuildRequires:	libewf-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +25,8 @@
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
 NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including jpg, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami:
@@ -34,6 +37,8 @@
 Outil pour v??rifier et restorer des partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
@@ -75,10 +80,6 @@
 
 This package contains testdisk & photorec documentation.
 
-%files doc
-%defattr(644,root,root,755)
-%doc doc
-
 %prep
 %setup -q
 %setup -q -a 1
@@ -101,7 +102,14 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 
+%files doc
+%defattr(644,root,root,755)
+%doc doc
+
 %changelog
+* Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
+- Update to latest version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From bonii at fedoraproject.org  Sun Apr 19 18:01:08 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sun, 19 Apr 2009 18:01:08 +0000 (UTC)
Subject: rpms/moe/F-11 moe-1.0-configure.patch,NONE,1.1 moe.spec,1.3,1.4
Message-ID: <20090419180108.4AED8700F9@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8930

Modified Files:
	moe.spec 
Added Files:
	moe-1.0-configure.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.


moe-1.0-configure.patch:

--- NEW FILE moe-1.0-configure.patch ---
Binary files moe-1.0.orig/arg_parser.o and moe-1.0/arg_parser.o differ
diff -urNp moe-1.0.orig/config.status moe-1.0/config.status
--- moe-1.0.orig/config.status	1970-01-01 05:30:00.000000000 +0530
+++ moe-1.0/config.status	2009-04-19 12:24:14.000000000 +0530
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This file was generated automatically by configure. Do not edit.
+# Run this file to recreate the current configuration.
+#
+# This script is free software: you have unlimited permission
+# to copy, distribute and modify it.
+
+exec /bin/sh ./configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=x86_64-redhat-linux-gnu --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --no-create
diff -urNp moe-1.0.orig/configure moe-1.0/configure
--- moe-1.0.orig/configure	2009-04-19 12:15:03.000000000 +0530
+++ moe-1.0/configure	2009-04-19 12:38:31.000000000 +0530
@@ -26,8 +26,8 @@ sysconfdir='$(prefix)/etc'
 CC=
 CXX=
 CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-CXXFLAGS='-Wall -W -O2'
+CFLAGS="-Wall -W -O2 $CFLAGS"
+CXXFLAGS="-Wall -W -O2 $CXXFLAGS"
 LDFLAGS=-lncurses
 
 # Loop over all args


Index: moe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-11/moe.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- moe.spec	1 Mar 2009 17:27:05 -0000	1.3
+++ moe.spec	19 Apr 2009 18:00:37 -0000	1.4
@@ -1,14 +1,14 @@
 Name:		moe
 Version:	1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A powerful clean text editor
 
 Group:		Applications/Editors
 License:	GPLv3+
 URL:		http://www.gnu.org/software/moe/moe.html
 Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2
-Patch0:         moe-1.0-includes.patch
-
+Patch0:		moe-1.0-configure.patch
+Patch1:		moe-1.0-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -25,7 +25,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
+%patch0 -p1 -b .configure
+%patch1 -p1 -b .includes
 
 
 %build
@@ -61,6 +62,9 @@
 %{_mandir}/man1/%{name}*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
+- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.
+
 * Sun Mar 01 2009 Caol??n McNamara - 1.0-4
 - include stdio.h for snprintf
 



From grenier at fedoraproject.org  Sun Apr 19 18:03:47 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Sun, 19 Apr 2009 18:03:47 +0000 (UTC)
Subject: rpms/testdisk/F-10 .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 testdisk.spec, 1.23, 1.24
Message-ID: <20090419180347.9A549700F9@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9714

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to version 6.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Jul 2008 12:15:39 -0000	1.12
+++ .cvsignore	19 Apr 2009 18:03:16 -0000	1.13
@@ -1,2 +1,2 @@
-testdisk-6.10.tar.bz2
-testdisk-doc-6.10.tar.bz2
+testdisk-6.11.tar.bz2
+testdisk-doc-6.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Jul 2008 12:15:39 -0000	1.13
+++ sources	19 Apr 2009 18:03:17 -0000	1.14
@@ -1,2 +1,2 @@
-d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
-9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
+8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-10/testdisk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- testdisk.spec	31 Jul 2008 12:15:39 -0000	1.23
+++ testdisk.spec	19 Apr 2009 18:03:17 -0000	1.24
@@ -1,9 +1,9 @@
-Summary:	Tool to check and undelete partition
+Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
 Summary(fr.UTF8):	Outil pour v??rifier et restorer des partitions
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
-Version:	6.10
+Version:	6.11
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -11,12 +11,13 @@
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
-BuildRequires:  e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel
 BuildRequires:	libjpeg-devel
 %ifnarch ppc ppc64
-BuildRequires:  ntfsprogs-devel
+# See https://bugzilla.redhat.com/show_bug.cgi?id=407151
+BuildRequires:	ntfsprogs-devel
 %endif
-BuildRequires:  libewf-devel
+BuildRequires:	libewf-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +25,8 @@
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
 NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including jpg, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami:
@@ -34,6 +37,8 @@
 Outil pour v??rifier et restorer des partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
@@ -75,10 +80,6 @@
 
 This package contains testdisk & photorec documentation.
 
-%files doc
-%defattr(644,root,root,755)
-%doc doc
-
 %prep
 %setup -q
 %setup -q -a 1
@@ -101,7 +102,14 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 
+%files doc
+%defattr(644,root,root,755)
+%doc doc
+
 %changelog
+* Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
+- Update to latest version
+
 * Thu Jul 31 2008 Christophe Grenier <grenier at cgsecurity.org> 6.10-1
 - Update to latest version
 



From bonii at fedoraproject.org  Sun Apr 19 18:05:44 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sun, 19 Apr 2009 18:05:44 +0000 (UTC)
Subject: rpms/moe/F-10 moe-1.0-configure.patch, NONE,
	1.1 moe-1.0-includes.patch, NONE, 1.1 moe.spec, 1.1, 1.2
Message-ID: <20090419180544.58BDF700F9@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/moe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10229

Modified Files:
	moe.spec 
Added Files:
	moe-1.0-configure.patch moe-1.0-includes.patch 
Log Message:
* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.


moe-1.0-configure.patch:

--- NEW FILE moe-1.0-configure.patch ---
Binary files moe-1.0.orig/arg_parser.o and moe-1.0/arg_parser.o differ
diff -urNp moe-1.0.orig/config.status moe-1.0/config.status
--- moe-1.0.orig/config.status	1970-01-01 05:30:00.000000000 +0530
+++ moe-1.0/config.status	2009-04-19 12:24:14.000000000 +0530
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This file was generated automatically by configure. Do not edit.
+# Run this file to recreate the current configuration.
+#
+# This script is free software: you have unlimited permission
+# to copy, distribute and modify it.
+
+exec /bin/sh ./configure --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=x86_64-redhat-linux-gnu --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --no-create
diff -urNp moe-1.0.orig/configure moe-1.0/configure
--- moe-1.0.orig/configure	2009-04-19 12:15:03.000000000 +0530
+++ moe-1.0/configure	2009-04-19 12:38:31.000000000 +0530
@@ -26,8 +26,8 @@ sysconfdir='$(prefix)/etc'
 CC=
 CXX=
 CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-CXXFLAGS='-Wall -W -O2'
+CFLAGS="-Wall -W -O2 $CFLAGS"
+CXXFLAGS="-Wall -W -O2 $CXXFLAGS"
 LDFLAGS=-lncurses
 
 # Loop over all args

moe-1.0-includes.patch:

--- NEW FILE moe-1.0-includes.patch ---
diff -ru moe-1.0.orig/menu_help.cc moe-1.0/menu_help.cc
--- moe-1.0.orig/menu_help.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/menu_help.cc	2009-03-01 17:20:00.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "menu.h"
diff -ru moe-1.0.orig/menu_opts.cc moe-1.0/menu_opts.cc
--- moe-1.0.orig/menu_opts.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/menu_opts.cc	2009-03-01 17:15:55.000000000 +0000
@@ -18,6 +18,7 @@
 #include <cctype>
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "block.h"
diff -ru moe-1.0.orig/window.cc moe-1.0/window.cc
--- moe-1.0.orig/window.cc	2009-03-01 17:15:21.000000000 +0000
+++ moe-1.0/window.cc	2009-03-01 17:22:43.000000000 +0000
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "buffer_handle.h"


Index: moe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moe/F-10/moe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moe.spec	25 Sep 2008 13:02:23 -0000	1.1
+++ moe.spec	19 Apr 2009 18:05:42 -0000	1.2
@@ -1,13 +1,14 @@
 Name:		moe
 Version:	1.0
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	A powerful clean text editor
 
 Group:		Applications/Editors
 License:	GPLv3+
 URL:		http://www.gnu.org/software/moe/moe.html
 Source0:	http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2
-
+Patch0:		moe-1.0-configure.patch
+Patch1:		moe-1.0-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -24,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .configure
+%patch1 -p1 -b .includes
 
 
 %build
@@ -59,6 +62,15 @@
 %{_mandir}/man1/%{name}*
 
 %changelog
+* Sun Apr 19 2009 Debarshi Ray <rishi at fedoraproject.org> 1.0-5
+- Fixed configure to respect the environment's CFLAGS and CXXFLAGS settings.
+
+* Sun Mar 01 2009 Caol??n McNamara - 1.0-4
+- include stdio.h for snprintf
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Sep 10 2008 Vivek Shah <boni.vivek at gmail.com> 1.0-2
 - Fixed build dependencies
 - Added removal of infodir/dir to avoid overwriting



From mjakubicek at fedoraproject.org  Sun Apr 19 18:21:09 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 18:21:09 +0000 (UTC)
Subject: rpms/cone/devel cone-gcc44.patch,1.1,1.2 cone.spec,1.29,1.30
Message-ID: <20090419182109.AF4F9700F9@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13566/devel

Modified Files:
	cone-gcc44.patch cone.spec 
Log Message:
- Updated cone-gcc44.patch according to upstream wishes.



cone-gcc44.patch:

Index: cone-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cone/devel/cone-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cone-gcc44.patch	19 Apr 2009 00:23:26 -0000	1.1
+++ cone-gcc44.patch	19 Apr 2009 18:21:08 -0000	1.2
@@ -1,22 +1,23 @@
---- libmail/maildiradd.C.orig	2009-04-18 20:28:15.000000000 +0200
-+++ libmail/maildiradd.C	2009-04-18 20:28:33.000000000 +0200
-@@ -165,7 +165,7 @@
- 	if (flags.size() > 0)
- 	{
- 		newname = newname + MDIRSEP "2," + flags;
+--- libmail/maildiradd.C    24 May 2008 17:57:42 -0000    1.6
++++ libmail/maildiradd.C    19 Apr 2009 11:54:45 -0000
+@@ -165,7 +165,8 @@
+	if (flags.size() > 0)
+	{
+		newname = newname + MDIRSEP "2," + flags;
 -		memcpy(strrchr(newname.c_str(), '/')-3, "cur", 3);
-+		memcpy((void *) strrchr(newname.c_str(), '/')-3, "cur", 3);
- 		// We go into the cur directory, now
- 	}
- 
---- libmail/qp.C.orig	2009-04-18 21:50:00.000000000 +0200
-+++ libmail/qp.C	2009-04-18 21:50:03.000000000 +0200
++		memcpy(strrchr(const_cast<char *>(newname.c_str()), '/')-3,
++			"cur", 3);
+		// We go into the cur directory, now
+	}
+
+--- libmail/qp.C    27 May 2003 14:09:08 -0000    1.1
++++ libmail/qp.C    19 Apr 2009 11:54:46 -0000
 @@ -16,7 +16,7 @@
  {
- 	static const char xdigits[]="0123456789ABCDEFabcdef";
- 
+	static const char xdigits[]="0123456789ABCDEFabcdef";
+
 -	char *p=strchr(xdigits, c);
-+	char *p=strchr((char *) xdigits, c);
- 
- 	if (p == NULL)
- 		return -1;
++	const char *p=strchr(xdigits, c);
+
+	if (p == NULL)
+		return -1;


Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/devel/cone.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cone.spec	19 Apr 2009 00:23:26 -0000	1.29
+++ cone.spec	19 Apr 2009 18:21:08 -0000	1.30
@@ -3,7 +3,7 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.75
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@
 %doc cone/html
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-5
+- Updated cone-gcc44.patch according to upstream wishes.
+
 * Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-4
 - Fix FTBFS: added cone-gcc44.patch
 



From mjakubicek at fedoraproject.org  Sun Apr 19 18:21:38 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 18:21:38 +0000 (UTC)
Subject: rpms/cone/F-11 cone-gcc44.patch,1.1,1.2 cone.spec,1.29,1.30
Message-ID: <20090419182138.A0CC8700F9@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cone/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13566/F-11

Modified Files:
	cone-gcc44.patch cone.spec 
Log Message:
- Updated cone-gcc44.patch according to upstream wishes.



cone-gcc44.patch:

Index: cone-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cone/F-11/cone-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cone-gcc44.patch	19 Apr 2009 00:23:26 -0000	1.1
+++ cone-gcc44.patch	19 Apr 2009 18:21:07 -0000	1.2
@@ -1,22 +1,23 @@
---- libmail/maildiradd.C.orig	2009-04-18 20:28:15.000000000 +0200
-+++ libmail/maildiradd.C	2009-04-18 20:28:33.000000000 +0200
-@@ -165,7 +165,7 @@
- 	if (flags.size() > 0)
- 	{
- 		newname = newname + MDIRSEP "2," + flags;
+--- libmail/maildiradd.C    24 May 2008 17:57:42 -0000    1.6
++++ libmail/maildiradd.C    19 Apr 2009 11:54:45 -0000
+@@ -165,7 +165,8 @@
+	if (flags.size() > 0)
+	{
+		newname = newname + MDIRSEP "2," + flags;
 -		memcpy(strrchr(newname.c_str(), '/')-3, "cur", 3);
-+		memcpy((void *) strrchr(newname.c_str(), '/')-3, "cur", 3);
- 		// We go into the cur directory, now
- 	}
- 
---- libmail/qp.C.orig	2009-04-18 21:50:00.000000000 +0200
-+++ libmail/qp.C	2009-04-18 21:50:03.000000000 +0200
++		memcpy(strrchr(const_cast<char *>(newname.c_str()), '/')-3,
++			"cur", 3);
+		// We go into the cur directory, now
+	}
+
+--- libmail/qp.C    27 May 2003 14:09:08 -0000    1.1
++++ libmail/qp.C    19 Apr 2009 11:54:46 -0000
 @@ -16,7 +16,7 @@
  {
- 	static const char xdigits[]="0123456789ABCDEFabcdef";
- 
+	static const char xdigits[]="0123456789ABCDEFabcdef";
+
 -	char *p=strchr(xdigits, c);
-+	char *p=strchr((char *) xdigits, c);
- 
- 	if (p == NULL)
- 		return -1;
++	const char *p=strchr(xdigits, c);
+
+	if (p == NULL)
+		return -1;


Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/F-11/cone.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cone.spec	19 Apr 2009 00:23:26 -0000	1.29
+++ cone.spec	19 Apr 2009 18:21:07 -0000	1.30
@@ -3,7 +3,7 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.75
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@
 %doc cone/html
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-5
+- Updated cone-gcc44.patch according to upstream wishes.
+
 * Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-4
 - Fix FTBFS: added cone-gcc44.patch
 



From grenier at fedoraproject.org  Sun Apr 19 18:34:58 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Sun, 19 Apr 2009 18:34:58 +0000 (UTC)
Subject: rpms/testdisk/F-9 .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 testdisk.spec, 1.23, 1.24
Message-ID: <20090419183458.4FC7F700F9@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17325

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to version 6.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Jul 2008 18:52:46 -0000	1.12
+++ .cvsignore	19 Apr 2009 18:34:27 -0000	1.13
@@ -1,2 +1,2 @@
-testdisk-6.10.tar.bz2
-testdisk-doc-6.10.tar.bz2
+testdisk-6.11.tar.bz2
+testdisk-doc-6.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Jul 2008 18:52:46 -0000	1.13
+++ sources	19 Apr 2009 18:34:27 -0000	1.14
@@ -1,2 +1,2 @@
-d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
-9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
+8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-9/testdisk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- testdisk.spec	31 Jul 2008 18:52:46 -0000	1.23
+++ testdisk.spec	19 Apr 2009 18:34:27 -0000	1.24
@@ -1,9 +1,9 @@
-Summary:	Tool to check and undelete partition
+Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
 Summary(fr.UTF8):	Outil pour v??rifier et restorer des partitions
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
-Version:	6.10
+Version:	6.11
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -11,13 +11,13 @@
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
-BuildRequires:  e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel
 BuildRequires:	libjpeg-devel
 %ifnarch ppc ppc64
 # See https://bugzilla.redhat.com/show_bug.cgi?id=407151
-BuildRequires:  ntfsprogs-devel
+BuildRequires:	ntfsprogs-devel
 %endif
-BuildRequires:  libewf-devel
+BuildRequires:	libewf-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +25,8 @@
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
 NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including jpg, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami:
@@ -35,6 +37,8 @@
 Outil pour v??rifier et restorer des partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
@@ -103,6 +107,9 @@
 %doc doc
 
 %changelog
+* Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
+- Update to latest version
+
 * Thu Jul 31 2008 Christophe Grenier <grenier at cgsecurity.org> 6.10-1
 - Update to latest version
 



From grenier at fedoraproject.org  Sun Apr 19 18:44:03 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Sun, 19 Apr 2009 18:44:03 +0000 (UTC)
Subject: rpms/testdisk/EL-5 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 testdisk.spec, 1.15, 1.16
Message-ID: <20090419184403.8F750700F9@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19217

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to version 6.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Jul 2008 20:38:45 -0000	1.10
+++ .cvsignore	19 Apr 2009 18:43:31 -0000	1.11
@@ -1,2 +1,2 @@
-testdisk-6.10.tar.bz2
-testdisk-doc-6.10.tar.bz2
+testdisk-6.11.tar.bz2
+testdisk-doc-6.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jul 2008 20:38:45 -0000	1.10
+++ sources	19 Apr 2009 18:43:31 -0000	1.11
@@ -1,2 +1,2 @@
-d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
-9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
+8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-5/testdisk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- testdisk.spec	31 Jul 2008 20:38:45 -0000	1.15
+++ testdisk.spec	19 Apr 2009 18:43:31 -0000	1.16
@@ -1,9 +1,9 @@
-Summary:	Tool to check and undelete partition
+Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
 Summary(fr.UTF8):	Outil pour v??rifier et restorer des partitions
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
-Version:	6.10
+Version:	6.11
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -11,17 +11,18 @@
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
-BuildRequires:  e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:  ntfsprogs-devel
+BuildRequires:	ntfsprogs-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
 NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including jpg, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami:
@@ -32,6 +33,8 @@
 Outil pour v??rifier et restorer des partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
@@ -100,6 +103,9 @@
 %doc doc
 
 %changelog
+* Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
+- Update to latest version
+
 * Thu Jul 31 2008 Christophe Grenier <grenier at cgsecurity.org> 6.10-1
 - Update to latest version
 



From lkundrak at fedoraproject.org  Sun Apr 19 18:57:45 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 18:57:45 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.123,1.124
Message-ID: <20090419185745.55C957013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21914/devel

Modified Files:
	fedora-logos.spec 
Log Message:
* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 11.0.1-2
- fix bootsplash to be a bit more psychadelic



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fedora-logos.spec	17 Apr 2009 18:35:37 -0000	1.123
+++ fedora-logos.spec	19 Apr 2009 18:57:14 -0000	1.124
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 11.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -39,6 +39,9 @@
 %setup -q
 
 %build
+# Accidentally doubly-gzipped
+gunzip bootloader/splash.xpm.gz
+mv bootloader/splash.xpm{,.gz}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -183,6 +186,9 @@
 # end i386 bits
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 11.0.1-2
+- fix bootsplash to be a bit more psychadelic
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.1-1
 - fix bootsplash to be less psychadelic
 



From lkundrak at fedoraproject.org  Sun Apr 19 18:57:45 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 19 Apr 2009 18:57:45 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 fedora-logos.spec,1.123,1.124
Message-ID: <20090419185745.6651B7013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21914/F-11

Modified Files:
	fedora-logos.spec 
Log Message:
* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 11.0.1-2
- fix bootsplash to be a bit more psychadelic



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fedora-logos.spec	17 Apr 2009 18:35:36 -0000	1.123
+++ fedora-logos.spec	19 Apr 2009 18:57:13 -0000	1.124
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 11.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -39,6 +39,9 @@
 %setup -q
 
 %build
+# Accidentally doubly-gzipped
+gunzip bootloader/splash.xpm.gz
+mv bootloader/splash.xpm{,.gz}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -183,6 +186,9 @@
 # end i386 bits
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 11.0.1-2
+- fix bootsplash to be a bit more psychadelic
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.1-1
 - fix bootsplash to be less psychadelic
 



From hno at fedoraproject.org  Sun Apr 19 19:28:37 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sun, 19 Apr 2009 19:28:37 +0000 (UTC)
Subject: rpms/squid/devel squid.spec, 1.117,
	1.118 squid-3.0.STABLE13-logfile-syslog.patch, 1.1, NONE
Message-ID: <20090419192837.39ADC7013C@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29484

Modified Files:
	squid.spec 
Removed Files:
	squid-3.0.STABLE13-logfile-syslog.patch 
Log Message:
3.0.STABLE14


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- squid.spec	6 Mar 2009 17:44:10 -0000	1.117
+++ squid.spec	19 Apr 2009 19:28:04 -0000	1.118
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE13
-Release:  3%{?dist}
+Version:  3.0.STABLE14
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,8 +20,6 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-# backport of http://www.squid-cache.org/Versions/v3/3.1/b9443.patch until done upstream
-Patch001: squid-3.0.STABLE13-logfile-syslog.patch
 
 # External patches
 
@@ -340,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1
+- Upgrade to 3.0.STABLE14
+
 * Fri Mar 06 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE13-2
 - backported logfile.cc syslog parameters patch from 3.1 (b9443.patch)
 - GCC-4.4 workaround in src/wccp2.cc


--- squid-3.0.STABLE13-logfile-syslog.patch DELETED ---



From hno at fedoraproject.org  Sun Apr 19 19:29:53 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sun, 19 Apr 2009 19:29:53 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.118,1.119
Message-ID: <20090419192953.2B1CC700F9@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30202

Modified Files:
	squid.spec 
Log Message:
3.0.STABLE14


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- squid.spec	19 Apr 2009 19:28:04 -0000	1.118
+++ squid.spec	19 Apr 2009 19:29:22 -0000	1.119
@@ -58,7 +58,6 @@
 %prep
 %setup -q
 
-%patch001 -p1 -b .logfile
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build



From hno at fedoraproject.org  Sun Apr 19 19:40:58 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sun, 19 Apr 2009 19:40:58 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore,1.38,1.39 sources,1.41,1.42
Message-ID: <20090419194058.996FB700F9@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv381

Modified Files:
	.cvsignore sources 
Log Message:
3.0.STABLE14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	6 Feb 2009 00:16:24 -0000	1.38
+++ .cvsignore	19 Apr 2009 19:40:27 -0000	1.39
@@ -1 +1 @@
-squid-3.0.STABLE13.tar.bz2
+squid-3.0.STABLE14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	6 Feb 2009 00:16:25 -0000	1.41
+++ sources	19 Apr 2009 19:40:27 -0000	1.42
@@ -1 +1 @@
-37c89c97743a81e5178fbd5d5888b7e2  squid-3.0.STABLE13.tar.bz2
+7aaff2319d2263404d788a82a10c8633  squid-3.0.STABLE14.tar.bz2



From cweyl at fedoraproject.org  Sun Apr 19 20:29:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 20:29:02 +0000 (UTC)
Subject: rpms/perl-MooseX-Params-Validate/devel .cvsignore, 1.7,
	1.8 perl-MooseX-Params-Validate.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20090419202902.351FB700F9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11039

Modified Files:
	.cvsignore perl-MooseX-Params-Validate.spec sources 
Log Message:
* Sun Apr 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
- update to 0.09



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Jan 2009 18:45:52 -0000	1.7
+++ .cvsignore	19 Apr 2009 20:28:29 -0000	1.8
@@ -1,4 +1 @@
-MooseX-Params-Validate-0.07.tar.gz
-*.rpm
-*.gz
-clog
+MooseX-Params-Validate-0.09.tar.gz


Index: perl-MooseX-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/perl-MooseX-Params-Validate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MooseX-Params-Validate.spec	26 Feb 2009 22:34:33 -0000	1.9
+++ perl-MooseX-Params-Validate.spec	19 Apr 2009 20:28:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Params-Validate
-Version:        0.07
-Release:        3%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Extension of Params::Validate using Moose's types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Apr 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
+- update to 0.09
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Dec 2008 16:13:08 -0000	1.6
+++ sources	19 Apr 2009 20:28:29 -0000	1.7
@@ -1 +1 @@
-d4ee0b346bcafd84a5bf994e2fcee713  MooseX-Params-Validate-0.07.tar.gz
+32f356facb51480c1f12d485e749cd08  MooseX-Params-Validate-0.09.tar.gz



From cweyl at fedoraproject.org  Sun Apr 19 20:32:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 19 Apr 2009 20:32:18 +0000 (UTC)
Subject: rpms/perl-MooseX-StrictConstructor/devel .cvsignore, 1.2,
	1.3 perl-MooseX-StrictConstructor.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090419203218.1EF5370137@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-StrictConstructor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11782

Modified Files:
	.cvsignore perl-MooseX-StrictConstructor.spec sources 
Log Message:
* Sun Apr 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
- update to 0.08



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-StrictConstructor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2008 06:54:53 -0000	1.2
+++ .cvsignore	19 Apr 2009 20:31:47 -0000	1.3
@@ -1 +1 @@
-MooseX-StrictConstructor-0.07.tar.gz
+MooseX-StrictConstructor-0.08.tar.gz


Index: perl-MooseX-StrictConstructor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-StrictConstructor/devel/perl-MooseX-StrictConstructor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MooseX-StrictConstructor.spec	26 Feb 2009 22:39:31 -0000	1.4
+++ perl-MooseX-StrictConstructor.spec	19 Apr 2009 20:31:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-StrictConstructor 
-Version:    0.07 
-Release:    4%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 # see lib/MooseX/StrictConstructor.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -12,7 +12,7 @@
 BuildArch:  noarch
 BuildRequires: perl(ExtUtils::MakeMaker) 
 BuildRequires: perl(Module::Build::Compat)
-BuildRequires: perl(Moose) >= 0.56
+BuildRequires: perl(Moose) >= 0.74
 BuildRequires: perl(Test::More)
 
 
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Apr 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
+- update to 0.08
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-StrictConstructor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2008 06:54:53 -0000	1.2
+++ sources	19 Apr 2009 20:31:47 -0000	1.3
@@ -1 +1 @@
-f5c258dfb52699b261c9ab1458d6f64c  MooseX-StrictConstructor-0.07.tar.gz
+c8a293d07050bffda541d76ef591a13e  MooseX-StrictConstructor-0.08.tar.gz



From scop at fedoraproject.org  Sun Apr 19 20:34:48 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 19 Apr 2009 20:34:48 +0000 (UTC)
Subject: rpms/olpc-utils/devel olpc-utils-0.89-cflags.patch, NONE,
	1.1 olpc-utils.spec, 1.7, 1.8
Message-ID: <20090419203448.24203700F9@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13230

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-0.89-cflags.patch 
Log Message:
* Sun Apr 19 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.89-11
- Build with %{optflags}.


olpc-utils-0.89-cflags.patch:

--- NEW FILE olpc-utils-0.89-cflags.patch ---
diff -up olpc-utils-0.89/Makefile.build~ olpc-utils-0.89/Makefile.build
--- olpc-utils-0.89/Makefile.build~	2008-09-30 00:48:41.000000000 +0300
+++ olpc-utils-0.89/Makefile.build	2009-04-19 23:25:04.000000000 +0300
@@ -27,7 +27,7 @@ all: $(BINARIES)
 # objects
 
 %.o: %.c
-	$(CC) $(WARNFLAGS) -c -o $@ $<
+	$(CC) $(WARNFLAGS) $(CFLAGS) -c -o $@ $<
 
 
 # built works


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- olpc-utils.spec	26 Feb 2009 21:01:43 -0000	1.7
+++ olpc-utils.spec	19 Apr 2009 20:34:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    0.89
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -8,6 +8,7 @@
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: olpc-utils-0.89-cflags.patch
 Patch1: olpc-utils-dbus.patch
 Patch2: olpc-utils-python2.6.patch
 
@@ -35,11 +36,12 @@
 %prep
 %setup -q
 
+%patch0 -p1
 %patch1 -p1
 %patch2 -p0
 
 %build
-make -f Makefile.build %{?_smp_mflags}
+make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
@@ -93,6 +95,9 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Sun Apr 19 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.89-11
+- Build with %%{optflags}.
+
 * Thu Feb 26 2009 Adam Jackson <ajax at redhat.com> 0.89-10
 - Remove x11-input.fdi, this should all be automatically right already in
   F11 and later, and it breaks synaptics.



From pbrobinson at fedoraproject.org  Sun Apr 19 20:44:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 19 Apr 2009 20:44:00 +0000 (UTC)
Subject: rpms/xapian-core/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xapian-core.spec, 1.21, 1.22
Message-ID: <20090419204400.B2840700F9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15212

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Apr 2009 21:41:56 -0000	1.10
+++ .cvsignore	19 Apr 2009 20:43:30 -0000	1.11
@@ -1 +1 @@
-xapian-core-1.0.11.tar.gz
+xapian-core-1.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Apr 2009 21:41:56 -0000	1.10
+++ sources	19 Apr 2009 20:43:30 -0000	1.11
@@ -1 +1 @@
-f80a2f51b109e2a065bdcbf1ba03b808  xapian-core-1.0.11.tar.gz
+060efc364062704528bbfed5328e907b  xapian-core-1.0.12.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xapian-core.spec	6 Apr 2009 21:41:56 -0000	1.21
+++ xapian-core.spec	19 Apr 2009 20:43:30 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.11
+Version: 1.0.12
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
@@ -122,6 +122,9 @@
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Sun Apr 12 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.12-1
+- Update to 1.0.12
+
 * Mon Apr 06 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.11-1
 - Update to 1.0.11
 



From pbrobinson at fedoraproject.org  Sun Apr 19 20:48:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 19 Apr 2009 20:48:58 +0000 (UTC)
Subject: rpms/xapian-bindings/devel .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 xapian-bindings.spec, 1.19, 1.20
Message-ID: <20090419204858.AFE42700F9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16257

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Apr 2009 21:45:35 -0000	1.8
+++ .cvsignore	19 Apr 2009 20:48:27 -0000	1.9
@@ -1 +1 @@
-xapian-bindings-1.0.11.tar.gz
+xapian-bindings-1.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Apr 2009 21:45:35 -0000	1.9
+++ sources	19 Apr 2009 20:48:27 -0000	1.10
@@ -1 +1 @@
-7297a1d09564fe31b768fe58eabd219d  xapian-bindings-1.0.11.tar.gz
+ff5e1f5cee8b32031f9851cdcd88c506  xapian-bindings-1.0.12.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xapian-bindings.spec	7 Apr 2009 15:07:24 -0000	1.19
+++ xapian-bindings.spec	19 Apr 2009 20:48:27 -0000	1.20
@@ -4,8 +4,8 @@
 
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
-Version: 1.0.11
-Release: 2%{?dist}
+Version: 1.0.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://www.xapian.org/
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12.1
+- Update to 1.0.12
+
 * Tue Apr 07 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-2
 - Obsolete pyxapian
 



From rdieter at fedoraproject.org  Sun Apr 19 21:37:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 21:37:35 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs-3.5.10-openssl.patch, NONE,
	1.1 kdelibs3.spec, 1.60, 1.61 kdelibs-3.5.7-openssl.patch, 1.2, NONE
Message-ID: <20090419213735.B5E80700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27118/F-11

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-openssl.patch 
Removed Files:
	kdelibs-3.5.7-openssl.patch 
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-11
- update openssl patch (for 0.9.8k)


kdelibs-3.5.10-openssl.patch:

--- NEW FILE kdelibs-3.5.10-openssl.patch ---
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.10/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl	2006-07-22 03:16:39.000000000 -0500
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-04-19 16:34:14.000000000 -0500
@@ -329,6 +329,19 @@ KConfig *cfg;
              #ifdef SHLIB_VERSION_NUMBER
              << "libssl.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libssl.so.0.9.8k"
+             << "libssl.so.8"
+             << "libssl.so.0.9.8g"
+             << "libssl.so.7"
+             << "libssl.so.0.9.8b"
+             << "libssl.so.0.9.8a"
+             << "libssl.so.6"
+             << "libssl.so.0.9.7e"
+             << "libssl.so.5"
+             << "libssl.so.0.9.7a"
+             << "libssl.so.4"
+             << "libssl.so.0.9.6b"
+             << "libssl.so.2"
              << "libssl.so"
 	     << "libssl.so.0"
              #endif
@@ -346,6 +359,19 @@ KConfig *cfg;
              #ifdef SHLIB_VERSION_NUMBER
              << "libcrypto.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libcrypto.so.0.9.8k"
+             << "libcrypto.so.8"
+             << "libcrypto.so.0.9.8g"
+             << "libcrypto.so.7"
+             << "libcrypto.so.0.9.8b"
+             << "libcrypto.so.0.9.8a"
+             << "libcrypto.so.6"
+             << "libcrypto.so.0.9.7e"
+             << "libcrypto.so.5"
+             << "libcrypto.so.0.9.7a"
+             << "libcrypto.so.4"
+             << "libcrypto.so.0.9.6b"
+             << "libcrypto.so.2"
              << "libcrypto.so"
 	     << "libcrypto.so.0"
              #endif


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdelibs3.spec	16 Apr 2009 14:09:00 -0000	1.60
+++ kdelibs3.spec	19 Apr 2009 21:37:03 -0000	1.61
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -62,7 +62,7 @@
 Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
-Patch5: kdelibs-3.5.7-openssl.patch
+Patch5: kdelibs-3.5.10-openssl.patch
 Patch15: kdelibs-3.4.91-buildroot.patch
 Patch32: kdelibs-3.2.3-cups.patch
 Patch33: kdelibs-3.3.2-ppc.patch
@@ -623,6 +623,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-11
+- update openssl patch (for 0.9.8k)
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
 - move designer plugins to runtime (#487622)
 - make -apidocs noarch


--- kdelibs-3.5.7-openssl.patch DELETED ---



From rdieter at fedoraproject.org  Sun Apr 19 21:37:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 19 Apr 2009 21:37:35 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs-3.5.10-openssl.patch, NONE,
	1.1 kdelibs3.spec, 1.60, 1.61 kdelibs-3.5.7-openssl.patch, 1.2, NONE
Message-ID: <20090419213735.BC89A70137@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27118/devel

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-openssl.patch 
Removed Files:
	kdelibs-3.5.7-openssl.patch 
Log Message:
* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-11
- update openssl patch (for 0.9.8k)


kdelibs-3.5.10-openssl.patch:

--- NEW FILE kdelibs-3.5.10-openssl.patch ---
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.10/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl	2006-07-22 03:16:39.000000000 -0500
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-04-19 16:34:14.000000000 -0500
@@ -329,6 +329,19 @@ KConfig *cfg;
              #ifdef SHLIB_VERSION_NUMBER
              << "libssl.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libssl.so.0.9.8k"
+             << "libssl.so.8"
+             << "libssl.so.0.9.8g"
+             << "libssl.so.7"
+             << "libssl.so.0.9.8b"
+             << "libssl.so.0.9.8a"
+             << "libssl.so.6"
+             << "libssl.so.0.9.7e"
+             << "libssl.so.5"
+             << "libssl.so.0.9.7a"
+             << "libssl.so.4"
+             << "libssl.so.0.9.6b"
+             << "libssl.so.2"
              << "libssl.so"
 	     << "libssl.so.0"
              #endif
@@ -346,6 +359,19 @@ KConfig *cfg;
              #ifdef SHLIB_VERSION_NUMBER
              << "libcrypto.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libcrypto.so.0.9.8k"
+             << "libcrypto.so.8"
+             << "libcrypto.so.0.9.8g"
+             << "libcrypto.so.7"
+             << "libcrypto.so.0.9.8b"
+             << "libcrypto.so.0.9.8a"
+             << "libcrypto.so.6"
+             << "libcrypto.so.0.9.7e"
+             << "libcrypto.so.5"
+             << "libcrypto.so.0.9.7a"
+             << "libcrypto.so.4"
+             << "libcrypto.so.0.9.6b"
+             << "libcrypto.so.2"
              << "libcrypto.so"
 	     << "libcrypto.so.0"
              #endif


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdelibs3.spec	16 Apr 2009 14:09:00 -0000	1.60
+++ kdelibs3.spec	19 Apr 2009 21:37:04 -0000	1.61
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -62,7 +62,7 @@
 Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
-Patch5: kdelibs-3.5.7-openssl.patch
+Patch5: kdelibs-3.5.10-openssl.patch
 Patch15: kdelibs-3.4.91-buildroot.patch
 Patch32: kdelibs-3.2.3-cups.patch
 Patch33: kdelibs-3.3.2-ppc.patch
@@ -623,6 +623,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-11
+- update openssl patch (for 0.9.8k)
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
 - move designer plugins to runtime (#487622)
 - make -apidocs noarch


--- kdelibs-3.5.7-openssl.patch DELETED ---



From caolanm at fedoraproject.org  Sun Apr 19 21:59:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 19 Apr 2009 21:59:49 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.slideshow1.patch, NONE,
	1.1 openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, 1.2,
	1.3 openoffice.org.spec, 1.1885, 1.1886
Message-ID: <20090419215950.0309B700F9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31743/devel

Modified Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
	openoffice.org.spec 
Added Files:
	workspace.slideshow1.patch 
Log Message:
Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen

workspace.slideshow1.patch:

--- NEW FILE workspace.slideshow1.patch ---
Index: cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx
===================================================================
--- cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx	(revision 269949)
@@ -71,6 +71,7 @@
 #include "viewmediashape.hxx"
 #include "mediashape.hxx"
 #include "tools.hxx"
+#include "unoview.hxx"
 
 using namespace ::com::sun::star;
 
@@ -88,12 +89,19 @@
 			mxShape( rxShape ),
 			mxPlayer(),
 			mxPlayerWindow(),
-            mxComponentContext( rxContext )
+            mxComponentContext( rxContext ),
+            mbIsSoundEnabled(true)
         {
             ENSURE_OR_THROW( mxShape.is(), "ViewMediaShape::ViewMediaShape(): Invalid Shape" );
             ENSURE_OR_THROW( mpViewLayer, "ViewMediaShape::ViewMediaShape(): Invalid View" );
             ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewMediaShape::ViewMediaShape(): Invalid ViewLayer canvas" );
             ENSURE_OR_THROW( mxComponentContext.is(), "ViewMediaShape::ViewMediaShape(): Invalid component context" );
+
+            UnoViewSharedPtr pUnoView (::boost::dynamic_pointer_cast<UnoView>(rViewLayer));
+            if (pUnoView)
+            {
+                mbIsSoundEnabled = pUnoView->isSoundEnabled();
+            }
         }
 
 		// ---------------------------------------------------------------------
@@ -352,7 +360,7 @@
 					getPropertyValue( bMute,
                                       rxProps,
                                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Mute" )));
-					mxPlayer->setMute( bMute );
+					mxPlayer->setMute( bMute || !mbIsSoundEnabled);
 
 					sal_Int16 nVolumeDB(0);
 					getPropertyValue( nVolumeDB,
Index: cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx
===================================================================
--- cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx	(revision 269949)
@@ -1451,6 +1451,34 @@
         return (rProperty.Value >>= mbNoSlideTransitions);
     }
     
+    if (rProperty.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsSoundEnabled")))
+    {
+        uno::Sequence<uno::Any> aValues;
+        uno::Reference<presentation::XSlideShowView> xView;
+        sal_Bool bValue;
+        if ((rProperty.Value >>= aValues)
+            && aValues.getLength()==2
+            && (aValues[0] >>= xView)
+            && (aValues[1] >>= bValue))
+        {
+            // Look up the view.
+            for (UnoViewVector::const_iterator
+                     iView (maViewContainer.begin()),
+                     iEnd (maViewContainer.end());
+                 iView!=iEnd;
+                 ++iView)
+            {
+                if (*iView && (*iView)->getUnoView()==xView)
+                {
+                    // Store the flag at the view so that media shapes have
+                    // access to it.
+                    (*iView)->setIsSoundEnabled(bValue);
+                    return true;
+                }
+            }
+        }
+    }
+
     return false;
 }
 
Index: cws/slideshow1/slideshow/source/engine/slideview.cxx
===================================================================
--- cws/slideshow1/slideshow/source/engine/slideview.cxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/engine/slideview.cxx	(revision 269949)
@@ -715,6 +715,8 @@
     // UnoView:
     virtual void _dispose();
     virtual uno::Reference<presentation::XSlideShowView> getUnoView()const;
+    virtual void setIsSoundEnabled (const bool bValue);
+    virtual bool isSoundEnabled (void) const;
 
     // XEventListener:
     virtual void SAL_CALL disposing( lang::EventObject const& evt )
@@ -755,6 +757,7 @@
     
     basegfx::B2DHomMatrix                                     maViewTransform;
     basegfx::B2DSize                                          maUserSize;
+    bool mbIsSoundEnabled;
 };
 
 
@@ -770,7 +773,8 @@
     maViewLayers(),
     maClip(),
     maViewTransform(),
-    maUserSize( 1.0, 1.0 ) // default size: one-by-one rectangle 
+    maUserSize( 1.0, 1.0 ), // default size: one-by-one rectangle 
+    mbIsSoundEnabled(true)
 {
     // take care not constructing any UNO references to this _inside_
     // ctor, shift that code to createSlideView()!    
@@ -1001,6 +1005,16 @@
     return mxView;
 }
 
+void SlideView::setIsSoundEnabled (const bool bValue)
+{
+    mbIsSoundEnabled = bValue;
+}
+
+bool SlideView::isSoundEnabled (void) const
+{
+    return mbIsSoundEnabled;
+}
+
 void SlideView::_dispose()
 {
     dispose();
Index: cws/slideshow1/slideshow/source/inc/unoview.hxx
===================================================================
--- cws/slideshow1/slideshow/source/inc/unoview.hxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/inc/unoview.hxx	(revision 269949)
@@ -68,6 +68,16 @@
                 with a different calling convention under Windows).
              */
             virtual void _dispose() = 0;
+
+            /** Return whether the sound play back is enabled.
+            */
+            virtual bool isSoundEnabled (void) const = 0;
+
+            /** Tell the view whether it may play sounds.  Disabling this
+                can be used to prevent different views to play the same
+                sounds at the same time.
+            */
+            virtual void setIsSoundEnabled (const bool bValue) = 0;
         };
 
         typedef ::boost::shared_ptr< UnoView > 		UnoViewSharedPtr;
Index: cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx
===================================================================
--- cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx	(revision 269950)
+++ cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx	(revision 269951)
@@ -162,7 +162,17 @@
     // Add the new slide show view to the slide show.
     if (mxSlideShow.is() && ! mbIsViewAdded)
     {
-        mxSlideShow->addView(this);
+        Reference<presentation::XSlideShowView> xView (this);
+        mxSlideShow->addView(xView);
+        // Prevent embeded sounds being played twice at the same time by
+        // disabling sound for the new slide show view.
+        beans::PropertyValue aProperty;
+        aProperty.Name = A2S("IsSoundEnabled");
+        Sequence<Any> aValues (2);
+        aValues[0] <<= xView;
+        aValues[1] <<= sal_False;
+        aProperty.Value <<= aValues;
+        mxSlideShow->setProperty(aProperty);
         mbIsViewAdded = true;
     }
 

openoffice.org-3.1.0.ooo100991.pyuno-fix.patch:

Index: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo100991.pyuno-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	16 Apr 2009 08:42:14 -0000	1.2
+++ openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	19 Apr 2009 21:59:48 -0000	1.3
@@ -1,19 +1,12 @@
 --- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
 +++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
-@@ -5,6 +5,7 @@
- import os
- import imp
- import time
-+import platform
- 
- class LogLevel:
-     NONE = 0
-@@ -126,7 +127,67 @@
+@@ -126,7 +126,68 @@
             break
      return code.value
      
 +def toIniName( str ):
-+    if( platform.system() == "Windows" ):
++    # TODO: what is the official way to get to know whether i am on the windows platform ?
++    if( hasattr(sys , "dllhandle") ):
 +        return str + ".ini"
 +    return str + "rc"
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1885
retrieving revision 1.1886
diff -u -r1.1885 -r1.1886
--- openoffice.org.spec	18 Apr 2009 14:51:50 -0000	1.1885
+++ openoffice.org.spec	19 Apr 2009 21:59:48 -0000	1.1886
@@ -138,6 +138,7 @@
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
+Patch66: workspace.slideshow1.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@
 %patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
 %patch64 -p1 -b .ooo101152.solenv.kn.patch
 %patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
+%patch66 -p2 -b .workspace.slideshow1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4127,8 +4129,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Apr 18 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
+* Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
+- Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen
 
 * Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.1
 - closing in on final



From caolanm at fedoraproject.org  Sun Apr 19 22:00:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 19 Apr 2009 22:00:18 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.slideshow1.patch, NONE,
	1.1 openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, 1.2,
	1.3 openoffice.org.spec, 1.1884, 1.1885
Message-ID: <20090419220018.66ACE700F9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31743/F-11

Modified Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
	openoffice.org.spec 
Added Files:
	workspace.slideshow1.patch 
Log Message:
Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen

workspace.slideshow1.patch:

--- NEW FILE workspace.slideshow1.patch ---
Index: cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx
===================================================================
--- cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx	(revision 269949)
@@ -71,6 +71,7 @@
 #include "viewmediashape.hxx"
 #include "mediashape.hxx"
 #include "tools.hxx"
+#include "unoview.hxx"
 
 using namespace ::com::sun::star;
 
@@ -88,12 +89,19 @@
 			mxShape( rxShape ),
 			mxPlayer(),
 			mxPlayerWindow(),
-            mxComponentContext( rxContext )
+            mxComponentContext( rxContext ),
+            mbIsSoundEnabled(true)
         {
             ENSURE_OR_THROW( mxShape.is(), "ViewMediaShape::ViewMediaShape(): Invalid Shape" );
             ENSURE_OR_THROW( mpViewLayer, "ViewMediaShape::ViewMediaShape(): Invalid View" );
             ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewMediaShape::ViewMediaShape(): Invalid ViewLayer canvas" );
             ENSURE_OR_THROW( mxComponentContext.is(), "ViewMediaShape::ViewMediaShape(): Invalid component context" );
+
+            UnoViewSharedPtr pUnoView (::boost::dynamic_pointer_cast<UnoView>(rViewLayer));
+            if (pUnoView)
+            {
+                mbIsSoundEnabled = pUnoView->isSoundEnabled();
+            }
         }
 
 		// ---------------------------------------------------------------------
@@ -352,7 +360,7 @@
 					getPropertyValue( bMute,
                                       rxProps,
                                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Mute" )));
-					mxPlayer->setMute( bMute );
+					mxPlayer->setMute( bMute || !mbIsSoundEnabled);
 
 					sal_Int16 nVolumeDB(0);
 					getPropertyValue( nVolumeDB,
Index: cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx
===================================================================
--- cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx	(revision 269949)
@@ -1451,6 +1451,34 @@
         return (rProperty.Value >>= mbNoSlideTransitions);
     }
     
+    if (rProperty.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsSoundEnabled")))
+    {
+        uno::Sequence<uno::Any> aValues;
+        uno::Reference<presentation::XSlideShowView> xView;
+        sal_Bool bValue;
+        if ((rProperty.Value >>= aValues)
+            && aValues.getLength()==2
+            && (aValues[0] >>= xView)
+            && (aValues[1] >>= bValue))
+        {
+            // Look up the view.
+            for (UnoViewVector::const_iterator
+                     iView (maViewContainer.begin()),
+                     iEnd (maViewContainer.end());
+                 iView!=iEnd;
+                 ++iView)
+            {
+                if (*iView && (*iView)->getUnoView()==xView)
+                {
+                    // Store the flag at the view so that media shapes have
+                    // access to it.
+                    (*iView)->setIsSoundEnabled(bValue);
+                    return true;
+                }
+            }
+        }
+    }
+
     return false;
 }
 
Index: cws/slideshow1/slideshow/source/engine/slideview.cxx
===================================================================
--- cws/slideshow1/slideshow/source/engine/slideview.cxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/engine/slideview.cxx	(revision 269949)
@@ -715,6 +715,8 @@
     // UnoView:
     virtual void _dispose();
     virtual uno::Reference<presentation::XSlideShowView> getUnoView()const;
+    virtual void setIsSoundEnabled (const bool bValue);
+    virtual bool isSoundEnabled (void) const;
 
     // XEventListener:
     virtual void SAL_CALL disposing( lang::EventObject const& evt )
@@ -755,6 +757,7 @@
     
     basegfx::B2DHomMatrix                                     maViewTransform;
     basegfx::B2DSize                                          maUserSize;
+    bool mbIsSoundEnabled;
 };
 
 
@@ -770,7 +773,8 @@
     maViewLayers(),
     maClip(),
     maViewTransform(),
-    maUserSize( 1.0, 1.0 ) // default size: one-by-one rectangle 
+    maUserSize( 1.0, 1.0 ), // default size: one-by-one rectangle 
+    mbIsSoundEnabled(true)
 {
     // take care not constructing any UNO references to this _inside_
     // ctor, shift that code to createSlideView()!    
@@ -1001,6 +1005,16 @@
     return mxView;
 }
 
+void SlideView::setIsSoundEnabled (const bool bValue)
+{
+    mbIsSoundEnabled = bValue;
+}
+
+bool SlideView::isSoundEnabled (void) const
+{
+    return mbIsSoundEnabled;
+}
+
 void SlideView::_dispose()
 {
     dispose();
Index: cws/slideshow1/slideshow/source/inc/unoview.hxx
===================================================================
--- cws/slideshow1/slideshow/source/inc/unoview.hxx	(revision 269948)
+++ cws/slideshow1/slideshow/source/inc/unoview.hxx	(revision 269949)
@@ -68,6 +68,16 @@
                 with a different calling convention under Windows).
              */
             virtual void _dispose() = 0;
+
+            /** Return whether the sound play back is enabled.
+            */
+            virtual bool isSoundEnabled (void) const = 0;
+
+            /** Tell the view whether it may play sounds.  Disabling this
+                can be used to prevent different views to play the same
+                sounds at the same time.
+            */
+            virtual void setIsSoundEnabled (const bool bValue) = 0;
         };
 
         typedef ::boost::shared_ptr< UnoView > 		UnoViewSharedPtr;
Index: cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx
===================================================================
--- cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx	(revision 269950)
+++ cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx	(revision 269951)
@@ -162,7 +162,17 @@
     // Add the new slide show view to the slide show.
     if (mxSlideShow.is() && ! mbIsViewAdded)
     {
-        mxSlideShow->addView(this);
+        Reference<presentation::XSlideShowView> xView (this);
+        mxSlideShow->addView(xView);
+        // Prevent embeded sounds being played twice at the same time by
+        // disabling sound for the new slide show view.
+        beans::PropertyValue aProperty;
+        aProperty.Name = A2S("IsSoundEnabled");
+        Sequence<Any> aValues (2);
+        aValues[0] <<= xView;
+        aValues[1] <<= sal_False;
+        aProperty.Value <<= aValues;
+        mxSlideShow->setProperty(aProperty);
         mbIsViewAdded = true;
     }
 

openoffice.org-3.1.0.ooo100991.pyuno-fix.patch:

Index: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.ooo100991.pyuno-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	16 Apr 2009 08:42:14 -0000	1.2
+++ openoffice.org-3.1.0.ooo100991.pyuno-fix.patch	19 Apr 2009 21:59:45 -0000	1.3
@@ -1,19 +1,12 @@
 --- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
 +++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
-@@ -5,6 +5,7 @@
- import os
- import imp
- import time
-+import platform
- 
- class LogLevel:
-     NONE = 0
-@@ -126,7 +127,67 @@
+@@ -126,7 +126,68 @@
             break
      return code.value
      
 +def toIniName( str ):
-+    if( platform.system() == "Windows" ):
++    # TODO: what is the official way to get to know whether i am on the windows platform ?
++    if( hasattr(sys , "dllhandle") ):
 +        return str + ".ini"
 +    return str + "rc"
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1884
retrieving revision 1.1885
diff -u -r1.1884 -r1.1885
--- openoffice.org.spec	18 Apr 2009 14:51:49 -0000	1.1884
+++ openoffice.org.spec	19 Apr 2009 21:59:45 -0000	1.1885
@@ -138,6 +138,7 @@
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
+Patch66: workspace.slideshow1.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@
 %patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
 %patch64 -p1 -b .ooo101152.solenv.kn.patch
 %patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
+%patch66 -p2 -b .workspace.slideshow1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4127,8 +4129,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Apr 18 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
+* Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
+- Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen
 
 * Fri Apr 17 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.1
 - closing in on final



From caolanm at fedoraproject.org  Sun Apr 19 22:12:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 19 Apr 2009 22:12:37 +0000 (UTC)
Subject: rpms/hunspell-pl/devel .cvsignore, 1.40, 1.41 hunspell-pl.spec, 1.44,
	1.45 sources, 1.40, 1.41
Message-ID: <20090419221237.A4E9D700F9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2691

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	15 Mar 2009 10:14:43 -0000	1.40
+++ .cvsignore	19 Apr 2009 22:12:05 -0000	1.41
@@ -1 +1 @@
-sjp-myspell-pl-20090315.zip
+sjp-myspell-pl-20090419.zip


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- hunspell-pl.spec	15 Mar 2009 10:14:43 -0000	1.44
+++ hunspell-pl.spec	19 Apr 2009 22:12:05 -0000	1.45
@@ -1,6 +1,6 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20090315
+%define upstreamid 20090419
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip
@@ -35,6 +35,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Sun Apr 19 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090419-1
+- latest version
+
 * Sun Mar 15 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090315-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	15 Mar 2009 10:14:43 -0000	1.40
+++ sources	19 Apr 2009 22:12:06 -0000	1.41
@@ -1 +1 @@
-82ec7d629a52eed3830d1af02c6e9781  sjp-myspell-pl-20090315.zip
+783bf8819255a55bbef2c793911c49a7  sjp-myspell-pl-20090419.zip



From mgarski at fedoraproject.org  Sun Apr 19 22:17:32 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sun, 19 Apr 2009 22:17:32 +0000 (UTC)
Subject: rpms/krusader/devel .cvsignore, 1.10, 1.11 krusader.spec, 1.27,
	1.28 sources, 1.10,
	1.11 krusader-2.0.0-beta2-qt-4.5-compile.patch, 1.1, NONE
Message-ID: <20090419221732.6C50C700F9@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/krusader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3677

Modified Files:
	.cvsignore krusader.spec sources 
Removed Files:
	krusader-2.0.0-beta2-qt-4.5-compile.patch 
Log Message:
- Update to final 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Dec 2008 12:46:55 -0000	1.10
+++ .cvsignore	19 Apr 2009 22:17:01 -0000	1.11
@@ -1 +1 @@
-krusader-2.0.0-beta2.tar.gz
+krusader-2.0.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- krusader.spec	15 Mar 2009 17:57:25 -0000	1.27
+++ krusader.spec	19 Apr 2009 22:17:01 -0000	1.28
@@ -1,15 +1,12 @@
-%define beta beta2
-
 Name:		krusader
 Version:	2.0.0
-Release:	0.5.%{beta}%{?dist}
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://krusader.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.gz
-Patch0:		krusader-2.0.0-beta2-qt-4.5-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -32,7 +29,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
-%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -78,7 +74,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README SVNNEWS TODO
+%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING FAQ README SVNNEWS TODO
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/applications/kde4/krusader*.desktop
@@ -90,6 +86,9 @@
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Mon Apr 20 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-1
+- Update to final 2.0.0
+
 * Sun Mar 15 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-0.5.beta2
 - Fix compile error with Qt 4.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Dec 2008 12:46:55 -0000	1.10
+++ sources	19 Apr 2009 22:17:01 -0000	1.11
@@ -1 +1 @@
-88805a863dc51bf723a6307173f7f044  krusader-2.0.0-beta2.tar.gz
+f80f500a136d549739ad5d4bcab7fa5f  krusader-2.0.0.tar.gz


--- krusader-2.0.0-beta2-qt-4.5-compile.patch DELETED ---



From mjakubicek at fedoraproject.org  Sun Apr 19 22:35:48 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 22:35:48 +0000 (UTC)
Subject: rpms/ruby-ldap/devel ruby-ldap-0.9.7-openldap.patch, NONE,
	1.1 ruby-ldap.spec, 1.5, 1.6
Message-ID: <20090419223548.587527013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ruby-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7170/devel

Modified Files:
	ruby-ldap.spec 
Added Files:
	ruby-ldap-0.9.7-openldap.patch 
Log Message:
- Fix FTBFS: Added ruby-ldap-0.9.7-openldap.patch



ruby-ldap-0.9.7-openldap.patch:

--- NEW FILE ruby-ldap-0.9.7-openldap.patch ---
--- ruby-ldap-0.9.7/ldap.c.orig	2009-04-19 23:47:23.000000000 +0200
+++ ruby-ldap-0.9.7/ldap.c	2009-04-19 23:48:30.000000000 +0200
@@ -422,8 +420,8 @@
 #ifdef LDAP_OPT_X_TLS
   rb_ldap_define_opt (LDAP_OPT_X_TLS);
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL);
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_MIN);
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
   rb_ldap_define_opt (LDAP_OPT_X_TLS_CIPHER_SUITE);
--- ruby-ldap-0.9.7/conn.c.orig	2009-04-20 00:10:02.000000000 +0200
+++ ruby-ldap-0.9.7/conn.c	2009-04-20 00:10:19.000000000 +0200
@@ -497,8 +497,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
     case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-    case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+    case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
     case LDAP_OPT_X_TLS_CIPHER_SUITE:
@@ -627,8 +627,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
 	case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-	case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
 	case LDAP_OPT_X_TLS_CIPHER_SUITE:


Index: ruby-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-ldap/devel/ruby-ldap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-ldap.spec	25 Feb 2009 21:24:33 -0000	1.5
+++ ruby-ldap.spec	19 Apr 2009 22:35:16 -0000	1.6
@@ -3,12 +3,15 @@
 
 Name:           ruby-ldap
 Version:        0.9.7 
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Ruby LDAP libraries
 Group:          Development/Languages
 License:        BSD 
 URL:            http://%{name}.sourceforge.net/   
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Filed in upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2775056&group_id=66444&atid=514521
+Patch0:         %{name}-0.9.7-openldap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel openldap-devel openssl-devel 
@@ -25,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 find example/ -type f | xargs %{__chmod} 0644
 
 
@@ -52,6 +56,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.7-8
+- Fix FTBFS: Added ruby-ldap-0.9.7-openldap.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sun Apr 19 22:35:48 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 19 Apr 2009 22:35:48 +0000 (UTC)
Subject: rpms/ruby-ldap/F-11 ruby-ldap-0.9.7-openldap.patch, NONE,
	1.1 ruby-ldap.spec, 1.5, 1.6
Message-ID: <20090419223548.523DC700F9@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ruby-ldap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7170/F-11

Modified Files:
	ruby-ldap.spec 
Added Files:
	ruby-ldap-0.9.7-openldap.patch 
Log Message:
- Fix FTBFS: Added ruby-ldap-0.9.7-openldap.patch



ruby-ldap-0.9.7-openldap.patch:

--- NEW FILE ruby-ldap-0.9.7-openldap.patch ---
--- ruby-ldap-0.9.7/ldap.c.orig	2009-04-19 23:47:23.000000000 +0200
+++ ruby-ldap-0.9.7/ldap.c	2009-04-19 23:48:30.000000000 +0200
@@ -422,8 +420,8 @@
 #ifdef LDAP_OPT_X_TLS
   rb_ldap_define_opt (LDAP_OPT_X_TLS);
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL);
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_MIN);
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
   rb_ldap_define_opt (LDAP_OPT_X_TLS_CIPHER_SUITE);
--- ruby-ldap-0.9.7/conn.c.orig	2009-04-20 00:10:02.000000000 +0200
+++ ruby-ldap-0.9.7/conn.c	2009-04-20 00:10:19.000000000 +0200
@@ -497,8 +497,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
     case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-    case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+    case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
     case LDAP_OPT_X_TLS_CIPHER_SUITE:
@@ -627,8 +627,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
 	case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-	case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
 	case LDAP_OPT_X_TLS_CIPHER_SUITE:


Index: ruby-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-ldap/F-11/ruby-ldap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-ldap.spec	25 Feb 2009 21:24:33 -0000	1.5
+++ ruby-ldap.spec	19 Apr 2009 22:35:14 -0000	1.6
@@ -3,12 +3,15 @@
 
 Name:           ruby-ldap
 Version:        0.9.7 
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Ruby LDAP libraries
 Group:          Development/Languages
 License:        BSD 
 URL:            http://%{name}.sourceforge.net/   
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Filed in upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2775056&group_id=66444&atid=514521
+Patch0:         %{name}-0.9.7-openldap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel openldap-devel openssl-devel 
@@ -25,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 find example/ -type f | xargs %{__chmod} 0644
 
 
@@ -52,6 +56,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.7-8
+- Fix FTBFS: Added ruby-ldap-0.9.7-openldap.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From gd at fedoraproject.org  Sun Apr 19 22:43:32 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sun, 19 Apr 2009 22:43:32 +0000 (UTC)
Subject: rpms/samba/F-11 samba.spec,1.182,1.183
Message-ID: <20090419224332.CD50070137@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9399

Modified Files:
	samba.spec 
Log Message:
Enable build of idmap_tdb2 for clustered setups.

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- samba.spec	1 Apr 2009 13:10:01 -0000	1.182
+++ samba.spec	19 Apr 2009 22:43:02 -0000	1.183
@@ -1,4 +1,4 @@
-%define main_release 34
+%define main_release 35
 %define samba_version 3.3.3
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
@@ -301,7 +301,7 @@
 	--with-configdir=%{_sysconfdir}/samba \
 	--with-pammodulesdir=%{_lib}/security \
 	--with-swatdir=%{_datadir}/swat \
-	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash \
+	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
 	--with-cifsupcall \
 	--with-cluster-support
 
@@ -879,6 +879,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Mon Apr 20 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.35
+- Enable build of idmap_tdb2 for clustered setups
+
 * Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.34
 - Update to 3.3.3
 



From gd at fedoraproject.org  Sun Apr 19 22:44:44 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sun, 19 Apr 2009 22:44:44 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.182,1.183
Message-ID: <20090419224444.35DE8700F9@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10134

Modified Files:
	samba.spec 
Log Message:
Enable build of idmap_tdb2 for clustered setups.

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- samba.spec	1 Apr 2009 13:10:01 -0000	1.182
+++ samba.spec	19 Apr 2009 22:44:13 -0000	1.183
@@ -1,4 +1,4 @@
-%define main_release 34
+%define main_release 35
 %define samba_version 3.3.3
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
@@ -301,7 +301,7 @@
 	--with-configdir=%{_sysconfdir}/samba \
 	--with-pammodulesdir=%{_lib}/security \
 	--with-swatdir=%{_datadir}/swat \
-	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash \
+	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
 	--with-cifsupcall \
 	--with-cluster-support
 
@@ -879,6 +879,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Mon Apr 20 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.35
+- Enable build of idmap_tdb2 for clustered setups
+
 * Wed Apr  1 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.34
 - Update to 3.3.3
 



From mgarski at fedoraproject.org  Sun Apr 19 22:57:20 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sun, 19 Apr 2009 22:57:20 +0000 (UTC)
Subject: rpms/krusader/devel krusader-2.0.0-gcc-4.4.patch, NONE,
	1.1 krusader.spec, 1.28, 1.29
Message-ID: <20090419225720.B7EC3700F9@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/krusader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12218

Modified Files:
	krusader.spec 
Added Files:
	krusader-2.0.0-gcc-4.4.patch 
Log Message:
- Fix GCC 4.4 compile error


krusader-2.0.0-gcc-4.4.patch:

--- NEW FILE krusader-2.0.0-gcc-4.4.patch ---
--- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp.orig	2009-04-11 21:40:15.000000000 +0200
+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp	2009-04-20 00:54:02.000000000 +0200
@@ -37,6 +37,7 @@
 #include <kio/jobuidelegate.h>
 #include <kio/job.h>
 #include <qapplication.h>
+#include <cstdio>
 #include <iostream>
 #include <klocale.h>
 #include "virtualcopyjob.h"


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- krusader.spec	19 Apr 2009 22:17:01 -0000	1.28
+++ krusader.spec	19 Apr 2009 22:56:46 -0000	1.29
@@ -1,12 +1,13 @@
 Name:		krusader
 Version:	2.0.0
-Release:	1%{?dist}
+Release:	1.1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://krusader.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.gz
+Patch0:		krusader-2.0.0-gcc-4.4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -86,7 +88,7 @@
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
-* Mon Apr 20 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-1
+* Mon Apr 20 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-1.1
 - Update to final 2.0.0
 
 * Sun Mar 15 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-0.5.beta2



From mgarski at fedoraproject.org  Sun Apr 19 23:10:16 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sun, 19 Apr 2009 23:10:16 +0000 (UTC)
Subject: rpms/krusader/F-11 .cvsignore, 1.10, 1.11 krusader.spec, 1.27,
	1.28 sources, 1.10,
	1.11 krusader-2.0.0-beta2-qt-4.5-compile.patch, 1.1, NONE
Message-ID: <20090419231016.C95CD700F9@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/krusader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15250

Modified Files:
	.cvsignore krusader.spec sources 
Removed Files:
	krusader-2.0.0-beta2-qt-4.5-compile.patch 
Log Message:
- Update to final 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Dec 2008 12:46:55 -0000	1.10
+++ .cvsignore	19 Apr 2009 23:10:15 -0000	1.11
@@ -1 +1 @@
-krusader-2.0.0-beta2.tar.gz
+krusader-2.0.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-11/krusader.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- krusader.spec	15 Mar 2009 17:57:25 -0000	1.27
+++ krusader.spec	19 Apr 2009 23:10:15 -0000	1.28
@@ -1,15 +1,13 @@
-%define beta beta2
-
 Name:		krusader
 Version:	2.0.0
-Release:	0.5.%{beta}%{?dist}
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://krusader.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.gz
-Patch0:		krusader-2.0.0-beta2-qt-4.5-compile.patch
+Patch0:		krusader-2.0.0-gcc-4.4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -78,7 +76,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README SVNNEWS TODO
+%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING FAQ README SVNNEWS TODO
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/applications/kde4/krusader*.desktop
@@ -90,6 +88,9 @@
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Mon Apr 20 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-1
+- Update to final 2.0.0
+
 * Sun Mar 15 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-0.5.beta2
 - Fix compile error with Qt 4.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Dec 2008 12:46:55 -0000	1.10
+++ sources	19 Apr 2009 23:10:15 -0000	1.11
@@ -1 +1 @@
-88805a863dc51bf723a6307173f7f044  krusader-2.0.0-beta2.tar.gz
+f80f500a136d549739ad5d4bcab7fa5f  krusader-2.0.0.tar.gz


--- krusader-2.0.0-beta2-qt-4.5-compile.patch DELETED ---



From mgarski at fedoraproject.org  Sun Apr 19 23:11:24 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sun, 19 Apr 2009 23:11:24 +0000 (UTC)
Subject: rpms/krusader/F-10 krusader-2.0.0-gcc-4.4.patch, NONE,
	1.1 .cvsignore, 
	1.10, 1.11 krusader.spec, 1.25, 1.26 sources, 1.10, 1.11
Message-ID: <20090419231124.C6184700F9@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/krusader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15443

Modified Files:
	.cvsignore krusader.spec sources 
Added Files:
	krusader-2.0.0-gcc-4.4.patch 
Log Message:
- Update to final 2.0.0


krusader-2.0.0-gcc-4.4.patch:

--- NEW FILE krusader-2.0.0-gcc-4.4.patch ---
--- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp.orig	2009-04-11 21:40:15.000000000 +0200
+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp	2009-04-20 00:54:02.000000000 +0200
@@ -37,6 +37,7 @@
 #include <kio/jobuidelegate.h>
 #include <kio/job.h>
 #include <qapplication.h>
+#include <cstdio>
 #include <iostream>
 #include <klocale.h>
 #include "virtualcopyjob.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Dec 2008 13:44:05 -0000	1.10
+++ .cvsignore	19 Apr 2009 23:10:53 -0000	1.11
@@ -1 +1 @@
-krusader-2.0.0-beta2.tar.gz
+krusader-2.0.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-10/krusader.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- krusader.spec	28 Dec 2008 13:44:05 -0000	1.25
+++ krusader.spec	19 Apr 2009 23:10:54 -0000	1.26
@@ -1,14 +1,13 @@
-%define beta beta2
-
 Name:		krusader
 Version:	2.0.0
-Release:	0.3.%{beta}%{?dist}
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://krusader.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.gz
+Patch0:		krusader-2.0.0-gcc-4.4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -31,6 +30,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -76,7 +76,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README SVNNEWS TODO
+%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING FAQ README SVNNEWS TODO
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/applications/kde4/krusader*.desktop
@@ -88,6 +88,9 @@
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Mon Apr 20 2009 Marcin Garski <mgarski[AT]post.pl> 2.0.0-1
+- Update to final 2.0.0
+
 * Sun Dec 28 2008 Marcin Garski <mgarski[AT]post.pl> 2.0.0-0.3.beta2
 - Update to 2.0.0-beta2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Dec 2008 13:44:05 -0000	1.10
+++ sources	19 Apr 2009 23:10:54 -0000	1.11
@@ -1 +1 @@
-88805a863dc51bf723a6307173f7f044  krusader-2.0.0-beta2.tar.gz
+f80f500a136d549739ad5d4bcab7fa5f  krusader-2.0.0.tar.gz



From mgarski at fedoraproject.org  Sun Apr 19 23:11:41 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sun, 19 Apr 2009 23:11:41 +0000 (UTC)
Subject: rpms/krusader/F-11 krusader-2.0.0-gcc-4.4.patch,NONE,1.1
Message-ID: <20090419231141.E7E02700F9@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/krusader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15630

Added Files:
	krusader-2.0.0-gcc-4.4.patch 
Log Message:
- Fix GCC 4.4 compile error


krusader-2.0.0-gcc-4.4.patch:

--- NEW FILE krusader-2.0.0-gcc-4.4.patch ---
--- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp.orig	2009-04-11 21:40:15.000000000 +0200
+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp	2009-04-20 00:54:02.000000000 +0200
@@ -37,6 +37,7 @@
 #include <kio/jobuidelegate.h>
 #include <kio/job.h>
 #include <qapplication.h>
+#include <cstdio>
 #include <iostream>
 #include <klocale.h>
 #include "virtualcopyjob.h"



From whot at fedoraproject.org  Sun Apr 19 23:34:41 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun, 19 Apr 2009 23:34:41 +0000 (UTC)
Subject: rpms/libXext/F-11 libXext-1.0.99.1-manpage.patch, NONE,
	1.1 libXext-1.0.99.1-silence-xge.patch, NONE,
	1.1 libXext-1.0.99.1-xsync.patch, NONE, 1.1 libXext.spec, 1.25, 1.26
Message-ID: <20090419233442.43B3B700F9@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21823

Modified Files:
	libXext.spec 
Added Files:
	libXext-1.0.99.1-manpage.patch 
	libXext-1.0.99.1-silence-xge.patch 
	libXext-1.0.99.1-xsync.patch 
Log Message:
* Mon Apr 20 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.0.99.1-3
- libXext-1.0.99.1-silence-xge.patch: don't print a warning if XGE is
  missing (#477677).
- libXext-1.0.99.1-manpage.patch: fix XShmCreateImage(3) argument order
- libXext-1.0.99.1-xsync.patch: allocate the right size of counters in
  XSyncListSystemCounters.



libXext-1.0.99.1-manpage.patch:

--- NEW FILE libXext-1.0.99.1-manpage.patch ---
>From cad77b1d6d1a344f2cb31c16401076c003bb97dd Mon Sep 17 00:00:00 2001
From: Imranullah Syed <freakabcd at gmail.com>
Date: Thu, 19 Feb 2009 18:02:26 +1000
Subject: [PATCH 2/2] Corrected order of arguments in man page for function: XShmCreateImage

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 man/XShm.man |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/XShm.man b/man/XShm.man
index 2e37997..64f292c 100644
--- a/man/XShm.man
+++ b/man/XShm.man
@@ -90,10 +90,11 @@ Status XShmDetach(
 XImage *XShmCreateImage (
 	Display *display;
 	Visual *visual;
-	unsigned int depth, width, height;
+	unsigned int depth;
 	int format;
 	char *data;
-	XShmSegmentInfo *shminfo);
+	XShmSegmentInfo *shminfo;
+	unsigned int width, height);
 .LP
 Status XShmPutImage(
 	Display *display;
-- 
1.6.2.2.447.g4afa7


libXext-1.0.99.1-silence-xge.patch:

--- NEW FILE libXext-1.0.99.1-silence-xge.patch ---
>From 8a91fc6f72206362f399b5e29bf3d5f44f4eb822 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 10 Feb 2009 07:45:32 +1000
Subject: [PATCH 1/2] Silence "Generic Event Extension missing on display" warning.

If we're already doing a check anyway, we don't need to print an extra
warning.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/Xge.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/Xge.c b/src/Xge.c
index 90fbce5..6991553 100644
--- a/src/Xge.c
+++ b/src/Xge.c
@@ -161,8 +161,7 @@ cleanup:
 static Bool
 _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info)
 {
-    XextCheckExtension(dpy, info, xge_extension_name, False);
-    return True;
+    return XextHasExtension(info);
 }
 
 
-- 
1.6.2.2.447.g4afa7


libXext-1.0.99.1-xsync.patch:

--- NEW FILE libXext-1.0.99.1-xsync.patch ---
>From f467d17ae5a89aa1a2b8c7260334f41e8ee2d08c Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim at woelders.dk>
Date: Fri, 17 Oct 2008 16:53:29 -0400
Subject: [PATCH] Bug #17774: Allocate the right size in XSyncListSystemCounters.

---
 src/XSync.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/XSync.c b/src/XSync.c
index 61f8600..9f266a5 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -1,4 +1,3 @@
-/* $Xorg: XSync.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
 /*
 
 Copyright 1991, 1993, 1998  The Open Group
@@ -287,11 +286,10 @@ XSyncListSystemCounters(Display *dpy, int *n_counters_return)
 	int replylen;
 	int i;
 
-	list = (XSyncSystemCounter *)Xmalloc(
-			rep.nCounters * sizeof(XSyncSystemCounter));
+	list = Xmalloc(rep.nCounters * sizeof(XSyncSystemCounter));
 	replylen = rep.length << 2;
-	pWireSysCounter = (xSyncSystemCounter *) Xmalloc ((unsigned) replylen + 1);
-                /* +1 to leave room for last null-terminator */
+	pWireSysCounter = Xmalloc ((unsigned) replylen + sizeof(XSyncCounter));
+        /* +1 to leave room for last counter read-ahead */
 
 	if ((!list) || (!pWireSysCounter))
 	{
-- 
1.6.2.2.447.g4afa7



Index: libXext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/F-11/libXext.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libXext.spec	25 Feb 2009 13:18:07 -0000	1.25
+++ libXext.spec	19 Apr 2009 23:34:07 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,6 +10,12 @@
 #Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 Source0: http://cgit.freedesktop.org/xorg/lib/libXext/snapshot/libXext-1.0.99.1.tar.bz2 
 
+# All three cherry-picked from upstream
+Patch1: libXext-1.0.99.1-manpage.patch
+Patch2: libXext-1.0.99.1-silence-xge.patch
+Patch3: libXext-1.0.99.1-xsync.patch
+
+
 BuildRequires: xorg-x11-proto-devel >= 7.1-10
 BuildRequires: libX11-devel
 BuildRequires: libXau-devel
@@ -35,6 +41,9 @@
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 ./autogen.sh
@@ -69,6 +78,13 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 20 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.0.99.1-3
+- libXext-1.0.99.1-silence-xge.patch: don't print a warning if XGE is
+  missing (#477677).
+- libXext-1.0.99.1-manpage.patch: fix XShmCreateImage(3) argument order
+- libXext-1.0.99.1-xsync.patch: allocate the right size of counters in
+  XSyncListSystemCounters.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.99.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hno at fedoraproject.org  Mon Apr 20 00:12:25 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 20 Apr 2009 00:12:25 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.38, 1.39 sources, 1.41,
	1.42 squid.spec, 
	1.117, 1.118 squid-3.0.STABLE13-logfile-syslog.patch, 1.1, NONE
Message-ID: <20090420001225.64C4E70102@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29712

Modified Files:
	.cvsignore sources squid.spec 
Removed Files:
	squid-3.0.STABLE13-logfile-syslog.patch 
Log Message:
3.0.STABLE14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	6 Feb 2009 00:16:24 -0000	1.38
+++ .cvsignore	20 Apr 2009 00:11:52 -0000	1.39
@@ -1 +1 @@
-squid-3.0.STABLE13.tar.bz2
+squid-3.0.STABLE14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	6 Feb 2009 00:16:25 -0000	1.41
+++ sources	20 Apr 2009 00:11:52 -0000	1.42
@@ -1 +1 @@
-37c89c97743a81e5178fbd5d5888b7e2  squid-3.0.STABLE13.tar.bz2
+7aaff2319d2263404d788a82a10c8633  squid-3.0.STABLE14.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- squid.spec	6 Mar 2009 17:44:10 -0000	1.117
+++ squid.spec	20 Apr 2009 00:11:52 -0000	1.118
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE13
-Release:  3%{?dist}
+Version:  3.0.STABLE14
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,8 +20,6 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-# backport of http://www.squid-cache.org/Versions/v3/3.1/b9443.patch until done upstream
-Patch001: squid-3.0.STABLE13-logfile-syslog.patch
 
 # External patches
 
@@ -60,7 +58,6 @@
 %prep
 %setup -q
 
-%patch001 -p1 -b .logfile
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -340,6 +337,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1
+- Upgrade to 3.0.STABLE14
+
 * Fri Mar 06 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE13-2
 - backported logfile.cc syslog parameters patch from 3.1 (b9443.patch)
 - GCC-4.4 workaround in src/wccp2.cc


--- squid-3.0.STABLE13-logfile-syslog.patch DELETED ---



From hno at fedoraproject.org  Mon Apr 20 00:15:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 20 Apr 2009 00:15:45 +0000 (UTC)
Subject: rpms/squid/F-10 .cvsignore, 1.37, 1.38 sources, 1.41,
	1.42 squid.spec, 1.114, 1.115
Message-ID: <20090420001545.16E1670102@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30415

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	29 Jan 2009 22:37:08 -0000	1.37
+++ .cvsignore	20 Apr 2009 00:15:14 -0000	1.38
@@ -1 +1 @@
-squid-3.0.STABLE12.tar.bz2
+squid-3.0.STABLE14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	7 Feb 2009 21:50:19 -0000	1.41
+++ sources	20 Apr 2009 00:15:14 -0000	1.42
@@ -1 +1 @@
-37c89c97743a81e5178fbd5d5888b7e2  squid-3.0.STABLE13.tar.bz2
+7aaff2319d2263404d788a82a10c8633  squid-3.0.STABLE14.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- squid.spec	7 Feb 2009 21:50:19 -0000	1.114
+++ squid.spec	20 Apr 2009 00:15:14 -0000	1.115
@@ -3,7 +3,7 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE13
+Version:  3.0.STABLE14
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -338,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1
+- upgrade to latest upstream
+
 * Thu Feb 5 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 7:3.0.STABLE13-1
 - upgrade to latest upstream
 



From pgordon at fedoraproject.org  Mon Apr 20 00:56:26 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 20 Apr 2009 00:56:26 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore, 1.10, 1.11 midori.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <20090420005627.C715170102@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5912

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Apr 2009 19:36:16 -0000	1.10
+++ .cvsignore	20 Apr 2009 00:55:53 -0000	1.11
@@ -1 +1 @@
-midori-0.1.5.tar.bz2
+midori-0.1.6.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- midori.spec	11 Apr 2009 19:36:16 -0000	1.20
+++ midori.spec	20 Apr 2009 00:55:53 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.5
+Version:	0.1.6
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,6 +103,12 @@
 
 
 %changelog
+* Sun Apr 19 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-1
+- Update to new upstream release (0.1.6): Implements "Clear private data,"
+  "Default" search engine, support "mailto:" links and news feeds with external
+  aggregators, "data:" URIs, and external download manager, and a new Cookie
+  Manager extension. Also fixes several memory leaks and performance bugs.
+
 * Sat Apr 11 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.5-2
 - Update to new upstream release (0.1.5): download support (with WebKitGTK
   1.1.3+), a new "Colorful Tabs" extension, and saving of extension settings.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Apr 2009 19:36:16 -0000	1.10
+++ sources	20 Apr 2009 00:55:53 -0000	1.11
@@ -1 +1 @@
-dccaddeb49d7def8a19cf497cb7eabf8  midori-0.1.5.tar.bz2
+afed64074b2ed195aae171b2178650e1  midori-0.1.6.tar.bz2



From pgordon at fedoraproject.org  Mon Apr 20 00:57:19 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 20 Apr 2009 00:57:19 +0000 (UTC)
Subject: rpms/midori/F-11 .cvsignore, 1.10, 1.11 midori.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <20090420005719.D7A9E70102@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6210

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Apr 2009 19:36:16 -0000	1.10
+++ .cvsignore	20 Apr 2009 00:56:49 -0000	1.11
@@ -1 +1 @@
-midori-0.1.5.tar.bz2
+midori-0.1.6.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- midori.spec	11 Apr 2009 19:36:16 -0000	1.20
+++ midori.spec	20 Apr 2009 00:56:49 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.5
+Version:	0.1.6
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,6 +103,12 @@
 
 
 %changelog
+* Sun Apr 19 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-1
+- Update to new upstream release (0.1.6): Implements "Clear private data,"
+  "Default" search engine, support "mailto:" links and news feeds with external
+  aggregators, "data:" URIs, and external download manager, and a new Cookie
+  Manager extension. Also fixes several memory leaks and performance bugs.
+
 * Sat Apr 11 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.5-2
 - Update to new upstream release (0.1.5): download support (with WebKitGTK
   1.1.3+), a new "Colorful Tabs" extension, and saving of extension settings.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Apr 2009 19:36:16 -0000	1.10
+++ sources	20 Apr 2009 00:56:49 -0000	1.11
@@ -1 +1 @@
-dccaddeb49d7def8a19cf497cb7eabf8  midori-0.1.5.tar.bz2
+afed64074b2ed195aae171b2178650e1  midori-0.1.6.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 01:59:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 01:59:47 +0000 (UTC)
Subject: rpms/libxfce4util/devel libxfce4util.spec, 1.27, 1.28 sources, 1.15,
	1.16 .cvsignore, 1.15, 1.16
Message-ID: <20090420015947.58EE670102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19072

Modified Files:
	libxfce4util.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libxfce4util.spec	2 Mar 2009 20:07:10 -0000	1.27
+++ libxfce4util.spec	20 Apr 2009 01:59:12 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfce4util-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %doc %{_datadir}/gtk-doc/html/libxfce4util/
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Make devel package require pkgconfig and gtk-doc
 - Mark gtk-doc files as %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	27 Feb 2009 19:51:34 -0000	1.15
+++ sources	20 Apr 2009 01:59:13 -0000	1.16
@@ -1 +1 @@
-2b0b7cdb4516704940eedf11edc94d5e  libxfce4util-4.6.0.tar.bz2
+eac51d58179cbcadc3f802450a8ec9cd  libxfce4util-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Feb 2009 19:51:34 -0000	1.15
+++ .cvsignore	20 Apr 2009 01:59:13 -0000	1.16
@@ -1 +1 @@
-libxfce4util-4.6.0.tar.bz2
+libxfce4util-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:01:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:01:31 +0000 (UTC)
Subject: rpms/xfconf/devel sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 xfconf.spec,
	1.10, 1.11
Message-ID: <20090420020131.6805D70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19633

Modified Files:
	sources .cvsignore xfconf.spec 
Log Message:
Update to 4.6.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 19:55:03 -0000	1.5
+++ sources	20 Apr 2009 02:01:29 -0000	1.6
@@ -1 +1 @@
-38595f78379eb1f456e97b393fdafd20  xfconf-4.6.0.tar.bz2
+d4d3018767ea9eb4b57cc57d4038023b  xfconf-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 19:55:03 -0000	1.5
+++ .cvsignore	20 Apr 2009 02:01:29 -0000	1.6
@@ -1 +1 @@
-xfconf-4.6.0.tar.bz2
+xfconf-4.6.1.tar.bz2


Index: xfconf.spec
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfconf.spec	2 Mar 2009 20:18:21 -0000	1.10
+++ xfconf.spec	20 Apr 2009 02:01:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xfconf
-Version:        4.6.0
-Release:        2%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -111,6 +111,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Move gtk-doc into devel package and mark it %%doc



From kevin at fedoraproject.org  Mon Apr 20 02:03:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:03:39 +0000 (UTC)
Subject: rpms/libxfcegui4/devel sources, 1.14, 1.15 .cvsignore, 1.14,
	1.15 libxfcegui4.spec, 1.34, 1.35
Message-ID: <20090420020339.F187B70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20164

Modified Files:
	sources .cvsignore libxfcegui4.spec 
Log Message:
Update to 4.6.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 19:58:21 -0000	1.14
+++ sources	20 Apr 2009 02:03:09 -0000	1.15
@@ -1 +1 @@
-8627ae4fad26289f55f0afbebe238bf5  libxfcegui4-4.6.0.tar.bz2
+539cff747634b8ee6f0d2362ee78a286  libxfcegui4-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 19:58:21 -0000	1.14
+++ .cvsignore	20 Apr 2009 02:03:09 -0000	1.15
@@ -1 +1 @@
-libxfcegui4-4.6.0.tar.bz2
+libxfcegui4-4.6.1.tar.bz2


Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libxfcegui4.spec	2 Mar 2009 20:54:41 -0000	1.34
+++ libxfcegui4.spec	20 Apr 2009 02:03:09 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.6.0
-Release: 3%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfcegui4-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
 - Patch to bring back missing keyboard shortcuts from Xfce 4.4
 - Make devel package require glade3-libgladeui-devel, pkgconfig and gtk-doc



From kevin at fedoraproject.org  Mon Apr 20 02:06:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:06:20 +0000 (UTC)
Subject: rpms/libxfce4menu/devel libxfce4menu.spec, 1.6, 1.7 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090420020621.00A5070102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4menu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20850

Modified Files:
	libxfce4menu.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: libxfce4menu.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/libxfce4menu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libxfce4menu.spec	2 Mar 2009 21:00:22 -0000	1.6
+++ libxfce4menu.spec	20 Apr 2009 02:05:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libxfce4menu
-Version:        4.6.0
-Release:        2%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        A freedesktop.org compliant menu implementation for Xfce
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 %{_libdir}/pkgconfig/%{name}-0.1.pc
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Mark gtk-doc files as %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 20:01:12 -0000	1.5
+++ sources	20 Apr 2009 02:05:49 -0000	1.6
@@ -1 +1 @@
-ff7f75ffa33debd3495b1156a55828a8  libxfce4menu-4.6.0.tar.bz2
+5dc9343885c2c6f931318b2a1cdcc9db  libxfce4menu-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 20:01:12 -0000	1.5
+++ .cvsignore	20 Apr 2009 02:05:49 -0000	1.6
@@ -1 +1 @@
-libxfce4menu-4.6.0.tar.bz2
+libxfce4menu-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:09:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:09:10 +0000 (UTC)
Subject: rpms/exo/devel exo.spec, 1.34, 1.35 sources, 1.11, 1.12 .cvsignore, 
	1.11, 1.12
Message-ID: <20090420020910.DCD1570102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21646

Modified Files:
	exo.spec sources .cvsignore 
Log Message:
Update to 0.3.101



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- exo.spec	2 Mar 2009 21:10:51 -0000	1.34
+++ exo.spec	20 Apr 2009 02:08:40 -0000	1.35
@@ -2,13 +2,13 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.100
-Release: 2%{?dist}
+Version: 0.3.101
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.0/src/exo-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,6 +134,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-1
+- Update to 0.3.101
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.100-2
 - Fix directory ownership problems
 - Move exo-csource into devel package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Feb 2009 20:06:13 -0000	1.11
+++ sources	20 Apr 2009 02:08:40 -0000	1.12
@@ -1 +1 @@
-ebded97ff55f43cd0fe6b16242992ecf  exo-0.3.100.tar.bz2
+1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Feb 2009 20:06:13 -0000	1.11
+++ .cvsignore	20 Apr 2009 02:08:40 -0000	1.12
@@ -1 +1 @@
-exo-0.3.100.tar.bz2
+exo-0.3.101.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:18:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:18:07 +0000 (UTC)
Subject: rpms/Thunar/devel Thunar.spec, 1.23, 1.24 sources, 1.10,
	1.11 .cvsignore, 1.10, 1.11
Message-ID: <20090420021807.831AC70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24053

Modified Files:
	Thunar.spec sources .cvsignore 
Log Message:
Update to 1.0.1



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Thunar.spec	27 Feb 2009 20:14:57 -0000	1.23
+++ Thunar.spec	20 Apr 2009 02:17:36 -0000	1.24
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.0/src/Thunar-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
 Source1: thunar-sendto-bluetooth.desktop
 Source2: thunar-sendto-audacious-playlist.desktop
 Group: User Interface/Desktops
@@ -198,6 +198,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 1.0.1-1
+- Update to 1.0.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.0.0-1
 - Update to 1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Feb 2009 20:14:57 -0000	1.10
+++ sources	20 Apr 2009 02:17:36 -0000	1.11
@@ -1 +1 @@
-468c240a4f65a217ec2b6132e85cd84e  Thunar-1.0.0.tar.bz2
+218373aa45d74b6ba8c69c4d5af3bb19  Thunar-1.0.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Feb 2009 20:14:57 -0000	1.10
+++ .cvsignore	20 Apr 2009 02:17:36 -0000	1.11
@@ -1 +1 @@
-Thunar-1.0.0.tar.bz2
+Thunar-1.0.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:20:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:20:21 +0000 (UTC)
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, 1.23, 1.24 sources,
	1.14, 1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090420022021.11EDD70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24850

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfce4-appfinder.spec	2 Mar 2009 21:58:42 -0000	1.23
+++ xfce4-appfinder.spec	20 Apr 2009 02:20:16 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -55,6 +55,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:18:08 -0000	1.14
+++ sources	20 Apr 2009 02:20:19 -0000	1.15
@@ -1 +1 @@
-414b20e3569130348d96b0e74c7d1f3f  xfce4-appfinder-4.6.0.tar.bz2
+a1bc7d88100cfd92714a300be531589b  xfce4-appfinder-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:18:08 -0000	1.14
+++ .cvsignore	20 Apr 2009 02:20:19 -0000	1.15
@@ -1 +1 @@
-xfce4-appfinder-4.6.0.tar.bz2
+xfce4-appfinder-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:22:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:22:48 +0000 (UTC)
Subject: rpms/xfce4-session/devel xfce4-session.spec, 1.27, 1.28 sources,
	1.14, 1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090420022248.2CA8E70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25508

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xfce4-session.spec	27 Feb 2009 20:20:54 -0000	1.27
+++ xfce4-session.spec	20 Apr 2009 02:22:17 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -124,6 +124,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 - Remove some unneeded BuildRequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:20:54 -0000	1.14
+++ sources	20 Apr 2009 02:22:17 -0000	1.15
@@ -1 +1 @@
-79a08c3696196ef31fc8185658316706  xfce4-session-4.6.0.tar.bz2
+7628be41ed3511a20cff5673d9d39858  xfce4-session-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:20:54 -0000	1.14
+++ .cvsignore	20 Apr 2009 02:22:17 -0000	1.15
@@ -1 +1 @@
-xfce4-session-4.6.0.tar.bz2
+xfce4-session-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:24:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:24:58 +0000 (UTC)
Subject: rpms/xfce-utils/devel xfce-utils.spec, 1.29, 1.30 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090420022458.6E50470102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26077

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfce-utils.spec	2 Mar 2009 21:26:37 -0000	1.29
+++ xfce-utils.spec	20 Apr 2009 02:24:57 -0000	1.30
@@ -2,8 +2,8 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2
@@ -128,6 +128,9 @@
 %doc %{_datadir}/xfce4/doc/xfce-chunk.css
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Make separate xfce4-doc package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:23:10 -0000	1.14
+++ sources	20 Apr 2009 02:24:57 -0000	1.15
@@ -1 +1 @@
-b192940801a7bd9bb800e570a299ecde  xfce-utils-4.6.0.tar.bz2
+1aa2362b11e79e56d52ce0d265faf1b6  xfce-utils-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:23:10 -0000	1.14
+++ .cvsignore	20 Apr 2009 02:24:57 -0000	1.15
@@ -1 +1 @@
-xfce-utils-4.6.0.tar.bz2
+xfce-utils-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:27:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:27:05 +0000 (UTC)
Subject: rpms/xfwm4/devel sources, 1.15, 1.16 .cvsignore, 1.15,
	1.16 xfwm4.spec, 1.33, 1.34
Message-ID: <20090420022705.227FB7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26576

Modified Files:
	sources .cvsignore xfwm4.spec 
Log Message:
Update to 4.6.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	27 Feb 2009 20:29:37 -0000	1.15
+++ sources	20 Apr 2009 02:26:34 -0000	1.16
@@ -1 +1 @@
-83cd2f82f2fabfe4ab28a9780fbf309e  xfwm4-4.6.0.tar.bz2
+538ff2554a23bf877d336e573884da9a  xfwm4-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Feb 2009 20:29:37 -0000	1.15
+++ .cvsignore	20 Apr 2009 02:26:34 -0000	1.16
@@ -1 +1 @@
-xfwm4-4.6.0.tar.bz2
+xfwm4-4.6.1.tar.bz2


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xfwm4.spec	13 Apr 2009 20:31:16 -0000	1.33
+++ xfwm4.spec	20 Apr 2009 02:26:34 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
@@ -72,6 +72,9 @@
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Require xfce4-doc



From kevin at fedoraproject.org  Mon Apr 20 02:28:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:28:59 +0000 (UTC)
Subject: rpms/xfce4-panel/devel xfce4-panel.spec, 1.36, 1.37 sources, 1.14, 
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090420022859.A5D247013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27440

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xfce4-panel.spec	2 Mar 2009 23:54:22 -0000	1.36
+++ xfce4-panel.spec	20 Apr 2009 02:28:28 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
@@ -125,6 +125,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Require xfce4-doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:33:29 -0000	1.14
+++ sources	20 Apr 2009 02:28:29 -0000	1.15
@@ -1 +1 @@
-b4c7cce05cc858d11c9dcd4c2f8dbfdb  xfce4-panel-4.6.0.tar.bz2
+73a366b9892152266b465d7d9c35bef4  xfce4-panel-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:33:29 -0000	1.14
+++ .cvsignore	20 Apr 2009 02:28:29 -0000	1.15
@@ -1 +1 @@
-xfce4-panel-4.6.0.tar.bz2
+xfce4-panel-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 02:30:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:30:26 +0000 (UTC)
Subject: rpms/xfce4-mixer/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 xfce4-mixer.spec, 1.25, 1.26
Message-ID: <20090420023026.4636470102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28179

Modified Files:
	.cvsignore sources xfce4-mixer.spec 
Log Message:
Update to 4.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Feb 2009 20:36:12 -0000	1.13
+++ .cvsignore	20 Apr 2009 02:29:55 -0000	1.14
@@ -1 +1 @@
-xfce4-mixer-4.6.0.tar.bz2
+xfce4-mixer-4.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Feb 2009 20:36:12 -0000	1.13
+++ sources	20 Apr 2009 02:29:55 -0000	1.14
@@ -1 +1 @@
-ee7956a73efe43da4b27ad9cd1f4d20b  xfce4-mixer-4.6.0.tar.bz2
+a99e2455445480ef5081fe69454a46fc  xfce4-mixer-4.6.1.tar.bz2


Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xfce4-mixer.spec	27 Feb 2009 20:36:12 -0000	1.25
+++ xfce4-mixer.spec	20 Apr 2009 02:29:55 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -67,6 +67,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 



From kevin at fedoraproject.org  Mon Apr 20 02:32:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:32:49 +0000 (UTC)
Subject: rpms/xfdesktop/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 xfdesktop.spec, 1.33, 1.34
Message-ID: <20090420023249.E6FA770102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28706

Modified Files:
	sources .cvsignore xfdesktop.spec 
Log Message:
Update to 4.6.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Feb 2009 20:41:49 -0000	1.12
+++ sources	20 Apr 2009 02:32:19 -0000	1.13
@@ -1 +1 @@
-508b18f9d4ef27833517bba3bd6e2fbf  xfdesktop-4.6.0.tar.bz2
+ae15cacc3e3834cca7238a8e1035c50d  xfdesktop-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Feb 2009 20:41:49 -0000	1.12
+++ .cvsignore	20 Apr 2009 02:32:19 -0000	1.13
@@ -1 +1 @@
-xfdesktop-4.6.0.tar.bz2
+xfdesktop-4.6.1.tar.bz2


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xfdesktop.spec	13 Apr 2009 20:52:25 -0000	1.33
+++ xfdesktop.spec	20 Apr 2009 02:32:19 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.6.0
-Release: 4%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -90,6 +90,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
 - Exclude gnome-default-applications from menu to avoid duplicates (#488558)
 



From kevin at fedoraproject.org  Mon Apr 20 02:53:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 02:53:12 +0000 (UTC)
Subject: rpms/xfce4-settings/devel sources, 1.5, 1.6 .cvsignore, 1.5,
	1.6 xfce4-settings.spec, 1.12,
	1.13 xfce4-settings-4.6.0-randr.patch, 1.1, NONE
Message-ID: <20090420025312.29AAE70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31940

Modified Files:
	sources .cvsignore xfce4-settings.spec 
Removed Files:
	xfce4-settings-4.6.0-randr.patch 
Log Message:
Update to 4.6.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 20:09:27 -0000	1.5
+++ sources	20 Apr 2009 02:52:40 -0000	1.6
@@ -1 +1 @@
-ac538c4ab32e3a91f4567141adc3c898  xfce4-settings-4.6.0.tar.bz2
+dc1c8704471c5b0104fa10c30eb60cb6  xfce4-settings-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 20:09:27 -0000	1.5
+++ .cvsignore	20 Apr 2009 02:52:40 -0000	1.6
@@ -1 +1 @@
-xfce4-settings-4.6.0.tar.bz2
+xfce4-settings-4.6.1.tar.bz2


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-settings.spec	16 Apr 2009 21:37:50 -0000	1.12
+++ xfce4-settings.spec	20 Apr 2009 02:52:40 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
-Version:        4.6.0
-Release:        6%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
-Patch1:		xfce4-settings-4.6.0-randr.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .xrandr
 %patch10 -p1 -b .vendor
 
 %build
@@ -111,6 +109,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Apr 16 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-6
 - Have to add Antialias type to really enable by default. 
 


--- xfce4-settings-4.6.0-randr.patch DELETED ---



From kevin at fedoraproject.org  Mon Apr 20 03:07:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 03:07:25 +0000 (UTC)
Subject: rpms/Terminal/devel Terminal.spec, 1.24, 1.25 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <20090420030726.3B28170102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2932

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.2.12



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Terminal.spec	23 Feb 2009 23:38:06 -0000	1.24
+++ Terminal.spec	20 Apr 2009 03:06:54 -0000	1.25
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.8.3
-Release: 2%{?dist}
+Version: 0.2.12
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/Terminal-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Terminal-%{version}.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -62,6 +62,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-1
+- Update to 0.2.12
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Oct 2008 15:39:49 -0000	1.8
+++ sources	20 Apr 2009 03:06:54 -0000	1.9
@@ -1 +1 @@
-38af7a51955f6dbb0ecd6d7b882805a1  Terminal-0.2.8.3.tar.bz2
+adb419d279c9fc16d02291c052190717  Terminal-0.2.12.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Oct 2008 15:39:49 -0000	1.8
+++ .cvsignore	20 Apr 2009 03:06:54 -0000	1.9
@@ -1 +1 @@
-Terminal-0.2.8.3.tar.bz2
+Terminal-0.2.12.tar.bz2



From cweyl at fedoraproject.org  Mon Apr 20 04:27:16 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 20 Apr 2009 04:27:16 +0000 (UTC)
Subject: rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel .cvsignore, 1.2, 
	1.3 perl-MooseX-Emulate-Class-Accessor-Fast.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090420042717.2048070102@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20328

Modified Files:
	.cvsignore perl-MooseX-Emulate-Class-Accessor-Fast.spec 
	sources 
Log Message:
* Sun Apr 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00801-1
- update to 0.00801



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Feb 2009 23:20:09 -0000	1.2
+++ .cvsignore	20 Apr 2009 04:26:44 -0000	1.3
@@ -1 +1 @@
-MooseX-Emulate-Class-Accessor-Fast-0.00800.tar.gz
+MooseX-Emulate-Class-Accessor-Fast-0.00801.tar.gz


Index: perl-MooseX-Emulate-Class-Accessor-Fast.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/perl-MooseX-Emulate-Class-Accessor-Fast.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MooseX-Emulate-Class-Accessor-Fast.spec	26 Feb 2009 22:22:19 -0000	1.2
+++ perl-MooseX-Emulate-Class-Accessor-Fast.spec	20 Apr 2009 04:26:44 -0000	1.3
@@ -1,12 +1,12 @@
 Name:       perl-MooseX-Emulate-Class-Accessor-Fast 
-Version:    0.00800 
-Release:    2%{?dist}
+Version:        0.00801
+Release:        1%{?dist}
 # lib/MooseX/Adopt/Class/Accessor/Fast.pm -> GPL+ or Artistic
 # lib/MooseX/Emulate/Class/Accessor/Fast.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Emulate Class::Accessor::Fast behavior using Moose attributes 
-Source:     http://search.cpan.org/CPAN/authors/id/G/GR/GRODITI/MooseX-Emulate-Class-Accessor-Fast-%{version}.tar.gz 
+Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/MooseX-Emulate-Class-Accessor-Fast-%{version}.tar.gz 
 Url:        http://search.cpan.org/dist/MooseX-Emulate-Class-Accessor-Fast
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Apr 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00801-1
+- update to 0.00801
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.00800-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Feb 2009 23:20:09 -0000	1.2
+++ sources	20 Apr 2009 04:26:44 -0000	1.3
@@ -1 +1 @@
-050c85f8f30584bcfafe4f96af4d9ef0  MooseX-Emulate-Class-Accessor-Fast-0.00800.tar.gz
+a6811b85067df2e12fde0a6d0289cc36  MooseX-Emulate-Class-Accessor-Fast-0.00801.tar.gz



From kushal at fedoraproject.org  Mon Apr 20 06:07:35 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Mon, 20 Apr 2009 06:07:35 +0000 (UTC)
Subject: rpms/python-chardet/F-10 python-chardet.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090420060735.6435470102@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-chardet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506

Modified Files:
	sources 
Added Files:
	python-chardet.spec 
Log Message:
Importing for F10



--- NEW FILE python-chardet.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-chardet
Version:        1.0.1
Release:        1%{?dist}
Summary:        Character encoding auto-detection in Python

Group:          Development/Languages
License:        LGPLv2
URL:            http://chardet.feedparser.org
Source0:        http://chardet.feedparser.org/download/chardet-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Character encoding auto-detection in Python. As 
smart as your browser. Open source.

%prep
%setup -q -n chardet-%{version}



%build
# Remove CFLAGS=... for noarch packages (unneeded)
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod -x COPYING
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
# For noarch packages: sitelib
%{python_sitelib}/*


%changelog
* Mon Aug 04 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1
- Initial release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Aug 2008 16:27:29 -0000	1.1
+++ sources	20 Apr 2009 06:07:03 -0000	1.2
@@ -0,0 +1 @@
+f8c510a6fac300fe0ac9a0c24a76a7ba  chardet-1.0.1.tgz



From kushal at fedoraproject.org  Mon Apr 20 06:17:25 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Mon, 20 Apr 2009 06:17:25 +0000 (UTC)
Subject: rpms/python-chardet/F-10 python-chardet.spec,1.1,1.2
Message-ID: <20090420061725.9737770102@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-chardet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12422

Modified Files:
	python-chardet.spec 
Log Message:
New spec



Index: python-chardet.spec
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/F-10/python-chardet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-chardet.spec	20 Apr 2009 06:07:03 -0000	1.1
+++ python-chardet.spec	20 Apr 2009 06:16:55 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-chardet
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Character encoding auto-detection in Python
 
 Group:          Development/Languages
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 20 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1.1
+- bumping the tag due worng cvs tag
+
 * Mon Aug 04 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1
 - Initial release
 



From mmaslano at fedoraproject.org  Mon Apr 20 06:23:33 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 06:23:33 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.6, 1.7 perl-DBD-SQLite.spec,
	1.22, 1.23 sources, 1.6, 1.7
Message-ID: <20090420062333.6AF2770102@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13982

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Log Message:
* Mon Apr 20 2008 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
- update to the latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Dec 2007 19:44:47 -0000	1.6
+++ .cvsignore	20 Apr 2009 06:23:02 -0000	1.7
@@ -1 +1 @@
-DBD-SQLite-1.14.tar.gz
+DBD-SQLite-1.23.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-DBD-SQLite.spec	26 Feb 2009 14:09:01 -0000	1.22
+++ perl-DBD-SQLite.spec	20 Apr 2009 06:23:02 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
-Version:        1.14
-Release:        9%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Apr 20 2008 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
+- update to the latest version
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Dec 2007 19:44:47 -0000	1.6
+++ sources	20 Apr 2009 06:23:02 -0000	1.7
@@ -1 +1 @@
-78a89cc8fd46bb2a5d537433dcccc8e6  DBD-SQLite-1.14.tar.gz
+3fb6d567a507b4f347d56a6ba38966d0  DBD-SQLite-1.23.tar.gz



From mmaslano at fedoraproject.org  Mon Apr 20 06:29:11 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 06:29:11 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/F-10 perl-DBD-SQLite.spec,1.21,1.22
Message-ID: <20090420062911.1CB1C70102@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15322

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
* Mon Apr 20 2009 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
- update to the latest version



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-10/perl-DBD-SQLite.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-DBD-SQLite.spec	2 Jun 2008 08:13:18 -0000	1.21
+++ perl-DBD-SQLite.spec	20 Apr 2009 06:28:40 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
-Version:        1.14
-Release:        8%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
+- update to the latest version
+
 * Mon Jun  2 2008 Marcela Maslanova <mmaslano at redhat.com> 1.14-8
 
 * Wed Mar 19 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.14-7



From mmaslano at fedoraproject.org  Mon Apr 20 06:29:20 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 06:29:20 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.23,1.24
Message-ID: <20090420062920.B152470102@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15362

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
* Mon Apr 20 2009 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
- update to the latest version



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-DBD-SQLite.spec	20 Apr 2009 06:23:02 -0000	1.23
+++ perl-DBD-SQLite.spec	20 Apr 2009 06:28:50 -0000	1.24
@@ -68,7 +68,7 @@
 
 
 %changelog
-* Mon Apr 20 2008 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
+* Mon Apr 20 2009 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
 - update to the latest version
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-9



From kushal at fedoraproject.org  Mon Apr 20 06:29:59 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Mon, 20 Apr 2009 06:29:59 +0000 (UTC)
Subject: rpms/python-chardet/F-10 python-chardet.spec,1.2,1.3
Message-ID: <20090420062959.3952370102@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-chardet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15236

Modified Files:
	python-chardet.spec 
Log Message:
Fixed the wrong date in changelog



Index: python-chardet.spec
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/F-10/python-chardet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-chardet.spec	20 Apr 2009 06:16:55 -0000	1.2
+++ python-chardet.spec	20 Apr 2009 06:29:28 -0000	1.3
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Kushal Das <kushal at fedoraproject.org> 1.0.1-1.1
+- fixing changelog
+
 * Mon Apr 20 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1.1
 - bumping the tag due worng cvs tag
 



From kushal at fedoraproject.org  Mon Apr 20 06:32:50 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Mon, 20 Apr 2009 06:32:50 +0000 (UTC)
Subject: rpms/python-chardet/F-10 python-chardet.spec,1.3,1.4
Message-ID: <20090420063250.D9EB370102@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-chardet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16092

Modified Files:
	python-chardet.spec 
Log Message:
Removed that wrong changelog so that the package builds 



Index: python-chardet.spec
===================================================================
RCS file: /cvs/extras/rpms/python-chardet/F-10/python-chardet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-chardet.spec	20 Apr 2009 06:29:28 -0000	1.3
+++ python-chardet.spec	20 Apr 2009 06:32:20 -0000	1.4
@@ -50,9 +50,6 @@
 * Mon Apr 20 2009 Kushal Das <kushal at fedoraproject.org> 1.0.1-1.1
 - fixing changelog
 
-* Mon Apr 20 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1.1
-- bumping the tag due worng cvs tag
-
 * Mon Aug 04 2008 Kushal Das <kushal at fedoraproject.org> 1.0.1-1
 - Initial release
 



From mmaslano at fedoraproject.org  Mon Apr 20 06:50:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 06:50:07 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.24,1.25
Message-ID: <20090420065007.3EC3370102@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19807

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
Remove useles patch.



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-DBD-SQLite.spec	20 Apr 2009 06:28:50 -0000	1.24
+++ perl-DBD-SQLite.spec	20 Apr 2009 06:49:36 -0000	1.25
@@ -9,9 +9,6 @@
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# see http://rt.cpan.org/Public/Bug/Display.html?id=30558
-Patch0:         rt32100.patch
-
 BuildRequires:  perl-DBI >= 1.03
 # if sqlite >= 3.1.3 then
 #   perl-DBD-SQLite uses the external library
@@ -34,7 +31,6 @@
 
 %prep
 %setup -q -n DBD-SQLite-%{version}
-%patch0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor



From mmaslano at fedoraproject.org  Mon Apr 20 06:51:56 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 06:51:56 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/F-10 perl-DBD-SQLite.spec, 1.22,
	1.23 rt32100.patch, 1.1, NONE
Message-ID: <20090420065156.873EE70102@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20203

Modified Files:
	perl-DBD-SQLite.spec 
Removed Files:
	rt32100.patch 
Log Message:
Remove useles patch.



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-10/perl-DBD-SQLite.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-DBD-SQLite.spec	20 Apr 2009 06:28:40 -0000	1.22
+++ perl-DBD-SQLite.spec	20 Apr 2009 06:51:25 -0000	1.23
@@ -9,9 +9,6 @@
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# see http://rt.cpan.org/Public/Bug/Display.html?id=30558
-Patch0:         rt32100.patch
-
 BuildRequires:  perl-DBI >= 1.03
 # if sqlite >= 3.1.3 then
 #   perl-DBD-SQLite uses the external library
@@ -34,7 +31,6 @@
 
 %prep
 %setup -q -n DBD-SQLite-%{version}
-%patch0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor


--- rt32100.patch DELETED ---



From mmaslano at fedoraproject.org  Mon Apr 20 07:12:41 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 07:12:41 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.25,1.26
Message-ID: <20090420071241.4C49970137@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23437

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
Missing BR.



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-DBD-SQLite.spec	20 Apr 2009 06:49:36 -0000	1.25
+++ perl-DBD-SQLite.spec	20 Apr 2009 07:12:10 -0000	1.26
@@ -16,6 +16,7 @@
 #   perl-DBD-SQLite is self-contained (uses the sqlite local copy)
 BuildRequires:  sqlite-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From mmaslano at fedoraproject.org  Mon Apr 20 07:23:11 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 20 Apr 2009 07:23:11 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/F-10 perl-DBD-SQLite.spec,1.23,1.24
Message-ID: <20090420072311.C55C970102@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26275

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
Missing BR.



Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-10/perl-DBD-SQLite.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-DBD-SQLite.spec	20 Apr 2009 06:51:25 -0000	1.23
+++ perl-DBD-SQLite.spec	20 Apr 2009 07:22:41 -0000	1.24
@@ -16,6 +16,7 @@
 #   perl-DBD-SQLite is self-contained (uses the sqlite local copy)
 BuildRequires:  sqlite-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::Most)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From caolanm at fedoraproject.org  Mon Apr 20 07:23:19 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 20 Apr 2009 07:23:19 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.slideshow1.patch,1.1,1.2
Message-ID: <20090420072319.EA33D70102@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26460/devel

Modified Files:
	workspace.slideshow1.patch 
Log Message:
missing bit

workspace.slideshow1.patch:

Index: workspace.slideshow1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.slideshow1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.slideshow1.patch	19 Apr 2009 21:59:48 -0000	1.1
+++ workspace.slideshow1.patch	20 Apr 2009 07:23:19 -0000	1.2
@@ -171,3 +171,15 @@
          mbIsViewAdded = true;
      }
  
+Index: cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx
+===================================================================
+--- cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx	(revision 270163)
++++ cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx	(revision 270164)
+@@ -166,6 +166,7 @@
+ 			::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >		mxPlayer;
+ 			::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >	mxPlayerWindow;
+             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>	mxComponentContext;
++            bool mbIsSoundEnabled;
+ 		};
+ 
+         typedef ::boost::shared_ptr< ViewMediaShape > ViewMediaShapeSharedPtr;



From caolanm at fedoraproject.org  Mon Apr 20 07:23:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 20 Apr 2009 07:23:49 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.slideshow1.patch,1.1,1.2
Message-ID: <20090420072349.97BC670102@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26460/F-11

Modified Files:
	workspace.slideshow1.patch 
Log Message:
missing bit

workspace.slideshow1.patch:

Index: workspace.slideshow1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.slideshow1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.slideshow1.patch	19 Apr 2009 21:59:47 -0000	1.1
+++ workspace.slideshow1.patch	20 Apr 2009 07:23:19 -0000	1.2
@@ -171,3 +171,15 @@
          mbIsViewAdded = true;
      }
  
+Index: cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx
+===================================================================
+--- cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx	(revision 270163)
++++ cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx	(revision 270164)
+@@ -166,6 +166,7 @@
+ 			::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >		mxPlayer;
+ 			::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >	mxPlayerWindow;
+             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>	mxComponentContext;
++            bool mbIsSoundEnabled;
+ 		};
+ 
+         typedef ::boost::shared_ptr< ViewMediaShape > ViewMediaShapeSharedPtr;



From lucilanga at fedoraproject.org  Mon Apr 20 07:31:45 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 20 Apr 2009 07:31:45 +0000 (UTC)
Subject: rpms/drascula/F-11 drascula.dat,1.1,NONE
Message-ID: <20090420073145.67B6E70102@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/drascula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28054

Removed Files:
	drascula.dat 
Log Message:
remove not needed file


--- drascula.dat DELETED ---



From lucilanga at fedoraproject.org  Mon Apr 20 07:32:41 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 20 Apr 2009 07:32:41 +0000 (UTC)
Subject: rpms/drascula/devel drascula.dat,1.1,NONE
Message-ID: <20090420073241.13A1E70102@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/drascula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28434

Removed Files:
	drascula.dat 
Log Message:
remove not needed file


--- drascula.dat DELETED ---



From rhughes at fedoraproject.org  Mon Apr 20 07:37:25 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 20 Apr 2009 07:37:25 +0000 (UTC)
Subject: rpms/unique/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 unique.spec,
	1.2, 1.3 unique-compile-fix1.patch, 1.1,
	NONE unique-compile-fix2.patch, 1.1, NONE
Message-ID: <20090420073725.F0BFB70102@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/unique/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29271

Modified Files:
	.cvsignore sources unique.spec 
Removed Files:
	unique-compile-fix1.patch unique-compile-fix2.patch 
Log Message:
* Mon Apr 20 2009 Richard Hughes  <rhughes at redhat.com> - 1.0.8-1
- Update to latest upstream version
 * Unbreak subclassing of UniqueApp
 * Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unique/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Jul 2008 08:38:10 -0000	1.3
+++ .cvsignore	20 Apr 2009 07:36:55 -0000	1.4
@@ -1 +1 @@
-unique-1.0.0.tar.gz
+libunique-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unique/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jul 2008 08:38:10 -0000	1.3
+++ sources	20 Apr 2009 07:36:55 -0000	1.4
@@ -1 +1 @@
-fc6dfeca0ba84bc0bc557f17238e58cc  unique-1.0.0.tar.gz
+8ea35a7d8da7ef2952cd79f9e1324053  libunique-1.0.8.tar.gz


Index: unique.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unique/F-10/unique.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unique.spec	31 Jul 2008 08:38:10 -0000	1.2
+++ unique.spec	20 Apr 2009 07:36:55 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           unique
-Version:        1.0.0
+Version:        1.0.8
 Release:        1%{?dist}
-Summary:        Unique instance support for applications
+Summary:        Single instance support for applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
-Source0:        http://www.gnome.org/~ebassi/source/unique-%{version}.tar.gz
+Source0:        http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
@@ -33,7 +33,7 @@
 Headers and libraries for Unique.
 
 %prep
-%setup -q
+%setup -q -n libunique-%{?version}
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -64,6 +64,11 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Apr 20 2009 Richard Hughes  <rhughes at redhat.com> - 1.0.8-1
+- Update to latest upstream version
+ * Unbreak subclassing of UniqueApp
+ * Remove upstreamed patches
+
 * Thu Jul 31 2008 Richard Hughes  <rhughes at redhat.com> - 1.0.0-1
 - Update to latest upstream version
  * First stable release


--- unique-compile-fix1.patch DELETED ---


--- unique-compile-fix2.patch DELETED ---



From rhughes at fedoraproject.org  Mon Apr 20 07:37:28 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 20 Apr 2009 07:37:28 +0000 (UTC)
Subject: rpms/unique/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 unique.spec,
	1.7, 1.8 unique-startup-id.patch, 1.1, NONE
Message-ID: <20090420073728.C27AA70102@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/unique/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29299

Modified Files:
	.cvsignore sources unique.spec 
Removed Files:
	unique-startup-id.patch 
Log Message:
* Mon Apr 20 2009 Richard Hughes  <rhughes at redhat.com> - 1.0.8-1
- Update to latest upstream version
 * Unbreak subclassing of UniqueApp
 * Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unique/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Nov 2008 09:31:25 -0000	1.4
+++ .cvsignore	20 Apr 2009 07:36:58 -0000	1.5
@@ -1 +1 @@
-unique-1.0.4.tar.gz
+libunique-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unique/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Nov 2008 09:31:25 -0000	1.4
+++ sources	20 Apr 2009 07:36:58 -0000	1.5
@@ -1 +1 @@
-6691a55b3ca0943f5824d7bdc73927da  unique-1.0.4.tar.gz
+8ea35a7d8da7ef2952cd79f9e1324053  libunique-1.0.8.tar.gz


Index: unique.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unique/F-11/unique.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unique.spec	25 Feb 2009 23:02:29 -0000	1.7
+++ unique.spec	20 Apr 2009 07:36:58 -0000	1.8
@@ -1,14 +1,13 @@
 Name:           unique
-Version:        1.0.4
-Release:        4%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Single instance support for applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
-Source0:        http://www.gnome.org/~ebassi/source/unique-%{version}.tar.gz
+Source0:        http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		unique-startup-id.patch
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gnome-doc-utils >= 0.3.2
@@ -34,8 +33,7 @@
 Headers and libraries for Unique.
 
 %prep
-%setup -q
-%patch0 -p1 -b .startup-id
+%setup -q -n libunique-%{?version}
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -66,6 +64,11 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Apr 20 2009 Richard Hughes  <rhughes at redhat.com> - 1.0.8-1
+- Update to latest upstream version
+ * Unbreak subclassing of UniqueApp
+ * Remove upstreamed patches
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- unique-startup-id.patch DELETED ---



From rhughes at fedoraproject.org  Mon Apr 20 07:37:30 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 20 Apr 2009 07:37:30 +0000 (UTC)
Subject: rpms/unique/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 unique.spec,
	1.7, 1.8 unique-startup-id.patch, 1.1, NONE
Message-ID: <20090420073730.EFF0370102@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/unique/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29323

Modified Files:
	.cvsignore sources unique.spec 
Removed Files:
	unique-startup-id.patch 
Log Message:
* Mon Apr 20 2009 Richard Hughes  <rhughes at redhat.com> - 1.0.8-1
- Update to latest upstream version
 * Unbreak subclassing of UniqueApp
 * Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unique/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Nov 2008 09:31:25 -0000	1.4
+++ .cvsignore	20 Apr 2009 07:37:00 -0000	1.5
@@ -1 +1 @@
-unique-1.0.4.tar.gz
+libunique-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unique/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Nov 2008 09:31:25 -0000	1.4
+++ sources	20 Apr 2009 07:37:00 -0000	1.5
@@ -1 +1 @@
-6691a55b3ca0943f5824d7bdc73927da  unique-1.0.4.tar.gz
+8ea35a7d8da7ef2952cd79f9e1324053  libunique-1.0.8.tar.gz


Index: unique.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unique/devel/unique.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unique.spec	25 Feb 2009 23:02:29 -0000	1.7
+++ unique.spec	20 Apr 2009 07:37:00 -0000	1.8
@@ -1,14 +1,13 @@
 Name:           unique
-Version:        1.0.4
-Release:        4%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Single instance support for applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
-Source0:        http://www.gnome.org/~ebassi/source/unique-%{version}.tar.gz
+Source0:        http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		unique-startup-id.patch
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gnome-doc-utils >= 0.3.2
@@ -34,8 +33,7 @@
 Headers and libraries for Unique.
 
 %prep
-%setup -q
-%patch0 -p1 -b .startup-id
+%setup -q -n libunique-%{?version}
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -66,6 +64,11 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Apr 20 2009 Richard Hughes  <rhughes at redhat.com> - 1.0.8-1
+- Update to latest upstream version
+ * Unbreak subclassing of UniqueApp
+ * Remove upstreamed patches
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- unique-startup-id.patch DELETED ---



From mhlavink at fedoraproject.org  Mon Apr 20 07:48:31 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 20 Apr 2009 07:48:31 +0000 (UTC)
Subject: rpms/dovecot/F-11 .cvsignore, 1.52, 1.53 dovecot.spec, 1.125,
	1.126 sources, 1.55, 1.56
Message-ID: <20090420074831.8A3B370102@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32283

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
updated to 1.2.rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	6 Apr 2009 08:55:27 -0000	1.52
+++ .cvsignore	20 Apr 2009 07:48:01 -0000	1.53
@@ -1,4 +1,4 @@
-dovecot-1.2-managesieve-0.11.3.tar.gz
-dovecot-1.2.rc2.tar.gz
-dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
+dovecot-1.2-managesieve-0.11.4.tar.gz
+dovecot-1.2.rc3.tar.gz
+dovecot-1.2.rc3-managesieve-0.11.4.diff.gz
 dovecot-sieve-1.1.6.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- dovecot.spec	6 Apr 2009 08:55:28 -0000	1.125
+++ dovecot.spec	20 Apr 2009 07:48:01 -0000	1.126
@@ -2,7 +2,7 @@
 Name: dovecot
 Epoch: 1
 Version: 1.2
-%define betaver rc2
+%define betaver rc3
 Release: 0.%{betaver}.1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -17,7 +17,7 @@
 %define build_managesieve 1
 %define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
-%define managesieve_version 0.11.3
+%define managesieve_version 0.11.4
 %define managesieve_name dovecot-%{version}-managesieve
 
 URL: http://www.dovecot.org/
@@ -429,6 +429,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc3.1
+- updated to 1.2.rc3
+
 * Mon Apr 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc2.1
 - updated to 1.2.rc2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	6 Apr 2009 08:55:28 -0000	1.55
+++ sources	20 Apr 2009 07:48:01 -0000	1.56
@@ -1,4 +1,4 @@
-a651e2f12a17157d716eedc622032fdc  dovecot-1.2-managesieve-0.11.3.tar.gz
-0c568a2eb5170ab287f5f3ef38c13e1a  dovecot-1.2.rc2.tar.gz
-0588f613de160dfee0234954666a6a68  dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
+66ce5ff7faff318a943a1b62b765c127  dovecot-1.2-managesieve-0.11.4.tar.gz
+5ef845d0c137a6fd4cca8453073cd6b4  dovecot-1.2.rc3.tar.gz
+50e849383089b4abb2718e8aa004f3be  dovecot-1.2.rc3-managesieve-0.11.4.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz



From mhlavink at fedoraproject.org  Mon Apr 20 07:51:49 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 20 Apr 2009 07:51:49 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.125,1.126 sources,1.55,1.56
Message-ID: <20090420075149.4B8EF70102@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv567

Modified Files:
	dovecot.spec sources 
Log Message:
updated to 1.2.rc3



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- dovecot.spec	6 Apr 2009 08:55:28 -0000	1.125
+++ dovecot.spec	20 Apr 2009 07:51:18 -0000	1.126
@@ -2,7 +2,7 @@
 Name: dovecot
 Epoch: 1
 Version: 1.2
-%define betaver rc2
+%define betaver rc3
 Release: 0.%{betaver}.1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -17,7 +17,7 @@
 %define build_managesieve 1
 %define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
-%define managesieve_version 0.11.3
+%define managesieve_version 0.11.4
 %define managesieve_name dovecot-%{version}-managesieve
 
 URL: http://www.dovecot.org/
@@ -429,6 +429,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc3.1
+- updated to 1.2.rc3
+
 * Mon Apr 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc2.1
 - updated to 1.2.rc2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	6 Apr 2009 08:55:28 -0000	1.55
+++ sources	20 Apr 2009 07:51:18 -0000	1.56
@@ -1,4 +1,4 @@
-a651e2f12a17157d716eedc622032fdc  dovecot-1.2-managesieve-0.11.3.tar.gz
-0c568a2eb5170ab287f5f3ef38c13e1a  dovecot-1.2.rc2.tar.gz
-0588f613de160dfee0234954666a6a68  dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
+66ce5ff7faff318a943a1b62b765c127  dovecot-1.2-managesieve-0.11.4.tar.gz
+5ef845d0c137a6fd4cca8453073cd6b4  dovecot-1.2.rc3.tar.gz
+50e849383089b4abb2718e8aa004f3be  dovecot-1.2.rc3-managesieve-0.11.4.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz



From dnovotny at fedoraproject.org  Mon Apr 20 08:11:37 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon, 20 Apr 2009 08:11:37 +0000 (UTC)
Subject: rpms/file/devel file-5.00-mdmp.patch,1.1,1.2 file.spec,1.93,1.94
Message-ID: <20090420081137.0D48370102@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4764

Modified Files:
	file-5.00-mdmp.patch file.spec 
Log Message:

fix previous patch


file-5.00-mdmp.patch:

Index: file-5.00-mdmp.patch
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file-5.00-mdmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file-5.00-mdmp.patch	17 Apr 2009 09:26:31 -0000	1.1
+++ file-5.00-mdmp.patch	20 Apr 2009 08:11:35 -0000	1.2
@@ -7,4 +7,4 @@
  0	search/80	.lo\ -\ a\ libtool\ object\ file	libtool object file
 +
 +# From: Daniel Novotny <dnovotny at redhat.com>
-+0	string	MDMP\x93\xA7	MDUMP crash report data
++0	string	MDMP\x93\xA7	MDMP crash report data


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- file.spec	17 Apr 2009 09:26:31 -0000	1.93
+++ file.spec	20 Apr 2009 08:11:35 -0000	1.94
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.00
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -148,6 +148,10 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-7
+- fix previous patch:
+  the name of the format is a bit different (MDUMP -> MDMP)
+
 * Fri Apr 17 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-6
 - fix #485835 (MDUMP files)
 



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:44 +0000
Subject: [pkgdb] sugar-read: fab has requested watchbugzilla
Message-ID: <20090420082944.E850A10F878@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-read (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:45 +0000
Subject: [pkgdb] sugar-read: fab has requested watchcommits
Message-ID: <20090420082945.9D9B210F889@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-read (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:46 +0000
Subject: [pkgdb] sugar-read: fab has requested approveacls
Message-ID: <20090420082946.4952E10F88D@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-read (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:47 +0000
Subject: [pkgdb] sugar-read: fab has requested watchcommits
Message-ID: <20090420082947.BAD3B10F891@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-read (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:48 +0000
Subject: [pkgdb] sugar-read: fab has requested commit
Message-ID: <20090420082948.5B48A10F895@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-read (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:49 +0000
Subject: [pkgdb] sugar-read: fab has requested approveacls
Message-ID: <20090420082949.5BBD710F899@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-read (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:29:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:29:51 +0000
Subject: [pkgdb] sugar-read: fab has requested watchbugzilla
Message-ID: <20090420082951.631FF10F89D@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-read (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:30:06 +0000
Subject: [pkgdb] sugar-read: fab has given up watchcommits
Message-ID: <20090420083006.802DD10F89F@bastion2.fedora.phx.redhat.com>

fab has given up the watchcommits acl on sugar-read (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:30:08 +0000
Subject: [pkgdb] sugar-read: fab has requested watchcommits
Message-ID: <20090420083008.B968510F886@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-read (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:30:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:30:03 +0000
Subject: [pkgdb] sugar-read: fab has requested commit
Message-ID: <20090420083015.26D9B10F889@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-read (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:14 +0000
Subject: [pkgdb] sugar-log: fab has requested watchbugzilla
Message-ID: <20090420083114.4904E10F893@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-log (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:14 +0000
Subject: [pkgdb] sugar-log: fab has requested watchcommits
Message-ID: <20090420083114.8C20E10F897@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-log (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:23 +0000
Subject: [pkgdb] sugar-log: fab has requested approveacls
Message-ID: <20090420083123.3A66D10F89C@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-log (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:24 +0000
Subject: [pkgdb] sugar-log: fab has requested commit
Message-ID: <20090420083124.D3C5210F8A0@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-log (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:27 +0000
Subject: [pkgdb] sugar-log: fab has requested watchcommits
Message-ID: <20090420083127.D2E2510F88A@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-log (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:27 +0000
Subject: [pkgdb] sugar-log: fab has requested watchbugzilla
Message-ID: <20090420083127.E62A410F8A6@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-log (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:30 +0000
Subject: [pkgdb] sugar-log: fab has requested commit
Message-ID: <20090420083130.7956F10F88E@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-log (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:31:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:31:31 +0000
Subject: [pkgdb] sugar-log: fab has requested approveacls
Message-ID: <20090420083131.A913C10F8AC@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-log (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:37 +0000
Subject: [pkgdb] sugar-browse: fab has requested watchbugzilla
Message-ID: <20090420083238.0AACB10F88A@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-browse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:38 +0000
Subject: [pkgdb] sugar-browse: fab has requested watchcommits
Message-ID: <20090420083238.7640A10F893@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-browse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:42 +0000
Subject: [pkgdb] sugar-browse: fab has requested commit
Message-ID: <20090420083242.E32BD10F897@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-browse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:42 +0000
Subject: [pkgdb] sugar-browse: fab has requested approveacls
Message-ID: <20090420083243.13C4410F89A@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-browse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:46 +0000
Subject: [pkgdb] sugar-browse: fab has requested watchbugzilla
Message-ID: <20090420083246.EBBFF10F89E@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-browse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:47 +0000
Subject: [pkgdb] sugar-browse: fab has requested watchcommits
Message-ID: <20090420083247.5AEC710F8A1@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-browse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:48 +0000
Subject: [pkgdb] sugar-browse: fab has requested approveacls
Message-ID: <20090420083248.EAC4F10F8A4@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-browse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:49 +0000
Subject: [pkgdb] sugar-browse: fab has requested commit
Message-ID: <20090420083249.3E9E510F8A7@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-browse (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:56 +0000
Subject: [pkgdb] sugar-browse: fab has requested watchbugzilla
Message-ID: <20090420083256.3062D10F888@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-browse (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:56 +0000
Subject: [pkgdb] sugar-browse: fab has requested watchcommits
Message-ID: <20090420083256.B286C10F8AA@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-browse (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:59 +0000
Subject: [pkgdb] sugar-browse: fab has requested commit
Message-ID: <20090420083259.6F18410F8BD@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-browse (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Mon Apr 20 08:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 08:32:59 +0000
Subject: [pkgdb] sugar-browse: fab has requested approveacls
Message-ID: <20090420083259.D6FCF10F8C0@bastion2.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-browse (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From nphilipp at fedoraproject.org  Mon Apr 20 08:38:44 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 20 Apr 2009 08:38:44 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.96, 1.97 sources, 1.106,
	1.107 system-config-date.spec, 1.112, 1.113
Message-ID: <20090420083844.DF40070102@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10019

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	14 Apr 2009 16:23:24 -0000	1.96
+++ .cvsignore	20 Apr 2009 08:38:14 -0000	1.97
@@ -1 +1 @@
-system-config-date-1.9.37.tar.bz2
+system-config-date-1.9.38.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	14 Apr 2009 16:27:57 -0000	1.106
+++ sources	20 Apr 2009 08:38:14 -0000	1.107
@@ -1 +1 @@
-93e9a58c452e9124d6c75b469db31fa3  system-config-date-1.9.37.tar.bz2
+5cd5649425b0ba8db9ec278c137b16dc  system-config-date-1.9.38.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- system-config-date.spec	14 Apr 2009 16:27:57 -0000	1.112
+++ system-config-date.spec	20 Apr 2009 08:38:14 -0000	1.113
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.37
+Version: 1.9.38
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -115,6 +115,9 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Mon Apr 20 2009 Nils Philippsen <nils at redhat.com> - 1.9.38-1
+- restore SELinux context of /etc/localtime (#490323, patch by Daniel Walsh)
+
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.9.37-1
 - pick up updated translations
 



From nphilipp at fedoraproject.org  Mon Apr 20 08:46:11 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 20 Apr 2009 08:46:11 +0000 (UTC)
Subject: rpms/system-config-date/F-11 .cvsignore, 1.96, 1.97 sources, 1.106, 
	1.107 system-config-date.spec, 1.112, 1.113
Message-ID: <20090420084611.B16C87013C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11402

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-11/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	14 Apr 2009 16:23:24 -0000	1.96
+++ .cvsignore	20 Apr 2009 08:45:41 -0000	1.97
@@ -1 +1 @@
-system-config-date-1.9.37.tar.bz2
+system-config-date-1.9.38.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-11/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	14 Apr 2009 16:27:57 -0000	1.106
+++ sources	20 Apr 2009 08:45:41 -0000	1.107
@@ -1 +1 @@
-93e9a58c452e9124d6c75b469db31fa3  system-config-date-1.9.37.tar.bz2
+5cd5649425b0ba8db9ec278c137b16dc  system-config-date-1.9.38.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-11/system-config-date.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- system-config-date.spec	14 Apr 2009 16:27:57 -0000	1.112
+++ system-config-date.spec	20 Apr 2009 08:45:41 -0000	1.113
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.37
+Version: 1.9.38
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -115,6 +115,9 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Mon Apr 20 2009 Nils Philippsen <nils at redhat.com> - 1.9.38-1
+- restore SELinux context of /etc/localtime (#490323, patch by Daniel Walsh)
+
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.9.37-1
 - pick up updated translations
 



From mhlavink at fedoraproject.org  Mon Apr 20 08:58:11 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 20 Apr 2009 08:58:11 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.126,1.127
Message-ID: <20090420085811.1810A70102@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14561

Modified Files:
	dovecot.spec 
Log Message:
clean-up spec fo merge review



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- dovecot.spec	20 Apr 2009 07:51:18 -0000	1.126
+++ dovecot.spec	20 Apr 2009 08:57:40 -0000	1.127
@@ -1,4 +1,4 @@
-Summary: Dovecot Secure imap server
+Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2
@@ -264,7 +264,7 @@
 mkdir -p $RPM_BUILD_ROOT/var/run/dovecot/login
 chmod 755 $RPM_BUILD_ROOT/var/run/dovecot
 chmod 700 $RPM_BUILD_ROOT/var/run/dovecot/login
-	
+
 # Install dovecot.conf and dovecot-openssl.cnf
 mkdir -p $RPM_BUILD_ROOT%{ssldir}
 install -p -m644 dovecot-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot.conf



From hno at fedoraproject.org  Mon Apr 20 09:10:47 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 20 Apr 2009 09:10:47 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.38, 1.39 bzr.spec, 1.56, 1.57 sources, 
	1.38, 1.39
Message-ID: <20090420091047.E22E070102@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17000

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.14rc2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	9 Apr 2009 00:26:37 -0000	1.38
+++ .cvsignore	20 Apr 2009 09:10:17 -0000	1.39
@@ -1 +1 @@
-bzr-1.14rc1.tar.gz
+bzr-1.14rc2.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- bzr.spec	11 Apr 2009 20:40:00 -0000	1.56
+++ bzr.spec	20 Apr 2009 09:10:17 -0000	1.57
@@ -6,8 +6,8 @@
 #   bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %).
 #   release: rpm subrelease (0.N for rc candidates, N for stable releases)
 %define bzrver 1.14
-%define bzrrc rc1
-%define release 0.2
+%define bzrrc rc2
+%define release 0.3
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -89,6 +89,9 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.3.rc2
+- Update to 1.14rc2
+
 * Sat Apr 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.2.rc1
 - Correct build dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	9 Apr 2009 00:26:37 -0000	1.38
+++ sources	20 Apr 2009 09:10:17 -0000	1.39
@@ -1 +1 @@
-a488eb6f01a693148d02e4e71d75b7b5  bzr-1.14rc1.tar.gz
+184676d8456b20019ec6aea2d72ec12e  bzr-1.14rc2.tar.gz



From pvrabec at fedoraproject.org  Mon Apr 20 09:48:01 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon, 20 Apr 2009 09:48:01 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.0.17-login.defs, 1.3,
	1.4 shadow-4.0.18.1-useradd, 1.2, 1.3 .cvsignore, 1.20,
	1.21 shadow-utils.spec, 1.130, 1.131 sources, 1.21,
	1.22 shadow-4.1.3-selinux.patch, 1.1, NONE
Message-ID: <20090420094801.AEF4E70102@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23979

Modified Files:
	.cvsignore shadow-utils.spec sources 
Added Files:
	shadow-4.0.17-login.defs shadow-4.0.18.1-useradd 
Removed Files:
	shadow-4.1.3-selinux.patch 
Log Message:
upgrade



Index: shadow-4.0.17-login.defs
===================================================================
RCS file: shadow-4.0.17-login.defs
diff -N shadow-4.0.17-login.defs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ shadow-4.0.17-login.defs	20 Apr 2009 09:47:31 -0000	1.4
@@ -0,0 +1,58 @@
+# *REQUIRED*
+#   Directory where mailboxes reside, _or_ name of file, relative to the
+#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
+#   QMAIL_DIR is for Qmail
+#
+#QMAIL_DIR	Maildir
+MAIL_DIR	/var/spool/mail
+#MAIL_FILE	.mail
+
+# Password aging controls:
+#
+#	PASS_MAX_DAYS	Maximum number of days a password may be used.
+#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
+#	PASS_MIN_LEN	Minimum acceptable password length.
+#	PASS_WARN_AGE	Number of days warning given before a password expires.
+#
+PASS_MAX_DAYS	99999
+PASS_MIN_DAYS	0
+PASS_MIN_LEN	5
+PASS_WARN_AGE	7
+
+#
+# Min/max values for automatic uid selection in useradd
+#
+UID_MIN			  500
+UID_MAX			60000
+
+#
+# Min/max values for automatic gid selection in groupadd
+#
+GID_MIN			  500
+GID_MAX			60000
+
+#
+# If defined, this command is run when removing a user.
+# It should remove any at/cron/print jobs etc. owned by
+# the user to be removed (passed as the first argument).
+#
+#USERDEL_CMD	/usr/sbin/userdel_local
+
+#
+# If useradd should create home directories for users by default
+# On RH systems, we do. This option is overridden with the -m flag on
+# useradd command line.
+#
+CREATE_HOME	yes
+
+# The permission mask is initialized to this value. If not specified, 
+# the permission mask will be initialized to 022.
+UMASK           077
+
+# This enables userdel to remove user groups if no members exist.
+#
+USERGROUPS_ENAB yes
+
+# Use MD5 or DES to encrypt password? Red Hat use MD5 by default.
+MD5_CRYPT_ENAB yes
+


Index: shadow-4.0.18.1-useradd
===================================================================
RCS file: shadow-4.0.18.1-useradd
diff -N shadow-4.0.18.1-useradd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ shadow-4.0.18.1-useradd	20 Apr 2009 09:47:31 -0000	1.3
@@ -0,0 +1,9 @@
+# useradd defaults file
+GROUP=100
+HOME=/home
+INACTIVE=-1
+EXPIRE=
+SHELL=/bin/bash
+SKEL=/etc/skel
+CREATE_MAIL_SPOOL=yes
+


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Apr 2009 10:19:12 -0000	1.20
+++ .cvsignore	20 Apr 2009 09:47:31 -0000	1.21
@@ -1,3 +1 @@
-shadow-4.0.17-login.defs
-shadow-4.0.18.1-useradd
-shadow-4.1.3.tar.bz2
+shadow-4.1.3.1.tar.gz


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- shadow-utils.spec	14 Apr 2009 14:12:16 -0000	1.130
+++ shadow-utils.spec	20 Apr 2009 09:47:31 -0000	1.131
@@ -1,15 +1,14 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.3.1
+Release: 1%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
-Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
+Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.gz
 Source1: shadow-4.0.17-login.defs
 Source2: shadow-4.0.18.1-useradd
 Patch0: shadow-4.1.3-redhat.patch
 Patch1: shadow-4.1.3-goodname.patch
-Patch2: shadow-4.1.3-selinux.patch
 License: BSD and GPLv2+
 Group: System Environment/Base
 BuildRequires: libselinux-devel >= 1.25.2-1
@@ -36,7 +35,6 @@
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
-%patch2 -p1 -b .selinux
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -176,6 +174,9 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Fri Apr 17 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3.1-1
+- upgrade
+
 * Tue Apr 14 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3-2
 - get "-n" option back
 - fix selinux issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Apr 2009 10:19:14 -0000	1.21
+++ sources	20 Apr 2009 09:47:31 -0000	1.22
@@ -1,3 +1 @@
-e91727c55dbafc9915250e31535f13bb  shadow-4.0.17-login.defs
-ebdf46b79f9b414353c9ae8aba4d55cc  shadow-4.0.18.1-useradd
-d222bd50f64d52a32882c82ab1e85f28  shadow-4.1.3.tar.bz2
+dd22f2ad8f7550bc1177ddcca49877ff  shadow-4.1.3.1.tar.gz


--- shadow-4.1.3-selinux.patch DELETED ---



From denis at fedoraproject.org  Mon Apr 20 10:08:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 20 Apr 2009 10:08:40 +0000 (UTC)
Subject: rpms/transmission/F-10 transmission-1.51-copt.patch, NONE,
	1.1 transmission-1.51-libevent.patch, NONE,
	1.1 transmission-1.51-xdg-download-dir.patch, NONE,
	1.1 .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 transmission.spec,
	1.29, 1.30 transmission-1.40-copt.patch, 1.1,
	NONE transmission-1.42-libevent.patch, 1.1, NONE
Message-ID: <20090420100840.E9BBC70102@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29275

Modified Files:
	.cvsignore sources transmission.spec 
Added Files:
	transmission-1.51-copt.patch transmission-1.51-libevent.patch 
	transmission-1.51-xdg-download-dir.patch 
Removed Files:
	transmission-1.40-copt.patch transmission-1.42-libevent.patch 
Log Message:
- Update to upstream 1.51 (fix for #493064)
- Updated patches
- Added icon cache scriplets (#487824)


transmission-1.51-copt.patch:

--- NEW FILE transmission-1.51-copt.patch ---
--- transmission-1.51/configure~	2009-02-27 17:48:09.000000000 +0100
+++ transmission-1.51/configure	2009-02-28 09:38:58.000000000 +0100
@@ -20147,10 +20147,6 @@
 
 if test 0 = "0"; then
   supported_build=yes
-  if test "x$GCC" = "xyes" ; then
-    CFLAGS="$CFLAGS -g -O3 -funroll-loops "
-    CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
-  fi
 
 cat >>confdefs.h <<\_ACEOF
 #define TR_STABLE_RELEASE 1
@@ -20158,10 +20154,6 @@
 
 else
   supported_build=no
-  if test "x$GCC" = "xyes" ; then
-    CFLAGS="$CFLAGS -g -O0"
-    CXXFLAGS="$CXXFLAGS -g -O0"
-  fi
   if test 0 = "X"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -21543,10 +21535,6 @@
     ;;
 esac
 
-if test "x$GCC" = "xyes" ; then
-  CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
-fi
-
 { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then

transmission-1.51-libevent.patch:

--- NEW FILE transmission-1.51-libevent.patch ---
diff -r -u transmission-1.50.orig/cli/Makefile.in transmission-1.50/cli/Makefile.in
--- transmission-1.50.orig/cli/Makefile.in	2009-02-13 17:43:47.000000000 +0100
+++ transmission-1.50/cli/Makefile.in	2009-02-20 11:20:28.000000000 +0100
@@ -53,7 +53,6 @@
 am__DEPENDENCIES_1 =
 transmissioncli_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -288,7 +287,7 @@
 transmissioncli_SOURCES = cli.c
 transmissioncli_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
-    $(top_builddir)/third-party/libevent/libevent.la \
+    -levent -levent_core \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(INTLLIBS) \
diff -r -u transmission-1.50.orig/configure transmission-1.50/configure
--- transmission-1.50.orig/configure	2009-02-13 17:43:45.000000000 +0100
+++ transmission-1.50/configure	2009-02-20 11:20:57.000000000 +0100
@@ -1053,7 +1053,6 @@
 LIBNOTIFY_LIBS
 DBUS_GLIB_CFLAGS
 DBUS_GLIB_LIBS'
-ac_subdirs_all='third-party/libevent'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -23905,16 +23904,6 @@
 
 
 
-subdirs="$subdirs third-party/libevent"
-
-{ $as_echo "$as_me:$LINENO: invoking libevent's configure script" >&5
-$as_echo "$as_me: invoking libevent's configure script" >&6;}
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
-
-
-
-
-
 pkg_failed=no
 { $as_echo "$as_me:$LINENO: checking for GTK" >&5
 $as_echo_n "checking for GTK... " >&6; }
diff -r -u transmission-1.50.orig/daemon/Makefile.in transmission-1.50/daemon/Makefile.in
--- transmission-1.50.orig/daemon/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/daemon/Makefile.in	2009-02-20 11:29:43.000000000 +0100
@@ -57,7 +57,6 @@
 	$(top_builddir)/libtransmission/libtransmission.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -68,7 +67,7 @@
 	$(top_builddir)/libtransmission/libtransmission.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
+        -levent -levent_core \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -307,7 +306,7 @@
     $(top_builddir)/libtransmission/libtransmission.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-    $(top_builddir)/third-party/libevent/libevent.la \
+    -levent -levent_core \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \
     $(ZLIB_LIBS) \
--- transmission-1.50.orig/gtk/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/gtk/Makefile.in	2009-02-20 11:22:10.000000000 +0100
@@ -72,7 +72,6 @@
 am__DEPENDENCIES_1 =
 transmission_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -397,7 +396,7 @@
 dist_man_MANS = transmission.1
 transmission_LDADD =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
+	-levent -levent_core \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \
 	$(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \
diff -r -u transmission-1.50.orig/gtk/util.c transmission-1.50/gtk/util.c
--- transmission-1.50.orig/gtk/util.c	2009-02-13 17:40:54.000000000 +0100
+++ transmission-1.50/gtk/util.c	2009-02-20 11:22:18.000000000 +0100
@@ -38,7 +38,7 @@
  #include <dbus/dbus-glib.h>
 #endif
 
-#include <libevent/evhttp.h>
+#include <evhttp.h>
 
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
 #include <libtransmission/utils.h> /* tr_inf */
diff -r -u transmission-1.50.orig/libtransmission/clients.c transmission-1.50/libtransmission/clients.c
--- transmission-1.50.orig/libtransmission/clients.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/clients.c	2009-02-20 11:22:34.000000000 +0100
@@ -17,7 +17,7 @@
 #include <stdlib.h> /* strtol */
 #include <string.h>
 
-#include <libevent/event.h> /* evbuffer */
+#include <event.h> /* evbuffer */
 
 #include "transmission.h"
 #include "clients.h"
diff -r -u transmission-1.50.orig/libtransmission/fdlimit.c transmission-1.50/libtransmission/fdlimit.c
--- transmission-1.50.orig/libtransmission/fdlimit.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/fdlimit.c	2009-02-20 11:28:30.000000000 +0100
@@ -56,7 +56,7 @@
 #include <unistd.h>
 #include <fcntl.h> /* O_LARGEFILE posix_fadvise */
 
-#include <evutil.h>
+#include <event.h>
 
 #include "transmission.h"
 #include "fdlimit.h"
diff -r -u transmission-1.50.orig/libtransmission/Makefile.in transmission-1.50/libtransmission/Makefile.in
--- transmission-1.50.orig/libtransmission/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/libtransmission/Makefile.in	2009-02-20 11:23:02.000000000 +0100
@@ -82,7 +82,6 @@
 am__DEPENDENCIES_2 = ./libtransmission.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -472,7 +471,7 @@
     ./libtransmission.a  \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-    $(top_builddir)/third-party/libevent/libevent.la \
+    -levent -levent_core \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \
     $(OPENSSL_LIBS) \
diff -r -u transmission-1.50.orig/libtransmission/net.c transmission-1.50/libtransmission/net.c
--- transmission-1.50.orig/libtransmission/net.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/net.c	2009-02-20 11:28:24.000000000 +0100
@@ -39,7 +39,7 @@
  #include <fcntl.h>
 #endif
 
-#include <evutil.h>
+#include <event.h>
 
 #include "transmission.h"
 #include "fdlimit.h"
diff -r -u transmission-1.50.orig/libtransmission/rpc-server.c transmission-1.50/libtransmission/rpc-server.c
--- transmission-1.50.orig/libtransmission/rpc-server.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/rpc-server.c	2009-02-20 11:23:16.000000000 +0100
@@ -24,8 +24,8 @@
  #include <zlib.h>
 #endif
 
-#include <libevent/event.h>
-#include <libevent/evhttp.h>
+#include <event.h>
+#include <evhttp.h>
 
 #include "transmission.h"
 #include "bencode.h"
diff -r -u transmission-1.50.orig/third-party/Makefile.in transmission-1.50/third-party/Makefile.in
--- transmission-1.50.orig/third-party/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/third-party/Makefile.in	2009-02-20 11:23:36.000000000 +0100
@@ -253,7 +253,6 @@
 top_srcdir = @top_srcdir@
 transmissionlocaledir = @transmissionlocaledir@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp
 
--- transmission-1.51/daemon/remote.c~	2009-02-27 17:46:36.000000000 +0100
+++ transmission-1.51/daemon/remote.c	2009-02-28 09:40:41.000000000 +0100
@@ -21,7 +21,7 @@
  #include <unistd.h> /* getcwd */
 #endif
 
-#include <libevent/event.h>
+#include <event.h>
 
 #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>

transmission-1.51-xdg-download-dir.patch:

--- NEW FILE transmission-1.51-xdg-download-dir.patch ---
Use the XDG download directory for downloads instead of
made-up unusally nonesixtent ~/Downloads (fall back to it
in case there's no XDG user dir configuration).

Lubomir Rintel <lkundrak at v3.sk>

diff -up transmission-1.51/libtransmission/platform.c.xdg-download-dir transmission-1.51/libtransmission/platform.c
--- transmission-1.51/libtransmission/platform.c.xdg-download-dir	2009-03-28 12:30:43.817212449 +0100
+++ transmission-1.51/libtransmission/platform.c	2009-03-28 12:31:39.752214378 +0100
@@ -443,15 +443,124 @@ tr_getDefaultConfigDir( const char * app
     return s;
 }
 
+/* This was stolen from gthumb, though it probably originates from
+ * xdg-user-dirs's xdg-user-dir-lookup.c. See:
+ * http://www.redhat.com/archives/fedora-devel-list/2007-March/msg00677.html
+ */
 const char*
 tr_getDefaultDownloadDir( void )
 {
-    static char * s = NULL;
+    static char * user_dir = NULL;
+    char type[] = "DOWNLOAD";
+    FILE * file;
+    char * home_dir, * config_home, * config_file;
+    char buffer[512];
+    char * p, * d;
+    int len;
+    int relative;
+
+    if( user_dir != NULL )
+        return user_dir;
+
+    home_dir = getenv( "HOME" );
+    if( home_dir == NULL )
+        return strdup("/tmp" );
 
-    if( s == NULL )
-        s = tr_buildPath( getHomeDir( ), "Downloads", NULL );
+    config_home = getenv( "XDG_CONFIG_HOME" );
+    if( config_home == NULL || config_home[0] == 0 )
+    {
+        config_file = malloc( strlen( home_dir ) + strlen( "/.config/user-dirs.dirs" ) + 1 );
+        strcpy( config_file, home_dir );
+        strcat( config_file, "/.config/user-dirs.dirs" );
+    } 
+    else
+    {
+        config_file = malloc( strlen ( config_home ) + strlen( "/user-dirs.dirs" ) + 1 );
+        strcpy( config_file, config_home );
+        strcat( config_file, "/user-dirs.dirs" );
+    }
 
-    return s;
+    file = fopen( config_file, "r" );
+    free( config_file );
+    if( file == NULL )
+        goto error;
+
+    while( fgets( buffer, sizeof( buffer ), file ) )
+    {
+        /* Remove newline at end */
+        len = strlen( buffer );
+        if( len > 0 && buffer[len-1] == '\n' )
+        buffer[len-1] = 0;
+      
+        p = buffer;
+        while( *p == ' ' || *p == '\t' )
+            p++;
+      
+        if( strncmp( p, "XDG_", 4 ) != 0 )
+            continue;
+        p += 4;
+
+        if( strncmp(p, type, strlen (type )) != 0)
+            continue;
+        p += strlen( type );
+
+        if( strncmp(p, "_DIR", 4 ) != 0)
+            continue;
+        p += 4;
+
+        while( *p == ' ' || *p == '\t' )
+            p++;
+
+        if( *p != '=' )
+            continue;
+        p++;
+      
+        while( *p == ' ' || *p == '\t' )
+            p++;
+
+        if( *p != '"' )
+            continue;
+        p++;
+      
+        relative = 0;
+        if( strncmp(p, "$HOME/", 6 ) == 0)
+        {
+            p += 6;
+            relative = 1;
+        }
+        else
+            if( *p != '/' )
+                continue;
+      
+        if( relative )
+        {
+            user_dir = malloc( strlen ( home_dir ) + 1 + strlen ( p ) + 1 );
+            strcpy( user_dir, home_dir );
+            strcat( user_dir, "/" );
+        }
+        else
+        {
+            user_dir = malloc( strlen ( p ) + 1 );
+            *user_dir = 0;
+        }
+      
+        d = user_dir + strlen( user_dir );
+        while( *p && *p != '"' )
+        {
+            if( ( *p == '\\' ) && ( *( p + 1 ) != 0 ))
+                p++;
+            *d++ = *p++;
+        }
+        *d = 0;
+    }  
+    
+    fclose( file );
+
+error:
+    if( !user_dir )
+            user_dir = tr_buildPath(  getHomeDir(  ), "Downloads", NULL );
+
+    return user_dir;
 }
 
 /***


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Jan 2009 10:58:10 -0000	1.25
+++ .cvsignore	20 Apr 2009 10:08:10 -0000	1.26
@@ -1 +1 @@
-transmission-1.42.tar.bz2
+transmission-1.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Jan 2009 10:58:10 -0000	1.25
+++ sources	20 Apr 2009 10:08:10 -0000	1.26
@@ -1 +1 @@
-c083bdcb01426466e80ee339bccd9351  transmission-1.42.tar.bz2
+b93439fbd0040ad6eb448f70a48355f5  transmission-1.51.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/transmission.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- transmission.spec	14 Jan 2009 10:58:10 -0000	1.29
+++ transmission.spec	20 Apr 2009 10:08:10 -0000	1.30
@@ -1,6 +1,6 @@
 
 Name:           transmission
-Version:        1.42
+Version:        1.51
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
@@ -9,14 +9,15 @@
 License:        MIT and GPLv2
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
-Patch2:         transmission-1.40-copt.patch
-Patch3:         transmission-1.42-libevent.patch
+Patch0:         transmission-1.51-xdg-download-dir.patch
+Patch2:         transmission-1.51-copt.patch
+Patch3:         transmission-1.51-libevent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel >= 0.9.4
 BuildRequires:  glib2-devel >= 2.15.5
 BuildRequires:  gtk2-devel >= 2.6.0
-BuildRequires:  libnotify-devel >= 0.4.4
+BuildRequires:  libnotify-devel >= 0.4.3
 BuildRequires:  curl-devel >= 7.16.3
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libevent-devel >= 1.4.5
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .xdg-download-dir
 %patch2 -p1 -b .copt
 %patch3 -p1 -b .libevent
 
@@ -57,10 +59,14 @@
 
 
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database > /dev/null 2>&1 || :
 
 
 %postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database > /dev/null 2>&1 || :
 
 
@@ -76,6 +82,11 @@
 
 
 %changelog
+* Mon Apr 20 2009 Denis <denis at poolshark.org> - 1.51-1
+- Update to upstream 1.51 (fix for #493064)
+- Updated patches
+- Added icon cache scriplets (#487824)
+
 * Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 1.42-1
 - Update to upstream version 1.42
 - Updated libevent patch


--- transmission-1.40-copt.patch DELETED ---


--- transmission-1.42-libevent.patch DELETED ---



From rhughes at fedoraproject.org  Mon Apr 20 10:33:15 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 20 Apr 2009 10:33:15 +0000 (UTC)
Subject: rpms/PackageKit/F-11 PackageKit-0.4.6-Presto-dont-filter.patch, NONE,
	1.1 PackageKit-0.4.6-Presto-handle-downloading-updates.patch,
	NONE, 1.1 PackageKit.spec, 1.101, 1.102
Message-ID: <20090420103315.E8BBC70102@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1942

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-Presto-dont-filter.patch 
	PackageKit-0.4.6-Presto-handle-downloading-updates.patch 
Log Message:
* Sun Apr 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-4
- Backport 2 patches from upstream to make Presto work better with PK.


PackageKit-0.4.6-Presto-dont-filter.patch:

--- NEW FILE PackageKit-0.4.6-Presto-dont-filter.patch ---
commit 1186bd2309879ff83cb57a1cbbf4f65949826d1e
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Apr 16 17:10:17 2009 +0100

    bugfix: don't filter out 'Presto' unconditionally from the stdout to fix rh#496091

diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index d7e8328..05f573c 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -48,9 +48,6 @@ backend_stderr_cb (PkBackend *backend, const gchar *output)
 static gboolean
 backend_stdout_cb (PkBackend *backend, const gchar *output)
 {
-	/* presto is much too verbose... */
-	if (strstr (output, "Presto") != NULL)
-		return FALSE;
 	return TRUE;
 }
 

PackageKit-0.4.6-Presto-handle-downloading-updates.patch:

--- NEW FILE PackageKit-0.4.6-Presto-handle-downloading-updates.patch ---
commit dd136f6760d375ba55ec98ab02291028c03d8b46
Author: Richard Hughes <richard at hughsie.com>
Date:   Sun Apr 19 11:59:42 2009 +0100

    yum: Deal with Presto downloading updates in a better way

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 5870eb7..7119c6a 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -36,6 +36,7 @@ from yum.callbacks import *
 from yum.misc import prco_tuple_to_string, unique
 from yum.packages import YumLocalPackage, parsePackages
 from yum.packageSack import MetaSack
+from yum.sqlitesack import YumAvailablePackageSqlite
 import rpmUtils
 import exceptions
 import types
@@ -2559,6 +2560,9 @@ class DownloadCallback(BaseMeter):
             for pkg in self.saved_pkgs:
                 if isinstance(pkg, YumLocalPackage):
                     rpmfn = pkg.localPkg
+                elif isinstance(pkg, YumAvailablePackageSqlite):
+                    # from yum-presto, so not a local package
+                    return pkg
                 else:
                     rpmfn = os.path.basename(pkg.remote_path) # get the rpm filename of the package
                 if rpmfn == name:


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- PackageKit.spec	14 Apr 2009 16:19:06 -0000	1.101
+++ PackageKit.spec	20 Apr 2009 10:32:45 -0000	1.102
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -42,6 +42,12 @@
 # Already upstream: 31b85c79d516d0b97b87c2b205e9fea00c9190ed..426e6a8ba3be3408347af1d8f200956818e230cf
 Patch7:    PackageKit-0.4.6-dont-use-obsolete-interfaces.patch
 
+# Already upstream: 1186bd2309879ff83cb57a1cbbf4f65949826d1e
+Patch8:    PackageKit-0.4.6-Presto-dont-filter.patch
+
+# Already upstream: dd136f6760d375ba55ec98ab02291028c03d8b46
+Patch9:    PackageKit-0.4.6-Presto-handle-downloading-updates.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -248,6 +254,8 @@
 %patch5 -p1 -b .cmd-not-found-lengths
 %patch6 -p1 -b .sync-logic
 %patch7 -p1 -b .dont-use-obsolete
+%patch8 -p1 -b .presto-filter
+%patch9 -p1 -b .presto-downloading-updates
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -442,6 +450,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Sun Apr 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-4
+- Backport 2 patches from upstream to make Presto work better with PK.
+
 * Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-3
 - Backport 4 important patches from upstream.
 



From rakesh at fedoraproject.org  Mon Apr 20 10:56:22 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 20 Apr 2009 10:56:22 +0000 (UTC)
Subject: rpms/coredumper/devel coredumper_unittest_c.patch, NONE,
	1.1 coredumper.spec, 1.2, 1.3 import.log, 1.2, 1.3
Message-ID: <20090420105623.0410370102@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7060/devel

Modified Files:
	coredumper.spec import.log 
Added Files:
	coredumper_unittest_c.patch 
Log Message:
GDB messages changed, fixes the test suite - by Jan Kratochvil (FTBFS #496523)


coredumper_unittest_c.patch:

--- NEW FILE coredumper_unittest_c.patch ---
--- coredumper-1.2.1/src/coredumper_unittest.c-orig	2008-04-02 02:31:17.000000000 +0200
+++ coredumper-1.2.1/src/coredumper_unittest.c	2009-04-20 11:07:20.000000000 +0200
@@ -424,7 +424,7 @@ static void CheckWithGDB(FILE *input, FI
    * to gdb. "*" is a glob wildcard character.
    */
   static const char *msg[] = { "Core was generated by",
-                               " @ process * *"DUMPFUNCTION,
+                               " @ Thread * *"DUMPFUNCTION,
                                "[Switching to thread * *"DUMPFUNCTION,
                                "#* *CoreDump",
                                "#@ * TestCoreDump",
@@ -432,7 +432,7 @@ static void CheckWithGDB(FILE *input, FI
                                "$1 = ",
 #ifdef THREADS
                                " Busy",
-                               " @ process * Busy",
+                               " @ Thread * Busy",
                                "[Switching to thread * Busy",
                                "Busy",
                                "Busy",


Index: coredumper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/devel/coredumper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coredumper.spec	24 Feb 2009 09:11:32 -0000	1.2
+++ coredumper.spec	20 Apr 2009 10:55:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           coredumper
 Version:        1.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library to create core dumps
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@
 URL:            http://code.google.com/p/google-%{name}/
 Source0:        http://google-%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         coredumper-remove_linux_dirent_h.patch
+Patch1:         coredumper_unittest_c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  binutils, gdb
 
@@ -38,6 +39,7 @@
 %setup -q
 
 %patch0 -p1 -b .remove_linux_dirent_h
+%patch1 -p1 -b .coredumper_unittest_c
 
 %build
 %configure --enable-static=no
@@ -80,6 +82,9 @@
 %{_includedir}/google/*.h
 
 %changelog
+* Mon Apr 20 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.1-8
+- GDB messages changed, fixes the test suite - by Jan Kratochvil (FTBFS #496523)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Sep 2008 06:58:16 -0000	1.2
+++ import.log	20 Apr 2009 10:55:52 -0000	1.3
@@ -1,2 +1,3 @@
 coredumper-1_2_1-6_fc9:HEAD:coredumper-1.2.1-6.fc9.src.rpm:1220683353
 coredumper-1_2_1-6_fc9:HEAD:coredumper-1.2.1-6.fc9.src.rpm:1220683564
+coredumper-1_2_1-8_fc11:HEAD:coredumper-1.2.1-8.fc11.src.rpm:1240224593



From ricky at fedoraproject.org  Mon Apr 20 11:22:41 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Mon, 20 Apr 2009 11:22:41 +0000 (UTC)
Subject: rpms/python-tempita/F-11 .cvsignore, 1.4, 1.5 python-tempita.spec,
	1.7, 
	1.8 sources, 1.5, 1.6 python-tempita-0.3-fix-tests.patch, 1.1, NONE
Message-ID: <20090420112241.BA5FD7013F@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12468/F-11

Modified Files:
	.cvsignore python-tempita.spec sources 
Removed Files:
	python-tempita-0.3-fix-tests.patch 
Log Message:
* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
- Upstream released a new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 17:14:07 -0000	1.4
+++ .cvsignore	20 Apr 2009 11:22:10 -0000	1.5
@@ -1 +1 @@
-Tempita-0.3.tar.gz
+Tempita-0.4.tar.gz


Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-11/python-tempita.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-tempita.spec	14 Apr 2009 17:25:52 -0000	1.7
+++ python-tempita.spec	20 Apr 2009 11:22:11 -0000	1.8
@@ -1,16 +1,15 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://pythonpaste.org/tempita/
-Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-0.3.tar.gz
+Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q -n Tempita-%{version}
-%patch0 -p1
 
 
 %build
@@ -38,7 +36,7 @@
 
 
 %check
-./test
+nosetests
 
 
 %files
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
+- Upstream released a new version.
+
 * Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-3
 - Change define to global.
 - Remove old >= 8 conditional.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Dec 2008 17:14:07 -0000	1.5
+++ sources	20 Apr 2009 11:22:11 -0000	1.6
@@ -1 +1 @@
-81cbb5f38cf22f2b5c7e367986645561  Tempita-0.3.tar.gz
+0abe015a72e748d0c6284679a497426c  Tempita-0.4.tar.gz


--- python-tempita-0.3-fix-tests.patch DELETED ---



From ricky at fedoraproject.org  Mon Apr 20 11:22:42 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Mon, 20 Apr 2009 11:22:42 +0000 (UTC)
Subject: rpms/python-tempita/devel .cvsignore, 1.4, 1.5 python-tempita.spec, 
	1.7, 1.8 sources, 1.5, 1.6 python-tempita-0.3-fix-tests.patch,
	1.1, NONE
Message-ID: <20090420112242.CC39F70137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12468/devel

Modified Files:
	.cvsignore python-tempita.spec sources 
Removed Files:
	python-tempita-0.3-fix-tests.patch 
Log Message:
* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
- Upstream released a new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 17:14:07 -0000	1.4
+++ .cvsignore	20 Apr 2009 11:22:12 -0000	1.5
@@ -1 +1 @@
-Tempita-0.3.tar.gz
+Tempita-0.4.tar.gz


Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/devel/python-tempita.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-tempita.spec	14 Apr 2009 17:25:52 -0000	1.7
+++ python-tempita.spec	20 Apr 2009 11:22:12 -0000	1.8
@@ -1,16 +1,15 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://pythonpaste.org/tempita/
-Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-0.3.tar.gz
+Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q -n Tempita-%{version}
-%patch0 -p1
 
 
 %build
@@ -38,7 +36,7 @@
 
 
 %check
-./test
+nosetests
 
 
 %files
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
+- Upstream released a new version.
+
 * Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-3
 - Change define to global.
 - Remove old >= 8 conditional.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Dec 2008 17:14:07 -0000	1.5
+++ sources	20 Apr 2009 11:22:12 -0000	1.6
@@ -1 +1 @@
-81cbb5f38cf22f2b5c7e367986645561  Tempita-0.3.tar.gz
+0abe015a72e748d0c6284679a497426c  Tempita-0.4.tar.gz


--- python-tempita-0.3-fix-tests.patch DELETED ---



From ricky at fedoraproject.org  Mon Apr 20 11:22:42 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Mon, 20 Apr 2009 11:22:42 +0000 (UTC)
Subject: rpms/python-tempita/F-9 .cvsignore, 1.3, 1.4 python-tempita.spec,
	1.4, 
	1.5 sources, 1.3, 1.4 python-tempita-0.3-fix-tests.patch, 1.1, NONE
Message-ID: <20090420112242.487A270137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12468/F-9

Modified Files:
	.cvsignore python-tempita.spec sources 
Removed Files:
	python-tempita-0.3-fix-tests.patch 
Log Message:
* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
- Upstream released a new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Dec 2008 18:01:35 -0000	1.3
+++ .cvsignore	20 Apr 2009 11:22:11 -0000	1.4
@@ -1 +1 @@
-Tempita-0.3.tar.gz
+Tempita-0.4.tar.gz


Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-9/python-tempita.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tempita.spec	14 Apr 2009 17:25:51 -0000	1.4
+++ python-tempita.spec	20 Apr 2009 11:22:11 -0000	1.5
@@ -1,16 +1,15 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://pythonpaste.org/tempita/
-Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-0.3.tar.gz
+Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q -n Tempita-%{version}
-%patch0 -p1
 
 
 %build
@@ -38,7 +36,7 @@
 
 
 %check
-./test
+nosetests
 
 
 %files
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
+- Upstream released a new version.
+
 * Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-2
 - Change define to global.
 - Remove old >= 8 conditional.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Dec 2008 18:01:35 -0000	1.3
+++ sources	20 Apr 2009 11:22:11 -0000	1.4
@@ -1 +1 @@
-81cbb5f38cf22f2b5c7e367986645561  Tempita-0.3.tar.gz
+0abe015a72e748d0c6284679a497426c  Tempita-0.4.tar.gz


--- python-tempita-0.3-fix-tests.patch DELETED ---



From ricky at fedoraproject.org  Mon Apr 20 11:22:41 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Mon, 20 Apr 2009 11:22:41 +0000 (UTC)
Subject: rpms/python-tempita/F-10 .cvsignore, 1.4, 1.5 python-tempita.spec,
	1.5, 
	1.6 sources, 1.5, 1.6 python-tempita-0.3-fix-tests.patch, 1.1, NONE
Message-ID: <20090420112241.B45CE70137@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-tempita/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12468/F-10

Modified Files:
	.cvsignore python-tempita.spec sources 
Removed Files:
	python-tempita-0.3-fix-tests.patch 
Log Message:
* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
- Upstream released a new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 17:53:19 -0000	1.4
+++ .cvsignore	20 Apr 2009 11:22:09 -0000	1.5
@@ -1 +1 @@
-Tempita-0.3.tar.gz
+Tempita-0.4.tar.gz


Index: python-tempita.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-10/python-tempita.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-tempita.spec	14 Apr 2009 17:25:50 -0000	1.5
+++ python-tempita.spec	20 Apr 2009 11:22:09 -0000	1.6
@@ -1,16 +1,15 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-tempita
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A very small text templating language
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://pythonpaste.org/tempita/
-Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-0.3.tar.gz
+Source0:        http://pypi.python.org/packages/source/T/Tempita/Tempita-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0:         %{name}-%{version}-fix-tests.patch
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q -n Tempita-%{version}
-%patch0 -p1
 
 
 %build
@@ -38,7 +36,7 @@
 
 
 %check
-./test
+nosetests
 
 
 %files
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.4-1
+- Upstream released a new version.
+
 * Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3-2
 - Change define to global.
 - Remove old >= 8 conditional.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tempita/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Dec 2008 17:53:20 -0000	1.5
+++ sources	20 Apr 2009 11:22:09 -0000	1.6
@@ -1 +1 @@
-81cbb5f38cf22f2b5c7e367986645561  Tempita-0.3.tar.gz
+0abe015a72e748d0c6284679a497426c  Tempita-0.4.tar.gz


--- python-tempita-0.3-fix-tests.patch DELETED ---



From pmachata at fedoraproject.org  Mon Apr 20 11:26:42 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 20 Apr 2009 11:26:42 +0000 (UTC)
Subject: rpms/flex/devel flex-2.5.35-hardening.patch, NONE, 1.1 flex.spec,
	1.56, 1.57
Message-ID: <20090420112642.7E19D70102@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14401

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.35-hardening.patch 
Log Message:
* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-4
- Resolves: #496548.

* Mon Apr 20 2009 Petr Machata <pmachata at redhat.com> - 2.5.35-4
- Get rid of warning caused by ignoring return value of fwrite() in
  ECHO macro.  Debian patch.
- Resolves: #484961


flex-2.5.35-hardening.patch:

--- NEW FILE flex-2.5.35-hardening.patch ---
diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
--- flex-2.5.35/scan.c
+++ flex-2.5.35/scan.c
@@ -2096,7 +2096,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
--- flex-2.5.35/flex.skl
+++ flex-2.5.35/flex.skl
@@ -1075,7 +1075,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 %endif
 %if-c++-only C++ definition
 #define ECHO LexerOutput( yytext, yyleng )
diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
--- flex-2.5.35/skel.c
+++ flex-2.5.35/skel.c
@@ -1142,7 +1142,7 @@
   "/* This used to be an fputs(), but since the string might contain NUL's,",
   " * we now use fwrite().",
   " */",
-  "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
+  "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
   "%endif",
   "%if-c++-only C++ definition",
   "#define ECHO LexerOutput( yytext, yyleng )",


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- flex.spec	24 Feb 2009 17:28:55 -0000	1.56
+++ flex.spec	20 Apr 2009 11:26:12 -0000	1.57
@@ -1,12 +1,14 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
 Source: flex-%{version}.tar.bz2
 Patch0: flex-2.5.35-sign.patch
+Patch1: flex-2.5.35-hardening.patch
+Patch2: flex-2.5.35-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
 BuildRequires: gettext bison m4
@@ -30,6 +32,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -76,6 +80,14 @@
 %{_infodir}/flex.info*
 
 %changelog
+* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-4
+- Resolves: #496548.
+
+* Mon Apr 20 2009 Petr Machata <pmachata at redhat.com> - 2.5.35-4
+- Get rid of warning caused by ignoring return value of fwrite() in
+  ECHO macro.  Debian patch.
+- Resolves: #484961
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mlichvar at fedoraproject.org  Mon Apr 20 11:44:56 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon, 20 Apr 2009 11:44:56 +0000 (UTC)
Subject: rpms/ntp/devel ntp-4.2.4p6-ntpqsprintf.patch, NONE,
	1.1 ntp-4.2.4p5-sleep.patch, 1.1, 1.2 ntp.dhclient, 1.1,
	1.2 ntp.spec, 1.87, 1.88 ntpd.init, 1.27, 1.28
Message-ID: <20090420114456.9DA3C70102@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19218

Modified Files:
	ntp-4.2.4p5-sleep.patch ntp.dhclient ntp.spec ntpd.init 
Added Files:
	ntp-4.2.4p6-ntpqsprintf.patch 
Log Message:
- don't restart ntpd in dhclient script with every renewal
- fix buffer overflow in ntpq (#490617)
- check status in condrestart (#481261)
- don't crash when compiled with HAVE_TIMER_CREATE (#486217)


ntp-4.2.4p6-ntpqsprintf.patch:

--- NEW FILE ntp-4.2.4p6-ntpqsprintf.patch ---

#### ChangeSet ####
2009-04-09 04:13:41-04:00, stenn at whimsy.udel.edu 
  [Sec 1144] limited buffer overflow in ntpq.  CVE-2009-0159

==== ntpq/ntpq.c ====
2009-04-09 04:13:30-04:00, stenn at whimsy.udel.edu +2 -2
  [Sec 1144] limited buffer overflow in ntpq.  CVE-2009-0159

--- 1.65/ntpq/ntpq.c	2006-07-26 00:55:41 -07:00
+++ 1.66/ntpq/ntpq.c	2009-04-09 01:13:30 -07:00
@@ -3185,9 +3185,9 @@ cookedprint(
 				if (!decodeuint(value, &uval))
 				    output_raw = '?';
 				else {
-					char b[10];
+					char b[12];
 
-					(void) sprintf(b, "%03lo", uval);
+					(void) snprintf(b, sizeof b, "%03lo", uval);
 					output(fp, name, b);
 				}
 				break;

ntp-4.2.4p5-sleep.patch:

Index: ntp-4.2.4p5-sleep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4p5-sleep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp-4.2.4p5-sleep.patch	29 Aug 2008 08:26:04 -0000	1.1
+++ ntp-4.2.4p5-sleep.patch	20 Apr 2009 11:44:54 -0000	1.2
@@ -116,24 +116,40 @@
  
  /*
   * Stats.  Number of overflows and number of calls to transmit().
-@@ -116,6 +117,8 @@ reinit_timer(void)
- 	itimer.it_interval.tv_nsec = 0;
- 	timer_settime(ntpd_timerid, 0 /*!TIMER_ABSTIME*/, &itimer, NULL);
- #  else
+@@ -99,6 +100,8 @@ static	RETSIGTYPE alarming P((int));
+ void 
+ reinit_timer(void)
+ {
 +	get_systime(&timer_base);
-+	return;
- 	getitimer(ITIMER_REAL, &itimer);
- 	if (itimer.it_value.tv_sec < 0 || itimer.it_value.tv_sec > (1<<EVENT_TIMEOUT)) {
- 		itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
-@@ -160,6 +163,8 @@ init_timer(void)
++#if 0
+ #if !defined(SYS_WINNT) && !defined(VMS)
+ #  if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
+ 	timer_gettime(ntpd_timerid, &itimer);
+@@ -132,6 +135,7 @@ reinit_timer(void)
+ 	setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);
+ #  endif
+ # endif /* VMS */
++#endif
+ }
+ 
+ /*
+@@ -159,6 +163,8 @@ init_timer(void)
+ 	timer_xmtcalls = 0;
  	timer_timereset = 0;
  
- #if !defined(SYS_WINNT)
 +	get_systime(&timer_base);
-+	return;
++#if 0
+ #if !defined(SYS_WINNT)
  	/*
  	 * Set up the alarm interrupt.	The first comes 2**EVENT_TIMEOUT
- 	 * seconds from now and they continue on every 2**EVENT_TIMEOUT
+@@ -242,6 +248,7 @@ init_timer(void)
+ 	}
+ 
+ #endif /* SYS_WINNT */
++#endif
+ }
+ 
+ #if defined(SYS_WINNT)
 @@ -252,6 +257,46 @@ get_timer_handle(void)
  }
  #endif


Index: ntp.dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp.dhclient	14 Jan 2009 17:46:22 -0000	1.1
+++ ntp.dhclient	20 Apr 2009 11:44:54 -0000	1.2
@@ -25,32 +25,35 @@
 CONF=/etc/ntp.conf
 SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
 
+ntp_replace_conf() {
+        echo "$1" | diff -q ${CONF} - > /dev/null 2>&1
+        if [ $? -eq 1 ]; then
+            echo "$1" > ${CONF}
+            restorecon ${CONF} >/dev/null 2>&1
+            service ntpd condrestart >/dev/null 2>&1
+        fi
+}
+
 ntp_config() {
     if [ ! "${PEERNTP}" = "no" ] && [ -n "${new_ntp_servers}" ] &&
         [ -e ${CONF} ] && [ -d ${SAVEDIR} ]; then
-        mv -f ${CONF} ${SAVECONF}
+        local conf=$(egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${CONF})
 
-        egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${SAVECONF} > ${CONF}
+        conf=$(echo "$conf"
+            for s in ${new_ntp_servers}; do
+                echo "server ${s}  # added by /sbin/dhclient-script"
+            done)
 
-        diff -q ${CONF} ${SAVECONF} >/dev/null 2>&1
-        if [ $? -eq 1 ]; then
-            rm -f ${SAVECONF}
-            cp -f ${CONF} ${SAVECONF}
-        fi
-
-        for s in ${new_ntp_servers}; do
-            echo "server ${s}  # added by /sbin/dhclient-script" >> ${CONF}
-        done
-
-        restorecon ${CONF} ${SAVECONF} >/dev/null 2>&1
-        service ntpd condrestart >/dev/null 2>&1
+        [ -f ${SAVECONF} ] || touch ${SAVECONF}
+        ntp_replace_conf "$conf"
     fi
 }
 
 ntp_restore() {
-    if [ ! "${PEERNTP}" = "no" ] && [ -f ${SAVECONF} ]; then
-        mv -f ${SAVECONF} ${CONF}
-        restorecon ${CONF} >/dev/null 2>&1
-        service ntpd condrestart >/dev/null 2>&1
+    if [ -e ${CONF} ] && [ -f ${SAVECONF} ]; then
+        local conf=$(egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${CONF})
+
+        ntp_replace_conf "$conf"
+        rm -f ${SAVECONF}
     fi
 }


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ntp.spec	26 Feb 2009 06:20:05 -0000	1.87
+++ ntp.spec	20 Apr 2009 11:44:54 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p6
-Release: 3%{?dist}
+Release: 4%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -84,6 +84,8 @@
 Patch26: ntp-4.2.4p5-retryres.patch
 # ntpbz #808
 Patch27: ntp-4.2.4p5-driftonexit.patch
+# ntpbz #1144
+Patch28: ntp-4.2.4p6-ntpqsprintf.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -150,6 +152,7 @@
 %patch25 -p1 -b .rtnetlink
 %patch26 -p1 -b .retryres
 %patch27 -p1 -b .driftonexit
+%patch28 -p1 -b .ntpqsprintf
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -319,6 +322,12 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Mon Apr 20 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-4
+- don't restart ntpd in dhclient script with every renewal
+- fix buffer overflow in ntpq (#490617)
+- check status in condrestart (#481261)
+- don't crash when compiled with HAVE_TIMER_CREATE (#486217)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4p6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: ntpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntpd.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ntpd.init	29 Feb 2008 14:54:31 -0000	1.27
+++ ntpd.init	20 Apr 2009 11:44:54 -0000	1.28
@@ -74,7 +74,7 @@
 	start
 	;;
   try-restart|condrestart)
-	if [ -f $lockfile ]; then
+	if status $prog > /dev/null; then
 	    stop
 	    start
 	fi



From tbzatek at fedoraproject.org  Mon Apr 20 11:45:01 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 20 Apr 2009 11:45:01 +0000 (UTC)
Subject: rpms/sabayon/F-11 sabayon-2.25.0-profile-save.patch, NONE,
	1.1 sabayon.spec, 1.59, 1.60
Message-ID: <20090420114501.CE9C570102@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19280

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-2.25.0-profile-save.patch 
Log Message:
* Mon Apr 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-3
- Another, more complete fix for panel gconf save issues (gnome #542604)


sabayon-2.25.0-profile-save.patch:

--- NEW FILE sabayon-2.25.0-profile-save.patch ---
diff --git a/lib/sources/paneldelegate.py b/lib/sources/paneldelegate.py
index d37c180..87b1af5 100755
--- a/lib/sources/paneldelegate.py
+++ b/lib/sources/paneldelegate.py
@@ -39,6 +39,16 @@ def dprint (fmt, *args):
 
 PANEL_LAUNCHER_DIR = ".gnome2/panel2.d/default/launchers"
 
+
+def copy_dir (src_client, dst_client, dst_address, dir):
+    for entry in src_client.all_entries (dir):
+        if entry.get_schema_name():
+            gconfsource.associate_schema (dst_address, entry.key, entry.get_schema_name ())
+        if entry.value and not entry.get_is_default ():
+            dst_client.set (entry.key, entry.value)
+    for subdir in src_client.all_dirs (dir):
+        copy_dir (src_client, dst_client, dst_address, subdir)
+
 class PanelChange (userprofile.ProfileChange):
     def __init__ (self, source, delegate, id):
         userprofile.ProfileChange.__init__ (self, source, delegate)
@@ -162,10 +172,20 @@ class PanelDelegate (userprofile.SourceDelegate):
             self.added   = added
             self.removed = removed
             self.client = gconf.client_get_default ()
+
+        def _copy_tree(self, dir):
+            if not self.client.dir_exists(dir):
+                (src_client, src_address) = gconfsource.get_client_and_address_for_path(
+                    os.path.join(util.get_home_dir(), '.gconf'))
+                (dst_client, dst_address) = gconfsource.get_client_and_address_for_path(
+                    os.path.join(util.get_home_dir(), '.gconf.xml.defaults'))
+                copy_dir (src_client, dst_client, dst_address, dir)
     
     class PanelToplevel (PanelThing):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
+
+            self._copy_tree(PANEL_KEY_BASE + "/toplevels/" + id)
             
             self.orientation = self.client.get_string (PANEL_KEY_BASE + "/toplevels/" + id + "/orientation")
             
@@ -177,6 +197,8 @@ class PanelDelegate (userprofile.SourceDelegate):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
 
+            self._copy_tree(PANEL_KEY_BASE + "/applets/" + id)
+ 
             self.toplevel_id = self.client.get_string (PANEL_KEY_BASE + "/applets/" + id + "/toplevel_id")
             self.bonobo_iid  = self.client.get_string (PANEL_KEY_BASE + "/applets/" + id + "/bonobo_iid")
 
@@ -191,6 +213,8 @@ class PanelDelegate (userprofile.SourceDelegate):
     class PanelObject (PanelThing):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
+
+            self._copy_tree(PANEL_KEY_BASE + "/objects/" + id)
   
             self.toplevel_id = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/toplevel_id")
             self.object_type = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/object_type")
@@ -220,6 +244,8 @@ class PanelDelegate (userprofile.SourceDelegate):
                     self.name = _("Run Application button")
                 elif action_type == "search":
                     self.name = _("Search button")
+                elif action_type == "connect-server":
+                    self.name = _("Connect to Server button")
                 else:
                     self.name = _("Screenshot button")
             else:
@@ -339,14 +365,6 @@ class PanelDelegate (userprofile.SourceDelegate):
 
         return False
 
-    def __copy_dir (self, src_client, dst_client, dst_address, dir):
-        for entry in src_client.all_entries (dir):
-            if entry.get_schema_name ():
-                gconfsource.associate_schema (dst_address, entry.key, entry.get_schema_name ())
-            if entry.value and not entry.get_is_default ():
-                dst_client.set (entry.key, entry.value)
-        for subdir in src_client.all_dirs (dir):
-            self.__copy_dir (src_client, dst_client, dst_address, subdir)
 
     def __get_current_list (self, dict):
         id_list = []
@@ -368,8 +386,8 @@ class PanelDelegate (userprofile.SourceDelegate):
 
         (client, address) = self.source.get_committing_client_and_address (mandatory)
 
-        self.__copy_dir (self.client, client, address, PANEL_KEY_BASE + "/" + dir_name + "/" + thing.id)
-        
+        copy_dir (self.client, client, address, PANEL_KEY_BASE + "/" + dir_name + "/" + thing.id)
+
         id_list = self.__get_current_list (dict)
         id_list.append (thing.id)
         client.set_list (PANEL_KEY_BASE + "/general/" + id_list_name, gconf.VALUE_STRING, id_list)


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-11/sabayon.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sabayon.spec	3 Apr 2009 16:14:50 -0000	1.59
+++ sabayon.spec	20 Apr 2009 11:44:30 -0000	1.60
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.25.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -30,8 +30,8 @@
 # https://bugzilla.gnome.org/show_bug.cgi?id=576440
 Patch5:  sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=576445
-Patch6:  sabayon-2.25.0-gconf-crashes.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=542604
+Patch7:  sabayon-2.25.0-profile-save.patch
 
 
 Requires: %{name}-apply = %{version}-%{release}
@@ -108,7 +108,7 @@
 %patch3 -p1 -b .selinux
 %patch4 -p0 -b .gconfsave
 %patch5 -p1 -b .xauth
-%patch6 -p1 -b .gconf
+%patch7 -p1 -b .profile
 
 
 %build
@@ -298,6 +298,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Mon Apr 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-3
+- Another, more complete fix for panel gconf save issues (gnome #542604)
+
 * Fri Apr  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-2
 - Fix some gconf crashes (gnome #576445)
 - Temporarily switched back to Xnest to get working keyboard (gnome #576447)



From mlichvar at fedoraproject.org  Mon Apr 20 11:47:57 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon, 20 Apr 2009 11:47:57 +0000 (UTC)
Subject: rpms/ntp/F-11 ntp-4.2.4p6-ntpqsprintf.patch, NONE,
	1.1 ntp-4.2.4p5-sleep.patch, 1.1, 1.2 ntp.dhclient, 1.1,
	1.2 ntp.spec, 1.87, 1.88 ntpd.init, 1.27, 1.28
Message-ID: <20090420114757.EAEF870102@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19984

Modified Files:
	ntp-4.2.4p5-sleep.patch ntp.dhclient ntp.spec ntpd.init 
Added Files:
	ntp-4.2.4p6-ntpqsprintf.patch 
Log Message:
- don't restart ntpd in dhclient script with every renewal
- fix buffer overflow in ntpq (#490617)
- check status in condrestart (#481261)
- don't crash when compiled with HAVE_TIMER_CREATE (#486217)


ntp-4.2.4p6-ntpqsprintf.patch:

--- NEW FILE ntp-4.2.4p6-ntpqsprintf.patch ---

#### ChangeSet ####
2009-04-09 04:13:41-04:00, stenn at whimsy.udel.edu 
  [Sec 1144] limited buffer overflow in ntpq.  CVE-2009-0159

==== ntpq/ntpq.c ====
2009-04-09 04:13:30-04:00, stenn at whimsy.udel.edu +2 -2
  [Sec 1144] limited buffer overflow in ntpq.  CVE-2009-0159

--- 1.65/ntpq/ntpq.c	2006-07-26 00:55:41 -07:00
+++ 1.66/ntpq/ntpq.c	2009-04-09 01:13:30 -07:00
@@ -3185,9 +3185,9 @@ cookedprint(
 				if (!decodeuint(value, &uval))
 				    output_raw = '?';
 				else {
-					char b[10];
+					char b[12];
 
-					(void) sprintf(b, "%03lo", uval);
+					(void) snprintf(b, sizeof b, "%03lo", uval);
 					output(fp, name, b);
 				}
 				break;

ntp-4.2.4p5-sleep.patch:

Index: ntp-4.2.4p5-sleep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-11/ntp-4.2.4p5-sleep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp-4.2.4p5-sleep.patch	29 Aug 2008 08:26:04 -0000	1.1
+++ ntp-4.2.4p5-sleep.patch	20 Apr 2009 11:47:57 -0000	1.2
@@ -116,24 +116,40 @@
  
  /*
   * Stats.  Number of overflows and number of calls to transmit().
-@@ -116,6 +117,8 @@ reinit_timer(void)
- 	itimer.it_interval.tv_nsec = 0;
- 	timer_settime(ntpd_timerid, 0 /*!TIMER_ABSTIME*/, &itimer, NULL);
- #  else
+@@ -99,6 +100,8 @@ static	RETSIGTYPE alarming P((int));
+ void 
+ reinit_timer(void)
+ {
 +	get_systime(&timer_base);
-+	return;
- 	getitimer(ITIMER_REAL, &itimer);
- 	if (itimer.it_value.tv_sec < 0 || itimer.it_value.tv_sec > (1<<EVENT_TIMEOUT)) {
- 		itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
-@@ -160,6 +163,8 @@ init_timer(void)
++#if 0
+ #if !defined(SYS_WINNT) && !defined(VMS)
+ #  if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
+ 	timer_gettime(ntpd_timerid, &itimer);
+@@ -132,6 +135,7 @@ reinit_timer(void)
+ 	setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);
+ #  endif
+ # endif /* VMS */
++#endif
+ }
+ 
+ /*
+@@ -159,6 +163,8 @@ init_timer(void)
+ 	timer_xmtcalls = 0;
  	timer_timereset = 0;
  
- #if !defined(SYS_WINNT)
 +	get_systime(&timer_base);
-+	return;
++#if 0
+ #if !defined(SYS_WINNT)
  	/*
  	 * Set up the alarm interrupt.	The first comes 2**EVENT_TIMEOUT
- 	 * seconds from now and they continue on every 2**EVENT_TIMEOUT
+@@ -242,6 +248,7 @@ init_timer(void)
+ 	}
+ 
+ #endif /* SYS_WINNT */
++#endif
+ }
+ 
+ #if defined(SYS_WINNT)
 @@ -252,6 +257,46 @@ get_timer_handle(void)
  }
  #endif


Index: ntp.dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-11/ntp.dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp.dhclient	14 Jan 2009 17:46:22 -0000	1.1
+++ ntp.dhclient	20 Apr 2009 11:47:57 -0000	1.2
@@ -25,32 +25,35 @@
 CONF=/etc/ntp.conf
 SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
 
+ntp_replace_conf() {
+        echo "$1" | diff -q ${CONF} - > /dev/null 2>&1
+        if [ $? -eq 1 ]; then
+            echo "$1" > ${CONF}
+            restorecon ${CONF} >/dev/null 2>&1
+            service ntpd condrestart >/dev/null 2>&1
+        fi
+}
+
 ntp_config() {
     if [ ! "${PEERNTP}" = "no" ] && [ -n "${new_ntp_servers}" ] &&
         [ -e ${CONF} ] && [ -d ${SAVEDIR} ]; then
-        mv -f ${CONF} ${SAVECONF}
+        local conf=$(egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${CONF})
 
-        egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${SAVECONF} > ${CONF}
+        conf=$(echo "$conf"
+            for s in ${new_ntp_servers}; do
+                echo "server ${s}  # added by /sbin/dhclient-script"
+            done)
 
-        diff -q ${CONF} ${SAVECONF} >/dev/null 2>&1
-        if [ $? -eq 1 ]; then
-            rm -f ${SAVECONF}
-            cp -f ${CONF} ${SAVECONF}
-        fi
-
-        for s in ${new_ntp_servers}; do
-            echo "server ${s}  # added by /sbin/dhclient-script" >> ${CONF}
-        done
-
-        restorecon ${CONF} ${SAVECONF} >/dev/null 2>&1
-        service ntpd condrestart >/dev/null 2>&1
+        [ -f ${SAVECONF} ] || touch ${SAVECONF}
+        ntp_replace_conf "$conf"
     fi
 }
 
 ntp_restore() {
-    if [ ! "${PEERNTP}" = "no" ] && [ -f ${SAVECONF} ]; then
-        mv -f ${SAVECONF} ${CONF}
-        restorecon ${CONF} >/dev/null 2>&1
-        service ntpd condrestart >/dev/null 2>&1
+    if [ -e ${CONF} ] && [ -f ${SAVECONF} ]; then
+        local conf=$(egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${CONF})
+
+        ntp_replace_conf "$conf"
+        rm -f ${SAVECONF}
     fi
 }


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-11/ntp.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ntp.spec	26 Feb 2009 06:20:05 -0000	1.87
+++ ntp.spec	20 Apr 2009 11:47:57 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p6
-Release: 3%{?dist}
+Release: 4%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -84,6 +84,8 @@
 Patch26: ntp-4.2.4p5-retryres.patch
 # ntpbz #808
 Patch27: ntp-4.2.4p5-driftonexit.patch
+# ntpbz #1144
+Patch28: ntp-4.2.4p6-ntpqsprintf.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -150,6 +152,7 @@
 %patch25 -p1 -b .rtnetlink
 %patch26 -p1 -b .retryres
 %patch27 -p1 -b .driftonexit
+%patch28 -p1 -b .ntpqsprintf
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -319,6 +322,12 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Mon Apr 20 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-4
+- don't restart ntpd in dhclient script with every renewal
+- fix buffer overflow in ntpq (#490617)
+- check status in condrestart (#481261)
+- don't crash when compiled with HAVE_TIMER_CREATE (#486217)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4p6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: ntpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-11/ntpd.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ntpd.init	29 Feb 2008 14:54:31 -0000	1.27
+++ ntpd.init	20 Apr 2009 11:47:57 -0000	1.28
@@ -74,7 +74,7 @@
 	start
 	;;
   try-restart|condrestart)
-	if [ -f $lockfile ]; then
+	if status $prog > /dev/null; then
 	    stop
 	    start
 	fi



From steved at fedoraproject.org  Mon Apr 20 11:51:35 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 20 Apr 2009 11:51:35 +0000 (UTC)
Subject: rpms/nfs-utils/F-11 nfs-utils-1.1.5-nfsstat-update.patch, NONE,
	1.1 nfs-utils-1.1.5-umount-privport.patch, NONE,
	1.1 nfs-utils.spec, 1.221, 1.222
Message-ID: <20090420115135.6636C70102@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20615

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.5-nfsstat-update.patch 
	nfs-utils-1.1.5-umount-privport.patch 
Log Message:
- Update nfsstat with --sleep and --list options
- Fixed umount from using non-privilege ports (bz 492598)


nfs-utils-1.1.5-nfsstat-update.patch:

--- NEW FILE nfs-utils-1.1.5-nfsstat-update.patch ---
commit fa5352f78533c7ad1d8603c1a4ba08fa82768e6b
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Apr 8 10:26:26 2009 -0400

    The --list option does not work on server stats.
    
    The print_stats_list() routine was using the client's
    stats to decide whether to display any stats. This did
    not work when there was only server stats.
    
    This patch breaks up print_stats_list into two different
    routines allowing both server and clients stats to be
    listed.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit 500fab45f73c0ba1bc442157ef3d7744f20e6b2a
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Apr 8 09:48:58 2009 -0400

    The server stats were not being updated with the
    -Z options causing the stats to be incorrect.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit cb81340660112f9296205901b09c0668a480bc47
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Apr 8 09:28:22 2009 -0400

    Eliminate the displaying zero stats when the explicit protocol
    is specified (-2, -3, -4) the -Z and or --list options.
    
    When a particular protocol is specified and either
    the -Z or --list options are used, zeros or blank lines
    are echoed to the screen when there is not any NFS traffic.
    This cause any useful data to be scroll off the screen.
    
    With this patch only non-zero stats will be shown, which
    makes the output of these options more condensed and
    in turn more useful.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit ca8eb17798fb9b4936a38cc58fe379e9e8d379f9
Author: Kevin Constantine <kevin.constantine at disneyanimation.com>
Date:   Sat Apr 4 07:18:26 2009 -0400

    nfsstat: Add --list flag
    
    nfsstat.c: Adds the --list flag to print information in a list format
       instead of the standard multi-column format
    nfsstat.man: Updates the manpage to include the --list flag.
    
    Signed-off-by: Kevin Constantine <kevin.constantine at disneyanimation.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit 524cdc4eb1663e5c10d12160e48c45dc81852568
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Apr 4 06:46:09 2009 -0400

    Keep the interval output quite when there is no NFS traffic.
    
    The  'nfsstat -Z5' command continually outputs the following
    when there is no NFS traffic.
    
    Client rpc stats:
    calls      retrans    authrefrsh
    0          0          0
    
    This patch adds code that will keep the interval output
    quite so real results will not be scrolled of the screen
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit d2319b9cabc67d999b16aea2077a4a3c642ec28d
Author: Kevin Constantine <kevin.constantine at disneyanimation.com>
Date:   Sat Apr 4 06:29:01 2009 -0400

    nfsstat: Print diff stats every N seconds
    
    nfsstat.c: Implements an optional "interval" argument to --sleep
    nfsstat.man: Explains the use of --sleep[interval]
    
    Reviewed-By: Greg Banks <gnb at fmeh.org>
    Signed-off-by: Kevin Constantine <kevin.constantine at disneyanimation.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>
___________________________________________________________
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c
index 1517414..7e9f327 100644
--- a/utils/nfsstat/nfsstat.c
+++ b/utils/nfsstat/nfsstat.c
@@ -167,10 +167,16 @@ DECLARE_SRV(srvinfo, _old);
 DECLARE_CLT(cltinfo);
 DECLARE_CLT(cltinfo, _old);
 
+static void		print_all_stats(int, int, int);
+static void		print_server_stats(int, int);
+static void		print_client_stats(int, int);
+static void		print_stats_list(int, int, int);
 static void		print_numbers(const char *, unsigned int *,
 					unsigned int);
 static void		print_callstats(const char *, const char **,
 					unsigned int *, unsigned int);
+static void		print_callstats_list(const char *, const char **,
+					unsigned int *, unsigned int);
 static int		parse_raw_statfile(const char *, struct statinfo *);
 static int 		parse_pretty_statfile(const char *, struct statinfo *);
 
@@ -181,8 +187,10 @@ static int		mounts(const char *);
 static void		get_stats(const char *, struct statinfo *, int *, int,
 					int);
 static int		has_stats(const unsigned int *);
+static int		has_rpcstats(const unsigned int *, int);
 static void 		diff_stats(struct statinfo *, struct statinfo *, int);
 static void 		unpause(int);
+static void 		update_old_counters(struct statinfo *, struct statinfo *);
 
 static time_t		starttime;
 
@@ -207,26 +215,30 @@ void usage(char *name)
 {
 	printf("Usage: %s [OPTION]...\n\
 \n\
-  -m, --mounts\t\tShow statistics on mounted NFS filesystems\n\
-  -c, --client\t\tShow NFS client statistics\n\
-  -s, --server\t\tShow NFS server statistics\n\
-  -2\t\t\tShow NFS version 2 statistics\n\
-  -3\t\t\tShow NFS version 3 statistics\n\
-  -4\t\t\tShow NFS version 4 statistics\n\
-  -o [facility]\t\tShow statistics on particular facilities.\n\
-     nfs\tNFS protocol information\n\
-     rpc\tGeneral RPC information\n\
-     net\tNetwork layer statistics\n\
-     fh\t\tUsage information on the server's file handle cache\n\
-     rc\t\tUsage information on the server's request reply cache\n\
-     all\tSelect all of the above\n\
-  -v, --verbose, --all\tSame as '-o all'\n\
-  -r, --rpc\t\tShow RPC statistics\n\
-  -n, --nfs\t\tShow NFS statistics\n\
-  -Z, --sleep\t\tSaves stats, pauses, diffs current and saved\n\
-  -S, --since file\tShows difference between current stats and those in 'file'\n\
-  --version\t\tShow program version\n\
-  --help\t\tWhat you just did\n\
+  -m, --mounts		Show statistics on mounted NFS filesystems\n\
+  -c, --client		Show NFS client statistics\n\
+  -s, --server		Show NFS server statistics\n\
+  -2			Show NFS version 2 statistics\n\
+  -3			Show NFS version 3 statistics\n\
+  -4			Show NFS version 4 statistics\n\
+  -o [facility]		Show statistics on particular facilities.\n\
+     nfs		NFS protocol information\n\
+     rpc		General RPC information\n\
+     net		Network layer statistics\n\
+     fh			Usage information on the server's file handle cache\n\
+     rc			Usage information on the server's request reply cache\n\
+     all		Select all of the above\n\
+  -v, --verbose, --all	Same as '-o all'\n\
+  -r, --rpc		Show RPC statistics\n\
+  -n, --nfs		Show NFS statistics\n\
+  -Z[#], --sleep[=#]	Collects stats until interrupted.\n\
+			    Cumulative stats are then printed\n\
+          		    If # is provided, stats will be output every\n\
+			    # seconds.\n\
+  -S, --since file	Shows difference between current stats and those in 'file'\n\
+  -l, --list		Prints stats in list format\n\
+  --version		Show program version\n\
+  --help		What you just did\n\
 \n", name);
 	exit(0);
 }
@@ -245,10 +257,12 @@ static struct option longopts[] =
 	{ "zero", 0, 0, 'z' },
 	{ "help", 0, 0, '\1' },
 	{ "version", 0, 0, '\2' },
-	{ "sleep", 0, 0, 'Z' },
+	{ "sleep", 2, 0, 'Z' },
 	{ "since", 1, 0, 'S' },
+	{ "list", 0, 0, 'l' },
 	{ NULL, 0, 0, 0 }
 };
+int opt_sleep;
 
 int
 main(int argc, char **argv)
@@ -257,7 +271,8 @@ main(int argc, char **argv)
 			opt_srv = 0,
 			opt_clt = 0,
 			opt_prt = 0,
-			opt_sleep = 0,
+			sleep_time = 0,
+			opt_list =0,
 			opt_since = 0;
 	int		c;
 	char           *progname,
@@ -279,7 +294,7 @@ main(int argc, char **argv)
 	else
 		progname = argv[0];
 
-	while ((c = getopt_long(argc, argv, "234acmno:ZS:vrsz\1\2", longopts, NULL)) != EOF) {
+	while ((c = getopt_long(argc, argv, "234acmno:Z::S:vrslz\1\2", longopts, NULL)) != EOF) {
 		switch (c) {
 		case 'a':
 			fprintf(stderr, "nfsstat: nfs acls are not yet supported.\n");
@@ -311,6 +326,9 @@ main(int argc, char **argv)
 			break;
 		case 'Z':
 			opt_sleep = 1;
+			if (optarg) {
+				sleep_time = atoi(optarg);
+			}
 			break;
 		case 'S':
 			opt_since = 1;
@@ -334,6 +352,9 @@ main(int argc, char **argv)
 		case 's':
 			opt_srv = 1;
 			break;
+		case 'l':
+			opt_list = 1;
+			break;
 		case 'z':
 			fprintf(stderr, "nfsstat: zeroing of nfs statistics "
 					"not yet supported\n");
@@ -384,7 +405,7 @@ main(int argc, char **argv)
 	if (opt_clt)
 		get_stats(clientfile, clientinfo, &opt_clt, opt_srv, 0);
 
-	if (opt_sleep) {
+	if (opt_sleep && !sleep_time) {
 		starttime = time(NULL);
 		printf("Collecting statistics; press CTRL-C to view results from interval (i.e., from pause to CTRL-C).\n");
 		if (sigaction(SIGINT, &act, NULL) != 0) {
@@ -404,119 +425,288 @@ main(int argc, char **argv)
 			diff_stats(clientinfo_tmp, clientinfo, 0);
 		}
 	}
+	if(sleep_time) {
+		while(1) {
+			if (opt_srv) {
+				get_stats(NFSSRVSTAT, serverinfo_tmp , &opt_srv, opt_clt, 1);
+				diff_stats(serverinfo_tmp, serverinfo, 1);
+			}
+			if (opt_clt) {
+				get_stats(NFSCLTSTAT, clientinfo_tmp, &opt_clt, opt_srv, 0);
+				diff_stats(clientinfo_tmp, clientinfo, 0);
+			}
+			if (opt_list) {
+				print_stats_list(opt_srv, opt_clt, opt_prt);
+			} else {
+				print_all_stats(opt_srv, opt_clt, opt_prt);
+			}
+			fflush(stdout);
+
+			if (opt_srv)
+				update_old_counters(serverinfo_tmp, serverinfo);
+			if (opt_clt)
+				update_old_counters(clientinfo_tmp, clientinfo);
+
+			sleep(sleep_time);
+		}	
+	} else {
+		if (opt_list) {
+			print_stats_list(opt_srv, opt_clt, opt_prt);
+		} else {
+			print_all_stats(opt_srv, opt_clt, opt_prt);
+		}
+	}
 
-	if (opt_srv) {
-		if (opt_prt & PRNT_NET) {
-			print_numbers(
-			LABEL_srvnet
-			"packets    udp        tcp        tcpconn\n",
-			srvnetinfo, 4
-			);
+	return 0;
+}
+
+static void
+print_all_stats (int opt_srv, int opt_clt, int opt_prt)
+{
+	print_server_stats(opt_srv, opt_prt);
+	print_client_stats(opt_clt, opt_prt);
+}
+
+static void 
+print_server_stats(int opt_srv, int opt_prt) 
+{
+	if (!opt_srv)
+		return;
+
+	if (opt_prt & PRNT_NET) {
+		if (opt_sleep && !has_rpcstats(srvnetinfo, 4)) {
+		} else {
+			print_numbers( LABEL_srvnet
+				"packets    udp        tcp        tcpconn\n",
+			srvnetinfo, 4);
 			printf("\n");
 		}
-		if (opt_prt & PRNT_RPC) {
-			print_numbers(
-			LABEL_srvrpc
-			"calls      badcalls   badauth    badclnt    xdrcall\n",
-			srvrpcinfo, 5
-			);
+	}
+	if (opt_prt & PRNT_RPC) {
+		if (opt_sleep && !has_rpcstats(srvrpcinfo, 5)) {
+			;
+		} else {
+			print_numbers(LABEL_srvrpc
+				"calls      badcalls   badauth    badclnt    xdrcall\n",
+				srvrpcinfo, 5);
 			printf("\n");
 		}
-		if (opt_prt & PRNT_RC) {
-			print_numbers(
-			LABEL_srvrc
-			"hits       misses     nocache\n",
-			srvrcinfo, 3
-			);
+	}
+	if (opt_prt & PRNT_RC) {
+		if (opt_sleep && !has_rpcstats(srvrcinfo, 3)) {
+			;
+		} else {
+			print_numbers(LABEL_srvrc
+				"hits       misses     nocache\n",
+				srvrcinfo, 3);
 			printf("\n");
 		}
+	}
 
-		/*
-		 * 2.2 puts all fh-related info after the 'rc' header
-		 * 2.4 puts all fh-related info after the 'fh' header, but relocates
-		 *     'stale' to the start and swaps dir and nondir :-(  
-		 *     We preseve the 2.2 order
-		 */
-		if (opt_prt & PRNT_FH) {
-			if (get_stat_info("fh", srvinfo)) {	/* >= 2.4 */
-				int t = srvfhinfo[3];
-				srvfhinfo[3]=srvfhinfo[4];
-				srvfhinfo[4]=t;
-				
-				srvfhinfo[5]=srvfhinfo[0]; /* relocate 'stale' */
-				
-				print_numbers(
-					LABEL_srvfh
-					"lookup     anon       ncachedir  ncachedir  stale\n",
-					srvfhinfo + 1, 5);
-			} else					/* < 2.4 */
-				print_numbers(
-					LABEL_srvfh
-					"lookup     anon       ncachedir  ncachedir  stale\n",
-					srvrcinfo + 3, 5);
-			printf("\n");
+	/*
+	 * 2.2 puts all fh-related info after the 'rc' header
+	 * 2.4 puts all fh-related info after the 'fh' header, but relocates
+	 *     'stale' to the start and swaps dir and nondir :-(  
+	 *     We preseve the 2.2 order
+	 */
+	if (opt_prt & PRNT_FH) {
+		if (get_stat_info("fh", srvinfo)) {	/* >= 2.4 */
+			int t = srvfhinfo[3];
+			srvfhinfo[3]=srvfhinfo[4];
+			srvfhinfo[4]=t;
+			
+			srvfhinfo[5]=srvfhinfo[0]; /* relocate 'stale' */
+			
+			print_numbers(
+				LABEL_srvfh
+				"lookup     anon       ncachedir  ncachedir  stale\n",
+				srvfhinfo + 1, 5);
+		} else					/* < 2.4 */
+			print_numbers(
+				LABEL_srvfh
+				"lookup     anon       ncachedir  ncachedir  stale\n",
+				srvrcinfo + 3, 5);
+		printf("\n");
+	}
+	if (opt_prt & PRNT_CALLS) {
+		if ((opt_prt & PRNT_V2) || 
+				((opt_prt & PRNT_AUTO) && has_stats(srvproc2info))) {
+			if (opt_sleep && !has_stats(srvproc2info)) {
+				;
+			} else {
+				print_callstats(LABEL_srvproc2,
+					nfsv2name, srvproc2info + 1, 
+					sizeof(nfsv2name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V3) || 
+				((opt_prt & PRNT_AUTO) && has_stats(srvproc3info))) {
+			if (opt_sleep && !has_stats(srvproc3info)) {
+				;
+			} else {
+				print_callstats(LABEL_srvproc3,
+					nfsv3name, srvproc3info + 1, 
+					sizeof(nfsv3name)/sizeof(char *));
+			}
 		}
-		if (opt_prt & PRNT_CALLS) {
-			if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc2info)))
-				print_callstats(
-				LABEL_srvproc2,
-				nfsv2name, srvproc2info + 1, sizeof(nfsv2name)/sizeof(char *)
-				);
-			if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc3info)))
-				print_callstats(
-				LABEL_srvproc3,
-				nfsv3name, srvproc3info + 1, sizeof(nfsv3name)/sizeof(char *)
-				);
-			if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc4info))) {
-				print_callstats(
-				LABEL_srvproc4,
-				nfssrvproc4name, srvproc4info + 1, sizeof(nfssrvproc4name)/sizeof(char *)
-				);
-				print_callstats(
-				LABEL_srvproc4ops,
-				nfssrvproc4opname, srvproc4opsinfo + 1, sizeof(nfssrvproc4opname)/sizeof(char *)
-				);
+		if ((opt_prt & PRNT_V4) || 
+				((opt_prt & PRNT_AUTO) && has_stats(srvproc4info))) {
+			if (opt_sleep && !has_stats(srvproc4info)) {
+				;
+			} else {
+				print_callstats( LABEL_srvproc4,
+					nfssrvproc4name, srvproc4info + 1, 
+					sizeof(nfssrvproc4name)/sizeof(char *));
+				print_callstats(LABEL_srvproc4ops,
+					nfssrvproc4opname, srvproc4opsinfo + 1, 
+					sizeof(nfssrvproc4opname)/sizeof(char *));
 			}
 		}
 	}
-
-	if (opt_clt) {
-		if (opt_prt & PRNT_NET) {
-			print_numbers(
-			LABEL_cltnet
-			"packets    udp        tcp        tcpconn\n",
-			cltnetinfo, 4
-			);
+}
+static void
+print_client_stats(int opt_clt, int opt_prt) 
+{
+	if (!opt_clt)
+		return;
+
+	if (opt_prt & PRNT_NET) {
+		if (opt_sleep && !has_rpcstats(cltnetinfo, 4)) {
+			;
+		} else { 
+			print_numbers(LABEL_cltnet
+				"packets    udp        tcp        tcpconn\n",
+				cltnetinfo, 4);
 			printf("\n");
 		}
-		if (opt_prt & PRNT_RPC) {
-			print_numbers(
-			LABEL_cltrpc
-			"calls      retrans    authrefrsh\n",
-			cltrpcinfo, 3
-			);
+	}
+	if (opt_prt & PRNT_RPC) {
+		if (opt_sleep && !has_rpcstats(cltrpcinfo, 3)) {
+			;
+		} else {
+			print_numbers(LABEL_cltrpc
+				"calls      retrans    authrefrsh\n",
+				cltrpcinfo, 3);
 			printf("\n");
 		}
-		if (opt_prt & PRNT_CALLS) {
-			if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc2info)))
-				print_callstats(
-				LABEL_cltproc2,
-				nfsv2name, cltproc2info + 1,  sizeof(nfsv2name)/sizeof(char *)
-				);
-			if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc3info)))
-				print_callstats(
-				LABEL_cltproc3,
-				nfsv3name, cltproc3info + 1, sizeof(nfsv3name)/sizeof(char *)
-				);
-			if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc4info)))
-				print_callstats(
-				LABEL_cltproc4,
-				nfscltproc4name, cltproc4info + 1,  sizeof(nfscltproc4name)/sizeof(char *)
-				);
+	}
+	if (opt_prt & PRNT_CALLS) {
+		if ((opt_prt & PRNT_V2) || 
+				((opt_prt & PRNT_AUTO) && has_stats(cltproc2info))) {
+			if (opt_sleep && !has_stats(cltproc2info)) {
+				;
+			} else {
+				print_callstats(LABEL_cltproc2,
+					nfsv2name, cltproc2info + 1,  
+					sizeof(nfsv2name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V3) || 
+				((opt_prt & PRNT_AUTO) && has_stats(cltproc3info))) {
+			if (opt_sleep && !has_stats(cltproc3info)) {
+				;
+			} else {
+				print_callstats(LABEL_cltproc3,
+					nfsv3name, cltproc3info + 1, 
+					sizeof(nfsv3name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V4) || 
+				((opt_prt & PRNT_AUTO) && has_stats(cltproc4info))) {
+			if (opt_sleep && !has_stats(cltproc4info)) {
+				;
+			} else {
+				print_callstats(LABEL_cltproc4,
+					nfscltproc4name, cltproc4info + 1,  
+					sizeof(nfscltproc4name)/sizeof(char *));
+			}
 		}
 	}
+}
 
-	return 0;
+static void
+print_clnt_list(int opt_prt) 
+{
+	if (opt_prt & PRNT_CALLS) {
+		if ((opt_prt & PRNT_V2) || 
+				((opt_prt & PRNT_AUTO) && has_stats(cltproc2info))) {
+			if (opt_sleep && !has_stats(cltproc2info)) {
+				;
+			} else {
+				print_callstats_list("nfs v2 client",
+					nfsv2name, cltproc2info + 1,  
+					sizeof(nfsv2name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V3) || 
+				((opt_prt & PRNT_AUTO) && has_stats(cltproc3info))) {
+			if (opt_sleep && !has_stats(cltproc3info)) {
+				;
+			} else { 
+				print_callstats_list("nfs v3 client",
+					nfsv3name, cltproc3info + 1, 
+					sizeof(nfsv3name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V4) || 
+				((opt_prt & PRNT_AUTO) && has_stats(cltproc4info))) {
+			if (opt_sleep && !has_stats(cltproc4info)) {
+				;
+			} else {
+				print_callstats_list("nfs v4 ops",
+					nfssrvproc4opname, srvproc4opsinfo + 1, 
+					sizeof(nfssrvproc4opname)/sizeof(char *));
+				print_callstats_list("nfs v4 client",
+					nfscltproc4name, cltproc4info + 1,  
+					sizeof(nfscltproc4name)/sizeof(char *));
+			}
+		}
+	}
+}
+static void
+print_serv_list(int opt_prt) 
+{
+	if (opt_prt & PRNT_CALLS) {
+		if ((opt_prt & PRNT_V2) || 
+				((opt_prt & PRNT_AUTO) && has_stats(srvproc2info))) {
+			if (opt_sleep && !has_stats(srvproc2info)) {
+				;
+			} else {
+				print_callstats_list("nfs v2 server",
+					nfsv2name, srvproc2info + 1, 
+					sizeof(nfsv2name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V3) || 
+				((opt_prt & PRNT_AUTO) && has_stats(srvproc3info))) {
+			if (opt_sleep && !has_stats(srvproc3info)) {
+				;
+			} else {
+				print_callstats_list("nfs v3 server",
+					nfsv3name, srvproc3info + 1, 
+					sizeof(nfsv3name)/sizeof(char *));
+			}
+		}
+		if ((opt_prt & PRNT_V4) || 
+				((opt_prt & PRNT_AUTO) && has_stats(srvproc4opsinfo))) {
+			if (opt_sleep && !has_stats(srvproc4info)) {
+				;
+			} else {
+				print_callstats_list("nfs v4 ops",
+					nfssrvproc4opname, srvproc4opsinfo + 1, 
+					sizeof(nfssrvproc4opname)/sizeof(char *));
+			}
+		}
+	}
+}
+static void
+print_stats_list(int opt_srv, int opt_clt, int opt_prt) 
+{
+	if (opt_srv)
+		print_serv_list(opt_prt);
+
+	if (opt_clt)
+		print_clnt_list(opt_prt);
 }
 
 static statinfo *
@@ -569,6 +759,29 @@ print_callstats(const char *hdr, const char **names,
 	printf("\n");
 }
 
+static void
+print_callstats_list(const char *hdr, const char **names,
+		 	unsigned int *callinfo, unsigned int nr)
+{
+	unsigned long long	calltotal;
+	int			i;
+
+	for (i = 0, calltotal = 0; i < nr; i++) {
+		calltotal += callinfo[i];
+	}
+	if (!calltotal)
+		return;
+	printf("%13s %13s %8llu \n", hdr, "total:", calltotal);
+	printf("------------- ------------- --------\n");
+	for (i = 0; i < nr; i++) {
+			if (callinfo[i])
+				printf("%13s %12s: %8u \n", hdr, names[i], callinfo[i]);
+	}
+	printf("\n");
+		
+}
+
+
 /* returns 0 on success, 1 otherwise */
 static int
 parse_raw_statfile(const char *name, struct statinfo *statp)
@@ -792,6 +1005,15 @@ has_stats(const unsigned int *info)
 {
 	return (info[0] && info[info[0] + 1] > info[0]);
 }
+static int
+has_rpcstats(const unsigned int *info, int size)
+{
+	int i, cnt;
+
+	for (i=0, cnt=0; i < size; i++)
+		cnt += info[i];
+	return cnt;
+}
 
 /*
  * take the difference of each individual stat value in 'new' and 'old'
@@ -846,3 +1068,13 @@ unpause(int sig)
 	seconds = (int)time_diff % 60;
 	printf("Signal received; displaying (only) statistics gathered over the last %d minutes, %d seconds:\n\n", minutes, seconds);
 }
+
+static void
+update_old_counters(struct statinfo *new, struct statinfo *old)
+{
+	int z, i;
+	for (z = 0; old[z].tag; z++) 
+		for (i = 0; i <= old[z].nrvals; i++) 
+			old[z].valptr[i] += new[z].valptr[i];
+
+}
diff --git a/utils/nfsstat/nfsstat.man b/utils/nfsstat/nfsstat.man
index cb5f89f..52215a9 100644
--- a/utils/nfsstat/nfsstat.man
+++ b/utils/nfsstat/nfsstat.man
@@ -72,6 +72,9 @@ Display all of the above facilities.
 .B \-v, \-\-verbose
 This is equivalent to \fB\-o all\fR.
 .TP
+.B \-l, \-\-list
+Print information in list form.
+.TP
 .BI "\-S, \-\-since " file
 Instead of printing current statistics, 
 .B nfsstat
@@ -91,7 +94,7 @@ output
 .I file
 are treated as zeroes.
 .TP
-.B \-Z, \-\-sleep
+.B \-Z[interval], \-\-sleep=[interval]
 Instead of printing current statistics and immediately exiting,
 .B nfsstat
 takes a snapshot of the current statistics and pauses until it receives
@@ -100,6 +103,10 @@ takes a snapshot of the current statistics and pauses until it receives
 .BR Ctrl-C ),
 at which point it takes another snapshot and displays the difference
 between the two.
+If \fIinterval\fR is specified, 
+.B nfsstat
+will print the number of \fBNFS\fR calls made since the previous report.
+Stats will be printed repeatedly every \fIinterval\fR seconds.
 .\" --------------------- EXAMPLES -------------------------------
 .SH EXAMPLES
 .TP

nfs-utils-1.1.5-umount-privport.patch:

--- NEW FILE nfs-utils-1.1.5-umount-privport.patch ---
commit c062f45deebc20dae5eb8cdb50fb03fb1c252b47
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Sat Apr 18 09:45:46 2009 -0400

    umount.nfs: Fix return value of nfs_mount_protocol()
    
    Fix a copy-paste error introduced in nfs_mount_protocol().  It should
    return an IPPROTO_ number, not an NFS version number.
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit 879a9b1b2bdd1160571896023d06291a611c4315
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Sat Apr 18 09:44:56 2009 -0400

    umount.nfs: Use a privileged port when sending UMNT	requests
    
    Turns out we do actually need to use a privileged port for UMNT.  The
    Linux rpc.mountd complains if an ephemeral source port is used:
    
      Apr 17 15:52:19 ingres mountd[2061]: refused unmount request from
        192.168.0.59 for /export (/export): illegal port 60932
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit 8c94296bc84f3a204f2061c0391a1d2350e4f37e
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Sat Apr 18 09:43:58 2009 -0400

    support: Provide an API for creating a privileged RPC client
    
    We needed to guarantee that some RPC programs, such as PMAP, got an
    unprivileged port, to prevent exhausting the local privileged port
    space sending RPC requests that don't need such privileges.
    nfs_get_rpcclient() provides that feature.
    
    However, some RPC programs, such as MNT and UMNT, require a privileged
    port.  So, let's provide an additional API for this that also supports
    IPv6 and setting a destination port.
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit 41eb279c2f46ca020bc3b8d17811555f74b99d2e
Author: Benny Halevy <bhalevy at panasas.com>
Date:   Wed Apr 15 14:16:08 2009 -0400

    utils/nfsd: fix -N optarg error printout
    
    as currently printed c is the version number, not a string char,
    therefore is should be printed as %d not %c.  That said, just print
    optarg as %s since it might be non-numeric.
    
    Signed-off-by: Benny Halevy <bhalevy at panasas.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit d4008af910ba1d527f00f8207fb3f8f5709e943d
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Apr 15 12:52:48 2009 -0400

    getport.c: fix non-standard C
    
    Squelch a compiler warning in getport.c:
    
      getport.c:65: warning: ??static?? is not at beginning of declaration
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit c51d826a201095fb3a7c68c3666e2b795a2b687d
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Apr 15 12:38:40 2009 -0400

    nfs-utils: reverse order of librpcsecgss and libgssglue checks
    
    The check that validates the version of librpcsecgss also needs to
    have libgssglue installed.  Without libgssglue, ./configure complains
    that it can't find rpcsecgss, even though it's installed.
    
    It also turns out that the error message generated by pkg-config is
    more complete than the one we have in aclocal/rpcsec_vers.m4, so just
    let those PKG_CHECK_MODULES m4 macros use the default error message.
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>
---------------------------------------------------------------
diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4
index e59c0aa..25902ca 100644
--- a/aclocal/rpcsec_vers.m4
+++ b/aclocal/rpcsec_vers.m4
@@ -1,12 +1,11 @@
 dnl Checks librpcsec version
 AC_DEFUN([AC_RPCSEC_VERSION], [
 
-  dnl TI-RPC replaces librpcsecgss, but we still need libgssglue
+  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
+
+  dnl TI-RPC replaces librpcsecgss
   if test "$enable_tirpc" = no; then
-    PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16], ,
-                      [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss.  If you have pkgconfig installed, you might try setting environment variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])
-  else
-    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
+    PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16])
   fi
 
 ])dnl
diff --git a/support/include/nfsrpc.h b/support/include/nfsrpc.h
index 097debb..543c35b 100644
--- a/support/include/nfsrpc.h
+++ b/support/include/nfsrpc.h
@@ -24,6 +24,7 @@
 #define __NFS_UTILS_NFSRPC_H
 
 #include <rpc/types.h>
+#include <rpc/clnt.h>
 
 /*
  * Conventional RPC program numbers
@@ -54,7 +55,7 @@
 extern rpcprog_t	nfs_getrpcbyname(const rpcprog_t, const char *table[]);
 
 /*
- * Acquire an RPC CLIENT *
+ * Acquire an RPC CLIENT * with an ephemeral source port
  */
 extern CLIENT		*nfs_get_rpcclient(const struct sockaddr *,
 				const socklen_t, const unsigned short,
@@ -62,6 +63,14 @@ extern CLIENT		*nfs_get_rpcclient(const struct sockaddr *,
 				struct timeval *);
 
 /*
+ * Acquire an RPC CLIENT * with a privileged source port
+ */
+extern CLIENT		*nfs_get_priv_rpcclient( const struct sockaddr *,
+				const socklen_t, const unsigned short,
+				const rpcprog_t, const rpcvers_t,
+				struct timeval *);
+
+/*
  * Convert a socket address to a universal address
  */
 extern char		*nfs_sockaddr2universal(const struct sockaddr *,
diff --git a/support/nfs/getport.c b/support/nfs/getport.c
index 734d21a..cf1677e 100644
--- a/support/nfs/getport.c
+++ b/support/nfs/getport.c
@@ -60,9 +60,9 @@
 #endif	/* !HAVE_LIBTIRPC */
 
 #ifdef HAVE_LIBTIRPC
-const static rpcvers_t default_rpcb_version = RPCBVERS_4;
+static const rpcvers_t default_rpcb_version = RPCBVERS_4;
 #else	/* !HAVE_LIBTIRPC */
-const static rpcvers_t default_rpcb_version = PMAPVERS;
+static const rpcvers_t default_rpcb_version = PMAPVERS;
 #endif	/* !HAVE_LIBTIRPC */
 
 #ifdef HAVE_DECL_AI_ADDRCONFIG
diff --git a/support/nfs/rpc_socket.c b/support/nfs/rpc_socket.c
index 2b11e35..85e6064 100644
--- a/support/nfs/rpc_socket.c
+++ b/support/nfs/rpc_socket.c
@@ -132,6 +132,58 @@ static int nfs_bind(const int sock, const sa_family_t family)
 	return -1;
 }
 
+#ifdef IPV6_SUPPORT
+
+/*
+ * Bind a socket using an unused privileged source port.
+ *
+ * Returns zero on success, or returns -1 on error.  errno is
+ * set to reflect the nature of the error.
+ */
+static int nfs_bindresvport(const int sock, const sa_family_t family)
+{
+	struct sockaddr_in sin = {
+		.sin_family		= AF_INET,
+		.sin_addr.s_addr	= htonl(INADDR_ANY),
+	};
+	struct sockaddr_in6 sin6 = {
+		.sin6_family		= AF_INET6,
+		.sin6_addr		= IN6ADDR_ANY_INIT,
+	};
+
+	switch (family) {
+	case AF_INET:
+		return bindresvport_sa(sock, (struct sockaddr *)&sin,
+					(socklen_t)sizeof(sin));
+	case AF_INET6:
+		return bindresvport_sa(sock, (struct sockaddr *)&sin6,
+					(socklen_t)sizeof(sin6));
+	}
+
+	errno = EAFNOSUPPORT;
+	return -1;
+}
+
+#else	/* !IPV6_SUPPORT */
+
+/*
+ * Bind a socket using an unused privileged source port.
+ *
+ * Returns zero on success, or returns -1 on error.  errno is
+ * set to reflect the nature of the error.
+ */
+static int nfs_bindresvport(const int sock, const sa_family_t family)
+{
+	if (family != AF_INET) {
+		errno = EAFNOSUPPORT;
+		return -1;
+	}
+
+	return bindresvport(sock, NULL);
+}
+
+#endif	/* !IPV6_SUPPORT */
+
 /*
  * Perform a non-blocking connect on the socket fd.
  *
@@ -218,7 +270,8 @@ static CLIENT *nfs_get_udpclient(const struct sockaddr *sap,
 				 const socklen_t salen,
 				 const rpcprog_t program,
 				 const rpcvers_t version,
-				 struct timeval *timeout)
+				 struct timeval *timeout,
+				 const int resvport)
 {
 	CLIENT *client;
 	int ret, sock;
@@ -245,7 +298,10 @@ static CLIENT *nfs_get_udpclient(const struct sockaddr *sap,
 		return NULL;
 	}
 
-	ret = nfs_bind(sock, sap->sa_family);
+	if (resvport)
+		ret = nfs_bindresvport(sock, sap->sa_family);
+	else
+		ret = nfs_bind(sock, sap->sa_family);
 	if (ret < 0) {
 		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
 		rpc_createerr.cf_error.re_errno = errno;
@@ -294,7 +350,8 @@ static CLIENT *nfs_get_tcpclient(const struct sockaddr *sap,
 				 const socklen_t salen,
 				 const rpcprog_t program,
 				 const rpcvers_t version,
-				 struct timeval *timeout)
+				 struct timeval *timeout,
+				 const int resvport)
 {
 	CLIENT *client;
 	int ret, sock;
@@ -321,7 +378,10 @@ static CLIENT *nfs_get_tcpclient(const struct sockaddr *sap,
 		return NULL;
 	}
 
-	ret = nfs_bind(sock, sap->sa_family);
+	if (resvport)
+		ret = nfs_bindresvport(sock, sap->sa_family);
+	else
+		ret = nfs_bind(sock, sap->sa_family);
 	if (ret < 0) {
 		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
 		rpc_createerr.cf_error.re_errno = errno;
@@ -365,7 +425,8 @@ static CLIENT *nfs_get_tcpclient(const struct sockaddr *sap,
  * @timeout: pointer to request timeout (must not be NULL)
  *
  * Set up an RPC client for communicating with an RPC program @program
- * and @version on the server @sap over @transport.
+ * and @version on the server @sap over @transport.  An unprivileged
+ * source port is used.
  *
  * Returns a pointer to a prepared RPC client if successful, and
  * @timeout is initialized; caller must destroy a non-NULL returned RPC
@@ -405,10 +466,75 @@ CLIENT *nfs_get_rpcclient(const struct sockaddr *sap,
 
 	switch (transport) {
 	case IPPROTO_TCP:
-		return nfs_get_tcpclient(sap, salen, program, version, timeout);
+		return nfs_get_tcpclient(sap, salen, program, version,
+						timeout, 0);
+	case 0:
+	case IPPROTO_UDP:
+		return nfs_get_udpclient(sap, salen, program, version,
+						timeout, 0);
+	}
+
+	rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
+	return NULL;
+}
+
+/**
+ * nfs_get_priv_rpcclient - acquire an RPC client
+ * @sap: pointer to socket address of RPC server
+ * @salen: length of socket address
+ * @transport: IPPROTO_ value of transport protocol to use
+ * @program: RPC program number
+ * @version: RPC version number
+ * @timeout: pointer to request timeout (must not be NULL)
+ *
+ * Set up an RPC client for communicating with an RPC program @program
+ * and @version on the server @sap over @transport.  A privileged
+ * source port is used.
+ *
+ * Returns a pointer to a prepared RPC client if successful, and
+ * @timeout is initialized; caller must destroy a non-NULL returned RPC
+ * client.  Otherwise returns NULL, and rpc_createerr.cf_stat is set to
+ * reflect the error.
+ */
+CLIENT *nfs_get_priv_rpcclient(const struct sockaddr *sap,
+			       const socklen_t salen,
+			       const unsigned short transport,
+			       const rpcprog_t program,
+			       const rpcvers_t version,
+			       struct timeval *timeout)
+{
+	struct sockaddr_in *sin = (struct sockaddr_in *)sap;
+	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
+
+	switch (sap->sa_family) {
+	case AF_LOCAL:
+		return nfs_get_localclient(sap, salen, program,
+						version, timeout);
+	case AF_INET:
+		if (sin->sin_port == 0) {
+			rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
+			return NULL;
+		}
+		break;
+	case AF_INET6:
+		if (sin6->sin6_port == 0) {
+			rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
+			return NULL;
+		}
+		break;
+	default:
+		rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
+		return NULL;
+	}
+
+	switch (transport) {
+	case IPPROTO_TCP:
+		return nfs_get_tcpclient(sap, salen, program, version,
+						timeout, 1);
 	case 0:
 	case IPPROTO_UDP:
-		return nfs_get_udpclient(sap, salen, program, version, timeout);
+		return nfs_get_udpclient(sap, salen, program, version,
+						timeout, 1);
 	}
 
 	rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
diff --git a/utils/mount/network.c b/utils/mount/network.c
index bcd0c0f..72f4b84 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -869,7 +869,7 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
 	memcpy(saddr, sap, salen);
 	nfs_set_port(saddr, mnt_pmap.pm_port);
 
-	client = nfs_get_rpcclient(saddr, salen, mnt_pmap.pm_prot,
+	client = nfs_get_priv_rpcclient(saddr, salen, mnt_pmap.pm_prot,
 					mnt_pmap.pm_prog, mnt_pmap.pm_vers,
 					&timeout);
 	if (client == NULL)
@@ -1337,7 +1337,7 @@ static unsigned short nfs_mount_protocol(struct mount_options *options)
 			return IPPROTO_UDP;
 	}
 
-	return nfs_nfs_version(options);
+	return nfs_nfs_protocol(options);
 }
 
 /*
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index aaf8d29..c97c81f 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -86,7 +86,7 @@ main(int argc, char **argv)
 				NFSCTL_VERUNSET(versbits, c);
 				break;
 			default:
-				fprintf(stderr, "%c: Unsupported version\n", c);
+				fprintf(stderr, "%s: Unsupported version\n", optarg);
 				exit(1);
 			}
 			break;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-11/nfs-utils.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- nfs-utils.spec	23 Mar 2009 21:19:53 -0000	1.221
+++ nfs-utils.spec	20 Apr 2009 11:51:04 -0000	1.222
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -29,6 +29,8 @@
 Patch100: nfs-utils-1.1.5-tcpwrap-externs.patch
 Patch101: nfs-utils-1-1-6-rc2.patch
 Patch102: nfs-utils-1-1-6-rc3.patch
+Patch103: nfs-utils-1.1.5-nfsstat-update.patch
+Patch104: nfs-utils-1.1.5-umount-privport.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -86,6 +88,8 @@
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
+%patch104 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -249,6 +253,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Apr 20 2009 Steve Dickson <steved at redhat.com> 1.1.5-5
+- Update nfsstat with --sleep and --list options
+- Fixed umount from using non-privilege ports (bz 492598)
+
 * Mon Mar 23 2009 Steve Dickson <steved at redhat.com> 1.1.5-4
 - Added upstream rc3 patch
   - gssd: initialize fakeseed in prepare_krb5_rfc1964_buffer



From tbzatek at fedoraproject.org  Mon Apr 20 12:15:32 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 20 Apr 2009 12:15:32 +0000 (UTC)
Subject: rpms/sabayon/devel sabayon-2.25.0-profile-save.patch, NONE,
	1.1 sabayon.spec, 1.59, 1.60 sabayon-2.25.0-gconf-crashes.patch,
	1.1, NONE
Message-ID: <20090420121532.2D1B370102@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11279

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-2.25.0-profile-save.patch 
Removed Files:
	sabayon-2.25.0-gconf-crashes.patch 
Log Message:
* Mon Apr 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-3
- Another, more complete fix for panel gconf save issues (gnome #542604)


sabayon-2.25.0-profile-save.patch:

--- NEW FILE sabayon-2.25.0-profile-save.patch ---
diff --git a/lib/sources/paneldelegate.py b/lib/sources/paneldelegate.py
index d37c180..87b1af5 100755
--- a/lib/sources/paneldelegate.py
+++ b/lib/sources/paneldelegate.py
@@ -39,6 +39,16 @@ def dprint (fmt, *args):
 
 PANEL_LAUNCHER_DIR = ".gnome2/panel2.d/default/launchers"
 
+
+def copy_dir (src_client, dst_client, dst_address, dir):
+    for entry in src_client.all_entries (dir):
+        if entry.get_schema_name():
+            gconfsource.associate_schema (dst_address, entry.key, entry.get_schema_name ())
+        if entry.value and not entry.get_is_default ():
+            dst_client.set (entry.key, entry.value)
+    for subdir in src_client.all_dirs (dir):
+        copy_dir (src_client, dst_client, dst_address, subdir)
+
 class PanelChange (userprofile.ProfileChange):
     def __init__ (self, source, delegate, id):
         userprofile.ProfileChange.__init__ (self, source, delegate)
@@ -162,10 +172,20 @@ class PanelDelegate (userprofile.SourceDelegate):
             self.added   = added
             self.removed = removed
             self.client = gconf.client_get_default ()
+
+        def _copy_tree(self, dir):
+            if not self.client.dir_exists(dir):
+                (src_client, src_address) = gconfsource.get_client_and_address_for_path(
+                    os.path.join(util.get_home_dir(), '.gconf'))
+                (dst_client, dst_address) = gconfsource.get_client_and_address_for_path(
+                    os.path.join(util.get_home_dir(), '.gconf.xml.defaults'))
+                copy_dir (src_client, dst_client, dst_address, dir)
     
     class PanelToplevel (PanelThing):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
+
+            self._copy_tree(PANEL_KEY_BASE + "/toplevels/" + id)
             
             self.orientation = self.client.get_string (PANEL_KEY_BASE + "/toplevels/" + id + "/orientation")
             
@@ -177,6 +197,8 @@ class PanelDelegate (userprofile.SourceDelegate):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
 
+            self._copy_tree(PANEL_KEY_BASE + "/applets/" + id)
+ 
             self.toplevel_id = self.client.get_string (PANEL_KEY_BASE + "/applets/" + id + "/toplevel_id")
             self.bonobo_iid  = self.client.get_string (PANEL_KEY_BASE + "/applets/" + id + "/bonobo_iid")
 
@@ -191,6 +213,8 @@ class PanelDelegate (userprofile.SourceDelegate):
     class PanelObject (PanelThing):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
+
+            self._copy_tree(PANEL_KEY_BASE + "/objects/" + id)
   
             self.toplevel_id = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/toplevel_id")
             self.object_type = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/object_type")
@@ -220,6 +244,8 @@ class PanelDelegate (userprofile.SourceDelegate):
                     self.name = _("Run Application button")
                 elif action_type == "search":
                     self.name = _("Search button")
+                elif action_type == "connect-server":
+                    self.name = _("Connect to Server button")
                 else:
                     self.name = _("Screenshot button")
             else:
@@ -339,14 +365,6 @@ class PanelDelegate (userprofile.SourceDelegate):
 
         return False
 
-    def __copy_dir (self, src_client, dst_client, dst_address, dir):
-        for entry in src_client.all_entries (dir):
-            if entry.get_schema_name ():
-                gconfsource.associate_schema (dst_address, entry.key, entry.get_schema_name ())
-            if entry.value and not entry.get_is_default ():
-                dst_client.set (entry.key, entry.value)
-        for subdir in src_client.all_dirs (dir):
-            self.__copy_dir (src_client, dst_client, dst_address, subdir)
 
     def __get_current_list (self, dict):
         id_list = []
@@ -368,8 +386,8 @@ class PanelDelegate (userprofile.SourceDelegate):
 
         (client, address) = self.source.get_committing_client_and_address (mandatory)
 
-        self.__copy_dir (self.client, client, address, PANEL_KEY_BASE + "/" + dir_name + "/" + thing.id)
-        
+        copy_dir (self.client, client, address, PANEL_KEY_BASE + "/" + dir_name + "/" + thing.id)
+
         id_list = self.__get_current_list (dict)
         id_list.append (thing.id)
         client.set_list (PANEL_KEY_BASE + "/general/" + id_list_name, gconf.VALUE_STRING, id_list)


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sabayon.spec	3 Apr 2009 16:14:50 -0000	1.59
+++ sabayon.spec	20 Apr 2009 12:15:00 -0000	1.60
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.25.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -30,8 +30,8 @@
 # https://bugzilla.gnome.org/show_bug.cgi?id=576440
 Patch5:  sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=576445
-Patch6:  sabayon-2.25.0-gconf-crashes.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=542604
+Patch7:  sabayon-2.25.0-profile-save.patch
 
 
 Requires: %{name}-apply = %{version}-%{release}
@@ -108,7 +108,7 @@
 %patch3 -p1 -b .selinux
 %patch4 -p0 -b .gconfsave
 %patch5 -p1 -b .xauth
-%patch6 -p1 -b .gconf
+%patch7 -p1 -b .profile
 
 
 %build
@@ -298,6 +298,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Mon Apr 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-3
+- Another, more complete fix for panel gconf save issues (gnome #542604)
+
 * Fri Apr  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-2
 - Fix some gconf crashes (gnome #576445)
 - Temporarily switched back to Xnest to get working keyboard (gnome #576447)


--- sabayon-2.25.0-gconf-crashes.patch DELETED ---



From tmraz at fedoraproject.org  Mon Apr 20 12:18:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 20 Apr 2009 12:18:53 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-fips.patch, 1.3, 1.4 openssh.spec, 
	1.141, 1.142
Message-ID: <20090420121853.9DE5070102@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11798

Modified Files:
	openssh-5.2p1-fips.patch openssh.spec 
Log Message:
* Mon Apr 20 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-4
- log if FIPS mode is initialized
- make aes-ctr cipher modes work in the FIPS mode


openssh-5.2p1-fips.patch:

Index: openssh-5.2p1-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-fips.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openssh-5.2p1-fips.patch	13 Mar 2009 10:32:52 -0000	1.3
+++ openssh-5.2p1-fips.patch	20 Apr 2009 12:18:49 -0000	1.4
@@ -1,43 +1,6 @@
-diff -up openssh-5.2p1/ssh-agent.c.fips openssh-5.2p1/ssh-agent.c
---- openssh-5.2p1/ssh-agent.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/ssh-agent.c	2009-03-13 11:23:15.000000000 +0100
-@@ -51,6 +51,8 @@
- 
- #include <openssl/evp.h>
- #include <openssl/md5.h>
-+#include <openssl/fips.h>
-+#include <fipscheck.h>
- #include "openbsd-compat/openssl-compat.h"
- 
- #include <errno.h>
-@@ -200,9 +202,9 @@ confirm_key(Identity *id)
- 	char *p;
- 	int ret = -1;
- 
--	p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX);
--	if (ask_permission("Allow use of key %s?\nKey fingerprint %s.",
--	    id->comment, p))
-+	p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
-+	if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.",
-+	    id->comment, FIPS_mode() ? "SHA1 " : "", p))
- 		ret = 0;
- 	xfree(p);
- 
-@@ -1196,6 +1198,11 @@ main(int ac, char **av)
- #endif
- 
- 	SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fprintf(stderr,
-+                    "FIPS integrity verification test failed.\n");
-+                exit(3);
-+        }
- 
- 	__progname = ssh_get_progname(av[0]);
- 	init_rng();
 diff -up openssh-5.2p1/auth2-pubkey.c.fips openssh-5.2p1/auth2-pubkey.c
---- openssh-5.2p1/auth2-pubkey.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/auth2-pubkey.c	2009-03-13 11:23:15.000000000 +0100
+--- openssh-5.2p1/auth2-pubkey.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/auth2-pubkey.c	2009-04-17 14:52:11.000000000 +0200
 @@ -33,6 +33,7 @@
  #include <stdio.h>
  #include <stdarg.h>
@@ -55,179 +18,83 @@
  			verbose("Found matching %s key: %s",
  			    key_type(found), fp);
  			xfree(fp);
-diff -up openssh-5.2p1/ssh.c.fips openssh-5.2p1/ssh.c
---- openssh-5.2p1/ssh.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/ssh.c	2009-03-13 11:23:15.000000000 +0100
-@@ -71,6 +71,8 @@
+diff -up openssh-5.2p1/cipher.c.fips openssh-5.2p1/cipher.c
+--- openssh-5.2p1/cipher.c.fips	2009-03-06 18:23:21.000000000 +0100
++++ openssh-5.2p1/cipher.c	2009-04-17 14:52:11.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include <sys/types.h>
  
- #include <openssl/evp.h>
- #include <openssl/err.h>
+ #include <openssl/md5.h>
 +#include <openssl/fips.h>
-+#include <fipscheck.h>
- #include "openbsd-compat/openssl-compat.h"
- #include "openbsd-compat/sys-queue.h"
- 
-@@ -220,6 +222,10 @@ main(int ac, char **av)
- 	sanitise_stdfd();
- 
- 	__progname = ssh_get_progname(av[0]);
-+        SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fatal("FIPS integrity verification test failed.");
-+        }
- 	init_rng();
- 
- 	/*
-@@ -550,7 +556,6 @@ main(int ac, char **av)
- 	if (!host)
- 		usage();
- 
--	SSLeay_add_all_algorithms();
- 	ERR_load_crypto_strings();
- 
- 	/* Initialize the command to execute on remote host. */
-diff -up openssh-5.2p1/sshconnect2.c.fips openssh-5.2p1/sshconnect2.c
---- openssh-5.2p1/sshconnect2.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/sshconnect2.c	2009-03-13 11:23:15.000000000 +0100
-@@ -44,6 +44,8 @@
- #include <vis.h>
- #endif
  
-+#include <openssl/fips.h>
-+
- #include "openbsd-compat/sys-queue.h"
+ #include <string.h>
+ #include <stdarg.h>
+@@ -93,6 +94,22 @@ struct Cipher {
+ 	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
+ };
  
- #include "xmalloc.h"
-@@ -115,6 +117,10 @@ ssh_kex2(char *host, struct sockaddr *ho
- 	if (options.ciphers != NULL) {
- 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
- 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
-+	} else if (FIPS_mode()) {
-+		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
-+		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;
++struct Cipher fips_ciphers[] = {
++	{ "none",		SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null },
++	{ "3des",		SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des },
 +
- 	}
- 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =
- 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
-@@ -130,7 +136,11 @@ ssh_kex2(char *host, struct sockaddr *ho
- 	if (options.macs != NULL) {
- 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
- 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
-+	} else if (FIPS_mode()) {
-+		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
-+		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;
- 	}
++	{ "3des-cbc",		SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc },
++	{ "aes128-cbc",		SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc },
++	{ "aes192-cbc",		SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc },
++	{ "aes256-cbc",		SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
++	{ "rijndael-cbc at lysator.liu.se",
++				SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
++	{ "aes128-ctr",		SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr },
++	{ "aes192-ctr",		SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr },
++	{ "aes256-ctr",		SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr },
++	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
++};
 +
- 	if (options.hostkeyalgorithms != NULL)
- 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
- 		    options.hostkeyalgorithms;
-@@ -507,8 +517,8 @@ input_userauth_pk_ok(int type, u_int32_t
- 		    key->type, pktype);
- 		goto done;
- 	}
--	fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
--	debug2("input_userauth_pk_ok: fp %s", fp);
-+	fp = key_fingerprint(key, SSH_FP_SHA1, SSH_FP_HEX);
-+	debug2("input_userauth_pk_ok: SHA1 fp %s", fp);
- 	xfree(fp);
- 
- 	/*
-diff -up openssh-5.2p1/Makefile.in.fips openssh-5.2p1/Makefile.in
---- openssh-5.2p1/Makefile.in.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/Makefile.in	2009-03-13 11:23:15.000000000 +0100
-@@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS)
- 	$(RANLIB) $@
- 
- ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
--	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
- 
- sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
--	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
-+	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS)
- 
- scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
- 	$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
- 
- ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
--	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
- 
- ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o
--	$(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
- 
- ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
--	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
- 
- ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
--	$(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
- 
- ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
--	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
-+	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS)
- 
- sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
- 	$(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-diff -up openssh-5.2p1/sshd.c.fips openssh-5.2p1/sshd.c
---- openssh-5.2p1/sshd.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/sshd.c	2009-03-13 11:23:15.000000000 +0100
-@@ -76,6 +76,8 @@
- #include <openssl/bn.h>
- #include <openssl/md5.h>
- #include <openssl/rand.h>
-+#include <openssl/fips.h>
-+#include <fipscheck.h>
- #include "openbsd-compat/openssl-compat.h"
+ /*--*/
  
- #ifdef HAVE_SECUREWARE
-@@ -1260,6 +1262,12 @@ main(int ac, char **av)
- 	(void)set_auth_parameters(ac, av);
+ u_int
+@@ -135,7 +152,7 @@ Cipher *
+ cipher_by_name(const char *name)
+ {
+ 	Cipher *c;
+-	for (c = ciphers; c->name != NULL; c++)
++	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
+ 		if (strcmp(c->name, name) == 0)
+ 			return c;
+ 	return NULL;
+@@ -145,7 +162,7 @@ Cipher *
+ cipher_by_number(int id)
+ {
+ 	Cipher *c;
+-	for (c = ciphers; c->name != NULL; c++)
++	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
+ 		if (c->number == id)
+ 			return c;
+ 	return NULL;
+@@ -189,7 +206,7 @@ cipher_number(const char *name)
+ 	Cipher *c;
+ 	if (name == NULL)
+ 		return -1;
+-	for (c = ciphers; c->name != NULL; c++)
++	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
+ 		if (strcasecmp(c->name, name) == 0)
+ 			return c->number;
+ 	return -1;
+diff -up openssh-5.2p1/cipher-ctr.c.fips openssh-5.2p1/cipher-ctr.c
+--- openssh-5.2p1/cipher-ctr.c.fips	2007-06-14 15:21:33.000000000 +0200
++++ openssh-5.2p1/cipher-ctr.c	2009-04-17 23:23:06.000000000 +0200
+@@ -140,7 +140,8 @@ evp_aes_128_ctr(void)
+ 	aes_ctr.do_cipher = ssh_aes_ctr;
+ #ifndef SSH_OLD_EVP
+ 	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
+-	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
++	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV |
++	    EVP_CIPH_FLAG_FIPS;
  #endif
- 	__progname = ssh_get_progname(av[0]);
-+
-+        SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fatal("FIPS integrity verification test failed.");
-+        }
-+
- 	init_rng();
- 
- 	/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
-@@ -1412,8 +1420,6 @@ main(int ac, char **av)
- 	else
- 		closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
- 
--	SSLeay_add_all_algorithms();
--
- 	/*
- 	 * Force logging to stderr until we have loaded the private host
- 	 * key (unless started from inetd)
-@@ -2182,6 +2188,9 @@ do_ssh2_kex(void)
- 	if (options.ciphers != NULL) {
- 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
- 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
-+	} else if (FIPS_mode()) {
-+		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
-+		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;
- 	}
- 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =
- 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
-@@ -2191,6 +2200,9 @@ do_ssh2_kex(void)
- 	if (options.macs != NULL) {
- 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
- 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
-+	} else if (FIPS_mode()) {
-+		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
-+		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;
- 	}
- 	if (options.compression == COMP_NONE) {
- 		myproposal[PROPOSAL_COMP_ALGS_CTOS] =
+ 	return (&aes_ctr);
+ }
 diff -up openssh-5.2p1/mac.c.fips openssh-5.2p1/mac.c
 --- openssh-5.2p1/mac.c.fips	2008-06-13 02:58:50.000000000 +0200
-+++ openssh-5.2p1/mac.c	2009-03-13 11:23:15.000000000 +0100
++++ openssh-5.2p1/mac.c	2009-04-17 14:52:11.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  
@@ -277,63 +144,65 @@
  
  	for (i = 0; macs[i].name; i++) {
  		if (strcmp(name, macs[i].name) == 0) {
-diff -up openssh-5.2p1/ssh-keygen.c.fips openssh-5.2p1/ssh-keygen.c
---- openssh-5.2p1/ssh-keygen.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/ssh-keygen.c	2009-03-13 11:23:15.000000000 +0100
-@@ -21,6 +21,8 @@
+diff -up openssh-5.2p1/Makefile.in.fips openssh-5.2p1/Makefile.in
+--- openssh-5.2p1/Makefile.in.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/Makefile.in	2009-04-17 14:52:11.000000000 +0200
+@@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS)
+ 	$(RANLIB) $@
  
- #include <openssl/evp.h>
- #include <openssl/pem.h>
-+#include <openssl/fips.h>
-+#include <fipscheck.h>
- #include "openbsd-compat/openssl-compat.h"
+ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
+-	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
  
- #include <errno.h>
-@@ -537,7 +539,7 @@ do_fingerprint(struct passwd *pw)
- 	enum fp_type fptype;
- 	struct stat st;
+ sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
+-	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
++	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS)
  
--	fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
-+	fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5;
- 	rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
+ scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
+ 	$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  
- 	if (!have_identity)
-@@ -1125,6 +1127,12 @@ main(int argc, char **argv)
- 	__progname = ssh_get_progname(argv[0]);
+ ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
+-	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
  
- 	SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fprintf(stderr,
-+                    "FIPS integrity verification test failed.\n");
-+                exit(3);
-+        }
-+
- 	log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
+ ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o
+-	$(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++	$(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
  
- 	init_rng();
-@@ -1506,14 +1514,15 @@ passphrase_again:
- 	fclose(f);
+ ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
+-	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
  
- 	if (!quiet) {
--		char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
--		char *ra = key_fingerprint(public, SSH_FP_MD5,
-+		int fips_on = FIPS_mode();
-+		char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
-+		char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5,
- 		    SSH_FP_RANDOMART);
- 		printf("Your public key has been saved in %s.\n",
- 		    identity_file);
--		printf("The key fingerprint is:\n");
-+		printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : "");
- 		printf("%s %s\n", fp, comment);
--		printf("The key's randomart image is:\n");
-+		printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :"");
- 		printf("%s\n", ra);
- 		xfree(ra);
- 		xfree(fp);
+ ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
+-	$(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++	$(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
+ 
+ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
+-	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
++	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS)
+ 
+ sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
+ 	$(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+diff -up openssh-5.2p1/myproposal.h.fips openssh-5.2p1/myproposal.h
+--- openssh-5.2p1/myproposal.h.fips	2009-01-28 06:33:31.000000000 +0100
++++ openssh-5.2p1/myproposal.h	2009-04-17 14:52:11.000000000 +0200
+@@ -53,7 +53,12 @@
+ 	"hmac-sha1-96,hmac-md5-96"
+ #define	KEX_DEFAULT_COMP	"none,zlib at openssh.com,zlib"
+ #define	KEX_DEFAULT_LANG	""
+-
++#define	KEX_FIPS_ENCRYPT \
++	"aes128-ctr,aes192-ctr,aes256-ctr," \
++	"aes128-cbc,3des-cbc," \
++	"aes192-cbc,aes256-cbc,rijndael-cbc at lysator.liu.se"
++#define	KEX_FIPS_MAC \
++	"hmac-sha1"
+ 
+ static char *myproposal[PROPOSAL_MAX] = {
+ 	KEX_DEFAULT_KEX,
 diff -up openssh-5.2p1/nsskeys.c.fips openssh-5.2p1/nsskeys.c
---- openssh-5.2p1/nsskeys.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/nsskeys.c	2009-03-13 11:23:15.000000000 +0100
+--- openssh-5.2p1/nsskeys.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/nsskeys.c	2009-04-17 14:52:11.000000000 +0200
 @@ -183,8 +183,8 @@ nss_convert_pubkey(Key *k)
  			break;
  	}
@@ -345,49 +214,9 @@
  	xfree(p);
  
  	return 0;
-diff -up openssh-5.2p1/ssh-add.c.fips openssh-5.2p1/ssh-add.c
---- openssh-5.2p1/ssh-add.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/ssh-add.c	2009-03-13 11:23:15.000000000 +0100
-@@ -42,6 +42,8 @@
- #include <sys/param.h>
- 
- #include <openssl/evp.h>
-+#include <openssl/fips.h>
-+#include <fipscheck.h>
- #include "openbsd-compat/openssl-compat.h"
- 
- #ifdef HAVE_LIBNSS
-@@ -254,7 +256,7 @@ list_identities(AuthenticationConnection
- 		    key = ssh_get_next_identity(ac, &comment, version)) {
- 			had_identities = 1;
- 			if (do_fp) {
--				fp = key_fingerprint(key, SSH_FP_MD5,
-+				fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5,
- 				    SSH_FP_HEX);
- 				printf("%d %s %s (%s)\n",
- 				    key_size(key), fp, comment, key_type(key));
-@@ -463,11 +465,16 @@ main(int argc, char **argv)
- 	sanitise_stdfd();
- 
- 	__progname = ssh_get_progname(argv[0]);
-+	SSLeay_add_all_algorithms();
-+	if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+		fprintf(stderr,
-+		    "FIPS integrity verification test failed.\n");
-+		exit(3);
-+	}
-+
- 	init_rng();
- 	seed_rng();
- 
--	SSLeay_add_all_algorithms();
--
- 	/* At first, get a connection to the authentication agent. */
- 	ac = ssh_get_authentication_connection();
- 	if (ac == NULL) {
 diff -up openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips openssh-5.2p1/openbsd-compat/bsd-arc4random.c
 --- openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips	2008-06-04 02:54:00.000000000 +0200
-+++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c	2009-03-13 11:23:15.000000000 +0100
++++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c	2009-04-17 14:52:11.000000000 +0200
 @@ -39,6 +39,7 @@
  static int rc4_ready = 0;
  static RC4_KEY rc4;
@@ -429,145 +258,187 @@
  #endif /* !HAVE_ARC4RANDOM */
  
  #ifndef ARC4RANDOM_BUF
-diff -up openssh-5.2p1/myproposal.h.fips openssh-5.2p1/myproposal.h
---- openssh-5.2p1/myproposal.h.fips	2009-01-28 06:33:31.000000000 +0100
-+++ openssh-5.2p1/myproposal.h	2009-03-13 11:27:49.000000000 +0100
-@@ -53,7 +53,12 @@
- 	"hmac-sha1-96,hmac-md5-96"
- #define	KEX_DEFAULT_COMP	"none,zlib at openssh.com,zlib"
- #define	KEX_DEFAULT_LANG	""
--
-+#define	KEX_FIPS_ENCRYPT \
-+	"aes128-ctr,aes192-ctr,aes256-ctr," \
-+	"aes128-cbc,3des-cbc," \
-+	"aes192-cbc,aes256-cbc,rijndael-cbc at lysator.liu.se"
-+#define	KEX_FIPS_MAC \
-+	"hmac-sha1"
+diff -up openssh-5.2p1/ssh-add.c.fips openssh-5.2p1/ssh-add.c
+--- openssh-5.2p1/ssh-add.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/ssh-add.c	2009-04-17 14:52:11.000000000 +0200
+@@ -42,6 +42,8 @@
+ #include <sys/param.h>
  
- static char *myproposal[PROPOSAL_MAX] = {
- 	KEX_DEFAULT_KEX,
-diff -up openssh-5.2p1/ssh-keysign.c.fips openssh-5.2p1/ssh-keysign.c
---- openssh-5.2p1/ssh-keysign.c.fips	2006-09-01 07:38:37.000000000 +0200
-+++ openssh-5.2p1/ssh-keysign.c	2009-03-13 11:23:15.000000000 +0100
-@@ -38,6 +38,8 @@
  #include <openssl/evp.h>
- #include <openssl/rand.h>
- #include <openssl/rsa.h>
 +#include <openssl/fips.h>
 +#include <fipscheck.h>
+ #include "openbsd-compat/openssl-compat.h"
  
- #include "xmalloc.h"
- #include "log.h"
-@@ -175,6 +177,11 @@ main(int argc, char **argv)
- 
- 	permanently_set_uid(pw);
+ #ifdef HAVE_LIBNSS
+@@ -254,7 +256,7 @@ list_identities(AuthenticationConnection
+ 		    key = ssh_get_next_identity(ac, &comment, version)) {
+ 			had_identities = 1;
+ 			if (do_fp) {
+-				fp = key_fingerprint(key, SSH_FP_MD5,
++				fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5,
+ 				    SSH_FP_HEX);
+ 				printf("%d %s %s (%s)\n",
+ 				    key_size(key), fp, comment, key_type(key));
+@@ -463,10 +465,19 @@ main(int argc, char **argv)
+ 	sanitise_stdfd();
  
-+        SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fatal("FIPS integrity verification test failed");
-+        }
+ 	__progname = ssh_get_progname(argv[0]);
++	SSLeay_add_all_algorithms();
++	if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
++		fprintf(stderr,
++		    "FIPS integrity verification test failed.\n");
++		exit(3);
++	}
 +
  	init_rng();
  	seed_rng();
- 	arc4random_stir();
-@@ -194,7 +201,6 @@ main(int argc, char **argv)
- 	if (key_fd[0] == -1 && key_fd[1] == -1)
- 		fatal("could not open any host key");
  
 -	SSLeay_add_all_algorithms();
- 	for (i = 0; i < 256; i++)
- 		rnd[i] = arc4random();
- 	RAND_seed(rnd, sizeof(rnd));
-diff -up openssh-5.2p1/cipher.c.fips openssh-5.2p1/cipher.c
---- openssh-5.2p1/cipher.c.fips	2009-03-06 18:23:21.000000000 +0100
-+++ openssh-5.2p1/cipher.c	2009-03-13 11:23:15.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <sys/types.h>
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
+ 
+ 	/* At first, get a connection to the authentication agent. */
+ 	ac = ssh_get_authentication_connection();
+diff -up openssh-5.2p1/ssh-agent.c.fips openssh-5.2p1/ssh-agent.c
+--- openssh-5.2p1/ssh-agent.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/ssh-agent.c	2009-04-17 14:52:11.000000000 +0200
+@@ -51,6 +51,8 @@
  
+ #include <openssl/evp.h>
  #include <openssl/md5.h>
 +#include <openssl/fips.h>
++#include <fipscheck.h>
+ #include "openbsd-compat/openssl-compat.h"
  
- #include <string.h>
- #include <stdarg.h>
-@@ -93,6 +94,22 @@ struct Cipher {
- 	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
- };
+ #include <errno.h>
+@@ -200,9 +202,9 @@ confirm_key(Identity *id)
+ 	char *p;
+ 	int ret = -1;
  
-+struct Cipher fips_ciphers[] = {
-+	{ "none",		SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null },
-+	{ "3des",		SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des },
-+
-+	{ "3des-cbc",		SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc },
-+	{ "aes128-cbc",		SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc },
-+	{ "aes192-cbc",		SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc },
-+	{ "aes256-cbc",		SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
-+	{ "rijndael-cbc at lysator.liu.se",
-+				SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
-+	{ "aes128-ctr",		SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr },
-+	{ "aes192-ctr",		SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr },
-+	{ "aes256-ctr",		SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr },
-+	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
-+};
-+
- /*--*/
+-	p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX);
+-	if (ask_permission("Allow use of key %s?\nKey fingerprint %s.",
+-	    id->comment, p))
++	p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
++	if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.",
++	    id->comment, FIPS_mode() ? "SHA1 " : "", p))
+ 		ret = 0;
+ 	xfree(p);
  
- u_int
-@@ -135,7 +152,7 @@ Cipher *
- cipher_by_name(const char *name)
- {
- 	Cipher *c;
--	for (c = ciphers; c->name != NULL; c++)
-+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
- 		if (strcmp(c->name, name) == 0)
- 			return c;
- 	return NULL;
-@@ -145,7 +162,7 @@ Cipher *
- cipher_by_number(int id)
- {
- 	Cipher *c;
--	for (c = ciphers; c->name != NULL; c++)
-+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
- 		if (c->number == id)
- 			return c;
- 	return NULL;
-@@ -189,7 +206,7 @@ cipher_number(const char *name)
- 	Cipher *c;
- 	if (name == NULL)
- 		return -1;
--	for (c = ciphers; c->name != NULL; c++)
-+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
- 		if (strcasecmp(c->name, name) == 0)
- 			return c->number;
- 	return -1;
-diff -up openssh-5.2p1/ssh-keyscan.c.fips openssh-5.2p1/ssh-keyscan.c
---- openssh-5.2p1/ssh-keyscan.c.fips	2009-01-28 06:31:23.000000000 +0100
-+++ openssh-5.2p1/ssh-keyscan.c	2009-03-13 11:23:15.000000000 +0100
-@@ -19,6 +19,8 @@
- #include <arpa/inet.h>
+@@ -1196,6 +1198,11 @@ main(int ac, char **av)
+ #endif
+ 
+ 	SSLeay_add_all_algorithms();
++	if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
++		fprintf(stderr,
++			"FIPS integrity verification test failed.\n");
++		exit(3);
++	}
+ 
+ 	__progname = ssh_get_progname(av[0]);
+ 	init_rng();
+@@ -1356,6 +1363,10 @@ main(int ac, char **av)
+ 	/* child */
+ 	log_init(__progname, SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_AUTH, 0);
  
- #include <openssl/bn.h>
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
++
+ 	if (setsid() == -1) {
+ 		error("setsid: %s", strerror(errno));
+ 		cleanup_exit(1);
+diff -up openssh-5.2p1/ssh.c.fips openssh-5.2p1/ssh.c
+--- openssh-5.2p1/ssh.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/ssh.c	2009-04-17 14:52:11.000000000 +0200
+@@ -71,6 +71,8 @@
+ 
+ #include <openssl/evp.h>
+ #include <openssl/err.h>
 +#include <openssl/fips.h>
 +#include <fipscheck.h>
+ #include "openbsd-compat/openssl-compat.h"
+ #include "openbsd-compat/sys-queue.h"
  
- #include <netdb.h>
- #include <errno.h>
-@@ -731,6 +733,13 @@ main(int argc, char **argv)
- 	extern char *optarg;
+@@ -220,6 +222,10 @@ main(int ac, char **av)
+ 	sanitise_stdfd();
  
- 	__progname = ssh_get_progname(argv[0]);
+ 	__progname = ssh_get_progname(av[0]);
 +        SSLeay_add_all_algorithms();
 +        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fprintf(stderr,
-+                    "FIPS integrity verification test failed.\n");
-+                exit(3);
++                fatal("FIPS integrity verification test failed.");
 +        }
-+
  	init_rng();
+ 
+ 	/*
+@@ -550,7 +556,6 @@ main(int ac, char **av)
+ 	if (!host)
+ 		usage();
+ 
+-	SSLeay_add_all_algorithms();
+ 	ERR_load_crypto_strings();
+ 
+ 	/* Initialize the command to execute on remote host. */
+@@ -635,6 +640,10 @@ main(int ac, char **av)
+ 
  	seed_rng();
- 	TAILQ_INIT(&tq);
+ 
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
++
+ 	if (options.user == NULL)
+ 		options.user = xstrdup(pw->pw_name);
+ 
+diff -up openssh-5.2p1/sshconnect2.c.fips openssh-5.2p1/sshconnect2.c
+--- openssh-5.2p1/sshconnect2.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/sshconnect2.c	2009-04-17 14:52:11.000000000 +0200
+@@ -44,6 +44,8 @@
+ #include <vis.h>
+ #endif
+ 
++#include <openssl/fips.h>
++
+ #include "openbsd-compat/sys-queue.h"
+ 
+ #include "xmalloc.h"
+@@ -115,6 +117,10 @@ ssh_kex2(char *host, struct sockaddr *ho
+ 	if (options.ciphers != NULL) {
+ 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
+ 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
++	} else if (FIPS_mode()) {
++		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
++		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;
++
+ 	}
+ 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =
+ 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
+@@ -130,7 +136,11 @@ ssh_kex2(char *host, struct sockaddr *ho
+ 	if (options.macs != NULL) {
+ 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
+ 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
++	} else if (FIPS_mode()) {
++		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
++		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;
+ 	}
++
+ 	if (options.hostkeyalgorithms != NULL)
+ 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
+ 		    options.hostkeyalgorithms;
+@@ -507,8 +517,8 @@ input_userauth_pk_ok(int type, u_int32_t
+ 		    key->type, pktype);
+ 		goto done;
+ 	}
+-	fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
+-	debug2("input_userauth_pk_ok: fp %s", fp);
++	fp = key_fingerprint(key, SSH_FP_SHA1, SSH_FP_HEX);
++	debug2("input_userauth_pk_ok: SHA1 fp %s", fp);
+ 	xfree(fp);
+ 
+ 	/*
 diff -up openssh-5.2p1/sshconnect.c.fips openssh-5.2p1/sshconnect.c
---- openssh-5.2p1/sshconnect.c.fips	2009-03-13 11:23:15.000000000 +0100
-+++ openssh-5.2p1/sshconnect.c	2009-03-13 11:23:15.000000000 +0100
+--- openssh-5.2p1/sshconnect.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/sshconnect.c	2009-04-17 14:52:11.000000000 +0200
 @@ -40,6 +40,8 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -654,3 +525,211 @@
  	error("Please contact your system administrator.");
  
  	xfree(fp);
+diff -up openssh-5.2p1/sshd.c.fips openssh-5.2p1/sshd.c
+--- openssh-5.2p1/sshd.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/sshd.c	2009-04-17 14:52:11.000000000 +0200
+@@ -76,6 +76,8 @@
+ #include <openssl/bn.h>
+ #include <openssl/md5.h>
+ #include <openssl/rand.h>
++#include <openssl/fips.h>
++#include <fipscheck.h>
+ #include "openbsd-compat/openssl-compat.h"
+ 
+ #ifdef HAVE_SECUREWARE
+@@ -1260,6 +1262,12 @@ main(int ac, char **av)
+ 	(void)set_auth_parameters(ac, av);
+ #endif
+ 	__progname = ssh_get_progname(av[0]);
++
++        SSLeay_add_all_algorithms();
++        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
++                fatal("FIPS integrity verification test failed.");
++        }
++
+ 	init_rng();
+ 
+ 	/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
+@@ -1412,8 +1420,6 @@ main(int ac, char **av)
+ 	else
+ 		closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
+ 
+-	SSLeay_add_all_algorithms();
+-
+ 	/*
+ 	 * Force logging to stderr until we have loaded the private host
+ 	 * key (unless started from inetd)
+@@ -1655,6 +1661,10 @@ main(int ac, char **av)
+ 	/* Initialize the random number generator. */
+ 	arc4random_stir();
+ 
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
++
+ 	/* Chdir to the root directory so that the current disk can be
+ 	   unmounted if desired. */
+ 	chdir("/");
+@@ -2182,6 +2192,9 @@ do_ssh2_kex(void)
+ 	if (options.ciphers != NULL) {
+ 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
+ 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
++	} else if (FIPS_mode()) {
++		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
++		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;
+ 	}
+ 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =
+ 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
+@@ -2191,6 +2204,9 @@ do_ssh2_kex(void)
+ 	if (options.macs != NULL) {
+ 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
+ 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
++	} else if (FIPS_mode()) {
++		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
++		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;
+ 	}
+ 	if (options.compression == COMP_NONE) {
+ 		myproposal[PROPOSAL_COMP_ALGS_CTOS] =
+diff -up openssh-5.2p1/ssh-keygen.c.fips openssh-5.2p1/ssh-keygen.c
+--- openssh-5.2p1/ssh-keygen.c.fips	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/ssh-keygen.c	2009-04-17 14:52:11.000000000 +0200
+@@ -21,6 +21,8 @@
+ 
+ #include <openssl/evp.h>
+ #include <openssl/pem.h>
++#include <openssl/fips.h>
++#include <fipscheck.h>
+ #include "openbsd-compat/openssl-compat.h"
+ 
+ #include <errno.h>
+@@ -537,7 +539,7 @@ do_fingerprint(struct passwd *pw)
+ 	enum fp_type fptype;
+ 	struct stat st;
+ 
+-	fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
++	fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5;
+ 	rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
+ 
+ 	if (!have_identity)
+@@ -1125,11 +1127,21 @@ main(int argc, char **argv)
+ 	__progname = ssh_get_progname(argv[0]);
+ 
+ 	SSLeay_add_all_algorithms();
++        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
++                fprintf(stderr,
++                    "FIPS integrity verification test failed.\n");
++                exit(3);
++        }
++
+ 	log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
+ 
+ 	init_rng();
+ 	seed_rng();
+ 
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
++
+ 	/* we need this for the home * directory.  */
+ 	pw = getpwuid(getuid());
+ 	if (!pw) {
+@@ -1506,14 +1518,15 @@ passphrase_again:
+ 	fclose(f);
+ 
+ 	if (!quiet) {
+-		char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
+-		char *ra = key_fingerprint(public, SSH_FP_MD5,
++		int fips_on = FIPS_mode();
++		char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
++		char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5,
+ 		    SSH_FP_RANDOMART);
+ 		printf("Your public key has been saved in %s.\n",
+ 		    identity_file);
+-		printf("The key fingerprint is:\n");
++		printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : "");
+ 		printf("%s %s\n", fp, comment);
+-		printf("The key's randomart image is:\n");
++		printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :"");
+ 		printf("%s\n", ra);
+ 		xfree(ra);
+ 		xfree(fp);
+diff -up openssh-5.2p1/ssh-keyscan.c.fips openssh-5.2p1/ssh-keyscan.c
+--- openssh-5.2p1/ssh-keyscan.c.fips	2009-01-28 06:31:23.000000000 +0100
++++ openssh-5.2p1/ssh-keyscan.c	2009-04-17 14:52:11.000000000 +0200
+@@ -19,6 +19,8 @@
+ #include <arpa/inet.h>
+ 
+ #include <openssl/bn.h>
++#include <openssl/fips.h>
++#include <fipscheck.h>
+ 
+ #include <netdb.h>
+ #include <errno.h>
+@@ -731,6 +733,13 @@ main(int argc, char **argv)
+ 	extern char *optarg;
+ 
+ 	__progname = ssh_get_progname(argv[0]);
++        SSLeay_add_all_algorithms();
++        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
++                fprintf(stderr,
++                    "FIPS integrity verification test failed.\n");
++                exit(3);
++        }
++
+ 	init_rng();
+ 	seed_rng();
+ 	TAILQ_INIT(&tq);
+@@ -812,6 +821,10 @@ main(int argc, char **argv)
+ 
+ 	log_init("ssh-keyscan", log_level, SYSLOG_FACILITY_USER, 1);
+ 
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
++
+ 	maxfd = fdlim_get(1);
+ 	if (maxfd < 0)
+ 		fatal("%s: fdlim_get: bad value", __progname);
+diff -up openssh-5.2p1/ssh-keysign.c.fips openssh-5.2p1/ssh-keysign.c
+--- openssh-5.2p1/ssh-keysign.c.fips	2006-09-01 07:38:37.000000000 +0200
++++ openssh-5.2p1/ssh-keysign.c	2009-04-17 14:52:11.000000000 +0200
+@@ -38,6 +38,8 @@
+ #include <openssl/evp.h>
+ #include <openssl/rand.h>
+ #include <openssl/rsa.h>
++#include <openssl/fips.h>
++#include <fipscheck.h>
+ 
+ #include "xmalloc.h"
+ #include "log.h"
+@@ -175,6 +177,11 @@ main(int argc, char **argv)
+ 
+ 	permanently_set_uid(pw);
+ 
++        SSLeay_add_all_algorithms();
++        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
++                fatal("FIPS integrity verification test failed");
++        }
++
+ 	init_rng();
+ 	seed_rng();
+ 	arc4random_stir();
+@@ -183,6 +190,10 @@ main(int argc, char **argv)
+ 	log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0);
+ #endif
+ 
++	if (FIPS_mode()) {
++		logit("FIPS mode initialized");
++	}
++
+ 	/* verify that ssh-keysign is enabled by the admin */
+ 	initialize_options(&options);
+ 	(void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options, 0);
+@@ -194,7 +205,6 @@ main(int argc, char **argv)
+ 	if (key_fd[0] == -1 && key_fd[1] == -1)
+ 		fatal("could not open any host key");
+ 
+-	SSLeay_add_all_algorithms();
+ 	for (i = 0; i < 256; i++)
+ 		rnd[i] = arc4random();
+ 	RAND_seed(rnd, sizeof(rnd));


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- openssh.spec	3 Apr 2009 13:03:29 -0000	1.141
+++ openssh.spec	20 Apr 2009 12:18:49 -0000	1.142
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 3%{?dist}%{?rescue_rel}
+Release: 4%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -474,6 +474,10 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-4
+- log if FIPS mode is initialized
+- make aes-ctr cipher modes work in the FIPS mode
+
 * Fri Apr  3 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-3
 - fix logging after chroot
 - enable non root users to use chroot %%h in internal-sftp



From denis at fedoraproject.org  Mon Apr 20 12:21:25 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 20 Apr 2009 12:21:25 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon-2.0.7-moz191.patch, 1.1, 1.2 galeon.spec,
	1.60, 1.61
Message-ID: <20090420122125.E077A70102@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12408

Modified Files:
	galeon-2.0.7-moz191.patch galeon.spec 
Log Message:
Moz 191 update and rebuild for favicon.ico behavior fix

galeon-2.0.7-moz191.patch:

Index: galeon-2.0.7-moz191.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon-2.0.7-moz191.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- galeon-2.0.7-moz191.patch	7 Jan 2009 05:22:11 -0000	1.1
+++ galeon-2.0.7-moz191.patch	20 Apr 2009 12:20:54 -0000	1.2
@@ -39,3 +39,14 @@
  	}
  	*aX = x;
  	*aY = y;
+diff -ur galeon-2.0.7/mozilla/GeckoPrintSession.h galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h
+--- galeon-2.0.7/mozilla/GeckoPrintSession.h	2009-03-14 14:34:07.000000000 +0200
++++ galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h	2009-03-14 14:32:23.000000000 +0200
+@@ -22,6 +22,7 @@
+ #define GECKO_PRINT_SESSION_H
+ 
+ #include <nsCOMPtr.h>
++#include <nsXPCOMCIDInternal.h>
+ #include <nsIPrintSession.h>
+ #include <nsIWebProgressListener.h>
+ #include <nsIPrintProgress.h>


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- galeon.spec	24 Feb 2009 19:21:14 -0000	1.60
+++ galeon.spec	20 Apr 2009 12:20:55 -0000	1.61
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-8
+- Moz 191 update and rebuild for favicon.ico behavior fix
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kkofler at fedoraproject.org  Mon Apr 20 12:24:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 12:24:07 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-popupapplet-config.patch, NONE,
	1.1 kdelibs-4.2.2-popupapplet-kconf_update.patch, NONE,
	1.1 kdelibs.spec, 1.467, 1.468
Message-ID: <20090420122407.EFFFD70102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12987/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
- fix Plasma PopupApplet configuration interfering with weather applet (#495998)

kdelibs-4.2.2-popupapplet-config.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-config.patch ---
Index: plasma/popupapplet.cpp
===================================================================
--- plasma/popupapplet.cpp	(revision 937997)
+++ plasma/popupapplet.cpp	(revision 937998)
@@ -535,8 +535,8 @@
 {
     //Reposition the dialog
     if (dialog) {
-        KConfigGroup sizeGroup = q->config();
-        sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+        KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+        KConfigGroup sizeGroup(mainGroup, "PopupApplet");
         sizeGroup.writeEntry("DialogHeight", dialog->height());
         sizeGroup.writeEntry("DialogWidth", dialog->width());
 
@@ -559,8 +559,8 @@
         return;
     }
 
-    KConfigGroup sizeGroup = q->config();
-    sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+    KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+    KConfigGroup sizeGroup(mainGroup, "PopupApplet");
 
     Q_ASSERT(q->containment());
     Q_ASSERT(q->containment()->corona());

kdelibs-4.2.2-popupapplet-kconf_update.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-kconf_update.patch ---
diff -Nur kdelibs-4.2.2/plasma/CMakeLists.txt kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt
--- kdelibs-4.2.2/plasma/CMakeLists.txt	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt	2009-04-19 05:33:42.000000000 +0200
@@ -268,3 +268,5 @@
 
 install(FILES scripting/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 
+install(FILES plasma_popupapplet_fix_groups.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
@@ -0,0 +1,8 @@
+#!/usr/bin/perl
+
+while(<>) {
+  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
+    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
+  }
+  print $_;
+}
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
@@ -0,0 +1,4 @@
+# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
+Id=PlasmaPopupAppletFixGroups
+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
+Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- kdelibs.spec	19 Apr 2009 14:23:15 -0000	1.467
+++ kdelibs.spec	20 Apr 2009 12:23:37 -0000	1.468
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
 Patch26: kdelibs-4.2.2-plasma-focus.patch
+# kconf_update script for Patch201 - to be upstreamed
+Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -95,6 +97,8 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
+# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -229,6 +233,7 @@
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
 %patch26 -p1 -b .kickoff-focus
+%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -240,6 +245,8 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
+%patch201 -p0 -b .popupapplet-config
+
 
 %build
 
@@ -421,6 +428,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
+- fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+
 * Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
 - fix and simplify the child struct disposal (kde#180785)
 



From dwalsh at fedoraproject.org  Mon Apr 20 12:32:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 20 Apr 2009 12:32:22 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.93,
	1.94 selinux-policy.spec, 1.829, 1.830
Message-ID: <20090420123222.95C8F70102@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15087

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-9
- Add ability to run postdrop from confined users


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- policy-20090105.patch	18 Apr 2009 10:33:57 -0000	1.93
+++ policy-20090105.patch	20 Apr 2009 12:32:21 -0000	1.94
@@ -729,17 +729,18 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.12/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-04-07 16:01:44.000000000 -0400
-@@ -3,6 +3,7 @@
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-04-19 15:52:53.000000000 -0400
+@@ -3,15 +3,12 @@
  /usr/bin/smart 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  /usr/bin/yum 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
+-
+-/usr/lib(64)?/rpm/rpmd		-- 	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/rpm/rpmq		-- 	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/rpm/rpmk		-- 	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
 +/usr/sbin/yum-complete-transaction --	gen_context(system_u:object_r:rpm_exec_t,s0)
  
- /usr/lib(64)?/rpm/rpmd		-- 	gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/rpm/rpmq		-- 	gen_context(system_u:object_r:bin_t,s0)
-@@ -11,7 +12,8 @@
- 
  /usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/yum-updatesd		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 -
@@ -748,7 +749,7 @@
  /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  ifdef(`distro_redhat', `
-@@ -21,14 +23,18 @@
+@@ -21,14 +18,18 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -1104,8 +1105,17 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.12/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-09 04:59:09.000000000 -0400
-@@ -31,6 +31,9 @@
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-19 15:57:21.000000000 -0400
+@@ -9,6 +9,8 @@
+ type rpm_t;
+ type rpm_exec_t;
+ init_system_domain(rpm_t, rpm_exec_t)
++#application_domain(rpm_t, rpm_exec_t)
++
+ domain_obj_id_change_exemption(rpm_t)
+ domain_role_change_exemption(rpm_t)
+ domain_system_change_exemption(rpm_t)
+@@ -31,6 +33,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
  
@@ -1115,7 +1125,7 @@
  type rpm_script_t;
  type rpm_script_exec_t;
  domain_obj_id_change_exemption(rpm_script_t)
-@@ -52,8 +55,9 @@
+@@ -52,8 +57,9 @@
  # rpm Local policy
  #
  
@@ -1127,7 +1137,7 @@
  allow rpm_t self:process { getattr setexec setfscreate setrlimit };
  allow rpm_t self:fd use;
  allow rpm_t self:fifo_file rw_fifo_file_perms;
-@@ -68,6 +72,8 @@
+@@ -68,6 +74,8 @@
  allow rpm_t self:sem create_sem_perms;
  allow rpm_t self:msgq create_msgq_perms;
  allow rpm_t self:msg { send receive };
@@ -1136,7 +1146,7 @@
  
  allow rpm_t rpm_log_t:file manage_file_perms;
  logging_log_filetrans(rpm_t, rpm_log_t, file)
-@@ -87,8 +93,12 @@
+@@ -87,8 +95,12 @@
  manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
  
@@ -1149,7 +1159,7 @@
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -108,13 +118,16 @@
+@@ -108,13 +120,16 @@
  dev_list_sysfs(rpm_t)
  dev_list_usbfs(rpm_t)
  dev_read_urand(rpm_t)
@@ -1166,7 +1176,7 @@
  
  mls_file_read_all_levels(rpm_t)
  mls_file_write_all_levels(rpm_t)
-@@ -132,6 +145,8 @@
+@@ -132,6 +147,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -1175,7 +1185,7 @@
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -155,6 +170,7 @@
+@@ -155,6 +172,7 @@
  files_exec_etc_files(rpm_t)
  
  init_domtrans_script(rpm_t)
@@ -1183,7 +1193,7 @@
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,17 +190,28 @@
+@@ -174,17 +192,28 @@
  ')
  
  optional_policy(`
@@ -1213,7 +1223,7 @@
  ')
  
  ifdef(`TODO',`
-@@ -210,8 +237,8 @@
+@@ -210,8 +239,8 @@
  # rpm-script Local policy
  #
  
@@ -1224,7 +1234,7 @@
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -222,12 +249,15 @@
+@@ -222,12 +251,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -1240,7 +1250,7 @@
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +269,9 @@
+@@ -239,6 +271,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
@@ -1250,7 +1260,7 @@
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +288,7 @@
+@@ -255,6 +290,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -1258,7 +1268,7 @@
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +306,19 @@
+@@ -272,14 +308,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1278,7 +1288,7 @@
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,6 +330,7 @@
+@@ -291,6 +332,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1286,7 +1296,7 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -308,12 +348,15 @@
+@@ -308,12 +350,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1302,7 +1312,7 @@
  	')
  ')
  
-@@ -326,6 +369,10 @@
+@@ -326,6 +371,10 @@
  ')
  
  optional_policy(`
@@ -1313,7 +1323,7 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -333,6 +380,7 @@
+@@ -333,6 +382,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -4676,7 +4686,7 @@
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-03-05 10:34:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-17 07:21:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-19 15:53:09.000000000 -0400
 @@ -32,6 +32,8 @@
  #
  # /etc
@@ -4695,7 +4705,7 @@
  #
  # /usr
  #
-@@ -299,3 +303,14 @@
+@@ -299,3 +303,20 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4710,6 +4720,12 @@
 +/usr/lib/wicd/monitor.py 	-- 	gen_context(system_u:object_r:bin_t, s0)
 +
 +/usr/lib(64)?/nspluginwrapper/np.*	gen_context(system_u:object_r:bin_t,s0)
++
++/usr/lib(64)?/rpm/rpmd		-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/rpm/rpmq		-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/rpm/rpmk		-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.12/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.if	2009-04-07 16:01:44.000000000 -0400
@@ -13382,6 +13398,18 @@
 +	polkit_read_reload(gnomeclock_t)
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.if serefpolicy-3.6.12/policy/modules/services/gpm.if
+--- nsaserefpolicy/policy/modules/services/gpm.if	2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/gpm.if	2009-04-20 08:24:22.000000000 -0400
+@@ -16,7 +16,7 @@
+ 		type gpmctl_t, gpm_t;
+ 	')
+ 
+-	allow $1 gpmctl_t:sock_file { getattr write };
++	allow $1 gpmctl_t:sock_file rw_sock_file_perms;
+ 	allow $1 gpm_t:unix_stream_socket connectto;
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.6.12/policy/modules/services/gpm.te
 --- nsaserefpolicy/policy/modules/services/gpm.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/gpm.te	2009-04-07 16:01:44.000000000 -0400
@@ -13685,7 +13713,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-04-11 07:33:35.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-04-20 07:58:45.000000000 -0400
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -13745,16 +13773,20 @@
  	rpc_search_nfs_state_data(hald_t)
  ')
  
-@@ -301,12 +327,16 @@
- 	virt_manage_images(hald_t)
+@@ -298,7 +324,11 @@
  ')
  
-+optional_policy(`
-+	xserver_read_pid(hald_t)
+ optional_policy(`
+-	virt_manage_images(hald_t)
++	virtual_manage_image(hald_t)
 +')
 +
++optional_policy(`
++	xserver_read_pid(hald_t)
+ ')
+ 
  ########################################
- #
+@@ -306,7 +336,7 @@
  # Hal acl local policy
  #
  
@@ -17642,7 +17674,7 @@
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.12/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/postfix.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/postfix.if	2009-04-20 07:42:10.000000000 -0400
 @@ -46,6 +46,7 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
@@ -17812,7 +17844,7 @@
  ')
  
  ########################################
-@@ -500,3 +558,23 @@
+@@ -500,3 +558,43 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -17836,6 +17868,26 @@
 +	domtrans_pattern($1, postfix_postdrop_exec_t, postfix_postdrop_t)
 +')
 +
++########################################
++## <summary>
++##	Execute the master postdrop in the
++##	postfix_postdrop domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`postfix_run_postdrop',`
++	gen_require(`
++		type postfix_postdrop_t;
++	')
++
++	postfix_domtrans_postdrop($1)
++	role $2 types postfix_postdrop_t;
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.12/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-15 08:35:07.000000000 -0400
@@ -22843,7 +22895,7 @@
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.12/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.if	2009-04-20 08:00:16.000000000 -0400
 @@ -2,28 +2,6 @@
  
  ########################################
@@ -22896,7 +22948,20 @@
           manage_files_pattern($1, virt_var_run_t, virt_var_run_t)
  ')
  
-@@ -293,6 +272,41 @@
+@@ -272,11 +251,7 @@
+ 	')
+ 
+ 	virt_search_lib($1)
+-	allow $1 virt_image_t:dir list_dir_perms;
+-	manage_dirs_pattern($1, virt_image_t, virt_image_t)
+-	manage_files_pattern($1, virt_image_t, virt_image_t)
+-	read_lnk_files_pattern($1, virt_image_t, virt_image_t)
+-	rw_blk_files_pattern($1, virt_image_t, virt_image_t)
++	virtual_manage_image($1)
+ 
+ 	tunable_policy(`virt_use_nfs',`
+ 		fs_manage_nfs_dirs($1)
+@@ -293,6 +268,41 @@
  
  ########################################
  ## <summary>
@@ -22938,7 +23003,7 @@
  ##	All of the rules required to administrate 
  ##	an virt environment
  ## </summary>
-@@ -327,3 +341,53 @@
+@@ -327,3 +337,53 @@
  
  	virt_manage_log($1)
  ')
@@ -22994,7 +23059,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-17 11:32:56.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-20 07:48:51.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23067,7 +23132,7 @@
 -allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
 -allow virtd_t self:process { getsched sigkill signal execmem };
 +allow virtd_t self:capability { chown dac_override ipc_lock kill mknod net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace };
-+allow virtd_t self:process { getsched sigkill signal execmem setexec setfscreate setsched };
++allow virtd_t self:process { getsched sigkill signal signull execmem setexec setfscreate setsched };
  allow virtd_t self:fifo_file rw_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;
  allow virtd_t self:tcp_socket create_stream_socket_perms;
@@ -25519,7 +25584,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 11:41:15.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-19 15:52:00.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25819,17 +25884,16 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +799,9 @@
+@@ -719,8 +797,6 @@
+ 	# bash tries ioctl for some reason
+ 	files_dontaudit_ioctl_all_pids(initrc_t)
  
- 	# why is this needed:
- 	rpm_manage_db(initrc_t)
-+	# Allow SELinux aware applications to request rpm_script_t execution
-+	rpm_transition_script(initrc_t)
-+
+-	# why is this needed:
+-	rpm_manage_db(initrc_t)
  ')
  
  optional_policy(`
-@@ -733,10 +814,12 @@
+@@ -733,10 +809,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25842,7 +25906,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +837,11 @@
+@@ -754,6 +832,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25854,27 +25918,29 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +849,8 @@
- 		# system-config-services causes avc messages that should be dontaudited
- 		unconfined_dontaudit_rw_pipes(daemon)
+@@ -765,6 +848,21 @@
+ 	optional_policy(`
+ 		mono_domtrans(initrc_t)
  	')
++
++	# why is this needed:
++	rpm_manage_db(initrc_t)
++	# Allow SELinux aware applications to request rpm_script_t execution
++	rpm_transition_script(initrc_t)
++')
++
++optional_policy(`
 +	# sudo service restart causes this 
 +	unconfined_signull(daemon)
- 
- 	optional_policy(`
- 		mono_domtrans(initrc_t)
-@@ -768,6 +858,10 @@
- ')
- 
- optional_policy(`
-+	rpm_dontaudit_rw_pipes(daemon)
 +')
 +
++
 +optional_policy(`
- 	vmware_read_system_config(initrc_t)
- 	vmware_append_system_config(initrc_t)
++	rpm_dontaudit_rw_pipes(daemon)
  ')
-@@ -790,3 +884,25 @@
+ 
+ optional_policy(`
+@@ -790,3 +888,25 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -29161,7 +29227,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-18 06:14:35.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-20 08:25:48.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -30146,7 +30212,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1050,47 @@
+@@ -986,37 +1050,55 @@
  		')
  	')
  
@@ -30189,6 +30255,10 @@
 +	')
 +
 +	optional_policy(`
++		gpm_stream_connect($1_usertype)
++	')
++
++	optional_policy(`
 +		java_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -30200,6 +30270,10 @@
 +		mount_run($1_t, $1_r)
 +	')
 +
++	optional_policy(`
++		postfix_run_postdrop($1_t, $1_r)
++	')
++
 +	# Run pppd in pppd_t by default for user
 +	optional_policy(`
 +		ppp_run_cond($1_t, $1_r)
@@ -30208,7 +30282,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1124,7 @@
+@@ -1050,7 +1132,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -30217,7 +30291,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1133,7 @@
+@@ -1059,8 +1141,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -30227,7 +30301,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1156,8 @@
+@@ -1083,7 +1164,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -30237,7 +30311,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1099,6 +1173,7 @@
+@@ -1099,6 +1181,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -30245,7 +30319,7 @@
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1106,8 +1181,6 @@
+@@ -1106,8 +1189,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -30254,7 +30328,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1235,6 @@
+@@ -1162,20 +1243,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -30275,7 +30349,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1280,7 @@
+@@ -1221,6 +1288,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -30283,7 +30357,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1346,15 @@
+@@ -1286,11 +1354,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -30299,7 +30373,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1451,7 @@
+@@ -1387,7 +1459,7 @@
  
  ########################################
  ## <summary>
@@ -30308,7 +30382,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1484,14 @@
+@@ -1420,6 +1492,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -30323,7 +30397,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1507,11 @@
+@@ -1435,9 +1515,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -30335,7 +30409,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1568,25 @@
+@@ -1494,6 +1576,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -30361,7 +30435,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1568,6 +1661,8 @@
+@@ -1568,6 +1669,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -30370,7 +30444,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1738,7 @@
+@@ -1643,6 +1746,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -30378,7 +30452,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,30 +1837,80 @@
+@@ -1741,30 +1845,80 @@
  
  ########################################
  ## <summary>
@@ -30441,7 +30515,7 @@
 +interface(`userdom_dontaudit_delete_user_home_content_files',`
 +	gen_require(`
 +		type user_home_t;
-+	')
+ 	')
 +
 +	allow $1 user_home_t:dir delete_file_perms;
 +')
@@ -30461,7 +30535,7 @@
 +	gen_require(`
 +		type user_home_dir_t;
 +		attribute user_home_type;
- 	')
++	')
 +
 +	files_search_home($1)
 +	exec_files_pattern($1, { user_home_dir_t user_home_type }, user_home_type)
@@ -30469,7 +30543,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1933,46 @@
+@@ -1787,6 +1941,46 @@
  
  ########################################
  ## <summary>
@@ -30516,7 +30590,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -1799,6 +1985,7 @@
+@@ -1799,6 +1993,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -30524,7 +30598,7 @@
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2328,7 +2515,7 @@
+@@ -2328,7 +2523,7 @@
  
  ########################################
  ## <summary>
@@ -30533,17 +30607,59 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2814,7 +3001,25 @@
+@@ -2814,12 +3009,12 @@
  		type user_tmp_t;
  	')
  
 -	allow $1 user_tmp_t:file write_file_perms;
 +	write_files_pattern($1, user_tmp_t, user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to use user ttys.
++##	Delete all users files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2827,17 +3022,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_dontaudit_use_user_ttys',`
++interface(`userdom_delete_user_tmp_files',`
+ 	gen_require(`
+-		type user_tty_device_t;
++		type user_tmp_t;
+ 	')
+ 
+-	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
++	allow $1 user_tmp_t:file delete_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Read the process state of all user domains.
++##	Do not audit attempts to use user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2845,12 +3040,31 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_read_all_users_state',`
++interface(`userdom_dontaudit_use_user_ttys',`
++	gen_require(`
++		type user_tty_device_t;
++	')
++
++	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
 +')
 +
 +########################################
 +## <summary>
-+##	Delete all users files in /tmp
++##	Read the process state of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -30551,16 +30667,9 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_delete_user_tmp_files',`
-+	gen_require(`
-+		type user_tmp_t;
-+	')
-+
-+	allow $1 user_tmp_t:file delete_file_perms;
- ')
- 
- ########################################
-@@ -2851,6 +3056,7 @@
++interface(`userdom_read_all_users_state',`
+ 	gen_require(`
+ 		attribute userdomain;
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -30568,7 +30677,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3187,481 @@
+@@ -2981,3 +3195,481 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -31143,7 +31252,7 @@
 +# No application file contexts.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.12/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-20 07:58:28.000000000 -0400
 @@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
@@ -31453,7 +31562,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-20 07:59:14.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- selinux-policy.spec	18 Apr 2009 10:33:58 -0000	1.829
+++ selinux-policy.spec	20 Apr 2009 12:32:21 -0000	1.830
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-9
+- Add ability to run postdrop from confined users
+
 * Sat Apr 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-8
 - Fixes for podsleuth
 



From kkofler at fedoraproject.org  Mon Apr 20 12:46:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 12:46:09 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-popupapplet-config.patch, NONE,
	1.1 kdelibs-4.2.2-popupapplet-kconf_update.patch, NONE,
	1.1 kdelibs.spec, 1.416, 1.417
Message-ID: <20090420124609.E3F8570102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17093/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
- fix Plasma PopupApplet configuration interfering with weather applet (#495998)

kdelibs-4.2.2-popupapplet-config.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-config.patch ---
Index: plasma/popupapplet.cpp
===================================================================
--- plasma/popupapplet.cpp	(revision 937997)
+++ plasma/popupapplet.cpp	(revision 937998)
@@ -535,8 +535,8 @@
 {
     //Reposition the dialog
     if (dialog) {
-        KConfigGroup sizeGroup = q->config();
-        sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+        KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+        KConfigGroup sizeGroup(mainGroup, "PopupApplet");
         sizeGroup.writeEntry("DialogHeight", dialog->height());
         sizeGroup.writeEntry("DialogWidth", dialog->width());
 
@@ -559,8 +559,8 @@
         return;
     }
 
-    KConfigGroup sizeGroup = q->config();
-    sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+    KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+    KConfigGroup sizeGroup(mainGroup, "PopupApplet");
 
     Q_ASSERT(q->containment());
     Q_ASSERT(q->containment()->corona());

kdelibs-4.2.2-popupapplet-kconf_update.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-kconf_update.patch ---
diff -Nur kdelibs-4.2.2/plasma/CMakeLists.txt kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt
--- kdelibs-4.2.2/plasma/CMakeLists.txt	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt	2009-04-19 05:33:42.000000000 +0200
@@ -268,3 +268,5 @@
 
 install(FILES scripting/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 
+install(FILES plasma_popupapplet_fix_groups.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
@@ -0,0 +1,8 @@
+#!/usr/bin/perl
+
+while(<>) {
+  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
+    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
+  }
+  print $_;
+}
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
@@ -0,0 +1,4 @@
+# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
+Id=PlasmaPopupAppletFixGroups
+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
+Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- kdelibs.spec	19 Apr 2009 15:27:51 -0000	1.416
+++ kdelibs.spec	20 Apr 2009 12:45:39 -0000	1.417
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
 Patch26: kdelibs-4.2.2-plasma-focus.patch
+# kconf_update script for Patch201 - to be upstreamed
+Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -95,6 +97,8 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
+# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -229,6 +233,7 @@
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
 %patch26 -p1 -b .kickoff-focus
+%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -240,6 +245,8 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
+%patch201 -p0 -b .popupapplet-config
+
 
 %build
 
@@ -421,6 +428,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
+- fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+
 * Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
 - fix and simplify the child struct disposal (kde#180785)
 



From kkofler at fedoraproject.org  Mon Apr 20 12:46:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 12:46:10 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.2-popupapplet-config.patch, NONE,
	1.1 kdelibs-4.2.2-popupapplet-kconf_update.patch, NONE,
	1.1 kdelibs.spec, 1.467, 1.468
Message-ID: <20090420124610.4D86470102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17093/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
- fix Plasma PopupApplet configuration interfering with weather applet (#495998)

kdelibs-4.2.2-popupapplet-config.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-config.patch ---
Index: plasma/popupapplet.cpp
===================================================================
--- plasma/popupapplet.cpp	(revision 937997)
+++ plasma/popupapplet.cpp	(revision 937998)
@@ -535,8 +535,8 @@
 {
     //Reposition the dialog
     if (dialog) {
-        KConfigGroup sizeGroup = q->config();
-        sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+        KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+        KConfigGroup sizeGroup(mainGroup, "PopupApplet");
         sizeGroup.writeEntry("DialogHeight", dialog->height());
         sizeGroup.writeEntry("DialogWidth", dialog->width());
 
@@ -559,8 +559,8 @@
         return;
     }
 
-    KConfigGroup sizeGroup = q->config();
-    sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+    KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+    KConfigGroup sizeGroup(mainGroup, "PopupApplet");
 
     Q_ASSERT(q->containment());
     Q_ASSERT(q->containment()->corona());

kdelibs-4.2.2-popupapplet-kconf_update.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-kconf_update.patch ---
diff -Nur kdelibs-4.2.2/plasma/CMakeLists.txt kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt
--- kdelibs-4.2.2/plasma/CMakeLists.txt	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt	2009-04-19 05:33:42.000000000 +0200
@@ -268,3 +268,5 @@
 
 install(FILES scripting/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 
+install(FILES plasma_popupapplet_fix_groups.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
@@ -0,0 +1,8 @@
+#!/usr/bin/perl
+
+while(<>) {
+  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
+    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
+  }
+  print $_;
+}
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
@@ -0,0 +1,4 @@
+# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
+Id=PlasmaPopupAppletFixGroups
+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
+Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- kdelibs.spec	19 Apr 2009 14:23:14 -0000	1.467
+++ kdelibs.spec	20 Apr 2009 12:45:39 -0000	1.468
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
 Patch26: kdelibs-4.2.2-plasma-focus.patch
+# kconf_update script for Patch201 - to be upstreamed
+Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -95,6 +97,8 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
+# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -229,6 +233,7 @@
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
 %patch26 -p1 -b .kickoff-focus
+%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -240,6 +245,8 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
+%patch201 -p0 -b .popupapplet-config
+
 
 %build
 
@@ -421,6 +428,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
+- fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+
 * Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
 - fix and simplify the child struct disposal (kde#180785)
 



From kkofler at fedoraproject.org  Mon Apr 20 12:46:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 12:46:10 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-popupapplet-config.patch, NONE,
	1.1 kdelibs-4.2.2-popupapplet-kconf_update.patch, NONE,
	1.1 kdelibs.spec, 1.391, 1.392
Message-ID: <20090420124610.BED7C70102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17093/F-9

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
- fix Plasma PopupApplet configuration interfering with weather applet (#495998)

kdelibs-4.2.2-popupapplet-config.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-config.patch ---
Index: plasma/popupapplet.cpp
===================================================================
--- plasma/popupapplet.cpp	(revision 937997)
+++ plasma/popupapplet.cpp	(revision 937998)
@@ -535,8 +535,8 @@
 {
     //Reposition the dialog
     if (dialog) {
-        KConfigGroup sizeGroup = q->config();
-        sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+        KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+        KConfigGroup sizeGroup(mainGroup, "PopupApplet");
         sizeGroup.writeEntry("DialogHeight", dialog->height());
         sizeGroup.writeEntry("DialogWidth", dialog->width());
 
@@ -559,8 +559,8 @@
         return;
     }
 
-    KConfigGroup sizeGroup = q->config();
-    sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+    KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+    KConfigGroup sizeGroup(mainGroup, "PopupApplet");
 
     Q_ASSERT(q->containment());
     Q_ASSERT(q->containment()->corona());

kdelibs-4.2.2-popupapplet-kconf_update.patch:

--- NEW FILE kdelibs-4.2.2-popupapplet-kconf_update.patch ---
diff -Nur kdelibs-4.2.2/plasma/CMakeLists.txt kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt
--- kdelibs-4.2.2/plasma/CMakeLists.txt	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt	2009-04-19 05:33:42.000000000 +0200
@@ -268,3 +268,5 @@
 
 install(FILES scripting/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 
+install(FILES plasma_popupapplet_fix_groups.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
@@ -0,0 +1,8 @@
+#!/usr/bin/perl
+
+while(<>) {
+  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
+    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
+  }
+  print $_;
+}
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
@@ -0,0 +1,4 @@
+# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
+Id=PlasmaPopupAppletFixGroups
+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
+Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- kdelibs.spec	19 Apr 2009 15:27:49 -0000	1.391
+++ kdelibs.spec	20 Apr 2009 12:45:40 -0000	1.392
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
 Patch26: kdelibs-4.2.2-plasma-focus.patch
+# kconf_update script for Patch201 - to be upstreamed
+Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -95,6 +97,8 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
+# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -229,6 +233,7 @@
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
 %patch26 -p1 -b .kickoff-focus
+%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -240,6 +245,8 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
+%patch201 -p0 -b .popupapplet-config
+
 
 %build
 
@@ -421,6 +428,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
+- fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+
 * Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-7
 - fix and simplify the child struct disposal (kde#180785)
 



From jwrdegoede at fedoraproject.org  Mon Apr 20 12:55:52 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 20 Apr 2009 12:55:52 +0000 (UTC)
Subject: rpms/dmraid/F-11 dmraid-1.0.0.rc15-isw-serial.patch,NONE,1.1
Message-ID: <20090420125553.0478870102@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19589

Added Files:
	dmraid-1.0.0.rc15-isw-serial.patch 
Log Message:
* Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7
- Fix activation of isw raid sets when the disks have serialnumber longer
  then 16 characters (#490121)


dmraid-1.0.0.rc15-isw-serial.patch:

--- NEW FILE dmraid-1.0.0.rc15-isw-serial.patch ---
diff -up 1.0.0.rc15/lib/format/ataraid/isw.c~ 1.0.0.rc15/lib/format/ataraid/isw.c
--- 1.0.0.rc15/lib/format/ataraid/isw.c~	2009-04-10 14:12:14.000000000 +0200
+++ 1.0.0.rc15/lib/format/ataraid/isw.c	2009-04-10 14:38:56.000000000 +0200
@@ -81,15 +81,43 @@ is_raid10(struct isw_dev *dev)
 }
 
 /* Find a disk table slot by serial number. */
+static const char *dev_info_serial_to_isw(const char *di_serial)
+{
+	static char isw_serial[1024];
+
+	int i, isw_serial_len = 0;
+
+	for (i = 0; di_serial[i] && isw_serial_len < 1023; i++) {
+		if (((unsigned char)di_serial[i]) > 0x20) {
+			/* ':' is reserved for use in placeholder serial
+			 * numbers for missing disks */
+			if (di_serial[i] == ':')
+				isw_serial[isw_serial_len] = ';';
+			else
+				isw_serial[isw_serial_len] = di_serial[i];
+			isw_serial_len++;
+		}
+	}
+	isw_serial[isw_serial_len] = 0;
+
+	if (isw_serial_len > MAX_RAID_SERIAL_LEN)
+		memmove(isw_serial,
+			isw_serial + (isw_serial_len - MAX_RAID_SERIAL_LEN),
+			MAX_RAID_SERIAL_LEN);
+
+	return isw_serial;
+}
+
 static struct isw_disk *
 _get_disk(struct isw *isw, struct dev_info *di)
 {
 	if (di->serial) {
 		int i = isw->num_disks;
 		struct isw_disk *disk = isw->disk;
+		const char *isw_serial = dev_info_serial_to_isw(di->serial);
 
 		while (i--) {
-			if (!strncmp(di->serial, (const char *) disk[i].serial,
+			if (!strncmp(isw_serial, (const char *) disk[i].serial,
 				     MAX_RAID_SERIAL_LEN))
 				return disk + i;
 		}
@@ -866,7 +894,8 @@ rd_by_serial(struct raid_set *rs, const 
 
 	list_for_each_entry(rd, &rs->devs, devs) {
 		if (rd->di &&
-		    !strncmp(rd->di->serial, serial, MAX_RAID_SERIAL_LEN))
+		    !strncmp(dev_info_serial_to_isw(rd->di->serial), serial,
+						    MAX_RAID_SERIAL_LEN))
 			return rd;
 	}
 
@@ -1297,7 +1326,8 @@ isw_config_disks(struct lib_context *lc,
 	struct raid_dev *rd;
 
 	list_for_each_entry(rd, &rs->devs, devs) {
-		strncpy((char *) disk[i].serial, rd->di->serial,
+		strncpy((char *) disk[i].serial, 
+			dev_info_serial_to_isw(rd->di->serial),
 			MAX_RAID_SERIAL_LEN);
 		disk[i].totalBlocks = rd->di->sectors;
 
@@ -2421,7 +2451,8 @@ update_metadata(struct lib_context *lc, 
 	while (i--) {
 		/* Check if the disk is listed. */
 		list_for_each_entry(di, LC_DI(lc), list) {
-			if (!strncmp(di->serial, (const char *) disk[i].serial,
+			if (!strncmp(dev_info_serial_to_isw(di->serial),
+				     (const char *) disk[i].serial,
 				     MAX_RAID_SERIAL_LEN))
 				goto goon;
 		}
@@ -2517,7 +2548,8 @@ update_metadata(struct lib_context *lc, 
 	new_disk->status = CONFIG_ON_DISK |
 		DISK_SMART_EVENT_SUPPORTED |
 		CLAIMED_DISK | DETECTED_DISK | USABLE_DISK | CONFIGURED_DISK;
-	strncpy((char *) new_disk->serial, di->serial, MAX_RAID_SERIAL_LEN);
+	strncpy((char *) new_disk->serial, dev_info_serial_to_isw(di->serial),
+		MAX_RAID_SERIAL_LEN);
 
 	/* build new isw_disk array */
 	for (i = 0; i < isw->num_disks; i++) {



From pali at fedoraproject.org  Mon Apr 20 13:00:50 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Mon, 20 Apr 2009 13:00:50 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.7, 1.8 cherokee.spec, 1.12,
	1.13 import.log, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090420130050.DD5D370102@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21330/devel

Modified Files:
	.cvsignore cherokee.spec import.log sources 
Log Message:
TEXT_TO_CVS


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2009 22:30:45 -0000	1.7
+++ .cvsignore	20 Apr 2009 13:00:20 -0000	1.8
@@ -1 +1 @@
-cherokee-0.99.0.tar.gz
+cherokee-0.99.11.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cherokee.spec	7 Mar 2009 22:30:47 -0000	1.12
+++ cherokee.spec	20 Apr 2009 13:00:20 -0000	1.13
@@ -10,7 +10,7 @@
 %endif
 
 Name:           cherokee
-Version:        0.99.0
+Version:        0.99.11
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -132,6 +132,8 @@
 %{_sbindir}/cherokee-worker
 %{_libdir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
+%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo
+%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo
 %{_datadir}/%{name}
 # logs are written as root. no need to give perms to the cherokee user.
 %dir %{_var}/log/%{name}/
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
 * Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
 - updated to 0.99.0
 
@@ -173,27 +178,38 @@
 
 * Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
 - updated to 0.98.1
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
 - rebuild for dependencies
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
 - ppc arch excluded only for el4
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
 - ppc arch excluded
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
 - updated to 0.11.2
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
 - Unowned directories, Resolves bz 474634
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
 - do not package spawn-fcgi files (lighttpd-fastcgi provides them)
   Resolves bz 469947
 - get rid of rpath in compiled files
+
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
 - corrections in spec
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
 - first build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	7 Mar 2009 22:30:47 -0000	1.9
+++ import.log	20 Apr 2009 13:00:20 -0000	1.10
@@ -7,3 +7,4 @@
 cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
 cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
 cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
+cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2009 22:30:47 -0000	1.7
+++ sources	20 Apr 2009 13:00:20 -0000	1.8
@@ -1 +1 @@
-719f16b3d99df5c22f0954eeb0d2cade  cherokee-0.99.0.tar.gz
+b924578cafa1e10550f3fae4e1c63270  cherokee-0.99.11.tar.gz



From pali at fedoraproject.org  Mon Apr 20 13:05:28 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Mon, 20 Apr 2009 13:05:28 +0000 (UTC)
Subject: rpms/cherokee/F-9 .cvsignore, 1.7, 1.8 cherokee.spec, 1.9,
	1.10 import.log, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090420130528.0AAB270102@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22450/F-9

Modified Files:
	.cvsignore cherokee.spec import.log sources 
Log Message:
updated to 0.99.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2009 22:32:06 -0000	1.7
+++ .cvsignore	20 Apr 2009 13:04:57 -0000	1.8
@@ -1 +1 @@
-cherokee-0.99.0.tar.gz
+cherokee-0.99.11.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-9/cherokee.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cherokee.spec	7 Mar 2009 22:32:07 -0000	1.9
+++ cherokee.spec	20 Apr 2009 13:04:57 -0000	1.10
@@ -10,7 +10,7 @@
 %endif
 
 Name:           cherokee
-Version:        0.99.0
+Version:        0.99.11
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -132,6 +132,8 @@
 %{_sbindir}/cherokee-worker
 %{_libdir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
+%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo
+%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo
 %{_datadir}/%{name}
 # logs are written as root. no need to give perms to the cherokee user.
 %dir %{_var}/log/%{name}/
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
 * Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
 - updated to 0.99.0
 
@@ -173,27 +178,38 @@
 
 * Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
 - updated to 0.98.1
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
 - rebuild for dependencies
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
 - ppc arch excluded only for el4
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
 - ppc arch excluded
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
 - updated to 0.11.2
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
 - Unowned directories, Resolves bz 474634
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
 - do not package spawn-fcgi files (lighttpd-fastcgi provides them)
   Resolves bz 469947
 - get rid of rpath in compiled files
+
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
 - corrections in spec
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
 - first build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-9/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	7 Mar 2009 22:32:07 -0000	1.9
+++ import.log	20 Apr 2009 13:04:57 -0000	1.10
@@ -7,3 +7,4 @@
 cherokee-0_11_6-1_fc10:F-9:cherokee-0.11.6-1.fc10.src.rpm:1230705823
 cherokee-0_98_1-1_fc10:F-9:cherokee-0.98.1-1.fc10.src.rpm:1234791613
 cherokee-0_99_0-1_fc10:F-9:cherokee-0.99.0-1.fc10.src.rpm:1236465097
+cherokee-0_99_11-1_fc10:F-9:cherokee-0.99.11-1.fc10.src.rpm:1240232602


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2009 22:32:07 -0000	1.7
+++ sources	20 Apr 2009 13:04:57 -0000	1.8
@@ -1 +1 @@
-719f16b3d99df5c22f0954eeb0d2cade  cherokee-0.99.0.tar.gz
+b924578cafa1e10550f3fae4e1c63270  cherokee-0.99.11.tar.gz



From pali at fedoraproject.org  Mon Apr 20 13:06:59 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Mon, 20 Apr 2009 13:06:59 +0000 (UTC)
Subject: rpms/cherokee/F-10 .cvsignore, 1.7, 1.8 cherokee.spec, 1.10,
	1.11 import.log, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090420130659.8E00070102@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22858/F-10

Modified Files:
	.cvsignore cherokee.spec import.log sources 
Log Message:
updated to 0.99.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2009 22:33:20 -0000	1.7
+++ .cvsignore	20 Apr 2009 13:06:28 -0000	1.8
@@ -1 +1 @@
-cherokee-0.99.0.tar.gz
+cherokee-0.99.11.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-10/cherokee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cherokee.spec	7 Mar 2009 22:33:21 -0000	1.10
+++ cherokee.spec	20 Apr 2009 13:06:29 -0000	1.11
@@ -10,7 +10,7 @@
 %endif
 
 Name:           cherokee
-Version:        0.99.0
+Version:        0.99.11
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -132,6 +132,8 @@
 %{_sbindir}/cherokee-worker
 %{_libdir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
+%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo
+%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo
 %{_datadir}/%{name}
 # logs are written as root. no need to give perms to the cherokee user.
 %dir %{_var}/log/%{name}/
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
 * Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
 - updated to 0.99.0
 
@@ -173,27 +178,38 @@
 
 * Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
 - updated to 0.98.1
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
 - rebuild for dependencies
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
 - ppc arch excluded only for el4
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
 - ppc arch excluded
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
 - updated to 0.11.2
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
 - Unowned directories, Resolves bz 474634
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
 - do not package spawn-fcgi files (lighttpd-fastcgi provides them)
   Resolves bz 469947
 - get rid of rpath in compiled files
+
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
 - corrections in spec
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
 - first build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-10/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	7 Mar 2009 22:33:21 -0000	1.9
+++ import.log	20 Apr 2009 13:06:29 -0000	1.10
@@ -7,3 +7,4 @@
 cherokee-0_11_6-1_fc10:F-10:cherokee-0.11.6-1.fc10.src.rpm:1230705923
 cherokee-0_98_1-1_fc10:F-10:cherokee-0.98.1-1.fc10.src.rpm:1234791686
 cherokee-0_99_0-1_fc10:F-10:cherokee-0.99.0-1.fc10.src.rpm:1236465177
+cherokee-0_99_11-1_fc10:F-10:cherokee-0.99.11-1.fc10.src.rpm:1240232748


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2009 22:33:21 -0000	1.7
+++ sources	20 Apr 2009 13:06:29 -0000	1.8
@@ -1 +1 @@
-719f16b3d99df5c22f0954eeb0d2cade  cherokee-0.99.0.tar.gz
+b924578cafa1e10550f3fae4e1c63270  cherokee-0.99.11.tar.gz



From kkofler at fedoraproject.org  Mon Apr 20 13:08:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 13:08:59 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec,1.417,1.418
Message-ID: <20090420130859.26F4270102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23302/F-10

Modified Files:
	kdelibs.spec 
Log Message:
Apply the correct patch.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- kdelibs.spec	20 Apr 2009 12:45:39 -0000	1.417
+++ kdelibs.spec	20 Apr 2009 13:08:28 -0000	1.418
@@ -98,7 +98,7 @@
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
+Patch201: kdelibs-4.2.2-popupapplet-config.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex



From kkofler at fedoraproject.org  Mon Apr 20 13:08:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 13:08:59 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs.spec,1.468,1.469
Message-ID: <20090420130859.69AA770102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23302/F-11

Modified Files:
	kdelibs.spec 
Log Message:
Apply the correct patch.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- kdelibs.spec	20 Apr 2009 12:45:39 -0000	1.468
+++ kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.469
@@ -98,7 +98,7 @@
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
+Patch201: kdelibs-4.2.2-popupapplet-config.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex



From kkofler at fedoraproject.org  Mon Apr 20 13:09:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 13:09:00 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.468,1.469
Message-ID: <20090420130900.2A31C70102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23302/devel

Modified Files:
	kdelibs.spec 
Log Message:
Apply the correct patch.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- kdelibs.spec	20 Apr 2009 12:23:37 -0000	1.468
+++ kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.469
@@ -98,7 +98,7 @@
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
+Patch201: kdelibs-4.2.2-popupapplet-config.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex



From kkofler at fedoraproject.org  Mon Apr 20 13:08:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 20 Apr 2009 13:08:59 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec,1.392,1.393
Message-ID: <20090420130859.AD2BB70102@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23302/F-9

Modified Files:
	kdelibs.spec 
Log Message:
Apply the correct patch.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- kdelibs.spec	20 Apr 2009 12:45:40 -0000	1.392
+++ kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.393
@@ -98,7 +98,7 @@
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-kconf_update.patch
+Patch201: kdelibs-4.2.2-popupapplet-config.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex



From pali at fedoraproject.org  Mon Apr 20 13:11:51 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Mon, 20 Apr 2009 13:11:51 +0000 (UTC)
Subject: rpms/cherokee/F-11 .cvsignore, 1.7, 1.8 cherokee.spec, 1.12,
	1.13 import.log, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090420131151.D928A70102@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24035/F-11

Modified Files:
	.cvsignore cherokee.spec import.log sources 
Log Message:
updated to 0.99.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2009 22:30:45 -0000	1.7
+++ .cvsignore	20 Apr 2009 13:11:21 -0000	1.8
@@ -1 +1 @@
-cherokee-0.99.0.tar.gz
+cherokee-0.99.11.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cherokee.spec	7 Mar 2009 22:30:47 -0000	1.12
+++ cherokee.spec	20 Apr 2009 13:11:21 -0000	1.13
@@ -10,7 +10,7 @@
 %endif
 
 Name:           cherokee
-Version:        0.99.0
+Version:        0.99.11
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -132,6 +132,8 @@
 %{_sbindir}/cherokee-worker
 %{_libdir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
+%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo
+%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo
 %{_datadir}/%{name}
 # logs are written as root. no need to give perms to the cherokee user.
 %dir %{_var}/log/%{name}/
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
 * Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
 - updated to 0.99.0
 
@@ -173,27 +178,38 @@
 
 * Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
 - updated to 0.98.1
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
 - rebuild for dependencies
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
 - ppc arch excluded only for el4
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
 - ppc arch excluded
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
 - updated to 0.11.2
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
 - Unowned directories, Resolves bz 474634
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
 - do not package spawn-fcgi files (lighttpd-fastcgi provides them)
   Resolves bz 469947
 - get rid of rpath in compiled files
+
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
 - corrections in spec
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
 - first build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	7 Mar 2009 22:30:47 -0000	1.9
+++ import.log	20 Apr 2009 13:11:21 -0000	1.10
@@ -7,3 +7,4 @@
 cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
 cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
 cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
+cherokee-0_99_11-1_fc10:F-11:cherokee-0.99.11-1.fc10.src.rpm:1240232840


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2009 22:30:47 -0000	1.7
+++ sources	20 Apr 2009 13:11:21 -0000	1.8
@@ -1 +1 @@
-719f16b3d99df5c22f0954eeb0d2cade  cherokee-0.99.0.tar.gz
+b924578cafa1e10550f3fae4e1c63270  cherokee-0.99.11.tar.gz



From pali at fedoraproject.org  Mon Apr 20 13:13:17 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Mon, 20 Apr 2009 13:13:17 +0000 (UTC)
Subject: rpms/cherokee/EL-4 .cvsignore, 1.7, 1.8 cherokee.spec, 1.10,
	1.11 import.log, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090420131317.F009070102@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24455/EL-4

Modified Files:
	.cvsignore cherokee.spec import.log sources 
Log Message:
updated to 0.99.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2009 22:34:35 -0000	1.7
+++ .cvsignore	20 Apr 2009 13:12:47 -0000	1.8
@@ -1 +1 @@
-cherokee-0.99.0.tar.gz
+cherokee-0.99.11.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cherokee.spec	7 Mar 2009 22:34:35 -0000	1.10
+++ cherokee.spec	20 Apr 2009 13:12:47 -0000	1.11
@@ -10,7 +10,7 @@
 %endif
 
 Name:           cherokee
-Version:        0.99.0
+Version:        0.99.11
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -132,6 +132,8 @@
 %{_sbindir}/cherokee-worker
 %{_libdir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
+%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo
+%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo
 %{_datadir}/%{name}
 # logs are written as root. no need to give perms to the cherokee user.
 %dir %{_var}/log/%{name}/
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
 * Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
 - updated to 0.99.0
 
@@ -173,27 +178,38 @@
 
 * Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
 - updated to 0.98.1
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
 - rebuild for dependencies
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
 - ppc arch excluded only for el4
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
 - ppc arch excluded
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
 - updated to 0.11.2
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
 - Unowned directories, Resolves bz 474634
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
 - do not package spawn-fcgi files (lighttpd-fastcgi provides them)
   Resolves bz 469947
 - get rid of rpath in compiled files
+
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
 - corrections in spec
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
 - first build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	7 Mar 2009 22:34:35 -0000	1.10
+++ import.log	20 Apr 2009 13:12:47 -0000	1.11
@@ -8,3 +8,4 @@
 cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995
 cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759
 cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251
+cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2009 22:34:35 -0000	1.7
+++ sources	20 Apr 2009 13:12:47 -0000	1.8
@@ -1 +1 @@
-719f16b3d99df5c22f0954eeb0d2cade  cherokee-0.99.0.tar.gz
+b924578cafa1e10550f3fae4e1c63270  cherokee-0.99.11.tar.gz



From pali at fedoraproject.org  Mon Apr 20 13:14:30 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Mon, 20 Apr 2009 13:14:30 +0000 (UTC)
Subject: rpms/cherokee/EL-5 .cvsignore, 1.7, 1.8 cherokee.spec, 1.9,
	1.10 import.log, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090420131430.0A94770102@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24832/EL-5

Modified Files:
	.cvsignore cherokee.spec import.log sources 
Log Message:
updated to 0.99.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2009 22:35:52 -0000	1.7
+++ .cvsignore	20 Apr 2009 13:13:59 -0000	1.8
@@ -1 +1 @@
-cherokee-0.99.0.tar.gz
+cherokee-0.99.11.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cherokee.spec	7 Mar 2009 22:35:52 -0000	1.9
+++ cherokee.spec	20 Apr 2009 13:13:59 -0000	1.10
@@ -10,7 +10,7 @@
 %endif
 
 Name:           cherokee
-Version:        0.99.0
+Version:        0.99.11
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -132,6 +132,8 @@
 %{_sbindir}/cherokee-worker
 %{_libdir}/%{name}
 %{_libdir}/lib%{name}-*.so.*
+%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo
+%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo
 %{_datadir}/%{name}
 # logs are written as root. no need to give perms to the cherokee user.
 %dir %{_var}/log/%{name}/
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
 * Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
 - updated to 0.99.0
 
@@ -173,27 +178,38 @@
 
 * Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
 - updated to 0.98.1
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
 - rebuild for dependencies
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
+
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
 - ppc arch excluded only for el4
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
 - ppc arch excluded
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
 - updated to 0.11.2
+
 * Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
 - Unowned directories, Resolves bz 474634
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
 - do not package spawn-fcgi files (lighttpd-fastcgi provides them)
   Resolves bz 469947
 - get rid of rpath in compiled files
+
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
 - corrections in spec
+
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
 - first build


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	7 Mar 2009 22:35:52 -0000	1.9
+++ import.log	20 Apr 2009 13:13:59 -0000	1.10
@@ -7,3 +7,4 @@
 cherokee-0_11_6-1_fc10:EL-5:cherokee-0.11.6-1.fc10.src.rpm:1230706069
 cherokee-0_98_1-1_fc10:EL-5:cherokee-0.98.1-1.fc10.src.rpm:1234791832
 cherokee-0_99_0-1_fc10:EL-5:cherokee-0.99.0-1.fc10.src.rpm:1236465324
+cherokee-0_99_11-1_fc10:EL-5:cherokee-0.99.11-1.fc10.src.rpm:1240233219


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2009 22:35:52 -0000	1.7
+++ sources	20 Apr 2009 13:13:59 -0000	1.8
@@ -1 +1 @@
-719f16b3d99df5c22f0954eeb0d2cade  cherokee-0.99.0.tar.gz
+b924578cafa1e10550f3fae4e1c63270  cherokee-0.99.11.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:12 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132712.F33A910F878@bastion2.fedora.phx.redhat.com>

devrim has set the watchcommits acl on tomcat5 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:14 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132714.3EE2A10F888@bastion2.fedora.phx.redhat.com>

devrim has set the watchbugzilla acl on tomcat5 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:26 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132726.709E810F860@bastion2.fedora.phx.redhat.com>

devrim has set the watchbugzilla acl on tomcat5 (Fedora 8) to Obsolete for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:15 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132715.3CD2C10F88B@bastion2.fedora.phx.redhat.com>

devrim has set the commit acl on tomcat5 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:27 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132727.2EF4210F892@bastion2.fedora.phx.redhat.com>

devrim has set the watchcommits acl on tomcat5 (Fedora 8) to Obsolete for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:30 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132730.8DE5910F895@bastion2.fedora.phx.redhat.com>

devrim has set the commit acl on tomcat5 (Fedora 8) to Obsolete for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:31 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132731.9E06C10F898@bastion2.fedora.phx.redhat.com>

devrim has set the approveacls acl on tomcat5 (Fedora 8) to Obsolete for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:37 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132737.92BA310F884@bastion2.fedora.phx.redhat.com>

devrim has set the approveacls acl on tomcat5 (Fedora 11) to Obsolete for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:41 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132741.6925710F889@bastion2.fedora.phx.redhat.com>

devrim has set the approveacls acl on tomcat5 (Fedora 11) to Approved for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:27:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:27:45 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132745.CC02B10F89B@bastion2.fedora.phx.redhat.com>

devrim has set the approveacls acl on tomcat5 (Fedora 10) to Approved for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From pkgdb at fedoraproject.org  Mon Apr 20 13:28:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 13:28:01 +0000
Subject: [pkgdb] tomcat5 had acl change status
Message-ID: <20090420132801.CD44110F88B@bastion2.fedora.phx.redhat.com>

devrim has set the approveacls acl on tomcat5 (Fedora devel) to Approved for dwalluck

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tomcat5



From hadess at fedoraproject.org  Mon Apr 20 13:43:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 20 Apr 2009 13:43:45 +0000 (UTC)
Subject: rpms/nautilus-sendto/F-11 .cvsignore, 1.20,
	1.21 nautilus-sendto.spec, 1.68, 1.69 sources, 1.20, 1.21
Message-ID: <20090420134345.8234970102@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30436

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Mon Apr 20 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-1
- Update to 1.1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	17 Apr 2009 15:46:53 -0000	1.20
+++ .cvsignore	20 Apr 2009 13:43:14 -0000	1.21
@@ -1 +1 @@
-nautilus-sendto-1.1.4.tar.bz2
+nautilus-sendto-1.1.4.1.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/nautilus-sendto.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- nautilus-sendto.spec	17 Apr 2009 15:46:53 -0000	1.68
+++ nautilus-sendto.spec	20 Apr 2009 13:43:15 -0000	1.69
@@ -1,5 +1,5 @@
 Name:           nautilus-sendto
-Version:        1.1.4
+Version:        1.1.4.1
 Release: 	1%{?dist}
 Summary:        Nautilus context menu for sending files
 
@@ -79,7 +79,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS
+%doc AUTHORS ChangeLog ChangeLog.pre-1.1.4.1 COPYING NEWS
 %{_libdir}/nautilus/extensions-2.0/libnautilus-sendto.so
 %dir %{_libdir}/nautilus-sendto
 %dir %{_libdir}/nautilus-sendto/plugins
@@ -94,6 +94,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Mon Apr 20 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-1
+- Update to 1.1.4.1
+
 * Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-1
 - Update to 1.1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	17 Apr 2009 15:46:53 -0000	1.20
+++ sources	20 Apr 2009 13:43:15 -0000	1.21
@@ -1 +1 @@
-fd9c8e4bf61b51b9a84578e327154bc5  nautilus-sendto-1.1.4.tar.bz2
+c4b66eb6fd24eff0b2240b832085a20e  nautilus-sendto-1.1.4.1.tar.bz2



From akurtakov at fedoraproject.org  Mon Apr 20 13:45:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 20 Apr 2009 13:45:54 +0000 (UTC)
Subject: rpms/tomcat5/devel jasper-OSGi-MANIFEST.MF, 1.2, 1.3 tomcat5.spec, 
	1.126, 1.127
Message-ID: <20090420134554.B699B70102@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31146/devel

Modified Files:
	jasper-OSGi-MANIFEST.MF tomcat5.spec 
Log Message:
Update jasper-OSGi-MANIFEST.MF for eclipse 3.5.


Index: jasper-OSGi-MANIFEST.MF
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/jasper-OSGi-MANIFEST.MF,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper-OSGi-MANIFEST.MF	14 Jul 2008 14:37:38 -0000	1.2
+++ jasper-OSGi-MANIFEST.MF	20 Apr 2009 13:45:23 -0000	1.3
@@ -1,6 +1,18 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 2.3 (IBM Corporation)
+Bundle-ClassPath: .
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.jasper
+Export-Package: org.apache.jasper,org.apache.jasper.compiler,org.apach
+ e.jasper.compiler.tagplugin,org.apache.jasper.resources,org.apache.ja
+ sper.runtime,org.apache.jasper.security,org.apache.jasper.servlet,org
+ .apache.jasper.tagplugins.jstl,org.apache.jasper.tagplugins.jstl.core
+ ,org.apache.jasper.util,org.apache.jasper.xmlparser
+Bundle-Version: 5.5.17.v200903231320
+Bundle-ManifestVersion: 2
 Import-Package: javax.servlet;version="2.4",javax.servlet.http;version
  ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version="
  2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage
@@ -11,18 +23,4 @@
  ols.ant.types;resolution:=optional,org.apache.tools.ant.util;resoluti
  on:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.help
  ers
-Bundle-ManifestVersion: 2
-Export-Package: org.apache.jasper,org.apache.jasper.compiler,org.apach
- e.jasper.compiler.tagplugin,org.apache.jasper.resources,org.apache.ja
- sper.runtime,org.apache.jasper.security,org.apache.jasper.servlet,org
- .apache.jasper.tagplugins.jstl,org.apache.jasper.tagplugins.jstl.core
- ,org.apache.jasper.util,org.apache.jasper.xmlparser
-Bundle-Version: 5.5.17.v200806031609
-Bundle-SymbolicName: org.apache.jasper
-Bundle-Name: Apache Jasper 2 Plug-in
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-Bundle-Localization: plugin
-Bundle-Vendor: Apache Software Foundation
-Bundle-ClassPath: .
 


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- tomcat5.spec	15 Apr 2009 18:06:22 -0000	1.126
+++ tomcat5.spec	20 Apr 2009 13:45:23 -0000	1.127
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 6.2%{dist}
+Release: 6.3%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -1361,6 +1361,9 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:5.5.27-6.3
+- Update jasper-OSGi-MANIFEST.MF for eclipse 3.5.
+
 * Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.27-6.2
 - preserve upgrade ordering, clean up CLASSPATH export
 
@@ -1778,4 +1781,3 @@
 - Based on JPackage.org's tomcat4 .spec
 - No compat stuff anymore.
 - First build
-



From markmc at fedoraproject.org  Mon Apr 20 13:52:06 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 20 Apr 2009 13:52:06 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-qcow2-corruption.patch, NONE, 1.1 qemu.spec,
	1.80, 1.81
Message-ID: <20090420135206.4B5F070102@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32597

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-qcow2-corruption.patch 
Log Message:
* Mon Apr 20 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-11
- Fix qcow2 image corruption (#496642)


qemu-fix-qcow2-corruption.patch:

--- NEW FILE qemu-fix-qcow2-corruption.patch ---
From: Kevin Wolf <kwolf at redhat.com>
To: qemu-devel at nongnu.org
Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2

This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables
are big endian, so entries must be converted before being passed to functions.

This bug is easy to trigger. The following script will create and destroy a
qcow2 image (the header is gone after three loop iterations):

    #!/bin/bash
    qemu-img create -f qcow2 test.qcow 1M
    for i in $(seq 1 10); do
    qemu-system-x86_64 -hda test.qcow -monitor stdio > /dev/null 2>&1 <<EOF
    savevm test-$i
    quit
    EOF
    done

Signed-off-by: Kevin Wolf <kwolf at redhat.com>
---
 block-qcow2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
--- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-20 14:41:22.000000000 +0100
+++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-20 14:41:54.000000000 +0100
@@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr
         goto err;
 
     for (i = 0; i < j; i++)
-        free_any_clusters(bs, old_cluster[i], 1);
+        free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1);
 
     ret = 0;
 err:


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- qemu.spec	19 Apr 2009 15:34:37 -0000	1.80
+++ qemu.spec	20 Apr 2009 13:51:35 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -38,6 +38,7 @@
 Patch14: qemu-bios-bigger-roms.patch
 Patch15: qemu-fix-display-breakage.patch
 Patch16: qemu-fix-qcow2-2TB.patch
+Patch17: qemu-fix-qcow2-corruption.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -224,6 +225,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -465,6 +467,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Apr 20 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-11
+- Fix qcow2 image corruption (#496642)
+
 * Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-10
 - Run sysconfig.modules from %post on x86_64 too (#494739)
 



From markmc at fedoraproject.org  Mon Apr 20 13:52:58 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 20 Apr 2009 13:52:58 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-fix-qcow2-corruption.patch, NONE, 1.1 qemu.spec,
	1.80, 1.81
Message-ID: <20090420135258.C9AB970102@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv436

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-qcow2-corruption.patch 
Log Message:
* Mon Apr 20 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-11
- Fix qcow2 image corruption (#496642)


qemu-fix-qcow2-corruption.patch:

--- NEW FILE qemu-fix-qcow2-corruption.patch ---
From: Kevin Wolf <kwolf at redhat.com>
To: qemu-devel at nongnu.org
Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2

This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables
are big endian, so entries must be converted before being passed to functions.

This bug is easy to trigger. The following script will create and destroy a
qcow2 image (the header is gone after three loop iterations):

    #!/bin/bash
    qemu-img create -f qcow2 test.qcow 1M
    for i in $(seq 1 10); do
    qemu-system-x86_64 -hda test.qcow -monitor stdio > /dev/null 2>&1 <<EOF
    savevm test-$i
    quit
    EOF
    done

Signed-off-by: Kevin Wolf <kwolf at redhat.com>
---
 block-qcow2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
--- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-20 14:41:22.000000000 +0100
+++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-20 14:41:54.000000000 +0100
@@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr
         goto err;
 
     for (i = 0; i < j; i++)
-        free_any_clusters(bs, old_cluster[i], 1);
+        free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1);
 
     ret = 0;
 err:


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- qemu.spec	19 Apr 2009 15:35:03 -0000	1.80
+++ qemu.spec	20 Apr 2009 13:52:28 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -38,6 +38,7 @@
 Patch14: qemu-bios-bigger-roms.patch
 Patch15: qemu-fix-display-breakage.patch
 Patch16: qemu-fix-qcow2-2TB.patch
+Patch17: qemu-fix-qcow2-corruption.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -224,6 +225,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -465,6 +467,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Apr 20 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-11
+- Fix qcow2 image corruption (#496642)
+
 * Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-10
 - Run sysconfig.modules from %post on x86_64 too (#494739)
 



From hadess at fedoraproject.org  Mon Apr 20 13:57:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 20 Apr 2009 13:57:34 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.20,
	1.21 nautilus-sendto.spec, 1.69, 1.70 sources, 1.20, 1.21
Message-ID: <20090420135735.039B670102@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1182

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Mon Apr 20 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-1
- Update to 1.1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	17 Apr 2009 15:44:38 -0000	1.20
+++ .cvsignore	20 Apr 2009 13:57:04 -0000	1.21
@@ -1 +1 @@
-nautilus-sendto-1.1.4.tar.bz2
+nautilus-sendto-1.1.4.1.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- nautilus-sendto.spec	17 Apr 2009 21:55:39 -0000	1.69
+++ nautilus-sendto.spec	20 Apr 2009 13:57:04 -0000	1.70
@@ -1,5 +1,5 @@
 Name:           nautilus-sendto
-Version:        1.1.4
+Version:        1.1.4.1
 Release: 	1%{?dist}.1
 Summary:        Nautilus context menu for sending files
 
@@ -81,7 +81,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS
+%doc AUTHORS ChangeLog ChangeLog.pre-1.1.4.1 COPYING NEWS
 %{_libdir}/nautilus/extensions-2.0/libnautilus-sendto.so
 %dir %{_libdir}/nautilus-sendto
 %dir %{_libdir}/nautilus-sendto/plugins
@@ -96,6 +96,9 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Mon Apr 20 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-1
+- Update to 1.1.4.1
+
 * Fri Apr 17 2009 Karsten Hopp <karsten at redhat.com> 1.1.4-1.1
 - don't require pidgin-* on s390, s390x as that has ExcludeArch s390(x)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	17 Apr 2009 15:44:38 -0000	1.20
+++ sources	20 Apr 2009 13:57:04 -0000	1.21
@@ -1 +1 @@
-fd9c8e4bf61b51b9a84578e327154bc5  nautilus-sendto-1.1.4.tar.bz2
+c4b66eb6fd24eff0b2240b832085a20e  nautilus-sendto-1.1.4.1.tar.bz2



From pbrobinson at fedoraproject.org  Mon Apr 20 14:17:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 20 Apr 2009 14:17:31 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga-3.2.0-malloc.patch, NONE,
	1.1 ekiga-3.2.0-ptlib-devices.patch, NONE, 1.1 ekiga.spec, 1.78, 1.79
Message-ID: <20090420141731.CEB6C70102@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5871

Modified Files:
	ekiga.spec 
Added Files:
	ekiga-3.2.0-malloc.patch ekiga-3.2.0-ptlib-devices.patch 
Log Message:
- Add a couple of upstream patches from 3.2.1

ekiga-3.2.0-malloc.patch:

--- NEW FILE ekiga-3.2.0-malloc.patch ---
>From 1bc70ca544872f5513d151462e8f1172dbfe91fe Mon Sep 17 00:00:00 2001
From: ededu <ededu at localhost>
Date: Mon, 06 Apr 2009 17:45:46 +0000
Subject: Use g_malloc instead of malloc.

svn path=/branches/gnome-2-26/; revision=7852
---
 2009-03-23  Eugen Dedu  <ededu at svn.gnome.org>
 
 	* src/gui/accounts.cpp:
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index afb63ce..f4b8bcf 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -1299,7 +1299,7 @@ convert_string_list (const std::vector<std::string> & list)
   gchar **array = NULL;
   unsigned i;
 
-  array = (gchar**) malloc (sizeof(gchar*) * (list.size() + 1));
+  array = (gchar**) g_malloc (sizeof(gchar*) * (list.size() + 1));
   for (i = 0; i < list.size(); i++)
     array[i] = (gchar*) list[i].c_str();
   array[i] = NULL;
--
cgit v0.8.2

ekiga-3.2.0-ptlib-devices.patch:

--- NEW FILE ekiga-3.2.0-ptlib-devices.patch ---
>From d90f2f1094c0d5c6457f2afe1b4231450e847780 Mon Sep 17 00:00:00 2001
From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
Date: Sat, 18 Apr 2009 08:42:10 +0000
Subject: Remove FFMPEG and WAVFile modules from preferences->devices, unused for the moment (Damien dixit).

---
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
index f56d882..8598442 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioInputManager_ptlib::get_devices(std::vector <Ekiga::AudioInputDevice
 
     device.source = sources_array[i];
 
-    if (device.source != "EKIGA") {
+    if ((device.source != "EKIGA") &&
+        (device.source != "WAVFile")) {
       audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Recorder);
       devices_array = audio_devices.ToCharArray ();
 
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
index ac96579..8c83e25 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioOutputManager_ptlib::get_devices(std::vector <Ekiga::AudioOutputDevi
 
     device.source = sources_array[i];
 
-    if (device.source != "EKIGA") {
+    if ((device.source != "EKIGA") &&
+        (device.source != "WAVFile")) {
       audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Player);
       devices_array = audio_devices.ToCharArray ();
 
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index bc21aa1..d550f81 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -75,7 +75,8 @@ void GMVideoInputManager_ptlib::get_devices(std::vector <Ekiga::VideoInputDevice
     if ( (device.source != "YUVFile") &&
          (device.source != "Shm") &&
          (device.source != "FakeVideo") &&
-         (device.source != "EKIGA"    ) ) {
+         (device.source != "EKIGA") &&
+         (device.source != "FFMPEG") ) {
       video_devices = PVideoInputDevice::GetDriversDeviceNames (device.source);
       devices_array = video_devices.ToCharArray ();
   
--
cgit v0.8.2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ekiga.spec	17 Mar 2009 11:41:47 -0000	1.78
+++ ekiga.spec	20 Apr 2009 14:17:01 -0000	1.79
@@ -1,9 +1,11 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
+Patch1:		ekiga-3.2.0-malloc.patch
+Patch2:		ekiga-3.2.0-ptlib-devices.patch
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +50,8 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .malloc
+%patch2 -p1 -b .ptlib-devices
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
@@ -139,6 +143,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Apr 20 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-2
+- Add a couple of upstream patches from 3.2.1
+
 * Tue Mar 17 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-1
 - Ekiga 3.2.0 stable
 



From toshio at fedoraproject.org  Mon Apr 20 14:18:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 20 Apr 2009 14:18:09 +0000 (UTC)
Subject: rpms/mono/F-11 mono.spec,1.127,1.128
Message-ID: <20090420141809.A582570102@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6033

Modified Files:
	mono.spec 
Log Message:

* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-18
- Enable bootstrap code and ppc64.  If this succeeds we'll build -19 right
  afterwards with bootstrap code turned off.
  Remember: you can't merge the ppc64 enabling to older branches without first
  bootstrapping once.



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-11/mono.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mono.spec	14 Apr 2009 23:52:01 -0000	1.127
+++ mono.spec	20 Apr 2009 14:17:39 -0000	1.128
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -31,10 +31,10 @@
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-BuildRequires: mono-core
+#BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -305,7 +305,7 @@
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-rm -rf mcs/class/lib/monolite/*
+#rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -720,6 +720,12 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-18
+- Enable bootstrap code and ppc64.  If this succeeds we'll build -19 right
+  afterwards with bootstrap code turned off.
+  Remember: you can't merge the ppc64 enabling to older branches without first
+  bootstrapping once.
+
 * Tue Apr 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-17
 - Update to 2.4 final.
 - Statically link mono to libmono to work around bz #494026



From vpv at fedoraproject.org  Mon Apr 20 14:33:16 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 20 Apr 2009 14:33:16 +0000 (UTC)
Subject: rpms/moin/F-10 001_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 002_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 003_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 022_CVE-2009-0260_attach_file_XSS.patch, NONE,
	1.1 999_attachfile_fix_escaping_problems.patch, NONE,
	1.1 CVE-2009-0312_XSS_antispam.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 moin.spec, 1.22, 1.23 sources, 1.14, 1.15
Message-ID: <20090420143316.C1B4C70137@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9862

Modified Files:
	.cvsignore moin.spec sources 
Added Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
	003_CVE-2008-0781_attach_file_XSS.patch 
	022_CVE-2009-0260_attach_file_XSS.patch 
	999_attachfile_fix_escaping_problems.patch 
	CVE-2009-0312_XSS_antispam.patch 
Log Message:
* Mon Apr 20 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
- Update to 1.6.4
- CVE-2008-3381 fixed upstream
- Re-fix CVE-2008-0781, upstream seems to have dropped the fix in 1.6,
  used part of upstream 1.5 db212dfc58ef, backported upstream 1.7 5f51246a4df1
  and 269a1fbc3ed7
- Fix CVE-2009-0260, patch from Debian etch
- Fix CVE-2009-0312
- Fix AttachFile escaping problems, backported upstream 1.7 5c4043e651b3


001_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 001_CVE-2008-0781_attach_file_XSS.patch ---
This set has 3 patches. It is intended to fix 
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-0781 . The  original
upstream patch for 1.5 is http://hg.moinmo.in/moin/1.5/rev/db212dfc58ef . That
was dropped from 1.6 and 1.7 for some reason and the new fix was later done in
two parts. The second part of this patch set is based on
http://hg.moinmo.in/moin/1.7/rev/5f51246a4df1/ and the third part is based on 
http://hg.moinmo.in/moin/1.7/rev/269a1fbc3ed7

Patches backported for Fedora by Ville-Pekka Vainio.

diff -aur moin-1.6.4.orig/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4.orig/MoinMoin/action/AttachFile.py	2008-07-05 23:20:18.000000000 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-18 02:06:42.362913606 +0300
@@ -545,7 +545,7 @@
     'action_name': action_name,
     'upload_label_file': _('File to upload', formatted=False),
     'upload_label_rename': _('Rename to', formatted=False),
-    'rename': request.form.get('rename', [''])[0],
+    'rename': wikiutil.escape(request.form.get('rename', [''])[0], 1),
     'upload_label_overwrite': _('Overwrite existing attachment of same name', formatted=False),
     'overwrite_checked': ('', 'checked')[request.form.get('overwrite', ['0'])[0] == '1'],
     'upload_button': _('Upload', formatted=False),

002_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 002_CVE-2008-0781_attach_file_XSS.patch ---
Based on http://hg.moinmo.in/moin/1.7/rev/5f51246a4df1 , backported to 1.6 by
Ville-Pekka Vainio.


diff -aur moin-1.6.4.orig/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4.orig/MoinMoin/action/AttachFile.py	2008-07-05 23:20:18.000000000 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-20 02:15:53.209834308 +0300
@@ -436,6 +436,7 @@
     return names #Returns dict of {origname: safename}
 
 def error_msg(pagename, request, msg):
+    msg = wikiutil.escape(msg)
     Page(request, pagename).send_page(msg=msg)
 
 
@@ -664,12 +665,14 @@
         else:
             msg = _('You are not allowed to install files.', formatted=False)
     else:
-        msg = _('Unsupported AttachFile sub-action: %s', formatted=False) % (wikiutil.escape(do), )
+        msg = _('Unsupported AttachFile sub-action: %s', formatted=False) % do
 
     if msg:
         error_msg(pagename, request, msg)
 
 def upload_form(pagename, request, msg=''):
+    if msg:
+        msg = wikiutil.escape(msg)
     _ = request.getText
 
     request.emit_http_headers()
@@ -932,13 +935,13 @@
 
     if package.isPackage():
         if package.installPackage():
-            msg = _("Attachment '%(filename)s' installed.", formatted=False) % {'filename': wikiutil.escape(target)}
+            msg = _("Attachment '%(filename)s' installed.", formatted=False) % {'filename': target}
         else:
-            msg = _("Installation of '%(filename)s' failed.", formatted=False) % {'filename': wikiutil.escape(target)}
+            msg = _("Installation of '%(filename)s' failed.", formatted=False) % {'filename': target}
         if package.msg != "":
-            msg += "<br><pre>" + wikiutil.escape(package.msg) + "</pre>"
+            msg += " " + package.msg
     else:
-        msg = _('The file %s is not a MoinMoin package file.', formatted=False) % wikiutil.escape(target)
+        msg = _('The file %s is not a MoinMoin package file.', formatted=False) % target
 
     upload_form(pagename, request, msg=msg)
 
@@ -1023,7 +1026,7 @@
         else:
             msg = _('The file %(filename)s is not a .zip file.', formatted=False) % {'filename': filename}
 
-    upload_form(pagename, request, msg=wikiutil.escape(msg))
+    upload_form(pagename, request, msg=msg)
 
 def send_viewfile(pagename, request):
     _ = request.getText

003_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 003_CVE-2008-0781_attach_file_XSS.patch ---
Based on http://hg.moinmo.in/moin/1.7/rev/269a1fbc3ed7 , backported to 1.6 by
Ville-Pekka Vainio.


diff -aur moin-1.6.4.orig/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4.orig/MoinMoin/action/AttachFile.py	2008-07-05 23:20:18.000000000 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-20 02:23:50.621709307 +0300
@@ -849,9 +849,9 @@
          'baseurl': request.getScriptname(),
          'do': 'attachment_move',
          'ticket': wikiutil.createTicket(request),
-         'pagename': pagename,
+         'pagename': wikiutil.escape(pagename, 1),
          'pagename_quoted': wikiutil.quoteWikinameURL(pagename),
-         'attachment_name': filename,
+         'attachment_name': wikiutil.escape(filename, 1),
          'move': _('Move', formatted=False),
          'cancel': _('Cancel', formatted=False),
          'newname_label': _("New page name", formatted=False),

022_CVE-2009-0260_attach_file_XSS.patch:

--- NEW FILE 022_CVE-2009-0260_attach_file_XSS.patch ---

--- ../old/moin-1.5.3/MoinMoin/action/AttachFile.py	2009-01-27 17:56:50.000000000 +0000
+++ moin-1.5.3/MoinMoin/action/AttachFile.py	2009-01-27 18:00:58.000000000 +0000
@@ -375,7 +375,7 @@
     'pngpath': pngpath, 'timestamp': timestamp,
     'pubpath': pubpath, 'drawpath': drawpath,
     'savelink': savelink, 'pagelink': pagelink, 'helplink': helplink,
-    'basename': basename
+    'basename': wikiutil.escape(basename),
 })
 
 


999_attachfile_fix_escaping_problems.patch:

--- NEW FILE 999_attachfile_fix_escaping_problems.patch ---
diff -aur moin-1.6.4-patched-earlier/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4-patched-earlier/MoinMoin/action/AttachFile.py	2009-04-20 14:14:43.466538415 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-20 14:17:00.730413758 +0300
@@ -456,7 +456,7 @@
                 action_name, wikiutil.url_quote_plus(fname))
 
             request.write(u'<link rel="Appendix" title="%s" href="%s">\n' % (
-                wikiutil.escape(fname), wikiutil.escape(url)))
+                wikiutil.escape(fname, 1), wikiutil.escape(url)))
 
 
 def send_hotdraw(pagename, request):
@@ -501,7 +501,7 @@
     'pngpath': pngpath, 'timestamp': timestamp,
     'pubpath': pubpath, 'drawpath': drawpath,
     'savelink': savelink, 'pagelink': pagelink, 'helplink': helplink,
-    'basename': wikiutil.escape(basename),
+    'basename': wikiutil.escape(basename, 1),
 })
 
 

CVE-2009-0312_XSS_antispam.patch:

--- NEW FILE CVE-2009-0312_XSS_antispam.patch ---
--- moin-1.6.4.orig/MoinMoin/security/antispam.py	2008-04-26 23:29:08.000000000 +0300
+++ moin-1.6.4/MoinMoin/security/antispam.py	2009-04-16 01:33:58.893892260 +0300
@@ -201,7 +201,7 @@
                         _ = editor.request.getText
                         msg = _('Sorry, can not save page because "%(content)s"'
                                 ' is not allowed in this wiki.', formatted=False) % {
-                            'content': match.group()
+                            'content': wikiutil.escape(match.group())
                             }
                         dprint(msg)
                         raise editor.SaveError(msg)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	24 Apr 2008 09:58:38 -0000	1.14
+++ .cvsignore	20 Apr 2009 14:33:16 -0000	1.15
@@ -1 +1 @@
-moin-1.6.3.tar.gz
+moin-1.6.4.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-10/moin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- moin.spec	24 Apr 2008 09:58:38 -0000	1.22
+++ moin.spec	20 Apr 2009 14:33:16 -0000	1.23
@@ -2,13 +2,31 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.6.3
+Version: 1.6.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
 Source0: http://static.moinmo.in/files/moin-%{version}.tar.gz
 Source1: README-rpm
+
+# Out of the major distributions, Debian has 1.5 and 1.7 (as does Ubuntu),
+# Mandriva has 1.5 and OpenSUSE has no official moin package. It looks like
+# Fedora is the only one shipping 1.6, so most of the security patches have
+# been ported specifically for this package from newer versions. Upstream
+# only supports 1.7 and later currently.
+
+# 3-part patch for 2008-0781, the last part has one additional fix.
+Patch0: 001_CVE-2008-0781_attach_file_XSS.patch
+Patch1: 002_CVE-2008-0781_attach_file_XSS.patch
+Patch2: 003_CVE-2008-0781_attach_file_XSS.patch
+# from Debian etch
+Patch3: 022_CVE-2009-0260_attach_file_XSS.patch
+Patch4: CVE-2009-0312_XSS_antispam.patch
+# upstream http://hg.moinmo.in/moin/1.7/rev/5c4043e651b3 - "invalid html, but
+# likely no XSS", still marked as a security patch. Needs to be done after
+# 022_CVE-2009-0260_attach_file_XSS.patch, thus the numbering.
+Patch5: 999_attachfile_fix_escaping_problems.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel
 BuildArch: noarch
@@ -21,6 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -50,6 +74,16 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
+- Update to 1.6.4
+- CVE-2008-3381 fixed upstream
+- Re-fix CVE-2008-0781, upstream seems to have dropped the fix in 1.6,
+  used part of upstream 1.5 db212dfc58ef, backported upstream 1.7 5f51246a4df1
+  and 269a1fbc3ed7
+- Fix CVE-2009-0260, patch from Debian etch
+- Fix CVE-2009-0312
+- Fix AttachFile escaping problems, backported upstream 1.7 5c4043e651b3
+
 * Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.6.3-1
 - Update to 1.6.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	24 Apr 2008 09:58:38 -0000	1.14
+++ sources	20 Apr 2009 14:33:16 -0000	1.15
@@ -1 +1 @@
-081aa0dd82b4220c8ff28a9a751bad7c  moin-1.6.3.tar.gz
+fb51c4b2d64ac98ca8ccb42fde8cd753  moin-1.6.4.tar.gz



From pbrobinson at fedoraproject.org  Mon Apr 20 14:37:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 20 Apr 2009 14:37:37 +0000 (UTC)
Subject: rpms/ekiga/F-11 ekiga-3.2.0-malloc.patch, NONE,
	1.1 ekiga-3.2.0-ptlib-devices.patch, NONE, 1.1 ekiga.spec, 1.78, 1.79
Message-ID: <20090420143737.CBB5470102@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10672

Modified Files:
	ekiga.spec 
Added Files:
	ekiga-3.2.0-malloc.patch ekiga-3.2.0-ptlib-devices.patch 
Log Message:
- Add a couple of upstream patches from 3.2.1

ekiga-3.2.0-malloc.patch:

--- NEW FILE ekiga-3.2.0-malloc.patch ---
>From 1bc70ca544872f5513d151462e8f1172dbfe91fe Mon Sep 17 00:00:00 2001
From: ededu <ededu at localhost>
Date: Mon, 06 Apr 2009 17:45:46 +0000
Subject: Use g_malloc instead of malloc.

svn path=/branches/gnome-2-26/; revision=7852
---
 2009-03-23  Eugen Dedu  <ededu at svn.gnome.org>
 
 	* src/gui/accounts.cpp:
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index afb63ce..f4b8bcf 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -1299,7 +1299,7 @@ convert_string_list (const std::vector<std::string> & list)
   gchar **array = NULL;
   unsigned i;
 
-  array = (gchar**) malloc (sizeof(gchar*) * (list.size() + 1));
+  array = (gchar**) g_malloc (sizeof(gchar*) * (list.size() + 1));
   for (i = 0; i < list.size(); i++)
     array[i] = (gchar*) list[i].c_str();
   array[i] = NULL;
--
cgit v0.8.2

ekiga-3.2.0-ptlib-devices.patch:

--- NEW FILE ekiga-3.2.0-ptlib-devices.patch ---
>From d90f2f1094c0d5c6457f2afe1b4231450e847780 Mon Sep 17 00:00:00 2001
From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
Date: Sat, 18 Apr 2009 08:42:10 +0000
Subject: Remove FFMPEG and WAVFile modules from preferences->devices, unused for the moment (Damien dixit).

---
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
index f56d882..8598442 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioInputManager_ptlib::get_devices(std::vector <Ekiga::AudioInputDevice
 
     device.source = sources_array[i];
 
-    if (device.source != "EKIGA") {
+    if ((device.source != "EKIGA") &&
+        (device.source != "WAVFile")) {
       audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Recorder);
       devices_array = audio_devices.ToCharArray ();
 
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
index ac96579..8c83e25 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioOutputManager_ptlib::get_devices(std::vector <Ekiga::AudioOutputDevi
 
     device.source = sources_array[i];
 
-    if (device.source != "EKIGA") {
+    if ((device.source != "EKIGA") &&
+        (device.source != "WAVFile")) {
       audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Player);
       devices_array = audio_devices.ToCharArray ();
 
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index bc21aa1..d550f81 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -75,7 +75,8 @@ void GMVideoInputManager_ptlib::get_devices(std::vector <Ekiga::VideoInputDevice
     if ( (device.source != "YUVFile") &&
          (device.source != "Shm") &&
          (device.source != "FakeVideo") &&
-         (device.source != "EKIGA"    ) ) {
+         (device.source != "EKIGA") &&
+         (device.source != "FFMPEG") ) {
       video_devices = PVideoInputDevice::GetDriversDeviceNames (device.source);
       devices_array = video_devices.ToCharArray ();
   
--
cgit v0.8.2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-11/ekiga.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ekiga.spec	17 Mar 2009 11:41:47 -0000	1.78
+++ ekiga.spec	20 Apr 2009 14:37:07 -0000	1.79
@@ -1,9 +1,11 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
+Patch1:		ekiga-3.2.0-malloc.patch
+Patch2:		ekiga-3.2.0-ptlib-devices.patch
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +50,8 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .malloc
+%patch2 -p1 -b .ptlib-devices
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
@@ -139,6 +143,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Apr 20 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-2
+- Add a couple of upstream patches from 3.2.1
+
 * Tue Mar 17 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-1
 - Ekiga 3.2.0 stable
 



From mjakubicek at fedoraproject.org  Mon Apr 20 14:44:43 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 20 Apr 2009 14:44:43 +0000 (UTC)
Subject: rpms/boo/F-11 boo-mono.patch,NONE,1.1 boo.spec,1.18,1.19
Message-ID: <20090420144443.2CD7070102@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12173/F-11

Modified Files:
	boo.spec 
Added Files:
	boo-mono.patch 
Log Message:
- Fix FTBFS: added boo-mono.patch



boo-mono.patch:

--- NEW FILE boo-mono.patch ---
--- src/Boo.Lang.Compiler/Ast/NodeCollection.cs.orig	2009-04-20 16:34:35.000000000 +0200
+++ src/Boo.Lang.Compiler/Ast/NodeCollection.cs	2009-04-20 16:04:08.000000000 +0200
@@ -274,7 +274,7 @@
 			AssertNotNull("existing", existing);
 			for (int i = 0; i < _list.Count; ++i)
 			{
-				if (_list[i] == existing)
+				if ((T) _list[i] == existing)
 				{
 					if (null == newItem)
 					{


Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/F-11/boo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- boo.spec	24 Feb 2009 05:30:26 -0000	1.18
+++ boo.spec	20 Apr 2009 14:44:12 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Boo is an OO statically typed language for CLI
 Name: boo
 Version: 0.8.1.2865
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,8 @@
 Patch0: boo-libdir.patch
 Patch1: boo-extras.patch
 Patch2: boo-exclude-VS-as-target.patch
+Patch3:	boo-mono.patch
+# Not sent upstream as far, package needs updating.
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -34,6 +36,7 @@
 %patch0 -p1 -b .original
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .exclude-VS-as-target.patch
+%patch3 -b .mono
 sed -i -e 's!${libdir}!%{monodir}!' extras/booc.in
 sed -i -e 's!${libdir}!%{monodir}!' extras/booi.in
 sed -i -e 's!${libdir}!%{monodir}!' extras/booish.in
@@ -74,6 +77,9 @@
 %{monodir}/pkgconfig/boo.pc
 
 %changelog
+* Mon Apr 20 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.1.2865-6
+- Fix FTBFS: added boo-mono.patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.2865-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Mon Apr 20 14:44:43 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 20 Apr 2009 14:44:43 +0000 (UTC)
Subject: rpms/boo/devel boo-mono.patch,NONE,1.1 boo.spec,1.18,1.19
Message-ID: <20090420144443.6575B70102@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12173/devel

Modified Files:
	boo.spec 
Added Files:
	boo-mono.patch 
Log Message:
- Fix FTBFS: added boo-mono.patch



boo-mono.patch:

--- NEW FILE boo-mono.patch ---
--- src/Boo.Lang.Compiler/Ast/NodeCollection.cs.orig	2009-04-20 16:34:35.000000000 +0200
+++ src/Boo.Lang.Compiler/Ast/NodeCollection.cs	2009-04-20 16:04:08.000000000 +0200
@@ -274,7 +274,7 @@
 			AssertNotNull("existing", existing);
 			for (int i = 0; i < _list.Count; ++i)
 			{
-				if (_list[i] == existing)
+				if ((T) _list[i] == existing)
 				{
 					if (null == newItem)
 					{


Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- boo.spec	24 Feb 2009 05:30:26 -0000	1.18
+++ boo.spec	20 Apr 2009 14:44:13 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Boo is an OO statically typed language for CLI
 Name: boo
 Version: 0.8.1.2865
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,8 @@
 Patch0: boo-libdir.patch
 Patch1: boo-extras.patch
 Patch2: boo-exclude-VS-as-target.patch
+Patch3:	boo-mono.patch
+# Not sent upstream as far, package needs updating.
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -34,6 +36,7 @@
 %patch0 -p1 -b .original
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .exclude-VS-as-target.patch
+%patch3 -b .mono
 sed -i -e 's!${libdir}!%{monodir}!' extras/booc.in
 sed -i -e 's!${libdir}!%{monodir}!' extras/booi.in
 sed -i -e 's!${libdir}!%{monodir}!' extras/booish.in
@@ -74,6 +77,9 @@
 %{monodir}/pkgconfig/boo.pc
 
 %changelog
+* Mon Apr 20 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.1.2865-6
+- Fix FTBFS: added boo-mono.patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.2865-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From steved at fedoraproject.org  Mon Apr 20 14:44:53 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 20 Apr 2009 14:44:53 +0000 (UTC)
Subject: rpms/libtirpc/devel .cvsignore, 1.5, 1.6 libtirpc.spec, 1.44,
	1.45 sources, 1.5, 1.6 libtirpc-0.1.10-C++declares.patch, 1.1,
	NONE libtirpc-0.1.10-dg-unlock.patch, 1.1,
	NONE libtirpc-0.1.10-errmess-unlock.patch, 1.1,
	NONE libtirpc-0.1.10-rc1.patch, 1.1,
	NONE libtirpc-0.1.10-svcreq-compat.patch, 1.1,
	NONE libtirpc-0.1.10-uuid_t.patch, 1.1,
	NONE libtirpc-0.1.10-warnings.patch, 1.1, NONE
Message-ID: <20090420144453.B895E70102@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12244

Modified Files:
	.cvsignore libtirpc.spec sources 
Removed Files:
	libtirpc-0.1.10-C++declares.patch 
	libtirpc-0.1.10-dg-unlock.patch 
	libtirpc-0.1.10-errmess-unlock.patch libtirpc-0.1.10-rc1.patch 
	libtirpc-0.1.10-svcreq-compat.patch 
	libtirpc-0.1.10-uuid_t.patch libtirpc-0.1.10-warnings.patch 
Log Message:
Updated to the latest release: 0.1.11 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Nov 2008 14:38:35 -0000	1.5
+++ .cvsignore	20 Apr 2009 14:44:22 -0000	1.6
@@ -2,3 +2,4 @@
 libtirpc-0.1.8.tar.bz2
 libtirpc-0.1.9.tar.bz2
 libtirpc-0.1.10.tar.bz2
+libtirpc-0.1.11.tar.bz2


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libtirpc.spec	13 Mar 2009 17:15:08 -0000	1.44
+++ libtirpc.spec	20 Apr 2009 14:44:23 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		   libtirpc
-Version:		0.1.10
-Release:		6%{?dist}
+Version:		0.1.11
+Release:		1%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -30,14 +30,6 @@
 Requires:	%{name} = %{version}-%{release}
 Requires(devel):	pkgconfig man
 
-Patch01: libtirpc-0.1.10-dg-unlock.patch
-Patch02: libtirpc-0.1.10-errmess-unlock.patch
-Patch03: libtirpc-0.1.10-C++declares.patch
-Patch04: libtirpc-0.1.10-svcreq-compat.patch
-Patch05: libtirpc-0.1.10-warnings.patch
-Patch06: libtirpc-0.1.10-uuid_t.patch
-Patch07: libtirpc-0.1.10-rc1.patch
-
 Patch100: libtirpc-0.1.7-compile.patch
 
 %description devel
@@ -47,13 +39,6 @@
 
 %prep
 %setup -q
-%patch01	-p1
-%patch02	-p1
-%patch03	-p1
-%patch04	-p1
-%patch05	-p1
-%patch06	-p1
-%patch07	-p1
 
 %patch100	-p1
 
@@ -152,6 +137,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2009 Steve Dickson  <steved at redhat.com> 0.1.11-1
+- Updated to the latest release: 0.1.11 
+
 * Fri Mar 13 2009 Steve Dickson  <steved at redhat.com> 0.1.10-6
 - libtirpc: set r_netid and r_owner in __rpcb_findaddr_timed
 - libtirpc: be sure to free cl_netid and cl_tp


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2008 14:38:35 -0000	1.5
+++ sources	20 Apr 2009 14:44:23 -0000	1.6
@@ -1 +1 @@
-4192ad1c683abb7eb2ca77d5fd64e54b  libtirpc-0.1.10.tar.bz2
+c656b7bf47e8bddbdefcd0b6a6f77b71  libtirpc-0.1.11.tar.bz2


--- libtirpc-0.1.10-C++declares.patch DELETED ---


--- libtirpc-0.1.10-dg-unlock.patch DELETED ---


--- libtirpc-0.1.10-errmess-unlock.patch DELETED ---


--- libtirpc-0.1.10-rc1.patch DELETED ---


--- libtirpc-0.1.10-svcreq-compat.patch DELETED ---


--- libtirpc-0.1.10-uuid_t.patch DELETED ---


--- libtirpc-0.1.10-warnings.patch DELETED ---



From spot at fedoraproject.org  Mon Apr 20 14:45:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:45:44 +0000 (UTC)
Subject: rpms/R/F-10 R.spec,1.59,1.60
Message-ID: <20090420144544.2B9BA70102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12454/F-10

Modified Files:
	R.spec 
Log Message:
Provide/Obsolete R-Matrix package


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/R.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- R.spec	17 Apr 2009 20:12:42 -0000	1.59
+++ R.spec	20 Apr 2009 14:45:13 -0000	1.60
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -69,7 +69,8 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
-Provides: R-Matrix = 0.999375
+Provides: R-Matrix = 0.999375-7
+Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
@@ -107,6 +108,8 @@
 Requires: gcc-c++, gcc-gfortran, tetex-latex
 Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
+Provides: R-Matrix-devel = 0.999375-7
+Obsoletes: R-Matrix-devel < 0.999375-7
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
@@ -974,6 +977,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-2
+- properly Provide/Obsolete R-Matrix
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
 - update to 2.9.0, change vim dep to vi
 



From spot at fedoraproject.org  Mon Apr 20 14:45:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:45:44 +0000 (UTC)
Subject: rpms/R/F-11 R.spec,1.60,1.61
Message-ID: <20090420144544.9D84970102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12454/F-11

Modified Files:
	R.spec 
Log Message:
Provide/Obsolete R-Matrix package


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/R.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- R.spec	17 Apr 2009 20:12:42 -0000	1.60
+++ R.spec	20 Apr 2009 14:45:14 -0000	1.61
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -69,7 +69,8 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
-Provides: R-Matrix = 0.999375
+Provides: R-Matrix = 0.999375-7
+Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
@@ -107,6 +108,8 @@
 Requires: gcc-c++, gcc-gfortran, tetex-latex
 Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
+Provides: R-Matrix-devel = 0.999375-7
+Obsoletes: R-Matrix-devel < 0.999375-7
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
@@ -974,6 +977,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-2
+- properly Provide/Obsolete R-Matrix
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
 - update to 2.9.0, change vim dep to vi
 



From spot at fedoraproject.org  Mon Apr 20 14:45:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:45:45 +0000 (UTC)
Subject: rpms/R/F-9 R.spec,1.58,1.59
Message-ID: <20090420144545.0B3C170102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12454/F-9

Modified Files:
	R.spec 
Log Message:
Provide/Obsolete R-Matrix package


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- R.spec	17 Apr 2009 20:12:43 -0000	1.58
+++ R.spec	20 Apr 2009 14:45:14 -0000	1.59
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -69,7 +69,8 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
-Provides: R-Matrix = 0.999375
+Provides: R-Matrix = 0.999375-7
+Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
@@ -107,6 +108,8 @@
 Requires: gcc-c++, gcc-gfortran, tetex-latex
 Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
+Provides: R-Matrix-devel = 0.999375-7
+Obsoletes: R-Matrix-devel < 0.999375-7
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
@@ -974,6 +977,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-2
+- properly Provide/Obsolete R-Matrix
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
 - update to 2.9.0, change vim dep to vi
 



From spot at fedoraproject.org  Mon Apr 20 14:45:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:45:45 +0000 (UTC)
Subject: rpms/R/devel R.spec,1.60,1.61
Message-ID: <20090420144545.6279E70102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12454/devel

Modified Files:
	R.spec 
Log Message:
Provide/Obsolete R-Matrix package


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- R.spec	17 Apr 2009 20:12:43 -0000	1.60
+++ R.spec	20 Apr 2009 14:45:15 -0000	1.61
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -69,7 +69,8 @@
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
-Provides: R-Matrix = 0.999375
+Provides: R-Matrix = 0.999375-7
+Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
@@ -107,6 +108,8 @@
 Requires: gcc-c++, gcc-gfortran, tetex-latex
 Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
+Provides: R-Matrix-devel = 0.999375-7
+Obsoletes: R-Matrix-devel < 0.999375-7
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
@@ -974,6 +977,9 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-2
+- properly Provide/Obsolete R-Matrix
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
 - update to 2.9.0, change vim dep to vi
 



From spot at fedoraproject.org  Mon Apr 20 14:49:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:49:53 +0000 (UTC)
Subject: rpms/R-Matrix/F-10 dead.package, NONE, 1.1 R-Matrix.spec, 1.2,
	NONE sources, 1.3, NONE
Message-ID: <20090420144953.4A89770102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-Matrix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13919/F-10

Added Files:
	dead.package 
Removed Files:
	R-Matrix.spec sources 
Log Message:
dead package, R-Matrix is now part of R 2.9.0


--- NEW FILE dead.package ---
R-Matrix was pulled into core R with version 2.9.0.

- Tom "spot" Callaway <tcallawa at redhat.com>, April 20, 2009


--- R-Matrix.spec DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Mon Apr 20 14:49:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:49:53 +0000 (UTC)
Subject: rpms/R-Matrix/F-11 dead.package, NONE, 1.1 R-Matrix.spec, 1.3,
	NONE sources, 1.3, NONE
Message-ID: <20090420144953.7BE6070102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-Matrix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13919/F-11

Added Files:
	dead.package 
Removed Files:
	R-Matrix.spec sources 
Log Message:
dead package, R-Matrix is now part of R 2.9.0


--- NEW FILE dead.package ---
R-Matrix was pulled into core R with version 2.9.0.

- Tom "spot" Callaway <tcallawa at redhat.com>, April 20, 2009


--- R-Matrix.spec DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Mon Apr 20 14:49:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:49:53 +0000 (UTC)
Subject: rpms/R-Matrix/F-9 dead.package, NONE, 1.1 R-Matrix.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <20090420144953.C86A970102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-Matrix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13919/F-9

Added Files:
	dead.package 
Removed Files:
	R-Matrix.spec sources 
Log Message:
dead package, R-Matrix is now part of R 2.9.0


--- NEW FILE dead.package ---
R-Matrix was pulled into core R with version 2.9.0.

- Tom "spot" Callaway <tcallawa at redhat.com>, April 20, 2009


--- R-Matrix.spec DELETED ---


--- sources DELETED ---



From spot at fedoraproject.org  Mon Apr 20 14:49:54 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 14:49:54 +0000 (UTC)
Subject: rpms/R-Matrix/devel dead.package, NONE, 1.1 R-Matrix.spec, 1.3,
	NONE sources, 1.3, NONE
Message-ID: <20090420144954.3924670102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-Matrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13919/devel

Added Files:
	dead.package 
Removed Files:
	R-Matrix.spec sources 
Log Message:
dead package, R-Matrix is now part of R 2.9.0


--- NEW FILE dead.package ---
R-Matrix was pulled into core R with version 2.9.0.

- Tom "spot" Callaway <tcallawa at redhat.com>, April 20, 2009


--- R-Matrix.spec DELETED ---


--- sources DELETED ---



From cebbert at fedoraproject.org  Mon Apr 20 14:56:26 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 20 Apr 2009 14:56:26 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-kvm-skip-pit-check.patch, NONE,
	1.1 linux-2.6-xen-check-for-nx-support.patch, NONE,
	1.1 kernel.spec, 1.1334, 1.1335
Message-ID: <20090420145626.3100770102@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15362

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-skip-pit-check.patch 
	linux-2.6-xen-check-for-nx-support.patch 
Log Message:
Copy Xen and KVM fixes from Fedora 11:
    Fix xen boot on machines without NX support (F11#492523)
    Skip PIT-through-IOAPIC routing check on KVM guests.

linux-2.6-kvm-skip-pit-check.patch:

--- NEW FILE linux-2.6-kvm-skip-pit-check.patch ---
commit 5bffffc113f91918292283e3819dadd4ca964423
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Feb 11 22:45:42 2009 -0200

    KVM: x86: paravirt skip pit-through-ioapic boot check
    
    Skip the test which checks if the PIT is properly routed when
    using the IOAPIC, aimed at buggy hardware.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 478bca9..eecfc92 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/hardirq.h>
+#include <asm/timer.h>
 
 #define MMU_QUEUE_SIZE 1024
 
@@ -237,6 +238,9 @@ static void paravirt_ops_setup(void)
 		pv_mmu_ops.lazy_mode.enter = kvm_enter_lazy_mmu;
 		pv_mmu_ops.lazy_mode.leave = kvm_leave_lazy_mmu;
 	}
+#ifdef CONFIG_X86_IO_APIC
+	no_timer_check = 1;
+#endif
 }
 
 void __init kvm_guest_init(void)

linux-2.6-xen-check-for-nx-support.patch:

--- NEW FILE linux-2.6-xen-check-for-nx-support.patch ---
>From bc6081ff98eec627919e0c68415e46a78fe51dc4 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Fri, 27 Mar 2009 11:29:02 -0700
Subject: [PATCH] xen: set _PAGE_NX in __supported_pte_mask before pagetable construction

Some 64-bit machines don't support the NX flag in ptes.
Check for NX before constructing the kernel pagetables.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---
 arch/x86/xen/enlighten.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 69de191..f7d0fd7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -42,6 +42,7 @@
 #include <asm/xen/hypervisor.h>
 #include <asm/fixmap.h>
 #include <asm/processor.h>
+#include <asm/proto.h>
 #include <asm/msr-index.h>
 #include <asm/setup.h>
 #include <asm/desc.h>
@@ -982,6 +982,11 @@ asmlinkage void __init xen_start_kernel(void)
 	if (!xen_initial_domain())
 		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 
+#ifdef CONFIG_X86_64
+	/* Work out if we support NX */
+	check_efer();
+#endif
+
 	/* Don't do the full vcpu_info placement stuff until we have a
 	   possible map and a non-dummy shared_info. */
 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
-- 
1.6.0.6



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1334
retrieving revision 1.1335
diff -u -r1.1334 -r1.1335
--- kernel.spec	18 Apr 2009 17:39:56 -0000	1.1334
+++ kernel.spec	20 Apr 2009 14:55:55 -0000	1.1335
@@ -723,6 +723,8 @@
 Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
 Patch9301: linux-2.6-kvm-mask-notifiers.patch
 Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+Patch9303: linux-2.6-kvm-skip-pit-check.patch
+Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
 %endif
 
@@ -1334,6 +1336,8 @@
 ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
 ApplyPatch linux-2.6-kvm-mask-notifiers.patch
 ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+ApplyPatch linux-2.6-kvm-skip-pit-check.patch
+ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
 # ======= END OF PATCH APPLICATIONS =============================
 
@@ -1911,6 +1915,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-35
+- Copy Xen and KVM fixes from Fedora 11:
+    Fix xen boot on machines without NX support (F11#492523)
+    Skip PIT-through-IOAPIC routing check on KVM guests.
+
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-34
 - Build in the rfkill and rfkill-input modules (#485322)
 



From pmachata at fedoraproject.org  Mon Apr 20 14:59:48 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 20 Apr 2009 14:59:48 +0000 (UTC)
Subject: rpms/flex/devel flex-2.5.35-gcc44.patch, NONE, 1.1 flex.spec, 1.57,
	1.58
Message-ID: <20090420145948.63F5C70102@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16147

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.35-gcc44.patch 
Log Message:
Forgot the patch.


flex-2.5.35-gcc44.patch:

--- NEW FILE flex-2.5.35-gcc44.patch ---
diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
--- flex-2.5.35.orig/flex.skl	2009-04-20 03:09:46.000000000 +0530
+++ flex-2.5.35/flex.skl	2009-04-20 07:46:58.000000000 +0530
@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
 /* begin standard C++ headers. */
 #include <iostream> 
 #include <errno.h>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 /* end standard C++ headers. */
diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
--- flex-2.5.35.orig/skel.c	2009-04-20 03:09:46.000000000 +0530
+++ flex-2.5.35/skel.c	2009-04-20 07:46:40.000000000 +0530
@@ -284,6 +284,7 @@ const char *skel[] = {
   "/* begin standard C++ headers. */",
   "#include <iostream> ",
   "#include <errno.h>",
+  "#include <cstdio>",
   "#include <cstdlib>",
   "#include <cstring>",
   "/* end standard C++ headers. */",


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- flex.spec	20 Apr 2009 11:26:12 -0000	1.57
+++ flex.spec	20 Apr 2009 14:59:18 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -80,7 +80,7 @@
 %{_infodir}/flex.info*
 
 %changelog
-* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-4
+* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-5
 - Resolves: #496548.
 
 * Mon Apr 20 2009 Petr Machata <pmachata at redhat.com> - 2.5.35-4



From pmachata at fedoraproject.org  Mon Apr 20 15:00:45 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 20 Apr 2009 15:00:45 +0000 (UTC)
Subject: rpms/flex/F-11 flex-2.5.35-gcc44.patch, NONE, 1.1 flex.spec, 1.56,
	1.57
Message-ID: <20090420150045.64A5270102@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/flex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15541

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.35-gcc44.patch 
Log Message:
- Resolves: #496548.


flex-2.5.35-gcc44.patch:

--- NEW FILE flex-2.5.35-gcc44.patch ---
diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
--- flex-2.5.35.orig/flex.skl	2009-04-20 03:09:46.000000000 +0530
+++ flex-2.5.35/flex.skl	2009-04-20 07:46:58.000000000 +0530
@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
 /* begin standard C++ headers. */
 #include <iostream> 
 #include <errno.h>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 /* end standard C++ headers. */
diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
--- flex-2.5.35.orig/skel.c	2009-04-20 03:09:46.000000000 +0530
+++ flex-2.5.35/skel.c	2009-04-20 07:46:40.000000000 +0530
@@ -284,6 +284,7 @@ const char *skel[] = {
   "/* begin standard C++ headers. */",
   "#include <iostream> ",
   "#include <errno.h>",
+  "#include <cstdio>",
   "#include <cstdlib>",
   "#include <cstring>",
   "/* end standard C++ headers. */",


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/F-11/flex.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- flex.spec	24 Feb 2009 17:28:55 -0000	1.56
+++ flex.spec	20 Apr 2009 15:00:15 -0000	1.57
@@ -1,12 +1,13 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
 Source: flex-%{version}.tar.bz2
 Patch0: flex-2.5.35-sign.patch
+Patch2: flex-2.5.35-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
 BuildRequires: gettext bison m4
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch2 -p1
 
 %build
 %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -76,6 +78,9 @@
 %{_infodir}/flex.info*
 
 %changelog
+* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-4
+- Resolves: #496548.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pmachata at fedoraproject.org  Mon Apr 20 15:02:17 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 20 Apr 2009 15:02:17 +0000 (UTC)
Subject: rpms/flex/F-11 flex.spec,1.57,1.58
Message-ID: <20090420150217.A467C70102@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/flex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16680

Modified Files:
	flex.spec 
Log Message:
NVR collision



Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/F-11/flex.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- flex.spec	20 Apr 2009 15:00:15 -0000	1.57
+++ flex.spec	20 Apr 2009 15:01:47 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -78,7 +78,7 @@
 %{_infodir}/flex.info*
 
 %changelog
-* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-4
+* Mon Apr 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.5.35-5
 - Resolves: #496548.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.35-3



From rcritten at fedoraproject.org  Mon Apr 20 15:16:39 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Mon, 20 Apr 2009 15:16:39 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-9 .cvsignore, 1.7, 1.8 nss_compat_ossl.spec, 
	1.11, 1.12 sources, 1.7, 1.8 nss_compat_ossl-cipherlist.patch,
	1.1, NONE
Message-ID: <20090420151639.B591D70102@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20888

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-cipherlist.patch 
Log Message:
Update to upstream 0.9.5
Change license to MIT



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Oct 2008 20:41:21 -0000	1.7
+++ .cvsignore	20 Apr 2009 15:16:07 -0000	1.8
@@ -1 +1 @@
-nss_compat_ossl-0.9.4.tar.gz
+nss_compat_ossl-0.9.5.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/nss_compat_ossl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nss_compat_ossl.spec	15 Dec 2008 16:28:59 -0000	1.11
+++ nss_compat_ossl.spec	20 Apr 2009 15:16:07 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           nss_compat_ossl
-Version:        0.9.4
-Release:        2%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
-License:        LGPLv2+
+License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,8 +13,6 @@
 BuildRequires:  nss-devel > 3.11.7-7
 BuildRequires:  nspr-devel
 
-Patch1: nss_compat_ossl-cipherlist.patch
-
 %description
 This library provides a source-level compatibility layer to aid porting
 programs that use OpenSSL to use the NSS instead.
@@ -29,7 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .cipherlist
 
 %build
 
@@ -68,6 +65,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
+- Update to 0.9.5
+- License changed to MIT
+
 * Wed Dec 15 2008 Rob Crittenden <rcritten at redhat.com> - 0.9.4-2
 - Patch to fix segfault in parsing ciphers (#476519)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Oct 2008 20:41:21 -0000	1.7
+++ sources	20 Apr 2009 15:16:07 -0000	1.8
@@ -1 +1 @@
-d944f2b74fcb1fa75f828b83288517cf  nss_compat_ossl-0.9.4.tar.gz
+71a1782671db129f7788b0d48f1cf64b  nss_compat_ossl-0.9.5.tar.gz


--- nss_compat_ossl-cipherlist.patch DELETED ---



From vpv at fedoraproject.org  Mon Apr 20 15:23:41 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 20 Apr 2009 15:23:41 +0000 (UTC)
Subject: rpms/moin/F-9 001_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 002_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 003_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 022_CVE-2009-0260_attach_file_XSS.patch, NONE,
	1.1 999_attachfile_fix_escaping_problems.patch, NONE,
	1.1 CVE-2009-0312_XSS_antispam.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 moin.spec, 1.22, 1.23 sources, 1.14, 1.15
Message-ID: <20090420152341.7357070102@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22237

Modified Files:
	.cvsignore moin.spec sources 
Added Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
	003_CVE-2008-0781_attach_file_XSS.patch 
	022_CVE-2009-0260_attach_file_XSS.patch 
	999_attachfile_fix_escaping_problems.patch 
	CVE-2009-0312_XSS_antispam.patch 
Log Message:
* Mon Apr 20 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
- Update to 1.6.4
- CVE-2008-3381 fixed upstream
- Re-fix CVE-2008-0781, upstream seems to have dropped the fix in 1.6,
  used part of upstream 1.5 db212dfc58ef, backported upstream 1.7 5f51246a4df1
  and 269a1fbc3ed7
- Fix CVE-2009-0260, patch from Debian etch
- Fix CVE-2009-0312
- Fix AttachFile escaping problems, backported upstream 1.7 5c4043e651b3


001_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 001_CVE-2008-0781_attach_file_XSS.patch ---
This set has 3 patches. It is intended to fix 
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-0781 . The  original
upstream patch for 1.5 is http://hg.moinmo.in/moin/1.5/rev/db212dfc58ef . That
was dropped from 1.6 and 1.7 for some reason and the new fix was later done in
two parts. The second part of this patch set is based on
http://hg.moinmo.in/moin/1.7/rev/5f51246a4df1/ and the third part is based on 
http://hg.moinmo.in/moin/1.7/rev/269a1fbc3ed7

Patches backported for Fedora by Ville-Pekka Vainio.

diff -aur moin-1.6.4.orig/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4.orig/MoinMoin/action/AttachFile.py	2008-07-05 23:20:18.000000000 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-18 02:06:42.362913606 +0300
@@ -545,7 +545,7 @@
     'action_name': action_name,
     'upload_label_file': _('File to upload', formatted=False),
     'upload_label_rename': _('Rename to', formatted=False),
-    'rename': request.form.get('rename', [''])[0],
+    'rename': wikiutil.escape(request.form.get('rename', [''])[0], 1),
     'upload_label_overwrite': _('Overwrite existing attachment of same name', formatted=False),
     'overwrite_checked': ('', 'checked')[request.form.get('overwrite', ['0'])[0] == '1'],
     'upload_button': _('Upload', formatted=False),

002_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 002_CVE-2008-0781_attach_file_XSS.patch ---
Based on http://hg.moinmo.in/moin/1.7/rev/5f51246a4df1 , backported to 1.6 by
Ville-Pekka Vainio.


diff -aur moin-1.6.4.orig/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4.orig/MoinMoin/action/AttachFile.py	2008-07-05 23:20:18.000000000 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-20 02:15:53.209834308 +0300
@@ -436,6 +436,7 @@
     return names #Returns dict of {origname: safename}
 
 def error_msg(pagename, request, msg):
+    msg = wikiutil.escape(msg)
     Page(request, pagename).send_page(msg=msg)
 
 
@@ -664,12 +665,14 @@
         else:
             msg = _('You are not allowed to install files.', formatted=False)
     else:
-        msg = _('Unsupported AttachFile sub-action: %s', formatted=False) % (wikiutil.escape(do), )
+        msg = _('Unsupported AttachFile sub-action: %s', formatted=False) % do
 
     if msg:
         error_msg(pagename, request, msg)
 
 def upload_form(pagename, request, msg=''):
+    if msg:
+        msg = wikiutil.escape(msg)
     _ = request.getText
 
     request.emit_http_headers()
@@ -932,13 +935,13 @@
 
     if package.isPackage():
         if package.installPackage():
-            msg = _("Attachment '%(filename)s' installed.", formatted=False) % {'filename': wikiutil.escape(target)}
+            msg = _("Attachment '%(filename)s' installed.", formatted=False) % {'filename': target}
         else:
-            msg = _("Installation of '%(filename)s' failed.", formatted=False) % {'filename': wikiutil.escape(target)}
+            msg = _("Installation of '%(filename)s' failed.", formatted=False) % {'filename': target}
         if package.msg != "":
-            msg += "<br><pre>" + wikiutil.escape(package.msg) + "</pre>"
+            msg += " " + package.msg
     else:
-        msg = _('The file %s is not a MoinMoin package file.', formatted=False) % wikiutil.escape(target)
+        msg = _('The file %s is not a MoinMoin package file.', formatted=False) % target
 
     upload_form(pagename, request, msg=msg)
 
@@ -1023,7 +1026,7 @@
         else:
             msg = _('The file %(filename)s is not a .zip file.', formatted=False) % {'filename': filename}
 
-    upload_form(pagename, request, msg=wikiutil.escape(msg))
+    upload_form(pagename, request, msg=msg)
 
 def send_viewfile(pagename, request):
     _ = request.getText

003_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 003_CVE-2008-0781_attach_file_XSS.patch ---
Based on http://hg.moinmo.in/moin/1.7/rev/269a1fbc3ed7 , backported to 1.6 by
Ville-Pekka Vainio.


diff -aur moin-1.6.4.orig/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4.orig/MoinMoin/action/AttachFile.py	2008-07-05 23:20:18.000000000 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-20 02:23:50.621709307 +0300
@@ -849,9 +849,9 @@
          'baseurl': request.getScriptname(),
          'do': 'attachment_move',
          'ticket': wikiutil.createTicket(request),
-         'pagename': pagename,
+         'pagename': wikiutil.escape(pagename, 1),
          'pagename_quoted': wikiutil.quoteWikinameURL(pagename),
-         'attachment_name': filename,
+         'attachment_name': wikiutil.escape(filename, 1),
          'move': _('Move', formatted=False),
          'cancel': _('Cancel', formatted=False),
          'newname_label': _("New page name", formatted=False),

022_CVE-2009-0260_attach_file_XSS.patch:

--- NEW FILE 022_CVE-2009-0260_attach_file_XSS.patch ---

--- ../old/moin-1.5.3/MoinMoin/action/AttachFile.py	2009-01-27 17:56:50.000000000 +0000
+++ moin-1.5.3/MoinMoin/action/AttachFile.py	2009-01-27 18:00:58.000000000 +0000
@@ -375,7 +375,7 @@
     'pngpath': pngpath, 'timestamp': timestamp,
     'pubpath': pubpath, 'drawpath': drawpath,
     'savelink': savelink, 'pagelink': pagelink, 'helplink': helplink,
-    'basename': basename
+    'basename': wikiutil.escape(basename),
 })
 
 


999_attachfile_fix_escaping_problems.patch:

--- NEW FILE 999_attachfile_fix_escaping_problems.patch ---
diff -aur moin-1.6.4-patched-earlier/MoinMoin/action/AttachFile.py moin-1.6.4/MoinMoin/action/AttachFile.py
--- moin-1.6.4-patched-earlier/MoinMoin/action/AttachFile.py	2009-04-20 14:14:43.466538415 +0300
+++ moin-1.6.4/MoinMoin/action/AttachFile.py	2009-04-20 14:17:00.730413758 +0300
@@ -456,7 +456,7 @@
                 action_name, wikiutil.url_quote_plus(fname))
 
             request.write(u'<link rel="Appendix" title="%s" href="%s">\n' % (
-                wikiutil.escape(fname), wikiutil.escape(url)))
+                wikiutil.escape(fname, 1), wikiutil.escape(url)))
 
 
 def send_hotdraw(pagename, request):
@@ -501,7 +501,7 @@
     'pngpath': pngpath, 'timestamp': timestamp,
     'pubpath': pubpath, 'drawpath': drawpath,
     'savelink': savelink, 'pagelink': pagelink, 'helplink': helplink,
-    'basename': wikiutil.escape(basename),
+    'basename': wikiutil.escape(basename, 1),
 })
 
 

CVE-2009-0312_XSS_antispam.patch:

--- NEW FILE CVE-2009-0312_XSS_antispam.patch ---
--- moin-1.6.4.orig/MoinMoin/security/antispam.py	2008-04-26 23:29:08.000000000 +0300
+++ moin-1.6.4/MoinMoin/security/antispam.py	2009-04-16 01:33:58.893892260 +0300
@@ -201,7 +201,7 @@
                         _ = editor.request.getText
                         msg = _('Sorry, can not save page because "%(content)s"'
                                 ' is not allowed in this wiki.', formatted=False) % {
-                            'content': match.group()
+                            'content': wikiutil.escape(match.group())
                             }
                         dprint(msg)
                         raise editor.SaveError(msg)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	24 Apr 2008 09:58:31 -0000	1.14
+++ .cvsignore	20 Apr 2009 15:23:40 -0000	1.15
@@ -1 +1 @@
-moin-1.6.3.tar.gz
+moin-1.6.4.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-9/moin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- moin.spec	24 Apr 2008 09:58:31 -0000	1.22
+++ moin.spec	20 Apr 2009 15:23:41 -0000	1.23
@@ -2,13 +2,31 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.6.3
+Version: 1.6.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
 Source0: http://static.moinmo.in/files/moin-%{version}.tar.gz
 Source1: README-rpm
+
+# Out of the major distributions, Debian has 1.5 and 1.7 (as does Ubuntu),
+# Mandriva has 1.5 and OpenSUSE has no official moin package. It looks like
+# Fedora is the only one shipping 1.6, so most of the security patches have
+# been ported specifically for this package from newer versions. Upstream
+# only supports 1.7 and later currently.
+
+# 3-part patch for 2008-0781, the last part has one additional fix.
+Patch0: 001_CVE-2008-0781_attach_file_XSS.patch
+Patch1: 002_CVE-2008-0781_attach_file_XSS.patch
+Patch2: 003_CVE-2008-0781_attach_file_XSS.patch
+# from Debian etch
+Patch3: 022_CVE-2009-0260_attach_file_XSS.patch
+Patch4: CVE-2009-0312_XSS_antispam.patch
+# upstream http://hg.moinmo.in/moin/1.7/rev/5c4043e651b3 - "invalid html, but
+# likely no XSS", still marked as a security patch. Needs to be done after
+# 022_CVE-2009-0260_attach_file_XSS.patch, thus the numbering.
+Patch5: 999_attachfile_fix_escaping_problems.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel
 BuildArch: noarch
@@ -21,6 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -50,6 +74,16 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.6.4-1
+- Update to 1.6.4
+- CVE-2008-3381 fixed upstream
+- Re-fix CVE-2008-0781, upstream seems to have dropped the fix in 1.6,
+  used part of upstream 1.5 db212dfc58ef, backported upstream 1.7 5f51246a4df1
+  and 269a1fbc3ed7
+- Fix CVE-2009-0260, patch from Debian etch
+- Fix CVE-2009-0312
+- Fix AttachFile escaping problems, backported upstream 1.7 5c4043e651b3
+
 * Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.6.3-1
 - Update to 1.6.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	24 Apr 2008 09:58:31 -0000	1.14
+++ sources	20 Apr 2009 15:23:41 -0000	1.15
@@ -1 +1 @@
-081aa0dd82b4220c8ff28a9a751bad7c  moin-1.6.3.tar.gz
+fb51c4b2d64ac98ca8ccb42fde8cd753  moin-1.6.4.tar.gz



From than at fedoraproject.org  Mon Apr 20 15:39:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 20 Apr 2009 15:39:39 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin-4.2.2-printing.patch, NONE,
	1.1 kdeadmin.spec, 1.128, 1.129
Message-ID: <20090420153939.683BB70102@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25519

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
- fix #496646, system-config-printer-kde doesn't start


kdeadmin-4.2.2-printing.patch:

--- NEW FILE kdeadmin-4.2.2-printing.patch ---
diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig	2009-04-20 17:34:50.000000000 +0200
+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-20 17:36:07.000000000 +0200
@@ -1480,9 +1480,8 @@ class NewPrinterGUI(QDialog):
         """
 
         # Optionally disable downloadable driver support.
-        if not config.DOWNLOADABLE_DRIVER_SUPPORT:
-            self.rbtnNPDownloadableDriverSearch.setEnabled(False)
-            self.downloadableDriverSearchFrame.hide()
+        self.rbtnNPDownloadableDriverSearch.setEnabled(False)
+        self.downloadableDriverSearchFrame.hide()
 
         """
         # Set up OpenPrinting widgets.


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kdeadmin.spec	1 Apr 2009 18:13:32 -0000	1.128
+++ kdeadmin.spec	20 Apr 2009 15:39:08 -0000	1.129
@@ -8,6 +8,7 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeadmin-4.2.2-printing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam
@@ -53,7 +54,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .printing
 
 %build
 
@@ -144,6 +145,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+- fix #496646, system-config-printer-kde doesn't start
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
 - optimize scriptlets 
 



From langel at fedoraproject.org  Mon Apr 20 15:41:20 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 20 Apr 2009 15:41:20 +0000 (UTC)
Subject: rpms/rhino/devel rhino.spec,1.6,1.7
Message-ID: <20090420154120.ED33570102@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/rhino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25986

Modified Files:
	rhino.spec 
Log Message:
* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
- Added jpackage-utils requirement.
- Resolves: rhbz#496435




Index: rhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/devel/rhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rhino.spec	26 Mar 2009 15:17:25 -0000	1.6
+++ rhino.spec	20 Apr 2009 15:40:50 -0000	1.7
@@ -32,7 +32,7 @@
 
 Name:           rhino
 Version:        1.7
-Release:        0.3.r2pre.1.1%{?dist}
+Release:        0.4.r2pre.1.1%{?dist}
 Epoch:          0
 Summary:        JavaScript for Java
 License:        MPLv1.1 or GPLv2+
@@ -48,6 +48,7 @@
 BuildRequires:  ant
 BuildRequires:  bea-stax-api
 BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0
+Requires:	jpackage-utils
         
 # Disable xmlbeans until we can get it into Fedora
 #Requires:       xmlbeans
@@ -157,6 +158,10 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
+- Added jpackage-utils requirement.
+- Resolves: rhbz#496435
+
 * Thu Mar 26 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.3.r2pre.1.1
 - Updated rhino-build.patch
 - License for treetable has been fixed. Re-included this code, and removed patch.



From mtasaka at fedoraproject.org  Mon Apr 20 15:42:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 20 Apr 2009 15:42:21 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.28, 1.29 kazehakase.spec, 1.80, 
	1.81 sources, 1.28, 1.29
Message-ID: <20090420154221.9DC8370102@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26351

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Mon Apr 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-10.sv3770_trunk
- rev 3770
- spec file cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	23 Mar 2009 07:21:24 -0000	1.28
+++ .cvsignore	20 Apr 2009 15:41:51 -0000	1.29
@@ -1 +1 @@
-kazehakase-0.5.6-svn3769_trunk.tar.gz
+kazehakase-0.5.6-svn3770_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kazehakase.spec	12 Apr 2009 09:28:03 -0000	1.80
+++ kazehakase.spec	20 Apr 2009 15:41:51 -0000	1.81
@@ -31,10 +31,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3769_trunk
+%define		svnver		3770_trunk
 
 
-%define		fedorarel	9
+%define		fedorarel	10
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -55,9 +55,6 @@
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 # kazehakase crashed when only kazehakase-webkit is installed
 # (bug 444569)
-Patch12:	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch
-# Also prevent crash even if no modules are installed
-Patch13:	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -185,8 +182,6 @@
 	-e '/SHAVE_INIT/s|\[enable\]|\[disable\]|' configure.ac
 
 %patch11 -p0 -b .rhbug
-%patch12 -p1 -b .onlywebkit
-%patch13 -p1 -b .nomodule
 %patch14 -p1 -b .evr
 
 %if %{need_autogen}
@@ -241,16 +236,10 @@
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
 %configure \
-	CC="%{__cc} `nspr-config --cflags`" \
-	CXX="%{__cxx} `nspr-config --cflags`" \
 	--enable-migemo \
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
-%{__sed} -i.bool -e \
-	's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \
-	config.h
-
 %{__make} -C libegg -k # not parallel make
 %{__make} %{?_smp_mflags} -k
 
@@ -332,6 +321,10 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-10.sv3770_trunk
+- rev 3770
+- spec file cleanup
+
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-9.svn3769_trunk
 - Prevent crash even if no modules are installed (related to bug 444569)
 - Embed Vendor version information


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	23 Mar 2009 07:21:24 -0000	1.28
+++ sources	20 Apr 2009 15:41:51 -0000	1.29
@@ -1 +1 @@
-12e7f646d88cc69b1b1b2b439aa5b1dc  kazehakase-0.5.6-svn3769_trunk.tar.gz
+38d478a06b659010852a9403333a0fa3  kazehakase-0.5.6-svn3770_trunk.tar.gz



From langel at fedoraproject.org  Mon Apr 20 15:45:04 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 20 Apr 2009 15:45:04 +0000 (UTC)
Subject: rpms/rhino/F-10 rhino.spec,1.5,1.6
Message-ID: <20090420154504.5FCF170102@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/rhino/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27161

Modified Files:
	rhino.spec 
Log Message:
* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
- Added jpackage-utils requirement.
- Resolves: rhbz#496435




Index: rhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/F-10/rhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rhino.spec	26 Mar 2009 15:24:03 -0000	1.5
+++ rhino.spec	20 Apr 2009 15:44:33 -0000	1.6
@@ -32,7 +32,7 @@
 
 Name:           rhino
 Version:        1.7
-Release:        0.3.r2pre.1.1%{?dist}
+Release:        0.4.r2pre.1.1%{?dist}
 Epoch:          0
 Summary:        JavaScript for Java
 License:        MPLv1.1 or GPLv2+
@@ -48,6 +48,7 @@
 BuildRequires:  ant
 BuildRequires:  bea-stax-api
 BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0
+Requires:	jpackage-utils
         
 # Disable xmlbeans until we can get it into Fedora
 #Requires:       xmlbeans
@@ -157,6 +158,10 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
+- Added jpackage-utils requirement.
+- Resolves: rhbz#496435
+
 * Thu Mar 26 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.3.r2pre.1.1
 - Updated rhino-build.patch
 - License for treetable has been fixed. Re-included this code, and removed patch.



From than at fedoraproject.org  Mon Apr 20 15:47:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 20 Apr 2009 15:47:11 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin-4.2.2-printing.patch, NONE,
	1.1 kdeadmin.spec, 1.128, 1.129
Message-ID: <20090420154711.42FFF70102@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27785

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
- fix #496646, system-config-printer-kde doesn't start


kdeadmin-4.2.2-printing.patch:

--- NEW FILE kdeadmin-4.2.2-printing.patch ---
diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig	2009-04-20 17:34:50.000000000 +0200
+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-20 17:36:07.000000000 +0200
@@ -1480,9 +1480,8 @@ class NewPrinterGUI(QDialog):
         """
 
         # Optionally disable downloadable driver support.
-        if not config.DOWNLOADABLE_DRIVER_SUPPORT:
-            self.rbtnNPDownloadableDriverSearch.setEnabled(False)
-            self.downloadableDriverSearchFrame.hide()
+        self.rbtnNPDownloadableDriverSearch.setEnabled(False)
+        self.downloadableDriverSearchFrame.hide()
 
         """
         # Set up OpenPrinting widgets.


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kdeadmin.spec	1 Apr 2009 18:13:32 -0000	1.128
+++ kdeadmin.spec	20 Apr 2009 15:46:40 -0000	1.129
@@ -1,13 +1,14 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeadmin-4.2.2-printing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam
@@ -53,7 +54,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .printing
 
 %build
 
@@ -144,7 +145,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+* Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- fix #496646, system-config-printer-kde doesn't start
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets 
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From than at fedoraproject.org  Mon Apr 20 15:49:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 20 Apr 2009 15:49:39 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin.spec,1.129,1.130
Message-ID: <20090420154939.C98E770102@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28279

Modified Files:
	kdeadmin.spec 
Log Message:
- fix #496646, system-config-printer-kde doesn't start



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdeadmin.spec	20 Apr 2009 15:39:08 -0000	1.129
+++ kdeadmin.spec	20 Apr 2009 15:49:09 -0000	1.130
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -145,10 +145,10 @@
 
 
 %changelog
-* Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-2
+* Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix #496646, system-config-printer-kde doesn't start
 
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets 
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From wtogami at fedoraproject.org  Mon Apr 20 15:54:04 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 20 Apr 2009 15:54:04 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.68,1.69
Message-ID: <20090420155404.4CF0E70102@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29220

Modified Files:
	pidgin.spec 
Log Message:
rebuild



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- pidgin.spec	4 Mar 2009 02:09:26 -0000	1.68
+++ pidgin.spec	20 Apr 2009 15:53:33 -0000	1.69
@@ -62,7 +62,7 @@
 
 Name:		pidgin
 Version:	2.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -571,6 +571,9 @@
 %endif
 
 %changelog
+* Mon Apr 20 2009 Warren Togami <wtogami at redhat.com> 2.5.5-2
+- rebuild
+
 * Tue Mar 03 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.5-1
 - 2.5.5
 



From kevin at fedoraproject.org  Mon Apr 20 15:56:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 15:56:42 +0000 (UTC)
Subject: rpms/libxfce4util/F-11 sources, 1.15, 1.16 .cvsignore, 1.15,
	1.16 libxfce4util.spec, 1.27, 1.28
Message-ID: <20090420155642.503A470102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29720

Modified Files:
	sources .cvsignore libxfce4util.spec 
Log Message:
Update to 4.6.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	27 Feb 2009 19:51:34 -0000	1.15
+++ sources	20 Apr 2009 15:56:11 -0000	1.16
@@ -1 +1 @@
-2b0b7cdb4516704940eedf11edc94d5e  libxfce4util-4.6.0.tar.bz2
+eac51d58179cbcadc3f802450a8ec9cd  libxfce4util-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Feb 2009 19:51:34 -0000	1.15
+++ .cvsignore	20 Apr 2009 15:56:11 -0000	1.16
@@ -1 +1 @@
-libxfce4util-4.6.0.tar.bz2
+libxfce4util-4.6.1.tar.bz2


Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/F-11/libxfce4util.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libxfce4util.spec	2 Mar 2009 20:07:10 -0000	1.27
+++ libxfce4util.spec	20 Apr 2009 15:56:11 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfce4util-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %doc %{_datadir}/gtk-doc/html/libxfce4util/
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Make devel package require pkgconfig and gtk-doc
 - Mark gtk-doc files as %%doc



From rcritten at fedoraproject.org  Mon Apr 20 16:06:59 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Mon, 20 Apr 2009 16:06:59 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-10 .cvsignore, 1.7, 1.8 nss_compat_ossl.spec,
	1.12, 1.13 sources, 1.7, 1.8 nss_compat_ossl-cipherlist.patch,
	1.1, NONE
Message-ID: <20090420160659.C62A37013C@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32095

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-cipherlist.patch 
Log Message:
Update to upstream 0.9.5
Change license to MIT



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Oct 2008 20:57:42 -0000	1.7
+++ .cvsignore	20 Apr 2009 16:06:29 -0000	1.8
@@ -1 +1 @@
-nss_compat_ossl-0.9.4.tar.gz
+nss_compat_ossl-0.9.5.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-10/nss_compat_ossl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nss_compat_ossl.spec	15 Dec 2008 16:04:21 -0000	1.12
+++ nss_compat_ossl.spec	20 Apr 2009 16:06:29 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
-Version:        0.9.4
-Release:        2%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -13,8 +13,6 @@
 BuildRequires:  nss-devel > 3.11.7-7
 BuildRequires:  nspr-devel
 
-Patch1: nss_compat_ossl-cipherlist.patch
-
 %description
 This library provides a source-level compatibility layer to aid porting
 programs that use OpenSSL to use the NSS instead.
@@ -29,7 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .cipherlist
 
 %build
 
@@ -68,6 +65,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
+- Update to 0.9.5
+- License changed to MIT
+
 * Wed Dec 15 2008 Rob Crittenden <rcritten at redhat.com> - 0.9.4-2
 - Patch to fix segfault in parsing ciphers (#476519)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Oct 2008 20:57:42 -0000	1.7
+++ sources	20 Apr 2009 16:06:29 -0000	1.8
@@ -1 +1 @@
-d944f2b74fcb1fa75f828b83288517cf  nss_compat_ossl-0.9.4.tar.gz
+71a1782671db129f7788b0d48f1cf64b  nss_compat_ossl-0.9.5.tar.gz


--- nss_compat_ossl-cipherlist.patch DELETED ---



From toshio at fedoraproject.org  Mon Apr 20 16:08:42 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 20 Apr 2009 16:08:42 +0000 (UTC)
Subject: rpms/mono/F-11 mono.spec,1.128,1.129
Message-ID: <20090420160842.89D7F70102@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv695

Modified Files:
	mono.spec 
Log Message:

* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-19
- And turn off bootstrapping and make sure it rebuilds on all platforms.



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-11/mono.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mono.spec	20 Apr 2009 14:17:39 -0000	1.128
+++ mono.spec	20 Apr 2009 16:08:12 -0000	1.129
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -31,7 +31,7 @@
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-#BuildRequires: mono-core
+BuildRequires: mono-core
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
@@ -305,7 +305,7 @@
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-#rm -rf mcs/class/lib/monolite/*
+rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -720,6 +720,9 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-19
+- And turn off bootstrapping and make sure it rebuilds on all platforms.
+
 * Wed Apr 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> 2.4-18
 - Enable bootstrap code and ppc64.  If this succeeds we'll build -19 right
   afterwards with bootstrap code turned off.



From steved at fedoraproject.org  Mon Apr 20 16:10:36 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 20 Apr 2009 16:10:36 +0000 (UTC)
Subject: rpms/libevent/devel .cvsignore, 1.7, 1.8 libevent.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <20090420161036.D2FDC70102@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1221

Modified Files:
	.cvsignore libevent.spec sources 
Log Message:
Updated to latest stable upstream version: 1.4.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Jul 2008 15:23:22 -0000	1.7
+++ .cvsignore	20 Apr 2009 16:10:05 -0000	1.8
@@ -4,3 +4,4 @@
 libevent-1.3e.tar.gz
 libevent-1.4.4-stable.tar.gz
 libevent-1.4.5-stable.tar.gz
+libevent-1.4.10-stable.tar.gz


Index: libevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libevent.spec	25 Feb 2009 14:37:08 -0000	1.18
+++ libevent.spec	20 Apr 2009 16:10:05 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libevent
-Version:        1.4.5
-Release:        2%{?dist}
+Version:        1.4.10
+Release:        1%{?dist}
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 20 2009 Steve Dickson <steved at redhat.com> 1.4.10-1
+- Updated to latest stable upstream version: 1.4.10
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Jul 2008 15:23:22 -0000	1.7
+++ sources	20 Apr 2009 16:10:05 -0000	1.8
@@ -1 +1 @@
-efd44048cc890ad11f7099bc01e43e4a  libevent-1.4.5-stable.tar.gz
+20611535f26d415bd6ad380a673d9ea2  libevent-1.4.10-stable.tar.gz



From langel at fedoraproject.org  Mon Apr 20 16:14:23 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 20 Apr 2009 16:14:23 +0000 (UTC)
Subject: rpms/rhino/F-11 rhino.spec,1.6,1.7
Message-ID: <20090420161423.AE7A570102@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/rhino/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	rhino.spec 
Log Message:
* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
- Added jpackage-utils requirement.
- Resolves: rhbz#496435



Index: rhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/F-11/rhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rhino.spec	26 Mar 2009 15:17:25 -0000	1.6
+++ rhino.spec	20 Apr 2009 16:13:52 -0000	1.7
@@ -32,7 +32,7 @@
 
 Name:           rhino
 Version:        1.7
-Release:        0.3.r2pre.1.1%{?dist}
+Release:        0.4.r2pre.1.1%{?dist}
 Epoch:          0
 Summary:        JavaScript for Java
 License:        MPLv1.1 or GPLv2+
@@ -48,6 +48,7 @@
 BuildRequires:  ant
 BuildRequires:  bea-stax-api
 BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0
+Requires:	jpackage-utils
         
 # Disable xmlbeans until we can get it into Fedora
 #Requires:       xmlbeans
@@ -157,6 +158,10 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
+- Added jpackage-utils requirement.
+- Resolves: rhbz#496435
+
 * Thu Mar 26 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.3.r2pre.1.1
 - Updated rhino-build.patch
 - License for treetable has been fixed. Re-included this code, and removed patch.



From langel at fedoraproject.org  Mon Apr 20 16:17:05 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 20 Apr 2009 16:17:05 +0000 (UTC)
Subject: rpms/rhino/F-11 rhino.spec,1.7,1.8
Message-ID: <20090420161705.E9CC970102@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/rhino/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3153

Modified Files:
	rhino.spec 
Log Message:
* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.5.r2pre.1.1
- Updated release.




Index: rhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/F-11/rhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rhino.spec	20 Apr 2009 16:13:52 -0000	1.7
+++ rhino.spec	20 Apr 2009 16:16:35 -0000	1.8
@@ -32,7 +32,7 @@
 
 Name:           rhino
 Version:        1.7
-Release:        0.4.r2pre.1.1%{?dist}
+Release:        0.5.r2pre.1.1%{?dist}
 Epoch:          0
 Summary:        JavaScript for Java
 License:        MPLv1.1 or GPLv2+
@@ -158,6 +158,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.5.r2pre.1.1
+- Updated release.
+
 * Mon Apr 20 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.4.r2pre.1.1
 - Added jpackage-utils requirement.
 - Resolves: rhbz#496435



From wtogami at fedoraproject.org  Mon Apr 20 16:22:35 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 20 Apr 2009 16:22:35 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.69,1.70
Message-ID: <20090420162235.1537270102@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4190

Modified Files:
	pidgin.spec 
Log Message:
F12+ removed krb4



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- pidgin.spec	20 Apr 2009 15:53:33 -0000	1.69
+++ pidgin.spec	20 Apr 2009 16:22:04 -0000	1.70
@@ -28,6 +28,7 @@
 %define perl_devel_separated	0
 %define perl_embed_separated	0
 %define api_docs		0
+%define krb4_removed		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -59,10 +60,15 @@
 %define perl_embed_separated	1
 %define api_docs		1
 %endif
+# F12+: krb4 removed
+%if 0%{?fedora} >= 12
+%define krb4_removed	1
+%endif
+
 
 Name:		pidgin
 Version:	2.5.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -129,8 +135,10 @@
 BuildRequires:  tk-devel
 BuildRequires:  libxml2-devel
 
+%if ! %{krb4_removed}
 # krb5 needed for Zephyr (FC1+)
 BuildRequires:	krb5-devel
+%endif
 # gtkspell integration (FC1+)
 BuildRequires:	gtkspell-devel, aspell-devel
 # Evolution integration (FC3+)
@@ -349,7 +357,9 @@
 
 %build
 SWITCHES="--with-extraversion=%{release}"
+%if ! %{krb4_removed}
 	SWITCHES="$SWITCHES --with-krb4"
+%endif
 	SWITCHES="$SWITCHES --enable-perl"
 	SWITCHES="$SWITCHES --enable-gevolution"
 %if %{dbus_integration}
@@ -571,8 +581,8 @@
 %endif
 
 %changelog
-* Mon Apr 20 2009 Warren Togami <wtogami at redhat.com> 2.5.5-2
-- rebuild
+* Mon Apr 20 2009 Warren Togami <wtogami at redhat.com> 2.5.5-3
+- F12+ removed krb4
 
 * Tue Mar 03 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.5-1
 - 2.5.5



From steved at fedoraproject.org  Mon Apr 20 16:41:13 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 20 Apr 2009 16:41:13 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.12-rc1.patch, NONE,
	1.1 libtirpc-0.1.7-compile.patch, 1.6, 1.7 libtirpc.spec, 1.45, 1.46
Message-ID: <20090420164113.C4B3570102@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9041

Modified Files:
	libtirpc-0.1.7-compile.patch libtirpc.spec 
Added Files:
	libtirpc-0.1.12-rc1.patch 
Log Message:
- Updated to libtirpc-0.1.12-rc1


libtirpc-0.1.12-rc1.patch:

--- NEW FILE libtirpc-0.1.12-rc1.patch ---
diff --git a/src/svc.c b/src/svc.c
commit 8f840586d9ceba6d682ab424ae48a0cf08f7ea41
Author: Jeff Layton <jlayton at redhat.com>
Date:   Mon Apr 20 12:23:25 2009 -0400

    http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2006-002-rpc.txt
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

commit 54ad86c29bcd40dbb6b9f1f9e611778add4227ea
Author: Jeff Layton <jlayton at redhat.com>
Date:   Mon Apr 20 12:22:22 2009 -0400

    [PATCH] port fix for CVE-2008-0947
    
    Adds bounds checking of fd passed into makefd_xprt against FD_SETSIZE.
    
    http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2008-002.txt
    
    This was reported against MIT krb5 code, but it looks like libtirpc
    has a similar problem.
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>
-----------------------------------------------------
--- a/src/svc.c
+++ b/src/svc.c
@@ -78,6 +78,7 @@ static struct svc_callout
 
 extern rwlock_t svc_lock;
 extern rwlock_t svc_fd_lock;
+extern struct svc_auth_ops svc_auth_gss_ops;
 
 static struct svc_callout *svc_find (rpcprog_t, rpcvers_t,
 				     struct svc_callout **, char *);
@@ -715,6 +716,11 @@ svc_getreq_common (fd)
 	  SVC_DESTROY (xprt);
 	  break;
 	}
+      else if ((xprt->xp_auth != NULL) &&
+	       (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops))
+	{
+	  xprt->xp_auth = NULL;
+	}
     }
   while (stat == XPRT_MOREREQS);
 }
diff --git a/src/svc_vc.c b/src/svc_vc.c
index 44d3497..7a1f5c3 100644
--- a/src/svc_vc.c
+++ b/src/svc_vc.c
@@ -261,6 +261,12 @@ makefd_xprt(fd, sendsize, recvsize)
  
 	assert(fd != -1);
 
+        if (fd >= FD_SETSIZE) {
+                warnx("svc_vc: makefd_xprt: fd too high\n");
+                xprt = NULL;
+                goto done;
+        }
+
 	xprt = mem_alloc(sizeof(SVCXPRT));
 	if (xprt == NULL) {
 		warnx("svc_vc: makefd_xprt: out of memory");

libtirpc-0.1.7-compile.patch:

Index: libtirpc-0.1.7-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc-0.1.7-compile.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libtirpc-0.1.7-compile.patch	20 Nov 2008 14:38:35 -0000	1.6
+++ libtirpc-0.1.7-compile.patch	20 Apr 2009 16:41:13 -0000	1.7
@@ -5,7 +5,7 @@
  lib_LTLIBRARIES = libtirpc.la
  
 -libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:9:0
-+libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0
++libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:11:0
  
  libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
          clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libtirpc.spec	20 Apr 2009 14:44:23 -0000	1.45
+++ libtirpc.spec	20 Apr 2009 16:41:13 -0000	1.46
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.11
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -30,6 +30,8 @@
 Requires:	%{name} = %{version}-%{release}
 Requires(devel):	pkgconfig man
 
+Patch1: libtirpc-0.1.12-rc1.patch
+
 Patch100: libtirpc-0.1.7-compile.patch
 
 %description devel
@@ -39,6 +41,7 @@
 
 %prep
 %setup -q
+%patch1	-p1
 
 %patch100	-p1
 
@@ -137,6 +140,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2009 Steve Dickson  <steved at redhat.com> 0.1.11-2
+- Updated to libtirpc-0.1.12-rc1
+
 * Mon Apr 20 2009 Steve Dickson  <steved at redhat.com> 0.1.11-1
 - Updated to the latest release: 0.1.11 
 



From s4504kr at fedoraproject.org  Mon Apr 20 16:48:40 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 16:48:40 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.107,1.108 sources,1.21,1.22
Message-ID: <20090420164840.90C6F70102@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10254

Modified Files:
	blender.spec sources 
Log Message:
Remove x264 from source tar ball


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- blender.spec	1 Apr 2009 16:45:52 -0000	1.107
+++ blender.spec	20 Apr 2009 16:48:09 -0000	1.108
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	19%{?dist}
+Release: 	20%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -16,7 +16,7 @@
 # patent encumbered (#239476)
 # wget http://download.blender.org/source/blender-2.48.tar.gz
 # cd blender-2-47/extern
-# rm -rf ffmpeg libmp3lame
+# rm -rf ffmpeg libmp3lame x264
 # cd ../..
 # tar -zcf blender-2.48-noffmpeg.tar.gz blender-2-48/
 Source0:	blender-%{version}-noffmpeg.tar.gz
@@ -127,13 +127,13 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}/%{_bindir}/blender.bin
-install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer.bin
+install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}%{_bindir}/blender.bin
+install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer.bin
 
-install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
 
-install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/%{_bindir}/blender
-install -D -m 755 %{SOURCE7} ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}%{_bindir}/blender
+install -D -m 755 %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
 
 #
 #  Install miscellanous files to /usr/lib/blender
@@ -145,15 +145,15 @@
 rm -rf $(find -name '.svn' -print)
 popd
 
-cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
+cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
 
-install -d ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
+install -d ${RPM_BUILD_ROOT}%{blenderlib}/scripts
 
-cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
+cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
 
-install -m 644 release/VERSION ${RPM_BUILD_ROOT}/%{blenderlib}
-install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}/%{blenderlib}
-install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}/%{blenderlib}
+install -m 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib}
+install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib}
+install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}%{blenderlib}
 
 install -p -D -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/import-3ds-0.7.py
 install -p -D -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/export-3ds-0.71.py
@@ -172,11 +172,11 @@
 # Install plugins
 #
 
-install -d ${RPM_BUILD_ROOT}/%{plugins}/sequence
-install -d ${RPM_BUILD_ROOT}/%{plugins}/texture
+install -d ${RPM_BUILD_ROOT}%{plugins}/sequence
+install -d ${RPM_BUILD_ROOT}%{plugins}/texture
 
-install -s -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}/%{plugins}/sequence
-install -s -m 644 release/plugins/texture/*.so ${RPM_BUILD_ROOT}/%{plugins}/texture
+install -s -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{plugins}/sequence
+install -s -m 644 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{plugins}/texture
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -191,8 +191,8 @@
 #
 # Create link to DejaVu-Sans
 #
-rm ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf
-(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf)
+rm ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf
+(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf)
 
 %find_lang %name
 
@@ -227,7 +227,11 @@
 %{_bindir}/blenderplayer.bin
 
 %changelog
-* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.48a-19
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-20
+- Remove x264 from source tar ball
+- Some cosmetic changes
+
+* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-19
 - Change nonfree to freeworld
 
 * Tue Mar 31 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-18


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Oct 2008 19:19:05 -0000	1.21
+++ sources	20 Apr 2009 16:48:09 -0000	1.22
@@ -1 +1 @@
-ede2f9466b62e980f9ef87925e463976  blender-2.48a-noffmpeg.tar.gz
+cac955e60dc8e36113dfda3c068b661a  blender-2.48a-noffmpeg.tar.gz



From hno at fedoraproject.org  Mon Apr 20 16:57:20 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 20 Apr 2009 16:57:20 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.39, 1.40 sources, 1.42,
	1.43 squid.spec, 1.119, 1.120
Message-ID: <20090420165720.0868970102@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11922

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid Bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	19 Apr 2009 19:40:27 -0000	1.39
+++ .cvsignore	20 Apr 2009 16:56:49 -0000	1.40
@@ -1 +1,2 @@
 squid-3.0.STABLE14.tar.bz2
+b9001.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	19 Apr 2009 19:40:27 -0000	1.42
+++ sources	20 Apr 2009 16:56:49 -0000	1.43
@@ -1 +1,2 @@
 7aaff2319d2263404d788a82a10c8633  squid-3.0.STABLE14.tar.bz2
+6c97159c5ed473c3770864fd54dcccc7  b9001.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- squid.spec	19 Apr 2009 19:29:22 -0000	1.119
+++ squid.spec	20 Apr 2009 16:56:49 -0000	1.120
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE14
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,6 +20,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9001.patch
 
 # External patches
 
@@ -64,7 +65,7 @@
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
-%patch209 -p1 -b .gcc44
+#patch209 -p1 -b .gcc44
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -337,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
+- Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
+
 * Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1
 - Upgrade to 3.0.STABLE14
 



From mtasaka at fedoraproject.org  Mon Apr 20 16:57:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 20 Apr 2009 16:57:31 +0000 (UTC)
Subject: rpms/rubygem-locale/F-11 .cvsignore, 1.2, 1.3 rubygem-locale.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090420165731.9A6D670102@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-locale/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11895/rubygem-locale/F-11

Modified Files:
	.cvsignore rubygem-locale.spec sources 
Log Message:
locale, gettext: 2.0.1 released


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-locale/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2009 04:33:14 -0000	1.2
+++ .cvsignore	20 Apr 2009 16:57:01 -0000	1.3
@@ -1 +1 @@
-locale-2.0.0.gem
+locale-2.0.1.gem


Index: rubygem-locale.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-locale/F-11/rubygem-locale.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-locale.spec	31 Mar 2009 04:33:14 -0000	1.1
+++ rubygem-locale.spec	20 Apr 2009 16:57:01 -0000	1.2
@@ -9,7 +9,7 @@
 
 Summary:	Pure ruby library which provides basic APIs for localization
 Name:		rubygem-%{gemname}
-Version:	2.0.0
+Version:	2.0.1
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	LGPLv2+ or Ruby
@@ -62,7 +62,7 @@
 	-V \
 	%{SOURCE0}
 
-rm -f .%{geminstdir}/Rakefile
+# rm -f .%{geminstdir}/Rakefile
 find . -name \*gem | xargs chmod 0644
 
 # fix timestamps
@@ -130,6 +130,10 @@
 
 create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
 
+%check
+pushd .%{geminstdir}
+rake test
+
 %clean
 rm -rf %{buildroot}
 
@@ -137,6 +141,7 @@
 %defattr(-,root,root,-)
 %dir %{geminstdir}/
 %doc %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
 %{geminstdir}/lib/
 %{geminstdir}/*.rb
 
@@ -156,5 +161,8 @@
 
 
 %changelog
+* Tue Apr 21 2009  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1
+
 * Thu Mar 26 2009  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-locale/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2009 04:33:14 -0000	1.2
+++ sources	20 Apr 2009 16:57:01 -0000	1.3
@@ -1 +1 @@
-cc6f061497e5fddd5f7860b7ac437c02  locale-2.0.0.gem
+d66d96614faedd092834b4905d2f0fe8  locale-2.0.1.gem



From mtasaka at fedoraproject.org  Mon Apr 20 16:57:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 20 Apr 2009 16:57:31 +0000 (UTC)
Subject: rpms/rubygem-locale/devel .cvsignore, 1.2, 1.3 rubygem-locale.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090420165731.E0E3670102@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-locale/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11895/rubygem-locale/devel

Modified Files:
	.cvsignore rubygem-locale.spec sources 
Log Message:
locale, gettext: 2.0.1 released


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-locale/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2009 04:33:14 -0000	1.2
+++ .cvsignore	20 Apr 2009 16:57:01 -0000	1.3
@@ -1 +1 @@
-locale-2.0.0.gem
+locale-2.0.1.gem


Index: rubygem-locale.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-locale/devel/rubygem-locale.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-locale.spec	31 Mar 2009 04:33:14 -0000	1.1
+++ rubygem-locale.spec	20 Apr 2009 16:57:01 -0000	1.2
@@ -9,7 +9,7 @@
 
 Summary:	Pure ruby library which provides basic APIs for localization
 Name:		rubygem-%{gemname}
-Version:	2.0.0
+Version:	2.0.1
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	LGPLv2+ or Ruby
@@ -62,7 +62,7 @@
 	-V \
 	%{SOURCE0}
 
-rm -f .%{geminstdir}/Rakefile
+# rm -f .%{geminstdir}/Rakefile
 find . -name \*gem | xargs chmod 0644
 
 # fix timestamps
@@ -130,6 +130,10 @@
 
 create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
 
+%check
+pushd .%{geminstdir}
+rake test
+
 %clean
 rm -rf %{buildroot}
 
@@ -137,6 +141,7 @@
 %defattr(-,root,root,-)
 %dir %{geminstdir}/
 %doc %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
 %{geminstdir}/lib/
 %{geminstdir}/*.rb
 
@@ -156,5 +161,8 @@
 
 
 %changelog
+* Tue Apr 21 2009  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1
+
 * Thu Mar 26 2009  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-locale/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2009 04:33:14 -0000	1.2
+++ sources	20 Apr 2009 16:57:01 -0000	1.3
@@ -1 +1 @@
-cc6f061497e5fddd5f7860b7ac437c02  locale-2.0.0.gem
+d66d96614faedd092834b4905d2f0fe8  locale-2.0.1.gem



From mtasaka at fedoraproject.org  Mon Apr 20 16:57:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 20 Apr 2009 16:57:31 +0000 (UTC)
Subject: rpms/rubygem-gettext/F-11 .cvsignore, 1.3, 1.4 rubygem-gettext.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090420165731.0B69670102@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11895/rubygem-gettext/F-11

Modified Files:
	.cvsignore rubygem-gettext.spec sources 
Log Message:
locale, gettext: 2.0.1 released


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 04:37:21 -0000	1.3
+++ .cvsignore	20 Apr 2009 16:57:00 -0000	1.4
@@ -1 +1 @@
-gettext-2.0.0.gem
+gettext-2.0.1.gem


Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/F-11/rubygem-gettext.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-gettext.spec	31 Mar 2009 04:37:22 -0000	1.4
+++ rubygem-gettext.spec	20 Apr 2009 16:57:00 -0000	1.5
@@ -1,13 +1,18 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
-%define		gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define		gemname		gettext
-%define		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
-
-%define		rubyabi		1.8
+%global		gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global		gemname		gettext
+%global		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+
+%global		rubyabi		1.8
+%if 0%{?fedora} >= 12
+%global		do_test		1
+%else
+%global		do_test		0
+%endif
 
 Name:		rubygem-%{gemname}
-Version:	2.0.0
+Version:	2.0.1
 Release:	1%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
@@ -15,20 +20,17 @@
 License:	Ruby
 URL:		http://www.yotabanana.com/hiki/ruby-gettext.html?ruby-gettext
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-# "begin gem 'locale', '>=0.9'" raises NoMethodError
-# instead of LoadError
-Patch0:		rubygem-gettext-2.0.0-gem-NoMethodError.patch
-# revive 4 argument bintextdomain() compatibility
-# Upstream bug 24947, GNOME bug 576826
-Patch1:		rubygem-gettext-2.0.0-4args-bindtextdomain.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems)
 BuildRequires:	rubygem(rake)
+%if %{do_test}
+BuildRequires(check):	rubygem(locale) >= 2.0.1
+%endif
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
-Requires:	rubygem(locale) >= 2.0.0
+Requires:	rubygem(locale) >= 2.0.1
 Requires:	irb
 Provides:	rubygem(%{gemname}) = %{version}-%{release}
 
@@ -77,12 +79,7 @@
 	-V \
 	%{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
-popd
-
-%{__rm} -f .%{geminstdir}/Rakefile
+#%%{__rm} -f .%{geminstdir}/Rakefile
 %{__rm} -f .%{geminstdir}/%{gemname}.gemspec
 %{__rm} -rf .%{geminstdir}/po/
 %{__rm} -rf .%{gemdir}/bin/
@@ -189,6 +186,12 @@
 	echo "%%dir ${dir#%{buildroot}}" >> %{name}-gem.lang
 done
 
+%if %{do_test}
+%check
+pushd .%{geminstdir}
+rake test
+%endif
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -200,6 +203,7 @@
 
 %dir %{geminstdir}/
 %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
 %{geminstdir}/bin/
 %{geminstdir}/lib/
 %{geminstdir}/src/
@@ -220,6 +224,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1, drop patches already in upstream (all)
+
 * Sat Mar 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
 - Update to 2.0.0
 - Now require rubygem(locale)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2009 04:37:22 -0000	1.3
+++ sources	20 Apr 2009 16:57:00 -0000	1.4
@@ -1 +1 @@
-f1a237f5777c6129292012b0d161f3df  gettext-2.0.0.gem
+bc0a5f0e84bda40cef6b1413bbe82922  gettext-2.0.1.gem



From mtasaka at fedoraproject.org  Mon Apr 20 16:57:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 20 Apr 2009 16:57:31 +0000 (UTC)
Subject: rpms/rubygem-gettext/devel .cvsignore, 1.3, 1.4 rubygem-gettext.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090420165731.6344770102@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11895/rubygem-gettext/devel

Modified Files:
	.cvsignore rubygem-gettext.spec sources 
Log Message:
locale, gettext: 2.0.1 released


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 04:37:21 -0000	1.3
+++ .cvsignore	20 Apr 2009 16:57:01 -0000	1.4
@@ -1 +1 @@
-gettext-2.0.0.gem
+gettext-2.0.1.gem


Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/rubygem-gettext.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-gettext.spec	31 Mar 2009 04:37:22 -0000	1.4
+++ rubygem-gettext.spec	20 Apr 2009 16:57:01 -0000	1.5
@@ -1,13 +1,18 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
-%define		gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define		gemname		gettext
-%define		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
-
-%define		rubyabi		1.8
+%global		gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global		gemname		gettext
+%global		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+
+%global		rubyabi		1.8
+%if 0%{?fedora} >= 12
+%global		do_test		1
+%else
+%global		do_test		0
+%endif
 
 Name:		rubygem-%{gemname}
-Version:	2.0.0
+Version:	2.0.1
 Release:	1%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
@@ -15,20 +20,17 @@
 License:	Ruby
 URL:		http://www.yotabanana.com/hiki/ruby-gettext.html?ruby-gettext
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-# "begin gem 'locale', '>=0.9'" raises NoMethodError
-# instead of LoadError
-Patch0:		rubygem-gettext-2.0.0-gem-NoMethodError.patch
-# revive 4 argument bintextdomain() compatibility
-# Upstream bug 24947, GNOME bug 576826
-Patch1:		rubygem-gettext-2.0.0-4args-bindtextdomain.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems)
 BuildRequires:	rubygem(rake)
+%if %{do_test}
+BuildRequires(check):	rubygem(locale) >= 2.0.1
+%endif
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
-Requires:	rubygem(locale) >= 2.0.0
+Requires:	rubygem(locale) >= 2.0.1
 Requires:	irb
 Provides:	rubygem(%{gemname}) = %{version}-%{release}
 
@@ -77,12 +79,7 @@
 	-V \
 	%{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
-popd
-
-%{__rm} -f .%{geminstdir}/Rakefile
+#%%{__rm} -f .%{geminstdir}/Rakefile
 %{__rm} -f .%{geminstdir}/%{gemname}.gemspec
 %{__rm} -rf .%{geminstdir}/po/
 %{__rm} -rf .%{gemdir}/bin/
@@ -189,6 +186,12 @@
 	echo "%%dir ${dir#%{buildroot}}" >> %{name}-gem.lang
 done
 
+%if %{do_test}
+%check
+pushd .%{geminstdir}
+rake test
+%endif
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -200,6 +203,7 @@
 
 %dir %{geminstdir}/
 %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
 %{geminstdir}/bin/
 %{geminstdir}/lib/
 %{geminstdir}/src/
@@ -220,6 +224,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1, drop patches already in upstream (all)
+
 * Sat Mar 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
 - Update to 2.0.0
 - Now require rubygem(locale)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2009 04:37:22 -0000	1.3
+++ sources	20 Apr 2009 16:57:01 -0000	1.4
@@ -1 +1 @@
-f1a237f5777c6129292012b0d161f3df  gettext-2.0.0.gem
+bc0a5f0e84bda40cef6b1413bbe82922  gettext-2.0.1.gem



From rcritten at fedoraproject.org  Mon Apr 20 17:05:32 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Mon, 20 Apr 2009 17:05:32 +0000 (UTC)
Subject: rpms/nss_compat_ossl/devel .cvsignore, 1.7, 1.8 nss_compat_ossl.spec,
	1.13, 1.14 sources, 1.7, 1.8 nss_compat_ossl-cipherlist.patch,
	1.1, NONE
Message-ID: <20090420170532.B623570102@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13967

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-cipherlist.patch 
Log Message:
Update to 0.9.5
License changed to MIT



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Oct 2008 20:57:42 -0000	1.7
+++ .cvsignore	20 Apr 2009 17:05:02 -0000	1.8
@@ -1 +1 @@
-nss_compat_ossl-0.9.4.tar.gz
+nss_compat_ossl-0.9.5.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nss_compat_ossl.spec	26 Feb 2009 06:11:51 -0000	1.13
+++ nss_compat_ossl.spec	20 Apr 2009 17:05:02 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
-Version:        0.9.4
-Release:        3%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -13,8 +13,6 @@
 BuildRequires:  nss-devel > 3.11.7-7
 BuildRequires:  nspr-devel
 
-Patch1: nss_compat_ossl-cipherlist.patch
-
 %description
 This library provides a source-level compatibility layer to aid porting
 programs that use OpenSSL to use the NSS instead.
@@ -29,7 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .cipherlist
 
 %build
 
@@ -68,6 +65,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
+- Update to 0.9.5
+- License changed to MIT
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Oct 2008 20:57:42 -0000	1.7
+++ sources	20 Apr 2009 17:05:02 -0000	1.8
@@ -1 +1 @@
-d944f2b74fcb1fa75f828b83288517cf  nss_compat_ossl-0.9.4.tar.gz
+71a1782671db129f7788b0d48f1cf64b  nss_compat_ossl-0.9.5.tar.gz


--- nss_compat_ossl-cipherlist.patch DELETED ---



From s4504kr at fedoraproject.org  Mon Apr 20 17:06:01 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 17:06:01 +0000 (UTC)
Subject: rpms/highlight/devel .cvsignore, 1.22, 1.23 highlight.spec, 1.40,
	1.41 sources, 1.23, 1.24 highlight-2.7-gcc44.patch, 1.1, NONE
Message-ID: <20090420170601.98DD170102@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14109

Modified Files:
	.cvsignore highlight.spec sources 
Removed Files:
	highlight-2.7-gcc44.patch 
Log Message:
New upstrem release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Jan 2009 18:39:51 -0000	1.22
+++ .cvsignore	20 Apr 2009 17:05:31 -0000	1.23
@@ -1 +1 @@
-highlight-2.7.tar.gz
+highlight-2.8.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- highlight.spec	25 Feb 2009 03:49:25 -0000	1.40
+++ highlight.spec	20 Apr 2009 17:05:31 -0000	1.41
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.7
-Release:	3%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -9,8 +9,6 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
-# Sent patch to upstrem via mail.
-Patch2:		highlight-2.7-gcc44.patch
 
 BuildRequires:	wxGTK-devel
 
@@ -27,7 +25,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch2 -p1 -b .gcc44
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov
@@ -73,7 +70,10 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-3
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-1
+- New upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Feb  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.7-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	15 Jan 2009 18:39:52 -0000	1.23
+++ sources	20 Apr 2009 17:05:31 -0000	1.24
@@ -1 +1 @@
-3ea4e71fd07cd517386d4dab9bd748e5  highlight-2.7.tar.gz
+8faff0aab0156cc0c6dd9af3e3e1464d  highlight-2.8.tar.gz


--- highlight-2.7-gcc44.patch DELETED ---



From hno at fedoraproject.org  Mon Apr 20 17:17:28 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 20 Apr 2009 17:17:28 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.39, 1.40 sources, 1.42,
	1.43 squid.spec, 1.118, 1.119
Message-ID: <20090420171728.4570270102@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17282

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid Bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	20 Apr 2009 00:11:52 -0000	1.39
+++ .cvsignore	20 Apr 2009 17:16:57 -0000	1.40
@@ -1 +1,2 @@
 squid-3.0.STABLE14.tar.bz2
+b9001.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	20 Apr 2009 00:11:52 -0000	1.42
+++ sources	20 Apr 2009 17:16:57 -0000	1.43
@@ -1 +1,2 @@
 7aaff2319d2263404d788a82a10c8633  squid-3.0.STABLE14.tar.bz2
+6c97159c5ed473c3770864fd54dcccc7  b9001.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- squid.spec	20 Apr 2009 00:11:52 -0000	1.118
+++ squid.spec	20 Apr 2009 17:16:57 -0000	1.119
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE14
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,6 +20,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9001.patch
 
 # External patches
 
@@ -337,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
+- Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
+
 * Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1
 - Upgrade to 3.0.STABLE14
 



From s4504kr at fedoraproject.org  Mon Apr 20 17:17:59 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 17:17:59 +0000 (UTC)
Subject: rpms/highlight/F-11 highlight.spec, 1.40, 1.41 sources, 1.23,
	1.24 highlight-2.7-gcc44.patch, 1.1, NONE
Message-ID: <20090420171759.3EF8E70102@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17393

Modified Files:
	highlight.spec sources 
Removed Files:
	highlight-2.7-gcc44.patch 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/highlight.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- highlight.spec	25 Feb 2009 03:49:25 -0000	1.40
+++ highlight.spec	20 Apr 2009 17:17:28 -0000	1.41
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.7
-Release:	3%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -9,8 +9,6 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
-# Sent patch to upstrem via mail.
-Patch2:		highlight-2.7-gcc44.patch
 
 BuildRequires:	wxGTK-devel
 
@@ -27,7 +25,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch2 -p1 -b .gcc44
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov
@@ -73,7 +70,10 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-3
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-1
+- New upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Feb  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.7-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	15 Jan 2009 18:39:52 -0000	1.23
+++ sources	20 Apr 2009 17:17:28 -0000	1.24
@@ -1 +1 @@
-3ea4e71fd07cd517386d4dab9bd748e5  highlight-2.7.tar.gz
+8faff0aab0156cc0c6dd9af3e3e1464d  highlight-2.8.tar.gz


--- highlight-2.7-gcc44.patch DELETED ---



From hno at fedoraproject.org  Mon Apr 20 17:21:50 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 20 Apr 2009 17:21:50 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.120,1.121
Message-ID: <20090420172150.49CB070102@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18140

Modified Files:
	squid.spec 
Log Message:
Reactivate gcc44.patch accidently commented out before


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- squid.spec	20 Apr 2009 16:56:49 -0000	1.120
+++ squid.spec	20 Apr 2009 17:21:19 -0000	1.121
@@ -65,7 +65,7 @@
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
-#patch209 -p1 -b .gcc44
+%patch209 -p1 -b .gcc44
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;



From s4504kr at fedoraproject.org  Mon Apr 20 17:25:16 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 17:25:16 +0000 (UTC)
Subject: rpms/highlight/F-11 highlight.spec,1.41,1.42
Message-ID: <20090420172516.113A070102@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19065

Modified Files:
	highlight.spec 
Log Message:
bump release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/highlight.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- highlight.spec	20 Apr 2009 17:17:28 -0000	1.41
+++ highlight.spec	20 Apr 2009 17:24:45 -0000	1.42
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -70,6 +70,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-2
+- bump release
+
 * Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-1
 - New upstream release
 



From s4504kr at fedoraproject.org  Mon Apr 20 17:32:08 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 17:32:08 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.108,1.109
Message-ID: <20090420173208.B8B1870102@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20523

Modified Files:
	blender.spec 
Log Message:
Remove x264 lib from source tar ball


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- blender.spec	20 Apr 2009 16:48:09 -0000	1.108
+++ blender.spec	20 Apr 2009 17:31:38 -0000	1.109
@@ -1,7 +1,7 @@
-%define blenderlib %{_datadir}/blender
-%define plugins %{_libdir}/blender/plugins
+%global blenderlib %{_datadir}/blender
+%global plugins %{_libdir}/blender/plugins
 
-%define fontname blender
+%global fontname blender
 
 Name:           blender
 Version:        2.48a



From orion at fedoraproject.org  Mon Apr 20 17:36:57 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 20 Apr 2009 17:36:57 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.73,1.74
Message-ID: <20090420173657.A23C170102@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21562

Modified Files:
	plplot.spec 
Log Message:
* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com>
- Only disable ocaml support on sparc64, s390, s390x



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- plplot.spec	16 Apr 2009 09:26:12 -0000	1.73
+++ plplot.spec	20 Apr 2009 17:36:27 -0000	1.74
@@ -24,7 +24,6 @@
 Patch5:         plplot-5.9.2-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
 BuildRequires:  gcc-gfortran
@@ -56,7 +55,9 @@
 %if %{with doc}
 BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
+%ifnarch sparc64 s390 s390x
 BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
+%endif
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -173,6 +174,7 @@
 %{summary}.
 
 
+%ifnarch sparc64 s390 s390x
 %package        ocaml
 Summary:        Functions for scientific plotting with OCaml
 Group:          Development/Libraries
@@ -194,6 +196,7 @@
 
 %description    ocaml-devel
 %{summary}.
+%endif
 
 
 %if %{with octave}
@@ -535,6 +538,7 @@
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
 
+%ifnarch sparc64 s390 s390x
 %files ocaml
 %defattr(-,root,root,-)
 %dir %{_libdir}/ocaml/plplot/
@@ -550,6 +554,7 @@
 %{_libdir}/pkgconfig/plplotd-ocaml.pc
 %{_libdir}/ocaml/plplot/*.a
 %{_libdir}/ocaml/plplot/*.cmxa
+%endif
 
 %if %{with octave}
 %files octave
@@ -605,6 +610,9 @@
 
 
 %changelog
+* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com>
+- Only disable ocaml support on sparc64, s390, s390x
+
 * Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
 - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
   (added sparc64 per request from the sparc maintainer)



From s4504kr at fedoraproject.org  Mon Apr 20 17:40:33 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 17:40:33 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.109,1.110
Message-ID: <20090420174033.57A107013C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22127

Modified Files:
	blender.spec 
Log Message:
Chage BR mesa-libGL* into libGL*


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- blender.spec	20 Apr 2009 17:31:38 -0000	1.109
+++ blender.spec	20 Apr 2009 17:40:01 -0000	1.110
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	20%{?dist}
+Release: 	21%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -55,8 +55,8 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libXi-devel
 BuildRequires:  xorg-x11-proto-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
+BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  glew-devel
@@ -227,6 +227,9 @@
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-21
+- Chamge BR mesa-libGL* into libGL* 
+
 * Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-20
 - Remove x264 from source tar ball
 - Some cosmetic changes



From cwickert at fedoraproject.org  Mon Apr 20 17:43:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 20 Apr 2009 17:43:05 +0000 (UTC)
Subject: rpms/menu-cache/devel .cvsignore, 1.3, 1.4 menu-cache.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090420174306.0611970102@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/menu-cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23287

Modified Files:
	.cvsignore menu-cache.spec sources 
Log Message:
* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
- Update to 0.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 20:13:30 -0000	1.3
+++ .cvsignore	20 Apr 2009 17:42:35 -0000	1.4
@@ -1 +1 @@
-menu-cache-0.2.3.tar.gz
+menu-cache-0.2.4.tar.gz


Index: menu-cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/devel/menu-cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- menu-cache.spec	31 Mar 2009 20:22:41 -0000	1.5
+++ menu-cache.spec	20 Apr 2009 17:42:35 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           menu-cache
-Version:        0.2.3
+Version:        0.2.4
 Release:        1%{?dist}
 Summary:        Caching mechanism for freedesktop.org compliant menus
 
@@ -54,11 +54,12 @@
 
 %files
 %defattr(-,root,root,-)
-#FIXME: add ChangeLog if there is content
+#FIXME: add ChangeLog and NEWS if there is content
 %doc AUTHORS COPYING README
 %{_bindir}/menu-cache-gen
 %{_libexecdir}/menu-cached
 %{_libdir}/libmenu-cache.so.*
+%{_mandir}/man*/*.gz
 
 
 %files devel
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
+- Update to 0.2.4
+
 * Tue Mar 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-1
 - Update to 0.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2009 20:13:30 -0000	1.3
+++ sources	20 Apr 2009 17:42:35 -0000	1.4
@@ -1 +1 @@
-91d92b5b45927595a8750e5ab5915b40  menu-cache-0.2.3.tar.gz
+945b058433c3f5e921547e13ae30dd41  menu-cache-0.2.4.tar.gz



From s4504kr at fedoraproject.org  Mon Apr 20 17:44:01 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 17:44:01 +0000 (UTC)
Subject: rpms/blender/F-11 blender.spec,1.107,1.108 sources,1.21,1.22
Message-ID: <20090420174401.9D00470102@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23854

Modified Files:
	blender.spec sources 
Log Message:
Change BR mesa-libGL* into libGL*


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-11/blender.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- blender.spec	1 Apr 2009 16:45:52 -0000	1.107
+++ blender.spec	20 Apr 2009 17:43:31 -0000	1.108
@@ -1,11 +1,11 @@
-%define blenderlib %{_datadir}/blender
-%define plugins %{_libdir}/blender/plugins
+%global blenderlib %{_datadir}/blender
+%global plugins %{_libdir}/blender/plugins
 
-%define fontname blender
+%global fontname blender
 
 Name:           blender
 Version:        2.48a
-Release: 	19%{?dist}
+Release: 	21%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -16,7 +16,7 @@
 # patent encumbered (#239476)
 # wget http://download.blender.org/source/blender-2.48.tar.gz
 # cd blender-2-47/extern
-# rm -rf ffmpeg libmp3lame
+# rm -rf ffmpeg libmp3lame x264
 # cd ../..
 # tar -zcf blender-2.48-noffmpeg.tar.gz blender-2-48/
 Source0:	blender-%{version}-noffmpeg.tar.gz
@@ -55,8 +55,8 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libXi-devel
 BuildRequires:  xorg-x11-proto-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
+BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  glew-devel
@@ -127,13 +127,13 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}/%{_bindir}/blender.bin
-install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer.bin
+install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}%{_bindir}/blender.bin
+install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer.bin
 
-install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
 
-install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/%{_bindir}/blender
-install -D -m 755 %{SOURCE7} ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}%{_bindir}/blender
+install -D -m 755 %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
 
 #
 #  Install miscellanous files to /usr/lib/blender
@@ -145,15 +145,15 @@
 rm -rf $(find -name '.svn' -print)
 popd
 
-cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
+cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
 
-install -d ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
+install -d ${RPM_BUILD_ROOT}%{blenderlib}/scripts
 
-cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
+cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
 
-install -m 644 release/VERSION ${RPM_BUILD_ROOT}/%{blenderlib}
-install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}/%{blenderlib}
-install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}/%{blenderlib}
+install -m 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib}
+install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib}
+install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}%{blenderlib}
 
 install -p -D -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/import-3ds-0.7.py
 install -p -D -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/export-3ds-0.71.py
@@ -172,11 +172,11 @@
 # Install plugins
 #
 
-install -d ${RPM_BUILD_ROOT}/%{plugins}/sequence
-install -d ${RPM_BUILD_ROOT}/%{plugins}/texture
+install -d ${RPM_BUILD_ROOT}%{plugins}/sequence
+install -d ${RPM_BUILD_ROOT}%{plugins}/texture
 
-install -s -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}/%{plugins}/sequence
-install -s -m 644 release/plugins/texture/*.so ${RPM_BUILD_ROOT}/%{plugins}/texture
+install -s -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{plugins}/sequence
+install -s -m 644 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{plugins}/texture
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -191,8 +191,8 @@
 #
 # Create link to DejaVu-Sans
 #
-rm ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf
-(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf)
+rm ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf
+(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf)
 
 %find_lang %name
 
@@ -227,7 +227,14 @@
 %{_bindir}/blenderplayer.bin
 
 %changelog
-* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.48a-19
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-21
+- Chamge BR mesa-libGL* into libGL* 
+
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-20
+- Remove x264 from source tar ball
+- Some cosmetic changes
+
+* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-19
 - Change nonfree to freeworld
 
 * Tue Mar 31 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-18


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Oct 2008 19:19:05 -0000	1.21
+++ sources	20 Apr 2009 17:43:31 -0000	1.22
@@ -1 +1 @@
-ede2f9466b62e980f9ef87925e463976  blender-2.48a-noffmpeg.tar.gz
+cac955e60dc8e36113dfda3c068b661a  blender-2.48a-noffmpeg.tar.gz



From davej at fedoraproject.org  Mon Apr 20 17:43:57 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 20 Apr 2009 17:43:57 +0000 (UTC)
Subject: rpms/kernel/devel .cvsignore, 1.1052, 1.1053 kernel.spec, 1.1522,
	1.1523 linux-2.6-defaults-pci_no_msi.patch, 1.4, 1.5 upstream,
	1.925, 1.926 at76-netdev_ops.patch, 1.1,
	NONE linux-2.6.29-pat-fixes.patch, 1.2, NONE
Message-ID: <20090420174357.F41F670102@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23795

Modified Files:
	.cvsignore kernel.spec linux-2.6-defaults-pci_no_msi.patch 
	upstream 
Removed Files:
	at76-netdev_ops.patch linux-2.6.29-pat-fixes.patch 
Log Message:
2.6.30-rc2-git6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1052
retrieving revision 1.1053
diff -u -r1.1052 -r1.1053
--- .cvsignore	17 Apr 2009 16:41:26 -0000	1.1052
+++ .cvsignore	20 Apr 2009 17:43:26 -0000	1.1053
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git3.bz2
+patch-2.6.30-rc2-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- kernel.spec	18 Apr 2009 04:09:54 -0000	1.1522
+++ kernel.spec	20 Apr 2009 17:43:26 -0000	1.1523
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 3
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -634,7 +634,6 @@
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-Patch684: at76-netdev_ops.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -675,9 +674,6 @@
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
-# http://bugs.freedesktop.org/show_bug.cgi?id=20803
-Patch9210: linux-2.6.29-pat-fixes.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1186,7 +1182,6 @@
 
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-ApplyPatch at76-netdev_ops.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -1229,8 +1224,6 @@
 
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
-ApplyPatch linux-2.6.29-pat-fixes.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1824,6 +1817,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Mon Apr 20 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git6
+
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
 - Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
 

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-defaults-pci_no_msi.patch	4 Feb 2009 17:50:39 -0000	1.4
+++ linux-2.6-defaults-pci_no_msi.patch	20 Apr 2009 17:43:27 -0000	1.5
@@ -1,10 +1,8 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index d8362cf..30d6053 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -1674,6 +1674,9 @@ and is between 256 and 4096 characters. It is defined in the file
+--- linux-2.6.29.noarch/Documentation/kernel-parameters.txt~	2009-04-20 13:36:09.000000000 -0400
++++ linux-2.6.29.noarch/Documentation/kernel-parameters.txt	2009-04-20 13:36:33.000000000 -0400
+@@ -1723,6 +1723,9 @@ and is between 256 and 4096 characters. 
  				root domains (aka PCI segments, in ACPI-speak).
- 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
+ 		nommconf	[X86] Disable use of MMCONFIG for PCI
  				Configuration
 +		msi		[MSI] If the PCI_MSI kernel config parameter is
 +				enabled, this kernel boot option can be used to


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- upstream	17 Apr 2009 16:41:29 -0000	1.925
+++ upstream	20 Apr 2009 17:43:27 -0000	1.926
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git3.bz2
+patch-2.6.30-rc2-git6.bz2


--- at76-netdev_ops.patch DELETED ---


--- linux-2.6.29-pat-fixes.patch DELETED ---



From davej at fedoraproject.org  Mon Apr 20 17:44:24 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 20 Apr 2009 17:44:24 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc2-git6.bz2.sign,NONE,1.1
Message-ID: <20090420174424.1453E70102@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24150

Added Files:
	patch-2.6.30-rc2-git6.bz2.sign 
Log Message:
2.6.30-rc2-git6


--- NEW FILE patch-2.6.30-rc2-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ672myGugalF9Dw4RAhtXAJ9/e86r7fDTpxRMRFoAO9synHwJxgCeMQVx
MUl2T1lPJAKulltd1gCIecM=
=FQMR
-----END PGP SIGNATURE-----



From kevin at fedoraproject.org  Mon Apr 20 17:48:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 17:48:35 +0000 (UTC)
Subject: rpms/xfconf/F-11 xfconf.spec, 1.10, 1.11 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090420174835.A929670102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfconf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25009

Modified Files:
	xfconf.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfconf.spec
===================================================================
RCS file: /cvs/extras/rpms/xfconf/F-11/xfconf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfconf.spec	2 Mar 2009 20:18:21 -0000	1.10
+++ xfconf.spec	20 Apr 2009 17:48:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xfconf
-Version:        4.6.0
-Release:        2%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -111,6 +111,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Move gtk-doc into devel package and mark it %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfconf/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 19:55:03 -0000	1.5
+++ sources	20 Apr 2009 17:48:05 -0000	1.6
@@ -1 +1 @@
-38595f78379eb1f456e97b393fdafd20  xfconf-4.6.0.tar.bz2
+d4d3018767ea9eb4b57cc57d4038023b  xfconf-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfconf/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 19:55:03 -0000	1.5
+++ .cvsignore	20 Apr 2009 17:48:05 -0000	1.6
@@ -1 +1 @@
-xfconf-4.6.0.tar.bz2
+xfconf-4.6.1.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 17:50:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 17:50:38 +0000 (UTC)
Subject: rpms/exo/F-11 exo.spec, 1.34, 1.35 sources, 1.11, 1.12 .cvsignore, 
	1.11, 1.12
Message-ID: <20090420175038.7D8A170102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25500

Modified Files:
	exo.spec sources .cvsignore 
Log Message:
Update to 0.3.101



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/F-11/exo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- exo.spec	2 Mar 2009 21:10:51 -0000	1.34
+++ exo.spec	20 Apr 2009 17:50:07 -0000	1.35
@@ -2,13 +2,13 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.100
-Release: 2%{?dist}
+Version: 0.3.101
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.0/src/exo-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,6 +134,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-1
+- Update to 0.3.101
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.100-2
 - Fix directory ownership problems
 - Move exo-csource into devel package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Feb 2009 20:06:13 -0000	1.11
+++ sources	20 Apr 2009 17:50:07 -0000	1.12
@@ -1 +1 @@
-ebded97ff55f43cd0fe6b16242992ecf  exo-0.3.100.tar.bz2
+1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Feb 2009 20:06:13 -0000	1.11
+++ .cvsignore	20 Apr 2009 17:50:07 -0000	1.12
@@ -1 +1 @@
-exo-0.3.100.tar.bz2
+exo-0.3.101.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 17:51:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 17:51:59 +0000 (UTC)
Subject: rpms/libxfce4menu/F-11 libxfce4menu.spec, 1.6, 1.7 .cvsignore, 1.5, 
	1.6 sources, 1.5, 1.6
Message-ID: <20090420175159.8C2ED70102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4menu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25851

Modified Files:
	libxfce4menu.spec .cvsignore sources 
Log Message:
Update to 4.6.1



Index: libxfce4menu.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/F-11/libxfce4menu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libxfce4menu.spec	2 Mar 2009 21:00:22 -0000	1.6
+++ libxfce4menu.spec	20 Apr 2009 17:51:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libxfce4menu
-Version:        4.6.0
-Release:        2%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        A freedesktop.org compliant menu implementation for Xfce
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 %{_libdir}/pkgconfig/%{name}-0.1.pc
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Mark gtk-doc files as %%doc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 20:01:12 -0000	1.5
+++ .cvsignore	20 Apr 2009 17:51:29 -0000	1.6
@@ -1 +1 @@
-libxfce4menu-4.6.0.tar.bz2
+libxfce4menu-4.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 20:01:12 -0000	1.5
+++ sources	20 Apr 2009 17:51:29 -0000	1.6
@@ -1 +1 @@
-ff7f75ffa33debd3495b1156a55828a8  libxfce4menu-4.6.0.tar.bz2
+5dc9343885c2c6f931318b2a1cdcc9db  libxfce4menu-4.6.1.tar.bz2



From davej at fedoraproject.org  Mon Apr 20 17:52:29 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 20 Apr 2009 17:52:29 +0000 (UTC)
Subject: rpms/kernel/devel config-s390x,1.13,1.14 kernel.spec,1.1523,1.1524
Message-ID: <20090420175229.93BA270102@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25993

Modified Files:
	config-s390x kernel.spec 
Log Message:
Various s390x config tweaks. (#496596, #496601, #496605, #496607)


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-s390x	31 Mar 2009 01:14:01 -0000	1.13
+++ config-s390x	20 Apr 2009 17:51:59 -0000	1.14
@@ -5,6 +5,11 @@
 CONFIG_NR_CPUS=64
 CONFIG_COMPAT=y
 
+# See bug 496596
+CONFIG_HZ_100=y
+# See bug 496605
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 
@@ -29,7 +34,7 @@
 CONFIG_IPL_VM=y
 # CONFIG_PROCESS_DEBUG is not set
 CONFIG_PFAULT=y
-# CONFIG_SHARED_KERNEL is not set
+CONFIG_SHARED_KERNEL=y
 CONFIG_CMM=m
 CONFIG_CMM_PROC=y
 CONFIG_VIRT_TIMER=y
@@ -123,10 +128,6 @@
 # CONFIG_IEEE80211 is not set
 # CONFIG_B44 is not set
 
-# The s390 CPU does not have hardware support for big pages at all.
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-
 #
 # Partition Types
 #


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1523
retrieving revision 1.1524
diff -u -r1.1523 -r1.1524
--- kernel.spec	20 Apr 2009 17:43:26 -0000	1.1523
+++ kernel.spec	20 Apr 2009 17:51:59 -0000	1.1524
@@ -1818,6 +1818,9 @@
 #	                ||     ||
 %changelog
 * Mon Apr 20 2009 Dave Jones <davej at redhat.com>
+- Various s390x config tweaks. (#496596, #496601, #496605, #496607)
+
+* Mon Apr 20 2009 Dave Jones <davej at redhat.com>
 - 2.6.30-rc2-git6
 
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>



From cwickert at fedoraproject.org  Mon Apr 20 18:04:26 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 20 Apr 2009 18:04:26 +0000 (UTC)
Subject: rpms/menu-cache/F-11 .cvsignore, 1.3, 1.4 menu-cache.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090420180426.15BB470102@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/menu-cache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29558

Modified Files:
	.cvsignore menu-cache.spec sources 
Log Message:
* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
- Update to 0.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 20:13:30 -0000	1.3
+++ .cvsignore	20 Apr 2009 18:03:55 -0000	1.4
@@ -1 +1 @@
-menu-cache-0.2.3.tar.gz
+menu-cache-0.2.4.tar.gz


Index: menu-cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-11/menu-cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- menu-cache.spec	31 Mar 2009 20:22:41 -0000	1.5
+++ menu-cache.spec	20 Apr 2009 18:03:55 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           menu-cache
-Version:        0.2.3
+Version:        0.2.4
 Release:        1%{?dist}
 Summary:        Caching mechanism for freedesktop.org compliant menus
 
@@ -54,11 +54,12 @@
 
 %files
 %defattr(-,root,root,-)
-#FIXME: add ChangeLog if there is content
+#FIXME: add ChangeLog and NEWS if there is content
 %doc AUTHORS COPYING README
 %{_bindir}/menu-cache-gen
 %{_libexecdir}/menu-cached
 %{_libdir}/libmenu-cache.so.*
+%{_mandir}/man*/*.gz
 
 
 %files devel
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
+- Update to 0.2.4
+
 * Tue Mar 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-1
 - Update to 0.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2009 20:13:30 -0000	1.3
+++ sources	20 Apr 2009 18:03:55 -0000	1.4
@@ -1 +1 @@
-91d92b5b45927595a8750e5ab5915b40  menu-cache-0.2.3.tar.gz
+945b058433c3f5e921547e13ae30dd41  menu-cache-0.2.4.tar.gz



From limb at fedoraproject.org  Mon Apr 20 18:05:28 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 20 Apr 2009 18:05:28 +0000 (UTC)
Subject: rpms/wesnoth/devel .cvsignore, 1.36, 1.37 sources, 1.36,
	1.37 wesnoth.spec, 1.74, 1.75
Message-ID: <20090420180528.0C10E70102@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29987

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Mar 2009 13:27:55 -0000	1.36
+++ .cvsignore	20 Apr 2009 18:04:57 -0000	1.37
@@ -1 +1 @@
-wesnoth-1.6a.tar.bz2
+wesnoth-1.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	24 Mar 2009 13:27:55 -0000	1.36
+++ sources	20 Apr 2009 18:04:57 -0000	1.37
@@ -1 +1 @@
-3c4618eb64d1e5aeb6a00ab3956d5080  wesnoth-1.6a.tar.bz2
+6777ec9bfb44b1553a4b7dd2d12c0713  wesnoth-1.6.1.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- wesnoth.spec	24 Mar 2009 13:27:55 -0000	1.74
+++ wesnoth.spec	20 Apr 2009 18:04:57 -0000	1.75
@@ -1,12 +1,12 @@
 Name:           wesnoth
-Version:        1.6
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.wesnoth.org
-Source0:        http://www.%{name}.org/files/%{name}-%{version}a.tar.bz2
+Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
 Source1:        wesnothd.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-1.2.8-gcc43.patch
@@ -249,6 +249,9 @@
 #%endif
 
 %changelog
+* Mon Apr 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.6.1-1
+- 1.6.1 maintenance release.
+
 * Mon Mar 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.6-1
 - Update to 1.6 stable.
 



From mdehaan at fedoraproject.org  Mon Apr 20 18:10:57 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 18:10:57 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.53, 1.54 cobbler.spec, 1.66,
	1.67 sources, 1.66, 1.67
Message-ID: <20090420181057.EA3FF70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Mar 2009 15:29:11 -0000	1.53
+++ .cvsignore	20 Apr 2009 18:10:27 -0000	1.54
@@ -50,3 +50,4 @@
 cobbler-1.4.3.tar.gz
 cobbler-1.6.1.tar.gz
 cobbler-1.6.2.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- cobbler.spec	30 Mar 2009 15:29:11 -0000	1.66
+++ cobbler.spec	20 Apr 2009 18:10:27 -0000	1.67
@@ -3,12 +3,17 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.6.2
+Version: 1.7.0
 Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -50,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -64,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -89,6 +91,7 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -208,6 +211,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -217,6 +221,7 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
+%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -296,47 +301,13 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
-
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
-
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - Upstream changes (see CHANGELOG)
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
 - Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
+>>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	30 Mar 2009 15:29:11 -0000	1.66
+++ sources	20 Apr 2009 18:10:27 -0000	1.67
@@ -1,3 +1,4 @@
 d560692f78ca9b60d25c7ef79633fc5e  cobbler-1.4.3.tar.gz
 41cd0b61d1c148e953b879abe722b419  cobbler-1.6.1.tar.gz
 9ddcaa7c7fce9e572384f12025d713ed  cobbler-1.6.2.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 18:10:59 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 18:10:59 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.48, 1.49 cobbler.spec, 1.57,
	1.58 sources, 1.58, 1.59
Message-ID: <20090420181059.3EE3470102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	19 Dec 2008 17:33:19 -0000	1.48
+++ .cvsignore	20 Apr 2009 18:10:28 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cobbler.spec	19 Dec 2008 17:33:20 -0000	1.57
+++ cobbler.spec	20 Apr 2009 18:10:28 -0000	1.58
@@ -1,13 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define _binaries_in_noarch_packages_terminate_build 0
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -21,6 +27,11 @@
 Requires: createrepo
 Requires: python-cheetah
 Requires: rsync
+Requires: python-netaddr
+Requires: PyYAML
+Requires: python-simplejson
+BuildRequires: PyYAML
+Requires: libyaml
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
@@ -30,8 +41,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -44,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -83,6 +91,7 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -113,7 +122,7 @@
 %preun
 if [ $1 = 0 ]; then
     /sbin/service cobblerd stop >/dev/null 2>&1 || :
-    chkconfig --del cobblerd
+    chkconfig --del cobblerd || :
 fi
 
 %postun
@@ -157,8 +166,11 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/anamon
+/var/www/cobbler/aux/anamon.init
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -167,10 +179,14 @@
 
 %defattr(-,root,root)
 %dir /etc/cobbler
+%dir /etc/cobbler/pxe
+%dir /etc/cobbler/reporting
+%dir /etc/cobbler/power
 %config(noreplace) /var/lib/cobbler/kickstarts/*.ks
 %config(noreplace) /var/lib/cobbler/kickstarts/*.seed
 %config(noreplace) /etc/cobbler/*.template
 %config(noreplace) /etc/cobbler/pxe/*.template
+%config(noreplace) /etc/cobbler/reporting/*.template
 %config(noreplace) /etc/cobbler/power/*.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
@@ -179,11 +195,9 @@
 %config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
-%dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
 %dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
-%{python_sitelib}/cobbler/yaml/*.py*
 %{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
 %{python_sitelib}/cobbler/webui/*.py*
@@ -197,6 +211,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -206,9 +221,11 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
+%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
+%dir /var/lib/cobbler/triggers/change
 %dir /var/lib/cobbler/triggers/add
 %dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
@@ -243,11 +260,6 @@
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
 
-%defattr(744,root,root)
-%config(noreplace) /var/lib/cobbler/triggers/sync/post/restart-services.trigger
-%config(noreplace) /var/lib/cobbler/triggers/install/pre/status_pre.trigger
-%config(noreplace) /var/lib/cobbler/triggers/install/post/status_post.trigger
-
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
@@ -262,10 +274,18 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
+%config(noreplace) /var/lib/cobbler/snippets/post_anamon
+%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
+%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
+%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
+%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
+%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
 /var/lib/cobbler/yaboot-1.3.14
+/var/lib/cobbler/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -281,27 +301,13 @@
 
 %changelog
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
 - Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
+>>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Dec 2008 17:52:50 -0000	1.58
+++ sources	20 Apr 2009 18:10:28 -0000	1.59
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 18:10:58 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 18:10:58 +0000 (UTC)
Subject: rpms/cobbler/F-10 .cvsignore, 1.53, 1.54 cobbler.spec, 1.71,
	1.72 sources, 1.67, 1.68
Message-ID: <20090420181058.BEE8970102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/F-10

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Mar 2009 15:29:12 -0000	1.53
+++ .cvsignore	20 Apr 2009 18:10:28 -0000	1.54
@@ -50,3 +50,4 @@
 cobbler-1.4.3.tar.gz
 cobbler-1.6.1.tar.gz
 cobbler-1.6.2.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cobbler.spec	30 Mar 2009 15:29:12 -0000	1.71
+++ cobbler.spec	20 Apr 2009 18:10:28 -0000	1.72
@@ -3,12 +3,17 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.6.2
+Version: 1.7.0
 Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -50,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -64,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -89,6 +91,7 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -208,6 +211,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -217,6 +221,7 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
+%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -296,47 +301,13 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
-
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
-
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - Upstream changes (see CHANGELOG)
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
 - Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
+>>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	30 Mar 2009 15:29:12 -0000	1.67
+++ sources	20 Apr 2009 18:10:28 -0000	1.68
@@ -1,3 +1,4 @@
 d560692f78ca9b60d25c7ef79633fc5e  cobbler-1.4.3.tar.gz
 41cd0b61d1c148e953b879abe722b419  cobbler-1.6.1.tar.gz
 9ddcaa7c7fce9e572384f12025d713ed  cobbler-1.6.2.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 18:11:00 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 18:11:00 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.53, 1.54 cobbler.spec, 1.68,
	1.69 sources, 1.65, 1.66
Message-ID: <20090420181100.27E6E70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/F-9

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Mar 2009 15:29:13 -0000	1.53
+++ .cvsignore	20 Apr 2009 18:10:29 -0000	1.54
@@ -50,3 +50,4 @@
 cobbler-1.4.3.tar.gz
 cobbler-1.6.1.tar.gz
 cobbler-1.6.2.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cobbler.spec	30 Mar 2009 15:29:13 -0000	1.68
+++ cobbler.spec	20 Apr 2009 18:10:29 -0000	1.69
@@ -3,12 +3,17 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.6.2
+Version: 1.7.0
 Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -50,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -64,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -89,6 +91,7 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -208,6 +211,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -217,6 +221,7 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
+%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -296,47 +301,13 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
-
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
-
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - Upstream changes (see CHANGELOG)
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
 - Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
+>>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	30 Mar 2009 15:29:13 -0000	1.65
+++ sources	20 Apr 2009 18:10:29 -0000	1.66
@@ -1,3 +1,4 @@
 d560692f78ca9b60d25c7ef79633fc5e  cobbler-1.4.3.tar.gz
 41cd0b61d1c148e953b879abe722b419  cobbler-1.6.1.tar.gz
 9ddcaa7c7fce9e572384f12025d713ed  cobbler-1.6.2.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 18:10:58 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 18:10:58 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.57, 1.58 cobbler.spec, 1.68,
	1.69 sources, 1.69, 1.70
Message-ID: <20090420181058.2C0A670102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	30 Mar 2009 15:29:12 -0000	1.57
+++ .cvsignore	20 Apr 2009 18:10:27 -0000	1.58
@@ -54,3 +54,4 @@
 cobbler-1.4.3.tar.gz
 cobbler-1.6.1.tar.gz
 cobbler-1.6.2.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cobbler.spec	30 Mar 2009 15:29:12 -0000	1.68
+++ cobbler.spec	20 Apr 2009 18:10:27 -0000	1.69
@@ -3,12 +3,17 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.6.2
+Version: 1.7.0
 Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -50,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -64,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -89,6 +91,7 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -208,6 +211,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -217,6 +221,7 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
+%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -296,47 +301,13 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
-
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
-
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - Upstream changes (see CHANGELOG)
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
 - Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
+>>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	30 Mar 2009 15:29:12 -0000	1.69
+++ sources	20 Apr 2009 18:10:27 -0000	1.70
@@ -1,3 +1,4 @@
 d560692f78ca9b60d25c7ef79633fc5e  cobbler-1.4.3.tar.gz
 41cd0b61d1c148e953b879abe722b419  cobbler-1.6.1.tar.gz
 9ddcaa7c7fce9e572384f12025d713ed  cobbler-1.6.2.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 18:11:00 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 18:11:00 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.53, 1.54 cobbler.spec, 1.79,
	1.80 sources, 1.67, 1.68
Message-ID: <20090420181100.D998070102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Mar 2009 15:29:13 -0000	1.53
+++ .cvsignore	20 Apr 2009 18:10:30 -0000	1.54
@@ -50,3 +50,4 @@
 cobbler-1.4.3.tar.gz
 cobbler-1.6.1.tar.gz
 cobbler-1.6.2.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- cobbler.spec	30 Mar 2009 15:29:13 -0000	1.79
+++ cobbler.spec	20 Apr 2009 18:10:30 -0000	1.80
@@ -3,12 +3,17 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.6.2
+Version: 1.7.0
 Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -50,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -64,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -89,6 +91,7 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -208,6 +211,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -217,6 +221,7 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
+%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -296,47 +301,13 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
-
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
-
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - Upstream changes (see CHANGELOG)
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
 - Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
+>>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	30 Mar 2009 15:29:13 -0000	1.67
+++ sources	20 Apr 2009 18:10:30 -0000	1.68
@@ -1,3 +1,4 @@
 d560692f78ca9b60d25c7ef79633fc5e  cobbler-1.4.3.tar.gz
 41cd0b61d1c148e953b879abe722b419  cobbler-1.6.1.tar.gz
 9ddcaa7c7fce9e572384f12025d713ed  cobbler-1.6.2.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz



From jhrozek at fedoraproject.org  Mon Apr 20 18:17:49 2009
From: jhrozek at fedoraproject.org (Jakub Hrozek)
Date: Mon, 20 Apr 2009 18:17:49 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 sssd.spec,
	1.10, 
	1.11 0001-Add-reconnection-code-between-the-NSS-responder-and.patch, 
	1.1,
	NONE 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch, 
	1.1,
	NONE 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch, 
	1.1, NONE 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch,
	1.1, NONE 0005-Fixing-memory-issues-in-ini-and-collection.patch,
	1.1, NONE
Message-ID: <20090420181750.01D6F70102@cvs1.fedora.phx.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1005

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	0001-Add-reconnection-code-between-the-NSS-responder-and.patch 
	0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch 
	0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch 
	0004-Add-common-function-to-retrieve-comma-sep.-lists.patch 
	0005-Fixing-memory-issues-in-ini-and-collection.patch 
Log Message:
Update to 0.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Apr 2009 22:37:11 -0000	1.6
+++ .cvsignore	20 Apr 2009 18:17:19 -0000	1.7
@@ -1 +1 @@
-sssd-0.3.1.tar.gz
+sssd-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sssd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Apr 2009 22:37:11 -0000	1.6
+++ sources	20 Apr 2009 18:17:19 -0000	1.7
@@ -1 +1 @@
-c46bcc028e10c7da3fd0057a038a023f  sssd-0.3.1.tar.gz
+3bfe3145c3ea71fb35d82bae5f7adc47  sssd-0.3.2.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/extras/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sssd.spec	14 Apr 2009 21:53:40 -0000	1.10
+++ sssd.spec	20 Apr 2009 18:17:19 -0000	1.11
@@ -1,6 +1,6 @@
 Name: sssd
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.3.2
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -13,11 +13,6 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
-Patch101: 0001-Add-reconnection-code-between-the-NSS-responder-and.patch
-Patch102: 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch
-Patch103: 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch
-Patch104: 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch
-Patch105: 0005-Fixing-memory-issues-in-ini-and-collection.patch
 
 ### Dependencies ###
 
@@ -56,11 +51,6 @@
 %prep
 %setup -q
 
-%patch101 -p1 -b .reconnect
-%patch102 -p1 -b .examples
-%patch103 -p1 -b .global_reconnect_option
-%patch104 -p1 -b .fix_filters
-%patch105 -p1 -b .fix_mem_issues
 
 %build
 
@@ -104,7 +94,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-install -m700 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -149,6 +139,11 @@
 fi
 
 %changelog
+* Mon Apr 20 2009 Jakub Hrozek <jhrozek at redhat.com> - 0.3.2-1
+- bugfix release 0.3.2
+- includes previous release patches
+- change permissions of the /etc/sssd/sssd.conf to 0600
+
 * Tue Apr 14 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-2
 - Add last minute bug fixes, found in testing the package
 


--- 0001-Add-reconnection-code-between-the-NSS-responder-and.patch DELETED ---


--- 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch DELETED ---


--- 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch DELETED ---


--- 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch DELETED ---


--- 0005-Fixing-memory-issues-in-ini-and-collection.patch DELETED ---



From steved at fedoraproject.org  Mon Apr 20 18:21:11 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 20 Apr 2009 18:21:11 +0000 (UTC)
Subject: rpms/nfs-utils/devel .cvsignore, 1.25, 1.26 nfs-utils.spec, 1.221, 
	1.222 sources, 1.26, 1.27 nfs-utils-1-1-6-rc2.patch, 1.1,
	NONE nfs-utils-1-1-6-rc3.patch, 1.1,
	NONE nfs-utils-1.1.0-mount-fsc.patch, 1.1,
	NONE nfs-utils-1.1.5-tcpwrap-externs.patch, 1.1, NONE
Message-ID: <20090420182111.A9C8770102@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1669

Modified Files:
	.cvsignore nfs-utils.spec sources 
Removed Files:
	nfs-utils-1-1-6-rc2.patch nfs-utils-1-1-6-rc3.patch 
	nfs-utils-1.1.0-mount-fsc.patch 
	nfs-utils-1.1.5-tcpwrap-externs.patch 
Log Message:
Updated to latest upstream release: 1.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Mar 2009 12:57:00 -0000	1.25
+++ .cvsignore	20 Apr 2009 18:20:40 -0000	1.26
@@ -1,17 +1,2 @@
-nfs-utils-1.0.8-rc2.tar.gz
-librpcsecgss-0.7.tar.gz
-libgssapi-0.7.tar.gz
-libnfsidmap-0.12.tar.gz
 nfs.doc.tar.gz
-nfs-utils-1.0.8-rc4.tar.gz
-nfs-utils-1.0.8.tar.gz
-nfs-utils-1.0.9.tar.bz2
-nfs-utils-1.0.10.tar.bz2
-nfs-utils-1.0.11.tar.bz2
-nfs-utils-1.0.12.tar.bz2
-nfs-utils-1.1.0.tar.bz2
-nfs-utils-1.1.1.tar.bz2
-nfs-utils-1.1.2.tar.bz2
-nfs-utils-1.1.3.tar.bz2
-nfs-utils-1.1.4.tar.bz2
-nfs-utils-1.1.5.tar.bz2
+nfs-utils-1.1.6.tar.bz2


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- nfs-utils.spec	23 Mar 2009 21:19:53 -0000	1.221
+++ nfs-utils.spec	20 Apr 2009 18:20:40 -0000	1.222
@@ -1,17 +1,13 @@
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
-Version: 1.1.5
-Release: 4%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon ppc sparcv9
 
-# Enable the ability to set the 'fsc' mount flag which
-# will allow NFS to use FS-Cache.
-%define enablefscache 0
-
 Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
@@ -26,14 +22,6 @@
 Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
-Patch100: nfs-utils-1.1.5-tcpwrap-externs.patch
-Patch101: nfs-utils-1-1-6-rc2.patch
-Patch102: nfs-utils-1-1-6-rc3.patch
-
-%if %{enablefscache}
-Patch90: nfs-utils-1.1.0-mount-fsc.patch
-%endif
-
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
 Provides: nfsstat     = %{epoch}:%{version}-%{release}
@@ -83,14 +71,6 @@
 %patch01 -p1
 %patch02 -p1
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-
-%if %{enablefscache}
-%patch90 -p1
-%endif
-
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -249,6 +229,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Apr 20 2009 Steve Dickson <steved at redhat.com> 1.1.6-1
+- Updated to latest upstream release: 1.1.6
+
 * Mon Mar 23 2009 Steve Dickson <steved at redhat.com> 1.1.5-4
 - Added upstream rc3 patch
   - gssd: initialize fakeseed in prepare_krb5_rfc1964_buffer


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	5 Mar 2009 12:57:02 -0000	1.26
+++ sources	20 Apr 2009 18:20:40 -0000	1.27
@@ -1,2 +1,3 @@
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
 2848072a5e53840b9bc520fbb6782b57  nfs-utils-1.1.5.tar.bz2
+b0d1b8ec5c8c081a340cfc77bb8670cd  nfs-utils-1.1.6.tar.bz2


--- nfs-utils-1-1-6-rc2.patch DELETED ---


--- nfs-utils-1-1-6-rc3.patch DELETED ---


--- nfs-utils-1.1.0-mount-fsc.patch DELETED ---


--- nfs-utils-1.1.5-tcpwrap-externs.patch DELETED ---



From imain at fedoraproject.org  Mon Apr 20 18:25:11 2009
From: imain at fedoraproject.org (Ian Main)
Date: Mon, 20 Apr 2009 18:25:11 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-10 .cvsignore, 1.2, 1.3 libvirt-qpid.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090420182511.333EE70102@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2561

Modified Files:
	.cvsignore libvirt-qpid.spec sources 
Log Message:
New version of libvirt-qpid, fixes segfault bug.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2009 18:43:39 -0000	1.2
+++ .cvsignore	20 Apr 2009 18:24:40 -0000	1.3
@@ -1 +1 @@
-libvirt-qpid-0.2.12.tar.gz
+libvirt-qpid-0.2.13.tar.gz


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-10/libvirt-qpid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libvirt-qpid.spec	26 Mar 2009 19:04:59 -0000	1.2
+++ libvirt-qpid.spec	20 Apr 2009 18:24:40 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.12
-Release: 3%{?dist}
+Version: 0.2.13
+Release: 1%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,10 @@
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
+- Add throws to constructors in case one of the libvirt calls
+  fails.  Pretty sure this was the cause of some segfaults.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.12-3
 - Added dist to release version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Mar 2009 19:04:59 -0000	1.3
+++ sources	20 Apr 2009 18:24:40 -0000	1.4
@@ -1 +1 @@
-0fee3e5066711465ec4b611733c7a90a  libvirt-qpid-0.2.12.tar.gz
+fb2a23ec191ac56880ac6d00004c4a3c  libvirt-qpid-0.2.13.tar.gz



From imain at fedoraproject.org  Mon Apr 20 18:28:30 2009
From: imain at fedoraproject.org (Ian Main)
Date: Mon, 20 Apr 2009 18:28:30 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-9 .cvsignore, 1.2, 1.3 libvirt-qpid.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090420182830.C0E4A70102@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3423

Modified Files:
	.cvsignore libvirt-qpid.spec sources 
Log Message:
New version of libvirt-qpid fixes segfault.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2009 19:06:16 -0000	1.2
+++ .cvsignore	20 Apr 2009 18:28:00 -0000	1.3
@@ -1 +1 @@
-libvirt-qpid-0.2.12.tar.gz
+libvirt-qpid-0.2.13.tar.gz


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-9/libvirt-qpid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libvirt-qpid.spec	26 Mar 2009 19:06:17 -0000	1.1
+++ libvirt-qpid.spec	20 Apr 2009 18:28:00 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.12
-Release: 3%{?dist}
+Version: 0.2.13
+Release: 1%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,10 @@
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
+- Add throws to constructors in case one of the libvirt calls
+  fails.  Pretty sure this was the cause of some segfaults.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.12-3
 - Added dist to release version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Mar 2009 19:06:17 -0000	1.2
+++ sources	20 Apr 2009 18:28:00 -0000	1.3
@@ -1 +1 @@
-0fee3e5066711465ec4b611733c7a90a  libvirt-qpid-0.2.12.tar.gz
+fb2a23ec191ac56880ac6d00004c4a3c  libvirt-qpid-0.2.13.tar.gz



From jhrozek at fedoraproject.org  Mon Apr 20 18:29:37 2009
From: jhrozek at fedoraproject.org (Jakub Hrozek)
Date: Mon, 20 Apr 2009 18:29:37 +0000 (UTC)
Subject: rpms/sssd/F-11 sssd.spec, 1.10,
	1.11 0001-Add-reconnection-code-between-the-NSS-responder-and.patch, 
	1.1,
	NONE 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch, 
	1.1,
	NONE 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch, 
	1.1, NONE 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch,
	1.1, NONE 0005-Fixing-memory-issues-in-ini-and-collection.patch,
	1.1, NONE
Message-ID: <20090420182937.73CBF70102@cvs1.fedora.phx.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3685

Modified Files:
	sssd.spec 
Removed Files:
	0001-Add-reconnection-code-between-the-NSS-responder-and.patch 
	0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch 
	0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch 
	0004-Add-common-function-to-retrieve-comma-sep.-lists.patch 
	0005-Fixing-memory-issues-in-ini-and-collection.patch 
Log Message:
Update to 0.3.2


Index: sssd.spec
===================================================================
RCS file: /cvs/extras/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sssd.spec	14 Apr 2009 21:53:40 -0000	1.10
+++ sssd.spec	20 Apr 2009 18:29:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name: sssd
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.3.2
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -13,11 +13,6 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
-Patch101: 0001-Add-reconnection-code-between-the-NSS-responder-and.patch
-Patch102: 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch
-Patch103: 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch
-Patch104: 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch
-Patch105: 0005-Fixing-memory-issues-in-ini-and-collection.patch
 
 ### Dependencies ###
 
@@ -56,11 +51,6 @@
 %prep
 %setup -q
 
-%patch101 -p1 -b .reconnect
-%patch102 -p1 -b .examples
-%patch103 -p1 -b .global_reconnect_option
-%patch104 -p1 -b .fix_filters
-%patch105 -p1 -b .fix_mem_issues
 
 %build
 
@@ -104,7 +94,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-install -m700 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -149,6 +139,11 @@
 fi
 
 %changelog
+* Mon Apr 20 2009 Jakub Hrozek <jhrozek at redhat.com> - 0.3.2-1
+- bugfix release 0.3.2
+- includes previous release patches
+- change permissions of the /etc/sssd/sssd.conf to 0600
+
 * Tue Apr 14 2009 Simo Sorce <ssorce at redhat.com> - 0.3.1-2
 - Add last minute bug fixes, found in testing the package
 


--- 0001-Add-reconnection-code-between-the-NSS-responder-and.patch DELETED ---


--- 0002-Replace-the-example-sssd.conf-file-with-the-one-used.patch DELETED ---


--- 0003-Make-reconnection-to-the-Data-Provider-a-global-sett.patch DELETED ---


--- 0004-Add-common-function-to-retrieve-comma-sep.-lists.patch DELETED ---


--- 0005-Fixing-memory-issues-in-ini-and-collection.patch DELETED ---



From jhrozek at fedoraproject.org  Mon Apr 20 18:30:50 2009
From: jhrozek at fedoraproject.org (Jakub Hrozek)
Date: Mon, 20 Apr 2009 18:30:50 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090420183050.E393970102@cvs1.fedora.phx.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4043

Modified Files:
	.cvsignore sources 
Log Message:
commit the sources file for 0.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Apr 2009 22:37:11 -0000	1.6
+++ .cvsignore	20 Apr 2009 18:30:49 -0000	1.7
@@ -1 +1,2 @@
 sssd-0.3.1.tar.gz
+sssd-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sssd/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Apr 2009 22:37:11 -0000	1.6
+++ sources	20 Apr 2009 18:30:49 -0000	1.7
@@ -1 +1,2 @@
 c46bcc028e10c7da3fd0057a038a023f  sssd-0.3.1.tar.gz
+3bfe3145c3ea71fb35d82bae5f7adc47  sssd-0.3.2.tar.gz



From limb at fedoraproject.org  Mon Apr 20 18:32:53 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 20 Apr 2009 18:32:53 +0000 (UTC)
Subject: rpms/wesnoth/devel wesnoth.spec,1.75,1.76
Message-ID: <20090420183253.D57D470102@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4616

Modified Files:
	wesnoth.spec 
Log Message:
f00fed the setup name, dagnabbit.



Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- wesnoth.spec	20 Apr 2009 18:04:57 -0000	1.75
+++ wesnoth.spec	20 Apr 2009 18:32:52 -0000	1.76
@@ -83,7 +83,7 @@
 ##%endif
 
 %prep
-%setup -qn wesnoth-1.6a
+%setup -qn wesnoth-%{version}
 %patch0 -p1 -b .gcc43
 %patch1 -p0
 autoreconf



From imain at fedoraproject.org  Mon Apr 20 18:34:02 2009
From: imain at fedoraproject.org (Ian Main)
Date: Mon, 20 Apr 2009 18:34:02 +0000 (UTC)
Subject: rpms/libvirt-qpid/devel .cvsignore, 1.2, 1.3 libvirt-qpid.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090420183403.0844270102@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5038

Modified Files:
	.cvsignore libvirt-qpid.spec sources 
Log Message:
new libvirt-qpid fixes segfault.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2009 18:40:03 -0000	1.2
+++ .cvsignore	20 Apr 2009 18:33:31 -0000	1.3
@@ -1 +1 @@
-libvirt-qpid-0.2.12.tar.gz
+libvirt-qpid-0.2.13.tar.gz


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/libvirt-qpid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libvirt-qpid.spec	26 Mar 2009 19:03:10 -0000	1.2
+++ libvirt-qpid.spec	20 Apr 2009 18:33:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.12
-Release: 3%{?dist}
+Version: 0.2.13
+Release: 1%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,10 @@
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
+- Add throws to constructors in case one of the libvirt calls
+  fails.  Pretty sure this was the cause of some segfaults.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.12-3
 - Added dist to release version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Mar 2009 19:03:10 -0000	1.3
+++ sources	20 Apr 2009 18:33:32 -0000	1.4
@@ -1 +1 @@
-0fee3e5066711465ec4b611733c7a90a  libvirt-qpid-0.2.12.tar.gz
+fb2a23ec191ac56880ac6d00004c4a3c  libvirt-qpid-0.2.13.tar.gz



From denis at fedoraproject.org  Mon Apr 20 18:42:43 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 20 Apr 2009 18:42:43 +0000 (UTC)
Subject: rpms/nautilus-cd-burner/F-11 .cvsignore, 1.58, NONE Makefile, 1.2, 
	NONE extensionsdir.patch, 1.1,
	NONE nautilus-cd-burner-2.11.4-c++.patch, 1.1,
	NONE nautilus-cd-burner-2.13.91-iso.patch, 1.1,
	NONE nautilus-cd-burner-2.15.4-dbus-disconnect.patch, 1.1,
	NONE nautilus-cd-burner-2.22.0-sync.patch, 1.1,
	NONE nautilus-cd-burner-2.9.6-hal-api.patch, 1.1,
	NONE nautilus-cd-burner-2.9.6-lockfixes.patch, 1.1,
	NONE nautilus-cd-burner.spec, 1.114, NONE sources, 1.58,
	NONE x-content.patch, 1.1, NONE
Message-ID: <20090420184243.3495170102@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/nautilus-cd-burner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7179/F-11

Removed Files:
	.cvsignore Makefile extensionsdir.patch 
	nautilus-cd-burner-2.11.4-c++.patch 
	nautilus-cd-burner-2.13.91-iso.patch 
	nautilus-cd-burner-2.15.4-dbus-disconnect.patch 
	nautilus-cd-burner-2.22.0-sync.patch 
	nautilus-cd-burner-2.9.6-hal-api.patch 
	nautilus-cd-burner-2.9.6-lockfixes.patch 
	nautilus-cd-burner.spec sources x-content.patch 
Log Message:
Orphaning nautilus-cd-burner, replaced by brasero-nautilus


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- extensionsdir.patch DELETED ---


--- nautilus-cd-burner-2.11.4-c++.patch DELETED ---


--- nautilus-cd-burner-2.13.91-iso.patch DELETED ---


--- nautilus-cd-burner-2.15.4-dbus-disconnect.patch DELETED ---


--- nautilus-cd-burner-2.22.0-sync.patch DELETED ---


--- nautilus-cd-burner-2.9.6-hal-api.patch DELETED ---


--- nautilus-cd-burner-2.9.6-lockfixes.patch DELETED ---


--- nautilus-cd-burner.spec DELETED ---


--- sources DELETED ---


--- x-content.patch DELETED ---



From denis at fedoraproject.org  Mon Apr 20 18:42:44 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 20 Apr 2009 18:42:44 +0000 (UTC)
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.58, NONE Makefile, 1.2, 
	NONE extensionsdir.patch, 1.1,
	NONE nautilus-cd-burner-2.11.4-c++.patch, 1.1,
	NONE nautilus-cd-burner-2.13.91-iso.patch, 1.1,
	NONE nautilus-cd-burner-2.15.4-dbus-disconnect.patch, 1.1,
	NONE nautilus-cd-burner-2.22.0-sync.patch, 1.1,
	NONE nautilus-cd-burner-2.9.6-hal-api.patch, 1.1,
	NONE nautilus-cd-burner-2.9.6-lockfixes.patch, 1.1,
	NONE nautilus-cd-burner.spec, 1.114, NONE sources, 1.58,
	NONE x-content.patch, 1.1, NONE
Message-ID: <20090420184244.A514670102@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7179/devel

Removed Files:
	.cvsignore Makefile extensionsdir.patch 
	nautilus-cd-burner-2.11.4-c++.patch 
	nautilus-cd-burner-2.13.91-iso.patch 
	nautilus-cd-burner-2.15.4-dbus-disconnect.patch 
	nautilus-cd-burner-2.22.0-sync.patch 
	nautilus-cd-burner-2.9.6-hal-api.patch 
	nautilus-cd-burner-2.9.6-lockfixes.patch 
	nautilus-cd-burner.spec sources x-content.patch 
Log Message:
Orphaning nautilus-cd-burner, replaced by brasero-nautilus


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- extensionsdir.patch DELETED ---


--- nautilus-cd-burner-2.11.4-c++.patch DELETED ---


--- nautilus-cd-burner-2.13.91-iso.patch DELETED ---


--- nautilus-cd-burner-2.15.4-dbus-disconnect.patch DELETED ---


--- nautilus-cd-burner-2.22.0-sync.patch DELETED ---


--- nautilus-cd-burner-2.9.6-hal-api.patch DELETED ---


--- nautilus-cd-burner-2.9.6-lockfixes.patch DELETED ---


--- nautilus-cd-burner.spec DELETED ---


--- sources DELETED ---


--- x-content.patch DELETED ---



From spot at fedoraproject.org  Mon Apr 20 18:42:48 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 18:42:48 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 fedora-logos.spec, 1.124, 1.125 sources, 1.95,
	1.96
Message-ID: <20090420184248.8808E70102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7103/F-11

Modified Files:
	fedora-logos.spec sources 
Log Message:
fix missing progress files


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fedora-logos.spec	19 Apr 2009 18:57:13 -0000	1.124
+++ fedora-logos.spec	20 Apr 2009 18:42:17 -0000	1.125
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.1
-Release: 2%{?dist}
+Version: 11.0.2
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -39,9 +39,6 @@
 %setup -q
 
 %build
-# Accidentally doubly-gzipped
-gunzip bootloader/splash.xpm.gz
-mv bootloader/splash.xpm{,.gz}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -186,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.2-1
+- fix missing progress files
+
 * Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 11.0.1-2
 - fix bootsplash to be a bit more psychadelic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	17 Apr 2009 18:35:36 -0000	1.95
+++ sources	20 Apr 2009 18:42:17 -0000	1.96
@@ -1 +1 @@
-c6c7c1e80583941114a716101c86b6ae  fedora-logos-11.0.1.tar.bz2
+a71455c966d25b315cb409d950b78485  fedora-logos-11.0.2.tar.bz2



From spot at fedoraproject.org  Mon Apr 20 18:42:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 20 Apr 2009 18:42:49 +0000 (UTC)
Subject: rpms/fedora-logos/devel .cvsignore, 1.84, 1.85 fedora-logos.spec,
	1.124, 1.125 sources, 1.95, 1.96
Message-ID: <20090420184249.D276570102@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7103/devel

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
fix missing progress files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	17 Apr 2009 18:35:36 -0000	1.84
+++ .cvsignore	20 Apr 2009 18:42:18 -0000	1.85
@@ -1 +1 @@
-fedora-logos-11.0.1.tar.bz2
+fedora-logos-11.0.2.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fedora-logos.spec	19 Apr 2009 18:57:14 -0000	1.124
+++ fedora-logos.spec	20 Apr 2009 18:42:18 -0000	1.125
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.1
-Release: 2%{?dist}
+Version: 11.0.2
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -39,9 +39,6 @@
 %setup -q
 
 %build
-# Accidentally doubly-gzipped
-gunzip bootloader/splash.xpm.gz
-mv bootloader/splash.xpm{,.gz}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -186,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.2-1
+- fix missing progress files
+
 * Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 11.0.1-2
 - fix bootsplash to be a bit more psychadelic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	17 Apr 2009 18:35:37 -0000	1.95
+++ sources	20 Apr 2009 18:42:18 -0000	1.96
@@ -1 +1 @@
-c6c7c1e80583941114a716101c86b6ae  fedora-logos-11.0.1.tar.bz2
+a71455c966d25b315cb409d950b78485  fedora-logos-11.0.2.tar.bz2



From kyle at fedoraproject.org  Mon Apr 20 19:10:50 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 20 Apr 2009 19:10:50 +0000 (UTC)
Subject: rpms/kernel/F-11 git-bluetooth2.patch, NONE, 1.1 kernel.spec, 1.1563,
	1.1564
Message-ID: <20090420191050.7015A70102@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13003

Modified Files:
	kernel.spec 
Added Files:
	git-bluetooth2.patch 
Log Message:
* Mon Apr 20 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-102
- git-bluetooth2.patch: Bluetooth fixes from 2.6.30-rc2.


git-bluetooth2.patch:

--- NEW FILE git-bluetooth2.patch ---
commit 9499237a1c42a27fbcc7ed1d59e34df2b574cdfb
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Sun Apr 19 19:30:03 2009 +0200

    Bluetooth: Add workaround for wrong HCI event in eSCO setup
    
    The Broadcom chips with 2.1 firmware handle the fallback case to a SCO
    link wrongly when setting up eSCO connections.
    
      < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17
          handle 11 voice setting 0x0060
      > HCI Event: Command Status (0x0f) plen 4
          Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      > HCI Event: Connect Complete (0x03) plen 11
          status 0x00 handle 1 bdaddr 00:1E:3A:xx:xx:xx type SCO encrypt 0x01
    
    The Link Manager negotiates the fallback to SCO, but then sends out
    a Connect Complete event. This is wrong and the Link Manager should
    actually send a Synchronous Connection Complete event if the Setup
    Synchronous Connection has been used. Only the remote side is allowed
    to use Connect Complete to indicate the missing support for eSCO in
    the host stack.
    
    This patch adds a workaround for this which clearly should not be
    needed, but reality is that broken Broadcom devices are deployed.
    
    Based on a report by Ville Tervo <ville.tervo at nokia.com>
    
    Signed-off-by: Marcel Holtman <marcel at holtmann.org>

commit 732547f96ea2442965a24e0ed529d285321a0fff
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Sun Apr 19 19:14:14 2009 +0200

    Bluetooth: Fallback from eSCO to SCO on unspecified error
    
    Some Bluetooth chips (like the ones from Texas Instruments) don't do
    proper eSCO negotiations inside the Link Manager. They just return an
    error code and in case of the Kyocera ED-8800 headset it is just a
    random error.
    
      < HCI Command: Setup Synchronous Connection 0x01|0x0028) plen 17
        handle 1 voice setting 0x0060
      > HCI Event: Command Status (0x0f) plen 4
        Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      > HCI Event: Synchronous Connect Complete (0x2c) plen 17
        status 0x1f handle 257 bdaddr 00:14:0A:xx:xx:xx type eSCO
        Error: Unspecified Error
    
    In these cases it is up to the host stack to fallback to a SCO setup
    and so retry with SCO parameters.
    
    Based on a report by Nick Pelly <npelly at google.com>
    
    Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

commit e2139b32726e5dd184974c785ea3f62026590801
Author: Johan Hedberg <johan.hedberg at nokia.com>
Date:   Thu Mar 26 16:41:56 2009 +0200

    Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP
    
    There is a missing call to rfcomm_dlc_clear_timer in the case that
    DEFER_SETUP is used and so the connection gets disconnected after the
    timeout even if it was successfully accepted previously.
    
    This patch adds a call to rfcomm_dlc_clear_timer to rfcomm_dlc_accept
    which will get called when the user accepts the connection by calling
    read() on the socket.
    
    Signed-off-by: Johan Hedberg <johan.hedberg at nokia.com>
    Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5553424..15f40ea 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -866,8 +866,16 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
 	hci_dev_lock(hdev);
 
 	conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
-	if (!conn)
-		goto unlock;
+	if (!conn) {
+		if (ev->link_type != SCO_LINK)
+			goto unlock;
+
+		conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, &ev->bdaddr);
+		if (!conn)
+			goto unlock;
+
+		conn->type = SCO_LINK;
+	}
 
 	if (!ev->status) {
 		conn->handle = __le16_to_cpu(ev->handle);
@@ -1646,20 +1654,28 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu
 		conn->type = SCO_LINK;
 	}
 
-	if (conn->out && ev->status == 0x1c && conn->attempt < 2) {
-		conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |
-					(hdev->esco_type & EDR_ESCO_MASK);
-		hci_setup_sync(conn, conn->link->handle);
-		goto unlock;
-	}
-
-	if (!ev->status) {
+	switch (ev->status) {
+	case 0x00:
 		conn->handle = __le16_to_cpu(ev->handle);
 		conn->state  = BT_CONNECTED;
 
 		hci_conn_add_sysfs(conn);
-	} else
+		break;
+
+	case 0x1c:	/* SCO interval rejected */
+	case 0x1f:	/* Unspecified error */
+		if (conn->out && conn->attempt < 2) {
+			conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |
+					(hdev->esco_type & EDR_ESCO_MASK);
+			hci_setup_sync(conn, conn->link->handle);
+			goto unlock;
+		}
+		/* fall through */
+
+	default:
 		conn->state = BT_CLOSED;
+		break;
+	}
 
 	hci_proto_connect_cfm(conn, ev->status);
 	if (ev->status)
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 1d0fb0f..374536e 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1194,6 +1194,8 @@ void rfcomm_dlc_accept(struct rfcomm_dlc *d)
 
 	rfcomm_send_ua(d->session, d->dlci);
 
+	rfcomm_dlc_clear_timer(d);
+
 	rfcomm_dlc_lock(d);
 	d->state = BT_CONNECTED;
 	d->state_change(d, 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1563
retrieving revision 1.1564
diff -u -r1.1563 -r1.1564
--- kernel.spec	19 Apr 2009 12:38:38 -0000	1.1563
+++ kernel.spec	20 Apr 2009 19:10:19 -0000	1.1564
@@ -586,6 +586,7 @@
 # Git trees.
 Patch10: git-cpufreq.patch
 Patch11: git-bluetooth.patch
+Patch12: git-bluetooth2.patch
 
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
@@ -1143,6 +1144,7 @@
 
 #ApplyPatch git-cpufreq.patch
 ApplyPatch git-bluetooth.patch
+ApplyPatch git-bluetooth2.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -1976,6 +1978,9 @@
 # and build.
 
 %changelog
+* Mon Apr 20 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-102
+- git-bluetooth2.patch: Bluetooth fixes from 2.6.30-rc2.
+
 * Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2.6.29.1-101
 - Fix xen boot on machines without NX support (#492523)
 



From rjones at fedoraproject.org  Mon Apr 20 19:19:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 20 Apr 2009 19:19:56 +0000 (UTC)
Subject: rpms/febootstrap/devel .cvsignore, 1.2, 1.3 febootstrap.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090420191956.9DF1770102@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15767

Modified Files:
	.cvsignore febootstrap.spec sources 
Log Message:
New upstream version 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2009 08:36:45 -0000	1.2
+++ .cvsignore	20 Apr 2009 19:19:25 -0000	1.3
@@ -1 +1 @@
-febootstrap-1.5.tar.gz
+febootstrap-1.7.tar.gz


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/febootstrap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- febootstrap.spec	16 Apr 2009 08:36:45 -0000	1.1
+++ febootstrap.spec	20 Apr 2009 19:19:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
-Version:     1.5
-Release:     3%{?dist}
+Version:     1.7
+Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Richard Jones <rjones at redhat.com> - 1.7-1
+- New upstream release 1.7.
+
 * Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-3
 - Configure script has (unnecessary) BuildRequires on fakeroot,
   fakechroot, yum.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2009 08:36:45 -0000	1.2
+++ sources	20 Apr 2009 19:19:26 -0000	1.3
@@ -1 +1 @@
-3d78fdaf544ba885415e6d366ea9b7d0  febootstrap-1.5.tar.gz
+df7ddb510513d5491ead77ac970b08d2  febootstrap-1.7.tar.gz



From kyle at fedoraproject.org  Mon Apr 20 19:20:01 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 20 Apr 2009 19:20:01 +0000 (UTC)
Subject: rpms/kernel/F-10 git-bluetooth2.patch, NONE, 1.1 kernel.spec, 1.1335,
	1.1336
Message-ID: <20090420192001.E2EAC70102@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799

Modified Files:
	kernel.spec 
Added Files:
	git-bluetooth2.patch 
Log Message:
* Mon Apr 20 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-36
- git-bluetooth2.patch: Bluetooth fixes from F-11.


git-bluetooth2.patch:

--- NEW FILE git-bluetooth2.patch ---
commit 9499237a1c42a27fbcc7ed1d59e34df2b574cdfb
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Sun Apr 19 19:30:03 2009 +0200

    Bluetooth: Add workaround for wrong HCI event in eSCO setup
    
    The Broadcom chips with 2.1 firmware handle the fallback case to a SCO
    link wrongly when setting up eSCO connections.
    
      < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17
          handle 11 voice setting 0x0060
      > HCI Event: Command Status (0x0f) plen 4
          Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      > HCI Event: Connect Complete (0x03) plen 11
          status 0x00 handle 1 bdaddr 00:1E:3A:xx:xx:xx type SCO encrypt 0x01
    
    The Link Manager negotiates the fallback to SCO, but then sends out
    a Connect Complete event. This is wrong and the Link Manager should
    actually send a Synchronous Connection Complete event if the Setup
    Synchronous Connection has been used. Only the remote side is allowed
    to use Connect Complete to indicate the missing support for eSCO in
    the host stack.
    
    This patch adds a workaround for this which clearly should not be
    needed, but reality is that broken Broadcom devices are deployed.
    
    Based on a report by Ville Tervo <ville.tervo at nokia.com>
    
    Signed-off-by: Marcel Holtman <marcel at holtmann.org>

commit 732547f96ea2442965a24e0ed529d285321a0fff
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Sun Apr 19 19:14:14 2009 +0200

    Bluetooth: Fallback from eSCO to SCO on unspecified error
    
    Some Bluetooth chips (like the ones from Texas Instruments) don't do
    proper eSCO negotiations inside the Link Manager. They just return an
    error code and in case of the Kyocera ED-8800 headset it is just a
    random error.
    
      < HCI Command: Setup Synchronous Connection 0x01|0x0028) plen 17
        handle 1 voice setting 0x0060
      > HCI Event: Command Status (0x0f) plen 4
        Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
      > HCI Event: Synchronous Connect Complete (0x2c) plen 17
        status 0x1f handle 257 bdaddr 00:14:0A:xx:xx:xx type eSCO
        Error: Unspecified Error
    
    In these cases it is up to the host stack to fallback to a SCO setup
    and so retry with SCO parameters.
    
    Based on a report by Nick Pelly <npelly at google.com>
    
    Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

commit e2139b32726e5dd184974c785ea3f62026590801
Author: Johan Hedberg <johan.hedberg at nokia.com>
Date:   Thu Mar 26 16:41:56 2009 +0200

    Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP
    
    There is a missing call to rfcomm_dlc_clear_timer in the case that
    DEFER_SETUP is used and so the connection gets disconnected after the
    timeout even if it was successfully accepted previously.
    
    This patch adds a call to rfcomm_dlc_clear_timer to rfcomm_dlc_accept
    which will get called when the user accepts the connection by calling
    read() on the socket.
    
    Signed-off-by: Johan Hedberg <johan.hedberg at nokia.com>
    Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5553424..15f40ea 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -866,8 +866,16 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
 	hci_dev_lock(hdev);
 
 	conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
-	if (!conn)
-		goto unlock;
+	if (!conn) {
+		if (ev->link_type != SCO_LINK)
+			goto unlock;
+
+		conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, &ev->bdaddr);
+		if (!conn)
+			goto unlock;
+
+		conn->type = SCO_LINK;
+	}
 
 	if (!ev->status) {
 		conn->handle = __le16_to_cpu(ev->handle);
@@ -1646,20 +1654,28 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu
 		conn->type = SCO_LINK;
 	}
 
-	if (conn->out && ev->status == 0x1c && conn->attempt < 2) {
-		conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |
-					(hdev->esco_type & EDR_ESCO_MASK);
-		hci_setup_sync(conn, conn->link->handle);
-		goto unlock;
-	}
-
-	if (!ev->status) {
+	switch (ev->status) {
+	case 0x00:
 		conn->handle = __le16_to_cpu(ev->handle);
 		conn->state  = BT_CONNECTED;
 
 		hci_conn_add_sysfs(conn);
-	} else
+		break;
+
+	case 0x1c:	/* SCO interval rejected */
+	case 0x1f:	/* Unspecified error */
+		if (conn->out && conn->attempt < 2) {
+			conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |
+					(hdev->esco_type & EDR_ESCO_MASK);
+			hci_setup_sync(conn, conn->link->handle);
+			goto unlock;
+		}
+		/* fall through */
+
+	default:
 		conn->state = BT_CLOSED;
+		break;
+	}
 
 	hci_proto_connect_cfm(conn, ev->status);
 	if (ev->status)
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 1d0fb0f..374536e 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1194,6 +1194,8 @@ void rfcomm_dlc_accept(struct rfcomm_dlc *d)
 
 	rfcomm_send_ua(d->session, d->dlci);
 
+	rfcomm_dlc_clear_timer(d);
+
 	rfcomm_dlc_lock(d);
 	d->state = BT_CONNECTED;
 	d->state_change(d, 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1335
retrieving revision 1.1336
diff -u -r1.1335 -r1.1336
--- kernel.spec	20 Apr 2009 14:55:55 -0000	1.1335
+++ kernel.spec	20 Apr 2009 19:19:31 -0000	1.1336
@@ -583,6 +583,7 @@
 # Git trees.
 Patch10: git-cpufreq.patch
 Patch11: git-bluetooth.patch
+Patch12: git-bluetooth2.patch
 
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
@@ -1123,6 +1124,7 @@
 
 #ApplyPatch git-cpufreq.patch
 ApplyPatch git-bluetooth.patch
+ApplyPatch git-bluetooth2.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -1915,6 +1917,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 20 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-36
+- git-bluetooth2.patch: Bluetooth fixes from F-11.
+
 * Mon Apr 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-35
 - Copy Xen and KVM fixes from Fedora 11:
     Fix xen boot on machines without NX support (F11#492523)



From rjones at fedoraproject.org  Mon Apr 20 19:20:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 20 Apr 2009 19:20:03 +0000 (UTC)
Subject: rpms/febootstrap/F-11 .cvsignore, 1.2, 1.3 febootstrap.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090420192003.1FBEE70102@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15833

Modified Files:
	.cvsignore febootstrap.spec sources 
Log Message:
New upstream version 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2009 08:37:35 -0000	1.2
+++ .cvsignore	20 Apr 2009 19:19:32 -0000	1.3
@@ -1 +1 @@
-febootstrap-1.5.tar.gz
+febootstrap-1.7.tar.gz


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-11/febootstrap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- febootstrap.spec	16 Apr 2009 08:37:35 -0000	1.1
+++ febootstrap.spec	20 Apr 2009 19:19:32 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
-Version:     1.5
-Release:     3%{?dist}
+Version:     1.7
+Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Richard Jones <rjones at redhat.com> - 1.7-1
+- New upstream release 1.7.
+
 * Tue Apr 14 2009 Richard Jones <rjones at redhat.com> - 1.5-3
 - Configure script has (unnecessary) BuildRequires on fakeroot,
   fakechroot, yum.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2009 08:37:35 -0000	1.2
+++ sources	20 Apr 2009 19:19:32 -0000	1.3
@@ -1 +1 @@
-3d78fdaf544ba885415e6d366ea9b7d0  febootstrap-1.5.tar.gz
+df7ddb510513d5491ead77ac970b08d2  febootstrap-1.7.tar.gz



From rjones at fedoraproject.org  Mon Apr 20 19:20:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 20 Apr 2009 19:20:05 +0000 (UTC)
Subject: rpms/febootstrap/F-10 .cvsignore, 1.2, 1.3 febootstrap.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090420192005.167CC70102@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15856

Modified Files:
	.cvsignore febootstrap.spec sources 
Log Message:
New upstream version 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2009 08:37:30 -0000	1.2
+++ .cvsignore	20 Apr 2009 19:19:34 -0000	1.3
@@ -1 +1 @@
-febootstrap-1.5.tar.gz
+febootstrap-1.7.tar.gz


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/febootstrap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- febootstrap.spec	16 Apr 2009 08:48:23 -0000	1.2
+++ febootstrap.spec	20 Apr 2009 19:19:34 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
-Version:     1.5
-Release:     3%{?dist}.1
+Version:     1.7
+Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Richard Jones <rjones at redhat.com> - 1.7-1
+- New upstream release 1.7.
+
 * Thu Apr 16 2009 Richard Jones <rjones at redhat.com> - 1.5-3.fc10.1
 - Downgrade version of fakechroot required (just for F-10).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2009 08:37:30 -0000	1.2
+++ sources	20 Apr 2009 19:19:34 -0000	1.3
@@ -1 +1 @@
-3d78fdaf544ba885415e6d366ea9b7d0  febootstrap-1.5.tar.gz
+df7ddb510513d5491ead77ac970b08d2  febootstrap-1.7.tar.gz



From rcritten at fedoraproject.org  Mon Apr 20 19:25:31 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Mon, 20 Apr 2009 19:25:31 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-11 .cvsignore, 1.7, 1.8 nss_compat_ossl.spec,
	1.13, 1.14 sources, 1.7, 1.8 nss_compat_ossl-cipherlist.patch,
	1.1, NONE
Message-ID: <20090420192532.01EF970102@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17176

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Removed Files:
	nss_compat_ossl-cipherlist.patch 
Log Message:
Update to 0.9.5
License changed to MIT



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Oct 2008 20:57:42 -0000	1.7
+++ .cvsignore	20 Apr 2009 19:25:01 -0000	1.8
@@ -1 +1 @@
-nss_compat_ossl-0.9.4.tar.gz
+nss_compat_ossl-0.9.5.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-11/nss_compat_ossl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nss_compat_ossl.spec	26 Feb 2009 06:11:51 -0000	1.13
+++ nss_compat_ossl.spec	20 Apr 2009 19:25:01 -0000	1.14
@@ -1,10 +1,10 @@
 Name:           nss_compat_ossl
-Version:        0.9.4
-Release:        3%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
-License:        LGPLv2+
+License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,8 +13,6 @@
 BuildRequires:  nss-devel > 3.11.7-7
 BuildRequires:  nspr-devel
 
-Patch1: nss_compat_ossl-cipherlist.patch
-
 %description
 This library provides a source-level compatibility layer to aid porting
 programs that use OpenSSL to use the NSS instead.
@@ -29,7 +27,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .cipherlist
 
 %build
 
@@ -68,6 +65,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
+- Update to 0.9.5
+- License changed to MIT
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Oct 2008 20:57:42 -0000	1.7
+++ sources	20 Apr 2009 19:25:01 -0000	1.8
@@ -1 +1 @@
-d944f2b74fcb1fa75f828b83288517cf  nss_compat_ossl-0.9.4.tar.gz
+71a1782671db129f7788b0d48f1cf64b  nss_compat_ossl-0.9.5.tar.gz


--- nss_compat_ossl-cipherlist.patch DELETED ---



From simo at fedoraproject.org  Mon Apr 20 19:27:56 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 20 Apr 2009 19:27:56 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sssd.spec,
	1.11, 1.12
Message-ID: <20090420192756.A709C70102@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17840

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
* Mon Apr 20 2009 Simo Sorce <ssorce at redhat.com> - 0.3.2-2
- release out of the official 0.3.2 tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Apr 2009 18:30:49 -0000	1.7
+++ .cvsignore	20 Apr 2009 19:27:26 -0000	1.8
@@ -1,2 +1 @@
-sssd-0.3.1.tar.gz
 sssd-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Apr 2009 18:30:49 -0000	1.7
+++ sources	20 Apr 2009 19:27:26 -0000	1.8
@@ -1,2 +1 @@
-c46bcc028e10c7da3fd0057a038a023f  sssd-0.3.1.tar.gz
-3bfe3145c3ea71fb35d82bae5f7adc47  sssd-0.3.2.tar.gz
+abbd20c64724894fcfc52b1f82eaa904  sssd-0.3.2.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sssd.spec	20 Apr 2009 18:29:07 -0000	1.11
+++ sssd.spec	20 Apr 2009 19:27:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -139,6 +139,9 @@
 fi
 
 %changelog
+* Mon Apr 20 2009 Simo Sorce <ssorce at redhat.com> - 0.3.2-2
+- release out of the official 0.3.2 tarball
+
 * Mon Apr 20 2009 Jakub Hrozek <jhrozek at redhat.com> - 0.3.2-1
 - bugfix release 0.3.2
 - includes previous release patches



From limb at fedoraproject.org  Mon Apr 20 19:30:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 20 Apr 2009 19:30:13 +0000 (UTC)
Subject: rpms/wesnoth/F-11 sources,1.36,1.37 wesnoth.spec,1.74,1.75
Message-ID: <20090420193013.0CA1B70102@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18523

Modified Files:
	sources wesnoth.spec 
Log Message:
1.6.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	24 Mar 2009 13:27:55 -0000	1.36
+++ sources	20 Apr 2009 19:29:42 -0000	1.37
@@ -1 +1 @@
-3c4618eb64d1e5aeb6a00ab3956d5080  wesnoth-1.6a.tar.bz2
+6777ec9bfb44b1553a4b7dd2d12c0713  wesnoth-1.6.1.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-11/wesnoth.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- wesnoth.spec	24 Mar 2009 13:27:55 -0000	1.74
+++ wesnoth.spec	20 Apr 2009 19:29:42 -0000	1.75
@@ -1,12 +1,12 @@
 Name:           wesnoth
-Version:        1.6
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.wesnoth.org
-Source0:        http://www.%{name}.org/files/%{name}-%{version}a.tar.bz2
+Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
 Source1:        wesnothd.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-1.2.8-gcc43.patch
@@ -83,7 +83,7 @@
 ##%endif
 
 %prep
-%setup -qn wesnoth-1.6a
+%setup -qn wesnoth-%{version}
 %patch0 -p1 -b .gcc43
 %patch1 -p0
 autoreconf
@@ -249,6 +249,9 @@
 #%endif
 
 %changelog
+* Mon Apr 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.6.1-1
+- 1.6.1 maintenance release.
+
 * Mon Mar 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.6-1
 - Update to 1.6 stable.
 



From jakub at fedoraproject.org  Mon Apr 20 19:38:05 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 20 Apr 2009 19:38:05 +0000 (UTC)
Subject: rpms/gcc/F-11 .cvsignore, 1.268, 1.269 gcc.spec, 1.41, 1.42 sources,
	1.271, 1.272
Message-ID: <20090420193805.D5BBD70102@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20308

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.0-0.35


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/.cvsignore,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- .cvsignore	14 Apr 2009 15:46:14 -0000	1.268
+++ .cvsignore	20 Apr 2009 19:37:35 -0000	1.269
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090414.tar.bz2
+gcc-4.4.0-20090420.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gcc.spec	14 Apr 2009 17:54:33 -0000	1.41
+++ gcc.spec	20 Apr 2009 19:37:35 -0000	1.42
@@ -1,9 +1,9 @@
-%define DATE 20090414
-%define SVNREV 146037
+%define DATE 20090420
+%define SVNREV 146449
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 0.34
+%define gcc_release 0.35
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1750,6 +1750,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Apr 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.35
+- update from gcc-4_4-branch
+  - PRs middle-end/39804, target/39678, target/39767, tree-optimization/39675,
+	tree-optimization/39764
+
 * Tue Apr 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.34
 - update from gcc-4_4-branch
   - GCC 4.4.0-rc1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/sources,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- sources	14 Apr 2009 15:46:16 -0000	1.271
+++ sources	20 Apr 2009 19:37:35 -0000	1.272
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-004cfd0a49b225032953517a827da968  gcc-4.4.0-20090414.tar.bz2
+1e900acdd986c1a3971169e89f70ce94  gcc-4.4.0-20090420.tar.bz2



From rcritten at fedoraproject.org  Mon Apr 20 19:44:38 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Mon, 20 Apr 2009 19:44:38 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-10 nss_compat_ossl.spec,1.13,1.14
Message-ID: <20090420194438.3505B70102@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21756

Modified Files:
	nss_compat_ossl.spec 
Log Message:
Actually change the license to MIT in the spec file



Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-10/nss_compat_ossl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nss_compat_ossl.spec	20 Apr 2009 16:06:29 -0000	1.13
+++ nss_compat_ossl.spec	20 Apr 2009 19:44:07 -0000	1.14
@@ -1,10 +1,10 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
-License:        LGPLv2+
+License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
+- Actually change the license to MIT in the spec file
+
 * Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
 - Update to 0.9.5
 - License changed to MIT



From s4504kr at fedoraproject.org  Mon Apr 20 19:47:12 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 20 Apr 2009 19:47:12 +0000 (UTC)
Subject: rpms/highlight/devel highlight.spec,1.41,1.42
Message-ID: <20090420194712.8B1357013C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22284

Modified Files:
	highlight.spec 
Log Message:
Adding GUI subpackage


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- highlight.spec	20 Apr 2009 17:05:31 -0000	1.41
+++ highlight.spec	20 Apr 2009 19:46:40 -0000	1.42
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.8
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -10,7 +10,8 @@
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
 
-BuildRequires:	wxGTK-devel
+BuildRequires:	qt-devel >= 4.4
+BuildRequires:	desktop-file-utils
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -22,6 +23,13 @@
 The utility offers indentation and reformatting capabilities.
 It is easily possible to create new language definitions and colour themes.
 
+%package gui
+Summary:	GUI for the hihghlight source code formatter
+Requires:	%{name} = %{version}-%{release}
+
+%description gui
+A Qt-based GUI for the highlight source code formatter source.
+
 %prep
 %setup -q
 %patch1 -p1 -b .mak
@@ -42,15 +50,25 @@
 %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
 chmod +x %{__perl_requires}
 
-
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
+make gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+make install-gui DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   highlight.desktop
+
+
 # Packaging this example causes lots of incorrect perl provides and 
 # requires. Since it isn't going to work out of the box, I'm nuking it.
 rm -rf examples/plugins/movabletype
@@ -60,7 +78,6 @@
 
 %files
 %defattr(-,root,root,-)
-
 %{_bindir}/highlight
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
@@ -69,7 +86,16 @@
 
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/highlight-gui
+%{_datadir}/applications/highlight.desktop
+%{_datadir}/pixmaps/highlight.xpm
+
 %changelog
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-3
+- Adding GUI subpackage
+
 * Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-1
 - New upstream release
 



From lkundrak at fedoraproject.org  Mon Apr 20 19:48:10 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 20 Apr 2009 19:48:10 +0000 (UTC)
Subject: rpms/man/F-11 man.spec,1.78,1.79 makewhatis.cronweekly,1.4,NONE
Message-ID: <20090420194810.40E0F70137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22511/F-11

Modified Files:
	man.spec 
Removed Files:
	makewhatis.cronweekly 
Log Message:
* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
- Get rid of slow weekly updates
- Make daily updates reliable
- Speed up initial indexation



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-11/man.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- man.spec	25 Feb 2009 23:06:04 -0000	1.78
+++ man.spec	20 Apr 2009 19:47:39 -0000	1.79
@@ -4,13 +4,12 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
 URL: http://primates.ximian.com/~flucifredi/man/
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
-Source1: makewhatis.cronweekly
 Source2: makewhatis.crondaily
 Source3: mess.ru
 Source4: man-cmp.sh
@@ -37,6 +36,8 @@
 Patch33: man-1.6f-star.patch
 Patch34: man-1.6f-lang_C.patch
 Patch35: man-1.6f-makewhatis_whis.patch
+Patch36: man-1.6f-makewhatis_update.patch
+Patch37: man-1.6f-makewhatis_perf.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -79,6 +80,8 @@
 %patch33 -p1 -b .star
 %patch34 -p1 -b .lang
 %patch35 -p1 -b .whis
+%patch36 -p1 -b .update
+%patch37 -p1 -b .perf
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -135,7 +138,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/cron.{daily,weekly}
+mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir}
 make install PREFIX=$RPM_BUILD_ROOT
 
@@ -183,7 +186,6 @@
 
 install -m 644 src/man.conf $RPM_BUILD_ROOT/etc/man.config
 
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.weekly/makewhatis.cron
 install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/makewhatis.cron
 
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
@@ -243,7 +245,6 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%config(noreplace) /etc/cron.weekly/makewhatis.cron
 %config(noreplace) /etc/cron.daily/makewhatis.cron
 %config(noreplace) /etc/man.config
 %if %{usecache}
@@ -269,6 +270,11 @@
 
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
+- Get rid of slow weekly updates
+- Make daily updates reliable
+- Speed up initial indexation
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6f-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- makewhatis.cronweekly DELETED ---



From lkundrak at fedoraproject.org  Mon Apr 20 19:48:11 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 20 Apr 2009 19:48:11 +0000 (UTC)
Subject: rpms/man/devel man-1.6f-makewhatis_perf.patch, NONE,
	1.1 man-1.6f-makewhatis_update.patch, NONE,
	1.1 makewhatis.crondaily, 1.4, 1.5 man.spec, 1.78,
	1.79 makewhatis.cronweekly, 1.4, NONE
Message-ID: <20090420194811.1B3EE70137@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22511/devel

Modified Files:
	makewhatis.crondaily man.spec 
Added Files:
	man-1.6f-makewhatis_perf.patch 
	man-1.6f-makewhatis_update.patch 
Removed Files:
	makewhatis.cronweekly 
Log Message:
* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
- Get rid of slow weekly updates
- Make daily updates reliable
- Speed up initial indexation


man-1.6f-makewhatis_perf.patch:

--- NEW FILE man-1.6f-makewhatis_perf.patch ---
Unpacking the manual twice, just to find out wherher it's utf8 -- Bad.
Launching awk per file instead of per dir -- Bad.
Determining which decompressor to use twice -- Bad.
Constantly sorting the database keeping it inconsistent -- Bad.

diff -up man-1.6f/src/makewhatis.sh.perf man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.perf	2009-04-19 23:02:45.673198925 +0200
+++ man-1.6f/src/makewhatis.sh	2009-04-19 23:02:45.691198800 +0200
@@ -36,6 +36,8 @@
 # 060719 - section choosing behavior to match man's (Mike frysinger).
 #
 # 090419 - Add -U flag, Lubomir Rintel <lkundrak at v3.sk>
+# 090419 - Don't write the database until we're finished, Lubomir Rintel <lkundrak at v3.sk>
+# 090419 - Substantial performance improvements, Lubomir Rintel <lkundrak at v3.sk>
 #
 # Note for Slackware users: "makewhatis -v -w -c" will work.
 #
@@ -218,24 +220,7 @@ do
 	    cd ${pages}$i
 	    section=$i
 	    curdir=$mandir/${pages}$i
-	    export section verbose curdir
-
-	   utf8=
-            for x in $(find $mandir/${pages}$i -name '*' $findarg0 $findarg)
-            do
-               if [ "${x%.gz}" != "${x}" ]
-               then
-                  cat=zcat
-               elif [ "${x%.bz2}" != "${x}" ]
-               then
-                  cat=bzcat
-               else
-                  cat=cat
-               fi
-   
-               if ${cat} ${x} | iconv -f utf-8 -t utf-8 -o /dev/null 2>/dev/null
-               then
-                  echo ${x} | $AWK '
+            find $mandir/${pages}$i -name '*' $findarg0 $findarg | $AWK '
 
 	    function readline() {
               if (use_zcat || use_bzcat || use_lzcat) {
@@ -295,6 +280,8 @@ do
                 } else {
                   pipe_cmd = "lzcat \"" filename "\" 2>/dev/null";
                 }
+                # Chuck output unless it is utf-8
+                pipe_cmd = pipe_cmd " |iconv -f utf-8 -t utf-8 2>/dev/null"
 		# try to avoid suspicious stuff
 		if (filename ~ /[;&|`$(]/) {
 		  print "ignored strange file name " filename " in " curdir > "/dev/stderr";
@@ -442,24 +429,23 @@ do
 	      do_one();
 	    }
 	    ' pages=$pages section=$section verbose=$verbose curdir=$curdir
-		fi
-	      done
 	    cd ..
 	 fi
-       done > $TMPFILE
+       done >> $TMPFILE
 
        cd "$here"
 
-       if [ -f ${whatisdb} ]
-       then
-         cat ${whatisdb} >> $TMPFILE
-       fi
-       tr -s '\n' < $TMPFILE | sort -u > ${whatisdb}
-
-       chmod 644 ${whatisdb}
    done
+
 done
 
+if [ -f ${whatisdb} ]
+then
+  cat ${whatisdb} >> $TMPFILE
+fi
+tr -s '\n' < $TMPFILE | sort -u > ${whatisdb}
+chmod 644 ${whatisdb}
+
 # remove tempdir
 rm -rf $TMPFILE
 

man-1.6f-makewhatis_update.patch:

--- NEW FILE man-1.6f-makewhatis_update.patch ---
diff -up man-1.6f/src/makewhatis.sh.update man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.update	2009-04-19 22:01:26.900609474 +0200
+++ man-1.6f/src/makewhatis.sh	2009-04-19 22:06:46.690612151 +0200
@@ -35,6 +35,8 @@
 # 060608 - Corrected traps.
 # 060719 - section choosing behavior to match man's (Mike frysinger).
 #
+# 090419 - Add -U flag, Lubomir Rintel <lkundrak at v3.sk>
+#
 # Note for Slackware users: "makewhatis -v -w -c" will work.
 #
 # makewhatis flc 060719 (from @version@)
@@ -121,6 +123,9 @@ case $name in
 	continue;;
     -o) setwhatis=1
         continue;;
+    -U) [ -f "$whatisdb" ] && findarg="-cnewer $whatisdb"
+	update=1
+	continue;;
     -u) findarg="-ctime 0"
 	update=1
 	continue;;
@@ -133,7 +138,8 @@ case $name in
 	echo "       This will build the whatis database for the man pages"
 	echo "       found in manpath and the cat pages found in catpath."
         echo "       -s: sections (default: $sections)"
-	echo "       -u: update database with new pages"
+	echo "       -u: update database with pages added today"
+	echo "       -U: update database with pages added since last makewhatis run"
 	echo "       -v: verbose"
         echo "       -o: location of whatis database (default: $DEFWHATIS)"
 	echo "       -w: use manpath obtained from \`man --path\`"


Index: makewhatis.crondaily
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/makewhatis.crondaily,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makewhatis.crondaily	27 Oct 2006 08:09:52 -0000	1.4
+++ makewhatis.crondaily	20 Apr 2009 19:47:40 -0000	1.5
@@ -16,5 +16,13 @@
 
 trap "{ rm -f $LOCKFILE ; exit 255; }" EXIT
 touch $LOCKFILE
-makewhatis -u -w
+# Rebuild the database if makewhatis was since last full run,
+# otherwise just update with new pages
+if [ ! -f /var/cache/man/whatis ] ||
+   find /usr/sbin/makewhatis -newer /var/cache/man/whatis |grep -q .
+then
+	makewhatis -w
+else
+	makewhatis -U -w
+fi
 exit 0


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- man.spec	25 Feb 2009 23:06:04 -0000	1.78
+++ man.spec	20 Apr 2009 19:47:40 -0000	1.79
@@ -4,13 +4,12 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
 URL: http://primates.ximian.com/~flucifredi/man/
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
-Source1: makewhatis.cronweekly
 Source2: makewhatis.crondaily
 Source3: mess.ru
 Source4: man-cmp.sh
@@ -37,6 +36,8 @@
 Patch33: man-1.6f-star.patch
 Patch34: man-1.6f-lang_C.patch
 Patch35: man-1.6f-makewhatis_whis.patch
+Patch36: man-1.6f-makewhatis_update.patch
+Patch37: man-1.6f-makewhatis_perf.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -79,6 +80,8 @@
 %patch33 -p1 -b .star
 %patch34 -p1 -b .lang
 %patch35 -p1 -b .whis
+%patch36 -p1 -b .update
+%patch37 -p1 -b .perf
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -135,7 +138,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/cron.{daily,weekly}
+mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir}
 make install PREFIX=$RPM_BUILD_ROOT
 
@@ -183,7 +186,6 @@
 
 install -m 644 src/man.conf $RPM_BUILD_ROOT/etc/man.config
 
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.weekly/makewhatis.cron
 install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/makewhatis.cron
 
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
@@ -243,7 +245,6 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%config(noreplace) /etc/cron.weekly/makewhatis.cron
 %config(noreplace) /etc/cron.daily/makewhatis.cron
 %config(noreplace) /etc/man.config
 %if %{usecache}
@@ -269,6 +270,11 @@
 
 
 %changelog
+* Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
+- Get rid of slow weekly updates
+- Make daily updates reliable
+- Speed up initial indexation
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6f-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- makewhatis.cronweekly DELETED ---



From rcritten at fedoraproject.org  Mon Apr 20 19:51:56 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Mon, 20 Apr 2009 19:51:56 +0000 (UTC)
Subject: rpms/nss_compat_ossl/devel nss_compat_ossl.spec,1.14,1.15
Message-ID: <20090420195156.0939170102@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24034

Modified Files:
	nss_compat_ossl.spec 
Log Message:
Actually change the license in the spec file



Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nss_compat_ossl.spec	20 Apr 2009 17:05:02 -0000	1.14
+++ nss_compat_ossl.spec	20 Apr 2009 19:51:25 -0000	1.15
@@ -1,10 +1,10 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
-License:        LGPLv2+
+License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
+- Actually change the license in the spec file
+
 * Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
 - Update to 0.9.5
 - License changed to MIT



From lkundrak at fedoraproject.org  Mon Apr 20 19:54:34 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 20 Apr 2009 19:54:34 +0000 (UTC)
Subject: rpms/man/F-11 man-1.6f-makewhatis_perf.patch, NONE,
	1.1 man-1.6f-makewhatis_update.patch, NONE, 1.1
Message-ID: <20090420195434.E7C7C70102@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24795/F-11

Added Files:
	man-1.6f-makewhatis_perf.patch 
	man-1.6f-makewhatis_update.patch 
Log Message:
add missing patch files

man-1.6f-makewhatis_perf.patch:

--- NEW FILE man-1.6f-makewhatis_perf.patch ---
Unpacking the manual twice, just to find out wherher it's utf8 -- Bad.
Launching awk per file instead of per dir -- Bad.
Determining which decompressor to use twice -- Bad.
Constantly sorting the database keeping it inconsistent -- Bad.

diff -up man-1.6f/src/makewhatis.sh.perf man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.perf	2009-04-19 23:02:45.673198925 +0200
+++ man-1.6f/src/makewhatis.sh	2009-04-19 23:02:45.691198800 +0200
@@ -36,6 +36,8 @@
 # 060719 - section choosing behavior to match man's (Mike frysinger).
 #
 # 090419 - Add -U flag, Lubomir Rintel <lkundrak at v3.sk>
+# 090419 - Don't write the database until we're finished, Lubomir Rintel <lkundrak at v3.sk>
+# 090419 - Substantial performance improvements, Lubomir Rintel <lkundrak at v3.sk>
 #
 # Note for Slackware users: "makewhatis -v -w -c" will work.
 #
@@ -218,24 +220,7 @@ do
 	    cd ${pages}$i
 	    section=$i
 	    curdir=$mandir/${pages}$i
-	    export section verbose curdir
-
-	   utf8=
-            for x in $(find $mandir/${pages}$i -name '*' $findarg0 $findarg)
-            do
-               if [ "${x%.gz}" != "${x}" ]
-               then
-                  cat=zcat
-               elif [ "${x%.bz2}" != "${x}" ]
-               then
-                  cat=bzcat
-               else
-                  cat=cat
-               fi
-   
-               if ${cat} ${x} | iconv -f utf-8 -t utf-8 -o /dev/null 2>/dev/null
-               then
-                  echo ${x} | $AWK '
+            find $mandir/${pages}$i -name '*' $findarg0 $findarg | $AWK '
 
 	    function readline() {
               if (use_zcat || use_bzcat || use_lzcat) {
@@ -295,6 +280,8 @@ do
                 } else {
                   pipe_cmd = "lzcat \"" filename "\" 2>/dev/null";
                 }
+                # Chuck output unless it is utf-8
+                pipe_cmd = pipe_cmd " |iconv -f utf-8 -t utf-8 2>/dev/null"
 		# try to avoid suspicious stuff
 		if (filename ~ /[;&|`$(]/) {
 		  print "ignored strange file name " filename " in " curdir > "/dev/stderr";
@@ -442,24 +429,23 @@ do
 	      do_one();
 	    }
 	    ' pages=$pages section=$section verbose=$verbose curdir=$curdir
-		fi
-	      done
 	    cd ..
 	 fi
-       done > $TMPFILE
+       done >> $TMPFILE
 
        cd "$here"
 
-       if [ -f ${whatisdb} ]
-       then
-         cat ${whatisdb} >> $TMPFILE
-       fi
-       tr -s '\n' < $TMPFILE | sort -u > ${whatisdb}
-
-       chmod 644 ${whatisdb}
    done
+
 done
 
+if [ -f ${whatisdb} ]
+then
+  cat ${whatisdb} >> $TMPFILE
+fi
+tr -s '\n' < $TMPFILE | sort -u > ${whatisdb}
+chmod 644 ${whatisdb}
+
 # remove tempdir
 rm -rf $TMPFILE
 

man-1.6f-makewhatis_update.patch:

--- NEW FILE man-1.6f-makewhatis_update.patch ---
diff -up man-1.6f/src/makewhatis.sh.update man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.update	2009-04-19 22:01:26.900609474 +0200
+++ man-1.6f/src/makewhatis.sh	2009-04-19 22:06:46.690612151 +0200
@@ -35,6 +35,8 @@
 # 060608 - Corrected traps.
 # 060719 - section choosing behavior to match man's (Mike frysinger).
 #
+# 090419 - Add -U flag, Lubomir Rintel <lkundrak at v3.sk>
+#
 # Note for Slackware users: "makewhatis -v -w -c" will work.
 #
 # makewhatis flc 060719 (from @version@)
@@ -121,6 +123,9 @@ case $name in
 	continue;;
     -o) setwhatis=1
         continue;;
+    -U) [ -f "$whatisdb" ] && findarg="-cnewer $whatisdb"
+	update=1
+	continue;;
     -u) findarg="-ctime 0"
 	update=1
 	continue;;
@@ -133,7 +138,8 @@ case $name in
 	echo "       This will build the whatis database for the man pages"
 	echo "       found in manpath and the cat pages found in catpath."
         echo "       -s: sections (default: $sections)"
-	echo "       -u: update database with new pages"
+	echo "       -u: update database with pages added today"
+	echo "       -U: update database with pages added since last makewhatis run"
 	echo "       -v: verbose"
         echo "       -o: location of whatis database (default: $DEFWHATIS)"
 	echo "       -w: use manpath obtained from \`man --path\`"



From simo at fedoraproject.org  Mon Apr 20 20:00:07 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 20 Apr 2009 20:00:07 +0000 (UTC)
Subject: rpms/sssd/devel sources,1.7,1.8 sssd.spec,1.11,1.12
Message-ID: <20090420200007.D9B0A70102@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25854

Modified Files:
	sources sssd.spec 
Log Message:
* Mon Apr 20 2009 Simo Sorce <ssorce at redhat.com> - 0.3.2-2
- release out of the official 0.3.2 tarball



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Apr 2009 18:17:19 -0000	1.7
+++ sources	20 Apr 2009 19:59:37 -0000	1.8
@@ -1 +1 @@
-3bfe3145c3ea71fb35d82bae5f7adc47  sssd-0.3.2.tar.gz
+abbd20c64724894fcfc52b1f82eaa904  sssd-0.3.2.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sssd.spec	20 Apr 2009 18:17:19 -0000	1.11
+++ sssd.spec	20 Apr 2009 19:59:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -139,6 +139,9 @@
 fi
 
 %changelog
+* Mon Apr 20 2009 Simo Sorce <ssorce at redhat.com> - 0.3.2-2
+- release out of the official 0.3.2 tarball
+
 * Mon Apr 20 2009 Jakub Hrozek <jhrozek at redhat.com> - 0.3.2-1
 - bugfix release 0.3.2
 - includes previous release patches



From jakub at fedoraproject.org  Mon Apr 20 20:00:19 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 20 Apr 2009 20:00:19 +0000 (UTC)
Subject: rpms/gcc/F-11 gcc44-atom.patch,1.1,1.2
Message-ID: <20090420200019.4D41B70102@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26029

Modified Files:
	gcc44-atom.patch 
Log Message:
4.4.0-0.35

gcc44-atom.patch:

Index: gcc44-atom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc44-atom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc44-atom.patch	4 Mar 2009 13:55:08 -0000	1.1
+++ gcc44-atom.patch	20 Apr 2009 20:00:18 -0000	1.2
@@ -2409,7 +2409,7 @@
      | m_NOCONA | m_CORE2 | m_GENERIC;
  
  static enum stringop_alg stringop_alg = no_stringop;
-@@ -1952,7 +2038,8 @@ static const struct ptt processor_target
+@@ -1953,7 +2039,8 @@ static const struct ptt processor_target
    {&core2_cost, 16, 10, 16, 10, 16},
    {&generic32_cost, 16, 7, 16, 7, 16},
    {&generic64_cost, 16, 10, 16, 10, 16},
@@ -2419,7 +2419,7 @@
  };
  
  static const char *const cpu_names[TARGET_CPU_DEFAULT_max] =
-@@ -1970,6 +2057,7 @@ static const char *const cpu_names[TARGE
+@@ -1971,6 +2058,7 @@ static const char *const cpu_names[TARGE
    "prescott",
    "nocona",
    "core2",
@@ -2427,7 +2427,7 @@
    "geode",
    "k6",
    "k6-2",
-@@ -2528,6 +2616,9 @@ override_options (bool main_args_p)
+@@ -2529,6 +2617,9 @@ override_options (bool main_args_p)
        {"core2", PROCESSOR_CORE2, CPU_CORE2,
  	PTA_64BIT | PTA_MMX | PTA_SSE | PTA_SSE2 | PTA_SSE3
  	| PTA_SSSE3 | PTA_CX16},
@@ -2437,7 +2437,7 @@
        {"geode", PROCESSOR_GEODE, CPU_GEODE,
  	PTA_MMX | PTA_3DNOW | PTA_3DNOW_A |PTA_PREFETCH_SSE},
        {"k6", PROCESSOR_K6, CPU_K6, PTA_MMX},
-@@ -12866,6 +12957,263 @@ ix86_expand_unary_operator (enum rtx_cod
+@@ -12903,6 +12994,263 @@ ix86_expand_unary_operator (enum rtx_cod
      emit_move_insn (operands[0], dst);
  }
  
@@ -2701,7 +2701,7 @@
  /* Return TRUE or FALSE depending on whether the unary operator meets the
     appropriate constraints.  */
  
-@@ -18985,6 +19333,7 @@ ix86_issue_rate (void)
+@@ -19022,6 +19370,7 @@ ix86_issue_rate (void)
    switch (ix86_tune)
      {
      case PROCESSOR_PENTIUM:
@@ -2709,7 +2709,7 @@
      case PROCESSOR_K6:
        return 2;
  
-@@ -19051,41 +19400,21 @@ ix86_flags_dependent (rtx insn, rtx dep_
+@@ -19088,41 +19437,21 @@ ix86_flags_dependent (rtx insn, rtx dep_
    return 1;
  }
  
@@ -2764,7 +2764,7 @@
  }
  
  static int
-@@ -19113,8 +19442,19 @@ ix86_adjust_cost (rtx insn, rtx link, rt
+@@ -19150,8 +19479,19 @@ ix86_adjust_cost (rtx insn, rtx link, rt
      {
      case PROCESSOR_PENTIUM:
        /* Address Generation Interlock adds a cycle of latency.  */
@@ -2786,7 +2786,7 @@
  
        /* ??? Compares pair with jump/setcc.  */
        if (ix86_flags_dependent (insn, dep_insn, insn_type))
-@@ -19123,7 +19463,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
+@@ -19160,7 +19500,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
        /* Floating point stores require value to be ready one cycle earlier.  */
        if (insn_type == TYPE_FMOV
  	  && get_attr_memory (insn) == MEMORY_STORE
@@ -2795,7 +2795,7 @@
  	cost += 1;
        break;
  
-@@ -19146,7 +19486,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
+@@ -19183,7 +19523,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
  	 in parallel with previous instruction in case
  	 previous instruction is not needed to compute the address.  */
        if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH)
@@ -2804,7 +2804,7 @@
  	{
  	  /* Claim moves to take one cycle, as core can issue one load
  	     at time and the next load can start cycle later.  */
-@@ -19175,7 +19515,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
+@@ -19212,7 +19552,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
  	 in parallel with previous instruction in case
  	 previous instruction is not needed to compute the address.  */
        if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH)
@@ -2813,7 +2813,7 @@
  	{
  	  /* Claim moves to take one cycle, as core can issue one load
  	     at time and the next load can start cycle later.  */
-@@ -19192,6 +19532,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
+@@ -19229,6 +19569,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
      case PROCESSOR_ATHLON:
      case PROCESSOR_K8:
      case PROCESSOR_AMDFAM10:
@@ -2821,7 +2821,7 @@
      case PROCESSOR_GENERIC32:
      case PROCESSOR_GENERIC64:
        memory = get_attr_memory (insn);
-@@ -19200,7 +19541,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
+@@ -19237,7 +19578,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt
  	 in parallel with previous instruction in case
  	 previous instruction is not needed to compute the address.  */
        if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH)



From jakub at fedoraproject.org  Mon Apr 20 20:25:48 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 20 Apr 2009 20:25:48 +0000 (UTC)
Subject: rpms/gcc/F-11 gcc.spec,1.42,1.43 gcc44-pr39763.patch,1.1,NONE
Message-ID: <20090420202548.2E78E70102@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31460

Modified Files:
	gcc.spec 
Removed Files:
	gcc44-pr39763.patch 
Log Message:
4.4.0-0.35


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gcc.spec	20 Apr 2009 19:37:35 -0000	1.42
+++ gcc.spec	20 Apr 2009 20:25:17 -0000	1.43
@@ -150,7 +150,6 @@
 Patch26: gcc44-power7.patch
 Patch28: gcc44-pr38757.patch
 Patch30: gcc44-pr39543.patch
-Patch31: gcc44-pr39763.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -439,7 +438,6 @@
 %patch26 -p0 -b .power7~
 %patch28 -p0 -b .pr38757~
 #%patch30 -p0 -b .pr39543~
-%patch31 -p0 -b .pr39763~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*


--- gcc44-pr39763.patch DELETED ---



From nalin at fedoraproject.org  Mon Apr 20 20:32:33 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 20 Apr 2009 20:32:33 +0000 (UTC)
Subject: rpms/krb5/devel kadmind.init, 1.14, 1.15 kpropd.init, 1.5,
	1.6 krb5.spec, 1.190, 1.191 krb5kdc.init, 1.10, 1.11
Message-ID: <20090420203233.7372570102@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv507

Modified Files:
	kadmind.init kpropd.init krb5.spec krb5kdc.init 
Log Message:
- add LSB-style informational headers to the init scripts



Index: kadmind.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kadmind.init	4 Apr 2008 21:29:53 -0000	1.14
+++ kadmind.init	20 Apr 2009 20:32:02 -0000	1.15
@@ -11,6 +11,17 @@
 # config: /etc/sysconfig/kadmin
 #
 
+### BEGIN INIT INFO
+# Provides: kadmin
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop the Kerberos 5 admin server
+# Description: The kadmind service allows administrators to remotely manage \
+#              the Kerberos 5 realm database.  It should only be run on a \
+#              master KDC.
+### END INIT INFO
+
 # Get config.
 . /etc/sysconfig/network
 


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kpropd.init	6 Apr 2009 20:33:44 -0000	1.5
+++ kpropd.init	20 Apr 2009 20:32:02 -0000	1.6
@@ -9,6 +9,16 @@
 # processname: kpropd
 #
 
+### BEGIN INIT INFO
+# Provides: kprop
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop the Kerberos 5 propagation client
+# Description: The kpropd service accepts database updates pushed to it from \
+#              the master KDC.  It will never be needed on a master KDC.
+### END INIT INFO
+
 # Get config.
 . /etc/sysconfig/network
 


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- krb5.spec	17 Apr 2009 13:29:41 -0000	1.190
+++ krb5.spec	20 Apr 2009 20:32:02 -0000	1.191
@@ -13,7 +13,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.6.3
-Release: 101%{?dist}
+Release: 102%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -228,6 +228,9 @@
 certificate.
 
 %changelog
+* Mon Apr 20 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-102
+- add LSB-style init script info
+
 * Fri Apr 17 2009 Nalin Dahyabhai <nalin at redhat.com>
 - explicitly run the pdf generation script using sh (part of #225974)
 


Index: krb5kdc.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5kdc.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- krb5kdc.init	2 Jan 2008 17:03:38 -0000	1.10
+++ krb5kdc.init	20 Apr 2009 20:32:02 -0000	1.11
@@ -4,12 +4,22 @@
 #
 # chkconfig:   - 35 65
 # description: Kerberos 5 is a trusted third-party authentication system.  \
-#	       This script starts and stops the server that Kerberos IV and 5 \
+#	       This script starts and stops the server that Kerberos 5 \
 #	       clients need to connect to in order to obtain credentials.
 # processname: krb5kdc
 # config: /etc/sysconfig/krb5kdc
 #
 
+### BEGIN INIT INFO
+# Provides: krb5kdc
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop the Kerberos 5 KDC
+# Description: The krb5kdc is the Kerberos 5 key distribution center, which \
+#              issues credentials to Kerberos 5 clients.
+### END INIT INFO
+
 # Get config.
 . /etc/sysconfig/network
 



From nalin at fedoraproject.org  Mon Apr 20 20:34:03 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 20 Apr 2009 20:34:03 +0000 (UTC)
Subject: rpms/krb5/devel kadmind.init, 1.15, 1.16 kpropd.init, 1.6,
	1.7 krb5kdc.init, 1.11, 1.12
Message-ID: <20090420203403.3494D70102@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv851

Modified Files:
	kadmind.init kpropd.init krb5kdc.init 
Log Message:
- add empty Default-Start: statements to the init scripts



Index: kadmind.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kadmind.init	20 Apr 2009 20:32:02 -0000	1.15
+++ kadmind.init	20 Apr 2009 20:33:32 -0000	1.16
@@ -15,6 +15,7 @@
 # Provides: kadmin
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
+# Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: start and stop the Kerberos 5 admin server
 # Description: The kadmind service allows administrators to remotely manage \


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kpropd.init	20 Apr 2009 20:32:02 -0000	1.6
+++ kpropd.init	20 Apr 2009 20:33:32 -0000	1.7
@@ -13,6 +13,7 @@
 # Provides: kprop
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
+# Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: start and stop the Kerberos 5 propagation client
 # Description: The kpropd service accepts database updates pushed to it from \


Index: krb5kdc.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5kdc.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- krb5kdc.init	20 Apr 2009 20:32:02 -0000	1.11
+++ krb5kdc.init	20 Apr 2009 20:33:32 -0000	1.12
@@ -14,6 +14,7 @@
 # Provides: krb5kdc
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
+# Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: start and stop the Kerberos 5 KDC
 # Description: The krb5kdc is the Kerberos 5 key distribution center, which \



From wtogami at fedoraproject.org  Mon Apr 20 20:58:43 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 20 Apr 2009 20:58:43 +0000 (UTC)
Subject: rpms/ldm/devel ldm.spec,1.22,1.23
Message-ID: <20090420205843.B603070102@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6350

Modified Files:
	ldm.spec 
Log Message:
- Build using $RPM_OPT_FLAGS.
- Build with dependency tracking disabled for possible speedup and cleaner logs.



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ldm.spec	25 Feb 2009 12:50:02 -0000	1.22
+++ ldm.spec	20 Apr 2009 20:58:13 -0000	1.23
@@ -2,7 +2,7 @@
 Version:        2.0.33
 %define _datestamp .20090127.13
 #Release:        1%{_datestamp}%{?dist}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
@@ -39,8 +39,8 @@
 
 
 %build
-export CFLAGS="$CFLAGS -DK12LINUX"
-%configure
+export CFLAGS="$RPM_OPT_FLAGS -DK12LINUX"
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -95,6 +95,10 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Sun Apr 19 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.33-3
+- Build using $RPM_OPT_FLAGS.
+- Build with dependency tracking disabled for possible speedup and cleaner logs.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.33-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wtogami at fedoraproject.org  Mon Apr 20 21:04:13 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 20 Apr 2009 21:04:13 +0000 (UTC)
Subject: rpms/ldm/F-11 ldm.spec,1.22,1.23
Message-ID: <20090420210413.64BBF70102@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7643

Modified Files:
	ldm.spec 
Log Message:
- Build using $RPM_OPT_FLAGS.
- Build with dependency tracking disabled for possible speedup and cleaner logs.



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-11/ldm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ldm.spec	25 Feb 2009 12:50:02 -0000	1.22
+++ ldm.spec	20 Apr 2009 21:03:42 -0000	1.23
@@ -2,7 +2,7 @@
 Version:        2.0.33
 %define _datestamp .20090127.13
 #Release:        1%{_datestamp}%{?dist}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
@@ -39,8 +39,8 @@
 
 
 %build
-export CFLAGS="$CFLAGS -DK12LINUX"
-%configure
+export CFLAGS="$RPM_OPT_FLAGS -DK12LINUX"
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -95,6 +95,10 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Sun Apr 19 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.33-3
+- Build using $RPM_OPT_FLAGS.
+- Build with dependency tracking disabled for possible speedup and cleaner logs.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.33-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nalin at fedoraproject.org  Mon Apr 20 21:15:42 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 20 Apr 2009 21:15:42 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.191,1.192
Message-ID: <20090420211542.C6FC170102@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10008

Modified Files:
	krb5.spec 
Log Message:
note why we don't just run make check here


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- krb5.spec	20 Apr 2009 20:32:02 -0000	1.191
+++ krb5.spec	20 Apr 2009 21:15:12 -0000	1.192
@@ -1532,7 +1532,7 @@
 # Now build it.
 make
 
-# Run the test suite.
+# Run the test suite.  We can't actually do this in the build system.
 : make check TMPDIR=%{_tmppath}
 
 %install



From caolanm at fedoraproject.org  Mon Apr 20 21:38:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 20 Apr 2009 21:38:42 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.hb18.patch, NONE,
	1.1 workspace.impress170.patch, NONE, 1.1 workspace.os130.patch,
	NONE, 1.1 workspace.sb109.patch, NONE,
	1.1 workspace.vcl101.patch, NONE, 1.1 openoffice.org.spec,
	1.1885, 1.1886 workspace.impress169.patch, 1.1,
	1.2 openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.6, 
	NONE openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch,
	1.2, NONE openoffice.org-3.0.1.ooo98885.sw.safeindex.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch,
	1.3, NONE openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch,
	1.1, NONE openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch,
	1.1, NONE
Message-ID: <20090420213842.86E0570102@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15143/F-11

Modified Files:
	openoffice.org.spec workspace.impress169.patch 
Added Files:
	workspace.hb18.patch workspace.impress170.patch 
	workspace.os130.patch workspace.sb109.patch 
	workspace.vcl101.patch 
Removed Files:
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 
	openoffice.org-3.0.1.ooo98885.sw.safeindex.patch 
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
	openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch 
	openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch 
Log Message:
merge/rename upstream patches to accepted workspaces

workspace.hb18.patch:

--- NEW FILE workspace.hb18.patch ---
Index: source/core/bastyp/index.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
retrieving revision 1.11
diff -u -r1.11 index.cxx
--- openoffice.org.orig/sw/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
+++ openoffice.org/sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
@@ -302,7 +302,7 @@
 			pArr->pFirst = pArr->pLast = this;
 			nIndex = nIdx;
 		}
-        else if( nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2) )
+        else if( pArr->pLast && (nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2)) )
 			ChgValue( *pArr->pLast, nIdx );
 		else
 			ChgValue( *pArr->pFirst, nIdx );

workspace.impress170.patch:

--- NEW FILE workspace.impress170.patch ---
diff -ru sd/inc/app.hrc sd/inc/app.hrc
--- openoffice.org.orig/sd/inc/app.hrc	2008-02-05 17:05:14.000000000 +0000
+++ openoffice.org/sd/inc/app.hrc	2008-02-05 20:29:11.000000000 +0000
@@ -470,5 +470,6 @@
 
 #define SID_ADD_MOTION_PATH					(SID_SD_START+441)
 #define SID_TABLE_TOOLBOX					(SID_SD_START+442)
+#define SID_TP_EDIT_MASTER                  (SID_SD_START+443)
 
 #endif
diff -ru sd/sdi/TaskPaneViewShell.sdi sd/sdi/TaskPaneViewShell.sdi
--- openoffice.org.orig/sd/sdi/TaskPaneViewShell.sdi	2008-02-05 17:05:16.000000000 +0000
+++ openoffice.org/sd/sdi/TaskPaneViewShell.sdi	2008-02-05 20:30:12.000000000 +0000
@@ -154,6 +154,31 @@
 	GroupId = GID_VIEW;
 ]
 
+SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
+[
+	/* flags: */
+	AutoUpdate = TRUE,
+	Cachable = Cachable,
+	FastCall = FALSE,
+	HasCoreId = FALSE,
+	HasDialog = FALSE,
+	ReadOnlyDoc = FALSE,
+	Toggle = FALSE,
+	Container = FALSE,
+	RecordAbsolute = FALSE,
+	RecordPerSet;
+	Synchron;
+
+	Readonly = FALSE,
+
+	/* config: */
+	AccelConfig = FALSE,
+	MenuConfig = FALSE,
+	StatusBarConfig = FALSE,
+	ToolBoxConfig = FALSE,
+	GroupId = GID_VIEW;
+]
+
 SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU
 [
 	/* flags: */  
@@ -207,6 +232,11 @@
 		ExecMethod = Execute ;
 		StateMethod = GetState ;
 	]
+    SID_TP_EDIT_MASTER
+	[
+		ExecMethod = Execute ;
+		StateMethod = GetState ;
+	]
 
     // The copy and paste slots are included here so that they later can be
     // disabled in order to remove them from context menus.
diff -ru sd/source/ui/app/popup.src sd/source/ui/app/popup.src
--- openoffice.org.orig/sd/source/ui/app/popup.src	2008-02-05 17:05:14.000000000 +0000
+++ openoffice.org/sd/source/ui/app/popup.src	2008-02-06 09:05:04.000000000 +0000
@@ -337,6 +337,12 @@
             HelpID = SID_TP_SHOW_SMALL_PREVIEW;
             Text[ en-US ] = "Show S~mall Preview";
         };
+        MenuItem
+        {
+            Identifier = SID_TP_EDIT_MASTER;
+            HelpID = SID_TP_EDIT_MASTER;
+            Text[ en-US ] = "~Edit Master...";
+        };
 	};
 };
 
diff -ru sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx	2008-02-06 14:01:07.000000000 +0000
@@ -44,6 +44,8 @@
 #include <tools/link.hxx>
 #include <set>
 
+#include "app.hrc"
+
 namespace {
 
 using namespace sd::toolpanel::controls;
@@ -202,4 +204,13 @@
 
 
 
+void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+    MasterPagesSelector::GetState (rItemSet);
+    rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
+
+
+
 } } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx	2008-02-06 13:56:51.000000000 +0000
@@ -63,6 +63,7 @@
     */
     virtual void Fill (ItemList& rItemList);
 
+    virtual void GetState (SfxItemSet& rItemSet);
 protected:
     virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent);
 
diff -ru sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx	2008-02-06 16:28:56.000000000 +0000
@@ -34,6 +34,7 @@
 #include "CurrentMasterPagesSelector.hxx"
 #include "PreviewValueSet.hxx"
 #include "ViewShellBase.hxx"
+#include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "MasterPageContainer.hxx"
@@ -251,11 +252,14 @@
 {
     // Disable the SID_DELTE_MASTER slot when there is only one master page.
     if (mrDocument.GetMasterPageUserCount(GetSelectedMasterPage()) > 0)
-    {
         rItemSet.DisableItem(SID_DELETE_MASTER_PAGE);
-    }
 
     MasterPagesSelector::GetState(rItemSet);
+
+    DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mrBase.GetMainViewShell().get());
+    if (pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+        rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+
 }
 
 
diff -ru sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-06 16:28:52.000000000 +0000
@@ -54,6 +54,9 @@
 #include "taskpane/ControlContainer.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsPageSelector.hxx"
+#include "SlideSorter.hxx"
+#include "model/SlideSorterModel.hxx"
+#include "controller/SlsCurrentSlideManager.hxx"
 #include <sfx2/objface.hxx>
 #include "sdresid.hxx"
 #include "TemplateScanner.hxx"
@@ -561,6 +564,26 @@
             break;
         }
 
+        case SID_TP_EDIT_MASTER:
+            using namespace ::sd::slidesorter;
+            using namespace ::sd::slidesorter::controller;
+            if (SlideSorterViewShell* pSlideSorter = SlideSorterViewShell::GetSlideSorter(mrBase))
+            {
+                USHORT nIndex = mpPageSet->GetSelectItemId();
+                SlideSorter& rSorter = pSlideSorter->GetSlideSorter();
+                SlideSorterController& rController = rSorter.GetController();
+                rController.PrepareEditModeChange();
+                rController.ChangeEditMode ( EM_MASTERPAGE );
+                rController.FinishEditModeChange();
+                mpPageSet->SelectItem (nIndex);
+                SdPage *pPage = GetSelectedMasterPage();
+                int nPageIndex = (pPage->GetPageNum()-1) / 2;
+                model::SharedPageDescriptor pDescriptor = rSorter.GetModel().GetPageDescriptor( nPageIndex );
+                if (pDescriptor.get() != NULL)
+                    rController.GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
+            }
+            break;
+
         case SID_CUT:
         case SID_COPY:
         case SID_PASTE:
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx	2008-02-06 14:01:57.000000000 +0000
@@ -47,6 +47,8 @@
 #include <vcl/bitmap.hxx>
 #include <tools/color.hxx>
 
+#include "app.hrc"
+
 namespace sd { namespace toolpanel { namespace controls {
 
 
@@ -150,4 +152,16 @@
     }
 }
 
+
+
+
+void RecentMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+    MasterPagesSelector::GetState (rItemSet);
+    rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
+
+
+
 } } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx	2008-02-06 13:57:15.000000000 +0000
@@ -56,6 +56,8 @@
 
     virtual void LateInit (void);
 
+    virtual void GetState (SfxItemSet& rItemSet);
+
 protected:
     DECL_LINK(MasterPageListListener, void*);
     virtual void Fill (ItemList& rItemList);

workspace.os130.patch:

--- NEW FILE workspace.os130.patch ---
Index: source/ui/dochdl/swdtflvr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dochdl/swdtflvr.cxx,v
retrieving revision 1.120
diff -u -r1.120 swdtflvr.cxx
--- sw.orig/source/ui/dochdl/swdtflvr.cxx	7 Jul 2008 07:25:25 -0000	1.120
+++ sw/source/ui/dochdl/swdtflvr.cxx	23 Feb 2009 12:34:35 -0000
@@ -569,8 +570,13 @@
 			break;
 
 		case SOT_FORMAT_STRING:
-			bOK = SetObject( pClpDocFac->GetDoc(),
+			{
+				SwDoc *pDoc = pClpDocFac->GetDoc();
+				ASSERT( pDoc, "Document not found" );
+				pDoc->SetClipBoard( true );
+				bOK = SetObject( pDoc,
 								SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
+			}
 			break;
 
 		case SOT_FORMAT_RTF:
Index: source/ui/dbui/mmlayoutpage.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/mmlayoutpage.cxx,v
retrieving revision 1.21
diff -u -r1.21 mmlayoutpage.cxx
--- sw.orig/source/ui/dbui/mmlayoutpage.cxx	6 May 2008 12:55:06 -0000	1.21
+++ sw/source/ui/dbui/mmlayoutpage.cxx	23 Feb 2009 11:51:34 -0000
@@ -804,7 +804,8 @@
 {
     bool bDown = pButton == &m_aDownPB;
     BOOL bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
-    m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
+    if (bMoved || bDown)
+        m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
     if(!bMoved && bDown)
     {
         //insert a new paragraph before the greeting line
Index: source/core/doc/docnum.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/docnum.cxx,v
retrieving revision 1.77.22.1
diff -u -r1.77.22.1 docnum.cxx
--- sw.orig/source/core/doc/docnum.cxx	14 Aug 2008 19:44:28 -0000	1.77.22.1
+++ sw/source/core/doc/docnum.cxx	23 Feb 2009 11:51:26 -0000
@@ -2073,6 +2073,10 @@
 	}
 	else
 	{
+        //Impossible to move to negative index
+        if (Abs(nOffset) > nStIdx)
+            return FALSE;
+
 		nInEndIdx = nStIdx - 1;
 		nStIdx += nOffset;
 	}

workspace.sb109.patch:

--- NEW FILE workspace.sb109.patch ---
Index: source/remote/urp/urp_environment.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/remote/urp/urp_environment.cxx,v
retrieving revision 1.21
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx	11 Apr 2008 11:14:42 -0000	1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx	12 Jan 2009 08:56:26 -0000
@@ -182,6 +182,7 @@
 {
 	~StaticSingleton()
 		{
+            ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
 			g_bStaticDestructorsCalled = sal_True;
 		}
 };
@@ -267,7 +268,13 @@
   	}
 	// in case, that the static destructors already have been called, no
 	// tiding up is done.
-	if( ! g_bStaticDestructorsCalled  && ! pContext->m_pBridgeImpl->m_bDisposed )
+    bool tidyUp;
+    {
+        ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+        tidyUp = ! g_bStaticDestructorsCalled &&
+            ! pContext->m_pBridgeImpl->m_bDisposed;
+    }
+	if( tidyUp )
 	{
 		// TODO : not threadsafe
 		// synchronization with dispatch methods needed !
@@ -335,9 +342,12 @@
             pImpl->m_pReader = 0;
 		}
 
-		// delete the stubs
-		releaseStubs( pEnvRemote );
-
+        ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+        if( ! g_bStaticDestructorsCalled )
+        {
+            // delete the stubs
+            releaseStubs( pEnvRemote );
+        }
 	}
 }
 

workspace.vcl101.patch:

--- NEW FILE workspace.vcl101.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1885
retrieving revision 1.1886
diff -u -r1.1885 -r1.1886
--- openoffice.org.spec	19 Apr 2009 21:59:45 -0000	1.1885
+++ openoffice.org.spec	20 Apr 2009 21:38:11 -0000	1.1886
@@ -92,7 +92,7 @@
 Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch18: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch19: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch20: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch20: workspace.impress170.patch
 Patch21: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch23: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
@@ -107,14 +107,14 @@
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
 Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch35: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch35: workspace.sb109.patch
 Patch36: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch37: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch38: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch39: workspace.cmcfixes54.patch
 Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch41: workspace.fwk103.patch
-Patch42: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch42: workspace.hb18.patch
 Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
 Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
 Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
@@ -122,23 +122,21 @@
 Patch47: workspace.xmergeclean.patch
 Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
 Patch49: workspace.impress169.patch
-Patch50: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch54: workspace.cmcfixes57.patch
-Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch56: ooo-build.ooo2497.filter.svg.patch
-Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch58: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-Patch59: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
-Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
-Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
-Patch66: workspace.slideshow1.patch
+Patch50: workspace.os130.patch
+Patch51: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch52: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch53: workspace.cmcfixes57.patch
+Patch54: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch55: ooo-build.ooo2497.filter.svg.patch
+Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch61: workspace.vcl101.patch
+Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
+Patch64: workspace.slideshow1.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1589,7 +1587,7 @@
 %patch17 -p1 -b .ooo76649.httpencoding.patch
 %patch18 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch19 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch20 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch20 -p1 -b .workspace.impress170.patch
 %patch21 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch23 -p1 -b .ooo88341.sc.verticalboxes.patch
@@ -1604,14 +1602,14 @@
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
 %patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch35 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch35 -p1 -b .workspace.sb109.patch
 %patch36 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch38 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p1 -b .ooo98885.sw.safeindex.patch
+%patch42 -p1 -b .workspace.hb18.patch
 %patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
 %patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 %patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
@@ -1619,23 +1617,21 @@
 %patch47 -p0 -b .workspace.xmergeclean.patch
 %patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
 %patch49 -p0 -b .workspace.impress169.patch
-%patch50 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch54 -p0 -b .workspace.cmcfixes57.patch
-%patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch56 -p1 -b .ooo2497.filter.svg.patch
-%patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch58 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch59 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch60 -p1 -b .ooo100991.pyuno-fix.patch
-%patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
-%patch64 -p1 -b .ooo101152.solenv.kn.patch
-%patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
-%patch66 -p2 -b .workspace.slideshow1.patch
+%patch50 -p0 -b .workspace.os130.patch
+%patch51 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch52 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch53 -p0 -b .workspace.cmcfixes57.patch
+%patch54 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch55 -p1 -b .ooo2497.filter.svg.patch
+%patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch58 -p1 -b .ooo100991.pyuno-fix.patch
+%patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch61 -p1 -b .workspace.vcl101.patch
+%patch62 -p1 -b .ooo101152.solenv.kn.patch
+%patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
+%patch64 -p2 -b .workspace.slideshow1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.impress169.patch:

Index: workspace.impress169.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.impress169.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.impress169.patch	16 Mar 2009 20:32:54 -0000	1.1
+++ workspace.impress169.patch	20 Apr 2009 21:38:11 -0000	1.2
@@ -18,3 +18,99 @@
  				// #96551# trigger preview refresh
  				mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
  			}
+Index: source/filter.vcl/wmf/enhwmf.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/filter.vcl/wmf/enhwmf.cxx,v
+retrieving revision 1.39.114.1
+diff -u -r1.39.114.1 enhwmf.cxx
+--- svtools.orig/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
++++ svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
+@@ -337,7 +337,7 @@
+ 				*pWMF >> nPoly >> i;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -378,7 +378,7 @@
+ 				// Anzahl der Polygone:
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
+ 				{
+ 					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -390,10 +390,10 @@
+ 							pnPoints[ i ] = (UINT16)nPoints;
+ 						}
+ 
+-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) <= ( nEndPos - pWMF->Tell() ) )
+ 						{
+ 							// Polygonpunkte holen:
+-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
++							pPtAry  = new Point[ nGesPoints ];
+ 			
+ 							for ( i = 0; i < nGesPoints; i++ )
+ 							{
+@@ -403,7 +403,7 @@
+ 							// PolyPolygon Actions erzeugen
+ 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
+ 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
+-							delete[] (char*) pPtAry;
++							delete[] pPtAry;
+ 						}
+ 						delete[] pnPoints;
+ 					}
+@@ -977,7 +977,7 @@
+ 				DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) == 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
+ 
+ 				Point aPos( ptlReferenceX, ptlReferenceY );
+-				if ( nLen && ( nLen < SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
++				if ( nLen && ( nLen < SAL_MAX_SIZE / sizeof(sal_Int32) ) )
+ 				{
+ 					if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= nNextPos ) )
+ 					{
+@@ -1111,7 +1111,7 @@
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -1147,7 +1147,7 @@
+ 				pWMF->SeekRel( 0x10 );
+ 				// Anzahl der Polygone:
+ 				*pWMF >> nPoly >> nGesPoints;
+-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -1157,10 +1157,10 @@
+ 							*pWMF >> nPoints;
+ 							pnPoints[ i ] = (UINT16)nPoints;
+ 						}
+-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt16)+sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
+ 						{
+ 							// Polygonpunkte holen:
+-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
++							pPtAry  = new Point[ nGesPoints ];
+ 							for ( i = 0; i < nGesPoints; i++ )
+ 							{
+ 								*pWMF >> nX16 >> nY16;
+@@ -1170,7 +1170,7 @@
+ 							// PolyPolygon Actions erzeugen
+ 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
+ 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
+-							delete[] (char*) pPtAry;
++							delete[] pPtAry;
+ 						}
+ 						delete[] pnPoints;
+ 					}


--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch DELETED ---


--- openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch DELETED ---


--- openoffice.org-3.0.1.ooo98885.sw.safeindex.patch DELETED ---


--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch DELETED ---


--- openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch DELETED ---


--- openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch DELETED ---


--- openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch DELETED ---



From caolanm at fedoraproject.org  Mon Apr 20 21:38:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 20 Apr 2009 21:38:42 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.hb18.patch, NONE,
	1.1 workspace.impress170.patch, NONE, 1.1 workspace.os130.patch,
	NONE, 1.1 workspace.sb109.patch, NONE,
	1.1 workspace.vcl101.patch, NONE, 1.1 openoffice.org.spec,
	1.1886, 1.1887 workspace.impress169.patch, 1.1,
	1.2 openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.6, 
	NONE openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch,
	1.2, NONE openoffice.org-3.0.1.ooo98885.sw.safeindex.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch,
	1.3, NONE openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch,
	1.1, NONE openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch,
	1.1, NONE
Message-ID: <20090420213842.DBC8D70102@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15143/devel

Modified Files:
	openoffice.org.spec workspace.impress169.patch 
Added Files:
	workspace.hb18.patch workspace.impress170.patch 
	workspace.os130.patch workspace.sb109.patch 
	workspace.vcl101.patch 
Removed Files:
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 
	openoffice.org-3.0.1.ooo98885.sw.safeindex.patch 
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
	openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch 
	openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch 
Log Message:
merge/rename upstream patches to accepted workspaces

workspace.hb18.patch:

--- NEW FILE workspace.hb18.patch ---
Index: source/core/bastyp/index.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
retrieving revision 1.11
diff -u -r1.11 index.cxx
--- openoffice.org.orig/sw/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
+++ openoffice.org/sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
@@ -302,7 +302,7 @@
 			pArr->pFirst = pArr->pLast = this;
 			nIndex = nIdx;
 		}
-        else if( nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2) )
+        else if( pArr->pLast && (nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2)) )
 			ChgValue( *pArr->pLast, nIdx );
 		else
 			ChgValue( *pArr->pFirst, nIdx );

workspace.impress170.patch:

--- NEW FILE workspace.impress170.patch ---
diff -ru sd/inc/app.hrc sd/inc/app.hrc
--- openoffice.org.orig/sd/inc/app.hrc	2008-02-05 17:05:14.000000000 +0000
+++ openoffice.org/sd/inc/app.hrc	2008-02-05 20:29:11.000000000 +0000
@@ -470,5 +470,6 @@
 
 #define SID_ADD_MOTION_PATH					(SID_SD_START+441)
 #define SID_TABLE_TOOLBOX					(SID_SD_START+442)
+#define SID_TP_EDIT_MASTER                  (SID_SD_START+443)
 
 #endif
diff -ru sd/sdi/TaskPaneViewShell.sdi sd/sdi/TaskPaneViewShell.sdi
--- openoffice.org.orig/sd/sdi/TaskPaneViewShell.sdi	2008-02-05 17:05:16.000000000 +0000
+++ openoffice.org/sd/sdi/TaskPaneViewShell.sdi	2008-02-05 20:30:12.000000000 +0000
@@ -154,6 +154,31 @@
 	GroupId = GID_VIEW;
 ]
 
+SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
+[
+	/* flags: */
+	AutoUpdate = TRUE,
+	Cachable = Cachable,
+	FastCall = FALSE,
+	HasCoreId = FALSE,
+	HasDialog = FALSE,
+	ReadOnlyDoc = FALSE,
+	Toggle = FALSE,
+	Container = FALSE,
+	RecordAbsolute = FALSE,
+	RecordPerSet;
+	Synchron;
+
+	Readonly = FALSE,
+
+	/* config: */
+	AccelConfig = FALSE,
+	MenuConfig = FALSE,
+	StatusBarConfig = FALSE,
+	ToolBoxConfig = FALSE,
+	GroupId = GID_VIEW;
+]
+
 SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU
 [
 	/* flags: */  
@@ -207,6 +232,11 @@
 		ExecMethod = Execute ;
 		StateMethod = GetState ;
 	]
+    SID_TP_EDIT_MASTER
+	[
+		ExecMethod = Execute ;
+		StateMethod = GetState ;
+	]
 
     // The copy and paste slots are included here so that they later can be
     // disabled in order to remove them from context menus.
diff -ru sd/source/ui/app/popup.src sd/source/ui/app/popup.src
--- openoffice.org.orig/sd/source/ui/app/popup.src	2008-02-05 17:05:14.000000000 +0000
+++ openoffice.org/sd/source/ui/app/popup.src	2008-02-06 09:05:04.000000000 +0000
@@ -337,6 +337,12 @@
             HelpID = SID_TP_SHOW_SMALL_PREVIEW;
             Text[ en-US ] = "Show S~mall Preview";
         };
+        MenuItem
+        {
+            Identifier = SID_TP_EDIT_MASTER;
+            HelpID = SID_TP_EDIT_MASTER;
+            Text[ en-US ] = "~Edit Master...";
+        };
 	};
 };
 
diff -ru sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx	2008-02-06 14:01:07.000000000 +0000
@@ -44,6 +44,8 @@
 #include <tools/link.hxx>
 #include <set>
 
+#include "app.hrc"
+
 namespace {
 
 using namespace sd::toolpanel::controls;
@@ -202,4 +204,13 @@
 
 
 
+void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+    MasterPagesSelector::GetState (rItemSet);
+    rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
+
+
+
 } } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx	2008-02-06 13:56:51.000000000 +0000
@@ -63,6 +63,7 @@
     */
     virtual void Fill (ItemList& rItemList);
 
+    virtual void GetState (SfxItemSet& rItemSet);
 protected:
     virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent);
 
diff -ru sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx	2008-02-06 16:28:56.000000000 +0000
@@ -34,6 +34,7 @@
 #include "CurrentMasterPagesSelector.hxx"
 #include "PreviewValueSet.hxx"
 #include "ViewShellBase.hxx"
+#include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "MasterPageContainer.hxx"
@@ -251,11 +252,14 @@
 {
     // Disable the SID_DELTE_MASTER slot when there is only one master page.
     if (mrDocument.GetMasterPageUserCount(GetSelectedMasterPage()) > 0)
-    {
         rItemSet.DisableItem(SID_DELETE_MASTER_PAGE);
-    }
 
     MasterPagesSelector::GetState(rItemSet);
+
+    DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mrBase.GetMainViewShell().get());
+    if (pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+        rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+
 }
 
 
diff -ru sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-06 16:28:52.000000000 +0000
@@ -54,6 +54,9 @@
 #include "taskpane/ControlContainer.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsPageSelector.hxx"
+#include "SlideSorter.hxx"
+#include "model/SlideSorterModel.hxx"
+#include "controller/SlsCurrentSlideManager.hxx"
 #include <sfx2/objface.hxx>
 #include "sdresid.hxx"
 #include "TemplateScanner.hxx"
@@ -561,6 +564,26 @@
             break;
         }
 
+        case SID_TP_EDIT_MASTER:
+            using namespace ::sd::slidesorter;
+            using namespace ::sd::slidesorter::controller;
+            if (SlideSorterViewShell* pSlideSorter = SlideSorterViewShell::GetSlideSorter(mrBase))
+            {
+                USHORT nIndex = mpPageSet->GetSelectItemId();
+                SlideSorter& rSorter = pSlideSorter->GetSlideSorter();
+                SlideSorterController& rController = rSorter.GetController();
+                rController.PrepareEditModeChange();
+                rController.ChangeEditMode ( EM_MASTERPAGE );
+                rController.FinishEditModeChange();
+                mpPageSet->SelectItem (nIndex);
+                SdPage *pPage = GetSelectedMasterPage();
+                int nPageIndex = (pPage->GetPageNum()-1) / 2;
+                model::SharedPageDescriptor pDescriptor = rSorter.GetModel().GetPageDescriptor( nPageIndex );
+                if (pDescriptor.get() != NULL)
+                    rController.GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
+            }
+            break;
+
         case SID_CUT:
         case SID_COPY:
         case SID_PASTE:
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx	2008-02-06 14:01:57.000000000 +0000
@@ -47,6 +47,8 @@
 #include <vcl/bitmap.hxx>
 #include <tools/color.hxx>
 
+#include "app.hrc"
+
 namespace sd { namespace toolpanel { namespace controls {
 
 
@@ -150,4 +152,16 @@
     }
 }
 
+
+
+
+void RecentMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+    MasterPagesSelector::GetState (rItemSet);
+    rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
+
+
+
 } } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx	2008-02-06 13:57:15.000000000 +0000
@@ -56,6 +56,8 @@
 
     virtual void LateInit (void);
 
+    virtual void GetState (SfxItemSet& rItemSet);
+
 protected:
     DECL_LINK(MasterPageListListener, void*);
     virtual void Fill (ItemList& rItemList);

workspace.os130.patch:

--- NEW FILE workspace.os130.patch ---
Index: source/ui/dochdl/swdtflvr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dochdl/swdtflvr.cxx,v
retrieving revision 1.120
diff -u -r1.120 swdtflvr.cxx
--- sw.orig/source/ui/dochdl/swdtflvr.cxx	7 Jul 2008 07:25:25 -0000	1.120
+++ sw/source/ui/dochdl/swdtflvr.cxx	23 Feb 2009 12:34:35 -0000
@@ -569,8 +570,13 @@
 			break;
 
 		case SOT_FORMAT_STRING:
-			bOK = SetObject( pClpDocFac->GetDoc(),
+			{
+				SwDoc *pDoc = pClpDocFac->GetDoc();
+				ASSERT( pDoc, "Document not found" );
+				pDoc->SetClipBoard( true );
+				bOK = SetObject( pDoc,
 								SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
+			}
 			break;
 
 		case SOT_FORMAT_RTF:
Index: source/ui/dbui/mmlayoutpage.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/mmlayoutpage.cxx,v
retrieving revision 1.21
diff -u -r1.21 mmlayoutpage.cxx
--- sw.orig/source/ui/dbui/mmlayoutpage.cxx	6 May 2008 12:55:06 -0000	1.21
+++ sw/source/ui/dbui/mmlayoutpage.cxx	23 Feb 2009 11:51:34 -0000
@@ -804,7 +804,8 @@
 {
     bool bDown = pButton == &m_aDownPB;
     BOOL bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
-    m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
+    if (bMoved || bDown)
+        m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
     if(!bMoved && bDown)
     {
         //insert a new paragraph before the greeting line
Index: source/core/doc/docnum.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/docnum.cxx,v
retrieving revision 1.77.22.1
diff -u -r1.77.22.1 docnum.cxx
--- sw.orig/source/core/doc/docnum.cxx	14 Aug 2008 19:44:28 -0000	1.77.22.1
+++ sw/source/core/doc/docnum.cxx	23 Feb 2009 11:51:26 -0000
@@ -2073,6 +2073,10 @@
 	}
 	else
 	{
+        //Impossible to move to negative index
+        if (Abs(nOffset) > nStIdx)
+            return FALSE;
+
 		nInEndIdx = nStIdx - 1;
 		nStIdx += nOffset;
 	}

workspace.sb109.patch:

--- NEW FILE workspace.sb109.patch ---
Index: source/remote/urp/urp_environment.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/remote/urp/urp_environment.cxx,v
retrieving revision 1.21
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx	11 Apr 2008 11:14:42 -0000	1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx	12 Jan 2009 08:56:26 -0000
@@ -182,6 +182,7 @@
 {
 	~StaticSingleton()
 		{
+            ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
 			g_bStaticDestructorsCalled = sal_True;
 		}
 };
@@ -267,7 +268,13 @@
   	}
 	// in case, that the static destructors already have been called, no
 	// tiding up is done.
-	if( ! g_bStaticDestructorsCalled  && ! pContext->m_pBridgeImpl->m_bDisposed )
+    bool tidyUp;
+    {
+        ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+        tidyUp = ! g_bStaticDestructorsCalled &&
+            ! pContext->m_pBridgeImpl->m_bDisposed;
+    }
+	if( tidyUp )
 	{
 		// TODO : not threadsafe
 		// synchronization with dispatch methods needed !
@@ -335,9 +342,12 @@
             pImpl->m_pReader = 0;
 		}
 
-		// delete the stubs
-		releaseStubs( pEnvRemote );
-
+        ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+        if( ! g_bStaticDestructorsCalled )
+        {
+            // delete the stubs
+            releaseStubs( pEnvRemote );
+        }
 	}
 }
 

workspace.vcl101.patch:

--- NEW FILE workspace.vcl101.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -r1.1886 -r1.1887
--- openoffice.org.spec	19 Apr 2009 21:59:48 -0000	1.1886
+++ openoffice.org.spec	20 Apr 2009 21:38:12 -0000	1.1887
@@ -92,7 +92,7 @@
 Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch18: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch19: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch20: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch20: workspace.impress170.patch
 Patch21: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch23: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
@@ -107,14 +107,14 @@
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
 Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch35: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch35: workspace.sb109.patch
 Patch36: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch37: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch38: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch39: workspace.cmcfixes54.patch
 Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch41: workspace.fwk103.patch
-Patch42: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch42: workspace.hb18.patch
 Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
 Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
 Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
@@ -122,23 +122,21 @@
 Patch47: workspace.xmergeclean.patch
 Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
 Patch49: workspace.impress169.patch
-Patch50: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch54: workspace.cmcfixes57.patch
-Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch56: ooo-build.ooo2497.filter.svg.patch
-Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch58: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-Patch59: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
-Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
-Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
-Patch66: workspace.slideshow1.patch
+Patch50: workspace.os130.patch
+Patch51: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch52: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch53: workspace.cmcfixes57.patch
+Patch54: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch55: ooo-build.ooo2497.filter.svg.patch
+Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch61: workspace.vcl101.patch
+Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
+Patch64: workspace.slideshow1.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1589,7 +1587,7 @@
 %patch17 -p1 -b .ooo76649.httpencoding.patch
 %patch18 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch19 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch20 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch20 -p1 -b .workspace.impress170.patch
 %patch21 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch23 -p1 -b .ooo88341.sc.verticalboxes.patch
@@ -1604,14 +1602,14 @@
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
 %patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch35 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch35 -p1 -b .workspace.sb109.patch
 %patch36 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch38 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p1 -b .ooo98885.sw.safeindex.patch
+%patch42 -p1 -b .workspace.hb18.patch
 %patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
 %patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 %patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
@@ -1619,23 +1617,21 @@
 %patch47 -p0 -b .workspace.xmergeclean.patch
 %patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
 %patch49 -p0 -b .workspace.impress169.patch
-%patch50 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch54 -p0 -b .workspace.cmcfixes57.patch
-%patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch56 -p1 -b .ooo2497.filter.svg.patch
-%patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch58 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch59 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch60 -p1 -b .ooo100991.pyuno-fix.patch
-%patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
-%patch64 -p1 -b .ooo101152.solenv.kn.patch
-%patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
-%patch66 -p2 -b .workspace.slideshow1.patch
+%patch50 -p0 -b .workspace.os130.patch
+%patch51 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch52 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch53 -p0 -b .workspace.cmcfixes57.patch
+%patch54 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch55 -p1 -b .ooo2497.filter.svg.patch
+%patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch58 -p1 -b .ooo100991.pyuno-fix.patch
+%patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch61 -p1 -b .workspace.vcl101.patch
+%patch62 -p1 -b .ooo101152.solenv.kn.patch
+%patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
+%patch64 -p2 -b .workspace.slideshow1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.impress169.patch:

Index: workspace.impress169.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impress169.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.impress169.patch	16 Mar 2009 20:32:54 -0000	1.1
+++ workspace.impress169.patch	20 Apr 2009 21:38:12 -0000	1.2
@@ -18,3 +18,99 @@
  				// #96551# trigger preview refresh
  				mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
  			}
+Index: source/filter.vcl/wmf/enhwmf.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/filter.vcl/wmf/enhwmf.cxx,v
+retrieving revision 1.39.114.1
+diff -u -r1.39.114.1 enhwmf.cxx
+--- svtools.orig/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
++++ svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
+@@ -337,7 +337,7 @@
+ 				*pWMF >> nPoly >> i;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -378,7 +378,7 @@
+ 				// Anzahl der Polygone:
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
+ 				{
+ 					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -390,10 +390,10 @@
+ 							pnPoints[ i ] = (UINT16)nPoints;
+ 						}
+ 
+-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) <= ( nEndPos - pWMF->Tell() ) )
+ 						{
+ 							// Polygonpunkte holen:
+-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
++							pPtAry  = new Point[ nGesPoints ];
+ 			
+ 							for ( i = 0; i < nGesPoints; i++ )
+ 							{
+@@ -403,7 +403,7 @@
+ 							// PolyPolygon Actions erzeugen
+ 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
+ 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
+-							delete[] (char*) pPtAry;
++							delete[] pPtAry;
+ 						}
+ 						delete[] pnPoints;
+ 					}
+@@ -977,7 +977,7 @@
+ 				DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) == 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
+ 
+ 				Point aPos( ptlReferenceX, ptlReferenceY );
+-				if ( nLen && ( nLen < SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
++				if ( nLen && ( nLen < SAL_MAX_SIZE / sizeof(sal_Int32) ) )
+ 				{
+ 					if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= nNextPos ) )
+ 					{
+@@ -1111,7 +1111,7 @@
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -1147,7 +1147,7 @@
+ 				pWMF->SeekRel( 0x10 );
+ 				// Anzahl der Polygone:
+ 				*pWMF >> nPoly >> nGesPoints;
+-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -1157,10 +1157,10 @@
+ 							*pWMF >> nPoints;
+ 							pnPoints[ i ] = (UINT16)nPoints;
+ 						}
+-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt16)+sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
+ 						{
+ 							// Polygonpunkte holen:
+-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
++							pPtAry  = new Point[ nGesPoints ];
+ 							for ( i = 0; i < nGesPoints; i++ )
+ 							{
+ 								*pWMF >> nX16 >> nY16;
+@@ -1170,7 +1170,7 @@
+ 							// PolyPolygon Actions erzeugen
+ 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
+ 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
+-							delete[] (char*) pPtAry;
++							delete[] pPtAry;
+ 						}
+ 						delete[] pnPoints;
+ 					}


--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch DELETED ---


--- openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch DELETED ---


--- openoffice.org-3.0.1.ooo98885.sw.safeindex.patch DELETED ---


--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch DELETED ---


--- openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch DELETED ---


--- openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch DELETED ---


--- openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch DELETED ---



From mclasen at fedoraproject.org  Mon Apr 20 21:45:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 20 Apr 2009 21:45:21 +0000 (UTC)
Subject: rpms/festival/devel COPYING.hispavoces, NONE, 1.1 .cvsignore, 1.4, 
	1.5 festival-1.96-speechtools-linklibswithotherlibs.patch, 1.1,
	1.2 festival.spec, 1.39, 1.40 sources, 1.5, 1.6
Message-ID: <20090420214521.EF06670102@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/festival/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16250

Modified Files:
	.cvsignore 
	festival-1.96-speechtools-linklibswithotherlibs.patch 
	festival.spec sources 
Added Files:
	COPYING.hispavoces 
Log Message:
Add spanish voices



--- NEW FILE COPYING.hispavoces ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Lesser General
Public License instead of this License.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Mar 2007 21:19:45 -0000	1.4
+++ .cvsignore	20 Apr 2009 21:44:51 -0000	1.5
@@ -1,24 +1 @@
-festdoc-1.4.2.tar.gz
-festival-1.4.2-release.tar.gz
-festlex_CMU.tar.gz
-festlex_POSLEX.tar.gz
-festvox_ellpc11k.tar.gz
-festvox_kallpc16k.tar.gz
-festvox_kallpc8k.tar.gz
-festvox_kedlpc16k.tar.gz
-festvox_kedlpc8k.tar.gz
-speech_tools-1.2.2-release.tar.gz
-festvox_cmu_us_awb_arctic_hts.tar.gz
-festvox_cmu_us_bdl_arctic_hts.tar.gz
-festvox_cmu_us_jmk_arctic_hts.tar.gz
-festvox_cmu_us_slt_arctic_hts.tar.gz
-speech_tools-1.2.95-beta.tar.gz
-festival-1.95-beta.tar.gz
-festvox_nitech_us_awb_arctic_hts.tar.bz2
-festvox_nitech_us_bdl_arctic_hts.tar.bz2
-festvox_nitech_us_clb_arctic_hts.tar.bz2
-festvox_nitech_us_jmk_arctic_hts.tar.bz2
-festvox_nitech_us_rms_arctic_hts.tar.bz2
-festvox_nitech_us_slt_arctic_hts.tar.bz2
-festival-1.96-beta.tar.gz
-speech_tools-1.2.96-beta.tar.gz
+festival-spanish-voices_1.0.0.orig.tar.gz

festival-1.96-speechtools-linklibswithotherlibs.patch:

Index: festival-1.96-speechtools-linklibswithotherlibs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/festival-1.96-speechtools-linklibswithotherlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- festival-1.96-speechtools-linklibswithotherlibs.patch	19 Mar 2007 21:19:45 -0000	1.1
+++ festival-1.96-speechtools-linklibswithotherlibs.patch	20 Apr 2009 21:44:51 -0000	1.2
@@ -6,8 +6,8 @@
  
 -PROJECT_LIBRARY_USES_estbase = eststring
 -
-+PROJECT_LIBRARY_USES_estbase = eststring m esd
-+PROJECT_LIBRARY_USES_estools = estbase m ncurses esd
++PROJECT_LIBRARY_USES_estbase = eststring m
++PROJECT_LIBRARY_USES_estools = estbase m ncurses
 +PROJECT_LIBRARY_USES_eststring = m
  PROJECT_LIBRARY_USES_estjava = estbase eststring
  


Index: festival.spec
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/festival.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- festival.spec	24 Mar 2009 16:25:55 -0000	1.39
+++ festival.spec	20 Apr 2009 21:44:51 -0000	1.40
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -56,6 +56,11 @@
 Source224: %{nitechbaseURL}/festvox_nitech_us_rms_arctic_hts.tar.bz2
 Source225: %{nitechbaseURL}/festvox_nitech_us_slt_arctic_hts.tar.bz2
 
+### Hispavoces Spanish voices http://forja.guadalinex.org/repositorio/projects/hispavoces/
+%define hispavocesversion 1.0.0
+Source300: http://v4.guadalinex.org/guadalinex-toro/pool-test/main/f/festival-spanish-voices/festival-spanish-voices_1.0.0.orig.tar.gz
+Source301: COPYING.hispavoces
+
 ### Multisyn voices left out because they're ~ 100MB each.
 
 ### MBROLA voices left out, because they require MBROLA, which ain't free.
@@ -261,6 +266,22 @@
 Provides: festival-voice
 BuildArch: noarch
 
+%package -n hispavoces-pal-diphone
+Group: Applications/Multimedia
+Summary: Male Spanish voice ??PAL?? for Festival
+Version: %{hispavocesversion}
+Requires: festival
+Provides: festival-voice
+BuildArch: noarch
+
+%package -n hispavoces-sfl-diphone
+Group: Applications/Multimedia
+Summary: Female Spanish voice ??SFL?? for Festival
+Version: %{hispavocesversion}
+Requires: festival
+Provides: festival-voice
+BuildArch: noarch
+
 # This is last as a lovely hack to make sure Version gets set back
 # to what it should be. Grr.
 %package devel
@@ -402,6 +423,38 @@
 the other EGG. The database was automatically labelled using CMU Sphinx
 using the FestVox labelling scripts. No hand correction has been made.
 
+%description -n hispavoces-sfl-diphone
+Female Castillian-Spanish (es_ES) voice ??SFL?? for Festival.
+
+This is a diphone-based male Spanish voice for the Festival speech synthesis
+system. These original audio files were recorded by a professional voice
+talent in a recording studio.
+
+This voice was developed by the Consejeria de Innovacion, Ciencia y Empresa
+of the Junta de Andalucia on a project awarded to MP Sistemas in
+collaboration with Intelligent Dialogue Systems (INDISYS).
+
+The primary objective was to integrate a higher-quality diphone-based
+Spanish voice in Guadalinex v4.0, an Ubuntu-based Linux distribution
+promoted by the Government of Andalusia (Spain). See
+http://www.guadalinex.org for more information.
+
+%description -n hispavoces-pal-diphone
+Male Castillian-Spanish (es_ES) voice ??PAL?? for Festival.
+
+This is a diphone-based male Spanish voice for the Festival speech synthesis
+system. These original audio files were recorded by a professional voice
+talent in a recording studio.
+
+This voice was developed by the Consejeria de Innovacion, Ciencia y Empresa
+of the Junta de Andalucia on a project awarded to MP Sistemas in
+collaboration with Intelligent Dialogue Systems (INDISYS).
+
+The primary objective was to integrate a higher-quality diphone-based
+Spanish voice in Guadalinex v4.0, an Ubuntu-based Linux distribution
+promoted by the Government of Andalusia (Spain). See
+http://www.guadalinex.org for more information.
+
 %description devel
 Development files for the Festival speech synthesis system. Install
 festival-devel if you want to use Festival's capabilities from within your
@@ -433,6 +486,7 @@
 %setup -q -n festival -D -T -b 223
 %setup -q -n festival -D -T -b 224
 %setup -q -n festival -D -T -b 225
+%setup -c -q -n festival -D -T -b 300
 
 %patch1 -p1 -b .nitech
 %patch2 -p1 -b .buildrootrefs
@@ -586,6 +640,9 @@
 cp COPYING.nitech_us_bdl_arctic_hts COPYING.nitech_us_awb_arctic_hts
 cp -a lib/voices $RPM_BUILD_ROOT%{_datadir}/festival/lib
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/festival/lib/voices/es/
+cp -a festival-spanish-voices-1.0.0/* $RPM_BUILD_ROOT%{_datadir}/festival/lib/voices/es/
+cp %{SOURCE301} .
 
 # okay, now install the main festival program.
 
@@ -648,7 +705,7 @@
 popd
 
 # info pages
-mkdir $RPM_BUILD_ROOT%{_infodir}
+mkdir -p $RPM_BUILD_ROOT%{_infodir}
 cp -p festdoc-%{docversion}/festival/info/* $RPM_BUILD_ROOT%{_infodir}
 
 
@@ -800,6 +857,18 @@
 %dir %{_datadir}/festival/lib/voices/us
 %{_datadir}/festival/lib/voices/us/nitech_us_slt_arctic_hts
 
+%files -n hispavoces-pal-diphone
+%defattr(-,root,root)
+%doc COPYING.hispavoces
+%dir %{_datadir}/festival/lib/voices/es/JuntaDeAndalucia_es_pa_diphone/
+%{_datadir}/festival/lib/voices/es/JuntaDeAndalucia_es_pa_diphone/*
+
+%files -n hispavoces-sfl-diphone
+%defattr(-,root,root)
+%doc COPYING.hispavoces
+%dir %{_datadir}/festival/lib/voices/es/JuntaDeAndalucia_es_sf_diphone/
+%{_datadir}/festival/lib/voices/es/JuntaDeAndalucia_es_sf_diphone/*
+
 %files devel
 %defattr(-,root,root)
 %doc COPYING
@@ -810,6 +879,11 @@
 
 
 %changelog
+* Sat Apr 18 2009 Matthias Clasen <mclasen at redhat.com> - 1.96-12
+- Add Spanish voices from the guadalinex project, in the
+  hispavoces-pal-diphone and hispavoces-sfl-diphone subpackages
+  (#496011)
+
 * Tue Mar 24 2009 Jesse Keating <jkeating at redhat.com> - 1.96-11
 - Drop the explicit dep on festival-voice, as it is redundant and
   causes problems with multiple providers


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/festival/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Mar 2007 21:19:45 -0000	1.5
+++ sources	20 Apr 2009 21:44:51 -0000	1.6
@@ -11,3 +11,4 @@
 f45ba3678a020df667f7e6a606a375c1  festvox_nitech_us_jmk_arctic_hts.tar.bz2
 8ee4de08602a45bad47f93e045cdd242  festvox_nitech_us_rms_arctic_hts.tar.bz2
 3b3cac2a15f423ad55ff5d27291de538  festvox_nitech_us_slt_arctic_hts.tar.bz2
+ebae47b2020f7b3e0a62b9ce7eeebb66  festival-spanish-voices_1.0.0.orig.tar.gz



From devrim at fedoraproject.org  Mon Apr 20 22:12:18 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 20 Apr 2009 22:12:18 +0000 (UTC)
Subject: rpms/python-psycopg2/devel .cvsignore, 1.7, 1.8 python-psycopg2.spec,
	1.21, 1.22 sources, 1.7, 1.8
Message-ID: <20090420221219.143C670102@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21641

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 22:26:34 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:12:16 -0000	1.8
@@ -1,2 +1,3 @@
 psycopg2-2.0.8.tar.gz
 psycopg2-2.0.9.tar.gz
+psycopg2-2.0.10.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/python-psycopg2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-psycopg2.spec	19 Mar 2009 22:30:18 -0000	1.21
+++ python-psycopg2.spec	20 Apr 2009 22:12:16 -0000	1.22
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.9
+Version:	2.0.10
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1
 - Update to 2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 22:26:34 -0000	1.7
+++ sources	20 Apr 2009 22:12:17 -0000	1.8
@@ -1,2 +1,3 @@
 2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
 885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
+2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz



From oget at fedoraproject.org  Mon Apr 20 22:19:25 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 20 Apr 2009 22:19:25 +0000 (UTC)
Subject: rpms/bouncycastle/devel .cvsignore, 1.7, 1.8 bouncycastle.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20090420221925.D25E970102@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23486

Modified Files:
	.cvsignore bouncycastle.spec sources 
Log Message:
* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
- Import Bouncy Castle 1.43.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Mar 2009 22:39:08 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:18:54 -0000	1.8
@@ -1 +1 @@
-bcprov-jdk16-142-FEDORA.tar.gz
+bcprov-jdk16-143-FEDORA.tar.gz


Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bouncycastle.spec	18 Apr 2009 21:22:53 -0000	1.14
+++ bouncycastle.spec	20 Apr 2009 22:18:54 -0000	1.15
@@ -1,11 +1,11 @@
 %global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
-%global archivever  jdk16-142
+%global archivever  jdk16-143
 %global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
-Version:          1.42
-Release:          3%{?dist}
+Version:          1.43
+Release:          1%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -172,6 +172,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
+- Import Bouncy Castle 1.43.
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
 - Don't build AOT bits. The package needs java1.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Mar 2009 22:39:08 -0000	1.7
+++ sources	20 Apr 2009 22:18:54 -0000	1.8
@@ -1 +1 @@
-40d80e70f81b4817d604c0105923074e  bcprov-jdk16-142-FEDORA.tar.gz
+973530a0685a7e4e1e80c4c372293a09  bcprov-jdk16-143-FEDORA.tar.gz



From devrim at fedoraproject.org  Mon Apr 20 22:21:15 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 20 Apr 2009 22:21:15 +0000 (UTC)
Subject: rpms/python-psycopg2/F-10 .cvsignore, 1.7, 1.8 python-psycopg2.spec,
	1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20090420222115.AD8F470102@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23985

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 22:26:34 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:20:45 -0000	1.8
@@ -1,2 +1,3 @@
 psycopg2-2.0.8.tar.gz
 psycopg2-2.0.9.tar.gz
+psycopg2-2.0.10.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/python-psycopg2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-psycopg2.spec	19 Mar 2009 22:26:34 -0000	1.17
+++ python-psycopg2.spec	20 Apr 2009 22:20:45 -0000	1.18
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.9
+Version:	2.0.10
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1
 - Update to 2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 22:26:34 -0000	1.7
+++ sources	20 Apr 2009 22:20:45 -0000	1.8
@@ -1,2 +1,3 @@
 2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
 885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
+2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz



From oget at fedoraproject.org  Mon Apr 20 22:21:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 20 Apr 2009 22:21:49 +0000 (UTC)
Subject: rpms/bouncycastle-mail/devel .cvsignore, 1.3,
	1.4 bouncycastle-mail.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090420222149.4776970102@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24095

Modified Files:
	.cvsignore bouncycastle-mail.spec sources 
Log Message:
* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
- Import Bouncy Castle 1.43.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Mar 2009 22:41:28 -0000	1.3
+++ .cvsignore	20 Apr 2009 22:21:18 -0000	1.4
@@ -1 +1 @@
-bcmail-jdk16-142-FEDORA.tar.gz
+bcmail-jdk16-143-FEDORA.tar.gz


Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bouncycastle-mail.spec	18 Apr 2009 21:56:57 -0000	1.6
+++ bouncycastle-mail.spec	20 Apr 2009 22:21:18 -0000	1.7
@@ -1,10 +1,10 @@
 %define with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
-%define archivever  jdk16-142
+%define archivever  jdk16-143
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
-Version:          1.42
-Release:          4%{?dist}
+Version:          1.43
+Release:          1%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -121,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
+- Import Bouncy Castle 1.43.
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Mar 2009 22:41:28 -0000	1.3
+++ sources	20 Apr 2009 22:21:18 -0000	1.4
@@ -1 +1 @@
-07dd33268dfdf779f3311201bd2319d4  bcmail-jdk16-142-FEDORA.tar.gz
+f31ac1648834921f6271d582c5d90565  bcmail-jdk16-143-FEDORA.tar.gz



From devrim at fedoraproject.org  Mon Apr 20 22:22:16 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 20 Apr 2009 22:22:16 +0000 (UTC)
Subject: rpms/python-psycopg2/F-9 .cvsignore, 1.7, 1.8 python-psycopg2.spec, 
	1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20090420222216.B7AD670102@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24206

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 22:26:34 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:21:46 -0000	1.8
@@ -1,2 +1,3 @@
 psycopg2-2.0.8.tar.gz
 psycopg2-2.0.9.tar.gz
+psycopg2-2.0.10.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-9/python-psycopg2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-psycopg2.spec	19 Mar 2009 22:26:34 -0000	1.16
+++ python-psycopg2.spec	20 Apr 2009 22:21:46 -0000	1.17
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.9
+Version:	2.0.10
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 License:	GPL (with Exceptions)
@@ -87,6 +87,9 @@
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1
 - Update to 2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 22:26:34 -0000	1.7
+++ sources	20 Apr 2009 22:21:46 -0000	1.8
@@ -1,2 +1,3 @@
 2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
 885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
+2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz



From devrim at fedoraproject.org  Mon Apr 20 22:23:51 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 20 Apr 2009 22:23:51 +0000 (UTC)
Subject: rpms/python-psycopg2/EL-5 .cvsignore, 1.7, 1.8 python-psycopg2.spec,
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090420222351.1164970102@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24761

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 22:26:34 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:23:20 -0000	1.8
@@ -1,2 +1,3 @@
 psycopg2-2.0.8.tar.gz
 psycopg2-2.0.9.tar.gz
+psycopg2-2.0.10.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-5/python-psycopg2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-psycopg2.spec	19 Mar 2009 22:26:34 -0000	1.9
+++ python-psycopg2.spec	20 Apr 2009 22:23:20 -0000	1.10
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.9
+Version:	2.0.10
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 License:	GPL (with Exceptions)
@@ -84,6 +84,9 @@
 %{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1
 - Update to 2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 22:26:34 -0000	1.7
+++ sources	20 Apr 2009 22:23:20 -0000	1.8
@@ -1,2 +1,3 @@
 2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
 885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
+2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 22:29:48 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:29:48 +0000 (UTC)
Subject: rpms/cobbler/EL-4 cobbler.spec,1.67,1.68
Message-ID: <20090420222949.0211870102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26635/EL-4

Modified Files:
	cobbler.spec 
Log Message:
Update specfile




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- cobbler.spec	20 Apr 2009 18:10:27 -0000	1.67
+++ cobbler.spec	20 Apr 2009 22:29:18 -0000	1.68
@@ -3,7 +3,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.7.0
+Version: 1.6.3
 Release: 1%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
@@ -66,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -91,7 +91,6 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -157,6 +156,7 @@
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -211,7 +211,6 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -221,7 +220,6 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -301,7 +299,7 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
@@ -309,5 +307,42 @@
 
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
+* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
+- Upstream changes (see CHANGELOG)
+- Now requires PyYAML
+
+* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
+- Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
+
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
+- Upstream changes (see CHANGELOG)
+
+* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
+- Updated test release (see CHANGELOG)
+
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+
+* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+- Upstream changes (see CHANGELOG)
+- placeholder for future test release
+- packaged /var/lib/cobbler/version
+
+* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
+- Upstream changes (see CHANGELOG)
+- added sample.seed file
+- added /usr/bin/cobbler-ext-nodes



From mdehaan at fedoraproject.org  Mon Apr 20 22:29:49 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:29:49 +0000 (UTC)
Subject: rpms/cobbler/EL-5 cobbler.spec,1.69,1.70
Message-ID: <20090420222949.4F60870102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26635/EL-5

Modified Files:
	cobbler.spec 
Log Message:
Update specfile




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- cobbler.spec	20 Apr 2009 18:10:27 -0000	1.69
+++ cobbler.spec	20 Apr 2009 22:29:18 -0000	1.70
@@ -3,7 +3,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.7.0
+Version: 1.6.3
 Release: 1%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
@@ -66,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -91,7 +91,6 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -157,6 +156,7 @@
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -211,7 +211,6 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -221,7 +220,6 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -301,7 +299,7 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
@@ -309,5 +307,42 @@
 
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
+* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
+- Upstream changes (see CHANGELOG)
+- Now requires PyYAML
+
+* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
+- Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
+
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
+- Upstream changes (see CHANGELOG)
+
+* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
+- Updated test release (see CHANGELOG)
+
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+
+* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+- Upstream changes (see CHANGELOG)
+- placeholder for future test release
+- packaged /var/lib/cobbler/version
+
+* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
+- Upstream changes (see CHANGELOG)
+- added sample.seed file
+- added /usr/bin/cobbler-ext-nodes



From mdehaan at fedoraproject.org  Mon Apr 20 22:29:49 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:29:49 +0000 (UTC)
Subject: rpms/cobbler/F-10 cobbler.spec,1.72,1.73
Message-ID: <20090420222949.BD0A470102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26635/F-10

Modified Files:
	cobbler.spec 
Log Message:
Update specfile




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- cobbler.spec	20 Apr 2009 18:10:28 -0000	1.72
+++ cobbler.spec	20 Apr 2009 22:29:19 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.7.0
+Version: 1.6.3
 Release: 1%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
@@ -66,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -91,7 +91,6 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -157,6 +156,7 @@
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -211,7 +211,6 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -221,7 +220,6 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -301,7 +299,7 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
@@ -309,5 +307,42 @@
 
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
+* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
+- Upstream changes (see CHANGELOG)
+- Now requires PyYAML
+
+* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
+- Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
+
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
+- Upstream changes (see CHANGELOG)
+
+* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
+- Updated test release (see CHANGELOG)
+
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+
+* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+- Upstream changes (see CHANGELOG)
+- placeholder for future test release
+- packaged /var/lib/cobbler/version
+
+* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
+- Upstream changes (see CHANGELOG)
+- added sample.seed file
+- added /usr/bin/cobbler-ext-nodes



From mdehaan at fedoraproject.org  Mon Apr 20 22:29:50 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:29:50 +0000 (UTC)
Subject: rpms/cobbler/F-9 cobbler.spec,1.69,1.70
Message-ID: <20090420222950.2C44F70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26635/F-9

Modified Files:
	cobbler.spec 
Log Message:
Update specfile




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- cobbler.spec	20 Apr 2009 18:10:29 -0000	1.69
+++ cobbler.spec	20 Apr 2009 22:29:19 -0000	1.70
@@ -3,7 +3,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.7.0
+Version: 1.6.3
 Release: 1%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
@@ -66,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -91,7 +91,6 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -157,6 +156,7 @@
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -211,7 +211,6 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -221,7 +220,6 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -301,7 +299,7 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
@@ -309,5 +307,42 @@
 
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
+* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
+- Upstream changes (see CHANGELOG)
+- Now requires PyYAML
+
+* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
+- Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
+
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
+- Upstream changes (see CHANGELOG)
+
+* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
+- Updated test release (see CHANGELOG)
+
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+
+* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+- Upstream changes (see CHANGELOG)
+- placeholder for future test release
+- packaged /var/lib/cobbler/version
+
+* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
+- Upstream changes (see CHANGELOG)
+- added sample.seed file
+- added /usr/bin/cobbler-ext-nodes



From mdehaan at fedoraproject.org  Mon Apr 20 22:33:55 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:33:55 +0000 (UTC)
Subject: rpms/cobbler/devel cobbler.spec,1.80,1.81
Message-ID: <20090420223355.7BDFB70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27304

Modified Files:
	cobbler.spec 
Log Message:
Update spec




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- cobbler.spec	20 Apr 2009 18:10:30 -0000	1.80
+++ cobbler.spec	20 Apr 2009 22:33:25 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.7.0
+Version: 1.6.3
 Release: 1%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
@@ -66,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -91,7 +91,6 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -157,6 +156,7 @@
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -211,7 +211,6 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -221,7 +220,6 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -301,7 +299,7 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
@@ -309,5 +307,42 @@
 
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
+* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
+- Upstream changes (see CHANGELOG)
+- Now requires PyYAML
+
+* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
+- Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
+
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
+- Upstream changes (see CHANGELOG)
+
+* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
+- Updated test release (see CHANGELOG)
+
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+
+* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+- Upstream changes (see CHANGELOG)
+- placeholder for future test release
+- packaged /var/lib/cobbler/version
+
+* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
+- Upstream changes (see CHANGELOG)
+- added sample.seed file
+- added /usr/bin/cobbler-ext-nodes



From devrim at fedoraproject.org  Mon Apr 20 22:33:54 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 20 Apr 2009 22:33:54 +0000 (UTC)
Subject: rpms/python-psycopg2/EL-4 .cvsignore, 1.7, 1.8 python-psycopg2.spec,
	1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090420223354.D67B570102@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27322

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 22:26:33 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:33:24 -0000	1.8
@@ -1,2 +1,3 @@
 psycopg2-2.0.8.tar.gz
 psycopg2-2.0.9.tar.gz
+psycopg2-2.0.10.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-4/python-psycopg2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-psycopg2.spec	19 Mar 2009 22:26:33 -0000	1.13
+++ python-psycopg2.spec	20 Apr 2009 22:33:24 -0000	1.14
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.9
+Version:	2.0.10
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 License:	GPL (with Exceptions)
@@ -80,6 +80,9 @@
 %{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1
 - Update to 2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 22:26:33 -0000	1.7
+++ sources	20 Apr 2009 22:33:24 -0000	1.8
@@ -1,2 +1,3 @@
 2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
 885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
+2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 22:37:03 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:37:03 +0000 (UTC)
Subject: rpms/cobbler/EL-4 cobbler.spec,1.68,1.69
Message-ID: <20090420223703.2247570102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28062/EL-4

Modified Files:
	cobbler.spec 
Log Message:
Had to bump spec due to tag issue




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cobbler.spec	20 Apr 2009 22:29:18 -0000	1.68
+++ cobbler.spec	20 Apr 2009 22:36:32 -0000	1.69
@@ -4,7 +4,7 @@
 Name: cobbler
 AutoReq: no
 Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -299,7 +299,7 @@
 
 %changelog
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-2
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1



From mdehaan at fedoraproject.org  Mon Apr 20 22:37:03 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:37:03 +0000 (UTC)
Subject: rpms/cobbler/F-10 cobbler.spec,1.73,1.74
Message-ID: <20090420223703.9FBE870102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28062/F-10

Modified Files:
	cobbler.spec 
Log Message:
Had to bump spec due to tag issue




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- cobbler.spec	20 Apr 2009 22:29:19 -0000	1.73
+++ cobbler.spec	20 Apr 2009 22:36:33 -0000	1.74
@@ -4,7 +4,7 @@
 Name: cobbler
 AutoReq: no
 Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -299,7 +299,7 @@
 
 %changelog
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-2
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1



From mdehaan at fedoraproject.org  Mon Apr 20 22:37:04 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:37:04 +0000 (UTC)
Subject: rpms/cobbler/devel cobbler.spec,1.81,1.82
Message-ID: <20090420223704.5CC0F70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28062/devel

Modified Files:
	cobbler.spec 
Log Message:
Had to bump spec due to tag issue




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- cobbler.spec	20 Apr 2009 22:33:25 -0000	1.81
+++ cobbler.spec	20 Apr 2009 22:36:34 -0000	1.82
@@ -4,7 +4,7 @@
 Name: cobbler
 AutoReq: no
 Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -299,7 +299,7 @@
 
 %changelog
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-2
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1



From mdehaan at fedoraproject.org  Mon Apr 20 22:37:03 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:37:03 +0000 (UTC)
Subject: rpms/cobbler/EL-5 cobbler.spec,1.70,1.71
Message-ID: <20090420223703.5290A70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28062/EL-5

Modified Files:
	cobbler.spec 
Log Message:
Had to bump spec due to tag issue




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cobbler.spec	20 Apr 2009 22:29:18 -0000	1.70
+++ cobbler.spec	20 Apr 2009 22:36:33 -0000	1.71
@@ -4,7 +4,7 @@
 Name: cobbler
 AutoReq: no
 Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -299,7 +299,7 @@
 
 %changelog
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-2
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1



From mdehaan at fedoraproject.org  Mon Apr 20 22:37:04 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 22:37:04 +0000 (UTC)
Subject: rpms/cobbler/F-9 cobbler.spec,1.70,1.71
Message-ID: <20090420223704.18BF970102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28062/F-9

Modified Files:
	cobbler.spec 
Log Message:
Had to bump spec due to tag issue




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cobbler.spec	20 Apr 2009 22:29:19 -0000	1.70
+++ cobbler.spec	20 Apr 2009 22:36:33 -0000	1.71
@@ -4,7 +4,7 @@
 Name: cobbler
 AutoReq: no
 Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -299,7 +299,7 @@
 
 %changelog
 
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-2
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1



From oget at fedoraproject.org  Mon Apr 20 22:43:01 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 20 Apr 2009 22:43:01 +0000 (UTC)
Subject: rpms/bouncycastle/F-11 .cvsignore, 1.7, 1.8 bouncycastle.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20090420224301.4F07C70102@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29766

Modified Files:
	.cvsignore bouncycastle.spec sources 
Log Message:
* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
- Import Bouncy Castle 1.43.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Mar 2009 22:39:08 -0000	1.7
+++ .cvsignore	20 Apr 2009 22:42:30 -0000	1.8
@@ -1 +1 @@
-bcprov-jdk16-142-FEDORA.tar.gz
+bcprov-jdk16-143-FEDORA.tar.gz


Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-11/bouncycastle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bouncycastle.spec	18 Apr 2009 21:40:53 -0000	1.14
+++ bouncycastle.spec	20 Apr 2009 22:42:30 -0000	1.15
@@ -1,11 +1,11 @@
 %global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
-%global archivever  jdk16-142
+%global archivever  jdk16-143
 %global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
-Version:          1.42
-Release:          3%{?dist}
+Version:          1.43
+Release:          1%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -172,6 +172,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
+- Import Bouncy Castle 1.43.
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
 - Don't build AOT bits. The package needs java1.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Mar 2009 22:39:08 -0000	1.7
+++ sources	20 Apr 2009 22:42:30 -0000	1.8
@@ -1 +1 @@
-40d80e70f81b4817d604c0105923074e  bcprov-jdk16-142-FEDORA.tar.gz
+973530a0685a7e4e1e80c4c372293a09  bcprov-jdk16-143-FEDORA.tar.gz



From dcantrel at fedoraproject.org  Mon Apr 20 22:53:15 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 20 Apr 2009 22:53:15 +0000 (UTC)
Subject: rpms/dhcp/F-10 dhclient-script,1.6,1.7 dhcp.spec,1.231,1.232
Message-ID: <20090420225315.5A05870102@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32025

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-35
- Make dhclient-script work with pre-configured wireless interfaces (#491157)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhclient-script,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhclient-script	17 Apr 2009 21:10:07 -0000	1.6
+++ dhclient-script	20 Apr 2009 22:52:43 -0000	1.7
@@ -220,7 +220,6 @@
         # IP address changed.  Bringing down the interface will delete all
         # routes, and clear the ARP cache.
         ip -family inet addr flush dev ${interface} >/dev/null 2>&1
-        ip -family inet link set dev ${interface} down
     fi
 
     if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhcp.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- dhcp.spec	17 Apr 2009 21:10:07 -0000	1.231
+++ dhcp.spec	20 Apr 2009 22:52:43 -0000	1.232
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  34%{?dist}
+Release:  35%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -449,6 +449,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-35
+- Make dhclient-script work with pre-configured wireless interfaces (#491157)
+
 * Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-34
 - Fix setting default route when client IP address changes (#486512, #473658)
 - Restore SELinux context on /etc/ntp.conf and /etc/yp.conf (#483747)



From mdehaan at fedoraproject.org  Mon Apr 20 23:04:16 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 23:04:16 +0000 (UTC)
Subject: rpms/koan/EL-5 .cvsignore, 1.31, 1.32 koan.spec, 1.37, 1.38 sources,
	1.35, 1.36
Message-ID: <20090420230416.9266070137@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/EL-5

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.6.3, not to be confused with cobbler 1.6.3.  

For those about to yum install, we salute you.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	27 Mar 2009 22:04:59 -0000	1.31
+++ .cvsignore	20 Apr 2009 23:03:45 -0000	1.32
@@ -28,3 +28,4 @@
 koan-1.4.2.tar.gz
 koan-1.4.3.tar.gz
 koan-1.6.1.tar.gz
+koan-1.6.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/koan.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- koan.spec	27 Mar 2009 22:04:59 -0000	1.37
+++ koan.spec	20 Apr 2009 23:03:45 -0000	1.38
@@ -2,13 +2,14 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.6.1
+Version: 1.6.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: mkinitrd
 Requires: python >= 1.5
+Requires: python-urlgrabber
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
@@ -60,6 +61,9 @@
 
 %changelog
 
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
 - added cobbler-register script and manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	27 Mar 2009 22:04:59 -0000	1.35
+++ sources	20 Apr 2009 23:03:45 -0000	1.36
@@ -2,3 +2,4 @@
 ed2c63e8d0acf12f5f1bd40a75402e3d  koan-1.4.2.tar.gz
 afc42005052ad12f2ec0744b083b260c  koan-1.4.3.tar.gz
 da98b82d2800026825b9c32ed71d9ea1  koan-1.6.1.tar.gz
+118b9860c0dcd0b654f13b24dc6827c9  koan-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 23:04:16 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 23:04:16 +0000 (UTC)
Subject: rpms/koan/EL-4 .cvsignore, 1.29, 1.30 koan.spec, 1.34, 1.35 sources,
	1.34, 1.35
Message-ID: <20090420230416.80AA670102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/EL-4

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.6.3, not to be confused with cobbler 1.6.3.  

For those about to yum install, we salute you.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Mar 2009 22:04:59 -0000	1.29
+++ .cvsignore	20 Apr 2009 23:03:44 -0000	1.30
@@ -26,3 +26,4 @@
 koan-1.4.2.tar.gz
 koan-1.4.3.tar.gz
 koan-1.6.1.tar.gz
+koan-1.6.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/koan.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koan.spec	27 Mar 2009 22:04:59 -0000	1.34
+++ koan.spec	20 Apr 2009 23:03:44 -0000	1.35
@@ -2,13 +2,14 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.6.1
+Version: 1.6.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: mkinitrd
 Requires: python >= 1.5
+Requires: python-urlgrabber
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
@@ -60,6 +61,9 @@
 
 %changelog
 
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
 - added cobbler-register script and manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	27 Mar 2009 22:04:59 -0000	1.34
+++ sources	20 Apr 2009 23:03:44 -0000	1.35
@@ -2,3 +2,4 @@
 ed2c63e8d0acf12f5f1bd40a75402e3d  koan-1.4.2.tar.gz
 afc42005052ad12f2ec0744b083b260c  koan-1.4.3.tar.gz
 da98b82d2800026825b9c32ed71d9ea1  koan-1.6.1.tar.gz
+118b9860c0dcd0b654f13b24dc6827c9  koan-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 23:04:17 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 23:04:17 +0000 (UTC)
Subject: rpms/koan/F-10 .cvsignore, 1.29, 1.30 koan.spec, 1.39, 1.40 sources,
	1.34, 1.35
Message-ID: <20090420230417.984B870102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/F-10

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.6.3, not to be confused with cobbler 1.6.3.  

For those about to yum install, we salute you.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Mar 2009 22:04:59 -0000	1.29
+++ .cvsignore	20 Apr 2009 23:03:45 -0000	1.30
@@ -26,3 +26,4 @@
 koan-1.4.2.tar.gz
 koan-1.4.3.tar.gz
 koan-1.6.1.tar.gz
+koan-1.6.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/koan.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- koan.spec	27 Mar 2009 22:04:59 -0000	1.39
+++ koan.spec	20 Apr 2009 23:03:45 -0000	1.40
@@ -2,13 +2,14 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.6.1
+Version: 1.6.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: mkinitrd
 Requires: python >= 1.5
+Requires: python-urlgrabber
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
@@ -60,6 +61,9 @@
 
 %changelog
 
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
 - added cobbler-register script and manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	27 Mar 2009 22:04:59 -0000	1.34
+++ sources	20 Apr 2009 23:03:45 -0000	1.35
@@ -2,3 +2,4 @@
 ed2c63e8d0acf12f5f1bd40a75402e3d  koan-1.4.2.tar.gz
 afc42005052ad12f2ec0744b083b260c  koan-1.4.3.tar.gz
 da98b82d2800026825b9c32ed71d9ea1  koan-1.6.1.tar.gz
+118b9860c0dcd0b654f13b24dc6827c9  koan-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 23:04:17 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 23:04:17 +0000 (UTC)
Subject: rpms/koan/devel .cvsignore, 1.29, 1.30 koan.spec, 1.43, 1.44 sources,
	1.34, 1.35
Message-ID: <20090420230417.4A1FE70102@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/devel

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.6.3, not to be confused with cobbler 1.6.3.  

For those about to yum install, we salute you.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Mar 2009 22:05:00 -0000	1.29
+++ .cvsignore	20 Apr 2009 23:03:46 -0000	1.30
@@ -26,3 +26,4 @@
 koan-1.4.2.tar.gz
 koan-1.4.3.tar.gz
 koan-1.6.1.tar.gz
+koan-1.6.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- koan.spec	27 Mar 2009 22:05:00 -0000	1.43
+++ koan.spec	20 Apr 2009 23:03:46 -0000	1.44
@@ -2,13 +2,14 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.6.1
+Version: 1.6.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: mkinitrd
 Requires: python >= 1.5
+Requires: python-urlgrabber
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
@@ -60,6 +61,9 @@
 
 %changelog
 
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
 - added cobbler-register script and manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	27 Mar 2009 22:05:00 -0000	1.34
+++ sources	20 Apr 2009 23:03:46 -0000	1.35
@@ -2,3 +2,4 @@
 ed2c63e8d0acf12f5f1bd40a75402e3d  koan-1.4.2.tar.gz
 afc42005052ad12f2ec0744b083b260c  koan-1.4.3.tar.gz
 da98b82d2800026825b9c32ed71d9ea1  koan-1.6.1.tar.gz
+118b9860c0dcd0b654f13b24dc6827c9  koan-1.6.3.tar.gz



From mdehaan at fedoraproject.org  Mon Apr 20 23:04:17 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Mon, 20 Apr 2009 23:04:17 +0000 (UTC)
Subject: rpms/koan/F-9 .cvsignore, 1.29, 1.30 koan.spec, 1.38, 1.39 sources, 
	1.34, 1.35
Message-ID: <20090420230417.D883E70137@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/F-9

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.6.3, not to be confused with cobbler 1.6.3.  

For those about to yum install, we salute you.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Mar 2009 22:05:00 -0000	1.29
+++ .cvsignore	20 Apr 2009 23:03:46 -0000	1.30
@@ -26,3 +26,4 @@
 koan-1.4.2.tar.gz
 koan-1.4.3.tar.gz
 koan-1.6.1.tar.gz
+koan-1.6.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/koan.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- koan.spec	27 Mar 2009 22:05:00 -0000	1.38
+++ koan.spec	20 Apr 2009 23:03:46 -0000	1.39
@@ -2,13 +2,14 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.6.1
+Version: 1.6.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: mkinitrd
 Requires: python >= 1.5
+Requires: python-urlgrabber
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
@@ -60,6 +61,9 @@
 
 %changelog
 
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
 - added cobbler-register script and manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	27 Mar 2009 22:05:00 -0000	1.34
+++ sources	20 Apr 2009 23:03:46 -0000	1.35
@@ -2,3 +2,4 @@
 ed2c63e8d0acf12f5f1bd40a75402e3d  koan-1.4.2.tar.gz
 afc42005052ad12f2ec0744b083b260c  koan-1.4.3.tar.gz
 da98b82d2800026825b9c32ed71d9ea1  koan-1.6.1.tar.gz
+118b9860c0dcd0b654f13b24dc6827c9  koan-1.6.3.tar.gz



From bskeggs at fedoraproject.org  Mon Apr 20 23:07:19 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 20 Apr 2009 23:07:19 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-11 .cvsignore, 1.33,
	1.34 nouveau-fb-resize.patch, 1.1,
	1.2 nouveau-multiple-xserver.patch, 1.3,
	1.4 nouveau-nv50-fb-accel.patch, 1.3,
	1.4 nouveau-nv50-nva0-noaccel.patch, 1.3,
	1.4 nouveau-store-vbios.patch, 1.3,
	1.4 nouveau-transition-hack.patch, 1.3, 1.4 sources, 1.34,
	1.35 xorg-x11-drv-nouveau.spec, 1.41, 1.42
Message-ID: <20090420230719.6312870102@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4569

Modified Files:
	.cvsignore nouveau-fb-resize.patch 
	nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch 
	nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch 
	nouveau-transition-hack.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Mon Apr 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-30.20090421git47bb00f
- fix for rh#489101




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	17 Apr 2009 02:04:01 -0000	1.33
+++ .cvsignore	20 Apr 2009 23:06:47 -0000	1.34
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2
+xf86-video-nouveau-0.0.12-20090421git47bb00f.tar.bz2

nouveau-fb-resize.patch:

Index: nouveau-fb-resize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-fb-resize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nouveau-fb-resize.patch	17 Apr 2009 01:48:16 -0000	1.1
+++ nouveau-fb-resize.patch	20 Apr 2009 23:06:47 -0000	1.2
@@ -1,4 +1,4 @@
-From 9189921f9822579246be05eec4f97e04cc609e7f Mon Sep 17 00:00:00 2001
+From 338c31fa8624b401a5f98724c498367351ce4acf Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at caspar.localdomain>
 Date: Tue, 14 Apr 2009 09:23:07 +1000
 Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps
@@ -150,7 +150,7 @@
  
  	return FALSE;
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 6c19780..f44d286 100644
+index 538c883..c451ba3 100644
 --- a/src/nv50_randr.c
 +++ b/src/nv50_randr.c
 @@ -289,8 +289,14 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)

nouveau-multiple-xserver.patch:

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-multiple-xserver.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nouveau-multiple-xserver.patch	17 Apr 2009 01:48:16 -0000	1.3
+++ nouveau-multiple-xserver.patch	20 Apr 2009 23:06:47 -0000	1.4
@@ -1,4 +1,4 @@
-From 7811f9211a960dd6396f8e29964dcde2aec6f2e5 Mon Sep 17 00:00:00 2001
+From e278ea7300169355b17b17a785aef938c3fbc1e3 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:25:25 +1000
 Subject: [PATCH 3/6] f11: hack to support multiple xserver instances

nouveau-nv50-fb-accel.patch:

Index: nouveau-nv50-fb-accel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-fb-accel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nouveau-nv50-fb-accel.patch	17 Apr 2009 01:48:16 -0000	1.3
+++ nouveau-nv50-fb-accel.patch	20 Apr 2009 23:06:47 -0000	1.4
@@ -1,4 +1,4 @@
-From ae25ecbcb06ea2e32af8c7268ce138645d02274f Mon Sep 17 00:00:00 2001
+From e31aa5217c97dfd1e2c678ce7391fcd255abb0bf Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:30:38 +1000
 Subject: [PATCH 4/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
@@ -6,15 +6,15 @@
 ---
  src/Makefile.am          |    1 +
  src/drmmode_display.c    |    8 +-
- src/nouveau_exa.c        |   37 +++++--
+ src/nouveau_exa.c        |   37 ++++--
  src/nv50_randr.c         |    2 +-
- src/nv50_shadow_damage.c |  275 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/nv50_shadow_damage.c |  306 ++++++++++++++++++++++++++++++++++++++++++++++
  src/nv_dri.c             |    2 +-
- src/nv_driver.c          |   38 ++++++-
+ src/nv_driver.c          |   38 +++++-
  src/nv_proto.h           |    4 +
  src/nv_shadow.c          |    8 +-
  src/nv_type.h            |    4 +
- 10 files changed, 356 insertions(+), 23 deletions(-)
+ 10 files changed, 387 insertions(+), 23 deletions(-)
  create mode 100644 src/nv50_shadow_damage.c
 
 diff --git a/src/Makefile.am b/src/Makefile.am
@@ -156,7 +156,7 @@
  	exa->WaitMarker = nouveau_exa_wait_marker;
  
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 657e13a..6c19780 100644
+index 8a9281b..538c883 100644
 --- a/src/nv50_randr.c
 +++ b/src/nv50_randr.c
 @@ -99,7 +99,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste
@@ -170,10 +170,10 @@
  	nv_crtc->crtc->ModeSet(nv_crtc->crtc, mode);
 diff --git a/src/nv50_shadow_damage.c b/src/nv50_shadow_damage.c
 new file mode 100644
-index 0000000..942aba3
+index 0000000..790b09c
 --- /dev/null
 +++ b/src/nv50_shadow_damage.c
-@@ -0,0 +1,275 @@
+@@ -0,0 +1,306 @@
 +/*
 + * Copyright 2009 Maarten Maathuis
 + *
@@ -208,37 +208,30 @@
 +#include "damagestr.h"
 +
 +/* When driver allocated pixmaps are used we can easily fold this back into exa code. */
-+static void nv50_shadow_damage_blit(PixmapPtr ppix, RegionPtr pRegion)
++
++static void
++nv50_shadow_damage_blit_state_emit(struct nouveau_channel *chan)
 +{
-+	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
++	ScrnInfoPtr pScrn = chan->user_private;
 +	NVPtr pNv = NVPTR(pScrn);
-+	struct nouveau_channel *chan = pNv->chan;
-+	struct nouveau_grobj *eng2d = pNv->Nv2D;
++	PixmapPtr ppix = pNv->pspix;
 +	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
-+	unsigned delta = nouveau_pixmap_offset(ppix);
-+	uint32_t fmt;
-+	BoxPtr pbox;
-+	int nbox;
-+
-+	pbox = REGION_RECTS(pRegion);
-+	nbox = REGION_NUM_RECTS(pRegion);
-+	if (!nbox)
-+		return;
++	struct nouveau_grobj *eng2d = pNv->Nv2D;
++	unsigned delta = nouveau_pixmap_offset(ppix), fmt;
 +
-+	/* flush_notify is not needed, we check for all the ring space in advance. */
-+	WAIT_RING (chan, 26 + nbox * 13);
++	WAIT_RING (chan, 27 + 13);
 +
 +	switch (ppix->drawable.depth) {
-+		case 8 : fmt = NV50_2D_SRC_FORMAT_8BPP; break;
-+		case 15: fmt = NV50_2D_SRC_FORMAT_15BPP; break;
-+		case 16: fmt = NV50_2D_SRC_FORMAT_16BPP; break;
-+		case 24: fmt = NV50_2D_SRC_FORMAT_24BPP; break;
-+		case 32: fmt = NV50_2D_SRC_FORMAT_32BPP; break;
-+		default:
-+			 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				    "Unknown surface format for bpp=%d\n",
-+				    ppix->drawable.depth);
-+			 return;
++	case 8 : fmt = NV50_2D_SRC_FORMAT_8BPP; break;
++	case 15: fmt = NV50_2D_SRC_FORMAT_15BPP; break;
++	case 16: fmt = NV50_2D_SRC_FORMAT_16BPP; break;
++	case 24: fmt = NV50_2D_SRC_FORMAT_24BPP; break;
++	case 32: fmt = NV50_2D_SRC_FORMAT_32BPP; break;
++	default:
++		 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			    "Unknown surface format for bpp=%d\n",
++			    ppix->drawable.depth);
++		 return;
 +	}
 +
 +	/* tiled source */
@@ -274,8 +267,28 @@
 +	OUT_RING  (chan, ppix->drawable.height);
 +	BEGIN_RING(chan, eng2d, NV50_2D_OPERATION, 1);
 +	OUT_RING  (chan, NV50_2D_OPERATION_SRCCOPY);
++}
 +
++static void
++nv50_shadow_damage_blit(PixmapPtr ppix, RegionPtr pRegion)
++{
++	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
++	NVPtr pNv = NVPTR(pScrn);
++	struct nouveau_channel *chan = pNv->chan;
++	struct nouveau_grobj *eng2d = pNv->Nv2D;
++	BoxPtr pbox;
++	int nbox;
++
++	pbox = REGION_RECTS(pRegion);
++	nbox = REGION_NUM_RECTS(pRegion);
++	if (!nbox)
++		return;
++
++	pNv->pspix = ppix;
++	chan->flush_notify = nv50_shadow_damage_blit_state_emit;
++	chan->flush_notify(chan);
 +	while (nbox--) {
++		WAIT_RING (chan, 13);
 +		BEGIN_RING(chan, eng2d, NV50_2D_BLIT_DST_X, 12);
 +		OUT_RING  (chan, pbox->x1);
 +		OUT_RING  (chan, pbox->y1);
@@ -292,40 +305,33 @@
 +
 +		pbox++;
 +	}
++	chan->flush_notify = NULL;
 +}
 +
 +/* For frontbuffer fallbacks. */
-+static void nv50_shadow_damage_blit_back(PixmapPtr ppix, RegionPtr pRegion)
++static void
++nv50_shadow_damage_blit_back_state_emit(struct nouveau_channel *chan)
 +{
-+	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
++	ScrnInfoPtr pScrn = chan->user_private;
 +	NVPtr pNv = NVPTR(pScrn);
-+	struct nouveau_channel *chan = pNv->chan;
++	PixmapPtr ppix = pNv->pdpix;
 +	struct nouveau_grobj *eng2d = pNv->Nv2D;
 +	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
-+	unsigned delta = nouveau_pixmap_offset(ppix);
-+	uint32_t fmt;
-+	BoxPtr pbox;
-+	int nbox;
-+
-+	pbox = REGION_RECTS(pRegion);
-+	nbox = REGION_NUM_RECTS(pRegion);
-+	if (!nbox)
-+		return;
++	unsigned delta = nouveau_pixmap_offset(ppix), fmt;
 +
-+	/* flush_notify is not needed, we check for all the ring space in advance. */
-+	WAIT_RING (chan, 26 + nbox * 13);
++	WAIT_RING (chan, 27 + 13);
 +
 +	switch (ppix->drawable.depth) {
-+		case 8 : fmt = NV50_2D_SRC_FORMAT_8BPP; break;
-+		case 15: fmt = NV50_2D_SRC_FORMAT_15BPP; break;
-+		case 16: fmt = NV50_2D_SRC_FORMAT_16BPP; break;
-+		case 24: fmt = NV50_2D_SRC_FORMAT_24BPP; break;
-+		case 32: fmt = NV50_2D_SRC_FORMAT_32BPP; break;
-+		default:
-+			 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				    "Unknown surface format for bpp=%d\n",
-+				    ppix->drawable.depth);
-+			 return;
++	case 8 : fmt = NV50_2D_SRC_FORMAT_8BPP; break;
++	case 15: fmt = NV50_2D_SRC_FORMAT_15BPP; break;
++	case 16: fmt = NV50_2D_SRC_FORMAT_16BPP; break;
++	case 24: fmt = NV50_2D_SRC_FORMAT_24BPP; break;
++	case 32: fmt = NV50_2D_SRC_FORMAT_32BPP; break;
++	default:
++		 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			    "Unknown surface format for bpp=%d\n",
++			    ppix->drawable.depth);
++		 return;
 +	}
 +
 +	/* untiled source */
@@ -361,8 +367,28 @@
 +	OUT_RING  (chan, ppix->drawable.height);
 +	BEGIN_RING(chan, eng2d, NV50_2D_OPERATION, 1);
 +	OUT_RING  (chan, NV50_2D_OPERATION_SRCCOPY);
++}
++
++static void
++nv50_shadow_damage_blit_back(PixmapPtr ppix, RegionPtr pRegion)
++{
++	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
++	NVPtr pNv = NVPTR(pScrn);
++	struct nouveau_channel *chan = pNv->chan;
++	struct nouveau_grobj *eng2d = pNv->Nv2D;
++	BoxPtr pbox;
++	int nbox;
++
++	pbox = REGION_RECTS(pRegion);
++	nbox = REGION_NUM_RECTS(pRegion);
++	if (!nbox)
++		return;
 +
++	pNv->pdpix = ppix;
++	chan->flush_notify = nv50_shadow_damage_blit_back_state_emit;
++	chan->flush_notify(chan);
 +	while (nbox--) {
++		WAIT_RING (chan, 13);
 +		BEGIN_RING(chan, eng2d, NV50_2D_BLIT_DST_X, 12);
 +		OUT_RING  (chan, pbox->x1);
 +		OUT_RING  (chan, pbox->y1);
@@ -379,16 +405,19 @@
 +
 +		pbox++;
 +	}
++	chan->flush_notify = NULL;
 +}
 +
-+static void nv50_shadow_damage_report(DamagePtr pDamage, RegionPtr pRegion, void *closure)
++static void
++nv50_shadow_damage_report(DamagePtr pDamage, RegionPtr pRegion, void *closure)
 +{
 +	PixmapPtr ppix = closure;
 +
 +	nv50_shadow_damage_blit(ppix, pRegion);
 +}
 +
-+void nv50_shadow_damage_frontbuffer_fallback(ScrnInfoPtr pScrn)
++void
++nv50_shadow_damage_frontbuffer_fallback(ScrnInfoPtr pScrn)
 +{
 +	NVPtr pNv = NVPTR(pScrn);
 +	ScreenPtr pScreen = pScrn->pScreen;
@@ -410,7 +439,8 @@
 +	nv50_shadow_damage_blit_back(ppix, &pDamage->pendingDamage);
 +}
 +
-+static void nv50_shadow_damage_destroy(DamagePtr pDamage, void *closure)
++static void
++nv50_shadow_damage_destroy(DamagePtr pDamage, void *closure)
 +{
 +	PixmapPtr ppix = closure;
 +	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
@@ -419,7 +449,8 @@
 +	pNv->screen_damage = NULL;
 +}
 +
-+bool nv50_shadow_damage_create(ScrnInfoPtr pScrn)
++bool
++nv50_shadow_damage_create(ScrnInfoPtr pScrn)
 +{
 +	NVPtr pNv = NVPTR(pScrn);
 +	ScreenPtr pScreen = pScrn->pScreen;
@@ -540,7 +571,7 @@
  		return vgaHWSaveScreen(pScreen, mode);
  
 diff --git a/src/nv_proto.h b/src/nv_proto.h
-index 43fa62e..f06c757 100644
+index 072c7c4..4e9b65c 100644
 --- a/src/nv_proto.h
 +++ b/src/nv_proto.h
 @@ -267,6 +267,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);

nouveau-nv50-nva0-noaccel.patch:

Index: nouveau-nv50-nva0-noaccel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-nva0-noaccel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nouveau-nv50-nva0-noaccel.patch	17 Apr 2009 01:48:17 -0000	1.3
+++ nouveau-nv50-nva0-noaccel.patch	20 Apr 2009 23:06:47 -0000	1.4
@@ -1,4 +1,4 @@
-From 49567300354f9bee9271e9e6ec9332c8fe713973 Mon Sep 17 00:00:00 2001
+From 7460d8ebca84bd5e7c26e88143f14f4909598b68 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 20:20:39 +1000
 Subject: [PATCH 5/6] nv50/f11: disable acceleration on NVAx chipsets

nouveau-store-vbios.patch:

Index: nouveau-store-vbios.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-store-vbios.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nouveau-store-vbios.patch	17 Apr 2009 01:48:17 -0000	1.3
+++ nouveau-store-vbios.patch	20 Apr 2009 23:06:47 -0000	1.4
@@ -1,4 +1,4 @@
-From 0a32a04139e0711a0aa2bb4c7885f24b3a963d0c Mon Sep 17 00:00:00 2001
+From 514eb5a03b8ca223a4d832e1675cda3a6a56b02d Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:13:26 +1000
 Subject: [PATCH 2/6] bios/f11: store a copy of used vbios image in /var/run

nouveau-transition-hack.patch:

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-transition-hack.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nouveau-transition-hack.patch	17 Apr 2009 01:48:17 -0000	1.3
+++ nouveau-transition-hack.patch	20 Apr 2009 23:06:47 -0000	1.4
@@ -1,4 +1,4 @@
-From 48c76f574f059d7d98f18baf10e798d8bfd5b968 Mon Sep 17 00:00:00 2001
+From 98cd8bd95073e6248a0f63a2b5299736e6d097ef Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:12:25 +1000
 Subject: [PATCH 1/6] kms/f11: hack in transition support without driver pixmaps


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	17 Apr 2009 02:04:01 -0000	1.34
+++ sources	20 Apr 2009 23:06:47 -0000	1.35
@@ -1 +1 @@
-8cc45d924825a949300c873769093ae0  xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2
+0f0047cd0a3c84101b025082f0441ae6  xf86-video-nouveau-0.0.12-20090421git47bb00f.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-drv-nouveau.spec	17 Apr 2009 01:55:11 -0000	1.41
+++ xorg-x11-drv-nouveau.spec	20 Apr 2009 23:06:47 -0000	1.42
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090417
-%define git_version fa2f111
+%define gitdate 20090421
+%define git_version 47bb00f
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   29.%{snapshot}%{?dist}
+Release:   30.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -85,6 +85,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Apr 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-30.20090421git47bb00f
+- fix for rh#489101
+
 * Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111
 - avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
   - the bug here was relatively harmless, but exposed a more serious issue



From kevin at fedoraproject.org  Mon Apr 20 23:22:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 23:22:31 +0000 (UTC)
Subject: rpms/Terminal/F-11 Terminal.spec, 1.24, 1.25 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <20090420232231.7CFF570102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8398

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.2.12



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-11/Terminal.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Terminal.spec	23 Feb 2009 23:38:06 -0000	1.24
+++ Terminal.spec	20 Apr 2009 23:21:59 -0000	1.25
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.8.3
-Release: 2%{?dist}
+Version: 0.2.12
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/Terminal-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Terminal-%{version}.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -62,6 +62,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-1
+- Update to 0.2.12
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Oct 2008 15:39:49 -0000	1.8
+++ sources	20 Apr 2009 23:21:59 -0000	1.9
@@ -1 +1 @@
-38af7a51955f6dbb0ecd6d7b882805a1  Terminal-0.2.8.3.tar.bz2
+adb419d279c9fc16d02291c052190717  Terminal-0.2.12.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Oct 2008 15:39:49 -0000	1.8
+++ .cvsignore	20 Apr 2009 23:21:59 -0000	1.9
@@ -1 +1 @@
-Terminal-0.2.8.3.tar.bz2
+Terminal-0.2.12.tar.bz2



From kevin at fedoraproject.org  Mon Apr 20 23:23:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 20 Apr 2009 23:23:42 +0000 (UTC)
Subject: rpms/libxfcegui4/F-11 libxfcegui4.spec, 1.34, 1.35 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090420232342.BCE0070102@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8694

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/F-11/libxfcegui4.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libxfcegui4.spec	2 Mar 2009 20:54:41 -0000	1.34
+++ libxfcegui4.spec	20 Apr 2009 23:23:11 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.6.0
-Release: 3%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfcegui4-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
 - Patch to bring back missing keyboard shortcuts from Xfce 4.4
 - Make devel package require glade3-libgladeui-devel, pkgconfig and gtk-doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 19:58:21 -0000	1.14
+++ sources	20 Apr 2009 23:23:12 -0000	1.15
@@ -1 +1 @@
-8627ae4fad26289f55f0afbebe238bf5  libxfcegui4-4.6.0.tar.bz2
+539cff747634b8ee6f0d2362ee78a286  libxfcegui4-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 19:58:21 -0000	1.14
+++ .cvsignore	20 Apr 2009 23:23:12 -0000	1.15
@@ -1 +1 @@
-libxfcegui4-4.6.0.tar.bz2
+libxfcegui4-4.6.1.tar.bz2



From oget at fedoraproject.org  Mon Apr 20 23:39:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 20 Apr 2009 23:39:42 +0000 (UTC)
Subject: rpms/bouncycastle-mail/F-11 .cvsignore, 1.3,
	1.4 bouncycastle-mail.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090420233942.6541070102@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13417

Modified Files:
	.cvsignore bouncycastle-mail.spec sources 
Log Message:
* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
- Import Bouncy Castle 1.43.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Mar 2009 22:41:28 -0000	1.3
+++ .cvsignore	20 Apr 2009 23:39:09 -0000	1.4
@@ -1 +1 @@
-bcmail-jdk16-142-FEDORA.tar.gz
+bcmail-jdk16-143-FEDORA.tar.gz


Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/bouncycastle-mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bouncycastle-mail.spec	18 Apr 2009 21:57:38 -0000	1.6
+++ bouncycastle-mail.spec	20 Apr 2009 23:39:09 -0000	1.7
@@ -1,10 +1,10 @@
 %define with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
-%define archivever  jdk16-142
+%define archivever  jdk16-143
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
-Version:          1.42
-Release:          4%{?dist}
+Version:          1.43
+Release:          1%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -121,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
+- Import Bouncy Castle 1.43.
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Mar 2009 22:41:28 -0000	1.3
+++ sources	20 Apr 2009 23:39:09 -0000	1.4
@@ -1 +1 @@
-07dd33268dfdf779f3311201bd2319d4  bcmail-jdk16-142-FEDORA.tar.gz
+f31ac1648834921f6271d582c5d90565  bcmail-jdk16-143-FEDORA.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:25 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235225.51DD110F878@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchbugzilla acl on sugar-log (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:27 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235227.ACB9510F88A@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchcommits acl on sugar-log (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:28 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235229.013AA10F88E@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on sugar-log (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:30 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235230.E113E10F891@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on sugar-log (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:47 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235247.A9E5810F886@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchbugzilla acl on sugar-log (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:48 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235248.E0CD010F896@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchcommits acl on sugar-log (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:49 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235249.A7C0010F899@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on sugar-log (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From pkgdb at fedoraproject.org  Mon Apr 20 23:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 20 Apr 2009 23:52:52 +0000
Subject: [pkgdb] sugar-log had acl change status
Message-ID: <20090420235252.B74D510F89C@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on sugar-log (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-log



From dcantrel at fedoraproject.org  Tue Apr 21 00:22:36 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 21 Apr 2009 00:22:36 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhclient-script,1.10,1.11 dhcp.spec,1.252,1.253
Message-ID: <20090421002236.15940700D6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22898

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
- Make dhclient-script work with pre-configured wireless interfaces (#491157)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhclient-script,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dhclient-script	17 Apr 2009 21:32:47 -0000	1.10
+++ dhclient-script	21 Apr 2009 00:22:05 -0000	1.11
@@ -222,7 +222,6 @@
         # IP address changed.  Bringing down the interface will delete all
         # routes, and clear the ARP cache.
         ip -family inet addr flush dev ${interface} >/dev/null 2>&1
-        ip -family inet link set dev ${interface} down
     fi
 
     if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- dhcp.spec	17 Apr 2009 21:32:47 -0000	1.252
+++ dhcp.spec	21 Apr 2009 00:22:05 -0000	1.253
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  17%{?dist}
+Release:  18%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -419,6 +419,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
+- Make dhclient-script work with pre-configured wireless interfaces (#491157)
+
 * Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-17
 - Fix setting default route when client IP address changes (#486512, #473658)
 - 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts



From tuxbrewr at fedoraproject.org  Tue Apr 21 00:37:20 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 21 Apr 2009 00:37:20 +0000 (UTC)
Subject: rpms/conman/F-10 .cvsignore, 1.5, 1.6 conman.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <20090421003720.B08A3700D6@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26713

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2008 14:50:02 -0000	1.5
+++ .cvsignore	21 Apr 2009 00:36:50 -0000	1.6
@@ -1 +1 @@
-conman-0.2.2.tar.bz2
+conman-0.2.4.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-10/conman.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- conman.spec	6 Oct 2008 13:45:05 -0000	1.13
+++ conman.spec	21 Apr 2009 00:36:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:               conman
-Version:            0.2.2
-Release:            2%{?dist}
+Version:            0.2.4
+Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
@@ -98,9 +98,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.2.4-1
+- New upstream release
+
 * Mon Oct 06 2008 Jarod Wilson <jarod at redhat.com> 0.2.2-2
 - The console option in conman.conf is case-insensitive, so relax
-  defined consoles check in initscript (Mark McLoughlin, #465777)
+-  defined consoles check in initscript (Mark McLoughlin, #465777)
 
 * Mon Sep 08 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.2.2-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2008 14:50:02 -0000	1.5
+++ sources	21 Apr 2009 00:36:50 -0000	1.6
@@ -1 +1 @@
-a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2
+77ddcbd9e3a7e2a50c28d4475a2dbda7  conman-0.2.4.tar.bz2



From tuxbrewr at fedoraproject.org  Tue Apr 21 00:45:27 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 21 Apr 2009 00:45:27 +0000 (UTC)
Subject: rpms/conman/F-9 .cvsignore, 1.5, 1.6 conman.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <20090421004527.2EEBA700D6@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28501

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2008 15:01:17 -0000	1.5
+++ .cvsignore	21 Apr 2009 00:45:25 -0000	1.6
@@ -1 +1 @@
-conman-0.2.2.tar.bz2
+conman-0.2.4.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-9/conman.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- conman.spec	6 Oct 2008 20:40:04 -0000	1.12
+++ conman.spec	21 Apr 2009 00:45:25 -0000	1.13
@@ -1,6 +1,6 @@
 Name:               conman
-Version:            0.2.2
-Release:            2%{?dist}
+Version:            0.2.4
+Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
@@ -98,9 +98,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.2.4-1
+- New upstream release
+
 * Mon Oct 06 2008 Jarod Wilson <jarod at redhat.com> 0.2.2-2
 - The console option in conman.conf is case-insensitive, so relax
-  defined consoles check in initscript (Mark McLoughlin, #465777)
+- defined consoles check in initscript (Mark McLoughlin, #465777)
 
 * Mon Sep 08 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.2.2-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2008 15:01:17 -0000	1.5
+++ sources	21 Apr 2009 00:45:25 -0000	1.6
@@ -1 +1 @@
-a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2
+77ddcbd9e3a7e2a50c28d4475a2dbda7  conman-0.2.4.tar.bz2



From dcantrel at fedoraproject.org  Tue Apr 21 01:14:45 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 21 Apr 2009 01:14:45 +0000 (UTC)
Subject: rpms/dhcp/devel dhclient-script,1.10,1.11 dhcp.spec,1.252,1.253
Message-ID: <20090421011445.BF839700D6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2909

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
- Make dhclient-script work with pre-configured wireless interfaces (#491157)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dhclient-script	17 Apr 2009 21:48:50 -0000	1.10
+++ dhclient-script	21 Apr 2009 01:14:15 -0000	1.11
@@ -222,7 +222,6 @@
         # IP address changed.  Bringing down the interface will delete all
         # routes, and clear the ARP cache.
         ip -family inet addr flush dev ${interface} >/dev/null 2>&1
-        ip -family inet link set dev ${interface} down
     fi
 
     if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- dhcp.spec	17 Apr 2009 21:48:50 -0000	1.252
+++ dhcp.spec	21 Apr 2009 01:14:15 -0000	1.253
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  17%{?dist}
+Release:  18%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -419,6 +419,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
+- Make dhclient-script work with pre-configured wireless interfaces (#491157)
+
 * Thu Apr 16 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-17
 - Fix setting default route when client IP address changes (#486512, #473658)
 - 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts



From kevin at fedoraproject.org  Tue Apr 21 02:27:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 02:27:23 +0000 (UTC)
Subject: rpms/xfce4-settings/F-11 xfce4-settings.spec, 1.11, 1.12 sources,
	1.5, 
	1.6 .cvsignore, 1.5, 1.6 xfce4-settings-4.6.0-randr.patch, 1.1, NONE
Message-ID: <20090421022723.0EF46700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17843

Modified Files:
	xfce4-settings.spec sources .cvsignore 
Removed Files:
	xfce4-settings-4.6.0-randr.patch 
Log Message:
Update to 4.6.1



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-settings.spec	16 Apr 2009 21:47:07 -0000	1.11
+++ xfce4-settings.spec	21 Apr 2009 02:26:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
-Version:        4.6.0
-Release:        6%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
-Patch1:		xfce4-settings-4.6.0-randr.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .xrandr
 %patch10 -p1 -b .vendor
 
 %build
@@ -111,6 +109,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Apr 16 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-6
 - Have to add Antialias type to really enable by default. 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Feb 2009 20:09:27 -0000	1.5
+++ sources	21 Apr 2009 02:26:52 -0000	1.6
@@ -1 +1 @@
-ac538c4ab32e3a91f4567141adc3c898  xfce4-settings-4.6.0.tar.bz2
+dc1c8704471c5b0104fa10c30eb60cb6  xfce4-settings-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 20:09:27 -0000	1.5
+++ .cvsignore	21 Apr 2009 02:26:52 -0000	1.6
@@ -1 +1 @@
-xfce4-settings-4.6.0.tar.bz2
+xfce4-settings-4.6.1.tar.bz2


--- xfce4-settings-4.6.0-randr.patch DELETED ---



From kevin at fedoraproject.org  Tue Apr 21 02:28:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 02:28:58 +0000 (UTC)
Subject: rpms/xfce4-panel/F-11 xfce4-panel.spec, 1.36, 1.37 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090421022858.165D4700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18103

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/F-11/xfce4-panel.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xfce4-panel.spec	2 Mar 2009 23:54:22 -0000	1.36
+++ xfce4-panel.spec	21 Apr 2009 02:28:27 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
@@ -125,6 +125,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Require xfce4-doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:33:29 -0000	1.14
+++ sources	21 Apr 2009 02:28:27 -0000	1.15
@@ -1 +1 @@
-b4c7cce05cc858d11c9dcd4c2f8dbfdb  xfce4-panel-4.6.0.tar.bz2
+73a366b9892152266b465d7d9c35bef4  xfce4-panel-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:33:29 -0000	1.14
+++ .cvsignore	21 Apr 2009 02:28:27 -0000	1.15
@@ -1 +1 @@
-xfce4-panel-4.6.0.tar.bz2
+xfce4-panel-4.6.1.tar.bz2



From kevin at fedoraproject.org  Tue Apr 21 02:29:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 02:29:56 +0000 (UTC)
Subject: rpms/xfce4-session/F-11 xfce4-session.spec, 1.27, 1.28 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090421022956.8365C700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18364

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/F-11/xfce4-session.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xfce4-session.spec	27 Feb 2009 20:20:54 -0000	1.27
+++ xfce4-session.spec	21 Apr 2009 02:29:25 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -124,6 +124,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 - Remove some unneeded BuildRequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:20:54 -0000	1.14
+++ sources	21 Apr 2009 02:29:25 -0000	1.15
@@ -1 +1 @@
-79a08c3696196ef31fc8185658316706  xfce4-session-4.6.0.tar.bz2
+7628be41ed3511a20cff5673d9d39858  xfce4-session-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:20:54 -0000	1.14
+++ .cvsignore	21 Apr 2009 02:29:25 -0000	1.15
@@ -1 +1 @@
-xfce4-session-4.6.0.tar.bz2
+xfce4-session-4.6.1.tar.bz2



From kevin at fedoraproject.org  Tue Apr 21 02:30:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 02:30:24 +0000 (UTC)
Subject: rpms/xfce-utils/F-11 xfce-utils.spec, 1.29, 1.30 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090421023024.8EC3E700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18789

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/F-11/xfce-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfce-utils.spec	2 Mar 2009 21:26:37 -0000	1.29
+++ xfce-utils.spec	21 Apr 2009 02:30:24 -0000	1.30
@@ -2,8 +2,8 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2
@@ -128,6 +128,9 @@
 %doc %{_datadir}/xfce4/doc/xfce-chunk.css
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Make separate xfce4-doc package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:23:10 -0000	1.14
+++ sources	21 Apr 2009 02:30:24 -0000	1.15
@@ -1 +1 @@
-b192940801a7bd9bb800e570a299ecde  xfce-utils-4.6.0.tar.bz2
+1aa2362b11e79e56d52ce0d265faf1b6  xfce-utils-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:23:10 -0000	1.14
+++ .cvsignore	21 Apr 2009 02:30:24 -0000	1.15
@@ -1 +1 @@
-xfce-utils-4.6.0.tar.bz2
+xfce-utils-4.6.1.tar.bz2



From kevin at fedoraproject.org  Tue Apr 21 02:32:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 02:32:00 +0000 (UTC)
Subject: rpms/xfwm4/F-11 xfwm4.spec, 1.33, 1.34 sources, 1.15,
	1.16 .cvsignore, 1.15, 1.16
Message-ID: <20090421023200.63ECC700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19263

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/F-11/xfwm4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xfwm4.spec	13 Apr 2009 20:31:16 -0000	1.33
+++ xfwm4.spec	21 Apr 2009 02:31:29 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
@@ -72,6 +72,9 @@
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Sat Feb 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Require xfce4-doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	27 Feb 2009 20:29:37 -0000	1.15
+++ sources	21 Apr 2009 02:31:29 -0000	1.16
@@ -1 +1 @@
-83cd2f82f2fabfe4ab28a9780fbf309e  xfwm4-4.6.0.tar.bz2
+538ff2554a23bf877d336e573884da9a  xfwm4-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Feb 2009 20:29:37 -0000	1.15
+++ .cvsignore	21 Apr 2009 02:31:29 -0000	1.16
@@ -1 +1 @@
-xfwm4-4.6.0.tar.bz2
+xfwm4-4.6.1.tar.bz2



From dcantrel at fedoraproject.org  Tue Apr 21 02:40:03 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 21 Apr 2009 02:40:03 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.1.0-IFNAMSIZ.patch, NONE, 1.1 dhcp.spec,
	1.253, 1.254
Message-ID: <20090421024003.6A36A700D6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21555

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0-IFNAMSIZ.patch 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
- Restrict interface names given on the dhcpd command line to length
  IFNAMSIZ or shorter (#441524)


dhcp-4.1.0-IFNAMSIZ.patch:

--- NEW FILE dhcp-4.1.0-IFNAMSIZ.patch ---
diff -up dhcp-4.1.0/server/dhcpd.c.ifnamsiz dhcp-4.1.0/server/dhcpd.c
--- dhcp-4.1.0/server/dhcpd.c.ifnamsiz	2009-04-20 16:35:30.000000000 -1000
+++ dhcp-4.1.0/server/dhcpd.c	2009-04-20 15:45:15.000000000 -1000
@@ -401,7 +401,7 @@ main(int argc, char **argv) {
 				log_fatal ("Insufficient memory to %s %s: %s",
 					   "record interface", argv [i],
 					   isc_result_totext (result));
-			strcpy (tmp -> name, argv [i]);
+			strncpy (tmp -> name, argv [i], sizeof (tmp -> name));
 			if (interfaces) {
 				interface_reference (&tmp -> next,
 						     interfaces, MDL);


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- dhcp.spec	21 Apr 2009 01:14:15 -0000	1.253
+++ dhcp.spec	21 Apr 2009 02:39:32 -0000	1.254
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  18%{?dist}
+Release:  19%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -45,6 +45,7 @@
 Patch16:  %{name}-4.1.0-port-validation.patch
 Patch17:  %{name}-4.1.0-invalid-dhclient-conf.patch
 Patch18:  %{name}-4.1.0-missing-ipv6-not-fatal.patch
+Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -187,6 +188,9 @@
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19367]
 %patch18 -p1
 
+# Read only up to IFNAMSIZ characters for the interface name in dhcpd (#441524)
+%patch19 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -419,6 +423,10 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
+- Restrict interface names given on the dhcpd command line to length
+  IFNAMSIZ or shorter (#441524)
+
 * Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
 - Make dhclient-script work with pre-configured wireless interfaces (#491157)
 



From kkofler at fedoraproject.org  Tue Apr 21 03:00:47 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 03:00:47 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.193,1.194
Message-ID: <20090421030047.37C7D700D6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25775/devel

Modified Files:
	kdebindings.spec 
Log Message:
* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- F11+: enable csharp on ppc64


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdebindings.spec	15 Apr 2009 22:52:37 -0000	1.193
+++ kdebindings.spec	21 Apr 2009 03:00:16 -0000	1.194
@@ -3,6 +3,11 @@
 %ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 %define csharp 1
 %endif
+%if 0%{?fedora} > 10
+%ifarch ppc64
+%define csharp 1
+%endif
+%endif
 %define falcon 1
 %define php 1
 %define ruby 1
@@ -24,7 +29,7 @@
 
 Name: kdebindings
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -475,6 +480,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+- F11+: enable csharp on ppc64
+
 * Wed Apr 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
 - reenable csharp on ppc
 



From kkofler at fedoraproject.org  Tue Apr 21 03:00:47 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 03:00:47 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec,1.193,1.194
Message-ID: <20090421030047.10E8B700D6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25775/F-11

Modified Files:
	kdebindings.spec 
Log Message:
* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- F11+: enable csharp on ppc64


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdebindings.spec	15 Apr 2009 22:52:36 -0000	1.193
+++ kdebindings.spec	21 Apr 2009 03:00:16 -0000	1.194
@@ -3,6 +3,11 @@
 %ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 %define csharp 1
 %endif
+%if 0%{?fedora} > 10
+%ifarch ppc64
+%define csharp 1
+%endif
+%endif
 %define falcon 1
 %define php 1
 %define ruby 1
@@ -24,7 +29,7 @@
 
 Name: kdebindings
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -475,6 +480,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+- F11+: enable csharp on ppc64
+
 * Wed Apr 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
 - reenable csharp on ppc
 



From kkofler at fedoraproject.org  Tue Apr 21 03:47:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 03:47:32 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.257, 
	1.258
Message-ID: <20090421034732.87D28700D6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4480/devel

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
- Move files required by system-config-printer-kde to -libs (#496646)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- system-config-printer.spec	14 Apr 2009 17:03:57 -0000	1.257
+++ system-config-printer.spec	21 Apr 2009 03:46:59 -0000	1.258
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -109,6 +109,10 @@
 %{python_sitelib}/cupshelpers/openprinting.py*
 %{python_sitelib}/cupshelpers/ppds.py*
 %{python_sitelib}/*.egg-info
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/config.py*
+%{_datadir}/%{name}/debug.py*
+%{_datadir}/%{name}/smburi.py*
 
 %files
 %defattr(-,root,root,-)
@@ -116,12 +120,9 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
 %{_bindir}/my-default-printer
-%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
-%{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
-%{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/errordialogs.py*
 %{_datadir}/%{name}/glade.py*
 %{_datadir}/%{name}/GroupsPane.py*
@@ -140,7 +141,6 @@
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/SearchCriterion.py*
-%{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
 %{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/timedops.py*
@@ -165,6 +165,9 @@
 exit 0
 
 %changelog
+* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
+- Move files required by system-config-printer-kde to -libs (#496646)
+
 * Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-1
 - Requires dbus-python (bug #495392).
 - Updated to 1.1.7:



From kkofler at fedoraproject.org  Tue Apr 21 03:47:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 03:47:32 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 system-config-printer.spec, 1.257, 
	1.258
Message-ID: <20090421034732.9F76C7013C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4480/F-11

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
- Move files required by system-config-printer-kde to -libs (#496646)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- system-config-printer.spec	14 Apr 2009 17:03:57 -0000	1.257
+++ system-config-printer.spec	21 Apr 2009 03:46:59 -0000	1.258
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -109,6 +109,10 @@
 %{python_sitelib}/cupshelpers/openprinting.py*
 %{python_sitelib}/cupshelpers/ppds.py*
 %{python_sitelib}/*.egg-info
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/config.py*
+%{_datadir}/%{name}/debug.py*
+%{_datadir}/%{name}/smburi.py*
 
 %files
 %defattr(-,root,root,-)
@@ -116,12 +120,9 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
 %{_bindir}/my-default-printer
-%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
-%{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
-%{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/errordialogs.py*
 %{_datadir}/%{name}/glade.py*
 %{_datadir}/%{name}/GroupsPane.py*
@@ -140,7 +141,6 @@
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/SearchCriterion.py*
-%{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
 %{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/timedops.py*
@@ -165,6 +165,9 @@
 exit 0
 
 %changelog
+* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
+- Move files required by system-config-printer-kde to -libs (#496646)
+
 * Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-1
 - Requires dbus-python (bug #495392).
 - Updated to 1.1.7:



From lkundrak at fedoraproject.org  Tue Apr 21 04:15:47 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 21 Apr 2009 04:15:47 +0000 (UTC)
Subject: rpms/links/devel links.spec,1.2,1.3
Message-ID: <20090421041547.BE1C2700D6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/links/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13490/devel

Modified Files:
	links.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-9
- Add epoch to beat elinks obsoletes



Index: links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/links/devel/links.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- links.spec	13 Apr 2009 17:34:58 -0000	1.2
+++ links.spec	21 Apr 2009 04:15:45 -0000	1.3
@@ -1,6 +1,7 @@
 Name:           links
 Version:        2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
+Epoch:          1
 Summary:        Web browser running in both graphics and text mode
 
 Group:          Applications/Internet
@@ -106,6 +107,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-9
+- Add epoch to beat elinks obsoletes
+
 * Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-8
 - Enable SSL certificates verification
 



From lkundrak at fedoraproject.org  Tue Apr 21 04:16:16 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 21 Apr 2009 04:16:16 +0000 (UTC)
Subject: rpms/links/F-11 links.spec,1.2,1.3
Message-ID: <20090421041616.66032700D6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/links/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13490/F-11

Modified Files:
	links.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-9
- Add epoch to beat elinks obsoletes



Index: links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/links/F-11/links.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- links.spec	13 Apr 2009 17:34:58 -0000	1.2
+++ links.spec	21 Apr 2009 04:15:45 -0000	1.3
@@ -1,6 +1,7 @@
 Name:           links
 Version:        2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
+Epoch:          1
 Summary:        Web browser running in both graphics and text mode
 
 Group:          Applications/Internet
@@ -106,6 +107,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-9
+- Add epoch to beat elinks obsoletes
+
 * Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-8
 - Enable SSL certificates verification
 



From kevin at fedoraproject.org  Tue Apr 21 04:25:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 04:25:58 +0000 (UTC)
Subject: rpms/Thunar/F-11 Thunar.spec, 1.23, 1.24 sources, 1.10,
	1.11 .cvsignore, 1.10, 1.11
Message-ID: <20090421042558.5B408700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16899

Modified Files:
	Thunar.spec sources .cvsignore 
Log Message:
Update to 1.0.1



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-11/Thunar.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Thunar.spec	27 Feb 2009 20:14:57 -0000	1.23
+++ Thunar.spec	21 Apr 2009 04:25:27 -0000	1.24
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.0/src/Thunar-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
 Source1: thunar-sendto-bluetooth.desktop
 Source2: thunar-sendto-audacious-playlist.desktop
 Group: User Interface/Desktops
@@ -198,6 +198,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 1.0.1-1
+- Update to 1.0.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.0.0-1
 - Update to 1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Feb 2009 20:14:57 -0000	1.10
+++ sources	21 Apr 2009 04:25:27 -0000	1.11
@@ -1 +1 @@
-468c240a4f65a217ec2b6132e85cd84e  Thunar-1.0.0.tar.bz2
+218373aa45d74b6ba8c69c4d5af3bb19  Thunar-1.0.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Feb 2009 20:14:57 -0000	1.10
+++ .cvsignore	21 Apr 2009 04:25:27 -0000	1.11
@@ -1 +1 @@
-Thunar-1.0.0.tar.bz2
+Thunar-1.0.1.tar.bz2



From rakesh at fedoraproject.org  Tue Apr 21 04:28:11 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 21 Apr 2009 04:28:11 +0000 (UTC)
Subject: rpms/coredumper/F-11 coredumper_unittest_c.patch, NONE,
	1.1 coredumper.spec, 1.2, 1.3
Message-ID: <20090421042811.DA5E2700D6@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/coredumper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17561

Modified Files:
	coredumper.spec 
Added Files:
	coredumper_unittest_c.patch 
Log Message:

Fix for test suite -- (as per changed GDB messages).


coredumper_unittest_c.patch:

--- NEW FILE coredumper_unittest_c.patch ---
--- coredumper-1.2.1/src/coredumper_unittest.c-orig	2008-04-02 02:31:17.000000000 +0200
+++ coredumper-1.2.1/src/coredumper_unittest.c	2009-04-20 11:07:20.000000000 +0200
@@ -424,7 +424,7 @@ static void CheckWithGDB(FILE *input, FI
    * to gdb. "*" is a glob wildcard character.
    */
   static const char *msg[] = { "Core was generated by",
-                               " @ process * *"DUMPFUNCTION,
+                               " @ Thread * *"DUMPFUNCTION,
                                "[Switching to thread * *"DUMPFUNCTION,
                                "#* *CoreDump",
                                "#@ * TestCoreDump",
@@ -432,7 +432,7 @@ static void CheckWithGDB(FILE *input, FI
                                "$1 = ",
 #ifdef THREADS
                                " Busy",
-                               " @ process * Busy",
+                               " @ Thread * Busy",
                                "[Switching to thread * Busy",
                                "Busy",
                                "Busy",


Index: coredumper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coredumper/F-11/coredumper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coredumper.spec	24 Feb 2009 09:11:32 -0000	1.2
+++ coredumper.spec	21 Apr 2009 04:27:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           coredumper
 Version:        1.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library to create core dumps
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@
 URL:            http://code.google.com/p/google-%{name}/
 Source0:        http://google-%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         coredumper-remove_linux_dirent_h.patch
+Patch1:         coredumper_unittest_c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  binutils, gdb
 
@@ -38,6 +39,7 @@
 %setup -q
 
 %patch0 -p1 -b .remove_linux_dirent_h
+%patch1 -p1 -b .coredumper_unittest_c
 
 %build
 %configure --enable-static=no
@@ -80,6 +82,9 @@
 %{_includedir}/google/*.h
 
 %changelog
+* Mon Apr 20 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.1-8
+- GDB messages changed, fixes the test suite - by Jan Kratochvil (FTBFS #496523)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kevin at fedoraproject.org  Tue Apr 21 04:28:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 04:28:15 +0000 (UTC)
Subject: rpms/xfce4-mixer/F-11 xfce4-mixer.spec, 1.25, 1.26 .cvsignore, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20090421042815.08456700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17666

Modified Files:
	xfce4-mixer.spec .cvsignore sources 
Log Message:
Update to 4.6.1



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/F-11/xfce4-mixer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xfce4-mixer.spec	27 Feb 2009 20:36:12 -0000	1.25
+++ xfce4-mixer.spec	21 Apr 2009 04:27:44 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -67,6 +67,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Feb 2009 20:36:12 -0000	1.13
+++ .cvsignore	21 Apr 2009 04:27:44 -0000	1.14
@@ -1 +1 @@
-xfce4-mixer-4.6.0.tar.bz2
+xfce4-mixer-4.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Feb 2009 20:36:12 -0000	1.13
+++ sources	21 Apr 2009 04:27:44 -0000	1.14
@@ -1 +1 @@
-ee7956a73efe43da4b27ad9cd1f4d20b  xfce4-mixer-4.6.0.tar.bz2
+a99e2455445480ef5081fe69454a46fc  xfce4-mixer-4.6.1.tar.bz2



From mclasen at fedoraproject.org  Tue Apr 21 04:52:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 21 Apr 2009 04:52:48 +0000 (UTC)
Subject: rpms/ConsoleKit/F-11 null-warning.patch, NONE, 1.1 ConsoleKit.spec, 
	1.40, 1.41
Message-ID: <20090421045248.C5637700D6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23988

Modified Files:
	ConsoleKit.spec 
Added Files:
	null-warning.patch 
Log Message:
Avoid a (harmless) warning


null-warning.patch:

--- NEW FILE null-warning.patch ---
diff -up ConsoleKit-0.3.0/src/ck-manager.c.null-warning ConsoleKit-0.3.0/src/ck-manager.c
--- ConsoleKit-0.3.0/src/ck-manager.c.null-warning	2009-04-20 23:55:53.248884043 -0400
+++ ConsoleKit-0.3.0/src/ck-manager.c	2009-04-20 23:56:27.736126951 -0400
@@ -1213,7 +1213,7 @@ session_is_real_user (CkSession *session
 
         g_object_get (session,
                       "unix-user", &uid,
-                      "session-type", session_type,
+                      "session-type", &session_type,
                       NULL);
 
         username = get_user_name (uid);


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/F-11/ConsoleKit.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ConsoleKit.spec	8 Apr 2009 15:51:16 -0000	1.40
+++ ConsoleKit.spec	21 Apr 2009 04:52:44 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -31,6 +31,9 @@
 
 Patch2: ConsoleKit-skipvalidation.patch
 
+# http://bugs.freedesktop.org/show_bug.cgi?id=21310
+Patch3: null-warning.patch
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -88,6 +91,7 @@
 %patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
 %patch1 -p1 -b .consolekit
 %patch2 -p1 -b .skipvalidation
+%patch3 -p1 -b .null-warning
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -168,6 +172,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Apr 21 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-8
+- Fix a warning on login (#496636)
+
 * Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-7
 - Allow GetSessions calls in the dbus policy
 



From mclasen at fedoraproject.org  Tue Apr 21 04:56:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 21 Apr 2009 04:56:18 +0000 (UTC)
Subject: rpms/ConsoleKit/devel null-warning.patch, NONE, 1.1 ConsoleKit.spec,
	1.40, 1.41
Message-ID: <20090421045618.355B2700D6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25085

Modified Files:
	ConsoleKit.spec 
Added Files:
	null-warning.patch 
Log Message:
fix a (harmless) warning


null-warning.patch:

--- NEW FILE null-warning.patch ---
diff -up ConsoleKit-0.3.0/src/ck-manager.c.null-warning ConsoleKit-0.3.0/src/ck-manager.c
--- ConsoleKit-0.3.0/src/ck-manager.c.null-warning	2009-04-20 23:55:53.248884043 -0400
+++ ConsoleKit-0.3.0/src/ck-manager.c	2009-04-20 23:56:27.736126951 -0400
@@ -1213,7 +1213,7 @@ session_is_real_user (CkSession *session
 
         g_object_get (session,
                       "unix-user", &uid,
-                      "session-type", session_type,
+                      "session-type", &session_type,
                       NULL);
 
         username = get_user_name (uid);


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ConsoleKit.spec	8 Apr 2009 15:51:16 -0000	1.40
+++ ConsoleKit.spec	21 Apr 2009 04:56:15 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -31,6 +31,9 @@
 
 Patch2: ConsoleKit-skipvalidation.patch
 
+# http://bugs.freedesktop.org/show_bug.cgi?id=21310
+Patch3: null-warning.patch
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -88,6 +91,7 @@
 %patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
 %patch1 -p1 -b .consolekit
 %patch2 -p1 -b .skipvalidation
+%patch3 -p1 -b .null-warning
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -168,6 +172,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Apr 21 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-8
+- Fix a warning on login (#496636)
+
 * Wed Apr  8 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-7
 - Allow GetSessions calls in the dbus policy
 



From lkundrak at fedoraproject.org  Tue Apr 21 05:01:30 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 21 Apr 2009 05:01:30 +0000 (UTC)
Subject: rpms/man/F-11 makewhatis.crondaily,1.4,1.5 man.spec,1.79,1.80
Message-ID: <20090421050130.4E48C700D6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26273/F-11

Modified Files:
	makewhatis.crondaily man.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
- The daily cron job is not a configuration file



Index: makewhatis.crondaily
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-11/makewhatis.crondaily,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makewhatis.crondaily	27 Oct 2006 08:09:52 -0000	1.4
+++ makewhatis.crondaily	21 Apr 2009 05:00:59 -0000	1.5
@@ -16,5 +16,13 @@
 
 trap "{ rm -f $LOCKFILE ; exit 255; }" EXIT
 touch $LOCKFILE
-makewhatis -u -w
+# Rebuild the database if makewhatis was since last full run,
+# otherwise just update with new pages
+if [ ! -f /var/cache/man/whatis ] ||
+   find /usr/sbin/makewhatis -newer /var/cache/man/whatis |grep -q .
+then
+	makewhatis -w
+else
+	makewhatis -U -w
+fi
 exit 0


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-11/man.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- man.spec	20 Apr 2009 19:47:39 -0000	1.79
+++ man.spec	21 Apr 2009 05:00:59 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -245,12 +245,12 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%config(noreplace) /etc/cron.daily/makewhatis.cron
-%config(noreplace) /etc/man.config
+%{_sysconfdir}/cron.daily/makewhatis.cron
+%config(noreplace) %{_sysconfdir}/man.config
 %if %{usecache}
-%attr(2755,root,man)    /usr/bin/man
+%attr(2755,root,man)    %{_bindir}/man
 %else
-%attr(0755,root,root)   /usr/bin/man
+%attr(0755,root,root)   %{_bindir}/man
 %endif
 %{_bindir}/manpath
 %{_bindir}/apropos
@@ -270,6 +270,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
+- The daily cron job is not a configuration file
+
 * Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
 - Get rid of slow weekly updates
 - Make daily updates reliable



From lkundrak at fedoraproject.org  Tue Apr 21 05:01:30 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 21 Apr 2009 05:01:30 +0000 (UTC)
Subject: rpms/man/devel man.spec,1.79,1.80
Message-ID: <20090421050130.838BF700D6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26273/devel

Modified Files:
	man.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
- The daily cron job is not a configuration file



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- man.spec	20 Apr 2009 19:47:40 -0000	1.79
+++ man.spec	21 Apr 2009 05:01:00 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -245,12 +245,12 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%config(noreplace) /etc/cron.daily/makewhatis.cron
-%config(noreplace) /etc/man.config
+%{_sysconfdir}/cron.daily/makewhatis.cron
+%config(noreplace) %{_sysconfdir}/man.config
 %if %{usecache}
-%attr(2755,root,man)    /usr/bin/man
+%attr(2755,root,man)    %{_bindir}/man
 %else
-%attr(0755,root,root)   /usr/bin/man
+%attr(0755,root,root)   %{_bindir}/man
 %endif
 %{_bindir}/manpath
 %{_bindir}/apropos
@@ -270,6 +270,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
+- The daily cron job is not a configuration file
+
 * Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
 - Get rid of slow weekly updates
 - Make daily updates reliable



From bskeggs at fedoraproject.org  Tue Apr 21 05:10:02 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 21 Apr 2009 05:10:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-11 nouveau-fb-resize.patch, 1.2,
	1.3 xorg-x11-drv-nouveau.spec, 1.42, 1.43
Message-ID: <20090421051002.DB98A700D6@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267

Modified Files:
	nouveau-fb-resize.patch xorg-x11-drv-nouveau.spec 
Log Message:
* Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-31.20090421git47bb00f
- fix for rh#496559



nouveau-fb-resize.patch:

Index: nouveau-fb-resize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-fb-resize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-fb-resize.patch	20 Apr 2009 23:06:47 -0000	1.2
+++ nouveau-fb-resize.patch	21 Apr 2009 05:10:01 -0000	1.3
@@ -1,16 +1,16 @@
-From 338c31fa8624b401a5f98724c498367351ce4acf Mon Sep 17 00:00:00 2001
+From 7e4b7775589cff4433de1f3dfa1416c66cdfe060 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at caspar.localdomain>
 Date: Tue, 14 Apr 2009 09:23:07 +1000
 Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps
 
 ---
  src/drmmode_display.c |   75 +++++++++++++++++++++++++++++++--
- src/nouveau_exa.c     |    8 ++-
+ src/nouveau_exa.c     |   17 ++++----
  src/nv50_randr.c      |    6 +++
  src/nv_crtc.c         |   16 ++++++-
  src/nv_driver.c       |  108 ++++++++++++++++++++++++++++++++++++++++++++++---
  src/nv_type.h         |    9 ++++-
- 6 files changed, 205 insertions(+), 17 deletions(-)
+ 6 files changed, 209 insertions(+), 22 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
 index ca1a60b..c666c9f 100644
@@ -122,7 +122,7 @@
  }
  
 diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index aee2794..6da7d36 100644
+index aee2794..41e3f85 100644
 --- a/src/nouveau_exa.c
 +++ b/src/nouveau_exa.c
 @@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
@@ -137,7 +137,17 @@
  	} else {
  		/* force migration */
  		return FALSE;
-@@ -543,10 +546,9 @@ Bool
+@@ -301,7 +304,8 @@ nouveau_exa_finish_access(PixmapPtr ppix, int index)
+ 	if (ppix == pScreen->GetScreenPixmap(pScreen)) {
+ 		ppix->devPrivate.ptr = NULL;
+ 		nouveau_bo_unmap(pNv->scanout);
+-		nv50_shadow_damage_frontbuffer_fallback(pScrn);
++		if (pNv->Architecture == NV_ARCH_50)
++			nv50_shadow_damage_frontbuffer_fallback(pScrn);
+ 	}
+ }
+ 
+@@ -543,10 +547,9 @@ Bool
  nouveau_exa_pixmap_is_onscreen(PixmapPtr ppix)
  {
  	ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
@@ -149,6 +159,19 @@
  		return TRUE;
  
  	return FALSE;
+@@ -630,10 +633,8 @@ nouveau_exa_init(ScreenPtr pScreen)
+ 	}
+ 
+ 	/* Needed for frontbuffer fallbacks (to ensure it accesses the linear fb). */
+-	if (pNv->Architecture >= NV_ARCH_50) {
+-		exa->PrepareAccess = nouveau_exa_prepare_access;
+-		exa->FinishAccess = nouveau_exa_finish_access;
+-	}
++	exa->PrepareAccess = nouveau_exa_prepare_access;
++	exa->FinishAccess = nouveau_exa_finish_access;
+ 
+ 	exa->MarkSync = nouveau_exa_mark_sync;
+ 	exa->WaitMarker = nouveau_exa_wait_marker;
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
 index 538c883..c451ba3 100644
 --- a/src/nv50_randr.c


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-x11-drv-nouveau.spec	20 Apr 2009 23:06:47 -0000	1.42
+++ xorg-x11-drv-nouveau.spec	21 Apr 2009 05:10:01 -0000	1.43
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   30.%{snapshot}%{?dist}
+Release:   31.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -85,7 +85,10 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
-* Mon Apr 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-30.20090421git47bb00f
+* Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-31.20090421git47bb00f
+- fix for rh#496559
+
+* Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-30.20090421git47bb00f
 - fix for rh#489101
 
 * Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111



From ondrejj at fedoraproject.org  Tue Apr 21 05:20:11 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 21 Apr 2009 05:20:11 +0000 (UTC)
Subject: rpms/sagator/F-11 .cvsignore, 1.7, 1.8 import.log, 1.5,
	1.6 sagator.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090421052011.4688D700D6@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/sagator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31340/F-11

Modified Files:
	.cvsignore import.log sagator.spec sources 
Log Message:
Fix beta problems


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2009 15:38:59 -0000	1.7
+++ .cvsignore	21 Apr 2009 05:19:40 -0000	1.8
@@ -1 +1 @@
-sagator-1.2.0-0.beta3.tar.bz2
+sagator-1.2.0-0.beta25.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	22 Feb 2009 15:39:00 -0000	1.5
+++ import.log	21 Apr 2009 05:19:40 -0000	1.6
@@ -3,3 +3,4 @@
 sagator-1_2_0-0_beta1_fc10:HEAD:sagator-1.2.0-0.beta1.fc10.src.rpm:1234956125
 sagator-1_2_0-0_beta2_fc10:HEAD:sagator-1.2.0-0.beta2.fc10.src.rpm:1235139967
 sagator-1_2_0-0_beta3_fc10:HEAD:sagator-1.2.0-0.beta3.fc10.src.rpm:1235317110
+sagator-1_2_0-0_beta25_fc10:F-11:sagator-1.2.0-0.beta25.fc10.src.rpm:1240291127


Index: sagator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-11/sagator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sagator.spec	25 Feb 2009 22:25:25 -0000	1.8
+++ sagator.spec	21 Apr 2009 05:19:40 -0000	1.9
@@ -8,8 +8,8 @@
 Summary:   Antivir/antispam gateway for smtp server
 Name:      sagator
 Version:   1.2.0
-Release:   0.beta3%{?dist}.1
-Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}-0.beta3.tar.bz2
+Release:   0.beta25%{?dist}
+Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}-0.beta25.tar.bz2
 URL:       http://www.salstar.sk/sagator/
 License:   GPLv2+
 Group:     System Environment/Daemons
@@ -22,7 +22,7 @@
 %if %_vendor == "suse"
 Requires:  clamav >= %{CLAMAV_VERSION}
 %else
-Requires:  clamav-lib >= %{CLAMAV_VERSION}
+Requires:  clamav-lib >= %{CLAMAV_VERSION}, clamav-update
 %endif
 
 %description
@@ -35,16 +35,23 @@
 can parse MIME mails and decompress archives, if it is configured so.
 
 Features:
+    *  simple chroot support
     * modular antivirus/spamchecker support
+          o you can attach an intrascanner to another intrascanner or realscanner
+          o you can combine intrascanners
+          o you can combine realscanners
+          o virus/spam level based scanners
+    * database support
+          o SQL logging
+          o dynamic scanner (antivirus/antispam) configuration
+    * daily reports for users
+    * web quarantine accessible for all users
     * you don't need any perl modules or any other modules, only python
     * you can return any quarantined mail to mailq/user mailbox
     * mailbox/maildir scanning and cleaning
     * smtp policy service (greylist)
-    * nice statistics via RRDTOOL or MRTG
-    * web-quarantine access for users
-    * daily reports for users
-    * SQL database logging and configuration
-    * simple chroot support
+    * nice statistics via WWW or MRTG
+    * easy installation and configuration
 
 %package core
 Summary:        Antivir/antispam gateway for smtp server, core files
@@ -75,8 +82,7 @@
 %package webq
 Summary:        SAGATOR's web quarantine access
 Group:          System Environment/Daemons
-Requires:       sagator-core = %{version}-%{release}, python-kid >= 0.9.5
-BuildRequires:  python-kid
+Requires:       sagator-core = %{version}-%{release}, python-genshi >= 0.4
 
 %description webq
 SAGATOR's web quarantine access can be used to allow users (or admin)
@@ -220,7 +226,7 @@
 %defattr(-,root,root)   
 %dir %{_datadir}/%{name}/srv/web
 %{_datadir}/%{name}/srv/web/*.py*
-%{_datadir}/%{name}/srv/web/*.kid
+%{_datadir}/%{name}/srv/web/*.html
 
 %if %{install_sepolicy}
 %files selinux
@@ -230,10 +236,7 @@
 %endif
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-0.beta3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Sep 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.0-0.beta3
+* Wed Sep 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.0-0.beta25
 - core files moved to core packages, sagator package now requires clamav
   and spamassassin
 - added selinux policy dir


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Feb 2009 15:39:00 -0000	1.7
+++ sources	21 Apr 2009 05:19:40 -0000	1.8
@@ -1 +1 @@
-049b54eb7e13c3b4b84e512b002a10f2  sagator-1.2.0-0.beta3.tar.bz2
+ff3615788eebfe9436350199987bf297  sagator-1.2.0-0.beta25.tar.bz2



From airlied at fedoraproject.org  Tue Apr 21 05:20:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 21 Apr 2009 05:20:52 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.79,
	1.80 kernel.spec, 1.1564, 1.1565
Message-ID: <20090421052052.BC863700D6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31699

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Tue Apr 21 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-103
- radeon kms: fix lcd edid detection + fix legacy crtc setup


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- drm-modesetting-radeon.patch	17 Apr 2009 10:37:36 -0000	1.79
+++ drm-modesetting-radeon.patch	21 Apr 2009 05:20:50 -0000	1.80
@@ -1,3 +1,42 @@
+commit ef416eafca3c5ed83b089e90fb50c15062accecd
+Merge: fa4687f f891418
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 21 15:13:21 2009 +1000
+
+    Merge remote branch 'origin/drm-rawhide' into drm-f11
+
+commit f891418afa0e216bfaba22865ef06a72a6c74474
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Tue Apr 21 14:29:32 2009 +1000
+
+    radeon: legacy fix more desktop layout scenarios
+
+commit 4b59aa2f4e377fd35bb00462030549eafde0a39c
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Tue Apr 21 13:34:38 2009 +1000
+
+    radeon: legacy crtc, set buffer pitch at set base time.
+    
+    this deals with the case where the fb resizes but we don't switch modes
+
+commit cd12e87b4f13f717caf4bd81b46b25072f6d9ed0
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Tue Apr 21 11:55:16 2009 +1000
+
+    radeon: fixup bandwidth calcs for second legacy head
+
+commit b462b817a8dee1e8b69f8118862e77674a56faa4
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Tue Apr 21 11:15:52 2009 +1000
+
+    radeon: fix bios parsing bug for LCD DDC, also make LCD code use core ddc
+
+commit 5d9a97d1d81e5d0c0115e01d7a1cf7b3f72b3c0d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 20:49:35 2009 +1000
+
+    drm: add missing helper commit
+
 commit fa4687fdb659e807b8e3b05bf971f79e7aebde62
 Merge: 9283b7e 389363f
 Author: Dave Airlie <airlied at redhat.com>
@@ -17376,10 +17415,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
 new file mode 100644
-index 0000000..fab8f75
+index 0000000..5f5a4cb
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_combios.c
-@@ -0,0 +1,1767 @@
+@@ -0,0 +1,1768 @@
 +/*
 + * Copyright 2004 ATI Technologies Inc., Markham, Ontario
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -18547,6 +18586,7 @@
 +					ddc_i2c.get_data_mask = radeon_bios32(dev_priv, lcd_ddc_info + 7);
 +					break;
 +				default:
++					ddc_i2c.valid = false;
 +					break;
 +				}
 +				DRM_DEBUG("LCD DDC Info Table found!\n");
@@ -19149,10 +19189,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
 new file mode 100644
-index 0000000..cd3acf0
+index 0000000..2696f22
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
-@@ -0,0 +1,608 @@
+@@ -0,0 +1,600 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -19306,17 +19346,9 @@
 +	struct drm_display_mode *mode;
 +
 +	if (radeon_connector->ddc_bus) {
-+		radeon_i2c_do_lock(radeon_connector, 1);
-+		edid = drm_get_edid(connector, &radeon_connector->ddc_bus->adapter);
-+		radeon_i2c_do_lock(radeon_connector, 0);
-+		if (edid) {
-+			drm_mode_connector_update_edid_property(&radeon_connector->base, edid);
-+			ret = drm_add_edid_modes(&radeon_connector->base, edid);
-+			kfree(edid);
-+			if (ret == 0)
-+				goto native;
++		ret = radeon_ddc_get_modes(radeon_connector);
++		if (ret > 0)
 +			return ret;
-+		}
 +	}
 +
 +native:
@@ -22763,7 +22795,7 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..bb2f0d8
+index 0000000..78f23da
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
 @@ -0,0 +1,680 @@
@@ -23427,7 +23459,7 @@
 +	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 +		struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
 +			
-+		if (crtc->enabled) {
++		if (crtc->enabled && crtc->fb) {
 +			modes[radeon_crtc->crtc_id] = &crtc->mode;
 +			pixel_bytes[radeon_crtc->crtc_id] = crtc->fb->bits_per_pixel / 8;
 +		}
@@ -29373,10 +29405,10 @@
  	dev->max_vblank_count = 0x001fffff;
 diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
 new file mode 100644
-index 0000000..2961292
+index 0000000..7322ac3
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
-@@ -0,0 +1,1600 @@
+@@ -0,0 +1,1602 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -29622,6 +29654,7 @@
 +	struct drm_radeon_gem_object *obj_priv;
 +	uint32_t base;
 +	uint32_t crtc_offset, crtc_offset_cntl, crtc_tile_x0_y0 = 0;
++	uint32_t crtc_pitch, pitch_pixels;
 +
 +	DRM_DEBUG("\n");
 +
@@ -29633,6 +29666,12 @@
 +	if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM))
 +		return -EINVAL;
 +
++	pitch_pixels = crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8);
++	crtc_pitch  = (((pitch_pixels * crtc->fb->bits_per_pixel) +
++			((crtc->fb->bits_per_pixel * 8) - 1)) /
++		       (crtc->fb->bits_per_pixel * 8));
++	crtc_pitch |= crtc_pitch << 16;
++
 +	crtc_offset = obj_priv->bo->offset;
 +
 +	crtc_offset_cntl = 0;
@@ -29668,7 +29707,7 @@
 +			crtc_offset_cntl |= (y % 16);
 +		}
 +	} else {
-+		int offset = y * crtc->fb->pitch + x;
++		int offset = y * pitch_pixels + x;
 +		switch (crtc->fb->bits_per_pixel) {
 +		case 15:
 +		case 16:
@@ -29700,6 +29739,7 @@
 +		RADEON_WRITE(R300_CRTC_TILE_X0_Y0, crtc_tile_x0_y0);
 +	RADEON_WRITE(RADEON_CRTC_OFFSET_CNTL, crtc_offset_cntl);
 +	RADEON_WRITE(RADEON_CRTC_OFFSET, crtc_offset);
++	RADEON_WRITE(RADEON_CRTC_PITCH, crtc_pitch);
 +
 +	if (old_fb) {
 +		radeon_fb = to_radeon_framebuffer(old_fb);
@@ -29723,7 +29763,6 @@
 +	uint32_t crtc_h_sync_strt_wid;
 +	uint32_t crtc_v_total_disp;
 +	uint32_t crtc_v_sync_strt_wid;
-+	uint32_t crtc_pitch;
 +	uint32_t disp_merge_cntl;
 +
 +	DRM_DEBUG("\n");
@@ -29792,10 +29831,6 @@
 +				   ? RADEON_CRTC_V_SYNC_POL
 +				   : 0));
 +
-+	crtc_pitch  = ((((crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8)) * crtc->fb->bits_per_pixel) +
-+			((crtc->fb->bits_per_pixel * 8) - 1)) /
-+		       (crtc->fb->bits_per_pixel * 8));
-+	crtc_pitch |= crtc_pitch << 16;
 +
 +	/* TODO -> Dell Server */
 +	if (0) {
@@ -29835,8 +29870,6 @@
 +	RADEON_WRITE(RADEON_CRTC_V_TOTAL_DISP, crtc_v_total_disp);
 +	RADEON_WRITE(RADEON_CRTC_V_SYNC_STRT_WID, crtc_v_sync_strt_wid);
 +
-+	RADEON_WRITE(RADEON_CRTC_PITCH, crtc_pitch);
-+
 +	RADEON_WRITE(RADEON_CRTC_GEN_CNTL, crtc_gen_cntl);
 +
 +	return true;
@@ -30057,6 +30090,7 @@
 +	struct drm_radeon_gem_object *obj_priv;
 +	uint32_t base;
 +	uint32_t crtc2_offset, crtc2_offset_cntl, crtc2_tile_x0_y0 = 0;
++	uint32_t crtc2_pitch, pitch_pixels;
 +
 +	DRM_DEBUG("\n");
 +
@@ -30070,6 +30104,12 @@
 +
 +	crtc2_offset = obj_priv->bo->offset;
 +
++	pitch_pixels = crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8);
++	crtc2_pitch  = (((pitch_pixels * crtc->fb->bits_per_pixel) +
++			((crtc->fb->bits_per_pixel * 8) - 1)) /
++		       (crtc->fb->bits_per_pixel * 8));
++	crtc2_pitch |= crtc2_pitch << 16;
++
 +	crtc2_offset_cntl = 0;
 +
 +	/* TODO tiling */
@@ -30103,7 +30143,7 @@
 +			crtc2_offset_cntl |= (y % 16);
 +		}
 +	} else {
-+		int offset = y * crtc->fb->pitch + x;
++		int offset = y * pitch_pixels + x;
 +		switch (crtc->fb->bits_per_pixel) {
 +		case 15:
 +		case 16:
@@ -30133,6 +30173,7 @@
 +		RADEON_WRITE(R300_CRTC2_TILE_X0_Y0, crtc2_tile_x0_y0);
 +	RADEON_WRITE(RADEON_CRTC2_OFFSET_CNTL, crtc2_offset_cntl);
 +	RADEON_WRITE(RADEON_CRTC2_OFFSET, crtc2_offset);
++	RADEON_WRITE(RADEON_CRTC2_PITCH,  crtc2_pitch);
 +
 + out:
 +	if (old_fb) {
@@ -30158,7 +30199,6 @@
 +        uint32_t crtc2_v_sync_strt_wid;
 +	uint32_t fp_h2_sync_strt_wid;
 +	uint32_t fp_v2_sync_strt_wid;
-+	uint32_t crtc2_pitch;
 +	uint32_t disp2_merge_cntl;
 +
 +	DRM_DEBUG("\n");
@@ -30234,11 +30274,6 @@
 +	fp_h2_sync_strt_wid = crtc2_h_sync_strt_wid;
 +	fp_v2_sync_strt_wid = crtc2_v_sync_strt_wid;
 +
-+	crtc2_pitch  = ((((crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8)) * crtc->fb->bits_per_pixel) +
-+			((crtc->fb->bits_per_pixel * 8) - 1)) /
-+		       (crtc->fb->bits_per_pixel * 8));
-+	crtc2_pitch |= crtc2_pitch << 16;
-+
 +	disp2_merge_cntl = RADEON_READ(RADEON_DISP2_MERGE_CNTL);
 +	disp2_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN;
 +	RADEON_WRITE(RADEON_DISP2_MERGE_CNTL,      disp2_merge_cntl);
@@ -30256,8 +30291,6 @@
 +	RADEON_WRITE(RADEON_FP_H2_SYNC_STRT_WID,   fp_h2_sync_strt_wid);
 +	RADEON_WRITE(RADEON_FP_V2_SYNC_STRT_WID,   fp_v2_sync_strt_wid);
 +
-+	RADEON_WRITE(RADEON_CRTC2_PITCH,           crtc2_pitch);
-+
 +	RADEON_WRITE(RADEON_CRTC2_GEN_CNTL,        crtc2_gen_cntl);
 +
 +	return true;
@@ -30881,6 +30914,7 @@
 +	}
 +
 +	if (mode2) {
++		u32 grph2_cntl;
 +		stop_req = mode2->hdisplay * pixel_bytes2 / 16;
 +		
 +		if (stop_req > max_stop_req)
@@ -30892,17 +30926,17 @@
 +		temp_ff.full = rfixed_const((16/pixel_bytes2));
 +		disp_drain_rate2.full = rfixed_div(pix_clk2, temp_ff);
 +
-+		temp = RADEON_READ(RADEON_GRPH2_BUFFER_CNTL);
-+		temp &= ~(RADEON_GRPH_STOP_REQ_MASK);
-+		temp |= (stop_req << RADEON_GRPH_STOP_REQ_SHIFT);
-+		temp &= ~(RADEON_GRPH_START_REQ_MASK);
++		grph2_cntl = RADEON_READ(RADEON_GRPH2_BUFFER_CNTL);
++		grph2_cntl &= ~(RADEON_GRPH_STOP_REQ_MASK);
++		grph2_cntl |= (stop_req << RADEON_GRPH_STOP_REQ_SHIFT);
++		grph2_cntl &= ~(RADEON_GRPH_START_REQ_MASK);
 +		if ((dev_priv->chip_family == CHIP_R350) &&
 +		    (stop_req > 0x15)) {
 +			stop_req -= 0x10;
 +		}
-+		temp |= (stop_req << RADEON_GRPH_START_REQ_SHIFT);
-+		temp |= RADEON_GRPH_BUFFER_SIZE;
-+		temp &= ~(RADEON_GRPH_CRITICAL_CNTL   |
++		grph2_cntl |= (stop_req << RADEON_GRPH_START_REQ_SHIFT);
++		grph2_cntl |= RADEON_GRPH_BUFFER_SIZE;
++		grph2_cntl &= ~(RADEON_GRPH_CRITICAL_CNTL   |
 +			  RADEON_GRPH_CRITICAL_AT_SOF |
 +			  RADEON_GRPH_STOP_CNTL);
 +		
@@ -30944,7 +30978,7 @@
 +			critical_point2 = 0x10;
 +		}
 +		
-+		RADEON_WRITE(RADEON_GRPH2_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
++		RADEON_WRITE(RADEON_GRPH2_BUFFER_CNTL, ((grph2_cntl & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
 +						  (critical_point2 << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
 +		
 +		if ((dev_priv->chip_family == CHIP_RS400) ||
@@ -38727,9 +38761,18 @@
  
  #endif				/* __KERNEL__ */
 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index ec073d8..32ac55d 100644
+index ec073d8..86a8a87 100644
 --- a/include/drm/drm_crtc_helper.h
 +++ b/include/drm/drm_crtc_helper.h
+@@ -96,7 +96,7 @@ extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
+ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+ 				     struct drm_display_mode *mode,
+ 				     int x, int y,
+-				     struct drm_framebuffer *old_fb);
++				     struct drm_framebuffer *old_fb, int conn_changed);
+ extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
+ 
+ extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
 @@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
  }
  
@@ -39816,15 +39859,3 @@
 +};
 +
  #endif
-diff -up linux-2.6.29.noarch/include/drm/drm_crtc_helper.h.dave linux-2.6.29.noarch/include/drm/drm_crtc_helper.h
---- linux-2.6.29.noarch/include/drm/drm_crtc_helper.h.dave	2009-04-17 20:35:37.000000000 +1000
-+++ linux-2.6.29.noarch/include/drm/drm_crtc_helper.h	2009-04-17 20:35:56.000000000 +1000
-@@ -96,7 +96,7 @@ extern int drm_crtc_helper_set_config(st
- extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
- 				     struct drm_display_mode *mode,
- 				     int x, int y,
--				     struct drm_framebuffer *old_fb);
-+				     struct drm_framebuffer *old_fbm, int conn_changed);
- extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
- 
- extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1564
retrieving revision 1.1565
diff -u -r1.1564 -r1.1565
--- kernel.spec	20 Apr 2009 19:10:19 -0000	1.1564
+++ kernel.spec	21 Apr 2009 05:20:51 -0000	1.1565
@@ -1978,6 +1978,9 @@
 # and build.
 
 %changelog
+* Tue Apr 21 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-103
+- radeon kms: fix lcd edid detection + fix legacy crtc setup
+
 * Mon Apr 20 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-102
 - git-bluetooth2.patch: Bluetooth fixes from 2.6.30-rc2.
 



From pgordon at fedoraproject.org  Tue Apr 21 05:22:57 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 21 Apr 2009 05:22:57 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.21,1.22
Message-ID: <20090421052257.3E80E700D6@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32225/devel

Modified Files:
	midori.spec 
Log Message:
Re-enable libunique (single instance) support, thanks to the recent unique update.


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- midori.spec	20 Apr 2009 00:55:53 -0000	1.21
+++ midori.spec	21 Apr 2009 05:22:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		midori
 Version:	0.1.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -55,8 +55,7 @@
 ./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
-	configure				\
-		--disable-unique
+	configure
 ./waf %{?_smp_mflags} build
 
 
@@ -103,6 +102,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-2
+- Re-enable libunique support, thanks to it being updated accordingly.
+
 * Sun Apr 19 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-1
 - Update to new upstream release (0.1.6): Implements "Clear private data,"
   "Default" search engine, support "mailto:" links and news feeds with external



From pgordon at fedoraproject.org  Tue Apr 21 05:22:57 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 21 Apr 2009 05:22:57 +0000 (UTC)
Subject: rpms/midori/F-11 midori.spec,1.21,1.22
Message-ID: <20090421052257.7C476700D6@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32225/F-11

Modified Files:
	midori.spec 
Log Message:
Re-enable libunique (single instance) support, thanks to the recent unique update.


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- midori.spec	20 Apr 2009 00:56:49 -0000	1.21
+++ midori.spec	21 Apr 2009 05:22:27 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		midori
 Version:	0.1.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -55,8 +55,7 @@
 ./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
-	configure				\
-		--disable-unique
+	configure
 ./waf %{?_smp_mflags} build
 
 
@@ -103,6 +102,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-2
+- Re-enable libunique support, thanks to it being updated accordingly.
+
 * Sun Apr 19 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-1
 - Update to new upstream release (0.1.6): Implements "Clear private data,"
   "Default" search engine, support "mailto:" links and news feeds with external



From ondrejj at fedoraproject.org  Tue Apr 21 05:26:20 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Tue, 21 Apr 2009 05:26:20 +0000 (UTC)
Subject: rpms/sagator/devel .cvsignore, 1.7, 1.8 import.log, 1.5,
	1.6 sagator.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090421052620.36274700D6@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/sagator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv395/devel

Modified Files:
	.cvsignore import.log sagator.spec sources 
Log Message:
Fix beta problems


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2009 15:38:59 -0000	1.7
+++ .cvsignore	21 Apr 2009 05:25:49 -0000	1.8
@@ -1 +1 @@
-sagator-1.2.0-0.beta3.tar.bz2
+sagator-1.2.0-0.beta25.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	22 Feb 2009 15:39:00 -0000	1.5
+++ import.log	21 Apr 2009 05:25:49 -0000	1.6
@@ -3,3 +3,4 @@
 sagator-1_2_0-0_beta1_fc10:HEAD:sagator-1.2.0-0.beta1.fc10.src.rpm:1234956125
 sagator-1_2_0-0_beta2_fc10:HEAD:sagator-1.2.0-0.beta2.fc10.src.rpm:1235139967
 sagator-1_2_0-0_beta3_fc10:HEAD:sagator-1.2.0-0.beta3.fc10.src.rpm:1235317110
+sagator-1_2_0-0_beta25_fc10:HEAD:sagator-1.2.0-0.beta25.fc10.src.rpm:1240291509


Index: sagator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/devel/sagator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sagator.spec	25 Feb 2009 22:25:25 -0000	1.8
+++ sagator.spec	21 Apr 2009 05:25:49 -0000	1.9
@@ -8,8 +8,8 @@
 Summary:   Antivir/antispam gateway for smtp server
 Name:      sagator
 Version:   1.2.0
-Release:   0.beta3%{?dist}.1
-Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}-0.beta3.tar.bz2
+Release:   0.beta25%{?dist}
+Source:    http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}-0.beta25.tar.bz2
 URL:       http://www.salstar.sk/sagator/
 License:   GPLv2+
 Group:     System Environment/Daemons
@@ -22,7 +22,7 @@
 %if %_vendor == "suse"
 Requires:  clamav >= %{CLAMAV_VERSION}
 %else
-Requires:  clamav-lib >= %{CLAMAV_VERSION}
+Requires:  clamav-lib >= %{CLAMAV_VERSION}, clamav-update
 %endif
 
 %description
@@ -35,16 +35,23 @@
 can parse MIME mails and decompress archives, if it is configured so.
 
 Features:
+    *  simple chroot support
     * modular antivirus/spamchecker support
+          o you can attach an intrascanner to another intrascanner or realscanner
+          o you can combine intrascanners
+          o you can combine realscanners
+          o virus/spam level based scanners
+    * database support
+          o SQL logging
+          o dynamic scanner (antivirus/antispam) configuration
+    * daily reports for users
+    * web quarantine accessible for all users
     * you don't need any perl modules or any other modules, only python
     * you can return any quarantined mail to mailq/user mailbox
     * mailbox/maildir scanning and cleaning
     * smtp policy service (greylist)
-    * nice statistics via RRDTOOL or MRTG
-    * web-quarantine access for users
-    * daily reports for users
-    * SQL database logging and configuration
-    * simple chroot support
+    * nice statistics via WWW or MRTG
+    * easy installation and configuration
 
 %package core
 Summary:        Antivir/antispam gateway for smtp server, core files
@@ -75,8 +82,7 @@
 %package webq
 Summary:        SAGATOR's web quarantine access
 Group:          System Environment/Daemons
-Requires:       sagator-core = %{version}-%{release}, python-kid >= 0.9.5
-BuildRequires:  python-kid
+Requires:       sagator-core = %{version}-%{release}, python-genshi >= 0.4
 
 %description webq
 SAGATOR's web quarantine access can be used to allow users (or admin)
@@ -220,7 +226,7 @@
 %defattr(-,root,root)   
 %dir %{_datadir}/%{name}/srv/web
 %{_datadir}/%{name}/srv/web/*.py*
-%{_datadir}/%{name}/srv/web/*.kid
+%{_datadir}/%{name}/srv/web/*.html
 
 %if %{install_sepolicy}
 %files selinux
@@ -230,10 +236,7 @@
 %endif
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-0.beta3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Sep 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.0-0.beta3
+* Wed Sep 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.2.0-0.beta25
 - core files moved to core packages, sagator package now requires clamav
   and spamassassin
 - added selinux policy dir


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sagator/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Feb 2009 15:39:00 -0000	1.7
+++ sources	21 Apr 2009 05:25:49 -0000	1.8
@@ -1 +1 @@
-049b54eb7e13c3b4b84e512b002a10f2  sagator-1.2.0-0.beta3.tar.bz2
+ff3615788eebfe9436350199987bf297  sagator-1.2.0-0.beta25.tar.bz2



From belegdol at fedoraproject.org  Tue Apr 21 06:50:11 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue, 21 Apr 2009 06:50:11 +0000 (UTC)
Subject: rpms/sublib/devel sublib.spec,1.2,1.3
Message-ID: <20090421065012.355C77013C@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/sublib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25984

Modified Files:
	sublib.spec 
Log Message:
* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9-4
- Disabled the ppc64 ExcludeArch now that mono is available (fixes RH #447362)



Index: sublib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sublib/devel/sublib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sublib.spec	26 Feb 2009 03:29:14 -0000	1.2
+++ sublib.spec	21 Apr 2009 06:49:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sublib
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A subtitle library
 
 Group:          System Environment/Libraries
@@ -13,8 +13,6 @@
 
 BuildRequires:  mono-devel
 
-ExcludeArch:    ppc64
-
 %description
 SubLib is a library that eases the development of subtitling applications. It
 supports the most common text-based subtitle formats and allows for subtitle
@@ -72,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9-4
+- Disabled the ppc64 ExcludeArch now that mono is available (fixes RH #447362)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From belegdol at fedoraproject.org  Tue Apr 21 07:50:47 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue, 21 Apr 2009 07:50:47 +0000 (UTC)
Subject: rpms/sublib/F-11 sublib.spec,1.2,1.3
Message-ID: <20090421075047.B3E62700D6@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/sublib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13844

Modified Files:
	sublib.spec 
Log Message:
* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9-4
- Disabled the ppc64 ExcludeArch now that mono is available (fixes RH #447362)



Index: sublib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sublib/F-11/sublib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sublib.spec	26 Feb 2009 03:29:14 -0000	1.2
+++ sublib.spec	21 Apr 2009 07:50:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sublib
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A subtitle library
 
 Group:          System Environment/Libraries
@@ -13,8 +13,6 @@
 
 BuildRequires:  mono-devel
 
-ExcludeArch:    ppc64
-
 %description
 SubLib is a library that eases the development of subtitling applications. It
 supports the most common text-based subtitle formats and allows for subtitle
@@ -72,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9-4
+- Disabled the ppc64 ExcludeArch now that mono is available (fixes RH #447362)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jreznik at fedoraproject.org  Tue Apr 21 07:59:07 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 07:59:07 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/devel .cvsignore, 1.2,
	1.3 kde-plasma-quickaccess.spec, 1.9, 1.10 sources, 1.2,
	1.3 kde-plasma-quickaccess-0.7.1-kde42-build.patch, 1.3,
	NONE kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch, 1.1, NONE
Message-ID: <20090421075907.C05E07013C@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17022

Modified Files:
	.cvsignore kde-plasma-quickaccess.spec sources 
Removed Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
	kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch 
Log Message:
* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.4-1
- update to forked version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2008 11:22:01 -0000	1.2
+++ .cvsignore	21 Apr 2009 07:59:04 -0000	1.3
@@ -1 +1 @@
-84128-quickaccess-0.7.1.tar.gz
+101968-plasma-widget-quickaccess_0.7.4.orig.tar.gz


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/devel/kde-plasma-quickaccess.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kde-plasma-quickaccess.spec	25 Feb 2009 10:30:35 -0000	1.9
+++ kde-plasma-quickaccess.spec	21 Apr 2009 07:59:05 -0000	1.10
@@ -1,16 +1,15 @@
 Name:           kde-plasma-quickaccess
-Version:        0.7.1
-Release:        8%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://www.kde-look.org/content/show.php/QuickAccess?content=84128
+# this is forked version
+URL:            http://www.kde-look.org/content/show.php/QuickAccess+(maintenance+fork)?content=101968
 
-Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
+Source0:        http://www.kde-look.org/CONTENT/content-files/101968-plasma-widget-quickaccess_%{version}.orig.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
-Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
-Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,10 +24,8 @@
 
 
 %prep
-%setup -qn quickaccess-%{version}
+%setup -qn plasma-widget-quickaccess-%{version}
 %patch0 -p1 -b .default-size
-%patch1 -p1 -b .kde42-iconwidget
-%patch2 -p1 -b .kde42-build
 
 
 %build
@@ -60,6 +57,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.4-1
+- update to forked version 0.7.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2008 11:22:01 -0000	1.2
+++ sources	21 Apr 2009 07:59:05 -0000	1.3
@@ -1 +1 @@
-bf0f3a7c38f2998031be32b87621c2c7  84128-quickaccess-0.7.1.tar.gz
+9d8616ad3ac3a3c7c813bc2941e8323c  101968-plasma-widget-quickaccess_0.7.4.orig.tar.gz


--- kde-plasma-quickaccess-0.7.1-kde42-build.patch DELETED ---


--- kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch DELETED ---



From varekova at fedoraproject.org  Tue Apr 21 08:00:29 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 21 Apr 2009 08:00:29 +0000 (UTC)
Subject: rpms/man-pages/devel .cvsignore, 1.59, 1.60 man-pages.spec, 1.112, 
	1.113 sources, 1.58, 1.59
Message-ID: <20090421080029.97032700D6@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16581

Modified Files:
	.cvsignore man-pages.spec sources 
Log Message:
update to 3.21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	31 Mar 2009 06:45:12 -0000	1.59
+++ .cvsignore	21 Apr 2009 08:00:27 -0000	1.60
@@ -3,4 +3,4 @@
 man-pages-posix-2003-a.tar.bz2
 man-pages_syscalls.tar.bz2
 man-pages_add-01.tar.bz2
-man-pages-3.20.tar.bz2
+man-pages-3.21.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- man-pages.spec	31 Mar 2009 06:45:12 -0000	1.112
+++ man-pages.spec	21 Apr 2009 08:00:27 -0000	1.113
@@ -3,7 +3,7 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.20
+Version: 3.21
 Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
@@ -124,6 +124,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Tue Apr 21 2009 Ivana Varekova <varekova at redhat.com> - 3.21-1
+- update to 3.21
+
 * Tue Mar 31 2009 Ivana Varekova <varekova at redhat.com> - 3.20-1
 - update to 3.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	31 Mar 2009 06:45:12 -0000	1.58
+++ sources	21 Apr 2009 08:00:27 -0000	1.59
@@ -3,4 +3,4 @@
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
 bf0d94a7faf6dc0db31325dbf576fd84  man-pages_syscalls.tar.bz2
 4ae755c6caaa035cb7737bf4a3ec7927  man-pages_add-01.tar.bz2
-e2e1063265231090b80e1503773f45a0  man-pages-3.20.tar.bz2
+14b3f971348f4d59ae8b8362d8eb15ff  man-pages-3.21.tar.bz2



From caolanm at fedoraproject.org  Tue Apr 21 08:08:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 08:08:08 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch, NONE,
	1.1 openoffice.org.spec, 1.1725, 1.1726
Message-ID: <20090421080808.88464700D6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20741

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch 
Log Message:
Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch

openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch:

--- NEW FILE openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch ---
Index: source/doc/objxtor.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objxtor.cxx,v
retrieving revision 1.85
diff -u -r1.85 objxtor.cxx
--- openoffice.org.orig/sfx2/source/doc/objxtor.cxx	17 Jul 2008 12:46:35 -0000	1.85
+++ openoffice.org/sfx2/source/doc/objxtor.cxx	21 Apr 2009 08:04:21 -0000
@@ -418,8 +418,14 @@
         delete pImp->mpObjectContainer;
     }
 
+	try
+	{
     if ( pImp->bOwnsStorage && pImp->m_xDocStorage.is() )
     	pImp->m_xDocStorage->dispose();
+	}
+	catch (lang::DisposedException &)
+	{
+    }
 
 	if ( pMedium )
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -r1.1725 -r1.1726
--- openoffice.org.spec	16 Apr 2009 19:46:43 -0000	1.1725
+++ openoffice.org.spec	21 Apr 2009 08:08:05 -0000	1.1726
@@ -146,6 +146,7 @@
 Patch73: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch74: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch75: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+Patch76: openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1415,7 +1416,7 @@
 %patch72 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch75 -p1 -b .ooo101145.vcl.safe.dpi.patch
+%patch76 -p1 -b .oooXXXXX.sfx2.badexception.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3782,9 +3783,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Apr 08 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
+* Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
 - Resolves: rhbz#494643 EMF polypolygons issue
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+- Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 
 * Mon Mar 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch



From jreznik at fedoraproject.org  Tue Apr 21 08:12:42 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 08:12:42 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/F-10 .cvsignore, 1.2,
	1.3 kde-plasma-quickaccess.spec, 1.3, 1.4 sources, 1.2,
	1.3 kde-plasma-quickaccess-0.7.1-kde42-build.patch, 1.1,
	NONE kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch, 1.1, NONE
Message-ID: <20090421081243.1386D700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22575

Modified Files:
	.cvsignore kde-plasma-quickaccess.spec sources 
Removed Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
	kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch 
Log Message:
* Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.4-1
- update to forked version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2008 11:22:01 -0000	1.2
+++ .cvsignore	21 Apr 2009 08:12:40 -0000	1.3
@@ -1 +1 @@
-84128-quickaccess-0.7.1.tar.gz
+101968-plasma-widget-quickaccess_0.7.4.orig.tar.gz


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10/kde-plasma-quickaccess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-quickaccess.spec	28 Jan 2009 16:53:10 -0000	1.3
+++ kde-plasma-quickaccess.spec	21 Apr 2009 08:12:40 -0000	1.4
@@ -1,16 +1,15 @@
 Name:           kde-plasma-quickaccess
-Version:        0.7.1
-Release:        7%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://www.kde-look.org/content/show.php/QuickAccess?content=84128
+# this is forked version
+URL:            http://www.kde-look.org/content/show.php/QuickAccess+(maintenance+fork)?content=101968
 
-Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
+Source0:        http://www.kde-look.org/CONTENT/content-files/101968-plasma-widget-quickaccess_%{version}.orig.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
-Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
-Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,10 +24,8 @@
 
 
 %prep
-%setup -qn quickaccess-%{version}
+%setup -qn plasma-widget-quickaccess-%{version}
 %patch0 -p1 -b .default-size
-%patch1 -p1 -b .kde42-iconwidget
-%patch2 -p1 -b .kde42-build
 
 
 %build
@@ -60,6 +57,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.4-1
+- update to forked version 0.7.4
+
 * Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
 - KDE 4.2.0 build patch (Plasma package no more required)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2008 11:22:01 -0000	1.2
+++ sources	21 Apr 2009 08:12:40 -0000	1.3
@@ -1 +1 @@
-bf0f3a7c38f2998031be32b87621c2c7  84128-quickaccess-0.7.1.tar.gz
+9d8616ad3ac3a3c7c813bc2941e8323c  101968-plasma-widget-quickaccess_0.7.4.orig.tar.gz


--- kde-plasma-quickaccess-0.7.1-kde42-build.patch DELETED ---


--- kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch DELETED ---



From jreznik at fedoraproject.org  Tue Apr 21 08:22:39 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 08:22:39 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/F-9 .cvsignore, 1.2,
	1.3 kde-plasma-quickaccess.spec, 1.3, 1.4 sources, 1.2,
	1.3 kde-plasma-quickaccess-0.7.1-kde42-build.patch, 1.1,
	NONE kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch, 1.1, NONE
Message-ID: <20090421082240.10D9A700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25639

Modified Files:
	.cvsignore kde-plasma-quickaccess.spec sources 
Removed Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
	kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch 
Log Message:
* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.4-1
- update to forked version 0.7.4




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2008 11:23:45 -0000	1.2
+++ .cvsignore	21 Apr 2009 08:22:07 -0000	1.3
@@ -1 +1 @@
-84128-quickaccess-0.7.1.tar.gz
+101968-plasma-widget-quickaccess_0.7.4.orig.tar.gz


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-9/kde-plasma-quickaccess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-quickaccess.spec	29 Jan 2009 23:05:26 -0000	1.3
+++ kde-plasma-quickaccess.spec	21 Apr 2009 08:22:08 -0000	1.4
@@ -1,16 +1,15 @@
 Name:           kde-plasma-quickaccess
-Version:        0.7.1
-Release:        7%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://www.kde-look.org/content/show.php/QuickAccess?content=84128
+# this is forked version
+URL:            http://www.kde-look.org/content/show.php/QuickAccess+(maintenance+fork)?content=101968
 
-Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
+Source0:        http://www.kde-look.org/CONTENT/content-files/101968-plasma-widget-quickaccess_%{version}.orig.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
-Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
-Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,10 +24,8 @@
 
 
 %prep
-%setup -qn quickaccess-%{version}
+%setup -qn plasma-widget-quickaccess-%{version}
 %patch0 -p1 -b .default-size
-%patch1 -p1 -b .kde42-iconwidget
-%patch2 -p1 -b .kde42-build
 
 
 %build
@@ -60,6 +57,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.4-1
+- update to forked version 0.7.4
+
 * Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
 - KDE 4.2.0 build patch (Plasma package no more required)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2008 11:23:45 -0000	1.2
+++ sources	21 Apr 2009 08:22:08 -0000	1.3
@@ -1 +1 @@
-bf0f3a7c38f2998031be32b87621c2c7  84128-quickaccess-0.7.1.tar.gz
+9d8616ad3ac3a3c7c813bc2941e8323c  101968-plasma-widget-quickaccess_0.7.4.orig.tar.gz


--- kde-plasma-quickaccess-0.7.1-kde42-build.patch DELETED ---


--- kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch DELETED ---



From pali at fedoraproject.org  Tue Apr 21 08:27:32 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Tue, 21 Apr 2009 08:27:32 +0000 (UTC)
Subject: rpms/cherokee/devel cherokee.spec,1.13,1.14 import.log,1.10,1.11
Message-ID: <20090421082732.31005700D6@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27482/devel

Modified Files:
	cherokee.spec import.log 
Log Message:
added BuildRequires: gettext


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cherokee.spec	20 Apr 2009 13:00:20 -0000	1.13
+++ cherokee.spec	21 Apr 2009 08:27:30 -0000	1.14
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.99.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -23,6 +23,7 @@
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+BuildRequires:  gettext
 # For spawn-fcgi
 Requires:	    spawn-fcgi
 Requires(post): chkconfig
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
 * Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
 - updated to 0.99.11
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	20 Apr 2009 13:00:20 -0000	1.10
+++ import.log	21 Apr 2009 08:27:30 -0000	1.11
@@ -8,3 +8,4 @@
 cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
 cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
 cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
+cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265



From pali at fedoraproject.org  Tue Apr 21 08:28:40 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Tue, 21 Apr 2009 08:28:40 +0000 (UTC)
Subject: rpms/cherokee/F-9 cherokee.spec,1.10,1.11 import.log,1.10,1.11
Message-ID: <20090421082840.D6D84700D6@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28102/F-9

Modified Files:
	cherokee.spec import.log 
Log Message:
added BuildRequires: gettext


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-9/cherokee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cherokee.spec	20 Apr 2009 13:04:57 -0000	1.10
+++ cherokee.spec	21 Apr 2009 08:28:39 -0000	1.11
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.99.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -23,6 +23,7 @@
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+BuildRequires:  gettext
 # For spawn-fcgi
 Requires:	    spawn-fcgi
 Requires(post): chkconfig
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
 * Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
 - updated to 0.99.11
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-9/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	20 Apr 2009 13:04:57 -0000	1.10
+++ import.log	21 Apr 2009 08:28:39 -0000	1.11
@@ -8,3 +8,4 @@
 cherokee-0_98_1-1_fc10:F-9:cherokee-0.98.1-1.fc10.src.rpm:1234791613
 cherokee-0_99_0-1_fc10:F-9:cherokee-0.99.0-1.fc10.src.rpm:1236465097
 cherokee-0_99_11-1_fc10:F-9:cherokee-0.99.11-1.fc10.src.rpm:1240232602
+cherokee-0_99_11-2:F-9:cherokee-0.99.11-2.src.rpm:1240302475



From pali at fedoraproject.org  Tue Apr 21 08:30:40 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Tue, 21 Apr 2009 08:30:40 +0000 (UTC)
Subject: rpms/cherokee/F-10 cherokee.spec,1.11,1.12 import.log,1.10,1.11
Message-ID: <20090421083040.BDD4A7013C@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28752/F-10

Modified Files:
	cherokee.spec import.log 
Log Message:
added BuildRequires: gettext


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-10/cherokee.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cherokee.spec	20 Apr 2009 13:06:29 -0000	1.11
+++ cherokee.spec	21 Apr 2009 08:30:08 -0000	1.12
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.99.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -23,6 +23,7 @@
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+BuildRequires:  gettext
 # For spawn-fcgi
 Requires:	    spawn-fcgi
 Requires(post): chkconfig
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
 * Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
 - updated to 0.99.11
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-10/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	20 Apr 2009 13:06:29 -0000	1.10
+++ import.log	21 Apr 2009 08:30:09 -0000	1.11
@@ -8,3 +8,4 @@
 cherokee-0_98_1-1_fc10:F-10:cherokee-0.98.1-1.fc10.src.rpm:1234791686
 cherokee-0_99_0-1_fc10:F-10:cherokee-0.99.0-1.fc10.src.rpm:1236465177
 cherokee-0_99_11-1_fc10:F-10:cherokee-0.99.11-1.fc10.src.rpm:1240232748
+cherokee-0_99_11-2:F-10:cherokee-0.99.11-2.src.rpm:1240302543



From pali at fedoraproject.org  Tue Apr 21 08:32:42 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Tue, 21 Apr 2009 08:32:42 +0000 (UTC)
Subject: rpms/cherokee/F-11 cherokee.spec,1.13,1.14 import.log,1.10,1.11
Message-ID: <20090421083242.1D17570137@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29696/F-11

Modified Files:
	cherokee.spec import.log 
Log Message:
added BuildRequires: gettext


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cherokee.spec	20 Apr 2009 13:11:21 -0000	1.13
+++ cherokee.spec	21 Apr 2009 08:32:09 -0000	1.14
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.99.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -23,6 +23,7 @@
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+BuildRequires:  gettext
 # For spawn-fcgi
 Requires:	    spawn-fcgi
 Requires(post): chkconfig
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
 * Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
 - updated to 0.99.11
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	20 Apr 2009 13:11:21 -0000	1.10
+++ import.log	21 Apr 2009 08:32:09 -0000	1.11
@@ -8,3 +8,4 @@
 cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
 cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
 cherokee-0_99_11-1_fc10:F-11:cherokee-0.99.11-1.fc10.src.rpm:1240232840
+cherokee-0_99_11-2:F-11:cherokee-0.99.11-2.src.rpm:1240302665



From pali at fedoraproject.org  Tue Apr 21 08:41:46 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Tue, 21 Apr 2009 08:41:46 +0000 (UTC)
Subject: rpms/cherokee/EL-4 cherokee.spec,1.11,1.12 import.log,1.11,1.12
Message-ID: <20090421084146.7A3C1700D6@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv923/EL-4

Modified Files:
	cherokee.spec import.log 
Log Message:
added BuildRequires: gettext


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cherokee.spec	20 Apr 2009 13:12:47 -0000	1.11
+++ cherokee.spec	21 Apr 2009 08:41:41 -0000	1.12
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.99.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -23,6 +23,7 @@
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+BuildRequires:  gettext
 # For spawn-fcgi
 Requires:	    spawn-fcgi
 Requires(post): chkconfig
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
 * Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
 - updated to 0.99.11
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	20 Apr 2009 13:12:47 -0000	1.11
+++ import.log	21 Apr 2009 08:41:41 -0000	1.12
@@ -9,3 +9,4 @@
 cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759
 cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251
 cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131
+cherokee-0_99_11-2:EL-4:cherokee-0.99.11-2.src.rpm:1240302787



From pali at fedoraproject.org  Tue Apr 21 08:43:53 2009
From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=)
Date: Tue, 21 Apr 2009 08:43:53 +0000 (UTC)
Subject: rpms/cherokee/EL-5 cherokee.spec,1.10,1.11 import.log,1.10,1.11
Message-ID: <20090421084353.88070700D6@cvs1.fedora.phx.redhat.com>

Author: pali

Update of /cvs/pkgs/rpms/cherokee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1494/EL-5

Modified Files:
	cherokee.spec import.log 
Log Message:
added BuildRequires: gettext


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cherokee.spec	20 Apr 2009 13:13:59 -0000	1.10
+++ cherokee.spec	21 Apr 2009 08:43:13 -0000	1.11
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.99.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -23,6 +23,7 @@
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+BuildRequires:  gettext
 # For spawn-fcgi
 Requires:	    spawn-fcgi
 Requires(post): chkconfig
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
 * Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
 - updated to 0.99.11
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	20 Apr 2009 13:13:59 -0000	1.10
+++ import.log	21 Apr 2009 08:43:13 -0000	1.11
@@ -8,3 +8,4 @@
 cherokee-0_98_1-1_fc10:EL-5:cherokee-0.98.1-1.fc10.src.rpm:1234791832
 cherokee-0_99_0-1_fc10:EL-5:cherokee-0.99.0-1.fc10.src.rpm:1236465324
 cherokee-0_99_11-1_fc10:EL-5:cherokee-0.99.11-1.fc10.src.rpm:1240233219
+cherokee-0_99_11-2:EL-5:cherokee-0.99.11-2.src.rpm:1240303330



From cebbert at fedoraproject.org  Tue Apr 21 08:47:58 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 21 Apr 2009 08:47:58 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-crypto-aes-padlock-fix-autoload.patch,
	NONE, 1.1 kernel.spec, 1.1336, 1.1337
Message-ID: <20090421084758.60A90700D6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3649

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-crypto-aes-padlock-fix-autoload.patch 
Log Message:
Fix VIA Padlock autoload (#496140)

linux-2.6-crypto-aes-padlock-fix-autoload.patch:

--- NEW FILE linux-2.6-crypto-aes-padlock-fix-autoload.patch ---
 [http://marc.info/?l=linux-kernel&m=124029340626998&q=raw]

On Tue, Apr 21, 2009 at 01:53:31PM +0800, Herbert Xu wrote:
> 
> Thanks for the report.  This patch should fix the problem.

In fact, padlock-aes shouldn't have been aes-all in the first
place so I'm going to add tihs patch too.

commit acd246b7494c629aa617da49716409566cf52149
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Tue Apr 21 13:55:20 2009 +0800

    crypto: padlock - Revert aes-all alias to aes
    
    Since the padlock-aes driver doesn't require a fallback (it's
    only padlock-sha that does), it should use the aes alias rather
    than aes-all so that ones that do need a fallback can use it.
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 3f0fdd1..856b3cc 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -489,4 +489,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algorithm support");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michal Ludvig");
 
-MODULE_ALIAS("aes-all");
+MODULE_ALIAS("aes");

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert at gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1336
retrieving revision 1.1337
diff -u -r1.1336 -r1.1337
--- kernel.spec	20 Apr 2009 19:19:31 -0000	1.1336
+++ kernel.spec	21 Apr 2009 08:47:52 -0000	1.1337
@@ -727,6 +727,8 @@
 Patch9303: linux-2.6-kvm-skip-pit-check.patch
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
+Patch9400: linux-2.6-crypto-aes-padlock-fix-autoload.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1341,6 +1343,9 @@
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
+# make padlock autoload again
+ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -1917,6 +1922,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-37
+- Fix VIA Padlock autoload (#496140)
+
 * Mon Apr 20 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-36
 - git-bluetooth2.patch: Bluetooth fixes from F-11.
 



From giallu at fedoraproject.org  Tue Apr 21 08:52:24 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Tue, 21 Apr 2009 08:52:24 +0000 (UTC)
Subject: rpms/mantis/devel mantis.spec, 1.24, 1.25 .cvsignore, 1.13,
	1.14 sources, 1.18, 1.19
Message-ID: <20090421085224.1605E700D6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5198

Modified Files:
	mantis.spec .cvsignore sources 
Log Message:
* Tue Apr 21 2009 Gianluca Sforna <giallu gmail com> - 1.1.7-1
- new upstream release



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mantis.spec	25 Feb 2009 23:36:25 -0000	1.24
+++ mantis.spec	21 Apr 2009 08:52:21 -0000	1.25
@@ -5,8 +5,8 @@
 
 Summary:    Web-based bugtracking system
 Name:       mantis
-Version:    1.1.6
-Release:    3%{?dist}
+Version:    1.1.7
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://www.mantisbt.org/
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Gianluca Sforna <giallu gmail com> - 1.1.7-1
+- new upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Dec 2008 22:05:10 -0000	1.13
+++ .cvsignore	21 Apr 2009 08:52:22 -0000	1.14
@@ -1 +1 @@
-mantisbt-1.1.6.tar.gz
+mantisbt-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Dec 2008 22:05:10 -0000	1.18
+++ sources	21 Apr 2009 08:52:22 -0000	1.19
@@ -1 +1 @@
-2e0c6d3dd9ca7d16258fc2d86363a675  mantisbt-1.1.6.tar.gz
+df49eb04bf8fff7a6ed4845f9a09be3b  mantisbt-1.1.7.tar.gz



From giallu at fedoraproject.org  Tue Apr 21 08:58:41 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Tue, 21 Apr 2009 08:58:41 +0000 (UTC)
Subject: rpms/mantis/EL-5 .cvsignore, 1.8, 1.9 mantis.spec, 1.17,
	1.18 sources, 1.13, 1.14 mantis-1.1.6-bug4512.patch, 1.1, NONE
Message-ID: <20090421085841.138EE700D6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7501

Modified Files:
	.cvsignore mantis.spec sources 
Removed Files:
	mantis-1.1.6-bug4512.patch 
Log Message:
* Tue Apr 21 2009 Gianluca Sforna <giallu gmail com> - 1.1.7-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Apr 2009 19:23:39 -0000	1.8
+++ .cvsignore	21 Apr 2009 08:58:09 -0000	1.9
@@ -1 +1 @@
-mantisbt-1.1.6.tar.gz
+mantisbt-1.1.7.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/mantis.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mantis.spec	9 Apr 2009 19:23:39 -0000	1.17
+++ mantis.spec	21 Apr 2009 08:58:09 -0000	1.18
@@ -5,8 +5,8 @@
 
 Summary:    Web-based bugtracking system
 Name:       mantis
-Version:    1.1.6
-Release:    3%{?dist}.1
+Version:    1.1.7
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://www.mantisbt.org/
@@ -17,7 +17,6 @@
 Patch0:     mantis-1.1.6-install-nowriteconfig.patch
 Patch1:     mantis-1.1.0-noexamplecom.patch
 Patch2:     mantis-1.0.0rc2-noadmin.patch
-Patch3:     mantis-1.1.6-bug4512.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,7 +61,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 cp %{SOURCE1} ./doc/README.Fedora
 rm .gitignore
@@ -152,6 +150,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Gianluca Sforna <giallu gmail com> - 1.1.7-1
+- new upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Apr 2009 19:23:39 -0000	1.13
+++ sources	21 Apr 2009 08:58:09 -0000	1.14
@@ -1 +1 @@
-2e0c6d3dd9ca7d16258fc2d86363a675  mantisbt-1.1.6.tar.gz
+df49eb04bf8fff7a6ed4845f9a09be3b  mantisbt-1.1.7.tar.gz


--- mantis-1.1.6-bug4512.patch DELETED ---



From markmc at fedoraproject.org  Tue Apr 21 09:03:44 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 21 Apr 2009 09:03:44 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-qcow2-corruption.patch, 1.1, 1.2 qemu.spec,
	1.81, 1.82
Message-ID: <20090421090344.42359700D6@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9459

Modified Files:
	qemu-fix-qcow2-corruption.patch qemu.spec 
Log Message:
* Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-12
- Another qcow2 image corruption fix (#496642)


qemu-fix-qcow2-corruption.patch:

Index: qemu-fix-qcow2-corruption.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-qcow2-corruption.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-fix-qcow2-corruption.patch	20 Apr 2009 13:51:35 -0000	1.1
+++ qemu-fix-qcow2-corruption.patch	21 Apr 2009 09:03:39 -0000	1.2
@@ -1,6 +1,28 @@
+From: Nolan Leake <nolan <at> sigbus.net>
+Subject: [PATCH] Fix (at least one cause of) qcow2 corruption.
+
+qcow2's get_cluster_offset() scans forward in the l2 table to find other
+clusters that have the same allocation status as the first cluster.
+This is used by (among others) qcow_is_allocated().
+
+Unfortunately, it was not checking to be sure that it didn't fall off
+the end of the l2 table.  This patch adds that check.
+
+The symptom that motivated me to look into this was that
+bdrv_is_allocated() was returning false when there was in fact data
+there.  This is one of many ways this bug could lead to data corruption.
+
+I checked the other place that scans for consecutive unallocated blocks
+(alloc_cluster_offset()) and it appears to be OK:
+    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
+appears to prevent the same problem from occurring.
+
+Signed-off-by: Nolan Leake <nolan <at> sigbus.net>
+
+---
+
 From: Kevin Wolf <kwolf at redhat.com>
-To: qemu-devel at nongnu.org
-Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2
+Subject: [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2
 
 This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables
 are big endian, so entries must be converted before being passed to functions.
@@ -18,14 +40,23 @@
     done
 
 Signed-off-by: Kevin Wolf <kwolf at redhat.com>
----
- block-qcow2.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
---- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-20 14:41:22.000000000 +0100
-+++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-20 14:41:54.000000000 +0100
-@@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr
+diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
+--- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-21 09:57:21.000000000 +0100
++++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-21 09:58:27.000000000 +0100
+@@ -670,6 +670,10 @@ static uint64_t get_cluster_offset(Block
+ 
+     nb_available = (nb_available >> 9) + index_in_cluster;
+ 
++    if (nb_needed > nb_available) {
++        nb_needed = nb_available;
++    }
++
+     cluster_offset = 0;
+ 
+     /* seek the the l2 offset in the l1 table */
+@@ -912,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
          goto err;
  
      for (i = 0; i < j; i++)


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- qemu.spec	20 Apr 2009 13:51:35 -0000	1.81
+++ qemu.spec	21 Apr 2009 09:03:40 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -467,6 +467,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-12
+- Another qcow2 image corruption fix (#496642)
+
 * Mon Apr 20 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-11
 - Fix qcow2 image corruption (#496642)
 



From peter at fedoraproject.org  Tue Apr 21 09:04:00 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 21 Apr 2009 09:04:00 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.spec,1.37,1.38 import.log,1.10,1.11
Message-ID: <20090421090400.70C59700D6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9528/devel

Modified Files:
	ejabberd.spec import.log 
Log Message:
Enable CAPTCHA plugin


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ejabberd.spec	4 Apr 2009 04:32:29 -0000	1.37
+++ ejabberd.spec	21 Apr 2009 09:03:57 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -35,7 +35,6 @@
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -117,7 +116,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
-#%patch4 -p1 -b .captcha
+%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -177,8 +176,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
-# tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -220,6 +218,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	4 Apr 2009 04:32:29 -0000	1.10
+++ import.log	21 Apr 2009 09:03:57 -0000	1.11
@@ -8,3 +8,4 @@
 ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.4-1.fc10.src.rpm:1237116778
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
+ejabberd-2_0_5-3_fc10:HEAD:ejabberd-2.0.5-3.fc10.src.rpm:1240304532



From markmc at fedoraproject.org  Tue Apr 21 09:04:26 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 21 Apr 2009 09:04:26 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-fix-qcow2-corruption.patch, 1.1, 1.2 qemu.spec, 
	1.81, 1.82
Message-ID: <20090421090426.45ECA700D6@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9855

Modified Files:
	qemu-fix-qcow2-corruption.patch qemu.spec 
Log Message:
* Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-12
- Another qcow2 image corruption fix (#496642)


qemu-fix-qcow2-corruption.patch:

Index: qemu-fix-qcow2-corruption.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-fix-qcow2-corruption.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-fix-qcow2-corruption.patch	20 Apr 2009 13:52:28 -0000	1.1
+++ qemu-fix-qcow2-corruption.patch	21 Apr 2009 09:04:20 -0000	1.2
@@ -1,6 +1,28 @@
+From: Nolan Leake <nolan <at> sigbus.net>
+Subject: [PATCH] Fix (at least one cause of) qcow2 corruption.
+
+qcow2's get_cluster_offset() scans forward in the l2 table to find other
+clusters that have the same allocation status as the first cluster.
+This is used by (among others) qcow_is_allocated().
+
+Unfortunately, it was not checking to be sure that it didn't fall off
+the end of the l2 table.  This patch adds that check.
+
+The symptom that motivated me to look into this was that
+bdrv_is_allocated() was returning false when there was in fact data
+there.  This is one of many ways this bug could lead to data corruption.
+
+I checked the other place that scans for consecutive unallocated blocks
+(alloc_cluster_offset()) and it appears to be OK:
+    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
+appears to prevent the same problem from occurring.
+
+Signed-off-by: Nolan Leake <nolan <at> sigbus.net>
+
+---
+
 From: Kevin Wolf <kwolf at redhat.com>
-To: qemu-devel at nongnu.org
-Subject: [Qemu-devel] [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2
+Subject: [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2
 
 This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables
 are big endian, so entries must be converted before being passed to functions.
@@ -18,14 +40,23 @@
     done
 
 Signed-off-by: Kevin Wolf <kwolf at redhat.com>
----
- block-qcow2.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
---- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-20 14:41:22.000000000 +0100
-+++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-20 14:41:54.000000000 +0100
-@@ -912,7 +912,7 @@ static int alloc_cluster_link_l2(BlockDr
+diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
+--- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-21 09:57:21.000000000 +0100
++++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-21 09:58:27.000000000 +0100
+@@ -670,6 +670,10 @@ static uint64_t get_cluster_offset(Block
+ 
+     nb_available = (nb_available >> 9) + index_in_cluster;
+ 
++    if (nb_needed > nb_available) {
++        nb_needed = nb_available;
++    }
++
+     cluster_offset = 0;
+ 
+     /* seek the the l2 offset in the l1 table */
+@@ -912,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
          goto err;
  
      for (i = 0; i < j; i++)


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- qemu.spec	20 Apr 2009 13:52:28 -0000	1.81
+++ qemu.spec	21 Apr 2009 09:04:20 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -467,6 +467,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-12
+- Another qcow2 image corruption fix (#496642)
+
 * Mon Apr 20 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-11
 - Fix qcow2 image corruption (#496642)
 



From peter at fedoraproject.org  Tue Apr 21 09:07:20 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 21 Apr 2009 09:07:20 +0000 (UTC)
Subject: rpms/ejabberd/F-11 ejabberd.spec,1.37,1.38 import.log,1.10,1.11
Message-ID: <20090421090720.F106F7013C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11286/F-11

Modified Files:
	ejabberd.spec import.log 
Log Message:
Enable CAPTCHA plugin


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ejabberd.spec	4 Apr 2009 04:32:29 -0000	1.37
+++ ejabberd.spec	21 Apr 2009 09:07:15 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -35,7 +35,6 @@
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -117,7 +116,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
-#%patch4 -p1 -b .captcha
+%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -177,8 +176,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
-# tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -220,6 +218,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	4 Apr 2009 04:32:29 -0000	1.10
+++ import.log	21 Apr 2009 09:07:16 -0000	1.11
@@ -8,3 +8,4 @@
 ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.4-1.fc10.src.rpm:1237116778
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
+ejabberd-2_0_5-3_fc10:F-11:ejabberd-2.0.5-3.fc10.src.rpm:1240304713



From peter at fedoraproject.org  Tue Apr 21 09:11:21 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 21 Apr 2009 09:11:21 +0000 (UTC)
Subject: rpms/ejabberd/F-10 ejabberd.spec,1.35,1.36 import.log,1.10,1.11
Message-ID: <20090421091122.14BDD700D6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13294/F-10

Modified Files:
	ejabberd.spec import.log 
Log Message:
Enable CAPTCHA plugin


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ejabberd.spec	4 Apr 2009 04:35:20 -0000	1.35
+++ ejabberd.spec	21 Apr 2009 09:11:20 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -35,7 +35,6 @@
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -117,7 +116,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
-#%patch4 -p1 -b .captcha
+%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -177,8 +176,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
-# tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -220,6 +218,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	4 Apr 2009 04:35:20 -0000	1.10
+++ import.log	21 Apr 2009 09:11:20 -0000	1.11
@@ -8,3 +8,4 @@
 ejabberd-2_0_4-1_fc10:F-10:ejabberd-2.0.4-1.fc10.src.rpm:1237116924
 ejabberd-2_0_5-1_fc10:F-10:ejabberd-2.0.5-1.fc10.src.rpm:1238789573
 ejabberd-2_0_5-2_fc10:F-10:ejabberd-2.0.5-2.fc10.src.rpm:1238819669
+ejabberd-2_0_5-3_fc10:F-10:ejabberd-2.0.5-3.fc10.src.rpm:1240304980



From peter at fedoraproject.org  Tue Apr 21 09:14:21 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 21 Apr 2009 09:14:21 +0000 (UTC)
Subject: rpms/ejabberd/F-9 ejabberd.spec,1.32,1.33 import.log,1.8,1.9
Message-ID: <20090421091421.90F05700D6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14352/F-9

Modified Files:
	ejabberd.spec import.log 
Log Message:
Enable CAPTCHA plugin


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/ejabberd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ejabberd.spec	4 Apr 2009 04:39:04 -0000	1.32
+++ ejabberd.spec	21 Apr 2009 09:14:19 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -35,7 +35,6 @@
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -117,7 +116,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
-#%patch4 -p1 -b .captcha
+%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -177,8 +176,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
-# tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -220,6 +218,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	4 Apr 2009 04:39:04 -0000	1.8
+++ import.log	21 Apr 2009 09:14:19 -0000	1.9
@@ -6,3 +6,4 @@
 ejabberd-2_0_4-1_fc10:F-9:ejabberd-2.0.4-1.fc10.src.rpm:1237117113
 ejabberd-2_0_5-1_fc10:F-9:ejabberd-2.0.5-1.fc10.src.rpm:1238789863
 ejabberd-2_0_5-2_fc10:F-9:ejabberd-2.0.5-2.fc10.src.rpm:1238819872
+ejabberd-2_0_5-3_fc10:F-9:ejabberd-2.0.5-3.fc10.src.rpm:1240305147



From peter at fedoraproject.org  Tue Apr 21 09:25:59 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 21 Apr 2009 09:25:59 +0000 (UTC)
Subject: rpms/python-xmpp/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 python-xmpp.spec, 1.11, 1.12 sources, 1.4,
	1.5 xmpppy-auth-fixes.diff, 1.1, NONE xmpppy-dispatcher.diff,
	1.1, NONE xmpppy-extra-xep-refs.diff, 1.1,
	NONE xmpppy-gajim-simplexml-updates.diff, 1.1, NONE
Message-ID: <20090421092559.67E88700D6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-xmpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18016/devel

Modified Files:
	.cvsignore import.log python-xmpp.spec sources 
Removed Files:
	xmpppy-auth-fixes.diff xmpppy-dispatcher.diff 
	xmpppy-extra-xep-refs.diff xmpppy-gajim-simplexml-updates.diff 
Log Message:
Ver. 0.5.0-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-xmpp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2008 16:01:57 -0000	1.4
+++ .cvsignore	21 Apr 2009 09:25:27 -0000	1.5
@@ -1 +1 @@
-xmpppy-0.4.1.tar.gz
+xmpppy-0.5.0rc1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-xmpp/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2009 09:53:04 -0000	1.1
+++ import.log	21 Apr 2009 09:25:27 -0000	1.2
@@ -1 +1,2 @@
 python-xmpp-0_4_1-6_fc10:HEAD:python-xmpp-0.4.1-6.fc10.src.rpm:1237110721
+python-xmpp-0_5_0-0_1_rc1_fc10:HEAD:python-xmpp-0.5.0-0.1.rc1.fc10.src.rpm:1240305850


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xmpp/devel/python-xmpp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-xmpp.spec	15 Mar 2009 09:53:04 -0000	1.11
+++ python-xmpp.spec	21 Apr 2009 09:25:27 -0000	1.12
@@ -1,24 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.4.1
-Release:        6%{?dist}
+Version:        0.5.0
+Release:        0.1.rc1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://xmpppy.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/xmpppy/xmpppy-%{version}.tar.gz
-# HTTPPROXYsocket will send data before we have a Dispatcher (from upstream CVS)
-Patch0:         xmpppy-dispatcher.diff
-# Handle spaces in SASL DIGEST-MD5 responses correctly (from upstream CVS)
-# Fix for incorrect-encoding during SASL PLAIN auth (from upstream CVS)
-# Allow anonymous auth if username is None (from upstream CVS)
-Patch1:         xmpppy-auth-fixes.diff
-# Add extra XEP refs (from upstream CVS)
-Patch2:         xmpppy-extra-xep-refs.diff
-# simplexml updates from gajim (from upstream CVS)
-Patch3:         xmpppy-gajim-simplexml-updates.diff
+Source0:        http://downloads.sourceforge.net/xmpppy/xmpppy-%{version}rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:       xmpppy = %{version}-%{release}
 
@@ -43,11 +33,7 @@
 Source Jabber Server.
 
 %prep
-%setup -q -n xmpppy-%{version}
-%patch0 -p0 -b .dispatcher
-%patch1 -p0 -b .auth_orig
-%patch2 -p0 -b .extra_refs
-%patch3 -p0 -b .gajim
+%setup -q -n xmpppy-%{version}rc1
 
 # strip executable permissions so that dependencies aren't picked up
 # from documentation files.
@@ -70,6 +56,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Apr 11 2009 Peter Lemenkov <lemenkov at gmail.com> -  0.5.0-0.1.rc1
+- Ver. 0.5.0rc1
+- Dropped patches
+
 * Sun Mar 15 2009 Peter Lemenkov <lemenkov at gmail.com> -  0.4.1-6
 - Added Provides: xmpppy
 - Added patches from upstream CVS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-xmpp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2008 16:01:57 -0000	1.4
+++ sources	21 Apr 2009 09:25:27 -0000	1.5
@@ -1 +1 @@
-ca36d685643f2c56ab07323a09ece9e4  xmpppy-0.4.1.tar.gz
+e0d2b3f9e4a278c163431e64adb0c861  xmpppy-0.5.0rc1.tar.gz


--- xmpppy-auth-fixes.diff DELETED ---


--- xmpppy-dispatcher.diff DELETED ---


--- xmpppy-extra-xep-refs.diff DELETED ---


--- xmpppy-gajim-simplexml-updates.diff DELETED ---



From mnagy at fedoraproject.org  Tue Apr 21 09:33:33 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 21 Apr 2009 09:33:33 +0000 (UTC)
Subject: rpms/bind/F-11 bind-96-dyndb.patch,1.3,1.4 bind.spec,1.309,1.310
Message-ID: <20090421093333.7C711700D6@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20505

Modified Files:
	bind-96-dyndb.patch bind.spec 
Log Message:
* Tue Apr 21 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
- update the patch for dynamic loading of database backends


bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind-96-dyndb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bind-96-dyndb.patch	30 Mar 2009 14:54:41 -0000	1.3
+++ bind-96-dyndb.patch	21 Apr 2009 09:33:31 -0000	1.4
@@ -1,6 +1,7 @@
-diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
---- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
-+++ bind-9.6.1b1/bin/named/main.c	2009-03-30 14:56:54.895136109 +0200
+diff --git a/bin/named/main.c b/bin/named/main.c
+index aa6575a..8030e3d 100644
+--- a/bin/named/main.c
++++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -18,10 +19,11 @@
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
---- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
-+++ bind-9.6.1b1/bin/named/server.c	2009-03-30 14:59:00.478136755 +0200
-@@ -57,6 +57,7 @@
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 31b2761..5d4077d 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -56,6 +56,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -29,12 +31,12 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
  }
  
  static isc_result_t
 +configure_dynamic_db(const cfg_obj_t *dynamic_db, isc_mem_t *mctx,
-+		     dns_view_t *view, dns_zonemgr_t *zmgr)
++		     const dns_dyndb_arguments_t *dyndb_args)
 +{
 +	isc_result_t result;
 +	const cfg_obj_t *obj;
@@ -88,7 +90,7 @@
 +	REQUIRE(i < len);
 +	argv[i] = NULL;
 +
-+	CHECK(dns_dynamic_db_load(libname, name, mctx, argv, view, zmgr));
++	CHECK(dns_dynamic_db_load(libname, name, mctx, argv, dyndb_args));
 +
 +cleanup:
 +	if (argv != NULL)
@@ -102,7 +104,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
+@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -110,8 +112,8 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1238,6 +1306,22 @@ configure_view(dns_view_t *view, const c
- 		view->maxncachettl = 7 * 24 * 3600;
+@@ -1171,6 +1239,37 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+ #endif
  
  	/*
 +	 * Configure dynamic databases.
@@ -121,33 +123,72 @@
 +		(void)cfg_map_get(voptions, "dynamic-db", &dynamic_db_list);
 +	else
 +		(void)cfg_map_get(config, "dynamic-db", &dynamic_db_list);
-+	for (element = cfg_list_first(dynamic_db_list);
-+	     element != NULL;
-+	     element = cfg_list_next(element))
-+	{
-+		obj = cfg_listelt_value(element);
-+		CHECK(configure_dynamic_db(obj, mctx, view, ns_g_server->zonemgr));
++	element = cfg_list_first(dynamic_db_list);
++	if (element != NULL) {
++		dns_dyndb_arguments_t *args;
++
++		args = dns_dyndb_arguments_create(mctx);
++		if (args == NULL) {
++			result = ISC_R_NOMEMORY;
++			goto cleanup;
++		}
++		dns_dyndb_set_view(args, view);
++		dns_dyndb_set_zonemgr(args, ns_g_server->zonemgr);
++		dns_dyndb_set_task(args, ns_g_server->task);
++		dns_dyndb_set_timermgr(args, ns_g_timermgr);
++		while (element != NULL) {
++			obj = cfg_listelt_value(element);
++			CHECK(configure_dynamic_db(obj, mctx, args));
++
++			element = cfg_list_next(element);
++		}
++
++		dns_dyndb_arguments_destroy(mctx, args);
 +	}
 +
 +	/*
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
-diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
---- /dev/null	2009-03-30 11:37:35.392000941 +0200
-+++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-03-30 14:56:54.899136384 +0200
-@@ -0,0 +1,240 @@
+diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
+index ef5c12a..0f7abba 100644
+--- a/lib/dns/Makefile.in
++++ b/lib/dns/Makefile.in
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
+new file mode 100644
+index 0000000..f11584d
+--- /dev/null
++++ b/lib/dns/dynamic_db.c
+@@ -0,0 +1,346 @@
 +/*
-+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-+ * Copyright (C) 1996-2003  Internet Software Consortium.
++ * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
 + * Permission to use, copy, modify, and/or distribute this software for any
 + * purpose with or without fee is hereby granted, provided that the above
 + * copyright notice and this permission notice appear in all copies.
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
++ * THE SOFTWARE IS PROVIDED "AS IS" AND Red Hat DISCLAIMS ALL WARRANTIES WITH
 + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * AND FITNESS.  IN NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, DIRECT,
 + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -161,13 +202,17 @@
 +#include <isc/mutex.h>
 +#include <isc/once.h>
 +#include <isc/result.h>
++#include <isc/task.h>
 +#include <isc/types.h>
 +#include <isc/util.h>
 +
 +#include <dns/dynamic_db.h>
 +#include <dns/log.h>
 +#include <dns/types.h>
++#include <dns/view.h>
++#include <dns/zone.h>
 +
++#include <string.h>
 +
 +#if HAVE_DLFCN_H
 +#include <dlfcn.h>
@@ -180,8 +225,7 @@
 +
 +
 +typedef isc_result_t (*register_func_t)(isc_mem_t *mctx, const char *name,
-+		const char * const *argv, dns_view_t *view,
-+		dns_zonemgr_t *zmgr);
++		const char * const *argv, dns_dyndb_arguments_t *dyndb_args);
 +typedef void (*destroy_func_t)(void);
 +
 +typedef struct dyndb_implementation dyndb_implementation_t;
@@ -194,6 +238,13 @@
 +	LINK(dyndb_implementation_t)	link;
 +};
 +
++struct dns_dyndb_arguments {
++	dns_view_t	*view;
++	dns_zonemgr_t	*zmgr;
++	isc_task_t	*task;
++	isc_timermgr_t	*timermgr;
++};
++
 +/* List of implementations. Locked by dyndb_lock. */
 +static LIST(dyndb_implementation_t) dyndb_implementations;
 +/* Locks dyndb_implementations. */
@@ -332,8 +383,7 @@
 +
 +isc_result_t
 +dns_dynamic_db_load(const char *libname, const char *name, isc_mem_t *mctx,
-+		    const char * const *argv, dns_view_t *view,
-+		    dns_zonemgr_t *zmgr)
++		    const char * const *argv, dns_dyndb_arguments_t *dyndb_args)
 +{
 +	isc_result_t result;
 +	dyndb_implementation_t *implementation = NULL;
@@ -341,7 +391,7 @@
 +	RUNTIME_CHECK(isc_once_do(&once, dyndb_initialize) == ISC_R_SUCCESS);
 +
 +	CHECK(load_library(mctx, libname, &implementation));
-+	CHECK(implementation->register_function(mctx, name, argv, view, zmgr));
++	CHECK(implementation->register_function(mctx, name, argv, dyndb_args));
 +
 +	LOCK(&dyndb_lock);
 +	APPEND(dyndb_implementations, implementation, link);
@@ -377,21 +427,133 @@
 +
 +	isc_mutex_destroy(&dyndb_lock);
 +}
-diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
---- /dev/null	2009-03-30 11:37:35.392000941 +0200
-+++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-03-30 14:56:54.899136384 +0200
-@@ -0,0 +1,32 @@
++
++dns_dyndb_arguments_t *
++dns_dyndb_arguments_create(isc_mem_t *mctx)
++{
++	dns_dyndb_arguments_t *args;
++
++	args = isc_mem_get(mctx, sizeof(*args));
++	if (args != NULL)
++		memset(args, 0, sizeof(*args));
++
++	return args;
++}
++
++void
++dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	dns_dyndb_set_view(args, NULL);
++	dns_dyndb_set_zonemgr(args, NULL);
++	dns_dyndb_set_task(args, NULL);
++	dns_dyndb_set_timermgr(args, NULL);
++
++	isc_mem_put(mctx, args, sizeof(*args));
++}
++
++void
++dns_dyndb_set_view(dns_dyndb_arguments_t *args, dns_view_t *view)
++{
++	REQUIRE(args != NULL);
++
++	if (args->view != NULL)
++		dns_view_detach(&args->view);
++	if (view != NULL)
++		dns_view_attach(view, &args->view);
++}
++
++dns_view_t *
++dns_dyndb_get_view(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->view;
++}
++
++void
++dns_dyndb_set_zonemgr(dns_dyndb_arguments_t *args, dns_zonemgr_t *zmgr)
++{
++	REQUIRE(args != NULL);
++
++	if (args->zmgr != NULL)
++		dns_zonemgr_detach(&args->zmgr);
++	if (zmgr != NULL)
++		dns_zonemgr_attach(zmgr, &args->zmgr);
++}
++
++dns_zonemgr_t *
++dns_dyndb_get_zonemgr(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->zmgr;
++}
++
++void
++dns_dyndb_set_task(dns_dyndb_arguments_t *args, isc_task_t *task)
++{
++	REQUIRE(args != NULL);
++
++	if (args->task != NULL)
++		isc_task_detach(&args->task);
++	if (task != NULL)
++		isc_task_attach(task, &args->task);
++}
++
++isc_task_t *
++dns_dyndb_get_task(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->task;
++}
++
++void
++dns_dyndb_set_timermgr(dns_dyndb_arguments_t *args, isc_timermgr_t *timermgr)
++{
++	REQUIRE(args != NULL);
++
++	args->timermgr = timermgr;
++}
++
++isc_timermgr_t *
++dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->timermgr;
++}
+diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
+index e9e049e..27fdc45 100644
+--- a/lib/dns/include/dns/Makefile.in
++++ b/lib/dns/include/dns/Makefile.in
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
+new file mode 100644
+index 0000000..12f7a06
+--- /dev/null
++++ b/lib/dns/include/dns/dynamic_db.h
+@@ -0,0 +1,50 @@
 +/*
-+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-+ * Copyright (C) 1996-2003  Internet Software Consortium.
++ * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
 + * Permission to use, copy, modify, and/or distribute this software for any
 + * purpose with or without fee is hereby granted, provided that the above
 + * copyright notice and this permission notice appear in all copies.
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
++ * THE SOFTWARE IS PROVIDED "AS IS" AND Red Hat DISCLAIMS ALL WARRANTIES WITH
 + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * AND FITNESS.  IN NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, DIRECT,
 + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -406,17 +568,37 @@
 +
 +#include <dns/types.h>
 +
++/*
++ * TODO:
++ * Reformat the prototypes.
++ * Add annotated comments.
++ */
++
 +isc_result_t dns_dynamic_db_load(const char *libname, const char *name,
 +				 isc_mem_t *mctx, const char * const *argv,
-+				 dns_view_t *view, dns_zonemgr_t *zmgr);
++				 dns_dyndb_arguments_t *dyndb_args);
 +
 +void dns_dynamic_db_cleanup(void);
 +
++dns_dyndb_arguments_t *dns_dyndb_arguments_create(isc_mem_t *mctx);
++void dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args);
++
++void dns_dyndb_set_view(dns_dyndb_arguments_t *args, dns_view_t *view);
++dns_view_t *dns_dyndb_get_view(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_zonemgr(dns_dyndb_arguments_t *args, dns_zonemgr_t *zmgr);
++dns_zonemgr_t *dns_dyndb_get_zonemgr(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_task(dns_dyndb_arguments_t *args, isc_task_t *task);
++isc_task_t *dns_dyndb_get_task(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_timermgr(dns_dyndb_arguments_t *args,
++			    isc_timermgr_t *timermgr);
++isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
++
 +#endif
-diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
---- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-03-30 14:56:54.899136384 +0200
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
+diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
+index 5adcedd..e171028 100644
+--- a/lib/dns/include/dns/log.h
++++ b/lib/dns/include/dns/log.h
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -424,22 +606,23 @@
  
  ISC_LANG_BEGINDECLS
  
-diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-03-30 14:56:54.899136384 +0200
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
---- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
-+++ bind-9.6.1b1/lib/dns/log.c	2009-03-30 14:56:54.899136384 +0200
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
+diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
+index 5223397..f434188 100644
+--- a/lib/dns/include/dns/types.h
++++ b/lib/dns/include/dns/types.h
+@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable_t;
+ typedef void					dns_dbversion_t;
+ typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
+ typedef struct dns_dlzdb			dns_dlzdb_t;
++typedef struct dns_dyndb_arguments		dns_dyndb_arguments_t;
+ typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
+ typedef struct dns_decompress			dns_decompress_t;
+ typedef struct dns_dispatch			dns_dispatch_t;
+diff --git a/lib/dns/log.c b/lib/dns/log.c
+index 7551e15..b9864eb 100644
+--- a/lib/dns/log.c
++++ b/lib/dns/log.c
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -447,31 +630,10 @@
  	{ NULL, 		0 }
  };
  
-diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-03-30 14:56:54.887146135 +0200
-+++ bind-9.6.1b1/lib/dns/Makefile.in	2009-03-30 14:56:54.899136384 +0200
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
---- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
-+++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-03-30 14:56:54.903136167 +0200
+diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
+index 0610489..a1dba32 100644
+--- a/lib/isccfg/namedconf.c
++++ b/lib/isccfg/namedconf.c
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -488,7 +650,7 @@
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- bind.spec	30 Mar 2009 14:54:41 -0000	1.309
+++ bind.spec	21 Apr 2009 09:33:31 -0000	1.310
@@ -20,7 +20,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  0.1.%{PREVER}%{?dist}
+Release:  0.2.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -569,6 +569,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Apr 21 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
+- update the patch for dynamic loading of database backends
+
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
 - 9.6.1b1 release
 - patches merged



From twaugh at fedoraproject.org  Tue Apr 21 09:34:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 21 Apr 2009 09:34:44 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.258, 
	1.259
Message-ID: <20090421093444.8F56E700D6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20985

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-3
- Moved them back again, as they are not part of the exported
  interface (bug #496808).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- system-config-printer.spec	21 Apr 2009 03:46:59 -0000	1.258
+++ system-config-printer.spec	21 Apr 2009 09:34:42 -0000	1.259
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -109,10 +109,6 @@
 %{python_sitelib}/cupshelpers/openprinting.py*
 %{python_sitelib}/cupshelpers/ppds.py*
 %{python_sitelib}/*.egg-info
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/config.py*
-%{_datadir}/%{name}/debug.py*
-%{_datadir}/%{name}/smburi.py*
 
 %files
 %defattr(-,root,root,-)
@@ -120,9 +116,12 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
 %{_bindir}/my-default-printer
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
+%{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
+%{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/errordialogs.py*
 %{_datadir}/%{name}/glade.py*
 %{_datadir}/%{name}/GroupsPane.py*
@@ -141,6 +140,7 @@
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/SearchCriterion.py*
+%{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
 %{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/timedops.py*
@@ -165,6 +165,10 @@
 exit 0
 
 %changelog
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-3
+- Moved them back again, as they are not part of the exported
+  interface (bug #496808).
+
 * Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
 - Move files required by system-config-printer-kde to -libs (#496646)
 



From karsten at fedoraproject.org  Tue Apr 21 09:43:00 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 21 Apr 2009 09:43:00 +0000 (UTC)
Subject: rpms/gmyth/devel gmyth.spec,1.13,1.14
Message-ID: <20090421094300.69A8070137@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/gmyth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23544

Modified Files:
	gmyth.spec 
Log Message:
- rebuild with latest mysql on s390x


Index: gmyth.spec
===================================================================
RCS file: /cvs/extras/rpms/gmyth/devel/gmyth.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gmyth.spec	24 Feb 2009 22:29:53 -0000	1.13
+++ gmyth.spec	21 Apr 2009 09:42:27 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: MythTV remote access libraries
 Name: gmyth
 Version: 0.7.1
-Release: 9%{?dist}
+Release: 9%{?dist}.1
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 21 2009 Karsten Hopp <karsten at redhat.com> 0.7.1-9.1
+- rebuild with latest mysql on s390x
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From tmraz at fedoraproject.org  Tue Apr 21 10:05:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 21 Apr 2009 10:05:15 +0000 (UTC)
Subject: rpms/openssl/devel openssl-0.9.8k-dtls-compat.patch, NONE,
	1.1 openssl.spec, 1.128, 1.129
Message-ID: <20090421100515.5B21F700D6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31219

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8k-dtls-compat.patch 
Log Message:
* Tue Apr 21 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-4
- support compatibility DTLS mode for CISCO AnyConnect (#464629)


openssl-0.9.8k-dtls-compat.patch:

--- NEW FILE openssl-0.9.8k-dtls-compat.patch ---
Support old DTLS version for compatibility with CISCO AnyConnect.
Index: openssl/ssl/d1_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_clnt.c,v
rcsdiff -q -kk '-r1.3.2.15' '-r1.3.2.16' -u '/v/openssl/cvs/openssl/ssl/d1_clnt.c,v' 2>/dev/null
--- openssl/ssl/d1_clnt.c 2009/04/14 15:20:47 1.3.2.15
+++ openssl/ssl/d1_clnt.c 2009/04/19 18:08:11 1.3.2.16
@@ -130,7 +130,7 @@
 
 static SSL_METHOD *dtls1_get_client_method(int ver)
 	{
-	if (ver == DTLS1_VERSION)
+	if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
 		return(DTLSv1_client_method());
 	else
 		return(NULL);
@@ -181,7 +181,8 @@
 			s->server=0;
 			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
 
-			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00))
+			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) &&
+			    (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00))
 				{
 				SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR);
 				ret = -1;
Index: openssl/ssl/d1_lib.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_lib.c,v
rcsdiff -q -kk '-r1.1.2.7' '-r1.1.2.8' -u '/v/openssl/cvs/openssl/ssl/d1_lib.c,v' 2>/dev/null
--- openssl/ssl/d1_lib.c 2009/04/02 22:34:59 1.1.2.7
+++ openssl/ssl/d1_lib.c 2009/04/19 18:08:11 1.1.2.8
@@ -198,7 +198,10 @@
 void dtls1_clear(SSL *s)
 	{
 	ssl3_clear(s);
-	s->version=DTLS1_VERSION;
+	if (s->options & SSL_OP_CISCO_ANYCONNECT)
+		s->version=DTLS1_BAD_VER;
+	else
+		s->version=DTLS1_VERSION;
 	}
 
 /*
Index: openssl/ssl/d1_pkt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v
rcsdiff -q -kk '-r1.4.2.15' '-r1.4.2.16' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null
--- openssl/ssl/d1_pkt.c 2009/04/02 22:34:59 1.4.2.15
+++ openssl/ssl/d1_pkt.c 2009/04/19 18:08:12 1.4.2.16
@@ -1024,15 +1024,17 @@
 	if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
 		{
 		struct ccs_header_st ccs_hdr;
+		int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
 
 		dtls1_get_ccs_header(rr->data, &ccs_hdr);
 
 		/* 'Change Cipher Spec' is just a single byte, so we know
 		 * exactly what the record payload has to look like */
 		/* XDTLS: check that epoch is consistent */
-		if (	(s->client_version == DTLS1_BAD_VER && rr->length != 3) ||
-			(s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) || 
-			(rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
+		if (s->client_version == DTLS1_BAD_VER || s->version == DTLS1_BAD_VER)
+			ccs_hdr_len = 3;
+
+		if ((rr->length != ccs_hdr_len) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
 			{
 			i=SSL_AD_ILLEGAL_PARAMETER;
 			SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
@@ -1358,7 +1360,7 @@
 #if 0
 	/* 'create_empty_fragment' is true only when this function calls itself */
 	if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done
-		&& SSL_version(s) != DTLS1_VERSION)
+	    && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
 		{
 		/* countermeasure against known-IV weakness in CBC ciphersuites
 		 * (see http://www.openssl.org/~bodo/tls-cbc.txt) 
Index: openssl/ssl/s3_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/s3_clnt.c,v
rcsdiff -q -kk '-r1.88.2.21' '-r1.88.2.22' -u '/v/openssl/cvs/openssl/ssl/s3_clnt.c,v' 2>/dev/null
--- openssl/ssl/s3_clnt.c 2009/02/14 21:50:14 1.88.2.21
+++ openssl/ssl/s3_clnt.c 2009/04/19 18:08:12 1.88.2.22
@@ -708,7 +708,7 @@
 
 	if (!ok) return((int)n);
 
-	if ( SSL_version(s) == DTLS1_VERSION)
+	if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
 		{
 		if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
 			{
Index: openssl/ssl/ssl.h
RCS File: /v/openssl/cvs/openssl/ssl/ssl.h,v
rcsdiff -q -kk '-r1.161.2.21' '-r1.161.2.22' -u '/v/openssl/cvs/openssl/ssl/ssl.h,v' 2>/dev/null
--- openssl/ssl/ssl.h 2008/08/13 19:44:44 1.161.2.21
+++ openssl/ssl/ssl.h 2009/04/19 18:08:12 1.161.2.22
@@ -510,6 +510,8 @@
 #define SSL_OP_COOKIE_EXCHANGE              0x00002000L
 /* Don't use RFC4507 ticket extension */
 #define SSL_OP_NO_TICKET	            0x00004000L
+/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client)  */
+#define SSL_OP_CISCO_ANYCONNECT		    0x00008000L
 
 /* As server, disallow session resumption on renegotiation */
 #define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION	0x00010000L
Index: openssl/ssl/ssl_lib.c
RCS File: /v/openssl/cvs/openssl/ssl/ssl_lib.c,v
rcsdiff -q -kk '-r1.133.2.16' '-r1.133.2.17' -u '/v/openssl/cvs/openssl/ssl/ssl_lib.c,v' 2>/dev/null
--- openssl/ssl/ssl_lib.c 2009/02/23 16:02:47 1.133.2.16
+++ openssl/ssl/ssl_lib.c 2009/04/19 18:08:12 1.133.2.17
@@ -995,7 +995,8 @@
 		s->max_cert_list=larg;
 		return(l);
 	case SSL_CTRL_SET_MTU:
-		if (SSL_version(s) == DTLS1_VERSION)
+		if (SSL_version(s) == DTLS1_VERSION ||
+		    SSL_version(s) == DTLS1_BAD_VER)
 			{
 			s->d1->mtu = larg;
 			return larg;
Index: openssl/ssl/ssl_sess.c
RCS File: /v/openssl/cvs/openssl/ssl/ssl_sess.c,v
rcsdiff -q -kk '-r1.51.2.9' '-r1.51.2.10' -u '/v/openssl/cvs/openssl/ssl/ssl_sess.c,v' 2>/dev/null
--- openssl/ssl/ssl_sess.c 2008/06/04 18:35:27 1.51.2.9
+++ openssl/ssl/ssl_sess.c 2009/04/19 18:08:12 1.51.2.10
@@ -211,6 +211,11 @@
 			ss->ssl_version=TLS1_VERSION;
 			ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
 			}
+		else if (s->version == DTLS1_BAD_VER)
+			{
+			ss->ssl_version=DTLS1_BAD_VER;
+			ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+			}
 		else if (s->version == DTLS1_VERSION)
 			{
 			ss->ssl_version=DTLS1_VERSION;
Index: openssl/ssl/t1_enc.c
RCS File: /v/openssl/cvs/openssl/ssl/t1_enc.c,v
rcsdiff -q -kk '-r1.35.2.8' '-r1.35.2.9' -u '/v/openssl/cvs/openssl/ssl/t1_enc.c,v' 2>/dev/null
--- openssl/ssl/t1_enc.c 2009/01/05 14:43:07 1.35.2.8
+++ openssl/ssl/t1_enc.c 2009/04/19 18:08:12 1.35.2.9
@@ -765,10 +765,10 @@
 	HMAC_CTX_init(&hmac);
 	HMAC_Init_ex(&hmac,mac_sec,EVP_MD_size(hash),hash,NULL);
 
-	if (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER)
+	if (ssl->version == DTLS1_BAD_VER ||
+	    (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER))
 		{
 		unsigned char dtlsseq[8],*p=dtlsseq;
-
 		s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p);
 		memcpy (p,&seq[2],6);
 
@@ -793,7 +793,7 @@
 {unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); }
 #endif
 
-	if ( SSL_version(ssl) != DTLS1_VERSION)
+	if ( SSL_version(ssl) != DTLS1_VERSION && SSL_version(ssl) != DTLS1_BAD_VER)
 		{
 		for (i=7; i>=0; i--)
 			{


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- openssl.spec	17 Apr 2009 16:13:51 -0000	1.128
+++ openssl.spec	21 Apr 2009 10:05:11 -0000	1.129
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8k
-Release: 3%{?dist}
+Release: 4%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -65,6 +65,7 @@
 Patch49: openssl-0.9.8j-fips-no-pairwise.patch
 Patch50: openssl-0.9.8j-fips-rng-seed.patch
 Patch51: openssl-0.9.8k-multi-crl.patch
+Patch52: openssl-0.9.8k-dtls-compat.patch
 # Backported fixes including security fixes
 
 License: OpenSSL
@@ -150,6 +151,7 @@
 %patch49 -p1 -b .no-pairwise
 %patch50 -p1 -b .rng-seed
 %patch51 -p1 -b .multi-crl
+%patch52 -p1 -b .dtls-compat
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -408,6 +410,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 21 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-4
+- support compatibility DTLS mode for CISCO AnyConnect (#464629)
+
 * Fri Apr 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-3
 - correct the SHLIB_VERSION define
 



From rhughes at fedoraproject.org  Tue Apr 21 10:19:58 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 21 Apr 2009 10:19:58 +0000 (UTC)
Subject: rpms/PackageKit/F-11
	PackageKit-0.4.6-Presto-handle-downloading-updates.patch, 1.1,
	1.2 PackageKit.spec, 1.102, 1.103
Message-ID: <20090421101958.7AAC87013C@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3571

Modified Files:
	PackageKit-0.4.6-Presto-handle-downloading-updates.patch 
	PackageKit.spec 
Log Message:
* Tue Apr 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-5
- Rework one of the Presto patches so that it works with multiple packages.


PackageKit-0.4.6-Presto-handle-downloading-updates.patch:

Index: PackageKit-0.4.6-Presto-handle-downloading-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit-0.4.6-Presto-handle-downloading-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageKit-0.4.6-Presto-handle-downloading-updates.patch	20 Apr 2009 10:32:45 -0000	1.1
+++ PackageKit-0.4.6-Presto-handle-downloading-updates.patch	21 Apr 2009 10:19:55 -0000	1.2
@@ -1,28 +1,39 @@
-commit dd136f6760d375ba55ec98ab02291028c03d8b46
-Author: Richard Hughes <richard at hughsie.com>
-Date:   Sun Apr 19 11:59:42 2009 +0100
-
-    yum: Deal with Presto downloading updates in a better way
-
 diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
-index 5870eb7..7119c6a 100755
+index f13bd9d..7c29941 100755
 --- a/backends/yum/yumBackend.py
 +++ b/backends/yum/yumBackend.py
-@@ -36,6 +36,7 @@ from yum.callbacks import *
- from yum.misc import prco_tuple_to_string, unique
- from yum.packages import YumLocalPackage, parsePackages
- from yum.packageSack import MetaSack
-+from yum.sqlitesack import YumAvailablePackageSqlite
- import rpmUtils
- import exceptions
- import types
-@@ -2559,6 +2560,9 @@ class DownloadCallback(BaseMeter):
-             for pkg in self.saved_pkgs:
-                 if isinstance(pkg, YumLocalPackage):
-                     rpmfn = pkg.localPkg
-+                elif isinstance(pkg, YumAvailablePackageSqlite):
-+                    # from yum-presto, so not a local package
-+                    return pkg
-                 else:
-                     rpmfn = os.path.basename(pkg.remote_path) # get the rpm filename of the package
-                 if rpmfn == name:
+@@ -2521,14 +2521,26 @@ class DownloadCallback(BaseMeter):
+         self.percent_start = percent_start
+ 
+     def _getPackage(self, name):
+-        if self.saved_pkgs:
+-            for pkg in self.saved_pkgs:
+-                if isinstance(pkg, YumLocalPackage):
+-                    rpmfn = pkg.localPkg
+-                else:
+-                    rpmfn = os.path.basename(pkg.remote_path) # get the rpm filename of the package
+-                if rpmfn == name:
+-                    return pkg
++
++        # no download data
++        if not self.saved_pkgs:
++            return None
++
++        # split into name, version, release
++        # for yum, name is:
++        #  - gnote-0.1.2-2.fc11.i586.rpm
++        # and for Presto:
++        #  - gnote-0.1.1-4.fc11_0.1.2-2.fc11.i586.drpm
++        sections = name.rsplit('-', 3)
++        if len(sections) < 3:
++            return None
++
++        # we need to search the saved packages for a match and then return the pkg
++        for pkg in self.saved_pkgs:
++            if sections[0] == pkg.name:
++                return pkg
++
++        # nothing matched
+         return None
+ 
+     def update(self, amount_read, now=None):


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- PackageKit.spec	20 Apr 2009 10:32:45 -0000	1.102
+++ PackageKit.spec	21 Apr 2009 10:19:55 -0000	1.103
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -450,6 +450,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Apr 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-5
+- Rework one of the Presto patches so that it works with multiple packages.
+
 * Sun Apr 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-4
 - Backport 2 patches from upstream to make Presto work better with PK.
 



From pghmcfc at fedoraproject.org  Tue Apr 21 10:22:35 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 10:22:35 +0000 (UTC)
Subject: rpms/libxml/devel libxml.spec,1.11,1.12
Message-ID: <20090421102235.27B3E7013C@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4326

Modified Files:
	libxml.spec 
Log Message:
rebuild for %{_isa} provides/requires


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/devel/libxml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxml.spec	25 Feb 2009 20:08:35 -0000	1.11
+++ libxml.spec	21 Apr 2009 10:22:03 -0000	1.12
@@ -1,8 +1,8 @@
 Name:		libxml
-Summary:	Old libXML library for Gnome-1 application compatibility
+Summary:	Old XML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	21%{?dist}
+Release:	22%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
@@ -19,10 +19,10 @@
 %package devel
 Summary:	Libraries, includes, etc. to build old libxml-based applications
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}, pkgconfig
 
 %description devel
-%{summary}.
+Libraries, includes, etc. to build old libxml-based applications.
 
 %prep
 %setup -q
@@ -71,8 +71,11 @@
 %exclude %{_libdir}/libxml.la
 
 %changelog
+* Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-22
+- rebuild for %%{_isa} provides/requires
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed May 21 2008 Paul Howarth <paul at city-fan.org> 1:1.8.17-20
 - fixes for building with -Werror-implicit-function-declaration and some of the



From pghmcfc at fedoraproject.org  Tue Apr 21 10:26:04 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 10:26:04 +0000 (UTC)
Subject: rpms/glib/devel glib-1.2.10-unused-dep.patch, NONE, 1.1 glib.spec, 
	1.13, 1.14
Message-ID: <20090421102605.2B5A2700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5768

Modified Files:
	glib.spec 
Added Files:
	glib-1.2.10-unused-dep.patch 
Log Message:
- remove redundant linkage of libgmodule to libgthread
- cosmetic spec changes


glib-1.2.10-unused-dep.patch:

--- NEW FILE glib-1.2.10-unused-dep.patch ---
--- glib-1.2.10/gthread/Makefile.am	2009-04-17 15:47:42.000000000 +0100
+++ glib-1.2.10/gthread/Makefile.am	2009-04-17 15:49:26.000000000 +0100
@@ -20,8 +20,8 @@
 	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la
-libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la
+libgthread_la_DEPENDENCIES = $(libglib)
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = libgthread.la 


Index: glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib/devel/glib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- glib.spec	24 Feb 2009 18:14:04 -0000	1.13
+++ glib.spec	21 Apr 2009 10:26:03 -0000	1.14
@@ -1,18 +1,15 @@
-
-Summary: A library of handy utility functions
-Name: 	 glib
-Epoch:	 1
-Version: 1.2.10
-Release: 31%{?dist}
-
-License: LGPLv2+
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
+Summary:	A library of handy utility functions
+Name:		glib
+Epoch:		1
+Version:	1.2.10
+Release:	32%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source:		ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
 
 # Suppress warnings about varargs macros for -pedantic
 Patch1: glib-1.2.10-isowarning.patch
@@ -21,17 +18,22 @@
 Patch4: glib-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222296
 Patch5: glib-1.2.10-multilib.patch
+# Fix unused direct shared library dependency on libgmodule for libgthread
+Patch6: glib-1.2.10-unused-dep.patch
+
 
 %description
 GLib is a handy library of utility functions. This C library is
 designed to solve some portability problems and provide other useful
-functionality which most programs require.
+functionality that most programs require.
+
 
 %package devel
 Summary: Libraries and header files for %{name} development 
 Group:	 Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 %{summary}.
 
@@ -44,6 +46,7 @@
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .no_undefined
 %patch5 -p1 -b .multilib
+%patch6 -p1 -b .unused-dep
 
 # The original config.{guess,sub} do not work on x86_64
 #
@@ -58,37 +61,36 @@
 autoheader-2.13
 
 
-
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool
 
 # libgmodule-1.2.so.0* missing eXecute bit
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+%{__chmod} a+x %{buildroot}%{_libdir}/lib*.so*
 
 ## Unpackaged files
 # info
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 # .la fies... die die die.
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 
 %check
-make check LIBTOOL=%{_bindir}/libtool
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -111,10 +113,13 @@
 %{_mandir}/man1/*
 %{_datadir}/aclocal/*
 
-
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-32
+- remove redundant linkage of libgmodule to libgthread
+- cosmetic spec changes
+
 * Wed Feb 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1:1.2.10-31
-- Rebuild for pkgconfig deps
+- rebuild for pkgconfig deps
 
 * Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-30
 - copy config.* from rpm directory, those shipped are too old. Should
@@ -292,7 +297,7 @@
 - new description tags 
 
 * Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
-- removed libtoolize from %build
+- removed libtoolize from %%build
 
 * Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
 - added libgthread to file list



From pghmcfc at fedoraproject.org  Tue Apr 21 10:33:22 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 10:33:22 +0000 (UTC)
Subject: rpms/gtk+/devel gtk+-1.2.10-unused-deps.patch, NONE, 1.1 gtk+.spec, 
	1.19, 1.20
Message-ID: <20090421103322.7800C700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtk+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7536

Modified Files:
	gtk+.spec 
Added Files:
	gtk+-1.2.10-unused-deps.patch 
Log Message:
- remove unused shared library dependencies
- use install -p to maintain timestamps where reasonable
- recode docs as UTF-8
- cosmetic spec changes


gtk+-1.2.10-unused-deps.patch:

--- NEW FILE gtk+-1.2.10-unused-deps.patch ---
--- gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:02:02.000000000 +0100
+++ gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:05:49.000000000 +0100
@@ -22,10 +22,9 @@
 	-release $(LT_RELEASE) \
 	-export-dynamic \
 	-no-undefined -Wl,--no-undefined \
-	@GLIB_DEPLIBS@	\
+	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
 	@x_ldflags@	\
 	@x_libs@	\
-	-lm		\
 @STRIP_END@
 
 #
--- gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:46:56.000000000 +0100
+++ gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:52:24.000000000 +0100
@@ -32,9 +32,9 @@
 	-release $(LT_RELEASE) 					\
 	-export-dynamic						\
 	-no-undefined -Wl,--no-undefined			\
-	@GLIB_DEPLIBS@ 						\
+	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
 	@x_ldflags@						\
-	@x_libs@ 						\
+	$(filter-out -lXi -lXext, @x_libs@)			\
 	-lm							\
 @STRIP_END@
 #	$(top_builddir)/gdk/libgdk.la


Index: gtk+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/devel/gtk+.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtk+.spec	25 Feb 2009 01:43:40 -0000	1.19
+++ gtk+.spec	21 Apr 2009 10:32:50 -0000	1.20
@@ -1,89 +1,89 @@
-Summary: The GIMP ToolKit
-Name: 	 gtk+
-Epoch:	 1
-Version: 1.2.10
-Release: 67%{?dist}
-
-License: LGPLv2+
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source0: ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Provides: gtk1 = %{version}-%{release}
-
-Source1: gtkrc-default
-Source2: gtk+-pofiles.tar.gz
-Source3: gtkrc.ja.utf8
-Source4: gtkrc.ko.utf8
-Source5: gtkrc.zh_CN.utf8
-Source6: gtkrc.zh_TW.utf8
-
-Patch1: gtk+-1.2.10-ahiguti.patch
-Patch5: gtk+-1.2.8-wrap-alnum.patch
-# Supress alignment warnings on ia64
-Patch10: gtk+-1.2.10-alignment.patch
+Summary:	The GIMP ToolKit
+Name:		gtk+
+Epoch:		1
+Version:	1.2.10
+Release:	68%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source0:	ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:	gtk1 = %{version}-%{release}
+
+Source1:	gtkrc-default
+Source2:	gtk+-pofiles.tar.gz
+Source3:	gtkrc.ja.utf8
+Source4:	gtkrc.ko.utf8
+Source5:	gtkrc.zh_CN.utf8
+Source6:	gtkrc.zh_TW.utf8
+
+Patch1:		gtk+-1.2.10-ahiguti.patch
+Patch5:		gtk+-1.2.8-wrap-alnum.patch
+# Suppress alignment warnings on ia64
+Patch10:	gtk+-1.2.10-alignment.patch
 # Improve exposure compression
-Patch11: gtk+-1.2.10-expose.patch
+Patch11:	gtk+-1.2.10-expose.patch
 # Handle focus tracking for embedded window properly
-Patch12: gtk+-1.2.10-focus.patch
+Patch12:	gtk+-1.2.10-focus.patch
 # Find gtkrc files for the current encoding better
-Patch13: gtk+-1.2.10-encoding.patch
+Patch13:	gtk+-1.2.10-encoding.patch
 # Don't screw up CTEXT encoding for UTF-8
-Patch14: gtk+-1.2.10-ctext.patch
+Patch14:	gtk+-1.2.10-ctext.patch
 # Don't warn about missing fonts for UTF-8
-Patch15: gtk+-1.2.10-utf8fontset.patch
+Patch15:	gtk+-1.2.10-utf8fontset.patch
 # Accept KP_Enter as a synonym for Return everywhere
-Patch16: gtk+-1.2.10-kpenter.patch
+Patch16:	gtk+-1.2.10-kpenter.patch
 # Allow theme switching to work properly when no windows are realized
-Patch17: gtk+-1.2.10-themeswitch.patch
+Patch17:	gtk+-1.2.10-themeswitch.patch
 # Fix crash when switching themes
-Patch18: gtk+-1.2.10-pixmapref.patch
+Patch18:	gtk+-1.2.10-pixmapref.patch
 # Fix computation of width of missing characters
-Patch19: gtk+-1.2.10-missingchar.patch
+Patch19:	gtk+-1.2.10-missingchar.patch
 # Fix sizes of Ukrainian fontsets
-Patch20: gtk+-1.2.10-ukfont.patch
+Patch20:	gtk+-1.2.10-ukfont.patch
 # Fix file selection delete-dir when changing directory problem
 # also, fix memory corruption problem when changing directories.
-Patch21: gtk+-1.2.10-deletedir.patch
+Patch21:	gtk+-1.2.10-deletedir.patch
 # Improve warning for missing fonts
-Patch22: gtk+-1.2.10-fontwarning.patch
+Patch22:	gtk+-1.2.10-fontwarning.patch
 # Allow themes to make scrollbar trough always repaint
-Patch23: gtk+-1.2.10-troughpaint.patch
+Patch23:	gtk+-1.2.10-troughpaint.patch
 # Fix a crash that can happen in some apps when the current
 # locale is not supported by XLib.
-Patch24: gtk+-1.2.10-localecrash.patch
+Patch24:	gtk+-1.2.10-localecrash.patch
 # Patch from CVS to fix b.g.o #56349
-Patch26: gtk+-1.2.10-dndorder.patch
+Patch26:	gtk+-1.2.10-dndorder.patch
 # Patch from CVS to fix b.g.o #94812
-Patch27: gtk+-1.2.10-clistfocusrow.patch
+Patch27:	gtk+-1.2.10-clistfocusrow.patch
 # Fix GTK+ to obey X server's default bell volume
-Patch28: gtk+-1.2.10-bellvolume.patch
+Patch28:	gtk+-1.2.10-bellvolume.patch
 # Hack up the configure scripts to deal with some obscure
 # breakage with ancient libtool
-Patch29: gtk+-1.2.10-libtool.patch
+Patch29:	gtk+-1.2.10-libtool.patch
 # Add a dependency on libgdk to libgtk (#106677)
-Patch30: gtk+-1.2.10-gtkgdkdep.patch
-Patch31: gtk+-underquoted.patch
-Patch32: gtk+-1.2.10-ppc64.patch
+Patch30:	gtk+-1.2.10-gtkgdkdep.patch
+Patch31:	gtk+-underquoted.patch
+Patch32:	gtk+-1.2.10-ppc64.patch
 # do not allow for undefined symbols in shared libraries -- Rex
-Patch33: gtk+-1.2.10-no_undefined.patch
+Patch33:	gtk+-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222298
-Patch34: gtk+-1.2.10-multilib.patch
-
-BuildRequires: glib-devel >= 1:%{version}
-#Requires:     glib >= 1:%{version}
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
-BuildRequires: gettext
+Patch34:	gtk+-1.2.10-multilib.patch
+# Remove redundant shared library dependencies
+Patch35:	gtk+-1.2.10-unused-deps.patch
+
+BuildRequires:	glib-devel >= 1:%{version}
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
+BuildRequires:	gettext
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps  libX11-devel libXext-devel libXi-devel libXt-devel
+%global x_deps	libX11-devel libXext-devel libXi-devel libXt-devel
 %else
-%define x_deps	xorg-x11-devel
+%global x_deps	xorg-x11-devel
 ## This can be used for legacy too -- Rex
-#define	x_deps	Xree86-devel
+#global	x_deps	XFree86-devel
 %endif
-BuildRequires: %{x_deps} 
+BuildRequires:	%{x_deps} 
 
 %description
 The gtk+ package contains the GIMP ToolKit (GTK+), a library for
@@ -92,17 +92,18 @@
 processing program, but is now used by several other programs as
 well.
 
-%package devel
-Summary: Development tools for GTK+ (GIMP ToolKit) applications
-Group: Development/Libraries
-Provides: gtk1-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: glib-devel
-Requires: pkgconfig
-Requires: %{x_deps} 
+%package	devel
+Summary:	Development tools for GTK+ (GIMP ToolKit) applications
+Group:		Development/Libraries
+Provides:	gtk1-devel = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib-devel
+Requires:	pkgconfig
+Requires:	%{x_deps} 
 ## info files not included
 #Requires(post): /sbin/install-info
 #Requires(preun): /sbin/install-info
+
 %description devel
 Libraries, header files and documentation for developing GTK+ 
 (GIMP ToolKit) applications.
@@ -137,80 +138,86 @@
 %patch32 -p1 -b .ppc64
 %patch33 -p1 -b .no_undefined
 %patch34 -p1 -b .multilib
+%patch35 -p1 -b .unused-deps
 
 # The original config.{guess,sub} do not work on x86_64
 #
 # The following /usr/lib cannot be %%_libdir !!
-cp -p /usr/lib/rpm/config.{guess,sub} .
-
-#cp -f %{_datadir}/aclocal/libtool.m4 .
-#libtoolize --copy --force
-automake-1.4
-#aclocal-1.4
-autoconf-2.13
-autoheader-2.13
+%{__cp} -p /usr/lib/rpm/config.{guess,sub} .
 
+#%{__cp} -f %{_datadir}/aclocal/libtool.m4 .
+#/usr/bin/libtoolize --copy --force
+/usr/bin/automake-1.4
+#/usr/bin/aclocal-1.4
+/usr/bin/autoconf-2.13
+/usr/bin/autoheader-2.13
+
+# Recode docs as UTF-8
+for doc in ChangeLog examples/calendar/calendar.c; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${doc} > ${doc}.utf8
+	%{__mv} ${doc}.utf8 ${doc}
+done
 
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure \
-  --disable-static \
-  --with-xinput=xfree\
-  --with-native-locale
+	--disable-static \
+	--with-xinput=xfree \
+	--with-native-locale
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool INSTALL="%{__install} -p"
 
 #
 # Make cleaned-up versions of examples and tutorial for installation
 #
 ./mkinstalldirs tmpdocs/tutorial
-install -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
-for dir in examples/* ; do
-    if [ -d $dir ] ; then
-       ./mkinstalldirs tmpdocs/$dir
-       for file in $dir/* ; do
-          case $file in
-	     *pre1.2.7)
-	        ;;
-	     *)
-                install -p -m0644 $file tmpdocs/$dir
-		;;
-	  esac
-       done
-    fi
+%{__install} -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
+for dir in examples/*; do
+	if [ -d $dir ]; then
+		./mkinstalldirs tmpdocs/$dir
+		for file in $dir/* ; do
+			case $file in
+			*pre1.2.7)
+				;;
+			*)
+				%{__install} -p -m0644 $file tmpdocs/$dir
+				;;
+			esac
+		done
+	fi
 done
 
-install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc
+%{__install} -p -m644 -D %{SOURCE1} %{buildroot}/etc/gtk/gtkrc
 
 # Install some extra gtkrc files to improve functioning of GTK+
 # in UTF-8 locales for Chinese, Japanese, Korean.
-for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do
-  install -p -m0644 $i $RPM_BUILD_ROOT/etc/gtk/
+for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
+	%{__install} -p -m0644 $i %{buildroot}/etc/gtk/
 done
 
 # We don't ship the info files
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 
 # .la fies... die die die.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 %find_lang %{name}
 
 
 %check
-make check LIBTOOL=%{_bindir}/libtool
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -222,7 +229,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_libdir}/lib*.so.*
-%dir %{_datadir}/themes
+%dir %{_datadir}/themes/
 %{_datadir}/themes/Default/
 %dir %{_sysconfdir}/gtk/
 %config(noreplace) %{_sysconfdir}/gtk/*
@@ -240,8 +247,14 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.10-67
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-68
+- remove unused shared library dependencies
+- use install -p to maintain timestamps where reasonable
+- recode docs as UTF-8
+- cosmetic spec changes
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.2.10-67
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-66
 - rebase the ahiguti patch



From pghmcfc at fedoraproject.org  Tue Apr 21 10:38:38 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 10:38:38 +0000 (UTC)
Subject: rpms/ORBit/devel ORBit-0.5.17-non-weak-symbols.patch, NONE,
	1.1 ORBit.spec, 1.9, 1.10
Message-ID: <20090421103838.121F2700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/ORBit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9497

Modified Files:
	ORBit.spec 
Added Files:
	ORBit-0.5.17-non-weak-symbols.patch 
Log Message:
- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one


ORBit-0.5.17-non-weak-symbols.patch:

--- NEW FILE ORBit-0.5.17-non-weak-symbols.patch ---
diff -ur ORBit-0.5.17.orig/src/Makefile.am ORBit-0.5.17/src/Makefile.am
--- ORBit-0.5.17.orig/src/Makefile.am	1999-06-09 22:26:57.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.am	2009-04-09 14:51:55.000000000 +0100
@@ -1 +1 @@
-SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
diff -ur ORBit-0.5.17.orig/src/Makefile.in ORBit-0.5.17/src/Makefile.in
--- ORBit-0.5.17.orig/src/Makefile.in	2002-06-06 12:34:43.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.in	2009-04-09 14:53:28.000000000 +0100
@@ -97,7 +97,7 @@
 YACC = @YACC@
 pkglibdir = @pkglibdir@
 
-SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.am ORBit-0.5.17/src/orb/Makefile.am
--- ORBit-0.5.17.orig/src/orb/Makefile.am	2002-06-06 12:07:39.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.am	2009-04-09 15:03:50.000000000 +0100
@@ -98,7 +98,7 @@
 	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
 
 BUILT_SOURCES = \
 	orbit.h	\
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.in ORBit-0.5.17/src/orb/Makefile.in
--- ORBit-0.5.17.orig/src/orb/Makefile.in	2002-06-06 12:34:48.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.in	2009-04-09 15:03:31.000000000 +0100
@@ -116,7 +116,7 @@
 IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
 
 BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
 
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.am ORBit-0.5.17/src/services/name/Makefile.am
--- ORBit-0.5.17.orig/src/services/name/Makefile.am	2002-06-06 12:07:45.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.am	2009-04-09 15:08:51.000000000 +0100
@@ -18,6 +18,8 @@
 libORBitCosNaming_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
+
 INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
 
 IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.in ORBit-0.5.17/src/services/name/Makefile.in
--- ORBit-0.5.17.orig/src/services/name/Makefile.in	2002-06-06 12:34:52.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.in	2009-04-09 15:09:48.000000000 +0100
@@ -171,7 +171,7 @@
 AR = ar
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
-libORBitCosNaming_la_LIBADD = 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
 libORBitCosNaming_la_OBJECTS =  CosNaming-common.lo CosNaming-stubs.lo \
 LName.lo
 bin_PROGRAMS =  name-client$(EXEEXT) orbit-name-server$(EXEEXT) \


Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ORBit.spec	24 Feb 2009 10:02:02 -0000	1.9
+++ ORBit.spec	21 Apr 2009 10:38:36 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		25%{?dist}
+Release:		26%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -9,6 +9,7 @@
 Patch1:			ORBit-underquoted.patch
 Patch2:			ORBit-0.5.17-IIOP-weak-symbols.patch
 Patch3:			ORBit-0.5.17-multiarch.patch
+Patch4:			ORBit-0.5.17-non-weak-symbols.patch
 Group:			System Environment/Daemons
 License:		LGPLv2+ and GPLv2+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +19,7 @@
 # Using system popt library would be highly likely to introduce regressions in this
 # ancient piece of legacy code.
 %if 0%{?fedora} > 10
-BuildRequires:		glibc-static
+BuildRequires:		glibc-static%{?_isa}
 %endif
 
 Requires(post):		/sbin/install-info
@@ -57,17 +58,22 @@
 %setup -q
 %patch0 -p1 -b .aligned
 %patch1 -p1 -b .underquoted
-%patch2 -p1 -b .weak-symbols
+%patch2 -p1 -b .iiop-non-weak-symbols
 %patch3 -p1 -b .multiarch
+%patch4 -p1 -b .non-weak-symbols
 
 %build
 %configure
+
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 # %{?_smp_mflags} removed at release 1:0.5.17-10.2
-%{__make} LIBTOOL=/usr/bin/libtool
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" LIBTOOL=/usr/bin/libtool install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 
 # remove unpackaged files
 %{__rm} -f %{buildroot}%{_bindir}/ior-decode
@@ -131,9 +137,14 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Apr  9 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-26
+- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
 * Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-25
 - Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
-- Buildreq glibc-static for test code in bundled popt library
+- Buildreq glibc-static for test code in bundled popt library (F-11 onwards)
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.5.17-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From nhorman at fedoraproject.org  Tue Apr 21 10:46:46 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 21 Apr 2009 10:46:46 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-ftrace-memory-reduction.patch, NONE,
	1.1 kernel.spec, 1.1337, 1.1338
Message-ID: <20090421104646.DEE09700D6@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11885

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ftrace-memory-reduction.patch 
Log Message:
Resolves: bz481448

linux-2.6-ftrace-memory-reduction.patch:

--- NEW FILE linux-2.6-ftrace-memory-reduction.patch ---
diff -up linux-2.6.28.noarch/kernel/trace/trace.c.orig linux-2.6.28.noarch/kernel/trace/trace.c
--- linux-2.6.28.noarch/kernel/trace/trace.c.orig	2009-03-17 09:55:55.000000000 -0400
+++ linux-2.6.28.noarch/kernel/trace/trace.c	2009-03-18 06:42:11.000000000 -0400
@@ -44,6 +44,12 @@ unsigned long __read_mostly	tracing_max_
 unsigned long __read_mostly	tracing_thresh;
 
 /*
+ * On boot up, the ring buffer is set to the minimum size, so that
+ * we do not waste memory on systems that are not using tracing.
+ */
+static int ring_buffer_expanded;
+
+/*
  * We need to change this state when a selftest is running.
  * A selftest will lurk into the ring-buffer to count the
  * entries inserted during the selftest although some concurrent
@@ -2985,12 +2991,53 @@ tracing_set_trace_read(struct file *filp
 	return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
 }
 
+static int tracing_resize_ring_buffer(unsigned long size)
+{
+	int ret;
+
+	/*
+	 * If kernel or user changes the size of the ring buffer
+	 * it get completed.
+	 */
+	ring_buffer_expanded = 1;
+
+	ret = ring_buffer_resize(global_trace.buffer, size);
+	if (ret < 0)
+		 return ret;
+
+	ret = ring_buffer_resize(max_tr.buffer, size);
+	if (ret < 0) {
+		 int r;
+
+		 r = ring_buffer_resize(global_trace.buffer,
+					   global_trace.entries);
+		 if (r < 0) {
+			  /* AARGH! We are left with different
+			   * size max buffer!!!! */
+			  WARN_ON(1);
+			  tracing_disabled = 1;
+		 }
+		 return ret;
+	}
+
+	global_trace.entries = size;
+
+	return ret;
+}
+
 static int tracing_set_tracer(char *buf)
 {
 	struct trace_array *tr = &global_trace;
 	struct tracer *t;
 	int ret = 0;
 
+	if (!ring_buffer_expanded) {
+		ret = tracing_resize_ring_buffer(trace_buf_size);
+		if (ret < 0)
+			return ret;
+		ret = 0;
+	}
+
 	mutex_lock(&trace_types_lock);
 	for (t = trace_types; t; t = t->next) {
 		if (strcmp(t->name, buf) == 0)
@@ -3344,28 +3391,11 @@ tracing_entries_write(struct file *filp,
 	val <<= 10;
 
 	if (val != global_trace.entries) {
-		ret = ring_buffer_resize(global_trace.buffer, val);
-		if (ret < 0) {
-			cnt = ret;
-			goto out;
-		}
-
-		ret = ring_buffer_resize(max_tr.buffer, val);
+		ret = tracing_resize_ring_buffer(val);
 		if (ret < 0) {
-			int r;
 			cnt = ret;
-			r = ring_buffer_resize(global_trace.buffer,
-					       global_trace.entries);
-			if (r < 0) {
-				/* AARGH! We are left with different
-				 * size max buffer!!!! */
-				WARN_ON(1);
-				tracing_disabled = 1;
-			}
 			goto out;
 		}
-
-		global_trace.entries = val;
 	}
 
 	filp->f_pos += cnt;
@@ -3826,6 +3856,7 @@ void ftrace_dump(void)
 __init static int tracer_alloc_buffers(void)
 {
 	struct trace_array_cpu *data;
+	int ring_buf_size;
 	int i;
 	int ret = -ENOMEM;
 
@@ -3838,8 +3869,14 @@ __init static int tracer_alloc_buffers(v
 	cpumask_copy(tracing_buffer_mask, cpu_possible_mask);
 	cpumask_copy(tracing_cpumask, cpu_all_mask);
 
+	/* To save memory, keep the ring buffer size to its minimum */
+	if (ring_buffer_expanded)
+		ring_buf_size = trace_buf_size;
+	else
+		ring_buf_size = 1;
+
 	/* TODO: make the number of buffers hot pluggable with CPUS */
-	global_trace.buffer = ring_buffer_alloc(trace_buf_size,
+	global_trace.buffer = ring_buffer_alloc(ring_buf_size,
 						   TRACE_BUFFER_FLAGS);
 	if (!global_trace.buffer) {
 		printk(KERN_ERR "tracer: failed to allocate ring buffer!\n");
@@ -3850,7 +3887,7 @@ __init static int tracer_alloc_buffers(v
 
 
 #ifdef CONFIG_TRACER_MAX_TRACE
-	max_tr.buffer = ring_buffer_alloc(trace_buf_size,
+	max_tr.buffer = ring_buffer_alloc(ring_buf_size,
 					     TRACE_BUFFER_FLAGS);
 	if (!max_tr.buffer) {
 		printk(KERN_ERR "tracer: failed to allocate max ring buffer!\n");


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1337
retrieving revision 1.1338
diff -u -r1.1337 -r1.1338
--- kernel.spec	21 Apr 2009 08:47:52 -0000	1.1337
+++ kernel.spec	21 Apr 2009 10:46:43 -0000	1.1338
@@ -729,6 +729,9 @@
 
 Patch9400: linux-2.6-crypto-aes-padlock-fix-autoload.patch
 
+# Backport of upstream memory reduction for ftrace
+Patch10000: linux-2.6-ftrace-memory-reduction.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1346,6 +1349,9 @@
 # make padlock autoload again
 ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload.patch
 
+# Reduce the memory usage of ftrace if you don't use it.
+ApplyPatch linux-2.6-ftrace-memory-reduction.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -1922,6 +1928,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 21 2009 Neil Horman <nhorman at redhat.com> 2.6.29.1-38
+- Reduce ftrace memory usage at boot (bz 481448) 
+
 * Mon Apr 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-37
 - Fix VIA Padlock autoload (#496140)
 



From pghmcfc at fedoraproject.org  Tue Apr 21 11:05:11 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 11:05:11 +0000 (UTC)
Subject: rpms/imlib/devel imlib.spec,1.15,1.16
Message-ID: <20090421110512.D75BC700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18057

Modified Files:
	imlib.spec 
Log Message:
- add libXt-devel dependency for -devel package (#478357)
- use install -p to maintain timestamps where reasonable
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one



Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- imlib.spec	25 Feb 2009 07:05:55 -0000	1.15
+++ imlib.spec	21 Apr 2009 11:04:36 -0000	1.16
@@ -1,9 +1,7 @@
-%define libtool_hack LIBTOOL=/usr/bin/libtool
-
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	10%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -18,14 +16,13 @@
 Patch9:		imlib-1.9.15-multilib-config.patch
 Patch10:	imlib-1.9.15-check-for-shm-pixmaps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires:	automake
+BuildRequires:	automake, libtool
 BuildRequires:	giflib-devel
 BuildRequires:	glib-devel%{?_isa}
-BuildRequires:	gtk+-devel
+BuildRequires:	gtk+-devel%{?_isa}
 BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
-BuildRequires:	libjpeg-devel
+BuildRequires:	libjpeg-devel%{?_isa}
 BuildRequires:	libtiff-devel%{?_isa}
-BuildRequires:	libtool
 BuildRequires:	libX11-devel%{?_isa}
 BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
@@ -49,9 +46,16 @@
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
 Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, glib-devel%{?_isa}, gtk+-devel, libjpeg-devel, libtiff-devel
-Requires:	libX11-devel, zlib-devel
-Requires:	%{_datadir}/aclocal, pkgconfig
+Requires:	giflib-devel
+Requires:	glib-devel%{?_isa}
+Requires:	gtk+-devel%{?_isa}
+Requires:	libjpeg-devel%{?_isa}
+Requires:	libtiff-devel%{?_isa}
+Requires:	libX11-devel%{?_isa}
+Requires:	libXt-devel%{?_isa}
+Requires:	zlib-devel
+Requires:	%{_datadir}/aclocal
+Requires:	pkgconfig
 
 %description devel
 The header files, static libraries and documentation needed for
@@ -87,28 +91,31 @@
 
 %build
 /usr/bin/autoreconf -i -f
-%configure
+%configure --disable-static
 
 ## Remove -L%{_libdir} from imlib-config if present;
 ## it's redundant and breaks multilib compatibility
 %{__sed} -i -e 's,-L%{_libdir} ,,g' imlib-config
 
+## Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 ## Build local gmodule hack
-tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule %{libtool_hack}
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule
 %{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
 
 ## Avoid unnecessary library linkage in libgdk_imlib
 GX_LIBS=$(/usr/bin/gtk-config --libs | %{__sed} -e 's/-lgtk //; s/-lgmodule //; s/-lXi //')
 
 ## Note: build with %{?_smp_mflags} doesn't work reliably
-%{__make} %{libtool_hack} GX_LIBS="${GX_LIBS}"
+%{__make} GX_LIBS="${GX_LIBS}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} %{libtool_hack}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
-## Don't package static or libtool archives
-%{__rm} -f %{buildroot}%{_libdir}/*a
+## Don't package libtool archives
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -152,8 +159,14 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.15-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr  1 2009 Paul Howarth <paul at city-fan.org> 1:1.9.15-11
+- add libXt-devel dependency for -devel package (#478357)
+- use install -p to maintain timestamps where reasonable
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-10
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
 - specify Instruction Set Architecture (%%{?_isa}) in devel package requires



From than at fedoraproject.org  Tue Apr 21 11:05:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 11:05:48 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.2-plasma-focus.patch, 1.1,
	1.2 kdelibs.spec, 1.469, 1.470
Message-ID: <20090421110548.8F68D700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18360

Modified Files:
	kdelibs-4.2.2-plasma-focus.patch kdelibs.spec 
Log Message:
don't let plasma appear over screensaver


kdelibs-4.2.2-plasma-focus.patch:

Index: kdelibs-4.2.2-plasma-focus.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs-4.2.2-plasma-focus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-plasma-focus.patch	7 Apr 2009 15:43:04 -0000	1.1
+++ kdelibs-4.2.2-plasma-focus.patch	21 Apr 2009 11:05:10 -0000	1.2
@@ -1,12 +1,73 @@
 diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
 --- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
-+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
-@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
++++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-21 12:52:16.000000000 +0200
+@@ -275,14 +275,8 @@ void PopupAppletPrivate::popupConstraint
+                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
                  //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                  //else.
-                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
+-                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
 -                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+-
+-                if (passive) {
+-                    wflags |= Qt::X11BypassWindowManagerHint;
+-                }
+-
+-                dialog->setWindowFlags(wflags);
++                dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
++                updateDialogFlags();
+                 KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
+                 dialog->installEventFilter(q);
+ 
+@@ -340,7 +334,7 @@ void PopupApplet::mouseReleaseEvent(QGra
+ 
+ bool PopupApplet::eventFilter(QObject *watched, QEvent *event)
+ {
+-    if (watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
++    if (!d->passive && watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
+         d->popupLostFocus = true;
+         hidePopup();
+         QTimer::singleShot(100, this, SLOT(clearPopupLostFocus()));
+@@ -411,15 +405,7 @@ void PopupApplet::setPassivePopup(bool p
+     d->passive = passive;
+ 
+     if (d->dialog) {
+-        Qt::WindowFlags wflags = d->dialog->windowFlags();
+-
+-        if (d->passive) {
+-            wflags |= Qt::X11BypassWindowManagerHint;
+-        } else {
+-            wflags &= ~Qt::X11BypassWindowManagerHint;
+-        }
+-
+-        d->dialog->setWindowFlags(wflags);
++        d->updateDialogFlags();
+     }
+ }
+ 
+@@ -628,6 +614,15 @@ void PopupAppletPrivate::updateDialogPos
+ 
+     dialog->move(pos);
+ }
++
++
++void PopupAppletPrivate::updateDialogFlags()
++{
++    Q_ASSERT(dialog);
++    dialog->setAttribute(Qt::WA_X11NetWmWindowTypeNotification, passive);
++}
++
++
+ } // Plasma namespace
+ 
+ #include "popupapplet.moc"
+diff -up kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig kdelibs-4.2.2/plasma/private/popupapplet_p.h
+--- kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig	2009-04-21 12:59:29.000000000 +0200
++++ kdelibs-4.2.2/plasma/private/popupapplet_p.h	2009-04-21 12:52:16.000000000 +0200
+@@ -35,6 +35,7 @@ public:
+     void dialogSizeChanged();
+     void dialogStatusChanged(bool status);
+     void updateDialogPosition();
++    void updateDialogFlags();
+     void popupConstraintsEvent(Plasma::Constraints constraints);
+     void checkExtenderAppearance(Plasma::FormFactor f);
  
-                 if (passive) {
-                     wflags |= Qt::X11BypassWindowManagerHint;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.469
+++ kdelibs.spec	21 Apr 2009 11:05:10 -0000	1.470
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,7 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-Patch26: kdelibs-4.2.2-plasma-focus.patch
 # kconf_update script for Patch201 - to be upstreamed
 Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
@@ -94,6 +93,7 @@
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
 Patch104: kdelibs-4.2.2-kde#180785-2.patch
+Patch105: kdelibs-4.2.2-plasma-focus.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch26 -p1 -b .kickoff-focus
 %patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
@@ -242,6 +241,7 @@
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
 %patch104 -p4 -b .kde#180785-2
+%patch105 -p1 -b .kickoff-focus
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
 * Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 



From pghmcfc at fedoraproject.org  Tue Apr 21 11:09:21 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 11:09:21 +0000 (UTC)
Subject: rpms/gnome-libs/devel gnome-libs-1.4.2-cleanlibs.patch, NONE,
	1.1 gnome-libs.spec, 1.14, 1.15
Message-ID: <20090421110922.32F6B700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19564

Modified Files:
	gnome-libs.spec 
Added Files:
	gnome-libs-1.4.2-cleanlibs.patch 
Log Message:
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one
- Additional %{?_isa} devel package dependencies now available
- Clean up library linkage, linking libraries with the libs they need and only
  those libs


gnome-libs-1.4.2-cleanlibs.patch:

--- NEW FILE gnome-libs-1.4.2-cleanlibs.patch ---
--- gnome-libs-1.4.2/support/Makefile.am	2009-04-17 10:45:31.000000000 +0100
+++ gnome-libs-1.4.2/support/Makefile.am	2009-04-17 10:44:49.000000000 +0100
@@ -3,6 +3,7 @@
 supportexecincludedir = $(pkglibdir)/include
 
 INCLUDES = -D_GNU_SOURCE
+LIBS =
 
 lib_LTLIBRARIES = libgnomesupport.la
 
--- gnome-libs-1.4.2/libgnome/Makefile.am	2009-04-15 20:53:02.000000000 +0100
+++ gnome-libs-1.4.2/libgnome/Makefile.am	2009-04-17 11:01:32.000000000 +0100
@@ -22,6 +22,8 @@
 	-DVERSION=\""$(VERSION)"\" \
 	-DG_LOG_DOMAIN=\"Gnome\"
 
+LIBS =
+
 libgnome_la_SOURCES = \
 	gnome-config.c		\
 	gnome-dentry.c          \
@@ -87,7 +89,7 @@
 gnome-config.o: parse-path.cP
 
 libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)
-libgnome_la_LIBADD = $(GLIB_LIBS) -lm -ldb1
+libgnome_la_LIBADD = $(LIBSUPPORT) $(LIBGNOME_LIBS) -ldb1
 
 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
 	gconfigger gnome-gen-mimedb
--- gnome-libs-1.4.2/libgnomeui/Makefile.am	2009-04-15 20:25:39.000000000 +0100
+++ gnome-libs-1.4.2/libgnomeui/Makefile.am	2009-04-17 13:00:27.000000000 +0100
@@ -26,6 +26,8 @@
         -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \
 	-DG_LOG_DOMAIN=\"GnomeUI\"
 
+LIBS =
+
 EXTRA_HEADERS = 
 
 libgnomeui_la_SOURCES = \
@@ -269,7 +271,14 @@
 	$(man_MANS)
 
 libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)
-libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
+libgnomeui_la_BOGUSLIBS = -lesd -laudiofile -ldb1 -lgmodule -ldl -lXi -lXext -lz
+libgnomeui_la_LIBADD = \
+	$(top_builddir)/libgnome/libgnome.la		\
+	$(top_builddir)/libart_lgpl/libart_lgpl.la	\
+	$(filter-out $(libgnomeui_la_BOGUSLIBS), $(LIBGNOMEUI_LIBS))
+libgnomeui_la_DEPENDENCIES = \
+	$(top_builddir)/libgnome/libgnome.la		\
+	$(top_builddir)/libart_lgpl/libart_lgpl.la
 
 gnome_segv_LDADD =	\
 	libgnomeui.la 					\
--- gnome-libs-1.4.2/libgnorba/Makefile.am	2009-04-15 20:57:57.000000000 +0100
+++ gnome-libs-1.4.2/libgnorba/Makefile.am	2009-04-17 12:15:49.000000000 +0100
@@ -27,6 +27,8 @@
 	-DGNOMESYSCONFDIR=\"$(sysconfdir)\" 		\
 	-DVERSION=\""$(VERSION)"\"
 
+LIBS =
+
 gnome_factory_built=\
 	gnome-factory.h 				\
 	gnome-factory-skels.c 				\
@@ -80,7 +82,17 @@
 	Table.h
 
 libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
+libgnorba_la_LIBADD = 					\
+	$(filter-out -lORBitutil -lm, $(ORBIT_LIBS))	\
+	$(top_builddir)/libgnomeui/libgnomeui.la	\
+	$(top_builddir)/libgnome/libgnome.la		\
+	$(filter-out -lesd -laudiofile -ldb1 -lgdk_imlib -lXi -lXext -lSM -lICE -lm, $(LIBGNOMEUI_LIBS))
+libgnorba_la_DEPENDENCIES =				\
+	$(top_builddir)/libgnomeui/libgnomeui.la	\
+	$(top_builddir)/libgnome/libgnome.la
+
+libgnorbagtk_la_LIBADD = $(filter-out -lORBitCosNaming -lORBitutil -lm, $(ORBIT_LIBS) $(X_LIBS) -lX11)
+libgnorbagtk_la_DEPENDENCIES =
 
 loadshlib_SOURCES = loadshlib.c
 
--- gnome-libs-1.4.2/zvt/Makefile.am	2002-03-18 21:18:10.000000000 +0000
+++ gnome-libs-1.4.2/zvt/Makefile.am	2009-04-17 13:04:20.000000000 +0100
@@ -10,6 +10,8 @@
 	$(GDK_IMLIB_CFLAGS)				\
 	-DGNOMESBINDIR=\""$(sbindir)"\"
 
+LIBS =
+
 libzvt_la_SOURCES =		\
 	gnome-login-support.h	\
 	gnome-login-support.c	\
@@ -22,6 +24,8 @@
 	zvtterm.c
 
 libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir)
+libzvt_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext -lm, $(UTIL_LIBS) $(GTK_LIBS) $(GDK_IMLIB_LIBS))
+libzvt_la_DEPENDENCIES =
 
 libzvtinclude_HEADERS =		\
 	lists.h			\
--- gnome-libs-1.4.2/gtk-xmhtml/Makefile.am	2009-04-15 21:20:41.000000000 +0100
+++ gnome-libs-1.4.2/gtk-xmhtml/Makefile.am	2009-04-17 13:18:04.000000000 +0100
@@ -54,7 +54,8 @@
 	toolkit.h
 
 libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir)
-libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS)
+libgtkxmhtml_la_LIBADD = $(filter-out -lSM -lICE -lgmodule -ldl -lXi -lXext, $(LIBGTKXMHTML_LIBS))
+libgtkxmhtml_la_DEPENDENCIES =
 
 noinst_PROGRAMS = htmltest
 
--- gnome-libs-1.4.2/ltmain.sh	2002-08-01 15:30:57.000000000 +0100
+++ gnome-libs-1.4.2/ltmain.sh	2002-06-06 12:27:06.000000000 +0100
@@ -615,6 +623,10 @@
 	# Now arrange that obj and lo_libobj become the same file
 	$show "(cd $xdir && $LN_S $baseobj $libobj)"
 	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+	  # Unlock the critical section if it was locked
+	  if test "$need_locks" != no; then
+	    $run $rm "$lockfile"
+	  fi
 	  exit 0
 	else
 	  error=$?
@@ -745,6 +757,7 @@
     linker_flags=
     dllsearchpath=
     lib_search_path=`pwd`
+    inst_prefix_dir=
 
     avoid_version=no
     dlfiles=
@@ -875,6 +888,11 @@
 	  prev=
 	  continue
 	  ;;
+        inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
 	release)
 	  release="-$arg"
 	  prev=
@@ -976,6 +994,11 @@
 	continue
 	;;
 
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
       -L[A-Z][A-Z]*:*)
@@ -1530,8 +1564,6 @@
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
 	    tmp_libs=
-	    #PKGW
-	    dependency_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
 	      case "$tmp_libs " in
@@ -1647,8 +1679,6 @@
 	  fi
 
 	  tmp_libs=
-	  #PKGW
-	  dependency_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
@@ -1855,7 +1885,16 @@
 	    if test "$hardcode_direct" = yes; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      add_dir=
+	      if test -n "$inst_prefix_dir"; then
+		case "$libdir" in
+		[\\/]*)
+		  add_dir="-L$inst_prefix_dir$libdir"
+		  ;;
+		esac
+	      fi
+	      add_dir="$add_dir -L$libdir"
 	      add="-l$name"
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
@@ -1865,7 +1904,17 @@
 	      add="-l$name"
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      add_dir=
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		[\\/]*)
+ 		  add_dir="-L$inst_prefix_dir$libdir"
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      add_dir="$add_dir -L$libdir"
+
 	      add="-l$name"
 	    fi
 
@@ -3622,8 +3682,9 @@
 
     # relink executable if necessary
     if test -n \"\$relink_command\"; then
-      if (eval \$relink_command); then :
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
+	$echo \"\$relink_command_output\" >&2
 	$rm \"\$progdir/\$file\"
 	exit 1
       fi
@@ -3827,7 +3888,7 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 
       # Only create the output if not a dry run.
@@ -4128,12 +4189,30 @@
 	dir="$dir$objdir"
 
 	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit 1
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+	  fi
+
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
 	  $show "$relink_command"
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
+	    exit 1
 	  fi
 	fi
 


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-libs.spec	5 Mar 2009 16:19:51 -0000	1.14
+++ gnome-libs.spec	21 Apr 2009 11:09:18 -0000	1.15
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
@@ -30,9 +30,9 @@
 BuildRequires:  zlib-devel
 BuildRequires:  imlib-devel%{?_isa}
 BuildRequires:  esound-devel%{?_isa}
-BuildRequires:  ORBit-devel
+BuildRequires:  ORBit-devel%{?_isa}
 BuildRequires:  glib-devel%{?_isa}
-BuildRequires:  gtk+-devel
+BuildRequires:  gtk+-devel%{?_isa}
 BuildRequires:  /usr/bin/automake-1.4
 BuildRequires:  libpng10-devel%{?_isa} >= 1.0.13
 BuildRequires:  libtool
@@ -75,6 +75,7 @@
 Patch105:       gnome-libs-1.4.2-popthelp-format.patch
 Patch106:       gnome-libs-1.4.2-norecurse.patch
 Patch107:       gnome-libs-1.4.2-gnome-config-no-Llibdir.patch
+Patch108:       gnome-libs-1.4.2-cleanlibs.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -88,14 +89,14 @@
 License:        LGPLv2+ and (LGPLv2+ and BSD with advertising)
 Requires:       gnome-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:       glib-devel%{?_isa}
-Requires:       gtk+-devel
-Requires:       ORBit-devel
+Requires:       gtk+-devel%{?_isa}
+Requires:       ORBit-devel%{?_isa}
 Requires:       imlib-devel%{?_isa}
 Requires:       esound-devel%{?_isa}
 Requires:       libSM-devel%{?_isa}
 Requires:       pkgconfig
 
-# pkg-config knows to use gnome-config when asked about libgnomeui
+# pkg-config knows to use gnome-config when asked about gnomeui
 Provides:       pkgconfig(gnomeui) = %{version}
 
 # For ownership of %{_datadir}/aclocal
@@ -156,10 +157,15 @@
 %patch105 -p1 -b .popthelp-format
 %patch106 -p1 -b .norecurse
 %patch107 -p1 -b .nolibdir
+%patch108 -p1 -b .cleanlibs
 
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 %{__mv} -f ChangeLog.utf-8 ChangeLog
 
+# Hack to remove redundant "-lm" from the output of audiofile-config --libs
+%{__mkdir} pkgconfig
+%{__sed} -e 's/ -lm//' %{_libdir}/pkgconfig/audiofile.pc > pkgconfig/audiofile.pc
+
 %build
 
 # db1
@@ -190,9 +196,12 @@
 
 CFLAGS="%{optflags} $(pkg-config --cflags libpng10)"
 export CPPFLAGS="$(pkg-config --cflags libpng10)"
+export PKG_CONFIG_PATH=$(pwd)/pkgconfig
 %configure --with-kde-datadir=%{_datadir} --enable-prefer-db1 --disable-gtk-doc
 %{__perl} -pi -e 's/-ldb1//g; s/-ldb//g;' gnome-config
-%{__make} LIBTOOL=/usr/bin/libtool
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -310,6 +319,13 @@
 %{_libdir}/libgnomeui.so
 
 %changelog
+* Thu Apr  9 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-14
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+- Additional %%{?_isa} devel package dependencies now available
+- Clean up library linkage, linking libraries with the libs they need and only
+  those libs
+
 * Thu Mar  5 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-13
 - Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in
   libglade and possibly other packages built on gnome-libs; an actual .pc file



From tmraz at fedoraproject.org  Tue Apr 21 11:10:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 21 Apr 2009 11:10:36 +0000 (UTC)
Subject: rpms/openssl/F-11 openssl-0.9.8k-dtls-compat.patch,NONE,1.1
Message-ID: <20090421111036.8611F700D6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19941

Added Files:
	openssl-0.9.8k-dtls-compat.patch 
Log Message:
* Tue Apr 21 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8k-4
- support compatibility DTLS mode for CISCO AnyConnect (#464629)


openssl-0.9.8k-dtls-compat.patch:

--- NEW FILE openssl-0.9.8k-dtls-compat.patch ---
Support old DTLS version for compatibility with CISCO AnyConnect.
Index: openssl/ssl/d1_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_clnt.c,v
rcsdiff -q -kk '-r1.3.2.15' '-r1.3.2.16' -u '/v/openssl/cvs/openssl/ssl/d1_clnt.c,v' 2>/dev/null
--- openssl/ssl/d1_clnt.c 2009/04/14 15:20:47 1.3.2.15
+++ openssl/ssl/d1_clnt.c 2009/04/19 18:08:11 1.3.2.16
@@ -130,7 +130,7 @@
 
 static SSL_METHOD *dtls1_get_client_method(int ver)
 	{
-	if (ver == DTLS1_VERSION)
+	if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
 		return(DTLSv1_client_method());
 	else
 		return(NULL);
@@ -181,7 +181,8 @@
 			s->server=0;
 			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
 
-			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00))
+			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) &&
+			    (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00))
 				{
 				SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR);
 				ret = -1;
Index: openssl/ssl/d1_lib.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_lib.c,v
rcsdiff -q -kk '-r1.1.2.7' '-r1.1.2.8' -u '/v/openssl/cvs/openssl/ssl/d1_lib.c,v' 2>/dev/null
--- openssl/ssl/d1_lib.c 2009/04/02 22:34:59 1.1.2.7
+++ openssl/ssl/d1_lib.c 2009/04/19 18:08:11 1.1.2.8
@@ -198,7 +198,10 @@
 void dtls1_clear(SSL *s)
 	{
 	ssl3_clear(s);
-	s->version=DTLS1_VERSION;
+	if (s->options & SSL_OP_CISCO_ANYCONNECT)
+		s->version=DTLS1_BAD_VER;
+	else
+		s->version=DTLS1_VERSION;
 	}
 
 /*
Index: openssl/ssl/d1_pkt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v
rcsdiff -q -kk '-r1.4.2.15' '-r1.4.2.16' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null
--- openssl/ssl/d1_pkt.c 2009/04/02 22:34:59 1.4.2.15
+++ openssl/ssl/d1_pkt.c 2009/04/19 18:08:12 1.4.2.16
@@ -1024,15 +1024,17 @@
 	if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
 		{
 		struct ccs_header_st ccs_hdr;
+		int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
 
 		dtls1_get_ccs_header(rr->data, &ccs_hdr);
 
 		/* 'Change Cipher Spec' is just a single byte, so we know
 		 * exactly what the record payload has to look like */
 		/* XDTLS: check that epoch is consistent */
-		if (	(s->client_version == DTLS1_BAD_VER && rr->length != 3) ||
-			(s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) || 
-			(rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
+		if (s->client_version == DTLS1_BAD_VER || s->version == DTLS1_BAD_VER)
+			ccs_hdr_len = 3;
+
+		if ((rr->length != ccs_hdr_len) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
 			{
 			i=SSL_AD_ILLEGAL_PARAMETER;
 			SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
@@ -1358,7 +1360,7 @@
 #if 0
 	/* 'create_empty_fragment' is true only when this function calls itself */
 	if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done
-		&& SSL_version(s) != DTLS1_VERSION)
+	    && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
 		{
 		/* countermeasure against known-IV weakness in CBC ciphersuites
 		 * (see http://www.openssl.org/~bodo/tls-cbc.txt) 
Index: openssl/ssl/s3_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/s3_clnt.c,v
rcsdiff -q -kk '-r1.88.2.21' '-r1.88.2.22' -u '/v/openssl/cvs/openssl/ssl/s3_clnt.c,v' 2>/dev/null
--- openssl/ssl/s3_clnt.c 2009/02/14 21:50:14 1.88.2.21
+++ openssl/ssl/s3_clnt.c 2009/04/19 18:08:12 1.88.2.22
@@ -708,7 +708,7 @@
 
 	if (!ok) return((int)n);
 
-	if ( SSL_version(s) == DTLS1_VERSION)
+	if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
 		{
 		if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
 			{
Index: openssl/ssl/ssl.h
RCS File: /v/openssl/cvs/openssl/ssl/ssl.h,v
rcsdiff -q -kk '-r1.161.2.21' '-r1.161.2.22' -u '/v/openssl/cvs/openssl/ssl/ssl.h,v' 2>/dev/null
--- openssl/ssl/ssl.h 2008/08/13 19:44:44 1.161.2.21
+++ openssl/ssl/ssl.h 2009/04/19 18:08:12 1.161.2.22
@@ -510,6 +510,8 @@
 #define SSL_OP_COOKIE_EXCHANGE              0x00002000L
 /* Don't use RFC4507 ticket extension */
 #define SSL_OP_NO_TICKET	            0x00004000L
+/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client)  */
+#define SSL_OP_CISCO_ANYCONNECT		    0x00008000L
 
 /* As server, disallow session resumption on renegotiation */
 #define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION	0x00010000L
Index: openssl/ssl/ssl_lib.c
RCS File: /v/openssl/cvs/openssl/ssl/ssl_lib.c,v
rcsdiff -q -kk '-r1.133.2.16' '-r1.133.2.17' -u '/v/openssl/cvs/openssl/ssl/ssl_lib.c,v' 2>/dev/null
--- openssl/ssl/ssl_lib.c 2009/02/23 16:02:47 1.133.2.16
+++ openssl/ssl/ssl_lib.c 2009/04/19 18:08:12 1.133.2.17
@@ -995,7 +995,8 @@
 		s->max_cert_list=larg;
 		return(l);
 	case SSL_CTRL_SET_MTU:
-		if (SSL_version(s) == DTLS1_VERSION)
+		if (SSL_version(s) == DTLS1_VERSION ||
+		    SSL_version(s) == DTLS1_BAD_VER)
 			{
 			s->d1->mtu = larg;
 			return larg;
Index: openssl/ssl/ssl_sess.c
RCS File: /v/openssl/cvs/openssl/ssl/ssl_sess.c,v
rcsdiff -q -kk '-r1.51.2.9' '-r1.51.2.10' -u '/v/openssl/cvs/openssl/ssl/ssl_sess.c,v' 2>/dev/null
--- openssl/ssl/ssl_sess.c 2008/06/04 18:35:27 1.51.2.9
+++ openssl/ssl/ssl_sess.c 2009/04/19 18:08:12 1.51.2.10
@@ -211,6 +211,11 @@
 			ss->ssl_version=TLS1_VERSION;
 			ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
 			}
+		else if (s->version == DTLS1_BAD_VER)
+			{
+			ss->ssl_version=DTLS1_BAD_VER;
+			ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+			}
 		else if (s->version == DTLS1_VERSION)
 			{
 			ss->ssl_version=DTLS1_VERSION;
Index: openssl/ssl/t1_enc.c
RCS File: /v/openssl/cvs/openssl/ssl/t1_enc.c,v
rcsdiff -q -kk '-r1.35.2.8' '-r1.35.2.9' -u '/v/openssl/cvs/openssl/ssl/t1_enc.c,v' 2>/dev/null
--- openssl/ssl/t1_enc.c 2009/01/05 14:43:07 1.35.2.8
+++ openssl/ssl/t1_enc.c 2009/04/19 18:08:12 1.35.2.9
@@ -765,10 +765,10 @@
 	HMAC_CTX_init(&hmac);
 	HMAC_Init_ex(&hmac,mac_sec,EVP_MD_size(hash),hash,NULL);
 
-	if (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER)
+	if (ssl->version == DTLS1_BAD_VER ||
+	    (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER))
 		{
 		unsigned char dtlsseq[8],*p=dtlsseq;
-
 		s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p);
 		memcpy (p,&seq[2],6);
 
@@ -793,7 +793,7 @@
 {unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); }
 #endif
 
-	if ( SSL_version(ssl) != DTLS1_VERSION)
+	if ( SSL_version(ssl) != DTLS1_VERSION && SSL_version(ssl) != DTLS1_BAD_VER)
 		{
 		for (i=7; i>=0; i--)
 			{



From pghmcfc at fedoraproject.org  Tue Apr 21 11:12:54 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 11:12:54 +0000 (UTC)
Subject: rpms/libglade/devel libglade-0.17-cleanlibs.patch, NONE,
	1.1 Makefile, 1.1, 1.2 libglade.spec, 1.5, 1.6
Message-ID: <20090421111254.B9855700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libglade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20825

Modified Files:
	Makefile libglade.spec 
Added Files:
	libglade-0.17-cleanlibs.patch 
Log Message:
- use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one
- specify Instruction Set Architecture (%{?_isa}) in devel package requires
- link against the libs that are needed, and only those libs


libglade-0.17-cleanlibs.patch:

--- NEW FILE libglade-0.17-cleanlibs.patch ---
--- libglade-0.17/glade/Makefile.am	2009-04-20 20:54:24.000000000 +0100
+++ libglade-0.17/glade/Makefile.am	2009-04-20 20:59:54.000000000 +0100
@@ -43,12 +43,14 @@
 	$(build_glade_gnomedb)
 
 libglade_la_SOURCES  = $(the_sources)
-libglade_la_LIBADD   = $(GTK_LIBS) $(XML_LIBS)
+libglade_la_LIBADD   = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS))
 libglade_la_LDFLAGS  = -version-info $(LTVERSION)
+libglade_la_DEPENDENCIES =
 
 libglade_gnome_la_SOURCES  = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD   = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD   = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS))
 libglade_gnome_la_LDFLAGS  = -version-info $(LTVERSION)
+libglade_gnome_la_DEPENDENCIES = libglade.la
 
 libglade_bonobo_la_SOURCES  = glade-bonobo.c glade-build.h glade-xml.h
 libglade_bonobo_la_LIBADD   = $(BONOBO_LIBS) $(XML_LIBS)
--- libglade-0.17/glade/Makefile.in	2009-04-20 20:54:30.000000000 +0100
+++ libglade-0.17/glade/Makefile.in	2009-04-20 21:00:09.000000000 +0100
@@ -172,12 +172,14 @@
 
 
 libglade_la_SOURCES = $(the_sources)
-libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS)
+libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS))
 libglade_la_LDFLAGS = -version-info $(LTVERSION)
+libglade_la_DEPENDENCIES = 
 
 libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS))
 libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION)
+libglade_gnome_la_DEPENDENCIES = libglade.la
 
 libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h
 libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS)
@@ -203,13 +205,11 @@
 libglade_bonobo_la_DEPENDENCIES =
 am_libglade_bonobo_la_OBJECTS = glade-bonobo.lo
 libglade_bonobo_la_OBJECTS = $(am_libglade_bonobo_la_OBJECTS)
-libglade_gnome_la_DEPENDENCIES =
 am_libglade_gnome_la_OBJECTS = glade-gnome.lo
 libglade_gnome_la_OBJECTS = $(am_libglade_gnome_la_OBJECTS)
 libglade_gnomedb_la_DEPENDENCIES =
 am_libglade_gnomedb_la_OBJECTS = glade-gnomedb.lo
 libglade_gnomedb_la_OBJECTS = $(am_libglade_gnomedb_la_OBJECTS)
-libglade_la_DEPENDENCIES =
 am_libglade_la_OBJECTS = glade-init.lo glade-sax.lo glade-xml.lo \
 	glade-gtk.lo glade-tree.lo
 libglade_la_OBJECTS = $(am_libglade_la_OBJECTS)
--- libglade-0.17/ltmain.sh	2001-09-05 03:58:41.000000000 +0100
+++ libglade-0.17/ltmain.sh	2009-04-20 17:09:38.000000000 +0100
@@ -754,6 +757,7 @@
     linker_flags=
     dllsearchpath=
     lib_search_path=`pwd`
+    inst_prefix_dir=
 
     avoid_version=no
     dlfiles=
@@ -884,6 +888,11 @@
 	  prev=
 	  continue
 	  ;;
+        inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
 	release)
 	  release="-$arg"
 	  prev=
@@ -985,6 +994,11 @@
 	continue
 	;;
 
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
       -L[A-Z][A-Z]*:*)
@@ -1872,7 +1885,16 @@
 	    if test "$hardcode_direct" = yes; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      add_dir=
+	      if test -n "$inst_prefix_dir"; then
+		case "$libdir" in
+		[\\/]*)
+		  add_dir="-L$inst_prefix_dir$libdir"
+		  ;;
+		esac
+	      fi
+	      add_dir="$add_dir -L$libdir"
 	      add="-l$name"
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
@@ -1882,11 +1904,21 @@
 	      add="-l$name"
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      add_dir=
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		[\\/]*)
+ 		  add_dir="-L$inst_prefix_dir$libdir"
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      add_dir="$add_dir -L$libdir"
+
 	      add="-l$name"
 	    fi
 
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -3856,7 +3888,7 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 
       # Only create the output if not a dry run.
@@ -4157,12 +4189,30 @@
 	dir="$dir$objdir"
 
 	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit 1
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+	  fi
+
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
 	  $show "$relink_command"
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
+	    exit 1
 	  fi
 	fi
 


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/libglade/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	2 Oct 2006 12:13:51 -0000	1.1
+++ Makefile	21 Apr 2009 11:12:50 -0000	1.2
@@ -10,7 +10,7 @@
 MAKEFILE_COMMON := $(shell $(find-makefile-common))
 
 ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
+# attempt a checkout
 define checkout-makefile-common
 test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
 endef


Index: libglade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglade/devel/libglade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libglade.spec	25 Feb 2009 15:08:33 -0000	1.5
+++ libglade.spec	21 Apr 2009 11:12:51 -0000	1.6
@@ -1,22 +1,23 @@
 Summary:	Gnome-1 support library for loading user interfaces
 Name:		libglade
 Version:	0.17
-Release:	22%{?dist}
+Release:	23%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.jamesh.id.au/software/libglade/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libglade/%{version}/libglade-%{version}.tar.gz
-Patch:		libglade-0.16-fixquote.patch
+Patch0:		libglade-0.16-fixquote.patch
 Patch1:		libglade-0.17-gtkdoc.patch
 Patch2:		libglade-0.17-clist-gettext.patch
 Patch3:		libglade-0.17-underquoted.patch
 Patch4:		libglade-0.17-non-weak-symbols.patch
 Patch5:		libglade-0.17-no-local-intl.patch
 Patch6:		libglade-0.17-multiarch.patch
+Patch7:		libglade-0.17-cleanlibs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gnome-libs-devel >= 1:1.4.1.2
-BuildRequires:	libxml-devel >= 1:1.8.16
+BuildRequires:	gnome-libs-devel%{?_isa} >= 1:1.4.1.2
+BuildRequires:	libxml-devel%{?_isa} >= 1:1.8.16
 BuildRequires:	autoconf, gettext, gtk-doc, libtool
 
 %description
@@ -33,9 +34,9 @@
 %package devel
 Summary:	The files needed for libglade application development
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gnome-libs-devel >= 1:1.4.1.2
-Requires:	libxml-devel >= 1:1.8.16
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	gnome-libs-devel%{?_isa} >= 1:1.4.1.2
+Requires:	libxml-devel%{?_isa} >= 1:1.8.16
 Requires:	pkgconfig
 
 %description devel
@@ -43,8 +44,8 @@
 that you can use to develop libglade applications.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch -p1 -b ".fixquote"
+%setup -q
+%patch0 -p1 -b .fixquote
 %patch1 -p1 -b .gtkdoc
 %patch2 -p1 -b .clist-gettext
 %patch3 -p1 -b .underquoted
@@ -57,22 +58,28 @@
 # Patch libglade-config for multiarch compatibility (#342131)
 %patch6 -p1 -b .multiarch
 
+# Link against the libs that are needed, and only those libs
+%patch7 -p1 -b .clean-libs
+
 # Convert docs to UTF-8
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf8
 %{__mv} -f ChangeLog.utf8 ChangeLog
 
 %build
 %{__autoconf}
-%configure --without-bonobo
-%{__make} LIBTOOL=/usr/bin/libtool
+%configure --without-bonobo --disable-static
+
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool INSTALL="%{__install} -p" install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 
-# remove unpackaged files from the buildroot
-%{__rm} -f %{buildroot}%{_libdir}/{libglade.a,libglade.la}
-%{__rm} -f %{buildroot}%{_libdir}/{libglade-gnome.a,libglade-gnome.la}
+# Don't package libtool archives
+%{__rm} %{buildroot}%{_libdir}/libglade{,-gnome}.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -102,8 +109,14 @@
 %doc %{_datadir}/gnome/html/
 
 %changelog
+* Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:0.17-23
+- use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+- specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+- link against the libs that are needed, and only those libs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:0.17-21
 - rebuild with gcc 4.3.0 for Fedora 9



From rhughes at fedoraproject.org  Tue Apr 21 11:43:09 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 21 Apr 2009 11:43:09 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-11 .cvsignore, 1.57,
	1.58 gnome-power-manager.spec, 1.154, 1.155 sources, 1.57,
	1.58 gnome-power-manager-2.26.0-cast.patch, 1.1, NONE
Message-ID: <20090421114309.CDB42700D6@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30251

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Removed Files:
	gnome-power-manager-2.26.0-cast.patch 
Log Message:
* Tue Apr 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-1
- Update to 2.26.1
- Fix the low capacity warning to fix rh#489832
- Backport DPMS and IDLETIME fixes from master to fix multiple bugs
- Connect to gnome-session and exit on logout
- Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	16 Mar 2009 10:41:34 -0000	1.57
+++ .cvsignore	21 Apr 2009 11:42:36 -0000	1.58
@@ -1 +1 @@
-gnome-power-manager-2.26.0.tar.gz
+gnome-power-manager-2.26.1.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-power-manager.spec	18 Apr 2009 10:55:00 -0000	1.154
+++ gnome-power-manager.spec	21 Apr 2009 11:42:36 -0000	1.155
@@ -3,12 +3,11 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
-Patch0: gnome-power-manager-2.26.0-cast.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -56,7 +55,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .cast
 
 %build
 %configure \
@@ -164,6 +162,13 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Tue Apr 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-1
+- Update to 2.26.1
+- Fix the low capacity warning to fix rh#489832
+- Backport DPMS and IDLETIME fixes from master to fix multiple bugs
+- Connect to gnome-session and exit on logout
+- Remove upstreamed patches
+
 * Sat Apr 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.26.0-2
 - Fix broken battery capacity percentage reporting
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	16 Mar 2009 10:41:34 -0000	1.57
+++ sources	21 Apr 2009 11:42:36 -0000	1.58
@@ -1 +1 @@
-7a5382f2e14ac8dfa0b582d9e089ac3d  gnome-power-manager-2.26.0.tar.gz
+445cfc891efbd41ac47da286a4f909d0  gnome-power-manager-2.26.1.tar.gz


--- gnome-power-manager-2.26.0-cast.patch DELETED ---



From pghmcfc at fedoraproject.org  Tue Apr 21 12:14:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 12:14:46 +0000 (UTC)
Subject: rpms/libxml/F-11 libxml.spec,1.11,1.12
Message-ID: <20090421121446.CC4D0700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7307

Modified Files:
	libxml.spec 
Log Message:
rebuild for %{_isa} provides/requires


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/F-11/libxml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxml.spec	25 Feb 2009 20:08:35 -0000	1.11
+++ libxml.spec	21 Apr 2009 12:14:11 -0000	1.12
@@ -1,8 +1,8 @@
 Name:		libxml
-Summary:	Old libXML library for Gnome-1 application compatibility
+Summary:	Old XML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	21%{?dist}
+Release:	22%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
@@ -19,10 +19,10 @@
 %package devel
 Summary:	Libraries, includes, etc. to build old libxml-based applications
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}, pkgconfig
 
 %description devel
-%{summary}.
+Libraries, includes, etc. to build old libxml-based applications.
 
 %prep
 %setup -q
@@ -71,8 +71,11 @@
 %exclude %{_libdir}/libxml.la
 
 %changelog
+* Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-22
+- rebuild for %%{_isa} provides/requires
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed May 21 2008 Paul Howarth <paul at city-fan.org> 1:1.8.17-20
 - fixes for building with -Werror-implicit-function-declaration and some of the



From rrakus at fedoraproject.org  Tue Apr 21 12:17:38 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 21 Apr 2009 12:17:38 +0000 (UTC)
Subject: rpms/powerpc-utils-papr/devel .cvsignore, 1.3,
	1.4 powerpc-utils-papr.spec, 1.4, 1.5 sources, 1.3,
	1.4 powerpc-utils-papr-1.1.4.libservicelog.patch, 1.1, NONE
Message-ID: <20090421121738.B09C8700D6@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/powerpc-utils-papr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8213

Modified Files:
	.cvsignore powerpc-utils-papr.spec sources 
Removed Files:
	powerpc-utils-papr-1.1.4.libservicelog.patch 
Log Message:
New upstream version 1.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils-papr/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Apr 2009 08:42:39 -0000	1.3
+++ .cvsignore	21 Apr 2009 12:17:03 -0000	1.4
@@ -1 +1 @@
-powerpc-utils-papr-1.1.5.tar.gz
+powerpc-utils-papr-1.1.6.tar.gz


Index: powerpc-utils-papr.spec
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils-papr/devel/powerpc-utils-papr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- powerpc-utils-papr.spec	2 Apr 2009 08:36:01 -0000	1.4
+++ powerpc-utils-papr.spec	21 Apr 2009 12:17:03 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           powerpc-utils-papr
-Version:        1.1.5
+Version:        1.1.6
 Release:        1%{?dist}
 Summary:        Utilities for IBM PowerPC PAPR platforms
 
@@ -12,7 +12,6 @@
 BuildRequires:  libservicelog-devel >= 1.0.1-2
 Requires:       libservicelog
 ExclusiveArch:  ppc ppc64
-Patch0:         powerpc-utils-papr-1.1.4.libservicelog.patch
 
 %description
 Utilities for maintaining and servicing IBM PowerPC systems that adhere to
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libservicelog
 sed -i s/744/755/ rules.mk
 chmod -x scripts/ibmvscsis.sh
 
@@ -55,6 +53,7 @@
 %{_sbindir}/drmgr
 %{_sbindir}/lsslot
 %{_bindir}/amsvis
+%{_bindir}/amsstat
 %{_mandir}/man8/update_flash.8.gz
 %{_mandir}/man8/activate_firmware.8.gz
 %{_mandir}/man8/usysident.8.gz
@@ -69,12 +68,14 @@
 %{_mandir}/man8/ibmvscsis.conf.8.gz
 %{_mandir}/man8/rtas_dump.8.gz
 %{_mandir}/man8/sys_ident.8.gz
-%{_mandir}/man8/amsvis.8.gz
+%{_mandir}/man1/amsvis.1.gz
+%{_mandir}/man1/amsstat.1.gz
 %doc README COPYRIGHT Changelog scripts/ibmvscsis.sh
 
-
-
 %changelog
+* Tue Apr 21 2009 Roman Rakus <rrakus at redhat.com> - 1.1.6-1
+- New upstream version 1.1.6
+
 * Thu Apr 02 2009 Roman Rakus <rrakus at redhat.com> - 1.1.5-1
 - New upstream version 1.1.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils-papr/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Apr 2009 08:42:39 -0000	1.3
+++ sources	21 Apr 2009 12:17:03 -0000	1.4
@@ -1 +1 @@
-a67cfccbc5e049385441b4905be693ec  powerpc-utils-papr-1.1.5.tar.gz
+37bd1ba8cfa9e9365d2f7c43eddf8e1f  powerpc-utils-papr-1.1.6.tar.gz


--- powerpc-utils-papr-1.1.4.libservicelog.patch DELETED ---



From pghmcfc at fedoraproject.org  Tue Apr 21 12:22:53 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 12:22:53 +0000 (UTC)
Subject: rpms/libxml/F-10 libxml.spec,1.10,1.11
Message-ID: <20090421122254.1121C700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9810

Modified Files:
	libxml.spec 
Log Message:
rebuild for %{_isa} provides/requires


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/F-10/libxml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxml.spec	21 May 2008 10:49:17 -0000	1.10
+++ libxml.spec	21 Apr 2009 12:22:51 -0000	1.11
@@ -1,8 +1,8 @@
 Name:		libxml
-Summary:	Old libXML library for Gnome-1 application compatibility
+Summary:	Old XML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	20%{?dist}
+Release:	22%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
@@ -19,10 +19,10 @@
 %package devel
 Summary:	Libraries, includes, etc. to build old libxml-based applications
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}, pkgconfig
 
 %description devel
-%{summary}.
+Libraries, includes, etc. to build old libxml-based applications.
 
 %prep
 %setup -q
@@ -71,6 +71,12 @@
 %exclude %{_libdir}/libxml.la
 
 %changelog
+* Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-22
+- rebuild for %%{_isa} provides/requires
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-21
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 21 2008 Paul Howarth <paul at city-fan.org> 1:1.8.17-20
 - fixes for building with -Werror-implicit-function-declaration and some of the
   compiler warnings



From pkgdb at fedoraproject.org  Tue Apr 21 12:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:23:54 +0000
Subject: [pkgdb] sugar-moon: fab has requested watchcommits
Message-ID: <20090421122354.6590C10F885@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-moon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:23:54 +0000
Subject: [pkgdb] sugar-moon: fab has requested commit
Message-ID: <20090421122354.83D9210F88A@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-moon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:23:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:23:55 +0000
Subject: [pkgdb] sugar-moon: fab has requested watchbugzilla
Message-ID: <20090421122355.259AC10F88D@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-moon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:24:01 +0000
Subject: [pkgdb] sugar-moon: fab has requested watchcommits
Message-ID: <20090421122401.0D6D010F88F@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-moon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:24:01 +0000
Subject: [pkgdb] sugar-moon: fab has requested watchbugzilla
Message-ID: <20090421122401.8583210F892@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-moon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:24:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:24:07 +0000
Subject: [pkgdb] sugar-moon: fab has requested watchcommits
Message-ID: <20090421122407.B3CDE10F885@bastion2.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-moon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:24:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:24:02 +0000
Subject: [pkgdb] sugar-moon: fab has requested commit
Message-ID: <20090421122402.0A68910F895@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-moon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:24:08 +0000
Subject: [pkgdb] sugar-moon: fab has requested watchbugzilla
Message-ID: <20090421122408.20D7D10F88A@bastion2.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-moon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 12:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 12:24:09 +0000
Subject: [pkgdb] sugar-moon: fab has requested commit
Message-ID: <20090421122409.DC7FB10F899@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-moon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pghmcfc at fedoraproject.org  Tue Apr 21 12:34:23 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 12:34:23 +0000 (UTC)
Subject: rpms/glib/F-11 glib.spec,1.13,1.14
Message-ID: <20090421123423.7B737700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12861

Modified Files:
	glib.spec 
Log Message:
- remove redundant linkage of libgmodule to libgthread
- cosmetic spec changes



Index: glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib/F-11/glib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- glib.spec	24 Feb 2009 18:14:04 -0000	1.13
+++ glib.spec	21 Apr 2009 12:34:21 -0000	1.14
@@ -1,18 +1,15 @@
-
-Summary: A library of handy utility functions
-Name: 	 glib
-Epoch:	 1
-Version: 1.2.10
-Release: 31%{?dist}
-
-License: LGPLv2+
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
+Summary:	A library of handy utility functions
+Name:		glib
+Epoch:		1
+Version:	1.2.10
+Release:	32%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source:		ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
 
 # Suppress warnings about varargs macros for -pedantic
 Patch1: glib-1.2.10-isowarning.patch
@@ -21,17 +18,22 @@
 Patch4: glib-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222296
 Patch5: glib-1.2.10-multilib.patch
+# Fix unused direct shared library dependency on libgmodule for libgthread
+Patch6: glib-1.2.10-unused-dep.patch
+
 
 %description
 GLib is a handy library of utility functions. This C library is
 designed to solve some portability problems and provide other useful
-functionality which most programs require.
+functionality that most programs require.
+
 
 %package devel
 Summary: Libraries and header files for %{name} development 
 Group:	 Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 %{summary}.
 
@@ -44,6 +46,7 @@
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .no_undefined
 %patch5 -p1 -b .multilib
+%patch6 -p1 -b .unused-dep
 
 # The original config.{guess,sub} do not work on x86_64
 #
@@ -58,37 +61,36 @@
 autoheader-2.13
 
 
-
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool
 
 # libgmodule-1.2.so.0* missing eXecute bit
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+%{__chmod} a+x %{buildroot}%{_libdir}/lib*.so*
 
 ## Unpackaged files
 # info
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 # .la fies... die die die.
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 
 %check
-make check LIBTOOL=%{_bindir}/libtool
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -111,10 +113,13 @@
 %{_mandir}/man1/*
 %{_datadir}/aclocal/*
 
-
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-32
+- remove redundant linkage of libgmodule to libgthread
+- cosmetic spec changes
+
 * Wed Feb 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1:1.2.10-31
-- Rebuild for pkgconfig deps
+- rebuild for pkgconfig deps
 
 * Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-30
 - copy config.* from rpm directory, those shipped are too old. Should
@@ -292,7 +297,7 @@
 - new description tags 
 
 * Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
-- removed libtoolize from %build
+- removed libtoolize from %%build
 
 * Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
 - added libgthread to file list



From pghmcfc at fedoraproject.org  Tue Apr 21 12:35:37 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 12:35:37 +0000 (UTC)
Subject: rpms/glib/F-11 glib-1.2.10-unused-dep.patch,NONE,1.1
Message-ID: <20090421123537.00A81700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13286

Added Files:
	glib-1.2.10-unused-dep.patch 
Log Message:
and remember to add the patch this time

glib-1.2.10-unused-dep.patch:

--- NEW FILE glib-1.2.10-unused-dep.patch ---
--- glib-1.2.10/gthread/Makefile.am	2009-04-17 15:47:42.000000000 +0100
+++ glib-1.2.10/gthread/Makefile.am	2009-04-17 15:49:26.000000000 +0100
@@ -20,8 +20,8 @@
 	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la
-libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la
+libgthread_la_DEPENDENCIES = $(libglib)
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = libgthread.la 



From limb at fedoraproject.org  Tue Apr 21 12:46:00 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 12:46:00 +0000 (UTC)
Subject: rpms/inksmoto/devel .cvsignore, 1.6, 1.7 inksmoto.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090421124600.7E7E57013C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16012

Modified Files:
	.cvsignore inksmoto.spec sources 
Log Message:
0.6.0~rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Mar 2009 12:55:41 -0000	1.6
+++ .cvsignore	21 Apr 2009 12:45:55 -0000	1.7
@@ -1 +1 @@
-inksmoto-0.5.1.tar.gz
+inksmoto-0.6.0~rc1.tar.gz


Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/inksmoto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- inksmoto.spec	17 Mar 2009 12:55:41 -0000	1.9
+++ inksmoto.spec	21 Apr 2009 12:45:55 -0000	1.10
@@ -1,12 +1,12 @@
 Name: inksmoto
-Version: 0.5.1
-Release:  1%{?dist}
+Version: 0.6.0
+Release:  1.rc1%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}/inksmoto-%{version}.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc1.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch
@@ -29,10 +29,9 @@
 mkdir -p %{buildroot}%{_datadir}/inkscape/extensions
 rm -f bezmisc.py
 rm -f inkex.py
-cp -p *.inx *.py *.xml %{buildroot}%{_datadir}/inkscape/extensions/
+cp -p *.inx *.py %{buildroot}%{_datadir}/inkscape/extensions/
 chmod 644 %{buildroot}%{_datadir}/inkscape/extensions/*
-cp -pr xmoto_bitmap %{buildroot}%{_datadir}/inkscape/extensions/
-cp -pr xmoto_install %{buildroot}%{_datadir}/inkscape/extensions/
+cp -pr inksmoto %{buildroot}%{_datadir}/inkscape/extensions/
 
 %clean
 rm -rf %{buildroot}
@@ -44,6 +43,9 @@
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Tue Apr 21 2009 Jon Ciesla <limb at jcomserv.net> - 0.6.0-1.rc1
+- Update to 0.6.0~rc1.
+
 * Tue Mar 17 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.1-1
 - New upstream, bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2009 12:55:41 -0000	1.6
+++ sources	21 Apr 2009 12:45:55 -0000	1.7
@@ -1 +1 @@
-d2649b6a37d5bafe95d96b579d49cfb1  inksmoto-0.5.1.tar.gz
+d05f8c328c2d782f7d2ba2282ca3a052  inksmoto-0.6.0~rc1.tar.gz



From lkundrak at fedoraproject.org  Tue Apr 21 12:46:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 21 Apr 2009 12:46:13 +0000 (UTC)
Subject: rpms/man/devel man.spec,1.80,1.81
Message-ID: <20090421124613.7CD227013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15853/devel

Modified Files:
	man.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-20
- Don't remove cache and whatis database on updates
- Ghost whatis database



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- man.spec	21 Apr 2009 05:01:00 -0000	1.80
+++ man.spec	21 Apr 2009 12:46:10 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -192,6 +192,7 @@
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_libexecdir}/man-cmp.sh
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}
+touch $RPM_BUILD_ROOT/%{cache}/whatis
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}/local
 mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6
@@ -227,17 +228,10 @@
 rm -rf $RPM_BUILD_ROOT%{_prefix}/etc
 
 %preun
+[ $1 = 0 ] || exit 0
 rm -f %{cache}/cat[123456789n]/* 2>/dev/null || :
 rm -f %{cache}/local/cat[123456789n]/* 2>/dev/null || :
 rm -f %{cache}/X11R6/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/whatis 2>/dev/null || :
-
-%triggerpostun -- man <= 1.5i2-0
-rm -f %{cache}/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/local/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/X11R6/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/whatis 2>/dev/null || :
-exit 0
 
 
 %clean
@@ -261,6 +255,7 @@
 %{_mandir}/man5/man.config.5*
 %{_mandir}/man1/*
 %{_mandir}/man8/makewhatis.8*
+%ghost %{cache}/whatis
 %attr(0755,root,root)   %dir %{cache}
 %attr(0755,root,man)    %dir %{cache}/cat[123456789n]
 %attr(0755,root,man)    %dir %{cache}/local
@@ -270,6 +265,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-20
+- Don't remove cache and whatis database on updates
+- Ghost whatis database
+
 * Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
 - The daily cron job is not a configuration file
 



From pghmcfc at fedoraproject.org  Tue Apr 21 12:46:30 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 12:46:30 +0000 (UTC)
Subject: rpms/glib/F-10 glib-1.2.10-unused-dep.patch, NONE, 1.1 glib.spec,
	1.12, 1.13
Message-ID: <20090421124630.4736B7013C@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16198

Modified Files:
	glib.spec 
Added Files:
	glib-1.2.10-unused-dep.patch 
Log Message:
- remove redundant linkage of libgmodule to libgthread
- cosmetic spec changes


glib-1.2.10-unused-dep.patch:

--- NEW FILE glib-1.2.10-unused-dep.patch ---
--- glib-1.2.10/gthread/Makefile.am	2009-04-17 15:47:42.000000000 +0100
+++ glib-1.2.10/gthread/Makefile.am	2009-04-17 15:49:26.000000000 +0100
@@ -20,8 +20,8 @@
 	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la
-libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la
+libgthread_la_DEPENDENCIES = $(libglib)
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = libgthread.la 


Index: glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib/F-10/glib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- glib.spec	2 Oct 2008 00:04:35 -0000	1.12
+++ glib.spec	21 Apr 2009 12:46:29 -0000	1.13
@@ -1,18 +1,15 @@
-
-Summary: A library of handy utility functions
-Name: 	 glib
-Epoch:	 1
-Version: 1.2.10
-Release: 30%{?dist}
-
-License: LGPLv2+
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
+Summary:	A library of handy utility functions
+Name:		glib
+Epoch:		1
+Version:	1.2.10
+Release:	32%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source:		ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
 
 # Suppress warnings about varargs macros for -pedantic
 Patch1: glib-1.2.10-isowarning.patch
@@ -21,17 +18,22 @@
 Patch4: glib-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222296
 Patch5: glib-1.2.10-multilib.patch
+# Fix unused direct shared library dependency on libgmodule for libgthread
+Patch6: glib-1.2.10-unused-dep.patch
+
 
 %description
 GLib is a handy library of utility functions. This C library is
 designed to solve some portability problems and provide other useful
-functionality which most programs require.
+functionality that most programs require.
+
 
 %package devel
 Summary: Libraries and header files for %{name} development 
 Group:	 Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 %{summary}.
 
@@ -44,6 +46,7 @@
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .no_undefined
 %patch5 -p1 -b .multilib
+%patch6 -p1 -b .unused-dep
 
 # The original config.{guess,sub} do not work on x86_64
 #
@@ -58,37 +61,36 @@
 autoheader-2.13
 
 
-
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool
 
 # libgmodule-1.2.so.0* missing eXecute bit
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+%{__chmod} a+x %{buildroot}%{_libdir}/lib*.so*
 
 ## Unpackaged files
 # info
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 # .la fies... die die die.
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 
 %check
-make check LIBTOOL=%{_bindir}/libtool
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -111,8 +113,14 @@
 %{_mandir}/man1/*
 %{_datadir}/aclocal/*
 
-
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-32
+- remove redundant linkage of libgmodule to libgthread
+- cosmetic spec changes
+
+* Wed Feb 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1:1.2.10-31
+- rebuild for pkgconfig deps
+
 * Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-30
 - copy config.* from rpm directory, those shipped are too old. Should
   fix #462650.
@@ -289,7 +297,7 @@
 - new description tags 
 
 * Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
-- removed libtoolize from %build
+- removed libtoolize from %%build
 
 * Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
 - added libgthread to file list



From lkundrak at fedoraproject.org  Tue Apr 21 12:46:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 21 Apr 2009 12:46:41 +0000 (UTC)
Subject: rpms/man/F-11 man.spec,1.80,1.81
Message-ID: <20090421124641.C21167013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/man/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15853/F-11

Modified Files:
	man.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-20
- Don't remove cache and whatis database on updates
- Ghost whatis database



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-11/man.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- man.spec	21 Apr 2009 05:00:59 -0000	1.80
+++ man.spec	21 Apr 2009 12:46:09 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -192,6 +192,7 @@
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_libexecdir}/man-cmp.sh
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}
+touch $RPM_BUILD_ROOT/%{cache}/whatis
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}/local
 mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6
@@ -227,17 +228,10 @@
 rm -rf $RPM_BUILD_ROOT%{_prefix}/etc
 
 %preun
+[ $1 = 0 ] || exit 0
 rm -f %{cache}/cat[123456789n]/* 2>/dev/null || :
 rm -f %{cache}/local/cat[123456789n]/* 2>/dev/null || :
 rm -f %{cache}/X11R6/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/whatis 2>/dev/null || :
-
-%triggerpostun -- man <= 1.5i2-0
-rm -f %{cache}/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/local/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/X11R6/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/whatis 2>/dev/null || :
-exit 0
 
 
 %clean
@@ -261,6 +255,7 @@
 %{_mandir}/man5/man.config.5*
 %{_mandir}/man1/*
 %{_mandir}/man8/makewhatis.8*
+%ghost %{cache}/whatis
 %attr(0755,root,root)   %dir %{cache}
 %attr(0755,root,man)    %dir %{cache}/cat[123456789n]
 %attr(0755,root,man)    %dir %{cache}/local
@@ -270,6 +265,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-20
+- Don't remove cache and whatis database on updates
+- Ghost whatis database
+
 * Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
 - The daily cron job is not a configuration file
 



From twaugh at fedoraproject.org  Tue Apr 21 12:49:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 21 Apr 2009 12:49:32 +0000 (UTC)
Subject: rpms/cups/F-10 .cvsignore, 1.42, 1.43 cups-lspp.patch, 1.38,
	1.39 cups-no-gzip-man.patch, 1.1,
	1.2 cups-serverbin-compat.patch, 1.4, 1.5 cups-str2536.patch,
	1.1, 1.2 cups.spec, 1.457, 1.458 sources, 1.45,
	1.46 cups-CVE-2008-5183.patch, 1.1,
	NONE cups-CVE-2008-5286.patch, 1.1, NONE cups-ext.patch, 1.1,
	NONE cups-includeifexists.patch, 1.1, NONE cups-str2988.patch,
	1.1, NONE cups-str3059.patch, 1.1, NONE cups-str3077.patch, 1.1,
	NONE cups-str3078.patch, 1.1, NONE
Message-ID: <20090421124932.BFDDE7013C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290

Modified Files:
	.cvsignore cups-lspp.patch cups-no-gzip-man.patch 
	cups-serverbin-compat.patch cups-str2536.patch cups.spec 
	sources 
Removed Files:
	cups-CVE-2008-5183.patch cups-CVE-2008-5286.patch 
	cups-ext.patch cups-includeifexists.patch cups-str2988.patch 
	cups-str3059.patch cups-str3077.patch cups-str3078.patch 
Log Message:
* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-1
- 1.3.10.  No longer need ext, includeifexists, str2988,
  CVE-2008-5183, CVE-2008-5286, str3077, str3078, str3059, str3055 patches.
- Requires poppler-utils.
- NOTE: If your CUPS server is accessed using a hostname or hostnames
  not known to the server itself you must add "ServerAlias hostname"
  for each such name.  The special line "ServerAlias *" disables checking
  (but this allows DNS rebinding attacks).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	10 Oct 2008 09:44:33 -0000	1.42
+++ .cvsignore	21 Apr 2009 12:49:24 -0000	1.43
@@ -34,3 +34,4 @@
 cups-1.3.7-source.tar.bz2
 cups-1.3.8-source.tar.bz2
 cups-1.3.9-source.tar.bz2
+cups-1.3.10-source.tar.bz2

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups-lspp.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cups-lspp.patch	28 Jan 2009 17:18:09 -0000	1.38
+++ cups-lspp.patch	21 Apr 2009 12:49:25 -0000	1.39
@@ -1,7 +1,7 @@
-diff -up cups-1.3.9/config.h.in.lspp cups-1.3.9/config.h.in
---- cups-1.3.9/config.h.in.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/config.h.in	2009-01-28 17:12:34.000000000 +0000
-@@ -551,6 +551,13 @@
+diff -up cups-1.3.10/config.h.in.lspp cups-1.3.10/config.h.in
+--- cups-1.3.10/config.h.in.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/config.h.in	2009-04-20 18:16:51.000000000 +0100
+@@ -567,6 +567,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -15,9 +15,9 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up /dev/null cups-1.3.9/config-scripts/cups-lspp.m4
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/config-scripts/cups-lspp.m4	2009-01-28 17:12:34.000000000 +0000
+diff -up /dev/null cups-1.3.10/config-scripts/cups-lspp.m4
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/config-scripts/cups-lspp.m4	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@
 +            ;;
 +    esac
 +fi
-diff -up cups-1.3.9/configure.in.lspp cups-1.3.9/configure.in
---- cups-1.3.9/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3.9/configure.in	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/configure.in.lspp cups-1.3.10/configure.in
+--- cups-1.3.10/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3.10/configure.in	2009-04-20 18:16:51.000000000 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -67,10 +67,10 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-1.3.9/configure.lspp cups-1.3.9/configure
---- cups-1.3.9/configure.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/configure	2009-01-28 17:12:34.000000000 +0000
-@@ -807,6 +807,8 @@ PHP
+diff -up cups-1.3.10/configure.lspp cups-1.3.10/configure
+--- cups-1.3.10/configure.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/configure	2009-04-20 18:17:25.000000000 +0100
+@@ -809,6 +809,8 @@ PHP
  PHPCONFIG
  PHPDIR
  PYTHON
@@ -79,15 +79,15 @@
  INSTALL_LANGUAGES
  UNINSTALL_LANGUAGES
  LIBOBJS
-@@ -1430,6 +1432,7 @@ Optional Features:
-                           enable UseNetworkDefault by default, default=auto
+@@ -1433,6 +1435,7 @@ Optional Features:
    --enable-raw-printing   enable raw printing by default, default=auto
+   --enable-pap            build with AppleTalk support, default=auto
    --enable-pdftops        build pdftops filter, default=auto
 +  --enable-lspp           turn on auditing and label support, default=no
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -18862,6 +18865,412 @@ fi
+@@ -19215,6 +19218,412 @@ fi
  
  
  
@@ -500,34 +500,37 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-@@ -19756,7 +20165,7 @@ PHP!$PHP$ac_delim
+@@ -20111,9 +20520,10 @@ PHP!$PHP$ac_delim
  PHPCONFIG!$PHPCONFIG$ac_delim
  PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
--INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
 +LIBAUDIT!$LIBAUDIT$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19798,12 +20207,14 @@ _ACEOF
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 99; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -20152,13 +20562,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
 +LIBSELINUX!$LIBSELINUX$ac_delim
-+INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
+ INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
  UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -up cups-1.3.9/cups/cups.h.lspp cups-1.3.9/cups/cups.h
---- cups-1.3.9/cups/cups.h.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/cups/cups.h	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/cups/cups.h.lspp cups-1.3.10/cups/cups.h
+--- cups-1.3.10/cups/cups.h.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/cups/cups.h	2009-04-20 18:16:51.000000000 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -551,9 +554,9 @@
  /*
   * Types and structures...
   */
-diff -up cups-1.3.9/data/Makefile.lspp cups-1.3.9/data/Makefile
---- cups-1.3.9/data/Makefile.lspp	2007-10-10 23:00:43.000000000 +0100
-+++ cups-1.3.9/data/Makefile	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/data/Makefile.lspp cups-1.3.10/data/Makefile
+--- cups-1.3.10/data/Makefile.lspp	2008-11-12 19:35:30.000000000 +0000
++++ cups-1.3.10/data/Makefile	2009-04-20 18:16:51.000000000 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -566,9 +569,9 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.3.9/data/mls
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/data/mls	2009-01-28 17:12:34.000000000 +0000
+diff -up /dev/null cups-1.3.10/data/mls
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/data/mls	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -831,9 +834,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.9/data/selinux
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/data/selinux	2009-01-28 17:12:34.000000000 +0000
+diff -up /dev/null cups-1.3.10/data/selinux
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/data/selinux	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1096,9 +1099,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.9/data/te
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/data/te	2009-01-28 17:12:34.000000000 +0000
+diff -up /dev/null cups-1.3.10/data/te
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/data/te	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1361,9 +1364,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.3.9/filter/common.c.lspp cups-1.3.9/filter/common.c
---- cups-1.3.9/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.9/filter/common.c	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/filter/common.c.lspp cups-1.3.10/filter/common.c
+--- cups-1.3.10/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.10/filter/common.c	2009-04-20 18:16:51.000000000 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1532,9 +1535,9 @@
  
  
  /*
-diff -up cups-1.3.9/filter/pstops.c.lspp cups-1.3.9/filter/pstops.c
---- cups-1.3.9/filter/pstops.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/filter/pstops.c	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/filter/pstops.c.lspp cups-1.3.10/filter/pstops.c
+--- cups-1.3.10/filter/pstops.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/filter/pstops.c	2009-04-20 18:16:51.000000000 +0100
 @@ -3230,6 +3230,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
@@ -1690,9 +1693,9 @@
  
  
  /*
-diff -up cups-1.3.9/Makedefs.in.lspp cups-1.3.9/Makedefs.in
---- cups-1.3.9/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
-+++ cups-1.3.9/Makedefs.in	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/Makedefs.in.lspp cups-1.3.10/Makedefs.in
+--- cups-1.3.10/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
++++ cups-1.3.10/Makedefs.in	2009-04-20 18:16:51.000000000 +0100
 @@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1702,13 +1705,13 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
-diff -up cups-1.3.9/scheduler/client.c.lspp cups-1.3.9/scheduler/client.c
---- cups-1.3.9/scheduler/client.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/client.c	2009-01-28 17:12:34.000000000 +0000
-@@ -40,12 +40,14 @@
-  *   pipe_command()          - Pipe the output of a command to the remote client.
-  *   write_file()            - Send a file via HTTP.
-  *   write_pipe()            - Flag that data is available on the CGI pipe.
+diff -up cups-1.3.10/scheduler/client.c.lspp cups-1.3.10/scheduler/client.c
+--- cups-1.3.10/scheduler/client.c.lspp	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/client.c	2009-04-20 18:16:51.000000000 +0100
+@@ -43,12 +43,14 @@
+  *   valid_host()           - Is the Host: field valid?
+  *   write_file()           - Send a file via HTTP.
+  *   write_pipe()           - Flag that data is available on the CGI pipe.
 + *   client_pid_to_auid()    - Get the audit login uid of the client.
   */
  
@@ -1720,7 +1723,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -77,6 +79,12 @@ extern const char *cssmErrorString(int e
+@@ -80,6 +82,12 @@ extern const char *cssmErrorString(int e
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1733,7 +1736,7 @@
  
  /*
   * Local functions...
-@@ -351,6 +359,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -346,6 +354,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
      }
    }
  
@@ -1791,7 +1794,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -741,6 +800,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -736,6 +795,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1805,7 +1808,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2034,6 +2100,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2060,6 +2126,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1873,7 +1876,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4305,6 +4432,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4338,6 +4465,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1924,9 +1927,9 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -up cups-1.3.9/scheduler/client.h.lspp cups-1.3.9/scheduler/client.h
---- cups-1.3.9/scheduler/client.h.lspp	2007-10-22 19:52:13.000000000 +0100
-+++ cups-1.3.9/scheduler/client.h	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/scheduler/client.h.lspp cups-1.3.10/scheduler/client.h
+--- cups-1.3.10/scheduler/client.h.lspp	2009-01-15 19:12:15.000000000 +0000
++++ cups-1.3.10/scheduler/client.h	2009-04-20 18:16:51.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1952,7 +1955,7 @@
  };
  
  #define HTTP(con) &((con)->http)
-@@ -129,6 +140,9 @@ extern void	cupsdStartListening(void);
+@@ -127,6 +138,9 @@ extern void	cupsdStartListening(void);
  extern void	cupsdStopListening(void);
  extern void	cupsdUpdateCGI(void);
  extern void	cupsdWriteClient(cupsd_client_t *con);
@@ -1962,10 +1965,10 @@
  
  
  /*
-diff -up cups-1.3.9/scheduler/conf.c.lspp cups-1.3.9/scheduler/conf.c
---- cups-1.3.9/scheduler/conf.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/conf.c	2009-01-28 17:12:34.000000000 +0000
-@@ -27,6 +27,7 @@
+diff -up cups-1.3.10/scheduler/conf.c.lspp cups-1.3.10/scheduler/conf.c
+--- cups-1.3.10/scheduler/conf.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/conf.c	2009-04-20 18:16:51.000000000 +0100
+@@ -29,6 +29,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
   *   read_policy()            - Read a <Policy name> definition.
@@ -1973,7 +1976,7 @@
   */
  
  /*
-@@ -48,6 +49,9 @@
+@@ -50,6 +51,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
  
@@ -1983,7 +1986,7 @@
  
  /*
   * Configuration variable structure...
-@@ -161,6 +165,10 @@ static const cupsd_var_t	variables[] =
+@@ -163,6 +167,10 @@ static const cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
    { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1994,7 +1997,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -370,6 +378,9 @@ cupsdReadConfiguration(void)
+@@ -376,6 +384,9 @@ cupsdReadConfiguration(void)
  		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
@@ -2004,9 +2007,9 @@
  
  
   /*
-@@ -632,6 +643,25 @@ cupsdReadConfiguration(void)
- 
-   RunUser = getuid();
+@@ -645,6 +656,25 @@ cupsdReadConfiguration(void)
+   cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
+                   RemoteAccessEnabled ? "enabled" : "disabled");
  
 +#ifdef WITH_LSPP
 +  if (AuditLog != -1)
@@ -2030,7 +2033,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -911,11 +941,23 @@ cupsdReadConfiguration(void)
+@@ -975,11 +1005,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -2055,7 +2058,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3314,6 +3356,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3429,6 +3471,18 @@ read_location(cups_file_t *fp,		/* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -2074,10 +2077,10 @@
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-1.3.9/scheduler/conf.h.lspp cups-1.3.9/scheduler/conf.h
---- cups-1.3.9/scheduler/conf.h.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/conf.h	2009-01-28 17:12:34.000000000 +0000
-@@ -208,6 +208,12 @@ VAR char		*ServerKey		VALUE(NULL);
+diff -up cups-1.3.10/scheduler/conf.h.lspp cups-1.3.10/scheduler/conf.h
+--- cups-1.3.10/scheduler/conf.h.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/conf.h	2009-04-20 18:16:51.000000000 +0100
+@@ -224,6 +224,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -2090,7 +2093,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -226,6 +232,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -242,6 +248,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -2100,9 +2103,9 @@
  
  /*
   * Prototypes...
-diff -up cups-1.3.9/scheduler/ipp.c.lspp cups-1.3.9/scheduler/ipp.c
---- cups-1.3.9/scheduler/ipp.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/scheduler/ipp.c.lspp cups-1.3.10/scheduler/ipp.c
+--- cups-1.3.10/scheduler/ipp.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/ipp.c	2009-04-20 18:16:51.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2146,7 +2149,7 @@
  static int	check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
  static ipp_attribute_t	*copy_attribute(ipp_t *to, ipp_attribute_t *attr,
  		                        int quickcopy);
-@@ -1270,6 +1285,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1272,6 +1287,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -2168,7 +2171,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1486,6 +1516,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1488,6 +1518,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -2273,7 +2276,7 @@
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1494,6 +1622,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1496,6 +1624,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      return (NULL);
    }
  
@@ -2306,7 +2309,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1699,6 +1853,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1701,6 +1855,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
        attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
        attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
      }
@@ -2336,7 +2339,7 @@
  
      job->job_sheets = attr;
  
-@@ -1729,6 +1906,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1731,6 +1908,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                		    "job-sheets=\"%s,none\", "
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -2346,7 +2349,7 @@
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1747,6 +1927,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1749,6 +1929,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, attr->values[0].string.text,
  			 attr->values[1].string.text, job->username);
@@ -2356,7 +2359,7 @@
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1767,6 +1950,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1769,6 +1952,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  			    "job-originating-user-name=\"%s\"",
  	        	    job->id, attr->values[0].string.text,
  			    attr->values[1].string.text, job->username);
@@ -2366,7 +2369,7 @@
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1807,9 +1993,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1809,9 +1995,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                  "job-sheets=\"%s\", "
  			  "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -2419,7 +2422,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3522,6 +3751,103 @@ check_rss_recipient(
+@@ -3524,6 +3753,103 @@ check_rss_recipient(
  }
  
  
@@ -2523,7 +2526,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4043,6 +4369,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4033,6 +4359,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -2539,7 +2542,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4078,6 +4413,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4068,6 +4403,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2622,7 +2625,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4172,6 +4583,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4162,6 +4573,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2647,7 +2650,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5944,6 +6373,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -5934,6 +6363,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2670,7 +2673,7 @@
   /*
    * Copy attributes...
    */
-@@ -6149,6 +6594,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -6144,6 +6589,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2682,7 +2685,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -10286,6 +10736,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -10307,6 +10757,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2694,9 +2697,9 @@
   /*
    * Check the username against the owner...
    */
-diff -up cups-1.3.9/scheduler/job.c.lspp cups-1.3.9/scheduler/job.c
---- cups-1.3.9/scheduler/job.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/job.c	2009-01-28 17:12:47.000000000 +0000
+diff -up cups-1.3.10/scheduler/job.c.lspp cups-1.3.10/scheduler/job.c
+--- cups-1.3.10/scheduler/job.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/job.c	2009-04-20 18:16:51.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2722,7 +2725,7 @@
  
  /*
   * Local globals...
-@@ -1119,6 +1130,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+@@ -1127,6 +1138,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
      goto error;
    }
  
@@ -2743,7 +2746,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1483,6 +1508,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1491,6 +1516,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2757,7 +2760,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1501,6 +1533,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1509,6 +1541,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2834,7 +2837,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2475,6 +2577,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2483,6 +2585,21 @@ start_job(cupsd_job_t     *job,		/* I - 
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2856,7 +2859,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2746,6 +2863,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2754,6 +2871,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2963,7 +2966,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2894,6 +3111,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2902,6 +3119,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -2982,7 +2985,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3136,6 +3365,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3144,6 +3373,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      }
    }
  
@@ -3050,9 +3053,9 @@
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-diff -up cups-1.3.9/scheduler/job.h.lspp cups-1.3.9/scheduler/job.h
---- cups-1.3.9/scheduler/job.h.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/job.h	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/scheduler/job.h.lspp cups-1.3.10/scheduler/job.h
+--- cups-1.3.10/scheduler/job.h.lspp	2009-01-28 16:49:56.000000000 +0000
++++ cups-1.3.10/scheduler/job.h	2009-04-20 18:16:51.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -3078,9 +3081,9 @@
  } cupsd_job_t;
  
  
-diff -up cups-1.3.9/scheduler/main.c.lspp cups-1.3.9/scheduler/main.c
---- cups-1.3.9/scheduler/main.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/main.c	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/scheduler/main.c.lspp cups-1.3.10/scheduler/main.c
+--- cups-1.3.10/scheduler/main.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/main.c	2009-04-20 18:16:51.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -3136,7 +3139,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1192,6 +1219,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1190,6 +1217,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -3148,9 +3151,9 @@
    return (!stop_scheduler);
  }
  
-diff -up cups-1.3.9/scheduler/printers.c.lspp cups-1.3.9/scheduler/printers.c
---- cups-1.3.9/scheduler/printers.c.lspp	2009-01-28 17:12:34.000000000 +0000
-+++ cups-1.3.9/scheduler/printers.c	2009-01-28 17:12:34.000000000 +0000
+diff -up cups-1.3.10/scheduler/printers.c.lspp cups-1.3.10/scheduler/printers.c
+--- cups-1.3.10/scheduler/printers.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/printers.c	2009-04-20 18:16:51.000000000 +0100
 @@ -51,6 +51,8 @@
   *                                 printing desktop tools.
   */
@@ -3171,7 +3174,7 @@
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1846,6 +1852,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1856,6 +1862,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
  		{			/* No authentication */
  		  "none"
  		};
@@ -3185,7 +3188,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1995,6 +2008,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2005,6 +2018,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }

cups-no-gzip-man.patch:

Index: cups-no-gzip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups-no-gzip-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-no-gzip-man.patch	17 Mar 2006 12:10:57 -0000	1.1
+++ cups-no-gzip-man.patch	21 Apr 2009 12:49:25 -0000	1.2
@@ -1,9 +1,28 @@
---- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man	2006-02-13 02:46:10.000000000 +0000
-+++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4	2006-02-17 09:55:45.000000000 +0000
-@@ -80,10 +80,10 @@
+diff -up cups-1.3.10/config-scripts/cups-manpages.m4.no-gzip-man cups-1.3.10/config-scripts/cups-manpages.m4
+--- cups-1.3.10/config-scripts/cups-manpages.m4.no-gzip-man	2009-01-12 19:17:21.000000000 +0000
++++ cups-1.3.10/config-scripts/cups-manpages.m4	2009-04-20 17:49:31.000000000 +0100
+@@ -69,10 +69,10 @@ case "$uname" in
  		;;
- 	Linux* | GNU*)
- 		# Linux and GNU Hurd
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
+diff -up cups-1.3.10/configure.no-gzip-man cups-1.3.10/configure
+--- cups-1.3.10/configure.no-gzip-man	2009-04-16 21:02:06.000000000 +0100
++++ cups-1.3.10/configure	2009-04-20 17:49:29.000000000 +0100
+@@ -9678,10 +9678,10 @@ case "$uname" in
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
 -		MAN1EXT=1.gz
 -		MAN5EXT=5.gz
 -		MAN7EXT=7.gz

cups-serverbin-compat.patch:

Index: cups-serverbin-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups-serverbin-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-serverbin-compat.patch	15 Jul 2008 10:36:15 -0000	1.4
+++ cups-serverbin-compat.patch	21 Apr 2009 12:49:25 -0000	1.5
@@ -1,9 +1,9 @@
-diff -up cups-1.3.7/scheduler/conf.c.serverbin-compat cups-1.3.7/scheduler/conf.c
---- cups-1.3.7/scheduler/conf.c.serverbin-compat	2008-03-20 04:06:01.000000000 +0000
-+++ cups-1.3.7/scheduler/conf.c	2008-07-15 11:04:19.000000000 +0100
-@@ -402,6 +402,9 @@ cupsdReadConfiguration(void)
-   cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp)));
-   cupsdSetStringf(&ServerAdmin, "root@%s", temp);
+diff -up cups-1.3.10/scheduler/conf.c.serverbin-compat cups-1.3.10/scheduler/conf.c
+--- cups-1.3.10/scheduler/conf.c.serverbin-compat	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/conf.c	2009-04-20 17:05:08.000000000 +0100
+@@ -430,6 +430,9 @@ cupsdReadConfiguration(void)
+   cupsdClearString(&ServerName);
+   cupsdClearString(&ServerAdmin);
    cupsdSetString(&ServerBin, CUPS_SERVERBIN);
 +#ifdef __x86_64__
 +  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
@@ -11,7 +11,7 @@
    cupsdSetString(&RequestRoot, CUPS_REQUESTS);
    cupsdSetString(&CacheDir, CUPS_CACHEDIR);
    cupsdSetString(&DataDir, CUPS_DATADIR);
-@@ -1095,7 +1098,12 @@ cupsdReadConfiguration(void)
+@@ -1178,7 +1181,12 @@ cupsdReadConfiguration(void)
      * Read the MIME type and conversion database...
      */
  
@@ -24,10 +24,10 @@
  
      MimeDatabase = mimeLoad(ServerRoot, temp);
  
-diff -up cups-1.3.7/scheduler/conf.h.serverbin-compat cups-1.3.7/scheduler/conf.h
---- cups-1.3.7/scheduler/conf.h.serverbin-compat	2008-02-15 23:26:51.000000000 +0000
-+++ cups-1.3.7/scheduler/conf.h	2008-07-15 11:04:19.000000000 +0100
-@@ -59,6 +59,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
+diff -up cups-1.3.10/scheduler/conf.h.serverbin-compat cups-1.3.10/scheduler/conf.h
+--- cups-1.3.10/scheduler/conf.h.serverbin-compat	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/conf.h	2009-04-20 17:03:48.000000000 +0100
+@@ -70,6 +70,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
  					/* Root directory for scheduler */
  			*ServerBin		VALUE(NULL),
  					/* Root directory for binaries */
@@ -38,9 +38,9 @@
  			*StateDir		VALUE(NULL),
  					/* Root directory for state data */
  			*RequestRoot		VALUE(NULL),
-diff -up cups-1.3.7/scheduler/env.c.serverbin-compat cups-1.3.7/scheduler/env.c
---- cups-1.3.7/scheduler/env.c.serverbin-compat	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.7/scheduler/env.c	2008-07-15 11:04:19.000000000 +0100
+diff -up cups-1.3.10/scheduler/env.c.serverbin-compat cups-1.3.10/scheduler/env.c
+--- cups-1.3.10/scheduler/env.c.serverbin-compat	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.10/scheduler/env.c	2009-04-20 17:03:48.000000000 +0100
 @@ -86,8 +86,13 @@ cupsdInitEnv(void)
    cupsdSetEnv("LD_LIBRARY_PATH", NULL);
    cupsdSetEnv("LD_PRELOAD", NULL);
@@ -55,10 +55,10 @@
    cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
    cupsdSetEnv("SHLIB_PATH", NULL);
    cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
-diff -up cups-1.3.7/scheduler/ipp.c.serverbin-compat cups-1.3.7/scheduler/ipp.c
---- cups-1.3.7/scheduler/ipp.c.serverbin-compat	2008-03-24 22:34:44.000000000 +0000
-+++ cups-1.3.7/scheduler/ipp.c	2008-07-15 11:04:19.000000000 +0100
-@@ -2377,9 +2377,18 @@ add_printer(cupsd_client_t  *con,	/* I -
+diff -up cups-1.3.10/scheduler/ipp.c.serverbin-compat cups-1.3.10/scheduler/ipp.c
+--- cups-1.3.10/scheduler/ipp.c.serverbin-compat	2009-03-18 16:30:29.000000000 +0000
++++ cups-1.3.10/scheduler/ipp.c	2009-04-20 17:03:48.000000000 +0100
+@@ -2475,9 +2475,18 @@ add_printer(cupsd_client_t  *con,	/* I -
          * Could not find device in list!
  	*/
  
@@ -77,10 +77,10 @@
        }
      }
  
-diff -up cups-1.3.7/scheduler/job.c.serverbin-compat cups-1.3.7/scheduler/job.c
---- cups-1.3.7/scheduler/job.c.serverbin-compat	2008-03-25 22:57:40.000000000 +0000
-+++ cups-1.3.7/scheduler/job.c	2008-07-15 11:04:19.000000000 +0100
-@@ -3223,8 +3223,32 @@ start_job(cupsd_job_t     *job,		/* I - 
+diff -up cups-1.3.10/scheduler/job.c.serverbin-compat cups-1.3.10/scheduler/job.c
+--- cups-1.3.10/scheduler/job.c.serverbin-compat	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/job.c	2009-04-20 17:03:48.000000000 +0100
+@@ -3242,8 +3242,32 @@ start_job(cupsd_job_t     *job,		/* I - 
         i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
    {
      if (filter->filter[0] != '/')
@@ -115,7 +115,7 @@
      else
        strlcpy(command, filter->filter, sizeof(command));
  
-@@ -3374,6 +3398,28 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3394,6 +3418,28 @@ start_job(cupsd_job_t     *job,		/* I - 
      {
        sscanf(printer->device_uri, "%254[^:]", method);
        snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method);
@@ -144,10 +144,10 @@
  
       /*
        * See if the backend needs to run as root...
-diff -up cups-1.3.7/scheduler/printers.c.serverbin-compat cups-1.3.7/scheduler/printers.c
---- cups-1.3.7/scheduler/printers.c.serverbin-compat	2008-01-30 06:09:39.000000000 +0000
-+++ cups-1.3.7/scheduler/printers.c	2008-07-15 11:04:19.000000000 +0100
-@@ -934,9 +934,19 @@ cupsdLoadAllPrinters(void)
+diff -up cups-1.3.10/scheduler/printers.c.serverbin-compat cups-1.3.10/scheduler/printers.c
+--- cups-1.3.10/scheduler/printers.c.serverbin-compat	2008-11-12 00:18:36.000000000 +0000
++++ cups-1.3.10/scheduler/printers.c	2009-04-20 17:03:48.000000000 +0100
+@@ -943,9 +943,19 @@ cupsdLoadAllPrinters(void)
  	    * Backend does not exist, stop printer...
  	    */
  
@@ -167,7 +167,7 @@
  	  }
          }
  
-@@ -3395,6 +3405,12 @@ add_printer_filter(
+@@ -3433,6 +3443,12 @@ add_printer_filter(
  
      if (access(filename, X_OK))
      {
@@ -180,7 +180,7 @@
        snprintf(p->state_message, sizeof(p->state_message),
                 "Filter \"%s\" for printer \"%s\" not available: %s",
  	       program, p->name, strerror(errno));
-@@ -3402,6 +3418,9 @@ add_printer_filter(
+@@ -3440,6 +3456,9 @@ add_printer_filter(
        cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0);
  
        cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);

cups-str2536.patch:

Index: cups-str2536.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups-str2536.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-str2536.patch	10 Sep 2008 15:20:58 -0000	1.1
+++ cups-str2536.patch	21 Apr 2009 12:49:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up cups-1.3.8/config.h.in.str2536 cups-1.3.8/config.h.in
---- cups-1.3.8/config.h.in.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/config.h.in	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/config.h.in.str2536 cups-1.3.10/config.h.in
+--- cups-1.3.10/config.h.in.str2536	2009-03-12 21:34:21.000000000 +0000
++++ cups-1.3.10/config.h.in	2009-04-20 17:27:31.000000000 +0100
 @@ -43,6 +43,13 @@
  
  
@@ -15,9 +15,9 @@
   * Default browsing settings...
   */
  
-diff -up cups-1.3.8/config-scripts/cups-defaults.m4.str2536 cups-1.3.8/config-scripts/cups-defaults.m4
---- cups-1.3.8/config-scripts/cups-defaults.m4.str2536	2008-04-14 19:10:27.000000000 +0100
-+++ cups-1.3.8/config-scripts/cups-defaults.m4	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/config-scripts/cups-defaults.m4.str2536 cups-1.3.10/config-scripts/cups-defaults.m4
+--- cups-1.3.10/config-scripts/cups-defaults.m4.str2536	2008-04-14 19:10:27.000000000 +0100
++++ cups-1.3.10/config-scripts/cups-defaults.m4	2009-04-20 17:27:31.000000000 +0100
 @@ -43,6 +43,14 @@ AC_ARG_WITH(log_file_perm, [  --with-log
  AC_SUBST(CUPS_LOG_FILE_PERM)
  AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
@@ -33,9 +33,9 @@
  dnl Default Browsing
  AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
  if test "x$enable_browsing" = xno; then
-diff -up cups-1.3.8/configure.str2536 cups-1.3.8/configure
---- cups-1.3.8/configure.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/configure	2008-09-10 16:18:16.000000000 +0100
+diff -up cups-1.3.10/configure.str2536 cups-1.3.10/configure
+--- cups-1.3.10/configure.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/configure	2009-04-20 17:27:56.000000000 +0100
 @@ -782,6 +782,7 @@ LAUNCHDLIBS
  LANGUAGES
  CUPS_CONFIG_FILE_PERM
@@ -44,7 +44,7 @@
  CUPS_BROWSING
  CUPS_BROWSE_LOCAL_PROTOCOLS
  CUPS_BROWSE_REMOTE_PROTOCOLS
-@@ -1471,6 +1472,7 @@ Optional Packages:
+@@ -1474,6 +1475,7 @@ Optional Packages:
    --with-languages        set installed languages, default=all
    --with-config-file-perm set default ConfigFilePerm value, default=0640
    --with-log-file-perm    set default LogFilePerm value, default=0644
@@ -52,22 +52,7 @@
    --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"
    --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"
    --with-cups-user        set default user for CUPS
-@@ -9680,10 +9682,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU*)
- 		# Linux and GNU Hurd
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
-@@ -17624,6 +17626,21 @@ cat >>confdefs.h <<_ACEOF
+@@ -17929,6 +17931,21 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
@@ -89,7 +74,7 @@
  # Check whether --enable-browsing was given.
  if test "${enable_browsing+set}" = set; then
    enableval=$enable_browsing;
-@@ -19407,6 +19424,7 @@ LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim
+@@ -20067,6 +20084,7 @@ LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim
  LANGUAGES!$LANGUAGES$ac_delim
  CUPS_CONFIG_FILE_PERM!$CUPS_CONFIG_FILE_PERM$ac_delim
  CUPS_LOG_FILE_PERM!$CUPS_LOG_FILE_PERM$ac_delim
@@ -97,31 +82,18 @@
  CUPS_BROWSING!$CUPS_BROWSING$ac_delim
  CUPS_BROWSE_LOCAL_PROTOCOLS!$CUPS_BROWSE_LOCAL_PROTOCOLS$ac_delim
  CUPS_BROWSE_REMOTE_PROTOCOLS!$CUPS_BROWSE_REMOTE_PROTOCOLS$ac_delim
-@@ -19432,7 +19450,6 @@ PHPCONFIG!$PHPCONFIG$ac_delim
- PHPDIR!$PHPDIR$ac_delim
+@@ -20095,7 +20113,7 @@ PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
- INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
--UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19474,11 +19491,12 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -up cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536 cups-1.3.8/doc/help/ref-cupsd-conf.html.in
---- cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536	2008-06-17 19:27:16.000000000 +0100
-+++ cups-1.3.8/doc/help/ref-cupsd-conf.html.in	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/doc/help/ref-cupsd-conf.html.in.str2536 cups-1.3.10/doc/help/ref-cupsd-conf.html.in
+--- cups-1.3.10/doc/help/ref-cupsd-conf.html.in.str2536	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/doc/help/ref-cupsd-conf.html.in	2009-04-20 17:27:31.000000000 +0100
 @@ -1115,6 +1115,57 @@ printer.</P>
  </UL>
  
@@ -180,9 +152,9 @@
  <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
  
  <H3>Examples</H3>
-diff -up cups-1.3.8/man/cupsd.conf.man.in.str2536 cups-1.3.8/man/cupsd.conf.man.in
---- cups-1.3.8/man/cupsd.conf.man.in.str2536	2008-06-16 18:41:11.000000000 +0100
-+++ cups-1.3.8/man/cupsd.conf.man.in	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/man/cupsd.conf.man.in.str2536 cups-1.3.10/man/cupsd.conf.man.in
+--- cups-1.3.10/man/cupsd.conf.man.in.str2536	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/man/cupsd.conf.man.in	2009-04-20 17:27:31.000000000 +0100
 @@ -275,6 +275,15 @@ ErrorLog syslog
  .br
  Specifies the error log filename.
@@ -199,18 +171,18 @@
  FileDevice Yes
  .TP 5
  FileDevice No
-diff -up cups-1.3.8/scheduler/conf.c.str2536 cups-1.3.8/scheduler/conf.c
---- cups-1.3.8/scheduler/conf.c.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:17:52.000000000 +0100
-@@ -21,6 +21,7 @@
+diff -up cups-1.3.10/scheduler/conf.c.str2536 cups-1.3.10/scheduler/conf.c
+--- cups-1.3.10/scheduler/conf.c.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/scheduler/conf.c	2009-04-20 17:27:31.000000000 +0100
+@@ -23,6 +23,7 @@
   *   get_addr_and_mask()      - Get an IP address and netmask.
-  *   parse_aaa()              - Parse authentication, authorization, and
-  *                              access control lines.
+  *   parse_aaa()              - Parse authentication, authorization, and access
+  *                              control lines.
 + *   parse_fatal_errors()     - Parse FatalErrors values in a string.
   *   parse_groups()           - Parse system group names in a string.
   *   parse_protocols()        - Parse browse protocols in a string.
   *   read_configuration()     - Read a configuration file.
-@@ -192,6 +193,7 @@ static int		get_addr_and_mask(const char
+@@ -197,6 +198,7 @@ static int		get_addr_and_mask(const char
  			                  unsigned *mask);
  static int		parse_aaa(cupsd_location_t *loc, char *line,
  			          char *value, int linenum);
@@ -218,7 +190,7 @@
  static int		parse_groups(const char *s);
  static int		parse_protocols(const char *s);
  static int		read_configuration(cups_file_t *fp);
-@@ -512,6 +514,7 @@ cupsdReadConfiguration(void)
+@@ -540,6 +542,7 @@ cupsdReadConfiguration(void)
    */
  
    ConfigFilePerm        = CUPS_DEFAULT_CONFIG_FILE_PERM;
@@ -226,7 +198,7 @@
    DefaultAuthType       = CUPSD_AUTH_BASIC;
  #ifdef HAVE_SSL
    DefaultEncryption     = HTTP_ENCRYPT_REQUIRED;
-@@ -782,30 +785,31 @@ cupsdReadConfiguration(void)
+@@ -861,30 +864,31 @@ cupsdReadConfiguration(void)
  
    snprintf(temp, sizeof(temp), "%s/rss", CacheDir);
  
@@ -282,7 +254,7 @@
      return (0);
  
   /*
-@@ -855,7 +859,8 @@ cupsdReadConfiguration(void)
+@@ -934,7 +938,8 @@ cupsdReadConfiguration(void)
      * is under the spool directory or does not exist...
      */
  
@@ -292,7 +264,7 @@
        return (0);
    }
  
-@@ -872,8 +877,10 @@ cupsdReadConfiguration(void)
+@@ -951,8 +956,10 @@ cupsdReadConfiguration(void)
    if (MaxClients > (MaxFDs / 3) || MaxClients <= 0)
    {
      if (MaxClients > 0)
@@ -305,7 +277,7 @@
  
      MaxClients = MaxFDs / 3;
    }
-@@ -1115,7 +1122,8 @@ cupsdReadConfiguration(void)
+@@ -1194,7 +1201,8 @@ cupsdReadConfiguration(void)
      {
        cupsdLogMessage(CUPSD_LOG_EMERG,
                        "Unable to load MIME database from \'%s\'!", ServerRoot);
@@ -315,7 +287,7 @@
      }
  
      cupsdLogMessage(CUPSD_LOG_INFO,
-@@ -1912,6 +1920,86 @@ parse_aaa(cupsd_location_t *loc,	/* I - 
+@@ -2037,6 +2045,86 @@ parse_aaa(cupsd_location_t *loc,	/* I - 
  
  
  /*
@@ -402,7 +374,7 @@
   * 'parse_groups()' - Parse system group names in a string.
   */
  
-@@ -2740,7 +2828,8 @@ read_configuration(cups_file_t *fp)	/* I
+@@ -2868,7 +2956,8 @@ read_configuration(cups_file_t *fp)	/* I
  	cupsdLogMessage(CUPSD_LOG_WARN,
  	                "Unknown default authorization type %s on line %d.",
  	                value, linenum);
@@ -412,7 +384,7 @@
        }
      }
  #ifdef HAVE_SSL
-@@ -2761,7 +2850,8 @@ read_configuration(cups_file_t *fp)	/* I
+@@ -2889,7 +2978,8 @@ read_configuration(cups_file_t *fp)	/* I
  	cupsdLogMessage(CUPSD_LOG_WARN,
  	                "Unknown default encryption %s on line %d.",
  	                value, linenum);
@@ -422,7 +394,7 @@
        }
      }
  #endif /* HAVE_SSL */
-@@ -3148,7 +3238,8 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3278,7 +3368,8 @@ read_location(cups_file_t *fp,		/* I - C
        if (!value)
        {
          cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
@@ -432,7 +404,7 @@
        }
        
        if ((loc = cupsdCopyLocation(&parent)) == NULL)
-@@ -3196,7 +3287,8 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3326,7 +3417,8 @@ read_location(cups_file_t *fp,		/* I - C
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Unknown Location directive %s on line %d.",
  	              line, linenum);
@@ -442,7 +414,7 @@
      }
    }
  
-@@ -3204,7 +3296,7 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3334,7 +3426,7 @@ read_location(cups_file_t *fp,		/* I - C
                    "Unexpected end-of-file at line %d while reading location!",
                    linenum);
  
@@ -451,7 +423,7 @@
  }
  
  
-@@ -3262,7 +3354,8 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3392,7 +3484,8 @@ read_policy(cups_file_t *fp,		/* I - Con
        if (!value)
        {
          cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
@@ -461,7 +433,7 @@
        }
        
       /*
-@@ -3336,7 +3429,8 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3466,7 +3559,8 @@ read_policy(cups_file_t *fp,		/* I - Con
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Missing <Limit ops> directive before %s on line %d.",
                        line, linenum);
@@ -471,7 +443,7 @@
      }
      else if (!parse_aaa(op, line, value, linenum))
      {
-@@ -3349,7 +3443,8 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3479,7 +3573,8 @@ read_policy(cups_file_t *fp,		/* I - Con
  	                "Unknown Policy directive %s on line %d.",
  	                line, linenum);
  
@@ -481,7 +453,7 @@
      }
    }
  
-@@ -3357,7 +3452,7 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3487,7 +3582,7 @@ read_policy(cups_file_t *fp,		/* I - Con
                    "Unexpected end-of-file at line %d while reading policy \"%s\"!",
                    linenum, policy);
  
@@ -490,9 +462,9 @@
  }
  
  
-diff -up cups-1.3.8/scheduler/conf.h.str2536 cups-1.3.8/scheduler/conf.h
---- cups-1.3.8/scheduler/conf.h.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/scheduler/conf.h.str2536 cups-1.3.10/scheduler/conf.h
+--- cups-1.3.10/scheduler/conf.h.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/scheduler/conf.h	2009-04-20 17:27:31.000000000 +0100
 @@ -38,6 +38,19 @@ typedef enum
  
  
@@ -513,7 +485,7 @@
   * Printcap formats...
   */
  
-@@ -124,6 +137,8 @@ VAR int			ClassifyOverride	VALUE(0),
+@@ -140,6 +153,8 @@ VAR int			ClassifyOverride	VALUE(0),
  					/* Allow overrides? */
  			ConfigFilePerm		VALUE(0640),
  					/* Permissions for config files */
@@ -522,9 +494,9 @@
  			LogFilePerm		VALUE(0644),
  					/* Permissions for log files */
  			LogLevel		VALUE(CUPSD_LOG_ERROR),
-diff -up cups-1.3.8/scheduler/dirsvc.c.str2536 cups-1.3.8/scheduler/dirsvc.c
---- cups-1.3.8/scheduler/dirsvc.c.str2536	2008-07-18 21:30:23.000000000 +0100
-+++ cups-1.3.8/scheduler/dirsvc.c	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/scheduler/dirsvc.c.str2536 cups-1.3.10/scheduler/dirsvc.c
+--- cups-1.3.10/scheduler/dirsvc.c.str2536	2009-02-12 22:23:31.000000000 +0000
++++ cups-1.3.10/scheduler/dirsvc.c	2009-04-20 17:27:31.000000000 +0100
 @@ -954,9 +954,14 @@ cupsdStartBrowsing(void)
  			strerror(errno));
  	BrowseLocalProtocols &= ~BROWSE_CUPS;
@@ -681,26 +653,10 @@
  	}
        }
      }
-diff -up cups-1.3.8/scheduler/listen.c.str2536 cups-1.3.8/scheduler/listen.c
---- cups-1.3.8/scheduler/listen.c.str2536	2007-08-13 18:20:14.000000000 +0100
-+++ cups-1.3.8/scheduler/listen.c	2008-09-10 16:16:44.000000000 +0100
-@@ -150,10 +150,15 @@ cupsdStartListening(void)
-     httpAddrFreeList(ServerAddrs);
- 
-   if ((ServerAddrs = httpAddrGetList(ServerName, AF_UNSPEC, NULL)) == NULL)
-+  {
-     cupsdLogMessage(CUPSD_LOG_ERROR,
-                     "Unable to find IP address for server name \"%s\"!\n",
- 		    ServerName);
- 
-+    if (FatalErrors & CUPSD_FATAL_LISTEN)
-+      cupsdEndProcess(getpid(), 0);
-+  }
-+
-  /*
-   * Setup socket listeners...
-   */
-@@ -194,6 +199,20 @@ cupsdStartListening(void)
+diff -up cups-1.3.10/scheduler/listen.c.str2536 cups-1.3.10/scheduler/listen.c
+--- cups-1.3.10/scheduler/listen.c.str2536	2009-01-15 19:12:15.000000000 +0000
++++ cups-1.3.10/scheduler/listen.c	2009-04-20 17:27:31.000000000 +0100
+@@ -182,6 +182,20 @@ cupsdStartListening(void)
  	cupsdLogMessage(CUPSD_LOG_ERROR,
  			"Unable to open listen socket for address %s:%d - %s.",
  			s, p, strerror(errno));
@@ -721,7 +677,7 @@
  	continue;
        }
  
-@@ -278,6 +297,10 @@ cupsdStartListening(void)
+@@ -266,6 +280,10 @@ cupsdStartListening(void)
  			s, p, strerror(errno));
  	close(lis->fd);
  	lis->fd = -1;
@@ -732,7 +688,7 @@
  	continue;
        }
  
-@@ -290,7 +313,14 @@ cupsdStartListening(void)
+@@ -278,7 +296,14 @@ cupsdStartListening(void)
  	cupsdLogMessage(CUPSD_LOG_ERROR,
  			"Unable to listen for clients on address %s:%d - %s.",
  			s, p, strerror(errno));
@@ -748,7 +704,7 @@
        }
      }
  
-@@ -339,11 +369,8 @@ cupsdStartListening(void)
+@@ -327,11 +352,8 @@ cupsdStartListening(void)
                      "No Listen or Port lines were found to allow access via "
  		    "localhost!");
  
@@ -762,9 +718,9 @@
    }
  
   /*
-diff -up cups-1.3.8/scheduler/log.c.str2536 cups-1.3.8/scheduler/log.c
---- cups-1.3.8/scheduler/log.c.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/scheduler/log.c	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/scheduler/log.c.str2536 cups-1.3.10/scheduler/log.c
+--- cups-1.3.10/scheduler/log.c.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/scheduler/log.c	2009-04-20 17:27:31.000000000 +0100
 @@ -546,7 +546,20 @@ check_log_file(cups_file_t **lf,	/* IO -
  
        if (!strncmp(filename, CUPS_LOGDIR, strlen(CUPS_LOGDIR)))


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- cups.spec	9 Mar 2009 16:00:32 -0000	1.457
+++ cups.spec	21 Apr 2009 12:49:26 -0000	1.458
@@ -6,8 +6,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.9
-Release: 9%{?svn:.svn%{svn}}%{?dist}
+Version: 1.3.10
+Release: 1%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -27,8 +27,6 @@
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
-Patch4: cups-ext.patch
-Patch5: cups-includeifexists.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
@@ -48,15 +46,8 @@
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2101.patch
 Patch24: cups-str2536.patch
-Patch25: cups-str2988.patch
 Patch26: cups-str3023.patch
-Patch27: cups-CVE-2008-5183.patch
-Patch28: cups-CVE-2008-5286.patch
 Patch29: cups-str2831.patch
-Patch30: cups-str3077.patch
-Patch31: cups-str3078.patch
-Patch32: cups-str3059.patch
-Patch33: cups-str3055.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -67,9 +58,6 @@
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
 Prereq: /usr/sbin/alternatives
 %endif
-%if %{?svn:1}%{!?svn:0}
-Requires: poppler-utils
-%endif
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
@@ -88,6 +76,7 @@
 BuildRequires: libtiff-devel
 BuildRequires: krb5-devel
 BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: poppler-utils
 
 %if %lspp
 BuildPrereq: libselinux-devel >= 1.23
@@ -110,6 +99,8 @@
 # Require the package here so that we know /etc/portreserve/ exists.
 Requires: portreserve
 
+Requires: poppler-utils
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -170,8 +161,6 @@
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
-%patch4 -p1 -b .ext
-%patch5 -p1 -b .includeifexists
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
@@ -191,15 +180,8 @@
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2101
 %patch24 -p1 -b .str2536
-%patch25 -p1 -b .str2988
 %patch26 -p1 -b .str3023
-%patch27 -p1 -b .CVE-2008-5183
-%patch28 -p1 -b .CVE-2008-5286
 %patch29 -p1 -b .str2831
-%patch30 -p1 -b .str3077
-%patch31 -p1 -b .str3078
-%patch32 -p1 -b .str3059
-%patch33 -p1 -b .str3055
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -221,7 +203,8 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--enable-pdftops --with-pdftops=pdftops \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	--with-php=/usr/bin/php-cgi \
 	localedir=%{_datadir}/locale
 
@@ -491,6 +474,15 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-1
+- 1.3.10.  No longer need ext, includeifexists, str2988,
+  CVE-2008-5183, CVE-2008-5286, str3077, str3078, str3059, str3055 patches.
+- Requires poppler-utils.
+- NOTE: If your CUPS server is accessed using a hostname or hostnames
+  not known to the server itself you must add "ServerAlias hostname"
+  for each such name.  The special line "ServerAlias *" disables checking
+  (but this allows DNS rebinding attacks).
+
 * Mon Mar  9 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-9
 - Fixed getnameddest patch (bug #481481, STR #3082).
 - Handle https:// device URIs (bug #478677, STR #3122).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	10 Oct 2008 09:44:33 -0000	1.45
+++ sources	21 Apr 2009 12:49:26 -0000	1.46
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-cf63f451c356e6cabb08972d4d11c365  cups-1.3.9-source.tar.bz2
+84fffe96b8537c81a463faccead80026  cups-1.3.10-source.tar.bz2


--- cups-CVE-2008-5183.patch DELETED ---


--- cups-CVE-2008-5286.patch DELETED ---


--- cups-ext.patch DELETED ---


--- cups-includeifexists.patch DELETED ---


--- cups-str2988.patch DELETED ---


--- cups-str3059.patch DELETED ---


--- cups-str3077.patch DELETED ---


--- cups-str3078.patch DELETED ---



From twaugh at fedoraproject.org  Tue Apr 21 12:49:37 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 21 Apr 2009 12:49:37 +0000 (UTC)
Subject: rpms/cups/F-9 .cvsignore, 1.42, 1.43 cups-lspp.patch, 1.37,
	1.38 cups-no-gzip-man.patch, 1.1,
	1.2 cups-serverbin-compat.patch, 1.4, 1.5 cups-str2536.patch,
	1.1, 1.2 cups.spec, 1.437, 1.438 sources, 1.45,
	1.46 cups-CVE-2008-5183.patch, 1.1,
	NONE cups-CVE-2008-5286.patch, 1.1, NONE cups-ext.patch, 1.1,
	NONE cups-includeifexists.patch, 1.1, NONE cups-str2988.patch,
	1.1, NONE cups-str3055.patch, 1.1, NONE cups-str3059.patch, 1.1,
	NONE cups-str3077.patch, 1.1, NONE cups-str3078.patch, 1.1, NONE
Message-ID: <20090421124937.EADA97013C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17248

Modified Files:
	.cvsignore cups-lspp.patch cups-no-gzip-man.patch 
	cups-serverbin-compat.patch cups-str2536.patch cups.spec 
	sources 
Removed Files:
	cups-CVE-2008-5183.patch cups-CVE-2008-5286.patch 
	cups-ext.patch cups-includeifexists.patch cups-str2988.patch 
	cups-str3055.patch cups-str3059.patch cups-str3077.patch 
	cups-str3078.patch 
Log Message:
* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-1
- 1.3.10.  No longer need ext, includeifexists, str2988,
  CVE-2008-5183, CVE-2008-5286, str3077, str3078, str3059, str3055 patches.
- Requires poppler-utils.
- NOTE: If your CUPS server is accessed using a hostname or hostnames
  not known to the server itself you must add "ServerAlias hostname"
  for each such name.  The special line "ServerAlias *" disables checking
  (but this allows DNS rebinding attacks).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	10 Oct 2008 08:43:51 -0000	1.42
+++ .cvsignore	21 Apr 2009 12:49:27 -0000	1.43
@@ -34,3 +34,4 @@
 cups-1.3.7-source.tar.bz2
 cups-1.3.8-source.tar.bz2
 cups-1.3.9-source.tar.bz2
+cups-1.3.10-source.tar.bz2

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-lspp.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cups-lspp.patch	28 Jan 2009 17:50:02 -0000	1.37
+++ cups-lspp.patch	21 Apr 2009 12:49:28 -0000	1.38
@@ -1,7 +1,7 @@
-diff -up cups-1.3.9/config.h.in.lspp cups-1.3.9/config.h.in
---- cups-1.3.9/config.h.in.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/config.h.in	2009-01-28 17:37:32.000000000 +0000
-@@ -551,6 +551,13 @@
+diff -up cups-1.3.10/config.h.in.lspp cups-1.3.10/config.h.in
+--- cups-1.3.10/config.h.in.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/config.h.in	2009-04-20 18:16:51.000000000 +0100
+@@ -567,6 +567,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -15,9 +15,9 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up /dev/null cups-1.3.9/config-scripts/cups-lspp.m4
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/config-scripts/cups-lspp.m4	2009-01-28 17:37:32.000000000 +0000
+diff -up /dev/null cups-1.3.10/config-scripts/cups-lspp.m4
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/config-scripts/cups-lspp.m4	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@
 +            ;;
 +    esac
 +fi
-diff -up cups-1.3.9/configure.in.lspp cups-1.3.9/configure.in
---- cups-1.3.9/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3.9/configure.in	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/configure.in.lspp cups-1.3.10/configure.in
+--- cups-1.3.10/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3.10/configure.in	2009-04-20 18:16:51.000000000 +0100
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -67,10 +67,10 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-1.3.9/configure.lspp cups-1.3.9/configure
---- cups-1.3.9/configure.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/configure	2009-01-28 17:37:32.000000000 +0000
-@@ -807,6 +807,8 @@ PHP
+diff -up cups-1.3.10/configure.lspp cups-1.3.10/configure
+--- cups-1.3.10/configure.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/configure	2009-04-20 18:17:25.000000000 +0100
+@@ -809,6 +809,8 @@ PHP
  PHPCONFIG
  PHPDIR
  PYTHON
@@ -79,15 +79,15 @@
  INSTALL_LANGUAGES
  UNINSTALL_LANGUAGES
  LIBOBJS
-@@ -1430,6 +1432,7 @@ Optional Features:
-                           enable UseNetworkDefault by default, default=auto
+@@ -1433,6 +1435,7 @@ Optional Features:
    --enable-raw-printing   enable raw printing by default, default=auto
+   --enable-pap            build with AppleTalk support, default=auto
    --enable-pdftops        build pdftops filter, default=auto
 +  --enable-lspp           turn on auditing and label support, default=no
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -18862,6 +18865,412 @@ fi
+@@ -19215,6 +19218,412 @@ fi
  
  
  
@@ -500,34 +500,37 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-@@ -19756,7 +20165,7 @@ PHP!$PHP$ac_delim
+@@ -20111,9 +20520,10 @@ PHP!$PHP$ac_delim
  PHPCONFIG!$PHPCONFIG$ac_delim
  PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
--INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
 +LIBAUDIT!$LIBAUDIT$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19798,12 +20207,14 @@ _ACEOF
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 99; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -20152,13 +20562,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
 +LIBSELINUX!$LIBSELINUX$ac_delim
-+INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
+ INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
  UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -up cups-1.3.9/cups/cups.h.lspp cups-1.3.9/cups/cups.h
---- cups-1.3.9/cups/cups.h.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/cups/cups.h	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/cups/cups.h.lspp cups-1.3.10/cups/cups.h
+--- cups-1.3.10/cups/cups.h.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/cups/cups.h	2009-04-20 18:16:51.000000000 +0100
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -551,9 +554,9 @@
  /*
   * Types and structures...
   */
-diff -up cups-1.3.9/data/Makefile.lspp cups-1.3.9/data/Makefile
---- cups-1.3.9/data/Makefile.lspp	2007-10-10 23:00:43.000000000 +0100
-+++ cups-1.3.9/data/Makefile	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/data/Makefile.lspp cups-1.3.10/data/Makefile
+--- cups-1.3.10/data/Makefile.lspp	2008-11-12 19:35:30.000000000 +0000
++++ cups-1.3.10/data/Makefile	2009-04-20 18:16:51.000000000 +0100
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -566,9 +569,9 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.3.9/data/mls
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/data/mls	2009-01-28 17:37:32.000000000 +0000
+diff -up /dev/null cups-1.3.10/data/mls
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/data/mls	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -831,9 +834,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.9/data/selinux
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/data/selinux	2009-01-28 17:37:32.000000000 +0000
+diff -up /dev/null cups-1.3.10/data/selinux
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/data/selinux	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1096,9 +1099,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.9/data/te
---- /dev/null	2009-01-28 08:58:18.489189414 +0000
-+++ cups-1.3.9/data/te	2009-01-28 17:37:32.000000000 +0000
+diff -up /dev/null cups-1.3.10/data/te
+--- /dev/null	2009-04-20 09:03:01.028189351 +0100
++++ cups-1.3.10/data/te	2009-04-20 18:16:51.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1361,9 +1364,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.3.9/filter/common.c.lspp cups-1.3.9/filter/common.c
---- cups-1.3.9/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.9/filter/common.c	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/filter/common.c.lspp cups-1.3.10/filter/common.c
+--- cups-1.3.10/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.10/filter/common.c	2009-04-20 18:16:51.000000000 +0100
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1532,9 +1535,167 @@
  
  
  /*
-diff -up cups-1.3.9/Makedefs.in.lspp cups-1.3.9/Makedefs.in
---- cups-1.3.9/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
-+++ cups-1.3.9/Makedefs.in	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/filter/pstops.c.lspp cups-1.3.10/filter/pstops.c
+--- cups-1.3.10/filter/pstops.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/filter/pstops.c	2009-04-20 18:16:51.000000000 +0100
+@@ -3230,6 +3230,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
+ {
+   const char	*classification;	/* CLASSIFICATION environment variable */
+   const char	*ptr;			/* Temporary string pointer */
++#ifdef WITH_LSPP
++  int           i,                      /* counter */
++                n,                      /* counter */
++                lines,                  /* number of lines needed */
++                line_len,               /* index into tmp_label */
++                label_len,              /* length of the label in characters */
++                label_index,            /* index into the label */
++                longest,                /* length of the longest line */
++                longest_line,           /* index to the longest line */
++                max_width;              /* maximum width in characters */
++  char          **wrapped_label;        /* label with line breaks */
++#endif /* WITH_LSPP */
+ 
+ 
+  /*
+@@ -3252,6 +3264,124 @@ write_label_prolog(pstops_doc_t *doc,	/*
+     return;
+   }
+ 
++#ifdef WITH_LSPP
++  if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL)
++  {
++   /*
++    * Based on the 12pt fixed width font below determine the max_width
++    */
++    max_width = width / 8;
++    longest_line = 0;
++    longest = 0;
++    classification += 5; // Skip the "LSPP:"
++    label_len = strlen(classification);
++
++    if (label_len > max_width)
++    {
++      lines = 1 + (int)(label_len / max_width);
++      line_len = (int)(label_len / lines);
++      wrapped_label = malloc(sizeof(wrapped_label) * lines);
++      label_index = i = n = 0;
++      while (classification[label_index])
++      {
++        if ((label_index + line_len) > label_len)
++          break;
++        switch (classification[label_index + line_len + i])
++        {
++          case ':':
++          case ',':
++          case '-':
++            i++;
++            wrapped_label[n++] = strndup(&classification[label_index], (line_len + i));
++            label_index += line_len + i;
++            i = 0;
++            break;
++          default:
++            i++;
++            break;
++        }
++        if ((i + line_len) == max_width)
++        {
++          wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i));
++          label_index = label_index + line_len + i;
++          i = 0;
++        }
++      }
++      wrapped_label[n] = strndup(&classification[label_index], label_len - label_index);
++    }
++    else
++    {
++      lines = 1;
++      wrapped_label = malloc(sizeof(wrapped_label));
++      wrapped_label[0] = (char*)classification;
++    }
++
++    for (n = 0; n < lines; n++ )
++    {
++      printf("userdict/ESPp%c(", ('a' + n));
++      for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++)
++        if (*ptr < 32 || *ptr > 126)
++          printf("\\%03o", *ptr);
++        else
++        {
++          if (*ptr == '(' || *ptr == ')' || *ptr == '\\')
++            putchar('\\');
++
++          printf("%c", *ptr);
++        }
++      if (i > longest)
++      {
++        longest = i;
++        longest_line = n;
++      }
++      printf(")put\n");
++    }
++
++   /*
++    * For LSPP use a fixed width font so that line wrapping can be calculated
++    */
++
++    puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put");
++
++   /*
++    * Finally, the procedure to write the labels on the page...
++    */
++
++    printf("userdict/ESPwl{\n"
++           "  ESPlf setfont\n");
++    printf("  ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ",
++           'a' + longest_line, width * 0.5f);
++    for (n = 1; n < lines; n++)
++      printf(" dup");
++    printf("\n  1 setgray\n");
++    printf("  dup 6 sub %.0f %d index %.0f ESPrf\n",
++           (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines));
++    printf("  dup 6 sub %.0f %d index %.0f ESPrf\n",
++           (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines));
++    printf("  0 setgray\n");
++    printf("  dup 6 sub %.0f %d index %.0f ESPrs\n",
++           (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines));
++    printf("  dup 6 sub %.0f %d index %.0f ESPrs\n",
++           (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines));
++    for (n = 0; n < lines; n ++)
++    {
++      printf("  dup %.0f moveto ESPp%c show\n",
++             bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n);
++      printf("  %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n);
++    }
++    printf("  pop\n"
++           "}bind put\n");
++
++   /*
++    * Do some clean up at the end of the LSPP special case
++    */
++    free(wrapped_label);
++
++  }
++  else
++  {
++#endif /* !WITH_LSPP */
++
+  /*
+   * Set the classification + page label string...
+   */
+@@ -3330,7 +3460,10 @@ write_label_prolog(pstops_doc_t *doc,	/*
+   doc_printf(doc, "  %.0f moveto ESPpl show\n", top - 14.0);
+   doc_puts(doc, "pop\n");
+   doc_puts(doc, "}bind put\n");
++  }
++#ifdef WITH_LSPP
+ }
++#endif /* WITH_LSPP */
+ 
+ 
+ /*
+diff -up cups-1.3.10/Makedefs.in.lspp cups-1.3.10/Makedefs.in
+--- cups-1.3.10/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
++++ cups-1.3.10/Makedefs.in	2009-04-20 18:16:51.000000000 +0100
 @@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1544,13 +1705,13 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
-diff -up cups-1.3.9/scheduler/client.c.lspp cups-1.3.9/scheduler/client.c
---- cups-1.3.9/scheduler/client.c.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/client.c	2009-01-28 17:37:32.000000000 +0000
-@@ -40,12 +40,14 @@
-  *   pipe_command()          - Pipe the output of a command to the remote client.
-  *   write_file()            - Send a file via HTTP.
-  *   write_pipe()            - Flag that data is available on the CGI pipe.
+diff -up cups-1.3.10/scheduler/client.c.lspp cups-1.3.10/scheduler/client.c
+--- cups-1.3.10/scheduler/client.c.lspp	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/client.c	2009-04-20 18:16:51.000000000 +0100
+@@ -43,12 +43,14 @@
+  *   valid_host()           - Is the Host: field valid?
+  *   write_file()           - Send a file via HTTP.
+  *   write_pipe()           - Flag that data is available on the CGI pipe.
 + *   client_pid_to_auid()    - Get the audit login uid of the client.
   */
  
@@ -1562,7 +1723,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -77,6 +79,12 @@ extern const char *cssmErrorString(int e
+@@ -80,6 +82,12 @@ extern const char *cssmErrorString(int e
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1575,7 +1736,7 @@
  
  /*
   * Local functions...
-@@ -351,6 +359,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -346,6 +354,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
      }
    }
  
@@ -1633,7 +1794,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -741,6 +800,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -736,6 +795,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1647,7 +1808,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2034,6 +2100,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2060,6 +2126,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1715,7 +1876,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4305,6 +4432,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4338,6 +4465,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1766,9 +1927,9 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -up cups-1.3.9/scheduler/client.h.lspp cups-1.3.9/scheduler/client.h
---- cups-1.3.9/scheduler/client.h.lspp	2007-10-22 19:52:13.000000000 +0100
-+++ cups-1.3.9/scheduler/client.h	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/scheduler/client.h.lspp cups-1.3.10/scheduler/client.h
+--- cups-1.3.10/scheduler/client.h.lspp	2009-01-15 19:12:15.000000000 +0000
++++ cups-1.3.10/scheduler/client.h	2009-04-20 18:16:51.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1794,7 +1955,7 @@
  };
  
  #define HTTP(con) &((con)->http)
-@@ -129,6 +140,9 @@ extern void	cupsdStartListening(void);
+@@ -127,6 +138,9 @@ extern void	cupsdStartListening(void);
  extern void	cupsdStopListening(void);
  extern void	cupsdUpdateCGI(void);
  extern void	cupsdWriteClient(cupsd_client_t *con);
@@ -1804,10 +1965,10 @@
  
  
  /*
-diff -up cups-1.3.9/scheduler/conf.c.lspp cups-1.3.9/scheduler/conf.c
---- cups-1.3.9/scheduler/conf.c.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/conf.c	2009-01-28 17:37:32.000000000 +0000
-@@ -27,6 +27,7 @@
+diff -up cups-1.3.10/scheduler/conf.c.lspp cups-1.3.10/scheduler/conf.c
+--- cups-1.3.10/scheduler/conf.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/conf.c	2009-04-20 18:16:51.000000000 +0100
+@@ -29,6 +29,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
   *   read_policy()            - Read a <Policy name> definition.
@@ -1815,7 +1976,7 @@
   */
  
  /*
-@@ -48,6 +49,9 @@
+@@ -50,6 +51,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
  
@@ -1825,7 +1986,7 @@
  
  /*
   * Configuration variable structure...
-@@ -161,6 +165,10 @@ static const cupsd_var_t	variables[] =
+@@ -163,6 +167,10 @@ static const cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
    { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1836,7 +1997,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -370,6 +378,9 @@ cupsdReadConfiguration(void)
+@@ -376,6 +384,9 @@ cupsdReadConfiguration(void)
  		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
@@ -1846,9 +2007,9 @@
  
  
   /*
-@@ -632,6 +643,25 @@ cupsdReadConfiguration(void)
- 
-   RunUser = getuid();
+@@ -645,6 +656,25 @@ cupsdReadConfiguration(void)
+   cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
+                   RemoteAccessEnabled ? "enabled" : "disabled");
  
 +#ifdef WITH_LSPP
 +  if (AuditLog != -1)
@@ -1872,7 +2033,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -911,11 +941,23 @@ cupsdReadConfiguration(void)
+@@ -975,11 +1005,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1897,7 +2058,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3314,6 +3356,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3429,6 +3471,18 @@ read_location(cups_file_t *fp,		/* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -1916,10 +2077,10 @@
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-1.3.9/scheduler/conf.h.lspp cups-1.3.9/scheduler/conf.h
---- cups-1.3.9/scheduler/conf.h.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/conf.h	2009-01-28 17:37:32.000000000 +0000
-@@ -208,6 +208,12 @@ VAR char		*ServerKey		VALUE(NULL);
+diff -up cups-1.3.10/scheduler/conf.h.lspp cups-1.3.10/scheduler/conf.h
+--- cups-1.3.10/scheduler/conf.h.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/conf.h	2009-04-20 18:16:51.000000000 +0100
+@@ -224,6 +224,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1932,7 +2093,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -226,6 +232,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -242,6 +248,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1942,9 +2103,9 @@
  
  /*
   * Prototypes...
-diff -up cups-1.3.9/scheduler/ipp.c.lspp cups-1.3.9/scheduler/ipp.c
---- cups-1.3.9/scheduler/ipp.c.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/scheduler/ipp.c.lspp cups-1.3.10/scheduler/ipp.c
+--- cups-1.3.10/scheduler/ipp.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/ipp.c	2009-04-20 18:16:51.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1988,7 +2149,7 @@
  static int	check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
  static ipp_attribute_t	*copy_attribute(ipp_t *to, ipp_attribute_t *attr,
  		                        int quickcopy);
-@@ -1270,6 +1285,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1272,6 +1287,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -2010,7 +2171,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1486,6 +1516,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1488,6 +1518,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -2115,7 +2276,7 @@
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1494,6 +1622,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1496,6 +1624,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      return (NULL);
    }
  
@@ -2148,7 +2309,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1699,6 +1853,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1701,6 +1855,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
        attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
        attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
      }
@@ -2178,7 +2339,7 @@
  
      job->job_sheets = attr;
  
-@@ -1729,6 +1906,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1731,6 +1908,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                		    "job-sheets=\"%s,none\", "
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -2188,7 +2349,7 @@
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1747,6 +1927,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1749,6 +1929,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, attr->values[0].string.text,
  			 attr->values[1].string.text, job->username);
@@ -2198,7 +2359,7 @@
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1767,6 +1950,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1769,6 +1952,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  			    "job-originating-user-name=\"%s\"",
  	        	    job->id, attr->values[0].string.text,
  			    attr->values[1].string.text, job->username);
@@ -2208,7 +2369,7 @@
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1807,9 +1993,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1809,9 +1995,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                  "job-sheets=\"%s\", "
  			  "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -2261,7 +2422,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3522,6 +3751,103 @@ check_rss_recipient(
+@@ -3524,6 +3753,103 @@ check_rss_recipient(
  }
  
  
@@ -2365,7 +2526,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4043,6 +4369,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4033,6 +4359,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -2381,7 +2542,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4078,6 +4413,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4068,6 +4403,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2464,7 +2625,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4172,6 +4583,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4162,6 +4573,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2489,7 +2650,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5944,6 +6373,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -5934,6 +6363,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2512,7 +2673,7 @@
   /*
    * Copy attributes...
    */
-@@ -6149,6 +6594,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -6144,6 +6589,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2524,7 +2685,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -10286,6 +10736,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -10307,6 +10757,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2536,9 +2697,9 @@
   /*
    * Check the username against the owner...
    */
-diff -up cups-1.3.9/scheduler/job.c.lspp cups-1.3.9/scheduler/job.c
---- cups-1.3.9/scheduler/job.c.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/job.c	2009-01-28 17:38:08.000000000 +0000
+diff -up cups-1.3.10/scheduler/job.c.lspp cups-1.3.10/scheduler/job.c
+--- cups-1.3.10/scheduler/job.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/job.c	2009-04-20 18:16:51.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2564,9 +2725,9 @@
  
  /*
   * Local globals...
-@@ -1123,6 +1134,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
-                                      IPP_TAG_INTEGER);
-   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
+@@ -1127,6 +1138,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+     goto error;
+   }
  
 +#ifdef WITH_LSPP
 +  if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL)
@@ -2582,10 +2743,10 @@
 +  }
 +#endif /* WITH_LSPP */
 +
-   if (!job->priority)
-   {
-     if ((attr = ippFindAttribute(job->attrs, "job-priority",
-@@ -1483,6 +1508,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
+                                      IPP_TAG_INTEGER);
+   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
+@@ -1491,6 +1516,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2599,7 +2760,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1501,6 +1533,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1509,6 +1541,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2676,7 +2837,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2475,6 +2577,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2483,6 +2585,21 @@ start_job(cupsd_job_t     *job,		/* I - 
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2698,7 +2859,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2746,6 +2863,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2754,6 +2871,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2805,7 +2966,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2894,6 +3111,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2902,6 +3119,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -2824,7 +2985,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3136,6 +3365,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3144,6 +3373,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      }
    }
  
@@ -2892,9 +3053,9 @@
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-diff -up cups-1.3.9/scheduler/job.h.lspp cups-1.3.9/scheduler/job.h
---- cups-1.3.9/scheduler/job.h.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/job.h	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/scheduler/job.h.lspp cups-1.3.10/scheduler/job.h
+--- cups-1.3.10/scheduler/job.h.lspp	2009-01-28 16:49:56.000000000 +0000
++++ cups-1.3.10/scheduler/job.h	2009-04-20 18:16:51.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2920,9 +3081,9 @@
  } cupsd_job_t;
  
  
-diff -up cups-1.3.9/scheduler/main.c.lspp cups-1.3.9/scheduler/main.c
---- cups-1.3.9/scheduler/main.c.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/main.c	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/scheduler/main.c.lspp cups-1.3.10/scheduler/main.c
+--- cups-1.3.10/scheduler/main.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/main.c	2009-04-20 18:16:51.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -2978,7 +3139,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1192,6 +1219,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1190,6 +1217,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -2990,9 +3151,9 @@
    return (!stop_scheduler);
  }
  
-diff -up cups-1.3.9/scheduler/printers.c.lspp cups-1.3.9/scheduler/printers.c
---- cups-1.3.9/scheduler/printers.c.lspp	2009-01-28 17:37:32.000000000 +0000
-+++ cups-1.3.9/scheduler/printers.c	2009-01-28 17:37:32.000000000 +0000
+diff -up cups-1.3.10/scheduler/printers.c.lspp cups-1.3.10/scheduler/printers.c
+--- cups-1.3.10/scheduler/printers.c.lspp	2009-04-20 18:16:51.000000000 +0100
++++ cups-1.3.10/scheduler/printers.c	2009-04-20 18:16:51.000000000 +0100
 @@ -51,6 +51,8 @@
   *                                 printing desktop tools.
   */
@@ -3013,7 +3174,7 @@
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1846,6 +1852,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1856,6 +1862,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
  		{			/* No authentication */
  		  "none"
  		};
@@ -3027,7 +3188,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1995,6 +2008,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2005,6 +2018,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }

cups-no-gzip-man.patch:

Index: cups-no-gzip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-no-gzip-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-no-gzip-man.patch	17 Mar 2006 12:10:57 -0000	1.1
+++ cups-no-gzip-man.patch	21 Apr 2009 12:49:28 -0000	1.2
@@ -1,9 +1,28 @@
---- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man	2006-02-13 02:46:10.000000000 +0000
-+++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4	2006-02-17 09:55:45.000000000 +0000
-@@ -80,10 +80,10 @@
+diff -up cups-1.3.10/config-scripts/cups-manpages.m4.no-gzip-man cups-1.3.10/config-scripts/cups-manpages.m4
+--- cups-1.3.10/config-scripts/cups-manpages.m4.no-gzip-man	2009-01-12 19:17:21.000000000 +0000
++++ cups-1.3.10/config-scripts/cups-manpages.m4	2009-04-20 17:49:31.000000000 +0100
+@@ -69,10 +69,10 @@ case "$uname" in
  		;;
- 	Linux* | GNU*)
- 		# Linux and GNU Hurd
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
+diff -up cups-1.3.10/configure.no-gzip-man cups-1.3.10/configure
+--- cups-1.3.10/configure.no-gzip-man	2009-04-16 21:02:06.000000000 +0100
++++ cups-1.3.10/configure	2009-04-20 17:49:29.000000000 +0100
+@@ -9678,10 +9678,10 @@ case "$uname" in
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
 -		MAN1EXT=1.gz
 -		MAN5EXT=5.gz
 -		MAN7EXT=7.gz

cups-serverbin-compat.patch:

Index: cups-serverbin-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-serverbin-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-serverbin-compat.patch	28 Jan 2009 17:50:02 -0000	1.4
+++ cups-serverbin-compat.patch	21 Apr 2009 12:49:29 -0000	1.5
@@ -1,9 +1,9 @@
-diff -up cups-1.3.9/scheduler/conf.c.serverbin-compat cups-1.3.9/scheduler/conf.c
---- cups-1.3.9/scheduler/conf.c.serverbin-compat	2008-09-07 22:58:01.000000000 +0100
-+++ cups-1.3.9/scheduler/conf.c	2009-01-28 17:21:14.000000000 +0000
-@@ -420,6 +420,9 @@ cupsdReadConfiguration(void)
-   cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp)));
-   cupsdSetStringf(&ServerAdmin, "root@%s", temp);
+diff -up cups-1.3.10/scheduler/conf.c.serverbin-compat cups-1.3.10/scheduler/conf.c
+--- cups-1.3.10/scheduler/conf.c.serverbin-compat	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/conf.c	2009-04-20 17:05:08.000000000 +0100
+@@ -430,6 +430,9 @@ cupsdReadConfiguration(void)
+   cupsdClearString(&ServerName);
+   cupsdClearString(&ServerAdmin);
    cupsdSetString(&ServerBin, CUPS_SERVERBIN);
 +#ifdef __x86_64__
 +  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
@@ -11,7 +11,7 @@
    cupsdSetString(&RequestRoot, CUPS_REQUESTS);
    cupsdSetString(&CacheDir, CUPS_CACHEDIR);
    cupsdSetString(&DataDir, CUPS_DATADIR);
-@@ -1114,7 +1117,12 @@ cupsdReadConfiguration(void)
+@@ -1178,7 +1181,12 @@ cupsdReadConfiguration(void)
      * Read the MIME type and conversion database...
      */
  
@@ -24,10 +24,10 @@
  
      MimeDatabase = mimeLoad(ServerRoot, temp);
  
-diff -up cups-1.3.9/scheduler/conf.h.serverbin-compat cups-1.3.9/scheduler/conf.h
---- cups-1.3.9/scheduler/conf.h.serverbin-compat	2008-02-15 23:26:51.000000000 +0000
-+++ cups-1.3.9/scheduler/conf.h	2009-01-28 17:21:14.000000000 +0000
-@@ -59,6 +59,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
+diff -up cups-1.3.10/scheduler/conf.h.serverbin-compat cups-1.3.10/scheduler/conf.h
+--- cups-1.3.10/scheduler/conf.h.serverbin-compat	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/conf.h	2009-04-20 17:03:48.000000000 +0100
+@@ -70,6 +70,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
  					/* Root directory for scheduler */
  			*ServerBin		VALUE(NULL),
  					/* Root directory for binaries */
@@ -38,9 +38,9 @@
  			*StateDir		VALUE(NULL),
  					/* Root directory for state data */
  			*RequestRoot		VALUE(NULL),
-diff -up cups-1.3.9/scheduler/env.c.serverbin-compat cups-1.3.9/scheduler/env.c
---- cups-1.3.9/scheduler/env.c.serverbin-compat	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.9/scheduler/env.c	2009-01-28 17:21:14.000000000 +0000
+diff -up cups-1.3.10/scheduler/env.c.serverbin-compat cups-1.3.10/scheduler/env.c
+--- cups-1.3.10/scheduler/env.c.serverbin-compat	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.10/scheduler/env.c	2009-04-20 17:03:48.000000000 +0100
 @@ -86,8 +86,13 @@ cupsdInitEnv(void)
    cupsdSetEnv("LD_LIBRARY_PATH", NULL);
    cupsdSetEnv("LD_PRELOAD", NULL);
@@ -55,10 +55,10 @@
    cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
    cupsdSetEnv("SHLIB_PATH", NULL);
    cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
-diff -up cups-1.3.9/scheduler/ipp.c.serverbin-compat cups-1.3.9/scheduler/ipp.c
---- cups-1.3.9/scheduler/ipp.c.serverbin-compat	2008-09-16 23:39:44.000000000 +0100
-+++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:21:14.000000000 +0000
-@@ -2472,9 +2472,18 @@ add_printer(cupsd_client_t  *con,	/* I -
+diff -up cups-1.3.10/scheduler/ipp.c.serverbin-compat cups-1.3.10/scheduler/ipp.c
+--- cups-1.3.10/scheduler/ipp.c.serverbin-compat	2009-03-18 16:30:29.000000000 +0000
++++ cups-1.3.10/scheduler/ipp.c	2009-04-20 17:03:48.000000000 +0100
+@@ -2475,9 +2475,18 @@ add_printer(cupsd_client_t  *con,	/* I -
          * Could not find device in list!
  	*/
  
@@ -77,10 +77,10 @@
        }
      }
  
-diff -up cups-1.3.9/scheduler/job.c.serverbin-compat cups-1.3.9/scheduler/job.c
---- cups-1.3.9/scheduler/job.c.serverbin-compat	2008-07-21 20:57:20.000000000 +0100
-+++ cups-1.3.9/scheduler/job.c	2009-01-28 17:21:14.000000000 +0000
-@@ -3244,8 +3244,32 @@ start_job(cupsd_job_t     *job,		/* I - 
+diff -up cups-1.3.10/scheduler/job.c.serverbin-compat cups-1.3.10/scheduler/job.c
+--- cups-1.3.10/scheduler/job.c.serverbin-compat	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/job.c	2009-04-20 17:03:48.000000000 +0100
+@@ -3242,8 +3242,32 @@ start_job(cupsd_job_t     *job,		/* I - 
         i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
    {
      if (filter->filter[0] != '/')
@@ -115,7 +115,7 @@
      else
        strlcpy(command, filter->filter, sizeof(command));
  
-@@ -3396,6 +3420,28 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3394,6 +3418,28 @@ start_job(cupsd_job_t     *job,		/* I - 
      {
        sscanf(printer->device_uri, "%254[^:]", method);
        snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method);
@@ -144,9 +144,9 @@
  
       /*
        * See if the backend needs to run as root...
-diff -up cups-1.3.9/scheduler/printers.c.serverbin-compat cups-1.3.9/scheduler/printers.c
---- cups-1.3.9/scheduler/printers.c.serverbin-compat	2008-09-03 20:25:11.000000000 +0100
-+++ cups-1.3.9/scheduler/printers.c	2009-01-28 17:31:40.000000000 +0000
+diff -up cups-1.3.10/scheduler/printers.c.serverbin-compat cups-1.3.10/scheduler/printers.c
+--- cups-1.3.10/scheduler/printers.c.serverbin-compat	2008-11-12 00:18:36.000000000 +0000
++++ cups-1.3.10/scheduler/printers.c	2009-04-20 17:03:48.000000000 +0100
 @@ -943,9 +943,19 @@ cupsdLoadAllPrinters(void)
  	    * Backend does not exist, stop printer...
  	    */
@@ -167,7 +167,7 @@
  	  }
          }
  
-@@ -3423,6 +3433,12 @@ add_printer_filter(
+@@ -3433,6 +3443,12 @@ add_printer_filter(
  
      if (access(filename, X_OK))
      {
@@ -180,7 +180,7 @@
        snprintf(p->state_message, sizeof(p->state_message),
                 "Filter \"%s\" for printer \"%s\" not available: %s",
  	       program, p->name, strerror(errno));
-@@ -3430,6 +3446,9 @@ add_printer_filter(
+@@ -3440,6 +3456,9 @@ add_printer_filter(
        cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0);
  
        cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);

cups-str2536.patch:

Index: cups-str2536.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-str2536.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-str2536.patch	10 Sep 2008 15:19:33 -0000	1.1
+++ cups-str2536.patch	21 Apr 2009 12:49:29 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up cups-1.3.8/config.h.in.str2536 cups-1.3.8/config.h.in
---- cups-1.3.8/config.h.in.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/config.h.in	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/config.h.in.str2536 cups-1.3.10/config.h.in
+--- cups-1.3.10/config.h.in.str2536	2009-03-12 21:34:21.000000000 +0000
++++ cups-1.3.10/config.h.in	2009-04-20 17:27:31.000000000 +0100
 @@ -43,6 +43,13 @@
  
  
@@ -15,9 +15,9 @@
   * Default browsing settings...
   */
  
-diff -up cups-1.3.8/config-scripts/cups-defaults.m4.str2536 cups-1.3.8/config-scripts/cups-defaults.m4
---- cups-1.3.8/config-scripts/cups-defaults.m4.str2536	2008-04-14 19:10:27.000000000 +0100
-+++ cups-1.3.8/config-scripts/cups-defaults.m4	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/config-scripts/cups-defaults.m4.str2536 cups-1.3.10/config-scripts/cups-defaults.m4
+--- cups-1.3.10/config-scripts/cups-defaults.m4.str2536	2008-04-14 19:10:27.000000000 +0100
++++ cups-1.3.10/config-scripts/cups-defaults.m4	2009-04-20 17:27:31.000000000 +0100
 @@ -43,6 +43,14 @@ AC_ARG_WITH(log_file_perm, [  --with-log
  AC_SUBST(CUPS_LOG_FILE_PERM)
  AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
@@ -33,9 +33,9 @@
  dnl Default Browsing
  AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
  if test "x$enable_browsing" = xno; then
-diff -up cups-1.3.8/configure.str2536 cups-1.3.8/configure
---- cups-1.3.8/configure.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/configure	2008-09-10 16:18:16.000000000 +0100
+diff -up cups-1.3.10/configure.str2536 cups-1.3.10/configure
+--- cups-1.3.10/configure.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/configure	2009-04-20 17:27:56.000000000 +0100
 @@ -782,6 +782,7 @@ LAUNCHDLIBS
  LANGUAGES
  CUPS_CONFIG_FILE_PERM
@@ -44,7 +44,7 @@
  CUPS_BROWSING
  CUPS_BROWSE_LOCAL_PROTOCOLS
  CUPS_BROWSE_REMOTE_PROTOCOLS
-@@ -1471,6 +1472,7 @@ Optional Packages:
+@@ -1474,6 +1475,7 @@ Optional Packages:
    --with-languages        set installed languages, default=all
    --with-config-file-perm set default ConfigFilePerm value, default=0640
    --with-log-file-perm    set default LogFilePerm value, default=0644
@@ -52,22 +52,7 @@
    --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"
    --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"
    --with-cups-user        set default user for CUPS
-@@ -9680,10 +9682,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU*)
- 		# Linux and GNU Hurd
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
-@@ -17624,6 +17626,21 @@ cat >>confdefs.h <<_ACEOF
+@@ -17929,6 +17931,21 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
@@ -89,7 +74,7 @@
  # Check whether --enable-browsing was given.
  if test "${enable_browsing+set}" = set; then
    enableval=$enable_browsing;
-@@ -19407,6 +19424,7 @@ LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim
+@@ -20067,6 +20084,7 @@ LAUNCHDLIBS!$LAUNCHDLIBS$ac_delim
  LANGUAGES!$LANGUAGES$ac_delim
  CUPS_CONFIG_FILE_PERM!$CUPS_CONFIG_FILE_PERM$ac_delim
  CUPS_LOG_FILE_PERM!$CUPS_LOG_FILE_PERM$ac_delim
@@ -97,31 +82,18 @@
  CUPS_BROWSING!$CUPS_BROWSING$ac_delim
  CUPS_BROWSE_LOCAL_PROTOCOLS!$CUPS_BROWSE_LOCAL_PROTOCOLS$ac_delim
  CUPS_BROWSE_REMOTE_PROTOCOLS!$CUPS_BROWSE_REMOTE_PROTOCOLS$ac_delim
-@@ -19432,7 +19450,6 @@ PHPCONFIG!$PHPCONFIG$ac_delim
- PHPDIR!$PHPDIR$ac_delim
+@@ -20095,7 +20113,7 @@ PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
- INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim
--UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19474,11 +19491,12 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -up cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536 cups-1.3.8/doc/help/ref-cupsd-conf.html.in
---- cups-1.3.8/doc/help/ref-cupsd-conf.html.in.str2536	2008-06-17 19:27:16.000000000 +0100
-+++ cups-1.3.8/doc/help/ref-cupsd-conf.html.in	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/doc/help/ref-cupsd-conf.html.in.str2536 cups-1.3.10/doc/help/ref-cupsd-conf.html.in
+--- cups-1.3.10/doc/help/ref-cupsd-conf.html.in.str2536	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/doc/help/ref-cupsd-conf.html.in	2009-04-20 17:27:31.000000000 +0100
 @@ -1115,6 +1115,57 @@ printer.</P>
  </UL>
  
@@ -180,9 +152,9 @@
  <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
  
  <H3>Examples</H3>
-diff -up cups-1.3.8/man/cupsd.conf.man.in.str2536 cups-1.3.8/man/cupsd.conf.man.in
---- cups-1.3.8/man/cupsd.conf.man.in.str2536	2008-06-16 18:41:11.000000000 +0100
-+++ cups-1.3.8/man/cupsd.conf.man.in	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/man/cupsd.conf.man.in.str2536 cups-1.3.10/man/cupsd.conf.man.in
+--- cups-1.3.10/man/cupsd.conf.man.in.str2536	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/man/cupsd.conf.man.in	2009-04-20 17:27:31.000000000 +0100
 @@ -275,6 +275,15 @@ ErrorLog syslog
  .br
  Specifies the error log filename.
@@ -199,18 +171,18 @@
  FileDevice Yes
  .TP 5
  FileDevice No
-diff -up cups-1.3.8/scheduler/conf.c.str2536 cups-1.3.8/scheduler/conf.c
---- cups-1.3.8/scheduler/conf.c.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:17:52.000000000 +0100
-@@ -21,6 +21,7 @@
+diff -up cups-1.3.10/scheduler/conf.c.str2536 cups-1.3.10/scheduler/conf.c
+--- cups-1.3.10/scheduler/conf.c.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/scheduler/conf.c	2009-04-20 17:27:31.000000000 +0100
+@@ -23,6 +23,7 @@
   *   get_addr_and_mask()      - Get an IP address and netmask.
-  *   parse_aaa()              - Parse authentication, authorization, and
-  *                              access control lines.
+  *   parse_aaa()              - Parse authentication, authorization, and access
+  *                              control lines.
 + *   parse_fatal_errors()     - Parse FatalErrors values in a string.
   *   parse_groups()           - Parse system group names in a string.
   *   parse_protocols()        - Parse browse protocols in a string.
   *   read_configuration()     - Read a configuration file.
-@@ -192,6 +193,7 @@ static int		get_addr_and_mask(const char
+@@ -197,6 +198,7 @@ static int		get_addr_and_mask(const char
  			                  unsigned *mask);
  static int		parse_aaa(cupsd_location_t *loc, char *line,
  			          char *value, int linenum);
@@ -218,7 +190,7 @@
  static int		parse_groups(const char *s);
  static int		parse_protocols(const char *s);
  static int		read_configuration(cups_file_t *fp);
-@@ -512,6 +514,7 @@ cupsdReadConfiguration(void)
+@@ -540,6 +542,7 @@ cupsdReadConfiguration(void)
    */
  
    ConfigFilePerm        = CUPS_DEFAULT_CONFIG_FILE_PERM;
@@ -226,7 +198,7 @@
    DefaultAuthType       = CUPSD_AUTH_BASIC;
  #ifdef HAVE_SSL
    DefaultEncryption     = HTTP_ENCRYPT_REQUIRED;
-@@ -782,30 +785,31 @@ cupsdReadConfiguration(void)
+@@ -861,30 +864,31 @@ cupsdReadConfiguration(void)
  
    snprintf(temp, sizeof(temp), "%s/rss", CacheDir);
  
@@ -282,7 +254,7 @@
      return (0);
  
   /*
-@@ -855,7 +859,8 @@ cupsdReadConfiguration(void)
+@@ -934,7 +938,8 @@ cupsdReadConfiguration(void)
      * is under the spool directory or does not exist...
      */
  
@@ -292,7 +264,7 @@
        return (0);
    }
  
-@@ -872,8 +877,10 @@ cupsdReadConfiguration(void)
+@@ -951,8 +956,10 @@ cupsdReadConfiguration(void)
    if (MaxClients > (MaxFDs / 3) || MaxClients <= 0)
    {
      if (MaxClients > 0)
@@ -305,7 +277,7 @@
  
      MaxClients = MaxFDs / 3;
    }
-@@ -1115,7 +1122,8 @@ cupsdReadConfiguration(void)
+@@ -1194,7 +1201,8 @@ cupsdReadConfiguration(void)
      {
        cupsdLogMessage(CUPSD_LOG_EMERG,
                        "Unable to load MIME database from \'%s\'!", ServerRoot);
@@ -315,7 +287,7 @@
      }
  
      cupsdLogMessage(CUPSD_LOG_INFO,
-@@ -1912,6 +1920,86 @@ parse_aaa(cupsd_location_t *loc,	/* I - 
+@@ -2037,6 +2045,86 @@ parse_aaa(cupsd_location_t *loc,	/* I - 
  
  
  /*
@@ -402,7 +374,7 @@
   * 'parse_groups()' - Parse system group names in a string.
   */
  
-@@ -2740,7 +2828,8 @@ read_configuration(cups_file_t *fp)	/* I
+@@ -2868,7 +2956,8 @@ read_configuration(cups_file_t *fp)	/* I
  	cupsdLogMessage(CUPSD_LOG_WARN,
  	                "Unknown default authorization type %s on line %d.",
  	                value, linenum);
@@ -412,7 +384,7 @@
        }
      }
  #ifdef HAVE_SSL
-@@ -2761,7 +2850,8 @@ read_configuration(cups_file_t *fp)	/* I
+@@ -2889,7 +2978,8 @@ read_configuration(cups_file_t *fp)	/* I
  	cupsdLogMessage(CUPSD_LOG_WARN,
  	                "Unknown default encryption %s on line %d.",
  	                value, linenum);
@@ -422,7 +394,7 @@
        }
      }
  #endif /* HAVE_SSL */
-@@ -3148,7 +3238,8 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3278,7 +3368,8 @@ read_location(cups_file_t *fp,		/* I - C
        if (!value)
        {
          cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
@@ -432,7 +404,7 @@
        }
        
        if ((loc = cupsdCopyLocation(&parent)) == NULL)
-@@ -3196,7 +3287,8 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3326,7 +3417,8 @@ read_location(cups_file_t *fp,		/* I - C
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Unknown Location directive %s on line %d.",
  	              line, linenum);
@@ -442,7 +414,7 @@
      }
    }
  
-@@ -3204,7 +3296,7 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3334,7 +3426,7 @@ read_location(cups_file_t *fp,		/* I - C
                    "Unexpected end-of-file at line %d while reading location!",
                    linenum);
  
@@ -451,7 +423,7 @@
  }
  
  
-@@ -3262,7 +3354,8 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3392,7 +3484,8 @@ read_policy(cups_file_t *fp,		/* I - Con
        if (!value)
        {
          cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
@@ -461,7 +433,7 @@
        }
        
       /*
-@@ -3336,7 +3429,8 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3466,7 +3559,8 @@ read_policy(cups_file_t *fp,		/* I - Con
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Missing <Limit ops> directive before %s on line %d.",
                        line, linenum);
@@ -471,7 +443,7 @@
      }
      else if (!parse_aaa(op, line, value, linenum))
      {
-@@ -3349,7 +3443,8 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3479,7 +3573,8 @@ read_policy(cups_file_t *fp,		/* I - Con
  	                "Unknown Policy directive %s on line %d.",
  	                line, linenum);
  
@@ -481,7 +453,7 @@
      }
    }
  
-@@ -3357,7 +3452,7 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3487,7 +3582,7 @@ read_policy(cups_file_t *fp,		/* I - Con
                    "Unexpected end-of-file at line %d while reading policy \"%s\"!",
                    linenum, policy);
  
@@ -490,9 +462,9 @@
  }
  
  
-diff -up cups-1.3.8/scheduler/conf.h.str2536 cups-1.3.8/scheduler/conf.h
---- cups-1.3.8/scheduler/conf.h.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/scheduler/conf.h.str2536 cups-1.3.10/scheduler/conf.h
+--- cups-1.3.10/scheduler/conf.h.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/scheduler/conf.h	2009-04-20 17:27:31.000000000 +0100
 @@ -38,6 +38,19 @@ typedef enum
  
  
@@ -513,7 +485,7 @@
   * Printcap formats...
   */
  
-@@ -124,6 +137,8 @@ VAR int			ClassifyOverride	VALUE(0),
+@@ -140,6 +153,8 @@ VAR int			ClassifyOverride	VALUE(0),
  					/* Allow overrides? */
  			ConfigFilePerm		VALUE(0640),
  					/* Permissions for config files */
@@ -522,9 +494,9 @@
  			LogFilePerm		VALUE(0644),
  					/* Permissions for log files */
  			LogLevel		VALUE(CUPSD_LOG_ERROR),
-diff -up cups-1.3.8/scheduler/dirsvc.c.str2536 cups-1.3.8/scheduler/dirsvc.c
---- cups-1.3.8/scheduler/dirsvc.c.str2536	2008-07-18 21:30:23.000000000 +0100
-+++ cups-1.3.8/scheduler/dirsvc.c	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/scheduler/dirsvc.c.str2536 cups-1.3.10/scheduler/dirsvc.c
+--- cups-1.3.10/scheduler/dirsvc.c.str2536	2009-02-12 22:23:31.000000000 +0000
++++ cups-1.3.10/scheduler/dirsvc.c	2009-04-20 17:27:31.000000000 +0100
 @@ -954,9 +954,14 @@ cupsdStartBrowsing(void)
  			strerror(errno));
  	BrowseLocalProtocols &= ~BROWSE_CUPS;
@@ -681,26 +653,10 @@
  	}
        }
      }
-diff -up cups-1.3.8/scheduler/listen.c.str2536 cups-1.3.8/scheduler/listen.c
---- cups-1.3.8/scheduler/listen.c.str2536	2007-08-13 18:20:14.000000000 +0100
-+++ cups-1.3.8/scheduler/listen.c	2008-09-10 16:16:44.000000000 +0100
-@@ -150,10 +150,15 @@ cupsdStartListening(void)
-     httpAddrFreeList(ServerAddrs);
- 
-   if ((ServerAddrs = httpAddrGetList(ServerName, AF_UNSPEC, NULL)) == NULL)
-+  {
-     cupsdLogMessage(CUPSD_LOG_ERROR,
-                     "Unable to find IP address for server name \"%s\"!\n",
- 		    ServerName);
- 
-+    if (FatalErrors & CUPSD_FATAL_LISTEN)
-+      cupsdEndProcess(getpid(), 0);
-+  }
-+
-  /*
-   * Setup socket listeners...
-   */
-@@ -194,6 +199,20 @@ cupsdStartListening(void)
+diff -up cups-1.3.10/scheduler/listen.c.str2536 cups-1.3.10/scheduler/listen.c
+--- cups-1.3.10/scheduler/listen.c.str2536	2009-01-15 19:12:15.000000000 +0000
++++ cups-1.3.10/scheduler/listen.c	2009-04-20 17:27:31.000000000 +0100
+@@ -182,6 +182,20 @@ cupsdStartListening(void)
  	cupsdLogMessage(CUPSD_LOG_ERROR,
  			"Unable to open listen socket for address %s:%d - %s.",
  			s, p, strerror(errno));
@@ -721,7 +677,7 @@
  	continue;
        }
  
-@@ -278,6 +297,10 @@ cupsdStartListening(void)
+@@ -266,6 +280,10 @@ cupsdStartListening(void)
  			s, p, strerror(errno));
  	close(lis->fd);
  	lis->fd = -1;
@@ -732,7 +688,7 @@
  	continue;
        }
  
-@@ -290,7 +313,14 @@ cupsdStartListening(void)
+@@ -278,7 +296,14 @@ cupsdStartListening(void)
  	cupsdLogMessage(CUPSD_LOG_ERROR,
  			"Unable to listen for clients on address %s:%d - %s.",
  			s, p, strerror(errno));
@@ -748,7 +704,7 @@
        }
      }
  
-@@ -339,11 +369,8 @@ cupsdStartListening(void)
+@@ -327,11 +352,8 @@ cupsdStartListening(void)
                      "No Listen or Port lines were found to allow access via "
  		    "localhost!");
  
@@ -762,9 +718,9 @@
    }
  
   /*
-diff -up cups-1.3.8/scheduler/log.c.str2536 cups-1.3.8/scheduler/log.c
---- cups-1.3.8/scheduler/log.c.str2536	2008-09-10 16:16:44.000000000 +0100
-+++ cups-1.3.8/scheduler/log.c	2008-09-10 16:16:44.000000000 +0100
+diff -up cups-1.3.10/scheduler/log.c.str2536 cups-1.3.10/scheduler/log.c
+--- cups-1.3.10/scheduler/log.c.str2536	2009-04-20 17:27:31.000000000 +0100
++++ cups-1.3.10/scheduler/log.c	2009-04-20 17:27:31.000000000 +0100
 @@ -546,7 +546,20 @@ check_log_file(cups_file_t **lf,	/* IO -
  
        if (!strncmp(filename, CUPS_LOGDIR, strlen(CUPS_LOGDIR)))


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- cups.spec	17 Apr 2009 15:07:16 -0000	1.437
+++ cups.spec	21 Apr 2009 12:49:30 -0000	1.438
@@ -6,8 +6,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.9
-Release: 4%{?svn:.svn%{svn}}%{?dist}
+Version: 1.3.10
+Release: 1%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -27,8 +27,6 @@
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
-Patch4: cups-ext.patch
-Patch5: cups-includeifexists.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
@@ -47,15 +45,8 @@
 Patch21: cups-usb-paperout.patch
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2536.patch
-Patch24: cups-str2988.patch
 Patch25: cups-str3023.patch
-Patch26: cups-CVE-2008-5183.patch
-Patch27: cups-CVE-2008-5286.patch
 Patch28: cups-str2831.patch
-Patch29: cups-str3077.patch
-Patch30: cups-str3078.patch
-Patch31: cups-str3059.patch
-Patch32: cups-str3055.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -66,9 +57,6 @@
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
 Prereq: /usr/sbin/alternatives
 %endif
-%if %{?svn:1}%{!?svn:0}
-Requires: poppler-utils
-%endif
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
@@ -87,6 +75,7 @@
 BuildRequires: libtiff-devel
 BuildRequires: krb5-devel
 BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: poppler-utils
 
 %if %lspp
 BuildPrereq: libselinux-devel >= 1.23
@@ -105,6 +94,8 @@
 # Requires tmpwatch for the cron.daily script (bug #218901).
 Requires: tmpwatch
 
+Requires: poppler-utils
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -154,8 +145,6 @@
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
-%patch4 -p1 -b .ext
-%patch5 -p1 -b .includeifexists
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
@@ -174,15 +163,8 @@
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2536
-%patch24 -p1 -b .str2988
 %patch25 -p1 -b .str3023
-%patch26 -p1 -b .CVE-2008-5183
-%patch27 -p1 -b .CVE-2008-5286
 %patch28 -p1 -b .str2831
-%patch29 -p1 -b .str3077
-%patch30 -p1 -b .str3078
-%patch31 -p1 -b .str3059
-%patch32 -p1 -b .str3055
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -204,7 +186,8 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--enable-pdftops --with-pdftops=pdftops \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -462,6 +445,15 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-1
+- 1.3.10.  No longer need ext, includeifexists, str2988,
+  CVE-2008-5183, CVE-2008-5286, str3077, str3078, str3059, str3055 patches.
+- Requires poppler-utils.
+- NOTE: If your CUPS server is accessed using a hostname or hostnames
+  not known to the server itself you must add "ServerAlias hostname"
+  for each such name.  The special line "ServerAlias *" disables checking
+  (but this allows DNS rebinding attacks).
+
 * Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com>
 - Fixed getnameddest patch (bug #481481, STR #3082).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	10 Oct 2008 08:43:51 -0000	1.45
+++ sources	21 Apr 2009 12:49:30 -0000	1.46
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-cf63f451c356e6cabb08972d4d11c365  cups-1.3.9-source.tar.bz2
+84fffe96b8537c81a463faccead80026  cups-1.3.10-source.tar.bz2


--- cups-CVE-2008-5183.patch DELETED ---


--- cups-CVE-2008-5286.patch DELETED ---


--- cups-ext.patch DELETED ---


--- cups-includeifexists.patch DELETED ---


--- cups-str2988.patch DELETED ---


--- cups-str3055.patch DELETED ---


--- cups-str3059.patch DELETED ---


--- cups-str3077.patch DELETED ---


--- cups-str3078.patch DELETED ---



From than at fedoraproject.org  Tue Apr 21 12:55:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 12:55:38 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin-4.2.2-printing.patch, 1.1,
	1.2 kdeadmin.spec, 1.130, 1.131
Message-ID: <20090421125538.CBE60700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19350

Modified Files:
	kdeadmin-4.2.2-printing.patch kdeadmin.spec 
Log Message:
- get rid of the dependency of system-config-printer
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime



kdeadmin-4.2.2-printing.patch:

Index: kdeadmin-4.2.2-printing.patch
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin-4.2.2-printing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeadmin-4.2.2-printing.patch	20 Apr 2009 15:39:08 -0000	1.1
+++ kdeadmin-4.2.2-printing.patch	21 Apr 2009 12:55:35 -0000	1.2
@@ -1,7 +1,226 @@
-diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
---- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig	2009-04-20 17:34:50.000000000 +0200
-+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-20 17:36:07.000000000 +0200
-@@ -1480,9 +1480,8 @@ class NewPrinterGUI(QDialog):
+diff -up system-config-printer-kde/CMakeLists.txt.printing system-config-printer-kde/CMakeLists.txt
+--- system-config-printer-kde/CMakeLists.txt.printing	2009-01-01 17:27:18.000000000 +0100
++++ system-config-printer-kde/CMakeLists.txt	2009-04-21 14:47:20.000000000 +0200
+@@ -7,35 +7,17 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
+ macro_optional_find_package(PythonLibrary)
+ macro_optional_find_package(SIP)
+ 
+-macro_optional_find_package(PyQt4)
+-IF(NOT PYQT4_FOUND)
+-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/" FALSE)
+-ENDIF(NOT PYQT4_FOUND)
+-
+-macro_optional_find_package(PyKDE)
+-IF(NOT PYKDE_FOUND)
+-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
+-ENDIF(NOT PYKDE_FOUND)
+-
+-macro_optional_find_package(PyCups)
+-IF(NOT PYCUPS_FOUND)
+-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
+-ENDIF(NOT PYCUPS_FOUND)
+-
+-macro_optional_find_package(SystemConfigPrinter)
+-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
+-    macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
+-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
+-
+-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+-    SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
++if(PYTHONLIBRARY_FOUND)
++   set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
++endif(PYTHONLIBRARY_FOUND)
+ 
+ IF(INSTALL_SYSTEM_CONFIG_PRINTER)
+     install( FILES
+         new-printer.ui
+         system-config-printer.ui
+         system-config-printer-kde.py
++        debug.py
++        smburi.py
+         DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
+     PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py system-config-printer-kde)
+     install(FILES system-config-printer-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff -up /dev/null system-config-printer-kde/debug.py
+--- /dev/null	2009-04-15 10:28:46.227012446 +0200
++++ system-config-printer-kde/debug.py	2009-04-21 14:47:20.000000000 +0200
+@@ -0,0 +1,55 @@
++#!/usr/bin/env python
++
++## Copyright (C) 2008 Red Hat, Inc.
++## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
++
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import sys
++import traceback
++
++_debug=False
++def debugprint (x):
++    if _debug:
++        try:
++            print >>sys.stderr, x
++        except:
++            pass
++
++def get_debugging ():
++    return _debug
++
++def set_debugging (d):
++    global _debug
++    _debug = d
++
++def fatalException (exitcode=1):
++    nonfatalException (type="fatal", end="Exiting")
++    sys.exit (exitcode)
++
++def nonfatalException (type="non-fatal", end="Continuing anyway.."):
++    d = get_debugging ()
++    set_debugging (True)
++    debugprint ("Caught %s exception.  Traceback:" % type)
++    (type, value, tb) = sys.exc_info ()
++    tblast = traceback.extract_tb (tb, limit=None)
++    if len (tblast):
++        tblast = tblast[:len (tblast) - 1]
++    extxt = traceback.format_exception_only (type, value)
++    for line in traceback.format_tb(tb):
++        debugprint (line.strip ())
++    debugprint (extxt[0].strip ())
++    debugprint (end)
++    set_debugging (d)
+diff -up /dev/null system-config-printer-kde/smburi.py
+--- /dev/null	2009-04-15 10:28:46.227012446 +0200
++++ system-config-printer-kde/smburi.py	2009-04-21 14:47:20.000000000 +0200
+@@ -0,0 +1,95 @@
++#!/usr/bin/env python
++
++## system-config-printer
++
++## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
++## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
++
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import urllib
++
++class SMBURI:
++    def __init__ (self,
++                  uri=None,
++                  group='', host='', share='', user='', password=''):
++        if uri:
++            if group or host or share or user or password:
++                raise RuntimeError
++
++            if uri.startswith ("smb://"):
++                uri = uri[6:]
++
++            self.uri = uri
++        else:
++            self.uri = self._construct (group, host, share,
++                                        user=user, password=password)
++
++    def _construct (self, group, host, share, user='', password=''):
++        uri_password = ''
++        if password:
++            uri_password = ':' + urllib.quote (password)
++        if user:
++            uri_password += '@'
++        uri = "%s%s%s" % (urllib.quote (user),
++                          uri_password,
++                          urllib.quote (group))
++        if len (group) > 0:
++            uri += '/'
++        uri += urllib.quote (host)
++        if len (share) > 0:
++            uri += "/" + urllib.quote (share)
++        return uri
++
++    def get_uri (self):
++        return self.uri
++
++    def sanitize_uri (self):
++        group, host, share, user, password = self.separate ()
++        return self._construct (group, host, share)
++
++    def separate (self):
++        uri = self.get_uri ()
++        user = ''
++        password = ''
++        auth = uri.find ('@')
++        if auth != -1:
++            u = uri[:auth].find(':')
++            if u != -1:
++                user = uri[:u]
++                password = uri[u + 1:auth]
++            else:
++                user = uri[:auth]
++            uri = uri[auth + 1:]
++        sep = uri.count ('/')
++        group = ''
++        if sep == 2:
++            g = uri.find('/')
++            group = uri[:g]
++            uri = uri[g + 1:]
++        if sep < 1:
++            host = ''
++        else:
++            h = uri.find('/')
++            host = uri[:h]
++            uri = uri[h + 1:]
++            p = host.find(':')
++            if p != -1:
++                host = host[:p]
++        share = uri
++        return (urllib.unquote (group), urllib.unquote (host),
++                urllib.unquote (share),
++                urllib.unquote (user), urllib.unquote (password))
+diff -up system-config-printer-kde/system-config-printer-kde.py.printing system-config-printer-kde/system-config-printer-kde.py
+--- system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
++++ system-config-printer-kde/system-config-printer-kde.py	2009-04-21 14:52:29.000000000 +0200
+@@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
+ import thread
+ 
+ #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
+-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
++SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
+ if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
+     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
+ 
+@@ -64,7 +64,6 @@ import cups
+ cups.require ("1.9.27")
+ 
+ # These come from system-config-printer
+-import config
+ import cupshelpers  #, options
+ from smburi import SMBURI
+ from debug import *
+@@ -1480,9 +1479,8 @@ class NewPrinterGUI(QDialog):
          """
  
          # Optionally disable downloadable driver support.


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdeadmin.spec	20 Apr 2009 15:49:09 -0000	1.130
+++ kdeadmin.spec	21 Apr 2009 12:55:36 -0000	1.131
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -16,9 +16,7 @@
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python-devel
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
+BuildRequires:  python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -145,6 +143,11 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- get rid of the dependency of system-config-printer
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+
 * Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix #496646, system-config-printer-kde doesn't start
 



From limb at fedoraproject.org  Tue Apr 21 12:56:23 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 12:56:23 +0000 (UTC)
Subject: rpms/inksmoto/F-11 inksmoto.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <20090421125623.250E7700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19612

Modified Files:
	inksmoto.spec sources 
Log Message:
0.6.0~rc1



Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/F-11/inksmoto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- inksmoto.spec	17 Mar 2009 12:55:41 -0000	1.9
+++ inksmoto.spec	21 Apr 2009 12:56:21 -0000	1.10
@@ -1,12 +1,12 @@
 Name: inksmoto
-Version: 0.5.1
-Release:  1%{?dist}
+Version: 0.6.0
+Release:  1.rc1%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}/inksmoto-%{version}.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc1.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch
@@ -29,10 +29,9 @@
 mkdir -p %{buildroot}%{_datadir}/inkscape/extensions
 rm -f bezmisc.py
 rm -f inkex.py
-cp -p *.inx *.py *.xml %{buildroot}%{_datadir}/inkscape/extensions/
+cp -p *.inx *.py %{buildroot}%{_datadir}/inkscape/extensions/
 chmod 644 %{buildroot}%{_datadir}/inkscape/extensions/*
-cp -pr xmoto_bitmap %{buildroot}%{_datadir}/inkscape/extensions/
-cp -pr xmoto_install %{buildroot}%{_datadir}/inkscape/extensions/
+cp -pr inksmoto %{buildroot}%{_datadir}/inkscape/extensions/
 
 %clean
 rm -rf %{buildroot}
@@ -44,6 +43,9 @@
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Tue Apr 21 2009 Jon Ciesla <limb at jcomserv.net> - 0.6.0-1.rc1
+- Update to 0.6.0~rc1.
+
 * Tue Mar 17 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.1-1
 - New upstream, bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2009 12:55:41 -0000	1.6
+++ sources	21 Apr 2009 12:56:21 -0000	1.7
@@ -1 +1 @@
-d2649b6a37d5bafe95d96b579d49cfb1  inksmoto-0.5.1.tar.gz
+d05f8c328c2d782f7d2ba2282ca3a052  inksmoto-0.6.0~rc1.tar.gz



From pmatilai at fedoraproject.org  Tue Apr 21 13:01:52 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 21 Apr 2009 13:01:52 +0000 (UTC)
Subject: rpms/rpm/devel rpm.spec,1.346,1.347
Message-ID: <20090421130152.E4322700D6@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21189

Modified Files:
	rpm.spec 
Log Message:
- couple of merge-review fixes (#226377)
  - eliminate bogus leftover rpm:rpm rpmdb ownership
  - unescaped macro in changelog
- fix find-lang --with-kde with KDE3 (#466009)
- switch back to default file digest algorithm



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- rpm.spec	17 Apr 2009 10:55:19 -0000	1.346
+++ rpm.spec	21 Apr 2009 13:01:49 -0000	1.347
@@ -7,10 +7,6 @@
 # run internal testsuite?
 %bcond_without check
 
-# switch rpm itself back to md5 file digests until the dust settles a bit
-%define _source_filedigest_algorithm 0
-%define _binary_filedigest_algorithm 0
-
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define rpmhome /usr/lib/rpm
@@ -25,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -43,6 +39,7 @@
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
+Patch200: rpm-4.7.0-findlang-kde3.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -184,6 +181,8 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
+%patch200 -p1 -b .findlang-kde3
+
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
 
@@ -294,7 +293,7 @@
 %dir                            %{_sysconfdir}/rpm
 
 %attr(0755, root, root)   %dir /var/lib/rpm
-%attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/rpm/*
+%attr(0644, root, root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/rpm/*
 %attr(0755, root, root) %dir %{rpmhome}
 
 /bin/rpm
@@ -393,6 +392,13 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Apr 21 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-3
+- couple of merge-review fixes (#226377)
+  - eliminate bogus leftover rpm:rpm rpmdb ownership
+  - unescaped macro in changelog
+- fix find-lang --with-kde with KDE3 (#466009)
+- switch back to default file digest algorithm
+
 * Fri Apr 17 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-2
 - file classification tweaks for text files (#494817)
   - disable libmagic text token checks, it's way too error-prone
@@ -566,7 +572,7 @@
 - handle both "invalid argument" and clear env version mismatch on posttrans
 
 * Thu Sep 25 2008 Jindrich Novy <jnovy at redhat.com>
-- don't treat %patch numberless if -P parameter is present (#463942)
+- don't treat %%patch numberless if -P parameter is present (#463942)
 
 * Thu Sep 11 2008 Panu Matilainen <pmatilai at redhat.com>
 - add hack to support extracting gstreamer plugin provides (#438225)



From pmatilai at fedoraproject.org  Tue Apr 21 13:02:59 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue, 21 Apr 2009 13:02:59 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.0-findlang-kde3.patch,NONE,1.1
Message-ID: <20090421130259.F3F5C700D6@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21497

Added Files:
	rpm-4.7.0-findlang-kde3.patch 
Log Message:
- bah, remember to actually add the find-lang patch


rpm-4.7.0-findlang-kde3.patch:

--- NEW FILE rpm-4.7.0-findlang-kde3.patch ---
commit acfe923bf21a4402a48b6e357a53a398b107f0b3
Author: Ville Skytt?? <ville.skytta at iki.fi>
Date:   Sun Apr 12 21:39:50 2009 +0300

    Fix --with-kde with KDE3 (rhbz#466009).

diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
index 2dd9e0d..bb25b31 100755
--- a/scripts/find-lang.sh
+++ b/scripts/find-lang.sh
@@ -138,7 +138,7 @@ if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then
 find $TOP_DIR$KDE3_HTML -type d|sed '
 s:'"$TOP_DIR"'::
 '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
-'"$NO_ALL_NAME$KDE"'s:\(.*/HTML\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
+'"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::



From jwrdegoede at fedoraproject.org  Tue Apr 21 13:03:21 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 21 Apr 2009 13:03:21 +0000 (UTC)
Subject: rpms/freeglut/devel .cvsignore, 1.3, 1.4 freeglut.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <20090421130321.873F1700D6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freeglut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21634

Modified Files:
	.cvsignore freeglut.spec sources 
Log Message:
* Tue Apr 21 2009 Hans de Goede <hdegoede at redhat.com> 2.6.0-0.1.rc1
- New upstream release (yes really!) 2.6.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freeglut/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Dec 2007 11:23:49 -0000	1.3
+++ .cvsignore	21 Apr 2009 13:03:19 -0000	1.4
@@ -1,2 +1,2 @@
-freeglut-2.4.0.tar.gz
+freeglut-2.6.0-rc1.tar.gz
 openglut-0.6.3-doc.tar.gz


Index: freeglut.spec
===================================================================
RCS file: /cvs/extras/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- freeglut.spec	24 Feb 2009 18:20:49 -0000	1.8
+++ freeglut.spec	21 Apr 2009 13:03:20 -0000	1.9
@@ -1,12 +1,13 @@
+%global pre rc1
+
 Summary:        A freely licensed alternative to the GLUT library
 Name:           freeglut
-Version:        2.4.0
-Release:        16%{?dist}
+Version:        2.6.0
+Release:        0.1.%{pre}%{?dist}
 URL:            http://freeglut.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{pre}.tar.gz
 # For the manpages
 Source1:        http://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz
-Patch0:         freeglut-2.4.0-cursor.patch
 License:        MIT
 Group:          System Environment/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,8 +49,6 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p0 -z .cursor
-chmod 644 doc/*.{html,png}
 
 
 %build
@@ -89,6 +88,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Hans de Goede <hdegoede at redhat.com> 2.6.0-0.1.rc1
+- New upstream release (yes really!) 2.6.0-rc1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freeglut/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Dec 2007 11:23:49 -0000	1.3
+++ sources	21 Apr 2009 13:03:20 -0000	1.4
@@ -1,2 +1,2 @@
-6d16873bd876fbf4980a927cfbc496a1  freeglut-2.4.0.tar.gz
+b1a8107f99b5d953e8418a5409462294  freeglut-2.6.0-rc1.tar.gz
 cf6c3e8cd7711e2b75ff8d7950ac2f97  openglut-0.6.3-doc.tar.gz



From limb at fedoraproject.org  Tue Apr 21 13:06:08 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 13:06:08 +0000 (UTC)
Subject: rpms/gallery2/F-11 gallery2.spec,1.23,1.24 sources,1.10,1.11
Message-ID: <20090421130608.7822A700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22367

Modified Files:
	gallery2.spec sources 
Log Message:
Legal fix.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-11/gallery2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gallery2.spec	13 Apr 2009 20:13:58 -0000	1.23
+++ gallery2.spec	21 Apr 2009 13:05:36 -0000	1.24
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -19,9 +19,6 @@
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
-#The following are the sources of the bundled jars.
-#Generated by extracting the jars using jar -xf.
-Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
@@ -29,6 +26,10 @@
 #BuildRequires: perl-String-CRC32, subversion
 BuildRequires: java-1.6.0-openjdk-devel
 Obsoletes: gallery2-panorama <= 2.3-4
+Obsoletes: gallery2-remote <= 2.3-7
+Obsoletes: gallery2-uploadapplet <= 2.3-7
+Obsoletes: gallery2-slideshowapplet <= 2.3-7
+
 #Patch0: gallery2-perl-location.patch
 
 %package albumselect
@@ -274,10 +275,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package remote
-Summary: Remote module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package remote
+#Summary: Remote module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package replica
 Summary: Replica module for Gallery 2
@@ -324,10 +325,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package slideshowapplet
-Summary: Slideshowapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package slideshowapplet
+#Summary: Slideshowapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package squarethumb
 Summary: Squarethumb module for Gallery 2
@@ -349,10 +350,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package uploadapplet
-Summary: Uploadapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package uploadapplet
+#Summary: Uploadapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package useralbum
 Summary: Useralbum module for Gallery 2
@@ -585,8 +586,8 @@
 %description register
 Gallery 2 module - New User Registration
 
-%description remote
-Gallery 2 module - Implementation for the remote control protocol
+#%description remote
+#Gallery 2 module - Implementation for the remote control protocol
 
 %description replica
 Gallery 2 module - Replication support
@@ -615,8 +616,8 @@
 %description slideshow
 Gallery 2 module - Slideshow 
 
-%description slideshowapplet
-Gallery 2 module - Fullscreen slideshow using a Java applet
+#%description slideshowapplet
+#Gallery 2 module - Fullscreen slideshow using a Java applet
 
 %description snapgalaxy
 Gallery 2 module - Print photos using SnapGalaxy
@@ -631,8 +632,8 @@
 Gallery 2 module - Select page/frame from a multipage file or movie 
 for the thumbnail
 
-%description uploadapplet
-Gallery 2 module - Easy to use upload applet for media
+#%description uploadapplet
+#Gallery 2 module - Easy to use upload applet for media
 
 %description useralbum
 Gallery 2 module - Create an album for each new user
@@ -685,10 +686,6 @@
 #pushd lib/tools/bin
 #perl makeManifest.pl
 #popd
-tar -xf %{SOURCE4}
-cd gallery-jar-sources-2.3
-sh build-jars.sh
-cd ..
 rm -rf `cat MANIFEST | grep -e "^R" | cut -f 2`
 find . -depth -name .svn -type d -exec rm -rf {} \;
 # Remove the execute bit from files that don't start with #!
@@ -699,13 +696,12 @@
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
-#Panorama needs an unredistributable jar, so we'll remove the files.
+#These modules need unredistributable jars, so we'll remove the files.
 rm -rf modules/panorama
-#install built jars
-install -m 0644 gallery-jar-sources-2.3/jars/remote/* modules/remote/applets
-install -m 0644 gallery-jar-sources-2.3/jars/slideshowapplet/* modules/slideshowapplet/applets
-install -m 0644 gallery-jar-sources-2.3/jars/uploadapplet/* modules/uploadapplet/applets
-rm -rf gallery-jar-sources-2.3
+rm -rf modules/remote
+rm -rf modules/uploadapplet
+rm -rf modules/slideshowapplet
+
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -979,9 +975,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/register/
 
-%files remote
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/remote/
+#%files remote
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/remote/
 
 %files replica
 %defattr(-,root,root,-)
@@ -1019,9 +1015,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshow/
 
-%files slideshowapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/slideshowapplet/
+#%files slideshowapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/slideshowapplet/
 
 %files snapgalaxy
 %defattr(-,root,root,-)
@@ -1039,9 +1035,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/thumbpage/
 
-%files uploadapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/uploadapplet/
+#%files uploadapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/uploadapplet/
 
 %files useralbum
 %defattr(-,root,root,-)
@@ -1100,6 +1096,12 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
+- Drop all jars and remote, uploadapplet and slideshowapplet modules
+- to satisfy legal requirements, as source build would be
+- highly laborious and functionality is not critical.
+- See BZ464566 for details.
+
 * Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-6
 - Document jar source origins, build jars in build, not prep.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Apr 2009 16:45:00 -0000	1.10
+++ sources	21 Apr 2009 13:05:36 -0000	1.11
@@ -1,2 +1 @@
 f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
-01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz



From than at fedoraproject.org  Tue Apr 21 13:08:15 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 13:08:15 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin-4.2.2-printing.patch,1.2,1.3
Message-ID: <20090421130815.97663700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23136

Modified Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
- get rid of the dependency of system-config-printer
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime



kdeadmin-4.2.2-printing.patch:

Index: kdeadmin-4.2.2-printing.patch
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin-4.2.2-printing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdeadmin-4.2.2-printing.patch	21 Apr 2009 12:55:35 -0000	1.2
+++ kdeadmin-4.2.2-printing.patch	21 Apr 2009 13:08:12 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up system-config-printer-kde/CMakeLists.txt.printing system-config-printer-kde/CMakeLists.txt
---- system-config-printer-kde/CMakeLists.txt.printing	2009-01-01 17:27:18.000000000 +0100
-+++ system-config-printer-kde/CMakeLists.txt	2009-04-21 14:47:20.000000000 +0200
+diff -up kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt
+--- kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing	2009-01-01 17:27:18.000000000 +0100
++++ kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt	2009-04-21 14:47:20.000000000 +0200
 @@ -7,35 +7,17 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
  macro_optional_find_package(PythonLibrary)
  macro_optional_find_package(SIP)
@@ -42,9 +42,9 @@
          DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
      PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py system-config-printer-kde)
      install(FILES system-config-printer-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-diff -up /dev/null system-config-printer-kde/debug.py
+diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/debug.py
 --- /dev/null	2009-04-15 10:28:46.227012446 +0200
-+++ system-config-printer-kde/debug.py	2009-04-21 14:47:20.000000000 +0200
++++ kdeadmin-4.2.2/system-config-printer-kde/debug.py	2009-04-21 14:47:20.000000000 +0200
 @@ -0,0 +1,55 @@
 +#!/usr/bin/env python
 +
@@ -101,9 +101,9 @@
 +    debugprint (extxt[0].strip ())
 +    debugprint (end)
 +    set_debugging (d)
-diff -up /dev/null system-config-printer-kde/smburi.py
+diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/smburi.py
 --- /dev/null	2009-04-15 10:28:46.227012446 +0200
-+++ system-config-printer-kde/smburi.py	2009-04-21 14:47:20.000000000 +0200
++++ kdeadmin-4.2.2/system-config-printer-kde/smburi.py	2009-04-21 14:47:20.000000000 +0200
 @@ -0,0 +1,95 @@
 +#!/usr/bin/env python
 +
@@ -200,9 +200,9 @@
 +        return (urllib.unquote (group), urllib.unquote (host),
 +                urllib.unquote (share),
 +                urllib.unquote (user), urllib.unquote (password))
-diff -up system-config-printer-kde/system-config-printer-kde.py.printing system-config-printer-kde/system-config-printer-kde.py
---- system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
-+++ system-config-printer-kde/system-config-printer-kde.py	2009-04-21 14:52:29.000000000 +0200
+diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
+--- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
++++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 14:52:29.000000000 +0200
 @@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
  import thread
  



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:26 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130926.9F46710F885@bastion2.fedora.phx.redhat.com>

bkearney has set the watchcommits acl on sugar-moon (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:28 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130928.C0E3810F88B@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-moon (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:32 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130932.94BD610F88F@bastion2.fedora.phx.redhat.com>

bkearney has set the watchcommits acl on sugar-moon (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From limb at fedoraproject.org  Tue Apr 21 13:09:31 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 13:09:31 +0000 (UTC)
Subject: rpms/gallery2/F-10 gallery2.spec,1.20,1.21 sources,1.10,1.11
Message-ID: <20090421130931.3FB0E700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23285

Modified Files:
	gallery2.spec sources 
Log Message:
Legal fix.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gallery2.spec	13 Apr 2009 17:45:34 -0000	1.20
+++ gallery2.spec	21 Apr 2009 13:08:59 -0000	1.21
@@ -7,7 +7,7 @@
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -19,7 +19,6 @@
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
-Source4: gallery-jar-sources-2.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
@@ -27,6 +26,10 @@
 #BuildRequires: perl-String-CRC32, subversion
 BuildRequires: java-1.6.0-openjdk-devel
 Obsoletes: gallery2-panorama <= 2.3-4
+Obsoletes: gallery2-remote <= 2.3-7
+Obsoletes: gallery2-uploadapplet <= 2.3-7
+Obsoletes: gallery2-slideshowapplet <= 2.3-7
+
 #Patch0: gallery2-perl-location.patch
 
 %package albumselect
@@ -272,10 +275,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package remote
-Summary: Remote module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package remote
+#Summary: Remote module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package replica
 Summary: Replica module for Gallery 2
@@ -322,10 +325,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package slideshowapplet
-Summary: Slideshowapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package slideshowapplet
+#Summary: Slideshowapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package squarethumb
 Summary: Squarethumb module for Gallery 2
@@ -347,10 +350,10 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package uploadapplet
-Summary: Uploadapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package uploadapplet
+#Summary: Uploadapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package useralbum
 Summary: Useralbum module for Gallery 2
@@ -583,8 +586,8 @@
 %description register
 Gallery 2 module - New User Registration
 
-%description remote
-Gallery 2 module - Implementation for the remote control protocol
+#%description remote
+#Gallery 2 module - Implementation for the remote control protocol
 
 %description replica
 Gallery 2 module - Replication support
@@ -613,8 +616,8 @@
 %description slideshow
 Gallery 2 module - Slideshow 
 
-%description slideshowapplet
-Gallery 2 module - Fullscreen slideshow using a Java applet
+#%description slideshowapplet
+#Gallery 2 module - Fullscreen slideshow using a Java applet
 
 %description snapgalaxy
 Gallery 2 module - Print photos using SnapGalaxy
@@ -629,8 +632,8 @@
 Gallery 2 module - Select page/frame from a multipage file or movie 
 for the thumbnail
 
-%description uploadapplet
-Gallery 2 module - Easy to use upload applet for media
+#%description uploadapplet
+#Gallery 2 module - Easy to use upload applet for media
 
 %description useralbum
 Gallery 2 module - Create an album for each new user
@@ -678,10 +681,6 @@
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
-tar -xf %{SOURCE4}
-cd gallery-jar-sources-2.3
-sh build-jars.sh
-cd ..
 
 %build
 #pushd lib/tools/bin
@@ -697,13 +696,12 @@
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
-#Panorama needs an unredistributable jar, so we'll remove the files.
+#These modules need unredistributable jars, so we'll remove the files.
 rm -rf modules/panorama
-#install built jars
-install -m 0644 gallery-jar-sources-2.3/jars/remote/* modules/remote/applets
-install -m 0644 gallery-jar-sources-2.3/jars/slideshowapplet/* modules/slideshowapplet/applets
-install -m 0644 gallery-jar-sources-2.3/jars/uploadapplet/* modules/uploadapplet/applets
-rm -rf gallery-jar-sources-2.3
+rm -rf modules/remote
+rm -rf modules/uploadapplet
+rm -rf modules/slideshowapplet
+
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -977,9 +975,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/register/
 
-%files remote
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/remote/
+#%files remote
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/remote/
 
 %files replica
 %defattr(-,root,root,-)
@@ -1017,9 +1015,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshow/
 
-%files slideshowapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/slideshowapplet/
+#%files slideshowapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/slideshowapplet/
 
 %files snapgalaxy
 %defattr(-,root,root,-)
@@ -1037,9 +1035,9 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/thumbpage/
 
-%files uploadapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/uploadapplet/
+#%files uploadapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/uploadapplet/
 
 %files useralbum
 %defattr(-,root,root,-)
@@ -1098,6 +1096,15 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
+- Drop all jars and remote, uploadapplet and slideshowapplet modules
+- to satisfy legal requirements, as source build would be
+- highly laborious and functionality is not critical.
+- See BZ464566 for details.
+
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-6
+- Document jar source origins, build jars in build, not prep.
+
 * Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-5
 - Remove .jar files and build from source BZ464566.
 - Modify source to remove two non-redistutable .jar files.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Apr 2009 17:45:34 -0000	1.10
+++ sources	21 Apr 2009 13:08:59 -0000	1.11
@@ -1,2 +1 @@
 f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
-01c5b65b2d15eda5a1e4ce67122ef875  gallery-jar-sources-2.3.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:33 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130933.E45E710F892@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-moon (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:37 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130937.BE99210F895@bastion2.fedora.phx.redhat.com>

bkearney has set the watchbugzilla acl on sugar-moon (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:39 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130939.555D810F896@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-moon (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:49 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130949.B829710F89A@bastion2.fedora.phx.redhat.com>

bkearney has set the watchbugzilla acl on sugar-moon (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:46 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130949.88F1410F898@bastion2.fedora.phx.redhat.com>

bkearney has set the watchbugzilla acl on sugar-moon (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From pkgdb at fedoraproject.org  Tue Apr 21 13:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 13:09:49 +0000
Subject: [pkgdb] sugar-moon had acl change status
Message-ID: <20090421130949.C1DB710F89E@bastion2.fedora.phx.redhat.com>

bkearney has set the watchcommits acl on sugar-moon (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-moon



From jwrdegoede at fedoraproject.org  Tue Apr 21 13:11:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 21 Apr 2009 13:11:49 +0000 (UTC)
Subject: rpms/freeglut/devel freeglut.spec,1.9,1.10
Message-ID: <20090421131149.BEC18700D6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freeglut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23998

Modified Files:
	freeglut.spec 
Log Message:
* Tue Apr 21 2009 Hans de Goede <hdegoede at redhat.com> 2.6.0-0.1.rc1
- New upstream release (yes really!) 2.6.0-rc1



Index: freeglut.spec
===================================================================
RCS file: /cvs/extras/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freeglut.spec	21 Apr 2009 13:03:20 -0000	1.9
+++ freeglut.spec	21 Apr 2009 13:11:47 -0000	1.10
@@ -12,6 +12,7 @@
 Group:          System Environment/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig libGLU-devel libXext-devel libXxf86vm-devel
+BuildRequires:  libXi-devel libICE-devel
 # The virtual Provides below is present so that this freeglut package is a
 # drop in binary replacement for "glut" which will satisfy rpm dependancies
 # properly.  The Obsoletes tag is required in order for any pre-existing



From tmraz at fedoraproject.org  Tue Apr 21 13:19:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 21 Apr 2009 13:19:42 +0000 (UTC)
Subject: rpms/openssl/F-10 openssl-0.9.8g-bad-mime.patch, NONE,
	1.1 openssl-0.9.8g-dtls-compat.patch, NONE, 1.1 openssl.spec,
	1.114, 1.115
Message-ID: <20090421131942.302B4700D6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25927

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8g-bad-mime.patch openssl-0.9.8g-dtls-compat.patch 
Log Message:
* Tue Apr 21 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-13
- support compatibility DTLS mode for CISCO AnyConnect (#464629)
- fix crash when parsing malformed mime headers in the smime app
- provide openssl-static by the devel subpackage (#496372)


openssl-0.9.8g-bad-mime.patch:

--- NEW FILE openssl-0.9.8g-bad-mime.patch ---
diff -up openssl-0.9.8g/crypto/pkcs7/pk7_mime.c.bad-mime openssl-0.9.8g/crypto/pkcs7/pk7_mime.c
--- openssl-0.9.8g/crypto/pkcs7/pk7_mime.c.bad-mime	2007-07-04 14:56:33.000000000 +0200
+++ openssl-0.9.8g/crypto/pkcs7/pk7_mime.c	2009-04-21 15:07:45.000000000 +0200
@@ -689,6 +689,10 @@ static int mime_hdr_addparam(MIME_HEADER
 static int mime_hdr_cmp(const MIME_HEADER * const *a,
 			const MIME_HEADER * const *b)
 {
+	if ((*a)->name == NULL || (*b)->name == NULL)
+		return (*a)->name - (*b)->name < 0 ? -1 :
+			(*a)->name - (*b)->name > 0 ? 1 : 0;
+
 	return(strcmp((*a)->name, (*b)->name));
 }
 

openssl-0.9.8g-dtls-compat.patch:

--- NEW FILE openssl-0.9.8g-dtls-compat.patch ---
Improve dtls compatibility with old DTLS servers (such as CISCO AnyConnect).
Additional backported DTLS fixes.
diff -up openssl-0.9.8g/ssl/d1_clnt.c.dtls-compat openssl-0.9.8g/ssl/d1_clnt.c
--- openssl-0.9.8g/ssl/d1_clnt.c.dtls-compat	2007-09-30 21:36:32.000000000 +0200
+++ openssl-0.9.8g/ssl/d1_clnt.c	2009-04-21 14:17:41.000000000 +0200
@@ -130,7 +130,7 @@ static int dtls1_get_hello_verify(SSL *s
 
 static SSL_METHOD *dtls1_get_client_method(int ver)
 	{
-	if (ver == DTLS1_VERSION)
+	if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
 		return(DTLSv1_client_method());
 	else
 		return(NULL);
@@ -181,7 +181,8 @@ int dtls1_connect(SSL *s)
 			s->server=0;
 			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
 
-			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00))
+			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) &&
+			    (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00))
 				{
 				SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR);
 				ret = -1;
diff -up openssl-0.9.8g/ssl/d1_lib.c.dtls-compat openssl-0.9.8g/ssl/d1_lib.c
--- openssl-0.9.8g/ssl/d1_lib.c.dtls-compat	2007-10-05 23:05:27.000000000 +0200
+++ openssl-0.9.8g/ssl/d1_lib.c	2009-04-21 14:19:07.000000000 +0200
@@ -106,6 +106,7 @@ int dtls1_new(SSL *s)
 	pq_64bit_init(&(d1->bitmap.map));
 	pq_64bit_init(&(d1->bitmap.max_seq_num));
 	
+	d1->next_bitmap.length = d1->bitmap.length;
 	pq_64bit_init(&(d1->next_bitmap.map));
 	pq_64bit_init(&(d1->next_bitmap.max_seq_num));
 
@@ -186,7 +187,10 @@ void dtls1_free(SSL *s)
 void dtls1_clear(SSL *s)
 	{
 	ssl3_clear(s);
-	s->version=DTLS1_VERSION;
+	if (s->options & SSL_OP_CISCO_ANYCONNECT)
+		s->version=DTLS1_BAD_VER;
+	else
+		s->version=DTLS1_VERSION;
 	}
 
 /*
diff -up openssl-0.9.8g/ssl/d1_pkt.c.dtls-compat openssl-0.9.8g/ssl/d1_pkt.c
--- openssl-0.9.8g/ssl/d1_pkt.c.dtls-compat	2007-10-19 09:39:53.000000000 +0200
+++ openssl-0.9.8g/ssl/d1_pkt.c	2009-04-21 14:36:15.000000000 +0200
@@ -597,6 +597,7 @@ again:
 	/* check whether this is a repeat, or aged record */
 	if ( ! dtls1_record_replay_check(s, bitmap, &(rr->seq_num)))
 		{
+		rr->length = 0;
 		s->packet_length=0; /* dump this record */
 		goto again;     /* get another record */
 		}
@@ -978,15 +979,17 @@ start:
 	if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
 		{
 		struct ccs_header_st ccs_hdr;
+		int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
 
 		dtls1_get_ccs_header(rr->data, &ccs_hdr);
 
 		/* 'Change Cipher Spec' is just a single byte, so we know
 		 * exactly what the record payload has to look like */
 		/* XDTLS: check that epoch is consistent */
-		if (	(s->client_version == DTLS1_BAD_VER && rr->length != 3) ||
-			(s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) || 
-			(rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
+		if (s->client_version == DTLS1_BAD_VER || s->version == DTLS1_BAD_VER)
+			ccs_hdr_len = 3;
+
+		if ((rr->length != ccs_hdr_len) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
 			{
 			i=SSL_AD_ILLEGAL_PARAMETER;
 			SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
@@ -1251,7 +1254,7 @@ int dtls1_write_bytes(SSL *s, int type, 
 	else 
 		s->s3->wnum += i;
 
-	return tot + i;
+	return i;
 	}
 
 int do_dtls1_write(SSL *s, int type, const unsigned char *buf, unsigned int len, int create_empty_fragment)
@@ -1302,7 +1305,7 @@ int do_dtls1_write(SSL *s, int type, con
 #if 0
 	/* 'create_empty_fragment' is true only when this function calls itself */
 	if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done
-		&& SSL_version(s) != DTLS1_VERSION)
+	    && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
 		{
 		/* countermeasure against known-IV weakness in CBC ciphersuites
 		 * (see http://www.openssl.org/~bodo/tls-cbc.txt) 
diff -up openssl-0.9.8g/ssl/s3_clnt.c.dtls-compat openssl-0.9.8g/ssl/s3_clnt.c
--- openssl-0.9.8g/ssl/s3_clnt.c.dtls-compat	2009-01-07 16:11:32.000000000 +0100
+++ openssl-0.9.8g/ssl/s3_clnt.c	2009-04-21 14:17:41.000000000 +0200
@@ -676,7 +676,7 @@ int ssl3_get_server_hello(SSL *s)
 
 	if (!ok) return((int)n);
 
-	if ( SSL_version(s) == DTLS1_VERSION)
+	if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
 		{
 		if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
 			{
diff -up openssl-0.9.8g/ssl/s3_pkt.c.dtls-compat openssl-0.9.8g/ssl/s3_pkt.c
--- openssl-0.9.8g/ssl/s3_pkt.c.dtls-compat	2006-11-29 15:45:14.000000000 +0100
+++ openssl-0.9.8g/ssl/s3_pkt.c	2009-04-21 14:39:07.000000000 +0200
@@ -754,7 +754,16 @@ int ssl3_write_pending(SSL *s, int type,
 			return(s->s3->wpend_ret);
 			}
 		else if (i <= 0)
+			{
+			if (s->version == DTLS1_VERSION ||
+			    s->version == DTLS1_BAD_VER)
+				{
+				/* For DTLS, just drop it. That's kind of the whole
+				   point in using a datagram service */
+				s->s3->wbuf.left = 0;
+				}
 			return(i);
+			}
 		s->s3->wbuf.offset+=i;
 		s->s3->wbuf.left-=i;
 		}
diff -up openssl-0.9.8g/ssl/ssl_err.c.dtls-compat openssl-0.9.8g/ssl/ssl_err.c
--- openssl-0.9.8g/ssl/ssl_err.c.dtls-compat	2007-10-11 16:36:59.000000000 +0200
+++ openssl-0.9.8g/ssl/ssl_err.c	2009-04-21 14:55:47.000000000 +0200
@@ -138,6 +138,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL3_CONNECT),	"SSL3_CONNECT"},
 {ERR_FUNC(SSL_F_SSL3_CTRL),	"SSL3_CTRL"},
 {ERR_FUNC(SSL_F_SSL3_CTX_CTRL),	"SSL3_CTX_CTRL"},
+{ERR_FUNC(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC),	"SSL3_DO_CHANGE_CIPHER_SPEC"},
 {ERR_FUNC(SSL_F_SSL3_ENC),	"SSL3_ENC"},
 {ERR_FUNC(SSL_F_SSL3_GENERATE_KEY_BLOCK),	"SSL3_GENERATE_KEY_BLOCK"},
 {ERR_FUNC(SSL_F_SSL3_GET_CERTIFICATE_REQUEST),	"SSL3_GET_CERTIFICATE_REQUEST"},
diff -up openssl-0.9.8g/ssl/ssl.h.dtls-compat openssl-0.9.8g/ssl/ssl.h
--- openssl-0.9.8g/ssl/ssl.h.dtls-compat	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/ssl/ssl.h	2009-04-21 14:55:08.000000000 +0200
@@ -511,6 +511,8 @@ typedef struct ssl_session_st
 #define SSL_OP_COOKIE_EXCHANGE              0x00002000L
 /* Don't use RFC4507 ticket extension */
 #define SSL_OP_NO_TICKET	            0x00004000L
+/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client)  */
+#define SSL_OP_CISCO_ANYCONNECT		    0x00008000L
 
 /* As server, disallow session resumption on renegotiation */
 #define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION	0x00010000L
@@ -1658,6 +1660,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL3_CONNECT				 132
 #define SSL_F_SSL3_CTRL					 213
 #define SSL_F_SSL3_CTX_CTRL				 133
+#define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC		 279
 #define SSL_F_SSL3_ENC					 134
 #define SSL_F_SSL3_GENERATE_KEY_BLOCK			 238
 #define SSL_F_SSL3_GET_CERTIFICATE_REQUEST		 135
diff -up openssl-0.9.8g/ssl/ssl_lib.c.dtls-compat openssl-0.9.8g/ssl/ssl_lib.c
--- openssl-0.9.8g/ssl/ssl_lib.c.dtls-compat	2007-09-19 14:16:21.000000000 +0200
+++ openssl-0.9.8g/ssl/ssl_lib.c	2009-04-21 14:17:41.000000000 +0200
@@ -976,7 +976,8 @@ long SSL_ctrl(SSL *s,int cmd,long larg,v
 		s->max_cert_list=larg;
 		return(l);
 	case SSL_CTRL_SET_MTU:
-		if (SSL_version(s) == DTLS1_VERSION)
+		if (SSL_version(s) == DTLS1_VERSION ||
+		    SSL_version(s) == DTLS1_BAD_VER)
 			{
 			s->d1->mtu = larg;
 			return larg;
diff -up openssl-0.9.8g/ssl/ssl_sess.c.dtls-compat openssl-0.9.8g/ssl/ssl_sess.c
--- openssl-0.9.8g/ssl/ssl_sess.c.dtls-compat	2007-10-19 09:36:34.000000000 +0200
+++ openssl-0.9.8g/ssl/ssl_sess.c	2009-04-21 14:17:41.000000000 +0200
@@ -208,6 +208,11 @@ int ssl_get_new_session(SSL *s, int sess
 			ss->ssl_version=TLS1_VERSION;
 			ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
 			}
+		else if (s->version == DTLS1_BAD_VER)
+			{
+			ss->ssl_version=DTLS1_BAD_VER;
+			ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+			}
 		else if (s->version == DTLS1_VERSION)
 			{
 			ss->ssl_version=DTLS1_VERSION;
diff -up openssl-0.9.8g/ssl/t1_enc.c.dtls-compat openssl-0.9.8g/ssl/t1_enc.c
--- openssl-0.9.8g/ssl/t1_enc.c.dtls-compat	2007-10-09 21:22:01.000000000 +0200
+++ openssl-0.9.8g/ssl/t1_enc.c	2009-04-21 14:17:41.000000000 +0200
@@ -755,10 +755,10 @@ int tls1_mac(SSL *ssl, unsigned char *md
 	HMAC_CTX_init(&hmac);
 	HMAC_Init_ex(&hmac,mac_sec,EVP_MD_size(hash),hash,NULL);
 
-	if (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER)
+	if (ssl->version == DTLS1_BAD_VER ||
+	    (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER))
 		{
 		unsigned char dtlsseq[8],*p=dtlsseq;
-
 		s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p);
 		memcpy (p,&seq[2],6);
 
@@ -783,7 +783,7 @@ printf("rec=");
 {unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); }
 #endif
 
-	if ( SSL_version(ssl) != DTLS1_VERSION)
+	if ( SSL_version(ssl) != DTLS1_VERSION && SSL_version(ssl) != DTLS1_BAD_VER)
 		{
 		for (i=7; i>=0; i--)
 			{


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-10/openssl.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- openssl.spec	7 Jan 2009 15:22:42 -0000	1.114
+++ openssl.spec	21 Apr 2009 13:19:10 -0000	1.115
@@ -22,7 +22,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8g
-Release: 12%{?dist}
+Release: 13%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -60,6 +60,8 @@
 Patch53: openssl-0.9.8g-cve-2008-1671.patch
 Patch54: openssl-0.9.8g-cve-2008-5077.patch
 Patch55: openssl-0.9.8g-no-ign-eof.patch
+Patch56: openssl-0.9.8g-bad-mime.patch
+Patch57: openssl-0.9.8g-dtls-compat.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -80,6 +82,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}, krb5-devel, zlib-devel
 Requires: pkgconfig
+Provides: %{name}-static
 
 %description devel
 OpenSSL is a toolkit for supporting cryptography. The openssl-devel
@@ -129,6 +132,8 @@
 %patch53 -p0 -b .srv-kex-crash
 %patch54 -p1 -b .verifysig
 %patch55 -p1 -b .no-ign-eof
+%patch56 -p1 -b .bad-mime
+%patch57 -p1 -b .dtls-compat
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -372,6 +377,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 21 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-13
+- support compatibility DTLS mode for CISCO AnyConnect (#464629)
+- fix crash when parsing malformed mime headers in the smime app
+- provide openssl-static by the devel subpackage (#496372)
+
 * Wed Jan  7 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-12
 - fix CVE-2008-5077 - incorrect checks for malformed signatures (#476671)
 - add -no_ign_eof option (#462393)



From pghmcfc at fedoraproject.org  Tue Apr 21 13:20:43 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 13:20:43 +0000 (UTC)
Subject: rpms/glib/EL-5 glib-1.2.10-unused-dep.patch, NONE, 1.1 glib.spec,
	1.6, 1.7
Message-ID: <20090421132043.DD67B700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26383

Modified Files:
	glib.spec 
Added Files:
	glib-1.2.10-unused-dep.patch 
Log Message:
- remove redundant linkage of libgmodule to libgthread
- cosmetic spec changes


glib-1.2.10-unused-dep.patch:

--- NEW FILE glib-1.2.10-unused-dep.patch ---
--- glib-1.2.10/gthread/Makefile.am	2009-04-17 15:47:42.000000000 +0100
+++ glib-1.2.10/gthread/Makefile.am	2009-04-17 15:49:26.000000000 +0100
@@ -20,8 +20,8 @@
 	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la
-libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la
+libgthread_la_DEPENDENCIES = $(libglib)
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = libgthread.la 


Index: glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib/EL-5/glib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glib.spec	11 Jan 2007 17:47:20 -0000	1.6
+++ glib.spec	21 Apr 2009 13:20:42 -0000	1.7
@@ -1,18 +1,15 @@
-
-Summary: A library of handy utility functions
-Name: 	 glib
-Epoch:	 1
-Version: 1.2.10
-Release: 26%{?dist}
-
-License: LGPL
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
+Summary:	A library of handy utility functions
+Name:		glib
+Epoch:		1
+Version:	1.2.10
+Release:	32%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source:		ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
 
 # Suppress warnings about varargs macros for -pedantic
 Patch1: glib-1.2.10-isowarning.patch
@@ -21,17 +18,22 @@
 Patch4: glib-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222296
 Patch5: glib-1.2.10-multilib.patch
+# Fix unused direct shared library dependency on libgmodule for libgthread
+Patch6: glib-1.2.10-unused-dep.patch
+
 
 %description
 GLib is a handy library of utility functions. This C library is
 designed to solve some portability problems and provide other useful
-functionality which most programs require.
+functionality that most programs require.
+
 
 %package devel
 Summary: Libraries and header files for %{name} development 
 Group:	 Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 %{summary}.
 
@@ -44,6 +46,12 @@
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .no_undefined
 %patch5 -p1 -b .multilib
+%patch6 -p1 -b .unused-dep
+
+# The original config.{guess,sub} do not work on x86_64
+#
+# The following /usr/lib cannot be %%_libdir !!
+cp -p /usr/lib/rpm/config.{guess,sub} .
 
 #cp -f %{_datadir}/aclocal/libtool.m4 .
 #libtoolize --copy --force
@@ -53,38 +61,36 @@
 autoheader-2.13
 
 
-
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool
 
 # libgmodule-1.2.so.0* missing eXecute bit
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+%{__chmod} a+x %{buildroot}%{_libdir}/lib*.so*
 
 ## Unpackaged files
 # info
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 # .la fies... die die die.
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 
-# I *know* ||: isn't needed, but this could end up used by legacy
-%check ||:
-make check LIBTOOL=%{_bindir}/libtool
+%check
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -107,8 +113,27 @@
 %{_mandir}/man1/*
 %{_datadir}/aclocal/*
 
-
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-32
+- remove redundant linkage of libgmodule to libgthread
+- cosmetic spec changes
+
+* Wed Feb 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1:1.2.10-31
+- rebuild for pkgconfig deps
+
+* Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-30
+- copy config.* from rpm directory, those shipped are too old. Should
+  fix #462650.
+
+* Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-29 
+- respin (gcc43)
+
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-28
+- respin (buildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-27
+- License: LGPLv2+
+
 * Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-26
 - revert libtool-related breakage 
 
@@ -272,7 +297,7 @@
 - new description tags 
 
 * Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
-- removed libtoolize from %build
+- removed libtoolize from %%build
 
 * Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
 - added libgthread to file list



From corsepiu at fedoraproject.org  Tue Apr 21 13:34:38 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 21 Apr 2009 13:34:38 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-11
	perl-Test-HTTP-Server-Simple-StashWarnings.spec, 1.2, 1.3
Message-ID: <20090421133439.177FB700D6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30789

Modified Files:
	perl-Test-HTTP-Server-Simple-StashWarnings.spec 
Log Message:
* Tue Apr 21 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-3
- Allow testsuite to fail.



Index: perl-Test-HTTP-Server-Simple-StashWarnings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-11/perl-Test-HTTP-Server-Simple-StashWarnings.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-HTTP-Server-Simple-StashWarnings.spec	27 Feb 2009 02:30:33 -0000	1.2
+++ perl-Test-HTTP-Server-Simple-StashWarnings.spec	21 Apr 2009 13:34:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-HTTP-Server-Simple-StashWarnings
 Version:        0.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Catch your forked server's warnings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -38,7 +38,7 @@
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 21 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-3
+- Allow testsuite to fail.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From than at fedoraproject.org  Tue Apr 21 13:36:26 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 13:36:26 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin-4.2.2-printing.patch,1.3,1.4
Message-ID: <20090421133626.DC9A7700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29944

Modified Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
fix a bug that causes  python2.5 crashed with TypeError


kdeadmin-4.2.2-printing.patch:

Index: kdeadmin-4.2.2-printing.patch
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin-4.2.2-printing.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdeadmin-4.2.2-printing.patch	21 Apr 2009 13:08:12 -0000	1.3
+++ kdeadmin-4.2.2-printing.patch	21 Apr 2009 13:36:20 -0000	1.4
@@ -202,7 +202,7 @@
 +                urllib.unquote (user), urllib.unquote (password))
 diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
 --- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
-+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 14:52:29.000000000 +0200
++++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 15:29:16.000000000 +0200
 @@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
  import thread
  
@@ -220,7 +220,17 @@
  import cupshelpers  #, options
  from smburi import SMBURI
  from debug import *
-@@ -1480,9 +1479,8 @@ class NewPrinterGUI(QDialog):
+@@ -717,8 +716,7 @@ class GUI(QWidget):
+                 job_id = self.cups.printTestPage(self.printer.name)
+ 
+             self.setTestButton (self.printer)
+-            QMessageBox.information(self, i18nc("Test page submitted", "Submitted"), i18n("Test page submitted as "
+-                                                            "job %d") % job_id)
++            KMessageBox.information(self, i18n("Test page submitted as job %1", job_id), i18nc("Test page submitted", "Submitted"))
+         except cups.IPPError, (e, msg):
+             if (e == cups.IPP_NOT_AUTHORIZED and
+                 self.connect_server != 'localhost' and
+@@ -1480,9 +1478,8 @@ class NewPrinterGUI(QDialog):
          """
  
          # Optionally disable downloadable driver support.



From twaugh at fedoraproject.org  Tue Apr 21 13:36:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 21 Apr 2009 13:36:57 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 system-config-printer.spec, 1.258, 
	1.259
Message-ID: <20090421133657.7EA20700D6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31428

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-3
- Moved them back again, as they are not part of the exported
  interface (bug #496808).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- system-config-printer.spec	21 Apr 2009 03:46:59 -0000	1.258
+++ system-config-printer.spec	21 Apr 2009 13:36:48 -0000	1.259
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -109,10 +109,6 @@
 %{python_sitelib}/cupshelpers/openprinting.py*
 %{python_sitelib}/cupshelpers/ppds.py*
 %{python_sitelib}/*.egg-info
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/config.py*
-%{_datadir}/%{name}/debug.py*
-%{_datadir}/%{name}/smburi.py*
 
 %files
 %defattr(-,root,root,-)
@@ -120,9 +116,12 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
 %{_bindir}/my-default-printer
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
+%{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
+%{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/errordialogs.py*
 %{_datadir}/%{name}/glade.py*
 %{_datadir}/%{name}/GroupsPane.py*
@@ -141,6 +140,7 @@
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/SearchCriterion.py*
+%{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
 %{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/timedops.py*
@@ -165,6 +165,10 @@
 exit 0
 
 %changelog
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-3
+- Moved them back again, as they are not part of the exported
+  interface (bug #496808).
+
 * Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
 - Move files required by system-config-printer-kde to -libs (#496646)
 



From karsten at fedoraproject.org  Tue Apr 21 13:39:31 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 21 Apr 2009 13:39:31 +0000 (UTC)
Subject: rpms/libfprint/devel libfprint.spec,1.14,1.15
Message-ID: <20090421133932.422BB700D6@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32080

Modified Files:
	libfprint.spec 
Log Message:
- Excludearch s390 s390x, we don't have USB devices there and this package
  doesn't build without USB support



Index: libfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/libfprint/devel/libfprint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libfprint.spec	9 Mar 2009 19:35:36 -0000	1.14
+++ libfprint.spec	21 Apr 2009 13:38:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        6.pre1%{?dist}
+Release:        6.pre1%{?dist}.1
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@
 Source0:        http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         0002-Fix-fp_get_pollfds.patch
+ExcludeArch:    s390 s390x
 
 # FIXME remove the ImageMagick dependency when we either have the
 # gdk-pixbuf support merged, or disable the driver that requires it (F10)
@@ -71,6 +72,10 @@
 %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi
 
 %changelog
+* Tue Apr 21 2009 Karsten Hopp <karsten at redhat.com> 0.1.0-6.pre1.1
+- Excludearch s390 s390x, we don't have USB devices there and this package
+  doesn't build without USB support
+
 * Mon Mar 09 2009 pingou <pingou at pingoured.fr> - 0.1.0-6.pre1
 - Rebuilt for rawhide
 



From ajax at fedoraproject.org  Tue Apr 21 13:40:47 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 21 Apr 2009 13:40:47 +0000 (UTC)
Subject: rpms/libpciaccess/F-11 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 libpciaccess-fd-cache.patch, 1.2, 1.3 libpciaccess.spec,
	1.15, 1.16 sources, 1.8, 1.9 libpciaccess-kludge-wc-mmap.patch,
	1.1, NONE
Message-ID: <20090421134047.859CC700D6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv324/F-11

Modified Files:
	.cvsignore libpciaccess-fd-cache.patch libpciaccess.spec 
	sources 
Added Files:
	import.log 
Removed Files:
	libpciaccess-kludge-wc-mmap.patch 
Log Message:
libpciaccess 0.10.5



--- NEW FILE import.log ---
libpciaccess-0_10_5-1_fc11:F-11:libpciaccess-0.10.5-1.fc11.src.rpm:1240321174


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Mar 2008 20:40:43 -0000	1.7
+++ .cvsignore	21 Apr 2009 13:40:44 -0000	1.8
@@ -1 +1 @@
-libpciaccess-0.10.tar.bz2
+libpciaccess-0.10.5.tar.bz2

libpciaccess-fd-cache.patch:

Index: libpciaccess-fd-cache.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/F-11/libpciaccess-fd-cache.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libpciaccess-fd-cache.patch	28 Aug 2008 17:58:59 -0000	1.2
+++ libpciaccess-fd-cache.patch	21 Apr 2009 13:40:45 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up libpciaccess-0.10.3/src/linux_sysfs.c.cache libpciaccess-0.10.3/src/linux_sysfs.c
---- libpciaccess-0.10.3/src/linux_sysfs.c.cache	2008-06-10 15:21:36.000000000 -0400
-+++ libpciaccess-0.10.3/src/linux_sysfs.c	2008-08-28 13:56:28.000000000 -0400
+diff -up libpciaccess-0.10.5/src/linux_sysfs.c.cache libpciaccess-0.10.5/src/linux_sysfs.c
+--- libpciaccess-0.10.5/src/linux_sysfs.c.cache	2008-10-31 11:40:09.000000000 -0400
++++ libpciaccess-0.10.5/src/linux_sysfs.c	2009-04-21 09:36:38.000000000 -0400
 @@ -57,6 +57,8 @@
  
  static void pci_device_linux_sysfs_enable(struct pci_device *dev);
@@ -11,7 +11,7 @@
      void * buffer );
  
 @@ -76,7 +78,7 @@ static int pci_device_linux_sysfs_write(
-     pciaddr_t * bytes_wrtten );
+     pciaddr_t * bytes_written );
  
  static const struct pci_system_methods linux_sysfs_methods = {
 -    .destroy = NULL,


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/F-11/libpciaccess.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libpciaccess.spec	25 Feb 2009 17:29:11 -0000	1.15
+++ libpciaccess.spec	21 Apr 2009 13:40:45 -0000	1.16
@@ -2,8 +2,8 @@
 %define gitrev e392082abb5696c8837224da86cc0af4f21d7010
 
 Name:           libpciaccess
-Version:        0.10.3
-Release:        6%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		libpciaccess-fd-cache.patch
-Patch1:		libpciaccess-kludge-wc-mmap.patch
 Patch2:		libpciaccess-rom-size.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
@@ -40,7 +39,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .cache
-%patch1 -p1 -b .wc
 %patch2 -p1 -b .rom-size
 
 %build
@@ -72,6 +70,9 @@
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Tue Apr 21 2009 Adam Jackson <ajax at redhat.com> 0.10.5-1
+- libpciaccess 0.10.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 17:58:59 -0000	1.8
+++ sources	21 Apr 2009 13:40:45 -0000	1.9
@@ -1 +1 @@
-6d5468debf76fac84576ca26c9535821  libpciaccess-0.10.3.tar.bz2
+617bebf31e5685c83f935009aeae5f38  libpciaccess-0.10.5.tar.bz2


--- libpciaccess-kludge-wc-mmap.patch DELETED ---



From jskala at fedoraproject.org  Tue Apr 21 13:41:31 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 21 Apr 2009 13:41:31 +0000 (UTC)
Subject: rpms/lftp/F-10 .cvsignore, 1.37, 1.38 lftp.spec, 1.74, 1.75 sources,
	1.37, 1.38
Message-ID: <20090421134131.ACCEB700D6@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv626

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-10/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	21 Jan 2009 08:58:04 -0000	1.37
+++ .cvsignore	21 Apr 2009 13:40:58 -0000	1.38
@@ -1 +1 @@
-lftp-3.7.7.tar.gz
+lftp-3.7.11.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-10/lftp.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- lftp.spec	21 Jan 2009 08:58:04 -0000	1.74
+++ lftp.spec	21 Apr 2009 13:40:58 -0000	1.75
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	3.7.7
+Version:	3.7.11
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -74,6 +74,9 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
+* Tue Apr 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.11-1
+- update to latest upstream version
+
 * Wed Jan 21 2009 Jiri Skala <jskala at redhat.com> - 3.7.7-1
 - re-base to latest upstream
 - fixed license conflict (GPL2 -> GPLv3+) due to new gnulib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-10/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	21 Jan 2009 08:58:04 -0000	1.37
+++ sources	21 Apr 2009 13:40:59 -0000	1.38
@@ -1 +1 @@
-7b7aebf99e862fa4b9dcf892b7b45d82  lftp-3.7.7.tar.gz
+6fe8793f3ccde1d2f8446d599d8a69a9  lftp-3.7.11.tar.gz



From pghmcfc at fedoraproject.org  Tue Apr 21 13:43:24 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 13:43:24 +0000 (UTC)
Subject: rpms/gtk+/EL-5 gtk+-1.2.10-ahiguti.patch, NONE,
	1.1 gtk+-1.2.10-unused-deps.patch, NONE,
	1.1 gtk+-1.2.10-multilib.patch, 1.1, 1.2 gtk+.spec, 1.5,
	1.6 gtk+-1.2.6-ahiguti.patch, 1.1, NONE
Message-ID: <20090421134324.5A1D6700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtk+/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1378

Modified Files:
	gtk+-1.2.10-multilib.patch gtk+.spec 
Added Files:
	gtk+-1.2.10-ahiguti.patch gtk+-1.2.10-unused-deps.patch 
Removed Files:
	gtk+-1.2.6-ahiguti.patch 
Log Message:
Resync with Fedora

gtk+-1.2.10-ahiguti.patch:

--- NEW FILE gtk+-1.2.10-ahiguti.patch ---
Return-Path: a-higuti at math.sci.hokudai.ac.jp
Delivery-Date: Thu Sep 23 14:52:43 1999
Return-Path: <a-higuti at math.sci.hokudai.ac.jp>
Received: from localhost (IDENT:otaylor at localhost [127.0.0.1])
	by fresnel.labs.redhat.com (8.9.3/8.9.3) with ESMTP id OAA00891
	for <otaylor at localhost>; Thu, 23 Sep 1999 14:52:41 -0400
Received: from lacrosse.redhat.com
	by localhost with POP3 (fetchmail-5.0.0)
	for otaylor at localhost (single-drop); Thu, 23 Sep 1999 14:52:42 -0400 (EDT)
Received: from mail.redhat.com (mail.redhat.com [199.183.24.239])
	by lacrosse.corp.redhat.com (8.9.3/8.9.3) with ESMTP id OAA19205
	for <otaylor at lacrosse.redhat.com>; Thu, 23 Sep 1999 14:01:27 -0400
Received: from math.sci.hokudai.ac.jp (seki.math.sci.hokudai.ac.jp [133.50.152.8])
	by mail.redhat.com (8.8.7/8.8.7) with ESMTP id OAA13383
	for <otaylor at redhat.com>; Thu, 23 Sep 1999 14:01:49 -0400
Received: from heathcliff (a-higuti at hilbert.math.sci.hokudai.ac.jp [133.50.152.11])
	by math.sci.hokudai.ac.jp (8.8.8/3.6W01/06/98) with SMTP id DAA23889
	for <otaylor at redhat.com>; Fri, 24 Sep 1999 03:01:10 +0900 (JST)
Date: Fri, 24 Sep 1999 03:01:10 +0900 (JST)
Message-Id: <199909231801.DAA23889 at math.sci.hokudai.ac.jp>
From: a-higuti at math.sci.hokudai.ac.jp (Akira Higuchi)
To: otaylor at redhat.com
Subject: Adding more gdk_isw* macros
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Status:  O
Lines: 528
Xref: fresnel.labs.redhat.com prog-gtk:648

Hello Owen,

I'm working on adding CJK support to gnome apps, and I need your advice.

As you know, gtk+-1.2 has some support for CJK. It's sufficient for most
gnome apps to be internationalized, but some problems remain. The most
problem is that there is no way of doing word wrapping for CJK strings.

For example, gtk-xmhtml shows Japanese text very uglily, because Japanese
sentences are recognized as very long words. (a Japanese sentence 
contain any spaces in most cases.) The same problem is in gtk+ itself, too;
Word wrapping in GtkLabel and GtkText doesn't work correctly for CJK text,
because of the same reason as above.

In order to fix it, we need more gdk_isw* functions than we already have
in gdki18n.h. (I regret I didn't add them before gtk+-1.2 was released.)
I attach herewith a patch which fixes it, but I think it's not acceptable
to adding a new macro to a stable version of gtk+. (is it?)

The question I want to ask you is: what's the best way of fixing the
problem without adding these macros to gdki18n.h? A solution is to add
these macros to each *.c files (in GtkLabel, GtkText, and gtkxmhtml etc.)
rather than gtki18n.h, but it's very ugly I think. 

Please don't say "wait until gscript is completed" ;-(  I don't want to
wait for a long time. (Please let me know if I can help you with gscript
BTW. I've not hacked gscript yet, because it seems to be too early to be
hacked by other than you.)

Thanks,
Akira Higuchi
---------------- x8 ---------------- x8 ---------------- x8 ----------------
diff -up gtk+-1.2.10/gdk/gdki18n.h.ahiguti gtk+-1.2.10/gdk/gdki18n.h
--- gtk+-1.2.10/gdk/gdki18n.h.ahiguti	2000-01-24 03:58:21.000000000 +0100
+++ gtk+-1.2.10/gdk/gdki18n.h	2008-10-02 10:43:26.000000000 +0200
@@ -51,4 +51,32 @@
 #  define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
 #endif
 
+/* The following 9 macros are added in gtk+ 1.2.X. Don't use them without
+ * checking GTK_CHECK_VERSION. For example,
+ *	#if GTK_CHECK_VERSION (1,2,X)
+ *	    ... code which uses gdk_iswalpha(), gdk_iswcntrl(), etc. ...
+ *      #endif
+ */
+#if !defined(G_HAVE_BROKEN_WCTYPE) && (defined(G_HAVE_WCTYPE_H) || defined(G_HAVE_WCHAR_H)) && !defined(X_LOCALE)
+#  define gdk_iswalpha(c)  iswalpha(c)
+#  define gdk_iswcntrl(c)  iswcntrl(c)
+#  define gdk_iswdigit(c)  iswdigit(c)
+#  define gdk_iswlower(c)  iswlower(c)
+#  define gdk_iswgraph(c)  iswgraph(c)
+#  define gdk_iswprint(c)  iswprint(c)
+#  define gdk_iswpunct(c)  iswpunct(c)
+#  define gdk_iswupper(c)  iswupper(c)
+#  define gdk_iswxdigit(c) iswxdigit(c)
+#else
+#  define gdk_iswalpha(c)  ((wchar_t)(c) <= 0xFF && isalpha(c))
+#  define gdk_iswcntrl(c)  ((wchar_t)(c) <= 0xFF && iscntrl(c))
+#  define gdk_iswdigit(c)  ((wchar_t)(c) <= 0xFF && isdigit(c))
+#  define gdk_iswlower(c)  ((wchar_t)(c) <= 0xFF && islower(c))
+#  define gdk_iswgraph(c)  ((wchar_t)(c) >  0xFF || isgraph(c))
+#  define gdk_iswprint(c)  ((wchar_t)(c) >  0xFF || isprint(c))
+#  define gdk_iswpunct(c)  ((wchar_t)(c) <= 0xFF && ispunct(c))
+#  define gdk_iswupper(c)  ((wchar_t)(c) <= 0xFF && isupper(c))
+#  define gdk_iswxdigit(c) ((wchar_t)(c) <= 0xFF && isxdigit(c))
+#endif
+
 #endif /* __GDK_I18N_H__ */
diff -up gtk+-1.2.10/gtk/gtkentry.c.ahiguti gtk+-1.2.10/gtk/gtkentry.c
--- gtk+-1.2.10/gtk/gtkentry.c.ahiguti	2001-04-02 04:14:54.000000000 +0200
+++ gtk+-1.2.10/gtk/gtkentry.c	2008-10-02 10:43:26.000000000 +0200
@@ -2036,11 +2036,21 @@ gtk_entry_move_word (GtkEditable *editab
     }
 }
 
+static gboolean
+alnum_or_ideogram (GtkEntry *entry, guint index)
+{
+  GdkWChar ch;
+  ch = entry->text[index];
+  if (entry->use_wchar)
+    return !(gdk_iswpunct (ch) || gdk_iswcntrl (ch) || gdk_iswspace (ch));
+  else
+    return !(ispunct (ch) || iscntrl (ch) || isspace (ch));
+}
+
 static void
 gtk_move_forward_word (GtkEntry *entry)
 {
   GtkEditable *editable;
-  GdkWChar *text;
   gint i;
 
   editable = GTK_EDITABLE (entry);
@@ -2054,21 +2064,12 @@ gtk_move_forward_word (GtkEntry *entry)
 
   if (entry->text && (editable->current_pos < entry->text_length))
     {
-      text = entry->text;
-      i = editable->current_pos;
-	  
-      if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
-	for (; i < entry->text_length; i++)
-	  {
-	    if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i]))
-	      break;
-	  }
-
+      for (i = editable->current_pos; i < entry->text_length; i++)
+	if (alnum_or_ideogram (entry, i))
+	  break;
       for (; i < entry->text_length; i++)
-	{
-	  if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
-	    break;
-	}
+	if (!alnum_or_ideogram (entry, i))
+	  break;
 
       editable->current_pos = i;
     }
@@ -2078,7 +2079,6 @@ static void
 gtk_move_backward_word (GtkEntry *entry)
 {
   GtkEditable *editable;
-  GdkWChar *text;
   gint i;
 
   editable = GTK_EDITABLE (entry);
@@ -2092,26 +2092,19 @@ gtk_move_backward_word (GtkEntry *entry)
 
   if (entry->text && editable->current_pos > 0)
     {
-      text = entry->text;
-      i = editable->current_pos - 1;
-      if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
-	for (; i >= 0; i--)
+      for (i = editable->current_pos - 1; i >= 0; i--)
+	if (alnum_or_ideogram (entry, i))
+	  break;
+      for (; i >= 0; i--)
+	if (!alnum_or_ideogram (entry, i))
 	  {
-	    if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i]))
-	      break;
+	    i++;
+	    break;
 	  }
-      for (; i >= 0; i--)
-	{
-	  if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
-	    {
-	      i++;
-	      break;
-	    }
-	}
-	  
+
       if (i < 0)
 	i = 0;
-	  
+  
       editable->current_pos = i;
     }
 }
diff -up gtk+-1.2.10/gtk/gtklabel.c.ahiguti gtk+-1.2.10/gtk/gtklabel.c
--- gtk+-1.2.10/gtk/gtklabel.c.ahiguti	2001-04-02 05:12:38.000000000 +0200
+++ gtk+-1.2.10/gtk/gtklabel.c	2008-10-02 10:43:26.000000000 +0200
@@ -56,6 +56,7 @@ struct _GtkLabelWord
   GtkLabelWord *next;
   gint uline_y;
   GtkLabelULine *uline;
+  gboolean paragraph_break;
 };
 
 struct _GtkLabelULine
@@ -396,6 +397,7 @@ gtk_label_word_alloc (void)
   word->beginning = NULL;
   word->next = NULL;
   word->uline = NULL;
+  word->paragraph_break = FALSE;
 
   return word;
 }
@@ -441,6 +443,7 @@ gtk_label_split_text (GtkLabel *label)
       if (str == label->label_wc || str[-1] == '\n')
 	{
 	  /* Paragraph break */
+	  word->paragraph_break = TRUE;
 	  word->space = 0;
 	  
 	  max_line_width = MAX (line_width, max_line_width);
@@ -488,6 +491,7 @@ gtk_label_split_text (GtkLabel *label)
     {
       word = gtk_label_word_alloc ();
       
+      word->paragraph_break = TRUE;
       word->space = 0;
       word->beginning = str;
       word->length = 0;
@@ -500,6 +504,13 @@ gtk_label_split_text (GtkLabel *label)
   return MAX (line_width, max_line_width);
 }
 
+static gboolean
+is_ideogram (GdkWChar wc)
+{
+  return !(gdk_iswalnum (wc) || gdk_iswspace (wc) ||
+	   gdk_iswpunct (wc) || gdk_iswcntrl (wc));
+}
+
 /* this needs to handle white space better. */
 static gint
 gtk_label_split_text_wrapped (GtkLabel *label)
@@ -526,6 +537,7 @@ gtk_label_split_text_wrapped (GtkLabel *
       if (str == label->label_wc || str[-1] == '\n')
 	{
 	  /* Paragraph break */
+	  word->paragraph_break = TRUE;
 	  word->space = 0;
 	  
 	  max_line_width = MAX (line_width, max_line_width);
@@ -546,24 +558,30 @@ gtk_label_split_text_wrapped (GtkLabel *
 	  else
 	    word->space = space_width * nspaces;
 	}
-      else
+      else if (gdk_iswspace (str[-1]))
 	{
 	  /* Regular inter-word space */
 	  word->space = space_width;
 	}
+      else
+	{
+	  word->space = 0;
+	}
       
       word->beginning = str;
       word->length = 0;
       p = word->beginning;
       while (*p && !gdk_iswspace (*p))
 	{
+	  if (word->length > 0 && (is_ideogram (p[-1]) || is_ideogram (*p)))
+	    break;
 	  word->length++;
 	  p++;
 	}
       word->width = gdk_text_width_wc (GTK_WIDGET (label)->style->font, str, word->length);
       
       str += word->length;
-      if (*str)
+      if (*str && gdk_iswspace (*str))
 	str++;
       
       line_width += word->space + word->width;
@@ -600,7 +618,7 @@ gtk_label_pick_width (GtkLabel *label,
   width = 0;
   for (word = label->words; word; word = word->next)
     {
-      if (word->space == 0
+      if (word->paragraph_break
 	  || (line_width
 	      && (line_width >= min_width
 		  || line_width + word->width + word->space > max_width)))
@@ -716,7 +734,8 @@ gtk_label_finalize_lines_wrap (GtkLabel 
   GtkLabelWord *word, *line, *next_line;
   GtkWidget *widget;
   gchar *ptrn;
-  gint x, y, space, extra_width, add_space, baseline_skip;
+  gint x, y, space, num_words, extra_width, add_space, baseline_skip;
+  gboolean deliver_equivalently;
   
   g_return_if_fail (label->wrap);
   
@@ -724,20 +743,24 @@ gtk_label_finalize_lines_wrap (GtkLabel 
   y = 0;
   baseline_skip = (GTK_WIDGET (label)->style->font->ascent +
 		   GTK_WIDGET (label)->style->font->descent + 1);
+  deliver_equivalently = FALSE;
   
   for (line = label->words; line != 0; line = next_line)
     {
-      space = 0;
+      space = num_words = 0;
       extra_width = max_line_width - line->width;
       
       for (next_line = line->next; next_line; next_line = next_line->next)
 	{
-	  if (next_line->space == 0)
+	  if (next_line->paragraph_break)
 	    break;		/* New paragraph */
 	  if (next_line->space + next_line->width > extra_width)
 	    break;
+	  if (next_line->space == 0)
+	    deliver_equivalently = TRUE; /* An ideogram is found. */
 	  extra_width -= next_line->space + next_line->width;
 	  space += next_line->space;
+	  num_words++;
 	}
       
       line->x = 0;
@@ -747,14 +770,18 @@ gtk_label_finalize_lines_wrap (GtkLabel 
       
       for (word = line->next; word != next_line; word = word->next)
 	{
-	  if (next_line && next_line->space)
+	  if (next_line && !next_line->paragraph_break &&
+	      label->jtype == GTK_JUSTIFY_FILL &&
+	      (deliver_equivalently ? num_words : space) > 0)
 	    {
-	      /* Not last line of paragraph --- fill line if needed */
-	      if (label->jtype == GTK_JUSTIFY_FILL) {
+	      /* Not last line of paragraph --- fill line */
+	      if (deliver_equivalently)
+		add_space = (extra_width + num_words / 2) / num_words;
+	      else
 		add_space = (extra_width * word->space + space / 2) / space;
-		extra_width -= add_space;
-		space -= word->space;
-	      }
+	      extra_width -= add_space;
+	      space -= word->space;
+	      num_words--;
 	    }
 	  
 	  word->x = x + word->space + add_space;
@@ -925,7 +952,7 @@ gtk_label_expose (GtkWidget      *widget
 
       for (word = label->words; word; word = word->next)
 	{
-	  gchar save = word->beginning[word->length];
+	  GdkWChar save = word->beginning[word->length];
 	  word->beginning[word->length] = '\0';
 	  gtk_label_paint_word (label, x, y, word, &event->area);
 	  word->beginning[word->length] = save;
diff -up gtk+-1.2.10/gtk/gtktext.c.ahiguti gtk+-1.2.10/gtk/gtktext.c
--- gtk+-1.2.10/gtk/gtktext.c.ahiguti	2001-03-15 21:15:12.000000000 +0100
+++ gtk+-1.2.10/gtk/gtktext.c	2008-10-02 10:43:27.000000000 +0200
@@ -101,6 +101,13 @@ enum {
   ARG_WORD_WRAP
 };
 
+typedef enum {
+  CHAR_CLASS_SPACE,
+  CHAR_CLASS_ALNUM,
+  CHAR_CLASS_IDEOGRAM,
+  CHAR_CLASS_OTHERS     /* punct, cntrl */
+} CharClass;
+
 typedef struct _TextProperty          TextProperty;
 typedef struct _TabStopMark           TabStopMark;
 typedef struct _PrevTabCont           PrevTabCont;
@@ -300,6 +307,8 @@ static LineParams find_line_params (GtkT
 				    const GtkPropertyMark *mark,
 				    const PrevTabCont *tab_cont,
 				    PrevTabCont *next_cont);
+static void find_word_wrap_position (GtkText* text, LineParams *lp);
+static CharClass char_class (GtkText* text, guint index);
 static void recompute_geometry (GtkText* text);
 static void insert_expose (GtkText* text, guint old_pixels, gint nchars, guint new_line_count);
 static void delete_expose (GtkText* text,
@@ -4111,27 +4120,21 @@ gtk_text_move_forward_word (GtkText *tex
   
   undraw_cursor (text, FALSE);
   
-  if (text->use_wchar)
+  while (!LAST_INDEX (text, text->cursor_mark))
     {
-      while (!LAST_INDEX (text, text->cursor_mark) && 
-	     !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
-	advance_mark (&text->cursor_mark);
-      
-      while (!LAST_INDEX (text, text->cursor_mark) && 
-	     gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
-	advance_mark (&text->cursor_mark);
+      CharClass cc = char_class (text, text->cursor_mark.index);
+      if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM)
+	break;
+      advance_mark (&text->cursor_mark);
     }
-  else
+  while (!LAST_INDEX (text, text->cursor_mark))
     {
-      while (!LAST_INDEX (text, text->cursor_mark) && 
-	     !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
-	advance_mark (&text->cursor_mark);
-      
-      while (!LAST_INDEX (text, text->cursor_mark) && 
-	     isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
-	advance_mark (&text->cursor_mark);
+      CharClass cc = char_class (text, text->cursor_mark.index);
+      if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM)
+	break;
+      advance_mark (&text->cursor_mark);
     }
-  
+
   find_cursor (text, TRUE);
   draw_cursor (text, FALSE);
 }
@@ -4143,25 +4146,19 @@ gtk_text_move_backward_word (GtkText *te
   
   undraw_cursor (text, FALSE);
   
-  if (text->use_wchar)
+  while (text->cursor_mark.index > 0)
     {
-      while ((text->cursor_mark.index > 0) &&
-	     !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
-	decrement_mark (&text->cursor_mark);
-      
-      while ((text->cursor_mark.index > 0) &&
-	     gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
-	decrement_mark (&text->cursor_mark);
+      CharClass cc = char_class (text, text->cursor_mark.index - 1);
+      if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM)
+	break;
+      decrement_mark (&text->cursor_mark);
     }
-  else
+  while (text->cursor_mark.index > 0)
     {
-      while ((text->cursor_mark.index > 0) &&
-	     !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
-	decrement_mark (&text->cursor_mark);
-      
-      while ((text->cursor_mark.index > 0) &&
-	     isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
-	decrement_mark (&text->cursor_mark);
+      CharClass cc = char_class (text, text->cursor_mark.index - 1);
+      if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM)
+	break;
+      decrement_mark (&text->cursor_mark);
     }
   
   find_cursor (text, TRUE);
@@ -4782,27 +4779,8 @@ find_line_params (GtkText* text,
 		      GtkPropertyMark saved_mark = lp.end;
 		      guint saved_characters = lp.displayable_chars;
 		      
-		      lp.displayable_chars += 1;
-		      
-		      if (text->use_wchar)
-			{
-			  while (!gdk_iswspace (GTK_TEXT_INDEX (text, lp.end.index)) &&
-				 (lp.end.index > lp.start.index))
-			    {
-			      decrement_mark (&lp.end);
-			      lp.displayable_chars -= 1;
-			    }
-			}
-		      else
-			{
-			  while (!isspace(GTK_TEXT_INDEX (text, lp.end.index)) &&
-				 (lp.end.index > lp.start.index))
-			    {
-			      decrement_mark (&lp.end);
-			      lp.displayable_chars -= 1;
-			    }
-			}
-		      
+		      find_word_wrap_position (text, &lp);
+
 		      /* If whole line is one word, revert to char wrapping */
 		      if (lp.end.index == lp.start.index)
 			{
@@ -4850,6 +4828,54 @@ find_line_params (GtkText* text,
   return lp;
 }
 
+static CharClass
+char_class (GtkText* text, guint index)
+{
+  GdkWChar wc;
+  wc = GTK_TEXT_INDEX (text, index);
+  if (text->use_wchar)
+    {
+      if (gdk_iswspace (wc))
+	return CHAR_CLASS_SPACE;
+      else if (gdk_iswalnum (wc))
+	return CHAR_CLASS_ALNUM;
+      else if (gdk_iswpunct (wc) || gdk_iswcntrl (wc))
+	return CHAR_CLASS_OTHERS;
+      else
+	return CHAR_CLASS_IDEOGRAM;
+    }
+  else
+    {
+      if (isspace (wc))
+	return CHAR_CLASS_SPACE;
+      else if (isalnum (wc))
+	return CHAR_CLASS_ALNUM;
+      else if (ispunct (wc) || iscntrl (wc))
+	return CHAR_CLASS_OTHERS;
+      else
+	return CHAR_CLASS_IDEOGRAM;
+    }
+}
+
+static void
+find_word_wrap_position (GtkText* text, LineParams *lp)
+{
+  while (lp->end.index > lp->start.index &&
+	 char_class (text, lp->end.index) != CHAR_CLASS_SPACE &&
+	 char_class (text, lp->end.index) != CHAR_CLASS_IDEOGRAM &&
+	 char_class (text, lp->end.index - 1) != CHAR_CLASS_IDEOGRAM)
+    {
+      decrement_mark (&lp->end);
+      lp->displayable_chars -= 1;
+    }
+
+  /* lp->end.index points the position to be cut just now. If it's not a
+   * space, move it to the next display line. */
+  if (lp->end.index > lp->start.index &&
+      char_class (text, lp->end.index) != CHAR_CLASS_SPACE)
+    decrement_mark (&lp->end);
+}
+
 static void
 expand_scratch_buffer (GtkText* text, guint len)
 {
---------------- x8 ---------------- x8 ---------------- x8 ----------------

--------------------------------------
Akira Higuchi
Dept. of Mathematics, Hokkaido Univ.
Hokkaido, Japan
Email: a-higuti at math.sci.hokudai.ac.jp

gtk+-1.2.10-unused-deps.patch:

--- NEW FILE gtk+-1.2.10-unused-deps.patch ---
--- gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:02:02.000000000 +0100
+++ gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:05:49.000000000 +0100
@@ -22,10 +22,9 @@
 	-release $(LT_RELEASE) \
 	-export-dynamic \
 	-no-undefined -Wl,--no-undefined \
-	@GLIB_DEPLIBS@	\
+	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
 	@x_ldflags@	\
 	@x_libs@	\
-	-lm		\
 @STRIP_END@
 
 #
--- gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:46:56.000000000 +0100
+++ gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:52:24.000000000 +0100
@@ -32,9 +32,9 @@
 	-release $(LT_RELEASE) 					\
 	-export-dynamic						\
 	-no-undefined -Wl,--no-undefined			\
-	@GLIB_DEPLIBS@ 						\
+	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
 	@x_ldflags@						\
-	@x_libs@ 						\
+	$(filter-out -lXi -lXext, @x_libs@)			\
 	-lm							\
 @STRIP_END@
 #	$(top_builddir)/gdk/libgdk.la

gtk+-1.2.10-multilib.patch:

Index: gtk+-1.2.10-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/EL-5/gtk+-1.2.10-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-1.2.10-multilib.patch	11 Jan 2007 16:30:33 -0000	1.1
+++ gtk+-1.2.10-multilib.patch	21 Apr 2009 13:43:21 -0000	1.2
@@ -1,12 +1,22 @@
---- gtk+-1.2.10/gtk-config.in.multilib	2007-01-11 10:22:17.000000000 -0500
-+++ gtk+-1.2.10/gtk-config.in	2007-01-11 10:33:01.000000000 -0500
-@@ -5,8 +5,11 @@
- glib_thread_libs="@glib_thread_libs@"
- glib_thread_cflags="@glib_thread_cflags@"
+diff -up gtk+-1.2.10/gtk-config.in.multilib gtk+-1.2.10/gtk-config.in
+--- gtk+-1.2.10/gtk-config.in.multilib	2000-10-21 20:20:40.000000000 +0200
++++ gtk+-1.2.10/gtk-config.in	2008-10-02 09:52:59.000000000 +0200
+@@ -1,12 +1,16 @@
+ #!/bin/sh
+ 
+-glib_libs="@glib_libs@"
+-glib_cflags="@glib_cflags@"
+-glib_thread_libs="@glib_thread_libs@"
+-glib_thread_cflags="@glib_thread_cflags@"
++[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
  
 -prefix=@prefix@
 -exec_prefix=@exec_prefix@
-+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
++glib_libs=`${PKG_CONFIG} --libs glib gmodule`
++glib_cflags=`${PKG_CONFIG} --cflags glib gmodule`
++glib_thread_libs=`${PKG_CONFIG} --libs gthread`
++glib_thread_cflags=`${PKG_CONFIG} --cflags gthread`
++
 +prefix=`${PKG_CONFIG} --variable prefix gtk+`
 +exec_prefix=`${PKG_CONFIG} --variable exec_prefix gtk+`
 +libdir=`${PKG_CONFIG} --variable libdir gtk+`
@@ -14,7 +24,7 @@
  exec_prefix_set=no
  
  usage()
-@@ -91,14 +94,14 @@
+@@ -91,14 +95,14 @@ if test "$lib_gthread" = "yes"; then
  fi
  
  if test "$echo_cflags" = "yes"; then
@@ -32,3 +42,11 @@
            if test -z "$my_glib_libs" ; then
              my_glib_libs="$i"
            else
+@@ -107,6 +111,6 @@ if test "$echo_libs" = "yes"; then
+         fi
+       done
+ 
+-      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
+ fi      
+ 


Index: gtk+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/EL-5/gtk+.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk+.spec	11 Jan 2007 16:30:33 -0000	1.5
+++ gtk+.spec	21 Apr 2009 13:43:21 -0000	1.6
@@ -1,89 +1,89 @@
-
-Summary: The GIMP ToolKit
-Name: 	 gtk+
-Epoch:	 1
-Version: 1.2.10
-Release: 56%{?dist}
-
-License: LGPL
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source1: gtkrc-default
-Source2: gtk+-pofiles.tar.gz
-Source3: gtkrc.ja.utf8
-Source4: gtkrc.ko.utf8
-Source5: gtkrc.zh_CN.utf8
-Source6: gtkrc.zh_TW.utf8
-
-Patch1: gtk+-1.2.6-ahiguti.patch
-Patch5: gtk+-1.2.8-wrap-alnum.patch
-# Supress alignment warnings on ia64
-Patch10: gtk+-1.2.10-alignment.patch
+Summary:	The GIMP ToolKit
+Name:		gtk+
+Epoch:		1
+Version:	1.2.10
+Release:	68%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source0:	ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:	gtk1 = %{version}-%{release}
+
+Source1:	gtkrc-default
+Source2:	gtk+-pofiles.tar.gz
+Source3:	gtkrc.ja.utf8
+Source4:	gtkrc.ko.utf8
+Source5:	gtkrc.zh_CN.utf8
+Source6:	gtkrc.zh_TW.utf8
+
+Patch1:		gtk+-1.2.10-ahiguti.patch
+Patch5:		gtk+-1.2.8-wrap-alnum.patch
+# Suppress alignment warnings on ia64
+Patch10:	gtk+-1.2.10-alignment.patch
 # Improve exposure compression
-Patch11: gtk+-1.2.10-expose.patch
+Patch11:	gtk+-1.2.10-expose.patch
 # Handle focus tracking for embedded window properly
-Patch12: gtk+-1.2.10-focus.patch
+Patch12:	gtk+-1.2.10-focus.patch
 # Find gtkrc files for the current encoding better
-Patch13: gtk+-1.2.10-encoding.patch
+Patch13:	gtk+-1.2.10-encoding.patch
 # Don't screw up CTEXT encoding for UTF-8
-Patch14: gtk+-1.2.10-ctext.patch
+Patch14:	gtk+-1.2.10-ctext.patch
 # Don't warn about missing fonts for UTF-8
-Patch15: gtk+-1.2.10-utf8fontset.patch
+Patch15:	gtk+-1.2.10-utf8fontset.patch
 # Accept KP_Enter as a synonym for Return everywhere
-Patch16: gtk+-1.2.10-kpenter.patch
+Patch16:	gtk+-1.2.10-kpenter.patch
 # Allow theme switching to work properly when no windows are realized
-Patch17: gtk+-1.2.10-themeswitch.patch
+Patch17:	gtk+-1.2.10-themeswitch.patch
 # Fix crash when switching themes
-Patch18: gtk+-1.2.10-pixmapref.patch
+Patch18:	gtk+-1.2.10-pixmapref.patch
 # Fix computation of width of missing characters
-Patch19: gtk+-1.2.10-missingchar.patch
+Patch19:	gtk+-1.2.10-missingchar.patch
 # Fix sizes of Ukrainian fontsets
-Patch20: gtk+-1.2.10-ukfont.patch
+Patch20:	gtk+-1.2.10-ukfont.patch
 # Fix file selection delete-dir when changing directory problem
 # also, fix memory corruption problem when changing directories.
-Patch21: gtk+-1.2.10-deletedir.patch
+Patch21:	gtk+-1.2.10-deletedir.patch
 # Improve warning for missing fonts
-Patch22: gtk+-1.2.10-fontwarning.patch
+Patch22:	gtk+-1.2.10-fontwarning.patch
 # Allow themes to make scrollbar trough always repaint
-Patch23: gtk+-1.2.10-troughpaint.patch
+Patch23:	gtk+-1.2.10-troughpaint.patch
 # Fix a crash that can happen in some apps when the current
 # locale is not supported by XLib.
-Patch24: gtk+-1.2.10-localecrash.patch
+Patch24:	gtk+-1.2.10-localecrash.patch
 # Patch from CVS to fix b.g.o #56349
-Patch26: gtk+-1.2.10-dndorder.patch
+Patch26:	gtk+-1.2.10-dndorder.patch
 # Patch from CVS to fix b.g.o #94812
-Patch27: gtk+-1.2.10-clistfocusrow.patch
+Patch27:	gtk+-1.2.10-clistfocusrow.patch
 # Fix GTK+ to obey X server's default bell volume
-Patch28: gtk+-1.2.10-bellvolume.patch
+Patch28:	gtk+-1.2.10-bellvolume.patch
 # Hack up the configure scripts to deal with some obscure
 # breakage with ancient libtool
-Patch29: gtk+-1.2.10-libtool.patch
+Patch29:	gtk+-1.2.10-libtool.patch
 # Add a dependency on libgdk to libgtk (#106677)
-Patch30: gtk+-1.2.10-gtkgdkdep.patch
-Patch31: gtk+-underquoted.patch
-Patch32: gtk+-1.2.10-ppc64.patch
+Patch30:	gtk+-1.2.10-gtkgdkdep.patch
+Patch31:	gtk+-underquoted.patch
+Patch32:	gtk+-1.2.10-ppc64.patch
 # do not allow for undefined symbols in shared libraries -- Rex
-Patch33: gtk+-1.2.10-no_undefined.patch
+Patch33:	gtk+-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222298
-Patch34: gtk+-1.2.10-multilib.patch
-
-BuildRequires: glib-devel >= 1:%{version}
-## auto-req -- Rex
-#Requires:     glib >= 1:%{version}
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
-BuildRequires: gettext
+Patch34:	gtk+-1.2.10-multilib.patch
+# Remove redundant shared library dependencies
+Patch35:	gtk+-1.2.10-unused-deps.patch
+
+BuildRequires:	glib-devel >= 1:%{version}
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
+BuildRequires:	gettext
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps  libX11-devel libXext-devel libXi-devel libXt-devel
+%global x_deps	libX11-devel libXext-devel libXi-devel libXt-devel
 %else
-%define x_deps	xorg-x11-devel
+%global x_deps	xorg-x11-devel
 ## This can be used for legacy too -- Rex
-#define	x_deps	Xree86-devel
+#global	x_deps	XFree86-devel
 %endif
-BuildRequires: %{x_deps} 
+BuildRequires:	%{x_deps} 
 
 %description
 The gtk+ package contains the GIMP ToolKit (GTK+), a library for
@@ -92,16 +92,18 @@
 processing program, but is now used by several other programs as
 well.
 
-%package devel
-Summary: Development tools for GTK+ (GIMP ToolKit) applications
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: glib-devel
-Requires: pkgconfig
-Requires: %{x_deps} 
+%package	devel
+Summary:	Development tools for GTK+ (GIMP ToolKit) applications
+Group:		Development/Libraries
+Provides:	gtk1-devel = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib-devel
+Requires:	pkgconfig
+Requires:	%{x_deps} 
 ## info files not included
 #Requires(post): /sbin/install-info
 #Requires(preun): /sbin/install-info
+
 %description devel
 Libraries, header files and documentation for developing GTK+ 
 (GIMP ToolKit) applications.
@@ -136,75 +138,86 @@
 %patch32 -p1 -b .ppc64
 %patch33 -p1 -b .no_undefined
 %patch34 -p1 -b .multilib
+%patch35 -p1 -b .unused-deps
 
-cp -f %{_datadir}/aclocal/libtool.m4 .
-libtoolize --copy --force
-automake-1.4
-aclocal-1.4
-autoconf-2.13
-autoheader-2.13
+# The original config.{guess,sub} do not work on x86_64
+#
+# The following /usr/lib cannot be %%_libdir !!
+%{__cp} -p /usr/lib/rpm/config.{guess,sub} .
 
+#%{__cp} -f %{_datadir}/aclocal/libtool.m4 .
+#/usr/bin/libtoolize --copy --force
+/usr/bin/automake-1.4
+#/usr/bin/aclocal-1.4
+/usr/bin/autoconf-2.13
+/usr/bin/autoheader-2.13
+
+# Recode docs as UTF-8
+for doc in ChangeLog examples/calendar/calendar.c; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${doc} > ${doc}.utf8
+	%{__mv} ${doc}.utf8 ${doc}
+done
 
 %build
+LIBTOOL=%{_bindir}/libtool \
 %configure \
-  --disable-static \
-  --with-xinput=xfree\
-  --with-native-locale
+	--disable-static \
+	--with-xinput=xfree \
+	--with-native-locale
 
-make %{?_smp_mflags} 
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT 
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool INSTALL="%{__install} -p"
 
 #
 # Make cleaned-up versions of examples and tutorial for installation
 #
 ./mkinstalldirs tmpdocs/tutorial
-install -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
-for dir in examples/* ; do
-    if [ -d $dir ] ; then
-       ./mkinstalldirs tmpdocs/$dir
-       for file in $dir/* ; do
-          case $file in
-	     *pre1.2.7)
-	        ;;
-	     *)
-                install -p -m0644 $file tmpdocs/$dir
-		;;
-	  esac
-       done
-    fi
+%{__install} -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
+for dir in examples/*; do
+	if [ -d $dir ]; then
+		./mkinstalldirs tmpdocs/$dir
+		for file in $dir/* ; do
+			case $file in
+			*pre1.2.7)
+				;;
+			*)
+				%{__install} -p -m0644 $file tmpdocs/$dir
+				;;
+			esac
+		done
+	fi
 done
 
-install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc
+%{__install} -p -m644 -D %{SOURCE1} %{buildroot}/etc/gtk/gtkrc
 
 # Install some extra gtkrc files to improve functioning of GTK+
 # in UTF-8 locales for Chinese, Japanese, Korean.
-for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do
-  install -p -m0644 $i $RPM_BUILD_ROOT/etc/gtk/
+for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
+	%{__install} -p -m0644 $i %{buildroot}/etc/gtk/
 done
 
 # We don't ship the info files
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 
 # .la fies... die die die.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 %find_lang %{name}
 
 
-# I *know* ||: isn't needed, but this could end up used by legacy
-%check ||:
-make check 
+%check
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -216,7 +229,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_libdir}/lib*.so.*
-%dir %{_datadir}/themes
+%dir %{_datadir}/themes/
 %{_datadir}/themes/Default/
 %dir %{_sysconfdir}/gtk/
 %config(noreplace) %{_sysconfdir}/gtk/*
@@ -234,6 +247,45 @@
 
 
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-68
+- remove unused shared library dependencies
+- use install -p to maintain timestamps where reasonable
+- recode docs as UTF-8
+- cosmetic spec changes
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.2.10-67
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-66
+- rebase the ahiguti patch
+
+* Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-65
+- remove x_ldflags from gtk-config (#462650)
+
+* Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-64
+- copy config.* from rpm directory, those shipped with gtk+ are too old
+
+* Wed Oct 01 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-63
+- patch_fuzz, fix build (#465033)
+
+* Mon Mar 10 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-62
+- Provides: gtk1(-devel)
+
+* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-61
+- fix multilib patch (#341401)
+
+* Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-60 
+- respin (gcc43)
+
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-59
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-58
+- License: LGPLv2+
+
+* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-57
+- revert libtool-related breakage 
+
 * Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-56
 - multilib patch (#222298)
 - cleanup auto*/libtool foo 
@@ -466,7 +518,7 @@
 - Up Epoch and release
 
 * Wed Jul 19 2000 Owen Taylor <otaylor at redhat.com>
-- Add BuildPreReq on glib = %{version}
+- Add BuildPreReq on glib = %%{version}
 
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
@@ -581,7 +633,7 @@
 - Fixed Source: to point to v1.1 
 
 * Tue Aug 04 1998 Michael Fulbright <msf at redhat.com>
-- change %postun to %preun
+- change %%postun to %%preun
 
 * Mon Jun 27 1998 Shawn T. Amundson
 - Changed version to 1.1.0


--- gtk+-1.2.6-ahiguti.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Apr 21 13:43:50 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 21 Apr 2009 13:43:50 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
	perl-Test-HTTP-Server-Simple-StashWarnings.spec, 1.2, 1.3
Message-ID: <20090421134350.B70CC700D6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1452

Modified Files:
	perl-Test-HTTP-Server-Simple-StashWarnings.spec 
Log Message:
* Tue Apr 21 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-3
- Allow testsuite to fail.



Index: perl-Test-HTTP-Server-Simple-StashWarnings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel/perl-Test-HTTP-Server-Simple-StashWarnings.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-HTTP-Server-Simple-StashWarnings.spec	27 Feb 2009 02:30:33 -0000	1.2
+++ perl-Test-HTTP-Server-Simple-StashWarnings.spec	21 Apr 2009 13:43:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-HTTP-Server-Simple-StashWarnings
 Version:        0.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Catch your forked server's warnings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -38,7 +38,7 @@
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 21 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-3
+- Allow testsuite to fail.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From than at fedoraproject.org  Tue Apr 21 13:46:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 13:46:08 +0000 (UTC)
Subject: rpms/kde-settings/F-11 kde-settings.spec,1.71,1.72
Message-ID: <20090421134608.6049E700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2376

Modified Files:
	kde-settings.spec 
Log Message:
get rid of requires on solar-kde-theme, it should leonidas-kde-theme for F11



Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kde-settings.spec	16 Apr 2009 19:34:47 -0000	1.71
+++ kde-settings.spec	21 Apr 2009 13:46:07 -0000	1.72
@@ -8,7 +8,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 6.%{rel}%{?dist}
+Release: 7.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -44,8 +44,8 @@
 Summary: Config files for kdebase-workspace(kdm)
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < %{version}-%{release}
-# Solar theme for KDM
-Requires: solar-kde-theme
+# leonidas theme for KDM
+Requires: leonidas-kde-theme
 #Requires: kdebase-workspace
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2-7.20090416svn
+- get rid of requires on solar-kde-theme, it should leonidas-kde-theme for F11
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-6.20090416
 - update for leonidas-kde-theme
 



From markmc at fedoraproject.org  Tue Apr 21 13:54:06 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 21 Apr 2009 13:54:06 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.82,1.83
Message-ID: <20090421135407.23B57700D6@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4522

Modified Files:
	qemu.spec 
Log Message:
* Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
- Enable pulseaudio driver to fix qemu lockup at shutdown (#495964)



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- qemu.spec	21 Apr 2009 09:03:40 -0000	1.82
+++ qemu.spec	21 Apr 2009 13:53:59 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 12%{?dist}
+Release: 13%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -44,6 +44,7 @@
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
 BuildRequires: pciutils-devel
+BuildRequires: pulseaudio-libs-devel
 Requires: %{name}-user = %{epoch}:%{version}-%{release}
 Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release}
 Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release}
@@ -245,12 +246,12 @@
 fi
 
 %ifarch %{ix86} x86_64
-# sdl outputs to alsa or pulseaudio directly depending on what the system has configured
+# sdl outputs to alsa or pulseaudio depending on system config, but it's broken (#495964)
 # alsa works, but causes huge CPU load due to bugs
 # oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire
 ./configure --target-list=x86_64-softmmu \
             --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \
-            --audio-drv-list=sdl,alsa,oss \
+            --audio-drv-list=pa,sdl,alsa,oss \
             --with-patched-kernel \
             --disable-strip \
             --qemu-ldflags=$extraldflags \
@@ -280,7 +281,7 @@
     --disable-strip \
     --disable-kvm \
     --extra-ldflags=$extraldflags \
-    --audio-drv-list=sdl,alsa,oss \
+    --audio-drv-list=pa,sdl,alsa,oss \
     --extra-cflags="$RPM_OPT_FLAGS"
 
 
@@ -467,6 +468,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
+- Enable pulseaudio driver to fix qemu lockup at shutdown (#495964)
+
 * Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-12
 - Another qcow2 image corruption fix (#496642)
 



From karsten at fedoraproject.org  Tue Apr 21 13:55:39 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 21 Apr 2009 13:55:39 +0000 (UTC)
Subject: rpms/fprintd/devel fprintd.spec,1.7,1.8
Message-ID: <20090421135539.8C927700D6@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5033

Modified Files:
	fprintd.spec 
Log Message:
- Excludearch s390 s390x, as we don't have libusb1 on mainframe, we can't build
  the required libfprint package



Index: fprintd.spec
===================================================================
RCS file: /cvs/extras/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fprintd.spec	24 Feb 2009 18:07:50 -0000	1.7
+++ fprintd.spec	21 Apr 2009 13:55:38 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		fprintd
 Version:	0.1
-Release:	8.git%{short_hash}%{?dist}
+Release:	8.git%{short_hash}%{?dist}.1
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
@@ -19,6 +19,7 @@
 Patch1:		0001-Detect-when-a-device-is-disconnected.patch
 Url:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    s390 s390x
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	pam-devel
@@ -96,6 +97,10 @@
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
+* Tue Apr 21 2009 Karsten Hopp <karsten at redhat.com> 0.1-8.git04fd09cfa.1
+- Excludearch s390 s390x, as we don't have libusb1 on mainframe, we can't build
+  the required libfprint package
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-8.git04fd09cfa
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From limb at fedoraproject.org  Tue Apr 21 14:10:06 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 14:10:06 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle-cron,1.4,1.5 moodle.spec,1.41,1.42
Message-ID: <20090421141006.EA7AD700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9304

Modified Files:
	moodle-cron moodle.spec 
Log Message:
cron and symlink fix.



Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle-cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle-cron	23 Feb 2009 18:26:40 -0000	1.4
+++ moodle-cron	21 Apr 2009 14:10:03 -0000	1.5
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-[ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php
+[ -f /var/lock/subsys/moodle ] && [ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- moodle.spec	2 Apr 2009 19:55:34 -0000	1.41
+++ moodle.spec	21 Apr 2009 14:10:04 -0000	1.42
@@ -1548,7 +1548,7 @@
   /sbin/chkconfig --del %{name}
 fi
 
-%pre
+%pretrans
 if [ -d /var/www/moodle/web/lib/smarty ]; then
   rm -rf /var/www/moodle/web/lib/smarty
 fi
@@ -1694,6 +1694,10 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
+- Move symlink scripts from pre to pretrans.
+- Corrented moodle-cron BZ 494090.
+
 * Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6.1
 - Fix broken font deps.
 



From limb at fedoraproject.org  Tue Apr 21 14:11:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 14:11:44 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle.spec,1.42,1.43
Message-ID: <20090421141144.70E24700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9827

Modified Files:
	moodle.spec 
Log Message:
D'oh!



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- moodle.spec	21 Apr 2009 14:10:04 -0000	1.42
+++ moodle.spec	21 Apr 2009 14:11:42 -0000	1.43
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6.1%{?dist}
+Release:        7%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing



From pghmcfc at fedoraproject.org  Tue Apr 21 14:16:42 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 14:16:42 +0000 (UTC)
Subject: rpms/gnome-libs/devel gnome-libs-1.4.2-ppc64-config.patch, NONE,
	1.1 gnome-libs.spec, 1.15, 1.16
Message-ID: <20090421141642.90CE3700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11738

Modified Files:
	gnome-libs.spec 
Added Files:
	gnome-libs-1.4.2-ppc64-config.patch 
Log Message:
Fix config.guess and config.sub to support build on ppc64

gnome-libs-1.4.2-ppc64-config.patch:

--- NEW FILE gnome-libs-1.4.2-ppc64-config.patch ---
--- gnome-libs-1.4.2/config.guess	2002-08-01 15:30:57.000000000 +0100
+++ gnome-libs-1.4.2/config.guess	2009-04-21 15:07:58.000000000 +0100
@@ -811,6 +811,9 @@
 	rm -f $dummy.c $dummy
 	echo powerpc-unknown-linux-gnu${LIBC}
 	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
     alpha:Linux:*:*)
 	cat <<EOF >$dummy.s
 	  .data
--- gnome-libs-1.4.2/config.sub	2002-08-01 15:30:57.000000000 +0100
+++ gnome-libs-1.4.2/config.sub	2009-04-21 15:09:15.000000000 +0100
@@ -721,6 +721,10 @@
 	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
 	        ;;


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-libs.spec	21 Apr 2009 11:09:18 -0000	1.15
+++ gnome-libs.spec	21 Apr 2009 14:16:41 -0000	1.16
@@ -76,6 +76,7 @@
 Patch106:       gnome-libs-1.4.2-norecurse.patch
 Patch107:       gnome-libs-1.4.2-gnome-config-no-Llibdir.patch
 Patch108:       gnome-libs-1.4.2-cleanlibs.patch
+Patch109:       gnome-libs-1.4.2-ppc64-config.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -158,6 +159,7 @@
 %patch106 -p1 -b .norecurse
 %patch107 -p1 -b .nolibdir
 %patch108 -p1 -b .cleanlibs
+%patch109 -p1 -b .ppc64-config
 
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 %{__mv} -f ChangeLog.utf-8 ChangeLog
@@ -325,6 +327,7 @@
 - Additional %%{?_isa} devel package dependencies now available
 - Clean up library linkage, linking libraries with the libs they need and only
   those libs
+- Fix config.guess and config.sub to support build on ppc64
 
 * Thu Mar  5 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-13
 - Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in



From dwmw2 at fedoraproject.org  Tue Apr 21 14:20:39 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue, 21 Apr 2009 14:20:39 +0000 (UTC)
Subject: rpms/openconnect/F-10 openconnect.spec,1.3,1.4
Message-ID: <20090421142039.999AF700D6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12842

Modified Files:
	openconnect.spec 
Log Message:
require DTLS-fixed openssl


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-10/openconnect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openconnect.spec	1 Apr 2009 14:39:20 -0000	1.3
+++ openconnect.spec	21 Apr 2009 14:20:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		openconnect
 Version:	1.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -11,6 +11,7 @@
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
 Requires:	vpnc
+Requires:	openssl >= 0.9.8g-13
 # The "lasthost" and "autoconnect" gconf keys will cause older versions of
 # NetworkManager-openconnect to barf
 Conflicts:	NetworkManager-openconnect < 0.7.0.99-2
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-2
+- Require openssl0.9.8g-13, which has all required DTLS patches.
+
 * Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-1
 - Update to 1.10.
 



From limb at fedoraproject.org  Tue Apr 21 14:27:16 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 14:27:16 +0000 (UTC)
Subject: rpms/moodle/F-9 moodle-cron,1.4,1.5 moodle.spec,1.32,1.33
Message-ID: <20090421142716.AAC53700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14684

Modified Files:
	moodle-cron moodle.spec 
Log Message:
Cron and symlink fixes.



Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-9/moodle-cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle-cron	23 Feb 2009 18:45:43 -0000	1.4
+++ moodle-cron	21 Apr 2009 14:27:12 -0000	1.5
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-[ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php
+[ -f /var/lock/subsys/moodle ] && [ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-9/moodle.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- moodle.spec	2 Apr 2009 19:55:34 -0000	1.32
+++ moodle.spec	21 Apr 2009 14:27:12 -0000	1.33
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6.1%{?dist}
+Release:        7%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -1548,7 +1548,7 @@
   /sbin/chkconfig --del %{name}
 fi
 
-%pre
+%pretrans
 if [ -d /var/www/moodle/web/lib/smarty ]; then
   rm -rf /var/www/moodle/web/lib/smarty
 fi
@@ -1694,6 +1694,10 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
+- Move symlink scripts from pre to pretrans.
+- Corrented moodle-cron BZ 494090.
+
 * Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6.1
 - Fix broken font deps.
 



From caolanm at fedoraproject.org  Tue Apr 21 14:40:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 14:40:00 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch, NONE,
	1.1 openoffice.org.spec, 1.1887, 1.1888
Message-ID: <20090421144000.1E66370137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18531/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch 
Log Message:
ooo#101245 qstarter bustage

openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch:

--- NEW FILE openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch ---
diff -ru sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdownicon.cxx
--- sfx2.orig/source/appl/shutdownicon.cxx	2009-04-21 12:57:08.000000000 +0100
+++ sfx2/source/appl/shutdownicon.cxx	2009-04-21 15:26:25.000000000 +0100
@@ -192,7 +192,9 @@
 		return;
 	m_bInitialized = true;
 
-	(void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
+    if (!m_pPlugin)
+	    (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
+
 	m_bVeto = true;
 	m_pInitSystray();
 }
@@ -201,15 +203,11 @@
 {
 	if (!m_bInitialized)
 		return;
+
     if (m_pDeInitSystray)
 		m_pDeInitSystray();
 
 	m_bVeto = false;
-	m_pInitSystray = 0;
-	m_pDeInitSystray = 0;
-	if (m_pPlugin)
-		delete m_pPlugin;
-	m_pPlugin = 0;
     delete m_pFileDlg;
 	m_pFileDlg = NULL;
 	m_bInitialized = false;
@@ -233,6 +231,11 @@
 ShutdownIcon::~ShutdownIcon()
 {
 	deInitSystray();
+    //Bustage on dlclosing when: no qstarter, start writer, enable, close writer, choose disable/quit
+    //dlclose gets called and pulls .so from under hack-tower
+#ifndef UNX
+	delete m_pPlugin;
+#endif
 }
 
 // ---------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1887
retrieving revision 1.1888
diff -u -r1.1887 -r1.1888
--- openoffice.org.spec	20 Apr 2009 21:38:12 -0000	1.1887
+++ openoffice.org.spec	21 Apr 2009 14:39:55 -0000	1.1888
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 10
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 Patch64: workspace.slideshow1.patch
+Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
 %patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 %patch64 -p2 -b .workspace.slideshow1.patch
+%patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+- add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
 - Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen



From caolanm at fedoraproject.org  Tue Apr 21 14:39:59 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 14:39:59 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch, NONE,
	1.1 openoffice.org.spec, 1.1886, 1.1887
Message-ID: <20090421143959.AE8FD700D6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18531/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch 
Log Message:
ooo#101245 qstarter bustage

openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch:

--- NEW FILE openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch ---
diff -ru sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdownicon.cxx
--- sfx2.orig/source/appl/shutdownicon.cxx	2009-04-21 12:57:08.000000000 +0100
+++ sfx2/source/appl/shutdownicon.cxx	2009-04-21 15:26:25.000000000 +0100
@@ -192,7 +192,9 @@
 		return;
 	m_bInitialized = true;
 
-	(void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
+    if (!m_pPlugin)
+	    (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
+
 	m_bVeto = true;
 	m_pInitSystray();
 }
@@ -201,15 +203,11 @@
 {
 	if (!m_bInitialized)
 		return;
+
     if (m_pDeInitSystray)
 		m_pDeInitSystray();
 
 	m_bVeto = false;
-	m_pInitSystray = 0;
-	m_pDeInitSystray = 0;
-	if (m_pPlugin)
-		delete m_pPlugin;
-	m_pPlugin = 0;
     delete m_pFileDlg;
 	m_pFileDlg = NULL;
 	m_bInitialized = false;
@@ -233,6 +231,11 @@
 ShutdownIcon::~ShutdownIcon()
 {
 	deInitSystray();
+    //Bustage on dlclosing when: no qstarter, start writer, enable, close writer, choose disable/quit
+    //dlclose gets called and pulls .so from under hack-tower
+#ifndef UNX
+	delete m_pPlugin;
+#endif
 }
 
 // ---------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -r1.1886 -r1.1887
--- openoffice.org.spec	20 Apr 2009 21:38:11 -0000	1.1886
+++ openoffice.org.spec	21 Apr 2009 14:39:53 -0000	1.1887
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 10
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 Patch64: workspace.slideshow1.patch
+Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
 %patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 %patch64 -p2 -b .workspace.slideshow1.patch
+%patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+- add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
 - Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen



From ajax at fedoraproject.org  Tue Apr 21 14:40:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 21 Apr 2009 14:40:08 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-fd-cache.patch, 1.2,
	1.3 libpciaccess.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <20090421144008.DD2C6700D6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18809

Modified Files:
	libpciaccess-fd-cache.patch libpciaccess.spec sources 
Log Message:
f11 sync

libpciaccess-fd-cache.patch:

Index: libpciaccess-fd-cache.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-fd-cache.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libpciaccess-fd-cache.patch	28 Aug 2008 17:58:59 -0000	1.2
+++ libpciaccess-fd-cache.patch	21 Apr 2009 14:40:05 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up libpciaccess-0.10.3/src/linux_sysfs.c.cache libpciaccess-0.10.3/src/linux_sysfs.c
---- libpciaccess-0.10.3/src/linux_sysfs.c.cache	2008-06-10 15:21:36.000000000 -0400
-+++ libpciaccess-0.10.3/src/linux_sysfs.c	2008-08-28 13:56:28.000000000 -0400
+diff -up libpciaccess-0.10.5/src/linux_sysfs.c.cache libpciaccess-0.10.5/src/linux_sysfs.c
+--- libpciaccess-0.10.5/src/linux_sysfs.c.cache	2008-10-31 11:40:09.000000000 -0400
++++ libpciaccess-0.10.5/src/linux_sysfs.c	2009-04-21 09:36:38.000000000 -0400
 @@ -57,6 +57,8 @@
  
  static void pci_device_linux_sysfs_enable(struct pci_device *dev);
@@ -11,7 +11,7 @@
      void * buffer );
  
 @@ -76,7 +78,7 @@ static int pci_device_linux_sysfs_write(
-     pciaddr_t * bytes_wrtten );
+     pciaddr_t * bytes_written );
  
  static const struct pci_system_methods linux_sysfs_methods = {
 -    .destroy = NULL,


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libpciaccess.spec	25 Feb 2009 17:29:11 -0000	1.15
+++ libpciaccess.spec	21 Apr 2009 14:40:06 -0000	1.16
@@ -2,8 +2,8 @@
 %define gitrev e392082abb5696c8837224da86cc0af4f21d7010
 
 Name:           libpciaccess
-Version:        0.10.3
-Release:        6%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		libpciaccess-fd-cache.patch
-Patch1:		libpciaccess-kludge-wc-mmap.patch
 Patch2:		libpciaccess-rom-size.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
@@ -40,7 +39,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .cache
-%patch1 -p1 -b .wc
 %patch2 -p1 -b .rom-size
 
 %build
@@ -72,6 +70,9 @@
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Tue Apr 21 2009 Adam Jackson <ajax at redhat.com> 0.10.5-1
+- libpciaccess 0.10.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2008 17:58:59 -0000	1.8
+++ sources	21 Apr 2009 14:40:06 -0000	1.9
@@ -1 +1 @@
-6d5468debf76fac84576ca26c9535821  libpciaccess-0.10.3.tar.bz2
+617bebf31e5685c83f935009aeae5f38  libpciaccess-0.10.5.tar.bz2



From dwmw2 at fedoraproject.org  Tue Apr 21 14:40:12 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue, 21 Apr 2009 14:40:12 +0000 (UTC)
Subject: rpms/openconnect/F-11 openconnect.spec,1.5,1.6
Message-ID: <20090421144012.4E771700D6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19028

Modified Files:
	openconnect.spec 
Log Message:
require DTLS-fixed openssl


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-11/openconnect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openconnect.spec	1 Apr 2009 14:39:59 -0000	1.5
+++ openconnect.spec	21 Apr 2009 14:40:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		openconnect
 Version:	1.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -11,6 +11,7 @@
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
 Requires:	vpnc
+Requires:	openssl >= 0.9.8k-4
 # The "lasthost" and "autoconnect" gconf keys will cause older versions of
 # NetworkManager-openconnect to barf
 Conflicts:	NetworkManager-openconnect < 0.7.0.99-2
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-2
+- Require openssl0.9.8k-4, which has all required DTLS patches.
+
 * Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-1
 - Update to 1.10.
 



From kkofler at fedoraproject.org  Tue Apr 21 14:40:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 14:40:12 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin-4.2.2-printing.patch, 1.1,
	1.2 kdeadmin.spec, 1.129, 1.130
Message-ID: <20090421144012.97B8A700D6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18979/devel

Modified Files:
	kdeadmin-4.2.2-printing.patch kdeadmin.spec 
Log Message:
Sync from F11:

* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
- get rid of the dependency of system-config-printer
- drop the BR on PyKDE4, system-config-printer-libs
  it's just needed for runtime

No need to build this (F12 can inherit the F11 build), but we want to keep things in sync so the changes don't get lost.

kdeadmin-4.2.2-printing.patch:

Index: kdeadmin-4.2.2-printing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin-4.2.2-printing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeadmin-4.2.2-printing.patch	20 Apr 2009 15:46:40 -0000	1.1
+++ kdeadmin-4.2.2-printing.patch	21 Apr 2009 14:40:11 -0000	1.2
@@ -1,7 +1,236 @@
-diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
---- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.orig	2009-04-20 17:34:50.000000000 +0200
-+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-20 17:36:07.000000000 +0200
-@@ -1480,9 +1480,8 @@ class NewPrinterGUI(QDialog):
+diff -up kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt
+--- kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing	2009-01-01 17:27:18.000000000 +0100
++++ kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt	2009-04-21 14:47:20.000000000 +0200
+@@ -7,35 +7,17 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
+ macro_optional_find_package(PythonLibrary)
+ macro_optional_find_package(SIP)
+ 
+-macro_optional_find_package(PyQt4)
+-IF(NOT PYQT4_FOUND)
+-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/" FALSE)
+-ENDIF(NOT PYQT4_FOUND)
+-
+-macro_optional_find_package(PyKDE)
+-IF(NOT PYKDE_FOUND)
+-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
+-ENDIF(NOT PYKDE_FOUND)
+-
+-macro_optional_find_package(PyCups)
+-IF(NOT PYCUPS_FOUND)
+-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
+-ENDIF(NOT PYCUPS_FOUND)
+-
+-macro_optional_find_package(SystemConfigPrinter)
+-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
+-    macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
+-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
+-
+-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+-    SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
++if(PYTHONLIBRARY_FOUND)
++   set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
++endif(PYTHONLIBRARY_FOUND)
+ 
+ IF(INSTALL_SYSTEM_CONFIG_PRINTER)
+     install( FILES
+         new-printer.ui
+         system-config-printer.ui
+         system-config-printer-kde.py
++        debug.py
++        smburi.py
+         DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
+     PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py system-config-printer-kde)
+     install(FILES system-config-printer-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/debug.py
+--- /dev/null	2009-04-15 10:28:46.227012446 +0200
++++ kdeadmin-4.2.2/system-config-printer-kde/debug.py	2009-04-21 14:47:20.000000000 +0200
+@@ -0,0 +1,55 @@
++#!/usr/bin/env python
++
++## Copyright (C) 2008 Red Hat, Inc.
++## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
++
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import sys
++import traceback
++
++_debug=False
++def debugprint (x):
++    if _debug:
++        try:
++            print >>sys.stderr, x
++        except:
++            pass
++
++def get_debugging ():
++    return _debug
++
++def set_debugging (d):
++    global _debug
++    _debug = d
++
++def fatalException (exitcode=1):
++    nonfatalException (type="fatal", end="Exiting")
++    sys.exit (exitcode)
++
++def nonfatalException (type="non-fatal", end="Continuing anyway.."):
++    d = get_debugging ()
++    set_debugging (True)
++    debugprint ("Caught %s exception.  Traceback:" % type)
++    (type, value, tb) = sys.exc_info ()
++    tblast = traceback.extract_tb (tb, limit=None)
++    if len (tblast):
++        tblast = tblast[:len (tblast) - 1]
++    extxt = traceback.format_exception_only (type, value)
++    for line in traceback.format_tb(tb):
++        debugprint (line.strip ())
++    debugprint (extxt[0].strip ())
++    debugprint (end)
++    set_debugging (d)
+diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/smburi.py
+--- /dev/null	2009-04-15 10:28:46.227012446 +0200
++++ kdeadmin-4.2.2/system-config-printer-kde/smburi.py	2009-04-21 14:47:20.000000000 +0200
+@@ -0,0 +1,95 @@
++#!/usr/bin/env python
++
++## system-config-printer
++
++## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
++## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
++
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import urllib
++
++class SMBURI:
++    def __init__ (self,
++                  uri=None,
++                  group='', host='', share='', user='', password=''):
++        if uri:
++            if group or host or share or user or password:
++                raise RuntimeError
++
++            if uri.startswith ("smb://"):
++                uri = uri[6:]
++
++            self.uri = uri
++        else:
++            self.uri = self._construct (group, host, share,
++                                        user=user, password=password)
++
++    def _construct (self, group, host, share, user='', password=''):
++        uri_password = ''
++        if password:
++            uri_password = ':' + urllib.quote (password)
++        if user:
++            uri_password += '@'
++        uri = "%s%s%s" % (urllib.quote (user),
++                          uri_password,
++                          urllib.quote (group))
++        if len (group) > 0:
++            uri += '/'
++        uri += urllib.quote (host)
++        if len (share) > 0:
++            uri += "/" + urllib.quote (share)
++        return uri
++
++    def get_uri (self):
++        return self.uri
++
++    def sanitize_uri (self):
++        group, host, share, user, password = self.separate ()
++        return self._construct (group, host, share)
++
++    def separate (self):
++        uri = self.get_uri ()
++        user = ''
++        password = ''
++        auth = uri.find ('@')
++        if auth != -1:
++            u = uri[:auth].find(':')
++            if u != -1:
++                user = uri[:u]
++                password = uri[u + 1:auth]
++            else:
++                user = uri[:auth]
++            uri = uri[auth + 1:]
++        sep = uri.count ('/')
++        group = ''
++        if sep == 2:
++            g = uri.find('/')
++            group = uri[:g]
++            uri = uri[g + 1:]
++        if sep < 1:
++            host = ''
++        else:
++            h = uri.find('/')
++            host = uri[:h]
++            uri = uri[h + 1:]
++            p = host.find(':')
++            if p != -1:
++                host = host[:p]
++        share = uri
++        return (urllib.unquote (group), urllib.unquote (host),
++                urllib.unquote (share),
++                urllib.unquote (user), urllib.unquote (password))
+diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
+--- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
++++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 15:29:16.000000000 +0200
+@@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
+ import thread
+ 
+ #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
+-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
++SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
+ if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
+     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
+ 
+@@ -64,7 +64,6 @@ import cups
+ cups.require ("1.9.27")
+ 
+ # These come from system-config-printer
+-import config
+ import cupshelpers  #, options
+ from smburi import SMBURI
+ from debug import *
+@@ -717,8 +716,7 @@ class GUI(QWidget):
+                 job_id = self.cups.printTestPage(self.printer.name)
+ 
+             self.setTestButton (self.printer)
+-            QMessageBox.information(self, i18nc("Test page submitted", "Submitted"), i18n("Test page submitted as "
+-                                                            "job %d") % job_id)
++            KMessageBox.information(self, i18n("Test page submitted as job %1", job_id), i18nc("Test page submitted", "Submitted"))
+         except cups.IPPError, (e, msg):
+             if (e == cups.IPP_NOT_AUTHORIZED and
+                 self.connect_server != 'localhost' and
+@@ -1480,9 +1478,8 @@ class NewPrinterGUI(QDialog):
          """
  
          # Optionally disable downloadable driver support.


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdeadmin.spec	20 Apr 2009 15:46:40 -0000	1.129
+++ kdeadmin.spec	21 Apr 2009 14:40:11 -0000	1.130
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -16,9 +16,7 @@
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python-devel
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
+BuildRequires:  python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -145,6 +143,11 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- get rid of the dependency of system-config-printer
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+
 * Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix #496646, system-config-printer-kde doesn't start
 



From pghmcfc at fedoraproject.org  Tue Apr 21 14:44:32 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 14:44:32 +0000 (UTC)
Subject: rpms/imlib/EL-5 imlib-1.9.10-cppflags.patch, 1.1,
	1.2 imlib-1.9.15-lib-bloat.patch, 1.1, 1.2 imlib.spec, 1.6, 1.7
Message-ID: <20090421144433.16B26700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20395

Modified Files:
	imlib-1.9.10-cppflags.patch imlib-1.9.15-lib-bloat.patch 
	imlib.spec 
Log Message:
Resync with Fedora

imlib-1.9.10-cppflags.patch:

Index: imlib-1.9.10-cppflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-5/imlib-1.9.10-cppflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imlib-1.9.10-cppflags.patch	3 Jul 2006 23:05:07 -0000	1.1
+++ imlib-1.9.10-cppflags.patch	21 Apr 2009 14:44:29 -0000	1.2
@@ -1,8 +1,8 @@
---- imlib-1.9.10/configure.in.cppflags	Tue Jan  8 15:05:58 2002
-+++ imlib-1.9.10/configure.in	Tue Jan  8 15:06:11 2002
-@@ -160,8 +160,6 @@
-   GX_LIBS="$GTK_LIBS"
+--- imlib-1.9.15/configure.in.cppflags	2004-09-23 02:13:45.000000000 +0100
++++ imlib-1.9.15/configure.in		2008-08-29 09:11:06.000000000 +0100
+@@ -141,8 +141,6 @@
  fi
+ AC_SUBST(GX_LIBS)
  
 -CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
 -

imlib-1.9.15-lib-bloat.patch:

Index: imlib-1.9.15-lib-bloat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-5/imlib-1.9.15-lib-bloat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imlib-1.9.15-lib-bloat.patch	10 Apr 2007 16:50:30 -0000	1.1
+++ imlib-1.9.15-lib-bloat.patch	21 Apr 2009 14:44:29 -0000	1.2
@@ -1,5 +1,5 @@
---- imlib-1.9.15/configure.in	2007-03-27 15:02:59.000000000 +0100
-+++ imlib-1.9.15/configure.in	2007-03-27 16:18:49.000000000 +0100
+--- imlib-1.9.15/configure.in	2008-08-29 16:05:28.000000000 +0100
++++ imlib-1.9.15/configure.in	2008-08-29 16:06:57.000000000 +0100
 @@ -204,16 +204,12 @@
  
  
@@ -17,7 +17,7 @@
    [AC_MSG_ERROR(*** GIF header not found ***)])
  
  AC_CHECK_LIB(png, png_read_info,
-@@ -237,9 +237,9 @@
+@@ -237,9 +233,9 @@
  fi
  
  if test "$png_ok" = yes; then
@@ -29,11 +29,11 @@
  fi
  
  SUPPORT_LIBS="$SUPPORT_LIBS -lm"
---- imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:17.000000000 +0100
-+++ imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:46.000000000 +0100
+--- imlib-1.9.15/Imlib/Makefile.am	2004-09-21 01:22:59.000000000 +0100
++++ imlib-1.9.15/Imlib/Makefile.am	2008-08-29 16:06:57.000000000 +0100
 @@ -32,8 +32,7 @@
  
- libImlib_la_LDFLAGS    = -version-info 11:0:0
+ libImlib_la_LDFLAGS    = -version-info 10:15:9
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
 -libImlib_la_LIBADD     = $(SUPPORT_LIBS) $(X_PRE_LIBS) \
 -			 $(X_LIBS) $(X_EXTRA_LIBS)
@@ -41,8 +41,8 @@
  
  DEFS =  -DSYSTEM_IMRC=\"$(sysconfdir)/imrc\" \
  	-DSYSCONFDIR=\"$(sysconfdir)\"
---- imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:45:24.000000000 +0100
-+++ imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:48:05.000000000 +0100
+--- imlib-1.9.15/gdk_imlib/Makefile.am	2008-08-29 16:05:28.000000000 +0100
++++ imlib-1.9.15/gdk_imlib/Makefile.am	2008-08-29 16:06:57.000000000 +0100
 @@ -20,11 +20,11 @@
  
  libimlib_tiff_la_SOURCES = io-tiff.c


Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-5/imlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- imlib.spec	19 Dec 2007 17:53:17 -0000	1.6
+++ imlib.spec	21 Apr 2009 14:44:29 -0000	1.7
@@ -1,9 +1,7 @@
-%define libtool_hack LIBTOOL=/usr/bin/libtool
-
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	6%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -18,15 +16,15 @@
 Patch9:		imlib-1.9.15-multilib-config.patch
 Patch10:	imlib-1.9.15-check-for-shm-pixmaps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires:	automake
+BuildRequires:	automake, libtool
 BuildRequires:	giflib-devel
-BuildRequires:	gtk+-devel
-BuildRequires:	libpng-devel >= 1.2.2
-BuildRequires:	libjpeg-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libtool
-BuildRequires:	libX11-devel
-BuildRequires:	libXt-devel
+BuildRequires:	glib-devel%{?_isa}
+BuildRequires:	gtk+-devel%{?_isa}
+BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
+BuildRequires:	libjpeg-devel%{?_isa}
+BuildRequires:	libtiff-devel%{?_isa}
+BuildRequires:	libX11-devel%{?_isa}
+BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
 Obsoletes:	imlib-cfgeditor <= %{version}-%{release}, Imlib <= %{version}-%{release}
 Provides:	imlib-cfgeditor = %{version}-%{release}, Imlib = %{version}-%{release}
@@ -47,10 +45,17 @@
 %package devel
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
-Requires:	imlib = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, gtk+-devel, libjpeg-devel, libtiff-devel
-Requires:	libX11-devel, zlib-devel
-Requires:	%{_datadir}/aclocal, pkgconfig
+Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	giflib-devel
+Requires:	glib-devel%{?_isa}
+Requires:	gtk+-devel%{?_isa}
+Requires:	libjpeg-devel%{?_isa}
+Requires:	libtiff-devel%{?_isa}
+Requires:	libX11-devel%{?_isa}
+Requires:	libXt-devel%{?_isa}
+Requires:	zlib-devel
+Requires:	%{_datadir}/aclocal
+Requires:	pkgconfig
 
 %description devel
 The header files, static libraries and documentation needed for
@@ -86,28 +91,31 @@
 
 %build
 /usr/bin/autoreconf -i -f
-%configure
+%configure --disable-static
 
 ## Remove -L%{_libdir} from imlib-config if present;
 ## it's redundant and breaks multilib compatibility
 %{__sed} -i -e 's,-L%{_libdir} ,,g' imlib-config
 
+## Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 ## Build local gmodule hack
-tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule %{libtool_hack}
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule
 %{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
 
 ## Avoid unnecessary library linkage in libgdk_imlib
 GX_LIBS=$(/usr/bin/gtk-config --libs | %{__sed} -e 's/-lgtk //; s/-lgmodule //; s/-lXi //')
 
 ## Note: build with %{?_smp_mflags} doesn't work reliably
-%{__make} %{libtool_hack} GX_LIBS="${GX_LIBS}"
+%{__make} GX_LIBS="${GX_LIBS}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} %{libtool_hack}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
-## Don't package static or libtool archives
-%{__rm} -f %{buildroot}%{_libdir}/*a
+## Don't package libtool archives
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -151,6 +159,25 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Wed Apr  1 2009 Paul Howarth <paul at city-fan.org> 1:1.9.15-11
+- add libXt-devel dependency for -devel package (#478357)
+- use install -p to maintain timestamps where reasonable
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-10
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
+- specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+  (where available)
+
+* Fri Aug 29 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-8
+- fix patches to apply without fuzz
+
+* Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-7
+- rebuild with gcc 4.3.0 for Fedora 9
+
 * Tue Dec 18 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-6
 - include patch to fix a DoS caused via a BMP image with a Bits Per Page (BPP)
   value of 0 (#426091, CVE-2007-3568); thanks to Peter Volkov at Gentoo for



From dwmw2 at fedoraproject.org  Tue Apr 21 14:46:01 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue, 21 Apr 2009 14:46:01 +0000 (UTC)
Subject: rpms/openconnect/devel openconnect.spec,1.5,1.6
Message-ID: <20090421144601.77D52700D6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20836

Modified Files:
	openconnect.spec 
Log Message:
require DTLS-fixed openssl


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/openconnect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openconnect.spec	1 Apr 2009 14:39:59 -0000	1.5
+++ openconnect.spec	21 Apr 2009 14:45:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		openconnect
 Version:	1.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -11,6 +11,7 @@
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
 Requires:	vpnc
+Requires:	openssl >= 0.9.8k-4
 # The "lasthost" and "autoconnect" gconf keys will cause older versions of
 # NetworkManager-openconnect to barf
 Conflicts:	NetworkManager-openconnect < 0.7.0.99-2
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-2
+- Require openssl0.9.8k-4, which has all required DTLS patches.
+
 * Wed Apr  1 2009 David Woodhouse <David.Woodhouse at intel.com> - 1.10-1
 - Update to 1.10.
 



From ellert at fedoraproject.org  Tue Apr 21 14:47:32 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 14:47:32 +0000 (UTC)
Subject: rpms/globus-core/devel globus-core.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20090421144732.60A89700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20906/devel

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:21:54 -0000	1.2
+++ globus-core.spec	21 Apr 2009 14:47:00 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:21:54 -0000	1.2
+++ import.log	21 Apr 2009 14:47:01 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693
 globus-core-5_15-2_fc9:HEAD:globus-core-5.15-2.fc9.src.rpm:1240003266
+globus-core-5_15-3_fc9:HEAD:globus-core-5.15-3.fc9.src.rpm:1240325051



From ellert at fedoraproject.org  Tue Apr 21 14:50:42 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 14:50:42 +0000 (UTC)
Subject: rpms/globus-core/F-9 globus-core.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20090421145042.62C46700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606/F-9

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:24:17 -0000	1.2
+++ globus-core.spec	21 Apr 2009 14:50:40 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:24:17 -0000	1.2
+++ import.log	21 Apr 2009 14:50:40 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:F-9:globus-core-5.15-1.fc9.src.rpm:1237533936
 globus-core-5_15-2_fc9:F-9:globus-core-5.15-2.fc9.src.rpm:1240003398
+globus-core-5_15-3_fc9:F-9:globus-core-5.15-3.fc9.src.rpm:1240325336



From mjakubicek at fedoraproject.org  Tue Apr 21 14:52:36 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 14:52:36 +0000 (UTC)
Subject: rpms/darkice/devel darkice-0.19-gcc44.patch, NONE, 1.1 darkice.spec,
	1.4, 1.5
Message-ID: <20090421145236.A6EFE700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/darkice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22839/devel

Modified Files:
	darkice.spec 
Added Files:
	darkice-0.19-gcc44.patch 
Log Message:
- Fix FTBFS: added darkice-0.19-gcc44.patch



darkice-0.19-gcc44.patch:

--- NEW FILE darkice-0.19-gcc44.patch ---
--- src/Util.cpp.orig	2009-04-21 16:34:28.000000000 +0200
+++ src/Util.cpp	2009-04-21 16:36:33.000000000 +0200
@@ -296,7 +296,7 @@
     unsigned int    size;
     char          * s;
     char          * strdate;
-    char          * last;
+    const char    * last;
     time_t          now;
 
     if ( !str ) {


Index: darkice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darkice/devel/darkice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- darkice.spec	24 Feb 2009 10:49:23 -0000	1.4
+++ darkice.spec	21 Apr 2009 14:52:30 -0000	1.5
@@ -1,13 +1,14 @@
 Name:       darkice
 Version:    0.19
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Live audio streamer
 Group:      Applications/Multimedia
 License:    GPLv2+
 URL:        http://darkice.tyrell.hu/
 Source0:    http://darkice.tyrell.hu/dist/0.19/%{name}-%{version}.tar.gz
 Patch0:     %{name}-%{version}-configure.patch
-
+Patch1:     %{name}-%{version}-gcc44.patch
+#??Sent to darkeye [AT] users.sourceforge.net on 2009/04/21 (Trac not working at that time)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -30,11 +31,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .configure
+%patch1 -b .gcc44
 
 %build
 %configure
 
-%{__make} %{?_smp_mflags}
+%{__make} -k %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -52,6 +54,9 @@
 %{_mandir}/man5/%{name}.cfg.5.gz
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.19-5
+- Fix FTBFS: added darkice-0.19-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Tue Apr 21 14:53:00 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 14:53:00 +0000 (UTC)
Subject: rpms/darkice/F-11 darkice-0.19-gcc44.patch, NONE, 1.1 darkice.spec, 
	1.4, 1.5
Message-ID: <20090421145300.ECD37700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/darkice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22839/F-11

Modified Files:
	darkice.spec 
Added Files:
	darkice-0.19-gcc44.patch 
Log Message:
- Fix FTBFS: added darkice-0.19-gcc44.patch



darkice-0.19-gcc44.patch:

--- NEW FILE darkice-0.19-gcc44.patch ---
--- src/Util.cpp.orig	2009-04-21 16:34:28.000000000 +0200
+++ src/Util.cpp	2009-04-21 16:36:33.000000000 +0200
@@ -296,7 +296,7 @@
     unsigned int    size;
     char          * s;
     char          * strdate;
-    char          * last;
+    const char    * last;
     time_t          now;
 
     if ( !str ) {


Index: darkice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darkice/F-11/darkice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- darkice.spec	24 Feb 2009 10:49:23 -0000	1.4
+++ darkice.spec	21 Apr 2009 14:52:25 -0000	1.5
@@ -1,13 +1,14 @@
 Name:       darkice
 Version:    0.19
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Live audio streamer
 Group:      Applications/Multimedia
 License:    GPLv2+
 URL:        http://darkice.tyrell.hu/
 Source0:    http://darkice.tyrell.hu/dist/0.19/%{name}-%{version}.tar.gz
 Patch0:     %{name}-%{version}-configure.patch
-
+Patch1:     %{name}-%{version}-gcc44.patch
+#??Sent to darkeye [AT] users.sourceforge.net on 2009/04/21 (Trac not working at that time)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -30,11 +31,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .configure
+%patch1 -b .gcc44
 
 %build
 %configure
 
-%{__make} %{?_smp_mflags}
+%{__make} -k %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -52,6 +54,9 @@
 %{_mandir}/man5/%{name}.cfg.5.gz
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.19-5
+- Fix FTBFS: added darkice-0.19-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ellert at fedoraproject.org  Tue Apr 21 14:54:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 14:54:59 +0000 (UTC)
Subject: rpms/globus-core/F-10 globus-core.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20090421145459.5676A700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23456/F-10

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:26:09 -0000	1.2
+++ globus-core.spec	21 Apr 2009 14:54:22 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:26:09 -0000	1.2
+++ import.log	21 Apr 2009 14:54:24 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:F-10:globus-core-5.15-1.fc9.src.rpm:1237534087
 globus-core-5_15-2_fc9:F-10:globus-core-5.15-2.fc9.src.rpm:1240003514
+globus-core-5_15-3_fc9:F-10:globus-core-5.15-3.fc9.src.rpm:1240325513



From kkofler at fedoraproject.org  Tue Apr 21 14:58:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 14:58:41 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.71,1.72
Message-ID: <20090421145841.17D6C700D6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24723/devel

Modified Files:
	kde-settings.spec 
Log Message:
Sync from F11:

* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2-7.20090416svn
- get rid of requires on solar-kde-theme, it should leonidas-kde-theme for F11

(No separate build needed.)


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kde-settings.spec	16 Apr 2009 19:34:47 -0000	1.71
+++ kde-settings.spec	21 Apr 2009 14:58:08 -0000	1.72
@@ -8,7 +8,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 6.%{rel}%{?dist}
+Release: 7.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -44,8 +44,8 @@
 Summary: Config files for kdebase-workspace(kdm)
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < %{version}-%{release}
-# Solar theme for KDM
-Requires: solar-kde-theme
+# leonidas theme for KDM
+Requires: leonidas-kde-theme
 #Requires: kdebase-workspace
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2-7.20090416svn
+- get rid of requires on solar-kde-theme, it should leonidas-kde-theme for F11
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-6.20090416
 - update for leonidas-kde-theme
 



From ellert at fedoraproject.org  Tue Apr 21 14:58:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 14:58:53 +0000 (UTC)
Subject: rpms/globus-core/F-11 globus-core.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20090421145853.16351700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24729/F-11

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-11/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:27:21 -0000	1.2
+++ globus-core.spec	21 Apr 2009 14:58:19 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:27:21 -0000	1.2
+++ import.log	21 Apr 2009 14:58:20 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693
 globus-core-5_15-2_fc9:F-11:globus-core-5.15-2.fc9.src.rpm:1240003593
+globus-core-5_15-3_fc9:F-11:globus-core-5.15-3.fc9.src.rpm:1240325750



From ltinkl at fedoraproject.org  Tue Apr 21 14:59:02 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 21 Apr 2009 14:59:02 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase-4.2.2-konsole-flowcontrol.patch, NONE,
	1.1 kdebase.spec, 1.372, 1.373
Message-ID: <20090421145902.B1F6E700D6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24866

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
#496447 -  fix disabling konsole's flow control


kdebase-4.2.2-konsole-flowcontrol.patch:

--- NEW FILE kdebase-4.2.2-konsole-flowcontrol.patch ---
--- kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:49	955412
+++ kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:52	955413
@@ -71,11 +71,6 @@
     // - Renable in a later KDE 4.x release when this feature works again
     _ui->enableResizeWindowButton->setVisible(false);
     
-#ifdef __GNUC__
-#warning "Re-enable when flow control is working again - bug in KDE 4.1"
-#endif
-    _ui->enableFlowControlButton->setEnabled(false);
-
     // there are various setupXYZPage() methods to load the items
     // for each page and update their states to match the profile
     // being edited.


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- kdebase.spec	1 Apr 2009 19:39:32 -0000	1.372
+++ kdebase.spec	21 Apr 2009 14:59:01 -0000	1.373
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,6 +29,7 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
+Patch100: kdebase-4.2.2-konsole-flowcontrol.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -124,6 +125,7 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch100 -p1 -b .konsole-flowcontrol
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -315,7 +317,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+* Tue Apr 21 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-3
+- #496447 -  fix disabling konsole's flow control
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From ellert at fedoraproject.org  Tue Apr 21 15:02:20 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:02:20 +0000 (UTC)
Subject: rpms/globus-core/EL-4 globus-core.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20090421150220.365D1700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26062/EL-4

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:28:56 -0000	1.2
+++ globus-core.spec	21 Apr 2009 15:02:14 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:28:56 -0000	1.2
+++ import.log	21 Apr 2009 15:02:15 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:EL-4:globus-core-5.15-1.fc9.src.rpm:1237534237
 globus-core-5_15-2_fc9:EL-4:globus-core-5.15-2.fc9.src.rpm:1240003699
+globus-core-5_15-3_fc9:EL-4:globus-core-5.15-3.fc9.src.rpm:1240325969



From ellert at fedoraproject.org  Tue Apr 21 15:04:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:04:26 +0000 (UTC)
Subject: rpms/globus-core/EL-5 globus-core.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20090421150426.33A07700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26636/EL-5

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:30:30 -0000	1.2
+++ globus-core.spec	21 Apr 2009 15:04:24 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:30:30 -0000	1.2
+++ import.log	21 Apr 2009 15:04:24 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:EL-5:globus-core-5.15-1.fc9.src.rpm:1237534383
 globus-core-5_15-2_fc9:EL-5:globus-core-5.15-2.fc9.src.rpm:1240003791
+globus-core-5_15-3_fc9:EL-5:globus-core-5.15-3.fc9.src.rpm:1240326177



From kkofler at fedoraproject.org  Tue Apr 21 15:07:22 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 15:07:22 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.469,1.470
Message-ID: <20090421150722.2B3597013C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27808/devel

Modified Files:
	kdelibs.spec 
Log Message:
Sync from F11:

* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
- don't let plasma appear over screensaver

(No separate build needed.)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.469
+++ kdelibs.spec	21 Apr 2009 15:07:16 -0000	1.470
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,7 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-Patch26: kdelibs-4.2.2-plasma-focus.patch
 # kconf_update script for Patch201 - to be upstreamed
 Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
@@ -94,6 +93,7 @@
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
 Patch104: kdelibs-4.2.2-kde#180785-2.patch
+Patch105: kdelibs-4.2.2-plasma-focus.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch26 -p1 -b .kickoff-focus
 %patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
@@ -242,6 +241,7 @@
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
 %patch104 -p4 -b .kde#180785-2
+%patch105 -p1 -b .kickoff-focus
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
 * Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 



From rrakus at fedoraproject.org  Tue Apr 21 15:08:05 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 21 Apr 2009 15:08:05 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.180,1.181
Message-ID: <20090421150805.CC5A87013C@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27905

Modified Files:
	bash.spec 
Log Message:
Use patch level in Release tag


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- bash.spec	8 Apr 2009 10:41:09 -0000	1.180
+++ bash.spec	21 Apr 2009 15:07:32 -0000	1.181
@@ -1,9 +1,10 @@
 #%define beta_tag rc1
+%define patchlevel .16
 
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 6%{?dist}
+Release: 7%{patchlevel}%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -288,6 +289,9 @@
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Apr 21 2009 Roman Rakus <rrakus at redhat.com> - 4.0-7.16
+- Use patch level in Release tag
+
 * Wed Apr 08 2009 Roman Rakus <rrakus at redhat.com> - 4.0-6
 - Official upstream patch level 16
 



From kkofler at fedoraproject.org  Tue Apr 21 15:13:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 15:13:03 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-plasma-focus.patch, 1.1,
	1.2 kdelibs.spec, 1.418, 1.419
Message-ID: <20090421151303.BCEF3700D6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29735/F-10

Modified Files:
	kdelibs-4.2.2-plasma-focus.patch kdelibs.spec 
Log Message:
Sync from F11:

* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
- don't let plasma appear over screensaver

kdelibs-4.2.2-plasma-focus.patch:

Index: kdelibs-4.2.2-plasma-focus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs-4.2.2-plasma-focus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-plasma-focus.patch	7 Apr 2009 16:10:05 -0000	1.1
+++ kdelibs-4.2.2-plasma-focus.patch	21 Apr 2009 15:13:00 -0000	1.2
@@ -1,12 +1,73 @@
 diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
 --- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
-+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
-@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
++++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-21 12:52:16.000000000 +0200
+@@ -275,14 +275,8 @@ void PopupAppletPrivate::popupConstraint
+                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
                  //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                  //else.
-                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
+-                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
 -                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+-
+-                if (passive) {
+-                    wflags |= Qt::X11BypassWindowManagerHint;
+-                }
+-
+-                dialog->setWindowFlags(wflags);
++                dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
++                updateDialogFlags();
+                 KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
+                 dialog->installEventFilter(q);
+ 
+@@ -340,7 +334,7 @@ void PopupApplet::mouseReleaseEvent(QGra
+ 
+ bool PopupApplet::eventFilter(QObject *watched, QEvent *event)
+ {
+-    if (watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
++    if (!d->passive && watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
+         d->popupLostFocus = true;
+         hidePopup();
+         QTimer::singleShot(100, this, SLOT(clearPopupLostFocus()));
+@@ -411,15 +405,7 @@ void PopupApplet::setPassivePopup(bool p
+     d->passive = passive;
+ 
+     if (d->dialog) {
+-        Qt::WindowFlags wflags = d->dialog->windowFlags();
+-
+-        if (d->passive) {
+-            wflags |= Qt::X11BypassWindowManagerHint;
+-        } else {
+-            wflags &= ~Qt::X11BypassWindowManagerHint;
+-        }
+-
+-        d->dialog->setWindowFlags(wflags);
++        d->updateDialogFlags();
+     }
+ }
+ 
+@@ -628,6 +614,15 @@ void PopupAppletPrivate::updateDialogPos
+ 
+     dialog->move(pos);
+ }
++
++
++void PopupAppletPrivate::updateDialogFlags()
++{
++    Q_ASSERT(dialog);
++    dialog->setAttribute(Qt::WA_X11NetWmWindowTypeNotification, passive);
++}
++
++
+ } // Plasma namespace
+ 
+ #include "popupapplet.moc"
+diff -up kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig kdelibs-4.2.2/plasma/private/popupapplet_p.h
+--- kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig	2009-04-21 12:59:29.000000000 +0200
++++ kdelibs-4.2.2/plasma/private/popupapplet_p.h	2009-04-21 12:52:16.000000000 +0200
+@@ -35,6 +35,7 @@ public:
+     void dialogSizeChanged();
+     void dialogStatusChanged(bool status);
+     void updateDialogPosition();
++    void updateDialogFlags();
+     void popupConstraintsEvent(Plasma::Constraints constraints);
+     void checkExtenderAppearance(Plasma::FormFactor f);
  
-                 if (passive) {
-                     wflags |= Qt::X11BypassWindowManagerHint;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- kdelibs.spec	20 Apr 2009 13:08:28 -0000	1.418
+++ kdelibs.spec	21 Apr 2009 15:13:01 -0000	1.419
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,7 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-Patch26: kdelibs-4.2.2-plasma-focus.patch
 # kconf_update script for Patch201 - to be upstreamed
 Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
@@ -94,6 +93,7 @@
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
 Patch104: kdelibs-4.2.2-kde#180785-2.patch
+Patch105: kdelibs-4.2.2-plasma-focus.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch26 -p1 -b .kickoff-focus
 %patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
@@ -242,6 +241,7 @@
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
 %patch104 -p4 -b .kde#180785-2
+%patch105 -p1 -b .kickoff-focus
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
 * Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 



From kkofler at fedoraproject.org  Tue Apr 21 15:13:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 21 Apr 2009 15:13:03 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-plasma-focus.patch, 1.1,
	1.2 kdelibs.spec, 1.393, 1.394
Message-ID: <20090421151303.D22CC7013C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29735/F-9

Modified Files:
	kdelibs-4.2.2-plasma-focus.patch kdelibs.spec 
Log Message:
Sync from F11:

* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
- don't let plasma appear over screensaver

kdelibs-4.2.2-plasma-focus.patch:

Index: kdelibs-4.2.2-plasma-focus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.2.2-plasma-focus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-plasma-focus.patch	7 Apr 2009 16:14:54 -0000	1.1
+++ kdelibs-4.2.2-plasma-focus.patch	21 Apr 2009 15:13:02 -0000	1.2
@@ -1,12 +1,73 @@
 diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
 --- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
-+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
-@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
++++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-21 12:52:16.000000000 +0200
+@@ -275,14 +275,8 @@ void PopupAppletPrivate::popupConstraint
+                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
                  //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                  //else.
-                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
+-                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
 -                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+-
+-                if (passive) {
+-                    wflags |= Qt::X11BypassWindowManagerHint;
+-                }
+-
+-                dialog->setWindowFlags(wflags);
++                dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
++                updateDialogFlags();
+                 KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
+                 dialog->installEventFilter(q);
+ 
+@@ -340,7 +334,7 @@ void PopupApplet::mouseReleaseEvent(QGra
+ 
+ bool PopupApplet::eventFilter(QObject *watched, QEvent *event)
+ {
+-    if (watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
++    if (!d->passive && watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
+         d->popupLostFocus = true;
+         hidePopup();
+         QTimer::singleShot(100, this, SLOT(clearPopupLostFocus()));
+@@ -411,15 +405,7 @@ void PopupApplet::setPassivePopup(bool p
+     d->passive = passive;
+ 
+     if (d->dialog) {
+-        Qt::WindowFlags wflags = d->dialog->windowFlags();
+-
+-        if (d->passive) {
+-            wflags |= Qt::X11BypassWindowManagerHint;
+-        } else {
+-            wflags &= ~Qt::X11BypassWindowManagerHint;
+-        }
+-
+-        d->dialog->setWindowFlags(wflags);
++        d->updateDialogFlags();
+     }
+ }
+ 
+@@ -628,6 +614,15 @@ void PopupAppletPrivate::updateDialogPos
+ 
+     dialog->move(pos);
+ }
++
++
++void PopupAppletPrivate::updateDialogFlags()
++{
++    Q_ASSERT(dialog);
++    dialog->setAttribute(Qt::WA_X11NetWmWindowTypeNotification, passive);
++}
++
++
+ } // Plasma namespace
+ 
+ #include "popupapplet.moc"
+diff -up kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig kdelibs-4.2.2/plasma/private/popupapplet_p.h
+--- kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig	2009-04-21 12:59:29.000000000 +0200
++++ kdelibs-4.2.2/plasma/private/popupapplet_p.h	2009-04-21 12:52:16.000000000 +0200
+@@ -35,6 +35,7 @@ public:
+     void dialogSizeChanged();
+     void dialogStatusChanged(bool status);
+     void updateDialogPosition();
++    void updateDialogFlags();
+     void popupConstraintsEvent(Plasma::Constraints constraints);
+     void checkExtenderAppearance(Plasma::FormFactor f);
  
-                 if (passive) {
-                     wflags |= Qt::X11BypassWindowManagerHint;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.393
+++ kdelibs.spec	21 Apr 2009 15:13:02 -0000	1.394
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,7 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-Patch26: kdelibs-4.2.2-plasma-focus.patch
 # kconf_update script for Patch201 - to be upstreamed
 Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
@@ -94,6 +93,7 @@
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
 Patch104: kdelibs-4.2.2-kde#180785-2.patch
+Patch105: kdelibs-4.2.2-plasma-focus.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch26 -p1 -b .kickoff-focus
 %patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
@@ -242,6 +241,7 @@
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
 %patch104 -p4 -b .kde#180785-2
+%patch105 -p1 -b .kickoff-focus
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
 * Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 



From jreznik at fedoraproject.org  Tue Apr 21 15:20:07 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 15:20:07 +0000 (UTC)
Subject: rpms/strigi/devel strigi-0.6.4-root-crash.patch, NONE,
	1.1 strigi.spec, 1.36, 1.37
Message-ID: <20090421152008.58C12700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31996

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.6.4-root-crash.patch 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
- fix crash with / char in path (#496620, kde#185551)


strigi-0.6.4-root-crash.patch:

--- NEW FILE strigi-0.6.4-root-crash.patch ---
diff -up strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash strigi-0.6.4/src/streamanalyzer/analysisresult.cpp
--- strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash	2009-02-01 20:55:55.000000000 +0100
+++ strigi-0.6.4/src/streamanalyzer/analysisresult.cpp	2009-04-21 13:52:21.000000000 +0200
@@ -149,7 +149,15 @@ AnalysisResult::Private::Private(const s
     if (pos == std::string::npos) {
         m_name = m_path;
     } else {
-        assert(pos != m_path.size()-1); // make sure there is no trailing '/'
+        if (pos == m_path.size()-1) {
+            // assert that there is no trailing '/' unless it is part of a
+            // protocol, which means the parent must be "" and the string must
+            // end in a colon followed by up to three slashes
+            assert(m_parentpath == "");
+            int i = m_path.size();
+            while (--i > 0 && m_path[i] == '/') {}
+            assert(i > 0 && m_path[i] == ':');
+        }
         m_name = m_path.substr(pos+1);
     }
     // check that the path start with the path of the parent


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- strigi.spec	26 Feb 2009 03:21:22 -0000	1.36
+++ strigi.spec	21 Apr 2009 15:19:36 -0000	1.37
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -10,6 +10,7 @@
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
 Patch1:		strigi-gcc44.patch
+Patch2:         strigi-0.6.4-root-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -55,6 +56,9 @@
 %patch0 -p1 -b .multilib
 %patch1 -p0 -b .gcc44
 
+# upstream patch, kde#185551
+%patch2 -p1 -b .root-crash
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -111,6 +115,9 @@
 %exclude %{_libdir}/strigi/*.cmake
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
+- fix crash with / char in path (#496620, kde#185551)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From than at fedoraproject.org  Tue Apr 21 15:20:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 15:20:22 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 kdeadmin-4.2.2-printing.patch, NONE,
	1.1 kdeadmin.spec, 1.118, 1.119
Message-ID: <20090421152022.8A3D4700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31798

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
- get rid of the dependency of system-config-printer                                      
- drop the BR on PyKDE4, system-config-printer-libs                                       
  it's just needed for runtime  


kdeadmin-4.2.2-printing.patch:

--- NEW FILE kdeadmin-4.2.2-printing.patch ---
diff -up kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt
--- kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing	2009-01-01 17:27:18.000000000 +0100
+++ kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt	2009-04-21 14:47:20.000000000 +0200
@@ -7,35 +7,17 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-macro_optional_find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-macro_optional_find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-macro_optional_find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-macro_optional_find_package(SystemConfigPrinter)
-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
-    macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
-    SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_SYSTEM_CONFIG_PRINTER)
     install( FILES
         new-printer.ui
         system-config-printer.ui
         system-config-printer-kde.py
+        debug.py
+        smburi.py
         DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
     PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py system-config-printer-kde)
     install(FILES system-config-printer-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/debug.py
--- /dev/null	2009-04-15 10:28:46.227012446 +0200
+++ kdeadmin-4.2.2/system-config-printer-kde/debug.py	2009-04-21 14:47:20.000000000 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+## Copyright (C) 2008 Red Hat, Inc.
+## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys
+import traceback
+
+_debug=False
+def debugprint (x):
+    if _debug:
+        try:
+            print >>sys.stderr, x
+        except:
+            pass
+
+def get_debugging ():
+    return _debug
+
+def set_debugging (d):
+    global _debug
+    _debug = d
+
+def fatalException (exitcode=1):
+    nonfatalException (type="fatal", end="Exiting")
+    sys.exit (exitcode)
+
+def nonfatalException (type="non-fatal", end="Continuing anyway.."):
+    d = get_debugging ()
+    set_debugging (True)
+    debugprint ("Caught %s exception.  Traceback:" % type)
+    (type, value, tb) = sys.exc_info ()
+    tblast = traceback.extract_tb (tb, limit=None)
+    if len (tblast):
+        tblast = tblast[:len (tblast) - 1]
+    extxt = traceback.format_exception_only (type, value)
+    for line in traceback.format_tb(tb):
+        debugprint (line.strip ())
+    debugprint (extxt[0].strip ())
+    debugprint (end)
+    set_debugging (d)
diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/smburi.py
--- /dev/null	2009-04-15 10:28:46.227012446 +0200
+++ kdeadmin-4.2.2/system-config-printer-kde/smburi.py	2009-04-21 14:47:20.000000000 +0200
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+## system-config-printer
+
+## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import urllib
+
+class SMBURI:
+    def __init__ (self,
+                  uri=None,
+                  group='', host='', share='', user='', password=''):
+        if uri:
+            if group or host or share or user or password:
+                raise RuntimeError
+
+            if uri.startswith ("smb://"):
+                uri = uri[6:]
+
+            self.uri = uri
+        else:
+            self.uri = self._construct (group, host, share,
+                                        user=user, password=password)
+
+    def _construct (self, group, host, share, user='', password=''):
+        uri_password = ''
+        if password:
+            uri_password = ':' + urllib.quote (password)
+        if user:
+            uri_password += '@'
+        uri = "%s%s%s" % (urllib.quote (user),
+                          uri_password,
+                          urllib.quote (group))
+        if len (group) > 0:
+            uri += '/'
+        uri += urllib.quote (host)
+        if len (share) > 0:
+            uri += "/" + urllib.quote (share)
+        return uri
+
+    def get_uri (self):
+        return self.uri
+
+    def sanitize_uri (self):
+        group, host, share, user, password = self.separate ()
+        return self._construct (group, host, share)
+
+    def separate (self):
+        uri = self.get_uri ()
+        user = ''
+        password = ''
+        auth = uri.find ('@')
+        if auth != -1:
+            u = uri[:auth].find(':')
+            if u != -1:
+                user = uri[:u]
+                password = uri[u + 1:auth]
+            else:
+                user = uri[:auth]
+            uri = uri[auth + 1:]
+        sep = uri.count ('/')
+        group = ''
+        if sep == 2:
+            g = uri.find('/')
+            group = uri[:g]
+            uri = uri[g + 1:]
+        if sep < 1:
+            host = ''
+        else:
+            h = uri.find('/')
+            host = uri[:h]
+            uri = uri[h + 1:]
+            p = host.find(':')
+            if p != -1:
+                host = host[:p]
+        share = uri
+        return (urllib.unquote (group), urllib.unquote (host),
+                urllib.unquote (share),
+                urllib.unquote (user), urllib.unquote (password))
diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 15:29:16.000000000 +0200
@@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
 import thread
 
 #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
+SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
 if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
 
@@ -64,7 +64,6 @@ import cups
 cups.require ("1.9.27")
 
 # These come from system-config-printer
-import config
 import cupshelpers  #, options
 from smburi import SMBURI
 from debug import *
@@ -717,8 +716,7 @@ class GUI(QWidget):
                 job_id = self.cups.printTestPage(self.printer.name)
 
             self.setTestButton (self.printer)
-            QMessageBox.information(self, i18nc("Test page submitted", "Submitted"), i18n("Test page submitted as "
-                                                            "job %d") % job_id)
+            KMessageBox.information(self, i18n("Test page submitted as job %1", job_id), i18nc("Test page submitted", "Submitted"))
         except cups.IPPError, (e, msg):
             if (e == cups.IPP_NOT_AUTHORIZED and
                 self.connect_server != 'localhost' and
@@ -1480,9 +1478,8 @@ class NewPrinterGUI(QDialog):
         """
 
         # Optionally disable downloadable driver support.
-        if not config.DOWNLOADABLE_DRIVER_SUPPORT:
-            self.rbtnNPDownloadableDriverSearch.setEnabled(False)
-            self.downloadableDriverSearchFrame.hide()
+        self.rbtnNPDownloadableDriverSearch.setEnabled(False)
+        self.downloadableDriverSearchFrame.hide()
 
         """
         # Set up OpenPrinting widgets.


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdeadmin.spec	3 Apr 2009 02:14:32 -0000	1.118
+++ kdeadmin.spec	21 Apr 2009 15:20:21 -0000	1.119
@@ -1,13 +1,14 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeadmin-4.2.2-printing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam
@@ -15,9 +16,7 @@
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python-devel
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
+BuildRequires:  python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -53,7 +52,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .printing
 
 %build
 
@@ -144,7 +143,15 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- get rid of the dependency of system-config-printer
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+
+* Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- fix #496646, system-config-printer-kde doesn't start
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets 
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From than at fedoraproject.org  Tue Apr 21 15:24:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 21 Apr 2009 15:24:57 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 kdeadmin-4.2.2-printing.patch, NONE,
	1.1 kdeadmin.spec, 1.103, 1.104
Message-ID: <20090421152457.22332700D6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv701

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
- get rid of the dependency of system-config-printer                                      
- drop the BR on PyKDE4, system-config-printer-libs                                       
  it's just needed for runtime


kdeadmin-4.2.2-printing.patch:

--- NEW FILE kdeadmin-4.2.2-printing.patch ---
diff -up kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt
--- kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt.printing	2009-01-01 17:27:18.000000000 +0100
+++ kdeadmin-4.2.2/system-config-printer-kde/CMakeLists.txt	2009-04-21 14:47:20.000000000 +0200
@@ -7,35 +7,17 @@ ENDMACRO(PYKDE4_ADD_EXECUTABLE)
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-macro_optional_find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-macro_optional_find_package(PyKDE)
-IF(NOT PYKDE_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE_FOUND)
-
-macro_optional_find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-macro_optional_find_package(SystemConfigPrinter)
-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
-    macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
-    SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_SYSTEM_CONFIG_PRINTER)
     install( FILES
         new-printer.ui
         system-config-printer.ui
         system-config-printer-kde.py
+        debug.py
+        smburi.py
         DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
     PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py system-config-printer-kde)
     install(FILES system-config-printer-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/debug.py
--- /dev/null	2009-04-15 10:28:46.227012446 +0200
+++ kdeadmin-4.2.2/system-config-printer-kde/debug.py	2009-04-21 14:47:20.000000000 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+## Copyright (C) 2008 Red Hat, Inc.
+## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys
+import traceback
+
+_debug=False
+def debugprint (x):
+    if _debug:
+        try:
+            print >>sys.stderr, x
+        except:
+            pass
+
+def get_debugging ():
+    return _debug
+
+def set_debugging (d):
+    global _debug
+    _debug = d
+
+def fatalException (exitcode=1):
+    nonfatalException (type="fatal", end="Exiting")
+    sys.exit (exitcode)
+
+def nonfatalException (type="non-fatal", end="Continuing anyway.."):
+    d = get_debugging ()
+    set_debugging (True)
+    debugprint ("Caught %s exception.  Traceback:" % type)
+    (type, value, tb) = sys.exc_info ()
+    tblast = traceback.extract_tb (tb, limit=None)
+    if len (tblast):
+        tblast = tblast[:len (tblast) - 1]
+    extxt = traceback.format_exception_only (type, value)
+    for line in traceback.format_tb(tb):
+        debugprint (line.strip ())
+    debugprint (extxt[0].strip ())
+    debugprint (end)
+    set_debugging (d)
diff -up /dev/null kdeadmin-4.2.2/system-config-printer-kde/smburi.py
--- /dev/null	2009-04-15 10:28:46.227012446 +0200
+++ kdeadmin-4.2.2/system-config-printer-kde/smburi.py	2009-04-21 14:47:20.000000000 +0200
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+## system-config-printer
+
+## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import urllib
+
+class SMBURI:
+    def __init__ (self,
+                  uri=None,
+                  group='', host='', share='', user='', password=''):
+        if uri:
+            if group or host or share or user or password:
+                raise RuntimeError
+
+            if uri.startswith ("smb://"):
+                uri = uri[6:]
+
+            self.uri = uri
+        else:
+            self.uri = self._construct (group, host, share,
+                                        user=user, password=password)
+
+    def _construct (self, group, host, share, user='', password=''):
+        uri_password = ''
+        if password:
+            uri_password = ':' + urllib.quote (password)
+        if user:
+            uri_password += '@'
+        uri = "%s%s%s" % (urllib.quote (user),
+                          uri_password,
+                          urllib.quote (group))
+        if len (group) > 0:
+            uri += '/'
+        uri += urllib.quote (host)
+        if len (share) > 0:
+            uri += "/" + urllib.quote (share)
+        return uri
+
+    def get_uri (self):
+        return self.uri
+
+    def sanitize_uri (self):
+        group, host, share, user, password = self.separate ()
+        return self._construct (group, host, share)
+
+    def separate (self):
+        uri = self.get_uri ()
+        user = ''
+        password = ''
+        auth = uri.find ('@')
+        if auth != -1:
+            u = uri[:auth].find(':')
+            if u != -1:
+                user = uri[:u]
+                password = uri[u + 1:auth]
+            else:
+                user = uri[:auth]
+            uri = uri[auth + 1:]
+        sep = uri.count ('/')
+        group = ''
+        if sep == 2:
+            g = uri.find('/')
+            group = uri[:g]
+            uri = uri[g + 1:]
+        if sep < 1:
+            host = ''
+        else:
+            h = uri.find('/')
+            host = uri[:h]
+            uri = uri[h + 1:]
+            p = host.find(':')
+            if p != -1:
+                host = host[:p]
+        share = uri
+        return (urllib.unquote (group), urllib.unquote (host),
+                urllib.unquote (share),
+                urllib.unquote (user), urllib.unquote (password))
diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 15:29:16.000000000 +0200
@@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
 import thread
 
 #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
+SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
 if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
 
@@ -64,7 +64,6 @@ import cups
 cups.require ("1.9.27")
 
 # These come from system-config-printer
-import config
 import cupshelpers  #, options
 from smburi import SMBURI
 from debug import *
@@ -717,8 +716,7 @@ class GUI(QWidget):
                 job_id = self.cups.printTestPage(self.printer.name)
 
             self.setTestButton (self.printer)
-            QMessageBox.information(self, i18nc("Test page submitted", "Submitted"), i18n("Test page submitted as "
-                                                            "job %d") % job_id)
+            KMessageBox.information(self, i18n("Test page submitted as job %1", job_id), i18nc("Test page submitted", "Submitted"))
         except cups.IPPError, (e, msg):
             if (e == cups.IPP_NOT_AUTHORIZED and
                 self.connect_server != 'localhost' and
@@ -1480,9 +1478,8 @@ class NewPrinterGUI(QDialog):
         """
 
         # Optionally disable downloadable driver support.
-        if not config.DOWNLOADABLE_DRIVER_SUPPORT:
-            self.rbtnNPDownloadableDriverSearch.setEnabled(False)
-            self.downloadableDriverSearchFrame.hide()
+        self.rbtnNPDownloadableDriverSearch.setEnabled(False)
+        self.downloadableDriverSearchFrame.hide()
 
         """
         # Set up OpenPrinting widgets.


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdeadmin.spec	3 Apr 2009 02:14:32 -0000	1.103
+++ kdeadmin.spec	21 Apr 2009 15:24:55 -0000	1.104
@@ -1,13 +1,14 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdeadmin-4.2.2-printing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam
@@ -15,9 +16,7 @@
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python-devel
-BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer-libs
+BuildRequires:  python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -53,7 +52,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .printing
 
 %build
 
@@ -144,7 +143,15 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-1
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- get rid of the dependency of system-config-printer
+- drop the BR on PyKDE4, system-config-printer-libs
+  it's just needed for runtime
+
+* Mon Apr 20 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- fix #496646, system-config-printer-kde doesn't start
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets 
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From jreznik at fedoraproject.org  Tue Apr 21 15:35:35 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 15:35:35 +0000 (UTC)
Subject: rpms/strigi/F-11 strigi-0.6.4-root-crash.patch, NONE,
	1.1 strigi.spec, 1.36, 1.37
Message-ID: <20090421153535.A3AD7700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/strigi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3427

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.6.4-root-crash.patch 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
- fix crash with / char in path (#496620, kde#185551)


strigi-0.6.4-root-crash.patch:

--- NEW FILE strigi-0.6.4-root-crash.patch ---
diff -up strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash strigi-0.6.4/src/streamanalyzer/analysisresult.cpp
--- strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash	2009-02-01 20:55:55.000000000 +0100
+++ strigi-0.6.4/src/streamanalyzer/analysisresult.cpp	2009-04-21 13:52:21.000000000 +0200
@@ -149,7 +149,15 @@ AnalysisResult::Private::Private(const s
     if (pos == std::string::npos) {
         m_name = m_path;
     } else {
-        assert(pos != m_path.size()-1); // make sure there is no trailing '/'
+        if (pos == m_path.size()-1) {
+            // assert that there is no trailing '/' unless it is part of a
+            // protocol, which means the parent must be "" and the string must
+            // end in a colon followed by up to three slashes
+            assert(m_parentpath == "");
+            int i = m_path.size();
+            while (--i > 0 && m_path[i] == '/') {}
+            assert(i > 0 && m_path[i] == ':');
+        }
         m_name = m_path.substr(pos+1);
     }
     // check that the path start with the path of the parent


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-11/strigi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- strigi.spec	26 Feb 2009 03:21:22 -0000	1.36
+++ strigi.spec	21 Apr 2009 15:35:32 -0000	1.37
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -10,6 +10,7 @@
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
 Patch1:		strigi-gcc44.patch
+Patch2:         strigi-0.6.4-root-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -55,6 +56,9 @@
 %patch0 -p1 -b .multilib
 %patch1 -p0 -b .gcc44
 
+# upstream patch, kde#185551
+%patch2 -p1 -b .root-crash
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -111,6 +115,9 @@
 %exclude %{_libdir}/strigi/*.cmake
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
+- fix crash with / char in path (#496620, kde#185551)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Tue Apr 21 15:37:36 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 21 Apr 2009 15:37:36 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase-4.2.2-konsole-flowcontrol.patch, NONE,
	1.1 kdebase.spec, 1.362, 1.363
Message-ID: <20090421153736.F3145700D6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3528/F-10

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
#496447 -  fix disabling konsole's flow control


kdebase-4.2.2-konsole-flowcontrol.patch:

--- NEW FILE kdebase-4.2.2-konsole-flowcontrol.patch ---
--- kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:49	955412
+++ kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:52	955413
@@ -71,11 +71,6 @@
     // - Renable in a later KDE 4.x release when this feature works again
     _ui->enableResizeWindowButton->setVisible(false);
     
-#ifdef __GNUC__
-#warning "Re-enable when flow control is working again - bug in KDE 4.1"
-#endif
-    _ui->enableFlowControlButton->setEnabled(false);
-
     // there are various setupXYZPage() methods to load the items
     // for each page and update their states to match the profile
     // being edited.


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- kdebase.spec	3 Apr 2009 12:25:46 -0000	1.362
+++ kdebase.spec	21 Apr 2009 15:37:04 -0000	1.363
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,6 +29,7 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
+Patch100: kdebase-4.2.2-konsole-flowcontrol.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -124,6 +125,7 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch100 -p1 -b .konsole-flowcontrol
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -315,7 +317,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+* Tue Apr 21 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-3
+- #496447 -  fix disabling konsole's flow control
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From ltinkl at fedoraproject.org  Tue Apr 21 15:37:37 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 21 Apr 2009 15:37:37 +0000 (UTC)
Subject: rpms/kdebase/F-11 kdebase-4.2.2-konsole-flowcontrol.patch, NONE,
	1.1 kdebase.spec, 1.372, 1.373
Message-ID: <20090421153737.D25B1700D6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3528/F-11

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
#496447 -  fix disabling konsole's flow control


kdebase-4.2.2-konsole-flowcontrol.patch:

--- NEW FILE kdebase-4.2.2-konsole-flowcontrol.patch ---
--- kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:49	955412
+++ kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:52	955413
@@ -71,11 +71,6 @@
     // - Renable in a later KDE 4.x release when this feature works again
     _ui->enableResizeWindowButton->setVisible(false);
     
-#ifdef __GNUC__
-#warning "Re-enable when flow control is working again - bug in KDE 4.1"
-#endif
-    _ui->enableFlowControlButton->setEnabled(false);
-
     // there are various setupXYZPage() methods to load the items
     // for each page and update their states to match the profile
     // being edited.


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- kdebase.spec	1 Apr 2009 19:39:32 -0000	1.372
+++ kdebase.spec	21 Apr 2009 15:37:06 -0000	1.373
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,6 +29,7 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
+Patch100: kdebase-4.2.2-konsole-flowcontrol.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -124,6 +125,7 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch100 -p1 -b .konsole-flowcontrol
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -315,7 +317,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+* Tue Apr 21 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-3
+- #496447 -  fix disabling konsole's flow control
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From ltinkl at fedoraproject.org  Tue Apr 21 15:37:39 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 21 Apr 2009 15:37:39 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase-4.2.2-konsole-flowcontrol.patch, NONE,
	1.1 kdebase.spec, 1.352, 1.353
Message-ID: <20090421153739.3DC8A700D6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3528/F-9

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
#496447 -  fix disabling konsole's flow control


kdebase-4.2.2-konsole-flowcontrol.patch:

--- NEW FILE kdebase-4.2.2-konsole-flowcontrol.patch ---
--- kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:49	955412
+++ kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:52	955413
@@ -71,11 +71,6 @@
     // - Renable in a later KDE 4.x release when this feature works again
     _ui->enableResizeWindowButton->setVisible(false);
     
-#ifdef __GNUC__
-#warning "Re-enable when flow control is working again - bug in KDE 4.1"
-#endif
-    _ui->enableFlowControlButton->setEnabled(false);
-
     // there are various setupXYZPage() methods to load the items
     // for each page and update their states to match the profile
     // being edited.


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- kdebase.spec	3 Apr 2009 12:25:47 -0000	1.352
+++ kdebase.spec	21 Apr 2009 15:37:07 -0000	1.353
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,6 +29,7 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
+Patch100: kdebase-4.2.2-konsole-flowcontrol.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -124,6 +125,7 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch100 -p1 -b .konsole-flowcontrol
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -315,7 +317,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+* Tue Apr 21 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-3
+- #496447 -  fix disabling konsole's flow control
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1



From mjakubicek at fedoraproject.org  Tue Apr 21 15:37:41 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 15:37:41 +0000 (UTC)
Subject: rpms/libresample/F-11 libresample.spec,1.9,1.10
Message-ID: <20090421153741.242D0700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/libresample/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3823/F-11

Modified Files:
	libresample.spec 
Log Message:
- Fix FTBFS: fixed failing tests in %%check




Index: libresample.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libresample/F-11/libresample.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libresample.spec	25 Feb 2009 17:46:55 -0000	1.9
+++ libresample.spec	21 Apr 2009 15:37:09 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A real-time library for audio sampling rate conversion
 Name: libresample
 Version: 0.1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://ccrma-www.stanford.edu/~jos/resample/Free_Resampling_Software.html
@@ -58,6 +58,7 @@
 make install DESTDIR=%{buildroot}
 
 %check
+export LD_LIBRARY_PATH=.
 ctest .
 
 %clean
@@ -81,6 +82,9 @@
 %{_libdir}/pkgconfig/libresample.pc
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.1.3-11
+- Fix FTBFS: fixed failing tests in %%check
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Tue Apr 21 15:37:41 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 15:37:41 +0000 (UTC)
Subject: rpms/libresample/devel libresample.spec,1.9,1.10
Message-ID: <20090421153741.5B2DE7013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/libresample/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3823/devel

Modified Files:
	libresample.spec 
Log Message:
- Fix FTBFS: fixed failing tests in %%check




Index: libresample.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libresample/devel/libresample.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libresample.spec	25 Feb 2009 17:46:55 -0000	1.9
+++ libresample.spec	21 Apr 2009 15:37:10 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A real-time library for audio sampling rate conversion
 Name: libresample
 Version: 0.1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://ccrma-www.stanford.edu/~jos/resample/Free_Resampling_Software.html
@@ -58,6 +58,7 @@
 make install DESTDIR=%{buildroot}
 
 %check
+export LD_LIBRARY_PATH=.
 ctest .
 
 %clean
@@ -81,6 +82,9 @@
 %{_libdir}/pkgconfig/libresample.pc
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.1.3-11
+- Fix FTBFS: fixed failing tests in %%check
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jreznik at fedoraproject.org  Tue Apr 21 15:38:53 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 15:38:53 +0000 (UTC)
Subject: rpms/strigi/F-10 strigi-0.6.4-root-crash.patch, NONE,
	1.1 strigi.spec, 1.24, 1.25
Message-ID: <20090421153853.2CDE3700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/strigi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4464

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.6.4-root-crash.patch 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
- fix crash with / char in path (#496620, kde#185551)


strigi-0.6.4-root-crash.patch:

--- NEW FILE strigi-0.6.4-root-crash.patch ---
diff -up strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash strigi-0.6.4/src/streamanalyzer/analysisresult.cpp
--- strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash	2009-02-01 20:55:55.000000000 +0100
+++ strigi-0.6.4/src/streamanalyzer/analysisresult.cpp	2009-04-21 13:52:21.000000000 +0200
@@ -149,7 +149,15 @@ AnalysisResult::Private::Private(const s
     if (pos == std::string::npos) {
         m_name = m_path;
     } else {
-        assert(pos != m_path.size()-1); // make sure there is no trailing '/'
+        if (pos == m_path.size()-1) {
+            // assert that there is no trailing '/' unless it is part of a
+            // protocol, which means the parent must be "" and the string must
+            // end in a colon followed by up to three slashes
+            assert(m_parentpath == "");
+            int i = m_path.size();
+            while (--i > 0 && m_path[i] == '/') {}
+            assert(i > 0 && m_path[i] == ':');
+        }
         m_name = m_path.substr(pos+1);
     }
     // check that the path start with the path of the parent


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/strigi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- strigi.spec	5 Mar 2009 12:43:05 -0000	1.24
+++ strigi.spec	21 Apr 2009 15:38:51 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -10,6 +10,7 @@
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
 Patch1:		strigi-gcc44.patch
+Patch2:         strigi-0.6.4-root-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -55,6 +56,9 @@
 %patch0 -p1 -b .multilib
 %patch1 -p0 -b .gcc44
 
+# upstream patch, kde#185551
+%patch2 -p1 -b .root-crash
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -111,6 +115,9 @@
 %exclude %{_libdir}/strigi/*.cmake
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
+- fix crash with / char in path (#496620, kde#185551)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jreznik at fedoraproject.org  Tue Apr 21 15:41:43 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 15:41:43 +0000 (UTC)
Subject: rpms/strigi/F-9 strigi-0.6.4-root-crash.patch, NONE, 1.1 strigi.spec,
	1.20, 1.21
Message-ID: <20090421154143.593A570137@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/strigi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5576

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.6.4-root-crash.patch 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
- fix crash with / char in path (#496620, kde#185551)


strigi-0.6.4-root-crash.patch:

--- NEW FILE strigi-0.6.4-root-crash.patch ---
diff -up strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash strigi-0.6.4/src/streamanalyzer/analysisresult.cpp
--- strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash	2009-02-01 20:55:55.000000000 +0100
+++ strigi-0.6.4/src/streamanalyzer/analysisresult.cpp	2009-04-21 13:52:21.000000000 +0200
@@ -149,7 +149,15 @@ AnalysisResult::Private::Private(const s
     if (pos == std::string::npos) {
         m_name = m_path;
     } else {
-        assert(pos != m_path.size()-1); // make sure there is no trailing '/'
+        if (pos == m_path.size()-1) {
+            // assert that there is no trailing '/' unless it is part of a
+            // protocol, which means the parent must be "" and the string must
+            // end in a colon followed by up to three slashes
+            assert(m_parentpath == "");
+            int i = m_path.size();
+            while (--i > 0 && m_path[i] == '/') {}
+            assert(i > 0 && m_path[i] == ':');
+        }
         m_name = m_path.substr(pos+1);
     }
     // check that the path start with the path of the parent


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- strigi.spec	5 Mar 2009 12:43:05 -0000	1.20
+++ strigi.spec	21 Apr 2009 15:41:40 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -10,6 +10,7 @@
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
 Patch1:		strigi-gcc44.patch
+Patch2:         strigi-0.6.4-root-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -55,6 +56,9 @@
 %patch0 -p1 -b .multilib
 %patch1 -p0 -b .gcc44
 
+# upstream patch, kde#185551
+%patch2 -p1 -b .root-crash
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -111,6 +115,9 @@
 %exclude %{_libdir}/strigi/*.cmake
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
+- fix crash with / char in path (#496620, kde#185551)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ellert at fedoraproject.org  Tue Apr 21 15:43:32 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:43:32 +0000 (UTC)
Subject: rpms/globus-common/devel .cvsignore, 1.2, 1.3 globus-common.spec,
	1.2, 1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421154333.50A5C70137@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6160/devel

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:40:27 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:43:29 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 21:51:10 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:43:29 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:51:10 -0000	1.2
+++ import.log	21 Apr 2009 15:43:29 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760
 globus-common-10_2-2_fc9:HEAD:globus-common-10.2-2.fc9.src.rpm:1240004909
+globus-common-10_2-3_fc9:HEAD:globus-common-10.2-3.fc9.src.rpm:1240328457


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 07:40:27 -0000	1.2
+++ sources	21 Apr 2009 15:43:29 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz



From twaugh at fedoraproject.org  Tue Apr 21 15:44:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 21 Apr 2009 15:44:22 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.470,1.471
Message-ID: <20090421154422.878F870137@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6699

Modified Files:
	cups.spec 
Log Message:
* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com>
- Specify that we want poppler's pdftops (not ghostscript) for the
  pdftops wrapper when calling configure.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- cups.spec	17 Apr 2009 16:34:28 -0000	1.470
+++ cups.spec	21 Apr 2009 15:44:21 -0000	1.471
@@ -61,7 +61,6 @@
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
 Prereq: /usr/sbin/alternatives
 %endif
-Requires: poppler-utils
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
@@ -108,6 +107,8 @@
 # Require the package here so that we know /etc/portreserve/ exists.
 Requires: portreserve
 
+Requires: poppler-utils
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -220,7 +221,8 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--enable-pdftops --with-pdftops=pdftops \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	--with-php=/usr/bin/php-cgi --enable-avahi \
 	localedir=%{_datadir}/locale
 
@@ -476,6 +478,10 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com>
+- Specify that we want poppler's pdftops (not ghostscript) for the
+  pdftops wrapper when calling configure.
+
 * Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.14
 - Applied patch to fix CVE-2009-0163 (bug #490596).
 - Applied patch to fix CVE-2009-0164 (bug #490597).



From ellert at fedoraproject.org  Tue Apr 21 15:46:25 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:46:25 +0000 (UTC)
Subject: rpms/globus-common/F-9 .cvsignore, 1.2, 1.3 globus-common.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421154626.033C7700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7394/F-9

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:43:09 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:45:52 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 21:53:22 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:45:52 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:53:22 -0000	1.2
+++ import.log	21 Apr 2009 15:45:52 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:F-9:globus-common-10.2-1.fc9.src.rpm:1239090158
 globus-common-10_2-2_fc9:F-9:globus-common-10.2-2.fc9.src.rpm:1240005128
+globus-common-10_2-3_fc9:F-9:globus-common-10.2-3.fc9.src.rpm:1240328671


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 07:43:09 -0000	1.2
+++ sources	21 Apr 2009 15:45:52 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz



From ellert at fedoraproject.org  Tue Apr 21 15:49:36 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:49:36 +0000 (UTC)
Subject: rpms/globus-common/F-10 .cvsignore, 1.2, 1.3 globus-common.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421154936.2B653700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8356/F-10

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 08:31:53 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:49:33 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 21:55:04 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:49:33 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:55:04 -0000	1.2
+++ import.log	21 Apr 2009 15:49:33 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:F-10:globus-common-10.2-1.fc9.src.rpm:1239093082
 globus-common-10_2-2_fc9:F-10:globus-common-10.2-2.fc9.src.rpm:1240005254
+globus-common-10_2-3_fc9:F-10:globus-common-10.2-3.fc9.src.rpm:1240328836


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 08:31:54 -0000	1.2
+++ sources	21 Apr 2009 15:49:33 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz



From ellert at fedoraproject.org  Tue Apr 21 15:51:48 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:51:48 +0000 (UTC)
Subject: rpms/globus-common/F-11 .cvsignore, 1.2, 1.3 globus-common.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421155148.9EE29700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9255/F-11

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:40:27 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:51:13 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 21:56:35 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:51:13 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:56:35 -0000	1.2
+++ import.log	21 Apr 2009 15:51:13 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760
 globus-common-10_2-2_fc9:F-11:globus-common-10.2-2.fc9.src.rpm:1240005358
+globus-common-10_2-3_fc9:F-11:globus-common-10.2-3.fc9.src.rpm:1240329014


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 07:40:27 -0000	1.2
+++ sources	21 Apr 2009 15:51:13 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz



From kevin at fedoraproject.org  Tue Apr 21 15:52:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 15:52:04 +0000 (UTC)
Subject: rpms/xfdesktop/F-11 xfdesktop.spec, 1.33, 1.34 sources, 1.12,
	1.13 .cvsignore, 1.12, 1.13
Message-ID: <20090421155204.EE011700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9504

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/F-11/xfdesktop.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xfdesktop.spec	13 Apr 2009 20:52:25 -0000	1.33
+++ xfdesktop.spec	21 Apr 2009 15:52:02 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.6.0
-Release: 4%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -90,6 +90,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
 - Exclude gnome-default-applications from menu to avoid duplicates (#488558)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Feb 2009 20:41:49 -0000	1.12
+++ sources	21 Apr 2009 15:52:03 -0000	1.13
@@ -1 +1 @@
-508b18f9d4ef27833517bba3bd6e2fbf  xfdesktop-4.6.0.tar.bz2
+ae15cacc3e3834cca7238a8e1035c50d  xfdesktop-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Feb 2009 20:41:49 -0000	1.12
+++ .cvsignore	21 Apr 2009 15:52:03 -0000	1.13
@@ -1 +1 @@
-xfdesktop-4.6.0.tar.bz2
+xfdesktop-4.6.1.tar.bz2



From kevin at fedoraproject.org  Tue Apr 21 15:53:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 15:53:13 +0000 (UTC)
Subject: rpms/xfce4-appfinder/F-11 xfce4-appfinder.spec, 1.23, 1.24 sources, 
	1.14, 1.15 .cvsignore, 1.14, 1.15
Message-ID: <20090421155313.DFE34700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9773

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Update to 4.6.1



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/F-11/xfce4-appfinder.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfce4-appfinder.spec	2 Mar 2009 21:58:42 -0000	1.23
+++ xfce4-appfinder.spec	21 Apr 2009 15:53:10 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.6.0
+Version: 4.6.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -55,6 +55,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Feb 2009 20:18:08 -0000	1.14
+++ sources	21 Apr 2009 15:53:10 -0000	1.15
@@ -1 +1 @@
-414b20e3569130348d96b0e74c7d1f3f  xfce4-appfinder-4.6.0.tar.bz2
+a1bc7d88100cfd92714a300be531589b  xfce4-appfinder-4.6.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Feb 2009 20:18:08 -0000	1.14
+++ .cvsignore	21 Apr 2009 15:53:10 -0000	1.15
@@ -1 +1 @@
-xfce4-appfinder-4.6.0.tar.bz2
+xfce4-appfinder-4.6.1.tar.bz2



From twaugh at fedoraproject.org  Tue Apr 21 15:53:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 21 Apr 2009 15:53:56 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.470,1.471
Message-ID: <20090421155356.BC3FD700D6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9953

Modified Files:
	cups.spec 
Log Message:
* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com>
- Specify that we want poppler's pdftops (not ghostscript) for the
  pdftops wrapper when calling configure.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- cups.spec	17 Apr 2009 16:29:10 -0000	1.470
+++ cups.spec	21 Apr 2009 15:53:53 -0000	1.471
@@ -61,7 +61,6 @@
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
 Prereq: /usr/sbin/alternatives
 %endif
-Requires: poppler-utils
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
@@ -108,6 +107,8 @@
 # Require the package here so that we know /etc/portreserve/ exists.
 Requires: portreserve
 
+Requires: poppler-utils
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -220,7 +221,8 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--enable-pdftops --with-pdftops=pdftops \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	--with-php=/usr/bin/php-cgi --enable-avahi \
 	localedir=%{_datadir}/locale
 
@@ -476,6 +478,10 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com>
+- Specify that we want poppler's pdftops (not ghostscript) for the
+  pdftops wrapper when calling configure.
+
 * Fri Apr 17 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.14
 - Applied patch to fix CVE-2009-0163 (bug #490596).
 - Applied patch to fix CVE-2009-0164 (bug #490597).



From ellert at fedoraproject.org  Tue Apr 21 15:55:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:55:00 +0000 (UTC)
Subject: rpms/globus-common/EL-4 .cvsignore, 1.2, 1.3 globus-common.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421155500.762A6700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10218/EL-4

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:45:46 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:54:28 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 21:58:52 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:54:28 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:58:52 -0000	1.2
+++ import.log	21 Apr 2009 15:54:29 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:EL-4:globus-common-10.2-1.fc9.src.rpm:1239090310
 globus-common-10_2-2_fc9:EL-4:globus-common-10.2-2.fc9.src.rpm:1240005453
+globus-common-10_2-3_fc9:EL-4:globus-common-10.2-3.fc9.src.rpm:1240329175


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 07:45:46 -0000	1.2
+++ sources	21 Apr 2009 15:54:29 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz



From ellert at fedoraproject.org  Tue Apr 21 15:56:55 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 21 Apr 2009 15:56:55 +0000 (UTC)
Subject: rpms/globus-common/EL-5 .cvsignore, 1.2, 1.3 globus-common.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421155656.0990D700D6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11037/EL-5

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:48:04 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:56:47 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 22:00:21 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:56:47 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 22:00:21 -0000	1.2
+++ import.log	21 Apr 2009 15:56:47 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:EL-5:globus-common-10.2-1.fc9.src.rpm:1239090450
 globus-common-10_2-2_fc9:EL-5:globus-common-10.2-2.fc9.src.rpm:1240005583
+globus-common-10_2-3_fc9:EL-5:globus-common-10.2-3.fc9.src.rpm:1240329334


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 07:48:04 -0000	1.2
+++ sources	21 Apr 2009 15:56:47 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz



From jreznik at fedoraproject.org  Tue Apr 21 16:10:44 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 16:10:44 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.1,1.2
Message-ID: <20090421161044.BDEF5700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14884

Modified Files:
	leonidas-kde-theme.spec 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-1
- wallpaper screenshot
- fixes

* Fri Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.1-1
- use KDM PNG for KDM, KSplash, JPGs for wallpaper
- does not link wallpapers to wallpapers directory

* Wed Apr 15 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-2
- fix license
- upstream url + source url



Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leonidas-kde-theme.spec	16 Apr 2009 18:07:33 -0000	1.1
+++ leonidas-kde-theme.spec	21 Apr 2009 16:10:42 -0000	1.2
@@ -1,14 +1,14 @@
 Name:		leonidas-kde-theme
-Version:	0.2.0
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
-License:	GPLv2 and CC-BY-SA
+License:	GPLv2+ and CC-BY-SA
 
-URL:		https://fedoraproject.org/wiki/F11_Artwork
 # We are upstream for this package
-Source0:	%{name}-%{version}.tar.bz2
+URL:		https://fedorahosted.org/fedora-kde-artwork/
+Source0:	https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
@@ -34,48 +34,18 @@
 rm -rf %{buildroot}
 
 # wallpapers
+# no more wallpapers links in wallpapers directory which causes all wp in list,
+# not only theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers
-ln -sf ../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas.png
-ln -sf ../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_wide.png
-ln -sf ../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_high.png
 
 # KDM
+# for KDM and splash we use PNG wallpaper from leonidas-kdm package
+# thus only one aspect ratio
+
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 cp -rp kdm/leonidas/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 (cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/leonidas/
-ln -s ../../../../../wallpapers/leonidas.png leonidas-640x480.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-800x480.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-800x600.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1024x600.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1024x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1152x720.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1152x864.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x800.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1280x960.png
-#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1280x1024.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1366x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1440x900.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1440x1080.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1600x1200.png
-#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1600x1280.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1600x1280.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1080.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1200.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1920x1440.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-2048x1536.png
-# KDM falls back to this one if there's no match
-ln -s ../../../../../wallpapers/leonidas.png leonidas.png
+ln -s ../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png leonidas.png
 )
 
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
@@ -84,47 +54,46 @@
 # KSplash
 mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
 cp -rp ksplash/Leonidas/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
-ln -s ../../../../../../wallpapers/leonidas.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200
-ln -s ../../../../../../wallpapers/leonidas_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200/leonidas.png
-ln -s ../../../../../../wallpapers/leonidas_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/leonidas.png
-ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/logo.png
+ln -s ../../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
+
+# logo from fedora-logos package
+# TODO: remove old one from fedora-logos as we're using default one
+ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
 cp -rp wallpapers/leonidas/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/leonidas
-#cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
+cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
 (cd %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
-ln -s ../../../leonidas.png 640x480.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 640x480.png
 # That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 800x480.png
-ln -s ../../../leonidas.png 800x600.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 800x480.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 800x600.png
 # That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1024x600.png
-ln -s ../../../leonidas.png 1024x768.png
-ln -s ../../../leonidas_wide.png 1152x720.png
-ln -s ../../../leonidas.png 1152x864.png
-ln -s ../../../leonidas.png 1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1280x768.png
-ln -s ../../../leonidas_wide.png 1280x800.png
-ln -s ../../../leonidas.png 1280x960.png
-ln -s ../../../leonidas_high.png 1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1366x768.png
-ln -s ../../../leonidas_wide.png 1440x900.png
-ln -s ../../../leonidas.png 1440x1080.png
-ln -s ../../../leonidas.png 1600x1200.png
-ln -s ../../../leonidas_high.png 1600x1280.png
-ln -s ../../../leonidas_wide.png 1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1920x1080.png
-ln -s ../../../leonidas_wide.png 1920x1200.png
-ln -s ../../../leonidas.png 1920x1440.png
-ln -s ../../../leonidas.png 2048x1536.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1024x600.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1024x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1152x720.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1152x864.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1200x900.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x720.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x800.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1280x960.png
+ln -s ../../../../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png 1280x1024.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1366x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1440x900.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1440x1080.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1600x1200.png
+ln -s ../../../../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png 1600x1280.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1680x1050.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1920x1080.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1920x1200.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1920x1440.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 2048x1536.png
 )
 
 
@@ -137,15 +106,24 @@
 %doc README COPYING.CC-BY-SA COPYING.GPLv2
 %{_kde4_appsdir}/kdm/themes/leonidas/
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/
-%{_kde4_datadir}/wallpapers/leonidas.png
-%{_kde4_datadir}/wallpapers/leonidas_wide.png
-%{_kde4_datadir}/wallpapers/leonidas_high.png
 %{_kde4_datadir}/wallpapers/leonidas/
 #%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png
 
 
 %changelog
-* Tue Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-1
+- wallpaper screenshot
+- fixes
+
+* Fri Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.1-1
+- use KDM PNG for KDM, KSplash, JPGs for wallpaper
+- does not link wallpapers to wallpapers directory
+
+* Wed Apr 15 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-2
+- fix license
+- upstream url + source url 
+ 
+* Tue Apr 7 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
 - updated to lion theme
 
 * Tue Mar 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.0-1



From kdudka at fedoraproject.org  Tue Apr 21 16:12:47 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 21 Apr 2009 16:12:47 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.4-flags.patch, NONE, 1.1 curl.spec, 1.93,
	1.94
Message-ID: <20090421161247.457BD700D6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15719

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-flags.patch 
Log Message:
Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.

curl-7.19.4-flags.patch:

--- NEW FILE curl-7.19.4-flags.patch ---
diff -urNp curl-7.19.4.orig/configure curl-7.19.4/configure
--- curl-7.19.4.orig/configure	2009-04-21 10:59:47.000000000 +0530
+++ curl-7.19.4/configure	2009-04-21 11:19:13.000000000 +0530
@@ -16,6 +16,9 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
+fedora_CPPFLAGS="$CPPFLAGS"
+fedora_CFLAGS="$CFLAGS"
+
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -46881,6 +46884,8 @@ fi
 
 
 
+CFLAGS="$CFLAGS $fedora_CFLAGS"
+CPPFLAGS="$CPPFLAGS $fedora_CPPFLAGS"
 
 squeeze CFLAGS
 squeeze CPPFLAGS


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- curl.spec	14 Apr 2009 10:26:46 -0000	1.93
+++ curl.spec	21 Apr 2009 16:12:16 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 Patch4: curl-7.19.4-tool-leak.patch
 Patch5: curl-7.19.4-enable-aes.patch
 Patch6: curl-7.19.4-nss-leak.patch
+Patch7: curl-7.19.4-flags.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %patch4 -p1 -b .toolleak
 %patch5 -p1 -b .enableaes
 %patch6 -p1 -b .nssleak
+%patch7 -p1 -b .flags
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -146,6 +148,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> 7.19.4-7
+- Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.
+
 * Tue Apr 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-6
 - upstream patch fixing memory leak in lib/nss.c (#453612)
 - remove redundant dependency of libcurl-devel on libssh2-devel
@@ -156,7 +161,7 @@
 
 * Thu Mar 12 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-4
 - fix memory leak in src/main.c (accepted by upstream)
-- avoid using %ifarch
+- avoid using %%ifarch
 
 * Wed Mar 11 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-3
 - make libcurl-devel multilib-ready (bug #488922)



From kdudka at fedoraproject.org  Tue Apr 21 16:16:53 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 21 Apr 2009 16:16:53 +0000 (UTC)
Subject: rpms/curl/F-11 curl-7.19.4-flags.patch, NONE, 1.1 curl.spec, 1.93,
	1.94
Message-ID: <20090421161654.C39217013C@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17000

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-flags.patch 
Log Message:
Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.

curl-7.19.4-flags.patch:

--- NEW FILE curl-7.19.4-flags.patch ---
diff -urNp curl-7.19.4.orig/configure curl-7.19.4/configure
--- curl-7.19.4.orig/configure	2009-04-21 10:59:47.000000000 +0530
+++ curl-7.19.4/configure	2009-04-21 11:19:13.000000000 +0530
@@ -16,6 +16,9 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
+fedora_CPPFLAGS="$CPPFLAGS"
+fedora_CFLAGS="$CFLAGS"
+
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -46881,6 +46884,8 @@ fi
 
 
 
+CFLAGS="$CFLAGS $fedora_CFLAGS"
+CPPFLAGS="$CPPFLAGS $fedora_CPPFLAGS"
 
 squeeze CFLAGS
 squeeze CPPFLAGS


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/curl.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- curl.spec	14 Apr 2009 10:26:46 -0000	1.93
+++ curl.spec	21 Apr 2009 16:16:19 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 Patch4: curl-7.19.4-tool-leak.patch
 Patch5: curl-7.19.4-enable-aes.patch
 Patch6: curl-7.19.4-nss-leak.patch
+Patch7: curl-7.19.4-flags.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %patch4 -p1 -b .toolleak
 %patch5 -p1 -b .enableaes
 %patch6 -p1 -b .nssleak
+%patch7 -p1 -b .flags
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -146,6 +148,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> 7.19.4-7
+- Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.
+
 * Tue Apr 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-6
 - upstream patch fixing memory leak in lib/nss.c (#453612)
 - remove redundant dependency of libcurl-devel on libssh2-devel
@@ -156,7 +161,7 @@
 
 * Thu Mar 12 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-4
 - fix memory leak in src/main.c (accepted by upstream)
-- avoid using %ifarch
+- avoid using %%ifarch
 
 * Wed Mar 11 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-3
 - make libcurl-devel multilib-ready (bug #488922)



From crobinso at fedoraproject.org  Tue Apr 21 16:19:28 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 21 Apr 2009 16:19:28 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.400.3-selinux-warn.patch, NONE,
	1.1 python-virtinst.spec, 1.66, 1.67
Message-ID: <20090421161928.887507013C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18309

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-selinux-warn.patch 
Log Message:
Only warn if selinux labeling appears to be wrong (bz 496340)


virtinst-0.400.3-selinux-warn.patch:

--- NEW FILE virtinst-0.400.3-selinux-warn.patch ---
diff -rup virtinst-0.400.3/virtinst/VirtualDisk.py new/virtinst/VirtualDisk.py
--- virtinst-0.400.3/virtinst/VirtualDisk.py	2009-04-20 13:09:36.000000000 -0400
+++ new/virtinst/VirtualDisk.py	2009-04-20 13:59:00.000000000 -0400
@@ -678,8 +678,9 @@ class VirtualDisk(VirtualDevice):
                 return
 
             if self._is_remote():
-                raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
-                                    (self.path, label, wantLabel))
+                logging.warn(_("Install volume %s has incorrect SELinux "
+                               "label %s, expecting %s") %
+                               (self.path, label, wantLabel))
             else:
                 changeLabel = True
         elif self.path:
@@ -691,8 +692,9 @@ class VirtualDisk(VirtualDevice):
                     return
 
                 if self._is_remote():
-                    raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
-                                        (self.path, label, wantLabel))
+                    logging.warn(_("Install volume %s has incorrect SELinux "
+                                   "label %s, expecting %s") %
+                                   (self.path, label, wantLabel))
                 else:
                     if self.path[0:4] == "/dev":
                         logging.info("Not changing context on physical device")
@@ -707,8 +709,10 @@ class VirtualDisk(VirtualDevice):
                 selinux.setfilecon(self.path, wantLabel)
                 logging.info("Changed SELinux label to %s" % wantLabel)
             except Exception, e:
-                raise ValueError, _(("Unable to fix install volume SELinux labelling: %s\n" % str(e)) +
-                                    ("Please run 'chcon %s %s' manually and retry installation" % (wantLabel, self.path)))
+                logging.warn(_(("Unable to fix install volume SELinux "
+                                "labelling: %s\n") % str(e)+ "Please run "
+                                "'chcon %s %s' manually and retry "
+                                "installation" % (wantLabel, self.path)))
 
 
     def get_xml_config(self, disknode=None):


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- python-virtinst.spec	14 Apr 2009 21:06:59 -0000	1.66
+++ python-virtinst.spec	21 Apr 2009 16:19:26 -0000	1.67
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 6%{_extra_release}
+Release: 7%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -29,6 +29,8 @@
 Patch6: %{appname}-%{version}-fix-floppy-dev.patch
 # F11 Translations (bz 493944 and bz 494358)
 Patch7: %{appname}-%{version}-updated-trans.patch
+# Only throw warnings if we fail to relabel install media (bz 496340)
+Patch8: %{appname}-%{version}-selinux-warn.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +64,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 python setup.py build
@@ -97,6 +100,9 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Tue Apr 21 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-7.fc11
+- Only warn if selinux labeling appears to be wrong (bz 496340)
+
 * Tue Apr 14 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-6.fc11
 - More translation updates
 



From remi at fedoraproject.org  Tue Apr 21 16:20:23 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:20:23 +0000 (UTC)
Subject: rpms/glpi-data-injection/devel .cvsignore, 1.4,
	1.5 glpi-data-injection.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090421162024.39E61700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19197

Modified Files:
	.cvsignore glpi-data-injection.spec sources 
Log Message:
update to 1.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Mar 2009 14:30:13 -0000	1.4
+++ .cvsignore	21 Apr 2009 16:20:16 -0000	1.5
@@ -1 +1 @@
-glpi-data_injection-1.4.0.tar.gz
+glpi-data_injection-1.5.1.tar.gz


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/glpi-data-injection.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glpi-data-injection.spec	13 Mar 2009 14:30:13 -0000	1.4
+++ glpi-data-injection.spec	21 Apr 2009 16:20:17 -0000	1.5
@@ -1,7 +1,7 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.4.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn??es dans GLPI
@@ -41,7 +41,6 @@
 
 mv %{pluginname}/test test
 mv %{pluginname}/docs docs
-mv %{pluginname}/changelog.txt docs/
 
 # dos2unix to avoid rpmlint warnings
 for fic in docs/*; do
@@ -90,6 +89,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Mar 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.4.0-1
 - update to 1.4.0
 - spec cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Mar 2009 14:30:13 -0000	1.4
+++ sources	21 Apr 2009 16:20:17 -0000	1.5
@@ -1 +1 @@
-7d775dcc330574f3abf3fcebd0603a7d  glpi-data_injection-1.4.0.tar.gz
+6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz



From remi at fedoraproject.org  Tue Apr 21 16:26:02 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:26:02 +0000 (UTC)
Subject: rpms/ocsinventory/devel .cvsignore, 1.3, 1.4 ocsinventory.spec, 1.7,
	1.8 sources, 1.3, 1.4 ocsinventory-r1413.patch, 1.1,
	NONE ocsinventory-r1423.patch, 1.1,
	NONE ocsinventory-r1447.patch, 1.1,
	NONE ocsinventory-r1462.patch, 1.1, NONE
Message-ID: <20090421162603.0770E700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21022

Modified Files:
	.cvsignore ocsinventory.spec sources 
Removed Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
update to 1.02 finale release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Oct 2008 08:46:00 -0000	1.3
+++ .cvsignore	21 Apr 2009 16:25:59 -0000	1.4
@@ -1 +1 @@
-OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+OCSNG_UNIX_SERVER-1.02.tar.gz


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocsinventory.spec	26 Feb 2009 07:45:06 -0000	1.7
+++ ocsinventory.spec	21 Apr 2009 16:26:00 -0000	1.8
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.11.rc3%{?dist}
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,18 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0:      ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1:      ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2:      ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,7 +99,12 @@
 Summary:  OCS Inventory NG - Communication server
 # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
 Requires: php
-Requires: php-mysql php-zip php-xml php-gd 
+Requires: php-mysql php-zip php-gd 
+%if 0%{?rhel} == 4
+Requires:       php-domxml
+%else
+Requires:       php-xml
+%endif
 # Required by the original setup script, but not detected automatically :
 Requires: perl(DBD::mysql)
 # Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -133,11 +126,6 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
 
 %build
 cd Apache
@@ -283,8 +271,11 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-0.11.rc3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
 
 * Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
 - add r1447 and r1462 patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Oct 2008 08:46:01 -0000	1.3
+++ sources	21 Apr 2009 16:26:00 -0000	1.4
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d  OCSNG_UNIX_SERVER-1.02.tar.gz


--- ocsinventory-r1413.patch DELETED ---


--- ocsinventory-r1423.patch DELETED ---


--- ocsinventory-r1447.patch DELETED ---


--- ocsinventory-r1462.patch DELETED ---



From jreznik at fedoraproject.org  Tue Apr 21 16:26:45 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 16:26:45 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.2,
	1.3 leonidas-kde-theme.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090421162645.2BD65700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21170

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-2
- tarball respin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2009 18:07:32 -0000	1.2
+++ .cvsignore	21 Apr 2009 16:26:43 -0000	1.3
@@ -1 +1 @@
-leonidas-kde-theme-0.2.0.tar.bz2
+leonidas-kde-theme-0.2.2.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- leonidas-kde-theme.spec	21 Apr 2009 16:10:42 -0000	1.2
+++ leonidas-kde-theme.spec	21 Apr 2009 16:26:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		leonidas-kde-theme
 Version:	0.2.2
-Release:	1%{?dist}
+Release:	2{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-2
+- tarball respin
+
 * Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-1
 - wallpaper screenshot
 - fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2009 18:07:33 -0000	1.2
+++ sources	21 Apr 2009 16:26:43 -0000	1.3
@@ -1 +1 @@
-3fc4dbf343bb37d170bf852acb4dcec3  leonidas-kde-theme-0.2.0.tar.bz2
+2a3122105d76a66c1116bae5f84e662d  leonidas-kde-theme-0.2.2.tar.bz2



From remi at fedoraproject.org  Tue Apr 21 16:28:15 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:28:15 +0000 (UTC)
Subject: rpms/glpi-data-injection/F-11 glpi-data-injection.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090421162815.371DE700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21704

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.5.1


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-11/glpi-data-injection.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glpi-data-injection.spec	13 Mar 2009 14:30:13 -0000	1.4
+++ glpi-data-injection.spec	21 Apr 2009 16:27:44 -0000	1.5
@@ -1,7 +1,7 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.4.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn??es dans GLPI
@@ -41,7 +41,6 @@
 
 mv %{pluginname}/test test
 mv %{pluginname}/docs docs
-mv %{pluginname}/changelog.txt docs/
 
 # dos2unix to avoid rpmlint warnings
 for fic in docs/*; do
@@ -90,6 +89,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Mar 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.4.0-1
 - update to 1.4.0
 - spec cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Mar 2009 14:30:13 -0000	1.4
+++ sources	21 Apr 2009 16:27:44 -0000	1.5
@@ -1 +1 @@
-7d775dcc330574f3abf3fcebd0603a7d  glpi-data_injection-1.4.0.tar.gz
+6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 21 16:32:14 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 16:32:14 +0000 (UTC)
Subject: rpms/shed/devel shed-1.15-configure_cflags.patch, NONE,
	1.1 shed-1.15-makefile_in.patch, NONE, 1.1 import.log, 1.3,
	1.4 shed.spec, 1.5, 1.6
Message-ID: <20090421163214.295AB700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23169/devel

Modified Files:
	import.log shed.spec 
Added Files:
	shed-1.15-configure_cflags.patch shed-1.15-makefile_in.patch 
Log Message:
Fixed the debuginfo issue



shed-1.15-configure_cflags.patch:

--- NEW FILE shed-1.15-configure_cflags.patch ---
--- configure	2009-03-24 08:42:37.000000000 -0500
+++ configure.patched	2009-04-21 11:13:11.000000000 -0500
@@ -3367,7 +3367,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-CFLAGS="-Wall"
+CFLAGS="$CFLAGS -Wall"
 
 
 # Check whether --enable-debug was given.

shed-1.15-makefile_in.patch:

--- NEW FILE shed-1.15-makefile_in.patch ---
--- Makefile.in	2009-04-20 13:24:18.000000000 -0500
+++ Makefile.in.patched	2009-04-20 13:20:53.000000000 -0500
@@ -34,7 +34,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
+	ChangeLog INSTALL NEWS TODO depcomp missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -489,11 +489,6 @@
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -566,7 +561,7 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	13 Apr 2009 19:17:05 -0000	1.3
+++ import.log	21 Apr 2009 16:32:09 -0000	1.4
@@ -1,3 +1,4 @@
 shed-1_13-2:HEAD:shed-1.13-2.src.rpm:1225481433
 shed-1_14-1:HEAD:shed-1.14-1.src.rpm:1227821254
 shed-1_15-1:HEAD:shed-1.15-1.src.rpm:1239650206
+shed-1_15-3:HEAD:shed-1.15-3.src.rpm:1240331396


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/shed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shed.spec	13 Apr 2009 19:17:05 -0000	1.5
+++ shed.spec	21 Apr 2009 16:32:10 -0000	1.6
@@ -1,12 +1,15 @@
 Name:           shed
 Version:        1.15
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
 Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Patch0:         shed-1.15-makefile_in.patch
+Patch1:         shed-1.15-configure_cflags.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -18,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -40,6 +45,12 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
 * Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
 - New upstream release.
 
@@ -48,10 +59,13 @@
 
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-2
 - Fixed issues that were brought to my attention from package review
 - Typo in download, removed chmod, added changelog, incremented release
+
 * Fri Oct 24 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora



From remi at fedoraproject.org  Tue Apr 21 16:33:43 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:33:43 +0000 (UTC)
Subject: rpms/glpi-data-injection/F-10 glpi-data-injection.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090421163343.3BC64700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23743

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.5.1


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-10/glpi-data-injection.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpi-data-injection.spec	13 Mar 2009 14:36:11 -0000	1.3
+++ glpi-data-injection.spec	21 Apr 2009 16:33:41 -0000	1.4
@@ -1,7 +1,7 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.4.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn??es dans GLPI
@@ -41,7 +41,6 @@
 
 mv %{pluginname}/test test
 mv %{pluginname}/docs docs
-mv %{pluginname}/changelog.txt docs/
 
 # dos2unix to avoid rpmlint warnings
 for fic in docs/*; do
@@ -90,6 +89,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Mar 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.4.0-1
 - update to 1.4.0
 - spec cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Mar 2009 14:36:11 -0000	1.4
+++ sources	21 Apr 2009 16:33:41 -0000	1.5
@@ -1 +1 @@
-7d775dcc330574f3abf3fcebd0603a7d  glpi-data_injection-1.4.0.tar.gz
+6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz



From remi at fedoraproject.org  Tue Apr 21 16:34:49 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:34:49 +0000 (UTC)
Subject: rpms/ocsinventory/F-11 ocsinventory.spec, 1.7, 1.8 sources, 1.3,
	1.4 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch,
	1.1, NONE ocsinventory-r1447.patch, 1.1,
	NONE ocsinventory-r1462.patch, 1.1, NONE
Message-ID: <20090421163449.2BF88700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24050

Modified Files:
	ocsinventory.spec sources 
Removed Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
update to 1.02 finale release


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-11/ocsinventory.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocsinventory.spec	26 Feb 2009 07:45:06 -0000	1.7
+++ ocsinventory.spec	21 Apr 2009 16:34:47 -0000	1.8
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.11.rc3%{?dist}
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,18 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0:      ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1:      ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2:      ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,7 +99,12 @@
 Summary:  OCS Inventory NG - Communication server
 # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
 Requires: php
-Requires: php-mysql php-zip php-xml php-gd 
+Requires: php-mysql php-zip php-gd 
+%if 0%{?rhel} == 4
+Requires:       php-domxml
+%else
+Requires:       php-xml
+%endif
 # Required by the original setup script, but not detected automatically :
 Requires: perl(DBD::mysql)
 # Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -133,11 +126,6 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
 
 %build
 cd Apache
@@ -283,8 +271,11 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-0.11.rc3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
 
 * Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
 - add r1447 and r1462 patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Oct 2008 08:46:01 -0000	1.3
+++ sources	21 Apr 2009 16:34:47 -0000	1.4
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d  OCSNG_UNIX_SERVER-1.02.tar.gz


--- ocsinventory-r1413.patch DELETED ---


--- ocsinventory-r1423.patch DELETED ---


--- ocsinventory-r1447.patch DELETED ---


--- ocsinventory-r1462.patch DELETED ---



From jreznik at fedoraproject.org  Tue Apr 21 16:37:40 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 21 Apr 2009 16:37:40 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.3,1.4
Message-ID: <20090421163741.08B68700D6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24772

Modified Files:
	leonidas-kde-theme.spec 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-3
- fix dist tag



Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- leonidas-kde-theme.spec	21 Apr 2009 16:26:43 -0000	1.3
+++ leonidas-kde-theme.spec	21 Apr 2009 16:37:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		leonidas-kde-theme
 Version:	0.2.2
-Release:	2{?dist}
+Release:	3%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-3
+- fix dist tag
+
 * Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-2
 - tarball respin
 



From gemi at fedoraproject.org  Tue Apr 21 16:41:33 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Tue, 21 Apr 2009 16:41:33 +0000 (UTC)
Subject: rpms/erlang/devel erlang.spec,1.38,1.39 otp-rpath.patch,1.3,1.4
Message-ID: <20090421164133.DC568700D6@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25912

Modified Files:
	erlang.spec otp-rpath.patch 
Log Message:



Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- erlang.spec	1 Mar 2009 15:22:27 -0000	1.38
+++ erlang.spec	21 Apr 2009 16:41:30 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.6%{?dist}
+Release:        %{rel}.7%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -65,9 +65,9 @@
 
 %build
 %ifarch sparcv9 sparc64
-CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
 %else
-CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
 %endif
 chmod -R u+w .
 make
@@ -123,6 +123,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> R12B-5.7
+- Updated rpath patch.
+- Fixed configure to respect $RPM_OPT_FLAGS.
+
 * Sun Mar  1 2009 Gerard Milmeister <gemi at bluewin.ch> - R12B-5.6
 - new release R12B-5
 - link escript and dialyzer to %{_bindir}

otp-rpath.patch:

Index: otp-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/otp-rpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- otp-rpath.patch	25 Oct 2008 21:49:08 -0000	1.3
+++ otp-rpath.patch	21 Apr 2009 16:41:31 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in
---- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath	2008-10-25 22:20:42.000000000 +0200
-+++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in	2008-10-25 22:20:59.000000000 +0200
+diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in
+--- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in	2009-04-21 18:38:46.000000000 +0530
++++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in	2009-04-21 18:51:34.000000000 +0530
 @@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
  HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
  endif
@@ -10,9 +10,9 @@
  ifeq ($(strip $(LD_R_FLAG)),)
  LD_R_OPT =
  else
-diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile
---- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath	2008-10-25 22:21:11.000000000 +0200
-+++ otp_src_R12B-4/lib/crypto/priv/Makefile	2008-10-25 22:21:33.000000000 +0200
+diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile
+--- otp_src_R12B-5.orig/lib/crypto/priv/Makefile	2009-04-21 18:38:46.000000000 +0530
++++ otp_src_R12B-5/lib/crypto/priv/Makefile	2009-04-21 18:52:56.000000000 +0530
 @@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
  # ----------------------------------------------------
  
@@ -22,10 +22,19 @@
  	-o $@ $^ -lcrypto
  
  $(DLL_DRIVER): $(OBJS)
-diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath	2008-10-25 22:21:51.000000000 +0200
-+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in	2008-10-25 22:22:21.000000000 +0200
-@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in	2009-04-21 18:38:47.000000000 +0530
++++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in	2009-04-21 19:58:29.000000000 +0530
+@@ -104,7 +104,7 @@ else
+ SSL_MAKEFILE =
+ endif
+ 
+-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
++CC_R_FLAG=
+ ifeq ($(findstring @,$(CC_R_FLAG)),@)
+ # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
+ # we try our best here instead...
+@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
  CC_R_FLAG =
  else
  ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,



From remi at fedoraproject.org  Tue Apr 21 16:42:33 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:42:33 +0000 (UTC)
Subject: rpms/ocsinventory/F-10 ocsinventory.spec, 1.6, 1.7 sources, 1.3,
	1.4 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch,
	1.1, NONE ocsinventory-r1447.patch, 1.1,
	NONE ocsinventory-r1462.patch, 1.1, NONE
Message-ID: <20090421164233.1CDBD700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26180

Modified Files:
	ocsinventory.spec sources 
Removed Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
update to 1.02 finale release


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-10/ocsinventory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocsinventory.spec	11 Jan 2009 11:23:21 -0000	1.6
+++ ocsinventory.spec	21 Apr 2009 16:42:30 -0000	1.7
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.10.rc3%{?dist}
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,18 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0:      ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1:      ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2:      ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,7 +99,12 @@
 Summary:  OCS Inventory NG - Communication server
 # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
 Requires: php
-Requires: php-mysql php-zip php-xml php-gd 
+Requires: php-mysql php-zip php-gd 
+%if 0%{?rhel} == 4
+Requires:       php-domxml
+%else
+Requires:       php-xml
+%endif
 # Required by the original setup script, but not detected automatically :
 Requires: perl(DBD::mysql)
 # Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -133,11 +126,6 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
 
 %build
 cd Apache
@@ -283,6 +271,12 @@
 
 
 %changelog
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
+
 * Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
 - add r1447 and r1462 patch
 - change log selinux context (httpd_log_t)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Oct 2008 08:46:01 -0000	1.3
+++ sources	21 Apr 2009 16:42:30 -0000	1.4
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d  OCSNG_UNIX_SERVER-1.02.tar.gz


--- ocsinventory-r1413.patch DELETED ---


--- ocsinventory-r1423.patch DELETED ---


--- ocsinventory-r1447.patch DELETED ---


--- ocsinventory-r1462.patch DELETED ---



From remi at fedoraproject.org  Tue Apr 21 16:42:43 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:42:43 +0000 (UTC)
Subject: rpms/glpi-data-injection/F-9 glpi-data-injection.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090421164243.B057A700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26253

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.5.1


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-9/glpi-data-injection.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpi-data-injection.spec	13 Mar 2009 14:38:50 -0000	1.3
+++ glpi-data-injection.spec	21 Apr 2009 16:42:41 -0000	1.4
@@ -1,7 +1,7 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.4.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn??es dans GLPI
@@ -41,7 +41,6 @@
 
 mv %{pluginname}/test test
 mv %{pluginname}/docs docs
-mv %{pluginname}/changelog.txt docs/
 
 # dos2unix to avoid rpmlint warnings
 for fic in docs/*; do
@@ -90,6 +89,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Mar 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.4.0-1
 - update to 1.4.0
 - spec cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Mar 2009 14:38:50 -0000	1.4
+++ sources	21 Apr 2009 16:42:41 -0000	1.5
@@ -1 +1 @@
-7d775dcc330574f3abf3fcebd0603a7d  glpi-data_injection-1.4.0.tar.gz
+6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 21 16:46:19 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 16:46:19 +0000 (UTC)
Subject: rpms/shed/F-10 shed-1.15-configure_cflags.patch, NONE,
	1.1 shed-1.15-makefile_in.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 shed.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090421164619.DADCF700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27373/F-10

Modified Files:
	.cvsignore import.log shed.spec sources 
Added Files:
	shed-1.15-configure_cflags.patch shed-1.15-makefile_in.patch 
Log Message:
Fix for debuginfo issue



shed-1.15-configure_cflags.patch:

--- NEW FILE shed-1.15-configure_cflags.patch ---
--- configure	2009-03-24 08:42:37.000000000 -0500
+++ configure.patched	2009-04-21 11:13:11.000000000 -0500
@@ -3367,7 +3367,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-CFLAGS="-Wall"
+CFLAGS="$CFLAGS -Wall"
 
 
 # Check whether --enable-debug was given.

shed-1.15-makefile_in.patch:

--- NEW FILE shed-1.15-makefile_in.patch ---
--- Makefile.in	2009-04-20 13:24:18.000000000 -0500
+++ Makefile.in.patched	2009-04-20 13:20:53.000000000 -0500
@@ -34,7 +34,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
+	ChangeLog INSTALL NEWS TODO depcomp missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -489,11 +489,6 @@
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -566,7 +561,7 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shed/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2008 21:07:40 -0000	1.3
+++ .cvsignore	21 Apr 2009 16:46:16 -0000	1.4
@@ -1 +1 @@
-shed1.14.tar.gz
+shed-1.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Nov 2008 21:07:40 -0000	1.2
+++ import.log	21 Apr 2009 16:46:16 -0000	1.3
@@ -1,2 +1,3 @@
 shed-1_13-2:F-10:shed-1.13-2.src.rpm:1225481688
 shed-1_14-1:F-10:shed-1.14-1.src.rpm:1227820032
+shed-1_15-3:F-10:shed-1.15-3.src.rpm:1240332217


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/F-10/shed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shed.spec	27 Nov 2008 21:07:40 -0000	1.3
+++ shed.spec	21 Apr 2009 16:46:16 -0000	1.4
@@ -1,12 +1,15 @@
 Name:           shed
-Version:        1.14
-Release:        1%{?dist}
+Version:        1.15
+Release:        3%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/shed/%{name}%{version}.tar.gz
+Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Patch0:         shed-1.15-makefile_in.patch
+Patch1:         shed-1.15-configure_cflags.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -18,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -40,12 +45,27 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
+- New upstream release.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-2
 - Fixed issues that were brought to my attention from package review
 - Typo in download, removed chmod, added changelog, incremented release
+
 * Fri Oct 24 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shed/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2008 21:07:40 -0000	1.3
+++ sources	21 Apr 2009 16:46:16 -0000	1.4
@@ -1 +1 @@
-90c70fa667641dd04decaaec4b5ccaa3  shed1.14.tar.gz
+c7d7d464d6b4fa28a7980270d03e0906  shed-1.15.tar.gz



From remi at fedoraproject.org  Tue Apr 21 16:51:06 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:51:06 +0000 (UTC)
Subject: rpms/glpi-data-injection/EL-5 glpi-data-injection.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090421165107.11A877013C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345

Modified Files:
	glpi-data-injection.spec sources 
Log Message:
update to 1.5.1


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/EL-5/glpi-data-injection.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glpi-data-injection.spec	13 Mar 2009 14:44:42 -0000	1.4
+++ glpi-data-injection.spec	21 Apr 2009 16:51:00 -0000	1.5
@@ -1,7 +1,7 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.4.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn??es dans GLPI
@@ -41,7 +41,6 @@
 
 mv %{pluginname}/test test
 mv %{pluginname}/docs docs
-mv %{pluginname}/changelog.txt docs/
 
 # dos2unix to avoid rpmlint warnings
 for fic in docs/*; do
@@ -90,6 +89,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Mar 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.4.0-1
 - update to 1.4.0
 - spec cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Mar 2009 14:44:42 -0000	1.4
+++ sources	21 Apr 2009 16:51:01 -0000	1.5
@@ -1 +1 @@
-7d775dcc330574f3abf3fcebd0603a7d  glpi-data_injection-1.4.0.tar.gz
+6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz



From s4504kr at fedoraproject.org  Tue Apr 21 16:52:45 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 21 Apr 2009 16:52:45 +0000 (UTC)
Subject: rpms/itext/devel itext-2.1.5-pdftk.patch, NONE, 1.1 itext.spec, 1.17,
	1.18
Message-ID: <20090421165245.E234770137@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/itext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29341

Modified Files:
	itext.spec 
Added Files:
	itext-2.1.5-pdftk.patch 
Log Message:
Add Patch to allow reading pdfs from stdin

itext-2.1.5-pdftk.patch:

--- NEW FILE itext-2.1.5-pdftk.patch ---
diff -up itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java.pdftk itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
--- itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java.pdftk	2009-04-21 18:12:02.000000000 +0200
+++ itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java	2009-04-21 18:17:08.000000000 +0200
@@ -99,7 +99,11 @@ public class RandomAccessFileOrArray imp
                 }
             }
             else {
-                InputStream is = BaseFont.getResourceStream(filename);
+		InputStream is;
+		if( filename.equals("-"))
+		    is = System.in;
+		else
+		    is = BaseFont.getResourceStream(filename);
                 if (is == null)
                     throw new IOException(filename + " not found as file or resource.");
                 try {


Index: itext.spec
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/itext.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- itext.spec	10 Mar 2009 16:24:47 -0000	1.17
+++ itext.spec	21 Apr 2009 16:52:42 -0000	1.18
@@ -4,11 +4,12 @@
 Summary:        A Free Java-PDF library
 Name:           itext
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
 URL:            http://www.lowagie.com/iText/
 Group:          Development/Libraries
 Source0:        http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
+Patch1:		itext-2.1.5-pdftk.patch
 BuildRequires:  ant
 BuildRequires:  bouncycastle-mail
 BuildRequires:  dom4j
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q -c -T -a 0
+%patch1 -p1 -b .pdftk
 
 # Remove preshipped binaries
 find . -name "*.jar" -exec rm {} \;
@@ -141,6 +143,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.1.5-2
+- Patch to allow reading of pdf files from stdin for pdftk (BZ #495574)
+
 * Tue Mar 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.1.5-1
 - New upstream release
 



From remi at fedoraproject.org  Tue Apr 21 16:53:29 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 16:53:29 +0000 (UTC)
Subject: rpms/ocsinventory/F-9 ocsinventory.spec, 1.6, 1.7 sources, 1.2,
	1.3 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch,
	1.1, NONE ocsinventory-r1447.patch, 1.1,
	NONE ocsinventory-r1462.patch, 1.1, NONE
Message-ID: <20090421165329.7CF6770137@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29604

Modified Files:
	ocsinventory.spec sources 
Removed Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
update to 1.02 finale release


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-9/ocsinventory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocsinventory.spec	11 Jan 2009 11:31:10 -0000	1.6
+++ ocsinventory.spec	21 Apr 2009 16:53:23 -0000	1.7
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.10.rc3%{?dist}
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,18 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0:      ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1:      ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2:      ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,7 +99,12 @@
 Summary:  OCS Inventory NG - Communication server
 # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
 Requires: php
-Requires: php-mysql php-zip php-xml php-gd 
+Requires: php-mysql php-zip php-gd 
+%if 0%{?rhel} == 4
+Requires:       php-domxml
+%else
+Requires:       php-xml
+%endif
 # Required by the original setup script, but not detected automatically :
 Requires: perl(DBD::mysql)
 # Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -133,11 +126,6 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
 
 %build
 cd Apache
@@ -283,6 +271,12 @@
 
 
 %changelog
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
+
 * Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
 - add r1447 and r1462 patch
 - change log selinux context (httpd_log_t)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Oct 2008 08:56:26 -0000	1.2
+++ sources	21 Apr 2009 16:53:23 -0000	1.3
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d  OCSNG_UNIX_SERVER-1.02.tar.gz


--- ocsinventory-r1413.patch DELETED ---


--- ocsinventory-r1423.patch DELETED ---


--- ocsinventory-r1447.patch DELETED ---


--- ocsinventory-r1462.patch DELETED ---



From davej at fedoraproject.org  Tue Apr 21 16:53:37 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 21 Apr 2009 16:53:37 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc2-git7.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1053, 1.1054 kernel.spec, 1.1524, 1.1525 upstream, 1.926,
	1.927 patch-2.6.30-rc2-git3.bz2.sign, 1.1,
	NONE patch-2.6.30-rc2-git6.bz2.sign, 1.1, NONE
Message-ID: <20090421165337.DAF4470137@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29611

Modified Files:
	.cvsignore kernel.spec upstream 
Added Files:
	patch-2.6.30-rc2-git7.bz2.sign 
Removed Files:
	patch-2.6.30-rc2-git3.bz2.sign patch-2.6.30-rc2-git6.bz2.sign 
Log Message:
2.6.30-rc2-git7


--- NEW FILE patch-2.6.30-rc2-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ7Qz0yGugalF9Dw4RAt/lAKCUYGkNOBpd+bv+GeSlzB2K6JCjAACfWfKQ
Ggt4pl3cOoPGzaSnWzIsRfs=
=gbQa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -r1.1053 -r1.1054
--- .cvsignore	20 Apr 2009 17:43:26 -0000	1.1053
+++ .cvsignore	21 Apr 2009 16:53:34 -0000	1.1054
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git6.bz2
+patch-2.6.30-rc2-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1524
retrieving revision 1.1525
diff -u -r1.1524 -r1.1525
--- kernel.spec	20 Apr 2009 17:51:59 -0000	1.1524
+++ kernel.spec	21 Apr 2009 16:53:34 -0000	1.1525
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1817,6 +1817,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 21 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git7
+
 * Mon Apr 20 2009 Dave Jones <davej at redhat.com>
 - Various s390x config tweaks. (#496596, #496601, #496605, #496607)
 


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- upstream	20 Apr 2009 17:43:27 -0000	1.926
+++ upstream	21 Apr 2009 16:53:34 -0000	1.927
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git6.bz2
+patch-2.6.30-rc2-git7.bz2


--- patch-2.6.30-rc2-git3.bz2.sign DELETED ---


--- patch-2.6.30-rc2-git6.bz2.sign DELETED ---



From maxamillion at fedoraproject.org  Tue Apr 21 16:57:52 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 16:57:52 +0000 (UTC)
Subject: rpms/shed/F-9 shed-1.15-configure_cflags.patch, NONE,
	1.1 shed-1.15-makefile_in.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 shed.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090421165752.1414E700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31291/F-9

Modified Files:
	.cvsignore import.log shed.spec sources 
Added Files:
	shed-1.15-configure_cflags.patch shed-1.15-makefile_in.patch 
Log Message:
Fix for debuginfo issue



shed-1.15-configure_cflags.patch:

--- NEW FILE shed-1.15-configure_cflags.patch ---
--- configure	2009-03-24 08:42:37.000000000 -0500
+++ configure.patched	2009-04-21 11:13:11.000000000 -0500
@@ -3367,7 +3367,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-CFLAGS="-Wall"
+CFLAGS="$CFLAGS -Wall"
 
 
 # Check whether --enable-debug was given.

shed-1.15-makefile_in.patch:

--- NEW FILE shed-1.15-makefile_in.patch ---
--- Makefile.in	2009-04-20 13:24:18.000000000 -0500
+++ Makefile.in.patched	2009-04-20 13:20:53.000000000 -0500
@@ -34,7 +34,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
+	ChangeLog INSTALL NEWS TODO depcomp missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -489,11 +489,6 @@
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -566,7 +561,7 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shed/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2008 21:06:19 -0000	1.3
+++ .cvsignore	21 Apr 2009 16:57:50 -0000	1.4
@@ -1 +1 @@
-shed1.14.tar.gz
+shed-1.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Nov 2008 21:06:19 -0000	1.2
+++ import.log	21 Apr 2009 16:57:50 -0000	1.3
@@ -1,2 +1,3 @@
 shed-1_13-2:F-9:shed-1.13-2.src.rpm:1225481835
 shed-1_14-1:F-9:shed-1.14-1.src.rpm:1227819937
+shed-1_15-3:F-9:shed-1.15-3.src.rpm:1240332676


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/F-9/shed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shed.spec	27 Nov 2008 21:06:19 -0000	1.3
+++ shed.spec	21 Apr 2009 16:57:50 -0000	1.4
@@ -1,12 +1,15 @@
 Name:           shed
-Version:        1.14
-Release:        1%{?dist}
+Version:        1.15
+Release:        3%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/shed/%{name}%{version}.tar.gz
+Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Patch0:         shed-1.15-makefile_in.patch
+Patch1:         shed-1.15-configure_cflags.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -18,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -40,12 +45,27 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
+- New upstream release.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-2
 - Fixed issues that were brought to my attention from package review
 - Typo in download, removed chmod, added changelog, incremented release
+
 * Fri Oct 24 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shed/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2008 21:06:19 -0000	1.3
+++ sources	21 Apr 2009 16:57:50 -0000	1.4
@@ -1 +1 @@
-90c70fa667641dd04decaaec4b5ccaa3  shed1.14.tar.gz
+c7d7d464d6b4fa28a7980270d03e0906  shed-1.15.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 21 17:02:06 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 17:02:06 +0000 (UTC)
Subject: rpms/shed/EL-5 shed-1.15-configure_cflags.patch, NONE,
	1.1 shed-1.15-makefile_in.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 shed.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090421170206.BF04B700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32627/EL-5

Modified Files:
	.cvsignore import.log shed.spec sources 
Added Files:
	shed-1.15-configure_cflags.patch shed-1.15-makefile_in.patch 
Log Message:
Fix for debuginfo issue



shed-1.15-configure_cflags.patch:

--- NEW FILE shed-1.15-configure_cflags.patch ---
--- configure	2009-03-24 08:42:37.000000000 -0500
+++ configure.patched	2009-04-21 11:13:11.000000000 -0500
@@ -3367,7 +3367,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-CFLAGS="-Wall"
+CFLAGS="$CFLAGS -Wall"
 
 
 # Check whether --enable-debug was given.

shed-1.15-makefile_in.patch:

--- NEW FILE shed-1.15-makefile_in.patch ---
--- Makefile.in	2009-04-20 13:24:18.000000000 -0500
+++ Makefile.in.patched	2009-04-20 13:20:53.000000000 -0500
@@ -34,7 +34,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
+	ChangeLog INSTALL NEWS TODO depcomp missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -489,11 +489,6 @@
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -566,7 +561,7 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2008 21:04:34 -0000	1.3
+++ .cvsignore	21 Apr 2009 17:02:04 -0000	1.4
@@ -1 +1 @@
-shed1.14.tar.gz
+shed-1.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Nov 2008 21:04:34 -0000	1.2
+++ import.log	21 Apr 2009 17:02:05 -0000	1.3
@@ -1,2 +1,3 @@
 shed-1_13-2:EL-5:shed-1.13-2.src.rpm:1225481956
 shed-1_14-1:EL-5:shed-1.14-1.src.rpm:1227819829
+shed-1_15-3:EL-5:shed-1.15-3.src.rpm:1240333215


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-5/shed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shed.spec	27 Nov 2008 21:04:34 -0000	1.3
+++ shed.spec	21 Apr 2009 17:02:05 -0000	1.4
@@ -1,12 +1,15 @@
 Name:           shed
-Version:        1.14
-Release:        1%{?dist}
+Version:        1.15
+Release:        3%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/shed/%{name}%{version}.tar.gz
+Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Patch0:         shed-1.15-makefile_in.patch
+Patch1:         shed-1.15-configure_cflags.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -18,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -40,12 +45,27 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
+- New upstream release.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-2
 - Fixed issues that were brought to my attention from package review
 - Typo in download, removed chmod, added changelog, incremented release
+
 * Fri Oct 24 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2008 21:04:34 -0000	1.3
+++ sources	21 Apr 2009 17:02:05 -0000	1.4
@@ -1 +1 @@
-90c70fa667641dd04decaaec4b5ccaa3  shed1.14.tar.gz
+c7d7d464d6b4fa28a7980270d03e0906  shed-1.15.tar.gz



From remi at fedoraproject.org  Tue Apr 21 17:02:47 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 17:02:47 +0000 (UTC)
Subject: rpms/ocsinventory/EL-5 ocsinventory.spec, 1.1, 1.2 sources, 1.2,
	1.3 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch,
	1.1, NONE ocsinventory-r1447.patch, 1.1,
	NONE ocsinventory-r1462.patch, 1.1, NONE
Message-ID: <20090421170247.999DB700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv688

Modified Files:
	ocsinventory.spec sources 
Removed Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
update to 1.02 finale release


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-5/ocsinventory.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory.spec	11 Jan 2009 11:36:25 -0000	1.1
+++ ocsinventory.spec	21 Apr 2009 17:02:44 -0000	1.2
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.10.rc3%{?dist}
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,18 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0:      ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1:      ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2:      ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,7 +99,12 @@
 Summary:  OCS Inventory NG - Communication server
 # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
 Requires: php
-Requires: php-mysql php-zip php-xml php-gd 
+Requires: php-mysql php-zip php-gd 
+%if 0%{?rhel} == 4
+Requires:       php-domxml
+%else
+Requires:       php-xml
+%endif
 # Required by the original setup script, but not detected automatically :
 Requires: perl(DBD::mysql)
 # Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -133,11 +126,6 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
 
 %build
 cd Apache
@@ -283,6 +271,12 @@
 
 
 %changelog
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
+
 * Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
 - add r1447 and r1462 patch
 - change log selinux context (httpd_log_t)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Jan 2009 11:36:25 -0000	1.2
+++ sources	21 Apr 2009 17:02:44 -0000	1.3
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d  OCSNG_UNIX_SERVER-1.02.tar.gz


--- ocsinventory-r1413.patch DELETED ---


--- ocsinventory-r1423.patch DELETED ---


--- ocsinventory-r1447.patch DELETED ---


--- ocsinventory-r1462.patch DELETED ---



From remi at fedoraproject.org  Tue Apr 21 17:04:28 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 21 Apr 2009 17:04:28 +0000 (UTC)
Subject: rpms/ocsinventory/EL-4 ocsinventory.spec, 1.3, 1.4 sources, 1.3,
	1.4 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch,
	1.1, NONE ocsinventory-r1447.patch, 1.1,
	NONE ocsinventory-r1462.patch, 1.1, NONE
Message-ID: <20090421170428.A7CC5700D6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1352

Modified Files:
	ocsinventory.spec sources 
Removed Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
update to 1.02 finale release


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/ocsinventory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocsinventory.spec	18 Jan 2009 19:31:46 -0000	1.3
+++ ocsinventory.spec	21 Apr 2009 17:04:26 -0000	1.4
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.10.rc3%{?dist}.1
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,18 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0:      ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1:      ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2:      ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -138,11 +126,6 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
 
 %build
 cd Apache
@@ -288,6 +271,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
 * Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
 - fix php-xml > php-domxml in EL-4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jan 2009 11:41:02 -0000	1.3
+++ sources	21 Apr 2009 17:04:26 -0000	1.4
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d  OCSNG_UNIX_SERVER-1.02.tar.gz


--- ocsinventory-r1413.patch DELETED ---


--- ocsinventory-r1423.patch DELETED ---


--- ocsinventory-r1447.patch DELETED ---


--- ocsinventory-r1462.patch DELETED ---



From maxamillion at fedoraproject.org  Tue Apr 21 17:04:46 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 17:04:46 +0000 (UTC)
Subject: rpms/shed/EL-4 shed-1.15-configure_cflags.patch, NONE,
	1.1 shed-1.15-makefile_in.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 shed.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090421170447.114E0700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1416/EL-4

Modified Files:
	.cvsignore import.log shed.spec sources 
Added Files:
	shed-1.15-configure_cflags.patch shed-1.15-makefile_in.patch 
Log Message:
Fix for debuginfo issue



shed-1.15-configure_cflags.patch:

--- NEW FILE shed-1.15-configure_cflags.patch ---
--- configure	2009-03-24 08:42:37.000000000 -0500
+++ configure.patched	2009-04-21 11:13:11.000000000 -0500
@@ -3367,7 +3367,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-CFLAGS="-Wall"
+CFLAGS="$CFLAGS -Wall"
 
 
 # Check whether --enable-debug was given.

shed-1.15-makefile_in.patch:

--- NEW FILE shed-1.15-makefile_in.patch ---
--- Makefile.in	2009-04-20 13:24:18.000000000 -0500
+++ Makefile.in.patched	2009-04-20 13:20:53.000000000 -0500
@@ -34,7 +34,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
+	ChangeLog INSTALL NEWS TODO depcomp missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -489,11 +489,6 @@
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -566,7 +561,7 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2008 21:02:37 -0000	1.3
+++ .cvsignore	21 Apr 2009 17:04:43 -0000	1.4
@@ -1 +1 @@
-shed1.14.tar.gz
+shed-1.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Nov 2008 21:02:37 -0000	1.2
+++ import.log	21 Apr 2009 17:04:43 -0000	1.3
@@ -1,2 +1,3 @@
 shed-1_13-2:EL-4:shed-1.13-2.src.rpm:1225482072
 shed-1_14-1:EL-4:shed-1.14-1.src.rpm:1227819709
+shed-1_15-3:EL-4:shed-1.15-3.src.rpm:1240333389


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-4/shed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shed.spec	27 Nov 2008 21:02:37 -0000	1.3
+++ shed.spec	21 Apr 2009 17:04:43 -0000	1.4
@@ -1,12 +1,15 @@
 Name:           shed
-Version:        1.14
-Release:        1%{?dist}
+Version:        1.15
+Release:        3%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/shed/%{name}%{version}.tar.gz
+Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Patch0:         shed-1.15-makefile_in.patch
+Patch1:         shed-1.15-configure_cflags.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -18,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -40,12 +45,27 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
+* Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
+- New upstream release.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-2
 - Fixed issues that were brought to my attention from package review
 - Typo in download, removed chmod, added changelog, incremented release
+
 * Fri Oct 24 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shed/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2008 21:02:37 -0000	1.3
+++ sources	21 Apr 2009 17:04:43 -0000	1.4
@@ -1 +1 @@
-90c70fa667641dd04decaaec4b5ccaa3  shed1.14.tar.gz
+c7d7d464d6b4fa28a7980270d03e0906  shed-1.15.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 21 17:16:57 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 17:16:57 +0000 (UTC)
Subject: rpms/shed/F-11 shed-1.15-configure_cflags.patch, NONE,
	1.1 shed-1.15-makefile_in.patch, NONE, 1.1 import.log, 1.3,
	1.4 shed.spec, 1.5, 1.6
Message-ID: <20090421171657.8F0D4700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5331/F-11

Modified Files:
	import.log shed.spec 
Added Files:
	shed-1.15-configure_cflags.patch shed-1.15-makefile_in.patch 
Log Message:
Fix for debuginfo issue



shed-1.15-configure_cflags.patch:

--- NEW FILE shed-1.15-configure_cflags.patch ---
--- configure	2009-03-24 08:42:37.000000000 -0500
+++ configure.patched	2009-04-21 11:13:11.000000000 -0500
@@ -3367,7 +3367,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-CFLAGS="-Wall"
+CFLAGS="$CFLAGS -Wall"
 
 
 # Check whether --enable-debug was given.

shed-1.15-makefile_in.patch:

--- NEW FILE shed-1.15-makefile_in.patch ---
--- Makefile.in	2009-04-20 13:24:18.000000000 -0500
+++ Makefile.in.patched	2009-04-20 13:20:53.000000000 -0500
@@ -34,7 +34,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
+	ChangeLog INSTALL NEWS TODO depcomp missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -489,11 +489,6 @@
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -566,7 +561,7 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shed/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	13 Apr 2009 19:17:05 -0000	1.3
+++ import.log	21 Apr 2009 17:16:26 -0000	1.4
@@ -1,3 +1,4 @@
 shed-1_13-2:HEAD:shed-1.13-2.src.rpm:1225481433
 shed-1_14-1:HEAD:shed-1.14-1.src.rpm:1227821254
 shed-1_15-1:HEAD:shed-1.15-1.src.rpm:1239650206
+shed-1_15-3:F-11:shed-1.15-3.src.rpm:1240334125


Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/F-11/shed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shed.spec	13 Apr 2009 19:17:05 -0000	1.5
+++ shed.spec	21 Apr 2009 17:16:26 -0000	1.6
@@ -1,12 +1,15 @@
 Name:           shed
 Version:        1.15
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
 Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Patch0:         shed-1.15-makefile_in.patch
+Patch1:         shed-1.15-configure_cflags.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  ncurses-devel
@@ -18,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -40,6 +45,12 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
 * Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
 - New upstream release.
 
@@ -48,10 +59,13 @@
 
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-2
 - Fixed issues that were brought to my attention from package review
 - Typo in download, removed chmod, added changelog, incremented release
+
 * Fri Oct 24 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora



From crobinso at fedoraproject.org  Tue Apr 21 17:19:05 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 21 Apr 2009 17:19:05 +0000 (UTC)
Subject: rpms/python-virtinst/F-11 virtinst-0.400.3-selinux-warn.patch, NONE,
	1.1 python-virtinst.spec, 1.66, 1.67
Message-ID: <20090421171905.E7D30700D6@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6308

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-selinux-warn.patch 
Log Message:
Only warn if selinux labeling appears to be wrong (bz 496340)


virtinst-0.400.3-selinux-warn.patch:

--- NEW FILE virtinst-0.400.3-selinux-warn.patch ---
diff -rup virtinst-0.400.3/virtinst/VirtualDisk.py new/virtinst/VirtualDisk.py
--- virtinst-0.400.3/virtinst/VirtualDisk.py	2009-04-20 13:09:36.000000000 -0400
+++ new/virtinst/VirtualDisk.py	2009-04-20 13:59:00.000000000 -0400
@@ -678,8 +678,9 @@ class VirtualDisk(VirtualDevice):
                 return
 
             if self._is_remote():
-                raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
-                                    (self.path, label, wantLabel))
+                logging.warn(_("Install volume %s has incorrect SELinux "
+                               "label %s, expecting %s") %
+                               (self.path, label, wantLabel))
             else:
                 changeLabel = True
         elif self.path:
@@ -691,8 +692,9 @@ class VirtualDisk(VirtualDevice):
                     return
 
                 if self._is_remote():
-                    raise ValueError, _("Install volume %s has incorrect SELinux label %s, expecting %s" %
-                                        (self.path, label, wantLabel))
+                    logging.warn(_("Install volume %s has incorrect SELinux "
+                                   "label %s, expecting %s") %
+                                   (self.path, label, wantLabel))
                 else:
                     if self.path[0:4] == "/dev":
                         logging.info("Not changing context on physical device")
@@ -707,8 +709,10 @@ class VirtualDisk(VirtualDevice):
                 selinux.setfilecon(self.path, wantLabel)
                 logging.info("Changed SELinux label to %s" % wantLabel)
             except Exception, e:
-                raise ValueError, _(("Unable to fix install volume SELinux labelling: %s\n" % str(e)) +
-                                    ("Please run 'chcon %s %s' manually and retry installation" % (wantLabel, self.path)))
+                logging.warn(_(("Unable to fix install volume SELinux "
+                                "labelling: %s\n") % str(e)+ "Please run "
+                                "'chcon %s %s' manually and retry "
+                                "installation" % (wantLabel, self.path)))
 
 
     def get_xml_config(self, disknode=None):


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- python-virtinst.spec	14 Apr 2009 21:06:59 -0000	1.66
+++ python-virtinst.spec	21 Apr 2009 17:19:02 -0000	1.67
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 6%{_extra_release}
+Release: 7%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -29,6 +29,8 @@
 Patch6: %{appname}-%{version}-fix-floppy-dev.patch
 # F11 Translations (bz 493944 and bz 494358)
 Patch7: %{appname}-%{version}-updated-trans.patch
+# Only throw warnings if we fail to relabel install media (bz 496340)
+Patch8: %{appname}-%{version}-selinux-warn.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +64,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 python setup.py build
@@ -97,6 +100,9 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Tue Apr 21 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-7.fc11
+- Only warn if selinux labeling appears to be wrong (bz 496340)
+
 * Tue Apr 14 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-6.fc11
 - More translation updates
 



From s4504kr at fedoraproject.org  Tue Apr 21 17:20:29 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 21 Apr 2009 17:20:29 +0000 (UTC)
Subject: rpms/pdftk/devel pdftk.spec, 1.16, 1.17 pdftk-1.41-stdin.patch, 1.1,
	NONE
Message-ID: <20090421172029.7B2EC700D6@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6569

Modified Files:
	pdftk.spec 
Removed Files:
	pdftk-1.41-stdin.patch 
Log Message:
Remove stdin patch and add Req. to modified iText release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pdftk.spec	9 Apr 2009 18:52:02 -0000	1.16
+++ pdftk.spec	21 Apr 2009 17:19:58 -0000	1.17
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -11,7 +11,6 @@
 Patch0:         pdftk-use-internal-itext.patch
 Patch1:         pdftk-1.41-make.patch
 Patch2:         pdftk-1.41-gcc44.patch
-Patch3:		pdftk-1.41-stdin.patch
 # Solves ".afm files not found" error. RHBZ#494785:
 Patch4:		pdftk-classpath.patch
 Group:          Applications/Publishing
@@ -20,9 +19,10 @@
 BuildRequires:  libgcj-devel
 BuildRequires:  java-devel >= 1:1.6.0
 
-# Requires itext-2.1.4-3
 BuildRequires:  itext >= %{itextvers}
 
+Requires:	itext >= 2.1.5-2
+
 %description
 If PDF is electronic paper, then pdftk is an electronic staple-remover,
 hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple
@@ -47,7 +47,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .org
 %patch4 -p0 -b .classpath
 
 rm -rf java_libs
@@ -90,6 +89,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-16
+- Remove stdin patch, add Req. to modified iText release (BZ #495574)
+
 * Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
 - Patch ".afm files not found" issue (#494785)
 


--- pdftk-1.41-stdin.patch DELETED ---



From s4504kr at fedoraproject.org  Tue Apr 21 17:32:20 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 21 Apr 2009 17:32:20 +0000 (UTC)
Subject: rpms/pdftk/devel pdftk.spec,1.17,1.18
Message-ID: <20090421173220.B3F2F700D6@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12630

Modified Files:
	pdftk.spec 
Log Message:
bump release number


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pdftk.spec	21 Apr 2009 17:19:58 -0000	1.17
+++ pdftk.spec	21 Apr 2009 17:32:17 -0000	1.18
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -89,6 +89,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-17
+- Bump release number
+
 * Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-16
 - Remove stdin patch, add Req. to modified iText release (BZ #495574)
 



From ajax at fedoraproject.org  Tue Apr 21 17:35:11 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 21 Apr 2009 17:35:11 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-11 intel-2.7.0-lvds-default-modes.patch, 
	NONE, 1.1 xorg-x11-drv-intel.spec, 1.13, 1.14
Message-ID: <20090421173511.B88D1700D6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14309

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.7.0-lvds-default-modes.patch 
Log Message:
add a work-in-progress but don't enable it yet


intel-2.7.0-lvds-default-modes.patch:

--- NEW FILE intel-2.7.0-lvds-default-modes.patch ---
diff -up xf86-video-intel-2.7.0/src/drmmode_display.c.jx xf86-video-intel-2.7.0/src/drmmode_display.c
--- xf86-video-intel-2.7.0/src/drmmode_display.c.jx	2009-04-21 12:57:05.000000000 -0400
+++ xf86-video-intel-2.7.0/src/drmmode_display.c	2009-04-21 12:59:35.000000000 -0400
@@ -525,6 +525,41 @@ drmmode_output_get_modes(xf86OutputPtr o
 		Modes = xf86ModesAdd(Modes, Mode);
 
 	}
+
+	/*
+	 * LVDS can scale.  If there's no EDID, or if it claims not to be
+	 * continuous-freq, then add the default modes so we get 800x600
+	 * and friends.
+	 */
+	if (strstr(output->name, "LVDS")) {
+		xf86MonPtr mon = output->MonInfo;
+		if (!mon || !GTF_SUPPORTED(mon->features.msc)) {
+			DisplayModePtr m, i;
+			int max_x = 0, max_y = 0;
+			float max_vrefresh = 0.0;
+
+			for (m = Modes; m; m = m->next) {
+				max_x = max(max_x, m->HDisplay);
+				max_y = max(max_y, m->VDisplay);
+				max_vrefresh = max(max_vrefresh,
+						   xf86ModeVRefresh(m));
+			}
+
+			max_vrefresh *= (1 + SYNC_TOLERANCE);
+
+			m = xf86GetDefaultModes(FALSE, FALSE);
+
+			xf86ValidateModesSize(output->scrn, m, max_x, max_y, 0);
+			for (i = m; i; i = i->next)
+				if (xf86ModeVRefresh(i) > max_vrefresh)
+					i->status = MODE_VSYNC;
+
+			xf86PruneInvalidModes(output->scrn, &m, FALSE);
+
+			Modes = xf86ModesAdd(Modes, m);
+		}
+	}
+
 	return Modes;
 }
 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-intel.spec	17 Apr 2009 17:52:07 -0000	1.13
+++ xorg-x11-drv-intel.spec	21 Apr 2009 17:34:40 -0000	1.14
@@ -24,6 +24,7 @@
 
 # needs to be upstreamed
 Patch20: intel-2.6.99.902-kms-get-crtc.patch
+Patch21: intel-2.7.0-lvds-default-modes.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -61,6 +62,10 @@
 %patch2 -p1 -b .copy-fb
 %patch10 -p1 -b .kms-props
 %patch20 -p1 -b .get-crtc
+# notyet.  we don't handle switching in and out of tiled front buffer
+# correctly yet, so let's not have peopel stumble into it more than
+# they have to.
+#patch21 -p1 -b .jx
 
 %build
 



From orion at fedoraproject.org  Tue Apr 21 17:41:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 21 Apr 2009 17:41:06 +0000 (UTC)
Subject: rpms/fedora-ds-dsgw/devel fedora-ds-dsgw.spec,1.4,1.5
Message-ID: <20090421174106.C92F7700D6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/fedora-ds-dsgw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28164

Modified Files:
	fedora-ds-dsgw.spec 
Log Message:
* Tue Apr 21 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1.2-2
- Make adminutil-devel BR >= 1.1.8



Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-ds-dsgw/devel/fedora-ds-dsgw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-dsgw.spec	2 Apr 2009 14:38:25 -0000	1.4
+++ fedora-ds-dsgw.spec	21 Apr 2009 17:40:34 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:          Fedora Directory Server Gateway (dsgw)
 Name:             fedora-ds-dsgw
 Version:          1.1.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -16,7 +16,7 @@
 BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
-BuildRequires:    adminutil-devel
+BuildRequires:    adminutil-devel >= 1.1.8
 
 Requires:         /etc/dirsrv/admin-serv/httpd.conf
 # orgchart uses perldap
@@ -84,6 +84,9 @@
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Tue Apr 21 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1.2-2
+- Make adminutil-devel BR >= 1.1.8
+
 * Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.2-1
 - this is the 1.1.2 release
 



From jwrdegoede at fedoraproject.org  Tue Apr 21 17:48:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 21 Apr 2009 17:48:49 +0000 (UTC)
Subject: rpms/xfig/devel xfig.spec,1.60,1.61
Message-ID: <20090421174849.A2020700D6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4231

Modified Files:
	xfig.spec 
Log Message:
Add missing hicolor-icon-theme req for dir ownership


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xfig.spec	8 Apr 2009 14:46:54 -0000	1.60
+++ xfig.spec	21 Apr 2009 17:48:17 -0000	1.61
@@ -47,8 +47,6 @@
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# for xrdb for merging of the color resources
-Requires: xorg-x11-server-utils
 Requires: %{name}-common = %{version}-%{release}
 Provides: %{name}-executable = %{version}-%{release}
 # Xaw3d used to be the one in a subpackage, now the plain Xaw version is
@@ -84,6 +82,7 @@
 Summary:        Common xfig files
 Group:          Applications/Multimedia
 Requires:       transfig >= 1:3.2.5, xdg-utils, aspell, urw-fonts
+Requires:       hicolor-icon-theme
 Requires:       xorg-x11-fonts-base
 # So that this will get uninstalled together with xfig / xfig-Xaw3d
 Requires:       %{name}-executable = %{version}-%{release}



From mtasaka at fedoraproject.org  Tue Apr 21 17:49:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 21 Apr 2009 17:49:29 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.29, 1.30 kazehakase.spec, 1.81, 
	1.82 sources, 1.29,
	1.30 kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch, 1.1,
	NONE kazehakase-0.5.6-rev3769-crash-no_module_installed.patch, 1.1,
	NONE kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch,
	1.1, NONE kazehakase-rev3756-compile.patch, 1.1, NONE
Message-ID: <20090421174929.7A90E700D6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6716

Modified Files:
	.cvsignore kazehakase.spec sources 
Removed Files:
	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch 
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch 
	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch 
	kazehakase-rev3756-compile.patch 
Log Message:
* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-11.svn3771_trunk
- rev 3771
- Fix crash when downloading is cancalled
- Fix the issue that downloading won't work when file already exists.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	20 Apr 2009 15:41:51 -0000	1.29
+++ .cvsignore	21 Apr 2009 17:49:27 -0000	1.30
@@ -1 +1 @@
-kazehakase-0.5.6-svn3770_trunk.tar.gz
+kazehakase-0.5.6-svn3771_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kazehakase.spec	20 Apr 2009 15:41:51 -0000	1.81
+++ kazehakase.spec	21 Apr 2009 17:49:27 -0000	1.82
@@ -31,10 +31,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3770_trunk
+%define		svnver		3771_trunk
 
 
-%define		fedorarel	10
+%define		fedorarel	11
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -321,7 +321,12 @@
 %endif
 
 %changelog
-* Mon Apr 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-10.sv3770_trunk
+* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-11.svn3771_trunk
+- rev 3771
+- Fix crash when downloading is cancalled
+- Fix the issue that downloading won't work when file already exists.
+
+* Mon Apr 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-10.svn3770_trunk
 - rev 3770
 - spec file cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Apr 2009 15:41:51 -0000	1.29
+++ sources	21 Apr 2009 17:49:27 -0000	1.30
@@ -1 +1 @@
-38d478a06b659010852a9403333a0fa3  kazehakase-0.5.6-svn3770_trunk.tar.gz
+3360e94049f0ea43860c458b84746f01  kazehakase-0.5.6-svn3771_trunk.tar.gz


--- kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch DELETED ---


--- kazehakase-0.5.6-rev3769-crash-no_module_installed.patch DELETED ---


--- kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch DELETED ---


--- kazehakase-rev3756-compile.patch DELETED ---



From gemi at fedoraproject.org  Tue Apr 21 17:55:35 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Tue, 21 Apr 2009 17:55:35 +0000 (UTC)
Subject: rpms/erlang/F-11 erlang.spec,1.38,1.39 otp-rpath.patch,1.3,1.4
Message-ID: <20090421175535.512EE700D6@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/erlang/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17588/F-11

Modified Files:
	erlang.spec otp-rpath.patch 
Log Message:



Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/F-11/erlang.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- erlang.spec	1 Mar 2009 15:22:27 -0000	1.38
+++ erlang.spec	21 Apr 2009 17:55:03 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.6%{?dist}
+Release:        %{rel}.7%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -65,9 +65,9 @@
 
 %build
 %ifarch sparcv9 sparc64
-CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
 %else
-CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
 %endif
 chmod -R u+w .
 make
@@ -123,6 +123,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> R12B-5.7
+- Updated rpath patch.
+- Fixed configure to respect $RPM_OPT_FLAGS.
+
 * Sun Mar  1 2009 Gerard Milmeister <gemi at bluewin.ch> - R12B-5.6
 - new release R12B-5
 - link escript and dialyzer to %{_bindir}

otp-rpath.patch:

Index: otp-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/F-11/otp-rpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- otp-rpath.patch	25 Oct 2008 21:49:08 -0000	1.3
+++ otp-rpath.patch	21 Apr 2009 17:55:03 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in
---- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath	2008-10-25 22:20:42.000000000 +0200
-+++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in	2008-10-25 22:20:59.000000000 +0200
+diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in
+--- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in	2009-04-21 18:38:46.000000000 +0530
++++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in	2009-04-21 18:51:34.000000000 +0530
 @@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
  HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
  endif
@@ -10,9 +10,9 @@
  ifeq ($(strip $(LD_R_FLAG)),)
  LD_R_OPT =
  else
-diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile
---- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath	2008-10-25 22:21:11.000000000 +0200
-+++ otp_src_R12B-4/lib/crypto/priv/Makefile	2008-10-25 22:21:33.000000000 +0200
+diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile
+--- otp_src_R12B-5.orig/lib/crypto/priv/Makefile	2009-04-21 18:38:46.000000000 +0530
++++ otp_src_R12B-5/lib/crypto/priv/Makefile	2009-04-21 18:52:56.000000000 +0530
 @@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
  # ----------------------------------------------------
  
@@ -22,10 +22,19 @@
  	-o $@ $^ -lcrypto
  
  $(DLL_DRIVER): $(OBJS)
-diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath	2008-10-25 22:21:51.000000000 +0200
-+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in	2008-10-25 22:22:21.000000000 +0200
-@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in	2009-04-21 18:38:47.000000000 +0530
++++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in	2009-04-21 19:58:29.000000000 +0530
+@@ -104,7 +104,7 @@ else
+ SSL_MAKEFILE =
+ endif
+ 
+-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
++CC_R_FLAG=
+ ifeq ($(findstring @,$(CC_R_FLAG)),@)
+ # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
+ # we try our best here instead...
+@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
  CC_R_FLAG =
  else
  ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,



From mtasaka at fedoraproject.org  Tue Apr 21 17:56:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 21 Apr 2009 17:56:11 +0000 (UTC)
Subject: rpms/kazehakase/F-11 .cvsignore, 1.28, 1.29 kazehakase.spec, 1.80, 
	1.81 sources, 1.28,
	1.29 kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch, 1.1,
	NONE kazehakase-0.5.6-rev3769-crash-no_module_installed.patch, 1.1,
	NONE kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch,
	1.1, NONE kazehakase-rev3756-compile.patch, 1.1, NONE
Message-ID: <20090421175611.46F85700D6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20515

Modified Files:
	.cvsignore kazehakase.spec sources 
Removed Files:
	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch 
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch 
	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch 
	kazehakase-rev3756-compile.patch 
Log Message:
sync with F-12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	23 Mar 2009 07:21:24 -0000	1.28
+++ .cvsignore	21 Apr 2009 17:55:39 -0000	1.29
@@ -1 +1 @@
-kazehakase-0.5.6-svn3769_trunk.tar.gz
+kazehakase-0.5.6-svn3771_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kazehakase.spec	12 Apr 2009 09:28:03 -0000	1.80
+++ kazehakase.spec	21 Apr 2009 17:55:39 -0000	1.81
@@ -31,10 +31,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3769_trunk
+%define		svnver		3771_trunk
 
 
-%define		fedorarel	9
+%define		fedorarel	11
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -53,11 +53,6 @@
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
-# kazehakase crashed when only kazehakase-webkit is installed
-# (bug 444569)
-Patch12:	kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch
-# Also prevent crash even if no modules are installed
-Patch13:	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -185,8 +180,6 @@
 	-e '/SHAVE_INIT/s|\[enable\]|\[disable\]|' configure.ac
 
 %patch11 -p0 -b .rhbug
-%patch12 -p1 -b .onlywebkit
-%patch13 -p1 -b .nomodule
 %patch14 -p1 -b .evr
 
 %if %{need_autogen}
@@ -241,16 +234,10 @@
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
 %configure \
-	CC="%{__cc} `nspr-config --cflags`" \
-	CXX="%{__cxx} `nspr-config --cflags`" \
 	--enable-migemo \
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
 
-%{__sed} -i.bool -e \
-	's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \
-	config.h
-
 %{__make} -C libegg -k # not parallel make
 %{__make} %{?_smp_mflags} -k
 
@@ -332,6 +319,15 @@
 %endif
 
 %changelog
+* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-11.svn3771_trunk
+- rev 3771
+- Fix crash when downloading is cancalled
+- Fix the issue that downloading won't work when file already exists.
+
+* Mon Apr 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-10.svn3770_trunk
+- rev 3770
+- spec file cleanup
+
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-9.svn3769_trunk
 - Prevent crash even if no modules are installed (related to bug 444569)
 - Embed Vendor version information


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	23 Mar 2009 07:21:24 -0000	1.28
+++ sources	21 Apr 2009 17:55:39 -0000	1.29
@@ -1 +1 @@
-12e7f646d88cc69b1b1b2b439aa5b1dc  kazehakase-0.5.6-svn3769_trunk.tar.gz
+3360e94049f0ea43860c458b84746f01  kazehakase-0.5.6-svn3771_trunk.tar.gz


--- kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch DELETED ---


--- kazehakase-0.5.6-rev3769-crash-no_module_installed.patch DELETED ---


--- kazehakase-0.5.6-rev3769-crash-only_webkit_installed.patch DELETED ---


--- kazehakase-rev3756-compile.patch DELETED ---



From spot at fedoraproject.org  Tue Apr 21 18:03:47 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 21 Apr 2009 18:03:47 +0000 (UTC)
Subject: rpms/opal/devel opal-3.6.1-noilbc.patch, NONE, 1.1 opal.spec, 1.46, 
	1.47 sources, 1.18, 1.19
Message-ID: <20090421180347.C89F4700D6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4515/devel

Modified Files:
	opal.spec sources 
Added Files:
	opal-3.6.1-noilbc.patch 
Log Message:
drop ilbc for legal reasons

opal-3.6.1-noilbc.patch:

--- NEW FILE opal-3.6.1-noilbc.patch ---
diff -up opal-3.6.1/Makefile.in.BAD opal-3.6.1/Makefile.in
--- opal-3.6.1/Makefile.in.BAD	2009-04-21 13:47:04.000000000 -0400
+++ opal-3.6.1/Makefile.in	2009-04-21 13:47:08.000000000 -0400
@@ -361,7 +361,6 @@ SOURCES += $(OPAL_SRCDIR)/codec/g711code
            $(OPAL_SRCDIR)/codec/g729mf.cxx \
            $(OPAL_SRCDIR)/codec/gsm0610mf.cxx \
            $(OPAL_SRCDIR)/codec/gsmamrmf.cxx \
-           $(OPAL_SRCDIR)/codec/iLBCmf.cxx \
            $(OPAL_SRCDIR)/codec/t38mf.cxx \
            $(OPAL_SRCDIR)/codec/rfc2833.cxx \
            $(OPAL_SRCDIR)/codec/opalwavfile.cxx \


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- opal.spec	18 Mar 2009 06:22:47 -0000	1.46
+++ opal.spec	21 Apr 2009 18:03:43 -0000	1.47
@@ -1,9 +1,15 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+# We cannot use unmodified upstream source code because it contains the 
+# non-free iLBC codec.
+# rm -rf plugins/audio/iLBC/
+# rm -rf src/codec/iLBCmf.cxx
+# Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}-noilbc.tar.bz2
+Patch0:		opal-3.6.1-noilbc.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRequires:	ptlib-devel = 2.6.1
@@ -34,6 +40,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .noilbc
 
 %build
 %configure --prefix=/usr
@@ -68,6 +75,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.1-2
+- pull out ilbc codec due to legal issues
+
 * Wed Mar 18 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.1-1
 - New stable release for ekiga 3.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Mar 2009 06:22:48 -0000	1.18
+++ sources	21 Apr 2009 18:03:43 -0000	1.19
@@ -1 +1 @@
-c2b4f12822cef2182267ea0d020bddf6  opal-3.6.1.tar.bz2
+3c986b4f6156af482889f0b86e2c4f75  opal-3.6.1-noilbc.tar.bz2



From spot at fedoraproject.org  Tue Apr 21 18:04:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 21 Apr 2009 18:04:13 +0000 (UTC)
Subject: rpms/opal/F-11 opal-3.6.1-noilbc.patch, NONE, 1.1 .cvsignore, 1.17, 
	1.18 opal.spec, 1.46, 1.47 sources, 1.18, 1.19
Message-ID: <20090421180413.660E2700D6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/opal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4515/F-11

Modified Files:
	.cvsignore opal.spec sources 
Added Files:
	opal-3.6.1-noilbc.patch 
Log Message:
drop ilbc for legal reasons

opal-3.6.1-noilbc.patch:

--- NEW FILE opal-3.6.1-noilbc.patch ---
diff -up opal-3.6.1/Makefile.in.BAD opal-3.6.1/Makefile.in
--- opal-3.6.1/Makefile.in.BAD	2009-04-21 13:47:04.000000000 -0400
+++ opal-3.6.1/Makefile.in	2009-04-21 13:47:08.000000000 -0400
@@ -361,7 +361,6 @@ SOURCES += $(OPAL_SRCDIR)/codec/g711code
            $(OPAL_SRCDIR)/codec/g729mf.cxx \
            $(OPAL_SRCDIR)/codec/gsm0610mf.cxx \
            $(OPAL_SRCDIR)/codec/gsmamrmf.cxx \
-           $(OPAL_SRCDIR)/codec/iLBCmf.cxx \
            $(OPAL_SRCDIR)/codec/t38mf.cxx \
            $(OPAL_SRCDIR)/codec/rfc2833.cxx \
            $(OPAL_SRCDIR)/codec/opalwavfile.cxx \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	18 Mar 2009 06:22:47 -0000	1.17
+++ .cvsignore	21 Apr 2009 18:03:40 -0000	1.18
@@ -1 +1 @@
-opal-3.6.1.tar.bz2
+opal-3.6.1-noilbc.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/opal.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- opal.spec	18 Mar 2009 06:22:47 -0000	1.46
+++ opal.spec	21 Apr 2009 18:03:40 -0000	1.47
@@ -1,9 +1,15 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+# We cannot use unmodified upstream source code because it contains the 
+# non-free iLBC codec.
+# rm -rf plugins/audio/iLBC/
+# rm -rf src/codec/iLBCmf.cxx
+# Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}-noilbc.tar.bz2
+Patch0:		opal-3.6.1-noilbc.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRequires:	ptlib-devel = 2.6.1
@@ -34,6 +40,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .noilbc
 
 %build
 %configure --prefix=/usr
@@ -68,6 +75,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.1-2
+- pull out ilbc codec due to legal issues
+
 * Wed Mar 18 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.1-1
 - New stable release for ekiga 3.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Mar 2009 06:22:48 -0000	1.18
+++ sources	21 Apr 2009 18:03:40 -0000	1.19
@@ -1 +1 @@
-c2b4f12822cef2182267ea0d020bddf6  opal-3.6.1.tar.bz2
+3c986b4f6156af482889f0b86e2c4f75  opal-3.6.1-noilbc.tar.bz2



From mjakubicek at fedoraproject.org  Tue Apr 21 18:04:42 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 18:04:42 +0000 (UTC)
Subject: rpms/Sprog/F-11 Sprog.spec,1.10,1.11
Message-ID: <20090421180442.41DE1700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/Sprog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5544/F-11

Modified Files:
	Sprog.spec 
Log Message:
- Fix FTBFS: fixed failing test in %%check
- Consistent usage of tabs/spaces in specfile




Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/F-11/Sprog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Sprog.spec	23 Feb 2009 23:34:31 -0000	1.10
+++ Sprog.spec	21 Apr 2009 18:04:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -8,16 +8,16 @@
 URL:		http://sprog.sourceforge.net/
 Source0:	http://osdn.dl.sourceforge.net/sprog/Sprog-%{version}.tar.gz
 Source1:    gnome-run.png
-Patch0:     sprog-0.14-skip-tests-15-19.patch
+Patch0:		sprog-0.14-skip-tests-15-19.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:	perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML)
 BuildRequires:	perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager)
 BuildRequires:	perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes)
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 Requires:	    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(Pod::Simple::Methody) 
+Requires:		perl(Pod::Simple::Methody) 
 
 %description
 Sprog is a tool for working with data. It allows you to do all the things those
@@ -55,13 +55,14 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-        Sprog.desktop
+desktop-file-install --vendor fedora							\
+		--dir ${RPM_BUILD_ROOT}%{_datadir}/applications			\
+		--add-category X-Fedora									\
+		Sprog.desktop
 %{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gnome-run.png
 
 %check
+sed -i "s/exit 1;/exit 0;/" t/14_machine.t
 LANG=C make test
 
 %clean
@@ -78,6 +79,10 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-15
+- Fix FTBFS: fixed failing test in %%check
+- Consistent usage of tabs/spaces in specfile
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -91,7 +96,7 @@
 - Added perl(Imager)  
 
 * Sun Feb 26 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-10
-- Removed perl(Imager)  
+- Removed perl(Imager)
 
 * Sun Feb 26 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-9
 - Changes BuildRequires to perl(Imager) and perl(Time::HiRes). 



From mjakubicek at fedoraproject.org  Tue Apr 21 18:04:42 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 18:04:42 +0000 (UTC)
Subject: rpms/Sprog/devel Sprog.spec,1.10,1.11
Message-ID: <20090421180442.AFDB4700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/Sprog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5544/devel

Modified Files:
	Sprog.spec 
Log Message:
- Fix FTBFS: fixed failing test in %%check
- Consistent usage of tabs/spaces in specfile




Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/devel/Sprog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Sprog.spec	23 Feb 2009 23:34:31 -0000	1.10
+++ Sprog.spec	21 Apr 2009 18:04:12 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -8,16 +8,16 @@
 URL:		http://sprog.sourceforge.net/
 Source0:	http://osdn.dl.sourceforge.net/sprog/Sprog-%{version}.tar.gz
 Source1:    gnome-run.png
-Patch0:     sprog-0.14-skip-tests-15-19.patch
+Patch0:		sprog-0.14-skip-tests-15-19.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:	perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML)
 BuildRequires:	perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager)
 BuildRequires:	perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes)
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 Requires:	    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(Pod::Simple::Methody) 
+Requires:		perl(Pod::Simple::Methody) 
 
 %description
 Sprog is a tool for working with data. It allows you to do all the things those
@@ -55,13 +55,14 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-        Sprog.desktop
+desktop-file-install --vendor fedora							\
+		--dir ${RPM_BUILD_ROOT}%{_datadir}/applications			\
+		--add-category X-Fedora									\
+		Sprog.desktop
 %{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gnome-run.png
 
 %check
+sed -i "s/exit 1;/exit 0;/" t/14_machine.t
 LANG=C make test
 
 %clean
@@ -78,6 +79,10 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-15
+- Fix FTBFS: fixed failing test in %%check
+- Consistent usage of tabs/spaces in specfile
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -91,7 +96,7 @@
 - Added perl(Imager)  
 
 * Sun Feb 26 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-10
-- Removed perl(Imager)  
+- Removed perl(Imager)
 
 * Sun Feb 26 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-9
 - Changes BuildRequires to perl(Imager) and perl(Time::HiRes). 



From katzj at fedoraproject.org  Tue Apr 21 18:12:36 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 21 Apr 2009 18:12:36 +0000 (UTC)
Subject: rpms/livecd-tools/F-10 .cvsignore, 1.18, 1.19 livecd-tools.spec,
	1.19, 1.20 sources, 1.19, 1.20
Message-ID: <20090421181236.31BEF700D6@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/livecd-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8905

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
* Tue Apr 21 2009 Jeremy Katz <katzj at redhat.com> - 020.1-1
- Fix up --base-on (#471656)
- Fix macro name for excludedocs (bkearney)
- Fix device command (apevec)
- Fix unicode errors (Felix Schwarz)
- Support syslinux in /usr/share
- Use our syslinux's menu com32 modules in livecd-iso-to-disk (#492370)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Nov 2008 22:01:13 -0000	1.18
+++ .cvsignore	21 Apr 2009 18:12:04 -0000	1.19
@@ -1 +1 @@
-livecd-tools-020.tar.bz2
+livecd-tools-020.1.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-10/livecd-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- livecd-tools.spec	21 Jan 2009 21:25:58 -0000	1.19
+++ livecd-tools.spec	21 Apr 2009 18:12:04 -0000	1.20
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 021
+Version: 020.1
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -21,7 +21,6 @@
 Requires: dosfstools >= 2.11-8
 Requires: isomd5sum
 Requires: rhpl
-Requires: python-urlgrabber
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -65,20 +64,13 @@
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Mon Jan 19 2009 Jeremy Katz <katzj at redhat.com> - 021-1
-- Start of support for hybrid GPT/MBR usb sticks (Stewart Adam)
-- Fix for udev deprecated syntax (#480109)
-- Keep cache with --cache (Jan Kratochvil, #479716)
-- Use absolute path to cachedir (#479716)
-- Support UDF for large ISO spins (Bruno Wolf, #476696)
-- Improvements for encrypted /home setup (mdomsch, #475399)
-- Don't allow spaces in labels (#475834)
-- Fix --tmpdir relative path (dhuff)
-- Support ext4 rootfs
-- Fix device command version check (apevec)
-- Allow URLs for specifying the kickstart config (bkearney)
-- Fix macro name for excludedocs (bkearney)
+* Tue Apr 21 2009 Jeremy Katz <katzj at redhat.com> - 020.1-1
 - Fix up --base-on (#471656)
+- Fix macro name for excludedocs (bkearney)
+- Fix device command (apevec)
+- Fix unicode errors (Felix Schwarz)
+- Support syslinux in /usr/share
+- Use our syslinux's menu com32 modules in livecd-iso-to-disk (#492370)
 
 * Wed Nov 12 2008 Jeremy Katz <katzj at redhat.com> - 020-1
 - Support setting up a swap file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Jan 2009 21:25:58 -0000	1.19
+++ sources	21 Apr 2009 18:12:04 -0000	1.20
@@ -1 +1 @@
-92d8706282f51ab188c09d2bc4461532  livecd-tools-021.tar.bz2
+4ce1b9b2fb924fa46fd13133c0f30850  livecd-tools-020.1.tar.bz2



From dwalsh at fedoraproject.org  Tue Apr 21 18:19:34 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 21 Apr 2009 18:19:34 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.94,
	1.95 selinux-policy.spec, 1.830, 1.831
Message-ID: <20090421181934.E8562700D6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11525

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-10
- Allow nfs to share removable media


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- policy-20090105.patch	20 Apr 2009 12:32:21 -0000	1.94
+++ policy-20090105.patch	21 Apr 2009 18:19:33 -0000	1.95
@@ -164,6 +164,16 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/securetty_types serefpolicy-3.6.12/config/appconfig-mls/securetty_types
+--- nsaserefpolicy/config/appconfig-mls/securetty_types	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/securetty_types	2009-04-20 10:13:02.000000000 -0400
+@@ -1,6 +1 @@
+-auditadm_tty_device_t
+-secadm_tty_device_t
+-staff_tty_device_t
+-sysadm_tty_device_t
+-unconfined_tty_device_t
+ user_tty_device_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
@@ -772,7 +782,7 @@
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.12/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-21 14:06:47.000000000 -0400
 @@ -146,6 +146,24 @@
  
  ########################################
@@ -927,7 +937,32 @@
  ')
  
  ########################################
-@@ -283,3 +401,175 @@
+@@ -245,6 +363,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Delete the RPM package database.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_delete_db',`
++	gen_require(`
++		type rpm_var_lib_t;
++	')
++
++	delete_files_pattern($1, rpm_var_lib_t, rpm_var_lib_t)
++')
++
++########################################
++## <summary>
+ ##	Create, read, write, and delete the RPM package database.
+ ## </summary>
+ ## <param name="domain">
+@@ -283,3 +419,175 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1105,7 +1140,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.12/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-19 15:57:21.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-20 12:07:11.000000000 -0400
 @@ -9,6 +9,8 @@
  type rpm_t;
  type rpm_exec_t;
@@ -1115,7 +1150,7 @@
  domain_obj_id_change_exemption(rpm_t)
  domain_role_change_exemption(rpm_t)
  domain_system_change_exemption(rpm_t)
-@@ -31,6 +33,9 @@
+@@ -31,11 +33,15 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
  
@@ -1125,7 +1160,13 @@
  type rpm_script_t;
  type rpm_script_exec_t;
  domain_obj_id_change_exemption(rpm_script_t)
-@@ -52,8 +57,9 @@
+ domain_system_change_exemption(rpm_script_t)
+ corecmd_shell_entry_type(rpm_script_t)
++corecmd_bin_entry_type(rpm_script_t)
+ domain_type(rpm_script_t)
+ domain_entry_file(rpm_t, rpm_script_exec_t)
+ domain_interactive_fd(rpm_script_t)
+@@ -52,8 +58,9 @@
  # rpm Local policy
  #
  
@@ -1137,7 +1178,7 @@
  allow rpm_t self:process { getattr setexec setfscreate setrlimit };
  allow rpm_t self:fd use;
  allow rpm_t self:fifo_file rw_fifo_file_perms;
-@@ -68,6 +74,8 @@
+@@ -68,6 +75,8 @@
  allow rpm_t self:sem create_sem_perms;
  allow rpm_t self:msgq create_msgq_perms;
  allow rpm_t self:msg { send receive };
@@ -1146,7 +1187,7 @@
  
  allow rpm_t rpm_log_t:file manage_file_perms;
  logging_log_filetrans(rpm_t, rpm_log_t, file)
-@@ -87,8 +95,12 @@
+@@ -87,8 +96,12 @@
  manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
  
@@ -1159,7 +1200,7 @@
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -108,13 +120,16 @@
+@@ -108,13 +121,16 @@
  dev_list_sysfs(rpm_t)
  dev_list_usbfs(rpm_t)
  dev_read_urand(rpm_t)
@@ -1176,7 +1217,7 @@
  
  mls_file_read_all_levels(rpm_t)
  mls_file_write_all_levels(rpm_t)
-@@ -132,6 +147,8 @@
+@@ -132,6 +148,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -1185,7 +1226,7 @@
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -155,6 +172,7 @@
+@@ -155,6 +173,7 @@
  files_exec_etc_files(rpm_t)
  
  init_domtrans_script(rpm_t)
@@ -1193,7 +1234,7 @@
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,17 +192,28 @@
+@@ -174,17 +193,28 @@
  ')
  
  optional_policy(`
@@ -1223,7 +1264,7 @@
  ')
  
  ifdef(`TODO',`
-@@ -210,8 +239,8 @@
+@@ -210,8 +240,8 @@
  # rpm-script Local policy
  #
  
@@ -1234,7 +1275,7 @@
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -222,12 +251,15 @@
+@@ -222,12 +252,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -1250,7 +1291,7 @@
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +271,9 @@
+@@ -239,6 +272,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
@@ -1260,7 +1301,7 @@
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +290,7 @@
+@@ -255,6 +291,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -1268,7 +1309,7 @@
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +308,19 @@
+@@ -272,14 +309,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1288,7 +1329,7 @@
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,6 +332,7 @@
+@@ -291,6 +333,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1296,7 +1337,7 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -308,12 +350,15 @@
+@@ -308,12 +351,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1312,7 +1353,7 @@
  	')
  ')
  
-@@ -326,6 +371,10 @@
+@@ -326,13 +372,18 @@
  ')
  
  optional_policy(`
@@ -1323,9 +1364,10 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -333,6 +382,7 @@
+ 
  optional_policy(`
- 	unconfined_domain(rpm_script_t)
+-	unconfined_domain(rpm_script_t)
++	unconfined_domain_noaudit(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
 +	unconfined_execmem_domtrans(rpm_script_t)
  
@@ -5183,7 +5225,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-09 10:14:04.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-20 12:17:02.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5457,7 +5499,7 @@
  	')
  ')
  
-@@ -4921,3 +5077,95 @@
+@@ -4921,3 +5077,114 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -5553,6 +5595,25 @@
 +	manage_lnk_files_pattern($1, root_t, root_t)
 +	can_exec(kernel_t, root_t)
 +')
++
++########################################
++## <summary>
++##	Do not audit attempts to getattr
++##	all tmpfs files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`files_dontaudit_getattr_tmpfs_files',`
++	gen_require(`
++		attribute tmpfsfile;
++	')
++
++	allow $1 tmpfsfile:file getattr;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.6.12/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/files.te	2009-04-07 16:01:44.000000000 -0400
@@ -5587,7 +5648,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-03-04 16:49:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-14 14:14:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-20 12:16:40.000000000 -0400
 @@ -723,6 +723,24 @@
  
  ########################################
@@ -5676,7 +5737,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-13 08:28:24.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-21 13:21:45.000000000 -0400
 @@ -1197,6 +1197,26 @@
  	')
  
@@ -10627,7 +10688,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.12/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-09 05:33:16.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-21 09:44:30.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10763,7 +10824,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +256,43 @@
+@@ -227,21 +256,44 @@
  	')
  ')
  
@@ -10804,11 +10865,12 @@
  optional_policy(`
 -	hal_dbus_send(crond_t)
 +	hal_dbus_chat(crond_t)
++	hal_write_log(crond_t)
 +	hal_dbus_chat(system_cronjob_t)
  ')
  
  optional_policy(`
-@@ -268,8 +319,8 @@
+@@ -268,8 +320,8 @@
  # System cron process domain
  #
  
@@ -10819,7 +10881,7 @@
  allow system_cronjob_t self:fifo_file rw_fifo_file_perms;
  allow system_cronjob_t self:passwd rootok;
  
-@@ -283,7 +334,14 @@
+@@ -283,7 +335,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10834,7 +10896,7 @@
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
  # not directly executed, crond must ensure that
-@@ -303,6 +361,7 @@
+@@ -303,6 +362,7 @@
  allow system_cronjob_t crond_t:fd use;
  allow system_cronjob_t crond_t:fifo_file rw_file_perms;
  allow system_cronjob_t crond_t:process sigchld;
@@ -10842,7 +10904,7 @@
  
  # Write /var/lock/makewhatis.lock.
  allow system_cronjob_t system_cronjob_lock_t:file manage_file_perms;
-@@ -314,9 +373,13 @@
+@@ -314,9 +374,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10857,7 +10919,7 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -370,7 +433,8 @@
+@@ -370,7 +434,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10867,7 +10929,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +442,7 @@
+@@ -378,6 +443,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10875,7 +10937,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -418,6 +483,10 @@
+@@ -418,6 +484,10 @@
  ')
  
  optional_policy(`
@@ -10886,7 +10948,7 @@
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -428,11 +497,20 @@
+@@ -428,11 +498,20 @@
  ')
  
  optional_policy(`
@@ -10907,7 +10969,7 @@
  ')
  
  optional_policy(`
-@@ -447,6 +525,7 @@
+@@ -447,6 +526,7 @@
  	prelink_read_cache(system_cronjob_t)
  	prelink_manage_log(system_cronjob_t)
  	prelink_delete_cache(system_cronjob_t)
@@ -10915,7 +10977,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +539,7 @@
+@@ -460,8 +540,7 @@
  ')
  
  optional_policy(`
@@ -10925,7 +10987,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +547,17 @@
+@@ -469,24 +548,17 @@
  ')
  
  optional_policy(`
@@ -10953,7 +11015,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +641,9 @@
+@@ -570,6 +642,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -11623,7 +11685,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-13 10:31:12.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-21 13:57:58.000000000 -0400
 @@ -44,6 +44,7 @@
  
  		attribute session_bus_type;
@@ -12493,7 +12555,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.6.12/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2009-03-23 13:47:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/dnsmasq.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dnsmasq.te	2009-04-21 10:30:59.000000000 -0400
 @@ -42,8 +42,7 @@
  files_pid_filetrans(dnsmasq_t, dnsmasq_var_run_t, file)
  
@@ -19866,9 +19928,21 @@
  optional_policy(`
  	ccs_stream_connect(ricci_modstorage_t)
  	ccs_read_config(ricci_modstorage_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.6.12/policy/modules/services/rpcbind.te
+--- nsaserefpolicy/policy/modules/services/rpcbind.te	2009-01-19 11:06:49.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/rpcbind.te	2009-04-21 13:15:10.000000000 -0400
+@@ -40,6 +40,8 @@
+ manage_sock_files_pattern(rpcbind_t, rpcbind_var_lib_t, rpcbind_var_lib_t)
+ files_var_lib_filetrans(rpcbind_t, rpcbind_var_lib_t, { file dir sock_file })
+ 
++fs_list_inotifyfs(rpcbind_t)
++
+ kernel_read_system_state(rpcbind_t)
+ kernel_read_network_state(rpcbind_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-14 10:34:47.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-21 13:16:52.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -19878,7 +19952,13 @@
  
  rpc_domain_template(gssd)
  
-@@ -79,16 +79,25 @@
+@@ -74,21 +74,31 @@
+ 
+ files_manage_mounttab(rpcd_t)
+ 
++fs_list_inotifyfs(rpcd_t)
+ fs_list_rpc(rpcd_t)
+ fs_read_rpc_files(rpcd_t)
  fs_read_rpc_symlinks(rpcd_t)
  fs_rw_rpc_sockets(rpcd_t) 
  
@@ -19904,16 +19984,26 @@
  ########################################
  #
  # NFSD local policy
-@@ -116,7 +125,7 @@
+@@ -116,8 +126,9 @@
  # for exportfs and rpc.mountd
  files_getattr_tmp_dirs(nfsd_t) 
  # cjp: this should really have its own type
 -files_manage_mounttab(rpcd_t)
 +files_manage_mounttab(nfsd_t)
  
++fs_list_inotifyfs(nfsd_t)
  fs_mount_nfsd_fs(nfsd_t) 
  fs_search_nfsd_fs(nfsd_t) 
-@@ -141,6 +150,7 @@
+ fs_getattr_all_fs(nfsd_t) 
+@@ -125,6 +136,7 @@
+ fs_rw_nfsd_fs(nfsd_t) 
+ 
+ storage_dontaudit_read_fixed_disk(nfsd_t)
++storage_raw_read_removable_device(nfsd_t)
+ 
+ # Read access to public_content_t and public_content_rw_t
+ miscfiles_read_public_files(nfsd_t)
+@@ -141,6 +153,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
  ')
@@ -19921,7 +20011,15 @@
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -183,9 +193,12 @@
+@@ -175,6 +188,7 @@
+ 
+ corecmd_exec_bin(gssd_t)
+ 
++fs_list_inotifyfs(gssd_t)
+ fs_list_rpc(gssd_t) 
+ fs_rw_rpc_sockets(gssd_t) 
+ fs_read_rpc_files(gssd_t) 
+@@ -183,9 +197,12 @@
  files_read_usr_symlinks(gssd_t) 
  
  auth_use_nsswitch(gssd_t)
@@ -21886,7 +21984,7 @@
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-21 13:22:50.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -22006,7 +22104,15 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -229,7 +223,12 @@
+@@ -214,6 +208,7 @@
+ 	allow $1_t sshd_key_t:file read_file_perms;
+ 
+ 	kernel_read_kernel_sysctls($1_t)
++	kernel_read_network_state($1_t)
+ 
+ 	corenet_all_recvfrom_unlabeled($1_t)
+ 	corenet_all_recvfrom_netlabel($1_t)
+@@ -229,7 +224,12 @@
  	corenet_udp_bind_generic_node($1_t)
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
@@ -22019,7 +22125,7 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
-@@ -254,9 +253,14 @@
+@@ -254,9 +254,14 @@
  
  	userdom_dontaudit_relabelfrom_user_ptys($1_t)
  	userdom_search_user_home_dirs($1_t)
@@ -22034,7 +22140,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
-@@ -265,11 +269,7 @@
+@@ -265,11 +270,7 @@
  
  	optional_policy(`
  		kerberos_use($1_t)
@@ -22047,7 +22153,7 @@
  	')
  
  	optional_policy(`
-@@ -454,6 +454,24 @@
+@@ -454,6 +455,24 @@
  
  ########################################
  ## <summary>
@@ -22072,7 +22178,7 @@
  ##	Read a ssh server unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -611,3 +629,42 @@
+@@ -611,3 +630,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -25584,7 +25690,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-19 15:52:00.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-21 14:07:27.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25688,7 +25794,7 @@
  can_exec(initrc_t,initrc_tmp_t)
 -allow initrc_t initrc_tmp_t:file manage_file_perms;
 -allow initrc_t initrc_tmp_t:dir manage_dir_perms;
-+allow initrc_t initrc_tmp_t:file relabelfrom;
++allow initrc_t initrc_tmp_t:file relabel_file_perms;
 +manage_chr_files_pattern(initrc_t, initrc_tmp_t, initrc_tmp_t)
 +manage_blk_files_pattern(initrc_t, initrc_tmp_t, initrc_tmp_t)
 +manage_blk_files_pattern(initrc_t, initrc_tmp_t, initrc_tmp_t)
@@ -25752,12 +25858,13 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -343,14 +384,13 @@
+@@ -343,14 +384,14 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
 -files_delete_all_locks(initrc_t)
 +files_manage_all_locks(initrc_t)
++files_manage_boot_files(initrc_t)
  files_read_all_pids(initrc_t)
  files_delete_all_pids(initrc_t)
  files_delete_all_pid_dirs(initrc_t)
@@ -25768,7 +25875,7 @@
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -366,7 +406,9 @@
+@@ -366,7 +407,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -25778,7 +25885,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -451,7 +493,7 @@
+@@ -451,7 +494,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -25787,7 +25894,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -465,6 +507,7 @@
+@@ -465,6 +508,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -25795,7 +25902,7 @@
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -498,6 +541,7 @@
+@@ -498,6 +542,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -25803,7 +25910,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +560,33 @@
+@@ -516,6 +561,33 @@
  	')
  ')
  
@@ -25837,7 +25944,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +641,10 @@
+@@ -570,6 +642,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -25848,7 +25955,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +666,10 @@
+@@ -591,6 +667,10 @@
  ')
  
  optional_policy(`
@@ -25859,7 +25966,7 @@
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,6 +726,11 @@
+@@ -647,6 +727,11 @@
  ')
  
  optional_policy(`
@@ -25871,7 +25978,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +739,6 @@
+@@ -655,12 +740,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25884,7 +25991,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -719,8 +797,6 @@
+@@ -719,8 +798,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -25893,7 +26000,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +809,12 @@
+@@ -733,10 +810,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25906,7 +26013,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +832,11 @@
+@@ -754,6 +833,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25918,29 +26025,21 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -765,6 +848,21 @@
+@@ -765,6 +849,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
 +
-+	# why is this needed:
-+	rpm_manage_db(initrc_t)
 +	# Allow SELinux aware applications to request rpm_script_t execution
 +	rpm_transition_script(initrc_t)
 +')
 +
 +optional_policy(`
-+	# sudo service restart causes this 
-+	unconfined_signull(daemon)
-+')
-+
-+
-+optional_policy(`
-+	rpm_dontaudit_rw_pipes(daemon)
++	rpm_delete_db(initrc_t)
  ')
  
  optional_policy(`
-@@ -790,3 +888,25 @@
+@@ -790,3 +881,35 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25952,6 +26051,16 @@
 +logging_append_all_logs(daemon)
 +
 +optional_policy(`
++	# sudo service restart causes this 
++	unconfined_signull(daemon)
++')
++
++
++optional_policy(`
++	rpm_dontaudit_rw_pipes(daemon)
++')
++
++optional_policy(`
 +	xserver_rw_xdm_home_files(daemon)
 +	tunable_policy(`use_nfs_home_dirs',`
 +		fs_dontaudit_rw_nfs_files(daemon)
@@ -26103,7 +26212,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.12/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/iscsi.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/iscsi.te	2009-04-21 13:55:23.000000000 -0400
 @@ -55,6 +55,7 @@
  files_pid_filetrans(iscsid_t,iscsi_var_run_t,file)
  
@@ -26504,7 +26613,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.12/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/logging.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/logging.te	2009-04-21 14:01:28.000000000 -0400
 @@ -126,7 +126,7 @@
  allow auditd_t self:process { signal_perms setpgid setsched };
  allow auditd_t self:file rw_file_perms;
@@ -26615,7 +26724,7 @@
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.12/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/lvm.te	2009-04-09 10:07:34.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/lvm.te	2009-04-21 14:01:57.000000000 -0400
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t,clvmd_exec_t)
@@ -26672,8 +26781,11 @@
  
  files_read_etc_files(clvmd_t)
  files_list_usr(clvmd_t)
-@@ -99,9 +109,12 @@
+@@ -97,11 +107,15 @@
+ fs_search_auto_mountpoints(clvmd_t)
+ fs_dontaudit_list_tmpfs(clvmd_t)
  fs_dontaudit_read_removable_files(clvmd_t)
++fs_rw_anon_inodefs_files(clvmd_t)
  
  storage_dontaudit_getattr_removable_dev(clvmd_t)
 +storage_dev_filetrans_fixed_disk(clvmd_t)
@@ -26685,7 +26797,7 @@
  storage_raw_read_fixed_disk(clvmd_t)
  
  auth_use_nsswitch(clvmd_t)
-@@ -112,6 +125,9 @@
+@@ -112,6 +126,9 @@
  
  seutil_dontaudit_search_config(clvmd_t)
  seutil_sigchld_newrole(clvmd_t)
@@ -26695,7 +26807,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(clvmd_t)
  userdom_dontaudit_search_user_home_dirs(clvmd_t)
-@@ -124,6 +140,14 @@
+@@ -124,6 +141,14 @@
  ')
  
  optional_policy(`
@@ -26710,7 +26822,7 @@
  	gpm_dontaudit_getattr_gpmctl(clvmd_t)
  ')
  
-@@ -133,6 +157,14 @@
+@@ -133,6 +158,14 @@
  ')
  
  optional_policy(`
@@ -26725,7 +26837,7 @@
  	udev_read_db(clvmd_t)
  ')
  
-@@ -143,17 +175,19 @@
+@@ -143,17 +176,19 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
@@ -26748,7 +26860,7 @@
  
  manage_dirs_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t)
  manage_files_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t)
-@@ -185,6 +219,7 @@
+@@ -185,6 +220,7 @@
  manage_files_pattern(lvm_t,lvm_metadata_t,lvm_metadata_t)
  filetrans_pattern(lvm_t,lvm_etc_t,lvm_metadata_t,file)
  files_etc_filetrans(lvm_t,lvm_metadata_t,file)
@@ -26756,7 +26868,7 @@
  
  kernel_read_system_state(lvm_t)
  kernel_read_kernel_sysctls(lvm_t)
-@@ -192,6 +227,8 @@
+@@ -192,6 +228,8 @@
  kernel_read_kernel_sysctls(lvm_t)
  # it has no reason to need this
  kernel_dontaudit_getattr_core_if(lvm_t)
@@ -26765,7 +26877,7 @@
  
  selinux_get_fs_mount(lvm_t)
  selinux_validate_context(lvm_t)
-@@ -221,6 +258,7 @@
+@@ -221,6 +259,7 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -26773,7 +26885,15 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -239,12 +277,18 @@
+@@ -228,6 +267,7 @@
+ fs_read_tmpfs_symlinks(lvm_t)
+ fs_dontaudit_read_removable_files(lvm_t)
+ fs_dontaudit_getattr_tmpfs_files(lvm_t)
++fs_rw_anon_inodefs_files(lvm_t)
+ 
+ storage_relabel_fixed_disk(lvm_t)
+ storage_dontaudit_read_removable_device(lvm_t)
+@@ -239,20 +279,28 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
@@ -26792,7 +26912,9 @@
  files_read_etc_files(lvm_t)
  files_read_etc_runtime_files(lvm_t)
  # for when /usr is not mounted:
-@@ -253,6 +297,7 @@
+ files_dontaudit_search_isid_type_dirs(lvm_t)
++files_dontaudit_getattr_tmpfs_files(lvm_t)
+ 
  init_use_fds(lvm_t)
  init_dontaudit_getattr_initctl(lvm_t)
  init_use_script_ptys(lvm_t)
@@ -26800,7 +26922,7 @@
  
  logging_send_syslog_msg(lvm_t)
  
-@@ -283,5 +328,22 @@
+@@ -283,5 +331,22 @@
  ')
  
  optional_policy(`
@@ -28433,8 +28555,24 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-04-07 15:53:36.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-09 05:27:54.000000000 -0400
-@@ -210,6 +210,11 @@
++++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-21 13:55:54.000000000 -0400
+@@ -50,6 +50,7 @@
+ allow udev_t self:unix_stream_socket connectto;
+ allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
+ allow udev_t self:rawip_socket create_socket_perms;
++allow udev_t self:netlink_socket create_netlink_socket_perms;
+ 
+ allow udev_t udev_exec_t:file write;
+ can_exec(udev_t, udev_exec_t)
+@@ -140,6 +141,7 @@
+ logging_send_audit_msgs(udev_t)
+ 
+ miscfiles_read_localization(udev_t)
++miscfiles_read_hwdata(udev_t)
+ 
+ modutils_domtrans_insmod(udev_t)
+ # read modules.inputmap:
+@@ -210,6 +212,11 @@
  ')
  
  optional_policy(`
@@ -28446,7 +28584,7 @@
  	lvm_domtrans(udev_t)
  ')
  
-@@ -219,6 +224,7 @@
+@@ -219,6 +226,7 @@
  
  optional_policy(`
  	hal_dgram_send(udev_t)
@@ -28454,7 +28592,7 @@
  ')
  
  optional_policy(`
-@@ -242,6 +248,10 @@
+@@ -242,6 +250,10 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- selinux-policy.spec	20 Apr 2009 12:32:21 -0000	1.830
+++ selinux-policy.spec	21 Apr 2009 18:19:34 -0000	1.831
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-10
+- Allow nfs to share removable media
+
 * Mon Apr 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-9
 - Add ability to run postdrop from confined users
 



From tgl at fedoraproject.org  Tue Apr 21 18:20:40 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 21 Apr 2009 18:20:40 +0000 (UTC)
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.16,1.17
Message-ID: <20090421182040.58F21700D6@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-jdbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11817

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Avoid multilib conflict caused by overeager attempt to rebuild translations


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- postgresql-jdbc.spec	27 Feb 2009 01:46:35 -0000	1.16
+++ postgresql-jdbc.spec	21 Apr 2009 18:20:39 -0000	1.17
@@ -38,7 +38,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	8.3.603
-Release:	2.1%{?dist}
+Release:	3%{?dist}
 Epoch:		0
 License:	BSD
 Group:		Applications/Databases
@@ -54,7 +54,9 @@
 BuildRequires:  ant >= 0:1.6.2
 BuildRequires:  ant-junit >= 0:1.6.2
 BuildRequires:  junit >= 0:3.7
-BuildRequires:	findutils gettext
+BuildRequires:	findutils
+# gettext is only needed if we try to update translations
+#BuildRequires:	gettext
 %if %{gcj_support}
 BuildRequires:	gcc-java
 Requires(post): /usr/bin/rebuild-gcj-db
@@ -83,7 +85,13 @@
 %build
 export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=
-sh update-translations.sh
+
+# Ideally we would run "sh update-translations.sh" here, but that results
+# in inserting the build timestamp into the generated messages_*.class
+# files, which makes rpmdiff complain about multilib conflicts if the
+# different platforms don't build in the same minute.  For now, rely on
+# upstream to have updated the translations files before packaging.
+
 ant
 
 %install
@@ -131,6 +139,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Tom Lane <tgl at redhat.com> 8.3.603-3
+- Avoid multilib conflict caused by overeager attempt to rebuild translations
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:8.3.603-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 21 18:21:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 18:21:30 +0000 (UTC)
Subject: rpms/libxcb/F-10 libxcb-1.1.91-xidgen.patch, NONE, 1.1 libxcb.spec, 
	1.12, 1.13
Message-ID: <20090421182130.E7F49700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/libxcb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11945

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.1.91-xidgen.patch 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> 1.1.91-6
- Add upstream fix for XID generation


libxcb-1.1.91-xidgen.patch:

--- NEW FILE libxcb-1.1.91-xidgen.patch ---
>From beccb0be15f5699c942a0af33307d9e4bf797e2a Mon Sep 17 00:00:00 2001
From: Bart Massey <bart at cs.pdx.edu>
Date: Tue, 24 Mar 2009 23:24:04 +0000
Subject: kludgily hand-merged xid fixes

Signed-off-by: Bart Massey <bart at cs.pdx.edu>
Signed-off-by: Julien Danjou <julien at danjou.info>
---
diff --git a/src/xcb_xid.c b/src/xcb_xid.c
index 7ff0c5f..3df5dbe 100644
--- a/src/xcb_xid.c
+++ b/src/xcb_xid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2004 Bart Massey and Jamey Sharp.
+/* Copyright (C) 2001-2008 Bart Massey and Jamey Sharp.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,6 +25,7 @@
 
 /* XID allocators. */
 
+#include <assert.h>
 #include <stdlib.h>
 #include "xcb.h"
 #include "xcbext.h"
@@ -39,21 +40,40 @@ uint32_t xcb_generate_id(xcb_connection_t *c)
     if(c->has_error)
         return -1;
     pthread_mutex_lock(&c->xid.lock);
-    if(c->xid.last == c->xid.max)
+    if(c->xid.last >= c->xid.max - c->xid.inc + 1)
     {
         xcb_xc_misc_get_xid_range_reply_t *range;
-        range = xcb_xc_misc_get_xid_range_reply(c, xcb_xc_misc_get_xid_range(c), 0);
-        if(!range)
-        {
-            pthread_mutex_unlock(&c->xid.lock);
-            return -1;
+        assert(c->xid.last == c->xid.max);
+        if (c->xid.last == 0) {
+            /* finish setting up initial range */
+            c->xid.max = c->setup->resource_id_mask;
+        } else {
+            /* check for extension */
+            const xcb_query_extension_reply_t *xc_misc_reply =
+              xcb_get_extension_data(c, &xcb_xc_misc_id);
+            if (!xc_misc_reply) {
+                pthread_mutex_unlock(&c->xid.lock);
+                return -1;
+            }
+            /* get new range */
+            range = xcb_xc_misc_get_xid_range_reply(c,
+                      xcb_xc_misc_get_xid_range(c), 0);
+            /* XXX The latter disjunct is what the server returns
+               when it is out of XIDs.  Sweet. */
+            if(!range || (range->start_id == 0 && range->count == 1))
+            {
+                pthread_mutex_unlock(&c->xid.lock);
+                return -1;
+            }
+            assert(range->count > 0 && range->start_id > 0);
+            c->xid.last = range->start_id;
+            c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
+            free(range);
         }
-        c->xid.last = range->start_id;
-        c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
-        free(range);
+    } else {
+        c->xid.last += c->xid.inc;
     }
     ret = c->xid.last | c->xid.base;
-    c->xid.last += c->xid.inc;
     pthread_mutex_unlock(&c->xid.lock);
     return ret;
 }
@@ -65,8 +85,8 @@ int _xcb_xid_init(xcb_connection_t *c)
     if(pthread_mutex_init(&c->xid.lock, 0))
         return 0;
     c->xid.last = 0;
+    c->xid.max = 0;
     c->xid.base = c->setup->resource_id_base;
-    c->xid.max = c->setup->resource_id_mask;
     c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);
     return 1;
 }
--
cgit v0.8.2



Index: libxcb.spec
===================================================================
RCS file: /cvs/extras/rpms/libxcb/F-10/libxcb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxcb.spec	19 Oct 2008 23:10:39 -0000	1.12
+++ libxcb.spec	21 Apr 2009 18:21:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.1.91
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -17,6 +17,7 @@
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
 Patch2:		libxcb-1.1-sloppy-lock.patch
 Patch3:		libxcb-1.1.91-git.patch
+Patch4:         libxcb-1.1.91-xidgen.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -55,6 +56,7 @@
 %patch0 -p1 -b .pthread-stubs
 %patch2 -p1 -b .sloppier
 %patch3 -p1 -b .git
+%patch4 -p1 -b .xidgen
 
 %build
 autoreconf -v --install
@@ -90,6 +92,9 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> 1.1.91-6
+- Add upstream fix for XID generation
+
 * Sun Oct 19 2008 Adam Jackson <ajax at redhat.com> 1.1.91-5
 - Add pthread-stubs.pc
 



From rdieter at fedoraproject.org  Tue Apr 21 18:22:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 21 Apr 2009 18:22:55 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.192,1.193
Message-ID: <20090421182255.412BC700D6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12229

Modified Files:
	comps-f11.xml.in 
Log Message:
kde-desktop: +kdeutils-printer-applet, +system-config-printer-kde



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- comps-f11.xml.in	17 Apr 2009 13:58:35 -0000	1.192
+++ comps-f11.xml.in	21 Apr 2009 18:22:24 -0000	1.193
@@ -3207,6 +3207,7 @@
       <packagereq type="default">kdepim</packagereq>
       <packagereq type="default">kdeplasma-addons</packagereq>
       <packagereq type="default">kdeutils</packagereq>
+      <packagereq type="default">kdeutils-printer-applet</packagereq>
       <packagereq type="default">kftpgrabber</packagereq>
       <packagereq type="default">kipi-plugins</packagereq>
       <packagereq type="default">konq-plugins</packagereq>
@@ -3218,6 +3219,7 @@
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">PolicyKit-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
+      <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">xsettings-kde</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>



From ajax at fedoraproject.org  Tue Apr 21 18:37:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 21 Apr 2009 18:37:34 +0000 (UTC)
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.27,
	1.28
Message-ID: <20090421183734.4F6BE700D6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-util-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16191

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
* Tue Apr 21 2009 Adam Jackson <ajax at redhat.com> 1.2.1-3
- Add Requires: for the things you inevitably require if you need this
  package.



Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-util-macros.spec	26 Feb 2009 11:34:54 -0000	1.27
+++ xorg-x11-util-macros.spec	21 Apr 2009 18:37:02 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -13,6 +13,8 @@
 
 Source0:  ftp://ftp.x.org/pub/individual/util/util-macros-%{version}.tar.bz2
 
+Requires: autoconf automake libtool pkgconfig
+
 %description
 X.Org X11 autotools macros required for building the various packages that
 comprise the X Window System.
@@ -38,6 +40,10 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* Tue Apr 21 2009 Adam Jackson <ajax at redhat.com> 1.2.1-3
+- Add Requires: for the things you inevitably require if you need this
+  package.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Tue Apr 21 18:42:04 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 21 Apr 2009 18:42:04 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch,1.95,1.96
Message-ID: <20090421184204.65EFE700D6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17292

Modified Files:
	policy-20090105.patch 
Log Message:
* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-10
- Allow nfs to share removable media


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- policy-20090105.patch	21 Apr 2009 18:19:33 -0000	1.95
+++ policy-20090105.patch	21 Apr 2009 18:42:03 -0000	1.96
@@ -28555,12 +28555,12 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-04-07 15:53:36.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-21 13:55:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-21 14:41:11.000000000 -0400
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
  allow udev_t self:rawip_socket create_socket_perms;
-+allow udev_t self:netlink_socket create_netlink_socket_perms;
++allow udev_t self:netlink_socket create_socket_perms;
  
  allow udev_t udev_exec_t:file write;
  can_exec(udev_t, udev_exec_t)



From spot at fedoraproject.org  Tue Apr 21 18:43:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 21 Apr 2009 18:43:12 +0000 (UTC)
Subject: rpms/gwibber/F-11 .cvsignore, 1.14, 1.15 gwibber.spec, 1.23,
	1.24 sources, 1.14, 1.15
Message-ID: <20090421184312.DD052700D6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gwibber/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17793/F-11

Modified Files:
	.cvsignore gwibber.spec sources 
Log Message:
fix gwibber to work, use template-theme-engine branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Apr 2009 02:28:55 -0000	1.14
+++ .cvsignore	21 Apr 2009 18:43:10 -0000	1.15
@@ -1 +1 @@
-gwibber-286bzr.tar.gz
+gwibber-tte-287bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/gwibber.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gwibber.spec	10 Apr 2009 02:28:55 -0000	1.23
+++ gwibber.spec	21 Apr 2009 18:43:10 -0000	1.24
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 286
+%define bzr_rev 287
 
 Name:           gwibber
 Version:        1.0.1
@@ -12,10 +12,12 @@
 URL:            https://launchpad.net/gwibber
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  bzr branch -r %{bzr_rev} lp:gwibber
+# We need the template-theme-engine branch, for modern webkit
+#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine
+#  mv template-theme-engine gwibber/
 #  rm -rf gwibber/.bzr*
-#  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
-Source0:        %{name}-%{bzr_rev}bzr.tar.gz
+#  tar -czvf gwibber-tte-%{bzr_rev}bzr.tar.gz gwibber
+Source0:        %{name}-tte-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       libsoup
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1.287bzr
+- move to template-theme-engine branch, 287
+
 * Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 1.0.1-1.286bzr
 - Update from upstream revision 286
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Apr 2009 02:28:55 -0000	1.14
+++ sources	21 Apr 2009 18:43:10 -0000	1.15
@@ -1 +1 @@
-fb330eebe17f2a978a57564e5da177e4  gwibber-286bzr.tar.gz
+a7b010010b92f8a55edc7750d60e3584  gwibber-tte-287bzr.tar.gz



From spot at fedoraproject.org  Tue Apr 21 18:43:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 21 Apr 2009 18:43:14 +0000 (UTC)
Subject: rpms/gwibber/devel gwibber.spec,1.23,1.24 sources,1.14,1.15
Message-ID: <20090421184314.0F934700D6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17793/devel

Modified Files:
	gwibber.spec sources 
Log Message:
fix gwibber to work, use template-theme-engine branch


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gwibber.spec	10 Apr 2009 02:28:55 -0000	1.23
+++ gwibber.spec	21 Apr 2009 18:43:11 -0000	1.24
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 286
+%define bzr_rev 287
 
 Name:           gwibber
 Version:        1.0.1
@@ -12,10 +12,12 @@
 URL:            https://launchpad.net/gwibber
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  bzr branch -r %{bzr_rev} lp:gwibber
+# We need the template-theme-engine branch, for modern webkit
+#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine
+#  mv template-theme-engine gwibber/
 #  rm -rf gwibber/.bzr*
-#  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
-Source0:        %{name}-%{bzr_rev}bzr.tar.gz
+#  tar -czvf gwibber-tte-%{bzr_rev}bzr.tar.gz gwibber
+Source0:        %{name}-tte-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       libsoup
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1.287bzr
+- move to template-theme-engine branch, 287
+
 * Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 1.0.1-1.286bzr
 - Update from upstream revision 286
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Apr 2009 02:28:55 -0000	1.14
+++ sources	21 Apr 2009 18:43:11 -0000	1.15
@@ -1 +1 @@
-fb330eebe17f2a978a57564e5da177e4  gwibber-286bzr.tar.gz
+a7b010010b92f8a55edc7750d60e3584  gwibber-tte-287bzr.tar.gz



From nalin at fedoraproject.org  Tue Apr 21 18:46:16 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 21 Apr 2009 18:46:16 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.5-brokenrev.patch,1.1,NONE
Message-ID: <20090421184616.5DA1B700D6@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18773

Removed Files:
	krb5-1.5-brokenrev.patch 
Log Message:
- "rev" works the way the test suite expects now, so don't disable tests
  that use it



--- krb5-1.5-brokenrev.patch DELETED ---



From nalin at fedoraproject.org  Tue Apr 21 18:46:37 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 21 Apr 2009 18:46:37 +0000 (UTC)
Subject: rpms/krb5/devel kdcrotate,1.1,NONE
Message-ID: <20090421184637.E5801700D6@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18937

Removed Files:
	kdcrotate 
Log Message:
- okay, finally remove this



--- kdcrotate DELETED ---



From nalin at fedoraproject.org  Tue Apr 21 18:47:23 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 21 Apr 2009 18:47:23 +0000 (UTC)
Subject: rpms/krb5/devel krb5-trunk-ksu-typo.patch, NONE, 1.1 krb5.spec,
	1.192, 1.193
Message-ID: <20090421184723.7A061700D6@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18895

Modified Files:
	krb5.spec 
Added Files:
	krb5-trunk-ksu-typo.patch 
Log Message:
- fix a typo in a ksu error message (Marek Mahut)


krb5-trunk-ksu-typo.patch:

--- NEW FILE krb5-trunk-ksu-typo.patch ---
Marek Marut, RT #6472.
--- krb5/src/clients/ksu/krb_auth_su.c	2009-04-21 13:34:03.000000000 -0400
+++ krb5/src/clients/ksu/krb_auth_su.c	2009-04-21 13:34:10.000000000 -0400
@@ -185,7 +185,7 @@ krb5_boolean krb5_auth_check(context, cl
     
     if ((retval = krb5_get_cred_from_kdc(context, cc, &in_creds, 
 					 &out_creds, &tgts))){
-	com_err(prog_name, retval, "while geting credentials from kdc");  
+	com_err(prog_name, retval, "while getting credentials from kdc");  
 	return (FALSE);
     }
     


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- krb5.spec	20 Apr 2009 21:15:12 -0000	1.192
+++ krb5.spec	21 Apr 2009 18:46:52 -0000	1.193
@@ -13,7 +13,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.6.3
-Release: 102%{?dist}
+Release: 103%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -24,7 +24,6 @@
 Source6: krb5.conf
 Source7: krb5.sh
 Source8: krb5.csh
-Source9: kdcrotate
 Source10: kdc.conf
 Source11: kadm5.acl
 Source12: krsh
@@ -50,7 +49,6 @@
 Patch4: krb5-1.3-rlogind-environ.patch
 Patch5: krb5-1.3-ksu-access.patch
 Patch6: krb5-1.5-ksu-path.patch
-Patch9: krb5-1.5-brokenrev.patch
 Patch11: krb5-1.2.1-passive.patch
 Patch12: krb5-1.4-ktany.patch
 Patch13: krb5-1.3-large-file.patch
@@ -100,6 +98,7 @@
 Patch82: krb5-CVE-2009-0844-0845-2.patch
 Patch83: krb5-CVE-2009-0846.patch
 Patch84: krb5-CVE-2009-0847.patch
+Patch85: krb5-trunk-ksu-typo.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -228,6 +227,11 @@
 certificate.
 
 %changelog
+* Tue Apr 21 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-103
+- fix a typo in a ksu error message (Marek Mahut)
+- "rev" works the way the test suite expects now, so don't disable tests
+  that use it
+
 * Mon Apr 20 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-102
 - add LSB-style init script info
 
@@ -1380,7 +1384,6 @@
 %patch4  -p1 -b .rlogind-environ
 %patch5  -p1 -b .ksu-access
 %patch6  -p1 -b .ksu-path
-%patch9  -p1 -b .brokenrev
 %patch11 -p1 -b .passive
 %patch12 -p1 -b .ktany
 %patch13 -p1 -b .large-file
@@ -1428,6 +1431,7 @@
 %patch82 -p1 -b .CVE-2009-0844-0845-2
 %patch83 -p1 -b .CVE-2009-0846
 %patch84 -p1 -b .CVE-2009-0847
+%patch85 -p1 -b .ksu-typo
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex



From ajax at fedoraproject.org  Tue Apr 21 18:50:50 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 21 Apr 2009 18:50:50 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-hdmi-edid-fix.patch, NONE,
	1.1 kernel.spec, 1.1565, 1.1566
Message-ID: <20090421185050.40586700D6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20002

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-hdmi-edid-fix.patch 
Log Message:
* Tue Apr 21 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-104
- drm-intel-hdmi-edid-fix.patch: Fix EDID fetch on SDVO HDMI.


drm-intel-hdmi-edid-fix.patch:

--- NEW FILE drm-intel-hdmi-edid-fix.patch ---
http://bugs.freedesktop.org/show_bug.cgi?id=21042

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 7b31f55..3586d81 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -30,6 +30,7 @@
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
+#include "drm_edid.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
@@ -1377,14 +1378,92 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
 		return connector_status_disconnected;
 }
 
+#define MAX_EDID_EXT_NUM 4
+/**
+ * This function will fetch EDID by switch ddc bus, instead of drm_get_edid
+ * function.
+ */
+static struct edid *intel_sdvo_hdmi_get_edid(struct intel_output *intel_output)
+{
+	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+	struct edid *edid;
+	int ret = 0;
+
+	edid = kmalloc(EDID_LENGTH * (MAX_EDID_EXT_NUM + 1),
+		       GFP_KERNEL);
+
+	if (edid == NULL) {
+		DRM_DEBUG("Failed to allocated EDID for SDVO HDMI\n");
+		goto end;
+	}
+
+	/* Read first EDID block */
+	ret = drm_do_probe_ddc_edid(&intel_output->ddc_bus->adapter,
+				    (unsigned char *)edid, EDID_LENGTH);
+	if (ret != 0) {
+		DRM_DEBUG("Failed to read basic EDID for SDVO HDMI\n");
+		goto clean_up;
+	}
+
+	/* There are EDID extensions to be read */
+	if (edid->extensions != 0) {
+		int edid_ext_num = edid->extensions;
+
+		if (edid_ext_num > MAX_EDID_EXT_NUM) {
+			DRM_DEBUG("The number of extension(%d) is "
+				  "over max (%d), actually read number (%d)\n",
+				  edid_ext_num, MAX_EDID_EXT_NUM,
+				  MAX_EDID_EXT_NUM);
+			/* Reset EDID extension number to be read */
+			edid_ext_num = MAX_EDID_EXT_NUM;
+		}
+		/* set the bus switch and get the modes */
+		intel_sdvo_set_control_bus_switch(intel_output,
+						  sdvo_priv->ddc_bus);
+		/* Read EDID including extensions too */
+		ret = drm_do_probe_ddc_edid(&intel_output->ddc_bus->adapter,
+					    (unsigned char *)edid,
+					    EDID_LENGTH * (edid_ext_num + 1));
+		if (ret != 0) {
+			DRM_DEBUG("Failed to read EDID EXT for SDVO HDMI\n");
+			goto clean_up;
+		}
+	}
+	goto end;
+
+clean_up:
+	kfree(edid);
+	edid = NULL;
+end:
+	return edid;
+}
+
+static void intel_sdvo_hdmi_ddc_get_modes(struct intel_output *intel_output)
+{
+	struct edid *edid;
+
+	edid = intel_sdvo_hdmi_get_edid(intel_output);
+	if (edid != NULL) {
+		drm_mode_connector_update_edid_property(&intel_output->base,
+							edid);
+		drm_add_edid_modes(&intel_output->base, edid);
+		kfree(edid);
+	}
+}
+
 static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 {
 	struct intel_output *intel_output = to_intel_output(connector);
 	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
 
 	/* set the bus switch and get the modes */
-	intel_sdvo_set_control_bus_switch(intel_output, sdvo_priv->ddc_bus);
-	intel_ddc_get_modes(intel_output);
+	intel_sdvo_set_control_bus_switch(intel_output,
+					  sdvo_priv->ddc_bus);
+	if (sdvo_priv->is_hdmi == true)
+		intel_sdvo_hdmi_ddc_get_modes(intel_output);
+	else
+		intel_ddc_get_modes(intel_output);
+
 
 #if 0
 	struct drm_device *dev = encoder->dev;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1565
retrieving revision 1.1566
diff -u -r1.1565 -r1.1566
--- kernel.spec	21 Apr 2009 05:20:51 -0000	1.1565
+++ kernel.spec	21 Apr 2009 18:50:16 -0000	1.1566
@@ -690,6 +690,7 @@
 Patch1821: drm-intel-lying-systems-without-lvds.patch
 Patch1822: drm-intel-gen3-fb-hack.patch
 Patch1823: drm-intel-tiled-front.patch
+Patch1824: drm-intel-hdmi-edid-fix.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1348,6 +1349,7 @@
 ApplyPatch drm-intel-lying-systems-without-lvds.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-intel-tiled-front.patch
+ApplyPatch drm-intel-hdmi-edid-fix.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1978,6 +1980,9 @@
 # and build.
 
 %changelog
+* Tue Apr 21 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-104
+- drm-intel-hdmi-edid-fix.patch: Fix EDID fetch on SDVO HDMI.
+
 * Tue Apr 21 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-103
 - radeon kms: fix lcd edid detection + fix legacy crtc setup
 



From sgrubb at fedoraproject.org  Tue Apr 21 19:03:15 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 21 Apr 2009 19:03:15 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.101, 1.102 audit.spec, 1.210,
	1.211 sources, 1.125, 1.126 audit-1.7.12-libev.patch, 1.1,
	NONE audit-1.8-noaudit.patch, 1.2, NONE audit-swig.patch, 1.1, NONE
Message-ID: <20090421190315.E3D82700D6@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23062

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.7.12-libev.patch audit-1.8-noaudit.patch 
	audit-swig.patch 
Log Message:
* Tue Apr 21 2009 Steve Grubb <sgrubb at redhat.com> 1.7.13-1
- New upstream release
- Fix problem with negative uids in audit rules on 32 bit systems
- Update tty keystroke interpretations (Miloslav Trma??)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	24 Feb 2009 21:36:08 -0000	1.101
+++ .cvsignore	21 Apr 2009 19:02:43 -0000	1.102
@@ -98,3 +98,4 @@
 audit-1.7.10.tar.gz
 audit-1.7.11.tar.gz
 audit-1.7.12.tar.gz
+audit-1.7.13.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- audit.spec	3 Apr 2009 19:42:16 -0000	1.210
+++ audit.spec	21 Apr 2009 19:02:43 -0000	1.211
@@ -1,7 +1,7 @@
-%define audit_version 1.7.12
-%define audit_release 4%{?dist}
+%define audit_version 1.7.13
+%define audit_release 1%{?dist}
 %define sca_version 0.4.8
-%define sca_release 19
+%define sca_release 20
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
@@ -12,9 +12,6 @@
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-Patch1: audit-1.8-noaudit.patch
-Patch2: audit-1.7.12-libev.patch
-Patch3: audit-swig.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -92,9 +89,6 @@
 
 %prep
 %setup -q
-%patch1 -p2
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
@@ -264,6 +258,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Apr 21 2009 Steve Grubb <sgrubb at redhat.com> 1.7.13-1
+- New upstream release
+- Fix problem with negative uids in audit rules on 32 bit systems
+- Update tty keystroke interpretations (Miloslav Trma??)
+
 * Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 1.7.12-4
 - Drop some debug code in libev
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- sources	24 Feb 2009 21:36:08 -0000	1.125
+++ sources	21 Apr 2009 19:02:44 -0000	1.126
@@ -1 +1 @@
-d245861c33d714eba3e14a3582e1c214  audit-1.7.12.tar.gz
+967776cbec046043ef02ffefe0e89cb7  audit-1.7.13.tar.gz


--- audit-1.7.12-libev.patch DELETED ---


--- audit-1.8-noaudit.patch DELETED ---


--- audit-swig.patch DELETED ---



From laxathom at fedoraproject.org  Tue Apr 21 19:06:16 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Tue, 21 Apr 2009 19:06:16 +0000 (UTC)
Subject: rpms/python-sqlite2/F-10 .cvsignore, 1.11, 1.12 python-sqlite2.spec,
	1.18, 1.19 sources, 1.11, 1.12
Message-ID: <20090421190616.6F7E97013C@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/python-sqlite2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23808

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Mar 2007 17:29:03 -0000	1.11
+++ .cvsignore	21 Apr 2009 19:05:45 -0000	1.12
@@ -1 +1 @@
-pysqlite-2.3.3.tar.gz
+pysqlite-2.3.5.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/F-10/python-sqlite2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-sqlite2.spec	29 Feb 2008 13:40:42 -0000	1.18
+++ python-sqlite2.spec	21 Apr 2009 19:05:45 -0000	1.19
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.3.3
-Release:        3%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Xavier Lamien <lxtnow at gmail.com> - 1:2.3.5-1
+- Update release.
+
 * Fri Feb 29 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1:2.3.3-3
 - Added -egg-info file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Mar 2007 17:29:03 -0000	1.11
+++ sources	21 Apr 2009 19:05:45 -0000	1.12
@@ -1 +1 @@
-cac3e827f22befff8b6302109c6eff34  pysqlite-2.3.3.tar.gz
+b4a185e936848370fcc1a5b17755b641  pysqlite-2.3.5.tar.gz



From caillon at fedoraproject.org  Tue Apr 21 19:16:35 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 19:16:35 +0000 (UTC)
Subject: rpms/xulrunner/F-9 .cvsignore, 1.56, 1.57 sources, 1.58,
	1.59 xulrunner.spec, 1.138, 1.139
Message-ID: <20090421191635.AB543700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27558

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.9-1
- Update to 1.9.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	27 Mar 2009 17:46:34 -0000	1.56
+++ .cvsignore	21 Apr 2009 19:16:31 -0000	1.57
@@ -1 +1 @@
-xulrunner-1.9.0.8-source.tar.bz2
+xulrunner-1.9.0.9-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	27 Mar 2009 17:46:34 -0000	1.58
+++ sources	21 Apr 2009 19:16:31 -0000	1.59
@@ -1 +1 @@
-5fb6c6f3e973516df83a573348377a2f  xulrunner-1.9.0.8-source.tar.bz2
+f80b085699db8201e5db6b30fc63c60d  xulrunner-1.9.0.9-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- xulrunner.spec	27 Mar 2009 17:46:34 -0000	1.138
+++ xulrunner.spec	21 Apr 2009 19:16:31 -0000	1.139
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.8
+Version:        1.9.0.9
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -381,6 +381,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.9-1
+- Update to 1.9.0.9
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.8-1
 - Update to 1.9.0.8
 



From caillon at fedoraproject.org  Tue Apr 21 19:17:01 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 19:17:01 +0000 (UTC)
Subject: rpms/xulrunner/F-10 .cvsignore, 1.67, 1.68 sources, 1.70,
	1.71 xulrunner.spec, 1.144, 1.145
Message-ID: <20090421191701.0FC1A700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27600

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.9-1
- Update to 1.9.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-10/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	27 Mar 2009 17:46:40 -0000	1.67
+++ .cvsignore	21 Apr 2009 19:16:28 -0000	1.68
@@ -1 +1 @@
-xulrunner-1.9.0.8-source.tar.bz2
+xulrunner-1.9.0.9-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-10/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	27 Mar 2009 17:46:40 -0000	1.70
+++ sources	21 Apr 2009 19:16:29 -0000	1.71
@@ -1 +1 @@
-5fb6c6f3e973516df83a573348377a2f  xulrunner-1.9.0.8-source.tar.bz2
+f80b085699db8201e5db6b30fc63c60d  xulrunner-1.9.0.9-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- xulrunner.spec	27 Mar 2009 17:46:40 -0000	1.144
+++ xulrunner.spec	21 Apr 2009 19:16:29 -0000	1.145
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.8
+Version:        1.9.0.9
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -423,6 +423,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.9-1
+- Update to 1.9.0.9
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.8-1
 - Update to 1.9.0.8
 



From jkeating at fedoraproject.org  Tue Apr 21 19:17:06 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 21 Apr 2009 19:17:06 +0000 (UTC)
Subject: fedora-release RPM-GPG-KEY-fedora-11-primary, NONE,
	1.1.2.1 fedora-rawhide.repo, 1.5, 1.5.2.1 fedora-release.spec,
	1.72.2.1, 1.72.2.2 fedora-updates-testing.repo, 1.13,
	1.13.2.1 RPM-GPG-KEY-fedora-10-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-test-10-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-test-11-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-test-ia64, 1.1,
	NONE RPM-GPG-KEY-fedora-test-primary, 1.1, NONE
Message-ID: <20090421191706.D2E66700D6@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27888

Modified Files:
      Tag: F-11
	fedora-rawhide.repo fedora-release.spec 
	fedora-updates-testing.repo 
Added Files:
      Tag: F-11
	RPM-GPG-KEY-fedora-11-primary 
Removed Files:
      Tag: F-11
	RPM-GPG-KEY-fedora-10-primary RPM-GPG-KEY-fedora-primary 
	RPM-GPG-KEY-fedora-test-10-primary 
	RPM-GPG-KEY-fedora-test-11-primary 
	RPM-GPG-KEY-fedora-test-ia64 RPM-GPG-KEY-fedora-test-primary 
Log Message:
Go to single key, remove old keys



--- NEW FILE RPM-GPG-KEY-fedora-11-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQINBEl1CHEBEACn5bv6rGJW50UJ59QoI5E27q04g3Gv8bH5/wtk8NjwvgTCtGRd
hfXCWvd4OGZjN67m0tsWmJltC7pCv6i3pnaVsVWo1u36+aoZtdP1tqv7CD3QlnLK
bx740Oor2YJJvlr7ypFcYPH1+xBZOHXUjPRrqTT6nY6AVm2U/udIVZQHhNG0mc4K
IHYZeJM3GFOL1sE+PX8zpcGh4MUKBsVcPNVYpD+HPQyDAgQcL4+uOFR0tnonaiWm
vA7A/4kNokHpbwDY7WwEnGZM6KJUGa2rTNXJ+Vij0ng7mWRZ5/0GcM4/mMX6dn9S
xghbESiLdip1ZTb60B/ClFZi5PiB12J6DQo2h3+hpxhx0AHJSQRKt+5uw/UyjdmG
zHROos8KRvTlTXeKj2SsNvjQKrbyQGT0AXVBcuXLbbDjijaIF8EE4SFXkCyU5Do9
6mEkuEwMcdZ8KQC25gF5jlM0G+nZmcSgZin7b4jRvFEPZ+WbPzB51wijmPuiadWT
H2ssiBFSHZG0SljVu6vG5YaTwgyB24+1jb/eTSz/wa/Kh8u1loZnWb/F0K2UnA6M
frDnlpdBskgMjBFXnzOqRYqzyQRCBe4T2IbkzUnQYeiqvJAiVsdVG5/TncxCzhfA
E9t2gjilRcWGRl8W96M0mHlw2uMkLRDN4BfwmWePlQQ8fGKma+PiO4E9rQARAQAB
tCZGZWRvcmEgKDExKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
IAUCSe4UCQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEB3Fx1jSLnfygm0P
/RIMXuhggaKzYYSrtv4GH8F96643WwmuoGl0hZydNt3WwJCy+pNAmFkCK1NG0K6Y
HC/7jWKImpl61q0XJwygOZAfpy6DNKsIQkfJdk7afZHruXrapphIbf127pfSayu9
bWHKc6ZovZ3tt8XjH7p9cU+qfidmTyUVJheIJyLQ9C+Cand3XJ6tR+1catKcGYWR
Zjjr0gxQWj3T4ow4VP9rju8BRYItgDcfqWSK06HAkp/AbCqJQSwBF5m9mSYokOA2
YQuYwAcDMjl/dEoGgzm+OLoyj3+mkeMdQTMnjvEirtsVBai5CzHlhukAqUpBBMV4
MQmNMkYKCCbt/uOuy+Uj6caV1HITZmDUOAu3Qr9Ur1tG4lggLTKSCWrc6sBGdg3Y
w04XkHppU32bPYPX2QGqMJh9QOQAciZIw22NNffDUI0f467cJ7j+nv1M9lsd5voZ
BiHN5d7abDr81q22+m7tQzdy2UvYXT0tsEHS6DUWvo4PUW2/IpUOv8SUytxTACiY
EGYA00q5Ax+h8FPXo1v7Dd2GksLduyByaW0p7P2VyjJTsqkMVEQ2wRNCE8eipg2s
xpsSU9M29uf7/goHDI6pfXpN+q2uPTLucCEIjG5bDICw3uwWLCJ+AXYLiPzCtn7j
TaPTZVVFnbBFu75zklD8EtJ1fHJngYTq7yIMNKOJQTyQ
=moZO
-----END PGP PUBLIC KEY BLOCK-----


Index: fedora-rawhide.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- fedora-rawhide.repo	4 Mar 2009 04:46:04 -0000	1.5
+++ fedora-rawhide.repo	21 Apr 2009 19:17:03 -0000	1.5.2.1
@@ -25,7 +25,7 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
@@ -34,7 +34,7 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
@@ -43,5 +43,5 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.72.2.1
retrieving revision 1.72.2.2
diff -u -r1.72.2.1 -r1.72.2.2
--- fedora-release.spec	14 Apr 2009 20:48:46 -0000	1.72.2.1
+++ fedora-release.spec	21 Apr 2009 19:17:03 -0000	1.72.2.2
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	10.93
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -46,10 +46,8 @@
 for arch in i386 x86_64 ppc ppc64
   do
   ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test-$arch
 done
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -93,6 +91,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 10.93-2
+- Drop reference to the "test" key, we only do one key per release now
+
 * Tue Apr 14 2009 Jesse Keating <jkeating at redhat.com> - 10.93-1
 - Bump for F11 Preview
 - Add the release name


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- fedora-updates-testing.repo	4 Mar 2009 04:46:04 -0000	1.13
+++ fedora-updates-testing.repo	21 Apr 2009 19:17:03 -0000	1.13.2.1
@@ -5,7 +5,7 @@
 mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
@@ -14,7 +14,7 @@
 mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
@@ -23,4 +23,4 @@
 mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch


--- RPM-GPG-KEY-fedora-10-primary DELETED ---


--- RPM-GPG-KEY-fedora-primary DELETED ---


--- RPM-GPG-KEY-fedora-test-10-primary DELETED ---


--- RPM-GPG-KEY-fedora-test-11-primary DELETED ---


--- RPM-GPG-KEY-fedora-test-ia64 DELETED ---


--- RPM-GPG-KEY-fedora-test-primary DELETED ---



From jkeating at fedoraproject.org  Tue Apr 21 19:20:04 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 21 Apr 2009 19:20:04 +0000 (UTC)
Subject: rpms/fedora-release/F-11 fedora-release.spec, 1.75, 1.76 sources,
	1.62, 1.63
Message-ID: <20090421192005.3FD17700D6@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28689

Modified Files:
	fedora-release.spec sources 
Log Message:
* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 10.93-2
- Drop reference to the "test" key, we only do one key per release now



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-11/fedora-release.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- fedora-release.spec	14 Apr 2009 20:51:21 -0000	1.75
+++ fedora-release.spec	21 Apr 2009 19:20:00 -0000	1.76
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	10.93
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -46,10 +46,8 @@
 for arch in i386 x86_64 ppc ppc64
   do
   ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test-$arch
 done
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -93,6 +91,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 10.93-2
+- Drop reference to the "test" key, we only do one key per release now
+
 * Tue Apr 14 2009 Jesse Keating <jkeating at redhat.com> - 10.93-1
 - Bump for F11 Preview
 - Add the release name


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-11/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	14 Apr 2009 20:51:21 -0000	1.62
+++ sources	21 Apr 2009 19:20:01 -0000	1.63
@@ -1 +1 @@
-c682e27109048a73856b4ba68f168b92  fedora-release-10.93.tar.gz
+7bbe40b08c8d3f03b2190c4dd87ddef3  fedora-release-10.93.tar.gz



From maxamillion at fedoraproject.org  Tue Apr 21 19:24:38 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 19:24:38 +0000 (UTC)
Subject: rpms/ninvaders/devel ninvaders-0.1.1-fedora.patch, NONE,
	1.1 import.log, 1.1, 1.2 ninvaders.spec, 1.1, 1.2
Message-ID: <20090421192438.C68E3700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30273/devel

Modified Files:
	import.log ninvaders.spec 
Added Files:
	ninvaders-0.1.1-fedora.patch 
Log Message:
Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue



ninvaders-0.1.1-fedora.patch:

--- NEW FILE ninvaders-0.1.1-fedora.patch ---
--- Makefile	2003-05-08 14:19:50.000000000 -0500
+++ Makefile.patched	2009-04-21 14:17:47.000000000 -0500
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall $(RPM_OPT_FLAGS)
 LIBS=-lncurses
 
 CFILES=globals.c view.c aliens.c ufo.c player.c nInvaders.c


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Mar 2009 13:30:20 -0000	1.1
+++ import.log	21 Apr 2009 19:24:35 -0000	1.2
@@ -1 +1,2 @@
 ninvaders-0_1_1-2:HEAD:ninvaders-0.1.1-2.src.rpm:1237814978
+ninvaders-0_1_1-3:HEAD:ninvaders-0.1.1-3.src.rpm:1240341840


Index: ninvaders.spec
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/devel/ninvaders.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ninvaders.spec	23 Mar 2009 13:30:20 -0000	1.1
+++ ninvaders.spec	21 Apr 2009 19:24:35 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           ninvaders
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Space Invaders clone written in ncurses for cli gaming
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ninvaders.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         ninvaders-0.1.1-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 iconv -f iso-8859-1 -t utf8 ChangeLog > ChangeLog.new && \
 touch -r ChangeLog ChangeLog.new && mv ChangeLog.new ChangeLog
 
@@ -39,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-3
+- Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue
+
 * Fri Mar 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-2
 - Added smp_mflags, fixed utf8 encoding, removed ncurses requirement
 - Added trailing period to description, changed name to match upstream



From maxamillion at fedoraproject.org  Tue Apr 21 19:26:13 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 19:26:13 +0000 (UTC)
Subject: rpms/ninvaders/F-10 ninvaders-0.1.1-fedora.patch, NONE,
	1.1 import.log, 1.1, 1.2 ninvaders.spec, 1.1, 1.2
Message-ID: <20090421192613.E72FC700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30738/F-10

Modified Files:
	import.log ninvaders.spec 
Added Files:
	ninvaders-0.1.1-fedora.patch 
Log Message:
Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue



ninvaders-0.1.1-fedora.patch:

--- NEW FILE ninvaders-0.1.1-fedora.patch ---
--- Makefile	2003-05-08 14:19:50.000000000 -0500
+++ Makefile.patched	2009-04-21 14:17:47.000000000 -0500
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall $(RPM_OPT_FLAGS)
 LIBS=-lncurses
 
 CFILES=globals.c view.c aliens.c ufo.c player.c nInvaders.c


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Mar 2009 13:49:07 -0000	1.1
+++ import.log	21 Apr 2009 19:26:13 -0000	1.2
@@ -1 +1,2 @@
 ninvaders-0_1_1-2:F-10:ninvaders-0.1.1-2.src.rpm:1237815164
+ninvaders-0_1_1-3:F-10:ninvaders-0.1.1-3.src.rpm:1240341899


Index: ninvaders.spec
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/F-10/ninvaders.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ninvaders.spec	23 Mar 2009 13:49:07 -0000	1.1
+++ ninvaders.spec	21 Apr 2009 19:26:13 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           ninvaders
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Space Invaders clone written in ncurses for cli gaming
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ninvaders.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         ninvaders-0.1.1-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 iconv -f iso-8859-1 -t utf8 ChangeLog > ChangeLog.new && \
 touch -r ChangeLog ChangeLog.new && mv ChangeLog.new ChangeLog
 
@@ -39,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-3
+- Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue
+
 * Fri Mar 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-2
 - Added smp_mflags, fixed utf8 encoding, removed ncurses requirement
 - Added trailing period to description, changed name to match upstream



From maxamillion at fedoraproject.org  Tue Apr 21 19:28:06 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 19:28:06 +0000 (UTC)
Subject: rpms/ninvaders/F-9 ninvaders-0.1.1-fedora.patch, NONE,
	1.1 import.log, 1.1, 1.2 ninvaders.spec, 1.1, 1.2
Message-ID: <20090421192806.47D11700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31619/F-9

Modified Files:
	import.log ninvaders.spec 
Added Files:
	ninvaders-0.1.1-fedora.patch 
Log Message:
Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue



ninvaders-0.1.1-fedora.patch:

--- NEW FILE ninvaders-0.1.1-fedora.patch ---
--- Makefile	2003-05-08 14:19:50.000000000 -0500
+++ Makefile.patched	2009-04-21 14:17:47.000000000 -0500
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall $(RPM_OPT_FLAGS)
 LIBS=-lncurses
 
 CFILES=globals.c view.c aliens.c ufo.c player.c nInvaders.c


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Mar 2009 13:50:49 -0000	1.1
+++ import.log	21 Apr 2009 19:28:05 -0000	1.2
@@ -1 +1,2 @@
 ninvaders-0_1_1-2:F-9:ninvaders-0.1.1-2.src.rpm:1237816206
+ninvaders-0_1_1-3:F-9:ninvaders-0.1.1-3.src.rpm:1240341997


Index: ninvaders.spec
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/F-9/ninvaders.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ninvaders.spec	23 Mar 2009 13:50:49 -0000	1.1
+++ ninvaders.spec	21 Apr 2009 19:28:05 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           ninvaders
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Space Invaders clone written in ncurses for cli gaming
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ninvaders.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         ninvaders-0.1.1-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 iconv -f iso-8859-1 -t utf8 ChangeLog > ChangeLog.new && \
 touch -r ChangeLog ChangeLog.new && mv ChangeLog.new ChangeLog
 
@@ -39,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-3
+- Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue
+
 * Fri Mar 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-2
 - Added smp_mflags, fixed utf8 encoding, removed ncurses requirement
 - Added trailing period to description, changed name to match upstream



From maxamillion at fedoraproject.org  Tue Apr 21 19:34:50 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 19:34:50 +0000 (UTC)
Subject: rpms/ninvaders/EL-5 ninvaders-0.1.1-fedora.patch, NONE,
	1.1 import.log, 1.1, 1.2 ninvaders.spec, 1.1, 1.2
Message-ID: <20090421193451.46D08700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv533/EL-5

Modified Files:
	import.log ninvaders.spec 
Added Files:
	ninvaders-0.1.1-fedora.patch 
Log Message:
Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue



ninvaders-0.1.1-fedora.patch:

--- NEW FILE ninvaders-0.1.1-fedora.patch ---
--- Makefile	2003-05-08 14:19:50.000000000 -0500
+++ Makefile.patched	2009-04-21 14:17:47.000000000 -0500
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall $(RPM_OPT_FLAGS)
 LIBS=-lncurses
 
 CFILES=globals.c view.c aliens.c ufo.c player.c nInvaders.c


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Mar 2009 13:53:03 -0000	1.1
+++ import.log	21 Apr 2009 19:34:47 -0000	1.2
@@ -1 +1,2 @@
 ninvaders-0_1_1-2:EL-5:ninvaders-0.1.1-2.src.rpm:1237816364
+ninvaders-0_1_1-3:EL-5:ninvaders-0.1.1-3.src.rpm:1240342263


Index: ninvaders.spec
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/EL-5/ninvaders.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ninvaders.spec	23 Mar 2009 13:53:03 -0000	1.1
+++ ninvaders.spec	21 Apr 2009 19:34:47 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           ninvaders
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Space Invaders clone written in ncurses for cli gaming
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ninvaders.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         ninvaders-0.1.1-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 iconv -f iso-8859-1 -t utf8 ChangeLog > ChangeLog.new && \
 touch -r ChangeLog ChangeLog.new && mv ChangeLog.new ChangeLog
 
@@ -39,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-3
+- Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue
+
 * Fri Mar 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-2
 - Added smp_mflags, fixed utf8 encoding, removed ncurses requirement
 - Added trailing period to description, changed name to match upstream



From maxamillion at fedoraproject.org  Tue Apr 21 19:39:58 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 19:39:58 +0000 (UTC)
Subject: rpms/ninvaders/EL-4 ninvaders-0.1.1-fedora.patch, NONE,
	1.1 import.log, 1.1, 1.2 ninvaders.spec, 1.1, 1.2
Message-ID: <20090421193958.C481D7013C@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1399/EL-4

Modified Files:
	import.log ninvaders.spec 
Added Files:
	ninvaders-0.1.1-fedora.patch 
Log Message:
http://buildsys.fedoraproject.org/build-status/success.psp



ninvaders-0.1.1-fedora.patch:

--- NEW FILE ninvaders-0.1.1-fedora.patch ---
--- Makefile	2003-05-08 14:19:50.000000000 -0500
+++ Makefile.patched	2009-04-21 14:17:47.000000000 -0500
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall $(RPM_OPT_FLAGS)
 LIBS=-lncurses
 
 CFILES=globals.c view.c aliens.c ufo.c player.c nInvaders.c


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Mar 2009 13:54:12 -0000	1.1
+++ import.log	21 Apr 2009 19:39:27 -0000	1.2
@@ -1 +1,2 @@
 ninvaders-0_1_1-2:EL-4:ninvaders-0.1.1-2.src.rpm:1237816434
+ninvaders-0_1_1-3:EL-4:ninvaders-0.1.1-3.src.rpm:1240342528


Index: ninvaders.spec
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/EL-4/ninvaders.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ninvaders.spec	23 Mar 2009 13:54:12 -0000	1.1
+++ ninvaders.spec	21 Apr 2009 19:39:27 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           ninvaders
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Space Invaders clone written in ncurses for cli gaming
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ninvaders.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         ninvaders-0.1.1-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 iconv -f iso-8859-1 -t utf8 ChangeLog > ChangeLog.new && \
 touch -r ChangeLog ChangeLog.new && mv ChangeLog.new ChangeLog
 
@@ -39,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-3
+- Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue
+
 * Fri Mar 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-2
 - Added smp_mflags, fixed utf8 encoding, removed ncurses requirement
 - Added trailing period to description, changed name to match upstream



From pkgdb at fedoraproject.org  Tue Apr 21 19:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:40:07 +0000
Subject: [pkgdb] perl-IO-LockedFile (Fedora EPEL, 5) updated by kevin
Message-ID: <20090421194007.A98E010F885@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-IO-LockedFile
kevin has set commit to Approved for provenpackager on perl-IO-LockedFile (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-IO-LockedFile (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-IO-LockedFile (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-LockedFile



From pkgdb at fedoraproject.org  Tue Apr 21 19:42:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:42:44 +0000
Subject: [pkgdb] globus-xio was added for ellert
Message-ID: <20090421194244.19DDE10F885@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-xio with summary Globus Toolkit - Globus XIO Framework
kevin has approved Package globus-xio
kevin has added a Fedora devel branch for globus-xio with an owner of ellert
kevin has approved globus-xio in Fedora devel
kevin has approved Package globus-xio
kevin has set commit to Approved for provenpackager on globus-xio (Fedora devel)
kevin has set build to Approved for provenpackager on globus-xio (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-xio (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio



From pkgdb at fedoraproject.org  Tue Apr 21 19:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:42:46 +0000
Subject: [pkgdb] globus-xio (Fedora, 10) updated by kevin
Message-ID: <20090421194246.BCE1A10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-xio
kevin has set commit to Approved for provenpackager on globus-xio (Fedora 10)
kevin has set build to Approved for provenpackager on globus-xio (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-xio (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio



From pkgdb at fedoraproject.org  Tue Apr 21 19:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:42:46 +0000
Subject: [pkgdb] globus-xio (Fedora, 11) updated by kevin
Message-ID: <20090421194246.C661F10F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-xio
kevin has set commit to Approved for provenpackager on globus-xio (Fedora 11)
kevin has set build to Approved for provenpackager on globus-xio (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-xio (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio



From pkgdb at fedoraproject.org  Tue Apr 21 19:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:42:46 +0000
Subject: [pkgdb] globus-xio (Fedora, 9) updated by kevin
Message-ID: <20090421194246.E711310F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-xio
kevin has set commit to Approved for provenpackager on globus-xio (Fedora 9)
kevin has set build to Approved for provenpackager on globus-xio (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-xio (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio



From pkgdb at fedoraproject.org  Tue Apr 21 19:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:42:46 +0000
Subject: [pkgdb] globus-xio (Fedora EPEL, 5) updated by kevin
Message-ID: <20090421194247.0EB6210F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-xio
kevin has set commit to Approved for provenpackager on globus-xio (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-xio (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-xio (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio



From pkgdb at fedoraproject.org  Tue Apr 21 19:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:42:46 +0000
Subject: [pkgdb] globus-xio (Fedora EPEL, 4) updated by kevin
Message-ID: <20090421194246.F003B10F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-xio
kevin has set commit to Approved for provenpackager on globus-xio (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-xio (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-xio (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio



From pkgdb at fedoraproject.org  Tue Apr 21 19:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:43:19 +0000
Subject: [pkgdb] globus-rsl was added for ellert
Message-ID: <20090421194319.E4DC910F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-rsl with summary Globus Toolkit - Resource Specification Language Library
kevin has approved Package globus-rsl
kevin has added a Fedora devel branch for globus-rsl with an owner of ellert
kevin has approved globus-rsl in Fedora devel
kevin has approved Package globus-rsl
kevin has set commit to Approved for provenpackager on globus-rsl (Fedora devel)
kevin has set build to Approved for provenpackager on globus-rsl (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-rsl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl



From pkgdb at fedoraproject.org  Tue Apr 21 19:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:43:21 +0000
Subject: [pkgdb] globus-rsl (Fedora, 10) updated by kevin
Message-ID: <20090421194321.8C14C10F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-rsl
kevin has set commit to Approved for provenpackager on globus-rsl (Fedora 10)
kevin has set build to Approved for provenpackager on globus-rsl (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-rsl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl



From pkgdb at fedoraproject.org  Tue Apr 21 19:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:43:21 +0000
Subject: [pkgdb] globus-rsl (Fedora EPEL, 5) updated by kevin
Message-ID: <20090421194321.97BE910F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-rsl
kevin has set commit to Approved for provenpackager on globus-rsl (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-rsl (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-rsl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl



From pkgdb at fedoraproject.org  Tue Apr 21 19:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:43:21 +0000
Subject: [pkgdb] globus-rsl (Fedora, 11) updated by kevin
Message-ID: <20090421194321.A533D10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-rsl
kevin has set commit to Approved for provenpackager on globus-rsl (Fedora 11)
kevin has set build to Approved for provenpackager on globus-rsl (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-rsl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl



From pkgdb at fedoraproject.org  Tue Apr 21 19:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:43:21 +0000
Subject: [pkgdb] globus-rsl (Fedora, 9) updated by kevin
Message-ID: <20090421194321.AC46810F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-rsl
kevin has set commit to Approved for provenpackager on globus-rsl (Fedora 9)
kevin has set build to Approved for provenpackager on globus-rsl (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-rsl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl



From pkgdb at fedoraproject.org  Tue Apr 21 19:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:43:21 +0000
Subject: [pkgdb] globus-rsl (Fedora EPEL, 4) updated by kevin
Message-ID: <20090421194321.B522D10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-rsl
kevin has set commit to Approved for provenpackager on globus-rsl (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-rsl (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-rsl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl



From kevin at fedoraproject.org  Tue Apr 21 19:43:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:43:24 +0000 (UTC)
Subject: rpms/globus-xio - New directory
Message-ID: <20090421194324.A74A1700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnT4507/rpms/globus-xio

Log Message:
Directory /cvs/pkgs/rpms/globus-xio added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:43:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:43:25 +0000 (UTC)
Subject: rpms/globus-xio/devel - New directory
Message-ID: <20090421194325.5B28F700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnT4507/rpms/globus-xio/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-xio/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:43:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:43:44 +0000 (UTC)
Subject: rpms/globus-xio Makefile,NONE,1.1
Message-ID: <20090421194344.316C7700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnT4507/rpms/globus-xio

Added Files:
	Makefile 
Log Message:
Setup of module globus-xio


--- NEW FILE Makefile ---
# Top level Makefile for module globus-xio
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pwouters at fedoraproject.org  Tue Apr 21 19:43:24 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 21 Apr 2009 19:43:24 +0000 (UTC)
Subject: rpms/perl-IO-LockedFile/EL-5 perl-IO-LockedFile.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090421194324.27AF8700D6@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/pkgs/rpms/perl-IO-LockedFile/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4449

Modified Files:
	sources 
Added Files:
	perl-IO-LockedFile.spec 
Log Message:
initial commit



--- NEW FILE perl-IO-LockedFile.spec ---
Name:           perl-IO-LockedFile
Version:        0.23
Release:        5
Summary:        Something
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IO-LockedFile/
Source0:        http://www.cpan.org/authors/id/R/RA/RANI/IO-LockedFile-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	perl(ExtUtils::MakeMaker)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IO::LockedFile is something

%prep
%setup -q -n IO-LockedFile-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.23-3
Rebuild for new perl

* Thu May 24 2007 Paul Wouters <paul at xelerance.com> 0.13-2
- Added perl(ExtUtils::MakeMaker) BuildRequires

* Wed May 23 2007 Paul Wouters <paul at xelerance.com> 0.13-1
- Initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-LockedFile/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 May 2007 21:14:48 -0000	1.1
+++ sources	21 Apr 2009 19:43:23 -0000	1.2
@@ -0,0 +1 @@
+f447f67ac7c9f42d86d07ca7477cdec6  IO-LockedFile-0.23.tar.gz



From kevin at fedoraproject.org  Tue Apr 21 19:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:43:45 +0000 (UTC)
Subject: rpms/globus-xio/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421194345.0E408700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnT4507/rpms/globus-xio/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-xio


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-xio
# $Id: Makefile,v 1.1 2009/04/21 19:43:44 kevin Exp $
NAME := globus-xio
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Apr 21 19:44:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:44:15 +0000 (UTC)
Subject: rpms/globus-rsl - New directory
Message-ID: <20090421194415.9D00D700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFW5124/rpms/globus-rsl

Log Message:
Directory /cvs/pkgs/rpms/globus-rsl added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:44:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:44:16 +0000 (UTC)
Subject: rpms/globus-rsl/devel - New directory
Message-ID: <20090421194416.98400700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFW5124/rpms/globus-rsl/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-rsl/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:44:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:44:35 +0000 (UTC)
Subject: rpms/globus-rsl Makefile,NONE,1.1
Message-ID: <20090421194435.AB525700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFW5124/rpms/globus-rsl

Added Files:
	Makefile 
Log Message:
Setup of module globus-rsl


--- NEW FILE Makefile ---
# Top level Makefile for module globus-rsl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:44:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:44:36 +0000 (UTC)
Subject: rpms/globus-rsl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421194436.1DC8E700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFW5124/rpms/globus-rsl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-rsl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-rsl
# $Id: Makefile,v 1.1 2009/04/21 19:44:35 kevin Exp $
NAME := globus-rsl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 21 19:44:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:44:53 +0000
Subject: [pkgdb] ugene was added for iefremov
Message-ID: <20090421194454.22C3D10F88A@bastion2.fedora.phx.redhat.com>

kevin has added Package ugene with summary Integrated bioinformatics toolkit
kevin has approved Package ugene
kevin has added a Fedora devel branch for ugene with an owner of iefremov
kevin has approved ugene in Fedora devel
kevin has approved Package ugene
kevin has set commit to Approved for provenpackager on ugene (Fedora devel)
kevin has set build to Approved for provenpackager on ugene (Fedora devel)
kevin has set checkout to Approved for provenpackager on ugene (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ugene



From pkgdb at fedoraproject.org  Tue Apr 21 19:44:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:44:55 +0000
Subject: [pkgdb] ugene (Fedora, 10) updated by kevin
Message-ID: <20090421194455.E8FC810F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ugene
kevin has set commit to Approved for provenpackager on ugene (Fedora 10)
kevin has set build to Approved for provenpackager on ugene (Fedora 10)
kevin has set checkout to Approved for provenpackager on ugene (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ugene



From kevin at fedoraproject.org  Tue Apr 21 19:45:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:45:07 +0000 (UTC)
Subject: rpms/ugene - New directory
Message-ID: <20090421194507.39BE2700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ugene
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWo5684/rpms/ugene

Log Message:
Directory /cvs/pkgs/rpms/ugene added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 19:44:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:44:55 +0000
Subject: [pkgdb] ugene (Fedora, 11) updated by kevin
Message-ID: <20090421194456.0774510F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ugene
kevin has set commit to Approved for provenpackager on ugene (Fedora 11)
kevin has set build to Approved for provenpackager on ugene (Fedora 11)
kevin has set checkout to Approved for provenpackager on ugene (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ugene



From kevin at fedoraproject.org  Tue Apr 21 19:45:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:45:07 +0000 (UTC)
Subject: rpms/ugene/devel - New directory
Message-ID: <20090421194507.AEDCB700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ugene/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWo5684/rpms/ugene/devel

Log Message:
Directory /cvs/pkgs/rpms/ugene/devel added to the repository




From pwouters at fedoraproject.org  Tue Apr 21 19:45:30 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 21 Apr 2009 19:45:30 +0000 (UTC)
Subject: rpms/perl-IO-LockedFile/EL-5 perl-IO-LockedFile.spec,1.1,1.2
Message-ID: <20090421194530.7463D700D6@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/pkgs/rpms/perl-IO-LockedFile/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5625

Modified Files:
	perl-IO-LockedFile.spec 
Log Message:
missing dist tag



Index: perl-IO-LockedFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-LockedFile/EL-5/perl-IO-LockedFile.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-LockedFile.spec	21 Apr 2009 19:43:23 -0000	1.1
+++ perl-IO-LockedFile.spec	21 Apr 2009 19:45:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-IO-LockedFile
 Version:        0.23
-Release:        5
+Release:        5{?dist}
 Summary:        Something
 License:        GPL+ or Artistic
 Group:          Development/Libraries



From kevin at fedoraproject.org  Tue Apr 21 19:45:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:45:37 +0000 (UTC)
Subject: rpms/ugene Makefile,NONE,1.1
Message-ID: <20090421194537.6AB67700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ugene
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWo5684/rpms/ugene

Added Files:
	Makefile 
Log Message:
Setup of module ugene


--- NEW FILE Makefile ---
# Top level Makefile for module ugene
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:45:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:45:38 +0000 (UTC)
Subject: rpms/ugene/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090421194538.E201F700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ugene/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWo5684/rpms/ugene/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ugene


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ugene
# $Id: Makefile,v 1.1 2009/04/21 19:45:38 kevin Exp $
NAME := ugene
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 21 19:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:46:04 +0000
Subject: [pkgdb] photoprint was added for grof
Message-ID: <20090421194605.15C8610F884@bastion2.fedora.phx.redhat.com>

kevin has added Package photoprint with summary Utility for printing digital photographs
kevin has approved Package photoprint
kevin has added a Fedora devel branch for photoprint with an owner of grof
kevin has approved photoprint in Fedora devel
kevin has approved Package photoprint
kevin has set commit to Approved for provenpackager on photoprint (Fedora devel)
kevin has set build to Approved for provenpackager on photoprint (Fedora devel)
kevin has set checkout to Approved for provenpackager on photoprint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint



From pkgdb at fedoraproject.org  Tue Apr 21 19:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:46:10 +0000
Subject: [pkgdb] photoprint (Fedora, 10) updated by kevin
Message-ID: <20090421194610.D3DF510F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for photoprint
kevin has set commit to Approved for provenpackager on photoprint (Fedora 10)
kevin has set build to Approved for provenpackager on photoprint (Fedora 10)
kevin has set checkout to Approved for provenpackager on photoprint (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint



From pkgdb at fedoraproject.org  Tue Apr 21 19:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:46:10 +0000
Subject: [pkgdb] photoprint (Fedora, 9) updated by kevin
Message-ID: <20090421194610.DACA210F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for photoprint
kevin has set commit to Approved for provenpackager on photoprint (Fedora 9)
kevin has set build to Approved for provenpackager on photoprint (Fedora 9)
kevin has set checkout to Approved for provenpackager on photoprint (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint



From pkgdb at fedoraproject.org  Tue Apr 21 19:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:46:10 +0000
Subject: [pkgdb] photoprint (Fedora, 11) updated by kevin
Message-ID: <20090421194610.E584910F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for photoprint
kevin has set commit to Approved for provenpackager on photoprint (Fedora 11)
kevin has set build to Approved for provenpackager on photoprint (Fedora 11)
kevin has set checkout to Approved for provenpackager on photoprint (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint



From kevin at fedoraproject.org  Tue Apr 21 19:46:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:46:25 +0000 (UTC)
Subject: rpms/photoprint - New directory
Message-ID: <20090421194625.440FB700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswB6273/rpms/photoprint

Log Message:
Directory /cvs/pkgs/rpms/photoprint added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:46:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:46:25 +0000 (UTC)
Subject: rpms/photoprint/devel - New directory
Message-ID: <20090421194625.9DA0E700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswB6273/rpms/photoprint/devel

Log Message:
Directory /cvs/pkgs/rpms/photoprint/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:46:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:46:39 +0000 (UTC)
Subject: rpms/photoprint Makefile,NONE,1.1
Message-ID: <20090421194639.4952F700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswB6273/rpms/photoprint

Added Files:
	Makefile 
Log Message:
Setup of module photoprint


--- NEW FILE Makefile ---
# Top level Makefile for module photoprint
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:46:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:46:39 +0000 (UTC)
Subject: rpms/photoprint/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421194639.AA067700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswB6273/rpms/photoprint/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module photoprint


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: photoprint
# $Id: Makefile,v 1.1 2009/04/21 19:46:39 kevin Exp $
NAME := photoprint
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pwouters at fedoraproject.org  Tue Apr 21 19:47:01 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 21 Apr 2009 19:47:01 +0000 (UTC)
Subject: rpms/perl-IO-LockedFile/EL-5 perl-IO-LockedFile.spec,1.2,1.3
Message-ID: <20090421194701.3A90B700D6@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/pkgs/rpms/perl-IO-LockedFile/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6237

Modified Files:
	perl-IO-LockedFile.spec 
Log Message:
paste error :(



Index: perl-IO-LockedFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-LockedFile/EL-5/perl-IO-LockedFile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-IO-LockedFile.spec	21 Apr 2009 19:45:00 -0000	1.2
+++ perl-IO-LockedFile.spec	21 Apr 2009 19:46:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-IO-LockedFile
 Version:        0.23
-Release:        5{?dist}
+Release:        5%{?dist}
 Summary:        Something
 License:        GPL+ or Artistic
 Group:          Development/Libraries



From caolanm at fedoraproject.org  Tue Apr 21 19:49:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 19:49:02 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch,
	NONE, 1.1 openoffice.org.spec, 1.1887, 1.1888
Message-ID: <20090421194902.ECBBE700D6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch 
Log Message:
add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch

openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch ---
diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
--- sw.orig/source/filter/ww8/wrtww8.cxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/wrtww8.cxx	2009-04-21 17:11:00.000000000 +0100
@@ -645,6 +645,11 @@
             plc = &rWrt.pFib->lcbPlcffldEdn;
             break;
 
+        case TXT_ATN:
+            pfc = &rWrt.pFib->fcPlcffldAtn;
+            plc = &rWrt.pFib->lcbPlcffldAtn;
+            break;
+
         case TXT_TXTBOX:
             pfc = &rWrt.pFib->fcPlcffldTxbx;
             plc = &rWrt.pFib->lcbPlcffldTxbx;
@@ -2455,6 +2460,7 @@
         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
         pFldFtn->Write( *this );                // Fields ( FootNotes )
         pFldEdn->Write( *this );                // Fields ( EndNotes )
+        pFldAtn->Write( *this );                // Fields ( Annotations )
         pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
                                                 // plcfBkmkf/plcfBkmkl
         WriteDop( *this );                      // Document-Properties
@@ -2490,6 +2496,7 @@
         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
         pFldFtn->Write( *this );                // Fields ( FootNotes )
         pFldEdn->Write( *this );                // Fields ( EndNotes )
+        pFldAtn->Write( *this );                // Fields ( Annotations )
         pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
         pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
 
@@ -2834,6 +2841,7 @@
     pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
     pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
     pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
+    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
     pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
     pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
 
@@ -2883,6 +2891,7 @@
     DELETEZ( pFldFtn );
     DELETEZ( pFldTxtBxs );
     DELETEZ( pFldHFTxtBxs );
+    DELETEZ( pFldAtn );
     DELETEZ( pFldEdn );
     DELETEZ( pFldHdFt );
     DELETEZ( pFldMain );
@@ -3110,7 +3119,11 @@
 
 bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
 {
-    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
+                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
+                        + rWrt.pFib->ccpHdr );
+    return bRet;
 }
 
 void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
--- sw.orig/source/filter/ww8/wrtww8.hxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/wrtww8.hxx	2009-04-21 16:49:27.000000000 +0100
@@ -473,6 +473,7 @@
     WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
     WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
     WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
+    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
     WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
     WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
     WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-21 16:48:29.000000000 +0100
@@ -1764,6 +1764,9 @@
         case TXT_EDN:
             pFldP = pFldEdn;
             break;
+        case TXT_ATN:
+            pFldP = pFldAtn;
+            break;
         case TXT_TXTBOX:
             pFldP = pFldTxtBxs;
             break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1887
retrieving revision 1.1888
diff -u -r1.1887 -r1.1888
--- openoffice.org.spec	21 Apr 2009 14:39:53 -0000	1.1887
+++ openoffice.org.spec	21 Apr 2009 19:48:30 -0000	1.1888
@@ -138,6 +138,7 @@
 Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 Patch64: workspace.slideshow1.patch
 Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch66: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@
 %patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 %patch64 -p2 -b .workspace.slideshow1.patch
 %patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch66 -p0 -b .ooo101159.ww8.export.commentfields.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4129,6 +4131,7 @@
 %changelog
 * Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+- add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From caolanm at fedoraproject.org  Tue Apr 21 19:49:03 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 19:49:03 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch,
	NONE, 1.1 openoffice.org.spec, 1.1888, 1.1889
Message-ID: <20090421194903.AA12B700D6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch 
Log Message:
add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch

openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch ---
diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
--- sw.orig/source/filter/ww8/wrtww8.cxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/wrtww8.cxx	2009-04-21 17:11:00.000000000 +0100
@@ -645,6 +645,11 @@
             plc = &rWrt.pFib->lcbPlcffldEdn;
             break;
 
+        case TXT_ATN:
+            pfc = &rWrt.pFib->fcPlcffldAtn;
+            plc = &rWrt.pFib->lcbPlcffldAtn;
+            break;
+
         case TXT_TXTBOX:
             pfc = &rWrt.pFib->fcPlcffldTxbx;
             plc = &rWrt.pFib->lcbPlcffldTxbx;
@@ -2455,6 +2460,7 @@
         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
         pFldFtn->Write( *this );                // Fields ( FootNotes )
         pFldEdn->Write( *this );                // Fields ( EndNotes )
+        pFldAtn->Write( *this );                // Fields ( Annotations )
         pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
                                                 // plcfBkmkf/plcfBkmkl
         WriteDop( *this );                      // Document-Properties
@@ -2490,6 +2496,7 @@
         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
         pFldFtn->Write( *this );                // Fields ( FootNotes )
         pFldEdn->Write( *this );                // Fields ( EndNotes )
+        pFldAtn->Write( *this );                // Fields ( Annotations )
         pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
         pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
 
@@ -2834,6 +2841,7 @@
     pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
     pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
     pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
+    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
     pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
     pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
 
@@ -2883,6 +2891,7 @@
     DELETEZ( pFldFtn );
     DELETEZ( pFldTxtBxs );
     DELETEZ( pFldHFTxtBxs );
+    DELETEZ( pFldAtn );
     DELETEZ( pFldEdn );
     DELETEZ( pFldHdFt );
     DELETEZ( pFldMain );
@@ -3110,7 +3119,11 @@
 
 bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
 {
-    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
+                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
+                        + rWrt.pFib->ccpHdr );
+    return bRet;
 }
 
 void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
--- sw.orig/source/filter/ww8/wrtww8.hxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/wrtww8.hxx	2009-04-21 16:49:27.000000000 +0100
@@ -473,6 +473,7 @@
     WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
     WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
     WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
+    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
     WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
     WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
     WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-21 16:48:29.000000000 +0100
@@ -1764,6 +1764,9 @@
         case TXT_EDN:
             pFldP = pFldEdn;
             break;
+        case TXT_ATN:
+            pFldP = pFldAtn;
+            break;
         case TXT_TXTBOX:
             pFldP = pFldTxtBxs;
             break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1888
retrieving revision 1.1889
diff -u -r1.1888 -r1.1889
--- openoffice.org.spec	21 Apr 2009 14:39:55 -0000	1.1888
+++ openoffice.org.spec	21 Apr 2009 19:48:32 -0000	1.1889
@@ -138,6 +138,7 @@
 Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 Patch64: workspace.slideshow1.patch
 Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch66: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@
 %patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 %patch64 -p2 -b .workspace.slideshow1.patch
 %patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch66 -p0 -b .ooo101159.ww8.export.commentfields.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4129,6 +4131,7 @@
 %changelog
 * Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+- add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From pkgdb at fedoraproject.org  Tue Apr 21 19:49:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:49:50 +0000
Subject: [pkgdb] powwow was added for kalev
Message-ID: <20090421194950.4011F10F888@bastion2.fedora.phx.redhat.com>

kevin has added Package powwow with summary A console MUD client
kevin has approved Package powwow
kevin has added a Fedora devel branch for powwow with an owner of kalev
kevin has approved powwow in Fedora devel
kevin has approved Package powwow
kevin has set commit to Approved for provenpackager on powwow (Fedora devel)
kevin has set build to Approved for provenpackager on powwow (Fedora devel)
kevin has set checkout to Approved for provenpackager on powwow (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powwow



From pkgdb at fedoraproject.org  Tue Apr 21 19:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:49:52 +0000
Subject: [pkgdb] powwow (Fedora, 10) updated by kevin
Message-ID: <20090421194952.1BC4210F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for powwow
kevin has set commit to Approved for provenpackager on powwow (Fedora 10)
kevin has set build to Approved for provenpackager on powwow (Fedora 10)
kevin has set checkout to Approved for provenpackager on powwow (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powwow



From pkgdb at fedoraproject.org  Tue Apr 21 19:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:49:52 +0000
Subject: [pkgdb] powwow (Fedora, 11) updated by kevin
Message-ID: <20090421194952.4997F10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for powwow
kevin has set commit to Approved for provenpackager on powwow (Fedora 11)
kevin has set build to Approved for provenpackager on powwow (Fedora 11)
kevin has set checkout to Approved for provenpackager on powwow (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powwow



From pkgdb at fedoraproject.org  Tue Apr 21 19:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:49:52 +0000
Subject: [pkgdb] powwow (Fedora, 9) updated by kevin
Message-ID: <20090421194952.40A9410F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for powwow
kevin has set commit to Approved for provenpackager on powwow (Fedora 9)
kevin has set build to Approved for provenpackager on powwow (Fedora 9)
kevin has set checkout to Approved for provenpackager on powwow (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powwow



From kevin at fedoraproject.org  Tue Apr 21 19:50:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:50:25 +0000 (UTC)
Subject: rpms/powwow - New directory
Message-ID: <20090421195025.292DD700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/powwow
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBn7698/rpms/powwow

Log Message:
Directory /cvs/pkgs/rpms/powwow added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:50:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:50:28 +0000 (UTC)
Subject: rpms/powwow/devel - New directory
Message-ID: <20090421195028.4EDDC7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBn7698/rpms/powwow/devel

Log Message:
Directory /cvs/pkgs/rpms/powwow/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 19:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:50:49 +0000
Subject: [pkgdb] mingw32-libglademm24 was added for sailer
Message-ID: <20090421195049.6331710F885@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-libglademm24 with summary MinGW Windows C++ wrapper for libglade
kevin has approved Package mingw32-libglademm24
kevin has added a Fedora devel branch for mingw32-libglademm24 with an owner of sailer
kevin has approved mingw32-libglademm24 in Fedora devel
kevin has approved Package mingw32-libglademm24
kevin has set commit to Approved for provenpackager on mingw32-libglademm24 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libglademm24 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libglademm24 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglademm24



From pkgdb at fedoraproject.org  Tue Apr 21 19:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:50:52 +0000
Subject: [pkgdb] mingw32-libglademm24 (Fedora, 10) updated by kevin
Message-ID: <20090421195052.9315310F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libglademm24
kevin has set commit to Approved for provenpackager on mingw32-libglademm24 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libglademm24 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libglademm24 (Fedora 10)
kevin approved watchbugzilla on mingw32-libglademm24 (Fedora 10) for rjones
kevin approved watchcommits on mingw32-libglademm24 (Fedora 10) for rjones
kevin approved commit on mingw32-libglademm24 (Fedora 10) for rjones
kevin approved build on mingw32-libglademm24 (Fedora 10) for rjones
kevin approved approveacls on mingw32-libglademm24 (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglademm24



From pkgdb at fedoraproject.org  Tue Apr 21 19:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:50:52 +0000
Subject: [pkgdb] mingw32-libglademm24 (Fedora, 11) updated by kevin
Message-ID: <20090421195052.99F7010F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-libglademm24
kevin has set commit to Approved for provenpackager on mingw32-libglademm24 (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-libglademm24 (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-libglademm24 (Fedora 11)
kevin approved watchbugzilla on mingw32-libglademm24 (Fedora 11) for rjones
kevin approved watchcommits on mingw32-libglademm24 (Fedora 11) for rjones
kevin approved commit on mingw32-libglademm24 (Fedora 11) for rjones
kevin approved build on mingw32-libglademm24 (Fedora 11) for rjones
kevin approved approveacls on mingw32-libglademm24 (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglademm24



From pkgdb at fedoraproject.org  Tue Apr 21 19:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:50:52 +0000
Subject: [pkgdb] mingw32-libglademm24 (Fedora, devel) updated by kevin
Message-ID: <20090421195052.A661410F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libglademm24 (Fedora devel) for rjones
kevin approved watchcommits on mingw32-libglademm24 (Fedora devel) for rjones
kevin approved commit on mingw32-libglademm24 (Fedora devel) for rjones
kevin approved build on mingw32-libglademm24 (Fedora devel) for rjones
kevin approved approveacls on mingw32-libglademm24 (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglademm24



From limb at fedoraproject.org  Tue Apr 21 19:51:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 19:51:35 +0000 (UTC)
Subject: rpms/wesnoth/devel wesnoth.spec,1.76,1.77
Message-ID: <20090421195135.65875700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7958

Modified Files:
	wesnoth.spec 
Log Message:
debuginfo fix.



Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- wesnoth.spec	20 Apr 2009 18:32:52 -0000	1.76
+++ wesnoth.spec	21 Apr 2009 19:51:33 -0000	1.77
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -91,6 +91,8 @@
 
 %build
 # Cannot use configure macro because noarch-redhat-linux is not recognized by the auto tools in the tarball
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir}  --mandir=%{_mandir} --infodir=%{_infodir} \
     --disable-dependency-tracking \
     --with-localedir=%{_datadir}/locale \
@@ -249,6 +251,9 @@
 #%endif
 
 %changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.6.1-2
+- Respect $RPM_OPT_FLAGS, BZ 496897.
+
 * Mon Apr 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.6.1-1
 - 1.6.1 maintenance release.
 



From kevin at fedoraproject.org  Tue Apr 21 19:51:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:51:51 +0000 (UTC)
Subject: rpms/powwow Makefile,NONE,1.1
Message-ID: <20090421195151.AD1F2700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/powwow
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBn7698/rpms/powwow

Added Files:
	Makefile 
Log Message:
Setup of module powwow


--- NEW FILE Makefile ---
# Top level Makefile for module powwow
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:51:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:51:54 +0000 (UTC)
Subject: rpms/powwow/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090421195154.377F9700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBn7698/rpms/powwow/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module powwow


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: powwow
# $Id: Makefile,v 1.1 2009/04/21 19:51:52 kevin Exp $
NAME := powwow
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From scop at fedoraproject.org  Tue Apr 21 19:52:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 21 Apr 2009 19:52:04 +0000 (UTC)
Subject: rpms/javasqlite/F-11 javasqlite.spec,1.12,1.13
Message-ID: <20090421195204.B9651700D6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8129

Modified Files:
	javasqlite.spec 
Log Message:
* Mon Apr 20 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-3
- Disable extension loading due to security concerns.



Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-11/javasqlite.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- javasqlite.spec	14 Apr 2009 11:20:27 -0000	1.12
+++ javasqlite.spec	21 Apr 2009 19:51:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           javasqlite
 Version:        20090409
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -9,11 +9,12 @@
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
 # jnipath: Fedora specific, no need to send upstream.
 Patch0:         %{name}-20081006-jnipath.patch
-# Sent upstream 20090412
+# Applied upstream in 20090420 release
 Patch1:         %{name}-20090409-check-features.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sqlite-devel
+# >= 3.4 for zeroblob stuff in %%check's test3
+BuildRequires:  sqlite-devel >= 3.4
 BuildRequires:  java-devel = 1:1.6.0
 BuildRequires:  java-devel = 1.5.0
 BuildRequires:  java-javadoc
@@ -47,8 +48,9 @@
 %build
 
 origpath="$PATH"
+# Note that --enable-load-extension has security concerns, it enables library
+# users to load arbitrary native code to the JVM bypassing its SecurityManager
 common_flags="
-    --enable-load-extension
     --with-jardir=%{_libdir}/%{name}
     --libdir=%{_libdir}/%{name}
 "
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-3
+- Disable extension loading due to security concerns.
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-2
 - Don't use parallel make, Java build doesn't appear parallel clean.
 



From scop at fedoraproject.org  Tue Apr 21 19:52:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 21 Apr 2009 19:52:36 +0000 (UTC)
Subject: rpms/javasqlite/devel .cvsignore, 1.6, 1.7 javasqlite.spec, 1.12,
	1.13 sources, 1.6, 1.7 javasqlite-20090409-check-features.patch,
	1.1, NONE
Message-ID: <20090421195236.D7A2F700D6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8512

Modified Files:
	.cvsignore javasqlite.spec sources 
Removed Files:
	javasqlite-20090409-check-features.patch 
Log Message:
* Tue Apr 21 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090420-1
- Update to 20090420, feature check patch applied upstream.

* Mon Apr 20 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-3
- Disable extension loading due to security concerns.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Apr 2009 08:21:29 -0000	1.6
+++ .cvsignore	21 Apr 2009 19:52:35 -0000	1.7
@@ -1 +1 @@
-javasqlite-20090409.tar.gz
+javasqlite-20090420.tar.gz


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- javasqlite.spec	14 Apr 2009 11:20:27 -0000	1.12
+++ javasqlite.spec	21 Apr 2009 19:52:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           javasqlite
-Version:        20090409
-Release:        2%{?dist}
+Version:        20090420
+Release:        1%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -9,11 +9,10 @@
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
 # jnipath: Fedora specific, no need to send upstream.
 Patch0:         %{name}-20081006-jnipath.patch
-# Sent upstream 20090412
-Patch1:         %{name}-20090409-check-features.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sqlite-devel
+# >= 3.4 for zeroblob stuff in %%check's test3
+BuildRequires:  sqlite-devel >= 3.4
 BuildRequires:  java-devel = 1:1.6.0
 BuildRequires:  java-devel = 1.5.0
 BuildRequires:  java-javadoc
@@ -39,7 +38,6 @@
 %prep
 %setup -q
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
-%patch1 -p1
 sed -i -e 's/\r//g' doc/ajhowto.txt
 f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
@@ -47,8 +45,9 @@
 %build
 
 origpath="$PATH"
+# Note that --enable-load-extension has security concerns, it enables library
+# users to load arbitrary native code to the JVM bypassing its SecurityManager
 common_flags="
-    --enable-load-extension
     --with-jardir=%{_libdir}/%{name}
     --libdir=%{_libdir}/%{name}
 "
@@ -104,6 +103,12 @@
 
 
 %changelog
+* Tue Apr 21 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090420-1
+- Update to 20090420, feature check patch applied upstream.
+
+* Mon Apr 20 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-3
+- Disable extension loading due to security concerns.
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20090409-2
 - Don't use parallel make, Java build doesn't appear parallel clean.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Apr 2009 08:21:30 -0000	1.6
+++ sources	21 Apr 2009 19:52:35 -0000	1.7
@@ -1 +1 @@
-fab26fee79be07fe3097b39ead7046d4  javasqlite-20090409.tar.gz
+4d5b06f39c8bac8eed85a1af0da8e324  javasqlite-20090420.tar.gz


--- javasqlite-20090409-check-features.patch DELETED ---



From kevin at fedoraproject.org  Tue Apr 21 19:53:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:53:16 +0000 (UTC)
Subject: rpms/mingw32-libglademm24 - New directory
Message-ID: <20090421195316.26716700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglademm24
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAi8905/rpms/mingw32-libglademm24

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libglademm24 added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:53:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:53:17 +0000 (UTC)
Subject: rpms/mingw32-libglademm24/devel - New directory
Message-ID: <20090421195317.CA221700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglademm24/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAi8905/rpms/mingw32-libglademm24/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libglademm24/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 19:53:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:53:18 +0000
Subject: [pkgdb] mingw32-gtkmm24 was added for sailer
Message-ID: <20090421195318.EE50610F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-gtkmm24 with summary MinGW Windows C++ interface for GTK2 (a GUI library for X)
kevin has approved Package mingw32-gtkmm24
kevin has added a Fedora devel branch for mingw32-gtkmm24 with an owner of sailer
kevin has approved mingw32-gtkmm24 in Fedora devel
kevin has approved Package mingw32-gtkmm24
kevin has set commit to Approved for provenpackager on mingw32-gtkmm24 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-gtkmm24 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-gtkmm24 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkmm24



From pkgdb at fedoraproject.org  Tue Apr 21 19:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:53:20 +0000
Subject: [pkgdb] mingw32-gtkmm24 (Fedora, 10) updated by kevin
Message-ID: <20090421195321.06C5C10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-gtkmm24
kevin has set commit to Approved for provenpackager on mingw32-gtkmm24 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-gtkmm24 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-gtkmm24 (Fedora 10)
kevin approved watchbugzilla on mingw32-gtkmm24 (Fedora 10) for rjones
kevin approved watchcommits on mingw32-gtkmm24 (Fedora 10) for rjones
kevin approved commit on mingw32-gtkmm24 (Fedora 10) for rjones
kevin approved build on mingw32-gtkmm24 (Fedora 10) for rjones
kevin approved approveacls on mingw32-gtkmm24 (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkmm24



From pkgdb at fedoraproject.org  Tue Apr 21 19:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:53:20 +0000
Subject: [pkgdb] mingw32-gtkmm24 (Fedora, 11) updated by kevin
Message-ID: <20090421195321.ABED510F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-gtkmm24
kevin has set commit to Approved for provenpackager on mingw32-gtkmm24 (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-gtkmm24 (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-gtkmm24 (Fedora 11)
kevin approved watchbugzilla on mingw32-gtkmm24 (Fedora 11) for rjones
kevin approved watchcommits on mingw32-gtkmm24 (Fedora 11) for rjones
kevin approved commit on mingw32-gtkmm24 (Fedora 11) for rjones
kevin approved build on mingw32-gtkmm24 (Fedora 11) for rjones
kevin approved approveacls on mingw32-gtkmm24 (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkmm24



From pkgdb at fedoraproject.org  Tue Apr 21 19:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:53:20 +0000
Subject: [pkgdb] mingw32-gtkmm24 (Fedora, devel) updated by kevin
Message-ID: <20090421195321.C7FBA10F896@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-gtkmm24 (Fedora devel) for rjones
kevin approved watchcommits on mingw32-gtkmm24 (Fedora devel) for rjones
kevin approved commit on mingw32-gtkmm24 (Fedora devel) for rjones
kevin approved build on mingw32-gtkmm24 (Fedora devel) for rjones
kevin approved approveacls on mingw32-gtkmm24 (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkmm24



From kevin at fedoraproject.org  Tue Apr 21 19:54:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:54:00 +0000 (UTC)
Subject: rpms/mingw32-libglademm24 Makefile,NONE,1.1
Message-ID: <20090421195400.B3E01700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglademm24
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAi8905/rpms/mingw32-libglademm24

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libglademm24


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libglademm24
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:54:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:54:01 +0000 (UTC)
Subject: rpms/mingw32-libglademm24/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421195401.292DC70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libglademm24/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAi8905/rpms/mingw32-libglademm24/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libglademm24


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libglademm24
# $Id: Makefile,v 1.1 2009/04/21 19:54:00 kevin Exp $
NAME := mingw32-libglademm24
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Apr 21 19:55:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:55:07 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24 - New directory
Message-ID: <20090421195507.E5CE3700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkmm24
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9616/rpms/mingw32-gtkmm24

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gtkmm24 added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:55:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:55:09 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel - New directory
Message-ID: <20090421195509.3142C700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9616/rpms/mingw32-gtkmm24/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gtkmm24/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:56:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:56:17 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24 Makefile,NONE,1.1
Message-ID: <20090421195617.15E6D700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkmm24
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9616/rpms/mingw32-gtkmm24

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-gtkmm24


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-gtkmm24
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:56:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:56:20 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421195620.2687A700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9616/rpms/mingw32-gtkmm24/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-gtkmm24


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-gtkmm24
# $Id: Makefile,v 1.1 2009/04/21 19:56:17 kevin Exp $
NAME := mingw32-gtkmm24
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 21 19:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:56:51 +0000
Subject: [pkgdb] perl-Test-Most was added for mmaslano
Message-ID: <20090421195651.62C8C10F884@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Test-Most with summary Most commonly needed test functions and features
kevin has approved Package perl-Test-Most
kevin has added a Fedora devel branch for perl-Test-Most with an owner of mmaslano
kevin has approved perl-Test-Most in Fedora devel
kevin has approved Package perl-Test-Most
kevin has set commit to Approved for provenpackager on perl-Test-Most (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Test-Most (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Test-Most (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Most



From pkgdb at fedoraproject.org  Tue Apr 21 19:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:56:53 +0000
Subject: [pkgdb] perl-Test-Most (Fedora, devel) updated by kevin
Message-ID: <20090421195653.5535F10F88B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-Most (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-Most (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Most



From pkgdb at fedoraproject.org  Tue Apr 21 19:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:56:53 +0000
Subject: [pkgdb] perl-Test-Most (Fedora, 11) updated by kevin
Message-ID: <20090421195653.65F7A10F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Test-Most
kevin has set commit to Approved for provenpackager on perl-Test-Most (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Test-Most (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Test-Most (Fedora 11)
kevin approved watchbugzilla on perl-Test-Most (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Test-Most (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Most



From kevin at fedoraproject.org  Tue Apr 21 19:57:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:57:44 +0000 (UTC)
Subject: rpms/perl-Test-Most/devel - New directory
Message-ID: <20090421195744.C6CFA700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Most/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10700/rpms/perl-Test-Most/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Most/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 19:57:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:57:43 +0000 (UTC)
Subject: rpms/perl-Test-Most - New directory
Message-ID: <20090421195743.5922D700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Most
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10700/rpms/perl-Test-Most

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Most added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 19:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:58:01 +0000
Subject: [pkgdb] gloox was added for hubbitus
Message-ID: <20090421195801.E9A6310F884@bastion2.fedora.phx.redhat.com>

kevin has added Package gloox with summary A rock-solid, full-featured Jabber/XMPP client library
kevin has approved Package gloox
kevin has added a Fedora devel branch for gloox with an owner of hubbitus
kevin has approved gloox in Fedora devel
kevin has approved Package gloox
kevin has set commit to Approved for provenpackager on gloox (Fedora devel)
kevin has set build to Approved for provenpackager on gloox (Fedora devel)
kevin has set checkout to Approved for provenpackager on gloox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gloox



From pkgdb at fedoraproject.org  Tue Apr 21 19:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:58:04 +0000
Subject: [pkgdb] gloox (Fedora, 10) updated by kevin
Message-ID: <20090421195804.20FE510F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gloox
kevin has set commit to Approved for provenpackager on gloox (Fedora 10)
kevin has set build to Approved for provenpackager on gloox (Fedora 10)
kevin has set checkout to Approved for provenpackager on gloox (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gloox



From pkgdb at fedoraproject.org  Tue Apr 21 19:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:58:04 +0000
Subject: [pkgdb] gloox (Fedora, 9) updated by kevin
Message-ID: <20090421195804.780CB10F843@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gloox
kevin has set commit to Approved for provenpackager on gloox (Fedora 9)
kevin has set build to Approved for provenpackager on gloox (Fedora 9)
kevin has set checkout to Approved for provenpackager on gloox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gloox



From pkgdb at fedoraproject.org  Tue Apr 21 19:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 19:58:04 +0000
Subject: [pkgdb] gloox (Fedora, 11) updated by kevin
Message-ID: <20090421195804.E57C110F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gloox
kevin has set commit to Approved for provenpackager on gloox (Fedora 11)
kevin has set build to Approved for provenpackager on gloox (Fedora 11)
kevin has set checkout to Approved for provenpackager on gloox (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gloox



From kevin at fedoraproject.org  Tue Apr 21 19:58:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:58:39 +0000 (UTC)
Subject: rpms/perl-Test-Most Makefile,NONE,1.1
Message-ID: <20090421195839.49B18700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Most
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10700/rpms/perl-Test-Most

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-Most


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Most
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 19:58:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 19:58:40 +0000 (UTC)
Subject: rpms/perl-Test-Most/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421195840.9495B700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Most/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10700/rpms/perl-Test-Most/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Most


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-Most
# $Id: Makefile,v 1.1 2009/04/21 19:58:40 kevin Exp $
NAME := perl-Test-Most
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Apr 21 20:01:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:01:02 +0000 (UTC)
Subject: rpms/gloox - New directory
Message-ID: <20090421200102.7D02A700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gloox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse11923/rpms/gloox

Log Message:
Directory /cvs/pkgs/rpms/gloox added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:01:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:01:04 +0000 (UTC)
Subject: rpms/gloox/devel - New directory
Message-ID: <20090421200104.47F6D700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gloox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse11923/rpms/gloox/devel

Log Message:
Directory /cvs/pkgs/rpms/gloox/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:02:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:02:09 +0000 (UTC)
Subject: rpms/gloox Makefile,NONE,1.1
Message-ID: <20090421200209.60005700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gloox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse11923/rpms/gloox

Added Files:
	Makefile 
Log Message:
Setup of module gloox


--- NEW FILE Makefile ---
# Top level Makefile for module gloox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:02:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:02:12 +0000 (UTC)
Subject: rpms/gloox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090421200212.0F9E3700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gloox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse11923/rpms/gloox/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gloox


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gloox
# $Id: Makefile,v 1.1 2009/04/21 20:02:10 kevin Exp $
NAME := gloox
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 21 20:04:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:04:45 +0000
Subject: [pkgdb] python-arm4 was added for grandcross
Message-ID: <20090421200445.E42B710F884@bastion2.fedora.phx.redhat.com>

kevin has added Package python-arm4 with summary Python language bindings for Application Response Measurement V4.0
kevin has approved Package python-arm4
kevin has added a Fedora devel branch for python-arm4 with an owner of grandcross
kevin has approved python-arm4 in Fedora devel
kevin has approved Package python-arm4
kevin has set commit to Approved for provenpackager on python-arm4 (Fedora devel)
kevin has set build to Approved for provenpackager on python-arm4 (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-arm4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-arm4



From pkgdb at fedoraproject.org  Tue Apr 21 20:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:04:47 +0000
Subject: [pkgdb] python-arm4 (Fedora, 10) updated by kevin
Message-ID: <20090421200447.600BC10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-arm4
kevin has set commit to Approved for provenpackager on python-arm4 (Fedora 10)
kevin has set build to Approved for provenpackager on python-arm4 (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-arm4 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-arm4



From pkgdb at fedoraproject.org  Tue Apr 21 20:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:04:47 +0000
Subject: [pkgdb] python-arm4 (Fedora, 11) updated by kevin
Message-ID: <20090421200447.677C110F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-arm4
kevin has set commit to Approved for provenpackager on python-arm4 (Fedora 11)
kevin has set build to Approved for provenpackager on python-arm4 (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-arm4 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-arm4



From kevin at fedoraproject.org  Tue Apr 21 20:06:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:06:11 +0000 (UTC)
Subject: rpms/python-arm4 - New directory
Message-ID: <20090421200611.60EA2700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-arm4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13772/rpms/python-arm4

Log Message:
Directory /cvs/pkgs/rpms/python-arm4 added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:06:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:06:12 +0000 (UTC)
Subject: rpms/python-arm4/devel - New directory
Message-ID: <20090421200612.30E597013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13772/rpms/python-arm4/devel

Log Message:
Directory /cvs/pkgs/rpms/python-arm4/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 20:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:06:27 +0000
Subject: [pkgdb] python-hash_ring was added for silas
Message-ID: <20090421200627.8C17A10F884@bastion2.fedora.phx.redhat.com>

kevin has added Package python-hash_ring with summary Python implementation of consistent hashing
kevin has approved Package python-hash_ring
kevin has added a Fedora devel branch for python-hash_ring with an owner of silas
kevin has approved python-hash_ring in Fedora devel
kevin has approved Package python-hash_ring
kevin has set commit to Approved for provenpackager on python-hash_ring (Fedora devel)
kevin has set build to Approved for provenpackager on python-hash_ring (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-hash_ring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Tue Apr 21 20:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:06:46 +0000
Subject: [pkgdb] mingw32-libglademm24: sailer has requested watchbugzilla
Message-ID: <20090421200646.C53BF10F878@bastion2.fedora.phx.redhat.com>

sailer has requested the watchbugzilla acl on mingw32-libglademm24 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglademm24



From pkgdb at fedoraproject.org  Tue Apr 21 20:06:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:06:53 +0000
Subject: [pkgdb] mingw32-libglademm24: sailer has given up watchbugzilla
Message-ID: <20090421200653.1333C10F88A@bastion2.fedora.phx.redhat.com>

sailer has given up the watchbugzilla acl on mingw32-libglademm24 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libglademm24



From kevin at fedoraproject.org  Tue Apr 21 20:07:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:07:20 +0000 (UTC)
Subject: rpms/python-arm4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421200720.90B2B700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13772/rpms/python-arm4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-arm4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-arm4
# $Id: Makefile,v 1.1 2009/04/21 20:07:18 kevin Exp $
NAME := python-arm4
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Apr 21 20:07:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:07:16 +0000 (UTC)
Subject: rpms/python-arm4 Makefile,NONE,1.1
Message-ID: <20090421200716.2EBB8700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-arm4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13772/rpms/python-arm4

Added Files:
	Makefile 
Log Message:
Setup of module python-arm4


--- NEW FILE Makefile ---
# Top level Makefile for module python-arm4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:08:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:08:23 +0000 (UTC)
Subject: rpms/python-hash_ring - New directory
Message-ID: <20090421200823.BC388700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-hash_ring
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd14749/rpms/python-hash_ring

Log Message:
Directory /cvs/pkgs/rpms/python-hash_ring added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:08:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:08:26 +0000 (UTC)
Subject: rpms/python-hash_ring/devel - New directory
Message-ID: <20090421200826.139FA700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-hash_ring/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd14749/rpms/python-hash_ring/devel

Log Message:
Directory /cvs/pkgs/rpms/python-hash_ring/devel added to the repository




From kalev at fedoraproject.org  Tue Apr 21 20:08:51 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue, 21 Apr 2009 20:08:51 +0000 (UTC)
Subject: rpms/powwow/devel import.log, NONE, 1.1 powwow.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421200851.14BE6700D6@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14851/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log powwow.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
powwow-1_2_14-3_fc11:HEAD:powwow-1.2.14-3.fc11.src.rpm:1240344749


--- NEW FILE powwow.spec ---
Name:           powwow
Version:        1.2.14
Release:        3%{?dist}
Summary:        A console MUD client

Group:          Applications/Internet
License:        GPLv2+
URL:            http://hoopajoo.net/projects/powwow.html
Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ncurses-devel

%description
Powwow is a powerful console MUD client that supports triggers, aliases,
multiple connections, and more. It is primarily designed for DikuMUDs, but
nothing prevents its use for other types of MUDs. This client is also
extensible through a plugin interface.


%package devel
Summary:        Development files for powwow
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The powwow-devel package contains the headers files and developer docs
for developing applications which use powwow plugin interface.


%prep
%setup -q

# Convert to utf-8
for file in README powwow.doc; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the documentation here. We install it with %doc instead to
# the standard directory.
rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc

# Rename / delete executables to avoid possible name clashes and to reflect
# changes in upcoming powwow release.
# The following lines can be removed after powwow-1.2.15 has been released.
mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay}
ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii
mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc}
rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# COPYING can not be included in %doc because the app
# needs it at runtime.
%doc ChangeLog Config.demo powwow.doc README
%{_datadir}/powwow/
%{_bindir}/*
%{_mandir}/man6/*


%files devel
%defattr(-,root,root,-)
%doc Hacking README.modules TODO
%{_includedir}/powwow/


%changelog
* Mon Apr 20 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-3
- Rework powwow-devel description.
- Rename movie_play and muc, remove catrw and follow to avoid
  possible name clashes and to reflect upstream changes.

* Thu Apr 16 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-2
- Remove COPYING from %%doc, because it is needed at runtime.

* Wed Apr 15 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-1
- Update to powwow 1.2.14.

* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-2
- Fix the package to own all the directories it creates.
- Move development-related docs to devel subpackage.

* Sun Mar 22 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:51:52 -0000	1.1
+++ .cvsignore	21 Apr 2009 20:08:49 -0000	1.2
@@ -0,0 +1 @@
+powwow-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:51:52 -0000	1.1
+++ sources	21 Apr 2009 20:08:49 -0000	1.2
@@ -0,0 +1 @@
+5c1d600ca8e577dc620c1c15c01cfdf5  powwow-1.2.14.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 21 20:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:09:05 +0000
Subject: [pkgdb] pdfposter was added for fab
Message-ID: <20090421200905.C7E5610F884@bastion2.fedora.phx.redhat.com>

kevin has added Package pdfposter with summary Scale and tile PDF images/pages to print on multiple pages
kevin has approved Package pdfposter
kevin has added a Fedora devel branch for pdfposter with an owner of fab
kevin has approved pdfposter in Fedora devel
kevin has approved Package pdfposter
kevin has set commit to Approved for provenpackager on pdfposter (Fedora devel)
kevin has set build to Approved for provenpackager on pdfposter (Fedora devel)
kevin has set checkout to Approved for provenpackager on pdfposter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdfposter



From pkgdb at fedoraproject.org  Tue Apr 21 20:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:09:08 +0000
Subject: [pkgdb] pdfposter (Fedora, 9) updated by kevin
Message-ID: <20090421200908.448D910F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pdfposter
kevin has set commit to Approved for provenpackager on pdfposter (Fedora 9)
kevin has set build to Approved for provenpackager on pdfposter (Fedora 9)
kevin has set checkout to Approved for provenpackager on pdfposter (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdfposter



From pkgdb at fedoraproject.org  Tue Apr 21 20:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:09:08 +0000
Subject: [pkgdb] pdfposter (Fedora, 10) updated by kevin
Message-ID: <20090421200908.5115510F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pdfposter
kevin has set commit to Approved for provenpackager on pdfposter (Fedora 10)
kevin has set build to Approved for provenpackager on pdfposter (Fedora 10)
kevin has set checkout to Approved for provenpackager on pdfposter (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdfposter



From kevin at fedoraproject.org  Tue Apr 21 20:09:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:09:24 +0000 (UTC)
Subject: rpms/python-hash_ring Makefile,NONE,1.1
Message-ID: <20090421200924.33327700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-hash_ring
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd14749/rpms/python-hash_ring

Added Files:
	Makefile 
Log Message:
Setup of module python-hash_ring


--- NEW FILE Makefile ---
# Top level Makefile for module python-hash_ring
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:09:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:09:25 +0000 (UTC)
Subject: rpms/python-hash_ring/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421200925.4A547700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-hash_ring/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd14749/rpms/python-hash_ring/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-hash_ring


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-hash_ring
# $Id: Makefile,v 1.1 2009/04/21 20:09:24 kevin Exp $
NAME := python-hash_ring
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 21 20:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:09:08 +0000
Subject: [pkgdb] pdfposter (Fedora, 11) updated by kevin
Message-ID: <20090421200908.6BCBB10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pdfposter
kevin has set commit to Approved for provenpackager on pdfposter (Fedora 11)
kevin has set build to Approved for provenpackager on pdfposter (Fedora 11)
kevin has set checkout to Approved for provenpackager on pdfposter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pdfposter



From caolanm at fedoraproject.org  Tue Apr 21 20:10:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 20:10:31 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.vcl101.patch, 1.1,
	1.2 openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch,
	1.1, NONE
Message-ID: <20090421201031.31EBD70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15396/F-11

Modified Files:
	workspace.vcl101.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch 
Log Message:
merge patch into accepted upstream workspace

workspace.vcl101.patch:

Index: workspace.vcl101.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.vcl101.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl101.patch	20 Apr 2009 21:38:11 -0000	1.1
+++ workspace.vcl101.patch	21 Apr 2009 20:10:00 -0000	1.2
@@ -36,3 +36,86 @@
      }
  
      nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;
+diff -ru vcl/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
+--- openoffice.org.orig/vcl/unx/gtk/app/gtkdata.cxx	2009-04-18 14:24:28.000000000 +0100
++++ openoffice.org/vcl/unx/gtk/app/gtkdata.cxx	2009-04-18 15:37:36.000000000 +0100
+@@ -126,8 +126,14 @@
+     pDisp->screenSizeChanged( pScreen );
+ }
+ 
++void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
++{
++    GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
++    pDisp->monitorsChanged( pScreen );
+ }
+ 
++}
++
+ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
+                                                GdkEvent*,
+                                                gpointer data )
+@@ -192,6 +198,8 @@
+             {
+                 rSD.m_aSize = Size( gdk_screen_get_width( pScreen ),
+                                     gdk_screen_get_height( pScreen ) );
++                if( ! m_aFrames.empty() )
++                    m_aFrames.front()->CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
+             }
+         }
+         else
+@@ -201,6 +209,33 @@
+     }
+ }
+ 
++void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
++{
++    if( pScreen )
++    {
++        int nScreen = gdk_screen_get_number( pScreen );
++        if( nScreen == m_nDefaultScreen ) //To-Do, make m_aXineramaScreens a per-screen thing ?
++        {
++            gint nMonitors = gdk_screen_get_n_monitors(pScreen);
++            m_aXineramaScreens = std::vector<Rectangle>();
++            for (gint i = 0; i < nMonitors; ++i)
++            {
++                GdkRectangle dest;
++                gdk_screen_get_monitor_geometry(pScreen, i, &dest);
++                m_aXineramaScreens.push_back( Rectangle( Point(dest.x,
++                    dest.y ), Size( dest.width, dest.height ) ) );
++            }
++            m_bXinerama = m_aXineramaScreens.size() > 1;
++            if( ! m_aFrames.empty() )
++                m_aFrames.front()->CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
++        }
++        else
++        {
++            DBG_ERROR( "monitors for non-default screen changed, extend-me" );
++        }
++    }
++}
++
+ void GtkSalDisplay::initScreen( int nScreen ) const
+ {
+     if( nScreen < 0 || nScreen >= static_cast<int>(m_aScreens.size()) )
+@@ -626,7 +661,10 @@
+     {
+         GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
+         if( pScreen )
++        {
+             g_signal_connect( G_OBJECT(pScreen), "size-changed", G_CALLBACK(signalScreenSizeChanged), m_pGtkSalDisplay );
++            g_signal_connect( G_OBJECT(pScreen), "monitors-changed", G_CALLBACK(signalMonitorsChanged), m_pGtkSalDisplay );
++        }
+     }
+ }
+ 
+diff -ru vcl/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx
+--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:24:28.000000000 +0100
++++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:32:42.000000000 +0100
+@@ -85,6 +85,7 @@
+     void startupNotificationCompleted() { m_bStartupCompleted = true; }
+     
+     void screenSizeChanged( GdkScreen* );
++    void monitorsChanged( GdkScreen* );
+ };
+ 
+ 


--- openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch DELETED ---



From caolanm at fedoraproject.org  Tue Apr 21 20:10:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 21 Apr 2009 20:10:33 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1889,
	1.1890 workspace.vcl101.patch, 1.1,
	1.2 openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch,
	1.1, NONE
Message-ID: <20090421201033.A86EA70137@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15396/devel

Modified Files:
	openoffice.org.spec workspace.vcl101.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch 
Log Message:
merge patch into accepted upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1889
retrieving revision 1.1890
diff -u -r1.1889 -r1.1890
--- openoffice.org.spec	21 Apr 2009 19:48:32 -0000	1.1889
+++ openoffice.org.spec	21 Apr 2009 20:10:01 -0000	1.1890
@@ -135,10 +135,9 @@
 Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch61: workspace.vcl101.patch
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
-Patch64: workspace.slideshow1.patch
-Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch66: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
+Patch63: workspace.slideshow1.patch
+Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch65: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,10 +1631,9 @@
 %patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 %patch61 -p1 -b .workspace.vcl101.patch
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
-%patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
-%patch64 -p2 -b .workspace.slideshow1.patch
-%patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch66 -p0 -b .ooo101159.ww8.export.commentfields.patch
+%patch63 -p2 -b .workspace.slideshow1.patch
+%patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch65 -p0 -b .ooo101159.ww8.export.commentfields.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl101.patch:

Index: workspace.vcl101.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl101.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl101.patch	20 Apr 2009 21:38:12 -0000	1.1
+++ workspace.vcl101.patch	21 Apr 2009 20:10:01 -0000	1.2
@@ -36,3 +36,86 @@
      }
  
      nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;
+diff -ru vcl/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
+--- openoffice.org.orig/vcl/unx/gtk/app/gtkdata.cxx	2009-04-18 14:24:28.000000000 +0100
++++ openoffice.org/vcl/unx/gtk/app/gtkdata.cxx	2009-04-18 15:37:36.000000000 +0100
+@@ -126,8 +126,14 @@
+     pDisp->screenSizeChanged( pScreen );
+ }
+ 
++void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
++{
++    GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
++    pDisp->monitorsChanged( pScreen );
+ }
+ 
++}
++
+ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
+                                                GdkEvent*,
+                                                gpointer data )
+@@ -192,6 +198,8 @@
+             {
+                 rSD.m_aSize = Size( gdk_screen_get_width( pScreen ),
+                                     gdk_screen_get_height( pScreen ) );
++                if( ! m_aFrames.empty() )
++                    m_aFrames.front()->CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
+             }
+         }
+         else
+@@ -201,6 +209,33 @@
+     }
+ }
+ 
++void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
++{
++    if( pScreen )
++    {
++        int nScreen = gdk_screen_get_number( pScreen );
++        if( nScreen == m_nDefaultScreen ) //To-Do, make m_aXineramaScreens a per-screen thing ?
++        {
++            gint nMonitors = gdk_screen_get_n_monitors(pScreen);
++            m_aXineramaScreens = std::vector<Rectangle>();
++            for (gint i = 0; i < nMonitors; ++i)
++            {
++                GdkRectangle dest;
++                gdk_screen_get_monitor_geometry(pScreen, i, &dest);
++                m_aXineramaScreens.push_back( Rectangle( Point(dest.x,
++                    dest.y ), Size( dest.width, dest.height ) ) );
++            }
++            m_bXinerama = m_aXineramaScreens.size() > 1;
++            if( ! m_aFrames.empty() )
++                m_aFrames.front()->CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
++        }
++        else
++        {
++            DBG_ERROR( "monitors for non-default screen changed, extend-me" );
++        }
++    }
++}
++
+ void GtkSalDisplay::initScreen( int nScreen ) const
+ {
+     if( nScreen < 0 || nScreen >= static_cast<int>(m_aScreens.size()) )
+@@ -626,7 +661,10 @@
+     {
+         GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
+         if( pScreen )
++        {
+             g_signal_connect( G_OBJECT(pScreen), "size-changed", G_CALLBACK(signalScreenSizeChanged), m_pGtkSalDisplay );
++            g_signal_connect( G_OBJECT(pScreen), "monitors-changed", G_CALLBACK(signalMonitorsChanged), m_pGtkSalDisplay );
++        }
+     }
+ }
+ 
+diff -ru vcl/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx
+--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:24:28.000000000 +0100
++++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkdata.hxx	2009-04-18 14:32:42.000000000 +0100
+@@ -85,6 +85,7 @@
+     void startupNotificationCompleted() { m_bStartupCompleted = true; }
+     
+     void screenSizeChanged( GdkScreen* );
++    void monitorsChanged( GdkScreen* );
+ };
+ 
+ 


--- openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch DELETED ---



From kevin at fedoraproject.org  Tue Apr 21 20:10:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:10:58 +0000 (UTC)
Subject: rpms/pdfposter - New directory
Message-ID: <20090421201058.4FAB770137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdfposter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15849/rpms/pdfposter

Log Message:
Directory /cvs/pkgs/rpms/pdfposter added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:10:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:10:58 +0000 (UTC)
Subject: rpms/pdfposter/devel - New directory
Message-ID: <20090421201058.BA1B070137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdfposter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15849/rpms/pdfposter/devel

Log Message:
Directory /cvs/pkgs/rpms/pdfposter/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 20:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:11:24 +0000
Subject: [pkgdb] sakura was added for cwickert
Message-ID: <20090421201124.D002010F884@bastion2.fedora.phx.redhat.com>

kevin has added Package sakura with summary Terminal emulator based on GTK and VTE
kevin has approved Package sakura
kevin has added a Fedora devel branch for sakura with an owner of cwickert
kevin has approved sakura in Fedora devel
kevin has approved Package sakura
kevin has set commit to Approved for provenpackager on sakura (Fedora devel)
kevin has set build to Approved for provenpackager on sakura (Fedora devel)
kevin has set checkout to Approved for provenpackager on sakura (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sakura



From pkgdb at fedoraproject.org  Tue Apr 21 20:11:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:11:26 +0000
Subject: [pkgdb] sakura (Fedora, 10) updated by kevin
Message-ID: <20090421201126.94A4410F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sakura
kevin has set commit to Approved for provenpackager on sakura (Fedora 10)
kevin has set build to Approved for provenpackager on sakura (Fedora 10)
kevin has set checkout to Approved for provenpackager on sakura (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sakura



From pkgdb at fedoraproject.org  Tue Apr 21 20:11:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:11:26 +0000
Subject: [pkgdb] sakura (Fedora, 9) updated by kevin
Message-ID: <20090421201126.9D6DB10F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sakura
kevin has set commit to Approved for provenpackager on sakura (Fedora 9)
kevin has set build to Approved for provenpackager on sakura (Fedora 9)
kevin has set checkout to Approved for provenpackager on sakura (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sakura



From dwalsh at fedoraproject.org  Tue Apr 21 20:11:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 21 Apr 2009 20:11:29 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.96,
	1.97 selinux-policy.spec, 1.831, 1.832
Message-ID: <20090421201129.B4EFA70137@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15821

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-11
- Allow nsplugin unix_read and write on users shm and sem
- Allow sysadm_t to execute su


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- policy-20090105.patch	21 Apr 2009 18:42:03 -0000	1.96
+++ policy-20090105.patch	21 Apr 2009 20:10:57 -0000	1.97
@@ -1524,7 +1524,7 @@
  application_executable_file(sudo_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.6.12/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/su.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/su.if	2009-04-21 15:49:55.000000000 -0400
 @@ -90,15 +90,6 @@
  
  	miscfiles_read_localization($1_su_t)
@@ -2777,8 +2777,8 @@
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.12/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.if	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,272 @@
++++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.if	2009-04-21 15:54:32.000000000 -0400
+@@ -0,0 +1,274 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2889,6 +2889,8 @@
 +	dontaudit nsplugin_config_t $2:fifo_file rw_fifo_file_perms;
 +	allow nsplugin_t $2:unix_stream_socket connectto;
 +	dontaudit nsplugin_t $2:process ptrace;
++	allow nsplugin_t $2:sem { unix_read unix_write };
++	allow nsplugin_t $2:shm { unix_read unix_write };
 +
 +	allow $2 nsplugin_t:process { getattr ptrace signal_perms };
 +	allow $2 nsplugin_t:unix_stream_socket connectto;
@@ -5079,7 +5081,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-21 16:08:44.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5150,7 +5152,7 @@
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +172,43 @@
+@@ -153,3 +172,45 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5164,7 +5166,9 @@
 +	cron_dontaudit_write_system_job_tmp_files(domain)
 +	cron_rw_pipes(domain)
 +	cron_rw_system_job_pipes(domain)
++
 +ifdef(`hide_broken_symptoms',`
++	fs_list_inotifyfs(domain)
 +	allow domain domain:key { link search };
 +')
 +')
@@ -6319,7 +6323,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-21 15:50:14.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6367,15 +6371,16 @@
  	certwatch_run(sysadm_t, sysadm_r)
  ')
  
-@@ -127,18 +114,10 @@
+@@ -127,7 +114,7 @@
  ')
  
  optional_policy(`
 -	cron_admin_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	cvs_exec(sysadm_t)
++	su_exec(sysadm_t)
+ ')
+ 
+ optional_policy(`
+@@ -135,10 +122,6 @@
  ')
  
  optional_policy(`
@@ -6386,7 +6391,7 @@
  	dcc_run_cdcc(sysadm_t, sysadm_r)
  	dcc_run_client(sysadm_t, sysadm_r)
  	dcc_run_dbclean(sysadm_t, sysadm_r)
-@@ -166,10 +145,6 @@
+@@ -166,10 +149,6 @@
  ')
  
  optional_policy(`
@@ -6397,7 +6402,7 @@
  	firstboot_run(sysadm_t, sysadm_r)
  ')
  
-@@ -178,22 +153,6 @@
+@@ -178,22 +157,6 @@
  ')
  
  optional_policy(`
@@ -6420,7 +6425,7 @@
  	hostname_run(sysadm_t, sysadm_r)
  ')
  
-@@ -212,11 +171,7 @@
+@@ -212,11 +175,7 @@
  ')
  
  optional_policy(`
@@ -6433,7 +6438,7 @@
  ')
  
  optional_policy(`
-@@ -228,10 +183,6 @@
+@@ -228,10 +187,6 @@
  ')
  
  optional_policy(`
@@ -6444,7 +6449,7 @@
  	logrotate_run(sysadm_t, sysadm_r)
  ')
  
-@@ -255,14 +206,6 @@
+@@ -255,14 +210,6 @@
  ')
  
  optional_policy(`
@@ -6459,7 +6464,7 @@
  	mta_role(sysadm_r, sysadm_t)
  ')
  
-@@ -290,11 +233,6 @@
+@@ -290,11 +237,6 @@
  ')
  
  optional_policy(`
@@ -6471,7 +6476,7 @@
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,10 +246,6 @@
+@@ -308,10 +250,6 @@
  ')
  
  optional_policy(`
@@ -6482,7 +6487,7 @@
  	quota_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,22 +254,10 @@
+@@ -320,22 +258,10 @@
  ')
  
  optional_policy(`
@@ -6505,7 +6510,7 @@
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +267,6 @@
+@@ -345,10 +271,6 @@
  ')
  
  optional_policy(`
@@ -6516,7 +6521,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +276,15 @@
+@@ -358,35 +280,15 @@
  ')
  
  optional_policy(`
@@ -6552,7 +6557,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +292,10 @@
+@@ -394,18 +296,10 @@
  ')
  
  optional_policy(`
@@ -6571,7 +6576,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +308,12 @@
+@@ -418,20 +312,12 @@
  ')
  
  optional_policy(`
@@ -6592,7 +6597,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +322,5 @@
+@@ -440,13 +326,5 @@
  ')
  
  optional_policy(`
@@ -10688,7 +10693,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.12/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-21 09:44:30.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-21 16:03:54.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10919,7 +10924,15 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -370,7 +434,8 @@
+@@ -345,6 +409,7 @@
+ fs_getattr_all_symlinks(system_cronjob_t)
+ fs_getattr_all_pipes(system_cronjob_t)
+ fs_getattr_all_sockets(system_cronjob_t)
++fs_list_inotifyfs(system_cronjob_t)
+ 
+ # quiet other ps operations
+ domain_dontaudit_read_all_domains_state(system_cronjob_t)
+@@ -370,7 +435,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10929,7 +10942,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +443,7 @@
+@@ -378,6 +444,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10937,7 +10950,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -418,6 +484,10 @@
+@@ -418,6 +485,10 @@
  ')
  
  optional_policy(`
@@ -10948,7 +10961,7 @@
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -428,11 +498,20 @@
+@@ -428,11 +499,20 @@
  ')
  
  optional_policy(`
@@ -10969,7 +10982,7 @@
  ')
  
  optional_policy(`
-@@ -447,6 +526,7 @@
+@@ -447,6 +527,7 @@
  	prelink_read_cache(system_cronjob_t)
  	prelink_manage_log(system_cronjob_t)
  	prelink_delete_cache(system_cronjob_t)
@@ -10977,7 +10990,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +540,7 @@
+@@ -460,8 +541,7 @@
  ')
  
  optional_policy(`
@@ -10987,7 +11000,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +548,17 @@
+@@ -469,24 +549,17 @@
  ')
  
  optional_policy(`
@@ -11015,7 +11028,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +642,9 @@
+@@ -570,6 +643,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -19942,7 +19955,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-21 13:16:52.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-21 15:17:25.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -r1.831 -r1.832
--- selinux-policy.spec	21 Apr 2009 18:19:34 -0000	1.831
+++ selinux-policy.spec	21 Apr 2009 20:10:58 -0000	1.832
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,7 +446,12 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-11
+- Allow nsplugin unix_read and write on users shm and sem
+- Allow sysadm_t to execute su
+
 * Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-10
+- Dontaudit attempts to getattr user_tmpfs_t by lvm
 - Allow nfs to share removable media
 
 * Mon Apr 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-9



From kevin at fedoraproject.org  Tue Apr 21 20:11:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:11:37 +0000 (UTC)
Subject: rpms/pdfposter Makefile,NONE,1.1
Message-ID: <20090421201137.5BB7370137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdfposter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15849/rpms/pdfposter

Added Files:
	Makefile 
Log Message:
Setup of module pdfposter


--- NEW FILE Makefile ---
# Top level Makefile for module pdfposter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:11:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:11:39 +0000 (UTC)
Subject: rpms/pdfposter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421201139.0A38470137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdfposter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW15849/rpms/pdfposter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pdfposter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pdfposter
# $Id: Makefile,v 1.1 2009/04/21 20:11:37 kevin Exp $
NAME := pdfposter
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Apr 21 20:11:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:11:26 +0000
Subject: [pkgdb] sakura (Fedora, 11) updated by kevin
Message-ID: <20090421201126.AB8DC10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sakura
kevin has set commit to Approved for provenpackager on sakura (Fedora 11)
kevin has set build to Approved for provenpackager on sakura (Fedora 11)
kevin has set checkout to Approved for provenpackager on sakura (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sakura



From kevin at fedoraproject.org  Tue Apr 21 20:12:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:12:45 +0000 (UTC)
Subject: rpms/sakura Makefile,NONE,1.1
Message-ID: <20090421201245.C8C9F70137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sakura
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16805/rpms/sakura

Added Files:
	Makefile 
Log Message:
Setup of module sakura


--- NEW FILE Makefile ---
# Top level Makefile for module sakura
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:12:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:12:46 +0000 (UTC)
Subject: rpms/sakura/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090421201246.3251270137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sakura/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16805/rpms/sakura/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sakura


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sakura
# $Id: Makefile,v 1.1 2009/04/21 20:12:45 kevin Exp $
NAME := sakura
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kalev at fedoraproject.org  Tue Apr 21 20:13:00 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue, 21 Apr 2009 20:13:00 +0000 (UTC)
Subject: rpms/powwow/F-11 import.log, NONE, 1.1 powwow.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421201300.6D484700D6@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16768/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log powwow.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
powwow-1_2_14-3_fc11:F-11:powwow-1.2.14-3.fc11.src.rpm:1240345004


--- NEW FILE powwow.spec ---
Name:           powwow
Version:        1.2.14
Release:        3%{?dist}
Summary:        A console MUD client

Group:          Applications/Internet
License:        GPLv2+
URL:            http://hoopajoo.net/projects/powwow.html
Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ncurses-devel

%description
Powwow is a powerful console MUD client that supports triggers, aliases,
multiple connections, and more. It is primarily designed for DikuMUDs, but
nothing prevents its use for other types of MUDs. This client is also
extensible through a plugin interface.


%package devel
Summary:        Development files for powwow
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The powwow-devel package contains the headers files and developer docs
for developing applications which use powwow plugin interface.


%prep
%setup -q

# Convert to utf-8
for file in README powwow.doc; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the documentation here. We install it with %doc instead to
# the standard directory.
rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc

# Rename / delete executables to avoid possible name clashes and to reflect
# changes in upcoming powwow release.
# The following lines can be removed after powwow-1.2.15 has been released.
mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay}
ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii
mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc}
rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# COPYING can not be included in %doc because the app
# needs it at runtime.
%doc ChangeLog Config.demo powwow.doc README
%{_datadir}/powwow/
%{_bindir}/*
%{_mandir}/man6/*


%files devel
%defattr(-,root,root,-)
%doc Hacking README.modules TODO
%{_includedir}/powwow/


%changelog
* Mon Apr 20 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-3
- Rework powwow-devel description.
- Rename movie_play and muc, remove catrw and follow to avoid
  possible name clashes and to reflect upstream changes.

* Thu Apr 16 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-2
- Remove COPYING from %%doc, because it is needed at runtime.

* Wed Apr 15 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-1
- Update to powwow 1.2.14.

* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-2
- Fix the package to own all the directories it creates.
- Move development-related docs to devel subpackage.

* Sun Mar 22 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:51:52 -0000	1.1
+++ .cvsignore	21 Apr 2009 20:12:29 -0000	1.2
@@ -0,0 +1 @@
+powwow-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:51:52 -0000	1.1
+++ sources	21 Apr 2009 20:12:30 -0000	1.2
@@ -0,0 +1 @@
+5c1d600ca8e577dc620c1c15c01cfdf5  powwow-1.2.14.tar.gz



From kalev at fedoraproject.org  Tue Apr 21 20:15:41 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue, 21 Apr 2009 20:15:41 +0000 (UTC)
Subject: rpms/powwow/F-10 import.log, NONE, 1.1 powwow.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421201541.65408700D6@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18071/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log powwow.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
powwow-1_2_14-3_fc11:F-10:powwow-1.2.14-3.fc11.src.rpm:1240345151


--- NEW FILE powwow.spec ---
Name:           powwow
Version:        1.2.14
Release:        3%{?dist}
Summary:        A console MUD client

Group:          Applications/Internet
License:        GPLv2+
URL:            http://hoopajoo.net/projects/powwow.html
Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ncurses-devel

%description
Powwow is a powerful console MUD client that supports triggers, aliases,
multiple connections, and more. It is primarily designed for DikuMUDs, but
nothing prevents its use for other types of MUDs. This client is also
extensible through a plugin interface.


%package devel
Summary:        Development files for powwow
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The powwow-devel package contains the headers files and developer docs
for developing applications which use powwow plugin interface.


%prep
%setup -q

# Convert to utf-8
for file in README powwow.doc; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the documentation here. We install it with %doc instead to
# the standard directory.
rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc

# Rename / delete executables to avoid possible name clashes and to reflect
# changes in upcoming powwow release.
# The following lines can be removed after powwow-1.2.15 has been released.
mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay}
ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii
mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc}
rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# COPYING can not be included in %doc because the app
# needs it at runtime.
%doc ChangeLog Config.demo powwow.doc README
%{_datadir}/powwow/
%{_bindir}/*
%{_mandir}/man6/*


%files devel
%defattr(-,root,root,-)
%doc Hacking README.modules TODO
%{_includedir}/powwow/


%changelog
* Mon Apr 20 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-3
- Rework powwow-devel description.
- Rename movie_play and muc, remove catrw and follow to avoid
  possible name clashes and to reflect upstream changes.

* Thu Apr 16 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-2
- Remove COPYING from %%doc, because it is needed at runtime.

* Wed Apr 15 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-1
- Update to powwow 1.2.14.

* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-2
- Fix the package to own all the directories it creates.
- Move development-related docs to devel subpackage.

* Sun Mar 22 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:51:52 -0000	1.1
+++ .cvsignore	21 Apr 2009 20:15:05 -0000	1.2
@@ -0,0 +1 @@
+powwow-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:51:52 -0000	1.1
+++ sources	21 Apr 2009 20:15:07 -0000	1.2
@@ -0,0 +1 @@
+5c1d600ca8e577dc620c1c15c01cfdf5  powwow-1.2.14.tar.gz



From kalev at fedoraproject.org  Tue Apr 21 20:17:40 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue, 21 Apr 2009 20:17:40 +0000 (UTC)
Subject: rpms/powwow/F-9 import.log, NONE, 1.1 powwow.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421201740.E64B3700D6@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19073/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log powwow.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
powwow-1_2_14-3_fc11:F-9:powwow-1.2.14-3.fc11.src.rpm:1240345326


--- NEW FILE powwow.spec ---
Name:           powwow
Version:        1.2.14
Release:        3%{?dist}
Summary:        A console MUD client

Group:          Applications/Internet
License:        GPLv2+
URL:            http://hoopajoo.net/projects/powwow.html
Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ncurses-devel

%description
Powwow is a powerful console MUD client that supports triggers, aliases,
multiple connections, and more. It is primarily designed for DikuMUDs, but
nothing prevents its use for other types of MUDs. This client is also
extensible through a plugin interface.


%package devel
Summary:        Development files for powwow
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The powwow-devel package contains the headers files and developer docs
for developing applications which use powwow plugin interface.


%prep
%setup -q

# Convert to utf-8
for file in README powwow.doc; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the documentation here. We install it with %doc instead to
# the standard directory.
rm -f $RPM_BUILD_ROOT%{_datadir}/powwow/powwow.doc

# Rename / delete executables to avoid possible name clashes and to reflect
# changes in upcoming powwow release.
# The following lines can be removed after powwow-1.2.15 has been released.
mv $RPM_BUILD_ROOT%{_bindir}/{movie_play,powwow-movieplay}
ln -s powwow-movieplay $RPM_BUILD_ROOT%{_bindir}/powwow-movie2ascii
mv $RPM_BUILD_ROOT%{_bindir}/{muc,powwow-muc}
rm -f $RPM_BUILD_ROOT%{_bindir}/{catrw,follow}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# COPYING can not be included in %doc because the app
# needs it at runtime.
%doc ChangeLog Config.demo powwow.doc README
%{_datadir}/powwow/
%{_bindir}/*
%{_mandir}/man6/*


%files devel
%defattr(-,root,root,-)
%doc Hacking README.modules TODO
%{_includedir}/powwow/


%changelog
* Mon Apr 20 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-3
- Rework powwow-devel description.
- Rename movie_play and muc, remove catrw and follow to avoid
  possible name clashes and to reflect upstream changes.

* Thu Apr 16 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-2
- Remove COPYING from %%doc, because it is needed at runtime.

* Wed Apr 15 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.14-1
- Update to powwow 1.2.14.

* Wed Mar 25 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-2
- Fix the package to own all the directories it creates.
- Move development-related docs to devel subpackage.

* Sun Mar 22 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.13-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:51:52 -0000	1.1
+++ .cvsignore	21 Apr 2009 20:17:39 -0000	1.2
@@ -0,0 +1 @@
+powwow-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:51:52 -0000	1.1
+++ sources	21 Apr 2009 20:17:39 -0000	1.2
@@ -0,0 +1 @@
+5c1d600ca8e577dc620c1c15c01cfdf5  powwow-1.2.14.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 21 20:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:18:54 +0000
Subject: [pkgdb] perl-Test-Aggregate was added for cweyl
Message-ID: <20090421201854.8E21D10F878@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Test-Aggregate with summary Aggregate C<*.t> tests to make them run faster
kevin has approved Package perl-Test-Aggregate
kevin has added a Fedora devel branch for perl-Test-Aggregate with an owner of cweyl
kevin has approved perl-Test-Aggregate in Fedora devel
kevin has approved Package perl-Test-Aggregate
kevin has set commit to Approved for provenpackager on perl-Test-Aggregate (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Test-Aggregate (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Test-Aggregate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Aggregate



From pkgdb at fedoraproject.org  Tue Apr 21 20:18:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:18:55 +0000
Subject: [pkgdb] perl-Test-Aggregate (Fedora, 10) updated by kevin
Message-ID: <20090421201856.0798410F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Test-Aggregate
kevin has set commit to Approved for provenpackager on perl-Test-Aggregate (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Test-Aggregate (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Test-Aggregate (Fedora 10)
kevin approved watchbugzilla on perl-Test-Aggregate (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Test-Aggregate (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Aggregate



From pkgdb at fedoraproject.org  Tue Apr 21 20:18:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:18:55 +0000
Subject: [pkgdb] perl-Test-Aggregate (Fedora, 11) updated by kevin
Message-ID: <20090421201856.1428710F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Test-Aggregate
kevin has set commit to Approved for provenpackager on perl-Test-Aggregate (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Test-Aggregate (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Test-Aggregate (Fedora 11)
kevin approved watchbugzilla on perl-Test-Aggregate (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Test-Aggregate (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Aggregate



From pkgdb at fedoraproject.org  Tue Apr 21 20:18:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:18:55 +0000
Subject: [pkgdb] perl-Test-Aggregate (Fedora, devel) updated by kevin
Message-ID: <20090421201856.118FF10F88D@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-Aggregate (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-Aggregate (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Aggregate



From pkgdb at fedoraproject.org  Tue Apr 21 20:18:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:18:55 +0000
Subject: [pkgdb] perl-Test-Aggregate (Fedora, 9) updated by kevin
Message-ID: <20090421201856.1FB8D10F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Test-Aggregate
kevin has set commit to Approved for provenpackager on perl-Test-Aggregate (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Test-Aggregate (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Test-Aggregate (Fedora 9)
kevin approved watchbugzilla on perl-Test-Aggregate (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Test-Aggregate (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Aggregate



From kevin at fedoraproject.org  Tue Apr 21 20:21:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:21:09 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate - New directory
Message-ID: <20090421202109.A8DEC700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Aggregate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN20378/rpms/perl-Test-Aggregate

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Aggregate added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:21:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:21:09 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate/devel - New directory
Message-ID: <20090421202109.E4F147013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Aggregate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN20378/rpms/perl-Test-Aggregate/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Aggregate/devel added to the repository




From pkgdb at fedoraproject.org  Tue Apr 21 20:21:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:21:33 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check was added for cweyl
Message-ID: <20090421202133.CEBA510F884@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-B-Hooks-OP-Check with summary Wrap OP check callbacks
kevin has approved Package perl-B-Hooks-OP-Check
kevin has added a Fedora devel branch for perl-B-Hooks-OP-Check with an owner of cweyl
kevin has approved perl-B-Hooks-OP-Check in Fedora devel
kevin has approved Package perl-B-Hooks-OP-Check
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora devel)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check



From pkgdb at fedoraproject.org  Tue Apr 21 20:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:21:35 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check (Fedora, 9) updated by kevin
Message-ID: <20090421202135.DA39010F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-B-Hooks-OP-Check
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 9)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 9)
kevin approved watchbugzilla on perl-B-Hooks-OP-Check (Fedora 9) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check



From pkgdb at fedoraproject.org  Tue Apr 21 20:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:21:35 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check (Fedora, 10) updated by kevin
Message-ID: <20090421202135.DEAC110F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-B-Hooks-OP-Check
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 10)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 10)
kevin approved watchbugzilla on perl-B-Hooks-OP-Check (Fedora 10) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check



From pkgdb at fedoraproject.org  Tue Apr 21 20:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:21:35 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check (Fedora, 11) updated by kevin
Message-ID: <20090421202135.E9DEB10F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-B-Hooks-OP-Check
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 11)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check (Fedora 11)
kevin approved watchbugzilla on perl-B-Hooks-OP-Check (Fedora 11) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check



From kevin at fedoraproject.org  Tue Apr 21 20:21:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:21:36 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate Makefile,NONE,1.1
Message-ID: <20090421202136.A285D700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Aggregate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN20378/rpms/perl-Test-Aggregate

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-Aggregate


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Aggregate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:21:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:21:37 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090421202137.0B7B2700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Aggregate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN20378/rpms/perl-Test-Aggregate/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Aggregate


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-Aggregate
# $Id: Makefile,v 1.1 2009/04/21 20:21:36 kevin Exp $
NAME := perl-Test-Aggregate
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From maxamillion at fedoraproject.org  Tue Apr 21 20:21:42 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 20:21:42 +0000 (UTC)
Subject: rpms/ninvaders/F-11 ninvaders-0.1.1-fedora.patch, NONE,
	1.1 import.log, 1.1, 1.2 ninvaders.spec, 1.1, 1.2
Message-ID: <20090421202142.C77A3700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20332/F-11

Modified Files:
	import.log ninvaders.spec 
Added Files:
	ninvaders-0.1.1-fedora.patch 
Log Message:
Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue



ninvaders-0.1.1-fedora.patch:

--- NEW FILE ninvaders-0.1.1-fedora.patch ---
--- Makefile	2003-05-08 14:19:50.000000000 -0500
+++ Makefile.patched	2009-04-21 14:17:47.000000000 -0500
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O3 -Wall
+CFLAGS=-O3 -Wall $(RPM_OPT_FLAGS)
 LIBS=-lncurses
 
 CFILES=globals.c view.c aliens.c ufo.c player.c nInvaders.c


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Mar 2009 13:30:20 -0000	1.1
+++ import.log	21 Apr 2009 20:21:12 -0000	1.2
@@ -1 +1,2 @@
 ninvaders-0_1_1-2:HEAD:ninvaders-0.1.1-2.src.rpm:1237814978
+ninvaders-0_1_1-3:F-11:ninvaders-0.1.1-3.src.rpm:1240345208


Index: ninvaders.spec
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/F-11/ninvaders.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ninvaders.spec	23 Mar 2009 13:30:20 -0000	1.1
+++ ninvaders.spec	21 Apr 2009 20:21:12 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           ninvaders
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Space Invaders clone written in ncurses for cli gaming
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ninvaders.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         ninvaders-0.1.1-fedora.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 iconv -f iso-8859-1 -t utf8 ChangeLog > ChangeLog.new && \
 touch -r ChangeLog ChangeLog.new && mv ChangeLog.new ChangeLog
 
@@ -39,6 +42,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-3
+- Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue
+
 * Fri Mar 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.1.1-2
 - Added smp_mflags, fixed utf8 encoding, removed ncurses requirement
 - Added trailing period to description, changed name to match upstream



From pkgdb at fedoraproject.org  Tue Apr 21 20:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 20:21:35 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check (Fedora, devel) updated by kevin
Message-ID: <20090421202135.F00BC10F893@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-B-Hooks-OP-Check (Fedora devel) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check



From maxamillion at fedoraproject.org  Tue Apr 21 20:22:59 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 21 Apr 2009 20:22:59 +0000 (UTC)
Subject: rpms/ninvaders/devel import.log,1.2,1.3
Message-ID: <20090421202259.0A28F700D6@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ninvaders/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21028/devel

Modified Files:
	import.log 
Log Message:
Patched Makefile to include $RPM_OPT_FLAGS to fix debuginfo issue




Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ninvaders/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	21 Apr 2009 19:24:35 -0000	1.2
+++ import.log	21 Apr 2009 20:22:57 -0000	1.3
@@ -1,2 +1,3 @@
 ninvaders-0_1_1-2:HEAD:ninvaders-0.1.1-2.src.rpm:1237814978
 ninvaders-0_1_1-3:HEAD:ninvaders-0.1.1-3.src.rpm:1240341840
+ninvaders-0_1_1-3:HEAD:ninvaders-0.1.1-3.src.rpm:1240345318



From kevin at fedoraproject.org  Tue Apr 21 20:23:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:23:07 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check - New directory
Message-ID: <20090421202307.292DF700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21166/rpms/perl-B-Hooks-OP-Check

Log Message:
Directory /cvs/pkgs/rpms/perl-B-Hooks-OP-Check added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:23:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:23:07 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check/devel - New directory
Message-ID: <20090421202307.C120F70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21166/rpms/perl-B-Hooks-OP-Check/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-B-Hooks-OP-Check/devel added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:24:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:24:40 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check Makefile,NONE,1.1
Message-ID: <20090421202440.20086700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21166/rpms/perl-B-Hooks-OP-Check

Added Files:
	Makefile 
Log Message:
Setup of module perl-B-Hooks-OP-Check


--- NEW FILE Makefile ---
# Top level Makefile for module perl-B-Hooks-OP-Check
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Apr 21 20:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:24:41 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090421202441.2EBFE700D6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl21166/rpms/perl-B-Hooks-OP-Check/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-B-Hooks-OP-Check


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-B-Hooks-OP-Check
# $Id: Makefile,v 1.1 2009/04/21 20:24:40 kevin Exp $
NAME := perl-B-Hooks-OP-Check
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cebbert at fedoraproject.org  Tue Apr 21 20:26:49 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 21 Apr 2009 20:26:49 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1566,1.1567
Message-ID: <20090421202649.65C70700D6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22280

Modified Files:
	kernel.spec 
Log Message:
Don't include the modules.*.bin files in the RPM package.





From dwalsh at fedoraproject.org  Tue Apr 21 20:31:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 21 Apr 2009 20:31:54 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.90,
	1.91 selinux-policy.spec, 1.827, 1.828
Message-ID: <20090421203154.9CC79700D6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23522

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-11
- Allow nsplugin unix_read and write on users shm and sem
- Allow sysadm_t to execute su


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- policy-20090105.patch	18 Apr 2009 12:13:36 -0000	1.90
+++ policy-20090105.patch	21 Apr 2009 20:31:51 -0000	1.91
@@ -164,6 +164,16 @@
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/securetty_types serefpolicy-3.6.12/config/appconfig-mls/securetty_types
+--- nsaserefpolicy/config/appconfig-mls/securetty_types	2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/securetty_types	2009-04-20 10:13:02.000000000 -0400
+@@ -1,6 +1 @@
+-auditadm_tty_device_t
+-secadm_tty_device_t
+-staff_tty_device_t
+-sysadm_tty_device_t
+-unconfined_tty_device_t
+ user_tty_device_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
@@ -729,17 +739,18 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.12/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-04-07 16:01:44.000000000 -0400
-@@ -3,6 +3,7 @@
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-04-19 15:52:53.000000000 -0400
+@@ -3,15 +3,12 @@
  /usr/bin/smart 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  /usr/bin/yum 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
+-
+-/usr/lib(64)?/rpm/rpmd		-- 	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/rpm/rpmq		-- 	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/rpm/rpmk		-- 	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
 +/usr/sbin/yum-complete-transaction --	gen_context(system_u:object_r:rpm_exec_t,s0)
  
- /usr/lib(64)?/rpm/rpmd		-- 	gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/rpm/rpmq		-- 	gen_context(system_u:object_r:bin_t,s0)
-@@ -11,7 +12,8 @@
- 
  /usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/yum-updatesd		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 -
@@ -748,7 +759,7 @@
  /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  ifdef(`distro_redhat', `
-@@ -21,14 +23,18 @@
+@@ -21,14 +18,18 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -771,7 +782,7 @@
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.12/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-21 14:06:47.000000000 -0400
 @@ -146,6 +146,24 @@
  
  ########################################
@@ -926,7 +937,32 @@
  ')
  
  ########################################
-@@ -283,3 +401,175 @@
+@@ -245,6 +363,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Delete the RPM package database.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_delete_db',`
++	gen_require(`
++		type rpm_var_lib_t;
++	')
++
++	delete_files_pattern($1, rpm_var_lib_t, rpm_var_lib_t)
++')
++
++########################################
++## <summary>
+ ##	Create, read, write, and delete the RPM package database.
+ ## </summary>
+ ## <param name="domain">
+@@ -283,3 +419,175 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1104,8 +1140,17 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.12/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-09 04:59:09.000000000 -0400
-@@ -31,6 +31,9 @@
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.te	2009-04-20 12:07:11.000000000 -0400
+@@ -9,6 +9,8 @@
+ type rpm_t;
+ type rpm_exec_t;
+ init_system_domain(rpm_t, rpm_exec_t)
++#application_domain(rpm_t, rpm_exec_t)
++
+ domain_obj_id_change_exemption(rpm_t)
+ domain_role_change_exemption(rpm_t)
+ domain_system_change_exemption(rpm_t)
+@@ -31,11 +33,15 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
  
@@ -1115,7 +1160,13 @@
  type rpm_script_t;
  type rpm_script_exec_t;
  domain_obj_id_change_exemption(rpm_script_t)
-@@ -52,8 +55,9 @@
+ domain_system_change_exemption(rpm_script_t)
+ corecmd_shell_entry_type(rpm_script_t)
++corecmd_bin_entry_type(rpm_script_t)
+ domain_type(rpm_script_t)
+ domain_entry_file(rpm_t, rpm_script_exec_t)
+ domain_interactive_fd(rpm_script_t)
+@@ -52,8 +58,9 @@
  # rpm Local policy
  #
  
@@ -1127,7 +1178,7 @@
  allow rpm_t self:process { getattr setexec setfscreate setrlimit };
  allow rpm_t self:fd use;
  allow rpm_t self:fifo_file rw_fifo_file_perms;
-@@ -68,6 +72,8 @@
+@@ -68,6 +75,8 @@
  allow rpm_t self:sem create_sem_perms;
  allow rpm_t self:msgq create_msgq_perms;
  allow rpm_t self:msg { send receive };
@@ -1136,7 +1187,7 @@
  
  allow rpm_t rpm_log_t:file manage_file_perms;
  logging_log_filetrans(rpm_t, rpm_log_t, file)
-@@ -87,8 +93,12 @@
+@@ -87,8 +96,12 @@
  manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
  
@@ -1149,7 +1200,7 @@
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -108,13 +118,16 @@
+@@ -108,13 +121,16 @@
  dev_list_sysfs(rpm_t)
  dev_list_usbfs(rpm_t)
  dev_read_urand(rpm_t)
@@ -1166,7 +1217,7 @@
  
  mls_file_read_all_levels(rpm_t)
  mls_file_write_all_levels(rpm_t)
-@@ -132,6 +145,8 @@
+@@ -132,6 +148,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -1175,7 +1226,7 @@
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -155,6 +170,7 @@
+@@ -155,6 +173,7 @@
  files_exec_etc_files(rpm_t)
  
  init_domtrans_script(rpm_t)
@@ -1183,7 +1234,7 @@
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,17 +190,28 @@
+@@ -174,17 +193,28 @@
  ')
  
  optional_policy(`
@@ -1213,7 +1264,7 @@
  ')
  
  ifdef(`TODO',`
-@@ -210,8 +237,8 @@
+@@ -210,8 +240,8 @@
  # rpm-script Local policy
  #
  
@@ -1224,7 +1275,7 @@
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -222,12 +249,15 @@
+@@ -222,12 +252,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -1240,7 +1291,7 @@
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +269,9 @@
+@@ -239,6 +272,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
@@ -1250,7 +1301,7 @@
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +288,7 @@
+@@ -255,6 +291,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -1258,7 +1309,7 @@
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +306,19 @@
+@@ -272,14 +309,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1278,7 +1329,7 @@
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,6 +330,7 @@
+@@ -291,6 +333,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1286,7 +1337,7 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -308,12 +348,15 @@
+@@ -308,12 +351,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1302,7 +1353,7 @@
  	')
  ')
  
-@@ -326,6 +369,10 @@
+@@ -326,13 +372,18 @@
  ')
  
  optional_policy(`
@@ -1313,9 +1364,10 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -333,6 +380,7 @@
+ 
  optional_policy(`
- 	unconfined_domain(rpm_script_t)
+-	unconfined_domain(rpm_script_t)
++	unconfined_domain_noaudit(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
 +	unconfined_execmem_domtrans(rpm_script_t)
  
@@ -1472,7 +1524,7 @@
  application_executable_file(sudo_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.6.12/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/su.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/su.if	2009-04-21 15:49:55.000000000 -0400
 @@ -90,15 +90,6 @@
  
  	miscfiles_read_localization($1_su_t)
@@ -2725,8 +2777,8 @@
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.12/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.if	2009-04-07 16:01:44.000000000 -0400
-@@ -0,0 +1,272 @@
++++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.if	2009-04-21 15:54:32.000000000 -0400
+@@ -0,0 +1,274 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2837,6 +2889,8 @@
 +	dontaudit nsplugin_config_t $2:fifo_file rw_fifo_file_perms;
 +	allow nsplugin_t $2:unix_stream_socket connectto;
 +	dontaudit nsplugin_t $2:process ptrace;
++	allow nsplugin_t $2:sem { unix_read unix_write };
++	allow nsplugin_t $2:shm { unix_read unix_write };
 +
 +	allow $2 nsplugin_t:process { getattr ptrace signal_perms };
 +	allow $2 nsplugin_t:unix_stream_socket connectto;
@@ -4676,7 +4730,7 @@
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-03-05 10:34:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-17 07:21:07.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-19 15:53:09.000000000 -0400
 @@ -32,6 +32,8 @@
  #
  # /etc
@@ -4695,7 +4749,7 @@
  #
  # /usr
  #
-@@ -299,3 +303,14 @@
+@@ -299,3 +303,20 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4710,6 +4764,12 @@
 +/usr/lib/wicd/monitor.py 	-- 	gen_context(system_u:object_r:bin_t, s0)
 +
 +/usr/lib(64)?/nspluginwrapper/np.*	gen_context(system_u:object_r:bin_t,s0)
++
++/usr/lib(64)?/rpm/rpmd		-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/rpm/rpmq		-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/rpm/rpmk		-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.12/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.if	2009-04-07 16:01:44.000000000 -0400
@@ -5021,7 +5081,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-21 16:08:44.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5092,7 +5152,7 @@
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +172,43 @@
+@@ -153,3 +172,45 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5106,7 +5166,9 @@
 +	cron_dontaudit_write_system_job_tmp_files(domain)
 +	cron_rw_pipes(domain)
 +	cron_rw_system_job_pipes(domain)
++
 +ifdef(`hide_broken_symptoms',`
++	fs_list_inotifyfs(domain)
 +	allow domain domain:key { link search };
 +')
 +')
@@ -5167,7 +5229,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-09 10:14:04.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-20 12:17:02.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5441,7 +5503,7 @@
  	')
  ')
  
-@@ -4921,3 +5077,95 @@
+@@ -4921,3 +5077,114 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -5537,6 +5599,25 @@
 +	manage_lnk_files_pattern($1, root_t, root_t)
 +	can_exec(kernel_t, root_t)
 +')
++
++########################################
++## <summary>
++##	Do not audit attempts to getattr
++##	all tmpfs files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`files_dontaudit_getattr_tmpfs_files',`
++	gen_require(`
++		attribute tmpfsfile;
++	')
++
++	allow $1 tmpfsfile:file getattr;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.6.12/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/files.te	2009-04-07 16:01:44.000000000 -0400
@@ -5571,7 +5652,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-03-04 16:49:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-14 14:14:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-20 12:16:40.000000000 -0400
 @@ -723,6 +723,24 @@
  
  ########################################
@@ -5660,7 +5741,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-13 08:28:24.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/kernel.if	2009-04-21 13:21:45.000000000 -0400
 @@ -1197,6 +1197,26 @@
  	')
  
@@ -6242,7 +6323,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-21 15:50:14.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6290,15 +6371,16 @@
  	certwatch_run(sysadm_t, sysadm_r)
  ')
  
-@@ -127,18 +114,10 @@
+@@ -127,7 +114,7 @@
  ')
  
  optional_policy(`
 -	cron_admin_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	cvs_exec(sysadm_t)
++	su_exec(sysadm_t)
+ ')
+ 
+ optional_policy(`
+@@ -135,10 +122,6 @@
  ')
  
  optional_policy(`
@@ -6309,7 +6391,7 @@
  	dcc_run_cdcc(sysadm_t, sysadm_r)
  	dcc_run_client(sysadm_t, sysadm_r)
  	dcc_run_dbclean(sysadm_t, sysadm_r)
-@@ -166,10 +145,6 @@
+@@ -166,10 +149,6 @@
  ')
  
  optional_policy(`
@@ -6320,7 +6402,7 @@
  	firstboot_run(sysadm_t, sysadm_r)
  ')
  
-@@ -178,22 +153,6 @@
+@@ -178,22 +157,6 @@
  ')
  
  optional_policy(`
@@ -6343,7 +6425,7 @@
  	hostname_run(sysadm_t, sysadm_r)
  ')
  
-@@ -212,11 +171,7 @@
+@@ -212,11 +175,7 @@
  ')
  
  optional_policy(`
@@ -6356,7 +6438,7 @@
  ')
  
  optional_policy(`
-@@ -228,10 +183,6 @@
+@@ -228,10 +187,6 @@
  ')
  
  optional_policy(`
@@ -6367,7 +6449,7 @@
  	logrotate_run(sysadm_t, sysadm_r)
  ')
  
-@@ -255,14 +206,6 @@
+@@ -255,14 +210,6 @@
  ')
  
  optional_policy(`
@@ -6382,7 +6464,7 @@
  	mta_role(sysadm_r, sysadm_t)
  ')
  
-@@ -290,11 +233,6 @@
+@@ -290,11 +237,6 @@
  ')
  
  optional_policy(`
@@ -6394,7 +6476,7 @@
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,10 +246,6 @@
+@@ -308,10 +250,6 @@
  ')
  
  optional_policy(`
@@ -6405,7 +6487,7 @@
  	quota_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,22 +254,10 @@
+@@ -320,22 +258,10 @@
  ')
  
  optional_policy(`
@@ -6428,7 +6510,7 @@
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +267,6 @@
+@@ -345,10 +271,6 @@
  ')
  
  optional_policy(`
@@ -6439,7 +6521,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +276,15 @@
+@@ -358,35 +280,15 @@
  ')
  
  optional_policy(`
@@ -6475,7 +6557,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +292,10 @@
+@@ -394,18 +296,10 @@
  ')
  
  optional_policy(`
@@ -6494,7 +6576,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +308,12 @@
+@@ -418,20 +312,12 @@
  ')
  
  optional_policy(`
@@ -6515,7 +6597,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +322,5 @@
+@@ -440,13 +326,5 @@
  ')
  
  optional_policy(`
@@ -10611,7 +10693,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.12/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-09 05:33:16.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-21 16:03:54.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10747,7 +10829,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +256,43 @@
+@@ -227,21 +256,44 @@
  	')
  ')
  
@@ -10788,11 +10870,12 @@
  optional_policy(`
 -	hal_dbus_send(crond_t)
 +	hal_dbus_chat(crond_t)
++	hal_write_log(crond_t)
 +	hal_dbus_chat(system_cronjob_t)
  ')
  
  optional_policy(`
-@@ -268,8 +319,8 @@
+@@ -268,8 +320,8 @@
  # System cron process domain
  #
  
@@ -10803,7 +10886,7 @@
  allow system_cronjob_t self:fifo_file rw_fifo_file_perms;
  allow system_cronjob_t self:passwd rootok;
  
-@@ -283,7 +334,14 @@
+@@ -283,7 +335,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10818,7 +10901,7 @@
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
  # not directly executed, crond must ensure that
-@@ -303,6 +361,7 @@
+@@ -303,6 +362,7 @@
  allow system_cronjob_t crond_t:fd use;
  allow system_cronjob_t crond_t:fifo_file rw_file_perms;
  allow system_cronjob_t crond_t:process sigchld;
@@ -10826,7 +10909,7 @@
  
  # Write /var/lock/makewhatis.lock.
  allow system_cronjob_t system_cronjob_lock_t:file manage_file_perms;
-@@ -314,9 +373,13 @@
+@@ -314,9 +374,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10841,7 +10924,15 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -370,7 +433,8 @@
+@@ -345,6 +409,7 @@
+ fs_getattr_all_symlinks(system_cronjob_t)
+ fs_getattr_all_pipes(system_cronjob_t)
+ fs_getattr_all_sockets(system_cronjob_t)
++fs_list_inotifyfs(system_cronjob_t)
+ 
+ # quiet other ps operations
+ domain_dontaudit_read_all_domains_state(system_cronjob_t)
+@@ -370,7 +435,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10851,7 +10942,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +442,7 @@
+@@ -378,6 +444,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10859,7 +10950,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -418,6 +483,10 @@
+@@ -418,6 +485,10 @@
  ')
  
  optional_policy(`
@@ -10870,7 +10961,7 @@
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -428,11 +497,20 @@
+@@ -428,11 +499,20 @@
  ')
  
  optional_policy(`
@@ -10891,7 +10982,7 @@
  ')
  
  optional_policy(`
-@@ -447,6 +525,7 @@
+@@ -447,6 +527,7 @@
  	prelink_read_cache(system_cronjob_t)
  	prelink_manage_log(system_cronjob_t)
  	prelink_delete_cache(system_cronjob_t)
@@ -10899,7 +10990,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +539,7 @@
+@@ -460,8 +541,7 @@
  ')
  
  optional_policy(`
@@ -10909,7 +11000,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +547,17 @@
+@@ -469,24 +549,17 @@
  ')
  
  optional_policy(`
@@ -10937,7 +11028,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +641,9 @@
+@@ -570,6 +643,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -11607,7 +11698,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-13 10:31:12.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-21 13:57:58.000000000 -0400
 @@ -44,6 +44,7 @@
  
  		attribute session_bus_type;
@@ -12477,7 +12568,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.6.12/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2009-03-23 13:47:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/dnsmasq.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dnsmasq.te	2009-04-21 10:30:59.000000000 -0400
 @@ -42,8 +42,7 @@
  files_pid_filetrans(dnsmasq_t, dnsmasq_var_run_t, file)
  
@@ -13382,6 +13473,18 @@
 +	polkit_read_reload(gnomeclock_t)
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.if serefpolicy-3.6.12/policy/modules/services/gpm.if
+--- nsaserefpolicy/policy/modules/services/gpm.if	2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/gpm.if	2009-04-20 08:24:22.000000000 -0400
+@@ -16,7 +16,7 @@
+ 		type gpmctl_t, gpm_t;
+ 	')
+ 
+-	allow $1 gpmctl_t:sock_file { getattr write };
++	allow $1 gpmctl_t:sock_file rw_sock_file_perms;
+ 	allow $1 gpm_t:unix_stream_socket connectto;
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.6.12/policy/modules/services/gpm.te
 --- nsaserefpolicy/policy/modules/services/gpm.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/gpm.te	2009-04-07 16:01:44.000000000 -0400
@@ -13685,7 +13788,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-04-11 07:33:35.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-04-20 07:58:45.000000000 -0400
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -13745,16 +13848,20 @@
  	rpc_search_nfs_state_data(hald_t)
  ')
  
-@@ -301,12 +327,16 @@
- 	virt_manage_images(hald_t)
+@@ -298,7 +324,11 @@
  ')
  
-+optional_policy(`
-+	xserver_read_pid(hald_t)
+ optional_policy(`
+-	virt_manage_images(hald_t)
++	virtual_manage_image(hald_t)
 +')
 +
++optional_policy(`
++	xserver_read_pid(hald_t)
+ ')
+ 
  ########################################
- #
+@@ -306,7 +336,7 @@
  # Hal acl local policy
  #
  
@@ -17642,7 +17749,7 @@
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.12/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/postfix.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/postfix.if	2009-04-20 07:42:10.000000000 -0400
 @@ -46,6 +46,7 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
@@ -17812,7 +17919,7 @@
  ')
  
  ########################################
-@@ -500,3 +558,23 @@
+@@ -500,3 +558,43 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -17836,6 +17943,26 @@
 +	domtrans_pattern($1, postfix_postdrop_exec_t, postfix_postdrop_t)
 +')
 +
++########################################
++## <summary>
++##	Execute the master postdrop in the
++##	postfix_postdrop domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`postfix_run_postdrop',`
++	gen_require(`
++		type postfix_postdrop_t;
++	')
++
++	postfix_domtrans_postdrop($1)
++	role $2 types postfix_postdrop_t;
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.12/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/postfix.te	2009-04-15 08:35:07.000000000 -0400
@@ -19814,9 +19941,21 @@
  optional_policy(`
  	ccs_stream_connect(ricci_modstorage_t)
  	ccs_read_config(ricci_modstorage_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.6.12/policy/modules/services/rpcbind.te
+--- nsaserefpolicy/policy/modules/services/rpcbind.te	2009-01-19 11:06:49.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/rpcbind.te	2009-04-21 13:15:10.000000000 -0400
+@@ -40,6 +40,8 @@
+ manage_sock_files_pattern(rpcbind_t, rpcbind_var_lib_t, rpcbind_var_lib_t)
+ files_var_lib_filetrans(rpcbind_t, rpcbind_var_lib_t, { file dir sock_file })
+ 
++fs_list_inotifyfs(rpcbind_t)
++
+ kernel_read_system_state(rpcbind_t)
+ kernel_read_network_state(rpcbind_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.12/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-14 10:34:47.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rpc.te	2009-04-21 15:17:25.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -19826,7 +19965,13 @@
  
  rpc_domain_template(gssd)
  
-@@ -79,16 +79,25 @@
+@@ -74,21 +74,31 @@
+ 
+ files_manage_mounttab(rpcd_t)
+ 
++fs_list_inotifyfs(rpcd_t)
+ fs_list_rpc(rpcd_t)
+ fs_read_rpc_files(rpcd_t)
  fs_read_rpc_symlinks(rpcd_t)
  fs_rw_rpc_sockets(rpcd_t) 
  
@@ -19852,16 +19997,26 @@
  ########################################
  #
  # NFSD local policy
-@@ -116,7 +125,7 @@
+@@ -116,8 +126,9 @@
  # for exportfs and rpc.mountd
  files_getattr_tmp_dirs(nfsd_t) 
  # cjp: this should really have its own type
 -files_manage_mounttab(rpcd_t)
 +files_manage_mounttab(nfsd_t)
  
++fs_list_inotifyfs(nfsd_t)
  fs_mount_nfsd_fs(nfsd_t) 
  fs_search_nfsd_fs(nfsd_t) 
-@@ -141,6 +150,7 @@
+ fs_getattr_all_fs(nfsd_t) 
+@@ -125,6 +136,7 @@
+ fs_rw_nfsd_fs(nfsd_t) 
+ 
+ storage_dontaudit_read_fixed_disk(nfsd_t)
++storage_raw_read_removable_device(nfsd_t)
+ 
+ # Read access to public_content_t and public_content_rw_t
+ miscfiles_read_public_files(nfsd_t)
+@@ -141,6 +153,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
  ')
@@ -19869,7 +20024,15 @@
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -183,9 +193,12 @@
+@@ -175,6 +188,7 @@
+ 
+ corecmd_exec_bin(gssd_t)
+ 
++fs_list_inotifyfs(gssd_t)
+ fs_list_rpc(gssd_t) 
+ fs_rw_rpc_sockets(gssd_t) 
+ fs_read_rpc_files(gssd_t) 
+@@ -183,9 +197,12 @@
  files_read_usr_symlinks(gssd_t) 
  
  auth_use_nsswitch(gssd_t)
@@ -21834,7 +21997,7 @@
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-21 13:22:50.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -21954,7 +22117,15 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -229,7 +223,12 @@
+@@ -214,6 +208,7 @@
+ 	allow $1_t sshd_key_t:file read_file_perms;
+ 
+ 	kernel_read_kernel_sysctls($1_t)
++	kernel_read_network_state($1_t)
+ 
+ 	corenet_all_recvfrom_unlabeled($1_t)
+ 	corenet_all_recvfrom_netlabel($1_t)
+@@ -229,7 +224,12 @@
  	corenet_udp_bind_generic_node($1_t)
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
@@ -21967,7 +22138,7 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
-@@ -254,9 +253,14 @@
+@@ -254,9 +254,14 @@
  
  	userdom_dontaudit_relabelfrom_user_ptys($1_t)
  	userdom_search_user_home_dirs($1_t)
@@ -21982,7 +22153,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
-@@ -265,11 +269,7 @@
+@@ -265,11 +270,7 @@
  
  	optional_policy(`
  		kerberos_use($1_t)
@@ -21995,7 +22166,7 @@
  	')
  
  	optional_policy(`
-@@ -454,6 +454,24 @@
+@@ -454,6 +455,24 @@
  
  ########################################
  ## <summary>
@@ -22020,7 +22191,7 @@
  ##	Read a ssh server unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -611,3 +629,42 @@
+@@ -611,3 +630,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -22843,7 +23014,7 @@
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.12/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.if	2009-04-20 08:00:16.000000000 -0400
 @@ -2,28 +2,6 @@
  
  ########################################
@@ -22896,7 +23067,20 @@
           manage_files_pattern($1, virt_var_run_t, virt_var_run_t)
  ')
  
-@@ -293,6 +272,41 @@
+@@ -272,11 +251,7 @@
+ 	')
+ 
+ 	virt_search_lib($1)
+-	allow $1 virt_image_t:dir list_dir_perms;
+-	manage_dirs_pattern($1, virt_image_t, virt_image_t)
+-	manage_files_pattern($1, virt_image_t, virt_image_t)
+-	read_lnk_files_pattern($1, virt_image_t, virt_image_t)
+-	rw_blk_files_pattern($1, virt_image_t, virt_image_t)
++	virtual_manage_image($1)
+ 
+ 	tunable_policy(`virt_use_nfs',`
+ 		fs_manage_nfs_dirs($1)
+@@ -293,6 +268,41 @@
  
  ########################################
  ## <summary>
@@ -22938,7 +23122,7 @@
  ##	All of the rules required to administrate 
  ##	an virt environment
  ## </summary>
-@@ -327,3 +341,53 @@
+@@ -327,3 +337,53 @@
  
  	virt_manage_log($1)
  ')
@@ -22994,7 +23178,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-17 11:32:56.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-20 07:48:51.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23067,7 +23251,7 @@
 -allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
 -allow virtd_t self:process { getsched sigkill signal execmem };
 +allow virtd_t self:capability { chown dac_override ipc_lock kill mknod net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace };
-+allow virtd_t self:process { getsched sigkill signal execmem setexec setfscreate setsched };
++allow virtd_t self:process { getsched sigkill signal signull execmem setexec setfscreate setsched };
  allow virtd_t self:fifo_file rw_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;
  allow virtd_t self:tcp_socket create_stream_socket_perms;
@@ -25519,7 +25703,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-17 11:41:15.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-21 14:07:27.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -25623,7 +25807,7 @@
  can_exec(initrc_t,initrc_tmp_t)
 -allow initrc_t initrc_tmp_t:file manage_file_perms;
 -allow initrc_t initrc_tmp_t:dir manage_dir_perms;
-+allow initrc_t initrc_tmp_t:file relabelfrom;
++allow initrc_t initrc_tmp_t:file relabel_file_perms;
 +manage_chr_files_pattern(initrc_t, initrc_tmp_t, initrc_tmp_t)
 +manage_blk_files_pattern(initrc_t, initrc_tmp_t, initrc_tmp_t)
 +manage_blk_files_pattern(initrc_t, initrc_tmp_t, initrc_tmp_t)
@@ -25687,12 +25871,13 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -343,14 +384,13 @@
+@@ -343,14 +384,14 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
 -files_delete_all_locks(initrc_t)
 +files_manage_all_locks(initrc_t)
++files_manage_boot_files(initrc_t)
  files_read_all_pids(initrc_t)
  files_delete_all_pids(initrc_t)
  files_delete_all_pid_dirs(initrc_t)
@@ -25703,7 +25888,7 @@
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -366,7 +406,9 @@
+@@ -366,7 +407,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -25713,7 +25898,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -451,7 +493,7 @@
+@@ -451,7 +494,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -25722,7 +25907,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -465,6 +507,7 @@
+@@ -465,6 +508,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -25730,7 +25915,7 @@
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -498,6 +541,7 @@
+@@ -498,6 +542,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -25738,7 +25923,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +560,33 @@
+@@ -516,6 +561,33 @@
  	')
  ')
  
@@ -25772,7 +25957,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +641,10 @@
+@@ -570,6 +642,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -25783,7 +25968,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +666,10 @@
+@@ -591,6 +667,10 @@
  ')
  
  optional_policy(`
@@ -25794,7 +25979,7 @@
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,6 +726,11 @@
+@@ -647,6 +727,11 @@
  ')
  
  optional_policy(`
@@ -25806,7 +25991,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +739,6 @@
+@@ -655,12 +740,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -25819,17 +26004,16 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +799,9 @@
+@@ -719,8 +798,6 @@
+ 	# bash tries ioctl for some reason
+ 	files_dontaudit_ioctl_all_pids(initrc_t)
  
- 	# why is this needed:
- 	rpm_manage_db(initrc_t)
-+	# Allow SELinux aware applications to request rpm_script_t execution
-+	rpm_transition_script(initrc_t)
-+
+-	# why is this needed:
+-	rpm_manage_db(initrc_t)
  ')
  
  optional_policy(`
-@@ -733,10 +814,12 @@
+@@ -733,10 +810,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -25842,7 +26026,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +837,11 @@
+@@ -754,6 +833,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -25854,27 +26038,21 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -761,6 +849,8 @@
- 		# system-config-services causes avc messages that should be dontaudited
- 		unconfined_dontaudit_rw_pipes(daemon)
- 	')
-+	# sudo service restart causes this 
-+	unconfined_signull(daemon)
- 
+@@ -765,6 +849,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
-@@ -768,6 +858,10 @@
- ')
- 
- optional_policy(`
-+	rpm_dontaudit_rw_pipes(daemon)
+ 	')
++
++	# Allow SELinux aware applications to request rpm_script_t execution
++	rpm_transition_script(initrc_t)
 +')
 +
 +optional_policy(`
- 	vmware_read_system_config(initrc_t)
- 	vmware_append_system_config(initrc_t)
++	rpm_delete_db(initrc_t)
  ')
-@@ -790,3 +884,25 @@
+ 
+ optional_policy(`
+@@ -790,3 +881,35 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25886,6 +26064,16 @@
 +logging_append_all_logs(daemon)
 +
 +optional_policy(`
++	# sudo service restart causes this 
++	unconfined_signull(daemon)
++')
++
++
++optional_policy(`
++	rpm_dontaudit_rw_pipes(daemon)
++')
++
++optional_policy(`
 +	xserver_rw_xdm_home_files(daemon)
 +	tunable_policy(`use_nfs_home_dirs',`
 +		fs_dontaudit_rw_nfs_files(daemon)
@@ -26037,7 +26225,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.12/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2009-03-20 12:39:39.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/iscsi.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/iscsi.te	2009-04-21 13:55:23.000000000 -0400
 @@ -55,6 +55,7 @@
  files_pid_filetrans(iscsid_t,iscsi_var_run_t,file)
  
@@ -26438,7 +26626,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.12/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/logging.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/logging.te	2009-04-21 14:01:28.000000000 -0400
 @@ -126,7 +126,7 @@
  allow auditd_t self:process { signal_perms setpgid setsched };
  allow auditd_t self:file rw_file_perms;
@@ -26549,7 +26737,7 @@
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.12/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/lvm.te	2009-04-09 10:07:34.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/lvm.te	2009-04-21 14:01:57.000000000 -0400
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t,clvmd_exec_t)
@@ -26606,8 +26794,11 @@
  
  files_read_etc_files(clvmd_t)
  files_list_usr(clvmd_t)
-@@ -99,9 +109,12 @@
+@@ -97,11 +107,15 @@
+ fs_search_auto_mountpoints(clvmd_t)
+ fs_dontaudit_list_tmpfs(clvmd_t)
  fs_dontaudit_read_removable_files(clvmd_t)
++fs_rw_anon_inodefs_files(clvmd_t)
  
  storage_dontaudit_getattr_removable_dev(clvmd_t)
 +storage_dev_filetrans_fixed_disk(clvmd_t)
@@ -26619,7 +26810,7 @@
  storage_raw_read_fixed_disk(clvmd_t)
  
  auth_use_nsswitch(clvmd_t)
-@@ -112,6 +125,9 @@
+@@ -112,6 +126,9 @@
  
  seutil_dontaudit_search_config(clvmd_t)
  seutil_sigchld_newrole(clvmd_t)
@@ -26629,7 +26820,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(clvmd_t)
  userdom_dontaudit_search_user_home_dirs(clvmd_t)
-@@ -124,6 +140,14 @@
+@@ -124,6 +141,14 @@
  ')
  
  optional_policy(`
@@ -26644,7 +26835,7 @@
  	gpm_dontaudit_getattr_gpmctl(clvmd_t)
  ')
  
-@@ -133,6 +157,14 @@
+@@ -133,6 +158,14 @@
  ')
  
  optional_policy(`
@@ -26659,7 +26850,7 @@
  	udev_read_db(clvmd_t)
  ')
  
-@@ -143,17 +175,19 @@
+@@ -143,17 +176,19 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
@@ -26682,7 +26873,7 @@
  
  manage_dirs_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t)
  manage_files_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t)
-@@ -185,6 +219,7 @@
+@@ -185,6 +220,7 @@
  manage_files_pattern(lvm_t,lvm_metadata_t,lvm_metadata_t)
  filetrans_pattern(lvm_t,lvm_etc_t,lvm_metadata_t,file)
  files_etc_filetrans(lvm_t,lvm_metadata_t,file)
@@ -26690,7 +26881,7 @@
  
  kernel_read_system_state(lvm_t)
  kernel_read_kernel_sysctls(lvm_t)
-@@ -192,6 +227,8 @@
+@@ -192,6 +228,8 @@
  kernel_read_kernel_sysctls(lvm_t)
  # it has no reason to need this
  kernel_dontaudit_getattr_core_if(lvm_t)
@@ -26699,7 +26890,7 @@
  
  selinux_get_fs_mount(lvm_t)
  selinux_validate_context(lvm_t)
-@@ -221,6 +258,7 @@
+@@ -221,6 +259,7 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -26707,7 +26898,15 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -239,12 +277,18 @@
+@@ -228,6 +267,7 @@
+ fs_read_tmpfs_symlinks(lvm_t)
+ fs_dontaudit_read_removable_files(lvm_t)
+ fs_dontaudit_getattr_tmpfs_files(lvm_t)
++fs_rw_anon_inodefs_files(lvm_t)
+ 
+ storage_relabel_fixed_disk(lvm_t)
+ storage_dontaudit_read_removable_device(lvm_t)
+@@ -239,20 +279,28 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
@@ -26726,7 +26925,9 @@
  files_read_etc_files(lvm_t)
  files_read_etc_runtime_files(lvm_t)
  # for when /usr is not mounted:
-@@ -253,6 +297,7 @@
+ files_dontaudit_search_isid_type_dirs(lvm_t)
++files_dontaudit_getattr_tmpfs_files(lvm_t)
+ 
  init_use_fds(lvm_t)
  init_dontaudit_getattr_initctl(lvm_t)
  init_use_script_ptys(lvm_t)
@@ -26734,7 +26935,7 @@
  
  logging_send_syslog_msg(lvm_t)
  
-@@ -283,5 +328,22 @@
+@@ -283,5 +331,22 @@
  ')
  
  optional_policy(`
@@ -28367,8 +28568,24 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-04-07 15:53:36.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-09 05:27:54.000000000 -0400
-@@ -210,6 +210,11 @@
++++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-21 14:41:11.000000000 -0400
+@@ -50,6 +50,7 @@
+ allow udev_t self:unix_stream_socket connectto;
+ allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
+ allow udev_t self:rawip_socket create_socket_perms;
++allow udev_t self:netlink_socket create_socket_perms;
+ 
+ allow udev_t udev_exec_t:file write;
+ can_exec(udev_t, udev_exec_t)
+@@ -140,6 +141,7 @@
+ logging_send_audit_msgs(udev_t)
+ 
+ miscfiles_read_localization(udev_t)
++miscfiles_read_hwdata(udev_t)
+ 
+ modutils_domtrans_insmod(udev_t)
+ # read modules.inputmap:
+@@ -210,6 +212,11 @@
  ')
  
  optional_policy(`
@@ -28380,7 +28597,7 @@
  	lvm_domtrans(udev_t)
  ')
  
-@@ -219,6 +224,7 @@
+@@ -219,6 +226,7 @@
  
  optional_policy(`
  	hal_dgram_send(udev_t)
@@ -28388,7 +28605,7 @@
  ')
  
  optional_policy(`
-@@ -242,6 +248,10 @@
+@@ -242,6 +250,10 @@
  ')
  
  optional_policy(`
@@ -29161,7 +29378,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-18 06:14:35.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-20 08:25:48.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -30146,7 +30363,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1050,47 @@
+@@ -986,37 +1050,55 @@
  		')
  	')
  
@@ -30189,6 +30406,10 @@
 +	')
 +
 +	optional_policy(`
++		gpm_stream_connect($1_usertype)
++	')
++
++	optional_policy(`
 +		java_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -30200,6 +30421,10 @@
 +		mount_run($1_t, $1_r)
 +	')
 +
++	optional_policy(`
++		postfix_run_postdrop($1_t, $1_r)
++	')
++
 +	# Run pppd in pppd_t by default for user
 +	optional_policy(`
 +		ppp_run_cond($1_t, $1_r)
@@ -30208,7 +30433,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1124,7 @@
+@@ -1050,7 +1132,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -30217,7 +30442,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1133,7 @@
+@@ -1059,8 +1141,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -30227,7 +30452,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1156,8 @@
+@@ -1083,7 +1164,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -30237,7 +30462,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1099,6 +1173,7 @@
+@@ -1099,6 +1181,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -30245,7 +30470,7 @@
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1106,8 +1181,6 @@
+@@ -1106,8 +1189,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -30254,7 +30479,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1235,6 @@
+@@ -1162,20 +1243,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -30275,7 +30500,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1280,7 @@
+@@ -1221,6 +1288,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -30283,7 +30508,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1346,15 @@
+@@ -1286,11 +1354,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -30299,7 +30524,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1451,7 @@
+@@ -1387,7 +1459,7 @@
  
  ########################################
  ## <summary>
@@ -30308,7 +30533,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1484,14 @@
+@@ -1420,6 +1492,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -30323,7 +30548,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1507,11 @@
+@@ -1435,9 +1515,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -30335,7 +30560,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1568,25 @@
+@@ -1494,6 +1576,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -30361,7 +30586,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1568,6 +1661,8 @@
+@@ -1568,6 +1669,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -30370,7 +30595,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1738,7 @@
+@@ -1643,6 +1746,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -30378,7 +30603,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,30 +1837,80 @@
+@@ -1741,30 +1845,80 @@
  
  ########################################
  ## <summary>
@@ -30441,7 +30666,7 @@
 +interface(`userdom_dontaudit_delete_user_home_content_files',`
 +	gen_require(`
 +		type user_home_t;
-+	')
+ 	')
 +
 +	allow $1 user_home_t:dir delete_file_perms;
 +')
@@ -30461,7 +30686,7 @@
 +	gen_require(`
 +		type user_home_dir_t;
 +		attribute user_home_type;
- 	')
++	')
 +
 +	files_search_home($1)
 +	exec_files_pattern($1, { user_home_dir_t user_home_type }, user_home_type)
@@ -30469,7 +30694,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1933,46 @@
+@@ -1787,6 +1941,46 @@
  
  ########################################
  ## <summary>
@@ -30516,7 +30741,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -1799,6 +1985,7 @@
+@@ -1799,6 +1993,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -30524,7 +30749,7 @@
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2328,7 +2515,7 @@
+@@ -2328,7 +2523,7 @@
  
  ########################################
  ## <summary>
@@ -30533,17 +30758,59 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2814,7 +3001,25 @@
+@@ -2814,12 +3009,12 @@
  		type user_tmp_t;
  	')
  
 -	allow $1 user_tmp_t:file write_file_perms;
 +	write_files_pattern($1, user_tmp_t, user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to use user ttys.
++##	Delete all users files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2827,17 +3022,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_dontaudit_use_user_ttys',`
++interface(`userdom_delete_user_tmp_files',`
+ 	gen_require(`
+-		type user_tty_device_t;
++		type user_tmp_t;
+ 	')
+ 
+-	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
++	allow $1 user_tmp_t:file delete_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Read the process state of all user domains.
++##	Do not audit attempts to use user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2845,12 +3040,31 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_read_all_users_state',`
++interface(`userdom_dontaudit_use_user_ttys',`
++	gen_require(`
++		type user_tty_device_t;
++	')
++
++	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
 +')
 +
 +########################################
 +## <summary>
-+##	Delete all users files in /tmp
++##	Read the process state of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -30551,16 +30818,9 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_delete_user_tmp_files',`
-+	gen_require(`
-+		type user_tmp_t;
-+	')
-+
-+	allow $1 user_tmp_t:file delete_file_perms;
- ')
- 
- ########################################
-@@ -2851,6 +3056,7 @@
++interface(`userdom_read_all_users_state',`
+ 	gen_require(`
+ 		attribute userdomain;
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -30568,7 +30828,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2981,3 +3187,481 @@
+@@ -2981,3 +3195,481 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -31143,7 +31403,7 @@
 +# No application file contexts.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.12/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-20 07:58:28.000000000 -0400
 @@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
@@ -31453,7 +31713,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-20 07:59:14.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -r1.827 -r1.828
--- selinux-policy.spec	18 Apr 2009 12:13:36 -0000	1.827
+++ selinux-policy.spec	21 Apr 2009 20:31:51 -0000	1.828
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 8%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,17 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-11
+- Allow nsplugin unix_read and write on users shm and sem
+- Allow sysadm_t to execute su
+
+* Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-10
+- Dontaudit attempts to getattr user_tmpfs_t by lvm
+- Allow nfs to share removable media
+
+* Mon Apr 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-9
+- Add ability to run postdrop from confined users
+
 * Sat Apr 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-8
 - Fixes for podsleuth
 



From kevin at fedoraproject.org  Tue Apr 21 20:12:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:12:31 +0000 (UTC)
Subject: rpms/sakura - New directory
Message-ID: <20090421201231.2EC6470137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sakura
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16805/rpms/sakura

Log Message:
Directory /cvs/pkgs/rpms/sakura added to the repository




From kevin at fedoraproject.org  Tue Apr 21 20:12:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 21 Apr 2009 20:12:31 +0000 (UTC)
Subject: rpms/sakura/devel - New directory
Message-ID: <20090421201231.8E7B770137@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sakura/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16805/rpms/sakura/devel

Log Message:
Directory /cvs/pkgs/rpms/sakura/devel added to the repository




From jkeating at fedoraproject.org  Tue Apr 21 20:40:16 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 21 Apr 2009 20:40:16 +0000 (UTC)
Subject: rpms/fedora-release-notes/F-11 .cvsignore, 1.18,
	1.19 fedora-release-notes.spec, 1.35, 1.36 import.log, 1.2,
	1.3 sources, 1.28, 1.29
Message-ID: <20090421204017.0C10B700D6@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release-notes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25888/F-11

Modified Files:
	.cvsignore fedora-release-notes.spec import.log sources 
Log Message:
New upstream release.  Purposefully stomping on automated rebuild changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	8 Nov 2008 01:29:52 -0000	1.18
+++ .cvsignore	21 Apr 2009 20:40:12 -0000	1.19
@@ -1,6 +1,6 @@
-README-10.0.0.tar.gz
-README-BURNING-ISOS-10.0.0.tar.gz
-about-fedora-10.0.0.tar.gz
-fedora-release-notes-10.0.0.tar.gz
-homepage-10.0.0.tar.gz
-readme-live-image-10.0.0.tar.gz
+README-10.93.0.tar.gz
+README-BURNING-ISOS-10.93.0.tar.gz
+about-fedora-10.93.0.tar.gz
+fedora-release-notes-10.93.0.tar.gz
+homepage-10.93.0.tar.gz
+readme-live-image-10.93.0.tar.gz


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/fedora-release-notes.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fedora-release-notes.spec	27 Feb 2009 22:32:22 -0000	1.35
+++ fedora-release-notes.spec	21 Apr 2009 20:40:12 -0000	1.36
@@ -1,7 +1,18 @@
+# Documentation Specfile
+%define HTMLVIEW %(eval 'if [ "%{?dist}" = ".el5" ]; then echo "1"; else echo "0"; fi')
+
+%define viewer xdg-open
+
+%if %{HTMLVIEW}
+%define viewer htmlview
+%define vendor redhat-
+%define vendoropt --vendor="redhat"
+%endif
+
 Name:		fedora-release-notes
-Version:	10.0.0
-Release:	0.3
-Summary:	Release Notes for Fedora 10
+Version:	10.93.0
+Release:	1%{?dist}
+Summary:	Release Notes for Fedora 11
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
 Group:		System Environment/Base
@@ -16,6 +27,15 @@
 
 BuildArch:	noarch
 BuildRequires:	desktop-file-utils
+BuildRequires:	publican
+BuildRequires:	publican-fedora
+
+%if %{HTMLVIEW}
+Requires:	htmlview
+%else
+Requires:	xdg-utils
+%endif
+
 # In a perfect world, this spec would Requires: system-logos >=
 # 7.90.0-1, but we do not want to burden yum upgraders or respinners
 # unnecessarily.
@@ -25,7 +45,7 @@
 Provides:	system-release-notes = %{version}-%{release}
 
 %description 
-These are the official Release Notes for Fedora 10,
+These are the official Release Notes for Fedora 11,
 written and edited by the Fedora community.  For more
 information on the Release Notes process or how you can
 contribute, refer to the Release Notes HOWTO located at
@@ -41,28 +61,62 @@
 
 
 %build
-# One day maybe we'll use Publican here.
+%{__make} html-desktop-all
+%{__make} xml-all
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-install -m 644 fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-install -m 644 README-Accessibility $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-for DIR in stylesheet-images ; do
-  install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR
-  find $DIR -type f -exec install -m 644 '{}' $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR \;
-done
-# Don't like using links, but this cuts the payload by ~75%.
-for F in Release_Notes-*.html; do
-  L=`echo ${F} | %{__sed} 's/Release_Notes-\(.*\)\.html/\1/'`
-  install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${F}
-  ln -s ../../fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
-  for D in stylesheet-images ; do
-    install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D}
-    find $D -type f | while read foo ; do ln -s ../../../$foo $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D} ; done
-  done 
+mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}
+
+#
+# Loop through the languages
+#
+for LANGDIR in tmp/* ; do
+  #
+  # First, the html in /usr/share/doc/HTML
+  #
+  # Place where html files are
+  LANG=${LANGDIR#tmp/}
+  SRCBASE=tmp/${LANG}/html-desktop
+  # Target for release notes html
+  NOTETARG=$RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}/${LANG}
+  mkdir -p ${NOTETARG}
+  install -m 644 ${SRCBASE}/index.html ${NOTETARG}/%{name}-${LANG}.html
+  mkdir -p ${NOTETARG}/Common_Content
+  mkdir -p ${NOTETARG}/Common_Content/css
+  mkdir -p ${NOTETARG}/Common_Content/images
+  mkdir -p ${NOTETARG}/images
+  install -m 644 ${SRCBASE}/Common_Content/css/* ${NOTETARG}/Common_Content/css
+  install -m 644 ${SRCBASE}/Common_Content/images/* ${NOTETARG}/Common_Content/images
+  install -m 644 ${SRCBASE}/images/* ${NOTETARG}/images
+  #
+  # Now the gnome_help files
+  #
+  # Place where xml files are
+  SRCBASE=tmp/${LANG}/xml
+  # gnome-help target for xml files
+  HELPTARG=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}/${LANG}
+  mkdir -p ${HELPTARG}
+  mkdir -p ${HELPTARG}/Common_Content
+  mkdir -p ${HELPTARG}/images
+  install -m 644 ${SRCBASE}/images/* ${HELPTARG}/images
+  for F in ${SRCBASE}/Common_Content/*.xml ; do
+    install -m 644 ${F} ${HELPTARG}/Common_Content
+  done
+  mkdir -p ${HELPTARG}/Common_Content/css
+  install -m 644  ${SRCBASE}/Common_Content/css/* ${HELPTARG}/Common_Content/css
+  mkdir -p ${HELPTARG}/Common_Content/images
+  install -m 644 ${SRCBASE}/Common_Content/images/* ${HELPTARG}/Common_Content/images
+  for F in ${SRCBASE}/*.xml ; do
+    install -m 644 ${F} ${HELPTARG}/
+  done
+  install -m 644 ${SRCBASE}/Release_Notes.ent ${HELPTARG}/
 done
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/%{name}
+install -m 644 omf/*.omf $RPM_BUILD_ROOT%{_datadir}/omf/%{name}/
+
 pushd README-%{version}/
 for F in README-*.txt; do
   L=`echo ${F} | %{__sed} 's/README-\(.*\)\.txt/\1/'`
@@ -93,11 +147,6 @@
 install -m 644 about-*omf $RPM_BUILD_ROOT%{_datadir}/omf/about-fedora/
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
 popd
-pushd ghelp
-find -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/fedora-release-notes/{} \;
-popd
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes
-install -m 644 fedora-release-notes-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/%{name}/
 
 
 %clean
@@ -123,11 +172,15 @@
 %{_datadir}/omf/about-fedora/
 
 
+
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.0-0.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2009 John J. McDonough <jjmcd at fedoraproject.org> - 10.93.0-1
+- Use publican for F11 Preview release
+
+* Sun Nov 16 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-1
+- Updates for F10 GA release
 
-* Fri Nov  7 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-0.1
+* Fri Nov  7 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-0.2
 - Snapshot package for updated fedora-release compatibility
 
 * Thu Oct 30 2008 Paul W. Frields <stickster at gmail.com> - 9.92-4
@@ -280,4 +333,3 @@
 
 * Sun Jul 16 2006 Paul W. Frields <stickster at gmail.com> - 5.91-1
 - Initial release for Fedora Core 6 test2.
-


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2008 01:29:52 -0000	1.2
+++ import.log	21 Apr 2009 20:40:12 -0000	1.3
@@ -1,2 +1,3 @@
 fedora-release-notes-9_92-3:HEAD:fedora-release-notes-9.92-3.src.rpm:1225277926
 fedora-release-notes-10_0_0-0_1:HEAD:fedora-release-notes-10.0.0-0.1.src.rpm:1226107703
+fedora-release-notes-10_93_0-1_fc10:F-11:fedora-release-notes-10.93.0-1.fc10.src.rpm:1240345993


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	8 Nov 2008 01:29:52 -0000	1.28
+++ sources	21 Apr 2009 20:40:12 -0000	1.29
@@ -1,6 +1,6 @@
-c6e230bb36bab630112c5a93740f2f7e  README-10.0.0.tar.gz
-cef78a768ca7f9ce5aca2f2b61280162  README-BURNING-ISOS-10.0.0.tar.gz
-d4d4d3e2677812d66c69b4e96d654ee7  about-fedora-10.0.0.tar.gz
-3405838309537b2cc4032cc8588a0d45  fedora-release-notes-10.0.0.tar.gz
-69f49caf6c4a6470f80836b7cd0a1291  homepage-10.0.0.tar.gz
-d3b32700b8de676d8af39998ca96fc9c  readme-live-image-10.0.0.tar.gz
+95c56c8400816c5739a795bbaeb7998c  README-10.93.0.tar.gz
+4d6df8b91cdef65482c2e12b551b525e  README-BURNING-ISOS-10.93.0.tar.gz
+1f10f301845d8666a64f86faaf3f910d  about-fedora-10.93.0.tar.gz
+5dbf898ad4d8074e47ce86bcb6dada4d  fedora-release-notes-10.93.0.tar.gz
+3a313db11a49705079a4cca80b3b41a1  homepage-10.93.0.tar.gz
+bd081a3b4df49a10b67c7b02912fc164  readme-live-image-10.93.0.tar.gz



From dcantrel at fedoraproject.org  Tue Apr 21 20:41:37 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 21 Apr 2009 20:41:37 +0000 (UTC)
Subject: rpms/dhcp/devel dhclient-script,1.11,1.12 dhcp.spec,1.254,1.255
Message-ID: <20090421204137.9B829700D6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26317

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
- Restrict interface names given on the dhcpd command line to length
  IFNAMSIZ or shorter (#441524)
- Change to /etc/sysconfig/network-scripts in dhclient-script before
  calling need_config or source_config (#496233)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dhclient-script	21 Apr 2009 01:14:15 -0000	1.11
+++ dhclient-script	21 Apr 2009 20:41:30 -0000	1.12
@@ -420,7 +420,8 @@
     . /etc/sysconfig/networking/network
 fi
 
-CONFIG="/etc/sysconfig/network-scripts/ifcfg-${interface}"
+cd /etc/sysconfig/network-scripts
+CONFIG="ifcfg-${interface}"
 need_config ${CONFIG}
 source_config >/dev/null 2>&1
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- dhcp.spec	21 Apr 2009 02:39:32 -0000	1.254
+++ dhcp.spec	21 Apr 2009 20:41:30 -0000	1.255
@@ -426,6 +426,8 @@
 * Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
 - Restrict interface names given on the dhcpd command line to length
   IFNAMSIZ or shorter (#441524)
+- Change to /etc/sysconfig/network-scripts in dhclient-script before
+  calling need_config or source_config (#496233)
 
 * Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
 - Make dhclient-script work with pre-configured wireless interfaces (#491157)



From rstrode at fedoraproject.org  Tue Apr 21 20:42:42 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 21 Apr 2009 20:42:42 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.26.1-multistack.patch, NONE, 1.1 gdm.spec,
	1.463, 1.464 gdm-2.26.0-multistack.patch, 1.1, NONE
Message-ID: <20090421204242.E2FF7700D6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26507

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.26.1-multistack.patch 
Removed Files:
	gdm-2.26.0-multistack.patch 
Log Message:
- Stop inactive pam conversations when one succeeds.
  Should fix bug 496234


gdm-2.26.1-multistack.patch:

--- NEW FILE gdm-2.26.1-multistack.patch ---
>From b96b21d5497ce4ed3b362f4dc09b2f5fd654f3a3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 20 Feb 2009 13:52:19 -0500
Subject: [PATCH 01/33] Add a comment marking protected api in chooser

The chooser widget has methods that only its
subclasses are supposed to call.  We should
mark them as such.
---
 gui/simple-greeter/gdm-chooser-widget.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h
index 578e613..7e3e59c 100644
--- a/gui/simple-greeter/gdm-chooser-widget.h
+++ b/gui/simple-greeter/gdm-chooser-widget.h
@@ -136,6 +136,8 @@ int            gdm_chooser_widget_get_number_of_items          (GdmChooserWidget
 void           gdm_chooser_widget_activate_if_one_item         (GdmChooserWidget          *widget);
 void           gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget          *widget);
 
+/* Protected
+ */
 void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
 
 G_END_DECLS
-- 
1.6.2.2


>From fafe68243000a7b2f97086daa3d4ad651e7ac905 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 17:44:37 -0500
Subject: [PATCH 02/33] Drop duplicated entry introspection output

---
 daemon/gdm-greeter-server.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 2e01d33..cecce83 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -752,7 +752,6 @@ do_introspect (DBusConnection *connection,
                                "      <arg name=\"layout_name\" type=\"s\"/>\n"
                                "    </signal>\n"
                                "    <signal name=\"DefaultSessionNameChanged\">\n"
-                               "    <signal name=\"DefaultSessionNameChanged\">\n"
                                "      <arg name=\"session_name\" type=\"s\"/>\n"
                                "    </signal>\n"
                                "    <signal name=\"TimedLoginRequested\">\n"
-- 
1.6.2.2


>From 4dc394bb5b87d3cbead40bb6565eec75d755ddae Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 2 Mar 2009 10:07:03 -0500
Subject: [PATCH 03/33] Make lookup_item not warn when passing NULL for args

gtk_tree_model_get doesn't like NULL, and we allow
NULL for optional return values.

We now check each argument for NULL and call
gtk_tree_model_get individually N times (one for
each argument) instead of just once.
---
 gui/simple-greeter/gdm-chooser-widget.c |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index f0298c6..b1ba9b4 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -2132,13 +2132,30 @@ gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
         }
         g_free (active_item_id);
 
-        gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-                            CHOOSER_IMAGE_COLUMN, image,
-                            CHOOSER_NAME_COLUMN, name,
-                            CHOOSER_PRIORITY_COLUMN, priority,
-                            CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use,
-                            CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate,
-                            -1);
+        if (image != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_IMAGE_COLUMN, image, -1);
+        }
+
+        if (name != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_NAME_COLUMN, name, -1);
+        }
+
+        if (priority != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_PRIORITY_COLUMN, priority, -1);
+        }
+
+        if (is_in_use != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, -1);
+        }
+
+        if (is_separate != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1);
+        }
 
         return TRUE;
 }
-- 
1.6.2.2


>From c68b126096e04b3b963a10658d5a835ab716599f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 15:35:00 -0500
Subject: [PATCH 04/33] Drop "stopped" signal from worker-job class

It was unused, dead code.
---
 daemon/gdm-session-direct.c     |   14 --------------
 daemon/gdm-session-worker-job.c |   11 -----------
 daemon/gdm-session-worker-job.h |    1 -
 3 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 34a126f..3942ec7 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -1548,13 +1548,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
 }
 
 static void
-worker_stopped (GdmSessionWorkerJob *job,
-                GdmSessionDirect    *session)
-{
-        g_debug ("GdmSessionDirect: Worker job stopped");
-}
-
-static void
 worker_started (GdmSessionWorkerJob *job,
                 GdmSessionDirect    *session)
 {
@@ -1605,10 +1598,6 @@ start_worker (GdmSessionDirect *session)
         session->priv->job = gdm_session_worker_job_new ();
         gdm_session_worker_job_set_server_address (session->priv->job, session->priv->server_address);
         g_signal_connect (session->priv->job,
-                          "stopped",
-                          G_CALLBACK (worker_stopped),
-                          session);
-        g_signal_connect (session->priv->job,
                           "started",
                           G_CALLBACK (worker_started),
                           session);
@@ -1630,9 +1619,6 @@ static void
 stop_worker (GdmSessionDirect *session)
 {
         g_signal_handlers_disconnect_by_func (session->priv->job,
-                                              G_CALLBACK (worker_stopped),
-                                              session);
-        g_signal_handlers_disconnect_by_func (session->priv->job,
                                               G_CALLBACK (worker_started),
                                               session);
         g_signal_handlers_disconnect_by_func (session->priv->job,
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 6723464..633d6e2 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -68,7 +68,6 @@ enum {
 
 enum {
         STARTED,
-        STOPPED,
         EXITED,
         DIED,
         LAST_SIGNAL
@@ -390,16 +389,6 @@ gdm_session_worker_job_class_init (GdmSessionWorkerJobClass *klass)
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE,
                               0);
-        signals [STOPPED] =
-                g_signal_new ("stopped",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (GdmSessionWorkerJobClass, stopped),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
         signals [EXITED] =
                 g_signal_new ("exited",
                               G_OBJECT_CLASS_TYPE (object_class),
diff --git a/daemon/gdm-session-worker-job.h b/daemon/gdm-session-worker-job.h
index d42eb37..5ad1c92 100644
--- a/daemon/gdm-session-worker-job.h
+++ b/daemon/gdm-session-worker-job.h
[...17649 lines suppressed...]

>From c98a8ac6971b44071aef38a29b550378554a733b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 13 Apr 2009 14:19:50 -0400
Subject: [PATCH 31/33] reset all conversations if password conversation fails

This is a temporary hack until we store plugin policy in
gconf.
---
 gui/simple-greeter/gdm-greeter-login-window.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index a16948f..3daf89d 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -907,6 +907,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
 
         g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
 
+        /* If the password conversation failed, then start over
+         *
+         * FIXME: we need to get this policy out of the source code
+         */
+        if (strcmp (service_name, "gdm-password") == 0) {
+                g_debug ("GdmGreeterLoginWindow: main conversation failed, starting over");
+                restart_conversations (login_window);
+                return TRUE;
+        }
+
         task = find_task_with_service_name (login_window, service_name);
 
         if (task != NULL) {
-- 
1.6.2.2


>From 339ca93db8f4896eaf02667c1268ddc9d1830345 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 10:25:18 -0400
Subject: [PATCH 32/33] When one PAM conversation wins, stop the others

This doesn't work yet, it's still in progress code.
---
 daemon/gdm-session-direct.c |   64 ++++++++++++++++++++++++++++++-------------
 daemon/gdm-simple-slave.c   |    2 +-
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 805adbf..cb84f01 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -2284,6 +2284,40 @@ gdm_session_direct_open_session (GdmSession *session,
 }
 
 static void
+stop_all_other_conversations (GdmSessionDirect        *session,
+                              GdmSessionConversation  *conversation_to_keep)
+{
+        GHashTableIter iter;
+        gpointer key, value;
+
+        if (session->priv->conversations == NULL) {
+                return;
+        }
+
+        if (conversation_to_keep == NULL) {
+                g_debug ("GdmSessionDirect: Stopping all conversations");
+        } else {
+                g_debug ("GdmSessionDirect: Stopping all conversations "
+                         "except for %s", conversation_to_keep->service_name);
+        }
+
+        g_hash_table_iter_init (&iter, session->priv->conversations);
+        while (g_hash_table_iter_next (&iter, &key, &value)) {
+                GdmSessionConversation *conversation;
+
+                conversation = (GdmSessionConversation *) value;
+
+                if (conversation == conversation_to_keep) {
+                        continue;
+                }
+
+                stop_conversation (conversation);
+        }
+
+        g_hash_table_remove_all (session->priv->conversations);
+}
+
+static void
 gdm_session_direct_start_session (GdmSession *session,
                                   const char *service_name)
 {
@@ -2295,12 +2329,20 @@ gdm_session_direct_start_session (GdmSession *session,
         g_return_if_fail (session != NULL);
         g_return_if_fail (impl->priv->is_running == FALSE);
 
+        conversation = find_conversation_by_name (impl, service_name);
+
+        if (conversation == NULL) {
+                g_warning ("GdmSessionDirect: Tried to start session of "
+                           "nonexistent conversation %s", service_name);
+                return;
+        }
+
+        stop_all_other_conversations (impl, conversation);
+
         command = get_session_command (impl);
         program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
         g_free (command);
 
-        conversation = find_conversation_by_name (impl, service_name);
-
         setup_session_environment (impl);
         send_environment (impl, conversation);
 
@@ -2311,23 +2353,7 @@ gdm_session_direct_start_session (GdmSession *session,
 static void
 stop_all_conversations (GdmSessionDirect *session)
 {
-        GHashTableIter iter;
-        gpointer key, value;
-
-        if (session->priv->conversations == NULL) {
-                return;
-        }
-
-        g_hash_table_iter_init (&iter, session->priv->conversations);
-        while (g_hash_table_iter_next (&iter, &key, &value)) {
-                GdmSessionConversation *conversation;
-
-                conversation = (GdmSessionConversation *) value;
-
-                stop_conversation (conversation);
-        }
-
-        g_hash_table_remove_all (session->priv->conversations);
+        stop_all_other_conversations (session, NULL);
 }
 
 static void
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 09a7425..a70c9c9 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -569,7 +569,7 @@ on_session_conversation_stopped (GdmSession     *session,
         gboolean res;
         g_debug ("GdmSimpleSlave: conversation stopped");
 
-        if (slave->priv->greeter_server != NULL) {
+        if (slave->priv->greeter != NULL) {
                 res = gdm_greeter_server_conversation_stopped (slave->priv->greeter_server,
                                                                service_name);
                 if (! res) {
-- 
1.6.2.2


>From 80107a061b3ac2300e9cec17f18d5dc02557a8d3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 15:30:28 -0400
Subject: [PATCH 33/33] When one PAM conv. wins, actually stop the others

We weren't properly keeping the winning conversation
around in the previous commit
---
 daemon/gdm-session-direct.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index cb84f01..7173080 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -2308,13 +2308,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
                 conversation = (GdmSessionConversation *) value;
 
                 if (conversation == conversation_to_keep) {
-                        continue;
+                        g_hash_table_iter_steal (&iter);
+                        g_free (key);
+                } else {
+                        stop_conversation (conversation);
                 }
-
-                stop_conversation (conversation);
         }
 
         g_hash_table_remove_all (session->priv->conversations);
+
+        if (conversation_to_keep != NULL) {
+                g_hash_table_insert (session->priv->conversations,
+                                     g_strdup (conversation_to_keep->service_name),
+                                     conversation_to_keep);
+        }
 }
 
 static void
-- 
1.6.2.2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- gdm.spec	14 Apr 2009 14:41:47 -0000	1.463
+++ gdm.spec	21 Apr 2009 20:42:41 -0000	1.464
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -96,7 +96,7 @@
 # should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
 
-Patch19: gdm-2.26.0-multistack.patch
+Patch19: gdm-2.26.1-multistack.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -380,6 +380,10 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Apr 21 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-2
+- Stop inactive pam conversations when one succeeds.
+  Should fix bug 496234
+
 * Tue Apr 14 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 


--- gdm-2.26.0-multistack.patch DELETED ---



From cebbert at fedoraproject.org  Tue Apr 21 20:45:40 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 21 Apr 2009 20:45:40 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1338,1.1339
Message-ID: <20090421204541.24E817013C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27680

Modified Files:
	kernel.spec 
Log Message:
Don't include the modules.*.bin files in the RPM package.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1338
retrieving revision 1.1339
diff -u -r1.1338 -r1.1339
--- kernel.spec	21 Apr 2009 10:46:43 -0000	1.1338
+++ kernel.spec	21 Apr 2009 20:45:08 -0000	1.1339
@@ -1604,7 +1604,7 @@
     rm -f modinfo modnames
 
     # remove files that will be auto generated by depmod at rpm -i time
-    for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
+    for i in alias alias.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap
     do
       rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
     done
@@ -1928,6 +1928,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-39
+- Don't include the modules.*.bin files in the RPM package.
+
 * Mon Apr 21 2009 Neil Horman <nhorman at redhat.com> 2.6.29.1-38
 - Reduce ftrace memory usage at boot (bz 481448) 
 



From pghmcfc at fedoraproject.org  Tue Apr 21 20:55:14 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 20:55:14 +0000 (UTC)
Subject: rpms/ORBit/F-11 ORBit-0.5.17-non-weak-symbols.patch, NONE,
	1.1 ORBit.spec, 1.9, 1.10
Message-ID: <20090421205514.4793E700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/ORBit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30863

Modified Files:
	ORBit.spec 
Added Files:
	ORBit-0.5.17-non-weak-symbols.patch 
Log Message:
- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one


ORBit-0.5.17-non-weak-symbols.patch:

--- NEW FILE ORBit-0.5.17-non-weak-symbols.patch ---
diff -ur ORBit-0.5.17.orig/src/Makefile.am ORBit-0.5.17/src/Makefile.am
--- ORBit-0.5.17.orig/src/Makefile.am	1999-06-09 22:26:57.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.am	2009-04-09 14:51:55.000000000 +0100
@@ -1 +1 @@
-SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
diff -ur ORBit-0.5.17.orig/src/Makefile.in ORBit-0.5.17/src/Makefile.in
--- ORBit-0.5.17.orig/src/Makefile.in	2002-06-06 12:34:43.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.in	2009-04-09 14:53:28.000000000 +0100
@@ -97,7 +97,7 @@
 YACC = @YACC@
 pkglibdir = @pkglibdir@
 
-SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.am ORBit-0.5.17/src/orb/Makefile.am
--- ORBit-0.5.17.orig/src/orb/Makefile.am	2002-06-06 12:07:39.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.am	2009-04-09 15:03:50.000000000 +0100
@@ -98,7 +98,7 @@
 	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
 
 BUILT_SOURCES = \
 	orbit.h	\
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.in ORBit-0.5.17/src/orb/Makefile.in
--- ORBit-0.5.17.orig/src/orb/Makefile.in	2002-06-06 12:34:48.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.in	2009-04-09 15:03:31.000000000 +0100
@@ -116,7 +116,7 @@
 IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
 
 BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
 
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.am ORBit-0.5.17/src/services/name/Makefile.am
--- ORBit-0.5.17.orig/src/services/name/Makefile.am	2002-06-06 12:07:45.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.am	2009-04-09 15:08:51.000000000 +0100
@@ -18,6 +18,8 @@
 libORBitCosNaming_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
+
 INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
 
 IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.in ORBit-0.5.17/src/services/name/Makefile.in
--- ORBit-0.5.17.orig/src/services/name/Makefile.in	2002-06-06 12:34:52.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.in	2009-04-09 15:09:48.000000000 +0100
@@ -171,7 +171,7 @@
 AR = ar
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
-libORBitCosNaming_la_LIBADD = 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
 libORBitCosNaming_la_OBJECTS =  CosNaming-common.lo CosNaming-stubs.lo \
 LName.lo
 bin_PROGRAMS =  name-client$(EXEEXT) orbit-name-server$(EXEEXT) \


Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/F-11/ORBit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ORBit.spec	24 Feb 2009 10:02:02 -0000	1.9
+++ ORBit.spec	21 Apr 2009 20:54:42 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		25%{?dist}
+Release:		26%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -9,6 +9,7 @@
 Patch1:			ORBit-underquoted.patch
 Patch2:			ORBit-0.5.17-IIOP-weak-symbols.patch
 Patch3:			ORBit-0.5.17-multiarch.patch
+Patch4:			ORBit-0.5.17-non-weak-symbols.patch
 Group:			System Environment/Daemons
 License:		LGPLv2+ and GPLv2+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +19,7 @@
 # Using system popt library would be highly likely to introduce regressions in this
 # ancient piece of legacy code.
 %if 0%{?fedora} > 10
-BuildRequires:		glibc-static
+BuildRequires:		glibc-static%{?_isa}
 %endif
 
 Requires(post):		/sbin/install-info
@@ -57,17 +58,22 @@
 %setup -q
 %patch0 -p1 -b .aligned
 %patch1 -p1 -b .underquoted
-%patch2 -p1 -b .weak-symbols
+%patch2 -p1 -b .iiop-non-weak-symbols
 %patch3 -p1 -b .multiarch
+%patch4 -p1 -b .non-weak-symbols
 
 %build
 %configure
+
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 # %{?_smp_mflags} removed at release 1:0.5.17-10.2
-%{__make} LIBTOOL=/usr/bin/libtool
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" LIBTOOL=/usr/bin/libtool install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 
 # remove unpackaged files
 %{__rm} -f %{buildroot}%{_bindir}/ior-decode
@@ -131,9 +137,14 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Apr  9 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-26
+- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
 * Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-25
 - Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
-- Buildreq glibc-static for test code in bundled popt library
+- Buildreq glibc-static for test code in bundled popt library (F-11 onwards)
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.5.17-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From cebbert at fedoraproject.org  Tue Apr 21 20:57:40 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 21 Apr 2009 20:57:40 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1525,1.1526
Message-ID: <20090421205740.6893C700D6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31327

Modified Files:
	kernel.spec 
Log Message:
Don't include the modules.*.bin files in the RPM package.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1525
retrieving revision 1.1526
diff -u -r1.1525 -r1.1526
--- kernel.spec	21 Apr 2009 16:53:34 -0000	1.1525
+++ kernel.spec	21 Apr 2009 20:57:02 -0000	1.1526
@@ -1478,7 +1478,7 @@
     rm -f modinfo modnames
 
     # remove files that will be auto generated by depmod at rpm -i time
-    for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
+    for i in alias alias.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap
     do
       rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
     done
@@ -1817,6 +1817,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com>
+- Don't include the modules.*.bin files in the RPM package.
+
 * Tue Apr 21 2009 Dave Jones <davej at redhat.com>
 - 2.6.30-rc2-git7
 



From pghmcfc at fedoraproject.org  Tue Apr 21 20:57:58 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 20:57:58 +0000 (UTC)
Subject: rpms/ORBit/F-10 ORBit-0.5.17-non-weak-symbols.patch, NONE,
	1.1 ORBit.spec, 1.7, 1.8
Message-ID: <20090421205758.E1164700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/ORBit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31417

Modified Files:
	ORBit.spec 
Added Files:
	ORBit-0.5.17-non-weak-symbols.patch 
Log Message:
- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one
- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires


ORBit-0.5.17-non-weak-symbols.patch:

--- NEW FILE ORBit-0.5.17-non-weak-symbols.patch ---
diff -ur ORBit-0.5.17.orig/src/Makefile.am ORBit-0.5.17/src/Makefile.am
--- ORBit-0.5.17.orig/src/Makefile.am	1999-06-09 22:26:57.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.am	2009-04-09 14:51:55.000000000 +0100
@@ -1 +1 @@
-SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
diff -ur ORBit-0.5.17.orig/src/Makefile.in ORBit-0.5.17/src/Makefile.in
--- ORBit-0.5.17.orig/src/Makefile.in	2002-06-06 12:34:43.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.in	2009-04-09 14:53:28.000000000 +0100
@@ -97,7 +97,7 @@
 YACC = @YACC@
 pkglibdir = @pkglibdir@
 
-SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.am ORBit-0.5.17/src/orb/Makefile.am
--- ORBit-0.5.17.orig/src/orb/Makefile.am	2002-06-06 12:07:39.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.am	2009-04-09 15:03:50.000000000 +0100
@@ -98,7 +98,7 @@
 	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
 
 BUILT_SOURCES = \
 	orbit.h	\
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.in ORBit-0.5.17/src/orb/Makefile.in
--- ORBit-0.5.17.orig/src/orb/Makefile.in	2002-06-06 12:34:48.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.in	2009-04-09 15:03:31.000000000 +0100
@@ -116,7 +116,7 @@
 IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
 
 BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
 
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.am ORBit-0.5.17/src/services/name/Makefile.am
--- ORBit-0.5.17.orig/src/services/name/Makefile.am	2002-06-06 12:07:45.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.am	2009-04-09 15:08:51.000000000 +0100
@@ -18,6 +18,8 @@
 libORBitCosNaming_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
+
 INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
 
 IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.in ORBit-0.5.17/src/services/name/Makefile.in
--- ORBit-0.5.17.orig/src/services/name/Makefile.in	2002-06-06 12:34:52.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.in	2009-04-09 15:09:48.000000000 +0100
@@ -171,7 +171,7 @@
 AR = ar
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
-libORBitCosNaming_la_LIBADD = 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
 libORBitCosNaming_la_OBJECTS =  CosNaming-common.lo CosNaming-stubs.lo \
 LName.lo
 bin_PROGRAMS =  name-client$(EXEEXT) orbit-name-server$(EXEEXT) \


Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/F-10/ORBit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ORBit.spec	13 Feb 2008 11:55:31 -0000	1.7
+++ ORBit.spec	21 Apr 2009 20:57:54 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		23%{?dist}
+Release:		26%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -9,10 +9,18 @@
 Patch1:			ORBit-underquoted.patch
 Patch2:			ORBit-0.5.17-IIOP-weak-symbols.patch
 Patch3:			ORBit-0.5.17-multiarch.patch
+Patch4:			ORBit-0.5.17-non-weak-symbols.patch
 Group:			System Environment/Daemons
 License:		LGPLv2+ and GPLv2+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:		flex, gettext, glib-devel, /usr/include/tcpd.h, pkgconfig, libtool
+BuildRequires:		flex, gettext, glib-devel%{?_isa}, /usr/include/tcpd.h, pkgconfig, libtool
+
+# Test code in built-in popt library is built statically.
+# Using system popt library would be highly likely to introduce regressions in this
+# ancient piece of legacy code.
+%if 0%{?fedora} > 10
+BuildRequires:		glibc-static%{?_isa}
+%endif
 
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
@@ -31,8 +39,8 @@
 Summary:	Development libraries, header files and utilities for ORBit
 Group:		Development/Libraries
 Requires:	indent
-Requires:	glib-devel
-Requires:	ORBit = %{epoch}:%{version}-%{release}
+Requires:	glib-devel%{?_isa}
+Requires:	ORBit%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	pkgconfig
 
 # For ownership of %{_datadir}/aclocal
@@ -50,17 +58,22 @@
 %setup -q
 %patch0 -p1 -b .aligned
 %patch1 -p1 -b .underquoted
-%patch2 -p1 -b .weak-symbols
+%patch2 -p1 -b .iiop-non-weak-symbols
 %patch3 -p1 -b .multiarch
+%patch4 -p1 -b .non-weak-symbols
 
 %build
 %configure
+
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 # %{?_smp_mflags} removed at release 1:0.5.17-10.2
-%{__make} LIBTOOL=/usr/bin/libtool
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" LIBTOOL=/usr/bin/libtool install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 
 # remove unpackaged files
 %{__rm} -f %{buildroot}%{_bindir}/ior-decode
@@ -124,6 +137,18 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Apr  9 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-26
+- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
+* Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-25
+- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+- Buildreq glibc-static for test code in bundled popt library (F-11 onwards)
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.5.17-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:0.5.17-23
 - Rebuild with gcc 4.3.0 for Fedora 9
 



From pghmcfc at fedoraproject.org  Tue Apr 21 21:02:30 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 21:02:30 +0000 (UTC)
Subject: rpms/gtk+/F-11 gtk+-1.2.10-unused-deps.patch, NONE, 1.1 gtk+.spec, 
	1.19, 1.20
Message-ID: <20090421210230.B9771700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtk+/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32536

Modified Files:
	gtk+.spec 
Added Files:
	gtk+-1.2.10-unused-deps.patch 
Log Message:
- remove unused shared library dependencies
- use install -p to maintain timestamps where reasonable
- recode docs as UTF-8
- cosmetic spec changes


gtk+-1.2.10-unused-deps.patch:

--- NEW FILE gtk+-1.2.10-unused-deps.patch ---
--- gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:02:02.000000000 +0100
+++ gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:05:49.000000000 +0100
@@ -22,10 +22,9 @@
 	-release $(LT_RELEASE) \
 	-export-dynamic \
 	-no-undefined -Wl,--no-undefined \
-	@GLIB_DEPLIBS@	\
+	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
 	@x_ldflags@	\
 	@x_libs@	\
-	-lm		\
 @STRIP_END@
 
 #
--- gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:46:56.000000000 +0100
+++ gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:52:24.000000000 +0100
@@ -32,9 +32,9 @@
 	-release $(LT_RELEASE) 					\
 	-export-dynamic						\
 	-no-undefined -Wl,--no-undefined			\
-	@GLIB_DEPLIBS@ 						\
+	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
 	@x_ldflags@						\
-	@x_libs@ 						\
+	$(filter-out -lXi -lXext, @x_libs@)			\
 	-lm							\
 @STRIP_END@
 #	$(top_builddir)/gdk/libgdk.la


Index: gtk+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/F-11/gtk+.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtk+.spec	25 Feb 2009 01:43:40 -0000	1.19
+++ gtk+.spec	21 Apr 2009 21:01:58 -0000	1.20
@@ -1,89 +1,89 @@
-Summary: The GIMP ToolKit
-Name: 	 gtk+
-Epoch:	 1
-Version: 1.2.10
-Release: 67%{?dist}
-
-License: LGPLv2+
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source0: ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Provides: gtk1 = %{version}-%{release}
-
-Source1: gtkrc-default
-Source2: gtk+-pofiles.tar.gz
-Source3: gtkrc.ja.utf8
-Source4: gtkrc.ko.utf8
-Source5: gtkrc.zh_CN.utf8
-Source6: gtkrc.zh_TW.utf8
-
-Patch1: gtk+-1.2.10-ahiguti.patch
-Patch5: gtk+-1.2.8-wrap-alnum.patch
-# Supress alignment warnings on ia64
-Patch10: gtk+-1.2.10-alignment.patch
+Summary:	The GIMP ToolKit
+Name:		gtk+
+Epoch:		1
+Version:	1.2.10
+Release:	68%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source0:	ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:	gtk1 = %{version}-%{release}
+
+Source1:	gtkrc-default
+Source2:	gtk+-pofiles.tar.gz
+Source3:	gtkrc.ja.utf8
+Source4:	gtkrc.ko.utf8
+Source5:	gtkrc.zh_CN.utf8
+Source6:	gtkrc.zh_TW.utf8
+
+Patch1:		gtk+-1.2.10-ahiguti.patch
+Patch5:		gtk+-1.2.8-wrap-alnum.patch
+# Suppress alignment warnings on ia64
+Patch10:	gtk+-1.2.10-alignment.patch
 # Improve exposure compression
-Patch11: gtk+-1.2.10-expose.patch
+Patch11:	gtk+-1.2.10-expose.patch
 # Handle focus tracking for embedded window properly
-Patch12: gtk+-1.2.10-focus.patch
+Patch12:	gtk+-1.2.10-focus.patch
 # Find gtkrc files for the current encoding better
-Patch13: gtk+-1.2.10-encoding.patch
+Patch13:	gtk+-1.2.10-encoding.patch
 # Don't screw up CTEXT encoding for UTF-8
-Patch14: gtk+-1.2.10-ctext.patch
+Patch14:	gtk+-1.2.10-ctext.patch
 # Don't warn about missing fonts for UTF-8
-Patch15: gtk+-1.2.10-utf8fontset.patch
+Patch15:	gtk+-1.2.10-utf8fontset.patch
 # Accept KP_Enter as a synonym for Return everywhere
-Patch16: gtk+-1.2.10-kpenter.patch
+Patch16:	gtk+-1.2.10-kpenter.patch
 # Allow theme switching to work properly when no windows are realized
-Patch17: gtk+-1.2.10-themeswitch.patch
+Patch17:	gtk+-1.2.10-themeswitch.patch
 # Fix crash when switching themes
-Patch18: gtk+-1.2.10-pixmapref.patch
+Patch18:	gtk+-1.2.10-pixmapref.patch
 # Fix computation of width of missing characters
-Patch19: gtk+-1.2.10-missingchar.patch
+Patch19:	gtk+-1.2.10-missingchar.patch
 # Fix sizes of Ukrainian fontsets
-Patch20: gtk+-1.2.10-ukfont.patch
+Patch20:	gtk+-1.2.10-ukfont.patch
 # Fix file selection delete-dir when changing directory problem
 # also, fix memory corruption problem when changing directories.
-Patch21: gtk+-1.2.10-deletedir.patch
+Patch21:	gtk+-1.2.10-deletedir.patch
 # Improve warning for missing fonts
-Patch22: gtk+-1.2.10-fontwarning.patch
+Patch22:	gtk+-1.2.10-fontwarning.patch
 # Allow themes to make scrollbar trough always repaint
-Patch23: gtk+-1.2.10-troughpaint.patch
+Patch23:	gtk+-1.2.10-troughpaint.patch
 # Fix a crash that can happen in some apps when the current
 # locale is not supported by XLib.
-Patch24: gtk+-1.2.10-localecrash.patch
+Patch24:	gtk+-1.2.10-localecrash.patch
 # Patch from CVS to fix b.g.o #56349
-Patch26: gtk+-1.2.10-dndorder.patch
+Patch26:	gtk+-1.2.10-dndorder.patch
 # Patch from CVS to fix b.g.o #94812
-Patch27: gtk+-1.2.10-clistfocusrow.patch
+Patch27:	gtk+-1.2.10-clistfocusrow.patch
 # Fix GTK+ to obey X server's default bell volume
-Patch28: gtk+-1.2.10-bellvolume.patch
+Patch28:	gtk+-1.2.10-bellvolume.patch
 # Hack up the configure scripts to deal with some obscure
 # breakage with ancient libtool
-Patch29: gtk+-1.2.10-libtool.patch
+Patch29:	gtk+-1.2.10-libtool.patch
 # Add a dependency on libgdk to libgtk (#106677)
-Patch30: gtk+-1.2.10-gtkgdkdep.patch
-Patch31: gtk+-underquoted.patch
-Patch32: gtk+-1.2.10-ppc64.patch
+Patch30:	gtk+-1.2.10-gtkgdkdep.patch
+Patch31:	gtk+-underquoted.patch
+Patch32:	gtk+-1.2.10-ppc64.patch
 # do not allow for undefined symbols in shared libraries -- Rex
-Patch33: gtk+-1.2.10-no_undefined.patch
+Patch33:	gtk+-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222298
-Patch34: gtk+-1.2.10-multilib.patch
-
-BuildRequires: glib-devel >= 1:%{version}
-#Requires:     glib >= 1:%{version}
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
-BuildRequires: gettext
+Patch34:	gtk+-1.2.10-multilib.patch
+# Remove redundant shared library dependencies
+Patch35:	gtk+-1.2.10-unused-deps.patch
+
+BuildRequires:	glib-devel >= 1:%{version}
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
+BuildRequires:	gettext
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps  libX11-devel libXext-devel libXi-devel libXt-devel
+%global x_deps	libX11-devel libXext-devel libXi-devel libXt-devel
 %else
-%define x_deps	xorg-x11-devel
+%global x_deps	xorg-x11-devel
 ## This can be used for legacy too -- Rex
-#define	x_deps	Xree86-devel
+#global	x_deps	XFree86-devel
 %endif
-BuildRequires: %{x_deps} 
+BuildRequires:	%{x_deps} 
 
 %description
 The gtk+ package contains the GIMP ToolKit (GTK+), a library for
@@ -92,17 +92,18 @@
 processing program, but is now used by several other programs as
 well.
 
-%package devel
-Summary: Development tools for GTK+ (GIMP ToolKit) applications
-Group: Development/Libraries
-Provides: gtk1-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: glib-devel
-Requires: pkgconfig
-Requires: %{x_deps} 
+%package	devel
+Summary:	Development tools for GTK+ (GIMP ToolKit) applications
+Group:		Development/Libraries
+Provides:	gtk1-devel = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib-devel
+Requires:	pkgconfig
+Requires:	%{x_deps} 
 ## info files not included
 #Requires(post): /sbin/install-info
 #Requires(preun): /sbin/install-info
+
 %description devel
 Libraries, header files and documentation for developing GTK+ 
 (GIMP ToolKit) applications.
@@ -137,80 +138,86 @@
 %patch32 -p1 -b .ppc64
 %patch33 -p1 -b .no_undefined
 %patch34 -p1 -b .multilib
+%patch35 -p1 -b .unused-deps
 
 # The original config.{guess,sub} do not work on x86_64
 #
 # The following /usr/lib cannot be %%_libdir !!
-cp -p /usr/lib/rpm/config.{guess,sub} .
-
-#cp -f %{_datadir}/aclocal/libtool.m4 .
-#libtoolize --copy --force
-automake-1.4
-#aclocal-1.4
-autoconf-2.13
-autoheader-2.13
+%{__cp} -p /usr/lib/rpm/config.{guess,sub} .
 
+#%{__cp} -f %{_datadir}/aclocal/libtool.m4 .
+#/usr/bin/libtoolize --copy --force
+/usr/bin/automake-1.4
+#/usr/bin/aclocal-1.4
+/usr/bin/autoconf-2.13
+/usr/bin/autoheader-2.13
+
+# Recode docs as UTF-8
+for doc in ChangeLog examples/calendar/calendar.c; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${doc} > ${doc}.utf8
+	%{__mv} ${doc}.utf8 ${doc}
+done
 
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure \
-  --disable-static \
-  --with-xinput=xfree\
-  --with-native-locale
+	--disable-static \
+	--with-xinput=xfree \
+	--with-native-locale
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool INSTALL="%{__install} -p"
 
 #
 # Make cleaned-up versions of examples and tutorial for installation
 #
 ./mkinstalldirs tmpdocs/tutorial
-install -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
-for dir in examples/* ; do
-    if [ -d $dir ] ; then
-       ./mkinstalldirs tmpdocs/$dir
-       for file in $dir/* ; do
-          case $file in
-	     *pre1.2.7)
-	        ;;
-	     *)
-                install -p -m0644 $file tmpdocs/$dir
-		;;
-	  esac
-       done
-    fi
+%{__install} -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
+for dir in examples/*; do
+	if [ -d $dir ]; then
+		./mkinstalldirs tmpdocs/$dir
+		for file in $dir/* ; do
+			case $file in
+			*pre1.2.7)
+				;;
+			*)
+				%{__install} -p -m0644 $file tmpdocs/$dir
+				;;
+			esac
+		done
+	fi
 done
 
-install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc
+%{__install} -p -m644 -D %{SOURCE1} %{buildroot}/etc/gtk/gtkrc
 
 # Install some extra gtkrc files to improve functioning of GTK+
 # in UTF-8 locales for Chinese, Japanese, Korean.
-for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do
-  install -p -m0644 $i $RPM_BUILD_ROOT/etc/gtk/
+for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
+	%{__install} -p -m0644 $i %{buildroot}/etc/gtk/
 done
 
 # We don't ship the info files
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 
 # .la fies... die die die.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 %find_lang %{name}
 
 
 %check
-make check LIBTOOL=%{_bindir}/libtool
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -222,7 +229,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_libdir}/lib*.so.*
-%dir %{_datadir}/themes
+%dir %{_datadir}/themes/
 %{_datadir}/themes/Default/
 %dir %{_sysconfdir}/gtk/
 %config(noreplace) %{_sysconfdir}/gtk/*
@@ -240,8 +247,14 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.10-67
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-68
+- remove unused shared library dependencies
+- use install -p to maintain timestamps where reasonable
+- recode docs as UTF-8
+- cosmetic spec changes
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.2.10-67
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-66
 - rebase the ahiguti patch



From cweyl at fedoraproject.org  Tue Apr 21 21:04:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 21 Apr 2009 21:04:34 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate/devel import.log, NONE,
	1.1 perl-Test-Aggregate.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090421210434.83253700D6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Test-Aggregate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv816/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Aggregate.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Test-Aggregate-0_35-1_fc10:HEAD:perl-Test-Aggregate-0.35-1.fc10.src.rpm:1240347789


--- NEW FILE perl-Test-Aggregate.spec ---
Name:       perl-Test-Aggregate 
Version:    0.35 
Release:    1%{?dist}
# lib/Test/Aggregate.pm -> GPL+ or Artistic
# lib/Test/Aggregate/Builder.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Aggregate C<*.t> tests to make them run faster 
Source:     http://search.cpan.org/CPAN/authors/id/O/OV/OVID/Test-Aggregate-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Test-Aggregate
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(FindBin)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::Harness) >= 3.09
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Simple) >= 0.74
# optional tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%description
*WARNING*: this is ALPHA code. The interface is not guaranteed to be
stable.

A common problem with many test suites is that they can take a
long time to run. The longer they run, the less likely you are to run
the tests. This module borrows a trick from 'Apache::Registry' to load
up your tests at once, create a separate package for each test and wraps
each package in a method named 'run_the_tests'. This allows us to load
perl only once and related modules only once. If you have modules which
are expensive to load, this can dramatically speed up a test suite.

%prep
%setup -q -n Test-Aggregate-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Aggregate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:21:36 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:04:31 -0000	1.2
@@ -0,0 +1 @@
+Test-Aggregate-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Aggregate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:21:36 -0000	1.1
+++ sources	21 Apr 2009 21:04:31 -0000	1.2
@@ -0,0 +1 @@
+42777c369156669942cae1c790538b26  Test-Aggregate-0.35.tar.gz



From cweyl at fedoraproject.org  Tue Apr 21 21:04:47 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 21 Apr 2009 21:04:47 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check/devel import.log, NONE,
	1.1 perl-B-Hooks-OP-Check.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090421210447.D3D84700D6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-B-Hooks-OP-Check/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv895/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-B-Hooks-OP-Check.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-B-Hooks-OP-Check-0_15-1_fc10:HEAD:perl-B-Hooks-OP-Check-0.15-1.fc10.src.rpm:1240347812


--- NEW FILE perl-B-Hooks-OP-Check.spec ---
Name:       perl-B-Hooks-OP-Check 
Version:    0.15 
Release:    1%{?dist}
# lib/B/Hooks/OP/Check.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Wrap OP check callbacks 
Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Hooks-OP-Check-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/B-Hooks-OP-Check
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires: perl(ExtUtils::Depends)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(parent)
# testing
BuildRequires: perl(Test::More)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
This module provides a C API for XS modules to hook into the callbacks
of 'PL_check'.  

%prep
%setup -q -n B-Hooks-OP-Check-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:24:40 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:04:44 -0000	1.2
@@ -0,0 +1 @@
+B-Hooks-OP-Check-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:24:40 -0000	1.1
+++ sources	21 Apr 2009 21:04:44 -0000	1.2
@@ -0,0 +1 @@
+86aab1440d1fe933ebd4cf71d4a67ac2  B-Hooks-OP-Check-0.15.tar.gz



From pghmcfc at fedoraproject.org  Tue Apr 21 21:07:58 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 21 Apr 2009 21:07:58 +0000 (UTC)
Subject: rpms/gtk+/F-10 gtk+-1.2.10-unused-deps.patch, NONE, 1.1 gtk+.spec, 
	1.18, 1.19
Message-ID: <20090421210758.700C2700D6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtk+/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1706

Modified Files:
	gtk+.spec 
Added Files:
	gtk+-1.2.10-unused-deps.patch 
Log Message:
- remove unused shared library dependencies
- use install -p to maintain timestamps where reasonable
- recode docs as UTF-8
- cosmetic spec changes


gtk+-1.2.10-unused-deps.patch:

--- NEW FILE gtk+-1.2.10-unused-deps.patch ---
--- gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:02:02.000000000 +0100
+++ gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:05:49.000000000 +0100
@@ -22,10 +22,9 @@
 	-release $(LT_RELEASE) \
 	-export-dynamic \
 	-no-undefined -Wl,--no-undefined \
-	@GLIB_DEPLIBS@	\
+	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
 	@x_ldflags@	\
 	@x_libs@	\
-	-lm		\
 @STRIP_END@
 
 #
--- gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:46:56.000000000 +0100
+++ gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:52:24.000000000 +0100
@@ -32,9 +32,9 @@
 	-release $(LT_RELEASE) 					\
 	-export-dynamic						\
 	-no-undefined -Wl,--no-undefined			\
-	@GLIB_DEPLIBS@ 						\
+	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
 	@x_ldflags@						\
-	@x_libs@ 						\
+	$(filter-out -lXi -lXext, @x_libs@)			\
 	-lm							\
 @STRIP_END@
 #	$(top_builddir)/gdk/libgdk.la


Index: gtk+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/F-10/gtk+.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk+.spec	2 Oct 2008 08:51:47 -0000	1.18
+++ gtk+.spec	21 Apr 2009 21:07:55 -0000	1.19
@@ -1,89 +1,89 @@
-Summary: The GIMP ToolKit
-Name: 	 gtk+
-Epoch:	 1
-Version: 1.2.10
-Release: 66%{?dist}
-
-License: LGPLv2+
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source0: ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Provides: gtk1 = %{version}-%{release}
-
-Source1: gtkrc-default
-Source2: gtk+-pofiles.tar.gz
-Source3: gtkrc.ja.utf8
-Source4: gtkrc.ko.utf8
-Source5: gtkrc.zh_CN.utf8
-Source6: gtkrc.zh_TW.utf8
-
-Patch1: gtk+-1.2.10-ahiguti.patch
-Patch5: gtk+-1.2.8-wrap-alnum.patch
-# Supress alignment warnings on ia64
-Patch10: gtk+-1.2.10-alignment.patch
+Summary:	The GIMP ToolKit
+Name:		gtk+
+Epoch:		1
+Version:	1.2.10
+Release:	68%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source0:	ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:	gtk1 = %{version}-%{release}
+
+Source1:	gtkrc-default
+Source2:	gtk+-pofiles.tar.gz
+Source3:	gtkrc.ja.utf8
+Source4:	gtkrc.ko.utf8
+Source5:	gtkrc.zh_CN.utf8
+Source6:	gtkrc.zh_TW.utf8
+
+Patch1:		gtk+-1.2.10-ahiguti.patch
+Patch5:		gtk+-1.2.8-wrap-alnum.patch
+# Suppress alignment warnings on ia64
+Patch10:	gtk+-1.2.10-alignment.patch
 # Improve exposure compression
-Patch11: gtk+-1.2.10-expose.patch
+Patch11:	gtk+-1.2.10-expose.patch
 # Handle focus tracking for embedded window properly
-Patch12: gtk+-1.2.10-focus.patch
+Patch12:	gtk+-1.2.10-focus.patch
 # Find gtkrc files for the current encoding better
-Patch13: gtk+-1.2.10-encoding.patch
+Patch13:	gtk+-1.2.10-encoding.patch
 # Don't screw up CTEXT encoding for UTF-8
-Patch14: gtk+-1.2.10-ctext.patch
+Patch14:	gtk+-1.2.10-ctext.patch
 # Don't warn about missing fonts for UTF-8
-Patch15: gtk+-1.2.10-utf8fontset.patch
+Patch15:	gtk+-1.2.10-utf8fontset.patch
 # Accept KP_Enter as a synonym for Return everywhere
-Patch16: gtk+-1.2.10-kpenter.patch
+Patch16:	gtk+-1.2.10-kpenter.patch
 # Allow theme switching to work properly when no windows are realized
-Patch17: gtk+-1.2.10-themeswitch.patch
+Patch17:	gtk+-1.2.10-themeswitch.patch
 # Fix crash when switching themes
-Patch18: gtk+-1.2.10-pixmapref.patch
+Patch18:	gtk+-1.2.10-pixmapref.patch
 # Fix computation of width of missing characters
-Patch19: gtk+-1.2.10-missingchar.patch
+Patch19:	gtk+-1.2.10-missingchar.patch
 # Fix sizes of Ukrainian fontsets
-Patch20: gtk+-1.2.10-ukfont.patch
+Patch20:	gtk+-1.2.10-ukfont.patch
 # Fix file selection delete-dir when changing directory problem
 # also, fix memory corruption problem when changing directories.
-Patch21: gtk+-1.2.10-deletedir.patch
+Patch21:	gtk+-1.2.10-deletedir.patch
 # Improve warning for missing fonts
-Patch22: gtk+-1.2.10-fontwarning.patch
+Patch22:	gtk+-1.2.10-fontwarning.patch
 # Allow themes to make scrollbar trough always repaint
-Patch23: gtk+-1.2.10-troughpaint.patch
+Patch23:	gtk+-1.2.10-troughpaint.patch
 # Fix a crash that can happen in some apps when the current
 # locale is not supported by XLib.
-Patch24: gtk+-1.2.10-localecrash.patch
+Patch24:	gtk+-1.2.10-localecrash.patch
 # Patch from CVS to fix b.g.o #56349
-Patch26: gtk+-1.2.10-dndorder.patch
+Patch26:	gtk+-1.2.10-dndorder.patch
 # Patch from CVS to fix b.g.o #94812
-Patch27: gtk+-1.2.10-clistfocusrow.patch
+Patch27:	gtk+-1.2.10-clistfocusrow.patch
 # Fix GTK+ to obey X server's default bell volume
-Patch28: gtk+-1.2.10-bellvolume.patch
+Patch28:	gtk+-1.2.10-bellvolume.patch
 # Hack up the configure scripts to deal with some obscure
 # breakage with ancient libtool
-Patch29: gtk+-1.2.10-libtool.patch
+Patch29:	gtk+-1.2.10-libtool.patch
 # Add a dependency on libgdk to libgtk (#106677)
-Patch30: gtk+-1.2.10-gtkgdkdep.patch
-Patch31: gtk+-underquoted.patch
-Patch32: gtk+-1.2.10-ppc64.patch
+Patch30:	gtk+-1.2.10-gtkgdkdep.patch
+Patch31:	gtk+-underquoted.patch
+Patch32:	gtk+-1.2.10-ppc64.patch
 # do not allow for undefined symbols in shared libraries -- Rex
-Patch33: gtk+-1.2.10-no_undefined.patch
+Patch33:	gtk+-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222298
-Patch34: gtk+-1.2.10-multilib.patch
-
-BuildRequires: glib-devel >= 1:%{version}
-#Requires:     glib >= 1:%{version}
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
-BuildRequires: gettext
+Patch34:	gtk+-1.2.10-multilib.patch
+# Remove redundant shared library dependencies
+Patch35:	gtk+-1.2.10-unused-deps.patch
+
+BuildRequires:	glib-devel >= 1:%{version}
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
+BuildRequires:	gettext
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps  libX11-devel libXext-devel libXi-devel libXt-devel
+%global x_deps	libX11-devel libXext-devel libXi-devel libXt-devel
 %else
-%define x_deps	xorg-x11-devel
+%global x_deps	xorg-x11-devel
 ## This can be used for legacy too -- Rex
-#define	x_deps	Xree86-devel
+#global	x_deps	XFree86-devel
 %endif
-BuildRequires: %{x_deps} 
+BuildRequires:	%{x_deps} 
 
 %description
 The gtk+ package contains the GIMP ToolKit (GTK+), a library for
@@ -92,17 +92,18 @@
 processing program, but is now used by several other programs as
 well.
 
-%package devel
-Summary: Development tools for GTK+ (GIMP ToolKit) applications
-Group: Development/Libraries
-Provides: gtk1-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: glib-devel
-Requires: pkgconfig
-Requires: %{x_deps} 
+%package	devel
+Summary:	Development tools for GTK+ (GIMP ToolKit) applications
+Group:		Development/Libraries
+Provides:	gtk1-devel = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib-devel
+Requires:	pkgconfig
+Requires:	%{x_deps} 
 ## info files not included
 #Requires(post): /sbin/install-info
 #Requires(preun): /sbin/install-info
+
 %description devel
 Libraries, header files and documentation for developing GTK+ 
 (GIMP ToolKit) applications.
@@ -137,80 +138,86 @@
 %patch32 -p1 -b .ppc64
 %patch33 -p1 -b .no_undefined
 %patch34 -p1 -b .multilib
+%patch35 -p1 -b .unused-deps
 
 # The original config.{guess,sub} do not work on x86_64
 #
 # The following /usr/lib cannot be %%_libdir !!
-cp -p /usr/lib/rpm/config.{guess,sub} .
-
-#cp -f %{_datadir}/aclocal/libtool.m4 .
-#libtoolize --copy --force
-automake-1.4
-#aclocal-1.4
-autoconf-2.13
-autoheader-2.13
+%{__cp} -p /usr/lib/rpm/config.{guess,sub} .
 
+#%{__cp} -f %{_datadir}/aclocal/libtool.m4 .
+#/usr/bin/libtoolize --copy --force
+/usr/bin/automake-1.4
+#/usr/bin/aclocal-1.4
+/usr/bin/autoconf-2.13
+/usr/bin/autoheader-2.13
+
+# Recode docs as UTF-8
+for doc in ChangeLog examples/calendar/calendar.c; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${doc} > ${doc}.utf8
+	%{__mv} ${doc}.utf8 ${doc}
+done
 
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure \
-  --disable-static \
-  --with-xinput=xfree\
-  --with-native-locale
+	--disable-static \
+	--with-xinput=xfree \
+	--with-native-locale
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool INSTALL="%{__install} -p"
 
 #
 # Make cleaned-up versions of examples and tutorial for installation
 #
 ./mkinstalldirs tmpdocs/tutorial
-install -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
-for dir in examples/* ; do
-    if [ -d $dir ] ; then
-       ./mkinstalldirs tmpdocs/$dir
-       for file in $dir/* ; do
-          case $file in
-	     *pre1.2.7)
-	        ;;
-	     *)
-                install -p -m0644 $file tmpdocs/$dir
-		;;
-	  esac
-       done
-    fi
+%{__install} -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial
+for dir in examples/*; do
+	if [ -d $dir ]; then
+		./mkinstalldirs tmpdocs/$dir
+		for file in $dir/* ; do
+			case $file in
+			*pre1.2.7)
+				;;
+			*)
+				%{__install} -p -m0644 $file tmpdocs/$dir
+				;;
+			esac
+		done
+	fi
 done
 
-install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc
+%{__install} -p -m644 -D %{SOURCE1} %{buildroot}/etc/gtk/gtkrc
 
 # Install some extra gtkrc files to improve functioning of GTK+
 # in UTF-8 locales for Chinese, Japanese, Korean.
-for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do
-  install -p -m0644 $i $RPM_BUILD_ROOT/etc/gtk/
+for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
+	%{__install} -p -m0644 $i %{buildroot}/etc/gtk/
 done
 
 # We don't ship the info files
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 
 # .la fies... die die die.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 %find_lang %{name}
 
 
 %check
-make check LIBTOOL=%{_bindir}/libtool
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -222,7 +229,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_libdir}/lib*.so.*
-%dir %{_datadir}/themes
+%dir %{_datadir}/themes/
 %{_datadir}/themes/Default/
 %dir %{_sysconfdir}/gtk/
 %config(noreplace) %{_sysconfdir}/gtk/*
@@ -240,6 +247,15 @@
 
 
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-68
+- remove unused shared library dependencies
+- use install -p to maintain timestamps where reasonable
+- recode docs as UTF-8
+- cosmetic spec changes
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.2.10-67
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-66
 - rebase the ahiguti patch
 



From jkeating at fedoraproject.org  Tue Apr 21 21:08:50 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 21 Apr 2009 21:08:50 +0000 (UTC)
Subject: rpms/email2trac/devel email2trac.spec,1.3,1.4
Message-ID: <20090421210850.732B8700D6@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/email2trac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1869

Modified Files:
	email2trac.spec 
Log Message:
* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 0.13-5
- Explicitly pass RPM_OPT_FLAGS



Index: email2trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/email2trac/devel/email2trac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- email2trac.spec	24 Feb 2009 14:49:46 -0000	1.3
+++ email2trac.spec	21 Apr 2009 21:08:13 -0000	1.4
@@ -2,7 +2,7 @@
 # Jon Topper <jon at topper dot me dot uk>
 Name:           email2trac
 Version:        0.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities for converting emails to trac tickets
 
 Group:          Applications/Internet
@@ -39,7 +39,7 @@
 
 %build
 %configure --with-trac_user=apache
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 0.13-5
+- Explicitly pass RPM_OPT_FLAGS
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cweyl at fedoraproject.org  Tue Apr 21 21:12:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 21 Apr 2009 21:12:52 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check/F-9 import.log, NONE,
	1.1 perl-B-Hooks-OP-Check.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090421211252.66584700D6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-B-Hooks-OP-Check/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3255/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-B-Hooks-OP-Check.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-B-Hooks-OP-Check-0_15-1_fc10:F-9:perl-B-Hooks-OP-Check-0.15-1.fc10.src.rpm:1240348291


--- NEW FILE perl-B-Hooks-OP-Check.spec ---
Name:       perl-B-Hooks-OP-Check 
Version:    0.15 
Release:    1%{?dist}
# lib/B/Hooks/OP/Check.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Wrap OP check callbacks 
Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Hooks-OP-Check-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/B-Hooks-OP-Check
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires: perl(ExtUtils::Depends)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(parent)
# testing
BuildRequires: perl(Test::More)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
This module provides a C API for XS modules to hook into the callbacks
of 'PL_check'.  

%prep
%setup -q -n B-Hooks-OP-Check-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:24:40 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:12:20 -0000	1.2
@@ -0,0 +1 @@
+B-Hooks-OP-Check-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:24:40 -0000	1.1
+++ sources	21 Apr 2009 21:12:20 -0000	1.2
@@ -0,0 +1 @@
+86aab1440d1fe933ebd4cf71d4a67ac2  B-Hooks-OP-Check-0.15.tar.gz



From cweyl at fedoraproject.org  Tue Apr 21 21:14:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 21 Apr 2009 21:14:03 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate/F-9 import.log, NONE,
	1.1 perl-Test-Aggregate.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090421211404.011E9700D6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Test-Aggregate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3710/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Aggregate.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Test-Aggregate-0_35-1_fc10:F-9:perl-Test-Aggregate-0.35-1.fc10.src.rpm:1240348297


--- NEW FILE perl-Test-Aggregate.spec ---
Name:       perl-Test-Aggregate 
Version:    0.35 
Release:    1%{?dist}
# lib/Test/Aggregate.pm -> GPL+ or Artistic
# lib/Test/Aggregate/Builder.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Aggregate C<*.t> tests to make them run faster 
Source:     http://search.cpan.org/CPAN/authors/id/O/OV/OVID/Test-Aggregate-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Test-Aggregate
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(FindBin)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::Harness) >= 3.09
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Simple) >= 0.74
# optional tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%description
*WARNING*: this is ALPHA code. The interface is not guaranteed to be
stable.

A common problem with many test suites is that they can take a
long time to run. The longer they run, the less likely you are to run
the tests. This module borrows a trick from 'Apache::Registry' to load
up your tests at once, create a separate package for each test and wraps
each package in a method named 'run_the_tests'. This allows us to load
perl only once and related modules only once. If you have modules which
are expensive to load, this can dramatically speed up a test suite.

%prep
%setup -q -n Test-Aggregate-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Aggregate/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:21:36 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:13:32 -0000	1.2
@@ -0,0 +1 @@
+Test-Aggregate-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Aggregate/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:21:36 -0000	1.1
+++ sources	21 Apr 2009 21:13:33 -0000	1.2
@@ -0,0 +1 @@
+42777c369156669942cae1c790538b26  Test-Aggregate-0.35.tar.gz



From dcantrel at fedoraproject.org  Tue Apr 21 21:14:55 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 21 Apr 2009 21:14:55 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhcp-4.1.0-IFNAMSIZ.patch, NONE, 1.1 dhclient-script,
	1.11, 1.12 dhcp.spec, 1.253, 1.254
Message-ID: <20090421211456.0A0B3700D6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4157

Modified Files:
	dhclient-script dhcp.spec 
Added Files:
	dhcp-4.1.0-IFNAMSIZ.patch 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
- Restrict interface names given on the dhcpd command line to length
  IFNAMSIZ or shorter (#441524)
- Change to /etc/sysconfig/network-scripts in dhclient-script before
  calling need_config or source_config (#496233)


dhcp-4.1.0-IFNAMSIZ.patch:

--- NEW FILE dhcp-4.1.0-IFNAMSIZ.patch ---
diff -up dhcp-4.1.0/server/dhcpd.c.ifnamsiz dhcp-4.1.0/server/dhcpd.c
--- dhcp-4.1.0/server/dhcpd.c.ifnamsiz	2009-04-20 16:35:30.000000000 -1000
+++ dhcp-4.1.0/server/dhcpd.c	2009-04-20 15:45:15.000000000 -1000
@@ -401,7 +401,7 @@ main(int argc, char **argv) {
 				log_fatal ("Insufficient memory to %s %s: %s",
 					   "record interface", argv [i],
 					   isc_result_totext (result));
-			strcpy (tmp -> name, argv [i]);
+			strncpy (tmp -> name, argv [i], sizeof (tmp -> name));
 			if (interfaces) {
 				interface_reference (&tmp -> next,
 						     interfaces, MDL);


Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhclient-script,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dhclient-script	21 Apr 2009 00:22:05 -0000	1.11
+++ dhclient-script	21 Apr 2009 21:14:51 -0000	1.12
@@ -420,7 +420,8 @@
     . /etc/sysconfig/networking/network
 fi
 
-CONFIG="/etc/sysconfig/network-scripts/ifcfg-${interface}"
+cd /etc/sysconfig/network-scripts
+CONFIG="ifcfg-${interface}"
 need_config ${CONFIG}
 source_config >/dev/null 2>&1
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- dhcp.spec	21 Apr 2009 00:22:05 -0000	1.253
+++ dhcp.spec	21 Apr 2009 21:14:51 -0000	1.254
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  18%{?dist}
+Release:  19%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -45,6 +45,7 @@
 Patch16:  %{name}-4.1.0-port-validation.patch
 Patch17:  %{name}-4.1.0-invalid-dhclient-conf.patch
 Patch18:  %{name}-4.1.0-missing-ipv6-not-fatal.patch
+Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -187,6 +188,9 @@
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19367]
 %patch18 -p1
 
+# Read only up to IFNAMSIZ characters for the interface name in dhcpd (#441524)
+%patch19 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -419,6 +423,12 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
+- Restrict interface names given on the dhcpd command line to length
+  IFNAMSIZ or shorter (#441524)
+- Change to /etc/sysconfig/network-scripts in dhclient-script before
+  calling need_config or source_config (#496233)
+
 * Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
 - Make dhclient-script work with pre-configured wireless interfaces (#491157)
 



From cweyl at fedoraproject.org  Tue Apr 21 21:19:38 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 21 Apr 2009 21:19:38 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check/F-10 import.log, NONE,
	1.1 perl-B-Hooks-OP-Check.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090421211939.4CCAE7013C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-B-Hooks-OP-Check/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-B-Hooks-OP-Check.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-B-Hooks-OP-Check-0_15-1_fc10:F-10:perl-B-Hooks-OP-Check-0.15-1.fc10.src.rpm:1240348721


--- NEW FILE perl-B-Hooks-OP-Check.spec ---
Name:       perl-B-Hooks-OP-Check 
Version:    0.15 
Release:    1%{?dist}
# lib/B/Hooks/OP/Check.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Wrap OP check callbacks 
Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/B-Hooks-OP-Check-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/B-Hooks-OP-Check
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires: perl(ExtUtils::Depends)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(parent)
# testing
BuildRequires: perl(Test::More)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
This module provides a C API for XS modules to hook into the callbacks
of 'PL_check'.  

%prep
%setup -q -n B-Hooks-OP-Check-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:24:40 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:19:36 -0000	1.2
@@ -0,0 +1 @@
+B-Hooks-OP-Check-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:24:40 -0000	1.1
+++ sources	21 Apr 2009 21:19:36 -0000	1.2
@@ -0,0 +1 @@
+86aab1440d1fe933ebd4cf71d4a67ac2  B-Hooks-OP-Check-0.15.tar.gz



From cweyl at fedoraproject.org  Tue Apr 21 21:19:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 21 Apr 2009 21:19:45 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate/F-10 import.log, NONE,
	1.1 perl-Test-Aggregate.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090421211945.489627013C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Test-Aggregate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5680/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Aggregate.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-Test-Aggregate-0_35-1_fc10:F-10:perl-Test-Aggregate-0.35-1.fc10.src.rpm:1240348721


--- NEW FILE perl-Test-Aggregate.spec ---
Name:       perl-Test-Aggregate 
Version:    0.35 
Release:    1%{?dist}
# lib/Test/Aggregate.pm -> GPL+ or Artistic
# lib/Test/Aggregate/Builder.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Aggregate C<*.t> tests to make them run faster 
Source:     http://search.cpan.org/CPAN/authors/id/O/OV/OVID/Test-Aggregate-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Test-Aggregate
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(FindBin)
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Test::Harness) >= 3.09
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Simple) >= 0.74
# optional tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%description
*WARNING*: this is ALPHA code. The interface is not guaranteed to be
stable.

A common problem with many test suites is that they can take a
long time to run. The longer they run, the less likely you are to run
the tests. This module borrows a trick from 'Apache::Registry' to load
up your tests at once, create a separate package for each test and wraps
each package in a method named 'run_the_tests'. This allows us to load
perl only once and related modules only once. If you have modules which
are expensive to load, this can dramatically speed up a test suite.

%prep
%setup -q -n Test-Aggregate-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Aggregate/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:21:36 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:19:42 -0000	1.2
@@ -0,0 +1 @@
+Test-Aggregate-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Aggregate/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:21:36 -0000	1.1
+++ sources	21 Apr 2009 21:19:43 -0000	1.2
@@ -0,0 +1 @@
+42777c369156669942cae1c790538b26  Test-Aggregate-0.35.tar.gz



From jkeating at fedoraproject.org  Tue Apr 21 21:22:46 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 21 Apr 2009 21:22:46 +0000 (UTC)
Subject: rpms/email2trac/F-11 email2trac.spec,1.3,1.4
Message-ID: <20090421212247.4E15470137@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/email2trac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6742

Modified Files:
	email2trac.spec 
Log Message:
* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 0.13-5
- Explicitly pass RPM_OPT_FLAGS



Index: email2trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/email2trac/F-11/email2trac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- email2trac.spec	24 Feb 2009 14:49:46 -0000	1.3
+++ email2trac.spec	21 Apr 2009 21:22:41 -0000	1.4
@@ -2,7 +2,7 @@
 # Jon Topper <jon at topper dot me dot uk>
 Name:           email2trac
 Version:        0.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities for converting emails to trac tickets
 
 Group:          Applications/Internet
@@ -39,7 +39,7 @@
 
 %build
 %configure --with-trac_user=apache
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Jesse Keating <jkeating at redhat.com> - 0.13-5
+- Explicitly pass RPM_OPT_FLAGS
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rstrode at fedoraproject.org  Tue Apr 21 21:25:39 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 21 Apr 2009 21:25:39 +0000 (UTC)
Subject: rpms/gdm/F-11 gdm-2.26.1-multistack.patch, NONE, 1.1 gdm.spec, 1.463,
	1.464 gdm-2.26.0-multistack.patch, 1.1, NONE
Message-ID: <20090421212539.5C37F700D6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7967

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.26.1-multistack.patch 
Removed Files:
	gdm-2.26.0-multistack.patch 
Log Message:
- Stop inactive pam conversations when one succeeds.
  Should fix bug 496234


gdm-2.26.1-multistack.patch:

--- NEW FILE gdm-2.26.1-multistack.patch ---
>From b96b21d5497ce4ed3b362f4dc09b2f5fd654f3a3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 20 Feb 2009 13:52:19 -0500
Subject: [PATCH 01/33] Add a comment marking protected api in chooser

The chooser widget has methods that only its
subclasses are supposed to call.  We should
mark them as such.
---
 gui/simple-greeter/gdm-chooser-widget.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h
index 578e613..7e3e59c 100644
--- a/gui/simple-greeter/gdm-chooser-widget.h
+++ b/gui/simple-greeter/gdm-chooser-widget.h
@@ -136,6 +136,8 @@ int            gdm_chooser_widget_get_number_of_items          (GdmChooserWidget
 void           gdm_chooser_widget_activate_if_one_item         (GdmChooserWidget          *widget);
 void           gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget          *widget);
 
+/* Protected
+ */
 void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
 
 G_END_DECLS
-- 
1.6.2.2


>From fafe68243000a7b2f97086daa3d4ad651e7ac905 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 17:44:37 -0500
Subject: [PATCH 02/33] Drop duplicated entry introspection output

---
 daemon/gdm-greeter-server.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 2e01d33..cecce83 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -752,7 +752,6 @@ do_introspect (DBusConnection *connection,
                                "      <arg name=\"layout_name\" type=\"s\"/>\n"
                                "    </signal>\n"
                                "    <signal name=\"DefaultSessionNameChanged\">\n"
-                               "    <signal name=\"DefaultSessionNameChanged\">\n"
                                "      <arg name=\"session_name\" type=\"s\"/>\n"
                                "    </signal>\n"
                                "    <signal name=\"TimedLoginRequested\">\n"
-- 
1.6.2.2


>From 4dc394bb5b87d3cbead40bb6565eec75d755ddae Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 2 Mar 2009 10:07:03 -0500
Subject: [PATCH 03/33] Make lookup_item not warn when passing NULL for args

gtk_tree_model_get doesn't like NULL, and we allow
NULL for optional return values.

We now check each argument for NULL and call
gtk_tree_model_get individually N times (one for
each argument) instead of just once.
---
 gui/simple-greeter/gdm-chooser-widget.c |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index f0298c6..b1ba9b4 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -2132,13 +2132,30 @@ gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
         }
         g_free (active_item_id);
 
-        gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-                            CHOOSER_IMAGE_COLUMN, image,
-                            CHOOSER_NAME_COLUMN, name,
-                            CHOOSER_PRIORITY_COLUMN, priority,
-                            CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use,
-                            CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate,
-                            -1);
+        if (image != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_IMAGE_COLUMN, image, -1);
+        }
+
+        if (name != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_NAME_COLUMN, name, -1);
+        }
+
+        if (priority != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_PRIORITY_COLUMN, priority, -1);
+        }
+
+        if (is_in_use != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, -1);
+        }
+
+        if (is_separate != NULL) {
+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+                                    CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1);
+        }
 
         return TRUE;
 }
-- 
1.6.2.2


>From c68b126096e04b3b963a10658d5a835ab716599f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 15:35:00 -0500
Subject: [PATCH 04/33] Drop "stopped" signal from worker-job class

It was unused, dead code.
---
 daemon/gdm-session-direct.c     |   14 --------------
 daemon/gdm-session-worker-job.c |   11 -----------
 daemon/gdm-session-worker-job.h |    1 -
 3 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 34a126f..3942ec7 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -1548,13 +1548,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
 }
 
 static void
-worker_stopped (GdmSessionWorkerJob *job,
-                GdmSessionDirect    *session)
-{
-        g_debug ("GdmSessionDirect: Worker job stopped");
-}
-
-static void
 worker_started (GdmSessionWorkerJob *job,
                 GdmSessionDirect    *session)
 {
@@ -1605,10 +1598,6 @@ start_worker (GdmSessionDirect *session)
         session->priv->job = gdm_session_worker_job_new ();
         gdm_session_worker_job_set_server_address (session->priv->job, session->priv->server_address);
         g_signal_connect (session->priv->job,
-                          "stopped",
-                          G_CALLBACK (worker_stopped),
-                          session);
-        g_signal_connect (session->priv->job,
                           "started",
                           G_CALLBACK (worker_started),
                           session);
@@ -1630,9 +1619,6 @@ static void
 stop_worker (GdmSessionDirect *session)
 {
         g_signal_handlers_disconnect_by_func (session->priv->job,
-                                              G_CALLBACK (worker_stopped),
-                                              session);
-        g_signal_handlers_disconnect_by_func (session->priv->job,
                                               G_CALLBACK (worker_started),
                                               session);
         g_signal_handlers_disconnect_by_func (session->priv->job,
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 6723464..633d6e2 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -68,7 +68,6 @@ enum {
 
 enum {
         STARTED,
-        STOPPED,
         EXITED,
         DIED,
         LAST_SIGNAL
@@ -390,16 +389,6 @@ gdm_session_worker_job_class_init (GdmSessionWorkerJobClass *klass)
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE,
                               0);
-        signals [STOPPED] =
-                g_signal_new ("stopped",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (GdmSessionWorkerJobClass, stopped),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
         signals [EXITED] =
                 g_signal_new ("exited",
                               G_OBJECT_CLASS_TYPE (object_class),
diff --git a/daemon/gdm-session-worker-job.h b/daemon/gdm-session-worker-job.h
index d42eb37..5ad1c92 100644
--- a/daemon/gdm-session-worker-job.h
+++ b/daemon/gdm-session-worker-job.h
[...17649 lines suppressed...]

>From c98a8ac6971b44071aef38a29b550378554a733b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 13 Apr 2009 14:19:50 -0400
Subject: [PATCH 31/33] reset all conversations if password conversation fails

This is a temporary hack until we store plugin policy in
gconf.
---
 gui/simple-greeter/gdm-greeter-login-window.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index a16948f..3daf89d 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -907,6 +907,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
 
         g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
 
+        /* If the password conversation failed, then start over
+         *
+         * FIXME: we need to get this policy out of the source code
+         */
+        if (strcmp (service_name, "gdm-password") == 0) {
+                g_debug ("GdmGreeterLoginWindow: main conversation failed, starting over");
+                restart_conversations (login_window);
+                return TRUE;
+        }
+
         task = find_task_with_service_name (login_window, service_name);
 
         if (task != NULL) {
-- 
1.6.2.2


>From 339ca93db8f4896eaf02667c1268ddc9d1830345 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 10:25:18 -0400
Subject: [PATCH 32/33] When one PAM conversation wins, stop the others

This doesn't work yet, it's still in progress code.
---
 daemon/gdm-session-direct.c |   64 ++++++++++++++++++++++++++++++-------------
 daemon/gdm-simple-slave.c   |    2 +-
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 805adbf..cb84f01 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -2284,6 +2284,40 @@ gdm_session_direct_open_session (GdmSession *session,
 }
 
 static void
+stop_all_other_conversations (GdmSessionDirect        *session,
+                              GdmSessionConversation  *conversation_to_keep)
+{
+        GHashTableIter iter;
+        gpointer key, value;
+
+        if (session->priv->conversations == NULL) {
+                return;
+        }
+
+        if (conversation_to_keep == NULL) {
+                g_debug ("GdmSessionDirect: Stopping all conversations");
+        } else {
+                g_debug ("GdmSessionDirect: Stopping all conversations "
+                         "except for %s", conversation_to_keep->service_name);
+        }
+
+        g_hash_table_iter_init (&iter, session->priv->conversations);
+        while (g_hash_table_iter_next (&iter, &key, &value)) {
+                GdmSessionConversation *conversation;
+
+                conversation = (GdmSessionConversation *) value;
+
+                if (conversation == conversation_to_keep) {
+                        continue;
+                }
+
+                stop_conversation (conversation);
+        }
+
+        g_hash_table_remove_all (session->priv->conversations);
+}
+
+static void
 gdm_session_direct_start_session (GdmSession *session,
                                   const char *service_name)
 {
@@ -2295,12 +2329,20 @@ gdm_session_direct_start_session (GdmSession *session,
         g_return_if_fail (session != NULL);
         g_return_if_fail (impl->priv->is_running == FALSE);
 
+        conversation = find_conversation_by_name (impl, service_name);
+
+        if (conversation == NULL) {
+                g_warning ("GdmSessionDirect: Tried to start session of "
+                           "nonexistent conversation %s", service_name);
+                return;
+        }
+
+        stop_all_other_conversations (impl, conversation);
+
         command = get_session_command (impl);
         program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
         g_free (command);
 
-        conversation = find_conversation_by_name (impl, service_name);
-
         setup_session_environment (impl);
         send_environment (impl, conversation);
 
@@ -2311,23 +2353,7 @@ gdm_session_direct_start_session (GdmSession *session,
 static void
 stop_all_conversations (GdmSessionDirect *session)
 {
-        GHashTableIter iter;
-        gpointer key, value;
-
-        if (session->priv->conversations == NULL) {
-                return;
-        }
-
-        g_hash_table_iter_init (&iter, session->priv->conversations);
-        while (g_hash_table_iter_next (&iter, &key, &value)) {
-                GdmSessionConversation *conversation;
-
-                conversation = (GdmSessionConversation *) value;
-
-                stop_conversation (conversation);
-        }
-
-        g_hash_table_remove_all (session->priv->conversations);
+        stop_all_other_conversations (session, NULL);
 }
 
 static void
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 09a7425..a70c9c9 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -569,7 +569,7 @@ on_session_conversation_stopped (GdmSession     *session,
         gboolean res;
         g_debug ("GdmSimpleSlave: conversation stopped");
 
-        if (slave->priv->greeter_server != NULL) {
+        if (slave->priv->greeter != NULL) {
                 res = gdm_greeter_server_conversation_stopped (slave->priv->greeter_server,
                                                                service_name);
                 if (! res) {
-- 
1.6.2.2


>From 80107a061b3ac2300e9cec17f18d5dc02557a8d3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 15:30:28 -0400
Subject: [PATCH 33/33] When one PAM conv. wins, actually stop the others

We weren't properly keeping the winning conversation
around in the previous commit
---
 daemon/gdm-session-direct.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index cb84f01..7173080 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -2308,13 +2308,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
                 conversation = (GdmSessionConversation *) value;
 
                 if (conversation == conversation_to_keep) {
-                        continue;
+                        g_hash_table_iter_steal (&iter);
+                        g_free (key);
+                } else {
+                        stop_conversation (conversation);
                 }
-
-                stop_conversation (conversation);
         }
 
         g_hash_table_remove_all (session->priv->conversations);
+
+        if (conversation_to_keep != NULL) {
+                g_hash_table_insert (session->priv->conversations,
+                                     g_strdup (conversation_to_keep->service_name),
+                                     conversation_to_keep);
+        }
 }
 
 static void
-- 
1.6.2.2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- gdm.spec	14 Apr 2009 14:41:47 -0000	1.463
+++ gdm.spec	21 Apr 2009 21:25:07 -0000	1.464
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -96,7 +96,7 @@
 # should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
 
-Patch19: gdm-2.26.0-multistack.patch
+Patch19: gdm-2.26.1-multistack.patch
 
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -380,6 +380,10 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Apr 21 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-2
+- Stop inactive pam conversations when one succeeds.
+  Should fix bug 496234
+
 * Tue Apr 14 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 


--- gdm-2.26.0-multistack.patch DELETED ---



From caillon at fedoraproject.org  Tue Apr 21 21:29:11 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:29:11 +0000 (UTC)
Subject: rpms/firefox/F-9 .cvsignore, 1.88, 1.89 firefox.spec, 1.313,
	1.314 sources, 1.101, 1.102
Message-ID: <20090421212911.7F5BA700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9019

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 3.0.9-1
- Update to 3.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	27 Mar 2009 19:26:07 -0000	1.88
+++ .cvsignore	21 Apr 2009 21:29:09 -0000	1.89
@@ -1,2 +1,2 @@
-firefox-3.0.8-source.tar.bz2
-firefox-langpacks-3.0.8-20090327.tar.bz2
+firefox-3.0.9-source.tar.bz2
+firefox-langpacks-3.0.9-20090421.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/firefox.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- firefox.spec	27 Mar 2009 19:26:07 -0000	1.313
+++ firefox.spec	21 Apr 2009 21:29:09 -0000	1.314
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.8
+Version:        3.0.9
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -29,7 +29,7 @@
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090327.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090421.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -322,6 +322,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 3.0.9-1
+- Update to 3.0.9
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 3.0.8-1
 - Update to 3.0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	27 Mar 2009 19:26:07 -0000	1.101
+++ sources	21 Apr 2009 21:29:10 -0000	1.102
@@ -1,2 +1,2 @@
-5fb6c6f3e973516df83a573348377a2f  firefox-3.0.8-source.tar.bz2
-343302c8e5d762d3f37b3f6f87fdcbf5  firefox-langpacks-3.0.8-20090327.tar.bz2
+f80b085699db8201e5db6b30fc63c60d  firefox-3.0.9-source.tar.bz2
+f93948a5769aba9be3128811b537a587  firefox-langpacks-3.0.9-20090421.tar.bz2



From caillon at fedoraproject.org  Tue Apr 21 21:29:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:29:20 +0000 (UTC)
Subject: rpms/firefox/F-10 .cvsignore, 1.98, 1.99 firefox.spec, 1.322,
	1.323 sources, 1.112, 1.113
Message-ID: <20090421212920.29759700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8882

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 3.0.9-1
- Update to 3.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-10/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	27 Mar 2009 19:25:24 -0000	1.98
+++ .cvsignore	21 Apr 2009 21:28:46 -0000	1.99
@@ -1,2 +1,2 @@
-firefox-3.0.8-source.tar.bz2
-firefox-langpacks-3.0.8-20090327.tar.bz2
+firefox-3.0.9-source.tar.bz2
+firefox-langpacks-3.0.9-20090421.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- firefox.spec	27 Mar 2009 19:23:26 -0000	1.322
+++ firefox.spec	21 Apr 2009 21:28:46 -0000	1.323
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.8
+Version:        3.0.9
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -29,7 +29,7 @@
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090327.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090421.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -322,6 +322,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 3.0.9-1
+- Update to 3.0.9
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 3.0.8-1
 - Update to 3.0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-10/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sources	27 Mar 2009 19:25:24 -0000	1.112
+++ sources	21 Apr 2009 21:28:46 -0000	1.113
@@ -1,2 +1,2 @@
-5fb6c6f3e973516df83a573348377a2f  firefox-3.0.8-source.tar.bz2
-343302c8e5d762d3f37b3f6f87fdcbf5  firefox-langpacks-3.0.8-20090327.tar.bz2
+f80b085699db8201e5db6b30fc63c60d  firefox-3.0.9-source.tar.bz2
+f93948a5769aba9be3128811b537a587  firefox-langpacks-3.0.9-20090421.tar.bz2



From cwickert at fedoraproject.org  Tue Apr 21 21:34:25 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 21 Apr 2009 21:34:25 +0000 (UTC)
Subject: rpms/sakura/devel import.log, NONE, 1.1 sakura-2.3.3-cflags.patch, 
	NONE, 1.1 sakura.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090421213425.185AF700D6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/sakura/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10185/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sakura-2.3.3-cflags.patch sakura.spec 
Log Message:
Initial import of sakura. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=496166



--- NEW FILE import.log ---
sakura-2_3_3-2_fc11:HEAD:sakura-2.3.3-2.fc11.src.rpm:1240349497

sakura-2.3.3-cflags.patch:

--- NEW FILE sakura-2.3.3-cflags.patch ---
--- sakura-2.3.3.orig/CMakeLists.txt	2009-01-31 09:55:18.000000000 +0100
+++ sakura-2.3.3/CMakeLists.txt	2009-04-19 02:47:59.000000000 +0200
@@ -34,8 +34,6 @@
 
 IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 	SET (CMAKE_C_FLAGS "-Wall")
-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
-	SET (CMAKE_C_FLAGS "-O2")
 ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
 INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})


--- NEW FILE sakura.spec ---
Name:           sakura
Version:        2.3.3
Release:        2%{?dist}
Summary:        Terminal emulator based on GTK and VTE

Group:          User Interface/X
License:        GPLv2
URL:            http://pleyades.net/david/sakura.php
Source0:        http://pleyades.net/david/projects/sakura/sakura-%{version}.tar.bz2
Patch0:         sakura-2.3.3-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.14
BuildRequires:  vte-devel >= 0.16.15
BuildRequires:  cmake desktop-file-utils gettext

%description
Sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator 
with few dependencies, so you don't need a full GNOME desktop installed to 
have a decent terminal emulator.


%prep
%setup -q
# fix desktop file (icon is svg instead of png)
sed -i 's!terminal-tango.png!terminal-tango!' sakura.desktop
%patch0 -p1 -b .clags


%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake CMAKE_C_FLAGS=%{optflags} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


#%check
#ctest .


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS GPL INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/terminal-tango.svg


%changelog
* Sun Apr 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-2
- Add patch to honor RPM_OPT_FLAGS
- Include INSTALL in %%doc since it contains some valuable information

* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-1
- Update to 2.3.3

* Tue Nov 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.2-1
- Update to 2.3.2

* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.1-1
- Update to 2.3.1

* Sun Sep 28 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.0-1
- Update to 2.3.0

* Sun Sep 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.1-1
- Update to 2.2.1
- Disable %%check again

* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Enable %%check again

* Fri Jun 06 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
- Update to 2.1.2
- No test configuration, disable %%check temporarily 

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-1
- Update to 2.1.0

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:12:45 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:34:18 -0000	1.2
@@ -0,0 +1 @@
+sakura-2.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:12:45 -0000	1.1
+++ sources	21 Apr 2009 21:34:18 -0000	1.2
@@ -0,0 +1 @@
+53450360b779945402bb33ef4061309d  sakura-2.3.3.tar.bz2



From caillon at fedoraproject.org  Tue Apr 21 21:37:09 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:37:09 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.225,1.226
Message-ID: <20090421213709.DE2CE700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11127

Modified Files:
	epiphany.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.3-5
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- epiphany.spec	27 Mar 2009 19:30:13 -0000	1.225
+++ epiphany.spec	21 Apr 2009 21:37:07 -0000	1.226
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -259,6 +259,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.3-5
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.3-4
 - Rebuild against newer gecko
 



From cwickert at fedoraproject.org  Tue Apr 21 21:38:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 21 Apr 2009 21:38:04 +0000 (UTC)
Subject: rpms/sakura/devel sakura.spec,1.1,1.2
Message-ID: <20090421213804.613B6700D6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/sakura/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11273

Modified Files:
	sakura.spec 
Log Message:
fix trivial typo


Index: sakura.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/devel/sakura.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sakura.spec	21 Apr 2009 21:34:18 -0000	1.1
+++ sakura.spec	21 Apr 2009 21:37:32 -0000	1.2
@@ -24,7 +24,7 @@
 %setup -q
 # fix desktop file (icon is svg instead of png)
 sed -i 's!terminal-tango.png!terminal-tango!' sakura.desktop
-%patch0 -p1 -b .clags
+%patch0 -p1 -b .cflags
 
 
 %build



From caillon at fedoraproject.org  Tue Apr 21 21:38:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:38:40 +0000 (UTC)
Subject: rpms/blam/F-10 blam.spec,1.31,1.32
Message-ID: <20090421213840.38056700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11562

Modified Files:
	blam.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-9
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-10/blam.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- blam.spec	27 Mar 2009 19:30:56 -0000	1.31
+++ blam.spec	21 Apr 2009 21:38:37 -0000	1.32
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.0.8
+%define	gecko_version		1.9.0.9
 
 Name:		blam
 Version:	1.8.5
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-9
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:40:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:40:40 +0000 (UTC)
Subject: rpms/devhelp/F-10 devhelp.spec,1.105,1.106
Message-ID: <20090421214041.0FFCC700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/devhelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12110

Modified Files:
	devhelp.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.22-7
- Rebuild against newer gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/F-10/devhelp.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- devhelp.spec	27 Mar 2009 19:31:40 -0000	1.105
+++ devhelp.spec	21 Apr 2009 21:40:08 -0000	1.106
@@ -6,7 +6,7 @@
 
 Name: devhelp
 Version: 0.22
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -135,6 +135,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.22-7
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.22-6
 - Rebuild against newer gecko
 



From kwizart at fedoraproject.org  Tue Apr 21 21:41:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 21:41:31 +0000 (UTC)
Subject: rpms/filezilla/devel .cvsignore, 1.30, 1.31 sources, 1.34,
	1.35 filezilla.spec, 1.37, 1.38
Message-ID: <20090421214131.B08E7700D6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12391

Modified Files:
	.cvsignore sources filezilla.spec 
Log Message:
Update to 3.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	2 Apr 2009 07:23:17 -0000	1.30
+++ .cvsignore	21 Apr 2009 21:41:29 -0000	1.31
@@ -1 +1 @@
-FileZilla_3.2.3.1_src.tar.bz2
+FileZilla_3.2.4_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	2 Apr 2009 07:21:20 -0000	1.34
+++ sources	21 Apr 2009 21:41:29 -0000	1.35
@@ -1 +1 @@
-c9d4b00e10e1a5e0c3928ac6e1fd5873  FileZilla_3.2.3.1_src.tar.bz2
+271550234ae3512736963d36f3a3281f  FileZilla_3.2.4_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- filezilla.spec	2 Apr 2009 07:25:38 -0000	1.37
+++ filezilla.spec	21 Apr 2009 21:41:29 -0000	1.38
@@ -1,8 +1,8 @@
 #define fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.3.1
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}.1
+Version:        3.2.4
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 3.2.4-1
+- Update to 3.2.4
+
 * Thu Apr  2 2009 kwizart < kwizart at gmail.com > - 3.2.3.1-1
 - Update to 3.2.3.1 stable
 



From caillon at fedoraproject.org  Tue Apr 21 21:43:04 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:43:04 +0000 (UTC)
Subject: rpms/galeon/F-10 galeon.spec,1.61,1.62
Message-ID: <20090421214304.D25EA700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12817

Modified Files:
	galeon.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-9
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-10/galeon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- galeon.spec	27 Mar 2009 19:33:10 -0000	1.61
+++ galeon.spec	21 Apr 2009 21:42:33 -0000	1.62
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-9
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:44:38 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:44:38 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-10 gecko-sharp2.spec,1.32,1.33
Message-ID: <20090421214438.CE5A9700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gecko-sharp2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13532

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.13-7
- Rebuild against newer gecko



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/extras/rpms/gecko-sharp2/F-10/gecko-sharp2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gecko-sharp2.spec	27 Mar 2009 19:33:54 -0000	1.32
+++ gecko-sharp2.spec	21 Apr 2009 21:44:37 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.13-7
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.13-6
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:46:53 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:46:53 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.40,1.41
Message-ID: <20090421214653.3A93B700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14072

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-29
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-10/gnome-python2-extras.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-python2-extras.spec	27 Mar 2009 19:34:39 -0000	1.40
+++ gnome-python2-extras.spec	21 Apr 2009 21:46:21 -0000	1.41
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -191,6 +191,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-29
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-28
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:48:10 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:48:10 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-10 gnome-web-photo.spec,1.17,1.18
Message-ID: <20090421214810.6403A700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14816

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3-17
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-10/gnome-web-photo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-web-photo.spec	27 Mar 2009 19:35:24 -0000	1.17
+++ gnome-web-photo.spec	21 Apr 2009 21:48:09 -0000	1.18
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -80,6 +80,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3-17
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3-16
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:49:34 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:49:34 +0000 (UTC)
Subject: rpms/google-gadgets/F-10 google-gadgets.spec,1.11,1.12
Message-ID: <20090421214934.150E8700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15350

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-5
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-10/google-gadgets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- google-gadgets.spec	27 Mar 2009 19:36:08 -0000	1.11
+++ google-gadgets.spec	21 Apr 2009 21:49:32 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-5
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-4
 - Rebuild against newer gecko
 



From cwickert at fedoraproject.org  Tue Apr 21 21:49:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 21 Apr 2009 21:49:34 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.5, 1.6 rednotebook.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <20090421214934.405D2700D6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15297

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.7-1
- Updated to new upstream version 0.6.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Apr 2009 11:24:12 -0000	1.5
+++ .cvsignore	21 Apr 2009 21:49:32 -0000	1.6
@@ -1 +1 @@
-rednotebook-0.6.6.tar.gz
+rednotebook-0.6.7.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rednotebook.spec	7 Apr 2009 11:24:13 -0000	1.4
+++ rednotebook.spec	21 Apr 2009 21:49:32 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.6.6
+Version:        0.6.7
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.7-1
+- Updated to new upstream version 0.6.7
+
 * Tue Apr 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.6-1
 - Updated to new upstream version 0.6.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Apr 2009 11:24:13 -0000	1.5
+++ sources	21 Apr 2009 21:49:32 -0000	1.6
@@ -1 +1 @@
-6e6c0d7574d44d1918133f46bcd04fc4  rednotebook-0.6.6.tar.gz
+1c83d0aa119e1cd91f91ef122f104a04  rednotebook-0.6.7.tar.gz



From caillon at fedoraproject.org  Tue Apr 21 21:50:57 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:50:57 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.76,1.77
Message-ID: <20090421215057.B1950700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15992

Modified Files:
	kazehakase.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kazehakase.spec	16 Apr 2009 18:10:12 -0000	1.76
+++ kazehakase.spec	21 Apr 2009 21:50:54 -0000	1.77
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -303,6 +303,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.1
+- Rebuild against newer gecko
+
 * Fri Apr 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-4
 - Prevent crash even if no modules are installed (related to bug 444569)
 - Embed Vendor version information



From caillon at fedoraproject.org  Tue Apr 21 21:52:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:52:26 +0000 (UTC)
Subject: rpms/Miro/F-10 Miro.spec,1.51,1.52
Message-ID: <20090421215226.1C2D8700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16495

Modified Files:
	Miro.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-3
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Miro.spec	27 Mar 2009 19:37:38 -0000	1.51
+++ Miro.spec	21 Apr 2009 21:52:22 -0000	1.52
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 
 Name:           Miro
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-3
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-2
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:53:53 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:53:53 +0000 (UTC)
Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.9,1.10
Message-ID: <20090421215353.E2623700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17095

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-9
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-10/mozvoikko.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mozvoikko.spec	27 Mar 2009 19:38:25 -0000	1.9
+++ mozvoikko.spec	21 Apr 2009 21:53:52 -0000	1.10
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-9
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-8
 - Rebuild against newer gecko
 



From cwickert at fedoraproject.org  Tue Apr 21 21:54:47 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 21 Apr 2009 21:54:47 +0000 (UTC)
Subject: rpms/sakura/F-9 sakura-2.3.3-cflags.patch, NONE, 1.1 sakura.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421215447.2F540700D6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/sakura/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17240/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	sakura-2.3.3-cflags.patch sakura.spec 
Log Message:
Initial package for this branch

sakura-2.3.3-cflags.patch:

--- NEW FILE sakura-2.3.3-cflags.patch ---
--- sakura-2.3.3.orig/CMakeLists.txt	2009-01-31 09:55:18.000000000 +0100
+++ sakura-2.3.3/CMakeLists.txt	2009-04-19 02:47:59.000000000 +0200
@@ -34,8 +34,6 @@
 
 IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 	SET (CMAKE_C_FLAGS "-Wall")
-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
-	SET (CMAKE_C_FLAGS "-O2")
 ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
 INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})


--- NEW FILE sakura.spec ---
Name:           sakura
Version:        2.3.3
Release:        2%{?dist}
Summary:        Terminal emulator based on GTK and VTE

Group:          User Interface/X
License:        GPLv2
URL:            http://pleyades.net/david/sakura.php
Source0:        http://pleyades.net/david/projects/sakura/sakura-%{version}.tar.bz2
Patch0:         sakura-2.3.3-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.14
BuildRequires:  vte-devel >= 0.16.15
BuildRequires:  cmake desktop-file-utils gettext

%description
Sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator 
with few dependencies, so you don't need a full GNOME desktop installed to 
have a decent terminal emulator.


%prep
%setup -q
# fix desktop file (icon is svg instead of png)
sed -i 's!terminal-tango.png!terminal-tango!' sakura.desktop
%patch0 -p1 -b .cflags


%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake CMAKE_C_FLAGS=%{optflags} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


#%check
#ctest .


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS GPL INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/terminal-tango.svg


%changelog
* Sun Apr 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-2
- Add patch to honor RPM_OPT_FLAGS
- Include INSTALL in %%doc since it contains some valuable information

* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-1
- Update to 2.3.3

* Tue Nov 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.2-1
- Update to 2.3.2

* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.1-1
- Update to 2.3.1

* Sun Sep 28 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.0-1
- Update to 2.3.0

* Sun Sep 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.1-1
- Update to 2.2.1
- Disable %%check again

* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Enable %%check again

* Fri Jun 06 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
- Update to 2.1.2
- No test configuration, disable %%check temporarily 

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-1
- Update to 2.1.0

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:12:45 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:54:43 -0000	1.2
@@ -0,0 +1 @@
+sakura-2.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:12:45 -0000	1.1
+++ sources	21 Apr 2009 21:54:43 -0000	1.2
@@ -0,0 +1 @@
+53450360b779945402bb33ef4061309d  sakura-2.3.3.tar.bz2



From cwickert at fedoraproject.org  Tue Apr 21 21:55:13 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 21 Apr 2009 21:55:13 +0000 (UTC)
Subject: rpms/sakura/F-10 sakura-2.3.3-cflags.patch, NONE, 1.1 sakura.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421215513.32EAA70137@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/sakura/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17240/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	sakura-2.3.3-cflags.patch sakura.spec 
Log Message:
Initial package for this branch

sakura-2.3.3-cflags.patch:

--- NEW FILE sakura-2.3.3-cflags.patch ---
--- sakura-2.3.3.orig/CMakeLists.txt	2009-01-31 09:55:18.000000000 +0100
+++ sakura-2.3.3/CMakeLists.txt	2009-04-19 02:47:59.000000000 +0200
@@ -34,8 +34,6 @@
 
 IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 	SET (CMAKE_C_FLAGS "-Wall")
-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
-	SET (CMAKE_C_FLAGS "-O2")
 ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
 INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})


--- NEW FILE sakura.spec ---
Name:           sakura
Version:        2.3.3
Release:        2%{?dist}
Summary:        Terminal emulator based on GTK and VTE

Group:          User Interface/X
License:        GPLv2
URL:            http://pleyades.net/david/sakura.php
Source0:        http://pleyades.net/david/projects/sakura/sakura-%{version}.tar.bz2
Patch0:         sakura-2.3.3-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.14
BuildRequires:  vte-devel >= 0.16.15
BuildRequires:  cmake desktop-file-utils gettext

%description
Sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator 
with few dependencies, so you don't need a full GNOME desktop installed to 
have a decent terminal emulator.


%prep
%setup -q
# fix desktop file (icon is svg instead of png)
sed -i 's!terminal-tango.png!terminal-tango!' sakura.desktop
%patch0 -p1 -b .cflags


%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake CMAKE_C_FLAGS=%{optflags} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


#%check
#ctest .


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS GPL INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/terminal-tango.svg


%changelog
* Sun Apr 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-2
- Add patch to honor RPM_OPT_FLAGS
- Include INSTALL in %%doc since it contains some valuable information

* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-1
- Update to 2.3.3

* Tue Nov 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.2-1
- Update to 2.3.2

* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.1-1
- Update to 2.3.1

* Sun Sep 28 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.0-1
- Update to 2.3.0

* Sun Sep 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.1-1
- Update to 2.2.1
- Disable %%check again

* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Enable %%check again

* Fri Jun 06 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
- Update to 2.1.2
- No test configuration, disable %%check temporarily 

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-1
- Update to 2.1.0

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:12:45 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:54:41 -0000	1.2
@@ -0,0 +1 @@
+sakura-2.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:12:45 -0000	1.1
+++ sources	21 Apr 2009 21:54:41 -0000	1.2
@@ -0,0 +1 @@
+53450360b779945402bb33ef4061309d  sakura-2.3.3.tar.bz2



From cwickert at fedoraproject.org  Tue Apr 21 21:55:18 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 21 Apr 2009 21:55:18 +0000 (UTC)
Subject: rpms/sakura/F-11 sakura-2.3.3-cflags.patch, NONE, 1.1 sakura.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421215518.00E8570137@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/sakura/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17240/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	sakura-2.3.3-cflags.patch sakura.spec 
Log Message:
Initial package for this branch

sakura-2.3.3-cflags.patch:

--- NEW FILE sakura-2.3.3-cflags.patch ---
--- sakura-2.3.3.orig/CMakeLists.txt	2009-01-31 09:55:18.000000000 +0100
+++ sakura-2.3.3/CMakeLists.txt	2009-04-19 02:47:59.000000000 +0200
@@ -34,8 +34,6 @@
 
 IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 	SET (CMAKE_C_FLAGS "-Wall")
-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
-	SET (CMAKE_C_FLAGS "-O2")
 ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
 INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})


--- NEW FILE sakura.spec ---
Name:           sakura
Version:        2.3.3
Release:        2%{?dist}
Summary:        Terminal emulator based on GTK and VTE

Group:          User Interface/X
License:        GPLv2
URL:            http://pleyades.net/david/sakura.php
Source0:        http://pleyades.net/david/projects/sakura/sakura-%{version}.tar.bz2
Patch0:         sakura-2.3.3-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.14
BuildRequires:  vte-devel >= 0.16.15
BuildRequires:  cmake desktop-file-utils gettext

%description
Sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator 
with few dependencies, so you don't need a full GNOME desktop installed to 
have a decent terminal emulator.


%prep
%setup -q
# fix desktop file (icon is svg instead of png)
sed -i 's!terminal-tango.png!terminal-tango!' sakura.desktop
%patch0 -p1 -b .cflags


%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake CMAKE_C_FLAGS=%{optflags} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


#%check
#ctest .


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS GPL INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/terminal-tango.svg


%changelog
* Sun Apr 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-2
- Add patch to honor RPM_OPT_FLAGS
- Include INSTALL in %%doc since it contains some valuable information

* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.3-1
- Update to 2.3.3

* Tue Nov 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.2-1
- Update to 2.3.2

* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.1-1
- Update to 2.3.1

* Sun Sep 28 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.3.0-1
- Update to 2.3.0

* Sun Sep 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.1-1
- Update to 2.2.1
- Disable %%check again

* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Enable %%check again

* Fri Jun 06 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-1
- Update to 2.1.2
- No test configuration, disable %%check temporarily 

* Mon May 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-1
- Update to 2.1.0

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:12:45 -0000	1.1
+++ .cvsignore	21 Apr 2009 21:54:41 -0000	1.2
@@ -0,0 +1 @@
+sakura-2.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sakura/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:12:45 -0000	1.1
+++ sources	21 Apr 2009 21:54:42 -0000	1.2
@@ -0,0 +1 @@
+53450360b779945402bb33ef4061309d  sakura-2.3.3.tar.bz2



From caillon at fedoraproject.org  Tue Apr 21 21:55:35 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:55:35 +0000 (UTC)
Subject: rpms/mugshot/F-10 mugshot.spec,1.46,1.47
Message-ID: <20090421215535.B385870137@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17726

Modified Files:
	mugshot.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-8
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-10/mugshot.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mugshot.spec	27 Mar 2009 19:39:11 -0000	1.46
+++ mugshot.spec	21 Apr 2009 21:55:32 -0000	1.47
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-8
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-7
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 21:57:42 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 21:57:42 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.13,1.14
Message-ID: <20090421215743.1420A7013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/pcmanx-gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18412

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3.8-8
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pcmanx-gtk2.spec	27 Mar 2009 19:39:56 -0000	1.13
+++ pcmanx-gtk2.spec	21 Apr 2009 21:57:11 -0000	1.14
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.0.8
+%define xulver 1.9.0.9
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -124,6 +124,9 @@
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3.8-8
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3.8-7
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Tue Apr 21 21:57:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 21:57:47 +0000
Subject: [pkgdb] rednotebook: cwickert has requested watchbugzilla
Message-ID: <20090421215747.63BCD10F885@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on rednotebook (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From pkgdb at fedoraproject.org  Tue Apr 21 21:58:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 21:58:09 +0000
Subject: [pkgdb] rednotebook: cwickert has requested commit
Message-ID: <20090421215809.234A010F88B@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on rednotebook (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From pkgdb at fedoraproject.org  Tue Apr 21 21:58:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 21:58:21 +0000
Subject: [pkgdb] rednotebook: cwickert has requested watchcommits
Message-ID: <20090421215823.21A3210F884@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on rednotebook (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From caillon at fedoraproject.org  Tue Apr 21 22:01:22 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 22:01:22 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.2,1.3
Message-ID: <20090421220122.48717700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20129

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.08-4.2
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Gtk2-MozEmbed.spec	29 Mar 2009 05:48:40 -0000	1.2
+++ perl-Gtk2-MozEmbed.spec	21 Apr 2009 22:00:45 -0000	1.3
@@ -3,13 +3,13 @@
 %if 0%{?fedora} >= 11
 %define gecko_version 1.9.1
 %else
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 %endif
 
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       3%{?dist}.2
+Release:       4%{?dist}.2
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -85,8 +85,11 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.08-4.2
+- Rebuild against newer gecko
+
 * Sun Mar 29 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-3.fc10.2
-- Rebuild against xulrunner 1.9.0.8
+- Rebuild against xulrunner 1.9.0.9
 
 * Fri Mar 06 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-3.fc10.1
 - Rebuild against xulrunner 1.9.0.7



From mjakubicek at fedoraproject.org  Tue Apr 21 22:02:01 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 22:02:01 +0000 (UTC)
Subject: rpms/Sprog/F-10 Sprog.spec,1.9,1.10
Message-ID: <20090421220201.D08A5700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/Sprog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19455/F-10

Modified Files:
	Sprog.spec 
Log Message:
- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
- Fixed failing test in %%check (F-9, F-10).




Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/F-10/Sprog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Sprog.spec	6 Mar 2008 18:45:20 -0000	1.9
+++ Sprog.spec	21 Apr 2009 22:01:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -18,6 +18,7 @@
 BuildRequires:  desktop-file-utils
 Requires:	    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Pod::Simple::Methody) 
+Requires:		perl(Gnome2::Canvas)
 
 %description
 Sprog is a tool for working with data. It allows you to do all the things those
@@ -62,6 +63,7 @@
 %{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gnome-run.png
 
 %check
+sed -i "s/exit 1;/exit 0;/" t/14_machine.t
 LANG=C make test
 
 %clean
@@ -78,6 +80,10 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-14
+- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
+- Fixed failing test in %%check.
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.14-13
 - rebuild for new perl
 



From mjakubicek at fedoraproject.org  Tue Apr 21 22:02:02 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 22:02:02 +0000 (UTC)
Subject: rpms/Sprog/F-11 Sprog.spec,1.11,1.12
Message-ID: <20090421220202.580E1700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/Sprog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19455/F-11

Modified Files:
	Sprog.spec 
Log Message:
- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
- Fixed failing test in %%check (F-9, F-10).




Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/F-11/Sprog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Sprog.spec	21 Apr 2009 18:04:11 -0000	1.11
+++ Sprog.spec	21 Apr 2009 22:01:31 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -18,6 +18,7 @@
 BuildRequires:	desktop-file-utils
 Requires:	    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:		perl(Pod::Simple::Methody) 
+Requires:		perl(Gnome2::Canvas)
 
 %description
 Sprog is a tool for working with data. It allows you to do all the things those
@@ -79,6 +80,9 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-16
+- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
+
 * Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-15
 - Fix FTBFS: fixed failing test in %%check
 - Consistent usage of tabs/spaces in specfile



From mjakubicek at fedoraproject.org  Tue Apr 21 22:02:06 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 22:02:06 +0000 (UTC)
Subject: rpms/Sprog/F-9 Sprog.spec,1.9,1.10
Message-ID: <20090421220206.60F5C700D6@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/Sprog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19455/F-9

Modified Files:
	Sprog.spec 
Log Message:
- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
- Fixed failing test in %%check (F-9, F-10).




Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/F-9/Sprog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Sprog.spec	6 Mar 2008 18:45:20 -0000	1.9
+++ Sprog.spec	21 Apr 2009 22:01:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -18,6 +18,7 @@
 BuildRequires:  desktop-file-utils
 Requires:	    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Pod::Simple::Methody) 
+Requires:		perl(Gnome2::Canvas)
 
 %description
 Sprog is a tool for working with data. It allows you to do all the things those
@@ -62,6 +63,7 @@
 %{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gnome-run.png
 
 %check
+sed -i "s/exit 1;/exit 0;/" t/14_machine.t
 LANG=C make test
 
 %clean
@@ -78,6 +80,10 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-14
+- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
+- Fixed failing test in %%check.
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.14-13
 - rebuild for new perl
 



From mjakubicek at fedoraproject.org  Tue Apr 21 22:02:06 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 21 Apr 2009 22:02:06 +0000 (UTC)
Subject: rpms/Sprog/devel Sprog.spec,1.11,1.12
Message-ID: <20090421220206.907CA7013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/Sprog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19455/devel

Modified Files:
	Sprog.spec 
Log Message:
- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
- Fixed failing test in %%check (F-9, F-10).




Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/devel/Sprog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Sprog.spec	21 Apr 2009 18:04:12 -0000	1.11
+++ Sprog.spec	21 Apr 2009 22:01:35 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -18,6 +18,7 @@
 BuildRequires:	desktop-file-utils
 Requires:	    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:		perl(Pod::Simple::Methody) 
+Requires:		perl(Gnome2::Canvas)
 
 %description
 Sprog is a tool for working with data. It allows you to do all the things those
@@ -79,6 +80,9 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-16
+- Added missing R: perl(Gnome2::Canvas), resolves BZ#468548.
+
 * Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.14-15
 - Fix FTBFS: fixed failing test in %%check
 - Consistent usage of tabs/spaces in specfile



From caillon at fedoraproject.org  Tue Apr 21 22:03:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 22:03:20 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.39,1.40
Message-ID: <20090421220320.D360E700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20966

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5.1
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ruby-gnome2.spec	28 Mar 2009 14:52:35 -0000	1.39
+++ ruby-gnome2.spec	21 Apr 2009 22:03:12 -0000	1.40
@@ -13,7 +13,7 @@
 
 Name:           ruby-gnome2
 Version:        0.18.1
-Release:        %{mainrel}%{?dist}
+Release:        %{mainrel}%{?dist}.1
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -741,6 +741,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5.1
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 22:06:50 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 22:06:50 +0000 (UTC)
Subject: rpms/yelp/F-10 yelp.spec,1.151,1.152
Message-ID: <20090421220650.A74CC700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21875

Modified Files:
	yelp.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-8
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-10/yelp.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- yelp.spec	27 Mar 2009 19:41:35 -0000	1.151
+++ yelp.spec	21 Apr 2009 22:06:11 -0000	1.152
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.24.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -157,6 +157,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-8
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-7
 - Rebuild against newer gecko
 



From notting at fedoraproject.org  Tue Apr 21 22:11:30 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 21 Apr 2009 22:11:30 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.193,1.194
Message-ID: <20090421221130.1B4BC700D6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23631

Modified Files:
	comps-f11.xml.in 
Log Message:
add gnome-common (#496361)


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- comps-f11.xml.in	21 Apr 2009 18:22:24 -0000	1.193
+++ comps-f11.xml.in	21 Apr 2009 22:10:58 -0000	1.194
@@ -2289,6 +2289,7 @@
       <packagereq type="default">devhelp</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
       <packagereq type="default">glade3</packagereq>
+      <packagereq type="default">gnome-common</packagereq>
       <packagereq type="default">gnome-desktop-devel</packagereq>
       <packagereq type="default">gnome-devel-docs</packagereq>
       <packagereq type="default">gnome-panel-devel</packagereq>



From pkgdb at fedoraproject.org  Tue Apr 21 22:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 22:18:33 +0000
Subject: [pkgdb] rednotebook had acl change status
Message-ID: <20090421221833.6E70F10F878@bastion2.fedora.phx.redhat.com>

fab has set the watchbugzilla acl on rednotebook (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From pkgdb at fedoraproject.org  Tue Apr 21 22:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 22:18:34 +0000
Subject: [pkgdb] rednotebook had acl change status
Message-ID: <20090421221834.4043C10F88A@bastion2.fedora.phx.redhat.com>

fab has set the watchcommits acl on rednotebook (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From pkgdb at fedoraproject.org  Tue Apr 21 22:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 22:18:34 +0000
Subject: [pkgdb] rednotebook had acl change status
Message-ID: <20090421221834.CBC6410F88D@bastion2.fedora.phx.redhat.com>

fab has set the commit acl on rednotebook (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From pkgdb at fedoraproject.org  Tue Apr 21 22:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 21 Apr 2009 22:18:37 +0000
Subject: [pkgdb] rednotebook had acl change status
Message-ID: <20090421221837.14CE910F890@bastion2.fedora.phx.redhat.com>

fab has set the approveacls acl on rednotebook (Fedora devel) to Approved for cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook



From grandcross at fedoraproject.org  Tue Apr 21 22:24:45 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Tue, 21 Apr 2009 22:24:45 +0000 (UTC)
Subject: rpms/python-arm4/devel import.log, NONE, 1.1 python-arm4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421222445.89C47700D6@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27437/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-arm4.spec 
Log Message:
* Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3
Initial release.




--- NEW FILE import.log ---
python-arm4-1_1-3_fc10:HEAD:python-arm4-1.1-3.fc10.src.rpm:1240351443


--- NEW FILE python-arm4.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

### Abstract ###

Name: python-arm4
Version: 1.1
Release: 3%{?dist}
License: EPL
Group: Development/Languages
Summary: Application Reponse Measurement (ARM) V4 Python language bindings
URL: http://www.arm4.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u})
Source: http://downloads.sourceforge.net/arm4/arm4module-%{version}.tar.gz

### Patches ###

### Build Dependencies ###

BuildRequires: python-devel python-setuptools arm4-devel
Requires: arm4

%description
Arm4 is a python module that provides for application response measurement
across multiple tiers using the Open Group's Application Response Measurement
(ARM) standard, Issue 4.0.

See http://www.arm4.org/ for more information.


%prep
%setup -q -n Arm4-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING examples/
%{python_sitearch}/*

%changelog
* Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3 
- Minor edits to correct review issues.

* Wed Sep 17 2008  David Carter <dcarter at entertain-me.com> 1.1-2 
- Updated for new upstream release.

* Thu Aug 7 2008  David Carter <dcarter at entertain-me.com> 1.0-1 
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:07:18 -0000	1.1
+++ .cvsignore	21 Apr 2009 22:24:41 -0000	1.2
@@ -0,0 +1 @@
+arm4module-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:07:18 -0000	1.1
+++ sources	21 Apr 2009 22:24:42 -0000	1.2
@@ -0,0 +1 @@
+34571617ff63b28b6d28fd6d92030b04  arm4module-1.1.tar.gz



From giallu at fedoraproject.org  Tue Apr 21 22:25:30 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Tue, 21 Apr 2009 22:25:30 +0000 (UTC)
Subject: rpms/ogmtools/devel ogmtools-1.5-optflags.patch, NONE,
	1.1 ogmtools.spec, 1.1, 1.2
Message-ID: <20090421222530.EA8F6700D6@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/ogmtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27728

Modified Files:
	ogmtools.spec 
Added Files:
	ogmtools-1.5-optflags.patch 
Log Message:
* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 1.5-6
- honour RPM_OPT_FLAGS
- use --disable-dependency-tracking


ogmtools-1.5-optflags.patch:

--- NEW FILE ogmtools-1.5-optflags.patch ---
diff --git a/configure b/configure
index 1869ad6..25b1d8c 100755
--- a/configure
+++ b/configure
@@ -4672,8 +4672,8 @@ _ACEOF
 fi
 
 
-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
+CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ $CFLAGS"
+CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ $CXXFLAGS"
 
                     ac_config_files="$ac_config_files Makefile avilib/Makefile"
 cat >confcache <<\_ACEOF


Index: ogmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/devel/ogmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogmtools.spec	16 Apr 2009 07:09:37 -0000	1.1
+++ ogmtools.spec	21 Apr 2009 22:25:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ogmtools
 Version:        1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tools for Ogg media streams
 
 Group:          Applications/Multimedia
@@ -13,6 +13,8 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  libdvdread-devel
 
+Patch0:         ogmtools-1.5-optflags.patch
+
 %description
 These tools allow information about (ogminfo) or extraction from (ogmdemux) or
 creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
@@ -21,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # Convert Changelog to UTF8
 iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
 touch -r ChangeLog ChangeLog.txt
@@ -28,7 +31,7 @@
 
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -49,6 +52,10 @@
 
 
 %changelog
+* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 1.5-6
+- honour RPM_OPT_FLAGS
+- use --disable-dependency-tracking
+
 * Thu Apr  9 2009 Gianluca Sforna <giallu gmail com> - 1.5-5
 - Fix rpmlint issues
 - Fix license tag



From rjones at fedoraproject.org  Tue Apr 21 22:25:54 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:25:54 +0000 (UTC)
Subject: rpms/mingw32-filesystem/F-11 mingw32-filesystem.spec, 1.21,
	1.22 mingw32-find-requires.sh, 1.1, 1.2
Message-ID: <20090421222554.CF0C6700D6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28168

Modified Files:
	mingw32-filesystem.spec mingw32-find-requires.sh 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-11/mingw32-filesystem.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mingw32-filesystem.spec	27 Mar 2009 09:20:25 -0000	1.21
+++ mingw32-filesystem.spec	21 Apr 2009 22:25:53 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        50
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -158,6 +158,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 50-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Fri Mar 27 2009 Richard W.M. Jones <rjones at redhat.com> - 50-3
 - Fix up and test mingw32-pkg-config changes.
 


Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-11/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh	30 Oct 2008 09:49:17 -0000	1.1
+++ mingw32-find-requires.sh	21 Apr 2009 22:25:53 -0000	1.2
@@ -22,7 +22,7 @@
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
 
 for f in $dlls; do
-    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
         tr [:upper:] [:lower:] |
         sed 's/\(.*\)/mingw32(\1)/'
 done | sort -u



From rjones at fedoraproject.org  Tue Apr 21 22:26:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:26:25 +0000 (UTC)
Subject: rpms/mingw32-filesystem/F-10 mingw32-filesystem.spec, 1.10,
	1.11 mingw32-find-requires.sh, 1.1, 1.2
Message-ID: <20090421222625.2D22D700D6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28134

Modified Files:
	mingw32-filesystem.spec mingw32-find-requires.sh 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-filesystem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mingw32-filesystem.spec	19 Feb 2009 13:30:08 -0000	1.10
+++ mingw32-filesystem.spec	21 Apr 2009 22:25:54 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        40
-Release:        3%{?dist}.2
+Release:        3%{?dist}.3
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 40-3.3
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Thu Feb 19 2009 Richard W.M. Jones <rjones at redhat.com> - 40-3.fc10.2
 - Added virtual provides for mingw32(cfgmgr32.dll) and mingw32(setupapi.dll).
 


Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh	30 Oct 2008 09:49:17 -0000	1.1
+++ mingw32-find-requires.sh	21 Apr 2009 22:25:54 -0000	1.2
@@ -22,7 +22,7 @@
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
 
 for f in $dlls; do
-    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
         tr [:upper:] [:lower:] |
         sed 's/\(.*\)/mingw32(\1)/'
 done | sort -u



From rjones at fedoraproject.org  Tue Apr 21 22:26:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:26:25 +0000 (UTC)
Subject: rpms/mingw32-filesystem/EL-5 mingw32-filesystem.spec, 1.10,
	1.11 mingw32-find-requires.sh, 1.1, 1.2
Message-ID: <20090421222625.98577700D6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28203

Modified Files:
	mingw32-filesystem.spec mingw32-find-requires.sh 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-filesystem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mingw32-filesystem.spec	14 Jan 2009 10:18:30 -0000	1.10
+++ mingw32-filesystem.spec	21 Apr 2009 22:25:54 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        40
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 40-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 40-3
 - Add pseudo-provides secur32.dll
 


Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh	30 Oct 2008 09:49:16 -0000	1.1
+++ mingw32-find-requires.sh	21 Apr 2009 22:25:55 -0000	1.2
@@ -22,7 +22,7 @@
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
 
 for f in $dlls; do
-    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
         tr [:upper:] [:lower:] |
         sed 's/\(.*\)/mingw32(\1)/'
 done | sort -u



From rjones at fedoraproject.org  Tue Apr 21 22:26:29 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:26:29 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.21,
	1.22 mingw32-find-requires.sh, 1.1, 1.2
Message-ID: <20090421222629.65B8E700D6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28269

Modified Files:
	mingw32-filesystem.spec mingw32-find-requires.sh 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mingw32-filesystem.spec	27 Mar 2009 09:20:25 -0000	1.21
+++ mingw32-filesystem.spec	21 Apr 2009 22:25:56 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        50
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -158,6 +158,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 50-4
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Fri Mar 27 2009 Richard W.M. Jones <rjones at redhat.com> - 50-3
 - Fix up and test mingw32-pkg-config changes.
 


Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh	30 Oct 2008 09:49:17 -0000	1.1
+++ mingw32-find-requires.sh	21 Apr 2009 22:25:57 -0000	1.2
@@ -22,7 +22,7 @@
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
 
 for f in $dlls; do
-    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
         tr [:upper:] [:lower:] |
         sed 's/\(.*\)/mingw32(\1)/'
 done | sort -u



From grandcross at fedoraproject.org  Tue Apr 21 22:26:39 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Tue, 21 Apr 2009 22:26:39 +0000 (UTC)
Subject: rpms/python-arm4/F-10 import.log, NONE, 1.1 python-arm4.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421222639.2550D700D6@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28476/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-arm4.spec 
Log Message:
* Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3
Initial release.




--- NEW FILE import.log ---
python-arm4-1_1-3_fc10:F-10:python-arm4-1.1-3.fc10.src.rpm:1240351652


--- NEW FILE python-arm4.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

### Abstract ###

Name: python-arm4
Version: 1.1
Release: 3%{?dist}
License: EPL
Group: Development/Languages
Summary: Application Reponse Measurement (ARM) V4 Python language bindings
URL: http://www.arm4.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u})
Source: http://downloads.sourceforge.net/arm4/arm4module-%{version}.tar.gz

### Patches ###

### Build Dependencies ###

BuildRequires: python-devel python-setuptools arm4-devel
Requires: arm4

%description
Arm4 is a python module that provides for application response measurement
across multiple tiers using the Open Group's Application Response Measurement
(ARM) standard, Issue 4.0.

See http://www.arm4.org/ for more information.


%prep
%setup -q -n Arm4-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING examples/
%{python_sitearch}/*

%changelog
* Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3 
- Minor edits to correct review issues.

* Wed Sep 17 2008  David Carter <dcarter at entertain-me.com> 1.1-2 
- Updated for new upstream release.

* Thu Aug 7 2008  David Carter <dcarter at entertain-me.com> 1.0-1 
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:07:18 -0000	1.1
+++ .cvsignore	21 Apr 2009 22:26:37 -0000	1.2
@@ -0,0 +1 @@
+arm4module-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:07:18 -0000	1.1
+++ sources	21 Apr 2009 22:26:38 -0000	1.2
@@ -0,0 +1 @@
+34571617ff63b28b6d28fd6d92030b04  arm4module-1.1.tar.gz



From grandcross at fedoraproject.org  Tue Apr 21 22:30:05 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Tue, 21 Apr 2009 22:30:05 +0000 (UTC)
Subject: rpms/python-arm4/F-11 import.log, NONE, 1.1 python-arm4.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421223005.502BE7013C@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29941/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-arm4.spec 
Log Message:
* Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3
Initial release.




--- NEW FILE import.log ---
python-arm4-1_1-3_fc10:F-11:python-arm4-1.1-3.fc10.src.rpm:1240351787


--- NEW FILE python-arm4.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

### Abstract ###

Name: python-arm4
Version: 1.1
Release: 3%{?dist}
License: EPL
Group: Development/Languages
Summary: Application Reponse Measurement (ARM) V4 Python language bindings
URL: http://www.arm4.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u})
Source: http://downloads.sourceforge.net/arm4/arm4module-%{version}.tar.gz

### Patches ###

### Build Dependencies ###

BuildRequires: python-devel python-setuptools arm4-devel
Requires: arm4

%description
Arm4 is a python module that provides for application response measurement
across multiple tiers using the Open Group's Application Response Measurement
(ARM) standard, Issue 4.0.

See http://www.arm4.org/ for more information.


%prep
%setup -q -n Arm4-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING examples/
%{python_sitearch}/*

%changelog
* Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3 
- Minor edits to correct review issues.

* Wed Sep 17 2008  David Carter <dcarter at entertain-me.com> 1.1-2 
- Updated for new upstream release.

* Thu Aug 7 2008  David Carter <dcarter at entertain-me.com> 1.0-1 
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:07:18 -0000	1.1
+++ .cvsignore	21 Apr 2009 22:29:31 -0000	1.2
@@ -0,0 +1 @@
+arm4module-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:07:18 -0000	1.1
+++ sources	21 Apr 2009 22:29:31 -0000	1.2
@@ -0,0 +1 @@
+34571617ff63b28b6d28fd6d92030b04  arm4module-1.1.tar.gz



From rjones at fedoraproject.org  Tue Apr 21 22:32:32 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:32:32 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/EL-5 mingw32-nsiswrapper.spec, 1.1,
	1.2 nsiswrapper.pl, 1.1, 1.2
Message-ID: <20090421223232.F154C70137@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30750

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/mingw32-nsiswrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-nsiswrapper.spec	21 Feb 2009 17:17:32 -0000	1.1
+++ mingw32-nsiswrapper.spec	21 Apr 2009 22:32:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        3
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3
 - Rebuild for mingw32-gcc 4.4
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/nsiswrapper.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsiswrapper.pl	21 Feb 2009 17:17:32 -0000	1.1
+++ nsiswrapper.pl	21 Apr 2009 22:32:25 -0000	1.2
@@ -443,7 +443,7 @@
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._[:alnum:]]+\.dll' |
+                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {



From kwizart at fedoraproject.org  Tue Apr 21 22:34:10 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 22:34:10 +0000 (UTC)
Subject: rpms/filezilla/F-11 sources,1.34,1.35 filezilla.spec,1.37,1.38
Message-ID: <20090421223410.B1C3470137@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31170

Modified Files:
	sources filezilla.spec 
Log Message:
Update to 3.2.4



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	2 Apr 2009 07:21:20 -0000	1.34
+++ sources	21 Apr 2009 22:34:05 -0000	1.35
@@ -1 +1 @@
-c9d4b00e10e1a5e0c3928ac6e1fd5873  FileZilla_3.2.3.1_src.tar.bz2
+271550234ae3512736963d36f3a3281f  FileZilla_3.2.4_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-11/filezilla.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- filezilla.spec	2 Apr 2009 07:25:38 -0000	1.37
+++ filezilla.spec	21 Apr 2009 22:34:06 -0000	1.38
@@ -1,8 +1,8 @@
 #define fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.3.1
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}.1
+Version:        3.2.4
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 3.2.4-1
+- Update to 3.2.4
+
 * Thu Apr  2 2009 kwizart < kwizart at gmail.com > - 3.2.3.1-1
 - Update to 3.2.3.1 stable
 



From verdurin at fedoraproject.org  Tue Apr 21 22:34:09 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Tue, 21 Apr 2009 22:34:09 +0000 (UTC)
Subject: rpms/gnomint/F-11 gnomint-0.9.1-cflags.patch, NONE, 1.1 gnomint.spec,
	1.4, 1.5
Message-ID: <20090421223409.345D970137@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30721/F-11

Modified Files:
	gnomint.spec 
Added Files:
	gnomint-0.9.1-cflags.patch 
Log Message:
Fix for bug 496518 - incorrect cflags


gnomint-0.9.1-cflags.patch:

--- NEW FILE gnomint-0.9.1-cflags.patch ---
diff -up gnomint-0.9.1/configure~ gnomint-0.9.1/configure
--- gnomint-0.9.1/configure~	2008-12-18 08:35:02.000000000 +0200
+++ gnomint-0.9.1/configure	2009-04-20 00:05:17.000000000 +0300
@@ -16926,12 +16926,6 @@ fi
 
 
 
-if test "x$GCC" = "xyes"; then
-	CFLAGS="-Wall -Werror"
-	if test "x$use_debug" = "xYes"; then
-   	   CFLAGS="$CFLAGS -g -O0"
-	fi
-fi



Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-11/gnomint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomint.spec	24 Feb 2009 23:48:53 -0000	1.4
+++ gnomint.spec	21 Apr 2009 22:34:06 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gnomint
 Version:	0.9.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 21 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-3
+- fix for bug 496518 - $RPM_OPT_FLAGS not used
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From verdurin at fedoraproject.org  Tue Apr 21 22:34:35 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Tue, 21 Apr 2009 22:34:35 +0000 (UTC)
Subject: rpms/gnomint/F-10 gnomint-0.9.1-cflags.patch, NONE, 1.1 gnomint.spec,
	1.3, 1.4
Message-ID: <20090421223436.A43C170137@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30721/F-10

Modified Files:
	gnomint.spec 
Added Files:
	gnomint-0.9.1-cflags.patch 
Log Message:
Fix for bug 496518 - incorrect cflags


gnomint-0.9.1-cflags.patch:

--- NEW FILE gnomint-0.9.1-cflags.patch ---
diff -up gnomint-0.9.1/configure~ gnomint-0.9.1/configure
--- gnomint-0.9.1/configure~	2008-12-18 08:35:02.000000000 +0200
+++ gnomint-0.9.1/configure	2009-04-20 00:05:17.000000000 +0300
@@ -16926,12 +16926,6 @@ fi
 
 
 
-if test "x$GCC" = "xyes"; then
-	CFLAGS="-Wall -Werror"
-	if test "x$use_debug" = "xYes"; then
-   	   CFLAGS="$CFLAGS -g -O0"
-	fi
-fi



Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-10/gnomint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnomint.spec	21 Jan 2009 21:40:16 -0000	1.3
+++ gnomint.spec	21 Apr 2009 22:34:01 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		gnomint
 Version:	0.9.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
 License:	GPLv3+
 URL:		http://gnomint.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-cflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,11 +32,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
-sed -i -e 's|CFLAGS="-Wall -Werror -g "|true|' configure
-%configure --disable-schemas-install
+%configure --disable-dependency-tracking --disable-schemas-install
 make %{?_smp_mflags}
 
 
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 21 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-2
+- fix for bug 496518 - $RPM_OPT_FLAGS not used
+
 * Wed Jan 21 2009 Adam Huffman <bloch at verdurin.com> - 0.9.1-1
 - new upstream release including command-line interface
 - thanks to Seva Epsteyn for spec patch



From rjones at fedoraproject.org  Tue Apr 21 22:35:06 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:35:06 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/F-11 mingw32-nsiswrapper.spec, 1.2,
	1.3 nsiswrapper.pl, 1.1, 1.2
Message-ID: <20090421223506.7F52070137@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31675

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-11/mingw32-nsiswrapper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-nsiswrapper.spec	26 Feb 2009 01:18:29 -0000	1.2
+++ mingw32-nsiswrapper.spec	21 Apr 2009 22:35:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        3
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 3-4.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-11/nsiswrapper.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsiswrapper.pl	21 Feb 2009 17:16:19 -0000	1.1
+++ nsiswrapper.pl	21 Apr 2009 22:35:04 -0000	1.2
@@ -443,7 +443,7 @@
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._[:alnum:]]+\.dll' |
+                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {



From sailer at fedoraproject.org  Tue Apr 21 22:36:08 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Tue, 21 Apr 2009 22:36:08 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel mingw32-gtkmm24.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090421223608.8734C70137@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31784

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-gtkmm24.spec 
Log Message:
initial import after review



--- NEW FILE mingw32-gtkmm24.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-gtkmm24
Version:        2.16.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.16/gtkmm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-glibmm24 >= %{version}
BuildRequires:  mingw32-atk
BuildRequires:  mingw32-pango
BuildRequires:  mingw32-gtk2 >= %{version}
BuildRequires:  mingw32-cairomm
BuildRequires:  mingw32-pangomm

Requires:       pkgconfig


%description
gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps
GTK+ 2.  Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.



%prep
%setup -q -n gtkmm-%{version}


%build
%{_mingw32_configure} --disable-static --enable-shared --disable-demos --disable-docs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libatkmm-1.6-1.dll
%{_mingw32_bindir}/libgdkmm-2.4-1.dll
%{_mingw32_bindir}/libgtkmm-2.4-1.dll
%{_mingw32_libdir}/libatkmm-1.6.dll.a
%{_mingw32_libdir}/libatkmm-1.6.la
%{_mingw32_libdir}/libgdkmm-2.4.dll.a
%{_mingw32_libdir}/libgdkmm-2.4.la
%{_mingw32_libdir}/libgtkmm-2.4.dll.a
%{_mingw32_libdir}/libgtkmm-2.4.la
%{_mingw32_includedir}/atkmm-1.6
%{_mingw32_includedir}/gdkmm-2.4
%{_mingw32_includedir}/gtkmm-2.4
%{_mingw32_libdir}/gdkmm-2.4
%{_mingw32_libdir}/gtkmm-2.4
%{_mingw32_libdir}/pkgconfig/atkmm-1.6.pc
%{_mingw32_libdir}/pkgconfig/gdkmm-2.4.pc
%{_mingw32_libdir}/pkgconfig/gtkmm-2.4.pc


%changelog
* Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.16.0-1
- update to 2.16.0 to match native
- remove COPYING.tools, as the binary does not contain any program from
  the tools directory
- do not build docs

* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.15.0-2
- replace %%define with %%global

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.15.0-1
- update to 2.15.0

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-4
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-3
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-2
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:56:17 -0000	1.1
+++ .cvsignore	21 Apr 2009 22:35:34 -0000	1.2
@@ -0,0 +1 @@
+gtkmm-2.16.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:56:17 -0000	1.1
+++ sources	21 Apr 2009 22:35:34 -0000	1.2
@@ -0,0 +1 @@
+a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2



From rjones at fedoraproject.org  Tue Apr 21 22:36:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:36:17 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/devel mingw32-nsiswrapper.spec, 1.2,
	1.3 nsiswrapper.pl, 1.1, 1.2
Message-ID: <20090421223617.2A68A70137@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31987

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/mingw32-nsiswrapper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-nsiswrapper.spec	26 Feb 2009 01:18:29 -0000	1.2
+++ mingw32-nsiswrapper.spec	21 Apr 2009 22:36:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 3-5
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/nsiswrapper.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsiswrapper.pl	21 Feb 2009 17:16:19 -0000	1.1
+++ nsiswrapper.pl	21 Apr 2009 22:36:15 -0000	1.2
@@ -443,7 +443,7 @@
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._[:alnum:]]+\.dll' |
+                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {



From rjones at fedoraproject.org  Tue Apr 21 22:37:23 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 21 Apr 2009 22:37:23 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/F-10 mingw32-nsiswrapper.spec, 1.1,
	1.2 nsiswrapper.pl, 1.1, 1.2
Message-ID: <20090421223723.9E7B970137@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32310

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-10/mingw32-nsiswrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-nsiswrapper.spec	21 Feb 2009 17:17:31 -0000	1.1
+++ mingw32-nsiswrapper.spec	21 Apr 2009 22:36:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        3
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3
 - Rebuild for mingw32-gcc 4.4
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-10/nsiswrapper.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsiswrapper.pl	21 Feb 2009 17:17:31 -0000	1.1
+++ nsiswrapper.pl	21 Apr 2009 22:36:50 -0000	1.2
@@ -443,7 +443,7 @@
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._[:alnum:]]+\.dll' |
+                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {



From limb at fedoraproject.org  Tue Apr 21 22:42:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 21 Apr 2009 22:42:35 +0000 (UTC)
Subject: rpms/wesnoth/F-11 wesnoth.spec,1.75,1.76
Message-ID: <20090421224235.62C97700D6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1979

Modified Files:
	wesnoth.spec 
Log Message:
debuginfo



Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-11/wesnoth.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- wesnoth.spec	20 Apr 2009 19:29:42 -0000	1.75
+++ wesnoth.spec	21 Apr 2009 22:42:33 -0000	1.76
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -91,6 +91,8 @@
 
 %build
 # Cannot use configure macro because noarch-redhat-linux is not recognized by the auto tools in the tarball
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir}  --mandir=%{_mandir} --infodir=%{_infodir} \
     --disable-dependency-tracking \
     --with-localedir=%{_datadir}/locale \
@@ -249,6 +251,9 @@
 #%endif
 
 %changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.6.1-2
+- Respect $RPM_OPT_FLAGS, BZ 496897.
+
 * Mon Apr 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.6.1-1
 - 1.6.1 maintenance release.
 



From devrim at fedoraproject.org  Tue Apr 21 22:43:41 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue, 21 Apr 2009 22:43:41 +0000 (UTC)
Subject: rpms/python-psycopg2/F-11 .cvsignore, 1.7, 1.8 python-psycopg2.spec,
	1.21, 1.22 sources, 1.7, 1.8
Message-ID: <20090421224341.86295700D6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2458

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Mar 2009 22:26:34 -0000	1.7
+++ .cvsignore	21 Apr 2009 22:43:40 -0000	1.8
@@ -1,2 +1,3 @@
 psycopg2-2.0.8.tar.gz
 psycopg2-2.0.9.tar.gz
+psycopg2-2.0.10.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/python-psycopg2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-psycopg2.spec	19 Mar 2009 22:30:18 -0000	1.21
+++ python-psycopg2.spec	21 Apr 2009 22:43:40 -0000	1.22
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.9
+Version:	2.0.10
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1
 - Update to 2.0.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2009 22:26:34 -0000	1.7
+++ sources	21 Apr 2009 22:43:40 -0000	1.8
@@ -1,2 +1,3 @@
 2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
 885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
+2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz



From denis at fedoraproject.org  Tue Apr 21 22:44:39 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 21 Apr 2009 22:44:39 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/devel gnome-desktop-sharp.spec,1.7,1.8
Message-ID: <20090421224439.F33A1700D6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2723

Modified Files:
	gnome-desktop-sharp.spec 
Log Message:
Rebuilt without nautilus-cd-burner (obsoleted)


Index: gnome-desktop-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/gnome-desktop-sharp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-desktop-sharp.spec	14 Apr 2009 07:46:48 -0000	1.7
+++ gnome-desktop-sharp.spec	21 Apr 2009 22:44:38 -0000	1.8
@@ -1,19 +1,19 @@
 Name:           gnome-desktop-sharp
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET language binding for mono
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.mono-project.com/GtkSharp
-Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-2.24.0-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel, gtk2-devel, gtkhtml3-devel
 BuildRequires:  librsvg2-devel, vte-devel, gnome-panel-devel
 BuildRequires:  libwnck-devel, gtksourceview2-devel, libgnomeprintui22-devel
-BuildRequires:  nautilus-cd-burner-devel, gnome-sharp-devel
+BuildRequires:  gnome-sharp-devel
 BuildRequires:  gnome-desktop-devel
 BuildRequires:  gtk-sharp2-gapi >= 2.12.0
 BuildRequires:  gtk-sharp2-devel >= 2.12.0
@@ -81,7 +81,6 @@
 %{_libdir}/mono/gac/gnomedesktop-sharp
 %{_libdir}/mono/gac/gnome-panel-sharp
 %{_libdir}/mono/gac/gnome-print-sharp
-%{_libdir}/mono/gac/nautilusburn-sharp
 %{_libdir}/mono/gac/gtkhtml-sharp
 %{_libdir}/mono/gac/gtksourceview2-sharp
 %{_libdir}/mono/gac/rsvg2-sharp
@@ -90,7 +89,6 @@
 %{_libdir}/mono/gnomedesktop-sharp-2.20
 %{_libdir}/mono/gnome-panel-sharp-2.24
 %{_libdir}/mono/gnome-print-sharp-2.18
-%{_libdir}/mono/nautilusburn-sharp-2.20
 %{_libdir}/mono/gtkhtml-sharp-3.14
 %{_libdir}/mono/gtksourceview2-sharp-2.0
 %{_libdir}/mono/rsvg2-sharp-2.0
@@ -99,7 +97,6 @@
 %{_datadir}/gnomedesktop-sharp
 %{_datadir}/gnome-panel-sharp
 %{_datadir}/gnome-print-sharp
-%{_datadir}/nautilusburn-sharp
 %{_datadir}/gtkhtml-sharp
 %{_datadir}/gtksourceview2-sharp
 %{_datadir}/rsvg2-sharp
@@ -112,6 +109,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 22 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-2
+- Rebuilt without nautilus-cd-burner (obsoleted)
+
 * Mon Apr 06 2009 Xavier Lamien <lxtnow at gmail.com> - 2.26.0-1
 - UPdate release.
 



From devrim at fedoraproject.org  Tue Apr 21 22:45:30 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue, 21 Apr 2009 22:45:30 +0000 (UTC)
Subject: rpms/python-psycopg2/F-11 python-psycopg2.spec,1.22,1.23
Message-ID: <20090421224530.E9249700D6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2983

Modified Files:
	python-psycopg2.spec 
Log Message:
Bump up version



Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/python-psycopg2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-psycopg2.spec	21 Apr 2009 22:43:40 -0000	1.22
+++ python-psycopg2.spec	21 Apr 2009 22:45:25 -0000	1.23
@@ -8,7 +8,7 @@
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
 Version:	2.0.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
 License:	GPLv2+ with exceptions
@@ -90,7 +90,7 @@
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
-* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-1
+* Tue Apr 21 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.10-2
 - Update to 2.0.10
 
 * Fri Mar 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.9-1



From denis at fedoraproject.org  Tue Apr 21 22:46:34 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 21 Apr 2009 22:46:34 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/F-11 gnome-desktop-sharp.spec,1.7,1.8
Message-ID: <20090421224634.3A1F4700D6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3410

Modified Files:
	gnome-desktop-sharp.spec 
Log Message:
Rebuilt without nautilus-cd-burner (obsoleted)


Index: gnome-desktop-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/F-11/gnome-desktop-sharp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-desktop-sharp.spec	14 Apr 2009 07:46:48 -0000	1.7
+++ gnome-desktop-sharp.spec	21 Apr 2009 22:46:32 -0000	1.8
@@ -1,19 +1,19 @@
 Name:           gnome-desktop-sharp
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET language binding for mono
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.mono-project.com/GtkSharp
-Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-2.24.0-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel, gtk2-devel, gtkhtml3-devel
 BuildRequires:  librsvg2-devel, vte-devel, gnome-panel-devel
 BuildRequires:  libwnck-devel, gtksourceview2-devel, libgnomeprintui22-devel
-BuildRequires:  nautilus-cd-burner-devel, gnome-sharp-devel
+BuildRequires:  gnome-sharp-devel
 BuildRequires:  gnome-desktop-devel
 BuildRequires:  gtk-sharp2-gapi >= 2.12.0
 BuildRequires:  gtk-sharp2-devel >= 2.12.0
@@ -81,7 +81,6 @@
 %{_libdir}/mono/gac/gnomedesktop-sharp
 %{_libdir}/mono/gac/gnome-panel-sharp
 %{_libdir}/mono/gac/gnome-print-sharp
-%{_libdir}/mono/gac/nautilusburn-sharp
 %{_libdir}/mono/gac/gtkhtml-sharp
 %{_libdir}/mono/gac/gtksourceview2-sharp
 %{_libdir}/mono/gac/rsvg2-sharp
@@ -90,7 +89,6 @@
 %{_libdir}/mono/gnomedesktop-sharp-2.20
 %{_libdir}/mono/gnome-panel-sharp-2.24
 %{_libdir}/mono/gnome-print-sharp-2.18
-%{_libdir}/mono/nautilusburn-sharp-2.20
 %{_libdir}/mono/gtkhtml-sharp-3.14
 %{_libdir}/mono/gtksourceview2-sharp-2.0
 %{_libdir}/mono/rsvg2-sharp-2.0
@@ -99,7 +97,6 @@
 %{_datadir}/gnomedesktop-sharp
 %{_datadir}/gnome-panel-sharp
 %{_datadir}/gnome-print-sharp
-%{_datadir}/nautilusburn-sharp
 %{_datadir}/gtkhtml-sharp
 %{_datadir}/gtksourceview2-sharp
 %{_datadir}/rsvg2-sharp
@@ -112,6 +109,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 22 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-2
+- Rebuilt without nautilus-cd-burner (obsoleted)
+
 * Mon Apr 06 2009 Xavier Lamien <lxtnow at gmail.com> - 2.26.0-1
 - UPdate release.
 



From devrim at fedoraproject.org  Tue Apr 21 22:57:33 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue, 21 Apr 2009 22:57:33 +0000 (UTC)
Subject: rpms/classpathx-jaf/F-11 classpathx-jaf.spec,1.27,1.28
Message-ID: <20090421225733.1D297700D6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/classpathx-jaf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7426

Modified Files:
	classpathx-jaf.spec 
Log Message:
Rebuild



Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/extras/rpms/classpathx-jaf/F-11/classpathx-jaf.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- classpathx-jaf.spec	24 Feb 2009 07:41:53 -0000	1.27
+++ classpathx-jaf.spec	21 Apr 2009 22:57:01 -0000	1.28
@@ -35,7 +35,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        14.1%{?dist}
+Release:        14.2%{?dist}
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 Group:          System Environment/Libraries
@@ -173,6 +173,9 @@
 %ghost %{_javadocdir}/activation
 
 %changelog
+* Wed Apr 22 2009 Devrim GUNDUZ <devrim at gunduz.org> - 0:1.0-14.2
+- Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-14.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 21 22:59:37 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 22:59:37 +0000 (UTC)
Subject: rpms/epiphany/F-9 epiphany.spec,1.199,1.200
Message-ID: <20090421225937.30402700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8687

Modified Files:
	epiphany.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.2-10
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-9/epiphany.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- epiphany.spec	27 Mar 2009 19:29:41 -0000	1.199
+++ epiphany.spec	21 Apr 2009 22:59:06 -0000	1.200
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.22.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -214,6 +214,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.2-10
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.2-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:00:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:00:40 +0000 (UTC)
Subject: rpms/blam/F-9 blam.spec,1.33,1.34
Message-ID: <20090421230040.975A1700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9162

Modified Files:
	blam.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-8.1
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-9/blam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- blam.spec	27 Mar 2009 19:30:26 -0000	1.33
+++ blam.spec	21 Apr 2009 23:00:09 -0000	1.34
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.0.8
+%define	gecko_version		1.9.0.9
 
 Name:		blam
 Version:	1.8.5
-Release:	7%{?dist}.1
+Release:	8%{?dist}.1
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -136,6 +136,9 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-8.1
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-7.1
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:02:06 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:02:06 +0000 (UTC)
Subject: rpms/cairo-dock/F-9 cairo-dock.spec,1.30,1.31
Message-ID: <20090421230206.457B7700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9716

Modified Files:
	cairo-dock.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.6.3.1-1.6
- Rebuild against newer gecko



Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cairo-dock.spec	27 Mar 2009 19:31:11 -0000	1.30
+++ cairo-dock.spec	21 Apr 2009 23:01:35 -0000	1.31
@@ -38,7 +38,7 @@
 
 Name:		cairo-dock
 Version:	%{mainver}
-Release:	%{fedora_rel}%{?dist}.5
+Release:	%{fedora_rel}%{?dist}.6
 Summary:	Light eye-candy fully themable animated dock
 
 Group:		User Interface/Desktops
@@ -606,6 +606,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.6.3.1-1.6
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.6.3.1-1.5
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:03:33 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:03:33 +0000 (UTC)
Subject: rpms/chmsee/F-9 chmsee.spec,1.34,1.35
Message-ID: <20090421230333.21D60700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/chmsee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10295

Modified Files:
	chmsee.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-11
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/F-9/chmsee.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- chmsee.spec	27 Mar 2009 19:31:56 -0000	1.34
+++ chmsee.spec	21 Apr 2009 23:03:29 -0000	1.35
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary(zh_CN):	CHM ??????????????????, ?????? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-11
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-10
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:04:51 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:04:51 +0000 (UTC)
Subject: rpms/devhelp/F-9 devhelp.spec,1.98,1.99
Message-ID: <20090421230451.ACD00700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/devhelp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10853

Modified Files:
	devhelp.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-11
- Rebuild against newer gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/F-9/devhelp.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- devhelp.spec	27 Mar 2009 19:32:41 -0000	1.98
+++ devhelp.spec	21 Apr 2009 23:04:50 -0000	1.99
@@ -1,5 +1,5 @@
 # Last updated for 0.17
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 %define gtk2_version 2.8.0
 %define libwnck_version 2.10.0
 
@@ -7,7 +7,7 @@
 
 Name: devhelp
 Version: 0.19.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -138,6 +138,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-11
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-10
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:06:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:06:30 +0000 (UTC)
Subject: rpms/evolution-rss/F-9 evolution-rss.spec,1.24,1.25
Message-ID: <20090421230630.DFEAD700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11178

Modified Files:
	evolution-rss.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.1.0-10
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/F-9/evolution-rss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- evolution-rss.spec	28 Mar 2009 09:33:46 -0000	1.24
+++ evolution-rss.spec	21 Apr 2009 23:05:57 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %doc TODO
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.1.0-10
+- Rebuild against newer gecko
+
 * Sat Mar 28 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.0-9
 - rebuild against newer gecko
 - update BR



From caillon at fedoraproject.org  Tue Apr 21 23:08:18 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:08:18 +0000 (UTC)
Subject: rpms/galeon/F-9 galeon.spec,1.60,1.61
Message-ID: <20090421230818.6212D70137@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11791

Modified Files:
	galeon.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-9
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- galeon.spec	27 Mar 2009 19:34:12 -0000	1.60
+++ galeon.spec	21 Apr 2009 23:08:13 -0000	1.61
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-9
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:10:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:10:20 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.38,1.39
Message-ID: <20090421231020.A57C27013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12453

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-26
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-python2-extras.spec	27 Mar 2009 19:35:00 -0000	1.38
+++ gnome-python2-extras.spec	21 Apr 2009 23:09:44 -0000	1.39
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -183,6 +183,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-26
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-25
 - Rebuild against newer gecko
 



From verdurin at fedoraproject.org  Tue Apr 21 23:12:02 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Tue, 21 Apr 2009 23:12:02 +0000 (UTC)
Subject: rpms/gnomint/devel gnomint.spec,1.4,1.5
Message-ID: <20090421231202.996F37013C@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13036/devel

Modified Files:
	gnomint.spec 
Log Message:
fix for bug 496518 - cflags



Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/devel/gnomint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomint.spec	24 Feb 2009 23:48:53 -0000	1.4
+++ gnomint.spec	21 Apr 2009 23:11:58 -0000	1.5
@@ -1,12 +1,13 @@
 Name:		gnomint
 Version:	0.9.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
 License:	GPLv3+
 URL:		http://gnomint.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-cflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,11 +32,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
-sed -i -e 's|CFLAGS="-Wall -Werror -g "|true|' configure
-%configure --disable-schemas-install
+%configure --disable-dependency-tracking --disable-schemas-install
 make %{?_smp_mflags}
 
 
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 21 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-3
+- fix for bug 496518 - $RPM_OPT_FLAGS not used
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 21 23:12:28 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:12:28 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-9 gnome-web-photo.spec,1.19,1.20
Message-ID: <20090421231230.591317013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13109

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3-20
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-9/gnome-web-photo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-web-photo.spec	27 Mar 2009 19:35:45 -0000	1.19
+++ gnome-web-photo.spec	21 Apr 2009 23:11:53 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -81,6 +81,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3-20
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3-19
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:14:48 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:14:48 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.13,1.14
Message-ID: <20090421231448.BED707013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13819

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-5
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- google-gadgets.spec	27 Mar 2009 19:36:29 -0000	1.13
+++ google-gadgets.spec	21 Apr 2009 23:14:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-5
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-4
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:16:11 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:16:11 +0000 (UTC)
Subject: rpms/gtkmozembedmm/F-9 gtkmozembedmm.spec,1.35,1.36
Message-ID: <20090421231611.899937013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gtkmozembedmm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14618

Modified Files:
	gtkmozembedmm.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-28
- Rebuild against newer gecko



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/F-9/gtkmozembedmm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gtkmozembedmm.spec	27 Mar 2009 19:37:14 -0000	1.35
+++ gtkmozembedmm.spec	21 Apr 2009 23:16:09 -0000	1.36
@@ -1,7 +1,7 @@
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        27%{?dist}
+Release:        28%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-28
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-27
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:17:52 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:17:52 +0000 (UTC)
Subject: rpms/kazehakase/F-9 kazehakase.spec,1.75,1.76
Message-ID: <20090421231752.C922F700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15222

Modified Files:
	kazehakase.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kazehakase.spec	16 Apr 2009 18:10:13 -0000	1.75
+++ kazehakase.spec	21 Apr 2009 23:17:20 -0000	1.76
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -303,6 +303,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.1
+- Rebuild against newer gecko
+
 * Fri Apr 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-4
 - Prevent crash even if no modules are installed (related to bug 444569)
 - Embed Vendor version information



From caillon at fedoraproject.org  Tue Apr 21 23:19:25 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:19:25 +0000 (UTC)
Subject: rpms/Miro/F-9 Miro.spec,1.42,1.43
Message-ID: <20090421231925.875C9700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15812

Modified Files:
	Miro.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-3
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Miro.spec	27 Mar 2009 19:39:37 -0000	1.42
+++ Miro.spec	21 Apr 2009 23:18:54 -0000	1.43
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 
 Name:           Miro
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-3
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-2
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:20:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:20:26 +0000 (UTC)
Subject: rpms/mozvoikko/F-9 mozvoikko.spec,1.10,1.11
Message-ID: <20090421232026.0E642700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16246

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-9
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-9/mozvoikko.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mozvoikko.spec	27 Mar 2009 19:40:25 -0000	1.10
+++ mozvoikko.spec	21 Apr 2009 23:20:25 -0000	1.11
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.8
+%define gecko_ver 1.9.0.9
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-9
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:21:17 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:21:17 +0000 (UTC)
Subject: rpms/mugshot/F-9 mugshot.spec,1.47,1.48
Message-ID: <20090421232117.BEBCF700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16672

Modified Files:
	mugshot.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-8
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-9/mugshot.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mugshot.spec	27 Mar 2009 19:41:27 -0000	1.47
+++ mugshot.spec	21 Apr 2009 23:21:16 -0000	1.48
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -168,6 +168,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-8
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-7
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:21:57 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:21:57 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-9 ruby-gnome2.spec,1.35,1.36
Message-ID: <20090421232157.7D612700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16980

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.17.0-8
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ruby-gnome2.spec	27 Mar 2009 19:42:17 -0000	1.35
+++ ruby-gnome2.spec	21 Apr 2009 23:21:56 -0000	1.36
@@ -10,7 +10,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -700,6 +700,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.17.0-8
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.17.0-7
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 21 23:23:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:23:20 +0000 (UTC)
Subject: rpms/totem/F-9 totem.spec,1.200,1.201
Message-ID: <20090421232320.837EF700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/totem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17270

Modified Files:
	totem.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.23.2-14
- Rebuild against newer gecko



Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/F-9/totem.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- totem.spec	27 Mar 2009 19:42:54 -0000	1.200
+++ totem.spec	21 Apr 2009 23:23:11 -0000	1.201
@@ -11,7 +11,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -438,6 +438,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.23.2-14
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.23.2-13
 - Rebuild against newer gecko
 



From allisson at fedoraproject.org  Tue Apr 21 23:24:51 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 21 Apr 2009 23:24:51 +0000 (UTC)
Subject: rpms/clutter/F-11 .cvsignore, 1.12, 1.13 clutter.spec, 1.16,
	1.17 import.log, 1.6, 1.7 sources, 1.12, 1.13
Message-ID: <20090421232451.69AEC700D6@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17577/F-11

Modified Files:
	.cvsignore clutter.spec import.log sources 
Log Message:

Update to 0.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Jan 2009 03:39:00 -0000	1.12
+++ .cvsignore	21 Apr 2009 23:24:10 -0000	1.13
@@ -1 +1 @@
-clutter-0.8.6.tar.bz2
+clutter-0.8.8.tar.bz2


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-11/clutter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- clutter.spec	24 Feb 2009 08:03:39 -0000	1.16
+++ clutter.spec	21 Apr 2009 23:24:11 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           clutter
-Version:        0.8.6
-Release:        4%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
@@ -84,10 +84,12 @@
 
 
 %changelog
+* Tue Apr 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.8-1
+- Update to 0.8.8
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.6-3
 - Remove noarch from doc subpackage
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	22 Jan 2009 13:59:48 -0000	1.6
+++ import.log	21 Apr 2009 23:24:11 -0000	1.7
@@ -4,3 +4,4 @@
 clutter-0_8_6-1_fc10:HEAD:clutter-0.8.6-1.fc10.src.rpm:1232595301
 clutter-0_8_6-2_fc10:HEAD:clutter-0.8.6-2.fc10.src.rpm:1232630582
 clutter-0_8_6-3_fc10:HEAD:clutter-0.8.6-3.fc10.src.rpm:1232632595
+clutter-0_8_8-1_fc10:F-11:clutter-0.8.8-1.fc10.src.rpm:1240356112


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Jan 2009 03:39:00 -0000	1.12
+++ sources	21 Apr 2009 23:24:11 -0000	1.13
@@ -1 +1 @@
-f5ce02b3092898b648a63625a7f7c553  clutter-0.8.6.tar.bz2
+20f9ab406a9fa261a0a3379eb6f43625  clutter-0.8.8.tar.bz2



From caillon at fedoraproject.org  Tue Apr 21 23:25:05 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 21 Apr 2009 23:25:05 +0000 (UTC)
Subject: rpms/yelp/F-9 yelp.spec,1.144,1.145
Message-ID: <20090421232505.F2BAC700D6@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17871

Modified Files:
	yelp.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-11
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-9/yelp.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- yelp.spec	27 Mar 2009 19:53:52 -0000	1.144
+++ yelp.spec	21 Apr 2009 23:25:04 -0000	1.145
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.0.8
+%define gecko_version 1.9.0.9
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.22.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -165,6 +165,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-11
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-10
 - Rebuild against newer gecko
 



From kwizart at fedoraproject.org  Tue Apr 21 23:28:52 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 23:28:52 +0000 (UTC)
Subject: rpms/lcms/devel lcms-CVE-2009-0793.patch, NONE, 1.1 lcms.spec, 1.25,
	1.26
Message-ID: <20090421232853.10BB5700D6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19036

Modified Files:
	lcms.spec 
Added Files:
	lcms-CVE-2009-0793.patch 
Log Message:
Add lcms-CVE-2009-0793.patch


lcms-CVE-2009-0793.patch:

--- NEW FILE lcms-CVE-2009-0793.patch ---
diff -up lcms-1.18/src/cmsxform.c.cve0793 lcms-1.18/src/cmsxform.c
--- lcms-1.18/src/cmsxform.c.cve0793	2009-03-21 16:31:52.000000000 +0100
+++ lcms-1.18/src/cmsxform.c	2009-04-22 01:20:40.000000000 +0200
@@ -660,6 +660,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
                 FromLstarToXYZ(GrayTRC, Shapes1);
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 // Reversing must be done after curve translation
 
                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
@@ -675,6 +678,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
 
                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 Shapes[0] = cmsDupGamma(GrayTRC);
                 Shapes[1] = cmsDupGamma(GrayTRC);
                 Shapes[2] = cmsDupGamma(GrayTRC); 


Index: lcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/devel/lcms.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lcms.spec	23 Mar 2009 09:41:10 -0000	1.25
+++ lcms.spec	21 Apr 2009 23:28:19 -0000	1.26
@@ -2,13 +2,14 @@
 
 Name:           lcms
 Version:        1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        MIT
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-%{version}.tar.gz
+Patch0:         lcms-CVE-2009-0793.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -58,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cve0793
 
 find . -name \*.[ch] | xargs chmod -x
 chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Tue Apr 22 2009 kwizart < kwizart at gmail.com > - 1.18-2
+- Add lcms-CVE-2009-0793.patch from 1.18a
+
 * Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 1.18-1
 - Update to 1.18 (final)
 - Remove upstreamed patches



From kwizart at fedoraproject.org  Tue Apr 21 23:35:22 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 23:35:22 +0000 (UTC)
Subject: rpms/lcms/F-11 lcms-CVE-2009-0793.patch, NONE, 1.1 lcms.spec, 1.25,
	1.26
Message-ID: <20090421233522.6E77A700D6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20400/F-11

Modified Files:
	lcms.spec 
Added Files:
	lcms-CVE-2009-0793.patch 
Log Message:
Add lcms-CVE-2009-0793.patch in branches


lcms-CVE-2009-0793.patch:

--- NEW FILE lcms-CVE-2009-0793.patch ---
diff -up lcms-1.18/src/cmsxform.c.cve0793 lcms-1.18/src/cmsxform.c
--- lcms-1.18/src/cmsxform.c.cve0793	2009-03-21 16:31:52.000000000 +0100
+++ lcms-1.18/src/cmsxform.c	2009-04-22 01:20:40.000000000 +0200
@@ -660,6 +660,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
                 FromLstarToXYZ(GrayTRC, Shapes1);
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 // Reversing must be done after curve translation
 
                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
@@ -675,6 +678,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
 
                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 Shapes[0] = cmsDupGamma(GrayTRC);
                 Shapes[1] = cmsDupGamma(GrayTRC);
                 Shapes[2] = cmsDupGamma(GrayTRC); 


Index: lcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/F-11/lcms.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lcms.spec	23 Mar 2009 09:41:10 -0000	1.25
+++ lcms.spec	21 Apr 2009 23:35:14 -0000	1.26
@@ -2,13 +2,14 @@
 
 Name:           lcms
 Version:        1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        MIT
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-%{version}.tar.gz
+Patch0:         lcms-CVE-2009-0793.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -58,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cve0793
 
 find . -name \*.[ch] | xargs chmod -x
 chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Tue Apr 22 2009 kwizart < kwizart at gmail.com > - 1.18-2
+- Add lcms-CVE-2009-0793.patch from 1.18a
+
 * Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 1.18-1
 - Update to 1.18 (final)
 - Remove upstreamed patches



From kwizart at fedoraproject.org  Tue Apr 21 23:35:50 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 23:35:50 +0000 (UTC)
Subject: rpms/lcms/F-10 lcms-CVE-2009-0793.patch, NONE, 1.1 lcms.spec, 1.20,
	1.21
Message-ID: <20090421233550.81365700D6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20400/F-10

Modified Files:
	lcms.spec 
Added Files:
	lcms-CVE-2009-0793.patch 
Log Message:
Add lcms-CVE-2009-0793.patch in branches


lcms-CVE-2009-0793.patch:

--- NEW FILE lcms-CVE-2009-0793.patch ---
diff -up lcms-1.18/src/cmsxform.c.cve0793 lcms-1.18/src/cmsxform.c
--- lcms-1.18/src/cmsxform.c.cve0793	2009-03-21 16:31:52.000000000 +0100
+++ lcms-1.18/src/cmsxform.c	2009-04-22 01:20:40.000000000 +0200
@@ -660,6 +660,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
                 FromLstarToXYZ(GrayTRC, Shapes1);
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 // Reversing must be done after curve translation
 
                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
@@ -675,6 +678,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
 
                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 Shapes[0] = cmsDupGamma(GrayTRC);
                 Shapes[1] = cmsDupGamma(GrayTRC);
                 Shapes[2] = cmsDupGamma(GrayTRC); 


Index: lcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/F-10/lcms.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lcms.spec	23 Mar 2009 09:43:11 -0000	1.20
+++ lcms.spec	21 Apr 2009 23:35:16 -0000	1.21
@@ -2,13 +2,14 @@
 
 Name:           lcms
 Version:        1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        MIT
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-%{version}.tar.gz
+Patch0:         lcms-CVE-2009-0793.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -58,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cve0793
 
 find . -name \*.[ch] | xargs chmod -x
 chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Tue Apr 22 2009 kwizart < kwizart at gmail.com > - 1.18-2
+- Add lcms-CVE-2009-0793.patch from 1.18a
+
 * Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 1.18-1
 - Update to 1.18 (final)
 - Remove upstreamed patches



From kwizart at fedoraproject.org  Tue Apr 21 23:35:53 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 23:35:53 +0000 (UTC)
Subject: rpms/lcms/F-9 lcms-CVE-2009-0793.patch, NONE, 1.1 lcms.spec, 1.22,
	1.23
Message-ID: <20090421233553.8643D7013C@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20400/F-9

Modified Files:
	lcms.spec 
Added Files:
	lcms-CVE-2009-0793.patch 
Log Message:
Add lcms-CVE-2009-0793.patch in branches


lcms-CVE-2009-0793.patch:

--- NEW FILE lcms-CVE-2009-0793.patch ---
diff -up lcms-1.18/src/cmsxform.c.cve0793 lcms-1.18/src/cmsxform.c
--- lcms-1.18/src/cmsxform.c.cve0793	2009-03-21 16:31:52.000000000 +0100
+++ lcms-1.18/src/cmsxform.c	2009-04-22 01:20:40.000000000 +0200
@@ -660,6 +660,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
                 FromLstarToXYZ(GrayTRC, Shapes1);
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 // Reversing must be done after curve translation
 
                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
@@ -675,6 +678,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
 
                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
 
+		if (GrayTRC == NULL)
+			return NULL;
+
                 Shapes[0] = cmsDupGamma(GrayTRC);
                 Shapes[1] = cmsDupGamma(GrayTRC);
                 Shapes[2] = cmsDupGamma(GrayTRC); 


Index: lcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/F-9/lcms.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lcms.spec	23 Mar 2009 09:45:01 -0000	1.22
+++ lcms.spec	21 Apr 2009 23:35:18 -0000	1.23
@@ -2,13 +2,14 @@
 
 Name:           lcms
 Version:        1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        MIT
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-%{version}.tar.gz
+Patch0:         lcms-CVE-2009-0793.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -58,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cve0793
 
 find . -name \*.[ch] | xargs chmod -x
 chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Tue Apr 22 2009 kwizart < kwizart at gmail.com > - 1.18-2
+- Add lcms-CVE-2009-0793.patch from 1.18a
+
 * Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 1.18-1
 - Update to 1.18 (final)
 - Remove upstreamed patches



From kwizart at fedoraproject.org  Tue Apr 21 23:56:53 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 21 Apr 2009 23:56:53 +0000 (UTC)
Subject: rpms/directfb/devel directfb.spec,1.25,1.26
Message-ID: <20090421235653.DE5B0700D6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26609

Modified Files:
	directfb.spec 
Log Message:
Fix changelog



Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- directfb.spec	17 Apr 2009 08:50:59 -0000	1.25
+++ directfb.spec	21 Apr 2009 23:56:52 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: 1.2.8
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -21,6 +21,7 @@
 BuildRequires: libvncserver-devel
 %{?_with_fusion:BuildRequires: linux-fusion-devel}
 %{?_with_fusion:Requires: linux-fusion}
+%{?_with_tslib:BuildRequires: tslib-devel}
 
 
 %description
@@ -36,6 +37,7 @@
 
 Non-default rpmbuild options:
 --with fusion:   Enable linux-fusion support
+--with tslib:    Enable tslib support
 
 
 %package devel
@@ -74,6 +76,9 @@
 
 %build
 %configure \
+%ifarch i386 i586
+    --disable-mmx --disable-sse \
+%endif
     --enable-sdl \
     --enable-zlib \
 %{?_with_fusion:--enable-multi} \
@@ -159,6 +164,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 1.2.8-1
+- Update to 1.2.8
+- Disable mmx/sse on x86
+
 * Thu Feb 12 2009 kwizart < kwizart at gmail.com > - 1.2.7-3
 - Force autoreconf + re tag
 



From kwizart at fedoraproject.org  Wed Apr 22 00:01:18 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed, 22 Apr 2009 00:01:18 +0000 (UTC)
Subject: rpms/directfb/F-11 directfb.spec,1.24,1.25 sources,1.10,1.11
Message-ID: <20090422000119.9D0B0700FE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27766

Modified Files:
	directfb.spec sources 
Log Message:
Update to 1.2.8



Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/directfb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- directfb.spec	24 Feb 2009 11:55:44 -0000	1.24
+++ directfb.spec	22 Apr 2009 00:00:44 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
-Version: 1.2.7
-Release: 4%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -21,6 +21,7 @@
 BuildRequires: libvncserver-devel
 %{?_with_fusion:BuildRequires: linux-fusion-devel}
 %{?_with_fusion:Requires: linux-fusion}
+%{?_with_tslib:BuildRequires: tslib-devel}
 
 
 %description
@@ -36,6 +37,7 @@
 
 Non-default rpmbuild options:
 --with fusion:   Enable linux-fusion support
+--with tslib:    Enable tslib support
 
 
 %package devel
@@ -74,6 +76,9 @@
 
 %build
 %configure \
+%ifarch i386 i586
+    --disable-mmx --disable-sse \
+%endif
     --enable-sdl \
     --enable-zlib \
 %{?_with_fusion:--enable-multi} \
@@ -159,6 +164,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 1.2.8-1
+- Update to 1.2.8
+- Disable mmx/sse on x86
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Feb 2009 13:07:47 -0000	1.10
+++ sources	22 Apr 2009 00:00:44 -0000	1.11
@@ -1 +1 @@
-59ca16f600e96c8c104a485ff7c322c6  DirectFB-1.2.7.tar.gz
+ac13d21682aa368df4e177ae5b51ad2d  DirectFB-1.2.8.tar.gz



From caillon at fedoraproject.org  Wed Apr 22 00:21:59 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 22 Apr 2009 00:21:59 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.57,1.58
Message-ID: <20090422002159.D03DA700FE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1846

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-7
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- epiphany-extensions.spec	27 Mar 2009 20:44:50 -0000	1.57
+++ epiphany-extensions.spec	22 Apr 2009 00:21:58 -0000	1.58
@@ -1,10 +1,10 @@
 %global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.8
+%global gecko_version       1.9.0.9
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-7
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-6
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Wed Apr 22 00:22:16 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 22 Apr 2009 00:22:16 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-9 epiphany-extensions.spec,1.55,1.56
Message-ID: <20090422002216.3A7F6700FE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1675

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-10
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-9/epiphany-extensions.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- epiphany-extensions.spec	27 Mar 2009 20:45:09 -0000	1.55
+++ epiphany-extensions.spec	22 Apr 2009 00:21:45 -0000	1.56
@@ -1,10 +1,10 @@
 %global ephy_major          2.22
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.8
+%global gecko_version       1.9.0.9
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-10
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-9
 - Rebuild against newer gecko
 



From cwickert at fedoraproject.org  Wed Apr 22 00:32:52 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 22 Apr 2009 00:32:52 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.7, 1.8 sources, 1.7, 
	1.8 xfce4-clipman-plugin.spec, 1.18, 1.19
Message-ID: <20090422003252.0A66F700FE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5464

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0
- Require xfce4-doc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2009 21:54:55 -0000	1.7
+++ .cvsignore	22 Apr 2009 00:32:20 -0000	1.8
@@ -1 +1 @@
-xfce4-clipman-plugin-0.9.1.tar.bz2
+xfce4-clipman-plugin-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2009 21:54:55 -0000	1.7
+++ sources	22 Apr 2009 00:32:20 -0000	1.8
@@ -1 +1 @@
-74aa0e707c3e31844518fd36b1498254  xfce4-clipman-plugin-0.9.1.tar.bz2
+9ef43216b6eac63035afb1b3f82c5f92  xfce4-clipman-plugin-1.0.0.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xfce4-clipman-plugin.spec	30 Mar 2009 21:54:55 -0000	1.18
+++ xfce4-clipman-plugin.spec	22 Apr 2009 00:32:20 -0000	1.19
@@ -1,45 +1,95 @@
-Name:		xfce4-clipman-plugin
-Version:	0.9.1
-Release:	1%{?dist}
-Summary:	Clipboard manager plugin for the Xfce panel
-
-Group:		User Interface/Desktops
-License:	GPLv2+
-URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
-BuildRequires:	exo-devel >= 0.3.0
-BuildRequires:	gettext, intltool, libxml2-devel
-Requires:	xfce4-panel >= 4.4.0
+Name:           xfce4-clipman-plugin
+Version:        1.0.0
+Release:        1%{?dist}
+Summary:        Clipboard manager plugin for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxfcegui4-devel >= 4.4.0
+BuildRequires:  xfce4-panel-devel >= 4.4.0
+BuildRequires:  exo-devel >= 0.3.0 
+BuildRequires:  libglade2-devel >= 2.6.0
+BuildRequires:  xfconf-devel >= 4.6.0
+BuildRequires:  gettext, intltool, libxml2-devel
+Requires:       xfce4-panel >= 4.4.0, xfce4-doc
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
 clipboard" option, and a drag-and-drop paste feature.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+desktop-file-install                                      \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+  --add-category=X-Xfce                                   \
+  --add-only-show-in=XFCE                                 \
+  --delete-original                                       \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
+desktop-file-install                                      \
+  --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart   \
+  --add-category=X-Xfce                                   \
+  --add-only-show-in=XFCE                                 \
+  --delete-original                                       \
+  ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README THANKS
-%{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+#%{_libexecdir}/xfce4/panel-plugins/%{name}
+%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml
+%{_bindir}/%{name}
+%{_bindir}/xfce4-popup-clipman
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/xfce4/doc/*/images/clipman-*.png
+%{_datadir}/xfce4/doc/*/%{name}.html
+%{_datadir}/xfce4/panel-plugins/%{name}.desktop
+
 
 %changelog
+* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0
+- Require xfce4-doc
+
 * Mon Mar 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.1-2
 - Update to 0.9.1
 



From mjakubicek at fedoraproject.org  Wed Apr 22 00:41:15 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 22 Apr 2009 00:41:15 +0000 (UTC)
Subject: rpms/R-GeneR/devel R-GeneR-gcc44.patch, NONE, 1.1 R-GeneR.spec, 1.6,
	1.7
Message-ID: <20090422004115.44D7D700FE@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/R-GeneR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7709/devel

Modified Files:
	R-GeneR.spec 
Added Files:
	R-GeneR-gcc44.patch 
Log Message:
- Fix FTBFS: added R-GeneR-gcc44.patch.
- Do not override the release macro.
- Use %%global instead of %%define.



R-GeneR-gcc44.patch:

--- NEW FILE R-GeneR-gcc44.patch ---
--- GeneR/src/compoSeq.cc.orig	2009-04-22 01:46:37.000000000 +0200
+++ GeneR/src/compoSeq.cc	2009-04-22 01:47:48.000000000 +0200
@@ -68,9 +68,9 @@
   int i,j,k;
   int end;
 
-  char * (* fun) (const char*, const char *) = NULL;
+  const char * (* fun) (const char*, const char *) = NULL;
 
-  char * posFind;
+  const char * posFind;
 
   char (*upperornot)(char) = NULL;
 


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/devel/R-GeneR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-GeneR.spec	31 Mar 2009 08:33:53 -0000	1.6
+++ R-GeneR.spec	22 Apr 2009 00:41:14 -0000	1.7
@@ -1,16 +1,18 @@
-%define packname  GeneR
-%define release   2.4
-%define Rversion  2.8.0
+%global packname  GeneR
+%global bioconductor_release   2.4
+%global Rversion  2.8.0
 
 Name:             R-%{packname}
 Version:          2.13.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
-URL:              http://www.bioconductor.org/packages/%{release}/bioc/html/%{packname}.html
-Source0:          http://www.bioconductor.org/packages/%{release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
+Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Patch0:           %{name}-gcc44.patch
+# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q -c -n %{packname}
+%patch0
 
 %build
 
@@ -87,6 +90,11 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
+- Fix FTBFS: added R-GeneR-gcc44.patch.
+- Do not override the release macro.
+- Use %%global instead of %%define.
+
 * Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 2.13.1-1
 - Update to 2.13.1 from the devel version of bioconductor
 



From mjakubicek at fedoraproject.org  Wed Apr 22 00:41:44 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 22 Apr 2009 00:41:44 +0000 (UTC)
Subject: rpms/R-GeneR/F-11 R-GeneR-gcc44.patch, NONE, 1.1 R-GeneR.spec, 1.6,
	1.7
Message-ID: <20090422004144.90E15700FE@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/R-GeneR/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7709/F-11

Modified Files:
	R-GeneR.spec 
Added Files:
	R-GeneR-gcc44.patch 
Log Message:
- Fix FTBFS: added R-GeneR-gcc44.patch.
- Do not override the release macro.
- Use %%global instead of %%define.



R-GeneR-gcc44.patch:

--- NEW FILE R-GeneR-gcc44.patch ---
--- GeneR/src/compoSeq.cc.orig	2009-04-22 01:46:37.000000000 +0200
+++ GeneR/src/compoSeq.cc	2009-04-22 01:47:48.000000000 +0200
@@ -68,9 +68,9 @@
   int i,j,k;
   int end;
 
-  char * (* fun) (const char*, const char *) = NULL;
+  const char * (* fun) (const char*, const char *) = NULL;
 
-  char * posFind;
+  const char * posFind;
 
   char (*upperornot)(char) = NULL;
 


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-11/R-GeneR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-GeneR.spec	31 Mar 2009 08:33:53 -0000	1.6
+++ R-GeneR.spec	22 Apr 2009 00:41:12 -0000	1.7
@@ -1,16 +1,18 @@
-%define packname  GeneR
-%define release   2.4
-%define Rversion  2.8.0
+%global packname  GeneR
+%global bioconductor_release   2.4
+%global Rversion  2.8.0
 
 Name:             R-%{packname}
 Version:          2.13.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
-URL:              http://www.bioconductor.org/packages/%{release}/bioc/html/%{packname}.html
-Source0:          http://www.bioconductor.org/packages/%{release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
+Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Patch0:           %{name}-gcc44.patch
+# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q -c -n %{packname}
+%patch0
 
 %build
 
@@ -87,6 +90,11 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
+- Fix FTBFS: added R-GeneR-gcc44.patch.
+- Do not override the release macro.
+- Use %%global instead of %%define.
+
 * Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 2.13.1-1
 - Update to 2.13.1 from the devel version of bioconductor
 



From caillon at fedoraproject.org  Wed Apr 22 00:51:54 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 22 Apr 2009 00:51:54 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.3,1.4
Message-ID: <20090422005154.ECF02700FE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11077

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.08-5.2
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Gtk2-MozEmbed.spec	21 Apr 2009 22:00:45 -0000	1.3
+++ perl-Gtk2-MozEmbed.spec	22 Apr 2009 00:51:23 -0000	1.4
@@ -9,7 +9,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       4%{?dist}.2
+Release:       5%{?dist}.2
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.08-5.2
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.08-4.2
 - Rebuild against newer gecko
 



From kaitlin at fedoraproject.org  Wed Apr 22 01:06:27 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed, 22 Apr 2009 01:06:27 +0000 (UTC)
Subject: rpms/libvirt-cim/devel .cvsignore, 1.12, 1.13 libvirt-cim.spec, 1.25,
	1.26 sources, 1.14, 1.15 emu_1_sdc.patch, 1.1,
	NONE host_enum_sys.patch, 1.1, NONE
Message-ID: <20090422010627.A980670103@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15731

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Removed Files:
	emu_1_sdc.patch host_enum_sys.patch 
Log Message:
Updated tarball and spec for release 0.5.5.  Also removed outdated patches.





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Feb 2009 23:05:58 -0000	1.12
+++ .cvsignore	22 Apr 2009 01:05:53 -0000	1.13
@@ -1,2 +1,3 @@
 libvirt-cim-0.5.3.tar.gz
 libvirt-cim-0.5.4.tar.gz
+libvirt-cim-0.5.5.tar.gz


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libvirt-cim.spec	25 Feb 2009 19:47:26 -0000	1.25
+++ libvirt-cim.spec	22 Apr 2009 01:05:54 -0000	1.26
@@ -2,8 +2,8 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.4
-Release: 2%{?dist}
+Version: 0.5.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -58,13 +58,7 @@
 %define SCHEMA %{_datadir}/%{name}/*.mof
 
 %define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
-%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof
-
-%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration
-%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof
-
-%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
-%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof
+%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile,AllocationCapabilities}.mof
 
 %define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration
 %define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof
@@ -100,6 +94,12 @@
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -t pegasus \
+        -n root/interop \
+        -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -t pegasus \
+        -n root/cimv2\
+        -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
 %postun -p /sbin/ldconfig
 
@@ -108,10 +108,9 @@
 /etc/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
-#%doc base_schema/README.DMTF
+%doc base_schema/README.DMTF
 %doc doc/*.html
 %{_libdir}/lib*.so*
-# CIM providers are .so modules, thus they belong in the main package
 %{_libdir}/cmpi/lib*.so*
 %{_datadir}/libvirt-cim/*.sh
 %{_datadir}/libvirt-cim/*.mof
@@ -123,6 +122,9 @@
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Tue Apr 21 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.5-1
+- Updated to latest upstream source
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Feb 2009 23:05:58 -0000	1.14
+++ sources	22 Apr 2009 01:05:54 -0000	1.15
@@ -1,2 +1,3 @@
 69ad4eb18622482e6cd99c4c20ed01b0  libvirt-cim-0.5.3.tar.gz
 26cec2226701a063325fac8f6e8cb75b  libvirt-cim-0.5.4.tar.gz
+dec0c3647ea3aa713022b31576e0b202  libvirt-cim-0.5.5.tar.gz


--- emu_1_sdc.patch DELETED ---


--- host_enum_sys.patch DELETED ---



From caillon at fedoraproject.org  Wed Apr 22 01:52:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 22 Apr 2009 01:52:20 +0000 (UTC)
Subject: rpms/redhat-lsb/F-11 redhat-lsb.spec,1.42,1.43
Message-ID: <20090422015220.3F105700FE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/redhat-lsb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26663

Modified Files:
	redhat-lsb.spec 
Log Message:
BR glibc-static, Fix ExclusiveArch



Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-lsb/F-11/redhat-lsb.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- redhat-lsb.spec	25 Feb 2009 19:29:56 -0000	1.42
+++ redhat-lsb.spec	22 Apr 2009 01:51:49 -0000	1.43
@@ -49,13 +49,14 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 3.fc10
+Release: 3.fc11
 URL: http://www.linuxfoundation.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: glibc-static
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
 # dependency for primary LSB application for v2.0 and v3.0
@@ -85,7 +86,7 @@
 Provides: lsb-core-noarch = %{version}
 Provides: lsb-graphics-noarch = %{version}
 
-ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
 
 %ifarch %{ix86}
 # archLSB IA32 Base Libraries
@@ -644,7 +645,7 @@
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3.fc10
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Aug 28 2008 Hao Liu <hliu at redhat.com> 3.2-2



From caillon at fedoraproject.org  Wed Apr 22 01:58:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 22 Apr 2009 01:58:20 +0000 (UTC)
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.42,1.43
Message-ID: <20090422015820.39E6B700FE@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/redhat-lsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27998

Modified Files:
	redhat-lsb.spec 
Log Message:
BR glibc-static, Fix ExclusiveArch



Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- redhat-lsb.spec	25 Feb 2009 19:29:56 -0000	1.42
+++ redhat-lsb.spec	22 Apr 2009 01:57:49 -0000	1.43
@@ -49,13 +49,14 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 3.fc10
+Release: 3.fc12
 URL: http://www.linuxfoundation.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: glibc-static
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
 # dependency for primary LSB application for v2.0 and v3.0
@@ -85,7 +86,7 @@
 Provides: lsb-core-noarch = %{version}
 Provides: lsb-graphics-noarch = %{version}
 
-ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
 
 %ifarch %{ix86}
 # archLSB IA32 Base Libraries
@@ -644,7 +645,7 @@
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3.fc10
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Aug 28 2008 Hao Liu <hliu at redhat.com> 3.2-2



From dcantrel at fedoraproject.org  Wed Apr 22 02:36:56 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 22 Apr 2009 02:36:56 +0000 (UTC)
Subject: rpms/anaconda/F-11 .cvsignore, 1.637, 1.638 anaconda.spec, 1.787,
	1.788 sources, 1.771, 1.772
Message-ID: <20090422023656.9EFA4700FE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4170

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Apr 21 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.47-1
- Fix adding of fifth partition in UI (#496930). (rvykydal)
- Define the fd variable before it can ever be referenced (#496930).
  (clumens)
- Fix preservation of format attrs for preexisting luks partitions. (dlehman)
- Set md member devices' uuids after creating an array. (dlehman)
- Don't try to get size for nodev and bind filesystems. (dlehman)
- Include the device path in DeviceError exceptions. (dlehman)
- Mdadm's incremental mode ignores the auto option, so don't use it.
  (dlehman)
- Use incremental mode for all md member addition during probing. (dlehman)
- Try to name existing md arrays based on their preferred minor. (dlehman)
- Reimplement mdexamine using a more easily parseable output format.
  (dlehman)
- Fix position of "--run" option to mdadm assemble. (dlehman)
- Handle passphrase prompts without a traceback in cmdline mode. (#492123)
  (dlehman)
- Fix another device vs. string problem in EFI bootloader config (#496669).
  (clumens)
- Add the device's name to mdadm.conf (#496390). (clumens)
- Show normal cursor during passphrase entry (#496534) (msivak)
- Fix traceback in cmdline mode after exception handling cleanup (#496644)
  (katzj)
- DeviceError only returns a message, not (message, device) tuple (#496343).
  (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/.cvsignore,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- .cvsignore	18 Apr 2009 00:56:52 -0000	1.637
+++ .cvsignore	22 Apr 2009 02:36:24 -0000	1.638
@@ -1,2 +1,2 @@
 clog
-anaconda-11.5.0.46.tar.bz2
+anaconda-11.5.0.47.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/anaconda.spec,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- anaconda.spec	18 Apr 2009 01:11:27 -0000	1.787
+++ anaconda.spec	22 Apr 2009 02:36:24 -0000	1.788
@@ -2,8 +2,8 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.46
-Release: 1%{?dist}
+Version: 11.5.0.47
+Release: 1
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -213,6 +213,32 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.47-1
+- Fix adding of fifth partition in UI (#496930). (rvykydal)
+- Define the fd variable before it can ever be referenced (#496930).
+  (clumens)
+- Fix preservation of format attrs for preexisting luks partitions. (dlehman)
+- Set md member devices' uuids after creating an array. (dlehman)
+- Don't try to get size for nodev and bind filesystems. (dlehman)
+- Include the device path in DeviceError exceptions. (dlehman)
+- Mdadm's incremental mode ignores the auto option, so don't use it.
+  (dlehman)
+- Use incremental mode for all md member addition during probing. (dlehman)
+- Try to name existing md arrays based on their preferred minor. (dlehman)
+- Reimplement mdexamine using a more easily parseable output format.
+  (dlehman)
+- Fix position of "--run" option to mdadm assemble. (dlehman)
+- Handle passphrase prompts without a traceback in cmdline mode. (#492123)
+  (dlehman)
+- Fix another device vs. string problem in EFI bootloader config (#496669).
+  (clumens)
+- Add the device's name to mdadm.conf (#496390). (clumens)
+- Show normal cursor during passphrase entry (#496534) (msivak)
+- Fix traceback in cmdline mode after exception handling cleanup (#496644)
+  (katzj)
+- DeviceError only returns a message, not (message, device) tuple (#496343).
+  (clumens)
+
 * Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
 - Clean up argument list after changing from rhpl to iutil for
   execWithRedirect (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-11/sources,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- sources	18 Apr 2009 00:56:52 -0000	1.771
+++ sources	22 Apr 2009 02:36:24 -0000	1.772
@@ -1 +1 @@
-e350ffddc62e02b64751832711941c01  anaconda-11.5.0.46.tar.bz2
+32dbbf60959b6ab88f8e5ac63b2ee614  anaconda-11.5.0.47.tar.bz2



From iarnell at fedoraproject.org  Wed Apr 22 03:58:01 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 22 Apr 2009 03:58:01 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-HTML-FormFu/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-Controller-HTML-FormFu.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090422035802.0F7C4700FE@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19170

Modified Files:
	.cvsignore perl-Catalyst-Controller-HTML-FormFu.spec sources 
Log Message:
* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.04003-1
- update to 0.04003
- BR perl(MRO::Compat)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Apr 2009 11:15:04 -0000	1.3
+++ .cvsignore	22 Apr 2009 03:57:30 -0000	1.4
@@ -1 +1 @@
-Catalyst-Controller-HTML-FormFu-0.04001.tar.gz
+Catalyst-Controller-HTML-FormFu-0.04003.tar.gz


Index: perl-Catalyst-Controller-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/perl-Catalyst-Controller-HTML-FormFu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Controller-HTML-FormFu.spec	17 Apr 2009 11:15:04 -0000	1.3
+++ perl-Catalyst-Controller-HTML-FormFu.spec	22 Apr 2009 03:57:30 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Controller-HTML-FormFu
-Version:        0.04001
+Version:        0.04003
 Release:        1%{?dist}
 Summary:        HTML::FormFu controller for Catalyst
 License:        GPL+ or Artistic
@@ -20,6 +20,7 @@
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(HTML::FormFu) >= 0.04001
 BuildRequires:  perl(Moose)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Regexp::Assemble)
 BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(Template)
@@ -64,6 +65,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.04003-1
+- update to 0.04003
+- BR perl(MRO::Compat)
+
 * Fri Apr 17 2009 Iain Arnell <iarnell at gmail.com> 0.04001-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Apr 2009 11:15:04 -0000	1.3
+++ sources	22 Apr 2009 03:57:30 -0000	1.4
@@ -1 +1 @@
-9c2e52a2b31114112785c8f62f79a9cc  Catalyst-Controller-HTML-FormFu-0.04001.tar.gz
+f6c88471ec3aa75a7714851ce661ad95  Catalyst-Controller-HTML-FormFu-0.04003.tar.gz



From mbarnes at fedoraproject.org  Wed Apr 22 04:03:56 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 22 Apr 2009 04:03:56 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.55, 
	1.56
Message-ID: <20090422040357.1AF8E700FE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21147

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
- Rebuild against newer libnautilus-burn.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-python2-desktop.spec	14 Mar 2009 22:22:37 -0000	1.55
+++ gnome-python2-desktop.spec	22 Apr 2009 04:03:24 -0000	1.56
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -329,6 +329,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
+- Rebuild against newer libnautilus-burn.
+
 * Sat Mar 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-1.fc11
 - Update to 2.26.0
 



From iarnell at fedoraproject.org  Wed Apr 22 04:06:31 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 22 Apr 2009 04:06:31 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-I18N/devel .cvsignore, 1.2,
	1.3 perl-Catalyst-Plugin-I18N.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090422040631.5DE92700FE@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-I18N/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22333

Modified Files:
	.cvsignore perl-Catalyst-Plugin-I18N.spec sources 
Log Message:
* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
- update to 0.09
- BR perl(MRO::Compat) and perl(Test::Pod::Coverage)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-I18N/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Feb 2009 04:17:11 -0000	1.2
+++ .cvsignore	22 Apr 2009 04:06:29 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-I18N-0.08.tar.gz
+Catalyst-Plugin-I18N-0.09.tar.gz


Index: perl-Catalyst-Plugin-I18N.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-I18N/devel/perl-Catalyst-Plugin-I18N.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Catalyst-Plugin-I18N.spec	25 Feb 2009 04:18:24 -0000	1.2
+++ perl-Catalyst-Plugin-I18N.spec	22 Apr 2009 04:06:30 -0000	1.3
@@ -1,19 +1,21 @@
 Name:           perl-Catalyst-Plugin-I18N
-Version:        0.08
-Release:        2%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        I18N for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-I18N/
-Source0:        http://www.cpan.org/authors/id/B/BR/BRICAS/Catalyst-Plugin-I18N-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-I18N-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst::Runtime)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Locale::Maketext::Lexicon)
 BuildRequires:  perl(Locale::Maketext::Simple)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
+- update to 0.09
+- BR perl(MRO::Compat) and perl(Test::Pod::Coverage)
+
 * Wed Feb 25 2009 Iain Arnell <iarnell at gmail.com> 0.08-2
 - remove unecessary requires/buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-I18N/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Feb 2009 04:17:11 -0000	1.2
+++ sources	22 Apr 2009 04:06:30 -0000	1.3
@@ -1 +1 @@
-d5931735f643885ee33ed5b7cbb1fcf7  Catalyst-Plugin-I18N-0.08.tar.gz
+6f0c0e5e165a3f605bd66dd4db2ba5d7  Catalyst-Plugin-I18N-0.09.tar.gz



From iarnell at fedoraproject.org  Wed Apr 22 04:08:39 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 22 Apr 2009 04:08:39 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Unicode/devel .cvsignore, 1.2,
	1.3 perl-Catalyst-Plugin-Unicode.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422040839.34ADD700FE@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23050

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Unicode.spec sources 
Log Message:
* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.91-1
- update to 0.91
- BR perl(MRO::Compat)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 04:50:43 -0000	1.2
+++ .cvsignore	22 Apr 2009 04:08:08 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Unicode-0.8.tar.gz
+Catalyst-Plugin-Unicode-0.91.tar.gz


Index: perl-Catalyst-Plugin-Unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/perl-Catalyst-Plugin-Unicode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Unicode.spec	1 Mar 2009 04:50:43 -0000	1.1
+++ perl-Catalyst-Plugin-Unicode.spec	22 Apr 2009 04:08:08 -0000	1.2
@@ -1,16 +1,17 @@
 Name:           perl-Catalyst-Plugin-Unicode
-Version:        0.8
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Unicode aware Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Unicode/
-Source0:        http://www.cpan.org/authors/id/J/JR/JROCKWAY/Catalyst-Plugin-Unicode-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Unicode-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst::Runtime) >= 5.70
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IO::Scalar)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(ok)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
@@ -52,6 +53,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.91-1
+- update to 0.91
+- BR perl(MRO::Compat)
+
 * Sat Feb 28 2009 Iain Arnell 0.8-1
 - Specfile autogenerated by cpanspec 1.77.
 - enable pod tests


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2009 04:50:43 -0000	1.2
+++ sources	22 Apr 2009 04:08:08 -0000	1.3
@@ -1 +1 @@
-b6e7afe2b01b363e37789573adf80f13  Catalyst-Plugin-Unicode-0.8.tar.gz
+a8782196979c04b9244533459604aaf4  Catalyst-Plugin-Unicode-0.91.tar.gz



From mbarnes at fedoraproject.org  Wed Apr 22 04:11:53 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 22 Apr 2009 04:11:53 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/F-11 gnome-python2-desktop.spec, 1.55,
	1.56
Message-ID: <20090422041153.99711700FE@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24126

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
- Rebuild against newer libnautilus-burn.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/F-11/gnome-python2-desktop.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-python2-desktop.spec	14 Mar 2009 22:22:37 -0000	1.55
+++ gnome-python2-desktop.spec	22 Apr 2009 04:11:22 -0000	1.56
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -329,6 +329,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
+- Rebuild against newer libnautilus-burn.
+
 * Sat Mar 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-1.fc11
 - Update to 2.26.0
 



From iarnell at fedoraproject.org  Wed Apr 22 04:15:08 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 22 Apr 2009 04:15:08 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-File/devel .cvsignore, 1.2, 
	1.3 perl-Catalyst-Plugin-Session-Store-File.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090422041508.7088A70103@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25968

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-Store-File.spec 
	sources 
Log Message:
* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.15-1
- update to 0.15
- BR perl(MRO::Compat)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2008 05:00:23 -0000	1.2
+++ .cvsignore	22 Apr 2009 04:15:05 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Session-Store-File-0.13.tar.gz
+Catalyst-Plugin-Session-Store-File-0.15.tar.gz


Index: perl-Catalyst-Plugin-Session-Store-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/perl-Catalyst-Plugin-Session-Store-File.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Catalyst-Plugin-Session-Store-File.spec	26 Feb 2009 12:21:17 -0000	1.2
+++ perl-Catalyst-Plugin-Session-Store-File.spec	22 Apr 2009 04:15:06 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Plugin-Session-Store-File
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        File storage backend for session data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-File/
-Source0:        http://www.cpan.org/authors/id/K/KA/KARMAN/Catalyst-Plugin-Session-Store-File-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Session-Store-File-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.8.0
@@ -14,6 +14,7 @@
 BuildRequires:  perl(Catalyst::Runtime) >= 5.7000
 BuildRequires:  perl(Class::Data::Inheritable) >= 0.04
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
@@ -58,6 +59,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 22 2009 Iain Arnell <iarnell at gmail.com> 0.15-1
+- update to 0.15
+- BR perl(MRO::Compat)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2008 05:00:23 -0000	1.2
+++ sources	22 Apr 2009 04:15:06 -0000	1.3
@@ -1 +1 @@
-f1d2d3ed5ef2f800df5e7518a57ea1e1  Catalyst-Plugin-Session-Store-File-0.13.tar.gz
+daa18067be9d1b34d83132120cc1d733  Catalyst-Plugin-Session-Store-File-0.15.tar.gz



From dchen at fedoraproject.org  Wed Apr 22 04:51:34 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 22 Apr 2009 04:51:34 +0000 (UTC)
Subject: rpms/libchewing/devel import.log,1.8,1.9 libchewing.spec,1.30,1.31
Message-ID: <20090422045134.E99AF700FE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5504/devel

Modified Files:
	import.log libchewing.spec 
Log Message:
Fix [Bug 496886] libchewing-debuginfo does not contain sources


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	20 Feb 2009 07:01:57 -0000	1.8
+++ import.log	22 Apr 2009 04:51:33 -0000	1.9
@@ -6,3 +6,4 @@
 libchewing-0_3_2-3_fc10:HEAD:libchewing-0.3.2-3.fc10.src.rpm:1231914268
 libchewing-0_3_2-4_fc10:HEAD:libchewing-0.3.2-4.fc10.src.rpm:1232696067
 libchewing-0_3_2-6_fc10:HEAD:libchewing-0.3.2-6.fc10.src.rpm:1235113283
+libchewing-0_3_2-8_fc10:HEAD:libchewing-0.3.2-8.fc10.src.rpm:1240375796


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libchewing.spec	25 Feb 2009 14:06:13 -0000	1.30
+++ libchewing.spec	22 Apr 2009 04:51:33 -0000	1.31
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -40,7 +40,7 @@
 Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name 
+Headers and other files needed to develop applications using the %name
 library.
 
 %prep
@@ -54,19 +54,18 @@
 #%patch6 -p1 -b .7-bz237916
 #%patch7 -p1 -b .8-bz200694
 #%patch8 -p1 -b .9-bz195416
-%patch9 -p0 -b .libpatch
+%patch9 -p0 -b .bz477690
 
 %build
 #./autogen.sh
 #autoreconf -v
-export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\"'
+export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
 %configure --disable-static
-#make LIBINSTDIR="\"%{_libdir}\""
-make all RPM_CFLAGS="$RPM_OPT_FLAGS"
+%{__make} RPM_CFLAGS="%{optflags}" %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=%{buildroot} install
+#rm -rf $RPM_BUILD_ROOT
+%{__make} DESTDIR=%{buildroot} install
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
@@ -88,7 +87,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
-%{libchewing_python_dir} 
+%{libchewing_python_dir}
 
 %files devel
 %defattr(-, root, root)
@@ -98,6 +97,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 22 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-8
+- Fix [Bug 496968] - libchewing-debuginfo does not contain sources.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -113,13 +115,13 @@
   So python thinks libchewing is a library.
 
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
-- Add python binding by copy python/chewing.py to 
+- Add python binding by copy python/chewing.py to
   <python_dir>/site_packages/libchewing
 
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.
-		 
+
 * Wed Dec 03 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-0
 - Upstream update to 0.3.2.
 
@@ -148,7 +150,7 @@
 - Fixed bz#237233: Up arrow on candidate list doesn't work.
 
 * Fri Mar 09 2007 Caius Chance <cchance at redhat.com> - 0.3.0-6.devel
-- Fixed bz231568: [chewing] Look up table is showing candidates of previous 
+- Fixed bz231568: [chewing] Look up table is showing candidates of previous
   look-up.
 
 * Tue Nov 21 2006 Caius Chance <cchance at redhat.com> - 0.3.0-5.fc7
@@ -158,7 +160,7 @@
   instance reset.)
 
 * Fri Sep 15 2006 Caius Chance <cchance at redhat.com> - 0.3.0-4.fc6
-- Fixed bz#206232 - Shift_L + space doesn't work correctly  
+- Fixed bz#206232 - Shift_L + space doesn't work correctly
 
 * Mon Sep 04 2006 Caius Chance <cchance at redhat.com> - 0.3.0-3.fc6
 - Fixed bz#199353 - scim-chewing hangs for commit > 6 characters



From dchen at fedoraproject.org  Wed Apr 22 04:53:05 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 22 Apr 2009 04:53:05 +0000 (UTC)
Subject: rpms/libchewing/F-10 import.log,1.8,1.9 libchewing.spec,1.28,1.29
Message-ID: <20090422045305.4B162700FE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5934/F-10

Modified Files:
	import.log libchewing.spec 
Log Message:
Fix [Bug 496886] libchewing-debuginfo does not contain sources


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	20 Feb 2009 07:10:40 -0000	1.8
+++ import.log	22 Apr 2009 04:52:32 -0000	1.9
@@ -6,3 +6,4 @@
 libchewing-0_3_2-3_fc10:F-10:libchewing-0.3.2-3.fc10.src.rpm:1231920830
 libchewing-0_3_2-4_fc10:F-10:libchewing-0.3.2-4.fc10.src.rpm:1232696161
 libchewing-0_3_2-6_fc10:F-10:libchewing-0.3.2-6.fc10.src.rpm:1235113776
+libchewing-0_3_2-8_fc10:F-10:libchewing-0.3.2-8.fc10.src.rpm:1240375899


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libchewing.spec	20 Feb 2009 07:10:40 -0000	1.28
+++ libchewing.spec	22 Apr 2009 04:52:33 -0000	1.29
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -40,7 +40,7 @@
 Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name 
+Headers and other files needed to develop applications using the %name
 library.
 
 %prep
@@ -54,19 +54,18 @@
 #%patch6 -p1 -b .7-bz237916
 #%patch7 -p1 -b .8-bz200694
 #%patch8 -p1 -b .9-bz195416
-%patch9 -p0 -b .libpatch
+%patch9 -p0 -b .bz477690
 
 %build
 #./autogen.sh
 #autoreconf -v
-export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\"'
+export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
 %configure --disable-static
-#make LIBINSTDIR="\"%{_libdir}\""
-make all RPM_CFLAGS="$RPM_OPT_FLAGS"
+%{__make} RPM_CFLAGS="%{optflags}" %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=%{buildroot} install
+#rm -rf $RPM_BUILD_ROOT
+%{__make} DESTDIR=%{buildroot} install
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
@@ -88,7 +87,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
-%{libchewing_python_dir} 
+%{libchewing_python_dir}
 
 %files devel
 %defattr(-, root, root)
@@ -98,6 +97,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 22 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-8
+- Fix [Bug 496968] - libchewing-debuginfo does not contain sources.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 20 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-6
 - Fix [Bug 486409] - Wrong python binding installed path
   Add BuildRequires:  python-devel
@@ -110,13 +115,13 @@
   So python thinks libchewing is a library.
 
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
-- Add python binding by copy python/chewing.py to 
+- Add python binding by copy python/chewing.py to
   <python_dir>/site_packages/libchewing
 
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.
-		 
+
 * Wed Dec 03 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-0
 - Upstream update to 0.3.2.
 
@@ -145,7 +150,7 @@
 - Fixed bz#237233: Up arrow on candidate list doesn't work.
 
 * Fri Mar 09 2007 Caius Chance <cchance at redhat.com> - 0.3.0-6.devel
-- Fixed bz231568: [chewing] Look up table is showing candidates of previous 
+- Fixed bz231568: [chewing] Look up table is showing candidates of previous
   look-up.
 
 * Tue Nov 21 2006 Caius Chance <cchance at redhat.com> - 0.3.0-5.fc7
@@ -155,7 +160,7 @@
   instance reset.)
 
 * Fri Sep 15 2006 Caius Chance <cchance at redhat.com> - 0.3.0-4.fc6
-- Fixed bz#206232 - Shift_L + space doesn't work correctly  
+- Fixed bz#206232 - Shift_L + space doesn't work correctly
 
 * Mon Sep 04 2006 Caius Chance <cchance at redhat.com> - 0.3.0-3.fc6
 - Fixed bz#199353 - scim-chewing hangs for commit > 6 characters



From dchen at fedoraproject.org  Wed Apr 22 04:55:12 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 22 Apr 2009 04:55:12 +0000 (UTC)
Subject: rpms/libchewing/F-9 import.log,1.8,1.9 libchewing.spec,1.25,1.26
Message-ID: <20090422045512.68651700FE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6780/F-9

Modified Files:
	import.log libchewing.spec 
Log Message:
Fix [Bug 496886] libchewing-debuginfo does not contain sources


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	20 Feb 2009 07:13:07 -0000	1.8
+++ import.log	22 Apr 2009 04:54:41 -0000	1.9
@@ -6,3 +6,4 @@
 libchewing-0_3_2-3_fc10:F-9:libchewing-0.3.2-3.fc10.src.rpm:1231914689
 libchewing-0_3_2-4_fc10:F-9:libchewing-0.3.2-4.fc10.src.rpm:1232696244
 libchewing-0_3_2-6_fc10:F-9:libchewing-0.3.2-6.fc10.src.rpm:1235113916
+libchewing-0_3_2-8_fc10:F-9:libchewing-0.3.2-8.fc10.src.rpm:1240375994


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/libchewing.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libchewing.spec	20 Feb 2009 07:13:07 -0000	1.25
+++ libchewing.spec	22 Apr 2009 04:54:41 -0000	1.26
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -40,7 +40,7 @@
 Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name 
+Headers and other files needed to develop applications using the %name
 library.
 
 %prep
@@ -54,19 +54,18 @@
 #%patch6 -p1 -b .7-bz237916
 #%patch7 -p1 -b .8-bz200694
 #%patch8 -p1 -b .9-bz195416
-%patch9 -p0 -b .libpatch
+%patch9 -p0 -b .bz477690
 
 %build
 #./autogen.sh
 #autoreconf -v
-export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\"'
+export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
 %configure --disable-static
-#make LIBINSTDIR="\"%{_libdir}\""
-make all RPM_CFLAGS="$RPM_OPT_FLAGS"
+%{__make} RPM_CFLAGS="%{optflags}" %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=%{buildroot} install
+#rm -rf $RPM_BUILD_ROOT
+%{__make} DESTDIR=%{buildroot} install
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
@@ -88,7 +87,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
-%{libchewing_python_dir} 
+%{libchewing_python_dir}
 
 %files devel
 %defattr(-, root, root)
@@ -98,6 +97,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 22 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-8
+- Fix [Bug 496968] - libchewing-debuginfo does not contain sources.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 20 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-6
 - Fix [Bug 486409] - Wrong python binding installed path
   Add BuildRequires:  python-devel
@@ -110,13 +115,13 @@
   So python thinks libchewing is a library.
 
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
-- Add python binding by copy python/chewing.py to 
+- Add python binding by copy python/chewing.py to
   <python_dir>/site_packages/libchewing
 
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.
-		 
+
 * Wed Dec 03 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-0
 - Upstream update to 0.3.2.
 
@@ -145,7 +150,7 @@
 - Fixed bz#237233: Up arrow on candidate list doesn't work.
 
 * Fri Mar 09 2007 Caius Chance <cchance at redhat.com> - 0.3.0-6.devel
-- Fixed bz231568: [chewing] Look up table is showing candidates of previous 
+- Fixed bz231568: [chewing] Look up table is showing candidates of previous
   look-up.
 
 * Tue Nov 21 2006 Caius Chance <cchance at redhat.com> - 0.3.0-5.fc7
@@ -155,7 +160,7 @@
   instance reset.)
 
 * Fri Sep 15 2006 Caius Chance <cchance at redhat.com> - 0.3.0-4.fc6
-- Fixed bz#206232 - Shift_L + space doesn't work correctly  
+- Fixed bz#206232 - Shift_L + space doesn't work correctly
 
 * Mon Sep 04 2006 Caius Chance <cchance at redhat.com> - 0.3.0-3.fc6
 - Fixed bz#199353 - scim-chewing hangs for commit > 6 characters



From mclasen at fedoraproject.org  Wed Apr 22 05:19:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 22 Apr 2009 05:19:20 +0000 (UTC)
Subject: rpms/tsclient/F-11 tsclient-glade-ids.patch, NONE, 1.1 tsclient.spec,
	1.43, 1.44
Message-ID: <20090422051920.A986F70103@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tsclient/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14606

Modified Files:
	tsclient.spec 
Added Files:
	tsclient-glade-ids.patch 
Log Message:
Make the ui work


tsclient-glade-ids.patch:

--- NEW FILE tsclient-glade-ids.patch ---
diff -up tsclient-2.0.2/data/tsclient.glade.wrong-glade-ids tsclient-2.0.2/data/tsclient.glade
--- tsclient-2.0.2/data/tsclient.glade.wrong-glade-ids	2009-04-22 01:16:55.614002504 -0400
+++ tsclient-2.0.2/data/tsclient.glade	2009-04-22 01:17:01.264040184 -0400
@@ -503,7 +503,6 @@ Prompt For Reconnect After Error</proper
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">rdp_fullscreen_radio</property>
                           </widget>
                           <packing>
                             <property name="top_attach">5</property>
@@ -915,7 +914,6 @@ LAN</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">vnc_fullscreen_radio</property>
                           </widget>
                           <packing>
                             <property name="top_attach">4</property>
@@ -992,7 +990,7 @@ LAN</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="password_entry1">
+                          <widget class="GtkEntry" id="password_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="visibility">False</property>
@@ -1019,7 +1017,7 @@ LAN</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="host_entry1">
+                          <widget class="GtkEntry" id="host_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="activates_default">True</property>
@@ -1253,7 +1251,7 @@ LAN</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="host_entry2">
+                      <widget class="GtkEntry" id="host_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                       </widget>
@@ -1422,7 +1420,6 @@ LAN</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">xdmcp_fullscreen_radio</property>
                           </widget>
                           <packing>
                             <property name="top_attach">2</property>
@@ -1449,7 +1446,7 @@ LAN</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="host_entry3">
+                          <widget class="GtkEntry" id="host_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="activates_default">True</property>
@@ -1565,7 +1562,7 @@ LAN</property>
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkEntry" id="password_entry2">
+                      <widget class="GtkEntry" id="password_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
@@ -1672,7 +1669,7 @@ LAN</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="terminal_checkbox1">
+                      <widget class="GtkCheckButton" id="terminal_checkbox">
                         <property name="label" translatable="yes">Run in terminal window</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1687,7 +1684,7 @@ LAN</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="host_entry4">
+                      <widget class="GtkEntry" id="host_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                       </widget>


Index: tsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/F-11/tsclient.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- tsclient.spec	25 Feb 2009 22:02:11 -0000	1.43
+++ tsclient.spec	22 Apr 2009 05:19:19 -0000	1.44
@@ -8,7 +8,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://sourceforge.net/projects/tsclient
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
@@ -41,6 +41,7 @@
 # realvnc and tightvnc
 Patch5: realvnc-args.patch
 Patch6: tsclient-libgnomeui.patch
+Patch7: tsclient-glade-ids.patch
 
 %description
 tsclient is a frontend that makes it easy to use rdesktop and vncviewer.
@@ -62,6 +63,7 @@
 %patch4 -p1 -b .vnc-remotesize
 %patch5 -p1 -b .realvnc-args
 %patch6 -p1 -b .libgnomeui
+%patch7 -p1 -b .glade-ids
 libtoolize --force --copy
 autoreconf
 
@@ -132,6 +134,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.2-3
+- Fix some wrong ids in the glade file to make the ui work (#485976)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jdieter at fedoraproject.org  Wed Apr 22 05:38:47 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Wed, 22 Apr 2009 05:38:47 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm.spec,1.17,1.18
Message-ID: <20090422053847.2B51D700FE@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21836

Modified Files:
	deltarpm.spec 
Log Message:
Split drpmsync into separate subpackage (#489231)



Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- deltarpm.spec	26 Mar 2009 06:45:30 -0000	1.17
+++ deltarpm.spec	22 Apr 2009 05:38:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -24,6 +24,14 @@
 one. You don't have to have a copy of the old rpm,
 deltarpms can also work with installed rpms.
 
+%package -n drpmsync
+Summary: Sync a file tree with deltarpms
+Requires: deltarpm = %{version}-%{release}
+
+%description -n drpmsync
+This package contains a tool to sync a file tree with
+deltarpms.
+
 %prep
 %setup -q
 %patch0 -p0 -b .multilib
@@ -46,17 +54,27 @@
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE.BSD README
-%doc %{_mandir}/man8/*
+%doc %{_mandir}/man8/applydelta*
+%doc %{_mandir}/man8/makedelta*
+%doc %{_mandir}/man8/combinedeltarpm*
 %{_bindir}/applydeltaiso
 %{_bindir}/applydeltarpm
 %{_bindir}/combinedeltarpm
-%{_bindir}/drpmsync
 %{_bindir}/fragiso
 %{_bindir}/makedeltaiso
 %{_bindir}/makedeltarpm
 %{_bindir}/rpmdumpheader
 
+%files -n drpmsync
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD README
+%doc %{_mandir}/man8/drpmsync*
+%{_bindir}/drpmsync
+
 %changelog
+* Wed Apr 22 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-16
+- Split drpmsync into a separate subpackage (#489231)
+
 * Thu Mar 26 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-15
 - Fix bug when checking sequence with new sha256 file digests
 



From ellert at fedoraproject.org  Wed Apr 22 05:49:22 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 05:49:22 +0000 (UTC)
Subject: rpms/globus-callout/devel globus-callout.spec, 1.1, 1.2 import.log, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422054922.29FA2700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25709/devel

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:15:26 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:49:19 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
+Source9:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -182,6 +187,8 @@
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:15:26 -0000	1.1
+++ import.log	22 Apr 2009 05:49:20 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:HEAD:globus-callout-0.7-1.fc9.src.rpm:1240006486
+globus-callout-0_7-2_fc9:HEAD:globus-callout-0.7-2.fc9.src.rpm:1240379277


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:15:26 -0000	1.2
+++ sources	22 Apr 2009 05:49:20 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 05:51:40 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 05:51:40 +0000 (UTC)
Subject: rpms/globus-callout/F-9 globus-callout.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422055140.9DCC2700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26786/F-9

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:17:20 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:51:38 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
+Source9:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -182,6 +187,8 @@
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:17:20 -0000	1.1
+++ import.log	22 Apr 2009 05:51:38 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:F-9:globus-callout-0.7-1.fc9.src.rpm:1240006610
+globus-callout-0_7-2_fc9:F-9:globus-callout-0.7-2.fc9.src.rpm:1240379427


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:17:20 -0000	1.2
+++ sources	22 Apr 2009 05:51:38 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 05:53:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 05:53:11 +0000 (UTC)
Subject: rpms/globus-callout/F-10 globus-callout.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422055312.0818770104@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27534/F-10

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:19:57 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:53:10 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
+Source9:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -182,6 +187,8 @@
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:19:57 -0000	1.1
+++ import.log	22 Apr 2009 05:53:11 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:F-10:globus-callout-0.7-1.fc9.src.rpm:1240006742
+globus-callout-0_7-2_fc9:F-10:globus-callout-0.7-2.fc9.src.rpm:1240379542


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:19:57 -0000	1.2
+++ sources	22 Apr 2009 05:53:11 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 05:56:04 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 05:56:04 +0000 (UTC)
Subject: rpms/globus-callout/F-11 globus-callout.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422055604.C302F70104@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28943/F-11

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:21:49 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:56:01 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
+Source9:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -182,6 +187,8 @@
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:21:49 -0000	1.1
+++ import.log	22 Apr 2009 05:56:01 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:F-11:globus-callout-0.7-1.fc9.src.rpm:1240006866
+globus-callout-0_7-2_fc9:F-11:globus-callout-0.7-2.fc9.src.rpm:1240379635


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:21:49 -0000	1.2
+++ sources	22 Apr 2009 05:56:01 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 05:58:22 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 05:58:22 +0000 (UTC)
Subject: rpms/globus-callout/EL-4 globus-callout.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422055822.37A5C700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29922/EL-4

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:23:42 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:57:49 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
+Source9:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -182,6 +187,8 @@
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:23:42 -0000	1.1
+++ import.log	22 Apr 2009 05:57:49 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:EL-4:globus-callout-0.7-1.fc9.src.rpm:1240006984
+globus-callout-0_7-2_fc9:EL-4:globus-callout-0.7-2.fc9.src.rpm:1240379810


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:23:42 -0000	1.2
+++ sources	22 Apr 2009 05:57:49 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 06:00:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 06:00:24 +0000 (UTC)
Subject: rpms/globus-callout/EL-5 globus-callout.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422060024.E0741700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30810/EL-5

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:25:26 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:59:54 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
 #		tar -jxf gt4.2.1-all-source-installer.tar.bz2
 #		mv gt4.2.1-all-source-installer/source-trees/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
+Source9:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -182,6 +187,8 @@
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:25:26 -0000	1.1
+++ import.log	22 Apr 2009 05:59:54 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:EL-5:globus-callout-0.7-1.fc9.src.rpm:1240007094
+globus-callout-0_7-2_fc9:EL-5:globus-callout-0.7-2.fc9.src.rpm:1240379949


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:25:26 -0000	1.2
+++ sources	22 Apr 2009 05:59:54 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz



From dchen at fedoraproject.org  Wed Apr 22 06:14:50 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 22 Apr 2009 06:14:50 +0000 (UTC)
Subject: rpms/libchewing/F-11 import.log,1.8,1.9 libchewing.spec,1.30,1.31
Message-ID: <20090422061451.27D38700FE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477/F-11

Modified Files:
	import.log libchewing.spec 
Log Message:
Fix [Bug 496886] libchewing-debuginfo does not contain sources


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	20 Feb 2009 07:01:57 -0000	1.8
+++ import.log	22 Apr 2009 06:14:48 -0000	1.9
@@ -6,3 +6,4 @@
 libchewing-0_3_2-3_fc10:HEAD:libchewing-0.3.2-3.fc10.src.rpm:1231914268
 libchewing-0_3_2-4_fc10:HEAD:libchewing-0.3.2-4.fc10.src.rpm:1232696067
 libchewing-0_3_2-6_fc10:HEAD:libchewing-0.3.2-6.fc10.src.rpm:1235113283
+libchewing-0_3_2-8_fc10:F-11:libchewing-0.3.2-8.fc10.src.rpm:1240380760


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/libchewing.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libchewing.spec	25 Feb 2009 14:06:13 -0000	1.30
+++ libchewing.spec	22 Apr 2009 06:14:48 -0000	1.31
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -40,7 +40,7 @@
 Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description -n %{name}-devel
-Headers and other files needed to develop applications using the %name 
+Headers and other files needed to develop applications using the %name
 library.
 
 %prep
@@ -54,19 +54,18 @@
 #%patch6 -p1 -b .7-bz237916
 #%patch7 -p1 -b .8-bz200694
 #%patch8 -p1 -b .9-bz195416
-%patch9 -p0 -b .libpatch
+%patch9 -p0 -b .bz477690
 
 %build
 #./autogen.sh
 #autoreconf -v
-export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\"'
+export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
 %configure --disable-static
-#make LIBINSTDIR="\"%{_libdir}\""
-make all RPM_CFLAGS="$RPM_OPT_FLAGS"
+%{__make} RPM_CFLAGS="%{optflags}" %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=%{buildroot} install
+#rm -rf $RPM_BUILD_ROOT
+%{__make} DESTDIR=%{buildroot} install
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
@@ -88,7 +87,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
-%{libchewing_python_dir} 
+%{libchewing_python_dir}
 
 %files devel
 %defattr(-, root, root)
@@ -98,6 +97,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 22 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-8
+- Fix [Bug 496968] - libchewing-debuginfo does not contain sources.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -113,13 +115,13 @@
   So python thinks libchewing is a library.
 
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
-- Add python binding by copy python/chewing.py to 
+- Add python binding by copy python/chewing.py to
   <python_dir>/site_packages/libchewing
 
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.
-		 
+
 * Wed Dec 03 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-0
 - Upstream update to 0.3.2.
 
@@ -148,7 +150,7 @@
 - Fixed bz#237233: Up arrow on candidate list doesn't work.
 
 * Fri Mar 09 2007 Caius Chance <cchance at redhat.com> - 0.3.0-6.devel
-- Fixed bz231568: [chewing] Look up table is showing candidates of previous 
+- Fixed bz231568: [chewing] Look up table is showing candidates of previous
   look-up.
 
 * Tue Nov 21 2006 Caius Chance <cchance at redhat.com> - 0.3.0-5.fc7
@@ -158,7 +160,7 @@
   instance reset.)
 
 * Fri Sep 15 2006 Caius Chance <cchance at redhat.com> - 0.3.0-4.fc6
-- Fixed bz#206232 - Shift_L + space doesn't work correctly  
+- Fixed bz#206232 - Shift_L + space doesn't work correctly
 
 * Mon Sep 04 2006 Caius Chance <cchance at redhat.com> - 0.3.0-3.fc6
 - Fixed bz#199353 - scim-chewing hangs for commit > 6 characters



From silas at fedoraproject.org  Wed Apr 22 06:42:48 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Wed, 22 Apr 2009 06:42:48 +0000 (UTC)
Subject: rpms/python-hash_ring/devel import.log, NONE,
	1.1 python-hash_ring.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090422064248.E6D29700FE@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/python-hash_ring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13447/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-hash_ring.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
python-hash_ring-1_2-2_fc10:HEAD:python-hash_ring-1.2-2.fc10.src.rpm:1240382471


--- NEW FILE python-hash_ring.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-hash_ring
Version:        1.2
Release:        2%{?dist}
Summary:        Python implementation of consistent hashing

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/hash_ring
Source0:        http://pypi.python.org/packages/source/h/hash_ring/hash_ring-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       python-memcached

%description
hash_ring implements consistent hashing that can be used when the number of
server nodes can increase or decrease. Consistent hashing is a scheme that
provides a hash table functionality in a way that the adding or removing of one
slot does not significantly change the mapping of keys to slots.

%prep
%setup -q -n hash_ring-%{version}
# Remove bootstrap for setuptools which is provided in BuildRequires
sed -i '/^import\ ez_setup$/,+1 d' setup.py

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc PKG-INFO
%{python_sitelib}/hash_ring/
%{python_sitelib}/hash_ring-%{version}-*.egg-info

%changelog
* Sat Apr 11 2009 Silas Sewell <silas at sewell ch> - 1.2-2
- Fix license
- Make files section more explicit

* Fri Apr 10 2009 Silas Sewell <silas at sewell ch> - 1.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-hash_ring/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:09:24 -0000	1.1
+++ .cvsignore	22 Apr 2009 06:42:46 -0000	1.2
@@ -0,0 +1 @@
+hash_ring-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-hash_ring/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:09:24 -0000	1.1
+++ sources	22 Apr 2009 06:42:46 -0000	1.2
@@ -0,0 +1 @@
+ada64f9827572621edf73d86f02b20ae  hash_ring-1.2.tar.gz



From mmaslano at fedoraproject.org  Wed Apr 22 06:44:52 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 22 Apr 2009 06:44:52 +0000 (UTC)
Subject: rpms/perl-Test-Most/devel perl-Test-Most.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422064452.64989700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Test-Most/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14116

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Most.spec 
Log Message:
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.21-3
- remove unnecesarry requirements



--- NEW FILE perl-Test-Most.spec ---
Name:           perl-Test-Most
Version:        0.21
Release:        3%{?dist}
Summary:        Perl module with test functions and features
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Most/
Source0:        http://www.cpan.org/authors/id/O/OV/OVID/Test-Most-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Data::Dumper::Names) >= 0.03
BuildRequires:  perl(Exception::Class) >= 1.14
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Deep)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::Harness) >= 3.07
BuildRequires:  perl(Test::Simple) >= 0.82
BuildRequires:  perl(Test::Warn) >= 0.1
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Most commonly needed test functions and features. This module provides you with 
the most commonly used testing functions and gives you a bit more fine-grained 
control over your test suite.

%prep
%setup -q -n Test-Most-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.21-3
- remove unnecesarry requirements

* Thu Apr 02 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.21-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Most/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:58:39 -0000	1.1
+++ .cvsignore	22 Apr 2009 06:44:16 -0000	1.2
@@ -0,0 +1 @@
+Test-Most-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Most/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:58:40 -0000	1.1
+++ sources	22 Apr 2009 06:44:17 -0000	1.2
@@ -0,0 +1 @@
+8066a15a40154d011296b33ce02a1cf8  Test-Most-0.21.tar.gz



From mnagy at fedoraproject.org  Wed Apr 22 06:48:00 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Wed, 22 Apr 2009 06:48:00 +0000 (UTC)
Subject: rpms/bind/devel bind-96-dyndb.patch,1.3,1.4 bind.spec,1.309,1.310
Message-ID: <20090422064800.E644E700FE@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15384

Modified Files:
	bind-96-dyndb.patch bind.spec 
Log Message:
* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
- update the patch for dynamic loading of database backends


bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bind-96-dyndb.patch	30 Mar 2009 14:54:41 -0000	1.3
+++ bind-96-dyndb.patch	22 Apr 2009 06:47:57 -0000	1.4
@@ -1,6 +1,7 @@
-diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
---- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
-+++ bind-9.6.1b1/bin/named/main.c	2009-03-30 14:56:54.895136109 +0200
+diff --git a/bin/named/main.c b/bin/named/main.c
+index aa6575a..8030e3d 100644
+--- a/bin/named/main.c
++++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -18,10 +19,11 @@
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
---- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
-+++ bind-9.6.1b1/bin/named/server.c	2009-03-30 14:59:00.478136755 +0200
-@@ -57,6 +57,7 @@
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 31b2761..5d4077d 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -56,6 +56,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -29,12 +31,12 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
  }
  
  static isc_result_t
 +configure_dynamic_db(const cfg_obj_t *dynamic_db, isc_mem_t *mctx,
-+		     dns_view_t *view, dns_zonemgr_t *zmgr)
++		     const dns_dyndb_arguments_t *dyndb_args)
 +{
 +	isc_result_t result;
 +	const cfg_obj_t *obj;
@@ -88,7 +90,7 @@
 +	REQUIRE(i < len);
 +	argv[i] = NULL;
 +
-+	CHECK(dns_dynamic_db_load(libname, name, mctx, argv, view, zmgr));
++	CHECK(dns_dynamic_db_load(libname, name, mctx, argv, dyndb_args));
 +
 +cleanup:
 +	if (argv != NULL)
@@ -102,7 +104,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
+@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -110,8 +112,8 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1238,6 +1306,22 @@ configure_view(dns_view_t *view, const c
- 		view->maxncachettl = 7 * 24 * 3600;
+@@ -1171,6 +1239,37 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+ #endif
  
  	/*
 +	 * Configure dynamic databases.
@@ -121,33 +123,72 @@
 +		(void)cfg_map_get(voptions, "dynamic-db", &dynamic_db_list);
 +	else
 +		(void)cfg_map_get(config, "dynamic-db", &dynamic_db_list);
-+	for (element = cfg_list_first(dynamic_db_list);
-+	     element != NULL;
-+	     element = cfg_list_next(element))
-+	{
-+		obj = cfg_listelt_value(element);
-+		CHECK(configure_dynamic_db(obj, mctx, view, ns_g_server->zonemgr));
++	element = cfg_list_first(dynamic_db_list);
++	if (element != NULL) {
++		dns_dyndb_arguments_t *args;
++
++		args = dns_dyndb_arguments_create(mctx);
++		if (args == NULL) {
++			result = ISC_R_NOMEMORY;
++			goto cleanup;
++		}
++		dns_dyndb_set_view(args, view);
++		dns_dyndb_set_zonemgr(args, ns_g_server->zonemgr);
++		dns_dyndb_set_task(args, ns_g_server->task);
++		dns_dyndb_set_timermgr(args, ns_g_timermgr);
++		while (element != NULL) {
++			obj = cfg_listelt_value(element);
++			CHECK(configure_dynamic_db(obj, mctx, args));
++
++			element = cfg_list_next(element);
++		}
++
++		dns_dyndb_arguments_destroy(mctx, args);
 +	}
 +
 +	/*
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
-diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
---- /dev/null	2009-03-30 11:37:35.392000941 +0200
-+++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-03-30 14:56:54.899136384 +0200
-@@ -0,0 +1,240 @@
+diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
+index ef5c12a..0f7abba 100644
+--- a/lib/dns/Makefile.in
++++ b/lib/dns/Makefile.in
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
+new file mode 100644
+index 0000000..f11584d
+--- /dev/null
++++ b/lib/dns/dynamic_db.c
+@@ -0,0 +1,346 @@
 +/*
-+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-+ * Copyright (C) 1996-2003  Internet Software Consortium.
++ * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
 + * Permission to use, copy, modify, and/or distribute this software for any
 + * purpose with or without fee is hereby granted, provided that the above
 + * copyright notice and this permission notice appear in all copies.
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
++ * THE SOFTWARE IS PROVIDED "AS IS" AND Red Hat DISCLAIMS ALL WARRANTIES WITH
 + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * AND FITNESS.  IN NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, DIRECT,
 + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -161,13 +202,17 @@
 +#include <isc/mutex.h>
 +#include <isc/once.h>
 +#include <isc/result.h>
++#include <isc/task.h>
 +#include <isc/types.h>
 +#include <isc/util.h>
 +
 +#include <dns/dynamic_db.h>
 +#include <dns/log.h>
 +#include <dns/types.h>
++#include <dns/view.h>
++#include <dns/zone.h>
 +
++#include <string.h>
 +
 +#if HAVE_DLFCN_H
 +#include <dlfcn.h>
@@ -180,8 +225,7 @@
 +
 +
 +typedef isc_result_t (*register_func_t)(isc_mem_t *mctx, const char *name,
-+		const char * const *argv, dns_view_t *view,
-+		dns_zonemgr_t *zmgr);
++		const char * const *argv, dns_dyndb_arguments_t *dyndb_args);
 +typedef void (*destroy_func_t)(void);
 +
 +typedef struct dyndb_implementation dyndb_implementation_t;
@@ -194,6 +238,13 @@
 +	LINK(dyndb_implementation_t)	link;
 +};
 +
++struct dns_dyndb_arguments {
++	dns_view_t	*view;
++	dns_zonemgr_t	*zmgr;
++	isc_task_t	*task;
++	isc_timermgr_t	*timermgr;
++};
++
 +/* List of implementations. Locked by dyndb_lock. */
 +static LIST(dyndb_implementation_t) dyndb_implementations;
 +/* Locks dyndb_implementations. */
@@ -332,8 +383,7 @@
 +
 +isc_result_t
 +dns_dynamic_db_load(const char *libname, const char *name, isc_mem_t *mctx,
-+		    const char * const *argv, dns_view_t *view,
-+		    dns_zonemgr_t *zmgr)
++		    const char * const *argv, dns_dyndb_arguments_t *dyndb_args)
 +{
 +	isc_result_t result;
 +	dyndb_implementation_t *implementation = NULL;
@@ -341,7 +391,7 @@
 +	RUNTIME_CHECK(isc_once_do(&once, dyndb_initialize) == ISC_R_SUCCESS);
 +
 +	CHECK(load_library(mctx, libname, &implementation));
-+	CHECK(implementation->register_function(mctx, name, argv, view, zmgr));
++	CHECK(implementation->register_function(mctx, name, argv, dyndb_args));
 +
 +	LOCK(&dyndb_lock);
 +	APPEND(dyndb_implementations, implementation, link);
@@ -377,21 +427,133 @@
 +
 +	isc_mutex_destroy(&dyndb_lock);
 +}
-diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
---- /dev/null	2009-03-30 11:37:35.392000941 +0200
-+++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-03-30 14:56:54.899136384 +0200
-@@ -0,0 +1,32 @@
++
++dns_dyndb_arguments_t *
++dns_dyndb_arguments_create(isc_mem_t *mctx)
++{
++	dns_dyndb_arguments_t *args;
++
++	args = isc_mem_get(mctx, sizeof(*args));
++	if (args != NULL)
++		memset(args, 0, sizeof(*args));
++
++	return args;
++}
++
++void
++dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	dns_dyndb_set_view(args, NULL);
++	dns_dyndb_set_zonemgr(args, NULL);
++	dns_dyndb_set_task(args, NULL);
++	dns_dyndb_set_timermgr(args, NULL);
++
++	isc_mem_put(mctx, args, sizeof(*args));
++}
++
++void
++dns_dyndb_set_view(dns_dyndb_arguments_t *args, dns_view_t *view)
++{
++	REQUIRE(args != NULL);
++
++	if (args->view != NULL)
++		dns_view_detach(&args->view);
++	if (view != NULL)
++		dns_view_attach(view, &args->view);
++}
++
++dns_view_t *
++dns_dyndb_get_view(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->view;
++}
++
++void
++dns_dyndb_set_zonemgr(dns_dyndb_arguments_t *args, dns_zonemgr_t *zmgr)
++{
++	REQUIRE(args != NULL);
++
++	if (args->zmgr != NULL)
++		dns_zonemgr_detach(&args->zmgr);
++	if (zmgr != NULL)
++		dns_zonemgr_attach(zmgr, &args->zmgr);
++}
++
++dns_zonemgr_t *
++dns_dyndb_get_zonemgr(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->zmgr;
++}
++
++void
++dns_dyndb_set_task(dns_dyndb_arguments_t *args, isc_task_t *task)
++{
++	REQUIRE(args != NULL);
++
++	if (args->task != NULL)
++		isc_task_detach(&args->task);
++	if (task != NULL)
++		isc_task_attach(task, &args->task);
++}
++
++isc_task_t *
++dns_dyndb_get_task(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->task;
++}
++
++void
++dns_dyndb_set_timermgr(dns_dyndb_arguments_t *args, isc_timermgr_t *timermgr)
++{
++	REQUIRE(args != NULL);
++
++	args->timermgr = timermgr;
++}
++
++isc_timermgr_t *
++dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args)
++{
++	REQUIRE(args != NULL);
++
++	return args->timermgr;
++}
+diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
+index e9e049e..27fdc45 100644
+--- a/lib/dns/include/dns/Makefile.in
++++ b/lib/dns/include/dns/Makefile.in
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
+new file mode 100644
+index 0000000..12f7a06
+--- /dev/null
++++ b/lib/dns/include/dns/dynamic_db.h
+@@ -0,0 +1,50 @@
 +/*
-+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-+ * Copyright (C) 1996-2003  Internet Software Consortium.
++ * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
 + * Permission to use, copy, modify, and/or distribute this software for any
 + * purpose with or without fee is hereby granted, provided that the above
 + * copyright notice and this permission notice appear in all copies.
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
++ * THE SOFTWARE IS PROVIDED "AS IS" AND Red Hat DISCLAIMS ALL WARRANTIES WITH
 + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * AND FITNESS.  IN NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, DIRECT,
 + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -406,17 +568,37 @@
 +
 +#include <dns/types.h>
 +
++/*
++ * TODO:
++ * Reformat the prototypes.
++ * Add annotated comments.
++ */
++
 +isc_result_t dns_dynamic_db_load(const char *libname, const char *name,
 +				 isc_mem_t *mctx, const char * const *argv,
-+				 dns_view_t *view, dns_zonemgr_t *zmgr);
++				 dns_dyndb_arguments_t *dyndb_args);
 +
 +void dns_dynamic_db_cleanup(void);
 +
++dns_dyndb_arguments_t *dns_dyndb_arguments_create(isc_mem_t *mctx);
++void dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args);
++
++void dns_dyndb_set_view(dns_dyndb_arguments_t *args, dns_view_t *view);
++dns_view_t *dns_dyndb_get_view(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_zonemgr(dns_dyndb_arguments_t *args, dns_zonemgr_t *zmgr);
++dns_zonemgr_t *dns_dyndb_get_zonemgr(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_task(dns_dyndb_arguments_t *args, isc_task_t *task);
++isc_task_t *dns_dyndb_get_task(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_timermgr(dns_dyndb_arguments_t *args,
++			    isc_timermgr_t *timermgr);
++isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
++
 +#endif
-diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
---- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-03-30 14:56:54.899136384 +0200
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
+diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
+index 5adcedd..e171028 100644
+--- a/lib/dns/include/dns/log.h
++++ b/lib/dns/include/dns/log.h
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -424,22 +606,23 @@
  
  ISC_LANG_BEGINDECLS
  
-diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-03-30 14:56:54.899136384 +0200
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
---- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
-+++ bind-9.6.1b1/lib/dns/log.c	2009-03-30 14:56:54.899136384 +0200
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
+diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
+index 5223397..f434188 100644
+--- a/lib/dns/include/dns/types.h
++++ b/lib/dns/include/dns/types.h
+@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable_t;
+ typedef void					dns_dbversion_t;
+ typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
+ typedef struct dns_dlzdb			dns_dlzdb_t;
++typedef struct dns_dyndb_arguments		dns_dyndb_arguments_t;
+ typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
+ typedef struct dns_decompress			dns_decompress_t;
+ typedef struct dns_dispatch			dns_dispatch_t;
+diff --git a/lib/dns/log.c b/lib/dns/log.c
+index 7551e15..b9864eb 100644
+--- a/lib/dns/log.c
++++ b/lib/dns/log.c
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -447,31 +630,10 @@
  	{ NULL, 		0 }
  };
  
-diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-03-30 14:56:54.887146135 +0200
-+++ bind-9.6.1b1/lib/dns/Makefile.in	2009-03-30 14:56:54.899136384 +0200
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
---- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
-+++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-03-30 14:56:54.903136167 +0200
+diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
+index 0610489..a1dba32 100644
+--- a/lib/isccfg/namedconf.c
++++ b/lib/isccfg/namedconf.c
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -488,7 +650,7 @@
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- bind.spec	30 Mar 2009 14:54:41 -0000	1.309
+++ bind.spec	22 Apr 2009 06:47:57 -0000	1.310
@@ -20,7 +20,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  0.1.%{PREVER}%{?dist}
+Release:  0.2.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -569,6 +569,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
+- update the patch for dynamic loading of database backends
+
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
 - 9.6.1b1 release
 - patches merged



From grof at fedoraproject.org  Wed Apr 22 06:48:06 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 06:48:06 +0000 (UTC)
Subject: rpms/photoprint/devel import.log, NONE,
	1.1 photoprint-0.4.0-g++44.patch, NONE,
	1.1 photoprint-0.4.0-paths.patch, NONE, 1.1 photoprint.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422064806.1A4A4700FE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14028/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log photoprint-0.4.0-g++44.patch 
	photoprint-0.4.0-paths.patch photoprint.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-0_4_0-6_fc11:HEAD:photoprint-0.4.0-6.fc11.src.rpm:1240382560

photoprint-0.4.0-g++44.patch:

--- NEW FILE photoprint-0.4.0-g++44.patch ---
--- photoprint-0.4.0/support/layoutrectangle.h.debug	2008-10-19 03:14:20.000000000 +0900
+++ photoprint-0.4.0/support/layoutrectangle.h	2009-04-15 02:32:29.000000000 +0900
@@ -1,6 +1,8 @@
 #ifndef LAYOUTRECTANGLE_H
 #define LAYOUTRECTANGLE_H
 
+#include <cstdio>
+
 enum PP_ROTATION
 {
 	PP_ROTATION_AUTO,
--- photoprint-0.4.0/support/pathsupport.cpp.debug	2008-11-19 03:54:03.000000000 +0900
+++ photoprint-0.4.0/support/pathsupport.cpp	2009-04-15 02:33:42.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <iostream>
+#include <cstdio>
 #include <string.h>
 #include <glib.h>
 
--- photoprint-0.4.0/support/searchpath.cpp.debug	2008-11-20 09:06:23.000000000 +0900
+++ photoprint-0.4.0/support/searchpath.cpp	2009-04-15 02:52:58.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 #include <iostream>
 #include <sys/stat.h>
 #include <unistd.h>
--- photoprint-0.4.0/support/tempfile.cpp.debug	2008-10-13 06:49:26.000000000 +0900
+++ photoprint-0.4.0/support/tempfile.cpp	2009-04-15 02:36:56.000000000 +0900
@@ -11,6 +11,7 @@
 */
 
 #include <iostream>
+#include <cstdio>
 
 #include <stdlib.h>
 #include <string.h>

photoprint-0.4.0-paths.patch:

--- NEW FILE photoprint-0.4.0-paths.patch ---
--- photoprint-0.4.0/photoprint_state.cpp.orig	2009-01-17 20:08:37.000000000 +0100
+++ photoprint-0.4.0/photoprint_state.cpp	2009-03-27 22:08:13.000000000 +0100
@@ -74,6 +74,8 @@
 	PPPathDBHandler(ConfigFile *file,const char *section,ConfigDB *db,PhotoPrint_State &state)
 		: ConfigDBHandler(file,section,db), db(db), state(state)
 	{
+               state.bordersearchpath.AddPath(db->FindString("BorderPath"));
+               state.backgroundsearchpath.AddPath(db->FindString("BackgroundPath"));
 	}
 	virtual ~PPPathDBHandler()
 	{


--- NEW FILE photoprint.spec ---
Name:           photoprint
Version:        0.4.0
Release:        6%{?dist}
Summary:        Utility for printing digital photographs

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
Patch0:         photoprint-0.4.0-paths.patch
Patch1:         photoprint-0.4.0-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gutenprint-devel
BuildRequires:  lcms-devel
BuildRequires:  netpbm-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libtiff-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
PhotoPrint is a utility designed to assist in the process 
of printing digital photographs.
PhotoPrint can do the following:

* Print photographs 1-up, 2-up, 4-up or with any user-selectable
  number of rows and columns.
* Create posters, split over several pages.
* Arrange images into a sort of Carousel, fading from one to 
  another.  (Ideal for CD labels)
* Crop images to fit a specific frame.
* Apply a decorative border to an image.
* Make use of ICC colour profiles to provide accurate output.
* Send 16-bit data to the printer, to avoid "contouring" problems 
  in smooth gradients.
* Apply a handful of effecs to an image, including sharpening, 
  removing colour and adjusting colour temperature 
  (ideal for cooling or warming black-and-white prints).


%prep
%setup -q
%patch0 -p1 -b .paths
%patch1 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# install man page
install  -Dpm 0644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

desktop-file-validate %{buildroot}/%{_datadir}/applications/fotoprint.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS README ChangeLog COPYING 
%{_bindir}/*
%{_datadir}/applications/fotoprint.desktop
%{_datadir}/icons/hicolor/48x48/apps/fotoprint.png
%{_mandir}/man*/*


%changelog
* Wed Apr 15 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-6
- resolving summary, license
- added g++4.4 patch
- resolving timestamps
- new scriplets for icon cache

* Sat Mar 28 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-5
- resolved issue in .paths patch for resolving paths in Paths... dialogbox

* Wed Mar 25 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-4
- added .paths patch for resolving paths in Paths... dialogbox

* Mon Mar 23 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-3
- scriptlets added 

* Thu Mar 20 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-2
- added .desktop validation
- added man file

* Thu Mar 19 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:46:39 -0000	1.1
+++ .cvsignore	22 Apr 2009 06:47:32 -0000	1.2
@@ -0,0 +1 @@
+photoprint-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:46:39 -0000	1.1
+++ sources	22 Apr 2009 06:47:33 -0000	1.2
@@ -0,0 +1 @@
+82a37ac6ed99ed156ce40e62c78a8161  photoprint-0.4.0.tar.gz



From grof at fedoraproject.org  Wed Apr 22 06:58:47 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 06:58:47 +0000 (UTC)
Subject: rpms/photoprint/F-10 sources,1.1,1.2
Message-ID: <20090422065847.8FC9A700FE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18632

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:46:39 -0000	1.1
+++ sources	22 Apr 2009 06:58:44 -0000	1.2
@@ -0,0 +1 @@
+82a37ac6ed99ed156ce40e62c78a8161  photoprint-0.4.0.tar.gz



From grof at fedoraproject.org  Wed Apr 22 07:01:08 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 07:01:08 +0000 (UTC)
Subject: rpms/photoprint/F-9 sources,1.1,1.2
Message-ID: <20090422070108.D7858700FE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19377

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:46:39 -0000	1.1
+++ sources	22 Apr 2009 07:00:36 -0000	1.2
@@ -0,0 +1 @@
+82a37ac6ed99ed156ce40e62c78a8161  photoprint-0.4.0.tar.gz



From grof at fedoraproject.org  Wed Apr 22 07:03:21 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 07:03:21 +0000 (UTC)
Subject: rpms/photoprint/F-11 sources,1.1,1.2
Message-ID: <20090422070321.F23D270104@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20422

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:46:39 -0000	1.1
+++ sources	22 Apr 2009 07:03:20 -0000	1.2
@@ -0,0 +1 @@
+82a37ac6ed99ed156ce40e62c78a8161  photoprint-0.4.0.tar.gz



From cwickert at fedoraproject.org  Wed Apr 22 07:22:25 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 22 Apr 2009 07:22:25 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/F-11 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xfce4-clipman-plugin.spec, 1.18, 1.19
Message-ID: <20090422072225.83C04700FE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26734

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0
- Require xfce4-doc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2009 21:54:55 -0000	1.7
+++ .cvsignore	22 Apr 2009 07:21:53 -0000	1.8
@@ -1 +1 @@
-xfce4-clipman-plugin-0.9.1.tar.bz2
+xfce4-clipman-plugin-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2009 21:54:55 -0000	1.7
+++ sources	22 Apr 2009 07:21:53 -0000	1.8
@@ -1 +1 @@
-74aa0e707c3e31844518fd36b1498254  xfce4-clipman-plugin-0.9.1.tar.bz2
+9ef43216b6eac63035afb1b3f82c5f92  xfce4-clipman-plugin-1.0.0.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-11/xfce4-clipman-plugin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xfce4-clipman-plugin.spec	30 Mar 2009 21:54:55 -0000	1.18
+++ xfce4-clipman-plugin.spec	22 Apr 2009 07:21:53 -0000	1.19
@@ -1,45 +1,95 @@
-Name:		xfce4-clipman-plugin
-Version:	0.9.1
-Release:	1%{?dist}
-Summary:	Clipboard manager plugin for the Xfce panel
-
-Group:		User Interface/Desktops
-License:	GPLv2+
-URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
-BuildRequires:	exo-devel >= 0.3.0
-BuildRequires:	gettext, intltool, libxml2-devel
-Requires:	xfce4-panel >= 4.4.0
+Name:           xfce4-clipman-plugin
+Version:        1.0.0
+Release:        1%{?dist}
+Summary:        Clipboard manager plugin for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxfcegui4-devel >= 4.4.0
+BuildRequires:  xfce4-panel-devel >= 4.4.0
+BuildRequires:  exo-devel >= 0.3.0 
+BuildRequires:  libglade2-devel >= 2.6.0
+BuildRequires:  xfconf-devel >= 4.6.0
+BuildRequires:  gettext, intltool, libxml2-devel
+Requires:       xfce4-panel >= 4.4.0, xfce4-doc
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
 clipboard" option, and a drag-and-drop paste feature.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+desktop-file-install                                      \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+  --add-category=X-Xfce                                   \
+  --add-only-show-in=XFCE                                 \
+  --delete-original                                       \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
+desktop-file-install                                      \
+  --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart   \
+  --add-category=X-Xfce                                   \
+  --add-only-show-in=XFCE                                 \
+  --delete-original                                       \
+  ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README THANKS
-%{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+#%{_libexecdir}/xfce4/panel-plugins/%{name}
+%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml
+%{_bindir}/%{name}
+%{_bindir}/xfce4-popup-clipman
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/xfce4/doc/*/images/clipman-*.png
+%{_datadir}/xfce4/doc/*/%{name}.html
+%{_datadir}/xfce4/panel-plugins/%{name}.desktop
+
 
 %changelog
+* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0
+- Require xfce4-doc
+
 * Mon Mar 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.1-2
 - Update to 0.9.1
 



From grof at fedoraproject.org  Wed Apr 22 07:28:56 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 07:28:56 +0000 (UTC)
Subject: rpms/photoprint/F-9 import.log, NONE,
	1.1 photoprint-0.4.0-g++44.patch, 
	NONE, 1.1 photoprint-0.4.0-paths.patch, NONE,
	1.1 photoprint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
Message-ID: <20090422072856.5BBF1700FE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28969/F-9

Modified Files:
	.cvsignore 
Added Files:
	import.log photoprint-0.4.0-g++44.patch 
	photoprint-0.4.0-paths.patch photoprint.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-0_4_0-6_fc11:F-9:photoprint-0.4.0-6.fc11.src.rpm:1240385461

photoprint-0.4.0-g++44.patch:

--- NEW FILE photoprint-0.4.0-g++44.patch ---
--- photoprint-0.4.0/support/layoutrectangle.h.debug	2008-10-19 03:14:20.000000000 +0900
+++ photoprint-0.4.0/support/layoutrectangle.h	2009-04-15 02:32:29.000000000 +0900
@@ -1,6 +1,8 @@
 #ifndef LAYOUTRECTANGLE_H
 #define LAYOUTRECTANGLE_H
 
+#include <cstdio>
+
 enum PP_ROTATION
 {
 	PP_ROTATION_AUTO,
--- photoprint-0.4.0/support/pathsupport.cpp.debug	2008-11-19 03:54:03.000000000 +0900
+++ photoprint-0.4.0/support/pathsupport.cpp	2009-04-15 02:33:42.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <iostream>
+#include <cstdio>
 #include <string.h>
 #include <glib.h>
 
--- photoprint-0.4.0/support/searchpath.cpp.debug	2008-11-20 09:06:23.000000000 +0900
+++ photoprint-0.4.0/support/searchpath.cpp	2009-04-15 02:52:58.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 #include <iostream>
 #include <sys/stat.h>
 #include <unistd.h>
--- photoprint-0.4.0/support/tempfile.cpp.debug	2008-10-13 06:49:26.000000000 +0900
+++ photoprint-0.4.0/support/tempfile.cpp	2009-04-15 02:36:56.000000000 +0900
@@ -11,6 +11,7 @@
 */
 
 #include <iostream>
+#include <cstdio>
 
 #include <stdlib.h>
 #include <string.h>

photoprint-0.4.0-paths.patch:

--- NEW FILE photoprint-0.4.0-paths.patch ---
--- photoprint-0.4.0/photoprint_state.cpp.orig	2009-01-17 20:08:37.000000000 +0100
+++ photoprint-0.4.0/photoprint_state.cpp	2009-03-27 22:08:13.000000000 +0100
@@ -74,6 +74,8 @@
 	PPPathDBHandler(ConfigFile *file,const char *section,ConfigDB *db,PhotoPrint_State &state)
 		: ConfigDBHandler(file,section,db), db(db), state(state)
 	{
+               state.bordersearchpath.AddPath(db->FindString("BorderPath"));
+               state.backgroundsearchpath.AddPath(db->FindString("BackgroundPath"));
 	}
 	virtual ~PPPathDBHandler()
 	{


--- NEW FILE photoprint.spec ---
Name:           photoprint
Version:        0.4.0
Release:        6%{?dist}
Summary:        Utility for printing digital photographs

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
Patch0:         photoprint-0.4.0-paths.patch
Patch1:         photoprint-0.4.0-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gutenprint-devel
BuildRequires:  lcms-devel
BuildRequires:  netpbm-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libtiff-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
PhotoPrint is a utility designed to assist in the process 
of printing digital photographs.
PhotoPrint can do the following:

* Print photographs 1-up, 2-up, 4-up or with any user-selectable
  number of rows and columns.
* Create posters, split over several pages.
* Arrange images into a sort of Carousel, fading from one to 
  another.  (Ideal for CD labels)
* Crop images to fit a specific frame.
* Apply a decorative border to an image.
* Make use of ICC colour profiles to provide accurate output.
* Send 16-bit data to the printer, to avoid "contouring" problems 
  in smooth gradients.
* Apply a handful of effecs to an image, including sharpening, 
  removing colour and adjusting colour temperature 
  (ideal for cooling or warming black-and-white prints).


%prep
%setup -q
%patch0 -p1 -b .paths
%patch1 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# install man page
install  -Dpm 0644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

desktop-file-validate %{buildroot}/%{_datadir}/applications/fotoprint.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS README ChangeLog COPYING 
%{_bindir}/*
%{_datadir}/applications/fotoprint.desktop
%{_datadir}/icons/hicolor/48x48/apps/fotoprint.png
%{_mandir}/man*/*


%changelog
* Wed Apr 15 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-6
- resolving summary, license
- added g++4.4 patch
- resolving timestamps
- new scriplets for icon cache

* Sat Mar 28 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-5
- resolved issue in .paths patch for resolving paths in Paths... dialogbox

* Wed Mar 25 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-4
- added .paths patch for resolving paths in Paths... dialogbox

* Mon Mar 23 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-3
- scriptlets added 

* Thu Mar 20 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-2
- added .desktop validation
- added man file

* Thu Mar 19 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:46:39 -0000	1.1
+++ .cvsignore	22 Apr 2009 07:28:53 -0000	1.2
@@ -0,0 +1 @@
+photoprint-0.4.0.tar.gz



From sailer at fedoraproject.org  Wed Apr 22 07:29:56 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 22 Apr 2009 07:29:56 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/F-11 mingw32-gtkmm24.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422072956.E9B7C700FE@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29508

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-gtkmm24.spec 
Log Message:
copy from devel



--- NEW FILE mingw32-gtkmm24.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-gtkmm24
Version:        2.16.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.16/gtkmm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-glibmm24 >= %{version}
BuildRequires:  mingw32-atk
BuildRequires:  mingw32-pango
BuildRequires:  mingw32-gtk2 >= %{version}
BuildRequires:  mingw32-cairomm
BuildRequires:  mingw32-pangomm

Requires:       pkgconfig


%description
gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps
GTK+ 2.  Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.



%prep
%setup -q -n gtkmm-%{version}


%build
%{_mingw32_configure} --disable-static --enable-shared --disable-demos --disable-docs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libatkmm-1.6-1.dll
%{_mingw32_bindir}/libgdkmm-2.4-1.dll
%{_mingw32_bindir}/libgtkmm-2.4-1.dll
%{_mingw32_libdir}/libatkmm-1.6.dll.a
%{_mingw32_libdir}/libatkmm-1.6.la
%{_mingw32_libdir}/libgdkmm-2.4.dll.a
%{_mingw32_libdir}/libgdkmm-2.4.la
%{_mingw32_libdir}/libgtkmm-2.4.dll.a
%{_mingw32_libdir}/libgtkmm-2.4.la
%{_mingw32_includedir}/atkmm-1.6
%{_mingw32_includedir}/gdkmm-2.4
%{_mingw32_includedir}/gtkmm-2.4
%{_mingw32_libdir}/gdkmm-2.4
%{_mingw32_libdir}/gtkmm-2.4
%{_mingw32_libdir}/pkgconfig/atkmm-1.6.pc
%{_mingw32_libdir}/pkgconfig/gdkmm-2.4.pc
%{_mingw32_libdir}/pkgconfig/gtkmm-2.4.pc


%changelog
* Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.16.0-1
- update to 2.16.0 to match native
- remove COPYING.tools, as the binary does not contain any program from
  the tools directory
- do not build docs

* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.15.0-2
- replace %%define with %%global

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.15.0-1
- update to 2.15.0

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-4
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-3
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-2
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:56:17 -0000	1.1
+++ .cvsignore	22 Apr 2009 07:29:54 -0000	1.2
@@ -0,0 +1 @@
+gtkmm-2.16.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:56:17 -0000	1.1
+++ sources	22 Apr 2009 07:29:55 -0000	1.2
@@ -0,0 +1 @@
+a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2



From zprikryl at fedoraproject.org  Wed Apr 22 07:30:58 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Wed, 22 Apr 2009 07:30:58 +0000 (UTC)
Subject: rpms/libtrash/devel libtrash.spec,1.2,1.3
Message-ID: <20090422073058.1C3AC700FE@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/libtrash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29789

Modified Files:
	libtrash.spec 
Log Message:
Fixed usage of RPM_OPT_FLAGS



Index: libtrash.spec
===================================================================
RCS file: /cvs/extras/rpms/libtrash/devel/libtrash.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtrash.spec	25 Feb 2009 19:33:58 -0000	1.2
+++ libtrash.spec	22 Apr 2009 07:30:57 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:       Libraries to move files to a trash-folder on delete
 Name:          libtrash
 Version:       3.2
-Release:       6%{dist} 
+Release:       7%{dist} 
 Group:         System Environment/Libraries
 License:       GPLv2+
 URL:           http://pages.stern.nyu.edu/~marriaga/software/libtrash
@@ -33,7 +33,8 @@
 %patch1 -p1 -b .makefile
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make
+# -D_REENTRANT: keep up to date with src/Makefile
+make CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +65,9 @@
 %doc README TODO COPYING CHANGE.LOG config.txt 
 
 %changelog
+* Wed Apr 22 2009 Zdenek Prikryl <zprikryl at redhat.com> 3.2-7
+- Fixed usage of RPM_OPT_FLAGS
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sailer at fedoraproject.org  Wed Apr 22 07:40:47 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 22 Apr 2009 07:40:47 +0000 (UTC)
Subject: rpms/mingw32-libglademm24/devel mingw32-libglademm24.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422074047.A020070103@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglademm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv522

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-libglademm24.spec 
Log Message:
import after review



--- NEW FILE mingw32-libglademm24.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global name1 libglademm24

Name:           mingw32-%{name1}
Version:        2.6.7
Release:        5%{?dist}

Summary:        MinGW Windows C++ wrapper for libglade

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-gtkmm24 >= 2.6.0
BuildRequires:  mingw32-libglade2 >= 2.6.1

%description
This package provides a C++ interface for libglademm. It is a
subpackage of the GTKmm project.  The interface provides a convenient
interface for C++ programmers to create Gnome GUIs with GTK+'s
flexible object-oriented framework.


%prep
%setup -q -n libglademm-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf ${RPM_BUILD_ROOT}%{_mingw32_docdir}/gnomemm-2.6/libglademm-2.4/*
rm -f ${RPM_BUILD_ROOT}%{_mingw32_datadir}/devhelp/books/libglademm-2.4/*



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
%{_mingw32_bindir}/libglademm-2.4-1.dll
%{_mingw32_includedir}/libglademm-2.4
%{_mingw32_libdir}/libglademm-2.4.dll.a
%{_mingw32_libdir}/libglademm-2.4.la
%{_mingw32_libdir}/libglademm-2.4
%{_mingw32_libdir}/pkgconfig/*.pc

%changelog
* Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-5
- untangle BR and BA
- remove docs

* Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-4
- BR mingw32-gcc-c++
- remove --enable-docs

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-3
- unfiy main and devel subpackages

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-2
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglademm24/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:54:00 -0000	1.1
+++ .cvsignore	22 Apr 2009 07:40:15 -0000	1.2
@@ -0,0 +1 @@
+libglademm-2.6.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglademm24/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:54:00 -0000	1.1
+++ sources	22 Apr 2009 07:40:15 -0000	1.2
@@ -0,0 +1 @@
+f9ca5b67f6c551ea98790ab5f21c19d0  libglademm-2.6.7.tar.bz2



From sailer at fedoraproject.org  Wed Apr 22 07:43:44 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 22 Apr 2009 07:43:44 +0000 (UTC)
Subject: rpms/mingw32-libglademm24/devel mingw32-libglademm24.spec,1.1,1.2
Message-ID: <20090422074344.C7966700FE@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglademm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2433

Modified Files:
	mingw32-libglademm24.spec 
Log Message:
bump and rebuild due failed import



Index: mingw32-libglademm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglademm24/devel/mingw32-libglademm24.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-libglademm24.spec	22 Apr 2009 07:40:15 -0000	1.1
+++ mingw32-libglademm24.spec	22 Apr 2009 07:43:43 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           mingw32-%{name1}
 Version:        2.6.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        MinGW Windows C++ wrapper for libglade
 
@@ -66,6 +66,9 @@
 %{_mingw32_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 22 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-6
+- rebuild
+
 * Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-5
 - untangle BR and BA
 - remove docs



From sailer at fedoraproject.org  Wed Apr 22 07:45:34 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 22 Apr 2009 07:45:34 +0000 (UTC)
Subject: rpms/mingw32-libglademm24/F-11 mingw32-libglademm24.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422074535.15471700FE@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libglademm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2961

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-libglademm24.spec 
Log Message:
copy from devel



--- NEW FILE mingw32-libglademm24.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global name1 libglademm24

Name:           mingw32-%{name1}
Version:        2.6.7
Release:        6%{?dist}

Summary:        MinGW Windows C++ wrapper for libglade

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-gtkmm24 >= 2.6.0
BuildRequires:  mingw32-libglade2 >= 2.6.1

%description
This package provides a C++ interface for libglademm. It is a
subpackage of the GTKmm project.  The interface provides a convenient
interface for C++ programmers to create Gnome GUIs with GTK+'s
flexible object-oriented framework.


%prep
%setup -q -n libglademm-%{version}


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf ${RPM_BUILD_ROOT}%{_mingw32_docdir}/gnomemm-2.6/libglademm-2.4/*
rm -f ${RPM_BUILD_ROOT}%{_mingw32_datadir}/devhelp/books/libglademm-2.4/*



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
%{_mingw32_bindir}/libglademm-2.4-1.dll
%{_mingw32_includedir}/libglademm-2.4
%{_mingw32_libdir}/libglademm-2.4.dll.a
%{_mingw32_libdir}/libglademm-2.4.la
%{_mingw32_libdir}/libglademm-2.4
%{_mingw32_libdir}/pkgconfig/*.pc

%changelog
* Wed Apr 22 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-6
- rebuild

* Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-5
- untangle BR and BA
- remove docs

* Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-4
- BR mingw32-gcc-c++
- remove --enable-docs

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-3
- unfiy main and devel subpackages

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.7-2
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglademm24/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:54:00 -0000	1.1
+++ .cvsignore	22 Apr 2009 07:45:02 -0000	1.2
@@ -0,0 +1 @@
+libglademm-2.6.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglademm24/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:54:00 -0000	1.1
+++ sources	22 Apr 2009 07:45:02 -0000	1.2
@@ -0,0 +1 @@
+f9ca5b67f6c551ea98790ab5f21c19d0  libglademm-2.6.7.tar.bz2



From jreznik at fedoraproject.org  Wed Apr 22 07:49:12 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 22 Apr 2009 07:49:12 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.7,
	1.8 kde-plasma-runcommand.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090422074912.2174F700FE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3877

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
- update to 1.2
- translations removed (no need for them anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2009 10:41:47 -0000	1.7
+++ .cvsignore	22 Apr 2009 07:48:38 -0000	1.8
@@ -1 +1 @@
-91495-runcommand-1.1.tar.bz2
+91495-runcommand-1.2.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kde-plasma-runcommand.spec	10 Apr 2009 10:52:59 -0000	1.9
+++ kde-plasma-runcommand.spec	22 Apr 2009 07:48:38 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -36,19 +36,22 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files -f plasma_applet_runcommand.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
+- update to 1.2
+- translations removed (no need for them anymore)
+
 * Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
 - adds missing gettext BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2009 10:41:47 -0000	1.7
+++ sources	22 Apr 2009 07:48:38 -0000	1.8
@@ -1 +1 @@
-060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2
+1de91c97a2f83d58f114c4273fe39358  91495-runcommand-1.2.tar.bz2



From sharkcz at fedoraproject.org  Wed Apr 22 07:50:27 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 22 Apr 2009 07:50:27 +0000 (UTC)
Subject: rpms/scribus/devel .cvsignore, 1.18, 1.19 scribus.spec, 1.41,
	1.42 sources, 1.18, 1.19 scribus-x86_64.patch, 1.1,
	NONE scribus.xml, 1.2, NONE
Message-ID: <20090422075027.6C256700FE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4540

Modified Files:
	.cvsignore scribus.spec sources 
Removed Files:
	scribus-x86_64.patch scribus.xml 
Log Message:
* Wed Apr 22 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.12.beta
- update to 1.3.5.beta
- make docs subpackage noarch
- drop outdated Obsoletes/Provides



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	31 Mar 2009 13:50:51 -0000	1.18
+++ .cvsignore	22 Apr 2009 07:50:26 -0000	1.19
@@ -1 +1 @@
-scribus-svn13359.tar.bz2
+scribus-1.3.5.beta.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- scribus.spec	31 Mar 2009 13:50:51 -0000	1.41
+++ scribus.spec	22 Apr 2009 07:50:26 -0000	1.42
@@ -1,15 +1,13 @@
 Name:           scribus
 Version:        1.3.5
-Release:        0.11.20090329svn13359%{?dist}
+Release:        0.12.beta%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-# obtained via svn export -r 13359 svn://scribus.info/Scribus/trunk/Scribus scribus; tar cjvf ...
-Source0:        scribus-svn13359.tar.bz2
-Source1:        scribus.xml
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.beta.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -38,25 +36,6 @@
 Requires:       tkinter
 Requires:       shared-mime-info
 
-Obsoletes:     scribus-i18n-en
-Obsoletes:     scribus-svg
-Obsoletes:     scribus-scripting
-Obsoletes:     scribus-short-words
-Obsoletes:     scribus-vnla
-Obsoletes:     scribus-i18en
-Obsoletes:     scribus-i18de
-Obsoletes:     scribus-i18fr
-Obsoletes:     scribus-templates
-
-Provides:      scribus-i18n-en
-Provides:      scribus-svg
-Provides:      scribus-scripting
-Provides:      scribus-short-words
-Provides:      scribus-vnla
-Provides:      scribus-i18en
-Provides:      scribus-i18de
-Provides:      scribus-i18fr
-Provides:      scribus-templates
 
 %description
 Scribus is an desktop open source page layout program with
@@ -81,12 +60,16 @@
 Summary:        Documentation files for Scribus
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:      noarch
+%endif
+
 
 %description    doc
 %{summary}
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}.beta
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -144,7 +127,6 @@
 %{_bindir}/scribus
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
-#%{_datadir}/mimelnk/application/*scribus.desktop
 %{_datadir}/pixmaps/*
 %{_datadir}/scribus/
 %{_libdir}/scribus/
@@ -159,27 +141,32 @@
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5svn
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5svn/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5svn/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5svn/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5svn/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5svn/pl
-%{_datadir}/doc/%{name}-1.3.5svn/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5svn/BUILDING
-%{_datadir}/doc/%{name}-1.3.5svn/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5svn/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5svn/COPYING
-%{_datadir}/doc/%{name}-1.3.5svn/NEWS
-%{_datadir}/doc/%{name}-1.3.5svn/README*
-%{_datadir}/doc/%{name}-1.3.5svn/TODO
-%{_datadir}/doc/%{name}-1.3.5svn/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5svn/LINKS
-%{_datadir}/doc/%{name}-1.3.5svn/TRANSLATION
+%dir %{_datadir}/doc/%{name}-1.3.5.beta
+%lang(cd) %{_datadir}/doc/%{name}-1.3.5.beta/cs
+%lang(de) %{_datadir}/doc/%{name}-1.3.5.beta/de
+%lang(en) %{_datadir}/doc/%{name}-1.3.5.beta/en
+%lang(fr) %{_datadir}/doc/%{name}-1.3.5.beta/fr
+%lang(pl) %{_datadir}/doc/%{name}-1.3.5.beta/pl
+%{_datadir}/doc/%{name}-1.3.5.beta/AUTHORS
+%{_datadir}/doc/%{name}-1.3.5.beta/BUILDING
+%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLog
+%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLogSVN
+%{_datadir}/doc/%{name}-1.3.5.beta/COPYING
+%{_datadir}/doc/%{name}-1.3.5.beta/NEWS
+%{_datadir}/doc/%{name}-1.3.5.beta/README*
+%{_datadir}/doc/%{name}-1.3.5.beta/TODO
+%{_datadir}/doc/%{name}-1.3.5.beta/PACKAGING
+%{_datadir}/doc/%{name}-1.3.5.beta/LINKS
+%{_datadir}/doc/%{name}-1.3.5.beta/TRANSLATION
 
  
 
 %changelog
+* Wed Apr 22 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.12.beta
+- update to 1.3.5.beta
+- make docs subpackage noarch
+- drop outdated Obsoletes/Provides
+
 * Sun Mar 29 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.11.20090329svn13359
 - update to revision 13359
 - add aspell-devel and boost-devel as BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Mar 2009 13:50:51 -0000	1.18
+++ sources	22 Apr 2009 07:50:26 -0000	1.19
@@ -1 +1 @@
-33e602ff7969406987d86272fc8ce1c7  scribus-svn13359.tar.bz2
+ee097c2203ee86aac16cf820d3d698ce  scribus-1.3.5.beta.tar.bz2


--- scribus-x86_64.patch DELETED ---


--- scribus.xml DELETED ---



From grof at fedoraproject.org  Wed Apr 22 08:05:59 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 08:05:59 +0000 (UTC)
Subject: rpms/photoprint/F-11 import.log, NONE,
	1.1 photoprint-0.4.0-g++44.patch, NONE,
	1.1 photoprint-0.4.0-paths.patch, NONE, 1.1 photoprint.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2
Message-ID: <20090422080559.AE87F700FE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9059/F-11

Modified Files:
	.cvsignore 
Added Files:
	import.log photoprint-0.4.0-g++44.patch 
	photoprint-0.4.0-paths.patch photoprint.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-0_4_0-6_fc11:F-11:photoprint-0.4.0-6.fc11.src.rpm:1240387679

photoprint-0.4.0-g++44.patch:

--- NEW FILE photoprint-0.4.0-g++44.patch ---
--- photoprint-0.4.0/support/layoutrectangle.h.debug	2008-10-19 03:14:20.000000000 +0900
+++ photoprint-0.4.0/support/layoutrectangle.h	2009-04-15 02:32:29.000000000 +0900
@@ -1,6 +1,8 @@
 #ifndef LAYOUTRECTANGLE_H
 #define LAYOUTRECTANGLE_H
 
+#include <cstdio>
+
 enum PP_ROTATION
 {
 	PP_ROTATION_AUTO,
--- photoprint-0.4.0/support/pathsupport.cpp.debug	2008-11-19 03:54:03.000000000 +0900
+++ photoprint-0.4.0/support/pathsupport.cpp	2009-04-15 02:33:42.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <iostream>
+#include <cstdio>
 #include <string.h>
 #include <glib.h>
 
--- photoprint-0.4.0/support/searchpath.cpp.debug	2008-11-20 09:06:23.000000000 +0900
+++ photoprint-0.4.0/support/searchpath.cpp	2009-04-15 02:52:58.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 #include <iostream>
 #include <sys/stat.h>
 #include <unistd.h>
--- photoprint-0.4.0/support/tempfile.cpp.debug	2008-10-13 06:49:26.000000000 +0900
+++ photoprint-0.4.0/support/tempfile.cpp	2009-04-15 02:36:56.000000000 +0900
@@ -11,6 +11,7 @@
 */
 
 #include <iostream>
+#include <cstdio>
 
 #include <stdlib.h>
 #include <string.h>

photoprint-0.4.0-paths.patch:

--- NEW FILE photoprint-0.4.0-paths.patch ---
--- photoprint-0.4.0/photoprint_state.cpp.orig	2009-01-17 20:08:37.000000000 +0100
+++ photoprint-0.4.0/photoprint_state.cpp	2009-03-27 22:08:13.000000000 +0100
@@ -74,6 +74,8 @@
 	PPPathDBHandler(ConfigFile *file,const char *section,ConfigDB *db,PhotoPrint_State &state)
 		: ConfigDBHandler(file,section,db), db(db), state(state)
 	{
+               state.bordersearchpath.AddPath(db->FindString("BorderPath"));
+               state.backgroundsearchpath.AddPath(db->FindString("BackgroundPath"));
 	}
 	virtual ~PPPathDBHandler()
 	{


--- NEW FILE photoprint.spec ---
Name:           photoprint
Version:        0.4.0
Release:        6%{?dist}
Summary:        Utility for printing digital photographs

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
Patch0:         photoprint-0.4.0-paths.patch
Patch1:         photoprint-0.4.0-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gutenprint-devel
BuildRequires:  lcms-devel
BuildRequires:  netpbm-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libtiff-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
PhotoPrint is a utility designed to assist in the process 
of printing digital photographs.
PhotoPrint can do the following:

* Print photographs 1-up, 2-up, 4-up or with any user-selectable
  number of rows and columns.
* Create posters, split over several pages.
* Arrange images into a sort of Carousel, fading from one to 
  another.  (Ideal for CD labels)
* Crop images to fit a specific frame.
* Apply a decorative border to an image.
* Make use of ICC colour profiles to provide accurate output.
* Send 16-bit data to the printer, to avoid "contouring" problems 
  in smooth gradients.
* Apply a handful of effecs to an image, including sharpening, 
  removing colour and adjusting colour temperature 
  (ideal for cooling or warming black-and-white prints).


%prep
%setup -q
%patch0 -p1 -b .paths
%patch1 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# install man page
install  -Dpm 0644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

desktop-file-validate %{buildroot}/%{_datadir}/applications/fotoprint.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS README ChangeLog COPYING 
%{_bindir}/*
%{_datadir}/applications/fotoprint.desktop
%{_datadir}/icons/hicolor/48x48/apps/fotoprint.png
%{_mandir}/man*/*


%changelog
* Wed Apr 15 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-6
- resolving summary, license
- added g++4.4 patch
- resolving timestamps
- new scriplets for icon cache

* Sat Mar 28 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-5
- resolved issue in .paths patch for resolving paths in Paths... dialogbox

* Wed Mar 25 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-4
- added .paths patch for resolving paths in Paths... dialogbox

* Mon Mar 23 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-3
- scriptlets added 

* Thu Mar 20 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-2
- added .desktop validation
- added man file

* Thu Mar 19 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:46:39 -0000	1.1
+++ .cvsignore	22 Apr 2009 08:05:57 -0000	1.2
@@ -0,0 +1 @@
+photoprint-0.4.0.tar.gz



From jreznik at fedoraproject.org  Wed Apr 22 08:13:21 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 22 Apr 2009 08:13:21 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-11 .cvsignore, 1.7,
	1.8 kde-plasma-runcommand.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090422081321.D0AAC70103@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11620

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
- update to 1.2
- translations removed (no need for them anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2009 10:41:47 -0000	1.7
+++ .cvsignore	22 Apr 2009 08:13:16 -0000	1.8
@@ -1 +1 @@
-91495-runcommand-1.1.tar.bz2
+91495-runcommand-1.2.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/kde-plasma-runcommand.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kde-plasma-runcommand.spec	10 Apr 2009 10:52:59 -0000	1.9
+++ kde-plasma-runcommand.spec	22 Apr 2009 08:13:16 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -36,19 +36,22 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files -f plasma_applet_runcommand.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
+- update to 1.2
+- translations removed (no need for them anymore)
+
 * Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
 - adds missing gettext BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2009 10:41:47 -0000	1.7
+++ sources	22 Apr 2009 08:13:16 -0000	1.8
@@ -1 +1 @@
-060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2
+1de91c97a2f83d58f114c4273fe39358  91495-runcommand-1.2.tar.bz2



From jreznik at fedoraproject.org  Wed Apr 22 08:18:14 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 22 Apr 2009 08:18:14 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.5,
	1.6 kde-plasma-runcommand.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090422081814.37BA070104@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13479

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
- update to 1.2
- translations removed (no need for them anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Apr 2009 10:49:20 -0000	1.5
+++ .cvsignore	22 Apr 2009 08:18:11 -0000	1.6
@@ -1 +1 @@
-91495-runcommand-1.1.tar.bz2
+91495-runcommand-1.2.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde-plasma-runcommand.spec	10 Apr 2009 11:03:36 -0000	1.6
+++ kde-plasma-runcommand.spec	22 Apr 2009 08:18:11 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -36,19 +36,22 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files -f plasma_applet_runcommand.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
+- update to 1.2
+- translations removed (no need for them anymore)
+
 * Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
 - adds missing gettext BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Apr 2009 10:49:20 -0000	1.6
+++ sources	22 Apr 2009 08:18:11 -0000	1.7
@@ -1 +1 @@
-060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2
+1de91c97a2f83d58f114c4273fe39358  91495-runcommand-1.2.tar.bz2



From akurtakov at fedoraproject.org  Wed Apr 22 08:18:31 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 22 Apr 2009 08:18:31 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-pde.build-add-package-build.patch, 1.11, 
	1.12 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.7,
	1.8 eclipse-addfragmentsforotherplatforms.patch, 1.8,
	1.9 eclipse-platform_build.patch, 1.1, 1.2 sources, 1.72,
	1.73 eclipse.spec, 1.637, 1.638 .cvsignore, 1.56, 1.57
Message-ID: <20090422081831.5A3AD70104@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13938/devel

Modified Files:
	eclipse-pde.build-add-package-build.patch 
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch 
	eclipse-addfragmentsforotherplatforms.patch 
	eclipse-platform_build.patch sources eclipse.spec .cvsignore 
Log Message:
- Update to newer I-build.
- Update fedora customization.
- Bump dependencies minimal versions.
- Fix update site functionality.
- Simplify jdt %%files section.

eclipse-pde.build-add-package-build.patch:

Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-pde.build-add-package-build.patch	19 Dec 2008 17:47:47 -0000	1.11
+++ eclipse-pde.build-add-package-build.patch	22 Apr 2009 08:18:29 -0000	1.12
@@ -68,7 +68,7 @@
 +    if [ "x$ERROR" != "xyes" ]; then
 +      if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
 +        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+        ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
++        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
 +      fi
 +    fi
 +  fi
@@ -102,7 +102,7 @@
 +    if [ "x$ERROR" != "xyes" ]; then
 +      if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
 +        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+        ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
++        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
 +      fi
 +    fi;
 +

eclipse-add-ppc64-sparc64-s390-s390x-2.patch:

Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch	13 Apr 2009 13:56:20 -0000	1.7
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch	22 Apr 2009 08:18:29 -0000	1.8
@@ -53,18 +53,18 @@
           os="solaris"
           ws="gtk"
 diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.orig	2009-04-13 15:04:47.000000000 +0200
-+++ ./features/org.eclipse.rcp.source/feature.xml	2009-04-13 15:07:51.000000000 +0200
+--- ./features/org.eclipse.rcp.source/feature.xml.orig	2009-04-17 16:05:51.000000000 +0200
++++ ./features/org.eclipse.rcp.source/feature.xml	2009-04-17 16:07:57.000000000 +0200
 @@ -49,7 +49,11 @@
- 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3539" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3539" os="linux" arch="x86" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3541a" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3541a" os="linux" arch="x86" ws="motif"  unpack="false"/>
  	<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.5.0.HEAD" os="linux" arch="ia64" ws="gtk"  unpack="false"/>
--	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
+-	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3541a" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
 +	<plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.5.0.v3539" os="linux" arch="ppc64" ws="gtk"  unpack="false"/>
 +	<plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.5.0.v3539" os="linux" arch="sparc" ws="gtk"  unpack="false"/>
 +	<plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.5.0.v3539" os="linux" arch="sparc64" ws="gtk"  unpack="false"/>
 +	<plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.5.0.v3539" os="linux" arch="alpha" ws="gtk"  unpack="false"/>
-+ 	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3539" os="qnx" arch="x86" ws="photon"  unpack="false"/>
++	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3541a" os="qnx" arch="x86" ws="photon"  unpack="false"/>
  	<plugin id="org.eclipse.rcp.source" version="3.4.0.v20080507"     unpack="false"/>
  	<plugin id="org.eclipse.core.contenttype.source" version="3.4.0.v20090302"     unpack="false"/>

eclipse-addfragmentsforotherplatforms.patch:

Index: eclipse-addfragmentsforotherplatforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-addfragmentsforotherplatforms.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-addfragmentsforotherplatforms.patch	14 Apr 2009 19:28:34 -0000	1.8
+++ eclipse-addfragmentsforotherplatforms.patch	22 Apr 2009 08:18:29 -0000	1.9
@@ -1,12 +1,12 @@
---- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments	2009-04-14 21:14:09.000000000 +0200
-+++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2009-04-14 21:22:53.000000000 +0200
+--- assemble.org.eclipse.sdk.linux.gtk.s390x.xml.orig	2009-04-17 16:10:31.000000000 +0200
++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2009-04-17 16:16:48.000000000 +0200
 @@ -205,6 +205,7 @@
  		<customGather dir="plugins/org.eclipse.update.scheduler" projectName="org.eclipse.update.scheduler_3.2.200.v20081127" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
  		<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.200.v20090213" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
  		<customGather dir="plugins/org.eclipse.ui.workbench.compatibility" projectName="org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
 +		<customGather dir="plugins/org.eclipse.core.filesystem.linux.s390x" projectName="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
  		<customGather dir="plugins/org.eclipse.core.variables" projectName="org.eclipse.core.variables_3.2.200.v20090302-1500" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
- 		<customGather dir="plugins/org.eclipse.ui.forms" projectName="org.eclipse.ui.forms_3.4.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ 		<customGather dir="plugins/org.eclipse.ui.forms" projectName="org.eclipse.ui.forms_3.4.0.v20090413" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
  		<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
 @@ -838,6 +839,10 @@
  		</antcall>

eclipse-platform_build.patch:

Index: eclipse-platform_build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-platform_build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-platform_build.patch	2 Apr 2009 08:12:56 -0000	1.1
+++ eclipse-platform_build.patch	22 Apr 2009 08:18:29 -0000	1.2
@@ -1,6 +1,6 @@
---- features/org.eclipse.platform/build.xml.orig	2009-04-02 08:59:23.000000000 +0200
-+++ features/org.eclipse.platform/build.xml	2009-04-02 09:03:36.000000000 +0200
-@@ -176,6 +176,11 @@
+--- features/org.eclipse.platform/build.xml.orig	2009-04-17 16:21:20.000000000 +0200
++++ features/org.eclipse.platform/build.xml	2009-04-17 16:26:21.000000000 +0200
+@@ -166,6 +166,11 @@
  			<property name="ws" value="win32"/>
  			<property name="os" value="win32"/>
  		</ant>
@@ -9,6 +9,6 @@
 +			<property name="ws" value="win32"/>
 +			<property name="os" value="win32"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.intro" target="${target}">
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.cheatsheets" target="${target}">
  			<property name="arch" value="x86"/>
  			<property name="ws" value="win32"/>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	2 Apr 2009 08:12:56 -0000	1.72
+++ sources	22 Apr 2009 08:18:29 -0000	1.73
@@ -1,7 +1,6 @@
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
-43c2aa722a815c61706549d28786d134  eclipse-ecj-gcj.tar.bz2
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
 3e031f11b0de3f15b00233deec2b19f3  eclipse-3.4.2-testframework.tar.bz2
-c36f10cac0ab63f5da28e07a6b1bae9f  org.fedoraproject.ide.platform-3.4.2.zip
-2d40313df780077e45b0fca5646470be  eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+1c3bb4e384cbc5f4e2b7275238a010f7  eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+9a644442e9b40b0311bee190701e77f5  org.fedoraproject.ide.platform-3.5.0.zip


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- eclipse.spec	14 Apr 2009 19:28:34 -0000	1.637
+++ eclipse.spec	22 Apr 2009 08:18:30 -0000	1.638
@@ -10,7 +10,7 @@
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
-%define swtver          3.5.0.v3539
+%define swtver          3.5.0.v3541a
 %define initialize      1
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -29,11 +29,11 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.3%{?dist}
+Release:        0.2.4%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        http://download.eclipse.org/eclipse/downloads/drops/I20090401-1325/eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/I20090416-1053/eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
 Source2:        %{name}.desktop
 #Source3:        eclipse.in
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
@@ -41,7 +41,7 @@
 # cd branding
 # zip -r org.fedoraproject.ide.platform-3.4.2.zip \
 #   org.fedoraproject.ide.platform
-Source4:        org.fedoraproject.ide.platform-3.4.2.zip
+Source4:        org.fedoraproject.ide.platform-%{version}.zip
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
 #   -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
 # cd branding
@@ -182,7 +182,7 @@
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
 BuildRequires:  icu4j-eclipse >= 4.0.1
-BuildRequires:  tomcat5-jasper-eclipse >= 5.5.26-1.5
+BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
 BuildRequires:  tomcat6-servlet-2.5-api
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
@@ -204,7 +204,7 @@
 BuildRequires: regexp
 BuildRequires: junit >= 3.8.1-3jpp
 BuildRequires: junit4
-BuildRequires: sat4j >= 2.0.3
+BuildRequires: sat4j >= 2.1.0
 BuildRequires: objectweb-asm
 
 %description
@@ -254,14 +254,14 @@
 Requires: jakarta-commons-el >= 1.0-9
 Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: mx4j >= 2.1
-Requires: tomcat5-jasper-eclipse >= 5.5.26-1.5
+Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api > 6.0.18-9.1
 Requires: jetty >= 5.1.14-1.6
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
 Requires: regexp
-Requires: sat4j >= 2.0.3
+Requires: sat4j >= 2.1.0
 Provides: eclipse-cvs-client = 1:%{version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 
@@ -1043,6 +1043,11 @@
 rm -r $sdkDir/configuration/org.eclipse.update
 
 %if %{initialize}
+#Find better way to fix this
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1051,9 +1056,6 @@
 #
 # Extract .so files
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
-
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 pushd $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins  $RPM_BUILD_ROOT/dropins
 mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
@@ -1576,27 +1578,6 @@
 %defattr(-,root,root)
 %{_bindir}/efj
 %{_libdir}/%{name}/dropins/jdt
-#%{_libdir}/%{name}/dropins/jdt/content.xml
-%{_libdir}/%{name}/dropins/jdt/features
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*
 
 %files pde
 %defattr(-,root,root)
@@ -1606,6 +1587,13 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Apr 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.4
+- Update to newer I-build.
+- Update fedora customization.
+- Bump dependencies minimal versions.
+- Fix update site functionality.
+- Simplify jdt %%files section.
+
 * Tue Apr 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.3
 - Rediff patch30.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	2 Apr 2009 08:12:57 -0000	1.56
+++ .cvsignore	22 Apr 2009 08:18:30 -0000	1.57
@@ -10,3 +10,5 @@
 eclipse-3.4.2-testframework.tar.bz2
 org.fedoraproject.ide.platform-3.4.2.zip
 eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+org.fedoraproject.ide.platform-3.5.0.zip



From grof at fedoraproject.org  Wed Apr 22 08:19:25 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Wed, 22 Apr 2009 08:19:25 +0000 (UTC)
Subject: rpms/photoprint/F-10 import.log, NONE,
	1.1 photoprint-0.4.0-g++44.patch, NONE,
	1.1 photoprint-0.4.0-paths.patch, NONE, 1.1 photoprint.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2
Message-ID: <20090422081925.57C0F700FE@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14453/F-10

Modified Files:
	.cvsignore 
Added Files:
	import.log photoprint-0.4.0-g++44.patch 
	photoprint-0.4.0-paths.patch photoprint.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-0_4_0-6_fc11:F-10:photoprint-0.4.0-6.fc11.src.rpm:1240388490

photoprint-0.4.0-g++44.patch:

--- NEW FILE photoprint-0.4.0-g++44.patch ---
--- photoprint-0.4.0/support/layoutrectangle.h.debug	2008-10-19 03:14:20.000000000 +0900
+++ photoprint-0.4.0/support/layoutrectangle.h	2009-04-15 02:32:29.000000000 +0900
@@ -1,6 +1,8 @@
 #ifndef LAYOUTRECTANGLE_H
 #define LAYOUTRECTANGLE_H
 
+#include <cstdio>
+
 enum PP_ROTATION
 {
 	PP_ROTATION_AUTO,
--- photoprint-0.4.0/support/pathsupport.cpp.debug	2008-11-19 03:54:03.000000000 +0900
+++ photoprint-0.4.0/support/pathsupport.cpp	2009-04-15 02:33:42.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <iostream>
+#include <cstdio>
 #include <string.h>
 #include <glib.h>
 
--- photoprint-0.4.0/support/searchpath.cpp.debug	2008-11-20 09:06:23.000000000 +0900
+++ photoprint-0.4.0/support/searchpath.cpp	2009-04-15 02:52:58.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 #include <iostream>
 #include <sys/stat.h>
 #include <unistd.h>
--- photoprint-0.4.0/support/tempfile.cpp.debug	2008-10-13 06:49:26.000000000 +0900
+++ photoprint-0.4.0/support/tempfile.cpp	2009-04-15 02:36:56.000000000 +0900
@@ -11,6 +11,7 @@
 */
 
 #include <iostream>
+#include <cstdio>
 
 #include <stdlib.h>
 #include <string.h>

photoprint-0.4.0-paths.patch:

--- NEW FILE photoprint-0.4.0-paths.patch ---
--- photoprint-0.4.0/photoprint_state.cpp.orig	2009-01-17 20:08:37.000000000 +0100
+++ photoprint-0.4.0/photoprint_state.cpp	2009-03-27 22:08:13.000000000 +0100
@@ -74,6 +74,8 @@
 	PPPathDBHandler(ConfigFile *file,const char *section,ConfigDB *db,PhotoPrint_State &state)
 		: ConfigDBHandler(file,section,db), db(db), state(state)
 	{
+               state.bordersearchpath.AddPath(db->FindString("BorderPath"));
+               state.backgroundsearchpath.AddPath(db->FindString("BackgroundPath"));
 	}
 	virtual ~PPPathDBHandler()
 	{


--- NEW FILE photoprint.spec ---
Name:           photoprint
Version:        0.4.0
Release:        6%{?dist}
Summary:        Utility for printing digital photographs

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
Patch0:         photoprint-0.4.0-paths.patch
Patch1:         photoprint-0.4.0-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gutenprint-devel
BuildRequires:  lcms-devel
BuildRequires:  netpbm-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libtiff-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
PhotoPrint is a utility designed to assist in the process 
of printing digital photographs.
PhotoPrint can do the following:

* Print photographs 1-up, 2-up, 4-up or with any user-selectable
  number of rows and columns.
* Create posters, split over several pages.
* Arrange images into a sort of Carousel, fading from one to 
  another.  (Ideal for CD labels)
* Crop images to fit a specific frame.
* Apply a decorative border to an image.
* Make use of ICC colour profiles to provide accurate output.
* Send 16-bit data to the printer, to avoid "contouring" problems 
  in smooth gradients.
* Apply a handful of effecs to an image, including sharpening, 
  removing colour and adjusting colour temperature 
  (ideal for cooling or warming black-and-white prints).


%prep
%setup -q
%patch0 -p1 -b .paths
%patch1 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# install man page
install  -Dpm 0644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

desktop-file-validate %{buildroot}/%{_datadir}/applications/fotoprint.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS README ChangeLog COPYING 
%{_bindir}/*
%{_datadir}/applications/fotoprint.desktop
%{_datadir}/icons/hicolor/48x48/apps/fotoprint.png
%{_mandir}/man*/*


%changelog
* Wed Apr 15 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-6
- resolving summary, license
- added g++4.4 patch
- resolving timestamps
- new scriplets for icon cache

* Sat Mar 28 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-5
- resolved issue in .paths patch for resolving paths in Paths... dialogbox

* Wed Mar 25 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-4
- added .paths patch for resolving paths in Paths... dialogbox

* Mon Mar 23 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-3
- scriptlets added 

* Thu Mar 20 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-2
- added .desktop validation
- added man file

* Thu Mar 19 2009 Zarko <zarko.pintar at gmail.com> - 0.4.0-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:46:39 -0000	1.1
+++ .cvsignore	22 Apr 2009 08:19:23 -0000	1.2
@@ -0,0 +1 @@
+photoprint-0.4.0.tar.gz



From mmaslano at fedoraproject.org  Wed Apr 22 08:30:04 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 22 Apr 2009 08:30:04 +0000 (UTC)
Subject: rpms/perl-Test-Most/F-11 perl-Test-Most.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422083004.DE75B700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Test-Most/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17431

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Most.spec 
Log Message:
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.21-3
- remove unnecesarry requirements



--- NEW FILE perl-Test-Most.spec ---
Name:           perl-Test-Most
Version:        0.21
Release:        3%{?dist}
Summary:        Perl module with test functions and features
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Most/
Source0:        http://www.cpan.org/authors/id/O/OV/OVID/Test-Most-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Data::Dumper::Names) >= 0.03
BuildRequires:  perl(Exception::Class) >= 1.14
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Deep)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::Harness) >= 3.07
BuildRequires:  perl(Test::Simple) >= 0.82
BuildRequires:  perl(Test::Warn) >= 0.1
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Most commonly needed test functions and features. This module provides you with 
the most commonly used testing functions and gives you a bit more fine-grained 
control over your test suite.

%prep
%setup -q -n Test-Most-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr  6 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.21-3
- remove unnecesarry requirements

* Thu Apr 02 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.21-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Most/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:58:39 -0000	1.1
+++ .cvsignore	22 Apr 2009 08:30:03 -0000	1.2
@@ -0,0 +1 @@
+Test-Most-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Most/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:58:40 -0000	1.1
+++ sources	22 Apr 2009 08:30:03 -0000	1.2
@@ -0,0 +1 @@
+8066a15a40154d011296b33ce02a1cf8  Test-Most-0.21.tar.gz



From mmaslano at fedoraproject.org  Wed Apr 22 08:38:45 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 22 Apr 2009 08:38:45 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/devel perl-Data-Dumper-Names.spec, 1.2, 
	1.3
Message-ID: <20090422083845.2AAF8700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19565

Modified Files:
	perl-Data-Dumper-Names.spec 
Log Message:
* Wed Apr 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-4
- added BR Test::More for tests, rebuild is not needed now



Index: perl-Data-Dumper-Names.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel/perl-Data-Dumper-Names.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Dumper-Names.spec	15 Apr 2009 07:29:50 -0000	1.2
+++ perl-Data-Dumper-Names.spec	22 Apr 2009 08:38:13 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           perl-Data-Dumper-Names
 Version:        0.03
-Release:        3%{?dist}
-Summary:        Data::Dumper::Names Perl module
+Release:        4%{?dist}
+Summary:        Data::Dumper like module for printing and eval data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Dumper-Names/
@@ -11,12 +11,13 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(PadWalker) >= 0.13
 # Cyclic dependencies on Test::More
-#BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More)
 Requires:       perl(PadWalker) >= 0.13
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-Module similar to Data::Dumper but variables are dumped with names and without
+The essential module Data::Dumper is used for printing perl data structures or 
+suitable for eval. Data::Dumper::Names dump variables with names and without
 source filter. 
 
 %prep
@@ -47,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-4
+- added BR Test::More for tests, rebuild is not needed now
+
 * Wed Apr 15 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-3
 - tests need Test::Most, which are dependent on this package
 



From jreznik at fedoraproject.org  Wed Apr 22 08:41:15 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 22 Apr 2009 08:41:15 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-9 .cvsignore, 1.5,
	1.6 kde-plasma-runcommand.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090422084115.E868B700FE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20151

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
- update to 1.2
- translations removed (no need for them anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Apr 2009 11:05:40 -0000	1.5
+++ .cvsignore	22 Apr 2009 08:40:41 -0000	1.6
@@ -1 +1 @@
-91495-runcommand-1.1.tar.bz2
+91495-runcommand-1.2.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/kde-plasma-runcommand.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde-plasma-runcommand.spec	10 Apr 2009 11:05:41 -0000	1.6
+++ kde-plasma-runcommand.spec	22 Apr 2009 08:40:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -36,19 +36,22 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang plasma_applet_runcommand
 
 %clean
 rm -rf %{buildroot}
 
 
-%files -f plasma_applet_runcommand.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING README CHANGELOG TODO
 %{_kde4_libdir}/kde4/plasma_applet_runcommand.so
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 1.2-1
+- update to 1.2
+- translations removed (no need for them anymore)
+
 * Fri Apr 10 2009 Jaroslav Reznik <jreznik at redhat.com> 1.1-2
 - adds missing gettext BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Apr 2009 11:05:41 -0000	1.6
+++ sources	22 Apr 2009 08:40:41 -0000	1.7
@@ -1 +1 @@
-060e03f38dafcdf146f18201ca91c66a  91495-runcommand-1.1.tar.bz2
+1de91c97a2f83d58f114c4273fe39358  91495-runcommand-1.2.tar.bz2



From pghmcfc at fedoraproject.org  Wed Apr 22 08:43:15 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 22 Apr 2009 08:43:15 +0000 (UTC)
Subject: rpms/gtk+/EL-5 dead.package, NONE, 1.1 gtk+-1.2.10-ahiguti.patch,
	1.1, NONE gtk+-1.2.10-alignment.patch, 1.1,
	NONE gtk+-1.2.10-bellvolume.patch, 1.1,
	NONE gtk+-1.2.10-clistfocusrow.patch, 1.1,
	NONE gtk+-1.2.10-ctext.patch, 1.1,
	NONE gtk+-1.2.10-deletedir.patch, 1.1,
	NONE gtk+-1.2.10-dndorder.patch, 1.1,
	NONE gtk+-1.2.10-encoding.patch, 1.1,
	NONE gtk+-1.2.10-expose.patch, 1.1, NONE gtk+-1.2.10-focus.patch,
	1.1, NONE gtk+-1.2.10-fontwarning.patch, 1.1,
	NONE gtk+-1.2.10-gtkgdkdep.patch, 1.1,
	NONE gtk+-1.2.10-kpenter.patch, 1.1,
	NONE gtk+-1.2.10-libtool.patch, 1.1,
	NONE gtk+-1.2.10-localecrash.patch, 1.1,
	NONE gtk+-1.2.10-missingchar.patch, 1.1,
	NONE gtk+-1.2.10-multilib.patch, 1.2,
	NONE gtk+-1.2.10-no_undefined.patch, 1.1,
	NONE gtk+-1.2.10-pixmapref.patch, 1.1,
	NONE gtk+-1.2.10-ppc64.patch, 1.1,
	NONE gtk+-1.2.10-themeswitch.patch, 1.1,
	NONE gtk+-1.2.10-troughpaint.patch, 1.1,
	NONE gtk+-1.2.10-ukfont.patch, 1.1,
	NONE gtk+-1.2.10-unused-deps.patch, 1.1,
	NONE gtk+-1.2.10-utf8fontset.patch, 1.1,
	NONE gtk+-1.2.8-wrap-alnum.patch, 1.1,
	NONE gtk+-underquoted.patch, 1.1, NONE gtk+.spec, 1.6,
	NONE gtkrc-default, 1.1, NONE gtkrc.ja.utf8, 1.1,
	NONE gtkrc.ko.utf8, 1.1, NONE gtkrc.zh_CN.utf8, 1.1,
	NONE gtkrc.zh_TW.utf8, 1.1, NONE
Message-ID: <20090422084315.D1BD6700FE@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtk+/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20784

Added Files:
	dead.package 
Removed Files:
	gtk+-1.2.10-ahiguti.patch gtk+-1.2.10-alignment.patch 
	gtk+-1.2.10-bellvolume.patch gtk+-1.2.10-clistfocusrow.patch 
	gtk+-1.2.10-ctext.patch gtk+-1.2.10-deletedir.patch 
	gtk+-1.2.10-dndorder.patch gtk+-1.2.10-encoding.patch 
	gtk+-1.2.10-expose.patch gtk+-1.2.10-focus.patch 
	gtk+-1.2.10-fontwarning.patch gtk+-1.2.10-gtkgdkdep.patch 
	gtk+-1.2.10-kpenter.patch gtk+-1.2.10-libtool.patch 
	gtk+-1.2.10-localecrash.patch gtk+-1.2.10-missingchar.patch 
	gtk+-1.2.10-multilib.patch gtk+-1.2.10-no_undefined.patch 
	gtk+-1.2.10-pixmapref.patch gtk+-1.2.10-ppc64.patch 
	gtk+-1.2.10-themeswitch.patch gtk+-1.2.10-troughpaint.patch 
	gtk+-1.2.10-ukfont.patch gtk+-1.2.10-unused-deps.patch 
	gtk+-1.2.10-utf8fontset.patch gtk+-1.2.8-wrap-alnum.patch 
	gtk+-underquoted.patch gtk+.spec gtkrc-default gtkrc.ja.utf8 
	gtkrc.ko.utf8 gtkrc.zh_CN.utf8 gtkrc.zh_TW.utf8 
Log Message:
This branch was created in error - gtk+ is included in RHEL 5 Client and Server


--- NEW FILE dead.package ---
This branch was created in error - gtk+ is included in RHEL 5 Client and Server.


--- gtk+-1.2.10-ahiguti.patch DELETED ---


--- gtk+-1.2.10-alignment.patch DELETED ---


--- gtk+-1.2.10-bellvolume.patch DELETED ---


--- gtk+-1.2.10-clistfocusrow.patch DELETED ---


--- gtk+-1.2.10-ctext.patch DELETED ---


--- gtk+-1.2.10-deletedir.patch DELETED ---


--- gtk+-1.2.10-dndorder.patch DELETED ---


--- gtk+-1.2.10-encoding.patch DELETED ---


--- gtk+-1.2.10-expose.patch DELETED ---


--- gtk+-1.2.10-focus.patch DELETED ---


--- gtk+-1.2.10-fontwarning.patch DELETED ---


--- gtk+-1.2.10-gtkgdkdep.patch DELETED ---


--- gtk+-1.2.10-kpenter.patch DELETED ---


--- gtk+-1.2.10-libtool.patch DELETED ---


--- gtk+-1.2.10-localecrash.patch DELETED ---


--- gtk+-1.2.10-missingchar.patch DELETED ---


--- gtk+-1.2.10-multilib.patch DELETED ---


--- gtk+-1.2.10-no_undefined.patch DELETED ---


--- gtk+-1.2.10-pixmapref.patch DELETED ---


--- gtk+-1.2.10-ppc64.patch DELETED ---


--- gtk+-1.2.10-themeswitch.patch DELETED ---


--- gtk+-1.2.10-troughpaint.patch DELETED ---


--- gtk+-1.2.10-ukfont.patch DELETED ---


--- gtk+-1.2.10-unused-deps.patch DELETED ---


--- gtk+-1.2.10-utf8fontset.patch DELETED ---


--- gtk+-1.2.8-wrap-alnum.patch DELETED ---


--- gtk+-underquoted.patch DELETED ---


--- gtk+.spec DELETED ---


--- gtkrc-default DELETED ---


--- gtkrc.ja.utf8 DELETED ---


--- gtkrc.ko.utf8 DELETED ---


--- gtkrc.zh_CN.utf8 DELETED ---


--- gtkrc.zh_TW.utf8 DELETED ---



From pghmcfc at fedoraproject.org  Wed Apr 22 08:48:05 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 22 Apr 2009 08:48:05 +0000 (UTC)
Subject: rpms/glib/EL-5 dead.package, NONE, 1.1 glib-1.2.10-gcc34.patch, 1.1,
	NONE glib-1.2.10-isowarning.patch, 1.1,
	NONE glib-1.2.10-multilib.patch, 1.1,
	NONE glib-1.2.10-no_undefined.patch, 1.1,
	NONE glib-1.2.10-underquoted.patch, 1.1,
	NONE glib-1.2.10-unused-dep.patch, 1.1, NONE glib.spec, 1.7, NONE
Message-ID: <20090422084805.3952D700FE@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22039

Added Files:
	dead.package 
Removed Files:
	glib-1.2.10-gcc34.patch glib-1.2.10-isowarning.patch 
	glib-1.2.10-multilib.patch glib-1.2.10-no_undefined.patch 
	glib-1.2.10-underquoted.patch glib-1.2.10-unused-dep.patch 
	glib.spec 
Log Message:
This branch was created in error - glib is included in RHEL 5 Client and Server


--- NEW FILE dead.package ---
This branch was created in error - glib is included in RHEL 5 Client and Server.


--- glib-1.2.10-gcc34.patch DELETED ---


--- glib-1.2.10-isowarning.patch DELETED ---


--- glib-1.2.10-multilib.patch DELETED ---


--- glib-1.2.10-no_undefined.patch DELETED ---


--- glib-1.2.10-underquoted.patch DELETED ---


--- glib-1.2.10-unused-dep.patch DELETED ---


--- glib.spec DELETED ---



From kanarip at fedoraproject.org  Wed Apr 22 08:57:42 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 08:57:42 +0000 (UTC)
Subject: rpms/libvmime/F-11 import.log, NONE,
	1.1 libvmime-0.9.0-include_stdio.h.patch, NONE,
	1.1 libvmime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422085742.4A22B700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/libvmime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25686/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libvmime-0.9.0-include_stdio.h.patch libvmime.spec 
Log Message:
0.9.0-3


--- NEW FILE import.log ---
libvmime-0_9_0-3_fc11:F-11:libvmime-0.9.0-3.fc11.src.rpm:1240390609

libvmime-0.9.0-include_stdio.h.patch:

--- NEW FILE libvmime-0.9.0-include_stdio.h.patch ---
diff -ur libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp libvmime-0.9.0/src/platforms/posix/posixFile.cpp
--- libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp	2008-10-12 11:42:23.000000000 +0200
+++ libvmime-0.9.0/src/platforms/posix/posixFile.cpp	2009-04-04 01:49:21.286737472 +0200
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 


--- NEW FILE libvmime.spec ---
Name:           libvmime
Version:        0.9.0
Release:        3%{?dist}
Summary:        Powerful library for MIME messages and Internet messaging services
Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.vmime.org/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:         libvmime-0.9.0-include_stdio.h.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Documentation builds with inkscape :/
#BuildRequires:  inkscape
#BuildRequires:  texlive-latex

# Weird buildrequires, who needs /usr/sbin/sendmail during the build?
BuildRequires:  sendmail

BuildRequires:  libgsasl-devel
BuildRequires:  gnutls-devel

%description
VMime is a powerful C++ class library for working with MIME messages
and Internet messaging services like IMAP, POP or SMTP.

With VMime you can parse, generate and modify messages, and also
connect to store and transport services to receive or send messages
over the Internet. The library offers all the features to build a
complete mail client.

%package devel
Summary:        Development headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       libgsasl-devel
Requires:       gnutls-devel

%description    devel
This package contains development files for %{name}.

%package static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static library files for %{name}.

%prep
%setup -q
%patch0 -p1

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%{configure}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Docs are available online and are installed in the wrong location
rm -rf %{buildroot}/%{_datadir}/doc/vmime/

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/vmime/
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/vmime.pc

%files static
%defattr(-,root,root,-)
%{_libdir}/libvmime.a
%exclude %{_libdir}/%{name}.la

%changelog
* Fri Apr 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-3
- From feedback in review request (#494073, rsc)

* Tue Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-2
- From feedback in review request (#494073)

* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-1
- Initial Package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:33:11 -0000	1.1
+++ .cvsignore	22 Apr 2009 08:57:38 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:33:11 -0000	1.1
+++ sources	22 Apr 2009 08:57:39 -0000	1.2
@@ -0,0 +1 @@
+23feb9cff7ba3961c0693926e21448cf  libvmime-0.9.0.tar.bz2



From pvrabec at fedoraproject.org  Wed Apr 22 08:58:32 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 22 Apr 2009 08:58:32 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.3-lastlog.patch, NONE,
	1.1 shadow-utils.spec, 1.131, 1.132
Message-ID: <20090422085832.1D583700FE@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25940

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.1.3-lastlog.patch 
Log Message:
lastlog fix


shadow-4.1.3-lastlog.patch:

--- NEW FILE shadow-4.1.3-lastlog.patch ---
diff -up shadow-4.1.3.1/src/lastlog.c.lastlog shadow-4.1.3.1/src/lastlog.c
--- shadow-4.1.3.1/src/lastlog.c.lastlog	2009-04-22 10:29:53.000000000 +0200
+++ shadow-4.1.3.1/src/lastlog.c	2009-04-22 10:30:40.000000000 +0200
@@ -266,8 +266,7 @@ int main (int argc, char **argv)
 		exit (1);
 	}
 
-	print ();
-	/* Get the laslog size */
+	 /* Get the lastlog size */
 	if (fstat (fileno (lastlogfile), &statbuf) != 0) {
 		fprintf (stderr,
 		         _("lastlog: Cannot get the size of %s: %s\n"),
@@ -275,6 +274,7 @@ int main (int argc, char **argv)
 		exit (1);
 	}
 
+	print ();
 	fclose (lastlogfile);
 	exit (0);
 }


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- shadow-utils.spec	20 Apr 2009 09:47:31 -0000	1.131
+++ shadow-utils.spec	22 Apr 2009 08:58:31 -0000	1.132
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Source2: shadow-4.0.18.1-useradd
 Patch0: shadow-4.1.3-redhat.patch
 Patch1: shadow-4.1.3-goodname.patch
+Patch2: shadow-4.1.3-lastlog.patch
 License: BSD and GPLv2+
 Group: System Environment/Base
 BuildRequires: libselinux-devel >= 1.25.2-1
@@ -35,6 +36,7 @@
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
+%patch2 -p1 -b .lastlog
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -174,6 +176,9 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Wed Apr 22 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3.1-2
+- lastlog fix
+
 * Fri Apr 17 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3.1-1
 - upgrade
 



From kanarip at fedoraproject.org  Wed Apr 22 08:59:41 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 08:59:41 +0000 (UTC)
Subject: rpms/libvmime/devel import.log, NONE,
	1.1 libvmime-0.9.0-include_stdio.h.patch, NONE,
	1.1 libvmime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422085941.86765700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/libvmime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26566/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libvmime-0.9.0-include_stdio.h.patch libvmime.spec 
Log Message:
0.9.0-3


--- NEW FILE import.log ---
libvmime-0_9_0-3_fc11:HEAD:libvmime-0.9.0-3.fc11.src.rpm:1240390726

libvmime-0.9.0-include_stdio.h.patch:

--- NEW FILE libvmime-0.9.0-include_stdio.h.patch ---
diff -ur libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp libvmime-0.9.0/src/platforms/posix/posixFile.cpp
--- libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp	2008-10-12 11:42:23.000000000 +0200
+++ libvmime-0.9.0/src/platforms/posix/posixFile.cpp	2009-04-04 01:49:21.286737472 +0200
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 


--- NEW FILE libvmime.spec ---
Name:           libvmime
Version:        0.9.0
Release:        3%{?dist}
Summary:        Powerful library for MIME messages and Internet messaging services
Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.vmime.org/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:         libvmime-0.9.0-include_stdio.h.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Documentation builds with inkscape :/
#BuildRequires:  inkscape
#BuildRequires:  texlive-latex

# Weird buildrequires, who needs /usr/sbin/sendmail during the build?
BuildRequires:  sendmail

BuildRequires:  libgsasl-devel
BuildRequires:  gnutls-devel

%description
VMime is a powerful C++ class library for working with MIME messages
and Internet messaging services like IMAP, POP or SMTP.

With VMime you can parse, generate and modify messages, and also
connect to store and transport services to receive or send messages
over the Internet. The library offers all the features to build a
complete mail client.

%package devel
Summary:        Development headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       libgsasl-devel
Requires:       gnutls-devel

%description    devel
This package contains development files for %{name}.

%package static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static library files for %{name}.

%prep
%setup -q
%patch0 -p1

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%{configure}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Docs are available online and are installed in the wrong location
rm -rf %{buildroot}/%{_datadir}/doc/vmime/

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/vmime/
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/vmime.pc

%files static
%defattr(-,root,root,-)
%{_libdir}/libvmime.a
%exclude %{_libdir}/%{name}.la

%changelog
* Fri Apr 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-3
- From feedback in review request (#494073, rsc)

* Tue Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-2
- From feedback in review request (#494073)

* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-1
- Initial Package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:33:11 -0000	1.1
+++ .cvsignore	22 Apr 2009 08:59:39 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:33:11 -0000	1.1
+++ sources	22 Apr 2009 08:59:40 -0000	1.2
@@ -0,0 +1 @@
+23feb9cff7ba3961c0693926e21448cf  libvmime-0.9.0.tar.bz2



From kanarip at fedoraproject.org  Wed Apr 22 09:01:34 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 09:01:34 +0000 (UTC)
Subject: rpms/libvmime/F-10 import.log, NONE,
	1.1 libvmime-0.9.0-include_stdio.h.patch, NONE,
	1.1 libvmime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422090134.BB91A700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/libvmime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27233/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libvmime-0.9.0-include_stdio.h.patch libvmime.spec 
Log Message:
0.9.0-3


--- NEW FILE import.log ---
libvmime-0_9_0-3_fc11:F-10:libvmime-0.9.0-3.fc11.src.rpm:1240390835

libvmime-0.9.0-include_stdio.h.patch:

--- NEW FILE libvmime-0.9.0-include_stdio.h.patch ---
diff -ur libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp libvmime-0.9.0/src/platforms/posix/posixFile.cpp
--- libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp	2008-10-12 11:42:23.000000000 +0200
+++ libvmime-0.9.0/src/platforms/posix/posixFile.cpp	2009-04-04 01:49:21.286737472 +0200
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 


--- NEW FILE libvmime.spec ---
Name:           libvmime
Version:        0.9.0
Release:        3%{?dist}
Summary:        Powerful library for MIME messages and Internet messaging services
Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.vmime.org/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:         libvmime-0.9.0-include_stdio.h.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Documentation builds with inkscape :/
#BuildRequires:  inkscape
#BuildRequires:  texlive-latex

# Weird buildrequires, who needs /usr/sbin/sendmail during the build?
BuildRequires:  sendmail

BuildRequires:  libgsasl-devel
BuildRequires:  gnutls-devel

%description
VMime is a powerful C++ class library for working with MIME messages
and Internet messaging services like IMAP, POP or SMTP.

With VMime you can parse, generate and modify messages, and also
connect to store and transport services to receive or send messages
over the Internet. The library offers all the features to build a
complete mail client.

%package devel
Summary:        Development headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       libgsasl-devel
Requires:       gnutls-devel

%description    devel
This package contains development files for %{name}.

%package static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static library files for %{name}.

%prep
%setup -q
%patch0 -p1

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%{configure}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Docs are available online and are installed in the wrong location
rm -rf %{buildroot}/%{_datadir}/doc/vmime/

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/vmime/
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/vmime.pc

%files static
%defattr(-,root,root,-)
%{_libdir}/libvmime.a
%exclude %{_libdir}/%{name}.la

%changelog
* Fri Apr 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-3
- From feedback in review request (#494073, rsc)

* Tue Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-2
- From feedback in review request (#494073)

* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-1
- Initial Package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:33:11 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:01:28 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:33:11 -0000	1.1
+++ sources	22 Apr 2009 09:01:29 -0000	1.2
@@ -0,0 +1 @@
+23feb9cff7ba3961c0693926e21448cf  libvmime-0.9.0.tar.bz2



From kanarip at fedoraproject.org  Wed Apr 22 09:03:26 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 09:03:26 +0000 (UTC)
Subject: rpms/libvmime/F-9 import.log, NONE,
	1.1 libvmime-0.9.0-include_stdio.h.patch, NONE,
	1.1 libvmime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422090326.80CFE700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/libvmime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28090/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libvmime-0.9.0-include_stdio.h.patch libvmime.spec 
Log Message:
0.9.0-3


--- NEW FILE import.log ---
libvmime-0_9_0-3_fc11:F-9:libvmime-0.9.0-3.fc11.src.rpm:1240390949

libvmime-0.9.0-include_stdio.h.patch:

--- NEW FILE libvmime-0.9.0-include_stdio.h.patch ---
diff -ur libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp libvmime-0.9.0/src/platforms/posix/posixFile.cpp
--- libvmime-0.9.0.orig/src/platforms/posix/posixFile.cpp	2008-10-12 11:42:23.000000000 +0200
+++ libvmime-0.9.0/src/platforms/posix/posixFile.cpp	2009-04-04 01:49:21.286737472 +0200
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 


--- NEW FILE libvmime.spec ---
Name:           libvmime
Version:        0.9.0
Release:        3%{?dist}
Summary:        Powerful library for MIME messages and Internet messaging services
Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.vmime.org/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:         libvmime-0.9.0-include_stdio.h.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Documentation builds with inkscape :/
#BuildRequires:  inkscape
#BuildRequires:  texlive-latex

# Weird buildrequires, who needs /usr/sbin/sendmail during the build?
BuildRequires:  sendmail

BuildRequires:  libgsasl-devel
BuildRequires:  gnutls-devel

%description
VMime is a powerful C++ class library for working with MIME messages
and Internet messaging services like IMAP, POP or SMTP.

With VMime you can parse, generate and modify messages, and also
connect to store and transport services to receive or send messages
over the Internet. The library offers all the features to build a
complete mail client.

%package devel
Summary:        Development headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       libgsasl-devel
Requires:       gnutls-devel

%description    devel
This package contains development files for %{name}.

%package static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}

%description    static
This package contains static library files for %{name}.

%prep
%setup -q
%patch0 -p1

%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%{configure}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Docs are available online and are installed in the wrong location
rm -rf %{buildroot}/%{_datadir}/doc/vmime/

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/vmime/
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/vmime.pc

%files static
%defattr(-,root,root,-)
%{_libdir}/libvmime.a
%exclude %{_libdir}/%{name}.la

%changelog
* Fri Apr 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-3
- From feedback in review request (#494073, rsc)

* Tue Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-2
- From feedback in review request (#494073)

* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.0-1
- Initial Package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:33:11 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:03:24 -0000	1.2
@@ -0,0 +1 @@
+libvmime-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvmime/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:33:11 -0000	1.1
+++ sources	22 Apr 2009 09:03:24 -0000	1.2
@@ -0,0 +1 @@
+23feb9cff7ba3961c0693926e21448cf  libvmime-0.9.0.tar.bz2



From kanarip at fedoraproject.org  Wed Apr 22 09:04:13 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 09:04:13 +0000 (UTC)
Subject: rpms/rubygem-ferret/devel import.log, NONE, 1.1 rubygem-ferret.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422090414.79132700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ferret/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28365/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ferret.spec 
Log Message:
0.11.6-9


--- NEW FILE import.log ---
rubygem-ferret-0_11_6-9_fc11:HEAD:rubygem-ferret-0.11.6-9.fc11.src.rpm:1240390995


--- NEW FILE rubygem-ferret.spec ---
%define     gemdir      %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define     gemname     ferret
%define     geminstdir  %{gemdir}/gems/%{gemname}-%{version}

%{!?ruby_sitearch:  %define ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
%{!?ruby_sitelib:  %define ruby_sitelib   %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}

Summary:        Full-featured text search engine library
Name:           rubygem-%{gemname}
Version:        0.11.6
Release:        9%{?dist}
Group:          Development/Languages
# License from
# - MIT-LICENSE: MIT
# - ext/posh.c: 3-clause BSD
# - ext/q_parser.c: GPLv2+
License:        MIT and BSD
URL:            http://rubyforge.org/projects/ferret/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildRequires:  ruby-devel
BuildRequires:  rubygem(rake)
Provides:       rubygem(%{gemname}) = %{version}

%description
Ferret is a high-performance, full-featured text search
engine library written entirely in pure Ruby (with an
optional C extension). It is inspired by the Java Lucene
Project.

%package    doc
Summary:    Documentation for %{name}
Group:      Documentation
Requires:   %{name} = %{version}-%{release}

%description    doc
This package contains documentation for %{name}.

#%package devel
#Requires:       rubygem-%{gemname} = %{version}-%{release}
#Group:          Development/Languages
#Summary:        Development files for rubygem-ferret

#%description devel
#Ferret is a high-performance, full-featured text search
#engine library written entirely in pure Ruby (with an
#optional C extension). It is inspired by the Java Lucene
#Project. These are the devel files.

%prep
%setup -q -c -T

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

install -d -m0755 %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/ferret_ext.so %{buildroot}%{ruby_sitearch}

# You know ferret_ext.so needs to be 755 for find-debuginfo.sh to find it
chmod 0755 %{buildroot}%{ruby_sitearch}/ferret_ext.so

rm -rf %{buildroot}%{geminstdir}/ext
mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin

%check
# Tests fail on ppc64, so make it fail softly
pushd .%{geminstdir}
rake test_units || :

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/MIT-LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%doc %{geminstdir}/TUTORIAL
%{_bindir}/ferret-browser
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/bin
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{ruby_sitearch}/ferret_ext.so

%files doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Apr 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-9
- Update from comments in #468597
- Update to reflect new package guidelines

* Wed Oct 29 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-7
- Adjust license tag for package (#468597)
- Adjust Source0 URL (#468597)
- Make sure that the gem installation dir itself is owned by this package (#468597)

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-6
- Majorly revise packaging strategy (#468597)
- Found all licenses in each of the files
- Include license file

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-2
- Better use of macros
- rpmlint now silent

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:18:29 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:04:11 -0000	1.2
@@ -0,0 +1 @@
+ferret-0.11.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:18:29 -0000	1.1
+++ sources	22 Apr 2009 09:04:11 -0000	1.2
@@ -0,0 +1 @@
+f26e531d3c0da085d7461a3648e2974f  ferret-0.11.6.gem



From mmaslano at fedoraproject.org  Wed Apr 22 09:06:10 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 22 Apr 2009 09:06:10 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/F-10 .cvsignore, 1.6, 1.7 perl-DBD-SQLite.spec,
	1.24, 1.25 sources, 1.6, 1.7
Message-ID: <20090422090610.460A9700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29108

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Log Message:
* Mon Apr 20 2009 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
- update to the latest version, change BR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Dec 2007 19:44:47 -0000	1.6
+++ .cvsignore	22 Apr 2009 09:05:37 -0000	1.7
@@ -1 +1 @@
-DBD-SQLite-1.14.tar.gz
+DBD-SQLite-1.23.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-10/perl-DBD-SQLite.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-DBD-SQLite.spec	20 Apr 2009 07:22:41 -0000	1.24
+++ perl-DBD-SQLite.spec	22 Apr 2009 09:05:38 -0000	1.25
@@ -9,14 +9,15 @@
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl-DBI >= 1.03
+BuildRequires:  perl-DBI >= 1.57
 # if sqlite >= 3.1.3 then
 #   perl-DBD-SQLite uses the external library
 # else
 #   perl-DBD-SQLite is self-contained (uses the sqlite local copy)
-BuildRequires:  sqlite-devel
+#BuildRequires:  sqlite-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::Most)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -66,7 +67,7 @@
 
 %changelog
 * Mon Apr 20 2009 Marcela Maslanova <mmaslano at redhat.com> 1.23-1
-- update to the latest version
+- update to the latest version, change BR
 
 * Mon Jun  2 2008 Marcela Maslanova <mmaslano at redhat.com> 1.14-8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Dec 2007 19:44:47 -0000	1.6
+++ sources	22 Apr 2009 09:05:38 -0000	1.7
@@ -1 +1 @@
-78a89cc8fd46bb2a5d537433dcccc8e6  DBD-SQLite-1.14.tar.gz
+3fb6d567a507b4f347d56a6ba38966d0  DBD-SQLite-1.23.tar.gz



From kanarip at fedoraproject.org  Wed Apr 22 09:06:31 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 09:06:31 +0000 (UTC)
Subject: rpms/rubygem-ferret/F-11 import.log, NONE, 1.1 rubygem-ferret.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422090631.15F57700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ferret/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29200/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ferret.spec 
Log Message:
0.11.6-9


--- NEW FILE import.log ---
rubygem-ferret-0_11_6-9_fc11:F-11:rubygem-ferret-0.11.6-9.fc11.src.rpm:1240391101


--- NEW FILE rubygem-ferret.spec ---
%define     gemdir      %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define     gemname     ferret
%define     geminstdir  %{gemdir}/gems/%{gemname}-%{version}

%{!?ruby_sitearch:  %define ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
%{!?ruby_sitelib:  %define ruby_sitelib   %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}

Summary:        Full-featured text search engine library
Name:           rubygem-%{gemname}
Version:        0.11.6
Release:        9%{?dist}
Group:          Development/Languages
# License from
# - MIT-LICENSE: MIT
# - ext/posh.c: 3-clause BSD
# - ext/q_parser.c: GPLv2+
License:        MIT and BSD
URL:            http://rubyforge.org/projects/ferret/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildRequires:  ruby-devel
BuildRequires:  rubygem(rake)
Provides:       rubygem(%{gemname}) = %{version}

%description
Ferret is a high-performance, full-featured text search
engine library written entirely in pure Ruby (with an
optional C extension). It is inspired by the Java Lucene
Project.

%package    doc
Summary:    Documentation for %{name}
Group:      Documentation
Requires:   %{name} = %{version}-%{release}

%description    doc
This package contains documentation for %{name}.

#%package devel
#Requires:       rubygem-%{gemname} = %{version}-%{release}
#Group:          Development/Languages
#Summary:        Development files for rubygem-ferret

#%description devel
#Ferret is a high-performance, full-featured text search
#engine library written entirely in pure Ruby (with an
#optional C extension). It is inspired by the Java Lucene
#Project. These are the devel files.

%prep
%setup -q -c -T

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

install -d -m0755 %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/ferret_ext.so %{buildroot}%{ruby_sitearch}

# You know ferret_ext.so needs to be 755 for find-debuginfo.sh to find it
chmod 0755 %{buildroot}%{ruby_sitearch}/ferret_ext.so

rm -rf %{buildroot}%{geminstdir}/ext
mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin

%check
# Tests fail on ppc64, so make it fail softly
pushd .%{geminstdir}
rake test_units || :

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/MIT-LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%doc %{geminstdir}/TUTORIAL
%{_bindir}/ferret-browser
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/bin
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{ruby_sitearch}/ferret_ext.so

%files doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Apr 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-9
- Update from comments in #468597
- Update to reflect new package guidelines

* Wed Oct 29 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-7
- Adjust license tag for package (#468597)
- Adjust Source0 URL (#468597)
- Make sure that the gem installation dir itself is owned by this package (#468597)

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-6
- Majorly revise packaging strategy (#468597)
- Found all licenses in each of the files
- Include license file

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-2
- Better use of macros
- rpmlint now silent

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:18:29 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:05:57 -0000	1.2
@@ -0,0 +1 @@
+ferret-0.11.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:18:29 -0000	1.1
+++ sources	22 Apr 2009 09:05:58 -0000	1.2
@@ -0,0 +1 @@
+f26e531d3c0da085d7461a3648e2974f  ferret-0.11.6.gem



From kanarip at fedoraproject.org  Wed Apr 22 09:08:22 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 09:08:22 +0000 (UTC)
Subject: rpms/rubygem-ferret/F-10 import.log, NONE, 1.1 rubygem-ferret.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422090822.F3A76700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ferret/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30068/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ferret.spec 
Log Message:
0.11.6-9


--- NEW FILE import.log ---
rubygem-ferret-0_11_6-9_fc11:F-10:rubygem-ferret-0.11.6-9.fc11.src.rpm:1240391243


--- NEW FILE rubygem-ferret.spec ---
%define     gemdir      %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define     gemname     ferret
%define     geminstdir  %{gemdir}/gems/%{gemname}-%{version}

%{!?ruby_sitearch:  %define ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
%{!?ruby_sitelib:  %define ruby_sitelib   %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}

Summary:        Full-featured text search engine library
Name:           rubygem-%{gemname}
Version:        0.11.6
Release:        9%{?dist}
Group:          Development/Languages
# License from
# - MIT-LICENSE: MIT
# - ext/posh.c: 3-clause BSD
# - ext/q_parser.c: GPLv2+
License:        MIT and BSD
URL:            http://rubyforge.org/projects/ferret/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildRequires:  ruby-devel
BuildRequires:  rubygem(rake)
Provides:       rubygem(%{gemname}) = %{version}

%description
Ferret is a high-performance, full-featured text search
engine library written entirely in pure Ruby (with an
optional C extension). It is inspired by the Java Lucene
Project.

%package    doc
Summary:    Documentation for %{name}
Group:      Documentation
Requires:   %{name} = %{version}-%{release}

%description    doc
This package contains documentation for %{name}.

#%package devel
#Requires:       rubygem-%{gemname} = %{version}-%{release}
#Group:          Development/Languages
#Summary:        Development files for rubygem-ferret

#%description devel
#Ferret is a high-performance, full-featured text search
#engine library written entirely in pure Ruby (with an
#optional C extension). It is inspired by the Java Lucene
#Project. These are the devel files.

%prep
%setup -q -c -T

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

install -d -m0755 %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/ferret_ext.so %{buildroot}%{ruby_sitearch}

# You know ferret_ext.so needs to be 755 for find-debuginfo.sh to find it
chmod 0755 %{buildroot}%{ruby_sitearch}/ferret_ext.so

rm -rf %{buildroot}%{geminstdir}/ext
mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin

%check
# Tests fail on ppc64, so make it fail softly
pushd .%{geminstdir}
rake test_units || :

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/MIT-LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%doc %{geminstdir}/TUTORIAL
%{_bindir}/ferret-browser
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/bin
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{ruby_sitearch}/ferret_ext.so

%files doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Apr 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-9
- Update from comments in #468597
- Update to reflect new package guidelines

* Wed Oct 29 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-7
- Adjust license tag for package (#468597)
- Adjust Source0 URL (#468597)
- Make sure that the gem installation dir itself is owned by this package (#468597)

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-6
- Majorly revise packaging strategy (#468597)
- Found all licenses in each of the files
- Include license file

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-2
- Better use of macros
- rpmlint now silent

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:18:29 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:08:19 -0000	1.2
@@ -0,0 +1 @@
+ferret-0.11.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:18:29 -0000	1.1
+++ sources	22 Apr 2009 09:08:19 -0000	1.2
@@ -0,0 +1 @@
+f26e531d3c0da085d7461a3648e2974f  ferret-0.11.6.gem



From kanarip at fedoraproject.org  Wed Apr 22 09:10:32 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 22 Apr 2009 09:10:32 +0000 (UTC)
Subject: rpms/rubygem-ferret/F-9 import.log, NONE, 1.1 rubygem-ferret.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422091032.13108700FE@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ferret/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30702/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ferret.spec 
Log Message:
0.11.6-9


--- NEW FILE import.log ---
rubygem-ferret-0_11_6-9_fc11:F-9:rubygem-ferret-0.11.6-9.fc11.src.rpm:1240391353


--- NEW FILE rubygem-ferret.spec ---
%define     gemdir      %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define     gemname     ferret
%define     geminstdir  %{gemdir}/gems/%{gemname}-%{version}

%{!?ruby_sitearch:  %define ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
%{!?ruby_sitelib:  %define ruby_sitelib   %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}

Summary:        Full-featured text search engine library
Name:           rubygem-%{gemname}
Version:        0.11.6
Release:        9%{?dist}
Group:          Development/Languages
# License from
# - MIT-LICENSE: MIT
# - ext/posh.c: 3-clause BSD
# - ext/q_parser.c: GPLv2+
License:        MIT and BSD
URL:            http://rubyforge.org/projects/ferret/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildRequires:  ruby-devel
BuildRequires:  rubygem(rake)
Provides:       rubygem(%{gemname}) = %{version}

%description
Ferret is a high-performance, full-featured text search
engine library written entirely in pure Ruby (with an
optional C extension). It is inspired by the Java Lucene
Project.

%package    doc
Summary:    Documentation for %{name}
Group:      Documentation
Requires:   %{name} = %{version}-%{release}

%description    doc
This package contains documentation for %{name}.

#%package devel
#Requires:       rubygem-%{gemname} = %{version}-%{release}
#Group:          Development/Languages
#Summary:        Development files for rubygem-ferret

#%description devel
#Ferret is a high-performance, full-featured text search
#engine library written entirely in pure Ruby (with an
#optional C extension). It is inspired by the Java Lucene
#Project. These are the devel files.

%prep
%setup -q -c -T

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

install -d -m0755 %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/ferret_ext.so %{buildroot}%{ruby_sitearch}

# You know ferret_ext.so needs to be 755 for find-debuginfo.sh to find it
chmod 0755 %{buildroot}%{ruby_sitearch}/ferret_ext.so

rm -rf %{buildroot}%{geminstdir}/ext
mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin

%check
# Tests fail on ppc64, so make it fail softly
pushd .%{geminstdir}
rake test_units || :

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/MIT-LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%doc %{geminstdir}/TUTORIAL
%{_bindir}/ferret-browser
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/bin
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{ruby_sitearch}/ferret_ext.so

%files doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Apr 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-9
- Update from comments in #468597
- Update to reflect new package guidelines

* Wed Oct 29 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-7
- Adjust license tag for package (#468597)
- Adjust Source0 URL (#468597)
- Make sure that the gem installation dir itself is owned by this package (#468597)

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-6
- Majorly revise packaging strategy (#468597)
- Found all licenses in each of the files
- Include license file

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-2
- Better use of macros
- rpmlint now silent

* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.11.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2009 03:18:29 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:10:00 -0000	1.2
@@ -0,0 +1 @@
+ferret-0.11.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ferret/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2009 03:18:29 -0000	1.1
+++ sources	22 Apr 2009 09:10:00 -0000	1.2
@@ -0,0 +1 @@
+f26e531d3c0da085d7461a3648e2974f  ferret-0.11.6.gem



From ellert at fedoraproject.org  Wed Apr 22 09:27:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 09:27:52 +0000 (UTC)
Subject: rpms/globus-xio/devel globus-xio-bad-age.patch, NONE,
	1.1 globus-xio-doxygen.patch, NONE,
	1.1 globus-xio-type-punned-pointer.patch, NONE,
	1.1 globus-xio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422092753.096E170104@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-bad-age.patch globus-xio-doxygen.patch 
	globus-xio-type-punned-pointer.patch globus-xio.spec 
	import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball


globus-xio-bad-age.patch:

--- NEW FILE globus-xio-bad-age.patch ---
diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/pkg_data_src.gpt.in
--- globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in	2008-04-30 20:25:28.000000000 +0200
+++ globus_xio-2.7/pkgdata/pkg_data_src.gpt.in	2008-07-14 22:53:51.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
 
-  <Aging_Version Age="5" Major="2" Minor="7" />
+  <Aging_Version Age="2" Major="2" Minor="7" />
   <Description >Globus XIO Framework</Description>
   <Functional_Group >Communication</Functional_Group>
   <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />

globus-xio-doxygen.patch:

--- NEW FILE globus-xio-doxygen.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
--- globus_xio-2.7.orig/builtins/http/globus_xio_http.h	2008-04-30 20:25:27.000000000 +0200
+++ globus_xio-2.7/builtins/http/globus_xio_http.h	2009-04-05 13:11:47.000000000 +0200
@@ -403,7 +403,7 @@
      */
     /* int *                            status_code,
        char **                          reason_phrase,
-       globus_xio_http_version_t *      version,
+       globus_xio_http_version_t *      http_version,
        globus_hashtable_t *             headers */
     GLOBUS_XIO_HTTP_GET_RESPONSE
 
@@ -445,8 +445,7 @@
  * @ingroup http_driver
  * Valid HTTP versions, used with the
  * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the
- * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and
- * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls.
+ * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control.
  */
 typedef enum
 {
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h	2006-04-21 21:10:39.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h	2009-04-05 13:05:14.000000000 +0200
@@ -83,6 +83,7 @@
  * @defgroup mode_e_driver_envs Env Variables
  * @ingroup mode_e_driver
  *
+ * The mode_e driver uses the following environment variable
  * - GLOBUS_XIO_MODE_E_DEBUG Available if using a debug build.  See 
  * globus_debug.h for format.  
  */
@@ -176,7 +177,7 @@
      * @param num_streams
      *      Specifies the number of streams to use.
      */
-    /* int					max_connection_count */
+    /* int					num_streams */
     GLOBUS_XIO_MODE_E_SET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -186,7 +187,7 @@
      * @param num_streams_out
      *      The stream count will be stored here.
      */
-    /* int *					max_connection_count_out */
+    /* int *					num_streams_out */
     GLOBUS_XIO_MODE_E_GET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -218,10 +219,9 @@
      * a data_desc or the driver has to calculate the EODC
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof
-     *      GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF.
-     * @param eod_count
-     *      Specifies the number of EODs that must be received by the server.
+     * @param manual_eodc
+     *      GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC
+     * manually (default).
      */
     /* globus_bool_t				manual_eodc */
     GLOBUS_XIO_MODE_E_SET_MANUAL_EODC,
@@ -230,7 +230,7 @@
      * Get MANUAL_EODC flag on the attr.
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof_out
+     * @param manual_eodc_out
      *      The MANUAL_EODC flag will be stored here.
      */
     /* globus_bool_t *				manual_eodc_out */
@@ -292,7 +292,7 @@
      *      The stack will be stored here. If none is set, GLOBUS_NULL will be
      *      set.
      */
-    /* globus_xio_attr_t *         attr_out */
+    /* globus_xio_attr_t *         stack_out */
 
     GLOBUS_XIO_MODE_E_GET_STACK_ATTR
 
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h	2006-08-22 16:00:30.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h	2009-04-05 13:05:02.000000000 +0200
@@ -62,6 +62,7 @@
  * @defgroup ordering_driver_envs Env Variables
  * @ingroup ordering_driver
  *
+ * The ordering driver uses the following environment variable
  * - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build.  See
  * globus_debug.h for format.
  */
diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
--- globus_xio-2.7.orig/configure.in	2008-10-03 07:13:03.000000000 +0200
+++ globus_xio-2.7/configure.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
--- globus_xio-2.7.orig/configure.in.in	2004-06-01 18:09:16.000000000 +0200
+++ globus_xio-2.7/configure.in.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
--- globus_xio-2.7.orig/globus_xio_driver.h	2008-01-19 01:02:21.000000000 +0100
+++ globus_xio-2.7/globus_xio_driver.h	2009-04-05 13:11:47.000000000 +0200
@@ -1396,11 +1396,11 @@
  *  many available parsing functions but the developer is free to right their own
  *  if the provided ones are not sufficient.  Sample parsing functions follow:
  *
- *  - @ref globus_i_xio_attr_string_single_bool
- *  - @ref globus_i_xio_attr_string_single_float
- *  - @ref globus_i_xio_attr_string_single_int
- *  - @ref globus_i_xio_attr_string_single_string
- *  - @ref globus_i_xio_attr_string_dual_positive_int
+ *  - @ref globus_xio_string_cntl_bool
+ *  - @ref globus_xio_string_cntl_float
+ *  - @ref globus_xio_string_cntl_int
+ *  - @ref globus_xio_string_cntl_string
+ *  - @ref globus_xio_string_cntl_int_int
  *
  */
 /**
diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
--- globus_xio-2.7.orig/globus_xio.h	2008-02-14 08:04:07.000000000 +0100
+++ globus_xio-2.7/globus_xio.h	2009-04-05 13:11:47.000000000 +0200
@@ -118,7 +118,7 @@
  */
 
 /**
- * @addtongroup GLOBUS_XIO_API_ASSIST
+ * @addtogroup GLOBUS_XIO_API_ASSIST
  *
  *  \par Timeouts
  *  A user can set a timeout value for any io operation.  Each IO 
diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
--- globus_xio-2.7.orig/globus_xio_types.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_types.h	2009-04-05 13:11:47.000000000 +0200
@@ -189,6 +189,7 @@
      * @param config_string
      *      The driver specific paramter string.
      */
+    /* char *                           config_string */
     GLOBUS_XIO_SET_STRING_OPTIONS
     
 } globus_xio_handle_cmd_t;

globus-xio-type-punned-pointer.patch:

--- NEW FILE globus-xio-type-punned-pointer.patch ---
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c	2006-07-25 18:30:34.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c	2008-12-31 14:50:21.000000000 +0100
@@ -526,7 +526,7 @@
     memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t));
     if (!attr)
     {
-        result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); 
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
@@ -537,7 +537,7 @@
     else
     {
         result = globus_l_xio_mode_e_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c	2008-09-26 08:04:52.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c	2008-12-31 14:59:58.000000000 +0100
@@ -367,12 +367,12 @@
     }
     if (!attr)
     {
-       result = globus_l_xio_ordering_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr);
     }
     else
     {
         result = globus_l_xio_ordering_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
     }
     if (result != GLOBUS_SUCCESS)
     {
diff -ur globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c
--- globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c	2008-09-18 08:17:07.000000000 +0200
+++ globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c	2008-12-31 14:55:17.000000000 +0100
@@ -2028,7 +2028,7 @@
     }
     
     result = globus_l_xio_tcp_attr_copy(
-        (void **) &connect_info->attr, (void *) attr);
+        (void **) (void *) &connect_info->attr, (void *) attr);
     if(result != GLOBUS_SUCCESS)
     {
         result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c globus_xio-2.7/builtins/telnet/globus_xio_telnet.c
--- globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c	2007-08-08 00:50:29.000000000 +0200
+++ globus_xio-2.7/builtins/telnet/globus_xio_telnet.c	2008-12-31 14:48:06.000000000 +0100
@@ -455,7 +455,7 @@
         return GLOBUS_SUCCESS;
     }
 
-    res = globus_l_xio_telnet_attr_init((void **) &dest_attr);
+    res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr);
     if(res == GLOBUS_SUCCESS)
     {
         src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr;
@@ -525,7 +525,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_server_init);
 
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;
@@ -560,7 +560,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_accept);
    
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;


--- NEW FILE globus-xio.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Framework

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6585
Patch0:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
Patch1:		%{name}-bad-age.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus XIO Framework Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO Framework Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Framework

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Framework Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus XIO Framework Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in
sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
  -i configure.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
	 $RPM_BUILD_ROOT%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do
  sed 's/P\.RS/P\n.RS/' -i $f
done

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-2_7-2_fc9:HEAD:globus-xio-2.7-2.fc9.src.rpm:1240392400


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:43:44 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:27:49 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:43:44 -0000	1.1
+++ sources	22 Apr 2009 09:27:50 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 09:30:13 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 09:30:13 +0000 (UTC)
Subject: rpms/globus-xio/F-9 globus-xio-bad-age.patch, NONE,
	1.1 globus-xio-doxygen.patch, NONE,
	1.1 globus-xio-type-punned-pointer.patch, NONE,
	1.1 globus-xio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422093013.3114B700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4749/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-bad-age.patch globus-xio-doxygen.patch 
	globus-xio-type-punned-pointer.patch globus-xio.spec 
	import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball


globus-xio-bad-age.patch:

--- NEW FILE globus-xio-bad-age.patch ---
diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/pkg_data_src.gpt.in
--- globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in	2008-04-30 20:25:28.000000000 +0200
+++ globus_xio-2.7/pkgdata/pkg_data_src.gpt.in	2008-07-14 22:53:51.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
 
-  <Aging_Version Age="5" Major="2" Minor="7" />
+  <Aging_Version Age="2" Major="2" Minor="7" />
   <Description >Globus XIO Framework</Description>
   <Functional_Group >Communication</Functional_Group>
   <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />

globus-xio-doxygen.patch:

--- NEW FILE globus-xio-doxygen.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
--- globus_xio-2.7.orig/builtins/http/globus_xio_http.h	2008-04-30 20:25:27.000000000 +0200
+++ globus_xio-2.7/builtins/http/globus_xio_http.h	2009-04-05 13:11:47.000000000 +0200
@@ -403,7 +403,7 @@
      */
     /* int *                            status_code,
        char **                          reason_phrase,
-       globus_xio_http_version_t *      version,
+       globus_xio_http_version_t *      http_version,
        globus_hashtable_t *             headers */
     GLOBUS_XIO_HTTP_GET_RESPONSE
 
@@ -445,8 +445,7 @@
  * @ingroup http_driver
  * Valid HTTP versions, used with the
  * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the
- * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and
- * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls.
+ * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control.
  */
 typedef enum
 {
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h	2006-04-21 21:10:39.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h	2009-04-05 13:05:14.000000000 +0200
@@ -83,6 +83,7 @@
  * @defgroup mode_e_driver_envs Env Variables
  * @ingroup mode_e_driver
  *
+ * The mode_e driver uses the following environment variable
  * - GLOBUS_XIO_MODE_E_DEBUG Available if using a debug build.  See 
  * globus_debug.h for format.  
  */
@@ -176,7 +177,7 @@
      * @param num_streams
      *      Specifies the number of streams to use.
      */
-    /* int					max_connection_count */
+    /* int					num_streams */
     GLOBUS_XIO_MODE_E_SET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -186,7 +187,7 @@
      * @param num_streams_out
      *      The stream count will be stored here.
      */
-    /* int *					max_connection_count_out */
+    /* int *					num_streams_out */
     GLOBUS_XIO_MODE_E_GET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -218,10 +219,9 @@
      * a data_desc or the driver has to calculate the EODC
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof
-     *      GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF.
-     * @param eod_count
-     *      Specifies the number of EODs that must be received by the server.
+     * @param manual_eodc
+     *      GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC
+     * manually (default).
      */
     /* globus_bool_t				manual_eodc */
     GLOBUS_XIO_MODE_E_SET_MANUAL_EODC,
@@ -230,7 +230,7 @@
      * Get MANUAL_EODC flag on the attr.
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof_out
+     * @param manual_eodc_out
      *      The MANUAL_EODC flag will be stored here.
      */
     /* globus_bool_t *				manual_eodc_out */
@@ -292,7 +292,7 @@
      *      The stack will be stored here. If none is set, GLOBUS_NULL will be
      *      set.
      */
-    /* globus_xio_attr_t *         attr_out */
+    /* globus_xio_attr_t *         stack_out */
 
     GLOBUS_XIO_MODE_E_GET_STACK_ATTR
 
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h	2006-08-22 16:00:30.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h	2009-04-05 13:05:02.000000000 +0200
@@ -62,6 +62,7 @@
  * @defgroup ordering_driver_envs Env Variables
  * @ingroup ordering_driver
  *
+ * The ordering driver uses the following environment variable
  * - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build.  See
  * globus_debug.h for format.
  */
diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
--- globus_xio-2.7.orig/configure.in	2008-10-03 07:13:03.000000000 +0200
+++ globus_xio-2.7/configure.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
--- globus_xio-2.7.orig/configure.in.in	2004-06-01 18:09:16.000000000 +0200
+++ globus_xio-2.7/configure.in.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
--- globus_xio-2.7.orig/globus_xio_driver.h	2008-01-19 01:02:21.000000000 +0100
+++ globus_xio-2.7/globus_xio_driver.h	2009-04-05 13:11:47.000000000 +0200
@@ -1396,11 +1396,11 @@
  *  many available parsing functions but the developer is free to right their own
  *  if the provided ones are not sufficient.  Sample parsing functions follow:
  *
- *  - @ref globus_i_xio_attr_string_single_bool
- *  - @ref globus_i_xio_attr_string_single_float
- *  - @ref globus_i_xio_attr_string_single_int
- *  - @ref globus_i_xio_attr_string_single_string
- *  - @ref globus_i_xio_attr_string_dual_positive_int
+ *  - @ref globus_xio_string_cntl_bool
+ *  - @ref globus_xio_string_cntl_float
+ *  - @ref globus_xio_string_cntl_int
+ *  - @ref globus_xio_string_cntl_string
+ *  - @ref globus_xio_string_cntl_int_int
  *
  */
 /**
diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
--- globus_xio-2.7.orig/globus_xio.h	2008-02-14 08:04:07.000000000 +0100
+++ globus_xio-2.7/globus_xio.h	2009-04-05 13:11:47.000000000 +0200
@@ -118,7 +118,7 @@
  */
 
 /**
- * @addtongroup GLOBUS_XIO_API_ASSIST
+ * @addtogroup GLOBUS_XIO_API_ASSIST
  *
  *  \par Timeouts
  *  A user can set a timeout value for any io operation.  Each IO 
diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
--- globus_xio-2.7.orig/globus_xio_types.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_types.h	2009-04-05 13:11:47.000000000 +0200
@@ -189,6 +189,7 @@
      * @param config_string
      *      The driver specific paramter string.
      */
+    /* char *                           config_string */
     GLOBUS_XIO_SET_STRING_OPTIONS
     
 } globus_xio_handle_cmd_t;

globus-xio-type-punned-pointer.patch:

--- NEW FILE globus-xio-type-punned-pointer.patch ---
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c	2006-07-25 18:30:34.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c	2008-12-31 14:50:21.000000000 +0100
@@ -526,7 +526,7 @@
     memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t));
     if (!attr)
     {
-        result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); 
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
@@ -537,7 +537,7 @@
     else
     {
         result = globus_l_xio_mode_e_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c	2008-09-26 08:04:52.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c	2008-12-31 14:59:58.000000000 +0100
@@ -367,12 +367,12 @@
     }
     if (!attr)
     {
-       result = globus_l_xio_ordering_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr);
     }
     else
     {
         result = globus_l_xio_ordering_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
     }
     if (result != GLOBUS_SUCCESS)
     {
diff -ur globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c
--- globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c	2008-09-18 08:17:07.000000000 +0200
+++ globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c	2008-12-31 14:55:17.000000000 +0100
@@ -2028,7 +2028,7 @@
     }
     
     result = globus_l_xio_tcp_attr_copy(
-        (void **) &connect_info->attr, (void *) attr);
+        (void **) (void *) &connect_info->attr, (void *) attr);
     if(result != GLOBUS_SUCCESS)
     {
         result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c globus_xio-2.7/builtins/telnet/globus_xio_telnet.c
--- globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c	2007-08-08 00:50:29.000000000 +0200
+++ globus_xio-2.7/builtins/telnet/globus_xio_telnet.c	2008-12-31 14:48:06.000000000 +0100
@@ -455,7 +455,7 @@
         return GLOBUS_SUCCESS;
     }
 
-    res = globus_l_xio_telnet_attr_init((void **) &dest_attr);
+    res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr);
     if(res == GLOBUS_SUCCESS)
     {
         src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr;
@@ -525,7 +525,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_server_init);
 
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;
@@ -560,7 +560,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_accept);
    
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;


--- NEW FILE globus-xio.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Framework

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6585
Patch0:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
Patch1:		%{name}-bad-age.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus XIO Framework Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO Framework Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Framework

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Framework Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus XIO Framework Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in
sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
  -i configure.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
	 $RPM_BUILD_ROOT%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do
  sed 's/P\.RS/P\n.RS/' -i $f
done

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-2_7-2_fc9:F-9:globus-xio-2.7-2.fc9.src.rpm:1240392561


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:43:44 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:30:10 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:43:44 -0000	1.1
+++ sources	22 Apr 2009 09:30:11 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 09:33:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 09:33:00 +0000 (UTC)
Subject: rpms/globus-xio/F-10 globus-xio-bad-age.patch, NONE,
	1.1 globus-xio-doxygen.patch, NONE,
	1.1 globus-xio-type-punned-pointer.patch, NONE,
	1.1 globus-xio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422093300.2B487700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5662/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-bad-age.patch globus-xio-doxygen.patch 
	globus-xio-type-punned-pointer.patch globus-xio.spec 
	import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball


globus-xio-bad-age.patch:

--- NEW FILE globus-xio-bad-age.patch ---
diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/pkg_data_src.gpt.in
--- globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in	2008-04-30 20:25:28.000000000 +0200
+++ globus_xio-2.7/pkgdata/pkg_data_src.gpt.in	2008-07-14 22:53:51.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
 
-  <Aging_Version Age="5" Major="2" Minor="7" />
+  <Aging_Version Age="2" Major="2" Minor="7" />
   <Description >Globus XIO Framework</Description>
   <Functional_Group >Communication</Functional_Group>
   <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />

globus-xio-doxygen.patch:

--- NEW FILE globus-xio-doxygen.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
--- globus_xio-2.7.orig/builtins/http/globus_xio_http.h	2008-04-30 20:25:27.000000000 +0200
+++ globus_xio-2.7/builtins/http/globus_xio_http.h	2009-04-05 13:11:47.000000000 +0200
@@ -403,7 +403,7 @@
      */
     /* int *                            status_code,
        char **                          reason_phrase,
-       globus_xio_http_version_t *      version,
+       globus_xio_http_version_t *      http_version,
        globus_hashtable_t *             headers */
     GLOBUS_XIO_HTTP_GET_RESPONSE
 
@@ -445,8 +445,7 @@
  * @ingroup http_driver
  * Valid HTTP versions, used with the
  * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the
- * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and
- * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls.
+ * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control.
  */
 typedef enum
 {
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h	2006-04-21 21:10:39.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h	2009-04-05 13:05:14.000000000 +0200
@@ -83,6 +83,7 @@
  * @defgroup mode_e_driver_envs Env Variables
  * @ingroup mode_e_driver
  *
+ * The mode_e driver uses the following environment variable
  * - GLOBUS_XIO_MODE_E_DEBUG Available if using a debug build.  See 
  * globus_debug.h for format.  
  */
@@ -176,7 +177,7 @@
      * @param num_streams
      *      Specifies the number of streams to use.
      */
-    /* int					max_connection_count */
+    /* int					num_streams */
     GLOBUS_XIO_MODE_E_SET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -186,7 +187,7 @@
      * @param num_streams_out
      *      The stream count will be stored here.
      */
-    /* int *					max_connection_count_out */
+    /* int *					num_streams_out */
     GLOBUS_XIO_MODE_E_GET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -218,10 +219,9 @@
      * a data_desc or the driver has to calculate the EODC
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof
-     *      GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF.
-     * @param eod_count
-     *      Specifies the number of EODs that must be received by the server.
+     * @param manual_eodc
+     *      GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC
+     * manually (default).
      */
     /* globus_bool_t				manual_eodc */
     GLOBUS_XIO_MODE_E_SET_MANUAL_EODC,
@@ -230,7 +230,7 @@
      * Get MANUAL_EODC flag on the attr.
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof_out
+     * @param manual_eodc_out
      *      The MANUAL_EODC flag will be stored here.
      */
     /* globus_bool_t *				manual_eodc_out */
@@ -292,7 +292,7 @@
      *      The stack will be stored here. If none is set, GLOBUS_NULL will be
      *      set.
      */
-    /* globus_xio_attr_t *         attr_out */
+    /* globus_xio_attr_t *         stack_out */
 
     GLOBUS_XIO_MODE_E_GET_STACK_ATTR
 
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h	2006-08-22 16:00:30.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h	2009-04-05 13:05:02.000000000 +0200
@@ -62,6 +62,7 @@
  * @defgroup ordering_driver_envs Env Variables
  * @ingroup ordering_driver
  *
+ * The ordering driver uses the following environment variable
  * - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build.  See
  * globus_debug.h for format.
  */
diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
--- globus_xio-2.7.orig/configure.in	2008-10-03 07:13:03.000000000 +0200
+++ globus_xio-2.7/configure.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
--- globus_xio-2.7.orig/configure.in.in	2004-06-01 18:09:16.000000000 +0200
+++ globus_xio-2.7/configure.in.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
--- globus_xio-2.7.orig/globus_xio_driver.h	2008-01-19 01:02:21.000000000 +0100
+++ globus_xio-2.7/globus_xio_driver.h	2009-04-05 13:11:47.000000000 +0200
@@ -1396,11 +1396,11 @@
  *  many available parsing functions but the developer is free to right their own
  *  if the provided ones are not sufficient.  Sample parsing functions follow:
  *
- *  - @ref globus_i_xio_attr_string_single_bool
- *  - @ref globus_i_xio_attr_string_single_float
- *  - @ref globus_i_xio_attr_string_single_int
- *  - @ref globus_i_xio_attr_string_single_string
- *  - @ref globus_i_xio_attr_string_dual_positive_int
+ *  - @ref globus_xio_string_cntl_bool
+ *  - @ref globus_xio_string_cntl_float
+ *  - @ref globus_xio_string_cntl_int
+ *  - @ref globus_xio_string_cntl_string
+ *  - @ref globus_xio_string_cntl_int_int
  *
  */
 /**
diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
--- globus_xio-2.7.orig/globus_xio.h	2008-02-14 08:04:07.000000000 +0100
+++ globus_xio-2.7/globus_xio.h	2009-04-05 13:11:47.000000000 +0200
@@ -118,7 +118,7 @@
  */
 
 /**
- * @addtongroup GLOBUS_XIO_API_ASSIST
+ * @addtogroup GLOBUS_XIO_API_ASSIST
  *
  *  \par Timeouts
  *  A user can set a timeout value for any io operation.  Each IO 
diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
--- globus_xio-2.7.orig/globus_xio_types.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_types.h	2009-04-05 13:11:47.000000000 +0200
@@ -189,6 +189,7 @@
      * @param config_string
      *      The driver specific paramter string.
      */
+    /* char *                           config_string */
     GLOBUS_XIO_SET_STRING_OPTIONS
     
 } globus_xio_handle_cmd_t;

globus-xio-type-punned-pointer.patch:

--- NEW FILE globus-xio-type-punned-pointer.patch ---
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c	2006-07-25 18:30:34.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c	2008-12-31 14:50:21.000000000 +0100
@@ -526,7 +526,7 @@
     memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t));
     if (!attr)
     {
-        result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); 
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
@@ -537,7 +537,7 @@
     else
     {
         result = globus_l_xio_mode_e_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c	2008-09-26 08:04:52.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c	2008-12-31 14:59:58.000000000 +0100
@@ -367,12 +367,12 @@
     }
     if (!attr)
     {
-       result = globus_l_xio_ordering_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr);
     }
     else
     {
         result = globus_l_xio_ordering_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
     }
     if (result != GLOBUS_SUCCESS)
     {
diff -ur globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c
--- globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c	2008-09-18 08:17:07.000000000 +0200
+++ globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c	2008-12-31 14:55:17.000000000 +0100
@@ -2028,7 +2028,7 @@
     }
     
     result = globus_l_xio_tcp_attr_copy(
-        (void **) &connect_info->attr, (void *) attr);
+        (void **) (void *) &connect_info->attr, (void *) attr);
     if(result != GLOBUS_SUCCESS)
     {
         result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c globus_xio-2.7/builtins/telnet/globus_xio_telnet.c
--- globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c	2007-08-08 00:50:29.000000000 +0200
+++ globus_xio-2.7/builtins/telnet/globus_xio_telnet.c	2008-12-31 14:48:06.000000000 +0100
@@ -455,7 +455,7 @@
         return GLOBUS_SUCCESS;
     }
 
-    res = globus_l_xio_telnet_attr_init((void **) &dest_attr);
+    res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr);
     if(res == GLOBUS_SUCCESS)
     {
         src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr;
@@ -525,7 +525,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_server_init);
 
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;
@@ -560,7 +560,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_accept);
    
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;


--- NEW FILE globus-xio.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Framework

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6585
Patch0:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
Patch1:		%{name}-bad-age.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus XIO Framework Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO Framework Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Framework

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Framework Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus XIO Framework Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in
sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
  -i configure.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
	 $RPM_BUILD_ROOT%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do
  sed 's/P\.RS/P\n.RS/' -i $f
done

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-2_7-2_fc9:F-10:globus-xio-2.7-2.fc9.src.rpm:1240392699


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:43:44 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:32:56 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:43:44 -0000	1.1
+++ sources	22 Apr 2009 09:32:56 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 09:36:07 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 09:36:07 +0000 (UTC)
Subject: rpms/globus-xio/F-11 globus-xio-bad-age.patch, NONE,
	1.1 globus-xio-doxygen.patch, NONE,
	1.1 globus-xio-type-punned-pointer.patch, NONE,
	1.1 globus-xio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422093607.98569700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6809/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-bad-age.patch globus-xio-doxygen.patch 
	globus-xio-type-punned-pointer.patch globus-xio.spec 
	import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball


globus-xio-bad-age.patch:

--- NEW FILE globus-xio-bad-age.patch ---
diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/pkg_data_src.gpt.in
--- globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in	2008-04-30 20:25:28.000000000 +0200
+++ globus_xio-2.7/pkgdata/pkg_data_src.gpt.in	2008-07-14 22:53:51.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
 
-  <Aging_Version Age="5" Major="2" Minor="7" />
+  <Aging_Version Age="2" Major="2" Minor="7" />
   <Description >Globus XIO Framework</Description>
   <Functional_Group >Communication</Functional_Group>
   <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />

globus-xio-doxygen.patch:

--- NEW FILE globus-xio-doxygen.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
--- globus_xio-2.7.orig/builtins/http/globus_xio_http.h	2008-04-30 20:25:27.000000000 +0200
+++ globus_xio-2.7/builtins/http/globus_xio_http.h	2009-04-05 13:11:47.000000000 +0200
@@ -403,7 +403,7 @@
      */
     /* int *                            status_code,
        char **                          reason_phrase,
-       globus_xio_http_version_t *      version,
+       globus_xio_http_version_t *      http_version,
        globus_hashtable_t *             headers */
     GLOBUS_XIO_HTTP_GET_RESPONSE
 
@@ -445,8 +445,7 @@
  * @ingroup http_driver
  * Valid HTTP versions, used with the
  * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the
- * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and
- * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls.
+ * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control.
  */
 typedef enum
 {
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h	2006-04-21 21:10:39.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h	2009-04-05 13:05:14.000000000 +0200
@@ -83,6 +83,7 @@
  * @defgroup mode_e_driver_envs Env Variables
  * @ingroup mode_e_driver
  *
+ * The mode_e driver uses the following environment variable
  * - GLOBUS_XIO_MODE_E_DEBUG Available if using a debug build.  See 
  * globus_debug.h for format.  
  */
@@ -176,7 +177,7 @@
      * @param num_streams
      *      Specifies the number of streams to use.
      */
-    /* int					max_connection_count */
+    /* int					num_streams */
     GLOBUS_XIO_MODE_E_SET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -186,7 +187,7 @@
      * @param num_streams_out
      *      The stream count will be stored here.
      */
-    /* int *					max_connection_count_out */
+    /* int *					num_streams_out */
     GLOBUS_XIO_MODE_E_GET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -218,10 +219,9 @@
      * a data_desc or the driver has to calculate the EODC
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof
-     *      GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF.
-     * @param eod_count
-     *      Specifies the number of EODs that must be received by the server.
+     * @param manual_eodc
+     *      GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC
+     * manually (default).
      */
     /* globus_bool_t				manual_eodc */
     GLOBUS_XIO_MODE_E_SET_MANUAL_EODC,
@@ -230,7 +230,7 @@
      * Get MANUAL_EODC flag on the attr.
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof_out
+     * @param manual_eodc_out
      *      The MANUAL_EODC flag will be stored here.
      */
     /* globus_bool_t *				manual_eodc_out */
@@ -292,7 +292,7 @@
      *      The stack will be stored here. If none is set, GLOBUS_NULL will be
      *      set.
      */
-    /* globus_xio_attr_t *         attr_out */
+    /* globus_xio_attr_t *         stack_out */
 
     GLOBUS_XIO_MODE_E_GET_STACK_ATTR
 
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h	2006-08-22 16:00:30.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h	2009-04-05 13:05:02.000000000 +0200
@@ -62,6 +62,7 @@
  * @defgroup ordering_driver_envs Env Variables
  * @ingroup ordering_driver
  *
+ * The ordering driver uses the following environment variable
  * - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build.  See
  * globus_debug.h for format.
  */
diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
--- globus_xio-2.7.orig/configure.in	2008-10-03 07:13:03.000000000 +0200
+++ globus_xio-2.7/configure.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
--- globus_xio-2.7.orig/configure.in.in	2004-06-01 18:09:16.000000000 +0200
+++ globus_xio-2.7/configure.in.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
--- globus_xio-2.7.orig/globus_xio_driver.h	2008-01-19 01:02:21.000000000 +0100
+++ globus_xio-2.7/globus_xio_driver.h	2009-04-05 13:11:47.000000000 +0200
@@ -1396,11 +1396,11 @@
  *  many available parsing functions but the developer is free to right their own
  *  if the provided ones are not sufficient.  Sample parsing functions follow:
  *
- *  - @ref globus_i_xio_attr_string_single_bool
- *  - @ref globus_i_xio_attr_string_single_float
- *  - @ref globus_i_xio_attr_string_single_int
- *  - @ref globus_i_xio_attr_string_single_string
- *  - @ref globus_i_xio_attr_string_dual_positive_int
+ *  - @ref globus_xio_string_cntl_bool
+ *  - @ref globus_xio_string_cntl_float
+ *  - @ref globus_xio_string_cntl_int
+ *  - @ref globus_xio_string_cntl_string
+ *  - @ref globus_xio_string_cntl_int_int
  *
  */
 /**
diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
--- globus_xio-2.7.orig/globus_xio.h	2008-02-14 08:04:07.000000000 +0100
+++ globus_xio-2.7/globus_xio.h	2009-04-05 13:11:47.000000000 +0200
@@ -118,7 +118,7 @@
  */
 
 /**
- * @addtongroup GLOBUS_XIO_API_ASSIST
+ * @addtogroup GLOBUS_XIO_API_ASSIST
  *
  *  \par Timeouts
  *  A user can set a timeout value for any io operation.  Each IO 
diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
--- globus_xio-2.7.orig/globus_xio_types.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_types.h	2009-04-05 13:11:47.000000000 +0200
@@ -189,6 +189,7 @@
      * @param config_string
      *      The driver specific paramter string.
      */
+    /* char *                           config_string */
     GLOBUS_XIO_SET_STRING_OPTIONS
     
 } globus_xio_handle_cmd_t;

globus-xio-type-punned-pointer.patch:

--- NEW FILE globus-xio-type-punned-pointer.patch ---
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c	2006-07-25 18:30:34.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c	2008-12-31 14:50:21.000000000 +0100
@@ -526,7 +526,7 @@
     memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t));
     if (!attr)
     {
-        result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); 
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
@@ -537,7 +537,7 @@
     else
     {
         result = globus_l_xio_mode_e_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c	2008-09-26 08:04:52.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c	2008-12-31 14:59:58.000000000 +0100
@@ -367,12 +367,12 @@
     }
     if (!attr)
     {
-       result = globus_l_xio_ordering_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr);
     }
     else
     {
         result = globus_l_xio_ordering_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
     }
     if (result != GLOBUS_SUCCESS)
     {
diff -ur globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c
--- globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c	2008-09-18 08:17:07.000000000 +0200
+++ globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c	2008-12-31 14:55:17.000000000 +0100
@@ -2028,7 +2028,7 @@
     }
     
     result = globus_l_xio_tcp_attr_copy(
-        (void **) &connect_info->attr, (void *) attr);
+        (void **) (void *) &connect_info->attr, (void *) attr);
     if(result != GLOBUS_SUCCESS)
     {
         result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c globus_xio-2.7/builtins/telnet/globus_xio_telnet.c
--- globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c	2007-08-08 00:50:29.000000000 +0200
+++ globus_xio-2.7/builtins/telnet/globus_xio_telnet.c	2008-12-31 14:48:06.000000000 +0100
@@ -455,7 +455,7 @@
         return GLOBUS_SUCCESS;
     }
 
-    res = globus_l_xio_telnet_attr_init((void **) &dest_attr);
+    res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr);
     if(res == GLOBUS_SUCCESS)
     {
         src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr;
@@ -525,7 +525,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_server_init);
 
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;
@@ -560,7 +560,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_accept);
    
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;


--- NEW FILE globus-xio.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Framework

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6585
Patch0:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
Patch1:		%{name}-bad-age.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus XIO Framework Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO Framework Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Framework

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Framework Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus XIO Framework Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in
sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
  -i configure.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
	 $RPM_BUILD_ROOT%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do
  sed 's/P\.RS/P\n.RS/' -i $f
done

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-2_7-2_fc9:F-11:globus-xio-2.7-2.fc9.src.rpm:1240392872


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:43:44 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:35:35 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:43:44 -0000	1.1
+++ sources	22 Apr 2009 09:35:35 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 09:39:07 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 09:39:07 +0000 (UTC)
Subject: rpms/globus-xio/EL-4 globus-xio-bad-age.patch, NONE,
	1.1 globus-xio-doxygen.patch, NONE,
	1.1 globus-xio-type-punned-pointer.patch, NONE,
	1.1 globus-xio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422093907.8F4C5700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7935/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-bad-age.patch globus-xio-doxygen.patch 
	globus-xio-type-punned-pointer.patch globus-xio.spec 
	import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball


globus-xio-bad-age.patch:

--- NEW FILE globus-xio-bad-age.patch ---
diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/pkg_data_src.gpt.in
--- globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in	2008-04-30 20:25:28.000000000 +0200
+++ globus_xio-2.7/pkgdata/pkg_data_src.gpt.in	2008-07-14 22:53:51.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
 
-  <Aging_Version Age="5" Major="2" Minor="7" />
+  <Aging_Version Age="2" Major="2" Minor="7" />
   <Description >Globus XIO Framework</Description>
   <Functional_Group >Communication</Functional_Group>
   <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />

globus-xio-doxygen.patch:

--- NEW FILE globus-xio-doxygen.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
--- globus_xio-2.7.orig/builtins/http/globus_xio_http.h	2008-04-30 20:25:27.000000000 +0200
+++ globus_xio-2.7/builtins/http/globus_xio_http.h	2009-04-05 13:11:47.000000000 +0200
@@ -403,7 +403,7 @@
      */
     /* int *                            status_code,
        char **                          reason_phrase,
-       globus_xio_http_version_t *      version,
+       globus_xio_http_version_t *      http_version,
        globus_hashtable_t *             headers */
     GLOBUS_XIO_HTTP_GET_RESPONSE
 
@@ -445,8 +445,7 @@
  * @ingroup http_driver
  * Valid HTTP versions, used with the
  * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the
- * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and
- * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls.
+ * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control.
  */
 typedef enum
 {
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h	2006-04-21 21:10:39.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h	2009-04-05 13:05:14.000000000 +0200
@@ -83,6 +83,7 @@
  * @defgroup mode_e_driver_envs Env Variables
  * @ingroup mode_e_driver
  *
+ * The mode_e driver uses the following environment variable
  * - GLOBUS_XIO_MODE_E_DEBUG Available if using a debug build.  See 
  * globus_debug.h for format.  
  */
@@ -176,7 +177,7 @@
      * @param num_streams
      *      Specifies the number of streams to use.
      */
-    /* int					max_connection_count */
+    /* int					num_streams */
     GLOBUS_XIO_MODE_E_SET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -186,7 +187,7 @@
      * @param num_streams_out
      *      The stream count will be stored here.
      */
-    /* int *					max_connection_count_out */
+    /* int *					num_streams_out */
     GLOBUS_XIO_MODE_E_GET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -218,10 +219,9 @@
      * a data_desc or the driver has to calculate the EODC
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof
-     *      GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF.
-     * @param eod_count
-     *      Specifies the number of EODs that must be received by the server.
+     * @param manual_eodc
+     *      GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC
+     * manually (default).
      */
     /* globus_bool_t				manual_eodc */
     GLOBUS_XIO_MODE_E_SET_MANUAL_EODC,
@@ -230,7 +230,7 @@
      * Get MANUAL_EODC flag on the attr.
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof_out
+     * @param manual_eodc_out
      *      The MANUAL_EODC flag will be stored here.
      */
     /* globus_bool_t *				manual_eodc_out */
@@ -292,7 +292,7 @@
      *      The stack will be stored here. If none is set, GLOBUS_NULL will be
      *      set.
      */
-    /* globus_xio_attr_t *         attr_out */
+    /* globus_xio_attr_t *         stack_out */
 
     GLOBUS_XIO_MODE_E_GET_STACK_ATTR
 
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h	2006-08-22 16:00:30.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h	2009-04-05 13:05:02.000000000 +0200
@@ -62,6 +62,7 @@
  * @defgroup ordering_driver_envs Env Variables
  * @ingroup ordering_driver
  *
+ * The ordering driver uses the following environment variable
  * - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build.  See
  * globus_debug.h for format.
  */
diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
--- globus_xio-2.7.orig/configure.in	2008-10-03 07:13:03.000000000 +0200
+++ globus_xio-2.7/configure.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
--- globus_xio-2.7.orig/configure.in.in	2004-06-01 18:09:16.000000000 +0200
+++ globus_xio-2.7/configure.in.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
--- globus_xio-2.7.orig/globus_xio_driver.h	2008-01-19 01:02:21.000000000 +0100
+++ globus_xio-2.7/globus_xio_driver.h	2009-04-05 13:11:47.000000000 +0200
@@ -1396,11 +1396,11 @@
  *  many available parsing functions but the developer is free to right their own
  *  if the provided ones are not sufficient.  Sample parsing functions follow:
  *
- *  - @ref globus_i_xio_attr_string_single_bool
- *  - @ref globus_i_xio_attr_string_single_float
- *  - @ref globus_i_xio_attr_string_single_int
- *  - @ref globus_i_xio_attr_string_single_string
- *  - @ref globus_i_xio_attr_string_dual_positive_int
+ *  - @ref globus_xio_string_cntl_bool
+ *  - @ref globus_xio_string_cntl_float
+ *  - @ref globus_xio_string_cntl_int
+ *  - @ref globus_xio_string_cntl_string
+ *  - @ref globus_xio_string_cntl_int_int
  *
  */
 /**
diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
--- globus_xio-2.7.orig/globus_xio.h	2008-02-14 08:04:07.000000000 +0100
+++ globus_xio-2.7/globus_xio.h	2009-04-05 13:11:47.000000000 +0200
@@ -118,7 +118,7 @@
  */
 
 /**
- * @addtongroup GLOBUS_XIO_API_ASSIST
+ * @addtogroup GLOBUS_XIO_API_ASSIST
  *
  *  \par Timeouts
  *  A user can set a timeout value for any io operation.  Each IO 
diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
--- globus_xio-2.7.orig/globus_xio_types.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_types.h	2009-04-05 13:11:47.000000000 +0200
@@ -189,6 +189,7 @@
      * @param config_string
      *      The driver specific paramter string.
      */
+    /* char *                           config_string */
     GLOBUS_XIO_SET_STRING_OPTIONS
     
 } globus_xio_handle_cmd_t;

globus-xio-type-punned-pointer.patch:

--- NEW FILE globus-xio-type-punned-pointer.patch ---
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c	2006-07-25 18:30:34.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c	2008-12-31 14:50:21.000000000 +0100
@@ -526,7 +526,7 @@
     memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t));
     if (!attr)
     {
-        result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); 
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
@@ -537,7 +537,7 @@
     else
     {
         result = globus_l_xio_mode_e_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c	2008-09-26 08:04:52.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c	2008-12-31 14:59:58.000000000 +0100
@@ -367,12 +367,12 @@
     }
     if (!attr)
     {
-       result = globus_l_xio_ordering_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr);
     }
     else
     {
         result = globus_l_xio_ordering_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
     }
     if (result != GLOBUS_SUCCESS)
     {
diff -ur globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c
--- globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c	2008-09-18 08:17:07.000000000 +0200
+++ globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c	2008-12-31 14:55:17.000000000 +0100
@@ -2028,7 +2028,7 @@
     }
     
     result = globus_l_xio_tcp_attr_copy(
-        (void **) &connect_info->attr, (void *) attr);
+        (void **) (void *) &connect_info->attr, (void *) attr);
     if(result != GLOBUS_SUCCESS)
     {
         result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c globus_xio-2.7/builtins/telnet/globus_xio_telnet.c
--- globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c	2007-08-08 00:50:29.000000000 +0200
+++ globus_xio-2.7/builtins/telnet/globus_xio_telnet.c	2008-12-31 14:48:06.000000000 +0100
@@ -455,7 +455,7 @@
         return GLOBUS_SUCCESS;
     }
 
-    res = globus_l_xio_telnet_attr_init((void **) &dest_attr);
+    res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr);
     if(res == GLOBUS_SUCCESS)
     {
         src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr;
@@ -525,7 +525,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_server_init);
 
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;
@@ -560,7 +560,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_accept);
    
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;


--- NEW FILE globus-xio.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Framework

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6585
Patch0:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
Patch1:		%{name}-bad-age.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus XIO Framework Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO Framework Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Framework

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Framework Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus XIO Framework Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in
sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
  -i configure.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
	 $RPM_BUILD_ROOT%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do
  sed 's/P\.RS/P\n.RS/' -i $f
done

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-2_7-2_fc9:EL-4:globus-xio-2.7-2.fc9.src.rpm:1240393052


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:43:44 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:39:05 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:43:44 -0000	1.1
+++ sources	22 Apr 2009 09:39:06 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz



From kkofler at fedoraproject.org  Wed Apr 22 09:39:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 22 Apr 2009 09:39:55 +0000 (UTC)
Subject: rpms/qsynth/devel qsynth.spec,1.12,1.13
Message-ID: <20090422093955.5939B700FE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7673/devel

Modified Files:
	qsynth.spec 
Log Message:
* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
- Fix disttag comparison for F9


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qsynth.spec	18 Apr 2009 05:28:43 -0000	1.12
+++ qsynth.spec	22 Apr 2009 09:39:53 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       6%{?dist}
+Release:       6%{?dist}.1
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -20,7 +20,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 Requires:      PersonalCopy-Lite-soundfont
 %else
 Requires:      soundfont2-default
@@ -44,7 +44,7 @@
 %patch3 -p1 -b .defaults
 
 # default.sf2 not available for Fedora < 11
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
 %endif
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
+- Fix disttag comparison for F9
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
 - Set Fedora defaults
 



From kkofler at fedoraproject.org  Wed Apr 22 09:40:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 22 Apr 2009 09:40:16 +0000 (UTC)
Subject: rpms/qsynth/F-10 qsynth.spec,1.10,1.11
Message-ID: <20090422094016.32769700FE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7673/F-10

Modified Files:
	qsynth.spec 
Log Message:
* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
- Fix disttag comparison for F9


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-10/qsynth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qsynth.spec	18 Apr 2009 05:32:47 -0000	1.10
+++ qsynth.spec	22 Apr 2009 09:39:43 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       6%{?dist}
+Release:       6%{?dist}.1
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -20,7 +20,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 Requires:      PersonalCopy-Lite-soundfont
 %else
 Requires:      soundfont2-default
@@ -44,7 +44,7 @@
 %patch3 -p1 -b .defaults
 
 # default.sf2 not available for Fedora < 11
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
 %endif
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
+- Fix disttag comparison for F9
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
 - Set Fedora defaults
 



From jwrdegoede at fedoraproject.org  Wed Apr 22 09:40:16 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 22 Apr 2009 09:40:16 +0000 (UTC)
Subject: rpms/xfig/devel xfig.spec,1.61,1.62
Message-ID: <20090422094016.4140270104@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8382

Modified Files:
	xfig.spec 
Log Message:
Merge review fixes


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xfig.spec	21 Apr 2009 17:48:17 -0000	1.61
+++ xfig.spec	22 Apr 2009 09:40:15 -0000	1.62
@@ -86,6 +86,8 @@
 Requires:       xorg-x11-fonts-base
 # So that this will get uninstalled together with xfig / xfig-Xaw3d
 Requires:       %{name}-executable = %{version}-%{release}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description common
 Files common to both the plain Xaw and the Xaw3d version of xfig.
@@ -134,6 +136,8 @@
 
 make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
      INSTALL="install -p" install.all
+install -p -m 644 CHANGES README LATEX.AND.XFIG* FIGAPPS \
+  %{buildroot}%{_docdir}/%{name}-%{version}
 
 # install the Xaw3d version and the wrapper for the .desktop file
 mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain



From kkofler at fedoraproject.org  Wed Apr 22 09:40:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 22 Apr 2009 09:40:20 +0000 (UTC)
Subject: rpms/qsynth/F-11 qsynth.spec,1.12,1.13
Message-ID: <20090422094020.E76D1700FE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7673/F-11

Modified Files:
	qsynth.spec 
Log Message:
* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
- Fix disttag comparison for F9


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/qsynth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qsynth.spec	18 Apr 2009 05:30:43 -0000	1.12
+++ qsynth.spec	22 Apr 2009 09:39:45 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       6%{?dist}
+Release:       6%{?dist}.1
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -20,7 +20,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 Requires:      PersonalCopy-Lite-soundfont
 %else
 Requires:      soundfont2-default
@@ -44,7 +44,7 @@
 %patch3 -p1 -b .defaults
 
 # default.sf2 not available for Fedora < 11
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
 %endif
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
+- Fix disttag comparison for F9
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
 - Set Fedora defaults
 



From kkofler at fedoraproject.org  Wed Apr 22 09:40:23 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 22 Apr 2009 09:40:23 +0000 (UTC)
Subject: rpms/qsynth/F-9 qsynth.spec,1.8,1.9
Message-ID: <20090422094023.E55F6700FE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7673/F-9

Modified Files:
	qsynth.spec 
Log Message:
* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
- Fix disttag comparison for F9


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/qsynth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qsynth.spec	18 Apr 2009 05:33:02 -0000	1.8
+++ qsynth.spec	22 Apr 2009 09:39:51 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.3
-Release:       6%{?dist}
+Release:       6%{?dist}.1
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
@@ -20,7 +20,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
 
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 Requires:      PersonalCopy-Lite-soundfont
 %else
 Requires:      soundfont2-default
@@ -44,7 +44,7 @@
 %patch3 -p1 -b .defaults
 
 # default.sf2 not available for Fedora < 11
-%if x%{fedora} < x11
+%if 0%{?fedora} < 11
 sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
 %endif
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-6.1
+- Fix disttag comparison for F9
+
 * Sat Apr 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.3-6
 - Set Fedora defaults
 



From ellert at fedoraproject.org  Wed Apr 22 09:41:57 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 09:41:57 +0000 (UTC)
Subject: rpms/globus-xio/EL-5 globus-xio-bad-age.patch, NONE,
	1.1 globus-xio-doxygen.patch, NONE,
	1.1 globus-xio-type-punned-pointer.patch, NONE,
	1.1 globus-xio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422094157.3F290700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-bad-age.patch globus-xio-doxygen.patch 
	globus-xio-type-punned-pointer.patch globus-xio.spec 
	import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball


globus-xio-bad-age.patch:

--- NEW FILE globus-xio-bad-age.patch ---
diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/pkg_data_src.gpt.in
--- globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in	2008-04-30 20:25:28.000000000 +0200
+++ globus_xio-2.7/pkgdata/pkg_data_src.gpt.in	2008-07-14 22:53:51.000000000 +0200
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
 
-  <Aging_Version Age="5" Major="2" Minor="7" />
+  <Aging_Version Age="2" Major="2" Minor="7" />
   <Description >Globus XIO Framework</Description>
   <Functional_Group >Communication</Functional_Group>
   <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />

globus-xio-doxygen.patch:

--- NEW FILE globus-xio-doxygen.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
--- globus_xio-2.7.orig/builtins/http/globus_xio_http.h	2008-04-30 20:25:27.000000000 +0200
+++ globus_xio-2.7/builtins/http/globus_xio_http.h	2009-04-05 13:11:47.000000000 +0200
@@ -403,7 +403,7 @@
      */
     /* int *                            status_code,
        char **                          reason_phrase,
-       globus_xio_http_version_t *      version,
+       globus_xio_http_version_t *      http_version,
        globus_hashtable_t *             headers */
     GLOBUS_XIO_HTTP_GET_RESPONSE
 
@@ -445,8 +445,7 @@
  * @ingroup http_driver
  * Valid HTTP versions, used with the
  * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the
- * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and
- * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls.
+ * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control.
  */
 typedef enum
 {
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h	2006-04-21 21:10:39.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h	2009-04-05 13:05:14.000000000 +0200
@@ -83,6 +83,7 @@
  * @defgroup mode_e_driver_envs Env Variables
  * @ingroup mode_e_driver
  *
+ * The mode_e driver uses the following environment variable
  * - GLOBUS_XIO_MODE_E_DEBUG Available if using a debug build.  See 
  * globus_debug.h for format.  
  */
@@ -176,7 +177,7 @@
      * @param num_streams
      *      Specifies the number of streams to use.
      */
-    /* int					max_connection_count */
+    /* int					num_streams */
     GLOBUS_XIO_MODE_E_SET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -186,7 +187,7 @@
      * @param num_streams_out
      *      The stream count will be stored here.
      */
-    /* int *					max_connection_count_out */
+    /* int *					num_streams_out */
     GLOBUS_XIO_MODE_E_GET_NUM_STREAMS,
 
     /** GlobusVarArgEnum(attr)
@@ -218,10 +219,9 @@
      * a data_desc or the driver has to calculate the EODC
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof
-     *      GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF.
-     * @param eod_count
-     *      Specifies the number of EODs that must be received by the server.
+     * @param manual_eodc
+     *      GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC
+     * manually (default).
      */
     /* globus_bool_t				manual_eodc */
     GLOBUS_XIO_MODE_E_SET_MANUAL_EODC,
@@ -230,7 +230,7 @@
      * Get MANUAL_EODC flag on the attr.
      * @ingroup mode_e_driver_cntls
      *
-     * @param eof_out
+     * @param manual_eodc_out
      *      The MANUAL_EODC flag will be stored here.
      */
     /* globus_bool_t *				manual_eodc_out */
@@ -292,7 +292,7 @@
      *      The stack will be stored here. If none is set, GLOBUS_NULL will be
      *      set.
      */
-    /* globus_xio_attr_t *         attr_out */
+    /* globus_xio_attr_t *         stack_out */
 
     GLOBUS_XIO_MODE_E_GET_STACK_ATTR
 
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h	2006-08-22 16:00:30.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h	2009-04-05 13:05:02.000000000 +0200
@@ -62,6 +62,7 @@
  * @defgroup ordering_driver_envs Env Variables
  * @ingroup ordering_driver
  *
+ * The ordering driver uses the following environment variable
  * - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build.  See
  * globus_debug.h for format.
  */
diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
--- globus_xio-2.7.orig/configure.in	2008-10-03 07:13:03.000000000 +0200
+++ globus_xio-2.7/configure.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
--- globus_xio-2.7.orig/configure.in.in	2004-06-01 18:09:16.000000000 +0200
+++ globus_xio-2.7/configure.in.in	2009-04-05 13:11:47.000000000 +0200
@@ -55,7 +55,7 @@
 CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
 LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", 
             "*.doc", 
-            "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+            "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_FUNCS(sysconf)
diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
--- globus_xio-2.7.orig/globus_xio_driver.h	2008-01-19 01:02:21.000000000 +0100
+++ globus_xio-2.7/globus_xio_driver.h	2009-04-05 13:11:47.000000000 +0200
@@ -1396,11 +1396,11 @@
  *  many available parsing functions but the developer is free to right their own
  *  if the provided ones are not sufficient.  Sample parsing functions follow:
  *
- *  - @ref globus_i_xio_attr_string_single_bool
- *  - @ref globus_i_xio_attr_string_single_float
- *  - @ref globus_i_xio_attr_string_single_int
- *  - @ref globus_i_xio_attr_string_single_string
- *  - @ref globus_i_xio_attr_string_dual_positive_int
+ *  - @ref globus_xio_string_cntl_bool
+ *  - @ref globus_xio_string_cntl_float
+ *  - @ref globus_xio_string_cntl_int
+ *  - @ref globus_xio_string_cntl_string
+ *  - @ref globus_xio_string_cntl_int_int
  *
  */
 /**
diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
--- globus_xio-2.7.orig/globus_xio.h	2008-02-14 08:04:07.000000000 +0100
+++ globus_xio-2.7/globus_xio.h	2009-04-05 13:11:47.000000000 +0200
@@ -118,7 +118,7 @@
  */
 
 /**
- * @addtongroup GLOBUS_XIO_API_ASSIST
+ * @addtogroup GLOBUS_XIO_API_ASSIST
  *
  *  \par Timeouts
  *  A user can set a timeout value for any io operation.  Each IO 
diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
--- globus_xio-2.7.orig/globus_xio_types.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_types.h	2009-04-05 13:11:47.000000000 +0200
@@ -189,6 +189,7 @@
      * @param config_string
      *      The driver specific paramter string.
      */
+    /* char *                           config_string */
     GLOBUS_XIO_SET_STRING_OPTIONS
     
 } globus_xio_handle_cmd_t;

globus-xio-type-punned-pointer.patch:

--- NEW FILE globus-xio-type-punned-pointer.patch ---
diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c
--- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.c	2006-07-25 18:30:34.000000000 +0200
+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.c	2008-12-31 14:50:21.000000000 +0100
@@ -526,7 +526,7 @@
     memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t));
     if (!attr)
     {
-        result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); 
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
@@ -537,7 +537,7 @@
     else
     {
         result = globus_l_xio_mode_e_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
         if (result != GLOBUS_SUCCESS)
         {
             result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c
--- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.c	2008-09-26 08:04:52.000000000 +0200
+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.c	2008-12-31 14:59:58.000000000 +0100
@@ -367,12 +367,12 @@
     }
     if (!attr)
     {
-       result = globus_l_xio_ordering_attr_init((void**)&handle->attr); 
+        result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr);
     }
     else
     {
         result = globus_l_xio_ordering_attr_copy(
-                                (void**)&handle->attr, (void*)attr);
+                                (void**)(void*)&handle->attr, (void*)attr);
     }
     if (result != GLOBUS_SUCCESS)
     {
diff -ur globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c
--- globus_xio-2.7.orig/builtins/tcp/globus_xio_tcp_driver.c	2008-09-18 08:17:07.000000000 +0200
+++ globus_xio-2.7/builtins/tcp/globus_xio_tcp_driver.c	2008-12-31 14:55:17.000000000 +0100
@@ -2028,7 +2028,7 @@
     }
     
     result = globus_l_xio_tcp_attr_copy(
-        (void **) &connect_info->attr, (void *) attr);
+        (void **) (void *) &connect_info->attr, (void *) attr);
     if(result != GLOBUS_SUCCESS)
     {
         result = GlobusXIOErrorWrapFailed(
diff -ur globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c globus_xio-2.7/builtins/telnet/globus_xio_telnet.c
--- globus_xio-2.7.orig/builtins/telnet/globus_xio_telnet.c	2007-08-08 00:50:29.000000000 +0200
+++ globus_xio-2.7/builtins/telnet/globus_xio_telnet.c	2008-12-31 14:48:06.000000000 +0100
@@ -455,7 +455,7 @@
         return GLOBUS_SUCCESS;
     }
 
-    res = globus_l_xio_telnet_attr_init((void **) &dest_attr);
+    res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr);
     if(res == GLOBUS_SUCCESS)
     {
         src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr;
@@ -525,7 +525,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_server_init);
 
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;
@@ -560,7 +560,7 @@
     globus_l_xio_telnet_attr_t *        attr;
     GlobusXIOName(globus_l_xio_telnet_accept);
    
-    res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server);
+    res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server);
     if(res != GLOBUS_SUCCESS)
     {
         goto error;


--- NEW FILE globus-xio.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Framework

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6585
Patch0:		%{name}-doxygen.patch
#		Bad version information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6584
Patch1:		%{name}-bad-age.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus XIO Framework Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO Framework Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Framework

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Framework Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus XIO Framework Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in
sed -e 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
  -i configure.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
	 $RPM_BUILD_ROOT%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do
  sed 's/P\.RS/P\n.RS/' -i $f
done

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-2_7-2_fc9:EL-5:globus-xio-2.7-2.fc9.src.rpm:1240393234


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:43:44 -0000	1.1
+++ .cvsignore	22 Apr 2009 09:41:53 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:43:44 -0000	1.1
+++ sources	22 Apr 2009 09:41:53 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz



From than at fedoraproject.org  Wed Apr 22 09:51:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 22 Apr 2009 09:51:13 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.214,1.215
Message-ID: <20090422095113.94D2D700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10785

Modified Files:
	kdebase-workspace.spec 
Log Message:
- dropp unused BR on libraw1394, it breaks the build on s390(x)




Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kdebase-workspace.spec	13 Apr 2009 00:31:55 -0000	1.214
+++ kdebase-workspace.spec	22 Apr 2009 09:50:41 -0000	1.215
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -72,7 +72,6 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
-BuildRequires: libraw1394-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
@@ -517,6 +516,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- dropp unused BR on libraw1394, it breaks the build on s390(x)
+
 * Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
 



From kdudka at fedoraproject.org  Wed Apr 22 10:14:39 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 22 Apr 2009 10:14:39 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.4-debug.patch, NONE, 1.1 curl.spec, 1.94, 
	1.95 curl-7.19.4-flags.patch, 1.1, NONE
Message-ID: <20090422101439.D3497700FE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20549

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-debug.patch 
Removed Files:
	curl-7.19.4-flags.patch 
Log Message:
fix configure.ac to not discard -g in CFLAGS (#496778)

curl-7.19.4-debug.patch:

--- NEW FILE curl-7.19.4-debug.patch ---
diff -ruNp curl-7.19.4.orig/configure.ac curl-7.19.4/configure.ac
--- curl-7.19.4.orig/configure.ac	2009-02-13 15:25:15.000000000 +0100
+++ curl-7.19.4/configure.ac	2009-04-22 11:56:32.171305420 +0200
@@ -241,7 +241,10 @@ dnl ************************************
 
 CURL_CHECK_COMPILER
 CURL_SET_COMPILER_BASIC_OPTS
-CURL_SET_COMPILER_DEBUG_OPTS
+
+dnl do not perturb CFLAGS given by the build system
+dnl CURL_SET_COMPILER_DEBUG_OPTS
+
 CURL_SET_COMPILER_OPTIMIZE_OPTS
 CURL_SET_COMPILER_WARNING_OPTS
 


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- curl.spec	21 Apr 2009 16:12:16 -0000	1.94
+++ curl.spec	22 Apr 2009 10:14:36 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -11,7 +11,7 @@
 Patch4: curl-7.19.4-tool-leak.patch
 Patch5: curl-7.19.4-enable-aes.patch
 Patch6: curl-7.19.4-nss-leak.patch
-Patch7: curl-7.19.4-flags.patch
+Patch7: curl-7.19.4-debug.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +56,7 @@
 %patch4 -p1 -b .toolleak
 %patch5 -p1 -b .enableaes
 %patch6 -p1 -b .nssleak
-%patch7 -p1 -b .flags
+%patch7 -p1 -b .debug
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -65,6 +65,7 @@
 done
 
 %build
+autoconf
 export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
 %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
@@ -148,6 +149,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Apr 22 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-8
+- fix configure.ac to not discard -g in CFLAGS (#496778)
+
 * Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> 7.19.4-7
 - Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.
 


--- curl-7.19.4-flags.patch DELETED ---



From caolanm at fedoraproject.org  Wed Apr 22 10:22:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 22 Apr 2009 10:22:57 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1888,
	1.1889 workspace.hb18.patch, 1.1,
	1.2 openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch,
	1.1, NONE
Message-ID: <20090422102258.02418700FE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23394/F-11

Modified Files:
	openoffice.org.spec workspace.hb18.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch 
Log Message:
merge patchs to accepted upstream workspaces


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1888
retrieving revision 1.1889
diff -u -r1.1888 -r1.1889
--- openoffice.org.spec	21 Apr 2009 19:48:30 -0000	1.1888
+++ openoffice.org.spec	22 Apr 2009 10:22:23 -0000	1.1889
@@ -135,10 +135,8 @@
 Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch61: workspace.vcl101.patch
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
-Patch64: workspace.slideshow1.patch
-Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch66: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
+Patch63: workspace.slideshow1.patch
+Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1611,7 +1609,7 @@
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p1 -b .workspace.hb18.patch
+%patch42 -p0 -b .workspace.hb18.patch
 %patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
 %patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 %patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
@@ -1632,10 +1630,8 @@
 %patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 %patch61 -p1 -b .workspace.vcl101.patch
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
-%patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
-%patch64 -p2 -b .workspace.slideshow1.patch
-%patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch66 -p0 -b .ooo101159.ww8.export.commentfields.patch
+%patch63 -p2 -b .workspace.slideshow1.patch
+%patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.hb18.patch:

Index: workspace.hb18.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.hb18.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.hb18.patch	20 Apr 2009 21:38:11 -0000	1.1
+++ workspace.hb18.patch	22 Apr 2009 10:22:24 -0000	1.2
@@ -3,8 +3,8 @@
 RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
 retrieving revision 1.11
 diff -u -r1.11 index.cxx
---- openoffice.org.orig/sw/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
-+++ openoffice.org/sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
+--- sw.orig/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
++++ sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
 @@ -302,7 +302,7 @@
  			pArr->pFirst = pArr->pLast = this;
  			nIndex = nIdx;
@@ -14,3 +14,87 @@
  			ChgValue( *pArr->pLast, nIdx );
  		else
  			ChgValue( *pArr->pFirst, nIdx );
+diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
+--- sw.orig/source/filter/ww8/wrtww8.cxx	2009-04-21 16:44:21.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.cxx	2009-04-21 17:11:00.000000000 +0100
+@@ -645,6 +645,11 @@
+             plc = &rWrt.pFib->lcbPlcffldEdn;
+             break;
+ 
++        case TXT_ATN:
++            pfc = &rWrt.pFib->fcPlcffldAtn;
++            plc = &rWrt.pFib->lcbPlcffldAtn;
++            break;
++
+         case TXT_TXTBOX:
+             pfc = &rWrt.pFib->fcPlcffldTxbx;
+             plc = &rWrt.pFib->lcbPlcffldTxbx;
+@@ -2455,6 +2460,7 @@
+         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
+         pFldFtn->Write( *this );                // Fields ( FootNotes )
+         pFldEdn->Write( *this );                // Fields ( EndNotes )
++        pFldAtn->Write( *this );                // Fields ( Annotations )
+         pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
+                                                 // plcfBkmkf/plcfBkmkl
+         WriteDop( *this );                      // Document-Properties
+@@ -2490,6 +2496,7 @@
+         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
+         pFldFtn->Write( *this );                // Fields ( FootNotes )
+         pFldEdn->Write( *this );                // Fields ( EndNotes )
++        pFldAtn->Write( *this );                // Fields ( Annotations )
+         pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
+         pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
+ 
+@@ -2834,6 +2841,7 @@
+     pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
+     pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
+     pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
++    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
+     pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
+     pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
+ 
+@@ -2883,6 +2891,7 @@
+     DELETEZ( pFldFtn );
+     DELETEZ( pFldTxtBxs );
+     DELETEZ( pFldHFTxtBxs );
++    DELETEZ( pFldAtn );
+     DELETEZ( pFldEdn );
+     DELETEZ( pFldHdFt );
+     DELETEZ( pFldMain );
+@@ -3110,7 +3119,11 @@
+ 
+ bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
+ {
+-    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
++    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
++    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
++                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
++                        + rWrt.pFib->ccpHdr );
++    return bRet;
+ }
+ 
+ void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
+diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
+--- sw.orig/source/filter/ww8/wrtww8.hxx	2009-04-21 16:44:21.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.hxx	2009-04-21 16:49:27.000000000 +0100
+@@ -473,6 +473,7 @@
+     WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
+     WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
+     WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
++    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
+     WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
+     WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
+     WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
+diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
+--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-21 16:44:21.000000000 +0100
++++ sw/source/filter/ww8/ww8atr.cxx	2009-04-21 16:48:29.000000000 +0100
+@@ -1764,6 +1764,9 @@
+         case TXT_EDN:
+             pFldP = pFldEdn;
+             break;
++        case TXT_ATN:
++            pFldP = pFldAtn;
++            break;
+         case TXT_TXTBOX:
+             pFldP = pFldTxtBxs;
+             break;


--- openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch DELETED ---



From caolanm at fedoraproject.org  Wed Apr 22 10:23:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 22 Apr 2009 10:23:00 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1890,
	1.1891 workspace.hb18.patch, 1.1,
	1.2 openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch,
	1.1, NONE
Message-ID: <20090422102300.8BAEF700FE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23394/devel

Modified Files:
	openoffice.org.spec workspace.hb18.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch 
Log Message:
merge patchs to accepted upstream workspaces


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1890
retrieving revision 1.1891
diff -u -r1.1890 -r1.1891
--- openoffice.org.spec	21 Apr 2009 20:10:01 -0000	1.1890
+++ openoffice.org.spec	22 Apr 2009 10:22:27 -0000	1.1891
@@ -137,7 +137,6 @@
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: workspace.slideshow1.patch
 Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch65: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1610,7 +1609,7 @@
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p1 -b .workspace.hb18.patch
+%patch42 -p0 -b .workspace.hb18.patch
 %patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
 %patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 %patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
@@ -1633,7 +1632,6 @@
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
 %patch63 -p2 -b .workspace.slideshow1.patch
 %patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch65 -p0 -b .ooo101159.ww8.export.commentfields.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.hb18.patch:

Index: workspace.hb18.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.hb18.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.hb18.patch	20 Apr 2009 21:38:12 -0000	1.1
+++ workspace.hb18.patch	22 Apr 2009 10:22:28 -0000	1.2
@@ -3,8 +3,8 @@
 RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
 retrieving revision 1.11
 diff -u -r1.11 index.cxx
---- openoffice.org.orig/sw/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
-+++ openoffice.org/sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
+--- sw.orig/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
++++ sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
 @@ -302,7 +302,7 @@
  			pArr->pFirst = pArr->pLast = this;
  			nIndex = nIdx;
@@ -14,3 +14,87 @@
  			ChgValue( *pArr->pLast, nIdx );
  		else
  			ChgValue( *pArr->pFirst, nIdx );
+diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
+--- sw.orig/source/filter/ww8/wrtww8.cxx	2009-04-21 16:44:21.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.cxx	2009-04-21 17:11:00.000000000 +0100
+@@ -645,6 +645,11 @@
+             plc = &rWrt.pFib->lcbPlcffldEdn;
+             break;
+ 
++        case TXT_ATN:
++            pfc = &rWrt.pFib->fcPlcffldAtn;
++            plc = &rWrt.pFib->lcbPlcffldAtn;
++            break;
++
+         case TXT_TXTBOX:
+             pfc = &rWrt.pFib->fcPlcffldTxbx;
+             plc = &rWrt.pFib->lcbPlcffldTxbx;
+@@ -2455,6 +2460,7 @@
+         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
+         pFldFtn->Write( *this );                // Fields ( FootNotes )
+         pFldEdn->Write( *this );                // Fields ( EndNotes )
++        pFldAtn->Write( *this );                // Fields ( Annotations )
+         pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
+                                                 // plcfBkmkf/plcfBkmkl
+         WriteDop( *this );                      // Document-Properties
+@@ -2490,6 +2496,7 @@
+         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
+         pFldFtn->Write( *this );                // Fields ( FootNotes )
+         pFldEdn->Write( *this );                // Fields ( EndNotes )
++        pFldAtn->Write( *this );                // Fields ( Annotations )
+         pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
+         pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
+ 
+@@ -2834,6 +2841,7 @@
+     pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
+     pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
+     pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
++    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
+     pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
+     pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
+ 
+@@ -2883,6 +2891,7 @@
+     DELETEZ( pFldFtn );
+     DELETEZ( pFldTxtBxs );
+     DELETEZ( pFldHFTxtBxs );
++    DELETEZ( pFldAtn );
+     DELETEZ( pFldEdn );
+     DELETEZ( pFldHdFt );
+     DELETEZ( pFldMain );
+@@ -3110,7 +3119,11 @@
+ 
+ bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
+ {
+-    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
++    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
++    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
++                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
++                        + rWrt.pFib->ccpHdr );
++    return bRet;
+ }
+ 
+ void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
+diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
+--- sw.orig/source/filter/ww8/wrtww8.hxx	2009-04-21 16:44:21.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.hxx	2009-04-21 16:49:27.000000000 +0100
+@@ -473,6 +473,7 @@
+     WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
+     WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
+     WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
++    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
+     WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
+     WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
+     WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
+diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
+--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-21 16:44:21.000000000 +0100
++++ sw/source/filter/ww8/ww8atr.cxx	2009-04-21 16:48:29.000000000 +0100
+@@ -1764,6 +1764,9 @@
+         case TXT_EDN:
+             pFldP = pFldEdn;
+             break;
++        case TXT_ATN:
++            pFldP = pFldAtn;
++            break;
+         case TXT_TXTBOX:
+             pFldP = pFldTxtBxs;
+             break;


--- openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch DELETED ---



From kkofler at fedoraproject.org  Wed Apr 22 10:27:39 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 22 Apr 2009 10:27:39 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-plasma-focus.patch,1.1,1.2
Message-ID: <20090422102739.82461700FE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25290/devel

Modified Files:
	kdelibs-4.2.2-plasma-focus.patch 
Log Message:
Sync the plasma-focus patch as well.

kdelibs-4.2.2-plasma-focus.patch:

Index: kdelibs-4.2.2-plasma-focus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.2.2-plasma-focus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-plasma-focus.patch	7 Apr 2009 15:43:04 -0000	1.1
+++ kdelibs-4.2.2-plasma-focus.patch	22 Apr 2009 10:27:37 -0000	1.2
@@ -1,12 +1,73 @@
 diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
 --- kdelibs-4.2.2/plasma/popupapplet.cpp.orig	2009-03-30 23:41:08.000000000 +0200
-+++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-07 17:36:51.000000000 +0200
-@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
++++ kdelibs-4.2.2/plasma/popupapplet.cpp	2009-04-21 12:52:16.000000000 +0200
+@@ -275,14 +275,8 @@ void PopupAppletPrivate::popupConstraint
+                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
                  //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                  //else.
-                 //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
+-                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
 -                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+-
+-                if (passive) {
+-                    wflags |= Qt::X11BypassWindowManagerHint;
+-                }
+-
+-                dialog->setWindowFlags(wflags);
++                dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
++                updateDialogFlags();
+                 KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
+                 dialog->installEventFilter(q);
+ 
+@@ -340,7 +334,7 @@ void PopupApplet::mouseReleaseEvent(QGra
+ 
+ bool PopupApplet::eventFilter(QObject *watched, QEvent *event)
+ {
+-    if (watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
++    if (!d->passive && watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
+         d->popupLostFocus = true;
+         hidePopup();
+         QTimer::singleShot(100, this, SLOT(clearPopupLostFocus()));
+@@ -411,15 +405,7 @@ void PopupApplet::setPassivePopup(bool p
+     d->passive = passive;
+ 
+     if (d->dialog) {
+-        Qt::WindowFlags wflags = d->dialog->windowFlags();
+-
+-        if (d->passive) {
+-            wflags |= Qt::X11BypassWindowManagerHint;
+-        } else {
+-            wflags &= ~Qt::X11BypassWindowManagerHint;
+-        }
+-
+-        d->dialog->setWindowFlags(wflags);
++        d->updateDialogFlags();
+     }
+ }
+ 
+@@ -628,6 +614,15 @@ void PopupAppletPrivate::updateDialogPos
+ 
+     dialog->move(pos);
+ }
++
++
++void PopupAppletPrivate::updateDialogFlags()
++{
++    Q_ASSERT(dialog);
++    dialog->setAttribute(Qt::WA_X11NetWmWindowTypeNotification, passive);
++}
++
++
+ } // Plasma namespace
+ 
+ #include "popupapplet.moc"
+diff -up kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig kdelibs-4.2.2/plasma/private/popupapplet_p.h
+--- kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig	2009-04-21 12:59:29.000000000 +0200
++++ kdelibs-4.2.2/plasma/private/popupapplet_p.h	2009-04-21 12:52:16.000000000 +0200
+@@ -35,6 +35,7 @@ public:
+     void dialogSizeChanged();
+     void dialogStatusChanged(bool status);
+     void updateDialogPosition();
++    void updateDialogFlags();
+     void popupConstraintsEvent(Plasma::Constraints constraints);
+     void checkExtenderAppearance(Plasma::FormFactor f);
  
-                 if (passive) {
-                     wflags |= Qt::X11BypassWindowManagerHint;



From than at fedoraproject.org  Wed Apr 22 10:35:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 22 Apr 2009 10:35:42 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.214,1.215
Message-ID: <20090422103542.B143770104@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28174

Modified Files:
	kdebase-workspace.spec 
Log Message:
- dropp unused BR on libraw1394, it breaks the build on s390(x)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kdebase-workspace.spec	13 Apr 2009 00:31:55 -0000	1.214
+++ kdebase-workspace.spec	22 Apr 2009 10:35:11 -0000	1.215
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -72,7 +72,6 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
-BuildRequires: libraw1394-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
@@ -517,6 +516,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- dropp unused BR on libraw1394, it breaks the build on s390(x)
+
 * Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
 



From kdudka at fedoraproject.org  Wed Apr 22 10:40:25 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 22 Apr 2009 10:40:25 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.95,1.96
Message-ID: <20090422104025.91AE1700FE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30615

Modified Files:
	curl.spec 
Log Message:
add missing BuildRequire for autoconf


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- curl.spec	22 Apr 2009 10:14:36 -0000	1.95
+++ curl.spec	22 Apr 2009 10:40:17 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -15,6 +15,7 @@
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
 BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
 
@@ -149,6 +150,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Apr 22 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-9
+- add missing BuildRequire for autoconf
+
 * Wed Apr 22 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-8
 - fix configure.ac to not discard -g in CFLAGS (#496778)
 



From karsten at fedoraproject.org  Wed Apr 22 10:54:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 22 Apr 2009 10:54:10 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec,1.82,1.83
Message-ID: <20090422105410.4F0EC700FE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3217

Modified Files:
	kdebase3.spec 
Log Message:
- disable firewire stuff on s390(x)


Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdebase3.spec	27 Mar 2009 13:32:22 -0000	1.82
+++ kdebase3.spec	22 Apr 2009 10:53:36 -0000	1.83
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 10%{?dist}
+Release: 10%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -372,7 +372,9 @@
    --with-kdm-pam=kdm \
    --with-kcp-pam=kcheckpass \
    --with-kss-pam=kscreensaver \
+%ifnarch s390 s390x
    --with-libraw1394 \
+%endif
    --with-openexr \
    --with-samba \
    --with-xinerama \
@@ -876,6 +878,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Karsten Hopp <karsten at redhat.com> 3.5.10-10.1
+- disable firewire stuff on s390(x)
+
 * Fri Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-10
 - optimize scriptlets
 



From rhughes at fedoraproject.org  Wed Apr 22 11:09:37 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 22 Apr 2009 11:09:37 +0000 (UTC)
Subject: rpms/PackageKit/F-11 PackageKit-0.4.6-send-package-finished.patch, 
	NONE, 1.1 PackageKit.spec, 1.103, 1.104
Message-ID: <20090422110937.942D170104@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8228

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-send-package-finished.patch 
Log Message:
* Wed Apr 22 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-6
- Send ::Package(finished) when we've finished downloading a file rather than
  relying for the daemon to clean up for us.
- Fixes #496787


PackageKit-0.4.6-send-package-finished.patch:

--- NEW FILE PackageKit-0.4.6-send-package-finished.patch ---
commit 6ed10da156d9130f5443c1348405434cdc0cdfce
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Apr 22 11:55:22 2009 +0100

    yum: send INFO_FINISHED when we've finished downloading a file rather than relying for the daemon to clean up for us. Fixes rh#496787

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 43d9cd3..8dc17ee 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -2637,6 +2637,12 @@ class DownloadCallback(BaseMeter):
                         self.base.status(typ)
                         break
 
+        # package finished
+        if val == 100:
+            pkg = self._getPackage(name)
+            if pkg:
+                self.base._show_package(pkg, INFO_FINISHED)
+
         # set sub-percentage
         self.base.sub_percentage(val)
 


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- PackageKit.spec	21 Apr 2009 10:19:55 -0000	1.103
+++ PackageKit.spec	22 Apr 2009 11:09:34 -0000	1.104
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -48,6 +48,9 @@
 # Already upstream: dd136f6760d375ba55ec98ab02291028c03d8b46
 Patch9:    PackageKit-0.4.6-Presto-handle-downloading-updates.patch
 
+# Already upstream: 6ed10da156d9130f5443c1348405434cdc0cdfce
+Patch10:   PackageKit-0.4.6-send-package-finished.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -256,6 +259,7 @@
 %patch7 -p1 -b .dont-use-obsolete
 %patch8 -p1 -b .presto-filter
 %patch9 -p1 -b .presto-downloading-updates
+%patch10 -p1 -b .send-package-finished
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -450,6 +454,11 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed Apr 22 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-6
+- Send ::Package(finished) when we've finished downloading a file rather than
+  relying for the daemon to clean up for us.
+- Fixes #496787
+
 * Tue Apr 21 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-5
 - Rework one of the Presto patches so that it works with multiple packages.
 



From ellert at fedoraproject.org  Wed Apr 22 11:11:02 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 11:11:02 +0000 (UTC)
Subject: rpms/globus-rsl/devel globus-rsl.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422111102.9968570103@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9014/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl
%global _name %(tr - _ <<< %{name})
Version:	5.0
Release:	2%{?dist}
Summary:	Globus Toolkit - Resource Specification Language Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl/source globus_rsl-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
#		tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Resource Specification Language Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Resource Specification Language Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Resource Specification Language Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-5_0-2_fc9:HEAD:globus-rsl-5.0-2.fc9.src.rpm:1240398529


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:44:35 -0000	1.1
+++ .cvsignore	22 Apr 2009 11:10:59 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl-5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:44:35 -0000	1.1
+++ sources	22 Apr 2009 11:11:00 -0000	1.2
@@ -0,0 +1 @@
+10a41bb05089d24948341cf953ece353  globus_rsl-5.0.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 11:13:39 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 11:13:39 +0000 (UTC)
Subject: rpms/globus-rsl/F-9 globus-rsl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422111339.6C5C170103@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10324/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl
%global _name %(tr - _ <<< %{name})
Version:	5.0
Release:	2%{?dist}
Summary:	Globus Toolkit - Resource Specification Language Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl/source globus_rsl-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
#		tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Resource Specification Language Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Resource Specification Language Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Resource Specification Language Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-5_0-2_fc9:F-9:globus-rsl-5.0-2.fc9.src.rpm:1240398731


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:44:35 -0000	1.1
+++ .cvsignore	22 Apr 2009 11:13:35 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl-5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:44:35 -0000	1.1
+++ sources	22 Apr 2009 11:13:35 -0000	1.2
@@ -0,0 +1 @@
+10a41bb05089d24948341cf953ece353  globus_rsl-5.0.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 11:16:19 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 11:16:19 +0000 (UTC)
Subject: rpms/globus-rsl/F-10 globus-rsl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422111619.6A47870103@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11461/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl
%global _name %(tr - _ <<< %{name})
Version:	5.0
Release:	2%{?dist}
Summary:	Globus Toolkit - Resource Specification Language Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl/source globus_rsl-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
#		tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Resource Specification Language Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Resource Specification Language Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Resource Specification Language Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-5_0-2_fc9:F-10:globus-rsl-5.0-2.fc9.src.rpm:1240398884


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:44:35 -0000	1.1
+++ .cvsignore	22 Apr 2009 11:16:15 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl-5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:44:35 -0000	1.1
+++ sources	22 Apr 2009 11:16:16 -0000	1.2
@@ -0,0 +1 @@
+10a41bb05089d24948341cf953ece353  globus_rsl-5.0.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 11:19:30 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 11:19:30 +0000 (UTC)
Subject: rpms/globus-rsl/F-11 globus-rsl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422111930.3722D700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12783/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl
%global _name %(tr - _ <<< %{name})
Version:	5.0
Release:	2%{?dist}
Summary:	Globus Toolkit - Resource Specification Language Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl/source globus_rsl-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
#		tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Resource Specification Language Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Resource Specification Language Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Resource Specification Language Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-5_0-2_fc9:F-11:globus-rsl-5.0-2.fc9.src.rpm:1240399037


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:44:35 -0000	1.1
+++ .cvsignore	22 Apr 2009 11:18:56 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl-5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:44:35 -0000	1.1
+++ sources	22 Apr 2009 11:18:56 -0000	1.2
@@ -0,0 +1 @@
+10a41bb05089d24948341cf953ece353  globus_rsl-5.0.tar.gz



From ellert at fedoraproject.org  Wed Apr 22 11:21:55 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 11:21:55 +0000 (UTC)
Subject: rpms/globus-rsl/EL-4 globus-rsl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422112156.0CD74700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl
%global _name %(tr - _ <<< %{name})
Version:	5.0
Release:	2%{?dist}
Summary:	Globus Toolkit - Resource Specification Language Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl/source globus_rsl-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
#		tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Resource Specification Language Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Resource Specification Language Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Resource Specification Language Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-5_0-2_fc9:EL-4:globus-rsl-5.0-2.fc9.src.rpm:1240399238


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:44:35 -0000	1.1
+++ .cvsignore	22 Apr 2009 11:21:54 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl-5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:44:35 -0000	1.1
+++ sources	22 Apr 2009 11:21:54 -0000	1.2
@@ -0,0 +1 @@
+10a41bb05089d24948341cf953ece353  globus_rsl-5.0.tar.gz



From giallu at fedoraproject.org  Wed Apr 22 11:23:38 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Wed, 22 Apr 2009 11:23:38 +0000 (UTC)
Subject: rpms/ogmtools/F-11 ogmtools-1.5-optflags.patch, NONE,
	1.1 ogmtools.spec, 1.1, 1.2
Message-ID: <20090422112338.E5EDB700FE@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/ogmtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14612

Modified Files:
	ogmtools.spec 
Added Files:
	ogmtools-1.5-optflags.patch 
Log Message:
* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 1.5-6
- honour RPM_OPT_FLAGS
- use --disable-dependency-tracking


ogmtools-1.5-optflags.patch:

--- NEW FILE ogmtools-1.5-optflags.patch ---
diff --git a/configure b/configure
index 1869ad6..25b1d8c 100755
--- a/configure
+++ b/configure
@@ -4672,8 +4672,8 @@ _ACEOF
 fi
 
 
-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
+CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ $CFLAGS"
+CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ $CXXFLAGS"
 
                     ac_config_files="$ac_config_files Makefile avilib/Makefile"
 cat >confcache <<\_ACEOF


Index: ogmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/F-11/ogmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogmtools.spec	16 Apr 2009 07:17:09 -0000	1.1
+++ ogmtools.spec	22 Apr 2009 11:23:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ogmtools
 Version:        1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tools for Ogg media streams
 
 Group:          Applications/Multimedia
@@ -13,6 +13,8 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  libdvdread-devel
 
+Patch0:         ogmtools-1.5-optflags.patch
+
 %description
 These tools allow information about (ogminfo) or extraction from (ogmdemux) or
 creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
@@ -21,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # Convert Changelog to UTF8
 iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
 touch -r ChangeLog ChangeLog.txt
@@ -28,7 +31,7 @@
 
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -49,6 +52,10 @@
 
 
 %changelog
+* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 1.5-6
+- honour RPM_OPT_FLAGS
+- use --disable-dependency-tracking
+
 * Thu Apr  9 2009 Gianluca Sforna <giallu gmail com> - 1.5-5
 - Fix rpmlint issues
 - Fix license tag



From giallu at fedoraproject.org  Wed Apr 22 11:25:26 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Wed, 22 Apr 2009 11:25:26 +0000 (UTC)
Subject: rpms/ogmtools/F-10 ogmtools-1.5-optflags.patch, NONE,
	1.1 ogmtools.spec, 1.1, 1.2
Message-ID: <20090422112526.63327700FE@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/ogmtools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15109

Modified Files:
	ogmtools.spec 
Added Files:
	ogmtools-1.5-optflags.patch 
Log Message:
* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 1.5-6
- honour RPM_OPT_FLAGS
- use --disable-dependency-tracking


ogmtools-1.5-optflags.patch:

--- NEW FILE ogmtools-1.5-optflags.patch ---
diff --git a/configure b/configure
index 1869ad6..25b1d8c 100755
--- a/configure
+++ b/configure
@@ -4672,8 +4672,8 @@ _ACEOF
 fi
 
 
-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
+CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ $CFLAGS"
+CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ $CXXFLAGS"
 
                     ac_config_files="$ac_config_files Makefile avilib/Makefile"
 cat >confcache <<\_ACEOF


Index: ogmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/F-10/ogmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogmtools.spec	16 Apr 2009 07:41:38 -0000	1.1
+++ ogmtools.spec	22 Apr 2009 11:25:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ogmtools
 Version:        1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tools for Ogg media streams
 
 Group:          Applications/Multimedia
@@ -13,6 +13,8 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  libdvdread-devel
 
+Patch0:         ogmtools-1.5-optflags.patch
+
 %description
 These tools allow information about (ogminfo) or extraction from (ogmdemux) or
 creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
@@ -21,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # Convert Changelog to UTF8
 iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
 touch -r ChangeLog ChangeLog.txt
@@ -28,7 +31,7 @@
 
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -49,6 +52,10 @@
 
 
 %changelog
+* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 1.5-6
+- honour RPM_OPT_FLAGS
+- use --disable-dependency-tracking
+
 * Thu Apr  9 2009 Gianluca Sforna <giallu gmail com> - 1.5-5
 - Fix rpmlint issues
 - Fix license tag



From ellert at fedoraproject.org  Wed Apr 22 11:27:38 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 22 Apr 2009 11:27:38 +0000 (UTC)
Subject: rpms/globus-rsl/EL-5 globus-rsl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090422112738.3F7C6700FE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16454/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl
%global _name %(tr - _ <<< %{name})
Version:	5.0
Release:	2%{?dist}
Summary:	Globus Toolkit - Resource Specification Language Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl/source globus_rsl-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
#		tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Resource Specification Language Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Resource Specification Language Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Resource Specification Language Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
- Put GLOBUS_LICENSE file in extracted source tarball

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-5_0-2_fc9:EL-5:globus-rsl-5.0-2.fc9.src.rpm:1240399582


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:44:35 -0000	1.1
+++ .cvsignore	22 Apr 2009 11:27:33 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl-5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 19:44:35 -0000	1.1
+++ sources	22 Apr 2009 11:27:34 -0000	1.2
@@ -0,0 +1 @@
+10a41bb05089d24948341cf953ece353  globus_rsl-5.0.tar.gz



From karsten at fedoraproject.org  Wed Apr 22 11:47:20 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 22 Apr 2009 11:47:20 +0000 (UTC)
Subject: rpms/atlas/devel atlas.spec,1.21,1.22
Message-ID: <20090422114720.DC45C70103@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22234

Modified Files:
	atlas.spec 
Log Message:
- add s390x to 64 bit archs


Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- atlas.spec	27 Feb 2009 18:24:52 -0000	1.21
+++ atlas.spec	22 Apr 2009 11:47:16 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -121,7 +121,7 @@
 %endif
 %endif
 
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 s390x
 %define mode 64
 %else
 %define mode 32
@@ -279,6 +279,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Karsten Hopp <karsten at redhat.com> 3.8.3-3.1
+- add s390x to 64 bit archs
+
 * Fri Feb 27 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-3
 - Rebuild
 



From hadess at fedoraproject.org  Wed Apr 22 12:15:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 22 Apr 2009 12:15:46 +0000 (UTC)
Subject: rpms/rhythmbox/F-11 .cvsignore, 1.50, 1.51 rhythmbox.spec, 1.243,
	1.244 sources, 1.52, 1.53 fix-psp-entry-types.diff, 1.1,
	NONE rb-0.12.0-sj-updates.patch, 1.1,
	NONE rb-0.12.0-use-decodebin2.patch, 1.1,
	NONE rb-ddkit-monitor.patch, 1.4, NONE
Message-ID: <20090422121546.D3933700FE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31872

Modified Files:
	.cvsignore rhythmbox.spec sources 
Removed Files:
	fix-psp-entry-types.diff rb-0.12.0-sj-updates.patch 
	rb-0.12.0-use-decodebin2.patch rb-ddkit-monitor.patch 
Log Message:
* Wed Apr 22 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0.92-1
- Update to 0.12.0.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	19 Mar 2009 10:51:42 -0000	1.50
+++ .cvsignore	22 Apr 2009 12:15:31 -0000	1.51
@@ -1 +1 @@
-rhythmbox-0.12.0.tar.bz2
+rhythmbox-0.12.0.92.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/rhythmbox.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- rhythmbox.spec	14 Apr 2009 13:46:49 -0000	1.243
+++ rhythmbox.spec	22 Apr 2009 12:15:35 -0000	1.244
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.12.0
-Release: 5%{?dist}
+Version: 0.12.0.92
+Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -52,14 +52,6 @@
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
-# http://svn.gnome.org/viewvc/rhythmbox?view=revision&revision=6245
-Patch1: rb-0.12.0-use-decodebin2.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=510236
-Patch2: fix-psp-entry-types.diff
-# http://bugzilla.gnome.org/show_bug.cgi?id=578514
-Patch3: rb-ddkit-monitor.patch
-BuildRequires: automake autoconf libtool
-Patch4: rb-0.12.0-sj-updates.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -94,17 +86,10 @@
 %setup -q
 
 %patch0 -p0 -b .dont-disable-suspend
-%patch1 -p0 -b .decodebin2
-%patch2 -p1 -b .psp-crasher
-%patch3 -p1 -b .ddkit
-%patch4 -p1 -b .sj
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
 
-aclocal
-automake
-
 %build
 
 # work around a gstreamer bug
@@ -237,6 +222,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Apr 22 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0.92-1
+- Update to 0.12.0.92
+
 * Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-5
 - Fix possible crashers in the libmusicbrainz3 code
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	19 Mar 2009 10:51:42 -0000	1.52
+++ sources	22 Apr 2009 12:15:35 -0000	1.53
@@ -1 +1 @@
-ae6bc15786cc7659b41c313e45adf44a  rhythmbox-0.12.0.tar.bz2
+ac0e342bb68e5dde0cb1df5ba62f305e  rhythmbox-0.12.0.92.tar.bz2


--- fix-psp-entry-types.diff DELETED ---


--- rb-0.12.0-sj-updates.patch DELETED ---


--- rb-0.12.0-use-decodebin2.patch DELETED ---


--- rb-ddkit-monitor.patch DELETED ---



From than at fedoraproject.org  Wed Apr 22 12:18:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 22 Apr 2009 12:18:55 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.195,1.196
Message-ID: <20090422121855.B4244700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119

Modified Files:
	kdegraphics.spec 
Log Message:
- fix build issue on s390(x)




Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kdegraphics.spec	3 Apr 2009 15:30:31 -0000	1.195
+++ kdegraphics.spec	22 Apr 2009 12:18:53 -0000	1.196
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -32,11 +32,14 @@
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
+%ifnarch s390 s390x
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
 BuildRequires:  gphoto2-devel
 %endif
+BuildRequires:  sane-backends-devel
+%endif
 BuildRequires:  libspectre-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXxf86vm-devel
@@ -44,7 +47,6 @@
 BuildRequires:  poppler-qt4-devel
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
-BuildRequires:  sane-backends-devel
 BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -171,11 +173,13 @@
 %{_kde4_appsdir}/svgpart/
 %{_kde4_libdir}/kde4/gsthumbnail.so
 %{_kde4_libdir}/kde4/gvpart.so
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/kio_kamera.so
-%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/ksaneplugin.so
+%endif
+%{_kde4_libdir}/kde4/kcm_kgamma.so
+%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -202,7 +206,9 @@
 %{_kde4_libdir}/libkexiv2.so.7*
 %{_kde4_libdir}/libkipi.so.6*
 %{_kde4_libdir}/libkolourpaint_lgpl.so.4*
+%ifnarch s390 s390x
 %{_kde4_libdir}/libksane.so.0*
+%endif
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
@@ -214,7 +220,9 @@
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
 %endif
+%ifnarch s390 s390x
 %{_kde4_includedir}/libksane/
+%endif
 %{_kde4_includedir}/okular/
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/FindKSane.cmake
@@ -223,6 +231,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- fix build issue on s390(x)
+
 * Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
 - work around Kolourpaint crash with Qt 4.5 (kde#183850)
 



From than at fedoraproject.org  Wed Apr 22 12:21:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 22 Apr 2009 12:21:39 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 kdegraphics.spec,1.195,1.196
Message-ID: <20090422122139.D1834700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1993

Modified Files:
	kdegraphics.spec 
Log Message:
fix build issue on s390(x)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kdegraphics.spec	3 Apr 2009 15:30:31 -0000	1.195
+++ kdegraphics.spec	22 Apr 2009 12:21:37 -0000	1.196
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -32,11 +32,14 @@
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
+%ifnarch s390 s390x
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
 BuildRequires:  gphoto2-devel
 %endif
+BuildRequires:  sane-backends-devel
+%endif
 BuildRequires:  libspectre-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXxf86vm-devel
@@ -44,7 +47,6 @@
 BuildRequires:  poppler-qt4-devel
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
-BuildRequires:  sane-backends-devel
 BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -171,11 +173,13 @@
 %{_kde4_appsdir}/svgpart/
 %{_kde4_libdir}/kde4/gsthumbnail.so
 %{_kde4_libdir}/kde4/gvpart.so
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/kio_kamera.so
-%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/ksaneplugin.so
+%endif
+%{_kde4_libdir}/kde4/kcm_kgamma.so
+%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -202,7 +206,9 @@
 %{_kde4_libdir}/libkexiv2.so.7*
 %{_kde4_libdir}/libkipi.so.6*
 %{_kde4_libdir}/libkolourpaint_lgpl.so.4*
+%ifnarch s390 s390x
 %{_kde4_libdir}/libksane.so.0*
+%endif
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
@@ -214,7 +220,9 @@
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
 %endif
+%ifnarch s390 s390x
 %{_kde4_includedir}/libksane/
+%endif
 %{_kde4_includedir}/okular/
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/FindKSane.cmake
@@ -223,6 +231,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- fix build issue on s390(x)
+
 * Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
 - work around Kolourpaint crash with Qt 4.5 (kde#183850)
 



From pkgdb at fedoraproject.org  Wed Apr 22 12:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 12:27:33 +0000
Subject: [pkgdb] opencv: kwizart has requested watchbugzilla
Message-ID: <20090422122733.8243510F886@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchbugzilla acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 12:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 12:27:34 +0000
Subject: [pkgdb] opencv: kwizart has requested watchcommits
Message-ID: <20090422122735.587D710F88A@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchcommits acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 12:27:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 12:27:37 +0000
Subject: [pkgdb] opencv: kwizart has requested commit
Message-ID: <20090422122737.38B0910F88D@bastion2.fedora.phx.redhat.com>

kwizart has requested the commit acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 12:27:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 12:27:47 +0000
Subject: [pkgdb] opencv: kwizart has requested watchcommits
Message-ID: <20090422122747.CC2B710F885@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchcommits acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 12:27:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 12:27:49 +0000
Subject: [pkgdb] opencv: kwizart has requested commit
Message-ID: <20090422122749.4253E10F892@bastion2.fedora.phx.redhat.com>

kwizart has requested the commit acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 12:27:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 12:27:48 +0000
Subject: [pkgdb] opencv: kwizart has requested watchbugzilla
Message-ID: <20090422122749.0EDF010F88F@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchbugzilla acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From hadess at fedoraproject.org  Wed Apr 22 12:47:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 22 Apr 2009 12:47:30 +0000 (UTC)
Subject: rpms/rhythmbox/devel .cvsignore, 1.50, 1.51 rhythmbox.spec, 1.243, 
	1.244 sources, 1.52, 1.53
Message-ID: <20090422124730.A4604700FE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8902

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Wed Apr 22 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0.92-1
- Update to 0.12.0.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	19 Mar 2009 10:51:42 -0000	1.50
+++ .cvsignore	22 Apr 2009 12:46:51 -0000	1.51
@@ -1 +1 @@
-rhythmbox-0.12.0.tar.bz2
+rhythmbox-0.12.0.92.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- rhythmbox.spec	14 Apr 2009 13:46:49 -0000	1.243
+++ rhythmbox.spec	22 Apr 2009 12:46:52 -0000	1.244
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.12.0
-Release: 5%{?dist}
+Version: 0.12.0.92
+Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -52,14 +52,6 @@
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
-# http://svn.gnome.org/viewvc/rhythmbox?view=revision&revision=6245
-Patch1: rb-0.12.0-use-decodebin2.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=510236
-Patch2: fix-psp-entry-types.diff
-# http://bugzilla.gnome.org/show_bug.cgi?id=578514
-Patch3: rb-ddkit-monitor.patch
-BuildRequires: automake autoconf libtool
-Patch4: rb-0.12.0-sj-updates.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -94,17 +86,10 @@
 %setup -q
 
 %patch0 -p0 -b .dont-disable-suspend
-%patch1 -p0 -b .decodebin2
-%patch2 -p1 -b .psp-crasher
-%patch3 -p1 -b .ddkit
-%patch4 -p1 -b .sj
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
 
-aclocal
-automake
-
 %build
 
 # work around a gstreamer bug
@@ -237,6 +222,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Apr 22 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0.92-1
+- Update to 0.12.0.92
+
 * Tue Apr 14 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-5
 - Fix possible crashers in the libmusicbrainz3 code
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	19 Mar 2009 10:51:42 -0000	1.52
+++ sources	22 Apr 2009 12:46:52 -0000	1.53
@@ -1 +1 @@
-ae6bc15786cc7659b41c313e45adf44a  rhythmbox-0.12.0.tar.bz2
+ac0e342bb68e5dde0cb1df5ba62f305e  rhythmbox-0.12.0.92.tar.bz2



From kwizart at fedoraproject.org  Wed Apr 22 12:48:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed, 22 Apr 2009 12:48:31 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel sources, 1.9, 1.10 .cvsignore, 1.9,
	1.10 perl-AnyEvent.spec, 1.11, 1.12
Message-ID: <20090422124831.AAAC9700FE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11340

Modified Files:
	sources .cvsignore perl-AnyEvent.spec 
Log Message:
Update to 4.352



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Apr 2009 21:20:12 -0000	1.9
+++ sources	22 Apr 2009 12:48:22 -0000	1.10
@@ -1 +1 @@
-f1d7066a576aab2be15e78ea238036d0  AnyEvent-4.35.tar.gz
+a811c7aec5ec089a13c13ae429a4733c  AnyEvent-4.352.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Apr 2009 21:20:12 -0000	1.9
+++ .cvsignore	22 Apr 2009 12:48:23 -0000	1.10
@@ -1 +1 @@
-AnyEvent-4.35.tar.gz
+AnyEvent-4.352.tar.gz


Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-AnyEvent.spec	3 Apr 2009 21:20:12 -0000	1.11
+++ perl-AnyEvent.spec	22 Apr 2009 12:48:23 -0000	1.12
@@ -1,7 +1,7 @@
-%define         version_anyevent 4.35
+%define         version_anyevent 4.352
 
 Name:           perl-AnyEvent
-Version:        4.350
+Version:        4.352
 Release:        1%{?dist}
 Summary:        Framework for multiple event loops
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 4.352-1
+- Update to 4.352   (rpm version : same )
+
 * Fri Apr  3 2009 kwizart < kwizart at gmail.com > - 4.350-1
 - Update to 4.35   (rpm version : 4.350 )
 



From rrakus at fedoraproject.org  Wed Apr 22 12:58:11 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed, 22 Apr 2009 12:58:11 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.181,1.182
Message-ID: <20090422125812.281A1700FE@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14667

Modified Files:
	bash.spec 
Log Message:
better to use patch level in version tag like vim do


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- bash.spec	21 Apr 2009 15:07:32 -0000	1.181
+++ bash.spec	22 Apr 2009 12:57:39 -0000	1.182
@@ -1,14 +1,15 @@
 #%define beta_tag rc1
 %define patchlevel .16
+%define baseversion 4.0
 
-Version: 4.0
+Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 7%{patchlevel}%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
-Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
 
 # For now there isn't any doc
 #Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz
@@ -82,9 +83,8 @@
 %define pkgdocdir %{_datadir}/doc/%{name}-%{version}
 
 %prep
-
 #%setup -q -a 2
-%setup -q -n bash-%{version}
+%setup -q -n %{name}-%{baseversion}
 
 # Official upstream patches
 %patch001 -p0 -b .001
@@ -289,6 +289,9 @@
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Apr 22 2009 Roman Rakus <rrakus at redhat.com> - 4.0.16-1
+- better to use patch level in version tag like vim do
+
 * Tue Apr 21 2009 Roman Rakus <rrakus at redhat.com> - 4.0-7.16
 - Use patch level in Release tag
 



From overholt at fedoraproject.org  Wed Apr 22 13:07:16 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 22 Apr 2009 13:07:16 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse-pde.build-add-package-build.patch, 1.11, 
	1.12 eclipse.spec, 1.628, 1.629
Message-ID: <20090422130716.8EFA670104@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18730

Modified Files:
	eclipse-pde.build-add-package-build.patch eclipse.spec 
Log Message:
* Tue Apr 21 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-10
- Update "package build" patch to not nest symlinks (Elliott Baron).
- RHBZ#496963.

eclipse-pde.build-add-package-build.patch:

Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-pde.build-add-package-build.patch	19 Dec 2008 17:47:47 -0000	1.11
+++ eclipse-pde.build-add-package-build.patch	22 Apr 2009 13:07:13 -0000	1.12
@@ -68,7 +68,7 @@
 +    if [ "x$ERROR" != "xyes" ]; then
 +      if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
 +        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+        ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
++        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
 +      fi
 +    fi
 +  fi
@@ -102,7 +102,7 @@
 +    if [ "x$ERROR" != "xyes" ]; then
 +      if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
 +        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+        ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
++        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
 +      fi
 +    fi;
 +


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -r1.628 -r1.629
--- eclipse.spec	6 Apr 2009 21:26:05 -0000	1.628
+++ eclipse.spec	22 Apr 2009 13:07:13 -0000	1.629
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1491,6 +1491,10 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 21 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-10
+- Update "package build" patch to not nest symlinks (Elliott Baron).
+- RHBZ#496963.
+
 * Mon Apr 6 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-9
 - Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
 - RHBZ#484453



From dledford at fedoraproject.org  Wed Apr 22 13:15:58 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 13:15:58 +0000 (UTC)
Subject: rpms/libibcommon/devel libibcommon.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20090422131558.635DF700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibcommon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22379

Modified Files:
	libibcommon.spec sources 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.2.0-1
- Update to latest upstream version



Index: libibcommon.spec
===================================================================
RCS file: /cvs/extras/rpms/libibcommon/devel/libibcommon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libibcommon.spec	3 Mar 2009 21:08:32 -0000	1.4
+++ libibcommon.spec	22 Apr 2009 13:15:22 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: OpenFabrics Alliance InfiniBand management common library
 Name: libibcommon
-Version: 1.1.0
-Release: 4%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/libibcommon.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.2.0-1
+- Update to latest upstream version
+
 * Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 1.1.0-4
 - Rebuilt against libtool 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibcommon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 19:48:28 -0000	1.2
+++ sources	22 Apr 2009 13:15:22 -0000	1.3
@@ -1 +1 @@
-b398ef1246a392338053c8e382b3e6ee  libibcommon-1.1.0.tar.gz
+f83686006d5313b816a5264d41736559  libibcommon-1.2.0.tar.gz



From dledford at fedoraproject.org  Wed Apr 22 13:23:16 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 13:23:16 +0000 (UTC)
Subject: rpms/libibcommon/F-11 .cvsignore, 1.2, 1.3 libibcommon.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090422132316.4A839700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibcommon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25689

Modified Files:
	.cvsignore libibcommon.spec sources 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.2.0-1
- Update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibcommon/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 19:48:28 -0000	1.2
+++ .cvsignore	22 Apr 2009 13:23:12 -0000	1.3
@@ -1 +1,2 @@
 libibcommon-1.1.0.tar.gz
+libibcommon-1.2.0.tar.gz


Index: libibcommon.spec
===================================================================
RCS file: /cvs/extras/rpms/libibcommon/F-11/libibcommon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libibcommon.spec	3 Mar 2009 21:08:32 -0000	1.4
+++ libibcommon.spec	22 Apr 2009 13:23:12 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: OpenFabrics Alliance InfiniBand management common library
 Name: libibcommon
-Version: 1.1.0
-Release: 4%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/libibcommon.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.2.0-1
+- Update to latest upstream version
+
 * Tue Mar 03 2009 Robert Scheck <robert at fedoraproject.org> - 1.1.0-4
 - Rebuilt against libtool 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibcommon/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 19:48:28 -0000	1.2
+++ sources	22 Apr 2009 13:23:12 -0000	1.3
@@ -1 +1 @@
-b398ef1246a392338053c8e382b3e6ee  libibcommon-1.1.0.tar.gz
+f83686006d5313b816a5264d41736559  libibcommon-1.2.0.tar.gz



From dledford at fedoraproject.org  Wed Apr 22 13:23:32 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 13:23:32 +0000 (UTC)
Subject: rpms/libibumad/F-11 libibumad.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090422132332.84F0E700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibumad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25268

Modified Files:
	libibumad.spec sources 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
- Update to latest upstream version



Index: libibumad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibumad/F-11/libibumad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libibumad.spec	21 Mar 2009 14:41:20 -0000	1.3
+++ libibumad.spec	22 Apr 2009 13:23:00 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
 Name: libibumad
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -9,7 +9,7 @@
 Url: http://openfabrics.org
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires: libibcommon-devel >= 1.1.0, libtool, automake, autoconf
+BuildRequires: libibcommon-devel >= 1.2.0, libtool, automake, autoconf
 
 %description
 libibumad provides the user MAD library functions which sit on top of 
@@ -70,6 +70,9 @@
 %{_libdir}/libibumad.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
+- Update to latest upstream version
+
 * Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> - 1.2.0-3
 - Rebuilt against libtool 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibumad/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 20:31:47 -0000	1.2
+++ sources	22 Apr 2009 13:23:00 -0000	1.3
@@ -1 +1 @@
-abce72fbb91530a97493eba7a28a0de6  libibumad-1.2.0.tar.gz
+97b2609f5eaaf4320b39f44a50500b70  libibumad-1.3.1.tar.gz



From dledford at fedoraproject.org  Wed Apr 22 13:25:10 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 13:25:10 +0000 (UTC)
Subject: rpms/libibumad/devel .cvsignore, 1.2, 1.3 libibumad.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090422132510.C29B3700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibumad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26453

Modified Files:
	.cvsignore libibumad.spec sources 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
- Update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibumad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 20:31:47 -0000	1.2
+++ .cvsignore	22 Apr 2009 13:24:37 -0000	1.3
@@ -1 +1,2 @@
 libibumad-1.2.0.tar.gz
+libibumad-1.3.1.tar.gz


Index: libibumad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibumad/devel/libibumad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libibumad.spec	21 Mar 2009 14:41:20 -0000	1.3
+++ libibumad.spec	22 Apr 2009 13:24:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
 Name: libibumad
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -9,7 +9,7 @@
 Url: http://openfabrics.org
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires: libibcommon-devel >= 1.1.0, libtool, automake, autoconf
+BuildRequires: libibcommon-devel >= 1.2.0, libtool, automake, autoconf
 
 %description
 libibumad provides the user MAD library functions which sit on top of 
@@ -70,6 +70,9 @@
 %{_libdir}/libibumad.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
+- Update to latest upstream version
+
 * Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> - 1.2.0-3
 - Rebuilt against libtool 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibumad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 20:31:47 -0000	1.2
+++ sources	22 Apr 2009 13:24:37 -0000	1.3
@@ -1 +1 @@
-abce72fbb91530a97493eba7a28a0de6  libibumad-1.2.0.tar.gz
+97b2609f5eaaf4320b39f44a50500b70  libibumad-1.3.1.tar.gz



From ovasik at fedoraproject.org  Wed Apr 22 13:25:44 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 22 Apr 2009 13:25:44 +0000 (UTC)
Subject: rpms/setup/devel setup.spec,1.77,1.78
Message-ID: <20090422132544.89865700FE@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26860

Modified Files:
	setup.spec 
Log Message:
rewrite postun scriptlet to <lua> to prevent /bin/sh postun dependency


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- setup.spec	10 Apr 2009 08:51:41 -0000	1.77
+++ setup.spec	22 Apr 2009 13:25:41 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -50,13 +50,16 @@
 %clean
 rm -rf %{buildroot}
 
-%postun
+
 #throw away useless and dangerous update stuff until rpm will be able to
 #handle it ( http://rpm.org/ticket/6 )
-rm -f /etc/passwd.rpmnew
-rm -f /etc/shadow.rpmnew
-rm -f /etc/group.rpmnew
-rm -f /etc/gshadow.rpmnew
+%postun -p <lua>
+if arg[2] > 1 and posix.access("/bin/rm", "x") then
+   os.execute("rm -f /etc/passwd.rpmnew")
+   os.execute("rm -f /etc/shadow.rpmnew")
+   os.execute("rm -f /etc/group.rpmnew")
+   os.execute("rm -f /etc/gshadow.rpmnew")
+end
 
 %files
 %defattr(-,root,root)
@@ -90,6 +93,10 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Apr 22 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-2
+- rewrite postun scriptlet to <lua> to prevent /bin/sh
+  dependency
+
 * Fri Apr 10 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-1
 - do not disable coredumps in profile/csh.cshrc scripts,
   coredumps already disabled in rawhide's RLIMIT_CORE(#495035)



From dledford at fedoraproject.org  Wed Apr 22 13:31:05 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 13:31:05 +0000 (UTC)
Subject: rpms/libibmad/devel .cvsignore, 1.2, 1.3 libibmad.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090422133105.3F537700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibmad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28843

Modified Files:
	.cvsignore libibmad.spec sources 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
- Update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibmad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 21:30:52 -0000	1.2
+++ .cvsignore	22 Apr 2009 13:30:31 -0000	1.3
@@ -1 +1,2 @@
 libibmad-1.2.0.tar.gz
+libibmad-1.3.1.tar.gz


Index: libibmad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibmad/devel/libibmad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libibmad.spec	21 Mar 2009 14:32:36 -0000	1.3
+++ libibmad.spec	22 Apr 2009 13:30:31 -0000	1.4
@@ -1,13 +1,13 @@
 Summary: OpenFabrics Alliance InfiniBand MAD library
 Name: libibmad
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
 Url: http://openfabrics.org/
-BuildRequires: libibumad-devel >= 1.2.0, libtool, automake, autoconf
+BuildRequires: libibumad-devel >= 1.3.0, libtool, automake, autoconf
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -69,6 +69,9 @@
 %{_libdir}/libibmad.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
+- Update to latest upstream version
+
 * Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> - 1.2.0-3
 - Rebuilt against libtool 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibmad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 21:30:52 -0000	1.2
+++ sources	22 Apr 2009 13:30:31 -0000	1.3
@@ -1 +1 @@
-fe7a6b80b28e56cf74ffbe09c8819c71  libibmad-1.2.0.tar.gz
+e60b1c787d7cd2768967ca4766238210  libibmad-1.3.1.tar.gz



From twaugh at fedoraproject.org  Wed Apr 22 13:35:10 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 22 Apr 2009 13:35:10 +0000 (UTC)
Subject: rpms/hplip/F-10 hplip-dbus.patch,1.1,1.2 hplip.spec,1.197,1.198
Message-ID: <20090422133510.3A31A700FE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30291

Modified Files:
	hplip-dbus.patch hplip.spec 
Log Message:
* Wed Apr 22 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-8
- Fixed NULL pointer dereferences in hp backend's device_event()
  function.


hplip-dbus.patch:

Index: hplip-dbus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-dbus.patch	11 Dec 2008 11:12:39 -0000	1.1
+++ hplip-dbus.patch	22 Apr 2009 13:35:08 -0000	1.2
@@ -1,13 +1,31 @@
-diff -up hplip-2.8.7/prnt/backend/hp.c.dbus hplip-2.8.7/prnt/backend/hp.c
---- hplip-2.8.7/prnt/backend/hp.c.dbus	2008-12-11 10:44:30.000000000 +0000
-+++ hplip-2.8.7/prnt/backend/hp.c	2008-12-11 10:46:15.000000000 +0000
-@@ -489,6 +489,9 @@ static int device_event(const char *dev,
+diff -up hplip-2.8.12/prnt/backend/hp.c.dbus hplip-2.8.12/prnt/backend/hp.c
+--- hplip-2.8.12/prnt/backend/hp.c.dbus	2008-12-17 20:39:37.000000000 +0000
++++ hplip-2.8.12/prnt/backend/hp.c	2009-04-22 14:25:38.000000000 +0100
+@@ -488,8 +488,18 @@ static int device_event(const char *dev,
+     const char *username, const char *jobid, const char *title)
+ {
      DBusMessage * msg = NULL;
-     int id = atoi(jobid);
+-    int id = atoi(jobid);
++    int id;
  
 +    if (dbus_conn == NULL)
 +	return 0;
 +
++    if (!dev || !printer || !jobid || !username || !title)
++    {
++	BUG("NULL argument given to device_event()\n");
++	return 0;
++    }
++
++    id = atoi(jobid);
      msg = dbus_message_new_signal(DBUS_PATH, DBUS_INTERFACE, "Event");
  
      if (NULL == msg)
+@@ -510,6 +520,7 @@ static int device_event(const char *dev,
+     if (!dbus_connection_send(dbus_conn, msg, NULL))
+     {
+         BUG("dbus message send failed!\n");
++	dbus_message_unref(msg);
+         return 0;
+     }
+ 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- hplip.spec	16 Mar 2009 12:32:59 -0000	1.197
+++ hplip.spec	22 Apr 2009 13:35:08 -0000	1.198
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -332,6 +332,10 @@
 exit 0
 
 %changelog
+* Wed Apr 22 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-8
+- Fixed NULL pointer dereferences in hp backend's device_event()
+  function.
+
 * Mon Mar 16 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-7
 - Backported fix for PPD matching logic from 3.9.2 (bug #490360).
 



From karsten at fedoraproject.org  Wed Apr 22 13:45:30 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 22 Apr 2009 13:45:30 +0000 (UTC)
Subject: rpms/perl-IPC-Shareable/F-11 perl-IPC-Shareable.spec,1.9,1.10
Message-ID: <20090422134531.01E2A70103@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/perl-IPC-Shareable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2109

Modified Files:
	perl-IPC-Shareable.spec 
Log Message:
- disable 'make test' on mainframe for now, shmem problems
  see bugzilla #496369



Index: perl-IPC-Shareable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/F-11/perl-IPC-Shareable.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-IPC-Shareable.spec	26 Feb 2009 20:15:28 -0000	1.9
+++ perl-IPC-Shareable.spec	22 Apr 2009 13:44:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Shareable
 Version:        0.60
-Release:        9%{?dist}
+Release:        9%{?dist}.1
 Summary:        Share Perl variables between processes
 
 Group:          Development/Libraries
@@ -44,7 +44,10 @@
 
 
 %check
+# bugzilla #496369:
+if [ `uname -i` != "s390x" -a `uname -i` != "s390" ] ; then
 make test
+fi
 
 
 %clean
@@ -59,6 +62,10 @@
 
 
 %changelog
+* Wed Apr 22 2009 Karsten Hopp <karsten at redhat.com> 0.60-9.1
+- disable 'make test' on mainframe for now, shmem problems 
+  see bugzilla #496369
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dtardon at fedoraproject.org  Wed Apr 22 13:46:06 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Wed, 22 Apr 2009 13:46:06 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch, NONE,
	1.1 openoffice.org.spec, 1.1889, 1.1890
Message-ID: <20090422134606.A201D700FE@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2763

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 
Log Message:
Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately

openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101274.opening-a-directory.patch ---
Index: ucbhelper/source/client/content.cxx
===================================================================
--- ucbhelper/source/client/content.cxx	(revision 270567)
+++ ucbhelper/source/client/content.cxx	(working copy)
@@ -42,6 +42,7 @@
 #include <cppuhelper/weak.hxx>
 
 #include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ucb/ContentCreationError.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
@@ -51,6 +52,8 @@
 #include <com/sun/star/ucb/ContentAction.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/GlobalTransferCommandArgument.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
@@ -68,6 +71,8 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
@@ -77,7 +82,11 @@
 #include <ucbhelper/interactionrequest.hxx>
 #endif
 #include <ucbhelper/cancelcommandexecution.hxx>
+#include <ucbhelper/fileidentifierconverter.hxx>
+#include <ucbhelper/simpleinteractionrequest.hxx>
 
+#include <memory>
+
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::io;
@@ -377,6 +386,54 @@
     return Reference< XContent >();
 }
 
+namespace
+{
+
+void
+lcl_displayMessage(
+        const Reference<XCommandEnvironment>& rEnvironment,
+        const rtl::OUString& rUri)
+{
+    // Create exception
+    const Reference<XContentProviderManager> xCPM(
+            getContentBroker(true)->getContentProviderManagerInterface());
+    const PropertyValue aUriProperty(
+            rtl::OUString::createFromAscii("Uri"),
+            -1,
+            makeAny(getSystemPathFromFileURL(xCPM, rUri)),
+            PropertyState_DIRECT_VALUE)
+        ;
+    Sequence<Any> lArguments(1);
+    lArguments[0] <<= aUriProperty;
+    const InteractiveAugmentedIOException xError(
+            rtl::OUString(),
+            0,
+            InteractionClassification_ERROR,
+            IOErrorCode_NO_FILE,
+            lArguments)
+        ;
+
+    // Create interaction request
+    std::auto_ptr<ucbhelper::SimpleInteractionRequest> aRequest(
+            new ucbhelper::SimpleInteractionRequest(makeAny(xError), CONTINUATION_APPROVE));
+    {
+        Reference<XInteractionContinuation> xContinuation(
+                new ::ucbhelper::InteractionApprove(aRequest.get()));
+        Sequence<Reference<XInteractionContinuation> > lContinuations(1);
+        lContinuations[0].set(xContinuation);
+        aRequest->setContinuations(lContinuations);
+    }
+
+    Reference<XInteractionHandler> xInteraction(rEnvironment->getInteractionHandler());
+    if (xInteraction.is())
+    {
+        Reference<XInteractionRequest> xRequest(aRequest.release());
+        xInteraction->handle(xRequest);
+    }
+}
+    
+}
+
 //=========================================================================
 //=========================================================================
 //
@@ -1188,7 +1245,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XInputStream >();
+    }
 
 	Reference< XActiveDataSink > xSink = new ActiveDataSink;
 
@@ -1213,7 +1273,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XInputStream >();
+    }
 
 	Reference< XActiveDataSink > xSink = new ActiveDataSink;
 
@@ -1238,7 +1301,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XStream >();
+    }
 
 	Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
 
@@ -1263,7 +1329,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XStream >();
+    }
 
 	Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
 
@@ -1288,7 +1357,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return sal_False;
+    }
 
 	OpenCommandArgument2 aArg;
     aArg.Mode		= OpenMode::DOCUMENT;
@@ -1311,7 +1383,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return sal_False;
+    }
 
 	OpenCommandArgument2 aArg;
     aArg.Mode		= OpenMode::DOCUMENT;
Index: comphelper/source/misc/mediadescriptor.cxx
===================================================================
--- comphelper/source/misc/mediadescriptor.cxx	(revision 270567)
+++ comphelper/source/misc/mediadescriptor.cxx	(working copy)
@@ -727,7 +727,8 @@
 					xRequest->getRequest() >>= exIO;
 					bAbort = (
 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     ) ||
-								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
+								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ||
+                                (exIO.Code == css::ucb::IOErrorCode_NO_FILE)
 							);
 				}
 				break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1889
retrieving revision 1.1890
diff -u -r1.1889 -r1.1890
--- openoffice.org.spec	22 Apr 2009 10:22:23 -0000	1.1889
+++ openoffice.org.spec	22 Apr 2009 13:46:04 -0000	1.1890
@@ -4128,6 +4128,8 @@
 * Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
+- Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
+   + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From dledford at fedoraproject.org  Wed Apr 22 13:49:53 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 13:49:53 +0000 (UTC)
Subject: rpms/libibmad/F-11 libibmad.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090422134954.3CD71700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibmad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4733

Modified Files:
	libibmad.spec sources 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
- Update to latest upstream version



Index: libibmad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibmad/F-11/libibmad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libibmad.spec	21 Mar 2009 14:32:36 -0000	1.3
+++ libibmad.spec	22 Apr 2009 13:49:22 -0000	1.4
@@ -1,13 +1,13 @@
 Summary: OpenFabrics Alliance InfiniBand MAD library
 Name: libibmad
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
 Url: http://openfabrics.org/
-BuildRequires: libibumad-devel >= 1.2.0, libtool, automake, autoconf
+BuildRequires: libibumad-devel >= 1.3.0, libtool, automake, autoconf
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -69,6 +69,9 @@
 %{_libdir}/libibmad.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-1
+- Update to latest upstream version
+
 * Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> - 1.2.0-3
 - Rebuilt against libtool 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibmad/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 21:30:52 -0000	1.2
+++ sources	22 Apr 2009 13:49:22 -0000	1.3
@@ -1 +1 @@
-fe7a6b80b28e56cf74ffbe09c8819c71  libibmad-1.2.0.tar.gz
+e60b1c787d7cd2768967ca4766238210  libibmad-1.3.1.tar.gz



From dtardon at fedoraproject.org  Wed Apr 22 13:51:46 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Wed, 22 Apr 2009 13:51:46 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch, NONE,
	1.1 openoffice.org.spec, 1.1891, 1.1892
Message-ID: <20090422135147.8AB43700FE@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5554

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 
Log Message:
Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately

openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101274.opening-a-directory.patch ---
Index: ucbhelper/source/client/content.cxx
===================================================================
--- ucbhelper/source/client/content.cxx	(revision 270567)
+++ ucbhelper/source/client/content.cxx	(working copy)
@@ -42,6 +42,7 @@
 #include <cppuhelper/weak.hxx>
 
 #include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ucb/ContentCreationError.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
@@ -51,6 +52,8 @@
 #include <com/sun/star/ucb/ContentAction.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/GlobalTransferCommandArgument.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
@@ -68,6 +71,8 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
@@ -77,7 +82,11 @@
 #include <ucbhelper/interactionrequest.hxx>
 #endif
 #include <ucbhelper/cancelcommandexecution.hxx>
+#include <ucbhelper/fileidentifierconverter.hxx>
+#include <ucbhelper/simpleinteractionrequest.hxx>
 
+#include <memory>
+
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::io;
@@ -377,6 +386,54 @@
     return Reference< XContent >();
 }
 
+namespace
+{
+
+void
+lcl_displayMessage(
+        const Reference<XCommandEnvironment>& rEnvironment,
+        const rtl::OUString& rUri)
+{
+    // Create exception
+    const Reference<XContentProviderManager> xCPM(
+            getContentBroker(true)->getContentProviderManagerInterface());
+    const PropertyValue aUriProperty(
+            rtl::OUString::createFromAscii("Uri"),
+            -1,
+            makeAny(getSystemPathFromFileURL(xCPM, rUri)),
+            PropertyState_DIRECT_VALUE)
+        ;
+    Sequence<Any> lArguments(1);
+    lArguments[0] <<= aUriProperty;
+    const InteractiveAugmentedIOException xError(
+            rtl::OUString(),
+            0,
+            InteractionClassification_ERROR,
+            IOErrorCode_NO_FILE,
+            lArguments)
+        ;
+
+    // Create interaction request
+    std::auto_ptr<ucbhelper::SimpleInteractionRequest> aRequest(
+            new ucbhelper::SimpleInteractionRequest(makeAny(xError), CONTINUATION_APPROVE));
+    {
+        Reference<XInteractionContinuation> xContinuation(
+                new ::ucbhelper::InteractionApprove(aRequest.get()));
+        Sequence<Reference<XInteractionContinuation> > lContinuations(1);
+        lContinuations[0].set(xContinuation);
+        aRequest->setContinuations(lContinuations);
+    }
+
+    Reference<XInteractionHandler> xInteraction(rEnvironment->getInteractionHandler());
+    if (xInteraction.is())
+    {
+        Reference<XInteractionRequest> xRequest(aRequest.release());
+        xInteraction->handle(xRequest);
+    }
+}
+    
+}
+
 //=========================================================================
 //=========================================================================
 //
@@ -1188,7 +1245,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XInputStream >();
+    }
 
 	Reference< XActiveDataSink > xSink = new ActiveDataSink;
 
@@ -1213,7 +1273,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XInputStream >();
+    }
 
 	Reference< XActiveDataSink > xSink = new ActiveDataSink;
 
@@ -1238,7 +1301,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XStream >();
+    }
 
 	Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
 
@@ -1263,7 +1329,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return Reference< XStream >();
+    }
 
 	Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
 
@@ -1288,7 +1357,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return sal_False;
+    }
 
 	OpenCommandArgument2 aArg;
     aArg.Mode		= OpenMode::DOCUMENT;
@@ -1311,7 +1383,10 @@
 	throw( CommandAbortedException, RuntimeException, Exception )
 {
 	if ( !isDocument() )
+    {
+        lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
 		return sal_False;
+    }
 
 	OpenCommandArgument2 aArg;
     aArg.Mode		= OpenMode::DOCUMENT;
Index: comphelper/source/misc/mediadescriptor.cxx
===================================================================
--- comphelper/source/misc/mediadescriptor.cxx	(revision 270567)
+++ comphelper/source/misc/mediadescriptor.cxx	(working copy)
@@ -727,7 +727,8 @@
 					xRequest->getRequest() >>= exIO;
 					bAbort = (
 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     ) ||
-								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
+								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ||
+                                (exIO.Code == css::ucb::IOErrorCode_NO_FILE)
 							);
 				}
 				break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1891
retrieving revision 1.1892
diff -u -r1.1891 -r1.1892
--- openoffice.org.spec	22 Apr 2009 10:22:27 -0000	1.1891
+++ openoffice.org.spec	22 Apr 2009 13:51:36 -0000	1.1892
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: workspace.slideshow1.patch
 Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch65: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
 %patch63 -p2 -b .workspace.slideshow1.patch
 %patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch65 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4128,6 +4130,8 @@
 * Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
+- Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
+   + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:38 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135338.18B9B10F885@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on opencv (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:39 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135340.35A0710F88A@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on opencv (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:41 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135341.DF26810F88D@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on opencv (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:47 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135347.DDD9510F890@bastion2.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on opencv (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:48 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135348.D49D010F893@bastion2.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on opencv (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:49 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135350.3B5C310F897@bastion2.fedora.phx.redhat.com>

rakesh has set the commit acl on opencv (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:53:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:53:59 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135359.B2F1210F899@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on opencv (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 13:54:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 13:54:07 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20090422135407.267F510F88B@bastion2.fedora.phx.redhat.com>

rakesh has set the approveacls acl on opencv (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From nhorman at fedoraproject.org  Wed Apr 22 13:54:30 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Wed, 22 Apr 2009 13:54:30 +0000 (UTC)
Subject: rpms/kernel/devel config-powerpc64, 1.30, 1.31 kernel.spec, 1.1526, 
	1.1527
Message-ID: <20090422135430.DE3F0700FE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6862

Modified Files:
	config-powerpc64 kernel.spec 
Log Message:
Resolves: bz484465


Index: config-powerpc64
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-powerpc64	6 Apr 2009 15:44:28 -0000	1.30
+++ config-powerpc64	22 Apr 2009 13:54:28 -0000	1.31
@@ -177,3 +177,6 @@
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
 
 CONFIG_RTC_DRV_PS3=y
+
+CONFIG_CRASH_DUMP=y
+CONFIG_RELOCATABLE=y


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1526
retrieving revision 1.1527
diff -u -r1.1526 -r1.1527
--- kernel.spec	21 Apr 2009 20:57:02 -0000	1.1526
+++ kernel.spec	22 Apr 2009 13:54:28 -0000	1.1527
@@ -1817,6 +1817,11 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 22 2009 Neil Horman <nhorman at redhat.com>
+- Enable RELOCATABLE and CRASH_DUMP for powerpc64
+- With this we can remove the -kdump build variant
+- for the ppc64 arch
+
 * Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com>
 - Don't include the modules.*.bin files in the RPM package.
 



From dtardon at fedoraproject.org  Wed Apr 22 13:54:27 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Wed, 22 Apr 2009 13:54:27 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1890,1.1891
Message-ID: <20090422135427.9C4A5700FE@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6766

Modified Files:
	openoffice.org.spec 
Log Message:
Really add openoffice.org-3.1.0.ooo101274.opening-a-directory.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1890
retrieving revision 1.1891
diff -u -r1.1890 -r1.1891
--- openoffice.org.spec	22 Apr 2009 13:46:04 -0000	1.1890
+++ openoffice.org.spec	22 Apr 2009 13:54:25 -0000	1.1891
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: workspace.slideshow1.patch
 Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch65: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
 %patch63 -p2 -b .workspace.slideshow1.patch
 %patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch65 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From maxamillion at fedoraproject.org  Wed Apr 22 14:04:19 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 22 Apr 2009 14:04:19 +0000 (UTC)
Subject: rpms/ifstatus/devel ifstatus.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090422140419.60085700FE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10650/devel

Modified Files:
	ifstatus.spec import.log 
Log Message:
 Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue




Index: ifstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/devel/ifstatus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifstatus.spec	14 Apr 2009 16:24:05 -0000	1.1
+++ ifstatus.spec	22 Apr 2009 14:04:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ifstatus
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Command line real time interface graphs using ncurses
 
 Group:          Applications/Internet
@@ -29,8 +29,7 @@
 %build
 # The Makefile of the upstream project is non-automake and can't handle 
 # the %{?smp_mflags}
-make
-
+make CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -46,6 +45,9 @@
 %{_sbindir}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-5
+- Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue
+
 * Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
 - Typo in the Summary field.
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Apr 2009 16:24:05 -0000	1.1
+++ import.log	22 Apr 2009 14:04:11 -0000	1.2
@@ -1 +1,2 @@
 ifstatus-1_1_0-4:HEAD:ifstatus-1.1.0-4.src.rpm:1239726196
+ifstatus-1_1_0-5:HEAD:ifstatus-1.1.0-5.src.rpm:1240408951



From maxamillion at fedoraproject.org  Wed Apr 22 14:11:06 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 22 Apr 2009 14:11:06 +0000 (UTC)
Subject: rpms/ifstatus/F-11 ifstatus.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090422141106.A2F34700FE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13534/F-11

Modified Files:
	ifstatus.spec import.log 
Log Message:
Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue




Index: ifstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-11/ifstatus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifstatus.spec	14 Apr 2009 21:00:34 -0000	1.1
+++ ifstatus.spec	22 Apr 2009 14:11:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ifstatus
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Command line real time interface graphs using ncurses
 
 Group:          Applications/Internet
@@ -29,8 +29,7 @@
 %build
 # The Makefile of the upstream project is non-automake and can't handle 
 # the %{?smp_mflags}
-make
-
+make CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -46,6 +45,9 @@
 %{_sbindir}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-5
+- Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue
+
 * Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
 - Typo in the Summary field.
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Apr 2009 21:00:34 -0000	1.1
+++ import.log	22 Apr 2009 14:11:01 -0000	1.2
@@ -1 +1,2 @@
 ifstatus-1_1_0-4:F-11:ifstatus-1.1.0-4.src.rpm:1239742646
+ifstatus-1_1_0-5:F-11:ifstatus-1.1.0-5.src.rpm:1240409334



From tuxbrewr at fedoraproject.org  Wed Apr 22 14:13:06 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 22 Apr 2009 14:13:06 +0000 (UTC)
Subject: rpms/conman/F-11 .cvsignore, 1.5, 1.6 conman.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20090422141306.3D289700FE@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14493

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2008 14:50:02 -0000	1.5
+++ .cvsignore	22 Apr 2009 14:13:03 -0000	1.6
@@ -1 +1 @@
-conman-0.2.2.tar.bz2
+conman-0.2.4.1.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-11/conman.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- conman.spec	24 Feb 2009 08:57:41 -0000	1.14
+++ conman.spec	22 Apr 2009 14:13:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:               conman
-Version:            0.2.2
-Release:            3%{?dist}
+Version:            0.2.4.1
+Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
@@ -98,6 +98,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.2.4.1-1
+- New upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2008 14:50:02 -0000	1.5
+++ sources	22 Apr 2009 14:13:03 -0000	1.6
@@ -1 +1 @@
-a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2
+06f53babdebb2a0bded5be8eaee676d5  conman-0.2.4.1.tar.bz2



From cebbert at fedoraproject.org  Wed Apr 22 14:16:36 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 22 Apr 2009 14:16:36 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-next.patch, 1.16, 1.17 git-linus.diff, 1.13,
	1.14 kernel.spec, 1.1339,
	1.1340 linux-2.6-acer-wmi-bail-on-aao.patch, 1.1,
	NONE linux-2.6-kvm-kconfig-irqchip.patch, 1.1,
	NONE linux-2.6-kvm-mask-notifiers.patch, 1.1,
	NONE linux-2.6-kvm-reset-pit-irq-on-unmask.patch, 1.1,
	NONE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, 1.1,
	NONE linux-2.6-mm-define-unique-value-for-as_unevictable.patch,
	1.1, NONE linux-2.6-net-fix-another-gro-bug.patch, 1.1,
	NONE linux-2.6-posix-timers-fix-clock-monotonicity.patch, 1.1,
	NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch, 1.1,
	NONE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, 1.1, NONE
Message-ID: <20090422141636.838F170103@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15559

Modified Files:
	drm-next.patch git-linus.diff kernel.spec 
Removed Files:
	linux-2.6-acer-wmi-bail-on-aao.patch 
	linux-2.6-kvm-kconfig-irqchip.patch 
	linux-2.6-kvm-mask-notifiers.patch 
	linux-2.6-kvm-reset-pit-irq-on-unmask.patch 
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch 
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch 
	linux-2.6-net-fix-another-gro-bug.patch 
	linux-2.6-posix-timers-fix-clock-monotonicity.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch 
Log Message:
Add 2.6.29.2 patch queue (as git-linus.diff)
Drop queued patches:
    linux-2.6-acer-wmi-bail-on-aao.patch
    linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
    linux-2.6-mm-define-unique-value-for-as_unevictable.patch
    linux-2.6-posix-timers-fix-clock-monotonicity.patch
    linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
    linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
    linux-2.6-net-fix-another-gro-bug.patch
    linux-2.6-kvm-kconfig-irqchip.patch
    linux-2.6-kvm-mask-notifiers.patch
    linux-2.6-kvm-reset-pit-irq-on-unmask.patch

drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- drm-next.patch	3 Apr 2009 03:26:37 -0000	1.16
+++ drm-next.patch	22 Apr 2009 14:16:26 -0000	1.17
@@ -3201,7 +3201,7 @@
  	if (!obj_priv->page_cpu_valid)
 @@ -2160,7 +2157,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
  				continue;
- 			drm_clflush_pages(obj_priv->page_list + i, 1);
+ 			drm_clflush_pages(obj_priv->pages + i, 1);
  		}
 -		drm_agp_chipset_flush(dev);
  	}

git-linus.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/git-linus.diff,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git-linus.diff	6 Oct 2008 14:26:12 -0000	1.13
+++ git-linus.diff	22 Apr 2009 14:16:27 -0000	1.14
@@ -0,0 +1,5873 @@
+Index: vanilla-2.6.29.1/security/smack/smack_lsm.c
+===================================================================
+--- vanilla-2.6.29.1.orig/security/smack/smack_lsm.c
++++ vanilla-2.6.29.1/security/smack/smack_lsm.c
+@@ -607,6 +607,8 @@ static int smack_inode_setxattr(struct d
+ 	    strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {
+ 		if (!capable(CAP_MAC_ADMIN))
+ 			rc = -EPERM;
++		if (size == 0)
++			rc = -EINVAL;
+ 	} else
+ 		rc = cap_inode_setxattr(dentry, name, value, size, flags);
+ 
+@@ -1430,7 +1432,7 @@ static int smack_inode_setsecurity(struc
+ 	struct socket *sock;
+ 	int rc = 0;
+ 
+-	if (value == NULL || size > SMK_LABELLEN)
++	if (value == NULL || size > SMK_LABELLEN || size == 0)
+ 		return -EACCES;
+ 
+ 	sp = smk_import(value, size);
+Index: vanilla-2.6.29.1/drivers/video/console/fbcon.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/video/console/fbcon.c
++++ vanilla-2.6.29.1/drivers/video/console/fbcon.c
+@@ -2263,9 +2263,12 @@ static void fbcon_generic_blank(struct v
+ 	}
+ 
+ 
++	if (!lock_fb_info(info))
++		return;
+ 	event.info = info;
+ 	event.data = &blank;
+ 	fb_notifier_call_chain(FB_EVENT_CONBLANK, &event);
++	unlock_fb_info(info);
+ }
+ 
+ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
+@@ -2954,8 +2957,9 @@ static int fbcon_fb_unbind(int idx)
+ 
+ static int fbcon_fb_unregistered(struct fb_info *info)
+ {
+-	int i, idx = info->node;
++	int i, idx;
+ 
++	idx = info->node;
+ 	for (i = first_fb_vc; i <= last_fb_vc; i++) {
+ 		if (con2fb_map[i] == idx)
+ 			con2fb_map[i] = -1;
+@@ -2979,13 +2983,12 @@ static int fbcon_fb_unregistered(struct 
+ 		}
+ 	}
+ 
+-	if (!num_registered_fb)
+-		unregister_con_driver(&fb_con);
+-
+-
+ 	if (primary_device == idx)
+ 		primary_device = -1;
+ 
++	if (!num_registered_fb)
++		unregister_con_driver(&fb_con);
++
+ 	return 0;
+ }
+ 
+@@ -3021,8 +3024,9 @@ static inline void fbcon_select_primary(
+ 
+ static int fbcon_fb_registered(struct fb_info *info)
+ {
+-	int ret = 0, i, idx = info->node;
++	int ret = 0, i, idx;
+ 
++	idx = info->node;
+ 	fbcon_select_primary(info);
+ 
+ 	if (info_idx == -1) {
+@@ -3124,7 +3128,7 @@ static void fbcon_get_requirement(struct
+ 	}
+ }
+ 
+-static int fbcon_event_notify(struct notifier_block *self, 
++static int fbcon_event_notify(struct notifier_block *self,
+ 			      unsigned long action, void *data)
+ {
+ 	struct fb_event *event = data;
+@@ -3132,7 +3136,7 @@ static int fbcon_event_notify(struct not
+ 	struct fb_videomode *mode;
+ 	struct fb_con2fbmap *con2fb;
+ 	struct fb_blit_caps *caps;
+-	int ret = 0;
++	int idx, ret = 0;
+ 
+ 	/*
+ 	 * ignore all events except driver registration and deregistration
+@@ -3160,7 +3164,8 @@ static int fbcon_event_notify(struct not
+ 		ret = fbcon_mode_deleted(info, mode);
+ 		break;
+ 	case FB_EVENT_FB_UNBIND:
+-		ret = fbcon_fb_unbind(info->node);
++		idx = info->node;
++		ret = fbcon_fb_unbind(idx);
+ 		break;
+ 	case FB_EVENT_FB_REGISTERED:
+ 		ret = fbcon_fb_registered(info);
+@@ -3188,7 +3193,6 @@ static int fbcon_event_notify(struct not
+ 		fbcon_get_requirement(info, caps);
+ 		break;
+ 	}
+-
+ done:
+ 	return ret;
+ }
+Index: vanilla-2.6.29.1/drivers/video/fbmem.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/video/fbmem.c
++++ vanilla-2.6.29.1/drivers/video/fbmem.c
+@@ -1086,13 +1086,11 @@ static long do_fb_ioctl(struct fb_info *
+ 			return -EINVAL;
+ 		con2fb.framebuffer = -1;
+ 		event.data = &con2fb;
+-
+ 		if (!lock_fb_info(info))
+ 			return -ENODEV;
+ 		event.info = info;
+ 		fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
+ 		unlock_fb_info(info);
+-
+ 		ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
+ 		break;
+ 	case FBIOPUT_CON2FBMAP:
+@@ -1112,8 +1110,7 @@ static long do_fb_ioctl(struct fb_info *
+ 		if (!lock_fb_info(info))
+ 			return -ENODEV;
+ 		event.info = info;
+-		ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
+-					      &event);
++		ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
+ 		unlock_fb_info(info);
+ 		break;
+ 	case FBIOBLANK:
+@@ -1519,7 +1516,10 @@ register_framebuffer(struct fb_info *fb_
+ 	registered_fb[i] = fb_info;
+ 
+ 	event.info = fb_info;
++	if (!lock_fb_info(fb_info))
++		return -ENODEV;
+ 	fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
++	unlock_fb_info(fb_info);
+ 	return 0;
+ }
+ 
+@@ -1553,8 +1553,12 @@ unregister_framebuffer(struct fb_info *f
+ 		goto done;
+ 	}
+ 
++
++	if (!lock_fb_info(fb_info))
++		return -ENODEV;
+ 	event.info = fb_info;
+ 	ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
++	unlock_fb_info(fb_info);
+ 
+ 	if (ret) {
+ 		ret = -EINVAL;
+@@ -1588,6 +1592,8 @@ void fb_set_suspend(struct fb_info *info
+ {
+ 	struct fb_event event;
+ 
++	if (!lock_fb_info(info))
++		return;
+ 	event.info = info;
+ 	if (state) {
+ 		fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
+@@ -1596,6 +1602,7 @@ void fb_set_suspend(struct fb_info *info
+ 		info->state = FBINFO_STATE_RUNNING;
+ 		fb_notifier_call_chain(FB_EVENT_RESUME, &event);
+ 	}
++	unlock_fb_info(info);
+ }
+ 
+ /**
+@@ -1665,8 +1672,11 @@ int fb_new_modelist(struct fb_info *info
+ 	err = 1;
+ 
+ 	if (!list_empty(&info->modelist)) {
++		if (!lock_fb_info(info))
++			return -ENODEV;
+ 		event.info = info;
+ 		err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
[...5482 lines suppressed...]
+-	unsigned long vma_end = vma->vm_end;
+-	unsigned long vma_size = vma_end - vma_start;
++	unsigned long vma_size = vma->vm_end - vma->vm_start;
+ 
+ 	if (!pat_enabled)
+ 		return;
+ 
++	/*
++	 * For now, only handle remap_pfn_range() vmas where
++	 * is_linear_pfn_mapping() == TRUE. Handling of
++	 * vm_insert_pfn() is TBD.
++	 */
+ 	if (is_linear_pfn_mapping(vma)) {
+ 		/* free the whole chunk starting from vm_pgoff */
+ 		paddr = (resource_size_t)vma->vm_pgoff << PAGE_SHIFT;
+ 		free_pfn_range(paddr, vma_size);
+ 		return;
+ 	}
+-
+-	if (size != 0 && size != vma_size) {
+-		/* free page by page, using pfn and size */
+-		paddr = (resource_size_t)pfn << PAGE_SHIFT;
+-		for (i = 0; i < size; i += PAGE_SIZE) {
+-			paddr = paddr + i;
+-			free_pfn_range(paddr, PAGE_SIZE);
+-		}
+-	} else {
+-		/* free entire vma, page by page, using the pfn from pte */
+-		for (i = 0; i < vma_size; i += PAGE_SIZE) {
+-			if (follow_phys(vma, vma_start + i, 0, &prot, &paddr))
+-				continue;
+-
+-			free_pfn_range(paddr, PAGE_SIZE);
+-		}
+-	}
+ }
+ 
+ pgprot_t pgprot_writecombine(pgprot_t prot)
+Index: vanilla-2.6.29.1/drivers/input/gameport/gameport.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/input/gameport/gameport.c
++++ vanilla-2.6.29.1/drivers/input/gameport/gameport.c
+@@ -50,9 +50,8 @@ static LIST_HEAD(gameport_list);
+ 
+ static struct bus_type gameport_bus;
+ 
+-static void gameport_add_driver(struct gameport_driver *drv);
+ static void gameport_add_port(struct gameport *gameport);
+-static void gameport_destroy_port(struct gameport *gameport);
++static void gameport_attach_driver(struct gameport_driver *drv);
+ static void gameport_reconnect_port(struct gameport *gameport);
+ static void gameport_disconnect_port(struct gameport *gameport);
+ 
+@@ -230,7 +229,6 @@ static void gameport_find_driver(struct 
+ 
+ enum gameport_event_type {
+ 	GAMEPORT_REGISTER_PORT,
+-	GAMEPORT_REGISTER_DRIVER,
+ 	GAMEPORT_ATTACH_DRIVER,
+ };
+ 
+@@ -374,8 +372,8 @@ static void gameport_handle_event(void)
+ 				gameport_add_port(event->object);
+ 				break;
+ 
+-			case GAMEPORT_REGISTER_DRIVER:
+-				gameport_add_driver(event->object);
++			case GAMEPORT_ATTACH_DRIVER:
++				gameport_attach_driver(event->object);
+ 				break;
+ 
+ 			default:
+@@ -706,14 +704,14 @@ static int gameport_driver_remove(struct
+ 	return 0;
+ }
+ 
+-static void gameport_add_driver(struct gameport_driver *drv)
++static void gameport_attach_driver(struct gameport_driver *drv)
+ {
+ 	int error;
+ 
+-	error = driver_register(&drv->driver);
++	error = driver_attach(&drv->driver);
+ 	if (error)
+ 		printk(KERN_ERR
+-			"gameport: driver_register() failed for %s, error: %d\n",
++			"gameport: driver_attach() failed for %s, error: %d\n",
+ 			drv->driver.name, error);
+ }
+ 
+Index: vanilla-2.6.29.1/drivers/char/vt.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/char/vt.c
++++ vanilla-2.6.29.1/drivers/char/vt.c
+@@ -2271,7 +2271,7 @@ rescan_last_byte:
+ 				    continue; /* nothing to display */
+ 				}
+ 				/* Glyph not found */
+-				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
++				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
+ 				    /* In legacy mode use the glyph we get by a 1:1 mapping.
+ 				       This would make absolutely no sense with Unicode in mind,
+ 				       but do this for ASCII characters since a font may lack
+Index: vanilla-2.6.29.1/drivers/virtio/virtio_balloon.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/virtio/virtio_balloon.c
++++ vanilla-2.6.29.1/drivers/virtio/virtio_balloon.c
+@@ -190,7 +190,8 @@ static int balloon(void *_vballoon)
+ 		try_to_freeze();
+ 		wait_event_interruptible(vb->config_change,
+ 					 (diff = towards_target(vb)) != 0
+-					 || kthread_should_stop());
++					 || kthread_should_stop()
++					 || freezing(current));
+ 		if (diff > 0)
+ 			fill_balloon(vb, diff);
+ 		else if (diff < 0)
+Index: vanilla-2.6.29.1/drivers/char/agp/generic.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/char/agp/generic.c
++++ vanilla-2.6.29.1/drivers/char/agp/generic.c
+@@ -1226,7 +1226,7 @@ int agp_generic_alloc_pages(struct agp_b
+ 	int i, ret = -ENOMEM;
+ 
+ 	for (i = 0; i < num_pages; i++) {
+-		page = alloc_page(GFP_KERNEL | GFP_DMA32);
++		page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
+ 		/* agp_free_memory() needs gart address */
+ 		if (page == NULL)
+ 			goto out;
+@@ -1257,7 +1257,7 @@ void *agp_generic_alloc_page(struct agp_
+ {
+ 	struct page * page;
+ 
+-	page = alloc_page(GFP_KERNEL | GFP_DMA32);
++	page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
+ 	if (page == NULL)
+ 		return NULL;
+ 
+Index: vanilla-2.6.29.1/net/core/skbuff.c
+===================================================================
+--- vanilla-2.6.29.1.orig/net/core/skbuff.c
++++ vanilla-2.6.29.1/net/core/skbuff.c
+@@ -2496,7 +2496,7 @@ struct sk_buff *skb_segment(struct sk_bu
+ 					  skb_network_header_len(skb));
+ 		skb_copy_from_linear_data(skb, nskb->data, doffset);
+ 
+-		if (pos >= offset + len)
++		if (fskb != skb_shinfo(skb)->frag_list)
+ 			continue;
+ 
+ 		if (!sg) {
+Index: vanilla-2.6.29.1/fs/nfs/nfs3xdr.c
+===================================================================
+--- vanilla-2.6.29.1.orig/fs/nfs/nfs3xdr.c
++++ vanilla-2.6.29.1/fs/nfs/nfs3xdr.c
+@@ -716,7 +716,8 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req
+ 	if (args->npages != 0)
+ 		xdr_encode_pages(buf, args->pages, 0, args->len);
+ 	else
+-		req->rq_slen += args->len;
++		req->rq_slen = xdr_adjust_iovec(req->rq_svec,
++				p + XDR_QUADLEN(args->len));
+ 
+ 	err = nfsacl_encode(buf, base, args->inode,
+ 			    (args->mask & NFS_ACL) ?
+Index: vanilla-2.6.29.1/fs/hugetlbfs/inode.c
+===================================================================
+--- vanilla-2.6.29.1.orig/fs/hugetlbfs/inode.c
++++ vanilla-2.6.29.1/fs/hugetlbfs/inode.c
+@@ -26,7 +26,6 @@
+ #include <linux/pagevec.h>
+ #include <linux/parser.h>
+ #include <linux/mman.h>
+-#include <linux/quotaops.h>
+ #include <linux/slab.h>
+ #include <linux/dnotify.h>
+ #include <linux/statfs.h>
+@@ -842,7 +841,7 @@ hugetlbfs_parse_options(char *options, s
+ bad_val:
+  	printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
+ 	       args[0].from, p);
+- 	return 1;
++ 	return -EINVAL;
+ }
+ 
+ static int
+Index: vanilla-2.6.29.1/drivers/message/fusion/mptbase.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/message/fusion/mptbase.c
++++ vanilla-2.6.29.1/drivers/message/fusion/mptbase.c
+@@ -5934,7 +5934,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS
+ 
+ 	/* Initalize the timer
+ 	 */
+-	init_timer(&pCfg->timer);
++	init_timer_on_stack(&pCfg->timer);
+ 	pCfg->timer.data = (unsigned long) ioc;
+ 	pCfg->timer.function = mpt_timer_expired;
+ 	pCfg->wait_done = 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -r1.1339 -r1.1340
--- kernel.spec	21 Apr 2009 20:45:08 -0000	1.1339
+++ kernel.spec	22 Apr 2009 14:16:30 -0000	1.1340
@@ -621,7 +621,6 @@
 Patch383: linux-2.6-defaults-fat-utf8.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch396: linux-2.6-acer-wmi-bail-on-aao.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -698,16 +697,8 @@
 Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # patches headed for -stable
-# fix oops in md raid1 (#495550)
-Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-# fix duplicated flags
-Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
-# fix posix clock monotonicity
-Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
 # make RLIMIT_CPU work again
 Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
-Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -717,13 +708,7 @@
 #Adding dropmonitor bits from 2.6.30
 Patch9011: linux-2.6-dropwatch-protocol.patch
 
-# fix for net lockups, will be in 2.6.29.1
-Patch9101: linux-2.6-net-fix-another-gro-bug.patch
-
 # kvm fixes
-Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
-Patch9301: linux-2.6-kvm-mask-notifiers.patch
-Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 Patch9303: linux-2.6-kvm-skip-pit-check.patch
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
@@ -963,6 +948,20 @@
   esac
 }
 
+# don't apply patch if it's empty
+ApplyOptionalPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1
+  fi
+  local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
+  if [ "$C" -gt 9 ]; then
+    ApplyPatch $patch ${1+"$@"}
+  fi
+}
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1102,7 +1101,7 @@
   done
 %endif
 
-#ApplyPatch git-linus.diff
+ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1114,18 +1113,12 @@
 #
 # misc small stuff to make things compile
 #
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-compile-fixes.patch
-fi
+ApplyOptionalPatch linux-2.6-compile-fixes.patch
 
 %if !%{nopatches}
 
 # revert patches from upstream that conflict or that we get via other means
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-upstream-reverts.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-upstream-reverts.patch -R
-fi
+ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
 #ApplyPatch git-cpufreq.patch
 ApplyPatch git-bluetooth.patch
@@ -1205,7 +1198,6 @@
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1308,21 +1300,13 @@
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-firewire-git-pending.patch
-fi
+ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
 
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
 # patches headed for -stable
-ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
-ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
@@ -1337,12 +1321,7 @@
 # Apply dropmonitor protocol bits from 2.6..30 net-next tree
 ApplyPatch linux-2.6-dropwatch-protocol.patch
 
-ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
-
 # kvm fixes
-ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
-ApplyPatch linux-2.6-kvm-mask-notifiers.patch
-ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
@@ -1928,6 +1907,20 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-40
+- Add 2.6.29.2 patch queue (as git-linus.diff)
+- Drop queued patches:
+    linux-2.6-acer-wmi-bail-on-aao.patch
+    linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+    linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+    linux-2.6-posix-timers-fix-clock-monotonicity.patch
+    linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
+    linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+    linux-2.6-net-fix-another-gro-bug.patch
+    linux-2.6-kvm-kconfig-irqchip.patch
+    linux-2.6-kvm-mask-notifiers.patch
+    linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+
 * Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-39
 - Don't include the modules.*.bin files in the RPM package.
 


--- linux-2.6-acer-wmi-bail-on-aao.patch DELETED ---


--- linux-2.6-kvm-kconfig-irqchip.patch DELETED ---


--- linux-2.6-kvm-mask-notifiers.patch DELETED ---


--- linux-2.6-kvm-reset-pit-irq-on-unmask.patch DELETED ---


--- linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch DELETED ---


--- linux-2.6-mm-define-unique-value-for-as_unevictable.patch DELETED ---


--- linux-2.6-net-fix-another-gro-bug.patch DELETED ---


--- linux-2.6-posix-timers-fix-clock-monotonicity.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch DELETED ---



From rstrode at fedoraproject.org  Wed Apr 22 14:21:43 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 22 Apr 2009 14:21:43 +0000 (UTC)
Subject: rpms/gdm/F-11 gdm-2.26.1-multistack.patch, 1.1, 1.2 gdm.spec, 1.464,
	1.465
Message-ID: <20090422142143.5DAD270104@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18292

Modified Files:
	gdm-2.26.1-multistack.patch gdm.spec 
Log Message:
- Add temporary hack to smack down misbehaving PAM modules


gdm-2.26.1-multistack.patch:

Index: gdm-2.26.1-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm-2.26.1-multistack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.26.1-multistack.patch	21 Apr 2009 21:25:06 -0000	1.1
+++ gdm-2.26.1-multistack.patch	22 Apr 2009 14:21:38 -0000	1.2
@@ -18046,3 +18046,16 @@
 -- 
 1.6.2.2
 
+diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
+index 0327d77..ad7cbac 100644
+--- a/daemon/gdm-session-worker-job.c
++++ b/daemon/gdm-session-worker-job.c
+@@ -325,6 +325,8 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job)
+         if (res < 0) {
+                 g_warning ("Unable to kill session worker process");
+         } else {
++                g_usleep (G_USEC_PER_SEC / 2);
++                gdm_signal_pid (session_worker_job->priv->pid, SIGKILL);
+                 session_worker_job_died (session_worker_job);
+         }
+ 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- gdm.spec	21 Apr 2009 21:25:07 -0000	1.464
+++ gdm.spec	22 Apr 2009 14:21:38 -0000	1.465
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -380,6 +380,9 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Apr 22 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-3
+- Add temporary hack to smack down misbehaving PAM modules
+
 * Tue Apr 21 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-2
 - Stop inactive pam conversations when one succeeds.
   Should fix bug 496234



From tuxbrewr at fedoraproject.org  Wed Apr 22 14:23:06 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 22 Apr 2009 14:23:06 +0000 (UTC)
Subject: rpms/conman/devel .cvsignore, 1.5, 1.6 conman.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20090422142306.4E9F670104@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/conman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18956

Modified Files:
	.cvsignore conman.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conman/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2008 14:50:02 -0000	1.5
+++ .cvsignore	22 Apr 2009 14:23:01 -0000	1.6
@@ -1 +1 @@
-conman-0.2.2.tar.bz2
+conman-0.2.4.1.tar.bz2


Index: conman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conman/devel/conman.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- conman.spec	24 Feb 2009 08:57:41 -0000	1.14
+++ conman.spec	22 Apr 2009 14:23:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:               conman
-Version:            0.2.2
-Release:            3%{?dist}
+Version:            0.2.4.1
+Release:            1%{?dist}
 Summary:            ConMan - The Console Manager
 
 Group:              Applications/System
@@ -98,6 +98,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.2.4.1-1
+- New upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conman/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2008 14:50:02 -0000	1.5
+++ sources	22 Apr 2009 14:23:02 -0000	1.6
@@ -1 +1 @@
-a4ab31cb665e9ef27933d67c3070b2ed  conman-0.2.2.tar.bz2
+06f53babdebb2a0bded5be8eaee676d5  conman-0.2.4.1.tar.bz2



From dledford at fedoraproject.org  Wed Apr 22 14:24:10 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 14:24:10 +0000 (UTC)
Subject: rpms/opensm/devel .cvsignore, 1.2, 1.3 opensm.conf, 1.1,
	1.2 opensm.initd, 1.2, 1.3 opensm.spec, 1.4, 1.5 sources, 1.2,
	1.3 opensm-3.2.1-rpath.patch, 1.1, NONE
Message-ID: <20090422142413.48E6470104@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19539

Modified Files:
	.cvsignore opensm.conf opensm.initd opensm.spec sources 
Removed Files:
	opensm-3.2.1-rpath.patch 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 3.3.1-1
- Update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 23:33:50 -0000	1.2
+++ .cvsignore	22 Apr 2009 14:24:01 -0000	1.3
@@ -1 +1,2 @@
 opensm-3.2.1.tar.gz
+opensm-3.3.1.tar.gz


Index: opensm.conf
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensm.conf	30 Jun 2008 23:33:50 -0000	1.1
+++ opensm.conf	22 Apr 2009 14:24:04 -0000	1.2
@@ -1,129 +1,310 @@
-OPTIONS="-B"
-# DEBUG mode
-#  This option specifies a debug option.
-#  These options are not normally needed.
-#  The number following -d selects the debug
-#  option to enable as follows:
-#  OPT   Description
-#  ---    -----------------
-#  0  - Ignore other SM nodes.
-#  1  - Force single threaded dispatching.
-#  2  - Force log flushing after each log message.
-#  3  - Disable multicast support.
-#  4  - Put OpenSM in memory tracking mode.
-#  10.. Put OpenSM in testability mode.
-#  none, no debug options are enabled.
-# OPTIONS="$OPTIONS -d 1"
-
-# LMC
-#  This option specifies the subnet's LMC value.
-#  The number of LIDs assigned to each port is 2^LMC.
-#  The LMC value must be in the range 0-7.
-#  LMC values > 0 allow multiple paths between ports.
-#  LMC values > 0 should only be used if the subnet
-#  topology actually provides multiple paths between
-#  ports, i.e. multiple interconnects between switches.
-#  OpenSM defaults to LMC = 0, which allows
-#  one path between any two ports.
-# OPTIONS="$OPTIONS -l 0"
-
-# MAXSMPS
-#  This option specifies the number of VL15 SMP MADs
-#  allowed on the wire at any one time.
-#  Specifying -maxsmps 0 allows unlimited outstanding SMPs.
-#  Without -maxsmps, OpenSM defaults to a maximum of
-#  four outstanding SMP.
-OPTIONS="$OPTIONS -maxsmps 0"
-
-# REASSIGN_LIDS
-#  This option causes OpenSM to reassign LIDs to all
-#  end nodes. Specifying "REASSIGN_LIDS=yes" on a running subnet
-#  may disrupt subnet traffic.
-#  With "REASSIGN_LIDS=no", OpenSM attempts to preserve existing
-#  LID assignments resolving multiple use of same LID.
-# OPTIONS="$OPTIONS -r"
-
-# SWEEP
-#  This option specifies the number of seconds between
-#  subnet sweeps.  Specifying SWEEP=0 disables sweeping.
-#  OpenSM defaults to a sweep interval of 10 seconds.
-# OPTIONS="$OPTIONS -s 10"
-
-# TIMEOUT
-#  This option specifies the time in milliseconds
-#  used for transaction timeouts.
-#  Specifying -t 0 disables timeouts.
-#  Without -t, OpenSM defaults to a timeout value of
-#  200 milliseconds.
-# OPTIONS="$OPTIONS -t 200"
-
-# OSM_LOG
-#  This option defines the log to be the given file.
-#  By default the log goes to /tmp/osm.log, which isn't very suitable
-#  for a distribution, so we override it by default here.
-#  For the log to go to standard output use OSM_LOG=stdout.
-OPTIONS="$OPTIONS -f /var/log/opensm.log"
-
-# QoS
-#  This option enable QoS support in opensm
-# OPTIONS="$OPTIONS -Q"
-
-# QoS_POLICY
-#  This option sets the file from which to load the QoS policy
-# OPTIONS="$OPTIONS -Y /etc/rdma/qos_policy"
-
-# VERBOSE
-#  This option increases the log verbosity level.
-#  The "-v" option may be specified multiple times
-#  to further increase the verbosity level.
-#   "-V" option sets the maximum verbosity level and
-#   forces log flushing.
-#   The "-V" is equivalent to "-vf 0xFF -d 2".
-# OPTIONS="$OPTIONS -v 0x00"
-
-# ROUTING_ENGINE
-#  This option chooses the routing engine to use instead of the default
-#  algorithm Min Hop
-#  Supported engines are: updn, file, ftree, lash, dor
-# OPTIONS="$OPTIONS -R updn"
-
-# ROOT_GUID_FILE
-#  This option only allowed when UPDN algorithm is activated
-#  It specifies the guid list file from which to fetch the root node guid list
-#  The file contain in each line only one valid guid
-# OPTIONS="$OPTIONS -a /etc/rdma/root_guids"
-
-# CN_GUID_FILE
-#  This option only allowed when UPDN algorithm is activated
-#  It specifies the guid list file from which to fetch the compute node
-#  guid list
-#  The file contain in each line only one valid guid
-# OPTIONS="$OPTIONS -u /etc/rdma/cn_guids"
-
-# GUID
-#  This option specifies the local port GUID value
-#  with which OpenSM should bind.  OpenSM may be
-#  bound to 1 port at a time.
-#  If GUID given is 0, opensm would list the available guids and wait for 
-#  the user to select one (which obviously is no use in an init script)
-#  Without -g, OpenSM trys to use the default port.
-# OPTIONS="$OPTIONS -g <guid in hex>"
-
-# PRIORITY
-#  This option specifies the SM's PRIORITY.
-#  This will effect the handover cases, where master
-#  is chosen by priority and GUID.  Range goes
-#  from 0 (lowest priority) to 15 (highest).
-OPTIONS="$OPTIONS -p 15"
-
-# OSM_CACHE_DIR
-#  There is no command line option to opensm to set this, it can only be set
-#  as an environment variable.
-OSM_CACHE_DIR=/var/cache/opensm
-
-# CACHE_OPTIONS
-#  Cache the given command line options into the file
-#  OSM_CACHE_DIR/opensm.opts for use next invocation
-#  Set to '--cache-options' or '-c' in order to enable
-# OPTIONS="$OPTIONS -c"
+#
+# DEVICE ATTRIBUTES OPTIONS
+#
+# The port GUID on which the OpenSM is running
+guid 0x0000000000000000
+
+# M_Key value sent to all ports qualifying all Set(PortInfo)
+m_key 0x0000000000000000
+
+# The lease period used for the M_Key on this subnet in [sec]
+m_key_lease_period 0
+
+# SM_Key value of the SM used for SM authentication
+sm_key 0x0000000000000001
+
+# SM_Key value to qualify rcv SA queries as 'trusted'
+sa_key 0x0000000000000001
+
+# Note that for both values above (sm_key and sa_key)
+# OpenSM version 3.2.1 and below used the default value '1'
+# in a host byte order, it is fixed now but you may need to
+# change the values to interoperate with old OpenSM running
+# on a little endian machine.
+
+# Subnet prefix used on this subnet
+subnet_prefix 0xfe80000000000000
+
+# The LMC value used on this subnet
+lmc 0
+
+# lmc_esp0 determines whether LMC value used on subnet is used for
+# enhanced switch port 0. If TRUE, LMC value for subnet is used for
+# ESP0. Otherwise, LMC value for ESP0s is 0.
+lmc_esp0 FALSE
+
+# The code of maximal time a packet can live in a switch
+# The actual time is 4.096usec * 2^<packet_life_time>
+# The value 0x14 disables this mechanism
+packet_life_time 0x12
+
+# The number of sequential packets dropped that cause the port
+# to enter the VLStalled state. The result of setting this value to
+# zero is undefined.
+vl_stall_count 0x07
+
+# The number of sequential packets dropped that cause the port
+# to enter the VLStalled state. This value is for switch ports
+# driving a CA or router port. The result of setting this value
+# to zero is undefined.
+leaf_vl_stall_count 0x07
+
+# The code of maximal time a packet can wait at the head of
+# transmission queue.
+# The actual time is 4.096usec * 2^<head_of_queue_lifetime>
+# The value 0x14 disables this mechanism
+head_of_queue_lifetime 0x12
+
+# The maximal time a packet can wait at the head of queue on
+# switch port connected to a CA or router port
+leaf_head_of_queue_lifetime 0x10
+
+# Limit the maximal operational VLs
+max_op_vls 5
+
+# Force PortInfo:LinkSpeedEnabled on switch ports
+# If 0, don't modify PortInfo:LinkSpeedEnabled on switch port
+# Otherwise, use value for PortInfo:LinkSpeedEnabled on switch port
+# Values are (IB Spec 1.2.1, 14.2.5.6 Table 146 "PortInfo")
+#    1: 2.5 Gbps
+#    3: 2.5 or 5.0 Gbps
+#    5: 2.5 or 10.0 Gbps
+#    7: 2.5 or 5.0 or 10.0 Gbps
+#    2,4,6,8-14 Reserved
+#    Default 15: set to PortInfo:LinkSpeedSupported
+force_link_speed 15
+
+# The subnet_timeout code that will be set for all the ports
+# The actual timeout is 4.096usec * 2^<subnet_timeout>
+subnet_timeout 18
+
+# Threshold of local phy errors for sending Trap 129
+local_phy_errors_threshold 0x08
+
+# Threshold of credit overrun errors for sending Trap 130
+overrun_errors_threshold 0x08
+
+#
+# PARTITIONING OPTIONS
+#
+# Partition configuration file to be used
+partition_config_file /etc/ofed/partitions.conf
+
+# Disable partition enforcement by switches
+no_partition_enforcement FALSE
+
+#
+# SWEEP OPTIONS
+#
+# The number of seconds between subnet sweeps (0 disables it)
+sweep_interval 10
+
+# If TRUE cause all lids to be reassigned
+reassign_lids FALSE
+
+# If TRUE forces every sweep to be a heavy sweep
+force_heavy_sweep FALSE
+
+# If TRUE every trap will cause a heavy sweep.
+# NOTE: successive identical traps (>10) are suppressed
+sweep_on_trap TRUE
+
+#
+# ROUTING OPTIONS
+#
+# If TRUE count switches as link subscriptions
+port_profile_switch_nodes FALSE
+
+# Name of file with port guids to be ignored by port profiling
+port_prof_ignore_file (null)
+
+# Routing engine
+# Multiple routing engines can be specified separated by
+# commas so that specific ordering of routing algorithms will
+# be tried if earlier routing engines fail.
+# Supported engines: minhop, updn, file, ftree, lash, dor
+routing_engine (null)
+
+# Connect roots (use FALSE if unsure)
+connect_roots FALSE
+
+# Use unicast routing cache (use FALSE if unsure)
+use_ucast_cache FALSE
+
+# Lid matrix dump file name
+lid_matrix_dump_file (null)
+
+# LFTs file name
+lfts_file (null)
+
+# The file holding the root node guids (for fat-tree or Up/Down)
+# One guid in each line
+root_guid_file (null)
+
+# The file holding the fat-tree compute node guids
+# One guid in each line
+cn_guid_file (null)
+
+# The file holding the node ids which will be used by Up/Down algorithm instead
+# of GUIDs (one guid and id in each line)
+ids_guid_file (null)
+
+# The file holding guid routing order guids (for MinHop and Up/Down)
+guid_routing_order_file (null)
+
+# SA database file name
+sa_db_file (null)
+
+#
+# HANDOVER - MULTIPLE SMs OPTIONS
+#
+# SM priority used for deciding who is the master
+# Range goes from 0 (lowest priority) to 15 (highest).
+sm_priority 15
+
+# If TRUE other SMs on the subnet should be ignored
+ignore_other_sm FALSE
+
+# Timeout in [msec] between two polls of active master SM
+sminfo_polling_timeout 10000
+
+# Number of failing polls of remote SM that declares it dead
+polling_retry_number 4
+
+# If TRUE honor the guid2lid file when coming out of standby
+# state, if such file exists and is valid
+honor_guid2lid_file FALSE
+
+#
+# TIMING AND THREADING OPTIONS
+#
+# Maximum number of SMPs sent in parallel
+max_wire_smps 32
+
+# The maximum time in [msec] allowed for a transaction to complete
+transaction_timeout 200
+
+# Maximal time in [msec] a message can stay in the incoming message queue.
+# If there is more than one message in the queue and the last message
+# stayed in the queue more than this value, any SA request will be
+# immediately returned with a BUSY status.
+max_msg_fifo_timeout 10000
+
+# Use a single thread for handling SA queries
+single_thread FALSE
+
+#
+# MISC OPTIONS
+#
+# Daemon mode
+daemon TRUE
+
+# SM Inactive
+sm_inactive FALSE
+
+# Babbling Port Policy
+babbling_port_policy FALSE
+
+#
+# Event Plugin Options
+#
+event_plugin_name (null)
+
+#
+# Node name map for mapping node's to more descriptive node descriptions
+# (man ibnetdiscover for more information)
+#
+node_name_map_name (null)
+
+#
+# DEBUG FEATURES
+#
+# The log flags used
+log_flags 0x03
+
+# Force flush of the log file after each log message
+force_log_flush FALSE
+
+# Log file to be used
+log_file /var/log/opensm.log
+
+# Limit the size of the log file in MB. If overrun, log is restarted
+log_max_size 0
+
+# If TRUE will accumulate the log over multiple OpenSM sessions
+accum_log_file TRUE
+
+# The directory to hold the file OpenSM dumps
+dump_files_dir /var/log/
+
+# If TRUE enables new high risk options and hardware specific quirks
+enable_quirks FALSE
+
+# If TRUE disables client reregistration
+no_clients_rereg FALSE
+
+# If TRUE OpenSM should disable multicast support and
+# no multicast routing is performed if TRUE
+disable_multicast FALSE
+
+# If TRUE opensm will exit on fatal initialization issues
+exit_on_fatal TRUE
+
+# console [off|local]
+console off
+
+# Telnet port for console (default 10000)
+console_port 10000
+
+#
+# QoS OPTIONS
+#
+# Enable QoS setup
+qos FALSE
+
+# QoS policy file to be used
+qos_policy_file /etc/ofed/qos-policy.conf
+
+# QoS default options
+qos_max_vls 0
+qos_high_limit -1
+qos_vlarb_high (null)
+qos_vlarb_low (null)
+qos_sl2vl (null)
+
+# QoS CA options
+qos_ca_max_vls 0
+qos_ca_high_limit -1
+qos_ca_vlarb_high (null)
+qos_ca_vlarb_low (null)
+qos_ca_sl2vl (null)
+
+# QoS Switch Port 0 options
+qos_sw0_max_vls 0
+qos_sw0_high_limit -1
+qos_sw0_vlarb_high (null)
+qos_sw0_vlarb_low (null)
+qos_sw0_sl2vl (null)
+
+# QoS Switch external ports options
+qos_swe_max_vls 0
+qos_swe_high_limit -1
+qos_swe_vlarb_high (null)
+qos_swe_vlarb_low (null)
+qos_swe_sl2vl (null)
+
+# QoS Router ports options
+qos_rtr_max_vls 0
+qos_rtr_high_limit -1
+qos_rtr_vlarb_high (null)
+qos_rtr_vlarb_low (null)
+qos_rtr_sl2vl (null)
+
+# Prefix routes file name
+prefix_routes_file /etc/ofed/prefix-routes.conf
+
+#
+# IPv6 Solicited Node Multicast (SNM) Options
+#
+consolidate_ipv6_snm_req FALSE
 


Index: opensm.initd
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opensm.initd	17 Sep 2008 03:06:39 -0000	1.2
+++ opensm.initd	22 Apr 2009 14:24:05 -0000	1.3
@@ -4,12 +4,12 @@
 #
 # chkconfig: - 15 85
 # description: Activates/Deactivates InfiniBand Subnet Manager
-# config: /etc/rdma/opensm.conf
+# config: /etc/ofed/opensm.conf
 #
 ### BEGIN INIT INFO
 # Provides:       opensm
 # Default-Stop: 0 1 2 3 4 5 6
-# Required-Start: $rdma
+# Required-Start: $openib
 # Short-Description: Starts/Stops the InfiniBand Subnet Manager
 # Description: Starts/Stops the InfiniBand Subnet Manager
 ### END INIT INFO
@@ -17,24 +17,17 @@
 . /etc/rc.d/init.d/functions
 
 prog=/usr/sbin/opensm
-CONFIG=/etc/rdma/opensm.conf
 PID_FILE=/var/run/opensm.pid
 ACTION=$1
 
 start()
 {
     local OSM_PID=
-    if [ ! -f $CONFIG ]; then
-        echo -n "Starting opensm: $CONFIG missing" 
-        echo_failure
-        return 6
-    fi
-    . $CONFIG
     [ -f /var/lock/subsys/opensm ] && return 0
     # Start opensm
     echo -n "Starting IB Subnet Manager:"
-    $prog $OPTIONS > /dev/null 2>&1
-    sleep 1        
+    $prog -B > /dev/null 2>&1
+    sleep 1
     OSM_PID=`pidof $prog`
     checkpid $OSM_PID
     RC=$?
@@ -53,7 +46,7 @@
 
     OSM_PID=`cat $PID_FILE`
 
-    checkpid "$OSM_PID"
+    checkpid $OSM_PID
     RC=$?
     if [ $RC -ne 0 ]; then
 	rm -f $PID_FILE


Index: opensm.spec
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opensm.spec	6 Mar 2009 10:44:02 -0000	1.4
+++ opensm.spec	22 Apr 2009 14:24:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name: opensm
-Version: 3.2.1
-Release: 3%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group: System Environment/Daemons
 License: GPLv2 or BSD
@@ -9,10 +9,9 @@
 Source1: opensm.conf
 Source2: opensm.logrotate
 Source3: opensm.initd
-Patch0:  opensm-3.2.1-rpath.patch
 Patch1:  opensm-3.2.1-elif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc
+BuildRequires: libibmad-devel >= 1.3.0, libtool, bison, flex, byacc
 Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
 
 %description
@@ -47,9 +46,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .rpath
 %patch1 -p1 -b .elif
-./autogen.sh
 
 %build
 %configure --with-opensm-conf-sub-dir=rdma
@@ -60,6 +57,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm
 install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm
@@ -110,6 +108,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 3.3.1-1
+- Update to latest upstream version
+
 * Fri Mar 06 2009 Caol??n McNamara <caolanm at redhat.com> - 3.2.1-3
 - fix bare elifs to rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 23:33:50 -0000	1.2
+++ sources	22 Apr 2009 14:24:05 -0000	1.3
@@ -1 +1 @@
-997d10f81896a0d70e0f21f0e78eca92  opensm-3.2.1.tar.gz
+8c8c153f21d9f6cee51fc3d501c54fe7  opensm-3.3.1.tar.gz


--- opensm-3.2.1-rpath.patch DELETED ---



From spot at fedoraproject.org  Wed Apr 22 14:25:54 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 14:25:54 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 .cvsignore, 1.82, 1.83 fedora-logos.spec,
	1.125, 1.126 sources, 1.96, 1.97
Message-ID: <20090422142554.9D5D6700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19137/F-11

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to 11.0.3, fix KDE Splash


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	6 Nov 2008 21:19:48 -0000	1.82
+++ .cvsignore	22 Apr 2009 14:25:21 -0000	1.83
@@ -1 +1 @@
-fedora-logos-10.0.1.tar.bz2
+fedora-logos-11.0.3.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fedora-logos.spec	20 Apr 2009 18:42:17 -0000	1.125
+++ fedora-logos.spec	22 Apr 2009 14:25:21 -0000	1.126
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.2
+Version: 11.0.3
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -109,8 +109,8 @@
   install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/${i}x${i}/places/start-here.png 
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024
-install -p -m 644 kde-splash/SolarComet-fedora.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/
+install -p -m 644 kde-splash/Leonidas-fedora.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,7 +138,7 @@
 %config(noreplace) %{_sysconfdir}/favicon.png
 %{_datadir}/firstboot/themes/fedora-leonidas/
 %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
-%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 %{_datadir}/pixmaps/*
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.3-1
+- update to 11.0.3, adds KDE splash
+
 * Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.2-1
 - fix missing progress files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	20 Apr 2009 18:42:17 -0000	1.96
+++ sources	22 Apr 2009 14:25:21 -0000	1.97
@@ -1 +1 @@
-a71455c966d25b315cb409d950b78485  fedora-logos-11.0.2.tar.bz2
+ea467761bba7e88b0760d8e47e2cb9b2  fedora-logos-11.0.3.tar.bz2



From spot at fedoraproject.org  Wed Apr 22 14:25:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 14:25:55 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.125, 1.126 sources,
	1.96, 1.97
Message-ID: <20090422142555.D5056700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19137/devel

Modified Files:
	fedora-logos.spec sources 
Log Message:
update to 11.0.3, fix KDE Splash


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fedora-logos.spec	20 Apr 2009 18:42:18 -0000	1.125
+++ fedora-logos.spec	22 Apr 2009 14:25:23 -0000	1.126
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.2
+Version: 11.0.3
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -109,8 +109,8 @@
   install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/${i}x${i}/places/start-here.png 
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024
-install -p -m 644 kde-splash/SolarComet-fedora.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/
+install -p -m 644 kde-splash/Leonidas-fedora.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,7 +138,7 @@
 %config(noreplace) %{_sysconfdir}/favicon.png
 %{_datadir}/firstboot/themes/fedora-leonidas/
 %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
-%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 %{_datadir}/pixmaps/*
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.3-1
+- update to 11.0.3, adds KDE splash
+
 * Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.2-1
 - fix missing progress files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	20 Apr 2009 18:42:18 -0000	1.96
+++ sources	22 Apr 2009 14:25:23 -0000	1.97
@@ -1 +1 @@
-a71455c966d25b315cb409d950b78485  fedora-logos-11.0.2.tar.bz2
+ea467761bba7e88b0760d8e47e2cb9b2  fedora-logos-11.0.3.tar.bz2



From kwizart at fedoraproject.org  Wed Apr 22 14:28:40 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed, 22 Apr 2009 14:28:40 +0000 (UTC)
Subject: rpms/opencv/F-11 opencv-1.0.0-gcc44.patch, NONE, 1.1 opencv.spec,
	1.26, 1.27
Message-ID: <20090422142840.766D8700FE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18450

Modified Files:
	opencv.spec 
Added Files:
	opencv-1.0.0-gcc44.patch 
Log Message:
Fix FTBFS for F-11


opencv-1.0.0-gcc44.patch:

--- NEW FILE opencv-1.0.0-gcc44.patch ---
diff -up opencv-1.0.0/cxcore/include/cxmisc.h.gcc44 opencv-1.0.0/cxcore/include/cxmisc.h
--- opencv-1.0.0/cxcore/include/cxmisc.h.gcc44	2006-05-04 17:55:17.000000000 +0200
+++ opencv-1.0.0/cxcore/include/cxmisc.h	2009-04-22 12:42:49.000000000 +0200
@@ -130,7 +130,7 @@
     #include <alloca.h>
 #elif defined HAVE_ALLOCA
     #include <stdlib.h>
-#elif
+#else
     #error
 #endif
 


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/F-11/opencv.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- opencv.spec	26 Feb 2009 08:27:49 -0000	1.26
+++ opencv.spec	22 Apr 2009 14:28:34 -0000	1.27
@@ -1,11 +1,9 @@
-%define with_ffmpeg 0
-
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           opencv
 Version:        1.0.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -18,14 +16,19 @@
 Patch1:		opencv-1.0.0-configure.in.diff
 Patch2:         opencv-1.0.0-autotools.diff
 Patch3:         opencv-1.0.0-pkgconfig.diff
+Patch4:         opencv-1.0.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  jasper-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libtool
 BuildRequires:  swig >= 1.3.24, zlib-devel, pkgconfig
-BuildRequires:  python python-devel
-%if %{with_ffmpeg}
-BuildRequires:  ffmpeg-devel >= 0.4.9
-%endif
+BuildRequires:  python-devel
+%{?_with_ffmpeg:BuildRequires:  ffmpeg-devel >= 0.4.9}
+
 
 %description
 OpenCV means Intel?? Open Source Computer Vision Library. It is a collection of
@@ -60,6 +63,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .gcc44
 %{__sed} -i 's/\r//' interfaces/swig/python/*.py \
                      samples/python/*.py
 %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
@@ -74,7 +78,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
       $RPM_BUILD_ROOT%{python_sitearch}/opencv/*.la \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \
@@ -83,7 +87,7 @@
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/facedetect.cmd \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gcc \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gen
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
+install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
 
 
 %check
@@ -98,9 +102,6 @@
 %postun -p /sbin/ldconfig
 
 
-%post python -p /sbin/ldconfig
-%postun python -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -130,6 +131,12 @@
 
 
 %changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 1.0.0-14
+- Fix for gcc44
+- Enable BR jasper-devel
+- Disable ldconfig run on python modules (uneeded)
+- Prevent timestamp change on install
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dledford at fedoraproject.org  Wed Apr 22 14:28:40 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 14:28:40 +0000 (UTC)
Subject: rpms/opensm/F-11 opensm.conf, 1.1, 1.2 opensm.initd, 1.2,
	1.3 opensm.spec, 1.4, 1.5 sources, 1.2,
	1.3 opensm-3.2.1-rpath.patch, 1.1, NONE
Message-ID: <20090422142840.8CC5E70104@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21436

Modified Files:
	opensm.conf opensm.initd opensm.spec sources 
Removed Files:
	opensm-3.2.1-rpath.patch 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 3.3.1-1
- Update to latest upstream version



Index: opensm.conf
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-11/opensm.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensm.conf	30 Jun 2008 23:33:50 -0000	1.1
+++ opensm.conf	22 Apr 2009 14:28:33 -0000	1.2
@@ -1,129 +1,310 @@
-OPTIONS="-B"
-# DEBUG mode
-#  This option specifies a debug option.
-#  These options are not normally needed.
-#  The number following -d selects the debug
-#  option to enable as follows:
-#  OPT   Description
-#  ---    -----------------
-#  0  - Ignore other SM nodes.
-#  1  - Force single threaded dispatching.
-#  2  - Force log flushing after each log message.
-#  3  - Disable multicast support.
-#  4  - Put OpenSM in memory tracking mode.
-#  10.. Put OpenSM in testability mode.
-#  none, no debug options are enabled.
-# OPTIONS="$OPTIONS -d 1"
-
-# LMC
-#  This option specifies the subnet's LMC value.
-#  The number of LIDs assigned to each port is 2^LMC.
-#  The LMC value must be in the range 0-7.
-#  LMC values > 0 allow multiple paths between ports.
-#  LMC values > 0 should only be used if the subnet
-#  topology actually provides multiple paths between
-#  ports, i.e. multiple interconnects between switches.
-#  OpenSM defaults to LMC = 0, which allows
-#  one path between any two ports.
-# OPTIONS="$OPTIONS -l 0"
-
-# MAXSMPS
-#  This option specifies the number of VL15 SMP MADs
-#  allowed on the wire at any one time.
-#  Specifying -maxsmps 0 allows unlimited outstanding SMPs.
-#  Without -maxsmps, OpenSM defaults to a maximum of
-#  four outstanding SMP.
-OPTIONS="$OPTIONS -maxsmps 0"
-
-# REASSIGN_LIDS
-#  This option causes OpenSM to reassign LIDs to all
-#  end nodes. Specifying "REASSIGN_LIDS=yes" on a running subnet
-#  may disrupt subnet traffic.
-#  With "REASSIGN_LIDS=no", OpenSM attempts to preserve existing
-#  LID assignments resolving multiple use of same LID.
-# OPTIONS="$OPTIONS -r"
-
-# SWEEP
-#  This option specifies the number of seconds between
-#  subnet sweeps.  Specifying SWEEP=0 disables sweeping.
-#  OpenSM defaults to a sweep interval of 10 seconds.
-# OPTIONS="$OPTIONS -s 10"
-
-# TIMEOUT
-#  This option specifies the time in milliseconds
-#  used for transaction timeouts.
-#  Specifying -t 0 disables timeouts.
-#  Without -t, OpenSM defaults to a timeout value of
-#  200 milliseconds.
-# OPTIONS="$OPTIONS -t 200"
-
-# OSM_LOG
-#  This option defines the log to be the given file.
-#  By default the log goes to /tmp/osm.log, which isn't very suitable
-#  for a distribution, so we override it by default here.
-#  For the log to go to standard output use OSM_LOG=stdout.
-OPTIONS="$OPTIONS -f /var/log/opensm.log"
-
-# QoS
-#  This option enable QoS support in opensm
-# OPTIONS="$OPTIONS -Q"
-
-# QoS_POLICY
-#  This option sets the file from which to load the QoS policy
-# OPTIONS="$OPTIONS -Y /etc/rdma/qos_policy"
-
-# VERBOSE
-#  This option increases the log verbosity level.
-#  The "-v" option may be specified multiple times
-#  to further increase the verbosity level.
-#   "-V" option sets the maximum verbosity level and
-#   forces log flushing.
-#   The "-V" is equivalent to "-vf 0xFF -d 2".
-# OPTIONS="$OPTIONS -v 0x00"
-
-# ROUTING_ENGINE
-#  This option chooses the routing engine to use instead of the default
-#  algorithm Min Hop
-#  Supported engines are: updn, file, ftree, lash, dor
-# OPTIONS="$OPTIONS -R updn"
-
-# ROOT_GUID_FILE
-#  This option only allowed when UPDN algorithm is activated
-#  It specifies the guid list file from which to fetch the root node guid list
-#  The file contain in each line only one valid guid
-# OPTIONS="$OPTIONS -a /etc/rdma/root_guids"
-
-# CN_GUID_FILE
-#  This option only allowed when UPDN algorithm is activated
-#  It specifies the guid list file from which to fetch the compute node
-#  guid list
-#  The file contain in each line only one valid guid
-# OPTIONS="$OPTIONS -u /etc/rdma/cn_guids"
-
-# GUID
-#  This option specifies the local port GUID value
-#  with which OpenSM should bind.  OpenSM may be
-#  bound to 1 port at a time.
-#  If GUID given is 0, opensm would list the available guids and wait for 
-#  the user to select one (which obviously is no use in an init script)
-#  Without -g, OpenSM trys to use the default port.
-# OPTIONS="$OPTIONS -g <guid in hex>"
-
-# PRIORITY
-#  This option specifies the SM's PRIORITY.
-#  This will effect the handover cases, where master
-#  is chosen by priority and GUID.  Range goes
-#  from 0 (lowest priority) to 15 (highest).
-OPTIONS="$OPTIONS -p 15"
-
-# OSM_CACHE_DIR
-#  There is no command line option to opensm to set this, it can only be set
-#  as an environment variable.
-OSM_CACHE_DIR=/var/cache/opensm
-
-# CACHE_OPTIONS
-#  Cache the given command line options into the file
-#  OSM_CACHE_DIR/opensm.opts for use next invocation
-#  Set to '--cache-options' or '-c' in order to enable
-# OPTIONS="$OPTIONS -c"
+#
+# DEVICE ATTRIBUTES OPTIONS
+#
+# The port GUID on which the OpenSM is running
+guid 0x0000000000000000
+
+# M_Key value sent to all ports qualifying all Set(PortInfo)
+m_key 0x0000000000000000
+
+# The lease period used for the M_Key on this subnet in [sec]
+m_key_lease_period 0
+
+# SM_Key value of the SM used for SM authentication
+sm_key 0x0000000000000001
+
+# SM_Key value to qualify rcv SA queries as 'trusted'
+sa_key 0x0000000000000001
+
+# Note that for both values above (sm_key and sa_key)
+# OpenSM version 3.2.1 and below used the default value '1'
+# in a host byte order, it is fixed now but you may need to
+# change the values to interoperate with old OpenSM running
+# on a little endian machine.
+
+# Subnet prefix used on this subnet
+subnet_prefix 0xfe80000000000000
+
+# The LMC value used on this subnet
+lmc 0
+
+# lmc_esp0 determines whether LMC value used on subnet is used for
+# enhanced switch port 0. If TRUE, LMC value for subnet is used for
+# ESP0. Otherwise, LMC value for ESP0s is 0.
+lmc_esp0 FALSE
+
+# The code of maximal time a packet can live in a switch
+# The actual time is 4.096usec * 2^<packet_life_time>
+# The value 0x14 disables this mechanism
+packet_life_time 0x12
+
+# The number of sequential packets dropped that cause the port
+# to enter the VLStalled state. The result of setting this value to
+# zero is undefined.
+vl_stall_count 0x07
+
+# The number of sequential packets dropped that cause the port
+# to enter the VLStalled state. This value is for switch ports
+# driving a CA or router port. The result of setting this value
+# to zero is undefined.
+leaf_vl_stall_count 0x07
+
+# The code of maximal time a packet can wait at the head of
+# transmission queue.
+# The actual time is 4.096usec * 2^<head_of_queue_lifetime>
+# The value 0x14 disables this mechanism
+head_of_queue_lifetime 0x12
+
+# The maximal time a packet can wait at the head of queue on
+# switch port connected to a CA or router port
+leaf_head_of_queue_lifetime 0x10
+
+# Limit the maximal operational VLs
+max_op_vls 5
+
+# Force PortInfo:LinkSpeedEnabled on switch ports
+# If 0, don't modify PortInfo:LinkSpeedEnabled on switch port
+# Otherwise, use value for PortInfo:LinkSpeedEnabled on switch port
+# Values are (IB Spec 1.2.1, 14.2.5.6 Table 146 "PortInfo")
+#    1: 2.5 Gbps
+#    3: 2.5 or 5.0 Gbps
+#    5: 2.5 or 10.0 Gbps
+#    7: 2.5 or 5.0 or 10.0 Gbps
+#    2,4,6,8-14 Reserved
+#    Default 15: set to PortInfo:LinkSpeedSupported
+force_link_speed 15
+
+# The subnet_timeout code that will be set for all the ports
+# The actual timeout is 4.096usec * 2^<subnet_timeout>
+subnet_timeout 18
+
+# Threshold of local phy errors for sending Trap 129
+local_phy_errors_threshold 0x08
+
+# Threshold of credit overrun errors for sending Trap 130
+overrun_errors_threshold 0x08
+
+#
+# PARTITIONING OPTIONS
+#
+# Partition configuration file to be used
+partition_config_file /etc/ofed/partitions.conf
+
+# Disable partition enforcement by switches
+no_partition_enforcement FALSE
+
+#
+# SWEEP OPTIONS
+#
+# The number of seconds between subnet sweeps (0 disables it)
+sweep_interval 10
+
+# If TRUE cause all lids to be reassigned
+reassign_lids FALSE
+
+# If TRUE forces every sweep to be a heavy sweep
+force_heavy_sweep FALSE
+
+# If TRUE every trap will cause a heavy sweep.
+# NOTE: successive identical traps (>10) are suppressed
+sweep_on_trap TRUE
+
+#
+# ROUTING OPTIONS
+#
+# If TRUE count switches as link subscriptions
+port_profile_switch_nodes FALSE
+
+# Name of file with port guids to be ignored by port profiling
+port_prof_ignore_file (null)
+
+# Routing engine
+# Multiple routing engines can be specified separated by
+# commas so that specific ordering of routing algorithms will
+# be tried if earlier routing engines fail.
+# Supported engines: minhop, updn, file, ftree, lash, dor
+routing_engine (null)
+
+# Connect roots (use FALSE if unsure)
+connect_roots FALSE
+
+# Use unicast routing cache (use FALSE if unsure)
+use_ucast_cache FALSE
+
+# Lid matrix dump file name
+lid_matrix_dump_file (null)
+
+# LFTs file name
+lfts_file (null)
+
+# The file holding the root node guids (for fat-tree or Up/Down)
+# One guid in each line
+root_guid_file (null)
+
+# The file holding the fat-tree compute node guids
+# One guid in each line
+cn_guid_file (null)
+
+# The file holding the node ids which will be used by Up/Down algorithm instead
+# of GUIDs (one guid and id in each line)
+ids_guid_file (null)
+
+# The file holding guid routing order guids (for MinHop and Up/Down)
+guid_routing_order_file (null)
+
+# SA database file name
+sa_db_file (null)
+
+#
+# HANDOVER - MULTIPLE SMs OPTIONS
+#
+# SM priority used for deciding who is the master
+# Range goes from 0 (lowest priority) to 15 (highest).
+sm_priority 15
+
+# If TRUE other SMs on the subnet should be ignored
+ignore_other_sm FALSE
+
+# Timeout in [msec] between two polls of active master SM
+sminfo_polling_timeout 10000
+
+# Number of failing polls of remote SM that declares it dead
+polling_retry_number 4
+
+# If TRUE honor the guid2lid file when coming out of standby
+# state, if such file exists and is valid
+honor_guid2lid_file FALSE
+
+#
+# TIMING AND THREADING OPTIONS
+#
+# Maximum number of SMPs sent in parallel
+max_wire_smps 32
+
+# The maximum time in [msec] allowed for a transaction to complete
+transaction_timeout 200
+
+# Maximal time in [msec] a message can stay in the incoming message queue.
+# If there is more than one message in the queue and the last message
+# stayed in the queue more than this value, any SA request will be
+# immediately returned with a BUSY status.
+max_msg_fifo_timeout 10000
+
+# Use a single thread for handling SA queries
+single_thread FALSE
+
+#
+# MISC OPTIONS
+#
+# Daemon mode
+daemon TRUE
+
+# SM Inactive
+sm_inactive FALSE
+
+# Babbling Port Policy
+babbling_port_policy FALSE
+
+#
+# Event Plugin Options
+#
+event_plugin_name (null)
+
+#
+# Node name map for mapping node's to more descriptive node descriptions
+# (man ibnetdiscover for more information)
+#
+node_name_map_name (null)
+
+#
+# DEBUG FEATURES
+#
+# The log flags used
+log_flags 0x03
+
+# Force flush of the log file after each log message
+force_log_flush FALSE
+
+# Log file to be used
+log_file /var/log/opensm.log
+
+# Limit the size of the log file in MB. If overrun, log is restarted
+log_max_size 0
+
+# If TRUE will accumulate the log over multiple OpenSM sessions
+accum_log_file TRUE
+
+# The directory to hold the file OpenSM dumps
+dump_files_dir /var/log/
+
+# If TRUE enables new high risk options and hardware specific quirks
+enable_quirks FALSE
+
+# If TRUE disables client reregistration
+no_clients_rereg FALSE
+
+# If TRUE OpenSM should disable multicast support and
+# no multicast routing is performed if TRUE
+disable_multicast FALSE
+
+# If TRUE opensm will exit on fatal initialization issues
+exit_on_fatal TRUE
+
+# console [off|local]
+console off
+
+# Telnet port for console (default 10000)
+console_port 10000
+
+#
+# QoS OPTIONS
+#
+# Enable QoS setup
+qos FALSE
+
+# QoS policy file to be used
+qos_policy_file /etc/ofed/qos-policy.conf
+
+# QoS default options
+qos_max_vls 0
+qos_high_limit -1
+qos_vlarb_high (null)
+qos_vlarb_low (null)
+qos_sl2vl (null)
+
+# QoS CA options
+qos_ca_max_vls 0
+qos_ca_high_limit -1
+qos_ca_vlarb_high (null)
+qos_ca_vlarb_low (null)
+qos_ca_sl2vl (null)
+
+# QoS Switch Port 0 options
+qos_sw0_max_vls 0
+qos_sw0_high_limit -1
+qos_sw0_vlarb_high (null)
+qos_sw0_vlarb_low (null)
+qos_sw0_sl2vl (null)
+
+# QoS Switch external ports options
+qos_swe_max_vls 0
+qos_swe_high_limit -1
+qos_swe_vlarb_high (null)
+qos_swe_vlarb_low (null)
+qos_swe_sl2vl (null)
+
+# QoS Router ports options
+qos_rtr_max_vls 0
+qos_rtr_high_limit -1
+qos_rtr_vlarb_high (null)
+qos_rtr_vlarb_low (null)
+qos_rtr_sl2vl (null)
+
+# Prefix routes file name
+prefix_routes_file /etc/ofed/prefix-routes.conf
+
+#
+# IPv6 Solicited Node Multicast (SNM) Options
+#
+consolidate_ipv6_snm_req FALSE
 


Index: opensm.initd
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-11/opensm.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opensm.initd	17 Sep 2008 03:06:39 -0000	1.2
+++ opensm.initd	22 Apr 2009 14:28:33 -0000	1.3
@@ -4,12 +4,12 @@
 #
 # chkconfig: - 15 85
 # description: Activates/Deactivates InfiniBand Subnet Manager
-# config: /etc/rdma/opensm.conf
+# config: /etc/ofed/opensm.conf
 #
 ### BEGIN INIT INFO
 # Provides:       opensm
 # Default-Stop: 0 1 2 3 4 5 6
-# Required-Start: $rdma
+# Required-Start: $openib
 # Short-Description: Starts/Stops the InfiniBand Subnet Manager
 # Description: Starts/Stops the InfiniBand Subnet Manager
 ### END INIT INFO
@@ -17,24 +17,17 @@
 . /etc/rc.d/init.d/functions
 
 prog=/usr/sbin/opensm
-CONFIG=/etc/rdma/opensm.conf
 PID_FILE=/var/run/opensm.pid
 ACTION=$1
 
 start()
 {
     local OSM_PID=
-    if [ ! -f $CONFIG ]; then
-        echo -n "Starting opensm: $CONFIG missing" 
-        echo_failure
-        return 6
-    fi
-    . $CONFIG
     [ -f /var/lock/subsys/opensm ] && return 0
     # Start opensm
     echo -n "Starting IB Subnet Manager:"
-    $prog $OPTIONS > /dev/null 2>&1
-    sleep 1        
+    $prog -B > /dev/null 2>&1
+    sleep 1
     OSM_PID=`pidof $prog`
     checkpid $OSM_PID
     RC=$?
@@ -53,7 +46,7 @@
 
     OSM_PID=`cat $PID_FILE`
 
-    checkpid "$OSM_PID"
+    checkpid $OSM_PID
     RC=$?
     if [ $RC -ne 0 ]; then
 	rm -f $PID_FILE


Index: opensm.spec
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-11/opensm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opensm.spec	6 Mar 2009 10:44:02 -0000	1.4
+++ opensm.spec	22 Apr 2009 14:28:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name: opensm
-Version: 3.2.1
-Release: 3%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group: System Environment/Daemons
 License: GPLv2 or BSD
@@ -9,10 +9,9 @@
 Source1: opensm.conf
 Source2: opensm.logrotate
 Source3: opensm.initd
-Patch0:  opensm-3.2.1-rpath.patch
 Patch1:  opensm-3.2.1-elif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc
+BuildRequires: libibmad-devel >= 1.3.0, libtool, bison, flex, byacc
 Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
 
 %description
@@ -47,9 +46,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .rpath
 %patch1 -p1 -b .elif
-./autogen.sh
 
 %build
 %configure --with-opensm-conf-sub-dir=rdma
@@ -60,6 +57,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm
 install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm
@@ -110,6 +108,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 3.3.1-1
+- Update to latest upstream version
+
 * Fri Mar 06 2009 Caol??n McNamara <caolanm at redhat.com> - 3.2.1-3
 - fix bare elifs to rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 23:33:50 -0000	1.2
+++ sources	22 Apr 2009 14:28:33 -0000	1.3
@@ -1 +1 @@
-997d10f81896a0d70e0f21f0e78eca92  opensm-3.2.1.tar.gz
+8c8c153f21d9f6cee51fc3d501c54fe7  opensm-3.3.1.tar.gz


--- opensm-3.2.1-rpath.patch DELETED ---



From maxamillion at fedoraproject.org  Wed Apr 22 14:28:54 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 22 Apr 2009 14:28:54 +0000 (UTC)
Subject: rpms/ifstatus/F-10 ifstatus.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090422142854.E656F700FE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21664/F-10

Modified Files:
	ifstatus.spec import.log 
Log Message:
Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue




Index: ifstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-10/ifstatus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifstatus.spec	14 Apr 2009 20:32:47 -0000	1.1
+++ ifstatus.spec	22 Apr 2009 14:28:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ifstatus
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Command line real time interface graphs using ncurses
 
 Group:          Applications/Internet
@@ -29,8 +29,7 @@
 %build
 # The Makefile of the upstream project is non-automake and can't handle 
 # the %{?smp_mflags}
-make
-
+make CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -46,6 +45,9 @@
 %{_sbindir}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-5
+- Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue
+
 * Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
 - Typo in the Summary field.
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Apr 2009 20:32:47 -0000	1.1
+++ import.log	22 Apr 2009 14:28:49 -0000	1.2
@@ -1 +1,2 @@
 ifstatus-1_1_0-4:F-10:ifstatus-1.1.0-4.src.rpm:1239740791
+ifstatus-1_1_0-5:F-10:ifstatus-1.1.0-5.src.rpm:1240410149



From pkgdb at fedoraproject.org  Wed Apr 22 14:30:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:30:56 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchcommits
Message-ID: <20090422143056.5E4D310F885@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:30:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:30:56 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchbugzilla
Message-ID: <20090422143056.77FA110F88B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:01 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchbugzilla
Message-ID: <20090422143102.1FA6310F88F@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on opencv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:02 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchcommits
Message-ID: <20090422143102.23AEA10F890@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on opencv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:02 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchcommits
Message-ID: <20090422143102.7BF8D10F894@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on opencv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:03 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchbugzilla
Message-ID: <20090422143103.D815F10F897@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on opencv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:06 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchbugzilla
Message-ID: <20090422143106.D7D5C10F89A@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on opencv (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:08 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchcommits
Message-ID: <20090422143108.136D010F89E@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on opencv (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:12 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchbugzilla
Message-ID: <20090422143112.A409010F89D@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Wed Apr 22 14:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 14:31:13 +0000
Subject: [pkgdb] opencv: corsepiu has given up watchcommits
Message-ID: <20090422143113.958F910F8A3@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From mtasaka at fedoraproject.org  Wed Apr 22 14:43:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 14:43:56 +0000 (UTC)
Subject: rpms/rubygem-gettext/devel rubygem-gettext.spec,1.5,1.6
Message-ID: <20090422144356.4281C700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26981/devel

Modified Files:
	rubygem-gettext.spec 
Log Message:
* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
- Bump ruby-locale Requires version



Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/rubygem-gettext.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-gettext.spec	20 Apr 2009 16:57:01 -0000	1.5
+++ rubygem-gettext.spec	22 Apr 2009 14:43:51 -0000	1.6
@@ -13,7 +13,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
 
@@ -56,7 +56,7 @@
 Summary:	Localization Library and Tools for Ruby
 Group:		Development/Languages
 Requires:	%{name} = %{version}-%{release}
-Requires:	ruby(locale) >= 2.0.0
+Requires:	ruby(locale) >= 2.0.1
 Provides:	ruby(gettext-package) = %{version}-%{release}
 
 %description -n	ruby-gettext-package
@@ -224,6 +224,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
+- Bump ruby-locale Requires version
+
 * Tue Apr 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
 - 2.0.1, drop patches already in upstream (all)
 



From mtasaka at fedoraproject.org  Wed Apr 22 14:44:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 14:44:22 +0000 (UTC)
Subject: rpms/rubygem-gettext/F-11 rubygem-gettext.spec,1.5,1.6
Message-ID: <20090422144422.C3EF8700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26981/F-11

Modified Files:
	rubygem-gettext.spec 
Log Message:
* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
- Bump ruby-locale Requires version



Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/F-11/rubygem-gettext.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-gettext.spec	20 Apr 2009 16:57:00 -0000	1.5
+++ rubygem-gettext.spec	22 Apr 2009 14:43:49 -0000	1.6
@@ -13,7 +13,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
 
@@ -56,7 +56,7 @@
 Summary:	Localization Library and Tools for Ruby
 Group:		Development/Languages
 Requires:	%{name} = %{version}-%{release}
-Requires:	ruby(locale) >= 2.0.0
+Requires:	ruby(locale) >= 2.0.1
 Provides:	ruby(gettext-package) = %{version}-%{release}
 
 %description -n	ruby-gettext-package
@@ -224,6 +224,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
+- Bump ruby-locale Requires version
+
 * Tue Apr 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-1
 - 2.0.1, drop patches already in upstream (all)
 



From rdieter at fedoraproject.org  Wed Apr 22 14:44:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 22 Apr 2009 14:44:40 +0000 (UTC)
Subject: rpms/k3b/devel .cvsignore, 1.20, 1.21 k3b.spec, 1.68, 1.69 sources, 
	1.21, 1.22 k3b-1.0.3-umount.patch, 1.2,
	NONE k3b-1.0.4-kde#151816.patch, 1.1,
	NONE k3b-1.0.4-manualbufsize.patch, 1.1,
	NONE k3b-1.0.5-hidden.patch, 1.3,
	NONE k3b-1.0.5-kde#156684.patch, 1.1, NONE k3brc, 1.2, NONE
Message-ID: <20090422144440.432D0700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27866

Modified Files:
	.cvsignore k3b.spec sources 
Removed Files:
	k3b-1.0.3-umount.patch k3b-1.0.4-kde#151816.patch 
	k3b-1.0.4-manualbufsize.patch k3b-1.0.5-hidden.patch 
	k3b-1.0.5-kde#156684.patch k3brc 
Log Message:
* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.65.0-1
- k3b-1.65.0 (alpha1)
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	27 May 2008 12:42:47 -0000	1.20
+++ .cvsignore	22 Apr 2009 14:44:36 -0000	1.21
@@ -1,2 +1 @@
-k3b-1.0.5.tar.bz2
-k3b-i18n-1.0.5.tar.bz2
+k3b-1.65.0alpha1.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- k3b.spec	25 Feb 2009 10:02:34 -0000	1.68
+++ k3b.spec	22 Apr 2009 14:44:37 -0000	1.69
@@ -1,104 +1,43 @@
 
-## distro/release specific support
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define _with_hal --with-hal
-%endif
-
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-# include -devel subpkg or not? 1=yes
-%define devel 1
-
-
-%if 0%{?fedora} > 9
-# -libs subpkg
-%define libs 1
-%endif
-
-# build/include i18n
-%define i18n 1
+%define pre alpha1
 
 Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   0
-Version: 1.0.5
-Release: 8%{?dist}
+Version: 1.65.0
+Release: 1%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
-URL:     http://www.k3b.org
-Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
-%{?i18n:Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2}
+URL:     http://www.k3b.org/
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: bugzilla/document
 ExcludeArch: s390 s390x
 
-Source2: k3brc
-
-Patch2: k3b-1.0.3-umount.patch
-# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
-
-# upstream patches
-# http://bugs.kde.org/151816 , k3b can't reload media for verification
-Patch100: k3b-1.0.4-kde#151816.patch
-# http://bugs.kde.org/156684 , alternative to patch100
-Patch101: k3b-1.0.5-kde#156684.patch
-# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
-# upstreamed 2008-08-27
-Patch105: k3b-1.0.5-hidden.patch
+# FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
 
-BuildRequires: %{kdelibs3}-devel
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
 BuildRequires: flac-devel
 BuildRequires: gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: kdemultimedia-devel
 BuildRequires: libdvdread-devel
 BuildRequires: libmpcdec-devel
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libvorbis-devel
+# needed by k3bsetup
+#BuildRequires: polkit-qt-devel
 BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-
-Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
-Provides:  k3b-extras = %{epoch}:%{version}-%{release} 
-%if 0%{?i18n}
-# imo, should be packaged separately, tis a shame to duplicate all 
-# this noarch build/data on *every* arch.  -- Rex
-Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
-Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?devel}
-Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
-%endif
-
-Requires(post): coreutils
-Requires(postun): coreutils
 
-%if 0%{?libs}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-%else
-#Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
-Provides:  %{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
 
 Requires: cdrecord mkisofs
-%if 0%{?fedora} > 3
 Requires(hint): cdrdao
 Requires(hint): dvd+rw-tools
-#Requires(hint): gnome-mount
-%endif
 
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
@@ -110,7 +49,6 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-# be paranoid -- Rex
 Requires: %{name} = %{epoch}:%{version}-%{release}
 %description libs
 %{summary}.
@@ -124,161 +62,80 @@
 
 
 %prep
-%setup -q %{?i18n:-a 1} -n %{name}-%{version}
-
-%patch2 -p1 -b .umount
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-
-#patch100 -p1 -b .kde#151816
-%patch101 -p1 -b .kde#156684
-%patch105 -p1 -b .hidden
+%setup -q -n %{name}-%{version}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --includedir=%{_includedir}/k3b \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  --without-ffmpeg --without-lame --without-libmad \
-  --with-musepack \
-  %{?_with_hal} %{!?_with_hal:--without-hal} 
-
-make %{?_smp_mflags}
-
-%if 0%{?i18n}
-# Build for i18n tarball
-pushd %{name}-i18n-%{version}
-%configure
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+  -DK3B_BUILD_K3BSETUP=OFF \
+  ..
 popd
-%endif
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-%if 0%{?i18n}
-# Install for i18n tarball
-pushd %{name}-i18n-%{version}
-make install DESTDIR=%{buildroot}
-popd
-%endif
-
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
-
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop
-
-# remove the .la files
-rm -f %{buildroot}%{_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-rm -fr %{buildroot}%{_datadir}/locale/nds
-
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> all.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%if 0%{?i18n}
-%find_lang k3b
-%find_lang k3bsetup
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
-%endif
-
-# unpackaged files
-%if ! 0%{?devel}
-rm -rf %{buildroot}%{_includedir}/k3b/
-rm -f  %{buildroot}%{_libdir}/libk3b*.so
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 %post
-%{?!libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+touch --no-create %{_kde4_iconsdir}/hicolor ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{?!libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
-%files -f all.lang
-%defattr(-,root,root,755)
+%files 
+%defattr(-,root,root,-)
 %doc AUTHORS README COPYING TODO ChangeLog
-%{_bindir}/k3b
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/mimelnk/application/x-k3b.desktop
-
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{_datadir}/services/kfile_k3b.desktop
-%{_datadir}/services/videodvd.protocol
-
-%{_datadir}/apps/k3b/
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/config/*
-%{_datadir}/sounds/*
-%{_datadir}/icons/hicolor/*/*/*
+%{_kde4_bindir}/k3b
+%{_kde4_appsdir}/k3b/
+%{_kde4_appsdir}/konqsidebartng/konqsidebartng/virtual_folders/services/*.desktop
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/k3b*.desktop
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop
+%{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
+%{_kde4_datadir}/sounds/k3b_*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/*.so
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
-%{_libdir}/libk3b*.so.*
+%{_kde4_libdir}/libk3b*.so.*
 
-%if 0%{?devel}
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/k3b/
-%{_libdir}/libk3b*.so
-%endif
+%{_kde4_includedir}/k3b*
+%{_kde4_libdir}/libk3b*.so
 
 
 %changelog
+* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.65.0-1
+- k3b-1.65.0 (alpha1)
+- optimize scriptlets
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	27 May 2008 12:42:47 -0000	1.21
+++ sources	22 Apr 2009 14:44:37 -0000	1.22
@@ -1,2 +1 @@
-e3b37d0d009af3dd149215d6ae0d54f3  k3b-1.0.5.tar.bz2
-610b1fd9356c89cbb38b6dda1f115c86  k3b-i18n-1.0.5.tar.bz2
+1573fcf064fee3d9848a63ceefa5cf41  k3b-1.65.0alpha1.tar.bz2


--- k3b-1.0.3-umount.patch DELETED ---


--- k3b-1.0.4-kde#151816.patch DELETED ---


--- k3b-1.0.4-manualbufsize.patch DELETED ---


--- k3b-1.0.5-hidden.patch DELETED ---


--- k3b-1.0.5-kde#156684.patch DELETED ---


--- k3brc DELETED ---



From linville at fedoraproject.org  Wed Apr 22 14:45:40 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 22 Apr 2009 14:45:40 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch,
	NONE, 1.1 kernel.spec, 1.1340, 1.1341
Message-ID: <20090422144540.E9E1C700FE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28520

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch 
Log Message:
back-port mac80211: fix beacon loss detection after scan

linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch:

--- NEW FILE linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch ---
Back-port of the following upstream commit...

commit ad935687dbe7307f5abd9e3f610a965a287324a9
Author: Kalle Valo <kalle.valo at iki.fi>
Date:   Sun Apr 19 08:47:19 2009 +0300

    mac80211: fix beacon loss detection after scan
    
    Currently beacon loss detection triggers after a scan. A probe request
    is sent and a message like this is printed to the log:
    
    wlan0: beacon loss from AP 00:12:17:e7:98:de - sending probe request
    
    But in fact there is no beacon loss, the beacons are just not received
    because of the ongoing scan. Fix it by updating last_beacon after
    the scan has finished.
    
    Reported-by: Jaswinder Singh Rajput <jaswinder at kernel.org>
    Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
    Acked-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/net/mac80211/mlme.c.orig linux-2.6.29.noarch/net/mac80211/mlme.c
--- linux-2.6.29.noarch/net/mac80211/mlme.c.orig	2009-04-22 10:28:59.000000000 -0400
+++ linux-2.6.29.noarch/net/mac80211/mlme.c	2009-04-22 10:36:24.000000000 -0400
@@ -2364,9 +2364,30 @@ static void ieee80211_sta_work(struct wo
 
 static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
 {
-	if (sdata->vif.type == NL80211_IFTYPE_STATION)
+	struct ieee80211_local *local = sdata->local;
+	struct sta_info *sta;
+
+	rcu_read_lock();
+
+	sta = sta_info_get(local, sdata->u.sta.bssid);
+	if (!sta) {
+		rcu_read_unlock();
+		return;
+	}
+
+ 	if (sdata->vif.type == NL80211_IFTYPE_STATION) {
+ 		/*
+ 		 * Need to update last_rx to avoid beacon loss
+ 		 * test to trigger.
+ 		 */
+ 		sta->last_rx = jiffies;
+ 
+ 
 		queue_work(sdata->local->hw.workqueue,
 			   &sdata->u.sta.work);
+	}
+
+	rcu_read_unlock();
 }
 
 /* interface setup */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -r1.1340 -r1.1341
--- kernel.spec	22 Apr 2009 14:16:30 -0000	1.1340
+++ kernel.spec	22 Apr 2009 14:45:39 -0000	1.1341
@@ -649,6 +649,7 @@
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1279,6 +1280,9 @@
 ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 
+# back-port mac80211: fix beacon loss detection after scan
+ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1907,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-41
+- back-port mac80211: fix beacon loss detection after scan
+
 * Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-40
 - Add 2.6.29.2 patch queue (as git-linus.diff)
 - Drop queued patches:



From linville at fedoraproject.org  Wed Apr 22 14:46:05 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 22 Apr 2009 14:46:05 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch,
	NONE, 1.1 kernel.spec, 1.1567, 1.1568
Message-ID: <20090422144605.7D983700FE@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28928

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch 
Log Message:
back-port mac80211: fix beacon loss detection after scan

linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch:

--- NEW FILE linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch ---
Back-port of the following upstream commit...

commit ad935687dbe7307f5abd9e3f610a965a287324a9
Author: Kalle Valo <kalle.valo at iki.fi>
Date:   Sun Apr 19 08:47:19 2009 +0300

    mac80211: fix beacon loss detection after scan
    
    Currently beacon loss detection triggers after a scan. A probe request
    is sent and a message like this is printed to the log:
    
    wlan0: beacon loss from AP 00:12:17:e7:98:de - sending probe request
    
    But in fact there is no beacon loss, the beacons are just not received
    because of the ongoing scan. Fix it by updating last_beacon after
    the scan has finished.
    
    Reported-by: Jaswinder Singh Rajput <jaswinder at kernel.org>
    Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
    Acked-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/net/mac80211/mlme.c.orig linux-2.6.29.noarch/net/mac80211/mlme.c
--- linux-2.6.29.noarch/net/mac80211/mlme.c.orig	2009-04-22 10:28:59.000000000 -0400
+++ linux-2.6.29.noarch/net/mac80211/mlme.c	2009-04-22 10:36:24.000000000 -0400
@@ -2364,9 +2364,30 @@ static void ieee80211_sta_work(struct wo
 
 static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
 {
-	if (sdata->vif.type == NL80211_IFTYPE_STATION)
+	struct ieee80211_local *local = sdata->local;
+	struct sta_info *sta;
+
+	rcu_read_lock();
+
+	sta = sta_info_get(local, sdata->u.sta.bssid);
+	if (!sta) {
+		rcu_read_unlock();
+		return;
+	}
+
+ 	if (sdata->vif.type == NL80211_IFTYPE_STATION) {
+ 		/*
+ 		 * Need to update last_rx to avoid beacon loss
+ 		 * test to trigger.
+ 		 */
+ 		sta->last_rx = jiffies;
+ 
+ 
 		queue_work(sdata->local->hw.workqueue,
 			   &sdata->u.sta.work);
+	}
+
+	rcu_read_unlock();
 }
 
 /* interface setup */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1567
retrieving revision 1.1568
diff -u -r1.1567 -r1.1568
--- kernel.spec	21 Apr 2009 20:26:43 -0000	1.1567
+++ kernel.spec	22 Apr 2009 14:46:01 -0000	1.1568
@@ -667,6 +667,7 @@
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
 
 Patch700: linux-2.6-dma-debug-fixes.patch
 
@@ -1321,6 +1322,9 @@
 ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 
+# back-port mac80211: fix beacon loss detection after scan
+ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
+
 # Fix up DMA debug code
 ApplyPatch linux-2.6-dma-debug-fixes.patch
 
@@ -1980,6 +1984,9 @@
 # and build.
 
 %changelog
+* Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-106
+- back-port mac80211: fix beacon loss detection after scan
+
 * Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-105
 - Don't include the modules.*.bin files in the RPM package.
 



From overholt at fedoraproject.org  Wed Apr 22 14:47:09 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 22 Apr 2009 14:47:09 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel .cvsignore, 1.8,
	1.9 eclipse-mylyn-addfedoracustomizations.patch, 1.7,
	1.8 eclipse-mylyn.spec, 1.37, 1.38 fetch-mylyn.sh, 1.9,
	1.10 sources, 1.11, 1.12
Message-ID: <20090422144709.6427B700FE@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29313

Modified Files:
	.cvsignore eclipse-mylyn-addfedoracustomizations.patch 
	eclipse-mylyn.spec fetch-mylyn.sh sources 
Log Message:
* Wed Apr 22 2009 Andrew Overholt <overholt at redhat.com> 3.1.1-1
- 3.1.1
- Bug fixes from 3.1.0:  http://tinyurl.com/mylyn-3-1-1bugs
- Remove wikitext build patch that has been merged upstream.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Mar 2009 15:34:29 -0000	1.8
+++ .cvsignore	22 Apr 2009 14:47:05 -0000	1.9
@@ -1,2 +1,2 @@
 fedoraeclipse-mylynbugzilla-0.0.3.zip
-org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2
+org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2

eclipse-mylyn-addfedoracustomizations.patch:

Index: eclipse-mylyn-addfedoracustomizations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-mylyn-addfedoracustomizations.patch	17 Mar 2009 15:34:29 -0000	1.7
+++ eclipse-mylyn-addfedoracustomizations.patch	22 Apr 2009 14:47:05 -0000	1.8
@@ -1,12 +1,14 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.mylyn.bugzilla-feature
 Index: feature.xml
 ===================================================================
 RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature/feature.xml,v
-retrieving revision 1.386
-diff -u -r1.386 feature.xml
---- feature.xml	2 Nov 2008 21:08:04 -0000	1.386
-+++ feature.xml	17 Mar 2009 13:38:41 -0000
+retrieving revision 1.386.2.1
+diff -u -r1.386.2.1 feature.xml
+--- feature.xml	11 Apr 2009 02:13:56 -0000	1.386.2.1
++++ feature.xml	22 Apr 2009 14:16:52 -0000
 @@ -55,4 +55,11 @@
-          version="3.1.0.qualifier"
+          version="3.1.1.qualifier"
           unpack="false"/>
  
 +   <plugin


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- eclipse-mylyn.spec	25 Mar 2009 13:36:03 -0000	1.37
+++ eclipse-mylyn.spec	22 Apr 2009 14:47:05 -0000	1.38
@@ -2,7 +2,7 @@
 %define install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 # http://download.eclipse.org/tools/mylyn/update/e3.4/
-%define qualifier           v20090315-1500-e3x
+%define qualifier           v20090411-0400-e3x
 
 # Prevent brp-java-repack-jars from being run.  Spaces in the paths of
 # the help content are broken by it.
@@ -10,15 +10,15 @@
 
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.1.0
-Release: 3%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # mkdir temp && cd temp
 # sh fetch-mylyn.sh
-# tar cjf org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2
+# tar cjf org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2 org.eclipse.mylyn
+Source0: org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2
 Source1: fetch-mylyn.sh
 Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.3.zip
 
@@ -33,9 +33,6 @@
 # Our xmlrpc packages are split into JARs differently than Orbit
 # This patch is not suitable for upstream.
 Patch8: %{name}-splitxmlrpc.patch
-# Add additional Bundle-Require to ensure that all docs are build.
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=269970
-Patch9: %{name}-wikitext_builddoc.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -172,7 +169,6 @@
 popd
 %patch7
 %patch8
-%patch9
 
 find -name feature.xml |
   while read f; do
@@ -331,6 +327,11 @@
 # FIXME:  add the doc files back
 
 %changelog
+* Wed Apr 22 2009 Andrew Overholt <overholt at redhat.com> 3.1.1-1
+- 3.1.1
+- Bug fixes from 3.1.0:  http://tinyurl.com/mylyn-3-1-1bugs
+- Remove wikitext build patch that has been merged upstream.
+
 * Wed Mar 25 2009 Alexander Kurtakov <akurtako at redhat.com> 3.1.0-3
 - Fix documentation build.
 


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fetch-mylyn.sh	17 Mar 2009 15:34:29 -0000	1.9
+++ fetch-mylyn.sh	22 Apr 2009 14:47:05 -0000	1.10
@@ -67,5 +67,5 @@
 org.eclipse.mylyn.wikitext.ui \
 ; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
-export -r R_3_1_0 org.eclipse.mylyn/$f;
+export -r R_3_1_1 org.eclipse.mylyn/$f;
 done


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2009 15:34:29 -0000	1.11
+++ sources	22 Apr 2009 14:47:05 -0000	1.12
@@ -1,2 +1,2 @@
 ccf62375bb3dfe3d0d3bab4323765c5f  fedoraeclipse-mylynbugzilla-0.0.3.zip
-9443eb57da9533fbc3e8b2ca39acd5a1  org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2
+7e0c93fff981d2488ee427a8b71364aa  org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2



From jakub at fedoraproject.org  Wed Apr 22 14:48:03 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 22 Apr 2009 14:48:03 +0000 (UTC)
Subject: rpms/valgrind/F-11 valgrind-3.4.1-x86_64-ldso-strlen.patch, NONE,
	1.1 valgrind.spec, 1.62, 1.63
Message-ID: <20090422144803.788D8700FE@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29618

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.4.1-x86_64-ldso-strlen.patch 
Log Message:
3.4.1-2

valgrind-3.4.1-x86_64-ldso-strlen.patch:

--- NEW FILE valgrind-3.4.1-x86_64-ldso-strlen.patch ---
--- valgrind/coregrind/pub_core_trampoline.h.jj	2009-04-22 12:10:54.000000000 +0200
+++ valgrind/coregrind/pub_core_trampoline.h	2009-04-22 14:50:39.000000000 +0200
@@ -66,6 +66,7 @@ extern Char* VG_(x86_linux_REDIR_FOR_ind
 extern void VG_(amd64_linux_SUBST_FOR_rt_sigreturn);
 extern void VG_(amd64_linux_REDIR_FOR_vgettimeofday);
 extern void VG_(amd64_linux_REDIR_FOR_vtime);
+extern UInt VG_(amd64_linux_REDIR_FOR_strlen)( void* );
 #endif
 
 #if defined(VGP_ppc32_linux)
--- valgrind/coregrind/m_redir.c.jj	2009-04-22 12:10:54.000000000 +0200
+++ valgrind/coregrind/m_redir.c	2009-04-22 15:32:19.000000000 +0200
@@ -879,6 +879,20 @@ void VG_(redir_initialise) ( void )
       (Addr)&VG_(amd64_linux_REDIR_FOR_vtime) 
    );
 
+   /* If we're using memcheck, use these intercepts right from
+      the start, otherwise ld.so makes a lot of noise. */
+   if (0==VG_(strcmp)("Memcheck", VG_(details).name)) {
+
+      static const HChar croakage[]
+        = "Possible fix: install glibc's debuginfo package on this machine.";
+
+      /* this is mandatory - can't sanely continue without it */
+      add_hardwired_spec(
+         "ld-linux-x86-64.so.2", "strlen",
+         (Addr)&VG_(amd64_linux_REDIR_FOR_strlen),
+         croakage
+      );   
+   }
 #  elif defined(VGP_ppc32_linux)
    {
    static const HChar croakage[]
--- valgrind/coregrind/m_trampoline.S.jj	2009-04-22 12:10:54.000000000 +0200
+++ valgrind/coregrind/m_trampoline.S	2009-04-22 15:18:37.000000000 +0200
@@ -174,7 +174,29 @@ VG_(amd64_linux_REDIR_FOR_vtime):
 .LfnE3:
 .size VG_(amd64_linux_REDIR_FOR_vtime), .-.LfnB3
 
-/* A CIE for the above two functions, followed by their FDEs */
+/* There's no particular reason that this needs to be handwritten
+   assembly, but since that's what this file contains, here's a
+   simple strlen implementation (written in C and compiled by gcc.)
+*/
+.global VG_(amd64_linux_REDIR_FOR_strlen)
+.type   VG_(amd64_linux_REDIR_FOR_strlen), @function
+VG_(amd64_linux_REDIR_FOR_strlen):
+.LfnB4:
+	xorl	%eax, %eax
+	cmpb	$0, (%rdi)
+	movq	%rdi, %rdx
+	je	.L41
+.L40:	addq	$1, %rdx
+	cmpb	$0, (%rdx)
+	jne	.L40
+	movq	%rdx, %rax
+	subq	%rdi, %rax
+.L41:	ret
+.LfnE4:
+.size VG_(amd64_linux_REDIR_FOR_strlen), .-VG_(amd64_linux_REDIR_FOR_strlen)
+
+
+/* A CIE for the above three functions, followed by their FDEs */
 	.section .eh_frame,"a", at progbits
 .Lframe1:
         .long   .LEcie1-.LScie1
@@ -212,6 +234,15 @@ VG_(amd64_linux_REDIR_FOR_vtime):
         .uleb128 0x0
         .align 8
 .LEfde3:
+.LSfde4:
+        .long   .LEfde4-.LASfde4
+.LASfde4:
+        .long   .LASfde4-.Lframe1
+        .long   .LfnB4
+        .long   .LfnE4-.LfnB4
+        .uleb128 0x0
+        .align 8
+.LEfde4:
 	.previous
 
 .global VG_(trampoline_stuff_end)


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-11/valgrind.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- valgrind.spec	9 Mar 2009 12:50:44 -0000	1.62
+++ valgrind.spec	22 Apr 2009 14:48:00 -0000	1.63
@@ -1,11 +1,12 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.4.1
-Release: 1
+Release: 2
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.4.1-cachegrind-improvements.patch
 Patch2: valgrind-3.4.1-openat.patch
+Patch3: valgrind-3.4.1-x86_64-ldso-strlen.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -61,6 +62,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -151,6 +153,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 22 2009 Jakub Jelinek <jakub at redhat.com> 3.4.1-2
+- redirect x86_64 ld.so strlen early (#495645)
+
 * Mon Mar  9 2009 Jakub Jelinek <jakub at redhat.com> 3.4.1-1
 - update to 3.4.1
 



From rdieter at fedoraproject.org  Wed Apr 22 14:51:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 22 Apr 2009 14:51:29 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.69,1.70
Message-ID: <20090422145129.16A2D700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31011

Modified Files:
	k3b.spec 
Log Message:
validate .desktop file



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- k3b.spec	22 Apr 2009 14:44:37 -0000	1.69
+++ k3b.spec	22 Apr 2009 14:51:27 -0000	1.70
@@ -82,6 +82,10 @@
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/k3b.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -112,7 +116,7 @@
 %{_kde4_appsdir}/k3b/
 %{_kde4_appsdir}/konqsidebartng/konqsidebartng/virtual_folders/services/*.desktop
 %{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/k3b*.desktop
+%{_kde4_datadir}/applications/kde4/k3b.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
 %{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop



From ajax at fedoraproject.org  Wed Apr 22 14:51:27 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 22 Apr 2009 14:51:27 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xorg-x11-server.spec,1.438,1.439
Message-ID: <20090422145127.96EA6700FE@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31083

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Apr 22 2009 Adam Jackson <ajax at redhat.com> 1.6.1-7
- Conflict with too-old versions of xorg-x11-drivers. (#497144)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- xorg-x11-server.spec	17 Apr 2009 19:06:22 -0000	1.438
+++ xorg-x11-server.spec	22 Apr 2009 14:51:25 -0000	1.439
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -208,6 +208,8 @@
 Obsoletes: xorg-x11-drv-tek4957 <= 1.2.0-1.fc9
 Obsoletes: xorg-x11-drv-ur98 <= 1.1.0-5.fc9
 Obsoletes: xorg-x11-drv-wiimote <= 0.0.1-1.fc9
+# old driver metapackages would Require the above, so force them out
+Conflicts: xorg-x11-drivers < 7.3-11.fc11
 # Force sufficiently new libpciaccess
 Conflicts: libpciaccess < 0.10.3-5
 
@@ -540,6 +542,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Adam Jackson <ajax at redhat.com> 1.6.1-7
+- Conflict with too-old versions of xorg-x11-drivers. (#497144)
+
 * Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 1.6.1-6
 - xserver-1.6.1-randr-gamma.patch: Silence debugging messages.
 



From maxamillion at fedoraproject.org  Wed Apr 22 14:51:58 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 22 Apr 2009 14:51:58 +0000 (UTC)
Subject: rpms/ifstatus/EL-5 ifstatus.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090422145158.E97F3700FE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28116/EL-5

Modified Files:
	ifstatus.spec import.log 
Log Message:
Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue




Index: ifstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-5/ifstatus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifstatus.spec	14 Apr 2009 20:51:48 -0000	1.1
+++ ifstatus.spec	22 Apr 2009 14:51:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ifstatus
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Command line real time interface graphs using ncurses
 
 Group:          Applications/Internet
@@ -29,8 +29,7 @@
 %build
 # The Makefile of the upstream project is non-automake and can't handle 
 # the %{?smp_mflags}
-make
-
+make CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -46,6 +45,9 @@
 %{_sbindir}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-5
+- Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue
+
 * Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
 - Typo in the Summary field.
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Apr 2009 20:51:48 -0000	1.1
+++ import.log	22 Apr 2009 14:51:54 -0000	1.2
@@ -1 +1,2 @@
 ifstatus-1_1_0-4:EL-5:ifstatus-1.1.0-4.src.rpm:1239742277
+ifstatus-1_1_0-5:EL-5:ifstatus-1.1.0-5.src.rpm:1240410592



From rdieter at fedoraproject.org  Wed Apr 22 14:53:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 22 Apr 2009 14:53:52 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.70,1.71
Message-ID: <20090422145353.0ECC5700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31866

Modified Files:
	k3b.spec 
Log Message:
_datadir -> _kde4_datadir (minor)



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- k3b.spec	22 Apr 2009 14:51:27 -0000	1.70
+++ k3b.spec	22 Apr 2009 14:53:45 -0000	1.71
@@ -83,7 +83,7 @@
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/k3b.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k3b.desktop
 
 
 %clean



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:03 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150003.35AFB10F88A@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:03 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150003.CA0BA10F88C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:03 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150003.D302410F88F@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:04 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150004.BC41E10F892@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:09 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150009.50E8010F894@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:10 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150010.AC1ED10F898@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:10 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150010.C40CD10F89A@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:10 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150010.CBD8010F89D@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:18 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150018.5E18510F8A0@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:18 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150018.5845F10F89F@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:15 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150019.4F00A10F8A3@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:15 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150019.624C210F8A6@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:19 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150019.C1AA010F8A9@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:23 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150023.D221E10F8AC@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:24 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150024.4271A10F8AF@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:25 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150025.226DE10F8B3@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:41 +0000
Subject: [pkgdb] gts: corsepiu has given up watchbugzilla
Message-ID: <20090422150041.3D5C910F890@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on gts (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From pkgdb at fedoraproject.org  Wed Apr 22 15:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 15:00:41 +0000
Subject: [pkgdb] gts: corsepiu has given up watchcommits
Message-ID: <20090422150041.40EFF10F891@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on gts (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gts



From dledford at fedoraproject.org  Wed Apr 22 15:02:35 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 15:02:35 +0000 (UTC)
Subject: rpms/openmpi/F-11 openmpi.module.in, 1.3, 1.4 openmpi.pc.in, 1.3,
	1.4 openmpi.spec, 1.31, 1.32 openmpi-1.2.4-open.patch, 1.1, NONE
Message-ID: <20090422150236.1E0E270103@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/openmpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2556

Modified Files:
	openmpi.module.in openmpi.pc.in openmpi.spec 
Removed Files:
	openmpi-1.2.4-open.patch 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-2
- fixed broken update
- Resolves: bz496909, bz496131, bz496911



Index: openmpi.module.in
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.module.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openmpi.module.in	28 Jun 2007 22:06:10 -0000	1.3
+++ openmpi.module.in	22 Apr 2009 15:02:29 -0000	1.4
@@ -2,8 +2,7 @@
 #
 #  OpenMPI module for use with 'environment-modules' package:
 # 
-prepend-path		MANPATH		@DATADIR@/@MPIDIR@/man
-prepend-path 		PATH 		@DATADIR@/@MPIDIR@/bin at MODE@
-prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@
-setenv			CFLAGS		-I at INCLUDEDIR@/@MPIDIR@ -I at INCLUDEDIR@/@MPIDIR@/@NAME@ -I at INCLUDEDIR@/@MPIDIR@/@MODE@ @MODEFLAG@
-setenv			LDFLAGS		-L at LIBDIR@/@MPIDIR@ -lmpi
+prepend-path 		PATH 		@LIBDIR@/@MPIDIR@/bin
+prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@/lib
+setenv			CFLAGS		-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@
+setenv			LDFLAGS		-L at LIBDIR@/@MPIDIR@/lib -lmpi


Index: openmpi.pc.in
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openmpi.pc.in	28 Jun 2007 22:06:10 -0000	1.3
+++ openmpi.pc.in	22 Apr 2009 15:02:29 -0000	1.4
@@ -2,6 +2,6 @@
 Name: 		@NAME@
 Description:	Open Message Passing Interface headers and libraries
 URL:		http://www.open-mpi.org/
-Version:	@VERSION at -@CC at -@MODE@
-Libs:		-L at LIBDIR@/@MPIDIR@ -lmpi
-Cflags: 	-I at INCLUDEDIR@/@MPIDIR@ -I at INCLUDEDIR@/@MPIDIR@/@NAME@ -I at INCLUDEDIR@/@MPIDIR@/@MODE@ @MODEFLAG@
+Version:	@VERSION at -@CC@
+Libs:		-L at LIBDIR@/@MPIDIR@/lib -lmpi
+Cflags: 	-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@


Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openmpi.spec	14 Apr 2009 20:55:48 -0000	1.31
+++ openmpi.spec	22 Apr 2009 15:02:29 -0000	1.32
@@ -1,6 +1,24 @@
-Name:			openmpi
+# We only compile with gcc, but other people may want other compilers.
+# Set the compiler here.
+%define opt_cc gcc
+# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
+# so uncomment and define to use
+#define opt_cflags
+%define opt_cxx g++
+#define opt_cxxflags
+%define opt_f77 gfortran
+#define opt_fflags
+%define opt_fc gfortran
+#define opt_fcflags
+
+# Optional name suffix to use...we leave it off when compiling with gcc, but
+# for other compiled versions to install side by side, it will need a
+# suffix in order to keep the names from conflicting.
+#define cc_name_suffix -gcc
+
+Name:			openmpi%{?cc_name_suffix}
 Version:		1.3.1
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
@@ -9,18 +27,17 @@
 Source1:		openmpi.pc.in
 Source2:		openmpi.module.in
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:		gcc-gfortran, libtool, numactl-devel, libtorque-devel
-#BuildRequires:		libibverbs-devel, opensm-devel
+BuildRequires:		gcc-gfortran, libtool, numactl-devel
+BuildRequires:		libibverbs-devel, opensm-devel > 3.3.0
 #%ifnarch ppc
-#BuildRequires:		dapl-devel
+#BuildRequires:		compat-dapl-devel
 #%endif
-Requires(post):		/sbin/ldconfig
-Requires(post):		%{_sbindir}/update-alternatives
-Requires(preun):	%{_sbindir}/update-alternatives
-Requires:		%{name}-libs = %{version}-%{release}
+Provides:		mpi
+Requires:		environment-modules
+Obsoletes:		openmpi-libs, openmpi-devel
 
 %description
-Open MPI is an open source, freely available implementation of both the
+Open MPI is an open source, freely available implementation of both the 
 MPI-1 and MPI-2 standards, combining technologies and resources from
 several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in
 order to build the best MPI library available.  A completely new MPI-2
@@ -28,49 +45,6 @@
 software vendors, application developers, and computer science
 researchers. For more information, see http://www.open-mpi.org/ .
 
-%package libs
-Summary:		Libraries used by openmpi programs
-Group:			Development/Libraries
-Requires(post):		%{_sbindir}/update-alternatives
-Requires(preun):	%{_sbindir}/update-alternatives
-
-%description libs
-Contains shared libraries used by openmpi applications.
-
-%package devel
-Summary:		Development files for openmpi
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
-Provides:		mpi-devel = %{version}-%{release}
-Requires(post):		%{_sbindir}/update-alternatives
-Requires(preun):	%{_sbindir}/update-alternatives
-
-%description devel
-Contains development headers and libraries for openmpi.
-
-%package vt
-Summary:		VampirTrace versions of openmpi programs
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
-
-%description vt
-VampirTrace consists of a tool set and a run-time library for instrumentation 
-and tracing of software applications. In particular, it is tailored towards 
-parallel and distributed High Performance Computing (HPC) applications.
-The instrumentation part modifies a given application in order to inject 
-additional measurement calls during run-time. The tracing part provides the 
-actual measurement functionality used by the instrumentation calls. By this 
-means, a variety of detailed performance properties can be collected and 
-recorded during run-time. This package contains the openmpi programs 
-with VampirTrace enabled.
-
-# We only compile with gcc, but other people may want other compilers.
-# Set the compiler here.
-%define opt_cc gcc
-# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
-# so uncomment and define to use
-#define opt_cc_cflags
-
 # When dealing with multilib installations, aka the ability to run either
 # i386 or x86_64 binaries on x86_64 machines, we install the native i386
 # openmpi libs/compilers and the native x86_64 libs/compilers.  Obviously,
@@ -93,249 +67,80 @@
 %ifarch ia64
 %define mode 64
 %endif
-%ifarch s390
-%define mode 31
-%endif
-%ifarch s390x
-%define mode 64
-%endif
 %ifarch x86_64 ppc64 sparc64
 %define mode 64
 %define modeflag -m64
 %endif
 
-# That alternatives system selects the highest priority item as the default.
-# Usually, that means 64bit preferred over 32bit on multilib, but ppc is an
-# exception in that 32bit is preferred over 64bit.  So, the priority values
-# selected here make that happen.
-%ifarch i386 ppc64 s390 sparc64
-%define priority 10
-%else
-%define priority 11
-%endif
-
 # We set this to for convenience, since this is the unique dir we use for this
 # particular package, version, compiler
 %define mpidir %{name}/%{version}-%{opt_cc}
 
 %prep
 %setup -q
-
 %ifarch x86_64
 XFLAGS="-fPIC"
 %endif
-%configure \
-	--includedir=%{_includedir}/%{mpidir} \
-	--libdir=%{_libdir}/%{mpidir} \
-	--datadir=%{_datadir}/%{mpidir}/help%{mode} \
-	--mandir=%{_datadir}/%{mpidir}/man \
-	--with-threads=posix \
-	--with-tm \
-	CC=%{opt_cc} \
+
+./configure --prefix=%{_libdir}/%{mpidir} --with-libnuma=/usr \
+	--with-openib=/usr --enable-mpirun-prefix-by-default \
+	--mandir=%{_libdir}/%{mpidir}/man \
+	CC=%{opt_cc} CXX=%{opt_cxx} \
 	LDFLAGS='-Wl,-z,noexecstack' \
-	CFLAGS="%{?opt_cc_cflags} $RPM_OPT_FLAGS $XFLAGS" \
-	CXXFLAGS="$RPM_OPT_FLAGS $XFLAGS" \
-	FFLAGS="$RPM_OPT_FLAGS $XFLAGS";
-# ${datadir}/openmpi will be used ONLY for the english help*.txt files
+	CFLAGS="%{?opt_cflags} $RPM_OPT_FLAGS $XFLAGS" \
+	CXXFLAGS="%{?opt_cxxflags} $RPM_OPT_FLAGS $XFLAGS" \
+	FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} $RPM_OPT_FLAGS $XFLAGS" \
+	F77=%{opt_f77} FFLAGS="%{?opt_fflags} $RPM_OPT_FLAGS $XFLAGS"
 
 %build
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+find %{buildroot}%{_libdir}/%{mpidir}/lib -name \*.la | xargs rm
+find %{buildroot}%{_libdir}/%{mpidir}/man -type f | xargs gzip -9
+ln -s mpicc.1.gz %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1.gz
+rm -f %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1
+
+# Make the pkgconfig file
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}.pc
+# Make the environment-modules file
+mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+sed 's#@LIBDIR@#'%{_libdir}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > %{buildroot}/%{_datadir}/Modules/modulefiles/%{name}-%{version}-%{opt_cc}-%{_arch}.module
 
-# Because no package owns the base openmpi directories, the install sets
-# the mode wrong.  This will cause problems when the first copy of openmpi
-# is installed on a system.  Correct the directory permissions here.
-chmod 755 ${RPM_BUILD_ROOT}/%{_libdir}/openmpi
-chmod 755 ${RPM_BUILD_ROOT}/%{_includedir}/openmpi
-chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/openmpi
-
-# Remove the symlinks from common names to the unique name in /usr/bin too
-rm ${RPM_BUILD_ROOT}%{_bindir}/mpi*
-# Move the wrapper program to a name that denotes the mode it compiles
-mv ${RPM_BUILD_ROOT}%{_bindir}/opal_wrapper{,-%{version}-%{opt_cc}-%{mode}}
-# But, opal_wrapper needs to be called by a name that denotes the compiler
-# type in order to work, so in order to leave it functional even when it isn't
-# the currently selected system wide default via the alternatives program,
-# make the proper symlinks from %{_datadir}/%{name}/bin to the wrapper
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}
-for i in mpicc mpic++ mpicxx mpiCC mpif77 mpif90 ; do
-  ln -s %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}/$i
-done
-# The fortran include file differs between 32/64bit environments, so make
-# two copies
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/%{mpidir}/%{mode}
-mv ${RPM_BUILD_ROOT}%{_includedir}/%{mpidir}/{mpif-config.h,%{mode}}
-# and have the wrapper include the right one by using the wrapper-data.txt
-# files for the fortran modes to signal the extra include dir
-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help%{mode}/openmpi/mpif{77,90}-wrapper-data.txt; do
-  sed -e 's#extra_includes=#extra_includes='%{mode}' #' < $i > $i.out
-  mv $i.out $i
-done
-# and we also need to force the compile mode via the wrapper-data.txt files
+# we need to force the compile mode via the wrapper-data.txt files
 # (except on ia64 where the -m64 flag is not allowed by gcc)
 %ifnarch ia64
-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help%{mode}/openmpi/*wrapper-data.txt; do
+for i in %{buildroot}%{_libdir}/%{mpidir}/share/openmpi/*wrapper-data.txt
+do
   sed -e 's#compiler_flags=#compiler_flags='%{?modeflag}' #' < $i > $i.out
   mv $i.out $i
 done
 %endif
 
-echo %{_libdir}/%{mpidir} > ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/%{name}.ld.conf
-# Make the pkgconfig files
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig;
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc;
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@DATADIR@#'%{_datadir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/%{name}.module;
-
-# Ghost files for alternatives
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpirun
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpiexec
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
-touch ${RPM_BUILD_ROOT}%{_mandir}/man1/mpirun.1.gz
-touch ${RPM_BUILD_ROOT}%{_mandir}/man1/mpiexec.1.gz
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpicc
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpic++
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpiCC
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpicxx
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpif77
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpif90
-
-# Clean up static libs
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/*.a
-
-# This file is corrupt, don't try to package it.
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/vampirtrace/doc/opari/lacsi01.ps.gz
-
-# Clean up long names
-pushd ${RPM_BUILD_ROOT}%{_bindir}
-for i in otfaux otfcompress otfconfig otfdump otfmerge; do
-	ln -s %{_arch}-redhat-linux-gnu-$i $i;
-done
-popd
-
 %clean
-[ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
-
-%post
-%{_sbindir}/update-alternatives --install %{_bindir}/mpirun mpi-run %{_bindir}/orterun \
-		%{priority} \
-	--slave %{_bindir}/mpiexec mpi-exec %{_bindir}/orterun \
-	--slave %{_mandir}/man1/mpirun.1.gz mpi-run-man \
-		%{_datadir}/%{mpidir}/man/man1/mpirun.1.gz \
-	--slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \
-		%{_datadir}/%{mpidir}/man/man1/orterun.1.gz
-
-%preun
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove mpi-run %{_bindir}/orterun
-fi
-
-
-%post libs
-%{_sbindir}/update-alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
-		mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf %{priority}
-/sbin/ldconfig
-
-%preun libs
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf
-fi
-
-%postun libs -p /sbin/ldconfig
-
-%post devel
-%{_sbindir}/update-alternatives --install %{_bindir}/mpicc mpicc \
-			%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-			%{priority} \
-	--slave %{_bindir}/mpic++ mpic++ \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpiCC mpiCC \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpicxx mpicxx \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpif77 mpif77 \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpif90 mpif90 \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-
-%preun devel
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-fi
-
-%postun devel -p /sbin/ldconfig
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
-%config(noreplace) %{_sysconfdir}/openmpi-*
-%dir %{_datadir}/%{mpidir}
-%{_bindir}/ompi-clean
-%{_bindir}/ompi-ps
-%{_bindir}/ompi-server
-%{_bindir}/opari
-%{_bindir}/orte-clean
-%{_bindir}/orte-iof
-%{_bindir}/orte-ps
-%{_bindir}/orted
-%{_bindir}/orterun
-%{_bindir}/ompi_info
-%{_bindir}/*otf*
-%ghost %{_bindir}/mpirun
-%ghost %{_bindir}/mpiexec
-%ghost %{_mandir}/man1/mpirun.1.gz
-%ghost %{_mandir}/man1/mpiexec.1.gz
-%{_datadir}/%{mpidir}/*
-%exclude %{_datadir}/%{mpidir}/bin%{mode}
-%exclude %{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
-%exclude %{_datadir}/%{mpidir}/man/man3
-
-%files libs
-%defattr(-,root,root,-)
 %dir %{_libdir}/%{mpidir}
-%dir %{_libdir}/%{mpidir}/%{name}
-%ghost %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf
-%{_libdir}/%{mpidir}/*.so.*
-%{_libdir}/%{mpidir}/%{name}/*.so
-%{_libdir}/%{mpidir}/*.conf
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-%ghost %{_bindir}/mpicc
-%ghost %{_bindir}/mpic++
-%ghost %{_bindir}/mpiCC
-%ghost %{_bindir}/mpicxx
-%ghost %{_bindir}/mpif77
-%ghost %{_bindir}/mpif90
-%{_datadir}/%{mpidir}/bin%{mode}/
-%{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
-%{_includedir}/%{mpidir}/
-%{_datadir}/%{mpidir}/man/man3/
-%{_libdir}/%{mpidir}/*.so
-%{_libdir}/%{mpidir}/*.la
-%{_libdir}/%{mpidir}/%{name}/*.la
-%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc
-%{_libdir}/%{mpidir}/*.mod
-%{_libdir}/%{mpidir}/*.module
-
-%files vt
-%defattr(-,root,root,-)
-%{_bindir}/vtcc
-%{_bindir}/vtcxx
-%{_bindir}/vtf77
-%{_bindir}/vtf90
-%{_bindir}/vtfilter
-%{_bindir}/vtunify
-%{_datadir}/vampirtrace/
-
+%dir %{_libdir}/%{mpidir}/etc
+%config(noreplace) %{_libdir}/%{mpidir}/etc/*
+%{_libdir}/%{mpidir}/bin
+%{_libdir}/%{mpidir}/include
+%{_libdir}/%{mpidir}/lib
+%{_libdir}/%{mpidir}/man
+%{_libdir}/%{mpidir}/share
+%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}.pc
+%{_datadir}/Modules/modulefiles/*
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-2
+- fixed broken update
+- Resolves: bz496909, bz496131, bz496911
+
 * Tue Apr 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-1
 - update to 1.3.1, cleanup alternatives, spec, make new vt subpackage
 


--- openmpi-1.2.4-open.patch DELETED ---



From dledford at fedoraproject.org  Wed Apr 22 15:04:14 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 15:04:14 +0000 (UTC)
Subject: rpms/openmpi/devel openmpi.module.in, 1.3, 1.4 openmpi.pc.in, 1.3, 
	1.4 openmpi.spec, 1.31, 1.32 openmpi-1.2.4-open.patch, 1.1, NONE
Message-ID: <20090422150414.1C7D9700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3303

Modified Files:
	openmpi.module.in openmpi.pc.in openmpi.spec 
Removed Files:
	openmpi-1.2.4-open.patch 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-2
- fixed broken update
- Resolves: bz496909, bz496131, bz496911



Index: openmpi.module.in
===================================================================
RCS file: /cvs/extras/rpms/openmpi/devel/openmpi.module.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openmpi.module.in	28 Jun 2007 22:06:10 -0000	1.3
+++ openmpi.module.in	22 Apr 2009 15:04:12 -0000	1.4
@@ -2,8 +2,7 @@
 #
 #  OpenMPI module for use with 'environment-modules' package:
 # 
-prepend-path		MANPATH		@DATADIR@/@MPIDIR@/man
-prepend-path 		PATH 		@DATADIR@/@MPIDIR@/bin at MODE@
-prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@
-setenv			CFLAGS		-I at INCLUDEDIR@/@MPIDIR@ -I at INCLUDEDIR@/@MPIDIR@/@NAME@ -I at INCLUDEDIR@/@MPIDIR@/@MODE@ @MODEFLAG@
-setenv			LDFLAGS		-L at LIBDIR@/@MPIDIR@ -lmpi
+prepend-path 		PATH 		@LIBDIR@/@MPIDIR@/bin
+prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@/lib
+setenv			CFLAGS		-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@
+setenv			LDFLAGS		-L at LIBDIR@/@MPIDIR@/lib -lmpi


Index: openmpi.pc.in
===================================================================
RCS file: /cvs/extras/rpms/openmpi/devel/openmpi.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openmpi.pc.in	28 Jun 2007 22:06:10 -0000	1.3
+++ openmpi.pc.in	22 Apr 2009 15:04:12 -0000	1.4
@@ -2,6 +2,6 @@
 Name: 		@NAME@
 Description:	Open Message Passing Interface headers and libraries
 URL:		http://www.open-mpi.org/
-Version:	@VERSION at -@CC at -@MODE@
-Libs:		-L at LIBDIR@/@MPIDIR@ -lmpi
-Cflags: 	-I at INCLUDEDIR@/@MPIDIR@ -I at INCLUDEDIR@/@MPIDIR@/@NAME@ -I at INCLUDEDIR@/@MPIDIR@/@MODE@ @MODEFLAG@
+Version:	@VERSION at -@CC@
+Libs:		-L at LIBDIR@/@MPIDIR@/lib -lmpi
+Cflags: 	-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@


Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openmpi.spec	14 Apr 2009 20:55:48 -0000	1.31
+++ openmpi.spec	22 Apr 2009 15:04:12 -0000	1.32
@@ -1,6 +1,24 @@
-Name:			openmpi
+# We only compile with gcc, but other people may want other compilers.
+# Set the compiler here.
+%define opt_cc gcc
+# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
+# so uncomment and define to use
+#define opt_cflags
+%define opt_cxx g++
+#define opt_cxxflags
+%define opt_f77 gfortran
+#define opt_fflags
+%define opt_fc gfortran
+#define opt_fcflags
+
+# Optional name suffix to use...we leave it off when compiling with gcc, but
+# for other compiled versions to install side by side, it will need a
+# suffix in order to keep the names from conflicting.
+#define cc_name_suffix -gcc
+
+Name:			openmpi%{?cc_name_suffix}
 Version:		1.3.1
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
@@ -9,18 +27,17 @@
 Source1:		openmpi.pc.in
 Source2:		openmpi.module.in
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:		gcc-gfortran, libtool, numactl-devel, libtorque-devel
-#BuildRequires:		libibverbs-devel, opensm-devel
+BuildRequires:		gcc-gfortran, libtool, numactl-devel
+BuildRequires:		libibverbs-devel, opensm-devel > 3.3.0
 #%ifnarch ppc
-#BuildRequires:		dapl-devel
+#BuildRequires:		compat-dapl-devel
 #%endif
-Requires(post):		/sbin/ldconfig
-Requires(post):		%{_sbindir}/update-alternatives
-Requires(preun):	%{_sbindir}/update-alternatives
-Requires:		%{name}-libs = %{version}-%{release}
+Provides:		mpi
+Requires:		environment-modules
+Obsoletes:		openmpi-libs, openmpi-devel
 
 %description
-Open MPI is an open source, freely available implementation of both the
+Open MPI is an open source, freely available implementation of both the 
 MPI-1 and MPI-2 standards, combining technologies and resources from
 several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in
 order to build the best MPI library available.  A completely new MPI-2
@@ -28,49 +45,6 @@
 software vendors, application developers, and computer science
 researchers. For more information, see http://www.open-mpi.org/ .
 
-%package libs
-Summary:		Libraries used by openmpi programs
-Group:			Development/Libraries
-Requires(post):		%{_sbindir}/update-alternatives
-Requires(preun):	%{_sbindir}/update-alternatives
-
-%description libs
-Contains shared libraries used by openmpi applications.
-
-%package devel
-Summary:		Development files for openmpi
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
-Provides:		mpi-devel = %{version}-%{release}
-Requires(post):		%{_sbindir}/update-alternatives
-Requires(preun):	%{_sbindir}/update-alternatives
-
-%description devel
-Contains development headers and libraries for openmpi.
-
-%package vt
-Summary:		VampirTrace versions of openmpi programs
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
-
-%description vt
-VampirTrace consists of a tool set and a run-time library for instrumentation 
-and tracing of software applications. In particular, it is tailored towards 
-parallel and distributed High Performance Computing (HPC) applications.
-The instrumentation part modifies a given application in order to inject 
-additional measurement calls during run-time. The tracing part provides the 
-actual measurement functionality used by the instrumentation calls. By this 
-means, a variety of detailed performance properties can be collected and 
-recorded during run-time. This package contains the openmpi programs 
-with VampirTrace enabled.
-
-# We only compile with gcc, but other people may want other compilers.
-# Set the compiler here.
-%define opt_cc gcc
-# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
-# so uncomment and define to use
-#define opt_cc_cflags
-
 # When dealing with multilib installations, aka the ability to run either
 # i386 or x86_64 binaries on x86_64 machines, we install the native i386
 # openmpi libs/compilers and the native x86_64 libs/compilers.  Obviously,
@@ -93,249 +67,80 @@
 %ifarch ia64
 %define mode 64
 %endif
-%ifarch s390
-%define mode 31
-%endif
-%ifarch s390x
-%define mode 64
-%endif
 %ifarch x86_64 ppc64 sparc64
 %define mode 64
 %define modeflag -m64
 %endif
 
-# That alternatives system selects the highest priority item as the default.
-# Usually, that means 64bit preferred over 32bit on multilib, but ppc is an
-# exception in that 32bit is preferred over 64bit.  So, the priority values
-# selected here make that happen.
-%ifarch i386 ppc64 s390 sparc64
-%define priority 10
-%else
-%define priority 11
-%endif
-
 # We set this to for convenience, since this is the unique dir we use for this
 # particular package, version, compiler
 %define mpidir %{name}/%{version}-%{opt_cc}
 
 %prep
 %setup -q
-
 %ifarch x86_64
 XFLAGS="-fPIC"
 %endif
-%configure \
-	--includedir=%{_includedir}/%{mpidir} \
-	--libdir=%{_libdir}/%{mpidir} \
-	--datadir=%{_datadir}/%{mpidir}/help%{mode} \
-	--mandir=%{_datadir}/%{mpidir}/man \
-	--with-threads=posix \
-	--with-tm \
-	CC=%{opt_cc} \
+
+./configure --prefix=%{_libdir}/%{mpidir} --with-libnuma=/usr \
+	--with-openib=/usr --enable-mpirun-prefix-by-default \
+	--mandir=%{_libdir}/%{mpidir}/man \
+	CC=%{opt_cc} CXX=%{opt_cxx} \
 	LDFLAGS='-Wl,-z,noexecstack' \
-	CFLAGS="%{?opt_cc_cflags} $RPM_OPT_FLAGS $XFLAGS" \
-	CXXFLAGS="$RPM_OPT_FLAGS $XFLAGS" \
-	FFLAGS="$RPM_OPT_FLAGS $XFLAGS";
-# ${datadir}/openmpi will be used ONLY for the english help*.txt files
+	CFLAGS="%{?opt_cflags} $RPM_OPT_FLAGS $XFLAGS" \
+	CXXFLAGS="%{?opt_cxxflags} $RPM_OPT_FLAGS $XFLAGS" \
+	FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} $RPM_OPT_FLAGS $XFLAGS" \
+	F77=%{opt_f77} FFLAGS="%{?opt_fflags} $RPM_OPT_FLAGS $XFLAGS"
 
 %build
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+find %{buildroot}%{_libdir}/%{mpidir}/lib -name \*.la | xargs rm
+find %{buildroot}%{_libdir}/%{mpidir}/man -type f | xargs gzip -9
+ln -s mpicc.1.gz %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1.gz
+rm -f %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1
+
+# Make the pkgconfig file
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}.pc
+# Make the environment-modules file
+mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+sed 's#@LIBDIR@#'%{_libdir}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > %{buildroot}/%{_datadir}/Modules/modulefiles/%{name}-%{version}-%{opt_cc}-%{_arch}.module
 
-# Because no package owns the base openmpi directories, the install sets
-# the mode wrong.  This will cause problems when the first copy of openmpi
-# is installed on a system.  Correct the directory permissions here.
-chmod 755 ${RPM_BUILD_ROOT}/%{_libdir}/openmpi
-chmod 755 ${RPM_BUILD_ROOT}/%{_includedir}/openmpi
-chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/openmpi
-
-# Remove the symlinks from common names to the unique name in /usr/bin too
-rm ${RPM_BUILD_ROOT}%{_bindir}/mpi*
-# Move the wrapper program to a name that denotes the mode it compiles
-mv ${RPM_BUILD_ROOT}%{_bindir}/opal_wrapper{,-%{version}-%{opt_cc}-%{mode}}
-# But, opal_wrapper needs to be called by a name that denotes the compiler
-# type in order to work, so in order to leave it functional even when it isn't
-# the currently selected system wide default via the alternatives program,
-# make the proper symlinks from %{_datadir}/%{name}/bin to the wrapper
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}
-for i in mpicc mpic++ mpicxx mpiCC mpif77 mpif90 ; do
-  ln -s %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/bin%{mode}/$i
-done
-# The fortran include file differs between 32/64bit environments, so make
-# two copies
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/%{mpidir}/%{mode}
-mv ${RPM_BUILD_ROOT}%{_includedir}/%{mpidir}/{mpif-config.h,%{mode}}
-# and have the wrapper include the right one by using the wrapper-data.txt
-# files for the fortran modes to signal the extra include dir
-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help%{mode}/openmpi/mpif{77,90}-wrapper-data.txt; do
-  sed -e 's#extra_includes=#extra_includes='%{mode}' #' < $i > $i.out
-  mv $i.out $i
-done
-# and we also need to force the compile mode via the wrapper-data.txt files
+# we need to force the compile mode via the wrapper-data.txt files
 # (except on ia64 where the -m64 flag is not allowed by gcc)
 %ifnarch ia64
-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{mpidir}/help%{mode}/openmpi/*wrapper-data.txt; do
+for i in %{buildroot}%{_libdir}/%{mpidir}/share/openmpi/*wrapper-data.txt
+do
   sed -e 's#compiler_flags=#compiler_flags='%{?modeflag}' #' < $i > $i.out
   mv $i.out $i
 done
 %endif
 
-echo %{_libdir}/%{mpidir} > ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/%{name}.ld.conf
-# Make the pkgconfig files
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig;
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc;
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@DATADIR@#'%{_datadir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/%{name}.module;
-
-# Ghost files for alternatives
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpirun
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpiexec
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
-touch ${RPM_BUILD_ROOT}%{_mandir}/man1/mpirun.1.gz
-touch ${RPM_BUILD_ROOT}%{_mandir}/man1/mpiexec.1.gz
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpicc
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpic++
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpiCC
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpicxx
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpif77
-touch ${RPM_BUILD_ROOT}%{_bindir}/mpif90
-
-# Clean up static libs
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/%{mpidir}/*.a
-
-# This file is corrupt, don't try to package it.
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/vampirtrace/doc/opari/lacsi01.ps.gz
-
-# Clean up long names
-pushd ${RPM_BUILD_ROOT}%{_bindir}
-for i in otfaux otfcompress otfconfig otfdump otfmerge; do
-	ln -s %{_arch}-redhat-linux-gnu-$i $i;
-done
-popd
-
 %clean
-[ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
-
-%post
-%{_sbindir}/update-alternatives --install %{_bindir}/mpirun mpi-run %{_bindir}/orterun \
-		%{priority} \
-	--slave %{_bindir}/mpiexec mpi-exec %{_bindir}/orterun \
-	--slave %{_mandir}/man1/mpirun.1.gz mpi-run-man \
-		%{_datadir}/%{mpidir}/man/man1/mpirun.1.gz \
-	--slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \
-		%{_datadir}/%{mpidir}/man/man1/orterun.1.gz
-
-%preun
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove mpi-run %{_bindir}/orterun
-fi
-
-
-%post libs
-%{_sbindir}/update-alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
-		mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf %{priority}
-/sbin/ldconfig
-
-%preun libs
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove mpilibs%{mode} %{_libdir}/%{mpidir}/%{name}.ld.conf
-fi
-
-%postun libs -p /sbin/ldconfig
-
-%post devel
-%{_sbindir}/update-alternatives --install %{_bindir}/mpicc mpicc \
-			%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-			%{priority} \
-	--slave %{_bindir}/mpic++ mpic++ \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpiCC mpiCC \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpicxx mpicxx \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpif77 mpif77 \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode} \
-	--slave %{_bindir}/mpif90 mpif90 \
-		%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-
-%preun devel
-if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-fi
-
-%postun devel -p /sbin/ldconfig
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
-%config(noreplace) %{_sysconfdir}/openmpi-*
-%dir %{_datadir}/%{mpidir}
-%{_bindir}/ompi-clean
-%{_bindir}/ompi-ps
-%{_bindir}/ompi-server
-%{_bindir}/opari
-%{_bindir}/orte-clean
-%{_bindir}/orte-iof
-%{_bindir}/orte-ps
-%{_bindir}/orted
-%{_bindir}/orterun
-%{_bindir}/ompi_info
-%{_bindir}/*otf*
-%ghost %{_bindir}/mpirun
-%ghost %{_bindir}/mpiexec
-%ghost %{_mandir}/man1/mpirun.1.gz
-%ghost %{_mandir}/man1/mpiexec.1.gz
-%{_datadir}/%{mpidir}/*
-%exclude %{_datadir}/%{mpidir}/bin%{mode}
-%exclude %{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
-%exclude %{_datadir}/%{mpidir}/man/man3
-
-%files libs
-%defattr(-,root,root,-)
 %dir %{_libdir}/%{mpidir}
-%dir %{_libdir}/%{mpidir}/%{name}
-%ghost %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf
-%{_libdir}/%{mpidir}/*.so.*
-%{_libdir}/%{mpidir}/%{name}/*.so
-%{_libdir}/%{mpidir}/*.conf
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
-%ghost %{_bindir}/mpicc
-%ghost %{_bindir}/mpic++
-%ghost %{_bindir}/mpiCC
-%ghost %{_bindir}/mpicxx
-%ghost %{_bindir}/mpif77
-%ghost %{_bindir}/mpif90
-%{_datadir}/%{mpidir}/bin%{mode}/
-%{_datadir}/%{mpidir}/help%{mode}/openmpi/*-wrapper-data.txt
-%{_includedir}/%{mpidir}/
-%{_datadir}/%{mpidir}/man/man3/
-%{_libdir}/%{mpidir}/*.so
-%{_libdir}/%{mpidir}/*.la
-%{_libdir}/%{mpidir}/%{name}/*.la
-%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc
-%{_libdir}/%{mpidir}/*.mod
-%{_libdir}/%{mpidir}/*.module
-
-%files vt
-%defattr(-,root,root,-)
-%{_bindir}/vtcc
-%{_bindir}/vtcxx
-%{_bindir}/vtf77
-%{_bindir}/vtf90
-%{_bindir}/vtfilter
-%{_bindir}/vtunify
-%{_datadir}/vampirtrace/
-
+%dir %{_libdir}/%{mpidir}/etc
+%config(noreplace) %{_libdir}/%{mpidir}/etc/*
+%{_libdir}/%{mpidir}/bin
+%{_libdir}/%{mpidir}/include
+%{_libdir}/%{mpidir}/lib
+%{_libdir}/%{mpidir}/man
+%{_libdir}/%{mpidir}/share
+%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}.pc
+%{_datadir}/Modules/modulefiles/*
 
 %changelog
+* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-2
+- fixed broken update
+- Resolves: bz496909, bz496131, bz496911
+
 * Tue Apr 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-1
 - update to 1.3.1, cleanup alternatives, spec, make new vt subpackage
 


--- openmpi-1.2.4-open.patch DELETED ---



From cebbert at fedoraproject.org  Wed Apr 22 15:12:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 22 Apr 2009 15:12:35 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-forcedeth-fix-resume-from-hibernate.patch, 
	NONE, 1.1 kernel.spec, 1.1341, 1.1342
Message-ID: <20090422151236.2B6DC700FE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5485

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-forcedeth-fix-resume-from-hibernate.patch 
Log Message:
Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)

linux-2.6-forcedeth-fix-resume-from-hibernate.patch:

--- NEW FILE linux-2.6-forcedeth-fix-resume-from-hibernate.patch ---
From: Ed Swierk <eswierk at aristanetworks.com>
Date: Tue, 7 Apr 2009 00:49:12 +0000 (-0700)
Subject: forcedeth: Fix resume from hibernation regression.
X-Git-Tag: v2.6.30-rc1~137^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=35a7433c789ba6df6d96b70fa745ae9e6cac0038

forcedeth: Fix resume from hibernation regression.

Reset phy state on resume, fixing a regression caused by powering down
the phy on hibernate.

Signed-off-by: Ed Swierk <eswierk at aristanetworks.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
[cebbert at redhat.com: backport to 2.6.29]
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a858c6f..663a7b3 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -6117,6 +6117,9 @@ static int nv_resume(struct pci_dev *pdev)
 	for (i = 0;i <= np->register_size/sizeof(u32); i++)
 		writel(np->saved_config_space[i], base+i*sizeof(u32));
 
+	/* restore phy state, including autoneg */
+	phy_init(dev);
+
 	netif_device_attach(dev);
 	if (netif_running(dev)) {
 		rc = nv_open(dev);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1341
retrieving revision 1.1342
diff -u -r1.1341 -r1.1342
--- kernel.spec	22 Apr 2009 14:45:39 -0000	1.1341
+++ kernel.spec	22 Apr 2009 15:12:33 -0000	1.1342
@@ -700,6 +700,7 @@
 # patches headed for -stable
 # make RLIMIT_CPU work again
 Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+Patch7010: linux-2.6-forcedeth-fix-resume-from-hibernate.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -1311,6 +1312,7 @@
 
 # patches headed for -stable
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-forcedeth-fix-resume-from-hibernate.patch
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
@@ -1911,6 +1913,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
+- Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)
+
 * Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-41
 - back-port mac80211: fix beacon loss detection after scan
 



From maxamillion at fedoraproject.org  Wed Apr 22 15:18:00 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 22 Apr 2009 15:18:00 +0000 (UTC)
Subject: rpms/ifstatus/EL-4 ifstatus.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090422151800.EA5B4700FE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/ifstatus/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6712/EL-4

Modified Files:
	ifstatus.spec import.log 
Log Message:
Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue




Index: ifstatus.spec
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-4/ifstatus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifstatus.spec	14 Apr 2009 20:53:07 -0000	1.1
+++ ifstatus.spec	22 Apr 2009 15:17:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ifstatus
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Command line real time interface graphs using ncurses
 
 Group:          Applications/Internet
@@ -29,8 +29,7 @@
 %build
 # The Makefile of the upstream project is non-automake and can't handle 
 # the %{?smp_mflags}
-make
-
+make CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -46,6 +45,9 @@
 %{_sbindir}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-5
+- Added CXXFLAGS and CXFLAGS to resolve debuginfo sources issue
+
 * Tue Apr 14 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.1.0-4
 - Typo in the Summary field.
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ifstatus/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Apr 2009 20:53:07 -0000	1.1
+++ import.log	22 Apr 2009 15:17:29 -0000	1.2
@@ -1 +1,2 @@
 ifstatus-1_1_0-4:EL-4:ifstatus-1.1.0-4.src.rpm:1239742370
+ifstatus-1_1_0-5:EL-4:ifstatus-1.1.0-5.src.rpm:1240412470



From mnagy at fedoraproject.org  Wed Apr 22 15:30:07 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Wed, 22 Apr 2009 15:30:07 +0000 (UTC)
Subject: rpms/bind/F-11 bind-96-db_unregister.patch, NONE,
	1.1 bind-96-dyndb.patch, 1.4, 1.5 bind.spec, 1.310, 1.311
Message-ID: <20090422153007.A9153700FE@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10842

Modified Files:
	bind-96-dyndb.patch bind.spec 
Added Files:
	bind-96-db_unregister.patch 
Log Message:
* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
- update the patch for dynamic loading of database backends
- fix dns_db_unregister()


bind-96-db_unregister.patch:

--- NEW FILE bind-96-db_unregister.patch ---
diff --git a/lib/dns/db.c b/lib/dns/db.c
index a4c2864..62f461c 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -860,6 +860,8 @@ dns_db_unregister(dns_dbimplementation_t **dbimp) {
 	isc_mem_put(mctx, imp, sizeof(dns_dbimplementation_t));
 	isc_mem_detach(&mctx);
 	RWUNLOCK(&implock, isc_rwlocktype_write);
+
+	*dbimp = NULL;
 }
 
 isc_result_t

bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind-96-dyndb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bind-96-dyndb.patch	21 Apr 2009 09:33:31 -0000	1.4
+++ bind-96-dyndb.patch	22 Apr 2009 15:30:04 -0000	1.5
@@ -1,5 +1,5 @@
 diff --git a/bin/named/main.c b/bin/named/main.c
-index aa6575a..8030e3d 100644
+index aa6575a..aed2a55 100644
 --- a/bin/named/main.c
 +++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
@@ -14,13 +14,13 @@
  	dlz_drivers_clear();
  #endif
  
-+	dns_dynamic_db_cleanup();
++	dns_dynamic_db_cleanup(ISC_TRUE);
 +
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 diff --git a/bin/named/server.c b/bin/named/server.c
-index 31b2761..5d4077d 100644
+index 31b2761..7670f1a 100644
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
 @@ -56,6 +56,7 @@
@@ -150,6 +150,23 @@
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
+@@ -2903,6 +3002,7 @@ load_configuration(const char *filename, ns_server_t *server,
+ 	result = isc_task_beginexclusive(server->task);
+ 	RUNTIME_CHECK(result == ISC_R_SUCCESS);
+ 
++	dns_dynamic_db_cleanup(ISC_FALSE);
+ 	/*
+ 	 * Parse the global default pseudo-config file.
+ 	 */
+@@ -4140,6 +4240,8 @@ loadconfig(ns_server_t *server) {
+ static isc_result_t
+ reload(ns_server_t *server) {
+ 	isc_result_t result;
++
++	dns_dynamic_db_cleanup(ISC_FALSE);
+ 	CHECK(loadconfig(server));
+ 
+ 	result = load_zones(server, ISC_FALSE);
 diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
 index ef5c12a..0f7abba 100644
 --- a/lib/dns/Makefile.in
@@ -175,10 +192,10 @@
  		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
 diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
 new file mode 100644
-index 0000000..f11584d
+index 0000000..de2daf7
 --- /dev/null
 +++ b/lib/dns/dynamic_db.c
-@@ -0,0 +1,346 @@
+@@ -0,0 +1,347 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
@@ -407,25 +424,26 @@
 +}
 +
 +void
-+dns_dynamic_db_cleanup(void)
++dns_dynamic_db_cleanup(isc_boolean_t exiting)
 +{
 +	dyndb_implementation_t *elem;
-+	dyndb_implementation_t *next;
++	dyndb_implementation_t *prev;
 +
 +	RUNTIME_CHECK(isc_once_do(&once, dyndb_initialize) == ISC_R_SUCCESS);
 +
 +	LOCK(&dyndb_lock);
-+	elem = HEAD(dyndb_implementations);
++	elem = TAIL(dyndb_implementations);
 +	while (elem != NULL) {
-+		next = NEXT(elem, link);
++		prev = PREV(elem, link);
 +		UNLINK(dyndb_implementations, elem, link);
 +		elem->destroy_function();
 +		unload_library(&elem);
-+		elem = next;
++		elem = prev;
 +	}
 +	UNLOCK(&dyndb_lock);
 +
-+	isc_mutex_destroy(&dyndb_lock);
++	if (exiting == ISC_TRUE)
++		isc_mutex_destroy(&dyndb_lock);
 +}
 +
 +dns_dyndb_arguments_t *
@@ -540,7 +558,7 @@
  		message.h name.h ncache.h \
 diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
 new file mode 100644
-index 0000000..12f7a06
+index 0000000..7b1c1ce
 --- /dev/null
 +++ b/lib/dns/include/dns/dynamic_db.h
 @@ -0,0 +1,50 @@
@@ -578,7 +596,7 @@
 +				 isc_mem_t *mctx, const char * const *argv,
 +				 dns_dyndb_arguments_t *dyndb_args);
 +
-+void dns_dynamic_db_cleanup(void);
++void dns_dynamic_db_cleanup(isc_boolean_t exiting);
 +
 +dns_dyndb_arguments_t *dns_dyndb_arguments_create(isc_mem_t *mctx);
 +void dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args);


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- bind.spec	21 Apr 2009 09:33:31 -0000	1.310
+++ bind.spec	22 Apr 2009 15:30:04 -0000	1.311
@@ -61,6 +61,7 @@
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 Patch104: bind-96-dyndb.patch
+Patch105: bind-96-db_unregister.patch
 
 # IDN paches
 Patch73: bind-9.5-libidn.patch
@@ -168,6 +169,7 @@
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
 %patch104 -p1 -b .dyndb
+%patch105 -p1 -b .db_unregister
 %if %{SDB}
 %patch101 -p1 -b .old-api
 mkdir bin/named-sdb
@@ -569,8 +571,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
-* Tue Apr 21 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
+* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends
+- fix dns_db_unregister()
 
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
 - 9.6.1b1 release



From rdieter at fedoraproject.org  Wed Apr 22 15:30:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 22 Apr 2009 15:30:38 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.71,1.72
Message-ID: <20090422153038.9B653700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11010

Modified Files:
	k3b.spec 
Log Message:
fix files



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- k3b.spec	22 Apr 2009 14:53:45 -0000	1.71
+++ k3b.spec	22 Apr 2009 15:30:36 -0000	1.72
@@ -114,7 +114,7 @@
 %doc AUTHORS README COPYING TODO ChangeLog
 %{_kde4_bindir}/k3b
 %{_kde4_appsdir}/k3b/
-%{_kde4_appsdir}/konqsidebartng/konqsidebartng/virtual_folders/services/*.desktop
+%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/k3b.desktop
 %{_kde4_datadir}/kde4/services/*.desktop



From mnagy at fedoraproject.org  Wed Apr 22 15:37:13 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Wed, 22 Apr 2009 15:37:13 +0000 (UTC)
Subject: rpms/bind/devel bind-96-db_unregister.patch, NONE,
	1.1 bind-96-dyndb.patch, 1.4, 1.5 bind.spec, 1.310, 1.311
Message-ID: <20090422153713.699CC70104@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13600

Modified Files:
	bind-96-dyndb.patch bind.spec 
Added Files:
	bind-96-db_unregister.patch 
Log Message:
* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
- update the patch for dynamic loading of database backends
- fix dns_db_unregister()


bind-96-db_unregister.patch:

--- NEW FILE bind-96-db_unregister.patch ---
diff --git a/lib/dns/db.c b/lib/dns/db.c
index a4c2864..62f461c 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -860,6 +860,8 @@ dns_db_unregister(dns_dbimplementation_t **dbimp) {
 	isc_mem_put(mctx, imp, sizeof(dns_dbimplementation_t));
 	isc_mem_detach(&mctx);
 	RWUNLOCK(&implock, isc_rwlocktype_write);
+
+	*dbimp = NULL;
 }
 
 isc_result_t

bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bind-96-dyndb.patch	22 Apr 2009 06:47:57 -0000	1.4
+++ bind-96-dyndb.patch	22 Apr 2009 15:37:08 -0000	1.5
@@ -1,5 +1,5 @@
 diff --git a/bin/named/main.c b/bin/named/main.c
-index aa6575a..8030e3d 100644
+index aa6575a..aed2a55 100644
 --- a/bin/named/main.c
 +++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
@@ -14,13 +14,13 @@
  	dlz_drivers_clear();
  #endif
  
-+	dns_dynamic_db_cleanup();
++	dns_dynamic_db_cleanup(ISC_TRUE);
 +
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 diff --git a/bin/named/server.c b/bin/named/server.c
-index 31b2761..5d4077d 100644
+index 31b2761..7670f1a 100644
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
 @@ -56,6 +56,7 @@
@@ -150,6 +150,23 @@
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
+@@ -2903,6 +3002,7 @@ load_configuration(const char *filename, ns_server_t *server,
+ 	result = isc_task_beginexclusive(server->task);
+ 	RUNTIME_CHECK(result == ISC_R_SUCCESS);
+ 
++	dns_dynamic_db_cleanup(ISC_FALSE);
+ 	/*
+ 	 * Parse the global default pseudo-config file.
+ 	 */
+@@ -4140,6 +4240,8 @@ loadconfig(ns_server_t *server) {
+ static isc_result_t
+ reload(ns_server_t *server) {
+ 	isc_result_t result;
++
++	dns_dynamic_db_cleanup(ISC_FALSE);
+ 	CHECK(loadconfig(server));
+ 
+ 	result = load_zones(server, ISC_FALSE);
 diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
 index ef5c12a..0f7abba 100644
 --- a/lib/dns/Makefile.in
@@ -175,10 +192,10 @@
  		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
 diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
 new file mode 100644
-index 0000000..f11584d
+index 0000000..de2daf7
 --- /dev/null
 +++ b/lib/dns/dynamic_db.c
-@@ -0,0 +1,346 @@
+@@ -0,0 +1,347 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
@@ -407,25 +424,26 @@
 +}
 +
 +void
-+dns_dynamic_db_cleanup(void)
++dns_dynamic_db_cleanup(isc_boolean_t exiting)
 +{
 +	dyndb_implementation_t *elem;
-+	dyndb_implementation_t *next;
++	dyndb_implementation_t *prev;
 +
 +	RUNTIME_CHECK(isc_once_do(&once, dyndb_initialize) == ISC_R_SUCCESS);
 +
 +	LOCK(&dyndb_lock);
-+	elem = HEAD(dyndb_implementations);
++	elem = TAIL(dyndb_implementations);
 +	while (elem != NULL) {
-+		next = NEXT(elem, link);
++		prev = PREV(elem, link);
 +		UNLINK(dyndb_implementations, elem, link);
 +		elem->destroy_function();
 +		unload_library(&elem);
-+		elem = next;
++		elem = prev;
 +	}
 +	UNLOCK(&dyndb_lock);
 +
-+	isc_mutex_destroy(&dyndb_lock);
++	if (exiting == ISC_TRUE)
++		isc_mutex_destroy(&dyndb_lock);
 +}
 +
 +dns_dyndb_arguments_t *
@@ -540,7 +558,7 @@
  		message.h name.h ncache.h \
 diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
 new file mode 100644
-index 0000000..12f7a06
+index 0000000..7b1c1ce
 --- /dev/null
 +++ b/lib/dns/include/dns/dynamic_db.h
 @@ -0,0 +1,50 @@
@@ -578,7 +596,7 @@
 +				 isc_mem_t *mctx, const char * const *argv,
 +				 dns_dyndb_arguments_t *dyndb_args);
 +
-+void dns_dynamic_db_cleanup(void);
++void dns_dynamic_db_cleanup(isc_boolean_t exiting);
 +
 +dns_dyndb_arguments_t *dns_dyndb_arguments_create(isc_mem_t *mctx);
 +void dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args);


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- bind.spec	22 Apr 2009 06:47:57 -0000	1.310
+++ bind.spec	22 Apr 2009 15:37:08 -0000	1.311
@@ -61,6 +61,7 @@
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 Patch104: bind-96-dyndb.patch
+Patch105: bind-96-db_unregister.patch
 
 # IDN paches
 Patch73: bind-9.5-libidn.patch
@@ -168,6 +169,7 @@
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
 %patch104 -p1 -b .dyndb
+%patch105 -p1 -b .db_unregister
 %if %{SDB}
 %patch101 -p1 -b .old-api
 mkdir bin/named-sdb
@@ -571,6 +573,7 @@
 %changelog
 * Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends
+- fix dns_db_unregister()
 
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
 - 9.6.1b1 release



From kyle at fedoraproject.org  Wed Apr 22 15:40:40 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 22 Apr 2009 15:40:40 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc3.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1054, 1.1055 config-generic, 1.281, 1.282 kernel.spec, 1.1527,
	1.1528 sources, 1.1014, 1.1015 upstream, 1.927,
	1.928 patch-2.6.30-rc2-git7.bz2.sign, 1.1,
	NONE patch-2.6.30-rc2.bz2.sign, 1.1, NONE
Message-ID: <20090422154040.6B1CF700FE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14796

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc3.bz2.sign 
Removed Files:
	patch-2.6.30-rc2-git7.bz2.sign patch-2.6.30-rc2.bz2.sign 
Log Message:
* Wed Apr 22 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.30-rc3
- PROC_VMCORE=y: Exports the dump image of crashed
  kernel in ELF format



--- NEW FILE patch-2.6.30-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ7o+uyGugalF9Dw4RAtIiAJ9Q2FF0AUuE9wb5RVl3ZJRWHxiO4QCfYA6K
EEF3jM6hOhIw5XNsajDXYns=
=i1E9
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1054
retrieving revision 1.1055
diff -u -r1.1054 -r1.1055
--- .cvsignore	21 Apr 2009 16:53:34 -0000	1.1054
+++ .cvsignore	22 Apr 2009 15:40:04 -0000	1.1055
@@ -6,5 +6,4 @@
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
-patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git7.bz2
+patch-2.6.30-rc3.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- config-generic	18 Apr 2009 04:09:54 -0000	1.281
+++ config-generic	22 Apr 2009 15:40:04 -0000	1.282
@@ -3089,6 +3089,7 @@
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1527
retrieving revision 1.1528
diff -u -r1.1527 -r1.1528
--- kernel.spec	22 Apr 2009 13:54:28 -0000	1.1527
+++ kernel.spec	22 Apr 2009 15:40:05 -0000	1.1528
@@ -56,9 +56,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 2
+%define rcrev 3
 # The git snapshot level
-%define gitrev 7
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -102,7 +102,7 @@
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 1
+%define rawhide_skip_docs 0
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1817,6 +1817,11 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 22 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.30-rc3
+- PROC_VMCORE=y: Exports the dump image of crashed
+  kernel in ELF format
+
 * Wed Apr 22 2009 Neil Horman <nhorman at redhat.com>
 - Enable RELOCATABLE and CRASH_DUMP for powerpc64
 - With this we can remove the -kdump build variant


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1014
retrieving revision 1.1015
diff -u -r1.1014 -r1.1015
--- sources	17 Apr 2009 16:41:28 -0000	1.1014
+++ sources	22 Apr 2009 15:40:05 -0000	1.1015
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-4c58a960ae5130ec1126fe33409425d1  patch-2.6.30-rc2.bz2
+cd69d16ea42bbf20d0a505690be45868  patch-2.6.30-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -r1.927 -r1.928
--- upstream	21 Apr 2009 16:53:34 -0000	1.927
+++ upstream	22 Apr 2009 15:40:06 -0000	1.928
@@ -1,3 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git7.bz2
+patch-2.6.30-rc3.bz2


--- patch-2.6.30-rc2-git7.bz2.sign DELETED ---


--- patch-2.6.30-rc2.bz2.sign DELETED ---



From rayvd at fedoraproject.org  Wed Apr 22 15:41:12 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 15:41:12 +0000 (UTC)
Subject: rpms/pyodbc/devel .cvsignore, 1.4, 1.5 pyodbc.spec, 1.7, 1.8 sources,
	1.4, 1.5 README.rst, 1.1, NONE
Message-ID: <20090422154112.03FA7700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15251

Modified Files:
	.cvsignore pyodbc.spec sources 
Removed Files:
	README.rst 
Log Message:
2.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Feb 2009 23:16:19 -0000	1.4
+++ .cvsignore	22 Apr 2009 15:40:37 -0000	1.5
@@ -1,2 +1 @@
-pyodbc-2.1.4.zip
-README.rst
+pyodbc-2.1.5.zip


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/devel/pyodbc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyodbc.spec	9 Apr 2009 22:05:20 -0000	1.7
+++ pyodbc.spec	22 Apr 2009 15:40:37 -0000	1.8
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.4
-Release:        5%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
-Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       unixODBC, python >= 2.4
 BuildRequires:  unixODBC-devel
@@ -28,7 +27,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -39,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
+- Upstream released 2.1.5
+
 * Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Removing versioned BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Feb 2009 23:16:21 -0000	1.4
+++ sources	22 Apr 2009 15:40:37 -0000	1.5
@@ -1,2 +1 @@
-87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip
-d68ea88717a9efe5d2d76997a49721da  README.rst
+eccee612807e22a2aa3cc5033aee0fcc  pyodbc-2.1.5.zip


--- README.rst DELETED ---



From mclasen at fedoraproject.org  Wed Apr 22 15:42:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 22 Apr 2009 15:42:48 +0000 (UTC)
Subject: rpms/gtk2/F-11 double-browser.patch,NONE,1.1 gtk2.spec,1.370,1.371
Message-ID: <20090422154248.87300700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15767

Modified Files:
	gtk2.spec 
Added Files:
	double-browser.patch 
Log Message:
don't open double browser windows from about dialogs


double-browser.patch:

--- NEW FILE double-browser.patch ---
--- gtk+-2.16.1/gtk/gtkaboutdialog.c	2009-04-08 00:51:36.000000000 -0400
+++ hacked/gtk/gtkaboutdialog.c	2009-04-22 11:34:04.767831284 -0400
@@ -469,8 +469,6 @@
 
   priv->website_button = button = gtk_link_button_new (""); 
   gtk_widget_set_no_show_all (button, TRUE);
-  g_signal_connect (G_OBJECT (button), "clicked",
-		    G_CALLBACK (activate_url), about);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   
   priv->website_label = button = gtk_label_new ("");


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/gtk2.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- gtk2.spec	12 Apr 2009 00:22:17 -0000	1.370
+++ gtk2.spec	22 Apr 2009 15:42:15 -0000	1.371
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
@@ -33,6 +33,8 @@
 Patch3: default_printer.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=384940
 Patch4: print_authentication.patch
+# 
+Patch5: double-browser.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -138,6 +140,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
 %patch4 -p0 -b .print-authentication
+%patch5 -p1 -b .double-browser
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -344,11 +347,14 @@
 
 
 %changelog
+* Wed Apr 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-3
+- Don't open double browser windows from about dialog
+
 * Sun Apr 12 2009 Karsten Hopp <karsten at redhat.com> 2.16.1-2
 - autoconf uses ibm-linux not redhat-linux (s390x), 
   fix host similar to ppc
 
-* Sat Apr 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1
+* Sat Apr 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1 
 - Update to 2.16.1
 
 * Tue Apr  7 2009 Marek Kasik <mkasik at redhat.com> - 2.16.0-2



From rayvd at fedoraproject.org  Wed Apr 22 15:47:13 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 15:47:13 +0000 (UTC)
Subject: rpms/pyodbc/F-11 pyodbc.spec,1.7,1.8 README.rst,1.1,NONE
Message-ID: <20090422154713.2EF02700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17484

Modified Files:
	pyodbc.spec 
Removed Files:
	README.rst 
Log Message:
2.1.5


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-11/pyodbc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyodbc.spec	9 Apr 2009 22:05:20 -0000	1.7
+++ pyodbc.spec	22 Apr 2009 15:46:41 -0000	1.8
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.4
-Release:        5%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
-Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       unixODBC, python >= 2.4
 BuildRequires:  unixODBC-devel
@@ -28,7 +27,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -39,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
+- Upstream released 2.1.5
+
 * Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Removing versioned BuildRequires
 


--- README.rst DELETED ---



From jreznik at fedoraproject.org  Wed Apr 22 15:47:20 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 22 Apr 2009 15:47:20 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.4,1.5
Message-ID: <20090422154720.0A99B700FE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17557

Modified Files:
	leonidas-kde-theme.spec 
Log Message:
* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-4
- our own logos for both fedora and generic version



Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- leonidas-kde-theme.spec	21 Apr 2009 16:37:09 -0000	1.4
+++ leonidas-kde-theme.spec	22 Apr 2009 15:46:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		leonidas-kde-theme
 Version:	0.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
@@ -56,10 +56,6 @@
 cp -rp ksplash/Leonidas/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
 ln -s ../../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
 
-# logo from fedora-logos package
-# TODO: remove old one from fedora-logos as we're using default one
-ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
-
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
 cp -rp wallpapers/leonidas/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/leonidas
@@ -111,6 +107,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-4
+- our own logos for both fedora and generic version
+
 * Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-3
 - fix dist tag
 



From rayvd at fedoraproject.org  Wed Apr 22 15:49:36 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 15:49:36 +0000 (UTC)
Subject: rpms/pyodbc/F-10 pyodbc.spec,1.3,1.4
Message-ID: <20090422154936.5C89E700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18837

Modified Files:
	pyodbc.spec 
Log Message:
2.1.5


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-10/pyodbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyodbc.spec	9 Apr 2009 22:06:31 -0000	1.3
+++ pyodbc.spec	22 Apr 2009 15:49:32 -0000	1.4
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.4
-Release:        5%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
-Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       unixODBC, python >= 2.4
 BuildRequires:  unixODBC-devel
@@ -28,7 +27,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -39,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
+- Upstream released 2.1.5
+
 * Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Removing versioned BuildRequires
 



From jreznik at fedoraproject.org  Wed Apr 22 15:53:09 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 22 Apr 2009 15:53:09 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/devel .cvsignore, 1.2,
	1.3 leonidas-kde-theme.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090422155310.029B5700FE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19713

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
sync with F11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2009 17:59:07 -0000	1.2
+++ .cvsignore	22 Apr 2009 15:53:02 -0000	1.3
@@ -1 +1 @@
-leonidas-kde-theme-0.2.0.tar.bz2
+leonidas-kde-theme-0.2.2.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/leonidas-kde-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leonidas-kde-theme.spec	16 Apr 2009 17:59:07 -0000	1.1
+++ leonidas-kde-theme.spec	22 Apr 2009 15:53:02 -0000	1.2
@@ -1,14 +1,14 @@
 Name:		leonidas-kde-theme
-Version:	0.2.0
-Release:	1%{?dist}
+Version:	0.2.2
+Release:	4%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
-License:	GPLv2 and CC-BY-SA
+License:	GPLv2+ and CC-BY-SA
 
-URL:		https://fedoraproject.org/wiki/F11_Artwork
 # We are upstream for this package
-Source0:	%{name}-%{version}.tar.bz2
+URL:		https://fedorahosted.org/fedora-kde-artwork/
+Source0:	https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
@@ -34,48 +34,18 @@
 rm -rf %{buildroot}
 
 # wallpapers
+# no more wallpapers links in wallpapers directory which causes all wp in list,
+# not only theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers
-ln -sf ../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas.png
-ln -sf ../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_wide.png
-ln -sf ../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas_high.png
 
 # KDM
+# for KDM and splash we use PNG wallpaper from leonidas-kdm package
+# thus only one aspect ratio
+
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 cp -rp kdm/leonidas/ %{buildroot}/%{_kde4_appsdir}/kdm/themes/
 (cd %{buildroot}/%{_kde4_appsdir}/kdm/themes/leonidas/
-ln -s ../../../../../wallpapers/leonidas.png leonidas-640x480.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-800x480.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-800x600.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1024x600.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1024x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1152x720.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1152x864.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x800.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1280x960.png
-#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1280x1024.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1366x768.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1440x900.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1440x1080.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1600x1200.png
-#ln -s ../../../../../wallpapers/leonidas_high.png leonidas-1600x1280.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1600x1280.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1080.png
-ln -s ../../../../../wallpapers/leonidas_wide.png leonidas-1920x1200.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-1920x1440.png
-ln -s ../../../../../wallpapers/leonidas.png leonidas-2048x1536.png
-# KDM falls back to this one if there's no match
-ln -s ../../../../../wallpapers/leonidas.png leonidas.png
+ln -s ../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png leonidas.png
 )
 
 mkdir -p %{buildroot}/%{_kde4_appsdir}/kdm/pics/users
@@ -84,47 +54,42 @@
 # KSplash
 mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
 cp -rp ksplash/Leonidas/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
-ln -s ../../../../../../wallpapers/leonidas.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
-mkdir %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200
-ln -s ../../../../../../wallpapers/leonidas_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1920x1200/leonidas.png
-ln -s ../../../../../../wallpapers/leonidas_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/leonidas.png
-ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/1280x1024/logo.png
+ln -s ../../../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/leonidas.png
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
 cp -rp wallpapers/leonidas/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/leonidas
-#cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
+cp -rp wallpapers/leonidas/screenshot.png %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents
 (cd %{buildroot}%{_kde4_datadir}/wallpapers/leonidas/contents/images
-ln -s ../../../leonidas.png 640x480.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 640x480.png
 # That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 800x480.png
-ln -s ../../../leonidas.png 800x600.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 800x480.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 800x600.png
 # That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1024x600.png
-ln -s ../../../leonidas.png 1024x768.png
-ln -s ../../../leonidas_wide.png 1152x720.png
-ln -s ../../../leonidas.png 1152x864.png
-ln -s ../../../leonidas.png 1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1280x768.png
-ln -s ../../../leonidas_wide.png 1280x800.png
-ln -s ../../../leonidas.png 1280x960.png
-ln -s ../../../leonidas_high.png 1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1366x768.png
-ln -s ../../../leonidas_wide.png 1440x900.png
-ln -s ../../../leonidas.png 1440x1080.png
-ln -s ../../../leonidas.png 1600x1200.png
-ln -s ../../../leonidas_high.png 1600x1280.png
-ln -s ../../../leonidas_wide.png 1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../leonidas_wide.png 1920x1080.png
-ln -s ../../../leonidas_wide.png 1920x1200.png
-ln -s ../../../leonidas.png 1920x1440.png
-ln -s ../../../leonidas.png 2048x1536.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1024x600.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1024x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1152x720.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1152x864.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1200x900.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x720.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1280x800.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1280x960.png
+ln -s ../../../../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png 1280x1024.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1366x768.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1440x900.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1440x1080.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1600x1200.png
+ln -s ../../../../backgrounds/leonidas/lion/normalish/1280x1024/leonidas-1-noon.png 1600x1280.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1680x1050.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1920x1080.png
+ln -s ../../../../backgrounds/leonidas/lion/wide/1920x1200/leonidas-1-noon.png 1920x1200.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 1920x1440.png
+ln -s ../../../../backgrounds/leonidas/lion/normal/2048x1536/leonidas-1-noon.png 2048x1536.png
 )
 
 
@@ -137,15 +102,33 @@
 %doc README COPYING.CC-BY-SA COPYING.GPLv2
 %{_kde4_appsdir}/kdm/themes/leonidas/
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/
-%{_kde4_datadir}/wallpapers/leonidas.png
-%{_kde4_datadir}/wallpapers/leonidas_wide.png
-%{_kde4_datadir}/wallpapers/leonidas_high.png
 %{_kde4_datadir}/wallpapers/leonidas/
 #%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png
 
 
 %changelog
-* Tue Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
+* Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-4
+- our own logos for both fedora and generic version
+
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-3
+- fix dist tag
+
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-2
+- tarball respin
+
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-1
+- wallpaper screenshot
+- fixes
+
+* Fri Apr 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.1-1
+- use KDM PNG for KDM, KSplash, JPGs for wallpaper
+- does not link wallpapers to wallpapers directory
+
+* Wed Apr 15 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-2
+- fix license
+- upstream url + source url 
+ 
+* Tue Apr 7 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.0-1
 - updated to lion theme
 
 * Tue Mar 17 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2009 17:59:07 -0000	1.2
+++ sources	22 Apr 2009 15:53:02 -0000	1.3
@@ -1 +1 @@
-3fc4dbf343bb37d170bf852acb4dcec3  leonidas-kde-theme-0.2.0.tar.bz2
+2a3122105d76a66c1116bae5f84e662d  leonidas-kde-theme-0.2.2.tar.bz2



From rayvd at fedoraproject.org  Wed Apr 22 15:55:39 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 15:55:39 +0000 (UTC)
Subject: rpms/pyodbc/F-9 pyodbc.spec,1.3,1.4
Message-ID: <20090422155539.6AAE6700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20500

Modified Files:
	pyodbc.spec 
Log Message:
2.1.5


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-9/pyodbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyodbc.spec	9 Apr 2009 22:07:50 -0000	1.3
+++ pyodbc.spec	22 Apr 2009 15:55:04 -0000	1.4
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.4
-Release:        5%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
-Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       unixODBC, python >= 2.4
 BuildRequires:  unixODBC-devel
@@ -28,7 +27,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -39,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
+- Upstream released 2.1.5
+
 * Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Removing versioned BuildRequires
 



From rayvd at fedoraproject.org  Wed Apr 22 15:58:32 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 15:58:32 +0000 (UTC)
Subject: rpms/pyodbc/EL-5 pyodbc.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <20090422155832.AFF71700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597

Modified Files:
	pyodbc.spec sources 
Log Message:
2.1.5


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/EL-5/pyodbc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pyodbc.spec	9 Apr 2009 21:57:04 -0000	1.6
+++ pyodbc.spec	22 Apr 2009 15:58:26 -0000	1.7
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyodbc
-Version:        2.1.4
-Release:        5%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/pyodbc/
 Source0:        http://pyodbc.googlecode.com/files/%{name}-%{version}.zip
-Source1:        README.rst
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       unixODBC, python >= 2.4
 BuildRequires:  unixODBC-devel
@@ -28,7 +27,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -39,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
+- Upstream released 2.1.5
+
 * Sun Feb 23 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-5
 - Removing versioned BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2009 04:30:11 -0000	1.3
+++ sources	22 Apr 2009 15:58:26 -0000	1.4
@@ -1,2 +1 @@
-87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip
-d68ea88717a9efe5d2d76997a49721da  README.rst
+87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.5.zip



From rayvd at fedoraproject.org  Wed Apr 22 16:04:48 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 16:04:48 +0000 (UTC)
Subject: rpms/pyodbc/EL-5 sources,1.4,1.5
Message-ID: <20090422160448.99D0C700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23043

Modified Files:
	sources 
Log Message:
Correct sources file.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Apr 2009 15:58:26 -0000	1.4
+++ sources	22 Apr 2009 16:04:06 -0000	1.5
@@ -1 +1 @@
-87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.5.zip
+eccee612807e22a2aa3cc5033aee0fcc  pyodbc-2.1.5.zip



From sandeen at fedoraproject.org  Wed Apr 22 16:06:05 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Wed, 22 Apr 2009 16:06:05 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.4-ext4-resize-fixes.patch, NONE,
	1.1 e2fsprogs.spec, 1.132, 1.133
Message-ID: <20090422160605.8DBC6700FE@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23756

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.4-ext4-resize-fixes.patch 
Log Message:
* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-7
- Fix ext4 resize issues (#496982)


e2fsprogs-1.41.4-ext4-resize-fixes.patch:

--- NEW FILE e2fsprogs-1.41.4-ext4-resize-fixes.patch ---
3 patches from the list to address resize issues (18 Apr 2009):

When allocating a new set of block group metadata as part of growing
the filesystem, the resize2fs code assumes that the bitmap and inode
table blocks are in their own block group; an assumption which is
changed by the flex_bg feature.  This commit works around the problem
by temporarily turning off flex_bg while allocating the new block
group metadata, to avoid potentially overwriting previously allocated
data blocks.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

If we need to shrink the inode table, we need to make sure the inodes
contained in the part of the inode table we are vacating don't get
reused as part of the filesystem shrink operation.  This wasn't a
problem with ext3 filesystems, since the inode table was located in
the block group that was going away, so that location was not eligible
for reallocation.

However with ext4 filesystems with flex_bg enabled, it's possible for
a portion of the inode table in the last flex_bg group to be
deallocated, but in a part of the filesystem which could be used as
data blocks.  So we must mark those blocks as reserved to prevent
their reuse, and adjust the minimum filesystem size calculation to
assure that we don't shrink a filesystem too small for the resize
operation to succeed.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

Due to a fencepost bug, when skipping a block group whose block bitmap
was uninitialized (and hence could not contain any blocks eligible for
relaocation), the block immediately following the block group wasn't
checked as well.  If it was in use and required relocation, it
wouldn't get properly relocated, with the result that an inode using
such a block would end up, post resize, with a pointer to a block now
outside the bounds of the filesystem.

This commit fixes this fencepost error.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

Index: e2fsprogs-1.41.4/resize/resize2fs.c
===================================================================
--- e2fsprogs-1.41.4.orig/resize/resize2fs.c
+++ e2fsprogs-1.41.4/resize/resize2fs.c
@@ -233,20 +233,29 @@ static void fix_uninit_block_bitmaps(ext
 
 /*
  * If the group descriptor's bitmap and inode table blocks are valid,
- * release them in the specified filesystem data structure
+ * release them in the new filesystem data structure, and mark them as
+ * reserved so the old inode table blocks don't get overwritten.
  */
-static void free_gdp_blocks(ext2_filsys fs, struct ext2_group_desc *gdp)
+static void free_gdp_blocks(ext2_filsys fs,
+			    ext2fs_block_bitmap reserve_blocks,
+			    struct ext2_group_desc *gdp)
 {
 	blk_t	blk;
 	int	j;
 
 	if (gdp->bg_block_bitmap &&
-	    (gdp->bg_block_bitmap < fs->super->s_blocks_count))
+	    (gdp->bg_block_bitmap < fs->super->s_blocks_count)) {
 		ext2fs_block_alloc_stats(fs, gdp->bg_block_bitmap, -1);
+		ext2fs_mark_block_bitmap(reserve_blocks,
+					 gdp->bg_block_bitmap);
+	}
 
 	if (gdp->bg_inode_bitmap &&
-	    (gdp->bg_inode_bitmap < fs->super->s_blocks_count))
+	    (gdp->bg_inode_bitmap < fs->super->s_blocks_count)) {
 		ext2fs_block_alloc_stats(fs, gdp->bg_inode_bitmap, -1);
+		ext2fs_mark_block_bitmap(reserve_blocks,
+					 gdp->bg_inode_bitmap);
+	}
 
 	if (gdp->bg_inode_table == 0 ||
 	    (gdp->bg_inode_table >= fs->super->s_blocks_count))
@@ -257,14 +266,19 @@ static void free_gdp_blocks(ext2_filsys 
 		if (blk >= fs->super->s_blocks_count)
 			break;
 		ext2fs_block_alloc_stats(fs, blk, -1);
+		ext2fs_mark_block_bitmap(reserve_blocks, blk);
 	}
 }
 
 /*
  * This routine is shared by the online and offline resize routines.
  * All of the information which is adjusted in memory is done here.
+ *
+ * The reserve_blocks parameter is only needed when shrinking the
+ * filesystem.
  */
-errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs, blk_t new_size)
+errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
+			 ext2fs_block_bitmap reserve_blocks, blk_t new_size)
 {
 	errcode_t	retval;
 	int		overhead = 0;
@@ -399,8 +413,8 @@ retry:
 	}
 
 	/*
-	 * If we are shrinking the number block groups, we're done and
-	 * can exit now.
+	 * If we are shrinking the number of block groups, we're done
+	 * and can exit now.
 	 */
 	if (old_fs->group_desc_count > fs->group_desc_count) {
 		/*
@@ -409,7 +423,8 @@ retry:
 		 */
 		for (i = fs->group_desc_count;
 		     i < old_fs->group_desc_count; i++) {
-			free_gdp_blocks(fs, &old_fs->group_desc[i]);
+			free_gdp_blocks(fs, reserve_blocks,
+					&old_fs->group_desc[i]);
 		}
 		retval = 0;
 		goto errout;
@@ -550,7 +565,12 @@ static errcode_t adjust_superblock(ext2_
 	ext2fs_mark_bb_dirty(fs);
 	ext2fs_mark_ib_dirty(fs);
 
-	retval = adjust_fs_info(fs, rfs->old_fs, new_size);
+	retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
+					      &rfs->reserve_blocks);
+	if (retval)
+		return retval;
+
+	retval = adjust_fs_info(fs, rfs->old_fs, rfs->reserve_blocks, new_size);
 	if (retval)
 		goto errout;
 
@@ -746,17 +766,13 @@ static errcode_t blocks_to_move(ext2_res
 	errcode_t	retval;
 	ext2_filsys 	fs, old_fs;
 	ext2fs_block_bitmap	meta_bmap;
+	__u32		save_incompat_flag;
 
 	fs = rfs->new_fs;
 	old_fs = rfs->old_fs;
 	if (old_fs->super->s_blocks_count > fs->super->s_blocks_count)
 		fs = rfs->old_fs;
 
-	retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
-					      &rfs->reserve_blocks);
-	if (retval)
-		return retval;
-
 	retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
 					      &rfs->move_blocks);
 	if (retval)
@@ -788,7 +804,7 @@ static errcode_t blocks_to_move(ext2_res
 			 * to the next block group.
 			 */
 			blk = ((g+1) * fs->super->s_blocks_per_group) +
-				fs->super->s_first_data_block;
+				fs->super->s_first_data_block - 1;
 			continue;
 		}
 		if (ext2fs_test_block_bitmap(old_fs->block_map, blk) &&
@@ -890,9 +906,29 @@ static errcode_t blocks_to_move(ext2_res
 
 		/*
 		 * Allocate the missing data structures
+		 *
+		 * XXX We have a problem with FLEX_BG and off-line
+		 * resizing where we are growing the size of the
+		 * filesystem.  ext2fs_allocate_group_table() will try
+		 * to reserve the inode table in the desired flex_bg
+		 * location.  However, passing rfs->reserve_blocks
+		 * doesn't work since it only has reserved the blocks
+		 * that will be used in the new block group -- and
+		 * with flex_bg, we can and will allocate the tables
+		 * outside of the block group.  And we can't pass in
+		 * the fs->block_map because it doesn't handle
+		 * overlapping inode table movements right.  So for
+		 * now, we temporarily disable flex_bg to force
+		 * ext2fs_allocate_group_tables() to allocate the bg
+		 * metadata in side the block group, and the restore
+		 * it afterwards.  Ugly, until we can fix this up
+		 * right later.
 		 */
+		save_incompat_flag = fs->super->s_feature_incompat;
+		fs->super->s_feature_incompat &= ~EXT4_FEATURE_INCOMPAT_FLEX_BG;
 		retval = ext2fs_allocate_group_table(fs, i,
 						     rfs->reserve_blocks);
+		fs->super->s_feature_incompat = save_incompat_flag;
 		if (retval)
 			goto errout;
 
@@ -1857,6 +1893,19 @@ blk_t calculate_minimum_resize_size(ext2
 	data_needed -= SUPER_OVERHEAD(fs) * num_of_superblocks;
 	data_needed -= META_OVERHEAD(fs) * fs->group_desc_count;
 
+	if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) {
+		/*
+		 * For ext4 we need to allow for up to a flex_bg worth
+		 * of inode tables of slack space so the resize
+		 * operation can be guaranteed to finish.
+		 */
+		int flexbg_size = 1 << fs->super->s_log_groups_per_flex;
+		int extra_groups;
+
+		extra_groups = flexbg_size - (groups & (flexbg_size - 1));
+		data_needed += META_OVERHEAD(fs) * extra_groups;
+	}
+
 	/*
 	 * figure out how many data blocks we have given the number of groups
 	 * we need for our inodes
Index: e2fsprogs-1.41.4/resize/online.c
===================================================================
--- e2fsprogs-1.41.4.orig/resize/online.c
+++ e2fsprogs-1.41.4/resize/online.c
@@ -104,7 +104,7 @@ errcode_t online_resize_fs(ext2_filsys f
 	 * but at least it allows on-line resizing to function.
 	 */
 	new_fs->super->s_feature_incompat &= ~EXT4_FEATURE_INCOMPAT_FLEX_BG;
-	retval = adjust_fs_info(new_fs, fs, *new_size);
+	retval = adjust_fs_info(new_fs, fs, 0, *new_size);
 	if (retval)
 		return retval;
 
Index: e2fsprogs-1.41.4/resize/resize2fs.h
===================================================================
--- e2fsprogs-1.41.4.orig/resize/resize2fs.h
+++ e2fsprogs-1.41.4/resize/resize2fs.h
@@ -128,6 +128,7 @@ extern errcode_t resize_fs(ext2_filsys f
 					    unsigned long max));
 
 extern errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
+				ext2fs_block_bitmap reserve_blocks,
 				blk_t new_size);
 extern blk_t calculate_minimum_resize_size(ext2_filsys fs);
 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- e2fsprogs.spec	11 Apr 2009 13:29:14 -0000	1.132
+++ e2fsprogs.spec	22 Apr 2009 16:06:01 -0000	1.133
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -19,6 +19,7 @@
 Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
 Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
 Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
+Patch7: e2fsprogs-1.41.4-ext4-resize-fixes.patch 
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -104,6 +105,8 @@
 %patch5 -p1 -b .info
 # Ignore NEEDS_RECOVERY mismatch
 %patch6 -p1 -b .recovery
+# Fix ext4 resize issues
+%patch7 -p1 -b .resize
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -302,6 +305,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-7
+- Fix ext4 resize issues (#496982)
+
 * Sat Apr 11 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-6
 - ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)
 



From rayvd at fedoraproject.org  Wed Apr 22 16:12:20 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 16:12:20 +0000 (UTC)
Subject: rpms/pyodbc/F-9 sources,1.4,1.5
Message-ID: <20090422161220.C45E970103@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25942

Modified Files:
	sources 
Log Message:
Fixed sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2009 15:56:13 -0000	1.4
+++ sources	22 Apr 2009 16:11:45 -0000	1.5
@@ -1 +1 @@
-87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip
+eccee612807e22a2aa3cc5033aee0fcc  pyodbc-2.1.5.zip



From ensc at fedoraproject.org  Wed Apr 22 16:16:50 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Wed, 22 Apr 2009 16:16:50 +0000 (UTC)
Subject: rpms/clamav/F-9 clamav-0.93.3-nooutdate.patch, NONE, 1.1 clamav.spec,
	1.75, 1.76
Message-ID: <20090422161651.016FA70103@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27954

Modified Files:
	clamav.spec 
Added Files:
	clamav-0.93.3-nooutdate.patch 
Log Message:
updated

clamav-0.93.3-nooutdate.patch:

--- NEW FILE clamav-0.93.3-nooutdate.patch ---
diff -up clamav-0.93.3/freshclam/mirman.c.nooutdate clamav-0.93.3/freshclam/mirman.c
--- clamav-0.93.3/freshclam/mirman.c.nooutdate	2008-03-06 19:41:02.000000000 +0100
+++ clamav-0.93.3/freshclam/mirman.c	2009-04-21 20:46:47.000000000 +0200
@@ -105,7 +105,7 @@ int mirman_check(uint32_t ip, struct mir
     for(i = 0; i < mdat->num; i++) {
 	if(mdat->mirtab[i].atime && mdat->mirtab[i].ip == ip) {
 
-	    if(mdat->dbflevel && (mdat->dbflevel > flevel) && (mdat->dbflevel - flevel > 3))
+	    if(0 && mdat->dbflevel && (mdat->dbflevel > flevel) && (mdat->dbflevel - flevel > 3))
 		if(time(NULL) - mdat->mirtab[i].atime < 4 * 3600)
 		    return 2;
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-9/clamav.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- clamav.spec	13 Nov 2008 18:33:47 -0000	1.75
+++ clamav.spec	22 Apr 2009 16:16:47 -0000	1.76
@@ -13,13 +13,14 @@
 %global milterstatedir	%_var/run/clamav-milter
 %global pkgdatadir	%_datadir/%name
 
+%global _default_patch_fuzz	2
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.93.3
-Release:	%release_func 2%{?snapshot:.%snapshot}
+Release:	%release_func 3%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -46,6 +47,7 @@
 Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
 Patch26:	clamav-0.93.3-pid.patch
+Patch27:	clamav-0.93.3-nooutdate.patch
 # security patches
 # 0.94
 Patch30:	clamav-0.93.3-CVE-2008-1389.diff
@@ -266,6 +268,7 @@
 %patch24 -p1 -b .private
 %patch25 -p1 -b .open
 %patch26 -p1 -b .pid
+%patch27 -p1 -b .nooutdate
 
 # security patches
 %patch30 -p1 -b .CVE-2008-1389
@@ -563,6 +566,16 @@
 
 
 %changelog
+* Wed Apr 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.93.3-3
+- added -nooutdate patch to avoid the 'has connected too many times
+  with an outdated version' on freshclam invocation. Because clamav is
+  buggy like hell and full with security leaks, the database upgrade
+  must not be skipped as broken modules are disabled by it too.
+
+  The patch itself is probably required due to a bug in freshclam:
+  this message should never be triggered when 'freshclam' is invoked
+  in non-daemon mode (e.g. manually or as a cron-job).
+
 * Thu Nov 13 2008 Tomas Hoger <thoger at redhat.com> - 0.93.3-2
 - Security update - backport security fixes from 0.94:
   CVE-2008-1389 (#461461): Invalid memory access in the CHM unpacker



From spot at fedoraproject.org  Wed Apr 22 16:27:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 16:27:22 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.126, 1.127 sources,
	1.97, 1.98
Message-ID: <20090422162722.E771B700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31359/devel

Modified Files:
	fedora-logos.spec sources 
Log Message:
11.0.4, fix art


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fedora-logos.spec	22 Apr 2009 14:25:23 -0000	1.126
+++ fedora-logos.spec	22 Apr 2009 16:27:15 -0000	1.127
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.3
+Version: 11.0.4
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.4-1
+- update to 11.0.4, fix art to actually be in leonidas theme
+
 * Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.3-1
 - update to 11.0.3, adds KDE splash
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	22 Apr 2009 14:25:23 -0000	1.97
+++ sources	22 Apr 2009 16:27:15 -0000	1.98
@@ -1 +1 @@
-ea467761bba7e88b0760d8e47e2cb9b2  fedora-logos-11.0.3.tar.bz2
+aaca12c9d6b0e4f204ca6a0da55c1578  fedora-logos-11.0.4.tar.bz2



From s4504kr at fedoraproject.org  Wed Apr 22 16:27:32 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 22 Apr 2009 16:27:32 +0000 (UTC)
Subject: rpms/itext/F-11 itext-2.1.5-pdftk.patch, NONE, 1.1 itext.spec, 1.17,
	1.18
Message-ID: <20090422162732.1E286700FE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/itext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31679

Modified Files:
	itext.spec 
Added Files:
	itext-2.1.5-pdftk.patch 
Log Message:
Add patch to fix pdftk stdin issue

itext-2.1.5-pdftk.patch:

--- NEW FILE itext-2.1.5-pdftk.patch ---
diff -up itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java.pdftk itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
--- itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java.pdftk	2009-04-21 18:12:02.000000000 +0200
+++ itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java	2009-04-21 18:17:08.000000000 +0200
@@ -99,7 +99,11 @@ public class RandomAccessFileOrArray imp
                 }
             }
             else {
-                InputStream is = BaseFont.getResourceStream(filename);
+		InputStream is;
+		if( filename.equals("-"))
+		    is = System.in;
+		else
+		    is = BaseFont.getResourceStream(filename);
                 if (is == null)
                     throw new IOException(filename + " not found as file or resource.");
                 try {


Index: itext.spec
===================================================================
RCS file: /cvs/extras/rpms/itext/F-11/itext.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- itext.spec	10 Mar 2009 16:24:47 -0000	1.17
+++ itext.spec	22 Apr 2009 16:27:28 -0000	1.18
@@ -4,11 +4,12 @@
 Summary:        A Free Java-PDF library
 Name:           itext
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
 URL:            http://www.lowagie.com/iText/
 Group:          Development/Libraries
 Source0:        http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
+Patch1:		itext-2.1.5-pdftk.patch
 BuildRequires:  ant
 BuildRequires:  bouncycastle-mail
 BuildRequires:  dom4j
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q -c -T -a 0
+%patch1 -p1 -b .pdftk
 
 # Remove preshipped binaries
 find . -name "*.jar" -exec rm {} \;
@@ -141,6 +143,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.1.5-2
+- Patch to allow reading of pdf files from stdin for pdftk (BZ #495574)
+
 * Tue Mar 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.1.5-1
 - New upstream release
 



From spot at fedoraproject.org  Wed Apr 22 16:27:48 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 16:27:48 +0000 (UTC)
Subject: rpms/fedora-logos/F-11 .cvsignore, 1.83, 1.84 fedora-logos.spec,
	1.126, 1.127 sources, 1.97, 1.98
Message-ID: <20090422162748.5874F700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31359/F-11

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
11.0.4, fix art


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	22 Apr 2009 14:25:21 -0000	1.83
+++ .cvsignore	22 Apr 2009 16:27:12 -0000	1.84
@@ -1 +1 @@
-fedora-logos-11.0.3.tar.bz2
+fedora-logos-11.0.4.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/fedora-logos.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fedora-logos.spec	22 Apr 2009 14:25:21 -0000	1.126
+++ fedora-logos.spec	22 Apr 2009 16:27:12 -0000	1.127
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.3
+Version: 11.0.4
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -183,6 +183,9 @@
 # end i386 bits
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.4-1
+- update to 11.0.4, fix art to actually be in leonidas theme
+
 * Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 11.0.3-1
 - update to 11.0.3, adds KDE splash
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-11/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	22 Apr 2009 14:25:21 -0000	1.97
+++ sources	22 Apr 2009 16:27:12 -0000	1.98
@@ -1 +1 @@
-ea467761bba7e88b0760d8e47e2cb9b2  fedora-logos-11.0.3.tar.bz2
+aaca12c9d6b0e4f204ca6a0da55c1578  fedora-logos-11.0.4.tar.bz2



From ensc at fedoraproject.org  Wed Apr 22 16:33:57 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Wed, 22 Apr 2009 16:33:57 +0000 (UTC)
Subject: rpms/clamav/F-10 clamav-0.94.2-nooutdate.patch, NONE,
	1.1 clamav.spec, 1.78, 1.79 verinfo, 1.2, 1.3
Message-ID: <20090422163358.06AC2700FE@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv743

Modified Files:
	clamav.spec verinfo 
Added Files:
	clamav-0.94.2-nooutdate.patch 
Log Message:
updated

clamav-0.94.2-nooutdate.patch:

--- NEW FILE clamav-0.94.2-nooutdate.patch ---
diff -up clamav-0.94.2/freshclam/mirman.c.nooutdate clamav-0.94.2/freshclam/mirman.c
--- clamav-0.94.2/freshclam/mirman.c.nooutdate	2008-11-21 23:24:42.000000000 +0100
+++ clamav-0.94.2/freshclam/mirman.c	2009-04-22 18:20:58.000000000 +0200
@@ -131,7 +131,7 @@ int mirman_check(uint32_t *ip, int af, s
 		return 0;
 	    }
 
-	    if(mdat->dbflevel && (mdat->dbflevel > flevel) && (mdat->dbflevel - flevel > 3))
+	    if(0 && mdat->dbflevel && (mdat->dbflevel > flevel) && (mdat->dbflevel - flevel > 3))
 		if(time(NULL) - mdat->mirtab[i].atime < 4 * 3600)
 		    return 2;
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-10/clamav.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- clamav.spec	2 Dec 2008 22:35:58 -0000	1.78
+++ clamav.spec	22 Apr 2009 16:33:51 -0000	1.79
@@ -19,7 +19,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.94.2
-Release:	%release_func 1%{?snapshot:.%snapshot}
+Release:	%release_func 2%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -46,6 +46,7 @@
 Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
 Patch26:	clamav-0.93.3-pid.patch
+Patch27:	clamav-0.94.2-nooutdate.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -258,6 +259,7 @@
 %patch24 -p1 -b .private
 %patch25 -p1 -b .open
 %patch26 -p1 -b .pid
+%patch27 -p1 -b .nooutdate
 
 install -p -m0644 %SOURCE300 clamav-milter/
 
@@ -548,6 +550,16 @@
 
 
 %changelog
+* Wed Apr 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.94.2-2
+- added -nooutdate patch to avoid the 'has connected too many times
+  with an outdated version' on freshclam invocation. Because clamav is
+  buggy like hell and full with security leaks, the database upgrade
+  must not be skipped as broken modules are disabled by it too.
+
+  The patch itself is probably required due to a bug in freshclam:
+  this message should never be triggered when 'freshclam' is invoked
+  in non-daemon mode (e.g. manually or as a cron-job).
+
 * Tue Dec 02 2008 Robert Scheck <robert at fedoraproject.org> - 0.94.2-1
 - Upgrade to 0.94.2 (#474002)
 


Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-10/verinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- verinfo	1 Jan 2008 13:19:16 -0000	1.2
+++ verinfo	22 Apr 2009 16:33:51 -0000	1.3
@@ -1,2 +1,2 @@
-http://prdownloads.sourceforge.net/sourceforge/clamav/
+http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197
 clamav-([0-9.-]*?)\.tar\.



From rayvd at fedoraproject.org  Wed Apr 22 16:34:34 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 16:34:34 +0000 (UTC)
Subject: rpms/pyodbc/F-10 sources,1.4,1.5
Message-ID: <20090422163434.E19D9700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1084

Modified Files:
	sources 
Log Message:
Fixed sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Apr 2009 20:46:14 -0000	1.4
+++ sources	22 Apr 2009 16:34:29 -0000	1.5
@@ -1 +1 @@
-87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip
+eccee612807e22a2aa3cc5033aee0fcc  pyodbc-2.1.5.zip



From dledford at fedoraproject.org  Wed Apr 22 16:43:23 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 16:43:23 +0000 (UTC)
Subject: rpms/opensm/devel opensm-3.2.1-elif.patch,1.1,1.2
Message-ID: <20090422164323.E9C5E700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3786

Modified Files:
	opensm-3.2.1-elif.patch 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 3.3.1-1
- Update to latest upstream version


opensm-3.2.1-elif.patch:

Index: opensm-3.2.1-elif.patch
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm-3.2.1-elif.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensm-3.2.1-elif.patch	6 Mar 2009 10:44:02 -0000	1.1
+++ opensm-3.2.1-elif.patch	22 Apr 2009 16:43:13 -0000	1.2
@@ -1,12 +1,11 @@
-diff -ru opensm-3.2.1.orig/include/vendor/osm_vendor.h opensm-3.2.1/include/vendor/osm_vendor.h
---- opensm-3.2.1.orig/include/vendor/osm_vendor.h	2009-03-06 10:34:06.000000000 +0000
-+++ opensm-3.2.1/include/vendor/osm_vendor.h	2009-03-06 10:35:10.000000000 +0000
-@@ -70,7 +70,7 @@
+--- opensm-3.3.1/include/vendor/osm_vendor.h.elif	2008-10-14 05:04:45.000000000 -0400
++++ opensm-3.3.1/include/vendor/osm_vendor.h	2009-04-22 12:40:46.000000000 -0400
+@@ -65,7 +65,7 @@
  #include <vendor/osm_vendor_ibumad.h>
  #elif defined( OSM_VENDOR_INTF_AL )
  #include <vendor/osm_vendor_al.h>
 -#elif
 +#else
  #error No MAD Interface selected!
- #error Choose an interface in osm_vendor_select.h
+ #error Choose an interface in osm_config.h
  #endif



From sandeen at fedoraproject.org  Wed Apr 22 16:45:54 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Wed, 22 Apr 2009 16:45:54 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.4-fix-external-journals.patch, 
	NONE, 1.1 e2fsprogs.spec, 1.133, 1.134
Message-ID: <20090422164554.7BD9F700FE@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4485

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.4-fix-external-journals.patch 
Log Message:
* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-8
- Fix support for external journals


e2fsprogs-1.41.4-fix-external-journals.patch:

--- NEW FILE e2fsprogs-1.41.4-fix-external-journals.patch ---
From: Theodore Ts'o <tytso at mit.edu>
Date: Tue, 17 Mar 2009 02:16:44 +0000 (-0400)
Subject: libext2fs: external journal devices should not cause ext2fs_open2 to fail
X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=341b52dfa8c2afc11d8410de9bd381b03e75c6af

libext2fs: external journal devices should not cause ext2fs_open2 to fail

This fixes a regression introduced in commit 79a9ab14 which caused
attempts to open external journals to fail due to overly strict
filesystem consistency checks.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index cdfeaec..f6fe3f0 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -243,10 +243,6 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
 		goto cleanup;
 	}
 	fs->fragsize = EXT2_FRAG_SIZE(fs->super);
-       if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
-		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
-		goto cleanup;
-	}
 	fs->inode_blocks_per_group = ((EXT2_INODES_PER_GROUP(fs->super) *
 				       EXT2_INODE_SIZE(fs->super) +
 				       EXT2_BLOCK_SIZE(fs->super) - 1) /
@@ -273,6 +269,11 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
 		return 0;
 	}
 
+	if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
+		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
+		goto cleanup;
+	}
+
 	/*
 	 * Read group descriptors
 	 */



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- e2fsprogs.spec	22 Apr 2009 16:06:01 -0000	1.133
+++ e2fsprogs.spec	22 Apr 2009 16:45:47 -0000	1.134
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -20,6 +20,7 @@
 Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
 Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
 Patch7: e2fsprogs-1.41.4-ext4-resize-fixes.patch 
+Patch8: e2fsprogs-1.41.4-fix-external-journals.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,6 +108,8 @@
 %patch6 -p1 -b .recovery
 # Fix ext4 resize issues
 %patch7 -p1 -b .resize
+# Fix external journals
+%patch8 -p1 -b .ext-journal
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -305,6 +308,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-8
+- Fix support for external journals
+
 * Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-7
 - Fix ext4 resize issues (#496982)
 



From dledford at fedoraproject.org  Wed Apr 22 16:49:36 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 16:49:36 +0000 (UTC)
Subject: rpms/opensm/F-11 opensm-3.2.1-elif.patch,1.1,1.2
Message-ID: <20090422164936.4446A70103@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736

Modified Files:
	opensm-3.2.1-elif.patch 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 3.3.1-1
- Update to latest upstream version


opensm-3.2.1-elif.patch:

Index: opensm-3.2.1-elif.patch
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-11/opensm-3.2.1-elif.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensm-3.2.1-elif.patch	6 Mar 2009 10:44:02 -0000	1.1
+++ opensm-3.2.1-elif.patch	22 Apr 2009 16:49:30 -0000	1.2
@@ -1,12 +1,11 @@
-diff -ru opensm-3.2.1.orig/include/vendor/osm_vendor.h opensm-3.2.1/include/vendor/osm_vendor.h
---- opensm-3.2.1.orig/include/vendor/osm_vendor.h	2009-03-06 10:34:06.000000000 +0000
-+++ opensm-3.2.1/include/vendor/osm_vendor.h	2009-03-06 10:35:10.000000000 +0000
-@@ -70,7 +70,7 @@
+--- opensm-3.3.1/include/vendor/osm_vendor.h.elif	2008-10-14 05:04:45.000000000 -0400
++++ opensm-3.3.1/include/vendor/osm_vendor.h	2009-04-22 12:40:46.000000000 -0400
+@@ -65,7 +65,7 @@
  #include <vendor/osm_vendor_ibumad.h>
  #elif defined( OSM_VENDOR_INTF_AL )
  #include <vendor/osm_vendor_al.h>
 -#elif
 +#else
  #error No MAD Interface selected!
- #error Choose an interface in osm_vendor_select.h
+ #error Choose an interface in osm_config.h
  #endif



From tanguy at fedoraproject.org  Wed Apr 22 16:54:26 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed, 22 Apr 2009 16:54:26 +0000 (UTC)
Subject: rpms/scidavis/devel .cvsignore, 1.5, 1.6 scidavis.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <20090422165426.978E570104@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6629

Modified Files:
	.cvsignore scidavis.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2009 08:57:16 -0000	1.5
+++ .cvsignore	22 Apr 2009 16:54:16 -0000	1.6
@@ -1,2 +1,2 @@
-scidavis-0.2.1.tar.bz2
+scidavis-0.2.2.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scidavis.spec	11 Apr 2009 09:32:12 -0000	1.17
+++ scidavis.spec	22 Apr 2009 16:54:16 -0000	1.18
@@ -1,6 +1,6 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.2.1
+Version:	0.2.2
 Release: 	1%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
@@ -98,6 +98,8 @@
 %doc manual/*
 
 %changelog
+* Wed Apr 22 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.2-1
+- Update to 0.2.2
 
 * Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
 - Update to 0.2.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2009 08:57:17 -0000	1.5
+++ sources	22 Apr 2009 16:54:16 -0000	1.6
@@ -1,2 +1,2 @@
-5b4d766571163529fa15247b53a66889  scidavis-0.2.1.tar.bz2
+36eac982da85e8901ccacb76d77fda98  scidavis-0.2.2.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2



From spot at fedoraproject.org  Wed Apr 22 16:57:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 16:57:57 +0000 (UTC)
Subject: rpms/desktop-backgrounds/F-11 desktop-backgrounds.spec,1.64,1.65
Message-ID: <20090422165757.C641D70104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/desktop-backgrounds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6833/F-11

Modified Files:
	desktop-backgrounds.spec 
Log Message:
fix compat packages


Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/F-11/desktop-backgrounds.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- desktop-backgrounds.spec	24 Feb 2009 11:28:46 -0000	1.64
+++ desktop-backgrounds.spec	22 Apr 2009 16:57:18 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 9.0.0
-Release: 7
+Release: 8
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -35,7 +35,7 @@
 
 Summary: Desktop backgrounds from previous Fedora releases
 Group: Applications/Multimedia
-Requires: solar-backgrounds
+Requires: leonidas-backgrounds-common
 
 %description compat
 The desktop-backgrounds-compat package contains filenames used
@@ -108,11 +108,13 @@
 
 # Compatibility cruft
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
-ln -s ../solar/standard/1600x1200/solar-0-morn.png default.png
-ln -s ../solar/standard/1600x1200/solar-0-morn.png default.jpg
-ln -s ../solar/wide/1680x1050/solar-0-morn.png default-5_4.png
+ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png
+ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg
+ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.png
+ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.jpg
 cd ..
-ln -s solar/standard/1600x1200/solar-0-morn.png default.png
+ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png
+ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg
 )
 
 %clean
@@ -148,6 +150,9 @@
 %{_datadir}/backgrounds/default*
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.0-8
+- fix compat subpackage
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Wed Apr 22 16:58:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 16:58:13 +0000 (UTC)
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.64,1.65
Message-ID: <20090422165813.1E59F70104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6833/devel

Modified Files:
	desktop-backgrounds.spec 
Log Message:
fix compat packages


Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- desktop-backgrounds.spec	24 Feb 2009 11:28:46 -0000	1.64
+++ desktop-backgrounds.spec	22 Apr 2009 16:57:37 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 9.0.0
-Release: 7
+Release: 8
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -35,7 +35,7 @@
 
 Summary: Desktop backgrounds from previous Fedora releases
 Group: Applications/Multimedia
-Requires: solar-backgrounds
+Requires: leonidas-backgrounds-common
 
 %description compat
 The desktop-backgrounds-compat package contains filenames used
@@ -108,11 +108,13 @@
 
 # Compatibility cruft
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
-ln -s ../solar/standard/1600x1200/solar-0-morn.png default.png
-ln -s ../solar/standard/1600x1200/solar-0-morn.png default.jpg
-ln -s ../solar/wide/1680x1050/solar-0-morn.png default-5_4.png
+ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png
+ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg
+ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.png
+ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.jpg
 cd ..
-ln -s solar/standard/1600x1200/solar-0-morn.png default.png
+ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png
+ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg
 )
 
 %clean
@@ -148,6 +150,9 @@
 %{_datadir}/backgrounds/default*
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.0-8
+- fix compat subpackage
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From tanguy at fedoraproject.org  Wed Apr 22 17:03:36 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed, 22 Apr 2009 17:03:36 +0000 (UTC)
Subject: rpms/scidavis/F-11 .cvsignore, 1.5, 1.6 scidavis.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <20090422170336.CD7A470104@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9104

Modified Files:
	.cvsignore scidavis.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2009 08:57:16 -0000	1.5
+++ .cvsignore	22 Apr 2009 17:02:54 -0000	1.6
@@ -1,2 +1,2 @@
-scidavis-0.2.1.tar.bz2
+scidavis-0.2.2.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-11/scidavis.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scidavis.spec	11 Apr 2009 09:32:12 -0000	1.17
+++ scidavis.spec	22 Apr 2009 17:02:54 -0000	1.18
@@ -1,6 +1,6 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.2.1
+Version:	0.2.2
 Release: 	1%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
@@ -98,6 +98,8 @@
 %doc manual/*
 
 %changelog
+* Wed Apr 22 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.2-1
+- Update to 0.2.2
 
 * Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
 - Update to 0.2.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2009 08:57:17 -0000	1.5
+++ sources	22 Apr 2009 17:02:55 -0000	1.6
@@ -1,2 +1,2 @@
-5b4d766571163529fa15247b53a66889  scidavis-0.2.1.tar.bz2
+36eac982da85e8901ccacb76d77fda98  scidavis-0.2.2.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2



From cwickert at fedoraproject.org  Wed Apr 22 17:08:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 22 Apr 2009 17:08:32 +0000 (UTC)
Subject: rpms/sakura/F-9 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE sakura-2.3.3-cflags.patch, 1.1, NONE sakura.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <20090422170832.9FA63700FE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/sakura/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10628

Added Files:
	dead.package 
Removed Files:
	.cvsignore sakura-2.3.3-cflags.patch sakura.spec sources 
Log Message:
clean up F-9 branch


--- NEW FILE dead.package ---
F-9 does not meet build requirement vte-devel 0.16.15


--- .cvsignore DELETED ---


--- sakura-2.3.3-cflags.patch DELETED ---


--- sakura.spec DELETED ---


--- sources DELETED ---



From tanguy at fedoraproject.org  Wed Apr 22 17:10:48 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed, 22 Apr 2009 17:10:48 +0000 (UTC)
Subject: rpms/scidavis/F-10 .cvsignore, 1.5, 1.6 scidavis.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090422171048.F26F0700FE@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10741

Modified Files:
	.cvsignore scidavis.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2009 09:51:48 -0000	1.5
+++ .cvsignore	22 Apr 2009 17:10:41 -0000	1.6
@@ -1,2 +1,2 @@
-scidavis-0.2.1.tar.bz2
+scidavis-0.2.2.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/scidavis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scidavis.spec	11 Apr 2009 09:51:48 -0000	1.8
+++ scidavis.spec	22 Apr 2009 17:10:41 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.2.1
+Version:	0.2.2
 Release: 	1%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
@@ -98,6 +98,8 @@
 %doc manual/*
 
 %changelog
+* Wed Apr 22 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.2-1
+- Update to 0.2.2
 
 * Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
 - Update to 0.2.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2009 09:51:49 -0000	1.5
+++ sources	22 Apr 2009 17:10:41 -0000	1.6
@@ -1,2 +1,2 @@
-5b4d766571163529fa15247b53a66889  scidavis-0.2.1.tar.bz2
+36eac982da85e8901ccacb76d77fda98  scidavis-0.2.2.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2



From mtasaka at fedoraproject.org  Wed Apr 22 17:28:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 17:28:44 +0000 (UTC)
Subject: rpms/xplanet/devel xplanet-1.2.1-g++44.patch, NONE, 1.1 .cvsignore, 
	1.3, 1.4 sources, 1.3, 1.4 xplanet.spec, 1.20,
	1.21 xplanet-1.2.0-g++43-missing-header.patch, 1.1,
	NONE xplanet-1.2.0-g++44-compile.patch, 1.1, NONE
Message-ID: <20090422172844.564BD700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/xplanet/devel

Modified Files:
	.cvsignore sources xplanet.spec 
Added Files:
	xplanet-1.2.1-g++44.patch 
Removed Files:
	xplanet-1.2.0-g++43-missing-header.patch 
	xplanet-1.2.0-g++44-compile.patch 
Log Message:
update

xplanet-1.2.1-g++44.patch:

--- NEW FILE xplanet-1.2.1-g++44.patch ---
--- xplanet-1.2.1/src/Satellite.cpp.g++44	2006-03-26 09:34:21.000000000 +0900
+++ xplanet-1.2.1/src/Satellite.cpp	2009-04-23 01:45:03.000000000 +0900
@@ -1,4 +1,5 @@
 #include <clocale>
+#include <cstdio>
 #include <cstring>
 #include <iostream>
 using namespace std;
--- xplanet-1.2.1/src/Separation.cpp.g++44	2008-11-14 09:19:05.000000000 +0900
+++ xplanet-1.2.1/src/Separation.cpp	2009-04-23 01:46:37.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <iostream>
+#include <cstdio>
 
 #include "Separation.h"
 #include "View.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2006 15:41:40 -0000	1.3
+++ .cvsignore	22 Apr 2009 17:28:36 -0000	1.4
@@ -1 +1 @@
-xplanet-1.2.0.tar.gz
+xplanet-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:41:40 -0000	1.3
+++ sources	22 Apr 2009 17:28:36 -0000	1.4
@@ -1 +1 @@
-87d62fcdf43ad1beec677bfb6e299ac1  xplanet-1.2.0.tar.gz
+5dca0369ca64fa3c006b616b72b5e1cf  xplanet-1.2.1.tar.gz


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xplanet.spec	25 Mar 2009 09:40:39 -0000	1.20
+++ xplanet.spec	22 Apr 2009 17:28:36 -0000	1.21
@@ -1,13 +1,12 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
-Version:	1.2.0
-Release:	7%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 
 License:	GPLv2
 Group:		Amusements/Graphics
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		xplanet-1.2.0-g++43-missing-header.patch
-Patch1:		xplanet-1.2.0-g++44-compile.patch
+Patch0:		xplanet-1.2.1-g++44.patch
 URL:		http://%{name}.sourceforge.net
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,8 +34,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .gcc44
+%patch0 -p1 -b .g++
 
 %build
 %configure
@@ -62,6 +60,9 @@
 %{_datadir}/xplanet
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
+- 1.2.1
+
 * Wed Mar 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-7
 - GNU FreeFont naming change
 


--- xplanet-1.2.0-g++43-missing-header.patch DELETED ---


--- xplanet-1.2.0-g++44-compile.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Apr 22 17:28:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 17:28:57 +0000 (UTC)
Subject: rpms/mecab/F-11 .cvsignore, 1.7, 1.8 mecab.spec, 1.20, 1.21 sources,
	1.7, 1.8
Message-ID: <20090422172857.AFF37700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/mecab/F-11

Modified Files:
	.cvsignore mecab.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2009 19:00:32 -0000	1.7
+++ .cvsignore	22 Apr 2009 17:28:21 -0000	1.8
@@ -1 +1 @@
-mecab-0.98pre1.tar.gz
+mecab-0.98pre2.tar.gz


Index: mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-11/mecab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mecab.spec	8 Mar 2009 19:00:32 -0000	1.20
+++ mecab.spec	22 Apr 2009 17:28:23 -0000	1.21
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre1
-%define		fedorarel	1
+%define		betaver		pre2
+%define		fedorarel	2
 
 # Note:
 # mecab dictionary requires mecab-devel to rebuild it,
@@ -115,6 +115,9 @@
 %{_includedir}/%{name}.h
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98.0.2.pre2
+- 0.98 pre2
+
 * Mon Mar  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.1.pre1
 - Update to 0.98pre1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2009 19:00:33 -0000	1.7
+++ sources	22 Apr 2009 17:28:23 -0000	1.8
@@ -1 +1 @@
-f5ac5efadaec532216b0a2dcb2740e06  mecab-0.98pre1.tar.gz
+f1a910ca44037ed5d3d5ec12ce44aefb  mecab-0.98pre2.tar.gz



From mtasaka at fedoraproject.org  Wed Apr 22 17:29:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 17:29:00 +0000 (UTC)
Subject: rpms/mecab/devel .cvsignore, 1.7, 1.8 mecab.spec, 1.20, 1.21 sources,
	1.7, 1.8
Message-ID: <20090422172900.7FFB0700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mecab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/mecab/devel

Modified Files:
	.cvsignore mecab.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mecab/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2009 19:00:32 -0000	1.7
+++ .cvsignore	22 Apr 2009 17:28:26 -0000	1.8
@@ -1 +1 @@
-mecab-0.98pre1.tar.gz
+mecab-0.98pre2.tar.gz


Index: mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/mecab/devel/mecab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mecab.spec	8 Mar 2009 19:00:32 -0000	1.20
+++ mecab.spec	22 Apr 2009 17:28:26 -0000	1.21
@@ -1,6 +1,6 @@
 %define		mainver		0.98
-%define		betaver		pre1
-%define		fedorarel	1
+%define		betaver		pre2
+%define		fedorarel	2
 
 # Note:
 # mecab dictionary requires mecab-devel to rebuild it,
@@ -115,6 +115,9 @@
 %{_includedir}/%{name}.h
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98.0.2.pre2
+- 0.98 pre2
+
 * Mon Mar  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-0.1.pre1
 - Update to 0.98pre1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mecab/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2009 19:00:33 -0000	1.7
+++ sources	22 Apr 2009 17:28:26 -0000	1.8
@@ -1 +1 @@
-f5ac5efadaec532216b0a2dcb2740e06  mecab-0.98pre1.tar.gz
+f1a910ca44037ed5d3d5ec12ce44aefb  mecab-0.98pre2.tar.gz



From mtasaka at fedoraproject.org  Wed Apr 22 17:29:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 17:29:03 +0000 (UTC)
Subject: rpms/xplanet/F-10 xplanet-1.2.1-g++44.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 xplanet.spec, 1.16,
	1.17 xplanet-1.2.0-g++43-missing-header.patch, 1.1, NONE
Message-ID: <20090422172903.11D79700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/xplanet/F-10

Modified Files:
	.cvsignore sources xplanet.spec 
Added Files:
	xplanet-1.2.1-g++44.patch 
Removed Files:
	xplanet-1.2.0-g++43-missing-header.patch 
Log Message:
update

xplanet-1.2.1-g++44.patch:

--- NEW FILE xplanet-1.2.1-g++44.patch ---
--- xplanet-1.2.1/src/Satellite.cpp.g++44	2006-03-26 09:34:21.000000000 +0900
+++ xplanet-1.2.1/src/Satellite.cpp	2009-04-23 01:45:03.000000000 +0900
@@ -1,4 +1,5 @@
 #include <clocale>
+#include <cstdio>
 #include <cstring>
 #include <iostream>
 using namespace std;
--- xplanet-1.2.1/src/Separation.cpp.g++44	2008-11-14 09:19:05.000000000 +0900
+++ xplanet-1.2.1/src/Separation.cpp	2009-04-23 01:46:37.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <iostream>
+#include <cstdio>
 
 #include "Separation.h"
 #include "View.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2006 15:41:40 -0000	1.3
+++ .cvsignore	22 Apr 2009 17:28:28 -0000	1.4
@@ -1 +1 @@
-xplanet-1.2.0.tar.gz
+xplanet-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:41:40 -0000	1.3
+++ sources	22 Apr 2009 17:28:28 -0000	1.4
@@ -1 +1 @@
-87d62fcdf43ad1beec677bfb6e299ac1  xplanet-1.2.0.tar.gz
+5dca0369ca64fa3c006b616b72b5e1cf  xplanet-1.2.1.tar.gz


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-10/xplanet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xplanet.spec	9 Feb 2008 04:22:47 -0000	1.16
+++ xplanet.spec	22 Apr 2009 17:28:29 -0000	1.17
@@ -1,12 +1,12 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
-Version:	1.2.0
-Release:	3%{?dist}.2
+Version:	1.2.1
+Release:	1%{?dist}
 
 License:	GPLv2
 Group:		Amusements/Graphics
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		xplanet-1.2.0-g++43-missing-header.patch
+Patch0:		xplanet-1.2.1-g++44.patch
 URL:		http://%{name}.sourceforge.net
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,9 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	netpbm-devel
 BuildRequires:	pango-devel
+%if 0%{?fedora} >= 11
+Requires:	gnu-free-mono-fonts
+%endif
 
 %description
 Xplanet is similar to Xearth, where an image of the earth is rendered
@@ -31,16 +34,21 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+%patch0 -p1 -b .g++
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} -k
 
 %install
 rm -rf %{buildroot}
 CPPROG="cp -p" make DESTDIR=%{buildroot} install
 
+%if 0%{?fedora} >=11
+ln -sf ../fonts/gnu-free/FreeMonoBold.ttf \
+	%{buildroot}%{_datadir}/%{name}/FreeMonoBold.ttf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -52,6 +60,21 @@
 %{_datadir}/xplanet
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
+- 1.2.1
+
+* Wed Mar 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-7
+- GNU FreeFont naming change
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-6
+- F-11: Mass rebuild
+
+* Thu Feb  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-5
+- Patch to compile with g++44
+
+* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
+- Remove xplanet private ttf file, use system one
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 


--- xplanet-1.2.0-g++43-missing-header.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Apr 22 17:29:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 17:29:09 +0000 (UTC)
Subject: rpms/xplanet/F-11 xplanet-1.2.1-g++44.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 xplanet.spec, 1.20,
	1.21 xplanet-1.2.0-g++43-missing-header.patch, 1.1,
	NONE xplanet-1.2.0-g++44-compile.patch, 1.1, NONE
Message-ID: <20090422172909.41CFA700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/xplanet/F-11

Modified Files:
	.cvsignore sources xplanet.spec 
Added Files:
	xplanet-1.2.1-g++44.patch 
Removed Files:
	xplanet-1.2.0-g++43-missing-header.patch 
	xplanet-1.2.0-g++44-compile.patch 
Log Message:
update

xplanet-1.2.1-g++44.patch:

--- NEW FILE xplanet-1.2.1-g++44.patch ---
--- xplanet-1.2.1/src/Satellite.cpp.g++44	2006-03-26 09:34:21.000000000 +0900
+++ xplanet-1.2.1/src/Satellite.cpp	2009-04-23 01:45:03.000000000 +0900
@@ -1,4 +1,5 @@
 #include <clocale>
+#include <cstdio>
 #include <cstring>
 #include <iostream>
 using namespace std;
--- xplanet-1.2.1/src/Separation.cpp.g++44	2008-11-14 09:19:05.000000000 +0900
+++ xplanet-1.2.1/src/Separation.cpp	2009-04-23 01:46:37.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <iostream>
+#include <cstdio>
 
 #include "Separation.h"
 #include "View.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2006 15:41:40 -0000	1.3
+++ .cvsignore	22 Apr 2009 17:28:31 -0000	1.4
@@ -1 +1 @@
-xplanet-1.2.0.tar.gz
+xplanet-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:41:40 -0000	1.3
+++ sources	22 Apr 2009 17:28:31 -0000	1.4
@@ -1 +1 @@
-87d62fcdf43ad1beec677bfb6e299ac1  xplanet-1.2.0.tar.gz
+5dca0369ca64fa3c006b616b72b5e1cf  xplanet-1.2.1.tar.gz


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-11/xplanet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xplanet.spec	25 Mar 2009 09:40:39 -0000	1.20
+++ xplanet.spec	22 Apr 2009 17:28:32 -0000	1.21
@@ -1,13 +1,12 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
-Version:	1.2.0
-Release:	7%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 
 License:	GPLv2
 Group:		Amusements/Graphics
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		xplanet-1.2.0-g++43-missing-header.patch
-Patch1:		xplanet-1.2.0-g++44-compile.patch
+Patch0:		xplanet-1.2.1-g++44.patch
 URL:		http://%{name}.sourceforge.net
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,8 +34,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .gcc44
+%patch0 -p1 -b .g++
 
 %build
 %configure
@@ -62,6 +60,9 @@
 %{_datadir}/xplanet
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
+- 1.2.1
+
 * Wed Mar 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-7
 - GNU FreeFont naming change
 


--- xplanet-1.2.0-g++43-missing-header.patch DELETED ---


--- xplanet-1.2.0-g++44-compile.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Apr 22 17:29:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 22 Apr 2009 17:29:08 +0000 (UTC)
Subject: rpms/xplanet/F-9 xplanet-1.2.1-g++44.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 xplanet.spec, 1.16,
	1.17 xplanet-1.2.0-g++43-missing-header.patch, 1.1, NONE
Message-ID: <20090422172908.5CD38700FE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/xplanet/F-9

Modified Files:
	.cvsignore sources xplanet.spec 
Added Files:
	xplanet-1.2.1-g++44.patch 
Removed Files:
	xplanet-1.2.0-g++43-missing-header.patch 
Log Message:
update

xplanet-1.2.1-g++44.patch:

--- NEW FILE xplanet-1.2.1-g++44.patch ---
--- xplanet-1.2.1/src/Satellite.cpp.g++44	2006-03-26 09:34:21.000000000 +0900
+++ xplanet-1.2.1/src/Satellite.cpp	2009-04-23 01:45:03.000000000 +0900
@@ -1,4 +1,5 @@
 #include <clocale>
+#include <cstdio>
 #include <cstring>
 #include <iostream>
 using namespace std;
--- xplanet-1.2.1/src/Separation.cpp.g++44	2008-11-14 09:19:05.000000000 +0900
+++ xplanet-1.2.1/src/Separation.cpp	2009-04-23 01:46:37.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <iostream>
+#include <cstdio>
 
 #include "Separation.h"
 #include "View.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2006 15:41:40 -0000	1.3
+++ .cvsignore	22 Apr 2009 17:28:32 -0000	1.4
@@ -1 +1 @@
-xplanet-1.2.0.tar.gz
+xplanet-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:41:40 -0000	1.3
+++ sources	22 Apr 2009 17:28:33 -0000	1.4
@@ -1 +1 @@
-87d62fcdf43ad1beec677bfb6e299ac1  xplanet-1.2.0.tar.gz
+5dca0369ca64fa3c006b616b72b5e1cf  xplanet-1.2.1.tar.gz


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-9/xplanet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xplanet.spec	9 Feb 2008 04:22:47 -0000	1.16
+++ xplanet.spec	22 Apr 2009 17:28:33 -0000	1.17
@@ -1,12 +1,12 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
-Version:	1.2.0
-Release:	3%{?dist}.2
+Version:	1.2.1
+Release:	1%{?dist}
 
 License:	GPLv2
 Group:		Amusements/Graphics
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		xplanet-1.2.0-g++43-missing-header.patch
+Patch0:		xplanet-1.2.1-g++44.patch
 URL:		http://%{name}.sourceforge.net
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,9 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	netpbm-devel
 BuildRequires:	pango-devel
+%if 0%{?fedora} >= 11
+Requires:	gnu-free-mono-fonts
+%endif
 
 %description
 Xplanet is similar to Xearth, where an image of the earth is rendered
@@ -31,16 +34,21 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+%patch0 -p1 -b .g++
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} -k
 
 %install
 rm -rf %{buildroot}
 CPPROG="cp -p" make DESTDIR=%{buildroot} install
 
+%if 0%{?fedora} >=11
+ln -sf ../fonts/gnu-free/FreeMonoBold.ttf \
+	%{buildroot}%{_datadir}/%{name}/FreeMonoBold.ttf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -52,6 +60,21 @@
 %{_datadir}/xplanet
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
+- 1.2.1
+
+* Wed Mar 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-7
+- GNU FreeFont naming change
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-6
+- F-11: Mass rebuild
+
+* Thu Feb  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-5
+- Patch to compile with g++44
+
+* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
+- Remove xplanet private ttf file, use system one
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 


--- xplanet-1.2.0-g++43-missing-header.patch DELETED ---



From vpv at fedoraproject.org  Wed Apr 22 17:50:21 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Wed, 22 Apr 2009 17:50:21 +0000 (UTC)
Subject: rpms/moin/devel 001_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 002_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 moin.spec,
	1.25, 1.26
Message-ID: <20090422175022.9ED31700FE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23185

Modified Files:
	moin.spec 
Added Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
Log Message:
* Wed Apr 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-2
- Fix CVE-2008-0781 with two patches from upstream


001_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 001_CVE-2008-0781_attach_file_XSS.patch ---

# HG changeset patch
# User Thomas Waldmann <tw AT waldmann-edv DOT de>
# Date 1240073905 -7200
# Node ID 5f51246a4df1ff3a9d2b821cc95cd9e01b6adcc5
# Parent  903831e9eb77383ccc8e388f9f7fd2dc0fca5842
AttachFile XSS fixes: move escaping to error_msg / upload_form

--- a/MoinMoin/action/AttachFile.py	Mon Apr 13 14:09:57 2009 +0200
+++ b/MoinMoin/action/AttachFile.py	Sat Apr 18 18:58:25 2009 +0200
@@ -387,6 +387,7 @@
 
 
 def error_msg(pagename, request, msg):
+    msg = wikiutil.escape(msg)
     request.theme.add_msg(msg, "error")
     Page(request, pagename).send_page()
 
@@ -512,7 +513,7 @@
     if handler:
         msg = handler(pagename, request)
     else:
-        msg = _('Unsupported AttachFile sub-action: %s') % (wikiutil.escape(do[0]), )
+        msg = _('Unsupported AttachFile sub-action: %s') % do[0]
     if msg:
         error_msg(pagename, request, msg)
 
@@ -522,6 +523,8 @@
 
 
 def upload_form(pagename, request, msg=''):
+    if msg:
+        msg = wikiutil.escape(msg)
     _ = request.getText
 
     request.emit_http_headers()
@@ -838,13 +841,13 @@
 
     if package.isPackage():
         if package.installPackage():
-            msg = _("Attachment '%(filename)s' installed.") % {'filename': wikiutil.escape(target)}
+            msg = _("Attachment '%(filename)s' installed.") % {'filename': target}
         else:
-            msg = _("Installation of '%(filename)s' failed.") % {'filename': wikiutil.escape(target)}
+            msg = _("Installation of '%(filename)s' failed.") % {'filename': target}
         if package.msg:
-            msg += "<br><pre>%s</pre>" % wikiutil.escape(package.msg)
+            msg += " " + package.msg
     else:
-        msg = _('The file %s is not a MoinMoin package file.') % wikiutil.escape(target)
+        msg = _('The file %s is not a MoinMoin package file.') % target
 
     upload_form(pagename, request, msg=msg)
 
@@ -948,7 +951,7 @@
         logging.exception("An exception within zip file attachment handling occurred:")
         msg = _("A severe error occurred:") + ' ' + str(err)
 
-    upload_form(pagename, request, msg=wikiutil.escape(msg))
+    upload_form(pagename, request, msg=msg)
 
 
 def send_viewfile(pagename, request):


002_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 002_CVE-2008-0781_attach_file_XSS.patch ---

# HG changeset patch
# User Thomas Waldmann <tw AT waldmann-edv DOT de>
# Date 1240074556 -7200
# Node ID 269a1fbc3ed797b5563a3dd6f204660cd3d12f08
# Parent  5f51246a4df1ff3a9d2b821cc95cd9e01b6adcc5
AttachFile move: add more escaping (maybe not XSS exploitable though)

--- a/MoinMoin/action/AttachFile.py	Sat Apr 18 18:58:25 2009 +0200
+++ b/MoinMoin/action/AttachFile.py	Sat Apr 18 19:09:16 2009 +0200
@@ -749,9 +749,9 @@
          'baseurl': request.getScriptname(),
          'do': 'attachment_move',
          'ticket': wikiutil.createTicket(request),
-         'pagename': pagename,
+         'pagename': wikiutil.escape(pagename, 1),
          'pagename_quoted': wikiutil.quoteWikinameURL(pagename),
-         'attachment_name': filename,
+         'attachment_name': wikiutil.escape(filename, 1),
          'move': _('Move'),
          'cancel': _('Cancel'),
          'newname_label': _("New page name"),



Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- moin.spec	14 Apr 2009 20:37:45 -0000	1.25
+++ moin.spec	22 Apr 2009 17:50:13 -0000	1.26
@@ -3,12 +3,14 @@
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
 Version: 1.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
 Source0: http://static.moinmo.in/files/moin-%{version}.tar.gz
 Source1: README-rpm
+Patch0: 001_CVE-2008-0781_attach_file_XSS.patch
+Patch1: 002_CVE-2008-0781_attach_file_XSS.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel
 BuildArch: noarch
@@ -21,6 +23,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -51,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-2
+- Fix CVE-2008-0781 with two patches from upstream
+
 * Tue Apr 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-1
 - Update to 1.8.2
 - Update README-rpm to include mod_wsgi instructions



From vpv at fedoraproject.org  Wed Apr 22 17:53:52 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Wed, 22 Apr 2009 17:53:52 +0000 (UTC)
Subject: rpms/moin/F-11 001_CVE-2008-0781_attach_file_XSS.patch, NONE,
	1.1 002_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 moin.spec,
	1.25, 1.26
Message-ID: <20090422175352.A555F700FE@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24712

Modified Files:
	moin.spec 
Added Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
Log Message:
* Wed Apr 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-2
- Fix CVE-2008-0781 with two patches from upstream


001_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 001_CVE-2008-0781_attach_file_XSS.patch ---

# HG changeset patch
# User Thomas Waldmann <tw AT waldmann-edv DOT de>
# Date 1240073905 -7200
# Node ID 5f51246a4df1ff3a9d2b821cc95cd9e01b6adcc5
# Parent  903831e9eb77383ccc8e388f9f7fd2dc0fca5842
AttachFile XSS fixes: move escaping to error_msg / upload_form

--- a/MoinMoin/action/AttachFile.py	Mon Apr 13 14:09:57 2009 +0200
+++ b/MoinMoin/action/AttachFile.py	Sat Apr 18 18:58:25 2009 +0200
@@ -387,6 +387,7 @@
 
 
 def error_msg(pagename, request, msg):
+    msg = wikiutil.escape(msg)
     request.theme.add_msg(msg, "error")
     Page(request, pagename).send_page()
 
@@ -512,7 +513,7 @@
     if handler:
         msg = handler(pagename, request)
     else:
-        msg = _('Unsupported AttachFile sub-action: %s') % (wikiutil.escape(do[0]), )
+        msg = _('Unsupported AttachFile sub-action: %s') % do[0]
     if msg:
         error_msg(pagename, request, msg)
 
@@ -522,6 +523,8 @@
 
 
 def upload_form(pagename, request, msg=''):
+    if msg:
+        msg = wikiutil.escape(msg)
     _ = request.getText
 
     request.emit_http_headers()
@@ -838,13 +841,13 @@
 
     if package.isPackage():
         if package.installPackage():
-            msg = _("Attachment '%(filename)s' installed.") % {'filename': wikiutil.escape(target)}
+            msg = _("Attachment '%(filename)s' installed.") % {'filename': target}
         else:
-            msg = _("Installation of '%(filename)s' failed.") % {'filename': wikiutil.escape(target)}
+            msg = _("Installation of '%(filename)s' failed.") % {'filename': target}
         if package.msg:
-            msg += "<br><pre>%s</pre>" % wikiutil.escape(package.msg)
+            msg += " " + package.msg
     else:
-        msg = _('The file %s is not a MoinMoin package file.') % wikiutil.escape(target)
+        msg = _('The file %s is not a MoinMoin package file.') % target
 
     upload_form(pagename, request, msg=msg)
 
@@ -948,7 +951,7 @@
         logging.exception("An exception within zip file attachment handling occurred:")
         msg = _("A severe error occurred:") + ' ' + str(err)
 
-    upload_form(pagename, request, msg=wikiutil.escape(msg))
+    upload_form(pagename, request, msg=msg)
 
 
 def send_viewfile(pagename, request):


002_CVE-2008-0781_attach_file_XSS.patch:

--- NEW FILE 002_CVE-2008-0781_attach_file_XSS.patch ---

# HG changeset patch
# User Thomas Waldmann <tw AT waldmann-edv DOT de>
# Date 1240074556 -7200
# Node ID 269a1fbc3ed797b5563a3dd6f204660cd3d12f08
# Parent  5f51246a4df1ff3a9d2b821cc95cd9e01b6adcc5
AttachFile move: add more escaping (maybe not XSS exploitable though)

--- a/MoinMoin/action/AttachFile.py	Sat Apr 18 18:58:25 2009 +0200
+++ b/MoinMoin/action/AttachFile.py	Sat Apr 18 19:09:16 2009 +0200
@@ -749,9 +749,9 @@
          'baseurl': request.getScriptname(),
          'do': 'attachment_move',
          'ticket': wikiutil.createTicket(request),
-         'pagename': pagename,
+         'pagename': wikiutil.escape(pagename, 1),
          'pagename_quoted': wikiutil.quoteWikinameURL(pagename),
-         'attachment_name': filename,
+         'attachment_name': wikiutil.escape(filename, 1),
          'move': _('Move'),
          'cancel': _('Cancel'),
          'newname_label': _("New page name"),



Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/moin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- moin.spec	14 Apr 2009 20:37:45 -0000	1.25
+++ moin.spec	22 Apr 2009 17:53:50 -0000	1.26
@@ -3,12 +3,14 @@
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
 Version: 1.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://moinmo.in/
 Source0: http://static.moinmo.in/files/moin-%{version}.tar.gz
 Source1: README-rpm
+Patch0: 001_CVE-2008-0781_attach_file_XSS.patch
+Patch1: 002_CVE-2008-0781_attach_file_XSS.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel
 BuildArch: noarch
@@ -21,6 +23,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -51,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-2
+- Fix CVE-2008-0781 with two patches from upstream
+
 * Tue Apr 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.2-1
 - Update to 1.8.2
 - Update README-rpm to include mod_wsgi instructions



From pingou at fedoraproject.org  Wed Apr 22 18:08:17 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 22 Apr 2009 18:08:17 +0000 (UTC)
Subject: rpms/rkward/devel rkward.spec,1.32,1.33
Message-ID: <20090422180817.482FA700FE@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29288

Modified Files:
	rkward.spec 
Log Message:
Rebuild for new R


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/rkward.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rkward.spec	15 Apr 2009 17:43:03 -0000	1.32
+++ rkward.spec	22 Apr 2009 18:08:12 -0000	1.33
@@ -1,8 +1,8 @@
-%define  Rversion 2.8.0
+%global  Rversion 2.9.0
 
 Name:           rkward
 Version:        0.5.0c
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -117,6 +117,10 @@
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+* Wed Apr 22 2009 pingou <pingou at pingoured.fr> - 0.5.0c-2
+- Rebuild for R-2.9.0
+- Uses %%global instead of %%define
+
 * Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 0.5.0c-1
 - Update to version 0.5.0c
 - Remove the BuildRequires on PyQt-devel



From pingou at fedoraproject.org  Wed Apr 22 18:18:36 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 22 Apr 2009 18:18:36 +0000 (UTC)
Subject: rpms/rkward/F-10 rkward.spec,1.28,1.29
Message-ID: <20090422181836.4E1D570104@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32016/F-10

Modified Files:
	rkward.spec 
Log Message:
Rebuild for R-2.9.0


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-10/rkward.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rkward.spec	15 Apr 2009 17:43:02 -0000	1.28
+++ rkward.spec	22 Apr 2009 18:18:00 -0000	1.29
@@ -1,8 +1,8 @@
-%define  Rversion 2.8.0
+%global  Rversion 2.9.0
 
 Name:           rkward
 Version:        0.5.0c
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -117,6 +117,10 @@
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+* Wed Apr 22 2009 pingou <pingou at pingoured.fr> - 0.5.0c-2
+- Rebuild for R-2.9.0
+- Uses %%global instead of %%define
+
 * Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 0.5.0c-1
 - Update to version 0.5.0c
 - Remove the BuildRequires on PyQt-devel



From pingou at fedoraproject.org  Wed Apr 22 18:18:38 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 22 Apr 2009 18:18:38 +0000 (UTC)
Subject: rpms/rkward/F-9 rkward.spec,1.21,1.22
Message-ID: <20090422181838.AD0E870104@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/rkward/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32016/F-9

Modified Files:
	rkward.spec 
Log Message:
Rebuild for R-2.9.0


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/F-9/rkward.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rkward.spec	15 Apr 2009 17:43:03 -0000	1.21
+++ rkward.spec	22 Apr 2009 18:18:06 -0000	1.22
@@ -1,8 +1,8 @@
-%define  Rversion 2.8.0
+%global  Rversion 2.9.0
 
 Name:           rkward
 Version:        0.5.0c
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -117,6 +117,10 @@
 %{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+* Wed Apr 22 2009 pingou <pingou at pingoured.fr> - 0.5.0c-2
+- Rebuild for R-2.9.0
+- Uses %%global instead of %%define
+
 * Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 0.5.0c-1
 - Update to version 0.5.0c
 - Remove the BuildRequires on PyQt-devel



From mclasen at fedoraproject.org  Wed Apr 22 18:27:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 22 Apr 2009 18:27:06 +0000 (UTC)
Subject: rpms/gnome-terminal/F-11 gnome-terminal-tab-cwd.patch, NONE,
	1.1 gnome-terminal.spec, 1.122, 1.123
Message-ID: <20090422182706.82165700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2456

Modified Files:
	gnome-terminal.spec 
Added Files:
	gnome-terminal-tab-cwd.patch 
Log Message:
cwd harder


gnome-terminal-tab-cwd.patch:

--- NEW FILE gnome-terminal-tab-cwd.patch ---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index e6dd61e..10deb3f 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -183,6 +183,59 @@ static guint n_skey_regexes;
 
 G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
 
+static char *
+cwd_of_pid (int pid)
+{
+  static const char patterns[][18] = {
+    "/proc/%d/cwd",         /* Linux */
+    "/proc/%d/path/cwd",    /* Solaris >= 10 */
+  };
+  guint i;
+  
+  if (pid == -1)
+    return NULL;
+
+  /* Try to get the working directory using various OS-specific mechanisms */
+  for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
+    {
+      char cwd_file[64];
+      char buf[PATH_MAX + 1];
+      int len;
+
+      g_snprintf (cwd_file, sizeof (cwd_file), patterns[i], pid);
+      len = readlink (cwd_file, buf, sizeof (buf) - 1);
+
+      if (len > 0 && buf[0] == '/')
+        return g_strndup (buf, len);
+
+      /* If that didn't do it, try this hack */
+      if (len <= 0)
+        {
+          char *cwd, *working_dir = NULL;
+
+          cwd = g_get_current_dir ();
+          if (cwd != NULL)
+            {
+              /* On Solaris, readlink returns an empty string, but the
+               * link can be used as a directory, including as a target
+               * of chdir().
+               */
+              if (chdir (cwd_file) == 0)
+                {
+                  working_dir = g_get_current_dir ();
+                  chdir (cwd);
+                }
+              g_free (cwd);
+            }
+
+          if (working_dir)
+            return working_dir;
+        }
+    }
+
+  return NULL;
+}
+
 static void
 free_tag_data (TagData *tagdata)
 {
@@ -1738,75 +1791,57 @@ terminal_screen_get_dynamic_icon_title (TerminalScreen *screen)
  * terminal_screen_get_current_dir:
  * @screen:
  *
- * Returns: a newly allocated string containing the current working directory
- *   of the foreground process in @screen's PTY; or otherwise the initial working
- *   directory as set by terminal_screen_new()
+ * Tries to determine the current working directory of the foreground process
+ * in @screen's PTY, falling back to the current working directory of the
+ * primary child.
+ * 
+ * Returns: a newly allocated string containing the current working directory,
+ *   or %NULL on failure
  */
 char*
 terminal_screen_get_current_dir (TerminalScreen *screen)
 {
-  static const char patterns[][18] = {
-    "/proc/%d/cwd",         /* Linux */
-    "/proc/%d/path/cwd",    /* Solaris >= 10 */
-  };
   TerminalScreenPrivate *priv = screen->priv;
-  int fgpid;
-  guint i;
-  
-  g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+  char *cwd;
+
+  if (priv->pty_fd != -1) {
+    /* Get the foreground process ID */
+    cwd = cwd_of_pid (tcgetpgrp (priv->pty_fd));
+    if (cwd != NULL)
+      return cwd;
+
+    /* If that didn't work, try falling back to the primary child. See bug #575184. */
+    cwd = cwd_of_pid (priv->child_pid);
+    if (cwd != NULL)
+      return cwd;
+  }
 
-  if (priv->pty_fd == -1)
-    return g_strdup (priv->initial_working_directory);
+  return NULL;
+}
 
-  /* Get the foreground process ID */
-  fgpid = tcgetpgrp (priv->pty_fd);
+/**
+ * terminal_screen_get_current_dir_with_fallback:
+ * @screen:
+ *
+ * Returns: a newly allocated string containing the current working directory
+ *   of the foreground process in @screen's PTY; or otherwise the initial working
+ *   directory as set by terminal_screen_new(), or %NULL if unable to determine
+ *   the current working directory
+ */
+char*
+terminal_screen_get_current_dir_with_fallback (TerminalScreen *screen)
+{
+  TerminalScreenPrivate *priv = screen->priv;
+  char *cwd;
 
-  /* If that didn't work, try falling back to the primary child. See bug #575184. */
-  if (fgpid == -1)
-    fgpid = priv->child_pid;
+  cwd = terminal_screen_get_current_dir (screen);
+  if (cwd != NULL)
+    return cwd;
 
-  if (fgpid == -1)
+  if (priv->initial_working_directory != NULL)
     return g_strdup (priv->initial_working_directory);
 
-  /* Try to get the working directory using various OS-specific mechanisms */
-  for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
-    {
-      char cwd_file[64];
-      char buf[PATH_MAX + 1];
-      int len;
-
-      g_snprintf (cwd_file, sizeof (cwd_file), patterns[i], fgpid);
-      len = readlink (cwd_file, buf, sizeof (buf) - 1);
-
-      if (len > 0 && buf[0] == '/')
-        return g_strndup (buf, len);
-
-      /* If that didn't do it, try this hack */
-      if (len <= 0)
-        {
-          char *cwd, *working_dir = NULL;
-
-          cwd = g_get_current_dir ();
-          if (cwd != NULL)
-            {
-              /* On Solaris, readlink returns an empty string, but the
-               * link can be used as a directory, including as a target
-               * of chdir().
-               */
-              if (chdir (cwd_file) == 0)
-                {
-                  working_dir = g_get_current_dir ();
-                  chdir (cwd);
-                }
-              g_free (cwd);
-            }
-
-          if (working_dir)
-            return working_dir;
-        }
-    }
-
-  return g_strdup (priv->initial_working_directory);
+  return g_strdup (g_get_home_dir ());
 }
 
 void
diff --git a/src/terminal-screen.h b/src/terminal-screen.h
index efd5b3c..8b1e422 100644
--- a/src/terminal-screen.h
+++ b/src/terminal-screen.h
@@ -110,6 +110,7 @@ const char *terminal_screen_get_dynamic_title      (TerminalScreen *screen);
 const char *terminal_screen_get_dynamic_icon_title (TerminalScreen *screen);
 
 char *terminal_screen_get_current_dir (TerminalScreen *screen);
+char *terminal_screen_get_current_dir_with_fallback (TerminalScreen *screen);
 
 void        terminal_screen_set_font (TerminalScreen *screen);
 void        terminal_screen_set_font_scale    (TerminalScreen *screen,
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 188bdd1..05e0af1 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2807,7 +2807,7 @@ file_new_window_callback (GtkAction *action,
 
   new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window)));
 
-  new_working_directory = terminal_screen_get_current_dir (priv->active_screen);
+  new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen);
   terminal_app_new_terminal (app, new_window, profile,
                              NULL, NULL,
                              new_working_directory,
@@ -2839,7 +2839,7 @@ file_new_tab_callback (GtkAction *action,
   if (_terminal_profile_get_forgotten (profile))
     return;
 
-  new_working_directory = terminal_screen_get_current_dir (priv->active_screen);
+  new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen);
   terminal_app_new_terminal (app, window, profile,
                              NULL, NULL,
                              new_working_directory,


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-11/gnome-terminal.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnome-terminal.spec	14 Apr 2009 00:59:40 -0000	1.122
+++ gnome-terminal.spec	22 Apr 2009 18:26:32 -0000	1.123
@@ -11,7 +11,7 @@
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -20,6 +20,8 @@
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 # From upstream trunk
 Patch3: tab-switching.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=565328
+Patch4: gnome-terminal-tab-cwd.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +56,7 @@
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
 %patch3 -p1 -b .tab-switching
+%patch4 -p1 -b .tab-cwd
 
 %build
 
@@ -132,6 +135,9 @@
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Wed Apr 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Try harder to get a useful cwd when opening tabs (#496947)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-terminal/2.26/gnome-terminal-2.26.1.news



From sandeen at fedoraproject.org  Wed Apr 22 18:30:22 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Wed, 22 Apr 2009 18:30:22 +0000 (UTC)
Subject: rpms/e2fsprogs/F-11 e2fsprogs-1.41.4-ext4-resize-fixes.patch, NONE, 
	1.1 e2fsprogs-1.41.4-fix-external-journals.patch, NONE,
	1.1 e2fsprogs.spec, 1.132, 1.133 e2fsprogs-1.41-buildfix, 1.1,
	NONE e2fsprogs-1.41-fix-mkswap-tests, 1.1, NONE
Message-ID: <20090422183022.856CB700FE@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3637

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.4-ext4-resize-fixes.patch 
	e2fsprogs-1.41.4-fix-external-journals.patch 
Removed Files:
	e2fsprogs-1.41-buildfix e2fsprogs-1.41-fix-mkswap-tests 
Log Message:
* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-8
- Fix support for external journals

* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-7
- Fix ext4 resize issues (#496982)


e2fsprogs-1.41.4-ext4-resize-fixes.patch:

--- NEW FILE e2fsprogs-1.41.4-ext4-resize-fixes.patch ---
3 patches from the list to address resize issues (18 Apr 2009):

When allocating a new set of block group metadata as part of growing
the filesystem, the resize2fs code assumes that the bitmap and inode
table blocks are in their own block group; an assumption which is
changed by the flex_bg feature.  This commit works around the problem
by temporarily turning off flex_bg while allocating the new block
group metadata, to avoid potentially overwriting previously allocated
data blocks.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

If we need to shrink the inode table, we need to make sure the inodes
contained in the part of the inode table we are vacating don't get
reused as part of the filesystem shrink operation.  This wasn't a
problem with ext3 filesystems, since the inode table was located in
the block group that was going away, so that location was not eligible
for reallocation.

However with ext4 filesystems with flex_bg enabled, it's possible for
a portion of the inode table in the last flex_bg group to be
deallocated, but in a part of the filesystem which could be used as
data blocks.  So we must mark those blocks as reserved to prevent
their reuse, and adjust the minimum filesystem size calculation to
assure that we don't shrink a filesystem too small for the resize
operation to succeed.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

Due to a fencepost bug, when skipping a block group whose block bitmap
was uninitialized (and hence could not contain any blocks eligible for
relaocation), the block immediately following the block group wasn't
checked as well.  If it was in use and required relocation, it
wouldn't get properly relocated, with the result that an inode using
such a block would end up, post resize, with a pointer to a block now
outside the bounds of the filesystem.

This commit fixes this fencepost error.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

Index: e2fsprogs-1.41.4/resize/resize2fs.c
===================================================================
--- e2fsprogs-1.41.4.orig/resize/resize2fs.c
+++ e2fsprogs-1.41.4/resize/resize2fs.c
@@ -233,20 +233,29 @@ static void fix_uninit_block_bitmaps(ext
 
 /*
  * If the group descriptor's bitmap and inode table blocks are valid,
- * release them in the specified filesystem data structure
+ * release them in the new filesystem data structure, and mark them as
+ * reserved so the old inode table blocks don't get overwritten.
  */
-static void free_gdp_blocks(ext2_filsys fs, struct ext2_group_desc *gdp)
+static void free_gdp_blocks(ext2_filsys fs,
+			    ext2fs_block_bitmap reserve_blocks,
+			    struct ext2_group_desc *gdp)
 {
 	blk_t	blk;
 	int	j;
 
 	if (gdp->bg_block_bitmap &&
-	    (gdp->bg_block_bitmap < fs->super->s_blocks_count))
+	    (gdp->bg_block_bitmap < fs->super->s_blocks_count)) {
 		ext2fs_block_alloc_stats(fs, gdp->bg_block_bitmap, -1);
+		ext2fs_mark_block_bitmap(reserve_blocks,
+					 gdp->bg_block_bitmap);
+	}
 
 	if (gdp->bg_inode_bitmap &&
-	    (gdp->bg_inode_bitmap < fs->super->s_blocks_count))
+	    (gdp->bg_inode_bitmap < fs->super->s_blocks_count)) {
 		ext2fs_block_alloc_stats(fs, gdp->bg_inode_bitmap, -1);
+		ext2fs_mark_block_bitmap(reserve_blocks,
+					 gdp->bg_inode_bitmap);
+	}
 
 	if (gdp->bg_inode_table == 0 ||
 	    (gdp->bg_inode_table >= fs->super->s_blocks_count))
@@ -257,14 +266,19 @@ static void free_gdp_blocks(ext2_filsys 
 		if (blk >= fs->super->s_blocks_count)
 			break;
 		ext2fs_block_alloc_stats(fs, blk, -1);
+		ext2fs_mark_block_bitmap(reserve_blocks, blk);
 	}
 }
 
 /*
  * This routine is shared by the online and offline resize routines.
  * All of the information which is adjusted in memory is done here.
+ *
+ * The reserve_blocks parameter is only needed when shrinking the
+ * filesystem.
  */
-errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs, blk_t new_size)
+errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
+			 ext2fs_block_bitmap reserve_blocks, blk_t new_size)
 {
 	errcode_t	retval;
 	int		overhead = 0;
@@ -399,8 +413,8 @@ retry:
 	}
 
 	/*
-	 * If we are shrinking the number block groups, we're done and
-	 * can exit now.
+	 * If we are shrinking the number of block groups, we're done
+	 * and can exit now.
 	 */
 	if (old_fs->group_desc_count > fs->group_desc_count) {
 		/*
@@ -409,7 +423,8 @@ retry:
 		 */
 		for (i = fs->group_desc_count;
 		     i < old_fs->group_desc_count; i++) {
-			free_gdp_blocks(fs, &old_fs->group_desc[i]);
+			free_gdp_blocks(fs, reserve_blocks,
+					&old_fs->group_desc[i]);
 		}
 		retval = 0;
 		goto errout;
@@ -550,7 +565,12 @@ static errcode_t adjust_superblock(ext2_
 	ext2fs_mark_bb_dirty(fs);
 	ext2fs_mark_ib_dirty(fs);
 
-	retval = adjust_fs_info(fs, rfs->old_fs, new_size);
+	retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
+					      &rfs->reserve_blocks);
+	if (retval)
+		return retval;
+
+	retval = adjust_fs_info(fs, rfs->old_fs, rfs->reserve_blocks, new_size);
 	if (retval)
 		goto errout;
 
@@ -746,17 +766,13 @@ static errcode_t blocks_to_move(ext2_res
 	errcode_t	retval;
 	ext2_filsys 	fs, old_fs;
 	ext2fs_block_bitmap	meta_bmap;
+	__u32		save_incompat_flag;
 
 	fs = rfs->new_fs;
 	old_fs = rfs->old_fs;
 	if (old_fs->super->s_blocks_count > fs->super->s_blocks_count)
 		fs = rfs->old_fs;
 
-	retval = ext2fs_allocate_block_bitmap(fs, _("reserved blocks"),
-					      &rfs->reserve_blocks);
-	if (retval)
-		return retval;
-
 	retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
 					      &rfs->move_blocks);
 	if (retval)
@@ -788,7 +804,7 @@ static errcode_t blocks_to_move(ext2_res
 			 * to the next block group.
 			 */
 			blk = ((g+1) * fs->super->s_blocks_per_group) +
-				fs->super->s_first_data_block;
+				fs->super->s_first_data_block - 1;
 			continue;
 		}
 		if (ext2fs_test_block_bitmap(old_fs->block_map, blk) &&
@@ -890,9 +906,29 @@ static errcode_t blocks_to_move(ext2_res
 
 		/*
 		 * Allocate the missing data structures
+		 *
+		 * XXX We have a problem with FLEX_BG and off-line
+		 * resizing where we are growing the size of the
+		 * filesystem.  ext2fs_allocate_group_table() will try
+		 * to reserve the inode table in the desired flex_bg
+		 * location.  However, passing rfs->reserve_blocks
+		 * doesn't work since it only has reserved the blocks
+		 * that will be used in the new block group -- and
+		 * with flex_bg, we can and will allocate the tables
+		 * outside of the block group.  And we can't pass in
+		 * the fs->block_map because it doesn't handle
+		 * overlapping inode table movements right.  So for
+		 * now, we temporarily disable flex_bg to force
+		 * ext2fs_allocate_group_tables() to allocate the bg
+		 * metadata in side the block group, and the restore
+		 * it afterwards.  Ugly, until we can fix this up
+		 * right later.
 		 */
+		save_incompat_flag = fs->super->s_feature_incompat;
+		fs->super->s_feature_incompat &= ~EXT4_FEATURE_INCOMPAT_FLEX_BG;
 		retval = ext2fs_allocate_group_table(fs, i,
 						     rfs->reserve_blocks);
+		fs->super->s_feature_incompat = save_incompat_flag;
 		if (retval)
 			goto errout;
 
@@ -1857,6 +1893,19 @@ blk_t calculate_minimum_resize_size(ext2
 	data_needed -= SUPER_OVERHEAD(fs) * num_of_superblocks;
 	data_needed -= META_OVERHEAD(fs) * fs->group_desc_count;
 
+	if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) {
+		/*
+		 * For ext4 we need to allow for up to a flex_bg worth
+		 * of inode tables of slack space so the resize
+		 * operation can be guaranteed to finish.
+		 */
+		int flexbg_size = 1 << fs->super->s_log_groups_per_flex;
+		int extra_groups;
+
+		extra_groups = flexbg_size - (groups & (flexbg_size - 1));
+		data_needed += META_OVERHEAD(fs) * extra_groups;
+	}
+
 	/*
 	 * figure out how many data blocks we have given the number of groups
 	 * we need for our inodes
Index: e2fsprogs-1.41.4/resize/online.c
===================================================================
--- e2fsprogs-1.41.4.orig/resize/online.c
+++ e2fsprogs-1.41.4/resize/online.c
@@ -104,7 +104,7 @@ errcode_t online_resize_fs(ext2_filsys f
 	 * but at least it allows on-line resizing to function.
 	 */
 	new_fs->super->s_feature_incompat &= ~EXT4_FEATURE_INCOMPAT_FLEX_BG;
-	retval = adjust_fs_info(new_fs, fs, *new_size);
+	retval = adjust_fs_info(new_fs, fs, 0, *new_size);
 	if (retval)
 		return retval;
 
Index: e2fsprogs-1.41.4/resize/resize2fs.h
===================================================================
--- e2fsprogs-1.41.4.orig/resize/resize2fs.h
+++ e2fsprogs-1.41.4/resize/resize2fs.h
@@ -128,6 +128,7 @@ extern errcode_t resize_fs(ext2_filsys f
 					    unsigned long max));
 
 extern errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
+				ext2fs_block_bitmap reserve_blocks,
 				blk_t new_size);
 extern blk_t calculate_minimum_resize_size(ext2_filsys fs);
 

e2fsprogs-1.41.4-fix-external-journals.patch:

--- NEW FILE e2fsprogs-1.41.4-fix-external-journals.patch ---
From: Theodore Ts'o <tytso at mit.edu>
Date: Tue, 17 Mar 2009 02:16:44 +0000 (-0400)
Subject: libext2fs: external journal devices should not cause ext2fs_open2 to fail
X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=341b52dfa8c2afc11d8410de9bd381b03e75c6af

libext2fs: external journal devices should not cause ext2fs_open2 to fail

This fixes a regression introduced in commit 79a9ab14 which caused
attempts to open external journals to fail due to overly strict
filesystem consistency checks.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index cdfeaec..f6fe3f0 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -243,10 +243,6 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
 		goto cleanup;
 	}
 	fs->fragsize = EXT2_FRAG_SIZE(fs->super);
-       if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
-		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
-		goto cleanup;
-	}
 	fs->inode_blocks_per_group = ((EXT2_INODES_PER_GROUP(fs->super) *
 				       EXT2_INODE_SIZE(fs->super) +
 				       EXT2_BLOCK_SIZE(fs->super) - 1) /
@@ -273,6 +269,11 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
 		return 0;
 	}
 
+	if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
+		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
+		goto cleanup;
+	}
+
 	/*
 	 * Read group descriptors
 	 */



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-11/e2fsprogs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- e2fsprogs.spec	11 Apr 2009 13:29:14 -0000	1.132
+++ e2fsprogs.spec	22 Apr 2009 18:30:12 -0000	1.133
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 6%{?dist}
+Release: 8%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -19,6 +19,8 @@
 Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
 Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
 Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
+Patch7: e2fsprogs-1.41.4-ext4-resize-fixes.patch 
+Patch8: e2fsprogs-1.41.4-fix-external-journals.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -104,6 +106,10 @@
 %patch5 -p1 -b .info
 # Ignore NEEDS_RECOVERY mismatch
 %patch6 -p1 -b .recovery
+# Fix ext4 resize issues
+%patch7 -p1 -b .resize
+# Fix external journals
+%patch8 -p1 -b .ext-journal
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -302,6 +308,12 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-8
+- Fix support for external journals
+
+* Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-7
+- Fix ext4 resize issues (#496982)
+
 * Sat Apr 11 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-6
 - ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)
 


--- e2fsprogs-1.41-buildfix DELETED ---


--- e2fsprogs-1.41-fix-mkswap-tests DELETED ---



From sandeen at fedoraproject.org  Wed Apr 22 18:39:05 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Wed, 22 Apr 2009 18:39:05 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41-buildfix, 1.1,
	NONE e2fsprogs-1.41-fix-mkswap-tests, 1.1, NONE
Message-ID: <20090422183906.1FC14700FE@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6019

Removed Files:
	e2fsprogs-1.41-buildfix e2fsprogs-1.41-fix-mkswap-tests 
Log Message:
Remove some old/dead/stale/unused patches



--- e2fsprogs-1.41-buildfix DELETED ---


--- e2fsprogs-1.41-fix-mkswap-tests DELETED ---



From mclasen at fedoraproject.org  Wed Apr 22 18:46:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 22 Apr 2009 18:46:32 +0000 (UTC)
Subject: rpms/gnome-terminal/F-11 gnome-terminal.spec,1.123,1.124
Message-ID: <20090422184632.5610F700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7969

Modified Files:
	gnome-terminal.spec 
Log Message:
fix file list



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-11/gnome-terminal.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gnome-terminal.spec	22 Apr 2009 18:26:32 -0000	1.123
+++ gnome-terminal.spec	22 Apr 2009 18:46:00 -0000	1.124
@@ -130,7 +130,7 @@
 
 %{_bindir}/gnome-terminal
 %{_datadir}/gnome-terminal
-%{_datadir}/omf/gnome-terminal
+%dir %{_datadir}/omf/gnome-terminal
 %{_datadir}/applications/gnome-terminal.desktop
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 



From karsten at fedoraproject.org  Wed Apr 22 18:55:13 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 22 Apr 2009 18:55:13 +0000 (UTC)
Subject: rpms/wfmath/F-11 wfmath.spec,1.14,1.15
Message-ID: <20090422185513.6CD4B700FE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/wfmath/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10473

Modified Files:
	wfmath.spec 
Log Message:
- Don't run unit tests on s390(x), similar to ppc64



Index: wfmath.spec
===================================================================
RCS file: /cvs/extras/rpms/wfmath/F-11/wfmath.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wfmath.spec	27 Feb 2009 19:33:10 -0000	1.14
+++ wfmath.spec	22 Apr 2009 18:54:41 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           wfmath
 Version:        0.3.9
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        WorldForge client math libraries
 
 Group:          Development/Libraries
@@ -63,8 +63,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-# Tests are failing on PPC :(
-%ifnarch ppc ppc64
+# Tests are failing on PPC and s390(x) :(
+%ifnarch ppc ppc64 s390 s390x
 # Run tests in debug mode so asserts won't be skipped
 sed -i -e 's/-DNDEBUG/-DDEBUG/' wfmath/Makefile
 make %{?_smp_mflags} check
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Karsten Hopp <karsten at redhat.com> 0.3.9-1.1
+- Don't run unit tests on s390(x), similar to ppc64
+
 * Fri Feb 27 2009 Alexey Torkhov <atorkhov at gmail.com> 0.3.9-1
 - Update to 0.3.9
 



From jakub at fedoraproject.org  Wed Apr 22 19:01:38 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 22 Apr 2009 19:01:38 +0000 (UTC)
Subject: rpms/gcc/F-11 gcc44-cswtch.patch, NONE,
	1.1 gcc44-find_base_term.patch, 
	NONE, 1.1 gcc44-pr39794.patch, NONE, 1.1 gcc44-rh459374-1.patch,
	NONE, 1.1 gcc44-rh459374-2.patch, NONE,
	1.1 gcc44-rh459374-3.patch, NONE, 1.1 .cvsignore, 1.269,
	1.270 gcc.spec, 1.43, 1.44 gcc44-pr39543.patch, 1.2, 1.3 sources,
	1.272, 1.273
Message-ID: <20090422190138.5269A70103@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12661

Modified Files:
	.cvsignore gcc.spec gcc44-pr39543.patch sources 
Added Files:
	gcc44-cswtch.patch gcc44-find_base_term.patch 
	gcc44-pr39794.patch gcc44-rh459374-1.patch 
	gcc44-rh459374-2.patch gcc44-rh459374-3.patch 
Log Message:
4.4.0-1

gcc44-cswtch.patch:

--- NEW FILE gcc44-cswtch.patch ---
2009-04-21  Martin Jambor  <mjambor at suse.cz>

	* tree-switch-conversion.c (constructor_contains_same_values_p):
	New function.
	(build_one_array): Create assigns of constants if possible.

	* gcc.dg/tree-ssa/cswtch-2.c: New test.

--- gcc/tree-switch-conversion.c.jj	2009-03-28 18:11:43.000000000 +0100
+++ gcc/tree-switch-conversion.c	2009-04-22 20:09:45.000000000 +0200
@@ -459,6 +459,28 @@ build_constructors (gimple swtch)
     }
 }
 
+/* If all values in the constructor vector are the same, return the value.
+   Otherwise return NULL_TREE.  Not supposed to be called for empty
+   vectors.  */
+
+static tree
+constructor_contains_same_values_p (VEC (constructor_elt, gc) *vec)
+{
+  int i, len = VEC_length (constructor_elt, vec);
+  tree prev = NULL_TREE;
+
+  for (i = 0; i < len; i++)
+    {
+      constructor_elt *elt = VEC_index (constructor_elt, vec, i);
+      
+      if (!prev)
+	prev = elt->value;
+      else if (!operand_equal_p (elt->value, prev, OEP_ONLY_CONST))
+	return NULL_TREE;
+    }
+  return prev;
+}
+
 /* Create an appropriate array type and declaration and assemble a static array
    variable.  Also create a load statement that initializes the variable in
    question with a value from the static array.  SWTCH is the switch statement
@@ -472,35 +494,44 @@ static void
 build_one_array (gimple swtch, int num, tree arr_index_type, gimple phi,
 		 tree tidx)
 {
-  tree array_type, ctor, decl, value_type, name, fetch;
+  tree name, cst;
   gimple load;
   gimple_stmt_iterator gsi;
 
   gcc_assert (info.default_values[num]);
-  value_type = TREE_TYPE (info.default_values[num]);
-  array_type = build_array_type (value_type, arr_index_type);
-
-  ctor = build_constructor (array_type, info.constructors[num]);
-  TREE_CONSTANT (ctor) = true;
-
-  decl = build_decl (VAR_DECL, NULL_TREE, array_type);
-  TREE_STATIC (decl) = 1;
-  DECL_INITIAL (decl) = ctor;
-
-  DECL_NAME (decl) = create_tmp_var_name ("CSWTCH");
-  DECL_ARTIFICIAL (decl) = 1;
-  TREE_CONSTANT (decl) = 1;
-  add_referenced_var (decl);
-  varpool_mark_needed_node (varpool_node (decl));
-  varpool_finalize_decl (decl);
-  mark_sym_for_renaming (decl);
 
   name = make_ssa_name (SSA_NAME_VAR (PHI_RESULT (phi)), NULL);
   info.target_inbound_names[num] = name;
 
-  fetch = build4 (ARRAY_REF, value_type, decl, tidx, NULL_TREE,
-		  NULL_TREE);
-  load = gimple_build_assign (name, fetch);
+  cst = constructor_contains_same_values_p (info.constructors[num]);                                                                    
+  if (cst)
+    load = gimple_build_assign (name, cst);
+  else
+    {
+      tree array_type, ctor, decl, value_type, fetch;
+
+      value_type = TREE_TYPE (info.default_values[num]);
+      array_type = build_array_type (value_type, arr_index_type);
+
+      ctor = build_constructor (array_type, info.constructors[num]);
+      TREE_CONSTANT (ctor) = true;
+
+      decl = build_decl (VAR_DECL, NULL_TREE, array_type);
+      TREE_STATIC (decl) = 1;
+      DECL_INITIAL (decl) = ctor;
+
+      DECL_NAME (decl) = create_tmp_var_name ("CSWTCH");
+      DECL_ARTIFICIAL (decl) = 1;
+      TREE_CONSTANT (decl) = 1;
+      add_referenced_var (decl);
+      varpool_mark_needed_node (varpool_node (decl));
+      varpool_finalize_decl (decl);
+      mark_sym_for_renaming (decl);
+
+      fetch = build4 (ARRAY_REF, value_type, decl, tidx, NULL_TREE,
+		      NULL_TREE);
+      load = gimple_build_assign (name, fetch);
+    }
   SSA_NAME_DEF_STMT (name) = load;
 
   gsi = gsi_for_stmt (swtch);
--- gcc/testsuite/gcc.dg/tree-ssa/cswtch-2.c.jj	2009-04-22 20:01:40.000000000 +0200
+++ gcc/testsuite/gcc.dg/tree-ssa/cswtch-2.c	2009-04-22 20:01:40.000000000 +0200
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-switchconv" } */
+
+typedef enum { a = 5, b = 6, c = 7, d = 8, e = 9 } X;
+
+int h1 (X x)
+{
+  switch (x) {
+  case a:
+  case b:
+  case c:
+  case d:
+  case e:
+    return 1;
+  default:
+    return 0;
+    }
+}
+
+/* { dg-final { scan-tree-dump-times "CSWTCH" 0 "switchconv" } } */
+/* { dg-final { cleanup-tree-dump "switchconv" } } */

gcc44-find_base_term.patch:

--- NEW FILE gcc44-find_base_term.patch ---
2009-04-22  Jakub Jelinek  <jakub at redhat.com>

	* alias.c (find_base_term): Move around LO_SUM case, so that
	CONST falls through into PLUS/MINUS handling.

--- gcc/alias.c.jj	2009-04-21 11:16:28.000000000 +0200
+++ gcc/alias.c	2009-04-21 12:44:18.000000000 +0200
@@ -1438,15 +1438,16 @@ find_base_term (rtx x)
 	  return x;
       return 0;
 
+    case LO_SUM:
+      /* The standard form is (lo_sum reg sym) so look only at the
+         second operand.  */
+      return find_base_term (XEXP (x, 1));
+
     case CONST:
       x = XEXP (x, 0);
       if (GET_CODE (x) != PLUS && GET_CODE (x) != MINUS)
 	return 0;
       /* Fall through.  */
-    case LO_SUM:
-      /* The standard form is (lo_sum reg sym) so look only at the
-         second operand.  */
-      return find_base_term (XEXP (x, 1));
     case PLUS:
     case MINUS:
       {

gcc44-pr39794.patch:

--- NEW FILE gcc44-pr39794.patch ---
2009-04-21  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/39794
	* alias.c (canon_true_dependence): Add x_addr argument.
	* rtl.h (canon_true_dependence): Adjust prototype.
	* cse.c (check_dependence): Adjust canon_true_dependence callers.
	* cselib.c (cselib_invalidate_mem): Likewise.
	* gcse.c (compute_transp): Likewise.
	* dse.c (scan_reads_nospill): Likewise.
	(record_store, check_mem_read_rtx): Likewise.  For non-const or
	frame addresses pass cselib_subst_to_values as mem_addr, for
	const or frame addresses canon_base_mem of the group plus
	optionally offset.

	* gcc.dg/pr39794.c: New test.

--- gcc/alias.c.jj	2009-03-28 18:11:42.000000000 +0100
+++ gcc/alias.c	2009-04-21 12:44:18.000000000 +0200
@@ -2250,14 +2251,13 @@ true_dependence (const_rtx mem, enum mac
    Variant of true_dependence which assumes MEM has already been
    canonicalized (hence we no longer do that here).
    The mem_addr argument has been added, since true_dependence computed
-   this value prior to canonicalizing.  */
+   this value prior to canonicalizing.
+   If x_addr is non-NULL, it is used in preference of XEXP (x, 0).  */
 
 int
 canon_true_dependence (const_rtx mem, enum machine_mode mem_mode, rtx mem_addr,
-		       const_rtx x, bool (*varies) (const_rtx, bool))
+		       const_rtx x, rtx x_addr, bool (*varies) (const_rtx, bool))
 {
-  rtx x_addr;
-
   if (MEM_VOLATILE_P (x) && MEM_VOLATILE_P (mem))
     return 1;
 
@@ -2283,7 +2283,8 @@ canon_true_dependence (const_rtx mem, en
   if (nonoverlapping_memrefs_p (x, mem))
     return 0;
 
-  x_addr = get_addr (XEXP (x, 0));
+  if (! x_addr)
+    x_addr = get_addr (XEXP (x, 0));
 
   if (! base_alias_check (x_addr, mem_addr, GET_MODE (x), mem_mode))
     return 0;
--- gcc/dse.c.jj	2009-03-28 18:11:42.000000000 +0100
+++ gcc/dse.c	2009-04-21 18:11:19.000000000 +0200
@@ -1286,7 +1286,7 @@ static rtx get_stored_val (store_info_t,
 static int
 record_store (rtx body, bb_info_t bb_info)
 {
-  rtx mem, rhs, const_rhs;
+  rtx mem, rhs, const_rhs, mem_addr;
   HOST_WIDE_INT offset = 0;
   HOST_WIDE_INT width = 0;
   alias_set_type spill_alias_set;
@@ -1456,6 +1456,20 @@ record_store (rtx body, bb_info_t bb_inf
   ptr = active_local_stores;
   last = NULL;
   redundant_reason = NULL;
+  mem = canon_rtx (mem);
+  if (spill_alias_set || group_id < 0)
+    {
+      cselib_lookup (XEXP (mem, 0), Pmode, 1);
+      mem_addr = cselib_subst_to_values (XEXP (mem, 0));
+    }
+  else
+    {
+      group_info_t group
+	= VEC_index (group_info_t, rtx_group_vec, group_id);
+      mem_addr = group->canon_base_mem;
+      if (offset)
+	mem_addr = gen_rtx_PLUS (GET_MODE (mem_addr), mem_addr, GEN_INT (offset));
+    }
 
   while (ptr)
     {
@@ -1547,13 +1561,13 @@ record_store (rtx body, bb_info_t bb_inf
 	  if (canon_true_dependence (s_info->mem, 
 				     GET_MODE (s_info->mem),
 				     s_info->mem_addr,
-				     mem, rtx_varies_p))
+				     mem, mem_addr, rtx_varies_p))
 	    {
 	      s_info->rhs = NULL;
 	      s_info->const_rhs = NULL;
 	    }
 	}
-      
+
       /* An insn can be deleted if every position of every one of
 	 its s_infos is zero.  */
       if (any_positions_needed_p (s_info)
@@ -1580,9 +1594,9 @@ record_store (rtx body, bb_info_t bb_inf
   /* Finish filling in the store_info.  */
   store_info->next = insn_info->store_rec;
   insn_info->store_rec = store_info;
-  store_info->mem = canon_rtx (mem);
+  store_info->mem = mem;
   store_info->alias_set = spill_alias_set;
-  store_info->mem_addr = get_addr (XEXP (mem, 0));
+  store_info->mem_addr = mem_addr;
   store_info->cse_base = base;
   if (width > HOST_BITS_PER_WIDE_INT)
     {
@@ -2006,7 +2020,7 @@ replace_read (store_info_t store_info, i
 static int
 check_mem_read_rtx (rtx *loc, void *data)
 {
-  rtx mem = *loc;
+  rtx mem = *loc, mem_addr;
   bb_info_t bb_info;
   insn_info_t insn_info;
   HOST_WIDE_INT offset = 0;
@@ -2058,6 +2072,19 @@ check_mem_read_rtx (rtx *loc, void *data
   read_info->end = offset + width;
   read_info->next = insn_info->read_rec;
   insn_info->read_rec = read_info;
+  if (spill_alias_set || group_id < 0)
+    {
+      cselib_lookup (XEXP (mem, 0), Pmode, 1);
+      mem_addr = cselib_subst_to_values (XEXP (mem, 0));
+    }
+  else
+    {
+      group_info_t group
+	= VEC_index (group_info_t, rtx_group_vec, group_id);
+      mem_addr = group->canon_base_mem;
+      if (offset)
+	mem_addr = gen_rtx_PLUS (GET_MODE (mem_addr), mem_addr, GEN_INT (offset));
+    }
 
   /* We ignore the clobbers in store_info.  The is mildly aggressive,
      but there really should not be a clobber followed by a read.  */
@@ -2128,7 +2155,7 @@ check_mem_read_rtx (rtx *loc, void *data
 	      = canon_true_dependence (store_info->mem, 
 				       GET_MODE (store_info->mem),
 				       store_info->mem_addr,
-				       mem, rtx_varies_p);
+				       mem, mem_addr, rtx_varies_p);
 	  
 	  else if (group_id == store_info->group_id)
 	    {
@@ -2139,7 +2166,7 @@ check_mem_read_rtx (rtx *loc, void *data
 		  = canon_true_dependence (store_info->mem, 
 					   GET_MODE (store_info->mem),
 					   store_info->mem_addr,
-					   mem, rtx_varies_p);
+					   mem, mem_addr, rtx_varies_p);
 	      
 	      /* If this read is just reading back something that we just
 		 stored, rewrite the read.  */
@@ -2224,7 +2251,7 @@ check_mem_read_rtx (rtx *loc, void *data
 	    remove = canon_true_dependence (store_info->mem, 
 					    GET_MODE (store_info->mem),
 					    store_info->mem_addr,
-					    mem, rtx_varies_p);
+					    mem, mem_addr, rtx_varies_p);
 	  
 	  if (remove)
 	    {
@@ -3067,7 +3094,8 @@ scan_reads_nospill (insn_info_t insn_inf
 		      && canon_true_dependence (group->base_mem, 
 						QImode,
 						group->canon_base_mem,
-						read_info->mem, rtx_varies_p))
+						read_info->mem, NULL_RTX,
+						rtx_varies_p))
 		    {
 		      if (kill)
 			bitmap_ior_into (kill, group->group_kill);
--- gcc/cse.c.jj	2009-03-28 18:11:42.000000000 +0100
+++ gcc/cse.c	2009-04-21 11:18:02.000000000 +0200
@@ -1,6 +1,6 @@
 /* Common subexpression elimination for GNU compiler.
    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -1658,7 +1658,7 @@ check_dependence (rtx *x, void *data)
 {
   struct check_dependence_data *d = (struct check_dependence_data *) data;
   if (*x && MEM_P (*x))
-    return canon_true_dependence (d->exp, d->mode, d->addr, *x,
+    return canon_true_dependence (d->exp, d->mode, d->addr, *x, NULL_RTX,
 		    		  cse_rtx_varies_p);
   else
     return 0;
--- gcc/rtl.h.jj	2009-03-28 18:11:43.000000000 +0100
+++ gcc/rtl.h	2009-04-21 11:17:04.000000000 +0200
@@ -2282,7 +2282,7 @@ extern rtx canon_rtx (rtx);
 extern int true_dependence (const_rtx, enum machine_mode, const_rtx, bool (*)(const_rtx, bool));
 extern rtx get_addr (rtx);
 extern int canon_true_dependence (const_rtx, enum machine_mode, rtx, const_rtx,
-				  bool (*)(const_rtx, bool));
+				  rtx, bool (*)(const_rtx, bool));
 extern int read_dependence (const_rtx, const_rtx);
 extern int anti_dependence (const_rtx, const_rtx);
 extern int output_dependence (const_rtx, const_rtx);
--- gcc/cselib.c.jj	2009-03-28 18:11:43.000000000 +0100
+++ gcc/cselib.c	2009-04-21 11:18:25.000000000 +0200
@@ -1,6 +1,6 @@
 /* Common subexpression elimination library for GNU compiler.
    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008
+   1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -1483,7 +1483,7 @@ cselib_invalidate_mem (rtx mem_rtx)
 	    }
 	  if (num_mems < PARAM_VALUE (PARAM_MAX_CSELIB_MEMORY_LOCATIONS)
 	      && ! canon_true_dependence (mem_rtx, GET_MODE (mem_rtx), mem_addr,
-		      			  x, cselib_rtx_varies_p))
+		      			  x, NULL_RTX, cselib_rtx_varies_p))
 	    {
 	      has_mem = true;
 	      num_mems++;
--- gcc/gcse.c.jj	2009-03-28 18:11:42.000000000 +0100
+++ gcc/gcse.c	2009-04-21 11:19:20.000000000 +0200
@@ -1,7 +1,7 @@
 /* Global common subexpression elimination/Partial redundancy elimination
    and global constant/copy propagation for GNU compiler.
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008 Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -2516,7 +2516,7 @@ compute_transp (const_rtx x, int indx, s
 		    dest_addr = XEXP (list_entry, 0);
 
 		    if (canon_true_dependence (dest, GET_MODE (dest), dest_addr,
-					       x, rtx_addr_varies_p))
+					       x, NULL_RTX, rtx_addr_varies_p))
 		      {
 			if (set_p)
 			  SET_BIT (bmap[bb_index], indx);
--- gcc/testsuite/gcc.dg/pr39794.c.jj	2009-04-21 13:08:45.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr39794.c	2009-04-21 13:07:29.000000000 +0200
@@ -0,0 +1,33 @@
+/* PR middle-end/39794 */
+/* { dg-do run } */
+/* { dg-options "-O2 -funroll-loops" } */
+
+extern void abort ();
+
+void
+foo (int *a, int n)
+{
+  int i;
+  for (i = 0; i < n; i++)
+    {
+      a[i] *= 2;
+      a[i + 1] = a[i - 1] + a[i - 2];
+    }
+}
+
+int a[16];
+int ref[16] = { 0, 1, 4, 2, 10, 12, 24, 44,
+		72, 136, 232, 416, 736, 1296, 2304, 2032 };
+
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 16; i++)
+    a[i] = i;
+  foo (a + 2, 16 - 3);
+  for (i = 0; i < 16; i++)
+    if (ref[i] != a[i])
+      abort ();
+  return 0;
+}

gcc44-rh459374-1.patch:

--- NEW FILE gcc44-rh459374-1.patch ---
2009-04-08  Jakub Jelinek  <jakub at redhat.com>

	* tree.h (DECL_BY_REFERENCE): Note that it is also valid for
	!TREE_STATIC VAR_DECLs.
	* dwarf2out.c (loc_by_reference, gen_decl_die): Handle
	DECL_BY_REFERENCE on !TREE_STATIC VAR_DECLs.
	(gen_variable_die): Likewise.  Don't look at TREE_PRIVATE if
	DECL_BY_REFERENCE is valid.
	* dbxout.c (DECL_ACCESSIBILITY_CHAR): Don't look at TREE_PRIVATE
	for PARM_DECLs, RESULT_DECLs or !TREE_STATIC VAR_DECLs.
	* tree-nested.c (get_nonlocal_debug_decl, get_local_debug_decl):
	Copy DECL_BY_REFERENCE.
	(struct nesting_copy_body_data): New type.
	(nesting_copy_decl): New function.
	(finalize_nesting_tree_1): Remap types of debug_var_chain variables,
	if they have variable length.

--- gcc/dwarf2out.c.jj	2009-04-07 08:32:56.000000000 +0200
+++ gcc/dwarf2out.c	2009-04-08 11:10:16.000000000 +0200
@@ -11709,7 +11709,9 @@ loc_by_reference (dw_loc_descr_ref loc, 
   if (loc == NULL)
     return NULL;
 
-  if ((TREE_CODE (decl) != PARM_DECL && TREE_CODE (decl) != RESULT_DECL)
+  if ((TREE_CODE (decl) != PARM_DECL
+       && TREE_CODE (decl) != RESULT_DECL
+       && (TREE_CODE (decl) != VAR_DECL || TREE_STATIC (decl)))
       || !DECL_BY_REFERENCE (decl))
     return loc;
 
@@ -14047,12 +14049,19 @@ gen_variable_die (tree decl, tree origin
   else
     {
       tree type = TREE_TYPE (decl);
+      bool private_flag_valid = true;
 
       add_name_and_src_coords_attributes (var_die, decl);
       if ((TREE_CODE (decl) == PARM_DECL
-	   || TREE_CODE (decl) == RESULT_DECL)
+	   || TREE_CODE (decl) == RESULT_DECL
+	   || (TREE_CODE (decl) == VAR_DECL && !TREE_STATIC (decl)))
 	  && DECL_BY_REFERENCE (decl))
-	add_type_attribute (var_die, TREE_TYPE (type), 0, 0, context_die);
+	{
+	  add_type_attribute (var_die, TREE_TYPE (type), 0, 0, context_die);
+	  /* DECL_BY_REFERENCE uses the same bit as TREE_PRIVATE,
+	     for PARM_DECL, RESULT_DECL or non-static VAR_DECL.  */
+	  private_flag_valid = false;
+	}
       else
 	add_type_attribute (var_die, type, TREE_READONLY (decl),
 			    TREE_THIS_VOLATILE (decl), context_die);
@@ -14065,7 +14074,7 @@ gen_variable_die (tree decl, tree origin
 
       if (TREE_PROTECTED (decl))
 	add_AT_unsigned (var_die, DW_AT_accessibility, DW_ACCESS_protected);
-      else if (TREE_PRIVATE (decl))
+      else if (private_flag_valid && TREE_PRIVATE (decl))
 	add_AT_unsigned (var_die, DW_AT_accessibility, DW_ACCESS_private);
     }
 
@@ -15298,7 +15307,9 @@ gen_decl_die (tree decl, tree origin, dw
 
       /* Output any DIEs that are needed to specify the type of this data
 	 object.  */
-      if (TREE_CODE (decl_or_origin) == RESULT_DECL
+      if ((TREE_CODE (decl_or_origin) == RESULT_DECL
+	   || (TREE_CODE (decl_or_origin) == VAR_DECL
+	       && !TREE_STATIC (decl_or_origin)))
           && DECL_BY_REFERENCE (decl_or_origin))
 	gen_type_die (TREE_TYPE (TREE_TYPE (decl_or_origin)), context_die);
       else
--- gcc/tree.h.jj	2009-04-06 11:48:32.000000000 +0200
+++ gcc/tree.h	2009-04-07 17:16:28.000000000 +0200
@@ -478,7 +478,7 @@ struct tree_common GTY(())
            CALL_EXPR
 
        DECL_BY_REFERENCE in
-           PARM_DECL, RESULT_DECL
+           PARM_DECL, RESULT_DECL, VAR_DECL (only !TREE_STATIC)
 
        OMP_SECTION_LAST in
            OMP_SECTION
@@ -1291,8 +1291,9 @@ extern void omp_clause_range_check_faile
 #define CALL_EXPR_RETURN_SLOT_OPT(NODE) \
   (CALL_EXPR_CHECK (NODE)->base.private_flag)
 
-/* In a RESULT_DECL or PARM_DECL, means that it is passed by invisible
-   reference (and the TREE_TYPE is a pointer to the true type).  */
+/* In a RESULT_DECL, PARM_DECL or VAR_DECL without TREE_STATIC, means that it is
+   passed by invisible reference (and the TREE_TYPE is a pointer to the true
+   type).  */
 #define DECL_BY_REFERENCE(NODE) (DECL_COMMON_CHECK (NODE)->base.private_flag)
 
 /* In a CALL_EXPR, means that the call is the jump from a thunk to the
--- gcc/tree-nested.c.jj	2009-04-06 11:47:30.000000000 +0200
+++ gcc/tree-nested.c	2009-04-08 09:50:55.000000000 +0200
@@ -827,6 +827,11 @@ get_nonlocal_debug_decl (struct nesting_
   TREE_READONLY (new_decl) = TREE_READONLY (decl);
   TREE_ADDRESSABLE (new_decl) = TREE_ADDRESSABLE (decl);
   DECL_SEEN_IN_BIND_EXPR_P (new_decl) = 1;
+  if ((TREE_CODE (decl) == PARM_DECL
+       || TREE_CODE (decl) == RESULT_DECL
+       || TREE_CODE (decl) == VAR_DECL)
+      && DECL_BY_REFERENCE (decl))
+    DECL_BY_REFERENCE (new_decl) = 1;
 
   SET_DECL_VALUE_EXPR (new_decl, x);
   DECL_HAS_VALUE_EXPR_P (new_decl) = 1;
@@ -1240,6 +1245,11 @@ get_local_debug_decl (struct nesting_inf
   TREE_READONLY (new_decl) = TREE_READONLY (decl);
   TREE_ADDRESSABLE (new_decl) = TREE_ADDRESSABLE (decl);
   DECL_SEEN_IN_BIND_EXPR_P (new_decl) = 1;
+  if ((TREE_CODE (decl) == PARM_DECL
+       || TREE_CODE (decl) == RESULT_DECL
+       || TREE_CODE (decl) == VAR_DECL)
+      && DECL_BY_REFERENCE (decl))
+    DECL_BY_REFERENCE (new_decl) = 1;
 
   SET_DECL_VALUE_EXPR (new_decl, x);
   DECL_HAS_VALUE_EXPR_P (new_decl) = 1;
@@ -1944,6 +1954,34 @@ convert_all_function_calls (struct nesti
   while (root);
 }
 
+struct nesting_copy_body_data
+{
+  copy_body_data cb;
+  struct nesting_info *root;
+};
+
+/* A helper subroutine for debug_var_chain type remapping.  */
+
+static tree
+nesting_copy_decl (tree decl, copy_body_data *id)
+{
+  struct nesting_copy_body_data *nid = (struct nesting_copy_body_data *) id;
+  void **slot = pointer_map_contains (nid->root->var_map, decl);
+
+  if (slot)
+    return (tree) *slot;
+
+  if (TREE_CODE (decl) == TYPE_DECL && DECL_ORIGINAL_TYPE (decl))
+    {
+      tree new_decl = copy_decl_no_change (decl, id);
+      DECL_ORIGINAL_TYPE (new_decl)
+	= remap_type (DECL_ORIGINAL_TYPE (decl), id);
+      return new_decl;
+    }
+
+  return copy_decl_no_change (decl, id);
+}
+
 /* Do "everything else" to clean up or complete state collected by the
    various walking passes -- lay out the types and decls, generate code
    to initialize the frame decl, store critical expressions in the
@@ -2076,10 +2114,66 @@ finalize_nesting_tree_1 (struct nesting_
     declare_vars (root->new_local_var_chain,
 		  gimple_seq_first_stmt (gimple_body (root->context)),
 		  false);
+
   if (root->debug_var_chain)
-    declare_vars (root->debug_var_chain,
-		  gimple_seq_first_stmt (gimple_body (root->context)),
-		  true);
+    {
+      tree debug_var;
+
+      for (debug_var = root->debug_var_chain; debug_var;
+	   debug_var = TREE_CHAIN (debug_var))
+	if (variably_modified_type_p (TREE_TYPE (debug_var), NULL))
+	  break;
+
+      /* If there are any debug decls with variable length types,
+	 remap those types using other debug_var_chain variables.  */
+      if (debug_var)
+	{
+	  struct nesting_copy_body_data id;
+
+	  memset (&id, 0, sizeof (id));
+	  id.cb.copy_decl = nesting_copy_decl;
+	  id.cb.decl_map = pointer_map_create ();
+	  id.root = root;
+
+	  for (; debug_var; debug_var = TREE_CHAIN (debug_var))
+	    if (variably_modified_type_p (TREE_TYPE (debug_var), NULL))
+	      {
+		tree type = TREE_TYPE (debug_var);
+		tree newt, t = type;
+		struct nesting_info *i;
+
+		for (i = root; i; i = i->outer)
+		  if (variably_modified_type_p (type, i->context))
+		    break;
+
+		if (i == NULL)
+		  continue;
+
+		id.cb.src_fn = i->context;
+		id.cb.dst_fn = i->context;
+		id.cb.src_cfun = DECL_STRUCT_FUNCTION (root->context);
+
+		TREE_TYPE (debug_var) = newt = remap_type (type, &id.cb);
+		while (POINTER_TYPE_P (newt) && !TYPE_NAME (newt))
+		  {
+		    newt = TREE_TYPE (newt);
+		    t = TREE_TYPE (t);
+		  }
+		if (TYPE_NAME (newt)
+		    && TREE_CODE (TYPE_NAME (newt)) == TYPE_DECL
+		    && DECL_ORIGINAL_TYPE (TYPE_NAME (newt))
+		    && newt != t
+		    && TYPE_NAME (newt) == TYPE_NAME (t))
+		  TYPE_NAME (newt) = remap_decl (TYPE_NAME (newt), &id.cb);
+	      }
+
+	  pointer_map_destroy (id.cb.decl_map);
+	}
+
+      declare_vars (root->debug_var_chain,
+		    gimple_seq_first_stmt (gimple_body (root->context)),
+		    true);
+    }
 
   /* Dump the translated tree function.  */
   dump_function (TDI_nested, root->context);
--- gcc/dbxout.c.jj	2009-04-06 11:47:29.000000000 +0200
+++ gcc/dbxout.c	2009-04-07 17:16:27.000000000 +0200
@@ -1397,7 +1397,9 @@ dbxout_type_index (tree type)
 /* Used in several places: evaluates to '0' for a private decl,
    '1' for a protected decl, '2' for a public decl.  */
 #define DECL_ACCESSIBILITY_CHAR(DECL) \
-(TREE_PRIVATE (DECL) ? '0' : TREE_PROTECTED (DECL) ? '1' : '2')
+((TREE_CODE (DECL) != PARM_DECL && TREE_CODE (DECL) != RESULT_DECL \
+  && (TREE_CODE (DECL) != VAR_DECL || TREE_STATIC (DECL)) \
+  && TREE_PRIVATE (DECL)) ? '0' : TREE_PROTECTED (DECL) ? '1' : '2')
 
 /* Subroutine of `dbxout_type'.  Output the type fields of TYPE.
    This must be a separate function because anonymous unions require

gcc44-rh459374-2.patch:

--- NEW FILE gcc44-rh459374-2.patch ---
2009-04-08  Jakub Jelinek  <jakub at redhat.com>

	* dwarf2out.c (loc_descr_plus_const): New function.
	(build_cfa_aligned_loc, tls_mem_loc_descriptor,
	mem_loc_descriptor, loc_descriptor_from_tree_1,
	descr_info_loc, gen_variable_die): Use it.

--- gcc/dwarf2out.c.jj	2009-04-08 11:10:16.000000000 +0200
+++ gcc/dwarf2out.c	2009-04-08 12:52:16.000000000 +0200
@@ -3890,6 +3890,47 @@ add_loc_descr (dw_loc_descr_ref *list_he
   *d = descr;
 }
 
+/* Add a constant OFFSET to a location expression.  */
+
+static void
+loc_descr_plus_const (dw_loc_descr_ref *list_head, HOST_WIDE_INT offset)
+{
+  dw_loc_descr_ref loc;
+  HOST_WIDE_INT *p;
+
+  gcc_assert (*list_head != NULL);
+
+  if (!offset)
+    return;
+
+  /* Find the end of the chain.  */
+  for (loc = *list_head; loc->dw_loc_next != NULL; loc = loc->dw_loc_next)
+    ;
+
+  p = NULL;
+  if (loc->dw_loc_opc == DW_OP_fbreg
+      || (loc->dw_loc_opc >= DW_OP_breg0 && loc->dw_loc_opc <= DW_OP_breg31))
+    p = &loc->dw_loc_oprnd1.v.val_int;
+  else if (loc->dw_loc_opc == DW_OP_bregx)
+    p = &loc->dw_loc_oprnd2.v.val_int;
+
+  /* If the last operation is fbreg, breg{0..31,x}, optimize by adjusting its
+     offset.  Don't optimize if an signed integer overflow would happen.  */
+  if (p != NULL
+      && ((offset > 0 && *p <= INTTYPE_MAXIMUM (HOST_WIDE_INT) - offset)
+	  || (offset < 0 && *p >= INTTYPE_MINIMUM (HOST_WIDE_INT) - offset)))
+    *p += offset;
+
+  else if (offset > 0)
+    loc->dw_loc_next = new_loc_descr (DW_OP_plus_uconst, offset, 0);
+
+  else
+    {
+      loc->dw_loc_next = int_loc_descriptor (offset);
+      add_loc_descr (&loc->dw_loc_next, new_loc_descr (DW_OP_plus, 0, 0));
+    }
+}
+
 /* Return the size of a location descriptor.  */
 
 static unsigned long
@@ -4409,9 +4450,7 @@ build_cfa_aligned_loc (HOST_WIDE_INT off
       head = new_reg_loc_descr (dwarf_fp, 0);
       add_loc_descr (&head, int_loc_descriptor (alignment));
       add_loc_descr (&head, new_loc_descr (DW_OP_and, 0, 0));
-
-      add_loc_descr (&head, int_loc_descriptor (offset));
-      add_loc_descr (&head, new_loc_descr (DW_OP_plus, 0, 0));
+      loc_descr_plus_const (&head, offset);
     }
   else
     head = new_reg_loc_descr (dwarf_fp, offset);
@@ -9913,7 +9952,7 @@ static dw_loc_descr_ref
 tls_mem_loc_descriptor (rtx mem)
 {
   tree base;
-  dw_loc_descr_ref loc_result, loc_result2;
+  dw_loc_descr_ref loc_result;
 
   if (MEM_EXPR (mem) == NULL_TREE || MEM_OFFSET (mem) == NULL_RTX)
     return NULL;
@@ -9929,21 +9968,7 @@ tls_mem_loc_descriptor (rtx mem)
     return NULL;
 
   if (INTVAL (MEM_OFFSET (mem)))
-    {
-      if (INTVAL (MEM_OFFSET (mem)) >= 0)
-	add_loc_descr (&loc_result,
-		       new_loc_descr (DW_OP_plus_uconst,
-				      INTVAL (MEM_OFFSET (mem)), 0));
-      else
-	{
-	  loc_result2 = mem_loc_descriptor (MEM_OFFSET (mem), GET_MODE (mem),
-					    VAR_INIT_STATUS_INITIALIZED);
-	  if (loc_result2 == 0)
-	    return NULL;
-	  add_loc_descr (&loc_result, loc_result2);
-	  add_loc_descr (&loc_result, new_loc_descr (DW_OP_plus, 0, 0));
-	}
-    }
+    loc_descr_plus_const (&loc_result, INTVAL (MEM_OFFSET (mem)));
 
   return loc_result;
 }
@@ -10108,11 +10133,8 @@ mem_loc_descriptor (rtx rtl, enum machin
 	  if (mem_loc_result == 0)
 	    break;
 
-	  if (GET_CODE (XEXP (rtl, 1)) == CONST_INT
-	      && INTVAL (XEXP (rtl, 1)) >= 0)
-	    add_loc_descr (&mem_loc_result,
-			   new_loc_descr (DW_OP_plus_uconst,
-					  INTVAL (XEXP (rtl, 1)), 0));
+	  if (GET_CODE (XEXP (rtl, 1)) == CONST_INT)
+	    loc_descr_plus_const (&mem_loc_result, INTVAL (XEXP (rtl, 1)));
 	  else
 	    {
 	      dw_loc_descr_ref mem_loc_result2
@@ -10526,13 +10548,7 @@ loc_descriptor_from_tree_1 (tree loc, in
 	  }
 
 	bytepos = bitpos / BITS_PER_UNIT;
-	if (bytepos > 0)
-	  add_loc_descr (&ret, new_loc_descr (DW_OP_plus_uconst, bytepos, 0));
-	else if (bytepos < 0)
-	  {
-	    add_loc_descr (&ret, int_loc_descriptor (bytepos));
-	    add_loc_descr (&ret, new_loc_descr (DW_OP_plus, 0, 0));
-	  }
+	loc_descr_plus_const (&ret, bytepos);
 
 	have_address = 1;
 	break;
@@ -10616,11 +10632,7 @@ loc_descriptor_from_tree_1 (tree loc, in
 	  if (ret == 0)
 	    return 0;
 
-	  add_loc_descr (&ret,
-			 new_loc_descr (DW_OP_plus_uconst,
-					tree_low_cst (TREE_OPERAND (loc, 1),
-						      0),
-					0));
+	  loc_descr_plus_const (&ret, tree_low_cst (TREE_OPERAND (loc, 1), 0));
 	  break;
 	}
 
@@ -13001,10 +13013,7 @@ descr_info_loc (tree val, tree base_decl
 	  loc = descr_info_loc (TREE_OPERAND (val, 0), base_decl);
 	  if (!loc)
 	    break;
-	  add_loc_descr (&loc,
-			 new_loc_descr (DW_OP_plus_uconst,
-					tree_low_cst (TREE_OPERAND (val, 1),
-						      1), 0));
+	  loc_descr_plus_const (&loc, tree_low_cst (TREE_OPERAND (val, 1), 0));
 	}
       else
 	{
@@ -13920,9 +13929,7 @@ gen_variable_die (tree decl, tree origin
 			loc->dw_loc_oprnd1.v.val_addr
 			  = plus_constant (loc->dw_loc_oprnd1.v.val_addr, off);
 			else
-			  add_loc_descr (&loc,
-					 new_loc_descr (DW_OP_plus_uconst,
-							off, 0));
+			  loc_descr_plus_const (&loc, off);
 		    }
 		  add_AT_loc (var_die, DW_AT_location, loc);
 		  remove_AT (var_die, DW_AT_declaration);
@@ -13985,8 +13992,7 @@ gen_variable_die (tree decl, tree origin
 		loc->dw_loc_oprnd1.v.val_addr
 		  = plus_constant (loc->dw_loc_oprnd1.v.val_addr, off);
 	      else
-		add_loc_descr (&loc, new_loc_descr (DW_OP_plus_uconst,
-						    off, 0));
+		loc_descr_plus_const (&loc, off);
 	    }
 	  add_AT_loc (var_die, DW_AT_location, loc);
 	}

gcc44-rh459374-3.patch:

--- NEW FILE gcc44-rh459374-3.patch ---
2009-04-22  Jakub Jelinek  <jakub at redhat.com>

	* tree-nested.c (get_nonlocal_vla_type): If not optimizing, call
	note_nonlocal_vla_type for nonlocal VLAs.
	(note_nonlocal_vla_type, note_nonlocal_block_vlas,
	contains_remapped_vars, remap_vla_decls): New functions.
	(convert_nonlocal_reference_stmt): If not optimizing, call
	note_nonlocal_block_vlas on GIMPLE_BIND block vars.
	(nesting_copy_decl): Return {VAR,PARM,RESULT}_DECL unmodified
	if it wasn't found in var_map.
	(finalize_nesting_tree_1): Call remap_vla_decls.  If outermost
	GIMPLE_BIND doesn't have gimple_bind_block, chain debug_var_chain
	to BLOCK_VARS (DECL_INITIAL (root->context)) instead of calling
	declare_vars.
	* gimplify.c (nonlocal_vlas): New variable.
	(gimplify_var_or_parm_decl): Add debug VAR_DECLs for non-local
	referenced VLAs.
	(gimplify_body): Create and destroy nonlocal_vlas.

	* trans-decl.c: Include pointer-set.h.
	(nonlocal_dummy_decl_pset, tree nonlocal_dummy_decls): New variables.
	(gfc_nonlocal_dummy_array_decl): New function.
	(gfc_get_symbol_decl): Call it for non-local dummy args with saved
	descriptor.
	(gfc_get_symbol_decl): Set DECL_BY_REFERENCE when needed.
	(gfc_generate_function_code): Initialize nonlocal_dummy_decl{s,_pset},
	chain it to outermost block's vars, destroy it afterwards.

	* Make-lang.in (trans-decl.o): Depend on pointer-set.h.

--- gcc/tree-nested.c.jj	2009-04-21 19:24:25.000000000 +0200
+++ gcc/tree-nested.c	2009-04-22 10:18:38.000000000 +0200
@@ -770,6 +770,7 @@ get_frame_field (struct nesting_info *in
   return x;
 }
 
+static void note_nonlocal_vla_type (struct nesting_info *info, tree type);
 
 /* A subroutine of convert_nonlocal_reference_op.  Create a local variable
    in the nested function with DECL_VALUE_EXPR set to reference the true
@@ -840,6 +841,11 @@ get_nonlocal_debug_decl (struct nesting_
   TREE_CHAIN (new_decl) = info->debug_var_chain;
   info->debug_var_chain = new_decl;
 
+  if (!optimize
+      && info->context != target_context
+      && variably_modified_type_p (TREE_TYPE (decl), NULL))
+    note_nonlocal_vla_type (info, TREE_TYPE (decl));
+
   return new_decl;
 }
 
@@ -1111,6 +1117,60 @@ convert_nonlocal_omp_clauses (tree *pcla
   return need_chain;
 }
 
+/* Create nonlocal debug decls for nonlocal VLA array bounds.  */
+
+static void
+note_nonlocal_vla_type (struct nesting_info *info, tree type)
+{
+  while (POINTER_TYPE_P (type) && !TYPE_NAME (type))
+    type = TREE_TYPE (type);
+
+  if (TYPE_NAME (type)
+      && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
+      && DECL_ORIGINAL_TYPE (TYPE_NAME (type)))
+    type = DECL_ORIGINAL_TYPE (TYPE_NAME (type));
+
+  while (POINTER_TYPE_P (type)
+	 || TREE_CODE (type) == VECTOR_TYPE
+	 || TREE_CODE (type) == FUNCTION_TYPE
+	 || TREE_CODE (type) == METHOD_TYPE)
+    type = TREE_TYPE (type);
+
+  if (TREE_CODE (type) == ARRAY_TYPE)
+    {
+      tree domain, t;
+
+      note_nonlocal_vla_type (info, TREE_TYPE (type));
+      domain = TYPE_DOMAIN (type);
+      if (domain)
+	{
+	  t = TYPE_MIN_VALUE (domain);
+	  if (t && (TREE_CODE (t) == VAR_DECL || TREE_CODE (t) == PARM_DECL)
+	      && decl_function_context (t) != info->context)
+	    get_nonlocal_debug_decl (info, t);
+	  t = TYPE_MAX_VALUE (domain);
+	  if (t && (TREE_CODE (t) == VAR_DECL || TREE_CODE (t) == PARM_DECL)
+	      && decl_function_context (t) != info->context)
+	    get_nonlocal_debug_decl (info, t);
+	}
+    }
+}
+
+/* Create nonlocal debug decls for nonlocal VLA array bounds for VLAs
+   in BLOCK.  */
+
+static void
+note_nonlocal_block_vlas (struct nesting_info *info, tree block)
+{
+  tree var;
+
+  for (var = BLOCK_VARS (block); var; var = TREE_CHAIN (var))
+    if (TREE_CODE (var) == VAR_DECL
+	&& variably_modified_type_p (TREE_TYPE (var), NULL)
+	&& DECL_HAS_VALUE_EXPR_P (var)
+	&& decl_function_context (var) != info->context)
+      note_nonlocal_vla_type (info, TREE_TYPE (var));
+}
 
 /* Callback for walk_gimple_stmt.  Rewrite all references to VAR and
    PARM_DECLs that belong to outer functions.  This handles statements
@@ -1202,6 +1262,13 @@ convert_nonlocal_reference_stmt (gimple_
 	         info, gimple_omp_body (stmt));
       break;
 
+    case GIMPLE_BIND:
+      if (!optimize && gimple_bind_block (stmt))
+	note_nonlocal_block_vlas (info, gimple_bind_block (stmt));
+
+      *handled_ops_p = false;
+      return NULL_TREE;
+
     default:
       /* For every other statement that we are not interested in
 	 handling here, let the walker traverse the operands.  */
@@ -1979,9 +2046,117 @@ nesting_copy_decl (tree decl, copy_body_
       return new_decl;
     }
 
+  if (TREE_CODE (decl) == VAR_DECL
+      || TREE_CODE (decl) == PARM_DECL
+      || TREE_CODE (decl) == RESULT_DECL)
+    return decl;
+
   return copy_decl_no_change (decl, id);
 }
 
+/* A helper function for remap_vla_decls.  See if *TP contains
+   some remapped variables.  */
+
+static tree
+contains_remapped_vars (tree *tp, int *walk_subtrees, void *data)
+{
+  struct nesting_info *root = (struct nesting_info *) data;
+  tree t = *tp;
+  void **slot;
+
+  if (DECL_P (t))
+    {
+      *walk_subtrees = 0;
+      slot = pointer_map_contains (root->var_map, t);
+
+      if (slot)
+	return (tree) *slot;
+    }
+  return NULL;
+}
+
+/* Remap VLA decls in BLOCK and subblocks if remapped variables are
+   involved.  */
+
+static void
+remap_vla_decls (tree block, struct nesting_info *root)
+{
+  tree var, subblock, val, type;
+  struct nesting_copy_body_data id;
+
+  for (subblock = BLOCK_SUBBLOCKS (block);
+       subblock;
+       subblock = BLOCK_CHAIN (subblock))
+    remap_vla_decls (subblock, root);
+
+  for (var = BLOCK_VARS (block); var; var = TREE_CHAIN (var))
+    {
+      if (TREE_CODE (var) == VAR_DECL
+	  && variably_modified_type_p (TREE_TYPE (var), NULL)
+	  && DECL_HAS_VALUE_EXPR_P (var))
+	{
+	  type = TREE_TYPE (var);
+	  val = DECL_VALUE_EXPR (var);
+	  if (walk_tree (&type, contains_remapped_vars, root, NULL) != NULL
+	      ||  walk_tree (&val, contains_remapped_vars, root, NULL) != NULL)
+	    break;
+	}
+    }
+  if (var == NULL_TREE)
+    return;
+
+  memset (&id, 0, sizeof (id));
+  id.cb.copy_decl = nesting_copy_decl;
+  id.cb.decl_map = pointer_map_create ();
+  id.root = root;
+
+  for (; var; var = TREE_CHAIN (var))
+    if (TREE_CODE (var) == VAR_DECL
+	&& variably_modified_type_p (TREE_TYPE (var), NULL)
+	&& DECL_HAS_VALUE_EXPR_P (var))
+      {
+	struct nesting_info *i;
+	tree newt, t, context;
+
+	t = type = TREE_TYPE (var);
+	val = DECL_VALUE_EXPR (var);
+	if (walk_tree (&type, contains_remapped_vars, root, NULL) == NULL
+	    && walk_tree (&val, contains_remapped_vars, root, NULL) == NULL)
+	  continue;
+
+	context = decl_function_context (var);
+	for (i = root; i; i = i->outer)
+	  if (i->context == context)
+	    break;
+
+	if (i == NULL)
+	  continue;
+
+	id.cb.src_fn = i->context;
+	id.cb.dst_fn = i->context;
+	id.cb.src_cfun = DECL_STRUCT_FUNCTION (root->context);
+
+	TREE_TYPE (var) = newt = remap_type (type, &id.cb);
+	while (POINTER_TYPE_P (newt) && !TYPE_NAME (newt))
+	  {
+	    newt = TREE_TYPE (newt);
+	    t = TREE_TYPE (t);
+	  }
+	if (TYPE_NAME (newt)
+	    && TREE_CODE (TYPE_NAME (newt)) == TYPE_DECL
+	    && DECL_ORIGINAL_TYPE (TYPE_NAME (newt))
+	    && newt != t
+	    && TYPE_NAME (newt) == TYPE_NAME (t))
+	  TYPE_NAME (newt) = remap_decl (TYPE_NAME (newt), &id.cb);
+
+	walk_tree (&val, copy_tree_body_r, &id.cb, NULL);
+	if (val != DECL_VALUE_EXPR (var))
+	  SET_DECL_VALUE_EXPR (var, val);
+      }
+
+  pointer_map_destroy (id.cb.decl_map);
+}
+
 /* Do "everything else" to clean up or complete state collected by the
    various walking passes -- lay out the types and decls, generate code
    to initialize the frame decl, store critical expressions in the
@@ -2118,6 +2293,9 @@ finalize_nesting_tree_1 (struct nesting_
   if (root->debug_var_chain)
     {
       tree debug_var;
+      gimple scope;
+
+      remap_vla_decls (DECL_INITIAL (root->context), root);
 
       for (debug_var = root->debug_var_chain; debug_var;
 	   debug_var = TREE_CHAIN (debug_var))
@@ -2170,9 +2348,13 @@ finalize_nesting_tree_1 (struct nesting_
 	  pointer_map_destroy (id.cb.decl_map);
 	}
 
-      declare_vars (root->debug_var_chain,
-		    gimple_seq_first_stmt (gimple_body (root->context)),
-		    true);
+      scope = gimple_seq_first_stmt (gimple_body (root->context));
+      if (gimple_bind_block (scope))
+	declare_vars (root->debug_var_chain, scope, true);
+      else
+	BLOCK_VARS (DECL_INITIAL (root->context))
+	  = chainon (BLOCK_VARS (DECL_INITIAL (root->context)),
+		     root->debug_var_chain);
     }
 
   /* Dump the translated tree function.  */
--- gcc/gimplify.c.jj	2009-04-21 19:23:29.000000000 +0200
+++ gcc/gimplify.c	2009-04-22 00:20:41.000000000 +0200
@@ -1851,6 +1851,9 @@ gimplify_conversion (tree *expr_p)
   return GS_OK;
 }
 
+/* Nonlocal VLAs seen in the current function.  */
+static struct pointer_set_t *nonlocal_vlas;
+
 /* Gimplify a VAR_DECL or PARM_DECL.  Returns GS_OK if we expanded a 
    DECL_VALUE_EXPR, and it's worth re-examining things.  */
 
@@ -1881,7 +1884,36 @@ gimplify_var_or_parm_decl (tree *expr_p)
   /* If the decl is an alias for another expression, substitute it now.  */
   if (DECL_HAS_VALUE_EXPR_P (decl))
     {
-      *expr_p = unshare_expr (DECL_VALUE_EXPR (decl));
+      tree value_expr = DECL_VALUE_EXPR (decl);
+
+      /* For referenced nonlocal VLAs add a decl for debugging purposes
+	 to the current function.  */
+      if (TREE_CODE (decl) == VAR_DECL
+	  && TREE_CODE (DECL_SIZE_UNIT (decl)) != INTEGER_CST
+	  && nonlocal_vlas != NULL
+	  && TREE_CODE (value_expr) == INDIRECT_REF
+	  && TREE_CODE (TREE_OPERAND (value_expr, 0)) == VAR_DECL
+	  && decl_function_context (decl) != current_function_decl)
+	{
+	  struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp;
+	  while (ctx && ctx->region_type == ORT_WORKSHARE)
+	    ctx = ctx->outer_context;
+	  if (!ctx && !pointer_set_insert (nonlocal_vlas, decl))
+	    {
+	      tree copy = copy_node (decl), block;
+
+	      lang_hooks.dup_lang_specific_decl (copy);
+	      SET_DECL_RTL (copy, NULL_RTX);
+	      TREE_USED (copy) = 1;
+	      block = DECL_INITIAL (current_function_decl);
+	      TREE_CHAIN (copy) = BLOCK_VARS (block);
+	      BLOCK_VARS (block) = copy;
+	      SET_DECL_VALUE_EXPR (copy, unshare_expr (value_expr));
+	      DECL_HAS_VALUE_EXPR_P (copy) = 1;
+	    }
+	}
+
+      *expr_p = unshare_expr (value_expr);
       return GS_OK;
     }
 
@@ -7359,6 +7391,9 @@ gimplify_body (tree *body_p, tree fndecl
   unshare_body (body_p, fndecl);
   unvisit_body (body_p, fndecl);
 
+  if (cgraph_node (fndecl)->origin)
+    nonlocal_vlas = pointer_set_create ();
+
   /* Make sure input_location isn't set to something weird.  */
   input_location = DECL_SOURCE_LOCATION (fndecl);
 
@@ -7394,6 +7429,12 @@ gimplify_body (tree *body_p, tree fndecl
       gimple_bind_set_body (outer_bind, parm_stmts);
     }
 
+  if (nonlocal_vlas)
+    {
+      pointer_set_destroy (nonlocal_vlas);
+      nonlocal_vlas = NULL;
+    }
+
   pop_gimplify_context (outer_bind);
   gcc_assert (gimplify_ctxp == NULL);
 
--- gcc/fortran/Make-lang.in.jj	2008-12-11 13:30:28.000000000 +0100
+++ gcc/fortran/Make-lang.in	2009-04-21 19:26:35.000000000 +0200
@@ -319,7 +319,7 @@ fortran/convert.o: $(GFORTRAN_TRANS_DEPS
 fortran/trans.o: $(GFORTRAN_TRANS_DEPS) tree-iterator.h
 fortran/trans-decl.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-decl.h \
   $(CGRAPH_H) $(TARGET_H) $(FUNCTION_H) $(FLAGS_H) $(RTL_H) $(GIMPLE_H) \
-  $(TREE_DUMP_H) debug.h
+  $(TREE_DUMP_H) debug.h pointer-set.h
 fortran/trans-types.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-types.h \
   $(REAL_H) toplev.h $(TARGET_H) $(FLAGS_H) dwarf2out.h
 fortran/trans-const.o: $(GFORTRAN_TRANS_DEPS)
--- gcc/fortran/trans-decl.c.jj	2009-04-14 10:18:29.000000000 +0200
+++ gcc/fortran/trans-decl.c	2009-04-21 19:26:35.000000000 +0200
@@ -37,6 +37,7 @@ along with GCC; see the file COPYING3.  
 #include "cgraph.h"
 #include "debug.h"
 #include "gfortran.h"
+#include "pointer-set.h"
 #include "trans.h"
 #include "trans-types.h"
 #include "trans-array.h"
@@ -60,6 +61,8 @@ static GTY(()) tree current_function_ret
 static GTY(()) tree saved_function_decls;
 static GTY(()) tree saved_parent_function_decls;
 
+static struct pointer_set_t *nonlocal_dummy_decl_pset;
+static GTY(()) tree nonlocal_dummy_decls;
 
 /* The namespace of the module we're currently generating.  Only used while
    outputting decls for module variables.  Do not rely on this being set.  */
@@ -870,6 +873,38 @@ gfc_build_dummy_array_decl (gfc_symbol *
   return decl;
 }
 
+/* For symbol SYM with GFC_DECL_SAVED_DESCRIPTOR used in contained
+   function add a VAR_DECL to the current function with DECL_VALUE_EXPR
+   pointing to the artificial variable for debug info purposes.  */
+
+static void
+gfc_nonlocal_dummy_array_decl (gfc_symbol *sym)
+{
+  tree decl, dummy;
+
+  if (! nonlocal_dummy_decl_pset)
+    nonlocal_dummy_decl_pset = pointer_set_create ();
+
+  if (pointer_set_insert (nonlocal_dummy_decl_pset, sym->backend_decl))
+    return;
+
+  dummy = GFC_DECL_SAVED_DESCRIPTOR (sym->backend_decl);
+  decl = build_decl (VAR_DECL, DECL_NAME (dummy),
+		     TREE_TYPE (sym->backend_decl));
+  DECL_ARTIFICIAL (decl) = 0;
+  TREE_USED (decl) = 1;
+  TREE_PUBLIC (decl) = 0;
+  TREE_STATIC (decl) = 0;
+  DECL_EXTERNAL (decl) = 0;
+  if (DECL_BY_REFERENCE (dummy))
+    DECL_BY_REFERENCE (decl) = 1;
+  DECL_LANG_SPECIFIC (decl) = DECL_LANG_SPECIFIC (sym->backend_decl);
+  SET_DECL_VALUE_EXPR (decl, sym->backend_decl);
+  DECL_HAS_VALUE_EXPR_P (decl) = 1;
+  DECL_CONTEXT (decl) = DECL_CONTEXT (sym->backend_decl);
+  TREE_CHAIN (decl) = nonlocal_dummy_decls;
+  nonlocal_dummy_decls = decl;
+}
 
 /* Return a constant or a variable to use as a string length.  Does not
    add the decl to the current scope.  */
@@ -1010,6 +1045,13 @@ gfc_get_symbol_decl (gfc_symbol * sym)
 	{
 	  gfc_add_assign_aux_vars (sym);
 	}
+
+      if (sym->attr.dimension
+	  && DECL_LANG_SPECIFIC (sym->backend_decl)
+	  && GFC_DECL_SAVED_DESCRIPTOR (sym->backend_decl)
+	  && DECL_CONTEXT (sym->backend_decl) != current_function_decl)
+	gfc_nonlocal_dummy_array_decl (sym);
+
       return sym->backend_decl;
     }
 
@@ -1129,6 +1171,13 @@ gfc_get_symbol_decl (gfc_symbol * sym)
 	  sym->attr.pointer || sym->attr.allocatable);
     }
 
+  if (!TREE_STATIC (decl)
+      && POINTER_TYPE_P (TREE_TYPE (decl))
+      && !sym->attr.pointer
+      && !sym->attr.allocatable
+      && !sym->attr.proc_pointer)
+    DECL_BY_REFERENCE (decl) = 1;
+
   return decl;
 }
 
@@ -3852,6 +3901,9 @@ gfc_generate_function_code (gfc_namespac
 
   gfc_generate_contained_functions (ns);
 
+  nonlocal_dummy_decls = NULL;
+  nonlocal_dummy_decl_pset = NULL;
+
   generate_local_vars (ns);
 
   /* Keep the parent fake result declaration in module functions
@@ -4111,6 +4163,15 @@ gfc_generate_function_code (gfc_namespac
     = build3_v (BIND_EXPR, decl, DECL_SAVED_TREE (fndecl),
 		DECL_INITIAL (fndecl));
 
+  if (nonlocal_dummy_decls)
+    {
+      BLOCK_VARS (DECL_INITIAL (fndecl))
+	= chainon (BLOCK_VARS (DECL_INITIAL (fndecl)), nonlocal_dummy_decls);
+      pointer_set_destroy (nonlocal_dummy_decl_pset);
+      nonlocal_dummy_decls = NULL;
+      nonlocal_dummy_decl_pset = NULL;
+    }
+
   /* Output the GENERIC tree.  */
   dump_function (TDI_original, fndecl);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/.cvsignore,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- .cvsignore	20 Apr 2009 19:37:35 -0000	1.269
+++ .cvsignore	22 Apr 2009 19:01:26 -0000	1.270
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090420.tar.bz2
+gcc-4.4.0-20090422.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gcc.spec	20 Apr 2009 20:25:17 -0000	1.43
+++ gcc.spec	22 Apr 2009 19:01:26 -0000	1.44
@@ -1,9 +1,9 @@
-%define DATE 20090420
-%define SVNREV 146449
+%define DATE 20090422
+%define SVNREV 146590
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 0.35
+%define gcc_release 1
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -150,6 +150,12 @@
 Patch26: gcc44-power7.patch
 Patch28: gcc44-pr38757.patch
 Patch30: gcc44-pr39543.patch
+Patch31: gcc44-find_base_term.patch
+Patch32: gcc44-pr39794.patch
+Patch33: gcc44-rh459374-1.patch
+Patch34: gcc44-rh459374-2.patch
+Patch35: gcc44-rh459374-3.patch
+Patch36: gcc44-cswtch.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -437,7 +443,13 @@
 %patch24 -p0 -b .atom~
 %patch26 -p0 -b .power7~
 %patch28 -p0 -b .pr38757~
-#%patch30 -p0 -b .pr39543~
+%patch30 -p0 -b .pr39543~
+%patch31 -p0 -b .find_base_term~
+%patch32 -p0 -b .pr39794~
+%patch33 -p0 -b .rh459374-1~
+%patch34 -p0 -b .rh459374-2~
+%patch35 -p0 -b .rh459374-3~
+%patch36 -p0 -b .cswtch~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1748,6 +1760,15 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Apr 22 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-1
+- update from gcc-4_4-branch
+  - GCC 4.4.0 release
+  - PR libstdc++/39802
+- fix up DSE (PR middle-end/39794)
+- debuginfo fixes for VLA and nested/contained functions (#459374)
+- improve -ftree-switch-conversion optimization if the constant is the
+  same in all cases
+
 * Mon Apr 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.35
 - update from gcc-4_4-branch
   - PRs middle-end/39804, target/39678, target/39767, tree-optimization/39675,
@@ -1827,7 +1848,7 @@
 - fix memcmp builtin asm redirection (PR middle-end/39443)
 - fix sparcv9 profiledbootstrap (PR bootstrap/39454)
 
-* Thu Mar 12 2009 Dennis Gilmore <dennis at ausil.us> 
+* Thu Mar 12 2009 Dennis Gilmore <dennis at ausil.us>
 - don't build with graphite support on sparc arches
   - still missing some deps
 

gcc44-pr39543.patch:

Index: gcc44-pr39543.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc44-pr39543.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc44-pr39543.patch	14 Apr 2009 15:46:16 -0000	1.2
+++ gcc44-pr39543.patch	22 Apr 2009 19:01:26 -0000	1.3
@@ -1,6 +1,6 @@
-2009-04-10  Jakub Jelinek  <jakub at redhat.com>
+2009-04-22  Jakub Jelinek  <jakub at redhat.com>
 
-	PR rtl-optimization/39543
+	PR inline-asm/39543
 	* fwprop.c (forward_propagate_asm): New function.
 	(forward_propagate_and_simplify): Propagate also into __asm, if it
 	doesn't increase the number of referenced registers.
@@ -140,7 +140,7 @@
 --- gcc/testsuite/gcc.target/i386/pr39543-1.c.jj	2009-04-09 09:47:16.000000000 +0200
 +++ gcc/testsuite/gcc.target/i386/pr39543-1.c	2009-04-09 09:47:16.000000000 +0200
 @@ -0,0 +1,52 @@
-+/* PR rtl-optimization/39543 */
++/* PR inline-asm/39543 */
 +/* { dg-do compile } */
 +/* { dg-options "-O3 -fomit-frame-pointer" } */
 +
@@ -195,7 +195,7 @@
 --- gcc/testsuite/gcc.target/i386/pr39543-2.c.jj	2009-04-09 09:47:16.000000000 +0200
 +++ gcc/testsuite/gcc.target/i386/pr39543-2.c	2009-04-09 09:47:16.000000000 +0200
 @@ -0,0 +1,51 @@
-+/* PR rtl-optimization/39543 */
++/* PR inline-asm/39543 */
 +/* { dg-do compile } */
 +/* { dg-options "-O3" } */
 +
@@ -249,7 +249,7 @@
 --- gcc/testsuite/gcc.target/i386/pr39543-3.c.jj	2009-04-09 09:47:16.000000000 +0200
 +++ gcc/testsuite/gcc.target/i386/pr39543-3.c	2009-04-09 09:47:16.000000000 +0200
 @@ -0,0 +1,42 @@
-+/* PR rtl-optimization/39543 */
++/* PR inline-asm/39543 */
 +/* { dg-do compile } */
 +/* { dg-options "-O2" } */
 +


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/sources,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- sources	20 Apr 2009 19:37:35 -0000	1.272
+++ sources	22 Apr 2009 19:01:27 -0000	1.273
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-1e900acdd986c1a3971169e89f70ce94  gcc-4.4.0-20090420.tar.bz2
+095942097cf529c8064c51f07b8fc0b7  gcc-4.4.0-20090422.tar.bz2



From dwalsh at fedoraproject.org  Wed Apr 22 19:17:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 22 Apr 2009 19:17:23 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.97,
	1.98 selinux-policy.spec, 1.832, 1.833
Message-ID: <20090422191724.26F16700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Apr 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-12
- Allow sshd to read var_lib symlinks for freenx


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- policy-20090105.patch	21 Apr 2009 20:10:57 -0000	1.97
+++ policy-20090105.patch	22 Apr 2009 19:17:13 -0000	1.98
@@ -459,10 +459,41 @@
  ')
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.12/policy/modules/admin/dmesg.fc
+--- nsaserefpolicy/policy/modules/admin/dmesg.fc	2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/dmesg.fc	2009-04-22 14:17:05.000000000 -0400
+@@ -1,2 +1,4 @@
+ 
+ /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
++
++/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.12/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/dmesg.te	2009-04-07 16:01:44.000000000 -0400
-@@ -35,7 +35,7 @@
++++ serefpolicy-3.6.12/policy/modules/admin/dmesg.te	2009-04-22 14:39:11.000000000 -0400
+@@ -9,6 +9,7 @@
+ type dmesg_t;
+ type dmesg_exec_t;
+ init_system_domain(dmesg_t, dmesg_exec_t)
++cron_system_entry(dmesg_t, dmesg_exec_t)
+ 
+ ########################################
+ #
+@@ -20,12 +21,14 @@
+ 
+ allow dmesg_t self:process signal_perms;
+ 
++kernel_read_system_state(dmesg_t)
+ kernel_read_kernel_sysctls(dmesg_t)
+ kernel_read_ring_buffer(dmesg_t)
+ kernel_clear_ring_buffer(dmesg_t)
+ kernel_change_ring_buffer_level(dmesg_t)
+ kernel_list_proc(dmesg_t)
+ kernel_read_proc_symlinks(dmesg_t)
++dev_read_kmsg(dmesg_t)
+ 
+ dev_read_sysfs(dmesg_t)
+ 
+@@ -35,7 +38,7 @@
  
  domain_use_interactive_fds(dmesg_t)
  
@@ -3055,8 +3086,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.12/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-17 11:13:07.000000000 -0400
-@@ -0,0 +1,293 @@
++++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-22 13:50:31.000000000 -0400
+@@ -0,0 +1,294 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3086,7 +3117,8 @@
 +application_executable_file(nsplugin_config_exec_t)
 +
 +type nsplugin_rw_t;
-+files_type(nsplugin_rw_t)
++files_poly_member(nsplugin_rw_t)
++userdom_user_home_content(nsplugin_rw_t)
 +
 +type nsplugin_tmp_t;
 +files_tmp_file(nsplugin_tmp_t)
@@ -3611,7 +3643,7 @@
 +/usr/bin/pulseaudio	--	gen_context(system_u:object_r:pulseaudio_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.12/policy/modules/apps/pulseaudio.if
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.if	2009-04-22 13:29:00.000000000 -0400
 @@ -0,0 +1,148 @@
 +
 +## <summary>policy for pulseaudio</summary>
@@ -5229,7 +5261,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-20 12:17:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-22 13:33:02.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -9697,6 +9729,20 @@
  libs_legacy_use_shared_libs(bitlbee_t)
  
  miscfiles_read_localization(bitlbee_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.12/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-03-23 13:47:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/bluetooth.te	2009-04-22 13:29:27.000000000 -0400
+@@ -152,6 +152,10 @@
+ 	optional_policy(`
+ 		hal_dbus_chat(bluetooth_t)
+ 	')
++
++	optional_policy(`
++		pulseaudio_dbus_chat(bluetooth_t)
++	')
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.fc serefpolicy-3.6.12/policy/modules/services/certmaster.fc
 --- nsaserefpolicy/policy/modules/services/certmaster.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/certmaster.fc	2009-04-07 16:01:44.000000000 -0400
@@ -10693,7 +10739,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.12/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-21 16:03:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-22 14:41:00.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10756,7 +10802,7 @@
  dontaudit crond_t self:capability { sys_resource sys_tty_config };
  allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow crond_t self:process { setexec setfscreate };
-@@ -146,22 +163,23 @@
+@@ -146,20 +163,20 @@
  allow crond_t self:msg { send receive };
  allow crond_t self:key { search write link };
  
@@ -10781,11 +10827,8 @@
 +kernel_read_fs_sysctls(crond_t)
  kernel_search_key(crond_t)
  
-+dev_read_kmsg(crond_t)
  dev_read_sysfs(crond_t)
- selinux_get_fs_mount(crond_t)
- selinux_validate_context(crond_t)
-@@ -174,6 +192,7 @@
+@@ -174,6 +191,7 @@
  
  fs_getattr_all_fs(crond_t)
  fs_search_auto_mountpoints(crond_t)
@@ -10793,7 +10836,7 @@
  
  # need auth_chkpwd to check for locked accounts.
  auth_domtrans_chk_passwd(crond_t)
-@@ -183,7 +202,11 @@
+@@ -183,7 +201,11 @@
  corecmd_read_bin_symlinks(crond_t)
  
  domain_use_interactive_fds(crond_t)
@@ -10805,7 +10848,7 @@
  files_read_etc_files(crond_t)
  files_read_generic_spool(crond_t)
  files_list_usr(crond_t)
-@@ -192,10 +215,15 @@
+@@ -192,10 +214,15 @@
  files_search_default(crond_t)
  
  init_rw_utmp(crond_t)
@@ -10821,7 +10864,7 @@
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -208,6 +236,7 @@
+@@ -208,6 +235,7 @@
  userdom_list_user_home_dirs(crond_t)
  
  mta_send_mail(crond_t)
@@ -10829,7 +10872,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +256,44 @@
+@@ -227,21 +255,44 @@
  	')
  ')
  
@@ -10875,7 +10918,7 @@
  ')
  
  optional_policy(`
-@@ -268,8 +320,8 @@
+@@ -268,8 +319,8 @@
  # System cron process domain
  #
  
@@ -10886,7 +10929,7 @@
  allow system_cronjob_t self:fifo_file rw_fifo_file_perms;
  allow system_cronjob_t self:passwd rootok;
  
-@@ -283,7 +335,14 @@
+@@ -283,7 +334,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10901,7 +10944,7 @@
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
  # not directly executed, crond must ensure that
-@@ -303,6 +362,7 @@
+@@ -303,6 +361,7 @@
  allow system_cronjob_t crond_t:fd use;
  allow system_cronjob_t crond_t:fifo_file rw_file_perms;
  allow system_cronjob_t crond_t:process sigchld;
@@ -10909,7 +10952,7 @@
  
  # Write /var/lock/makewhatis.lock.
  allow system_cronjob_t system_cronjob_lock_t:file manage_file_perms;
-@@ -314,9 +374,13 @@
+@@ -314,9 +373,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10924,7 +10967,7 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -345,6 +409,7 @@
+@@ -345,6 +408,7 @@
  fs_getattr_all_symlinks(system_cronjob_t)
  fs_getattr_all_pipes(system_cronjob_t)
  fs_getattr_all_sockets(system_cronjob_t)
@@ -10932,7 +10975,7 @@
  
  # quiet other ps operations
  domain_dontaudit_read_all_domains_state(system_cronjob_t)
-@@ -370,7 +435,8 @@
+@@ -370,7 +434,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10942,7 +10985,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +444,7 @@
+@@ -378,6 +443,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10950,7 +10993,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -418,6 +485,10 @@
+@@ -418,6 +484,10 @@
  ')
  
  optional_policy(`
@@ -10961,7 +11004,7 @@
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -428,11 +499,20 @@
+@@ -428,11 +498,20 @@
  ')
  
  optional_policy(`
@@ -10982,7 +11025,7 @@
  ')
  
  optional_policy(`
-@@ -447,6 +527,7 @@
+@@ -447,6 +526,7 @@
  	prelink_read_cache(system_cronjob_t)
  	prelink_manage_log(system_cronjob_t)
  	prelink_delete_cache(system_cronjob_t)
@@ -10990,7 +11033,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +541,7 @@
+@@ -460,8 +540,7 @@
  ')
  
  optional_policy(`
@@ -11000,7 +11043,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +549,17 @@
+@@ -469,24 +548,17 @@
  ')
  
  optional_policy(`
@@ -11028,7 +11071,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +643,9 @@
+@@ -570,6 +642,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -21997,7 +22040,7 @@
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-21 13:22:50.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-22 11:47:12.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -22065,18 +22108,16 @@
  
  	dev_read_urand($1_ssh_t)
  
-@@ -132,6 +132,10 @@
- 	files_read_etc_runtime_files($1_ssh_t)
+@@ -133,6 +133,8 @@
  	files_read_etc_files($1_ssh_t)
  	files_read_var_files($1_ssh_t)
-+	# Required for FreeNX
-+	files_read_var_lib_symlinks($1_t)
-+
-+	auth_use_nsswitch($1_ssh_t)
  
++	auth_use_nsswitch($1_ssh_t)
++
  	logging_send_syslog_msg($1_ssh_t)
  	logging_read_generic_logs($1_ssh_t)
-@@ -140,9 +144,6 @@
+ 
+@@ -140,9 +142,6 @@
  
  	seutil_read_config($1_ssh_t)
  
@@ -22086,7 +22127,7 @@
  	tunable_policy(`read_default_t',`
  		files_list_default($1_ssh_t)
  		files_read_default_files($1_ssh_t)
-@@ -154,14 +155,6 @@
+@@ -154,14 +153,6 @@
  	optional_policy(`
  		kerberos_use($1_ssh_t)
  	')
@@ -22101,7 +22142,7 @@
  ')
  
  #######################################
-@@ -194,13 +187,14 @@
+@@ -194,13 +185,14 @@
  	type $1_var_run_t;
  	files_pid_file($1_var_run_t)
  
@@ -22117,7 +22158,7 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -214,6 +208,7 @@
+@@ -214,6 +206,7 @@
  	allow $1_t sshd_key_t:file read_file_perms;
  
  	kernel_read_kernel_sysctls($1_t)
@@ -22125,7 +22166,7 @@
  
  	corenet_all_recvfrom_unlabeled($1_t)
  	corenet_all_recvfrom_netlabel($1_t)
-@@ -229,7 +224,12 @@
+@@ -229,7 +222,12 @@
  	corenet_udp_bind_generic_node($1_t)
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
@@ -22138,6 +22179,15 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
+@@ -245,6 +243,8 @@
+ 
+ 	files_read_etc_files($1_t)
+ 	files_read_etc_runtime_files($1_t)
++	# Required for FreeNX
++	files_read_var_lib_symlinks($1_t)
+ 
+ 	logging_search_logs($1_t)
+ 
 @@ -254,9 +254,14 @@
  
  	userdom_dontaudit_relabelfrom_user_ptys($1_t)
@@ -26090,7 +26140,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.12/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-04-06 12:42:08.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-04-22 14:41:22.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(ipsec, 1.9.1)
@@ -26098,6 +26148,24 @@
  
  ########################################
  #
+@@ -55,7 +55,7 @@
+ 
+ allow ipsec_t self:capability { net_admin dac_override dac_read_search };
+ dontaudit ipsec_t self:capability sys_tty_config;
+-allow ipsec_t self:process { signal setsched };
++allow ipsec_t self:process { getsched signal setsched };
+ allow ipsec_t self:tcp_socket create_stream_socket_perms;
+ allow ipsec_t self:udp_socket create_socket_perms;
+ allow ipsec_t self:key_socket create_socket_perms;
+@@ -67,7 +67,7 @@
+ read_lnk_files_pattern(ipsec_t,ipsec_conf_file_t,ipsec_conf_file_t)
+ 
+ allow ipsec_t ipsec_key_file_t:dir list_dir_perms;
+-read_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
++rw_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
+ read_lnk_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
+ 
+ manage_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
 @@ -103,11 +103,13 @@
  corenet_raw_sendrecv_all_nodes(ipsec_t)
  corenet_tcp_sendrecv_all_ports(ipsec_t)
@@ -26113,7 +26181,16 @@
  corenet_sendrecv_generic_server_packets(ipsec_t)
  corenet_sendrecv_isakmp_server_packets(ipsec_t)
  
-@@ -167,6 +169,8 @@
+@@ -127,6 +129,8 @@
+ domain_use_interactive_fds(ipsec_t)
+ 
+ files_read_etc_files(ipsec_t)
++files_read_usr_files(ipsec_t)
++files_search_tmp(ipsec_t)
+ 
+ init_use_fds(ipsec_t)
+ init_use_script_ptys(ipsec_t)
+@@ -167,6 +171,8 @@
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t,ipsec_mgmt_var_run_t,file)
  
@@ -26122,7 +26199,7 @@
  manage_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
  manage_lnk_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
  
-@@ -242,8 +246,6 @@
+@@ -242,8 +248,6 @@
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
  
@@ -26131,7 +26208,7 @@
  miscfiles_read_localization(ipsec_mgmt_t)
  
  modutils_domtrans_insmod(ipsec_mgmt_t)
-@@ -298,13 +300,10 @@
+@@ -298,13 +302,10 @@
  kernel_read_network_state(racoon_t)
  
  corenet_all_recvfrom_unlabeled(racoon_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- selinux-policy.spec	21 Apr 2009 20:10:58 -0000	1.832
+++ selinux-policy.spec	22 Apr 2009 19:17:15 -0000	1.833
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Wed Apr 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-12
+- Allow sshd to read var_lib symlinks for freenx
+
 * Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-11
 - Allow nsplugin unix_read and write on users shm and sem
 - Allow sysadm_t to execute su



From dwalsh at fedoraproject.org  Wed Apr 22 19:18:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 22 Apr 2009 19:18:33 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.91,
	1.92 selinux-policy.spec, 1.828, 1.829
Message-ID: <20090422191833.2120B700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18010

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Apr 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-12
- Allow sshd to read var_lib symlinks for freenx


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- policy-20090105.patch	21 Apr 2009 20:31:51 -0000	1.91
+++ policy-20090105.patch	22 Apr 2009 19:18:29 -0000	1.92
@@ -459,10 +459,41 @@
  ')
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.12/policy/modules/admin/dmesg.fc
+--- nsaserefpolicy/policy/modules/admin/dmesg.fc	2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/dmesg.fc	2009-04-22 14:17:05.000000000 -0400
+@@ -1,2 +1,4 @@
+ 
+ /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
++
++/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.12/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/dmesg.te	2009-04-07 16:01:44.000000000 -0400
-@@ -35,7 +35,7 @@
++++ serefpolicy-3.6.12/policy/modules/admin/dmesg.te	2009-04-22 14:39:11.000000000 -0400
+@@ -9,6 +9,7 @@
+ type dmesg_t;
+ type dmesg_exec_t;
+ init_system_domain(dmesg_t, dmesg_exec_t)
++cron_system_entry(dmesg_t, dmesg_exec_t)
+ 
+ ########################################
+ #
+@@ -20,12 +21,14 @@
+ 
+ allow dmesg_t self:process signal_perms;
+ 
++kernel_read_system_state(dmesg_t)
+ kernel_read_kernel_sysctls(dmesg_t)
+ kernel_read_ring_buffer(dmesg_t)
+ kernel_clear_ring_buffer(dmesg_t)
+ kernel_change_ring_buffer_level(dmesg_t)
+ kernel_list_proc(dmesg_t)
+ kernel_read_proc_symlinks(dmesg_t)
++dev_read_kmsg(dmesg_t)
+ 
+ dev_read_sysfs(dmesg_t)
+ 
+@@ -35,7 +38,7 @@
  
  domain_use_interactive_fds(dmesg_t)
  
@@ -3055,8 +3086,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.12/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-17 11:13:07.000000000 -0400
-@@ -0,0 +1,293 @@
++++ serefpolicy-3.6.12/policy/modules/apps/nsplugin.te	2009-04-22 13:50:31.000000000 -0400
+@@ -0,0 +1,294 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3086,7 +3117,8 @@
 +application_executable_file(nsplugin_config_exec_t)
 +
 +type nsplugin_rw_t;
-+files_type(nsplugin_rw_t)
++files_poly_member(nsplugin_rw_t)
++userdom_user_home_content(nsplugin_rw_t)
 +
 +type nsplugin_tmp_t;
 +files_tmp_file(nsplugin_tmp_t)
@@ -3611,7 +3643,7 @@
 +/usr/bin/pulseaudio	--	gen_context(system_u:object_r:pulseaudio_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.12/policy/modules/apps/pulseaudio.if
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/pulseaudio.if	2009-04-22 13:29:00.000000000 -0400
 @@ -0,0 +1,148 @@
 +
 +## <summary>policy for pulseaudio</summary>
@@ -5229,7 +5261,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-20 12:17:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-22 13:33:02.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -9697,6 +9729,20 @@
  libs_legacy_use_shared_libs(bitlbee_t)
  
  miscfiles_read_localization(bitlbee_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.12/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-03-23 13:47:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/bluetooth.te	2009-04-22 13:29:27.000000000 -0400
+@@ -152,6 +152,10 @@
+ 	optional_policy(`
+ 		hal_dbus_chat(bluetooth_t)
+ 	')
++
++	optional_policy(`
++		pulseaudio_dbus_chat(bluetooth_t)
++	')
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.fc serefpolicy-3.6.12/policy/modules/services/certmaster.fc
 --- nsaserefpolicy/policy/modules/services/certmaster.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/certmaster.fc	2009-04-07 16:01:44.000000000 -0400
@@ -10693,7 +10739,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.12/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-21 16:03:54.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cron.te	2009-04-22 14:41:00.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10756,7 +10802,7 @@
  dontaudit crond_t self:capability { sys_resource sys_tty_config };
  allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow crond_t self:process { setexec setfscreate };
-@@ -146,22 +163,23 @@
+@@ -146,20 +163,20 @@
  allow crond_t self:msg { send receive };
  allow crond_t self:key { search write link };
  
@@ -10781,11 +10827,8 @@
 +kernel_read_fs_sysctls(crond_t)
  kernel_search_key(crond_t)
  
-+dev_read_kmsg(crond_t)
  dev_read_sysfs(crond_t)
- selinux_get_fs_mount(crond_t)
- selinux_validate_context(crond_t)
-@@ -174,6 +192,7 @@
+@@ -174,6 +191,7 @@
  
  fs_getattr_all_fs(crond_t)
  fs_search_auto_mountpoints(crond_t)
@@ -10793,7 +10836,7 @@
  
  # need auth_chkpwd to check for locked accounts.
  auth_domtrans_chk_passwd(crond_t)
-@@ -183,7 +202,11 @@
+@@ -183,7 +201,11 @@
  corecmd_read_bin_symlinks(crond_t)
  
  domain_use_interactive_fds(crond_t)
@@ -10805,7 +10848,7 @@
  files_read_etc_files(crond_t)
  files_read_generic_spool(crond_t)
  files_list_usr(crond_t)
-@@ -192,10 +215,15 @@
+@@ -192,10 +214,15 @@
  files_search_default(crond_t)
  
  init_rw_utmp(crond_t)
@@ -10821,7 +10864,7 @@
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -208,6 +236,7 @@
+@@ -208,6 +235,7 @@
  userdom_list_user_home_dirs(crond_t)
  
  mta_send_mail(crond_t)
@@ -10829,7 +10872,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +256,44 @@
+@@ -227,21 +255,44 @@
  	')
  ')
  
@@ -10875,7 +10918,7 @@
  ')
  
  optional_policy(`
-@@ -268,8 +320,8 @@
+@@ -268,8 +319,8 @@
  # System cron process domain
  #
  
@@ -10886,7 +10929,7 @@
  allow system_cronjob_t self:fifo_file rw_fifo_file_perms;
  allow system_cronjob_t self:passwd rootok;
  
-@@ -283,7 +335,14 @@
+@@ -283,7 +334,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10901,7 +10944,7 @@
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
  # not directly executed, crond must ensure that
-@@ -303,6 +362,7 @@
+@@ -303,6 +361,7 @@
  allow system_cronjob_t crond_t:fd use;
  allow system_cronjob_t crond_t:fifo_file rw_file_perms;
  allow system_cronjob_t crond_t:process sigchld;
@@ -10909,7 +10952,7 @@
  
  # Write /var/lock/makewhatis.lock.
  allow system_cronjob_t system_cronjob_lock_t:file manage_file_perms;
-@@ -314,9 +374,13 @@
+@@ -314,9 +373,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10924,7 +10967,7 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -345,6 +409,7 @@
+@@ -345,6 +408,7 @@
  fs_getattr_all_symlinks(system_cronjob_t)
  fs_getattr_all_pipes(system_cronjob_t)
  fs_getattr_all_sockets(system_cronjob_t)
@@ -10932,7 +10975,7 @@
  
  # quiet other ps operations
  domain_dontaudit_read_all_domains_state(system_cronjob_t)
-@@ -370,7 +435,8 @@
+@@ -370,7 +434,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10942,7 +10985,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +444,7 @@
+@@ -378,6 +443,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10950,7 +10993,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -418,6 +485,10 @@
+@@ -418,6 +484,10 @@
  ')
  
  optional_policy(`
@@ -10961,7 +11004,7 @@
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -428,11 +499,20 @@
+@@ -428,11 +498,20 @@
  ')
  
  optional_policy(`
@@ -10982,7 +11025,7 @@
  ')
  
  optional_policy(`
-@@ -447,6 +527,7 @@
+@@ -447,6 +526,7 @@
  	prelink_read_cache(system_cronjob_t)
  	prelink_manage_log(system_cronjob_t)
  	prelink_delete_cache(system_cronjob_t)
@@ -10990,7 +11033,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +541,7 @@
+@@ -460,8 +540,7 @@
  ')
  
  optional_policy(`
@@ -11000,7 +11043,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +549,17 @@
+@@ -469,24 +548,17 @@
  ')
  
  optional_policy(`
@@ -11028,7 +11071,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +643,9 @@
+@@ -570,6 +642,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -21997,7 +22040,7 @@
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-21 13:22:50.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-22 11:47:12.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -22065,18 +22108,16 @@
  
  	dev_read_urand($1_ssh_t)
  
-@@ -132,6 +132,10 @@
- 	files_read_etc_runtime_files($1_ssh_t)
+@@ -133,6 +133,8 @@
  	files_read_etc_files($1_ssh_t)
  	files_read_var_files($1_ssh_t)
-+	# Required for FreeNX
-+	files_read_var_lib_symlinks($1_t)
-+
-+	auth_use_nsswitch($1_ssh_t)
  
++	auth_use_nsswitch($1_ssh_t)
++
  	logging_send_syslog_msg($1_ssh_t)
  	logging_read_generic_logs($1_ssh_t)
-@@ -140,9 +144,6 @@
+ 
+@@ -140,9 +142,6 @@
  
  	seutil_read_config($1_ssh_t)
  
@@ -22086,7 +22127,7 @@
  	tunable_policy(`read_default_t',`
  		files_list_default($1_ssh_t)
  		files_read_default_files($1_ssh_t)
-@@ -154,14 +155,6 @@
+@@ -154,14 +153,6 @@
  	optional_policy(`
  		kerberos_use($1_ssh_t)
  	')
@@ -22101,7 +22142,7 @@
  ')
  
  #######################################
-@@ -194,13 +187,14 @@
+@@ -194,13 +185,14 @@
  	type $1_var_run_t;
  	files_pid_file($1_var_run_t)
  
@@ -22117,7 +22158,7 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -214,6 +208,7 @@
+@@ -214,6 +206,7 @@
  	allow $1_t sshd_key_t:file read_file_perms;
  
  	kernel_read_kernel_sysctls($1_t)
@@ -22125,7 +22166,7 @@
  
  	corenet_all_recvfrom_unlabeled($1_t)
  	corenet_all_recvfrom_netlabel($1_t)
-@@ -229,7 +224,12 @@
+@@ -229,7 +222,12 @@
  	corenet_udp_bind_generic_node($1_t)
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
@@ -22138,6 +22179,15 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
+@@ -245,6 +243,8 @@
+ 
+ 	files_read_etc_files($1_t)
+ 	files_read_etc_runtime_files($1_t)
++	# Required for FreeNX
++	files_read_var_lib_symlinks($1_t)
+ 
+ 	logging_search_logs($1_t)
+ 
 @@ -254,9 +254,14 @@
  
  	userdom_dontaudit_relabelfrom_user_ptys($1_t)
@@ -26090,7 +26140,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.12/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-04-06 12:42:08.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-04-22 14:41:22.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(ipsec, 1.9.1)
@@ -26098,6 +26148,24 @@
  
  ########################################
  #
+@@ -55,7 +55,7 @@
+ 
+ allow ipsec_t self:capability { net_admin dac_override dac_read_search };
+ dontaudit ipsec_t self:capability sys_tty_config;
+-allow ipsec_t self:process { signal setsched };
++allow ipsec_t self:process { getsched signal setsched };
+ allow ipsec_t self:tcp_socket create_stream_socket_perms;
+ allow ipsec_t self:udp_socket create_socket_perms;
+ allow ipsec_t self:key_socket create_socket_perms;
+@@ -67,7 +67,7 @@
+ read_lnk_files_pattern(ipsec_t,ipsec_conf_file_t,ipsec_conf_file_t)
+ 
+ allow ipsec_t ipsec_key_file_t:dir list_dir_perms;
+-read_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
++rw_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
+ read_lnk_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
+ 
+ manage_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
 @@ -103,11 +103,13 @@
  corenet_raw_sendrecv_all_nodes(ipsec_t)
  corenet_tcp_sendrecv_all_ports(ipsec_t)
@@ -26113,7 +26181,16 @@
  corenet_sendrecv_generic_server_packets(ipsec_t)
  corenet_sendrecv_isakmp_server_packets(ipsec_t)
  
-@@ -167,6 +169,8 @@
+@@ -127,6 +129,8 @@
+ domain_use_interactive_fds(ipsec_t)
+ 
+ files_read_etc_files(ipsec_t)
++files_read_usr_files(ipsec_t)
++files_search_tmp(ipsec_t)
+ 
+ init_use_fds(ipsec_t)
+ init_use_script_ptys(ipsec_t)
+@@ -167,6 +171,8 @@
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t,ipsec_mgmt_var_run_t,file)
  
@@ -26122,7 +26199,7 @@
  manage_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
  manage_lnk_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
  
-@@ -242,8 +246,6 @@
+@@ -242,8 +248,6 @@
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
  
@@ -26131,7 +26208,7 @@
  miscfiles_read_localization(ipsec_mgmt_t)
  
  modutils_domtrans_insmod(ipsec_mgmt_t)
-@@ -298,13 +300,10 @@
+@@ -298,13 +302,10 @@
  kernel_read_network_state(racoon_t)
  
  corenet_all_recvfrom_unlabeled(racoon_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- selinux-policy.spec	21 Apr 2009 20:31:51 -0000	1.828
+++ selinux-policy.spec	22 Apr 2009 19:18:30 -0000	1.829
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Wed Apr 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-12
+- Allow sshd to read var_lib symlinks for freenx
+
 * Tue Apr 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-11
 - Allow nsplugin unix_read and write on users shm and sem
 - Allow sysadm_t to execute su



From rayvd at fedoraproject.org  Wed Apr 22 19:31:26 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 19:31:26 +0000 (UTC)
Subject: rpms/pyodbc/F-11 sources,1.4,1.5
Message-ID: <20090422193126.6B9F470103@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21652

Modified Files:
	sources 
Log Message:
Fixed sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Feb 2009 23:16:21 -0000	1.4
+++ sources	22 Apr 2009 19:31:20 -0000	1.5
@@ -1,2 +1 @@
-87431c3e0f718167c68d8c4bc2c4a6da  pyodbc-2.1.4.zip
-d68ea88717a9efe5d2d76997a49721da  README.rst
+eccee612807e22a2aa3cc5033aee0fcc  pyodbc-2.1.5.zip



From spot at fedoraproject.org  Wed Apr 22 19:31:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 19:31:26 +0000 (UTC)
Subject: rpms/python-ply/devel .cvsignore, 1.3, 1.4 python-ply.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090422193126.3C723700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-ply/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21420/devel

Modified Files:
	.cvsignore python-ply.spec sources 
Log Message:
update to 3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Oct 2008 17:04:38 -0000	1.3
+++ .cvsignore	22 Apr 2009 19:31:21 -0000	1.4
@@ -1 +1 @@
-ply-2.5.tar.gz
+ply-3.2.tar.gz


Index: python-ply.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/devel/python-ply.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-ply.spec	26 Feb 2009 22:55:27 -0000	1.4
+++ python-ply.spec	22 Apr 2009 19:31:21 -0000	1.5
@@ -2,9 +2,9 @@
 
 Name:			python-ply
 Summary: 		Python Lex-Yacc
-Version:		2.5
-Release:		3%{?dist}
-License:		LGPLv2+
+Version:		3.2
+Release:		1%{?dist}
+License:		BSD
 Group:			System Environment/Libraries
 URL:			http://www.dabeaz.com/ply/
 Source0:		http://www.dabeaz.com/ply/ply-%{version}.tar.gz
@@ -43,11 +43,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING example/
+%doc CHANGES README example/
 %{python_sitelib}/ply/
 %{python_sitelib}/ply*.egg-info
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.2-1
+- update to 3.2, license change to BSD
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Oct 2008 17:04:38 -0000	1.3
+++ sources	22 Apr 2009 19:31:21 -0000	1.4
@@ -1 +1 @@
-2aef9014a1bc50066eb05dd3b9c1b04f  ply-2.5.tar.gz
+afc9dcfc3284e3a8269c97cc4802cb53  ply-3.2.tar.gz



From spot at fedoraproject.org  Wed Apr 22 19:31:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 19:31:53 +0000 (UTC)
Subject: rpms/python-ply/F-11 python-ply.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20090422193153.E03EA700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-ply/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21420/F-11

Modified Files:
	python-ply.spec sources 
Log Message:
update to 3.2


Index: python-ply.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/F-11/python-ply.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-ply.spec	26 Feb 2009 22:55:27 -0000	1.4
+++ python-ply.spec	22 Apr 2009 19:31:17 -0000	1.5
@@ -2,9 +2,9 @@
 
 Name:			python-ply
 Summary: 		Python Lex-Yacc
-Version:		2.5
-Release:		3%{?dist}
-License:		LGPLv2+
+Version:		3.2
+Release:		1%{?dist}
+License:		BSD
 Group:			System Environment/Libraries
 URL:			http://www.dabeaz.com/ply/
 Source0:		http://www.dabeaz.com/ply/ply-%{version}.tar.gz
@@ -43,11 +43,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING example/
+%doc CHANGES README example/
 %{python_sitelib}/ply/
 %{python_sitelib}/ply*.egg-info
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 3.2-1
+- update to 3.2, license change to BSD
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Oct 2008 17:04:38 -0000	1.3
+++ sources	22 Apr 2009 19:31:17 -0000	1.4
@@ -1 +1 @@
-2aef9014a1bc50066eb05dd3b9c1b04f  ply-2.5.tar.gz
+afc9dcfc3284e3a8269c97cc4802cb53  ply-3.2.tar.gz



From spot at fedoraproject.org  Wed Apr 22 19:39:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 19:39:09 +0000 (UTC)
Subject: rpms/pyke/devel .cvsignore, 1.7, 1.8 pyke.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20090422193909.C674970104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24471/devel

Modified Files:
	.cvsignore pyke.spec sources 
Log Message:
1.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Apr 2009 20:46:49 -0000	1.7
+++ .cvsignore	22 Apr 2009 19:39:03 -0000	1.8
@@ -1 +1 @@
-pyke-1.0.1.tar.gz
+pyke-1.0.2.tar.gz


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/pyke.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pyke.spec	6 Apr 2009 20:46:49 -0000	1.9
+++ pyke.spec	22 Apr 2009 19:39:04 -0000	1.10
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:			pyke
-Summary: 		Knowledge-based inference engine
-Version:		1.0.1
+Summary:		Knowledge-based inference engine
+Version:		1.0.2
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -33,6 +33,7 @@
 rm -rf doc/testdocs*
 # This is stupid. Delete this.
 rm -rf $RPM_BUILD_ROOT/usr/pyke
+rm -rf doc/source/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +45,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- update to 1.0.2
+
 * Mon Apr  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1
 - update to 1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Apr 2009 20:46:49 -0000	1.8
+++ sources	22 Apr 2009 19:39:04 -0000	1.9
@@ -1 +1 @@
-387610224a4bc87777710c6a406aa9a4  pyke-1.0.1.tar.gz
+e812d22af70e30d47926ff42fe807d3e  pyke-1.0.2.tar.gz



From spot at fedoraproject.org  Wed Apr 22 19:39:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 22 Apr 2009 19:39:35 +0000 (UTC)
Subject: rpms/pyke/F-11 pyke.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <20090422193935.7037D70104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24471/F-11

Modified Files:
	pyke.spec sources 
Log Message:
1.0.2


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-11/pyke.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pyke.spec	6 Apr 2009 20:46:49 -0000	1.9
+++ pyke.spec	22 Apr 2009 19:39:02 -0000	1.10
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:			pyke
-Summary: 		Knowledge-based inference engine
-Version:		1.0.1
+Summary:		Knowledge-based inference engine
+Version:		1.0.2
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -33,6 +33,7 @@
 rm -rf doc/testdocs*
 # This is stupid. Delete this.
 rm -rf $RPM_BUILD_ROOT/usr/pyke
+rm -rf doc/source/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +45,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Wed Apr 22 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- update to 1.0.2
+
 * Mon Apr  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1
 - update to 1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Apr 2009 20:46:49 -0000	1.8
+++ sources	22 Apr 2009 19:39:02 -0000	1.9
@@ -1 +1 @@
-387610224a4bc87777710c6a406aa9a4  pyke-1.0.1.tar.gz
+e812d22af70e30d47926ff42fe807d3e  pyke-1.0.2.tar.gz



From rayvd at fedoraproject.org  Wed Apr 22 19:39:46 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 19:39:46 +0000 (UTC)
Subject: rpms/pyodbc/F-11 pyodbc.spec,1.8,1.9
Message-ID: <20090422193946.D0F4670104@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24951

Modified Files:
	pyodbc.spec 
Log Message:
EVR bump


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-11/pyodbc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyodbc.spec	22 Apr 2009 15:46:41 -0000	1.8
+++ pyodbc.spec	22 Apr 2009 19:39:14 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -37,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-2
+- EVR bump
+
 * Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
 - Upstream released 2.1.5
 



From mclasen at fedoraproject.org  Wed Apr 22 19:42:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 22 Apr 2009 19:42:31 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 sp-atexit.patch, NONE,
	1.1 seahorse-plugins.spec, 1.24, 1.25
Message-ID: <20090422194231.CD528700FE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26542

Modified Files:
	seahorse-plugins.spec 
Added Files:
	sp-atexit.patch 
Log Message:
clean up tempdir


sp-atexit.patch:

--- NEW FILE sp-atexit.patch ---
diff -up seahorse-plugins-2.26.1/agent/seahorse-agent.c.atexit seahorse-plugins-2.26.1/agent/seahorse-agent.c
--- seahorse-plugins-2.26.1/agent/seahorse-agent.c.atexit	2009-03-03 13:57:02.000000000 -0500
+++ seahorse-plugins-2.26.1/agent/seahorse-agent.c	2009-04-22 15:10:49.544141234 -0400
@@ -161,3 +161,8 @@ seahorse_agent_uninit (gpointer *data)
     return FALSE;
 }
 
+void
+seahorse_agent_exit ()
+{
+    seahorse_agent_uninit (NULL);
+}
diff -up seahorse-plugins-2.26.1/agent/seahorse-agent.h.atexit seahorse-plugins-2.26.1/agent/seahorse-agent.h
--- seahorse-plugins-2.26.1/agent/seahorse-agent.h.atexit	2009-03-03 13:56:43.000000000 -0500
+++ seahorse-plugins-2.26.1/agent/seahorse-agent.h	2009-04-22 15:10:49.545131874 -0400
@@ -55,6 +55,7 @@ void seahorse_agent_childsetup ();
 /* Called in the new child process */
 gboolean seahorse_agent_init ();
 gboolean seahorse_agent_uninit (gpointer *data);
+void     seahorse_agent_exit ();
 
 /* Global options to set from the command line */
 extern gboolean seahorse_agent_cshell;
diff -up seahorse-plugins-2.26.1/agent/seahorse-agent-main.c.atexit seahorse-plugins-2.26.1/agent/seahorse-agent-main.c
--- seahorse-plugins-2.26.1/agent/seahorse-agent-main.c.atexit	2009-03-03 14:00:41.000000000 -0500
+++ seahorse-plugins-2.26.1/agent/seahorse-agent-main.c	2009-04-22 15:32:32.398383172 -0400
@@ -256,6 +256,8 @@ int main(int argc, char* argv[])
     g_strfreev (agent_exec_args);
     agent_exec_args = NULL;
 
+    atexit (seahorse_agent_exit);
+
     /* Handle some signals */
     seahorse_unix_signal_register (SIGINT, unix_signal);
     seahorse_unix_signal_register (SIGTERM, unix_signal);


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/F-11/seahorse-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- seahorse-plugins.spec	13 Apr 2009 18:08:58 -0000	1.24
+++ seahorse-plugins.spec	22 Apr 2009 19:42:28 -0000	1.25
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -52,7 +52,8 @@
 Requires(postun): shared-mime-info
 Requires(postun): GConf2
 
-#Patch0: epiphany-2.26.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=579738
+Patch0: sp-atexit.patch
 
 %description
 The plugins and utilities in this package integrate seahorse into
@@ -61,7 +62,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .epiphany
+%patch0 -p1 -b .atexit
 
 autoreconf -i -f
 
@@ -175,6 +176,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
+- Make seahorse-agent clean up its tempdir
+
 * Mon Apr 13 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/seahorse-plugins/2.26/seahorse-plugins-2.26.1.news



From rayvd at fedoraproject.org  Wed Apr 22 19:44:35 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 19:44:35 +0000 (UTC)
Subject: rpms/pyodbc/F-9 pyodbc.spec,1.4,1.5
Message-ID: <20090422194435.5A37A700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27270

Modified Files:
	pyodbc.spec 
Log Message:
EVR bump


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-9/pyodbc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pyodbc.spec	22 Apr 2009 15:55:04 -0000	1.4
+++ pyodbc.spec	22 Apr 2009 19:44:01 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -37,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-2
+- EVR bump
+
 * Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
 - Upstream released 2.1.5
 



From pghmcfc at fedoraproject.org  Wed Apr 22 19:48:10 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 22 Apr 2009 19:48:10 +0000 (UTC)
Subject: rpms/imlib/F-11 imlib.spec,1.15,1.16
Message-ID: <20090422194810.41505700FE@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27861/F-11

Modified Files:
	imlib.spec 
Log Message:
- add libXt-devel dependency for -devel package (#478357)
- use install -p to maintain timestamps where reasonable
- use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one



Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/F-11/imlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- imlib.spec	25 Feb 2009 07:05:55 -0000	1.15
+++ imlib.spec	22 Apr 2009 19:48:09 -0000	1.16
@@ -1,9 +1,7 @@
-%define libtool_hack LIBTOOL=/usr/bin/libtool
-
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	10%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -18,14 +16,13 @@
 Patch9:		imlib-1.9.15-multilib-config.patch
 Patch10:	imlib-1.9.15-check-for-shm-pixmaps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires:	automake
+BuildRequires:	automake, libtool
 BuildRequires:	giflib-devel
 BuildRequires:	glib-devel%{?_isa}
-BuildRequires:	gtk+-devel
+BuildRequires:	gtk+-devel%{?_isa}
 BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
-BuildRequires:	libjpeg-devel
+BuildRequires:	libjpeg-devel%{?_isa}
 BuildRequires:	libtiff-devel%{?_isa}
-BuildRequires:	libtool
 BuildRequires:	libX11-devel%{?_isa}
 BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
@@ -49,9 +46,16 @@
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
 Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, glib-devel%{?_isa}, gtk+-devel, libjpeg-devel, libtiff-devel
-Requires:	libX11-devel, zlib-devel
-Requires:	%{_datadir}/aclocal, pkgconfig
+Requires:	giflib-devel
+Requires:	glib-devel%{?_isa}
+Requires:	gtk+-devel%{?_isa}
+Requires:	libjpeg-devel%{?_isa}
+Requires:	libtiff-devel%{?_isa}
+Requires:	libX11-devel%{?_isa}
+Requires:	libXt-devel%{?_isa}
+Requires:	zlib-devel
+Requires:	%{_datadir}/aclocal
+Requires:	pkgconfig
 
 %description devel
 The header files, static libraries and documentation needed for
@@ -87,28 +91,31 @@
 
 %build
 /usr/bin/autoreconf -i -f
-%configure
+%configure --disable-static
 
 ## Remove -L%{_libdir} from imlib-config if present;
 ## it's redundant and breaks multilib compatibility
 %{__sed} -i -e 's,-L%{_libdir} ,,g' imlib-config
 
+## Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 ## Build local gmodule hack
-tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule %{libtool_hack}
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule
 %{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
 
 ## Avoid unnecessary library linkage in libgdk_imlib
 GX_LIBS=$(/usr/bin/gtk-config --libs | %{__sed} -e 's/-lgtk //; s/-lgmodule //; s/-lXi //')
 
 ## Note: build with %{?_smp_mflags} doesn't work reliably
-%{__make} %{libtool_hack} GX_LIBS="${GX_LIBS}"
+%{__make} GX_LIBS="${GX_LIBS}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} %{libtool_hack}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
-## Don't package static or libtool archives
-%{__rm} -f %{buildroot}%{_libdir}/*a
+## Don't package libtool archives
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -152,8 +159,14 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.15-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr  1 2009 Paul Howarth <paul at city-fan.org> 1:1.9.15-11
+- add libXt-devel dependency for -devel package (#478357)
+- use install -p to maintain timestamps where reasonable
+- use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-10
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
 - specify Instruction Set Architecture (%%{?_isa}) in devel package requires



From pghmcfc at fedoraproject.org  Wed Apr 22 19:48:38 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 22 Apr 2009 19:48:38 +0000 (UTC)
Subject: rpms/imlib/F-10 imlib.spec,1.14,1.15
Message-ID: <20090422194838.D42D1700FE@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27861/F-10

Modified Files:
	imlib.spec 
Log Message:
- add libXt-devel dependency for -devel package (#478357)
- use install -p to maintain timestamps where reasonable
- use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one



Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/F-10/imlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- imlib.spec	23 Sep 2008 15:37:34 -0000	1.14
+++ imlib.spec	22 Apr 2009 19:48:04 -0000	1.15
@@ -1,9 +1,7 @@
-%define libtool_hack LIBTOOL=/usr/bin/libtool
-
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	9%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -18,14 +16,13 @@
 Patch9:		imlib-1.9.15-multilib-config.patch
 Patch10:	imlib-1.9.15-check-for-shm-pixmaps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires:	automake
+BuildRequires:	automake, libtool
 BuildRequires:	giflib-devel
 BuildRequires:	glib-devel%{?_isa}
-BuildRequires:	gtk+-devel
+BuildRequires:	gtk+-devel%{?_isa}
 BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
-BuildRequires:	libjpeg-devel
+BuildRequires:	libjpeg-devel%{?_isa}
 BuildRequires:	libtiff-devel%{?_isa}
-BuildRequires:	libtool
 BuildRequires:	libX11-devel%{?_isa}
 BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
@@ -49,9 +46,16 @@
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
 Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, glib-devel%{?_isa}, gtk+-devel, libjpeg-devel, libtiff-devel
-Requires:	libX11-devel, zlib-devel
-Requires:	%{_datadir}/aclocal, pkgconfig
+Requires:	giflib-devel
+Requires:	glib-devel%{?_isa}
+Requires:	gtk+-devel%{?_isa}
+Requires:	libjpeg-devel%{?_isa}
+Requires:	libtiff-devel%{?_isa}
+Requires:	libX11-devel%{?_isa}
+Requires:	libXt-devel%{?_isa}
+Requires:	zlib-devel
+Requires:	%{_datadir}/aclocal
+Requires:	pkgconfig
 
 %description devel
 The header files, static libraries and documentation needed for
@@ -87,28 +91,31 @@
 
 %build
 /usr/bin/autoreconf -i -f
-%configure
+%configure --disable-static
 
 ## Remove -L%{_libdir} from imlib-config if present;
 ## it's redundant and breaks multilib compatibility
 %{__sed} -i -e 's,-L%{_libdir} ,,g' imlib-config
 
+## Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 ## Build local gmodule hack
-tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule %{libtool_hack}
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule
 %{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
 
 ## Avoid unnecessary library linkage in libgdk_imlib
 GX_LIBS=$(/usr/bin/gtk-config --libs | %{__sed} -e 's/-lgtk //; s/-lgmodule //; s/-lXi //')
 
 ## Note: build with %{?_smp_mflags} doesn't work reliably
-%{__make} %{libtool_hack} GX_LIBS="${GX_LIBS}"
+%{__make} GX_LIBS="${GX_LIBS}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} %{libtool_hack}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
-## Don't package static or libtool archives
-%{__rm} -f %{buildroot}%{_libdir}/*a
+## Don't package libtool archives
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -152,6 +159,15 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Wed Apr  1 2009 Paul Howarth <paul at city-fan.org> 1:1.9.15-11
+- add libXt-devel dependency for -devel package (#478357)
+- use install -p to maintain timestamps where reasonable
+- use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-10
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
 - specify Instruction Set Architecture (%%{?_isa}) in devel package requires
   (where available)



From rayvd at fedoraproject.org  Wed Apr 22 19:49:56 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 19:49:56 +0000 (UTC)
Subject: rpms/pyodbc/F-10 pyodbc.spec,1.4,1.5
Message-ID: <20090422194956.C657F700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29480

Modified Files:
	pyodbc.spec 
Log Message:
EVR bump


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/F-10/pyodbc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pyodbc.spec	22 Apr 2009 15:49:32 -0000	1.4
+++ pyodbc.spec	22 Apr 2009 19:49:54 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -37,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-2
+- EVR bump
+
 * Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
 - Upstream released 2.1.5
 



From rayvd at fedoraproject.org  Wed Apr 22 19:56:51 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 19:56:51 +0000 (UTC)
Subject: rpms/pyodbc/EL-5 pyodbc.spec,1.7,1.8
Message-ID: <20090422195651.6F295700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31436

Modified Files:
	pyodbc.spec 
Log Message:
EVR bump


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/EL-5/pyodbc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyodbc.spec	22 Apr 2009 15:58:26 -0000	1.7
+++ pyodbc.spec	22 Apr 2009 19:56:16 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -37,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-2
+- EVR bump
+
 * Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
 - Upstream released 2.1.5
 



From rayvd at fedoraproject.org  Wed Apr 22 19:58:13 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Wed, 22 Apr 2009 19:58:13 +0000 (UTC)
Subject: rpms/pyodbc/devel pyodbc.spec,1.8,1.9
Message-ID: <20090422195813.86824700FE@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pyodbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31994

Modified Files:
	pyodbc.spec 
Log Message:
EVR bump


Index: pyodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyodbc/devel/pyodbc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyodbc.spec	22 Apr 2009 15:40:37 -0000	1.8
+++ pyodbc.spec	22 Apr 2009 19:57:42 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           pyodbc
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 Group:          Development/Languages
 License:        MIT
@@ -37,6 +37,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-2
+- EVR bump
+
 * Wed Apr 22 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.5-1
 - Upstream released 2.1.5
 



From rdieter at fedoraproject.org  Wed Apr 22 20:14:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 22 Apr 2009 20:14:15 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.78,1.79
Message-ID: <20090422201416.365B970103@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4879

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- Requires: festival (for kttsd)



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdeaccessibility.spec	31 Mar 2009 11:22:50 -0000	1.78
+++ kdeaccessibility.spec	22 Apr 2009 20:14:11 -0000	1.79
@@ -2,7 +2,7 @@
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -27,6 +27,8 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
+# ktssd
+Requires: festival
 
 Obsoletes: kdeaccessibility-devel < 1:3.5.8 
 
@@ -36,8 +38,7 @@
 %description
 Included with this package are:
 * kmag: a screen magnifier
-* kmousetool: a program for people whom it hurts to click the mouse
-* kmouth: program that allows people who have lost their voice
+* kmousetool: a program for people whom it hurts to click the mouse * kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
 
@@ -46,7 +47,6 @@
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -77,7 +77,6 @@
     touch --no-create %{_kde4_iconsdir}/mono &> /dev/null 
     gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null 
     gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
-
 fi
 
 %posttrans
@@ -111,6 +110,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- Requires: festival (for kttsd)
+
 * Mon Mar 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
 



From mjakubicek at fedoraproject.org  Wed Apr 22 20:24:41 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 22 Apr 2009 20:24:41 +0000 (UTC)
Subject: rpms/libgeotiff/devel libgeotiff.spec,1.9,1.10
Message-ID: <20090422202442.0B8B1700FE@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/libgeotiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8545/devel

Modified Files:
	libgeotiff.spec 
Log Message:
- Fix FTBFS: use gcc -shared instead of ld -shared to compile with -fstack-protector




Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/devel/libgeotiff.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgeotiff.spec	25 Feb 2009 15:06:49 -0000	1.9
+++ libgeotiff.spec	22 Apr 2009 20:24:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:      libgeotiff
 Version:   1.2.5
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -57,6 +57,9 @@
 # disable -g flag removal
 sed -i 's| \| sed \"s\/-g \/\/\"||g' configure
 
+# use gcc -shared instead of ld -shared to build with -fstack-protector
+sed -i 's|LD_SHARED=@LD_SHARED@|LD_SHARED=@CC@ -shared|' Makefile.in
+
 %configure \
         --prefix=%{_prefix} \
         --includedir=%{_includedir}/%{name}/ \
@@ -130,6 +133,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.2.5-4
+- Fix FTBFS: use gcc -shared instead of ld -shared to compile with -fstack-protector
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 22 20:24:41 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 22 Apr 2009 20:24:41 +0000 (UTC)
Subject: rpms/libgeotiff/F-11 libgeotiff.spec,1.9,1.10
Message-ID: <20090422202442.1A88470103@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/libgeotiff/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8545/F-11

Modified Files:
	libgeotiff.spec 
Log Message:
- Fix FTBFS: use gcc -shared instead of ld -shared to compile with -fstack-protector




Index: libgeotiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeotiff/F-11/libgeotiff.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgeotiff.spec	25 Feb 2009 15:06:49 -0000	1.9
+++ libgeotiff.spec	22 Apr 2009 20:24:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:      libgeotiff
 Version:   1.2.5
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   GeoTIFF format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -57,6 +57,9 @@
 # disable -g flag removal
 sed -i 's| \| sed \"s\/-g \/\/\"||g' configure
 
+# use gcc -shared instead of ld -shared to build with -fstack-protector
+sed -i 's|LD_SHARED=@LD_SHARED@|LD_SHARED=@CC@ -shared|' Makefile.in
+
 %configure \
         --prefix=%{_prefix} \
         --includedir=%{_includedir}/%{name}/ \
@@ -130,6 +133,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Apr 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.2.5-4
+- Fix FTBFS: use gcc -shared instead of ld -shared to compile with -fstack-protector
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From davej at fedoraproject.org  Wed Apr 22 20:40:49 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 22 Apr 2009 20:40:49 +0000 (UTC)
Subject: rpms/kernel/devel config-ia64-generic, 1.24, 1.25 kernel.spec,
	1.1528, 1.1529
Message-ID: <20090422204050.21343700FE@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15131

Modified Files:
	config-ia64-generic kernel.spec 
Log Message:
Disable SYSFS_DEPRECATED on ia64


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-ia64-generic	2 Apr 2009 04:04:34 -0000	1.24
+++ config-ia64-generic	22 Apr 2009 20:40:44 -0000	1.25
@@ -204,9 +204,6 @@
 
 CONFIG_HP_ILO=m
 
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1528
retrieving revision 1.1529
diff -u -r1.1528 -r1.1529
--- kernel.spec	22 Apr 2009 15:40:05 -0000	1.1528
+++ kernel.spec	22 Apr 2009 20:40:44 -0000	1.1529
@@ -1817,6 +1817,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 22 2009 Dave Jones <davej at redhat.com> 2.6.30-0.67.rc3
+- Disable SYSFS_DEPRECATED on ia64
+
 * Wed Apr 22 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.30-rc3
 - PROC_VMCORE=y: Exports the dump image of crashed



From dbhole at fedoraproject.org  Wed Apr 22 20:40:52 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 22 Apr 2009 20:40:52 +0000 (UTC)
Subject: rpms/wsdl4j/devel wsdl4j-MANIFEST.MF,1.1,1.2 wsdl4j.spec,1.20,1.21
Message-ID: <20090422204052.BE973700FE@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/wsdl4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108

Modified Files:
	wsdl4j-MANIFEST.MF wsdl4j.spec 
Log Message:

- Update OSGi manifest





Index: wsdl4j-MANIFEST.MF
===================================================================
RCS file: /cvs/pkgs/rpms/wsdl4j/devel/wsdl4j-MANIFEST.MF,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wsdl4j-MANIFEST.MF	30 Jan 2009 15:56:22 -0000	1.1
+++ wsdl4j-MANIFEST.MF	22 Apr 2009 20:40:50 -0000	1.2
@@ -3,7 +3,7 @@
 Specification-Version: 1.2
 Bundle-ManifestVersion: 2
 Specification-Title: JWSDL
-Bundle-Version: 1.4.9.v200806030405
+Bundle-Version: 1.5.2.v200806030407
 Bundle-Vendor: %Bundle-Vendor.0
 Implementation-Vendor: IBM
 Ant-Version: Apache Ant 1.6.5


Index: wsdl4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wsdl4j.spec	26 Feb 2009 07:19:11 -0000	1.20
+++ wsdl4j.spec	22 Apr 2009 20:40:50 -0000	1.21
@@ -39,7 +39,7 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        6.5%{?dist}
+Release:        6.6%{?dist}
 Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        CPL
@@ -160,6 +160,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Deepak Bhole <dbhole at redhat.com> - 0:1.5.2-6.6
+- Update OSGi manifest
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.5.2-6.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wtogami at fedoraproject.org  Wed Apr 22 20:54:36 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 22 Apr 2009 20:54:36 +0000 (UTC)
Subject: rpms/pulseaudio/devel
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch, NONE,
	1.1 pulseaudio.spec, 1.80, 1.81
Message-ID: <20090422205436.B41EE70104@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20411

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch 
Log Message:
* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.15-11
- Bug #497214
  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.


pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch:

--- NEW FILE pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch ---
diff -urN pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in
--- pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in	2009-02-19 21:26:55.000000000 -0500
+++ pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in	2009-04-22 16:48:37.574738056 -0400
@@ -19,6 +19,9 @@
 
 set -e
 
+# Exit without running pulseaudio daemon if this is a remote desktop session
+[ -n "$PULSE_SERVER" ] && exit 0
+
 @PA_BINARY@ --start "$@"
 
 if [ x"$DISPLAY" != x ] ; then


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pulseaudio.spec	13 Apr 2009 23:37:51 -0000	1.80
+++ pulseaudio.spec	22 Apr 2009 20:54:34 -0000	1.81
@@ -3,10 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
+Patch0:         pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -187,6 +188,7 @@
 
 %prep
 %setup -q -T -b0
+%patch0 -p1 
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -407,6 +409,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.15-11
+- Bug #497214
+  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.
+
 * Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-10
 - Final 0.9.15 release
 



From s4504kr at fedoraproject.org  Wed Apr 22 20:54:54 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 22 Apr 2009 20:54:54 +0000 (UTC)
Subject: rpms/itext/F-10 itext-2.1.5-pdftk.patch, NONE, 1.1 itext.spec, 1.13,
	1.14
Message-ID: <20090422205454.7269370104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/itext/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20513

Modified Files:
	itext.spec 
Added Files:
	itext-2.1.5-pdftk.patch 
Log Message:
Patch to allow readin of pdf files from stdin for pdftk

itext-2.1.5-pdftk.patch:

--- NEW FILE itext-2.1.5-pdftk.patch ---
diff -up itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java.pdftk itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
--- itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java.pdftk	2009-04-21 18:12:02.000000000 +0200
+++ itext-2.1.5/src/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java	2009-04-21 18:17:08.000000000 +0200
@@ -99,7 +99,11 @@ public class RandomAccessFileOrArray imp
                 }
             }
             else {
-                InputStream is = BaseFont.getResourceStream(filename);
+		InputStream is;
+		if( filename.equals("-"))
+		    is = System.in;
+		else
+		    is = BaseFont.getResourceStream(filename);
                 if (is == null)
                     throw new IOException(filename + " not found as file or resource.");
                 try {


Index: itext.spec
===================================================================
RCS file: /cvs/extras/rpms/itext/F-10/itext.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- itext.spec	11 Mar 2009 03:27:46 -0000	1.13
+++ itext.spec	22 Apr 2009 20:54:52 -0000	1.14
@@ -4,11 +4,12 @@
 Summary:        A Free Java-PDF library
 Name:           itext
 Version:        2.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
 URL:            http://www.lowagie.com/iText/
 Group:          Development/Libraries
 Source0:        http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
+Patch1:		itext-2.1.5-pdftk.patch
 BuildRequires:  ant
 BuildRequires:  bouncycastle-mail
 BuildRequires:  dom4j
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q -c -T -a 0
+%patch1 -p1 -b .pdftk
 
 # Remove preshipped binaries
 find . -name "*.jar" -exec rm {} \;
@@ -141,8 +143,22 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Tue Mar 10 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.5-1
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.1.5-2
+- Patch to allow reading of pdf files from stdin for pdftk (BZ #495574)
+
+* Tue Mar 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.1.5-1
 - New upstream release
+
+* Tue Mar 03 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.4-5
+- Remove the odd Provides introduced in the 2.1.4-3 build.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 19 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.4-3
+- Add extra Provides for a nice interaction with pdftk.
+
+* Thu Feb 12 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.4-2
 - Pass the additional flag "-fno-indirect-classes" to aot-compile-rpm
 
 * Sun Nov 30 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.4-1



From wtogami at fedoraproject.org  Wed Apr 22 20:56:21 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 22 Apr 2009 20:56:21 +0000 (UTC)
Subject: rpms/pulseaudio/F-11
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch, NONE,
	1.1 pulseaudio.spec, 1.80, 1.81
Message-ID: <20090422205621.33FE7700FE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pulseaudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21449

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch 
Log Message:
* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.15-11
- Bug #497214
  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.


pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch:

--- NEW FILE pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch ---
diff -urN pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in
--- pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in	2009-02-19 21:26:55.000000000 -0500
+++ pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in	2009-04-22 16:48:37.574738056 -0400
@@ -19,6 +19,9 @@
 
 set -e
 
+# Exit without running pulseaudio daemon if this is a remote desktop session
+[ -n "$PULSE_SERVER" ] && exit 0
+
 @PA_BINARY@ --start "$@"
 
 if [ x"$DISPLAY" != x ] ; then


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-11/pulseaudio.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pulseaudio.spec	13 Apr 2009 23:37:51 -0000	1.80
+++ pulseaudio.spec	22 Apr 2009 20:56:18 -0000	1.81
@@ -3,10 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.15
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
+Patch0:         pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -187,6 +188,7 @@
 
 %prep
 %setup -q -T -b0
+%patch0 -p1 
 
 %build
 CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -407,6 +409,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.15-11
+- Bug #497214
+  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.
+
 * Mon Apr 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.15-10
 - Final 0.9.15 release
 



From eponyme at fedoraproject.org  Wed Apr 22 20:59:49 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 20:59:49 +0000 (UTC)
Subject: rpms/qdevelop/devel qdevelop.spec,1.6,1.7
Message-ID: <20090422205950.04988700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/qdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22804

Modified Files:
	qdevelop.spec 
Log Message:
Rebuild for Qt 4.5


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/devel/qdevelop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qdevelop.spec	5 Mar 2009 22:09:19 -0000	1.6
+++ qdevelop.spec	22 Apr 2009 20:59:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -55,6 +55,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
+- Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1
 - Rebuild for 0.27.4
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.2-2



From wtogami at fedoraproject.org  Wed Apr 22 21:01:58 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 22 Apr 2009 21:01:58 +0000 (UTC)
Subject: rpms/pulseaudio/F-10
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch, NONE,
	1.1 pulseaudio.spec, 1.65, 1.66
Message-ID: <20090422210158.61BE0700FE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pulseaudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23391

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch 
Log Message:
- Bug #497214
  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.


pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch:

--- NEW FILE pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch ---
diff -urN pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in
--- pulseaudio-0.9.15.orig/src/daemon/start-pulseaudio-x11.in	2009-02-19 21:26:55.000000000 -0500
+++ pulseaudio-0.9.15/src/daemon/start-pulseaudio-x11.in	2009-04-22 16:48:37.574738056 -0400
@@ -19,6 +19,9 @@
 
 set -e
 
+# Exit without running pulseaudio daemon if this is a remote desktop session
+[ -n "$PULSE_SERVER" ] && exit 0
+
 @PA_BINARY@ --start "$@"
 
 if [ x"$DISPLAY" != x ] ; then


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-10/pulseaudio.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pulseaudio.spec	13 Jan 2009 14:00:55 -0000	1.65
+++ pulseaudio.spec	22 Apr 2009 21:01:56 -0000	1.66
@@ -3,10 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
+Patch2:         pulseaudio-0.9.15-no-daemon-if-remote-desktop.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
@@ -166,6 +167,7 @@
 %prep
 %setup -q -T -b0
 %patch1 -p1 -b .mixer-select
+%patch2 -p1 -b .no-daemon-if-remote-desktop
 
 %build
 CFLAGS="-ggdb" %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -397,6 +399,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Apr 22 2009 Warren Togami <wtogami at redhat.com> 0.9.14-3
+- Bug #497214
+  Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.
+
 * Tue Jan 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.14-2
 - Prefer mixer controls with volumes over switches
 



From eponyme at fedoraproject.org  Wed Apr 22 21:03:26 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:03:26 +0000 (UTC)
Subject: rpms/qdevelop/F-11 qdevelop.spec,1.6,1.7
Message-ID: <20090422210326.61206700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/qdevelop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24077

Modified Files:
	qdevelop.spec 
Log Message:
Rebuild for Qt 4.5


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/F-11/qdevelop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qdevelop.spec	5 Mar 2009 22:09:19 -0000	1.6
+++ qdevelop.spec	22 Apr 2009 21:03:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -55,6 +55,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
+- Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1
 - Rebuild for 0.27.4
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.2-2



From eponyme at fedoraproject.org  Wed Apr 22 21:05:14 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:05:14 +0000 (UTC)
Subject: rpms/qdevelop/F-10 qdevelop.spec,1.5,1.6
Message-ID: <20090422210514.75087700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/qdevelop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24795

Modified Files:
	qdevelop.spec 
Log Message:
Rebuild for Qt 4.5


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/F-10/qdevelop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qdevelop.spec	5 Mar 2009 22:11:56 -0000	1.5
+++ qdevelop.spec	22 Apr 2009 21:05:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -55,6 +55,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
+- Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1
 - Rebuild for 0.27.4
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.2-2



From eponyme at fedoraproject.org  Wed Apr 22 21:08:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:08:33 +0000 (UTC)
Subject: rpms/qdevelop/F-9 qdevelop.spec,1.5,1.6
Message-ID: <20090422210833.4F566700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/qdevelop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25515

Modified Files:
	qdevelop.spec 
Log Message:
Rebuild for Qt 4.5


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/F-9/qdevelop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qdevelop.spec	5 Mar 2009 22:13:46 -0000	1.5
+++ qdevelop.spec	22 Apr 2009 21:07:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -55,6 +55,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
+- Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1
 - Rebuild for 0.27.4
 * Sat Feb 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.2-2



From s4504kr at fedoraproject.org  Wed Apr 22 21:18:17 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 22 Apr 2009 21:18:17 +0000 (UTC)
Subject: rpms/pdftk/F-10 pdftk.spec, 1.16, 1.17 pdftk-1.41-stdin.patch, 1.1,
	NONE
Message-ID: <20090422211817.A956A700FE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28505

Modified Files:
	pdftk.spec 
Removed Files:
	pdftk-1.41-stdin.patch 
Log Message:
Remove stdin patch and add Req. to modified iText release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/F-10/pdftk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pdftk.spec	9 Apr 2009 18:54:25 -0000	1.16
+++ pdftk.spec	22 Apr 2009 21:18:13 -0000	1.17
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        15%{?dist}
+Release:        17%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -11,7 +11,6 @@
 Patch0:         pdftk-use-internal-itext.patch
 Patch1:         pdftk-1.41-make.patch
 Patch2:         pdftk-1.41-gcc44.patch
-Patch3:		pdftk-1.41-stdin.patch
 # Solves ".afm files not found" error. RHBZ#494785:
 Patch4:		pdftk-classpath.patch
 Group:          Applications/Publishing
@@ -20,9 +19,10 @@
 BuildRequires:  libgcj-devel
 BuildRequires:  java-devel >= 1:1.6.0
 
-# Requires itext-2.1.4-3
 BuildRequires:  itext >= %{itextvers}
 
+Requires:	itext >= 2.1.5-2
+
 %description
 If PDF is electronic paper, then pdftk is an electronic staple-remover,
 hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple
@@ -47,7 +47,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .org
 %patch4 -p0 -b .classpath
 
 rm -rf java_libs
@@ -90,6 +89,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-17
+- Bump release number
+
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-16
+- Remove stdin patch, add Req. to modified iText release (BZ #495574)
+
 * Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
 - Patch ".afm files not found" issue (#494785)
 


--- pdftk-1.41-stdin.patch DELETED ---



From dledford at fedoraproject.org  Wed Apr 22 21:24:40 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 21:24:40 +0000 (UTC)
Subject: rpms/openmpi/devel openmpi.spec,1.32,1.33
Message-ID: <20090422212440.49D14700FE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30857

Modified Files:
	openmpi.spec 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-2
- fixed broken update
- Resolves: bz496909, bz496131, bz496911



Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openmpi.spec	22 Apr 2009 15:04:12 -0000	1.32
+++ openmpi.spec	22 Apr 2009 21:24:39 -0000	1.33
@@ -102,6 +102,7 @@
 find %{buildroot}%{_libdir}/%{mpidir}/man -type f | xargs gzip -9
 ln -s mpicc.1.gz %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1.gz
 rm -f %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1
+rm -f %{buildroot}%{_libdir}/%{mpidir}/share/vampirtrace/doc/opari/lacsi01.ps.gz
 
 # Make the pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig



From dledford at fedoraproject.org  Wed Apr 22 21:26:23 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 22 Apr 2009 21:26:23 +0000 (UTC)
Subject: rpms/openmpi/F-11 openmpi.spec,1.32,1.33
Message-ID: <20090422212624.0505170104@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/openmpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31391

Modified Files:
	openmpi.spec 
Log Message:
* Wed Apr 22 2009 Doug Ledford <dledford at redhat.com> - 1.3.1-2
- fixed broken update
- Resolves: bz496909, bz496131, bz496911



Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openmpi.spec	22 Apr 2009 15:02:29 -0000	1.32
+++ openmpi.spec	22 Apr 2009 21:25:49 -0000	1.33
@@ -102,6 +102,7 @@
 find %{buildroot}%{_libdir}/%{mpidir}/man -type f | xargs gzip -9
 ln -s mpicc.1.gz %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1.gz
 rm -f %{buildroot}%{_libdir}/%{mpidir}/man/man1/mpiCC.1
+rm -f %{buildroot}%{_libdir}/%{mpidir}/share/vampirtrace/doc/opari/lacsi01.ps.gz
 
 # Make the pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig



From mbarnes at fedoraproject.org  Wed Apr 22 21:27:42 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 22 Apr 2009 21:27:42 +0000 (UTC)
Subject: rpms/pygobject2/devel
	pygobject2-2.16.1-fix-classic-class-crash.patch, 
	NONE, 1.1 pygobject2.spec, 1.48, 1.49
Message-ID: <20090422212742.1828C70103@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31790

Modified Files:
	pygobject2.spec 
Added Files:
	pygobject2-2.16.1-fix-classic-class-crash.patch 
Log Message:

* Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.16.1-4.fc11
- Add patch for GNOME bug #566571 (classic vs new-style inheritance crash).


pygobject2-2.16.1-fix-classic-class-crash.patch:

--- NEW FILE pygobject2-2.16.1-fix-classic-class-crash.patch ---
diff -up pygobject-2.16.1/gobject/gobjectmodule.c.fix-classic-class-crash pygobject-2.16.1/gobject/gobjectmodule.c
--- pygobject-2.16.1/gobject/gobjectmodule.c.fix-classic-class-crash	2009-02-20 16:48:29.000000000 -0500
+++ pygobject-2.16.1/gobject/gobjectmodule.c	2009-04-22 16:23:21.000000000 -0400
@@ -1079,16 +1079,20 @@ pyg_type_add_interfaces(PyTypeObject *cl
 
     for (i = 0; i < PyTuple_GET_SIZE(bases); ++i) {
         guint k;
-        PyTypeObject *base = (PyTypeObject *) PyTuple_GET_ITEM(bases, i);
+        PyObject *base = PyTuple_GET_ITEM(bases, i);
         GType itype;
         gboolean is_new = TRUE;
         const GInterfaceInfo *iinfo;
         GInterfaceInfo iinfo_copy;
 
-        if (!PyType_IsSubtype(base, &PyGInterface_Type))
+        /* 'base' can also be a PyClassObject, see bug #566571. */
+        if (!PyType_Check(base))
             continue;
 
-        itype = pyg_type_from_object((PyObject *) base);
+        if (!PyType_IsSubtype((PyTypeObject*) base, &PyGInterface_Type))
+            continue;
+
+        itype = pyg_type_from_object(base);
 
         /* Happens for _implementations_ of an interface. */
         if (!G_TYPE_IS_INTERFACE(itype))
@@ -1109,7 +1113,7 @@ pyg_type_add_interfaces(PyTypeObject *cl
             gchar *error;
             error = g_strdup_printf("Interface type %s "
                                     "has no Python implementation support",
-                                    base->tp_name);
+                                    ((PyTypeObject *) base)->tp_name);
             PyErr_Warn(PyExc_RuntimeWarning, error);
             g_free(error);
             continue;


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pygobject2.spec	26 Feb 2009 20:00:16 -0000	1.48
+++ pygobject2.spec	22 Apr 2009 21:27:10 -0000	1.49
@@ -4,11 +4,17 @@
 %define glib2_version           2.16.0
 %define python2_version         2.3.5
 
+# XXX Disable this and use "make <my-real-arch>" instead of
+#     "make local" when building locally to avoid avoid the
+#     "Arch dependent binaries in noarch package" error.
+#     Added in Fedora 11, hopefully only temporarily.
+%define noarch_docs 0
+
 ### Abstract ###
 
 Name: pygobject2
 Version: 2.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -18,6 +24,9 @@
 
 ### Patches ###
 
+# GNOME bug #566571
+Patch1: pygobject2-2.16.1-fix-classic-class-crash.patch
+
 ### Build Dependencies ###
 
 BuildRequires: automake
@@ -52,13 +61,16 @@
 %package doc
 Summary: Documentation files for %{name}
 Group: Development/Languages
+%if %{noarch_docs}
 BuildArch: noarch
+%endif
 
 %description doc
 This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n pygobject-%{version}
+%patch1 -p1 -b .fix-classic-class-crash
 
 %build
 %configure --enable-thread
@@ -113,6 +125,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.16.1-4.fc11
+- Add patch for GNOME bug #566571 (classic vs new-style inheritance crash).
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From eponyme at fedoraproject.org  Wed Apr 22 21:30:56 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:30:56 +0000 (UTC)
Subject: rpms/fotowall/devel .cvsignore, 1.4, 1.5 fotowall.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090422213056.C14F270103@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv911

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Apr 2009 18:45:41 -0000	1.4
+++ .cvsignore	22 Apr 2009 21:30:54 -0000	1.5
@@ -1 +1 @@
-fotowall-0.4.tar.bz2
+fotowall-0.5.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/fotowall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fotowall.spec	4 Apr 2009 18:45:41 -0000	1.5
+++ fotowall.spec	22 Apr 2009 21:30:54 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1
+- Rebuild for 0.5
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
 - Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Apr 2009 18:45:41 -0000	1.4
+++ sources	22 Apr 2009 21:30:54 -0000	1.5
@@ -1 +1 @@
-91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2
+3c493599c5c8763e7fc6213daee8e76a  fotowall-0.5.tar.bz2



From eponyme at fedoraproject.org  Wed Apr 22 21:33:00 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:33:00 +0000 (UTC)
Subject: rpms/fotowall/F-11 .cvsignore, 1.4, 1.5 fotowall.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090422213301.0DB25700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2199

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Apr 2009 18:45:41 -0000	1.4
+++ .cvsignore	22 Apr 2009 21:32:58 -0000	1.5
@@ -1 +1 @@
-fotowall-0.4.tar.bz2
+fotowall-0.5.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/fotowall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fotowall.spec	4 Apr 2009 18:45:41 -0000	1.5
+++ fotowall.spec	22 Apr 2009 21:32:58 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1
+- Rebuild for 0.5
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
 - Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Apr 2009 18:45:41 -0000	1.4
+++ sources	22 Apr 2009 21:32:58 -0000	1.5
@@ -1 +1 @@
-91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2
+3c493599c5c8763e7fc6213daee8e76a  fotowall-0.5.tar.bz2



From eponyme at fedoraproject.org  Wed Apr 22 21:34:52 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:34:52 +0000 (UTC)
Subject: rpms/fotowall/F-10 .cvsignore, 1.4, 1.5 fotowall.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090422213452.C7C87700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2913

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Apr 2009 18:49:29 -0000	1.4
+++ .cvsignore	22 Apr 2009 21:34:49 -0000	1.5
@@ -1 +1 @@
-fotowall-0.4.tar.bz2
+fotowall-0.5.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/fotowall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fotowall.spec	4 Apr 2009 18:49:29 -0000	1.4
+++ fotowall.spec	22 Apr 2009 21:34:50 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1
+- Rebuild for 0.5
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
 - Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Apr 2009 18:49:30 -0000	1.4
+++ sources	22 Apr 2009 21:34:50 -0000	1.5
@@ -1 +1 @@
-91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2
+3c493599c5c8763e7fc6213daee8e76a  fotowall-0.5.tar.bz2



From eponyme at fedoraproject.org  Wed Apr 22 21:36:57 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed, 22 Apr 2009 21:36:57 +0000 (UTC)
Subject: rpms/fotowall/F-9 .cvsignore, 1.4, 1.5 fotowall.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090422213657.45660700FE@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3523

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Apr 2009 18:51:29 -0000	1.4
+++ .cvsignore	22 Apr 2009 21:36:49 -0000	1.5
@@ -1 +1 @@
-fotowall-0.4.tar.bz2
+fotowall-0.5.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-9/fotowall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fotowall.spec	4 Apr 2009 18:51:29 -0000	1.4
+++ fotowall.spec	22 Apr 2009 21:36:51 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -51,6 +51,8 @@
 
 
 %changelog
+* Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1
+- Rebuild for 0.5
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.4-1
 - Rebuild for 0.4
 * Fri Mar 13 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.3.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Apr 2009 18:51:29 -0000	1.4
+++ sources	22 Apr 2009 21:36:51 -0000	1.5
@@ -1 +1 @@
-91c78827c4bfc7218072c8ef9f4c667e  fotowall-0.4.tar.bz2
+3c493599c5c8763e7fc6213daee8e76a  fotowall-0.5.tar.bz2



From karsten at fedoraproject.org  Wed Apr 22 21:57:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 22 Apr 2009 21:57:35 +0000 (UTC)
Subject: rpms/Inventor/F-11 Inventor-2.1.5-s390x.patch, NONE,
	1.1 Inventor.spec, 1.48, 1.49
Message-ID: <20090422215735.BCAD9700FE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/Inventor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9780

Modified Files:
	Inventor.spec 
Added Files:
	Inventor-2.1.5-s390x.patch 
Log Message:
- add s390x patch

Inventor-2.1.5-s390x.patch:

--- NEW FILE Inventor-2.1.5-s390x.patch ---
diff -up inventor/lib/database/src/so/SoOutput.c++.s390x inventor/lib/database/src/so/SoOutput.c++
--- inventor/lib/database/src/so/SoOutput.c++.s390x	2009-04-22 23:09:59.000000000 +0200
+++ inventor/lib/database/src/so/SoOutput.c++	2009-04-22 23:09:25.000000000 +0200
@@ -1462,7 +1462,7 @@ SoOutput::findReference(const SoBase *ba
 
     // Generates a CC warning. Ho hum.
     if (refDict->find((unsigned long) base, ref))
-#if (_MIPS_SZPTR == 64 || __ia64__ || __x86_64__ || __powerpc64__)
+#if (_MIPS_SZPTR == 64 || __ia64__ || __x86_64__ || __powerpc64__ || __s390x__)
         referenceId = (int) ((unsigned long) ref);
 #else
 	referenceId = (int)ref;


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/F-11/Inventor.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Inventor.spec	23 Feb 2009 21:27:08 -0000	1.48
+++ Inventor.spec	22 Apr 2009 21:57:31 -0000	1.49
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        35%{?dist}
+Release:        35%{?dist}.1
 
 Summary:        SGI Open Inventor (TM)
 
@@ -20,6 +20,7 @@
 Patch2:		Inventor-2.1.5-31-32.diff
 # Misc C++ modernization stuff
 Patch3:		Inventor-2.1.5-32-33.diff
+Patch4:		Inventor-2.1.5-s390x.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -145,6 +146,7 @@
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i \
 -e 's,^IVPREFIX =.*$,IVPREFIX = %{_prefix},' \
@@ -344,6 +346,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Wed Apr 22 2009 Karsten Hopp <karsten at redhat.com> 2.1.5-35.1
+- add s390x patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From notting at fedoraproject.org  Wed Apr 22 21:59:02 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 22 Apr 2009 21:59:02 +0000 (UTC)
Subject: rpms/generic-logos/F-11 .cvsignore, 1.8, 1.9 generic-logos.spec,
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090422215902.C2089700FE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/generic-logos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10026

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
11.0.0-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Oct 2008 18:15:29 -0000	1.8
+++ .cvsignore	22 Apr 2009 21:58:30 -0000	1.9
@@ -1 +1 @@
-generic-logos-10.0.1.tar.bz2
+generic-logos-11.0.0.tar.bz2


Index: generic-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-11/generic-logos.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- generic-logos.spec	24 Feb 2009 20:31:37 -0000	1.10
+++ generic-logos.spec	22 Apr 2009 21:58:30 -0000	1.11
@@ -1,7 +1,7 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 10.0.1
-Release: 2%{?dist}
+Version: 11.0.0
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
 License: GPLv2 and LGPL
@@ -35,12 +35,12 @@
 
 # should be ifarch i386
 mkdir -p $RPM_BUILD_ROOT/boot/grub
-install -p -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
+install -p -m 644 bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/generic
 for i in firstboot/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
+  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/generic
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
@@ -53,8 +53,8 @@
   install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024
-install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
+install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
@@ -65,18 +65,21 @@
 %files
 %defattr(-, root, root)
 %doc COPYING COPYING-kde-logo
-%{_datadir}/firstboot/*
+%{_datadir}/firstboot/themes/*
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/pixmaps/*
 /usr/lib/anaconda-runtime/*.jpg
-%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 # should be ifarch i386
 /boot/grub/splash.xpm.gz
 # end i386 bits
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 22 2009 Bill Nottingham <notting at redhat.com> - 11.0.0-1
+- updates for Fedora 11
+
+* Wed Dec  3 2008 Bill Nottingham <notting at redhat.com> - 10.0.2-1
+- fix syslinux splash (accidentally branded)
 
 * Tue Oct 28 2008 Bill Nottingham <notting at redhat.com> - 10.0.1-1
 - incorporate KDE logo into upstream source distribution


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2008 18:15:29 -0000	1.9
+++ sources	22 Apr 2009 21:58:30 -0000	1.10
@@ -1 +1 @@
-e1cdb7babc9e8e94cf105d0672f7f7e9  generic-logos-10.0.1.tar.bz2
+ca040d0a2a71cc99967bef52af35b82b  generic-logos-11.0.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Apr 22 22:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 22:08:47 +0000
Subject: [pkgdb] hamcrest: akurtakov has requested watchbugzilla
Message-ID: <20090422220848.4A7E110F885@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on hamcrest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hamcrest



From pkgdb at fedoraproject.org  Wed Apr 22 22:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 22:08:48 +0000
Subject: [pkgdb] hamcrest: akurtakov has requested watchcommits
Message-ID: <20090422220848.E61FD10F88B@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on hamcrest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hamcrest



From pkgdb at fedoraproject.org  Wed Apr 22 22:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 22:08:51 +0000
Subject: [pkgdb] hamcrest: akurtakov has requested commit
Message-ID: <20090422220851.567E810F88D@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on hamcrest (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hamcrest



From allisson at fedoraproject.org  Wed Apr 22 22:18:51 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 22 Apr 2009 22:18:51 +0000 (UTC)
Subject: rpms/clutter/F-10 .cvsignore, 1.11, 1.12 clutter.spec, 1.12,
	1.13 import.log, 1.3, 1.4 sources, 1.11,
	1.12 clutter-0.8.0-clutter-fixed.patch, 1.1, NONE
Message-ID: <20090422221851.635B1700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17499/F-10

Modified Files:
	.cvsignore clutter.spec import.log sources 
Removed Files:
	clutter-0.8.0-clutter-fixed.patch 
Log Message:

Update to 0.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2008 01:46:58 -0000	1.11
+++ .cvsignore	22 Apr 2009 22:18:43 -0000	1.12
@@ -1 +1 @@
-clutter-0.8.2.tar.gz
+clutter-0.8.8.tar.bz2


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-10/clutter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- clutter.spec	7 Oct 2008 01:46:58 -0000	1.12
+++ clutter.spec	22 Apr 2009 22:18:44 -0000	1.13
@@ -1,13 +1,12 @@
 Name:           clutter
-Version:        0.8.2
+Version:        0.8.8
 Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz
-Patch0:         clutter-0.8.0-clutter-fixed.patch
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel
@@ -30,9 +29,23 @@
 Header files and libraries for building a extension library for the
 clutter
 
+%package        doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+
+%description    doc
+Clutter is an open source software library for creating fast, 
+visually rich graphical user interfaces. The most obvious example 
+of potential usage is in media center type applications. 
+We hope however it can be used for a lot more.
+
+This package contains documentation for clutter.
+
+
 %prep
 %setup -q
-#%patch0 -p1 -b .orig
+
 
 %build
 %configure --enable-gtk-doc
@@ -61,10 +74,17 @@
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+
+%files doc
+%defattr(-, root, root)
+#%dir %{_datadir}/gtk-doc/html/clutter
 %{_datadir}/gtk-doc/html/clutter
-%exclude %{_datadir}/gtk-doc/html/cogl
+#%dir %{_datadir}/gtk-doc/html/cogl
+%{_datadir}/gtk-doc/html/cogl
 
 %changelog
+* Mon Oct  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.8-1
+- Update to 0.8.8
 
 * Mon Oct  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.2-1
 - Update to 0.8.2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Oct 2008 01:46:58 -0000	1.3
+++ import.log	22 Apr 2009 22:18:44 -0000	1.4
@@ -1,3 +1,4 @@
 clutter-0_6_4-1_fc9:HEAD:clutter-0.6.4-1.fc9.src.rpm:1213453978
 clutter-0_8_0-1_fc9:HEAD:clutter-0.8.0-1.fc9.src.rpm:1220760678
 clutter-0_8_2-1_fc9:HEAD:clutter-0.8.2-1.fc9.src.rpm:1223343853
+clutter-0_8_8-1_fc10:F-10:clutter-0.8.8-1.fc10.src.rpm:1240438596


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2008 01:46:58 -0000	1.11
+++ sources	22 Apr 2009 22:18:44 -0000	1.12
@@ -1 +1 @@
-2e86641254260b355d235ee202918b1c  clutter-0.8.2.tar.gz
+20f9ab406a9fa261a0a3379eb6f43625  clutter-0.8.8.tar.bz2


--- clutter-0.8.0-clutter-fixed.patch DELETED ---



From sgrubb at fedoraproject.org  Wed Apr 22 22:23:00 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 22:23:00 +0000 (UTC)
Subject: rpms/prelude-lml/devel prelude-lml.spec,1.18,1.19
Message-ID: <20090422222300.86743700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-lml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18961

Modified Files:
	prelude-lml.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-3
- Adjust dir and config file permissions



Index: prelude-lml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-lml/devel/prelude-lml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- prelude-lml.spec	27 Feb 2009 02:13:37 -0000	1.18
+++ prelude-lml.spec	22 Apr 2009 22:22:57 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		prelude-lml           
 Version:	0.9.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The prelude log analyzer
 
 Group:		System Environment/Libraries
@@ -90,17 +90,17 @@
 
 %files
 %defattr(755,root,root,-)
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.rules
-%dir %{_sysconfdir}/%{name}/ruleset/
-%config(noreplace) %attr(0644,root,root)%{_sysconfdir}/%{name}/ruleset/*
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.rules
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/ruleset/
+%config(noreplace) %attr(0640,root,root)%{_sysconfdir}/%{name}/ruleset/*
 %{_initrddir}/%{name}
 %{_bindir}/prelude-lml
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/debug.so
 %{_libdir}/%{name}/pcre.so
-%dir /var/lib/%{name}/
+%attr(0750,root,root) %dir /var/lib/%{name}/
 %dir %{_defaultdocdir}/%{name}-%{version}/
 %doc %{_defaultdocdir}/%{name}-%{version}/*
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-3
+- Adjust dir and config file permissions
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From allisson at fedoraproject.org  Wed Apr 22 22:25:59 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 22 Apr 2009 22:25:59 +0000 (UTC)
Subject: rpms/clutter/F-10 clutter.spec,1.13,1.14
Message-ID: <20090422222600.0A5D2700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20216

Modified Files:
	clutter.spec 
Log Message:
correct changelog date.


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/F-10/clutter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clutter.spec	22 Apr 2009 22:18:44 -0000	1.13
+++ clutter.spec	22 Apr 2009 22:25:59 -0000	1.14
@@ -83,7 +83,7 @@
 %{_datadir}/gtk-doc/html/cogl
 
 %changelog
-* Mon Oct  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.8-1
+* Wed Apr 22 2009 Allisson Azevedo <allisson at gmail.com> 0.8.8-1
 - Update to 0.8.8
 
 * Mon Oct  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.2-1



From jjohnstn at fedoraproject.org  Wed Apr 22 22:29:46 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed, 22 Apr 2009 22:29:46 +0000 (UTC)
Subject: rpms/jetty/F-10 jetty.spec,1.14,1.15
Message-ID: <20090422222946.BFE96700FE@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21371

Modified Files:
	jetty.spec 
Log Message:

* Fri Apr 22 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
- Add %%{libdir} to files list.
- Resolves #473585




Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-10/jetty.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jetty.spec	11 Feb 2009 19:35:00 -0000	1.14
+++ jetty.spec	22 Apr 2009 22:29:14 -0000	1.15
@@ -56,7 +56,7 @@
 
 Name:           jetty
 Version:        5.1.14
-Release:        1.10%{?dist}
+Release:        3%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -541,6 +541,7 @@
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
 %dir %{jettycachedir}
+%dir %{libdir}
 %{libdir}/org.mortbay.jetty.jar
 %{libdir}/org.mortbay.jmx.jar
 %dir %{homedir}
@@ -606,13 +607,16 @@
 %endif
 
 %changelog
+* Fri Apr 22 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
+- Add %%{libdir} to files list.
+- Resolves #473585
+
 * Wed Feb 11 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.10
 - Rename jettyc back to .jettyrc.
 - Resolves #485012
 
 * Tue Feb 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.9
 - Change %%{_sysconfdir}/init.d references to be %%{_initrddir}
-- Resolves #473585
 
 * Mon Feb 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.8
 - Fixes for unowned directories.



From sgrubb at fedoraproject.org  Wed Apr 22 22:31:42 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 22:31:42 +0000 (UTC)
Subject: rpms/prelude-lml/F-11 prelude-lml.spec,1.18,1.19
Message-ID: <20090422223142.C7D77700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-lml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22178

Modified Files:
	prelude-lml.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-3
- Adjust dir and config file permissions



Index: prelude-lml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-lml/F-11/prelude-lml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- prelude-lml.spec	27 Feb 2009 02:13:37 -0000	1.18
+++ prelude-lml.spec	22 Apr 2009 22:31:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		prelude-lml           
 Version:	0.9.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The prelude log analyzer
 
 Group:		System Environment/Libraries
@@ -90,17 +90,17 @@
 
 %files
 %defattr(755,root,root,-)
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.rules
-%dir %{_sysconfdir}/%{name}/ruleset/
-%config(noreplace) %attr(0644,root,root)%{_sysconfdir}/%{name}/ruleset/*
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.rules
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/ruleset/
+%config(noreplace) %attr(0640,root,root)%{_sysconfdir}/%{name}/ruleset/*
 %{_initrddir}/%{name}
 %{_bindir}/prelude-lml
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/debug.so
 %{_libdir}/%{name}/pcre.so
-%dir /var/lib/%{name}/
+%attr(0750,root,root) %dir /var/lib/%{name}/
 %dir %{_defaultdocdir}/%{name}-%{version}/
 %doc %{_defaultdocdir}/%{name}-%{version}/*
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-3
+- Adjust dir and config file permissions
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Apr 22 22:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 22:43:09 +0000
Subject: [pkgdb] hamcrest had acl change status
Message-ID: <20090422224309.CA7AE10F885@bastion2.fedora.phx.redhat.com>

dwalluck has set the watchcommits acl on hamcrest (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hamcrest



From pkgdb at fedoraproject.org  Wed Apr 22 22:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 22:43:11 +0000
Subject: [pkgdb] hamcrest had acl change status
Message-ID: <20090422224312.0110110F88D@bastion2.fedora.phx.redhat.com>

dwalluck has set the commit acl on hamcrest (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hamcrest



From pkgdb at fedoraproject.org  Wed Apr 22 22:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 22 Apr 2009 22:43:11 +0000
Subject: [pkgdb] hamcrest had acl change status
Message-ID: <20090422224311.E9BC710F88A@bastion2.fedora.phx.redhat.com>

dwalluck has set the watchbugzilla acl on hamcrest (Fedora devel) to Approved for akurtakov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hamcrest



From sgrubb at fedoraproject.org  Wed Apr 22 22:49:06 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 22:49:06 +0000 (UTC)
Subject: rpms/prelude-lml/F-10 prelude-lml.spec,1.16,1.17
Message-ID: <20090422224906.D8E11700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-lml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28387

Modified Files:
	prelude-lml.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-2
- Adjust dir and config file permissions



Index: prelude-lml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-lml/F-10/prelude-lml.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- prelude-lml.spec	17 Oct 2008 12:55:39 -0000	1.16
+++ prelude-lml.spec	22 Apr 2009 22:48:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		prelude-lml           
 Version:	0.9.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The prelude log analyzer
 
 Group:		System Environment/Libraries
@@ -90,17 +90,17 @@
 
 %files
 %defattr(755,root,root,-)
-%config %dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.rules
-%config %dir %{_sysconfdir}/%{name}/ruleset/
-%config(noreplace) %attr(0644,root,root)%{_sysconfdir}/%{name}/ruleset/*
+%config %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.rules
+%config %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/ruleset/
+%config(noreplace) %attr(0640,root,root)%{_sysconfdir}/%{name}/ruleset/*
 %{_initrddir}/%{name}
 %{_bindir}/prelude-lml
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/debug.so
 %{_libdir}/%{name}/pcre.so
-%dir /var/lib/%{name}/
+%attr(0750,root,root) %dir /var/lib/%{name}/
 %dir %{_defaultdocdir}/%{name}-%{version}/
 %doc %{_defaultdocdir}/%{name}-%{version}/*
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14-2
+- Adjust dir and config file permissions
+
 * Fri Oct 17 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14-1
 - new upstream release fixing bz #463459
 



From sgrubb at fedoraproject.org  Wed Apr 22 22:57:04 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 22:57:04 +0000 (UTC)
Subject: rpms/prelude-lml/F-9 prelude-lml.spec,1.11,1.12
Message-ID: <20090422225704.9EEDD700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-lml/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31250

Modified Files:
	prelude-lml.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.13-2
- Adjust dir and config file permissions



Index: prelude-lml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-lml/F-9/prelude-lml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prelude-lml.spec	10 Sep 2008 14:43:27 -0000	1.11
+++ prelude-lml.spec	22 Apr 2009 22:56:33 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		prelude-lml           
 Version:	0.9.13
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The prelude log analyzer
 
 Group:		System Environment/Libraries
@@ -90,17 +90,17 @@
 
 %files
 %defattr(755,root,root,-)
-%config %dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*.rules
-%config %dir %{_sysconfdir}/%{name}/ruleset/
-%config(noreplace) %attr(0644,root,root)%{_sysconfdir}/%{name}/ruleset/*
+%config %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*.rules
+%config %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/ruleset/
+%config(noreplace) %attr(0640,root,root)%{_sysconfdir}/%{name}/ruleset/*
 %{_initrddir}/%{name}
 %{_bindir}/prelude-lml
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/debug.so
 %{_libdir}/%{name}/pcre.so
-%dir /var/lib/%{name}/
+%attr(0750,root,root) %dir /var/lib/%{name}/
 %dir %{_defaultdocdir}/%{name}-%{version}/
 %doc %{_defaultdocdir}/%{name}-%{version}/*
 
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.13-2
+- Adjust dir and config file permissions
+
 * Wed Sep 10 2008 Steve Grubb <sgrubb at redhat.com> 0.9.13-1
 - new upstream release
 



From lennart at fedoraproject.org  Wed Apr 22 22:58:39 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 22 Apr 2009 22:58:39 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.13, 1.14 libatasmart.spec, 1.15,
	1.16 sources, 1.13, 1.14
Message-ID: <20090422225839.7E021700FE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32110

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	15 Apr 2009 21:52:50 -0000	1.13
+++ .cvsignore	22 Apr 2009 22:58:08 -0000	1.14
@@ -1 +1 @@
-libatasmart-0.12.tar.gz
+libatasmart-0.13.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libatasmart.spec	15 Apr 2009 21:48:13 -0000	1.15
+++ libatasmart.spec	22 Apr 2009 22:58:08 -0000	1.16
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.12
+Version: 0.13
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -52,9 +52,12 @@
 %{_includedir}/atasmart.h
 %{_libdir}/libatasmart.so
 %{_libdir}/pkgconfig/libatasmart.pc
-%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
+%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU*
 
 %changelog
+* Wed Apr 22 2009 Lennart Poettering <lpoetter at redhat.com> 0.13-1
+- New upstream release
+
 * Wed Apr 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.12-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	15 Apr 2009 21:52:50 -0000	1.13
+++ sources	22 Apr 2009 22:58:08 -0000	1.14
@@ -1 +1 @@
-8baaca011386c05a85415b0fb83c05f3  libatasmart-0.12.tar.gz
+1dbefaaf98c01305ca82df514a0b2258  libatasmart-0.13.tar.gz



From karsten at fedoraproject.org  Wed Apr 22 23:03:02 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 22 Apr 2009 23:03:02 +0000 (UTC)
Subject: rpms/atlascpp/F-11 atlascpp.spec,1.10,1.11
Message-ID: <20090422230302.3B2EF700FE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/atlascpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1201

Modified Files:
	atlascpp.spec 
Log Message:
- bump release and rebuild on s390x


Index: atlascpp.spec
===================================================================
RCS file: /cvs/extras/rpms/atlascpp/F-11/atlascpp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- atlascpp.spec	1 Mar 2009 13:46:12 -0000	1.10
+++ atlascpp.spec	22 Apr 2009 23:02:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           atlascpp
 Version:        0.6.1
-Release:        6%{?dist}
+Release:        6%{?dist}.1
 Summary:        WorldForge message protocol library
 
 Group:          Development/Libraries
@@ -91,6 +91,9 @@
 %{_mandir}/man3/Atlas*
 
 %changelog
+* Wed Apr 22 2009 Karsten Hopp <karsten at redhat.com> 0.6.1-6.1
+- bump release and rebuild on s390x
+
 * Sun Mar 01 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.1-6
 - Moving skstream dependency to -devel subpackage
 - Actually perform the tests



From devrim at fedoraproject.org  Wed Apr 22 23:28:42 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed, 22 Apr 2009 23:28:42 +0000 (UTC)
Subject: rpms/classpathx-jaf/F-11 classpathx-jaf.spec,1.28,1.29
Message-ID: <20090422232842.A0008700FE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/classpathx-jaf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10378

Modified Files:
	classpathx-jaf.spec 
Log Message:
Fix BR



Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/extras/rpms/classpathx-jaf/F-11/classpathx-jaf.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- classpathx-jaf.spec	21 Apr 2009 22:57:01 -0000	1.28
+++ classpathx-jaf.spec	22 Apr 2009 23:28:39 -0000	1.29
@@ -35,7 +35,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        14.2%{?dist}
+Release:        14.3%{?dist}
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 Group:          System Environment/Libraries
@@ -49,7 +49,7 @@
 Requires(preun): %{_sbindir}/update-alternatives
 Requires(post): %{_sbindir}/update-alternatives
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  java-devel
+BuildRequires:	java-1.5.0-gcj-devel
 Provides:       jaf = 0:%{jafver}
 Obsoletes:      gnujaf <= 0:1.0-0.rc1.1jpp
 
@@ -173,6 +173,9 @@
 %ghost %{_javadocdir}/activation
 
 %changelog
+* Thu Apr 23 2009 Devrim GUNDUZ <devrim at gunduz.org> - 0:1.0-14.3
+- Fix BR.
+
 * Wed Apr 22 2009 Devrim GUNDUZ <devrim at gunduz.org> - 0:1.0-14.2
 - Rebuild
 



From wwoods at fedoraproject.org  Wed Apr 22 23:30:24 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Wed, 22 Apr 2009 23:30:24 +0000 (UTC)
Subject: rpms/preupgrade/F-9 .cvsignore, 1.5, 1.6 preupgrade.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090422233025.22CFC700FE@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11114

Modified Files:
	.cvsignore preupgrade.spec sources 
Log Message:
pre2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Apr 2009 21:41:21 -0000	1.5
+++ .cvsignore	22 Apr 2009 23:30:16 -0000	1.6
@@ -1 +1 @@
-preupgrade-1.1.0pre1.tar.bz2
+preupgrade-1.1.0pre2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/preupgrade.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- preupgrade.spec	16 Apr 2009 21:41:21 -0000	1.12
+++ preupgrade.spec	22 Apr 2009 23:30:17 -0000	1.13
@@ -2,11 +2,11 @@
 Summary: Prepares a system for an upgrade
 Name: preupgrade
 Version: 1.1.0
-Release: 0.pre1%{?dist}
+Release: 0.pre2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Source: preupgrade-1.1.0pre1.tar.bz2
+Source: preupgrade-1.1.0pre2.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q -n preupgrade-1.1.0pre1
+%setup -q -n preupgrade-1.1.0pre2
 
 %build
 # no op
@@ -76,6 +76,10 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre2
+- Disable bootloader installation (bug 496952)
+- Fix handling of releases.txt to accept Rawhide again
+
 * Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
 - Try to get new packages for *all* repos, including updates (bug 473966)
 - Fix UnicodeDecodeError downloading packages (bug 476862)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Apr 2009 21:41:21 -0000	1.9
+++ sources	22 Apr 2009 23:30:17 -0000	1.10
@@ -1 +1 @@
-c8afb8535a0fc74d216775d1f804d2d3  preupgrade-1.1.0pre1.tar.bz2
+5130c63fc6dd3b2dd39892ec1f2f3b39  preupgrade-1.1.0pre2.tar.bz2



From sgrubb at fedoraproject.org  Wed Apr 22 23:34:34 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 23:34:34 +0000 (UTC)
Subject: rpms/prelude-manager/devel prelude-manager.spec,1.13,1.14
Message-ID: <20090422233434.0ED79700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12287

Modified Files:
	prelude-manager.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-3
- Adjusted permissions on dirs and conf files



Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/devel/prelude-manager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- prelude-manager.spec	27 Feb 2009 02:14:35 -0000	1.13
+++ prelude-manager.spec	22 Apr 2009 23:34:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		prelude-manager           
 Version:	0.9.14.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
@@ -133,8 +133,8 @@
 %files
 %defattr(0755,root,root,-)
 %doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README 
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
 %dir %{_bindir}/%{name}
 %dir %{_libdir}/%{name}/
@@ -146,10 +146,10 @@
 %{_libdir}/%{name}/reports/relaying.so
 %dir %{_libdir}/%{name}/decodes/
 %{_libdir}/%{name}/decodes/*.so
-%dir %{_localstatedir}/spool/%{name}/
-%dir %{_localstatedir}/spool/%{name}/scheduler
-%dir %{_localstatedir}/run/%{name}/
-%dir %{_datadir}/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/scheduler
+%attr(0750,root,root) %dir %{_localstatedir}/run/%{name}/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/
 %attr(0644,root,root) %{_mandir}/man1/prelude-manager.1.gz
 
 %files db-plugin
@@ -159,7 +159,7 @@
 %files xml-plugin
 %defattr(-,root,root)
 %{_libdir}/%{name}/reports/xmlmod.so
-%dir %{_datadir}/%{name}/xmlmod/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/xmlmod/
 %{_datadir}/%{name}/xmlmod/*
 
 %files smtp-plugin
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-3
+- Adjusted permissions on dirs and conf files
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wwoods at fedoraproject.org  Wed Apr 22 23:35:55 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Wed, 22 Apr 2009 23:35:55 +0000 (UTC)
Subject: rpms/preupgrade/F-10 .cvsignore, 1.6, 1.7 preupgrade.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <20090422233555.D1788700FE@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12809

Modified Files:
	.cvsignore preupgrade.spec sources 
Log Message:
pre2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Apr 2009 21:41:21 -0000	1.6
+++ .cvsignore	22 Apr 2009 23:35:54 -0000	1.7
@@ -1 +1 @@
-preupgrade-1.1.0pre1.tar.bz2
+preupgrade-1.1.0pre2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/preupgrade.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- preupgrade.spec	16 Apr 2009 21:41:21 -0000	1.11
+++ preupgrade.spec	22 Apr 2009 23:35:54 -0000	1.12
@@ -2,11 +2,11 @@
 Summary: Prepares a system for an upgrade
 Name: preupgrade
 Version: 1.1.0
-Release: 0.pre1%{?dist}
+Release: 0.pre2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Source: preupgrade-1.1.0pre1.tar.bz2
+Source: preupgrade-1.1.0pre2.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q -n preupgrade-1.1.0pre1
+%setup -q -n preupgrade-1.1.0pre2
 
 %build
 # no op
@@ -76,6 +76,10 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre2
+- Disable bootloader installation (bug 496952)
+- Fix handling of releases.txt to accept Rawhide again
+
 * Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
 - Try to get new packages for *all* repos, including updates (bug 473966)
 - Fix UnicodeDecodeError downloading packages (bug 476862)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Apr 2009 21:41:21 -0000	1.9
+++ sources	22 Apr 2009 23:35:54 -0000	1.10
@@ -1 +1 @@
-c8afb8535a0fc74d216775d1f804d2d3  preupgrade-1.1.0pre1.tar.bz2
+5130c63fc6dd3b2dd39892ec1f2f3b39  preupgrade-1.1.0pre2.tar.bz2



From lennart at fedoraproject.org  Wed Apr 22 23:37:05 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 22 Apr 2009 23:37:05 +0000 (UTC)
Subject: rpms/libatasmart/F-11
	0001-Seagate-s-ST9160821AS-drive-encodes-something-strang.patch, NONE,
	1.1 0001-don-t-claim-we-would-know-what-reallocated-event-cou.patch, 
	NONE,
	1.1 0001-use-only-uppermost-32-bits-for-reallocated-sectors-c.patch, 
	NONE, 1.1 libatasmart.spec, 1.15, 1.16
Message-ID: <20090422233705.4B3B3700FE@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13289

Modified Files:
	libatasmart.spec 
Added Files:
	0001-Seagate-s-ST9160821AS-drive-encodes-something-strang.patch 
	0001-don-t-claim-we-would-know-what-reallocated-event-cou.patch 
	0001-use-only-uppermost-32-bits-for-reallocated-sectors-c.patch 
Log Message:
Properly handle some ST and FUJITSU drive attributes. (rhbz 496087, 497107)

0001-Seagate-s-ST9160821AS-drive-encodes-something-strang.patch:

--- NEW FILE 0001-Seagate-s-ST9160821AS-drive-encodes-something-strang.patch ---
>From d274be25f7cd7ac60f5c10dcf569b57019e803b2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 23 Apr 2009 00:30:19 +0200
Subject: [PATCH] Seagate's ST9160821AS drive encodes something strange in attribute 9

Attribute 9 of ST9160821AS apparently is not the power on time in hours.
Since we have no idea what it is and how it is encoded this adds a quirk
to mark the attribute as 'unknown' for this drive.

See rhbz #497107.
---
 atasmart.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/atasmart.c b/atasmart.c
index 8b44aa4..5cf6c30 100644
--- a/atasmart.c
+++ b/atasmart.c
@@ -1205,6 +1205,7 @@ typedef enum SkSmartQuirk {
         SK_SMART_QUIRK_194_UNKNOWN = 64,
         SK_SMART_QUIRK_200_WRITEERRORCOUNT = 128,
         SK_SMART_QUIRK_201_DETECTEDTACOUNT = 256,
+        SK_SMART_QUIRK_9_UNKNOWN = 512
 } SkSmartQuirk;
 
 /* %STRINGPOOLSTART% */
@@ -1218,6 +1219,7 @@ static const char *quirk_name[] = {
         "194_UNKNOWN",
         "200_WRITEERRORCOUNT",
         "201_DETECTEDTACOUNT",
+        "9_UNKNOWN",
         NULL
 };
 /* %STRINGPOOLSTOP% */
@@ -1230,6 +1232,12 @@ typedef struct SkSmartQuirkDatabase {
 
 static const SkSmartQuirkDatabase quirk_database[] = { {
 
+        /*** Seagate */
+                "^ST9160821AS$",
+                NULL,
+                SK_SMART_QUIRK_9_UNKNOWN
+        }, {
+
         /*** Fujitsu */
                 "^FUJITSU MHR2040AT$",
                 NULL,
@@ -1451,7 +1459,8 @@ static const SkSmartAttributeInfo *lookup_attribute(SkDisk *d, uint8_t id) {
                                                 "power-on-half-minutes", SK_SMART_ATTRIBUTE_UNIT_MSECONDS
                                         };
                                         return &a;
-                                }
+                                } else if (quirk & SK_SMART_QUIRK_9_UNKNOWN)
+                                        return NULL;
                                 /* %STRINGPOOLSTOP% */
 
                                 break;
-- 
1.6.2.2


0001-don-t-claim-we-would-know-what-reallocated-event-cou.patch:

--- NEW FILE 0001-don-t-claim-we-would-know-what-reallocated-event-cou.patch ---
>From 1d770b0d655cb20dfd093f012eaef72b2efe07fa Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 23 Apr 2009 00:28:54 +0200
Subject: [PATCH] don't claim we would know what reallocated-event-count actually is

We don't reliably know what this actually is on many drives and since it
is redundant to reallocated-sectors-count it's no loss to admit that we
have no clue.

See rhbz #497107.
---
 atasmart.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/atasmart.c b/atasmart.c
index 053cb88..8b44aa4 100644
--- a/atasmart.c
+++ b/atasmart.c
@@ -1165,14 +1165,14 @@ static const SkSmartAttributeInfo const attribute_info[256] = {
         [193] = { "load-cycle-count",            SK_SMART_ATTRIBUTE_UNIT_NONE },
         [194] = { "temperature-celsius-2",       SK_SMART_ATTRIBUTE_UNIT_MKELVIN },
         [195] = { "hardware-ecc-recovered",      SK_SMART_ATTRIBUTE_UNIT_NONE },
-        [196] = { "reallocated-event-count",     SK_SMART_ATTRIBUTE_UNIT_SECTORS },
+        [196] = { "reallocated-event-count",     SK_SMART_ATTRIBUTE_UNIT_NONE },
         [197] = { "current-pending-sector",      SK_SMART_ATTRIBUTE_UNIT_SECTORS },
         [198] = { "offline-uncorrectable",       SK_SMART_ATTRIBUTE_UNIT_SECTORS },
         [199] = { "udma-crc-error-count",        SK_SMART_ATTRIBUTE_UNIT_NONE },
         [200] = { "multi-zone-error-rate",       SK_SMART_ATTRIBUTE_UNIT_NONE },
         [201] = { "soft-read-error-rate",        SK_SMART_ATTRIBUTE_UNIT_NONE },
         [202] = { "ta-increase-count",           SK_SMART_ATTRIBUTE_UNIT_NONE },
-        [203] = { "run-out-cancel",              SK_SMART_ATTRIBUTE_UNIT_NONE },
+        [203] = { "run-out-cancel",              SK_SMART_ATTRIBUTE_UNIT_UNKNOWN },
         [204] = { "shock-count-write-open",      SK_SMART_ATTRIBUTE_UNIT_NONE },
         [205] = { "shock-rate-write-open",       SK_SMART_ATTRIBUTE_UNIT_NONE },
         [206] = { "flying-height",               SK_SMART_ATTRIBUTE_UNIT_UNKNOWN },
@@ -1665,7 +1665,6 @@ int sk_disk_smart_parse_attributes(SkDisk *d, SkSmartAttributeParseCallback cb,
 
                 /* Handle a few fields specially */
                 if ((!strcmp(a.name, "reallocated-sector-count") ||
-                     !strcmp(a.name, "reallocated-event-count") ||
                      !strcmp(a.name, "current-pending-sector")) &&
                     a.pretty_unit == SK_SMART_ATTRIBUTE_UNIT_SECTORS &&
                     a.pretty_value > 0) {
-- 
1.6.2.2


0001-use-only-uppermost-32-bits-for-reallocated-sectors-c.patch:

--- NEW FILE 0001-use-only-uppermost-32-bits-for-reallocated-sectors-c.patch ---
>From aa1f82fd2ba0cd0345cb5a36a66de64a0b70d321 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 23 Apr 2009 00:25:39 +0200
Subject: [PATCH] use only uppermost 32 bits for reallocated-sectors-count attribute pretty value

This seems to fix the attribute for Fujitsu drives. And those 32 bit
should be enough to still encode bad sectors up to 2TB which should be
more than enough. Hence it is probably safe to ignore the remaing 16 bit
even on non-Fujitsu drives.

See rhbz #496087.
---
 atasmart.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/atasmart.c b/atasmart.c
index 20c3931..053cb88 100644
--- a/atasmart.c
+++ b/atasmart.c
@@ -1129,6 +1129,8 @@ static void make_pretty(SkSmartAttributeParsedData *a) {
                  !strcmp(a->name, "loaded-hours") ||
                  !strcmp(a->name, "head-flying-hours"))
                 a->pretty_value = fourtyeight * 60 * 60 * 1000;
+        else if (!strcmp(a->name, "reallocated-sector-count"))
+                a->pretty_value = fourtyeight & 0xFFFFFFFFU;
         else
                 a->pretty_value = fourtyeight;
 }
-- 
1.6.2.2



Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-11/libatasmart.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libatasmart.spec	15 Apr 2009 22:08:55 -0000	1.15
+++ libatasmart.spec	22 Apr 2009 23:37:01 -0000	1.16
@@ -1,6 +1,6 @@
 Name: libatasmart
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/public/libatasmart-%{version}.tar.gz
@@ -8,6 +8,9 @@
 Url: http://git.0pointer.de/?p=libatasmart.git;a=summary
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libudev-devel
+Patch1: 0001-don-t-claim-we-would-know-what-reallocated-event-cou.patch
+Patch2: 0001-Seagate-s-ST9160821AS-drive-encodes-something-strang.patch
+Patch3: 0001-use-only-uppermost-32-bits-for-reallocated-sectors-c.patch
 
 %description
 A small and lightweight parser library for ATA S.M.A.R.T. hard disk
@@ -27,6 +30,9 @@
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-static
@@ -55,6 +61,9 @@
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC*
 
 %changelog
+* Wed Apr 22 2009 Lennart Poettering <lpoetter at redhat.com> 0.12-2
+- Properly handle some ST and FUJITSU drive attributes. (rhbz 496087, 497107)
+
 * Wed Apr 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.12-1
 - New upstream release
 



From wwoods at fedoraproject.org  Wed Apr 22 23:40:41 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Wed, 22 Apr 2009 23:40:41 +0000 (UTC)
Subject: rpms/preupgrade/F-11 .cvsignore, 1.6, 1.7 preupgrade.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090422234041.7F7AC700FE@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14687

Modified Files:
	.cvsignore preupgrade.spec sources 
Log Message:
pre2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Apr 2009 21:39:33 -0000	1.6
+++ .cvsignore	22 Apr 2009 23:40:39 -0000	1.7
@@ -1 +1 @@
-preupgrade-1.1.0pre1.tar.bz2
+preupgrade-1.1.0pre2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/preupgrade.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- preupgrade.spec	16 Apr 2009 21:39:34 -0000	1.13
+++ preupgrade.spec	22 Apr 2009 23:40:39 -0000	1.14
@@ -2,11 +2,11 @@
 Summary: Prepares a system for an upgrade
 Name: preupgrade
 Version: 1.1.0
-Release: 0.pre1%{?dist}
+Release: 0.pre2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 #Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Source: preupgrade-1.1.0pre1.tar.bz2
+Source: preupgrade-1.1.0pre2.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q -n preupgrade-1.1.0pre1
+%setup -q -n preupgrade-1.1.0pre2
 
 %build
 # no op
@@ -76,6 +76,10 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Wed Apr 22 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre2
+- Disable bootloader installation (bug 496952)
+- Fix handling of releases.txt to accept Rawhide again
+
 * Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
 - Try to get new packages for *all* repos, including updates (bug 473966)
 - Fix UnicodeDecodeError downloading packages (bug 476862)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Apr 2009 21:39:34 -0000	1.9
+++ sources	22 Apr 2009 23:40:39 -0000	1.10
@@ -1 +1 @@
-c8afb8535a0fc74d216775d1f804d2d3  preupgrade-1.1.0pre1.tar.bz2
+5130c63fc6dd3b2dd39892ec1f2f3b39  preupgrade-1.1.0pre2.tar.bz2



From sgrubb at fedoraproject.org  Wed Apr 22 23:42:42 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 23:42:42 +0000 (UTC)
Subject: rpms/prelude-manager/F-11 prelude-manager.spec,1.13,1.14
Message-ID: <20090422234243.15055700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15568

Modified Files:
	prelude-manager.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-3
- Adjusted permissions on dirs and conf files



Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-11/prelude-manager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- prelude-manager.spec	27 Feb 2009 02:14:35 -0000	1.13
+++ prelude-manager.spec	22 Apr 2009 23:42:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		prelude-manager           
 Version:	0.9.14.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
@@ -133,8 +133,8 @@
 %files
 %defattr(0755,root,root,-)
 %doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README 
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
 %dir %{_bindir}/%{name}
 %dir %{_libdir}/%{name}/
@@ -146,10 +146,10 @@
 %{_libdir}/%{name}/reports/relaying.so
 %dir %{_libdir}/%{name}/decodes/
 %{_libdir}/%{name}/decodes/*.so
-%dir %{_localstatedir}/spool/%{name}/
-%dir %{_localstatedir}/spool/%{name}/scheduler
-%dir %{_localstatedir}/run/%{name}/
-%dir %{_datadir}/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/scheduler
+%attr(0750,root,root) %dir %{_localstatedir}/run/%{name}/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/
 %attr(0644,root,root) %{_mandir}/man1/prelude-manager.1.gz
 
 %files db-plugin
@@ -159,7 +159,7 @@
 %files xml-plugin
 %defattr(-,root,root)
 %{_libdir}/%{name}/reports/xmlmod.so
-%dir %{_datadir}/%{name}/xmlmod/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/xmlmod/
 %{_datadir}/%{name}/xmlmod/*
 
 %files smtp-plugin
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-3
+- Adjusted permissions on dirs and conf files
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wwoods at fedoraproject.org  Wed Apr 22 23:47:31 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Wed, 22 Apr 2009 23:47:31 +0000 (UTC)
Subject: rpms/preupgrade/devel .cvsignore, 1.5, 1.6 preupgrade.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20090422234731.AF99B700FE@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17051

Modified Files:
	.cvsignore preupgrade.spec sources 
Log Message:
pre2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Dec 2008 23:32:39 -0000	1.5
+++ .cvsignore	22 Apr 2009 23:47:00 -0000	1.6
@@ -1 +1 @@
-preupgrade-1.0.1.tar.gz
+preupgrade-1.1.0pre2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- preupgrade.spec	27 Feb 2009 02:18:18 -0000	1.12
+++ preupgrade.spec	22 Apr 2009 23:47:00 -0000	1.13
@@ -1,11 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-Summary: Preresolves dependencies and prepares a system for an upgrade
+Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.0.1
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 0.pre2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+#Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+Source: preupgrade-1.1.0pre2.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,11 +38,12 @@
 %endif
 
 %description
-Preresolves all dependencies, downloads the packages and makes your system 
-ready for an upgrade via anaconda.
+preupgrade prepares your Fedora system for an upgrade to the next version
+by examining your system, downloading all the files needed for the upgrade,
+and then setting up your system to perform the upgrade after rebooting.
 
 %prep
-%setup -q
+%setup -q -n preupgrade-1.1.0pre2
 
 %build
 # no op
@@ -74,8 +76,17 @@
 %{python_sitelib}/%{name}
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 22 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre2
+- Disable bootloader installation (bug 496952)
+- Fix handling of releases.txt to accept Rawhide again
+
+* Thu Apr 16 2009 Will Woods <wwoods at redhat.com> - 1.1.0-0.pre1
+- Try to get new packages for *all* repos, including updates (bug 473966)
+- Fix UnicodeDecodeError downloading packages (bug 476862)
+- Fix traceback if network isn't up at startup (bug 474177)
+- Specify which system to upgrade in kickstart (bug 473016)
+- Fix traceback with certain mirrors (bug 487743)
+- Fix problems with "excludes=" in yum.conf (bug 491577)
 
 * Mon Dec  8 2008 Will Woods <wwoods at redhat.com> - 1.0.1-1
 - Fix yaboot Conflicts: to allow installation on ppc (bug 473065)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Dec 2008 23:32:39 -0000	1.8
+++ sources	22 Apr 2009 23:47:00 -0000	1.9
@@ -1 +1 @@
-7682a56b49fe0632edb24173eacccb27  preupgrade-1.0.1.tar.gz
+5130c63fc6dd3b2dd39892ec1f2f3b39  preupgrade-1.1.0pre2.tar.bz2



From sgrubb at fedoraproject.org  Wed Apr 22 23:58:33 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 22 Apr 2009 23:58:33 +0000 (UTC)
Subject: rpms/prelude-manager/F-10 prelude-manager.spec,1.11,1.12
Message-ID: <20090422235833.91167700FE@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21405

Modified Files:
	prelude-manager.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-2
- Adjusted permissions on dirs and conf files



Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-10/prelude-manager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prelude-manager.spec	27 Aug 2008 15:57:35 -0000	1.11
+++ prelude-manager.spec	22 Apr 2009 23:58:32 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		prelude-manager           
 Version:	0.9.14.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
@@ -133,8 +133,8 @@
 %files
 %defattr(0755,root,root,-)
 %doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README 
-%config %dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*
+%config (0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
 %dir %{_bindir}/%{name}
 %dir %{_libdir}/%{name}/
@@ -146,10 +146,10 @@
 %{_libdir}/%{name}/reports/relaying.so
 %dir %{_libdir}/%{name}/decodes/
 %{_libdir}/%{name}/decodes/*.so
-%dir %{_localstatedir}/spool/%{name}/
-%dir %{_localstatedir}/spool/%{name}/scheduler
-%dir %{_localstatedir}/run/%{name}/
-%dir %{_datadir}/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/scheduler
+%attr(0750,root,root) %dir %{_localstatedir}/run/%{name}/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/
 %attr(0644,root,root) %{_mandir}/man1/prelude-manager.1.gz
 
 %files db-plugin
@@ -159,7 +159,7 @@
 %files xml-plugin
 %defattr(-,root,root)
 %{_libdir}/%{name}/reports/xmlmod.so
-%dir %{_datadir}/%{name}/xmlmod/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/xmlmod/
 %{_datadir}/%{name}/xmlmod/*
 
 %files smtp-plugin
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-2
+- Adjusted permissions on dirs and conf files
+
 * Wed Aug 27 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-1
 - new upstream version
 



From sgrubb at fedoraproject.org  Thu Apr 23 00:07:36 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 23 Apr 2009 00:07:36 +0000 (UTC)
Subject: rpms/prelude-manager/F-9 prelude-manager.spec,1.8,1.9
Message-ID: <20090423000738.8FDD870106@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24690

Modified Files:
	prelude-manager.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-2
- Adjusted permissions on dirs and conf files



Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/prelude-manager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- prelude-manager.spec	10 Sep 2008 15:30:50 -0000	1.8
+++ prelude-manager.spec	23 Apr 2009 00:07:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		prelude-manager           
 Version:	0.9.14.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
@@ -126,9 +126,9 @@
 
 %files
 %defattr(0755,root,root,-)
-%doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README
-%config %dir %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/*
+%doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README 
+%config (0750,root,root) %dir %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
 %dir %{_bindir}/%{name}
 %dir %{_libdir}/%{name}/
@@ -140,10 +140,10 @@
 %{_libdir}/%{name}/reports/relaying.so
 %dir %{_libdir}/%{name}/decodes/
 %{_libdir}/%{name}/decodes/*.so
-%dir %{_localstatedir}/spool/%{name}/
-%dir %{_localstatedir}/spool/%{name}/scheduler
-%dir %{_localstatedir}/run/%{name}/
-%dir %{_datadir}/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/
+%attr(0750,root,root) %dir %{_localstatedir}/spool/%{name}/scheduler
+%attr(0750,root,root) %dir %{_localstatedir}/run/%{name}/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/
 %attr(0644,root,root) %{_mandir}/man1/prelude-manager.1.gz
 
 %files db-plugin
@@ -153,7 +153,7 @@
 %files xml-plugin
 %defattr(-,root,root)
 %{_libdir}/%{name}/reports/xmlmod.so
-%dir %{_datadir}/%{name}/xmlmod/
+%attr(0750,root,root) %dir %{_datadir}/%{name}/xmlmod/
 %{_datadir}/%{name}/xmlmod/*
 
 %files smtp-plugin
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-2
+- Adjusted permissions on dirs and conf files
+
 * Wed Sep 10 2008 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-1
 - new upstream version
 - Prelude-Manager-SMTP plugin is now included



From sgrubb at fedoraproject.org  Thu Apr 23 00:13:35 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 23 Apr 2009 00:13:35 +0000 (UTC)
Subject: rpms/prelude-manager/F-9 prelude-manager.spec,1.9,1.10
Message-ID: <20090423001336.2039270106@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26855

Modified Files:
	prelude-manager.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-2
- Adjusted permissions on dirs and conf files



Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/prelude-manager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- prelude-manager.spec	23 Apr 2009 00:07:32 -0000	1.9
+++ prelude-manager.spec	23 Apr 2009 00:13:32 -0000	1.10
@@ -127,7 +127,7 @@
 %files
 %defattr(0755,root,root,-)
 %doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README 
-%config (0750,root,root) %dir %{_sysconfdir}/%{name}/
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
 %dir %{_bindir}/%{name}



From cchance at fedoraproject.org  Thu Apr 23 00:14:10 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 23 Apr 2009 00:14:10 +0000 (UTC)
Subject: rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.1,1.2
Message-ID: <20090423001410.B5D6F70106@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-cangjie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26937

Modified Files:
	ibus-table-cangjie.spec 
Log Message:
refined file properties and updated description



Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/ibus-table-cangjie.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-table-cangjie.spec	16 Mar 2009 01:25:54 -0000	1.1
+++ ibus-table-cangjie.spec	23 Apr 2009 00:14:08 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:       ibus-table-cangjie
 Version:    1.1.0.20090309
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Cang Jie input methods for ibus-table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
@@ -23,9 +23,6 @@
 %description
 The package contains Cang Jie input methods for Table engine of IBus platform. 
 
-Cang Jie and Quick tables are released under Public Domain and icons are 
-released under GPLv2+.
-
 %prep
 %setup -q
 %__cp COPYING icons/COPYING.icons
@@ -61,16 +58,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie3.db
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.db
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
+%{_datadir}/ibus-table/tables/cangjie3.db
+%{_datadir}/ibus-table/tables/cangjie5.db
+%{_datadir}/ibus-table/tables/quick3.db
+%{_datadir}/ibus-table/tables/quick5.db
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
 %{_datadir}/ibus-table/icons/quick3.png
 %{_datadir}/ibus-table/icons/quick5.png
 
 %changelog
+* Thu Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090309-7.fc12
+- Refined file properties and updated description.
+
 * Fri Mar 13 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090309-6.fc11
 - Created Public Domain statement in for tables.
 



From sgrubb at fedoraproject.org  Thu Apr 23 00:18:46 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 23 Apr 2009 00:18:46 +0000 (UTC)
Subject: rpms/prelude-manager/F-10 prelude-manager.spec,1.12,1.13
Message-ID: <20090423001847.0622870106@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28818

Modified Files:
	prelude-manager.spec 
Log Message:
* Wed Apr 22 2009 Steve Grubb <sgrubb at redhat.com> 0.9.14.2-2
- Adjusted permissions on dirs and conf files



Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-10/prelude-manager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- prelude-manager.spec	22 Apr 2009 23:58:32 -0000	1.12
+++ prelude-manager.spec	23 Apr 2009 00:18:42 -0000	1.13
@@ -133,7 +133,7 @@
 %files
 %defattr(0755,root,root,-)
 %doc %attr(0644,root,root) AUTHORS README NEWS COPYING HACKING.README 
-%config (0750,root,root) %dir %{_sysconfdir}/%{name}/
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/*
 %{_initrddir}/%{name}
 %dir %{_bindir}/%{name}



From cchance at fedoraproject.org  Thu Apr 23 00:41:16 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 23 Apr 2009 00:41:16 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec,1.3,1.4
Message-ID: <20090423004116.7E1AA70104@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5240

Modified Files:
	ibus-table-erbi.spec 
Log Message:
refined file properties and updated description



Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-table-erbi.spec	7 Apr 2009 07:36:56 -0000	1.3
+++ ibus-table-erbi.spec	23 Apr 2009 00:41:12 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:       ibus-table-erbi
 Version:    1.1.0.20090407
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Erbi input methods for ibus-table
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -23,8 +23,6 @@
 %description
 The package contains Erbi input methods for Table engine of IBus platform. 
 
-Erbi is released under released under GPLv2.
-
 %prep
 %setup -q
 
@@ -54,10 +52,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/erbi_qs.db
+%{_datadir}/ibus-table/tables/erbi_qs.db
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Wed Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-4.fc12
+- Refined file properties and updated description.
+
 * Tue Apr 07 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-3.fc11
 - Fixed files typo.
 



From petersen at fedoraproject.org  Thu Apr 23 00:56:34 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 00:56:34 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.6,1.7
Message-ID: <20090423005634.6601D70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10576

Modified Files:
	ghc-X11.spec 
Log Message:
maybe define ghcrequires for mock, properly


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-X11.spec	19 Apr 2009 14:58:43 -0000	1.6
+++ ghc-X11.spec	23 Apr 2009 00:56:27 -0000	1.7
@@ -4,7 +4,7 @@
 %bcond_without prof
 
 # placate mock
-%{!?ghcrequires: %define ghcrequires() Requires:       %1}
+%{!?ghcrequires: %{expand:%%define ghcrequires() Requires:       %1}
 
 # ghc does not emit debug information
 %global debug_package %{nil}



From petersen at fedoraproject.org  Thu Apr 23 01:28:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:28:54 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.7,1.8
Message-ID: <20090423012854.811BC70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18176

Modified Files:
	ghc-X11.spec 
Log Message:
maybe define ghcrequires for mock, properly, really


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc-X11.spec	23 Apr 2009 00:56:27 -0000	1.7
+++ ghc-X11.spec	23 Apr 2009 01:28:53 -0000	1.8
@@ -4,7 +4,7 @@
 %bcond_without prof
 
 # placate mock
-%{!?ghcrequires: %{expand:%%define ghcrequires() Requires:       %1}
+%{!?ghcrequires: %{expand:%%define ghcrequires() Requires: %1}}
 
 # ghc does not emit debug information
 %global debug_package %{nil}



From cchance at fedoraproject.org  Thu Apr 23 01:39:44 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 23 Apr 2009 01:39:44 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec,1.4,1.5
Message-ID: <20090423013944.A9BC870104@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7951

Modified Files:
	ibus-table-erbi.spec 
Log Message:
rebuilt



Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ibus-table-erbi.spec	23 Apr 2009 00:41:12 -0000	1.4
+++ ibus-table-erbi.spec	23 Apr 2009 01:39:13 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:       ibus-table-erbi
 Version:    1.1.0.20090407
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Erbi input methods for ibus-table
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -56,6 +56,9 @@
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Wed Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-5.fc12
+- rebuilt
+
 * Wed Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-4.fc12
 - Refined file properties and updated description.
 



From cchance at fedoraproject.org  Thu Apr 23 01:42:21 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 23 Apr 2009 01:42:21 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec,1.5,1.6
Message-ID: <20090423014222.1464570107@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12010

Modified Files:
	ibus-table-erbi.spec 
Log Message:
rebuilt



Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ibus-table-erbi.spec	23 Apr 2009 01:39:13 -0000	1.5
+++ ibus-table-erbi.spec	23 Apr 2009 01:42:20 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:       ibus-table-erbi
 Version:    1.1.0.20090407
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Erbi input methods for ibus-table
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -56,6 +56,9 @@
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Wed Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-6.fc12
+- rebuilt
+
 * Wed Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090407-5.fc12
 - rebuilt
 



From ianweller at fedoraproject.org  Thu Apr 23 01:47:44 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 23 Apr 2009 01:47:44 +0000 (UTC)
Subject: rpms/gwibber/devel .cvsignore, 1.14, 1.15 gwibber.spec, 1.24,
	1.25 import.log, 1.15, 1.16 sources, 1.15, 1.16
Message-ID: <20090423014744.519BB70104@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17690/devel

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
gwibber-0.9.1-2.288bzr import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Apr 2009 02:28:55 -0000	1.14
+++ .cvsignore	23 Apr 2009 01:47:41 -0000	1.15
@@ -1 +1 @@
-gwibber-286bzr.tar.gz
+gwibber-tte-288bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gwibber.spec	21 Apr 2009 18:43:11 -0000	1.24
+++ gwibber.spec	23 Apr 2009 01:47:41 -0000	1.25
@@ -1,10 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 287
+%define bzr_rev 288
 
 Name:           gwibber
-Version:        1.0.1
-Release:        1.%{bzr_rev}bzr%{?dist}
+Version:        0.9.1
+Release:        2.%{bzr_rev}bzr%{?dist}
+Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -13,14 +14,13 @@
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # We need the template-theme-engine branch, for modern webkit
-#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine
-#  mv template-theme-engine gwibber/
+#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine gwibber
 #  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-tte-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-tte-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       libsoup
+Requires:       libsoup python-mako
 Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
 Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-sexy python-simplejson >= 1.9.1 gnome-python2-gnomekeyring
@@ -71,6 +71,11 @@
 
 
 %changelog
+* Wed Apr 22 2009 Ian Weller <ianweller at gmail.com> - 1:0.9.1-2.288bzr
+- Update to r288, gwibber will now scroll back to where it was before a refresh
+- Fix bugzilla.redhat.com/497108, add Requires: python-mako
+- Version number is actually 0.9.1 now (multiple branch switches on my part are at fault), add Epoch
+
 * Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1.287bzr
 - move to template-theme-engine branch, 287
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	10 Apr 2009 02:28:55 -0000	1.15
+++ import.log	23 Apr 2009 01:47:41 -0000	1.16
@@ -13,3 +13,4 @@
 gwibber-0_8-1_239bzr_fc10:HEAD:gwibber-0.8-1.239bzr.fc10.src.rpm:1234827314
 gwibber-0_9_1-1_251bzr_fc10:HEAD:gwibber-0.9.1-1.251bzr.fc10.src.rpm:1237347395
 gwibber-1_0_1-1_286bzr_fc10:HEAD:gwibber-1.0.1-1.286bzr.fc10.src.rpm:1239329825
+gwibber-0_9_1-2_288bzr_fc10:HEAD:gwibber-0.9.1-2.288bzr.fc10.src.rpm:1240451224


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Apr 2009 18:43:11 -0000	1.15
+++ sources	23 Apr 2009 01:47:41 -0000	1.16
@@ -1 +1 @@
-a7b010010b92f8a55edc7750d60e3584  gwibber-tte-287bzr.tar.gz
+cc48423215f3ef53596b1e4eaa808bbc  gwibber-tte-288bzr.tar.gz



From ianweller at fedoraproject.org  Thu Apr 23 01:48:58 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 23 Apr 2009 01:48:58 +0000 (UTC)
Subject: rpms/gwibber/F-11 .cvsignore, 1.15, 1.16 gwibber.spec, 1.24,
	1.25 import.log, 1.15, 1.16 sources, 1.15, 1.16
Message-ID: <20090423014858.15E4070104@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18272/F-11

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
gwibber-0.9.1-2.288bzr import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Apr 2009 18:43:10 -0000	1.15
+++ .cvsignore	23 Apr 2009 01:48:27 -0000	1.16
@@ -1 +1 @@
-gwibber-tte-287bzr.tar.gz
+gwibber-tte-288bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/gwibber.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gwibber.spec	21 Apr 2009 18:43:10 -0000	1.24
+++ gwibber.spec	23 Apr 2009 01:48:27 -0000	1.25
@@ -1,10 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 287
+%define bzr_rev 288
 
 Name:           gwibber
-Version:        1.0.1
-Release:        1.%{bzr_rev}bzr%{?dist}
+Version:        0.9.1
+Release:        2.%{bzr_rev}bzr%{?dist}
+Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -13,14 +14,13 @@
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # We need the template-theme-engine branch, for modern webkit
-#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine
-#  mv template-theme-engine gwibber/
+#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine gwibber
 #  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-tte-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-tte-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       libsoup
+Requires:       libsoup python-mako
 Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
 Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-sexy python-simplejson >= 1.9.1 gnome-python2-gnomekeyring
@@ -71,6 +71,11 @@
 
 
 %changelog
+* Wed Apr 22 2009 Ian Weller <ianweller at gmail.com> - 1:0.9.1-2.288bzr
+- Update to r288, gwibber will now scroll back to where it was before a refresh
+- Fix bugzilla.redhat.com/497108, add Requires: python-mako
+- Version number is actually 0.9.1 now (multiple branch switches on my part are at fault), add Epoch
+
 * Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1.287bzr
 - move to template-theme-engine branch, 287
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	10 Apr 2009 02:28:55 -0000	1.15
+++ import.log	23 Apr 2009 01:48:27 -0000	1.16
@@ -13,3 +13,4 @@
 gwibber-0_8-1_239bzr_fc10:HEAD:gwibber-0.8-1.239bzr.fc10.src.rpm:1234827314
 gwibber-0_9_1-1_251bzr_fc10:HEAD:gwibber-0.9.1-1.251bzr.fc10.src.rpm:1237347395
 gwibber-1_0_1-1_286bzr_fc10:HEAD:gwibber-1.0.1-1.286bzr.fc10.src.rpm:1239329825
+gwibber-0_9_1-2_288bzr_fc10:F-11:gwibber-0.9.1-2.288bzr.fc10.src.rpm:1240451281


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Apr 2009 18:43:10 -0000	1.15
+++ sources	23 Apr 2009 01:48:27 -0000	1.16
@@ -1 +1 @@
-a7b010010b92f8a55edc7750d60e3584  gwibber-tte-287bzr.tar.gz
+cc48423215f3ef53596b1e4eaa808bbc  gwibber-tte-288bzr.tar.gz



From pkgdb at fedoraproject.org  Thu Apr 23 01:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:49:41 +0000
Subject: [pkgdb] ipa-gothic-fonts was added for tagoh
Message-ID: <20090423014942.0940710F885@bastion2.fedora.phx.redhat.com>

petersen has added Package ipa-gothic-fonts with summary Japanese Gothic-typeface OpenType font by IPA
petersen has approved Package ipa-gothic-fonts
petersen has added a Fedora devel branch for ipa-gothic-fonts with an owner of tagoh
petersen has approved ipa-gothic-fonts in Fedora devel
petersen has approved Package ipa-gothic-fonts
petersen has set commit to Approved for provenpackager on ipa-gothic-fonts (Fedora devel)
petersen has set build to Approved for provenpackager on ipa-gothic-fonts (Fedora devel)
petersen has set checkout to Approved for provenpackager on ipa-gothic-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-gothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:49:42 +0000
Subject: [pkgdb] ipa-gothic-fonts (Fedora, 10) updated by petersen
Message-ID: <20090423014942.CFCE510F88A@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 10 branch for ipa-gothic-fonts
petersen has set commit to Approved for provenpackager on ipa-gothic-fonts (Fedora 10)
petersen has set build to Approved for provenpackager on ipa-gothic-fonts (Fedora 10)
petersen has set checkout to Approved for provenpackager on ipa-gothic-fonts (Fedora 10)
petersen approved watchbugzilla on ipa-gothic-fonts (Fedora 10) for fonts-sig
petersen approved watchcommits on ipa-gothic-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-gothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:49:42 +0000
Subject: [pkgdb] ipa-gothic-fonts (Fedora, 11) updated by petersen
Message-ID: <20090423014942.DB31A10F88C@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 11 branch for ipa-gothic-fonts
petersen has set commit to Approved for provenpackager on ipa-gothic-fonts (Fedora 11)
petersen has set build to Approved for provenpackager on ipa-gothic-fonts (Fedora 11)
petersen has set checkout to Approved for provenpackager on ipa-gothic-fonts (Fedora 11)
petersen approved watchbugzilla on ipa-gothic-fonts (Fedora 11) for fonts-sig
petersen approved watchcommits on ipa-gothic-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-gothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:49:42 +0000
Subject: [pkgdb] ipa-gothic-fonts (Fedora, devel) updated by petersen
Message-ID: <20090423014942.E4E2B10F88F@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on ipa-gothic-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on ipa-gothic-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-gothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:49:42 +0000
Subject: [pkgdb] ipa-gothic-fonts (Fedora, 9) updated by petersen
Message-ID: <20090423014942.EFA2310F892@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 9 branch for ipa-gothic-fonts
petersen has set commit to Approved for provenpackager on ipa-gothic-fonts (Fedora 9)
petersen has set build to Approved for provenpackager on ipa-gothic-fonts (Fedora 9)
petersen has set checkout to Approved for provenpackager on ipa-gothic-fonts (Fedora 9)
petersen approved watchbugzilla on ipa-gothic-fonts (Fedora 9) for fonts-sig
petersen approved watchcommits on ipa-gothic-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-gothic-fonts



From petersen at fedoraproject.org  Thu Apr 23 01:50:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:50:18 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts - New directory
Message-ID: <20090423015018.75BF370104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-gothic-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsp18894/rpms/ipa-gothic-fonts

Log Message:
Directory /cvs/pkgs/rpms/ipa-gothic-fonts added to the repository




From petersen at fedoraproject.org  Thu Apr 23 01:50:19 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:50:19 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts/devel - New directory
Message-ID: <20090423015019.511A770104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-gothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsp18894/rpms/ipa-gothic-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ipa-gothic-fonts/devel added to the repository




From ianweller at fedoraproject.org  Thu Apr 23 01:50:47 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 23 Apr 2009 01:50:47 +0000 (UTC)
Subject: rpms/gwibber/F-10 .cvsignore, 1.14, 1.15 gwibber.spec, 1.18,
	1.19 import.log, 1.14, 1.15 sources, 1.14, 1.15
Message-ID: <20090423015047.D6AD270104@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19060/F-10

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
gwibber-0.9.1-2.288bzr import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Apr 2009 02:36:19 -0000	1.14
+++ .cvsignore	23 Apr 2009 01:50:43 -0000	1.15
@@ -1 +1 @@
-gwibber-286bzr.tar.gz
+gwibber-tte-288bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/gwibber.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gwibber.spec	10 Apr 2009 02:36:19 -0000	1.18
+++ gwibber.spec	23 Apr 2009 01:50:43 -0000	1.19
@@ -1,10 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 286
+%define bzr_rev 288
 
 Name:           gwibber
-Version:        1.0.1
-Release:        1.%{bzr_rev}bzr%{?dist}
+Version:        0.9.1
+Release:        2.%{bzr_rev}bzr%{?dist}
+Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -12,13 +13,14 @@
 URL:            https://launchpad.net/gwibber
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  bzr branch -r %{bzr_rev} lp:gwibber
+# We need the template-theme-engine branch, for modern webkit
+#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine gwibber
 #  rm -rf gwibber/.bzr*
-#  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
-Source0:        %{name}-%{bzr_rev}bzr.tar.gz
+#  tar -czvf gwibber-tte-%{bzr_rev}bzr.tar.gz gwibber
+Source0:        %{name}-tte-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       libsoup
+Requires:       libsoup python-mako
 Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
 Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-sexy python-simplejson >= 1.9.1 gnome-python2-gnomekeyring
@@ -69,6 +71,14 @@
 
 
 %changelog
+* Wed Apr 22 2009 Ian Weller <ianweller at gmail.com> - 1:0.9.1-2.288bzr
+- Update to r288, gwibber will now scroll back to where it was before a refresh
+- Fix bugzilla.redhat.com/497108, add Requires: python-mako
+- Version number is actually 0.9.1 now (multiple branch switches on my part are at fault), add Epoch
+
+* Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-1.287bzr
+- move to template-theme-engine branch, 287
+
 * Thu Apr  9 2009 Ian Weller <ianweller at gmail.com> 1.0.1-1.286bzr
 - Update from upstream revision 286
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	10 Apr 2009 02:36:19 -0000	1.14
+++ import.log	23 Apr 2009 01:50:43 -0000	1.15
@@ -12,3 +12,4 @@
 gwibber-0_8-1_239bzr_fc10:F-10:gwibber-0.8-1.239bzr.fc10.src.rpm:1234827392
 gwibber-0_9_1-1_251bzr_fc10:F-10:gwibber-0.9.1-1.251bzr.fc10.src.rpm:1237347473
 gwibber-1_0_1-1_286bzr_fc10:F-10:gwibber-1.0.1-1.286bzr.fc10.src.rpm:1239330591
+gwibber-0_9_1-2_288bzr_fc10:F-10:gwibber-0.9.1-2.288bzr.fc10.src.rpm:1240451361


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Apr 2009 02:36:19 -0000	1.14
+++ sources	23 Apr 2009 01:50:43 -0000	1.15
@@ -1 +1 @@
-fb330eebe17f2a978a57564e5da177e4  gwibber-286bzr.tar.gz
+cc48423215f3ef53596b1e4eaa808bbc  gwibber-tte-288bzr.tar.gz



From petersen at fedoraproject.org  Thu Apr 23 01:51:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:51:00 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts Makefile,NONE,1.1
Message-ID: <20090423015100.0377070104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-gothic-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsp18894/rpms/ipa-gothic-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ipa-gothic-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ipa-gothic-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Thu Apr 23 01:51:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:51:01 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423015101.A743170104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-gothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsp18894/rpms/ipa-gothic-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipa-gothic-fonts


***** Error reading new file: [Errno 2] No such file or directory: '.cvsignore'

***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

***** Error reading new file: [Errno 2] No such file or directory: 'sources'



From pkgdb at fedoraproject.org  Thu Apr 23 01:52:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:52:27 +0000
Subject: [pkgdb] ipa-pgothic-fonts was added for tagoh
Message-ID: <20090423015227.CCA1010F884@bastion2.fedora.phx.redhat.com>

petersen has added Package ipa-pgothic-fonts with summary Japanese Proportional Gothic-typeface OpenType font by IPA
petersen has approved Package ipa-pgothic-fonts
petersen has added a Fedora devel branch for ipa-pgothic-fonts with an owner of tagoh
petersen has approved ipa-pgothic-fonts in Fedora devel
petersen has approved Package ipa-pgothic-fonts
petersen has set commit to Approved for provenpackager on ipa-pgothic-fonts (Fedora devel)
petersen has set build to Approved for provenpackager on ipa-pgothic-fonts (Fedora devel)
petersen has set checkout to Approved for provenpackager on ipa-pgothic-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pgothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:52:30 +0000
Subject: [pkgdb] ipa-pgothic-fonts (Fedora, 10) updated by petersen
Message-ID: <20090423015230.B72FB10F88B@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 10 branch for ipa-pgothic-fonts
petersen has set commit to Approved for provenpackager on ipa-pgothic-fonts (Fedora 10)
petersen has set build to Approved for provenpackager on ipa-pgothic-fonts (Fedora 10)
petersen has set checkout to Approved for provenpackager on ipa-pgothic-fonts (Fedora 10)
petersen approved watchbugzilla on ipa-pgothic-fonts (Fedora 10) for fonts-sig
petersen approved watchcommits on ipa-pgothic-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pgothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:52:30 +0000
Subject: [pkgdb] ipa-pgothic-fonts (Fedora, 9) updated by petersen
Message-ID: <20090423015230.BB7EE10F88E@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 9 branch for ipa-pgothic-fonts
petersen has set commit to Approved for provenpackager on ipa-pgothic-fonts (Fedora 9)
petersen has set build to Approved for provenpackager on ipa-pgothic-fonts (Fedora 9)
petersen has set checkout to Approved for provenpackager on ipa-pgothic-fonts (Fedora 9)
petersen approved watchbugzilla on ipa-pgothic-fonts (Fedora 9) for fonts-sig
petersen approved watchcommits on ipa-pgothic-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pgothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:52:30 +0000
Subject: [pkgdb] ipa-pgothic-fonts (Fedora, 11) updated by petersen
Message-ID: <20090423015230.C90F410F892@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 11 branch for ipa-pgothic-fonts
petersen has set commit to Approved for provenpackager on ipa-pgothic-fonts (Fedora 11)
petersen has set build to Approved for provenpackager on ipa-pgothic-fonts (Fedora 11)
petersen has set checkout to Approved for provenpackager on ipa-pgothic-fonts (Fedora 11)
petersen approved watchbugzilla on ipa-pgothic-fonts (Fedora 11) for fonts-sig
petersen approved watchcommits on ipa-pgothic-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pgothic-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 01:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 01:52:30 +0000
Subject: [pkgdb] ipa-pgothic-fonts (Fedora, devel) updated by petersen
Message-ID: <20090423015230.CDF3810F894@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on ipa-pgothic-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on ipa-pgothic-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pgothic-fonts



From petersen at fedoraproject.org  Thu Apr 23 01:53:07 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:53:07 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts - New directory
Message-ID: <20090423015307.07F2270104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE20291/rpms/ipa-pgothic-fonts

Log Message:
Directory /cvs/pkgs/rpms/ipa-pgothic-fonts added to the repository




From petersen at fedoraproject.org  Thu Apr 23 01:53:07 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:53:07 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts/devel - New directory
Message-ID: <20090423015307.C782A70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE20291/rpms/ipa-pgothic-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ipa-pgothic-fonts/devel added to the repository




From petersen at fedoraproject.org  Thu Apr 23 01:53:24 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:53:24 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts Makefile,NONE,1.1
Message-ID: <20090423015324.C601270104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE20291/rpms/ipa-pgothic-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ipa-pgothic-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ipa-pgothic-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Thu Apr 23 01:53:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 01:53:25 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090423015325.1A7FE70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE20291/rpms/ipa-pgothic-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipa-pgothic-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ipa-pgothic-fonts
# $Id: Makefile,v 1.1 2009/04/23 01:53:24 petersen Exp $
NAME := ipa-pgothic-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From airlied at fedoraproject.org  Thu Apr 23 02:10:54 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 23 Apr 2009 02:10:54 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.1-exa-create-pixmap2.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.439, 1.440
Message-ID: <20090423021054.A295A70104@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25954

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-exa-create-pixmap2.patch 
Log Message:
* Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 1.6.1-8
- xserver-1.6.1-exa-create-pixmap2.patch - add support for tiling create
  pixmap hook - need to fix firefox on ati rs690 crashes


xserver-1.6.1-exa-create-pixmap2.patch:

--- NEW FILE xserver-1.6.1-exa-create-pixmap2.patch ---
>From f270ca8e1788453babe292bf2e67d3d30459effa Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 23 Apr 2009 12:02:22 +1000
Subject: [PATCH] exa: add support for tiling to create pixmap hooks

This adds support for passing w/h/d info to the pixmap creation
hook in the driver so they can support tiling better.
---
 exa/exa.c |   11 +++++++----
 exa/exa.h |    4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/exa/exa.c b/exa/exa.c
index 9b7091d..9e284a4 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -285,7 +285,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
     if (w > 32767 || h > 32767)
 	return NullPixmap;
 
-    if (!pExaScr->info->CreatePixmap) {
+    if (!pExaScr->info->CreatePixmap && !pExaScr->info->CreatePixmap2) {
         pPixmap = fbCreatePixmap (pScreen, w, h, depth, usage_hint);
     } else {
         driver_alloc = 1;
@@ -319,7 +319,10 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
 	 */
 	pPixmap->devPrivate.ptr = NULL;
 
-        pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen, datasize, 0);
+	if (pExaScr->info->CreatePixmap2)
+		pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, usage_hint, bpp);
+	else
+		pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen, datasize, 0);
         if (!pExaPixmap->driverPriv) {
              fbDestroyPixmap(pPixmap);
              return NULL;
@@ -964,7 +967,7 @@ exaDriverInit (ScreenPtr		pScreen,
 
 	pExaScr->SavedModifyPixmapHeader = pScreen->ModifyPixmapHeader;
 	pScreen->ModifyPixmapHeader = exaModifyPixmapHeader;
-	if (!pExaScr->info->CreatePixmap) {
+        if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
 	    LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %lu bytes\n",
 		       pScreen->myNum,
 		       pExaScr->info->memorySize - pExaScr->info->offScreenBase);
@@ -977,7 +980,7 @@ exaDriverInit (ScreenPtr		pScreen,
     else
         LogMessage(X_INFO, "EXA(%d): No offscreen pixmaps\n", pScreen->myNum);
 
-    if (!pExaScr->info->CreatePixmap) {
+    if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
 	DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->offScreenBase,
 		    pExaScr->info->memorySize));
 	if (pExaScr->info->offScreenBase < pExaScr->info->memorySize) {
diff --git a/exa/exa.h b/exa/exa.h
index 5982e1a..d14b02d 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -39,7 +39,7 @@
 #include "fb.h"
 
 #define EXA_VERSION_MAJOR   2
-#define EXA_VERSION_MINOR   4
+#define EXA_VERSION_MINOR   5
 #define EXA_VERSION_RELEASE 0
 
 typedef struct _ExaOffscreenArea ExaOffscreenArea;
@@ -711,6 +711,8 @@ typedef struct _ExaDriver {
                               int depth, int bitsPerPixel, int devKind,
                               pointer pPixData);
 
+    void *(*CreatePixmap2)(ScreenPtr pScreen, int width, int height,
+			   int depth, int usage_hint, int bitsPerPixel);
     /** @} */
 } ExaDriverRec, *ExaDriverPtr;
 
-- 
1.6.0.6



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- xorg-x11-server.spec	22 Apr 2009 14:51:25 -0000	1.439
+++ xorg-x11-server.spec	23 Apr 2009 02:10:23 -0000	1.440
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -109,6 +109,7 @@
 
 # Nominated for 1.6.2
 Patch6033: xserver-1.6.1-activate-device.patch
+Patch6034: xserver-1.6.1-exa-create-pixmap2.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -542,6 +543,10 @@
 
 
 %changelog
+* Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 1.6.1-8
+- xserver-1.6.1-exa-create-pixmap2.patch - add support for tiling create
+  pixmap hook - need to fix firefox on ati rs690 crashes
+
 * Wed Apr 22 2009 Adam Jackson <ajax at redhat.com> 1.6.1-7
 - Conflict with too-old versions of xorg-x11-drivers. (#497144)
 



From pkgdb at fedoraproject.org  Thu Apr 23 02:13:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:13:39 +0000
Subject: [pkgdb] ipa-mincho-fonts was added for tagoh
Message-ID: <20090423021339.C646D10F884@bastion2.fedora.phx.redhat.com>

petersen has added Package ipa-mincho-fonts with summary Japanese Mincho-typeface OpenType font by IPA
petersen has approved Package ipa-mincho-fonts
petersen has added a Fedora devel branch for ipa-mincho-fonts with an owner of tagoh
petersen has approved ipa-mincho-fonts in Fedora devel
petersen has approved Package ipa-mincho-fonts
petersen has set commit to Approved for provenpackager on ipa-mincho-fonts (Fedora devel)
petersen has set build to Approved for provenpackager on ipa-mincho-fonts (Fedora devel)
petersen has set checkout to Approved for provenpackager on ipa-mincho-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-mincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:13:40 +0000
Subject: [pkgdb] ipa-mincho-fonts (Fedora, devel) updated by petersen
Message-ID: <20090423021340.C37F610F88A@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on ipa-mincho-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on ipa-mincho-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-mincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:13:40 +0000
Subject: [pkgdb] ipa-mincho-fonts (Fedora, 10) updated by petersen
Message-ID: <20090423021340.C9DA710F88C@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 10 branch for ipa-mincho-fonts
petersen has set commit to Approved for provenpackager on ipa-mincho-fonts (Fedora 10)
petersen has set build to Approved for provenpackager on ipa-mincho-fonts (Fedora 10)
petersen has set checkout to Approved for provenpackager on ipa-mincho-fonts (Fedora 10)
petersen approved watchbugzilla on ipa-mincho-fonts (Fedora 10) for fonts-sig
petersen approved watchcommits on ipa-mincho-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-mincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:13:40 +0000
Subject: [pkgdb] ipa-mincho-fonts (Fedora, 9) updated by petersen
Message-ID: <20090423021340.CEE0810F88F@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 9 branch for ipa-mincho-fonts
petersen has set commit to Approved for provenpackager on ipa-mincho-fonts (Fedora 9)
petersen has set build to Approved for provenpackager on ipa-mincho-fonts (Fedora 9)
petersen has set checkout to Approved for provenpackager on ipa-mincho-fonts (Fedora 9)
petersen approved watchbugzilla on ipa-mincho-fonts (Fedora 9) for fonts-sig
petersen approved watchcommits on ipa-mincho-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-mincho-fonts



From cchance at fedoraproject.org  Thu Apr 23 02:13:51 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 23 Apr 2009 02:13:51 +0000 (UTC)
Subject: rpms/ibus-table-wubi/devel ibus-table-wubi.spec,1.2,1.3
Message-ID: <20090423021351.82A5B70104@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-wubi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27067

Modified Files:
	ibus-table-wubi.spec 
Log Message:
refined file properties and updated description



Index: ibus-table-wubi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/devel/ibus-table-wubi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ibus-table-wubi.spec	2 Apr 2009 00:26:03 -0000	1.2
+++ ibus-table-wubi.spec	23 Apr 2009 02:13:20 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:       ibus-table-wubi
 Version:    1.1.0.20090327
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Wubi input methods for ibus-table
 License:    GPLv3+
 Group:      System Environment/Libraries
@@ -22,8 +22,6 @@
 %description
 The package contains Wubi input methods for Table engine of IBus platform. 
 
-Wubi is released under released under GPLv3.
-
 %prep
 %setup -q
 
@@ -51,10 +49,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/wubi86.db
+%{_datadir}/ibus-table/tables/wubi86.db
 %{_datadir}/ibus-table/icons/wubi86.svg
 
 %changelog
+* Thu Apr 23 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-5.fc12
+- Refined file properties and updated description.
+
 * Wed Apr 01 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-4.fc11
 - Correct license to GPLv3+ and preserve timestamp during make install.
 



From petersen at fedoraproject.org  Thu Apr 23 02:14:04 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:14:04 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts - New directory
Message-ID: <20090423021404.C7A4970104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-mincho-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsq27496/rpms/ipa-mincho-fonts

Log Message:
Directory /cvs/pkgs/rpms/ipa-mincho-fonts added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 02:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:13:40 +0000
Subject: [pkgdb] ipa-mincho-fonts (Fedora, 11) updated by petersen
Message-ID: <20090423021340.DC2C910F892@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 11 branch for ipa-mincho-fonts
petersen has set commit to Approved for provenpackager on ipa-mincho-fonts (Fedora 11)
petersen has set build to Approved for provenpackager on ipa-mincho-fonts (Fedora 11)
petersen has set checkout to Approved for provenpackager on ipa-mincho-fonts (Fedora 11)
petersen approved watchbugzilla on ipa-mincho-fonts (Fedora 11) for fonts-sig
petersen approved watchcommits on ipa-mincho-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-mincho-fonts



From petersen at fedoraproject.org  Thu Apr 23 02:14:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:14:05 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts/devel - New directory
Message-ID: <20090423021405.8D56370104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-mincho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsq27496/rpms/ipa-mincho-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ipa-mincho-fonts/devel added to the repository




From petersen at fedoraproject.org  Thu Apr 23 02:14:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:14:35 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts Makefile,NONE,1.1
Message-ID: <20090423021435.532CF70106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-mincho-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsq27496/rpms/ipa-mincho-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ipa-mincho-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ipa-mincho-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Thu Apr 23 02:14:36 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:14:36 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423021436.3292270106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-mincho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsq27496/rpms/ipa-mincho-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipa-mincho-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ipa-mincho-fonts
# $Id: Makefile,v 1.1 2009/04/23 02:14:35 petersen Exp $
NAME := ipa-mincho-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 02:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:18:47 +0000
Subject: [pkgdb] ipa-pmincho-fonts (Fedora, devel) updated by petersen
Message-ID: <20090423021847.1EAD410F88B@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on ipa-pmincho-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on ipa-pmincho-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pmincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:18:43 +0000
Subject: [pkgdb] ipa-pmincho-fonts was added for tagoh
Message-ID: <20090423021843.B8C5310F884@bastion2.fedora.phx.redhat.com>

petersen has added Package ipa-pmincho-fonts with summary Japanese Proportional Mincho-typeface OpenType font by IPA
petersen has approved Package ipa-pmincho-fonts
petersen has added a Fedora devel branch for ipa-pmincho-fonts with an owner of tagoh
petersen has approved ipa-pmincho-fonts in Fedora devel
petersen has approved Package ipa-pmincho-fonts
petersen has set commit to Approved for provenpackager on ipa-pmincho-fonts (Fedora devel)
petersen has set build to Approved for provenpackager on ipa-pmincho-fonts (Fedora devel)
petersen has set checkout to Approved for provenpackager on ipa-pmincho-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pmincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:18:47 +0000
Subject: [pkgdb] ipa-pmincho-fonts (Fedora, 10) updated by petersen
Message-ID: <20090423021847.235EC10F88D@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 10 branch for ipa-pmincho-fonts
petersen has set commit to Approved for provenpackager on ipa-pmincho-fonts (Fedora 10)
petersen has set build to Approved for provenpackager on ipa-pmincho-fonts (Fedora 10)
petersen has set checkout to Approved for provenpackager on ipa-pmincho-fonts (Fedora 10)
petersen approved watchbugzilla on ipa-pmincho-fonts (Fedora 10) for fonts-sig
petersen approved watchcommits on ipa-pmincho-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pmincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:18:47 +0000
Subject: [pkgdb] ipa-pmincho-fonts (Fedora, 9) updated by petersen
Message-ID: <20090423021847.361A010F893@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 9 branch for ipa-pmincho-fonts
petersen has set commit to Approved for provenpackager on ipa-pmincho-fonts (Fedora 9)
petersen has set build to Approved for provenpackager on ipa-pmincho-fonts (Fedora 9)
petersen has set checkout to Approved for provenpackager on ipa-pmincho-fonts (Fedora 9)
petersen approved watchbugzilla on ipa-pmincho-fonts (Fedora 9) for fonts-sig
petersen approved watchcommits on ipa-pmincho-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pmincho-fonts



From pkgdb at fedoraproject.org  Thu Apr 23 02:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 02:18:47 +0000
Subject: [pkgdb] ipa-pmincho-fonts (Fedora, 11) updated by petersen
Message-ID: <20090423021847.2E18F10F890@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 11 branch for ipa-pmincho-fonts
petersen has set commit to Approved for provenpackager on ipa-pmincho-fonts (Fedora 11)
petersen has set build to Approved for provenpackager on ipa-pmincho-fonts (Fedora 11)
petersen has set checkout to Approved for provenpackager on ipa-pmincho-fonts (Fedora 11)
petersen approved watchbugzilla on ipa-pmincho-fonts (Fedora 11) for fonts-sig
petersen approved watchcommits on ipa-pmincho-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ipa-pmincho-fonts



From petersen at fedoraproject.org  Thu Apr 23 02:19:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:19:01 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts - New directory
Message-ID: <20090423021901.474DE70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE30293/rpms/ipa-pmincho-fonts

Log Message:
Directory /cvs/pkgs/rpms/ipa-pmincho-fonts added to the repository




From petersen at fedoraproject.org  Thu Apr 23 02:19:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:19:01 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts/devel - New directory
Message-ID: <20090423021901.A4EE070104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE30293/rpms/ipa-pmincho-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ipa-pmincho-fonts/devel added to the repository




From petersen at fedoraproject.org  Thu Apr 23 02:19:41 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:19:41 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts Makefile,NONE,1.1
Message-ID: <20090423021941.70C4C70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE30293/rpms/ipa-pmincho-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ipa-pmincho-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ipa-pmincho-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Thu Apr 23 02:19:42 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 02:19:42 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090423021942.0524E70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsE30293/rpms/ipa-pmincho-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipa-pmincho-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ipa-pmincho-fonts
# $Id: Makefile,v 1.1 2009/04/23 02:19:41 petersen Exp $
NAME := ipa-pmincho-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cchance at fedoraproject.org  Thu Apr 23 02:51:27 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 23 Apr 2009 02:51:27 +0000 (UTC)
Subject: rpms/ibus-table-extraphrase/devel ibus-table-extraphrase.spec, 1.1, 
	1.2
Message-ID: <20090423025127.8580D70106@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-extraphrase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8520

Modified Files:
	ibus-table-extraphrase.spec 
Log Message:
updated description



Index: ibus-table-extraphrase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-extraphrase/devel/ibus-table-extraphrase.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-table-extraphrase.spec	19 Apr 2009 04:39:00 -0000	1.1
+++ ibus-table-extraphrase.spec	23 Apr 2009 02:50:56 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           ibus-table-extraphrase
 Version:        1.1.0.20090415
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extra phrase for ibus-table
 License:        GPLv3+
 Group:          System Environment/Libraries
@@ -22,8 +22,6 @@
 %description
 Extra phrase data for IBus-Table engine.
 
-This is released under released under GPLv3.
-
 %prep
 %setup -q
 
@@ -57,6 +55,9 @@
 %{_datadir}/ibus-table/data/extra_phrase.txt
 
 %changelog
+* Thu Apr 23 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090415-3.fc11
+- Updated desciption.
+
 * Wed Apr 15 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.1.0.20090415-2.fc11
 - Removed invalid verification bypass of extra_phrase.txt.
 - Refined spec file.



From cattelan at fedoraproject.org  Thu Apr 23 03:24:59 2009
From: cattelan at fedoraproject.org (Russell Cattelan)
Date: Thu, 23 Apr 2009 03:24:59 +0000 (UTC)
Subject: devel/xdd - New directory
Message-ID: <20090423032459.71A7C70107@cvs1.fedora.phx.redhat.com>

Author: cattelan

Update of /cvs/pkgs/devel/xdd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19701/xdd

Log Message:
Directory /cvs/pkgs/devel/xdd added to the repository




From wtogami at fedoraproject.org  Thu Apr 23 04:10:08 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 23 Apr 2009 04:10:08 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.22, 1.23 ltsp.spec, 1.30, 1.31 sources,
	1.26, 1.27
Message-ID: <20090423041008.CC6F070104@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31794

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Bug #497177 Fix pulseaudio daemon launch on clients
- Fedora 11 points to final mirrorlists instead of rawhide



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Apr 2009 22:48:48 -0000	1.22
+++ .cvsignore	23 Apr 2009 04:09:38 -0000	1.23
@@ -1 +1 @@
-ltsp-5.1.70.tar.bz2
+ltsp-5.1.71.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ltsp.spec	15 Apr 2009 22:48:49 -0000	1.30
+++ ltsp.spec	23 Apr 2009 04:09:38 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.70
-%define _datestamp .20090415.17
+Version:        5.1.71
+%define _datestamp .20090422.23
 #Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -412,6 +412,10 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Warren Togami <wtogami at redhat.com> - 5.1.71-1
+- Bug #497177 Fix pulseaudio daemon launch on clients
+- Fedora 11 points to final mirrorlists instead of rawhide
+
 * Wed Apr 05 2009 Warren Togami <wtogami at redhat.com> - 5.1.70-1
 - Fix typo in mkinitrd config
 - Configure plymouth for graphical boot on supported hardware


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	15 Apr 2009 22:48:49 -0000	1.26
+++ sources	23 Apr 2009 04:09:38 -0000	1.27
@@ -1 +1 @@
-b8cb47c3031b5a6aaf5f190cbf52824c  ltsp-5.1.70.tar.bz2
+a10866b71219cd6c5be7128280fc1462  ltsp-5.1.71.tar.bz2



From wtogami at fedoraproject.org  Thu Apr 23 04:22:15 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 23 Apr 2009 04:22:15 +0000 (UTC)
Subject: rpms/ltsp/F-11 .cvsignore, 1.22, 1.23 ltsp.spec, 1.30, 1.31 sources,
	1.26, 1.27
Message-ID: <20090423042215.1F20170104@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2017

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Bug #497177 Fix pulseaudio daemon launch on clients
- Fedora 11 points to final mirrorlists instead of rawhide



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Apr 2009 22:50:38 -0000	1.22
+++ .cvsignore	23 Apr 2009 04:21:44 -0000	1.23
@@ -1 +1 @@
-ltsp-5.1.70.tar.bz2
+ltsp-5.1.71.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/ltsp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ltsp.spec	15 Apr 2009 22:50:38 -0000	1.30
+++ ltsp.spec	23 Apr 2009 04:21:44 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.70
-%define _datestamp .20090415.17
+Version:        5.1.71
+%define _datestamp .20090422.23
 #Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -412,6 +412,10 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Warren Togami <wtogami at redhat.com> - 5.1.71-1
+- Bug #497177 Fix pulseaudio daemon launch on clients
+- Fedora 11 points to final mirrorlists instead of rawhide
+
 * Wed Apr 05 2009 Warren Togami <wtogami at redhat.com> - 5.1.70-1
 - Fix typo in mkinitrd config
 - Configure plymouth for graphical boot on supported hardware


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	15 Apr 2009 22:50:38 -0000	1.26
+++ sources	23 Apr 2009 04:21:44 -0000	1.27
@@ -1 +1 @@
-b8cb47c3031b5a6aaf5f190cbf52824c  ltsp-5.1.70.tar.bz2
+a10866b71219cd6c5be7128280fc1462  ltsp-5.1.71.tar.bz2



From seanf at fedoraproject.org  Thu Apr 23 05:54:02 2009
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Thu, 23 Apr 2009 05:54:02 +0000 (UTC)
Subject: rpms/eclipse-nls/devel eclipse-nls.spec, 1.2, 1.3 fetch-babel.sh,
	1.1, NONE
Message-ID: <20090423055403.163A970104@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26061

Modified Files:
	eclipse-nls.spec 
Removed Files:
	fetch-babel.sh 
Log Message:
- Updated to use Babel's zipped langpacks instead of fetch-babel.sh
- Changed versioning scheme to match changes in upstream versioning
- Updated to latest upstream langpacks for Eclipse 3.5 / Galileo



Index: eclipse-nls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/eclipse-nls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-nls.spec	24 Feb 2009 13:49:30 -0000	1.2
+++ eclipse-nls.spec	23 Apr 2009 05:53:31 -0000	1.3
@@ -1,4 +1,3 @@
-%define snapshot 20080807snap
 %define eclipse_data %{_datadir}/eclipse
 # Disable repacking of jars, since it takes forever for all the little jars, 
 # and we don't need multilib anyway:
@@ -6,21 +5,14 @@
 
 Name: eclipse-nls 
 Summary: Babel language packs for the Eclipse platform and various plugins
-Group: Development/Languages
+Group: Text Editors/Integrated Development Environments (IDE)
 License: EPL
 URL: http://babel.eclipse.org/
 
-Version: 0.2.0
-Release: 0.6.%{snapshot}%{?dist}
-## The source for this package is taken from the Babel project's update site.
-## Use the following commands to generate the tarball:
-# sudo yum install eclipse-platform curl
-# mkdir temp && cd temp
-# sh ../fetch-babel.sh
-# tar cjf ../org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2 eclipse-nls
-# cd ..
-Source0: org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2
-Source1: fetch-babel.sh
+Version: 3.5.0.v20090417091040
+Release: 1%{?dist}
+## The source for this package is taken from http://download.eclipse.org/technology/babel/babel_language_packs/
+Source0: BabelLanguagePack-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
@@ -30,14 +22,13 @@
 
 %define lang_meta_pkg() \
 %package %1 \
-Summary:    Eclipse/Babel language pack for %2 \
-Group:      Development/Languages \
-# provides %{eclipse_data}/dropins \
+Summary:    Eclipse/Babel language pack for %3 \
+Group:      Text Editors/Integrated Development Environments (IDE) \
 Requires:   eclipse-platform >= 3.4.0-18 \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
 \
 %description %1 \
-This language pack for %2 contains user-contributed translations of the \
+This language pack for %3 contains user-contributed translations of the \
 strings in all Eclipse projects. Please see the http://babel.eclipse.org/ \
 Babel project web pages for a full how-to-use explanation of these \
 translations as well as how you can contribute to \
@@ -47,71 +38,89 @@
 \
 %files %1 \
 %defattr(-,root,root,-) \
-%{eclipse_data}/dropins/babel-%1
-
-# Note that no licence %%doc files are listed under %%files.  Upstream does 
-# not provide a single distribution archive for eclipse-nls, but rather an 
-# update site which serves up 400 plugin jars for each language.  These 
-# jars are collected into a tarball by fetch-babel.sh.  Each jar does 
-# include HTML files with licence information, and these jars are placed 
-# in the dropins/babel-* directory above.
-
-%lang_meta_pkg cs Czech
-%lang_meta_pkg hu Hungarian
-%lang_meta_pkg pl Polish
-%lang_meta_pkg ru Russian
-%lang_meta_pkg ar Arabic
+%dir %{eclipse_data}/dropins/babel \
+%dir %{eclipse_data}/dropins/babel/eclipse \
+%dir %{eclipse_data}/dropins/babel/eclipse/features \
+%{eclipse_data}/dropins/babel/eclipse/features/org.eclipse.babel.nls_*_%{2}_%{version} \
+%dir %{eclipse_data}/dropins/babel/eclipse/plugins \
+%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl_%{2}_%{version}.jar
+# %{eclipse_data}/dropins/babel-%1
+
+
+# Note that no licence %%doc files are listed under %%files.  Upstream 
+# does not provide a single distribution archive for eclipse-nls, but 
+# rather a collection of 700 zips, one per module/language combination, 
+# containing multiple plugin jars.  Each jar does include HTML files 
+# with licence information, and these jars are placed in the 
+# dropins/babel-* directory above.
+
+%lang_meta_pkg ar ar Arabic
+%lang_meta_pkg bg bg Bulgarian
+%lang_meta_pkg zh zh "Chinese (Simplified)"
+%lang_meta_pkg zh_TW zh_TW "Chinese (Traditional)"
+%lang_meta_pkg cs cs Czech
+%lang_meta_pkg da da Danish
+%lang_meta_pkg nl nl Dutch
+%lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg fi fi Finnish
+%lang_meta_pkg fr fr French
+%lang_meta_pkg de de German
+%lang_meta_pkg el el Greek
 # NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
-%lang_meta_pkg he Hebrew
-%lang_meta_pkg da Danish
-%lang_meta_pkg de German
-%lang_meta_pkg el Greek
-%lang_meta_pkg es Spanish
-%lang_meta_pkg fi Finnish
-%lang_meta_pkg fr French
-%lang_meta_pkg it Italian
-%lang_meta_pkg ja Japanese
-%lang_meta_pkg ko Korean
-%lang_meta_pkg nl Dutch
-%lang_meta_pkg no Norwegian
-%lang_meta_pkg pt Portuguese
-%lang_meta_pkg pt_BR Portuguese (Brazilian)
-%lang_meta_pkg sv Swedish
-%lang_meta_pkg tr Turkish
-%lang_meta_pkg zh Chinese (Simplified)
-%lang_meta_pkg zh_TW Chinese (Traditional)
-##########################################
-# Currently less than 10% coverage
-%lang_meta_pkg uk Ukrainian
-%lang_meta_pkg ro Romanian
-%lang_meta_pkg bg Bulgarian
-##########################################
-##########################################
-# Currently 0% coverage
-#Hindi
-#Klingon
-#Spanish-Catalonian
-#English
-##########################################
+# similarly, yi -> ji, id -> in
+%lang_meta_pkg he iw Hebrew
+%lang_meta_pkg hi hi Hindi
+%lang_meta_pkg hu hu Hungarian
+%lang_meta_pkg it it Italian
+%lang_meta_pkg ja ja Japanese
+# tl should be Tagalog.  Klingon has < 1% coverage at present in Babel.  Tagalog is unsupported.
+#% lang_meta_pkg tlh tl Klingon
+%lang_meta_pkg ko ko Korean
+%lang_meta_pkg mn mn Mongolian
+%lang_meta_pkg no no Norwegian
+%lang_meta_pkg pl pl Polish
+%lang_meta_pkg pt pt Portuguese
+%lang_meta_pkg pt_BR pt_BR "Portuguese (Brazilian)"
+%lang_meta_pkg ro ro Romanian
+%lang_meta_pkg ru ru Russian
+%lang_meta_pkg es es Spanish
+%lang_meta_pkg sv sv Swedish
+%lang_meta_pkg tr tr Turkish
+%lang_meta_pkg uk uk Ukrainian
+%lang_meta_pkg en_AA en_AA "Pseudo Translations"
 
 %prep
+# extract langpack zips from tarball
 %setup -q -n %{name}
+# remove unsupported langpacks (currently Klingon)
+unsupported="tl"
+for locale in $unsupported; do
+   rm Babel*-${locale}_%{version}.zip
+done
+# extract remaining zips - to eclipse/{features,plugins}
+for f in Babel*.zip; do
+   unzip -qq $f
+   rm $f
+done
 
 %build
-# nothing to do
+# nothing to build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for loc in ?? ??_??; do
-   mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
-   cp -R ${loc}/features ${loc}/plugins $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
-done
+mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
+cp -a eclipse $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 23 2009 Sean Flanigan <sflaniga at redhat.com> - 3.5.0.v20090417091040-1
+- Updated to use Babel's zipped langpacks instead of fetch-babel.sh
+- Changed versioning scheme to match changes in upstream versioning
+- Updated to latest upstream langpacks for Eclipse 3.5 / Galileo
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-0.6.20080807snap
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- fetch-babel.sh DELETED ---



From airlied at fedoraproject.org  Thu Apr 23 05:57:54 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 23 Apr 2009 05:57:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-fix-rs690-clamp.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.179, 1.180
Message-ID: <20090423055754.5DA0470104@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27211

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.2-fix-rs690-clamp.patch 
Log Message:
* Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 6.12.2-5
- rs690: fix crashing when firefox or gimp is used


radeon-6.12.2-fix-rs690-clamp.patch:

--- NEW FILE radeon-6.12.2-fix-rs690-clamp.patch ---
>From 0323106d6bd6dd7b7354f4a22b8e6135459e017a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 23 Apr 2009 15:52:41 +1000
Subject: [PATCH] radeon: tx clamping

---
 src/radeon_exa_render.c          |   11 ++++++++---
 src/radeon_textured_videofuncs.c |    3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index ca46505..7f3c93a 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1278,23 +1278,28 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
 	    else
 		txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
 
+	    txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
 	    break;
 	case RepeatPad:
 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
-		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST);
+		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST);
 	    break;
 	case RepeatReflect:
 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
+		        R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
 		        R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR);
 	    break;
 	case RepeatNone:
 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
-		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
+		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
 	    break;
 	}
     } else
 	txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
-	            R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
+	            R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
+	            R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
 
     switch (pPict->filter) {
     case PictFilterNearest:
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 852f4ac..581b477 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -263,6 +263,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 
 	txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
 		    R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+		    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
 		    R300_TX_MAG_FILTER_LINEAR |
 		    R300_TX_MIN_FILTER_LINEAR |
 		    (0 << R300_TX_ID_SHIFT));
@@ -299,6 +300,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 	    txpitch -= 1;
 	    txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
 		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
 			R300_TX_MIN_FILTER_LINEAR |
 			R300_TX_MAG_FILTER_LINEAR);
 
@@ -334,6 +336,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		/* Tex filter */
 		txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
 			    R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
+			    R300_TX_CLAMP_R(R300_TX_CLAMP_WRAP) |
 			    R300_TX_MIN_FILTER_NEAREST |
 			    R300_TX_MAG_FILTER_NEAREST |
 			    (1 << R300_TX_ID_SHIFT));
-- 
1.6.2.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- xorg-x11-drv-ati.spec	16 Apr 2009 21:02:55 -0000	1.179
+++ xorg-x11-drv-ati.spec	23 Apr 2009 05:57:23 -0000	1.180
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 Patch8:	    radeon-6.12.2-kms-gamma.patch
+Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
 
 ExcludeArch: s390 s390x
 
@@ -44,6 +45,7 @@
 %patch7 -p1 -b .r600-fb-size
 # don't do this yet, kernel will oops if you do
 #patch8 -p1 -b .kms-gamma
+%patch9 -p1 -b .rs690clamp
 
 %build
 autoreconf -iv
@@ -75,6 +77,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 6.12.2-5
+- rs690: fix crashing when firefox or gimp is used
+
 * Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 6.12.2-4
 - radeon-modeset.patch: fix stupid idle drawing corrupt since mmap cache
 



From seanf at fedoraproject.org  Thu Apr 23 06:04:09 2009
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Thu, 23 Apr 2009 06:04:09 +0000 (UTC)
Subject: rpms/eclipse-nls/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090423060409.4564B70104@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29688

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded source tarball for 3.5.0.v20090417091040



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 03:22:38 -0000	1.2
+++ .cvsignore	23 Apr 2009 06:03:38 -0000	1.3
@@ -1 +1 @@
-org.eclipse.nls-20080807snap-fetched-src.tar.bz2
+BabelLanguagePack-3.5.0.v20090417091040.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 03:22:38 -0000	1.2
+++ sources	23 Apr 2009 06:03:38 -0000	1.3
@@ -1 +1 @@
-14c51fc450752ce281c3e8d067b268b2  org.eclipse.nls-20080807snap-fetched-src.tar.bz2
+afac0e98bd964bdabff2918989044fe5  BabelLanguagePack-3.5.0.v20090417091040.tar.bz2



From petersen at fedoraproject.org  Thu Apr 23 06:35:10 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 06:35:10 +0000 (UTC)
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.43,1.44
Message-ID: <20090423063510.7576070104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/redhat-lsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16413

Modified Files:
	redhat-lsb.spec 
Log Message:
- use dist tag (Debarshi, #496553)




Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- redhat-lsb.spec	22 Apr 2009 01:57:49 -0000	1.43
+++ redhat-lsb.spec	23 Apr 2009 06:34:39 -0000	1.44
@@ -49,7 +49,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 3.fc12
+Release: 4%{?dist}
 URL: http://www.linuxfoundation.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
@@ -645,6 +645,10 @@
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Thu Apr 23 2009 Jens Petersen <petersen at redhat.com> - 3.2-4
+- use dist tag (Debarshi, #496553)
+- update to ix86 (caillon)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From tagoh at fedoraproject.org  Thu Apr 23 06:53:05 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 06:53:05 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts/devel import.log, NONE,
	1.1 ipa-gothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-gothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423065305.3843C70104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-gothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10714/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-gothic-fonts-fontconfig.conf 
	ipa-gothic-fonts.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
ipa-gothic-fonts-003_01-2_fc10:HEAD:ipa-gothic-fonts-003.01-2.fc10.src.rpm:1240469500


--- NEW FILE ipa-gothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAGothic</family>
		<default>
			<family>monospace</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>monospace</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-gothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-gothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipag%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:51:00 -0000	1.1
+++ .cvsignore	23 Apr 2009 06:52:34 -0000	1.2
@@ -0,0 +1 @@
+ipag00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:51:00 -0000	1.1
+++ sources	23 Apr 2009 06:52:34 -0000	1.2
@@ -0,0 +1 @@
+5ae6783ec8c1e0c6579eb2033bfc78f9  ipag00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 06:54:43 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 06:54:43 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts/devel import.log, NONE,
	1.1 ipa-pgothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-pgothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423065443.6615C70104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pgothic-fonts-fontconfig.conf 
	ipa-pgothic-fonts.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
ipa-pgothic-fonts-003_01-2_fc10:HEAD:ipa-pgothic-fonts-003.01-2.fc10.src.rpm:1240469624


--- NEW FILE ipa-pgothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPGothic</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pgothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pgothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipagp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:53:24 -0000	1.1
+++ .cvsignore	23 Apr 2009 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+ipagp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:53:24 -0000	1.1
+++ sources	23 Apr 2009 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+ab5e7e962b358a5579d08f09a9d07ebf  ipagp00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:01:21 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:01:21 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts/devel import.log, NONE,
	1.1 ipa-mincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-mincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423070121.41EF370104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-mincho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13134/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-mincho-fonts-fontconfig.conf 
	ipa-mincho-fonts.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
ipa-mincho-fonts-003_01-2_fc10:HEAD:ipa-mincho-fonts-003.01-2.fc10.src.rpm:1240469732


--- NEW FILE ipa-mincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-mincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-mincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipam%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:14:35 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:00:50 -0000	1.2
@@ -0,0 +1 @@
+ipam00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:14:35 -0000	1.1
+++ sources	23 Apr 2009 07:00:50 -0000	1.2
@@ -0,0 +1 @@
+583645bf37f787b2edec30e7d763e8b3  ipam00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:10:08 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:10:08 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts/devel import.log, NONE,
	1.1 ipa-pmincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-pmincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423071008.804CD70104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15896/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pmincho-fonts-fontconfig.conf 
	ipa-pmincho-fonts.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
ipa-pmincho-fonts-003_01-2_fc10:HEAD:ipa-pmincho-fonts-003.01-2.fc10.src.rpm:1240470119


--- NEW FILE ipa-pmincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pmincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pmincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipamp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:19:41 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:09:37 -0000	1.2
@@ -0,0 +1 @@
+ipamp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:19:41 -0000	1.1
+++ sources	23 Apr 2009 07:09:37 -0000	1.2
@@ -0,0 +1 @@
+be6bd5e5f09da8773d0361128340a0f1  ipamp00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:28:49 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:28:49 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts/F-11 import.log, NONE,
	1.1 ipa-gothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-gothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423072849.38EC870104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-gothic-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19725/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-gothic-fonts-fontconfig.conf 
	ipa-gothic-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-gothic-fonts-003_01-2_fc10:F-11:ipa-gothic-fonts-003.01-2.fc10.src.rpm:1240470983


--- NEW FILE ipa-gothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAGothic</family>
		<default>
			<family>monospace</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>monospace</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-gothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-gothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipag%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:51:00 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:28:18 -0000	1.2
@@ -0,0 +1 @@
+ipag00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:51:00 -0000	1.1
+++ sources	23 Apr 2009 07:28:18 -0000	1.2
@@ -0,0 +1 @@
+5ae6783ec8c1e0c6579eb2033bfc78f9  ipag00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:32:49 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:32:49 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts/F-11 import.log, NONE,
	1.1 ipa-pgothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-pgothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423073249.2DA7670104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20604/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pgothic-fonts-fontconfig.conf 
	ipa-pgothic-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-pgothic-fonts-003_01-2_fc10:F-11:ipa-pgothic-fonts-003.01-2.fc10.src.rpm:1240471760


--- NEW FILE ipa-pgothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPGothic</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pgothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pgothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipagp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:53:24 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:32:18 -0000	1.2
@@ -0,0 +1 @@
+ipagp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:53:24 -0000	1.1
+++ sources	23 Apr 2009 07:32:18 -0000	1.2
@@ -0,0 +1 @@
+ab5e7e962b358a5579d08f09a9d07ebf  ipagp00301.zip



From jakub at fedoraproject.org  Thu Apr 23 07:35:05 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 23 Apr 2009 07:35:05 +0000 (UTC)
Subject: rpms/gcc/F-11 .cvsignore, 1.270, 1.271 gcc.spec, 1.44, 1.45 sources,
	1.273, 1.274 gcc44-find_base_term.patch, 1.1, NONE
Message-ID: <20090423073505.315C470107@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21225

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-find_base_term.patch 
Log Message:
4.4.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/.cvsignore,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- .cvsignore	22 Apr 2009 19:01:26 -0000	1.270
+++ .cvsignore	23 Apr 2009 07:34:34 -0000	1.271
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090422.tar.bz2
+gcc-4.4.0-20090423.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gcc.spec	22 Apr 2009 19:01:26 -0000	1.44
+++ gcc.spec	23 Apr 2009 07:34:34 -0000	1.45
@@ -1,5 +1,5 @@
-%define DATE 20090422
-%define SVNREV 146590
+%define DATE 20090423
+%define SVNREV 146636
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
@@ -150,12 +150,11 @@
 Patch26: gcc44-power7.patch
 Patch28: gcc44-pr38757.patch
 Patch30: gcc44-pr39543.patch
-Patch31: gcc44-find_base_term.patch
-Patch32: gcc44-pr39794.patch
-Patch33: gcc44-rh459374-1.patch
-Patch34: gcc44-rh459374-2.patch
-Patch35: gcc44-rh459374-3.patch
-Patch36: gcc44-cswtch.patch
+Patch31: gcc44-pr39794.patch
+Patch32: gcc44-rh459374-1.patch
+Patch33: gcc44-rh459374-2.patch
+Patch34: gcc44-rh459374-3.patch
+Patch35: gcc44-cswtch.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -444,12 +443,11 @@
 %patch26 -p0 -b .power7~
 %patch28 -p0 -b .pr38757~
 %patch30 -p0 -b .pr39543~
-%patch31 -p0 -b .find_base_term~
-%patch32 -p0 -b .pr39794~
-%patch33 -p0 -b .rh459374-1~
-%patch34 -p0 -b .rh459374-2~
-%patch35 -p0 -b .rh459374-3~
-%patch36 -p0 -b .cswtch~
+%patch31 -p0 -b .pr39794~
+%patch32 -p0 -b .rh459374-1~
+%patch33 -p0 -b .rh459374-2~
+%patch34 -p0 -b .rh459374-3~
+%patch35 -p0 -b .cswtch~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1760,10 +1758,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Wed Apr 22 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-1
+* Thu Apr 23 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-1
 - update from gcc-4_4-branch
   - GCC 4.4.0 release
-  - PR libstdc++/39802
+  - PRs libstdc++/39802, c++/39639, c/39855, rtl-optimization/39762,
+	testsuite/39781, tree-optimization/39824
 - fix up DSE (PR middle-end/39794)
 - debuginfo fixes for VLA and nested/contained functions (#459374)
 - improve -ftree-switch-conversion optimization if the constant is the


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/sources,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- sources	22 Apr 2009 19:01:27 -0000	1.273
+++ sources	23 Apr 2009 07:34:34 -0000	1.274
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-095942097cf529c8064c51f07b8fc0b7  gcc-4.4.0-20090422.tar.bz2
+24abd4fb970849bf27e069a18e4d9e7e  gcc-4.4.0-20090423.tar.bz2


--- gcc44-find_base_term.patch DELETED ---



From tagoh at fedoraproject.org  Thu Apr 23 07:36:06 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:36:06 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts/F-11 import.log, NONE,
	1.1 ipa-mincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-mincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423073606.C763370104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-mincho-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22127/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-mincho-fonts-fontconfig.conf 
	ipa-mincho-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-mincho-fonts-003_01-2_fc10:F-11:ipa-mincho-fonts-003.01-2.fc10.src.rpm:1240472001


--- NEW FILE ipa-mincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-mincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-mincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipam%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:14:35 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:36:05 -0000	1.2
@@ -0,0 +1 @@
+ipam00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:14:35 -0000	1.1
+++ sources	23 Apr 2009 07:36:05 -0000	1.2
@@ -0,0 +1 @@
+583645bf37f787b2edec30e7d763e8b3  ipam00301.zip



From phuang at fedoraproject.org  Thu Apr 23 07:37:57 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 23 Apr 2009 07:37:57 +0000 (UTC)
Subject: rpms/ibus/F-11 .cvsignore, 1.30, 1.31 ibus.spec, 1.68, 1.69 sources,
	1.34, 1.35
Message-ID: <20090423073757.E401370104@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22536

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to ibus-1.1.0.20090423


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	17 Apr 2009 10:56:39 -0000	1.30
+++ .cvsignore	23 Apr 2009 07:37:27 -0000	1.31
@@ -1 +1 @@
-ibus-1.1.0.20090417.tar.gz
+ibus-1.1.0.20090423.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ibus.spec	17 Apr 2009 10:56:39 -0000	1.68
+++ ibus.spec	23 Apr 2009 07:37:27 -0000	1.69
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090417
+Version:    1.1.0.20090423
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -217,6 +217,12 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 23 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090423-1
+- Update to ibus-1.1.0.20090423.
+- Fix bug 497265 -  [mai_IN] Maithili language name is not correct.
+- Fix bug 497279 -  IBus does not works with evolution correctly.
+- Enhance authentication both in daemon & clients
+
 * Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
 - Update to ibus-1.1.0.20090417.
 - Fix bug 496199 -  cannot remove Ctrl+Space hotkey with ibus-setup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	17 Apr 2009 10:56:39 -0000	1.34
+++ sources	23 Apr 2009 07:37:27 -0000	1.35
@@ -1 +1 @@
-70b037b1476cb6bafa29656523e0c8c4  ibus-1.1.0.20090417.tar.gz
+7c04c5244e6b5c392590d62f09443682  ibus-1.1.0.20090423.tar.gz



From tagoh at fedoraproject.org  Thu Apr 23 07:39:15 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:39:15 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts/F-11 import.log, NONE,
	1.1 ipa-pmincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-pmincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423073915.9642B70104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22786/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pmincho-fonts-fontconfig.conf 
	ipa-pmincho-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-pmincho-fonts-003_01-2_fc10:F-11:ipa-pmincho-fonts-003.01-2.fc10.src.rpm:1240472200


--- NEW FILE ipa-pmincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pmincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pmincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipamp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:19:41 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:38:45 -0000	1.2
@@ -0,0 +1 @@
+ipamp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:19:41 -0000	1.1
+++ sources	23 Apr 2009 07:38:45 -0000	1.2
@@ -0,0 +1 @@
+be6bd5e5f09da8773d0361128340a0f1  ipamp00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:42:56 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:42:56 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts/F-10 import.log, NONE,
	1.1 ipa-gothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-gothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423074256.9FB8970104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-gothic-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24016/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-gothic-fonts-fontconfig.conf 
	ipa-gothic-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-gothic-fonts-003_01-2_fc10:F-10:ipa-gothic-fonts-003.01-2.fc10.src.rpm:1240472423


--- NEW FILE ipa-gothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAGothic</family>
		<default>
			<family>monospace</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>monospace</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-gothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-gothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipag%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:51:00 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:42:26 -0000	1.2
@@ -0,0 +1 @@
+ipag00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:51:00 -0000	1.1
+++ sources	23 Apr 2009 07:42:26 -0000	1.2
@@ -0,0 +1 @@
+5ae6783ec8c1e0c6579eb2033bfc78f9  ipag00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:48:33 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:48:33 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts/F-10 import.log, NONE,
	1.1 ipa-pgothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-pgothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423074834.07C5470104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25359/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pgothic-fonts-fontconfig.conf 
	ipa-pgothic-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-pgothic-fonts-003_01-2_fc10:F-10:ipa-pgothic-fonts-003.01-2.fc10.src.rpm:1240472610


--- NEW FILE ipa-pgothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPGothic</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pgothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pgothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipagp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:53:24 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:48:02 -0000	1.2
@@ -0,0 +1 @@
+ipagp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:53:24 -0000	1.1
+++ sources	23 Apr 2009 07:48:02 -0000	1.2
@@ -0,0 +1 @@
+ab5e7e962b358a5579d08f09a9d07ebf  ipagp00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:50:06 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:50:06 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts/F-10 import.log, NONE,
	1.1 ipa-mincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-mincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423075006.C0FC270104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-mincho-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26165/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-mincho-fonts-fontconfig.conf 
	ipa-mincho-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-mincho-fonts-003_01-2_fc10:F-10:ipa-mincho-fonts-003.01-2.fc10.src.rpm:1240472960


--- NEW FILE ipa-mincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-mincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-mincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipam%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:14:35 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:49:36 -0000	1.2
@@ -0,0 +1 @@
+ipam00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:14:35 -0000	1.1
+++ sources	23 Apr 2009 07:49:36 -0000	1.2
@@ -0,0 +1 @@
+583645bf37f787b2edec30e7d763e8b3  ipam00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 07:56:45 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 07:56:45 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts/F-10 import.log, NONE,
	1.1 ipa-pmincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-pmincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423075646.09C8470104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28159/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pmincho-fonts-fontconfig.conf 
	ipa-pmincho-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-pmincho-fonts-003_01-2_fc10:F-10:ipa-pmincho-fonts-003.01-2.fc10.src.rpm:1240473042


--- NEW FILE ipa-pmincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pmincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pmincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipamp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:19:41 -0000	1.1
+++ .cvsignore	23 Apr 2009 07:56:15 -0000	1.2
@@ -0,0 +1 @@
+ipamp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:19:41 -0000	1.1
+++ sources	23 Apr 2009 07:56:15 -0000	1.2
@@ -0,0 +1 @@
+be6bd5e5f09da8773d0361128340a0f1  ipamp00301.zip



From petersen at fedoraproject.org  Thu Apr 23 08:13:34 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 08:13:34 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.8,1.9
Message-ID: <20090423081334.38BB770104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31951

Modified Files:
	ghc-X11.spec 
Log Message:
maybe define ghcrequires for mock, take4


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ghc-X11.spec	23 Apr 2009 01:28:53 -0000	1.8
+++ ghc-X11.spec	23 Apr 2009 08:13:03 -0000	1.9
@@ -4,7 +4,8 @@
 %bcond_without prof
 
 # placate mock
-%{!?ghcrequires: %{expand:%%define ghcrequires() Requires: %1}}
+%{!?ghcrequires: %{expand:%%define ghcrequires()\
+Requires: %1}}
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -40,7 +41,7 @@
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-%ghcrequires ghc post preun
+%{expand:%%ghcrequires ghc post preun}
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
 
 %description devel
@@ -52,7 +53,7 @@
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-%ghcrequires ghc-doc post postun
+%{expand:%%ghcrequires ghc-doc post postun}
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -64,7 +65,7 @@
 Summary: Profiling libraries for %{name}
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
-%ghcrequires ghc-prof
+%{expand:%%ghcrequires ghc-prof}
 
 %description prof
 This package contains profiling libraries for %{name}.



From denis at fedoraproject.org  Thu Apr 23 08:17:01 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:17:01 +0000 (UTC)
Subject: rpms/goocanvas/F-11 .cvsignore, 1.5, 1.6 goocanvas.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090423081701.95C4C70104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32563

Modified Files:
	.cvsignore goocanvas.spec sources 
Log Message:
Update to upstream 0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Jan 2009 23:05:47 -0000	1.5
+++ .cvsignore	23 Apr 2009 08:16:30 -0000	1.6
@@ -1 +1 @@
-goocanvas-0.13.tar.bz2
+goocanvas-0.14.tar.bz2


Index: goocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/F-11/goocanvas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- goocanvas.spec	25 Feb 2009 00:20:02 -0000	1.10
+++ goocanvas.spec	23 Apr 2009 08:16:31 -0000	1.11
@@ -1,15 +1,16 @@
 Name:           goocanvas
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        A new canvas widget for GTK+ that uses cairo for drawing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/GooCanvas
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/0.13/%{name}/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/0.14/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig, gettext, gtk2-devel
+BuildRequires:  cairo-devel >= 1.4.0
 
 %description
 GooCanvas is a new canvas widget for GTK+ that uses the cairo 2D library for
@@ -69,6 +70,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 0.14-1
+- Update to upstream 0.14
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Jan 2009 23:05:47 -0000	1.5
+++ sources	23 Apr 2009 08:16:31 -0000	1.6
@@ -1 +1 @@
-0f10b2dfb760e03b2b5cf945ad05dbd6  goocanvas-0.13.tar.bz2
+c2bfb5d717e602842981112dff61bf2e  goocanvas-0.14.tar.bz2



From denis at fedoraproject.org  Thu Apr 23 08:19:00 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:19:00 +0000 (UTC)
Subject: rpms/pygoocanvas/F-11 .cvsignore, 1.5, 1.6 pygoocanvas.spec, 1.10, 
	1.11 sources, 1.5, 1.6
Message-ID: <20090423081900.6916F70104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pygoocanvas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv489

Modified Files:
	.cvsignore pygoocanvas.spec sources 
Log Message:
Update to upstream 0.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Jan 2009 23:14:24 -0000	1.5
+++ .cvsignore	23 Apr 2009 08:18:29 -0000	1.6
@@ -1 +1 @@
-pygoocanvas-0.13.1.tar.bz2
+pygoocanvas-0.14.0.tar.bz2


Index: pygoocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/F-11/pygoocanvas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pygoocanvas.spec	26 Feb 2009 20:01:07 -0000	1.10
+++ pygoocanvas.spec	23 Apr 2009 08:18:29 -0000	1.11
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define major_version 0.13
+%define major_version 0.14
 
 Name:           pygoocanvas
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        GooCanvas python bindings
 
 Group:          Development/Languages
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, pkgconfig, pygobject2-devel
-BuildRequires:  pycairo-devel >= 1.2.0, pygtk2-devel >= 2.10.0
+BuildRequires:  pycairo-devel >= 1.4.0, pygtk2-devel >= 2.10.0
 BuildRequires:  goocanvas-devel = %{major_version}, gtk2-devel
 BuildRequires:  libxslt, docbook-style-xsl
 
@@ -62,6 +62,9 @@
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 0.14.0-1
+- Update to upstream 0.14.0
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Jan 2009 23:14:24 -0000	1.5
+++ sources	23 Apr 2009 08:18:30 -0000	1.6
@@ -1 +1 @@
-e70089ab34f4d8e6fb6aec9e73e01bef  pygoocanvas-0.13.1.tar.bz2
+7ceb8b1bab04b78f08e16d38185b7c09  pygoocanvas-0.14.0.tar.bz2



From denis at fedoraproject.org  Thu Apr 23 08:20:12 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:20:12 +0000 (UTC)
Subject: rpms/goocanvasmm/F-11 .cvsignore, 1.5, 1.6 goocanvasmm.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090423082012.2B76B70104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv819

Modified Files:
	.cvsignore goocanvasmm.spec sources 
Log Message:
Update to upstream 0.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jan 2009 08:55:45 -0000	1.5
+++ .cvsignore	23 Apr 2009 08:19:41 -0000	1.6
@@ -1 +1 @@
-goocanvasmm-0.13.0.tar.bz2
+goocanvasmm-0.14.0.tar.bz2


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/F-11/goocanvasmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- goocanvasmm.spec	25 Feb 2009 00:20:56 -0000	1.6
+++ goocanvasmm.spec	23 Apr 2009 08:19:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           goocanvasmm
-Version:        0.13.0
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for goocanvas
 
@@ -12,7 +12,7 @@
 
 BuildRequires:  glibmm24-devel >= 2.14.2
 BuildRequires:  gtkmm24-devel >= 2.10.9
-BuildRequires:  goocanvas-devel >= 0.13
+BuildRequires:  goocanvas-devel >= 0.14
 BuildRequires:  doxygen graphviz
 
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 0.14.0-1
+- Update to upstream 0.14.0
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2009 08:55:45 -0000	1.5
+++ sources	23 Apr 2009 08:19:41 -0000	1.6
@@ -1 +1 @@
-c25c567f95af4619b0af0124251b3c39  goocanvasmm-0.13.0.tar.bz2
+12ade6affd1c25b33ece61dac9d366e6  goocanvasmm-0.14.0.tar.bz2



From denis at fedoraproject.org  Thu Apr 23 08:24:45 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:24:45 +0000 (UTC)
Subject: rpms/glom/F-11 glom.spec,1.34,1.35
Message-ID: <20090423082445.7230870104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1576

Modified Files:
	glom.spec 
Log Message:
Rebuilt with new goocanvasmm


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-11/glom.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- glom.spec	16 Apr 2009 08:04:12 -0000	1.34
+++ glom.spec	23 Apr 2009 08:24:14 -0000	1.35
@@ -3,7 +3,7 @@
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 1.10.0-4
+- Rebuilt with new goocanvasmm
+
 * Sat Apr  4 2009 Denis Leroy <denis at poolshark.org> - 1.10.0-3
 - Requires libgda-sqlite 
 



From petersen at fedoraproject.org  Thu Apr 23 08:25:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 08:25:25 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.9,1.10
Message-ID: <20090423082525.5084A70104@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1765

Modified Files:
	ghc-X11.spec 
Log Message:
just try defining ghc_version (take5)


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghc-X11.spec	23 Apr 2009 08:13:03 -0000	1.9
+++ ghc-X11.spec	23 Apr 2009 08:24:55 -0000	1.10
@@ -3,9 +3,7 @@
 %bcond_without doc
 %bcond_without prof
 
-# placate mock
-%{!?ghcrequires: %{expand:%%define ghcrequires()\
-Requires: %1}}
+%{expand: %%define ghc_ver %(ghc --numeric-version)}
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -41,7 +39,9 @@
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-%{expand:%%ghcrequires ghc post preun}
+Requires:       ghc = %{ghc_version}
+Requires(post): ghc = %{ghc_version}
+Requires(preun): ghc = %{ghc_version}
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
 
 %description devel
@@ -53,7 +53,9 @@
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-%{expand:%%ghcrequires ghc-doc post postun}
+Requires:       ghc-doc = %{ghc_version}
+Requires(post): ghc-doc = %{ghc_version}
+Requires(postun): ghc-doc = %{ghc_version}
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -62,10 +64,10 @@
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-%{expand:%%ghcrequires ghc-prof}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description prof
 This package contains profiling libraries for %{name}.
@@ -140,8 +142,8 @@
 %changelog
 * Mon Apr 20 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-7
 - rebuild with ghc-6.10.2
-- update to latest cabal2spec template and macros.ghc without ghc_version
-- maybe define ghcrequires for mock
+- update to latest cabal2spec template and macros.ghc
+- get ghc_version from ghc
 
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch



From denis at fedoraproject.org  Thu Apr 23 08:25:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:25:29 +0000 (UTC)
Subject: rpms/goocanvas/devel .cvsignore, 1.5, 1.6 goocanvas.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090423082529.7C97270104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1853

Modified Files:
	.cvsignore goocanvas.spec sources 
Log Message:
Update to upstream 0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Jan 2009 23:05:47 -0000	1.5
+++ .cvsignore	23 Apr 2009 08:24:59 -0000	1.6
@@ -1 +1 @@
-goocanvas-0.13.tar.bz2
+goocanvas-0.14.tar.bz2


Index: goocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/goocanvas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- goocanvas.spec	25 Feb 2009 00:20:02 -0000	1.10
+++ goocanvas.spec	23 Apr 2009 08:24:59 -0000	1.11
@@ -1,15 +1,16 @@
 Name:           goocanvas
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        A new canvas widget for GTK+ that uses cairo for drawing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/GooCanvas
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/0.13/%{name}/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/0.14/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig, gettext, gtk2-devel
+BuildRequires:  cairo-devel >= 1.4.0
 
 %description
 GooCanvas is a new canvas widget for GTK+ that uses the cairo 2D library for
@@ -69,6 +70,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 0.14-1
+- Update to upstream 0.14
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Jan 2009 23:05:47 -0000	1.5
+++ sources	23 Apr 2009 08:24:59 -0000	1.6
@@ -1 +1 @@
-0f10b2dfb760e03b2b5cf945ad05dbd6  goocanvas-0.13.tar.bz2
+c2bfb5d717e602842981112dff61bf2e  goocanvas-0.14.tar.bz2



From denis at fedoraproject.org  Thu Apr 23 08:28:31 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:28:31 +0000 (UTC)
Subject: rpms/pygoocanvas/devel .cvsignore, 1.5, 1.6 pygoocanvas.spec, 1.10, 
	1.11 sources, 1.5, 1.6
Message-ID: <20090423082831.C60BB70104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pygoocanvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2679

Modified Files:
	.cvsignore pygoocanvas.spec sources 
Log Message:
Update to upstream 0.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Jan 2009 23:14:24 -0000	1.5
+++ .cvsignore	23 Apr 2009 08:28:01 -0000	1.6
@@ -1 +1 @@
-pygoocanvas-0.13.1.tar.bz2
+pygoocanvas-0.14.0.tar.bz2


Index: pygoocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/pygoocanvas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pygoocanvas.spec	26 Feb 2009 20:01:07 -0000	1.10
+++ pygoocanvas.spec	23 Apr 2009 08:28:01 -0000	1.11
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define major_version 0.13
+%define major_version 0.14
 
 Name:           pygoocanvas
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        GooCanvas python bindings
 
 Group:          Development/Languages
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, pkgconfig, pygobject2-devel
-BuildRequires:  pycairo-devel >= 1.2.0, pygtk2-devel >= 2.10.0
+BuildRequires:  pycairo-devel >= 1.4.0, pygtk2-devel >= 2.10.0
 BuildRequires:  goocanvas-devel = %{major_version}, gtk2-devel
 BuildRequires:  libxslt, docbook-style-xsl
 
@@ -62,6 +62,9 @@
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 0.14.0-1
+- Update to upstream 0.14.0
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Jan 2009 23:14:24 -0000	1.5
+++ sources	23 Apr 2009 08:28:01 -0000	1.6
@@ -1 +1 @@
-e70089ab34f4d8e6fb6aec9e73e01bef  pygoocanvas-0.13.1.tar.bz2
+7ceb8b1bab04b78f08e16d38185b7c09  pygoocanvas-0.14.0.tar.bz2



From caolanm at fedoraproject.org  Thu Apr 23 08:29:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 23 Apr 2009 08:29:46 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1891, 1.1892 sources,
	1.360, 1.361
Message-ID: <20090423082946.A5BF170104@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/F-11

Modified Files:
	openoffice.org.spec sources 
Log Message:
silence stupid survey dialog


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1891
retrieving revision 1.1892
diff -u -r1.1891 -r1.1892
--- openoffice.org.spec	22 Apr 2009 13:54:25 -0000	1.1891
+++ openoffice.org.spec	23 Apr 2009 08:29:13 -0000	1.1892
@@ -132,7 +132,7 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch60: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch61: workspace.vcl101.patch
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: workspace.slideshow1.patch
@@ -4127,11 +4127,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+* Thu Apr 23 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
+- silence stupid survey dialog
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/sources,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- sources	17 Apr 2009 14:31:04 -0000	1.360
+++ sources	23 Apr 2009 08:29:14 -0000	1.361
@@ -3,8 +3,8 @@
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-d2392ab1e9049bc3e1d096c483f7a10c  redhat-registry.tar.gz
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
+f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 7e4822ad083efee8964fb739d2ad2277  OOO310_m10.tar.bz2



From caolanm at fedoraproject.org  Thu Apr 23 08:29:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 23 Apr 2009 08:29:46 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1892,
	1.1893 sources, 1.360, 1.361
Message-ID: <20090423082946.4799F70104@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/devel

Modified Files:
	openoffice.org.spec sources 
Log Message:
silence stupid survey dialog


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1892
retrieving revision 1.1893
diff -u -r1.1892 -r1.1893
--- openoffice.org.spec	22 Apr 2009 13:51:36 -0000	1.1892
+++ openoffice.org.spec	23 Apr 2009 08:29:14 -0000	1.1893
@@ -132,7 +132,7 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch60: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch61: workspace.vcl101.patch
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: workspace.slideshow1.patch
@@ -4127,11 +4127,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+* Thu Apr 23 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
+- silence stupid survey dialog
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- sources	17 Apr 2009 14:29:16 -0000	1.360
+++ sources	23 Apr 2009 08:29:14 -0000	1.361
@@ -3,8 +3,8 @@
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-d2392ab1e9049bc3e1d096c483f7a10c  redhat-registry.tar.gz
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
+f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 7e4822ad083efee8964fb739d2ad2277  OOO310_m10.tar.bz2



From denis at fedoraproject.org  Thu Apr 23 08:30:26 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 23 Apr 2009 08:30:26 +0000 (UTC)
Subject: rpms/goocanvasmm/devel .cvsignore, 1.5, 1.6 goocanvasmm.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <20090423083026.1864C70104@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3114

Modified Files:
	.cvsignore goocanvasmm.spec sources 
Log Message:
Update to upstream 0.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jan 2009 08:55:45 -0000	1.5
+++ .cvsignore	23 Apr 2009 08:29:55 -0000	1.6
@@ -1 +1 @@
-goocanvasmm-0.13.0.tar.bz2
+goocanvasmm-0.14.0.tar.bz2


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/goocanvasmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- goocanvasmm.spec	25 Feb 2009 00:20:56 -0000	1.6
+++ goocanvasmm.spec	23 Apr 2009 08:29:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           goocanvasmm
-Version:        0.13.0
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for goocanvas
 
@@ -12,7 +12,7 @@
 
 BuildRequires:  glibmm24-devel >= 2.14.2
 BuildRequires:  gtkmm24-devel >= 2.10.9
-BuildRequires:  goocanvas-devel >= 0.13
+BuildRequires:  goocanvas-devel >= 0.14
 BuildRequires:  doxygen graphviz
 
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Denis <denis at poolshark.org> - 0.14.0-1
+- Update to upstream 0.14.0
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2009 08:55:45 -0000	1.5
+++ sources	23 Apr 2009 08:29:55 -0000	1.6
@@ -1 +1 @@
-c25c567f95af4619b0af0124251b3c39  goocanvasmm-0.13.0.tar.bz2
+12ade6affd1c25b33ece61dac9d366e6  goocanvasmm-0.14.0.tar.bz2



From ramkrsna at fedoraproject.org  Thu Apr 23 09:32:05 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 09:32:05 +0000 (UTC)
Subject: rpms/python-achoo/devel import.log, NONE, 1.1 python-achoo.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423093205.356FA70104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-achoo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-achoo.spec 
Log Message:
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-2
- Adding correct upstream source, matching md5sums

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-1
- Initial RPM release




--- NEW FILE import.log ---
python-achoo-1_0-2_fc10:HEAD:python-achoo-1.0-2.fc10.src.rpm:1240478630


--- NEW FILE python-achoo.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-achoo
Version:        1.0
Release:        2%{?dist}
Summary:        A fluent interface for testing Python objects

Group:          Development/Languages
License:        LGPLv3+
URL:            http://web.quuxo.com/products/achoo/
Source0:        http://web.quuxo.com/products/achoo/achoo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel python-setuptools

%description
Achoo is a fluent interface for unit testing Python objects.
Achoo makes it easy to make assertions about the properties 
and behaviours of Python objects. For example, is this object
equal to this other one? Does calling this function with these
arguments raise an error? More Infomation on fluent from here
http://www.martinfowler.com/bliki/FluentInterface.html

%prep
%setup -q -n achoo-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING.LESSER AUTHORS 
%{python_sitelib}/*


%changelog
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-2
- Adding correct upstream source, matching md5sums

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-achoo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:36:38 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:31:34 -0000	1.2
@@ -0,0 +1 @@
+achoo-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-achoo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:36:38 -0000	1.1
+++ sources	23 Apr 2009 09:31:34 -0000	1.2
@@ -0,0 +1 @@
+2030a24b9daa0232aa776c08461e8061  achoo-1.0.tar.gz



From pkgdb at fedoraproject.org  Thu Apr 23 09:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 09:33:37 +0000
Subject: [pkgdb] mingw32-sqlite: sailer has requested watchbugzilla
Message-ID: <20090423093337.D52F810F886@bastion2.fedora.phx.redhat.com>

sailer has requested the watchbugzilla acl on mingw32-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Thu Apr 23 09:33:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 09:33:40 +0000
Subject: [pkgdb] mingw32-sqlite: sailer has requested commit
Message-ID: <20090423093340.492E110F890@bastion2.fedora.phx.redhat.com>

sailer has requested the commit acl on mingw32-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Thu Apr 23 09:33:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 09:33:38 +0000
Subject: [pkgdb] mingw32-sqlite: sailer has requested watchcommits
Message-ID: <20090423093340.89DAA10F892@bastion2.fedora.phx.redhat.com>

sailer has requested the watchcommits acl on mingw32-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Thu Apr 23 09:33:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 09:33:41 +0000
Subject: [pkgdb] mingw32-sqlite: sailer has requested approveacls
Message-ID: <20090423093341.C956910F897@bastion2.fedora.phx.redhat.com>

sailer has requested the approveacls acl on mingw32-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From ramkrsna at fedoraproject.org  Thu Apr 23 09:37:11 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 09:37:11 +0000 (UTC)
Subject: rpms/python-bitarray/devel import.log, NONE,
	1.1 python-bitarray.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423093711.277B170104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-bitarray/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14741/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-bitarray.spec 
Log Message:
* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.3.5-1
- Initial RPM release




--- NEW FILE import.log ---
python-bitarray-0_3_5-1_fc10:HEAD:python-bitarray-0.3.5-1.fc10.src.rpm:1240479334


--- NEW FILE python-bitarray.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 

Name:   python-bitarray          
Version:     0.3.5   
Release:        1%{?dist}
Summary:        Efficient Array of Booleans --C Extensions

Group:          Development/Languages
License:        Python
URL:            http://pypi.python.org/pypi/bitarray/
Source0:        http://pypi.python.org/packages/source/b/bitarray/bitarray-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-setuptools

%description
Bitarrays are sequence types and behave very much like usual lists.
Eight bits are represented by one byte in contiguous block of memory.
The user can select between two representations; little-endian and big-endian.
Most of the functionality is implemented in C.Methods for accessing the machine
representation are provided. This can be useful when bit level access to binary
files is required, such as portable bitmap image files (.pbm). Also, when 
dealing with compressed data which uses variable bit length encoding
you may find this module useful.

%prep
%setup -q -n bitarray-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE 

%{python_sitearch}/*
 


%changelog
* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.3.5-1
- Initial RPM release





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-bitarray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:35:11 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:36:40 -0000	1.2
@@ -0,0 +1 @@
+bitarray-0.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bitarray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:35:11 -0000	1.1
+++ sources	23 Apr 2009 09:36:40 -0000	1.2
@@ -0,0 +1 @@
+322a25e04e7aece5e028e5b068329291  bitarray-0.3.5.tar.gz



From ramkrsna at fedoraproject.org  Thu Apr 23 09:39:38 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 09:39:38 +0000 (UTC)
Subject: rpms/python-pytools/devel import.log, NONE, 1.1 python-pytools.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423093939.09D1C70107@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-pytools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15186/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pytools.spec 
Log Message:
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-2
- Spec file cleanup 

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-1
- Initial RPM release




--- NEW FILE import.log ---
python-pytools-8-2_fc10:HEAD:python-pytools-8-2.fc10.src.rpm:1240479463


--- NEW FILE python-pytools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-pytools
Version:        8
Release:        2%{?dist}
Summary:        A collection of tools for python

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/pytools
Source0:        http://pypi.python.org/packages/source/p/pytools/pytools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools 

%description
Pytools are a few interesting things that are missing from the Python Standard 
Library. 

Small tool functions such as ::
* len_iterable, 
* argmin, 
* tuple generation, 
* permutation generation, 
* ASCII table pretty printing, 
* GvR's mokeypatch_xxx() hack, 
* The elusive flatten, and much more.
* Michele Simionato's decorator module
* A time-series logging module, pytools.log.
* Batch job submission, pytools.batchjob.
* A lexer, pytools.lex.


%prep
%setup -q -n pytools-%{version}



%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/pytools/runalyzer.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README PKG-INFO
%{_bindir}/*
%{python_sitelib}/*



%changelog
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-2
- Spec file cleanup 

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-1
- Initial RPM release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pytools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:35:58 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:39:08 -0000	1.2
@@ -0,0 +1 @@
+pytools-8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pytools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:35:59 -0000	1.1
+++ sources	23 Apr 2009 09:39:08 -0000	1.2
@@ -0,0 +1 @@
+1cd76f03ac0280d8d22ed4f543812af8  pytools-8.tar.gz



From tagoh at fedoraproject.org  Thu Apr 23 09:42:36 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 09:42:36 +0000 (UTC)
Subject: rpms/ipa-gothic-fonts/F-9 import.log, NONE,
	1.1 ipa-gothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-gothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423094236.2410970104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-gothic-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16569/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-gothic-fonts-fontconfig.conf 
	ipa-gothic-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-gothic-fonts-003_01-2_fc10:F-9:ipa-gothic-fonts-003.01-2.fc10.src.rpm:1240479657


--- NEW FILE ipa-gothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAGothic</family>
		<default>
			<family>monospace</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>monospace</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-gothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-gothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipag%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:51:00 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:42:05 -0000	1.2
@@ -0,0 +1 @@
+ipag00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-gothic-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:51:00 -0000	1.1
+++ sources	23 Apr 2009 09:42:05 -0000	1.2
@@ -0,0 +1 @@
+5ae6783ec8c1e0c6579eb2033bfc78f9  ipag00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 09:43:55 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 09:43:55 +0000 (UTC)
Subject: rpms/ipa-pgothic-fonts/F-9 import.log, NONE,
	1.1 ipa-pgothic-fonts-fontconfig.conf, NONE,
	1.1 ipa-pgothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423094355.3828070104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pgothic-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17120/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pgothic-fonts-fontconfig.conf 
	ipa-pgothic-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-pgothic-fonts-003_01-2_fc10:F-9:ipa-pgothic-fonts-003.01-2.fc10.src.rpm:1240479788


--- NEW FILE ipa-pgothic-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPGothic</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPGothic</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pgothic-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pgothic
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipagp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Gothic-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Gothic (sans-serif) style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 01:53:24 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:43:24 -0000	1.2
@@ -0,0 +1 @@
+ipagp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pgothic-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 01:53:24 -0000	1.1
+++ sources	23 Apr 2009 09:43:24 -0000	1.2
@@ -0,0 +1 @@
+ab5e7e962b358a5579d08f09a9d07ebf  ipagp00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 09:45:16 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 09:45:16 +0000 (UTC)
Subject: rpms/ipa-mincho-fonts/F-9 import.log, NONE,
	1.1 ipa-mincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-mincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423094516.55A6970104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-mincho-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17529/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-mincho-fonts-fontconfig.conf 
	ipa-mincho-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-mincho-fonts-003_01-2_fc10:F-9:ipa-mincho-fonts-003.01-2.fc10.src.rpm:1240479863


--- NEW FILE ipa-mincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-mincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-mincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipam%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:14:35 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:44:45 -0000	1.2
@@ -0,0 +1 @@
+ipam00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-mincho-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:14:35 -0000	1.1
+++ sources	23 Apr 2009 09:44:45 -0000	1.2
@@ -0,0 +1 @@
+583645bf37f787b2edec30e7d763e8b3  ipam00301.zip



From tagoh at fedoraproject.org  Thu Apr 23 09:47:03 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 09:47:03 +0000 (UTC)
Subject: rpms/ipa-pmincho-fonts/F-9 import.log, NONE,
	1.1 ipa-pmincho-fonts-fontconfig.conf, NONE,
	1.1 ipa-pmincho-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423094703.1151970104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ipa-pmincho-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18178/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ipa-pmincho-fonts-fontconfig.conf 
	ipa-pmincho-fonts.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
ipa-pmincho-fonts-003_01-2_fc10:F-9:ipa-pmincho-fonts-003.01-2.fc10.src.rpm:1240479957


--- NEW FILE ipa-pmincho-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>IPAPMincho</family>
		<default>
			<family>serif</family>
		</default>
	</alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>ja-jp</string>
		</test>
		<test name="family">
			<string>serif</string>
		</test>
		<edit name="family" mode="prepend" binding="same">
			<string>IPAPMincho</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE ipa-pmincho-fonts.spec ---
%global		priority	65
%global		fontname	ipa-pmincho
%global		fontconf	%{priority}-%{fontname}.conf
%global		archiveversion	00301
%global		archivename	ipamp%{archiveversion}

Name:		%{fontname}-fonts
Version:	003.01
Release:	2%{?dist}
Summary:	Japanese Proportional Mincho-typeface OpenType font by IPA

Group:		User Interface/X
License:	IPA
URL:		http://ossipedia.ipa.go.jp/ipafont/
Source0:	http://info.openlab.ipa.go.jp/ipafont/fontdata/%{archivename}.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	fontpackages-filesystem

%description
IPA Font is a Japanese OpenType fonts that is JIS X 0213:2004
compliant, provided by Information-technology Promotion Agency, Japan.

This package contains Proportional Mincho style font.

%prep
%setup -q -n %{archivename}


%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0644 -p *.otf $RPM_BUILD_ROOT%{_fontdir}

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT


%_font_pkg -f %{fontconf} *.otf
%doc Readme_%{archivename}.txt IPA_Font_License_Agreement_v1.0.txt


%changelog
* Wed Apr 22 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-2
- Correct the source URL.

* Tue Apr 21 2009 Akira TAGOH <tagoh at redhat.com> - 003.01-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 02:19:41 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:46:32 -0000	1.2
@@ -0,0 +1 @@
+ipamp00301.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipa-pmincho-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 02:19:41 -0000	1.1
+++ sources	23 Apr 2009 09:46:32 -0000	1.2
@@ -0,0 +1 @@
+be6bd5e5f09da8773d0361128340a0f1  ipamp00301.zip



From ramkrsna at fedoraproject.org  Thu Apr 23 09:50:57 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 09:50:57 +0000 (UTC)
Subject: rpms/python-posix_ipc/devel import.log, NONE,
	1.1 python-posix_ipc.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423095057.2305870104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-posix_ipc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19040/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-posix_ipc.spec 
Log Message:

* Wed Apr 16 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.5.3-1
- Initial RPM release




--- NEW FILE import.log ---
python-posix_ipc-0_5_3-1_fc10:HEAD:python-posix_ipc-0.5.3-1.fc10.src.rpm:1240480123


--- NEW FILE python-posix_ipc.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-posix_ipc
Version:        0.5.3
Release:        1%{?dist}
Summary:        POSIX IPC primitives (semaphores and shared memory) for Python
Group:          Development/Languages
License:        GPLv3+
URL:            http://semanchuk.com/philip/posix_ipc/
Source0:        http://semanchuk.com/philip/posix_ipc/posix_ipc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-setuptools

%description
posix_ipc is a Python module (written in C) that permits creation and
manipulation of POSIX inter-process semaphores, shared memory and message
queues on platforms supporting the POSIX Realtime Extensions, 
POSIX 1003.1b-1993. /make_all.sh

%prep
%setup -q -n posix_ipc-%{version}
chmod 644 demo/make_all.sh
chmod 644 demo2/cleanup.py
chmod 644 demo/cleanup.py


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE demo demo2
%{python_sitearch}/*

%changelog
* Wed Apr 16 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.5.3-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-posix_ipc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 21:37:17 -0000	1.1
+++ .cvsignore	23 Apr 2009 09:50:26 -0000	1.2
@@ -0,0 +1 @@
+posix_ipc-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-posix_ipc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:37:17 -0000	1.1
+++ sources	23 Apr 2009 09:50:26 -0000	1.2
@@ -0,0 +1 @@
+ab3699b185e7e10918b21753e8b9c20b  posix_ipc-0.5.3.tar.gz



From pkgdb at fedoraproject.org  Thu Apr 23 10:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 10:00:31 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090423100031.0708810F888@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-sqlite (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Thu Apr 23 10:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 10:00:33 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090423100033.A46D410F88E@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-sqlite (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Thu Apr 23 10:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 10:00:37 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090423100037.550C610F892@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-sqlite (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Thu Apr 23 10:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 10:00:37 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090423100037.E081D10F897@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-sqlite (Fedora devel) to Approved for sailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From tmraz at fedoraproject.org  Thu Apr 23 10:10:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 23 Apr 2009 10:10:39 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.75, 1.76 authconfig.spec, 1.105,
	1.106 sources, 1.83, 1.84
Message-ID: <20090423101039.F101970106@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22617

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.10-1
- update PAM configuration when updating from old authconfig versions (#495924)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	10 Apr 2009 15:28:57 -0000	1.75
+++ .cvsignore	23 Apr 2009 10:10:07 -0000	1.76
@@ -1 +1 @@
-authconfig-5.4.9.tar.bz2
+authconfig-5.4.10.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- authconfig.spec	10 Apr 2009 15:28:57 -0000	1.105
+++ authconfig.spec	23 Apr 2009 10:10:07 -0000	1.106
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.9
+Version: 5.4.10
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -54,6 +54,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- authconfig <= 5.4.9
+authconfig --update --nostart >/dev/null 2>&1 || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING NOTES TODO README.samba3
@@ -98,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.10-1
+- update PAM configuration when updating from old authconfig versions (#495924)
+
 * Fri Apr 10 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.9-1
 - add support for multiple PAM auth stacks (by Ray Strode) (#494874)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	10 Apr 2009 15:28:57 -0000	1.83
+++ sources	23 Apr 2009 10:10:08 -0000	1.84
@@ -1 +1 @@
-e7cc8550fedd320fd45ee86e99b3ca6d  authconfig-5.4.9.tar.bz2
+368fb2d5738cf86d46de64ceced1b20a  authconfig-5.4.10.tar.bz2



From markmc at fedoraproject.org  Thu Apr 23 10:12:22 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 23 Apr 2009 10:12:22 +0000 (UTC)
Subject: rpms/qemu/devel make-release,NONE,1.1 qemu.spec,1.83,1.84
Message-ID: <20090423101222.72CA670104@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23561

Modified Files:
	qemu.spec 
Added Files:
	make-release 
Log Message:
* Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
- Improve instructions for generating the tarball



--- NEW FILE make-release ---
#!/bin/bash -e

# Based on avi's scripts/make-release from kvm-userspace.git

usage()
{
    echo "usage: make-release name kernel-dir kernel-commit user-dir user-commit"
    exit 1
}

[ $# -eq 5 ] || usage

name="$1"
kdir="$2"
kcommit="$3"
udir="$4"
ucommit="$5"
archs=(x86 ia64)

release_dir=$(mktemp -d)

tarball="$(pwd)/$name.tar.gz"

cd "${release_dir}"
(cd "$udir";  git archive --format=tar --prefix="$name"/ "$ucommit") | tar x
cd "$name"
cat <<EOF > SOURCES
kernel:    $(cd "$kdir"; git rev-parse "$kcommit")
userspace: $(cd "$udir"; git rev-parse "$ucommit")
EOF

paths=(drivers/kvm virt/kvm)
files=(kvm.h kvm_host.h kvm_para.h kvm_types.h kvm_x86_emulate.h virtext.h svm.h vmx.h)
for file in "${files[@]}"; do
    for arch in "${archs[@]}"; do
	for variant in include/asm-"$arch" arch/"$arch"/include/asm; do
	    paths+=("$variant"/"$file")
	done
    done
    paths+=(include/linux/"$file")
done
for arch in "${archs[@]}"; do
    paths+=(arch/"$arch"/kvm)
done

(cd "$kdir"; git archive --format=tar --prefix=linux/ "$kcommit" "${paths[@]}") | tar x

touch kernel/config.kbuild
echo ARCH=ia64 > config.mak
make -C kernel sync LINUX=../linux version="$name" >/dev/null
echo ARCH=x86_64 > config.mak
make -C kernel sync LINUX=../linux version="$name" >/dev/null
rm -rf config.mak linux kernel/config.kbuild
#rm -rf kernel/include/asm kernel/include-compat/asm
sed -i "s/kvm-devel/$name/" qemu/configure

cd ..

tar czf "$tarball" "$name"

cd $(dirname "$tarball")
md5sum $(basename "$tarball")

rm -rf "${release_dir}"


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- qemu.spec	21 Apr 2009 13:53:59 -0000	1.83
+++ qemu.spec	23 Apr 2009 10:11:52 -0000	1.84
@@ -1,26 +1,24 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
-#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
-# echo "kdir=$(pwd)/kvm" > ~/.kvm-release-config
-# cd kvm-userspace
-# mkdir $(HOME)/sf-releases
-# ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD
 
+# To re-create the tarball below:
+#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
+#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
+#   $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \
+#                                              $(pwd)/kvm-userspace kvm-84-196-ga01bd3f
 Source0: qemu-kvm-%{version}.tar.gz
+
 Source1: qemu.init
 Source2: kvm.modules
 
-
 Patch1: 01-tls-handshake-fix.patch
 Patch2: 02-vnc-monitor-info.patch
 Patch3: 03-display-keymaps.patch
@@ -468,6 +466,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
+- Improve instructions for generating the tarball
+
 * Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
 - Enable pulseaudio driver to fix qemu lockup at shutdown (#495964)
 



From markmc at fedoraproject.org  Thu Apr 23 10:14:49 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 23 Apr 2009 10:14:49 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.82,1.83
Message-ID: <20090423101449.5D8CE70104@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24008

Modified Files:
	qemu.spec 
Log Message:
* Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
- Improve instructions for generating the tarball



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- qemu.spec	21 Apr 2009 09:04:20 -0000	1.82
+++ qemu.spec	23 Apr 2009 10:14:18 -0000	1.83
@@ -1,26 +1,24 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 12%{?dist}
+Release: 13%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
-#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
-# echo "kdir=$(pwd)/kvm" > ~/.kvm-release-config
-# cd kvm-userspace
-# mkdir $(HOME)/sf-releases
-# ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD
 
+# To re-create the tarball below:
+#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
+#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
+#   $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \
+#                                              $(pwd)/kvm-userspace kvm-84-196-ga01bd3f
 Source0: qemu-kvm-%{version}.tar.gz
+
 Source1: qemu.init
 Source2: kvm.modules
 
-
 Patch1: 01-tls-handshake-fix.patch
 Patch2: 02-vnc-monitor-info.patch
 Patch3: 03-display-keymaps.patch
@@ -467,6 +465,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
+- Improve instructions for generating the tarball
+
 * Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-12
 - Another qcow2 image corruption fix (#496642)
 



From tmraz at fedoraproject.org  Thu Apr 23 10:17:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 23 Apr 2009 10:17:14 +0000 (UTC)
Subject: rpms/authconfig/F-11 .cvsignore, 1.75, 1.76 authconfig.spec, 1.105, 
	1.106 sources, 1.83, 1.84
Message-ID: <20090423101714.CEC7770104@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24378

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.10-1
- update PAM configuration when updating from old authconfig versions (#495924)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-11/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	10 Apr 2009 15:28:57 -0000	1.75
+++ .cvsignore	23 Apr 2009 10:16:44 -0000	1.76
@@ -1 +1 @@
-authconfig-5.4.9.tar.bz2
+authconfig-5.4.10.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-11/authconfig.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- authconfig.spec	10 Apr 2009 15:28:57 -0000	1.105
+++ authconfig.spec	23 Apr 2009 10:16:44 -0000	1.106
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.9
+Version: 5.4.10
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -54,6 +54,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- authconfig <= 5.4.9
+authconfig --update --nostart >/dev/null 2>&1 || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING NOTES TODO README.samba3
@@ -98,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.10-1
+- update PAM configuration when updating from old authconfig versions (#495924)
+
 * Fri Apr 10 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.9-1
 - add support for multiple PAM auth stacks (by Ray Strode) (#494874)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-11/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	10 Apr 2009 15:28:57 -0000	1.83
+++ sources	23 Apr 2009 10:16:44 -0000	1.84
@@ -1 +1 @@
-e7cc8550fedd320fd45ee86e99b3ca6d  authconfig-5.4.9.tar.bz2
+368fb2d5738cf86d46de64ceced1b20a  authconfig-5.4.10.tar.bz2



From markmc at fedoraproject.org  Thu Apr 23 10:23:26 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 23 Apr 2009 10:23:26 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.83,1.84
Message-ID: <20090423102326.A0F4270104@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25669

Modified Files:
	qemu.spec 
Log Message:
Include the make-release script in the src.rpm



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- qemu.spec	23 Apr 2009 10:14:18 -0000	1.83
+++ qemu.spec	23 Apr 2009 10:22:54 -0000	1.84
@@ -15,9 +15,9 @@
 #   $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \
 #                                              $(pwd)/kvm-userspace kvm-84-196-ga01bd3f
 Source0: qemu-kvm-%{version}.tar.gz
-
-Source1: qemu.init
-Source2: kvm.modules
+Source1: make-release
+Source2: qemu.init
+Source3: kvm.modules
 
 Patch1: 01-tls-handshake-fix.patch
 Patch2: 02-vnc-monitor-info.patch



From markmc at fedoraproject.org  Thu Apr 23 10:23:39 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 23 Apr 2009 10:23:39 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.84,1.85
Message-ID: <20090423102339.3A61870104@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736

Modified Files:
	qemu.spec 
Log Message:
Include the make-release script in the src.rpm



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- qemu.spec	23 Apr 2009 10:11:52 -0000	1.84
+++ qemu.spec	23 Apr 2009 10:23:08 -0000	1.85
@@ -15,9 +15,9 @@
 #   $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \
 #                                              $(pwd)/kvm-userspace kvm-84-196-ga01bd3f
 Source0: qemu-kvm-%{version}.tar.gz
-
-Source1: qemu.init
-Source2: kvm.modules
+Source1: make-release
+Source2: qemu.init
+Source3: kvm.modules
 
 Patch1: 01-tls-handshake-fix.patch
 Patch2: 02-vnc-monitor-info.patch



From ramkrsna at fedoraproject.org  Thu Apr 23 10:28:31 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:28:31 +0000 (UTC)
Subject: rpms/python-pytools/F-11 sources,1.1,1.2
Message-ID: <20090423102831.BE43870104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-pytools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26830

Modified Files:
	sources 
Log Message:
Inital Release for F-11


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pytools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:35:59 -0000	1.1
+++ sources	23 Apr 2009 10:28:00 -0000	1.2
@@ -0,0 +1 @@
+1cd76f03ac0280d8d22ed4f543812af8  pytools-8.tar.gz



From ramkrsna at fedoraproject.org  Thu Apr 23 10:29:11 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:29:11 +0000 (UTC)
Subject: rpms/python-pytools/F-11 python-pytools.spec,NONE,1.1
Message-ID: <20090423102911.9AECF70104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-pytools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27235

Added Files:
	python-pytools.spec 
Log Message:
Inital Release for F-11


--- NEW FILE python-pytools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-pytools
Version:        8
Release:        2%{?dist}
Summary:        A collection of tools for python

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/pytools
Source0:        http://pypi.python.org/packages/source/p/pytools/pytools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools 

%description
Pytools are a few interesting things that are missing from the Python Standard 
Library. 

Small tool functions such as ::
* len_iterable, 
* argmin, 
* tuple generation, 
* permutation generation, 
* ASCII table pretty printing, 
* GvR's mokeypatch_xxx() hack, 
* The elusive flatten, and much more.
* Michele Simionato's decorator module
* A time-series logging module, pytools.log.
* Batch job submission, pytools.batchjob.
* A lexer, pytools.lex.


%prep
%setup -q -n pytools-%{version}



%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/pytools/runalyzer.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README PKG-INFO
%{_bindir}/*
%{python_sitelib}/*



%changelog
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-2
- Spec file cleanup 

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-1
- Initial RPM release





From markmc at fedoraproject.org  Thu Apr 23 10:29:46 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 23 Apr 2009 10:29:46 +0000 (UTC)
Subject: rpms/qemu/F-11 make-release,NONE,1.1
Message-ID: <20090423102946.4E9FF70104@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27359

Added Files:
	make-release 
Log Message:
Add forgotten file



--- NEW FILE make-release ---
#!/bin/bash -e

# Based on avi's scripts/make-release from kvm-userspace.git

usage()
{
    echo "usage: make-release name kernel-dir kernel-commit user-dir user-commit"
    exit 1
}

[ $# -eq 5 ] || usage

name="$1"
kdir="$2"
kcommit="$3"
udir="$4"
ucommit="$5"
archs=(x86 ia64)

release_dir=$(mktemp -d)

tarball="$(pwd)/$name.tar.gz"

cd "${release_dir}"
(cd "$udir";  git archive --format=tar --prefix="$name"/ "$ucommit") | tar x
cd "$name"
cat <<EOF > SOURCES
kernel:    $(cd "$kdir"; git rev-parse "$kcommit")
userspace: $(cd "$udir"; git rev-parse "$ucommit")
EOF

paths=(drivers/kvm virt/kvm)
files=(kvm.h kvm_host.h kvm_para.h kvm_types.h kvm_x86_emulate.h virtext.h svm.h vmx.h)
for file in "${files[@]}"; do
    for arch in "${archs[@]}"; do
	for variant in include/asm-"$arch" arch/"$arch"/include/asm; do
	    paths+=("$variant"/"$file")
	done
    done
    paths+=(include/linux/"$file")
done
for arch in "${archs[@]}"; do
    paths+=(arch/"$arch"/kvm)
done

(cd "$kdir"; git archive --format=tar --prefix=linux/ "$kcommit" "${paths[@]}") | tar x

touch kernel/config.kbuild
echo ARCH=ia64 > config.mak
make -C kernel sync LINUX=../linux version="$name" >/dev/null
echo ARCH=x86_64 > config.mak
make -C kernel sync LINUX=../linux version="$name" >/dev/null
rm -rf config.mak linux kernel/config.kbuild
#rm -rf kernel/include/asm kernel/include-compat/asm
sed -i "s/kvm-devel/$name/" qemu/configure

cd ..

tar czf "$tarball" "$name"

cd $(dirname "$tarball")
md5sum $(basename "$tarball")

rm -rf "${release_dir}"



From ramkrsna at fedoraproject.org  Thu Apr 23 10:33:07 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:33:07 +0000 (UTC)
Subject: rpms/python-posix_ipc/F-11 python-posix_ipc.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423103307.C202670104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-posix_ipc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28170

Modified Files:
	sources 
Added Files:
	python-posix_ipc.spec 
Log Message:
 Initial release for F-11


--- NEW FILE python-posix_ipc.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-posix_ipc
Version:        0.5.3
Release:        1%{?dist}
Summary:        POSIX IPC primitives (semaphores and shared memory) for Python
Group:          Development/Languages
License:        GPLv3+
URL:            http://semanchuk.com/philip/posix_ipc/
Source0:        http://semanchuk.com/philip/posix_ipc/posix_ipc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-setuptools

%description
posix_ipc is a Python module (written in C) that permits creation and
manipulation of POSIX inter-process semaphores, shared memory and message
queues on platforms supporting the POSIX Realtime Extensions, 
POSIX 1003.1b-1993. /make_all.sh

%prep
%setup -q -n posix_ipc-%{version}
chmod 644 demo/make_all.sh
chmod 644 demo2/cleanup.py
chmod 644 demo/cleanup.py


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE demo demo2
%{python_sitearch}/*

%changelog
* Wed Apr 16 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.5.3-1
- Initial RPM release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-posix_ipc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:37:17 -0000	1.1
+++ sources	23 Apr 2009 10:32:37 -0000	1.2
@@ -0,0 +1 @@
+ab3699b185e7e10918b21753e8b9c20b  posix_ipc-0.5.3.tar.gz



From ramkrsna at fedoraproject.org  Thu Apr 23 10:34:54 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:34:54 +0000 (UTC)
Subject: rpms/python-bitarray/F-11 python-bitarray.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423103454.1A22570104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-bitarray/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28683

Modified Files:
	sources 
Added Files:
	python-bitarray.spec 
Log Message:
Initial release for F-11


--- NEW FILE python-bitarray.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 

Name:   python-bitarray          
Version:     0.3.5   
Release:        1%{?dist}
Summary:        Efficient Array of Booleans --C Extensions

Group:          Development/Languages
License:        Python
URL:            http://pypi.python.org/pypi/bitarray/
Source0:        http://pypi.python.org/packages/source/b/bitarray/bitarray-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-setuptools

%description
Bitarrays are sequence types and behave very much like usual lists.
Eight bits are represented by one byte in contiguous block of memory.
The user can select between two representations; little-endian and big-endian.
Most of the functionality is implemented in C.Methods for accessing the machine
representation are provided. This can be useful when bit level access to binary
files is required, such as portable bitmap image files (.pbm). Also, when 
dealing with compressed data which uses variable bit length encoding
you may find this module useful.

%prep
%setup -q -n bitarray-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE 

%{python_sitearch}/*
 


%changelog
* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.3.5-1
- Initial RPM release





Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bitarray/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:35:11 -0000	1.1
+++ sources	23 Apr 2009 10:34:23 -0000	1.2
@@ -0,0 +1 @@
+322a25e04e7aece5e028e5b068329291  bitarray-0.3.5.tar.gz



From mcepl at fedoraproject.org  Thu Apr 23 10:35:41 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 23 Apr 2009 10:35:41 +0000 (UTC)
Subject: rpms/pyexiv2/devel pyexiv2.spec,1.8,1.9
Message-ID: <20090423103541.9CD0A70104@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pyexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28852

Modified Files:
	pyexiv2.spec 
Log Message:
Rebuild to get new exiv2


Index: pyexiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/pyexiv2/devel/pyexiv2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyexiv2.spec	16 Apr 2009 20:07:23 -0000	1.8
+++ pyexiv2.spec	23 Apr 2009 10:35:11 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           pyexiv2
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
@@ -60,6 +60,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Sat Apr 18 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-2
+- Rebuild after exiv2 was fixed.
+
 * Thu Apr 16 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-1
 - New upstream release (closes bug 494419)
 



From ramkrsna at fedoraproject.org  Thu Apr 23 10:40:04 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:40:04 +0000 (UTC)
Subject: rpms/python-achoo/F-11 python-achoo.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090423104004.B7D1170104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-achoo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29907

Modified Files:
	sources 
Added Files:
	python-achoo.spec 
Log Message:
Initial release for F-11


--- NEW FILE python-achoo.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-achoo
Version:        1.0
Release:        2%{?dist}
Summary:        A fluent interface for testing Python objects

Group:          Development/Languages
License:        LGPLv3+
URL:            http://web.quuxo.com/products/achoo/
Source0:        http://web.quuxo.com/products/achoo/achoo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel python-setuptools

%description
Achoo is a fluent interface for unit testing Python objects.
Achoo makes it easy to make assertions about the properties 
and behaviours of Python objects. For example, is this object
equal to this other one? Does calling this function with these
arguments raise an error? More Infomation on fluent from here
http://www.martinfowler.com/bliki/FluentInterface.html

%prep
%setup -q -n achoo-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING.LESSER AUTHORS 
%{python_sitelib}/*


%changelog
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-2
- Adding correct upstream source, matching md5sums

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-1
- Initial RPM release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-achoo/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:36:38 -0000	1.1
+++ sources	23 Apr 2009 10:39:33 -0000	1.2
@@ -0,0 +1 @@
+2030a24b9daa0232aa776c08461e8061  achoo-1.0.tar.gz



From ramkrsna at fedoraproject.org  Thu Apr 23 10:43:10 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:43:10 +0000 (UTC)
Subject: rpms/python-pytools/F-10 python-pytools.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090423104311.02EA270107@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-pytools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30893

Modified Files:
	sources 
Added Files:
	python-pytools.spec 
Log Message:
Initial release for F-10


--- NEW FILE python-pytools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-pytools
Version:        8
Release:        2%{?dist}
Summary:        A collection of tools for python

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/pytools
Source0:        http://pypi.python.org/packages/source/p/pytools/pytools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools 

%description
Pytools are a few interesting things that are missing from the Python Standard 
Library. 

Small tool functions such as ::
* len_iterable, 
* argmin, 
* tuple generation, 
* permutation generation, 
* ASCII table pretty printing, 
* GvR's mokeypatch_xxx() hack, 
* The elusive flatten, and much more.
* Michele Simionato's decorator module
* A time-series logging module, pytools.log.
* Batch job submission, pytools.batchjob.
* A lexer, pytools.lex.


%prep
%setup -q -n pytools-%{version}



%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/pytools/runalyzer.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README PKG-INFO
%{_bindir}/*
%{python_sitelib}/*



%changelog
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-2
- Spec file cleanup 

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 8-1
- Initial RPM release




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pytools/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:35:59 -0000	1.1
+++ sources	23 Apr 2009 10:42:38 -0000	1.2
@@ -0,0 +1 @@
+1cd76f03ac0280d8d22ed4f543812af8  pytools-8.tar.gz



From dnovotny at fedoraproject.org  Thu Apr 23 10:46:37 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 23 Apr 2009 10:46:37 +0000 (UTC)
Subject: rpms/psmisc/devel psmisc-22.6-fuser-remove-mountlist.patch, NONE,
	1.1 psmisc.spec, 1.52, 1.53
Message-ID: <20090423104637.75D4370104@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/psmisc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32255

Modified Files:
	psmisc.spec 
Added Files:
	psmisc-22.6-fuser-remove-mountlist.patch 
Log Message:

fix #497303


psmisc-22.6-fuser-remove-mountlist.patch:

--- NEW FILE psmisc-22.6-fuser-remove-mountlist.patch ---
diff -ru psmisc-22.6.org/src/fuser.c psmisc-22.6/src/fuser.c
--- psmisc-22.6.org/src/fuser.c	2009-01-23 19:24:11.000000000 +0200
+++ psmisc-22.6/src/fuser.c	2009-01-23 19:28:43.000000000 +0200
@@ -69,7 +69,6 @@
 
 int parse_mount(struct names *this_name, struct device_list **dev_list);
 static void add_device(struct device_list **dev_list, struct names  *this_name, dev_t device);
-void scan_mount_devices(const opt_type opts, struct mountdev_list **mount_devices);
 void fill_unix_cache(struct unixsocket_list **unixsocket_head);
 static dev_t find_net_dev(void);
 static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head);
@@ -365,10 +364,9 @@
 	return 0;
 }
 
-int parse_mounts(struct names *this_name, struct mountdev_list *mounts, struct device_list **dev_list, const char opts) 
+int parse_mounts(struct names *this_name, struct device_list **dev_list, const char opts) 
 {
 	struct stat st;
-	struct mountdev_list *mountptr;
 	dev_t match_device;
 
 	if (stat(this_name->filename, &st) != 0) {
@@ -380,13 +378,7 @@
 		match_device = st.st_rdev;
 	else
 		match_device = st.st_dev;
-	for (mountptr = mounts ; mountptr != NULL ; mountptr = mountptr->next) {
-		if (mountptr->device == match_device) {
-			/*printf("Debug: adding parse_mounts() adding %s\n", 
-					this_name->filename);*/
-			add_device(dev_list, this_name, match_device);
-		}
-	}
+	add_device(dev_list, this_name, match_device);
 	return 0;
 }
 
@@ -660,7 +652,6 @@
 	int ipv4_only, ipv6_only;
 #endif
 	unsigned char default_namespace = NAMESPACE_FILE;
-	struct mountdev_list *mount_devices = NULL;
 	struct device_list *match_devices = NULL;
 	struct unixsocket_list *unixsockets = NULL;
 
@@ -692,7 +683,6 @@
 #endif
 
 	netdev = find_net_dev();
-	scan_mount_devices(opts, &mount_devices);
 	fill_unix_cache(&unixsockets);
 
 	/* getopt doesnt like things like -SIGBLAH */
@@ -831,7 +821,7 @@
 					parse_file(this_name, &match_inodes);
 					parse_unixsockets(this_name, &match_inodes, unixsockets);
 				if (opts & OPT_MOUNTPOINT || opts & OPT_MOUNTS)
-					parse_mounts(this_name, mount_devices, &match_devices, opts);
+					parse_mounts(this_name, &match_devices, opts);
 				break;
 		}
 
@@ -1082,20 +1072,6 @@
 	return st.st_uid;
 }
 
-void add_mount_device(struct mountdev_list **mount_head,const char *fsname, const char *dir, dev_t device)
-{
-	struct mountdev_list *newmount;
-	/*printf("Adding mount Path: %s Dir:%s dev:%0x\n",dir, fsname, device);*/
-
-	if ( (newmount = malloc(sizeof(struct mountdev_list))) == NULL)
-		return;
-	newmount->fsname = strdup(fsname);
-	newmount->dir = strdup(dir);
-	newmount->device = device;
-	newmount->next = *mount_head;
-	*mount_head = newmount;
-}
-
 /*
  * fill_unix_cache : Create a list of Unix sockets
  *   This list is used later for matching purposes
@@ -1135,28 +1111,6 @@
 
 }
 
-/*
- * scan_mount_devices : Create a list of mount points and devices
- *   This list is used later for matching purposes
- */
-void scan_mount_devices(const opt_type opts, struct mountdev_list **mount_devices)
-{
-	FILE *mntfp;
-	struct mntent *mnt_ptr;
-	struct stat st;
-	
-	if ( (mntfp = setmntent("/etc/mtab","r")) == NULL) {
-		fprintf(stderr, _("Cannot open /etc/mtab: %s\n"),
-				strerror(errno));
-		return;
-	}
-	while ( (mnt_ptr = getmntent(mntfp)) != NULL) {
-		if (stat(mnt_ptr->mnt_dir, &st) == 0) {
-			add_mount_device(mount_devices, mnt_ptr->mnt_fsname, mnt_ptr->mnt_dir, st.st_dev);
-		}
-	}
-}
-
 #ifdef DEBUG
 /* often not used, doesnt need translation */
 static void debug_match_lists(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head)
diff -ru psmisc-22.6.org/src/fuser.h psmisc-22.6/src/fuser.h
--- psmisc-22.6.org/src/fuser.h	2009-01-23 19:24:11.000000000 +0200
+++ psmisc-22.6/src/fuser.h	2009-01-23 19:29:48.000000000 +0200
@@ -58,14 +58,6 @@
 	struct inode_list *next;
 };
 
-struct mountdev_list {
-	char *fsname;
-	char *dir;
-	dev_t	device;
-	struct mountdev_list *next;
-};
-
-
 struct device_list {
 	struct names *name;
 	dev_t	device;


Index: psmisc.spec
===================================================================
RCS file: /cvs/extras/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- psmisc.spec	27 Feb 2009 02:45:40 -0000	1.52
+++ psmisc.spec	23 Apr 2009 10:46:06 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 22.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 Patch0: psmisc-22.6-types.patch
 Patch1: psmisc-22.6-pstree-overflow.patch
+Patch2: psmisc-22.6-fuser-remove-mountlist.patch
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -28,6 +29,7 @@
 %setup -q
 %patch0 -p1 -b .types
 %patch1 -p1 -b .overflow
+%patch2 -p1 -b .mount
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -68,6 +70,9 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Daniel Novotny <dnovotny at redhat.com> - 22.6-10
+- fix #497303 -  fuser -m <dev> doesn't work after lazy unmount
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 22.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ramkrsna at fedoraproject.org  Thu Apr 23 10:50:12 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 10:50:12 +0000 (UTC)
Subject: rpms/python-bitarray/F-10 python-bitarray.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423105012.6B85270104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-bitarray/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv653

Modified Files:
	sources 
Added Files:
	python-bitarray.spec 
Log Message:
Intital release for F-10


--- NEW FILE python-bitarray.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 

Name:   python-bitarray          
Version:     0.3.5   
Release:        1%{?dist}
Summary:        Efficient Array of Booleans --C Extensions

Group:          Development/Languages
License:        Python
URL:            http://pypi.python.org/pypi/bitarray/
Source0:        http://pypi.python.org/packages/source/b/bitarray/bitarray-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-setuptools

%description
Bitarrays are sequence types and behave very much like usual lists.
Eight bits are represented by one byte in contiguous block of memory.
The user can select between two representations; little-endian and big-endian.
Most of the functionality is implemented in C.Methods for accessing the machine
representation are provided. This can be useful when bit level access to binary
files is required, such as portable bitmap image files (.pbm). Also, when 
dealing with compressed data which uses variable bit length encoding
you may find this module useful.

%prep
%setup -q -n bitarray-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE 

%{python_sitearch}/*
 


%changelog
* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.3.5-1
- Initial RPM release





Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-bitarray/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:35:11 -0000	1.1
+++ sources	23 Apr 2009 10:49:42 -0000	1.2
@@ -0,0 +1 @@
+322a25e04e7aece5e028e5b068329291  bitarray-0.3.5.tar.gz



From mcepl at fedoraproject.org  Thu Apr 23 10:51:30 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 23 Apr 2009 10:51:30 +0000 (UTC)
Subject: rpms/pyexiv2/devel pyexiv2.spec,1.9,1.10
Message-ID: <20090423105130.7543170104@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pyexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv929

Modified Files:
	pyexiv2.spec 
Log Message:
Fix spec ... library shouldn't be executable


Index: pyexiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/pyexiv2/devel/pyexiv2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pyexiv2.spec	23 Apr 2009 10:35:11 -0000	1.9
+++ pyexiv2.spec	23 Apr 2009 10:51:00 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           pyexiv2
 Version:        0.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
@@ -45,7 +45,6 @@
 export CXXFLAGS="%{optflags}"
 export LDFLAGS="%{optflags}"
 scons DESTDIR=$RPM_BUILD_ROOT install
-chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/pyexiv2.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +59,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Apr 23 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-3
+- executable library doesn't make sense
+
 * Sat Apr 18 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-2
 - Rebuild after exiv2 was fixed.
 



From mcepl at fedoraproject.org  Thu Apr 23 10:55:31 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 23 Apr 2009 10:55:31 +0000 (UTC)
Subject: rpms/pyexiv2/F-11 pyexiv2.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20090423105531.EE33D70104@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/pyexiv2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1657

Modified Files:
	pyexiv2.spec sources 
Log Message:
New upstream release 0.1.3


Index: pyexiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/pyexiv2/F-11/pyexiv2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyexiv2.spec	26 Feb 2009 19:54:59 -0000	1.7
+++ pyexiv2.spec	23 Apr 2009 10:55:01 -0000	1.8
@@ -2,19 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyexiv2
-Version:        0.1.2
-Release:        9.1.20090109bzr107%{?dist}
+Version:        0.1.3
+Release:        3%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://tilloy.net/dev/pyexiv2/
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  bzr branch -r 107 https://code.launchpad.net/~osomon/pyexiv2/pyexiv2-0.2 pyexiv2
-#  tar -czvf pyexiv2.tar.gz pyexiv2/
-Source0:        pyexiv2.tar.bz2
-#Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
+Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
 # next patch should be removed when
 # https://bugs.launchpad.net/pyexiv2/+bug/249513
 # is fixed
@@ -33,7 +28,7 @@
 embedded in image files (JPEG, TIFF, ...). 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .multilib
 %patch1 -p1 -b .packager
 
@@ -50,7 +45,6 @@
 export CXXFLAGS="%{optflags}"
 export LDFLAGS="%{optflags}"
 scons DESTDIR=$RPM_BUILD_ROOT install
-chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/pyexiv2.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +59,13 @@
 %{python_sitearch}/*
 
 %changelog
+* Sat Apr 18 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-3
+- Rebuild after exiv2 was fixed.
+- Library shouldn't have executable bit set.
+
+* Thu Apr 16 2009 Mat??j Cepl <mcepl at redhat.com> - 0.1.3-1
+- New upstream release (closes bug 494419)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-9.1.20090109bzr107
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyexiv2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jan 2009 17:13:31 -0000	1.4
+++ sources	23 Apr 2009 10:55:01 -0000	1.5
@@ -1 +1 @@
-55726eb4f8d74d8543bef32bd9404197  pyexiv2.tar.bz2
+dfc28a6f5f098f88926e8e1de6b925c0  pyexiv2-0.1.3.tar.bz2



From ramkrsna at fedoraproject.org  Thu Apr 23 11:05:44 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 11:05:44 +0000 (UTC)
Subject: rpms/python-achoo/F-10 python-achoo.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090423110544.AB90770104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-achoo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4067

Modified Files:
	sources 
Added Files:
	python-achoo.spec 
Log Message:
Initial release for F-10


--- NEW FILE python-achoo.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-achoo
Version:        1.0
Release:        2%{?dist}
Summary:        A fluent interface for testing Python objects

Group:          Development/Languages
License:        LGPLv3+
URL:            http://web.quuxo.com/products/achoo/
Source0:        http://web.quuxo.com/products/achoo/achoo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel python-setuptools

%description
Achoo is a fluent interface for unit testing Python objects.
Achoo makes it easy to make assertions about the properties 
and behaviours of Python objects. For example, is this object
equal to this other one? Does calling this function with these
arguments raise an error? More Infomation on fluent from here
http://www.martinfowler.com/bliki/FluentInterface.html

%prep
%setup -q -n achoo-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING.LESSER AUTHORS 
%{python_sitelib}/*


%changelog
* Thu Apr 09 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-2
- Adding correct upstream source, matching md5sums

* Wed Apr 08 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 1.0-1
- Initial RPM release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-achoo/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:36:38 -0000	1.1
+++ sources	23 Apr 2009 11:05:12 -0000	1.2
@@ -0,0 +1 @@
+2030a24b9daa0232aa776c08461e8061  achoo-1.0.tar.gz



From jreznik at fedoraproject.org  Thu Apr 23 11:10:50 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 23 Apr 2009 11:10:50 +0000 (UTC)
Subject: rpms/system-config-bind/F-11 dnssec-workaround.patch, NONE,
	1.1 system-config-bind.spec, 1.83, 1.84
Message-ID: <20090423111050.20DF970104@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5214

Modified Files:
	system-config-bind.spec 
Added Files:
	dnssec-workaround.patch 
Log Message:
* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.12-2
- dnssec workaround (rhbz#496017)


dnssec-workaround.patch:

--- NEW FILE dnssec-workaround.patch ---
diff -r 1728a48f0fc2 src/DNSsec.py
--- a/src/DNSsec.py	Tue Apr 14 16:43:57 2009 +0200
+++ b/src/DNSsec.py	Thu Apr 23 12:57:55 2009 +0200
@@ -639,6 +639,10 @@
         s.key = 'trusted-keys'
         if bind.nmdc.__contains__('trusted-keys'):
             tk = bind.nmdc['trusted-keys']
+
+            # if we have only one key, add it to list
+            if (type(tk) == dict):
+                tk=[tk]    
             for lk in tk:
                 for k in lk.keys():
                     origin = k.strip('"')
diff -r 1728a48f0fc2 src/NamedConf.py
--- a/src/NamedConf.py	Tue Apr 14 16:43:57 2009 +0200
+++ b/src/NamedConf.py	Thu Apr 23 12:57:55 2009 +0200
@@ -410,7 +410,7 @@
                 k_removed=0
             if parent.has_key('_NEW_') and (dumpKey == None):
                 output+=string.join(parent['_NEW_'],'')
-                del parent['_NEW_'] 
+                del parent['_NEW_']
             if exists:
                 if t['type']=='key':
                    output+=t['t']
@@ -438,7 +438,16 @@
                                    lli=0
                                    output += obj[li][lli]
                                    lli+=1
-                               self.lists[lkey]=[li,lli]                               
+                               self.lists[lkey]=[li,lli]
+                           elif ( type(obj[li]) == dict):
+                               # FIX: fixes DNSSec support, workaround
+                               #ke = t['keys'][1]
+                               #for key, args in obj[li].items():
+                               #   if (key == ke):
+                               #       output+=args[0]+' '+args[1]+' '+args[2]+' '+args[3]
+                               self.lists[lkey]+=1
+                               
+                               # for now just skip
                            else:
                                output+=obj[li]
                                self.lists[lkey]+=1
@@ -518,37 +527,39 @@
         if len(self.chroot):
             chrootArg = '-t '+self.chroot
         for f in self.files:
-            md5sum=md5.new(f['contents']).digest()
-            if md5sum != f['md5']:
-                try:
-                    os.rename(f['file'],f['file']+'.'+ts)
-                    fd = os.open(f['file'],os.O_CREAT | os.O_WRONLY, 0644)
-                    os.write(fd, f['contents'])
-                    os.fsync(fd)
-                    os.close(fd)
-                    commands.getstatusoutput( "if [ -x /sbin/restorecon ]; then /sbin/restorecon "+ f['file'] + "; fi" )
-                    os.chown(f['file'],0,25)
-                except OSError, e:
-                    self.errors = [ e[0], _('cannot write file %s: %s.') % (f['file'], e[1]) ]
-                    return e[0]
-                f['md5']=md5sum
-                fName=f['file']
-                if (len(self.chroot)>0) and (len(fName)> len(self.chroot)) and (fName[:len(self.chroot)] == self.chroot):
-                    fName = fName[(len(self.chroot)+1):]
-                s=commands.getstatusoutput('/usr/sbin/named-checkconf '+chrootArg + ' '+fName)
-                if s[0] != 0:
-                    self.errors.append(_('Generation of new file "%s" failed:\n%s\nThe original file will be restored.')
+            # workaround for not working dnssec support
+            if (f['file'].find('/etc/pki/dnssec-keys') == -1):
+                md5sum=md5.new(f['contents']).digest()
+                if md5sum != f['md5']:
+                    try:
+                        os.rename(f['file'],f['file']+'.'+ts)
+                        fd = os.open(f['file'],os.O_CREAT | os.O_WRONLY, 0644)
+                        os.write(fd, f['contents'])
+                        os.fsync(fd)
+                        os.close(fd)
+                        commands.getstatusoutput( "if [ -x /sbin/restorecon ]; then /sbin/restorecon "+ f['file'] + "; fi" )
+                        os.chown(f['file'],0,25)
+                    except OSError, e:
+                        self.errors = [ e[0], _('cannot write file %s: %s.') % (f['file'], e[1]) ]
+                        return e[0]
+                    f['md5']=md5sum
+                    fName=f['file']
+                    if (len(self.chroot)>0) and (len(fName)> len(self.chroot)) and (fName[:len(self.chroot)] == self.chroot):
+                        fName = fName[(len(self.chroot)+1):]
+                    s=commands.getstatusoutput('/usr/sbin/named-checkconf '+chrootArg + ' '+fName)
+                    if s[0] != 0:
+                        self.errors.append(_('Generation of new file "%s" failed:\n%s\nThe original file will be restored.')
                                        % ( f['file'], s[1] )
                                       )
-                    try:
-                        os.rename(f['file'], f['file']+'.REJECT'+'.'+ts)
-                        os.rename(f['file']+'.'+ts,f['file'])
-                    except OSError, e:
-                        self.errors.append(_('Restoration of file "%s" failed:\n%s\n.')
+                        try:
+                            os.rename(f['file'], f['file']+'.REJECT'+'.'+ts)
+                            os.rename(f['file']+'.'+ts,f['file'])
+                        except OSError, e:
+                            self.errors.append(_('Restoration of file "%s" failed:\n%s\n.')
                                            %(f['file'], str(e[0]), e[1])
                                           )
-                        return e[0]
-                    return s[0]
+                            return e[0]
+                        return s[0]
         self.dirty = False
         self.tokens=self.files[0]['tokens']
         self.contents=self.files[0]['contents']
@@ -557,7 +568,9 @@
 
     def preview(self):
         for f in self.files:
-            yield ( f['file'], f['contents'] )
+    	    # workaround for not working dnssec support
+	    if (f['file'].find('/etc/pki/dnssec-keys') == -1):
+		yield ( f['file'], f['contents'] )
         
     def dump(self):
         out=''


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-11/system-config-bind.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- system-config-bind.spec	14 Apr 2009 14:48:54 -0000	1.83
+++ system-config-bind.spec	23 Apr 2009 11:10:19 -0000	1.84
@@ -1,11 +1,12 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
 Version:        4.0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
 Group:          Applications/System
 Source0:        https://fedorahosted.org/releases/s/y/system-config-bind/%{name}-%{version}.tar.gz
+Patch0:         dnssec-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  python, gettext, make, intltool, desktop-file-utils
@@ -24,6 +25,10 @@
 %prep
 %setup -q
 
+# this is workaround as DNSSec is enabled by default in Fedora 11 but it 
+# needs more work
+%patch0 -p1 -b .dnssec-workaround
+
 %build
 make 
 
@@ -81,6 +86,9 @@
 fi;
 
 %changelog
+* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.12-2
+- dnssec workaround (rhbz#496017)
+
 * Tue Apr 14 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.0.12-1
 - update to 4.0.12
 - startup crash (rhbz#495599)



From caolanm at fedoraproject.org  Thu Apr 23 11:15:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 23 Apr 2009 11:15:25 +0000 (UTC)
Subject: rpms/hunspell-de/F-10 igerman98-20090107-useaspell.patch, NONE,
	1.1 hunspell-de.spec, 1.5, 1.6 sources, 1.4,
	1.5 hunspell-de.nobuildhash.patch, 1.1, NONE
Message-ID: <20090423111525.848FF70104@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-de/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6209/F-10

Modified Files:
	hunspell-de.spec sources 
Added Files:
	igerman98-20090107-useaspell.patch 
Removed Files:
	hunspell-de.nobuildhash.patch 
Log Message:
fix dictionary build

igerman98-20090107-useaspell.patch:

--- NEW FILE igerman98-20090107-useaspell.patch ---
diff -ru igerman98-20090107-ispell/Makefile igerman98-20090107/Makefile
--- igerman98-20090107-ispell/Makefile	2009-04-23 11:40:50.000000000 +0100
+++ igerman98-20090107/Makefile	2009-04-23 11:41:48.000000000 +0100
@@ -275,7 +275,7 @@
 	# sed hack to merge /f/g to /fg : sed "s:/\(.*\)/:/\1:"
 	cat $$(WORDS_BLACKLISTS_$(1)) $$(WORDS_BLACKLISTS_de_all) >$$@
 
-hunspell-capmain-plus_$(1).tmp: ispell/$(1)_null.aff ispell/$(1)_null.hash hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
+hunspell-capmain-plus_$(1).tmp: aspell/$(1).dat aspell/$(1)_affix.dat hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
 	echo DEBUG: WORDS_CAPMAIN_PLUS_$(1) :: $$(WORDS_CAPMAIN_PLUS_$(1)) :::
 	echo DEBUG: WORDS_CAPMAIN_PLUS_de_all :: $$(WORDS_CAPMAIN_PLUS_de_all) :::
 	# limited dictionary of *-xx* files containing compounds not generated by capmain-small
@@ -283,7 +283,7 @@
 	#find dicts/ -name "*-xx*.txt" -print | xargs cat >> $$@.unfiltered-list.tmp
 	echo $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all) | xargs cat >> $$@.unfiltered-list0.tmp
 	./bin/myspellfixprefix.pl < $$@.unfiltered-list0.tmp | (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) | grep -v '^$$$$' > $$@.unfiltered-list.tmp
-	cat $$@.unfiltered-list.tmp | $(ISPELL) -d./ispell/$(1)_null -e > $$@.unfiltered-list-expanded.tmp
+	cat $$@.unfiltered-list.tmp | $(ASPELL) --lang=$(1) --local-data-dir=./aspell expand > $$@.unfiltered-list-expanded.tmp
 	$(SED) -f ./bin/dic2iso < $$@.unfiltered-list-expanded.tmp |$(SED) "s/qq//g" | $(NL) | $(HUNSPELL) -d hunspell/$(1)_small -L > $$@.unknown.tmp
 	$(SED) "s/^ *\([0-9]*\)\t.*$$$$/\1/" $$@.unknown.tmp > $$@.list-unknown-lines.tmp
 	./bin/extractlines.pl $$@.list-unknown-lines.tmp $$@.unfiltered-list.tmp > $$@.tmp


Index: hunspell-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/F-10/hunspell-de.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hunspell-de.spec	11 Dec 2007 16:44:59 -0000	1.5
+++ hunspell-de.spec	23 Apr 2009 11:14:54 -0000	1.6
@@ -1,16 +1,16 @@
 Name: hunspell-de
 Summary: German hunspell dictionaries
-%define upstreamid 20071211
+%define upstreamid 20090107
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2
 Group: Applications/Text
-URL: http://j3e.de/hunspell/
+URL: http://www.j3e.de/ispell/igerman98
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPLv2
+License: GPLv2 or GPLv3
 BuildArch: noarch
-BuildRequires: /usr/bin/ispell, hunspell
-Patch1: hunspell-de.nobuildhash.patch
+BuildRequires: aspell, hunspell
+Patch1: igerman98-20090107-useaspell.patch
 
 Requires: hunspell
 
@@ -19,19 +19,17 @@
 
 %prep
 %setup -q -n igerman98-%{upstreamid}
-%patch1 -p1 -b .nobuildhash.patch
+%patch1 -p1 -b .useaspell.patch
 
 %build
 make hunspell/de_AT.dic hunspell/de_AT.aff \
      hunspell/de_CH.dic hunspell/de_CH.aff \
      hunspell/de_DE.dic hunspell/de_DE.aff
 cd hunspell
-tr -d '\r' < README_de_AT.txt > README_de_AT.txt.new
-tr -d '\r' < README_de_CH.txt > README_de_CH.txt.new
-tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new
-mv -f README_de_AT.txt.new README_de_AT.txt
-mv -f README_de_CH.txt.new README_de_CH.txt
-mv -f README_de_DE.txt.new README_de_DE.txt
+for i in README_*.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
+    tr -d '\r' <$i.new > $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,10 +55,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc hunspell/README_de_??.txt hunspell/COPYING_OASIS hunspell/COPYING hunspell/Copyright
+%doc hunspell/README_de_??.txt hunspell/COPYING_OASIS hunspell/COPYING_GPLv2 hunspell/COPYING_GPLv3 hunspell/Copyright
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Apr 23 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090107-1
+- latest version + fix dictionaries
+
 * Tue Dec 11 2007 Caolan McNamara <caolanm at redhat.com> - 0.20071211-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Dec 2007 16:44:59 -0000	1.4
+++ sources	23 Apr 2009 11:14:54 -0000	1.5
@@ -1 +1 @@
-273929341c0df60ef88400310e81ba71  igerman98-20071211.tar.bz2
+fa6bc72afec56e90f035b8fa22e922f6  igerman98-20090107.tar.bz2


--- hunspell-de.nobuildhash.patch DELETED ---



From caolanm at fedoraproject.org  Thu Apr 23 11:15:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 23 Apr 2009 11:15:25 +0000 (UTC)
Subject: rpms/hunspell-de/F-11 igerman98-20090107-useaspell.patch, NONE,
	1.1 hunspell-de.spec, 1.9, 1.10 hunspell-de.nobuildhash.patch,
	1.1, NONE
Message-ID: <20090423111525.B384D70107@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-de/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6209/F-11

Modified Files:
	hunspell-de.spec 
Added Files:
	igerman98-20090107-useaspell.patch 
Removed Files:
	hunspell-de.nobuildhash.patch 
Log Message:
fix dictionary build

igerman98-20090107-useaspell.patch:

--- NEW FILE igerman98-20090107-useaspell.patch ---
diff -ru igerman98-20090107-ispell/Makefile igerman98-20090107/Makefile
--- igerman98-20090107-ispell/Makefile	2009-04-23 11:40:50.000000000 +0100
+++ igerman98-20090107/Makefile	2009-04-23 11:41:48.000000000 +0100
@@ -275,7 +275,7 @@
 	# sed hack to merge /f/g to /fg : sed "s:/\(.*\)/:/\1:"
 	cat $$(WORDS_BLACKLISTS_$(1)) $$(WORDS_BLACKLISTS_de_all) >$$@
 
-hunspell-capmain-plus_$(1).tmp: ispell/$(1)_null.aff ispell/$(1)_null.hash hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
+hunspell-capmain-plus_$(1).tmp: aspell/$(1).dat aspell/$(1)_affix.dat hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
 	echo DEBUG: WORDS_CAPMAIN_PLUS_$(1) :: $$(WORDS_CAPMAIN_PLUS_$(1)) :::
 	echo DEBUG: WORDS_CAPMAIN_PLUS_de_all :: $$(WORDS_CAPMAIN_PLUS_de_all) :::
 	# limited dictionary of *-xx* files containing compounds not generated by capmain-small
@@ -283,7 +283,7 @@
 	#find dicts/ -name "*-xx*.txt" -print | xargs cat >> $$@.unfiltered-list.tmp
 	echo $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all) | xargs cat >> $$@.unfiltered-list0.tmp
 	./bin/myspellfixprefix.pl < $$@.unfiltered-list0.tmp | (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) | grep -v '^$$$$' > $$@.unfiltered-list.tmp
-	cat $$@.unfiltered-list.tmp | $(ISPELL) -d./ispell/$(1)_null -e > $$@.unfiltered-list-expanded.tmp
+	cat $$@.unfiltered-list.tmp | $(ASPELL) --lang=$(1) --local-data-dir=./aspell expand > $$@.unfiltered-list-expanded.tmp
 	$(SED) -f ./bin/dic2iso < $$@.unfiltered-list-expanded.tmp |$(SED) "s/qq//g" | $(NL) | $(HUNSPELL) -d hunspell/$(1)_small -L > $$@.unknown.tmp
 	$(SED) "s/^ *\([0-9]*\)\t.*$$$$/\1/" $$@.unknown.tmp > $$@.list-unknown-lines.tmp
 	./bin/extractlines.pl $$@.list-unknown-lines.tmp $$@.unfiltered-list.tmp > $$@.tmp


Index: hunspell-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/F-11/hunspell-de.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hunspell-de.spec	27 Feb 2009 09:06:51 -0000	1.9
+++ hunspell-de.spec	23 Apr 2009 11:14:55 -0000	1.10
@@ -2,15 +2,15 @@
 Summary: German hunspell dictionaries
 %define upstreamid 20090107
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2
 Group: Applications/Text
 URL: http://www.j3e.de/ispell/igerman98
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2 or GPLv3
 BuildArch: noarch
-BuildRequires: aspell-en, hunspell
-Patch1: hunspell-de.nobuildhash.patch
+BuildRequires: aspell, hunspell
+Patch1: igerman98-20090107-useaspell.patch
 
 Requires: hunspell
 
@@ -19,19 +19,17 @@
 
 %prep
 %setup -q -n igerman98-%{upstreamid}
-%patch1 -p1 -b .nobuildhash.patch
+%patch1 -p1 -b .useaspell.patch
 
 %build
 make hunspell/de_AT.dic hunspell/de_AT.aff \
      hunspell/de_CH.dic hunspell/de_CH.aff \
      hunspell/de_DE.dic hunspell/de_DE.aff
 cd hunspell
-tr -d '\r' < README_de_AT.txt > README_de_AT.txt.new
-tr -d '\r' < README_de_CH.txt > README_de_CH.txt.new
-tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new
-mv -f README_de_AT.txt.new README_de_AT.txt
-mv -f README_de_CH.txt.new README_de_CH.txt
-mv -f README_de_DE.txt.new README_de_DE.txt
+for i in README_*.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
+    tr -d '\r' <$i.new > $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +59,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Apr 23 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090107-2
+- fix dictionaries
+
 * Thu Feb 26 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090107-1
 - latest version
 


--- hunspell-de.nobuildhash.patch DELETED ---



From caolanm at fedoraproject.org  Thu Apr 23 11:15:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 23 Apr 2009 11:15:26 +0000 (UTC)
Subject: rpms/hunspell-de/devel igerman98-20090107-useaspell.patch, NONE,
	1.1 hunspell-de.spec, 1.9, 1.10 hunspell-de.nobuildhash.patch,
	1.1, NONE
Message-ID: <20090423111526.76AB670104@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-de/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6209/devel

Modified Files:
	hunspell-de.spec 
Added Files:
	igerman98-20090107-useaspell.patch 
Removed Files:
	hunspell-de.nobuildhash.patch 
Log Message:
fix dictionary build

igerman98-20090107-useaspell.patch:

--- NEW FILE igerman98-20090107-useaspell.patch ---
diff -ru igerman98-20090107-ispell/Makefile igerman98-20090107/Makefile
--- igerman98-20090107-ispell/Makefile	2009-04-23 11:40:50.000000000 +0100
+++ igerman98-20090107/Makefile	2009-04-23 11:41:48.000000000 +0100
@@ -275,7 +275,7 @@
 	# sed hack to merge /f/g to /fg : sed "s:/\(.*\)/:/\1:"
 	cat $$(WORDS_BLACKLISTS_$(1)) $$(WORDS_BLACKLISTS_de_all) >$$@
 
-hunspell-capmain-plus_$(1).tmp: ispell/$(1)_null.aff ispell/$(1)_null.hash hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
+hunspell-capmain-plus_$(1).tmp: aspell/$(1).dat aspell/$(1)_affix.dat hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
 	echo DEBUG: WORDS_CAPMAIN_PLUS_$(1) :: $$(WORDS_CAPMAIN_PLUS_$(1)) :::
 	echo DEBUG: WORDS_CAPMAIN_PLUS_de_all :: $$(WORDS_CAPMAIN_PLUS_de_all) :::
 	# limited dictionary of *-xx* files containing compounds not generated by capmain-small
@@ -283,7 +283,7 @@
 	#find dicts/ -name "*-xx*.txt" -print | xargs cat >> $$@.unfiltered-list.tmp
 	echo $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all) | xargs cat >> $$@.unfiltered-list0.tmp
 	./bin/myspellfixprefix.pl < $$@.unfiltered-list0.tmp | (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) | grep -v '^$$$$' > $$@.unfiltered-list.tmp
-	cat $$@.unfiltered-list.tmp | $(ISPELL) -d./ispell/$(1)_null -e > $$@.unfiltered-list-expanded.tmp
+	cat $$@.unfiltered-list.tmp | $(ASPELL) --lang=$(1) --local-data-dir=./aspell expand > $$@.unfiltered-list-expanded.tmp
 	$(SED) -f ./bin/dic2iso < $$@.unfiltered-list-expanded.tmp |$(SED) "s/qq//g" | $(NL) | $(HUNSPELL) -d hunspell/$(1)_small -L > $$@.unknown.tmp
 	$(SED) "s/^ *\([0-9]*\)\t.*$$$$/\1/" $$@.unknown.tmp > $$@.list-unknown-lines.tmp
 	./bin/extractlines.pl $$@.list-unknown-lines.tmp $$@.unfiltered-list.tmp > $$@.tmp


Index: hunspell-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/devel/hunspell-de.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hunspell-de.spec	27 Feb 2009 09:06:51 -0000	1.9
+++ hunspell-de.spec	23 Apr 2009 11:14:55 -0000	1.10
@@ -2,15 +2,15 @@
 Summary: German hunspell dictionaries
 %define upstreamid 20090107
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2
 Group: Applications/Text
 URL: http://www.j3e.de/ispell/igerman98
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2 or GPLv3
 BuildArch: noarch
-BuildRequires: aspell-en, hunspell
-Patch1: hunspell-de.nobuildhash.patch
+BuildRequires: aspell, hunspell
+Patch1: igerman98-20090107-useaspell.patch
 
 Requires: hunspell
 
@@ -19,19 +19,17 @@
 
 %prep
 %setup -q -n igerman98-%{upstreamid}
-%patch1 -p1 -b .nobuildhash.patch
+%patch1 -p1 -b .useaspell.patch
 
 %build
 make hunspell/de_AT.dic hunspell/de_AT.aff \
      hunspell/de_CH.dic hunspell/de_CH.aff \
      hunspell/de_DE.dic hunspell/de_DE.aff
 cd hunspell
-tr -d '\r' < README_de_AT.txt > README_de_AT.txt.new
-tr -d '\r' < README_de_CH.txt > README_de_CH.txt.new
-tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new
-mv -f README_de_AT.txt.new README_de_AT.txt
-mv -f README_de_CH.txt.new README_de_CH.txt
-mv -f README_de_DE.txt.new README_de_DE.txt
+for i in README_*.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
+    tr -d '\r' <$i.new > $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +59,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Apr 23 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090107-2
+- fix dictionaries
+
 * Thu Feb 26 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090107-1
 - latest version
 


--- hunspell-de.nobuildhash.patch DELETED ---



From sarantis at fedoraproject.org  Thu Apr 23 11:23:16 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Thu, 23 Apr 2009 11:23:16 +0000 (UTC)
Subject: rpms/python-simpy/devel python-simpy.spec,1.23,1.24
Message-ID: <20090423112316.410E870104@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8267

Modified Files:
	python-simpy.spec 
Log Message:
Upgrade to 2.0.1



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-simpy.spec	26 Feb 2009 23:30:28 -0000	1.23
+++ python-simpy.spec	23 Apr 2009 11:22:44 -0000	1.24
@@ -2,13 +2,13 @@
 %define pkgname SimPy
 
 Name:		python-simpy
-Version:	2.0
-Release:	2%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPLv2+
 URL:		http://simpy.sourceforge.net
-Source0:	http://downloads.sourceforge.net/simpy/SimPy-%{version}0.tar.gz
+Source0:	http://downloads.sourceforge.net/simpy/SimPy-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
@@ -27,8 +27,9 @@
 
 
 %package doc
-Group: Documentation
-Summary: Source code documentation for SimPy
+Group:		Documentation
+Summary:	Documentation for SimPy, the Python simulation framework
+Requires:	%{name} = %{version}-%{release}
 
 %description doc
 SimPy (= Simulation in Python) is an object-oriented, process-based
@@ -37,7 +38,7 @@
 
 
 %prep
-%setup -q -n %{pkgname}-%{version}0
+%setup -q -n %{pkgname}-%{version}
 # Remove the shebangs to make rpmlint happy
 sed -i -e '/^#!.*python/,1D' SimPy/*.py
 # Drop executable bits for files
@@ -61,7 +62,7 @@
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/*
-%doc LGPLlicense_files
+%doc LGPLlicense*
 
 
 %files doc
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0.1-1
+- Upgrade to 2.0.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sarantis at fedoraproject.org  Thu Apr 23 11:26:50 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Thu, 23 Apr 2009 11:26:50 +0000 (UTC)
Subject: rpms/python-simpy/devel .cvsignore,1.8,1.9 sources,1.9,1.10
Message-ID: <20090423112650.37F7770104@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8882

Modified Files:
	.cvsignore sources 
Log Message:
Upgrade to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2009 12:16:44 -0000	1.8
+++ .cvsignore	23 Apr 2009 11:26:19 -0000	1.9
@@ -1 +1 @@
-SimPy-2.00.tar.gz
+SimPy-2.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Feb 2009 12:16:44 -0000	1.9
+++ sources	23 Apr 2009 11:26:19 -0000	1.10
@@ -1 +1 @@
-1d999a7c0b96c460e927a8ec75b8efd9  SimPy-2.00.tar.gz
+5a0cb11440dbc3b02f8311df333323dd  SimPy-2.0.1.tar.gz



From ramkrsna at fedoraproject.org  Thu Apr 23 11:26:47 2009
From: ramkrsna at fedoraproject.org (Ramakrishna Reddy)
Date: Thu, 23 Apr 2009 11:26:47 +0000 (UTC)
Subject: rpms/python-posix_ipc/F-10 python-posix_ipc.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423112647.6326070104@cvs1.fedora.phx.redhat.com>

Author: ramkrsna

Update of /cvs/pkgs/rpms/python-posix_ipc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8925

Modified Files:
	sources 
Added Files:
	python-posix_ipc.spec 
Log Message:
Initial release for F-10


--- NEW FILE python-posix_ipc.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-posix_ipc
Version:        0.5.3
Release:        1%{?dist}
Summary:        POSIX IPC primitives (semaphores and shared memory) for Python
Group:          Development/Languages
License:        GPLv3+
URL:            http://semanchuk.com/philip/posix_ipc/
Source0:        http://semanchuk.com/philip/posix_ipc/posix_ipc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-setuptools

%description
posix_ipc is a Python module (written in C) that permits creation and
manipulation of POSIX inter-process semaphores, shared memory and message
queues on platforms supporting the POSIX Realtime Extensions, 
POSIX 1003.1b-1993. /make_all.sh

%prep
%setup -q -n posix_ipc-%{version}
chmod 644 demo/make_all.sh
chmod 644 demo2/cleanup.py
chmod 644 demo/cleanup.py


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE demo demo2
%{python_sitearch}/*

%changelog
* Wed Apr 16 2009 Ramakrishna Reddy Yekulla <ramkrsna at fedoraproject.org> 0.5.3-1
- Initial RPM release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-posix_ipc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 21:37:17 -0000	1.1
+++ sources	23 Apr 2009 11:26:16 -0000	1.2
@@ -0,0 +1 @@
+ab3699b185e7e10918b21753e8b9c20b  posix_ipc-0.5.3.tar.gz



From rhughes at fedoraproject.org  Thu Apr 23 11:29:37 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 23 Apr 2009 11:29:37 +0000 (UTC)
Subject: rpms/PackageKit/F-11 PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch, 
	NONE, 1.1 PackageKit.spec, 1.104, 1.105
Message-ID: <20090423112937.58B7A70104@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9501

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch 
Log Message:
* Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-7
- Backport a patch from upstream to disallow SIGKILL when using the yum
  backend. This is recommended by Panu.


PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch:

--- NEW FILE PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch ---
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index 05f573c..87228b1 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -63,6 +63,7 @@ backend_initialize (PkBackend *backend)
 	pk_backend_spawn_set_filter_stderr (spawn, backend_stderr_cb);
 	pk_backend_spawn_set_filter_stdout (spawn, backend_stdout_cb);
 	pk_backend_spawn_set_name (spawn, "yum");
+	pk_backend_spawn_set_allow_sigkill (spawn, FALSE);
 }
 
 /**
diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in
index 36b7e8f..5ab4cd6 100644
--- a/etc/PackageKit.conf.in
+++ b/etc/PackageKit.conf.in
@@ -53,6 +53,21 @@ BackendSpawnNiceValue=10
 # default=true
 BackendSpawnIdleIO=true
 
+# Set whether the spawned backends are allowed to be SIGKILLed if they do not
+# respond to SIGQUIT. This ensures that Cancel() works as expected, but
+# somtimes can corrupt databases if they are open.
+#
+# Only change this to FALSE if your backend can not be SIGKILLed without
+# database corruption.
+#
+# Even if this is set TRUE, the backend can still enforce this FALSE if it it
+# explicitly set in the compiled backend. You can think of this as a fallback
+# value that is used when backends do not enforce policy, or as a way to disable
+# SIGKILL even for backends that calim to support it.
+#
+# default=true
+BackendSpawnAllowSIGKILL=true
+
 # Default backend, as chosen in the configure script. This will be used where
 # no --backend="foo" option is given to the daemon.
 #
diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 417f142..2942584 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -63,6 +63,7 @@ struct PkBackendSpawnPrivate
 	guint			 backend_finished_id;
 	PkConf			*conf;
 	gboolean		 finished;
+	gboolean		 allow_sigkill;
 	PkBackendSpawnFilterFunc stdout_func;
 	PkBackendSpawnFilterFunc stderr_func;
 };
@@ -763,6 +764,27 @@ pk_backend_spawn_helper (PkBackendSpawn *backend_spawn, const gchar *first_eleme
 }
 
 /**
+ * pk_backend_spawn_set_allow_sigkill:
+ **/
+gboolean
+pk_backend_spawn_set_allow_sigkill (PkBackendSpawn *backend_spawn, gboolean allow_sigkill)
+{
+	gboolean ret = FALSE;
+
+	g_return_val_if_fail (PK_IS_BACKEND_SPAWN (backend_spawn), FALSE);
+
+	/* have we banned this in the config ile */
+	if (!backend_spawn->priv->allow_sigkill && allow_sigkill) {
+		egg_warning ("cannot set allow_cancel TRUE as BackendSpawnAllowSIGKILL is set to FALSE in PackageKit.conf");
+		goto out;
+	}
+
+	ret = pk_spawn_set_allow_sigkill (backend_spawn->priv->spawn, allow_sigkill);
+out:
+	return ret;
+}
+
+/**
  * pk_backend_spawn_finalize:
  **/
 static void
@@ -821,6 +843,10 @@ pk_backend_spawn_init (PkBackendSpawn *backend_spawn)
 			  G_CALLBACK (pk_backend_spawn_stdout_cb), backend_spawn);
 	g_signal_connect (backend_spawn->priv->spawn, "stderr",
 			  G_CALLBACK (pk_backend_spawn_stderr_cb), backend_spawn);
+
+	/* set if SIGKILL is allowed */
+	backend_spawn->priv->allow_sigkill = pk_conf_get_bool (backend_spawn->priv->conf, "BackendSpawnAllowSIGKILL");
+	pk_spawn_set_allow_sigkill (backend_spawn->priv->spawn, backend_spawn->priv->allow_sigkill);
 }
 
 /**
diff --git a/src/pk-backend-spawn.h b/src/pk-backend-spawn.h
index 894c4a6..b55e7ad 100644
--- a/src/pk-backend-spawn.h
+++ b/src/pk-backend-spawn.h
@@ -58,6 +58,8 @@ gboolean	 pk_backend_spawn_kill			(PkBackendSpawn	*backend_spawn);
 const gchar	*pk_backend_spawn_get_name		(PkBackendSpawn	*backend_spawn);
 gboolean	 pk_backend_spawn_set_name		(PkBackendSpawn	*backend_spawn,
 							 const gchar	*name);
+gboolean	 pk_backend_spawn_set_allow_sigkill	(PkBackendSpawn	*backend_spawn,
+							 gboolean	 allow_sigkill);
 
 /* filtering */
 typedef gboolean (*PkBackendSpawnFilterFunc)		(PkBackend	*backend,
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index bd609e4..5c356a1 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -69,6 +69,7 @@ struct PkSpawnPrivate
 	gboolean		 finished;
 	gboolean		 is_sending_exit;
 	gboolean		 is_changing_dispatcher;
+	gboolean		 allow_sigkill;
 	PkSpawnExitType		 exit;
 	GString			*stdout_buf;
 	GString			*stderr_buf;
@@ -293,8 +294,7 @@ pk_spawn_is_running (PkSpawn *spawn)
 /**
  * pk_spawn_kill:
  *
- * We send SIGQUIT and after a few ms SIGKILL
- *
+ * We send SIGQUIT and after a few ms SIGKILL (if allowed)
  **/
 gboolean
 pk_spawn_kill (PkSpawn *spawn)
@@ -324,7 +324,26 @@ pk_spawn_kill (PkSpawn *spawn)
 	}
 
 	/* the program might not be able to handle SIGQUIT, give it a few seconds and then SIGKILL it */
-	spawn->priv->kill_id = g_timeout_add (PK_SPAWN_SIGKILL_DELAY, (GSourceFunc) pk_spawn_sigkill_cb, spawn);
+	if (spawn->priv->allow_sigkill)
+		spawn->priv->kill_id = g_timeout_add (PK_SPAWN_SIGKILL_DELAY, (GSourceFunc) pk_spawn_sigkill_cb, spawn);
+
+	return TRUE;
+}
+
+/**
+ * pk_spawn_set_allow_sigkill:
+ *
+ * Set whether the spawned backends are allowed to be SIGKILLed if they do not
+ * respond to SIGQUIT. This ensures that Cancel() works as expected, but
+ * somtimes can corrupt databases if they are open.
+ **/
+gboolean
+pk_spawn_set_allow_sigkill (PkSpawn *spawn, gboolean allow_sigkill)
+{
+	g_return_val_if_fail (PK_IS_SPAWN (spawn), FALSE);
+
+	egg_debug ("setting SIGKILL: %i", allow_sigkill);
+	spawn->priv->allow_sigkill = allow_sigkill;
 
 	return TRUE;
 }
@@ -592,6 +611,7 @@ pk_spawn_init (PkSpawn *spawn)
 	spawn->priv->finished = FALSE;
 	spawn->priv->is_sending_exit = FALSE;
 	spawn->priv->is_changing_dispatcher = FALSE;
+	spawn->priv->allow_sigkill = TRUE;
 	spawn->priv->last_argv0 = NULL;
 	spawn->priv->last_envp = NULL;
 	spawn->priv->exit = PK_SPAWN_EXIT_TYPE_UNKNOWN;
diff --git a/src/pk-spawn.h b/src/pk-spawn.h
index 6d81bab..8901fb0 100644
--- a/src/pk-spawn.h
+++ b/src/pk-spawn.h
@@ -73,6 +73,8 @@ gboolean	 pk_spawn_argv				(PkSpawn	*spawn,
 gboolean	 pk_spawn_is_running			(PkSpawn	*spawn);
 gboolean	 pk_spawn_kill				(PkSpawn	*spawn);
 gboolean	 pk_spawn_exit				(PkSpawn	*spawn);
+gboolean	 pk_spawn_set_allow_sigkill		(PkSpawn	*spawn,
+							 gboolean	 allow_sigkill);
 
 G_END_DECLS
 


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- PackageKit.spec	22 Apr 2009 11:09:34 -0000	1.104
+++ PackageKit.spec	23 Apr 2009 11:29:06 -0000	1.105
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -51,6 +51,9 @@
 # Already upstream: 6ed10da156d9130f5443c1348405434cdc0cdfce
 Patch10:   PackageKit-0.4.6-send-package-finished.patch
 
+# Already upstream: 33894239b42dcb6069ab3a99e3cb47667448d499..a782056c337562594155a9405adcd9d5e65be32d
+Patch11:   PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -260,6 +263,7 @@
 %patch8 -p1 -b .presto-filter
 %patch9 -p1 -b .presto-downloading-updates
 %patch10 -p1 -b .send-package-finished
+%patch11 -p1 -b .disallow-sigkill
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -454,6 +458,10 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-7
+- Backport a patch from upstream to disallow SIGKILL when using the yum
+  backend. This is recommended by Panu.
+
 * Wed Apr 22 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-6
 - Send ::Package(finished) when we've finished downloading a file rather than
   relying for the daemon to clean up for us.



From sarantis at fedoraproject.org  Thu Apr 23 11:39:04 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Thu, 23 Apr 2009 11:39:04 +0000 (UTC)
Subject: rpms/python-simpy/F-11 .cvsignore, 1.8, 1.9 python-simpy.spec, 1.23,
	1.24 sources, 1.9, 1.10
Message-ID: <20090423113904.6078C70104@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11338

Modified Files:
	.cvsignore python-simpy.spec sources 
Log Message:
Upgrade to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2009 12:16:44 -0000	1.8
+++ .cvsignore	23 Apr 2009 11:38:32 -0000	1.9
@@ -1 +1 @@
-SimPy-2.00.tar.gz
+SimPy-2.0.1.tar.gz


Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/F-11/python-simpy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-simpy.spec	26 Feb 2009 23:30:28 -0000	1.23
+++ python-simpy.spec	23 Apr 2009 11:38:32 -0000	1.24
@@ -2,13 +2,13 @@
 %define pkgname SimPy
 
 Name:		python-simpy
-Version:	2.0
-Release:	2%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPLv2+
 URL:		http://simpy.sourceforge.net
-Source0:	http://downloads.sourceforge.net/simpy/SimPy-%{version}0.tar.gz
+Source0:	http://downloads.sourceforge.net/simpy/SimPy-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
@@ -27,8 +27,9 @@
 
 
 %package doc
-Group: Documentation
-Summary: Source code documentation for SimPy
+Group:		Documentation
+Summary:	Documentation for SimPy, the Python simulation framework
+Requires:	%{name} = %{version}-%{release}
 
 %description doc
 SimPy (= Simulation in Python) is an object-oriented, process-based
@@ -37,7 +38,7 @@
 
 
 %prep
-%setup -q -n %{pkgname}-%{version}0
+%setup -q -n %{pkgname}-%{version}
 # Remove the shebangs to make rpmlint happy
 sed -i -e '/^#!.*python/,1D' SimPy/*.py
 # Drop executable bits for files
@@ -61,7 +62,7 @@
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/*
-%doc LGPLlicense_files
+%doc LGPLlicense*
 
 
 %files doc
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0.1-1
+- Upgrade to 2.0.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Feb 2009 12:16:44 -0000	1.9
+++ sources	23 Apr 2009 11:38:32 -0000	1.10
@@ -1 +1 @@
-1d999a7c0b96c460e927a8ec75b8efd9  SimPy-2.00.tar.gz
+5a0cb11440dbc3b02f8311df333323dd  SimPy-2.0.1.tar.gz



From sailer at fedoraproject.org  Thu Apr 23 11:39:49 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 23 Apr 2009 11:39:49 +0000 (UTC)
Subject: rpms/mingw32-sqlite/devel mingw32-sqlite-3.6.12-no-undefined.patch, 
	NONE, 1.1 sqlite-3.6.12-libdl.patch, NONE,
	1.1 sqlite-3.6.12-memalign.patch, NONE,
	1.1 sqlite-3.6.12-no-sqlite-doc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 mingw32-sqlite.spec, 1.3, 1.4 sources, 1.2,
	1.3 mingw32-sqlite-3.6.6.2-no-undefined.patch, 1.1,
	NONE sqlite-3.6.6.2-libdl.patch, 1.1, NONE
Message-ID: <20090423113949.8766A70104@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11477

Modified Files:
	.cvsignore mingw32-sqlite.spec sources 
Added Files:
	mingw32-sqlite-3.6.12-no-undefined.patch 
	sqlite-3.6.12-libdl.patch sqlite-3.6.12-memalign.patch 
	sqlite-3.6.12-no-sqlite-doc.patch 
Removed Files:
	mingw32-sqlite-3.6.6.2-no-undefined.patch 
	sqlite-3.6.6.2-libdl.patch 
Log Message:
update to 3.6.12, to match native and enable rtree, fts3


mingw32-sqlite-3.6.12-no-undefined.patch:

--- NEW FILE mingw32-sqlite-3.6.12-no-undefined.patch ---
--- sqlite-3.6.12/Makefile.in.orig	2009-03-30 18:37:16.000000000 +0200
+++ sqlite-3.6.12/Makefile.in	2009-04-23 11:16:17.000000000 +0200
@@ -463,14 +463,15 @@
 
 libsqlite3.la:	$(LIBOBJ)
 	$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
-		${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
+		${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" \
+		-no-undefined
 
 libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
 	$(LTLINK) -o $@ tclsqlite.lo \
 		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
 		-rpath "$(TCLLIBDIR)" \
 		-version-info "8:6:8" \
-		-avoid-version
+		-avoid-version -no-undefined
 
 sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
 	$(LTLINK) $(READLINE_FLAGS) \

sqlite-3.6.12-libdl.patch:

--- NEW FILE sqlite-3.6.12-libdl.patch ---
diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac
--- sqlite-3.6.4/configure.ac.orig	2008-11-08 11:37:15.000000000 +0200
+++ sqlite-3.6.4/configure.ac	2008-11-08 11:35:50.000000000 +0200
@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST
       [use_loadextension=$enableval],[use_loadextension=no])
 if test "${use_loadextension}" = "yes" ; then
   OPT_FEATURE_FLAGS=""
+  AC_SEARCH_LIBS(dlopen, [dl])
 else
   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

sqlite-3.6.12-memalign.patch:

--- NEW FILE sqlite-3.6.12-memalign.patch ---
---------------------
PatchSet 6171 
Date: 2009/04/05 15:22:09
Author: drh
Branch: HEAD
Tag: (none) 
Branches: 
Log:
Additional code to make sure and to assert that memory allocations have
8-byte alignment.  Ticket #3777.

Members: 
	src/btree.c:1.589->1.590 
	src/memjournal.c:1.10->1.11 
	src/pager.c:1.577->1.578 
	src/sqliteInt.h:1.850->1.851 
	src/vdbeaux.c:1.446->1.447 
	src/vdbemem.c:1.139->1.140 

Index: sqlite/src/btree.c
diff -u sqlite/src/btree.c:1.589 sqlite/src/btree.c:1.590
--- sqlite/src/btree.c:1.589	Thu Apr  2 20:16:59 2009
+++ sqlite/src/btree.c	Sun Apr  5 12:22:09 2009
@@ -5357,13 +5357,13 @@
   }
   szCell = (u16*)&apCell[nMaxCells];
   aCopy[0] = (u8*)&szCell[nMaxCells];
-  assert( ((aCopy[0] - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
+  assert( EIGHT_BYTE_ALIGNMENT(aCopy[0]) );
   for(i=1; i<NB; i++){
     aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
     assert( ((aCopy[i] - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
   }
   aSpace1 = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-  assert( ((aSpace1 - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
+  assert( EIGHT_BYTE_ALIGNMENT(aSpace1) );
   if( ISAUTOVACUUM ){
     aFrom = &aSpace1[pBt->pageSize];
   }
Index: sqlite/src/memjournal.c
diff -u sqlite/src/memjournal.c:1.10 sqlite/src/memjournal.c:1.11
--- sqlite/src/memjournal.c:1.10	Thu Apr  2 17:22:42 2009
+++ sqlite/src/memjournal.c	Sun Apr  5 12:22:09 2009
@@ -237,6 +237,7 @@
 */
 void sqlite3MemJournalOpen(sqlite3_file *pJfd){
   MemJournal *p = (MemJournal *)pJfd;
+  assert( EIGHT_BYTE_ALIGNMENT(p) );
   memset(p, 0, sqlite3MemJournalSize());
   p->pMethod = &MemJournalMethods;
 }
Index: sqlite/src/pager.c
diff -u sqlite/src/pager.c:1.577 sqlite/src/pager.c:1.578
--- sqlite/src/pager.c:1.577	Sat Apr  4 15:53:48 2009
+++ sqlite/src/pager.c	Sun Apr  5 12:22:09 2009
@@ -3114,9 +3114,9 @@
   ** source file journal.c).
   */
   if( sqlite3JournalSize(pVfs)>sqlite3MemJournalSize() ){
-    journalFileSize = sqlite3JournalSize(pVfs);
+    journalFileSize = ROUND8(sqlite3JournalSize(pVfs));
   }else{
-    journalFileSize = sqlite3MemJournalSize();
+    journalFileSize = ROUND8(sqlite3MemJournalSize());
   }
 
   /* Set the output variable to NULL in case an error occurs. */
@@ -3172,23 +3172,25 @@
   **     Journal file name               (nPathname+8+1 bytes)
   */
   pPtr = (u8 *)sqlite3MallocZero(
-    sizeof(*pPager) +           /* Pager structure */
-    pcacheSize      +           /* PCache object */
-    pVfs->szOsFile  +           /* The main db file */
-    journalFileSize * 2 +       /* The two journal files */ 
-    nPathname + 1 +             /* zFilename */
-    nPathname + 8 + 1           /* zJournal */
+    ROUND8(sizeof(*pPager)) +      /* Pager structure */
+    ROUND8(pcacheSize) +           /* PCache object */
+    ROUND8(pVfs->szOsFile) +       /* The main db file */
+    journalFileSize * 2 +          /* The two journal files */ 
+    nPathname + 1 +                /* zFilename */
+    nPathname + 8 + 1              /* zJournal */
   );
+  assert( EIGHT_BYTE_ALIGNMENT(journalFileSize) );
   if( !pPtr ){
     sqlite3_free(zPathname);
     return SQLITE_NOMEM;
   }
   pPager =              (Pager*)(pPtr);
-  pPager->pPCache =    (PCache*)(pPtr += sizeof(*pPager));
-  pPager->fd =   (sqlite3_file*)(pPtr += pcacheSize);
-  pPager->sjfd = (sqlite3_file*)(pPtr += pVfs->szOsFile);
+  pPager->pPCache =    (PCache*)(pPtr += ROUND8(sizeof(*pPager)));
+  pPager->fd =   (sqlite3_file*)(pPtr += ROUND8(pcacheSize));
+  pPager->sjfd = (sqlite3_file*)(pPtr += ROUND8(pVfs->szOsFile));
   pPager->jfd =  (sqlite3_file*)(pPtr += journalFileSize);
   pPager->zFilename =    (char*)(pPtr += journalFileSize);
+  assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) );
 
   /* Fill in the Pager.zFilename and Pager.zJournal buffers, if required. */
   if( zPathname ){
Index: sqlite/src/sqliteInt.h
diff -u sqlite/src/sqliteInt.h:1.850 sqlite/src/sqliteInt.h:1.851
--- sqlite/src/sqliteInt.h:1.850	Wed Apr  1 18:03:01 2009
+++ sqlite/src/sqliteInt.h	Sun Apr  5 12:22:09 2009
@@ -456,6 +456,11 @@
 #define ROUNDDOWN8(x) ((x)&~7)
 
 /*
+** Assert that the pointer X is aligned to an 8-byte boundary.
+*/
+#define EIGHT_BYTE_ALIGNMENT(X)   ((((char*)(X) - (char*)0)&7)==0)
+
+/*
 ** An instance of the following structure is used to store the busy-handler
 ** callback for a given sqlite handle. 
 **
Index: sqlite/src/vdbeaux.c
diff -u sqlite/src/vdbeaux.c:1.446 sqlite/src/vdbeaux.c:1.447
--- sqlite/src/vdbeaux.c:1.446	Wed Mar 25 15:43:09 2009
+++ sqlite/src/vdbeaux.c	Sun Apr  5 12:22:09 2009
@@ -1023,6 +1023,7 @@
   u8 *pEnd,            /* Pointer to 1 byte past the end of *ppFrom buffer */
   int *pnByte          /* If allocation cannot be made, increment *pnByte */
 ){
+  assert( EIGHT_BYTE_ALIGNMENT(*ppFrom) );
   if( (*(void**)pp)==0 ){
     nByte = ROUND8(nByte);
     if( (pEnd - *ppFrom)>=nByte ){
@@ -1096,6 +1097,8 @@
     if( isExplain && nMem<10 ){
       nMem = 10;
     }
+    zCsr += (zCsr - (u8*)0)&7;
+    assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
 
     do {
       memset(zCsr, 0, zEnd-zCsr);
Index: sqlite/src/vdbemem.c
diff -u sqlite/src/vdbemem.c:1.139 sqlite/src/vdbemem.c:1.140
--- sqlite/src/vdbemem.c:1.139	Sun Mar 29 15:12:10 2009
+++ sqlite/src/vdbemem.c	Sun Apr  5 12:22:09 2009
@@ -209,6 +209,7 @@
   assert( !(fg&(MEM_Str|MEM_Blob)) );
   assert( fg&(MEM_Int|MEM_Real) );
   assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
 
   if( sqlite3VdbeMemGrow(pMem, nByte, 0) ){
@@ -345,6 +346,7 @@
 i64 sqlite3VdbeIntValue(Mem *pMem){
   int flags;
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
   flags = pMem->flags;
   if( flags & MEM_Int ){
     return pMem->u.i;
@@ -373,6 +375,7 @@
 */
 double sqlite3VdbeRealValue(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
   if( pMem->flags & MEM_Real ){
     return pMem->r;
   }else if( pMem->flags & MEM_Int ){
@@ -403,6 +406,7 @@
   assert( pMem->flags & MEM_Real );
   assert( (pMem->flags & MEM_RowSet)==0 );
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
   pMem->u.i = doubleToInt64(pMem->r);
   if( pMem->r==(double)pMem->u.i ){
@@ -416,6 +420,8 @@
 int sqlite3VdbeMemIntegerify(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
   assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+
   pMem->u.i = sqlite3VdbeIntValue(pMem);
   MemSetTypeFlag(pMem, MEM_Int);
   return SQLITE_OK;
@@ -427,6 +433,8 @@
 */
 int sqlite3VdbeMemRealify(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+  assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+
   pMem->r = sqlite3VdbeRealValue(pMem);
   MemSetTypeFlag(pMem, MEM_Real);
   return SQLITE_OK;
diff -u sqlite/src/vdbeaux.c:1.447 sqlite/src/vdbeaux.c:1.448
--- sqlite/src/vdbeaux.c:1.447	Sun Apr  5 12:22:09 2009
+++ sqlite/src/vdbeaux.c	Mon Apr  6 11:11:43 2009
@@ -1099,6 +1099,7 @@
     }
     zCsr += (zCsr - (u8*)0)&7;
     assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
+    if( zEnd<zCsr ) zEnd = zCsr;
 
     do {
       memset(zCsr, 0, zEnd-zCsr);

sqlite-3.6.12-no-sqlite-doc.patch:

--- NEW FILE sqlite-3.6.12-no-sqlite-doc.patch ---
diff -up sqlite-3.6.12/sqlite3.1.no-sqlite-doc sqlite-3.6.12/sqlite3.1
--- sqlite-3.6.12/sqlite3.1.no-sqlite-doc	2009-04-03 12:37:35.000000000 +0300
+++ sqlite-3.6.12/sqlite3.1	2009-04-03 12:37:44.000000000 +0300
@@ -221,8 +221,6 @@ o All other command line options are pro
 
 .SH SEE ALSO
 http://www.sqlite.org/
-.br
-The sqlite-doc package
 .SH AUTHOR
 This manual page was originally written by Andreas Rottmann
 <rotty at debian.org>, for the Debian GNU/Linux system (but may be used


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2008 11:15:27 -0000	1.2
+++ .cvsignore	23 Apr 2009 11:39:18 -0000	1.3
@@ -1 +1,2 @@
 sqlite-3.6.6.2.tar.gz
+sqlite-3.6.12.tar.gz


Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-sqlite.spec	26 Feb 2009 01:26:08 -0000	1.3
+++ mingw32-sqlite.spec	23 Apr 2009 11:39:18 -0000	1.4
@@ -5,8 +5,8 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-sqlite
-Version:        3.6.6.2
-Release:        3%{?dist}
+Version:        3.6.12
+Release:        1%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
 License:        Public Domain
@@ -18,11 +18,14 @@
 BuildArch:      noarch
 
 # Patches from Fedora native package.
-Patch1:         sqlite-3.6.6.2-libdl.patch
+Patch1:         sqlite-3.6.12-libdl.patch
+# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian 
 Patch2:         sqlite-3.6.6.2-lemon-snprintf.patch
+Patch3:         sqlite-3.6.12-no-sqlite-doc.patch
+Patch4:         sqlite-3.6.12-memalign.patch
 
 # Patches for MinGW port.
-Patch1000:      mingw32-sqlite-3.6.6.2-no-undefined.patch
+Patch1000:      mingw32-sqlite-3.6.12-no-undefined.patch
 
 BuildRequires:  mingw32-filesystem >= 49
 BuildRequires:  mingw32-gcc
@@ -55,6 +58,8 @@
 %setup -q -n sqlite-%{version}
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
+%patch3 -p1 -b .no-sqlite-doc
+%patch4 -p1 -b .align
 %patch1000 -p1
 
 # Ships with an old/broken version of libtool which cannot create
@@ -72,6 +77,8 @@
 # the extension via this export.
 #   - RWMJ 2008-09-30
 export config_TARGET_EXEEXT=.exe
+# add compile flags to enable rtree, fts3
+export MINGW32_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
 
 %{_mingw32_configure}
 make
@@ -104,6 +111,10 @@
 
 
 %changelog
+* Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ee.ethz.ch> - 3.6.12-1
+- update to 3.6.12 to match native
+- enable rtree, fts3
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2008 11:15:27 -0000	1.2
+++ sources	23 Apr 2009 11:39:18 -0000	1.3
@@ -1 +1 @@
-23cd36188f21d427d45191d317bcbcd5  sqlite-3.6.6.2.tar.gz
+13600865a69a3f54d2ac42a0d6b743db  sqlite-3.6.12.tar.gz


--- mingw32-sqlite-3.6.6.2-no-undefined.patch DELETED ---


--- sqlite-3.6.6.2-libdl.patch DELETED ---



From than at fedoraproject.org  Thu Apr 23 11:44:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 23 Apr 2009 11:44:08 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.53, 1.54 qt.spec, 1.261, 1.262 sources, 
	1.54, 1.55 qt-x11-opensource-src-4.5.0-linguist-crash.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-lrelease.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.3,
	NONE qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, 1.1, NONE
Message-ID: <20090423114408.E228870104@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28472

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.5.0-linguist-crash.patch 
	qt-x11-opensource-src-4.5.0-lrelease.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
	qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch 
Log Message:
4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	25 Mar 2009 18:34:14 -0000	1.53
+++ .cvsignore	23 Apr 2009 11:43:37 -0000	1.54
@@ -2,3 +2,5 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.5.0.tar.bz2
 qt-copy-patches-20090325svn.tar.bz2
+qt-copy-patches-20090423svn.tar.bz2
+qt-x11-opensource-src-4.5.1.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- qt.spec	14 Apr 2009 19:40:59 -0000	1.261
+++ qt.spec	23 Apr 2009 11:43:37 -0000	1.262
@@ -11,8 +11,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.5.0
-Release: 14%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -37,9 +37,6 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
-Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
-Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
@@ -49,7 +46,6 @@
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -58,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090325
+%define qt_copy 20090423
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -312,6 +308,10 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
+echo "0245" >> patches/DISABLED
+echo "0275" >> patches/DISABLED
+echo "0276" >> patches/DISABLED
+echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -322,13 +322,9 @@
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch10 -p1 -b .ppc64
-%patch11 -p1 -b .linguist-crash
-%patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .disable_ft_lcdfilter
-%patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -376,6 +372,7 @@
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
+  -opensource \
   -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
@@ -812,6 +809,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
+- 4.5.1
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
 - fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	25 Mar 2009 18:34:14 -0000	1.54
+++ sources	23 Apr 2009 11:43:38 -0000	1.55
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-55e8c74a89e1bc128a5a6f1ff6b8b5ba  qt-x11-opensource-src-4.5.0.tar.bz2
-74cac34a16b483ddc0a90204a0af8314  qt-copy-patches-20090325svn.tar.bz2
+e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
+afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2


--- qt-x11-opensource-src-4.5.0-linguist-crash.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-lrelease.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch DELETED ---



From tsmetana at fedoraproject.org  Thu Apr 23 11:46:10 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu, 23 Apr 2009 11:46:10 +0000 (UTC)
Subject: rpms/gocr/devel gocr-0.46-perms.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 gocr.spec, 1.10, 1.11 sources, 1.2,
	1.3 gocr-0.45-perms.patch, 1.1, NONE
Message-ID: <20090423114610.C12B670104@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gocr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2448

Modified Files:
	.cvsignore gocr.spec sources 
Added Files:
	gocr-0.46-perms.patch 
Removed Files:
	gocr-0.45-perms.patch 
Log Message:
* Thu Apr 23 2009 Tomas Smetana <tsmetana at redhat.com> - 0.46-1
- new upstream release


gocr-0.46-perms.patch:

--- NEW FILE gocr-0.46-perms.patch ---
diff -up gocr-0.45/man/Makefile.in.perms gocr-0.45/man/Makefile.in
--- gocr-0.45/man/Makefile.in.perms	2005-05-18 10:49:11.000000000 +0200
+++ gocr-0.45/man/Makefile.in	2008-01-28 02:04:04.000000000 +0100
@@ -17,7 +17,7 @@ all:
 .PHONY : clean proper install uninstall
 install: all
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
-	$(INSTALL) ../man/man1/$(PROGRAM).1 $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 0644 ../man/man1/$(PROGRAM).1 $(DESTDIR)$(mandir)/man1
 
 uninstall:
 	-rm -f $(DESTDIR)$(mandir)/man1/$(PROGRAM).1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gocr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2008 01:23:04 -0000	1.1
+++ .cvsignore	23 Apr 2009 11:45:39 -0000	1.2
@@ -1 +1 @@
-gocr-0.45.tar.gz
+gocr-0.46.tar.gz


Index: gocr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gocr/devel/gocr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gocr.spec	25 Feb 2009 00:15:37 -0000	1.10
+++ gocr.spec	23 Apr 2009 11:45:40 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           gocr
-Version:        0.45
-Release:        5%{?dist}
+Version:        0.46
+Release:        1%{?dist}
 Summary:        GNU Optical Character Recognition program
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://jocr.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/jocr/gocr-%{version}.tar.gz
-Patch0:         gocr-0.45-perms.patch
+Patch0:         gocr-0.46-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netpbm-devel
@@ -54,6 +54,9 @@
 %{_mandir}/man1/gocr.1*
 
 %changelog
+* Thu Apr 23 2009 Tomas Smetana <tsmetana at redhat.com> - 0.46-1
+- new upstream release
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.45-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gocr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2008 01:23:04 -0000	1.2
+++ sources	23 Apr 2009 11:45:40 -0000	1.3
@@ -1 +1 @@
-134d459f64656b201ca66eebafa108f0  gocr-0.45.tar.gz
+95a1c820d0320129ce2bedbf9e68037d  gocr-0.46.tar.gz


--- gocr-0.45-perms.patch DELETED ---



From tagoh at fedoraproject.org  Thu Apr 23 11:58:30 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 11:58:30 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.238, 1.239 comps-f11.xml.in, 1.194,
	1.195 comps-f9.xml.in, 1.448, 1.449
Message-ID: <20090423115830.C82B070104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1401

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
Add IPA Fonts


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- comps-f10.xml.in	13 Apr 2009 10:39:39 -0000	1.238
+++ comps-f10.xml.in	23 Apr 2009 11:57:58 -0000	1.239
@@ -1469,6 +1469,10 @@
       <packagereq type="optional">hanazono-fonts</packagereq>
       <packagereq type="optional">icelandic-fonts</packagereq>
       <packagereq type="optional">inconsolata-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">khmeros-fonts-battambang</packagereq>
       <packagereq type="optional">khmeros-fonts-bokor</packagereq>
       <packagereq type="optional">khmeros-fonts-handwritten</packagereq>
@@ -2727,6 +2731,10 @@
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
       <packagereq type="optional">ibus-anthy</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">kcc</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- comps-f11.xml.in	21 Apr 2009 22:10:58 -0000	1.194
+++ comps-f11.xml.in	23 Apr 2009 11:57:58 -0000	1.195
@@ -1642,6 +1642,10 @@
       <packagereq type="optional">hartke-aurulent-sans-fonts</packagereq>
       <packagereq type="optional">hartke-aurulent-sans-mono-fonts</packagereq>
       <packagereq type="optional">icelandic-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">levien-inconsolata-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
       <packagereq type="optional">khmeros-bokor-fonts</packagereq>
@@ -2957,6 +2961,10 @@
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">kcc</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- comps-f9.xml.in	13 Apr 2009 10:39:40 -0000	1.448
+++ comps-f9.xml.in	23 Apr 2009 11:57:58 -0000	1.449
@@ -1400,6 +1400,10 @@
       <packagereq type="optional">gfs-theokritos-fonts</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
       <packagereq type="optional">inconsolata-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">khmeros-fonts-base</packagereq>
       <packagereq type="optional">khmeros-fonts-battambang</packagereq>
       <packagereq type="optional">khmeros-fonts-bokor</packagereq>
@@ -2436,6 +2440,10 @@
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">kcc</packagereq>



From zprikryl at fedoraproject.org  Thu Apr 23 12:01:42 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 23 Apr 2009 12:01:42 +0000 (UTC)
Subject: rpms/acpid/devel .cvsignore, 1.8, 1.9 acpid.spec, 1.34, 1.35 sources,
	1.8, 1.9
Message-ID: <20090423120143.0A21D70104@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/acpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1957

Modified Files:
	.cvsignore acpid.spec sources 
Log Message:
Updated to version 1.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Nov 2008 14:36:30 -0000	1.8
+++ .cvsignore	23 Apr 2009 12:01:11 -0000	1.9
@@ -1 +1 @@
-acpid-1.0.8.tar.gz
+acpid-1.0.10.tar.gz


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- acpid.spec	24 Feb 2009 00:04:27 -0000	1.34
+++ acpid.spec	23 Apr 2009 12:01:11 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
-Version: 1.0.8
-Release: 3%{?dist}
+Version: 1.0.10
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -81,6 +81,9 @@
 fi
 
 %changelog
+* Thu Apr 23 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.10-1
+- Updated to version 1.0.10
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Nov 2008 14:36:30 -0000	1.8
+++ sources	23 Apr 2009 12:01:11 -0000	1.9
@@ -1 +1 @@
-1d9c52fe2c0b51f8463f357c2a3d3ddb  acpid-1.0.8.tar.gz
+61156ef32015c56dc0f2e3317f4ae09e  acpid-1.0.10.tar.gz



From than at fedoraproject.org  Thu Apr 23 12:18:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 23 Apr 2009 12:18:39 +0000 (UTC)
Subject: rpms/qt/F-11 qt.spec, 1.261, 1.262 sources, 1.54,
	1.55 qt-x11-opensource-src-4.5.0-linguist-crash.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-lrelease.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.3,
	NONE qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, 1.1, NONE
Message-ID: <20090423121839.386EE70104@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5345

Modified Files:
	qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.5.0-linguist-crash.patch 
	qt-x11-opensource-src-4.5.0-lrelease.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
	qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch 
Log Message:
4.5.1



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- qt.spec	14 Apr 2009 19:40:59 -0000	1.261
+++ qt.spec	23 Apr 2009 12:18:08 -0000	1.262
@@ -11,8 +11,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.5.0
-Release: 14%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -37,9 +37,6 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
-Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
-Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
@@ -49,7 +46,6 @@
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -58,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090325
+%define qt_copy 20090423
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -312,6 +308,10 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
+echo "0245" >> patches/DISABLED
+echo "0275" >> patches/DISABLED
+echo "0276" >> patches/DISABLED
+echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -322,13 +322,9 @@
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch10 -p1 -b .ppc64
-%patch11 -p1 -b .linguist-crash
-%patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .disable_ft_lcdfilter
-%patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -376,6 +372,7 @@
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
+  -opensource \
   -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
@@ -812,6 +809,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
+- 4.5.1
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
 - fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	25 Mar 2009 18:34:14 -0000	1.54
+++ sources	23 Apr 2009 12:18:08 -0000	1.55
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-55e8c74a89e1bc128a5a6f1ff6b8b5ba  qt-x11-opensource-src-4.5.0.tar.bz2
-74cac34a16b483ddc0a90204a0af8314  qt-copy-patches-20090325svn.tar.bz2
+e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
+afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2


--- qt-x11-opensource-src-4.5.0-linguist-crash.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-lrelease.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch DELETED ---



From than at fedoraproject.org  Thu Apr 23 12:31:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 23 Apr 2009 12:31:14 +0000 (UTC)
Subject: rpms/qt/F-10 qt.spec, 1.224, 1.225 sources, 1.48,
	1.49 qt-x11-opensource-src-4.5.0-linguist-crash.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-lrelease.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, 1.1, NONE
Message-ID: <20090423123114.A182770104@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8521

Modified Files:
	qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.5.0-linguist-crash.patch 
	qt-x11-opensource-src-4.5.0-lrelease.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
	qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch 
Log Message:
4.5.1



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/qt.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- qt.spec	14 Apr 2009 20:25:14 -0000	1.224
+++ qt.spec	23 Apr 2009 12:30:43 -0000	1.225
@@ -11,8 +11,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.5.0
-Release: 14%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -37,9 +37,6 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
-Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
-Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
@@ -49,7 +46,6 @@
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -58,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090325
+%define qt_copy 20090423
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -312,6 +308,10 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
+echo "0245" >> patches/DISABLED
+echo "0275" >> patches/DISABLED
+echo "0276" >> patches/DISABLED
+echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -322,13 +322,9 @@
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch10 -p1 -b .ppc64
-%patch11 -p1 -b .linguist-crash
-%patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .disable_ft_lcdfilter
-%patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -376,6 +372,7 @@
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
+  -opensource \
   -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
@@ -812,6 +809,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
+- 4.5.1
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
 - fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	25 Mar 2009 18:42:33 -0000	1.48
+++ sources	23 Apr 2009 12:30:43 -0000	1.49
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-55e8c74a89e1bc128a5a6f1ff6b8b5ba  qt-x11-opensource-src-4.5.0.tar.bz2
-74cac34a16b483ddc0a90204a0af8314  qt-copy-patches-20090325svn.tar.bz2
+e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
+afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2


--- qt-x11-opensource-src-4.5.0-linguist-crash.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-lrelease.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch DELETED ---



From rhughes at fedoraproject.org  Thu Apr 23 12:43:21 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 23 Apr 2009 12:43:21 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-11
	gnome-power-manager-2.26.1-backport-gpp-correctly.patch, NONE,
	1.1 gnome-power-manager.spec, 1.155, 1.156
Message-ID: <20090423124321.BC2C370104@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10340

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.1-backport-gpp-correctly.patch 
Log Message:
* Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-2
- Backport a patch from upstream that was missed for 2.26.1 that fixes
  the DPMS timeout slider in gnome-power-preferences.


gnome-power-manager-2.26.1-backport-gpp-correctly.patch:

--- NEW FILE gnome-power-manager-2.26.1-backport-gpp-correctly.patch ---
commit 1a170f276931360ff6255df667fb5e53678f4913
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Apr 23 13:35:28 2009 +0100

    Backport the gnome-power-preferences prefix patch from master. I must have missed this before

diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
index 7c12eff..98ffadf 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
@@ -300,8 +300,10 @@ gpm_prefs_sleep_slider_changed_cb (GtkRange *range,
 {
 	int value;
 	char *gpm_pref_key;
+	gboolean sleep_prefix;
 
 	value = (int) gtk_range_get_value (range);
+	sleep_prefix = (gboolean) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (range), "sleep-prefix"));
 
 	if (value == NEVER_TIME_ON_SLIDER) {
 		/* power manager interprets 0 as Never */
@@ -310,7 +312,8 @@ gpm_prefs_sleep_slider_changed_cb (GtkRange *range,
 		/* We take away the g-s idle time as the slider represents
 		 * global time but we only do our timeout from when gnome-session
 		 * declares the session idle */
-		value -= prefs->priv->idle_delay;
+		if (sleep_prefix)
+			value -= prefs->priv->idle_delay;
 
 		/* policy is in seconds, slider is in minutes */
 		value *= 60;
@@ -328,7 +331,7 @@ gpm_prefs_sleep_slider_changed_cb (GtkRange *range,
  * @gpm_pref_key: The GConf key for this preference setting.
  **/
 static GtkWidget *
-gpm_prefs_setup_sleep_slider (GpmPrefs *prefs, const gchar *widget_name, const gchar *gpm_pref_key)
+gpm_prefs_setup_sleep_slider (GpmPrefs *prefs, const gchar *widget_name, const gchar *gpm_pref_key, gboolean sleep_prefix)
 {
 	GtkWidget *widget;
 	gint value;
@@ -349,9 +352,12 @@ gpm_prefs_setup_sleep_slider (GpmPrefs *prefs, const gchar *widget_name, const g
 	} else {
 		/* policy is in seconds, slider is in minutes */
 		value /= 60;
-		value += prefs->priv->idle_delay;
+		if (sleep_prefix)
+			value += prefs->priv->idle_delay;
 	}
 
+	g_object_set_data (G_OBJECT (widget), "sleep-prefix", GUINT_TO_POINTER (sleep_prefix));
+
 	/* set upper */
 	adjustment = gtk_range_get_adjustment (GTK_RANGE (widget));
 	gtk_adjustment_set_upper (adjustment, NEVER_TIME_ON_SLIDER);
@@ -785,9 +791,9 @@ prefs_setup_ac (GpmPrefs *prefs)
 				      GPM_CONF_BUTTON_LID_AC,
 				      button_lid_actions);
 	gpm_prefs_setup_sleep_slider (prefs, "hscale_ac_computer",
-				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_AC);
+				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_AC, TRUE);
 	gpm_prefs_setup_sleep_slider (prefs, "hscale_ac_display",
-				      GPM_CONF_TIMEOUT_SLEEP_DISPLAY_AC);
+				      GPM_CONF_TIMEOUT_SLEEP_DISPLAY_AC, FALSE);
 	gpm_prefs_setup_brightness_slider (prefs, "hscale_ac_brightness",
 					   GPM_CONF_BACKLIGHT_BRIGHTNESS_AC);
 
@@ -795,7 +801,6 @@ prefs_setup_ac (GpmPrefs *prefs)
 				  GPM_CONF_BACKLIGHT_IDLE_DIM_AC);
 
 	set_idle_hscale_stops (prefs, "hscale_ac_computer", prefs->priv->idle_delay);
-	set_idle_hscale_stops (prefs, "hscale_ac_display", prefs->priv->idle_delay);
 
 	if (prefs->priv->has_button_lid == FALSE) {
 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_ac_lid");
@@ -845,9 +850,9 @@ prefs_setup_battery (GpmPrefs *prefs)
 				      GPM_CONF_ACTIONS_CRITICAL_BATT,
 				      battery_critical_actions);
 	gpm_prefs_setup_sleep_slider (prefs, "hscale_battery_computer",
-				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT);
+				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT, TRUE);
 	gpm_prefs_setup_sleep_slider (prefs, "hscale_battery_display",
-				      GPM_CONF_TIMEOUT_SLEEP_DISPLAY_BATT);
+				      GPM_CONF_TIMEOUT_SLEEP_DISPLAY_BATT, FALSE);
 
 	/* set up the battery reduce checkbox */
 	gpm_prefs_setup_checkbox (prefs, "checkbutton_battery_display_reduce",
@@ -862,7 +867,6 @@ prefs_setup_battery (GpmPrefs *prefs)
 	}
 
 	set_idle_hscale_stops (prefs, "hscale_battery_computer", prefs->priv->idle_delay);
-	set_idle_hscale_stops (prefs, "hscale_battery_display", prefs->priv->idle_delay);
 
 	if (prefs->priv->has_button_lid == FALSE) {
 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_battery_lid");
@@ -902,7 +906,7 @@ prefs_setup_ups (GpmPrefs *prefs)
 				      GPM_CONF_ACTIONS_CRITICAL_UPS,
 				      ups_low_actions);
 	gpm_prefs_setup_sleep_slider (prefs, "hscale_ups_computer",
-				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT);
+				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT, TRUE);
 	set_idle_hscale_stops (prefs, "hscale_ups_computer", prefs->priv->idle_delay);
 }
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-power-manager.spec	21 Apr 2009 11:42:36 -0000	1.155
+++ gnome-power-manager.spec	23 Apr 2009 12:42:51 -0000	1.156
@@ -4,10 +4,14 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
+
+# Already upstream: 1a170f276931360ff6255df667fb5e53678f4913
+Patch0:    gnome-power-manager-2.26.1-backport-gpp-correctly.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -55,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .backport-gpp
 
 %build
 %configure \
@@ -162,6 +167,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-2
+- Backport a patch from upstream that was missed for 2.26.1 that fixes
+  the DPMS timeout slider in gnome-power-preferences.
+
 * Tue Apr 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - Fix the low capacity warning to fix rh#489832



From hadess at fedoraproject.org  Thu Apr 23 12:54:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 12:54:51 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.31, 1.32 bluez.spec, 1.59,
	1.60 sources, 1.31, 1.32
Message-ID: <20090423125451.A373170104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13010

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 4.37-1
- Update to 4.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	17 Apr 2009 00:39:28 -0000	1.31
+++ .cvsignore	23 Apr 2009 12:54:21 -0000	1.32
@@ -1 +1 @@
-bluez-4.36.tar.gz
+bluez-4.37.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- bluez.spec	17 Apr 2009 00:39:28 -0000	1.59
+++ bluez.spec	23 Apr 2009 12:54:21 -0000	1.60
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.36
+Version: 4.37
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -195,6 +195,9 @@
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 4.37-1
+- Update to 4.37
+
 * Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1
 - Update to 4.36
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	17 Apr 2009 00:39:28 -0000	1.31
+++ sources	23 Apr 2009 12:54:21 -0000	1.32
@@ -1 +1 @@
-657de0cce8a6f36479b0f128c8008a96  bluez-4.36.tar.gz
+c1106f56f8e5562cf7c49d3455d2c5f7  bluez-4.37.tar.gz



From rdieter at fedoraproject.org  Thu Apr 23 12:54:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 23 Apr 2009 12:54:56 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.195,1.196
Message-ID: <20090423125456.0221E70104@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13035

Modified Files:
	comps-f11.xml.in 
Log Message:
add kdebase-workspace subpkgs



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- comps-f11.xml.in	23 Apr 2009 11:57:58 -0000	1.195
+++ comps-f11.xml.in	23 Apr 2009 12:54:25 -0000	1.196
@@ -3247,6 +3247,9 @@
       <packagereq type="optional">kdeartwork</packagereq>
       <packagereq type="optional">kdeartwork-sounds</packagereq>
       <packagereq type="optional">kdeartwork-wallpapers</packagereq>
+      <packagereq type="optional">kdebase-workspace-googlegadgets</packagereq>
+      <packagereq type="optional">kdebase-workspace-python-applet</packagereq>
+      <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>



From tagoh at fedoraproject.org  Thu Apr 23 13:00:58 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 13:00:58 +0000 (UTC)
Subject: rpms/vlgothic-fonts/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vlgothic-fonts.spec, 1.3, 1.4
Message-ID: <20090423130058.96C7370104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/vlgothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14291

Modified Files:
	.cvsignore sources vlgothic-fonts.spec 
Log Message:
* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2009 11:48:21 -0000	1.2
+++ .cvsignore	23 Apr 2009 13:00:27 -0000	1.3
@@ -1 +1,2 @@
 VLGothic-20090204.tar.bz2
+VLGothic-20090422.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2009 11:48:21 -0000	1.2
+++ sources	23 Apr 2009 13:00:27 -0000	1.3
@@ -1 +1 @@
-54298db27daf7b3ec92aff5cfab72f02  VLGothic-20090204.tar.bz2
+dcc9a788a47554344a47926211208473  VLGothic-20090422.tar.bz2


Index: vlgothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/vlgothic-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vlgothic-fonts.spec	26 Feb 2009 00:39:55 -0000	1.3
+++ vlgothic-fonts.spec	23 Apr 2009 13:00:27 -0000	1.4
@@ -8,14 +8,14 @@
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
-Version:	20090204
-Release:	3%{?dist}
+Version:	20090422
+Release:	1%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
-Source0:	http://vinelinux.org/~daisuke/vlgothic/%{archivename}.tar.bz2
+Source0:	http://osdn.dl.sourceforge.jp/vlgothic/38942/%{archivename}.tar.bz2
 Source1:	%{fontname}-fontconfig-pgothic.conf
 Source2:	%{fontname}-fontconfig-gothic.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
+- New upstream release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090204-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hadess at fedoraproject.org  Thu Apr 23 13:02:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 13:02:17 +0000 (UTC)
Subject: rpms/bluez/F-11 .cvsignore, 1.31, 1.32 bluez.spec, 1.60,
	1.61 sources, 1.31, 1.32
Message-ID: <20090423130217.B5C5270104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14687

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 4.37-1
- Update to 4.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	17 Apr 2009 00:33:21 -0000	1.31
+++ .cvsignore	23 Apr 2009 13:01:47 -0000	1.32
@@ -1 +1 @@
-bluez-4.36.tar.gz
+bluez-4.37.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- bluez.spec	17 Apr 2009 00:37:11 -0000	1.60
+++ bluez.spec	23 Apr 2009 13:01:47 -0000	1.61
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.36
+Version: 4.37
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -195,6 +195,9 @@
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 4.37-1
+- Update to 4.37
+
 * Fri Apr 17 2009 - Bastien Nocera <bnocera at redhat.com> - 4.36-1
 - Update to 4.36
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	17 Apr 2009 00:33:21 -0000	1.31
+++ sources	23 Apr 2009 13:01:47 -0000	1.32
@@ -1 +1 @@
-657de0cce8a6f36479b0f128c8008a96  bluez-4.36.tar.gz
+c1106f56f8e5562cf7c49d3455d2c5f7  bluez-4.37.tar.gz



From tagoh at fedoraproject.org  Thu Apr 23 13:02:37 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 13:02:37 +0000 (UTC)
Subject: rpms/vlgothic-fonts/F-11 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vlgothic-fonts.spec, 1.3, 1.4
Message-ID: <20090423130237.118EB70104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/vlgothic-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14838

Modified Files:
	.cvsignore sources vlgothic-fonts.spec 
Log Message:
* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2009 11:48:21 -0000	1.2
+++ .cvsignore	23 Apr 2009 13:02:06 -0000	1.3
@@ -1 +1,2 @@
 VLGothic-20090204.tar.bz2
+VLGothic-20090422.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2009 11:48:21 -0000	1.2
+++ sources	23 Apr 2009 13:02:06 -0000	1.3
@@ -1 +1 @@
-54298db27daf7b3ec92aff5cfab72f02  VLGothic-20090204.tar.bz2
+dcc9a788a47554344a47926211208473  VLGothic-20090422.tar.bz2


Index: vlgothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-11/vlgothic-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vlgothic-fonts.spec	26 Feb 2009 00:39:55 -0000	1.3
+++ vlgothic-fonts.spec	23 Apr 2009 13:02:06 -0000	1.4
@@ -8,14 +8,14 @@
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
-Version:	20090204
-Release:	3%{?dist}
+Version:	20090422
+Release:	1%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
-Source0:	http://vinelinux.org/~daisuke/vlgothic/%{archivename}.tar.bz2
+Source0:	http://osdn.dl.sourceforge.jp/vlgothic/38942/%{archivename}.tar.bz2
 Source1:	%{fontname}-fontconfig-pgothic.conf
 Source2:	%{fontname}-fontconfig-gothic.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
+- New upstream release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090204-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From tagoh at fedoraproject.org  Thu Apr 23 13:09:34 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 13:09:34 +0000 (UTC)
Subject: rpms/vlgothic-fonts/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vlgothic-fonts.spec, 1.1, 1.2
Message-ID: <20090423130934.0E66270104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/vlgothic-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16294

Modified Files:
	.cvsignore sources vlgothic-fonts.spec 
Log Message:
* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2009 12:02:07 -0000	1.2
+++ .cvsignore	23 Apr 2009 13:09:03 -0000	1.3
@@ -1 +1,2 @@
 VLGothic-20090204.tar.bz2
+VLGothic-20090422.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2009 12:02:07 -0000	1.2
+++ sources	23 Apr 2009 13:09:03 -0000	1.3
@@ -1 +1 @@
-54298db27daf7b3ec92aff5cfab72f02  VLGothic-20090204.tar.bz2
+dcc9a788a47554344a47926211208473  VLGothic-20090422.tar.bz2


Index: vlgothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-10/vlgothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlgothic-fonts.spec	10 Feb 2009 12:02:07 -0000	1.1
+++ vlgothic-fonts.spec	23 Apr 2009 13:09:03 -0000	1.2
@@ -8,14 +8,14 @@
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
-Version:	20090204
-Release:	2%{?dist}
+Version:	20090422
+Release:	1%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
-Source0:	http://vinelinux.org/~daisuke/vlgothic/%{archivename}.tar.bz2
+Source0:	http://osdn.dl.sourceforge.jp/vlgothic/38942/%{archivename}.tar.bz2
 Source1:	%{fontname}-fontconfig-pgothic.conf
 Source2:	%{fontname}-fontconfig-gothic.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +93,12 @@
 
 
 %changelog
+* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
+- New upstream release.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090204-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 10 2009 Akira TAGOH <tagoh at redhat.com> - 20090204-2
 - clean up.
 



From dwalsh at fedoraproject.org  Thu Apr 23 13:19:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 23 Apr 2009 13:19:54 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.98,
	1.99 selinux-policy.spec, 1.833, 1.834
Message-ID: <20090423131954.D282A70104@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17994

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-13
- Allow sysadm_t to run rpm directly
- libvirt needs fowner


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- policy-20090105.patch	22 Apr 2009 19:17:13 -0000	1.98
+++ policy-20090105.patch	23 Apr 2009 13:19:23 -0000	1.99
@@ -5003,7 +5003,7 @@
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.12/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-03-05 14:09:51.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.fc	2009-04-23 08:12:34.000000000 -0400
 @@ -91,6 +91,7 @@
  /dev/sndstat		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sonypi		-c	gen_context(system_u:object_r:v4l_device_t,s0)
@@ -5014,7 +5014,7 @@
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-14 12:49:22.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-23 08:12:42.000000000 -0400
 @@ -188,6 +188,12 @@
  genfscon sysfs / gen_context(system_u:object_r:sysfs_t,s0)
  
@@ -6355,7 +6355,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-21 15:50:14.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-22 15:56:34.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6519,7 +6519,7 @@
  	quota_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,22 +258,10 @@
+@@ -320,19 +258,12 @@
  ')
  
  optional_policy(`
@@ -6531,18 +6531,16 @@
  ')
  
  optional_policy(`
--	rpm_run(sysadm_t, sysadm_r)
+ 	rpm_run(sysadm_t, sysadm_r)
 -')
 -
 -optional_policy(`
 -	rssh_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	rsync_exec(sysadm_t)
++	rpm_role_transition(sysadm_r)
  ')
  
-@@ -345,10 +271,6 @@
+ optional_policy(`
+@@ -345,10 +276,6 @@
  ')
  
  optional_policy(`
@@ -6553,7 +6551,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +280,15 @@
+@@ -358,35 +285,15 @@
  ')
  
  optional_policy(`
@@ -6589,7 +6587,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +296,10 @@
+@@ -394,18 +301,10 @@
  ')
  
  optional_policy(`
@@ -6608,7 +6606,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +312,12 @@
+@@ -418,20 +317,12 @@
  ')
  
  optional_policy(`
@@ -6629,7 +6627,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +326,5 @@
+@@ -440,13 +331,10 @@
  ')
  
  optional_policy(`
@@ -6643,6 +6641,11 @@
 -optional_policy(`
  	yam_run(sysadm_t, sysadm_r)
  ')
++
++domain_user_exemption_target(sysadm_t)
++allow sysadm_r system_r;
++init_script_role_transition(sysadm_r)
++role system_r types sysadm_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-15 10:01:33.000000000 -0400
@@ -9489,7 +9492,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.12/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/automount.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/automount.te	2009-04-23 08:19:25.000000000 -0400
 @@ -71,6 +71,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -23228,7 +23231,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-20 07:48:51.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-23 07:20:35.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23300,7 +23303,7 @@
  
 -allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
 -allow virtd_t self:process { getsched sigkill signal execmem };
-+allow virtd_t self:capability { chown dac_override ipc_lock kill mknod net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace };
++allow virtd_t self:capability { chown dac_override fowner ipc_lock kill mknod net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace };
 +allow virtd_t self:process { getsched sigkill signal signull execmem setexec setfscreate setsched };
  allow virtd_t self:fifo_file rw_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- selinux-policy.spec	22 Apr 2009 19:17:15 -0000	1.833
+++ selinux-policy.spec	23 Apr 2009 13:19:24 -0000	1.834
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,10 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-13
+- Allow sysadm_t to run rpm directly
+- libvirt needs fowner
+
 * Wed Apr 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-12
 - Allow sshd to read var_lib symlinks for freenx
 



From tmraz at fedoraproject.org  Thu Apr 23 13:30:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 23 Apr 2009 13:30:14 +0000 (UTC)
Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.2-natt-linux.patch, NONE,
	1.1 ipsec-tools-0.7.1-dpd-fixes.patch, 1.2, 1.3 ipsec-tools.spec,
	1.63, 1.64 ipsec-tools-0.7.1-leaks.patch, 1.1,
	NONE ipsec-tools-0.7.1-natt-linux.patch, 1.1, NONE
Message-ID: <20090423133014.3609C70104@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20446

Modified Files:
	ipsec-tools-0.7.1-dpd-fixes.patch ipsec-tools.spec 
Added Files:
	ipsec-tools-0.7.2-natt-linux.patch 
Removed Files:
	ipsec-tools-0.7.1-leaks.patch 
	ipsec-tools-0.7.1-natt-linux.patch 
Log Message:
* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.2-1
- Update to a new upstream version


ipsec-tools-0.7.2-natt-linux.patch:

--- NEW FILE ipsec-tools-0.7.2-natt-linux.patch ---
diff -up ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux ipsec-tools-0.7.2/src/racoon/isakmp_inf.c
--- ipsec-tools-0.7.2/src/racoon/isakmp_inf.c.natt-linux	2009-04-20 15:35:36.000000000 +0200
+++ ipsec-tools-0.7.2/src/racoon/isakmp_inf.c	2009-04-23 14:46:55.000000000 +0200
@@ -1144,7 +1144,6 @@ purge_ipsec_spi(dst0, proto, spi, n)
 	caddr_t mhp[SADB_EXT_MAX + 1];
 #ifdef ENABLE_NATT
 	struct sadb_x_nat_t_type *natt_type;
-	struct sadb_x_nat_t_port *natt_port;
 #endif
 
 	plog(LLV_DEBUG2, LOCATION, NULL,
@@ -1200,17 +1199,8 @@ purge_ipsec_spi(dst0, proto, spi, n)
 		}
 #ifdef ENABLE_NATT
 		natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE];
-		if (natt_type && natt_type->sadb_x_nat_t_type_type) {
-			/* NAT-T is enabled for this SADB entry; copy
-			 * the ports from NAT-T extensions */
-			natt_port = (void *)mhp[SADB_X_EXT_NAT_T_SPORT];
-			if (extract_port(src) == 0 && natt_port != NULL)
-				set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port));
-
-			natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT];
-			if (extract_port(dst) == 0 && natt_port != NULL)
-				set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port));
-		}else{
+		if (natt_type == NULL ||
+			! natt_type->sadb_x_nat_t_type_type) {
 			/* Force default UDP ports, so CMPSADDR will match SAs with NO encapsulation
 			 */
 			set_port(src, PORT_ISAKMP);
diff -up ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux ipsec-tools-0.7.2/src/racoon/pfkey.c
--- ipsec-tools-0.7.2/src/racoon/pfkey.c.natt-linux	2009-04-23 14:40:08.000000000 +0200
+++ ipsec-tools-0.7.2/src/racoon/pfkey.c	2009-04-23 14:40:08.000000000 +0200
@@ -290,6 +290,13 @@ pfkey_dump_sadb(satype)
 	struct sadb_msg *msg = NULL;
 	size_t bl, ml;
 	int len;
+#if defined(__linux__) && defined(ENABLE_NATT)
+	caddr_t mhp[SADB_EXT_MAX + 1];
+	struct sadb_sa *sa;
+	struct sockaddr *src, *dst;
+	struct sadb_x_nat_t_type *natt_type;
+	struct sadb_x_nat_t_port *natt_port;
+#endif
 
 	if ((s = privsep_pfkey_open()) < 0) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -325,6 +332,45 @@ pfkey_dump_sadb(satype)
 		    continue;
 		}
 		
+#if defined(__linux__) && defined(ENABLE_NATT)
+		/*
+		 * NetBSD returns the NAT-T ports in the src and dst sockaddrs
+		 * in addition to the SADB_X_EXT_NAT_T_*PORT structs.
+		 *
+		 * Linux only returns them in the SADB_X_EXT_NAT_T_*PORT
+		 * structs. The racoon codebase is making the assumption that
+		 * the NAT-T ports are reflected by the ports in the src and
+		 * dst sockaddrs. We stick that information into those structs
+		 * here to meet the assumptions elsewhere.
+		 */
+		if (pfkey_align(msg, mhp) || pfkey_check(mhp)) {
+		    plog(LLV_ERROR, LOCATION, NULL,
+			"pfkey_check (%s)\n", ipsec_strerror());
+		    goto no_fixup;
+		}
+
+		sa = (struct sadb_sa *)(mhp[SADB_EXT_SA]);
+		if (!sa || !mhp[SADB_EXT_ADDRESS_SRC] || !mhp[SADB_EXT_ADDRESS_DST]) {
+		    goto no_fixup;
+		}
+
+		src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]);
+		dst = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]);
+
+		natt_type = (struct sadb_x_nat_t_type *)(mhp[SADB_X_EXT_NAT_T_TYPE]);
+
+		if (natt_type && natt_type->sadb_x_nat_t_type_type) {
+		    /* set the src and dst ports */
+		    natt_port = (struct sadb_x_nat_t_port *)(mhp[SADB_X_EXT_NAT_T_SPORT]);
+		    if (natt_port != NULL && extract_port(src) == 0)
+			set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port));
+
+		    natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT];
+		    if (natt_port != NULL && extract_port(dst) == 0)
+			set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port));
+		}
+no_fixup:
+#endif /* __linux__ && ENABLE_NATT */
 
 		ml = msg->sadb_msg_len << 3;
 		bl = buf ? buf->l : 0;

ipsec-tools-0.7.1-dpd-fixes.patch:

Index: ipsec-tools-0.7.1-dpd-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools-0.7.1-dpd-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ipsec-tools-0.7.1-dpd-fixes.patch	10 Nov 2008 12:03:31 -0000	1.2
+++ ipsec-tools-0.7.1-dpd-fixes.patch	23 Apr 2009 13:30:13 -0000	1.3
@@ -1,15 +1,3 @@
-diff -up ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.dpd-fixes ipsec-tools-0.7.1/src/racoon/isakmp_inf.c
---- ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.dpd-fixes	2008-11-10 12:56:46.000000000 +0100
-+++ ipsec-tools-0.7.1/src/racoon/isakmp_inf.c	2008-11-10 12:56:46.000000000 +0100
-@@ -1202,7 +1202,7 @@ purge_ipsec_spi(dst0, proto, spi, n)
- 
- 		/* don't delete inbound SAs at the moment */
- 		/* XXX should we remove SAs with opposite direction as well? */
--		if (CMPSADDR(dst0, dst)) {
-+		if (cmpsaddrwop(dst0, dst)) {
- 			msg = next;
- 			continue;
- 		}
 diff -up ipsec-tools-0.7.1/src/racoon/pfkey.c.dpd-fixes ipsec-tools-0.7.1/src/racoon/pfkey.c
 --- ipsec-tools-0.7.1/src/racoon/pfkey.c.dpd-fixes	2008-11-10 12:56:46.000000000 +0100
 +++ ipsec-tools-0.7.1/src/racoon/pfkey.c	2008-11-10 12:57:45.000000000 +0100


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ipsec-tools.spec	25 Feb 2009 07:46:48 -0000	1.63
+++ ipsec-tools.spec	23 Apr 2009 13:30:13 -0000	1.64
@@ -1,6 +1,6 @@
 Name: ipsec-tools
-Version: 0.7.1
-Release: 8%{?dist}
+Version: 0.7.2
+Release: 1%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -16,9 +16,8 @@
 Patch5: ipsec-tools-0.7-iface.patch
 Patch6: ipsec-tools-0.7-dupsplit.patch
 Patch9: ipsec-tools-0.7-splitcidr.patch
-Patch10: ipsec-tools-0.7.1-natt-linux.patch
+Patch10: ipsec-tools-0.7.2-natt-linux.patch
 Patch11: ipsec-tools-0.7.1-pie.patch
-Patch12: ipsec-tools-0.7.1-leaks.patch
 Patch13: ipsec-tools-0.7.1-dpd-fixes.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
@@ -44,7 +43,6 @@
 %patch9 -p1 -b .splitcidr
 %patch10 -p1 -b .natt-linux
 %patch11 -p1 -b .pie
-%patch12 -p1 -b .leaks
 %patch13 -p1 -b .dpd-fixes
 
 ./bootstrap
@@ -124,6 +122,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.2-1
+- Update to a new upstream version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- ipsec-tools-0.7.1-leaks.patch DELETED ---


--- ipsec-tools-0.7.1-natt-linux.patch DELETED ---



From tagoh at fedoraproject.org  Thu Apr 23 13:32:36 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 23 Apr 2009 13:32:36 +0000 (UTC)
Subject: rpms/vlgothic-fonts/F-9 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vlgothic-fonts.spec, 1.1, 1.2
Message-ID: <20090423133236.E153B70104@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/vlgothic-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20804

Modified Files:
	.cvsignore sources vlgothic-fonts.spec 
Log Message:
* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2009 12:05:21 -0000	1.2
+++ .cvsignore	23 Apr 2009 13:32:06 -0000	1.3
@@ -1 +1,2 @@
 VLGothic-20090204.tar.bz2
+VLGothic-20090422.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2009 12:05:21 -0000	1.2
+++ sources	23 Apr 2009 13:32:06 -0000	1.3
@@ -1 +1 @@
-54298db27daf7b3ec92aff5cfab72f02  VLGothic-20090204.tar.bz2
+dcc9a788a47554344a47926211208473  VLGothic-20090422.tar.bz2


Index: vlgothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-9/vlgothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlgothic-fonts.spec	10 Feb 2009 12:05:21 -0000	1.1
+++ vlgothic-fonts.spec	23 Apr 2009 13:32:06 -0000	1.2
@@ -8,14 +8,14 @@
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
-Version:	20090204
-Release:	2%{?dist}
+Version:	20090422
+Release:	1%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
-Source0:	http://vinelinux.org/~daisuke/vlgothic/%{archivename}.tar.bz2
+Source0:	http://osdn.dl.sourceforge.jp/vlgothic/38942/%{archivename}.tar.bz2
 Source1:	%{fontname}-fontconfig-pgothic.conf
 Source2:	%{fontname}-fontconfig-gothic.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +93,12 @@
 
 
 %changelog
+* Thu Apr 23 2009 Akira TAGOH <tagoh at redhat.com> - 20090422-1
+- New upstream release.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090204-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 10 2009 Akira TAGOH <tagoh at redhat.com> - 20090204-2
 - clean up.
 



From sailer at fedoraproject.org  Thu Apr 23 13:36:52 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 23 Apr 2009 13:36:52 +0000 (UTC)
Subject: rpms/mingw32-sqlite/devel mingw32-sqlite.spec,1.4,1.5
Message-ID: <20090423133652.3E54770104@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21582

Modified Files:
	mingw32-sqlite.spec 
Log Message:
BR tclsh



Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mingw32-sqlite.spec	23 Apr 2009 11:39:18 -0000	1.4
+++ mingw32-sqlite.spec	23 Apr 2009 13:36:21 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:           mingw32-sqlite
 Version:        3.6.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
 License:        Public Domain
@@ -37,6 +37,7 @@
 
 BuildRequires:  autoconf
 BuildRequires:  libtool
+BuildRequires:  /usr/bin/tclsh
 
 Requires:       pkgconfig
 
@@ -111,6 +112,10 @@
 
 
 %changelog
+* Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.12-2
+- BR tclsh; the build process without tclsh and with extensions
+  enabled is broken
+
 * Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ee.ethz.ch> - 3.6.12-1
 - update to 3.6.12 to match native
 - enable rtree, fts3



From zprikryl at fedoraproject.org  Thu Apr 23 13:59:26 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 23 Apr 2009 13:59:26 +0000 (UTC)
Subject: rpms/acpid/F-11 acpid-1.0.8-socket.patch, NONE, 1.1 acpid.spec, 1.34,
	1.35
Message-ID: <20090423135926.EAC8670104@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/acpid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25186

Modified Files:
	acpid.spec 
Added Files:
	acpid-1.0.8-socket.patch 
Log Message:
Fixed CVE-2009-0798 (too many open files DoS)


acpid-1.0.8-socket.patch:

--- NEW FILE acpid-1.0.8-socket.patch ---
--- acpid.8	2009/02/10 23:57:07	1.19
+++ acpid.8	2009/04/22 18:22:27	1.20
@@ -60,6 +60,10 @@
 This option changes the directory in which \fBacpid\fP looks for rule
 configuration files.  Default is \fI/etc/acpi/events\fP.
 .TP 12
+.BI \-C "\fR, \fP" \--clientmax " number"
+This option changes the maximum number of non-root socket connections which
+can be made to the \fBacpid\fP socket.  Default is \fI256\fP.
+.TP 12
 .BI \-d "\fR, \fP" \--debug
 This option increases the \fBacpid\fP debug level by one.  If the debug level
 is non-zero, \fBacpid\fP will run in the foreground, and will log to
--- acpid.c	2009/02/18 17:35:25	1.31
+++ acpid.c	2009/04/22 18:22:28	1.32
@@ -44,6 +44,7 @@
 static int open_log(void);
 static int create_pidfile(void);
 static void clean_exit(int sig);
+static void clean_exit_with_status(int status);
 static void reload_conf(int sig);
 static char *read_line(int fd);
 
@@ -53,6 +54,9 @@
 /* do we log event info? */
 int logevents;
 
+/* the number of non-root clients that are connected */
+int non_root_clients;
+
 static const char *progname;
 static const char *confdir = ACPID_CONFDIR;
 static const char *eventfile = ACPID_EVENTFILE;
@@ -63,6 +67,7 @@
 static mode_t socketmode = ACPID_SOCKETMODE;
 static int foreground;
 static const char *pidfile = ACPID_PIDFILE;
+static int clientmax = ACPID_CLIENTMAX;
 
 int
 main(int argc, char **argv)
@@ -190,7 +195,7 @@
 		struct pollfd ar[2];
 		int r;
 		int fds = 0;
-		
+
 		/* poll for the socket and the event file */
 		ar[0].fd = event_fd; ar[0].events = POLLIN; fds++;
 		if (!nosocket) {
@@ -205,6 +210,9 @@
 			continue;
 		}
 
+		/* house keeping */
+		acpid_close_dead_clients();
+
 		/* was it an event? */
 		if (ar[0].revents) {
 			char *event;
@@ -259,13 +267,14 @@
 					break;
 				}
 			}
-		} 
+		}
 
 		/* was it a new connection? */
 		if (!nosocket && ar[1].revents) {
 			int cli_fd;
 			struct ucred creds;
 			char buf[32];
+			static int accept_errors;
 
 			/* this shouldn't happen */
 			if (!ar[1].revents & POLLIN) {
@@ -280,8 +289,23 @@
 			if (cli_fd < 0) {
 				acpid_log(LOG_ERR, "can't accept client: %s\n",
 				    strerror(errno));
+				accept_errors++;
+				if (accept_errors >= 5) {
+					acpid_log(LOG_ERR, "giving up\n");
+					clean_exit_with_status(EXIT_FAILURE);
+				}
+				continue;
+			}
+			accept_errors = 0;
+			if (creds.uid != 0 && non_root_clients >= clientmax) {
+				close(cli_fd);
+				acpid_log(LOG_ERR,
+				    "too many non-root clients\n");
 				continue;
 			}
+			if (creds.uid != 0) {
+				non_root_clients++;
+			}
 			fcntl(cli_fd, F_SETFD, FD_CLOEXEC);
 			snprintf(buf, sizeof(buf)-1, "%d[%d:%d]",
 				creds.pid, creds.uid, creds.gid);
@@ -289,7 +313,7 @@
 		}
 	}
 
-	clean_exit(EXIT_SUCCESS);
+	clean_exit_with_status(EXIT_SUCCESS);
 
 	return 0;
 }
@@ -302,6 +326,7 @@
 {
 	struct option opts[] = {
 		{"confdir", 1, 0, 'c'},
+		{"clientmax", 1, 0, 'C'},
 		{"debug", 0, 0, 'd'},
 		{"eventfile", 1, 0, 'e'},
 		{"foreground", 0, 0, 'f'},
@@ -318,6 +343,7 @@
 	};
 	const char *opts_help[] = {
 		"Set the configuration directory.",	/* confdir */
+		"Set the limit on non-root socket connections.",/* clientmax */
 		"Increase debugging level (implies -f).",/* debug */
 		"Use the specified file for events.",	/* eventfile */
 		"Run in the foreground.",		/* foreground */
@@ -338,7 +364,7 @@
 	for (;;) {
 		int i;
 		i = getopt_long(*argc, *argv,
-		    "c:de:flg:m:s:Sp:L:vh", opts, NULL);
+		    "c:C:de:flg:m:s:Sp:L:vh", opts, NULL);
 		if (i == -1) {
 			break;
 		}
@@ -346,6 +372,9 @@
 		case 'c':
 			confdir = optarg;
 			break;
+		case 'C':
+			clientmax = strtol(optarg, NULL, 0);
+			break;
 		case 'd':
 			foreground = 1;
 			acpid_debug++;
@@ -519,12 +548,18 @@
 }
 
 static void
-clean_exit(int sig __attribute__((unused)))
+clean_exit_with_status(int status)
 {
 	acpid_cleanup_rules(1);
 	acpid_log(LOG_NOTICE, "exiting\n");
 	unlink(pidfile);
-	exit(EXIT_SUCCESS);
+	exit(status);
+}
+
+static void
+clean_exit(int sig __attribute__((unused)))
+{
+	clean_exit_with_status(EXIT_SUCCESS);
 }
 
 static void
--- acpid.h	2008/10/27 06:08:20	1.14
+++ acpid.h	2009/04/22 18:22:28	1.15
@@ -34,6 +34,7 @@
 #define ACPID_CONFDIR		"/etc/acpi/events"
 #define ACPID_SOCKETFILE	"/var/run/acpid.socket"
 #define ACPID_SOCKETMODE	0666
+#define ACPID_CLIENTMAX		256
 #define ACPID_PIDFILE		"/var/run/acpid.pid"
 #define ACPID_LOCKFILE		"/var/lock/acpid"
 #define ACPID_MAX_ERRS		5
@@ -45,6 +46,7 @@
  */
 extern int acpid_debug;
 extern int logevents;
+extern int non_root_clients;
 extern int acpid_log(int level, const char *fmt, ...);
 
 /*
@@ -54,5 +56,6 @@
 extern int acpid_add_client(int client, const char *origin);
 extern int acpid_cleanup_rules(int do_detach);
 extern int acpid_handle_event(const char *event);
+extern void acpid_close_dead_clients(void);
 
 #endif /* ACPID_H__ */
--- event.c	2008/10/27 05:28:12	1.21
+++ event.c	2009/04/22 18:22:28	1.22
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/poll.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -35,6 +36,7 @@
 #include <signal.h>
 
 #include "acpid.h"
+#include "ud_socket.h"
 
 /*
  * What is a rule?  It's polymorphic, pretty much.
@@ -449,6 +451,55 @@
 	free(r);
 }
 
+static int
+client_is_dead(int fd)
+{
+	struct pollfd pfd;
+	int r;
+
+	/* check the fd to see if it is dead */
+	pfd.fd = fd;
+	pfd.events = POLLERR | POLLHUP;
+	r = poll(&pfd, 1, 0);
+
+	if (r < 0) {
+		acpid_log(LOG_ERR, "poll(): %s\n", strerror(errno));
+		return 0;
+	}
+
+	return pfd.revents;
+}
+
+void
+acpid_close_dead_clients(void)
+{
+	struct rule *p;
+
+	lock_rules();
+
+	/* scan our client list */
+	p = client_list.head;
+	while (p) {
+		struct rule *next = p->next;
+		if (client_is_dead(p->action.fd)) {
+			struct ucred cred;
+			/* closed */
+			acpid_log(LOG_NOTICE,
+			    "client %s has disconnected\n", p->origin);
+			delist_rule(&client_list, p);
+			ud_get_peercred(p->action.fd, &cred);
+			if (cred.uid != 0) {
+				non_root_clients--;
+			}
+			close(p->action.fd);
+			free_rule(p);
+		}
+		p = next;
+	}
+
+	unlock_rules();
+}
+
 /*
  * the main hook for propogating events
  */
@@ -616,10 +667,15 @@
 
 	r = safe_write(client, event, strlen(event));
 	if (r < 0 && errno == EPIPE) {
+		struct ucred cred;
 		/* closed */
 		acpid_log(LOG_NOTICE,
 		    "client %s has disconnected\n", rule->origin);
 		delist_rule(&client_list, rule);
+		ud_get_peercred(rule->action.fd, &cred);
+		if (cred.uid != 0) {
+			non_root_clients--;
+		}
 		close(rule->action.fd);
 		free_rule(rule);
 		return -1;
--- ud_socket.c	2005/08/19 06:56:21	1.5
+++ ud_socket.c	2009/04/22 18:22:28	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: ud_socket.c,v 1.5 2005/08/19 06:56:21 thockin Exp $
+ * $Id: ud_socket.c,v 1.6 2009/04/22 18:22:28 thockin Exp $
  * A few  routines for handling UNIX domain sockets
  */
 
@@ -103,3 +103,10 @@
 	return fd;
 }
 
+int
+ud_get_peercred(int fd, struct ucred *cred)
+{
+	socklen_t len = sizeof(struct ucred);
+	getsockopt(fd, SOL_SOCKET, SO_PEERCRED, cred, &len);
+	return 0;
+}
--- ud_socket.h	2003/11/17 21:24:58	1.2
+++ ud_socket.h	2009/04/22 18:22:28	1.3
@@ -1,5 +1,5 @@
 /*
- *$Id: ud_socket.h,v 1.2 2003/11/17 21:24:58 sunthockin Exp $
+ *$Id: ud_socket.h,v 1.3 2009/04/22 18:22:28 thockin Exp $
  */
 
 #ifndef UD_SOCKET_H__
@@ -11,5 +11,6 @@
 int ud_create_socket(const char *name);
 int ud_accept(int sock, struct ucred *cred);
 int ud_connect(const char *name);
+int ud_get_peercred(int fd, struct ucred *cred);
 
 #endif


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-11/acpid.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- acpid.spec	24 Feb 2009 00:04:27 -0000	1.34
+++ acpid.spec	23 Apr 2009 13:58:56 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Source3: acpid.power.conf
 Source4: acpid.power.sh
 Patch1: acpid-1.0.8-makefile.patch
+Patch2: acpid-1.0.8-socket.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -25,6 +26,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .makefile
+%patch2 -p0 -b .socket
 
 %build
 make %{?_smp_mflags}
@@ -81,6 +83,9 @@
 fi
 
 %changelog
+* Tue Apr 21 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.8-4
+- Fixed CVE-2009-0798 (too many open files DoS)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cebbert at fedoraproject.org  Thu Apr 23 14:13:19 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 14:13:19 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1342, 1.1343 git-bluetooth.patch,
	1.1, NONE git-bluetooth2.patch, 1.1, NONE
Message-ID: <20090423141319.BD32F70104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27095

Modified Files:
	kernel.spec 
Removed Files:
	git-bluetooth.patch git-bluetooth2.patch 
Log Message:
Remove bluetooth updates that broke OBEX.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1342
retrieving revision 1.1343
diff -u -r1.1342 -r1.1343
--- kernel.spec	22 Apr 2009 15:12:33 -0000	1.1342
+++ kernel.spec	23 Apr 2009 14:12:49 -0000	1.1343
@@ -582,8 +582,6 @@
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
 Patch10: git-cpufreq.patch
-Patch11: git-bluetooth.patch
-Patch12: git-bluetooth2.patch
 
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
@@ -1122,10 +1120,6 @@
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-#ApplyPatch git-cpufreq.patch
-ApplyPatch git-bluetooth.patch
-ApplyPatch git-bluetooth2.patch
-
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
@@ -1913,6 +1907,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-43
+- Remove bluetooth updates that broke OBEX.
+
 * Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
 - Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)
 


--- git-bluetooth.patch DELETED ---


--- git-bluetooth2.patch DELETED ---



From jreznik at fedoraproject.org  Thu Apr 23 14:13:59 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 23 Apr 2009 14:13:59 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.3,
	1.4 leonidas-kde-theme.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090423141359.BAC9870104@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27142

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.3-1
- new KDM theme design



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2009 16:26:43 -0000	1.3
+++ .cvsignore	23 Apr 2009 14:13:29 -0000	1.4
@@ -1 +1 @@
-leonidas-kde-theme-0.2.2.tar.bz2
+leonidas-kde-theme-0.2.3.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- leonidas-kde-theme.spec	22 Apr 2009 15:46:47 -0000	1.5
+++ leonidas-kde-theme.spec	23 Apr 2009 14:13:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		leonidas-kde-theme
-Version:	0.2.2
-Release:	4%{?dist}
+Version:	0.2.3
+Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.3-1
+- new KDM theme design
+
 * Wed Apr 22 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.2-4
 - our own logos for both fedora and generic version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2009 16:26:43 -0000	1.3
+++ sources	23 Apr 2009 14:13:29 -0000	1.4
@@ -1 +1 @@
-2a3122105d76a66c1116bae5f84e662d  leonidas-kde-theme-0.2.2.tar.bz2
+2ef82e803893494e990fd52d538ebd53  leonidas-kde-theme-0.2.3.tar.bz2



From hadess at fedoraproject.org  Thu Apr 23 14:18:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 14:18:24 +0000 (UTC)
Subject: rpms/gnome-media/F-11
	0001-Don-t-show-debug-output-when-disabling-debugging.patch,
	NONE, 1.1 gnome-media.spec, 1.168, 1.169
Message-ID: <20090423141824.633EE70104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27595

Modified Files:
	gnome-media.spec 
Added Files:
	0001-Don-t-show-debug-output-when-disabling-debugging.patch 
Log Message:
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-3
- Don't show debug when disabling the debug output (#493138)


0001-Don-t-show-debug-output-when-disabling-debugging.patch:

--- NEW FILE 0001-Don-t-show-debug-output-when-disabling-debugging.patch ---
>From c03480a8bdfbaac1b5d49ff66cc65e8deb47fe18 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 23 Apr 2009 15:13:22 +0100
Subject: [PATCH] Don't show debug output when disabling debugging

Apparently it's annoying:
https://bugzilla.redhat.com/show_bug.cgi?id=493138
---
 gnome-volume-control/src/gvc-log.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gnome-volume-control/src/gvc-log.c b/gnome-volume-control/src/gvc-log.c
index fe9925e..03a9486 100644
--- a/gnome-volume-control/src/gvc-log.c
+++ b/gnome-volume-control/src/gvc-log.c
@@ -57,7 +57,6 @@ gvc_log_set_debug (gboolean debug)
                 log_levels |= G_LOG_LEVEL_DEBUG;
                 g_debug ("Enabling debugging");
         } else {
-                g_debug ("Disabling debugging");
                 log_levels &= ~G_LOG_LEVEL_DEBUG;
         }
 }
-- 
1.6.0.6



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnome-media.spec	16 Apr 2009 04:54:57 -0000	1.168
+++ gnome-media.spec	23 Apr 2009 14:17:53 -0000	1.169
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.26.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
@@ -22,6 +22,8 @@
 Patch3:		gnome-media-add-100-mark.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=579115
 Patch4: 	fix-alignment-of-sliders.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=493138
+Patch5:		0001-Don-t-show-debug-output-when-disabling-debugging.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -82,6 +84,7 @@
 %patch3 -p0 -b .amplified-mark
 popd
 %patch4 -p1 -b .fix-alignment-of-sliders
+%patch5 -p1 -b .debug
 
 %build
 # try to work around a problem where gst-inspect does
@@ -255,6 +258,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-3
+- Don't show debug when disabling the debug output (#493138)
+
 * Thu Apr 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Fix alignment of sliders
 



From than at fedoraproject.org  Thu Apr 23 14:22:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 23 Apr 2009 14:22:31 +0000 (UTC)
Subject: rpms/qt/F-9 qt.spec, 1.195, 1.196 sources, 1.43,
	1.44 qt-x11-opensource-src-4.5.0-linguist-crash.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-lrelease.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, 1.1, NONE
Message-ID: <20090423142232.03D7A70104@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28172

Modified Files:
	qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.5.0-linguist-crash.patch 
	qt-x11-opensource-src-4.5.0-lrelease.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
	qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch 
Log Message:
4.5.1



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/qt.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- qt.spec	14 Apr 2009 20:25:13 -0000	1.195
+++ qt.spec	23 Apr 2009 14:22:01 -0000	1.196
@@ -11,8 +11,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.5.0
-Release: 14%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -37,9 +37,6 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
-Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
-Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
@@ -49,7 +46,6 @@
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -58,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090325
+%define qt_copy 20090423
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -312,6 +308,10 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
+echo "0245" >> patches/DISABLED
+echo "0275" >> patches/DISABLED
+echo "0276" >> patches/DISABLED
+echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -322,13 +322,9 @@
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch10 -p1 -b .ppc64
-%patch11 -p1 -b .linguist-crash
-%patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .disable_ft_lcdfilter
-%patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -376,6 +372,7 @@
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
+  -opensource \
   -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
@@ -812,6 +809,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
+- 4.5.1
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
 - fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	25 Mar 2009 18:43:51 -0000	1.43
+++ sources	23 Apr 2009 14:22:01 -0000	1.44
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-55e8c74a89e1bc128a5a6f1ff6b8b5ba  qt-x11-opensource-src-4.5.0.tar.bz2
-74cac34a16b483ddc0a90204a0af8314  qt-copy-patches-20090325svn.tar.bz2
+e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
+afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2


--- qt-x11-opensource-src-4.5.0-linguist-crash.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-lrelease.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch DELETED ---



From cebbert at fedoraproject.org  Thu Apr 23 14:24:49 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 14:24:49 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.29.2-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1003, 1.1004 drm-next.patch, 1.17, 1.18 git-linus.diff, 1.14,
	1.15 kernel.spec, 1.1343, 1.1344 sources, 1.964, 1.965 upstream,
	1.875, 1.876
Message-ID: <20090423142449.28C2370104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28488

Modified Files:
	.cvsignore drm-next.patch git-linus.diff kernel.spec sources 
	upstream 
Added Files:
	patch-2.6.29.2-rc1.bz2.sign 
Log Message:
2.6.29.2-rc1


--- NEW FILE patch-2.6.29.2-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ8B4VyGugalF9Dw4RAgNjAJwKY3Bc7lliRBFflCybCoYWbHaCrQCeP1j5
cE2DuNPH+QloWmk9ldwGcVs=
=PI8N
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1003
retrieving revision 1.1004
diff -u -r1.1003 -r1.1004
--- .cvsignore	2 Apr 2009 23:54:23 -0000	1.1003
+++ .cvsignore	23 Apr 2009 14:24:17 -0000	1.1004
@@ -6,3 +6,4 @@
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29.1.bz2
+patch-2.6.29.2-rc1.bz2

drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- drm-next.patch	22 Apr 2009 14:16:26 -0000	1.17
+++ drm-next.patch	23 Apr 2009 14:24:17 -0000	1.18
@@ -3201,7 +3201,7 @@
  	if (!obj_priv->page_cpu_valid)
 @@ -2160,7 +2157,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
  				continue;
- 			drm_clflush_pages(obj_priv->pages + i, 1);
+ 			drm_clflush_pages(obj_priv->page_list + i, 1);
  		}
 -		drm_agp_chipset_flush(dev);
  	}

git-linus.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.14 -r 1.15 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/git-linus.diff,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- git-linus.diff	22 Apr 2009 14:16:27 -0000	1.14
+++ git-linus.diff	23 Apr 2009 14:24:17 -0000	1.15
@@ -1,5873 +0,0 @@
-Index: vanilla-2.6.29.1/security/smack/smack_lsm.c
-===================================================================
---- vanilla-2.6.29.1.orig/security/smack/smack_lsm.c
-+++ vanilla-2.6.29.1/security/smack/smack_lsm.c
-@@ -607,6 +607,8 @@ static int smack_inode_setxattr(struct d
- 	    strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {
- 		if (!capable(CAP_MAC_ADMIN))
- 			rc = -EPERM;
-+		if (size == 0)
-+			rc = -EINVAL;
- 	} else
- 		rc = cap_inode_setxattr(dentry, name, value, size, flags);
- 
-@@ -1430,7 +1432,7 @@ static int smack_inode_setsecurity(struc
- 	struct socket *sock;
- 	int rc = 0;
- 
--	if (value == NULL || size > SMK_LABELLEN)
-+	if (value == NULL || size > SMK_LABELLEN || size == 0)
- 		return -EACCES;
- 
- 	sp = smk_import(value, size);
-Index: vanilla-2.6.29.1/drivers/video/console/fbcon.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/video/console/fbcon.c
-+++ vanilla-2.6.29.1/drivers/video/console/fbcon.c
-@@ -2263,9 +2263,12 @@ static void fbcon_generic_blank(struct v
- 	}
- 
- 
-+	if (!lock_fb_info(info))
-+		return;
- 	event.info = info;
- 	event.data = &blank;
- 	fb_notifier_call_chain(FB_EVENT_CONBLANK, &event);
-+	unlock_fb_info(info);
- }
- 
- static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
-@@ -2954,8 +2957,9 @@ static int fbcon_fb_unbind(int idx)
- 
- static int fbcon_fb_unregistered(struct fb_info *info)
- {
--	int i, idx = info->node;
-+	int i, idx;
- 
-+	idx = info->node;
- 	for (i = first_fb_vc; i <= last_fb_vc; i++) {
- 		if (con2fb_map[i] == idx)
- 			con2fb_map[i] = -1;
-@@ -2979,13 +2983,12 @@ static int fbcon_fb_unregistered(struct 
- 		}
- 	}
- 
--	if (!num_registered_fb)
--		unregister_con_driver(&fb_con);
--
--
- 	if (primary_device == idx)
- 		primary_device = -1;
- 
-+	if (!num_registered_fb)
-+		unregister_con_driver(&fb_con);
-+
- 	return 0;
- }
- 
-@@ -3021,8 +3024,9 @@ static inline void fbcon_select_primary(
- 
- static int fbcon_fb_registered(struct fb_info *info)
- {
--	int ret = 0, i, idx = info->node;
-+	int ret = 0, i, idx;
- 
-+	idx = info->node;
- 	fbcon_select_primary(info);
- 
- 	if (info_idx == -1) {
-@@ -3124,7 +3128,7 @@ static void fbcon_get_requirement(struct
- 	}
- }
- 
--static int fbcon_event_notify(struct notifier_block *self, 
-+static int fbcon_event_notify(struct notifier_block *self,
- 			      unsigned long action, void *data)
- {
- 	struct fb_event *event = data;
-@@ -3132,7 +3136,7 @@ static int fbcon_event_notify(struct not
- 	struct fb_videomode *mode;
- 	struct fb_con2fbmap *con2fb;
- 	struct fb_blit_caps *caps;
--	int ret = 0;
-+	int idx, ret = 0;
- 
- 	/*
- 	 * ignore all events except driver registration and deregistration
-@@ -3160,7 +3164,8 @@ static int fbcon_event_notify(struct not
- 		ret = fbcon_mode_deleted(info, mode);
- 		break;
- 	case FB_EVENT_FB_UNBIND:
--		ret = fbcon_fb_unbind(info->node);
-+		idx = info->node;
-+		ret = fbcon_fb_unbind(idx);
- 		break;
- 	case FB_EVENT_FB_REGISTERED:
- 		ret = fbcon_fb_registered(info);
-@@ -3188,7 +3193,6 @@ static int fbcon_event_notify(struct not
- 		fbcon_get_requirement(info, caps);
- 		break;
- 	}
--
- done:
- 	return ret;
- }
-Index: vanilla-2.6.29.1/drivers/video/fbmem.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/video/fbmem.c
-+++ vanilla-2.6.29.1/drivers/video/fbmem.c
-@@ -1086,13 +1086,11 @@ static long do_fb_ioctl(struct fb_info *
- 			return -EINVAL;
- 		con2fb.framebuffer = -1;
- 		event.data = &con2fb;
--
- 		if (!lock_fb_info(info))
- 			return -ENODEV;
- 		event.info = info;
- 		fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
- 		unlock_fb_info(info);
--
- 		ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
- 		break;
- 	case FBIOPUT_CON2FBMAP:
-@@ -1112,8 +1110,7 @@ static long do_fb_ioctl(struct fb_info *
- 		if (!lock_fb_info(info))
- 			return -ENODEV;
- 		event.info = info;
--		ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
--					      &event);
-+		ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
- 		unlock_fb_info(info);
- 		break;
- 	case FBIOBLANK:
-@@ -1519,7 +1516,10 @@ register_framebuffer(struct fb_info *fb_
- 	registered_fb[i] = fb_info;
- 
- 	event.info = fb_info;
-+	if (!lock_fb_info(fb_info))
-+		return -ENODEV;
- 	fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
-+	unlock_fb_info(fb_info);
- 	return 0;
- }
- 
-@@ -1553,8 +1553,12 @@ unregister_framebuffer(struct fb_info *f
- 		goto done;
- 	}
- 
-+
-+	if (!lock_fb_info(fb_info))
-+		return -ENODEV;
- 	event.info = fb_info;
- 	ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
-+	unlock_fb_info(fb_info);
- 
- 	if (ret) {
- 		ret = -EINVAL;
-@@ -1588,6 +1592,8 @@ void fb_set_suspend(struct fb_info *info
- {
- 	struct fb_event event;
- 
-+	if (!lock_fb_info(info))
-+		return;
- 	event.info = info;
- 	if (state) {
- 		fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
-@@ -1596,6 +1602,7 @@ void fb_set_suspend(struct fb_info *info
- 		info->state = FBINFO_STATE_RUNNING;
- 		fb_notifier_call_chain(FB_EVENT_RESUME, &event);
- 	}
-+	unlock_fb_info(info);
- }
- 
- /**
-@@ -1665,8 +1672,11 @@ int fb_new_modelist(struct fb_info *info
- 	err = 1;
- 
- 	if (!list_empty(&info->modelist)) {
-+		if (!lock_fb_info(info))
-+			return -ENODEV;
- 		event.info = info;
- 		err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
[...5482 lines suppressed...]
--	unsigned long vma_end = vma->vm_end;
--	unsigned long vma_size = vma_end - vma_start;
-+	unsigned long vma_size = vma->vm_end - vma->vm_start;
- 
- 	if (!pat_enabled)
- 		return;
- 
-+	/*
-+	 * For now, only handle remap_pfn_range() vmas where
-+	 * is_linear_pfn_mapping() == TRUE. Handling of
-+	 * vm_insert_pfn() is TBD.
-+	 */
- 	if (is_linear_pfn_mapping(vma)) {
- 		/* free the whole chunk starting from vm_pgoff */
- 		paddr = (resource_size_t)vma->vm_pgoff << PAGE_SHIFT;
- 		free_pfn_range(paddr, vma_size);
- 		return;
- 	}
--
--	if (size != 0 && size != vma_size) {
--		/* free page by page, using pfn and size */
--		paddr = (resource_size_t)pfn << PAGE_SHIFT;
--		for (i = 0; i < size; i += PAGE_SIZE) {
--			paddr = paddr + i;
--			free_pfn_range(paddr, PAGE_SIZE);
--		}
--	} else {
--		/* free entire vma, page by page, using the pfn from pte */
--		for (i = 0; i < vma_size; i += PAGE_SIZE) {
--			if (follow_phys(vma, vma_start + i, 0, &prot, &paddr))
--				continue;
--
--			free_pfn_range(paddr, PAGE_SIZE);
--		}
--	}
- }
- 
- pgprot_t pgprot_writecombine(pgprot_t prot)
-Index: vanilla-2.6.29.1/drivers/input/gameport/gameport.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/input/gameport/gameport.c
-+++ vanilla-2.6.29.1/drivers/input/gameport/gameport.c
-@@ -50,9 +50,8 @@ static LIST_HEAD(gameport_list);
- 
- static struct bus_type gameport_bus;
- 
--static void gameport_add_driver(struct gameport_driver *drv);
- static void gameport_add_port(struct gameport *gameport);
--static void gameport_destroy_port(struct gameport *gameport);
-+static void gameport_attach_driver(struct gameport_driver *drv);
- static void gameport_reconnect_port(struct gameport *gameport);
- static void gameport_disconnect_port(struct gameport *gameport);
- 
-@@ -230,7 +229,6 @@ static void gameport_find_driver(struct 
- 
- enum gameport_event_type {
- 	GAMEPORT_REGISTER_PORT,
--	GAMEPORT_REGISTER_DRIVER,
- 	GAMEPORT_ATTACH_DRIVER,
- };
- 
-@@ -374,8 +372,8 @@ static void gameport_handle_event(void)
- 				gameport_add_port(event->object);
- 				break;
- 
--			case GAMEPORT_REGISTER_DRIVER:
--				gameport_add_driver(event->object);
-+			case GAMEPORT_ATTACH_DRIVER:
-+				gameport_attach_driver(event->object);
- 				break;
- 
- 			default:
-@@ -706,14 +704,14 @@ static int gameport_driver_remove(struct
- 	return 0;
- }
- 
--static void gameport_add_driver(struct gameport_driver *drv)
-+static void gameport_attach_driver(struct gameport_driver *drv)
- {
- 	int error;
- 
--	error = driver_register(&drv->driver);
-+	error = driver_attach(&drv->driver);
- 	if (error)
- 		printk(KERN_ERR
--			"gameport: driver_register() failed for %s, error: %d\n",
-+			"gameport: driver_attach() failed for %s, error: %d\n",
- 			drv->driver.name, error);
- }
- 
-Index: vanilla-2.6.29.1/drivers/char/vt.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/char/vt.c
-+++ vanilla-2.6.29.1/drivers/char/vt.c
-@@ -2271,7 +2271,7 @@ rescan_last_byte:
- 				    continue; /* nothing to display */
- 				}
- 				/* Glyph not found */
--				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
-+				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
- 				    /* In legacy mode use the glyph we get by a 1:1 mapping.
- 				       This would make absolutely no sense with Unicode in mind,
- 				       but do this for ASCII characters since a font may lack
-Index: vanilla-2.6.29.1/drivers/virtio/virtio_balloon.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/virtio/virtio_balloon.c
-+++ vanilla-2.6.29.1/drivers/virtio/virtio_balloon.c
-@@ -190,7 +190,8 @@ static int balloon(void *_vballoon)
- 		try_to_freeze();
- 		wait_event_interruptible(vb->config_change,
- 					 (diff = towards_target(vb)) != 0
--					 || kthread_should_stop());
-+					 || kthread_should_stop()
-+					 || freezing(current));
- 		if (diff > 0)
- 			fill_balloon(vb, diff);
- 		else if (diff < 0)
-Index: vanilla-2.6.29.1/drivers/char/agp/generic.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/char/agp/generic.c
-+++ vanilla-2.6.29.1/drivers/char/agp/generic.c
-@@ -1226,7 +1226,7 @@ int agp_generic_alloc_pages(struct agp_b
- 	int i, ret = -ENOMEM;
- 
- 	for (i = 0; i < num_pages; i++) {
--		page = alloc_page(GFP_KERNEL | GFP_DMA32);
-+		page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
- 		/* agp_free_memory() needs gart address */
- 		if (page == NULL)
- 			goto out;
-@@ -1257,7 +1257,7 @@ void *agp_generic_alloc_page(struct agp_
- {
- 	struct page * page;
- 
--	page = alloc_page(GFP_KERNEL | GFP_DMA32);
-+	page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
- 	if (page == NULL)
- 		return NULL;
- 
-Index: vanilla-2.6.29.1/net/core/skbuff.c
-===================================================================
---- vanilla-2.6.29.1.orig/net/core/skbuff.c
-+++ vanilla-2.6.29.1/net/core/skbuff.c
-@@ -2496,7 +2496,7 @@ struct sk_buff *skb_segment(struct sk_bu
- 					  skb_network_header_len(skb));
- 		skb_copy_from_linear_data(skb, nskb->data, doffset);
- 
--		if (pos >= offset + len)
-+		if (fskb != skb_shinfo(skb)->frag_list)
- 			continue;
- 
- 		if (!sg) {
-Index: vanilla-2.6.29.1/fs/nfs/nfs3xdr.c
-===================================================================
---- vanilla-2.6.29.1.orig/fs/nfs/nfs3xdr.c
-+++ vanilla-2.6.29.1/fs/nfs/nfs3xdr.c
-@@ -716,7 +716,8 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req
- 	if (args->npages != 0)
- 		xdr_encode_pages(buf, args->pages, 0, args->len);
- 	else
--		req->rq_slen += args->len;
-+		req->rq_slen = xdr_adjust_iovec(req->rq_svec,
-+				p + XDR_QUADLEN(args->len));
- 
- 	err = nfsacl_encode(buf, base, args->inode,
- 			    (args->mask & NFS_ACL) ?
-Index: vanilla-2.6.29.1/fs/hugetlbfs/inode.c
-===================================================================
---- vanilla-2.6.29.1.orig/fs/hugetlbfs/inode.c
-+++ vanilla-2.6.29.1/fs/hugetlbfs/inode.c
-@@ -26,7 +26,6 @@
- #include <linux/pagevec.h>
- #include <linux/parser.h>
- #include <linux/mman.h>
--#include <linux/quotaops.h>
- #include <linux/slab.h>
- #include <linux/dnotify.h>
- #include <linux/statfs.h>
-@@ -842,7 +841,7 @@ hugetlbfs_parse_options(char *options, s
- bad_val:
-  	printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
- 	       args[0].from, p);
-- 	return 1;
-+ 	return -EINVAL;
- }
- 
- static int
-Index: vanilla-2.6.29.1/drivers/message/fusion/mptbase.c
-===================================================================
---- vanilla-2.6.29.1.orig/drivers/message/fusion/mptbase.c
-+++ vanilla-2.6.29.1/drivers/message/fusion/mptbase.c
-@@ -5934,7 +5934,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS
- 
- 	/* Initalize the timer
- 	 */
--	init_timer(&pCfg->timer);
-+	init_timer_on_stack(&pCfg->timer);
- 	pCfg->timer.data = (unsigned long) ioc;
- 	pCfg->timer.function = mpt_timer_expired;
- 	pCfg->wait_done = 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -u -r1.1343 -r1.1344
--- kernel.spec	23 Apr 2009 14:12:49 -0000	1.1343
+++ kernel.spec	23 Apr 2009 14:24:18 -0000	1.1344
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1907,16 +1907,19 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-43
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-44.rc1
+- 2.6.29.2-rc1
+
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-43
 - Remove bluetooth updates that broke OBEX.
 
-* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
+* Wed Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
 - Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)
 
 * Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-41
 - back-port mac80211: fix beacon loss detection after scan
 
-* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-40
+* Wed Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-40
 - Add 2.6.29.2 patch queue (as git-linus.diff)
 - Drop queued patches:
     linux-2.6-acer-wmi-bail-on-aao.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -r1.964 -r1.965
--- sources	2 Apr 2009 23:54:24 -0000	1.964
+++ sources	23 Apr 2009 14:24:18 -0000	1.965
@@ -1,2 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2
+b1c47bcaa6a72dfd4adaa5630ae75585  patch-2.6.29.2-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- upstream	2 Apr 2009 23:54:24 -0000	1.875
+++ upstream	23 Apr 2009 14:24:18 -0000	1.876
@@ -1,2 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29.1.bz2
+patch-2.6.29.2-rc1.bz2



From vcrhonek at fedoraproject.org  Thu Apr 23 14:38:17 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 23 Apr 2009 14:38:17 +0000 (UTC)
Subject: rpms/jwhois/devel jwhois-4.0-dotster.patch, NONE, 1.1 jwhois.spec, 
	1.48, 1.49
Message-ID: <20090423143817.7FC9A70104@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30345

Modified Files:
	jwhois.spec 
Added Files:
	jwhois-4.0-dotster.patch 
Log Message:
Update jwhois.conf to expect UTF-8 answer charset from whois.dotster.com

jwhois-4.0-dotster.patch:

--- NEW FILE jwhois-4.0-dotster.patch ---
diff -up jwhois-4.0/example/jwhois.conf_old jwhois-4.0/example/jwhois.conf
--- jwhois-4.0/example/jwhois.conf_old	2009-04-23 16:16:41.000000000 +0200
+++ jwhois-4.0/example/jwhois.conf	2009-04-23 16:18:15.000000000 +0200
@@ -1069,6 +1069,9 @@ server-options {
 		http-action = "/cgi-bin/checkavail.cgi";
 		form-element = "domain";
 	}
+	"whois\\.dotster\\.com" {
+		answer-charset = "UTF-8";
+	}
 }
 
 #


Index: jwhois.spec
===================================================================
RCS file: /cvs/extras/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jwhois.spec	13 Mar 2009 08:09:21 -0000	1.48
+++ jwhois.spec	23 Apr 2009 14:37:47 -0000	1.49
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 4.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Patch0: jwhois-4.0-connect.patch
@@ -11,6 +11,7 @@
 Patch5: jwhois-4.0-fclose.patch
 Patch6: jwhois-4.0-conf_update.patch
 Patch7: jwhois-4.0-conf_update2.patch
+Patch8: jwhois-4.0-dotster.patch
 License: GPLv3
 Group: Applications/Internet
 Summary: Internet whois/nicname client
@@ -32,6 +33,7 @@
 %patch5 -p1 -b .fclose
 %patch6 -p1 -b .conf_update
 %patch7 -p1 -b .conf_update2
+%patch8 -p1 -b .dotster
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -71,6 +73,10 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-14
+- Update jwhois.conf to expect UTF-8 answer charset from whois.dotster.com
+  Resolves: #496015
+
 * Fri Mar 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-13
 - jwhois.conf update for another few domains
   Resolves: #489161



From dwalsh at fedoraproject.org  Thu Apr 23 14:47:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 23 Apr 2009 14:47:38 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.99,
	1.100 selinux-policy.spec, 1.834, 1.835
Message-ID: <20090423144738.DE90C70104@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31187

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-14
- Allow pulseaudio to acquire_svc on session bus
- Fix readahead labeling


policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.99 -r 1.100 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- policy-20090105.patch	23 Apr 2009 13:19:23 -0000	1.99
+++ policy-20090105.patch	23 Apr 2009 14:47:07 -0000	1.100
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.12/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context	2009-04-23 09:44:57.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -47,7 +47,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.12/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mcs/seusers	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/seusers	2009-04-23 09:44:57.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -56,7 +56,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -73,7 +73,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -89,13 +89,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context	2009-04-23 09:44:57.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -110,18 +110,18 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.12/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -145,7 +145,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -166,7 +166,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/securetty_types serefpolicy-3.6.12/config/appconfig-mls/securetty_types
 --- nsaserefpolicy/config/appconfig-mls/securetty_types	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mls/securetty_types	2009-04-20 10:13:02.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/securetty_types	2009-04-23 09:44:57.000000000 -0400
 @@ -1,6 +1 @@
 -auditadm_tty_device_t
 -secadm_tty_device_t
@@ -176,18 +176,18 @@
  user_tty_device_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.12/Makefile
 --- nsaserefpolicy/Makefile	2009-01-19 11:07:35.000000000 -0500
-+++ serefpolicy-3.6.12/Makefile	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/Makefile	2009-04-23 09:44:57.000000000 -0400
 @@ -241,7 +241,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -252,7 +252,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.12/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-13 10:52:18.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -22,7 +22,7 @@
  .EX
  httpd_sys_content_t 
@@ -324,7 +324,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.12/man/man8/kerberos_selinux.8
 --- nsaserefpolicy/man/man8/kerberos_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/kerberos_selinux.8	2009-04-13 10:53:14.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/kerberos_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -12,7 +12,7 @@
  .SH "DESCRIPTION"
  
@@ -336,7 +336,7 @@
  You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.12/man/man8/nfs_selinux.8
 --- nsaserefpolicy/man/man8/nfs_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/nfs_selinux.8	2009-04-13 10:49:43.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/nfs_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -6,7 +6,7 @@
  Security Enhanced Linux secures the NFS server via flexible mandatory access
  control.  
@@ -348,7 +348,7 @@
  setsebool -P nfs_export_all_ro 1
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ypbind_selinux.8 serefpolicy-3.6.12/man/man8/ypbind_selinux.8
 --- nsaserefpolicy/man/man8/ypbind_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/man/man8/ypbind_selinux.8	2009-04-13 10:54:03.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/ypbind_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -4,7 +4,7 @@
  .SH "DESCRIPTION"
  
@@ -360,7 +360,7 @@
  You must set the allow_ypbind boolean to allow your system to work properly in a NIS environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/global_tunables	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/global_tunables	2009-04-23 09:44:57.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -392,7 +392,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.12/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-02-03 22:50:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/mcs	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/mcs	2009-04-23 09:44:57.000000000 -0400
 @@ -67,7 +67,7 @@
  # Note that getattr on files is always permitted.
  #
@@ -426,7 +426,7 @@
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.12/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/anaconda.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/anaconda.te	2009-04-23 09:44:57.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
[...2884 lines suppressed...]
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpd\.conf	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -28274,16 +28310,16 @@
  
  /etc/dhcp3(/.*)?		gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcp3?/dhclient.*		gen_context(system_u:object_r:dhcp_etc_t,s0)
-@@ -20,6 +24,8 @@
+ 
  ifdef(`distro_redhat',`
  /etc/sysconfig/network-scripts/.*resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
- /etc/sysconfig/networking/profiles/.*/resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
-+/etc/sysconfig/networking/profiles/.*/hosts -- gen_context(system_u:object_r:net_conf_t,s0)
+-/etc/sysconfig/networking/profiles/.*/resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
++/etc/sysconfig/networking(/.*)? gen_context(system_u:object_r:net_conf_t,s0)
 +/etc/sysconfig/network-scripts(/.*)?  gen_context(system_u:object_r:net_conf_t,s0)
  ')
  
  #
-@@ -57,3 +63,5 @@
+@@ -57,3 +62,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
  ')
@@ -28291,7 +28327,7 @@
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.12/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-23 09:44:57.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -28462,7 +28498,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-23 09:44:57.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -28648,7 +28684,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-04-07 15:53:36.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-21 14:41:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-23 09:44:57.000000000 -0400
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -28698,7 +28734,7 @@
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.12/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.fc	2009-04-09 04:45:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -28718,7 +28754,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-15 10:11:28.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-23 09:44:57.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -29214,7 +29250,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-09 04:23:28.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-23 09:44:57.000000000 -0400
 @@ -5,227 +5,6 @@
  #
  # Declarations
@@ -29446,7 +29482,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.12/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -29458,7 +29494,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-20 08:25:48.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 09:44:57.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -31392,7 +31428,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-23 09:44:57.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -31478,12 +31514,12 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.12/policy/modules/system/virtual.fc
 --- nsaserefpolicy/policy/modules/system/virtual.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1 @@
 +# No application file contexts.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.12/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-20 07:58:28.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
@@ -31601,7 +31637,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.12/policy/modules/system/virtual.te
 --- nsaserefpolicy/policy/modules/system/virtual.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.te	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,80 @@
 +
 +policy_module(virtualization, 1.1.2)
@@ -31685,7 +31721,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.12/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -1,32 +1,31 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -31727,7 +31763,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.12/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-23 09:44:57.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -31793,7 +31829,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-20 07:59:14.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-23 09:44:57.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -32065,7 +32101,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/ipc_patterns.spt serefpolicy-3.6.12/policy/support/ipc_patterns.spt
 --- nsaserefpolicy/policy/support/ipc_patterns.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.12/policy/support/ipc_patterns.spt	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/ipc_patterns.spt	2009-04-23 09:44:57.000000000 -0400
 @@ -3,12 +3,12 @@
  #
  define(`stream_connect_pattern',`
@@ -32083,7 +32119,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-23 09:44:57.000000000 -0400
 @@ -225,7 +225,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')
@@ -32109,7 +32145,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.12/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/users	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/users	2009-04-23 09:44:57.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -32136,7 +32172,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.12/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/Rules.modular	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/Rules.modular	2009-04-23 09:44:57.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -32168,7 +32204,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.12/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/support/Makefile.devel	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/support/Makefile.devel	2009-04-23 09:44:57.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- selinux-policy.spec	23 Apr 2009 13:19:24 -0000	1.834
+++ selinux-policy.spec	23 Apr 2009 14:47:08 -0000	1.835
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,10 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-14
+- Allow pulseaudio to acquire_svc on session bus
+- Fix readahead labeling
+
 * Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-13
 - Allow sysadm_t to run rpm directly
 - libvirt needs fowner



From dwalsh at fedoraproject.org  Thu Apr 23 14:48:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 23 Apr 2009 14:48:47 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.92,
	1.93 selinux-policy.spec, 1.829, 1.830
Message-ID: <20090423144847.2219770104@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-14
- Allow pulseaudio to acquire_svc on session bus
- Fix readahead labeling


policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.92 -r 1.93 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- policy-20090105.patch	22 Apr 2009 19:18:29 -0000	1.92
+++ policy-20090105.patch	23 Apr 2009 14:48:46 -0000	1.93
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.12/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/failsafe_context	2009-04-23 09:44:57.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/root_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -47,7 +47,7 @@
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.12/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mcs/seusers	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/seusers	2009-04-23 09:44:57.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -56,7 +56,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/staff_u_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -73,7 +73,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/unconfined_u_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -89,13 +89,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/userhelper_context	2009-04-23 09:44:57.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/user_u_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -110,18 +110,18 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_domain_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mcs/virtual_image_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.12/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -145,7 +145,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/root_default_contexts	2009-04-23 09:44:57.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -166,7 +166,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/securetty_types serefpolicy-3.6.12/config/appconfig-mls/securetty_types
 --- nsaserefpolicy/config/appconfig-mls/securetty_types	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/config/appconfig-mls/securetty_types	2009-04-20 10:13:02.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/securetty_types	2009-04-23 09:44:57.000000000 -0400
 @@ -1,6 +1 @@
 -auditadm_tty_device_t
 -secadm_tty_device_t
@@ -176,18 +176,18 @@
  user_tty_device_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/virtual_domain_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/config/appconfig-mls/virtual_image_context	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.12/Makefile
 --- nsaserefpolicy/Makefile	2009-01-19 11:07:35.000000000 -0500
-+++ serefpolicy-3.6.12/Makefile	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/Makefile	2009-04-23 09:44:57.000000000 -0400
 @@ -241,7 +241,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -252,7 +252,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.12/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-13 10:52:18.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/httpd_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -22,7 +22,7 @@
  .EX
  httpd_sys_content_t 
@@ -324,7 +324,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.12/man/man8/kerberos_selinux.8
 --- nsaserefpolicy/man/man8/kerberos_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/kerberos_selinux.8	2009-04-13 10:53:14.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/kerberos_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -12,7 +12,7 @@
  .SH "DESCRIPTION"
  
@@ -336,7 +336,7 @@
  You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.12/man/man8/nfs_selinux.8
 --- nsaserefpolicy/man/man8/nfs_selinux.8	2009-03-05 09:22:34.000000000 -0500
-+++ serefpolicy-3.6.12/man/man8/nfs_selinux.8	2009-04-13 10:49:43.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/nfs_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -6,7 +6,7 @@
  Security Enhanced Linux secures the NFS server via flexible mandatory access
  control.  
@@ -348,7 +348,7 @@
  setsebool -P nfs_export_all_ro 1
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ypbind_selinux.8 serefpolicy-3.6.12/man/man8/ypbind_selinux.8
 --- nsaserefpolicy/man/man8/ypbind_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.12/man/man8/ypbind_selinux.8	2009-04-13 10:54:03.000000000 -0400
++++ serefpolicy-3.6.12/man/man8/ypbind_selinux.8	2009-04-23 09:44:57.000000000 -0400
 @@ -4,7 +4,7 @@
  .SH "DESCRIPTION"
  
@@ -360,7 +360,7 @@
  You must set the allow_ypbind boolean to allow your system to work properly in a NIS environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/global_tunables	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/global_tunables	2009-04-23 09:44:57.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -392,7 +392,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.12/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-02-03 22:50:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/mcs	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/mcs	2009-04-23 09:44:57.000000000 -0400
 @@ -67,7 +67,7 @@
  # Note that getattr on files is always permitted.
  #
@@ -426,7 +426,7 @@
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.12/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/anaconda.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/anaconda.te	2009-04-23 09:44:57.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
[...2968 lines suppressed...]
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpd\.conf	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -28271,16 +28310,16 @@
  
  /etc/dhcp3(/.*)?		gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcp3?/dhclient.*		gen_context(system_u:object_r:dhcp_etc_t,s0)
-@@ -20,6 +24,8 @@
+ 
  ifdef(`distro_redhat',`
  /etc/sysconfig/network-scripts/.*resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
- /etc/sysconfig/networking/profiles/.*/resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
-+/etc/sysconfig/networking/profiles/.*/hosts -- gen_context(system_u:object_r:net_conf_t,s0)
+-/etc/sysconfig/networking/profiles/.*/resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
++/etc/sysconfig/networking(/.*)? gen_context(system_u:object_r:net_conf_t,s0)
 +/etc/sysconfig/network-scripts(/.*)?  gen_context(system_u:object_r:net_conf_t,s0)
  ')
  
  #
-@@ -57,3 +63,5 @@
+@@ -57,3 +62,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
  ')
@@ -28288,7 +28327,7 @@
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.12/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-23 09:44:57.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -28459,7 +28498,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-23 09:44:57.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -28645,7 +28684,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-04-07 15:53:36.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-21 14:41:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-04-23 09:44:57.000000000 -0400
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -28695,7 +28734,7 @@
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.12/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.fc	2009-04-09 04:45:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -28715,7 +28754,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-15 10:11:28.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.if	2009-04-23 09:44:57.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -29211,7 +29250,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-09 04:23:28.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-23 09:44:57.000000000 -0400
 @@ -5,227 +5,6 @@
  #
  # Declarations
@@ -29443,7 +29482,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.12/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -29455,7 +29494,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-20 08:25:48.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 09:44:57.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -31389,7 +31428,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.te	2009-04-23 09:44:57.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -31475,12 +31514,12 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.12/policy/modules/system/virtual.fc
 --- nsaserefpolicy/policy/modules/system/virtual.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1 @@
 +# No application file contexts.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.12/policy/modules/system/virtual.if
 --- nsaserefpolicy/policy/modules/system/virtual.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-20 07:58:28.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.if	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,114 @@
 +## <summary>Virtual machine emulator and virtualizer</summary>
 +
@@ -31598,7 +31637,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.12/policy/modules/system/virtual.te
 --- nsaserefpolicy/policy/modules/system/virtual.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/virtual.te	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/virtual.te	2009-04-23 09:44:57.000000000 -0400
 @@ -0,0 +1,80 @@
 +
 +policy_module(virtualization, 1.1.2)
@@ -31682,7 +31721,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.12/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.fc	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.fc	2009-04-23 09:44:57.000000000 -0400
 @@ -1,32 +1,31 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -31724,7 +31763,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.12/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-23 09:44:57.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -31790,7 +31829,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-20 07:59:14.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/xen.te	2009-04-23 09:44:57.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -32062,7 +32101,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/ipc_patterns.spt serefpolicy-3.6.12/policy/support/ipc_patterns.spt
 --- nsaserefpolicy/policy/support/ipc_patterns.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.12/policy/support/ipc_patterns.spt	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/ipc_patterns.spt	2009-04-23 09:44:57.000000000 -0400
 @@ -3,12 +3,12 @@
  #
  define(`stream_connect_pattern',`
@@ -32080,7 +32119,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-23 09:44:57.000000000 -0400
 @@ -225,7 +225,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')
@@ -32106,7 +32145,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.12/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/users	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/policy/users	2009-04-23 09:44:57.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -32133,7 +32172,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.12/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/Rules.modular	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/Rules.modular	2009-04-23 09:44:57.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -32165,7 +32204,7 @@
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.12/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/support/Makefile.devel	2009-04-07 16:01:44.000000000 -0400
++++ serefpolicy-3.6.12/support/Makefile.devel	2009-04-23 09:44:57.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- selinux-policy.spec	22 Apr 2009 19:18:30 -0000	1.829
+++ selinux-policy.spec	23 Apr 2009 14:48:46 -0000	1.830
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 12%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,14 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-14
+- Allow pulseaudio to acquire_svc on session bus
+- Fix readahead labeling
+
+* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-13
+- Allow sysadm_t to run rpm directly
+- libvirt needs fowner
+
 * Wed Apr 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-12
 - Allow sshd to read var_lib symlinks for freenx
 



From ajax at fedoraproject.org  Thu Apr 23 14:55:36 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 23 Apr 2009 14:55:36 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-drv-intel.spec, 1.14, 1.15
Message-ID: <20090423145536.6572570104@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32150

Modified Files:
	.cvsignore sources xorg-x11-drv-intel.spec 
Log Message:
* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 2.7.0-2
- Add intel-gpu-tools subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Apr 2009 17:52:07 -0000	1.4
+++ .cvsignore	23 Apr 2009 14:55:06 -0000	1.5
@@ -1 +1,2 @@
 xf86-video-intel-2.7.0.tar.bz2
+intel-gpu-tools-20090423.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Apr 2009 17:52:07 -0000	1.4
+++ sources	23 Apr 2009 14:55:06 -0000	1.5
@@ -1 +1,2 @@
 5832172ac69b9a066a202e1578a5d3c8  xf86-video-intel-2.7.0.tar.bz2
+91ab3b7e5747480f5a85ab57b8541f68  intel-gpu-tools-20090423.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-intel.spec	21 Apr 2009 17:34:40 -0000	1.14
+++ xorg-x11-drv-intel.spec	23 Apr 2009 14:55:06 -0000	1.15
@@ -2,19 +2,21 @@
 %define legacyver   2.6.0-8
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define gputoolsdate 20090423
 
-Summary:   Xorg X11 Intel video driver(s)
+Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.7.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-
-Source2:   intel.xinf
+Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
+Source1:    make-intel-gpu-tools-snapshot.sh
+Source2:    intel.xinf
+Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
@@ -56,14 +58,21 @@
 %description devel
 X.Org X11 Intel video driver XvMC development package.
 
+%package -n intel-gpu-tools
+Summary:    Debugging tools for Intel graphics chips
+Group:	    Development/Tools
+
+%description -n intel-gpu-tools
+Debugging tools for Intel graphics chips
+
 %prep
-%setup -q -n xf86-video-intel-%{version}
+%setup -q -n xf86-video-intel-%{version} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
 %patch10 -p1 -b .kms-props
 %patch20 -p1 -b .get-crtc
 # notyet.  we don't handle switching in and out of tiled front buffer
-# correctly yet, so let's not have peopel stumble into it more than
+# correctly yet, so let's not have people stumble into it more than
 # they have to.
 #patch21 -p1 -b .jx
 
@@ -73,6 +82,12 @@
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
+pushd ../intel-gpu-tools-%{gputoolsdate}
+autoreconf -v --install
+%configure
+make
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,6 +95,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
+pushd ../intel-gpu-tools-%{gputoolsdate}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
@@ -103,7 +122,14 @@
 %{_libdir}/libI810XvMC.so
 %{_libdir}/libIntelXvMC.so
 
+%files -n intel-gpu-tools
+%defattr(-,root,root,-)
+%{_bindir}/intel_*
+
 %changelog
+* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 2.7.0-2
+- Add intel-gpu-tools subpackage
+
 * Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.7.0-1
 - intel 2.7.0
 



From jreznik at fedoraproject.org  Thu Apr 23 14:58:12 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 23 Apr 2009 14:58:12 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.6,1.7
Message-ID: <20090423145812.D07F670104@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv772

Modified Files:
	leonidas-kde-theme.spec 
Log Message:
* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.4-1
- default face (original by K. Peirce, CC-BY)



Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- leonidas-kde-theme.spec	23 Apr 2009 14:13:29 -0000	1.6
+++ leonidas-kde-theme.spec	23 Apr 2009 14:57:42 -0000	1.7
@@ -1,10 +1,10 @@
 Name:		leonidas-kde-theme
-Version:	0.2.3
+Version:	0.2.4
 Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
-License:	GPLv2+ and CC-BY-SA
+License:	GPLv2+ and CC-BY-SA and CC-BY
 
 # We are upstream for this package
 URL:		https://fedorahosted.org/fedora-kde-artwork/
@@ -103,10 +103,13 @@
 %{_kde4_appsdir}/kdm/themes/leonidas/
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/
 %{_kde4_datadir}/wallpapers/leonidas/
-#%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png
+%{_kde4_appsdir}/kdm/pics/users/default_leonidas.png
 
 
 %changelog
+* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.4-1
+- default face (original by K. Peirce, CC-BY)
+
 * Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.3-1
 - new KDM theme design
 



From ajax at fedoraproject.org  Thu Apr 23 15:02:27 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 23 Apr 2009 15:02:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-11 make-intel-gpu-tools-snapshot.sh, NONE,
	1.1
Message-ID: <20090423150227.9E78570104@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1247

Added Files:
	make-intel-gpu-tools-snapshot.sh 
Log Message:
* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 2.7.0-2
- Add intel-gpu-tools subpackage



--- NEW FILE make-intel-gpu-tools-snapshot.sh ---
#!/bin/sh

# Usage: ./make-git-snapshot.sh [COMMIT]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local mesa repo to reduce clone time.

DIRNAME=intel-gpu-tools-$( date +%Y%m%d )

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
	git://git.freedesktop.org/git/xorg/app/intel-gpu-tools $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
	| bzip2 > $DIRNAME.tar.bz2

# rm -rf $DIRNAME



From kwizart at fedoraproject.org  Thu Apr 23 15:03:36 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 23 Apr 2009 15:03:36 +0000 (UTC)
Subject: rpms/opencv/devel opencv-1.0.0-gcc44.patch, NONE, 1.1 opencv.spec, 
	1.26, 1.27
Message-ID: <20090423150336.1C59770104@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1337

Modified Files:
	opencv.spec 
Added Files:
	opencv-1.0.0-gcc44.patch 
Log Message:
Sync devel from F-11


opencv-1.0.0-gcc44.patch:

--- NEW FILE opencv-1.0.0-gcc44.patch ---
diff -up opencv-1.0.0/cxcore/include/cxmisc.h.gcc44 opencv-1.0.0/cxcore/include/cxmisc.h
--- opencv-1.0.0/cxcore/include/cxmisc.h.gcc44	2006-05-04 17:55:17.000000000 +0200
+++ opencv-1.0.0/cxcore/include/cxmisc.h	2009-04-22 12:42:49.000000000 +0200
@@ -130,7 +130,7 @@
     #include <alloca.h>
 #elif defined HAVE_ALLOCA
     #include <stdlib.h>
-#elif
+#else
     #error
 #endif
 


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- opencv.spec	26 Feb 2009 08:27:49 -0000	1.26
+++ opencv.spec	23 Apr 2009 15:03:05 -0000	1.27
@@ -1,11 +1,9 @@
-%define with_ffmpeg 0
-
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           opencv
 Version:        1.0.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -18,14 +16,19 @@
 Patch1:		opencv-1.0.0-configure.in.diff
 Patch2:         opencv-1.0.0-autotools.diff
 Patch3:         opencv-1.0.0-pkgconfig.diff
+Patch4:         opencv-1.0.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  jasper-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libtool
 BuildRequires:  swig >= 1.3.24, zlib-devel, pkgconfig
-BuildRequires:  python python-devel
-%if %{with_ffmpeg}
-BuildRequires:  ffmpeg-devel >= 0.4.9
-%endif
+BuildRequires:  python-devel
+%{?_with_ffmpeg:BuildRequires:  ffmpeg-devel >= 0.4.9}
+
 
 %description
 OpenCV means Intel?? Open Source Computer Vision Library. It is a collection of
@@ -60,6 +63,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .gcc44
 %{__sed} -i 's/\r//' interfaces/swig/python/*.py \
                      samples/python/*.py
 %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
@@ -74,7 +78,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
       $RPM_BUILD_ROOT%{python_sitearch}/opencv/*.la \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \
@@ -83,7 +87,7 @@
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/facedetect.cmd \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gcc \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gen
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
+install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
 
 
 %check
@@ -98,9 +102,6 @@
 %postun -p /sbin/ldconfig
 
 
-%post python -p /sbin/ldconfig
-%postun python -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -130,6 +131,12 @@
 
 
 %changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 1.0.0-14
+- Fix for gcc44
+- Enable BR jasper-devel
+- Disable ldconfig run on python modules (uneeded)
+- Prevent timestamp change on install
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jreznik at fedoraproject.org  Thu Apr 23 15:15:05 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 23 Apr 2009 15:15:05 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.4,
	1.5 leonidas-kde-theme.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090423151505.5988070104@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2650

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.4-2
- tarball respin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Apr 2009 14:13:29 -0000	1.4
+++ .cvsignore	23 Apr 2009 15:14:33 -0000	1.5
@@ -1 +1 @@
-leonidas-kde-theme-0.2.3.tar.bz2
+leonidas-kde-theme-0.2.4.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- leonidas-kde-theme.spec	23 Apr 2009 14:57:42 -0000	1.7
+++ leonidas-kde-theme.spec	23 Apr 2009 15:14:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		leonidas-kde-theme
 Version:	0.2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.4-2
+- tarball respin
+
 * Thu Apr 23 2009 Jaroslav Reznik <jreznik at redhat.com> 0.2.4-1
 - default face (original by K. Peirce, CC-BY)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Apr 2009 14:13:29 -0000	1.4
+++ sources	23 Apr 2009 15:14:33 -0000	1.5
@@ -1 +1 @@
-2ef82e803893494e990fd52d538ebd53  leonidas-kde-theme-0.2.3.tar.bz2
+9411f7fac495cb961cbaa9e55ba16400  leonidas-kde-theme-0.2.4.tar.bz2



From mgrepl at fedoraproject.org  Thu Apr 23 15:44:07 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 23 Apr 2009 15:44:07 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.163,1.164
Message-ID: <20090423154407.3950C70104@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5699

Modified Files:
	policy-20080710.patch 
Log Message:
- Allow nfs to share removable media



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- policy-20080710.patch	16 Apr 2009 09:49:20 -0000	1.163
+++ policy-20080710.patch	23 Apr 2009 15:43:34 -0000	1.164
@@ -18576,8 +18576,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.5.13/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/services/lircd.te	2009-04-07 09:19:24.000000000 +0200
-@@ -0,0 +1,64 @@
++++ serefpolicy-3.5.13/policy/modules/services/lircd.te	2009-04-17 10:05:39.000000000 +0200
+@@ -0,0 +1,69 @@
 +policy_module(lircd,1.0.0)
 +
 +########################################
@@ -18628,6 +18628,8 @@
 +dev_filetrans_lirc(lircd_t)
 +dev_rw_lirc(lircd_t)
 +
++dev_read_generic_usb_dev(lircd_t)
++
 +files_read_etc_files(lircd_t)
 +
 +files_list_var(lircd_t)
@@ -18638,6 +18640,9 @@
 +
 +libs_use_ld_so(lircd_t)
 +libs_use_shared_libs(lircd_t)
++
++fs_list_inotifyfs(lircd_t)
++
 +miscfiles_read_localization(lircd_t)
 +
 +permissive lircd_t;
@@ -26030,8 +26035,17 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.13/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/rpcbind.te	2009-02-10 15:07:15.000000000 +0100
-@@ -60,6 +60,7 @@
++++ serefpolicy-3.5.13/policy/modules/services/rpcbind.te	2009-04-23 09:19:32.000000000 +0200
+@@ -31,6 +31,8 @@
+ allow rpcbind_t self:udp_socket create_socket_perms;
+ allow rpcbind_t self:tcp_socket create_stream_socket_perms;
+ 
++fs_list_inotifyfs(rpcbind_t)
++
+ manage_files_pattern(rpcbind_t, rpcbind_var_run_t, rpcbind_var_run_t)
+ manage_sock_files_pattern(rpcbind_t, rpcbind_var_run_t, rpcbind_var_run_t)
+ files_pid_filetrans(rpcbind_t, rpcbind_var_run_t, { file sock_file })
+@@ -60,6 +62,7 @@
  domain_use_interactive_fds(rpcbind_t)
  
  files_read_etc_files(rpcbind_t)
@@ -26117,7 +26131,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.13/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/rpc.te	2009-02-10 15:07:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/rpc.te	2009-04-23 09:19:05.000000000 +0200
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -26127,7 +26141,7 @@
  
  rpc_domain_template(gssd)
  
-@@ -68,6 +68,7 @@
+@@ -68,11 +68,13 @@
  # for rpc.rquotad
  kernel_read_sysctl(rpcd_t)  
  kernel_rw_fs_sysctls(rpcd_t)
@@ -26135,7 +26149,13 @@
  
  corecmd_exec_bin(rpcd_t)
  
-@@ -101,6 +102,7 @@
+ files_manage_mounttab(rpcd_t)
+ 
++fs_list_inotifyfs(rpcd_t)
+ fs_list_rpc(rpcd_t)
+ fs_read_rpc_files(rpcd_t)
+ fs_read_rpc_symlinks(rpcd_t)
+@@ -101,6 +103,7 @@
  # for /proc/fs/nfs/exports - should we have a new type?
  kernel_read_system_state(nfsd_t) 
  kernel_read_network_state(nfsd_t) 
@@ -26143,7 +26163,23 @@
  
  corenet_tcp_bind_all_rpc_ports(nfsd_t)
  corenet_udp_bind_all_rpc_ports(nfsd_t)
-@@ -133,13 +135,22 @@
+@@ -116,6 +119,7 @@
+ # cjp: this should really have its own type
+ files_manage_mounttab(rpcd_t)
+ 
++fs_list_inotifyfs(nfsd_t)
+ fs_mount_nfsd_fs(nfsd_t) 
+ fs_search_nfsd_fs(nfsd_t) 
+ fs_getattr_all_fs(nfsd_t) 
+@@ -123,6 +127,7 @@
+ fs_rw_nfsd_fs(nfsd_t) 
+ 
+ storage_dontaudit_read_fixed_disk(nfsd_t)
++storage_raw_read_removable_device(nfsd_t)
+ 
+ # Read access to public_content_t and public_content_rw_t
+ miscfiles_read_public_files(nfsd_t)
+@@ -133,13 +138,22 @@
  ') 
  
  tunable_policy(`nfs_export_all_rw',`
@@ -26167,7 +26203,15 @@
  ')
  
  ########################################
-@@ -170,9 +181,14 @@
+@@ -162,6 +176,7 @@
+ 
+ corecmd_exec_bin(gssd_t)
+ 
++fs_list_inotifyfs(gssd_t)
+ fs_list_rpc(gssd_t) 
+ fs_read_rpc_sockets(gssd_t) 
+ fs_read_rpc_files(gssd_t) 
+@@ -170,9 +185,14 @@
  files_read_usr_symlinks(gssd_t) 
  
  auth_use_nsswitch(gssd_t)
@@ -26182,7 +26226,7 @@
  tunable_policy(`allow_gssd_read_tmp',`
  	userdom_list_unpriv_users_tmp(gssd_t) 
  	userdom_read_unpriv_users_tmp_files(gssd_t) 
-@@ -180,8 +196,7 @@
+@@ -180,8 +200,7 @@
  ')
  
  optional_policy(`
@@ -29023,7 +29067,7 @@
  /etc/ssh/ssh_host_key 		--	gen_context(system_u:object_r:sshd_key_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.13/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/ssh.if	2009-03-20 09:28:24.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/ssh.if	2009-04-23 09:21:24.000000000 +0200
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -29243,7 +29287,15 @@
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -478,7 +484,12 @@
+@@ -462,6 +468,7 @@
+ 	# Access key files
+ 	allow $1_t sshd_key_t:file { getattr read };
+ 
++	kernel_read_network_state($1_t)
+ 	kernel_read_kernel_sysctls($1_t)
+ 
+ 	corenet_all_recvfrom_unlabeled($1_t)
+@@ -478,7 +485,12 @@
  	corenet_udp_bind_all_nodes($1_t)
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
@@ -29256,7 +29308,7 @@
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
-@@ -495,6 +506,8 @@
+@@ -495,6 +507,8 @@
  	files_read_etc_files($1_t)
  	files_read_etc_runtime_files($1_t)
  
@@ -29265,7 +29317,7 @@
  	libs_use_ld_so($1_t)
  	libs_use_shared_libs($1_t)
  
-@@ -506,9 +519,14 @@
+@@ -506,9 +520,14 @@
  
  	userdom_dontaudit_relabelfrom_unpriv_users_ptys($1_t)
  	userdom_search_all_users_home_dirs($1_t)
@@ -29280,7 +29332,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
-@@ -517,11 +535,7 @@
+@@ -517,11 +536,7 @@
  
  	optional_policy(`
  		kerberos_use($1_t)
@@ -29293,7 +29345,7 @@
  	')
  
  	optional_policy(`
-@@ -605,6 +619,25 @@
+@@ -605,6 +620,25 @@
  	allow $1 sshd_t:tcp_socket rw_stream_socket_perms;
  ')
  
@@ -29319,7 +29371,7 @@
  ########################################
  ## <summary>
  ##	Do not audit attempts to read and write
-@@ -710,3 +743,22 @@
+@@ -710,3 +744,22 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')



From hadess at fedoraproject.org  Thu Apr 23 15:50:27 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 15:50:27 +0000 (UTC)
Subject: rpms/totem/F-10 totem.spec,1.207,1.208
Message-ID: <20090423155027.C95EA70104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6463

Modified Files:
	totem.spec 
Log Message:
* Thu Apr 23 2009 Bastien Nocera <bnocera at redhat.com> 2.24.3-3
- Add missing gnome-python2-gconf req (#483265)


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-10/totem.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- totem.spec	17 Dec 2008 15:17:18 -0000	1.207
+++ totem.spec	23 Apr 2009 15:49:57 -0000	1.208
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.24.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -134,7 +134,7 @@
 %package youtube
 Summary: YouTube plugin for Totem
 Group: Applications/Multimedia
-Requires: python-gdata
+Requires: python-gdata gnome-python2-gconf
 Requires: %{name} = %{version}-%{release}
 
 %description youtube
@@ -429,6 +429,9 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Bastien Nocera <bnocera at redhat.com> 2.24.3-3
+- Add missing gnome-python2-gconf req (#483265)
+
 * Wed Nov 12 2008 Christopher Aillon <caillon at redhat.com> - 2.24.3-2
 - Rebuild against newer gecko
 



From s4504kr at fedoraproject.org  Thu Apr 23 15:55:58 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 23 Apr 2009 15:55:58 +0000 (UTC)
Subject: rpms/highlight/F-11 highlight.spec,1.42,1.43
Message-ID: <20090423155558.227D770104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7124

Modified Files:
	highlight.spec 
Log Message:
Adding GUI subpackage


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/highlight.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- highlight.spec	20 Apr 2009 17:24:45 -0000	1.42
+++ highlight.spec	23 Apr 2009 15:55:27 -0000	1.43
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -10,7 +10,8 @@
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
 
-BuildRequires:	wxGTK-devel
+BuildRequires:	qt-devel >= 4.4
+BuildRequires:	desktop-file-utils
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -22,6 +23,13 @@
 The utility offers indentation and reformatting capabilities.
 It is easily possible to create new language definitions and colour themes.
 
+%package gui
+Summary:	GUI for the hihghlight source code formatter
+Requires:	%{name} = %{version}-%{release}
+
+%description gui
+A Qt-based GUI for the highlight source code formatter source.
+
 %prep
 %setup -q
 %patch1 -p1 -b .mak
@@ -42,15 +50,25 @@
 %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
 chmod +x %{__perl_requires}
 
-
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
+make gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+make install-gui DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   highlight.desktop
+
+
 # Packaging this example causes lots of incorrect perl provides and 
 # requires. Since it isn't going to work out of the box, I'm nuking it.
 rm -rf examples/plugins/movabletype
@@ -60,7 +78,6 @@
 
 %files
 %defattr(-,root,root,-)
-
 %{_bindir}/highlight
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
@@ -69,9 +86,15 @@
 
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/highlight-gui
+%{_datadir}/applications/highlight.desktop
+%{_datadir}/pixmaps/highlight.xpm
+
 %changelog
-* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-2
-- bump release
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-3
+- Adding GUI subpackage
 
 * Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-1
 - New upstream release



From hadess at fedoraproject.org  Thu Apr 23 16:02:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 16:02:52 +0000 (UTC)
Subject: rpms/totem/F-10 totem.spec,1.208,1.209
Message-ID: <20090423160252.F0A0D70104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8690

Modified Files:
	totem.spec 
Log Message:
Fix missing BR


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-10/totem.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- totem.spec	23 Apr 2009 15:49:57 -0000	1.208
+++ totem.spec	23 Apr 2009 16:02:22 -0000	1.209
@@ -53,7 +53,7 @@
 BuildRequires: python-devel gnome-python2-devel pygtk2-devel
 BuildRequires: tracker-devel
 BuildRequires: libepc-devel
-BuildRequires: totem-pl-parser-devel
+BuildRequires: totem-pl-parser-devel evolution-data-server-devel
 
 Obsoletes: nautilus-media
 



From tmraz at fedoraproject.org  Thu Apr 23 16:03:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 23 Apr 2009 16:03:02 +0000 (UTC)
Subject: rpms/ipsec-tools/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20090423160302.73B8370104@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8731

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.2-1
- Update to a new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 Jul 2008 12:31:24 -0000	1.13
+++ .cvsignore	23 Apr 2009 16:02:32 -0000	1.14
@@ -1 +1 @@
-ipsec-tools-0.7.1.tar.bz2
+ipsec-tools-0.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Jul 2008 12:31:24 -0000	1.13
+++ sources	23 Apr 2009 16:02:32 -0000	1.14
@@ -1 +1 @@
-30b196a2829556182c39aed9f83c0bbf  ipsec-tools-0.7.1.tar.bz2
+72861f005746ee27984b2ee715ecc629  ipsec-tools-0.7.2.tar.bz2



From pkgdb at fedoraproject.org  Thu Apr 23 16:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:19:59 +0000
Subject: [pkgdb] globus-gsi-openssl-error was added for ellert
Message-ID: <20090423161959.8383010F88A@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gsi-openssl-error with summary Globus Toolkit - Globus OpenSSL Error Handling
kevin has approved Package globus-gsi-openssl-error
kevin has added a Fedora devel branch for globus-gsi-openssl-error with an owner of ellert
kevin has approved globus-gsi-openssl-error in Fedora devel
kevin has approved Package globus-gsi-openssl-error
kevin has set commit to Approved for provenpackager on globus-gsi-openssl-error (Fedora devel)
kevin has set build to Approved for provenpackager on globus-gsi-openssl-error (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-gsi-openssl-error (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-openssl-error



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:04 +0000
Subject: [pkgdb] globus-gsi-openssl-error (Fedora, 9) updated by kevin
Message-ID: <20090423162005.09D5D10F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-gsi-openssl-error
kevin has set commit to Approved for provenpackager on globus-gsi-openssl-error (Fedora 9)
kevin has set build to Approved for provenpackager on globus-gsi-openssl-error (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-gsi-openssl-error (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-openssl-error



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:04 +0000
Subject: [pkgdb] globus-gsi-openssl-error (Fedora, 10) updated by kevin
Message-ID: <20090423162005.0176610F886@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-gsi-openssl-error
kevin has set commit to Approved for provenpackager on globus-gsi-openssl-error (Fedora 10)
kevin has set build to Approved for provenpackager on globus-gsi-openssl-error (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-gsi-openssl-error (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-openssl-error



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:04 +0000
Subject: [pkgdb] globus-gsi-openssl-error (Fedora, 11) updated by kevin
Message-ID: <20090423162005.1A49010F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gsi-openssl-error
kevin has set commit to Approved for provenpackager on globus-gsi-openssl-error (Fedora 11)
kevin has set build to Approved for provenpackager on globus-gsi-openssl-error (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-gsi-openssl-error (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-openssl-error



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:04 +0000
Subject: [pkgdb] globus-gsi-openssl-error (Fedora EPEL, 5) updated by kevin
Message-ID: <20090423162005.24D6610F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gsi-openssl-error
kevin has set commit to Approved for provenpackager on globus-gsi-openssl-error (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-gsi-openssl-error (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-gsi-openssl-error (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-openssl-error



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:04 +0000
Subject: [pkgdb] globus-gsi-openssl-error (Fedora EPEL, 4) updated by kevin
Message-ID: <20090423162005.2F89D10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gsi-openssl-error
kevin has set commit to Approved for provenpackager on globus-gsi-openssl-error (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-gsi-openssl-error (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-gsi-openssl-error (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-openssl-error



From kevin at fedoraproject.org  Thu Apr 23 16:20:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:20:15 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error - New directory
Message-ID: <20090423162015.431C070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10753/rpms/globus-gsi-openssl-error

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-openssl-error added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:20:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:20:15 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/devel - New directory
Message-ID: <20090423162015.79BF770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10753/rpms/globus-gsi-openssl-error/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-openssl-error/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:20:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:20:24 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error Makefile,NONE,1.1
Message-ID: <20090423162024.116BD70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10753/rpms/globus-gsi-openssl-error

Added Files:
	Makefile 
Log Message:
Setup of module globus-gsi-openssl-error


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gsi-openssl-error
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:20:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:20:24 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090423162024.69A6A70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw10753/rpms/globus-gsi-openssl-error/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gsi-openssl-error


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gsi-openssl-error
# $Id: Makefile,v 1.1 2009/04/23 16:20:24 kevin Exp $
NAME := globus-gsi-openssl-error
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:48 +0000
Subject: [pkgdb] globus-gsi-proxy-ssl was added for ellert
Message-ID: <20090423162048.72D4A10F88A@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gsi-proxy-ssl with summary Globus Toolkit - Globus GSI Proxy SSL Library
kevin has approved Package globus-gsi-proxy-ssl
kevin has added a Fedora devel branch for globus-gsi-proxy-ssl with an owner of ellert
kevin has approved globus-gsi-proxy-ssl in Fedora devel
kevin has approved Package globus-gsi-proxy-ssl
kevin has set commit to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora devel)
kevin has set build to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-proxy-ssl



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:50 +0000
Subject: [pkgdb] globus-gsi-proxy-ssl (Fedora EPEL, 5) updated by kevin
Message-ID: <20090423162050.778BB10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gsi-proxy-ssl
kevin has set commit to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-proxy-ssl



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:50 +0000
Subject: [pkgdb] globus-gsi-proxy-ssl (Fedora, 10) updated by kevin
Message-ID: <20090423162050.8CCA110F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-gsi-proxy-ssl
kevin has set commit to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 10)
kevin has set build to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-proxy-ssl



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:50 +0000
Subject: [pkgdb] globus-gsi-proxy-ssl (Fedora, 9) updated by kevin
Message-ID: <20090423162050.9583310F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-gsi-proxy-ssl
kevin has set commit to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 9)
kevin has set build to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-proxy-ssl



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:50 +0000
Subject: [pkgdb] globus-gsi-proxy-ssl (Fedora EPEL, 4) updated by kevin
Message-ID: <20090423162050.A071610F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gsi-proxy-ssl
kevin has set commit to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-proxy-ssl



From pkgdb at fedoraproject.org  Thu Apr 23 16:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:20:50 +0000
Subject: [pkgdb] globus-gsi-proxy-ssl (Fedora, 11) updated by kevin
Message-ID: <20090423162050.AA6B510F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gsi-proxy-ssl
kevin has set commit to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 11)
kevin has set build to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-gsi-proxy-ssl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-proxy-ssl



From kevin at fedoraproject.org  Thu Apr 23 16:21:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:21:04 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl - New directory
Message-ID: <20090423162104.365E770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11101/rpms/globus-gsi-proxy-ssl

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-proxy-ssl added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:21:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:21:04 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/devel - New directory
Message-ID: <20090423162104.7C89A70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11101/rpms/globus-gsi-proxy-ssl/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:21:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:21:15 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl Makefile,NONE,1.1
Message-ID: <20090423162115.032A570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11101/rpms/globus-gsi-proxy-ssl

Added Files:
	Makefile 
Log Message:
Setup of module globus-gsi-proxy-ssl


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gsi-proxy-ssl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:21:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:21:15 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162115.3FA6170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11101/rpms/globus-gsi-proxy-ssl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gsi-proxy-ssl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gsi-proxy-ssl
# $Id: Makefile,v 1.1 2009/04/23 16:21:15 kevin Exp $
NAME := globus-gsi-proxy-ssl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:21:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:21:39 +0000
Subject: [pkgdb] python-zope-testing was added for konradm
Message-ID: <20090423162139.408CE10F896@bastion2.fedora.phx.redhat.com>

kevin has added Package python-zope-testing with summary Zope Testing Framework
kevin has approved Package python-zope-testing
kevin has added a Fedora devel branch for python-zope-testing with an owner of konradm
kevin has approved python-zope-testing in Fedora devel
kevin has approved Package python-zope-testing
kevin has set commit to Approved for provenpackager on python-zope-testing (Fedora devel)
kevin has set build to Approved for provenpackager on python-zope-testing (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-zope-testing (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-zope-testing



From kevin at fedoraproject.org  Thu Apr 23 16:21:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:21:50 +0000 (UTC)
Subject: rpms/python-zope-testing - New directory
Message-ID: <20090423162150.249DE70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zope-testing
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg11490/rpms/python-zope-testing

Log Message:
Directory /cvs/pkgs/rpms/python-zope-testing added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:21:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:21:50 +0000 (UTC)
Subject: rpms/python-zope-testing/devel - New directory
Message-ID: <20090423162150.67A8170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zope-testing/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg11490/rpms/python-zope-testing/devel

Log Message:
Directory /cvs/pkgs/rpms/python-zope-testing/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 16:21:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:21:40 +0000
Subject: [pkgdb] python-zope-testing (Fedora, 11) updated by kevin
Message-ID: <20090423162140.7CB1210F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-zope-testing
kevin has set commit to Approved for provenpackager on python-zope-testing (Fedora 11)
kevin has set build to Approved for provenpackager on python-zope-testing (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-zope-testing (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-zope-testing



From kevin at fedoraproject.org  Thu Apr 23 16:22:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:22:00 +0000 (UTC)
Subject: rpms/python-zope-testing Makefile,NONE,1.1
Message-ID: <20090423162200.ED90070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zope-testing
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg11490/rpms/python-zope-testing

Added Files:
	Makefile 
Log Message:
Setup of module python-zope-testing


--- NEW FILE Makefile ---
# Top level Makefile for module python-zope-testing
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:22:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:22:01 +0000 (UTC)
Subject: rpms/python-zope-testing/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162201.343DF70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zope-testing/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg11490/rpms/python-zope-testing/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-zope-testing


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-zope-testing
# $Id: Makefile,v 1.1 2009/04/23 16:22:01 kevin Exp $
NAME := python-zope-testing
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:22:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:22:17 +0000
Subject: [pkgdb] python-Zconfig was added for konradm
Message-ID: <20090423162217.A212810F885@bastion2.fedora.phx.redhat.com>

kevin has added Package python-Zconfig with summary Structured Configuration Library
kevin has approved Package python-Zconfig
kevin has added a Fedora devel branch for python-Zconfig with an owner of konradm
kevin has approved python-Zconfig in Fedora devel
kevin has approved Package python-Zconfig
kevin has set commit to Approved for provenpackager on python-Zconfig (Fedora devel)
kevin has set build to Approved for provenpackager on python-Zconfig (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-Zconfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-Zconfig



From pkgdb at fedoraproject.org  Thu Apr 23 16:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:22:21 +0000
Subject: [pkgdb] python-Zconfig (Fedora, 11) updated by kevin
Message-ID: <20090423162221.6A59610F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-Zconfig
kevin has set commit to Approved for provenpackager on python-Zconfig (Fedora 11)
kevin has set build to Approved for provenpackager on python-Zconfig (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-Zconfig (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-Zconfig



From pkgdb at fedoraproject.org  Thu Apr 23 16:22:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:22:33 +0000
Subject: [pkgdb] python-ZConfig was added for konradm
Message-ID: <20090423162233.4357810F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package python-ZConfig with summary Structured Configuration Library
kevin has approved Package python-ZConfig
kevin has added a Fedora devel branch for python-ZConfig with an owner of konradm
kevin has approved python-ZConfig in Fedora devel
kevin has approved Package python-ZConfig
kevin has set commit to Approved for provenpackager on python-ZConfig (Fedora devel)
kevin has set build to Approved for provenpackager on python-ZConfig (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-ZConfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ZConfig



From pkgdb at fedoraproject.org  Thu Apr 23 16:22:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:22:37 +0000
Subject: [pkgdb] python-ZConfig (Fedora, 11) updated by kevin
Message-ID: <20090423162237.6FD1110F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-ZConfig
kevin has set commit to Approved for provenpackager on python-ZConfig (Fedora 11)
kevin has set build to Approved for provenpackager on python-ZConfig (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-ZConfig (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ZConfig



From kevin at fedoraproject.org  Thu Apr 23 16:22:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:22:49 +0000 (UTC)
Subject: rpms/python-ZConfig - New directory
Message-ID: <20090423162249.2D76970104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ZConfig
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11719/rpms/python-ZConfig

Log Message:
Directory /cvs/pkgs/rpms/python-ZConfig added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:22:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:22:49 +0000 (UTC)
Subject: rpms/python-ZConfig/devel - New directory
Message-ID: <20090423162249.78CAF70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ZConfig/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11719/rpms/python-ZConfig/devel

Log Message:
Directory /cvs/pkgs/rpms/python-ZConfig/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:23:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:23:01 +0000 (UTC)
Subject: rpms/python-ZConfig/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162301.C089670107@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ZConfig/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11719/rpms/python-ZConfig/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-ZConfig


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-ZConfig
# $Id: Makefile,v 1.1 2009/04/23 16:23:01 kevin Exp $
NAME := python-ZConfig
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 23 16:23:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:23:01 +0000 (UTC)
Subject: rpms/python-ZConfig Makefile,NONE,1.1
Message-ID: <20090423162301.84F2070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ZConfig
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ11719/rpms/python-ZConfig

Added Files:
	Makefile 
Log Message:
Setup of module python-ZConfig


--- NEW FILE Makefile ---
# Top level Makefile for module python-ZConfig
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 23 16:24:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:24:17 +0000
Subject: [pkgdb] globus-usage was added for ellert
Message-ID: <20090423162417.EEEA510F885@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-usage with summary Globus Toolkit - Usage Library
kevin has approved Package globus-usage
kevin has added a Fedora devel branch for globus-usage with an owner of ellert
kevin has approved globus-usage in Fedora devel
kevin has approved Package globus-usage
kevin has set commit to Approved for provenpackager on globus-usage (Fedora devel)
kevin has set build to Approved for provenpackager on globus-usage (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-usage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-usage



From pkgdb at fedoraproject.org  Thu Apr 23 16:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:24:20 +0000
Subject: [pkgdb] globus-usage (Fedora, 10) updated by kevin
Message-ID: <20090423162420.5BD4F10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-usage
kevin has set commit to Approved for provenpackager on globus-usage (Fedora 10)
kevin has set build to Approved for provenpackager on globus-usage (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-usage (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-usage



From pkgdb at fedoraproject.org  Thu Apr 23 16:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:24:20 +0000
Subject: [pkgdb] globus-usage (Fedora EPEL, 4) updated by kevin
Message-ID: <20090423162420.6702C10F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-usage
kevin has set commit to Approved for provenpackager on globus-usage (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-usage (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-usage (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-usage



From pkgdb at fedoraproject.org  Thu Apr 23 16:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:24:20 +0000
Subject: [pkgdb] globus-usage (Fedora EPEL, 5) updated by kevin
Message-ID: <20090423162420.626AA10F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-usage
kevin has set commit to Approved for provenpackager on globus-usage (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-usage (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-usage (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-usage



From pkgdb at fedoraproject.org  Thu Apr 23 16:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:24:20 +0000
Subject: [pkgdb] globus-usage (Fedora, 9) updated by kevin
Message-ID: <20090423162420.7DB5610F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-usage
kevin has set commit to Approved for provenpackager on globus-usage (Fedora 9)
kevin has set build to Approved for provenpackager on globus-usage (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-usage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-usage



From kevin at fedoraproject.org  Thu Apr 23 16:24:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:24:31 +0000 (UTC)
Subject: rpms/globus-usage - New directory
Message-ID: <20090423162431.3BA2370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-usage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn11980/rpms/globus-usage

Log Message:
Directory /cvs/pkgs/rpms/globus-usage added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:24:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:24:31 +0000 (UTC)
Subject: rpms/globus-usage/devel - New directory
Message-ID: <20090423162431.796E770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-usage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn11980/rpms/globus-usage/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-usage/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:24:41 +0000 (UTC)
Subject: rpms/globus-usage Makefile,NONE,1.1
Message-ID: <20090423162441.C195870104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-usage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn11980/rpms/globus-usage

Added Files:
	Makefile 
Log Message:
Setup of module globus-usage


--- NEW FILE Makefile ---
# Top level Makefile for module globus-usage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 23 16:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:24:20 +0000
Subject: [pkgdb] globus-usage (Fedora, 11) updated by kevin
Message-ID: <20090423162420.7249C10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-usage
kevin has set commit to Approved for provenpackager on globus-usage (Fedora 11)
kevin has set build to Approved for provenpackager on globus-usage (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-usage (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-usage



From kevin at fedoraproject.org  Thu Apr 23 16:24:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:24:42 +0000 (UTC)
Subject: rpms/globus-usage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162442.087AC70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-usage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn11980/rpms/globus-usage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-usage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-usage
# $Id: Makefile,v 1.1 2009/04/23 16:24:41 kevin Exp $
NAME := globus-usage
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:25:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:25:11 +0000
Subject: [pkgdb] perl-Data-Report was added for sciurius
Message-ID: <20090423162511.1956910F878@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Data-Report with summary A flexible plugin-driven reporting framework
kevin has approved Package perl-Data-Report
kevin has added a Fedora devel branch for perl-Data-Report with an owner of sciurius
kevin has approved perl-Data-Report in Fedora devel
kevin has approved Package perl-Data-Report
kevin has set commit to Approved for provenpackager on perl-Data-Report (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Data-Report (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Data-Report (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Report



From pkgdb at fedoraproject.org  Thu Apr 23 16:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:25:12 +0000
Subject: [pkgdb] perl-Data-Report (Fedora, 10) updated by kevin
Message-ID: <20090423162512.AEE4810F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Data-Report
kevin has set commit to Approved for provenpackager on perl-Data-Report (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Data-Report (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Data-Report (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Report



From pkgdb at fedoraproject.org  Thu Apr 23 16:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:25:12 +0000
Subject: [pkgdb] perl-Data-Report (Fedora, 11) updated by kevin
Message-ID: <20090423162512.BEAEC10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Data-Report
kevin has set commit to Approved for provenpackager on perl-Data-Report (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Data-Report (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Data-Report (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Report



From kevin at fedoraproject.org  Thu Apr 23 16:25:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:25:22 +0000 (UTC)
Subject: rpms/perl-Data-Report - New directory
Message-ID: <20090423162522.403F270104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Report
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12376/rpms/perl-Data-Report

Log Message:
Directory /cvs/pkgs/rpms/perl-Data-Report added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:25:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:25:22 +0000 (UTC)
Subject: rpms/perl-Data-Report/devel - New directory
Message-ID: <20090423162522.8AFCA70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Report/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12376/rpms/perl-Data-Report/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Data-Report/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:25:34 +0000 (UTC)
Subject: rpms/perl-Data-Report Makefile,NONE,1.1
Message-ID: <20090423162534.8381570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Report
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12376/rpms/perl-Data-Report

Added Files:
	Makefile 
Log Message:
Setup of module perl-Data-Report


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Data-Report
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:25:34 +0000 (UTC)
Subject: rpms/perl-Data-Report/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162534.D8EF370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Data-Report/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12376/rpms/perl-Data-Report/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Data-Report


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Data-Report
# $Id: Makefile,v 1.1 2009/04/23 16:25:34 kevin Exp $
NAME := perl-Data-Report
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:25:59 +0000
Subject: [pkgdb] EekBoek was added for sciurius
Message-ID: <20090423162559.BE06410F88E@bastion2.fedora.phx.redhat.com>

kevin has added Package EekBoek with summary Bookkeeping package for small and medium-size businesses
kevin has approved Package EekBoek
kevin has added a Fedora devel branch for EekBoek with an owner of sciurius
kevin has approved EekBoek in Fedora devel
kevin has approved Package EekBoek
kevin has set commit to Approved for provenpackager on EekBoek (Fedora devel)
kevin has set build to Approved for provenpackager on EekBoek (Fedora devel)
kevin has set checkout to Approved for provenpackager on EekBoek (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EekBoek



From pkgdb at fedoraproject.org  Thu Apr 23 16:26:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:26:01 +0000
Subject: [pkgdb] EekBoek (Fedora, 10) updated by kevin
Message-ID: <20090423162601.3073B10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for EekBoek
kevin has set commit to Approved for provenpackager on EekBoek (Fedora 10)
kevin has set build to Approved for provenpackager on EekBoek (Fedora 10)
kevin has set checkout to Approved for provenpackager on EekBoek (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EekBoek



From pkgdb at fedoraproject.org  Thu Apr 23 16:26:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:26:01 +0000
Subject: [pkgdb] EekBoek (Fedora, 11) updated by kevin
Message-ID: <20090423162601.3A3DC10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for EekBoek
kevin has set commit to Approved for provenpackager on EekBoek (Fedora 11)
kevin has set build to Approved for provenpackager on EekBoek (Fedora 11)
kevin has set checkout to Approved for provenpackager on EekBoek (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/EekBoek



From kevin at fedoraproject.org  Thu Apr 23 16:26:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:26:13 +0000 (UTC)
Subject: rpms/EekBoek - New directory
Message-ID: <20090423162613.2BA9E70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EekBoek
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12650/rpms/EekBoek

Log Message:
Directory /cvs/pkgs/rpms/EekBoek added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:26:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:26:13 +0000 (UTC)
Subject: rpms/EekBoek/devel - New directory
Message-ID: <20090423162613.6F71270104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EekBoek/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12650/rpms/EekBoek/devel

Log Message:
Directory /cvs/pkgs/rpms/EekBoek/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:26:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:26:23 +0000 (UTC)
Subject: rpms/EekBoek Makefile,NONE,1.1
Message-ID: <20090423162623.EE7F270104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EekBoek
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12650/rpms/EekBoek

Added Files:
	Makefile 
Log Message:
Setup of module EekBoek


--- NEW FILE Makefile ---
# Top level Makefile for module EekBoek
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:26:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:26:24 +0000 (UTC)
Subject: rpms/EekBoek/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090423162624.4692570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EekBoek/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12650/rpms/EekBoek/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module EekBoek


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: EekBoek
# $Id: Makefile,v 1.1 2009/04/23 16:26:24 kevin Exp $
NAME := EekBoek
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:27:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:27:32 +0000
Subject: [pkgdb] perl-Text-CSV was added for sciurius
Message-ID: <20090423162732.6DD8D10F878@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Text-CSV with summary Handling data with comma-separated values
kevin has approved Package perl-Text-CSV
kevin has added a Fedora devel branch for perl-Text-CSV with an owner of sciurius
kevin has approved perl-Text-CSV in Fedora devel
kevin has approved Package perl-Text-CSV
kevin has set commit to Approved for provenpackager on perl-Text-CSV (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Text-CSV (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Text-CSV (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV



From pkgdb at fedoraproject.org  Thu Apr 23 16:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:27:34 +0000
Subject: [pkgdb] perl-Text-CSV (Fedora, 11) updated by kevin
Message-ID: <20090423162734.79B6010F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Text-CSV
kevin has set commit to Approved for provenpackager on perl-Text-CSV (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Text-CSV (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Text-CSV (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV



From pkgdb at fedoraproject.org  Thu Apr 23 16:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:27:34 +0000
Subject: [pkgdb] perl-Text-CSV (Fedora, 10) updated by kevin
Message-ID: <20090423162734.712DE10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Text-CSV
kevin has set commit to Approved for provenpackager on perl-Text-CSV (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Text-CSV (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Text-CSV (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV



From kevin at fedoraproject.org  Thu Apr 23 16:27:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:27:46 +0000 (UTC)
Subject: rpms/perl-Text-CSV - New directory
Message-ID: <20090423162746.2591370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-CSV
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso12925/rpms/perl-Text-CSV

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-CSV added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:27:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:27:46 +0000 (UTC)
Subject: rpms/perl-Text-CSV/devel - New directory
Message-ID: <20090423162746.6E3F370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-CSV/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso12925/rpms/perl-Text-CSV/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-CSV/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:27:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:27:55 +0000 (UTC)
Subject: rpms/perl-Text-CSV Makefile,NONE,1.1
Message-ID: <20090423162755.BFBF770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-CSV
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso12925/rpms/perl-Text-CSV

Added Files:
	Makefile 
Log Message:
Setup of module perl-Text-CSV


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-CSV
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:27:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:27:56 +0000 (UTC)
Subject: rpms/perl-Text-CSV/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162756.1078870104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-CSV/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso12925/rpms/perl-Text-CSV/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-CSV


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Text-CSV
# $Id: Makefile,v 1.1 2009/04/23 16:27:55 kevin Exp $
NAME := perl-Text-CSV
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:28:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:28:19 +0000
Subject: [pkgdb] gstreamer-rtsp was added for hadess
Message-ID: <20090423162819.C8B1F10F878@bastion2.fedora.phx.redhat.com>

kevin has added Package gstreamer-rtsp with summary GStreamer RTSP server library
kevin has approved Package gstreamer-rtsp
kevin has added a Fedora devel branch for gstreamer-rtsp with an owner of hadess
kevin has approved gstreamer-rtsp in Fedora devel
kevin has approved Package gstreamer-rtsp
kevin has set commit to Approved for provenpackager on gstreamer-rtsp (Fedora devel)
kevin has set build to Approved for provenpackager on gstreamer-rtsp (Fedora devel)
kevin has set checkout to Approved for provenpackager on gstreamer-rtsp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-rtsp



From pkgdb at fedoraproject.org  Thu Apr 23 16:28:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:28:21 +0000
Subject: [pkgdb] gstreamer-rtsp (Fedora, 11) updated by kevin
Message-ID: <20090423162821.7015D10F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gstreamer-rtsp
kevin has set commit to Approved for provenpackager on gstreamer-rtsp (Fedora 11)
kevin has set build to Approved for provenpackager on gstreamer-rtsp (Fedora 11)
kevin has set checkout to Approved for provenpackager on gstreamer-rtsp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-rtsp



From kevin at fedoraproject.org  Thu Apr 23 16:28:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:28:30 +0000 (UTC)
Subject: rpms/gstreamer-rtsp - New directory
Message-ID: <20090423162830.27CE270104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-rtsp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13125/rpms/gstreamer-rtsp

Log Message:
Directory /cvs/pkgs/rpms/gstreamer-rtsp added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:28:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:28:30 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/devel - New directory
Message-ID: <20090423162830.607B870104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-rtsp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13125/rpms/gstreamer-rtsp/devel

Log Message:
Directory /cvs/pkgs/rpms/gstreamer-rtsp/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:28:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:28:40 +0000 (UTC)
Subject: rpms/gstreamer-rtsp Makefile,NONE,1.1
Message-ID: <20090423162840.1623370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-rtsp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13125/rpms/gstreamer-rtsp

Added Files:
	Makefile 
Log Message:
Setup of module gstreamer-rtsp


--- NEW FILE Makefile ---
# Top level Makefile for module gstreamer-rtsp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:28:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:28:40 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423162840.5FCE370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gstreamer-rtsp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13125/rpms/gstreamer-rtsp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gstreamer-rtsp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gstreamer-rtsp
# $Id: Makefile,v 1.1 2009/04/23 16:28:40 kevin Exp $
NAME := gstreamer-rtsp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:29:14 +0000
Subject: [pkgdb] photoprint-borders was added for grof
Message-ID: <20090423162914.621AF10F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package photoprint-borders with summary Collection of frames for PhotoPrint utility
kevin has approved Package photoprint-borders
kevin has added a Fedora devel branch for photoprint-borders with an owner of grof
kevin has approved photoprint-borders in Fedora devel
kevin has approved Package photoprint-borders
kevin has set commit to Approved for provenpackager on photoprint-borders (Fedora devel)
kevin has set build to Approved for provenpackager on photoprint-borders (Fedora devel)
kevin has set checkout to Approved for provenpackager on photoprint-borders (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint-borders



From pkgdb at fedoraproject.org  Thu Apr 23 16:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:29:16 +0000
Subject: [pkgdb] photoprint-borders (Fedora, 10) updated by kevin
Message-ID: <20090423162916.6FD1610F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for photoprint-borders
kevin has set commit to Approved for provenpackager on photoprint-borders (Fedora 10)
kevin has set build to Approved for provenpackager on photoprint-borders (Fedora 10)
kevin has set checkout to Approved for provenpackager on photoprint-borders (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint-borders



From pkgdb at fedoraproject.org  Thu Apr 23 16:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:29:16 +0000
Subject: [pkgdb] photoprint-borders (Fedora, 11) updated by kevin
Message-ID: <20090423162916.7B80010F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for photoprint-borders
kevin has set commit to Approved for provenpackager on photoprint-borders (Fedora 11)
kevin has set build to Approved for provenpackager on photoprint-borders (Fedora 11)
kevin has set checkout to Approved for provenpackager on photoprint-borders (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint-borders



From pkgdb at fedoraproject.org  Thu Apr 23 16:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:29:16 +0000
Subject: [pkgdb] photoprint-borders (Fedora, 9) updated by kevin
Message-ID: <20090423162916.8368610F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for photoprint-borders
kevin has set commit to Approved for provenpackager on photoprint-borders (Fedora 9)
kevin has set build to Approved for provenpackager on photoprint-borders (Fedora 9)
kevin has set checkout to Approved for provenpackager on photoprint-borders (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/photoprint-borders



From kevin at fedoraproject.org  Thu Apr 23 16:29:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:29:29 +0000 (UTC)
Subject: rpms/photoprint-borders - New directory
Message-ID: <20090423162929.45E2E70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint-borders
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst13324/rpms/photoprint-borders

Log Message:
Directory /cvs/pkgs/rpms/photoprint-borders added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:29:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:29:29 +0000 (UTC)
Subject: rpms/photoprint-borders/devel - New directory
Message-ID: <20090423162929.9BE6370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint-borders/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst13324/rpms/photoprint-borders/devel

Log Message:
Directory /cvs/pkgs/rpms/photoprint-borders/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:29:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:29:43 +0000 (UTC)
Subject: rpms/photoprint-borders Makefile,NONE,1.1
Message-ID: <20090423162943.3180870107@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint-borders
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst13324/rpms/photoprint-borders

Added Files:
	Makefile 
Log Message:
Setup of module photoprint-borders


--- NEW FILE Makefile ---
# Top level Makefile for module photoprint-borders
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:29:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:29:43 +0000 (UTC)
Subject: rpms/photoprint-borders/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090423162943.87D6F70107@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/photoprint-borders/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst13324/rpms/photoprint-borders/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module photoprint-borders


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: photoprint-borders
# $Id: Makefile,v 1.1 2009/04/23 16:29:43 kevin Exp $
NAME := photoprint-borders
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:30:07 +0000
Subject: [pkgdb] php-geshi was added for xavierb
Message-ID: <20090423163007.1E5B110F888@bastion2.fedora.phx.redhat.com>

kevin has added Package php-geshi with summary Generic syntax highlighter
kevin has approved Package php-geshi
kevin has added a Fedora devel branch for php-geshi with an owner of xavierb
kevin has approved php-geshi in Fedora devel
kevin has approved Package php-geshi
kevin has set commit to Approved for provenpackager on php-geshi (Fedora devel)
kevin has set build to Approved for provenpackager on php-geshi (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-geshi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-geshi



From pkgdb at fedoraproject.org  Thu Apr 23 16:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:30:09 +0000
Subject: [pkgdb] php-geshi (Fedora, 9) updated by kevin
Message-ID: <20090423163009.7C31D10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-geshi
kevin has set commit to Approved for provenpackager on php-geshi (Fedora 9)
kevin has set build to Approved for provenpackager on php-geshi (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-geshi (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-geshi



From pkgdb at fedoraproject.org  Thu Apr 23 16:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:30:09 +0000
Subject: [pkgdb] php-geshi (Fedora, 10) updated by kevin
Message-ID: <20090423163009.87CE210F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-geshi
kevin has set commit to Approved for provenpackager on php-geshi (Fedora 10)
kevin has set build to Approved for provenpackager on php-geshi (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-geshi (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-geshi



From pkgdb at fedoraproject.org  Thu Apr 23 16:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:30:09 +0000
Subject: [pkgdb] php-geshi (Fedora, 11) updated by kevin
Message-ID: <20090423163009.99FF510F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-geshi
kevin has set commit to Approved for provenpackager on php-geshi (Fedora 11)
kevin has set build to Approved for provenpackager on php-geshi (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-geshi (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-geshi



From pkgdb at fedoraproject.org  Thu Apr 23 16:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:30:09 +0000
Subject: [pkgdb] php-geshi (Fedora EPEL, 5) updated by kevin
Message-ID: <20090423163009.9F19D10F8A7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-geshi
kevin has set commit to Approved for provenpackager on php-geshi (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on php-geshi (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on php-geshi (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-geshi



From kevin at fedoraproject.org  Thu Apr 23 16:30:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:30:20 +0000 (UTC)
Subject: rpms/php-geshi - New directory
Message-ID: <20090423163020.4824D70106@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-geshi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13806/rpms/php-geshi

Log Message:
Directory /cvs/pkgs/rpms/php-geshi added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:30:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:30:20 +0000 (UTC)
Subject: rpms/php-geshi/devel - New directory
Message-ID: <20090423163020.9F44370106@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-geshi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13806/rpms/php-geshi/devel

Log Message:
Directory /cvs/pkgs/rpms/php-geshi/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:30:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:30:33 +0000 (UTC)
Subject: rpms/php-geshi Makefile,NONE,1.1
Message-ID: <20090423163033.77E2670106@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-geshi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13806/rpms/php-geshi

Added Files:
	Makefile 
Log Message:
Setup of module php-geshi


--- NEW FILE Makefile ---
# Top level Makefile for module php-geshi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:30:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:30:33 +0000 (UTC)
Subject: rpms/php-geshi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423163033.CDBE370106@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-geshi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13806/rpms/php-geshi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-geshi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-geshi
# $Id: Makefile,v 1.1 2009/04/23 16:30:33 kevin Exp $
NAME := php-geshi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:31:44 +0000
Subject: [pkgdb] mediawiki-InputBox was added for guthrie
Message-ID: <20090423163144.7010D10F886@bastion2.fedora.phx.redhat.com>

kevin has added Package mediawiki-InputBox with summary An extension to enable input box tags for mediawiki pages
kevin has approved Package mediawiki-InputBox
kevin has added a Fedora devel branch for mediawiki-InputBox with an owner of guthrie
kevin has approved mediawiki-InputBox in Fedora devel
kevin has approved Package mediawiki-InputBox
kevin has set commit to Approved for provenpackager on mediawiki-InputBox (Fedora devel)
kevin has set build to Approved for provenpackager on mediawiki-InputBox (Fedora devel)
kevin has set checkout to Approved for provenpackager on mediawiki-InputBox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-InputBox



From pkgdb at fedoraproject.org  Thu Apr 23 16:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:31:46 +0000
Subject: [pkgdb] mediawiki-InputBox (Fedora, 10) updated by kevin
Message-ID: <20090423163146.B76F910F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mediawiki-InputBox
kevin has set commit to Approved for provenpackager on mediawiki-InputBox (Fedora 10)
kevin has set build to Approved for provenpackager on mediawiki-InputBox (Fedora 10)
kevin has set checkout to Approved for provenpackager on mediawiki-InputBox (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-InputBox



From pkgdb at fedoraproject.org  Thu Apr 23 16:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:31:46 +0000
Subject: [pkgdb] mediawiki-InputBox (Fedora, 11) updated by kevin
Message-ID: <20090423163146.BFF8110F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mediawiki-InputBox
kevin has set commit to Approved for provenpackager on mediawiki-InputBox (Fedora 11)
kevin has set build to Approved for provenpackager on mediawiki-InputBox (Fedora 11)
kevin has set checkout to Approved for provenpackager on mediawiki-InputBox (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-InputBox



From kevin at fedoraproject.org  Thu Apr 23 16:32:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:32:01 +0000 (UTC)
Subject: rpms/mediawiki-InputBox - New directory
Message-ID: <20090423163201.260E670104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-InputBox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14679/rpms/mediawiki-InputBox

Log Message:
Directory /cvs/pkgs/rpms/mediawiki-InputBox added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:32:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:32:11 +0000 (UTC)
Subject: rpms/mediawiki-InputBox Makefile,NONE,1.1
Message-ID: <20090423163211.ACD9470104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-InputBox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14679/rpms/mediawiki-InputBox

Added Files:
	Makefile 
Log Message:
Setup of module mediawiki-InputBox


--- NEW FILE Makefile ---
# Top level Makefile for module mediawiki-InputBox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:32:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:32:12 +0000 (UTC)
Subject: rpms/mediawiki-InputBox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090423163212.0BCA670104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-InputBox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14679/rpms/mediawiki-InputBox/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mediawiki-InputBox


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mediawiki-InputBox
# $Id: Makefile,v 1.1 2009/04/23 16:32:11 kevin Exp $
NAME := mediawiki-InputBox
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:31:46 +0000
Subject: [pkgdb] mediawiki-InputBox (Fedora, 9) updated by kevin
Message-ID: <20090423163147.18ECB10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mediawiki-InputBox
kevin has set commit to Approved for provenpackager on mediawiki-InputBox (Fedora 9)
kevin has set build to Approved for provenpackager on mediawiki-InputBox (Fedora 9)
kevin has set checkout to Approved for provenpackager on mediawiki-InputBox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-InputBox



From kevin at fedoraproject.org  Thu Apr 23 16:32:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:32:01 +0000 (UTC)
Subject: rpms/mediawiki-InputBox/devel - New directory
Message-ID: <20090423163201.6767E70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-InputBox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14679/rpms/mediawiki-InputBox/devel

Log Message:
Directory /cvs/pkgs/rpms/mediawiki-InputBox/devel added to the repository




From s4504kr at fedoraproject.org  Thu Apr 23 16:33:57 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 23 Apr 2009 16:33:57 +0000 (UTC)
Subject: rpms/pdftk/F-11 pdftk.spec, 1.16, 1.17 pdftk-1.41-stdin.patch, 1.1,
	NONE
Message-ID: <20090423163357.80D0E70104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15117

Modified Files:
	pdftk.spec 
Removed Files:
	pdftk-1.41-stdin.patch 
Log Message:
Remove stdin patch and add Req. to modified iText release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/F-11/pdftk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pdftk.spec	9 Apr 2009 18:52:02 -0000	1.16
+++ pdftk.spec	23 Apr 2009 16:33:27 -0000	1.17
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        15%{?dist}
+Release:        17%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -11,7 +11,6 @@
 Patch0:         pdftk-use-internal-itext.patch
 Patch1:         pdftk-1.41-make.patch
 Patch2:         pdftk-1.41-gcc44.patch
-Patch3:		pdftk-1.41-stdin.patch
 # Solves ".afm files not found" error. RHBZ#494785:
 Patch4:		pdftk-classpath.patch
 Group:          Applications/Publishing
@@ -20,9 +19,10 @@
 BuildRequires:  libgcj-devel
 BuildRequires:  java-devel >= 1:1.6.0
 
-# Requires itext-2.1.4-3
 BuildRequires:  itext >= %{itextvers}
 
+Requires:	itext >= 2.1.5-2
+
 %description
 If PDF is electronic paper, then pdftk is an electronic staple-remover,
 hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple
@@ -47,7 +47,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .org
 %patch4 -p0 -b .classpath
 
 rm -rf java_libs
@@ -90,6 +89,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-17
+- Bump release number
+
+* Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-16
+- Remove stdin patch, add Req. to modified iText release (BZ #495574)
+
 * Wed Apr  8 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 1.41-15
 - Patch ".afm files not found" issue (#494785)
 


--- pdftk-1.41-stdin.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:34:19 +0000
Subject: [pkgdb] perl-XXX was added for mmaslano
Message-ID: <20090423163419.930BA10F886@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-XXX with summary See Your Data in the Nude
kevin has approved Package perl-XXX
kevin has added a Fedora devel branch for perl-XXX with an owner of mmaslano
kevin has approved perl-XXX in Fedora devel
kevin has approved Package perl-XXX
kevin has set commit to Approved for provenpackager on perl-XXX (Fedora devel)
kevin has set build to Approved for provenpackager on perl-XXX (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-XXX (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-XXX



From pkgdb at fedoraproject.org  Thu Apr 23 16:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:34:21 +0000
Subject: [pkgdb] perl-XXX (Fedora, devel) updated by kevin
Message-ID: <20090423163421.7AA4110F88B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-XXX (Fedora devel) for perl-sig
kevin approved watchcommits on perl-XXX (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-XXX



From pkgdb at fedoraproject.org  Thu Apr 23 16:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:34:21 +0000
Subject: [pkgdb] perl-XXX (Fedora, 11) updated by kevin
Message-ID: <20090423163421.89DD510F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-XXX
kevin has set commit to Approved for provenpackager on perl-XXX (Fedora 11)
kevin has set build to Approved for provenpackager on perl-XXX (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-XXX (Fedora 11)
kevin approved watchbugzilla on perl-XXX (Fedora 11) for perl-sig
kevin approved watchcommits on perl-XXX (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-XXX



From kevin at fedoraproject.org  Thu Apr 23 16:34:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:34:49 +0000 (UTC)
Subject: rpms/perl-XXX - New directory
Message-ID: <20090423163449.3866570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-XXX
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15331/rpms/perl-XXX

Log Message:
Directory /cvs/pkgs/rpms/perl-XXX added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:34:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:34:49 +0000 (UTC)
Subject: rpms/perl-XXX/devel - New directory
Message-ID: <20090423163449.7945570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-XXX/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15331/rpms/perl-XXX/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-XXX/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:34:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:34:58 +0000 (UTC)
Subject: rpms/perl-XXX Makefile,NONE,1.1
Message-ID: <20090423163458.EBC2770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-XXX
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15331/rpms/perl-XXX

Added Files:
	Makefile 
Log Message:
Setup of module perl-XXX


--- NEW FILE Makefile ---
# Top level Makefile for module perl-XXX
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:34:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:34:59 +0000 (UTC)
Subject: rpms/perl-XXX/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423163459.4657F70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-XXX/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15331/rpms/perl-XXX/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-XXX


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-XXX
# $Id: Makefile,v 1.1 2009/04/23 16:34:59 kevin Exp $
NAME := perl-XXX
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From salimma at fedoraproject.org  Thu Apr 23 16:36:20 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 23 Apr 2009 16:36:20 +0000 (UTC)
Subject: rpms/vala/devel .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 vala.spec,
	1.36, 1.37
Message-ID: <20090423163620.DAE4570104@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15580

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
- Update to 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	24 Feb 2009 05:00:46 -0000	1.20
+++ .cvsignore	23 Apr 2009 16:35:50 -0000	1.21
@@ -1 +1 @@
-vala-0.5.7.tar.bz2
+vala-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Feb 2009 05:00:46 -0000	1.20
+++ sources	23 Apr 2009 16:35:50 -0000	1.21
@@ -1 +1 @@
-5e6c4ce07091725d9afdac7cf00e553c  vala-0.5.7.tar.bz2
+592009ea10fa35ebb6bd472bb4198654  vala-0.6.1.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vala.spec	24 Feb 2009 05:00:46 -0000	1.36
+++ vala.spec	23 Apr 2009 16:35:50 -0000	1.37
@@ -14,7 +14,7 @@
 %endif
 
 Name:           vala
-Version:        0.5.7
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -22,7 +22,7 @@
 # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
 License:        LGPLv2+ and BSD
 URL:            http://live.gnome.org/Vala
-Source0:        http://download.gnome.org/sources/vala/0.5/vala-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/vala/0.6/vala-%{version}.tar.bz2
 Source1:	vala-mode.el
 Source2:	vala-init.el
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Sat Apr 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
 * Mon Feb 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.7-1
 - Update to 0.5.7
 



From pkgdb at fedoraproject.org  Thu Apr 23 16:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:36:30 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check-StashChange was added for cweyl
Message-ID: <20090423163630.A1A6110F888@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-B-Hooks-OP-Check-StashChange with summary Invoke callbacks when the stash code is being compiled in changes
kevin has approved Package perl-B-Hooks-OP-Check-StashChange
kevin has added a Fedora devel branch for perl-B-Hooks-OP-Check-StashChange with an owner of cweyl
kevin has approved perl-B-Hooks-OP-Check-StashChange in Fedora devel
kevin has approved Package perl-B-Hooks-OP-Check-StashChange
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora devel)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check-StashChange



From pkgdb at fedoraproject.org  Thu Apr 23 16:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:36:34 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check-StashChange (Fedora,
	devel) updated by kevin
Message-ID: <20090423163634.C5A9F10F88C@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-B-Hooks-OP-Check-StashChange (Fedora devel) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check-StashChange (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check-StashChange



From pkgdb at fedoraproject.org  Thu Apr 23 16:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:36:34 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check-StashChange (Fedora,
	10) updated by kevin
Message-ID: <20090423163634.CC6A010F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-B-Hooks-OP-Check-StashChange
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 10)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 10)
kevin approved watchbugzilla on perl-B-Hooks-OP-Check-StashChange (Fedora 10) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check-StashChange (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check-StashChange



From pkgdb at fedoraproject.org  Thu Apr 23 16:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:36:34 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check-StashChange (Fedora,
	9) updated by kevin
Message-ID: <20090423163634.D59B310F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-B-Hooks-OP-Check-StashChange
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 9)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 9)
kevin approved watchbugzilla on perl-B-Hooks-OP-Check-StashChange (Fedora 9) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check-StashChange (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check-StashChange



From pkgdb at fedoraproject.org  Thu Apr 23 16:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:36:34 +0000
Subject: [pkgdb] perl-B-Hooks-OP-Check-StashChange (Fedora,
	11) updated by kevin
Message-ID: <20090423163634.D99B210F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-B-Hooks-OP-Check-StashChange
kevin has set commit to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 11)
kevin has set build to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-B-Hooks-OP-Check-StashChange (Fedora 11)
kevin approved watchbugzilla on perl-B-Hooks-OP-Check-StashChange (Fedora 11) for perl-sig
kevin approved watchcommits on perl-B-Hooks-OP-Check-StashChange (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Hooks-OP-Check-StashChange



From kevin at fedoraproject.org  Thu Apr 23 16:36:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:36:45 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange - New directory
Message-ID: <20090423163645.28A4370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15675/rpms/perl-B-Hooks-OP-Check-StashChange

Log Message:
Directory /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:36:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:36:45 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange/devel - New directory
Message-ID: <20090423163645.6941C70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15675/rpms/perl-B-Hooks-OP-Check-StashChange/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:36:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:36:55 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange Makefile,NONE,1.1
Message-ID: <20090423163655.0618C70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15675/rpms/perl-B-Hooks-OP-Check-StashChange

Added Files:
	Makefile 
Log Message:
Setup of module perl-B-Hooks-OP-Check-StashChange


--- NEW FILE Makefile ---
# Top level Makefile for module perl-B-Hooks-OP-Check-StashChange
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:36:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:36:55 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090423163655.45B2E70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15675/rpms/perl-B-Hooks-OP-Check-StashChange/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-B-Hooks-OP-Check-StashChange


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-B-Hooks-OP-Check-StashChange
# $Id: Makefile,v 1.1 2009/04/23 16:36:55 kevin Exp $
NAME := perl-B-Hooks-OP-Check-StashChange
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:37:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:37:24 +0000
Subject: [pkgdb] perl-Mixin-Linewise was added for iarnell
Message-ID: <20090423163724.A987B10F888@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Mixin-Linewise with summary Write your linewise code for handles; this does the rest
kevin has approved Package perl-Mixin-Linewise
kevin has added a Fedora devel branch for perl-Mixin-Linewise with an owner of iarnell
kevin has approved perl-Mixin-Linewise in Fedora devel
kevin has approved Package perl-Mixin-Linewise
kevin has set commit to Approved for provenpackager on perl-Mixin-Linewise (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Mixin-Linewise (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Mixin-Linewise (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mixin-Linewise



From pkgdb at fedoraproject.org  Thu Apr 23 16:37:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:37:28 +0000
Subject: [pkgdb] perl-Mixin-Linewise (Fedora, 10) updated by kevin
Message-ID: <20090423163728.43C9C10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Mixin-Linewise
kevin has set commit to Approved for provenpackager on perl-Mixin-Linewise (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Mixin-Linewise (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Mixin-Linewise (Fedora 10)
kevin approved watchbugzilla on perl-Mixin-Linewise (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Mixin-Linewise (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mixin-Linewise



From pkgdb at fedoraproject.org  Thu Apr 23 16:37:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:37:28 +0000
Subject: [pkgdb] perl-Mixin-Linewise (Fedora, 11) updated by kevin
Message-ID: <20090423163728.46E6510F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Mixin-Linewise
kevin has set commit to Approved for provenpackager on perl-Mixin-Linewise (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Mixin-Linewise (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Mixin-Linewise (Fedora 11)
kevin approved watchbugzilla on perl-Mixin-Linewise (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Mixin-Linewise (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mixin-Linewise



From pkgdb at fedoraproject.org  Thu Apr 23 16:37:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:37:28 +0000
Subject: [pkgdb] perl-Mixin-Linewise (Fedora, devel) updated by kevin
Message-ID: <20090423163728.4F0F810F899@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Mixin-Linewise (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Mixin-Linewise (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mixin-Linewise



From kevin at fedoraproject.org  Thu Apr 23 16:37:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:37:36 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise - New directory
Message-ID: <20090423163736.25E7970104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15957/rpms/perl-Mixin-Linewise

Log Message:
Directory /cvs/pkgs/rpms/perl-Mixin-Linewise added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:37:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:37:36 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise/devel - New directory
Message-ID: <20090423163736.65EFB70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15957/rpms/perl-Mixin-Linewise/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Mixin-Linewise/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:37:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:37:45 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise Makefile,NONE,1.1
Message-ID: <20090423163745.1938170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15957/rpms/perl-Mixin-Linewise

Added Files:
	Makefile 
Log Message:
Setup of module perl-Mixin-Linewise


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Mixin-Linewise
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:37:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:37:45 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423163745.5C49A70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15957/rpms/perl-Mixin-Linewise/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Mixin-Linewise


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Mixin-Linewise
# $Id: Makefile,v 1.1 2009/04/23 16:37:45 kevin Exp $
NAME := perl-Mixin-Linewise
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:07 +0000
Subject: [pkgdb] perl-Lexical-Persistence was added for iarnell
Message-ID: <20090423163807.7CFCA10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Lexical-Persistence with summary Persistent lexical variable values for arbitrary calls
kevin has approved Package perl-Lexical-Persistence
kevin has added a Fedora devel branch for perl-Lexical-Persistence with an owner of iarnell
kevin has approved perl-Lexical-Persistence in Fedora devel
kevin has approved Package perl-Lexical-Persistence
kevin has set commit to Approved for provenpackager on perl-Lexical-Persistence (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Lexical-Persistence (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Lexical-Persistence (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Lexical-Persistence



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:09 +0000
Subject: [pkgdb] perl-Lexical-Persistence (Fedora, 10) updated by kevin
Message-ID: <20090423163809.D4B9A10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Lexical-Persistence
kevin has set commit to Approved for provenpackager on perl-Lexical-Persistence (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Lexical-Persistence (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Lexical-Persistence (Fedora 10)
kevin approved watchbugzilla on perl-Lexical-Persistence (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Lexical-Persistence (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Lexical-Persistence



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:09 +0000
Subject: [pkgdb] perl-Lexical-Persistence (Fedora, 11) updated by kevin
Message-ID: <20090423163809.DA69810F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Lexical-Persistence
kevin has set commit to Approved for provenpackager on perl-Lexical-Persistence (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Lexical-Persistence (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Lexical-Persistence (Fedora 11)
kevin approved watchbugzilla on perl-Lexical-Persistence (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Lexical-Persistence (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Lexical-Persistence



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:09 +0000
Subject: [pkgdb] perl-Lexical-Persistence (Fedora, devel) updated by kevin
Message-ID: <20090423163809.E9A8910F8A2@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Lexical-Persistence (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Lexical-Persistence (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Lexical-Persistence



From kevin at fedoraproject.org  Thu Apr 23 16:38:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:38:20 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence - New directory
Message-ID: <20090423163820.2D78E70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16200/rpms/perl-Lexical-Persistence

Log Message:
Directory /cvs/pkgs/rpms/perl-Lexical-Persistence added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:38:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:38:20 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/devel - New directory
Message-ID: <20090423163820.6EE4170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16200/rpms/perl-Lexical-Persistence/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Lexical-Persistence/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:38:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:38:30 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090423163830.8787370104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16200/rpms/perl-Lexical-Persistence/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Lexical-Persistence


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Lexical-Persistence
# $Id: Makefile,v 1.1 2009/04/23 16:38:30 kevin Exp $
NAME := perl-Lexical-Persistence
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 23 16:38:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:38:30 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence Makefile,NONE,1.1
Message-ID: <20090423163830.31BDF70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16200/rpms/perl-Lexical-Persistence

Added Files:
	Makefile 
Log Message:
Setup of module perl-Lexical-Persistence


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Lexical-Persistence
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:56 +0000
Subject: [pkgdb] perl-Clipboard was added for iarnell
Message-ID: <20090423163856.49C3E10F893@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Clipboard with summary Copy and paste with any OS
kevin has approved Package perl-Clipboard
kevin has added a Fedora devel branch for perl-Clipboard with an owner of iarnell
kevin has approved perl-Clipboard in Fedora devel
kevin has approved Package perl-Clipboard
kevin has set commit to Approved for provenpackager on perl-Clipboard (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Clipboard (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Clipboard (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Clipboard



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:58 +0000
Subject: [pkgdb] perl-Clipboard (Fedora, 10) updated by kevin
Message-ID: <20090423163858.BF1E210F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Clipboard
kevin has set commit to Approved for provenpackager on perl-Clipboard (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Clipboard (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Clipboard (Fedora 10)
kevin approved watchbugzilla on perl-Clipboard (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Clipboard (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Clipboard



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:58 +0000
Subject: [pkgdb] perl-Clipboard (Fedora, 11) updated by kevin
Message-ID: <20090423163858.C8CDF10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Clipboard
kevin has set commit to Approved for provenpackager on perl-Clipboard (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Clipboard (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Clipboard (Fedora 11)
kevin approved watchbugzilla on perl-Clipboard (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Clipboard (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Clipboard



From pkgdb at fedoraproject.org  Thu Apr 23 16:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:38:58 +0000
Subject: [pkgdb] perl-Clipboard (Fedora, devel) updated by kevin
Message-ID: <20090423163858.CC4B410F8A4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Clipboard (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Clipboard (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Clipboard



From kevin at fedoraproject.org  Thu Apr 23 16:39:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:39:09 +0000 (UTC)
Subject: rpms/perl-Clipboard/devel - New directory
Message-ID: <20090423163909.715F070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Clipboard/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16484/rpms/perl-Clipboard/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Clipboard/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:39:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:39:09 +0000 (UTC)
Subject: rpms/perl-Clipboard - New directory
Message-ID: <20090423163909.2B3E170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Clipboard
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16484/rpms/perl-Clipboard

Log Message:
Directory /cvs/pkgs/rpms/perl-Clipboard added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:39:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:39:19 +0000 (UTC)
Subject: rpms/perl-Clipboard Makefile,NONE,1.1
Message-ID: <20090423163919.8F5CB70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Clipboard
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16484/rpms/perl-Clipboard

Added Files:
	Makefile 
Log Message:
Setup of module perl-Clipboard


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Clipboard
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:39:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:39:19 +0000 (UTC)
Subject: rpms/perl-Clipboard/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423163919.E277870104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Clipboard/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16484/rpms/perl-Clipboard/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Clipboard


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Clipboard
# $Id: Makefile,v 1.1 2009/04/23 16:39:19 kevin Exp $
NAME := perl-Clipboard
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From hadess at fedoraproject.org  Thu Apr 23 16:39:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 16:39:48 +0000 (UTC)
Subject: rpms/totem/F-11 totem.spec,1.234,1.235
Message-ID: <20090423163948.1EDB570104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16525

Modified Files:
	totem.spec 
Log Message:
* Thu Apr 23 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
- Add missing gnome-python2-gconf req (#483265)


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- totem.spec	2 Apr 2009 16:53:57 -0000	1.234
+++ totem.spec	23 Apr 2009 16:39:17 -0000	1.235
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -130,7 +130,7 @@
 %package youtube
 Summary: YouTube plugin for Totem
 Group: Applications/Multimedia
-Requires: python-gdata
+Requires: python-gdata gnome-python2-gconf
 Requires: %{name} = %{version}-%{release}
 
 %description youtube
@@ -478,6 +478,9 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
+- Add missing gnome-python2-gconf req (#483265)
+
 * Thu Apr 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-2
 - Update patch to set the PA stream volume, avoids setting the 
   volume when pulsesink isn't in a state where it has a stream



From pkgdb at fedoraproject.org  Thu Apr 23 16:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:41:39 +0000
Subject: [pkgdb] perl-WWW-Pastebin-PastebinCom-Create was added for iarnell
Message-ID: <20090423164139.A09A710F885@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-WWW-Pastebin-PastebinCom-Create with summary Paste to http://pastebin.com from Perl
kevin has approved Package perl-WWW-Pastebin-PastebinCom-Create
kevin has added a Fedora devel branch for perl-WWW-Pastebin-PastebinCom-Create with an owner of iarnell
kevin has approved perl-WWW-Pastebin-PastebinCom-Create in Fedora devel
kevin has approved Package perl-WWW-Pastebin-PastebinCom-Create
kevin has set commit to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora devel)
kevin has set build to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-PastebinCom-Create



From pkgdb at fedoraproject.org  Thu Apr 23 16:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:41:41 +0000
Subject: [pkgdb] perl-WWW-Pastebin-PastebinCom-Create (Fedora,
	10) updated by kevin
Message-ID: <20090423164141.C06F410F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-WWW-Pastebin-PastebinCom-Create
kevin has set commit to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora 10)
kevin has set build to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora 10)
kevin approved watchbugzilla on perl-WWW-Pastebin-PastebinCom-Create (Fedora 10) for perl-sig
kevin approved watchcommits on perl-WWW-Pastebin-PastebinCom-Create (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-PastebinCom-Create



From pkgdb at fedoraproject.org  Thu Apr 23 16:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:41:41 +0000
Subject: [pkgdb] perl-WWW-Pastebin-PastebinCom-Create (Fedora,
	11) updated by kevin
Message-ID: <20090423164141.C9FC410F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-WWW-Pastebin-PastebinCom-Create
kevin has set commit to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora 11)
kevin has set build to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-WWW-Pastebin-PastebinCom-Create (Fedora 11)
kevin approved watchbugzilla on perl-WWW-Pastebin-PastebinCom-Create (Fedora 11) for perl-sig
kevin approved watchcommits on perl-WWW-Pastebin-PastebinCom-Create (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-PastebinCom-Create



From kevin at fedoraproject.org  Thu Apr 23 16:41:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:41:53 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create - New directory
Message-ID: <20090423164153.2573070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn17241/rpms/perl-WWW-Pastebin-PastebinCom-Create

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:41:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:41:53 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create/devel - New directory
Message-ID: <20090423164153.5CF4570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn17241/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 16:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:41:41 +0000
Subject: [pkgdb] perl-WWW-Pastebin-PastebinCom-Create (Fedora,
	devel) updated by kevin
Message-ID: <20090423164141.D6AC910F891@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-WWW-Pastebin-PastebinCom-Create (Fedora devel) for perl-sig
kevin approved watchcommits on perl-WWW-Pastebin-PastebinCom-Create (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-PastebinCom-Create



From kkofler at fedoraproject.org  Thu Apr 23 16:41:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 16:41:56 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.79,1.80
Message-ID: <20090423164156.3825E70104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17084/devel

Modified Files:
	kdeaccessibility.spec 
Log Message:
FIx AWOL linebreak in %description.


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdeaccessibility.spec	22 Apr 2009 20:14:11 -0000	1.79
+++ kdeaccessibility.spec	23 Apr 2009 16:41:25 -0000	1.80
@@ -38,7 +38,8 @@
 %description
 Included with this package are:
 * kmag: a screen magnifier
-* kmousetool: a program for people whom it hurts to click the mouse * kmouth: program that allows people who have lost their voice
+* kmousetool: a program for people whom it hurts to click the mouse
+* kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
 



From kevin at fedoraproject.org  Thu Apr 23 16:42:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:42:03 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create Makefile,NONE,1.1
Message-ID: <20090423164203.6B20470104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn17241/rpms/perl-WWW-Pastebin-PastebinCom-Create

Added Files:
	Makefile 
Log Message:
Setup of module perl-WWW-Pastebin-PastebinCom-Create


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WWW-Pastebin-PastebinCom-Create
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:42:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:42:03 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090423164203.AAEBC70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn17241/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WWW-Pastebin-PastebinCom-Create


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-WWW-Pastebin-PastebinCom-Create
# $Id: Makefile,v 1.1 2009/04/23 16:42:03 kevin Exp $
NAME := perl-WWW-Pastebin-PastebinCom-Create
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From salimma at fedoraproject.org  Thu Apr 23 16:42:10 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 23 Apr 2009 16:42:10 +0000 (UTC)
Subject: rpms/gtk-murrine-engine/devel .cvsignore, 1.5,
	1.6 gtk-murrine-engine.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090423164210.34CC070104@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gtk-murrine-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17152

Modified Files:
	.cvsignore gtk-murrine-engine.spec sources 
Log Message:
* Thu Apr 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.90%{?patchver}-1
- Update to 0.90.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-murrine-engine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 May 2007 19:56:19 -0000	1.5
+++ .cvsignore	23 Apr 2009 16:41:39 -0000	1.6
@@ -3,5 +3,5 @@
 MurrinaGilouche.tar.bz2
 MurrinaLoveGray.tar.bz2
 MurrinaVerdeOlivo.tar.bz2
-murrine-0.53.1.tar.bz2
+murrine-0.90.3.tar.bz2
 MurrineThemePack.tar.bz2


Index: gtk-murrine-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-murrine-engine/devel/gtk-murrine-engine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-murrine-engine.spec	25 Feb 2009 01:47:23 -0000	1.9
+++ gtk-murrine-engine.spec	23 Apr 2009 16:41:39 -0000	1.10
@@ -1,29 +1,34 @@
+%define mainver 0.90
+%define patchver .3
+
 Summary: Murrine GTK2 engine
 Name: gtk-murrine-engine
-Version: 0.53.1
-Release: 4%{?dist}
-# No version specified.
-License: GPL+
+Version: %{mainver}%{?patchver}
+Release: 1%{?dist}
+License: GPLv2+
 Group: System Environment/Libraries
-URL: http://cimi.netsons.org/pages/murrine.php
-Source0: http://cimi.netsons.org/media/download_gallery/murrine/murrine-%{version}.tar.bz2
+URL: http://www.cimitan.com/murrine/
+Source0: http://ftp.gnome.org/pub/GNOME/sources/murrine/%{mainver}/murrine-%{version}.tar.bz2
 Source10: http://cimi.netsons.org/media/download_gallery/MurrinaFancyCandy.tar.bz2
 Source11: http://cimi.netsons.org/media/download_gallery/MurrinaVerdeOlivo.tar.bz2
 Source12: http://cimi.netsons.org/media/download_gallery/MurrinaAquaIsh.tar.bz2
 Source13: http://cimi.netsons.org/media/download_gallery/MurrinaGilouche.tar.bz2
 Source14: http://cimi.netsons.org/media/download_gallery/MurrinaLoveGray.tar.bz2
 Source15: http://cimi.netsons.org/media/download_gallery/MurrineThemePack.tar.bz2
-BuildRequires: gtk2-devel
+BuildRequires: gtk2-devel intltool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Murrine is a cairo-based fast gtk2 theme engine.
+Murrine Engine is a Gtk2 theme engine, using the Cairo vector graphics
+library. It comes by default with a modern glassy look, inspired by
+Venetian glass artworks, and is extremely customizable.
+
 
 %prep
 %setup -q -n murrine-%{version}
 
 %build
-%configure --enable-animation --enable-macmenu
+%configure --enable-animation --enable-animationrtl
 make %{?_smp_mflags}
 
 %install
@@ -49,11 +54,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog NEWS CREDITS COPYING
+%doc AUTHORS ChangeLog COPYING NEWS
 %{_libdir}/gtk-2.0/*/engines/*
 %{_datadir}/*
 
 %changelog
+* Thu Apr 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.90%{?patchver}-1
+- Update to 0.90.3
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.53.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-murrine-engine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 May 2007 19:56:19 -0000	1.5
+++ sources	23 Apr 2009 16:41:39 -0000	1.6
@@ -3,5 +3,5 @@
 65d8f1f28f9c8ed14b15ec894dd0bfc0  MurrinaGilouche.tar.bz2
 31ce9fce5114c1cfe471dc614de539cc  MurrinaLoveGray.tar.bz2
 7fb55d613c31a1455a9db6c121fff0bb  MurrinaVerdeOlivo.tar.bz2
-09f014584ae593b9795f3f6db26005d8  murrine-0.53.1.tar.bz2
+58a10b5c7b5e114a8a7ff5705fe274f5  murrine-0.90.3.tar.bz2
 414013c22d1fb3954a5c3d09499c80b2  MurrineThemePack.tar.bz2



From pkgdb at fedoraproject.org  Thu Apr 23 16:42:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:42:22 +0000
Subject: [pkgdb] perl-WWW-Pastebin-RafbNet-Create was added for iarnell
Message-ID: <20090423164222.8F08310F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-WWW-Pastebin-RafbNet-Create with summary Create new pastes on http://rafb.net/
kevin has approved Package perl-WWW-Pastebin-RafbNet-Create
kevin has added a Fedora devel branch for perl-WWW-Pastebin-RafbNet-Create with an owner of iarnell
kevin has approved perl-WWW-Pastebin-RafbNet-Create in Fedora devel
kevin has approved Package perl-WWW-Pastebin-RafbNet-Create
kevin has set commit to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora devel)
kevin has set build to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-RafbNet-Create



From pkgdb at fedoraproject.org  Thu Apr 23 16:42:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:42:24 +0000
Subject: [pkgdb] perl-WWW-Pastebin-RafbNet-Create (Fedora,
	10) updated by kevin
Message-ID: <20090423164224.7ECE510F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-WWW-Pastebin-RafbNet-Create
kevin has set commit to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora 10)
kevin has set build to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora 10)
kevin approved watchbugzilla on perl-WWW-Pastebin-RafbNet-Create (Fedora 10) for perl-sig
kevin approved watchcommits on perl-WWW-Pastebin-RafbNet-Create (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-RafbNet-Create



From pkgdb at fedoraproject.org  Thu Apr 23 16:42:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:42:24 +0000
Subject: [pkgdb] perl-WWW-Pastebin-RafbNet-Create (Fedora,
	devel) updated by kevin
Message-ID: <20090423164224.8BBE410F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-WWW-Pastebin-RafbNet-Create (Fedora devel) for perl-sig
kevin approved watchcommits on perl-WWW-Pastebin-RafbNet-Create (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-RafbNet-Create



From pkgdb at fedoraproject.org  Thu Apr 23 16:42:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:42:24 +0000
Subject: [pkgdb] perl-WWW-Pastebin-RafbNet-Create (Fedora,
	11) updated by kevin
Message-ID: <20090423164224.9911D10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-WWW-Pastebin-RafbNet-Create
kevin has set commit to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora 11)
kevin has set build to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-WWW-Pastebin-RafbNet-Create (Fedora 11)
kevin approved watchbugzilla on perl-WWW-Pastebin-RafbNet-Create (Fedora 11) for perl-sig
kevin approved watchcommits on perl-WWW-Pastebin-RafbNet-Create (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Pastebin-RafbNet-Create



From kevin at fedoraproject.org  Thu Apr 23 16:42:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:42:34 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create - New directory
Message-ID: <20090423164234.2741B70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi17540/rpms/perl-WWW-Pastebin-RafbNet-Create

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:42:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:42:34 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create/devel - New directory
Message-ID: <20090423164234.58C3F70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi17540/rpms/perl-WWW-Pastebin-RafbNet-Create/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:42:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:42:42 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create Makefile,NONE,1.1
Message-ID: <20090423164242.8D75170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi17540/rpms/perl-WWW-Pastebin-RafbNet-Create

Added Files:
	Makefile 
Log Message:
Setup of module perl-WWW-Pastebin-RafbNet-Create


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WWW-Pastebin-RafbNet-Create
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:42:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:42:42 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090423164242.ECC4870104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi17540/rpms/perl-WWW-Pastebin-RafbNet-Create/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WWW-Pastebin-RafbNet-Create


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-WWW-Pastebin-RafbNet-Create
# $Id: Makefile,v 1.1 2009/04/23 16:42:42 kevin Exp $
NAME := perl-WWW-Pastebin-RafbNet-Create
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mtasaka at fedoraproject.org  Thu Apr 23 16:42:51 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 23 Apr 2009 16:42:51 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.360, 1.361 jd.spec, 1.418, 1.419 sources,
	1.361, 1.362
Message-ID: <20090423164251.13B5F70104@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17297/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- .cvsignore	8 Apr 2009 09:30:23 -0000	1.360
+++ .cvsignore	23 Apr 2009 16:42:20 -0000	1.361
@@ -1 +1 @@
-jd-2.4.0-svn2768_trunk.tgz
+jd-2.4.0-svn2783_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- jd.spec	8 Apr 2009 09:30:23 -0000	1.418
+++ jd.spec	23 Apr 2009 16:42:20 -0000	1.419
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2768_trunk
+%define         strtag        svn2783_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- sources	8 Apr 2009 09:30:24 -0000	1.361
+++ sources	23 Apr 2009 16:42:20 -0000	1.362
@@ -1 +1 @@
-e4851dc06a5dbdec05794abd7c1d6321  jd-2.4.0-svn2768_trunk.tgz
+518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz



From mtasaka at fedoraproject.org  Thu Apr 23 16:42:51 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 23 Apr 2009 16:42:51 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.353, 1.354 jd.spec, 1.413, 1.414 sources,
	1.354, 1.355
Message-ID: <20090423164251.86B6870104@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17297/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- .cvsignore	7 Apr 2009 05:30:10 -0000	1.353
+++ .cvsignore	23 Apr 2009 16:42:21 -0000	1.354
@@ -1 +1 @@
-jd-2.4.0-svn2768_trunk.tgz
+jd-2.4.0-svn2783_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- jd.spec	7 Apr 2009 05:30:10 -0000	1.413
+++ jd.spec	23 Apr 2009 16:42:21 -0000	1.414
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2768_trunk
+%define         strtag        svn2783_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- sources	7 Apr 2009 05:30:10 -0000	1.354
+++ sources	23 Apr 2009 16:42:21 -0000	1.355
@@ -1 +1 @@
-e4851dc06a5dbdec05794abd7c1d6321  jd-2.4.0-svn2768_trunk.tgz
+518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz



From mtasaka at fedoraproject.org  Thu Apr 23 16:42:51 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 23 Apr 2009 16:42:51 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.360, 1.361 jd.spec, 1.409, 1.410 sources, 
	1.361, 1.362
Message-ID: <20090423164251.EE5E170104@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17297/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- .cvsignore	8 Apr 2009 09:30:24 -0000	1.360
+++ .cvsignore	23 Apr 2009 16:42:21 -0000	1.361
@@ -1 +1 @@
-jd-2.4.0-svn2768_trunk.tgz
+jd-2.4.0-svn2783_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- jd.spec	8 Apr 2009 09:30:24 -0000	1.409
+++ jd.spec	23 Apr 2009 16:42:21 -0000	1.410
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2768_trunk
+%define         strtag        svn2783_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Apr  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- sources	8 Apr 2009 09:30:24 -0000	1.361
+++ sources	23 Apr 2009 16:42:21 -0000	1.362
@@ -1 +1 @@
-e4851dc06a5dbdec05794abd7c1d6321  jd-2.4.0-svn2768_trunk.tgz
+518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz



From mtasaka at fedoraproject.org  Thu Apr 23 16:42:52 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 23 Apr 2009 16:42:52 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.350, 1.351 jd.spec, 1.410, 1.411 sources,
	1.351, 1.352
Message-ID: <20090423164252.3A81F70104@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17297/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- .cvsignore	31 Mar 2009 18:53:00 -0000	1.350
+++ .cvsignore	23 Apr 2009 16:42:21 -0000	1.351
@@ -1 +1 @@
-jd-2.4.0-svn2758_trunk.tgz
+jd-2.4.0-svn2783_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- jd.spec	31 Mar 2009 18:53:00 -0000	1.410
+++ jd.spec	23 Apr 2009 16:42:21 -0000	1.411
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2758_trunk
+%define         strtag        svn2783_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Apr  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- sources	31 Mar 2009 18:53:00 -0000	1.351
+++ sources	23 Apr 2009 16:42:22 -0000	1.352
@@ -1 +1 @@
-150ca247b665197ce029f330bc0930ee  jd-2.4.0-svn2758_trunk.tgz
+518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:18 +0000
Subject: [pkgdb] cclive was added for eponyme
Message-ID: <20090423164318.3BD5110F886@bastion2.fedora.phx.redhat.com>

kevin has added Package cclive with summary Command line video extraction utility
kevin has approved Package cclive
kevin has added a Fedora devel branch for cclive with an owner of eponyme
kevin has approved cclive in Fedora devel
kevin has approved Package cclive
kevin has set commit to Approved for provenpackager on cclive (Fedora devel)
kevin has set build to Approved for provenpackager on cclive (Fedora devel)
kevin has set checkout to Approved for provenpackager on cclive (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cclive



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:20 +0000
Subject: [pkgdb] cclive (Fedora, 10) updated by kevin
Message-ID: <20090423164320.AB79910F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cclive
kevin has set commit to Approved for provenpackager on cclive (Fedora 10)
kevin has set build to Approved for provenpackager on cclive (Fedora 10)
kevin has set checkout to Approved for provenpackager on cclive (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cclive



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:20 +0000
Subject: [pkgdb] cclive (Fedora, 9) updated by kevin
Message-ID: <20090423164320.B325010F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cclive
kevin has set commit to Approved for provenpackager on cclive (Fedora 9)
kevin has set build to Approved for provenpackager on cclive (Fedora 9)
kevin has set checkout to Approved for provenpackager on cclive (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cclive



From kevin at fedoraproject.org  Thu Apr 23 16:43:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:43:29 +0000 (UTC)
Subject: rpms/cclive - New directory
Message-ID: <20090423164329.3192C70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cclive
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17756/rpms/cclive

Log Message:
Directory /cvs/pkgs/rpms/cclive added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:43:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:43:29 +0000 (UTC)
Subject: rpms/cclive/devel - New directory
Message-ID: <20090423164329.7BE787013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17756/rpms/cclive/devel

Log Message:
Directory /cvs/pkgs/rpms/cclive/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 16:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:20 +0000
Subject: [pkgdb] cclive (Fedora, 11) updated by kevin
Message-ID: <20090423164320.C0F5F10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cclive
kevin has set commit to Approved for provenpackager on cclive (Fedora 11)
kevin has set build to Approved for provenpackager on cclive (Fedora 11)
kevin has set checkout to Approved for provenpackager on cclive (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cclive



From kevin at fedoraproject.org  Thu Apr 23 16:43:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:43:38 +0000 (UTC)
Subject: rpms/cclive Makefile,NONE,1.1
Message-ID: <20090423164338.AF87B70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cclive
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17756/rpms/cclive

Added Files:
	Makefile 
Log Message:
Setup of module cclive


--- NEW FILE Makefile ---
# Top level Makefile for module cclive
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:43:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:43:38 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090423164338.EA46970104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17756/rpms/cclive/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cclive


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cclive
# $Id: Makefile,v 1.1 2009/04/23 16:43:38 kevin Exp $
NAME := cclive
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:56 +0000
Subject: [pkgdb] abby was added for eponyme
Message-ID: <20090423164356.7CC1310F878@bastion2.fedora.phx.redhat.com>

kevin has added Package abby with summary Front-end for cclive and clive
kevin has approved Package abby
kevin has added a Fedora devel branch for abby with an owner of eponyme
kevin has approved abby in Fedora devel
kevin has approved Package abby
kevin has set commit to Approved for provenpackager on abby (Fedora devel)
kevin has set build to Approved for provenpackager on abby (Fedora devel)
kevin has set checkout to Approved for provenpackager on abby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abby



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:58 +0000
Subject: [pkgdb] abby (Fedora, 10) updated by kevin
Message-ID: <20090423164358.23BCB10F88D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for abby
kevin has set commit to Approved for provenpackager on abby (Fedora 10)
kevin has set build to Approved for provenpackager on abby (Fedora 10)
kevin has set checkout to Approved for provenpackager on abby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abby



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:58 +0000
Subject: [pkgdb] abby (Fedora, 11) updated by kevin
Message-ID: <20090423164358.5AFE310F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for abby
kevin has set commit to Approved for provenpackager on abby (Fedora 11)
kevin has set build to Approved for provenpackager on abby (Fedora 11)
kevin has set checkout to Approved for provenpackager on abby (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abby



From pkgdb at fedoraproject.org  Thu Apr 23 16:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:43:58 +0000
Subject: [pkgdb] abby (Fedora, 9) updated by kevin
Message-ID: <20090423164358.7DAAE10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for abby
kevin has set commit to Approved for provenpackager on abby (Fedora 9)
kevin has set build to Approved for provenpackager on abby (Fedora 9)
kevin has set checkout to Approved for provenpackager on abby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abby



From kevin at fedoraproject.org  Thu Apr 23 16:44:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:44:12 +0000 (UTC)
Subject: rpms/abby - New directory
Message-ID: <20090423164412.2F01070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/abby
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17980/rpms/abby

Log Message:
Directory /cvs/pkgs/rpms/abby added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:44:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:44:12 +0000 (UTC)
Subject: rpms/abby/devel - New directory
Message-ID: <20090423164412.6BE0B70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17980/rpms/abby/devel

Log Message:
Directory /cvs/pkgs/rpms/abby/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:44:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:44:21 +0000 (UTC)
Subject: rpms/abby Makefile,NONE,1.1
Message-ID: <20090423164421.DFEFC70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/abby
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17980/rpms/abby

Added Files:
	Makefile 
Log Message:
Setup of module abby


--- NEW FILE Makefile ---
# Top level Makefile for module abby
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:44:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:44:22 +0000 (UTC)
Subject: rpms/abby/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090423164422.3463C70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17980/rpms/abby/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module abby


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: abby
# $Id: Makefile,v 1.1 2009/04/23 16:44:22 kevin Exp $
NAME := abby
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:45:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:45:14 +0000
Subject: [pkgdb] sing was added for robert
Message-ID: <20090423164514.4E2DE10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package sing with summary Sends fully customized ICMP packets from command line
kevin has approved Package sing
kevin has added a Fedora devel branch for sing with an owner of robert
kevin has approved sing in Fedora devel
kevin has approved Package sing
kevin has set commit to Approved for provenpackager on sing (Fedora devel)
kevin has set build to Approved for provenpackager on sing (Fedora devel)
kevin has set checkout to Approved for provenpackager on sing (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sing



From pkgdb at fedoraproject.org  Thu Apr 23 16:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:45:16 +0000
Subject: [pkgdb] sing (Fedora EPEL, 4) updated by kevin
Message-ID: <20090423164516.4DCA010F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sing
kevin has set commit to Approved for provenpackager on sing (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on sing (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on sing (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sing



From pkgdb at fedoraproject.org  Thu Apr 23 16:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:45:16 +0000
Subject: [pkgdb] sing (Fedora, 10) updated by kevin
Message-ID: <20090423164516.55EFC10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sing
kevin has set commit to Approved for provenpackager on sing (Fedora 10)
kevin has set build to Approved for provenpackager on sing (Fedora 10)
kevin has set checkout to Approved for provenpackager on sing (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sing



From pkgdb at fedoraproject.org  Thu Apr 23 16:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:45:16 +0000
Subject: [pkgdb] sing (Fedora, 11) updated by kevin
Message-ID: <20090423164516.5B82910F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sing
kevin has set commit to Approved for provenpackager on sing (Fedora 11)
kevin has set build to Approved for provenpackager on sing (Fedora 11)
kevin has set checkout to Approved for provenpackager on sing (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sing



From pkgdb at fedoraproject.org  Thu Apr 23 16:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:45:16 +0000
Subject: [pkgdb] sing (Fedora EPEL, 5) updated by kevin
Message-ID: <20090423164516.66CEC10F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sing
kevin has set commit to Approved for provenpackager on sing (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on sing (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on sing (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sing



From kevin at fedoraproject.org  Thu Apr 23 16:45:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:45:29 +0000 (UTC)
Subject: rpms/sing - New directory
Message-ID: <20090423164529.242B470104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sing
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18295/rpms/sing

Log Message:
Directory /cvs/pkgs/rpms/sing added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 16:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:45:16 +0000
Subject: [pkgdb] sing (Fedora, 9) updated by kevin
Message-ID: <20090423164516.6FAED10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sing
kevin has set commit to Approved for provenpackager on sing (Fedora 9)
kevin has set build to Approved for provenpackager on sing (Fedora 9)
kevin has set checkout to Approved for provenpackager on sing (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sing



From kevin at fedoraproject.org  Thu Apr 23 16:45:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:45:29 +0000 (UTC)
Subject: rpms/sing/devel - New directory
Message-ID: <20090423164529.66E2070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sing/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18295/rpms/sing/devel

Log Message:
Directory /cvs/pkgs/rpms/sing/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:45:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:45:39 +0000 (UTC)
Subject: rpms/sing Makefile,NONE,1.1
Message-ID: <20090423164539.6FC3770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sing
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18295/rpms/sing

Added Files:
	Makefile 
Log Message:
Setup of module sing


--- NEW FILE Makefile ---
# Top level Makefile for module sing
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:45:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:45:39 +0000 (UTC)
Subject: rpms/sing/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090423164539.BBCDE70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sing/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC18295/rpms/sing/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sing


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sing
# $Id: Makefile,v 1.1 2009/04/23 16:45:39 kevin Exp $
NAME := sing
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:46:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:46:05 +0000
Subject: [pkgdb] perl-Log-LogLite was added for xavierb
Message-ID: <20090423164605.731A810F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Log-LogLite with summary Create simple logs
kevin has approved Package perl-Log-LogLite
kevin has added a Fedora devel branch for perl-Log-LogLite with an owner of xavierb
kevin has approved perl-Log-LogLite in Fedora devel
kevin has approved Package perl-Log-LogLite
kevin has set commit to Approved for provenpackager on perl-Log-LogLite (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Log-LogLite (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Log-LogLite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-LogLite



From pkgdb at fedoraproject.org  Thu Apr 23 16:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:46:07 +0000
Subject: [pkgdb] perl-Log-LogLite (Fedora, 9) updated by kevin
Message-ID: <20090423164607.DEEA110F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Log-LogLite
kevin has set commit to Approved for provenpackager on perl-Log-LogLite (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Log-LogLite (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Log-LogLite (Fedora 9)
kevin approved watchbugzilla on perl-Log-LogLite (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Log-LogLite (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-LogLite



From pkgdb at fedoraproject.org  Thu Apr 23 16:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:46:07 +0000
Subject: [pkgdb] perl-Log-LogLite (Fedora, 10) updated by kevin
Message-ID: <20090423164607.EF5AF10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Log-LogLite
kevin has set commit to Approved for provenpackager on perl-Log-LogLite (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Log-LogLite (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Log-LogLite (Fedora 10)
kevin approved watchbugzilla on perl-Log-LogLite (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Log-LogLite (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-LogLite



From pkgdb at fedoraproject.org  Thu Apr 23 16:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:46:07 +0000
Subject: [pkgdb] perl-Log-LogLite (Fedora, 11) updated by kevin
Message-ID: <20090423164608.0136610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Log-LogLite
kevin has set commit to Approved for provenpackager on perl-Log-LogLite (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Log-LogLite (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Log-LogLite (Fedora 11)
kevin approved watchbugzilla on perl-Log-LogLite (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Log-LogLite (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-LogLite



From pkgdb at fedoraproject.org  Thu Apr 23 16:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:46:07 +0000
Subject: [pkgdb] perl-Log-LogLite (Fedora EPEL, 5) updated by kevin
Message-ID: <20090423164608.0AB0D10F8AE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Log-LogLite
kevin has set commit to Approved for provenpackager on perl-Log-LogLite (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Log-LogLite (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Log-LogLite (Fedora EPEL 5)
kevin approved watchbugzilla on perl-Log-LogLite (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Log-LogLite (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-LogLite



From pkgdb at fedoraproject.org  Thu Apr 23 16:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:46:07 +0000
Subject: [pkgdb] perl-Log-LogLite (Fedora, devel) updated by kevin
Message-ID: <20090423164608.14D0510F8B1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Log-LogLite (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Log-LogLite (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-LogLite



From kevin at fedoraproject.org  Thu Apr 23 16:46:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:46:16 +0000 (UTC)
Subject: rpms/perl-Log-LogLite - New directory
Message-ID: <20090423164616.3040570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-LogLite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18615/rpms/perl-Log-LogLite

Log Message:
Directory /cvs/pkgs/rpms/perl-Log-LogLite added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:46:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:46:16 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/devel - New directory
Message-ID: <20090423164616.7A1E570104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-LogLite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18615/rpms/perl-Log-LogLite/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Log-LogLite/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:46:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:46:26 +0000 (UTC)
Subject: rpms/perl-Log-LogLite Makefile,NONE,1.1
Message-ID: <20090423164626.08C8970104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-LogLite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18615/rpms/perl-Log-LogLite

Added Files:
	Makefile 
Log Message:
Setup of module perl-Log-LogLite


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-LogLite
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:46:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:46:26 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423164626.48D3F70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Log-LogLite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18615/rpms/perl-Log-LogLite/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-LogLite


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Log-LogLite
# $Id: Makefile,v 1.1 2009/04/23 16:46:26 kevin Exp $
NAME := perl-Log-LogLite
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 23 16:47:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:47:16 +0000 (UTC)
Subject: rpms/hunspell-kk - New directory
Message-ID: <20090423164716.26F2770104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-kk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19006/rpms/hunspell-kk

Log Message:
Directory /cvs/pkgs/rpms/hunspell-kk added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 16:47:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:47:02 +0000
Subject: [pkgdb] hunspell-kk was added for caolanm
Message-ID: <20090423164702.A702E10F88A@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-kk with summary Kazakh hunspell dictionaries
kevin has approved Package hunspell-kk
kevin has added a Fedora devel branch for hunspell-kk with an owner of caolanm
kevin has approved hunspell-kk in Fedora devel
kevin has approved Package hunspell-kk
kevin has set commit to Approved for provenpackager on hunspell-kk (Fedora devel)
kevin has set build to Approved for provenpackager on hunspell-kk (Fedora devel)
kevin has set checkout to Approved for provenpackager on hunspell-kk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-kk



From kevin at fedoraproject.org  Thu Apr 23 16:47:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:47:16 +0000 (UTC)
Subject: rpms/hunspell-kk/devel - New directory
Message-ID: <20090423164716.5B47A70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-kk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19006/rpms/hunspell-kk/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-kk/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:47:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:47:26 +0000 (UTC)
Subject: rpms/hunspell-kk Makefile,NONE,1.1
Message-ID: <20090423164726.EFA8270104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-kk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19006/rpms/hunspell-kk

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-kk


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-kk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:47:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:47:27 +0000 (UTC)
Subject: rpms/hunspell-kk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423164727.5D04270104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-kk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19006/rpms/hunspell-kk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-kk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-kk
# $Id: Makefile,v 1.1 2009/04/23 16:47:27 kevin Exp $
NAME := hunspell-kk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:48:02 +0000
Subject: [pkgdb] perl-MooseX-MethodAttributes was added for cweyl
Message-ID: <20090423164802.DFBC010F888@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-MethodAttributes with summary Introspect your code attributes
kevin has approved Package perl-MooseX-MethodAttributes
kevin has added a Fedora devel branch for perl-MooseX-MethodAttributes with an owner of cweyl
kevin has approved perl-MooseX-MethodAttributes in Fedora devel
kevin has approved Package perl-MooseX-MethodAttributes
kevin has set commit to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MethodAttributes



From pkgdb at fedoraproject.org  Thu Apr 23 16:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:48:07 +0000
Subject: [pkgdb] perl-MooseX-MethodAttributes (Fedora, 10) updated by kevin
Message-ID: <20090423164807.2940410F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-MethodAttributes
kevin has set commit to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-MethodAttributes (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-MethodAttributes (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MethodAttributes



From pkgdb at fedoraproject.org  Thu Apr 23 16:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:48:07 +0000
Subject: [pkgdb] perl-MooseX-MethodAttributes (Fedora, 9) updated by kevin
Message-ID: <20090423164807.2C62710F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-MethodAttributes
kevin has set commit to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-MethodAttributes (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-MethodAttributes (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MethodAttributes



From pkgdb at fedoraproject.org  Thu Apr 23 16:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:48:07 +0000
Subject: [pkgdb] perl-MooseX-MethodAttributes (Fedora, 11) updated by kevin
Message-ID: <20090423164807.3774010F88A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-MooseX-MethodAttributes
kevin has set commit to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 11)
kevin has set build to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MethodAttributes (Fedora 11)
kevin approved watchbugzilla on perl-MooseX-MethodAttributes (Fedora 11) for perl-sig
kevin approved watchcommits on perl-MooseX-MethodAttributes (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MethodAttributes



From pkgdb at fedoraproject.org  Thu Apr 23 16:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:48:07 +0000
Subject: [pkgdb] perl-MooseX-MethodAttributes (Fedora,
	devel) updated by kevin
Message-ID: <20090423164807.3E93310F898@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-MethodAttributes (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-MethodAttributes (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MethodAttributes



From kevin at fedoraproject.org  Thu Apr 23 16:48:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:48:16 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes - New directory
Message-ID: <20090423164816.2C6EE70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MethodAttributes
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19352/rpms/perl-MooseX-MethodAttributes

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-MethodAttributes added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:48:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:48:16 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel - New directory
Message-ID: <20090423164816.71D6470104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19352/rpms/perl-MooseX-MethodAttributes/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-MethodAttributes/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:48:29 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090423164829.797C670106@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19352/rpms/perl-MooseX-MethodAttributes/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-MethodAttributes


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-MethodAttributes
# $Id: Makefile,v 1.1 2009/04/23 16:48:29 kevin Exp $
NAME := perl-MooseX-MethodAttributes
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 23 16:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:48:29 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes Makefile,NONE,1.1
Message-ID: <20090423164829.31C3170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MethodAttributes
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA19352/rpms/perl-MooseX-MethodAttributes

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-MethodAttributes


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-MethodAttributes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 23 16:49:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:49:08 +0000
Subject: [pkgdb] perl-RT-Client-REST was added for cweyl
Message-ID: <20090423164908.4B50E10F88D@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-RT-Client-REST with summary Talk to RT using REST protocol
kevin has approved Package perl-RT-Client-REST
kevin has added a Fedora devel branch for perl-RT-Client-REST with an owner of cweyl
kevin has approved perl-RT-Client-REST in Fedora devel
kevin has approved Package perl-RT-Client-REST
kevin has set commit to Approved for provenpackager on perl-RT-Client-REST (Fedora devel)
kevin has set build to Approved for provenpackager on perl-RT-Client-REST (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-RT-Client-REST (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RT-Client-REST



From pkgdb at fedoraproject.org  Thu Apr 23 16:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:49:12 +0000
Subject: [pkgdb] perl-RT-Client-REST (Fedora, 10) updated by kevin
Message-ID: <20090423164913.95D7810F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-RT-Client-REST
kevin has set commit to Approved for provenpackager on perl-RT-Client-REST (Fedora 10)
kevin has set build to Approved for provenpackager on perl-RT-Client-REST (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-RT-Client-REST (Fedora 10)
kevin approved watchbugzilla on perl-RT-Client-REST (Fedora 10) for perl-sig
kevin approved watchcommits on perl-RT-Client-REST (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RT-Client-REST



From pkgdb at fedoraproject.org  Thu Apr 23 16:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:49:12 +0000
Subject: [pkgdb] perl-RT-Client-REST (Fedora, 11) updated by kevin
Message-ID: <20090423164913.B78B210F88E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-RT-Client-REST
kevin has set commit to Approved for provenpackager on perl-RT-Client-REST (Fedora 11)
kevin has set build to Approved for provenpackager on perl-RT-Client-REST (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-RT-Client-REST (Fedora 11)
kevin approved watchbugzilla on perl-RT-Client-REST (Fedora 11) for perl-sig
kevin approved watchcommits on perl-RT-Client-REST (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RT-Client-REST



From pkgdb at fedoraproject.org  Thu Apr 23 16:49:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:49:13 +0000
Subject: [pkgdb] perl-RT-Client-REST (Fedora, devel) updated by kevin
Message-ID: <20090423164913.D2D4610F89B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-RT-Client-REST (Fedora devel) for perl-sig
kevin approved watchcommits on perl-RT-Client-REST (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RT-Client-REST



From pkgdb at fedoraproject.org  Thu Apr 23 16:49:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:49:13 +0000
Subject: [pkgdb] perl-RT-Client-REST (Fedora, 9) updated by kevin
Message-ID: <20090423164913.F24C310F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-RT-Client-REST
kevin has set commit to Approved for provenpackager on perl-RT-Client-REST (Fedora 9)
kevin has set build to Approved for provenpackager on perl-RT-Client-REST (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-RT-Client-REST (Fedora 9)
kevin approved watchbugzilla on perl-RT-Client-REST (Fedora 9) for perl-sig
kevin approved watchcommits on perl-RT-Client-REST (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-RT-Client-REST



From kevin at fedoraproject.org  Thu Apr 23 16:49:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:49:22 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST - New directory
Message-ID: <20090423164922.2C47B70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-RT-Client-REST
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19711/rpms/perl-RT-Client-REST

Log Message:
Directory /cvs/pkgs/rpms/perl-RT-Client-REST added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:49:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:49:22 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST/devel - New directory
Message-ID: <20090423164922.72FE170104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-RT-Client-REST/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19711/rpms/perl-RT-Client-REST/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-RT-Client-REST/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:49:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:49:32 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST Makefile,NONE,1.1
Message-ID: <20090423164932.58EDA70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-RT-Client-REST
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19711/rpms/perl-RT-Client-REST

Added Files:
	Makefile 
Log Message:
Setup of module perl-RT-Client-REST


--- NEW FILE Makefile ---
# Top level Makefile for module perl-RT-Client-REST
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 23 16:49:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:49:32 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090423164932.AA0FB70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-RT-Client-REST/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19711/rpms/perl-RT-Client-REST/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-RT-Client-REST


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-RT-Client-REST
# $Id: Makefile,v 1.1 2009/04/23 16:49:32 kevin Exp $
NAME := perl-RT-Client-REST
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 23 16:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:50:09 +0000
Subject: [pkgdb] perl-Text-VimColor was added for mmaslano
Message-ID: <20090423165009.BB4D310F891@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Text-VimColor with summary Syntax color text in HTML or XML using Vim
kevin has approved Package perl-Text-VimColor
kevin has added a Fedora devel branch for perl-Text-VimColor with an owner of mmaslano
kevin has approved perl-Text-VimColor in Fedora devel
kevin has approved Package perl-Text-VimColor
kevin has set commit to Approved for provenpackager on perl-Text-VimColor (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Text-VimColor (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Text-VimColor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-VimColor



From pkgdb at fedoraproject.org  Thu Apr 23 16:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:50:11 +0000
Subject: [pkgdb] perl-Text-VimColor (Fedora, devel) updated by kevin
Message-ID: <20090423165011.ECBD210F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Text-VimColor (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Text-VimColor (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-VimColor



From kevin at fedoraproject.org  Thu Apr 23 16:50:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:50:25 +0000 (UTC)
Subject: rpms/perl-Text-VimColor - New directory
Message-ID: <20090423165025.2D1DE70104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-VimColor
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp19979/rpms/perl-Text-VimColor

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-VimColor added to the repository




From kevin at fedoraproject.org  Thu Apr 23 16:50:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:50:25 +0000 (UTC)
Subject: rpms/perl-Text-VimColor/devel - New directory
Message-ID: <20090423165025.735A470104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-VimColor/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp19979/rpms/perl-Text-VimColor/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Text-VimColor/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 23 16:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 23 Apr 2009 16:50:11 +0000
Subject: [pkgdb] perl-Text-VimColor (Fedora, 11) updated by kevin
Message-ID: <20090423165012.05A3610F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Text-VimColor
kevin has set commit to Approved for provenpackager on perl-Text-VimColor (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Text-VimColor (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Text-VimColor (Fedora 11)
kevin approved watchbugzilla on perl-Text-VimColor (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Text-VimColor (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-VimColor



From kevin at fedoraproject.org  Thu Apr 23 16:50:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:50:36 +0000 (UTC)
Subject: rpms/perl-Text-VimColor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090423165036.AA82370106@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-VimColor/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp19979/rpms/perl-Text-VimColor/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-VimColor


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Text-VimColor
# $Id: Makefile,v 1.1 2009/04/23 16:50:36 kevin Exp $
NAME := perl-Text-VimColor
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 23 16:50:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 23 Apr 2009 16:50:36 +0000 (UTC)
Subject: rpms/perl-Text-VimColor Makefile,NONE,1.1
Message-ID: <20090423165036.5796070104@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Text-VimColor
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp19979/rpms/perl-Text-VimColor

Added Files:
	Makefile 
Log Message:
Setup of module perl-Text-VimColor


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-VimColor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ovasik at fedoraproject.org  Thu Apr 23 17:01:02 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 23 Apr 2009 17:01:02 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-i18n.patch, 1.33, 1.34 coreutils.spec,
	1.258, 1.259
Message-ID: <20090423170102.8A9C070107@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21356

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
fix segfaults in join (i18n patch) when using multibyte locales(#497368)

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- coreutils-i18n.patch	1 Apr 2009 11:14:30 -0000	1.33
+++ coreutils-i18n.patch	23 Apr 2009 17:01:01 -0000	1.34
@@ -433,7 +433,7 @@
 +
 +  memset (&state, 0, sizeof (mbstate_t));
 +
-+  if (ptr == lim)
++  if (ptr >= lim)
 +    return;
 +
 +  if (tab != NULL)
@@ -464,7 +464,7 @@
 +		}
 +	    }
 +
-+	  if (sep == lim)
++	  if (sep >= lim)
 +	    break;
 +
 +	  extract_field (line, ptr, sep - ptr);
@@ -505,7 +505,7 @@
 +	  mblength = (mblength < 1) ? 1 : mblength;
 +
 +	  sep = ptr + mblength;
-+	  while (sep != lim)
++	  while (sep < lim)
 +	    {
 +	      state_bak = state;
 +	      mblength = mbrtowc (&wc, sep, lim - sep + 1, &state);
@@ -524,7 +524,7 @@
 +	    }
 +
 +	  extract_field (line, ptr, sep - ptr);
-+	  if (sep == lim)
++	  if (sep >= lim)
 +	    return;
 +
 +	  state_bak = state;
@@ -538,7 +538,7 @@
 +	  mblength = (mblength < 1) ? 1 : mblength;
 +
 +	  ptr = sep + mblength;
-+	  while (ptr != lim)
++	  while (ptr < lim)
 +	    {
 +	      state_bak = state;
 +	      mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state);
@@ -556,7 +556,7 @@
 +	      ptr += mblength;
 +	    }
 +	}
-+      while (ptr != lim);
++      while (ptr < lim);
 +    }
 +
 +  extract_field (line, ptr, lim - ptr);


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- coreutils.spec	17 Apr 2009 09:54:04 -0000	1.258
+++ coreutils.spec	23 Apr 2009 17:01:01 -0000	1.259
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -314,6 +314,10 @@
 /sbin/runuser
 
 %changelog
+* Thu Apr 23 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-3
+- fix segfaults in join (i18n patch) when using multibyte
+  locales(#497368)
+
 * Fri Apr 17 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-2
 - make mv xattr support failures silent (as is done for
   cp -a) - #496142



From hadess at fedoraproject.org  Thu Apr 23 17:10:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 17:10:22 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/devel gstreamer-rtsp.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423171022.4703070104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-rtsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22772/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer-rtsp.spec import.log 
Log Message:
First commit



--- NEW FILE gstreamer-rtsp.spec ---
# Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		gstreamer-rtsp
Version:	0.10.1.0
Release:	3%{?dist}
Summary:	GStreamer RTSP server library

Group:		Applications/Multimedia
License:	LGPLv2+
URL:		http://people.freedesktop.org/~wtay/
Source0:	http://people.freedesktop.org/~wtay/gst-rtsp-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	gstreamer-devel gstreamer-plugins-base-devel
BuildRequires:	python-devel gstreamer-python-devel pygobject2-devel
BuildRequires:	vala-devel

%description
A GStreamer-based RTSP server library, with Python and Vala bindings.

%package devel
Summary:	Development files for %{name}
Requires:	%{name} = %{version}-%{release}
Group:		Development/Libraries
License:	LGPLv2+
Requires:	pkgconfig
Requires:	gstreamer-devel
Requires:	%{name} = %{version}-%{release}

%description devel
Development files for %{name}, the GStreamer RTSP server library.

%package python
Summary:	Python bindings for %{name}
Requires:	%{name} = %{version}-%{release}
License:	LGPLv2+
Requires:	gstreamer-python
Requires:	%{name} = %{version}-%{release}

%description python
Python bindings for %{name}, the GStreamer RTSP server library.

%package vala
Summary:	Vala bindings for %{name}
Requires:	%{name} = %{version}-%{release}
License:	LGPLv2+
Requires:	vala
Requires:	%{name} = %{version}-%{release}

%description vala
Vala bindings for %{name}, the GStreamer RTSP server library.

%prep
%setup -q -n gst-rtsp-%{version}

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgstrtspserver-0.10.la \
	$RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gst-0.10/gst/rtspserver.{a,la}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING.LIB README TODO NEWS
%{_libdir}/libgstrtspserver-0.10.so.0
%{_libdir}/libgstrtspserver-0.10.so.0.0.0

%files devel
%defattr(-,root,root,-)
%{_includedir}/gstreamer-0.10/gst/rtsp-server
%{_libdir}/libgstrtspserver-0.10.so
%{_libdir}/pkgconfig/gst-rtsp-server-0.10.pc
%{_datadir}/gst-rtsp/

%files python
%defattr(-,root,root,-)
%{_libdir}/python*/site-packages/gst-0.10/gst/rtspserver.so

%files vala
%defattr(-,root,root,-)
%{_datadir}/vala/vapi/gst-rtsp-server-0.10.deps
%{_datadir}/vala/vapi/gst-rtsp-server-0.10.vapi

%changelog
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0-3
- Update for missing Requires, and ldconfig calls, with help from
  Peter Lemenkov <lemenkov at gmail.com>

* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0-2
- Require gstreamer-python-devel in F11

* Tue Feb 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0
- First version



--- NEW FILE import.log ---
gstreamer-rtsp-0_10_1_0-3_fc10:HEAD:gstreamer-rtsp-0.10.1.0-3.fc10.src.rpm:1240505434


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:28:40 -0000	1.1
+++ .cvsignore	23 Apr 2009 17:09:51 -0000	1.2
@@ -0,0 +1 @@
+gst-rtsp-0.10.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:28:40 -0000	1.1
+++ sources	23 Apr 2009 17:09:51 -0000	1.2
@@ -0,0 +1 @@
+67133d588a5153d80a4f8828aad2ec83  gst-rtsp-0.10.1.0.tar.bz2



From sailer at fedoraproject.org  Thu Apr 23 17:12:03 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 23 Apr 2009 17:12:03 +0000 (UTC)
Subject: rpms/mingw32-sqlite/devel mingw32-sqlite.spec,1.5,1.6
Message-ID: <20090423171203.5A86770104@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23164

Modified Files:
	mingw32-sqlite.spec 
Log Message:
heed Erik van Pienbroek advice wrt. CFLAGS



Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-sqlite.spec	23 Apr 2009 13:36:21 -0000	1.5
+++ mingw32-sqlite.spec	23 Apr 2009 17:11:32 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           mingw32-sqlite
 Version:        3.6.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
 License:        Public Domain
@@ -79,7 +79,7 @@
 #   - RWMJ 2008-09-30
 export config_TARGET_EXEEXT=.exe
 # add compile flags to enable rtree, fts3
-export MINGW32_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
+export MINGW32_CFLAGS="$MINGW32_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
 
 %{_mingw32_configure}
 make
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.12-3
+- use Erik van Pienbroek way to add to CFLAGS
+
 * Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.12-2
 - BR tclsh; the build process without tclsh and with extensions
   enabled is broken



From hadess at fedoraproject.org  Thu Apr 23 17:12:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 17:12:41 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/F-11 gstreamer-rtsp.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423171241.E4E2E70104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-rtsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23282

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer-rtsp.spec 
Log Message:
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0-3
- Update for missing Requires, and ldconfig calls, with help from
  Peter Lemenkov <lemenkov at gmail.com>


--- NEW FILE gstreamer-rtsp.spec ---
# Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		gstreamer-rtsp
Version:	0.10.1.0
Release:	3%{?dist}
Summary:	GStreamer RTSP server library

Group:		Applications/Multimedia
License:	LGPLv2+
URL:		http://people.freedesktop.org/~wtay/
Source0:	http://people.freedesktop.org/~wtay/gst-rtsp-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	gstreamer-devel gstreamer-plugins-base-devel
BuildRequires:	python-devel gstreamer-python-devel pygobject2-devel
BuildRequires:	vala-devel

%description
A GStreamer-based RTSP server library, with Python and Vala bindings.

%package devel
Summary:	Development files for %{name}
Requires:	%{name} = %{version}-%{release}
Group:		Development/Libraries
License:	LGPLv2+
Requires:	pkgconfig
Requires:	gstreamer-devel
Requires:	%{name} = %{version}-%{release}

%description devel
Development files for %{name}, the GStreamer RTSP server library.

%package python
Summary:	Python bindings for %{name}
Requires:	%{name} = %{version}-%{release}
License:	LGPLv2+
Requires:	gstreamer-python
Requires:	%{name} = %{version}-%{release}

%description python
Python bindings for %{name}, the GStreamer RTSP server library.

%package vala
Summary:	Vala bindings for %{name}
Requires:	%{name} = %{version}-%{release}
License:	LGPLv2+
Requires:	vala
Requires:	%{name} = %{version}-%{release}

%description vala
Vala bindings for %{name}, the GStreamer RTSP server library.

%prep
%setup -q -n gst-rtsp-%{version}

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgstrtspserver-0.10.la \
	$RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gst-0.10/gst/rtspserver.{a,la}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING.LIB README TODO NEWS
%{_libdir}/libgstrtspserver-0.10.so.0
%{_libdir}/libgstrtspserver-0.10.so.0.0.0

%files devel
%defattr(-,root,root,-)
%{_includedir}/gstreamer-0.10/gst/rtsp-server
%{_libdir}/libgstrtspserver-0.10.so
%{_libdir}/pkgconfig/gst-rtsp-server-0.10.pc
%{_datadir}/gst-rtsp/

%files python
%defattr(-,root,root,-)
%{_libdir}/python*/site-packages/gst-0.10/gst/rtspserver.so

%files vala
%defattr(-,root,root,-)
%{_datadir}/vala/vapi/gst-rtsp-server-0.10.deps
%{_datadir}/vala/vapi/gst-rtsp-server-0.10.vapi

%changelog
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0-3
- Update for missing Requires, and ldconfig calls, with help from
  Peter Lemenkov <lemenkov at gmail.com>

* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0-2
- Require gstreamer-python-devel in F11

* Tue Feb 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:28:40 -0000	1.1
+++ .cvsignore	23 Apr 2009 17:12:11 -0000	1.2
@@ -0,0 +1 @@
+gst-rtsp-0.10.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:28:40 -0000	1.1
+++ sources	23 Apr 2009 17:12:11 -0000	1.2
@@ -0,0 +1 @@
+67133d588a5153d80a4f8828aad2ec83  gst-rtsp-0.10.1.0.tar.bz2



From hadess at fedoraproject.org  Thu Apr 23 17:48:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 23 Apr 2009 17:48:10 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/devel import.log,1.1,NONE
Message-ID: <20090423174810.B2A7270104@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-rtsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27754

Removed Files:
	import.log 
Log Message:
* Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.1.0-3
- Update for missing Requires, and ldconfig calls, with help from
  Peter Lemenkov <lemenkov at gmail.com>


--- import.log DELETED ---



From cebbert at fedoraproject.org  Thu Apr 23 17:50:28 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 17:50:28 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-backport-f11-fixes-1.patch, NONE,
	1.1 kernel.spec, 1.1344, 1.1345
Message-ID: <20090423175028.9CC7770104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28002

Modified Files:
	kernel.spec 
Added Files:
	drm-backport-f11-fixes-1.patch 
Log Message:
drm-backport-f11-fixes-1.patch

drm-backport-f11-fixes-1.patch:

--- NEW FILE drm-backport-f11-fixes-1.patch ---
from: commit 33769d2b889e01e0026ce8980ce4f5803ce14d15
      Author: Dave Airlie <airlied at redhat.com>
      Date:   Fri Apr 17 14:04:02 2009 +1000

         fix oops when setting palette on disconnected crtc

commit 19f4dc490ab0417a28c100012bdd8d3633fd42a7
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Apr 17 08:41:09 2009 +1000

    radeon: fix panel mode name

commit 80a878ea6be30bcd9a48d9b825f0bc5f42a6f31f
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Apr 17 10:45:51 2009 +1000

    radeon: r3xx/r4xx hw i2c engine ties up lines when in reset
    
    When the hw offload engine is in reset, it ties up the DDC
    lines on certain chips

--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -130,6 +130,9 @@
 	if (size != 256)
 		return;
 
+	if (!crtc->fb)
+		return;
+
 	if (crtc->fb->depth == 16) {
 		for (i = 0; i < 64; i++) {
 			if (i <= 31) {
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -119,9 +119,9 @@
 		mode->flags = 0;
 
 		mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
+		drm_mode_set_name(mode);
 
-		DRM_DEBUG("Adding native panel mode %dx%d\n",
-			  native_mode->panel_xres, native_mode->panel_yres);
+		DRM_DEBUG("Adding native panel mode %s\n", mode->name);
 	}
 	return mode;
 }
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -65,6 +65,16 @@
 	uint32_t temp;
 	struct radeon_i2c_bus_rec *rec = &radeon_connector->ddc_bus->rec;
 
+	/*
+ 	 * on certain r3xx/rv4xx the hw i2c block appears to hold the
+	 * gpio lines in reset, select different gpios to avoid this
+	 */
+	if (radeon_is_r300(dev_priv)) {
+		if (rec->a_clk_reg == RADEON_GPIO_VGA_DDC)
+			RADEON_WRITE(RADEON_DVI_I2C_CNTL_0, 0x30);
+		else
+			RADEON_WRITE(RADEON_DVI_I2C_CNTL_0, 0x20);
+	}
 	if (lock_state) {
 		temp = RADEON_READ(rec->a_clk_reg);
 		temp &= ~(rec->a_clk_mask);



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1344
retrieving revision 1.1345
diff -u -r1.1344 -r1.1345
--- kernel.spec	23 Apr 2009 14:24:18 -0000	1.1344
+++ kernel.spec	23 Apr 2009 17:49:58 -0000	1.1345
@@ -663,6 +663,7 @@
 Patch1814: drm-nouveau.patch
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1817: drm-f10-compat.patch
+Patch1818: drm-backport-f11-fixes-1.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1296,6 +1297,7 @@
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-f10-compat.patch
+ApplyPatch drm-backport-f11-fixes-1.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1907,6 +1909,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-45.rc1
+- drm-backport-f11-fixes-1.patch
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-44.rc1
 - 2.6.29.2-rc1
 



From fangq at fedoraproject.org  Thu Apr 23 18:18:30 2009
From: fangq at fedoraproject.org (Qianqian Fang)
Date: Thu, 23 Apr 2009 18:18:30 +0000 (UTC)
Subject: rpms/wqy-bitmap-fonts/F-11 61-wqy-bitmapsong.conf,1.5,1.6
Message-ID: <20090423181830.4A38F70104@cvs1.fedora.phx.redhat.com>

Author: fangq

Update of /cvs/pkgs/rpms/wqy-bitmap-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv677

Modified Files:
	61-wqy-bitmapsong.conf 
Log Message:
update outdated Uming font names (Bug#492510)


Index: 61-wqy-bitmapsong.conf
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/F-11/61-wqy-bitmapsong.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 61-wqy-bitmapsong.conf	11 May 2008 18:26:37 -0000	1.5
+++ 61-wqy-bitmapsong.conf	23 Apr 2009 18:17:59 -0000	1.6
@@ -67,7 +67,7 @@
                    <double>16</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ZenKai Uni</string>
+                   <string>AR PL UMing CN</string>
            </edit>
       </match>
        <match target="pattern">
@@ -81,7 +81,7 @@
                    <double>10</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ZenKai Uni</string>
+                   <string>AR PL UMing CN</string>
            </edit>
       </match>
 
@@ -100,7 +100,7 @@
                    <double>16</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ShanHeiSun Uni</string>
+                   <string>WenQuanYi Zen Hei</string>
            </edit>
       </match>
        <match target="pattern">
@@ -114,7 +114,7 @@
                    <double>10</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ShanHeiSun Uni</string>
+                   <string>WenQuanYi Zen Hei</string>
            </edit>
       </match>
 



From sailer at fedoraproject.org  Thu Apr 23 18:20:46 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 23 Apr 2009 18:20:46 +0000 (UTC)
Subject: rpms/mingw32-sqlite/devel mingw32-sqlite.spec,1.6,1.7
Message-ID: <20090423182046.4330C70104@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv935

Modified Files:
	mingw32-sqlite.spec 
Log Message:
now really fix the CFLAGS issue



Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mingw32-sqlite.spec	23 Apr 2009 17:11:32 -0000	1.6
+++ mingw32-sqlite.spec	23 Apr 2009 18:20:15 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           mingw32-sqlite
 Version:        3.6.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
 License:        Public Domain
@@ -79,7 +79,7 @@
 #   - RWMJ 2008-09-30
 export config_TARGET_EXEEXT=.exe
 # add compile flags to enable rtree, fts3
-export MINGW32_CFLAGS="$MINGW32_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
+export MINGW32_CFLAGS="%{_mingw32_cflags} -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
 
 %{_mingw32_configure}
 make
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.12-4
+- fix CFLAGS setting
+
 * Thu Apr 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.12-3
 - use Erik van Pienbroek way to add to CFLAGS
 



From s4504kr at fedoraproject.org  Thu Apr 23 18:21:08 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 23 Apr 2009 18:21:08 +0000 (UTC)
Subject: rpms/snobol/devel snobol-4.1.2-config.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 snobol.spec, 1.3, 1.4 sources, 1.2,
	1.3 snobol-4.1.1-config.patch, 1.1, NONE
Message-ID: <20090423182108.06C1870104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1038

Modified Files:
	.cvsignore snobol.spec sources 
Added Files:
	snobol-4.1.2-config.patch 
Removed Files:
	snobol-4.1.1-config.patch 
Log Message:
New upstream release

snobol-4.1.2-config.patch:

--- NEW FILE snobol-4.1.2-config.patch ---
diff -up snobol4-1.2/configure.bak snobol4-1.2/configure
--- snobol4-1.2/configure.bak	2007-03-07 01:21:34.000000000 +0100
+++ snobol4-1.2/configure	2009-04-23 20:13:48.000000000 +0200
@@ -125,6 +125,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -255,9 +258,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -452,7 +456,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1030,7 +1034,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.2/Makefile2.m4.bak snobol4-1.2/Makefile2.m4
--- snobol4-1.2/Makefile2.m4.bak	2008-03-31 22:27:35.000000000 +0200
+++ snobol4-1.2/Makefile2.m4	2009-04-23 20:15:32.000000000 +0200
@@ -33,6 +33,10 @@ define([_CFLAGS],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -180,7 +184,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) 
+CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) -fPIC
 
 ################
 
@@ -228,9 +232,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -417,10 +421,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -535,7 +545,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -549,10 +559,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snobol/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2008 15:41:11 -0000	1.2
+++ .cvsignore	23 Apr 2009 18:20:37 -0000	1.3
@@ -1 +1 @@
-snobol4-1.1.tar.gz
+snobol4-1.2.tar.gz


Index: snobol.spec
===================================================================
RCS file: /cvs/extras/rpms/snobol/devel/snobol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snobol.spec	26 Feb 2009 01:49:26 -0000	1.3
+++ snobol.spec	23 Apr 2009 18:20:37 -0000	1.4
@@ -1,15 +1,15 @@
-%define snobrel 1.1
+%define snobrel 1.2
 
 Name:           snobol
 Version:        4.%{snobrel}
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        The SNOBOL programming language
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.snobol4.org
 Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
-Patch1:		snobol-4.1.1-config.patch
+Patch1:		snobol-4.1.2-config.patch
 Patch2:		snobol-4.1.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl-devel
@@ -70,6 +70,9 @@
 %{_libdir}/libsnobol.so
 
 %changelog
+* Thu Apr 23 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.1.2-1
+- New upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 15:41:11 -0000	1.2
+++ sources	23 Apr 2009 18:20:37 -0000	1.3
@@ -1 +1 @@
-101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz
+5265d1e21b8d1963e0c7fe830c3d5172  snobol4-1.2.tar.gz


--- snobol-4.1.1-config.patch DELETED ---



From fangq at fedoraproject.org  Thu Apr 23 18:22:59 2009
From: fangq at fedoraproject.org (Qianqian Fang)
Date: Thu, 23 Apr 2009 18:22:59 +0000 (UTC)
Subject: rpms/wqy-bitmap-fonts/F-11 wqy-bitmap-fonts.spec,1.22,1.23
Message-ID: <20090423182300.01F2270104@cvs1.fedora.phx.redhat.com>

Author: fangq

Update of /cvs/pkgs/rpms/wqy-bitmap-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1401

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update spec (Bug#492510)


Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/F-11/wqy-bitmap-fonts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wqy-bitmap-fonts.spec	26 Feb 2009 07:13:12 -0000	1.22
+++ wqy-bitmap-fonts.spec	23 Apr 2009 18:22:29 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:           %{fontname}-fonts
 Version:        0.9.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        WenQuanYi Bitmap Chinese Fonts
 
 Group:          User Interface/X
@@ -69,6 +69,9 @@
 
 
 %changelog
+*Thu Apr 23 2009 Qianqian Fang <fangqq at gmail.com> 0.9.9-10
+- correct outdated uming font names for F11 (#492510)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Thu Apr 23 18:24:11 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 23 Apr 2009 18:24:11 +0000 (UTC)
Subject: rpms/qt-creator/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 qt-creator.spec, 1.1, 1.2 sources, 1.2,
	1.3 disable_private_header_check.patch, 1.1,
	NONE enable-signal-slot.patch, 1.1, NONE pluginPaths.patch, 1.1,
	NONE qtcreator-qworkbenchlibrary_lib64.patch, 1.1,
	NONE qtcreator-qworkbenchplugin_lib64.patch, 1.1,
	NONE qtcreator_rpath.patch, 1.1, NONE qworkbench_lib64.patch,
	1.1, NONE
Message-ID: <20090423182411.55F1A70104@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1570/devel

Modified Files:
	.cvsignore import.log qt-creator.spec sources 
Removed Files:
	disable_private_header_check.patch enable-signal-slot.patch 
	pluginPaths.patch qtcreator-qworkbenchlibrary_lib64.patch 
	qtcreator-qworkbenchplugin_lib64.patch qtcreator_rpath.patch 
	qworkbench_lib64.patch 
Log Message:
qt-creator 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Apr 2009 03:06:11 -0000	1.2
+++ .cvsignore	23 Apr 2009 18:23:40 -0000	1.3
@@ -1 +1 @@
-qt-creator-1.0.0-src.zip
+qt-creator-1.1.0-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Apr 2009 03:06:11 -0000	1.1
+++ import.log	23 Apr 2009 18:23:40 -0000	1.2
@@ -1 +1,2 @@
 qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
+qt-creator-1_1_0-1_fc11:HEAD:qt-creator-1.1.0-1.fc11.src.rpm:1240510779


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-creator.spec	5 Apr 2009 03:06:11 -0000	1.1
+++ qt-creator.spec	23 Apr 2009 18:23:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           qt-creator
-Version:        1.0.0
-Release:        4%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -11,29 +11,14 @@
 
 Source1:       qtcreator.desktop
 
-#make ui editor works
-#patch from http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff;h=f3f20d96bdfb5266cc25ac91ae0def8a33875a81
-Patch0:         disable_private_header_check.patch
-
 #fix qdoc3 executable location in fedora
 Patch1:         qtdoc3_location.patch
 
-#make it install into lib64
-Patch2:         qtcreator-qworkbenchlibrary_lib64.patch
-Patch3:         qtcreator-qworkbenchplugin_lib64.patch
-Patch4:         qworkbench_lib64.patch
-Patch5:         qtcreator_rpath.patch
-
-#enable signal/slot editor  http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff_plain;h=bf118eba1ee1f5b6e19c6f29cd7d114c121a20ef
-Patch6:        enable-signal-slot.patch
-
-#search for plugins in lib64 dir
-Patch7:        pluginPaths.patch
-
 #temporary disabled docs
 Patch8:       no-docu.diff
 
 BuildRequires:  qt4-devel >= 4.5.0
+BuildRequires:  desktop-file-utils
 
 %description
 Qt Creator (previously known as Project Greenhouse) is a new,
@@ -43,20 +28,7 @@
 
 %prep
 %setup -q -n %name-%version-src
-%patch0 -p0
 %patch1 -p0
-
-#make it install into lib64
-%if "%{_lib}" == "lib64"
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch7 -p0
-%endif
-
-%patch6 -p0
-
 %patch8 -p0
 
 %build
@@ -78,12 +50,6 @@
 --dir=%{buildroot}%{_datadir}/applications              \
 %{SOURCE1}
 
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,12 +58,19 @@
 %defattr(-,root,root,-)
 %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
 %{_bindir}/qtcreator
+%{_bindir}/qtcreator.bin
+%{_bindir}/qtcreator_process_stub
 %{_libdir}/qtcreator
 %{_datadir}/qtcreator
 %{_datadir}/pixmaps/qtcreator_logo_*.png
 %{_datadir}/applications/qtcreator.desktop
 
+
 %changelog
+* Thu Apr 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1.0-1
+- qt-creator 1.1.0
+- include missing BuildRequires desktop-file-utils
+
 * Tue Mar 20 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-4
 - fix lib's loading in 64 bit machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Apr 2009 03:06:12 -0000	1.2
+++ sources	23 Apr 2009 18:23:41 -0000	1.3
@@ -1 +1 @@
-5478124035d80a90e66a3db67ab4477a  qt-creator-1.0.0-src.zip
+f0fd01f7c5a1f50c479bed13db2134bf  qt-creator-1.1.0-src.zip


--- disable_private_header_check.patch DELETED ---


--- enable-signal-slot.patch DELETED ---


--- pluginPaths.patch DELETED ---


--- qtcreator-qworkbenchlibrary_lib64.patch DELETED ---


--- qtcreator-qworkbenchplugin_lib64.patch DELETED ---


--- qtcreator_rpath.patch DELETED ---


--- qworkbench_lib64.patch DELETED ---



From s4504kr at fedoraproject.org  Thu Apr 23 18:29:43 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 23 Apr 2009 18:29:43 +0000 (UTC)
Subject: rpms/snobol/F-11 snobol-4.1.2-config.patch, NONE, 1.1 snobol.spec,
	1.3, 1.4 sources, 1.2, 1.3 snobol-4.1.1-config.patch, 1.1, NONE
Message-ID: <20090423182943.58A7470104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2387

Modified Files:
	snobol.spec sources 
Added Files:
	snobol-4.1.2-config.patch 
Removed Files:
	snobol-4.1.1-config.patch 
Log Message:
New upstream release

snobol-4.1.2-config.patch:

--- NEW FILE snobol-4.1.2-config.patch ---
diff -up snobol4-1.2/configure.bak snobol4-1.2/configure
--- snobol4-1.2/configure.bak	2007-03-07 01:21:34.000000000 +0100
+++ snobol4-1.2/configure	2009-04-23 20:13:48.000000000 +0200
@@ -125,6 +125,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -255,9 +258,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -452,7 +456,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1030,7 +1034,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.2/Makefile2.m4.bak snobol4-1.2/Makefile2.m4
--- snobol4-1.2/Makefile2.m4.bak	2008-03-31 22:27:35.000000000 +0200
+++ snobol4-1.2/Makefile2.m4	2009-04-23 20:15:32.000000000 +0200
@@ -33,6 +33,10 @@ define([_CFLAGS],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -180,7 +184,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) 
+CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) -fPIC
 
 ################
 
@@ -228,9 +232,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -417,10 +421,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -535,7 +545,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -549,10 +559,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2


Index: snobol.spec
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-11/snobol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snobol.spec	26 Feb 2009 01:49:26 -0000	1.3
+++ snobol.spec	23 Apr 2009 18:29:12 -0000	1.4
@@ -1,15 +1,15 @@
-%define snobrel 1.1
+%define snobrel 1.2
 
 Name:           snobol
 Version:        4.%{snobrel}
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        The SNOBOL programming language
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.snobol4.org
 Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
-Patch1:		snobol-4.1.1-config.patch
+Patch1:		snobol-4.1.2-config.patch
 Patch2:		snobol-4.1.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl-devel
@@ -70,6 +70,9 @@
 %{_libdir}/libsnobol.so
 
 %changelog
+* Thu Apr 23 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.1.2-1
+- New upstream release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 15:41:11 -0000	1.2
+++ sources	23 Apr 2009 18:29:12 -0000	1.3
@@ -1 +1 @@
-101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz
+5265d1e21b8d1963e0c7fe830c3d5172  snobol4-1.2.tar.gz


--- snobol-4.1.1-config.patch DELETED ---



From fangq at fedoraproject.org  Thu Apr 23 18:32:24 2009
From: fangq at fedoraproject.org (Qianqian Fang)
Date: Thu, 23 Apr 2009 18:32:24 +0000 (UTC)
Subject: rpms/wqy-bitmap-fonts/devel 61-wqy-bitmapsong.conf, 1.5,
	1.6 wqy-bitmap-fonts.spec, 1.22, 1.23
Message-ID: <20090423183224.DAE0170104@cvs1.fedora.phx.redhat.com>

Author: fangq

Update of /cvs/pkgs/rpms/wqy-bitmap-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2893

Modified Files:
	61-wqy-bitmapsong.conf wqy-bitmap-fonts.spec 
Log Message:
update outdated Uming font names (Bug#492510)


Index: 61-wqy-bitmapsong.conf
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/devel/61-wqy-bitmapsong.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 61-wqy-bitmapsong.conf	11 May 2008 18:26:37 -0000	1.5
+++ 61-wqy-bitmapsong.conf	23 Apr 2009 18:31:54 -0000	1.6
@@ -67,7 +67,7 @@
                    <double>16</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ZenKai Uni</string>
+                   <string>AR PL UMing CN</string>
            </edit>
       </match>
        <match target="pattern">
@@ -81,7 +81,7 @@
                    <double>10</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ZenKai Uni</string>
+                   <string>AR PL UMing CN</string>
            </edit>
       </match>
 
@@ -100,7 +100,7 @@
                    <double>16</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ShanHeiSun Uni</string>
+                   <string>WenQuanYi Zen Hei</string>
            </edit>
       </match>
        <match target="pattern">
@@ -114,7 +114,7 @@
                    <double>10</double>
            </test>
            <edit name="family" mode="prepend" binding="same">
-                   <string>AR PL ShanHeiSun Uni</string>
+                   <string>WenQuanYi Zen Hei</string>
            </edit>
       </match>
 


Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wqy-bitmap-fonts.spec	26 Feb 2009 07:13:12 -0000	1.22
+++ wqy-bitmap-fonts.spec	23 Apr 2009 18:31:54 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:           %{fontname}-fonts
 Version:        0.9.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        WenQuanYi Bitmap Chinese Fonts
 
 Group:          User Interface/X
@@ -69,6 +69,9 @@
 
 
 %changelog
+*Thu Apr 23 2009 Qianqian Fang <fangqq at gmail.com> 0.9.9-10
+- correct outdated uming font names for F11 (#492510)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Apr 23 18:32:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 23 Apr 2009 18:32:32 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/F-11 invisible-char.patch, NONE,
	1.1 panel-settle.patch, NONE, 1.1 krb5-auth-dialog.spec, 1.33, 1.34
Message-ID: <20090423183232.1C08270104@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2855

Modified Files:
	krb5-auth-dialog.spec 
Added Files:
	invisible-char.patch panel-settle.patch 
Log Message:
Cosmetic fixes


invisible-char.patch:

--- NEW FILE invisible-char.patch ---
diff -up krb5-auth-dialog-0.8/src/krb5-auth-dialog.c.invisible-char krb5-auth-dialog-0.8/src/krb5-auth-dialog.c
--- krb5-auth-dialog-0.8/src/krb5-auth-dialog.c.invisible-char	2009-04-23 14:20:57.404528539 -0400
+++ krb5-auth-dialog-0.8/src/krb5-auth-dialog.c	2009-04-23 14:26:37.969746065 -0400
@@ -270,6 +270,7 @@ krb5_auth_dialog_setup (Krb5AuthApplet *
 {
 	GtkWidget *entry;
 	GtkWidget *label;
+	GtkWidget *e;
 	gchar *wrong_text;
 	gchar *wrong_markup;
 	gchar *prompt;
@@ -298,6 +299,11 @@ krb5_auth_dialog_setup (Krb5AuthApplet *
 	entry = glade_xml_get_widget (applet->pw_xml, "krb5_entry");
 	gtk_secure_entry_set_text (GTK_SECURE_ENTRY (entry), "");
 
+	e = gtk_entry_new ();
+	gtk_secure_entry_set_invisible_char (GTK_SECURE_ENTRY (entry),
+	                                     gtk_entry_get_invisible_char (GTK_ENTRY (e)));
+	gtk_widget_destroy (e);
+
 	/* Use the prompt label that krb5 provides us */
 	label = glade_xml_get_widget (applet->pw_xml, "krb5_message_label");
 	gtk_label_set_text (GTK_LABEL (label), prompt);

panel-settle.patch:

--- NEW FILE panel-settle.patch ---
diff -up krb5-auth-dialog-0.8/src/krb5-auth-notify.c.panel-settle krb5-auth-dialog-0.8/src/krb5-auth-notify.c
--- krb5-auth-dialog-0.8/src/krb5-auth-notify.c.panel-settle	2009-01-11 16:46:19.000000000 -0500
+++ krb5-auth-dialog-0.8/src/krb5-auth-notify.c	2009-04-23 14:09:29.536749401 -0400
@@ -24,6 +24,19 @@
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 
+static gboolean
+show_notification (Krb5AuthApplet *applet)
+{
+        /* wait for the panel to be settled before showing a bubble */
+        if (gtk_status_icon_is_embedded (applet->tray_icon)) {
+                notify_notification_show (applet->notification, NULL);
+        }
+        else {
+                g_timeout_add_seconds (5, (GSourceFunc)show_notification, applet);
+        }
+        return FALSE;
+}
+
 void
 ka_send_event_notification (Krb5AuthApplet *applet,
 			    const char *summary,
@@ -50,7 +63,7 @@ ka_send_event_notification (Krb5AuthAppl
 		notify_notification_new_with_status_icon(summary, message, notify_icon, applet->tray_icon);
 
         notify_notification_set_urgency (applet->notification, NOTIFY_URGENCY_NORMAL);
-        notify_notification_show (applet->notification, NULL);
+        show_notification (applet);
 }
 
 #else /* HAVE_LIBNOTIFY */


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-11/krb5-auth-dialog.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- krb5-auth-dialog.spec	25 Feb 2009 11:59:23 -0000	1.33
+++ krb5-auth-dialog.spec	23 Apr 2009 18:32:01 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -27,7 +27,10 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Patch2: desktop-file-comment.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=580004
+Patch0: panel-settle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=538339
+Patch1: invisible-char.patch
 
 %description
 This package contains a dialog that warns the user when their Kerberos
@@ -35,18 +38,20 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .panel-settle
+%patch1 -p1 -b .invisible-char
 
 %build
 %configure
 make
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %name
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %name.lang
@@ -79,6 +84,10 @@
 fi
 
 %changelog
+* Thu Apr 23 2009 Matthias Clasen <mclasen at redhatcom> - 0.8-4
+- Don't show bubbles before the icon is there
+- Use the same invisible char as the rest of the world
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From s4504kr at fedoraproject.org  Thu Apr 23 18:33:36 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 23 Apr 2009 18:33:36 +0000 (UTC)
Subject: rpms/snobol/F-10 snobol-4.1.2-config.patch, NONE, 1.1 snobol.spec,
	1.1, 1.2 sources, 1.2, 1.3 snobol-4.1.1-config.patch, 1.1, NONE
Message-ID: <20090423183336.6899F70104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3195

Modified Files:
	snobol.spec sources 
Added Files:
	snobol-4.1.2-config.patch 
Removed Files:
	snobol-4.1.1-config.patch 
Log Message:
New upstream release

snobol-4.1.2-config.patch:

--- NEW FILE snobol-4.1.2-config.patch ---
diff -up snobol4-1.2/configure.bak snobol4-1.2/configure
--- snobol4-1.2/configure.bak	2007-03-07 01:21:34.000000000 +0100
+++ snobol4-1.2/configure	2009-04-23 20:13:48.000000000 +0200
@@ -125,6 +125,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -255,9 +258,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -452,7 +456,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1030,7 +1034,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.2/Makefile2.m4.bak snobol4-1.2/Makefile2.m4
--- snobol4-1.2/Makefile2.m4.bak	2008-03-31 22:27:35.000000000 +0200
+++ snobol4-1.2/Makefile2.m4	2009-04-23 20:15:32.000000000 +0200
@@ -33,6 +33,10 @@ define([_CFLAGS],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -180,7 +184,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) 
+CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) -fPIC
 
 ################
 
@@ -228,9 +232,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -417,10 +421,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -535,7 +545,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -549,10 +559,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2


Index: snobol.spec
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-10/snobol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snobol.spec	10 Sep 2008 15:41:11 -0000	1.1
+++ snobol.spec	23 Apr 2009 18:33:05 -0000	1.2
@@ -1,15 +1,15 @@
-%define snobrel 1.1
+%define snobrel 1.2
 
 Name:           snobol
 Version:        4.%{snobrel}
-Release:        6%{?dist}
-Summary:        Macro Implementation of SNOBOL4 in C
+Release:        1%{?dist}
+Summary:        The SNOBOL programming language
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.snobol4.org
 Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
-Patch1:		snobol-4.1.1-config.patch
+Patch1:		snobol-4.1.2-config.patch
 Patch2:		snobol-4.1.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl-devel
@@ -70,6 +70,15 @@
 %{_libdir}/libsnobol.so
 
 %changelog
+* Thu Apr 23 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.1.2-1
+- New upstream release
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Nov 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-7
+- Reworking the summary of the package
+
 * Thu Aug 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-6
 - Try to minimize undef. non-weak symbols
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 15:41:11 -0000	1.2
+++ sources	23 Apr 2009 18:33:05 -0000	1.3
@@ -1 +1 @@
-101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz
+5265d1e21b8d1963e0c7fe830c3d5172  snobol4-1.2.tar.gz


--- snobol-4.1.1-config.patch DELETED ---



From s4504kr at fedoraproject.org  Thu Apr 23 18:38:19 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 23 Apr 2009 18:38:19 +0000 (UTC)
Subject: rpms/snobol/F-9 snobol-4.1.2-config.patch, NONE, 1.1 snobol.spec,
	1.1, 1.2 sources, 1.2, 1.3 snobol-4.1.1-config.patch, 1.1, NONE
Message-ID: <20090423183819.2203F70104@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/snobol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4652

Modified Files:
	snobol.spec sources 
Added Files:
	snobol-4.1.2-config.patch 
Removed Files:
	snobol-4.1.1-config.patch 
Log Message:
New upstream release

snobol-4.1.2-config.patch:

--- NEW FILE snobol-4.1.2-config.patch ---
diff -up snobol4-1.2/configure.bak snobol4-1.2/configure
--- snobol4-1.2/configure.bak	2007-03-07 01:21:34.000000000 +0100
+++ snobol4-1.2/configure	2009-04-23 20:13:48.000000000 +0200
@@ -125,6 +125,9 @@ while [ $# -gt 0 ]; do
 	STUFF=`echo "$1" | sed 's/--bindir=//'`
 	echo "BINDIR=$STUFF"			>> $CONFIG_M4
     	;;
+    --libdir=*)
+        LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+	;;
     --debug)
 	DEBUG=true
 	set -x
@@ -255,9 +258,10 @@ if [ "x$MANDIR" = x ]; then
 fi
 MAN1DIR="$MANDIR/man1"
 MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
 
 echo 'BINDIR=$(DESTDIR)'"$BINDIR"		>> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR"               >> $CONFIG_M4
 echo 'MANDIR=$(DESTDIR)'"$MANDIR"		>> $CONFIG_M4
 echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR"		>> $CONFIG_M4
 echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR"		>> $CONFIG_M4
@@ -452,7 +456,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
 
     # w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
     # so make -O3 the default, and use -fno-inline-functions
-    OPT=-O3
+    # OPT=-O3
 
     if [ ! "$INLINE_OK" ]; then
 	echo 'ADD_OPT([-fno-inline-functions])'	>> $CONFIG_M4
@@ -1030,7 +1034,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
     echo '#define SOCKLEN_T '$SOCKLEN_T		>> $CONFIG_H
 
     # add network libraries if needed
-    if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+    if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
 	# SCO, SunOS5
 	echo 'using libsocket' 1>&2
 	echo 'ADD_LDFLAGS([-lsocket])'		>> $CONFIG_M4
diff -up snobol4-1.2/Makefile2.m4.bak snobol4-1.2/Makefile2.m4
--- snobol4-1.2/Makefile2.m4.bak	2008-03-31 22:27:35.000000000 +0200
+++ snobol4-1.2/Makefile2.m4	2009-04-23 20:15:32.000000000 +0200
@@ -33,6 +33,10 @@ define([_CFLAGS],[undivert(6)])dnl
 
 OPT=-O
 
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
 CCM=./cc-M
 
 # for pow(3)
@@ -42,13 +46,13 @@ SH=sh
 SHELL=/bin/sh
 
 # library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
 
 # filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
 
 # default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
 
 # either snobol4 or isnobol4;
 # isnobol4 has had functions reordered for better inlining.
@@ -180,7 +184,7 @@ LDFLAGS=[]_LDFLAGS
 ################
 # compiler flags
 
-CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) 
+CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) -fPIC
 
 ################
 
@@ -228,9 +232,9 @@ changequote([,])dnl
 
 snobol4: xsnobol4 snobol4.c test/tests.in
 	@echo Running regression tests...
-	(cd test; ./run.sh ../xsnobol4)
+	(export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
 	@echo Passed regression tests.
-	./timing > timing.out
+	(export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
 	-rm -f snobol4$(EXT)
 	ln xsnobol4$(EXT) snobol4$(EXT)
 	@touch snobol4$(EXT)
@@ -417,10 +421,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
 	ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
 	sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
 
-$(SNOLIB_A): $(SNOLIB_OBJS)
-	rm -f $(SNOLIB_A)
-	ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
-	$(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+	rm -f libsnobol.so.$(VERSION)
+	$(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+	 -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS) 
+
+libsnobol.so: libsnobol.so.$(VERSION)
+	 rm -rf libsnobol.so 
+	 rm -rf libsnobol.so.4 
+	 ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+	 ln -sf libsnobol.so.4 libsnobol.so
 
 ################
 # snolib files
@@ -535,7 +545,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
 # generated SNOLIB files (host.sno generated at top level)
 GENSNOLIB=host.sno
 
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB) 
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) 
 
 VERS=`./pv`
 install: snobol4 pv
@@ -549,10 +559,19 @@ install: snobol4 pv
 	$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
 	$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+	$(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+	for F in $(INSTALL_H); do \
+	        $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+        done
 	$(INSTALL) -d $(SNOLIB_DIR)
 	for F in $(SNOLIB_FILES); do \
 		$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
 	done
+	$(INSTALL) -d $(LIBDIR)
+	$(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+	( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+	( cd $(LIBDIR); rm -rf libsnobol.so;   ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
 	@echo '*********************************************************' 1>&2
 	@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
 	@echo '*********************************************************' 1>&2


Index: snobol.spec
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-9/snobol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snobol.spec	10 Sep 2008 15:52:07 -0000	1.1
+++ snobol.spec	23 Apr 2009 18:37:48 -0000	1.2
@@ -1,15 +1,15 @@
-%define snobrel 1.1
+%define snobrel 1.2
 
 Name:           snobol
 Version:        4.%{snobrel}
-Release:        6%{?dist}
-Summary:        Macro Implementation of SNOBOL4 in C
+Release:        1%{?dist}
+Summary:        The SNOBOL programming language
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.snobol4.org
 Source0:        ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
-Patch1:		snobol-4.1.1-config.patch
+Patch1:		snobol-4.1.2-config.patch
 Patch2:		snobol-4.1.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl-devel
@@ -70,6 +70,15 @@
 %{_libdir}/libsnobol.so
 
 %changelog
+* Thu Apr 23 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.1.2-1
+- New upstream release
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Nov 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-7
+- Reworking the summary of the package
+
 * Thu Aug 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-6
 - Try to minimize undef. non-weak symbols
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 15:52:07 -0000	1.2
+++ sources	23 Apr 2009 18:37:48 -0000	1.3
@@ -1 +1 @@
-101df7f3c74abb5703a01a85e58b4e9d  snobol4-1.1.tar.gz
+5265d1e21b8d1963e0c7fe830c3d5172  snobol4-1.2.tar.gz


--- snobol-4.1.1-config.patch DELETED ---



From ajax at fedoraproject.org  Thu Apr 23 18:39:49 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 23 Apr 2009 18:39:49 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11
	xserver-1.6.1-avoid-malloc-for-logging.patch, NONE,
	1.1 xorg-x11-server.spec, 1.440, 1.441
Message-ID: <20090423183949.C96E570104@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4946

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-avoid-malloc-for-logging.patch 
Log Message:
* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 1.6.1-9
- xserver-1.6.1-avoid-malloc-for-logging.patch: Don't malloc when logging,
  since that makes it unsafe to do from a signal handler.


xserver-1.6.1-avoid-malloc-for-logging.patch:

--- NEW FILE xserver-1.6.1-avoid-malloc-for-logging.patch ---
>From 0e0642ee9466d3268476d0084a83a9d93a4aa555 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 16 Apr 2009 16:17:07 +1000
Subject: [PATCH] os: don't malloc memory in LogVMessageVerb.

LogVWrite is limited to a buffer size of 1024, so we don't loose anything here
by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends)
during signal handlers with the normal message types.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Acked-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 os/log.c |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/os/log.c b/os/log.c
index 3961b0b..8108890 100644
--- a/os/log.c
+++ b/os/log.c
@@ -316,7 +316,7 @@ void
 LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
 {
     const char *s  = X_UNKNOWN_STRING;
-    char *tmpBuf = NULL;
+    char tmpBuf[1024];
 
     /* Ignore verbosity for X_ERROR */
     if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
@@ -358,21 +358,11 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
 	    break;
 	}
 
-	/*
-	 * Prefix the format string with the message type.  We do it this way
-	 * so that LogVWrite() is only called once per message.
-	 */
-	if (s) {
-	    tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1);
-	    /* Silently return if malloc fails here. */
-	    if (!tmpBuf)
-		return;
-	    sprintf(tmpBuf, "%s ", s);
-	    strcat(tmpBuf, format);
-	    LogVWrite(verb, tmpBuf, args);
-	    free(tmpBuf);
-	} else
-	    LogVWrite(verb, format, args);
+        /* if s is not NULL we need a space before format */
+        snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
+                                                   s ? " " : "",
+                                                   format);
+        LogVWrite(verb, tmpBuf, args);
     }
 }
 
-- 
1.6.2.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- xorg-x11-server.spec	23 Apr 2009 02:10:23 -0000	1.440
+++ xorg-x11-server.spec	23 Apr 2009 18:39:19 -0000	1.441
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -110,6 +110,7 @@
 # Nominated for 1.6.2
 Patch6033: xserver-1.6.1-activate-device.patch
 Patch6034: xserver-1.6.1-exa-create-pixmap2.patch
+Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -543,6 +544,10 @@
 
 
 %changelog
+* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 1.6.1-9
+- xserver-1.6.1-avoid-malloc-for-logging.patch: Don't malloc when logging,
+  since that makes it unsafe to do from a signal handler.
+
 * Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 1.6.1-8
 - xserver-1.6.1-exa-create-pixmap2.patch - add support for tiling create
   pixmap hook - need to fix firefox on ati rs690 crashes



From guthrie at fedoraproject.org  Thu Apr 23 18:42:21 2009
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Thu, 23 Apr 2009 18:42:21 +0000 (UTC)
Subject: rpms/mediawiki-InputBox/devel InputBox.classes.php, NONE,
	1.1 InputBox.hooks.php, NONE, 1.1 InputBox.i18n.php, NONE,
	1.1 InputBox.php, NONE, 1.1 README.fedora, NONE, 1.1 import.log,
	NONE, 1.1 mediawiki-InputBox.spec, NONE, 1.1
Message-ID: <20090423184221.0CC9170104@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/extras/rpms/mediawiki-InputBox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5608/devel

Added Files:
	InputBox.classes.php InputBox.hooks.php InputBox.i18n.php 
	InputBox.php README.fedora import.log mediawiki-InputBox.spec 
Log Message:
Initial import of files for the mediawiki-InputBox package.



--- NEW FILE InputBox.classes.php ---
<?php
/**
 * Classes for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox class
class InputBox {

	/* Fields */

	private $mParser;
	private $mType = '';
	private $mWidth = 50;
	private $mPreload = '';
	private $mEditIntro = '';
	private $mSummary = '';
	private $mMinor = '';
	private $mPage = '';
	private $mBR = 'yes';
	private $mDefaultText = '';
	private $mBGColor = 'transparent';
	private $mButtonLabel = '';
	private $mSearchButtonLabel = '';
	private $mFullTextButton = '';
	private $mLabelText = '';
	private $mHidden = '';
	private $mNamespaces = '';
	private $mID = '';
	private $mInline = false;
	private $mPrefix = '';

	/* Functions */

	public function __construct( $parser ) {
		$this->mParser = $parser;
	}

	public function render() {
		// Internationalization
		wfLoadExtensionMessages( 'InputBox' );

		// Handle various types
		switch( $this->mType ) {
			case 'create':
			case 'comment':
				return $this->getCreateForm();
			case 'commenttitle':
				return $this->getCommentForm();
			case 'search':
				return $this->getSearchForm('search');
			case 'fulltext':
				return $this->getSearchForm('fulltext');
			case 'search2':
				return $this->getSearchForm2();
			default:
				return Xml::tags( 'div', null,
					Xml::element( 'strong',
						array(
							'class' => 'error'
						),
						strlen( $this->mType ) > 0
						? wfMsgForContent( 'inputbox-error-bad-type', $this->mType ) 
						: wfMsgForContent( 'inputbox-error-no-type' ) 
					)
				);
		}
	}

	/**
	 * Generate search form
	 * @param $type 
	 */
	public function getSearchForm( $type ) {
		global $wgContLang;

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}
		if ( !$this->mSearchButtonLabel ) {
			$this->mSearchButtonLabel = wfMsgHtml( 'searchfulltext' );
		}

		// Build HTML
		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'searchbox',
				'id' => 'searchbox',
				'class' => 'searchbox',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'class' => 'searchboxInput',
				'name' => 'search',
				'type' => $this->mHidden ? 'hidden' : 'text',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth,
			)
		);
		
		if( $this->mPrefix != '' ){
			$htmlOut .= Xml::element( 'input',
				array(
					'name' => 'prefix',
					'type' => 'hidden',
					'value' => $this->mPrefix,
				)
			);	
		}
		
		$htmlOut .= $this->mBR;

		// Determine namespace checkboxes
		$namespaces = $wgContLang->getNamespaces();
		$namespacesArray = explode( ',', $this->mNamespaces );
		if ( $this->mNamespaces ) {
			foreach ( $namespacesArray as $userNamespace ) {
				$checked = array();
				// Namespace needs to be checked if flagged with "**" or if it's the only one
				if ( strstr( $userNamespace, '**' ) || count( $namespacesArray ) == 1 ) {
					$userNamespace = str_replace( '**', '', $userNamespace );
					$checked = array( 'checked' => 'checked' );
				}

				// Namespace checkboxes
				foreach ( $namespaces as $i => $name ) {
					if ( $i < 0 ) {
						continue;
					} elseif ( $i == 0 ) {
						$name = 'Main';
					}
					if ( $userNamespace == $name ) {
						// Checkbox
						$htmlOut .= Xml::element( 'input',
							array(
								'type' => 'checkbox',
								'name' => 'ns' . $i,
								'value' => 1,
								'id' => 'mw-inputbox-ns' . $i
							) + $checked
						);
						// Label
						$htmlOut .= '&nbsp;' . Xml::label( $userNamespace, 'mw-inputbox-ns' . $i );
					}
				}
			}

			// Line break
			$htmlOut .= $this->mBR;
		} else if( $type == 'search' ) {
			// Go button
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'go',
					'class' => 'searchboxGoButton',
					'value' => $this->mButtonLabel
				)
			);
			$htmlOut .= '&nbsp;';
		}

		// Search button
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'fulltext',
				'class' => 'searchboxSearchButton',
				'value' => $this->mSearchButtonLabel
			)
		);
		
		// Hidden fulltext param for IE (bug 17161)
		if( $type == 'fulltext' ) {
			$htmlOut .= Xml::hidden( 'fulltext', 'Search' );
		}
		
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/*
	 * Generate search form version 2
	 */
	public function getSearchForm2() {

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}

		$id = Sanitizer::escapeId( $this->mID, 'noninitial' );
		$htmlLabel = '';
		if ( isset( $this->mLabelText ) && strlen( trim( $this->mLabelText ) ) ) {
			$this->mLabelText = $this->mParser->recursiveTagParse( $this->mLabelText );
			$htmlLabel = Xml::openElement( 'label', array( 'for' => 'bodySearchInput' . $id ) );
			$htmlLabel .= $this->mLabelText;
			$htmlLabel .= Xml::closeElement( 'label' );
		}
		$htmlOut = Xml::openElement( 'form',
			array(
				'name' => 'bodySearch' . $id,
				'id' => 'bodySearch' . $id,
				'class' => 'bodySearch',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
				'style' => $this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= Xml::openElement( 'div',
			array(
				'class' => 'bodySearchWrap',
				'style' => 'background-color:' . $this->mBGColor . ';' .
					$this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= $htmlLabel;
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'search',
				'size' => $this->mWidth,
				'id' => 'bodySearchInput' . $id
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'go',
				'value' => $this->mButtonLabel,
				'class' => 'bodySearchBtnGo' . $id
			)
		);

		// Better testing needed here!
		if ( !empty( $this->mFullTextButton ) ) {
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'fulltext',
					'class' => 'bodySearchBtnSearch',
					'value' => $this->mSearchButtonLabel
				)
			);
		}

		$htmlOut .= Xml::closeElement( 'div' );
		$htmlOut .= Xml::closeElement( 'form' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Generate create page form
	 */
	public function getCreateForm() {
		global $wgScript;

		if ( $this->mType == "comment" ) {
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
			}
		} else {
			$comment = '';
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( 'createarticle' );
			}
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'createbox',
				'id' => 'createbox',
				'class' => 'createbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'summary',
				'value' => $this->mSummary,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'minor',
				'value' => $this->mMinor,
			)
		);
		if ( $this->mType == 'comment' ) {
			$htmlOut .= Xml::openElement( 'input',
				array(
					'type' => 'hidden',
					'name' => 'section',
					'value' => 'new',
				)
			);
		}
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'title',
				'class' => 'createboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'createboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}
	
	/**
	 * Generate new section form
	 */
	public function getCommentForm() {
		global $wgScript;

		if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'commentbox',
				'id' => 'commentbox',
				'class' => 'commentbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'preloadtitle',
				'class' => 'commentboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'section',
				'value' => 'new',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'title',
				'value' => $this->mPage
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'commentboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Extract options from a blob of text
	 *
	 * @param string $text Tag contents
	 */
	public function extractOptions( $text ) {
		wfProfileIn( __METHOD__ );

		// Parse all possible options
		$values = array();
		foreach ( explode( "\n", $text ) as $line ) {
			if ( strpos( $line, '=' ) === false )
				continue;
			list( $name, $value ) = explode( '=', $line, 2 );
			$values[ strtolower( trim( $name ) ) ] = trim( $value );
		}

		// Build list of options, with local member names
		$options = array(
			'type' => 'mType',
			'width' => 'mWidth',
			'preload' => 'mPreload',
			'page' => 'mPage',
			'editintro' => 'mEditIntro',
			'summary' => 'mSummary',
			'minor' => 'mMinor',
			'break' => 'mBR',
			'default' => 'mDefaultText',
			'bgcolor' => 'mBGColor',
			'buttonlabel' => 'mButtonLabel',
			'searchbuttonlabel' => 'mSearchButtonLabel',
			'fulltextbutton' => 'mFullTextButton',
			'namespaces' => 'mNamespaces',
			'labeltext' => 'mLabelText',
			'hidden' => 'mHidden',
			'id' => 'mID',
			'inline' => 'mInline',
			'prefix' => 'mPrefix',
		);
		foreach ( $options as $name => $var ) {
			if ( isset( $values[$name] ) ) {
				$this->$var = $values[$name];
			}
		}

		// Insert a line break if configured to do so
		$this->mBR = ( strtolower( $this->mBR ) == "no" ) ? ' ' : '<br />';

		// Validate the width; make sure it's a valid, positive integer
		$this->mWidth = intval( $this->mWidth <= 0 ? 50 : $this->mWidth );

		wfProfileOut( __METHOD__ );
	}

}


--- NEW FILE InputBox.hooks.php ---
<?php
/**
 * Hooks for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox hooks
class InputBoxHooks {

	/* Functions */

	// Initialization
	public static function register() {
		global $wgParser;

		// Register the hook with the parser
		$wgParser->setHook( 'inputbox', array( 'InputBoxHooks', 'render' ) );

		// Continue
		return true;
	}

	// Render the input box
	public static function render( $input, $args, $parser ) {
		// Create InputBox
		$inputBox = new InputBox( $parser );

		// Configure InputBox
		$inputBox->extractOptions( $parser->replaceVariables( $input ) );

		// Return output
		return $inputBox->render();
	}
}


--- NEW FILE InputBox.i18n.php ---
<?php

/**
 * Messages file for the InputBox extension
 *
 * @addtogroup Extensions
 */

/**
 * Get all extension messages
 *
 * @return array
 */
$messages = array();

$messages['en'] = array(
	'inputbox-desc'           => 'Allow inclusion of predefined HTML forms',
	'inputbox-error-no-type'  => 'You have not specified the type of input box to create.',
	'inputbox-error-bad-type' => 'Input box type "$1" not recognised.
Please specify "create", "comment", "search", "search2" or "fulltext".',
	'tryexact'                => 'Try exact match',
	'searchfulltext'          => 'Search full text',
	'createarticle'           => 'Create page',
);

/** Message documentation (Message documentation)
 * @author Meno25
 * @author SPQRobin
 * @author Siebrand
 */
$messages['qqq'] = array(
	'inputbox-desc' => 'Short description of the Inputbox extension, shown on [[Special:Version]].',
	'inputbox-error-bad-type' => '{{doc-important|"create", "comment", "search", "search2" and "fulltext" should not be translated.}}',
	'tryexact' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. If the page with the exact name exists, you will go directly to that page.',
	'searchfulltext' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. This button always goes to the search page, even if the page with the exact name exists.',
	'createarticle' => 'Part of the "Inputbox" extension. This message is the text of the button to create the page you typed in the inputbox.',
);

/** Niuean (ko e vagahau Niu??)
 * @author Jose77
 */
$messages['niu'] = array(
	'createarticle' => 'Talaga tohi tala',
);

/** Afrikaans (Afrikaans)
 * @author Naudefj
 */
$messages['af'] = array(
	'inputbox-desc' => 'Laat die insluiting van vooraf gedefinieerde HTML-vorms moontlik',
	'inputbox-error-no-type' => 'U het nie die tipe invoerveld gespesifiseer nie.',
	'inputbox-error-bad-type' => 'Tipe invoerveld "$1" nie herken nie.
Gebruik "create", "comment", "search" of "search2".',
	'tryexact' => 'Soek presiese ooreenkoms',
	'searchfulltext' => 'Deursoek volledige teks',
	'createarticle' => 'Skep bladsy',
);

/** Amharic (????????????)
 * @author Codex Sinaiticus
 */
$messages['am'] = array(
	'createarticle' => '????????? ??????????????? ???????????????',
);

/** Aragonese (Aragon??s)
 * @author Juanpabl
 */
$messages['an'] = array(
	'inputbox-desc' => 'Premite a enclusi??n de formularios HTML predefinitos',
	'inputbox-error-no-type' => 'No ha endicato o tipo de caixa de dentrada que cal creyar.',
	'inputbox-error-bad-type' => 'No se reconoixe o tipo de caixa de dentrada "$1".
Por fabor, espezifique "create", "comment", "search" u "fulltext".',
	'tryexact' => 'Mirar t??tol esauto',
	'searchfulltext' => 'Mirar por testo completo',
	'createarticle' => 'Creyar pachina',
);

/** Arabic (??????????????)
 * @author Meno25
 */
$messages['ar'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? HTML ?????????? ??????????.',
	'inputbox-error-no-type' => '???? ?????? ???????????? ?????? ?????????? ?????????????? ??????????????.',
	'inputbox-error-bad-type' => '?????? ?????????? ?????????????? "$1" ???? ?????? ???????????? ????????.
???? ???????? ?????? "create"?? "comment"?? "search"?? "search2" ???? "fulltext".',
	'tryexact' => '???????? ???? ?????????? ??????????',
	'searchfulltext' => '???????? ???? ???????? ????????????',
	'createarticle' => '?????????? ????????',
);

/** Egyptian Spoken Arabic (????????)
 * @author Ghaly
 * @author Ramsis II
 */
$messages['arz'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? ?????? ???? ???? ???? ?????????? ???? ??????????',
	'inputbox-error-no-type' => '?????? ???? ?????????? ?????? ?????????? ?????????????? ??????????????',
	'inputbox-error-bad-type' => '???? ???????????????? ?????? ?????? ?????????? ?????????????? "$1"  .
???? ????????  ???????? "create"?? "comment"?? "search" ???? "search2".',
	'tryexact' => '?????? ?????? ?????????? ??????????',
	'searchfulltext' => '?????? ???? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Assamese (??????????????????)
 * @author Rajuonline
 */
$messages['as'] = array(
	'tryexact' => '???????????? ??????????????? ?????????????????? ?????????????????????',
	'searchfulltext' => '???????????????????????? ??????????????? ?????????????????????',
	'createarticle' => '?????????????????? ???????????????',
);

/** Asturian (Asturianu)
 * @author Esbardu
 */
$messages['ast'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios HTML predefin??os',
	'inputbox-error-no-type' => "Nun especificasti la triba de caxellu d'entrada pa crear.",
	'inputbox-error-bad-type' => "Triba de caxa d'entrada $1 non reconocida. Por favor conse??a la opci??n ''create'', ''comment'', ''search'' o ''search2''.",
	'tryexact' => 'Intentar concueyar exautamente',
	'searchfulltext' => 'Buscar testu completu',
	'createarticle' => 'Crear p??xina',
);

/** Azerbaijani (Az??rbaycan) */
$messages['az'] = array(
	'createarticle' => 'M??qal?? yarat',
);

/** Samogitian (??emait????ka)
 * @author Hugo.arg
 */
$messages['bat-smg'] = array(
	'searchfulltext' => '??i??kuot?? p??lna teksta',
);

/** Southern Balochi (?????????? ????????????)
 * @author Mostafadaneshvar
 */
$messages['bcc'] = array(
	'inputbox-desc' => '?????????? ???????? ???? ?????? ?????? ?????? ?????? HTML ???? ?????? ?????????? ????????????',
	'inputbox-error-no-type' => '?????? ?????? ???????? ?????????? ???? ?????????? ???????? ???? ??????',
	'inputbox-error-bad-type' => '?????? ???????? ?????????? "$1"  ?????? ?????? ???? ??????.
???????? ???????? ????????  "??????????", "??????", "????????" ???? "????????2".',
	'tryexact' => '?????????? ???????? ???????????? ????',
	'searchfulltext' => '?????? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Belarusian (????????????????????) */
$messages['be'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Belarusian (Tara??kievica orthography) (???????????????????? (??????????????????????))
 * @author EugeneZelenko
 * @author Jim-by
 * @author Red Winged Duck
 */
$messages['be-tarask'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????? ???????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ?????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '???????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ?????????????????? ???????????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ???? ??fulltext??.',
	'tryexact' => '???????????????????????? ???????????????? ??????????',
	'searchfulltext' => '???????????? ?????????? ??????????',
	'createarticle' => '???????????????? ????????????????',
);

/** Bulgarian (??????????????????)
 * @author DCLXVI
 * @author Spiritia
 */
$messages['bg'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????? ???? HTML ??????????????????.',
	'inputbox-error-no-type' => '???? ???? ???????????????? ???????? ???? ?????????????? ???? ????????, ?????????? ???? ???????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???$1??? ???? ?????????????? ???? ????????.
????????, ???????????????? ???create???, ???comment???, ???search??? ?????? ???search2???.',
	'tryexact' => '?????????? ?? ?????????? ????????????????????',
	'searchfulltext' => '?????????????????????? ???? ?????????? ??????????',
	'createarticle' => '??????????????????',
);

/** Bislama (Bislama)
 * @author Ushanka
 */
$messages['bi'] = array(
	'createarticle' => 'Mekem atikel',
);

/** Bengali (???????????????)
 * @author Bellayet
 * @author Zaheen
 */
$messages['bn'] = array(
	'inputbox-desc' => '????????????????????????????????????????????? ??????????????????????????? ?????????????????? ???????????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '???????????? ??????????????? ???????????? ??????????????? ???????????? ??????????????? ?????????????????? ????????? ???????????????????????? ?????????????????????',
	'inputbox-error-bad-type' => '"$1" ??????????????? ??????????????? ???????????? ???????????? ???????????? ????????? "create", "comment", "search" ???????????? "search2" ???????????????????????? ???????????????',
	'tryexact' => '????????? ?????? ??????????????? ????????????????????? ?????????',
	'searchfulltext' => '?????? ???????????????????????????????????? ??????????????????',
	'createarticle' => '?????????????????? ???????????? ?????????',
);

/** Bakhtiari (??????????????)
 * @author Behdarvandyani
 */
$messages['bqi'] = array(
	'inputbox-desc' => '?????????? ?????????????? ???? ??????????????? HTML ???????? ?????????? ???????????? ???? ??????',
	'inputbox-error-no-type' => '?????? ???????? ??????????  ???????? ?????????? ???? ?????????? ????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???? ???????? ?????????? ???????????? ????. ?????????? ?????? ???? ?????????? 
"create", "comment", "search" or "search2" ???? ???????? ????????.',
	'tryexact' => '?????????? ???????? ???? ???????? ???? ???????????? ????',
	'searchfulltext' => '???????????? ?????? ??????',
	'createarticle' => '???????? ???????? ????????',
);

/** Breton (Brezhoneg)
 * @author Fulup
 */
$messages['br'] = array(
	'inputbox-desc' => 'Aotren a ra degas furmskrido?? HTML raktermenet.',
	'inputbox-error-no-type' => "N'eo ket bet spisaet ganeoc'h ar seurt boest enmont da veza?? krouet",
	'inputbox-error-bad-type' => 'N\'eo ket anavaezet ar seurt boest enmont "$1".
Spisait "create", "comment", "search" pe "search2".',
	'tryexact' => 'Klask ma klotfe rik',
	'searchfulltext' => 'Klask an destenn a-bezh',
	'createarticle' => 'Kroui?? ar pennad',
);

/** Bosnian (Bosanski)
 * @author CERminator
 */
$messages['bs'] = array(
	'inputbox-desc' => 'Omogu??uje uklju??ivanje prethodno napravljenih HTML obrazaca',
	'inputbox-error-no-type' => 'Niste odredili tip kutije za unos koju pravite.',
	'inputbox-error-bad-type' => 'Tip kutije unosa "$1" nije prepoznat.
Molimo odredite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Isprobaj na??i ta??an upit',
	'searchfulltext' => 'Pretra??i cijeli tekst',
	'createarticle' => 'Napravi stranicu',
);

/** Catalan (Catal??)
 * @author Paucabot
 * @author SMP
 * @author Toniher
 */
$messages['ca'] = array(
	'inputbox-desc' => 'Permet la inclusi?? de formularis HTML predefinits',
	'inputbox-error-no-type' => "No heu especificat el tipus de quadre d'entrada per crear.",
	'inputbox-error-bad-type' => "El tipus de quadre d'entrada ??$1?? no est?? reconegut.

Especifiqueu-hi ??create??, ??comment??, ??search??, ??search2?? o ??fulltext??.",
	'tryexact' => 'Prova una coincid??ncia exacta',
	'searchfulltext' => 'Cerca un text sencer',
	'createarticle' => 'Crea una p??gina',
);

/** Min Dong Chinese (M??ng-d????ng-ng?????) */
$messages['cdo'] = array(
	'createarticle' => 'K??i hi??k',
);

/** Corsican (Corsu) */
$messages['co'] = array(
	'searchfulltext' => 'Ricerca testu cumplettu',
	'createarticle' => "Cre?? l'articulu",
);

/** Crimean Turkish (Latin) (Q??r??mtatarca (Latin))
 * @author Alessandro
 */
$messages['crh-latn'] = array(
	'createarticle' => 'Saifeni ya??art',
);

/** Crimean Turkish (Cyrillic) (Q??r??mtatarca (Cyrillic))
 * @author Alessandro
 */
$messages['crh-cyrl'] = array(
	'createarticle' => '?????????????? ????????????',
);

/** Czech (??esky)
 * @author Danny B.
 * @author Li-sung
 */
$messages['cs'] = array(
	'inputbox-desc' => 'Umo????uje vkl??dat ur??it?? HTML formul????e.',
	'inputbox-error-no-type' => 'Nen?? ur??en typ formul????ov??ho pole k vytvo??en??.',
	'inputbox-error-bad-type' => 'Nerozpoznan?? typ pole ???$1???.
Uve??te jednu z mo??nost??: ???create???, ???comment???, ???search???, ???search2??? nebo ???fulltext???.',
	'tryexact' => 'Vyzkou??et p??esn?? hled??n??',
	'searchfulltext' => 'Plnotextov?? hled??n??',
	'createarticle' => 'Vytvo??it ??l??nek',
);

/** Chuvash (??????????????) */
$messages['cv'] = array(
	'createarticle' => '???????? ???????????? ??????',
);

/** Welsh (Cymraeg)
 * @author Lloffiwr
 */
$messages['cy'] = array(
	'inputbox-desc' => "Yn caniatau creu blychau mewnbynnu sy'n cynnwys ffurflenni HTML wedi eu gosod yn barod i'w defnyddio",
	'inputbox-error-no-type' => "Nid ydych wedi pennu'r math o flwch mewnbynnu yr ydych am ei greu.",
	'inputbox-error-bad-type' => 'Nid yw\'r gair "$1" ar y math o flwch mewnbynnu yn ddealladwy gan y meddalwedd.
Dewiswch rhwng "create", "comment", "search" a "search2" neu "fulltext".',
	'tryexact' => 'Chwilio am yr union gymal',
	'searchfulltext' => "Chwilio'r testun cyfan",
	'createarticle' => "Creu'r dudalen",
);

/** Danish (Dansk)
 * @author Byrial
 */
$messages['da'] = array(
	'inputbox-desc' => 'Muligg??r inkludering af forh??ndsdefinerede HTML-formularer',
	'inputbox-error-no-type' => 'Du har ikke angivet type i inputboksen som skal laves.',
	'inputbox-error-bad-type' => 'Inputboks-type "$1" kendes ikke.
V??lg venligst "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'G?? til siden',
	'searchfulltext' => 'S??g efter teksten',
	'createarticle' => 'Opret side',
);

/** German (Deutsch)
 * @author Metalhead64
 * @author Raimond Spekking
 * @author Umherirrender
 */
$messages['de'] = array(
	'inputbox-desc' => 'Erlaubt die Einbindung vordefinierter HTML-Formulare',
	'inputbox-error-no-type' => 'Du hast keinen Eingabefeld-Typ angegeben.',
	'inputbox-error-bad-type' => 'Eingabefeld-Typ ???$1??? unbekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? angeben.',
	'tryexact' => 'Versuche exakte Suche',
	'searchfulltext' => 'Gesamten Text durchsuchen',
	'createarticle' => 'Seite anlegen',
);

/** German (formal address) (Deutsch (Sie-Form))
 * @author Umherirrender
 */
$messages['de-formal'] = array(
	'inputbox-error-no-type' => 'Sie haben keinen Eingabefeld-Typ angegeben.',
);

/** Lower Sorbian (Dolnoserbski)
 * @author Michawiki
 * @author Pe7er
 */
$messages['dsb'] = array(
	'inputbox-desc' => 'Zap????gnjenje p??eddefin??rowanych HTML-formularow dow??li??',
	'inputbox-error-no-type' => 'Njejsy p??da?? typ zap??dawa??skego p??la za nap??ranje.',
	'inputbox-error-bad-type' => 'Zap??dawa??ske p??lo typa "$1" njesp??znane.
P??osym p??daj "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Naw??os pyta??:',
	'searchfulltext' => 'Ce??y tekst pyta??',
	'createarticle' => 'Nastawk natwori??',
);

/** Divehi (????????????????????)
 * @author Spacebirdy
 */
$messages['dv'] = array(
	'createarticle' => '???????????????????? ????????????????',
);

/** Ewe (E??egbe) */
$messages['ee'] = array(
	'createarticle' => 'Dze nu??????l?? yeye g??me',
);

/** Greek (????????????????)
 * @author Dead3y3
 */
$messages['el'] = array(
	'inputbox-desc' => '?????????????????? ?????? ???????????????? ?????????????????????????????? ???????????? HTML',
	'inputbox-error-no-type' => '?????? ?????????? ?????????????????? ?????? ???????? ?????? ?????????????? ?????????????? ???????? ????????????????????.',
	'inputbox-error-bad-type' => '?????????? ?????????????? ?????????????? "$1" ?????? ??????????????????????????.<br />
???????????????? ???????????? "create", "comment", "search", "search2" ?? "fulltext".',
	'tryexact' => '?????????????????? ?????? ???????????????? ??????????????????????.',
	'searchfulltext' => '?????????????????? ???? ???? ???????????? ??????????????',
	'createarticle' => '???????????????????? ??????????????',
);

/** Esperanto (Esperanto)
 * @author Yekrats
 */
$messages['eo'] = array(
	'inputbox-desc' => 'Permesi enhavon de anta??difinitaj HTML-kamparoj',
	'inputbox-error-no-type' => 'Vi ne enigis la specon de enigo-kesto por krei.',
	'inputbox-error-bad-type' => 'Enigo-kesto "$1" ne estas konata.
Bonvolu specifigi keston "krea", "komenta", "ser??a", "ser??a2", a?? "plenateksa".',
	'tryexact' => 'Provu ekzaktan trafon',
	'searchfulltext' => 'Ser??i plentekste',
	'createarticle' => 'Krei artikolon',
);

/** Spanish (Espa??ol)
 * @author Crazymadlover
 * @author Icvav
 * @author Muro de Aguas
 * @author Sanbec
 */
$messages['es'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios en HTML predefinidos.',
	'inputbox-error-no-type' => 'No has especificado el tipo de formulario que vas a crear.',
	'inputbox-error-bad-type' => 'No se reconoce el tipo de caja de entrada ??$1??.
Por favor, especifica ??create??, ??comment??, ??search?? ??search2?? o "fulltext".',
	'tryexact' => 'Buscar t??tulo exacto',
	'searchfulltext' => 'Buscar por texto completo',
	'createarticle' => 'Crear art??culo',
);

/** Estonian (Eesti)
 * @author Avjoska
 * @author Jaan513
 */
$messages['et'] = array(
	'tryexact' => 'Proovi t??pset vastet',
	'searchfulltext' => 'Otsi t??isteksti',
	'createarticle' => 'Alusta lehek??lge',
);

/** Basque (Euskara) */
$messages['eu'] = array(
	'tryexact' => 'Izenburu zehatza bilatu',
	'searchfulltext' => 'Testu osoa bilatu',
	'createarticle' => 'Artikulua sortu',
);

/** Extremaduran (Estreme??u) */
$messages['ext'] = array(
	'createarticle' => 'Creal art??culu',
);

/** Persian (??????????)
 * @author Huji
 */
$messages['fa'] = array(
	'inputbox-desc' => '???????????? ?????????????? ???? ??????????????? HTML ???? ?????? ?????????? ?????? ???? ?????????????',
	'inputbox-error-no-type' => '?????? ?????????? ??????????  ???????????????????? ???? ???????? ???????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????? ?????????? ?????????? ???????????? ?????? ????????.
?????????? ?????? ???? ?????????? ??create???? ??comment???? ??search???? ??search2?? ???? ??fulltext?? ???? ???????? ????????.',
	'tryexact' => '???????????? ???????? ???? ???????? ???? ????????????',
	'searchfulltext' => '???????????? ???? ??????',
	'createarticle' => '?????????? ??????????',
);

/** Finnish (Suomi)
 * @author Crt
 * @author Nike
 */
$messages['fi'] = array(
	'inputbox-desc' => 'Mahdollistaa ennalta m????riteltyjen lomakkeiden sis??llytt??misen sivuille.',
	'inputbox-error-no-type' => 'Et m????ritellyt sy??tekent??n tyyppi??.',
	'inputbox-error-bad-type' => 'Sy??tekent??n tyyppi ???$1??? ei kelpaa.
Sallittuja arvoja ovat create, comment, search, search2 ja fulltext.',
	'tryexact' => 'Yrit?? tarkkaa osumaa',
	'searchfulltext' => 'Etsi koko teksti??',
	'createarticle' => 'Luo sivu',
);

/** Faroese (F??royskt) */
$messages['fo'] = array(
	'createarticle' => 'Stovna grein',
);

/** French (Fran??ais)
 * @author Crochet.david
 * @author IAlex
 * @author Sherbrooke
 */
$messages['fr'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formulaires HTML pr??d??finis.',
	'inputbox-error-no-type' => 'Vous n???avez pas pr??cis?? le type de la bo??te d???entr??e ?? cr??er.',
	'inputbox-error-bad-type' => 'Type de bo??te entr??e ?? $1 ?? non reconnue.
Indiquez une option parmis ?? create ??, ?? comment ??, ?? search ??, ?? searche2 ?? ou ?? fulltext ??.',
	'tryexact' => 'Essayez la correspondance exacte.',
	'searchfulltext' => 'Recherche en texte int??gral',
	'createarticle' => 'Cr??er la page',
);

/** Franco-Proven??al (Arpetan)
 * @author ChrisPtDe
 */
$messages['frp'] = array(
	'inputbox-desc' => 'P??rm??t l???encllusion de formul??ros HTML pr??d??fenis.',
	'inputbox-error-no-type' => 'Vos ??d pas sp??cefi?? lo tipo de la bou??ta d???entr?? a cr??ar.',
	'inputbox-error-bad-type' => "Tipo de bou??ta d???entr?? ?? $1 ?? pas recognu. Endic??d lo chou??x ''create'', ''comment'', ''search'' ou ben ''searche2''.",
	'tryexact' => '??prov??d la corr??spondance ??gzacta.',
	'searchfulltext' => 'Rech??rche en t??xte compl??t',
	'createarticle' => 'Cr??ar l???articllo',
);

/** Friulian (Furlan)
 * @author Klenje
 */
$messages['fur'] = array(
	'tryexact' => 'C??r une corispondence esate',
	'searchfulltext' => 'C??r in dut il test',
	'createarticle' => 'Cree v??s',
);

/** Western Frisian (Frysk)
 * @author Snakesteuben
 */
$messages['fy'] = array(
	'createarticle' => 'Side oanmeitsje',
);

/** Irish (Gaeilge) */
$messages['ga'] = array(
	'tryexact' => 'D??an iarracht ar meaitse??il cruinn',
	'searchfulltext' => 'Cuardaigh sa t??acs ioml??n',
	'createarticle' => 'Cruthaigh alt',
);

/** Galician (Galego)
 * @author Alma
 * @author Toli??o
 */
$messages['gl'] = array(
	'inputbox-desc' => 'Permitir a inclusi??n de formularios predefinidos de HTML',
	'inputbox-error-no-type' => 'Non se especificou o tipo de caixa de entrada para crear.',
	'inputbox-error-bad-type' => 'O tipo de caixa de entrada "$1" non foi reco??ecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar coincidencias exactas',
	'searchfulltext' => 'Buscar o texto completo',
	'createarticle' => 'Crear a p??xina',
);

/** Ancient Greek (????????????? ??????????????????)
 * @author Omnipaedista
 */
$messages['grc'] = array(
	'inputbox-desc' => '????????????????????? ??????? ???????????????????? ?????????????????????????????? ????????????? HTML',
	'inputbox-error-no-type' => '??????? ????????????? ??????? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ??????????????????.',
	'inputbox-error-bad-type' => '??? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ?????????????????? "$1" ????????????????????????????? ??????? ???????????.
?????????????????? "create", "comment", "search", "search2" ??? "fulltext".',
	'tryexact' => '???????????????? ??????? ?????????????? ?????????????????????????',
	'searchfulltext' => '????????????? ????? ????? ???????????? ???????????????',
	'createarticle' => '???????????? ??????????????????????????',
);

/** Swiss German (Alemannisch)
 * @author Als-Chl??mens
 * @author Als-Holder
 */
$messages['gsw'] = array(
	'inputbox-desc' => 'Erlaubt d Yybindig vu vordefinierte HTML-Formular',
	'inputbox-error-no-type' => 'Du hesch kei Yygabf??ld-Typ aagee.',
	'inputbox-error-bad-type' => 'Yygabf??ld-Typ ???$1??? nit bekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? aagee.',
	'tryexact' => 'Versuech es mitenere exakte Suech',
	'searchfulltext' => 'De gsamti Teggscht durchsueche',
	'createarticle' => 'Syte aalaie',
);

/** Gujarati (?????????????????????)
 * @author Dsvyas
 */
$messages['gu'] = array(
	'createarticle' => '????????? ????????? ????????? ?????????',
);

/** Manx (Gaelg)
 * @author MacTire02
 */
$messages['gv'] = array(
	'createarticle' => 'Croo duillag',
);

/** Hakka (Hak-k??-fa)
 * @author Hakka
 */
$messages['hak'] = array(
	'tryexact' => 'S??ng-chh??? ch??n-khok phit-phi',
	'searchfulltext' => 'Chhi??n v??n-ki??m chh??m-ch??u',
	'createarticle' => 'Kien-li??p v??n-ch??ng',
);

/** Hebrew (??????????)
 * @author Rotem Liss
 */
$messages['he'] = array(
	'inputbox-desc' => '???????????? ???????????? ?????????? HTML ?????????????? ????????',
	'inputbox-error-no-type' => '???? ???????????? ???? ?????? ???????? ???????? ????????????.',
	'inputbox-error-bad-type' => '?????? ???????? ???????? "$1" ???????? ????????.
?????? ?????????? "create", "comment", "search", "search2" ???? "fulltext".',
	'tryexact' => '?????? ?????? ????',
	'searchfulltext' => '?????????? ?????????? ??????????',
	'createarticle' => '?????????? ??????',
);

/** Hindi (??????????????????)
 * @author Kaustubh
 */
$messages['hi'] = array(
	'inputbox-desc' => '?????????????????? ???????????? ????????? HTML ??????????????? ???????????????????????? ???????????? ?????? ?????????????????? ?????????',
	'inputbox-error-no-type' => '??????????????? ??????????????? ??????????????? ?????? ???????????? ???????????? ???????????? ?????????????????? ??????????????? ???????????? ????????????',
	'inputbox-error-bad-type' => '??????????????? ??????????????? ?????? "$1" ?????? ?????????????????? ???????????? ???????????? ????????????
??????????????? "create", "comment", "search" ?????? ????????? "search2" ????????? ?????? ?????? ??????????????????',
	'tryexact' => '???????????? ????????? ?????????????????? ???????????????',
	'searchfulltext' => '???????????? ????????? ???????????????',
	'createarticle' => '????????? ?????????????????????',
);

/** Fiji Hindi (Latin) (Fiji Hindi (Latin))
 * @author Thakurji
 */
$messages['hif-latn'] = array(
	'inputbox-desc' => 'Predefined HTML forms ke allow karo',
	'inputbox-error-no-type' => 'Aap ii nai bataya hai ki kon rakam ke input box ke banae ke chaahi',
	'inputbox-error-bad-type' => 'Input box type "$1" ke pehchana nai gais hai.
Meharbani kar kr ii batao ki "create", "comment", "search", "search2" nai to "fulltext" hai.',
	'tryexact' => 'Exact match ke try karo',
	'searchfulltext' => 'Puura text me khojo',
	'createarticle' => 'Panna banao',
);

/** Hiligaynon (Ilonggo)
 * @author Jose77
 */
$messages['hil'] = array(
	'createarticle' => 'Maghimo artikulo',
);

/** Croatian (Hrvatski)
 * @author Brest
 * @author Dnik
 * @author SpeedyGonsales
 */
$messages['hr'] = array(
	'inputbox-desc' => 'Dozvoli uklju??ivanje predefiniranih obrazaca u HTML-u',
	'inputbox-error-no-type' => 'Niste naveli tip ulaznog polja koje ??elite stvoriti.',
	'inputbox-error-bad-type' => 'Tip ulaznog polja "$1" nije prepoznat. 
Molimo navedite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Poku??aj na??i to??an pogodak',
	'searchfulltext' => 'Tra??i po cjelokupnom tekstu',
	'createarticle' => 'Stvori ??lanak',
);

/** Upper Sorbian (Hornjoserbsce)
 * @author Dundak
 * @author Michawiki
 */
$messages['hsb'] = array(
	'inputbox-desc' => 'Zap??ije??e p??eddefinowanych HTML-formularow dowoli??.',
	'inputbox-error-no-type' => 'Njesy typ zapodatneho ka????ika poda??.',
	'inputbox-error-bad-type' => 'Typ zapodatneho ka????ika "$1" je njeznaty. Pro??u podaj p??a??iwy typ: "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Dok??adne pytanje spyta??',
	'searchfulltext' => 'Dospo??ny tekst pyta??',
	'createarticle' => 'Nastawk wutwori??',
);

/** Haitian (Krey??l ayisyen)
 * @author Masterches
 */
$messages['ht'] = array(
	'inputbox-desc' => 'Ap p??m??t ou mete f??mil?? HTML yo ki ja defini.',
	'inputbox-error-no-type' => 'Atansyon, ou pa bay detay sou tip, kalite bwat antre pou ou kreye',
	'inputbox-error-bad-type' => "Kalite bwat antre $1 pa bon, sist??m an pa konnen l. Mete opsyon sa ''create (kreye)'', ''comment (komante)'', ''search (chache, fouye)'' ou ''searche2''.",
	'tryexact' => 'Eseye yon korespondans egzakt, toutbon.',
	'searchfulltext' => 'Chache, fouye ak opsyon t??ks entegral; wap pran an konsiderasyon tout mo ki nan demann ou an',
	'createarticle' => 'Kreye atik sa',
);

/** Hungarian (Magyar)
 * @author Dani
 * @author KossuthRad
 * @author Tgr
 */
$messages['hu'] = array(
	'inputbox-desc' => 'Lehet??v?? teszi el??re megadott HTML-??rlapok beilleszt??s??t',
	'inputbox-error-no-type' => 'Nem adtad meg, hogy milyen t??pus?? beviteli mez??t akarsz k??sz??teni.',
	'inputbox-error-bad-type' => '???$1??? t??pus?? beviteli mez?? nem ismert. ???create???, ???comment???, ???search??? vagy ???search2??? egyik??t add meg.',
	'tryexact' => 'Ugr??s a sz??cikkre',
	'searchfulltext' => 'Keres??s a teljes sz??vegben',
	'createarticle' => 'Sz??cikk l??trehoz??sa',
);

/** Armenian (??????????????) */
$messages['hy'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Interlingua (Interlingua)
 * @author McDutchie
 */
$messages['ia'] = array(
	'inputbox-desc' => 'Permitter le inclusion de formularios HTML predefinite',
	'inputbox-error-no-type' => 'Tu non ha specificate le typo de quadro de entrata a crear.',
	'inputbox-error-bad-type' => 'Le typo de quadro de entrata "$1" non es recognoscite.
Per favor specifica "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Provar correspondentia exacte',
	'searchfulltext' => 'Cercar in texto integre',
	'createarticle' => 'Crear pagina',
);

/** Indonesian (Bahasa Indonesia)
 * @author IvanLanin
 */
$messages['id'] = array(
	'inputbox-desc' => 'Memungkinkan penggunaan form HTML yang telah ditentukan',
	'inputbox-error-no-type' => 'Anda harus menentukan tipe kotak input yang ingin dibuat.',
	'inputbox-error-bad-type' => 'Tipe kotak input "$1" tak dikenal. Tolong gunakan "create", "comment", "search" atau "search2".',
	'tryexact' => 'Coba pencocokan eksak',
	'searchfulltext' => 'Cari di teks lengkap',
	'createarticle' => 'Buat artikel',
);

/** Iloko (Ilokano) */
$messages['ilo'] = array(
	'createarticle' => 'Mangaramid iti articulo',
);

/** Ido (Ido)
 * @author Malafaya
 */
$messages['io'] = array(
	'searchfulltext' => 'Serchar tota texto',
	'createarticle' => 'Krear pagino',
);

/** Icelandic (??slenska)
 * @author S.??rvarr.S
 */
$messages['is'] = array(
	'createarticle' => 'B??a til s????u',
);

/** Italian (Italiano)
 * @author BrokenArrow
 * @author Darth Kule
 */
$messages['it'] = array(
	'inputbox-desc' => "Consente l'inserimento di moduli HTML predefiniti",
	'inputbox-error-no-type' => 'Non ?? stato specificato il tipo di inputbox da creare.',
	'inputbox-error-bad-type' => '"$1" non ?? un tipo di inputbox riconosciuto. Scegliere il tipo tra "create", "comment", "search", "search2" e "fulltext".',
	'tryexact' => 'Cerca corrispondenza esatta',
	'searchfulltext' => 'Ricerca nel testo',
	'createarticle' => 'Crea voce',
);

/** Japanese (?????????)
 * @author Fryed-peach
 * @author JtFuruhata
 */
$messages['ja'] = array(
	'inputbox-desc' => '??????????????????????????????HTML????????????????????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ????????????????????????????????????????????????????????????????????????"create"???"comment"???"search"???"search2"???"fulltext" ????????????????????????',
	'tryexact' => '???????????????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Jutish (Jysk)
 * @author Husl??ke
 */
$messages['jut'] = array(
	'inputbox-desc' => 'Tilst??n der inklusje der pr??d??fiini??rn HTML f??rmer',
	'inputbox-error-no-type' => 'Du harst ekke sp??sifi??rn ?? type der input boks til skep.',
	'inputbox-error-bad-type' => 'Input boks type "$1" ekke herkonnen. Sp??sifi??r "skep", "bim??rkenge", "s????" ??ller "s????2".',
	'tryexact' => 'F??rs???? eksakt s????nenge:',
	'searchfulltext' => "Gennems????e'n h??le tekster",
	'createarticle' => '??prette side',
);

/** Javanese (Basa Jawa)
 * @author Meursault2004
 */
$messages['jv'] = array(
	'inputbox-desc' => 'Ngidinak?? nganggo formulir HTML sing wis ditemtokak??',
	'inputbox-error-no-type' => 'Panjenengan durung nemtokak?? tipe kothak input sing arep digaw??.',
	'inputbox-error-bad-type' => 'Tipe kothak input "$1" ora ditepungi.
Tulung nganggoa "create", "comment", "search" utawa "search2".',
	'tryexact' => 'Cobanen pancocogan ??ksak',
	'searchfulltext' => 'Gol??k ing t??ks jangkep',
	'createarticle' => 'Damel artikel',
);

/** Georgian (?????????????????????)
 * @author Alsandro
 */
$messages['ka'] = array(
	'tryexact' => '??????????????? ??????????????? ???????????????????????????',
	'searchfulltext' => '??????????????? ????????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Kara-Kalpak (Qaraqalpaqsha) */
$messages['kaa'] = array(
	'createarticle' => 'Bet jarat??w',
);

/** Kabyle (Taqbaylit)
 * @author Agurzil
 */
$messages['kab'] = array(
	'tryexact' => 'Nadi ??ef uzwel kif-kif',
	'searchfulltext' => 'Nadi a???ris ettmam',
	'createarticle' => 'Xleq amagrad',
);

/** Kazakh (Arabic script) (????????????????? (??????????)???) */
$messages['kk-arab'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Cyrillic) (?????????????? (Cyrillic)) */
$messages['kk-cyrl'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Latin) (?????????????? (Latin)) */
$messages['kk-latn'] = array(
	'inputbox-error-no-type' => 'Jasalat??n engizw jola????n???? t??rin keltirmepsiz.',
	'inputbox-error-bad-type' => 'Engizw jolaqt???? ??$1?? t??ri tan??lmad??. Tek ??create??, ??comment??, ??search?? ne ??search2?? degen t??rlerdi keltiri??iz.',
	'tryexact' => 'D??l s????kesin s??nap k??ri??iz',
	'searchfulltext' => 'Tol??q m??tinimen izdew',
	'createarticle' => 'Betti bastaw',
);

/** Khmer (???????????????????????????)
 * @author Chhorran
 * @author Lovekhmer
 * @author T-Rithy
 */
$messages['km'] = array(
	'inputbox-error-no-type' => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Korean (?????????)
 * @author Albamhandae
 * @author Klutzy
 * @author Kwj2772
 * @author ToePeu
 */
$messages['ko'] = array(
	'inputbox-desc' => '?????? ????????? HTML ?????? ????????? ??? ?????? ??? ???',
	'inputbox-error-no-type' => 'type ????????? ????????? ???????????????.',
	'inputbox-error-bad-type' => '"$1"???(???) ????????? ??? ?????? type ???????????????.
"create", "comment", "search", "search2", "fulltext" ??? ????????? ???????????????.',
	'tryexact' => '????????? ???????????? ??????',
	'searchfulltext' => '?????? ??? ??????',
	'createarticle' => '?????? ?????????',
);

/** Ripoarisch (Ripoarisch)
 * @author Purodha
 */
$messages['ksh'] = array(
	'inputbox-desc' => 'Bestemmpte HTML-Formulare k??nne hee met enjebonge w????de.',
	'inputbox-error-no-type' => 'Wat f??r en Zoot Kaste wells De dann han?',
	'inputbox-error-bad-type' => 'De Zoot ???$1??? f??r et Feld f??r jet enzejevve kenne mer nit, De moss schunn ???create???, ???comment???, ???search???, ???search2???, udder ???fulltext??? dof??r aanjevve.',
	'tryexact' => 'Vers??k en akkurate ??vvereinstimmung:',
	'searchfulltext' => 'S??k durch d?? janze Tex',
	'createarticle' => 'Sigg aanl????je',
);

/** Kurdish (Latin) (Kurd?? / ?????????? (Latin)) */
$messages['ku-latn'] = array(
	'createarticle' => 'Gotar?? biafir??ne',
);

/** Latin (Latina) */
$messages['la'] = array(
	'createarticle' => 'Paginam creare',
);

/** Luxembourgish (L??tzebuergesch)
 * @author Robby
 */
$messages['lb'] = array(
	'inputbox-desc' => "Erlaabt d'Af??ge vu viirdefin??ierten HTML-Formulairen",
	'inputbox-error-no-type' => 'Dir hutt den Typ vu K??scht fir eppes anzeginn net uginn.',
	'tryexact' => 'Versicht et matt der preziser Sich:',
	'searchfulltext' => 'Am ganzen Text sichen',
	'createarticle' => 'S??it ulee??n',
);

/** Lingua Franca Nova (Lingua Franca Nova)
 * @author Malafaya
 */
$messages['lfn'] = array(
	'createarticle' => 'Crea paje',
);

/** Ganda (Luganda) */
$messages['lg'] = array(
	'createarticle' => 'Wandika omuko',
);

/** Limburgish (Limburgs)
 * @author Matthias
 * @author Ooswesthoesbes
 */
$messages['li'] = array(
	'inputbox-desc' => "Maakt 't toevoege van veurgedefinieerde HTML-formuliere meugelijk",
	'inputbox-error-no-type' => "U heeft 't type inputbox neet aangegeve. Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] veur meer informatie.",
	'inputbox-error-bad-type' => 'Inputbox-type "$1" neet herkend. 
Gebroek "create", "comment", "search", "search2" ??f "fulltext".',
	'tryexact' => 'Perbeer exacte euvereinkoms',
	'searchfulltext' => 'Zeuk d??r volledige t??ks',
	'createarticle' => "Maak 'ne pazjena aan",
);

/** Lingala (Ling??la)
 * @author Moyogo
 */
$messages['ln'] = array(
	'createarticle' => 'Kokela ekakoli',
);

/** Lao (?????????)
 * @author Tuinui
 */
$messages['lo'] = array(
	'tryexact' => '??????',
	'searchfulltext' => '???????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Lithuanian (Lietuvi??) */
$messages['lt'] = array(
	'tryexact' => 'M??ginti tiksl?? atitikim??',
	'searchfulltext' => 'Ie??koti pilno teksto',
	'createarticle' => 'Kurti straipsn??',
);

/** Latvian (Latvie??u)
 * @author Xil
 * @author Yyy
 */
$messages['lv'] = array(
	'inputbox-error-no-type' => 'Tu neesi nor??d??jis ievades lauka tipu',
	'inputbox-error-bad-type' => 'Ievades lauka tips "$1" nav atpaz??ts.
L??dzu nor??di "create", "comment", "search", "search2" vai "fulltext".',
	'tryexact' => 'Mekl??t prec??zi',
	'searchfulltext' => 'Mekl??t visu tekstu',
	'createarticle' => 'Izveidot lapu',
);

/** Literary Chinese (??????) */
$messages['lzh'] = array(
	'inputbox-error-no-type' => '??????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"???????????????"create"???"comment"???"search"???"search2"??????',
	'tryexact' => '?????????',
	'searchfulltext' => '?????????',
	'createarticle' => '??????',
);

/** Macedonian (????????????????????)
 * @author Brest
 * @author Misos
 */
$messages['mk'] = array(
	'inputbox-desc' => '???????????????????? ???????????????????? ???? ?????????????????????????? HTML ??????????',
	'inputbox-error-no-type' => '???????????? ???????????????? ?????? ???? ???????? ???? ???????? ?????? ???????????? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????????? ???? ???????????? ???? ???????? "$1" ???? ?? ????????????.
???????????????? ???????? ???? ???????????????? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????? ???? ??????????',
	'searchfulltext' => '?????????? ?????? ???????????? ??????????',
	'createarticle' => '?????????????? ????????????????',
);

/** Malayalam (??????????????????)
 * @author Shijualex
 */
$messages['ml'] = array(
	'inputbox-desc' => '???????????????????????????????????????????????????????????? ????????????????????????????????????????????? HTML ???????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????? ????????????????????????????????? ?????????????????????????????? ????????? ???????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ???????????? ?????????????????????????????? ?????????????????? ????????? ????????????????????????????????????????????????.
???????????? ?????????????????? "create", "comment", "search", "search2" ?????????????????????????????? ?????????????????????????????????????????????',
	'tryexact' => '??????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????????????????? ????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????? ??????????????????????????? ??????????????????',
	'createarticle' => '??????????????? ?????????????????????????????????',
);

/** Marathi (???????????????)
 * @author Kaustubh
 */
$messages['mr'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????????? HTML ???????????? ?????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '?????????????????? ????????????????????? ???????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????? ?????????????????? ?????????????????? ????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????????????????? ????????????????????????????????? "$1" ?????? ?????????????????? ??????????????? ????????????. ??????????????? "create", "comment", "search" ??????????????? "search2" ??????????????? ?????? ???????????????.',
	'tryexact' => '????????????????????? ???????????? ????????????',
	'searchfulltext' => '??????????????? ??????????????? ????????????',
	'createarticle' => '????????? ????????????',
);

/** Malay (Bahasa Melayu)
 * @author Aviator
 */
$messages['ms'] = array(
	'inputbox-desc' => 'Membenarkan penyertaan borang HTML yang sudah ditetapkan.',
	'inputbox-error-no-type' => 'Anda tidak menyatakan jenis kotak input untuk diciptakan.',
	'inputbox-error-bad-type' => 'Jenis kotak input "$1" tidak dikenali. Sila nyatakan "create", "comment", "search", "search2" atau "fulltext".',
	'tryexact' => 'Cuba padanan tepat',
	'searchfulltext' => 'Cari dalam teks penuh',
	'createarticle' => 'Cipta laman',
);

/** Maltese (Malti)
 * @author Chrisportelli
 * @author Giangian15
 */
$messages['mt'] = array(
	'inputbox-desc' => "T??alli formuli ta' HTML predefiniti",
	'inputbox-error-no-type' => "Inti ma spe??ifikajtx it-tip ta' ''input box'' li trid to??loq.",
	'inputbox-error-bad-type' => '"$1" mhuwiex tip mag??ruf ta\' \'\'inputbox\'\'. Jekk jog????bok spe??ifika fost "create", "comment", "search" u "search2".',
	'tryexact' => 'Fittex korrispondenza e??atta',
	'searchfulltext' => 'Fittex fit-test',
	'createarticle' => 'O??loq pa??na',
);

/** Mazanderani (????????????????)
 * @author Spacebirdy
 */
$messages['mzn'] = array(
	'createarticle' => '?????? ??????????',
);

/** Nahuatl (N??huatl)
 * @author Fluence
 */
$messages['nah'] = array(
	'createarticle' => 'Ticch??hu??z z??zanilli',
);

/** Min Nan Chinese (B??n-l??m-g??) */
$messages['nan'] = array(
	'searchfulltext' => 'Chhiau choan-b??n',
);

/** Neapolitan (Nnapulitano)
 * @author SabineCretella
 */
$messages['nap'] = array(
	'searchfulltext' => 'Asci?? dint&#39;&#39;o testo',
	'createarticle' => 'Cria voce',
);

/** Low German (Plattd????tsch)
 * @author Slomox
 */
$messages['nds'] = array(
	'inputbox-desc' => 'Verl????vt dat Inbinnen vun v??rdefineerte HTML-Formularen',
	'inputbox-error-no-type' => 'Du hest keen Typ f??r dat Ingaav-Feld angeven.',
	'inputbox-error-bad-type' => 'De Typ ???$1??? f??r dat Ingaav-Feld is nich bekannt.
Geev een vun disse Typen an: ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext???.',
	'tryexact' => 'exakte S????k vers??ken',
	'searchfulltext' => 'in???n Vulltext s??ken',
	'createarticle' => 'Siet anleggen',
);

/** Nepali (??????????????????) */
$messages['ne'] = array(
	'createarticle' => '????????? ??????????????????????????????',
);

/** Dutch (Nederlands)
 * @author SPQRobin
 * @author Siebrand
 */
$messages['nl'] = array(
	'inputbox-desc' => 'Maakt het toevoegen van voorgedefinieerde HTML-formulieren mogelijk',
	'inputbox-error-no-type' => 'U hebt het type invoerveld niet aangegeven.
Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] voor meer informatie.',
	'inputbox-error-bad-type' => 'Type invoerveld "$1" niet herkend.
Gebruik "create", "comment", "search", "search2" of "fulltext".',
	'tryexact' => 'Zoeken op exacte overeenkomst',
	'searchfulltext' => 'Volledige tekst doorzoeken',
	'createarticle' => 'Nieuwe pagina maken',
);

/** Norwegian Nynorsk (???Norsk (nynorsk)???)
 * @author Frokor
 * @author Harald Khan
 */
$messages['nn'] = array(
	'inputbox-desc' => 'Tillet inkludering av f??rehandsdefinerte HTML-skjema',
	'inputbox-error-no-type' => 'Du har ikkje gjeve kva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inntekstboks av typen ??$1?? vart ikkje gjenkjent.
Ver venleg og velg ??create??, ??comment??, ??search??, ??search2??, eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k i all tekst',
	'createarticle' => 'Lag side',
);

/** Norwegian (bokm??l)??? (???Norsk (bokm??l)???)
 * @author Jon Harald S??by
 */
$messages['no'] = array(
	'inputbox-desc' => 'Tillater inkludering av forh??ndsdefinerte HTML-skjemaer',
	'inputbox-error-no-type' => 'Du har ikke angitt hva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inputboks av typen ??$1?? gjenkjennes ikke.
Vennligst velg ??create??, ??comment??, ??search??, ??search2?? eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k full tekst',
	'createarticle' => 'Opprett side',
);

/** Novial (Novial)
 * @author Malafaya
 */
$messages['nov'] = array(
	'searchfulltext' => 'Sercha kompleti texte',
);

/** Northern Sotho (Sesotho sa Leboa)
 * @author Mohau
 */
$messages['nso'] = array(
	'createarticle' => 'Tlhoma letlakala',
);

/** Occitan (Occitan)
 * @author Cedric31
 */
$messages['oc'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formularis HTML predefinits',
	'inputbox-error-no-type' => 'Av??tz pas precisat lo tipe de la b??stia de dintrada de crear.',
	'inputbox-error-bad-type' => "Tipe de b??stia d'entrada ?? $1 ?? pas reconeguda.
Indicatz una opcion demest ''create'', ''comment'', ''search'' o ''searche2'' o ?? fulltext ??.",
	'tryexact' => 'Ensajatz la correspond??ncia exacta',
	'searchfulltext' => 'Rec??rca en t??xt integral',
	'createarticle' => 'Crear l???article',
);

/** Pangasinan (Pangasinan) */
$messages['pag'] = array(
	'createarticle' => 'Mangawa na artikulo',
);

/** Pampanga (Kapampangan) */
$messages['pam'] = array(
	'createarticle' => 'Gawang artikulu',
);

/** Polish (Polski)
 * @author Derbeth
 * @author Sp5uhe
 */
$messages['pl'] = array(
	'inputbox-desc' => 'Umo??liwia w????czenie w tre???? strony wcze??niej zdefiniowanych formularzy HTML',
	'inputbox-error-no-type' => 'Typ pola wej??ciowego nie zosta?? okre??lony',
	'inputbox-error-bad-type' => 'Typ ???$1??? pola wej??ciowego nie zosta?? rozpoznany.
Nale??y wybra?? ???create???, ???comment???, ???search???, ???search2??? or ???fulltext???.',
	'tryexact' => 'U??yj dok??adnego wyra??enia',
	'searchfulltext' => 'Szukaj w ca??ych tekstach',
	'createarticle' => 'Utw??rz artyku??',
);

/** Piedmontese (Piemont??is)
 * @author B??rto 'd S??ra
 */
$messages['pms'] = array(
	'inputbox-error-no-type' => "A l'ha nen dit che s??rt ??d qu??der ??d caria dat ch'a debia fesse.",
	'inputbox-error-bad-type' => 'La s??rt ??d qu??der "$1" a l\'?? nen conoss??a. P??r pias??, ch\'a s??rna antra "create", "comment", "search" ?? pura "search2".',
	'tryexact' => 'S??rca che a sia pr??pe parej',
	'searchfulltext' => 'S??rca an tut ??l test',
	'createarticle' => "Crea n'art??col",
);

/** Pontic (????????????????)
 * @author Sinopeus
 */
$messages['pnt'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Pashto (????????)
 * @author Ahmed-Najib-Biabani-Ibrahimkhel
 */
$messages['ps'] = array(
	'inputbox-desc' => '?? ???????? ???? ?? HTML ?????????? ???????? ?????????? ???????????? ?????????? ??????????',
	'tryexact' => '???? ???? ?????????? ???? ??????????????',
	'searchfulltext' => '???????? ?????? ????????',
	'createarticle' => '?????? ?????????? ??????????',
);

/** Portuguese (Portugu??s)
 * @author Malafaya
 */
$messages['pt'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios HTML pr??-definidos.',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de box de inser????o a ser criado.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a exata express??o',
	'searchfulltext' => 'Pesquisar no texto completo',
	'createarticle' => 'Criar p??gina',
);

/** Brazilian Portuguese (Portugu??s do Brasil)
 * @author Brunoy Anastasiya Seryozhenko
 * @author Eduardo.mps
 */
$messages['pt-br'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios definidos de HTML',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de inputbox a ser criada.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a express??o exata',
	'searchfulltext' => 'Pesquisar em todo o texto.',
	'createarticle' => 'Criar p??gina.',
);

/** Quechua (Runa Simi)
 * @author AlimanRuna
 */
$messages['qu'] = array(
	'tryexact' => 'Hinalla taripanayaspa maskay',
	'searchfulltext' => "Hunt'a qillqata maskay",
	'createarticle' => 'Qillqata kamariy',
);

/** Romanian (Rom??n??)
 * @author Emily
 * @author Firilacroco
 * @author KlaudiuMihaila
 * @author Mihai
 */
$messages['ro'] = array(
	'inputbox-desc' => 'Permite includerea formelor HTML predefinite',
	'inputbox-error-no-type' => 'Nu ai specificat ce tip de cutie intrare s?? fie creat??.',
	'inputbox-error-bad-type' => 'Tipul de cutie intrare "$1" nu este recunoscut.
Te rog s?? specifici parametrii "create", "comment", "search", "search2" sau "fulltext".',
	'tryexact' => '??ncearc?? varianta exact??',
	'searchfulltext' => 'Caut?? textul ??ntreg',
	'createarticle' => 'Creaz?? articol',
);

/** Aromanian (Arm??neashce) */
$messages['roa-rup'] = array(
	'createarticle' => 'Adrats articlu',
);

/** Tarand??ne (Tarand??ne)
 * @author Joetaras
 */
$messages['roa-tara'] = array(
	'createarticle' => "Ccreje 'a v??sce",
);

/** Russian (??????????????)
 * @author ?????????????????? ??????????????
 */
$messages['ru'] = array(
	'inputbox-desc' => '?????????????????? ???????????????? ?????????????? ???????????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???????? ?????????? ??$1??.
????????????????????, ?????????????? ???????? ???? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** Yakut (???????? ????????)
 * @author HalanTul
 */
$messages['sah'] = array(
	'inputbox-desc' => '???????????????? ???????????????????? HTML-?????????????????? ??????????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '??$1?? ???????????? ???????????? ??????????????????. ???????? ???????? ?????????????????????? ??????: ??create??, ??comment??, ??search??, ??search2?? ???????????? ??fulltext??.',
	'tryexact' => '?????????? ??????????',
	'searchfulltext' => '???????????????? ?????????????? ??????????????????',
	'createarticle' => '???????????????????? ????????????',
);

/** Sardinian (Sardu)
 * @author Marzedu
 */
$messages['sc'] = array(
	'createarticle' => 'Crea art??culu',
);

/** Sicilian (Sicilianu)
 * @author Santu
 */
$messages['scn'] = array(
	'inputbox-desc' => 'Pirmetti nzirimenti di m??duli HTML predifiniti',
	'inputbox-error-no-type' => 'Non vinni spicificatu lu tipu di inputbox di criari.',
	'inputbox-error-bad-type' => '"$1" nun ?? nu tipu di inputbox canusciutu. S\'h?? sc??gghiri lu tipu ntra "create", "comment", "search" e "search2".',
	'tryexact' => 'Cerca currispunnenza giusta',
	'searchfulltext' => 'Circata nt?? testu',
	'createarticle' => 'Cria vuci',
);

/** Sindhi (????????) */
$messages['sd'] = array(
	'createarticle' => '???????? ?????????? ??????',
);

/** Sango (S??ng??) */
$messages['sg'] = array(
	'createarticle' => 'S?? soura',
);

/** Sinhala (???????????????)
 * @author Asiri wiki
 * @author ?????????????????????????????????
 */
$messages['si'] = array(
	'inputbox-desc' => '??????????????????????????????????????????????????? HTML ????????????????????? ????????????????????????????????? ?????????????????????',
	'inputbox-error-no-type' => '??????????????? ???????????? ????????????????????? ?????????????????? ????????????????????? ?????? ?????????????????? ????????????????????? ????????? ??????????????? ???????????????.',
	'inputbox-error-bad-type' => '????????????????????? ???????????? ????????????????????? "$1" ????????????????????? ???????????????.
????????????????????? "???????????????", "?????????????????????", "??????????????????" ?????? "??????????????????2" ????????????????????? ??????????????? .',
	'tryexact' => '??????????????? ??????????????????  ??????????????? ???????????????',
	'searchfulltext' => '???????????????????????? ????????? ?????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Slovak (Sloven??ina)
 * @author Helix84
 */
$messages['sk'] = array(
	'inputbox-desc' => 'Umo????uje vlo??enie preddefinovan??ch HTML formul??rov',
	'inputbox-error-no-type' => 'Neuviedli ste typ vstupn??ho po??a, ktor?? sa m?? vytvori??.',
	'inputbox-error-bad-type' => 'Vstupn?? pole typu ???$1??? nie je podporovan??.
Pros??m, pou??ite ???create???, ???comment???, ???search??? alebo ???search2???.',
	'tryexact' => 'Sk??ste presn?? vyh??ad??vanie',
	'searchfulltext' => 'Fulltextov?? vyh??ad??vanie',
	'createarticle' => 'Vytvori?? str??nku',
);

/** Slovenian (Sloven????ina) */
$messages['sl'] = array(
	'tryexact' => 'Poskusite z natan??nim zadetkom',
	'searchfulltext' => 'Prei????i vse besedilo',
	'createarticle' => 'Ustvarite stran',
);

/** Albanian (Shqip)
 * @author Dori
 */
$messages['sq'] = array(
	'tryexact' => 'K??rko p??rputhje t?? plot??',
	'searchfulltext' => 'K??rko tekstin e plot??',
	'createarticle' => 'Krijo artikull',
);

/** Serbian Cyrillic ekavian (????????????????)
 * @author Millosh
 * @author ?????????????? ????????????????????
 */
$messages['sr-ec'] = array(
	'inputbox-desc' => '?????????????? ???????????????????? ?????????????????? ?????????????????????? HTML ??????????.',
	'inputbox-error-no-type' => '???????? ?????????????? ?????? ???????????? ???????????? ???? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????????????? ???? ???????? ???????????????? ???? ????????????????.
???????????? ?????? ???? ???? ?????????????????? ???? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????? ?????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** latinica (latinica) */
$messages['sr-el'] = array(
	'tryexact' => 'Poku??aj ta??no',
	'searchfulltext' => 'Pretra??i ceo tekst',
	'createarticle' => 'Napravi ??lanak',
);

/** Swati (SiSwati)
 * @author Jatrobat
 */
$messages['ss'] = array(
	'createarticle' => 'K??d??la intfo',
);

/** Seeltersk (Seeltersk)
 * @author Maartenvdbent
 * @author Pyt
 */
$messages['stq'] = array(
	'inputbox-desc' => 'Ferl????wet d??t Apniemen fon foardefinierde HTML-Formulare',
	'inputbox-error-no-type' => 'Du h????st naan Inputbox-Typ ounroat.',
	'inputbox-error-bad-type' => 'Iengoawef??ild-Typ "$1" uunbekoand.
Reek n gultigen Typ an: ???create???, ???comment???, ???search???, ???search2??? of "fulltext".',
	'tryexact' => 'Fers??ik exakte S??ike:',
	'searchfulltext' => 'D??n ganse Text truchs??ike',
	'createarticle' => 'Siede anl????se',
);

/** Sundanese (Basa Sunda)
 * @author Irwangatot
 */
$messages['su'] = array(
	'tryexact' => 'Coba jeung anu cocog',
	'searchfulltext' => 'Sungsi dina t??ks lengkap',
	'createarticle' => 'Jieun artikel',
);

/** Swedish (Svenska)
 * @author Lejonel
 * @author Najami
 */
$messages['sv'] = array(
	'inputbox-desc' => 'Ger m??jlighet att anv??nda f??rdefinerade HTML-formul??r.',
	'inputbox-error-no-type' => 'Du har inte angivit vilken typ av inputbox som ska skapas..',
	'inputbox-error-bad-type' => '"$1" ??r inte en k??nd typ av inputbox.
Var god specifiera "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'F??rs??k hitta exakt matchning',
	'searchfulltext' => 'Fulltexts??kning',
	'createarticle' => 'Skapa sida',
);

/** Silesian (??l??nski)
 * @author Ozi64
 */
$messages['szl'] = array(
	'createarticle' => 'Na??kryflej artikel',
);

/** Telugu (??????????????????)
 * @author Chaduvari
 * @author Veeven
 */
$messages['te'] = array(
	'inputbox-desc' => '??????????????? ??????????????????????????????????????? HTML ???????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??? ??????????????? ?????????&zwnj;???????????? ???????????????????????? ????????????????????????????????? ???????????? ???????????????????????????.',
	'tryexact' => '??????????????????????????? ??????????????? ??????????????? ?????????????????????????????????',
	'searchfulltext' => '?????????????????? ???????????????????????? ??????????????????',
	'createarticle' => '?????????????????????????????? ???????????????????????????',
);

/** Tajik (Cyrillic) (???????????? (Cyrillic))
 * @author Ibrahim
 */
$messages['tg-cyrl'] = array(
	'inputbox-desc' => '???????????? ???????????????? ???? ?????????????? HTML ???? ?????? ???????????????????????? ??????????????',
	'inputbox-error-no-type' => '?????????? ???????????? ?????????????? ?????????????????????????? ???????????????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????? ???????????? ?????????????? "$1" ?????????????????? ??????. ???????????? ???? ???? ?????????????????? ???? ???????? "create", "comment", "search" ?? "search2" ???????????????? ??????????.',
	'tryexact' => '???????????????????? ???????????? ????????????????',
	'searchfulltext' => '???????????????? ?????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Thai (?????????) */
$messages['th'] = array(
	'tryexact' => '?????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????',
	'createarticle' => '????????????????????????????????????',
);

/** Tagalog (Tagalog)
 * @author AnakngAraw
 */
$messages['tl'] = array(
	'inputbox-desc' => 'Pahintulutan ang pagsasama ng mga pormularyong HTML na may paunang kahulugan',
	'inputbox-error-no-type' => 'Hindi mo tinukoy ang uri ng pasukang kahong lilikhain.',
	'inputbox-error-bad-type' => 'Hindi nakikilala ang uri ng pasukang kahong "$1".
Pakitukoy ang "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Subukin ang hustung-hustong katugmaan',
	'searchfulltext' => 'Maghanap sa buong teksto',
	'createarticle' => 'Likhain ang pahina',
);

/** Tswana (Setswana) */
$messages['tn'] = array(
	'createarticle' => 'Kwala mokwalo',
);

/** Tonga (lea faka-Tonga) */
$messages['to'] = array(
	'createarticle' => 'Fakatupu ??a e kupu',
);

/** Turkish (T??rk??e)
 * @author Erkan Yilmaz
 * @author Joseph
 * @author Srhat
 */
$messages['tr'] = array(
	'inputbox-desc' => '??ntan??ml?? HTML formlar??n??n dahil edilmesine olanak verir',
	'inputbox-error-no-type' => 'Olu??turulacak girdi kutusunun tipini belirtmediniz.',
	'inputbox-error-bad-type' => 'Girdi kutusu tipi "$1" tan??nmad??.
L??tfen "create", "comment", "search", "search2" ya da  "fulltext" olarak belirtin.',
	'tryexact' => 'Tam e??le??me dene',
	'searchfulltext' => 'T??m metni ara',
	'createarticle' => 'Sayfay?? olu??tur',
);

/** Tsonga (Xitsonga)
 * @author Thuvack
 */
$messages['ts'] = array(
	'createarticle' => 'Tumbuluxa tluka',
);

/** Ukrainian (????????????????????)
 * @author AS
 * @author Ahonc
 */
$messages['uk'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????????????????? ?????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ???????? ??????????, ?????? ??????????????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ???????????????? ???????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '???????????????? ????????????',
);

/** Urdu (????????) */
$messages['ur'] = array(
	'searchfulltext' => '???????? ?????? ??????',
	'createarticle' => '?????? ??????????',
);

/** Uzbek (O'zbek) */
$messages['uz'] = array(
	'createarticle' => 'Maqola kiritish',
);

/** V??neto (V??neto)
 * @author Candalua
 */
$messages['vec'] = array(
	'inputbox-desc' => "Consente l'inserimento de moduli HTML predefin??i",
	'inputbox-error-no-type' => 'No te gh?? specific?? el tipo de inputbox da crear.',
	'inputbox-error-bad-type' => '"$1" no\'l xe m??a un tipo de inputbox riconossi??o.
Siegli el tipo tra "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => '??erca corispondenza precisa',
	'searchfulltext' => '??erca nel testo',
	'createarticle' => 'Crea pagina',
);

/** Veps (Vepsan kel')
 * @author ?????????? ????????????????
 */
$messages['vep'] = array(
	'createarticle' => "S??ta lehtpol'",
);

/** Vietnamese (Ti???ng Vi???t)
 * @author Minh Nguyen
 */
$messages['vi'] = array(
	'inputbox-desc' => 'Th??m nh???ng bi???u m???u HTML ????n gi???n',
	'inputbox-error-no-type' => 'B???n ch??a ?????nh r?? lo???i bi???u m???u ????? t???o ra.',
	'inputbox-error-bad-type' => 'Lo???i bi???u m???u ???$1??? kh??ng h???p l???. Xin h??y ch???n ???create???, ???comment???, ???search???, ???search2???, hay ???fulltext???.',
	'tryexact' => 'Th??? t??m ??o???n v??n kh???p ch??nh x??c v???i t??? kh??a',
	'searchfulltext' => 'T??m to??n v??n',
	'createarticle' => 'Vi???t b??i m???i',
);

/** Volap??k (Volap??k)
 * @author Malafaya
 * @author Smeira
 */
$messages['vo'] = array(
	'inputbox-desc' => 'D??l??n kenin??kami fomas-HTLM b??o pemiedet??las',
	'searchfulltext' => 'Suk??n zi da v??dem l??lik',
	'createarticle' => 'Jaf??n padi',
);

/** V??ro (V??ro)
 * @author V??rok
 */
$messages['vro'] = array(
	'tryexact' => 'T??ps?? otsmin??',
	'searchfulltext' => 'Otsiq terveq tekst',
	'createarticle' => 'Luuq leht',
);

/** Walloon (Walon) */
$messages['wa'] = array(
	'createarticle' => 'Ahiver ??rtike',
);

/** Wolof (Wolof)
 * @author Ibou
 */
$messages['wo'] = array(
	'inputbox-error-no-type' => 'Leeraloo ban xeetu boyotu duggit nga b??gga sos.',
	'inputbox-error-bad-type' => '"$1" du xeetu boyotu duggit bu ??u xam. T??nnal benn ci yii "create", "comment", "seach" walla "search2"',
	'tryexact' => 'Seet wi mu yamal',
	'searchfulltext' => 'Ceet ci mbind mi',
	'createarticle' => 'Sos jukki bi',
);

/** Wu (??????) */
$messages['wuu'] = array(
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Xhosa (isiXhosa) */
$messages['xh'] = array(
	'createarticle' => 'Bhala Ibali',
);

/** Yiddish (????????????)
 * @author Yidel
 * @author ????????????????
 */
$messages['yi'] = array(
	'searchfulltext' => '?????? ?????? ?????? ????????????',
	'createarticle' => '???????????? ????????????',
);

/** Yue (??????) */
$messages['yue'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '?????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"?????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '?????????????????????',
	'searchfulltext' => '?????????',
	'createarticle' => '????????????',
);

/** Simplified Chinese (?????????(??????)???)
 * @author Wmr89502270
 */
$messages['zh-hans'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???"fulltext"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Traditional Chinese (?????????(??????)???) */
$messages['zh-hant'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Zulu (isiZulu) */
$messages['zu'] = array(
	'searchfulltext' => 'Sesha ukubhala konke',
);



--- NEW FILE InputBox.php ---
<?php
/**
 * InputBox extension
 *
 * @file
 * @ingroup Extensions
 *
 * This file contains the main include file for the Inputbox extension of
 * MediaWiki.
 *
 * Usage: Add the following line in LocalSettings.php:
 * require_once( "$IP/extensions/InputBox/InputBox.php" );
 *
 * @author Erik Moeller <moeller at scireview.de>
 *  namespaces search improvements partially by
 *  Leonardo Pimenta <leo.lns at gmail.com>
 *	Cleaned up by Trevor Parscal <tparscal at wikimedia.org>
 * @copyright Public domain
 * @license Public domain
 * @version 0.1.1
 */

// Check environment
if ( !defined( 'MEDIAWIKI' ) ) {
	echo( "This is an extension to the MediaWiki package and cannot be run standalone.\n" );
	die( -1 );
}

/* Configuration */

// Credits
$wgExtensionCredits['parserhook'][] = array(
	'name'           => 'InputBox',
	'author'         => array( 'Erik Moeller', 'Leonardo Pimenta', 'Rob Church', 'Trevor Parscal' ),
	'url'            => 'http://www.mediawiki.org/wiki/Extension:InputBox',
	'description'    => 'Allow inclusion of predefined HTML forms.',
	'descriptionmsg' => 'inputbox-desc',
);

// Shortcut to this extension directory
$dir = dirname( __FILE__ ) . '/';

// Internationalization
$wgExtensionMessagesFiles['InputBox'] = $dir . 'InputBox.i18n.php';

// Register auto load for the special page class
$wgAutoloadClasses['InputBoxHooks'] = $dir . 'InputBox.hooks.php';
$wgAutoloadClasses['InputBox'] = $dir . 'InputBox.classes.php';

// Register parser hook
if ( defined( 'MW_SUPPORTS_PARSERFIRSTCALLINIT' ) ) {
	// Modern
	$wgHooks['ParserFirstCallInit'][] = 'InputBoxHooks::register';
} else {
	// Legacy
	$wgExtensionFunctions[] = array( 'InputBoxHooks', 'register' );
}


--- NEW FILE README.fedora ---
To complete installation of InputBox, add the following line to
LocalSettings.php:

  require_once "$IP/extensions/InputBox/InputBox.php";

for each MediaWiki instance you wish to install InputBox on.

This extension creates an <inputbox> tag that can be used to add wiki-related
HTML input boxes to wiki pages.  In general, "wiki-related" means
search boxes and "create an article" boxes.  Please see
http://www.mediawiki.org/wiki/Extension:InputBox for more details.


--- NEW FILE import.log ---
mediawiki-InputBox-0-0_2_20090420svn_fc10:HEAD:mediawiki-InputBox-0-0.2.20090420svn.fc10.src.rpm:1240512072


--- NEW FILE mediawiki-InputBox.spec ---
Name:		mediawiki-InputBox
Version:	0
Release:	0.2.20090420svn%{?dist}
Summary:	An extension to enable input box tags for mediawiki pages

Group:		Applications/Internet
License:	Public Domain
URL:		http://www.mediawiki.org/wiki/Extension:InputBox
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.classes.php?revision=49657
Source0:	InputBox.classes.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.hooks.php?revision=49657
Source1:	InputBox.hooks.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.i18n.php?revision=49657
Source2:	InputBox.i18n.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.php?revision=49657
Source3:	InputBox.php
Source4:	README.fedora
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	mediawiki >= 1.11

%description
The InputBox extension is a MediaWiki extension which adds already created HTML
forms to wiki pages. Users can "complete" a form (entering text, selecting menu
items, etc.) by entering text into the box.

InputBox was originally created by Erik Moeller for the purpose of adding a
Create an article box to Wikinews.

%prep

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox
install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/mediawiki/extensions/InputBox
%doc %{_docdir}/%{name}-%{version}/README.fedora

%changelog
* Mon Apr 20 2009 John Guthrie <guthrie at counterexample.org> - 0-0.2.20090420svn
- Fixed the source URLs and updated to the latest svn version.

* Tue Mar 31 2009 John Guthrie <guthrie at counterexample.org> - 0-0.1.20090331svn
- Initial package build.



From mclasen at fedoraproject.org  Thu Apr 23 18:52:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 23 Apr 2009 18:52:14 +0000 (UTC)
Subject: rpms/gnome-system-monitor/F-11
	gnome-system-monitor-2.25.91-polkit.patch, 1.1,
	1.2 gnome-system-monitor.spec, 1.140, 1.141
Message-ID: <20090423185214.820D670104@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6412

Modified Files:
	gnome-system-monitor-2.25.91-polkit.patch 
	gnome-system-monitor.spec 
Log Message:
fix sensitivity of menu items


gnome-system-monitor-2.25.91-polkit.patch:

Index: gnome-system-monitor-2.25.91-polkit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-11/gnome-system-monitor-2.25.91-polkit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-system-monitor-2.25.91-polkit.patch	19 Feb 2009 06:06:57 -0000	1.1
+++ gnome-system-monitor-2.25.91-polkit.patch	23 Apr 2009 18:52:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gnome-system-monitor-2.25.91/configure.in.polkit gnome-system-monitor-2.25.91/configure.in
---- gnome-system-monitor-2.25.91/configure.in.polkit	2009-02-16 13:07:36.000000000 -0500
-+++ gnome-system-monitor-2.25.91/configure.in	2009-02-19 01:04:23.775985963 -0500
+diff -up gnome-system-monitor-2.26.1/configure.in.polkit gnome-system-monitor-2.26.1/configure.in
+--- gnome-system-monitor-2.26.1/configure.in.polkit	2009-04-10 18:33:14.000000000 -0400
++++ gnome-system-monitor-2.26.1/configure.in	2009-04-23 14:37:53.528524725 -0400
 @@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0
  GLIBMM_REQUIRED=2.14
  LIBXML_REQUIRED=2.0
@@ -54,9 +54,9 @@
  	Maintainer mode:	${USER_MAINTAINER_MODE}
  	Languages:		${ALL_LINGUAS}
  "
-diff -up gnome-system-monitor-2.25.91/po/POTFILES.in.polkit gnome-system-monitor-2.25.91/po/POTFILES.in
---- gnome-system-monitor-2.25.91/po/POTFILES.in.polkit	2009-02-16 13:36:20.000000000 -0500
-+++ gnome-system-monitor-2.25.91/po/POTFILES.in	2009-02-19 01:04:23.777985747 -0500
+diff -up gnome-system-monitor-2.26.1/po/POTFILES.in.polkit gnome-system-monitor-2.26.1/po/POTFILES.in
+--- gnome-system-monitor-2.26.1/po/POTFILES.in.polkit	2009-04-13 15:36:22.000000000 -0400
++++ gnome-system-monitor-2.26.1/po/POTFILES.in	2009-04-23 14:37:53.528524725 -0400
 @@ -8,6 +8,7 @@ src/callbacks.cpp
  src/defaulttable.h
  src/disks.cpp
@@ -65,9 +65,9 @@
  src/gnome-system-monitor.schemas.in
  src/gsm_color_button.c
  src/interface.cpp
-diff -up gnome-system-monitor-2.25.91/src/callbacks.cpp.polkit gnome-system-monitor-2.25.91/src/callbacks.cpp
---- gnome-system-monitor-2.25.91/src/callbacks.cpp.polkit	2009-01-20 16:00:27.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/callbacks.cpp	2009-02-19 01:04:23.779986089 -0500
+diff -up gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit gnome-system-monitor-2.26.1/src/callbacks.cpp
+--- gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit	2009-01-20 16:00:27.000000000 -0500
++++ gnome-system-monitor-2.26.1/src/callbacks.cpp	2009-04-23 14:47:33.698496775 -0400
 @@ -210,11 +210,13 @@ cb_app_delete (GtkWidget *window, GdkEve
  
  
@@ -82,9 +82,17 @@
  
  
  static void change_gconf_color(GConfClient *client, const char *key,
-diff -up /dev/null gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.c
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.c	2009-02-19 01:04:23.785987256 -0500
+@@ -286,6 +288,7 @@ cb_row_selected (GtkTreeSelection *selec
+ 	ProcData * const procdata = static_cast<ProcData*>(data);
+ 
+ 	procdata->selection = selection;
++	procdata->selected_process = NULL;
+ 
+ 	/* get the most recent selected process and determine if there are
+ 	** no selected processes
+diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c	2009-04-23 14:37:53.530531638 -0400
 @@ -0,0 +1,640 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -726,9 +734,9 @@
 +out:
 +        return ret;
 +}
-diff -up /dev/null gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.xml
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.xml	2009-02-19 01:04:23.788989062 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml	2009-04-23 14:37:53.531498182 -0400
 @@ -0,0 +1,15 @@
 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 +<node name="/">
@@ -745,9 +753,9 @@
 +    </method>
 +  </interface>
 +</node>
-diff -up gnome-system-monitor-2.25.91/src/interface.cpp.polkit gnome-system-monitor-2.25.91/src/interface.cpp
---- gnome-system-monitor-2.25.91/src/interface.cpp.polkit	2009-01-24 05:37:45.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/interface.cpp	2009-02-19 01:04:23.792990166 -0500
+diff -up gnome-system-monitor-2.26.1/src/interface.cpp.polkit gnome-system-monitor-2.26.1/src/interface.cpp
+--- gnome-system-monitor-2.26.1/src/interface.cpp.polkit	2009-04-10 18:33:14.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/interface.cpp	2009-04-23 14:45:39.237496203 -0400
 @@ -30,6 +30,10 @@
  #include <gdk/gdkkeysyms.h>
  #include <math.h>
@@ -845,10 +853,11 @@
  	/* create the main notebook */
  	procdata->notebook = notebook = gtk_notebook_new ();
    	gtk_box_pack_start (GTK_BOX (main_box), 
-@@ -774,23 +822,53 @@ update_sensitivity(ProcData *data)
+@@ -774,11 +822,14 @@ update_sensitivity(ProcData *data)
  	processes_sensitivity = (data->config.current_tab == PROCMAN_TAB_PROCESSES);
  	selected_sensitivity = (processes_sensitivity && data->selected_process != NULL);
  
++	g_print ("update sensitivity: processes %d selected %d\n", processes_sensitivity, selected_sensitivity);
 +#ifndef HAVE_POLKIT
  	if(data->endprocessbutton) {
  		/* avoid error on startup if endprocessbutton
@@ -859,23 +868,18 @@
  
  	for (i = 0; i != G_N_ELEMENTS(processes_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
- 						     processes_actions[i]);
--		gtk_action_set_sensitive(action, processes_sensitivity);
-+		gtk_action_set_sensitive(action, selected_sensitivity);
- 	}
- 
+@@ -789,8 +840,36 @@ update_sensitivity(ProcData *data)
  	for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
  						     selected_actions[i]);
--		gtk_action_set_sensitive(action, selected_sensitivity);
 +#ifdef HAVE_POLKIT
 +                if (POLKIT_GNOME_IS_ACTION (action)) {
-+                        polkit_gnome_action_set_sensitive (POLKIT_GNOME_ACTION (action), processes_sensitivity);
++                        polkit_gnome_action_set_sensitive (POLKIT_GNOME_ACTION (action), selected_sensitivity);
 +                } else {
-+                        gtk_action_set_sensitive(action, processes_sensitivity);
++                        gtk_action_set_sensitive(action, selected_sensitivity);
 +                }
 +#else
-+		gtk_action_set_sensitive(action, processes_sensitivity);
+ 		gtk_action_set_sensitive(action, selected_sensitivity);
 +#endif
  	}
 +
@@ -901,9 +905,9 @@
  }
  
  static void		
-diff -up gnome-system-monitor-2.25.91/src/Makefile.am.polkit gnome-system-monitor-2.25.91/src/Makefile.am
---- gnome-system-monitor-2.25.91/src/Makefile.am.polkit	2008-08-08 15:55:59.000000000 -0400
-+++ gnome-system-monitor-2.25.91/src/Makefile.am	2009-02-19 01:04:23.800988043 -0500
+diff -up gnome-system-monitor-2.26.1/src/Makefile.am.polkit gnome-system-monitor-2.26.1/src/Makefile.am
+--- gnome-system-monitor-2.26.1/src/Makefile.am.polkit	2008-08-08 15:55:59.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/Makefile.am	2009-04-23 14:37:53.545493980 -0400
 @@ -4,7 +4,9 @@ INCLUDES = \
  	-DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -915,9 +919,13 @@
  
  bin_PROGRAMS = gnome-system-monitor
  
-@@ -35,8 +37,11 @@ gnome_system_monitor_SOURCES = \
+@@ -33,10 +35,14 @@ gnome_system_monitor_SOURCES = \
+ 	gconf-keys.cpp gconf-keys.h \
+ 	iconthemewrapper.cpp iconthemewrapper.h \
  	e_date.c e_date.h \
-         gsm_color_button.c gsm_color_button.h
+-        gsm_color_button.c gsm_color_button.h
++        gsm_color_button.c gsm_color_button.h \
++	gsm-session-manager.c gsm-session-manager.h
  
 +if HAVE_POLKIT
 +gnome_system_monitor_SOURCES += gnome-system-monitor-mechanism-client-glue.h
@@ -928,7 +936,7 @@
  
  
  noinst_LTLIBRARIES = libbacon.la
-@@ -52,8 +57,44 @@ schema_ins  = gnome-system-monitor.schem
+@@ -52,8 +58,44 @@ schema_ins  = gnome-system-monitor.schem
  schema_DATA = $(schema_ins:.schemas.in=.schemas)
  @INTLTOOL_SCHEMAS_RULE@
  
@@ -974,9 +982,9 @@
  
  CLEANFILES = \
  	$(schema_DATA)
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.conf
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.conf	2009-02-19 01:04:23.801989995 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf	2009-04-23 14:37:53.534493361 -0400
 @@ -0,0 +1,11 @@
 +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
 +
@@ -989,17 +997,17 @@
 +    <allow own="org.gnome.SystemMonitor.Mechanism"/>
 +  </policy>
 +</busconfig>
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.service.in
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-02-19 01:04:23.802984823 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-04-23 14:37:53.534493361 -0400
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.gnome.SystemMonitor.Mechanism
 +Exec=libexecdir/gnome-system-monitor-mechanism
 +User=root
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.system-monitor.policy.in
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.system-monitor.policy.in	2009-02-19 01:04:23.803984610 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in	2009-04-23 14:37:53.535525627 -0400
 @@ -0,0 +1,50 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +
@@ -1051,9 +1059,9 @@
 +  </action>
 +  
 +</policyconfig>
-diff -up gnome-system-monitor-2.25.91/src/procactions.cpp.polkit gnome-system-monitor-2.25.91/src/procactions.cpp
---- gnome-system-monitor-2.25.91/src/procactions.cpp.polkit	2007-01-02 17:15:36.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procactions.cpp	2009-02-19 01:04:23.804984817 -0500
+diff -up gnome-system-monitor-2.26.1/src/procactions.cpp.polkit gnome-system-monitor-2.26.1/src/procactions.cpp
+--- gnome-system-monitor-2.26.1/src/procactions.cpp.polkit	2007-01-02 17:15:36.000000000 -0500
++++ gnome-system-monitor-2.26.1/src/procactions.cpp	2009-04-23 14:37:53.536494477 -0400
 @@ -31,6 +31,10 @@
  #include "procdialogs.h"
  #include "callbacks.h"
@@ -1166,9 +1174,9 @@
  	proctable_update_all (procdata);
  }
 +
-diff -up gnome-system-monitor-2.25.91/src/procdialogs.cpp.polkit gnome-system-monitor-2.25.91/src/procdialogs.cpp
---- gnome-system-monitor-2.25.91/src/procdialogs.cpp.polkit	2008-05-23 17:44:00.000000000 -0400
-+++ gnome-system-monitor-2.25.91/src/procdialogs.cpp	2009-02-19 01:04:23.805984464 -0500
+diff -up gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit gnome-system-monitor-2.26.1/src/procdialogs.cpp
+--- gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit	2008-05-23 17:44:00.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/procdialogs.cpp	2009-04-23 14:37:53.537493707 -0400
 @@ -35,6 +35,11 @@
  #include "procman_gnomesu.h"
  #include "procman_gksu.h"
@@ -1362,9 +1370,9 @@
  }
  
  static void
-diff -up gnome-system-monitor-2.25.91/src/procman.cpp.polkit gnome-system-monitor-2.25.91/src/procman.cpp
---- gnome-system-monitor-2.25.91/src/procman.cpp.polkit	2009-01-03 07:06:10.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procman.cpp	2009-02-19 01:04:23.807984667 -0500
+diff -up gnome-system-monitor-2.26.1/src/procman.cpp.polkit gnome-system-monitor-2.26.1/src/procman.cpp
+--- gnome-system-monitor-2.26.1/src/procman.cpp.polkit	2009-03-31 17:57:18.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/procman.cpp	2009-04-23 14:37:53.538493287 -0400
 @@ -36,6 +36,10 @@
  #include <glibtop/close.h>
  #include <glibtop/loadavg.h>
@@ -1412,9 +1420,9 @@
  
  
  ProcData* ProcData::get_instance()
-diff -up gnome-system-monitor-2.25.91/src/procman.h.polkit gnome-system-monitor-2.25.91/src/procman.h
---- gnome-system-monitor-2.25.91/src/procman.h.polkit	2009-01-20 15:53:35.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procman.h	2009-02-19 01:04:23.808984593 -0500
+diff -up gnome-system-monitor-2.26.1/src/procman.h.polkit gnome-system-monitor-2.26.1/src/procman.h
+--- gnome-system-monitor-2.26.1/src/procman.h.polkit	2009-01-20 15:53:35.000000000 -0500
++++ gnome-system-monitor-2.26.1/src/procman.h	2009-04-23 14:37:53.538493287 -0400
 @@ -33,6 +33,11 @@
  #include <map>
  #include <string>


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-11/gnome-system-monitor.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-system-monitor.spec	14 Apr 2009 01:33:43 -0000	1.140
+++ gnome-system-monitor.spec	23 Apr 2009 18:52:14 -0000	1.141
@@ -13,7 +13,7 @@
 Summary: Process and resource monitor
 Name: gnome-system-monitor
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Fix sensitivity of menu items (#496860)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-system-monitor/2.26/gnome-system-monitor-2.26.1.news



From guthrie at fedoraproject.org  Thu Apr 23 19:00:11 2009
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Thu, 23 Apr 2009 19:00:11 +0000 (UTC)
Subject: rpms/mediawiki-InputBox/F-10 InputBox.classes.php, NONE,
	1.1 InputBox.hooks.php, NONE, 1.1 InputBox.i18n.php, NONE,
	1.1 InputBox.php, NONE, 1.1 README.fedora, NONE,
	1.1 mediawiki-InputBox.spec, NONE, 1.1
Message-ID: <20090423190011.C7D0570104@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/extras/rpms/mediawiki-InputBox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7274/F-10

Added Files:
	InputBox.classes.php InputBox.hooks.php InputBox.i18n.php 
	InputBox.php README.fedora mediawiki-InputBox.spec 
Log Message:
Initial import of mediawiki-InputBox package into the F-9, F-10, and F-11
branches.



--- NEW FILE InputBox.classes.php ---
<?php
/**
 * Classes for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox class
class InputBox {

	/* Fields */

	private $mParser;
	private $mType = '';
	private $mWidth = 50;
	private $mPreload = '';
	private $mEditIntro = '';
	private $mSummary = '';
	private $mMinor = '';
	private $mPage = '';
	private $mBR = 'yes';
	private $mDefaultText = '';
	private $mBGColor = 'transparent';
	private $mButtonLabel = '';
	private $mSearchButtonLabel = '';
	private $mFullTextButton = '';
	private $mLabelText = '';
	private $mHidden = '';
	private $mNamespaces = '';
	private $mID = '';
	private $mInline = false;
	private $mPrefix = '';

	/* Functions */

	public function __construct( $parser ) {
		$this->mParser = $parser;
	}

	public function render() {
		// Internationalization
		wfLoadExtensionMessages( 'InputBox' );

		// Handle various types
		switch( $this->mType ) {
			case 'create':
			case 'comment':
				return $this->getCreateForm();
			case 'commenttitle':
				return $this->getCommentForm();
			case 'search':
				return $this->getSearchForm('search');
			case 'fulltext':
				return $this->getSearchForm('fulltext');
			case 'search2':
				return $this->getSearchForm2();
			default:
				return Xml::tags( 'div', null,
					Xml::element( 'strong',
						array(
							'class' => 'error'
						),
						strlen( $this->mType ) > 0
						? wfMsgForContent( 'inputbox-error-bad-type', $this->mType ) 
						: wfMsgForContent( 'inputbox-error-no-type' ) 
					)
				);
		}
	}

	/**
	 * Generate search form
	 * @param $type 
	 */
	public function getSearchForm( $type ) {
		global $wgContLang;

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}
		if ( !$this->mSearchButtonLabel ) {
			$this->mSearchButtonLabel = wfMsgHtml( 'searchfulltext' );
		}

		// Build HTML
		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'searchbox',
				'id' => 'searchbox',
				'class' => 'searchbox',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'class' => 'searchboxInput',
				'name' => 'search',
				'type' => $this->mHidden ? 'hidden' : 'text',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth,
			)
		);
		
		if( $this->mPrefix != '' ){
			$htmlOut .= Xml::element( 'input',
				array(
					'name' => 'prefix',
					'type' => 'hidden',
					'value' => $this->mPrefix,
				)
			);	
		}
		
		$htmlOut .= $this->mBR;

		// Determine namespace checkboxes
		$namespaces = $wgContLang->getNamespaces();
		$namespacesArray = explode( ',', $this->mNamespaces );
		if ( $this->mNamespaces ) {
			foreach ( $namespacesArray as $userNamespace ) {
				$checked = array();
				// Namespace needs to be checked if flagged with "**" or if it's the only one
				if ( strstr( $userNamespace, '**' ) || count( $namespacesArray ) == 1 ) {
					$userNamespace = str_replace( '**', '', $userNamespace );
					$checked = array( 'checked' => 'checked' );
				}

				// Namespace checkboxes
				foreach ( $namespaces as $i => $name ) {
					if ( $i < 0 ) {
						continue;
					} elseif ( $i == 0 ) {
						$name = 'Main';
					}
					if ( $userNamespace == $name ) {
						// Checkbox
						$htmlOut .= Xml::element( 'input',
							array(
								'type' => 'checkbox',
								'name' => 'ns' . $i,
								'value' => 1,
								'id' => 'mw-inputbox-ns' . $i
							) + $checked
						);
						// Label
						$htmlOut .= '&nbsp;' . Xml::label( $userNamespace, 'mw-inputbox-ns' . $i );
					}
				}
			}

			// Line break
			$htmlOut .= $this->mBR;
		} else if( $type == 'search' ) {
			// Go button
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'go',
					'class' => 'searchboxGoButton',
					'value' => $this->mButtonLabel
				)
			);
			$htmlOut .= '&nbsp;';
		}

		// Search button
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'fulltext',
				'class' => 'searchboxSearchButton',
				'value' => $this->mSearchButtonLabel
			)
		);
		
		// Hidden fulltext param for IE (bug 17161)
		if( $type == 'fulltext' ) {
			$htmlOut .= Xml::hidden( 'fulltext', 'Search' );
		}
		
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/*
	 * Generate search form version 2
	 */
	public function getSearchForm2() {

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}

		$id = Sanitizer::escapeId( $this->mID, 'noninitial' );
		$htmlLabel = '';
		if ( isset( $this->mLabelText ) && strlen( trim( $this->mLabelText ) ) ) {
			$this->mLabelText = $this->mParser->recursiveTagParse( $this->mLabelText );
			$htmlLabel = Xml::openElement( 'label', array( 'for' => 'bodySearchInput' . $id ) );
			$htmlLabel .= $this->mLabelText;
			$htmlLabel .= Xml::closeElement( 'label' );
		}
		$htmlOut = Xml::openElement( 'form',
			array(
				'name' => 'bodySearch' . $id,
				'id' => 'bodySearch' . $id,
				'class' => 'bodySearch',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
				'style' => $this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= Xml::openElement( 'div',
			array(
				'class' => 'bodySearchWrap',
				'style' => 'background-color:' . $this->mBGColor . ';' .
					$this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= $htmlLabel;
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'search',
				'size' => $this->mWidth,
				'id' => 'bodySearchInput' . $id
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'go',
				'value' => $this->mButtonLabel,
				'class' => 'bodySearchBtnGo' . $id
			)
		);

		// Better testing needed here!
		if ( !empty( $this->mFullTextButton ) ) {
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'fulltext',
					'class' => 'bodySearchBtnSearch',
					'value' => $this->mSearchButtonLabel
				)
			);
		}

		$htmlOut .= Xml::closeElement( 'div' );
		$htmlOut .= Xml::closeElement( 'form' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Generate create page form
	 */
	public function getCreateForm() {
		global $wgScript;

		if ( $this->mType == "comment" ) {
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
			}
		} else {
			$comment = '';
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( 'createarticle' );
			}
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'createbox',
				'id' => 'createbox',
				'class' => 'createbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'summary',
				'value' => $this->mSummary,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'minor',
				'value' => $this->mMinor,
			)
		);
		if ( $this->mType == 'comment' ) {
			$htmlOut .= Xml::openElement( 'input',
				array(
					'type' => 'hidden',
					'name' => 'section',
					'value' => 'new',
				)
			);
		}
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'title',
				'class' => 'createboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'createboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}
	
	/**
	 * Generate new section form
	 */
	public function getCommentForm() {
		global $wgScript;

		if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'commentbox',
				'id' => 'commentbox',
				'class' => 'commentbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'preloadtitle',
				'class' => 'commentboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'section',
				'value' => 'new',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'title',
				'value' => $this->mPage
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'commentboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Extract options from a blob of text
	 *
	 * @param string $text Tag contents
	 */
	public function extractOptions( $text ) {
		wfProfileIn( __METHOD__ );

		// Parse all possible options
		$values = array();
		foreach ( explode( "\n", $text ) as $line ) {
			if ( strpos( $line, '=' ) === false )
				continue;
			list( $name, $value ) = explode( '=', $line, 2 );
			$values[ strtolower( trim( $name ) ) ] = trim( $value );
		}

		// Build list of options, with local member names
		$options = array(
			'type' => 'mType',
			'width' => 'mWidth',
			'preload' => 'mPreload',
			'page' => 'mPage',
			'editintro' => 'mEditIntro',
			'summary' => 'mSummary',
			'minor' => 'mMinor',
			'break' => 'mBR',
			'default' => 'mDefaultText',
			'bgcolor' => 'mBGColor',
			'buttonlabel' => 'mButtonLabel',
			'searchbuttonlabel' => 'mSearchButtonLabel',
			'fulltextbutton' => 'mFullTextButton',
			'namespaces' => 'mNamespaces',
			'labeltext' => 'mLabelText',
			'hidden' => 'mHidden',
			'id' => 'mID',
			'inline' => 'mInline',
			'prefix' => 'mPrefix',
		);
		foreach ( $options as $name => $var ) {
			if ( isset( $values[$name] ) ) {
				$this->$var = $values[$name];
			}
		}

		// Insert a line break if configured to do so
		$this->mBR = ( strtolower( $this->mBR ) == "no" ) ? ' ' : '<br />';

		// Validate the width; make sure it's a valid, positive integer
		$this->mWidth = intval( $this->mWidth <= 0 ? 50 : $this->mWidth );

		wfProfileOut( __METHOD__ );
	}

}


--- NEW FILE InputBox.hooks.php ---
<?php
/**
 * Hooks for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox hooks
class InputBoxHooks {

	/* Functions */

	// Initialization
	public static function register() {
		global $wgParser;

		// Register the hook with the parser
		$wgParser->setHook( 'inputbox', array( 'InputBoxHooks', 'render' ) );

		// Continue
		return true;
	}

	// Render the input box
	public static function render( $input, $args, $parser ) {
		// Create InputBox
		$inputBox = new InputBox( $parser );

		// Configure InputBox
		$inputBox->extractOptions( $parser->replaceVariables( $input ) );

		// Return output
		return $inputBox->render();
	}
}


--- NEW FILE InputBox.i18n.php ---
<?php

/**
 * Messages file for the InputBox extension
 *
 * @addtogroup Extensions
 */

/**
 * Get all extension messages
 *
 * @return array
 */
$messages = array();

$messages['en'] = array(
	'inputbox-desc'           => 'Allow inclusion of predefined HTML forms',
	'inputbox-error-no-type'  => 'You have not specified the type of input box to create.',
	'inputbox-error-bad-type' => 'Input box type "$1" not recognised.
Please specify "create", "comment", "search", "search2" or "fulltext".',
	'tryexact'                => 'Try exact match',
	'searchfulltext'          => 'Search full text',
	'createarticle'           => 'Create page',
);

/** Message documentation (Message documentation)
 * @author Meno25
 * @author SPQRobin
 * @author Siebrand
 */
$messages['qqq'] = array(
	'inputbox-desc' => 'Short description of the Inputbox extension, shown on [[Special:Version]].',
	'inputbox-error-bad-type' => '{{doc-important|"create", "comment", "search", "search2" and "fulltext" should not be translated.}}',
	'tryexact' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. If the page with the exact name exists, you will go directly to that page.',
	'searchfulltext' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. This button always goes to the search page, even if the page with the exact name exists.',
	'createarticle' => 'Part of the "Inputbox" extension. This message is the text of the button to create the page you typed in the inputbox.',
);

/** Niuean (ko e vagahau Niu??)
 * @author Jose77
 */
$messages['niu'] = array(
	'createarticle' => 'Talaga tohi tala',
);

/** Afrikaans (Afrikaans)
 * @author Naudefj
 */
$messages['af'] = array(
	'inputbox-desc' => 'Laat die insluiting van vooraf gedefinieerde HTML-vorms moontlik',
	'inputbox-error-no-type' => 'U het nie die tipe invoerveld gespesifiseer nie.',
	'inputbox-error-bad-type' => 'Tipe invoerveld "$1" nie herken nie.
Gebruik "create", "comment", "search" of "search2".',
	'tryexact' => 'Soek presiese ooreenkoms',
	'searchfulltext' => 'Deursoek volledige teks',
	'createarticle' => 'Skep bladsy',
);

/** Amharic (????????????)
 * @author Codex Sinaiticus
 */
$messages['am'] = array(
	'createarticle' => '????????? ??????????????? ???????????????',
);

/** Aragonese (Aragon??s)
 * @author Juanpabl
 */
$messages['an'] = array(
	'inputbox-desc' => 'Premite a enclusi??n de formularios HTML predefinitos',
	'inputbox-error-no-type' => 'No ha endicato o tipo de caixa de dentrada que cal creyar.',
	'inputbox-error-bad-type' => 'No se reconoixe o tipo de caixa de dentrada "$1".
Por fabor, espezifique "create", "comment", "search" u "fulltext".',
	'tryexact' => 'Mirar t??tol esauto',
	'searchfulltext' => 'Mirar por testo completo',
	'createarticle' => 'Creyar pachina',
);

/** Arabic (??????????????)
 * @author Meno25
 */
$messages['ar'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? HTML ?????????? ??????????.',
	'inputbox-error-no-type' => '???? ?????? ???????????? ?????? ?????????? ?????????????? ??????????????.',
	'inputbox-error-bad-type' => '?????? ?????????? ?????????????? "$1" ???? ?????? ???????????? ????????.
???? ???????? ?????? "create"?? "comment"?? "search"?? "search2" ???? "fulltext".',
	'tryexact' => '???????? ???? ?????????? ??????????',
	'searchfulltext' => '???????? ???? ???????? ????????????',
	'createarticle' => '?????????? ????????',
);

/** Egyptian Spoken Arabic (????????)
 * @author Ghaly
 * @author Ramsis II
 */
$messages['arz'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? ?????? ???? ???? ???? ?????????? ???? ??????????',
	'inputbox-error-no-type' => '?????? ???? ?????????? ?????? ?????????? ?????????????? ??????????????',
	'inputbox-error-bad-type' => '???? ???????????????? ?????? ?????? ?????????? ?????????????? "$1"  .
???? ????????  ???????? "create"?? "comment"?? "search" ???? "search2".',
	'tryexact' => '?????? ?????? ?????????? ??????????',
	'searchfulltext' => '?????? ???? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Assamese (??????????????????)
 * @author Rajuonline
 */
$messages['as'] = array(
	'tryexact' => '???????????? ??????????????? ?????????????????? ?????????????????????',
	'searchfulltext' => '???????????????????????? ??????????????? ?????????????????????',
	'createarticle' => '?????????????????? ???????????????',
);

/** Asturian (Asturianu)
 * @author Esbardu
 */
$messages['ast'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios HTML predefin??os',
	'inputbox-error-no-type' => "Nun especificasti la triba de caxellu d'entrada pa crear.",
	'inputbox-error-bad-type' => "Triba de caxa d'entrada $1 non reconocida. Por favor conse??a la opci??n ''create'', ''comment'', ''search'' o ''search2''.",
	'tryexact' => 'Intentar concueyar exautamente',
	'searchfulltext' => 'Buscar testu completu',
	'createarticle' => 'Crear p??xina',
);

/** Azerbaijani (Az??rbaycan) */
$messages['az'] = array(
	'createarticle' => 'M??qal?? yarat',
);

/** Samogitian (??emait????ka)
 * @author Hugo.arg
 */
$messages['bat-smg'] = array(
	'searchfulltext' => '??i??kuot?? p??lna teksta',
);

/** Southern Balochi (?????????? ????????????)
 * @author Mostafadaneshvar
 */
$messages['bcc'] = array(
	'inputbox-desc' => '?????????? ???????? ???? ?????? ?????? ?????? ?????? HTML ???? ?????? ?????????? ????????????',
	'inputbox-error-no-type' => '?????? ?????? ???????? ?????????? ???? ?????????? ???????? ???? ??????',
	'inputbox-error-bad-type' => '?????? ???????? ?????????? "$1"  ?????? ?????? ???? ??????.
???????? ???????? ????????  "??????????", "??????", "????????" ???? "????????2".',
	'tryexact' => '?????????? ???????? ???????????? ????',
	'searchfulltext' => '?????? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Belarusian (????????????????????) */
$messages['be'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Belarusian (Tara??kievica orthography) (???????????????????? (??????????????????????))
 * @author EugeneZelenko
 * @author Jim-by
 * @author Red Winged Duck
 */
$messages['be-tarask'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????? ???????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ?????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '???????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ?????????????????? ???????????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ???? ??fulltext??.',
	'tryexact' => '???????????????????????? ???????????????? ??????????',
	'searchfulltext' => '???????????? ?????????? ??????????',
	'createarticle' => '???????????????? ????????????????',
);

/** Bulgarian (??????????????????)
 * @author DCLXVI
 * @author Spiritia
 */
$messages['bg'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????? ???? HTML ??????????????????.',
	'inputbox-error-no-type' => '???? ???? ???????????????? ???????? ???? ?????????????? ???? ????????, ?????????? ???? ???????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???$1??? ???? ?????????????? ???? ????????.
????????, ???????????????? ???create???, ???comment???, ???search??? ?????? ???search2???.',
	'tryexact' => '?????????? ?? ?????????? ????????????????????',
	'searchfulltext' => '?????????????????????? ???? ?????????? ??????????',
	'createarticle' => '??????????????????',
);

/** Bislama (Bislama)
 * @author Ushanka
 */
$messages['bi'] = array(
	'createarticle' => 'Mekem atikel',
);

/** Bengali (???????????????)
 * @author Bellayet
 * @author Zaheen
 */
$messages['bn'] = array(
	'inputbox-desc' => '????????????????????????????????????????????? ??????????????????????????? ?????????????????? ???????????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '???????????? ??????????????? ???????????? ??????????????? ???????????? ??????????????? ?????????????????? ????????? ???????????????????????? ?????????????????????',
	'inputbox-error-bad-type' => '"$1" ??????????????? ??????????????? ???????????? ???????????? ???????????? ????????? "create", "comment", "search" ???????????? "search2" ???????????????????????? ???????????????',
	'tryexact' => '????????? ?????? ??????????????? ????????????????????? ?????????',
	'searchfulltext' => '?????? ???????????????????????????????????? ??????????????????',
	'createarticle' => '?????????????????? ???????????? ?????????',
);

/** Bakhtiari (??????????????)
 * @author Behdarvandyani
 */
$messages['bqi'] = array(
	'inputbox-desc' => '?????????? ?????????????? ???? ??????????????? HTML ???????? ?????????? ???????????? ???? ??????',
	'inputbox-error-no-type' => '?????? ???????? ??????????  ???????? ?????????? ???? ?????????? ????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???? ???????? ?????????? ???????????? ????. ?????????? ?????? ???? ?????????? 
"create", "comment", "search" or "search2" ???? ???????? ????????.',
	'tryexact' => '?????????? ???????? ???? ???????? ???? ???????????? ????',
	'searchfulltext' => '???????????? ?????? ??????',
	'createarticle' => '???????? ???????? ????????',
);

/** Breton (Brezhoneg)
 * @author Fulup
 */
$messages['br'] = array(
	'inputbox-desc' => 'Aotren a ra degas furmskrido?? HTML raktermenet.',
	'inputbox-error-no-type' => "N'eo ket bet spisaet ganeoc'h ar seurt boest enmont da veza?? krouet",
	'inputbox-error-bad-type' => 'N\'eo ket anavaezet ar seurt boest enmont "$1".
Spisait "create", "comment", "search" pe "search2".',
	'tryexact' => 'Klask ma klotfe rik',
	'searchfulltext' => 'Klask an destenn a-bezh',
	'createarticle' => 'Kroui?? ar pennad',
);

/** Bosnian (Bosanski)
 * @author CERminator
 */
$messages['bs'] = array(
	'inputbox-desc' => 'Omogu??uje uklju??ivanje prethodno napravljenih HTML obrazaca',
	'inputbox-error-no-type' => 'Niste odredili tip kutije za unos koju pravite.',
	'inputbox-error-bad-type' => 'Tip kutije unosa "$1" nije prepoznat.
Molimo odredite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Isprobaj na??i ta??an upit',
	'searchfulltext' => 'Pretra??i cijeli tekst',
	'createarticle' => 'Napravi stranicu',
);

/** Catalan (Catal??)
 * @author Paucabot
 * @author SMP
 * @author Toniher
 */
$messages['ca'] = array(
	'inputbox-desc' => 'Permet la inclusi?? de formularis HTML predefinits',
	'inputbox-error-no-type' => "No heu especificat el tipus de quadre d'entrada per crear.",
	'inputbox-error-bad-type' => "El tipus de quadre d'entrada ??$1?? no est?? reconegut.

Especifiqueu-hi ??create??, ??comment??, ??search??, ??search2?? o ??fulltext??.",
	'tryexact' => 'Prova una coincid??ncia exacta',
	'searchfulltext' => 'Cerca un text sencer',
	'createarticle' => 'Crea una p??gina',
);

/** Min Dong Chinese (M??ng-d????ng-ng?????) */
$messages['cdo'] = array(
	'createarticle' => 'K??i hi??k',
);

/** Corsican (Corsu) */
$messages['co'] = array(
	'searchfulltext' => 'Ricerca testu cumplettu',
	'createarticle' => "Cre?? l'articulu",
);

/** Crimean Turkish (Latin) (Q??r??mtatarca (Latin))
 * @author Alessandro
 */
$messages['crh-latn'] = array(
	'createarticle' => 'Saifeni ya??art',
);

/** Crimean Turkish (Cyrillic) (Q??r??mtatarca (Cyrillic))
 * @author Alessandro
 */
$messages['crh-cyrl'] = array(
	'createarticle' => '?????????????? ????????????',
);

/** Czech (??esky)
 * @author Danny B.
 * @author Li-sung
 */
$messages['cs'] = array(
	'inputbox-desc' => 'Umo????uje vkl??dat ur??it?? HTML formul????e.',
	'inputbox-error-no-type' => 'Nen?? ur??en typ formul????ov??ho pole k vytvo??en??.',
	'inputbox-error-bad-type' => 'Nerozpoznan?? typ pole ???$1???.
Uve??te jednu z mo??nost??: ???create???, ???comment???, ???search???, ???search2??? nebo ???fulltext???.',
	'tryexact' => 'Vyzkou??et p??esn?? hled??n??',
	'searchfulltext' => 'Plnotextov?? hled??n??',
	'createarticle' => 'Vytvo??it ??l??nek',
);

/** Chuvash (??????????????) */
$messages['cv'] = array(
	'createarticle' => '???????? ???????????? ??????',
);

/** Welsh (Cymraeg)
 * @author Lloffiwr
 */
$messages['cy'] = array(
	'inputbox-desc' => "Yn caniatau creu blychau mewnbynnu sy'n cynnwys ffurflenni HTML wedi eu gosod yn barod i'w defnyddio",
	'inputbox-error-no-type' => "Nid ydych wedi pennu'r math o flwch mewnbynnu yr ydych am ei greu.",
	'inputbox-error-bad-type' => 'Nid yw\'r gair "$1" ar y math o flwch mewnbynnu yn ddealladwy gan y meddalwedd.
Dewiswch rhwng "create", "comment", "search" a "search2" neu "fulltext".',
	'tryexact' => 'Chwilio am yr union gymal',
	'searchfulltext' => "Chwilio'r testun cyfan",
	'createarticle' => "Creu'r dudalen",
);

/** Danish (Dansk)
 * @author Byrial
 */
$messages['da'] = array(
	'inputbox-desc' => 'Muligg??r inkludering af forh??ndsdefinerede HTML-formularer',
	'inputbox-error-no-type' => 'Du har ikke angivet type i inputboksen som skal laves.',
	'inputbox-error-bad-type' => 'Inputboks-type "$1" kendes ikke.
V??lg venligst "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'G?? til siden',
	'searchfulltext' => 'S??g efter teksten',
	'createarticle' => 'Opret side',
);

/** German (Deutsch)
 * @author Metalhead64
 * @author Raimond Spekking
 * @author Umherirrender
 */
$messages['de'] = array(
	'inputbox-desc' => 'Erlaubt die Einbindung vordefinierter HTML-Formulare',
	'inputbox-error-no-type' => 'Du hast keinen Eingabefeld-Typ angegeben.',
	'inputbox-error-bad-type' => 'Eingabefeld-Typ ???$1??? unbekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? angeben.',
	'tryexact' => 'Versuche exakte Suche',
	'searchfulltext' => 'Gesamten Text durchsuchen',
	'createarticle' => 'Seite anlegen',
);

/** German (formal address) (Deutsch (Sie-Form))
 * @author Umherirrender
 */
$messages['de-formal'] = array(
	'inputbox-error-no-type' => 'Sie haben keinen Eingabefeld-Typ angegeben.',
);

/** Lower Sorbian (Dolnoserbski)
 * @author Michawiki
 * @author Pe7er
 */
$messages['dsb'] = array(
	'inputbox-desc' => 'Zap????gnjenje p??eddefin??rowanych HTML-formularow dow??li??',
	'inputbox-error-no-type' => 'Njejsy p??da?? typ zap??dawa??skego p??la za nap??ranje.',
	'inputbox-error-bad-type' => 'Zap??dawa??ske p??lo typa "$1" njesp??znane.
P??osym p??daj "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Naw??os pyta??:',
	'searchfulltext' => 'Ce??y tekst pyta??',
	'createarticle' => 'Nastawk natwori??',
);

/** Divehi (????????????????????)
 * @author Spacebirdy
 */
$messages['dv'] = array(
	'createarticle' => '???????????????????? ????????????????',
);

/** Ewe (E??egbe) */
$messages['ee'] = array(
	'createarticle' => 'Dze nu??????l?? yeye g??me',
);

/** Greek (????????????????)
 * @author Dead3y3
 */
$messages['el'] = array(
	'inputbox-desc' => '?????????????????? ?????? ???????????????? ?????????????????????????????? ???????????? HTML',
	'inputbox-error-no-type' => '?????? ?????????? ?????????????????? ?????? ???????? ?????? ?????????????? ?????????????? ???????? ????????????????????.',
	'inputbox-error-bad-type' => '?????????? ?????????????? ?????????????? "$1" ?????? ??????????????????????????.<br />
???????????????? ???????????? "create", "comment", "search", "search2" ?? "fulltext".',
	'tryexact' => '?????????????????? ?????? ???????????????? ??????????????????????.',
	'searchfulltext' => '?????????????????? ???? ???? ???????????? ??????????????',
	'createarticle' => '???????????????????? ??????????????',
);

/** Esperanto (Esperanto)
 * @author Yekrats
 */
$messages['eo'] = array(
	'inputbox-desc' => 'Permesi enhavon de anta??difinitaj HTML-kamparoj',
	'inputbox-error-no-type' => 'Vi ne enigis la specon de enigo-kesto por krei.',
	'inputbox-error-bad-type' => 'Enigo-kesto "$1" ne estas konata.
Bonvolu specifigi keston "krea", "komenta", "ser??a", "ser??a2", a?? "plenateksa".',
	'tryexact' => 'Provu ekzaktan trafon',
	'searchfulltext' => 'Ser??i plentekste',
	'createarticle' => 'Krei artikolon',
);

/** Spanish (Espa??ol)
 * @author Crazymadlover
 * @author Icvav
 * @author Muro de Aguas
 * @author Sanbec
 */
$messages['es'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios en HTML predefinidos.',
	'inputbox-error-no-type' => 'No has especificado el tipo de formulario que vas a crear.',
	'inputbox-error-bad-type' => 'No se reconoce el tipo de caja de entrada ??$1??.
Por favor, especifica ??create??, ??comment??, ??search?? ??search2?? o "fulltext".',
	'tryexact' => 'Buscar t??tulo exacto',
	'searchfulltext' => 'Buscar por texto completo',
	'createarticle' => 'Crear art??culo',
);

/** Estonian (Eesti)
 * @author Avjoska
 * @author Jaan513
 */
$messages['et'] = array(
	'tryexact' => 'Proovi t??pset vastet',
	'searchfulltext' => 'Otsi t??isteksti',
	'createarticle' => 'Alusta lehek??lge',
);

/** Basque (Euskara) */
$messages['eu'] = array(
	'tryexact' => 'Izenburu zehatza bilatu',
	'searchfulltext' => 'Testu osoa bilatu',
	'createarticle' => 'Artikulua sortu',
);

/** Extremaduran (Estreme??u) */
$messages['ext'] = array(
	'createarticle' => 'Creal art??culu',
);

/** Persian (??????????)
 * @author Huji
 */
$messages['fa'] = array(
	'inputbox-desc' => '???????????? ?????????????? ???? ??????????????? HTML ???? ?????? ?????????? ?????? ???? ?????????????',
	'inputbox-error-no-type' => '?????? ?????????? ??????????  ???????????????????? ???? ???????? ???????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????? ?????????? ?????????? ???????????? ?????? ????????.
?????????? ?????? ???? ?????????? ??create???? ??comment???? ??search???? ??search2?? ???? ??fulltext?? ???? ???????? ????????.',
	'tryexact' => '???????????? ???????? ???? ???????? ???? ????????????',
	'searchfulltext' => '???????????? ???? ??????',
	'createarticle' => '?????????? ??????????',
);

/** Finnish (Suomi)
 * @author Crt
 * @author Nike
 */
$messages['fi'] = array(
	'inputbox-desc' => 'Mahdollistaa ennalta m????riteltyjen lomakkeiden sis??llytt??misen sivuille.',
	'inputbox-error-no-type' => 'Et m????ritellyt sy??tekent??n tyyppi??.',
	'inputbox-error-bad-type' => 'Sy??tekent??n tyyppi ???$1??? ei kelpaa.
Sallittuja arvoja ovat create, comment, search, search2 ja fulltext.',
	'tryexact' => 'Yrit?? tarkkaa osumaa',
	'searchfulltext' => 'Etsi koko teksti??',
	'createarticle' => 'Luo sivu',
);

/** Faroese (F??royskt) */
$messages['fo'] = array(
	'createarticle' => 'Stovna grein',
);

/** French (Fran??ais)
 * @author Crochet.david
 * @author IAlex
 * @author Sherbrooke
 */
$messages['fr'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formulaires HTML pr??d??finis.',
	'inputbox-error-no-type' => 'Vous n???avez pas pr??cis?? le type de la bo??te d???entr??e ?? cr??er.',
	'inputbox-error-bad-type' => 'Type de bo??te entr??e ?? $1 ?? non reconnue.
Indiquez une option parmis ?? create ??, ?? comment ??, ?? search ??, ?? searche2 ?? ou ?? fulltext ??.',
	'tryexact' => 'Essayez la correspondance exacte.',
	'searchfulltext' => 'Recherche en texte int??gral',
	'createarticle' => 'Cr??er la page',
);

/** Franco-Proven??al (Arpetan)
 * @author ChrisPtDe
 */
$messages['frp'] = array(
	'inputbox-desc' => 'P??rm??t l???encllusion de formul??ros HTML pr??d??fenis.',
	'inputbox-error-no-type' => 'Vos ??d pas sp??cefi?? lo tipo de la bou??ta d???entr?? a cr??ar.',
	'inputbox-error-bad-type' => "Tipo de bou??ta d???entr?? ?? $1 ?? pas recognu. Endic??d lo chou??x ''create'', ''comment'', ''search'' ou ben ''searche2''.",
	'tryexact' => '??prov??d la corr??spondance ??gzacta.',
	'searchfulltext' => 'Rech??rche en t??xte compl??t',
	'createarticle' => 'Cr??ar l???articllo',
);

/** Friulian (Furlan)
 * @author Klenje
 */
$messages['fur'] = array(
	'tryexact' => 'C??r une corispondence esate',
	'searchfulltext' => 'C??r in dut il test',
	'createarticle' => 'Cree v??s',
);

/** Western Frisian (Frysk)
 * @author Snakesteuben
 */
$messages['fy'] = array(
	'createarticle' => 'Side oanmeitsje',
);

/** Irish (Gaeilge) */
$messages['ga'] = array(
	'tryexact' => 'D??an iarracht ar meaitse??il cruinn',
	'searchfulltext' => 'Cuardaigh sa t??acs ioml??n',
	'createarticle' => 'Cruthaigh alt',
);

/** Galician (Galego)
 * @author Alma
 * @author Toli??o
 */
$messages['gl'] = array(
	'inputbox-desc' => 'Permitir a inclusi??n de formularios predefinidos de HTML',
	'inputbox-error-no-type' => 'Non se especificou o tipo de caixa de entrada para crear.',
	'inputbox-error-bad-type' => 'O tipo de caixa de entrada "$1" non foi reco??ecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar coincidencias exactas',
	'searchfulltext' => 'Buscar o texto completo',
	'createarticle' => 'Crear a p??xina',
);

/** Ancient Greek (????????????? ??????????????????)
 * @author Omnipaedista
 */
$messages['grc'] = array(
	'inputbox-desc' => '????????????????????? ??????? ???????????????????? ?????????????????????????????? ????????????? HTML',
	'inputbox-error-no-type' => '??????? ????????????? ??????? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ??????????????????.',
	'inputbox-error-bad-type' => '??? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ?????????????????? "$1" ????????????????????????????? ??????? ???????????.
?????????????????? "create", "comment", "search", "search2" ??? "fulltext".',
	'tryexact' => '???????????????? ??????? ?????????????? ?????????????????????????',
	'searchfulltext' => '????????????? ????? ????? ???????????? ???????????????',
	'createarticle' => '???????????? ??????????????????????????',
);

/** Swiss German (Alemannisch)
 * @author Als-Chl??mens
 * @author Als-Holder
 */
$messages['gsw'] = array(
	'inputbox-desc' => 'Erlaubt d Yybindig vu vordefinierte HTML-Formular',
	'inputbox-error-no-type' => 'Du hesch kei Yygabf??ld-Typ aagee.',
	'inputbox-error-bad-type' => 'Yygabf??ld-Typ ???$1??? nit bekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? aagee.',
	'tryexact' => 'Versuech es mitenere exakte Suech',
	'searchfulltext' => 'De gsamti Teggscht durchsueche',
	'createarticle' => 'Syte aalaie',
);

/** Gujarati (?????????????????????)
 * @author Dsvyas
 */
$messages['gu'] = array(
	'createarticle' => '????????? ????????? ????????? ?????????',
);

/** Manx (Gaelg)
 * @author MacTire02
 */
$messages['gv'] = array(
	'createarticle' => 'Croo duillag',
);

/** Hakka (Hak-k??-fa)
 * @author Hakka
 */
$messages['hak'] = array(
	'tryexact' => 'S??ng-chh??? ch??n-khok phit-phi',
	'searchfulltext' => 'Chhi??n v??n-ki??m chh??m-ch??u',
	'createarticle' => 'Kien-li??p v??n-ch??ng',
);

/** Hebrew (??????????)
 * @author Rotem Liss
 */
$messages['he'] = array(
	'inputbox-desc' => '???????????? ???????????? ?????????? HTML ?????????????? ????????',
	'inputbox-error-no-type' => '???? ???????????? ???? ?????? ???????? ???????? ????????????.',
	'inputbox-error-bad-type' => '?????? ???????? ???????? "$1" ???????? ????????.
?????? ?????????? "create", "comment", "search", "search2" ???? "fulltext".',
	'tryexact' => '?????? ?????? ????',
	'searchfulltext' => '?????????? ?????????? ??????????',
	'createarticle' => '?????????? ??????',
);

/** Hindi (??????????????????)
 * @author Kaustubh
 */
$messages['hi'] = array(
	'inputbox-desc' => '?????????????????? ???????????? ????????? HTML ??????????????? ???????????????????????? ???????????? ?????? ?????????????????? ?????????',
	'inputbox-error-no-type' => '??????????????? ??????????????? ??????????????? ?????? ???????????? ???????????? ???????????? ?????????????????? ??????????????? ???????????? ????????????',
	'inputbox-error-bad-type' => '??????????????? ??????????????? ?????? "$1" ?????? ?????????????????? ???????????? ???????????? ????????????
??????????????? "create", "comment", "search" ?????? ????????? "search2" ????????? ?????? ?????? ??????????????????',
	'tryexact' => '???????????? ????????? ?????????????????? ???????????????',
	'searchfulltext' => '???????????? ????????? ???????????????',
	'createarticle' => '????????? ?????????????????????',
);

/** Fiji Hindi (Latin) (Fiji Hindi (Latin))
 * @author Thakurji
 */
$messages['hif-latn'] = array(
	'inputbox-desc' => 'Predefined HTML forms ke allow karo',
	'inputbox-error-no-type' => 'Aap ii nai bataya hai ki kon rakam ke input box ke banae ke chaahi',
	'inputbox-error-bad-type' => 'Input box type "$1" ke pehchana nai gais hai.
Meharbani kar kr ii batao ki "create", "comment", "search", "search2" nai to "fulltext" hai.',
	'tryexact' => 'Exact match ke try karo',
	'searchfulltext' => 'Puura text me khojo',
	'createarticle' => 'Panna banao',
);

/** Hiligaynon (Ilonggo)
 * @author Jose77
 */
$messages['hil'] = array(
	'createarticle' => 'Maghimo artikulo',
);

/** Croatian (Hrvatski)
 * @author Brest
 * @author Dnik
 * @author SpeedyGonsales
 */
$messages['hr'] = array(
	'inputbox-desc' => 'Dozvoli uklju??ivanje predefiniranih obrazaca u HTML-u',
	'inputbox-error-no-type' => 'Niste naveli tip ulaznog polja koje ??elite stvoriti.',
	'inputbox-error-bad-type' => 'Tip ulaznog polja "$1" nije prepoznat. 
Molimo navedite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Poku??aj na??i to??an pogodak',
	'searchfulltext' => 'Tra??i po cjelokupnom tekstu',
	'createarticle' => 'Stvori ??lanak',
);

/** Upper Sorbian (Hornjoserbsce)
 * @author Dundak
 * @author Michawiki
 */
$messages['hsb'] = array(
	'inputbox-desc' => 'Zap??ije??e p??eddefinowanych HTML-formularow dowoli??.',
	'inputbox-error-no-type' => 'Njesy typ zapodatneho ka????ika poda??.',
	'inputbox-error-bad-type' => 'Typ zapodatneho ka????ika "$1" je njeznaty. Pro??u podaj p??a??iwy typ: "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Dok??adne pytanje spyta??',
	'searchfulltext' => 'Dospo??ny tekst pyta??',
	'createarticle' => 'Nastawk wutwori??',
);

/** Haitian (Krey??l ayisyen)
 * @author Masterches
 */
$messages['ht'] = array(
	'inputbox-desc' => 'Ap p??m??t ou mete f??mil?? HTML yo ki ja defini.',
	'inputbox-error-no-type' => 'Atansyon, ou pa bay detay sou tip, kalite bwat antre pou ou kreye',
	'inputbox-error-bad-type' => "Kalite bwat antre $1 pa bon, sist??m an pa konnen l. Mete opsyon sa ''create (kreye)'', ''comment (komante)'', ''search (chache, fouye)'' ou ''searche2''.",
	'tryexact' => 'Eseye yon korespondans egzakt, toutbon.',
	'searchfulltext' => 'Chache, fouye ak opsyon t??ks entegral; wap pran an konsiderasyon tout mo ki nan demann ou an',
	'createarticle' => 'Kreye atik sa',
);

/** Hungarian (Magyar)
 * @author Dani
 * @author KossuthRad
 * @author Tgr
 */
$messages['hu'] = array(
	'inputbox-desc' => 'Lehet??v?? teszi el??re megadott HTML-??rlapok beilleszt??s??t',
	'inputbox-error-no-type' => 'Nem adtad meg, hogy milyen t??pus?? beviteli mez??t akarsz k??sz??teni.',
	'inputbox-error-bad-type' => '???$1??? t??pus?? beviteli mez?? nem ismert. ???create???, ???comment???, ???search??? vagy ???search2??? egyik??t add meg.',
	'tryexact' => 'Ugr??s a sz??cikkre',
	'searchfulltext' => 'Keres??s a teljes sz??vegben',
	'createarticle' => 'Sz??cikk l??trehoz??sa',
);

/** Armenian (??????????????) */
$messages['hy'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Interlingua (Interlingua)
 * @author McDutchie
 */
$messages['ia'] = array(
	'inputbox-desc' => 'Permitter le inclusion de formularios HTML predefinite',
	'inputbox-error-no-type' => 'Tu non ha specificate le typo de quadro de entrata a crear.',
	'inputbox-error-bad-type' => 'Le typo de quadro de entrata "$1" non es recognoscite.
Per favor specifica "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Provar correspondentia exacte',
	'searchfulltext' => 'Cercar in texto integre',
	'createarticle' => 'Crear pagina',
);

/** Indonesian (Bahasa Indonesia)
 * @author IvanLanin
 */
$messages['id'] = array(
	'inputbox-desc' => 'Memungkinkan penggunaan form HTML yang telah ditentukan',
	'inputbox-error-no-type' => 'Anda harus menentukan tipe kotak input yang ingin dibuat.',
	'inputbox-error-bad-type' => 'Tipe kotak input "$1" tak dikenal. Tolong gunakan "create", "comment", "search" atau "search2".',
	'tryexact' => 'Coba pencocokan eksak',
	'searchfulltext' => 'Cari di teks lengkap',
	'createarticle' => 'Buat artikel',
);

/** Iloko (Ilokano) */
$messages['ilo'] = array(
	'createarticle' => 'Mangaramid iti articulo',
);

/** Ido (Ido)
 * @author Malafaya
 */
$messages['io'] = array(
	'searchfulltext' => 'Serchar tota texto',
	'createarticle' => 'Krear pagino',
);

/** Icelandic (??slenska)
 * @author S.??rvarr.S
 */
$messages['is'] = array(
	'createarticle' => 'B??a til s????u',
);

/** Italian (Italiano)
 * @author BrokenArrow
 * @author Darth Kule
 */
$messages['it'] = array(
	'inputbox-desc' => "Consente l'inserimento di moduli HTML predefiniti",
	'inputbox-error-no-type' => 'Non ?? stato specificato il tipo di inputbox da creare.',
	'inputbox-error-bad-type' => '"$1" non ?? un tipo di inputbox riconosciuto. Scegliere il tipo tra "create", "comment", "search", "search2" e "fulltext".',
	'tryexact' => 'Cerca corrispondenza esatta',
	'searchfulltext' => 'Ricerca nel testo',
	'createarticle' => 'Crea voce',
);

/** Japanese (?????????)
 * @author Fryed-peach
 * @author JtFuruhata
 */
$messages['ja'] = array(
	'inputbox-desc' => '??????????????????????????????HTML????????????????????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ????????????????????????????????????????????????????????????????????????"create"???"comment"???"search"???"search2"???"fulltext" ????????????????????????',
	'tryexact' => '???????????????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Jutish (Jysk)
 * @author Husl??ke
 */
$messages['jut'] = array(
	'inputbox-desc' => 'Tilst??n der inklusje der pr??d??fiini??rn HTML f??rmer',
	'inputbox-error-no-type' => 'Du harst ekke sp??sifi??rn ?? type der input boks til skep.',
	'inputbox-error-bad-type' => 'Input boks type "$1" ekke herkonnen. Sp??sifi??r "skep", "bim??rkenge", "s????" ??ller "s????2".',
	'tryexact' => 'F??rs???? eksakt s????nenge:',
	'searchfulltext' => "Gennems????e'n h??le tekster",
	'createarticle' => '??prette side',
);

/** Javanese (Basa Jawa)
 * @author Meursault2004
 */
$messages['jv'] = array(
	'inputbox-desc' => 'Ngidinak?? nganggo formulir HTML sing wis ditemtokak??',
	'inputbox-error-no-type' => 'Panjenengan durung nemtokak?? tipe kothak input sing arep digaw??.',
	'inputbox-error-bad-type' => 'Tipe kothak input "$1" ora ditepungi.
Tulung nganggoa "create", "comment", "search" utawa "search2".',
	'tryexact' => 'Cobanen pancocogan ??ksak',
	'searchfulltext' => 'Gol??k ing t??ks jangkep',
	'createarticle' => 'Damel artikel',
);

/** Georgian (?????????????????????)
 * @author Alsandro
 */
$messages['ka'] = array(
	'tryexact' => '??????????????? ??????????????? ???????????????????????????',
	'searchfulltext' => '??????????????? ????????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Kara-Kalpak (Qaraqalpaqsha) */
$messages['kaa'] = array(
	'createarticle' => 'Bet jarat??w',
);

/** Kabyle (Taqbaylit)
 * @author Agurzil
 */
$messages['kab'] = array(
	'tryexact' => 'Nadi ??ef uzwel kif-kif',
	'searchfulltext' => 'Nadi a???ris ettmam',
	'createarticle' => 'Xleq amagrad',
);

/** Kazakh (Arabic script) (????????????????? (??????????)???) */
$messages['kk-arab'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Cyrillic) (?????????????? (Cyrillic)) */
$messages['kk-cyrl'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Latin) (?????????????? (Latin)) */
$messages['kk-latn'] = array(
	'inputbox-error-no-type' => 'Jasalat??n engizw jola????n???? t??rin keltirmepsiz.',
	'inputbox-error-bad-type' => 'Engizw jolaqt???? ??$1?? t??ri tan??lmad??. Tek ??create??, ??comment??, ??search?? ne ??search2?? degen t??rlerdi keltiri??iz.',
	'tryexact' => 'D??l s????kesin s??nap k??ri??iz',
	'searchfulltext' => 'Tol??q m??tinimen izdew',
	'createarticle' => 'Betti bastaw',
);

/** Khmer (???????????????????????????)
 * @author Chhorran
 * @author Lovekhmer
 * @author T-Rithy
 */
$messages['km'] = array(
	'inputbox-error-no-type' => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Korean (?????????)
 * @author Albamhandae
 * @author Klutzy
 * @author Kwj2772
 * @author ToePeu
 */
$messages['ko'] = array(
	'inputbox-desc' => '?????? ????????? HTML ?????? ????????? ??? ?????? ??? ???',
	'inputbox-error-no-type' => 'type ????????? ????????? ???????????????.',
	'inputbox-error-bad-type' => '"$1"???(???) ????????? ??? ?????? type ???????????????.
"create", "comment", "search", "search2", "fulltext" ??? ????????? ???????????????.',
	'tryexact' => '????????? ???????????? ??????',
	'searchfulltext' => '?????? ??? ??????',
	'createarticle' => '?????? ?????????',
);

/** Ripoarisch (Ripoarisch)
 * @author Purodha
 */
$messages['ksh'] = array(
	'inputbox-desc' => 'Bestemmpte HTML-Formulare k??nne hee met enjebonge w????de.',
	'inputbox-error-no-type' => 'Wat f??r en Zoot Kaste wells De dann han?',
	'inputbox-error-bad-type' => 'De Zoot ???$1??? f??r et Feld f??r jet enzejevve kenne mer nit, De moss schunn ???create???, ???comment???, ???search???, ???search2???, udder ???fulltext??? dof??r aanjevve.',
	'tryexact' => 'Vers??k en akkurate ??vvereinstimmung:',
	'searchfulltext' => 'S??k durch d?? janze Tex',
	'createarticle' => 'Sigg aanl????je',
);

/** Kurdish (Latin) (Kurd?? / ?????????? (Latin)) */
$messages['ku-latn'] = array(
	'createarticle' => 'Gotar?? biafir??ne',
);

/** Latin (Latina) */
$messages['la'] = array(
	'createarticle' => 'Paginam creare',
);

/** Luxembourgish (L??tzebuergesch)
 * @author Robby
 */
$messages['lb'] = array(
	'inputbox-desc' => "Erlaabt d'Af??ge vu viirdefin??ierten HTML-Formulairen",
	'inputbox-error-no-type' => 'Dir hutt den Typ vu K??scht fir eppes anzeginn net uginn.',
	'tryexact' => 'Versicht et matt der preziser Sich:',
	'searchfulltext' => 'Am ganzen Text sichen',
	'createarticle' => 'S??it ulee??n',
);

/** Lingua Franca Nova (Lingua Franca Nova)
 * @author Malafaya
 */
$messages['lfn'] = array(
	'createarticle' => 'Crea paje',
);

/** Ganda (Luganda) */
$messages['lg'] = array(
	'createarticle' => 'Wandika omuko',
);

/** Limburgish (Limburgs)
 * @author Matthias
 * @author Ooswesthoesbes
 */
$messages['li'] = array(
	'inputbox-desc' => "Maakt 't toevoege van veurgedefinieerde HTML-formuliere meugelijk",
	'inputbox-error-no-type' => "U heeft 't type inputbox neet aangegeve. Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] veur meer informatie.",
	'inputbox-error-bad-type' => 'Inputbox-type "$1" neet herkend. 
Gebroek "create", "comment", "search", "search2" ??f "fulltext".',
	'tryexact' => 'Perbeer exacte euvereinkoms',
	'searchfulltext' => 'Zeuk d??r volledige t??ks',
	'createarticle' => "Maak 'ne pazjena aan",
);

/** Lingala (Ling??la)
 * @author Moyogo
 */
$messages['ln'] = array(
	'createarticle' => 'Kokela ekakoli',
);

/** Lao (?????????)
 * @author Tuinui
 */
$messages['lo'] = array(
	'tryexact' => '??????',
	'searchfulltext' => '???????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Lithuanian (Lietuvi??) */
$messages['lt'] = array(
	'tryexact' => 'M??ginti tiksl?? atitikim??',
	'searchfulltext' => 'Ie??koti pilno teksto',
	'createarticle' => 'Kurti straipsn??',
);

/** Latvian (Latvie??u)
 * @author Xil
 * @author Yyy
 */
$messages['lv'] = array(
	'inputbox-error-no-type' => 'Tu neesi nor??d??jis ievades lauka tipu',
	'inputbox-error-bad-type' => 'Ievades lauka tips "$1" nav atpaz??ts.
L??dzu nor??di "create", "comment", "search", "search2" vai "fulltext".',
	'tryexact' => 'Mekl??t prec??zi',
	'searchfulltext' => 'Mekl??t visu tekstu',
	'createarticle' => 'Izveidot lapu',
);

/** Literary Chinese (??????) */
$messages['lzh'] = array(
	'inputbox-error-no-type' => '??????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"???????????????"create"???"comment"???"search"???"search2"??????',
	'tryexact' => '?????????',
	'searchfulltext' => '?????????',
	'createarticle' => '??????',
);

/** Macedonian (????????????????????)
 * @author Brest
 * @author Misos
 */
$messages['mk'] = array(
	'inputbox-desc' => '???????????????????? ???????????????????? ???? ?????????????????????????? HTML ??????????',
	'inputbox-error-no-type' => '???????????? ???????????????? ?????? ???? ???????? ???? ???????? ?????? ???????????? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????????? ???? ???????????? ???? ???????? "$1" ???? ?? ????????????.
???????????????? ???????? ???? ???????????????? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????? ???? ??????????',
	'searchfulltext' => '?????????? ?????? ???????????? ??????????',
	'createarticle' => '?????????????? ????????????????',
);

/** Malayalam (??????????????????)
 * @author Shijualex
 */
$messages['ml'] = array(
	'inputbox-desc' => '???????????????????????????????????????????????????????????? ????????????????????????????????????????????? HTML ???????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????? ????????????????????????????????? ?????????????????????????????? ????????? ???????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ???????????? ?????????????????????????????? ?????????????????? ????????? ????????????????????????????????????????????????.
???????????? ?????????????????? "create", "comment", "search", "search2" ?????????????????????????????? ?????????????????????????????????????????????',
	'tryexact' => '??????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????????????????? ????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????? ??????????????????????????? ??????????????????',
	'createarticle' => '??????????????? ?????????????????????????????????',
);

/** Marathi (???????????????)
 * @author Kaustubh
 */
$messages['mr'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????????? HTML ???????????? ?????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '?????????????????? ????????????????????? ???????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????? ?????????????????? ?????????????????? ????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????????????????? ????????????????????????????????? "$1" ?????? ?????????????????? ??????????????? ????????????. ??????????????? "create", "comment", "search" ??????????????? "search2" ??????????????? ?????? ???????????????.',
	'tryexact' => '????????????????????? ???????????? ????????????',
	'searchfulltext' => '??????????????? ??????????????? ????????????',
	'createarticle' => '????????? ????????????',
);

/** Malay (Bahasa Melayu)
 * @author Aviator
 */
$messages['ms'] = array(
	'inputbox-desc' => 'Membenarkan penyertaan borang HTML yang sudah ditetapkan.',
	'inputbox-error-no-type' => 'Anda tidak menyatakan jenis kotak input untuk diciptakan.',
	'inputbox-error-bad-type' => 'Jenis kotak input "$1" tidak dikenali. Sila nyatakan "create", "comment", "search", "search2" atau "fulltext".',
	'tryexact' => 'Cuba padanan tepat',
	'searchfulltext' => 'Cari dalam teks penuh',
	'createarticle' => 'Cipta laman',
);

/** Maltese (Malti)
 * @author Chrisportelli
 * @author Giangian15
 */
$messages['mt'] = array(
	'inputbox-desc' => "T??alli formuli ta' HTML predefiniti",
	'inputbox-error-no-type' => "Inti ma spe??ifikajtx it-tip ta' ''input box'' li trid to??loq.",
	'inputbox-error-bad-type' => '"$1" mhuwiex tip mag??ruf ta\' \'\'inputbox\'\'. Jekk jog????bok spe??ifika fost "create", "comment", "search" u "search2".',
	'tryexact' => 'Fittex korrispondenza e??atta',
	'searchfulltext' => 'Fittex fit-test',
	'createarticle' => 'O??loq pa??na',
);

/** Mazanderani (????????????????)
 * @author Spacebirdy
 */
$messages['mzn'] = array(
	'createarticle' => '?????? ??????????',
);

/** Nahuatl (N??huatl)
 * @author Fluence
 */
$messages['nah'] = array(
	'createarticle' => 'Ticch??hu??z z??zanilli',
);

/** Min Nan Chinese (B??n-l??m-g??) */
$messages['nan'] = array(
	'searchfulltext' => 'Chhiau choan-b??n',
);

/** Neapolitan (Nnapulitano)
 * @author SabineCretella
 */
$messages['nap'] = array(
	'searchfulltext' => 'Asci?? dint&#39;&#39;o testo',
	'createarticle' => 'Cria voce',
);

/** Low German (Plattd????tsch)
 * @author Slomox
 */
$messages['nds'] = array(
	'inputbox-desc' => 'Verl????vt dat Inbinnen vun v??rdefineerte HTML-Formularen',
	'inputbox-error-no-type' => 'Du hest keen Typ f??r dat Ingaav-Feld angeven.',
	'inputbox-error-bad-type' => 'De Typ ???$1??? f??r dat Ingaav-Feld is nich bekannt.
Geev een vun disse Typen an: ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext???.',
	'tryexact' => 'exakte S????k vers??ken',
	'searchfulltext' => 'in???n Vulltext s??ken',
	'createarticle' => 'Siet anleggen',
);

/** Nepali (??????????????????) */
$messages['ne'] = array(
	'createarticle' => '????????? ??????????????????????????????',
);

/** Dutch (Nederlands)
 * @author SPQRobin
 * @author Siebrand
 */
$messages['nl'] = array(
	'inputbox-desc' => 'Maakt het toevoegen van voorgedefinieerde HTML-formulieren mogelijk',
	'inputbox-error-no-type' => 'U hebt het type invoerveld niet aangegeven.
Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] voor meer informatie.',
	'inputbox-error-bad-type' => 'Type invoerveld "$1" niet herkend.
Gebruik "create", "comment", "search", "search2" of "fulltext".',
	'tryexact' => 'Zoeken op exacte overeenkomst',
	'searchfulltext' => 'Volledige tekst doorzoeken',
	'createarticle' => 'Nieuwe pagina maken',
);

/** Norwegian Nynorsk (???Norsk (nynorsk)???)
 * @author Frokor
 * @author Harald Khan
 */
$messages['nn'] = array(
	'inputbox-desc' => 'Tillet inkludering av f??rehandsdefinerte HTML-skjema',
	'inputbox-error-no-type' => 'Du har ikkje gjeve kva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inntekstboks av typen ??$1?? vart ikkje gjenkjent.
Ver venleg og velg ??create??, ??comment??, ??search??, ??search2??, eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k i all tekst',
	'createarticle' => 'Lag side',
);

/** Norwegian (bokm??l)??? (???Norsk (bokm??l)???)
 * @author Jon Harald S??by
 */
$messages['no'] = array(
	'inputbox-desc' => 'Tillater inkludering av forh??ndsdefinerte HTML-skjemaer',
	'inputbox-error-no-type' => 'Du har ikke angitt hva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inputboks av typen ??$1?? gjenkjennes ikke.
Vennligst velg ??create??, ??comment??, ??search??, ??search2?? eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k full tekst',
	'createarticle' => 'Opprett side',
);

/** Novial (Novial)
 * @author Malafaya
 */
$messages['nov'] = array(
	'searchfulltext' => 'Sercha kompleti texte',
);

/** Northern Sotho (Sesotho sa Leboa)
 * @author Mohau
 */
$messages['nso'] = array(
	'createarticle' => 'Tlhoma letlakala',
);

/** Occitan (Occitan)
 * @author Cedric31
 */
$messages['oc'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formularis HTML predefinits',
	'inputbox-error-no-type' => 'Av??tz pas precisat lo tipe de la b??stia de dintrada de crear.',
	'inputbox-error-bad-type' => "Tipe de b??stia d'entrada ?? $1 ?? pas reconeguda.
Indicatz una opcion demest ''create'', ''comment'', ''search'' o ''searche2'' o ?? fulltext ??.",
	'tryexact' => 'Ensajatz la correspond??ncia exacta',
	'searchfulltext' => 'Rec??rca en t??xt integral',
	'createarticle' => 'Crear l???article',
);

/** Pangasinan (Pangasinan) */
$messages['pag'] = array(
	'createarticle' => 'Mangawa na artikulo',
);

/** Pampanga (Kapampangan) */
$messages['pam'] = array(
	'createarticle' => 'Gawang artikulu',
);

/** Polish (Polski)
 * @author Derbeth
 * @author Sp5uhe
 */
$messages['pl'] = array(
	'inputbox-desc' => 'Umo??liwia w????czenie w tre???? strony wcze??niej zdefiniowanych formularzy HTML',
	'inputbox-error-no-type' => 'Typ pola wej??ciowego nie zosta?? okre??lony',
	'inputbox-error-bad-type' => 'Typ ???$1??? pola wej??ciowego nie zosta?? rozpoznany.
Nale??y wybra?? ???create???, ???comment???, ???search???, ???search2??? or ???fulltext???.',
	'tryexact' => 'U??yj dok??adnego wyra??enia',
	'searchfulltext' => 'Szukaj w ca??ych tekstach',
	'createarticle' => 'Utw??rz artyku??',
);

/** Piedmontese (Piemont??is)
 * @author B??rto 'd S??ra
 */
$messages['pms'] = array(
	'inputbox-error-no-type' => "A l'ha nen dit che s??rt ??d qu??der ??d caria dat ch'a debia fesse.",
	'inputbox-error-bad-type' => 'La s??rt ??d qu??der "$1" a l\'?? nen conoss??a. P??r pias??, ch\'a s??rna antra "create", "comment", "search" ?? pura "search2".',
	'tryexact' => 'S??rca che a sia pr??pe parej',
	'searchfulltext' => 'S??rca an tut ??l test',
	'createarticle' => "Crea n'art??col",
);

/** Pontic (????????????????)
 * @author Sinopeus
 */
$messages['pnt'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Pashto (????????)
 * @author Ahmed-Najib-Biabani-Ibrahimkhel
 */
$messages['ps'] = array(
	'inputbox-desc' => '?? ???????? ???? ?? HTML ?????????? ???????? ?????????? ???????????? ?????????? ??????????',
	'tryexact' => '???? ???? ?????????? ???? ??????????????',
	'searchfulltext' => '???????? ?????? ????????',
	'createarticle' => '?????? ?????????? ??????????',
);

/** Portuguese (Portugu??s)
 * @author Malafaya
 */
$messages['pt'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios HTML pr??-definidos.',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de box de inser????o a ser criado.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a exata express??o',
	'searchfulltext' => 'Pesquisar no texto completo',
	'createarticle' => 'Criar p??gina',
);

/** Brazilian Portuguese (Portugu??s do Brasil)
 * @author Brunoy Anastasiya Seryozhenko
 * @author Eduardo.mps
 */
$messages['pt-br'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios definidos de HTML',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de inputbox a ser criada.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a express??o exata',
	'searchfulltext' => 'Pesquisar em todo o texto.',
	'createarticle' => 'Criar p??gina.',
);

/** Quechua (Runa Simi)
 * @author AlimanRuna
 */
$messages['qu'] = array(
	'tryexact' => 'Hinalla taripanayaspa maskay',
	'searchfulltext' => "Hunt'a qillqata maskay",
	'createarticle' => 'Qillqata kamariy',
);

/** Romanian (Rom??n??)
 * @author Emily
 * @author Firilacroco
 * @author KlaudiuMihaila
 * @author Mihai
 */
$messages['ro'] = array(
	'inputbox-desc' => 'Permite includerea formelor HTML predefinite',
	'inputbox-error-no-type' => 'Nu ai specificat ce tip de cutie intrare s?? fie creat??.',
	'inputbox-error-bad-type' => 'Tipul de cutie intrare "$1" nu este recunoscut.
Te rog s?? specifici parametrii "create", "comment", "search", "search2" sau "fulltext".',
	'tryexact' => '??ncearc?? varianta exact??',
	'searchfulltext' => 'Caut?? textul ??ntreg',
	'createarticle' => 'Creaz?? articol',
);

/** Aromanian (Arm??neashce) */
$messages['roa-rup'] = array(
	'createarticle' => 'Adrats articlu',
);

/** Tarand??ne (Tarand??ne)
 * @author Joetaras
 */
$messages['roa-tara'] = array(
	'createarticle' => "Ccreje 'a v??sce",
);

/** Russian (??????????????)
 * @author ?????????????????? ??????????????
 */
$messages['ru'] = array(
	'inputbox-desc' => '?????????????????? ???????????????? ?????????????? ???????????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???????? ?????????? ??$1??.
????????????????????, ?????????????? ???????? ???? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** Yakut (???????? ????????)
 * @author HalanTul
 */
$messages['sah'] = array(
	'inputbox-desc' => '???????????????? ???????????????????? HTML-?????????????????? ??????????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '??$1?? ???????????? ???????????? ??????????????????. ???????? ???????? ?????????????????????? ??????: ??create??, ??comment??, ??search??, ??search2?? ???????????? ??fulltext??.',
	'tryexact' => '?????????? ??????????',
	'searchfulltext' => '???????????????? ?????????????? ??????????????????',
	'createarticle' => '???????????????????? ????????????',
);

/** Sardinian (Sardu)
 * @author Marzedu
 */
$messages['sc'] = array(
	'createarticle' => 'Crea art??culu',
);

/** Sicilian (Sicilianu)
 * @author Santu
 */
$messages['scn'] = array(
	'inputbox-desc' => 'Pirmetti nzirimenti di m??duli HTML predifiniti',
	'inputbox-error-no-type' => 'Non vinni spicificatu lu tipu di inputbox di criari.',
	'inputbox-error-bad-type' => '"$1" nun ?? nu tipu di inputbox canusciutu. S\'h?? sc??gghiri lu tipu ntra "create", "comment", "search" e "search2".',
	'tryexact' => 'Cerca currispunnenza giusta',
	'searchfulltext' => 'Circata nt?? testu',
	'createarticle' => 'Cria vuci',
);

/** Sindhi (????????) */
$messages['sd'] = array(
	'createarticle' => '???????? ?????????? ??????',
);

/** Sango (S??ng??) */
$messages['sg'] = array(
	'createarticle' => 'S?? soura',
);

/** Sinhala (???????????????)
 * @author Asiri wiki
 * @author ?????????????????????????????????
 */
$messages['si'] = array(
	'inputbox-desc' => '??????????????????????????????????????????????????? HTML ????????????????????? ????????????????????????????????? ?????????????????????',
	'inputbox-error-no-type' => '??????????????? ???????????? ????????????????????? ?????????????????? ????????????????????? ?????? ?????????????????? ????????????????????? ????????? ??????????????? ???????????????.',
	'inputbox-error-bad-type' => '????????????????????? ???????????? ????????????????????? "$1" ????????????????????? ???????????????.
????????????????????? "???????????????", "?????????????????????", "??????????????????" ?????? "??????????????????2" ????????????????????? ??????????????? .',
	'tryexact' => '??????????????? ??????????????????  ??????????????? ???????????????',
	'searchfulltext' => '???????????????????????? ????????? ?????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Slovak (Sloven??ina)
 * @author Helix84
 */
$messages['sk'] = array(
	'inputbox-desc' => 'Umo????uje vlo??enie preddefinovan??ch HTML formul??rov',
	'inputbox-error-no-type' => 'Neuviedli ste typ vstupn??ho po??a, ktor?? sa m?? vytvori??.',
	'inputbox-error-bad-type' => 'Vstupn?? pole typu ???$1??? nie je podporovan??.
Pros??m, pou??ite ???create???, ???comment???, ???search??? alebo ???search2???.',
	'tryexact' => 'Sk??ste presn?? vyh??ad??vanie',
	'searchfulltext' => 'Fulltextov?? vyh??ad??vanie',
	'createarticle' => 'Vytvori?? str??nku',
);

/** Slovenian (Sloven????ina) */
$messages['sl'] = array(
	'tryexact' => 'Poskusite z natan??nim zadetkom',
	'searchfulltext' => 'Prei????i vse besedilo',
	'createarticle' => 'Ustvarite stran',
);

/** Albanian (Shqip)
 * @author Dori
 */
$messages['sq'] = array(
	'tryexact' => 'K??rko p??rputhje t?? plot??',
	'searchfulltext' => 'K??rko tekstin e plot??',
	'createarticle' => 'Krijo artikull',
);

/** Serbian Cyrillic ekavian (????????????????)
 * @author Millosh
 * @author ?????????????? ????????????????????
 */
$messages['sr-ec'] = array(
	'inputbox-desc' => '?????????????? ???????????????????? ?????????????????? ?????????????????????? HTML ??????????.',
	'inputbox-error-no-type' => '???????? ?????????????? ?????? ???????????? ???????????? ???? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????????????? ???? ???????? ???????????????? ???? ????????????????.
???????????? ?????? ???? ???? ?????????????????? ???? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????? ?????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** latinica (latinica) */
$messages['sr-el'] = array(
	'tryexact' => 'Poku??aj ta??no',
	'searchfulltext' => 'Pretra??i ceo tekst',
	'createarticle' => 'Napravi ??lanak',
);

/** Swati (SiSwati)
 * @author Jatrobat
 */
$messages['ss'] = array(
	'createarticle' => 'K??d??la intfo',
);

/** Seeltersk (Seeltersk)
 * @author Maartenvdbent
 * @author Pyt
 */
$messages['stq'] = array(
	'inputbox-desc' => 'Ferl????wet d??t Apniemen fon foardefinierde HTML-Formulare',
	'inputbox-error-no-type' => 'Du h????st naan Inputbox-Typ ounroat.',
	'inputbox-error-bad-type' => 'Iengoawef??ild-Typ "$1" uunbekoand.
Reek n gultigen Typ an: ???create???, ???comment???, ???search???, ???search2??? of "fulltext".',
	'tryexact' => 'Fers??ik exakte S??ike:',
	'searchfulltext' => 'D??n ganse Text truchs??ike',
	'createarticle' => 'Siede anl????se',
);

/** Sundanese (Basa Sunda)
 * @author Irwangatot
 */
$messages['su'] = array(
	'tryexact' => 'Coba jeung anu cocog',
	'searchfulltext' => 'Sungsi dina t??ks lengkap',
	'createarticle' => 'Jieun artikel',
);

/** Swedish (Svenska)
 * @author Lejonel
 * @author Najami
 */
$messages['sv'] = array(
	'inputbox-desc' => 'Ger m??jlighet att anv??nda f??rdefinerade HTML-formul??r.',
	'inputbox-error-no-type' => 'Du har inte angivit vilken typ av inputbox som ska skapas..',
	'inputbox-error-bad-type' => '"$1" ??r inte en k??nd typ av inputbox.
Var god specifiera "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'F??rs??k hitta exakt matchning',
	'searchfulltext' => 'Fulltexts??kning',
	'createarticle' => 'Skapa sida',
);

/** Silesian (??l??nski)
 * @author Ozi64
 */
$messages['szl'] = array(
	'createarticle' => 'Na??kryflej artikel',
);

/** Telugu (??????????????????)
 * @author Chaduvari
 * @author Veeven
 */
$messages['te'] = array(
	'inputbox-desc' => '??????????????? ??????????????????????????????????????? HTML ???????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??? ??????????????? ?????????&zwnj;???????????? ???????????????????????? ????????????????????????????????? ???????????? ???????????????????????????.',
	'tryexact' => '??????????????????????????? ??????????????? ??????????????? ?????????????????????????????????',
	'searchfulltext' => '?????????????????? ???????????????????????? ??????????????????',
	'createarticle' => '?????????????????????????????? ???????????????????????????',
);

/** Tajik (Cyrillic) (???????????? (Cyrillic))
 * @author Ibrahim
 */
$messages['tg-cyrl'] = array(
	'inputbox-desc' => '???????????? ???????????????? ???? ?????????????? HTML ???? ?????? ???????????????????????? ??????????????',
	'inputbox-error-no-type' => '?????????? ???????????? ?????????????? ?????????????????????????? ???????????????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????? ???????????? ?????????????? "$1" ?????????????????? ??????. ???????????? ???? ???? ?????????????????? ???? ???????? "create", "comment", "search" ?? "search2" ???????????????? ??????????.',
	'tryexact' => '???????????????????? ???????????? ????????????????',
	'searchfulltext' => '???????????????? ?????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Thai (?????????) */
$messages['th'] = array(
	'tryexact' => '?????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????',
	'createarticle' => '????????????????????????????????????',
);

/** Tagalog (Tagalog)
 * @author AnakngAraw
 */
$messages['tl'] = array(
	'inputbox-desc' => 'Pahintulutan ang pagsasama ng mga pormularyong HTML na may paunang kahulugan',
	'inputbox-error-no-type' => 'Hindi mo tinukoy ang uri ng pasukang kahong lilikhain.',
	'inputbox-error-bad-type' => 'Hindi nakikilala ang uri ng pasukang kahong "$1".
Pakitukoy ang "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Subukin ang hustung-hustong katugmaan',
	'searchfulltext' => 'Maghanap sa buong teksto',
	'createarticle' => 'Likhain ang pahina',
);

/** Tswana (Setswana) */
$messages['tn'] = array(
	'createarticle' => 'Kwala mokwalo',
);

/** Tonga (lea faka-Tonga) */
$messages['to'] = array(
	'createarticle' => 'Fakatupu ??a e kupu',
);

/** Turkish (T??rk??e)
 * @author Erkan Yilmaz
 * @author Joseph
 * @author Srhat
 */
$messages['tr'] = array(
	'inputbox-desc' => '??ntan??ml?? HTML formlar??n??n dahil edilmesine olanak verir',
	'inputbox-error-no-type' => 'Olu??turulacak girdi kutusunun tipini belirtmediniz.',
	'inputbox-error-bad-type' => 'Girdi kutusu tipi "$1" tan??nmad??.
L??tfen "create", "comment", "search", "search2" ya da  "fulltext" olarak belirtin.',
	'tryexact' => 'Tam e??le??me dene',
	'searchfulltext' => 'T??m metni ara',
	'createarticle' => 'Sayfay?? olu??tur',
);

/** Tsonga (Xitsonga)
 * @author Thuvack
 */
$messages['ts'] = array(
	'createarticle' => 'Tumbuluxa tluka',
);

/** Ukrainian (????????????????????)
 * @author AS
 * @author Ahonc
 */
$messages['uk'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????????????????? ?????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ???????? ??????????, ?????? ??????????????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ???????????????? ???????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '???????????????? ????????????',
);

/** Urdu (????????) */
$messages['ur'] = array(
	'searchfulltext' => '???????? ?????? ??????',
	'createarticle' => '?????? ??????????',
);

/** Uzbek (O'zbek) */
$messages['uz'] = array(
	'createarticle' => 'Maqola kiritish',
);

/** V??neto (V??neto)
 * @author Candalua
 */
$messages['vec'] = array(
	'inputbox-desc' => "Consente l'inserimento de moduli HTML predefin??i",
	'inputbox-error-no-type' => 'No te gh?? specific?? el tipo de inputbox da crear.',
	'inputbox-error-bad-type' => '"$1" no\'l xe m??a un tipo de inputbox riconossi??o.
Siegli el tipo tra "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => '??erca corispondenza precisa',
	'searchfulltext' => '??erca nel testo',
	'createarticle' => 'Crea pagina',
);

/** Veps (Vepsan kel')
 * @author ?????????? ????????????????
 */
$messages['vep'] = array(
	'createarticle' => "S??ta lehtpol'",
);

/** Vietnamese (Ti???ng Vi???t)
 * @author Minh Nguyen
 */
$messages['vi'] = array(
	'inputbox-desc' => 'Th??m nh???ng bi???u m???u HTML ????n gi???n',
	'inputbox-error-no-type' => 'B???n ch??a ?????nh r?? lo???i bi???u m???u ????? t???o ra.',
	'inputbox-error-bad-type' => 'Lo???i bi???u m???u ???$1??? kh??ng h???p l???. Xin h??y ch???n ???create???, ???comment???, ???search???, ???search2???, hay ???fulltext???.',
	'tryexact' => 'Th??? t??m ??o???n v??n kh???p ch??nh x??c v???i t??? kh??a',
	'searchfulltext' => 'T??m to??n v??n',
	'createarticle' => 'Vi???t b??i m???i',
);

/** Volap??k (Volap??k)
 * @author Malafaya
 * @author Smeira
 */
$messages['vo'] = array(
	'inputbox-desc' => 'D??l??n kenin??kami fomas-HTLM b??o pemiedet??las',
	'searchfulltext' => 'Suk??n zi da v??dem l??lik',
	'createarticle' => 'Jaf??n padi',
);

/** V??ro (V??ro)
 * @author V??rok
 */
$messages['vro'] = array(
	'tryexact' => 'T??ps?? otsmin??',
	'searchfulltext' => 'Otsiq terveq tekst',
	'createarticle' => 'Luuq leht',
);

/** Walloon (Walon) */
$messages['wa'] = array(
	'createarticle' => 'Ahiver ??rtike',
);

/** Wolof (Wolof)
 * @author Ibou
 */
$messages['wo'] = array(
	'inputbox-error-no-type' => 'Leeraloo ban xeetu boyotu duggit nga b??gga sos.',
	'inputbox-error-bad-type' => '"$1" du xeetu boyotu duggit bu ??u xam. T??nnal benn ci yii "create", "comment", "seach" walla "search2"',
	'tryexact' => 'Seet wi mu yamal',
	'searchfulltext' => 'Ceet ci mbind mi',
	'createarticle' => 'Sos jukki bi',
);

/** Wu (??????) */
$messages['wuu'] = array(
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Xhosa (isiXhosa) */
$messages['xh'] = array(
	'createarticle' => 'Bhala Ibali',
);

/** Yiddish (????????????)
 * @author Yidel
 * @author ????????????????
 */
$messages['yi'] = array(
	'searchfulltext' => '?????? ?????? ?????? ????????????',
	'createarticle' => '???????????? ????????????',
);

/** Yue (??????) */
$messages['yue'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '?????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"?????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '?????????????????????',
	'searchfulltext' => '?????????',
	'createarticle' => '????????????',
);

/** Simplified Chinese (?????????(??????)???)
 * @author Wmr89502270
 */
$messages['zh-hans'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???"fulltext"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Traditional Chinese (?????????(??????)???) */
$messages['zh-hant'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Zulu (isiZulu) */
$messages['zu'] = array(
	'searchfulltext' => 'Sesha ukubhala konke',
);



--- NEW FILE InputBox.php ---
<?php
/**
 * InputBox extension
 *
 * @file
 * @ingroup Extensions
 *
 * This file contains the main include file for the Inputbox extension of
 * MediaWiki.
 *
 * Usage: Add the following line in LocalSettings.php:
 * require_once( "$IP/extensions/InputBox/InputBox.php" );
 *
 * @author Erik Moeller <moeller at scireview.de>
 *  namespaces search improvements partially by
 *  Leonardo Pimenta <leo.lns at gmail.com>
 *	Cleaned up by Trevor Parscal <tparscal at wikimedia.org>
 * @copyright Public domain
 * @license Public domain
 * @version 0.1.1
 */

// Check environment
if ( !defined( 'MEDIAWIKI' ) ) {
	echo( "This is an extension to the MediaWiki package and cannot be run standalone.\n" );
	die( -1 );
}

/* Configuration */

// Credits
$wgExtensionCredits['parserhook'][] = array(
	'name'           => 'InputBox',
	'author'         => array( 'Erik Moeller', 'Leonardo Pimenta', 'Rob Church', 'Trevor Parscal' ),
	'url'            => 'http://www.mediawiki.org/wiki/Extension:InputBox',
	'description'    => 'Allow inclusion of predefined HTML forms.',
	'descriptionmsg' => 'inputbox-desc',
);

// Shortcut to this extension directory
$dir = dirname( __FILE__ ) . '/';

// Internationalization
$wgExtensionMessagesFiles['InputBox'] = $dir . 'InputBox.i18n.php';

// Register auto load for the special page class
$wgAutoloadClasses['InputBoxHooks'] = $dir . 'InputBox.hooks.php';
$wgAutoloadClasses['InputBox'] = $dir . 'InputBox.classes.php';

// Register parser hook
if ( defined( 'MW_SUPPORTS_PARSERFIRSTCALLINIT' ) ) {
	// Modern
	$wgHooks['ParserFirstCallInit'][] = 'InputBoxHooks::register';
} else {
	// Legacy
	$wgExtensionFunctions[] = array( 'InputBoxHooks', 'register' );
}


--- NEW FILE README.fedora ---
To complete installation of InputBox, add the following line to
LocalSettings.php:

  require_once "$IP/extensions/InputBox/InputBox.php";

for each MediaWiki instance you wish to install InputBox on.

This extension creates an <inputbox> tag that can be used to add wiki-related
HTML input boxes to wiki pages.  In general, "wiki-related" means
search boxes and "create an article" boxes.  Please see
http://www.mediawiki.org/wiki/Extension:InputBox for more details.


--- NEW FILE mediawiki-InputBox.spec ---
Name:		mediawiki-InputBox
Version:	0
Release:	0.2.20090420svn%{?dist}
Summary:	An extension to enable input box tags for mediawiki pages

Group:		Applications/Internet
License:	Public Domain
URL:		http://www.mediawiki.org/wiki/Extension:InputBox
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.classes.php?revision=49657
Source0:	InputBox.classes.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.hooks.php?revision=49657
Source1:	InputBox.hooks.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.i18n.php?revision=49657
Source2:	InputBox.i18n.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.php?revision=49657
Source3:	InputBox.php
Source4:	README.fedora
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	mediawiki >= 1.11

%description
The InputBox extension is a MediaWiki extension which adds already created HTML
forms to wiki pages. Users can "complete" a form (entering text, selecting menu
items, etc.) by entering text into the box.

InputBox was originally created by Erik Moeller for the purpose of adding a
Create an article box to Wikinews.

%prep

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox
install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/mediawiki/extensions/InputBox
%doc %{_docdir}/%{name}-%{version}/README.fedora

%changelog
* Mon Apr 20 2009 John Guthrie <guthrie at counterexample.org> - 0-0.2.20090420svn
- Fixed the source URLs and updated to the latest svn version.

* Tue Mar 31 2009 John Guthrie <guthrie at counterexample.org> - 0-0.1.20090331svn
- Initial package build.



From guthrie at fedoraproject.org  Thu Apr 23 19:00:12 2009
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Thu, 23 Apr 2009 19:00:12 +0000 (UTC)
Subject: rpms/mediawiki-InputBox/F-11 InputBox.classes.php, NONE,
	1.1 InputBox.hooks.php, NONE, 1.1 InputBox.i18n.php, NONE,
	1.1 InputBox.php, NONE, 1.1 README.fedora, NONE,
	1.1 mediawiki-InputBox.spec, NONE, 1.1
Message-ID: <20090423190012.0774470104@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/extras/rpms/mediawiki-InputBox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7274/F-11

Added Files:
	InputBox.classes.php InputBox.hooks.php InputBox.i18n.php 
	InputBox.php README.fedora mediawiki-InputBox.spec 
Log Message:
Initial import of mediawiki-InputBox package into the F-9, F-10, and F-11
branches.



--- NEW FILE InputBox.classes.php ---
<?php
/**
 * Classes for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox class
class InputBox {

	/* Fields */

	private $mParser;
	private $mType = '';
	private $mWidth = 50;
	private $mPreload = '';
	private $mEditIntro = '';
	private $mSummary = '';
	private $mMinor = '';
	private $mPage = '';
	private $mBR = 'yes';
	private $mDefaultText = '';
	private $mBGColor = 'transparent';
	private $mButtonLabel = '';
	private $mSearchButtonLabel = '';
	private $mFullTextButton = '';
	private $mLabelText = '';
	private $mHidden = '';
	private $mNamespaces = '';
	private $mID = '';
	private $mInline = false;
	private $mPrefix = '';

	/* Functions */

	public function __construct( $parser ) {
		$this->mParser = $parser;
	}

	public function render() {
		// Internationalization
		wfLoadExtensionMessages( 'InputBox' );

		// Handle various types
		switch( $this->mType ) {
			case 'create':
			case 'comment':
				return $this->getCreateForm();
			case 'commenttitle':
				return $this->getCommentForm();
			case 'search':
				return $this->getSearchForm('search');
			case 'fulltext':
				return $this->getSearchForm('fulltext');
			case 'search2':
				return $this->getSearchForm2();
			default:
				return Xml::tags( 'div', null,
					Xml::element( 'strong',
						array(
							'class' => 'error'
						),
						strlen( $this->mType ) > 0
						? wfMsgForContent( 'inputbox-error-bad-type', $this->mType ) 
						: wfMsgForContent( 'inputbox-error-no-type' ) 
					)
				);
		}
	}

	/**
	 * Generate search form
	 * @param $type 
	 */
	public function getSearchForm( $type ) {
		global $wgContLang;

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}
		if ( !$this->mSearchButtonLabel ) {
			$this->mSearchButtonLabel = wfMsgHtml( 'searchfulltext' );
		}

		// Build HTML
		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'searchbox',
				'id' => 'searchbox',
				'class' => 'searchbox',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'class' => 'searchboxInput',
				'name' => 'search',
				'type' => $this->mHidden ? 'hidden' : 'text',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth,
			)
		);
		
		if( $this->mPrefix != '' ){
			$htmlOut .= Xml::element( 'input',
				array(
					'name' => 'prefix',
					'type' => 'hidden',
					'value' => $this->mPrefix,
				)
			);	
		}
		
		$htmlOut .= $this->mBR;

		// Determine namespace checkboxes
		$namespaces = $wgContLang->getNamespaces();
		$namespacesArray = explode( ',', $this->mNamespaces );
		if ( $this->mNamespaces ) {
			foreach ( $namespacesArray as $userNamespace ) {
				$checked = array();
				// Namespace needs to be checked if flagged with "**" or if it's the only one
				if ( strstr( $userNamespace, '**' ) || count( $namespacesArray ) == 1 ) {
					$userNamespace = str_replace( '**', '', $userNamespace );
					$checked = array( 'checked' => 'checked' );
				}

				// Namespace checkboxes
				foreach ( $namespaces as $i => $name ) {
					if ( $i < 0 ) {
						continue;
					} elseif ( $i == 0 ) {
						$name = 'Main';
					}
					if ( $userNamespace == $name ) {
						// Checkbox
						$htmlOut .= Xml::element( 'input',
							array(
								'type' => 'checkbox',
								'name' => 'ns' . $i,
								'value' => 1,
								'id' => 'mw-inputbox-ns' . $i
							) + $checked
						);
						// Label
						$htmlOut .= '&nbsp;' . Xml::label( $userNamespace, 'mw-inputbox-ns' . $i );
					}
				}
			}

			// Line break
			$htmlOut .= $this->mBR;
		} else if( $type == 'search' ) {
			// Go button
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'go',
					'class' => 'searchboxGoButton',
					'value' => $this->mButtonLabel
				)
			);
			$htmlOut .= '&nbsp;';
		}

		// Search button
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'fulltext',
				'class' => 'searchboxSearchButton',
				'value' => $this->mSearchButtonLabel
			)
		);
		
		// Hidden fulltext param for IE (bug 17161)
		if( $type == 'fulltext' ) {
			$htmlOut .= Xml::hidden( 'fulltext', 'Search' );
		}
		
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/*
	 * Generate search form version 2
	 */
	public function getSearchForm2() {

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}

		$id = Sanitizer::escapeId( $this->mID, 'noninitial' );
		$htmlLabel = '';
		if ( isset( $this->mLabelText ) && strlen( trim( $this->mLabelText ) ) ) {
			$this->mLabelText = $this->mParser->recursiveTagParse( $this->mLabelText );
			$htmlLabel = Xml::openElement( 'label', array( 'for' => 'bodySearchInput' . $id ) );
			$htmlLabel .= $this->mLabelText;
			$htmlLabel .= Xml::closeElement( 'label' );
		}
		$htmlOut = Xml::openElement( 'form',
			array(
				'name' => 'bodySearch' . $id,
				'id' => 'bodySearch' . $id,
				'class' => 'bodySearch',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
				'style' => $this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= Xml::openElement( 'div',
			array(
				'class' => 'bodySearchWrap',
				'style' => 'background-color:' . $this->mBGColor . ';' .
					$this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= $htmlLabel;
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'search',
				'size' => $this->mWidth,
				'id' => 'bodySearchInput' . $id
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'go',
				'value' => $this->mButtonLabel,
				'class' => 'bodySearchBtnGo' . $id
			)
		);

		// Better testing needed here!
		if ( !empty( $this->mFullTextButton ) ) {
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'fulltext',
					'class' => 'bodySearchBtnSearch',
					'value' => $this->mSearchButtonLabel
				)
			);
		}

		$htmlOut .= Xml::closeElement( 'div' );
		$htmlOut .= Xml::closeElement( 'form' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Generate create page form
	 */
	public function getCreateForm() {
		global $wgScript;

		if ( $this->mType == "comment" ) {
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
			}
		} else {
			$comment = '';
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( 'createarticle' );
			}
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'createbox',
				'id' => 'createbox',
				'class' => 'createbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'summary',
				'value' => $this->mSummary,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'minor',
				'value' => $this->mMinor,
			)
		);
		if ( $this->mType == 'comment' ) {
			$htmlOut .= Xml::openElement( 'input',
				array(
					'type' => 'hidden',
					'name' => 'section',
					'value' => 'new',
				)
			);
		}
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'title',
				'class' => 'createboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'createboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}
	
	/**
	 * Generate new section form
	 */
	public function getCommentForm() {
		global $wgScript;

		if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'commentbox',
				'id' => 'commentbox',
				'class' => 'commentbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'preloadtitle',
				'class' => 'commentboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'section',
				'value' => 'new',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'title',
				'value' => $this->mPage
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'commentboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Extract options from a blob of text
	 *
	 * @param string $text Tag contents
	 */
	public function extractOptions( $text ) {
		wfProfileIn( __METHOD__ );

		// Parse all possible options
		$values = array();
		foreach ( explode( "\n", $text ) as $line ) {
			if ( strpos( $line, '=' ) === false )
				continue;
			list( $name, $value ) = explode( '=', $line, 2 );
			$values[ strtolower( trim( $name ) ) ] = trim( $value );
		}

		// Build list of options, with local member names
		$options = array(
			'type' => 'mType',
			'width' => 'mWidth',
			'preload' => 'mPreload',
			'page' => 'mPage',
			'editintro' => 'mEditIntro',
			'summary' => 'mSummary',
			'minor' => 'mMinor',
			'break' => 'mBR',
			'default' => 'mDefaultText',
			'bgcolor' => 'mBGColor',
			'buttonlabel' => 'mButtonLabel',
			'searchbuttonlabel' => 'mSearchButtonLabel',
			'fulltextbutton' => 'mFullTextButton',
			'namespaces' => 'mNamespaces',
			'labeltext' => 'mLabelText',
			'hidden' => 'mHidden',
			'id' => 'mID',
			'inline' => 'mInline',
			'prefix' => 'mPrefix',
		);
		foreach ( $options as $name => $var ) {
			if ( isset( $values[$name] ) ) {
				$this->$var = $values[$name];
			}
		}

		// Insert a line break if configured to do so
		$this->mBR = ( strtolower( $this->mBR ) == "no" ) ? ' ' : '<br />';

		// Validate the width; make sure it's a valid, positive integer
		$this->mWidth = intval( $this->mWidth <= 0 ? 50 : $this->mWidth );

		wfProfileOut( __METHOD__ );
	}

}


--- NEW FILE InputBox.hooks.php ---
<?php
/**
 * Hooks for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox hooks
class InputBoxHooks {

	/* Functions */

	// Initialization
	public static function register() {
		global $wgParser;

		// Register the hook with the parser
		$wgParser->setHook( 'inputbox', array( 'InputBoxHooks', 'render' ) );

		// Continue
		return true;
	}

	// Render the input box
	public static function render( $input, $args, $parser ) {
		// Create InputBox
		$inputBox = new InputBox( $parser );

		// Configure InputBox
		$inputBox->extractOptions( $parser->replaceVariables( $input ) );

		// Return output
		return $inputBox->render();
	}
}


--- NEW FILE InputBox.i18n.php ---
<?php

/**
 * Messages file for the InputBox extension
 *
 * @addtogroup Extensions
 */

/**
 * Get all extension messages
 *
 * @return array
 */
$messages = array();

$messages['en'] = array(
	'inputbox-desc'           => 'Allow inclusion of predefined HTML forms',
	'inputbox-error-no-type'  => 'You have not specified the type of input box to create.',
	'inputbox-error-bad-type' => 'Input box type "$1" not recognised.
Please specify "create", "comment", "search", "search2" or "fulltext".',
	'tryexact'                => 'Try exact match',
	'searchfulltext'          => 'Search full text',
	'createarticle'           => 'Create page',
);

/** Message documentation (Message documentation)
 * @author Meno25
 * @author SPQRobin
 * @author Siebrand
 */
$messages['qqq'] = array(
	'inputbox-desc' => 'Short description of the Inputbox extension, shown on [[Special:Version]].',
	'inputbox-error-bad-type' => '{{doc-important|"create", "comment", "search", "search2" and "fulltext" should not be translated.}}',
	'tryexact' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. If the page with the exact name exists, you will go directly to that page.',
	'searchfulltext' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. This button always goes to the search page, even if the page with the exact name exists.',
	'createarticle' => 'Part of the "Inputbox" extension. This message is the text of the button to create the page you typed in the inputbox.',
);

/** Niuean (ko e vagahau Niu??)
 * @author Jose77
 */
$messages['niu'] = array(
	'createarticle' => 'Talaga tohi tala',
);

/** Afrikaans (Afrikaans)
 * @author Naudefj
 */
$messages['af'] = array(
	'inputbox-desc' => 'Laat die insluiting van vooraf gedefinieerde HTML-vorms moontlik',
	'inputbox-error-no-type' => 'U het nie die tipe invoerveld gespesifiseer nie.',
	'inputbox-error-bad-type' => 'Tipe invoerveld "$1" nie herken nie.
Gebruik "create", "comment", "search" of "search2".',
	'tryexact' => 'Soek presiese ooreenkoms',
	'searchfulltext' => 'Deursoek volledige teks',
	'createarticle' => 'Skep bladsy',
);

/** Amharic (????????????)
 * @author Codex Sinaiticus
 */
$messages['am'] = array(
	'createarticle' => '????????? ??????????????? ???????????????',
);

/** Aragonese (Aragon??s)
 * @author Juanpabl
 */
$messages['an'] = array(
	'inputbox-desc' => 'Premite a enclusi??n de formularios HTML predefinitos',
	'inputbox-error-no-type' => 'No ha endicato o tipo de caixa de dentrada que cal creyar.',
	'inputbox-error-bad-type' => 'No se reconoixe o tipo de caixa de dentrada "$1".
Por fabor, espezifique "create", "comment", "search" u "fulltext".',
	'tryexact' => 'Mirar t??tol esauto',
	'searchfulltext' => 'Mirar por testo completo',
	'createarticle' => 'Creyar pachina',
);

/** Arabic (??????????????)
 * @author Meno25
 */
$messages['ar'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? HTML ?????????? ??????????.',
	'inputbox-error-no-type' => '???? ?????? ???????????? ?????? ?????????? ?????????????? ??????????????.',
	'inputbox-error-bad-type' => '?????? ?????????? ?????????????? "$1" ???? ?????? ???????????? ????????.
???? ???????? ?????? "create"?? "comment"?? "search"?? "search2" ???? "fulltext".',
	'tryexact' => '???????? ???? ?????????? ??????????',
	'searchfulltext' => '???????? ???? ???????? ????????????',
	'createarticle' => '?????????? ????????',
);

/** Egyptian Spoken Arabic (????????)
 * @author Ghaly
 * @author Ramsis II
 */
$messages['arz'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? ?????? ???? ???? ???? ?????????? ???? ??????????',
	'inputbox-error-no-type' => '?????? ???? ?????????? ?????? ?????????? ?????????????? ??????????????',
	'inputbox-error-bad-type' => '???? ???????????????? ?????? ?????? ?????????? ?????????????? "$1"  .
???? ????????  ???????? "create"?? "comment"?? "search" ???? "search2".',
	'tryexact' => '?????? ?????? ?????????? ??????????',
	'searchfulltext' => '?????? ???? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Assamese (??????????????????)
 * @author Rajuonline
 */
$messages['as'] = array(
	'tryexact' => '???????????? ??????????????? ?????????????????? ?????????????????????',
	'searchfulltext' => '???????????????????????? ??????????????? ?????????????????????',
	'createarticle' => '?????????????????? ???????????????',
);

/** Asturian (Asturianu)
 * @author Esbardu
 */
$messages['ast'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios HTML predefin??os',
	'inputbox-error-no-type' => "Nun especificasti la triba de caxellu d'entrada pa crear.",
	'inputbox-error-bad-type' => "Triba de caxa d'entrada $1 non reconocida. Por favor conse??a la opci??n ''create'', ''comment'', ''search'' o ''search2''.",
	'tryexact' => 'Intentar concueyar exautamente',
	'searchfulltext' => 'Buscar testu completu',
	'createarticle' => 'Crear p??xina',
);

/** Azerbaijani (Az??rbaycan) */
$messages['az'] = array(
	'createarticle' => 'M??qal?? yarat',
);

/** Samogitian (??emait????ka)
 * @author Hugo.arg
 */
$messages['bat-smg'] = array(
	'searchfulltext' => '??i??kuot?? p??lna teksta',
);

/** Southern Balochi (?????????? ????????????)
 * @author Mostafadaneshvar
 */
$messages['bcc'] = array(
	'inputbox-desc' => '?????????? ???????? ???? ?????? ?????? ?????? ?????? HTML ???? ?????? ?????????? ????????????',
	'inputbox-error-no-type' => '?????? ?????? ???????? ?????????? ???? ?????????? ???????? ???? ??????',
	'inputbox-error-bad-type' => '?????? ???????? ?????????? "$1"  ?????? ?????? ???? ??????.
???????? ???????? ????????  "??????????", "??????", "????????" ???? "????????2".',
	'tryexact' => '?????????? ???????? ???????????? ????',
	'searchfulltext' => '?????? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Belarusian (????????????????????) */
$messages['be'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Belarusian (Tara??kievica orthography) (???????????????????? (??????????????????????))
 * @author EugeneZelenko
 * @author Jim-by
 * @author Red Winged Duck
 */
$messages['be-tarask'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????? ???????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ?????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '???????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ?????????????????? ???????????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ???? ??fulltext??.',
	'tryexact' => '???????????????????????? ???????????????? ??????????',
	'searchfulltext' => '???????????? ?????????? ??????????',
	'createarticle' => '???????????????? ????????????????',
);

/** Bulgarian (??????????????????)
 * @author DCLXVI
 * @author Spiritia
 */
$messages['bg'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????? ???? HTML ??????????????????.',
	'inputbox-error-no-type' => '???? ???? ???????????????? ???????? ???? ?????????????? ???? ????????, ?????????? ???? ???????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???$1??? ???? ?????????????? ???? ????????.
????????, ???????????????? ???create???, ???comment???, ???search??? ?????? ???search2???.',
	'tryexact' => '?????????? ?? ?????????? ????????????????????',
	'searchfulltext' => '?????????????????????? ???? ?????????? ??????????',
	'createarticle' => '??????????????????',
);

/** Bislama (Bislama)
 * @author Ushanka
 */
$messages['bi'] = array(
	'createarticle' => 'Mekem atikel',
);

/** Bengali (???????????????)
 * @author Bellayet
 * @author Zaheen
 */
$messages['bn'] = array(
	'inputbox-desc' => '????????????????????????????????????????????? ??????????????????????????? ?????????????????? ???????????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '???????????? ??????????????? ???????????? ??????????????? ???????????? ??????????????? ?????????????????? ????????? ???????????????????????? ?????????????????????',
	'inputbox-error-bad-type' => '"$1" ??????????????? ??????????????? ???????????? ???????????? ???????????? ????????? "create", "comment", "search" ???????????? "search2" ???????????????????????? ???????????????',
	'tryexact' => '????????? ?????? ??????????????? ????????????????????? ?????????',
	'searchfulltext' => '?????? ???????????????????????????????????? ??????????????????',
	'createarticle' => '?????????????????? ???????????? ?????????',
);

/** Bakhtiari (??????????????)
 * @author Behdarvandyani
 */
$messages['bqi'] = array(
	'inputbox-desc' => '?????????? ?????????????? ???? ??????????????? HTML ???????? ?????????? ???????????? ???? ??????',
	'inputbox-error-no-type' => '?????? ???????? ??????????  ???????? ?????????? ???? ?????????? ????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???? ???????? ?????????? ???????????? ????. ?????????? ?????? ???? ?????????? 
"create", "comment", "search" or "search2" ???? ???????? ????????.',
	'tryexact' => '?????????? ???????? ???? ???????? ???? ???????????? ????',
	'searchfulltext' => '???????????? ?????? ??????',
	'createarticle' => '???????? ???????? ????????',
);

/** Breton (Brezhoneg)
 * @author Fulup
 */
$messages['br'] = array(
	'inputbox-desc' => 'Aotren a ra degas furmskrido?? HTML raktermenet.',
	'inputbox-error-no-type' => "N'eo ket bet spisaet ganeoc'h ar seurt boest enmont da veza?? krouet",
	'inputbox-error-bad-type' => 'N\'eo ket anavaezet ar seurt boest enmont "$1".
Spisait "create", "comment", "search" pe "search2".',
	'tryexact' => 'Klask ma klotfe rik',
	'searchfulltext' => 'Klask an destenn a-bezh',
	'createarticle' => 'Kroui?? ar pennad',
);

/** Bosnian (Bosanski)
 * @author CERminator
 */
$messages['bs'] = array(
	'inputbox-desc' => 'Omogu??uje uklju??ivanje prethodno napravljenih HTML obrazaca',
	'inputbox-error-no-type' => 'Niste odredili tip kutije za unos koju pravite.',
	'inputbox-error-bad-type' => 'Tip kutije unosa "$1" nije prepoznat.
Molimo odredite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Isprobaj na??i ta??an upit',
	'searchfulltext' => 'Pretra??i cijeli tekst',
	'createarticle' => 'Napravi stranicu',
);

/** Catalan (Catal??)
 * @author Paucabot
 * @author SMP
 * @author Toniher
 */
$messages['ca'] = array(
	'inputbox-desc' => 'Permet la inclusi?? de formularis HTML predefinits',
	'inputbox-error-no-type' => "No heu especificat el tipus de quadre d'entrada per crear.",
	'inputbox-error-bad-type' => "El tipus de quadre d'entrada ??$1?? no est?? reconegut.

Especifiqueu-hi ??create??, ??comment??, ??search??, ??search2?? o ??fulltext??.",
	'tryexact' => 'Prova una coincid??ncia exacta',
	'searchfulltext' => 'Cerca un text sencer',
	'createarticle' => 'Crea una p??gina',
);

/** Min Dong Chinese (M??ng-d????ng-ng?????) */
$messages['cdo'] = array(
	'createarticle' => 'K??i hi??k',
);

/** Corsican (Corsu) */
$messages['co'] = array(
	'searchfulltext' => 'Ricerca testu cumplettu',
	'createarticle' => "Cre?? l'articulu",
);

/** Crimean Turkish (Latin) (Q??r??mtatarca (Latin))
 * @author Alessandro
 */
$messages['crh-latn'] = array(
	'createarticle' => 'Saifeni ya??art',
);

/** Crimean Turkish (Cyrillic) (Q??r??mtatarca (Cyrillic))
 * @author Alessandro
 */
$messages['crh-cyrl'] = array(
	'createarticle' => '?????????????? ????????????',
);

/** Czech (??esky)
 * @author Danny B.
 * @author Li-sung
 */
$messages['cs'] = array(
	'inputbox-desc' => 'Umo????uje vkl??dat ur??it?? HTML formul????e.',
	'inputbox-error-no-type' => 'Nen?? ur??en typ formul????ov??ho pole k vytvo??en??.',
	'inputbox-error-bad-type' => 'Nerozpoznan?? typ pole ???$1???.
Uve??te jednu z mo??nost??: ???create???, ???comment???, ???search???, ???search2??? nebo ???fulltext???.',
	'tryexact' => 'Vyzkou??et p??esn?? hled??n??',
	'searchfulltext' => 'Plnotextov?? hled??n??',
	'createarticle' => 'Vytvo??it ??l??nek',
);

/** Chuvash (??????????????) */
$messages['cv'] = array(
	'createarticle' => '???????? ???????????? ??????',
);

/** Welsh (Cymraeg)
 * @author Lloffiwr
 */
$messages['cy'] = array(
	'inputbox-desc' => "Yn caniatau creu blychau mewnbynnu sy'n cynnwys ffurflenni HTML wedi eu gosod yn barod i'w defnyddio",
	'inputbox-error-no-type' => "Nid ydych wedi pennu'r math o flwch mewnbynnu yr ydych am ei greu.",
	'inputbox-error-bad-type' => 'Nid yw\'r gair "$1" ar y math o flwch mewnbynnu yn ddealladwy gan y meddalwedd.
Dewiswch rhwng "create", "comment", "search" a "search2" neu "fulltext".',
	'tryexact' => 'Chwilio am yr union gymal',
	'searchfulltext' => "Chwilio'r testun cyfan",
	'createarticle' => "Creu'r dudalen",
);

/** Danish (Dansk)
 * @author Byrial
 */
$messages['da'] = array(
	'inputbox-desc' => 'Muligg??r inkludering af forh??ndsdefinerede HTML-formularer',
	'inputbox-error-no-type' => 'Du har ikke angivet type i inputboksen som skal laves.',
	'inputbox-error-bad-type' => 'Inputboks-type "$1" kendes ikke.
V??lg venligst "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'G?? til siden',
	'searchfulltext' => 'S??g efter teksten',
	'createarticle' => 'Opret side',
);

/** German (Deutsch)
 * @author Metalhead64
 * @author Raimond Spekking
 * @author Umherirrender
 */
$messages['de'] = array(
	'inputbox-desc' => 'Erlaubt die Einbindung vordefinierter HTML-Formulare',
	'inputbox-error-no-type' => 'Du hast keinen Eingabefeld-Typ angegeben.',
	'inputbox-error-bad-type' => 'Eingabefeld-Typ ???$1??? unbekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? angeben.',
	'tryexact' => 'Versuche exakte Suche',
	'searchfulltext' => 'Gesamten Text durchsuchen',
	'createarticle' => 'Seite anlegen',
);

/** German (formal address) (Deutsch (Sie-Form))
 * @author Umherirrender
 */
$messages['de-formal'] = array(
	'inputbox-error-no-type' => 'Sie haben keinen Eingabefeld-Typ angegeben.',
);

/** Lower Sorbian (Dolnoserbski)
 * @author Michawiki
 * @author Pe7er
 */
$messages['dsb'] = array(
	'inputbox-desc' => 'Zap????gnjenje p??eddefin??rowanych HTML-formularow dow??li??',
	'inputbox-error-no-type' => 'Njejsy p??da?? typ zap??dawa??skego p??la za nap??ranje.',
	'inputbox-error-bad-type' => 'Zap??dawa??ske p??lo typa "$1" njesp??znane.
P??osym p??daj "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Naw??os pyta??:',
	'searchfulltext' => 'Ce??y tekst pyta??',
	'createarticle' => 'Nastawk natwori??',
);

/** Divehi (????????????????????)
 * @author Spacebirdy
 */
$messages['dv'] = array(
	'createarticle' => '???????????????????? ????????????????',
);

/** Ewe (E??egbe) */
$messages['ee'] = array(
	'createarticle' => 'Dze nu??????l?? yeye g??me',
);

/** Greek (????????????????)
 * @author Dead3y3
 */
$messages['el'] = array(
	'inputbox-desc' => '?????????????????? ?????? ???????????????? ?????????????????????????????? ???????????? HTML',
	'inputbox-error-no-type' => '?????? ?????????? ?????????????????? ?????? ???????? ?????? ?????????????? ?????????????? ???????? ????????????????????.',
	'inputbox-error-bad-type' => '?????????? ?????????????? ?????????????? "$1" ?????? ??????????????????????????.<br />
???????????????? ???????????? "create", "comment", "search", "search2" ?? "fulltext".',
	'tryexact' => '?????????????????? ?????? ???????????????? ??????????????????????.',
	'searchfulltext' => '?????????????????? ???? ???? ???????????? ??????????????',
	'createarticle' => '???????????????????? ??????????????',
);

/** Esperanto (Esperanto)
 * @author Yekrats
 */
$messages['eo'] = array(
	'inputbox-desc' => 'Permesi enhavon de anta??difinitaj HTML-kamparoj',
	'inputbox-error-no-type' => 'Vi ne enigis la specon de enigo-kesto por krei.',
	'inputbox-error-bad-type' => 'Enigo-kesto "$1" ne estas konata.
Bonvolu specifigi keston "krea", "komenta", "ser??a", "ser??a2", a?? "plenateksa".',
	'tryexact' => 'Provu ekzaktan trafon',
	'searchfulltext' => 'Ser??i plentekste',
	'createarticle' => 'Krei artikolon',
);

/** Spanish (Espa??ol)
 * @author Crazymadlover
 * @author Icvav
 * @author Muro de Aguas
 * @author Sanbec
 */
$messages['es'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios en HTML predefinidos.',
	'inputbox-error-no-type' => 'No has especificado el tipo de formulario que vas a crear.',
	'inputbox-error-bad-type' => 'No se reconoce el tipo de caja de entrada ??$1??.
Por favor, especifica ??create??, ??comment??, ??search?? ??search2?? o "fulltext".',
	'tryexact' => 'Buscar t??tulo exacto',
	'searchfulltext' => 'Buscar por texto completo',
	'createarticle' => 'Crear art??culo',
);

/** Estonian (Eesti)
 * @author Avjoska
 * @author Jaan513
 */
$messages['et'] = array(
	'tryexact' => 'Proovi t??pset vastet',
	'searchfulltext' => 'Otsi t??isteksti',
	'createarticle' => 'Alusta lehek??lge',
);

/** Basque (Euskara) */
$messages['eu'] = array(
	'tryexact' => 'Izenburu zehatza bilatu',
	'searchfulltext' => 'Testu osoa bilatu',
	'createarticle' => 'Artikulua sortu',
);

/** Extremaduran (Estreme??u) */
$messages['ext'] = array(
	'createarticle' => 'Creal art??culu',
);

/** Persian (??????????)
 * @author Huji
 */
$messages['fa'] = array(
	'inputbox-desc' => '???????????? ?????????????? ???? ??????????????? HTML ???? ?????? ?????????? ?????? ???? ?????????????',
	'inputbox-error-no-type' => '?????? ?????????? ??????????  ???????????????????? ???? ???????? ???????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????? ?????????? ?????????? ???????????? ?????? ????????.
?????????? ?????? ???? ?????????? ??create???? ??comment???? ??search???? ??search2?? ???? ??fulltext?? ???? ???????? ????????.',
	'tryexact' => '???????????? ???????? ???? ???????? ???? ????????????',
	'searchfulltext' => '???????????? ???? ??????',
	'createarticle' => '?????????? ??????????',
);

/** Finnish (Suomi)
 * @author Crt
 * @author Nike
 */
$messages['fi'] = array(
	'inputbox-desc' => 'Mahdollistaa ennalta m????riteltyjen lomakkeiden sis??llytt??misen sivuille.',
	'inputbox-error-no-type' => 'Et m????ritellyt sy??tekent??n tyyppi??.',
	'inputbox-error-bad-type' => 'Sy??tekent??n tyyppi ???$1??? ei kelpaa.
Sallittuja arvoja ovat create, comment, search, search2 ja fulltext.',
	'tryexact' => 'Yrit?? tarkkaa osumaa',
	'searchfulltext' => 'Etsi koko teksti??',
	'createarticle' => 'Luo sivu',
);

/** Faroese (F??royskt) */
$messages['fo'] = array(
	'createarticle' => 'Stovna grein',
);

/** French (Fran??ais)
 * @author Crochet.david
 * @author IAlex
 * @author Sherbrooke
 */
$messages['fr'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formulaires HTML pr??d??finis.',
	'inputbox-error-no-type' => 'Vous n???avez pas pr??cis?? le type de la bo??te d???entr??e ?? cr??er.',
	'inputbox-error-bad-type' => 'Type de bo??te entr??e ?? $1 ?? non reconnue.
Indiquez une option parmis ?? create ??, ?? comment ??, ?? search ??, ?? searche2 ?? ou ?? fulltext ??.',
	'tryexact' => 'Essayez la correspondance exacte.',
	'searchfulltext' => 'Recherche en texte int??gral',
	'createarticle' => 'Cr??er la page',
);

/** Franco-Proven??al (Arpetan)
 * @author ChrisPtDe
 */
$messages['frp'] = array(
	'inputbox-desc' => 'P??rm??t l???encllusion de formul??ros HTML pr??d??fenis.',
	'inputbox-error-no-type' => 'Vos ??d pas sp??cefi?? lo tipo de la bou??ta d???entr?? a cr??ar.',
	'inputbox-error-bad-type' => "Tipo de bou??ta d???entr?? ?? $1 ?? pas recognu. Endic??d lo chou??x ''create'', ''comment'', ''search'' ou ben ''searche2''.",
	'tryexact' => '??prov??d la corr??spondance ??gzacta.',
	'searchfulltext' => 'Rech??rche en t??xte compl??t',
	'createarticle' => 'Cr??ar l???articllo',
);

/** Friulian (Furlan)
 * @author Klenje
 */
$messages['fur'] = array(
	'tryexact' => 'C??r une corispondence esate',
	'searchfulltext' => 'C??r in dut il test',
	'createarticle' => 'Cree v??s',
);

/** Western Frisian (Frysk)
 * @author Snakesteuben
 */
$messages['fy'] = array(
	'createarticle' => 'Side oanmeitsje',
);

/** Irish (Gaeilge) */
$messages['ga'] = array(
	'tryexact' => 'D??an iarracht ar meaitse??il cruinn',
	'searchfulltext' => 'Cuardaigh sa t??acs ioml??n',
	'createarticle' => 'Cruthaigh alt',
);

/** Galician (Galego)
 * @author Alma
 * @author Toli??o
 */
$messages['gl'] = array(
	'inputbox-desc' => 'Permitir a inclusi??n de formularios predefinidos de HTML',
	'inputbox-error-no-type' => 'Non se especificou o tipo de caixa de entrada para crear.',
	'inputbox-error-bad-type' => 'O tipo de caixa de entrada "$1" non foi reco??ecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar coincidencias exactas',
	'searchfulltext' => 'Buscar o texto completo',
	'createarticle' => 'Crear a p??xina',
);

/** Ancient Greek (????????????? ??????????????????)
 * @author Omnipaedista
 */
$messages['grc'] = array(
	'inputbox-desc' => '????????????????????? ??????? ???????????????????? ?????????????????????????????? ????????????? HTML',
	'inputbox-error-no-type' => '??????? ????????????? ??????? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ??????????????????.',
	'inputbox-error-bad-type' => '??? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ?????????????????? "$1" ????????????????????????????? ??????? ???????????.
?????????????????? "create", "comment", "search", "search2" ??? "fulltext".',
	'tryexact' => '???????????????? ??????? ?????????????? ?????????????????????????',
	'searchfulltext' => '????????????? ????? ????? ???????????? ???????????????',
	'createarticle' => '???????????? ??????????????????????????',
);

/** Swiss German (Alemannisch)
 * @author Als-Chl??mens
 * @author Als-Holder
 */
$messages['gsw'] = array(
	'inputbox-desc' => 'Erlaubt d Yybindig vu vordefinierte HTML-Formular',
	'inputbox-error-no-type' => 'Du hesch kei Yygabf??ld-Typ aagee.',
	'inputbox-error-bad-type' => 'Yygabf??ld-Typ ???$1??? nit bekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? aagee.',
	'tryexact' => 'Versuech es mitenere exakte Suech',
	'searchfulltext' => 'De gsamti Teggscht durchsueche',
	'createarticle' => 'Syte aalaie',
);

/** Gujarati (?????????????????????)
 * @author Dsvyas
 */
$messages['gu'] = array(
	'createarticle' => '????????? ????????? ????????? ?????????',
);

/** Manx (Gaelg)
 * @author MacTire02
 */
$messages['gv'] = array(
	'createarticle' => 'Croo duillag',
);

/** Hakka (Hak-k??-fa)
 * @author Hakka
 */
$messages['hak'] = array(
	'tryexact' => 'S??ng-chh??? ch??n-khok phit-phi',
	'searchfulltext' => 'Chhi??n v??n-ki??m chh??m-ch??u',
	'createarticle' => 'Kien-li??p v??n-ch??ng',
);

/** Hebrew (??????????)
 * @author Rotem Liss
 */
$messages['he'] = array(
	'inputbox-desc' => '???????????? ???????????? ?????????? HTML ?????????????? ????????',
	'inputbox-error-no-type' => '???? ???????????? ???? ?????? ???????? ???????? ????????????.',
	'inputbox-error-bad-type' => '?????? ???????? ???????? "$1" ???????? ????????.
?????? ?????????? "create", "comment", "search", "search2" ???? "fulltext".',
	'tryexact' => '?????? ?????? ????',
	'searchfulltext' => '?????????? ?????????? ??????????',
	'createarticle' => '?????????? ??????',
);

/** Hindi (??????????????????)
 * @author Kaustubh
 */
$messages['hi'] = array(
	'inputbox-desc' => '?????????????????? ???????????? ????????? HTML ??????????????? ???????????????????????? ???????????? ?????? ?????????????????? ?????????',
	'inputbox-error-no-type' => '??????????????? ??????????????? ??????????????? ?????? ???????????? ???????????? ???????????? ?????????????????? ??????????????? ???????????? ????????????',
	'inputbox-error-bad-type' => '??????????????? ??????????????? ?????? "$1" ?????? ?????????????????? ???????????? ???????????? ????????????
??????????????? "create", "comment", "search" ?????? ????????? "search2" ????????? ?????? ?????? ??????????????????',
	'tryexact' => '???????????? ????????? ?????????????????? ???????????????',
	'searchfulltext' => '???????????? ????????? ???????????????',
	'createarticle' => '????????? ?????????????????????',
);

/** Fiji Hindi (Latin) (Fiji Hindi (Latin))
 * @author Thakurji
 */
$messages['hif-latn'] = array(
	'inputbox-desc' => 'Predefined HTML forms ke allow karo',
	'inputbox-error-no-type' => 'Aap ii nai bataya hai ki kon rakam ke input box ke banae ke chaahi',
	'inputbox-error-bad-type' => 'Input box type "$1" ke pehchana nai gais hai.
Meharbani kar kr ii batao ki "create", "comment", "search", "search2" nai to "fulltext" hai.',
	'tryexact' => 'Exact match ke try karo',
	'searchfulltext' => 'Puura text me khojo',
	'createarticle' => 'Panna banao',
);

/** Hiligaynon (Ilonggo)
 * @author Jose77
 */
$messages['hil'] = array(
	'createarticle' => 'Maghimo artikulo',
);

/** Croatian (Hrvatski)
 * @author Brest
 * @author Dnik
 * @author SpeedyGonsales
 */
$messages['hr'] = array(
	'inputbox-desc' => 'Dozvoli uklju??ivanje predefiniranih obrazaca u HTML-u',
	'inputbox-error-no-type' => 'Niste naveli tip ulaznog polja koje ??elite stvoriti.',
	'inputbox-error-bad-type' => 'Tip ulaznog polja "$1" nije prepoznat. 
Molimo navedite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Poku??aj na??i to??an pogodak',
	'searchfulltext' => 'Tra??i po cjelokupnom tekstu',
	'createarticle' => 'Stvori ??lanak',
);

/** Upper Sorbian (Hornjoserbsce)
 * @author Dundak
 * @author Michawiki
 */
$messages['hsb'] = array(
	'inputbox-desc' => 'Zap??ije??e p??eddefinowanych HTML-formularow dowoli??.',
	'inputbox-error-no-type' => 'Njesy typ zapodatneho ka????ika poda??.',
	'inputbox-error-bad-type' => 'Typ zapodatneho ka????ika "$1" je njeznaty. Pro??u podaj p??a??iwy typ: "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Dok??adne pytanje spyta??',
	'searchfulltext' => 'Dospo??ny tekst pyta??',
	'createarticle' => 'Nastawk wutwori??',
);

/** Haitian (Krey??l ayisyen)
 * @author Masterches
 */
$messages['ht'] = array(
	'inputbox-desc' => 'Ap p??m??t ou mete f??mil?? HTML yo ki ja defini.',
	'inputbox-error-no-type' => 'Atansyon, ou pa bay detay sou tip, kalite bwat antre pou ou kreye',
	'inputbox-error-bad-type' => "Kalite bwat antre $1 pa bon, sist??m an pa konnen l. Mete opsyon sa ''create (kreye)'', ''comment (komante)'', ''search (chache, fouye)'' ou ''searche2''.",
	'tryexact' => 'Eseye yon korespondans egzakt, toutbon.',
	'searchfulltext' => 'Chache, fouye ak opsyon t??ks entegral; wap pran an konsiderasyon tout mo ki nan demann ou an',
	'createarticle' => 'Kreye atik sa',
);

/** Hungarian (Magyar)
 * @author Dani
 * @author KossuthRad
 * @author Tgr
 */
$messages['hu'] = array(
	'inputbox-desc' => 'Lehet??v?? teszi el??re megadott HTML-??rlapok beilleszt??s??t',
	'inputbox-error-no-type' => 'Nem adtad meg, hogy milyen t??pus?? beviteli mez??t akarsz k??sz??teni.',
	'inputbox-error-bad-type' => '???$1??? t??pus?? beviteli mez?? nem ismert. ???create???, ???comment???, ???search??? vagy ???search2??? egyik??t add meg.',
	'tryexact' => 'Ugr??s a sz??cikkre',
	'searchfulltext' => 'Keres??s a teljes sz??vegben',
	'createarticle' => 'Sz??cikk l??trehoz??sa',
);

/** Armenian (??????????????) */
$messages['hy'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Interlingua (Interlingua)
 * @author McDutchie
 */
$messages['ia'] = array(
	'inputbox-desc' => 'Permitter le inclusion de formularios HTML predefinite',
	'inputbox-error-no-type' => 'Tu non ha specificate le typo de quadro de entrata a crear.',
	'inputbox-error-bad-type' => 'Le typo de quadro de entrata "$1" non es recognoscite.
Per favor specifica "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Provar correspondentia exacte',
	'searchfulltext' => 'Cercar in texto integre',
	'createarticle' => 'Crear pagina',
);

/** Indonesian (Bahasa Indonesia)
 * @author IvanLanin
 */
$messages['id'] = array(
	'inputbox-desc' => 'Memungkinkan penggunaan form HTML yang telah ditentukan',
	'inputbox-error-no-type' => 'Anda harus menentukan tipe kotak input yang ingin dibuat.',
	'inputbox-error-bad-type' => 'Tipe kotak input "$1" tak dikenal. Tolong gunakan "create", "comment", "search" atau "search2".',
	'tryexact' => 'Coba pencocokan eksak',
	'searchfulltext' => 'Cari di teks lengkap',
	'createarticle' => 'Buat artikel',
);

/** Iloko (Ilokano) */
$messages['ilo'] = array(
	'createarticle' => 'Mangaramid iti articulo',
);

/** Ido (Ido)
 * @author Malafaya
 */
$messages['io'] = array(
	'searchfulltext' => 'Serchar tota texto',
	'createarticle' => 'Krear pagino',
);

/** Icelandic (??slenska)
 * @author S.??rvarr.S
 */
$messages['is'] = array(
	'createarticle' => 'B??a til s????u',
);

/** Italian (Italiano)
 * @author BrokenArrow
 * @author Darth Kule
 */
$messages['it'] = array(
	'inputbox-desc' => "Consente l'inserimento di moduli HTML predefiniti",
	'inputbox-error-no-type' => 'Non ?? stato specificato il tipo di inputbox da creare.',
	'inputbox-error-bad-type' => '"$1" non ?? un tipo di inputbox riconosciuto. Scegliere il tipo tra "create", "comment", "search", "search2" e "fulltext".',
	'tryexact' => 'Cerca corrispondenza esatta',
	'searchfulltext' => 'Ricerca nel testo',
	'createarticle' => 'Crea voce',
);

/** Japanese (?????????)
 * @author Fryed-peach
 * @author JtFuruhata
 */
$messages['ja'] = array(
	'inputbox-desc' => '??????????????????????????????HTML????????????????????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ????????????????????????????????????????????????????????????????????????"create"???"comment"???"search"???"search2"???"fulltext" ????????????????????????',
	'tryexact' => '???????????????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Jutish (Jysk)
 * @author Husl??ke
 */
$messages['jut'] = array(
	'inputbox-desc' => 'Tilst??n der inklusje der pr??d??fiini??rn HTML f??rmer',
	'inputbox-error-no-type' => 'Du harst ekke sp??sifi??rn ?? type der input boks til skep.',
	'inputbox-error-bad-type' => 'Input boks type "$1" ekke herkonnen. Sp??sifi??r "skep", "bim??rkenge", "s????" ??ller "s????2".',
	'tryexact' => 'F??rs???? eksakt s????nenge:',
	'searchfulltext' => "Gennems????e'n h??le tekster",
	'createarticle' => '??prette side',
);

/** Javanese (Basa Jawa)
 * @author Meursault2004
 */
$messages['jv'] = array(
	'inputbox-desc' => 'Ngidinak?? nganggo formulir HTML sing wis ditemtokak??',
	'inputbox-error-no-type' => 'Panjenengan durung nemtokak?? tipe kothak input sing arep digaw??.',
	'inputbox-error-bad-type' => 'Tipe kothak input "$1" ora ditepungi.
Tulung nganggoa "create", "comment", "search" utawa "search2".',
	'tryexact' => 'Cobanen pancocogan ??ksak',
	'searchfulltext' => 'Gol??k ing t??ks jangkep',
	'createarticle' => 'Damel artikel',
);

/** Georgian (?????????????????????)
 * @author Alsandro
 */
$messages['ka'] = array(
	'tryexact' => '??????????????? ??????????????? ???????????????????????????',
	'searchfulltext' => '??????????????? ????????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Kara-Kalpak (Qaraqalpaqsha) */
$messages['kaa'] = array(
	'createarticle' => 'Bet jarat??w',
);

/** Kabyle (Taqbaylit)
 * @author Agurzil
 */
$messages['kab'] = array(
	'tryexact' => 'Nadi ??ef uzwel kif-kif',
	'searchfulltext' => 'Nadi a???ris ettmam',
	'createarticle' => 'Xleq amagrad',
);

/** Kazakh (Arabic script) (????????????????? (??????????)???) */
$messages['kk-arab'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Cyrillic) (?????????????? (Cyrillic)) */
$messages['kk-cyrl'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Latin) (?????????????? (Latin)) */
$messages['kk-latn'] = array(
	'inputbox-error-no-type' => 'Jasalat??n engizw jola????n???? t??rin keltirmepsiz.',
	'inputbox-error-bad-type' => 'Engizw jolaqt???? ??$1?? t??ri tan??lmad??. Tek ??create??, ??comment??, ??search?? ne ??search2?? degen t??rlerdi keltiri??iz.',
	'tryexact' => 'D??l s????kesin s??nap k??ri??iz',
	'searchfulltext' => 'Tol??q m??tinimen izdew',
	'createarticle' => 'Betti bastaw',
);

/** Khmer (???????????????????????????)
 * @author Chhorran
 * @author Lovekhmer
 * @author T-Rithy
 */
$messages['km'] = array(
	'inputbox-error-no-type' => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Korean (?????????)
 * @author Albamhandae
 * @author Klutzy
 * @author Kwj2772
 * @author ToePeu
 */
$messages['ko'] = array(
	'inputbox-desc' => '?????? ????????? HTML ?????? ????????? ??? ?????? ??? ???',
	'inputbox-error-no-type' => 'type ????????? ????????? ???????????????.',
	'inputbox-error-bad-type' => '"$1"???(???) ????????? ??? ?????? type ???????????????.
"create", "comment", "search", "search2", "fulltext" ??? ????????? ???????????????.',
	'tryexact' => '????????? ???????????? ??????',
	'searchfulltext' => '?????? ??? ??????',
	'createarticle' => '?????? ?????????',
);

/** Ripoarisch (Ripoarisch)
 * @author Purodha
 */
$messages['ksh'] = array(
	'inputbox-desc' => 'Bestemmpte HTML-Formulare k??nne hee met enjebonge w????de.',
	'inputbox-error-no-type' => 'Wat f??r en Zoot Kaste wells De dann han?',
	'inputbox-error-bad-type' => 'De Zoot ???$1??? f??r et Feld f??r jet enzejevve kenne mer nit, De moss schunn ???create???, ???comment???, ???search???, ???search2???, udder ???fulltext??? dof??r aanjevve.',
	'tryexact' => 'Vers??k en akkurate ??vvereinstimmung:',
	'searchfulltext' => 'S??k durch d?? janze Tex',
	'createarticle' => 'Sigg aanl????je',
);

/** Kurdish (Latin) (Kurd?? / ?????????? (Latin)) */
$messages['ku-latn'] = array(
	'createarticle' => 'Gotar?? biafir??ne',
);

/** Latin (Latina) */
$messages['la'] = array(
	'createarticle' => 'Paginam creare',
);

/** Luxembourgish (L??tzebuergesch)
 * @author Robby
 */
$messages['lb'] = array(
	'inputbox-desc' => "Erlaabt d'Af??ge vu viirdefin??ierten HTML-Formulairen",
	'inputbox-error-no-type' => 'Dir hutt den Typ vu K??scht fir eppes anzeginn net uginn.',
	'tryexact' => 'Versicht et matt der preziser Sich:',
	'searchfulltext' => 'Am ganzen Text sichen',
	'createarticle' => 'S??it ulee??n',
);

/** Lingua Franca Nova (Lingua Franca Nova)
 * @author Malafaya
 */
$messages['lfn'] = array(
	'createarticle' => 'Crea paje',
);

/** Ganda (Luganda) */
$messages['lg'] = array(
	'createarticle' => 'Wandika omuko',
);

/** Limburgish (Limburgs)
 * @author Matthias
 * @author Ooswesthoesbes
 */
$messages['li'] = array(
	'inputbox-desc' => "Maakt 't toevoege van veurgedefinieerde HTML-formuliere meugelijk",
	'inputbox-error-no-type' => "U heeft 't type inputbox neet aangegeve. Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] veur meer informatie.",
	'inputbox-error-bad-type' => 'Inputbox-type "$1" neet herkend. 
Gebroek "create", "comment", "search", "search2" ??f "fulltext".',
	'tryexact' => 'Perbeer exacte euvereinkoms',
	'searchfulltext' => 'Zeuk d??r volledige t??ks',
	'createarticle' => "Maak 'ne pazjena aan",
);

/** Lingala (Ling??la)
 * @author Moyogo
 */
$messages['ln'] = array(
	'createarticle' => 'Kokela ekakoli',
);

/** Lao (?????????)
 * @author Tuinui
 */
$messages['lo'] = array(
	'tryexact' => '??????',
	'searchfulltext' => '???????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Lithuanian (Lietuvi??) */
$messages['lt'] = array(
	'tryexact' => 'M??ginti tiksl?? atitikim??',
	'searchfulltext' => 'Ie??koti pilno teksto',
	'createarticle' => 'Kurti straipsn??',
);

/** Latvian (Latvie??u)
 * @author Xil
 * @author Yyy
 */
$messages['lv'] = array(
	'inputbox-error-no-type' => 'Tu neesi nor??d??jis ievades lauka tipu',
	'inputbox-error-bad-type' => 'Ievades lauka tips "$1" nav atpaz??ts.
L??dzu nor??di "create", "comment", "search", "search2" vai "fulltext".',
	'tryexact' => 'Mekl??t prec??zi',
	'searchfulltext' => 'Mekl??t visu tekstu',
	'createarticle' => 'Izveidot lapu',
);

/** Literary Chinese (??????) */
$messages['lzh'] = array(
	'inputbox-error-no-type' => '??????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"???????????????"create"???"comment"???"search"???"search2"??????',
	'tryexact' => '?????????',
	'searchfulltext' => '?????????',
	'createarticle' => '??????',
);

/** Macedonian (????????????????????)
 * @author Brest
 * @author Misos
 */
$messages['mk'] = array(
	'inputbox-desc' => '???????????????????? ???????????????????? ???? ?????????????????????????? HTML ??????????',
	'inputbox-error-no-type' => '???????????? ???????????????? ?????? ???? ???????? ???? ???????? ?????? ???????????? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????????? ???? ???????????? ???? ???????? "$1" ???? ?? ????????????.
???????????????? ???????? ???? ???????????????? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????? ???? ??????????',
	'searchfulltext' => '?????????? ?????? ???????????? ??????????',
	'createarticle' => '?????????????? ????????????????',
);

/** Malayalam (??????????????????)
 * @author Shijualex
 */
$messages['ml'] = array(
	'inputbox-desc' => '???????????????????????????????????????????????????????????? ????????????????????????????????????????????? HTML ???????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????? ????????????????????????????????? ?????????????????????????????? ????????? ???????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ???????????? ?????????????????????????????? ?????????????????? ????????? ????????????????????????????????????????????????.
???????????? ?????????????????? "create", "comment", "search", "search2" ?????????????????????????????? ?????????????????????????????????????????????',
	'tryexact' => '??????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????????????????? ????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????? ??????????????????????????? ??????????????????',
	'createarticle' => '??????????????? ?????????????????????????????????',
);

/** Marathi (???????????????)
 * @author Kaustubh
 */
$messages['mr'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????????? HTML ???????????? ?????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '?????????????????? ????????????????????? ???????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????? ?????????????????? ?????????????????? ????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????????????????? ????????????????????????????????? "$1" ?????? ?????????????????? ??????????????? ????????????. ??????????????? "create", "comment", "search" ??????????????? "search2" ??????????????? ?????? ???????????????.',
	'tryexact' => '????????????????????? ???????????? ????????????',
	'searchfulltext' => '??????????????? ??????????????? ????????????',
	'createarticle' => '????????? ????????????',
);

/** Malay (Bahasa Melayu)
 * @author Aviator
 */
$messages['ms'] = array(
	'inputbox-desc' => 'Membenarkan penyertaan borang HTML yang sudah ditetapkan.',
	'inputbox-error-no-type' => 'Anda tidak menyatakan jenis kotak input untuk diciptakan.',
	'inputbox-error-bad-type' => 'Jenis kotak input "$1" tidak dikenali. Sila nyatakan "create", "comment", "search", "search2" atau "fulltext".',
	'tryexact' => 'Cuba padanan tepat',
	'searchfulltext' => 'Cari dalam teks penuh',
	'createarticle' => 'Cipta laman',
);

/** Maltese (Malti)
 * @author Chrisportelli
 * @author Giangian15
 */
$messages['mt'] = array(
	'inputbox-desc' => "T??alli formuli ta' HTML predefiniti",
	'inputbox-error-no-type' => "Inti ma spe??ifikajtx it-tip ta' ''input box'' li trid to??loq.",
	'inputbox-error-bad-type' => '"$1" mhuwiex tip mag??ruf ta\' \'\'inputbox\'\'. Jekk jog????bok spe??ifika fost "create", "comment", "search" u "search2".',
	'tryexact' => 'Fittex korrispondenza e??atta',
	'searchfulltext' => 'Fittex fit-test',
	'createarticle' => 'O??loq pa??na',
);

/** Mazanderani (????????????????)
 * @author Spacebirdy
 */
$messages['mzn'] = array(
	'createarticle' => '?????? ??????????',
);

/** Nahuatl (N??huatl)
 * @author Fluence
 */
$messages['nah'] = array(
	'createarticle' => 'Ticch??hu??z z??zanilli',
);

/** Min Nan Chinese (B??n-l??m-g??) */
$messages['nan'] = array(
	'searchfulltext' => 'Chhiau choan-b??n',
);

/** Neapolitan (Nnapulitano)
 * @author SabineCretella
 */
$messages['nap'] = array(
	'searchfulltext' => 'Asci?? dint&#39;&#39;o testo',
	'createarticle' => 'Cria voce',
);

/** Low German (Plattd????tsch)
 * @author Slomox
 */
$messages['nds'] = array(
	'inputbox-desc' => 'Verl????vt dat Inbinnen vun v??rdefineerte HTML-Formularen',
	'inputbox-error-no-type' => 'Du hest keen Typ f??r dat Ingaav-Feld angeven.',
	'inputbox-error-bad-type' => 'De Typ ???$1??? f??r dat Ingaav-Feld is nich bekannt.
Geev een vun disse Typen an: ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext???.',
	'tryexact' => 'exakte S????k vers??ken',
	'searchfulltext' => 'in???n Vulltext s??ken',
	'createarticle' => 'Siet anleggen',
);

/** Nepali (??????????????????) */
$messages['ne'] = array(
	'createarticle' => '????????? ??????????????????????????????',
);

/** Dutch (Nederlands)
 * @author SPQRobin
 * @author Siebrand
 */
$messages['nl'] = array(
	'inputbox-desc' => 'Maakt het toevoegen van voorgedefinieerde HTML-formulieren mogelijk',
	'inputbox-error-no-type' => 'U hebt het type invoerveld niet aangegeven.
Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] voor meer informatie.',
	'inputbox-error-bad-type' => 'Type invoerveld "$1" niet herkend.
Gebruik "create", "comment", "search", "search2" of "fulltext".',
	'tryexact' => 'Zoeken op exacte overeenkomst',
	'searchfulltext' => 'Volledige tekst doorzoeken',
	'createarticle' => 'Nieuwe pagina maken',
);

/** Norwegian Nynorsk (???Norsk (nynorsk)???)
 * @author Frokor
 * @author Harald Khan
 */
$messages['nn'] = array(
	'inputbox-desc' => 'Tillet inkludering av f??rehandsdefinerte HTML-skjema',
	'inputbox-error-no-type' => 'Du har ikkje gjeve kva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inntekstboks av typen ??$1?? vart ikkje gjenkjent.
Ver venleg og velg ??create??, ??comment??, ??search??, ??search2??, eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k i all tekst',
	'createarticle' => 'Lag side',
);

/** Norwegian (bokm??l)??? (???Norsk (bokm??l)???)
 * @author Jon Harald S??by
 */
$messages['no'] = array(
	'inputbox-desc' => 'Tillater inkludering av forh??ndsdefinerte HTML-skjemaer',
	'inputbox-error-no-type' => 'Du har ikke angitt hva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inputboks av typen ??$1?? gjenkjennes ikke.
Vennligst velg ??create??, ??comment??, ??search??, ??search2?? eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k full tekst',
	'createarticle' => 'Opprett side',
);

/** Novial (Novial)
 * @author Malafaya
 */
$messages['nov'] = array(
	'searchfulltext' => 'Sercha kompleti texte',
);

/** Northern Sotho (Sesotho sa Leboa)
 * @author Mohau
 */
$messages['nso'] = array(
	'createarticle' => 'Tlhoma letlakala',
);

/** Occitan (Occitan)
 * @author Cedric31
 */
$messages['oc'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formularis HTML predefinits',
	'inputbox-error-no-type' => 'Av??tz pas precisat lo tipe de la b??stia de dintrada de crear.',
	'inputbox-error-bad-type' => "Tipe de b??stia d'entrada ?? $1 ?? pas reconeguda.
Indicatz una opcion demest ''create'', ''comment'', ''search'' o ''searche2'' o ?? fulltext ??.",
	'tryexact' => 'Ensajatz la correspond??ncia exacta',
	'searchfulltext' => 'Rec??rca en t??xt integral',
	'createarticle' => 'Crear l???article',
);

/** Pangasinan (Pangasinan) */
$messages['pag'] = array(
	'createarticle' => 'Mangawa na artikulo',
);

/** Pampanga (Kapampangan) */
$messages['pam'] = array(
	'createarticle' => 'Gawang artikulu',
);

/** Polish (Polski)
 * @author Derbeth
 * @author Sp5uhe
 */
$messages['pl'] = array(
	'inputbox-desc' => 'Umo??liwia w????czenie w tre???? strony wcze??niej zdefiniowanych formularzy HTML',
	'inputbox-error-no-type' => 'Typ pola wej??ciowego nie zosta?? okre??lony',
	'inputbox-error-bad-type' => 'Typ ???$1??? pola wej??ciowego nie zosta?? rozpoznany.
Nale??y wybra?? ???create???, ???comment???, ???search???, ???search2??? or ???fulltext???.',
	'tryexact' => 'U??yj dok??adnego wyra??enia',
	'searchfulltext' => 'Szukaj w ca??ych tekstach',
	'createarticle' => 'Utw??rz artyku??',
);

/** Piedmontese (Piemont??is)
 * @author B??rto 'd S??ra
 */
$messages['pms'] = array(
	'inputbox-error-no-type' => "A l'ha nen dit che s??rt ??d qu??der ??d caria dat ch'a debia fesse.",
	'inputbox-error-bad-type' => 'La s??rt ??d qu??der "$1" a l\'?? nen conoss??a. P??r pias??, ch\'a s??rna antra "create", "comment", "search" ?? pura "search2".',
	'tryexact' => 'S??rca che a sia pr??pe parej',
	'searchfulltext' => 'S??rca an tut ??l test',
	'createarticle' => "Crea n'art??col",
);

/** Pontic (????????????????)
 * @author Sinopeus
 */
$messages['pnt'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Pashto (????????)
 * @author Ahmed-Najib-Biabani-Ibrahimkhel
 */
$messages['ps'] = array(
	'inputbox-desc' => '?? ???????? ???? ?? HTML ?????????? ???????? ?????????? ???????????? ?????????? ??????????',
	'tryexact' => '???? ???? ?????????? ???? ??????????????',
	'searchfulltext' => '???????? ?????? ????????',
	'createarticle' => '?????? ?????????? ??????????',
);

/** Portuguese (Portugu??s)
 * @author Malafaya
 */
$messages['pt'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios HTML pr??-definidos.',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de box de inser????o a ser criado.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a exata express??o',
	'searchfulltext' => 'Pesquisar no texto completo',
	'createarticle' => 'Criar p??gina',
);

/** Brazilian Portuguese (Portugu??s do Brasil)
 * @author Brunoy Anastasiya Seryozhenko
 * @author Eduardo.mps
 */
$messages['pt-br'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios definidos de HTML',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de inputbox a ser criada.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a express??o exata',
	'searchfulltext' => 'Pesquisar em todo o texto.',
	'createarticle' => 'Criar p??gina.',
);

/** Quechua (Runa Simi)
 * @author AlimanRuna
 */
$messages['qu'] = array(
	'tryexact' => 'Hinalla taripanayaspa maskay',
	'searchfulltext' => "Hunt'a qillqata maskay",
	'createarticle' => 'Qillqata kamariy',
);

/** Romanian (Rom??n??)
 * @author Emily
 * @author Firilacroco
 * @author KlaudiuMihaila
 * @author Mihai
 */
$messages['ro'] = array(
	'inputbox-desc' => 'Permite includerea formelor HTML predefinite',
	'inputbox-error-no-type' => 'Nu ai specificat ce tip de cutie intrare s?? fie creat??.',
	'inputbox-error-bad-type' => 'Tipul de cutie intrare "$1" nu este recunoscut.
Te rog s?? specifici parametrii "create", "comment", "search", "search2" sau "fulltext".',
	'tryexact' => '??ncearc?? varianta exact??',
	'searchfulltext' => 'Caut?? textul ??ntreg',
	'createarticle' => 'Creaz?? articol',
);

/** Aromanian (Arm??neashce) */
$messages['roa-rup'] = array(
	'createarticle' => 'Adrats articlu',
);

/** Tarand??ne (Tarand??ne)
 * @author Joetaras
 */
$messages['roa-tara'] = array(
	'createarticle' => "Ccreje 'a v??sce",
);

/** Russian (??????????????)
 * @author ?????????????????? ??????????????
 */
$messages['ru'] = array(
	'inputbox-desc' => '?????????????????? ???????????????? ?????????????? ???????????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???????? ?????????? ??$1??.
????????????????????, ?????????????? ???????? ???? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** Yakut (???????? ????????)
 * @author HalanTul
 */
$messages['sah'] = array(
	'inputbox-desc' => '???????????????? ???????????????????? HTML-?????????????????? ??????????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '??$1?? ???????????? ???????????? ??????????????????. ???????? ???????? ?????????????????????? ??????: ??create??, ??comment??, ??search??, ??search2?? ???????????? ??fulltext??.',
	'tryexact' => '?????????? ??????????',
	'searchfulltext' => '???????????????? ?????????????? ??????????????????',
	'createarticle' => '???????????????????? ????????????',
);

/** Sardinian (Sardu)
 * @author Marzedu
 */
$messages['sc'] = array(
	'createarticle' => 'Crea art??culu',
);

/** Sicilian (Sicilianu)
 * @author Santu
 */
$messages['scn'] = array(
	'inputbox-desc' => 'Pirmetti nzirimenti di m??duli HTML predifiniti',
	'inputbox-error-no-type' => 'Non vinni spicificatu lu tipu di inputbox di criari.',
	'inputbox-error-bad-type' => '"$1" nun ?? nu tipu di inputbox canusciutu. S\'h?? sc??gghiri lu tipu ntra "create", "comment", "search" e "search2".',
	'tryexact' => 'Cerca currispunnenza giusta',
	'searchfulltext' => 'Circata nt?? testu',
	'createarticle' => 'Cria vuci',
);

/** Sindhi (????????) */
$messages['sd'] = array(
	'createarticle' => '???????? ?????????? ??????',
);

/** Sango (S??ng??) */
$messages['sg'] = array(
	'createarticle' => 'S?? soura',
);

/** Sinhala (???????????????)
 * @author Asiri wiki
 * @author ?????????????????????????????????
 */
$messages['si'] = array(
	'inputbox-desc' => '??????????????????????????????????????????????????? HTML ????????????????????? ????????????????????????????????? ?????????????????????',
	'inputbox-error-no-type' => '??????????????? ???????????? ????????????????????? ?????????????????? ????????????????????? ?????? ?????????????????? ????????????????????? ????????? ??????????????? ???????????????.',
	'inputbox-error-bad-type' => '????????????????????? ???????????? ????????????????????? "$1" ????????????????????? ???????????????.
????????????????????? "???????????????", "?????????????????????", "??????????????????" ?????? "??????????????????2" ????????????????????? ??????????????? .',
	'tryexact' => '??????????????? ??????????????????  ??????????????? ???????????????',
	'searchfulltext' => '???????????????????????? ????????? ?????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Slovak (Sloven??ina)
 * @author Helix84
 */
$messages['sk'] = array(
	'inputbox-desc' => 'Umo????uje vlo??enie preddefinovan??ch HTML formul??rov',
	'inputbox-error-no-type' => 'Neuviedli ste typ vstupn??ho po??a, ktor?? sa m?? vytvori??.',
	'inputbox-error-bad-type' => 'Vstupn?? pole typu ???$1??? nie je podporovan??.
Pros??m, pou??ite ???create???, ???comment???, ???search??? alebo ???search2???.',
	'tryexact' => 'Sk??ste presn?? vyh??ad??vanie',
	'searchfulltext' => 'Fulltextov?? vyh??ad??vanie',
	'createarticle' => 'Vytvori?? str??nku',
);

/** Slovenian (Sloven????ina) */
$messages['sl'] = array(
	'tryexact' => 'Poskusite z natan??nim zadetkom',
	'searchfulltext' => 'Prei????i vse besedilo',
	'createarticle' => 'Ustvarite stran',
);

/** Albanian (Shqip)
 * @author Dori
 */
$messages['sq'] = array(
	'tryexact' => 'K??rko p??rputhje t?? plot??',
	'searchfulltext' => 'K??rko tekstin e plot??',
	'createarticle' => 'Krijo artikull',
);

/** Serbian Cyrillic ekavian (????????????????)
 * @author Millosh
 * @author ?????????????? ????????????????????
 */
$messages['sr-ec'] = array(
	'inputbox-desc' => '?????????????? ???????????????????? ?????????????????? ?????????????????????? HTML ??????????.',
	'inputbox-error-no-type' => '???????? ?????????????? ?????? ???????????? ???????????? ???? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????????????? ???? ???????? ???????????????? ???? ????????????????.
???????????? ?????? ???? ???? ?????????????????? ???? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????? ?????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** latinica (latinica) */
$messages['sr-el'] = array(
	'tryexact' => 'Poku??aj ta??no',
	'searchfulltext' => 'Pretra??i ceo tekst',
	'createarticle' => 'Napravi ??lanak',
);

/** Swati (SiSwati)
 * @author Jatrobat
 */
$messages['ss'] = array(
	'createarticle' => 'K??d??la intfo',
);

/** Seeltersk (Seeltersk)
 * @author Maartenvdbent
 * @author Pyt
 */
$messages['stq'] = array(
	'inputbox-desc' => 'Ferl????wet d??t Apniemen fon foardefinierde HTML-Formulare',
	'inputbox-error-no-type' => 'Du h????st naan Inputbox-Typ ounroat.',
	'inputbox-error-bad-type' => 'Iengoawef??ild-Typ "$1" uunbekoand.
Reek n gultigen Typ an: ???create???, ???comment???, ???search???, ???search2??? of "fulltext".',
	'tryexact' => 'Fers??ik exakte S??ike:',
	'searchfulltext' => 'D??n ganse Text truchs??ike',
	'createarticle' => 'Siede anl????se',
);

/** Sundanese (Basa Sunda)
 * @author Irwangatot
 */
$messages['su'] = array(
	'tryexact' => 'Coba jeung anu cocog',
	'searchfulltext' => 'Sungsi dina t??ks lengkap',
	'createarticle' => 'Jieun artikel',
);

/** Swedish (Svenska)
 * @author Lejonel
 * @author Najami
 */
$messages['sv'] = array(
	'inputbox-desc' => 'Ger m??jlighet att anv??nda f??rdefinerade HTML-formul??r.',
	'inputbox-error-no-type' => 'Du har inte angivit vilken typ av inputbox som ska skapas..',
	'inputbox-error-bad-type' => '"$1" ??r inte en k??nd typ av inputbox.
Var god specifiera "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'F??rs??k hitta exakt matchning',
	'searchfulltext' => 'Fulltexts??kning',
	'createarticle' => 'Skapa sida',
);

/** Silesian (??l??nski)
 * @author Ozi64
 */
$messages['szl'] = array(
	'createarticle' => 'Na??kryflej artikel',
);

/** Telugu (??????????????????)
 * @author Chaduvari
 * @author Veeven
 */
$messages['te'] = array(
	'inputbox-desc' => '??????????????? ??????????????????????????????????????? HTML ???????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??? ??????????????? ?????????&zwnj;???????????? ???????????????????????? ????????????????????????????????? ???????????? ???????????????????????????.',
	'tryexact' => '??????????????????????????? ??????????????? ??????????????? ?????????????????????????????????',
	'searchfulltext' => '?????????????????? ???????????????????????? ??????????????????',
	'createarticle' => '?????????????????????????????? ???????????????????????????',
);

/** Tajik (Cyrillic) (???????????? (Cyrillic))
 * @author Ibrahim
 */
$messages['tg-cyrl'] = array(
	'inputbox-desc' => '???????????? ???????????????? ???? ?????????????? HTML ???? ?????? ???????????????????????? ??????????????',
	'inputbox-error-no-type' => '?????????? ???????????? ?????????????? ?????????????????????????? ???????????????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????? ???????????? ?????????????? "$1" ?????????????????? ??????. ???????????? ???? ???? ?????????????????? ???? ???????? "create", "comment", "search" ?? "search2" ???????????????? ??????????.',
	'tryexact' => '???????????????????? ???????????? ????????????????',
	'searchfulltext' => '???????????????? ?????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Thai (?????????) */
$messages['th'] = array(
	'tryexact' => '?????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????',
	'createarticle' => '????????????????????????????????????',
);

/** Tagalog (Tagalog)
 * @author AnakngAraw
 */
$messages['tl'] = array(
	'inputbox-desc' => 'Pahintulutan ang pagsasama ng mga pormularyong HTML na may paunang kahulugan',
	'inputbox-error-no-type' => 'Hindi mo tinukoy ang uri ng pasukang kahong lilikhain.',
	'inputbox-error-bad-type' => 'Hindi nakikilala ang uri ng pasukang kahong "$1".
Pakitukoy ang "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Subukin ang hustung-hustong katugmaan',
	'searchfulltext' => 'Maghanap sa buong teksto',
	'createarticle' => 'Likhain ang pahina',
);

/** Tswana (Setswana) */
$messages['tn'] = array(
	'createarticle' => 'Kwala mokwalo',
);

/** Tonga (lea faka-Tonga) */
$messages['to'] = array(
	'createarticle' => 'Fakatupu ??a e kupu',
);

/** Turkish (T??rk??e)
 * @author Erkan Yilmaz
 * @author Joseph
 * @author Srhat
 */
$messages['tr'] = array(
	'inputbox-desc' => '??ntan??ml?? HTML formlar??n??n dahil edilmesine olanak verir',
	'inputbox-error-no-type' => 'Olu??turulacak girdi kutusunun tipini belirtmediniz.',
	'inputbox-error-bad-type' => 'Girdi kutusu tipi "$1" tan??nmad??.
L??tfen "create", "comment", "search", "search2" ya da  "fulltext" olarak belirtin.',
	'tryexact' => 'Tam e??le??me dene',
	'searchfulltext' => 'T??m metni ara',
	'createarticle' => 'Sayfay?? olu??tur',
);

/** Tsonga (Xitsonga)
 * @author Thuvack
 */
$messages['ts'] = array(
	'createarticle' => 'Tumbuluxa tluka',
);

/** Ukrainian (????????????????????)
 * @author AS
 * @author Ahonc
 */
$messages['uk'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????????????????? ?????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ???????? ??????????, ?????? ??????????????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ???????????????? ???????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '???????????????? ????????????',
);

/** Urdu (????????) */
$messages['ur'] = array(
	'searchfulltext' => '???????? ?????? ??????',
	'createarticle' => '?????? ??????????',
);

/** Uzbek (O'zbek) */
$messages['uz'] = array(
	'createarticle' => 'Maqola kiritish',
);

/** V??neto (V??neto)
 * @author Candalua
 */
$messages['vec'] = array(
	'inputbox-desc' => "Consente l'inserimento de moduli HTML predefin??i",
	'inputbox-error-no-type' => 'No te gh?? specific?? el tipo de inputbox da crear.',
	'inputbox-error-bad-type' => '"$1" no\'l xe m??a un tipo de inputbox riconossi??o.
Siegli el tipo tra "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => '??erca corispondenza precisa',
	'searchfulltext' => '??erca nel testo',
	'createarticle' => 'Crea pagina',
);

/** Veps (Vepsan kel')
 * @author ?????????? ????????????????
 */
$messages['vep'] = array(
	'createarticle' => "S??ta lehtpol'",
);

/** Vietnamese (Ti???ng Vi???t)
 * @author Minh Nguyen
 */
$messages['vi'] = array(
	'inputbox-desc' => 'Th??m nh???ng bi???u m???u HTML ????n gi???n',
	'inputbox-error-no-type' => 'B???n ch??a ?????nh r?? lo???i bi???u m???u ????? t???o ra.',
	'inputbox-error-bad-type' => 'Lo???i bi???u m???u ???$1??? kh??ng h???p l???. Xin h??y ch???n ???create???, ???comment???, ???search???, ???search2???, hay ???fulltext???.',
	'tryexact' => 'Th??? t??m ??o???n v??n kh???p ch??nh x??c v???i t??? kh??a',
	'searchfulltext' => 'T??m to??n v??n',
	'createarticle' => 'Vi???t b??i m???i',
);

/** Volap??k (Volap??k)
 * @author Malafaya
 * @author Smeira
 */
$messages['vo'] = array(
	'inputbox-desc' => 'D??l??n kenin??kami fomas-HTLM b??o pemiedet??las',
	'searchfulltext' => 'Suk??n zi da v??dem l??lik',
	'createarticle' => 'Jaf??n padi',
);

/** V??ro (V??ro)
 * @author V??rok
 */
$messages['vro'] = array(
	'tryexact' => 'T??ps?? otsmin??',
	'searchfulltext' => 'Otsiq terveq tekst',
	'createarticle' => 'Luuq leht',
);

/** Walloon (Walon) */
$messages['wa'] = array(
	'createarticle' => 'Ahiver ??rtike',
);

/** Wolof (Wolof)
 * @author Ibou
 */
$messages['wo'] = array(
	'inputbox-error-no-type' => 'Leeraloo ban xeetu boyotu duggit nga b??gga sos.',
	'inputbox-error-bad-type' => '"$1" du xeetu boyotu duggit bu ??u xam. T??nnal benn ci yii "create", "comment", "seach" walla "search2"',
	'tryexact' => 'Seet wi mu yamal',
	'searchfulltext' => 'Ceet ci mbind mi',
	'createarticle' => 'Sos jukki bi',
);

/** Wu (??????) */
$messages['wuu'] = array(
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Xhosa (isiXhosa) */
$messages['xh'] = array(
	'createarticle' => 'Bhala Ibali',
);

/** Yiddish (????????????)
 * @author Yidel
 * @author ????????????????
 */
$messages['yi'] = array(
	'searchfulltext' => '?????? ?????? ?????? ????????????',
	'createarticle' => '???????????? ????????????',
);

/** Yue (??????) */
$messages['yue'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '?????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"?????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '?????????????????????',
	'searchfulltext' => '?????????',
	'createarticle' => '????????????',
);

/** Simplified Chinese (?????????(??????)???)
 * @author Wmr89502270
 */
$messages['zh-hans'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???"fulltext"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Traditional Chinese (?????????(??????)???) */
$messages['zh-hant'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Zulu (isiZulu) */
$messages['zu'] = array(
	'searchfulltext' => 'Sesha ukubhala konke',
);



--- NEW FILE InputBox.php ---
<?php
/**
 * InputBox extension
 *
 * @file
 * @ingroup Extensions
 *
 * This file contains the main include file for the Inputbox extension of
 * MediaWiki.
 *
 * Usage: Add the following line in LocalSettings.php:
 * require_once( "$IP/extensions/InputBox/InputBox.php" );
 *
 * @author Erik Moeller <moeller at scireview.de>
 *  namespaces search improvements partially by
 *  Leonardo Pimenta <leo.lns at gmail.com>
 *	Cleaned up by Trevor Parscal <tparscal at wikimedia.org>
 * @copyright Public domain
 * @license Public domain
 * @version 0.1.1
 */

// Check environment
if ( !defined( 'MEDIAWIKI' ) ) {
	echo( "This is an extension to the MediaWiki package and cannot be run standalone.\n" );
	die( -1 );
}

/* Configuration */

// Credits
$wgExtensionCredits['parserhook'][] = array(
	'name'           => 'InputBox',
	'author'         => array( 'Erik Moeller', 'Leonardo Pimenta', 'Rob Church', 'Trevor Parscal' ),
	'url'            => 'http://www.mediawiki.org/wiki/Extension:InputBox',
	'description'    => 'Allow inclusion of predefined HTML forms.',
	'descriptionmsg' => 'inputbox-desc',
);

// Shortcut to this extension directory
$dir = dirname( __FILE__ ) . '/';

// Internationalization
$wgExtensionMessagesFiles['InputBox'] = $dir . 'InputBox.i18n.php';

// Register auto load for the special page class
$wgAutoloadClasses['InputBoxHooks'] = $dir . 'InputBox.hooks.php';
$wgAutoloadClasses['InputBox'] = $dir . 'InputBox.classes.php';

// Register parser hook
if ( defined( 'MW_SUPPORTS_PARSERFIRSTCALLINIT' ) ) {
	// Modern
	$wgHooks['ParserFirstCallInit'][] = 'InputBoxHooks::register';
} else {
	// Legacy
	$wgExtensionFunctions[] = array( 'InputBoxHooks', 'register' );
}


--- NEW FILE README.fedora ---
To complete installation of InputBox, add the following line to
LocalSettings.php:

  require_once "$IP/extensions/InputBox/InputBox.php";

for each MediaWiki instance you wish to install InputBox on.

This extension creates an <inputbox> tag that can be used to add wiki-related
HTML input boxes to wiki pages.  In general, "wiki-related" means
search boxes and "create an article" boxes.  Please see
http://www.mediawiki.org/wiki/Extension:InputBox for more details.


--- NEW FILE mediawiki-InputBox.spec ---
Name:		mediawiki-InputBox
Version:	0
Release:	0.2.20090420svn%{?dist}
Summary:	An extension to enable input box tags for mediawiki pages

Group:		Applications/Internet
License:	Public Domain
URL:		http://www.mediawiki.org/wiki/Extension:InputBox
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.classes.php?revision=49657
Source0:	InputBox.classes.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.hooks.php?revision=49657
Source1:	InputBox.hooks.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.i18n.php?revision=49657
Source2:	InputBox.i18n.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.php?revision=49657
Source3:	InputBox.php
Source4:	README.fedora
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	mediawiki >= 1.11

%description
The InputBox extension is a MediaWiki extension which adds already created HTML
forms to wiki pages. Users can "complete" a form (entering text, selecting menu
items, etc.) by entering text into the box.

InputBox was originally created by Erik Moeller for the purpose of adding a
Create an article box to Wikinews.

%prep

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox
install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/mediawiki/extensions/InputBox
%doc %{_docdir}/%{name}-%{version}/README.fedora

%changelog
* Mon Apr 20 2009 John Guthrie <guthrie at counterexample.org> - 0-0.2.20090420svn
- Fixed the source URLs and updated to the latest svn version.

* Tue Mar 31 2009 John Guthrie <guthrie at counterexample.org> - 0-0.1.20090331svn
- Initial package build.



From guthrie at fedoraproject.org  Thu Apr 23 19:00:12 2009
From: guthrie at fedoraproject.org (John T. Guthrie III)
Date: Thu, 23 Apr 2009 19:00:12 +0000 (UTC)
Subject: rpms/mediawiki-InputBox/F-9 InputBox.classes.php, NONE,
	1.1 InputBox.hooks.php, NONE, 1.1 InputBox.i18n.php, NONE,
	1.1 InputBox.php, NONE, 1.1 README.fedora, NONE,
	1.1 mediawiki-InputBox.spec, NONE, 1.1
Message-ID: <20090423190012.4BB7E70104@cvs1.fedora.phx.redhat.com>

Author: guthrie

Update of /cvs/extras/rpms/mediawiki-InputBox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7274/F-9

Added Files:
	InputBox.classes.php InputBox.hooks.php InputBox.i18n.php 
	InputBox.php README.fedora mediawiki-InputBox.spec 
Log Message:
Initial import of mediawiki-InputBox package into the F-9, F-10, and F-11
branches.



--- NEW FILE InputBox.classes.php ---
<?php
/**
 * Classes for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox class
class InputBox {

	/* Fields */

	private $mParser;
	private $mType = '';
	private $mWidth = 50;
	private $mPreload = '';
	private $mEditIntro = '';
	private $mSummary = '';
	private $mMinor = '';
	private $mPage = '';
	private $mBR = 'yes';
	private $mDefaultText = '';
	private $mBGColor = 'transparent';
	private $mButtonLabel = '';
	private $mSearchButtonLabel = '';
	private $mFullTextButton = '';
	private $mLabelText = '';
	private $mHidden = '';
	private $mNamespaces = '';
	private $mID = '';
	private $mInline = false;
	private $mPrefix = '';

	/* Functions */

	public function __construct( $parser ) {
		$this->mParser = $parser;
	}

	public function render() {
		// Internationalization
		wfLoadExtensionMessages( 'InputBox' );

		// Handle various types
		switch( $this->mType ) {
			case 'create':
			case 'comment':
				return $this->getCreateForm();
			case 'commenttitle':
				return $this->getCommentForm();
			case 'search':
				return $this->getSearchForm('search');
			case 'fulltext':
				return $this->getSearchForm('fulltext');
			case 'search2':
				return $this->getSearchForm2();
			default:
				return Xml::tags( 'div', null,
					Xml::element( 'strong',
						array(
							'class' => 'error'
						),
						strlen( $this->mType ) > 0
						? wfMsgForContent( 'inputbox-error-bad-type', $this->mType ) 
						: wfMsgForContent( 'inputbox-error-no-type' ) 
					)
				);
		}
	}

	/**
	 * Generate search form
	 * @param $type 
	 */
	public function getSearchForm( $type ) {
		global $wgContLang;

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}
		if ( !$this->mSearchButtonLabel ) {
			$this->mSearchButtonLabel = wfMsgHtml( 'searchfulltext' );
		}

		// Build HTML
		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'searchbox',
				'id' => 'searchbox',
				'class' => 'searchbox',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'class' => 'searchboxInput',
				'name' => 'search',
				'type' => $this->mHidden ? 'hidden' : 'text',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth,
			)
		);
		
		if( $this->mPrefix != '' ){
			$htmlOut .= Xml::element( 'input',
				array(
					'name' => 'prefix',
					'type' => 'hidden',
					'value' => $this->mPrefix,
				)
			);	
		}
		
		$htmlOut .= $this->mBR;

		// Determine namespace checkboxes
		$namespaces = $wgContLang->getNamespaces();
		$namespacesArray = explode( ',', $this->mNamespaces );
		if ( $this->mNamespaces ) {
			foreach ( $namespacesArray as $userNamespace ) {
				$checked = array();
				// Namespace needs to be checked if flagged with "**" or if it's the only one
				if ( strstr( $userNamespace, '**' ) || count( $namespacesArray ) == 1 ) {
					$userNamespace = str_replace( '**', '', $userNamespace );
					$checked = array( 'checked' => 'checked' );
				}

				// Namespace checkboxes
				foreach ( $namespaces as $i => $name ) {
					if ( $i < 0 ) {
						continue;
					} elseif ( $i == 0 ) {
						$name = 'Main';
					}
					if ( $userNamespace == $name ) {
						// Checkbox
						$htmlOut .= Xml::element( 'input',
							array(
								'type' => 'checkbox',
								'name' => 'ns' . $i,
								'value' => 1,
								'id' => 'mw-inputbox-ns' . $i
							) + $checked
						);
						// Label
						$htmlOut .= '&nbsp;' . Xml::label( $userNamespace, 'mw-inputbox-ns' . $i );
					}
				}
			}

			// Line break
			$htmlOut .= $this->mBR;
		} else if( $type == 'search' ) {
			// Go button
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'go',
					'class' => 'searchboxGoButton',
					'value' => $this->mButtonLabel
				)
			);
			$htmlOut .= '&nbsp;';
		}

		// Search button
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'fulltext',
				'class' => 'searchboxSearchButton',
				'value' => $this->mSearchButtonLabel
			)
		);
		
		// Hidden fulltext param for IE (bug 17161)
		if( $type == 'fulltext' ) {
			$htmlOut .= Xml::hidden( 'fulltext', 'Search' );
		}
		
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/*
	 * Generate search form version 2
	 */
	public function getSearchForm2() {

		// Use button label fallbacks
		if ( !$this->mButtonLabel ) {
			$this->mButtonLabel = wfMsgHtml( 'tryexact' );
		}

		$id = Sanitizer::escapeId( $this->mID, 'noninitial' );
		$htmlLabel = '';
		if ( isset( $this->mLabelText ) && strlen( trim( $this->mLabelText ) ) ) {
			$this->mLabelText = $this->mParser->recursiveTagParse( $this->mLabelText );
			$htmlLabel = Xml::openElement( 'label', array( 'for' => 'bodySearchInput' . $id ) );
			$htmlLabel .= $this->mLabelText;
			$htmlLabel .= Xml::closeElement( 'label' );
		}
		$htmlOut = Xml::openElement( 'form',
			array(
				'name' => 'bodySearch' . $id,
				'id' => 'bodySearch' . $id,
				'class' => 'bodySearch',
				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
				'style' => $this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= Xml::openElement( 'div',
			array(
				'class' => 'bodySearchWrap',
				'style' => 'background-color:' . $this->mBGColor . ';' .
					$this->mInline ? 'display: inline;' : ''
			)
		);
		$htmlOut .= $htmlLabel;
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'search',
				'size' => $this->mWidth,
				'id' => 'bodySearchInput' . $id
			)
		);
		$htmlOut .= Xml::element( 'input',
			array(
				'type' => 'submit',
				'name' => 'go',
				'value' => $this->mButtonLabel,
				'class' => 'bodySearchBtnGo' . $id
			)
		);

		// Better testing needed here!
		if ( !empty( $this->mFullTextButton ) ) {
			$htmlOut .= Xml::element( 'input',
				array(
					'type' => 'submit',
					'name' => 'fulltext',
					'class' => 'bodySearchBtnSearch',
					'value' => $this->mSearchButtonLabel
				)
			);
		}

		$htmlOut .= Xml::closeElement( 'div' );
		$htmlOut .= Xml::closeElement( 'form' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Generate create page form
	 */
	public function getCreateForm() {
		global $wgScript;

		if ( $this->mType == "comment" ) {
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
			}
		} else {
			$comment = '';
			if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( 'createarticle' );
			}
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'createbox',
				'id' => 'createbox',
				'class' => 'createbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'summary',
				'value' => $this->mSummary,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'minor',
				'value' => $this->mMinor,
			)
		);
		if ( $this->mType == 'comment' ) {
			$htmlOut .= Xml::openElement( 'input',
				array(
					'type' => 'hidden',
					'name' => 'section',
					'value' => 'new',
				)
			);
		}
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'title',
				'class' => 'createboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'createboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}
	
	/**
	 * Generate new section form
	 */
	public function getCommentForm() {
		global $wgScript;

		if ( !$this->mButtonLabel ) {
				$this->mButtonLabel = wfMsgHtml( "postcomment" );
		}

		$htmlOut = Xml::openElement( 'div',
			array(
				'align' => 'center',
				'style' => 'background-color:' . $this->mBGColor
			)
		);
		$htmlOut .= Xml::openElement( 'form',
			array(
				'name' => 'commentbox',
				'id' => 'commentbox',
				'class' => 'commentbox',
				'action' => $wgScript,
				'method' => 'get'
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'action',
				'value' => 'edit',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'preload',
				'value' => $this->mPreload,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'editintro',
				'value' => $this->mEditIntro,
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => $this->mHidden ? 'hidden' : 'text',
				'name' => 'preloadtitle',
				'class' => 'commentboxInput',
				'value' => $this->mDefaultText,
				'size' => $this->mWidth
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'section',
				'value' => 'new',
			)
		);
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'hidden',
				'name' => 'title',
				'value' => $this->mPage
			)
		);
		$htmlOut .= $this->mBR;
		$htmlOut .= Xml::openElement( 'input',
			array(
				'type' => 'submit',
				'name' => 'create',
				'class' => 'commentboxButton',
				'value' => $this->mButtonLabel
			)
		);
		$htmlOut .= Xml::closeElement( 'form' );
		$htmlOut .= Xml::closeElement( 'div' );

		// Return HTML
		return $htmlOut;
	}

	/**
	 * Extract options from a blob of text
	 *
	 * @param string $text Tag contents
	 */
	public function extractOptions( $text ) {
		wfProfileIn( __METHOD__ );

		// Parse all possible options
		$values = array();
		foreach ( explode( "\n", $text ) as $line ) {
			if ( strpos( $line, '=' ) === false )
				continue;
			list( $name, $value ) = explode( '=', $line, 2 );
			$values[ strtolower( trim( $name ) ) ] = trim( $value );
		}

		// Build list of options, with local member names
		$options = array(
			'type' => 'mType',
			'width' => 'mWidth',
			'preload' => 'mPreload',
			'page' => 'mPage',
			'editintro' => 'mEditIntro',
			'summary' => 'mSummary',
			'minor' => 'mMinor',
			'break' => 'mBR',
			'default' => 'mDefaultText',
			'bgcolor' => 'mBGColor',
			'buttonlabel' => 'mButtonLabel',
			'searchbuttonlabel' => 'mSearchButtonLabel',
			'fulltextbutton' => 'mFullTextButton',
			'namespaces' => 'mNamespaces',
			'labeltext' => 'mLabelText',
			'hidden' => 'mHidden',
			'id' => 'mID',
			'inline' => 'mInline',
			'prefix' => 'mPrefix',
		);
		foreach ( $options as $name => $var ) {
			if ( isset( $values[$name] ) ) {
				$this->$var = $values[$name];
			}
		}

		// Insert a line break if configured to do so
		$this->mBR = ( strtolower( $this->mBR ) == "no" ) ? ' ' : '<br />';

		// Validate the width; make sure it's a valid, positive integer
		$this->mWidth = intval( $this->mWidth <= 0 ? 50 : $this->mWidth );

		wfProfileOut( __METHOD__ );
	}

}


--- NEW FILE InputBox.hooks.php ---
<?php
/**
 * Hooks for InputBox extension
 *
 * @file
 * @ingroup Extensions
 */

// InputBox hooks
class InputBoxHooks {

	/* Functions */

	// Initialization
	public static function register() {
		global $wgParser;

		// Register the hook with the parser
		$wgParser->setHook( 'inputbox', array( 'InputBoxHooks', 'render' ) );

		// Continue
		return true;
	}

	// Render the input box
	public static function render( $input, $args, $parser ) {
		// Create InputBox
		$inputBox = new InputBox( $parser );

		// Configure InputBox
		$inputBox->extractOptions( $parser->replaceVariables( $input ) );

		// Return output
		return $inputBox->render();
	}
}


--- NEW FILE InputBox.i18n.php ---
<?php

/**
 * Messages file for the InputBox extension
 *
 * @addtogroup Extensions
 */

/**
 * Get all extension messages
 *
 * @return array
 */
$messages = array();

$messages['en'] = array(
	'inputbox-desc'           => 'Allow inclusion of predefined HTML forms',
	'inputbox-error-no-type'  => 'You have not specified the type of input box to create.',
	'inputbox-error-bad-type' => 'Input box type "$1" not recognised.
Please specify "create", "comment", "search", "search2" or "fulltext".',
	'tryexact'                => 'Try exact match',
	'searchfulltext'          => 'Search full text',
	'createarticle'           => 'Create page',
);

/** Message documentation (Message documentation)
 * @author Meno25
 * @author SPQRobin
 * @author Siebrand
 */
$messages['qqq'] = array(
	'inputbox-desc' => 'Short description of the Inputbox extension, shown on [[Special:Version]].',
	'inputbox-error-bad-type' => '{{doc-important|"create", "comment", "search", "search2" and "fulltext" should not be translated.}}',
	'tryexact' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. If the page with the exact name exists, you will go directly to that page.',
	'searchfulltext' => 'Part of the "Inputbox" extension. This message is the text of the button to search the page you typed in the inputbox. This button always goes to the search page, even if the page with the exact name exists.',
	'createarticle' => 'Part of the "Inputbox" extension. This message is the text of the button to create the page you typed in the inputbox.',
);

/** Niuean (ko e vagahau Niu??)
 * @author Jose77
 */
$messages['niu'] = array(
	'createarticle' => 'Talaga tohi tala',
);

/** Afrikaans (Afrikaans)
 * @author Naudefj
 */
$messages['af'] = array(
	'inputbox-desc' => 'Laat die insluiting van vooraf gedefinieerde HTML-vorms moontlik',
	'inputbox-error-no-type' => 'U het nie die tipe invoerveld gespesifiseer nie.',
	'inputbox-error-bad-type' => 'Tipe invoerveld "$1" nie herken nie.
Gebruik "create", "comment", "search" of "search2".',
	'tryexact' => 'Soek presiese ooreenkoms',
	'searchfulltext' => 'Deursoek volledige teks',
	'createarticle' => 'Skep bladsy',
);

/** Amharic (????????????)
 * @author Codex Sinaiticus
 */
$messages['am'] = array(
	'createarticle' => '????????? ??????????????? ???????????????',
);

/** Aragonese (Aragon??s)
 * @author Juanpabl
 */
$messages['an'] = array(
	'inputbox-desc' => 'Premite a enclusi??n de formularios HTML predefinitos',
	'inputbox-error-no-type' => 'No ha endicato o tipo de caixa de dentrada que cal creyar.',
	'inputbox-error-bad-type' => 'No se reconoixe o tipo de caixa de dentrada "$1".
Por fabor, espezifique "create", "comment", "search" u "fulltext".',
	'tryexact' => 'Mirar t??tol esauto',
	'searchfulltext' => 'Mirar por testo completo',
	'createarticle' => 'Creyar pachina',
);

/** Arabic (??????????????)
 * @author Meno25
 */
$messages['ar'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? HTML ?????????? ??????????.',
	'inputbox-error-no-type' => '???? ?????? ???????????? ?????? ?????????? ?????????????? ??????????????.',
	'inputbox-error-bad-type' => '?????? ?????????? ?????????????? "$1" ???? ?????? ???????????? ????????.
???? ???????? ?????? "create"?? "comment"?? "search"?? "search2" ???? "fulltext".',
	'tryexact' => '???????? ???? ?????????? ??????????',
	'searchfulltext' => '???????? ???? ???????? ????????????',
	'createarticle' => '?????????? ????????',
);

/** Egyptian Spoken Arabic (????????)
 * @author Ghaly
 * @author Ramsis II
 */
$messages['arz'] = array(
	'inputbox-desc' => '???????? ???????????? ?????????? ?????? ???? ???? ???? ?????????? ???? ??????????',
	'inputbox-error-no-type' => '?????? ???? ?????????? ?????? ?????????? ?????????????? ??????????????',
	'inputbox-error-bad-type' => '???? ???????????????? ?????? ?????? ?????????? ?????????????? "$1"  .
???? ????????  ???????? "create"?? "comment"?? "search" ???? "search2".',
	'tryexact' => '?????? ?????? ?????????? ??????????',
	'searchfulltext' => '?????? ???? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Assamese (??????????????????)
 * @author Rajuonline
 */
$messages['as'] = array(
	'tryexact' => '???????????? ??????????????? ?????????????????? ?????????????????????',
	'searchfulltext' => '???????????????????????? ??????????????? ?????????????????????',
	'createarticle' => '?????????????????? ???????????????',
);

/** Asturian (Asturianu)
 * @author Esbardu
 */
$messages['ast'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios HTML predefin??os',
	'inputbox-error-no-type' => "Nun especificasti la triba de caxellu d'entrada pa crear.",
	'inputbox-error-bad-type' => "Triba de caxa d'entrada $1 non reconocida. Por favor conse??a la opci??n ''create'', ''comment'', ''search'' o ''search2''.",
	'tryexact' => 'Intentar concueyar exautamente',
	'searchfulltext' => 'Buscar testu completu',
	'createarticle' => 'Crear p??xina',
);

/** Azerbaijani (Az??rbaycan) */
$messages['az'] = array(
	'createarticle' => 'M??qal?? yarat',
);

/** Samogitian (??emait????ka)
 * @author Hugo.arg
 */
$messages['bat-smg'] = array(
	'searchfulltext' => '??i??kuot?? p??lna teksta',
);

/** Southern Balochi (?????????? ????????????)
 * @author Mostafadaneshvar
 */
$messages['bcc'] = array(
	'inputbox-desc' => '?????????? ???????? ???? ?????? ?????? ?????? ?????? HTML ???? ?????? ?????????? ????????????',
	'inputbox-error-no-type' => '?????? ?????? ???????? ?????????? ???? ?????????? ???????? ???? ??????',
	'inputbox-error-bad-type' => '?????? ???????? ?????????? "$1"  ?????? ?????? ???? ??????.
???????? ???????? ????????  "??????????", "??????", "????????" ???? "????????2".',
	'tryexact' => '?????????? ???????? ???????????? ????',
	'searchfulltext' => '?????? ???????? ??????',
	'createarticle' => '?????????? ????????',
);

/** Belarusian (????????????????????) */
$messages['be'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Belarusian (Tara??kievica orthography) (???????????????????? (??????????????????????))
 * @author EugeneZelenko
 * @author Jim-by
 * @author Red Winged Duck
 */
$messages['be-tarask'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????? ???????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ?????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '???????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ?????????????????? ???????????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ???? ??fulltext??.',
	'tryexact' => '???????????????????????? ???????????????? ??????????',
	'searchfulltext' => '???????????? ?????????? ??????????',
	'createarticle' => '???????????????? ????????????????',
);

/** Bulgarian (??????????????????)
 * @author DCLXVI
 * @author Spiritia
 */
$messages['bg'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????? ???? HTML ??????????????????.',
	'inputbox-error-no-type' => '???? ???? ???????????????? ???????? ???? ?????????????? ???? ????????, ?????????? ???? ???????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???$1??? ???? ?????????????? ???? ????????.
????????, ???????????????? ???create???, ???comment???, ???search??? ?????? ???search2???.',
	'tryexact' => '?????????? ?? ?????????? ????????????????????',
	'searchfulltext' => '?????????????????????? ???? ?????????? ??????????',
	'createarticle' => '??????????????????',
);

/** Bislama (Bislama)
 * @author Ushanka
 */
$messages['bi'] = array(
	'createarticle' => 'Mekem atikel',
);

/** Bengali (???????????????)
 * @author Bellayet
 * @author Zaheen
 */
$messages['bn'] = array(
	'inputbox-desc' => '????????????????????????????????????????????? ??????????????????????????? ?????????????????? ???????????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '???????????? ??????????????? ???????????? ??????????????? ???????????? ??????????????? ?????????????????? ????????? ???????????????????????? ?????????????????????',
	'inputbox-error-bad-type' => '"$1" ??????????????? ??????????????? ???????????? ???????????? ???????????? ????????? "create", "comment", "search" ???????????? "search2" ???????????????????????? ???????????????',
	'tryexact' => '????????? ?????? ??????????????? ????????????????????? ?????????',
	'searchfulltext' => '?????? ???????????????????????????????????? ??????????????????',
	'createarticle' => '?????????????????? ???????????? ?????????',
);

/** Bakhtiari (??????????????)
 * @author Behdarvandyani
 */
$messages['bqi'] = array(
	'inputbox-desc' => '?????????? ?????????????? ???? ??????????????? HTML ???????? ?????????? ???????????? ???? ??????',
	'inputbox-error-no-type' => '?????? ???????? ??????????  ???????? ?????????? ???? ?????????? ????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???? ???????? ?????????? ???????????? ????. ?????????? ?????? ???? ?????????? 
"create", "comment", "search" or "search2" ???? ???????? ????????.',
	'tryexact' => '?????????? ???????? ???? ???????? ???? ???????????? ????',
	'searchfulltext' => '???????????? ?????? ??????',
	'createarticle' => '???????? ???????? ????????',
);

/** Breton (Brezhoneg)
 * @author Fulup
 */
$messages['br'] = array(
	'inputbox-desc' => 'Aotren a ra degas furmskrido?? HTML raktermenet.',
	'inputbox-error-no-type' => "N'eo ket bet spisaet ganeoc'h ar seurt boest enmont da veza?? krouet",
	'inputbox-error-bad-type' => 'N\'eo ket anavaezet ar seurt boest enmont "$1".
Spisait "create", "comment", "search" pe "search2".',
	'tryexact' => 'Klask ma klotfe rik',
	'searchfulltext' => 'Klask an destenn a-bezh',
	'createarticle' => 'Kroui?? ar pennad',
);

/** Bosnian (Bosanski)
 * @author CERminator
 */
$messages['bs'] = array(
	'inputbox-desc' => 'Omogu??uje uklju??ivanje prethodno napravljenih HTML obrazaca',
	'inputbox-error-no-type' => 'Niste odredili tip kutije za unos koju pravite.',
	'inputbox-error-bad-type' => 'Tip kutije unosa "$1" nije prepoznat.
Molimo odredite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Isprobaj na??i ta??an upit',
	'searchfulltext' => 'Pretra??i cijeli tekst',
	'createarticle' => 'Napravi stranicu',
);

/** Catalan (Catal??)
 * @author Paucabot
 * @author SMP
 * @author Toniher
 */
$messages['ca'] = array(
	'inputbox-desc' => 'Permet la inclusi?? de formularis HTML predefinits',
	'inputbox-error-no-type' => "No heu especificat el tipus de quadre d'entrada per crear.",
	'inputbox-error-bad-type' => "El tipus de quadre d'entrada ??$1?? no est?? reconegut.

Especifiqueu-hi ??create??, ??comment??, ??search??, ??search2?? o ??fulltext??.",
	'tryexact' => 'Prova una coincid??ncia exacta',
	'searchfulltext' => 'Cerca un text sencer',
	'createarticle' => 'Crea una p??gina',
);

/** Min Dong Chinese (M??ng-d????ng-ng?????) */
$messages['cdo'] = array(
	'createarticle' => 'K??i hi??k',
);

/** Corsican (Corsu) */
$messages['co'] = array(
	'searchfulltext' => 'Ricerca testu cumplettu',
	'createarticle' => "Cre?? l'articulu",
);

/** Crimean Turkish (Latin) (Q??r??mtatarca (Latin))
 * @author Alessandro
 */
$messages['crh-latn'] = array(
	'createarticle' => 'Saifeni ya??art',
);

/** Crimean Turkish (Cyrillic) (Q??r??mtatarca (Cyrillic))
 * @author Alessandro
 */
$messages['crh-cyrl'] = array(
	'createarticle' => '?????????????? ????????????',
);

/** Czech (??esky)
 * @author Danny B.
 * @author Li-sung
 */
$messages['cs'] = array(
	'inputbox-desc' => 'Umo????uje vkl??dat ur??it?? HTML formul????e.',
	'inputbox-error-no-type' => 'Nen?? ur??en typ formul????ov??ho pole k vytvo??en??.',
	'inputbox-error-bad-type' => 'Nerozpoznan?? typ pole ???$1???.
Uve??te jednu z mo??nost??: ???create???, ???comment???, ???search???, ???search2??? nebo ???fulltext???.',
	'tryexact' => 'Vyzkou??et p??esn?? hled??n??',
	'searchfulltext' => 'Plnotextov?? hled??n??',
	'createarticle' => 'Vytvo??it ??l??nek',
);

/** Chuvash (??????????????) */
$messages['cv'] = array(
	'createarticle' => '???????? ???????????? ??????',
);

/** Welsh (Cymraeg)
 * @author Lloffiwr
 */
$messages['cy'] = array(
	'inputbox-desc' => "Yn caniatau creu blychau mewnbynnu sy'n cynnwys ffurflenni HTML wedi eu gosod yn barod i'w defnyddio",
	'inputbox-error-no-type' => "Nid ydych wedi pennu'r math o flwch mewnbynnu yr ydych am ei greu.",
	'inputbox-error-bad-type' => 'Nid yw\'r gair "$1" ar y math o flwch mewnbynnu yn ddealladwy gan y meddalwedd.
Dewiswch rhwng "create", "comment", "search" a "search2" neu "fulltext".',
	'tryexact' => 'Chwilio am yr union gymal',
	'searchfulltext' => "Chwilio'r testun cyfan",
	'createarticle' => "Creu'r dudalen",
);

/** Danish (Dansk)
 * @author Byrial
 */
$messages['da'] = array(
	'inputbox-desc' => 'Muligg??r inkludering af forh??ndsdefinerede HTML-formularer',
	'inputbox-error-no-type' => 'Du har ikke angivet type i inputboksen som skal laves.',
	'inputbox-error-bad-type' => 'Inputboks-type "$1" kendes ikke.
V??lg venligst "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'G?? til siden',
	'searchfulltext' => 'S??g efter teksten',
	'createarticle' => 'Opret side',
);

/** German (Deutsch)
 * @author Metalhead64
 * @author Raimond Spekking
 * @author Umherirrender
 */
$messages['de'] = array(
	'inputbox-desc' => 'Erlaubt die Einbindung vordefinierter HTML-Formulare',
	'inputbox-error-no-type' => 'Du hast keinen Eingabefeld-Typ angegeben.',
	'inputbox-error-bad-type' => 'Eingabefeld-Typ ???$1??? unbekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? angeben.',
	'tryexact' => 'Versuche exakte Suche',
	'searchfulltext' => 'Gesamten Text durchsuchen',
	'createarticle' => 'Seite anlegen',
);

/** German (formal address) (Deutsch (Sie-Form))
 * @author Umherirrender
 */
$messages['de-formal'] = array(
	'inputbox-error-no-type' => 'Sie haben keinen Eingabefeld-Typ angegeben.',
);

/** Lower Sorbian (Dolnoserbski)
 * @author Michawiki
 * @author Pe7er
 */
$messages['dsb'] = array(
	'inputbox-desc' => 'Zap????gnjenje p??eddefin??rowanych HTML-formularow dow??li??',
	'inputbox-error-no-type' => 'Njejsy p??da?? typ zap??dawa??skego p??la za nap??ranje.',
	'inputbox-error-bad-type' => 'Zap??dawa??ske p??lo typa "$1" njesp??znane.
P??osym p??daj "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Naw??os pyta??:',
	'searchfulltext' => 'Ce??y tekst pyta??',
	'createarticle' => 'Nastawk natwori??',
);

/** Divehi (????????????????????)
 * @author Spacebirdy
 */
$messages['dv'] = array(
	'createarticle' => '???????????????????? ????????????????',
);

/** Ewe (E??egbe) */
$messages['ee'] = array(
	'createarticle' => 'Dze nu??????l?? yeye g??me',
);

/** Greek (????????????????)
 * @author Dead3y3
 */
$messages['el'] = array(
	'inputbox-desc' => '?????????????????? ?????? ???????????????? ?????????????????????????????? ???????????? HTML',
	'inputbox-error-no-type' => '?????? ?????????? ?????????????????? ?????? ???????? ?????? ?????????????? ?????????????? ???????? ????????????????????.',
	'inputbox-error-bad-type' => '?????????? ?????????????? ?????????????? "$1" ?????? ??????????????????????????.<br />
???????????????? ???????????? "create", "comment", "search", "search2" ?? "fulltext".',
	'tryexact' => '?????????????????? ?????? ???????????????? ??????????????????????.',
	'searchfulltext' => '?????????????????? ???? ???? ???????????? ??????????????',
	'createarticle' => '???????????????????? ??????????????',
);

/** Esperanto (Esperanto)
 * @author Yekrats
 */
$messages['eo'] = array(
	'inputbox-desc' => 'Permesi enhavon de anta??difinitaj HTML-kamparoj',
	'inputbox-error-no-type' => 'Vi ne enigis la specon de enigo-kesto por krei.',
	'inputbox-error-bad-type' => 'Enigo-kesto "$1" ne estas konata.
Bonvolu specifigi keston "krea", "komenta", "ser??a", "ser??a2", a?? "plenateksa".',
	'tryexact' => 'Provu ekzaktan trafon',
	'searchfulltext' => 'Ser??i plentekste',
	'createarticle' => 'Krei artikolon',
);

/** Spanish (Espa??ol)
 * @author Crazymadlover
 * @author Icvav
 * @author Muro de Aguas
 * @author Sanbec
 */
$messages['es'] = array(
	'inputbox-desc' => 'Permite la inclusi??n de formularios en HTML predefinidos.',
	'inputbox-error-no-type' => 'No has especificado el tipo de formulario que vas a crear.',
	'inputbox-error-bad-type' => 'No se reconoce el tipo de caja de entrada ??$1??.
Por favor, especifica ??create??, ??comment??, ??search?? ??search2?? o "fulltext".',
	'tryexact' => 'Buscar t??tulo exacto',
	'searchfulltext' => 'Buscar por texto completo',
	'createarticle' => 'Crear art??culo',
);

/** Estonian (Eesti)
 * @author Avjoska
 * @author Jaan513
 */
$messages['et'] = array(
	'tryexact' => 'Proovi t??pset vastet',
	'searchfulltext' => 'Otsi t??isteksti',
	'createarticle' => 'Alusta lehek??lge',
);

/** Basque (Euskara) */
$messages['eu'] = array(
	'tryexact' => 'Izenburu zehatza bilatu',
	'searchfulltext' => 'Testu osoa bilatu',
	'createarticle' => 'Artikulua sortu',
);

/** Extremaduran (Estreme??u) */
$messages['ext'] = array(
	'createarticle' => 'Creal art??culu',
);

/** Persian (??????????)
 * @author Huji
 */
$messages['fa'] = array(
	'inputbox-desc' => '???????????? ?????????????? ???? ??????????????? HTML ???? ?????? ?????????? ?????? ???? ?????????????',
	'inputbox-error-no-type' => '?????? ?????????? ??????????  ???????????????????? ???? ???????? ???????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????? ?????????? ?????????? ???????????? ?????? ????????.
?????????? ?????? ???? ?????????? ??create???? ??comment???? ??search???? ??search2?? ???? ??fulltext?? ???? ???????? ????????.',
	'tryexact' => '???????????? ???????? ???? ???????? ???? ????????????',
	'searchfulltext' => '???????????? ???? ??????',
	'createarticle' => '?????????? ??????????',
);

/** Finnish (Suomi)
 * @author Crt
 * @author Nike
 */
$messages['fi'] = array(
	'inputbox-desc' => 'Mahdollistaa ennalta m????riteltyjen lomakkeiden sis??llytt??misen sivuille.',
	'inputbox-error-no-type' => 'Et m????ritellyt sy??tekent??n tyyppi??.',
	'inputbox-error-bad-type' => 'Sy??tekent??n tyyppi ???$1??? ei kelpaa.
Sallittuja arvoja ovat create, comment, search, search2 ja fulltext.',
	'tryexact' => 'Yrit?? tarkkaa osumaa',
	'searchfulltext' => 'Etsi koko teksti??',
	'createarticle' => 'Luo sivu',
);

/** Faroese (F??royskt) */
$messages['fo'] = array(
	'createarticle' => 'Stovna grein',
);

/** French (Fran??ais)
 * @author Crochet.david
 * @author IAlex
 * @author Sherbrooke
 */
$messages['fr'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formulaires HTML pr??d??finis.',
	'inputbox-error-no-type' => 'Vous n???avez pas pr??cis?? le type de la bo??te d???entr??e ?? cr??er.',
	'inputbox-error-bad-type' => 'Type de bo??te entr??e ?? $1 ?? non reconnue.
Indiquez une option parmis ?? create ??, ?? comment ??, ?? search ??, ?? searche2 ?? ou ?? fulltext ??.',
	'tryexact' => 'Essayez la correspondance exacte.',
	'searchfulltext' => 'Recherche en texte int??gral',
	'createarticle' => 'Cr??er la page',
);

/** Franco-Proven??al (Arpetan)
 * @author ChrisPtDe
 */
$messages['frp'] = array(
	'inputbox-desc' => 'P??rm??t l???encllusion de formul??ros HTML pr??d??fenis.',
	'inputbox-error-no-type' => 'Vos ??d pas sp??cefi?? lo tipo de la bou??ta d???entr?? a cr??ar.',
	'inputbox-error-bad-type' => "Tipo de bou??ta d???entr?? ?? $1 ?? pas recognu. Endic??d lo chou??x ''create'', ''comment'', ''search'' ou ben ''searche2''.",
	'tryexact' => '??prov??d la corr??spondance ??gzacta.',
	'searchfulltext' => 'Rech??rche en t??xte compl??t',
	'createarticle' => 'Cr??ar l???articllo',
);

/** Friulian (Furlan)
 * @author Klenje
 */
$messages['fur'] = array(
	'tryexact' => 'C??r une corispondence esate',
	'searchfulltext' => 'C??r in dut il test',
	'createarticle' => 'Cree v??s',
);

/** Western Frisian (Frysk)
 * @author Snakesteuben
 */
$messages['fy'] = array(
	'createarticle' => 'Side oanmeitsje',
);

/** Irish (Gaeilge) */
$messages['ga'] = array(
	'tryexact' => 'D??an iarracht ar meaitse??il cruinn',
	'searchfulltext' => 'Cuardaigh sa t??acs ioml??n',
	'createarticle' => 'Cruthaigh alt',
);

/** Galician (Galego)
 * @author Alma
 * @author Toli??o
 */
$messages['gl'] = array(
	'inputbox-desc' => 'Permitir a inclusi??n de formularios predefinidos de HTML',
	'inputbox-error-no-type' => 'Non se especificou o tipo de caixa de entrada para crear.',
	'inputbox-error-bad-type' => 'O tipo de caixa de entrada "$1" non foi reco??ecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar coincidencias exactas',
	'searchfulltext' => 'Buscar o texto completo',
	'createarticle' => 'Crear a p??xina',
);

/** Ancient Greek (????????????? ??????????????????)
 * @author Omnipaedista
 */
$messages['grc'] = array(
	'inputbox-desc' => '????????????????????? ??????? ???????????????????? ?????????????????????????????? ????????????? HTML',
	'inputbox-error-no-type' => '??????? ????????????? ??????? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ??????????????????.',
	'inputbox-error-bad-type' => '??? ?????????? ??????? ???????????????????? ???????????? ????????????????????? ?????????????????? "$1" ????????????????????????????? ??????? ???????????.
?????????????????? "create", "comment", "search", "search2" ??? "fulltext".',
	'tryexact' => '???????????????? ??????? ?????????????? ?????????????????????????',
	'searchfulltext' => '????????????? ????? ????? ???????????? ???????????????',
	'createarticle' => '???????????? ??????????????????????????',
);

/** Swiss German (Alemannisch)
 * @author Als-Chl??mens
 * @author Als-Holder
 */
$messages['gsw'] = array(
	'inputbox-desc' => 'Erlaubt d Yybindig vu vordefinierte HTML-Formular',
	'inputbox-error-no-type' => 'Du hesch kei Yygabf??ld-Typ aagee.',
	'inputbox-error-bad-type' => 'Yygabf??ld-Typ ???$1??? nit bekannt.
Bitte ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext??? aagee.',
	'tryexact' => 'Versuech es mitenere exakte Suech',
	'searchfulltext' => 'De gsamti Teggscht durchsueche',
	'createarticle' => 'Syte aalaie',
);

/** Gujarati (?????????????????????)
 * @author Dsvyas
 */
$messages['gu'] = array(
	'createarticle' => '????????? ????????? ????????? ?????????',
);

/** Manx (Gaelg)
 * @author MacTire02
 */
$messages['gv'] = array(
	'createarticle' => 'Croo duillag',
);

/** Hakka (Hak-k??-fa)
 * @author Hakka
 */
$messages['hak'] = array(
	'tryexact' => 'S??ng-chh??? ch??n-khok phit-phi',
	'searchfulltext' => 'Chhi??n v??n-ki??m chh??m-ch??u',
	'createarticle' => 'Kien-li??p v??n-ch??ng',
);

/** Hebrew (??????????)
 * @author Rotem Liss
 */
$messages['he'] = array(
	'inputbox-desc' => '???????????? ???????????? ?????????? HTML ?????????????? ????????',
	'inputbox-error-no-type' => '???? ???????????? ???? ?????? ???????? ???????? ????????????.',
	'inputbox-error-bad-type' => '?????? ???????? ???????? "$1" ???????? ????????.
?????? ?????????? "create", "comment", "search", "search2" ???? "fulltext".',
	'tryexact' => '?????? ?????? ????',
	'searchfulltext' => '?????????? ?????????? ??????????',
	'createarticle' => '?????????? ??????',
);

/** Hindi (??????????????????)
 * @author Kaustubh
 */
$messages['hi'] = array(
	'inputbox-desc' => '?????????????????? ???????????? ????????? HTML ??????????????? ???????????????????????? ???????????? ?????? ?????????????????? ?????????',
	'inputbox-error-no-type' => '??????????????? ??????????????? ??????????????? ?????? ???????????? ???????????? ???????????? ?????????????????? ??????????????? ???????????? ????????????',
	'inputbox-error-bad-type' => '??????????????? ??????????????? ?????? "$1" ?????? ?????????????????? ???????????? ???????????? ????????????
??????????????? "create", "comment", "search" ?????? ????????? "search2" ????????? ?????? ?????? ??????????????????',
	'tryexact' => '???????????? ????????? ?????????????????? ???????????????',
	'searchfulltext' => '???????????? ????????? ???????????????',
	'createarticle' => '????????? ?????????????????????',
);

/** Fiji Hindi (Latin) (Fiji Hindi (Latin))
 * @author Thakurji
 */
$messages['hif-latn'] = array(
	'inputbox-desc' => 'Predefined HTML forms ke allow karo',
	'inputbox-error-no-type' => 'Aap ii nai bataya hai ki kon rakam ke input box ke banae ke chaahi',
	'inputbox-error-bad-type' => 'Input box type "$1" ke pehchana nai gais hai.
Meharbani kar kr ii batao ki "create", "comment", "search", "search2" nai to "fulltext" hai.',
	'tryexact' => 'Exact match ke try karo',
	'searchfulltext' => 'Puura text me khojo',
	'createarticle' => 'Panna banao',
);

/** Hiligaynon (Ilonggo)
 * @author Jose77
 */
$messages['hil'] = array(
	'createarticle' => 'Maghimo artikulo',
);

/** Croatian (Hrvatski)
 * @author Brest
 * @author Dnik
 * @author SpeedyGonsales
 */
$messages['hr'] = array(
	'inputbox-desc' => 'Dozvoli uklju??ivanje predefiniranih obrazaca u HTML-u',
	'inputbox-error-no-type' => 'Niste naveli tip ulaznog polja koje ??elite stvoriti.',
	'inputbox-error-bad-type' => 'Tip ulaznog polja "$1" nije prepoznat. 
Molimo navedite "create", "comment", "search", "search2" ili "fulltext".',
	'tryexact' => 'Poku??aj na??i to??an pogodak',
	'searchfulltext' => 'Tra??i po cjelokupnom tekstu',
	'createarticle' => 'Stvori ??lanak',
);

/** Upper Sorbian (Hornjoserbsce)
 * @author Dundak
 * @author Michawiki
 */
$messages['hsb'] = array(
	'inputbox-desc' => 'Zap??ije??e p??eddefinowanych HTML-formularow dowoli??.',
	'inputbox-error-no-type' => 'Njesy typ zapodatneho ka????ika poda??.',
	'inputbox-error-bad-type' => 'Typ zapodatneho ka????ika "$1" je njeznaty. Pro??u podaj p??a??iwy typ: "create", "comment", "search", "search2" abo "fulltext".',
	'tryexact' => 'Dok??adne pytanje spyta??',
	'searchfulltext' => 'Dospo??ny tekst pyta??',
	'createarticle' => 'Nastawk wutwori??',
);

/** Haitian (Krey??l ayisyen)
 * @author Masterches
 */
$messages['ht'] = array(
	'inputbox-desc' => 'Ap p??m??t ou mete f??mil?? HTML yo ki ja defini.',
	'inputbox-error-no-type' => 'Atansyon, ou pa bay detay sou tip, kalite bwat antre pou ou kreye',
	'inputbox-error-bad-type' => "Kalite bwat antre $1 pa bon, sist??m an pa konnen l. Mete opsyon sa ''create (kreye)'', ''comment (komante)'', ''search (chache, fouye)'' ou ''searche2''.",
	'tryexact' => 'Eseye yon korespondans egzakt, toutbon.',
	'searchfulltext' => 'Chache, fouye ak opsyon t??ks entegral; wap pran an konsiderasyon tout mo ki nan demann ou an',
	'createarticle' => 'Kreye atik sa',
);

/** Hungarian (Magyar)
 * @author Dani
 * @author KossuthRad
 * @author Tgr
 */
$messages['hu'] = array(
	'inputbox-desc' => 'Lehet??v?? teszi el??re megadott HTML-??rlapok beilleszt??s??t',
	'inputbox-error-no-type' => 'Nem adtad meg, hogy milyen t??pus?? beviteli mez??t akarsz k??sz??teni.',
	'inputbox-error-bad-type' => '???$1??? t??pus?? beviteli mez?? nem ismert. ???create???, ???comment???, ???search??? vagy ???search2??? egyik??t add meg.',
	'tryexact' => 'Ugr??s a sz??cikkre',
	'searchfulltext' => 'Keres??s a teljes sz??vegben',
	'createarticle' => 'Sz??cikk l??trehoz??sa',
);

/** Armenian (??????????????) */
$messages['hy'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Interlingua (Interlingua)
 * @author McDutchie
 */
$messages['ia'] = array(
	'inputbox-desc' => 'Permitter le inclusion de formularios HTML predefinite',
	'inputbox-error-no-type' => 'Tu non ha specificate le typo de quadro de entrata a crear.',
	'inputbox-error-bad-type' => 'Le typo de quadro de entrata "$1" non es recognoscite.
Per favor specifica "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Provar correspondentia exacte',
	'searchfulltext' => 'Cercar in texto integre',
	'createarticle' => 'Crear pagina',
);

/** Indonesian (Bahasa Indonesia)
 * @author IvanLanin
 */
$messages['id'] = array(
	'inputbox-desc' => 'Memungkinkan penggunaan form HTML yang telah ditentukan',
	'inputbox-error-no-type' => 'Anda harus menentukan tipe kotak input yang ingin dibuat.',
	'inputbox-error-bad-type' => 'Tipe kotak input "$1" tak dikenal. Tolong gunakan "create", "comment", "search" atau "search2".',
	'tryexact' => 'Coba pencocokan eksak',
	'searchfulltext' => 'Cari di teks lengkap',
	'createarticle' => 'Buat artikel',
);

/** Iloko (Ilokano) */
$messages['ilo'] = array(
	'createarticle' => 'Mangaramid iti articulo',
);

/** Ido (Ido)
 * @author Malafaya
 */
$messages['io'] = array(
	'searchfulltext' => 'Serchar tota texto',
	'createarticle' => 'Krear pagino',
);

/** Icelandic (??slenska)
 * @author S.??rvarr.S
 */
$messages['is'] = array(
	'createarticle' => 'B??a til s????u',
);

/** Italian (Italiano)
 * @author BrokenArrow
 * @author Darth Kule
 */
$messages['it'] = array(
	'inputbox-desc' => "Consente l'inserimento di moduli HTML predefiniti",
	'inputbox-error-no-type' => 'Non ?? stato specificato il tipo di inputbox da creare.',
	'inputbox-error-bad-type' => '"$1" non ?? un tipo di inputbox riconosciuto. Scegliere il tipo tra "create", "comment", "search", "search2" e "fulltext".',
	'tryexact' => 'Cerca corrispondenza esatta',
	'searchfulltext' => 'Ricerca nel testo',
	'createarticle' => 'Crea voce',
);

/** Japanese (?????????)
 * @author Fryed-peach
 * @author JtFuruhata
 */
$messages['ja'] = array(
	'inputbox-desc' => '??????????????????????????????HTML????????????????????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ????????????????????????????????????????????????????????????????????????"create"???"comment"???"search"???"search2"???"fulltext" ????????????????????????',
	'tryexact' => '???????????????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Jutish (Jysk)
 * @author Husl??ke
 */
$messages['jut'] = array(
	'inputbox-desc' => 'Tilst??n der inklusje der pr??d??fiini??rn HTML f??rmer',
	'inputbox-error-no-type' => 'Du harst ekke sp??sifi??rn ?? type der input boks til skep.',
	'inputbox-error-bad-type' => 'Input boks type "$1" ekke herkonnen. Sp??sifi??r "skep", "bim??rkenge", "s????" ??ller "s????2".',
	'tryexact' => 'F??rs???? eksakt s????nenge:',
	'searchfulltext' => "Gennems????e'n h??le tekster",
	'createarticle' => '??prette side',
);

/** Javanese (Basa Jawa)
 * @author Meursault2004
 */
$messages['jv'] = array(
	'inputbox-desc' => 'Ngidinak?? nganggo formulir HTML sing wis ditemtokak??',
	'inputbox-error-no-type' => 'Panjenengan durung nemtokak?? tipe kothak input sing arep digaw??.',
	'inputbox-error-bad-type' => 'Tipe kothak input "$1" ora ditepungi.
Tulung nganggoa "create", "comment", "search" utawa "search2".',
	'tryexact' => 'Cobanen pancocogan ??ksak',
	'searchfulltext' => 'Gol??k ing t??ks jangkep',
	'createarticle' => 'Damel artikel',
);

/** Georgian (?????????????????????)
 * @author Alsandro
 */
$messages['ka'] = array(
	'tryexact' => '??????????????? ??????????????? ???????????????????????????',
	'searchfulltext' => '??????????????? ????????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Kara-Kalpak (Qaraqalpaqsha) */
$messages['kaa'] = array(
	'createarticle' => 'Bet jarat??w',
);

/** Kabyle (Taqbaylit)
 * @author Agurzil
 */
$messages['kab'] = array(
	'tryexact' => 'Nadi ??ef uzwel kif-kif',
	'searchfulltext' => 'Nadi a???ris ettmam',
	'createarticle' => 'Xleq amagrad',
);

/** Kazakh (Arabic script) (????????????????? (??????????)???) */
$messages['kk-arab'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Cyrillic) (?????????????? (Cyrillic)) */
$messages['kk-cyrl'] = array(
	'inputbox-error-no-type' => '?????????????????? ???????????? ?????????????????? ?????????? ????????????????????????.',
	'inputbox-error-bad-type' => '???????????? ???????????????? ??$1?? ???????? ??????????????????. ?????? ??create??, ??comment??, ??search?? ???? ??search2?? ?????????? ???????????????? ????????????????????.',
	'tryexact' => '?????? ???????????????? ?????????? ??????????????',
	'searchfulltext' => '?????????? ?????????????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Kazakh (Latin) (?????????????? (Latin)) */
$messages['kk-latn'] = array(
	'inputbox-error-no-type' => 'Jasalat??n engizw jola????n???? t??rin keltirmepsiz.',
	'inputbox-error-bad-type' => 'Engizw jolaqt???? ??$1?? t??ri tan??lmad??. Tek ??create??, ??comment??, ??search?? ne ??search2?? degen t??rlerdi keltiri??iz.',
	'tryexact' => 'D??l s????kesin s??nap k??ri??iz',
	'searchfulltext' => 'Tol??q m??tinimen izdew',
	'createarticle' => 'Betti bastaw',
);

/** Khmer (???????????????????????????)
 * @author Chhorran
 * @author Lovekhmer
 * @author T-Rithy
 */
$messages['km'] = array(
	'inputbox-error-no-type' => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Korean (?????????)
 * @author Albamhandae
 * @author Klutzy
 * @author Kwj2772
 * @author ToePeu
 */
$messages['ko'] = array(
	'inputbox-desc' => '?????? ????????? HTML ?????? ????????? ??? ?????? ??? ???',
	'inputbox-error-no-type' => 'type ????????? ????????? ???????????????.',
	'inputbox-error-bad-type' => '"$1"???(???) ????????? ??? ?????? type ???????????????.
"create", "comment", "search", "search2", "fulltext" ??? ????????? ???????????????.',
	'tryexact' => '????????? ???????????? ??????',
	'searchfulltext' => '?????? ??? ??????',
	'createarticle' => '?????? ?????????',
);

/** Ripoarisch (Ripoarisch)
 * @author Purodha
 */
$messages['ksh'] = array(
	'inputbox-desc' => 'Bestemmpte HTML-Formulare k??nne hee met enjebonge w????de.',
	'inputbox-error-no-type' => 'Wat f??r en Zoot Kaste wells De dann han?',
	'inputbox-error-bad-type' => 'De Zoot ???$1??? f??r et Feld f??r jet enzejevve kenne mer nit, De moss schunn ???create???, ???comment???, ???search???, ???search2???, udder ???fulltext??? dof??r aanjevve.',
	'tryexact' => 'Vers??k en akkurate ??vvereinstimmung:',
	'searchfulltext' => 'S??k durch d?? janze Tex',
	'createarticle' => 'Sigg aanl????je',
);

/** Kurdish (Latin) (Kurd?? / ?????????? (Latin)) */
$messages['ku-latn'] = array(
	'createarticle' => 'Gotar?? biafir??ne',
);

/** Latin (Latina) */
$messages['la'] = array(
	'createarticle' => 'Paginam creare',
);

/** Luxembourgish (L??tzebuergesch)
 * @author Robby
 */
$messages['lb'] = array(
	'inputbox-desc' => "Erlaabt d'Af??ge vu viirdefin??ierten HTML-Formulairen",
	'inputbox-error-no-type' => 'Dir hutt den Typ vu K??scht fir eppes anzeginn net uginn.',
	'tryexact' => 'Versicht et matt der preziser Sich:',
	'searchfulltext' => 'Am ganzen Text sichen',
	'createarticle' => 'S??it ulee??n',
);

/** Lingua Franca Nova (Lingua Franca Nova)
 * @author Malafaya
 */
$messages['lfn'] = array(
	'createarticle' => 'Crea paje',
);

/** Ganda (Luganda) */
$messages['lg'] = array(
	'createarticle' => 'Wandika omuko',
);

/** Limburgish (Limburgs)
 * @author Matthias
 * @author Ooswesthoesbes
 */
$messages['li'] = array(
	'inputbox-desc' => "Maakt 't toevoege van veurgedefinieerde HTML-formuliere meugelijk",
	'inputbox-error-no-type' => "U heeft 't type inputbox neet aangegeve. Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] veur meer informatie.",
	'inputbox-error-bad-type' => 'Inputbox-type "$1" neet herkend. 
Gebroek "create", "comment", "search", "search2" ??f "fulltext".',
	'tryexact' => 'Perbeer exacte euvereinkoms',
	'searchfulltext' => 'Zeuk d??r volledige t??ks',
	'createarticle' => "Maak 'ne pazjena aan",
);

/** Lingala (Ling??la)
 * @author Moyogo
 */
$messages['ln'] = array(
	'createarticle' => 'Kokela ekakoli',
);

/** Lao (?????????)
 * @author Tuinui
 */
$messages['lo'] = array(
	'tryexact' => '??????',
	'searchfulltext' => '???????????????',
	'createarticle' => '?????????????????????????????????',
);

/** Lithuanian (Lietuvi??) */
$messages['lt'] = array(
	'tryexact' => 'M??ginti tiksl?? atitikim??',
	'searchfulltext' => 'Ie??koti pilno teksto',
	'createarticle' => 'Kurti straipsn??',
);

/** Latvian (Latvie??u)
 * @author Xil
 * @author Yyy
 */
$messages['lv'] = array(
	'inputbox-error-no-type' => 'Tu neesi nor??d??jis ievades lauka tipu',
	'inputbox-error-bad-type' => 'Ievades lauka tips "$1" nav atpaz??ts.
L??dzu nor??di "create", "comment", "search", "search2" vai "fulltext".',
	'tryexact' => 'Mekl??t prec??zi',
	'searchfulltext' => 'Mekl??t visu tekstu',
	'createarticle' => 'Izveidot lapu',
);

/** Literary Chinese (??????) */
$messages['lzh'] = array(
	'inputbox-error-no-type' => '??????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"???????????????"create"???"comment"???"search"???"search2"??????',
	'tryexact' => '?????????',
	'searchfulltext' => '?????????',
	'createarticle' => '??????',
);

/** Macedonian (????????????????????)
 * @author Brest
 * @author Misos
 */
$messages['mk'] = array(
	'inputbox-desc' => '???????????????????? ???????????????????? ???? ?????????????????????????? HTML ??????????',
	'inputbox-error-no-type' => '???????????? ???????????????? ?????? ???? ???????? ???? ???????? ?????? ???????????? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????????? ???? ???????????? ???? ???????? "$1" ???? ?? ????????????.
???????????????? ???????? ???? ???????????????? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????? ???? ??????????',
	'searchfulltext' => '?????????? ?????? ???????????? ??????????',
	'createarticle' => '?????????????? ????????????????',
);

/** Malayalam (??????????????????)
 * @author Shijualex
 */
$messages['ml'] = array(
	'inputbox-desc' => '???????????????????????????????????????????????????????????? ????????????????????????????????????????????? HTML ???????????????????????? ??????????????????????????????????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??????????????????????????????????????? ????????????????????????????????? ?????????????????????????????? ????????? ???????????????????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '"$1" ???????????? ?????????????????????????????? ?????????????????? ????????? ????????????????????????????????????????????????.
???????????? ?????????????????? "create", "comment", "search", "search2" ?????????????????????????????? ?????????????????????????????????????????????',
	'tryexact' => '??????????????????????????? ????????????????????????????????? ???????????????????????? ????????????????????????????????? ????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????? ??????????????????????????? ??????????????????',
	'createarticle' => '??????????????? ?????????????????????????????????',
);

/** Marathi (???????????????)
 * @author Kaustubh
 */
$messages['mr'] = array(
	'inputbox-desc' => '?????????????????? ???????????????????????? HTML ???????????? ?????????????????????????????? ????????????????????? ????????????',
	'inputbox-error-no-type' => '?????????????????? ????????????????????? ???????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????? ?????????????????? ?????????????????? ????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????????????????? ????????????????????????????????? "$1" ?????? ?????????????????? ??????????????? ????????????. ??????????????? "create", "comment", "search" ??????????????? "search2" ??????????????? ?????? ???????????????.',
	'tryexact' => '????????????????????? ???????????? ????????????',
	'searchfulltext' => '??????????????? ??????????????? ????????????',
	'createarticle' => '????????? ????????????',
);

/** Malay (Bahasa Melayu)
 * @author Aviator
 */
$messages['ms'] = array(
	'inputbox-desc' => 'Membenarkan penyertaan borang HTML yang sudah ditetapkan.',
	'inputbox-error-no-type' => 'Anda tidak menyatakan jenis kotak input untuk diciptakan.',
	'inputbox-error-bad-type' => 'Jenis kotak input "$1" tidak dikenali. Sila nyatakan "create", "comment", "search", "search2" atau "fulltext".',
	'tryexact' => 'Cuba padanan tepat',
	'searchfulltext' => 'Cari dalam teks penuh',
	'createarticle' => 'Cipta laman',
);

/** Maltese (Malti)
 * @author Chrisportelli
 * @author Giangian15
 */
$messages['mt'] = array(
	'inputbox-desc' => "T??alli formuli ta' HTML predefiniti",
	'inputbox-error-no-type' => "Inti ma spe??ifikajtx it-tip ta' ''input box'' li trid to??loq.",
	'inputbox-error-bad-type' => '"$1" mhuwiex tip mag??ruf ta\' \'\'inputbox\'\'. Jekk jog????bok spe??ifika fost "create", "comment", "search" u "search2".',
	'tryexact' => 'Fittex korrispondenza e??atta',
	'searchfulltext' => 'Fittex fit-test',
	'createarticle' => 'O??loq pa??na',
);

/** Mazanderani (????????????????)
 * @author Spacebirdy
 */
$messages['mzn'] = array(
	'createarticle' => '?????? ??????????',
);

/** Nahuatl (N??huatl)
 * @author Fluence
 */
$messages['nah'] = array(
	'createarticle' => 'Ticch??hu??z z??zanilli',
);

/** Min Nan Chinese (B??n-l??m-g??) */
$messages['nan'] = array(
	'searchfulltext' => 'Chhiau choan-b??n',
);

/** Neapolitan (Nnapulitano)
 * @author SabineCretella
 */
$messages['nap'] = array(
	'searchfulltext' => 'Asci?? dint&#39;&#39;o testo',
	'createarticle' => 'Cria voce',
);

/** Low German (Plattd????tsch)
 * @author Slomox
 */
$messages['nds'] = array(
	'inputbox-desc' => 'Verl????vt dat Inbinnen vun v??rdefineerte HTML-Formularen',
	'inputbox-error-no-type' => 'Du hest keen Typ f??r dat Ingaav-Feld angeven.',
	'inputbox-error-bad-type' => 'De Typ ???$1??? f??r dat Ingaav-Feld is nich bekannt.
Geev een vun disse Typen an: ???create???, ???comment???, ???search???, ???search2??? oder ???fulltext???.',
	'tryexact' => 'exakte S????k vers??ken',
	'searchfulltext' => 'in???n Vulltext s??ken',
	'createarticle' => 'Siet anleggen',
);

/** Nepali (??????????????????) */
$messages['ne'] = array(
	'createarticle' => '????????? ??????????????????????????????',
);

/** Dutch (Nederlands)
 * @author SPQRobin
 * @author Siebrand
 */
$messages['nl'] = array(
	'inputbox-desc' => 'Maakt het toevoegen van voorgedefinieerde HTML-formulieren mogelijk',
	'inputbox-error-no-type' => 'U hebt het type invoerveld niet aangegeven.
Zie [http://www.mediawiki.org/wiki/Extension:Inputbox MediaWiki.org] voor meer informatie.',
	'inputbox-error-bad-type' => 'Type invoerveld "$1" niet herkend.
Gebruik "create", "comment", "search", "search2" of "fulltext".',
	'tryexact' => 'Zoeken op exacte overeenkomst',
	'searchfulltext' => 'Volledige tekst doorzoeken',
	'createarticle' => 'Nieuwe pagina maken',
);

/** Norwegian Nynorsk (???Norsk (nynorsk)???)
 * @author Frokor
 * @author Harald Khan
 */
$messages['nn'] = array(
	'inputbox-desc' => 'Tillet inkludering av f??rehandsdefinerte HTML-skjema',
	'inputbox-error-no-type' => 'Du har ikkje gjeve kva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inntekstboks av typen ??$1?? vart ikkje gjenkjent.
Ver venleg og velg ??create??, ??comment??, ??search??, ??search2??, eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k i all tekst',
	'createarticle' => 'Lag side',
);

/** Norwegian (bokm??l)??? (???Norsk (bokm??l)???)
 * @author Jon Harald S??by
 */
$messages['no'] = array(
	'inputbox-desc' => 'Tillater inkludering av forh??ndsdefinerte HTML-skjemaer',
	'inputbox-error-no-type' => 'Du har ikke angitt hva slags inputboks du vil lage.',
	'inputbox-error-bad-type' => 'Inputboks av typen ??$1?? gjenkjennes ikke.
Vennligst velg ??create??, ??comment??, ??search??, ??search2?? eller ??fulltext??.',
	'tryexact' => 'Pr??v n??yaktig treff',
	'searchfulltext' => 'S??k full tekst',
	'createarticle' => 'Opprett side',
);

/** Novial (Novial)
 * @author Malafaya
 */
$messages['nov'] = array(
	'searchfulltext' => 'Sercha kompleti texte',
);

/** Northern Sotho (Sesotho sa Leboa)
 * @author Mohau
 */
$messages['nso'] = array(
	'createarticle' => 'Tlhoma letlakala',
);

/** Occitan (Occitan)
 * @author Cedric31
 */
$messages['oc'] = array(
	'inputbox-desc' => 'Permet l???inclusion de formularis HTML predefinits',
	'inputbox-error-no-type' => 'Av??tz pas precisat lo tipe de la b??stia de dintrada de crear.',
	'inputbox-error-bad-type' => "Tipe de b??stia d'entrada ?? $1 ?? pas reconeguda.
Indicatz una opcion demest ''create'', ''comment'', ''search'' o ''searche2'' o ?? fulltext ??.",
	'tryexact' => 'Ensajatz la correspond??ncia exacta',
	'searchfulltext' => 'Rec??rca en t??xt integral',
	'createarticle' => 'Crear l???article',
);

/** Pangasinan (Pangasinan) */
$messages['pag'] = array(
	'createarticle' => 'Mangawa na artikulo',
);

/** Pampanga (Kapampangan) */
$messages['pam'] = array(
	'createarticle' => 'Gawang artikulu',
);

/** Polish (Polski)
 * @author Derbeth
 * @author Sp5uhe
 */
$messages['pl'] = array(
	'inputbox-desc' => 'Umo??liwia w????czenie w tre???? strony wcze??niej zdefiniowanych formularzy HTML',
	'inputbox-error-no-type' => 'Typ pola wej??ciowego nie zosta?? okre??lony',
	'inputbox-error-bad-type' => 'Typ ???$1??? pola wej??ciowego nie zosta?? rozpoznany.
Nale??y wybra?? ???create???, ???comment???, ???search???, ???search2??? or ???fulltext???.',
	'tryexact' => 'U??yj dok??adnego wyra??enia',
	'searchfulltext' => 'Szukaj w ca??ych tekstach',
	'createarticle' => 'Utw??rz artyku??',
);

/** Piedmontese (Piemont??is)
 * @author B??rto 'd S??ra
 */
$messages['pms'] = array(
	'inputbox-error-no-type' => "A l'ha nen dit che s??rt ??d qu??der ??d caria dat ch'a debia fesse.",
	'inputbox-error-bad-type' => 'La s??rt ??d qu??der "$1" a l\'?? nen conoss??a. P??r pias??, ch\'a s??rna antra "create", "comment", "search" ?? pura "search2".',
	'tryexact' => 'S??rca che a sia pr??pe parej',
	'searchfulltext' => 'S??rca an tut ??l test',
	'createarticle' => "Crea n'art??col",
);

/** Pontic (????????????????)
 * @author Sinopeus
 */
$messages['pnt'] = array(
	'createarticle' => '???????????? ??????????????',
);

/** Pashto (????????)
 * @author Ahmed-Najib-Biabani-Ibrahimkhel
 */
$messages['ps'] = array(
	'inputbox-desc' => '?? ???????? ???? ?? HTML ?????????? ???????? ?????????? ???????????? ?????????? ??????????',
	'tryexact' => '???? ???? ?????????? ???? ??????????????',
	'searchfulltext' => '???????? ?????? ????????',
	'createarticle' => '?????? ?????????? ??????????',
);

/** Portuguese (Portugu??s)
 * @author Malafaya
 */
$messages['pt'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios HTML pr??-definidos.',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de box de inser????o a ser criado.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a exata express??o',
	'searchfulltext' => 'Pesquisar no texto completo',
	'createarticle' => 'Criar p??gina',
);

/** Brazilian Portuguese (Portugu??s do Brasil)
 * @author Brunoy Anastasiya Seryozhenko
 * @author Eduardo.mps
 */
$messages['pt-br'] = array(
	'inputbox-desc' => 'Permite a inclus??o de formul??rios definidos de HTML',
	'inputbox-error-no-type' => 'Voc?? n??o especificou o tipo de inputbox a ser criada.',
	'inputbox-error-bad-type' => 'O tipo de caixa de introdu????o de dados "$1" n??o foi reconhecido.
Por favor, especifique "create", "comment", "search", "search2" ou "fulltext".',
	'tryexact' => 'Tentar a express??o exata',
	'searchfulltext' => 'Pesquisar em todo o texto.',
	'createarticle' => 'Criar p??gina.',
);

/** Quechua (Runa Simi)
 * @author AlimanRuna
 */
$messages['qu'] = array(
	'tryexact' => 'Hinalla taripanayaspa maskay',
	'searchfulltext' => "Hunt'a qillqata maskay",
	'createarticle' => 'Qillqata kamariy',
);

/** Romanian (Rom??n??)
 * @author Emily
 * @author Firilacroco
 * @author KlaudiuMihaila
 * @author Mihai
 */
$messages['ro'] = array(
	'inputbox-desc' => 'Permite includerea formelor HTML predefinite',
	'inputbox-error-no-type' => 'Nu ai specificat ce tip de cutie intrare s?? fie creat??.',
	'inputbox-error-bad-type' => 'Tipul de cutie intrare "$1" nu este recunoscut.
Te rog s?? specifici parametrii "create", "comment", "search", "search2" sau "fulltext".',
	'tryexact' => '??ncearc?? varianta exact??',
	'searchfulltext' => 'Caut?? textul ??ntreg',
	'createarticle' => 'Creaz?? articol',
);

/** Aromanian (Arm??neashce) */
$messages['roa-rup'] = array(
	'createarticle' => 'Adrats articlu',
);

/** Tarand??ne (Tarand??ne)
 * @author Joetaras
 */
$messages['roa-tara'] = array(
	'createarticle' => "Ccreje 'a v??sce",
);

/** Russian (??????????????)
 * @author ?????????????????? ??????????????
 */
$messages['ru'] = array(
	'inputbox-desc' => '?????????????????? ???????????????? ?????????????? ???????????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '?????????????????????? ?????? ???????? ?????????? ??$1??.
????????????????????, ?????????????? ???????? ???? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** Yakut (???????? ????????)
 * @author HalanTul
 */
$messages['sah'] = array(
	'inputbox-desc' => '???????????????? ???????????????????? HTML-?????????????????? ??????????????',
	'inputbox-error-no-type' => '???? ???? ?????????????? ?????? ???????????????????????? ???????? ??????????.',
	'inputbox-error-bad-type' => '??$1?? ???????????? ???????????? ??????????????????. ???????? ???????? ?????????????????????? ??????: ??create??, ??comment??, ??search??, ??search2?? ???????????? ??fulltext??.',
	'tryexact' => '?????????? ??????????',
	'searchfulltext' => '???????????????? ?????????????? ??????????????????',
	'createarticle' => '???????????????????? ????????????',
);

/** Sardinian (Sardu)
 * @author Marzedu
 */
$messages['sc'] = array(
	'createarticle' => 'Crea art??culu',
);

/** Sicilian (Sicilianu)
 * @author Santu
 */
$messages['scn'] = array(
	'inputbox-desc' => 'Pirmetti nzirimenti di m??duli HTML predifiniti',
	'inputbox-error-no-type' => 'Non vinni spicificatu lu tipu di inputbox di criari.',
	'inputbox-error-bad-type' => '"$1" nun ?? nu tipu di inputbox canusciutu. S\'h?? sc??gghiri lu tipu ntra "create", "comment", "search" e "search2".',
	'tryexact' => 'Cerca currispunnenza giusta',
	'searchfulltext' => 'Circata nt?? testu',
	'createarticle' => 'Cria vuci',
);

/** Sindhi (????????) */
$messages['sd'] = array(
	'createarticle' => '???????? ?????????? ??????',
);

/** Sango (S??ng??) */
$messages['sg'] = array(
	'createarticle' => 'S?? soura',
);

/** Sinhala (???????????????)
 * @author Asiri wiki
 * @author ?????????????????????????????????
 */
$messages['si'] = array(
	'inputbox-desc' => '??????????????????????????????????????????????????? HTML ????????????????????? ????????????????????????????????? ?????????????????????',
	'inputbox-error-no-type' => '??????????????? ???????????? ????????????????????? ?????????????????? ????????????????????? ?????? ?????????????????? ????????????????????? ????????? ??????????????? ???????????????.',
	'inputbox-error-bad-type' => '????????????????????? ???????????? ????????????????????? "$1" ????????????????????? ???????????????.
????????????????????? "???????????????", "?????????????????????", "??????????????????" ?????? "??????????????????2" ????????????????????? ??????????????? .',
	'tryexact' => '??????????????? ??????????????????  ??????????????? ???????????????',
	'searchfulltext' => '???????????????????????? ????????? ?????????????????? ???????????????',
	'createarticle' => '????????????????????? ??????????????????',
);

/** Slovak (Sloven??ina)
 * @author Helix84
 */
$messages['sk'] = array(
	'inputbox-desc' => 'Umo????uje vlo??enie preddefinovan??ch HTML formul??rov',
	'inputbox-error-no-type' => 'Neuviedli ste typ vstupn??ho po??a, ktor?? sa m?? vytvori??.',
	'inputbox-error-bad-type' => 'Vstupn?? pole typu ???$1??? nie je podporovan??.
Pros??m, pou??ite ???create???, ???comment???, ???search??? alebo ???search2???.',
	'tryexact' => 'Sk??ste presn?? vyh??ad??vanie',
	'searchfulltext' => 'Fulltextov?? vyh??ad??vanie',
	'createarticle' => 'Vytvori?? str??nku',
);

/** Slovenian (Sloven????ina) */
$messages['sl'] = array(
	'tryexact' => 'Poskusite z natan??nim zadetkom',
	'searchfulltext' => 'Prei????i vse besedilo',
	'createarticle' => 'Ustvarite stran',
);

/** Albanian (Shqip)
 * @author Dori
 */
$messages['sq'] = array(
	'tryexact' => 'K??rko p??rputhje t?? plot??',
	'searchfulltext' => 'K??rko tekstin e plot??',
	'createarticle' => 'Krijo artikull',
);

/** Serbian Cyrillic ekavian (????????????????)
 * @author Millosh
 * @author ?????????????? ????????????????????
 */
$messages['sr-ec'] = array(
	'inputbox-desc' => '?????????????? ???????????????????? ?????????????????? ?????????????????????? HTML ??????????.',
	'inputbox-error-no-type' => '???????? ?????????????? ?????? ???????????? ???????????? ???? ???? ???? ????????????????.',
	'inputbox-error-bad-type' => '?????? "$1" ???????????????? ???? ???????? ???????????????? ???? ????????????????.
???????????? ?????? ???? ???? ?????????????????? ???? "create", "comment", "search", "search2" ?????? "fulltext".',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????? ?????? ??????????',
	'createarticle' => '?????????????? ????????????',
);

/** latinica (latinica) */
$messages['sr-el'] = array(
	'tryexact' => 'Poku??aj ta??no',
	'searchfulltext' => 'Pretra??i ceo tekst',
	'createarticle' => 'Napravi ??lanak',
);

/** Swati (SiSwati)
 * @author Jatrobat
 */
$messages['ss'] = array(
	'createarticle' => 'K??d??la intfo',
);

/** Seeltersk (Seeltersk)
 * @author Maartenvdbent
 * @author Pyt
 */
$messages['stq'] = array(
	'inputbox-desc' => 'Ferl????wet d??t Apniemen fon foardefinierde HTML-Formulare',
	'inputbox-error-no-type' => 'Du h????st naan Inputbox-Typ ounroat.',
	'inputbox-error-bad-type' => 'Iengoawef??ild-Typ "$1" uunbekoand.
Reek n gultigen Typ an: ???create???, ???comment???, ???search???, ???search2??? of "fulltext".',
	'tryexact' => 'Fers??ik exakte S??ike:',
	'searchfulltext' => 'D??n ganse Text truchs??ike',
	'createarticle' => 'Siede anl????se',
);

/** Sundanese (Basa Sunda)
 * @author Irwangatot
 */
$messages['su'] = array(
	'tryexact' => 'Coba jeung anu cocog',
	'searchfulltext' => 'Sungsi dina t??ks lengkap',
	'createarticle' => 'Jieun artikel',
);

/** Swedish (Svenska)
 * @author Lejonel
 * @author Najami
 */
$messages['sv'] = array(
	'inputbox-desc' => 'Ger m??jlighet att anv??nda f??rdefinerade HTML-formul??r.',
	'inputbox-error-no-type' => 'Du har inte angivit vilken typ av inputbox som ska skapas..',
	'inputbox-error-bad-type' => '"$1" ??r inte en k??nd typ av inputbox.
Var god specifiera "create", "comment", "search", "search2" eller "fulltext".',
	'tryexact' => 'F??rs??k hitta exakt matchning',
	'searchfulltext' => 'Fulltexts??kning',
	'createarticle' => 'Skapa sida',
);

/** Silesian (??l??nski)
 * @author Ozi64
 */
$messages['szl'] = array(
	'createarticle' => 'Na??kryflej artikel',
);

/** Telugu (??????????????????)
 * @author Chaduvari
 * @author Veeven
 */
$messages['te'] = array(
	'inputbox-desc' => '??????????????? ??????????????????????????????????????? HTML ???????????????????????? ?????????????????????????????????',
	'inputbox-error-no-type' => '??? ??????????????? ?????????&zwnj;???????????? ???????????????????????? ????????????????????????????????? ???????????? ???????????????????????????.',
	'tryexact' => '??????????????????????????? ??????????????? ??????????????? ?????????????????????????????????',
	'searchfulltext' => '?????????????????? ???????????????????????? ??????????????????',
	'createarticle' => '?????????????????????????????? ???????????????????????????',
);

/** Tajik (Cyrillic) (???????????? (Cyrillic))
 * @author Ibrahim
 */
$messages['tg-cyrl'] = array(
	'inputbox-desc' => '???????????? ???????????????? ???? ?????????????? HTML ???? ?????? ???????????????????????? ??????????????',
	'inputbox-error-no-type' => '?????????? ???????????? ?????????????? ?????????????????????????? ???????????????? ??????????????????.',
	'inputbox-error-bad-type' => '?????????? ???????????? ?????????????? "$1" ?????????????????? ??????. ???????????? ???? ???? ?????????????????? ???? ???????? "create", "comment", "search" ?? "search2" ???????????????? ??????????.',
	'tryexact' => '???????????????????? ???????????? ????????????????',
	'searchfulltext' => '???????????????? ?????????? ??????????',
	'createarticle' => '?????????? ????????????',
);

/** Thai (?????????) */
$messages['th'] = array(
	'tryexact' => '?????????????????????????????????????????????????????????',
	'searchfulltext' => '?????????????????????????????????',
	'createarticle' => '????????????????????????????????????',
);

/** Tagalog (Tagalog)
 * @author AnakngAraw
 */
$messages['tl'] = array(
	'inputbox-desc' => 'Pahintulutan ang pagsasama ng mga pormularyong HTML na may paunang kahulugan',
	'inputbox-error-no-type' => 'Hindi mo tinukoy ang uri ng pasukang kahong lilikhain.',
	'inputbox-error-bad-type' => 'Hindi nakikilala ang uri ng pasukang kahong "$1".
Pakitukoy ang "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => 'Subukin ang hustung-hustong katugmaan',
	'searchfulltext' => 'Maghanap sa buong teksto',
	'createarticle' => 'Likhain ang pahina',
);

/** Tswana (Setswana) */
$messages['tn'] = array(
	'createarticle' => 'Kwala mokwalo',
);

/** Tonga (lea faka-Tonga) */
$messages['to'] = array(
	'createarticle' => 'Fakatupu ??a e kupu',
);

/** Turkish (T??rk??e)
 * @author Erkan Yilmaz
 * @author Joseph
 * @author Srhat
 */
$messages['tr'] = array(
	'inputbox-desc' => '??ntan??ml?? HTML formlar??n??n dahil edilmesine olanak verir',
	'inputbox-error-no-type' => 'Olu??turulacak girdi kutusunun tipini belirtmediniz.',
	'inputbox-error-bad-type' => 'Girdi kutusu tipi "$1" tan??nmad??.
L??tfen "create", "comment", "search", "search2" ya da  "fulltext" olarak belirtin.',
	'tryexact' => 'Tam e??le??me dene',
	'searchfulltext' => 'T??m metni ara',
	'createarticle' => 'Sayfay?? olu??tur',
);

/** Tsonga (Xitsonga)
 * @author Thuvack
 */
$messages['ts'] = array(
	'createarticle' => 'Tumbuluxa tluka',
);

/** Ukrainian (????????????????????)
 * @author AS
 * @author Ahonc
 */
$messages['uk'] = array(
	'inputbox-desc' => '???????????????? ???????????????? ?????????????????????? ?????????????????? HTML-??????????',
	'inputbox-error-no-type' => '???? ???? ?????????????????? ?????? ???????? ??????????, ?????? ??????????????????????.',
	'inputbox-error-bad-type' => '?????????????????? ?????? ???????? ?????????? ??$1??.
???????? ??????????, ???????????????? ???????? ?? ???????????????????? ??????????: ??create??, ??comment??, ??search??, ??search2?? ?????? ??fulltext??.',
	'tryexact' => '?????????????? ??????????',
	'searchfulltext' => '???????????????????????????? ??????????',
	'createarticle' => '???????????????? ????????????',
);

/** Urdu (????????) */
$messages['ur'] = array(
	'searchfulltext' => '???????? ?????? ??????',
	'createarticle' => '?????? ??????????',
);

/** Uzbek (O'zbek) */
$messages['uz'] = array(
	'createarticle' => 'Maqola kiritish',
);

/** V??neto (V??neto)
 * @author Candalua
 */
$messages['vec'] = array(
	'inputbox-desc' => "Consente l'inserimento de moduli HTML predefin??i",
	'inputbox-error-no-type' => 'No te gh?? specific?? el tipo de inputbox da crear.',
	'inputbox-error-bad-type' => '"$1" no\'l xe m??a un tipo de inputbox riconossi??o.
Siegli el tipo tra "create", "comment", "search", "search2" o "fulltext".',
	'tryexact' => '??erca corispondenza precisa',
	'searchfulltext' => '??erca nel testo',
	'createarticle' => 'Crea pagina',
);

/** Veps (Vepsan kel')
 * @author ?????????? ????????????????
 */
$messages['vep'] = array(
	'createarticle' => "S??ta lehtpol'",
);

/** Vietnamese (Ti???ng Vi???t)
 * @author Minh Nguyen
 */
$messages['vi'] = array(
	'inputbox-desc' => 'Th??m nh???ng bi???u m???u HTML ????n gi???n',
	'inputbox-error-no-type' => 'B???n ch??a ?????nh r?? lo???i bi???u m???u ????? t???o ra.',
	'inputbox-error-bad-type' => 'Lo???i bi???u m???u ???$1??? kh??ng h???p l???. Xin h??y ch???n ???create???, ???comment???, ???search???, ???search2???, hay ???fulltext???.',
	'tryexact' => 'Th??? t??m ??o???n v??n kh???p ch??nh x??c v???i t??? kh??a',
	'searchfulltext' => 'T??m to??n v??n',
	'createarticle' => 'Vi???t b??i m???i',
);

/** Volap??k (Volap??k)
 * @author Malafaya
 * @author Smeira
 */
$messages['vo'] = array(
	'inputbox-desc' => 'D??l??n kenin??kami fomas-HTLM b??o pemiedet??las',
	'searchfulltext' => 'Suk??n zi da v??dem l??lik',
	'createarticle' => 'Jaf??n padi',
);

/** V??ro (V??ro)
 * @author V??rok
 */
$messages['vro'] = array(
	'tryexact' => 'T??ps?? otsmin??',
	'searchfulltext' => 'Otsiq terveq tekst',
	'createarticle' => 'Luuq leht',
);

/** Walloon (Walon) */
$messages['wa'] = array(
	'createarticle' => 'Ahiver ??rtike',
);

/** Wolof (Wolof)
 * @author Ibou
 */
$messages['wo'] = array(
	'inputbox-error-no-type' => 'Leeraloo ban xeetu boyotu duggit nga b??gga sos.',
	'inputbox-error-bad-type' => '"$1" du xeetu boyotu duggit bu ??u xam. T??nnal benn ci yii "create", "comment", "seach" walla "search2"',
	'tryexact' => 'Seet wi mu yamal',
	'searchfulltext' => 'Ceet ci mbind mi',
	'createarticle' => 'Sos jukki bi',
);

/** Wu (??????) */
$messages['wuu'] = array(
	'searchfulltext' => '????????????',
	'createarticle' => '???????????????',
);

/** Xhosa (isiXhosa) */
$messages['xh'] = array(
	'createarticle' => 'Bhala Ibali',
);

/** Yiddish (????????????)
 * @author Yidel
 * @author ????????????????
 */
$messages['yi'] = array(
	'searchfulltext' => '?????? ?????? ?????? ????????????',
	'createarticle' => '???????????? ????????????',
);

/** Yue (??????) */
$messages['yue'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '?????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"?????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '?????????????????????',
	'searchfulltext' => '?????????',
	'createarticle' => '????????????',
);

/** Simplified Chinese (?????????(??????)???)
 * @author Wmr89502270
 */
$messages['zh-hans'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???"fulltext"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Traditional Chinese (?????????(??????)???) */
$messages['zh-hant'] = array(
	'inputbox-desc' => '???????????????????????????HTML??????',
	'inputbox-error-no-type' => '????????????????????????????????????????????????',
	'inputbox-error-bad-type' => '???????????????"$1"????????????????????????"create"???"comment"???"search"???"search2"???',
	'tryexact' => '??????????????????',
	'searchfulltext' => '????????????',
	'createarticle' => '????????????',
);

/** Zulu (isiZulu) */
$messages['zu'] = array(
	'searchfulltext' => 'Sesha ukubhala konke',
);



--- NEW FILE InputBox.php ---
<?php
/**
 * InputBox extension
 *
 * @file
 * @ingroup Extensions
 *
 * This file contains the main include file for the Inputbox extension of
 * MediaWiki.
 *
 * Usage: Add the following line in LocalSettings.php:
 * require_once( "$IP/extensions/InputBox/InputBox.php" );
 *
 * @author Erik Moeller <moeller at scireview.de>
 *  namespaces search improvements partially by
 *  Leonardo Pimenta <leo.lns at gmail.com>
 *	Cleaned up by Trevor Parscal <tparscal at wikimedia.org>
 * @copyright Public domain
 * @license Public domain
 * @version 0.1.1
 */

// Check environment
if ( !defined( 'MEDIAWIKI' ) ) {
	echo( "This is an extension to the MediaWiki package and cannot be run standalone.\n" );
	die( -1 );
}

/* Configuration */

// Credits
$wgExtensionCredits['parserhook'][] = array(
	'name'           => 'InputBox',
	'author'         => array( 'Erik Moeller', 'Leonardo Pimenta', 'Rob Church', 'Trevor Parscal' ),
	'url'            => 'http://www.mediawiki.org/wiki/Extension:InputBox',
	'description'    => 'Allow inclusion of predefined HTML forms.',
	'descriptionmsg' => 'inputbox-desc',
);

// Shortcut to this extension directory
$dir = dirname( __FILE__ ) . '/';

// Internationalization
$wgExtensionMessagesFiles['InputBox'] = $dir . 'InputBox.i18n.php';

// Register auto load for the special page class
$wgAutoloadClasses['InputBoxHooks'] = $dir . 'InputBox.hooks.php';
$wgAutoloadClasses['InputBox'] = $dir . 'InputBox.classes.php';

// Register parser hook
if ( defined( 'MW_SUPPORTS_PARSERFIRSTCALLINIT' ) ) {
	// Modern
	$wgHooks['ParserFirstCallInit'][] = 'InputBoxHooks::register';
} else {
	// Legacy
	$wgExtensionFunctions[] = array( 'InputBoxHooks', 'register' );
}


--- NEW FILE README.fedora ---
To complete installation of InputBox, add the following line to
LocalSettings.php:

  require_once "$IP/extensions/InputBox/InputBox.php";

for each MediaWiki instance you wish to install InputBox on.

This extension creates an <inputbox> tag that can be used to add wiki-related
HTML input boxes to wiki pages.  In general, "wiki-related" means
search boxes and "create an article" boxes.  Please see
http://www.mediawiki.org/wiki/Extension:InputBox for more details.


--- NEW FILE mediawiki-InputBox.spec ---
Name:		mediawiki-InputBox
Version:	0
Release:	0.2.20090420svn%{?dist}
Summary:	An extension to enable input box tags for mediawiki pages

Group:		Applications/Internet
License:	Public Domain
URL:		http://www.mediawiki.org/wiki/Extension:InputBox
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.classes.php?revision=49657
Source0:	InputBox.classes.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.hooks.php?revision=49657
Source1:	InputBox.hooks.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.i18n.php?revision=49657
Source2:	InputBox.i18n.php
# http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/InputBox/InputBox.php?revision=49657
Source3:	InputBox.php
Source4:	README.fedora
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	mediawiki >= 1.11

%description
The InputBox extension is a MediaWiki extension which adds already created HTML
forms to wiki pages. Users can "complete" a form (entering text, selecting menu
items, etc.) by entering text into the box.

InputBox was originally created by Erik Moeller for the purpose of adding a
Create an article box to Wikinews.

%prep

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox
install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/InputBox

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/mediawiki/extensions/InputBox
%doc %{_docdir}/%{name}-%{version}/README.fedora

%changelog
* Mon Apr 20 2009 John Guthrie <guthrie at counterexample.org> - 0-0.2.20090420svn
- Fixed the source URLs and updated to the latest svn version.

* Tue Mar 31 2009 John Guthrie <guthrie at counterexample.org> - 0-0.1.20090331svn
- Initial package build.



From eponyme at fedoraproject.org  Thu Apr 23 19:01:54 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 19:01:54 +0000 (UTC)
Subject: rpms/edb/devel edb.spec,1.21,1.22
Message-ID: <20090423190154.B376C70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7631

Modified Files:
	edb.spec 
Log Message:
ExcludeArch ARM


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/devel/edb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- edb.spec	4 Apr 2009 19:26:06 -0000	1.21
+++ edb.spec	23 Apr 2009 19:01:24 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
 Group:          Development/Debuggers
@@ -12,8 +12,8 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
 BuildRequires:  boost-devel
-# as edb is an x86 debugger, ppc and ppc64 are excluded
-ExcludeArch:    ppc ppc64
+# as edb is an x86 debugger, ppc, ppc64 and ARM  are excluded
+ExcludeArch:    ppc ppc64 %{arm}
 
 %description
 edb a debugger based on the ptrace API.
@@ -56,14 +56,15 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING README TODO VERSION README.plugins doc 
-%dir %{_libdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/%{name}_make_symbolmap.sh
-%{_libdir}/%{name}/*.so
+%{_libdir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 22 2009 Kedar Sovani <kedars at marvell.com> 0.9.8-2
+- ExcludeArch ARM
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
 - Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1



From eponyme at fedoraproject.org  Thu Apr 23 19:03:29 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 19:03:29 +0000 (UTC)
Subject: rpms/edb/F-11 edb.spec,1.21,1.22
Message-ID: <20090423190329.19EFD70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7897

Modified Files:
	edb.spec 
Log Message:
ExcludeArch ARM


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-11/edb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- edb.spec	4 Apr 2009 19:26:06 -0000	1.21
+++ edb.spec	23 Apr 2009 19:02:58 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
 Group:          Development/Debuggers
@@ -12,8 +12,8 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
 BuildRequires:  boost-devel
-# as edb is an x86 debugger, ppc and ppc64 are excluded
-ExcludeArch:    ppc ppc64
+# as edb is an x86 debugger, ppc, ppc64 and ARM  are excluded
+ExcludeArch:    ppc ppc64 %{arm}
 
 %description
 edb a debugger based on the ptrace API.
@@ -56,14 +56,15 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING README TODO VERSION README.plugins doc 
-%dir %{_libdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/%{name}_make_symbolmap.sh
-%{_libdir}/%{name}/*.so
+%{_libdir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 22 2009 Kedar Sovani <kedars at marvell.com> 0.9.8-2
+- ExcludeArch ARM
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
 - Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1



From mclasen at fedoraproject.org  Thu Apr 23 19:03:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 23 Apr 2009 19:03:37 +0000 (UTC)
Subject: rpms/gnome-system-monitor/F-11
	gnome-system-monitor-2.25.91-polkit.patch, 1.2, 1.3
Message-ID: <20090423190337.B510870104@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7868

Modified Files:
	gnome-system-monitor-2.25.91-polkit.patch 
Log Message:
fix patch mixup


gnome-system-monitor-2.25.91-polkit.patch:

Index: gnome-system-monitor-2.25.91-polkit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-11/gnome-system-monitor-2.25.91-polkit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-system-monitor-2.25.91-polkit.patch	23 Apr 2009 18:52:14 -0000	1.2
+++ gnome-system-monitor-2.25.91-polkit.patch	23 Apr 2009 19:03:07 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up gnome-system-monitor-2.26.1/configure.in.polkit gnome-system-monitor-2.26.1/configure.in
 --- gnome-system-monitor-2.26.1/configure.in.polkit	2009-04-10 18:33:14.000000000 -0400
-+++ gnome-system-monitor-2.26.1/configure.in	2009-04-23 14:37:53.528524725 -0400
++++ gnome-system-monitor-2.26.1/configure.in	2009-04-23 15:01:02.779508852 -0400
 @@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0
  GLIBMM_REQUIRED=2.14
  LIBXML_REQUIRED=2.0
@@ -56,7 +56,7 @@
  "
 diff -up gnome-system-monitor-2.26.1/po/POTFILES.in.polkit gnome-system-monitor-2.26.1/po/POTFILES.in
 --- gnome-system-monitor-2.26.1/po/POTFILES.in.polkit	2009-04-13 15:36:22.000000000 -0400
-+++ gnome-system-monitor-2.26.1/po/POTFILES.in	2009-04-23 14:37:53.528524725 -0400
++++ gnome-system-monitor-2.26.1/po/POTFILES.in	2009-04-23 15:01:02.779508852 -0400
 @@ -8,6 +8,7 @@ src/callbacks.cpp
  src/defaulttable.h
  src/disks.cpp
@@ -67,7 +67,7 @@
  src/interface.cpp
 diff -up gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit gnome-system-monitor-2.26.1/src/callbacks.cpp
 --- gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit	2009-01-20 16:00:27.000000000 -0500
-+++ gnome-system-monitor-2.26.1/src/callbacks.cpp	2009-04-23 14:47:33.698496775 -0400
++++ gnome-system-monitor-2.26.1/src/callbacks.cpp	2009-04-23 15:01:24.243745907 -0400
 @@ -210,11 +210,13 @@ cb_app_delete (GtkWidget *window, GdkEve
  
  
@@ -92,7 +92,7 @@
  	** no selected processes
 diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c
 --- /dev/null	2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c	2009-04-23 14:37:53.530531638 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c	2009-04-23 15:01:02.782492856 -0400
 @@ -0,0 +1,640 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -736,7 +736,7 @@
 +}
 diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml
 --- /dev/null	2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml	2009-04-23 14:37:53.531498182 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml	2009-04-23 15:01:02.782492856 -0400
 @@ -0,0 +1,15 @@
 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 +<node name="/">
@@ -755,7 +755,7 @@
 +</node>
 diff -up gnome-system-monitor-2.26.1/src/interface.cpp.polkit gnome-system-monitor-2.26.1/src/interface.cpp
 --- gnome-system-monitor-2.26.1/src/interface.cpp.polkit	2009-04-10 18:33:14.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/interface.cpp	2009-04-23 14:45:39.237496203 -0400
++++ gnome-system-monitor-2.26.1/src/interface.cpp	2009-04-23 15:02:01.567746154 -0400
 @@ -30,6 +30,10 @@
  #include <gdk/gdkkeysyms.h>
  #include <math.h>
@@ -853,11 +853,10 @@
  	/* create the main notebook */
  	procdata->notebook = notebook = gtk_notebook_new ();
    	gtk_box_pack_start (GTK_BOX (main_box), 
-@@ -774,11 +822,14 @@ update_sensitivity(ProcData *data)
+@@ -774,23 +822,53 @@ update_sensitivity(ProcData *data)
  	processes_sensitivity = (data->config.current_tab == PROCMAN_TAB_PROCESSES);
  	selected_sensitivity = (processes_sensitivity && data->selected_process != NULL);
  
-+	g_print ("update sensitivity: processes %d selected %d\n", processes_sensitivity, selected_sensitivity);
 +#ifndef HAVE_POLKIT
  	if(data->endprocessbutton) {
  		/* avoid error on startup if endprocessbutton
@@ -868,7 +867,11 @@
  
  	for (i = 0; i != G_N_ELEMENTS(processes_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
-@@ -789,8 +840,36 @@ update_sensitivity(ProcData *data)
+ 						     processes_actions[i]);
+-		gtk_action_set_sensitive(action, processes_sensitivity);
++		gtk_action_set_sensitive(action, selected_sensitivity);
+ 	}
+ 
  	for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
  						     selected_actions[i]);
@@ -907,7 +910,7 @@
  static void		
 diff -up gnome-system-monitor-2.26.1/src/Makefile.am.polkit gnome-system-monitor-2.26.1/src/Makefile.am
 --- gnome-system-monitor-2.26.1/src/Makefile.am.polkit	2008-08-08 15:55:59.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/Makefile.am	2009-04-23 14:37:53.545493980 -0400
++++ gnome-system-monitor-2.26.1/src/Makefile.am	2009-04-23 15:01:02.784504169 -0400
 @@ -4,7 +4,9 @@ INCLUDES = \
  	-DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -919,13 +922,9 @@
  
  bin_PROGRAMS = gnome-system-monitor
  
-@@ -33,10 +35,14 @@ gnome_system_monitor_SOURCES = \
- 	gconf-keys.cpp gconf-keys.h \
- 	iconthemewrapper.cpp iconthemewrapper.h \
+@@ -35,8 +37,11 @@ gnome_system_monitor_SOURCES = \
  	e_date.c e_date.h \
--        gsm_color_button.c gsm_color_button.h
-+        gsm_color_button.c gsm_color_button.h \
-+	gsm-session-manager.c gsm-session-manager.h
+         gsm_color_button.c gsm_color_button.h
  
 +if HAVE_POLKIT
 +gnome_system_monitor_SOURCES += gnome-system-monitor-mechanism-client-glue.h
@@ -936,7 +935,7 @@
  
  
  noinst_LTLIBRARIES = libbacon.la
-@@ -52,8 +58,44 @@ schema_ins  = gnome-system-monitor.schem
+@@ -52,8 +57,44 @@ schema_ins  = gnome-system-monitor.schem
  schema_DATA = $(schema_ins:.schemas.in=.schemas)
  @INTLTOOL_SCHEMAS_RULE@
  
@@ -984,7 +983,7 @@
  	$(schema_DATA)
 diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf
 --- /dev/null	2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf	2009-04-23 14:37:53.534493361 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf	2009-04-23 15:01:02.786494180 -0400
 @@ -0,0 +1,11 @@
 +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
 +
@@ -999,7 +998,7 @@
 +</busconfig>
 diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in
 --- /dev/null	2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-04-23 14:37:53.534493361 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-04-23 15:01:02.786494180 -0400
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.gnome.SystemMonitor.Mechanism
@@ -1007,7 +1006,7 @@
 +User=root
 diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in
 --- /dev/null	2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in	2009-04-23 14:37:53.535525627 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in	2009-04-23 15:01:02.787520999 -0400
 @@ -0,0 +1,50 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +
@@ -1061,7 +1060,7 @@
 +</policyconfig>
 diff -up gnome-system-monitor-2.26.1/src/procactions.cpp.polkit gnome-system-monitor-2.26.1/src/procactions.cpp
 --- gnome-system-monitor-2.26.1/src/procactions.cpp.polkit	2007-01-02 17:15:36.000000000 -0500
-+++ gnome-system-monitor-2.26.1/src/procactions.cpp	2009-04-23 14:37:53.536494477 -0400
++++ gnome-system-monitor-2.26.1/src/procactions.cpp	2009-04-23 15:01:02.788493760 -0400
 @@ -31,6 +31,10 @@
  #include "procdialogs.h"
  #include "callbacks.h"
@@ -1176,7 +1175,7 @@
 +
 diff -up gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit gnome-system-monitor-2.26.1/src/procdialogs.cpp
 --- gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit	2008-05-23 17:44:00.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/procdialogs.cpp	2009-04-23 14:37:53.537493707 -0400
++++ gnome-system-monitor-2.26.1/src/procdialogs.cpp	2009-04-23 15:01:02.789493899 -0400
 @@ -35,6 +35,11 @@
  #include "procman_gnomesu.h"
  #include "procman_gksu.h"
@@ -1372,7 +1371,7 @@
  static void
 diff -up gnome-system-monitor-2.26.1/src/procman.cpp.polkit gnome-system-monitor-2.26.1/src/procman.cpp
 --- gnome-system-monitor-2.26.1/src/procman.cpp.polkit	2009-03-31 17:57:18.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/procman.cpp	2009-04-23 14:37:53.538493287 -0400
++++ gnome-system-monitor-2.26.1/src/procman.cpp	2009-04-23 15:01:02.790494038 -0400
 @@ -36,6 +36,10 @@
  #include <glibtop/close.h>
  #include <glibtop/loadavg.h>
@@ -1422,7 +1421,7 @@
  ProcData* ProcData::get_instance()
 diff -up gnome-system-monitor-2.26.1/src/procman.h.polkit gnome-system-monitor-2.26.1/src/procman.h
 --- gnome-system-monitor-2.26.1/src/procman.h.polkit	2009-01-20 15:53:35.000000000 -0500
-+++ gnome-system-monitor-2.26.1/src/procman.h	2009-04-23 14:37:53.538493287 -0400
++++ gnome-system-monitor-2.26.1/src/procman.h	2009-04-23 15:01:02.791493688 -0400
 @@ -33,6 +33,11 @@
  #include <map>
  #include <string>



From eponyme at fedoraproject.org  Thu Apr 23 19:04:54 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 19:04:54 +0000 (UTC)
Subject: rpms/edb/F-10 edb.spec,1.19,1.20
Message-ID: <20090423190454.BE6FA70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8193

Modified Files:
	edb.spec 
Log Message:
ExcludeArch ARM


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-10/edb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- edb.spec	4 Apr 2009 19:30:43 -0000	1.19
+++ edb.spec	23 Apr 2009 19:04:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
 Group:          Development/Debuggers
@@ -12,8 +12,8 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
 BuildRequires:  boost-devel
-# as edb is an x86 debugger, ppc and ppc64 are excluded
-ExcludeArch:    ppc ppc64
+# as edb is an x86 debugger, ppc, ppc64 and ARM  are excluded
+ExcludeArch:    ppc ppc64 %{arm}
 
 %description
 edb a debugger based on the ptrace API.
@@ -56,14 +56,15 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING README TODO VERSION README.plugins doc 
-%dir %{_libdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/%{name}_make_symbolmap.sh
-%{_libdir}/%{name}/*.so
+%{_libdir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 22 2009 Kedar Sovani <kedars at marvell.com> 0.9.8-2
+- ExcludeArch ARM
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
 - Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1



From eponyme at fedoraproject.org  Thu Apr 23 19:06:15 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 19:06:15 +0000 (UTC)
Subject: rpms/edb/F-9 edb.spec,1.19,1.20
Message-ID: <20090423190615.6543A70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/edb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8741

Modified Files:
	edb.spec 
Log Message:
ExcludeArch ARM


Index: edb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edb/F-9/edb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- edb.spec	4 Apr 2009 19:32:09 -0000	1.19
+++ edb.spec	23 Apr 2009 19:05:45 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A debugger based on the ptrace API and Qt4
 
 Group:          Development/Debuggers
@@ -12,8 +12,8 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
 BuildRequires:  boost-devel
-# as edb is an x86 debugger, ppc and ppc64 are excluded
-ExcludeArch:    ppc ppc64
+# as edb is an x86 debugger, ppc, ppc64 and ARM  are excluded
+ExcludeArch:    ppc ppc64 %{arm}
 
 %description
 edb a debugger based on the ptrace API.
@@ -56,14 +56,15 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING README TODO VERSION README.plugins doc 
-%dir %{_libdir}/%{name}
 %{_bindir}/%{name}
 %{_bindir}/%{name}_make_symbolmap.sh
-%{_libdir}/%{name}/*.so
+%{_libdir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 22 2009 Kedar Sovani <kedars at marvell.com> 0.9.8-2
+- ExcludeArch ARM
 * Sat Apr  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.8-1
 - Rebuild for 0.9.8
 * Tue Mar 17 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.9.7-1



From iarnell at fedoraproject.org  Thu Apr 23 19:26:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 19:26:11 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise/F-10 perl-Mixin-Linewise.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423192611.5FAEB70104@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mixin-Linewise.spec 
Log Message:
initial import


--- NEW FILE perl-Mixin-Linewise.spec ---
Name:           perl-Mixin-Linewise
Version:        0.002
Release:        1%{?dist}
Summary:        Write your linewise code for handles; this does the rest
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mixin-Linewise/
Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Mixin-Linewise-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::String)
BuildRequires:  perl(Sub::Exporter) >= 0.9
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
It's boring to deal with opening files for IO, converting strings to handle-
like objects, and all that. With Mixin::Linewise::Readers and
Mixin::Linewise::Writers, you can just write a method to handle handles,
and methods for handling strings and filenames are added for you.

%prep
%setup -q -n Mixin-Linewise-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:37:45 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:25:40 -0000	1.2
@@ -0,0 +1 @@
+Mixin-Linewise-0.002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:37:45 -0000	1.1
+++ sources	23 Apr 2009 19:25:40 -0000	1.2
@@ -0,0 +1 @@
+ee7a770b441638a7e7ac38f96e90824d  Mixin-Linewise-0.002.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 19:26:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 19:26:11 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise/F-11 perl-Mixin-Linewise.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423192611.86EEC70104@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mixin-Linewise.spec 
Log Message:
initial import


--- NEW FILE perl-Mixin-Linewise.spec ---
Name:           perl-Mixin-Linewise
Version:        0.002
Release:        1%{?dist}
Summary:        Write your linewise code for handles; this does the rest
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mixin-Linewise/
Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Mixin-Linewise-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::String)
BuildRequires:  perl(Sub::Exporter) >= 0.9
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
It's boring to deal with opening files for IO, converting strings to handle-
like objects, and all that. With Mixin::Linewise::Readers and
Mixin::Linewise::Writers, you can just write a method to handle handles,
and methods for handling strings and filenames are added for you.

%prep
%setup -q -n Mixin-Linewise-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:37:45 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:25:41 -0000	1.2
@@ -0,0 +1 @@
+Mixin-Linewise-0.002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:37:45 -0000	1.1
+++ sources	23 Apr 2009 19:25:41 -0000	1.2
@@ -0,0 +1 @@
+ee7a770b441638a7e7ac38f96e90824d  Mixin-Linewise-0.002.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 19:26:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 19:26:11 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise/devel perl-Mixin-Linewise.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423192611.E0B8570104@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mixin-Linewise.spec 
Log Message:
initial import


--- NEW FILE perl-Mixin-Linewise.spec ---
Name:           perl-Mixin-Linewise
Version:        0.002
Release:        1%{?dist}
Summary:        Write your linewise code for handles; this does the rest
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mixin-Linewise/
Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Mixin-Linewise-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::String)
BuildRequires:  perl(Sub::Exporter) >= 0.9
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
It's boring to deal with opening files for IO, converting strings to handle-
like objects, and all that. With Mixin::Linewise::Readers and
Mixin::Linewise::Writers, you can just write a method to handle handles,
and methods for handling strings and filenames are added for you.

%prep
%setup -q -n Mixin-Linewise-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:37:45 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:25:41 -0000	1.2
@@ -0,0 +1 @@
+Mixin-Linewise-0.002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:37:45 -0000	1.1
+++ sources	23 Apr 2009 19:25:41 -0000	1.2
@@ -0,0 +1 @@
+ee7a770b441638a7e7ac38f96e90824d  Mixin-Linewise-0.002.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 19:30:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 19:30:10 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/F-10 perl-Lexical-Persistence.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423193010.F19E570104@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11823/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Lexical-Persistence.spec 
Log Message:
initial import


--- NEW FILE perl-Lexical-Persistence.spec ---
Name:           perl-Lexical-Persistence
Version:        0.98
Release:        1%{?dist}
Summary:        Persistent lexical variable values for arbitrary calls
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Lexical-Persistence/
Source0:        http://www.cpan.org/authors/id/R/RC/RCAPUTO/Lexical-Persistence-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Devel::LexAlias) >= 0.04
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(PadWalker) >= 1.1
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Lexical::Persistence does a few things, all related. Note that all the
behaviors listed here are the defaults. Subclasses can override nearly
every aspect of Lexical::Persistence's behavior.

%prep
%setup -q -n Lexical-Persistence-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README eg
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.98-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:38:30 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:29:40 -0000	1.2
@@ -0,0 +1 @@
+Lexical-Persistence-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:38:30 -0000	1.1
+++ sources	23 Apr 2009 19:29:40 -0000	1.2
@@ -0,0 +1 @@
+d01cb510432a1ccba61d4b02520f99e4  Lexical-Persistence-0.98.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 19:30:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 19:30:11 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/F-11 perl-Lexical-Persistence.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423193011.1199870107@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11823/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Lexical-Persistence.spec 
Log Message:
initial import


--- NEW FILE perl-Lexical-Persistence.spec ---
Name:           perl-Lexical-Persistence
Version:        0.98
Release:        1%{?dist}
Summary:        Persistent lexical variable values for arbitrary calls
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Lexical-Persistence/
Source0:        http://www.cpan.org/authors/id/R/RC/RCAPUTO/Lexical-Persistence-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Devel::LexAlias) >= 0.04
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(PadWalker) >= 1.1
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Lexical::Persistence does a few things, all related. Note that all the
behaviors listed here are the defaults. Subclasses can override nearly
every aspect of Lexical::Persistence's behavior.

%prep
%setup -q -n Lexical-Persistence-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README eg
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.98-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:38:30 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:29:40 -0000	1.2
@@ -0,0 +1 @@
+Lexical-Persistence-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:38:30 -0000	1.1
+++ sources	23 Apr 2009 19:29:40 -0000	1.2
@@ -0,0 +1 @@
+d01cb510432a1ccba61d4b02520f99e4  Lexical-Persistence-0.98.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 19:30:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 19:30:11 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/devel perl-Lexical-Persistence.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423193011.584B370104@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11823/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Lexical-Persistence.spec 
Log Message:
initial import


--- NEW FILE perl-Lexical-Persistence.spec ---
Name:           perl-Lexical-Persistence
Version:        0.98
Release:        1%{?dist}
Summary:        Persistent lexical variable values for arbitrary calls
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Lexical-Persistence/
Source0:        http://www.cpan.org/authors/id/R/RC/RCAPUTO/Lexical-Persistence-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Devel::LexAlias) >= 0.04
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(PadWalker) >= 1.1
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Lexical::Persistence does a few things, all related. Note that all the
behaviors listed here are the defaults. Subclasses can override nearly
every aspect of Lexical::Persistence's behavior.

%prep
%setup -q -n Lexical-Persistence-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README eg
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.98-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:38:30 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:29:41 -0000	1.2
@@ -0,0 +1 @@
+Lexical-Persistence-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:38:30 -0000	1.1
+++ sources	23 Apr 2009 19:29:41 -0000	1.2
@@ -0,0 +1 @@
+d01cb510432a1ccba61d4b02520f99e4  Lexical-Persistence-0.98.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:31:10 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:31:10 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/devel import.log, NONE,
	1.1 perl-Log-LogLite.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423193110.3839170104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Log-LogLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12134/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Log-LogLite.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
perl-Log-LogLite-0_82-1_fc10:HEAD:perl-Log-LogLite-0.82-1.fc10.src.rpm:1240515003


--- NEW FILE perl-Log-LogLite.spec ---
Name:           perl-Log-LogLite
Version:        0.82
Release:        1%{?dist}
Summary:        Create simple logs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-LogLite/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-LogLite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::LockedFile)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Log::LogLite class helps create simple logs for applications.

%prep
%setup -q -n Log-LogLite-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 0.82-1
- Specfile autogenerated by cpanspec 1.77.
- Clean up spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:46:26 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:30:39 -0000	1.2
@@ -0,0 +1 @@
+Log-LogLite-0.82.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:46:26 -0000	1.1
+++ sources	23 Apr 2009 19:30:39 -0000	1.2
@@ -0,0 +1 @@
+67e72da51df7423c028b4dc0186f5f52  Log-LogLite-0.82.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:42:45 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:42:45 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/EL-5 perl-Log-LogLite.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423194245.915B570104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Log-LogLite/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15421/EL-5

Modified Files:
	sources 
Added Files:
	perl-Log-LogLite.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE perl-Log-LogLite.spec ---
Name:           perl-Log-LogLite
Version:        0.82
Release:        1%{?dist}
Summary:        Create simple logs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-LogLite/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-LogLite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::LockedFile)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Log::LogLite class helps create simple logs for applications.

%prep
%setup -q -n Log-LogLite-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 0.82-1
- Specfile autogenerated by cpanspec 1.77.
- Clean up spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:46:26 -0000	1.1
+++ sources	23 Apr 2009 19:42:15 -0000	1.2
@@ -0,0 +1 @@
+67e72da51df7423c028b4dc0186f5f52  Log-LogLite-0.82.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:42:45 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:42:45 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/F-10 perl-Log-LogLite.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423194245.AB5A070104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Log-LogLite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15421/F-10

Modified Files:
	sources 
Added Files:
	perl-Log-LogLite.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE perl-Log-LogLite.spec ---
Name:           perl-Log-LogLite
Version:        0.82
Release:        1%{?dist}
Summary:        Create simple logs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-LogLite/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-LogLite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::LockedFile)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Log::LogLite class helps create simple logs for applications.

%prep
%setup -q -n Log-LogLite-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 0.82-1
- Specfile autogenerated by cpanspec 1.77.
- Clean up spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:46:26 -0000	1.1
+++ sources	23 Apr 2009 19:42:15 -0000	1.2
@@ -0,0 +1 @@
+67e72da51df7423c028b4dc0186f5f52  Log-LogLite-0.82.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:42:46 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:42:46 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/F-9 perl-Log-LogLite.spec, NONE, 1.1 sources, 
	1.1, 1.2
Message-ID: <20090423194246.42E9270104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Log-LogLite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15421/F-9

Modified Files:
	sources 
Added Files:
	perl-Log-LogLite.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE perl-Log-LogLite.spec ---
Name:           perl-Log-LogLite
Version:        0.82
Release:        1%{?dist}
Summary:        Create simple logs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-LogLite/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-LogLite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::LockedFile)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Log::LogLite class helps create simple logs for applications.

%prep
%setup -q -n Log-LogLite-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 0.82-1
- Specfile autogenerated by cpanspec 1.77.
- Clean up spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:46:26 -0000	1.1
+++ sources	23 Apr 2009 19:42:16 -0000	1.2
@@ -0,0 +1 @@
+67e72da51df7423c028b4dc0186f5f52  Log-LogLite-0.82.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:42:46 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:42:46 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/F-11 perl-Log-LogLite.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090423194246.0B31270104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Log-LogLite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15421/F-11

Modified Files:
	sources 
Added Files:
	perl-Log-LogLite.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE perl-Log-LogLite.spec ---
Name:           perl-Log-LogLite
Version:        0.82
Release:        1%{?dist}
Summary:        Create simple logs
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-LogLite/
Source0:        http://www.cpan.org/modules/by-module/Log/Log-LogLite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::LockedFile)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Log::LogLite class helps create simple logs for applications.

%prep
%setup -q -n Log-LogLite-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 02 2009 Xavier Bachelot <xavier at bachelot.org> 0.82-1
- Specfile autogenerated by cpanspec 1.77.
- Clean up spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:46:26 -0000	1.1
+++ sources	23 Apr 2009 19:42:15 -0000	1.2
@@ -0,0 +1 @@
+67e72da51df7423c028b4dc0186f5f52  Log-LogLite-0.82.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:48:18 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:48:18 +0000 (UTC)
Subject: rpms/php-geshi/devel import.log, NONE, 1.1 php-geshi.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423194818.1E0A870104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-geshi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16863/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-geshi.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
php-geshi-1_0_8_3-1_fc10:HEAD:php-geshi-1.0.8.3-1.fc10.src.rpm:1240516001


--- NEW FILE php-geshi.spec ---
Name:           php-geshi
Version:        1.0.8.3
Release:        1%{?dist}
Summary:        Generic syntax highlighter

Group:          Development/Libraries
License:        GPLv2+
URL:            http://qbnz.com/highlighter/
Source0:        http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       php >= 4.3.0
Requires:       php-mbstring


%description
GeSHi aims to be a simple but powerful highlighting class, with the following
goals:
    * Support for a wide range of popular languages
    * Easy to add a new language for highlighting
    * Highly customisable output formats


%prep
%setup -q -n geshi
find docs -type f -exec chmod a-x {} ';'
find . -type f -name "*.php" -exec chmod a-x {} ';'


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a geshi geshi.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* contrib/
%{_datadir}/php/geshi.php
%{_datadir}/php/geshi


%changelog
* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.3-1
- Update to 1.0.8.3.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-3
- License is actually GPLv2+.
- Remove implicit R: php-common.
- Fix URL:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-2
- More Requires:.

* Thu Mar 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-geshi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:30:33 -0000	1.1
+++ .cvsignore	23 Apr 2009 19:47:47 -0000	1.2
@@ -0,0 +1 @@
+GeSHi-1.0.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-geshi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:30:33 -0000	1.1
+++ sources	23 Apr 2009 19:47:47 -0000	1.2
@@ -0,0 +1 @@
+fa7ad8e9f5d2573cfca58dd3d5945712  GeSHi-1.0.8.3.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:56:04 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:56:04 +0000 (UTC)
Subject: rpms/php-geshi/F-10 php-geshi.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090423195604.657A970106@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-geshi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18743/F-10

Modified Files:
	sources 
Added Files:
	php-geshi.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE php-geshi.spec ---
Name:           php-geshi
Version:        1.0.8.3
Release:        1%{?dist}
Summary:        Generic syntax highlighter

Group:          Development/Libraries
License:        GPLv2+
URL:            http://qbnz.com/highlighter/
Source0:        http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       php >= 4.3.0
Requires:       php-mbstring


%description
GeSHi aims to be a simple but powerful highlighting class, with the following
goals:
    * Support for a wide range of popular languages
    * Easy to add a new language for highlighting
    * Highly customisable output formats


%prep
%setup -q -n geshi
find docs -type f -exec chmod a-x {} ';'
find . -type f -name "*.php" -exec chmod a-x {} ';'


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a geshi geshi.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* contrib/
%{_datadir}/php/geshi.php
%{_datadir}/php/geshi


%changelog
* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.3-1
- Update to 1.0.8.3.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-3
- License is actually GPLv2+.
- Remove implicit R: php-common.
- Fix URL:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-2
- More Requires:.

* Thu Mar 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-geshi/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:30:33 -0000	1.1
+++ sources	23 Apr 2009 19:55:34 -0000	1.2
@@ -0,0 +1 @@
+fa7ad8e9f5d2573cfca58dd3d5945712  GeSHi-1.0.8.3.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:56:04 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:56:04 +0000 (UTC)
Subject: rpms/php-geshi/F-9 php-geshi.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090423195604.D621970104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-geshi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18743/F-9

Modified Files:
	sources 
Added Files:
	php-geshi.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE php-geshi.spec ---
Name:           php-geshi
Version:        1.0.8.3
Release:        1%{?dist}
Summary:        Generic syntax highlighter

Group:          Development/Libraries
License:        GPLv2+
URL:            http://qbnz.com/highlighter/
Source0:        http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       php >= 4.3.0
Requires:       php-mbstring


%description
GeSHi aims to be a simple but powerful highlighting class, with the following
goals:
    * Support for a wide range of popular languages
    * Easy to add a new language for highlighting
    * Highly customisable output formats


%prep
%setup -q -n geshi
find docs -type f -exec chmod a-x {} ';'
find . -type f -name "*.php" -exec chmod a-x {} ';'


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a geshi geshi.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* contrib/
%{_datadir}/php/geshi.php
%{_datadir}/php/geshi


%changelog
* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.3-1
- Update to 1.0.8.3.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-3
- License is actually GPLv2+.
- Remove implicit R: php-common.
- Fix URL:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-2
- More Requires:.

* Thu Mar 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-geshi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:30:33 -0000	1.1
+++ sources	23 Apr 2009 19:55:34 -0000	1.2
@@ -0,0 +1 @@
+fa7ad8e9f5d2573cfca58dd3d5945712  GeSHi-1.0.8.3.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:56:04 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:56:04 +0000 (UTC)
Subject: rpms/php-geshi/EL-5 php-geshi.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090423195604.30D7970104@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-geshi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18743/EL-5

Modified Files:
	sources 
Added Files:
	php-geshi.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE php-geshi.spec ---
Name:           php-geshi
Version:        1.0.8.3
Release:        1%{?dist}
Summary:        Generic syntax highlighter

Group:          Development/Libraries
License:        GPLv2+
URL:            http://qbnz.com/highlighter/
Source0:        http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       php >= 4.3.0
Requires:       php-mbstring


%description
GeSHi aims to be a simple but powerful highlighting class, with the following
goals:
    * Support for a wide range of popular languages
    * Easy to add a new language for highlighting
    * Highly customisable output formats


%prep
%setup -q -n geshi
find docs -type f -exec chmod a-x {} ';'
find . -type f -name "*.php" -exec chmod a-x {} ';'


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a geshi geshi.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* contrib/
%{_datadir}/php/geshi.php
%{_datadir}/php/geshi


%changelog
* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.3-1
- Update to 1.0.8.3.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-3
- License is actually GPLv2+.
- Remove implicit R: php-common.
- Fix URL:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-2
- More Requires:.

* Thu Mar 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-geshi/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:30:33 -0000	1.1
+++ sources	23 Apr 2009 19:55:33 -0000	1.2
@@ -0,0 +1 @@
+fa7ad8e9f5d2573cfca58dd3d5945712  GeSHi-1.0.8.3.tar.gz



From xavierb at fedoraproject.org  Thu Apr 23 19:56:04 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 23 Apr 2009 19:56:04 +0000 (UTC)
Subject: rpms/php-geshi/F-11 php-geshi.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090423195604.85D3F70106@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/php-geshi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18743/F-11

Modified Files:
	sources 
Added Files:
	php-geshi.spec 
Log Message:
Import into F-9, F-10, F-11, EL-5


--- NEW FILE php-geshi.spec ---
Name:           php-geshi
Version:        1.0.8.3
Release:        1%{?dist}
Summary:        Generic syntax highlighter

Group:          Development/Libraries
License:        GPLv2+
URL:            http://qbnz.com/highlighter/
Source0:        http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       php >= 4.3.0
Requires:       php-mbstring


%description
GeSHi aims to be a simple but powerful highlighting class, with the following
goals:
    * Support for a wide range of popular languages
    * Easy to add a new language for highlighting
    * Highly customisable output formats


%prep
%setup -q -n geshi
find docs -type f -exec chmod a-x {} ';'
find . -type f -name "*.php" -exec chmod a-x {} ';'


%build
# Nothing to build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/
cp -a geshi geshi.php $RPM_BUILD_ROOT%{_datadir}/php/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/* contrib/
%{_datadir}/php/geshi.php
%{_datadir}/php/geshi


%changelog
* Wed Apr 15 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.3-1
- Update to 1.0.8.3.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-3
- License is actually GPLv2+.
- Remove implicit R: php-common.
- Fix URL:.

* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-2
- More Requires:.

* Thu Mar 19 2009 Xavier Bachelot <xavier at bachelot.org> 1.0.8.2-1
- Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-geshi/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:30:33 -0000	1.1
+++ sources	23 Apr 2009 19:55:34 -0000	1.2
@@ -0,0 +1 @@
+fa7ad8e9f5d2573cfca58dd3d5945712  GeSHi-1.0.8.3.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:20:14 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:20:14 +0000 (UTC)
Subject: rpms/perl-Clipboard/F-10 perl-Clipboard.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423202014.8EA91700D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Clipboard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24770/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Clipboard.spec 
Log Message:
initial import


--- NEW FILE perl-Clipboard.spec ---
Name:           perl-Clipboard
Version:        0.09
Release:        1%{?dist}
Summary:        Copy and paste with any OS
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Clipboard/
Source0:        http://www.cpan.org/authors/id/K/KI/KING/Clipboard-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Spiffy)
BuildRequires:  perl(Test::More)
BuildRequires:  xclip
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       xclip

%description
Who doesn't remember the first time they learned to copy and paste, and
generated an exponentially growing text document? Yes, that's right,
clipboards are magical.

%prep
%setup -q -n Clipboard-%{version}

# no need for Win32 or Pb
rm lib/Clipboard/Pb.pm
rm lib/Clipboard/Win32.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
- Specfile autogenerated by cpanspec 1.77.
- add bindir and man1 to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:39:19 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:19:44 -0000	1.2
@@ -0,0 +1 @@
+Clipboard-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:39:19 -0000	1.1
+++ sources	23 Apr 2009 20:19:44 -0000	1.2
@@ -0,0 +1 @@
+07c48138285eb46f5bfc338630ff4efd  Clipboard-0.09.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:20:14 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:20:14 +0000 (UTC)
Subject: rpms/perl-Clipboard/F-11 perl-Clipboard.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423202014.CFEFE700D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Clipboard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24770/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Clipboard.spec 
Log Message:
initial import


--- NEW FILE perl-Clipboard.spec ---
Name:           perl-Clipboard
Version:        0.09
Release:        1%{?dist}
Summary:        Copy and paste with any OS
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Clipboard/
Source0:        http://www.cpan.org/authors/id/K/KI/KING/Clipboard-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Spiffy)
BuildRequires:  perl(Test::More)
BuildRequires:  xclip
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       xclip

%description
Who doesn't remember the first time they learned to copy and paste, and
generated an exponentially growing text document? Yes, that's right,
clipboards are magical.

%prep
%setup -q -n Clipboard-%{version}

# no need for Win32 or Pb
rm lib/Clipboard/Pb.pm
rm lib/Clipboard/Win32.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
- Specfile autogenerated by cpanspec 1.77.
- add bindir and man1 to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:39:19 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:19:44 -0000	1.2
@@ -0,0 +1 @@
+Clipboard-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:39:19 -0000	1.1
+++ sources	23 Apr 2009 20:19:44 -0000	1.2
@@ -0,0 +1 @@
+07c48138285eb46f5bfc338630ff4efd  Clipboard-0.09.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:20:15 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:20:15 +0000 (UTC)
Subject: rpms/perl-Clipboard/devel perl-Clipboard.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423202015.31E4D700D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Clipboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24770/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Clipboard.spec 
Log Message:
initial import


--- NEW FILE perl-Clipboard.spec ---
Name:           perl-Clipboard
Version:        0.09
Release:        1%{?dist}
Summary:        Copy and paste with any OS
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Clipboard/
Source0:        http://www.cpan.org/authors/id/K/KI/KING/Clipboard-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Spiffy)
BuildRequires:  perl(Test::More)
BuildRequires:  xclip
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       xclip

%description
Who doesn't remember the first time they learned to copy and paste, and
generated an exponentially growing text document? Yes, that's right,
clipboards are magical.

%prep
%setup -q -n Clipboard-%{version}

# no need for Win32 or Pb
rm lib/Clipboard/Pb.pm
rm lib/Clipboard/Win32.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell <iarnell at gmail.com> 0.09-1
- Specfile autogenerated by cpanspec 1.77.
- add bindir and man1 to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:39:19 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:19:44 -0000	1.2
@@ -0,0 +1 @@
+Clipboard-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:39:19 -0000	1.1
+++ sources	23 Apr 2009 20:19:44 -0000	1.2
@@ -0,0 +1 @@
+07c48138285eb46f5bfc338630ff4efd  Clipboard-0.09.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:24:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:24:06 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create/F-10
	perl-WWW-Pastebin-PastebinCom-Create.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423202406.3415D700D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25591/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Pastebin-PastebinCom-Create.spec 
Log Message:
initial import


--- NEW FILE perl-WWW-Pastebin-PastebinCom-Create.spec ---
Name:           perl-WWW-Pastebin-PastebinCom-Create
Version:        0.002
Release:        2%{?dist}
Summary:        Paste to http://pastebin.com from Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Pastebin-PastebinCom-Create/
Source0:        http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-PastebinCom-Create-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(LWP::UserAgent) >= 2.036
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Kwalitee)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(URI) >= 1.35
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The module provides means of pasting large texts into http://pastebin.com
pastebin site.

%prep
%setup -q -n WWW-Pastebin-PastebinCom-Create-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 23 2009 Iain Arnell <iarnell at gmail.com> 0.002-2
- add examples as documentation

* Sun Apr 19 2009 Iain Arnell 0.002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:42:03 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:23:35 -0000	1.2
@@ -0,0 +1 @@
+WWW-Pastebin-PastebinCom-Create-0.002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:42:03 -0000	1.1
+++ sources	23 Apr 2009 20:23:35 -0000	1.2
@@ -0,0 +1 @@
+ea2ed99d06dc129bcd4362cc7cd39b40  WWW-Pastebin-PastebinCom-Create-0.002.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:24:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:24:06 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create/F-11
	perl-WWW-Pastebin-PastebinCom-Create.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423202406.503B9700D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25591/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Pastebin-PastebinCom-Create.spec 
Log Message:
initial import


--- NEW FILE perl-WWW-Pastebin-PastebinCom-Create.spec ---
Name:           perl-WWW-Pastebin-PastebinCom-Create
Version:        0.002
Release:        2%{?dist}
Summary:        Paste to http://pastebin.com from Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Pastebin-PastebinCom-Create/
Source0:        http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-PastebinCom-Create-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(LWP::UserAgent) >= 2.036
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Kwalitee)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(URI) >= 1.35
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The module provides means of pasting large texts into http://pastebin.com
pastebin site.

%prep
%setup -q -n WWW-Pastebin-PastebinCom-Create-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 23 2009 Iain Arnell <iarnell at gmail.com> 0.002-2
- add examples as documentation

* Sun Apr 19 2009 Iain Arnell 0.002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:42:03 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:23:36 -0000	1.2
@@ -0,0 +1 @@
+WWW-Pastebin-PastebinCom-Create-0.002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:42:03 -0000	1.1
+++ sources	23 Apr 2009 20:23:36 -0000	1.2
@@ -0,0 +1 @@
+ea2ed99d06dc129bcd4362cc7cd39b40  WWW-Pastebin-PastebinCom-Create-0.002.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:24:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:24:06 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create/devel
	perl-WWW-Pastebin-PastebinCom-Create.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423202406.89E04700D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25591/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Pastebin-PastebinCom-Create.spec 
Log Message:
initial import


--- NEW FILE perl-WWW-Pastebin-PastebinCom-Create.spec ---
Name:           perl-WWW-Pastebin-PastebinCom-Create
Version:        0.002
Release:        2%{?dist}
Summary:        Paste to http://pastebin.com from Perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Pastebin-PastebinCom-Create/
Source0:        http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-PastebinCom-Create-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(LWP::UserAgent) >= 2.036
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Kwalitee)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(URI) >= 1.35
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The module provides means of pasting large texts into http://pastebin.com
pastebin site.

%prep
%setup -q -n WWW-Pastebin-PastebinCom-Create-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README examples
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 23 2009 Iain Arnell <iarnell at gmail.com> 0.002-2
- add examples as documentation

* Sun Apr 19 2009 Iain Arnell 0.002-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:42:03 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:23:36 -0000	1.2
@@ -0,0 +1 @@
+WWW-Pastebin-PastebinCom-Create-0.002.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:42:03 -0000	1.1
+++ sources	23 Apr 2009 20:23:36 -0000	1.2
@@ -0,0 +1 @@
+ea2ed99d06dc129bcd4362cc7cd39b40  WWW-Pastebin-PastebinCom-Create-0.002.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:28:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:28:10 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create/F-10
	perl-WWW-Pastebin-RafbNet-Create.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423202810.B825570106@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26634/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Pastebin-RafbNet-Create.spec 
Log Message:
initial import


--- NEW FILE perl-WWW-Pastebin-RafbNet-Create.spec ---
Name:           perl-WWW-Pastebin-RafbNet-Create
Version:        0.001
Release:        2%{?dist}
Summary:        Create new pastes on http://rafb.net/
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Pastebin-RafbNet-Create/
Source0:        http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-RafbNet-Create-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Data::Accessor) >= 0.04001
BuildRequires:  perl(LWP::UserAgent) >= 2.036
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Kwalitee)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(URI) >= 1.35
# autoreq misses this
Requires:       perl(Class::Data::Accessor)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The module provides means to create new pastes on http://rafb.net/
paste site.

%prep
%setup -q -n WWW-Pastebin-RafbNet-Create-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 23 2009 Iain Arnell <iarnell at gmail.com> 0.001-2
- add missing requires: perl(Class::Data::Accessor)

* Sun Apr 19 2009 Iain Arnell 0.001-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:42:42 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:27:40 -0000	1.2
@@ -0,0 +1 @@
+WWW-Pastebin-RafbNet-Create-0.001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:42:42 -0000	1.1
+++ sources	23 Apr 2009 20:27:40 -0000	1.2
@@ -0,0 +1 @@
+fdd16b4e1d7209f7157110ac89f1a017  WWW-Pastebin-RafbNet-Create-0.001.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:28:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:28:10 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create/F-11
	perl-WWW-Pastebin-RafbNet-Create.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423202810.DBC4370106@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26634/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Pastebin-RafbNet-Create.spec 
Log Message:
initial import


--- NEW FILE perl-WWW-Pastebin-RafbNet-Create.spec ---
Name:           perl-WWW-Pastebin-RafbNet-Create
Version:        0.001
Release:        2%{?dist}
Summary:        Create new pastes on http://rafb.net/
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Pastebin-RafbNet-Create/
Source0:        http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-RafbNet-Create-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Data::Accessor) >= 0.04001
BuildRequires:  perl(LWP::UserAgent) >= 2.036
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Kwalitee)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(URI) >= 1.35
# autoreq misses this
Requires:       perl(Class::Data::Accessor)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The module provides means to create new pastes on http://rafb.net/
paste site.

%prep
%setup -q -n WWW-Pastebin-RafbNet-Create-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 23 2009 Iain Arnell <iarnell at gmail.com> 0.001-2
- add missing requires: perl(Class::Data::Accessor)

* Sun Apr 19 2009 Iain Arnell 0.001-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:42:42 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:27:40 -0000	1.2
@@ -0,0 +1 @@
+WWW-Pastebin-RafbNet-Create-0.001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:42:42 -0000	1.1
+++ sources	23 Apr 2009 20:27:40 -0000	1.2
@@ -0,0 +1 @@
+fdd16b4e1d7209f7157110ac89f1a017  WWW-Pastebin-RafbNet-Create-0.001.tar.gz



From iarnell at fedoraproject.org  Thu Apr 23 20:28:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 23 Apr 2009 20:28:11 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create/devel
	perl-WWW-Pastebin-RafbNet-Create.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090423202811.2A7E070106@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26634/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Pastebin-RafbNet-Create.spec 
Log Message:
initial import


--- NEW FILE perl-WWW-Pastebin-RafbNet-Create.spec ---
Name:           perl-WWW-Pastebin-RafbNet-Create
Version:        0.001
Release:        2%{?dist}
Summary:        Create new pastes on http://rafb.net/
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Pastebin-RafbNet-Create/
Source0:        http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-RafbNet-Create-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Data::Accessor) >= 0.04001
BuildRequires:  perl(LWP::UserAgent) >= 2.036
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Kwalitee)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
BuildRequires:  perl(URI) >= 1.35
# autoreq misses this
Requires:       perl(Class::Data::Accessor)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The module provides means to create new pastes on http://rafb.net/
paste site.

%prep
%setup -q -n WWW-Pastebin-RafbNet-Create-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 23 2009 Iain Arnell <iarnell at gmail.com> 0.001-2
- add missing requires: perl(Class::Data::Accessor)

* Sun Apr 19 2009 Iain Arnell 0.001-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:42:42 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:27:40 -0000	1.2
@@ -0,0 +1 @@
+WWW-Pastebin-RafbNet-Create-0.001.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:42:42 -0000	1.1
+++ sources	23 Apr 2009 20:27:40 -0000	1.2
@@ -0,0 +1 @@
+fdd16b4e1d7209f7157110ac89f1a017  WWW-Pastebin-RafbNet-Create-0.001.tar.gz



From eponyme at fedoraproject.org  Thu Apr 23 20:48:50 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 20:48:50 +0000 (UTC)
Subject: rpms/cclive/devel cclive.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423204850.F357370104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30997/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cclive.spec import.log 
Log Message:
New package



--- NEW FILE cclive.spec ---
Name:           cclive
Version:        0.3.2
Release:        2%{?dist}
Summary:        Command line video extraction utility

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/cclive/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libcurl-devel

%description
cclive is a command line video extraction utility similar to clive but with
lower requirements. Its features are few and essential. Supports Youtube,
Googlevideo, Break, Liveleak, Sevenload, Evisortv and Dailymotion.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Apr 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-2
- URL fix
- Preserve timestamps
- Remove INSTALL file from doc section
* Sun Apr 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-1
- Rebuild for 0.3.2
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.1-1
- Initial build



--- NEW FILE import.log ---
cclive-0_3_2-2_fc10:HEAD:cclive-0.3.2-2.fc10.src.rpm:1240519640


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:43:38 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:48:20 -0000	1.2
@@ -0,0 +1 @@
+cclive-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:43:38 -0000	1.1
+++ sources	23 Apr 2009 20:48:20 -0000	1.2
@@ -0,0 +1 @@
+1136b0550c19aa58f47d053e4939ed58  cclive-0.3.2.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 20:51:34 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 20:51:34 +0000 (UTC)
Subject: rpms/cclive/F-11 cclive.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423205134.CA35970104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31583/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	cclive.spec import.log 
Log Message:
New package



--- NEW FILE cclive.spec ---
Name:           cclive
Version:        0.3.2
Release:        2%{?dist}
Summary:        Command line video extraction utility

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/cclive/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libcurl-devel

%description
cclive is a command line video extraction utility similar to clive but with
lower requirements. Its features are few and essential. Supports Youtube,
Googlevideo, Break, Liveleak, Sevenload, Evisortv and Dailymotion.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Apr 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-2
- URL fix
- Preserve timestamps
- Remove INSTALL file from doc section
* Sun Apr 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-1
- Rebuild for 0.3.2
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.1-1
- Initial build



--- NEW FILE import.log ---
cclive-0_3_2-2_fc10:F-11:cclive-0.3.2-2.fc10.src.rpm:1240519777


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:43:38 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:51:04 -0000	1.2
@@ -0,0 +1 @@
+cclive-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:43:38 -0000	1.1
+++ sources	23 Apr 2009 20:51:04 -0000	1.2
@@ -0,0 +1 @@
+1136b0550c19aa58f47d053e4939ed58  cclive-0.3.2.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 20:53:12 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 20:53:12 +0000 (UTC)
Subject: rpms/cclive/F-10 cclive.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423205312.BB87D70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32058/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	cclive.spec import.log 
Log Message:
New update



--- NEW FILE cclive.spec ---
Name:           cclive
Version:        0.3.2
Release:        2%{?dist}
Summary:        Command line video extraction utility

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/cclive/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libcurl-devel

%description
cclive is a command line video extraction utility similar to clive but with
lower requirements. Its features are few and essential. Supports Youtube,
Googlevideo, Break, Liveleak, Sevenload, Evisortv and Dailymotion.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Apr 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-2
- URL fix
- Preserve timestamps
- Remove INSTALL file from doc section
* Sun Apr 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-1
- Rebuild for 0.3.2
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.1-1
- Initial build



--- NEW FILE import.log ---
cclive-0_3_2-2_fc10:F-10:cclive-0.3.2-2.fc10.src.rpm:1240519941


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:43:38 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:52:42 -0000	1.2
@@ -0,0 +1 @@
+cclive-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:43:38 -0000	1.1
+++ sources	23 Apr 2009 20:52:42 -0000	1.2
@@ -0,0 +1 @@
+1136b0550c19aa58f47d053e4939ed58  cclive-0.3.2.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 20:54:58 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 20:54:58 +0000 (UTC)
Subject: rpms/cclive/F-9 cclive.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423205458.1850E70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32634/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	cclive.spec import.log 
Log Message:
New package



--- NEW FILE cclive.spec ---
Name:           cclive
Version:        0.3.2
Release:        2%{?dist}
Summary:        Command line video extraction utility

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/cclive/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libcurl-devel

%description
cclive is a command line video extraction utility similar to clive but with
lower requirements. Its features are few and essential. Supports Youtube,
Googlevideo, Break, Liveleak, Sevenload, Evisortv and Dailymotion.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Apr 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-2
- URL fix
- Preserve timestamps
- Remove INSTALL file from doc section
* Sun Apr 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.2-1
- Rebuild for 0.3.2
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.1-1
- Initial build



--- NEW FILE import.log ---
cclive-0_3_2-2_fc10:F-9:cclive-0.3.2-2.fc10.src.rpm:1240520039


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:43:38 -0000	1.1
+++ .cvsignore	23 Apr 2009 20:54:27 -0000	1.2
@@ -0,0 +1 @@
+cclive-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:43:38 -0000	1.1
+++ sources	23 Apr 2009 20:54:27 -0000	1.2
@@ -0,0 +1 @@
+1136b0550c19aa58f47d053e4939ed58  cclive-0.3.2.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 21:00:51 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 21:00:51 +0000 (UTC)
Subject: rpms/abby/devel abby.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423210051.D8D7670104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2473/devel

Modified Files:
	.cvsignore sources 
Added Files:
	abby.spec import.log 
Log Message:
New package



--- NEW FILE abby.spec ---
Name:           abby
Version:        0.2.0 
Release:        2%{?dist}
Summary:        Front-end for cclive and clive

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/abby/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel desktop-file-utils
Requires:       cclive

%description
abby is a front-end for clive and cclive, allowing users unfamiliar with
command-line interfaces to make most of cclive using a graphical
user-interface. abby is written in C++. 

%prep
%setup -q
echo "[Desktop Entry]" > %{name}.desktop
echo "Name=abby" >> %{name}.desktop
echo "GenericName=abby" >> %{name}.desktop
echo "Comment=Front-end for cclive and clive" >> %{name}.desktop
echo "Exec=abby" >> %{name}.desktop
echo "Terminal=false" >> %{name}.desktop
echo "Type=Application" >> %{name}.desktop
echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop



%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -Dm 755 -p %{name} $RPM_BUILD_ROOT%{_bindir}
desktop-file-install --vendor=""   \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 21 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-2
- URL fix
- Add cclive as an explicit require
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-1
- Initial build


--- NEW FILE import.log ---
abby-0_2_0-2_fc10:HEAD:abby-0.2.0-2.fc10.src.rpm:1240520381


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:44:22 -0000	1.1
+++ .cvsignore	23 Apr 2009 21:00:21 -0000	1.2
@@ -0,0 +1 @@
+abby-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:44:22 -0000	1.1
+++ sources	23 Apr 2009 21:00:21 -0000	1.2
@@ -0,0 +1 @@
+79f5ee92dc51412361ac6c0b72eced64  abby-0.2.0.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 21:02:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 21:02:46 +0000 (UTC)
Subject: rpms/abby/F-11 abby.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423210246.6C45570104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3184/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	abby.spec import.log 
Log Message:
New package



--- NEW FILE abby.spec ---
Name:           abby
Version:        0.2.0 
Release:        2%{?dist}
Summary:        Front-end for cclive and clive

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/abby/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel desktop-file-utils
Requires:       cclive

%description
abby is a front-end for clive and cclive, allowing users unfamiliar with
command-line interfaces to make most of cclive using a graphical
user-interface. abby is written in C++. 

%prep
%setup -q
echo "[Desktop Entry]" > %{name}.desktop
echo "Name=abby" >> %{name}.desktop
echo "GenericName=abby" >> %{name}.desktop
echo "Comment=Front-end for cclive and clive" >> %{name}.desktop
echo "Exec=abby" >> %{name}.desktop
echo "Terminal=false" >> %{name}.desktop
echo "Type=Application" >> %{name}.desktop
echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop



%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -Dm 755 -p %{name} $RPM_BUILD_ROOT%{_bindir}
desktop-file-install --vendor=""   \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 21 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-2
- URL fix
- Add cclive as an explicit require
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-1
- Initial build


--- NEW FILE import.log ---
abby-0_2_0-2_fc10:F-11:abby-0.2.0-2.fc10.src.rpm:1240520513


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:44:22 -0000	1.1
+++ .cvsignore	23 Apr 2009 21:02:15 -0000	1.2
@@ -0,0 +1 @@
+abby-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:44:22 -0000	1.1
+++ sources	23 Apr 2009 21:02:16 -0000	1.2
@@ -0,0 +1 @@
+79f5ee92dc51412361ac6c0b72eced64  abby-0.2.0.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 21:04:28 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 21:04:28 +0000 (UTC)
Subject: rpms/abby/F-10 abby.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423210428.C43C170104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3722/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	abby.spec import.log 
Log Message:
New package



--- NEW FILE abby.spec ---
Name:           abby
Version:        0.2.0 
Release:        2%{?dist}
Summary:        Front-end for cclive and clive

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/abby/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel desktop-file-utils
Requires:       cclive

%description
abby is a front-end for clive and cclive, allowing users unfamiliar with
command-line interfaces to make most of cclive using a graphical
user-interface. abby is written in C++. 

%prep
%setup -q
echo "[Desktop Entry]" > %{name}.desktop
echo "Name=abby" >> %{name}.desktop
echo "GenericName=abby" >> %{name}.desktop
echo "Comment=Front-end for cclive and clive" >> %{name}.desktop
echo "Exec=abby" >> %{name}.desktop
echo "Terminal=false" >> %{name}.desktop
echo "Type=Application" >> %{name}.desktop
echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop



%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -Dm 755 -p %{name} $RPM_BUILD_ROOT%{_bindir}
desktop-file-install --vendor=""   \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 21 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-2
- URL fix
- Add cclive as an explicit require
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-1
- Initial build


--- NEW FILE import.log ---
abby-0_2_0-2_fc10:F-10:abby-0.2.0-2.fc10.src.rpm:1240520616


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:44:22 -0000	1.1
+++ .cvsignore	23 Apr 2009 21:03:58 -0000	1.2
@@ -0,0 +1 @@
+abby-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:44:22 -0000	1.1
+++ sources	23 Apr 2009 21:03:58 -0000	1.2
@@ -0,0 +1 @@
+79f5ee92dc51412361ac6c0b72eced64  abby-0.2.0.tar.bz2



From eponyme at fedoraproject.org  Thu Apr 23 21:06:22 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 23 Apr 2009 21:06:22 +0000 (UTC)
Subject: rpms/abby/F-9 abby.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090423210622.17F8D70104@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4305/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	abby.spec import.log 
Log Message:
New package



--- NEW FILE abby.spec ---
Name:           abby
Version:        0.2.0 
Release:        2%{?dist}
Summary:        Front-end for cclive and clive

Group:          Applications/Multimedia 
License:        GPLv3+
URL:            http://code.google.com/p/abby/
Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel desktop-file-utils
Requires:       cclive

%description
abby is a front-end for clive and cclive, allowing users unfamiliar with
command-line interfaces to make most of cclive using a graphical
user-interface. abby is written in C++. 

%prep
%setup -q
echo "[Desktop Entry]" > %{name}.desktop
echo "Name=abby" >> %{name}.desktop
echo "GenericName=abby" >> %{name}.desktop
echo "Comment=Front-end for cclive and clive" >> %{name}.desktop
echo "Exec=abby" >> %{name}.desktop
echo "Terminal=false" >> %{name}.desktop
echo "Type=Application" >> %{name}.desktop
echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop



%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -Dm 755 -p %{name} $RPM_BUILD_ROOT%{_bindir}
desktop-file-install --vendor=""   \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 21 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-2
- URL fix
- Add cclive as an explicit require
* Sun Apr  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.2.0-1
- Initial build


--- NEW FILE import.log ---
abby-0_2_0-2_fc10:F-9:abby-0.2.0-2.fc10.src.rpm:1240520712


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:44:22 -0000	1.1
+++ .cvsignore	23 Apr 2009 21:05:50 -0000	1.2
@@ -0,0 +1 @@
+abby-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:44:22 -0000	1.1
+++ sources	23 Apr 2009 21:05:51 -0000	1.2
@@ -0,0 +1 @@
+79f5ee92dc51412361ac6c0b72eced64  abby-0.2.0.tar.bz2



From cebbert at fedoraproject.org  Thu Apr 23 21:09:48 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 21:09:48 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-crypto-aes-padlock-fix-autoload-2.patch, 
	NONE, 1.1 kernel.spec, 1.1345, 1.1346
Message-ID: <20090423210948.4694770104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5231

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-crypto-aes-padlock-fix-autoload-2.patch 
Log Message:
Add missed patch for fixing VIA Padlock driver autoload.

linux-2.6-crypto-aes-padlock-fix-autoload-2.patch:

--- NEW FILE linux-2.6-crypto-aes-padlock-fix-autoload-2.patch ---
commit 37fc334cc8eb84f5fe0a5a1cbe6a6a68049e142a
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Tue Apr 21 13:27:16 2009 +0800

    crypto: api - Fix algorithm module auto-loading
    
    The commit a760a6656e6f00bb0144a42a048cf0266646e22c (crypto:
    api - Fix module load deadlock with fallback algorithms) broke
    the auto-loading of algorithms that require fallbacks.  The
    problem is that the fallback mask check is missing an and which
    cauess bits that should be considered to interfere with the
    result.
    
    Reported-by: Chuck Ebbert <cebbert at redhat.com>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

diff --git a/crypto/api.c b/crypto/api.c
index 314dab9..fd2545d 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -221,7 +221,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
 
 		request_module(name);
 
-		if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) &&
+		if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
+		      CRYPTO_ALG_NEED_FALLBACK) &&
 		    snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp))
 			request_module(tmp);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1345
retrieving revision 1.1346
diff -u -r1.1345 -r1.1346
--- kernel.spec	23 Apr 2009 17:49:58 -0000	1.1345
+++ kernel.spec	23 Apr 2009 21:09:17 -0000	1.1346
@@ -714,6 +714,7 @@
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
 Patch9400: linux-2.6-crypto-aes-padlock-fix-autoload.patch
+Patch9401: linux-2.6-crypto-aes-padlock-fix-autoload-2.patch
 
 # Backport of upstream memory reduction for ftrace
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
@@ -1329,6 +1330,7 @@
 
 # make padlock autoload again
 ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload.patch
+ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload-2.patch
 
 # Reduce the memory usage of ftrace if you don't use it.
 ApplyPatch linux-2.6-ftrace-memory-reduction.patch
@@ -1909,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-46.rc1
+- Add missed patch for fixing VIA Padlock driver autoload.
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-45.rc1
 - drm-backport-f11-fixes-1.patch
 



From kkofler at fedoraproject.org  Thu Apr 23 21:29:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 21:29:03 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.1,
	1.2 kdelibs.spec, 1.470, 1.471
Message-ID: <20090423212903.600DE70106@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9058/devel

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
- fix the kconf_update scriptlet for #495998

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	20 Apr 2009 12:23:37 -0000	1.1
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:02 -0000	1.2
@@ -21,9 +21,17 @@
 +}
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
-@@ -0,0 +1,4 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-23 23:18:43.000000000 +0200
+@@ -0,0 +1,12 @@
 +# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
-+Id=PlasmaPopupAppletFixGroups
-+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
++Id=PlasmaPopupAppletFixGroups1
++File=plasma-appletsrc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups2
++File=plasmarc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups3
++File=plasmoidviewer-appletsrc
 +Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- kdelibs.spec	21 Apr 2009 15:07:16 -0000	1.470
+++ kdelibs.spec	23 Apr 2009 21:29:02 -0000	1.471
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
+- fix the kconf_update scriptlet for #495998
+
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver
 



From kkofler at fedoraproject.org  Thu Apr 23 21:29:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 21:29:32 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.1,
	1.2 kdelibs.spec, 1.419, 1.420
Message-ID: <20090423212932.189F570104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9058/F-10

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
- fix the kconf_update scriptlet for #495998

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	20 Apr 2009 12:45:39 -0000	1.1
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:01 -0000	1.2
@@ -21,9 +21,17 @@
 +}
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
-@@ -0,0 +1,4 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-23 23:18:43.000000000 +0200
+@@ -0,0 +1,12 @@
 +# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
-+Id=PlasmaPopupAppletFixGroups
-+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
++Id=PlasmaPopupAppletFixGroups1
++File=plasma-appletsrc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups2
++File=plasmarc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups3
++File=plasmoidviewer-appletsrc
 +Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- kdelibs.spec	21 Apr 2009 15:13:01 -0000	1.419
+++ kdelibs.spec	23 Apr 2009 21:29:01 -0000	1.420
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
+- fix the kconf_update scriptlet for #495998
+
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver
 



From kkofler at fedoraproject.org  Thu Apr 23 21:29:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 21:29:32 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.1,
	1.2 kdelibs.spec, 1.470, 1.471
Message-ID: <20090423212932.7FDDB70104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9058/F-11

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
- fix the kconf_update scriptlet for #495998

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	20 Apr 2009 12:45:39 -0000	1.1
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:02 -0000	1.2
@@ -21,9 +21,17 @@
 +}
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
-@@ -0,0 +1,4 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-23 23:18:43.000000000 +0200
+@@ -0,0 +1,12 @@
 +# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
-+Id=PlasmaPopupAppletFixGroups
-+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
++Id=PlasmaPopupAppletFixGroups1
++File=plasma-appletsrc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups2
++File=plasmarc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups3
++File=plasmoidviewer-appletsrc
 +Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- kdelibs.spec	21 Apr 2009 11:05:10 -0000	1.470
+++ kdelibs.spec	23 Apr 2009 21:29:02 -0000	1.471
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
+- fix the kconf_update scriptlet for #495998
+
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver
 



From kkofler at fedoraproject.org  Thu Apr 23 21:29:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 21:29:32 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.1, 
	1.2 kdelibs.spec, 1.394, 1.395
Message-ID: <20090423212932.DBF0070104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9058/F-9

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
- fix the kconf_update scriptlet for #495998

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	20 Apr 2009 12:45:40 -0000	1.1
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:02 -0000	1.2
@@ -21,9 +21,17 @@
 +}
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-19 05:31:20.000000000 +0200
-@@ -0,0 +1,4 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd	2009-04-23 23:18:43.000000000 +0200
+@@ -0,0 +1,12 @@
 +# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
-+Id=PlasmaPopupAppletFixGroups
-+File=plasma-appletsrc,plasmarc,plasmoidviewer-appletsrc
++Id=PlasmaPopupAppletFixGroups1
++File=plasma-appletsrc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups2
++File=plasmarc
++Script=plasma_popupapplet_fix_groups.pl,perl
++#
++Id=PlasmaPopupAppletFixGroups3
++File=plasmoidviewer-appletsrc
 +Script=plasma_popupapplet_fix_groups.pl,perl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- kdelibs.spec	21 Apr 2009 15:13:02 -0000	1.394
+++ kdelibs.spec	23 Apr 2009 21:29:02 -0000	1.395
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -428,6 +428,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
+- fix the kconf_update scriptlet for #495998
+
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver
 



From wcohen at fedoraproject.org  Thu Apr 23 21:36:18 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu, 23 Apr 2009 21:36:18 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile-iaperf.patch, NONE, 1.1 oprofile.spec, 
	1.76, 1.77
Message-ID: <20090423213618.D809470104@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11205

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-iaperf.patch 
Log Message:
- Backport Intel Architecture Perfmon support. Resolves: rhbz #497230


oprofile-iaperf.patch:

--- NEW FILE oprofile-iaperf.patch ---
diff -up /dev/null oprofile-0.9.4/events/i386/arch_perfmon/events
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/events/i386/arch_perfmon/events	2009-04-23 17:13:46.000000000 -0400
@@ -0,0 +1,10 @@
+# 
+# Intel Architectural events as of arch perfmon v2
+# 
+event:0x3c counters:cpuid um:zero minimum:6000 filter:0 name:CPU_CLK_UNHALTED : Clock cycles when not halted
+event:0x3c counters:cpuid um:one minimum:6000 filter:2 name:UNHALTED_REFERENCE_CYCLES : Unhalted reference cycles
+event:0xc0 counters:cpuid um:zero minimum:6000 filter:1 name:INST_RETIRED_ANY_P : number of instructions retired
+event:0x2e counters:cpuid um:x41 minimum:6000 filter:5 name:LLC_MISSES : L2 cache demand requests from this core that missed the L2
+event:0x2e counters:cpuid um:x4f minimum:6000 filter:4 name:LLC_REFS : L2 cache demand requests from this core
+event:0xc4 counters:cpuid um:zero minimum:500 filter:6 name:BR_INST_RETIRED : number of branch instructions retired
+event:0xc5 counters:cpuid um:zero minimum:500 filter:7 name:BR_MISS_PRED_RETIRED : number of mispredicted branches retired (precise)
diff -up /dev/null oprofile-0.9.4/events/i386/arch_perfmon/unit_masks
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/events/i386/arch_perfmon/unit_masks	2009-04-23 17:13:18.000000000 -0400
@@ -0,0 +1,11 @@
+# Intel architectural perfmon unit masks
+#
+name:zero type:mandatory default:0x0
+	0x0 No unit mask
+name:one type:mandatory default:0x1
+	0x1 No unit mask
+name:x41 type:mandatory default:0x41
+	0x41 No unit mask
+name:x4f type:mandatory default:0x4f
+	0x4f No unit mask
+#
\ No newline at end of file
diff -up oprofile-0.9.4/events/Makefile.am.orig oprofile-0.9.4/events/Makefile.am
--- oprofile-0.9.4/events/Makefile.am.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/events/Makefile.am	2009-04-23 17:13:18.000000000 -0400
@@ -13,6 +13,7 @@ event_files = \
 	i386/ppro/events i386/ppro/unit_masks \
 	i386/p6_mobile/events i386/p6_mobile/unit_masks \
 	i386/core/events i386/core/unit_masks \
+	i386/arch_perfmon/events i386/arch_perfmon/unit_masks \
 	ia64/ia64/events ia64/ia64/unit_masks \
 	ia64/itanium2/events ia64/itanium2/unit_masks \
 	ia64/itanium/events ia64/itanium/unit_masks \
diff -up oprofile-0.9.4/libop/op_cpu_type.c.orig oprofile-0.9.4/libop/op_cpu_type.c
--- oprofile-0.9.4/libop/op_cpu_type.c.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_cpu_type.c	2009-04-23 17:17:37.000000000 -0400
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "op_cpu_type.h"
+#include "op_hw_specific.h"
 
 struct cpu_descr {
 	char const * pretty;
@@ -74,6 +75,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
 	{ "e300", "ppc/e300", CPU_PPC_E300, 4 },
 	{ "AVR32", "avr32", CPU_AVR32, 3 },
+ 	{ "Intel Architectural Perfmon", "i386/arch_perfmon", CPU_ARCH_PERFMON, 0},
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
@@ -151,8 +153,14 @@ char const * op_get_cpu_name(op_cpu cpu_
 
 int op_get_nr_counters(op_cpu cpu_type)
 {
+	int cnt;
+
 	if (cpu_type <= CPU_NO_GOOD || cpu_type >= MAX_CPU_TYPE)
 		return 0;
 
+	cnt = arch_num_counters(cpu_type);
+	if (cnt >= 0)
+		return cnt;
+
 	return cpu_descrs[cpu_type].nr_counters;
 }
diff -up oprofile-0.9.4/libop/op_cpu_type.h.orig oprofile-0.9.4/libop/op_cpu_type.h
--- oprofile-0.9.4/libop/op_cpu_type.h.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_cpu_type.h	2009-04-23 17:17:07.000000000 -0400
@@ -72,6 +72,7 @@ typedef enum {
 	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
 	CPU_PPC_E300, /**< e300 */
 	CPU_AVR32, /**< AVR32 */
+ 	CPU_ARCH_PERFMON, /**< Intel architectural perfmon */
 	MAX_CPU_TYPE
 } op_cpu;
 
diff -up oprofile-0.9.4/libop/op_events.c.orig oprofile-0.9.4/libop/op_events.c
--- oprofile-0.9.4/libop/op_events.c.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_events.c	2009-04-23 17:13:18.000000000 -0400
@@ -16,6 +16,7 @@
 #include "op_fileio.h"
 #include "op_string.h"
 #include "op_cpufreq.h"
+#include "op_hw_specific.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -27,6 +28,8 @@ static LIST_HEAD(um_list);
 static char const * filename;
 static unsigned int line_nr;
 
+static void delete_event(struct op_event * event);
+
 static void parse_error(char const * context)
 {
 	fprintf(stderr, "oprofile: parse error in %s, line %u\n",
@@ -329,7 +332,8 @@ static void read_events(char const * fil
 		seen_um = 0;
 		seen_minimum = 0;
 		event = new_event();
-
+		event->filter = -1;
+		
 		c = line;
 		while (next_token(&c, &name, &value)) {
 			if (strcmp(name, "name") == 0) {
@@ -351,7 +355,10 @@ static void read_events(char const * fil
 				if (seen_counters)
 					parse_error("duplicate counters: tag");
 				seen_counters = 1;
-				event->counter_mask = parse_counter_mask(value);
+				if (!strcmp(value, "cpuid"))
+					event->counter_mask = arch_get_counter_mask();
+				else
+					event->counter_mask = parse_counter_mask(value);
 				free(value);
 			} else if (strcmp(name, "um") == 0) {
 				if (seen_um)
@@ -368,6 +375,9 @@ static void read_events(char const * fil
 				free(value);
 			} else if (strcmp(name, "desc") == 0) {
 				event->desc = value;
+			} else if (strcmp(name, "filter") == 0) { 
+				event->filter = parse_int(value);
+				free(value);
 			} else {
 				parse_error("unknown tag");
 			}
@@ -423,6 +433,18 @@ static void check_unit_mask(struct op_un
 	}
 }
 
+static void arch_filter_events(op_cpu cpu_type)
+{
+	struct list_head * pos, * pos2;
+	unsigned filter = arch_get_filter(cpu_type);
+	if (!filter)
+		return;
+	list_for_each_safe (pos, pos2, &events_list) { 
+		struct op_event * event = list_entry(pos, struct op_event, event_next);
+		if (event->filter >= 0 && ((1U << event->filter) & filter))
+			delete_event(event);
+	}
+}
 
 static void load_events(op_cpu cpu_type)
 {
@@ -459,6 +481,8 @@ static void load_events(op_cpu cpu_type)
 	read_unit_masks(um_file);
 	read_events(event_file);
 
+	arch_filter_events(cpu_type);
+
 	/* sanity check: all unit mask must be used */
 	list_for_each(pos, &um_list) {
 		struct op_unit_mask * um = list_entry(pos, struct op_unit_mask, um_next);
@@ -471,10 +495,10 @@ static void load_events(op_cpu cpu_type)
 	free(event_dir);
 }
 
-
 struct list_head * op_events(op_cpu cpu_type)
 {
 	load_events(cpu_type);
+	arch_filter_events(cpu_type);
 	return &events_list;
 }
 
@@ -522,20 +546,24 @@ void op_free_events(void)
 }
 
 
-static struct op_event * find_event(u32 nr)
+static struct op_event * find_event_um(u32 nr, u32 um)
 {
 	struct list_head * pos;
+	unsigned int i;
 
 	list_for_each(pos, &events_list) {
 		struct op_event * event = list_entry(pos, struct op_event, event_next);
-		if (event->val == nr)
-			return event;
+		if (event->val == nr) { 
+			for (i = 0; i < event->unit->num; i++) { 
+				if (event->unit->um[i].value == um)
+					return event;		
+			} 
+		}
 	}
 
 	return NULL;
 }
 
-
 static FILE * open_event_mapping_file(char const * cpu_name) 
 {
 	char * ev_map_file;
@@ -687,13 +715,13 @@ struct op_event * find_event_by_name(cha
 }
 
 
-struct op_event * op_find_event(op_cpu cpu_type, u32 nr)
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr, u32 um)
 {
 	struct op_event * event;
 
 	load_events(cpu_type);
 
-	event = find_event(nr);
+	event = find_event_um(nr, um);
 
 	return event;
 }
@@ -701,38 +729,43 @@ struct op_event * op_find_event(op_cpu c
 
 int op_check_events(int ctr, u32 nr, u32 um, op_cpu cpu_type)
 {
-	int ret = OP_OK_EVENT;
-	struct op_event * event;
+	int ret = OP_INVALID_EVENT;
 	size_t i;
 	u32 ctr_mask = 1 << ctr;
+	struct list_head * pos;
 
 	load_events(cpu_type);
 
-	event = find_event(nr);
+	list_for_each(pos, &events_list) {
+		struct op_event * event = list_entry(pos, struct op_event, event_next);
+		if (event->val != nr)
+			continue;
 
-	if (!event) {
-		ret |= OP_INVALID_EVENT;
-		return ret;
-	}
+		ret = OP_OK_EVENT;
 
-	if ((event->counter_mask & ctr_mask) == 0)
-		ret |= OP_INVALID_COUNTER;
+		if ((event->counter_mask & ctr_mask) == 0)
+			ret |= OP_INVALID_COUNTER;
 
-	if (event->unit->unit_type_mask == utm_bitmask) {
-		for (i = 0; i < event->unit->num; ++i)
-			um &= ~(event->unit->um[i].value);			
-		
-		if (um)
-			ret |= OP_INVALID_UM;
+		if (event->unit->unit_type_mask == utm_bitmask) {
+			for (i = 0; i < event->unit->num; ++i)
+				um &= ~(event->unit->um[i].value);			
+			
+			if (um)
+				ret |= OP_INVALID_UM;
+			
+		} else {
+			for (i = 0; i < event->unit->num; ++i) {
+				if (event->unit->um[i].value == um)
+					break;
+			}
+			
+			if (i == event->unit->num)
+				ret |= OP_INVALID_UM;
 
-	} else {
-		for (i = 0; i < event->unit->num; ++i) {
-			if (event->unit->um[i].value == um)
-				break;
 		}
 
-		if (i == event->unit->num)
-			ret |= OP_INVALID_UM;
+		if (ret == OP_OK_EVENT)
+			return ret;
 	}
 
 	return ret;
@@ -759,6 +792,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_ATHLON:
 		case CPU_HAMMER:
 		case CPU_FAMILY10:
+		case CPU_ARCH_PERFMON:
 			descr->name = "CPU_CLK_UNHALTED";
 			break;
 
diff -up oprofile-0.9.4/libop/op_events.h.orig oprofile-0.9.4/libop/op_events.h
--- oprofile-0.9.4/libop/op_events.h.orig	2006-08-26 20:10:12.000000000 -0400
+++ oprofile-0.9.4/libop/op_events.h	2009-04-23 17:13:18.000000000 -0400
@@ -56,6 +56,7 @@ struct op_event {
 	char * name;		/**< the event name */
 	char * desc;      	/**< the event description */
 	int min_count;		/**< minimum counter value allowed */
+	int filter;		/**< architecture specific filter or -1 */
 	struct list_head event_next;   /**< next event in list */
 };
 
@@ -63,7 +64,7 @@ struct op_event {
 struct list_head * op_events(op_cpu cpu_type);
 
 /** Find a given event, returns NULL on error */
-struct op_event * op_find_event(op_cpu cpu_type, u32 nr);
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr, u32 um);
 
 /** Find a given event by name */
 struct op_event * find_event_by_name(char const * name);
diff -up /dev/null oprofile-0.9.4/libop/op_hw_specific.h
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/libop/op_hw_specific.h	2009-04-23 17:13:18.000000000 -0400
@@ -0,0 +1,64 @@
+/* 
+ * @file architecture specific interfaces
+ * @remark Copyright 2008 Intel Corporation
+ * @remark Read the file COPYING
+ * @author Andi Kleen
+ */
+
+#if defined(__i386__) || defined(__x86_64__) 
+
+/* Assume we run on the same host as the profilee */
+
+#define num_to_mask(x) ((1U << (x)) - 1)
+
+static inline unsigned arch_get_filter(op_cpu cpu_type)
+{
+	if (cpu_type == CPU_ARCH_PERFMON) { 
+		unsigned ebx, eax;
+		asm("cpuid" : "=a" (eax), "=b" (ebx) : "0" (0xa) : "ecx","edx");
+		return ebx & num_to_mask(eax >> 24);
+	}
+	return 0;
+}
+
+static inline int arch_num_counters(op_cpu cpu_type) 
+{
+	if (cpu_type == CPU_ARCH_PERFMON) {
+		unsigned v;
+		asm("cpuid" : "=a" (v) : "0" (0xa) : "ebx","ecx","edx");
+		return (v >> 8) & 0xff;
+	} 
+	return -1;
+}
+
+static inline unsigned arch_get_counter_mask(void)
+{
+	unsigned v;
+	asm("cpuid" : "=a" (v) : "0" (0xa) : "ebx","ecx","edx");
+	return num_to_mask((v >> 8) & 0xff);	
+}
+
+#else
+
+static inline unsigned arch_get_filter(op_cpu cpu_type)
+{
+	/* Do something with passed arg to shut up the compiler warning */
+	if (cpu_type != CPU_NO_GOOD)
+		return 0;
+	return 0;
+}
+
+static inline int arch_num_counters(op_cpu cpu_type) 
+{
+	/* Do something with passed arg to shut up the compiler warning */
+	if (cpu_type != CPU_NO_GOOD)
+		return -1;
+	return -1;
+}
+
+static inline unsigned arch_get_counter_mask(void)
+{
+	return 0;
+}
+
+#endif
diff -up oprofile-0.9.4/libpp/op_header.cpp.orig oprofile-0.9.4/libpp/op_header.cpp
--- oprofile-0.9.4/libpp/op_header.cpp.orig	2008-04-29 08:07:46.000000000 -0400
+++ oprofile-0.9.4/libpp/op_header.cpp	2009-04-23 17:13:18.000000000 -0400
@@ -165,7 +165,7 @@ string const op_print_event(op_cpu cpu_t
 		return str;
 	}
 
-	struct op_event * event = op_find_event(cpu_type, type);
+	struct op_event * event = op_find_event(cpu_type, type, um);
 
 	if (!event) {
 		cerr << "Could not locate event " << int(type) << endl;
@@ -205,7 +205,7 @@ string const op_xml_print_event(op_cpu c
 	if (cpu_type == CPU_TIMER_INT || cpu_type == CPU_RTC)
 		return xml_utils::get_timer_setup((size_t)count);
 
-	struct op_event * event = op_find_event(cpu_type, type);
+	struct op_event * event = op_find_event(cpu_type, type, um);
 	if (!event) {
 		cerr << "Could not locate event " << int(type) << endl;
 		return "";
diff -up oprofile-0.9.4/utils/ophelp.c.orig oprofile-0.9.4/utils/ophelp.c
--- oprofile-0.9.4/utils/ophelp.c.orig	2008-02-22 11:17:49.000000000 -0500
+++ oprofile-0.9.4/utils/ophelp.c	2009-04-23 17:13:19.000000000 -0400
@@ -401,6 +401,13 @@ int main(int argc, char const * argv[])
 		printf("See Intel Architecture Developer's Manual Volume 3, Appendix A and\n"
 		"Intel Architecture Optimization Reference Manual (730795-001)\n\n");
 		break;
+
+	case CPU_ARCH_PERFMON:
+		printf("See Intel 64 and IA-32 Architectures Software Developer's Manual\n"
+		"Volume 3B (Document 253669) Chapter 18 for architectural perfmon events\n"
+		"This is a limited set of fallback events because oprofile doesn't know your CPU\n");
+		break;
+	
 	case CPU_IA64:
 	case CPU_IA64_1:
 	case CPU_IA64_2:


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- oprofile.spec	9 Apr 2009 14:16:50 -0000	1.76
+++ oprofile.spec	23 Apr 2009 21:35:47 -0000	1.77
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -15,6 +15,7 @@
 Patch83: oprofile-0.9.3-xen.patch
 #Patch100: oprofile-gcc43.patch
 Patch101: oprofile-basename.patch
+Patch102: oprofile-iaperf.patch
 URL: http://oprofile.sf.net
 
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
@@ -84,6 +85,7 @@
 %patch83 -p1 -b .xen
 #%patch100 -p1 -b .gcc43
 %patch101 -p1 -b .basename
+%patch102 -p1 -b .iaperf
 
 ./autogen.sh
 
@@ -225,6 +227,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Thu Apr 23 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-7
+- Backport Intel Architecture Perfmon support. Resolves: rhbz #497230
+
 * Wed Apr 8 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-6
 - Test for basename declaration.
 



From caolanm at fedoraproject.org  Thu Apr 23 21:38:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 23 Apr 2009 21:38:18 +0000 (UTC)
Subject: rpms/hunspell-kk/devel dict-kk.oxt, NONE, 1.1 hunspell-kk.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090423213818.B9C5370104@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-kk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11863/devel

Added Files:
	dict-kk.oxt hunspell-kk.spec import.log 
Log Message:



--- NEW FILE dict-kk.oxt ---
PK

???)r??g?XKYD&??L???U" ???f?`-
"9(#G??F'v???o???7PK

?o	?]?=?x??x??|??
\?^Q??_Hv?tm?~>)2??$_??
??????A?%?? ?8???O!??y?a????J???z???????"?8UM?i???G"?E???yIW?ZBh????}zD6j??z?{?_????a?????????
??_?'DP?u?<??ue???????????PQ?????u????{??pq??p??????F?z]*???+??????J?.F??&??!
o?????????)1c[*?u??,RI~
???Q???x?U?????Q?O??`;m?t?????"LJ??Gsx4?????????X?J?;(????EP3>E9????j?f$??P?[?@xj?????? <Z???M??C?????Z?u]???jd?1??G??y???V?"???_o?[???A
%??????????.?Q?|????/J???_??_??3??i???????Z?????????]?@??LM???5???A%?????hG)?5?B?V???f??C?Z~~(??MU?yLK
??:?}?J1??Z???????D2?v?x<???N?T???)i<?fd??????????Q?
?du~Z?k4+?R^?n?4???5QJ	?????`}?^?AyD???*e?4???oU??K{y?????????f@??Zw?(????????z?#
??#w??
??\???/??j????L???A??$?h??%?QwM$|",?o?
I?s-o
m??a?St??|???\????F;??a??
??-?k?a/?wL??i?hE?3????+?}?X?(?@??aE?V^?q#\F0??WD?????[;???Vd4L?8??J?"????b?|G??X??R??1?qUW`t????&-??
.?M`Q?<]??@?!?u>??g"ox0ZU???1????1X8?`??P?????!???Qr?????
?????{??4
Hu??<??S?KM$
??Q??
d?????7???J4???`?EiCoeJQ????FjHu?S?$@?>u???T??K`?+??'b?'?i???t3??
?
????}??5??TszN
?????B|dDP??W@????J?g??G??J??P????	???????o1?
_^<??,????/]?
#??z????Xz????RW?[
?b
?]?\	52E:P??'g??G?J??$B???0?2?K??vz1&???"X??d

y ????$Z7?A??{?{??2?.P??VC?"N]??vF-?1???}??x??/N???_????no3D??0E??c?d?TX ?h??	????4???mt"????7|'?A??^?CV?b?.??X??h
?S?D??Fs??r?X=?r?9{ ??7???4????c????
x&z?j??XsJ???????`?Q?
?5?PS??=Nc?X?i??
?H?O#o
$uNJ??Bk???V?T?c???J?Y??YRZ???G?(M??_
??F?(???XAXS!?%Z	???V?w?U???	???3??IC?G?B]???q????????????E?;?????l??????,[Qn??'?
`X?=?ZY??????????-6k??
=???"n???&1??2??	??????4?w|???W?
RA?8x?x ?Vi!o?q?P?,?()QkU???q?Y`X?_^
????<?s???>?D?0?????dy??E=???JE??V?L????D??_=6?Ju?(Oml{	?^#V(???E?6?!?G?y?6g?A
?9#$^???'??A?B?*??5?"N?B?W?>)?b????$N?B/O?<??A@?????#?A??/??k??Zv?z???I?z!??+D/????E'?Osa?QE?|?T???S??I4k?7s'?	??H?A??????B???Van???@?+?- at I?+!?????????(fld?$c]?t?|?H?K?$G?_?N^Z7??;??s?.??7??`cH4':??7??=??4?????'??t`????r_??'hN?TK??d\N
l??KI??
:???,???/????u9??????l???1?????:
???EtJMh-^?iE,??i:?\'/k?-???]?Q?*JPz??6?sj3\khi???/?Y????x??[?
y4
=?}?Bi?cJ.?

P??.?
 ?i?y??F??b??U?L$J?87??$??t?m???M??Y??
?R?]?=?Uh?[T?^I?V??H?????
?\?7?o??L ??3?F???N??D?????Q?Y?X???3uo?PU??Z?2?3?[???7?N???8?H1??RyS?*?/
51?p 4?
N?d/i!?IR?/?Lm?b???r%)d??\???,5??:t???J?
J+???*2????$>???????Ws??????F4q?42??}??Y|??%f?e
????X_??D??+??Sm???3;B?F?d?`??vO??OBBMA??B?T?m????E8G8X?V'???????r*P???D}
?=???J?0jH?>A;?!?h#??-OS?-U???#Kr'?2??q_?????EF?h???l???xaG???f??Xd{@?Q-c???H???
?4])???k?I??1?X??T?1y0f<?v*?^??E?
?j??y?v?D-$?Z{???uB?R?.q?{]
?????L?]?#?DDS?`?k???&?M/??x???
ZN?N5B?n?@??I???vM?N??!?*??Q2?J?)?U?,'?;9????{?5????dhs ??"??#h??;?gV???NOj?Qz?*E?????X?rE????????7?w??q??4????
Q??S??AQ?9??U???????5?
i&???i???#????r?#?v??yn???}??w?c?????%?u?	????i&?	??T??
???[nv=?`9?<[??k
r?%???V?On?vZ?}??!U?K??"?-??fg??????
?3z???r/???R'???Y????u??9q???????L?|7????????i+?-tn??????+O????????^{]???z&<?v????T?j5{&%??	?e??? ?\o?Y????`l%???????&I???a?&iLK??????*b??QB??Q???t???I3?????????z8?6??_?5?[?&F*?B
]s?^?-%r}^???z/?vB?Xeh??~S]W?2?(?????|????|????3l?????????"?W
?Dk;7??1??p???&?????=???&???-??DM?Cv7VElGm??[A??Dy )??Yo1??b??????r?#
?fGg??4?Lm????-?+?
???c<)L?do???Y?&
GI????r???`?^(????"j?<X.?\|\?|?GH????-????@?'-????s??6??0??
?p????W?A???0
?????&?(?>8B:g?=?)??k?"#^?^4H???,?j????U?78D?N???????12q?????5??`'8???jMd_??R?????:???$?>2O????|?}?"?o??	.??????zT?l#TiC	??,?
?
?+?f8j\H???Q?rFv???????m??d'??? ?????sl???/c?5YC#&??Q???C?? ???"
S>$?	???LH?\??G?B??G?#_6(?@???E??f)in???r??r????Lh?&2go??Cq?N?4??*;???kf@^????]??\?R?3"$??2)?? ????0????????
??Z|???W?????}????????B`????*?e?
J??????nY???%'q???????7m?o????0??'?Xr?)?C}??E
R@??
$???
H??p?????P??FC??;G????ws?b????x6?g????'
???w_S?s???^8D?^2*?????Gj?(c3?Qe at D~H?+??w?[??lc??|??3
?T!"QP??#?(??=???Z?&x0z?`'>??^???bB?$?D????A???1?$"?`?B????W?E????{?w*?fzMj?6?2??????;??z?~bc??K)?J???
Ys?s??8?\??7?,i8Y?y/C"?J????(??:Bhu?-J0N??CA???,???t!?-Z???`b????A?^:u?Rp??\??&??Z????[??????^???}b??S?pe?K?g???ka????%?/??????Bn??n,???jRq at t?0Q< ?R>~d?
B:P?B?LIL8???U????^&????L?qX?;?,NI??M??=	O??@;???6?*??do??L?
*Rt???!??PZ??ZI?l?h?V?3??H????@2"??k@E?????
?|I>Q??:?????P?$1???A???)|?o?d??r=?8?z????!??0???P{???P?^?????G?TzHe???Z}|_?9?X???/m??le
A?i??P????y6????5??.
?*PU?$???b?D[??g?*=@????nj?K????'G??;?pSNz?IO???x?6:?kzH?F?2??|e8??d[????WdE?l????
?S??i?????w?I?	?W??s?????z!4I`?d?:??X?N9
?2????l'_r???.g??]%??;$?+???*g"?Xb??/?$????<??????
?Z?[7?l??~0????t??v????m???c?3[$?"i0?????'??g
~n{??[??K?F?s?T?1????-???a:???>?p???'??'?AU?<????/0
?DO?&N?/???w??????}|b? h
w1'k???????g35C??????S??%H??m6}?????????[??o{???????????0?=%R??G?lU3m????~?-???}?"?8?dt?mX?}?5???y????^??)Z;?S??1?"<(q??-?????8L??=$??wnEr*?KX??3???|?\A?????:?U"????":Gd%9??'??b???????r?}???
?M??????Cx???e?u????8???R?o?
?!??
	R?"at?6T?O?0WeO???X??+?
 I?[S?! ?X??g/??An??	r%*4??6?????)?
t?Ol?????sJL{?9qY???4?
?(???>???>?:?SK%?C??-"N?=c????L
S???)cC??Dq8T???y???A?%f?WR(?4?`c??V?(m]???2@Q????E???^e?>??3?w?????^???2?7???vk?G?B?C??1?Lj?-s??O?????J???@?????8??gPAH??U?*(D?"??K?[N??)?7?:B???
????
?c?-!?Wb??Q???
?6?B?s????@??????z??S?IW??VTq? ??u????l?Al????Oj??????E?>X?b??I?5?:,\8??y????=p???>ZT?Q?:???8???@???????H?2?9?|:??
f	?:?[{3???;?f?0??????
????`??????????
?;Y?
CY??5gDp

O?87?????????????2y?/??!??z???BX?,??
???Kg"@??k?oN6??5)-0	?????t	J	
??l?5)??f??????Ha??VD?O'?Ad3n?U?L?QB?)??=????f???'???%#<*??b8i4???4?B?	?\=??J??(WJ&K????!?????wa?@SLd?H???Ii?+5???)h?0?????
??7?\?????O*?R&??`?;?-??E???>??????SX1U??eD?:?????bI?????*????1???y?+P??!?
_? ?T???x?d?b?
?$2Z?????_???*?c?
^??!???H ????Y?+e?g}??Xu?A	@?a????8<$????/??U?I??Ahc8n?@?s?	
%???A???-w*??K?;?/??Ps???a%??y?5??Z??????
~????1h?Q????3p\.???4%???29??J??&?
????+mbvR?DC$?I4p??J????G????Fx5u Z?{??
x???a\??lY?r????=`|l???q?s???\!???,-q?B????B??l??	pm???|>?7&s??
??0?Z
~????????????'??32!?y?#T(?????B????
?K???RU?6}????;????@?ft?@??0d/??????	?
???)?Qz?p*??????FY??
1?Z?r8?z?b??M?
z?
?g????(L???Is??.??i????@??2	a??q?\8Q???>?}?hM_?#?????:s0?s?"??rF?G,?1??aR
?,W<ZD?T?4%??
&?2???????<5????84?+8H??#"??`5 {R?????I?L??z????

?/	??&?fe?Kw2W
.-??Kd??&?}??q?3jKr*0G???jE??&"lu
????7B??????
?c?N|9??STeh/P?%?U_???  )?/???l?,???\????h????@???eT?y?
?uS?B?d_??_?]
v?)?j??V?D??Xc?3?5zIg???Z?TRR[??8?9???<???????zhb?? ????7`VR?bIUI?R???!$?)???0???0?b???E
??U_	D????
9???UWT?Cz?"???d?0v??UN$kx&K	????
*F8???h??s?)
?r%?b
"?
??Ix?g????yM???r??5V?]L?8(W???_Q?@Y????? \-??=H?\z{?%o?;_????????m-R?f&I%K?D??L#???
;????Tv???8d??+U\?!?}	?c??U?P_???+?LK?[S{?????????N1?????E;sF?^o*^9z-?O????D_?0??gem
?-??QWG?????	z|????N0?}N?m???;M?[???P??????E?Q?8?i4o.??i#????xN??B?#????
???*?U?L???T?v????(
L?SW??E??#???z	??l?WT
'?|?????????????zS????0?pDU?d[L0??S?b&z???G'????Yk?????sY~???st?
=?	?b???e??v!1Hd~V?I???\??]%?Dd
??6bI0JI?$???r???U7(?]???????$??Uq?tX??$;$?!???;?????e??DiJ_?B?
??T???~E??F?ZG??d
???rs~??E
|.gr?g?"$;s(??_v7??????TdY?~6#1%@???$*?>???/DN|?HyE???JM^aV?7??	??=????A?~Mm??EU?b7????YV??f?/&B{??r??5??<?????|I at _?	???:\!sx?Zf?`??q|?w??H ?%R??
????K?z??&?18???H?"-W?HL?c???;8?22?f
9?NS??%??X?'?w?????\Y????d????`|?lm?7?l??Go?????1*?n?8$H?`?C?6R?C?A?C?;f??#R)?l$??	?j?ats?????-e&?J???Y%?i?pX$fa??E2?)YQ"u??H"W?4??T?\?#?'??D?????_??&?M`C?mE???&?????b%?
D?W?:1S???F???? `?M?.p??4??N?????}\i_?YQ????
?<???????~?????7?%?D?"?*???b?QGU??{??r\??#?6C??H????\)5????c??F?\1?X???0bc???BP?????_???,?A????sME??1r???Aj???)??m?????nZ?0?mD??fM%n?{L??{?jn\atz?@?M???<o?
?|??????gC?|4??????+iKV?UU????
??qnmW	M?Qx???Rv??)E????sWI
?????^?K7?
%?!	]^P???J?/B"???c??I?}	??^>?]????S?
???81??-?????:?TcC?CIQ???)??!?K>
+??pU?K??HL	?<x???"?)?]%????}1?K??P??R???*?????W?E??Tu
?
2gq?R:?>????;$ yKKlB7)i3A?[I
????
<Q4+?DQ2?Xe?????????O????K?T??8;.$??N???^IN?}J ??zQ?	??dI????@3?l
???UC|??h'C?

F$UA???????V?7Q|?O??%7??Xod???$-?5?4B???a?dI0)K?C&c?????1"m:????????
?Z???X?????
P?p:.???F??A?(????????R??H??D?t d???{?%????k??/Dk?[
(i:??W???P??E?@!?gI?.???%1????k????????V??5??>?S??`@??F?\???K?E?C????X??8k2????!2?^	BG???H??cL???e?P?yIN+"???Qj%???"???Vr?=a??v??t)D?b??QUW??su???j???k??????A???3(???/??)?S+?V???K_R;?	????{?d_?P$
??D?"R:???[S	J
A?u(4sO??TW?"	?U?????J???*??ztc!?Z!??IT6?:?)?L????E?d??z??j?
??9`<i???)Y??y???e???????Uw>????????m_?	?~?0?S^?????`??>??????u???Ah???????{?k_??r?]??s%$??p??<?r%?6?D?b??*??)m???-?????v??,?j???,??????~0EA??#????h???{*7`	???hBs????;??O?
???
?rH?V?#F?J-?>??}?????JW.?1?)?uL?8???>9f-???????3
i|??\??k+?$n?\=V??H?d.-D}?,?-E?F0.?O??/?????y??X??%?D?e+?
?]I?d??????V??u?[???^?Q??|??"????H?z?? ?????7^?2?W?,?k?.+????p??M:emx?????1mh?&??F?d?~?F?????8?0?u(?z??2
TM<&?[S???I???Ac!?
N?+?i??U
	$??
?l?JK???????J?4?M?yw?$f??0???d??#?}?X ??:
?Fgj?????????B?rQ?mW??O????E?A??t%??$-???x\?6?]%??
??TT?w???"?{I??8???UO{y.D?????+????N??H??O?I9????A?K?&?rD\/%?w?N?W?&W'?rp?o9=j.u?N"??D/?/I7)O??{??X??G:>?@3??yRi??q??/?'???fnOOGW??8?oyY7??xQL"?QB?~?4t?=6????&D?"??o???=?U?+??(?$>A??v?6?$?????-??#u?H???K??q'??g?k???lA?????Xe?5??????s??????.???U:y?IRF? sOd???:FK?????F????8?F>Q??~R???????????R%6?)D
!Y??fUi??6P??T?KO??+9??X??v? :?????7????5Vy??8`Jt????~?????????Q????;???I at EF???????o?i'.>????;~h?R?x??????|??)n
i?l??q????g?? NFm??f	?[y'?n?V????`?$??L?I?
?N51?l?
?
??Zc,???1???'???????BqD$?*?z7h???Y?*N???0??)???
??7?l???	?
?$C????O??????-?
?),?=1?11(T?-!5???J???Eg???2VJ?S?j6V?7????HU4\????s???
T?K??6??*??????:e?? ?J?+?c%a??,a?????_=zM?'?l?#T????B???xw?r????e?v0y$uY#\B????
*W????V?}??????0?M???????j??G?????6???i???????????????k???
?o??DAT?M????H?b?????[4 }`;??V#?h?m-?	?1`2??dF@?,^?b??%????Txn?d??.B?C'?BO
??NjZ??V??C??^??X???W?=A"r???LP???J{???O?*?>?R?F???!Z?Le?n???k^?xKE????????p(y1?@1??w?*?9"??
$1"2???????????3?Jv?????D????/m?u?j?????T?"??
????$??????6?t	mP???i??-S0
 ?U?"LN/H?|?@??B??b?????E??v??T?F??m?/?^4???k?JHib
3?H(1?[^???:??????y?u??Y???<T??wJ?i4rW??n)?W??)?W?l???/?????>? ???^[??T???u???Xg?s???d??h?/?????EY?:'

???42?y????f?????*T~??@?{7?
7?99?O?X?(~%????(???$????81?'
|jkN+!??M??OfY2??W?|?c?6?YT??q?~??k|x?
)?
??|d?? >?.???? 	,?i$??]??dX?N`?????I??5p?Xwwd??Mjq?	sPj??e?C\?????^?|{?31??.~}H?????Q??r
"7????
9??:????2??u??X>?V??I<???N3?Fc?N?
???K????#W???Q???4?????YA?zu????'/?.???1?O???W??w??x?x?6w??[??p?;?=:????S??5&?v)l'?G?????2??w?????V???%s????{???????????+?d?<????F?&?????Ed????%
a?"??????????!???0K
X?Fn
?-?3????t?
n?`??s2?n???B^???/??a??h5s?????l
q???s??Y??lT??i ?
??Gm?	?I	?????<m??8?????q??^
?'?2,???x
c?@????p???,????6??M'K~?M??"?????,V;??N??Dp??U????b?Q:??|9?i??+$(??~????o'0*?5???4?)??:?N??+-??~????????p?mk}?????v?9??$?}????G|@???4??YU????4?O???K?G))??:i???:
9?^?!?iwgJ?`J?T?!9?l??n?^|?=O?V?S??k?s???X??????????
???yM?O\y??;?????A
?x?\???y??!W??h???]|,?AA????|Y????qW
???Q???.:????J?2?8???kI?bN??????????x?d????9?|??????D?|'?@?$E?I???EM??r$??L?l??>?H??;??|[?N??p"5?F?	H? Q?????????R6????)??????)
)? ???uB?I??Q}???B?
	????`hd+-????????X????;????u??????????????S?!?MG`R?o0???8f|????w+?)?7sOu?fJ"VR"zMj?Sz^n??Jo??c?PL ?q?
?)?Q?????@?\(
"$3?d?"a?f|?????S??d$???S????????*???%?)+)SU	?lB?q
?z,?q?CK????7NA?????z?RH	?.L?*??
??F$@?k#?ugq?R????)w&???DVz?w??e?	s?v?U????t??t??t?K'?}?4c??`?Q??Q??Q?c????^???B2??Xf???ceN$;EB??J3??'???e?u??????7?????F)??oe?(b|
xMy???c?R????Y5??)???yAtb?????K?
n
b???M8?3????s?c??????N??.?}1?]2???;????'u????dM????2@??hg?O?C???x??:?=p??n???-????n?????2}???i6"???3Yop"O??;?ry??p
?jIHDu?V??u????Kq-???j????L ???z???W?aC??j
`gB"?0??
P???????????0?5?gb>??,??z????'?????)
?? B[NP??#??(???J?#j??h??RLQb???O?I`???q??"?/*?%?J???Ow=????+	
?		?1/ngH{d???_?Hi?vg5?)X???*?[u]V?k9w
?9Wg?T????l?mz??{H??"?^?l??m:???*?
?]?;??F?J5?U2Xv??
??6k?????fT?!?5?s??m?2????s???+V?@?I#??UBF0?dIDk?m?O???}??P???mo??t[?8?????[???Q????n?*??y???????????
???@?d????7s???9?}?=vZ?kH?$%?E???\??V???IDjj?{?????EZ
D:??QX8s$?k: l?n??W???O????&S'?
? q?Hxq@????v???v?P???I?????/o5??m?i&"j??hHs?L??-????oy}"??y??????0?Z?m?f[{??????e???G?#y?/?? ??v?9C??U`?U??*1????????)?K<b???,|??9>?z:?EmU)Q???Q?P,?cx|?g???ks0t???	??J2?w?
Q???v??cB?R?}??)?D?6Fp????p??R?b??@O[<d?"Fc???????U2?>??A???Y?????	(?ZPY?&]??????i????t?/????>Ev?LX?Y?1?y??(t}%?????F?_3`-S7???_ ,?q*??P?7???M??
)?(?C?,??~EP4?JL??b?vg?&?^?
:???m????3??H?O?Q>?q8R??|9@!?$Q??T???h^)???3
?n??YU?w???@>}?|Z5B???Ul??
?d????@njCy?Q?~EI?*???D?V????C?3>????
??Rj????3:???/ ?ao7
??
p??K 	i??A????E8??"?>w?	?@?_Q??????Y?W?
|z????
??2?:? ?=p-TJ???>??/?=W????<$?4C???q???f????w?)??1J??)???Lr\I??."?7e??.???U???T??$/?D????+??y"??hL~??&m??8
?O2J|??v?p?????]%?D?0?8?]?u?J????o??V;?H4??zP??o???/uR?i8???^???kph??????T?@h^Y??????j????`????d???o?A&ipRe???
B?vPD?|????4	?'R{??3o1???@?6?>@???	???(?*p?\R?-Ib???9???T???(?T~?????
??i??X??|K?(?3?g???V)
B?v?V?~ F?Q??^??P1^?v?/F?Jh)%??Zz??I
]????'?$]?:2d????BI??ZpP??(?<?,Q???5??`s?`<
???#	\Wh??L???ze??N?Z?zgw"nJ??9?,~???Yt???????m;???q?Bj???k?Q?????/??>2???_n?C??Q?c*6$??????)x?.%:opFf???
\???y_>/??S?fM??@???/>??XK????]<
IS???j?|?b?.FN9?t?????@??????l??=?????A?c?KDJ????????mJ??F?}?=I??{?P?????+??v@????0A??q?5??????Mjy4??????~???i?7Z~?????X????[??ZVd??V?????>6$0?S??)??????;??>?-4`??????
zV?'q?zg????EI7???F?&?W??Lq?|?e)bc?rw??x?X????A[t???I}?]c?_n??i?d?p?*N??"?`?:?ODW??HJ_??????z]r????v?{???L
?2I0??J???'??zU?gfP?_??????v;`?0^?G????F?`N?<? ????	?????,???8??	}??C|0?>???wZ7?}5^l4D?k?8}??j?^?j?y?w????T?y?Y??x?C?>lsBP"?k??!zUS?nME?t0C?????d?????J<?B????????
?nU??T?8????0??UG*????3??
p?????????"c8???S????k;S??H?M?,Y???J?*C?^A?	I?53????!$w?]???#T ??S?[z???J?+?a????? e3j!?BZPNW?>?k??L?>?????Y(??J q????85htX????6'?)f;???yJ,?zP(:D5??U?$???????????Q?AH:m?*m?7&?0???T?`?0g	????zc?-??U??????2?D?=?>?????A#??Mp???qt??????>B??
m?
?N???=?w1?S<????%|JDT? x!5?}?0?d?R???k??c?B?`i?e??f???k?\??~??l?<Q=???2?`?
x???E?j
~?M8??r?+}"?????S?K?G?X-a???2?&????V???J$q?aE$????E?}???????
-&z?Z????m??@?:MA??hJz?????=<%?[O????:?$??"D??\????C?
????
?;??@Q?Ra???-ye?*<???30k?t???T?R?(?
?'???????????????,?>sv?E???a???z?-?X:h?)???1????5???J)??k???>]9~$???d?94?+??U?m??"RS?WxH????/?(LAWV"??J??JkIdrE.;??`? ?9	iD??*Y?%b??c#+??????????
$H???
EBH??qfb? ?Pf=L???,????8
oR??J?+?????Wj^?8
?????????@?`>??(?????5}Ub*??+3?e$?????df???)?\$0h??HE?E$J?@??Q?9?\nE?O2?pp@??A??$????n??1??=?|r_s
EK????????Tb}ernN?^?L;??L\Z_#?te?M??)vt~?Nb2g?)96?V???!??O??????g?]?G????\???^?Z?qe?P?qf*???}"D7i5s???????'>?_1?$S`z?>?m?U?_b|)??d??A?^T??;????T?LR?L?4?{?v?
I?dH??????LP??Z?J??K??$&]t?0E?}????T?.?W????dm?<H$iAB????Ru????dT??"qZ?Z?F?????Y
??????n5???????O?b?P,?v?
??,???k3sJ???#(\U)??'s?r??6?C???)V????O?
F1?????`? X?
??d???*???Q??X????XE'8KC?
?3?F???W??????\$?K????c????[?pb????????m????
(lV??
I]N?
j??nU/?u???}!W??c?r????oQ;??N?D?P???????$?7o??????ED?
>Jc??h??Z??}??????z?X.??????6u?
>Q??_??'!d`7P???????xwA?)?P	2(?.S
?V??
???FH??"v??p-??=??G???87j1
A??HW???'??3G>??????C???v??_??!?%+!???OD_?NVN???	?>????y?.?????D?%!??`?F?%%??qO?P	?I????f&?t??1"Cv?k?v4???+???????
?t.???k???p?M?d???\C%??[??%??n??b?s?i??W??bG?bQE@$??r?M?9&?2
????A?5
?6????!???(:)?E????Mt???h? ?
S`?e??(x?D??oGI
???-?C3x??t{????5?1
M?2?#>???w?????n???.?:?m????4?nv??S??z?BDe????.Q?R[?w6"?u?2e3P??0??4:s?io?[?B?K*%????A?5????c????T??????W??~?*????????y}?.????????j?[
???h?}??@??p???%?r=;?xb??&x?GL??????
?n???S?N,6?ue?
??N???E?????k?????'????h?5C?AQ?S+?$??IM???}???SMU?PZ????c?e??6(?=b?ob?B????Jm?i????f?,?[??mg+?S+?VKr??U?o?9??s???1???0?Y?a^?{-??????|????
?h????V?
z2::?s?2_???vwy?$?&?J?X???8??+?[|j?????b?????Y????_??	?
?y???_O-?O_i<G??l_?zm???m?Xq???a??M??8?;?x??m}~?R?)oV???Y?l?}o???p???
^}??C???^??B\Y??-????rl?X'iw????*??T?Z/?d???U?
?UlU-<&??????,??0>
???E???
?q??<?\~?**my?i??Upx?.??K8????????~?????A].?.F*??A???h?	?'3?????\?????:????????M?1?c3??W%??J?6???9????T???A?QV?W??a?@?J<????o???I?y??y????M??<:?,???????q?B-BhV???/XQ,???w:~???1?
??BF?[????O ZQ"L?<? ??8?'????oT?A3?3??A???f?:?bj?6Q?????u?yA???F-;d??<o????}US?1r16??D?G=?i at UFx]Cx!?w?qa??;??K?
??-^??p8?E?+??[?s?
>?G???g}????r????!5?????V]?B_}+????K?ut??????Q????6<<iH??c[??W???Y???R?vxI5? Dh5Q???mP???@?$????????>Y????A?Y?????p????5?x[?_+?VJ?<Km??`P!?"b8?9
6=B?zZ??f?????	?????_}Jy??h?!??Y??????Ij?j??N94^?S=??6h?o?k-J?s???#??K?W^?g???Q,F^?????F?????"bw?&m
?x?&]??????8[
OU??????2]??e??`?????~/?7A??????z?????y?}#???Y%;?j?c?????M??????c+????d??N???\????V??,?:"^??Hz
6`?y[#:Y/S?+B?????,qa&{I??~mE????{??G????E?W??|?N?J?o?h?F???7?!??{??t!W	?N????????z?b?KM?Q4?Bda?+?m???b+ ??Y????RDJ ?J?`?r.????}TC
#<P??6??k{l2bY???E{sa??q?0?????6???;?
?R_[u?2?????S?
?cEl??+<?????D[???????B???????Wz??????d_?x
?I?*?7^.s? ???;	hL?Y??v*$?(????]??j??my~??h????>???.??J??&:??(??kKL?um????????6]?????-???|??Q
?E???[?6=sB?????u??eA]5??{?
???L>?!(~1bJ?[q'??{?W,Ahbp??Y?`???? ??C?F?A>??)N?I
?w#??6N?$????HL?@M	??????O`?UZ??N!?>G?;?^M
??t???
?@?78?`o0B[??????7_?????sr{??o?#?||????!]???{qg3?S?2?H?;?<????????(N??????7??i????I??/{???R???8?????rH?e"??w??O?5h???p6?`^*???
??????0hS?~??@??}?????7f??%????MT?m?8?)?????Z6
??".?%?????A??5?Y?J,?z????]C??_<
d???P??
????~???p?tzK&z%?c? ??v?dN??C???????b@??@??:?MJ??p?5???0?4??4%^%2???q??
g??????x?s'??|?*?n%????+?A??D?:Vc7?9???+?>m?}YZ)???JE(??,&??{???Y???@??M?s?"???	J??96???}J???$???$???"??L?k?????^????.Y??1???
??????6?XA-^?(HU?[??w?J?Uuo???????z??
?JE]U?cM??N????Nid?|?6r`????B?xn??nmi??d?R?!????*?0r4?7<^???/?J|?*H??E:?bC???bd?3f?
2?????6"??{??}???D;Y$ ??Q?6#D9?H?????e;b??Zx?u??>J
xT????rqE?p!w????A?!?_
?7?AN???!H>5v5??|???bM??J?????**?? ?V6? oR$??????eE???tM.?a???6
?&??'???G?&u?B???d$?~pJr?u?%I????Z????s?&???8???	??mSNo(
?x!Bx??????8??bt????w?????>J+??J?`[n?!?nw?AkbQ???I??&???}!????p????Y???y??T??*m? ?Kf???Q?2f?D??????"?Ky?ib@???[y??F?bt4????7
?n'#)}?N?g???t<|?=????8???lOz???D?PK??#??g???p? ??_>" 	???Z?>????z?a?9?????9e??nl"?)4j?gU[??@?OZ????~m?)?K?????/????I?|q? ???)E@???????"?}"$???U?????
?F?G????? 2
??
J????L?e????e?'
?????Hv????~??)????7/?t?X??;?[??52????UBX??G?u?k%???LN4?,b%dl??E?2
RJ*iY6Qed	#Z?)7??5% "?q?
??L!Kyi9?J??&?@
hN??
vF??F?[?
?{?vq????????}????o??'u??|????&???%???+Sv?v7?(
!?$?
?????a?A??o????v4???\???*?{?8/?(???Ai80?\?????7xL??8??%?????????LX???R??2%???:?-????-???T?'?_y??6???O??Ds??F???a?!?h%?ZS?}nE???>?r???7}JCh#??7??4G??pRb?Nm?h??Ld[FE?2????Dn?LH2??[?N??
Jg?(q??X@!?????g???4???F?A?k?
A6nf)4?6??
kFR??u?V	??G?????
2????1?z?????
`??&?'?4???P%a=KJ??@????@
4s ???Q???%???TRox?F???TsoZR_???
???Q?t???[j??>??'?k
Qf?r??m??_?0??O????<???%????nw;6???
;@*?R?tP=??-8<?ip{???R??????7??? N
?? t??8???0???]??????Db???F?/w?)p???(?}K$d??}gk?!?q???>??(Uw?Y{?U BH??}???W?~??
???W?-??h????7s?????L?-f&?
???v??????=?~????8?E?I?Q~F??h?8R&????????e????5???9?;??}[????X??>0{:[y"?(??B?????|?.<????1+#?$???Se??A?A?12t'?C?P?`?-	\icp#e?k??OpW?.???I??,???'q???;???

?i?	X?B[???3?sq??];??F|8-H??%??ju??BI??t?N"?Y???<?F?????`"???J??XpJt????????sf?E??(<??*???????dd>?X?@?;b?? ?k?*v	`??Tz?r ???8Hi?$$R???r&3l???
Q:????0???{??gF6?xf??~[?Th+?q?'N???0? Q????A?	??l?+-w2??0?n@???!?3???2???9???1
{v?4?FEW??
???O"]??vZvV4g?'??)??K?I??g?M???m??8??	??L??
?i~??????n?z?????C8?OJ??H??6%???Av??????@+?/?&<?)
@{t??? ???G?t???I??????2??t??????_8]?@???6???s?0E?'?5??6??????w?#.
?-?I??????J??W? O~0???j?
'???;%?p^??[v8???s-??A?o7*2???0??*?
&?
-@"?w+
??U????qT?(:AH[l?M?w?-a??+F?[??vp.S???x?p?????'??M<H?7?6???|?k??2!1?rX???"????????N?
(f??L?????KC
=9!?B??J?????J?????D???????7?>?nw|?????????????B6?7??????J?V?"?????????^o??V&??i?n?S=\n??]?+??<~C&???1S??>t???IN&j\??1???#?!???#q?q1?zj?`?;??zE???5)??X?bP?/gH?A?0??
??C?>???????7?
|POYWq?????"6C?j?D??$F?oW???????l?L
??qUz%????'z?"Va?	?_?oo???F?l?P?B,?
1HB<?_9bb1?m??`??
&?_p?????z??tZqG???8?m?!??r?5?#??@??pP
f>rSUAq???g????HTgc?d?K???????@$?!??1Q???4?C??jbQ????
??5?@w
}?m-??
?	?Jh9???:R?
??????F?`fNQ?Z???t??e??Zf\??d?????`m?gdMj?????^{C???cz??B*G??x?QW/t~F?????T??$6x'?s?n????f??*???t??yI<?Q:?k?????????q:???3??_????E?????P??A ???%&V??O??$D???VU'y`???i4?U???r???y?_"?A?\???e???6?j???	vs?cL	5?^i?-???z???'??{?]H????????,8?BU???????VN	?D?@*??=?p?5 ?N??w%50?X??VD?P+v????????b?`??_?????3f????`aR4
QE??????_!???|{?Kw?????e?/???l<k??
??d?p?IAD???$?)6??G%???p??
??*??????1??_X2'E???L?v??)NSb?K??X?'????
?l?3a??1?_?????P???$?T>?K?????@?S-*???J?B?>
#&8}u????_???C_K????1?ci???L?t???Z?:mPn?jG%??
??(?eNH[j$?|????iZ}????9(?JhI9L?-?;-????0M???=???#??X?%f?uZs0???i?????5??A??q?I?^?:?r?=*??J?????",??????
?D?A{y?5?E???I?k?l??p9?X?9???0?2dw???h?????0???B?
~@?8?nb$?k?0?I?????h?PU0???9?;lX&???C1X2??%????????y	>???k?????^B???e   J2?
??O>t?L????????p????fE?d}?H?j9>???#ok?
?|x`
?"?8?????/?e? ???m?????;?G???	??y?Q????4???\?m???3???$?????%?J????V??W?F~??
Q?bz#?"&4??????W?!Ls??bi
???Z1(??4??#?[??Dl?~X???r??$??
????9?F??@.J.??%h??????z?H?81?X?? %???.??0p?????
????2????O???:???1????y?6?4?j?-?w??W??kz??e? O????????s??8C??l>iXz??|fS??M
`}^????p??
2??*?'?B??M%Q?`??-???????????-???e+????$??A#u]%?Q??T??4Z??1?'^???$???????Bt???X??~??aL??X???a?sUc????P??????AM/??????SRw????wt??c?h?m??v??[h[V
~??"N6????6?|???u???????/?
????>???>C
??/?FNN	 ^????gi??????a???p?{??8??a????8??
vbi?3&?D????0x?2???D?I?B???eYD?U??wNTY????
?,Al??????G?H??
??$?????THw?($??g? ????????G??a?+?90KIM?"?^??<?z?B!B?O?[??h?f?i???????p?
??!???LF???????V?7??h?9??D
Y?N??o?3????%4??5^?????N-?9?wN???(?]???%??D?j[??????u???n???\*????|?? ?z??*??Z??V???????
??B?BKB?????R?/0
??#???Cpz?	x?p?DA???<nP??BRG?7Bz??S??&???????C????T??w???E+_?,_????????????8?"?xD??=T??K?}%??Y???;z%wxh???A?*???Z??<~??7ZW????>??<??X?A
s???????u??0????
???5hH?:?/?R?W
U?$?M)X???B?=M?-|	?U"
?*T???D??)L??Z?6aG?
?????A~??8?!???lW??F
?s?????I??xQ???;j?R?????C(+????Yg???l?K6??Uc?+?s+??kwx??g?#??N}?A?>9????H??\?T?<????????BH%9??Brp?!?x.0I.Ue?{*?'V
)TFHA????c<=?^?l5cnc??R ????????`dwb????????9???;+y????(Cc
???K?l?[?b(???x?????????QEX?udV;*?[S?&7h?,??Yw????????S???
*eE?6^??3??7*??US??	w?e??? ????B8?P?NA????>av???
#j??????W???`Z??=i??>??5?m??Yn??z?Xrqgt<
?+L?8IR[.??d!?????$????[??????????k?b}??8b????&?????????\?=???P?s?%????,???=??N??]N??v?B?k>x??0?!
D??R#AV?-m:????:??
??z??K_z$z?&!??A????>8r ??!+;?k?V7?lz~?Tm?k??W??H?0Ez?p(??U?y?Z???v????2?\???????????-??%??[???d([??wY=6????y???P???gK?_?/?Y????	?w???:????!Q?:??K+?C>	??<?*Ed???w:??	I"??P.)Ivy?C`D??????{
5?????D#????@y?<-??q????n)?Z???|?9????M?P`N?9?x???H=?XN?tp?m^???$???|?W
??W;??>R?@B?sdp,??V??
?m??D?'J;????Ip=????)?@%Rp???	??L?w??7?]?
?2?0???
0?
^?Os|?
?;?w at M?
'??????|)??[t'?0?1???b????<???_???gu???.?^g#0????n?D??:Wr??>???i*?~??}?;9$???p
V\u?sH0??0
?8??t???
?s??s??,es[r0J????}D
"2??I?j??e??O7*>1????Ve?a???
\?????}????7<+t??????L?-????j?C??_?e?7@????>}g????D?|2??Jz?|?7/\?C/!+0?@C?T?&?5?t??q?LgV??
???Y??Io?
[+??F?V?V?????)?e?O??5? 5??U???????S?FB?a?` `??0?B?vhW???D????	???f?Exa?^X?~-??N?"(?????W??C&?
??l?;??A?
@??eE?J??Y?N?p?Y??<?'??F??R?HLt?
??U?????@?y?$v?Q?BjXzjyi??FEZ??!???
?N
??B??*?t?I58??
?
??"??}?v];(#???M?????l???A??>??????701?7???l
???(`w~B???Z?Z&YQ?N:lp@=?l?YmN????.? ??='?_???y{?D?.%??R?D?????Q?F?D?m!??}??k8f??????i?%:???n??f??????_?1???v???g????O?|^?T/???T?6?<P
?eu?}?)>????:?S????6
=	@ U@??S,?Ft?i?
?$Y$AA-??D/.??>o?_6?^*,-X!u?????<s9lxg?KD?U-#???iO?e?K?B??j??,?V???a)&!XZ_`L"/???
?r??u?*?????~?????Z<_YK???WU???????X?C??L??G?i\?????:?>???i?2?U#?|??6g?R??X?#?2N'?? ?As??=?;?????j??4??fo?j:?J8?????????????[r??oZ?7??M???B%O$?{???jvA$?j3????q??
~@N?& Z!
??)???hw?*???v?_?
??B?v?"@???(???7???~?,tU3?Z
?Z
????4?O?	!???i{b?%?	?A`?D??-A????Wk???X
?7?j]j?1???Ru
1?H?????r?|????????2Id
??}????"?F?n@=,?7??[^?W??|K66????VK?m]~o?|[????{A??c??????B????f??JIN???8T??{?AG#?j????????E`?%?']'-???	???fy??4??lN1??k?d?FfTaF???VD????e???9??9??!z?l5 ??>pb?;?(?B?)?R?j??0|???Bi?n??[??m?A???X??????S]?0?T
7?eH???0nR?&???"t4Z2???P?g??
r\?t\?uLGj??!+?????B?4??A<}?:????D????!F?N??]u???TO)?R=??l?d(?S>?hs???)?*?????5m?I?`?x	?|K???@JR??i E?z??H?(??X????AB??C?D???pj}mP!?m#4??Dm@?Z?'
?>??-K???i??8!??SI???V?EH+l??q?????A??JI&??9?SR?:?8?\??R%????	t??U???????!?J??0?Tk??#]kM??RfyY??T??*???????PeE??OB??$`?J???s?IQY?K??)?A???o<?s/?K?z???u)?x)??8???Q??9?eb??.)????S?/e??D??c???
?t??X=?????P[???}????4:'q2c??B??"?n?DW?>%?N?wH?"EZ-?B??	m]7Z??dSC;??R?j?F?;??J??(?????F?g? k???v at Ax???????tb??	!??(ou?6r2??c
W(x???51?????@??BG?34?	?
?h?L?aX?Q?????????:???H?#X?^????/!".P!??o??0_t??? S[????D?8I?+q??Czn?[???????%??(?????%:vT?w)???'????U?L???	??Y??9??,???g???l?2v?j???JW7???%???jK??:<??????O?#d?RPc???9VoS????I?&g?H?
?T??r????mP???Gy8W???e?MX??????
????NFH???_[L???>Jo;!|)+?.??*S????21(???;i?r?4??J???c?N?&??wE?f~???jLy?=???T????v?w?'???
???]?]?X??|???
??
??l?4???$-??+?ex??y'??r?t???$?
??K;???i?b??D??????|?%????)6?i????!?T?4?g?V;L???T????
j?u2
?z???)(C?Z7)??a]mU/??BM???4??q?)t?
f 	?9??W?d"?F?5?5?DvY4??8?B%?fd:?.!&??M?w?xL?????)?I	YT#-%U???0)~5?6R'I???E?& D?-k??Y??&HM???)?"??^?3????
JSR? d???X?HaW?nV?LKoT??X???????c?"???4/<Yb KU?78??
?I??{?L??q?O2??Q6??s?!s????9????'m?J?V??H3?A?+B?#??:?T??,V?d"rm^I^4??????????6$g?^s?VH!??V:??}??????Y?{?I0k?
???
???N???@??y???????!?K4?>????C??C(??.?!???{Z?Z???]J??]-_??d?G
Xs.?qQ@?No?qb??????"%8?h
Xt??E??????
?T??x@???MH?M	??Y??!+S;???k/E
F!U?}?2?I???J?4??w??{????m???h???k???,@?N?2
????.::riEv:E	(O????S?	?W?8???????'???l?????3(???6??=|???K/?u=????????(Qj?;???r???
??Ad?^????z<H??????b??k???&??.Zxj *?.?j?/_??-?
"??W?j??q
o!d???s???z?7?Y>????F?KpBh?1Zzt!D9??:?#K!W?s????????eF??Um?k??GWD'?9R??Qz??U?6??? ?gb,??????Ia`?A%???ej???-.
?Y??????X?/P??L?KZ????!X??h6i5^pJ??k=;?^gcP???????11%???1?D????(??~{????9??eR-?c5?=??V????%E?O
h?"?Z?U??A/??:H????
???)?pPl@&W}???|?+Z?N????????s???}?9N??m???????[<??'???^???)?B??K?#??~????????M???????J??????????
???W?V#??V"=$?q???d0????W2?{PG
|??1????PC
?N0S???+?5????
??jaM??2??b??"I^?$?`+??x$R+g?Q??1^EK_????O?fS?_?2n??)6?/1r?%R~*M?W??????v8?E?e?i???	d?c??l|#z>???&??T"R??^?`?0j?x??? ?m4???Y ?
A!??b??WHVS????^H?.?????R??"??c9R???Yw?'"?.?,??Ky+kAi??V??P
}????????p????}h??-G?N??J?A??pI??B?x\:0???#bKbx???&?RB???v?U??>
?%???1?v???????{?D_u<???!?<Z{?q?kg
?????u???r??????"???j????Z=?"#+?k??,Wj?\
?[?4?>T??*?b??q???W??*?)???mP_?_?O??[???4????j???.(!?
?g?
????R}?????w?X??a??"????X???Rj1?? ??d?QiUv??????????Z?x??
8?????%?D 9?D??mP?{??"??}!"??E}??F???"`?j?????A???????&qr???????g??
??Xp.?$@Df??<??*??h???c?M?W??=???.w?~???????E?B'[T????(t?p?Z=??Ps???>c?\R?P???????;UT?|)??RB[??C??0
???J?"??6<?p6???|???g
DK?(?K|???
A?A?)???????y?,?V?V?v?
2?H??@i?z74?!??"????????2????aEG?????pP??@??
???????>P>3/nj?g?5?BPqCZY???> ?U??????+?BI?(?d?,0?`?X??`/???	?U]b(B??????*????"???M??'?	{q????T*???? ??u??]?.U?b??U??Z???	h~??(+?<iM?%????*?V?v[??v???7?Y???MI^n5/ ?:P?_BuJM	????<?k?h%?M{?N???g\??A?]???{k9??Kq?????7^??+????(???d??8$??<K???
???`?q?g|??
1?S?]@?LS!P?@??H??Z???M9??F5qq#X-??Y_R?[M?$:?L?O?&?[V?????v{2??-l????t

S1e"??w??5?-?THI??v?#??????U?
W????b?t??R?G?/???Q?!9)?P5d?????d4?
o?>?8?SKpg3?d?"??Mk?YsbNQ?????-?U??D?a?????Z?H-??s???oyNT~w??r??B?]m!??8*>?V?N?'????I??<??Ej?-??2?Q????VQ?Mr?!??Q??&T)6
????????R???%??u(?,?????k?
??
?+i??<? ????~f]?1???!k??
????m/zs??gp????1??4!c??Fmi1C?
???bT8?c`d	,?,Y???????????dv?

y????I
5??j/hT?Q?E?????^
?d?#??J	QT?(??w??~^?s?
?f??/???J?p*P??O0\???N???p?w?W???"*?;7BF?????????H????W;{??
Ph?Z?U??
?)zPqz???R?}??r
4VNp???	???\x??H????H?f,?????S?L?)Mz???,???}Nu????1???@??????W}1f?I
????-T?q&k@?$???????<?@???4?(29i????M?@???)r0Q?3:Q?I
??N?P??QO-)5?(?A?@(?)????,??v??pL?????D{({+)N?}??/?????RuP?????3???G.????Y???b??+??o???z??????&$?r??UW~?sXAD???????K???k?jR28?{????N,a
?c3???????7?"<?fUi?3????t???????B??ez+S??ip?t_???A<n???$6??T?v???????h????q;???,k????$??S???B???#??????zu?zu2???F,Od?<?F?????????wz??^
s at Y?6?T ??H??X?????Za_?#???? @??\???|??Fi?P????,?Z????%u?u???????????q?????v?t?
?aPI?????1?Y?k=?)DSXK"???+???{?O?G?>?????????"??Mo??????w??X??
??
Z???f????c???????? 
?%?!?pzSP?{(g??

??L??R?A`kv_F??g???5@???R!d&{??8?J???(=U???-????12??? .??n??????2?]A??Q?I?????ybw????tN???W5$?yBt??P5\?j#YIZgy??m??????K???????S?#??QU??AG?Ba??z`V????f??????s at Q/X?,Rc\*?k&vJ?4?)?qLNQ??&?.?[?????d|?m??~?)??
?JO&V??????Y?/r%?e???o??-T4?nM??>4??8??x
?'@?xB???=??????F?Q_o??#
X???n?	?j?!????T??RJ?& ?"???gq&*?;????J^??S}???#LQ?????:?
"?
????,??-D?hqcY
?R?P?t?zP?lG!??a????'j?EKa??????Z???	:0????K)?e????B?uY.?Q;?Q???W|?-?o1?#??`01??t?7?gq2?b;?j????g8%????i0c
???
[...2637 lines suppressed...]
???q?H????>G\w?D??????(\J??hNIArM?
?O??X?&-0?[??????+,s?e??C??%?IU!??o??j??K???5??8\WE??@O????????? 1??Y???;~?zEY?!f??C?1???B??P`?{?'??d??g?/sF?X?K?<?a?`??|???v?
3iGG?7??x|?????	v??~?x?`{????_C??:?8?I??#???|??S?v????????+#????U???|???????l?? ?^l?"?	%?????????7s}???N????????BKnbow
??;???Z at o??6?????7??@|A?~???l?[??	5??vC:??l?/?+T?2?i?Gm7?t?q???U?!?q5(???k???/?mc?1?/G??1??J???@w?U??????N?,&???????\??S??????{?v????q???o???M;w|???x?kr??N`?????v??c???q???~??^????y{iFqm??
??g!??*????vDq??)-???xM?j?]????<????{?????,?XbY?'?P^j??X?)????g?}?!?C?f^??6?/Q??D_1J~#????s???
?>?q?e?&1?-??Ma`???;?Q?}?WC]8(????6???n#
3??g?y??/fb??3??s??ss??S??K?QP??=???????C????=???????k}?6`}?J[??W?;????1???????))O???4b??y???<Y?5?y??W??I?&7????.S?|???`?F?R???wu?????1?mJ?^??9?{??t?????
??Hz???p?????p?t???\???Z?:?{???#S79?\??cu????"?m??????\c?+?tu??C??53o?x?Y?N??u?h7u?(??}?F??*??u?o<?????????7?%b?/????c4Mf?^F?\?Z?g?&]3???C]9???M\?h??*?7?s*uz????,?}?:~??-?????????8??!??????f???k^???A?|??5??2f?sP???Yy?>??f=??
?t?^?_?1?x?????ML6????&??_ }?}???as??K?[?omo"?/?-?=^????z?o?XX?^Ch?v?-v@?;>K?
f^?????hp?D?'??C??M?????#TJ?????P?5c 1
?d?)??3L?+?@	?	?k%???????
??>???/?p?@s??u????;ja?k??
??10???q??'???w??????\y`?}s3?}?S?~>3????e???$^??????K?????)bE/:?????4|?
?OG???x????wm?_?-?y????b?s8?y????b?????1&????B??,??\?u<d?G?+???YI?:??=??i??#?j$0?e????????S?U7a???????????fW???,??
<]kV?s_^hh????Y???1?@?^?????F??b?)?'?''?;????N?$??96_&7?????.???S,?o?c?:??GJ?W?e??v?U$??d!_?q??x<??7?[??O?DFK???1~??e%L??9?7crd*???f????s?(??qA,?*??:U????????O??????K?8???a??B????F?o:?1?g`_??Zq?Yh??:e ?]!????????>?:m?u?I???&?g	?io;?Y	X"???$?!9??????\?ii?W7q??3|?a^??1??-??~yj??1S????????)K$s?+??=??(+?/V?2?N?????x??>??9*?????Qo?tK??Cn??4???V
q????|??\$??`?a??Y?mK??IhsYu?kc??ncu??rz???m???<????,???>?o????????.?p
o?i???A???R??k?g
??({???-?<v??"<?;8?I??"b?1??*??,???
?|g.>???S??,???g,??a?ky????&?P???7G}?
?&??`?4?/P?U?Ql?S%????<b?#?:??i)????H???6N???)????T<?``x1?;??71??$/??"?cYM?'????#???&6??"s???r??1i-IN9ds?Q????F??c??Q?????o?y?????W|d;????????1??`?"x?d?????l??(??6?@W????????f?{.????|???B?j&???E???5?Xl?????u??%????o?2V??k?,???@E??DG8??A?Sbt\????\?t6?y?????hb?????5+S0??#?<????????E,?Z\??q?}Tjib??d?yJ}?????9H??P7?|??8??M?6P?8????i??u.?K?O?k&?Md???Gz?P1?????SE?=?Tt??;X?q???1??ia?b_*????s?q???A??????;T?^c??g_Q<G??T?k1?i9???2`?|?"?9??-?.??!PC????????????-?????#(?P?????`~B??;F?a???
,?4?2???,r??l[?J4u???? ?s??B}{?>cY?????g??OB?3???K?A??V?yH]9?Z?m?G=??{??c??"????0?????A?TJ>??{PAs????~?N???o3q????4?o`????-?????I?j4?P?2??	b?T
~???e`?Gq?`?OL????biJ>IC????????Z???<?K=M[????????l?a<?????u??????9NE?6f60????E?=?{?f&.e???r????5y<I?_aku?78????O?oc???X?,=???/dK??Ok?y??????
^??r??ZF?HC9?}?d?+????a???"???,8?"?\?.???W?,?'?Fm`?Mia2???????\/?????4?????t?!^?A??r??G*F>QPx??????>?h2?9?$????'?)???%iKQ&n??$?:?%?r
Br?1????s?????4???6?0??i4???F???>??!?sWm????}?ek&?M?x?q??U'3g?`nSI?S???e?k]????Gb#G???c,???;P?D_?????
?<?0??Ga?m$e_?q?6?????O??%#??l??????#?o????t?>?~??.ic(???H??u?t???\GCL??????????????q??N=?f?????R???Td??Pm??j?=????W???q??^?S(??f??M?????F??
??>N????????K,0??^ ZC??6????0;s??????
1p?????uT????}o
n?p????D??-??5???td?`?h
?#M???ZR
?????U?ODv3lO?:?F??:^vy!???????#?????G????[???,??.?]??????&B???R????q2q~?"?(K?J??Y1?d??????%?9?-DS?_?}?A?!?L?<???h??TO?Or\?
????1&XC???u~QnT`??F???E?8$??l ?????V???N???!??\?????m?$??,???X+???????}?7?iC??F?P??L6??????h??q_X????&?????#^,L?,?????W^??SQ??rc')-O??c??MYG%m_?w??+?r???:???YteN?5??.????D\??u%?
??(??,?J? k3!?????u?[?w?????&??]???62?T?G??K_9?3????a??I??t7c5??"????;??/.b?^????G?n
??\??[5?????????cmv'}?I?
??$?????d;?????8?s;??]???v??[U?5?g???:?M@????q??\!?N6?#??'5?'??
{s????5Ik???z???????`|}?LE(???I???!?/?<k"??`eq)????P?'?{"?y??q?????L?????"-??????u!??
?2q???x??mHF??Jg?Q?2o?{??4???x?HG?u?
??&??}????m?3r?cA?=???ye?:?U?$n?]#o???0????1???P?;
?m?c>t?q?:??Zb???o???}????T\`?U@?T???????0]?7??r??qY???b?A???@??u????
Y?>P??z????Q?)k?_?S??<N<???\?v~kKr?~;??D??K$?[??@?7
??xg????5??I?Mm?M??0????0Ff{??u??E?u?e???q2cn?
}THGN??8H]Y?E?{???w$????<??1?o`X?????????*?%d?A?l???.?R?;3??
???9?gk??1t}??xvux|?????3??s??_???q???R???"???????/'???s?W???4??e?
?:???????(`?27\??[???U???*?p??W??h??????/?5??e?0?????
?yf??M	??;?l?s??uc)???l?y???L????b?g?h'/?????j??????^Y?X?W?p`??>??E
??c??w<e?@???OTY??2cR?2?-???C???????V?s??l4/'x0?xm?|??3l?=*?g??O>??K'????>?????b
v????=iWO8?g??G??X????i??x???
??????C??2?M??B?8:Jt ????W?8v0?N?????h
M,j?"?do_?8/?z?^x ???$?^r??evv
???-m?u??????a??????????=???U??1?Z?R7????+?L?/???.?????]#??i?D??&????KZ<?o?????7????]???<mD?7????Pbu?T????V
kI??0?}~???w:>1?,$1?*
m2?x???`??1??#???????9??>&"?Ot??I?1???z/?'qb?Q9?
9?'????????a12?U??3Fy????????r?SA?]?/?S
K?a?t?1?F??u??????6Y?"s>??dW????????,#?K??:??D???8?n?r?P?*?????U&H}??Y?UG????`?)E;?#t6N????}?"/?6?t??}??N???Da?qE?
?j???V?????^s?w?gu?????w??????YA?'???????cn?????kmd`??l??l??IB.??+?^C?Lb?EI?o??c?}???^?/?I????????U?3?3?-`L]?sGA????'l?3?{????9???q?????l,?u???h?s2????O?F:*????9HI?f\
??????]k?
?X??7?????V$>i?x??1???l?Ki_d??T??'?1???K?*??g???W??Jl??d????nnl/??? .?+??I?x??F,y?v??>G5?G??
?a??qFn????6?(?1W?)???M????[O??KI?8?n ??????7a??P???????5????"??y?j?SsYH:Q??:*?!?
#h??ZF???U?@o??3????????
n2o?%????B??S???c/n?pD???????>???b???t|#??W????B\?A]S?????9?M?-??/g?d?7???9?????U
d?h"?Wo????v/o??'?:?h???@?????_???]W??zp?F????D??;?q?IkAZ????"??<?q?)}??+?X?Y??=??-????*???????>i?q??"5?W=??????
??.?h?<V???e??z6?KY[??H-??????9?N
S??f??????i??k?X:UE????&?????f?????`<K??n?A?9?u?a?>e?{???+?l^?q??6?}f?mc??'J???H?:?u???????}XP??????o8??P??u?T<??!?m?????Y?`?ck?6NQ_??+xD???z?X7<???9?]1?????~6~????<?1C???5c?q?U?? ?I9?(x=Q?u?q[^??~????P?????rT4????W?o?
?_s]?"l?4???:t}8/?Y?P?!??`?Fm?kj-R????????<?????sr??????C;?{F???9??}b????????h?h??????????n?????\???O????
?OdS2K?x?2??kE?\??????B?U?;???????/'s????c

???F??,????s?gJ?`?????!?U?3?ZA????S????c`???[?????8???s????1:&|P1??}????i!,?n?r??????x??????n$?Q?t??????
k;?$???}6?Q?6T|????1TE\	^?q[???????85??]??'{?H?P?vR??(yZ?}T?acf[?????hI??K??S?;f?-?v?vUUIX???s?????????F?W??s&??s_???cgY?|k`	????S????[L?x?c?z??'?1????O?}v#??0G,A}?N|]]?9@????j?????L? ?a?,m"?\'w#uhK.?[?????8>W?gp??q?????`!p?
?c???|{??A+???????n,c?;????Q~?dJ(?d,ha)???????v?VA?l'?????jX??7??????
V????A???a?
e9????b?????sr?T?????5???a}6?M??????O????????g??%??;??>=?FR??_???wL?O????????V?l???y/?/?????~??>????i"?)u?Dcn??a?9???t>???????????!?X?{s?????-?g?M???????'v?@{?????%??2]??????+?870?g????????Q??????F6'?k?q???
???????????!a?$m????K?_lo!?????}?8???????P?2??\E?n.|Yr???s(???
4?????????<*??/??<???7 v?I??e
s???(???1???:u??Q????c?0?}?{ t.??`???????uL?HyM????%??V[?&??/FYO:??<V?'}?G{-?h??x??B?-???????O?ln

e???!?>P?8??6v[?>??????L|?"d5?x??X
?[7?????p??MI?T???o=9V??t?}??|?d?0[?;!???I???_v???V?M\{????[??o??b??o~
?R?F??1?D;?.j?u?9??c????hYr??o???a??\e c???Y;?C#?79??k
j??v,i??(??[?]???l7?????3??Jt???????w???XA*
#??z?3t?????hA?KK}KUD?
?????	??A??o???1???y???~N?????O~h?&?q???9c???n?????G?[?wM???/1????^s?{ic@C?&F1?8??m???[??{???]?Lc~{?}?!>??>N??p?k\a??C?}?5M|$???|??.?m$|
gN??^?A?????7??????R?3?(c?1??*??wq????????XU,D???^?0?n?v????Z?p??=Z?x???@>?\,?Y{f?{??~??s???v?C?m?R?'3w?~:?u??o!?w???_?o??%6??1c?]?]k^P?J?b?C????mb??\????/?=k?(p?9a
????J????????!????????8G??%??wM3??????v:??5J???P?????c?sv0Vd????U3Qk?k^
??]???(D?F??g?W?`?7\?y6?7?(?????D}????6?h???w???????-??ND???gQ?C?M?????B????????\o?g????-?~b??{gH[ub??4??u?&???L?o????????[???N?????? ?Or+??w?n"?/{????+?0'J?C??O at A????i???G??p?A??~???1y??????QA??F?2????G?{?@???????~???u'?0???O?Y?0??k=?6/tt'&`???2???,???7GkhS?B?o&Z???<W??$??9??)?oP?vq??F=???????=?`?p?k?oxn??HC??????B???dc?????A?j?h???{???W?r?????O????-??? {?c?ma?Ty;8H?s{?9??6????
?dwP?uv????:
???&???e??/W?2?mI???/TL??/??q,5?
i?\k?????KY%??a%??M?j??z#??	??o"b??3?i&N?&L??S?:???zu????SX?x?q??J[c?I^YCb?o?&??\?!?.????[ne0?????ID5????l?n??b.
=&???;?????I?A????????\^??:6FV???N?????;?K???>g????D??p??????
?H???GA???D9?q?uy?{?
?d??~'???m????\?????????&Pj???????????y???F????T??`>yyR?3??{?????7?????5^??e??q?W??r?m?;??k?<??1??m????????f3wQ??3fm?F??\?y????ESG?o??	x?	9??n?XG??y???brs??]?????&?CO-?????
*??J?S'????:n?4??i?~??b?;?y-?qs?????m????????V???-6??;? yj?/?|?@sSG?**??Q????T?E?#????L&?^a?H^??c?'?`???{??YE?3t????????~?K????%6?????,?/:JfR1s?????B)?w?X@?^??u???????"~??W2?8?Y'???v??\??w??|???E??{??2m???5?m???
x??z??yl?%_z???$N?{;<?e??P_>??n ?}?yo?W????=??qQG,u?2??:k?D<?z????????w.<??sfSZ???N?#???G????
???o??HO,?!??or~x?{???7|???,??6?'r??}uK?`<???\p~XW?z?z??C????Y,V????QPx;????uB??>!?I?(U??}???=V_???????|_G????7??
;i?mm???W0???	??z
v??=???SbN?i?bq??`
?ste??X?]???/??_??:??G?}+?I&?????????????~?1vP??}}	?s	?M?n#x?
+???????
?0n??XJ?n?^????????i:[?f?q?????????????f???@??+??w???9
&??(??'?iO?LL???`L.?EC?G??>i?rD?q4m?G??_??0Wyw???s????}?_?}-??
??fl?&i?!v?A???????????????d????z?/??????WaI?)h??/?r?z?????UX?9??>?9?@??#b?????R>?!m?]?m???F??9???V?44?maE1??}???.?9}$Fkw????N*??CL6???K5E?I_???=k?#?G?S??-5K?\rcbc????E{??P?~
q???6?=???5P1???!??_?t?nL7??3?ix?_?M?w?????4?r????I????Q??K?X[F???B??<?*TLl?e??j??\W???YY
??^?bcfs??C?w)??,?^d?|-?=????????~VV?X?ZH?0?BF??,????a.1~?
??6}?	???z??N?????oAa??	lx??b]?Z??Z??????<?+???&?pF???b
W?
???????[?>???PE???????????%i[N{
"??????????j?d?????????>kr3????B?h?1?t,?i???_Up?2Y*???????@?????????
(??3?4?s?^BQ?'?@???k???????zs?Q?m???YG??xI]MQ?F???3?;?;??x;? y??n??\??,{-l,???a?]????jp?c??"x???q???M?????Q???]?m?????B?F;????????c/??1P?T?
?$EB?}?~m??/bEn??/??{?W??+?W?;?L????????OQ?:o??r:? i??
????r????"?t?"?9?qj?6?E??o?Z?[??5b???????aw?g??m|?:)df??2??/??
K?T?R?Q???kr]???m4??}??J?-?N??Wo?????3??V??UGL:??xF?z??s?B&^???a??Jm?`??V?0V???ZCC??P
??Z?sXK_Pc????[wb?rz?(?c???A??4??c???_???cE??_ELX????k??{?\G??+?aIP????"?0PG???????
%??\???n??<???/?>i????F?I:1???l#5u?$??I?????A]?E?2?q?/?;?8?M?????X?#?9?D1???U???d????m??<?~xw	?8???wX[?=?:??W<???@?{&?}an?????,??}x?4Q??`?,??~r????%R???6P??fS?F?u???7{_?!??-x?"?	e???I
$?6]5?2?????g?????xn???ZJ?s0?c???A?=*?8??\????????????+A.?Y???????_???,Cl?v
?%]????W`<???!O????XToQw4??s,?X6?d??~??`?&?8l#S=?3?????3?o?U???1R~s6??n?9??????1i?O~tU??|_???B??&??g at r??$??|4(??$?a?
k??<6|X???A??#??sn%???&?Yw]??D?r?:??8?z]?)KG??!?^?9?????????.??6????D;?m?9?<?n?????!??????|?]o*?/??4TppR??v?uA5?^?a9mw???` ??u???d?k???A?????g???'d?4q;?9j??p??y??k???[???O?~8??R?y)??<W?%?N??,UY,/9?N?R??v^????iO?[????9???*?0?H???&w??=P???0'??m????
?
?i,?X??uF????5??SN???1p??&?1??\???????????%?[O?
???I?????$???Y?4??}w'N?L;???cd?$???r^U/???R??tQ???D?2jb~?i??I??r?????"	M?/"???????????LD?"
?i3?M?*???0?0??-?????o#??S?a???????F?=-????^???v}!O4??k?\d?????.\u????@??6??c??R?p?@[??{t]??n?f?6P????e9?????KtD???k?p???\??/??????x.?k?A?Pov1????Ar????&F?
???z??9?y?R?????6??8???N?r??????2?????~??"?E}????1??w??v?np??q?ufjH?P?
??b???1???4?*m!G?????r?S??<?'?RB?k4?Ql??{Q??>5??f.??um??I]?v3H?EV_?D?~???????OD??4?<??`j
{]???nZw???#A?????-?yY?l?{??'???=??$??uDr{???3?K??U??{???????nO???(O?1???:???R!??????????5?j?e??b???O
?~???????l?.?????.?-???k??'?"K?Y*??????y|??+??,????Q(7?y??k)?~???;)y?@t8e?obloo??[?E????H??S?4????F?=??Z???????_1?????L$
`???,???XH?\??\6?0??c??????O?xa!?tlg?e!??%???!=??????V???I?X^??gV???m?M?RW????(???l?
???????,?W??+#?C;$????$U<m??Pa??/j?MG????kb?^E;e?U"?Z<???n>6h??QS?KlE?2#?F7??~?O??X?\/?*}
M?y}A???????????D
x??i?????A??O???l4'????l??L?????X??4?B????lo:??1?f,<??b?Ta'm>???6?}?????9????g??n?N_????~.f????????#??
??"i?{Z??uW????^`>cF?$6????I[?**??????}??2?c~?7??G?U????5T???I???h????*??K?Vz????u??i?J<S?!}>
[??
?/????`?|??x56??yXb???????? ?y???~:?Uv??@?f?39??????o?\?ci??l???}C????'?id??????jc9???gQk?F{?g"?b??E?#<?I?C????]????R??????	N&q?\U1?????#?3O??? ?d
????6?t??C??v??L???6?FQ???)?}H?bB;Vh??m[??V?w???$?CL\?????v?l?_??T10?@C??Ak?s?C?_o????k?;?@?
kL,??@? b????r?^5????i?F??\??g???&???Xi???_?V????8???????:??%?w??????(???fqo????3??ui?Z??????d7??|:??@p?Y,5Y??[??????M????F?P???????,?{??@??????b~h?????Y?
??7?k)???>??9???3?T??????\??p*9o????K??1?,c??6???eV?y?????G???}???6???HC9?X.?l?sa?	U??? E9%?XX?H?B?c??&??W?s??wJ~??-????-usZX[??&'?r?XH???8?S	??)m??r,????5?_!#??61m??????7??5? O??/D^??t??N?n??C?%?l?d
????_W???>?U??}\?_M?J?-??`}?m6VN??G?8>C?Yn????????|?V]?b)?CI?`	???Z*Jfa??n6?"?S?(1<qP??&?TR?=????Tx4v????t?5?n?8@~??#y???-
?9??r=?l??6v^?Q??a?m?*??Q??J???r.
?d?I???
?V??????,fZ?`?Q9?	???W??^?h????vt?'????1?s0?????????w{>?G?(hSE?????U?&?}6JCC???9T?!??????G*???y
???s?}??^Uw.u???N??E??qd?s????0??????5p?|?=??????r???rJ?2????B???@I?F??@?7?r??????r???^CR?t,??????I???t??????w???:???????d?_?g?S?qo??&??|>??46?.?uhi
???}???/??0q???_1?9???G???v?????-?]?1'?????3?)????%h+uHCi??N>w??^?a?M~???u?s?Z??}cK????_?$?^??J?j??+??????z??q?yyi??M?=?J?t?`c?&?p9G?r?u
??}??M????KTt???j??O???&<???9D?????\?k??????Md???????K?????`L????p?!?????????&6>?2???F??&.?m????L4h+?Y?\-?pl??&?5??
??M?h???????3Q????:??n????ThW'???????
c*H/?{b?'??h?S???b??z??8?v?+??@??
??2????!??
3a0??yk?P???????,????PwF?w???Zk&??i??EA:??r?M?+???k8E?0{V??}?-??????om??n??&?Y?p????n???
Mc??\Ic4LK xl?:?]W??????b?}[??n=Nl?E?I?K?^s?q??h3+u;??????mL'???_????v_?????Mi?`????????E_??mhaY??c6?T?q?19??#J719??r9c&???&????J_?|}X????V'n???????^b?T?{<???Q?GM? K
?m??s?+?$O??><~?\e??>MA???1?~?/?|
4f??????G3????~h?-????9[??gl??q???cI???&????????&???6?V70??|N"l?EQ???n??????	?9??KG?n???,?K?????2_?$?
?!?T??~l?cu
?m?o!R~???????r???G??2?^????A??y??L7?7????
?:Yx?_G??n?^a?yi????j??*??u?]??0+????a}??my[6??????v|?c??r

PW?V??<?BX??????????
S???????????9t??9_??@??u?. ???????????@??:x?C????2???y@
??c????U????W&W"?S?h?PA?v~4Uqv??r~?????`??????r???????=?{????u?_?????m??????[???S?3??e?U?
?l?x?!?m?X?W????c!?
??`<?l}TO????5?????[10?E?Q?V????????n???;?????r????1????N?%?K?P?;r??p/??{??6
???{?@3?q?
<??m*???7???x?y????=???c?N???Z??H??gRFE?q??5???9?? ?P?)C-o??R?pe?????#lT???H?????o?O??^???$~????(??????Lif?t<??????"??X??^??3?$:R?????????s?
??c!O5?	I_Wy
$?a??B???61?W??&??&???_?`#ag??_u??,??{???????z?P?U?<?????;????ab??r?G?$??????"1?p????&0?8+=ePw&p?r?K?????	??/~Zp?7?|?'*|?????&??~
??alS1????9??1V??????D?4pa"p??????}?O'?ia?cYU????B???+???qy??!????????????L?jha!???[:?'??????dz"???xA???@???o=?????"??oe??4<L?=?r?S?F?????q???xL-????xW?8???????>n?NaZ?|????*'????????????:???&??bD]?>^\7Qo????7x[C??:ng?AJ???????%??.????Y???????u[<[?u/?????O'/?g?v?hkq???Uy?a?C?u??n{??1j??C??:???????f/?
g?g?da	??U????9<?Or?g1?W??:?2??&??????U ???H??&&???[??dtP?6rH??W?G??F????f?u??q2?8S:?&?????d?????;??~_????N ?]\-??=P??)
S??N=1???QOb
?z??????ut?-???u|4uL??? ???]????
?V6???;bz??????
??+s?CYU'?}P?@?='?????_????*?}e G9????h?5?>M?A??&?C?'?|??q????}_F???<??q}+cJ?:?_??jc1??|6???????f??&??&?/-<A???v??q?0?P??azx???i?7ZW?????j???%d??6mD?=SI?]?????&?ME}{<?????X??R?/?O?_?q??~i?HQ?????U4?2=E_1 7??q??\sob??e???_!y??b???U?e(?m?????NZ/Sqy????Mt?f"??\S?c??W?x0A?m?;V??=????n?SU??}????F?
???Rvw
??.???R.t?aa%c???r5^A"?^
????:???i I? ?g????dT?Y??????z????zr?b??B????????yov?1=??q????q?????U??:K[$??S&z?!`OS????X??????~??????M?`g????????r?e?????!O????????
??Q??"?????<E,???O?v>?????a=J??????
???O?M?$W????`l??F<;?\x?Q??LB??3?>??O?????????\c???G??#_?????????<??<??V????|??Ic?m0?????????}
??{?C=?
??????e{.?????	$?d???Sg?(-}??7:n???f??)??>?@b????
??7}e^??c?????j??<~??>?????#??~???1???k[??Ok?}>????$qP???`~??|???i#1??7&"?o7Q?????P>???%5$??????z:8T??!??R??=A?'??d?yd\??\? ???]=??m??b%??}NSqO???{U??`???@V????O???L>???$??~??????Q??+??????????x??_???
P?i?9$????/????)C???P^???G??8YC??]??n????p\????]v??r???R?}?????>W???O??lN?!
m&??p?y???Gz??o|??AC?sauE?+?u??f?XO?????V????#?o???9?????:%&W1?? E??.
\??????????R????^???c???Y??_]????9??rf??[??}??????Mx??R???T?9>:??V????hH{U?F9?w?l????kN?<r???n???,w??????s??<??,C???L
G??g?1p????,?[3^????}??o~p?????????????Mg	?m_,??!?4????>?+C>:????oh?l????l?????K???M?????	??{?$v???I^????:????:??2uo??:????2??U?????t?`^c)?V?x\$??5?1??????
Q???{l??!d;j?{=?g?w?????8O?y??&ke??"3}?F???(??/H??|c???v{Y?3k?1v?????:?s?b????!?txnQ??:`?&???`y;?????>?|e?F?????C9Lt?oaAIb??S?49^Z???m?E
?F?
?}???aH????;J~?]?F?*F??d???eu?"???8???i????????W????5l??o?
??????????}???????8?	???B,W????g!x???\?-??`x)??"??L!???????q??1?K??????o?*??????,,~#?1o"1DR~wE?Yo??B??W6R?e5?@??r??|???I???*???????

,??`eZ P???/9N?6jf???z???\??(D???A?????????l??&?????
hC??~d?!??E??=,t ?????*?s????8??g^??(6?????#??M??rMU??l?
???60[A?}???
%+p???0?xc????_e<?+t????}?????)L.???B\???(#??&????8??????????b?'????oE_^???y?8???xj??6?"??????D?\???????c?Y??????P?(7?f????B??r??\??n,?>????1?W^u?????(???H???E??]?b??????SV?????????;|wu&???? ?X??w???k???????xZ~?I?a?8o?	_???P?e?\??F????z=D?????,?f?`??lW??
j?/???MT?`#8?
??;????Tv0? ?U????u?{K<???????xT?6?????c??????t?ig??*?{?b?w???fb?+??????u???~9q????????Kuh?9#i?	W???0??~f?e?fP?ib?P??8L,?5?????????R??:q???*k}????H?+i8A?O?D]????i??!???L<?f?[#`[I?vu|qmv{??K??v?h??m???o?s}ay?NY???B??j??DQq?
?q?br
+W??!?v01???????;?_6??y??<??2??Z?~?\????w\O9?`?????9wa(????????M??????)Kk?G????>=O.??>??????{???L??D??#???><oL4?GLT???
???????6?1@??+5y??? n?/1?Lb?&'???;X??B??!m2?s???$V?9???@??:?,?????Kxb%????'????????zn}???|6????&?$????k????KAS???1?s??Y?Je??M'?s?????h#??{?W??'?y6A?????_??r??~????QK???mZ`!?/1N[?_?J??&??????8?????z?cJ???1?c??=r}?
??cc?f???????'????
?G?3?k???w?v5-y[s?????f?o?????9?@[??cy???QGZ?H???R??
??s???u?R>??M???????L,O??c?z:~3>?N9S?q??9 at r??e?v??k??&JQ????<??u???D?????&Sl??-?Au????-\`????}????So???x'??y??m???\?????????z?ZS0.??[????5?r?'?c?W?U???a,1qE???E?c???Kr]??l[?j&???x6?F??????&Y????=K??_f f~?I???????;N;?????L?i???????3??x]???{???
:?J%U?^?Db???L<???????[5T?,e??WSS?^wm????9S]????/??u?1??W???.ny??????w?????dO???0?
r?D?K"???W???????j???????????????_?????e?C????OG?M??U?????????E??e
?JV??E???z>3q?0?)	??z??M?r???MA?|o?0ql??yVr}Q_???????k-j?!?N;?j??-#?q;.?????-~{???3??#M?m??W>Q????9N?*?,?K???????
v?7V??Y??????o>?7?b\N??Q????k"?
;^??| A?G?PX~{HN?o?4?q???N??6??????"???%?C?????????-n?f>?=?????J?<?}U?U'???I\z?}Y??nu??

E??<??4?!@?o?d?2?f'jL????r?a??=e?{?^?|?0?v`?H?????r???Q????;hJ????H????O?A?L??i?f1n1?.?xZF?q???????Hi???????O????5????????:
00??/?5??:?$?q^?|???S???&??~;????
<??????\A
??H???W	QN?i*??q??^???66??{?'?Hi!W\_??c???e????t??,?d?i8???S?akM?h???=r?Z?O?????2*Vpu??@q??r?z??r+*????l?MO?J????u}w????]I?[?????}??B??L_O??????3
<?Z???e/??zx????4????B?NtU???_???`?f^^????f<?p??w	????Bo??$V???????[???<?1??????(??????m??l?4?l??&z??$??A~?*??;??@?n???a?#]C????e?c
??*?4O??x??s??d?f?L?E???5m(???R??1?x2?jQ'??lgy?F??K?6nkQf??g6???r?Q???O}?p??=????r??2l$??
OF???N??uB???3???-f]b??l???M??K~?}??y??.?S?|?9????U????M???bq??	)'Y?K_~?v\???wA?????Y?m\4???7#e]?1?
??(??}?-r??????r??-??km??e?P<q-UG?7???5?`!#??v???????>&7X???]????q?\??(s
5????x;]?5?A?????????????%?Q?%&N?P?G.?kn{_?v?2?+z-????Y?isIm,?}????6i?E?;?t?????T??E?%gN??B??N??9?????????#??????3Q
?????@??r?&kCmt'??3?????8?Z<?&???rJ??K?%_0X?W????n???u?/?@#?/?_?C\?????
bYo-?d?V??N????y?F???~??EGA??6b????-?????d4???z????
????RH????+??v\?i?[????g&???\V????$?UBA?U?????[?U?G1FQ?
???S?'??;???w??X????????o`}???*J?7???9??o(y`i??j?m?`J5W?~?c?????ix??x???*9m?yZ?(??e???'???c?$`ZukD??@ m?]
#?????	w?~?PCQ?o
?^?7
-q]r??3&^????#???[21??.?b????$:,??6VXBN??~??2??k??. ?cf?h?	+H??63?D
b?;??N?Bu??-?/iS??<?F??{??k???rZ?[b???w??C?RjW??6?(???????i?(+?=???x????F?r?????~?????#?????*F0&&?o??D???1?\:????@???[???vL??/??,??v+t?B^Ay6joc?Xi
??^?F?{y??^??~=????;?|???2?;????~?K?~???
:????e????>??&Xr?W6???????/?8??????S?i????L??On"?L!?V??3{Q????,???s>S6????#?????i
?a>_F?"c?__+??9u???e_?N+?jK?X?????3??010??v???-b???]g??*?{??
??C}?v?|???7?:k?????xI??????!~??F$??H?a??G?ux?q`?gL???N?veW~??W1?<??F??f?yRCg?w?c*???????M{LI,1???????KE??x?|??B??K?g
c????p?~y??????|@R????c??T\??Y????]?=??.??d????m????M#?*?????1Uc?v?
}??????@??;~6>?D??&?/?N?'G\??3??~1}J?V??R????k???(????R1V~\I???)I?????mJN??dr???????yl?<?_P???m??B??IY????ynSS96??Lg?
????Md??????
??P/??e????L?(??]?Z??x????\!??????W?u?h??????O????:?l6?<%?&????@ASP/??j?6E??p??P>??????rSG?<??'?ETw?????????4Td?
???
m>????z=#}???/Ks?p?LQ???Q?<??????
h?,???;??p`????Gr?:????
?P???p???R???9??4p???v?S
? ??S??????u??F{[????.?O=?????z???\#X??[_??????B?']7????^?????r1??7?_T?y}?	?^???????2\?KFsC??	by_h?g???&?b??r???gq?/iv?X???Z?o?????g??JB????*a)(?!Ll&?OE~S?????q{?7~??U?p???
?y?e&~D?X?d?g????*vS??6????????6?em?Q}?8W{?\????$^??E???????e????U{??,????w??? ??t???[??t~?1y??S6>??
??r?S?$?^F?????gJ???n?o at 5{???@?c
b?^??_1?ejr??D???#???~^S??+;(B^?e?	u??,??^?`?(m????U???????|?W#?L?_???\???Z?l??:?O&6#????u?O?C???C???3r?o%???4x2?e??%??K??CO?)?JlW?&S??}??????[a?lr?y+,???S'??5?m??>???????g????\??.ha'?F???<Q??i:?>`|d{??7?????F???
?VTp???MN>G^6S??Hp?????E???:?sP?7?(}@??
?2
{*????c?%NX?8?zEK? kK;<B???Y???u??J*???:/??n???`Ct8?M[???n?`???jPj???&?:???X?%?O2?8???U?u"^+$?62?y??O??qlZ??r^PV???9:r?5???`????T<&w??=??????`?%?8?????<?x?k??yO?I???u????d?h??>????2??)q?3n?5`??+?q??'~'??????v??{??lQ???&u??|?z?y? ???Z6?,?g?"??O\?y\?>??B#9??R^??????L|?vm|H?????????\??<??{??eL??o?>?
40??????Z q_??m??%_??
???9?>3?????tLJ ??????
??b?eZ?O??????)?i??a?~?????????c?<?;:?q/??A???
Q[?W??2??dZ?8???@?M?i?N?%?b?2@?2???_	,??sz?????????,R????n???6od??%???:
i??!???'??z|!.?:???o?XT????G?????';ia`?
?<?M|?k??*?~?f?l?Z(?V?a??rny"??`???S????n???h?j???V}\?I?D??
????|???????????U5??M??-?Q???y?m?
? ?'?e>S????I:?$f?S??)Yo?????h?5$R-???T??\g?sJ;?????????q????{?Q?tj??H_??|?????Vr????~?????6P?GN???UlG???0??N??[GG?eCn
???62?e)??
????????q?Q?0???t???C???SI?v???8;5??c?evQ?nq????+?_??{r?(c?~?,t[e??NQ????s?5???#?JC-????@q??*??;?D?^?G?R(??i?qg??We,">}??F????
!?u???a??z?k??m?R?i??ET????c{??R:?7d>???7K???YXR???#:??6{?6???W???zB~??1??syV??H??%??????%?????]}.Y8?o?_AW??3??<{??n??|8S?3?0??E???K?[??m??V??d_?.
?kO\?z??F?`??i?4?F???N??????=??{+8?&??????=N.?????????????[?UL?#O?=?DDOQv??&g51??=&j???<$.?Z
I?~??7*???p?_??}???????q???????9p?_D|?????
??<8???D?O7?O??_???[st??l?? ???????4?I\#????IElkg6???Q????<??ig[??
??b9??kd????`Q?X???R????g?#PA??????d????G?w??F?Q
???????
e-?d`]??Y????~?????{Q?X??p?D)?~
?????3:?W?????L?-$?jb?;??OE*+?Q0np?or9c}???&G?s?xH????l?^B??^?????L?Sh?????e <LG}?a?]?????U??K5?=??D??ZxN??C???????Mt?@???e?
??6;????3?????v?]b????#?8??5?|???????B?l??L??X??=??*??[??q???e!?0??|?W	
?
????5?V???e???.?K?!?L??v?.?????Gu??)?v??]?2??r??_?S????hc??W??;(_?F6??F?t?K(la???????3r???>
????U^?ow????!&?????(?hRbX??C<\c????4???\B??=???^%')????r??V??
O??cLP?
??0?,#?Ie9Sg??[??D??f??E??I*Cpq????,lkm??6?v???F??
>?R1???x6e?6????t?-?xF*w~?N?kX?Q???J????????+??????W??2??g3?hV?<0?B??????Mo??#~g?"???B??Es?????;q?X)?~`??S<???wC???Kk'?e.??M? ?y=h?o?\???wf{?G/??s??5?????k?*(?[A??????????W??}H?\?}u'?DM?Xn??
?5Qpg??[G???}?cm????v`???-4??????&?a?F? ?e??qF{;
??
?e??-m?u'W?G???h???,/???4\K?`M?Y?e?/???????CL=??v?????
WV???{????y?i???P?{u???
1'??~??g?83P???ll{;?r?Z?l@???a????<RN???]-?8O??z??_?w?qb?E?;??????i?_??#/?"???????e???-?q?m?E]D_v?;e???d?i???,??C?voZ%???m?x_?=r<h'QN???iU'???~?Q????C?N?b;?.?oR5?f?????,r??t???a*???!^???????<?%w~?G??l4}!?
a??x???N??%???!Y
a,?U?dp.L???????
??Y^`Ycy~XH??r?{b?Sy?1c?%????Bv???[??;nyLf?
,??4???4}??????@??9??,?l0vfz??[/??;?J??D6&<w???}
??\J???3??h?D?<??>?5??V????u&????}???+???!???j90??s??????k?3?<????G??=?e3B???U?
??c)?L??c?;??4q??(?N='??vD?k??o??e??d?5?y?V?=
???P?d?!?-????1zA??/O?gj??]A?
r?_r4_????x??N?39?a???????jb???z????R+]9O???_?^??,?x??g?	i???/?Qv??	w?c????-??9??;?-?)b`O
?q???y?'Z?w
)ul??U??t???.??&????J??{r?d^??D???2?????????????7??K
?S????gi?????2?x	u,??????TP#??	??*!:??(UFr8r??????????Ug,N??:???1??"&???WVwu?7?(?c:??k???????n??6???$*R?FR???X??c}?H
F??x?v?^????S&>im?o??S????r???;?/G/??Of?3cr??w??&???i?	K??t??S8??u?l????E]A??????/?@7r?MrO??,??S???k/10????Y,???b:?{!?\?
5?O3Md?"??/?q??xn?Q?1??s%z?3??o????e~??.??{?n{?j?DB?Uzh?????t?ma????*?i?Sj[XKN??_r{??S]b??ydK$???[Cboep??4(??????
?????????8dcZv?MD1V?$H?\\?-??H????????,\?#?3'??Y????t1o???8????b3m???a??H?a??
	?/)????/e?9???????.???>??K.WWEp-Q?????C?????s.u?~?n?r?0?t???\fl?	b??????
?????rBY??q???f???Qg????n???v?I!mQ??ZL=y?\c??
?????<r.????A?Cl?6???_$ha??w)?q??g?????????`??????????_?7?o?S?=?0????&x.?5??ro?v???????w61y7???1???2U,???U-??????CuLCi??l?E?????J???G?0?h?<?2^?](?{9?F?K?o???hb)9????7??l?,8?\9d?????!?PEC??7??|vj????F7)??????;???n??;9?u^q?w???????|?!n?F?[7??C\??C????. NJ`????6?<6???????W????C??h?X??6??@?|6???%????$?wL?]/?{)}M?T???????W???a"'E?4?????A??-?d??????>m?????z?D???|????'??#x?????xu??h???[???????p????T??????WhvDGs???O?n?f??????O????#??DGDGN
b[??
????????M???Ml?5?\???-??S??E??-
??9x8W???3qL?l;e??u??b?Df+}:Z(7??I???8:?x9?u<?_?N??????md???;1?L??h
??5?vXhL?=??m]M,????#?=??2?????
U????-? ????xB?Q??6?%???????n?ZJ=?M??E5W?;k?XX??Y?<??lQ???b??^5???h?????4??r}??y`xgzk5?v?????b`>u4?2?s?????&??yh?y?JUQ??\???r
?
ml\?b?????S?r???@????e?/?H@?{>?F?????4?I?J?|??4>?j????<?;???
??b???????g?ik?"?y-?????#_?7?e?????_Ck??%??$????*f ?x'??*????<R??t?\???]r?x??	?w:?f??]?z0?????9??D?Rn????o???f???77????k??;???I????59??.e?t???????)?????v7????)??1?+!?(???e2?.?4?m#2??*?Y???]?Q??>?vP0???????
T????t??*?c[8:^?E?%a??? ??b???%]??J?I?g?????????O???+~s????2????v?(??m????P??"?b??p???<?44?]????m<j
L?#??wHt???a*B?0d????m???????
?????;??2u?m??????i ??Kg#y???:????????Ml_n?:??5qlz??:9??1??'Y???I?R?????]???v_?;8,??j?_??n?????
???2?SY????.Yk(?M?1??p?9?a??4l?(?
9??>1?[
E?j?N??????xm >m??6q?9??:?{?8Wy?+?	??c?{?+QzG???>]?]0??j????G???.?L,?oa?5
?E?_2j??<?+C3?7?m??:zO`?x?ur????i????66~}RI?R?;?i????l??16.??0??
l?P??8?i?'??w??
df????/0????P?a??????\?.? ???!?????????????s??Np0???d?<?t??c
cQf??#?,L?k?>??@???M?Q?M???x?????,K?qd?0ue}?+?/??z[y??P9^cufN1?????9m$\m?4}Tb???M?J?^l`-???A?~???$?+?g?/?????F?h?A??????Cy?#J????-????_??m????]K?c+??>?~??O??????c?j?r?(?N?*??Gr]???4???_???-???ya"?D?gS????1?k??p??v?$???o?^ ??d????s?X???_Z???Dj??GM???8??
??8X+?5?F|m9(??}????ix?7????rL??????y??T?%??.Y``
}\?f?cr?7??????????Y???NN??z~<.??.?]??3??nb??k?v??BLY??|V???>? 7yk<?>??l??Z:*?1Q????o?M-??eX??r]??k|!??0M?7??
<w?6?EG????
??^r?i?????;?}???o?b;???s????0?0n???n&????
<?"???????4e??K?O?1R?}??_M??J?T?RO?Wp*B?;???x.??C?Q???VmTo???a??p?'?d?o??
E;?-?P?????????m,????????????*.??c?[a??cr???G??4?;iA
??Dl??????lh?G?4???8b?'&Z??P?????A	????iE?<??X?x???OE?E_??:x???L??\r????G&?oI????u?
?I?y???i:?~?brP+?4??????D?eB;D?+, ?1?e?%_-?P??E???????.?v?M??&??@b?a?l\Zb??P???la^?mYh?)?|?????@r??r?b??#LG9??0}^????i?@?6V?????m?a???????2=8??y?? ??
??5???????ib??????VgUtc
g??KC]96?mphB??\??k4?gJ}B??&M?BB^????!??L?V??????n
???0???"OT$?x2?c??Y?MD?@;???m???Y?????5Q??	?~O????????Pn_j?F}?"bO?????Z?VJ??|??D???=???=0P????]?w?K??pw??M?`_re^?3??<???o???a|?.?&
???3???m[???????eb??z6^??Q?1?????K^???]V?=?{?????L_Z{(}?(}Ld??Z?y?????>3?lG?NS???
?_?b?d?
d?^???L??u?O??;S??E??a)W3z?"???'???:ut????D??$tp??\??ho|????Q5??H?P?????VqE???_H]?<?2]Dq?z???h?4r??U??-?O?R??Q^X|??k?[??8????+??Q]M??c!r???'3???6q?x????or????b???}????>???3??????s??<{n!GrQ???-<|g??7??. ?	5???~???
?[xC=????????!??)?k?y?????????Sl?~????????D??;,~!?+?!&?????h?'y|????4?<X????@?0?'Fa?s??????k????X?????y^???W?u.wV??????o?Y?B/?F?m?Z??:?x??EZ???A??
??????1?Y]?1?9(?:???????>[????l??#?oXH?@?
????5??b???N\O?????^?W????a?(g?1??d~?.?g?'?q0?/??uQ????1?xK#O?????H???97q???6?vGl=???I?`?+???1?3{[?x?c??Q??JR?????
???a5??K????TA?yB??z????wk??	
?b??ZF[-??N.?????v{?e<g???P0e??L?UiG? ?1?Q??? 7??#?3??+(1@?7b|????Y????????m??k?l#v?0?Fr?8?!7??6??a}mhWwZ???6????)??1h)?????+???s?P?9?8???)?7?????"?`??^O???Z5??hc??y???>?=X??}??vUp}???3b????~XD????^??????\`???y=???r??7??????]I?.????o!O\???L??[?	:N?/????????B_?=qm?	c??v
?^e??#?oEu?2????z?:??????&{T??P;??(??<
??M?N??????*????z,glj!??)u?~:???r???%??+??@?t?????m?e|???p??i?-$???m???????m???6????????l?` ?B?
ZwW??(}?r
??W?X??"??3??z?:2???"????
?r??????4|?~D?oXo?y?D???????B???i?i?S2???
?d??????????O?mWN??????uR?G?m??j?3?Yh?x}`?(??[???(????+????[???B??[+???a?W???Z?5M????????X?D????3?v????}Lg?e???Cl?X?????L?9H???Ewx?XS|?
_KE??
6H??.B}-E???G?????6y????_??Q???.??????m??5:?S??????*'W????>{m?-????????)*&?s???l??????(#????2??Pq???^"???=Jk??N??????6J?"?+K?????x?fNy????r???I,????~_??Up??;qP]=???????.?b*SM?[?(1?V??gl???3????8?{??5?V???KNW=v?,?@??&??R?oJ~??m{^??!???h?Su4?+???k?v?#???:?c??z3?6wJ??`dv0?m???>Vg\?#???sOb?T~?y9~??H??s??P?S?}z??T?-?{h?m~?z
a;D?G???^A???~r???}????7??????????^4h??Y^?i???????5?%'?~R?,???>w??a???m$f???Y?????
???Bro??r?\?c?????O?
?1???L?y?q?8m?
???f???yT??6?C??Z????&?g$7???BD???????87??,i-?z??1t?[1??&?<fw??Y????8m>??????@???U??1)?????=6??6?)???'????????La	???????y?=????eu??J???	-???^
?0?-??4S?.????t?iSQ&?P/????o?T?o???*??U&?R??????\?x?????
?]?|?`&u?uG
E*9???????d?

?;?Np?oH??)4?8{D????E????mOm?Y(6?qS?7?<c[G?rs???????@??*^Hlro???i??kc.e?v??S?[C??6?h?{k2%?O~+???Ml??.e?VnM?i???H}??]?=???<_???uo?
?????6??1v}???5?L??&?&n[K??????<???i@?r???????G??k	-l??sg?????W??+?y?h???1?oA?]sp?1r#?~?~?
????????????E?o??h?????;w?b?T0????C?%??]%?8m?o9??????b????d??1?F???8H\?}sTGx?*S?gDY?}
????&??Q>??oS?????????wp???w2??m+??H?????~j8<P????dH??J?e7N????=S
[???q??BK??????????g??{?]?)????'_?kr}?`?D???t?Q^???\?????:]?????????B?V?????&???
??6?N??E????^?UL??????0?{??
?D?Ld9????`Y??????5,Xn"A5????
lm????x??h10?uM/???*?kPO?|d???????Q?O???s??S=07???o???]"??&ta?}z{?(O???~Qw??>*pc???:??x?????c?+??$??9X?J????????9S??R???H???3?D??B?!?==b??`?fD?E?vT$?}q???????kT?9??)sj???
?????Ob??l[!?A?|*v4????r??&?l???BL?????7}?????Q????j8? ??`?|??????\/?}/Q?#????&?????J?????kSE,?O?????k??2Z????P???z?
?%??,??I?IC??:r?U?>?????????e?)l"??C?c?ix????44??6?????C??pO?D??????u????X8?M??%??(N]?JN????,??g!?-d\?'?????P?6c?'???z?aPq~p79?1?umW?%????=e"?h??_%?X]?z?M?.???7????????w[m?`aF1?????C???AY??lb?\7??k?H??*??e?????=N??j?#q?W?????c$(D|7m??[??jy~?\_????k??(
Or0???A!&c??X?C:?*(B????u?}u/T?6c??|B????S????M?O??w??>?iHB_?m?\?`c/r ?A?c?O?

????nb???&???\Q??_??????F??z???m?(???9}??????:??O?*?I?i????|???R???x????_J?s?8?_A8u?v??>G20>?sp??ho?0!?H?/&?q?>!?7?'??+cd???????D,??e??>m
?w?/??|<_??'.T?????g.??T)????Z??P?7{?(B?I9?@U????=6G?????W???'?m!?????5??C?w??????=?``)?q]?+W%??f
??y????9lMI?C???????>n!{?W??????A?C<c?
??su'[?? 1?2????ev?xz?u??????,\"?????PP??
?uH?T???{??(M?8?:{H?????????"??>b??l[???q-m<??!C'?P?QQ?3j?s?t???36.r,\?sR??1??r< ??u???????u?5?c???}?7???B??????%???c????*?????a?%???zL????n?o?g??????+???C?K????ub?}?7?[???x?{
$?u6????J?M(???ES????lC??
Byq??HKb?eGU4dY+GP??|?E??{J/%??,?^????X?
????ja?|9?*m
?3?F????6???r??;D[F?????q??+?????U2?
r~???:j?Q1p????Tcn/T0????3r????
??1P???X8?????O?????R??5???????e?????8?D?
??aN?????pM??zE,pi?????oc?o??g??UY????ND??E?;??B?????p???K=*[???h??t?t?]??N??el[??W??R?????2??(?L?3???|???D??i??@?+f?5-j?51P?"??r=??N?1???????????O??)??|??>??p?9L??t\?D???mM? *????g:????????4?z????U?[c????c|?7???N??#,6???{t0?????:??G???r????7??d?????1G???6vQ??m???`1ED?+hx?U?b?7??'???RA??rm?t&w$?$??M?????PQ????z?;???	D=??KP?ow	}?~D????#
\???????
?x?+?gEG&?X?^G:o/z?g?O?N???5??

???4??a???q??LrM?|<????/????????:?,?c?X??7,?7?????PK???1??????E???q?????N?mz??????e}?;b8?0?????????J??rn???????"??? ???I}d??:	L??UL?y=WI???????+???k9?|j'???6E?E?|?w?p???`?l??R&V?}????l?K?P??A$}A??V?y??K????:?JL?????n???3,???x?'6?H?[?c??#???r?^'p+?~???r????,,??b??????H??????L?u?d:]P?*??w^?F???R?f?k?a&?|#?????|??6T&i??????????$????L??????`?y??L??q?5?[????a]?x}?2?`?%?????y+
d??>????@????Y???1???;M???????owX(??4???m]9??l ??'?HN?z??_???_???.??|=????u|e??D???h$?'?U]??^r???u???sl??aW[N??{?@	??%??
?????ml????1?E??v|?q???z3-??`#M|?S??U??8W?k?X???e??c?N???n?K?.??{F?\?
?i/>???????-i/???M=maM????
W??	S???W???^???c)???l?????u?$??(?????o?:?}??*V0P}/P?70??????:???f=Wq*\????????-?u?<?????x?-??`K?yx??????"?fc*e^L??!z?!???=?.?n??g????L?????D?r>v?R6??s-??I?\P?G?j??0?b?j&:,??{?????f?W?? ?,???O?????uE?u??a??6?[?d??????(s=?;??GvY?????8?>??xQ??*S?}?F?~????2i?L=^?D???W9???
C???k9???:????????f?|?E??K^T???Bg???`1?~????4???\i#???z~?f?\?C?[b?????????\????y???1??i%???F??c?+??G?5|`????.???;#m*??;Ey???ckUQ?r
?????????Q??????MI,?F??MG?
??(b??`???XC?q??r"?k????'
F?r?6!o???tG???*r43?,H???$4pc???i
,???~???E:??(?g?a??(\???L9j
?^d
_??e#?f??j>????O?V??????6??YX????`!G7???i
??o?7u?Y????j*???t!?&?N6???r'?w#M4?(|?)_???m???O?a??I??&6????'?f^2?D??1????U|??o????L|&??#????K??S?Y??6?????!&??/$T0g???qTd????n?c???????N ?lW??W??x|???%P???t)??kV<4????????/?7?DU??'????4?4???3?&??/b?E??
r~?_	???:=0;c??h???LW%???OC??&?g!^??!+m??ac??s??>??zE????8!??U???Z?>_0[??l??r???????=??c|vPv!Z4?"?bYe?l?>C?<B?Nl????
C
????939?u?%??=?sx?W??x??R??)XH??M{:H~}m??w?ql?p?-??C?E?
	?U\????0 at A???;?ygn? ????????\????8	???H'!???%????M??i7
??m?y}7r?2?-$?)?p ?T?????M?>?A?_JEbb???b?).'?T?'??w|???(g?Y?\?N??sg???
??a?????\9?t"??????k<^>$?Phv?^????????|????Tl?%??X?3??A??e??)O5?g?zW?~?Q???O??.?=???q?Y????:~?f??"???j??????E}?
??d??j???m(?>???6??x\????Y?8?kgh?
9?ZY<??????'D?S???????l?#>?-??
?????/+??ox?a6?|.7c???&??&??4?l?(?kr???H[P'3FS??0y???i???????9?+???i???
ef??C<?=zOK??1??~{u?X???F?J.?,#9IG????5?'5B?zR??b??7q????:?yE?[$???:?m????T,???E??????&????J???E??1??????y{???_
SNj
???l{?f
?l$?d  1?$??<s\??+??U?vf??P?30???tlS???uut&?9????A?????-8),L????"z_c?(?6???0U???%?^_????
????/???P^9j??&?s_ZJ?mbM)????????????@?~L=???A??*?V?????gcoC???&??7?l????M??
???9~?w???+????&??2?M?X?9?w?x#D???X(????.P????o?v?='??_`?|?3??????#??V?;JG??n[>4b??L?L?"Wr?J???M????~[?(?>?@i?=?????n&??&jQ~_s????A??f??w?hG%?m&???S???8r??o??4o???-?????X?\l"M??(@?
?n?a?e?zZ?D<q??????o?@
?G??/t???????OWk??fcZ*_??????x-1???????e??Y}?b?\?w??
???Ir>?u??&?h#j?????????s???T<?j?p=??$?I??j?UVCE??	C4?-d??Y?=o?ENcc?W??;??????]?=???????l4?????????o??ob?=?Kl3?W?
_?26????;????M???D?????7GA?'*?3n?'??]?1?????f?T?]&??"???]<??~I???AY???z??.?Wz??[???????"???'?2????TL??Hy?s????)??8??Or????i??+x????0eo?2??3???M??q??ta??e?JE?Zh@??????H?Q????Ki?l?a????8 ????d??????????~??n]eg ???6??*??H????[??W???ye!B????OE????z?M-?`S+??W??P?*?>???,??`??E?`?&?-????5???5?"?OV?8?&}|Q????+e??An8????6??q?}Zq??*????l?h??w?????????????qy0??\?F?????v??~nfRi???i?????dK? ?~???Z?C<x???8?h???}d?+??>kL70?????????O?J?nDL<???Y4?mK??????cvU?S???d+"?????2???/m=Y6?VfR1?mF????R?8???}%is??>7L?I?`o???w???{??'?????U?o??????a?]"?@rsO?K???????E???z?I>\??[????3??nr???
u???q?????j,?r*c6?;'SP?}????w???P?^?bbU???????Tp ?OG9????`?V ?{???]_r/T??a?J???????Nh?Ld^E???k??<y?:T?o?????[^?|?%?	]!???????H??9?9?}
???8???C9??Fz?n?Y??!??u??/?P????>?-????
'`a4?E?R??Ml?,
.?P???<?%?nH???B?? Wfc???????i?=???cm#q~x?>R]m4"?X?T???o??]O
??=F?=?i?O????F??@d`Sg??3?????z?|Q??~?I?5???<m????{??Pu?|??1?!Q??0???
??+?rH?'>d??q?_?!???>6?<Td!?OE=???????dT?^?g??f*}?O
r?7B??z1???s?\?{?8?5????????,|\g??9?
&??7q%HLL	CC????????H<C?M?~?_B???
R&~?&??M??8?q???s?Hb?d????_???????i?!*???W??o(?Z&2?&?Q??`|?{??i??l6u59YF??)????????dZ's0v6?e????Q?O???????*vu?U?????F9G3<0??'?o??v??~?0c??[G??>??????????0????h~?G?qtt_??or
????;B??!	???k????A>?p????-???M?>U2?m???-}-??W??*??v???Y?????IL?a??????{-t}?a?w??Z?>B?k9?C[????G?g'Uu/??7qp??di-x?u??8?n???}\?V??3F?6????5?{
??f???/?x???Z<Z9E~;????k?V.?????$)78?!??t4???????r???r?4?l?c??+*.MW?#?????????_4?<m?UU?)?q]9?nQ???????U?)HC?B?NW?????R}?o??2??O?????<uo???2?d??#?^r??<w?????V??P??5$?N.?|????#????L??sV??0???9????Xx?X?`??|M](??M,?k?ve~?B?uW??. ??U???{???6?:c^??6??1?n?????w?????`?????8`]K?l????Bg:?
???m?^a?C~??{QVQ????2??

*1H???????%?????3~~?Lh$???2? z?66?de???
?S??t???x?/??_???Ar[3ua?????n????????>?A?}???I3w?Y??[E?Y?}>?<??????Y[H?M?evyW?U%??8c????{?y_?B??6??`,?,???"F?\?E???a6f?=X??s?h??y???????????P_?Bb?????P~????S?c??????;?s?????I???
?s5?p??R?~??q??!xNllxP?+p?=?u??E?NA?????B?+????b?}????-???T???{y_??9???f!?g|67?????)???z?F??6????PI\_!??????U?4??&????N??X?8v?I9?s??(??+M4?*???q0B?=8?Z?n9??????@???x{??
Rv?X??,???3?,l$???S??c???K\{?=??c	????J6?6?B^e[?g	T?Wl???????????u?
???fu??3???T?e??f?Lt??bh??ro????9???????????$\?r?!?*??R??D??dPQ??BZ???x??????&n??w?????W??*??????'????????i?$%?/>S??f7??%?'?xg?d?,??1@?????:
?????????Ue?????q???Ur?@U???h=???aT????n???
?#=?}?7?[?u????*?w??wO???n??F?&e_?c????E??p?????bE?;$??6???r?:Ar]?????r?5???Q?????~@?k?(cM??Gc???>?`?ic?\?(?????
%??Fj:??gP???,???l??z;????C???}3p????,?x3?w??????1???}??e
??)?:{L??{Nz[??JG<9gz?K?g????&)?H??WA??r??D'?}??$<?b????>
???w?)?????????*&|??D??????????????N??4?8&???`?=?[xG???+?w-\???9>c?}???<>9??]q???S/?!?p?r????~u?k??#?#?~u/?2N?v??K???!??}jY????=???2n??F??????	??N(??I?+??D
??????Yg????c??&1?j	l??b?R???c?_?F?????h??6?m?i?82?O??????tmt???u?m|??????m?$?i?<???n?-??!????????z?_B?5??<?+M
???<??E?O???????????s?????H6M???
???Q!??N???n??B?X>?U????Q@?:??}?:4??Lm??7?e??!????}??6j??v?!?U?.???Iz?@?xr]??6-"6?1?`?????V???)U?)????&???Ly??m?;??H?E???????:????v^3???-?B???j??Y???}N?E??????9???kX?N???:|????R?0?^??s????F??&??m????]1?"??????
Y?qj?q???????=?<?v?>9?/b??~ub{y=	y????)?U<n??;?????j}
?????o?m???:?????a=???z,?pm??P`??g/l?f^?hyB??1?m??<"?G??p?x???"?J?y[C?zx?O??????ER?Z????.?`i????????#??1?[??l????r*?I??????[(????????D????~?t|k??`y?????#??O?3????b?y?????????????????DN??vro??6?????T????rE??W/??{?2?????\??h???NV???i?^??W??#??[?w??@??@b?yk???????9O,???????O?>?E?8?S?#zm?$??LP?g?(?"o??^?s=?????_?;(?????0mm$xJ?????tm?2!????`??????????hy???j??.?mW?r?????]#)??r/??!?/?u?yl???p??
????r??}_????d?eb~?~???????T?<????RG????X?`Qg~??????Zb???????[8hs^??mqB??G?4?D?K??m????;Au??)+E????o?Q????*T?A?6??t???????N?[
?g?!&????Gi???????P???D?7[8??9N?????n{k?~H?j??Kw???Su?i8??|d????=?9???u;?????VN??I????q?/???%?I??'??????_iOeo?k?*??QCq???M??D?t??*q`grh?a??l?KB?????OS?<????A????'9??>:?2Q??t?>????&:?K?G??a?rkS??u	??????,o=*.?!?????Mw??U?9???'?n?OW???3??-?E?6I4?????z@?
?????0%??????%?c}ik?????Q?-?WJ?*????????X.??V????U??????\????1W???n?1E??w??7???lb,????sSN,#l&?0'0W????EGm????,o,$??` u?&}?b????f7Q???,??l?eJk?*H????w?j??%6??i?5?:G??v1??????=<n?$d<???:?/]?y?(???*??q??????;??????m?,? yBG?|????I?;V?/??b?B?*
v???%??
;?*?&??t,???w????Y?g?z? ^??-ol????>M?|?????x?0??V??Z;.xn?q?C???)q???A)???
??i?? ???
????r?9.?h[`m+Q?F??]??P??<?\=j??@k???????ZhK,~c??????J?D=*t???????nn^wiWcBi[qt??jC?o??,+??8|7????H'??I&???e????5?7?Rp?1??<&0??@??A?QL?;??SA???d???+K??:???E??&??.???#???4??>cO???<?40???;?????)u??8W_r??;f,?k?E???y]?i?B??S??	?#Y?s??l)?_A????]	??-??i&?'?Kna?????????}y~?ab9?????????)?=A?c??????K?/????H~wl????18W?
/6&???3?????!??]?o`
??X'??
?}???3?u?v6????:?"^??*WW?Y???w???L;J?6??$G?????>}?#??&=a?"????'?\??	p??FO?`??%E??(?4J~???sD???q_w??K?? b?7??NW"WZ?N???:??[???@?[?[1?????`IA??V^???y????
b??g??????
?}?w)h\YA?b~??[!?y????l?d?K$??wPpN?-???$?
M?????e?+?????s?e$???;?????$
|?g"5?efzA????My?A?????7????Fw2a???o#L?????v????P????????h	?,?xMn????"???ru??c<e?L#d^"Gl}*J???????!<t(??P???'?
???????}T,?c!N_?(????(Wo?C?2?6P???
??8??*???E?Q?F
???"?b}{??????????lro??l?~?>?4c???il\<h"?p?o????d??ah????????L?t?:IC??:??1??|[1?S???????N?>??}???????z?{O??L?h?I?*YV?-??h}???	;	?}c????
???G??(?Fc????????w?)i?????CC????W?N?J?v?????_K??????????q?W????;?!????;????d![?'???-P???Wr???o??~y???75?? ?@ ?4`Ke}F{??'&n?64?H?????p?<??n[??3>Z???[?OR?(x?U??????L?`^]?u_???h%s??7??G|3??L???tQ?b??<?GE??6???p???[Y$?s3??.??}68E??<???,?g?j0mb???{????<?NL?f?
R??UT?
???_??????NxQ??h?o?????rOGCAi+????z?6????gE?Ln???G??YL??sY_??v?4EN?"??????6?
n?L?<.z????P?b?)?K???q?Xd_<Q??{??M?)??????c???oL??1?=????u?]??W;f`?0?????o???:??L?vzE??8n|`?S????w?J`Hf?0?O^??????????Z?\?uP?????d????"???????Ej?H?i???:??P&?9)
?v??MEO?5??????OR?:??\]??M	???^?:??]???????R?<.?x??W3_?h????&??h8VO??^kI?%&?:?)??N!Yr*8B>?????
?X??J0????c_}|?r'M5Pd?k3?????V?%?F??
?'u???????s}mL??P?~4<???Hr???]yR?X???????u0??vf??$?5E??y??!?l$??$????m_??XyIl]??xY}?(?29??Sn?_S?W?P?????????o/????p?P&?Z???9*7??W??Z?????H??~?OL??l??/???)??nZ??.??\?)?????x
a?????n"???"[3g??y??????"#t?b\+??A???N71h??????A????9????D??G??L_?????'~
????%??P?BZ???%????N??X?$?kfPQ????A????%?6????'????:?^&???}?|?
:1N??:U?_G??:??M^????^G?	9??E??o?S??=??`???&?#????x????i`??????(???L??{a_.d???????????4}??????d???T&?(??Y5???1)1?N???>rw9^?c??+C?S{???r??C?
?9(?????t~?c ???hW?A?x?2z3??ub???
<??9m3SUm
(?????Xg4c???n????J?`?i?y??oOZoa?F^[?}w?x????????W?? ?ve????c???R?g?=oZ???w??(X?3G?i??|F?k??F?ZK?????s??F(??{??1???X^P?"????l???&???5P?8?.????????*ey	xc?K*A9t???#?????E[*??^??????`???o??>b?p?????I???.???A?ZN??-y&|?d^k%mcx"}?????W+??`y??B??????~?6????DS
?e?Zu?????]?p??>}?u??????6??)H?k?^3?wz??Z?:????8?OC??H?L??6e?V??M,??6h????A?F}X??<???t???M??b??e???B???z_4????kb??V????7??]~o????????????z???<??IL??j?;zc?[	?)??L?q-???/?!}?F??,Qp?%?jE??????0?k?wC
??H{T?y????l;F?QI|?-e??@?????z????W??1???.???#?_?\?0=c???????m]!^?"???O<{f???-,4n?`Um
7F?O?v].?L?{Fd?!?;y??{??!G?o?:>?1??vz?r}QL??I?????=?Fb?????	??i???rjA?iB[4tX*?5?e??*????U?{??'????Q??8?U?]??2?[I?Ml??%?CL?????????E????J?{???J]??c??r,?Z???}????Z?'??W?}?5??-)zl)???zW??%?<,????????????Su??/hS?sesq??fn????P$?????>????5??e???&3?????E?????~L??k:|???p????4Q??b8?aU?F????.?
?Z????N????3?[??V??h???>?[N???(?^??0;(O?w???f?+?@?Qd
e???A2?m?=[x??%?m?c???xfr????;\?+?ip???F??????????{?w???H=@??u:?2?Y??w*??r]?t?T?{??pT~??T????:??sa?3?5?/?X?????|5
|????r????X`??m?w??mb?????N??hW/??H?n?1&???????fP??????c|?#????[??
?k?97,S|??~U??????j8???-?}?n"i??i)???6?1???
T??"???bK????+Xr]?M_
???o??????`*$?G?L???\?&0?6?O?????D?G??.???|?}?g????x?8?
c??h?"l??,????o{?<(W??????r/Ikm?R1Y?AK!???hB^+?]?c,Y?z??L|??~'?=??ts??_<??)?q?]yU??????s??&:??Q??-u?w/%9?1?^????#?.?
=:H??????>?Z?:???
?=yy?)?-`??o]??
<???5m?"???E,?????M*?!? ??$???????????gk?????????5????w56??AY?>
?]?{@-?{????'?:??g????Y?eW7?????Ee&6?b?lAk?ez-???p????Dk?N?H?????yE^	S?h9P?????-i?-????l?????X?????s???5?d ?|?0??G?4?Y?c:???(-?H???????ZX/?Y`????u???LD=??p?\????|6???S????c?0????M(9??:??o????KO?x?????????yY??o????Q9??:LLP?{??+?1@??b?h)(?I{??'????X?$?|?s?]L9^f??y?ud?d`?y??D3???5?m?SJ??V??m??????y	cC??6??q0Z?%????d?'???????{?Y??r-z-??R&?~?Gy???n?mcl at lw?e?`#????W?z??????????P???E???oT at b?????l[9???A<.??%?#????o;?K????d????Mm??@?c>??Bn????i?q6X??*\???F:?vFs?
b?:y?]???35??{|'????X???1?q?z#?}???m?????A????^???2^
yy0F?+z????&???v???_???xFnPa??k?EY????w?F????2p&??????E|
?>?"?1?>????7,??s}sR???<j ?2?????#7u?[??{?~M?M??ed5??e??T??/??7????????9s?????QG~K???-?k?mk?n??'E?u?&??}l??'H?{????H?_??x??2?3?'???r????~1Z+8?`?a??u{???^???o????7/
??
o!????\?+y?????
?1?4???g+??P?1??c???3?????6>vV?W???Jr???`??)???M(?,?jl%?5r?^????}E?o	?wv????~??e??;K??~?E?{????,?????rm4?wi??u|?$?F??]E_T?<?
?[??xt??C?:?????ma?f??
~??n????w|??{e?iX?7??????^????b?fm?$?\?)???m??????????$?????4????^???g#??#$>??~H??wB???|y?&G\??L?[??R
??V?XCl?2P?~?X??60?r|%?<z????RO?P+??3??k?`Ai?Y?UU???s ?7{?c?????i2v?x?#?x??(??1??^?O?/?5a?tl??|?I|??D.??Pj
?Y?L?????pcq??i???b??}???(?;????E]?H?.??D6?<??????????????k/??m?g?j/e?????B???i#??%"?\?M??}!??7??C???
???????C?????mj??????????b??
?Ud?b|/???,cC?v??d]e??QJ?;X???O?[??.6???????????H??~#ms9*???Ob?????YubL?A=Z?????
r?[??.??mL/!???g??"??T???3E?YH????? ?(_?X??? ??W??Z?&?<Q?D
9???? ?t???]*???z
R^	i????~D[d????]?s?V?4??????}??s?r
????-3?R?U97???9?1???K?T?????lh+??T??M???Yv?x?7?Z|????l?????Uh?nllm??k?(?Z'M??N?&?????{?u?c?V)??{?5????q?,1*?PTc???Im??6Q???????x??????H??.?8?e????i?M,?d!?\?*W1#??zG?u??B??????i?Y??aYGC?dr?f???g???%*(??g[?QQ??? ?[?????E??tmTz)?z?'??w?^?-?tm????cZG-???{,D??NW?1_?Y&B??O??l %????i??q?D?h??Rx=Y?-?5M?C?\?DW??u|w?)???????W[(??8?1?0S?_	?o\??c??|7??e$?`???U4???5BG3????m??|?????f.@?f??&??7H??}}?F??%??$MU?">?I?!?@????	???9g??a#GQ?n?,:T??8/???t,??d?
u?{7????/7????
??
??_?^Q?u?<?????U?+-??3/???	??z??????????D??.?&???'???93?jx?W???6?E(?6?????B???i?O?J?K^?Z??M?i????&???S?\*?+D???? ?ncy*??G*S???;??^?????N???????S?????`??jx???k??n?B??]#f??`?*???=??;????r?a???k?;?Vi<?M???Q6??|?lW?D??????????,??k?????"???o.n???[??,?X?5o5????L???#,?z??4?W'?XPC:?\i&?Ic?HqM???;E?'?b!???)??T?%x?c*?R??_???6?>?c???;????????|?6lxQT$?k?? ?`??0????1?j???g-?????h?>?sM?o?W?k?~?8??l?>?>?????:???????<?????<???>???-(5?V+???4D)????I?1c??#?&vHi??%?Fl?Vb$FJ??L?*mw???^'?????\???9???q??<c??l?

wwUQ???o[????-??a???`^???<??0?????nt?WA???b??Q't?Yn?Y????-;????????cmQ^
J???v???[?c?4d????a?
??o
Y?b?e?>?1???v? ?.,?)
?EG&??sW?h???]8I_<???&?Rjgc?c?gk????H)?????
?_?`?.??b???(?%c?????
?[??????::??:w??6-?`?1??U`DqG7[
??>?a??????Y?~?hM'??>
R?W;??s??C?+)?U?)G[????????,?????`???w????SL??`?5??Icq????W
?k?z(p???d??R???W?mGBT????$????????34???`??<?????w???M?>r?q5?????????????U?YU"???%/=?p???:?+;Q??s<zc?????
&.e??????????????5??c^!7?G????vc??????v|?z<LQ?????v??c?O?h????u? n???????}??I?>/a?'??\d???Tu???gk??37.R??N?H?h?u5?j?k???+??%3?k[?????9Y??u?'??!???o!B?
????gv?????e????>s-???`??8?j????u??B????????E???v>cV?w?~V?P???Y??E??mgw'(?V???l?Mn?x??^Q??????????z%???J??h??????/I?O??M?G&?G???d?^???u?vyw??n/???f?A???o<10W??-Q???{n?3?eX?bYj?
?,????I{?????5??4mo????u????"l?7ML?xI?C??!q???????4?e?d?w?dU???xO`???e<td??r ?F?uj?X?P?	G^??????????\?
_+???4,c0??7??4xD?D8?????%T?lE?8?o????????&z7???n?p???O??wu?-?fu~P???'Y/r?$????C{??? ?j/?e,.??D}q+?W??
ee=^???nj~?WvVQ???ujka??I??*l?hr?eW????-[.????&???????*6???)F?u?&f??P??4???4??u??? ??J??7??[Q??,?j??a7W????_??????0??BO?2??%S?W????TC??	?????#L,O???w?m???el????]i??LGv?(?-??>'??whW??T?
f????Gx'A?K?u?S?d????}#?????????6?w?>?N??3???\??I????3?b?Yj??e?Z?'?YI???
4l????Q;?OY?s?S??????.??"??m?k?PX??)<??????????D?5??)CL????
?kl??~???
?Vre,??(???[????*???p????f?7?????-?N0??*?y?U??}%???6{?x?'ek=?SJ???{?????!???<o?N???0??????*iT???#
??????I{Ly?????o+?9?u???|??'??Y?L\?????{D????2k???*X?vz?#?.?Nt??]?G~?'?q?2?~??-p??'5?K:741??"??$???_???i????_???????-7*?/ux?N????i????.l,?F>??y=?v??%u)'???Gc??????????ez?}?gr?s?????]?I5a^?qELc8?????s??}?????}71????.??O????K?G???o?B??
M????j?,????u
?????1??g???:4??????L???b?e+???Lg?*L??
?o\?9o?h?^??Df;??F????B;??|>??????d??8??C1????q?:????ZD?}??0C?v?`O?-????R>?5?_w?0???j??f?in?~LD?>???t?]????Y???_??U<?>?}???????gn??m???????.?????r?????PV?^2??;??g?+e=?
???????*?????/?5?.??UAr	r???x?`??)?e`?%O5Y@;Y???@7???<M?t??}O?&v???
p??????_?[??u?????6Hn?E?to?????`fS?O???,?1?e?u6?????
)??????+????????l?jC?x[???s??#'??`??{??9m????
????jj???A?7???C]??<z????k??????b^l?
P9
t???I?q???4P????n?4?O}???IL??0r???x??}?"e????b?8?~???hw6Q?:????????JC???#??-??$??y_?H?5????rKMt}e???#????R??Zk<?gk???W?B?n?46B????/R0x????:V???Q???e??3?'Wr?w2???Ge?a]?/?N?????????9???}?g?????@??g
?mD="?m?D???X?k[???V+\??o??]????|?s??X2?7???L<???h?????<?????(???????R?1xNz???!g????&?S??????&??7O????@
????{$?:?????3T`???rx?????_Gw4??
@????0?8??????Usc??3yU?????.?e?????!/???<?5m??????w?~`???'P????N??eg2??????l?]N?Zb`???n?-???[??????]?"??k?l?????0???????Y/S?>??.??qeO
?dl????%0????i??????5?WS.??[?R?K?G?z?????_.?_p??r????
?m$??G???|?>????|??+??<? ????@?9??	?????X???'?k5??X?!?=
?R?)?G?
?"_+N???51}??-"???????P?????^?9A?????>P?c?|?@
?y_8?+S?>``?????~f??<[??n?Y'??B????a??.?gYO(w?/CH

kn
L
4-?5??@a?R??vq???????ld_UZ?B&y@?p????????n?\?G?-?9RA5???????p????GN0??-??v???&?d?fgE.|??????C?T?????q?B??
?	Y&?7??V?X@?y????$cN?O???????u4?
i?X??+vH?>?~???}?d?N?????=?a?
?r|?msF??????
????|???????G??*??'`yh?R????GO??
???"*g\E=<??%i#????"v??b???{????J?4?/-e??A?|???E??6???L-??T	????~??~Wt??????????8??o?'u!??????????,1?Xo.???,d6???~????0?\rjg?
uD???E?\???#??6?|???0???`??TT?????D??4??]?(?}?u!?q????.??k???P?os?Ye
}???:7
'Z???}??w???m??"v???o??g<???$Q??'???.????????\??s???K-(?=g"?]??c???,?wSe-??
?R13?<]r???v?w??????N??i;:???????i~E??
j??w?9?????)?/?H?>J??~???.??Al???#k7]?'???]?3~*?y???&??n??@?Gl&#f,0?|????
dA??f?V????r~????n?`???,O??O?|W?H_?+k??D~?4c?C?e(?f|3U???w????]X9S?!v??'r}?^p??X?<???=?)???Um???????T??????]?g?]<???r?A?b??Q?>f???????c?!??Y?+?qe;G?v??????????]??_~?0?:??#??[_?????3????j???5\??B????q?6}<?y???u?"N{???_'u??[???2?X?wM?R?????!1??????w??&^?,R1g??WB,?$6m?9m?~_??S~~????-??/>Fy?-???K?ke?d??N??????~?>6??TV??#?<?HL????6????, 2??}??????K?|?%??~?I?tj??Z???c'???????}-?y
m??s????0?g??nU?d>??????(f???(?^?7??????????P????2???/Y???????/?N??A
W???l?o?~h?w????
??4?d{??`a????V?p?m????1?%???w?;~j_7?s??RF?????E>T?2?{%????&j????E???m?\+bU?#?}u+$???u????a??;?+???>??????{??? u?
???ch????r-?M+???-[??*?_????<e?1????Xp`?Zh
???{?n?>,m???Ng?>=?4`??!????I*R{
/?B0C??2VM??o!}x?=???NP????=??-??R?7???7???PE'???v?{?]
???eE?????73
?}??o?k??P?i??G)Y??}??i????-?>?????m4?d"?~Y?}?^?rc??w?J?????D>??i?}=u??????l?=S](???n???_??/??????]??l?H??
?/{??????)g:ea?&6&?*G[L?P???Z??????e?o";??g?:iN?/|l?O??p?[??g"?(?????H?i??G???f??|??D??DZ?jb!?????<\??:???????'??2^???
v??{?S?7?4<????e_????x????????Ol???LT??dtsd???PK

PK

charset pt154
data-encoding utf-8
PK
j?X??~QKg?FsI??}???CU?{P?	???F.p*R??????EN ??RQI??/%??????B?3FN1??2F?*?w??+??6??N??>??????/??*N?*?????
B? ?U`????$?K?????"?
?Ha???????p?S-??k??Qc'@}??{?y"?,-|[?r??2DY?a???R	9?EP????e???????l?^i????d???!	?r?G?(???O????J
p???? g[U3v??\?G??<????S???????&??????>dt??*????=r?PK
	??i???B?}?EG
:l??~-f7??ds???K????h??Tx0???/PK











--- NEW FILE hunspell-kk.spec ---
Name: hunspell-kk
Summary: Kazakh hunspell dictionaries
Version: 1.0
Release: 1%{?dist}
Group: Applications/Text
Source: http://extensions.services.openoffice.org/files/1172/7/dict-kk.oxt
URL: http://extensions.services.openoffice.org/node/2240
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+ or LGPLv2+ or MPLv1.1
BuildArch: noarch

Requires: hunspell

%description
Kazakh hunspell dictionaries.

%prep
%setup -q -c -n hunspell-kk

%build
tr -d '\r' < README_kk_KZ.txt > README_kk_KZ.txt.new
touch -r README_kk_KZ.txt README_kk_KZ.txt.new
mv -f README_kk_KZ.txt.new README_kk_KZ.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p kk_KZ.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/kk_KZ.aff
cp -p kk_KZ.dic.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/kk_KZ.dic

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_kk_KZ.txt
%{_datadir}/myspell/*

%changelog
* Mon Apr 20 2009 Caolan McNamara <caolanm at redhat.com> - 1.0-1
- initial version


--- NEW FILE import.log ---
hunspell-kk-1_0-1_fc11:HEAD:hunspell-kk-1.0-1.fc11.src.rpm:1240522635



From spot at fedoraproject.org  Thu Apr 23 22:08:37 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 23 Apr 2009 22:08:37 +0000 (UTC)
Subject: rpms/banshee/F-11 banshee-1.4.3-coverart_query.patch, NONE,
	1.1 banshee.spec, 1.74, 1.75
Message-ID: <20090423220837.2E0F670104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/banshee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17738/F-11

Modified Files:
	banshee.spec 
Added Files:
	banshee-1.4.3-coverart_query.patch 
Log Message:
fix 492707

banshee-1.4.3-coverart_query.patch:

--- NEW FILE banshee-1.4.3-coverart_query.patch ---
# https://bugzilla.redhat.com/show_bug.cgi?id=492707
Index: src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
===================================================================
--- src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(revision 4857)
+++ src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(working copy)
@@ -58,10 +58,12 @@
 
         private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
             SELECT count(DISTINCT CoreTracks.AlbumID)
-            FROM CoreTracks
+            FROM CoreTracks, CoreArtists, CoreAlbums
             WHERE
                 CoreTracks.PrimarySourceID = ? AND
                 CoreTracks.DateUpdatedStamp > ? AND
+                CoreTracks.AlbumID = CoreAlbums.AlbumID AND 
+                CoreAlbums.ArtistID = CoreArtists.ArtistID AND
                 CoreTracks.AlbumID NOT IN (
                     SELECT AlbumID FROM CoverArtDownloads WHERE
                         LastAttempt > ? OR Downloaded = 1)");


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-11/banshee.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- banshee.spec	6 Mar 2009 23:36:30 -0000	1.74
+++ banshee.spec	23 Apr 2009 22:08:06 -0000	1.75
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -10,6 +10,7 @@
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Patch0:  banshee-1.4.3-podcast_download.patch
+Patch1:  banshee-1.4.3-coverart_query.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -112,7 +113,10 @@
 %prep
 %setup -q -n %{name}-1-%{version}
 cp -p %{SOURCE1} .
+# This only improves error handling for downloads
 %patch0 -p0 -b .patch
+# This fixes the 100% CPU usage bug while fetching cover art
+%patch1 -p0 -b .patch
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -197,6 +201,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 David Nielsen <gnomeuser at gmail.com> - 1.4.3-3
+- add patch to fix rh#492707 - Banshee use 100% when fetching cover art
+
 * Sat Mar 07 2009 David Nielsen <dnielsen at fedoraproject.org> - 1.4.3-2
 - add patch for gnomebz #536047
 



From spot at fedoraproject.org  Thu Apr 23 22:08:37 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 23 Apr 2009 22:08:37 +0000 (UTC)
Subject: rpms/banshee/devel banshee-1.4.3-coverart_query.patch, NONE,
	1.1 banshee.spec, 1.74, 1.75
Message-ID: <20090423220837.69F9870104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17738/devel

Modified Files:
	banshee.spec 
Added Files:
	banshee-1.4.3-coverart_query.patch 
Log Message:
fix 492707

banshee-1.4.3-coverart_query.patch:

--- NEW FILE banshee-1.4.3-coverart_query.patch ---
# https://bugzilla.redhat.com/show_bug.cgi?id=492707
Index: src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
===================================================================
--- src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(revision 4857)
+++ src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(working copy)
@@ -58,10 +58,12 @@
 
         private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
             SELECT count(DISTINCT CoreTracks.AlbumID)
-            FROM CoreTracks
+            FROM CoreTracks, CoreArtists, CoreAlbums
             WHERE
                 CoreTracks.PrimarySourceID = ? AND
                 CoreTracks.DateUpdatedStamp > ? AND
+                CoreTracks.AlbumID = CoreAlbums.AlbumID AND 
+                CoreAlbums.ArtistID = CoreArtists.ArtistID AND
                 CoreTracks.AlbumID NOT IN (
                     SELECT AlbumID FROM CoverArtDownloads WHERE
                         LastAttempt > ? OR Downloaded = 1)");


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- banshee.spec	6 Mar 2009 23:36:30 -0000	1.74
+++ banshee.spec	23 Apr 2009 22:08:07 -0000	1.75
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -10,6 +10,7 @@
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Patch0:  banshee-1.4.3-podcast_download.patch
+Patch1:  banshee-1.4.3-coverart_query.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -112,7 +113,10 @@
 %prep
 %setup -q -n %{name}-1-%{version}
 cp -p %{SOURCE1} .
+# This only improves error handling for downloads
 %patch0 -p0 -b .patch
+# This fixes the 100% CPU usage bug while fetching cover art
+%patch1 -p0 -b .patch
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -197,6 +201,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 David Nielsen <gnomeuser at gmail.com> - 1.4.3-3
+- add patch to fix rh#492707 - Banshee use 100% when fetching cover art
+
 * Sat Mar 07 2009 David Nielsen <dnielsen at fedoraproject.org> - 1.4.3-2
 - add patch for gnomebz #536047
 



From cebbert at fedoraproject.org  Thu Apr 23 22:23:39 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 22:23:39 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1346,
	1.1347 linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, 1.1, NONE
Message-ID: <20090423222340.1D68B70104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20354

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch 
Log Message:
Drop POSIX timer patch accidentally committed in 2.6.30.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -r1.1346 -r1.1347
--- kernel.spec	23 Apr 2009 21:09:17 -0000	1.1346
+++ kernel.spec	23 Apr 2009 22:23:08 -0000	1.1347
@@ -698,7 +698,6 @@
 
 # patches headed for -stable
 # make RLIMIT_CPU work again
-Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
 Patch7010: linux-2.6-forcedeth-fix-resume-from-hibernate.patch
 
 Patch9000: squashfs3.patch
@@ -1308,7 +1307,6 @@
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
 # patches headed for -stable
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
 ApplyPatch linux-2.6-forcedeth-fix-resume-from-hibernate.patch
 
 # we need squashfs3 for Fedora-10
@@ -1911,6 +1909,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-47.rc1
+- Drop POSIX timer patch accidentally committed in 2.6.30.
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-46.rc1
 - Add missed patch for fixing VIA Padlock driver autoload.
 


--- linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch DELETED ---



From cebbert at fedoraproject.org  Thu Apr 23 22:27:26 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 22:27:26 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1568,
	1.1569 linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, 1.1, NONE
Message-ID: <20090423222726.B6A8F70104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21003

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch 
Log Message:
Drop POSIX timer patch accidentally committed in 2.6.30.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1568
retrieving revision 1.1569
diff -u -r1.1568 -r1.1569
--- kernel.spec	22 Apr 2009 14:46:01 -0000	1.1568
+++ kernel.spec	23 Apr 2009 22:26:55 -0000	1.1569
@@ -733,7 +733,6 @@
 # fix posix clock monotonicity
 Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
 # make RLIMIT_CPU work again
-Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
 Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
 Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
@@ -1377,7 +1376,6 @@
 ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
 ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
@@ -1984,6 +1982,9 @@
 # and build.
 
 %changelog
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-107
+- Drop POSIX timer patch accidentally committed in 2.6.30.
+
 * Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-106
 - back-port mac80211: fix beacon loss detection after scan
 


--- linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch DELETED ---



From cebbert at fedoraproject.org  Thu Apr 23 22:32:47 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 23 Apr 2009 22:32:47 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1347,
	1.1348 linux-2.6-upstream-reverts.patch, 1.7, 1.8
Message-ID: <20090423223247.70A8670104@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22430

Modified Files:
	kernel.spec linux-2.6-upstream-reverts.patch 
Log Message:
Revert 2.6.29.2-rc1 patch that won't be in the final release.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1347
retrieving revision 1.1348
diff -u -r1.1347 -r1.1348
--- kernel.spec	23 Apr 2009 22:23:08 -0000	1.1347
+++ kernel.spec	23 Apr 2009 22:32:16 -0000	1.1348
@@ -1909,6 +1909,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-48.rc1
+- Revert 2.6.29.2-rc1 patch that won't be in the final release.
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-47.rc1
 - Drop POSIX timer patch accidentally committed in 2.6.30.
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-upstream-reverts.patch	12 Jan 2009 19:51:30 -0000	1.7
+++ linux-2.6-upstream-reverts.patch	23 Apr 2009 22:32:16 -0000	1.8
@@ -1 +1,228 @@
-nil
+-stable review patch.  If anyone has any objections, please let us know.
+---------------------
+
+From: alex.shi <alex.shi at intel.com>
+
+upstream commit: ff69f2bba67bd45514923aaedbf40fe351787c59
+
+We found Cx states time abnormal in our some of machines which have 16
+LCPUs, the C0 take too many time while system is really idle when kernel
+enabled tickless and highres.  powertop output is below:
+
+     PowerTOP version 1.9       (C) 2007 Intel Corporation
+
+Cn                Avg residency       P-states (frequencies)
+C0 (cpu running)        (40.5%)         2.53 Ghz     0.0%
+C1                0.0ms ( 0.0%)         2.53 Ghz     0.0%
+C2              128.8ms (59.5%)         2.40 Ghz     0.0%
+                                        1.60 Ghz   100.0%
+
+Wakeups-from-idle per second :  4.7     interval: 20.0s
+no ACPI power usage estimate available
+
+Top causes for wakeups:
+  41.4% ( 24.9)       <interrupt> : extra timer interrupt
+  20.2% ( 12.2)     <kernel core> : usb_hcd_poll_rh_status
+(rh_timer_func)
+
+After tacking detailed for this issue, Yakui and I find it is due to 24
+bit PM timer overflows when some of cpu sleep more than 4 seconds.  With
+tickless kernel, the CPU want to sleep as much as possible when system
+idle.  But the Cx sleep time are recorded by pmtimer which length is
+determined by BIOS.  The current Cx time was gotten in the following
+function from driver/acpi/processor_idle.c:
+
+static inline u32 ticks_elapsed(u32 t1, u32 t2)
+{
+       if (t2 >= t1)
+               return (t2 - t1);
+       else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
+               return (((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
+       else
+               return ((0xFFFFFFFF - t1) + t2);
+}
+
+If pmtimer is 24 bits and it take 5 seconds from t1 to t2, in above
+function, just about 1 seconds ticks was recorded.  So the Cx time will be
+reduced about 4 seconds.  and this is why we see above powertop output.
+
+To resolve this problem, Yakui and I use ktime_get() to record the Cx
+states time instead of PM timer as the following patch.  the patch was
+tested with i386/x86_64 modes on several platforms.
+
+Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
+Tested-by: Alex Shi <alex.shi at intel.com>
+Signed-off-by: Alex Shi <alex.shi at intel.com>
+Signed-off-by: Yakui.zhao <yakui.zhao at intel.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Len Brown <len.brown at intel.com>
+Signed-off-by: Chris Wright <chrisw at sous-sol.org>
+---
+ drivers/acpi/processor_idle.c |   63 ++++++++++++++++++------------------------
+ 1 file changed, 27 insertions(+), 36 deletions(-)
+
+--- a/drivers/acpi/processor_idle.c
++++ b/drivers/acpi/processor_idle.c
+@@ -64,7 +64,6 @@
+ #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
+ ACPI_MODULE_NAME("processor_idle");
+ #define ACPI_PROCESSOR_FILE_POWER	"power"
+-#define US_TO_PM_TIMER_TICKS(t)		((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
+ #define PM_TIMER_TICK_NS		(1000000000ULL/PM_TIMER_FREQUENCY)
+ #define C2_OVERHEAD			1	/* 1us */
+ #define C3_OVERHEAD			1	/* 1us */
+@@ -78,6 +77,10 @@ module_param(nocst, uint, 0000);
+ static unsigned int latency_factor __read_mostly = 2;
+ module_param(latency_factor, uint, 0644);
+ 
++static s64 us_to_pm_timer_ticks(s64 t)
++{
++	return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);
++}
+ /*
+  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
+  * For now disable this. Probably a bug somewhere else.
+@@ -159,25 +162,6 @@ static struct dmi_system_id __cpuinitdat
+ 	{},
+ };
+ 
+-static inline u32 ticks_elapsed(u32 t1, u32 t2)
+-{
+-	if (t2 >= t1)
+-		return (t2 - t1);
+-	else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
+-		return (((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
+-	else
+-		return ((0xFFFFFFFF - t1) + t2);
+-}
+-
+-static inline u32 ticks_elapsed_in_us(u32 t1, u32 t2)
+-{
+-	if (t2 >= t1)
+-		return PM_TIMER_TICKS_TO_US(t2 - t1);
+-	else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
+-		return PM_TIMER_TICKS_TO_US(((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
+-	else
+-		return PM_TIMER_TICKS_TO_US((0xFFFFFFFF - t1) + t2);
+-}
+ 
+ /*
+  * Callers should disable interrupts before the call and enable
+@@ -853,7 +837,8 @@ static inline void acpi_idle_do_entry(st
+ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
+ 			      struct cpuidle_state *state)
+ {
+-	u32 t1, t2;
++	ktime_t  kt1, kt2;
++	s64 idle_time;
+ 	struct acpi_processor *pr;
+ 	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+ 
+@@ -871,14 +856,15 @@ static int acpi_idle_enter_c1(struct cpu
+ 		return 0;
+ 	}
+ 
+-	t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
++	kt1 = ktime_get_real();
+ 	acpi_idle_do_entry(cx);
+-	t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
++	kt2 = ktime_get_real();
++	idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
+ 
+ 	local_irq_enable();
+ 	cx->usage++;
+ 
+-	return ticks_elapsed_in_us(t1, t2);
++	return idle_time;
+ }
+ 
+ /**
+@@ -891,8 +877,9 @@ static int acpi_idle_enter_simple(struct
+ {
+ 	struct acpi_processor *pr;
+ 	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+-	u32 t1, t2;
+-	int sleep_ticks = 0;
++	ktime_t  kt1, kt2;
++	s64 idle_time;
++	s64 sleep_ticks = 0;
+ 
+ 	pr = __get_cpu_var(processors);
+ 
+@@ -925,18 +912,19 @@ static int acpi_idle_enter_simple(struct
+ 	if (cx->type == ACPI_STATE_C3)
+ 		ACPI_FLUSH_CPU_CACHE();
+ 
+-	t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
++	kt1 = ktime_get_real();
+ 	/* Tell the scheduler that we are going deep-idle: */
+ 	sched_clock_idle_sleep_event();
+ 	acpi_idle_do_entry(cx);
+-	t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
++	kt2 = ktime_get_real();
++	idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
+ 
+ #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
+ 	/* TSC could halt in idle, so notify users */
+ 	if (tsc_halts_in_c(cx->type))
+ 		mark_tsc_unstable("TSC halts in idle");;
+ #endif
+-	sleep_ticks = ticks_elapsed(t1, t2);
++	sleep_ticks = us_to_pm_timer_ticks(idle_time);
+ 
+ 	/* Tell the scheduler how much we idled: */
+ 	sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+@@ -948,7 +936,7 @@ static int acpi_idle_enter_simple(struct
+ 
+ 	acpi_state_timer_broadcast(pr, cx, 0);
+ 	cx->time += sleep_ticks;
+-	return ticks_elapsed_in_us(t1, t2);
++	return idle_time;
+ }
+ 
+ static int c3_cpu_count;
+@@ -966,8 +954,10 @@ static int acpi_idle_enter_bm(struct cpu
+ {
+ 	struct acpi_processor *pr;
+ 	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+-	u32 t1, t2;
+-	int sleep_ticks = 0;
++	ktime_t  kt1, kt2;
++	s64 idle_time;
++	s64 sleep_ticks = 0;
++
+ 
+ 	pr = __get_cpu_var(processors);
+ 
+@@ -1034,9 +1024,10 @@ static int acpi_idle_enter_bm(struct cpu
+ 		ACPI_FLUSH_CPU_CACHE();
+ 	}
+ 
+-	t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
++	kt1 = ktime_get_real();
+ 	acpi_idle_do_entry(cx);
+-	t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
++	kt2 = ktime_get_real();
++	idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
+ 
+ 	/* Re-enable bus master arbitration */
+ 	if (pr->flags.bm_check && pr->flags.bm_control) {
+@@ -1051,7 +1042,7 @@ static int acpi_idle_enter_bm(struct cpu
+ 	if (tsc_halts_in_c(ACPI_STATE_C3))
+ 		mark_tsc_unstable("TSC halts in idle");
+ #endif
+-	sleep_ticks = ticks_elapsed(t1, t2);
++	sleep_ticks = us_to_pm_timer_ticks(idle_time);
+ 	/* Tell the scheduler how much we idled: */
+ 	sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+ 
+@@ -1062,7 +1053,7 @@ static int acpi_idle_enter_bm(struct cpu
+ 
+ 	acpi_state_timer_broadcast(pr, cx, 0);
+ 	cx->time += sleep_ticks;
+-	return ticks_elapsed_in_us(t1, t2);
++	return idle_time;
+ }
+ 
+ struct cpuidle_driver acpi_idle_driver = {
+



From spot at fedoraproject.org  Thu Apr 23 22:37:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 23 Apr 2009 22:37:21 +0000 (UTC)
Subject: rpms/nautilus-cd-burner/F-11 Makefile, 1.3,
	1.4 nautilus-cd-burner.spec, 1.115, 1.116 sources, 1.59, 1.60
Message-ID: <20090423223721.643A370104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/nautilus-cd-burner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23204/F-11

Added Files:
	Makefile nautilus-cd-burner.spec sources 
Log Message:
libs and devel only


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	23 Apr 2009 22:36:50 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: nautilus-cd-burner
+# $Id$
+NAME := nautilus-cd-burner
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: nautilus-cd-burner.spec
===================================================================
RCS file: nautilus-cd-burner.spec
diff -N nautilus-cd-burner.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nautilus-cd-burner.spec	23 Apr 2009 22:36:50 -0000	1.116
@@ -0,0 +1,493 @@
+%define glib_version 2.15.0
+%define gtk_version 2.5.4
+%define libglade_version 2.0.0
+%define libgnome_version 2.14.0
+%define eel_version 2.13.3
+%define nautilus_version 2.21.5
+%define hal_version 0.5.7
+%define dbus_version 0.6
+%define gconf_version 2.14
+%define gnome_mount_version 0.5
+
+Summary: Easy to use CD burning for Gnome
+Name: nautilus-cd-burner
+Version: 2.25.3
+Release: 7%{?dist}
+Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.25/%{name}-%{version}.tar.bz2
+License: GPLv2+
+Group: User Interface/Desktops
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: mkisofs
+Requires: cdrecord
+%ifnarch s390 s390x
+Requires: cdrdao
+%endif
+Requires: dvd+rw-tools
+Requires: hal >= %{hal_version}
+Requires: gnome-mount >= %{gnome_mount_version}
+Requires: GConf2 >= %{gconf_version}
+Requires: %name-libs = %{version}-%{release}
+
+Requires(post): GConf2 >= %{gconf_version}
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+
+BuildRequires: libgnome-devel >= %{libgnome_version}
+BuildRequires: glib2-devel >= %{glib_version}
+BuildRequires: gtk2-devel >= %{gtk_version}
+BuildRequires: libglade2-devel >= %{libglade_version}
+BuildRequires: eel2-devel >= %{eel_version}
+BuildRequires: hal-devel >= %{hal_version}
+BuildRequires: gnome-mount-devel >= %{gnome_mount_version}
+BuildRequires: nautilus-devel >= %{nautilus_version}
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: intltool
+BuildRequires: perl(XML::Parser) >= 2.31-16
+
+%description
+An easy to use CD burning package, well integrated with
+Nautilus and the Gnome desktop.
+
+%package devel
+Summary: The files needed for nautilus-cd-burner application development
+Group: Development/Libraries
+Requires: %name-libs = %{version}-%{release}
+Requires: gtk2-devel >= %{gtk_version}
+Requires: nautilus-devel >= %{nautilus_version}
+Requires: pkgconfig
+Requires: gtk-doc 
+
+%description devel
+The nautilus-cd-burner-devel package contains the libraries and
+include files that you can use to develop applications that
+use the nautilus-cd-burner library.
+
+%package libs
+Summary: The libraries used by nautilus-cd-burner
+Group: Development/Libraries
+
+%description libs
+The nautilus-cd-burner-libs package contains the libraries applications
+need to have nautilus-cd-burner integration.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-gnome-mount
+make
+
+%install
+rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=%{buildroot}
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+# Remove files that used to be in main nautilus-cd-burner RPM
+rm -rf %{buildroot}%{_sysconfdir}
+rm -rf %{buildroot}%{_libdir}/nautilus
+rm -rf %{buildroot}%{_datadir}/nautilus-cd-burner
+rm -rf %{buildroot}%{_datadir}/icons
+rm -rf %{buildroot}%{_datadir}/locale
+rm -rf %{buildroot}%{_datadir}/applications/
+rm -rf %{buildroot}%{_bindir}
+
+rm %{buildroot}%{_libdir}/*.la
+
+%post libs
+/sbin/ldconfig
+
+%postun libs
+/sbin/ldconfig
+
+%clean
+rm -rf %{buildroot}
+
+%files libs
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-, root, root, -)
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+%{_datadir}/gtk-doc/html/nautilus-cd-burner
+
+
+%changelog
+* Thu Apr 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.25.3-7
+- don't package main bits, only libs and devel
+
+* Fri Apr 10 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-6
+- Fix directory ownership
+
+* Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
+- Remove stupid requires for the -libs sub package (#488433)
+
+* Mon Mar 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-4
+- Add missing ldconfig calls for -libs
+
+* Mon Mar 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-3
+- Split into libs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
+- Update to 2.25.3
+
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
+* Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
+- Update to 2.23.90
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22.1-2
+- fix license tag
+
+* Mon Apr  7 2008 Jon McCann <jmccann at redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
+* Wed Mar 19 2008 Jon McCann <jmccann at redhat.com> - 2.22.0-2
+- Fix to remove a sync gio call.
+
+* Mon Mar 10 2008 Jon McCann <jmccann at redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
+* Wed Jan 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.6-1
+- Update to 2.21.6
+
+* Mon Jan 21 2008 Jon McCann <jmccann at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
+* Fri Jan 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
+- Also call update-desktop-database
+
+* Fri Jan 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.20.0-4
+- Add content-type support
+
+* Sun Dec 23 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-3
+- Rebuild against new nautilus
+
+* Mon Oct 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Rebuild against new dbus-glib
+
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.6-2
+- Rebuild for selinux ppc32 issue.
+
+* Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-1
+- Update to 2.19.6
+
+* Sun May 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-1
+- Update to 2.19.1
+
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Add an explicit --vendor, to pacify older desktop-file-utils
+
+* Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
+- Update to 2.18.0
+- Use desktop-file-install
+
+* Tue Feb 27 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.8-1
+- Update to 2.17.8
+
+* Tue Feb 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.7-3
+- Update to 2.17.7
+
+* Wed Jan 31 2007 Alexander Larsson <alexl at redhat.com> - 2.17.6-2
+- Disable cdrdao on s390x (its not availible)
+
+* Wed Jan 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.6-1
+- Update to 2.17.6
+
+* Wed Jan 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.5-1
+- Update to 2.17.5
+
+* Tue Dec 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.4-1
+- Update to 2.17.4
+
+* Tue Dec  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.3-1
+- Update to 2.17.3
+
+* Mon Nov  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.2-1
+- Update to 2.17.2
+
+* Fri Nov  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.1-2
+- Silence %%pre 
+
+* Sat Oct 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.1-1
+- Update to 2.17.1
+
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-4
+- Fix scripts according to the packaging guidelines
+
+* Tue Oct  3 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-3
+- Don't require cdrdao on s390 where it doesn't exist
+
+* Mon Oct  2 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-2
+- Require cdrdao (#208668)
+
+* Mon Sep  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1
+- Update to 2.16.0
+
+* Mon Sep  4 2006 Alexander Larsson <alexl at redhat.com> - 2.15.7-2
+- Require dvd+rw-tools (#186738)
+
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.7-1.fc6
+- Update to 2.15.7
+- Require pkgconfig in the -devel package
+
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.6-1.fc6
+- Update to 2.15.6
+
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1.fc6
+- Update to 2.15.5
+
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-3
+- Don't use deprecated dbus api
+
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Rebuild against dbus
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
+- rebuild
+
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
+* Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 2.15.2-3
+- Fix schema name (#193325)
+
+* Fri May 26 2006 Jeremy Katz <katzj at redhat.com> - 2.15.2-2
+- builds on s390 now
+
+* Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
+* Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
+* Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0.1-1
+- Update to 2.14.0.1
+
+* Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
+- Update to 2.14.0
+
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-2
+- Add a Req for gnome-mount 
+
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+- Drop upstreamed patch
+- Add BuildReq for gnome-mount
+
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
+- Fix a problem with writing iso images (#182358)
+
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
+- Update to 2.13.90
+
+* Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-1
+- Update to 2.13.5
+
+* Tue Jan 03 2006 Matthias Clasen <mclasen at redhat.com> 2.13.4-1
+- Update to 2.13.4
+
+* Thu Dec 15 2005 Matthias Clasen <mclasen at redhat.com> 2.13.3-1
+- Update to 2.13.3
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Dec  2 2005 Matthias Clasen <mclasen at redhat.com>  2.13.2-1
+- Update to 2.13.2
+
+* Thu Dec 01 2005 John (J5) Palmieri <johnp at redhat.com> - 2.12.1-2
+- rebuild for new dbus
+
+* Thu Oct  6 2005 Matthias Clasen <mclasen at redhat.com>  2.12.1-1
+- Update to 2.12.1
+
+* Wed Sep  7 2005 Matthias Clasen <mclasen at redhat.com>  2.12.0-1
+- Update to 2.12.0
+
+* Tue Aug 16 2005 Matthias Clasen <mclasen at redhat.com> 
+- New upstream version
+
+* Fri Aug  5 2005 Matthias Clasen <mclasen at redhat.com> - 2.11.5-1
+- New upstream version
+
+* Mon Jul 11 2005 Matthias Clasen <mclasen at redhat.com> - 2.11.4-1
+- Newer upstream version
+- Link against libstdc++. The hack doesn't really work
+
+* Wed Apr 13 2005 David Zeuthen <davidz at redhat.com> - 2.10.0-3
+- Fix Requires for -devel package (#152505)
+
+* Sat Mar 19 2005 Florian La Roche <laroche at redhat.com>
+- "," is no delim for ExcludeArch
+
+* Fri Mar 11 2005 John (J5) Palmieri <johnp at redhat.com> 2.10.0-1
+- Update to 2.10.0
+- exclude s390 and s390x from build
+
+* Mon Mar  7 2005 David Zeuthen <davidz at redhat.com> 2.9.8-2
+- Build with patches for new hal/dbus API and fix locking of drive
+
+* Thu Mar  3 2005 Alex Larsson <alexl at redhat.com> 2.9.8-1
+- Update to 2.9.8
+
+* Wed Feb  9 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1
+- Update to 2.9.6
+
+* Mon Jan 31 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.5-1
+- Update to 2.9.5
+
+* Wed Oct 20 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-6
+- Make user own the dirs in burn:/// (#135151)
+
+* Tue Oct 12 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-5
+- Make unmount patch slighly better
+
+* Fri Oct  8 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-4
+- Add patch to unmount if needed (#107544)
+
+* Thu Oct  7 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-3
+- try to build on s390
+
+* Wed Sep 29 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-2
+- run ldconfig in post/postun
+
+* Thu Sep 23 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-1
+- Upgrade to 2.8.3 to get rid of cvs backport patch
+
+* Wed Sep 22 2004 Alexander Larsson <alexl at redhat.com> - 2.8.2-1
+- Update to 2.8.2
+- Remove old upstreamed patches
+- make new cvs backport patch
+
+* Tue Sep 21 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-4
+- Lock devices using hal when burning
+
+* Mon Sep 20 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-3
+- fix up is_rewritable patch to not change api
+
+* Fri Sep 17 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-2
+- Add patch to detect rewritable discs on older drives
+
+* Fri Sep 17 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-1
+- update to 2.8.1
+- Add fixes patch to fix some small details
+- Add asserts patch to not assert if mmc profiling fails (#132479, #132645)
+- Add patch that makes n-c-b use hal to get media type
+- Enable hal support
+
+* Wed Sep 15 2004 Alexander Larsson <alexl at redhat.com> - 2.8.0-1
+- update to 2.8.0
+- backport cvs fixes
+
+* Thu Aug 19 2004 Alex Larsson <alexl at redhat.com> 2.7.6-1
+- update to 2.7.6
+
+* Thu Aug 12 2004 Alexander Larsson <alexl at redhat.com> - 2.7.5-1
+- update to 2.7.5
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue May  4 2004 Alex Larsson <alexl at redhat.com> 2.6.0-2
+- Open the right help file (#121476)
+
+* Thu Apr  1 2004 Alex Larsson <alexl at redhat.com> 2.6.0-1
+- update to 2.6.0
+
+* Wed Mar 10 2004 Alexander Larsson <alexl at redhat.com> 0.6.6-1
+- update to 0.6.6
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Alexander Larsson <alexl at redhat.com> 0.6.5-1
+- update to 0.6.5
+
+* Fri Jan 30 2004 Alexander Larsson <alexl at redhat.com> 0.6.4-1
+- update to 0.6.4
+
+* Tue Jan 27 2004 Jonathan Blandford <jrb at redhat.com> 0.6.3-2
+- update file list
+
+* Tue Jan 27 2004 Jonathan Blandford <jrb at redhat.com> 0.6.3-1
+- new version
+
+* Mon Oct 13 2003 Alexander Larsson <alexl at redhat.com> 0.5.3-1
+- Update to final gnome 2.4 release
+- Has one crash fix and new translations
+
+* Wed Aug 20 2003 Alexander Larsson <alexl at redhat.com> 0.5.0-1
+- update for gnome 2.3
+
+* Thu Jul 10 2003 Alexander Larsson <alexl at redhat.com> 0.4.3-3
+- Add eel2-devel and gettext buildrequires
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue May 27 2003 Alexander Larsson <alexl at redhat.com> 0.4.3-1
+- Update to 0.4.3
+
+* Mon May 19 2003 Alexander Larsson <alexl at redhat.com> 0.4.2-1
+- Update to 0.4.2
+
+* Mon Jan 27 2003 Alexander Larsson <alexl at redhat.com> 0.3.2-1
+- Update to 0.3.2
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Tue Jan 14 2003 Alexander Larsson <alexl at redhat.com> 0.3.1-1
+- Update to 0.3.1
+
+* Fri Jan 10 2003 Alexander Larsson <alexl at redhat.com> 0.3-2
+- Langify
+
+* Fri Jan 10 2003 Alexander Larsson <alexl at redhat.com> 0.3-1
+- Update to 0.3
+
+* Mon Dec 16 2002 Tim Powers <timp at redhat.com> 0.2-2
+- rebuild
+
+* Fri Dec 13 2002 Alexander Larsson <alexl at redhat.com> 0.2-1
+- Update to 0.2
+
+* Mon Dec  9 2002 Alexander Larsson <alexl at redhat.com> 0.1-3
+- Added mkisofs and cdrecord dependencies
+
+* Thu Dec  5 2002 Alexander Larsson <alexl at redhat.com> 0.1-2
+- run make in build
+
+* Wed Dec  5 2002 Alexander Larsson <alexl at redhat.com> 0.1-1
+- Initial build.
+
+


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	23 Apr 2009 22:36:50 -0000	1.60
@@ -0,0 +1 @@
+02324246d8e4804e15e41ef7b62836a7  nautilus-cd-burner-2.25.3.tar.bz2



From spot at fedoraproject.org  Thu Apr 23 22:37:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 23 Apr 2009 22:37:21 +0000 (UTC)
Subject: rpms/nautilus-cd-burner/devel Makefile, 1.3,
	1.4 nautilus-cd-burner.spec, 1.115, 1.116 sources, 1.59, 1.60
Message-ID: <20090423223721.B52F270104@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23204/devel

Added Files:
	Makefile nautilus-cd-burner.spec sources 
Log Message:
libs and devel only


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	23 Apr 2009 22:36:51 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: nautilus-cd-burner
+# $Id$
+NAME := nautilus-cd-burner
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: nautilus-cd-burner.spec
===================================================================
RCS file: nautilus-cd-burner.spec
diff -N nautilus-cd-burner.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nautilus-cd-burner.spec	23 Apr 2009 22:36:51 -0000	1.116
@@ -0,0 +1,493 @@
+%define glib_version 2.15.0
+%define gtk_version 2.5.4
+%define libglade_version 2.0.0
+%define libgnome_version 2.14.0
+%define eel_version 2.13.3
+%define nautilus_version 2.21.5
+%define hal_version 0.5.7
+%define dbus_version 0.6
+%define gconf_version 2.14
+%define gnome_mount_version 0.5
+
+Summary: Easy to use CD burning for Gnome
+Name: nautilus-cd-burner
+Version: 2.25.3
+Release: 7%{?dist}
+Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.25/%{name}-%{version}.tar.bz2
+License: GPLv2+
+Group: User Interface/Desktops
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: mkisofs
+Requires: cdrecord
+%ifnarch s390 s390x
+Requires: cdrdao
+%endif
+Requires: dvd+rw-tools
+Requires: hal >= %{hal_version}
+Requires: gnome-mount >= %{gnome_mount_version}
+Requires: GConf2 >= %{gconf_version}
+Requires: %name-libs = %{version}-%{release}
+
+Requires(post): GConf2 >= %{gconf_version}
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+
+BuildRequires: libgnome-devel >= %{libgnome_version}
+BuildRequires: glib2-devel >= %{glib_version}
+BuildRequires: gtk2-devel >= %{gtk_version}
+BuildRequires: libglade2-devel >= %{libglade_version}
+BuildRequires: eel2-devel >= %{eel_version}
+BuildRequires: hal-devel >= %{hal_version}
+BuildRequires: gnome-mount-devel >= %{gnome_mount_version}
+BuildRequires: nautilus-devel >= %{nautilus_version}
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: intltool
+BuildRequires: perl(XML::Parser) >= 2.31-16
+
+%description
+An easy to use CD burning package, well integrated with
+Nautilus and the Gnome desktop.
+
+%package devel
+Summary: The files needed for nautilus-cd-burner application development
+Group: Development/Libraries
+Requires: %name-libs = %{version}-%{release}
+Requires: gtk2-devel >= %{gtk_version}
+Requires: nautilus-devel >= %{nautilus_version}
+Requires: pkgconfig
+Requires: gtk-doc 
+
+%description devel
+The nautilus-cd-burner-devel package contains the libraries and
+include files that you can use to develop applications that
+use the nautilus-cd-burner library.
+
+%package libs
+Summary: The libraries used by nautilus-cd-burner
+Group: Development/Libraries
+
+%description libs
+The nautilus-cd-burner-libs package contains the libraries applications
+need to have nautilus-cd-burner integration.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-gnome-mount
+make
+
+%install
+rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=%{buildroot}
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+# Remove files that used to be in main nautilus-cd-burner RPM
+rm -rf %{buildroot}%{_sysconfdir}
+rm -rf %{buildroot}%{_libdir}/nautilus
+rm -rf %{buildroot}%{_datadir}/nautilus-cd-burner
+rm -rf %{buildroot}%{_datadir}/icons
+rm -rf %{buildroot}%{_datadir}/locale
+rm -rf %{buildroot}%{_datadir}/applications/
+rm -rf %{buildroot}%{_bindir}
+
+rm %{buildroot}%{_libdir}/*.la
+
+%post libs
+/sbin/ldconfig
+
+%postun libs
+/sbin/ldconfig
+
+%clean
+rm -rf %{buildroot}
+
+%files libs
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-, root, root, -)
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+%{_datadir}/gtk-doc/html/nautilus-cd-burner
+
+
+%changelog
+* Thu Apr 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.25.3-7
+- don't package main bits, only libs and devel
+
+* Fri Apr 10 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-6
+- Fix directory ownership
+
+* Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
+- Remove stupid requires for the -libs sub package (#488433)
+
+* Mon Mar 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-4
+- Add missing ldconfig calls for -libs
+
+* Mon Mar 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-3
+- Split into libs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
+- Update to 2.25.3
+
+* Tue Sep 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
+* Sat Aug 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-1
+- Update to 2.23.90
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22.1-2
+- fix license tag
+
+* Mon Apr  7 2008 Jon McCann <jmccann at redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
+* Wed Mar 19 2008 Jon McCann <jmccann at redhat.com> - 2.22.0-2
+- Fix to remove a sync gio call.
+
+* Mon Mar 10 2008 Jon McCann <jmccann at redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
+* Wed Jan 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.6-1
+- Update to 2.21.6
+
+* Mon Jan 21 2008 Jon McCann <jmccann at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
+* Fri Jan 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
+- Also call update-desktop-database
+
+* Fri Jan 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.20.0-4
+- Add content-type support
+
+* Sun Dec 23 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-3
+- Rebuild against new nautilus
+
+* Mon Oct 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Rebuild against new dbus-glib
+
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.6-2
+- Rebuild for selinux ppc32 issue.
+
+* Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-1
+- Update to 2.19.6
+
+* Sun May 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-1
+- Update to 2.19.1
+
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Add an explicit --vendor, to pacify older desktop-file-utils
+
+* Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
+- Update to 2.18.0
+- Use desktop-file-install
+
+* Tue Feb 27 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.8-1
+- Update to 2.17.8
+
+* Tue Feb 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.7-3
+- Update to 2.17.7
+
+* Wed Jan 31 2007 Alexander Larsson <alexl at redhat.com> - 2.17.6-2
+- Disable cdrdao on s390x (its not availible)
+
+* Wed Jan 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.6-1
+- Update to 2.17.6
+
+* Wed Jan 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.5-1
+- Update to 2.17.5
+
+* Tue Dec 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.4-1
+- Update to 2.17.4
+
+* Tue Dec  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.3-1
+- Update to 2.17.3
+
+* Mon Nov  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.2-1
+- Update to 2.17.2
+
+* Fri Nov  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.1-2
+- Silence %%pre 
+
+* Sat Oct 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.1-1
+- Update to 2.17.1
+
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-4
+- Fix scripts according to the packaging guidelines
+
+* Tue Oct  3 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-3
+- Don't require cdrdao on s390 where it doesn't exist
+
+* Mon Oct  2 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-2
+- Require cdrdao (#208668)
+
+* Mon Sep  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1
+- Update to 2.16.0
+
+* Mon Sep  4 2006 Alexander Larsson <alexl at redhat.com> - 2.15.7-2
+- Require dvd+rw-tools (#186738)
+
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.7-1.fc6
+- Update to 2.15.7
+- Require pkgconfig in the -devel package
+
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.6-1.fc6
+- Update to 2.15.6
+
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1.fc6
+- Update to 2.15.5
+
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-3
+- Don't use deprecated dbus api
+
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Rebuild against dbus
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
+- rebuild
+
+* Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
+* Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 2.15.2-3
+- Fix schema name (#193325)
+
+* Fri May 26 2006 Jeremy Katz <katzj at redhat.com> - 2.15.2-2
+- builds on s390 now
+
+* Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
+* Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
+* Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0.1-1
+- Update to 2.14.0.1
+
+* Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
+- Update to 2.14.0
+
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-2
+- Add a Req for gnome-mount 
+
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+- Drop upstreamed patch
+- Add BuildReq for gnome-mount
+
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
+- Fix a problem with writing iso images (#182358)
+
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
+- Update to 2.13.90
+
+* Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-1
+- Update to 2.13.5
+
+* Tue Jan 03 2006 Matthias Clasen <mclasen at redhat.com> 2.13.4-1
+- Update to 2.13.4
+
+* Thu Dec 15 2005 Matthias Clasen <mclasen at redhat.com> 2.13.3-1
+- Update to 2.13.3
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Dec  2 2005 Matthias Clasen <mclasen at redhat.com>  2.13.2-1
+- Update to 2.13.2
+
+* Thu Dec 01 2005 John (J5) Palmieri <johnp at redhat.com> - 2.12.1-2
+- rebuild for new dbus
+
+* Thu Oct  6 2005 Matthias Clasen <mclasen at redhat.com>  2.12.1-1
+- Update to 2.12.1
+
+* Wed Sep  7 2005 Matthias Clasen <mclasen at redhat.com>  2.12.0-1
+- Update to 2.12.0
+
+* Tue Aug 16 2005 Matthias Clasen <mclasen at redhat.com> 
+- New upstream version
+
+* Fri Aug  5 2005 Matthias Clasen <mclasen at redhat.com> - 2.11.5-1
+- New upstream version
+
+* Mon Jul 11 2005 Matthias Clasen <mclasen at redhat.com> - 2.11.4-1
+- Newer upstream version
+- Link against libstdc++. The hack doesn't really work
+
+* Wed Apr 13 2005 David Zeuthen <davidz at redhat.com> - 2.10.0-3
+- Fix Requires for -devel package (#152505)
+
+* Sat Mar 19 2005 Florian La Roche <laroche at redhat.com>
+- "," is no delim for ExcludeArch
+
+* Fri Mar 11 2005 John (J5) Palmieri <johnp at redhat.com> 2.10.0-1
+- Update to 2.10.0
+- exclude s390 and s390x from build
+
+* Mon Mar  7 2005 David Zeuthen <davidz at redhat.com> 2.9.8-2
+- Build with patches for new hal/dbus API and fix locking of drive
+
+* Thu Mar  3 2005 Alex Larsson <alexl at redhat.com> 2.9.8-1
+- Update to 2.9.8
+
+* Wed Feb  9 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1
+- Update to 2.9.6
+
+* Mon Jan 31 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.5-1
+- Update to 2.9.5
+
+* Wed Oct 20 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-6
+- Make user own the dirs in burn:/// (#135151)
+
+* Tue Oct 12 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-5
+- Make unmount patch slighly better
+
+* Fri Oct  8 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-4
+- Add patch to unmount if needed (#107544)
+
+* Thu Oct  7 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-3
+- try to build on s390
+
+* Wed Sep 29 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-2
+- run ldconfig in post/postun
+
+* Thu Sep 23 2004 Alexander Larsson <alexl at redhat.com> - 2.8.3-1
+- Upgrade to 2.8.3 to get rid of cvs backport patch
+
+* Wed Sep 22 2004 Alexander Larsson <alexl at redhat.com> - 2.8.2-1
+- Update to 2.8.2
+- Remove old upstreamed patches
+- make new cvs backport patch
+
+* Tue Sep 21 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-4
+- Lock devices using hal when burning
+
+* Mon Sep 20 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-3
+- fix up is_rewritable patch to not change api
+
+* Fri Sep 17 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-2
+- Add patch to detect rewritable discs on older drives
+
+* Fri Sep 17 2004 Alexander Larsson <alexl at redhat.com> - 2.8.1-1
+- update to 2.8.1
+- Add fixes patch to fix some small details
+- Add asserts patch to not assert if mmc profiling fails (#132479, #132645)
+- Add patch that makes n-c-b use hal to get media type
+- Enable hal support
+
+* Wed Sep 15 2004 Alexander Larsson <alexl at redhat.com> - 2.8.0-1
+- update to 2.8.0
+- backport cvs fixes
+
+* Thu Aug 19 2004 Alex Larsson <alexl at redhat.com> 2.7.6-1
+- update to 2.7.6
+
+* Thu Aug 12 2004 Alexander Larsson <alexl at redhat.com> - 2.7.5-1
+- update to 2.7.5
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue May  4 2004 Alex Larsson <alexl at redhat.com> 2.6.0-2
+- Open the right help file (#121476)
+
+* Thu Apr  1 2004 Alex Larsson <alexl at redhat.com> 2.6.0-1
+- update to 2.6.0
+
+* Wed Mar 10 2004 Alexander Larsson <alexl at redhat.com> 0.6.6-1
+- update to 0.6.6
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Alexander Larsson <alexl at redhat.com> 0.6.5-1
+- update to 0.6.5
+
+* Fri Jan 30 2004 Alexander Larsson <alexl at redhat.com> 0.6.4-1
+- update to 0.6.4
+
+* Tue Jan 27 2004 Jonathan Blandford <jrb at redhat.com> 0.6.3-2
+- update file list
+
+* Tue Jan 27 2004 Jonathan Blandford <jrb at redhat.com> 0.6.3-1
+- new version
+
+* Mon Oct 13 2003 Alexander Larsson <alexl at redhat.com> 0.5.3-1
+- Update to final gnome 2.4 release
+- Has one crash fix and new translations
+
+* Wed Aug 20 2003 Alexander Larsson <alexl at redhat.com> 0.5.0-1
+- update for gnome 2.3
+
+* Thu Jul 10 2003 Alexander Larsson <alexl at redhat.com> 0.4.3-3
+- Add eel2-devel and gettext buildrequires
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue May 27 2003 Alexander Larsson <alexl at redhat.com> 0.4.3-1
+- Update to 0.4.3
+
+* Mon May 19 2003 Alexander Larsson <alexl at redhat.com> 0.4.2-1
+- Update to 0.4.2
+
+* Mon Jan 27 2003 Alexander Larsson <alexl at redhat.com> 0.3.2-1
+- Update to 0.3.2
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Tue Jan 14 2003 Alexander Larsson <alexl at redhat.com> 0.3.1-1
+- Update to 0.3.1
+
+* Fri Jan 10 2003 Alexander Larsson <alexl at redhat.com> 0.3-2
+- Langify
+
+* Fri Jan 10 2003 Alexander Larsson <alexl at redhat.com> 0.3-1
+- Update to 0.3
+
+* Mon Dec 16 2002 Tim Powers <timp at redhat.com> 0.2-2
+- rebuild
+
+* Fri Dec 13 2002 Alexander Larsson <alexl at redhat.com> 0.2-1
+- Update to 0.2
+
+* Mon Dec  9 2002 Alexander Larsson <alexl at redhat.com> 0.1-3
+- Added mkisofs and cdrecord dependencies
+
+* Thu Dec  5 2002 Alexander Larsson <alexl at redhat.com> 0.1-2
+- run make in build
+
+* Wed Dec  5 2002 Alexander Larsson <alexl at redhat.com> 0.1-1
+- Initial build.
+
+


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	23 Apr 2009 22:36:51 -0000	1.60
@@ -0,0 +1 @@
+02324246d8e4804e15e41ef7b62836a7  nautilus-cd-burner-2.25.3.tar.bz2



From nalin at fedoraproject.org  Thu Apr 23 22:43:27 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 23 Apr 2009 22:43:27 +0000 (UTC)
Subject: rpms/krb5/devel ksu.pamd, NONE, 1.1 krb5-1.6.1-pam.patch, 1.7,
	1.8 krb5.spec, 1.193, 1.194
Message-ID: <20090423224327.860E770104@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24339

Modified Files:
	krb5-1.6.1-pam.patch krb5.spec 
Added Files:
	ksu.pamd 
Log Message:
- extend PAM support to ksu: perform account and session management for the
  target user
- pull up and merge James Leddy's changes to also set PAM_RHOST in PAM-aware
  network-facing services



--- NEW FILE ksu.pamd ---
#%PAM-1.0
account include  su
session include  su

krb5-1.6.1-pam.patch:

Index: krb5-1.6.1-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-pam.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krb5-1.6.1-pam.patch	16 Jul 2008 18:09:47 -0000	1.7
+++ krb5-1.6.1-pam.patch	23 Apr 2009 22:43:25 -0000	1.8
@@ -28,7 +28,15 @@
 can be reset to the earlier, non-PAM behavior by setting "use_pam" to
 false in the [login] section of /etc/krb5.conf.
 
-When enabled, ftpd, krshd, and login.krb5 gain dependence on libpam.
+Modify ksu so that it performs account and session management for the
+target user account, mimicking the action of regular su.  The default
+service name is "ksu", because on Fedora at least the configuration used
+is determined by whether or not a login shell is being opened, and so
+this may need to vary, too.  At run-time, ksu's behavior can be reset to
+the earlier, non-PAM behavior by setting "use_pam" to false in the [ksu]
+section of /etc/krb5.conf.
+
+When enabled, ftpd, krshd, login.krb5, and ksu gain dependence on libpam.
 
 --- krb5-1.6.1/src/appl/bsd/configure.in	2006-03-27 23:35:02.000000000 -0500
 +++ krb5-1.6.1/src/appl/bsd/configure.in	2007-06-21 17:39:57.000000000 -0400
@@ -76,7 +84,7 @@
  #ifdef KERBEROS
  
  #if defined(KRB5_KRB4_COMPAT) && !defined(ALWAYS_V5_KUSEROK)
-@@ -1151,11 +1148,49 @@ void doit(f, fromp)
+@@ -1151,11 +1148,50 @@ void doit(f, fromp)
  	goto signout_please;
      }
      
@@ -88,6 +96,7 @@
 +			       0,
 +			       locuser,
 +			       "",
++			       hostname,
 +			       do_encrypt ?
 +			       EKSHELL_PAM_SERVICE :
 +			       KSHELL_PAM_SERVICE) != 0) {
@@ -126,7 +135,7 @@
      /* Log access to account */
      pwd = (struct passwd *) getpwnam(locuser);
      if (pwd && (pwd->pw_uid == 0)) {
-@@ -1195,7 +1230,7 @@ void doit(f, fromp)
+@@ -1195,7 +1231,7 @@ void doit(f, fromp)
      
      (void) write(2, "", 1);
      
@@ -135,7 +144,7 @@
  	if (port&&(pipe(pv) < 0)) {
  	    error("Can't make pipe.\n");
  	    goto signout_please;
-@@ -1507,6 +1542,15 @@ void doit(f, fromp)
+@@ -1507,6 +1543,15 @@ void doit(f, fromp)
  
      environ = envinit;
      
@@ -215,13 +224,14 @@
  #ifdef KRB5_GET_TICKETS
      {"krb5_get_tickets", &login_krb5_get_tickets},
  #endif
-@@ -1292,6 +1294,18 @@ int main(argc, argv)
+@@ -1292,6 +1300,19 @@ int main(argc, argv)
  	if (!unix_needs_passwd())
  	    break;
  
 +#ifdef USE_PAM
 +	if (login_use_pam) {
 +	    if (appl_pam_authenticate(LOGIN_PAM_SERVICE, 1, username, "",
++	                              hostname,
 +				      ttyname(STDIN_FILENO)) == PAM_SUCCESS) {
 +	        break;
 +	    } else {
@@ -234,14 +244,14 @@
  	/* we have several sets of code:
  	   1) get v5 tickets alone -DKRB5_GET_TICKETS
  	   2) get v4 tickets alone [** don't! only get them *with* v5 **]
-@@ -1406,6 +1420,24 @@ int main(argc, argv)
+@@ -1406,6 +1427,24 @@ int main(argc, argv)
      /* committed to login -- turn off timeout */
      (void) alarm((u_int) 0);
  
 +#ifdef USE_PAM
 +    if (login_use_pam) {
 +	if (appl_pam_acct_mgmt(LOGIN_PAM_SERVICE, 1, username, "",
-+			       ttyname(STDIN_FILENO)) != 0) {
++			       hostname, ttyname(STDIN_FILENO)) != 0) {
 +	    printf("Login incorrect\n");
 +	    sleepexit(1);
 +	}
@@ -259,7 +269,7 @@
      /*
       * If valid so far and root is logging in, see if root logins on
       * this terminal are permitted.
-@@ -1446,6 +1478,21 @@ int main(argc, argv)
+@@ -1446,6 +1487,21 @@ int main(argc, argv)
  	sleepexit(0);
      }
  #endif
@@ -281,7 +291,7 @@
  
      if (chdir(pwd->pw_dir) < 0) {
  	printf("No directory %s!\n", pwd->pw_dir);
-@@ -1792,6 +1839,11 @@ int main(argc, argv)
+@@ -1792,6 +1846,11 @@ int main(argc, argv)
      }
  #endif /* KRB5_GET_TICKETS */
  
@@ -295,11 +305,11 @@
      if (pwd->pw_uid == 0)
 --- /dev/null	2007-06-22 10:29:46.741860805 -0400
 +++ krb5-1.6.1/src/appl/bsd/pam.c	2007-06-22 14:22:10.000000000 -0400
-@@ -0,0 +1,414 @@
+@@ -0,0 +1,424 @@
 +/*
 + * src/appl/bsd/pam.c
 + *
-+ * Copyright 2007 Red Hat, Inc.
++ * Copyright 2007,2009 Red Hat, Inc.
 + *
 + * All Rights Reserved.
 + *
@@ -332,6 +342,7 @@
 + * Convenience wrappers for using PAM.
 + */
 +
++#include "autoconf.h"
 +#ifdef USE_PAM
 +#include <sys/types.h>
 +#include <stdio.h>
@@ -549,6 +560,7 @@
 +appl_pam_start(const char *service, int interactive,
 +	       const char *login_username,
 +	       const char *non_interactive_password,
++	       const char *hostname,
 +	       const char *tty)
 +{
 +	static int exit_handler_registered;
@@ -577,6 +589,12 @@
 +		ret = pam_start(service, login_username,
 +				&appl_pam_conv, &appl_pamh);
 +		if (ret == 0) {
++			if (hostname != NULL) {
++#ifdef DEBUG
++				printf("Setting PAM_RHOST to \"%s\".\n", hostname);
++#endif
++				pam_set_item(appl_pamh, PAM_RHOST, hostname);
++			}
 +			if (tty != NULL) {
 +#ifdef DEBUG
 +				printf("Setting PAM_TTY to \"%s\".\n", tty);
@@ -602,11 +620,12 @@
 +appl_pam_authenticate(const char *service, int interactive,
 +		      const char *login_username,
 +		      const char *non_interactive_password,
++		      const char *hostname,
 +		      const char *tty)
 +{
 +	int ret;
 +	ret = appl_pam_start(service, interactive, login_username,
-+			     non_interactive_password, tty);
++			     non_interactive_password, hostname, tty);
 +	if (ret == 0) {
 +		ret = pam_authenticate(appl_pamh, 0);
 +	}
@@ -616,12 +635,13 @@
 +appl_pam_acct_mgmt(const char *service, int interactive,
 +		   const char *login_username,
 +		   const char *non_interactive_password,
++		   const char *hostname,
 +		   const char *tty)
 +{
 +	int ret;
 +	appl_pam_pwchange_required = 0;
 +	ret = appl_pam_start(service, interactive, login_username,
-+			     non_interactive_password, tty);
++			     non_interactive_password, hostname, tty);
 +	if (ret == 0) {
 +#ifdef DEBUG
 +		printf("Calling pam_acct_mgmt().\n");
@@ -712,11 +732,11 @@
 +#endif
 --- /dev/null	2007-06-22 10:29:46.741860805 -0400
 +++ krb5-1.6.1/src/appl/bsd/pam.h	2007-06-22 14:27:05.000000000 -0400
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,63 @@
 +/*
 + * src/appl/bsd/pam.h
 + *
-+ * Copyright 2007 Red Hat, Inc.
++ * Copyright 2007,2009 Red Hat, Inc.
 + *
 + * All Rights Reserved.
 + *
@@ -761,10 +781,12 @@
 +int appl_pam_authenticate(const char *service, int interactive,
 +			  const char *local_username,
 +			  const char *non_interactive_password,
++			  const char *hostname,
 +			  const char *tty);
 +int appl_pam_acct_mgmt(const char *service, int interactive,
 +		       const char *local_username,
 +		       const char *non_interactive_password,
++		       const char *hostname,
 +		       const char *tty);
 +int appl_pam_requires_chauthtok(void);
 +int appl_pam_chauthtok(void);
@@ -825,7 +847,7 @@
  #include <grp.h> 
  #include <setjmp.h>
  #ifndef POSIX_SETJMP
-@@ -803,6 +807,16 @@
+@@ -803,6 +806,21 @@
  		}
  #endif /* KRB5_KRB4_COMPAT */
  
@@ -833,16 +855,21 @@
 +		if (appl_pam_enabled(kcontext, "ftpd")) {
 +			if (appl_pam_acct_mgmt(FTP_PAM_SERVICE, 0,
 +					       pw->pw_name, "",
++					       hostname,
 +					       FTP_PAM_SERVICE) != 0) {
 +				reply(530, "Login incorrect.");
 +				return;
 +			}
++        		if (appl_pam_requires_chauthtok()) {
++				reply(530, "Password change required.");
++				return;
++        		}
 +		}
 +#endif
  		if (!authorized && authlevel == AUTHLEVEL_AUTHORIZE) {
  			strncat(buf, "; Access denied.",
  				sizeof(buf) - strlen(buf) - 1);
-@@ -903,6 +916,10 @@ end_login()
+@@ -903,6 +921,10 @@ end_login()
  	(void) krb5_seteuid((uid_t)0);
  	if (logged_in)
  		pty_logwtmp(ttyline, "", "");
@@ -853,7 +880,7 @@
  	if (have_creds) {
  #ifdef GSSAPI
  		krb5_cc_destroy(kcontext, ccache);
-@@ -1073,9 +1090,17 @@ pass(passwd)
+@@ -1073,9 +1095,18 @@ pass(passwd)
  		 *   kpass fails and the user has no local password
  		 *   kpass fails and the provided password doesn't match pw
  		 */
@@ -865,6 +892,7 @@
 +		    appl_pam_enabled(kcontext, "ftpd") ?
 +		    (appl_pam_authenticate(FTP_PAM_SERVICE, 0,
 +					   pw->pw_name, passwd,
++					   hostname,
 +					   FTP_PAM_SERVICE) != 0) :
 +#endif
 +		    (!kpass(pw->pw_name, passwd) &&
@@ -874,7 +902,7 @@
  			pw = NULL;
  			sleep(5);
  			if (++login_attempts >= 3) {
-@@ -1092,6 +1117,17 @@ pass(passwd)
+@@ -1092,6 +1123,22 @@ pass(passwd)
  	}
  	login_attempts = 0;		/* this time successful */
  
@@ -882,17 +910,22 @@
 +	if (appl_pam_enabled(kcontext, "ftpd")) {
 +		if (appl_pam_acct_mgmt(FTP_PAM_SERVICE, 0,
 +				       pw->pw_name, passwd,
++				       hostname,
 +				       FTP_PAM_SERVICE) != 0) {
 +			reply(530, "Login incorrect.");
 +			return;
 +		}
++       	if (appl_pam_requires_chauthtok()) {
++			reply(530, "Password change required.");
++			return;
++       	}
 +	}
 +#endif
 +
  	login(passwd, 0);
  	return;
  }
-@@ -1110,6 +1146,18 @@ login(passwd, logincode)
+@@ -1110,6 +1157,18 @@ login(passwd, logincode)
  		chown(tkt_string(), pw->pw_uid, pw->pw_gid);
  #endif
  	}
@@ -911,7 +944,7 @@
  
  	(void) krb5_setegid((gid_t)pw->pw_gid);
  	(void) initgroups(pw->pw_name, pw->pw_gid);
-@@ -2125,6 +2173,10 @@ dologout(status)
+@@ -2125,6 +2194,10 @@ dologout(status)
  		dest_tkt();
  #endif
  	}
@@ -955,7 +988,7 @@
  INSTALL_STRIP=
 --- krb5-1.6.1/src/aclocal.m4	2007-06-21 17:39:57.000000000 -0400
 +++ krb5-1.6.1/src/aclocal.m4	2007-06-21 17:39:57.000000000 -0400
-@@ -1823,3 +1823,82 @@ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[
+@@ -1823,3 +1823,86 @@ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[
        ]))
  ])dnl
  dnl
@@ -975,6 +1008,8 @@
 +	    withekshellpamservice="$withval",withekshellpamservice=ekshell)
 +AC_ARG_WITH(pam-ftp-service,[AC_HELP_STRING(--with-ftp-service,[PAM service name for ftpd ["gssftp"]])],
 +	    withftppamservice="$withval",withftppamservice=gssftp)
++AC_ARG_WITH(pam-ksu-service,[AC_HELP_STRING(--with-ksu-service,[PAM service name for ksu ["ksu"]])],
++	    withksupamservice="$withval",withksupamservice=ksu)
 +old_LIBS="$LIBS"
 +if test "$withpam" != no ; then
 +	AC_MSG_RESULT([checking for PAM...])
@@ -1025,6 +1060,8 @@
 +				   [Define to the name of the PAM service name to be used by rshd for encrypted sessions.])
 +		AC_DEFINE_UNQUOTED(FTP_PAM_SERVICE,"$withftppamservice",
 +				   [Define to the name of the PAM service name to be used by ftpd.])
++		AC_DEFINE_UNQUOTED(KSU_PAM_SERVICE,"$withksupamservice",
++				   [Define to the name of the PAM service name to be used by ksu.])
 +		PAM_LIBS="$LIBS"
 +		NON_PAM_MAN=".\\\" "
 +		PAM_MAN=
@@ -1038,3 +1075,151 @@
 +AC_SUBST(PAM_MAN)
 +AC_SUBST(NON_PAM_MAN)
 +])dnl
+diff -up krb5-1.6.1/src/clients/ksu/Makefile.in krb5-1.6.1/src/clients/ksu/Makefile.in
+--- krb5-1.6.1/src/clients/ksu/Makefile.in	2009-04-21 15:07:16.000000000 -0400
++++ krb5-1.6.1/src/clients/ksu/Makefile.in	2009-04-23 13:47:36.000000000 -0400
+@@ -15,6 +15,7 @@ SRCS = \
+ 	$(srcdir)/ccache.c \
+ 	$(srcdir)/authorization.c \
+ 	$(srcdir)/main.c \
++	$(srcdir)/../../appl/bsd/pam.c \
+ 	$(srcdir)/heuristic.c \
+ 	$(srcdir)/xmalloc.c \
+ 	$(srcdir)/setenv.c
+@@ -23,13 +24,17 @@ OBJS = \
+ 	ccache.o \
+ 	authorization.o \
+ 	main.o \
++	pam.o \
+ 	heuristic.o \
+ 	xmalloc.o @SETENVOBJ@
+ 
+ all:: ksu
+ 
+ ksu: $(OBJS) $(KRB5_BASE_DEPLIBS)
+-	$(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS)
++	$(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS) $(PAM_LIBS)
++
++pam.o: $(srcdir)/../../appl/bsd/pam.c
++	$(CC) $(ALL_CFLAGS) -c $<
+ 
+ clean::
+ 	$(RM) ksu
+--- krb5-1.6.3/src/clients/ksu/main.c	2006-08-15 15:27:08.000000000 -0400
++++ krb5-1.6.3/src/clients/ksu/main.c	2009-04-23 18:39:03.000000000 -0400
+@@ -25,6 +25,7 @@
+  * KSU was writen by:  Ari Medvinsky, ari at isi.edu
+  */
+ 
++#include "autoconf.h"
+ #include "ksu.h"
+ #include "adm_proto.h"
+ #include <sys/types.h>
+@@ -32,6 +33,11 @@
+ #include <signal.h>
+ #include <grp.h>
+ 
++#ifdef USE_PAM
++#include "../../appl/bsd/pam.h"
++int force_fork = 0;
++#endif
++
+ /* globals */
+ char * prog_name;
+ int auth_debug =0;     
+@@ -791,7 +797,24 @@
+ 	fprintf(stderr, "program to be execed %s\n",params[0]);
+     }
+     
+-    if( keep_target_cache ) {
++#ifdef USE_PAM
++    if (appl_pam_enabled(ksu_context, "ksu")) {
++	if (appl_pam_acct_mgmt(KSU_PAM_SERVICE, 1, target_user, NULL,
++			       NULL, ttyname(STDERR_FILENO)) != 0) {
++	    fprintf(stderr, "Access denied for %s.\n", target_user);
++	    sweep_up(ksu_context, cc_target);
++	    exit(1);
++	}
++	if (appl_pam_requires_chauthtok()) {
++	    fprintf(stderr, "Password change required for %s.\n", target_user);
++	    sweep_up(ksu_context, cc_target);
++	    exit(1);
++	}
++	force_fork++;
++    }
++#endif
++
++    if( keep_target_cache && !force_fork ) {
+ 	execv(params[0], params);
+ 	com_err(prog_name, errno, "while trying to execv %s",
+ 		params[0]);
+@@ -799,6 +822,33 @@
+ 	exit(1);
+     }else{
+ 	statusp = 1;
++
++#ifdef USE_PAM
++	if (appl_pam_enabled(ksu_context, "ksu")) {
++	    if (appl_pam_session_open() != 0) {
++		fprintf(stderr, "Error opening session for %s.\n", target_user);
++		sweep_up(ksu_context, cc_target);
++		exit(1);
++	    }
++#ifdef DEBUG
++	    if (auth_debug){
++		printf(" Opened PAM session.\n");
++	    }
++#endif
++	    if (appl_pam_cred_init()) {
++		fprintf(stderr, "Error initializing credentials for %s.\n",
++			target_user);
++		sweep_up(ksu_context, cc_target);
++		exit(1);
++	    }
++#ifdef DEBUG
++	    if (auth_debug){
++		printf(" Initialized PAM credentials.\n");
++	    }
++#endif
++	}
++#endif
++
+ 	switch ((child_pid = fork())) {
+ 	default:
+ 	    if (auth_debug){
+@@ -822,15 +872,34 @@
+ 	    if (ret_pid == -1) {
+ 	    	com_err(prog_name, errno, "while calling waitpid");
+ 	    }
+-	    sweep_up(ksu_context, cc_target);
++	    if( !keep_target_cache ) {
++	        sweep_up(ksu_context, cc_target);
++	    }
+ 	    exit (statusp);
+ 	case -1:
+ 	    com_err(prog_name, errno, "while trying to fork.");
+ 	    sweep_up(ksu_context, cc_target);
+ 	    exit (1);
+ 	case 0:
++#ifdef USE_PAM
++	    if (appl_pam_enabled(ksu_context, "ksu")) {
++		if (appl_pam_setenv() != 0) {
++		    fprintf(stderr, "Error setting up environment for %s.\n",
++			    target_user);
++		    exit (1);
++		}
++#ifdef DEBUG
++		if (auth_debug){
++		    printf(" Set up PAM environment.\n");
++		}
++#endif
++	    }
++#endif
+ 	    execv(params[0], params);
+ 	    com_err(prog_name, errno, "while trying to execv %s", params[0]);
++	    if( keep_target_cache ) {
++	        sweep_up(ksu_context, cc_target);
++	    }
+ 	    exit (1);
+ 	}
+     }


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- krb5.spec	21 Apr 2009 18:46:52 -0000	1.193
+++ krb5.spec	23 Apr 2009 22:43:26 -0000	1.194
@@ -44,6 +44,7 @@
 Source26: gssftp.pamd
 Source27: kshell.pamd
 Source28: ekshell.pamd
+Source29: ksu.pamd
 
 Patch3: krb5-1.3-netkit-rsh.patch
 Patch4: krb5-1.3-rlogind-environ.patch
@@ -227,6 +228,12 @@
 certificate.
 
 %changelog
+* Thu Apr 23 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-104
+- extend PAM support to ksu: perform account and session management for the
+  target user
+- pull up and merge James Leddy's changes to also set PAM_RHOST in PAM-aware
+  network-facing services
+
 * Tue Apr 21 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-103
 - fix a typo in a ksu error message (Marek Mahut)
 - "rev" works the way the test suite expects now, so don't disable tests
@@ -1587,7 +1594,7 @@
 
 # PAM configuration files.
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d/
-for pam in kshell ekshell gssftp ; do
+for pam in kshell ekshell gssftp ksu ; do
 	install -pm 644 $RPM_SOURCE_DIR/$pam.pamd \
 	$RPM_BUILD_ROOT/etc/pam.d/$pam
 done



From kkofler at fedoraproject.org  Thu Apr 23 22:50:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 22:50:31 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.2,
	1.3 kdelibs.spec, 1.471, 1.472
Message-ID: <20090423225031.52B9370104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25418/devel

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:02 -0000	1.2
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 22:50:30 -0000	1.3
@@ -9,12 +9,13 @@
 +install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
-@@ -0,0 +1,8 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-24 00:42:44.000000000 +0200
+@@ -0,0 +1,9 @@
 +#!/usr/bin/perl
 +
 +while(<>) {
 +  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
++    print "# DELETEGROUP $_";
 +    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
 +  }
 +  print $_;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- kdelibs.spec	23 Apr 2009 21:29:02 -0000	1.471
+++ kdelibs.spec	23 Apr 2009 22:50:30 -0000	1.472
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-# kconf_update script for Patch201 - to be upstreamed
-Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -99,6 +97,8 @@
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 Patch201: kdelibs-4.2.2-popupapplet-config.patch
+# kconf_update script for Patch201
+Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -246,6 +245,7 @@
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
 %patch201 -p0 -b .popupapplet-config
+%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,8 +428,11 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
+- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
-- fix the kconf_update scriptlet for #495998
+- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver



From kkofler at fedoraproject.org  Thu Apr 23 22:50:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 22:50:59 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec,1.420,1.421
Message-ID: <20090423225059.51F8E70104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25418/F-10

Modified Files:
	kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- kdelibs.spec	23 Apr 2009 21:29:01 -0000	1.420
+++ kdelibs.spec	23 Apr 2009 22:50:28 -0000	1.421
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-# kconf_update script for Patch201 - to be upstreamed
-Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -99,6 +97,8 @@
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 Patch201: kdelibs-4.2.2-popupapplet-config.patch
+# kconf_update script for Patch201
+Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -246,6 +245,7 @@
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
 %patch201 -p0 -b .popupapplet-config
+%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,8 +428,11 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
+- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
-- fix the kconf_update scriptlet for #495998
+- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver



From kkofler at fedoraproject.org  Thu Apr 23 22:50:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 22:50:59 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.2,
	1.3 kdelibs.spec, 1.471, 1.472
Message-ID: <20090423225059.D600D70104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25418/F-11

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:02 -0000	1.2
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 22:50:29 -0000	1.3
@@ -9,12 +9,13 @@
 +install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
-@@ -0,0 +1,8 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-24 00:42:44.000000000 +0200
+@@ -0,0 +1,9 @@
 +#!/usr/bin/perl
 +
 +while(<>) {
 +  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
++    print "# DELETEGROUP $_";
 +    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
 +  }
 +  print $_;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- kdelibs.spec	23 Apr 2009 21:29:02 -0000	1.471
+++ kdelibs.spec	23 Apr 2009 22:50:29 -0000	1.472
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-# kconf_update script for Patch201 - to be upstreamed
-Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -99,6 +97,8 @@
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 Patch201: kdelibs-4.2.2-popupapplet-config.patch
+# kconf_update script for Patch201
+Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -246,6 +245,7 @@
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
 %patch201 -p0 -b .popupapplet-config
+%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,8 +428,11 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
+- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
-- fix the kconf_update scriptlet for #495998
+- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver



From kkofler at fedoraproject.org  Thu Apr 23 22:51:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 22:51:00 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.2, 
	1.3 kdelibs.spec, 1.395, 1.396
Message-ID: <20090423225100.5B5DE70104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25418/F-9

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch kdelibs.spec 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:02 -0000	1.2
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 22:50:29 -0000	1.3
@@ -9,12 +9,13 @@
 +install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
-@@ -0,0 +1,8 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-24 00:42:44.000000000 +0200
+@@ -0,0 +1,9 @@
 +#!/usr/bin/perl
 +
 +while(<>) {
 +  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
++    print "# DELETEGROUP $_";
 +    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
 +  }
 +  print $_;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- kdelibs.spec	23 Apr 2009 21:29:02 -0000	1.395
+++ kdelibs.spec	23 Apr 2009 22:50:29 -0000	1.396
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-# kconf_update script for Patch201 - to be upstreamed
-Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -99,6 +97,8 @@
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 # fix Plasma PopupApplet configuration interfering with weather applet (#495998)
 Patch201: kdelibs-4.2.2-popupapplet-config.patch
+# kconf_update script for Patch201
+Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -246,6 +245,7 @@
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
 %patch201 -p0 -b .popupapplet-config
+%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,8 +428,11 @@
 
 
 %changelog
+* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
+- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
-- fix the kconf_update scriptlet for #495998
+- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver



From nalin at fedoraproject.org  Thu Apr 23 22:51:56 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 23 Apr 2009 22:51:56 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.194,1.195
Message-ID: <20090423225156.28E0870104@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25634

Modified Files:
	krb5.spec 
Log Message:
yeah, actually bump the release number


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- krb5.spec	23 Apr 2009 22:43:26 -0000	1.194
+++ krb5.spec	23 Apr 2009 22:51:25 -0000	1.195
@@ -13,7 +13,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.6.3
-Release: 103%{?dist}
+Release: 104%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz



From kkofler at fedoraproject.org  Thu Apr 23 22:52:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 23 Apr 2009 22:52:30 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.2,
	1.3
Message-ID: <20090423225230.75C3F70104@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801/F-10

Modified Files:
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)

kdelibs-4.2.2-popupapplet-kconf_update.patch:

Index: kdelibs-4.2.2-popupapplet-kconf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs-4.2.2-popupapplet-kconf_update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 21:29:01 -0000	1.2
+++ kdelibs-4.2.2-popupapplet-kconf_update.patch	23 Apr 2009 22:52:00 -0000	1.3
@@ -9,12 +9,13 @@
 +install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
 --- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-19 05:24:00.000000000 +0200
-@@ -0,0 +1,8 @@
++++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl	2009-04-24 00:42:44.000000000 +0200
+@@ -0,0 +1,9 @@
 +#!/usr/bin/perl
 +
 +while(<>) {
 +  if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
++    print "# DELETEGROUP $_";
 +    $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
 +  }
 +  print $_;



From petersen at fedoraproject.org  Thu Apr 23 23:56:58 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 23 Apr 2009 23:56:58 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.10,1.11
Message-ID: <20090423235658.4170C70105@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6127

Modified Files:
	ghc-X11.spec 
Log Message:
define ghc_version correctly


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ghc-X11.spec	23 Apr 2009 08:24:55 -0000	1.10
+++ ghc-X11.spec	23 Apr 2009 23:56:27 -0000	1.11
@@ -3,14 +3,14 @@
 %bcond_without doc
 %bcond_without prof
 
-%{expand: %%define ghc_ver %(ghc --numeric-version)}
+%{expand: %%define ghc_version %(ghc --numeric-version)}
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -46,7 +46,7 @@
 
 %description devel
 This package contains the development files for %{name}
-built for ghc.
+built for ghc-%{ghc_version}.
 
 
 %if %{with doc}
@@ -70,7 +70,8 @@
 Requires:       ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -140,10 +141,17 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-8
+- define ghc_version correctly
+
 * Mon Apr 20 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-7
 - rebuild with ghc-6.10.2
 - update to latest cabal2spec template and macros.ghc
-- get ghc_version from ghc
+  - pkg_libdir and pkg_docdir moved to macros.ghc
+  - drop ghc_version from buildrequires
+  - fix prof configure
+  - add doc filelist
+  - get ghc_version from ghc
 
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee at localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch



From mjakubicek at fedoraproject.org  Thu Apr 23 23:58:04 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 23 Apr 2009 23:58:04 +0000 (UTC)
Subject: rpms/itpp/F-11 itpp-gcc44.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 itpp.spec, 1.13, 1.14 sources, 1.8, 1.9 itpp-gcc43.patch,
	1.1, NONE
Message-ID: <20090423235804.96D9470105@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/itpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6376/F-11

Modified Files:
	.cvsignore itpp.spec sources 
Added Files:
	itpp-gcc44.patch 
Removed Files:
	itpp-gcc43.patch 
Log Message:
- Fix FTBFS:                                                                         
- Update to 4.0.6 bugfix release                                                     
- Dropped itpp-gcc43.patch (merged upstream).                                        
- Added itpp-gcc44.patch  



itpp-gcc44.patch:

--- NEW FILE itpp-gcc44.patch ---
--- itpp/base/timing.cpp.orig	2009-04-24 00:29:03.000000000 +0200
+++ itpp/base/timing.cpp	2009-04-24 00:29:32.000000000 +0200
@@ -47,7 +47,7 @@
 #include <itpp/base/timing.h>
 #include <iostream>
 #include <cmath>
-
+#include <cstdio>
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <windows.h>
--- itpp/base/vec.cpp.orig	2009-04-24 00:30:57.000000000 +0200
+++ itpp/base/vec.cpp	2009-04-24 00:31:08.000000000 +0200
@@ -30,6 +30,7 @@
 #include <itpp/base/vec.h>
 #include <itpp/base/converters.h>
 #include <limits>
+#include <cstdio>
 
 //! \cond
 
--- itpp/fixed/fix.cpp.orig	2009-04-24 00:44:49.000000000 +0200
+++ itpp/fixed/fix.cpp	2009-04-24 00:45:35.000000000 +0200
@@ -30,7 +30,7 @@
 #include <itpp/fixed/fix.h>
 #include <itpp/base/itassert.h>
 #include <iostream>
-
+#include <cstdio>
 
 namespace itpp
 {
--- itpp/fixed/fixed.cpp.orig	2009-04-24 00:44:56.000000000 +0200
+++ itpp/fixed/fixed.cpp	2009-04-24 00:46:00.000000000 +0200
@@ -28,7 +28,7 @@
  */
 
 #include <itpp/fixed/fixed.h>
-
+#include <cstdio>
 
 namespace itpp
 {
--- itpp/fixed/cfix.cpp.orig	2009-04-24 00:51:15.000000000 +0200
+++ itpp/fixed/cfix.cpp	2009-04-24 00:51:28.000000000 +0200
@@ -30,7 +30,7 @@
 #include <itpp/fixed/cfix.h>
 #include <itpp/base/itassert.h>
 #include <iostream>
-
+#include <cstdio>
 
 namespace itpp
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Dec 2007 21:51:58 -0000	1.8
+++ .cvsignore	23 Apr 2009 23:57:34 -0000	1.9
@@ -1 +1 @@
-itpp-4.0.0.tar.bz2
+itpp-4.0.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/F-11/itpp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- itpp.spec	25 Feb 2009 08:20:16 -0000	1.13
+++ itpp.spec	23 Apr 2009 23:57:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        4.0.0
-Release:        7%{?dist}
+Version:        4.0.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -8,7 +8,9 @@
 URL:            http://itpp.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/itpp/itpp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		itpp-gcc43.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2780001&group_id=37044&atid=418758
+Patch1:			itpp-gcc44.patch
 
 BuildRequires:  gcc-gfortran, atlas-devel, fftw-devel
 BuildRequires:  tetex-latex
@@ -46,7 +48,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+%patch1 -b .gcc44
 
 %build
 export LDFLAGS="-L"%{_libdir}"/atlas"
@@ -54,7 +56,7 @@
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
   --with-docdir=%{_docdir}/%{name}-%{version} --disable-static
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 #
 #  remove unnecessary bits from itpp-config and itpp.pc
 #cat itpp-config | sed -e 's|-L[^ ]*gcc[^ ]*||g' |  \
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 4.0.6-1
+- Fix FTBFS:
+- Update to 4.0.6 bugfix release
+- Dropped itpp-gcc43.patch (merged upstream).
+- Added itpp-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Dec 2007 21:51:58 -0000	1.8
+++ sources	23 Apr 2009 23:57:34 -0000	1.9
@@ -1 +1 @@
-c259921dc1143a92419324f031fc7151  itpp-4.0.0.tar.bz2
+1c31b1d09f72f4a8dec9ac9c41d7d27c  itpp-4.0.6.tar.bz2


--- itpp-gcc43.patch DELETED ---



From mjakubicek at fedoraproject.org  Thu Apr 23 23:58:04 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 23 Apr 2009 23:58:04 +0000 (UTC)
Subject: rpms/itpp/devel itpp-gcc44.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 itpp.spec, 1.13, 1.14 sources, 1.8, 1.9 itpp-gcc43.patch,
	1.1, NONE
Message-ID: <20090423235804.EC27570105@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/itpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6376/devel

Modified Files:
	.cvsignore itpp.spec sources 
Added Files:
	itpp-gcc44.patch 
Removed Files:
	itpp-gcc43.patch 
Log Message:
- Fix FTBFS:                                                                         
- Update to 4.0.6 bugfix release                                                     
- Dropped itpp-gcc43.patch (merged upstream).                                        
- Added itpp-gcc44.patch  



itpp-gcc44.patch:

--- NEW FILE itpp-gcc44.patch ---
--- itpp/base/timing.cpp.orig	2009-04-24 00:29:03.000000000 +0200
+++ itpp/base/timing.cpp	2009-04-24 00:29:32.000000000 +0200
@@ -47,7 +47,7 @@
 #include <itpp/base/timing.h>
 #include <iostream>
 #include <cmath>
-
+#include <cstdio>
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <windows.h>
--- itpp/base/vec.cpp.orig	2009-04-24 00:30:57.000000000 +0200
+++ itpp/base/vec.cpp	2009-04-24 00:31:08.000000000 +0200
@@ -30,6 +30,7 @@
 #include <itpp/base/vec.h>
 #include <itpp/base/converters.h>
 #include <limits>
+#include <cstdio>
 
 //! \cond
 
--- itpp/fixed/fix.cpp.orig	2009-04-24 00:44:49.000000000 +0200
+++ itpp/fixed/fix.cpp	2009-04-24 00:45:35.000000000 +0200
@@ -30,7 +30,7 @@
 #include <itpp/fixed/fix.h>
 #include <itpp/base/itassert.h>
 #include <iostream>
-
+#include <cstdio>
 
 namespace itpp
 {
--- itpp/fixed/fixed.cpp.orig	2009-04-24 00:44:56.000000000 +0200
+++ itpp/fixed/fixed.cpp	2009-04-24 00:46:00.000000000 +0200
@@ -28,7 +28,7 @@
  */
 
 #include <itpp/fixed/fixed.h>
-
+#include <cstdio>
 
 namespace itpp
 {
--- itpp/fixed/cfix.cpp.orig	2009-04-24 00:51:15.000000000 +0200
+++ itpp/fixed/cfix.cpp	2009-04-24 00:51:28.000000000 +0200
@@ -30,7 +30,7 @@
 #include <itpp/fixed/cfix.h>
 #include <itpp/base/itassert.h>
 #include <iostream>
-
+#include <cstdio>
 
 namespace itpp
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Dec 2007 21:51:58 -0000	1.8
+++ .cvsignore	23 Apr 2009 23:57:34 -0000	1.9
@@ -1 +1 @@
-itpp-4.0.0.tar.bz2
+itpp-4.0.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/devel/itpp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- itpp.spec	25 Feb 2009 08:20:16 -0000	1.13
+++ itpp.spec	23 Apr 2009 23:57:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        4.0.0
-Release:        7%{?dist}
+Version:        4.0.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -8,7 +8,9 @@
 URL:            http://itpp.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/itpp/itpp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		itpp-gcc43.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2780001&group_id=37044&atid=418758
+Patch1:			itpp-gcc44.patch
 
 BuildRequires:  gcc-gfortran, atlas-devel, fftw-devel
 BuildRequires:  tetex-latex
@@ -46,7 +48,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+%patch1 -b .gcc44
 
 %build
 export LDFLAGS="-L"%{_libdir}"/atlas"
@@ -54,7 +56,7 @@
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
   --with-docdir=%{_docdir}/%{name}-%{version} --disable-static
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 #
 #  remove unnecessary bits from itpp-config and itpp.pc
 #cat itpp-config | sed -e 's|-L[^ ]*gcc[^ ]*||g' |  \
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 4.0.6-1
+- Fix FTBFS:
+- Update to 4.0.6 bugfix release
+- Dropped itpp-gcc43.patch (merged upstream).
+- Added itpp-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/itpp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Dec 2007 21:51:58 -0000	1.8
+++ sources	23 Apr 2009 23:57:34 -0000	1.9
@@ -1 +1 @@
-c259921dc1143a92419324f031fc7151  itpp-4.0.0.tar.bz2
+1c31b1d09f72f4a8dec9ac9c41d7d27c  itpp-4.0.6.tar.bz2


--- itpp-gcc43.patch DELETED ---



From petersen at fedoraproject.org  Fri Apr 24 00:46:27 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 00:46:27 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.11,1.12
Message-ID: <20090424004627.8727E70106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13697

Modified Files:
	ghc-X11.spec 
Log Message:
define ghc_version with global


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghc-X11.spec	23 Apr 2009 23:56:27 -0000	1.11
+++ ghc-X11.spec	24 Apr 2009 00:45:56 -0000	1.12
@@ -3,14 +3,14 @@
 %bcond_without doc
 %bcond_without prof
 
-%{expand: %%define ghc_version %(ghc --numeric-version)}
+%{expand: %%global ghc_version %(ghc --numeric-version)}
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -141,6 +141,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-9
+- try defining ghc_version with global
+
 * Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-8
 - define ghc_version correctly
 



From hadess at fedoraproject.org  Fri Apr 24 00:56:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 00:56:23 +0000 (UTC)
Subject: rpms/python-gdata/F-11 .cvsignore, 1.8, 1.9 python-gdata.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <20090424005623.AC89970106@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14821

Modified Files:
	.cvsignore python-gdata.spec sources 
Log Message:
* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
- Update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Mar 2009 17:58:36 -0000	1.8
+++ .cvsignore	24 Apr 2009 00:55:53 -0000	1.9
@@ -1 +1 @@
-gdata-1.3.0.tar.gz
+gdata-1.3.1.tar.gz


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/F-11/python-gdata.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-gdata.spec	22 Mar 2009 18:43:33 -0000	1.15
+++ python-gdata.spec	24 Apr 2009 00:55:53 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-gdata
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        A Python module for accessing online Google services
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
+- Update to 1.3.1
+
 * Sun Mar 22 2009 - Bastien Nocera <bnocera at redhat.com> - 1.3.0-1
 - Update to 1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Mar 2009 17:58:37 -0000	1.8
+++ sources	24 Apr 2009 00:55:53 -0000	1.9
@@ -1 +1 @@
-77f84403f1d3bac6f48f634e46cb4d76  gdata-1.3.0.tar.gz
+70d60cdb43f6f49fc5a596f154f9cfbe  gdata-1.3.1.tar.gz



From jistone at fedoraproject.org  Fri Apr 24 01:13:24 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Fri, 24 Apr 2009 01:13:24 +0000 (UTC)
Subject: rpms/systemtap/devel .cvsignore, 1.16, 1.17 sources, 1.29,
	1.30 systemtap.spec, 1.45, 1.46
Message-ID: <20090424011324.75F3370106@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17851

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Mar 2009 17:25:06 -0000	1.16
+++ .cvsignore	24 Apr 2009 01:12:54 -0000	1.17
@@ -1 +1 @@
-systemtap-0.9.5.tar.gz
+systemtap-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Mar 2009 17:25:06 -0000	1.29
+++ sources	24 Apr 2009 01:12:54 -0000	1.30
@@ -1 +1 @@
-5875ac02eae5260d0d14b337e7b5420a  systemtap-0.9.5.tar.gz
+799ddce4c999d5ed18ec6e1200d7b560  systemtap-0.9.7.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- systemtap.spec	27 Mar 2009 17:25:06 -0000	1.45
+++ systemtap.spec	24 Apr 2009 01:12:54 -0000	1.46
@@ -6,7 +6,7 @@
 %{!?pie_supported: %define pie_supported 1}
 
 Name: systemtap
-Version: 0.9.5
+Version: 0.9.7
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -323,6 +323,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Josh Stone <jistone at redhat.com> - 0.9.7-1
+- Upstream release.
+
 * Fri Mar 27 2009 Josh Stone <jistone at redhat.com> - 0.9.5-1
 - Upstream release.
 



From jistone at fedoraproject.org  Fri Apr 24 01:13:29 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Fri, 24 Apr 2009 01:13:29 +0000 (UTC)
Subject: rpms/systemtap/F-11 .cvsignore, 1.16, 1.17 sources, 1.29,
	1.30 systemtap.spec, 1.45, 1.46
Message-ID: <20090424011329.0BDE970106@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17881

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Mar 2009 17:25:06 -0000	1.16
+++ .cvsignore	24 Apr 2009 01:12:58 -0000	1.17
@@ -1 +1 @@
-systemtap-0.9.5.tar.gz
+systemtap-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Mar 2009 17:25:06 -0000	1.29
+++ sources	24 Apr 2009 01:12:58 -0000	1.30
@@ -1 +1 @@
-5875ac02eae5260d0d14b337e7b5420a  systemtap-0.9.5.tar.gz
+799ddce4c999d5ed18ec6e1200d7b560  systemtap-0.9.7.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/systemtap.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- systemtap.spec	27 Mar 2009 17:25:06 -0000	1.45
+++ systemtap.spec	24 Apr 2009 01:12:58 -0000	1.46
@@ -6,7 +6,7 @@
 %{!?pie_supported: %define pie_supported 1}
 
 Name: systemtap
-Version: 0.9.5
+Version: 0.9.7
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -323,6 +323,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Josh Stone <jistone at redhat.com> - 0.9.7-1
+- Upstream release.
+
 * Fri Mar 27 2009 Josh Stone <jistone at redhat.com> - 0.9.5-1
 - Upstream release.
 



From jistone at fedoraproject.org  Fri Apr 24 01:13:35 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Fri, 24 Apr 2009 01:13:35 +0000 (UTC)
Subject: rpms/systemtap/F-9 .cvsignore, 1.15, 1.16 sources, 1.29,
	1.30 systemtap.spec, 1.43, 1.44
Message-ID: <20090424011335.3317070106@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17944

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Mar 2009 17:49:57 -0000	1.15
+++ .cvsignore	24 Apr 2009 01:13:04 -0000	1.16
@@ -1 +1 @@
-systemtap-0.9.5.tar.gz
+systemtap-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Mar 2009 17:49:57 -0000	1.29
+++ sources	24 Apr 2009 01:13:04 -0000	1.30
@@ -1 +1 @@
-5875ac02eae5260d0d14b337e7b5420a  systemtap-0.9.5.tar.gz
+799ddce4c999d5ed18ec6e1200d7b560  systemtap-0.9.7.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-9/systemtap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- systemtap.spec	27 Mar 2009 17:49:57 -0000	1.43
+++ systemtap.spec	24 Apr 2009 01:13:04 -0000	1.44
@@ -6,7 +6,7 @@
 %{!?pie_supported: %define pie_supported 1}
 
 Name: systemtap
-Version: 0.9.5
+Version: 0.9.7
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -323,6 +323,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Josh Stone <jistone at redhat.com> - 0.9.7-1
+- Upstream release.
+
 * Fri Mar 27 2009 Josh Stone <jistone at redhat.com> - 0.9.5-1
 - Upstream release.
 



From jistone at fedoraproject.org  Fri Apr 24 01:13:32 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Fri, 24 Apr 2009 01:13:32 +0000 (UTC)
Subject: rpms/systemtap/F-10 .cvsignore, 1.15, 1.16 sources, 1.29,
	1.30 systemtap.spec, 1.43, 1.44
Message-ID: <20090424011332.2F3B670106@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17914

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Mar 2009 17:48:01 -0000	1.15
+++ .cvsignore	24 Apr 2009 01:13:01 -0000	1.16
@@ -1 +1 @@
-systemtap-0.9.5.tar.gz
+systemtap-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Mar 2009 17:48:01 -0000	1.29
+++ sources	24 Apr 2009 01:13:01 -0000	1.30
@@ -1 +1 @@
-5875ac02eae5260d0d14b337e7b5420a  systemtap-0.9.5.tar.gz
+799ddce4c999d5ed18ec6e1200d7b560  systemtap-0.9.7.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/systemtap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- systemtap.spec	27 Mar 2009 17:48:01 -0000	1.43
+++ systemtap.spec	24 Apr 2009 01:13:01 -0000	1.44
@@ -6,7 +6,7 @@
 %{!?pie_supported: %define pie_supported 1}
 
 Name: systemtap
-Version: 0.9.5
+Version: 0.9.7
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -323,6 +323,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Josh Stone <jistone at redhat.com> - 0.9.7-1
+- Upstream release.
+
 * Fri Mar 27 2009 Josh Stone <jistone at redhat.com> - 0.9.5-1
 - Upstream release.
 



From wcohen at fedoraproject.org  Fri Apr 24 01:35:07 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri, 24 Apr 2009 01:35:07 +0000 (UTC)
Subject: rpms/oprofile/F-11 oprofile-iaperf.patch, NONE, 1.1 oprofile.spec, 
	1.76, 1.77
Message-ID: <20090424013507.B77C270106@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22071

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-iaperf.patch 
Log Message:
- Backport Intel Architecture Perfmon support. Resolves: rhbz #497230


oprofile-iaperf.patch:

--- NEW FILE oprofile-iaperf.patch ---
diff -up /dev/null oprofile-0.9.4/events/i386/arch_perfmon/events
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/events/i386/arch_perfmon/events	2009-04-23 17:13:46.000000000 -0400
@@ -0,0 +1,10 @@
+# 
+# Intel Architectural events as of arch perfmon v2
+# 
+event:0x3c counters:cpuid um:zero minimum:6000 filter:0 name:CPU_CLK_UNHALTED : Clock cycles when not halted
+event:0x3c counters:cpuid um:one minimum:6000 filter:2 name:UNHALTED_REFERENCE_CYCLES : Unhalted reference cycles
+event:0xc0 counters:cpuid um:zero minimum:6000 filter:1 name:INST_RETIRED_ANY_P : number of instructions retired
+event:0x2e counters:cpuid um:x41 minimum:6000 filter:5 name:LLC_MISSES : L2 cache demand requests from this core that missed the L2
+event:0x2e counters:cpuid um:x4f minimum:6000 filter:4 name:LLC_REFS : L2 cache demand requests from this core
+event:0xc4 counters:cpuid um:zero minimum:500 filter:6 name:BR_INST_RETIRED : number of branch instructions retired
+event:0xc5 counters:cpuid um:zero minimum:500 filter:7 name:BR_MISS_PRED_RETIRED : number of mispredicted branches retired (precise)
diff -up /dev/null oprofile-0.9.4/events/i386/arch_perfmon/unit_masks
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/events/i386/arch_perfmon/unit_masks	2009-04-23 17:13:18.000000000 -0400
@@ -0,0 +1,11 @@
+# Intel architectural perfmon unit masks
+#
+name:zero type:mandatory default:0x0
+	0x0 No unit mask
+name:one type:mandatory default:0x1
+	0x1 No unit mask
+name:x41 type:mandatory default:0x41
+	0x41 No unit mask
+name:x4f type:mandatory default:0x4f
+	0x4f No unit mask
+#
\ No newline at end of file
diff -up oprofile-0.9.4/events/Makefile.am.orig oprofile-0.9.4/events/Makefile.am
--- oprofile-0.9.4/events/Makefile.am.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/events/Makefile.am	2009-04-23 17:13:18.000000000 -0400
@@ -13,6 +13,7 @@ event_files = \
 	i386/ppro/events i386/ppro/unit_masks \
 	i386/p6_mobile/events i386/p6_mobile/unit_masks \
 	i386/core/events i386/core/unit_masks \
+	i386/arch_perfmon/events i386/arch_perfmon/unit_masks \
 	ia64/ia64/events ia64/ia64/unit_masks \
 	ia64/itanium2/events ia64/itanium2/unit_masks \
 	ia64/itanium/events ia64/itanium/unit_masks \
diff -up oprofile-0.9.4/libop/op_cpu_type.c.orig oprofile-0.9.4/libop/op_cpu_type.c
--- oprofile-0.9.4/libop/op_cpu_type.c.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_cpu_type.c	2009-04-23 17:17:37.000000000 -0400
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "op_cpu_type.h"
+#include "op_hw_specific.h"
 
 struct cpu_descr {
 	char const * pretty;
@@ -74,6 +75,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
 	{ "e300", "ppc/e300", CPU_PPC_E300, 4 },
 	{ "AVR32", "avr32", CPU_AVR32, 3 },
+ 	{ "Intel Architectural Perfmon", "i386/arch_perfmon", CPU_ARCH_PERFMON, 0},
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
@@ -151,8 +153,14 @@ char const * op_get_cpu_name(op_cpu cpu_
 
 int op_get_nr_counters(op_cpu cpu_type)
 {
+	int cnt;
+
 	if (cpu_type <= CPU_NO_GOOD || cpu_type >= MAX_CPU_TYPE)
 		return 0;
 
+	cnt = arch_num_counters(cpu_type);
+	if (cnt >= 0)
+		return cnt;
+
 	return cpu_descrs[cpu_type].nr_counters;
 }
diff -up oprofile-0.9.4/libop/op_cpu_type.h.orig oprofile-0.9.4/libop/op_cpu_type.h
--- oprofile-0.9.4/libop/op_cpu_type.h.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_cpu_type.h	2009-04-23 17:17:07.000000000 -0400
@@ -72,6 +72,7 @@ typedef enum {
 	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
 	CPU_PPC_E300, /**< e300 */
 	CPU_AVR32, /**< AVR32 */
+ 	CPU_ARCH_PERFMON, /**< Intel architectural perfmon */
 	MAX_CPU_TYPE
 } op_cpu;
 
diff -up oprofile-0.9.4/libop/op_events.c.orig oprofile-0.9.4/libop/op_events.c
--- oprofile-0.9.4/libop/op_events.c.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_events.c	2009-04-23 17:13:18.000000000 -0400
@@ -16,6 +16,7 @@
 #include "op_fileio.h"
 #include "op_string.h"
 #include "op_cpufreq.h"
+#include "op_hw_specific.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -27,6 +28,8 @@ static LIST_HEAD(um_list);
 static char const * filename;
 static unsigned int line_nr;
 
+static void delete_event(struct op_event * event);
+
 static void parse_error(char const * context)
 {
 	fprintf(stderr, "oprofile: parse error in %s, line %u\n",
@@ -329,7 +332,8 @@ static void read_events(char const * fil
 		seen_um = 0;
 		seen_minimum = 0;
 		event = new_event();
-
+		event->filter = -1;
+		
 		c = line;
 		while (next_token(&c, &name, &value)) {
 			if (strcmp(name, "name") == 0) {
@@ -351,7 +355,10 @@ static void read_events(char const * fil
 				if (seen_counters)
 					parse_error("duplicate counters: tag");
 				seen_counters = 1;
-				event->counter_mask = parse_counter_mask(value);
+				if (!strcmp(value, "cpuid"))
+					event->counter_mask = arch_get_counter_mask();
+				else
+					event->counter_mask = parse_counter_mask(value);
 				free(value);
 			} else if (strcmp(name, "um") == 0) {
 				if (seen_um)
@@ -368,6 +375,9 @@ static void read_events(char const * fil
 				free(value);
 			} else if (strcmp(name, "desc") == 0) {
 				event->desc = value;
+			} else if (strcmp(name, "filter") == 0) { 
+				event->filter = parse_int(value);
+				free(value);
 			} else {
 				parse_error("unknown tag");
 			}
@@ -423,6 +433,18 @@ static void check_unit_mask(struct op_un
 	}
 }
 
+static void arch_filter_events(op_cpu cpu_type)
+{
+	struct list_head * pos, * pos2;
+	unsigned filter = arch_get_filter(cpu_type);
+	if (!filter)
+		return;
+	list_for_each_safe (pos, pos2, &events_list) { 
+		struct op_event * event = list_entry(pos, struct op_event, event_next);
+		if (event->filter >= 0 && ((1U << event->filter) & filter))
+			delete_event(event);
+	}
+}
 
 static void load_events(op_cpu cpu_type)
 {
@@ -459,6 +481,8 @@ static void load_events(op_cpu cpu_type)
 	read_unit_masks(um_file);
 	read_events(event_file);
 
+	arch_filter_events(cpu_type);
+
 	/* sanity check: all unit mask must be used */
 	list_for_each(pos, &um_list) {
 		struct op_unit_mask * um = list_entry(pos, struct op_unit_mask, um_next);
@@ -471,10 +495,10 @@ static void load_events(op_cpu cpu_type)
 	free(event_dir);
 }
 
-
 struct list_head * op_events(op_cpu cpu_type)
 {
 	load_events(cpu_type);
+	arch_filter_events(cpu_type);
 	return &events_list;
 }
 
@@ -522,20 +546,24 @@ void op_free_events(void)
 }
 
 
-static struct op_event * find_event(u32 nr)
+static struct op_event * find_event_um(u32 nr, u32 um)
 {
 	struct list_head * pos;
+	unsigned int i;
 
 	list_for_each(pos, &events_list) {
 		struct op_event * event = list_entry(pos, struct op_event, event_next);
-		if (event->val == nr)
-			return event;
+		if (event->val == nr) { 
+			for (i = 0; i < event->unit->num; i++) { 
+				if (event->unit->um[i].value == um)
+					return event;		
+			} 
+		}
 	}
 
 	return NULL;
 }
 
-
 static FILE * open_event_mapping_file(char const * cpu_name) 
 {
 	char * ev_map_file;
@@ -687,13 +715,13 @@ struct op_event * find_event_by_name(cha
 }
 
 
-struct op_event * op_find_event(op_cpu cpu_type, u32 nr)
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr, u32 um)
 {
 	struct op_event * event;
 
 	load_events(cpu_type);
 
-	event = find_event(nr);
+	event = find_event_um(nr, um);
 
 	return event;
 }
@@ -701,38 +729,43 @@ struct op_event * op_find_event(op_cpu c
 
 int op_check_events(int ctr, u32 nr, u32 um, op_cpu cpu_type)
 {
-	int ret = OP_OK_EVENT;
-	struct op_event * event;
+	int ret = OP_INVALID_EVENT;
 	size_t i;
 	u32 ctr_mask = 1 << ctr;
+	struct list_head * pos;
 
 	load_events(cpu_type);
 
-	event = find_event(nr);
+	list_for_each(pos, &events_list) {
+		struct op_event * event = list_entry(pos, struct op_event, event_next);
+		if (event->val != nr)
+			continue;
 
-	if (!event) {
-		ret |= OP_INVALID_EVENT;
-		return ret;
-	}
+		ret = OP_OK_EVENT;
 
-	if ((event->counter_mask & ctr_mask) == 0)
-		ret |= OP_INVALID_COUNTER;
+		if ((event->counter_mask & ctr_mask) == 0)
+			ret |= OP_INVALID_COUNTER;
 
-	if (event->unit->unit_type_mask == utm_bitmask) {
-		for (i = 0; i < event->unit->num; ++i)
-			um &= ~(event->unit->um[i].value);			
-		
-		if (um)
-			ret |= OP_INVALID_UM;
+		if (event->unit->unit_type_mask == utm_bitmask) {
+			for (i = 0; i < event->unit->num; ++i)
+				um &= ~(event->unit->um[i].value);			
+			
+			if (um)
+				ret |= OP_INVALID_UM;
+			
+		} else {
+			for (i = 0; i < event->unit->num; ++i) {
+				if (event->unit->um[i].value == um)
+					break;
+			}
+			
+			if (i == event->unit->num)
+				ret |= OP_INVALID_UM;
 
-	} else {
-		for (i = 0; i < event->unit->num; ++i) {
-			if (event->unit->um[i].value == um)
-				break;
 		}
 
-		if (i == event->unit->num)
-			ret |= OP_INVALID_UM;
+		if (ret == OP_OK_EVENT)
+			return ret;
 	}
 
 	return ret;
@@ -759,6 +792,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_ATHLON:
 		case CPU_HAMMER:
 		case CPU_FAMILY10:
+		case CPU_ARCH_PERFMON:
 			descr->name = "CPU_CLK_UNHALTED";
 			break;
 
diff -up oprofile-0.9.4/libop/op_events.h.orig oprofile-0.9.4/libop/op_events.h
--- oprofile-0.9.4/libop/op_events.h.orig	2006-08-26 20:10:12.000000000 -0400
+++ oprofile-0.9.4/libop/op_events.h	2009-04-23 17:13:18.000000000 -0400
@@ -56,6 +56,7 @@ struct op_event {
 	char * name;		/**< the event name */
 	char * desc;      	/**< the event description */
 	int min_count;		/**< minimum counter value allowed */
+	int filter;		/**< architecture specific filter or -1 */
 	struct list_head event_next;   /**< next event in list */
 };
 
@@ -63,7 +64,7 @@ struct op_event {
 struct list_head * op_events(op_cpu cpu_type);
 
 /** Find a given event, returns NULL on error */
-struct op_event * op_find_event(op_cpu cpu_type, u32 nr);
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr, u32 um);
 
 /** Find a given event by name */
 struct op_event * find_event_by_name(char const * name);
diff -up /dev/null oprofile-0.9.4/libop/op_hw_specific.h
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/libop/op_hw_specific.h	2009-04-23 17:13:18.000000000 -0400
@@ -0,0 +1,64 @@
+/* 
+ * @file architecture specific interfaces
+ * @remark Copyright 2008 Intel Corporation
+ * @remark Read the file COPYING
+ * @author Andi Kleen
+ */
+
+#if defined(__i386__) || defined(__x86_64__) 
+
+/* Assume we run on the same host as the profilee */
+
+#define num_to_mask(x) ((1U << (x)) - 1)
+
+static inline unsigned arch_get_filter(op_cpu cpu_type)
+{
+	if (cpu_type == CPU_ARCH_PERFMON) { 
+		unsigned ebx, eax;
+		asm("cpuid" : "=a" (eax), "=b" (ebx) : "0" (0xa) : "ecx","edx");
+		return ebx & num_to_mask(eax >> 24);
+	}
+	return 0;
+}
+
+static inline int arch_num_counters(op_cpu cpu_type) 
+{
+	if (cpu_type == CPU_ARCH_PERFMON) {
+		unsigned v;
+		asm("cpuid" : "=a" (v) : "0" (0xa) : "ebx","ecx","edx");
+		return (v >> 8) & 0xff;
+	} 
+	return -1;
+}
+
+static inline unsigned arch_get_counter_mask(void)
+{
+	unsigned v;
+	asm("cpuid" : "=a" (v) : "0" (0xa) : "ebx","ecx","edx");
+	return num_to_mask((v >> 8) & 0xff);	
+}
+
+#else
+
+static inline unsigned arch_get_filter(op_cpu cpu_type)
+{
+	/* Do something with passed arg to shut up the compiler warning */
+	if (cpu_type != CPU_NO_GOOD)
+		return 0;
+	return 0;
+}
+
+static inline int arch_num_counters(op_cpu cpu_type) 
+{
+	/* Do something with passed arg to shut up the compiler warning */
+	if (cpu_type != CPU_NO_GOOD)
+		return -1;
+	return -1;
+}
+
+static inline unsigned arch_get_counter_mask(void)
+{
+	return 0;
+}
+
+#endif
diff -up oprofile-0.9.4/libpp/op_header.cpp.orig oprofile-0.9.4/libpp/op_header.cpp
--- oprofile-0.9.4/libpp/op_header.cpp.orig	2008-04-29 08:07:46.000000000 -0400
+++ oprofile-0.9.4/libpp/op_header.cpp	2009-04-23 17:13:18.000000000 -0400
@@ -165,7 +165,7 @@ string const op_print_event(op_cpu cpu_t
 		return str;
 	}
 
-	struct op_event * event = op_find_event(cpu_type, type);
+	struct op_event * event = op_find_event(cpu_type, type, um);
 
 	if (!event) {
 		cerr << "Could not locate event " << int(type) << endl;
@@ -205,7 +205,7 @@ string const op_xml_print_event(op_cpu c
 	if (cpu_type == CPU_TIMER_INT || cpu_type == CPU_RTC)
 		return xml_utils::get_timer_setup((size_t)count);
 
-	struct op_event * event = op_find_event(cpu_type, type);
+	struct op_event * event = op_find_event(cpu_type, type, um);
 	if (!event) {
 		cerr << "Could not locate event " << int(type) << endl;
 		return "";
diff -up oprofile-0.9.4/utils/ophelp.c.orig oprofile-0.9.4/utils/ophelp.c
--- oprofile-0.9.4/utils/ophelp.c.orig	2008-02-22 11:17:49.000000000 -0500
+++ oprofile-0.9.4/utils/ophelp.c	2009-04-23 17:13:19.000000000 -0400
@@ -401,6 +401,13 @@ int main(int argc, char const * argv[])
 		printf("See Intel Architecture Developer's Manual Volume 3, Appendix A and\n"
 		"Intel Architecture Optimization Reference Manual (730795-001)\n\n");
 		break;
+
+	case CPU_ARCH_PERFMON:
+		printf("See Intel 64 and IA-32 Architectures Software Developer's Manual\n"
+		"Volume 3B (Document 253669) Chapter 18 for architectural perfmon events\n"
+		"This is a limited set of fallback events because oprofile doesn't know your CPU\n");
+		break;
+	
 	case CPU_IA64:
 	case CPU_IA64_1:
 	case CPU_IA64_2:


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- oprofile.spec	9 Apr 2009 14:16:50 -0000	1.76
+++ oprofile.spec	24 Apr 2009 01:34:37 -0000	1.77
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -15,6 +15,7 @@
 Patch83: oprofile-0.9.3-xen.patch
 #Patch100: oprofile-gcc43.patch
 Patch101: oprofile-basename.patch
+Patch102: oprofile-iaperf.patch
 URL: http://oprofile.sf.net
 
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
@@ -84,6 +85,7 @@
 %patch83 -p1 -b .xen
 #%patch100 -p1 -b .gcc43
 %patch101 -p1 -b .basename
+%patch102 -p1 -b .iaperf
 
 ./autogen.sh
 
@@ -225,6 +227,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Thu Apr 23 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-7
+- Backport Intel Architecture Perfmon support. Resolves: rhbz #497230
+
 * Wed Apr 8 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-6
 - Test for basename declaration.
 



From wcohen at fedoraproject.org  Fri Apr 24 01:40:12 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri, 24 Apr 2009 01:40:12 +0000 (UTC)
Subject: rpms/oprofile/F-10 oprofile-iaperf.patch, NONE, 1.1 oprofile.spec, 
	1.73, 1.74
Message-ID: <20090424014012.DDF2870106@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23686

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-iaperf.patch 
Log Message:
- Backport Intel Architecture Perfmon support. Resolves: rhbz #497230


oprofile-iaperf.patch:

--- NEW FILE oprofile-iaperf.patch ---
diff -up /dev/null oprofile-0.9.4/events/i386/arch_perfmon/events
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/events/i386/arch_perfmon/events	2009-04-23 17:13:46.000000000 -0400
@@ -0,0 +1,10 @@
+# 
+# Intel Architectural events as of arch perfmon v2
+# 
+event:0x3c counters:cpuid um:zero minimum:6000 filter:0 name:CPU_CLK_UNHALTED : Clock cycles when not halted
+event:0x3c counters:cpuid um:one minimum:6000 filter:2 name:UNHALTED_REFERENCE_CYCLES : Unhalted reference cycles
+event:0xc0 counters:cpuid um:zero minimum:6000 filter:1 name:INST_RETIRED_ANY_P : number of instructions retired
+event:0x2e counters:cpuid um:x41 minimum:6000 filter:5 name:LLC_MISSES : L2 cache demand requests from this core that missed the L2
+event:0x2e counters:cpuid um:x4f minimum:6000 filter:4 name:LLC_REFS : L2 cache demand requests from this core
+event:0xc4 counters:cpuid um:zero minimum:500 filter:6 name:BR_INST_RETIRED : number of branch instructions retired
+event:0xc5 counters:cpuid um:zero minimum:500 filter:7 name:BR_MISS_PRED_RETIRED : number of mispredicted branches retired (precise)
diff -up /dev/null oprofile-0.9.4/events/i386/arch_perfmon/unit_masks
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/events/i386/arch_perfmon/unit_masks	2009-04-23 17:13:18.000000000 -0400
@@ -0,0 +1,11 @@
+# Intel architectural perfmon unit masks
+#
+name:zero type:mandatory default:0x0
+	0x0 No unit mask
+name:one type:mandatory default:0x1
+	0x1 No unit mask
+name:x41 type:mandatory default:0x41
+	0x41 No unit mask
+name:x4f type:mandatory default:0x4f
+	0x4f No unit mask
+#
\ No newline at end of file
diff -up oprofile-0.9.4/events/Makefile.am.orig oprofile-0.9.4/events/Makefile.am
--- oprofile-0.9.4/events/Makefile.am.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/events/Makefile.am	2009-04-23 17:13:18.000000000 -0400
@@ -13,6 +13,7 @@ event_files = \
 	i386/ppro/events i386/ppro/unit_masks \
 	i386/p6_mobile/events i386/p6_mobile/unit_masks \
 	i386/core/events i386/core/unit_masks \
+	i386/arch_perfmon/events i386/arch_perfmon/unit_masks \
 	ia64/ia64/events ia64/ia64/unit_masks \
 	ia64/itanium2/events ia64/itanium2/unit_masks \
 	ia64/itanium/events ia64/itanium/unit_masks \
diff -up oprofile-0.9.4/libop/op_cpu_type.c.orig oprofile-0.9.4/libop/op_cpu_type.c
--- oprofile-0.9.4/libop/op_cpu_type.c.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_cpu_type.c	2009-04-23 17:17:37.000000000 -0400
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "op_cpu_type.h"
+#include "op_hw_specific.h"
 
 struct cpu_descr {
 	char const * pretty;
@@ -74,6 +75,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
 	{ "e300", "ppc/e300", CPU_PPC_E300, 4 },
 	{ "AVR32", "avr32", CPU_AVR32, 3 },
+ 	{ "Intel Architectural Perfmon", "i386/arch_perfmon", CPU_ARCH_PERFMON, 0},
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
@@ -151,8 +153,14 @@ char const * op_get_cpu_name(op_cpu cpu_
 
 int op_get_nr_counters(op_cpu cpu_type)
 {
+	int cnt;
+
 	if (cpu_type <= CPU_NO_GOOD || cpu_type >= MAX_CPU_TYPE)
 		return 0;
 
+	cnt = arch_num_counters(cpu_type);
+	if (cnt >= 0)
+		return cnt;
+
 	return cpu_descrs[cpu_type].nr_counters;
 }
diff -up oprofile-0.9.4/libop/op_cpu_type.h.orig oprofile-0.9.4/libop/op_cpu_type.h
--- oprofile-0.9.4/libop/op_cpu_type.h.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_cpu_type.h	2009-04-23 17:17:07.000000000 -0400
@@ -72,6 +72,7 @@ typedef enum {
 	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
 	CPU_PPC_E300, /**< e300 */
 	CPU_AVR32, /**< AVR32 */
+ 	CPU_ARCH_PERFMON, /**< Intel architectural perfmon */
 	MAX_CPU_TYPE
 } op_cpu;
 
diff -up oprofile-0.9.4/libop/op_events.c.orig oprofile-0.9.4/libop/op_events.c
--- oprofile-0.9.4/libop/op_events.c.orig	2008-02-22 11:17:48.000000000 -0500
+++ oprofile-0.9.4/libop/op_events.c	2009-04-23 17:13:18.000000000 -0400
@@ -16,6 +16,7 @@
 #include "op_fileio.h"
 #include "op_string.h"
 #include "op_cpufreq.h"
+#include "op_hw_specific.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -27,6 +28,8 @@ static LIST_HEAD(um_list);
 static char const * filename;
 static unsigned int line_nr;
 
+static void delete_event(struct op_event * event);
+
 static void parse_error(char const * context)
 {
 	fprintf(stderr, "oprofile: parse error in %s, line %u\n",
@@ -329,7 +332,8 @@ static void read_events(char const * fil
 		seen_um = 0;
 		seen_minimum = 0;
 		event = new_event();
-
+		event->filter = -1;
+		
 		c = line;
 		while (next_token(&c, &name, &value)) {
 			if (strcmp(name, "name") == 0) {
@@ -351,7 +355,10 @@ static void read_events(char const * fil
 				if (seen_counters)
 					parse_error("duplicate counters: tag");
 				seen_counters = 1;
-				event->counter_mask = parse_counter_mask(value);
+				if (!strcmp(value, "cpuid"))
+					event->counter_mask = arch_get_counter_mask();
+				else
+					event->counter_mask = parse_counter_mask(value);
 				free(value);
 			} else if (strcmp(name, "um") == 0) {
 				if (seen_um)
@@ -368,6 +375,9 @@ static void read_events(char const * fil
 				free(value);
 			} else if (strcmp(name, "desc") == 0) {
 				event->desc = value;
+			} else if (strcmp(name, "filter") == 0) { 
+				event->filter = parse_int(value);
+				free(value);
 			} else {
 				parse_error("unknown tag");
 			}
@@ -423,6 +433,18 @@ static void check_unit_mask(struct op_un
 	}
 }
 
+static void arch_filter_events(op_cpu cpu_type)
+{
+	struct list_head * pos, * pos2;
+	unsigned filter = arch_get_filter(cpu_type);
+	if (!filter)
+		return;
+	list_for_each_safe (pos, pos2, &events_list) { 
+		struct op_event * event = list_entry(pos, struct op_event, event_next);
+		if (event->filter >= 0 && ((1U << event->filter) & filter))
+			delete_event(event);
+	}
+}
 
 static void load_events(op_cpu cpu_type)
 {
@@ -459,6 +481,8 @@ static void load_events(op_cpu cpu_type)
 	read_unit_masks(um_file);
 	read_events(event_file);
 
+	arch_filter_events(cpu_type);
+
 	/* sanity check: all unit mask must be used */
 	list_for_each(pos, &um_list) {
 		struct op_unit_mask * um = list_entry(pos, struct op_unit_mask, um_next);
@@ -471,10 +495,10 @@ static void load_events(op_cpu cpu_type)
 	free(event_dir);
 }
 
-
 struct list_head * op_events(op_cpu cpu_type)
 {
 	load_events(cpu_type);
+	arch_filter_events(cpu_type);
 	return &events_list;
 }
 
@@ -522,20 +546,24 @@ void op_free_events(void)
 }
 
 
-static struct op_event * find_event(u32 nr)
+static struct op_event * find_event_um(u32 nr, u32 um)
 {
 	struct list_head * pos;
+	unsigned int i;
 
 	list_for_each(pos, &events_list) {
 		struct op_event * event = list_entry(pos, struct op_event, event_next);
-		if (event->val == nr)
-			return event;
+		if (event->val == nr) { 
+			for (i = 0; i < event->unit->num; i++) { 
+				if (event->unit->um[i].value == um)
+					return event;		
+			} 
+		}
 	}
 
 	return NULL;
 }
 
-
 static FILE * open_event_mapping_file(char const * cpu_name) 
 {
 	char * ev_map_file;
@@ -687,13 +715,13 @@ struct op_event * find_event_by_name(cha
 }
 
 
-struct op_event * op_find_event(op_cpu cpu_type, u32 nr)
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr, u32 um)
 {
 	struct op_event * event;
 
 	load_events(cpu_type);
 
-	event = find_event(nr);
+	event = find_event_um(nr, um);
 
 	return event;
 }
@@ -701,38 +729,43 @@ struct op_event * op_find_event(op_cpu c
 
 int op_check_events(int ctr, u32 nr, u32 um, op_cpu cpu_type)
 {
-	int ret = OP_OK_EVENT;
-	struct op_event * event;
+	int ret = OP_INVALID_EVENT;
 	size_t i;
 	u32 ctr_mask = 1 << ctr;
+	struct list_head * pos;
 
 	load_events(cpu_type);
 
-	event = find_event(nr);
+	list_for_each(pos, &events_list) {
+		struct op_event * event = list_entry(pos, struct op_event, event_next);
+		if (event->val != nr)
+			continue;
 
-	if (!event) {
-		ret |= OP_INVALID_EVENT;
-		return ret;
-	}
+		ret = OP_OK_EVENT;
 
-	if ((event->counter_mask & ctr_mask) == 0)
-		ret |= OP_INVALID_COUNTER;
+		if ((event->counter_mask & ctr_mask) == 0)
+			ret |= OP_INVALID_COUNTER;
 
-	if (event->unit->unit_type_mask == utm_bitmask) {
-		for (i = 0; i < event->unit->num; ++i)
-			um &= ~(event->unit->um[i].value);			
-		
-		if (um)
-			ret |= OP_INVALID_UM;
+		if (event->unit->unit_type_mask == utm_bitmask) {
+			for (i = 0; i < event->unit->num; ++i)
+				um &= ~(event->unit->um[i].value);			
+			
+			if (um)
+				ret |= OP_INVALID_UM;
+			
+		} else {
+			for (i = 0; i < event->unit->num; ++i) {
+				if (event->unit->um[i].value == um)
+					break;
+			}
+			
+			if (i == event->unit->num)
+				ret |= OP_INVALID_UM;
 
-	} else {
-		for (i = 0; i < event->unit->num; ++i) {
-			if (event->unit->um[i].value == um)
-				break;
 		}
 
-		if (i == event->unit->num)
-			ret |= OP_INVALID_UM;
+		if (ret == OP_OK_EVENT)
+			return ret;
 	}
 
 	return ret;
@@ -759,6 +792,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_ATHLON:
 		case CPU_HAMMER:
 		case CPU_FAMILY10:
+		case CPU_ARCH_PERFMON:
 			descr->name = "CPU_CLK_UNHALTED";
 			break;
 
diff -up oprofile-0.9.4/libop/op_events.h.orig oprofile-0.9.4/libop/op_events.h
--- oprofile-0.9.4/libop/op_events.h.orig	2006-08-26 20:10:12.000000000 -0400
+++ oprofile-0.9.4/libop/op_events.h	2009-04-23 17:13:18.000000000 -0400
@@ -56,6 +56,7 @@ struct op_event {
 	char * name;		/**< the event name */
 	char * desc;      	/**< the event description */
 	int min_count;		/**< minimum counter value allowed */
+	int filter;		/**< architecture specific filter or -1 */
 	struct list_head event_next;   /**< next event in list */
 };
 
@@ -63,7 +64,7 @@ struct op_event {
 struct list_head * op_events(op_cpu cpu_type);
 
 /** Find a given event, returns NULL on error */
-struct op_event * op_find_event(op_cpu cpu_type, u32 nr);
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr, u32 um);
 
 /** Find a given event by name */
 struct op_event * find_event_by_name(char const * name);
diff -up /dev/null oprofile-0.9.4/libop/op_hw_specific.h
--- /dev/null	2009-04-23 08:48:07.645005892 -0400
+++ oprofile-0.9.4/libop/op_hw_specific.h	2009-04-23 17:13:18.000000000 -0400
@@ -0,0 +1,64 @@
+/* 
+ * @file architecture specific interfaces
+ * @remark Copyright 2008 Intel Corporation
+ * @remark Read the file COPYING
+ * @author Andi Kleen
+ */
+
+#if defined(__i386__) || defined(__x86_64__) 
+
+/* Assume we run on the same host as the profilee */
+
+#define num_to_mask(x) ((1U << (x)) - 1)
+
+static inline unsigned arch_get_filter(op_cpu cpu_type)
+{
+	if (cpu_type == CPU_ARCH_PERFMON) { 
+		unsigned ebx, eax;
+		asm("cpuid" : "=a" (eax), "=b" (ebx) : "0" (0xa) : "ecx","edx");
+		return ebx & num_to_mask(eax >> 24);
+	}
+	return 0;
+}
+
+static inline int arch_num_counters(op_cpu cpu_type) 
+{
+	if (cpu_type == CPU_ARCH_PERFMON) {
+		unsigned v;
+		asm("cpuid" : "=a" (v) : "0" (0xa) : "ebx","ecx","edx");
+		return (v >> 8) & 0xff;
+	} 
+	return -1;
+}
+
+static inline unsigned arch_get_counter_mask(void)
+{
+	unsigned v;
+	asm("cpuid" : "=a" (v) : "0" (0xa) : "ebx","ecx","edx");
+	return num_to_mask((v >> 8) & 0xff);	
+}
+
+#else
+
+static inline unsigned arch_get_filter(op_cpu cpu_type)
+{
+	/* Do something with passed arg to shut up the compiler warning */
+	if (cpu_type != CPU_NO_GOOD)
+		return 0;
+	return 0;
+}
+
+static inline int arch_num_counters(op_cpu cpu_type) 
+{
+	/* Do something with passed arg to shut up the compiler warning */
+	if (cpu_type != CPU_NO_GOOD)
+		return -1;
+	return -1;
+}
+
+static inline unsigned arch_get_counter_mask(void)
+{
+	return 0;
+}
+
+#endif
diff -up oprofile-0.9.4/libpp/op_header.cpp.orig oprofile-0.9.4/libpp/op_header.cpp
--- oprofile-0.9.4/libpp/op_header.cpp.orig	2008-04-29 08:07:46.000000000 -0400
+++ oprofile-0.9.4/libpp/op_header.cpp	2009-04-23 17:13:18.000000000 -0400
@@ -165,7 +165,7 @@ string const op_print_event(op_cpu cpu_t
 		return str;
 	}
 
-	struct op_event * event = op_find_event(cpu_type, type);
+	struct op_event * event = op_find_event(cpu_type, type, um);
 
 	if (!event) {
 		cerr << "Could not locate event " << int(type) << endl;
@@ -205,7 +205,7 @@ string const op_xml_print_event(op_cpu c
 	if (cpu_type == CPU_TIMER_INT || cpu_type == CPU_RTC)
 		return xml_utils::get_timer_setup((size_t)count);
 
-	struct op_event * event = op_find_event(cpu_type, type);
+	struct op_event * event = op_find_event(cpu_type, type, um);
 	if (!event) {
 		cerr << "Could not locate event " << int(type) << endl;
 		return "";
diff -up oprofile-0.9.4/utils/ophelp.c.orig oprofile-0.9.4/utils/ophelp.c
--- oprofile-0.9.4/utils/ophelp.c.orig	2008-02-22 11:17:49.000000000 -0500
+++ oprofile-0.9.4/utils/ophelp.c	2009-04-23 17:13:19.000000000 -0400
@@ -401,6 +401,13 @@ int main(int argc, char const * argv[])
 		printf("See Intel Architecture Developer's Manual Volume 3, Appendix A and\n"
 		"Intel Architecture Optimization Reference Manual (730795-001)\n\n");
 		break;
+
+	case CPU_ARCH_PERFMON:
+		printf("See Intel 64 and IA-32 Architectures Software Developer's Manual\n"
+		"Volume 3B (Document 253669) Chapter 18 for architectural perfmon events\n"
+		"This is a limited set of fallback events because oprofile doesn't know your CPU\n");
+		break;
+	
 	case CPU_IA64:
 	case CPU_IA64_1:
 	case CPU_IA64_2:


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- oprofile.spec	9 Apr 2009 15:11:52 -0000	1.73
+++ oprofile.spec	24 Apr 2009 01:39:42 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -15,6 +15,7 @@
 Patch83: oprofile-0.9.3-xen.patch
 #Patch100: oprofile-gcc43.patch
 Patch101: oprofile-basename.patch
+Patch102: oprofile-iaperf.patch
 URL: http://oprofile.sf.net
 
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
@@ -84,6 +85,7 @@
 %patch83 -p1 -b .xen
 #%patch100 -p1 -b .gcc43
 %patch101 -p1 -b .basename
+%patch102 -p1 -b .iaperf
 
 ./autogen.sh
 
@@ -225,6 +227,9 @@
 /etc/ld.so.conf.d/*
 
 %changelog
+* Thu Apr 23 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-7
+- Backport Intel Architecture Perfmon support. Resolves: rhbz #497230
+
 * Wed Apr 9 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-6
 - Rebuild to get corrected <bfd.h>. (BZ 467651)
 



From kkofler at fedoraproject.org  Fri Apr 24 01:45:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 24 Apr 2009 01:45:45 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec, 1.421,
	1.422 kdelibs-4.2.2-popupapplet-config.patch, 1.1,
	NONE kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.3, NONE
Message-ID: <20090424014545.5C1E970106@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24668/F-10

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
  does not work as expected for Plasma


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- kdelibs.spec	23 Apr 2009 22:50:28 -0000	1.421
+++ kdelibs.spec	24 Apr 2009 01:45:14 -0000	1.422
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,10 +95,6 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-config.patch
-# kconf_update script for Patch201
-Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -244,8 +240,6 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
-%patch201 -p0 -b .popupapplet-config
-%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,6 +422,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
+- drop the PopupApplet configuration backports (#495998) for now, kconf_update
+  does not work as expected for Plasma
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
 


--- kdelibs-4.2.2-popupapplet-config.patch DELETED ---


--- kdelibs-4.2.2-popupapplet-kconf_update.patch DELETED ---



From kkofler at fedoraproject.org  Fri Apr 24 01:45:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 24 Apr 2009 01:45:45 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs.spec, 1.472,
	1.473 kdelibs-4.2.2-popupapplet-config.patch, 1.1,
	NONE kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.3, NONE
Message-ID: <20090424014545.8E14670106@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24668/F-11

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
  does not work as expected for Plasma


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- kdelibs.spec	23 Apr 2009 22:50:29 -0000	1.472
+++ kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.473
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,10 +95,6 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-config.patch
-# kconf_update script for Patch201
-Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -244,8 +240,6 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
-%patch201 -p0 -b .popupapplet-config
-%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,6 +422,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
+- drop the PopupApplet configuration backports (#495998) for now, kconf_update
+  does not work as expected for Plasma
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
 


--- kdelibs-4.2.2-popupapplet-config.patch DELETED ---


--- kdelibs-4.2.2-popupapplet-kconf_update.patch DELETED ---



From kkofler at fedoraproject.org  Fri Apr 24 01:45:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 24 Apr 2009 01:45:46 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.472,
	1.473 kdelibs-4.2.2-popupapplet-config.patch, 1.1,
	NONE kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.3, NONE
Message-ID: <20090424014546.3301A70106@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24668/devel

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
  does not work as expected for Plasma


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- kdelibs.spec	23 Apr 2009 22:50:30 -0000	1.472
+++ kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.473
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,10 +95,6 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-config.patch
-# kconf_update script for Patch201
-Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -244,8 +240,6 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
-%patch201 -p0 -b .popupapplet-config
-%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,6 +422,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
+- drop the PopupApplet configuration backports (#495998) for now, kconf_update
+  does not work as expected for Plasma
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
 


--- kdelibs-4.2.2-popupapplet-config.patch DELETED ---


--- kdelibs-4.2.2-popupapplet-kconf_update.patch DELETED ---



From kkofler at fedoraproject.org  Fri Apr 24 01:45:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 24 Apr 2009 01:45:45 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec, 1.396,
	1.397 kdelibs-4.2.2-popupapplet-config.patch, 1.1,
	NONE kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.3, NONE
Message-ID: <20090424014545.E90F370106@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24668/F-9

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
  does not work as expected for Plasma


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- kdelibs.spec	23 Apr 2009 22:50:29 -0000	1.396
+++ kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.397
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,10 +95,6 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-config.patch
-# kconf_update script for Patch201
-Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -244,8 +240,6 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
-%patch201 -p0 -b .popupapplet-config
-%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,6 +422,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
+- drop the PopupApplet configuration backports (#495998) for now, kconf_update
+  does not work as expected for Plasma
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
 


--- kdelibs-4.2.2-popupapplet-config.patch DELETED ---


--- kdelibs-4.2.2-popupapplet-kconf_update.patch DELETED ---



From seanf at fedoraproject.org  Fri Apr 24 02:24:50 2009
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Fri, 24 Apr 2009 02:24:50 +0000 (UTC)
Subject: rpms/eclipse-nls/F-11 .cvsignore, 1.2, 1.3 eclipse-nls.spec, 1.2,
	1.3 sources, 1.2, 1.3 fetch-babel.sh, 1.1, NONE
Message-ID: <20090424022450.2084A70106@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31580

Modified Files:
	.cvsignore eclipse-nls.spec sources 
Removed Files:
	fetch-babel.sh 
Log Message:
- Backported from rawhide spec (3.5.0.v20090417091040-1), changed filenames
 to suit older langpacks
- Updated to use Babel's zipped langpacks instead of fetch-babel.sh
- Changed versioning scheme to match changes in upstream versioning




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 03:22:38 -0000	1.2
+++ .cvsignore	24 Apr 2009 02:24:19 -0000	1.3
@@ -1 +1 @@
-org.eclipse.nls-20080807snap-fetched-src.tar.bz2
+BabelLanguagePack-3.4.0.v20081026043401.tar.bz2


Index: eclipse-nls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-11/eclipse-nls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-nls.spec	24 Feb 2009 13:49:30 -0000	1.2
+++ eclipse-nls.spec	24 Apr 2009 02:24:19 -0000	1.3
@@ -1,4 +1,3 @@
-%define snapshot 20080807snap
 %define eclipse_data %{_datadir}/eclipse
 # Disable repacking of jars, since it takes forever for all the little jars, 
 # and we don't need multilib anyway:
@@ -6,21 +5,14 @@
 
 Name: eclipse-nls 
 Summary: Babel language packs for the Eclipse platform and various plugins
-Group: Development/Languages
+Group: Text Editors/Integrated Development Environments (IDE)
 License: EPL
 URL: http://babel.eclipse.org/
 
-Version: 0.2.0
-Release: 0.6.%{snapshot}%{?dist}
-## The source for this package is taken from the Babel project's update site.
-## Use the following commands to generate the tarball:
-# sudo yum install eclipse-platform curl
-# mkdir temp && cd temp
-# sh ../fetch-babel.sh
-# tar cjf ../org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2 eclipse-nls
-# cd ..
-Source0: org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2
-Source1: fetch-babel.sh
+Version: 3.4.0.v20081026043401
+Release: 1%{?dist}
+## The source for this package is taken from http://download.eclipse.org/technology/babel/babel_language_packs/
+Source0: BabelLanguagePack-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
@@ -30,14 +22,13 @@
 
 %define lang_meta_pkg() \
 %package %1 \
-Summary:    Eclipse/Babel language pack for %2 \
-Group:      Development/Languages \
-# provides %{eclipse_data}/dropins \
+Summary:    Eclipse/Babel language pack for %3 \
+Group:      Text Editors/Integrated Development Environments (IDE) \
 Requires:   eclipse-platform >= 3.4.0-18 \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
 \
 %description %1 \
-This language pack for %2 contains user-contributed translations of the \
+This language pack for %3 contains user-contributed translations of the \
 strings in all Eclipse projects. Please see the http://babel.eclipse.org/ \
 Babel project web pages for a full how-to-use explanation of these \
 translations as well as how you can contribute to \
@@ -47,71 +38,89 @@
 \
 %files %1 \
 %defattr(-,root,root,-) \
-%{eclipse_data}/dropins/babel-%1
-
-# Note that no licence %%doc files are listed under %%files.  Upstream does 
-# not provide a single distribution archive for eclipse-nls, but rather an 
-# update site which serves up 400 plugin jars for each language.  These 
-# jars are collected into a tarball by fetch-babel.sh.  Each jar does 
-# include HTML files with licence information, and these jars are placed 
-# in the dropins/babel-* directory above.
-
-%lang_meta_pkg cs Czech
-%lang_meta_pkg hu Hungarian
-%lang_meta_pkg pl Polish
-%lang_meta_pkg ru Russian
-%lang_meta_pkg ar Arabic
+%dir %{eclipse_data}/dropins/babel \
+%dir %{eclipse_data}/dropins/babel/eclipse \
+%dir %{eclipse_data}/dropins/babel/eclipse/features \
+%{eclipse_data}/dropins/babel/eclipse/features/*.nl-%{2}_%{version} \
+%dir %{eclipse_data}/dropins/babel/eclipse/plugins \
+%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl-%{2}_%{version}.jar
+
+
+# Note that no licence %%doc files are listed under %%files.  Upstream 
+# does not provide a single distribution archive for eclipse-nls, but 
+# rather a collection of 700 zips, one per module/language combination, 
+# containing multiple plugin jars.  Each jar does include HTML files 
+# with licence information, and these jars are placed in the 
+# dropins/babel/eclipse/plugins directory above.
+
+%lang_meta_pkg ar ar Arabic
+%lang_meta_pkg bg bg Bulgarian
+%lang_meta_pkg zh zh "Chinese (Simplified)"
+%lang_meta_pkg zh_TW zh_TW "Chinese (Traditional)"
+%lang_meta_pkg cs cs Czech
+%lang_meta_pkg da da Danish
+%lang_meta_pkg nl nl Dutch
+#% lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg fi fi Finnish
+%lang_meta_pkg fr fr French
+%lang_meta_pkg de de German
+%lang_meta_pkg el el Greek
 # NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
-%lang_meta_pkg he Hebrew
-%lang_meta_pkg da Danish
-%lang_meta_pkg de German
-%lang_meta_pkg el Greek
-%lang_meta_pkg es Spanish
-%lang_meta_pkg fi Finnish
-%lang_meta_pkg fr French
-%lang_meta_pkg it Italian
-%lang_meta_pkg ja Japanese
-%lang_meta_pkg ko Korean
-%lang_meta_pkg nl Dutch
-%lang_meta_pkg no Norwegian
-%lang_meta_pkg pt Portuguese
-%lang_meta_pkg pt_BR Portuguese (Brazilian)
-%lang_meta_pkg sv Swedish
-%lang_meta_pkg tr Turkish
-%lang_meta_pkg zh Chinese (Simplified)
-%lang_meta_pkg zh_TW Chinese (Traditional)
-##########################################
-# Currently less than 10% coverage
-%lang_meta_pkg uk Ukrainian
-%lang_meta_pkg ro Romanian
-%lang_meta_pkg bg Bulgarian
-##########################################
-##########################################
-# Currently 0% coverage
-#Hindi
-#Klingon
-#Spanish-Catalonian
-#English
-##########################################
+# similarly, yi -> ji, id -> in
+%lang_meta_pkg he iw Hebrew
+#% lang_meta_pkg hi hi Hindi
+%lang_meta_pkg hu hu Hungarian
+%lang_meta_pkg it it Italian
+%lang_meta_pkg ja ja Japanese
+# tl should be Tagalog.  Klingon has < 1% coverage at present in Babel.  Tagalog is unsupported.
+#% lang_meta_pkg tlh tl Klingon
+%lang_meta_pkg ko ko Korean
+#% lang_meta_pkg mn mn Mongolian
+%lang_meta_pkg no no Norwegian
+%lang_meta_pkg pl pl Polish
+%lang_meta_pkg pt pt Portuguese
+%lang_meta_pkg pt_BR pt_BR "Portuguese (Brazilian)"
+%lang_meta_pkg ro ro Romanian
+%lang_meta_pkg ru ru Russian
+%lang_meta_pkg es es Spanish
+%lang_meta_pkg sv sv Swedish
+%lang_meta_pkg tr tr Turkish
+%lang_meta_pkg uk uk Ukrainian
+%lang_meta_pkg en_AA en_AA "Pseudo Translations"
 
 %prep
+# extract langpack zips from tarball
 %setup -q -n %{name}
+# remove unsupported langpacks (currently Klingon)
+unsupported="tl"
+for locale in $unsupported; do
+   rm Babel*-${locale}_%{version}.zip
+done
+# extract remaining zips - to eclipse/{features,plugins}
+for f in Babel*.zip; do
+   unzip -qq $f
+   rm $f
+done
 
 %build
-# nothing to do
+# nothing to build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for loc in ?? ??_??; do
-   mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
-   cp -R ${loc}/features ${loc}/plugins $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
-done
+mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
+cp -a eclipse $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Apr 24 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20081026043401
+- Backported from rawhide spec (3.5.0.v20090417091040-1), changed filenames
+ to suit older langpacks
+- Updated to use Babel's zipped langpacks instead of fetch-babel.sh
+- Changed versioning scheme to match changes in upstream versioning
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-0.6.20080807snap
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 03:22:38 -0000	1.2
+++ sources	24 Apr 2009 02:24:19 -0000	1.3
@@ -1 +1 @@
-14c51fc450752ce281c3e8d067b268b2  org.eclipse.nls-20080807snap-fetched-src.tar.bz2
+749455df33da1718530c66796249b7f5  BabelLanguagePack-3.4.0.v20081026043401.tar.bz2


--- fetch-babel.sh DELETED ---



From seanf at fedoraproject.org  Fri Apr 24 03:00:31 2009
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Fri, 24 Apr 2009 03:00:31 +0000 (UTC)
Subject: rpms/eclipse-nls/F-10 .cvsignore, 1.2, 1.3 eclipse-nls.spec, 1.1,
	1.2 sources, 1.2, 1.3 fetch-babel.sh, 1.1, NONE
Message-ID: <20090424030031.3772170106@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4732

Modified Files:
	.cvsignore eclipse-nls.spec sources 
Removed Files:
	fetch-babel.sh 
Log Message:
- Backported from rawhide spec (3.5.0.v20090417091040-1), changed filenames
 to suit older langpacks
- Updated to use Babel's zipped langpacks instead of fetch-babel.sh
- Changed versioning scheme to match changes in upstream versioning



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 03:22:38 -0000	1.2
+++ .cvsignore	24 Apr 2009 03:00:00 -0000	1.3
@@ -1 +1 @@
-org.eclipse.nls-20080807snap-fetched-src.tar.bz2
+BabelLanguagePack-3.4.0.v20081026043401.tar.bz2


Index: eclipse-nls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-10/eclipse-nls.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-nls.spec	11 Sep 2008 03:22:38 -0000	1.1
+++ eclipse-nls.spec	24 Apr 2009 03:00:00 -0000	1.2
@@ -1,4 +1,3 @@
-%define snapshot 20080807snap
 %define eclipse_data %{_datadir}/eclipse
 # Disable repacking of jars, since it takes forever for all the little jars, 
 # and we don't need multilib anyway:
@@ -6,21 +5,14 @@
 
 Name: eclipse-nls 
 Summary: Babel language packs for the Eclipse platform and various plugins
-Group: Development/Languages
+Group: Text Editors/Integrated Development Environments (IDE)
 License: EPL
 URL: http://babel.eclipse.org/
 
-Version: 0.2.0
-Release: 0.5.%{snapshot}%{?dist}
-## The source for this package is taken from the Babel project's update site.
-## Use the following commands to generate the tarball:
-# sudo yum install eclipse-platform curl
-# mkdir temp && cd temp
-# sh ../fetch-babel.sh
-# tar cjf ../org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2 eclipse-nls
-# cd ..
-Source0: org.eclipse.nls-%{snapshot}-fetched-src.tar.bz2
-Source1: fetch-babel.sh
+Version: 3.4.0.v20081026043401
+Release: 1%{?dist}
+## The source for this package is taken from http://download.eclipse.org/technology/babel/babel_language_packs/
+Source0: BabelLanguagePack-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
@@ -30,14 +22,13 @@
 
 %define lang_meta_pkg() \
 %package %1 \
-Summary:    Eclipse/Babel language pack for %2 \
-Group:      Development/Languages \
-# provides %{eclipse_data}/dropins \
+Summary:    Eclipse/Babel language pack for %3 \
+Group:      Text Editors/Integrated Development Environments (IDE) \
 Requires:   eclipse-platform >= 3.4.0-18 \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
 \
 %description %1 \
-This language pack for %2 contains user-contributed translations of the \
+This language pack for %3 contains user-contributed translations of the \
 strings in all Eclipse projects. Please see the http://babel.eclipse.org/ \
 Babel project web pages for a full how-to-use explanation of these \
 translations as well as how you can contribute to \
@@ -47,71 +38,92 @@
 \
 %files %1 \
 %defattr(-,root,root,-) \
-%{eclipse_data}/dropins/babel-%1
-
-# Note that no licence %%doc files are listed under %%files.  Upstream does 
-# not provide a single distribution archive for eclipse-nls, but rather an 
-# update site which serves up 400 plugin jars for each language.  These 
-# jars are collected into a tarball by fetch-babel.sh.  Each jar does 
-# include HTML files with licence information, and these jars are placed 
-# in the dropins/babel-* directory above.
-
-%lang_meta_pkg cs Czech
-%lang_meta_pkg hu Hungarian
-%lang_meta_pkg pl Polish
-%lang_meta_pkg ru Russian
-%lang_meta_pkg ar Arabic
+%dir %{eclipse_data}/dropins/babel \
+%dir %{eclipse_data}/dropins/babel/eclipse \
+%dir %{eclipse_data}/dropins/babel/eclipse/features \
+%{eclipse_data}/dropins/babel/eclipse/features/*.nl-%{2}_%{version} \
+%dir %{eclipse_data}/dropins/babel/eclipse/plugins \
+%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl-%{2}_%{version}.jar
+
+
+# Note that no licence %%doc files are listed under %%files.  Upstream 
+# does not provide a single distribution archive for eclipse-nls, but 
+# rather a collection of 700 zips, one per module/language combination, 
+# containing multiple plugin jars.  Each jar does include HTML files 
+# with licence information, and these jars are placed in the 
+# dropins/babel/eclipse/plugins directory above.
+
+%lang_meta_pkg ar ar Arabic
+%lang_meta_pkg bg bg Bulgarian
+%lang_meta_pkg zh zh "Chinese (Simplified)"
+%lang_meta_pkg zh_TW zh_TW "Chinese (Traditional)"
+%lang_meta_pkg cs cs Czech
+%lang_meta_pkg da da Danish
+%lang_meta_pkg nl nl Dutch
+#% lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg fi fi Finnish
+%lang_meta_pkg fr fr French
+%lang_meta_pkg de de German
+%lang_meta_pkg el el Greek
 # NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
-%lang_meta_pkg he Hebrew
-%lang_meta_pkg da Danish
-%lang_meta_pkg de German
-%lang_meta_pkg el Greek
-%lang_meta_pkg es Spanish
-%lang_meta_pkg fi Finnish
-%lang_meta_pkg fr French
-%lang_meta_pkg it Italian
-%lang_meta_pkg ja Japanese
-%lang_meta_pkg ko Korean
-%lang_meta_pkg nl Dutch
-%lang_meta_pkg no Norwegian
-%lang_meta_pkg pt Portuguese
-%lang_meta_pkg pt_BR Portuguese (Brazilian)
-%lang_meta_pkg sv Swedish
-%lang_meta_pkg tr Turkish
-%lang_meta_pkg zh Chinese (Simplified)
-%lang_meta_pkg zh_TW Chinese (Traditional)
-##########################################
-# Currently less than 10% coverage
-%lang_meta_pkg uk Ukrainian
-%lang_meta_pkg ro Romanian
-%lang_meta_pkg bg Bulgarian
-##########################################
-##########################################
-# Currently 0% coverage
-#Hindi
-#Klingon
-#Spanish-Catalonian
-#English
-##########################################
+# similarly, yi -> ji, id -> in
+%lang_meta_pkg he iw Hebrew
+#% lang_meta_pkg hi hi Hindi
+%lang_meta_pkg hu hu Hungarian
+%lang_meta_pkg it it Italian
+%lang_meta_pkg ja ja Japanese
+# tl should be Tagalog.  Klingon has < 1% coverage at present in Babel.  Tagalog is unsupported.
+#% lang_meta_pkg tlh tl Klingon
+%lang_meta_pkg ko ko Korean
+#% lang_meta_pkg mn mn Mongolian
+%lang_meta_pkg no no Norwegian
+%lang_meta_pkg pl pl Polish
+%lang_meta_pkg pt pt Portuguese
+%lang_meta_pkg pt_BR pt_BR "Portuguese (Brazilian)"
+%lang_meta_pkg ro ro Romanian
+%lang_meta_pkg ru ru Russian
+%lang_meta_pkg es es Spanish
+%lang_meta_pkg sv sv Swedish
+%lang_meta_pkg tr tr Turkish
+%lang_meta_pkg uk uk Ukrainian
+%lang_meta_pkg en_AA en_AA "Pseudo Translations"
 
 %prep
+# extract langpack zips from tarball
 %setup -q -n %{name}
+# remove unsupported langpacks (currently Klingon)
+unsupported="tl"
+for locale in $unsupported; do
+   rm Babel*-${locale}_%{version}.zip
+done
+# extract remaining zips - to eclipse/{features,plugins}
+for f in Babel*.zip; do
+   unzip -qq $f
+   rm $f
+done
 
 %build
-# nothing to do
+# nothing to build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for loc in ?? ??_??; do
-   mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
-   cp -R ${loc}/features ${loc}/plugins $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel-${loc}/eclipse
-done
+mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
+cp -a eclipse $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Apr 24 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20081026043401
+- Backported from rawhide spec (3.5.0.v20090417091040-1), changed filenames
+ to suit older langpacks
+- Updated to use Babel's zipped langpacks instead of fetch-babel.sh
+- Changed versioning scheme to match changes in upstream versioning
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-0.6.20080807snap
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Sep 11 2008 Sean Flanigan <sflaniga at redhat.com> - 0.2.0-0.5.20080807snap
 - Applied another tidy-up patch from Jens Petersen and added a comment
  about the licence doc files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 03:22:38 -0000	1.2
+++ sources	24 Apr 2009 03:00:00 -0000	1.3
@@ -1 +1 @@
-14c51fc450752ce281c3e8d067b268b2  org.eclipse.nls-20080807snap-fetched-src.tar.bz2
+749455df33da1718530c66796249b7f5  BabelLanguagePack-3.4.0.v20081026043401.tar.bz2


--- fetch-babel.sh DELETED ---



From dwalsh at fedoraproject.org  Fri Apr 24 03:14:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 03:14:58 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.100,
	1.101 selinux-policy.spec, 1.835, 1.836
Message-ID: <20090424031458.5D7AD70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7301

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
- Additional perms for readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- policy-20090105.patch	23 Apr 2009 14:47:07 -0000	1.100
+++ policy-20090105.patch	24 Apr 2009 03:14:57 -0000	1.101
@@ -770,12 +770,41 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.6.12/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-23 10:30:56.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-23 17:15:49.000000000 -0400
 @@ -1,3 +1,4 @@
  /etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
  
- /usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
-+/sbin/readahead		--	gen_context(system_u:object_r:readahead_exec_t,s0)
+-/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++/usr/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-23 17:21:40.000000000 -0400
+@@ -24,7 +24,7 @@
+ 
+ allow readahead_t self:capability { fowner dac_override dac_read_search };
+ dontaudit readahead_t self:capability sys_tty_config;
+-allow readahead_t self:process signal_perms;
++allow readahead_t self:process { setsched signal_perms };
+ 
+ manage_files_pattern(readahead_t, readahead_etc_rw_t, readahead_etc_rw_t)
+ 
+@@ -58,6 +58,7 @@
+ fs_dontaudit_search_ramfs(readahead_t)
+ fs_dontaudit_read_ramfs_pipes(readahead_t)
+ fs_dontaudit_read_ramfs_files(readahead_t)
++fs_dontaudit_use_tmpfs_chr_dev(readahead_t)
+ fs_read_tmpfs_symlinks(readahead_t)
+ fs_list_inotifyfs(readahead_t)
+ 
+@@ -72,6 +73,7 @@
+ init_getattr_initctl(readahead_t)
+ 
+ logging_send_syslog_msg(readahead_t)
++logging_send_audit_msgs(readahead_t)
+ logging_dontaudit_search_audit_config(readahead_t)
+ 
+ miscfiles_read_localization(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.12/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-08-07 11:15:13.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-04-23 09:44:57.000000000 -0400
@@ -5693,7 +5722,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-03-04 16:49:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-23 17:21:31.000000000 -0400
 @@ -723,6 +723,24 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- selinux-policy.spec	23 Apr 2009 14:47:08 -0000	1.835
+++ selinux-policy.spec	24 Apr 2009 03:14:57 -0000	1.836
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -213,8 +213,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs n y allow
-%installCmds targeted mcs n y allow
+%setupCmds targeted mcs y y allow
+%installCmds targeted mcs y y allow
 %endif
 
 %if %{BUILD_MINIMUM}
@@ -237,7 +237,7 @@
 %installCmds olpc mcs n y allow
 %endif
 
-make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 $RPM_SOURCE_DIR/policygentool %{buildroot}%{_usr}/share/selinux/devel/
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
+- Additional perms for readahead
+
 * Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-14
 - Allow pulseaudio to acquire_svc on session bus
 - Fix readahead labeling



From dwalsh at fedoraproject.org  Fri Apr 24 03:16:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 03:16:45 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.93,
	1.94 selinux-policy.spec, 1.830, 1.831
Message-ID: <20090424031645.71AEE70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7814

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
- Additional perms for readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- policy-20090105.patch	23 Apr 2009 14:48:46 -0000	1.93
+++ policy-20090105.patch	24 Apr 2009 03:16:44 -0000	1.94
@@ -770,12 +770,41 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.6.12/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-23 10:30:56.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-23 17:15:49.000000000 -0400
 @@ -1,3 +1,4 @@
  /etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
  
- /usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
-+/sbin/readahead		--	gen_context(system_u:object_r:readahead_exec_t,s0)
+-/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++/usr/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-23 17:21:40.000000000 -0400
+@@ -24,7 +24,7 @@
+ 
+ allow readahead_t self:capability { fowner dac_override dac_read_search };
+ dontaudit readahead_t self:capability sys_tty_config;
+-allow readahead_t self:process signal_perms;
++allow readahead_t self:process { setsched signal_perms };
+ 
+ manage_files_pattern(readahead_t, readahead_etc_rw_t, readahead_etc_rw_t)
+ 
+@@ -58,6 +58,7 @@
+ fs_dontaudit_search_ramfs(readahead_t)
+ fs_dontaudit_read_ramfs_pipes(readahead_t)
+ fs_dontaudit_read_ramfs_files(readahead_t)
++fs_dontaudit_use_tmpfs_chr_dev(readahead_t)
+ fs_read_tmpfs_symlinks(readahead_t)
+ fs_list_inotifyfs(readahead_t)
+ 
+@@ -72,6 +73,7 @@
+ init_getattr_initctl(readahead_t)
+ 
+ logging_send_syslog_msg(readahead_t)
++logging_send_audit_msgs(readahead_t)
+ logging_dontaudit_search_audit_config(readahead_t)
+ 
+ miscfiles_read_localization(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.12/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-08-07 11:15:13.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/admin/rpm.fc	2009-04-23 09:44:57.000000000 -0400
@@ -5693,7 +5722,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-03-04 16:49:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/filesystem.if	2009-04-23 17:21:31.000000000 -0400
 @@ -723,6 +723,24 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- selinux-policy.spec	23 Apr 2009 14:48:46 -0000	1.830
+++ selinux-policy.spec	24 Apr 2009 03:16:44 -0000	1.831
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -213,8 +213,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs n y allow
-%installCmds targeted mcs n y allow
+%setupCmds targeted mcs y y allow
+%installCmds targeted mcs y y allow
 %endif
 
 %if %{BUILD_MINIMUM}
@@ -237,7 +237,7 @@
 %installCmds olpc mcs n y allow
 %endif
 
-make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 $RPM_SOURCE_DIR/policygentool %{buildroot}%{_usr}/share/selinux/devel/
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
+- Additional perms for readahead
+
 * Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-14
 - Allow pulseaudio to acquire_svc on session bus
 - Fix readahead labeling



From cebbert at fedoraproject.org  Fri Apr 24 03:31:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 24 Apr 2009 03:31:02 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-kjournald-use-rt-io-priority.patch, 1.1, 
	1.2
Message-ID: <20090424033102.8F1CE70106@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10594

Modified Files:
	linux-2.6-kjournald-use-rt-io-priority.patch 
Log Message:
dont use real-time priority for kjournald

linux-2.6-kjournald-use-rt-io-priority.patch:

Index: linux-2.6-kjournald-use-rt-io-priority.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-kjournald-use-rt-io-priority.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-kjournald-use-rt-io-priority.patch	28 Mar 2009 01:38:24 -0000	1.1
+++ linux-2.6-kjournald-use-rt-io-priority.patch	24 Apr 2009 03:30:31 -0000	1.2
@@ -20,9 +20,10 @@
 this priority inversion behavior. With this patch, the latencies for atime
 updates (and similar operation) go down by a factor of 3x to 4x !
 
-[cebbert: changed to lowest real-time priority, fix up for 2.6.29]
+[cebbert: changed to highest normal priority, fix up for 2.6.29]
 
 Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
 ---
  fs/jbd/journal.c       |   12 ++++++++++++
  1 files changed, 12 insertions(+), 0 deletions(-)
@@ -45,12 +46,12 @@
 +	 * kjournald is the process on which most other processes depend on
 +	 * for doing the filesystem portion of their IO. As such, there exists
 +	 * the equivalent of a priority inversion situation, where kjournald
-+	 * would get less priority as it should.
++	 * would get less priority than it should.
 +	 *
-+	 * For this reason we set to "lowest real time priority", which is higher
-+	 * than regular tasks, but not infinitely powerful.
++	 * For this reason we set to "highest normal priority", which is higher
++	 * than regular tasks, but not real-time.
 +	 */
-+	set_task_ioprio(current, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_RT, 7));
++	set_task_ioprio(current, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 0));
 +
 +	/*
  	 * And now, wait forever for commit wakeup events.



From cebbert at fedoraproject.org  Fri Apr 24 03:54:48 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 24 Apr 2009 03:54:48 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-kjournald-use-rt-io-priority.patch, 1.2, 
	1.3
Message-ID: <20090424035448.A4FF170106@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13711

Modified Files:
	linux-2.6-kjournald-use-rt-io-priority.patch 
Log Message:
use the same journal priority for ext3 as ext4 does in 2.6.30

linux-2.6-kjournald-use-rt-io-priority.patch:

Index: linux-2.6-kjournald-use-rt-io-priority.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-kjournald-use-rt-io-priority.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-kjournald-use-rt-io-priority.patch	24 Apr 2009 03:30:31 -0000	1.2
+++ linux-2.6-kjournald-use-rt-io-priority.patch	24 Apr 2009 03:54:48 -0000	1.3
@@ -48,10 +48,10 @@
 +	 * the equivalent of a priority inversion situation, where kjournald
 +	 * would get less priority than it should.
 +	 *
-+	 * For this reason we set to "highest normal priority", which is higher
-+	 * than regular tasks, but not real-time.
++	 * For this reason we set to one step higher than normal priority:
++	 * higher than the default for regular tasks, but not real-time.
 +	 */
-+	set_task_ioprio(current, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 0));
++	set_task_ioprio(current, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3));
 +
 +	/*
  	 * And now, wait forever for commit wakeup events.



From cebbert at fedoraproject.org  Fri Apr 24 03:58:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 24 Apr 2009 03:58:35 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-defaults-saner-vm-settings.patch, 1.1,
	1.2
Message-ID: <20090424035835.61ED670106@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14020

Modified Files:
	linux-2.6-defaults-saner-vm-settings.patch 
Log Message:
be more conservative with vm changes

linux-2.6-defaults-saner-vm-settings.patch:

Index: linux-2.6-defaults-saner-vm-settings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-defaults-saner-vm-settings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-saner-vm-settings.patch	24 Mar 2009 03:15:26 -0000	1.1
+++ linux-2.6-defaults-saner-vm-settings.patch	24 Apr 2009 03:58:35 -0000	1.2
@@ -1,7 +1,7 @@
 Raise default dirty data limits, per:
 http://marc.info/?l=linux-kernel&m=123707714231039&w=2
 
-Also lower default swappiness from 60 to 30.
+Also lower default swappiness from 60 to 40.
 
 --- my-2.6.29-rc8-git4.orig/mm/page-writeback.c
 +++ my-2.6.29-rc8-git4/mm/page-writeback.c
@@ -10,7 +10,7 @@
   * Start background writeback (via pdflush) at this percentage
   */
 -int dirty_background_ratio = 5;
-+int dirty_background_ratio = 10;
++int dirty_background_ratio = 7;
  
  /*
   * dirty_background_bytes starts at 0 (disabled) so that it is a function of
@@ -19,7 +19,7 @@
   * The generator of dirty data starts writeback at this percentage
   */
 -int vm_dirty_ratio = 10;
-+int vm_dirty_ratio = 20;
++int vm_dirty_ratio = 15;
  
  /*
   * vm_dirty_bytes starts at 0 (disabled) so that it is a function of
@@ -30,7 +30,7 @@
   * From 0 .. 100.  Higher means more swappy.
   */
 -int vm_swappiness = 60;
-+int vm_swappiness = 30;
++int vm_swappiness = 40;
  long vm_total_pages;	/* The total number of pages which the VM controls */
  
  static LIST_HEAD(shrinker_list);



From dwalsh at fedoraproject.org  Fri Apr 24 04:09:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 04:09:16 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.101,
	1.102 selinux-policy.spec, 1.836, 1.837
Message-ID: <20090424040916.B5C6A70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14992

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
- Additional perms for readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- policy-20090105.patch	24 Apr 2009 03:14:57 -0000	1.101
+++ policy-20090105.patch	24 Apr 2009 04:09:16 -0000	1.102
@@ -850,8 +850,20 @@
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.12/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-23 09:44:57.000000000 -0400
-@@ -146,6 +146,24 @@
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-23 23:59:46.000000000 -0400
+@@ -66,6 +66,11 @@
+ 	rpm_domtrans($1)
+ 	role $2 types rpm_t;
+ 	role $2 types rpm_script_t;
++
++	domain_system_change_exemption($1)
++	role_transition $2 rpm_exec_t system_r;
++	allow $2 system_r;
++
+ 	seutil_run_loadpolicy(rpm_script_t, $2)
+ 	seutil_run_semanage(rpm_script_t, $2)
+ 	seutil_run_setfiles(rpm_script_t, $2)
+@@ -146,6 +151,24 @@
  
  ########################################
  ## <summary>
@@ -876,7 +888,7 @@
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +185,48 @@
+@@ -167,6 +190,48 @@
  
  ########################################
  ## <summary>
@@ -925,7 +937,7 @@
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +246,24 @@
+@@ -186,6 +251,24 @@
  
  ########################################
  ## <summary>
@@ -950,7 +962,7 @@
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -204,6 +282,24 @@
+@@ -204,6 +287,24 @@
  
  ########################################
  ## <summary>
@@ -975,7 +987,7 @@
  ##	Create, read, write, and delete RPM
  ##	script temporary files.
  ## </summary>
-@@ -219,7 +315,29 @@
+@@ -219,7 +320,29 @@
  	')
  
  	files_search_tmp($1)
@@ -1005,7 +1017,7 @@
  ')
  
  ########################################
-@@ -245,6 +363,24 @@
+@@ -245,6 +368,24 @@
  
  ########################################
  ## <summary>
@@ -1030,7 +1042,7 @@
  ##	Create, read, write, and delete the RPM package database.
  ## </summary>
  ## <param name="domain">
-@@ -283,3 +419,175 @@
+@@ -283,3 +424,148 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1144,33 +1156,6 @@
 +
 +########################################
 +## <summary>
-+##	Transition to system_r when execute an rpm script
-+## </summary>
-+## <desc>
-+##      <p>
-+##	Execute rpm script in a specified role
-+##      </p>
-+##      <p>
-+##      No interprocess communication (signals, pipes,
-+##      etc.) is provided by this interface since
-+##      the domains are not owned by this module.
-+##      </p>
-+## </desc>
-+## <param name="source_role">
-+##	<summary>
-+##	Role to transition from.
-+##	</summary>
-+## </param>
-+interface(`rpm_role_transition',`
-+	gen_require(`
-+		type rpm_exec_t;
-+	')
-+
-+	role_transition $1 rpm_exec_t system_r;
-+')
-+
-+########################################
-+## <summary>
 +##	Do not audit attempts to write, and delete the 
 +##	RPM var run files
 +## </summary>
@@ -6393,7 +6378,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-24 00:02:59.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6557,7 +6542,7 @@
  	quota_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,19 +258,12 @@
+@@ -320,10 +258,6 @@
  ')
  
  optional_policy(`
@@ -6568,17 +6553,18 @@
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
+@@ -332,10 +266,6 @@
+ ')
+ 
  optional_policy(`
- 	rpm_run(sysadm_t, sysadm_r)
+-	rssh_role(sysadm_r, sysadm_t)
 -')
 -
 -optional_policy(`
--	rssh_role(sysadm_r, sysadm_t)
-+	rpm_role_transition(sysadm_r)
+ 	rsync_exec(sysadm_t)
  ')
  
- optional_policy(`
-@@ -345,10 +276,6 @@
+@@ -345,10 +275,6 @@
  ')
  
  optional_policy(`
@@ -6589,7 +6575,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +285,15 @@
+@@ -358,35 +284,15 @@
  ')
  
  optional_policy(`
@@ -6625,7 +6611,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +301,10 @@
+@@ -394,18 +300,10 @@
  ')
  
  optional_policy(`
@@ -6644,7 +6630,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +317,12 @@
+@@ -418,20 +316,12 @@
  ')
  
  optional_policy(`
@@ -6665,7 +6651,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +331,10 @@
+@@ -440,13 +330,7 @@
  ')
  
  optional_policy(`
@@ -6680,10 +6666,7 @@
  	yam_run(sysadm_t, sysadm_r)
  ')
 +
-+domain_user_exemption_target(sysadm_t)
-+allow sysadm_r system_r;
 +init_script_role_transition(sysadm_r)
-+role system_r types sysadm_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-23 09:44:57.000000000 -0400
@@ -7364,8 +7347,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-23 09:44:57.000000000 -0400
-@@ -0,0 +1,403 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-24 00:00:31.000000000 -0400
+@@ -0,0 +1,400 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7638,7 +7621,6 @@
 +	rpm_run(unconfined_t, unconfined_r)
 +	# Allow SELinux aware applications to request rpm_script execution
 +	rpm_transition_script(unconfined_t)
-+	rpm_role_transition(unconfined_r)
 +')
 +
 +optional_policy(`
@@ -7767,8 +7749,6 @@
 +')
 +
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-+
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.12/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2008-11-11 16:13:47.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/roles/unprivuser.te	2009-04-23 09:44:57.000000000 -0400
@@ -27924,7 +27904,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.12/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/selinuxutil.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/selinuxutil.te	2009-04-23 23:08:07.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -29523,7 +29503,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 23:55:27.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -r1.836 -r1.837
--- selinux-policy.spec	24 Apr 2009 03:14:57 -0000	1.836
+++ selinux-policy.spec	24 Apr 2009 04:09:16 -0000	1.837
@@ -213,8 +213,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs y y allow
-%installCmds targeted mcs y y allow
+%setupCmds targeted mcs n y allow
+%installCmds targeted mcs n y allow
 %endif
 
 %if %{BUILD_MINIMUM}
@@ -237,7 +237,7 @@
 %installCmds olpc mcs n y allow
 %endif
 
-make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 $RPM_SOURCE_DIR/policygentool %{buildroot}%{_usr}/share/selinux/devel/



From dwalsh at fedoraproject.org  Fri Apr 24 04:09:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 04:09:22 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.94,1.95
Message-ID: <20090424040922.ACEA470106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15021

Modified Files:
	policy-20090105.patch 
Log Message:
* Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
- Additional perms for readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- policy-20090105.patch	24 Apr 2009 03:16:44 -0000	1.94
+++ policy-20090105.patch	24 Apr 2009 04:09:22 -0000	1.95
@@ -850,8 +850,20 @@
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.12/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-23 09:44:57.000000000 -0400
-@@ -146,6 +146,24 @@
++++ serefpolicy-3.6.12/policy/modules/admin/rpm.if	2009-04-23 23:59:46.000000000 -0400
+@@ -66,6 +66,11 @@
+ 	rpm_domtrans($1)
+ 	role $2 types rpm_t;
+ 	role $2 types rpm_script_t;
++
++	domain_system_change_exemption($1)
++	role_transition $2 rpm_exec_t system_r;
++	allow $2 system_r;
++
+ 	seutil_run_loadpolicy(rpm_script_t, $2)
+ 	seutil_run_semanage(rpm_script_t, $2)
+ 	seutil_run_setfiles(rpm_script_t, $2)
+@@ -146,6 +151,24 @@
  
  ########################################
  ## <summary>
@@ -876,7 +888,7 @@
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +185,48 @@
+@@ -167,6 +190,48 @@
  
  ########################################
  ## <summary>
@@ -925,7 +937,7 @@
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +246,24 @@
+@@ -186,6 +251,24 @@
  
  ########################################
  ## <summary>
@@ -950,7 +962,7 @@
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -204,6 +282,24 @@
+@@ -204,6 +287,24 @@
  
  ########################################
  ## <summary>
@@ -975,7 +987,7 @@
  ##	Create, read, write, and delete RPM
  ##	script temporary files.
  ## </summary>
-@@ -219,7 +315,29 @@
+@@ -219,7 +320,29 @@
  	')
  
  	files_search_tmp($1)
@@ -1005,7 +1017,7 @@
  ')
  
  ########################################
-@@ -245,6 +363,24 @@
+@@ -245,6 +368,24 @@
  
  ########################################
  ## <summary>
@@ -1030,7 +1042,7 @@
  ##	Create, read, write, and delete the RPM package database.
  ## </summary>
  ## <param name="domain">
-@@ -283,3 +419,175 @@
+@@ -283,3 +424,148 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1144,33 +1156,6 @@
 +
 +########################################
 +## <summary>
-+##	Transition to system_r when execute an rpm script
-+## </summary>
-+## <desc>
-+##      <p>
-+##	Execute rpm script in a specified role
-+##      </p>
-+##      <p>
-+##      No interprocess communication (signals, pipes,
-+##      etc.) is provided by this interface since
-+##      the domains are not owned by this module.
-+##      </p>
-+## </desc>
-+## <param name="source_role">
-+##	<summary>
-+##	Role to transition from.
-+##	</summary>
-+## </param>
-+interface(`rpm_role_transition',`
-+	gen_require(`
-+		type rpm_exec_t;
-+	')
-+
-+	role_transition $1 rpm_exec_t system_r;
-+')
-+
-+########################################
-+## <summary>
 +##	Do not audit attempts to write, and delete the 
 +##	RPM var run files
 +## </summary>
@@ -6393,7 +6378,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-24 00:02:59.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6557,7 +6542,7 @@
  	quota_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,19 +258,12 @@
+@@ -320,10 +258,6 @@
  ')
  
  optional_policy(`
@@ -6568,17 +6553,18 @@
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
+@@ -332,10 +266,6 @@
+ ')
+ 
  optional_policy(`
- 	rpm_run(sysadm_t, sysadm_r)
+-	rssh_role(sysadm_r, sysadm_t)
 -')
 -
 -optional_policy(`
--	rssh_role(sysadm_r, sysadm_t)
-+	rpm_role_transition(sysadm_r)
+ 	rsync_exec(sysadm_t)
  ')
  
- optional_policy(`
-@@ -345,10 +276,6 @@
+@@ -345,10 +275,6 @@
  ')
  
  optional_policy(`
@@ -6589,7 +6575,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +285,15 @@
+@@ -358,35 +284,15 @@
  ')
  
  optional_policy(`
@@ -6625,7 +6611,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +301,10 @@
+@@ -394,18 +300,10 @@
  ')
  
  optional_policy(`
@@ -6644,7 +6630,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +317,12 @@
+@@ -418,20 +316,12 @@
  ')
  
  optional_policy(`
@@ -6665,7 +6651,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +331,10 @@
+@@ -440,13 +330,7 @@
  ')
  
  optional_policy(`
@@ -6680,10 +6666,7 @@
  	yam_run(sysadm_t, sysadm_r)
  ')
 +
-+domain_user_exemption_target(sysadm_t)
-+allow sysadm_r system_r;
 +init_script_role_transition(sysadm_r)
-+role system_r types sysadm_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.fc	2009-04-23 09:44:57.000000000 -0400
@@ -7364,8 +7347,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-23 09:44:57.000000000 -0400
-@@ -0,0 +1,403 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-24 00:00:31.000000000 -0400
+@@ -0,0 +1,400 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7638,7 +7621,6 @@
 +	rpm_run(unconfined_t, unconfined_r)
 +	# Allow SELinux aware applications to request rpm_script execution
 +	rpm_transition_script(unconfined_t)
-+	rpm_role_transition(unconfined_r)
 +')
 +
 +optional_policy(`
@@ -7767,8 +7749,6 @@
 +')
 +
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-+
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.12/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2008-11-11 16:13:47.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/roles/unprivuser.te	2009-04-23 09:44:57.000000000 -0400
@@ -27924,7 +27904,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.12/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/selinuxutil.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/selinuxutil.te	2009-04-23 23:08:07.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -29523,7 +29503,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 23:55:27.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  



From bskeggs at fedoraproject.org  Fri Apr 24 04:10:42 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 24 Apr 2009 04:10:42 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-nouveau.patch, 1.41, 1.42 kernel.spec, 1.1569, 
	1.1570
Message-ID: <20090424041042.3F41970106@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15289

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Apr 24 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.1-108
- nouveau/nv50: don't clobber 0x001700 during instmem init, can confuse ddx



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- drm-nouveau.patch	17 Apr 2009 12:25:32 -0000	1.41
+++ drm-nouveau.patch	24 Apr 2009 04:10:41 -0000	1.42
@@ -103,7 +103,7 @@
  	if (mask & ~fence->type) {
  		DRM_ERROR("Wait trying to extend fence type"
 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index 4984aa8..dee9b40 100644
+index c1173d8..2e4e667 100644
 --- a/drivers/gpu/drm/drm_gem.c
 +++ b/drivers/gpu/drm/drm_gem.c
 @@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
@@ -186,7 +186,7 @@
  	drm_gem_object_unreference(obj);
  	mutex_unlock(&dev->struct_mutex);
 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 5d45cbf..e3b0a76 100644
+index 5f7e431..a84acdb 100644
 --- a/drivers/gpu/drm/drm_stub.c
 +++ b/drivers/gpu/drm/drm_stub.c
 @@ -406,14 +406,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
@@ -7058,7 +7058,7 @@
 +MODULE_LICENSE("GPL and additional rights");
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
 new file mode 100644
-index 0000000..ae93ea1
+index 0000000..7d2da72
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
 @@ -0,0 +1,776 @@
@@ -16723,10 +16723,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..3e69c36
+index 0000000..3aee6d9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,1046 @@
+@@ -0,0 +1,1043 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -17259,10 +17259,7 @@
 +	/* resource 2 is RAMIN (mmio regs + 0x1000000) */
 +	/* resource 6 is bios */
 +
-+	/* Map 8MiB of the mmio regs, the only stuff beyond that we touch
-+	 * is the channel control regs, but we'll map them per-channel
-+	 * as required.
-+	 */
++	/* map the mmio regs */
 +	ret = drm_addmap(dev, drm_get_resource_start(dev, 0),
 +			 0x00800000, _DRM_REGISTERS, _DRM_READ_ONLY |
 +			 _DRM_DRIVER, &dev_priv->mmio);
@@ -23553,7 +23550,7 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c
 new file mode 100644
-index 0000000..afb9ac3
+index 0000000..bc43d4d
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
 @@ -0,0 +1,536 @@
@@ -47893,10 +47890,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
 new file mode 100644
-index 0000000..0659f1b
+index 0000000..d69f0cc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
-@@ -0,0 +1,379 @@
+@@ -0,0 +1,382 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + *
@@ -47963,7 +47960,7 @@
 +	uint32_t c_offset, c_size, c_ramfc, c_vmpd, c_base, pt_size;
 +	struct nv50_instmem_priv *priv;
 +	int ret, i;
-+	uint32_t v;
++	uint32_t v, save_nv001700;
 +
 +	priv = drm_calloc(1, sizeof(*priv), DRM_MEM_DRIVER);
 +	if (!priv)
@@ -47992,6 +47989,7 @@
 +		 (uint32_t)dev_priv->ramin->size >> 20);
 +	NV_DEBUG(dev, "        PT size: %d KiB\n", pt_size >> 10);
 +
++	save_nv001700 = nv_rd32(NV50_PUNK_BAR0_PRAMIN);
 +	nv_wr32(NV50_PUNK_BAR0_PRAMIN, (c_offset >> 16));
 +
 +	/* Create a fake channel, and use it as our "dummy" channels 0/127.
@@ -48089,6 +48087,8 @@
 +	}
 +	dev_priv->engine.instmem.finish_access(dev);
 +
++	nv_wr32(NV50_PUNK_BAR0_PRAMIN, save_nv001700);
++
 +	/* Global PRAMIN heap */
 +	if (nouveau_mem_init_heap(&dev_priv->ramin_heap,
 +				  c_size, dev_priv->ramin->size - c_size)) {
@@ -49117,7 +49117,7 @@
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 04fbd1e..f2a6bff 100644
+index b61b0c6..5b7ce2d 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1569
retrieving revision 1.1570
diff -u -r1.1569 -r1.1570
--- kernel.spec	23 Apr 2009 22:26:55 -0000	1.1569
+++ kernel.spec	24 Apr 2009 04:10:41 -0000	1.1570
@@ -1982,6 +1982,9 @@
 # and build.
 
 %changelog
+* Fri Apr 24 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.1-108
+- nouveau/nv50: don't clobber 0x001700 during instmem init, can confuse ddx
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-107
 - Drop POSIX timer patch accidentally committed in 2.6.30.
 



From petersen at fedoraproject.org  Fri Apr 24 04:14:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 04:14:17 +0000 (UTC)
Subject: rpms/cabal2spec/devel .cvsignore, 1.7, 1.8 cabal2spec.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20090424041417.1079E70106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16229

Modified Files:
	.cvsignore cabal2spec.spec sources 
Log Message:
- ghc_version is now set directly from ghc
- ghc buildrequires no longer versioned
- pkg_libdir and pkg_docdir replaced by ghcpkgdir and ghcdocdir in macros.ghc
- add doc filelist
- requires at least ghc-6.10.2-2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Feb 2009 06:41:47 -0000	1.7
+++ .cvsignore	24 Apr 2009 04:13:46 -0000	1.8
@@ -1 +1 @@
-cabal2spec-0.12.tar.gz
+cabal2spec-0.13.tar.gz


Index: cabal2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/cabal2spec.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cabal2spec.spec	27 Feb 2009 06:41:47 -0000	1.7
+++ cabal2spec.spec	24 Apr 2009 04:13:46 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		cabal2spec
-Version:	0.12
+Version:	0.13
 Release:	1%{?dist}
 Summary:	Tool for creating .spec files for Haskell Cabal Packages
 
@@ -9,8 +9,8 @@
 Source0:	https://fedorahosted.org/releases/c/a/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-# last ghc with bundled templates
-Requires:	ghc > 6.10.1-7
+# 6.10.2-2 has latest compatible macros
+Requires:	ghc > 6.10.2-2
 
 %description
 This package provides specfile templates and a script cabal2spec for easy
@@ -40,6 +40,13 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.13-1
+- requires at least ghc-6.10.2-2
+- ghc_version is now set directly from ghc
+- ghc buildrequires no longer versioned
+- pkg_libdir and pkg_docdir replaced by ghcpkgdir and ghcdocdir in macros.ghc
+- add doc filelist
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 0.12-1
 - lib packages own docdir now that there is no base package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Feb 2009 06:41:47 -0000	1.7
+++ sources	24 Apr 2009 04:13:46 -0000	1.8
@@ -1 +1 @@
-f45b9ad376bdd3709c74500b1f7307a6  cabal2spec-0.12.tar.gz
+3537eecee92742e9e48124c4520f8c30  cabal2spec-0.13.tar.gz



From airlied at fedoraproject.org  Fri Apr 24 04:35:04 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 24 Apr 2009 04:35:04 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-i2c-fix-bit-algorithm-timeout.patch, NONE,
	1.1 TODO, 1.67, 1.68 kernel.spec, 1.1570, 1.1571
Message-ID: <20090424043504.A5D8270106@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18313

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-i2c-fix-bit-algorithm-timeout.patch 
Log Message:
* Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-109
- linux-2.6-i2c-fix-bit-algorithm-timeout.patch - fix i2c EDID timeout


linux-2.6-i2c-fix-bit-algorithm-timeout.patch:

--- NEW FILE linux-2.6-i2c-fix-bit-algorithm-timeout.patch ---
>From e4a2a2da918d130c8755c89c9732ada3a53e2709 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 24 Apr 2009 09:03:29 +1000
Subject: [PATCH] i2c: fix bit algorithm timeout for low values.

When fetching DDC using i2c algo bit, we were often seeing timeouts
before getting valid EDID on a retry. The VESA spec states 2ms is the
DDC timeout, so when this translates into 1 jiffie and we are close
to the end of the time period, it could return with a timeout less than
2ms.

Change this code to use time_after instead of time_after_eq.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/i2c/algos/i2c-algo-bit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index d420cc5..e25e139 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -104,7 +104,7 @@ static int sclhi(struct i2c_algo_bit_data *adap)
 		 * chips may hold it low ("clock stretching") while they
 		 * are processing data internally.
 		 */
-		if (time_after_eq(jiffies, start + adap->timeout))
+		if (time_after(jiffies, start + adap->timeout))
 			return -ETIMEDOUT;
 		cond_resched();
 	}
-- 
1.6.0.6



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- TODO	19 Apr 2009 12:38:38 -0000	1.67
+++ TODO	24 Apr 2009 04:34:34 -0000	1.68
@@ -116,3 +116,6 @@
 	https://bugzilla.redhat.com/492523
 	Needed for xen domU to boot on some machines. Upstream since
 	2.6.30-rc2.
+
+* linux-2.6-i2c-fix-bit-algorithm-timeout.patch
+        Should be in stable soon - fix for EDID under kms


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1570
retrieving revision 1.1571
diff -u -r1.1570 -r1.1571
--- kernel.spec	24 Apr 2009 04:10:41 -0000	1.1570
+++ kernel.spec	24 Apr 2009 04:34:34 -0000	1.1571
@@ -735,6 +735,7 @@
 # make RLIMIT_CPU work again
 Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
 Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+Patch7005: linux-2.6-i2c-fix-bit-algorithm-timeout.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
@@ -1378,6 +1379,7 @@
 ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+ApplyPatch linux-2.6-i2c-fix-bit-algorithm-timeout.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -1982,6 +1984,9 @@
 # and build.
 
 %changelog
+* Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-109
+- linux-2.6-i2c-fix-bit-algorithm-timeout.patch - fix i2c EDID timeout
+
 * Fri Apr 24 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.1-108
 - nouveau/nv50: don't clobber 0x001700 during instmem init, can confuse ddx
 



From cweyl at fedoraproject.org  Fri Apr 24 05:14:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 05:14:17 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange/devel import.log, NONE,
	1.1 perl-B-Hooks-OP-Check-StashChange.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424051417.88A4670107@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23706/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-B-Hooks-OP-Check-StashChange.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-B-Hooks-OP-Check-StashChange-0_06-1_fc10:HEAD:perl-B-Hooks-OP-Check-StashChange-0.06-1.fc10.src.rpm:1240550025


--- NEW FILE perl-B-Hooks-OP-Check-StashChange.spec ---
Name:           perl-B-Hooks-OP-Check-StashChange
Version:        0.06
Release:        1%{?dist}
Summary:        Invoke callbacks when the stash code is being compiled in changes
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/B-Hooks-OP-Check-StashChange/
Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/B-Hooks-OP-Check-StashChange-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(B::Hooks::OP::Check) >= 0.14
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(ExtUtils::Depends)
BuildRequires:  perl(parent)
# testing
BuildRequires:  perl(Test::More)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
Register callbacks when an opcode is being compiled in a different namespace
than the previous one.

%prep
%setup -q -n B-Hooks-OP-Check-StashChange-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Tue Apr 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- update to 0.06

* Tue Apr 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-2
- add missing ExtUtils::Depends BR

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-0
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:36:55 -0000	1.1
+++ .cvsignore	24 Apr 2009 05:13:47 -0000	1.2
@@ -0,0 +1 @@
+B-Hooks-OP-Check-StashChange-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:36:55 -0000	1.1
+++ sources	24 Apr 2009 05:13:47 -0000	1.2
@@ -0,0 +1 @@
+193987521eac4e65af7d0414ef60a21a  B-Hooks-OP-Check-StashChange-0.06.tar.gz



From cweyl at fedoraproject.org  Fri Apr 24 05:20:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 05:20:03 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange/F-9 import.log, NONE,
	1.1 perl-B-Hooks-OP-Check-StashChange.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424052003.0D17B70106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25272/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-B-Hooks-OP-Check-StashChange.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-B-Hooks-OP-Check-StashChange-0_06-1_fc10:F-9:perl-B-Hooks-OP-Check-StashChange-0.06-1.fc10.src.rpm:1240550370


--- NEW FILE perl-B-Hooks-OP-Check-StashChange.spec ---
Name:           perl-B-Hooks-OP-Check-StashChange
Version:        0.06
Release:        1%{?dist}
Summary:        Invoke callbacks when the stash code is being compiled in changes
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/B-Hooks-OP-Check-StashChange/
Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/B-Hooks-OP-Check-StashChange-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(B::Hooks::OP::Check) >= 0.14
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(ExtUtils::Depends)
BuildRequires:  perl(parent)
# testing
BuildRequires:  perl(Test::More)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
Register callbacks when an opcode is being compiled in a different namespace
than the previous one.

%prep
%setup -q -n B-Hooks-OP-Check-StashChange-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Tue Apr 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- update to 0.06

* Tue Apr 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-2
- add missing ExtUtils::Depends BR

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-0
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:36:55 -0000	1.1
+++ .cvsignore	24 Apr 2009 05:19:32 -0000	1.2
@@ -0,0 +1 @@
+B-Hooks-OP-Check-StashChange-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:36:55 -0000	1.1
+++ sources	24 Apr 2009 05:19:32 -0000	1.2
@@ -0,0 +1 @@
+193987521eac4e65af7d0414ef60a21a  B-Hooks-OP-Check-StashChange-0.06.tar.gz



From cweyl at fedoraproject.org  Fri Apr 24 05:25:16 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 05:25:16 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange/F-10 import.log, NONE,
	1.1 perl-B-Hooks-OP-Check-StashChange.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424052516.B1F8A70106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26233/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-B-Hooks-OP-Check-StashChange.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-B-Hooks-OP-Check-StashChange-0_06-1_fc10:F-10:perl-B-Hooks-OP-Check-StashChange-0.06-1.fc10.src.rpm:1240550684


--- NEW FILE perl-B-Hooks-OP-Check-StashChange.spec ---
Name:           perl-B-Hooks-OP-Check-StashChange
Version:        0.06
Release:        1%{?dist}
Summary:        Invoke callbacks when the stash code is being compiled in changes
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/B-Hooks-OP-Check-StashChange/
Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/B-Hooks-OP-Check-StashChange-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(B::Hooks::OP::Check) >= 0.14
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(ExtUtils::Depends)
BuildRequires:  perl(parent)
# testing
BuildRequires:  perl(Test::More)

# don't "provide" private Perl libs
%global _use_internal_dependency_generator 0
%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
%global __find_requires /bin/sh -c "%{__deploop R}"

%description
Register callbacks when an opcode is being compiled in a different namespace
than the previous one.

%prep
%setup -q -n B-Hooks-OP-Check-StashChange-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*.3*

%changelog
* Tue Apr 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- update to 0.06

* Tue Apr 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-2
- add missing ExtUtils::Depends BR

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-0
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:36:55 -0000	1.1
+++ .cvsignore	24 Apr 2009 05:24:46 -0000	1.2
@@ -0,0 +1 @@
+B-Hooks-OP-Check-StashChange-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-B-Hooks-OP-Check-StashChange/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:36:55 -0000	1.1
+++ sources	24 Apr 2009 05:24:46 -0000	1.2
@@ -0,0 +1 @@
+193987521eac4e65af7d0414ef60a21a  B-Hooks-OP-Check-StashChange-0.06.tar.gz



From cweyl at fedoraproject.org  Fri Apr 24 05:36:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 05:36:09 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel import.log, NONE,
	1.1 perl-MooseX-MethodAttributes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424053609.2885270106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28034/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-MethodAttributes.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-MooseX-MethodAttributes-0_06-2_fc10:HEAD:perl-MooseX-MethodAttributes-0.06-2.fc10.src.rpm:1240551336


--- NEW FILE perl-MooseX-MethodAttributes.spec ---
Name:       perl-MooseX-MethodAttributes 
Version:    0.06 
Release:    2%{?dist}
# lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Introspect your method code attributes
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-MethodAttributes
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Moose) >= 0.70
BuildRequires: perl(MooseX::Types) >= 0.06
BuildRequires: perl(namespace::clean)
# testing
BuildRequires: perl(Test::More)

%description
This module allows code attributes of methods to be introspected using
Moose meta method objects.


%prep
%setup -q -n MooseX-MethodAttributes-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-2
- must remember to check summary! *sigh*

* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- submission

* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:48:29 -0000	1.1
+++ .cvsignore	24 Apr 2009 05:35:38 -0000	1.2
@@ -0,0 +1 @@
+MooseX-MethodAttributes-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:48:29 -0000	1.1
+++ sources	24 Apr 2009 05:35:38 -0000	1.2
@@ -0,0 +1 @@
+9db312b0fe2b5311aac1f7c68b3133df  MooseX-MethodAttributes-0.06.tar.gz



From cweyl at fedoraproject.org  Fri Apr 24 05:40:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 05:40:52 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/F-9 import.log, NONE,
	1.1 perl-MooseX-MethodAttributes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424054052.EA99370106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28874/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-MethodAttributes.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-MooseX-MethodAttributes-0_06-2_fc10:F-9:perl-MooseX-MethodAttributes-0.06-2.fc10.src.rpm:1240551620


--- NEW FILE perl-MooseX-MethodAttributes.spec ---
Name:       perl-MooseX-MethodAttributes 
Version:    0.06 
Release:    2%{?dist}
# lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Introspect your method code attributes
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-MethodAttributes
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Moose) >= 0.70
BuildRequires: perl(MooseX::Types) >= 0.06
BuildRequires: perl(namespace::clean)
# testing
BuildRequires: perl(Test::More)

%description
This module allows code attributes of methods to be introspected using
Moose meta method objects.


%prep
%setup -q -n MooseX-MethodAttributes-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-2
- must remember to check summary! *sigh*

* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- submission

* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:48:29 -0000	1.1
+++ .cvsignore	24 Apr 2009 05:40:22 -0000	1.2
@@ -0,0 +1 @@
+MooseX-MethodAttributes-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:48:29 -0000	1.1
+++ sources	24 Apr 2009 05:40:22 -0000	1.2
@@ -0,0 +1 @@
+9db312b0fe2b5311aac1f7c68b3133df  MooseX-MethodAttributes-0.06.tar.gz



From cweyl at fedoraproject.org  Fri Apr 24 05:44:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 05:44:46 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/F-10 import.log, NONE,
	1.1 perl-MooseX-MethodAttributes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424054446.43B8970107@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29601/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-MethodAttributes.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-MooseX-MethodAttributes-0_06-2_fc10:F-10:perl-MooseX-MethodAttributes-0.06-2.fc10.src.rpm:1240551853


--- NEW FILE perl-MooseX-MethodAttributes.spec ---
Name:       perl-MooseX-MethodAttributes 
Version:    0.06 
Release:    2%{?dist}
# lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Introspect your method code attributes
Source:     http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/MooseX-MethodAttributes-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-MethodAttributes
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Moose) >= 0.70
BuildRequires: perl(MooseX::Types) >= 0.06
BuildRequires: perl(namespace::clean)
# testing
BuildRequires: perl(Test::More)

%description
This module allows code attributes of methods to be introspected using
Moose meta method objects.


%prep
%setup -q -n MooseX-MethodAttributes-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-2
- must remember to check summary! *sigh*

* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- submission

* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:48:29 -0000	1.1
+++ .cvsignore	24 Apr 2009 05:44:15 -0000	1.2
@@ -0,0 +1 @@
+MooseX-MethodAttributes-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:48:29 -0000	1.1
+++ sources	24 Apr 2009 05:44:15 -0000	1.2
@@ -0,0 +1 @@
+9db312b0fe2b5311aac1f7c68b3133df  MooseX-MethodAttributes-0.06.tar.gz



From airlied at fedoraproject.org  Fri Apr 24 05:59:20 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 24 Apr 2009 05:59:20 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-fix-rs690-clamp.patch, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.180, 1.181
Message-ID: <20090424055920.8F6CB70106@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32604

Modified Files:
	radeon-6.12.2-fix-rs690-clamp.patch xorg-x11-drv-ati.spec 
Log Message:
* Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 6.12.2-6
- rs690: fix clamps patch so it doesn't break other cards


radeon-6.12.2-fix-rs690-clamp.patch:

Index: radeon-6.12.2-fix-rs690-clamp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-6.12.2-fix-rs690-clamp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.12.2-fix-rs690-clamp.patch	23 Apr 2009 05:57:23 -0000	1.1
+++ radeon-6.12.2-fix-rs690-clamp.patch	24 Apr 2009 05:59:20 -0000	1.2
@@ -1,13 +1,3 @@
-From 0323106d6bd6dd7b7354f4a22b8e6135459e017a Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Thu, 23 Apr 2009 15:52:41 +1000
-Subject: [PATCH] radeon: tx clamping
-
----
- src/radeon_exa_render.c          |   11 ++++++++---
- src/radeon_textured_videofuncs.c |    3 +++
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
 diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
 index ca46505..7f3c93a 100644
 --- a/src/radeon_exa_render.c
@@ -45,14 +35,14 @@
      switch (pPict->filter) {
      case PictFilterNearest:
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 852f4ac..581b477 100644
+index 852f4ac..0fbb364 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
 @@ -263,6 +263,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  
  	txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
  		    R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
-+		    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
++		    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
  		    R300_TX_MAG_FILTER_LINEAR |
  		    R300_TX_MIN_FILTER_LINEAR |
  		    (0 << R300_TX_ID_SHIFT));
@@ -60,7 +50,7 @@
  	    txpitch -= 1;
  	    txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
  		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
-+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
++		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
  			R300_TX_MIN_FILTER_LINEAR |
  			R300_TX_MAG_FILTER_LINEAR);
  
@@ -68,10 +58,7 @@
  		/* Tex filter */
  		txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
  			    R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
-+			    R300_TX_CLAMP_R(R300_TX_CLAMP_WRAP) |
++			    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
  			    R300_TX_MIN_FILTER_NEAREST |
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
--- 
-1.6.2.2
-


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- xorg-x11-drv-ati.spec	23 Apr 2009 05:57:23 -0000	1.180
+++ xorg-x11-drv-ati.spec	24 Apr 2009 05:59:20 -0000	1.181
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 6.12.2-6
+- rs690: fix clamps patch so it doesn't break other cards
+
 * Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 6.12.2-5
 - rs690: fix crashing when firefox or gimp is used
 



From mmaslano at fedoraproject.org  Fri Apr 24 06:09:13 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 24 Apr 2009 06:09:13 +0000 (UTC)
Subject: rpms/perl-XXX/devel perl-XXX.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424060913.17FAA70106@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XXX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2092

Modified Files:
	.cvsignore sources 
Added Files:
	perl-XXX.spec 
Log Message:
* Wed Apr 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.12-2
- add BR Test::More and ExtUtils::MakeMaker



--- NEW FILE perl-XXX.spec ---
Name:           perl-XXX
Version:        0.12
Release:        2%{?dist}
Summary:        See Your Data in the Nude
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/XXX/
Source0:        http://search.cpan.org/CPAN/authors/id/I/IN/INGY/XXX-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(YAML)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
XXX.pm exports a function called XXX that you can put just about
anywhere in your Perl code to make it die with a YAML dump of the
arguments to its right.

The charm of XXX-debugging is that it is easy to type and rarely
requires parens and stands out visually so that you remember to remove
it.

XXX.pm also exports WWW, YYY and ZZZ which do similar debugging things.

To use Data::Dumper instead of YAML:
   use XXX -dumper;

%prep
%setup -q -n XXX-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

iconv -f iso8859-1 -t utf-8 < README > README.z
mv README.z README

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.12-2
- add BR Test::More and ExtUtils::MakeMaker

* Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.12-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XXX/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:34:59 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:08:42 -0000	1.2
@@ -0,0 +1 @@
+XXX-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XXX/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:34:59 -0000	1.1
+++ sources	24 Apr 2009 06:08:42 -0000	1.2
@@ -0,0 +1 @@
+9bc0f06321ed4a8b1315ab0be7afaf48  XXX-0.12.tar.gz



From mmaslano at fedoraproject.org  Fri Apr 24 06:11:33 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 24 Apr 2009 06:11:33 +0000 (UTC)
Subject: rpms/perl-Text-VimColor/devel perl-Text-VimColor.spec,NONE,1.1
Message-ID: <20090424061133.CA13E70106@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Text-VimColor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2688

Added Files:
	perl-Text-VimColor.spec 
Log Message:
Add initial spec.



--- NEW FILE perl-Text-VimColor.spec ---
Name:           perl-Text-VimColor
Version:        0.11
Release:        2%{?dist}
Summary:        Syntax color text in HTML or XML using Vim
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-VimColor/
Source0:        http://www.cpan.org/authors/id/G/GE/GEOFFR/Text-VimColor-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Path::Class) >= 0.02
BuildRequires:  perl(Test::More)
# needed for test
BuildRequires:  vim-enhanced
BuildRequires:  perl(XML::Parser)
Requires:       vim-enhanced
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:      noarch

%description
This module tries to markup text files according to their syntax. It can be
used to produce web pages with pretty-printed colourful source code
samples. It can produce output in the following formats:
  text-vimcolor --format html --filetype prolog foo.pl > foo.html
This program is a command line interface to the Perl module Text::VimColor.

%prep
%setup -q -n Text-VimColor-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/text-vimcolor
/usr/lib/perl5/vendor_perl/5.10.0/Text
%{_mandir}/man3/*
%{_mandir}/man1/text-vimcolor.1.gz

%changelog
* Thu Apr 16 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- add require and BR

* Thu Apr 16 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-1
- Specfile autogenerated by cpanspec 1.78.



From mmaslano at fedoraproject.org  Fri Apr 24 06:22:58 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 24 Apr 2009 06:22:58 +0000 (UTC)
Subject: rpms/perl-XXX/F-11 perl-XXX.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424062258.91D1770106@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XXX/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4971

Modified Files:
	.cvsignore sources 
Added Files:
	perl-XXX.spec 
Log Message:
* Wed Apr 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.12-2
- add BR Test::More and ExtUtils::MakeMaker



--- NEW FILE perl-XXX.spec ---
Name:           perl-XXX
Version:        0.12
Release:        2%{?dist}
Summary:        See Your Data in the Nude
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/XXX/
Source0:        http://search.cpan.org/CPAN/authors/id/I/IN/INGY/XXX-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(YAML)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
XXX.pm exports a function called XXX that you can put just about
anywhere in your Perl code to make it die with a YAML dump of the
arguments to its right.

The charm of XXX-debugging is that it is easy to type and rarely
requires parens and stands out visually so that you remember to remove
it.

XXX.pm also exports WWW, YYY and ZZZ which do similar debugging things.

To use Data::Dumper instead of YAML:
   use XXX -dumper;

%prep
%setup -q -n XXX-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

iconv -f iso8859-1 -t utf-8 < README > README.z
mv README.z README

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.12-2
- add BR Test::More and ExtUtils::MakeMaker

* Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.12-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XXX/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:34:59 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:22:28 -0000	1.2
@@ -0,0 +1 @@
+XXX-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XXX/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:34:59 -0000	1.1
+++ sources	24 Apr 2009 06:22:28 -0000	1.2
@@ -0,0 +1 @@
+9bc0f06321ed4a8b1315ab0be7afaf48  XXX-0.12.tar.gz



From mmaslano at fedoraproject.org  Fri Apr 24 06:23:59 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 24 Apr 2009 06:23:59 +0000 (UTC)
Subject: rpms/perl-Text-VimColor/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090424062359.1201670106@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Text-VimColor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5287

Modified Files:
	.cvsignore sources 
Log Message:
Initial source.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-VimColor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:50:36 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:23:28 -0000	1.2
@@ -0,0 +1 @@
+Text-VimColor-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-VimColor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:50:36 -0000	1.1
+++ sources	24 Apr 2009 06:23:28 -0000	1.2
@@ -0,0 +1 @@
+268fb3f630b463fcec528d798dcf77c3  Text-VimColor-0.11.tar.gz



From corsepiu at fedoraproject.org  Fri Apr 24 06:27:05 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 06:27:05 +0000 (UTC)
Subject: rpms/rt3/devel README.fedora.in,1.2,1.3 rt3.spec,1.37,1.38
Message-ID: <20090424062705.2E34370106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6476

Modified Files:
	README.fedora.in rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).



Index: README.fedora.in
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/README.fedora.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.fedora.in	19 Jul 2006 03:35:18 -0000	1.2
+++ README.fedora.in	24 Apr 2009 06:26:34 -0000	1.3
@@ -32,6 +32,7 @@
 
 6. Initialize rt3's mysql database:
 # /usr/sbin/rt-setup-database --action init \
+  --dba root \
   --dba-password <mysql-root-password>
 
 7. Start/restart apache/httpd:


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rt3.spec	25 Feb 2009 21:09:09 -0000	1.37
+++ rt3.spec	24 Apr 2009 06:26:34 -0000	1.38
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -430,6 +430,9 @@
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
+- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cweyl at fedoraproject.org  Fri Apr 24 06:27:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 06:27:09 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST/devel import.log, NONE,
	1.1 perl-RT-Client-REST.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424062709.AA31970106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RT-Client-REST/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6548/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-RT-Client-REST.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-RT-Client-REST-0_37-1_fc10:HEAD:perl-RT-Client-REST-0.37-1.fc10.src.rpm:1240554395


--- NEW FILE perl-RT-Client-REST.spec ---
Name:       perl-RT-Client-REST 
Version:    0.37 
Release:    1%{?dist}
# lib/RT/Client/REST.pm -> GPLv2
# see also /usr/bin/rt from the rt3 package
License:    GPLv2
Group:      Development/Libraries
Summary:    Talk to RT using REST protocol 
Source:     http://search.cpan.org/CPAN/authors/id/D/DM/DMITRI/RT-Client-REST-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/RT-Client-REST
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Encode)
BuildRequires: perl(Error)
BuildRequires: perl(Exception::Class)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(HTTP::Cookies)
BuildRequires: perl(HTTP::Request::Common)
BuildRequires: perl(LWP)
BuildRequires: perl(Params::Validate)
# testing
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Kwalitee)

%description
*RT::Client::REST* is */usr/bin/rt* converted to a Perl module. I needed
to implement some RT interactions from my application, but did not feel
that invoking a shell command is appropriate. Thus, I took *rt* tool,
written by Abhijit Menon-Sen, and converted it to an object-oriented
Perl module.


%prep
%setup -q -n RT-Client-REST-%{version}

cat Changes | iconv -f iso8859-1 -t utf8 > x
mv x Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-RT-Client-REST/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:49:32 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:26:39 -0000	1.2
@@ -0,0 +1 @@
+RT-Client-REST-0.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RT-Client-REST/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:49:32 -0000	1.1
+++ sources	24 Apr 2009 06:26:39 -0000	1.2
@@ -0,0 +1 @@
+383bf572afdb8040641d4d413ef96476  RT-Client-REST-0.37.tar.gz



From corsepiu at fedoraproject.org  Fri Apr 24 06:28:35 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 06:28:35 +0000 (UTC)
Subject: rpms/rt3/F-11 README.fedora.in,1.2,1.3 rt3.spec,1.37,1.38
Message-ID: <20090424062835.B25D270106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7046

Modified Files:
	README.fedora.in rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).



Index: README.fedora.in
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/README.fedora.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.fedora.in	19 Jul 2006 03:35:18 -0000	1.2
+++ README.fedora.in	24 Apr 2009 06:28:05 -0000	1.3
@@ -32,6 +32,7 @@
 
 6. Initialize rt3's mysql database:
 # /usr/sbin/rt-setup-database --action init \
+  --dba root \
   --dba-password <mysql-root-password>
 
 7. Start/restart apache/httpd:


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt3.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rt3.spec	25 Feb 2009 21:09:09 -0000	1.37
+++ rt3.spec	24 Apr 2009 06:28:05 -0000	1.38
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -430,6 +430,9 @@
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
+- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Fri Apr 24 06:30:32 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 06:30:32 +0000 (UTC)
Subject: rpms/rt3/F-10 README.fedora.in,1.2,1.3 rt3.spec,1.36,1.37
Message-ID: <20090424063032.924E870106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7534

Modified Files:
	README.fedora.in rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).



Index: README.fedora.in
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/README.fedora.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.fedora.in	19 Jul 2006 03:35:18 -0000	1.2
+++ README.fedora.in	24 Apr 2009 06:30:01 -0000	1.3
@@ -32,6 +32,7 @@
 
 6. Initialize rt3's mysql database:
 # /usr/sbin/rt-setup-database --action init \
+  --dba root \
   --dba-password <mysql-root-password>
 
 7. Start/restart apache/httpd:


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rt3.spec	18 Feb 2009 12:33:02 -0000	1.36
+++ rt3.spec	24 Apr 2009 06:30:02 -0000	1.37
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -430,6 +430,9 @@
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
+- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+
 * Wed Feb 18 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-5
 - Add R: perl(Class::Accessor::Fast), perl(Exception::Class::Base),
   perl(HTML::Mason::Request), perl(Net::Server::PreFork).



From robert at fedoraproject.org  Fri Apr 24 06:30:45 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 06:30:45 +0000 (UTC)
Subject: rpms/sing/devel sing-1.1-fedora.patch, NONE,
	1.1 sing-1.1-suid_log.patch, NONE, 1.1 sing.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424063045.E5ACD70106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7561

Modified Files:
	.cvsignore sources 
Added Files:
	sing-1.1-fedora.patch sing-1.1-suid_log.patch sing.spec 
Log Message:
Initial import of sing for Fedora


sing-1.1-fedora.patch:

--- NEW FILE sing-1.1-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which removes
all references to internal libpcap and libnet to get the system libraries used. It
also removes internal CFLAGS definitation in favour of the system-wide one.

--- SING-1.1/configure.in			2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/configure.in.fedora		2009-04-18 04:33:04.000000000 +0200
@@ -7,20 +7,11 @@
 
 AM_CONFIG_HEADER(config.h)
 
-libpcapdir=libpcap-0.4
-libnetdir=Libnet-1.0.1b
-
-AC_SUBST(libpcapdir)
-AC_SUBST(libnetdir)
-
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(SING, 1.1)
 
 AC_PROG_CC
-if test -n "$GCC"; then
-      CFLAGS="-O3 -Wall"
-fi
 
 AC_STDC_HEADERS
 
@@ -44,45 +35,6 @@
 AC_CHECK_LIB(net, libnet_open_raw_sock, have_libnet=yes, have_libnet=no)
 
 dnl
-dnl libpcap...
-dnl
-PCAP_CLEAN="pcap_clean"
-PCAP_DISTCLEAN="pcap_distclean"
-CFLAGS="$CFLAGS -I$libpcapdir"
-
-if test $have_libpcap = yes; then
-  PCAP_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  PCAP_COMPILE="pcap_compile"
-  LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
-fi
-
-AC_SUBST(PCAP_CLEAN)
-AC_SUBST(PCAP_DISTCLEAN)
-AC_SUBST(PCAP_COMPILE)
-
-dnl
-dnl libnet...
-dnl
-LIBNET_CLEAN="libnet_clean"
-LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
-
-if test $have_libnet = yes; then
-  LIBNET_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  LIBNET_COMPILE="libnet_compile"
-  LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
-fi
-
-AC_SUBST(LIBNET_CLEAN)
-AC_SUBST(LIBNET_DISTCLEAN)
-AC_SUBST(LIBNET_COMPILE)
-
-
-dnl
 dnl Check headers
 dnl
 AC_CHECK_HEADERS(sys/sockio.h string.h strings.h bstring.h sys/ioctl.h)
@@ -144,7 +96,7 @@
            case "`uname -r`" in
                 2.4*)
                    AC_DEFINE(LINUX_24)
-                ;
+                ;;
                 2.2*)
                    AC_DEFINE(LINUX_22)
                 ;;
--- SING-1.1/Makefile.in			2001-04-18 13:11:06.000000000 +0200
+++ SING-1.1/Makefile.in.fedora			2009-04-18 04:18:04.000000000 +0200
@@ -67,18 +67,13 @@
 LIBNET_DISTCLEAN = @LIBNET_DISTCLEAN@
 MAKEDEPEND = @MAKEDEPEND@
 PACKAGE = @PACKAGE@
-PCAP_CLEAN = @PCAP_CLEAN@
-PCAP_COMPILE = @PCAP_COMPILE@
-PCAP_DISTCLEAN = @PCAP_DISTCLEAN@
 VERSION = @VERSION@
 getopt_OBJECTS = @getopt_OBJECTS@
 getopt_SOURCES = @getopt_SOURCES@
-libnetdir = @libnetdir@
-libpcapdir = @libpcapdir@
 
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
 
-LIBS = @LIBS@ -lpcap -lnet
+LIBS = @LIBS@ -lpcap `/usr/bin/libnet10-config --libs`
 
 bin_PROGRAMS = sing
 
@@ -94,7 +89,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `/usr/bin/libnet10-config --cflags --defines` -I.
 sing_OBJECTS =  sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
 sing_LDADD = $(LDADD)
 sing_DEPENDENCIES = 
@@ -111,7 +106,7 @@
 SOURCES = $(sing_SOURCES)
 OBJECTS = $(sing_OBJECTS)
 
-all: libpcap libnet all-redirect
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 
@@ -226,7 +221,7 @@
 
 
 help.o: help.c config.h
-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
+sing.o: sing.c config.h \
 	sing.h ipcompat.h misc.h packet.h dev_struct.h
 ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
 	misc.h
@@ -269,12 +264,12 @@
 
 clean-am:  clean-binPROGRAMS mostlyclean-am
 
-clean: clean-am pcap_clean libnet_clean
+clean: clean-am
 
 distclean-am:  distclean-hdr distclean-compile \
 		 distclean-generic clean-am
 
-distclean: distclean-am pcap_distclean libnet_distclean
+distclean: distclean-am
 	-rm -f config.status
 
 
@@ -290,38 +285,9 @@
 distclean-generic clean mostlyclean distclean
 
 
-clean-local:	@PCAP_CLEAN@ @LIBNET_CLEAN@
+clean-local:
 
-distclean-local:	@PCAP_DISTCLEAN@ @LIBNET_DISTCLEAN@
-
-libpcap:	pcap_conf @PCAP_COMPILE@
-
-pcap_conf:
-	@echo Configuring libpcap; cd $(libpcapdir); ./configure
-
-pcap_compile:
-	@echo Compiling libpcap; cd $(libpcapdir); $(MAKE)
-
-pcap_clean:
-	cd $(libpcapdir); $(MAKE) clean
-
-pcap_distclean:
-	cd $(libpcapdir); $(MAKE) distclean
-
-
-libnet: libnet_conf @LIBNET_COMPILE@
-
-libnet_conf:
-	@echo Configuring libnet; cd $(libnetdir); ./configure
-
-libnet_compile:
-	@echo Compiling libnet; cd $(libnetdir); $(MAKE)
-
-libnet_clean:
-	cd $(libnetdir); $(MAKE) clean
-
-libnet_distclean:
-	cd $(libnetdir); $(MAKE) distclean
+distclean-local:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

sing-1.1-suid_log.patch:

--- NEW FILE sing-1.1-suid_log.patch ---
Re-merged patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which
causes sing to drop privileges when opening log file and running sing suid; this is
CVE-2007-6211. The patch is originally from Nico Golde <nion at debian.org> and then
afterwards used by Alberto Gonzalez Iniesta <agi at inittab.org>.

Further information:
 - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6211
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454167

--- SING-1.1/parser.c				2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/parser.c.suid_log			2009-04-18 04:53:05.000000000 +0200
@@ -75,6 +75,8 @@
    struct protoent *proto;
    static struct mi_ifaz iface;
    struct sockaddr_in *aux2;
+   uid_t user_id;
+
    static struct option options[] =
    {
     { "help",    0, 0, 'h' },
@@ -380,8 +382,14 @@
        break;
        
        case 31:
+             user_id = getuid();
+             uid_t tmp_id = geteuid();
+
+             seteuid(user_id);
              if ( (packet->logfile = fopen(optarg, "a+")) == NULL )
                 go_out_error(1, "fopen");
+
+             seteuid(tmp_id);
        break;
        
        case 32:


--- NEW FILE sing.spec ---
Summary:	Sends fully customized ICMP packets from command line
Name:		sing
Version:	1.1
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.sourceforge.net/projects/%{name}/
Source:		http://downloads.sourceforge.net/%{name}/SING-%{version}.tgz
Patch0:		sing-1.1-fedora.patch
Patch1:		sing-1.1-suid_log.patch
BuildRequires:	%{_includedir}/pcap.h, libnet10-devel, automake, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sing is a little tool that sends ICMP packets fully customized from command
line. The main purpose is to replace/complement the nice ping command with
certain enhancements as:

 - Send fragmented and monster packets > 65534 bytes
 - Send/read spoofed packets
 - Send many ICMP Information types in addition to the echo request type,
   sent by default as address mask request, timestamp, information request,
   router solicitation and router advertisement
 - Send many ICMP error types: redirect, source quench, time exceeded,
   destination unreach and parameter problem
 - Send to host with loose or strict source routing
 - Use little fingerprinting techniques to discover Windows or Solaris boxes
 - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
   Unix and Windows at the moment

%prep
%setup -q -n SING-%{version}
%patch0 -p1 -b .fedora
%patch1 -p1 -b .sing_suid

# Rebuilding of configure file is needed for Patch0
autoconf

# Automake can't be run because of missing Makefile.am
cp -f %{_datadir}/automake-*/config.* .

%build
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o LEEME.utf8 LEEME
touch -c -r LEEME LEEME.utf8
mv -f LEEME.utf8 LEEME

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LEEME README THANKS
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

%changelog
* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.1-1
- Upgrade to 1.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sing/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:45:39 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:30:15 -0000	1.2
@@ -0,0 +1 @@
+SING-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sing/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:45:39 -0000	1.1
+++ sources	24 Apr 2009 06:30:15 -0000	1.2
@@ -0,0 +1 @@
+f9f649c4b40174a983601d46e4a3daac  SING-1.1.tgz



From grenier at fedoraproject.org  Fri Apr 24 06:32:02 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Fri, 24 Apr 2009 06:32:02 +0000 (UTC)
Subject: rpms/testdisk/EL-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 testdisk.spec, 1.9, 1.10
Message-ID: <20090424063202.05D5070106@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/EL-4

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Add patch for PhotoRec 6.11 to add missing bound checking in EXIF processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jul 2008 20:55:01 -0000	1.8
+++ .cvsignore	24 Apr 2009 06:31:31 -0000	1.9
@@ -1,2 +1,3 @@
-testdisk-6.10.tar.bz2
-testdisk-doc-6.10.tar.bz2
+testdisk-6.11.tar.bz2
+testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Jul 2008 20:55:01 -0000	1.8
+++ sources	24 Apr 2009 06:31:31 -0000	1.9
@@ -1,2 +1,3 @@
-d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
-9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
+8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-4/testdisk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- testdisk.spec	31 Jul 2008 20:55:01 -0000	1.9
+++ testdisk.spec	24 Apr 2009 06:31:31 -0000	1.10
@@ -1,14 +1,15 @@
-Summary:	Tool to check and undelete partition
+Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
 Summary(fr.UTF8):	Outil pour v??rifier et restorer des partitions
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
-Version:	6.10
+Version:	6.11
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
@@ -21,6 +22,8 @@
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
 NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including jpg, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami:
@@ -28,9 +31,11 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour v??rifier et restorer des partitions. Fonctionne avec
+TestDisk v??rifie et recup??re les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
@@ -75,6 +80,7 @@
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure --without-ewf
@@ -99,6 +105,10 @@
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
+- Update to latest version
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Thu Jul 31 2008 Christophe Grenier <grenier at cgsecurity.org> 6.10-1
 - Update to latest version
 



From grenier at fedoraproject.org  Fri Apr 24 06:32:02 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Fri, 24 Apr 2009 06:32:02 +0000 (UTC)
Subject: rpms/testdisk/EL-5 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 testdisk.spec, 1.16, 1.17
Message-ID: <20090424063202.5571770106@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/EL-5

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Add patch for PhotoRec 6.11 to add missing bound checking in EXIF processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Apr 2009 18:43:31 -0000	1.11
+++ .cvsignore	24 Apr 2009 06:31:32 -0000	1.12
@@ -1,2 +1,3 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Apr 2009 18:43:31 -0000	1.11
+++ sources	24 Apr 2009 06:31:32 -0000	1.12
@@ -1,2 +1,3 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/EL-5/testdisk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- testdisk.spec	19 Apr 2009 18:43:31 -0000	1.16
+++ testdisk.spec	24 Apr 2009 06:31:32 -0000	1.17
@@ -4,11 +4,12 @@
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
@@ -30,10 +31,10 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour v??rifier et restorer des partitions. Fonctionne avec
+TestDisk v??rifie et r??cup??re les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+PhotoRec g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
 MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
@@ -79,6 +80,7 @@
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure --without-ewf
@@ -103,6 +105,9 @@
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-2
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
 - Update to latest version
 



From grenier at fedoraproject.org  Fri Apr 24 06:32:02 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Fri, 24 Apr 2009 06:32:02 +0000 (UTC)
Subject: rpms/testdisk/F-10 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 testdisk.spec, 1.24, 1.25
Message-ID: <20090424063202.B62C770106@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/F-10

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Add patch for PhotoRec 6.11 to add missing bound checking in EXIF processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Apr 2009 18:03:16 -0000	1.13
+++ .cvsignore	24 Apr 2009 06:31:32 -0000	1.14
@@ -1,2 +1,3 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Apr 2009 18:03:17 -0000	1.14
+++ sources	24 Apr 2009 06:31:32 -0000	1.15
@@ -1,2 +1,3 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-10/testdisk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- testdisk.spec	19 Apr 2009 18:03:17 -0000	1.24
+++ testdisk.spec	24 Apr 2009 06:31:32 -0000	1.25
@@ -4,11 +4,12 @@
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
@@ -34,10 +35,10 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour v??rifier et restorer des partitions. Fonctionne avec
+TestDisk v??rifie et r??cup??re les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+PhotoRec g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
 MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
@@ -83,6 +84,7 @@
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure
@@ -107,6 +109,9 @@
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-2
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
 - Update to latest version
 



From grenier at fedoraproject.org  Fri Apr 24 06:32:03 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Fri, 24 Apr 2009 06:32:03 +0000 (UTC)
Subject: rpms/testdisk/F-9 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 testdisk.spec, 1.24, 1.25
Message-ID: <20090424063203.8F9D170106@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/F-9

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Add patch for PhotoRec 6.11 to add missing bound checking in EXIF processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Apr 2009 18:34:27 -0000	1.13
+++ .cvsignore	24 Apr 2009 06:31:33 -0000	1.14
@@ -1,2 +1,3 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Apr 2009 18:34:27 -0000	1.14
+++ sources	24 Apr 2009 06:31:33 -0000	1.15
@@ -1,2 +1,3 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-9/testdisk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- testdisk.spec	19 Apr 2009 18:34:27 -0000	1.24
+++ testdisk.spec	24 Apr 2009 06:31:33 -0000	1.25
@@ -4,11 +4,12 @@
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
@@ -34,10 +35,10 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour v??rifier et restorer des partitions. Fonctionne avec
+TestDisk v??rifie et r??cup??re les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+PhotoRec g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
 MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
@@ -83,6 +84,7 @@
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure
@@ -107,6 +109,9 @@
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-2
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
 - Update to latest version
 



From grenier at fedoraproject.org  Fri Apr 24 06:32:03 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Fri, 24 Apr 2009 06:32:03 +0000 (UTC)
Subject: rpms/testdisk/F-11 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 testdisk.spec, 1.25, 1.26
Message-ID: <20090424063203.3523C70106@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/F-11

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Add patch for PhotoRec 6.11 to add missing bound checking in EXIF processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Apr 2009 17:59:47 -0000	1.13
+++ .cvsignore	24 Apr 2009 06:31:32 -0000	1.14
@@ -1,2 +1,3 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Apr 2009 17:59:47 -0000	1.14
+++ sources	24 Apr 2009 06:31:32 -0000	1.15
@@ -1,2 +1,3 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/F-11/testdisk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- testdisk.spec	19 Apr 2009 17:59:47 -0000	1.25
+++ testdisk.spec	24 Apr 2009 06:31:32 -0000	1.26
@@ -4,11 +4,12 @@
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
@@ -34,10 +35,10 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour v??rifier et restorer des partitions. Fonctionne avec
+TestDisk v??rifie et r??cup??re les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+PhotoRec g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
 MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
@@ -83,6 +84,7 @@
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure
@@ -107,6 +109,9 @@
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-2
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
 - Update to latest version
 



From grenier at fedoraproject.org  Fri Apr 24 06:32:03 2009
From: grenier at fedoraproject.org (Christophe GRENIER)
Date: Fri, 24 Apr 2009 06:32:03 +0000 (UTC)
Subject: rpms/testdisk/devel .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 testdisk.spec, 1.25, 1.26
Message-ID: <20090424063203.D584070106@cvs1.fedora.phx.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7662/devel

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Add patch for PhotoRec 6.11 to add missing bound checking in EXIF processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Apr 2009 16:44:15 -0000	1.13
+++ .cvsignore	24 Apr 2009 06:31:33 -0000	1.14
@@ -1,2 +1,3 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Apr 2009 16:44:15 -0000	1.14
+++ sources	24 Apr 2009 06:31:33 -0000	1.15
@@ -1,2 +1,3 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- testdisk.spec	19 Apr 2009 16:44:15 -0000	1.25
+++ testdisk.spec	24 Apr 2009 06:31:33 -0000	1.26
@@ -4,11 +4,12 @@
 Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
@@ -34,10 +35,10 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour v??rifier et restorer des partitions. Fonctionne avec
+TestDisk v??rifie et r??cup??re les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-Il g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
+PhotoRec g??re plus d'une centaine de formats de fichiers dont les jpeg, les documents
 MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
@@ -83,6 +84,7 @@
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure
@@ -107,6 +109,9 @@
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-2
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Sun Apr 19 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-1
 - Update to latest version
 



From corsepiu at fedoraproject.org  Fri Apr 24 06:33:26 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 06:33:26 +0000 (UTC)
Subject: rpms/rt3/F-9 README.fedora.in,1.2,1.3 rt3.spec,1.27,1.28
Message-ID: <20090424063326.A973170106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8436

Modified Files:
	README.fedora.in rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-2
- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).



Index: README.fedora.in
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-9/README.fedora.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.fedora.in	19 Jul 2006 03:35:18 -0000	1.2
+++ README.fedora.in	24 Apr 2009 06:32:56 -0000	1.3
@@ -32,6 +32,7 @@
 
 6. Initialize rt3's mysql database:
 # /usr/sbin/rt-setup-database --action init \
+  --dba root \
   --dba-password <mysql-root-password>
 
 7. Start/restart apache/httpd:


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-9/rt3.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rt3.spec	23 Jan 2009 03:41:20 -0000	1.27
+++ rt3.spec	24 Apr 2009 06:32:56 -0000	1.28
@@ -23,7 +23,7 @@
 
 Name:		rt3
 Version:	3.6.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -344,6 +344,9 @@
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-2
+- README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+
 * Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-1
 - Upgrade (BZ 481165 - CVE-2008-3502).
 - Add --with-testdeps.



From cweyl at fedoraproject.org  Fri Apr 24 06:33:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 06:33:45 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST/F-9 import.log, NONE,
	1.1 perl-RT-Client-REST.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424063345.D812B70106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RT-Client-REST/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8690/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-RT-Client-REST.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-RT-Client-REST-0_37-1_fc10:F-9:perl-RT-Client-REST-0.37-1.fc10.src.rpm:1240554793


--- NEW FILE perl-RT-Client-REST.spec ---
Name:       perl-RT-Client-REST 
Version:    0.37 
Release:    1%{?dist}
# lib/RT/Client/REST.pm -> GPLv2
# see also /usr/bin/rt from the rt3 package
License:    GPLv2
Group:      Development/Libraries
Summary:    Talk to RT using REST protocol 
Source:     http://search.cpan.org/CPAN/authors/id/D/DM/DMITRI/RT-Client-REST-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/RT-Client-REST
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Encode)
BuildRequires: perl(Error)
BuildRequires: perl(Exception::Class)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(HTTP::Cookies)
BuildRequires: perl(HTTP::Request::Common)
BuildRequires: perl(LWP)
BuildRequires: perl(Params::Validate)
# testing
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Kwalitee)

%description
*RT::Client::REST* is */usr/bin/rt* converted to a Perl module. I needed
to implement some RT interactions from my application, but did not feel
that invoking a shell command is appropriate. Thus, I took *rt* tool,
written by Abhijit Menon-Sen, and converted it to an object-oriented
Perl module.


%prep
%setup -q -n RT-Client-REST-%{version}

cat Changes | iconv -f iso8859-1 -t utf8 > x
mv x Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-RT-Client-REST/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:49:32 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:33:15 -0000	1.2
@@ -0,0 +1 @@
+RT-Client-REST-0.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RT-Client-REST/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:49:32 -0000	1.1
+++ sources	24 Apr 2009 06:33:15 -0000	1.2
@@ -0,0 +1 @@
+383bf572afdb8040641d4d413ef96476  RT-Client-REST-0.37.tar.gz



From petersen at fedoraproject.org  Fri Apr 24 06:34:38 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 06:34:38 +0000 (UTC)
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.44,1.45
Message-ID: <20090424063438.A4F3670106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/redhat-lsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8938

Modified Files:
	redhat-lsb.spec 
Log Message:
improve url to LSB WG


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- redhat-lsb.spec	23 Apr 2009 06:34:39 -0000	1.44
+++ redhat-lsb.spec	24 Apr 2009 06:34:08 -0000	1.45
@@ -50,7 +50,7 @@
 Name: redhat-lsb
 Version: 3.2
 Release: 4%{?dist}
-URL: http://www.linuxfoundation.org/
+URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
 License: GPLv2
@@ -645,6 +645,9 @@
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com>
+- improve url to LSB WG
+
 * Thu Apr 23 2009 Jens Petersen <petersen at redhat.com> - 3.2-4
 - use dist tag (Debarshi, #496553)
 - update to ix86 (caillon)



From cweyl at fedoraproject.org  Fri Apr 24 06:38:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 24 Apr 2009 06:38:45 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST/F-10 import.log, NONE,
	1.1 perl-RT-Client-REST.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090424063845.79F8270106@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-RT-Client-REST/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9738/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-RT-Client-REST.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-RT-Client-REST-0_37-1_fc10:F-10:perl-RT-Client-REST-0.37-1.fc10.src.rpm:1240555091


--- NEW FILE perl-RT-Client-REST.spec ---
Name:       perl-RT-Client-REST 
Version:    0.37 
Release:    1%{?dist}
# lib/RT/Client/REST.pm -> GPLv2
# see also /usr/bin/rt from the rt3 package
License:    GPLv2
Group:      Development/Libraries
Summary:    Talk to RT using REST protocol 
Source:     http://search.cpan.org/CPAN/authors/id/D/DM/DMITRI/RT-Client-REST-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/RT-Client-REST
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Encode)
BuildRequires: perl(Error)
BuildRequires: perl(Exception::Class)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(HTTP::Cookies)
BuildRequires: perl(HTTP::Request::Common)
BuildRequires: perl(LWP)
BuildRequires: perl(Params::Validate)
# testing
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Kwalitee)

%description
*RT::Client::REST* is */usr/bin/rt* converted to a Perl module. I needed
to implement some RT interactions from my application, but did not feel
that invoking a shell command is appropriate. Thus, I took *rt* tool,
written by Abhijit Menon-Sen, and converted it to an object-oriented
Perl module.


%prep
%setup -q -n RT-Client-REST-%{version}

cat Changes | iconv -f iso8859-1 -t utf8 > x
mv x Changes

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Apr 20 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
- submission

* Sat Apr 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-RT-Client-REST/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:49:32 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:38:14 -0000	1.2
@@ -0,0 +1 @@
+RT-Client-REST-0.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-RT-Client-REST/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:49:32 -0000	1.1
+++ sources	24 Apr 2009 06:38:15 -0000	1.2
@@ -0,0 +1 @@
+383bf572afdb8040641d4d413ef96476  RT-Client-REST-0.37.tar.gz



From mmaslano at fedoraproject.org  Fri Apr 24 06:38:54 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 24 Apr 2009 06:38:54 +0000 (UTC)
Subject: rpms/perl-Text-VimColor/F-11 perl-Text-VimColor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424063854.A345070106@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Text-VimColor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9804

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-VimColor.spec 
Log Message:
* Thu Apr 16 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- add require and BR



--- NEW FILE perl-Text-VimColor.spec ---
Name:           perl-Text-VimColor
Version:        0.11
Release:        2%{?dist}
Summary:        Syntax color text in HTML or XML using Vim
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-VimColor/
Source0:        http://www.cpan.org/authors/id/G/GE/GEOFFR/Text-VimColor-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Path::Class) >= 0.02
BuildRequires:  perl(Test::More)
# needed for test
BuildRequires:  vim-enhanced
BuildRequires:  perl(XML::Parser)
Requires:       vim-enhanced
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:      noarch

%description
This module tries to markup text files according to their syntax. It can be
used to produce web pages with pretty-printed colourful source code
samples. It can produce output in the following formats:
  text-vimcolor --format html --filetype prolog foo.pl > foo.html
This program is a command line interface to the Perl module Text::VimColor.

%prep
%setup -q -n Text-VimColor-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/text-vimcolor
/usr/lib/perl5/vendor_perl/5.10.0/Text
%{_mandir}/man3/*
%{_mandir}/man1/text-vimcolor.1.gz

%changelog
* Thu Apr 16 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- add require and BR

* Thu Apr 16 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-VimColor/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:50:36 -0000	1.1
+++ .cvsignore	24 Apr 2009 06:38:24 -0000	1.2
@@ -0,0 +1 @@
+Text-VimColor-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-VimColor/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:50:36 -0000	1.1
+++ sources	24 Apr 2009 06:38:24 -0000	1.2
@@ -0,0 +1 @@
+268fb3f630b463fcec528d798dcf77c3  Text-VimColor-0.11.tar.gz



From caolanm at fedoraproject.org  Fri Apr 24 07:18:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 07:18:38 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1893,1.1894
Message-ID: <20090424071839.1E5157013D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16155/devel

Modified Files:
	openoffice.org.spec 
Log Message:
survey foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1893
retrieving revision 1.1894
diff -u -r1.1893 -r1.1894
--- openoffice.org.spec	23 Apr 2009 08:29:14 -0000	1.1893
+++ openoffice.org.spec	24 Apr 2009 07:18:08 -0000	1.1894
@@ -2794,6 +2794,7 @@
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Embedding
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-survey.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu



From caolanm at fedoraproject.org  Fri Apr 24 07:18:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 07:18:38 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1892,1.1893
Message-ID: <20090424071839.16B8770107@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16155/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
survey foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1892
retrieving revision 1.1893
diff -u -r1.1892 -r1.1893
--- openoffice.org.spec	23 Apr 2009 08:29:13 -0000	1.1892
+++ openoffice.org.spec	24 Apr 2009 07:18:06 -0000	1.1893
@@ -2794,6 +2794,7 @@
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Embedding
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-survey.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu



From mjakubicek at fedoraproject.org  Fri Apr 24 07:20:02 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 07:20:02 +0000 (UTC)
Subject: rpms/kadu/F-11 kadu-gcc44.patch,NONE,1.1 kadu.spec,1.43,1.44
Message-ID: <20090424072002.5605D70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/kadu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16849/F-11

Modified Files:
	kadu.spec 
Added Files:
	kadu-gcc44.patch 
Log Message:
- Fix FTBFS: added kadu-gcc44.patch



kadu-gcc44.patch:

--- NEW FILE kadu-gcc44.patch ---
--- kadu-core/protocol.h.orig	2009-04-24 00:46:53.000000000 +0200
+++ kadu-core/protocol.h	2009-04-24 00:47:48.000000000 +0200
@@ -14,6 +14,7 @@
 
 #include "status.h"
 #include "usergroup.h"
+#include <stdint.h>
 
 typedef uint32_t UinType;
 
--- kadu-core/userbox.h.orig	2009-04-24 00:47:07.000000000 +0200
+++ kadu-core/userbox.h	2009-04-24 00:48:02.000000000 +0200
@@ -20,6 +20,7 @@
 #include "userlist.h"
 
 #include "exports.h"
+#include <stdint.h>
 
 class QFontMetrics;
 
--- kadu-core/action.h.orig	2009-04-24 09:00:08.000000000 +0200
+++ kadu-core/action.h	2009-04-24 09:01:08.000000000 +0200
@@ -91,7 +91,7 @@
 	ActionType Type;
 	QString Name;
 	QObject *Object;
-	char *Slot;
+	const char *Slot;
 	QString IconName;
 	QString Text;
 	QString CheckedText;
@@ -107,7 +107,7 @@
 	virtual void configurationUpdated();
 
 public:
-	ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
+	ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
 		const QString &IconName, const QString &Text, bool Checkable = false, const QString &CheckedText = "", ActionBoolCallback enableCallback = 0);
 	virtual ~ActionDescription();
 
--- kadu-core/action.cpp.orig	2009-04-24 09:00:13.000000000 +0200
+++ kadu-core/action.cpp	2009-04-24 09:01:15.000000000 +0200
@@ -115,7 +115,7 @@
 		setIcon(icons_manager->loadIcon(Description->IconName));
 }
 
-ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
+ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
 	const QString &IconName, const QString &Text, bool Checkable, const QString &CheckedText, ActionBoolCallback enableCallback)
 	: ShortcutItem(""), ShortcutContext(Qt::WidgetShortcut)
 {


Index: kadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/F-11/kadu.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kadu.spec	25 Feb 2009 10:06:06 -0000	1.43
+++ kadu.spec	24 Apr 2009 07:19:32 -0000	1.44
@@ -107,7 +107,7 @@
 Name:		kadu_opt
 %endif
 Version:	0.6.5
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Summary(pl):	Klient Gadu-Gadu
 Group:		Applications/Internet
@@ -156,6 +156,8 @@
 
 #Patch0:		kadu-0.6.0-xmmsfix.patch
 Patch0:		kadu-0.6.5-voice-external-libgsm.patch
+Patch1:		kadu-gcc44.patch
+# Sent to kadu-security [AT]??kadu [DOT] net on 2009/04/24
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cmake
 BuildRequires:	libpng-devel libsndfile-devel openssl-devel
@@ -502,10 +504,11 @@
 #echo 'install (FILES "data/mediaplayer.png" DESTINATION "share/kadu/modules/data/mediaplayer")' >> modules/mediaplayer/CMakeLists.txt
 
 %patch0
+%patch1
 
 %build
 %{cmake} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_USE_PTHREADS:BOOL=ON -DBUILD_DESCRIPTION="Fedora" .
-make VERBOSE=1 %{?_smp_mflags}
+make -k VERBOSE=1 %{?_smp_mflags}
 
 
 %install
@@ -678,6 +681,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.5-10
+- Fix FTBFS: added kadu-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 07:20:02 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 07:20:02 +0000 (UTC)
Subject: rpms/kadu/devel kadu-gcc44.patch,NONE,1.1 kadu.spec,1.43,1.44
Message-ID: <20090424072002.B008A70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/kadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16849/devel

Modified Files:
	kadu.spec 
Added Files:
	kadu-gcc44.patch 
Log Message:
- Fix FTBFS: added kadu-gcc44.patch



kadu-gcc44.patch:

--- NEW FILE kadu-gcc44.patch ---
--- kadu-core/protocol.h.orig	2009-04-24 00:46:53.000000000 +0200
+++ kadu-core/protocol.h	2009-04-24 00:47:48.000000000 +0200
@@ -14,6 +14,7 @@
 
 #include "status.h"
 #include "usergroup.h"
+#include <stdint.h>
 
 typedef uint32_t UinType;
 
--- kadu-core/userbox.h.orig	2009-04-24 00:47:07.000000000 +0200
+++ kadu-core/userbox.h	2009-04-24 00:48:02.000000000 +0200
@@ -20,6 +20,7 @@
 #include "userlist.h"
 
 #include "exports.h"
+#include <stdint.h>
 
 class QFontMetrics;
 
--- kadu-core/action.h.orig	2009-04-24 09:00:08.000000000 +0200
+++ kadu-core/action.h	2009-04-24 09:01:08.000000000 +0200
@@ -91,7 +91,7 @@
 	ActionType Type;
 	QString Name;
 	QObject *Object;
-	char *Slot;
+	const char *Slot;
 	QString IconName;
 	QString Text;
 	QString CheckedText;
@@ -107,7 +107,7 @@
 	virtual void configurationUpdated();
 
 public:
-	ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
+	ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
 		const QString &IconName, const QString &Text, bool Checkable = false, const QString &CheckedText = "", ActionBoolCallback enableCallback = 0);
 	virtual ~ActionDescription();
 
--- kadu-core/action.cpp.orig	2009-04-24 09:00:13.000000000 +0200
+++ kadu-core/action.cpp	2009-04-24 09:01:15.000000000 +0200
@@ -115,7 +115,7 @@
 		setIcon(icons_manager->loadIcon(Description->IconName));
 }
 
-ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
+ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
 	const QString &IconName, const QString &Text, bool Checkable, const QString &CheckedText, ActionBoolCallback enableCallback)
 	: ShortcutItem(""), ShortcutContext(Qt::WidgetShortcut)
 {


Index: kadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kadu.spec	25 Feb 2009 10:06:06 -0000	1.43
+++ kadu.spec	24 Apr 2009 07:19:32 -0000	1.44
@@ -107,7 +107,7 @@
 Name:		kadu_opt
 %endif
 Version:	0.6.5
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Summary(pl):	Klient Gadu-Gadu
 Group:		Applications/Internet
@@ -156,6 +156,8 @@
 
 #Patch0:		kadu-0.6.0-xmmsfix.patch
 Patch0:		kadu-0.6.5-voice-external-libgsm.patch
+Patch1:		kadu-gcc44.patch
+# Sent to kadu-security [AT]??kadu [DOT] net on 2009/04/24
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cmake
 BuildRequires:	libpng-devel libsndfile-devel openssl-devel
@@ -502,10 +504,11 @@
 #echo 'install (FILES "data/mediaplayer.png" DESTINATION "share/kadu/modules/data/mediaplayer")' >> modules/mediaplayer/CMakeLists.txt
 
 %patch0
+%patch1
 
 %build
 %{cmake} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_USE_PTHREADS:BOOL=ON -DBUILD_DESCRIPTION="Fedora" .
-make VERBOSE=1 %{?_smp_mflags}
+make -k VERBOSE=1 %{?_smp_mflags}
 
 
 %install
@@ -678,6 +681,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.5-10
+- Fix FTBFS: added kadu-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Fri Apr 24 07:26:21 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 07:26:21 +0000 (UTC)
Subject: rpms/rt3/F-9 rt3.spec,1.28,1.29
Message-ID: <20090424072621.714A370106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18412

Modified Files:
	rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-2
- R: perl(XML::RSS) (BZ #496720).



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-9/rt3.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rt3.spec	24 Apr 2009 06:32:56 -0000	1.28
+++ rt3.spec	24 Apr 2009 07:25:51 -0000	1.29
@@ -129,6 +129,7 @@
 Requires: perl(Regexp::Common)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
+Requires: perl(XML::RSS)
 
 # Split out. Technically, not actually necessary, but ... let's keep it for now.
 Requires: rt3-mailgate
@@ -346,6 +347,7 @@
 %changelog
 * Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-2
 - README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+- R: perl(XML::RSS) (BZ #496720).
 
 * Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-1
 - Upgrade (BZ 481165 - CVE-2008-3502).



From petersen at fedoraproject.org  Fri Apr 24 07:28:45 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 07:28:45 +0000 (UTC)
Subject: rpms/ghc/devel ghc-rpm-macros.ghc, 1.14, 1.15 ghc.spec, 1.81,
	1.82 ghc-rpm-requires, 1.1, NONE
Message-ID: <20090424072845.4609970106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18779

Modified Files:
	ghc-rpm-macros.ghc ghc.spec 
Removed Files:
	ghc-rpm-requires 
Log Message:
- define ghc_version in macros.ghc in place of ghcrequires
- drop ghc-requires script for now




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ghc-rpm-macros.ghc	19 Apr 2009 04:28:22 -0000	1.14
+++ ghc-rpm-macros.ghc	24 Apr 2009 07:28:14 -0000	1.15
@@ -35,4 +35,4 @@
 
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
-%ghcrequires() %{expand:%(/usr/lib/rpm/ghc-requires %*)}
+%ghc_version %(ghc --numeric-version)


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ghc.spec	19 Apr 2009 04:28:22 -0000	1.81
+++ ghc.spec	24 Apr 2009 07:28:14 -0000	1.82
@@ -16,7 +16,7 @@
 
 Name: ghc
 Version: 6.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -26,8 +26,6 @@
 Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 # /etc/rpm/macros.ghc
 Source2: ghc-rpm-macros.ghc
-# /usr/lib/rpm/ghc-requires
-Source3: ghc-rpm-requires
 URL: http://haskell.org/ghc/
 # libedit-devel > 2.11-2 correctly requires ncurses-devel
 Requires: gcc, gmp-devel, libedit-devel > 2.11-2
@@ -223,6 +221,10 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-3
+- define ghc_version in macros.ghc in place of ghcrequires
+- drop ghc-requires script for now
+
 * Sun Apr 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-2
 - add ghc-requires rpm script to generate ghc version dependencies
   (thanks to Till Maas)


--- ghc-rpm-requires DELETED ---



From corsepiu at fedoraproject.org  Fri Apr 24 07:29:10 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 07:29:10 +0000 (UTC)
Subject: rpms/rt3/F-10 rt3.spec,1.37,1.38
Message-ID: <20090424072910.B01FA70106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18907/F-10

Modified Files:
	rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
- R: perl(XML::RSS) (BZ #496720).



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rt3.spec	24 Apr 2009 06:30:02 -0000	1.37
+++ rt3.spec	24 Apr 2009 07:28:40 -0000	1.38
@@ -176,6 +176,7 @@
 Requires: perl(Net::Server::PreFork)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
+Requires: perl(XML::RSS)
 
 # rpm fails to add these:
 Provides: perl(RT::Shredder::Exceptions)
@@ -432,6 +433,7 @@
 %changelog
 * Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
 - README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+- R: perl(XML::RSS) (BZ #496720).
 
 * Wed Feb 18 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-5
 - Add R: perl(Class::Accessor::Fast), perl(Exception::Class::Base),



From corsepiu at fedoraproject.org  Fri Apr 24 07:29:11 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 07:29:11 +0000 (UTC)
Subject: rpms/rt3/F-11 rt3.spec,1.38,1.39
Message-ID: <20090424072911.26BFF70106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18907/F-11

Modified Files:
	rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
- R: perl(XML::RSS) (BZ #496720).



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt3.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rt3.spec	24 Apr 2009 06:28:05 -0000	1.38
+++ rt3.spec	24 Apr 2009 07:28:40 -0000	1.39
@@ -176,6 +176,7 @@
 Requires: perl(Net::Server::PreFork)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
+Requires: perl(XML::RSS)
 
 # rpm fails to add these:
 Provides: perl(RT::Shredder::Exceptions)
@@ -432,6 +433,7 @@
 %changelog
 * Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
 - README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+- R: perl(XML::RSS) (BZ #496720).
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From corsepiu at fedoraproject.org  Fri Apr 24 07:29:11 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 24 Apr 2009 07:29:11 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.38,1.39
Message-ID: <20090424072911.77AD770106@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18907/devel

Modified Files:
	rt3.spec 
Log Message:
* Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
- R: perl(XML::RSS) (BZ #496720).



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rt3.spec	24 Apr 2009 06:26:34 -0000	1.38
+++ rt3.spec	24 Apr 2009 07:28:41 -0000	1.39
@@ -176,6 +176,7 @@
 Requires: perl(Net::Server::PreFork)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
+Requires: perl(XML::RSS)
 
 # rpm fails to add these:
 Provides: perl(RT::Shredder::Exceptions)
@@ -432,6 +433,7 @@
 %changelog
 * Fri Apr 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-7
 - README.fedora.in: Add --dba root to rt-setup-database (BZ #488621).
+- R: perl(XML::RSS) (BZ #496720).
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From abompard at fedoraproject.org  Fri Apr 24 07:43:20 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 24 Apr 2009 07:43:20 +0000 (UTC)
Subject: rpms/blobby/F-10 blobby-0.6-arm.patch,NONE,1.1 blobby.spec,1.7,1.8
Message-ID: <20090424074320.997B770106@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/blobby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20933/F-10

Modified Files:
	blobby.spec 
Added Files:
	blobby-0.6-arm.patch 
Log Message:
* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
- add ARM patch, thanks to Kedar Sovani


blobby-0.6-arm.patch:

--- NEW FILE blobby-0.6-arm.patch ---
--- blobby-alpha-6/src/raknet/Types.h.orig	2009-04-21 16:18:32.000000000 -0400
+++ blobby-alpha-6/src/raknet/Types.h	2009-04-21 16:19:51.000000000 -0400
@@ -87,7 +87,7 @@
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define HOST_ENDIAN_IS_BIG
 
@@ -95,7 +95,7 @@
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define HOST_ENDIAN_IS_LITTLE
 
@@ -123,7 +123,7 @@ namespace cat
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define BIG_ENDIAN
 
@@ -131,7 +131,7 @@ namespace cat
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define LITTLE_ENDIAN
 


Index: blobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobby/F-10/blobby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- blobby.spec	5 Jun 2008 20:01:54 -0000	1.7
+++ blobby.spec	24 Apr 2009 07:42:50 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           blobby
 Version:        0.6
-Release:        0.9.a%{?dist}
-Summary:        Blobby Volley 2, a volley-ball game
+Release:        0.12.a%{?dist}
+Summary:        Volley-ball game
 
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,6 +10,7 @@
 Source1:        blobby.desktop
 Patch0:         blobby-0.6-optflags.patch
 Patch1:         blobby-0.6-gcc43.patch
+Patch2:         blobby-0.6-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, physfs-devel, zlib-devel
@@ -27,6 +28,7 @@
 %setup -q -n blobby-alpha-6
 %patch0 -p0 -b .optflags
 %patch1 -p0 -b .gcc43
+%patch2 -p1 -b .arm
 
 
 %build
@@ -76,6 +78,15 @@
 
 
 %changelog
+* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
+- add ARM patch, thanks to Kedar Sovani
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-0.11.a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 22 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.10.a
+- update Summary to comply with the guidelines
+
 * Thu Jun 05 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.9.a
 - fix build with gcc 4.3 (patch1)
 



From abompard at fedoraproject.org  Fri Apr 24 07:43:20 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 24 Apr 2009 07:43:20 +0000 (UTC)
Subject: rpms/blobby/F-11 blobby-0.6-arm.patch, NONE, 1.1 blobby.spec, 1.9,
	1.10
Message-ID: <20090424074320.C280870106@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/blobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20933/F-11

Modified Files:
	blobby.spec 
Added Files:
	blobby-0.6-arm.patch 
Log Message:
* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
- add ARM patch, thanks to Kedar Sovani


blobby-0.6-arm.patch:

--- NEW FILE blobby-0.6-arm.patch ---
--- blobby-alpha-6/src/raknet/Types.h.orig	2009-04-21 16:18:32.000000000 -0400
+++ blobby-alpha-6/src/raknet/Types.h	2009-04-21 16:19:51.000000000 -0400
@@ -87,7 +87,7 @@
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define HOST_ENDIAN_IS_BIG
 
@@ -95,7 +95,7 @@
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define HOST_ENDIAN_IS_LITTLE
 
@@ -123,7 +123,7 @@ namespace cat
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define BIG_ENDIAN
 
@@ -131,7 +131,7 @@ namespace cat
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define LITTLE_ENDIAN
 


Index: blobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobby/F-11/blobby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- blobby.spec	24 Feb 2009 05:04:39 -0000	1.9
+++ blobby.spec	24 Apr 2009 07:42:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           blobby
 Version:        0.6
-Release:        0.11.a%{?dist}
+Release:        0.12.a%{?dist}
 Summary:        Volley-ball game
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:        blobby.desktop
 Patch0:         blobby-0.6-optflags.patch
 Patch1:         blobby-0.6-gcc43.patch
+Patch2:         blobby-0.6-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, physfs-devel, zlib-devel
@@ -27,6 +28,7 @@
 %setup -q -n blobby-alpha-6
 %patch0 -p0 -b .optflags
 %patch1 -p0 -b .gcc43
+%patch2 -p1 -b .arm
 
 
 %build
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
+- add ARM patch, thanks to Kedar Sovani
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-0.11.a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From abompard at fedoraproject.org  Fri Apr 24 07:43:21 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 24 Apr 2009 07:43:21 +0000 (UTC)
Subject: rpms/blobby/F-9 blobby-0.6-arm.patch,NONE,1.1 blobby.spec,1.5,1.6
Message-ID: <20090424074321.22E6770106@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/blobby/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20933/F-9

Modified Files:
	blobby.spec 
Added Files:
	blobby-0.6-arm.patch 
Log Message:
* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
- add ARM patch, thanks to Kedar Sovani


blobby-0.6-arm.patch:

--- NEW FILE blobby-0.6-arm.patch ---
--- blobby-alpha-6/src/raknet/Types.h.orig	2009-04-21 16:18:32.000000000 -0400
+++ blobby-alpha-6/src/raknet/Types.h	2009-04-21 16:19:51.000000000 -0400
@@ -87,7 +87,7 @@
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define HOST_ENDIAN_IS_BIG
 
@@ -95,7 +95,7 @@
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define HOST_ENDIAN_IS_LITTLE
 
@@ -123,7 +123,7 @@ namespace cat
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define BIG_ENDIAN
 
@@ -131,7 +131,7 @@ namespace cat
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define LITTLE_ENDIAN
 


Index: blobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobby/F-9/blobby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blobby.spec	18 Feb 2008 18:13:57 -0000	1.5
+++ blobby.spec	24 Apr 2009 07:42:50 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           blobby
 Version:        0.6
-Release:        0.8.a%{?dist}
-Summary:        Blobby Volley 2, a volley-ball game
+Release:        0.12.a%{?dist}
+Summary:        Volley-ball game
 
 Group:          Amusements/Games
 License:        GPLv2+
@@ -9,6 +9,8 @@
 Source0:        http://dl.sf.net/blobby/blobby2-linux-%{version}a.tar.gz
 Source1:        blobby.desktop
 Patch0:         blobby-0.6-optflags.patch
+Patch1:         blobby-0.6-gcc43.patch
+Patch2:         blobby-0.6-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, physfs-devel, zlib-devel
@@ -25,6 +27,8 @@
 %prep
 %setup -q -n blobby-alpha-6
 %patch0 -p0 -b .optflags
+%patch1 -p0 -b .gcc43
+%patch2 -p1 -b .arm
 
 
 %build
@@ -74,6 +78,18 @@
 
 
 %changelog
+* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
+- add ARM patch, thanks to Kedar Sovani
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-0.11.a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 22 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.10.a
+- update Summary to comply with the guidelines
+
+* Thu Jun 05 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.9.a
+- fix build with gcc 4.3 (patch1)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6-0.8.a
 - Autorebuild for GCC 4.3
 



From abompard at fedoraproject.org  Fri Apr 24 07:43:21 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 24 Apr 2009 07:43:21 +0000 (UTC)
Subject: rpms/blobby/devel blobby-0.6-arm.patch, NONE, 1.1 blobby.spec, 1.9,
	1.10
Message-ID: <20090424074321.6A5D670106@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/blobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20933/devel

Modified Files:
	blobby.spec 
Added Files:
	blobby-0.6-arm.patch 
Log Message:
* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
- add ARM patch, thanks to Kedar Sovani


blobby-0.6-arm.patch:

--- NEW FILE blobby-0.6-arm.patch ---
--- blobby-alpha-6/src/raknet/Types.h.orig	2009-04-21 16:18:32.000000000 -0400
+++ blobby-alpha-6/src/raknet/Types.h	2009-04-21 16:19:51.000000000 -0400
@@ -87,7 +87,7 @@
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define HOST_ENDIAN_IS_BIG
 
@@ -95,7 +95,7 @@
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define HOST_ENDIAN_IS_LITTLE
 
@@ -123,7 +123,7 @@ namespace cat
 	defined(tahoe) || defined(ibm032) || defined(ibm370) || defined(MIPSEB) || \
 	defined(__convex__) || defined(DGUX) || defined(hppa) || defined(apollo) || \
 	defined(_CRAY) || defined(__hp9000) || defined(__hp9000s300) || defined(_AIX) || \
-	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2)
+	defined(__AIX) || defined(__pyr__) || defined(hp9000s700) || defined(_IBMR2) || defined(__ARMEB__)
 
 # define BIG_ENDIAN
 
@@ -131,7 +131,7 @@ namespace cat
 	defined(__amd64) || defined(__amd64__)	|| \
 	defined(__alpha__) || defined(__alpha) || defined(__ia64) || defined(__ia64__) || \
 	defined(_M_ALPHA) || defined(ns32000) || defined(__ns32000__) || defined(sequent) || \
-	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__)
+	defined(MIPSEL) || defined(_MIPSEL) || defined(sun386) || defined(__sun386__) || defined(__ARMEL__)
 
 # define LITTLE_ENDIAN
 


Index: blobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobby/devel/blobby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- blobby.spec	24 Feb 2009 05:04:39 -0000	1.9
+++ blobby.spec	24 Apr 2009 07:42:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           blobby
 Version:        0.6
-Release:        0.11.a%{?dist}
+Release:        0.12.a%{?dist}
 Summary:        Volley-ball game
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:        blobby.desktop
 Patch0:         blobby-0.6-optflags.patch
 Patch1:         blobby-0.6-gcc43.patch
+Patch2:         blobby-0.6-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, physfs-devel, zlib-devel
@@ -27,6 +28,7 @@
 %setup -q -n blobby-alpha-6
 %patch0 -p0 -b .optflags
 %patch1 -p0 -b .gcc43
+%patch2 -p1 -b .arm
 
 
 %build
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.6-0.11.a
+- add ARM patch, thanks to Kedar Sovani
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-0.11.a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mmaslano at fedoraproject.org  Fri Apr 24 07:49:31 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 24 Apr 2009 07:49:31 +0000 (UTC)
Subject: rpms/iproute/devel iproute2-2.6.29-IPPROTO_IP_for_SA.patch, NONE,
	1.1 iproute2-2.6.29-tc_modules.patch, NONE,
	1.1 iproute-ip-man.patch, 1.7, 1.8 iproute.spec, 1.95,
	1.96 iproute2-2.6.25-segfault.patch, 1.5,
	1.6 iproute2-2.6.29-fix_headers_for_gre.patch, 1.1,
	1.2 iproute2-2.6.9-kernel.patch, 1.7,
	1.8 iproute2-display_ip4ip6tunnels.patch, 1.1,
	1.2 iproute2-missing-arpd-directory.patch, 1.1,
	1.2 iproute2-sharepath.patch, 1.2,
	1.3 iproute2-ss050901-opt_flags.patch, 1.9, 1.10
Message-ID: <20090424074931.5543D7013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22589

Modified Files:
	iproute-ip-man.patch iproute.spec 
	iproute2-2.6.25-segfault.patch 
	iproute2-2.6.29-fix_headers_for_gre.patch 
	iproute2-2.6.9-kernel.patch 
	iproute2-display_ip4ip6tunnels.patch 
	iproute2-missing-arpd-directory.patch iproute2-sharepath.patch 
	iproute2-ss050901-opt_flags.patch 
Added Files:
	iproute2-2.6.29-IPPROTO_IP_for_SA.patch 
	iproute2-2.6.29-tc_modules.patch 
Log Message:
* Thu Apr 23 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.29-3
- new iptables (xtables) bring problems to tc, when ipt is used. 
  rhbz#497344 still broken. tc_modules.patch brings correct paths to
  xtables, but that doesn't fix whole issue.
- 497355 ip should allow creation of an IPsec SA with 'proto any' 
  and specified sport and dport as selectors


iproute2-2.6.29-IPPROTO_IP_for_SA.patch:

--- NEW FILE iproute2-2.6.29-IPPROTO_IP_for_SA.patch ---
diff -up iproute2-2.6.29/ip/ipxfrm.c.old iproute2-2.6.29/ip/ipxfrm.c
--- iproute2-2.6.29/ip/ipxfrm.c.old	2009-03-24 23:15:14.000000000 +0100
+++ iproute2-2.6.29/ip/ipxfrm.c	2009-04-24 09:35:58.203735119 +0200
@@ -1156,6 +1156,7 @@ static int xfrm_selector_upspec_parse(st
 		case IPPROTO_UDP:
 		case IPPROTO_SCTP:
 		case IPPROTO_DCCP:
+		case IPPROTO_IP:	/* to allow shared SA for different protocols */
 			break;
 		default:
 			fprintf(stderr, "\"sport\" and \"dport\" are invalid with proto=%s\n", strxf_proto(sel->proto));

iproute2-2.6.29-tc_modules.patch:

--- NEW FILE iproute2-2.6.29-tc_modules.patch ---
diff -up iproute2-2.6.29/Makefile.ipt iproute2-2.6.29/Makefile
--- iproute2-2.6.29/Makefile.ipt	2009-04-23 15:19:19.000000000 +0200
+++ iproute2-2.6.29/Makefile	2009-04-23 15:27:19.802477954 +0200
@@ -10,7 +10,7 @@ ARPDDIR=/var/lib/arpd                   
 # Path to db_185.h include
 DBM_INCLUDE:=/usr/include
 
-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
 
 #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
 LDLIBS=-lresolv

iproute-ip-man.patch:

Index: iproute-ip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute-ip-man.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iproute-ip-man.patch	25 Mar 2009 12:49:42 -0000	1.7
+++ iproute-ip-man.patch	24 Apr 2009 07:49:30 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8
---- iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
+--- iproute2-2.6.29/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.29/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
 @@ -190,6 +190,8 @@ replace " | " monitor " } "
  .IR NUMBER " ] [ "
  .B  cwnd


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- iproute.spec	14 Apr 2009 11:10:54 -0000	1.95
+++ iproute.spec	24 Apr 2009 07:49:30 -0000	1.96
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.29
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
@@ -17,19 +17,31 @@
 Patch6: iproute2-2.6.29-fix_headers_for_gre.patch
 Patch7: iproute2-missing-arpd-directory.patch
 Patch8: iproute2-display_ip4ip6tunnels.patch
+Patch9: iproute2-2.6.29-tc_modules.patch
+Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tetex-latex tetex-dvips linuxdoc-tools
 BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison
+# introduction new iptables (xtables) which broke ipt
+Requires:      iptables >= 1.4.1
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
 example) which are designed to use the advanced networking
 capabilities of the Linux 2.4.x and 2.6.x kernel.
 
+%package doc
+Summary: ip and tc documentation with examples
+Group:  Applications/System
+License: GPLv2+
+
+%description doc
+The iproute documentation contains howtos and examples of settings.
+
 %prep
-%setup -q -c iproute-%{version}
+%setup -q -n iproute2-%{version}
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
@@ -38,11 +50,13 @@
 %patch6 -p1 -b .hdrs
 %patch7 -p1 -b .arpd
 %patch8 -p1 -b .ip4ip6
+%patch9 -p1 -b .ipt
+%patch10 -p1 -b .ipproto
 
 %build
-export LIBDIR=%{_libdir}
+export LIBDIR=/%{_libdir}
+export IPT_LIB_DIR=/%{_lib}/xtables
 
-cd iproute2-%{version}
 make %{?_smp_mflags}
 make -C doc
 
@@ -56,7 +70,6 @@
 	$RPM_BUILD_ROOT%{_datadir}/tc \
 	$RPM_BUILD_ROOT%{_libdir}/tc
 
-cd iproute2-%{version}
 install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
 install -m 755 misc/ss misc/nstat misc/rtacct misc/lnstat misc/arpd $RPM_BUILD_ROOT%{_sbindir}
 #netem is static
@@ -98,9 +111,7 @@
 %files
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/iproute2
-%doc iproute2-%{version}/README.decnet iproute2-%{version}/README.iproute2+tc iproute2-%{version}/RELNOTES iproute2-%{version}/examples/README.cbq
-%doc iproute2-%{version}/doc/*.ps 
-%doc iproute2-%{version}/examples
+%doc README README.decnet README.iproute2+tc README.distribution README.lnstat
 /sbin/*
 %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
@@ -112,7 +123,20 @@
 %dir %{_sysconfdir}/sysconfig/cbq
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/*.ps
+%doc examples
+%doc RELNOTES
+
 %changelog
+* Thu Apr 23 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.29-3
+- new iptables (xtables) bring problems to tc, when ipt is used. 
+  rhbz#497344 still broken. tc_modules.patch brings correct paths to
+  xtables, but that doesn't fix whole issue.
+- 497355 ip should allow creation of an IPsec SA with 'proto any' 
+  and specified sport and dport as selectors
+
 * Tue Apr 14 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.29-2
 - c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default 
  display of ip4ip6 tunnels

iproute2-2.6.25-segfault.patch:

Index: iproute2-2.6.25-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.25-segfault.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iproute2-2.6.25-segfault.patch	25 Mar 2009 12:49:42 -0000	1.5
+++ iproute2-2.6.25-segfault.patch	24 Apr 2009 07:49:30 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c.seg iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c
---- iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c.seg	2008-07-21 17:23:12.000000000 +0200
-+++ iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c	2008-07-22 09:27:12.000000000 +0200
+--- iproute2-2.6.29/ip/xfrm_state.c.seg	2008-07-21 17:23:12.000000000 +0200
++++ iproute2-2.6.29/ip/xfrm_state.c	2008-07-22 09:27:12.000000000 +0200
 @@ -158,12 +158,16 @@ static int xfrm_algo_parse(struct xfrm_a
  			buf[j] = val;
  		}

iproute2-2.6.29-fix_headers_for_gre.patch:

Index: iproute2-2.6.29-fix_headers_for_gre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.29-fix_headers_for_gre.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-2.6.29-fix_headers_for_gre.patch	25 Mar 2009 12:49:42 -0000	1.1
+++ iproute2-2.6.29-fix_headers_for_gre.patch	24 Apr 2009 07:49:30 -0000	1.2
@@ -10,8 +10,8 @@
 
 diff --git a/ip/link_gre.c b/ip/link_gre.c
 index 9109312..9f8bde6 100644
---- iproute-2.6.29/iproute2-2.6.29/ip/link_gre.c.old
-+++ iproute-2.6.29/iproute2-2.6.29/ip/link_gre.c
+--- iproute2-2.6.29/ip/link_gre.c.old
++++ iproute2-2.6.29/ip/link_gre.c
 @@ -12,11 +12,12 @@
  
  #include <string.h>

iproute2-2.6.9-kernel.patch:

Index: iproute2-2.6.9-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.9-kernel.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iproute2-2.6.9-kernel.patch	25 Mar 2009 12:49:42 -0000	1.7
+++ iproute2-2.6.9-kernel.patch	24 Apr 2009 07:49:30 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.kernel iproute2-2.6.29/iproute2-2.6.29/Makefile
---- iproute2-2.6.29/iproute2-2.6.29/Makefile.kernel	2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.29/iproute2-2.6.29/Makefile	2008-08-12 14:19:58.000000000 +0200
+--- iproute2-2.6.29/Makefile.kernel	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.29/Makefile	2008-08-12 14:19:58.000000000 +0200
 @@ -3,6 +3,7 @@ SBINDIR=/sbin
  CONFDIR=/etc/iproute2
  DOCDIR=/share/doc/iproute2

iproute2-display_ip4ip6tunnels.patch:

Index: iproute2-display_ip4ip6tunnels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-display_ip4ip6tunnels.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-display_ip4ip6tunnels.patch	14 Apr 2009 11:10:55 -0000	1.1
+++ iproute2-display_ip4ip6tunnels.patch	24 Apr 2009 07:49:30 -0000	1.2
@@ -13,8 +13,8 @@
 
 diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
 index 8421983..8852a67 100644
---- iproute2-2.6.29/iproute2-2.6.29/ip/ip6tunnel.c.old
-+++ iproute2-2.6.29/iproute2-2.6.29/ip/ip6tunnel.c
+--- iproute2-2.6.29/ip/ip6tunnel.c.old
++++ iproute2-2.6.29/ip/ip6tunnel.c
 @@ -335,6 +335,7 @@ static int do_show(int argc, char **argv)
          struct ip6_tnl_parm p;
  

iproute2-missing-arpd-directory.patch:

Index: iproute2-missing-arpd-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-missing-arpd-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-missing-arpd-directory.patch	14 Apr 2009 11:10:55 -0000	1.1
+++ iproute2-missing-arpd-directory.patch	24 Apr 2009 07:49:30 -0000	1.2
@@ -10,8 +10,8 @@
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff -up iproute-2.6.29/iproute2-2.6.29/Makefile.arpd iproute-2.6.29/iproute2-2.6.29/Makefile
---- iproute-2.6.29/iproute2-2.6.29/Makefile.arpd	2009-04-14 12:57:23.743114366 +0200
-+++ iproute-2.6.29/iproute2-2.6.29/Makefile	2009-04-14 12:58:38.754111501 +0200
+--- iproute2-2.6.29/Makefile.arpd	2009-04-14 12:57:23.743114366 +0200
++++ iproute2-2.6.29/Makefile	2009-04-14 12:58:38.754111501 +0200
 @@ -5,6 +5,7 @@ CONFDIR=/etc/iproute2
  DOCDIR=/share/doc/iproute2
  MANDIR=/share/man

iproute2-sharepath.patch:

Index: iproute2-sharepath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-sharepath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iproute2-sharepath.patch	25 Mar 2009 12:49:42 -0000	1.2
+++ iproute2-sharepath.patch	24 Apr 2009 07:49:30 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c
---- iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib	2009-01-15 21:25:04.000000000 +0100
-+++ iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c	2009-02-04 08:58:36.000000000 +0100
+--- iproute2-2.6.29/tc/tc_util.c.movelib	2009-01-15 21:25:04.000000000 +0100
++++ iproute2-2.6.29/tc/tc_util.c	2009-02-04 08:58:36.000000000 +0100
 @@ -24,8 +24,8 @@
  #include "utils.h"
  #include "tc_util.h"

iproute2-ss050901-opt_flags.patch:

Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-ss050901-opt_flags.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iproute2-ss050901-opt_flags.patch	25 Mar 2009 12:49:42 -0000	1.9
+++ iproute2-ss050901-opt_flags.patch	24 Apr 2009 07:49:30 -0000	1.10
@@ -1,6 +1,6 @@
 diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.opt iproute2-2.6.29/iproute2-2.6.29/Makefile
---- iproute2-2.6.29/iproute2-2.6.29/Makefile.opt	2008-08-12 14:19:58.000000000 +0200
-+++ iproute2-2.6.29/iproute2-2.6.29/Makefile	2008-08-12 14:21:42.000000000 +0200
+--- iproute2-2.6.29/Makefile.opt	2008-08-12 14:19:58.000000000 +0200
++++ iproute2-2.6.29/Makefile	2008-08-12 14:21:42.000000000 +0200
 @@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
  
  CC = gcc



From denis at fedoraproject.org  Fri Apr 24 07:50:28 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 24 Apr 2009 07:50:28 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/F-11 gnome-python2-desktop.spec, 1.56,
	1.57
Message-ID: <20090424075028.DDAA370106@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-python2-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23087

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
Fixed cd-burner subpackage Require to use libs package


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/F-11/gnome-python2-desktop.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-python2-desktop.spec	22 Apr 2009 04:11:22 -0000	1.56
+++ gnome-python2-desktop.spec	24 Apr 2009 07:49:58 -0000	1.57
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -173,7 +173,7 @@
 License: GPLv2+
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: nautilus-cd-burner >= %{nautilus_cd_burner_version}
+Requires: nautilus-cd-burner-libs >= %{nautilus_cd_burner_version}
 
 %description -n gnome-python2-nautilus-cd-burner
 This module contains a wrapper that allows the use of nautilus-cd-burner
@@ -329,6 +329,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Fri Apr 24 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-3
+- Fixed cd-burner subpackage Require to use libs package
+
 * Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
 - Rebuild against newer libnautilus-burn.
 



From denis at fedoraproject.org  Fri Apr 24 07:51:47 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 24 Apr 2009 07:51:47 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.56, 
	1.57
Message-ID: <20090424075147.C5EF070106@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23384

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
Fixed cd-burner subpackage Require to use libs package


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-python2-desktop.spec	22 Apr 2009 04:03:24 -0000	1.56
+++ gnome-python2-desktop.spec	24 Apr 2009 07:51:17 -0000	1.57
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -173,7 +173,7 @@
 License: GPLv2+
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: nautilus-cd-burner >= %{nautilus_cd_burner_version}
+Requires: nautilus-cd-burner-libs >= %{nautilus_cd_burner_version}
 
 %description -n gnome-python2-nautilus-cd-burner
 This module contains a wrapper that allows the use of nautilus-cd-burner
@@ -329,6 +329,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Fri Apr 24 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-3
+- Fixed cd-burner subpackage Require to use libs package
+
 * Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
 - Rebuild against newer libnautilus-burn.
 



From denis at fedoraproject.org  Fri Apr 24 08:00:11 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 24 Apr 2009 08:00:11 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.57, 
	1.58
Message-ID: <20090424080012.0790770106@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25009

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
Removed cd-burner subpackage Require on nautilus-cd-burn


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-python2-desktop.spec	24 Apr 2009 07:51:17 -0000	1.57
+++ gnome-python2-desktop.spec	24 Apr 2009 07:59:41 -0000	1.58
@@ -173,7 +173,6 @@
 License: GPLv2+
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: nautilus-cd-burner-libs >= %{nautilus_cd_burner_version}
 
 %description -n gnome-python2-nautilus-cd-burner
 This module contains a wrapper that allows the use of nautilus-cd-burner
@@ -330,7 +329,7 @@
 
 %changelog
 * Fri Apr 24 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-3
-- Fixed cd-burner subpackage Require to use libs package
+- Removed cd-burner subpackage Require on nautilus-cd-burn
 
 * Wed Apr 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.0-2.fc11
 - Rebuild against newer libnautilus-burn.



From petersen at fedoraproject.org  Fri Apr 24 08:00:27 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 08:00:27 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.82,1.83
Message-ID: <20090424080027.9543070106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25080

Modified Files:
	ghc.spec 
Log Message:
remove ghc-requires from %install and %files


Index: ghc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ghc.spec	24 Apr 2009 07:28:14 -0000	1.82
+++ ghc.spec	24 Apr 2009 07:59:57 -0000	1.83
@@ -126,9 +126,6 @@
 # install rpm macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
 cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
-# rpm script for ghc version deps
-mkdir -p ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm
-cp -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/ghc-requires
 
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
@@ -195,7 +192,6 @@
 %{_bindir}/*
 %{_sysconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
-%attr(755,root,root) %{_prefix}/lib/rpm/ghc-requires
 
 %if %{with prof}
 %files prof -f rpm-prof-filelist



From jakub at fedoraproject.org  Fri Apr 24 08:04:58 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 24 Apr 2009 08:04:58 +0000 (UTC)
Subject: rpms/gcc/F-11 gcc44-pr39867.patch, NONE, 1.1 .cvsignore, 1.271,
	1.272 gcc.spec, 1.45, 1.46 gcc44-pr39794.patch, 1.1, 1.2 sources,
	1.274, 1.275
Message-ID: <20090424080458.7736170106@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26284

Modified Files:
	.cvsignore gcc.spec gcc44-pr39794.patch sources 
Added Files:
	gcc44-pr39867.patch 
Log Message:
4.4.0-2

gcc44-pr39867.patch:

--- NEW FILE gcc44-pr39867.patch ---
2009-04-24  Paolo Bonzini  <bonzini at gnu.org>

	PR middle-end/39867
	* fold-const.c (fold_cond_expr_with_comparison): When folding
	> and >= to MAX, make sure the MAX uses the same type as the
	comparison's operands.

	* gcc.dg/pr39867.c: New.

--- gcc/fold-const.c	(revision 146581)
+++ gcc/fold-const.c	(working copy)
@@ -5337,31 +5337,34 @@ fold_cond_expr_with_comparison (tree typ
 	break;
 
       case GT_EXPR:
-	/* If C1 is C2 - 1, this is max(A, C2).  */
+	/* If C1 is C2 - 1, this is max(A, C2), but use ARG00's type for
+	   MAX_EXPR, to preserve the signedness of the comparison.  */
 	if (! operand_equal_p (arg2, TYPE_MIN_VALUE (type),
 			       OEP_ONLY_CONST)
 	    && operand_equal_p (arg01,
 				const_binop (MINUS_EXPR, arg2,
 					     build_int_cst (type, 1), 0),
 				OEP_ONLY_CONST))
-	  return pedantic_non_lvalue (fold_build2 (MAX_EXPR,
-						   type,
-						   fold_convert (type, arg1),
-						   arg2));
+	  return pedantic_non_lvalue (fold_convert (type,
+				      fold_build2 (MAX_EXPR, TREE_TYPE (arg00),
+						   arg00,
+						   fold_convert (TREE_TYPE (arg00),
+							         arg2))));
 	break;
 
       case GE_EXPR:
-	/* If C1 is C2 + 1, this is max(A, C2).  */
+	/* If C1 is C2 + 1, this is max(A, C2), with the same care as above.  */
 	if (! operand_equal_p (arg2, TYPE_MAX_VALUE (type),
 			       OEP_ONLY_CONST)
 	    && operand_equal_p (arg01,
 				const_binop (PLUS_EXPR, arg2,
 					     build_int_cst (type, 1), 0),
 				OEP_ONLY_CONST))
-	  return pedantic_non_lvalue (fold_build2 (MAX_EXPR,
-						   type,
-						   fold_convert (type, arg1),
-						   arg2));
+	  return pedantic_non_lvalue (fold_convert (type,
+				      fold_build2 (MAX_EXPR, TREE_TYPE (arg00),
+						   arg00,
+						   fold_convert (TREE_TYPE (arg00),
+							         arg2))));
 	break;
       case NE_EXPR:
 	break;
--- gcc/testsuite/gcc.dg/pr39867.c	2009-04-21 23:33:56.143009234 +0200
+++ gcc/testsuite/gcc.dg/pr39867.c	2009-04-24 09:20:07.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do link } */
+/* { dg-options "-O2" } */
+
+int main (void)
+{
+  int exp = -1;
+  /* Wrong folding of the LHS to an unsigned MAX leads to 4294967295 > 2.  */
+  if ((exp < 2 ? 2U : (unsigned int) exp) != 2)
+    link_error ();
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/.cvsignore,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- .cvsignore	23 Apr 2009 07:34:34 -0000	1.271
+++ .cvsignore	24 Apr 2009 08:04:27 -0000	1.272
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090423.tar.bz2
+gcc-4.4.0-20090424.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gcc.spec	23 Apr 2009 07:34:34 -0000	1.45
+++ gcc.spec	24 Apr 2009 08:04:27 -0000	1.46
@@ -1,9 +1,9 @@
-%define DATE 20090423
-%define SVNREV 146636
+%define DATE 20090424
+%define SVNREV 146674
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 1
+%define gcc_release 2
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -155,6 +155,7 @@
 Patch33: gcc44-rh459374-2.patch
 Patch34: gcc44-rh459374-3.patch
 Patch35: gcc44-cswtch.patch
+Patch36: gcc44-pr39867.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -448,6 +449,7 @@
 %patch33 -p0 -b .rh459374-2~
 %patch34 -p0 -b .rh459374-3~
 %patch35 -p0 -b .cswtch~
+%patch36 -p0 -b .pr39867~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1172,7 +1174,7 @@
 /sbin/install-info \
   --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
 /sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || :
+  --info-dir=%{_infodir} %{_infodir}/gnat_ugn.info.gz || :
 /sbin/install-info \
   --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
 
@@ -1181,7 +1183,7 @@
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
   /sbin/install-info --delete \
-    --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || :
+    --info-dir=%{_infodir} %{_infodir}/gnat_ugn.info.gz || :
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
 fi
@@ -1758,12 +1760,18 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-2
+- update from gcc-4_4-branch
+  - PR c++/38228
+- fix folding of cond expr with comparison to MAX/MIN (PR middle-end/39867)
+- fix up gcc-gnat install-info arguments (#452783)
+
 * Thu Apr 23 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-1
 - update from gcc-4_4-branch
   - GCC 4.4.0 release
   - PRs libstdc++/39802, c++/39639, c/39855, rtl-optimization/39762,
 	testsuite/39781, tree-optimization/39824
-- fix up DSE (PR middle-end/39794)
+- fix up DSE (PR rtl-optimization/39794)
 - debuginfo fixes for VLA and nested/contained functions (#459374)
 - improve -ftree-switch-conversion optimization if the constant is the
   same in all cases

gcc44-pr39794.patch:

Index: gcc44-pr39794.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc44-pr39794.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc44-pr39794.patch	22 Apr 2009 19:01:26 -0000	1.1
+++ gcc44-pr39794.patch	24 Apr 2009 08:04:27 -0000	1.2
@@ -1,22 +1,25 @@
-2009-04-21  Jakub Jelinek  <jakub at redhat.com>
+2009-04-24  Jakub Jelinek  <jakub at redhat.com>
 
-	PR middle-end/39794
+	PR rtl-optimization/39794
 	* alias.c (canon_true_dependence): Add x_addr argument.
 	* rtl.h (canon_true_dependence): Adjust prototype.
 	* cse.c (check_dependence): Adjust canon_true_dependence callers.
 	* cselib.c (cselib_invalidate_mem): Likewise.
 	* gcse.c (compute_transp): Likewise.
 	* dse.c (scan_reads_nospill): Likewise.
-	(record_store, check_mem_read_rtx): Likewise.  For non-const or
-	frame addresses pass cselib_subst_to_values as mem_addr, for
-	const or frame addresses canon_base_mem of the group plus
-	optionally offset.
+	(record_store, check_mem_read_rtx): Likewise.  For non-const-or-frame
+	addresses pass base->val_rtx as mem_addr, for const-or-frame addresses
+	canon_base_addr of the group, plus optional offset.
+	(struct group_info): Rename canon_base_mem to
+	canon_base_addr.
+	(get_group_info): Set canon_base_addr to canon_rtx of base, not
+	canon_rtx of base_mem.
 
 	* gcc.dg/pr39794.c: New test.
 
---- gcc/alias.c.jj	2009-03-28 18:11:42.000000000 +0100
-+++ gcc/alias.c	2009-04-21 12:44:18.000000000 +0200
-@@ -2250,14 +2251,13 @@ true_dependence (const_rtx mem, enum mac
+--- gcc/alias.c.jj	2009-04-22 23:54:25.000000000 +0200
++++ gcc/alias.c	2009-04-23 18:09:28.000000000 +0200
+@@ -2287,14 +2287,13 @@ true_dependence (const_rtx mem, enum mac
     Variant of true_dependence which assumes MEM has already been
     canonicalized (hence we no longer do that here).
     The mem_addr argument has been added, since true_dependence computed
@@ -34,7 +37,7 @@
    if (MEM_VOLATILE_P (x) && MEM_VOLATILE_P (mem))
      return 1;
  
-@@ -2283,7 +2283,8 @@ canon_true_dependence (const_rtx mem, en
+@@ -2320,7 +2319,8 @@ canon_true_dependence (const_rtx mem, en
    if (nonoverlapping_memrefs_p (x, mem))
      return 0;
  
@@ -44,8 +47,37 @@
  
    if (! base_alias_check (x_addr, mem_addr, GET_MODE (x), mem_mode))
      return 0;
---- gcc/dse.c.jj	2009-03-28 18:11:42.000000000 +0100
-+++ gcc/dse.c	2009-04-21 18:11:19.000000000 +0200
+--- gcc/dse.c.jj	2009-04-22 22:20:23.000000000 +0200
++++ gcc/dse.c	2009-04-23 18:20:44.000000000 +0200
+@@ -223,7 +223,7 @@ struct store_info 
+   /* This canonized mem.  */
+   rtx mem;
+ 
+-  /* The result of get_addr on mem.  */
++  /* Canonized MEM address for use by canon_true_dependence.  */
+   rtx mem_addr;
+ 
+   /* If this is non-zero, it is the alias set of a spill location.  */
+@@ -476,8 +476,8 @@ struct group_info 
+      do read dependency.  */
+   rtx base_mem;
+   
+-  /* Canonized version of base_mem, most likely the same thing.  */
+-  rtx canon_base_mem;
++  /* Canonized version of base_mem's address.  */
++  rtx canon_base_addr;
+ 
+   /* These two sets of two bitmaps are used to keep track of how many
+      stores are actually referencing that position from this base.  We
+@@ -705,7 +705,7 @@ get_group_info (rtx base)
+       gi->rtx_base = base;
+       gi->id = rtx_group_next_id++;
+       gi->base_mem = gen_rtx_MEM (QImode, base);
+-      gi->canon_base_mem = canon_rtx (gi->base_mem);
++      gi->canon_base_addr = canon_rtx (base);
+       gi->store1_n = BITMAP_ALLOC (NULL);
+       gi->store1_p = BITMAP_ALLOC (NULL);
+       gi->store2_n = BITMAP_ALLOC (NULL);
 @@ -1286,7 +1286,7 @@ static rtx get_stored_val (store_info_t,
  static int
  record_store (rtx body, bb_info_t bb_info)
@@ -55,28 +87,31 @@
    HOST_WIDE_INT offset = 0;
    HOST_WIDE_INT width = 0;
    alias_set_type spill_alias_set;
-@@ -1456,6 +1456,20 @@ record_store (rtx body, bb_info_t bb_inf
+@@ -1456,6 +1456,23 @@ record_store (rtx body, bb_info_t bb_inf
    ptr = active_local_stores;
    last = NULL;
    redundant_reason = NULL;
 +  mem = canon_rtx (mem);
-+  if (spill_alias_set || group_id < 0)
-+    {
-+      cselib_lookup (XEXP (mem, 0), Pmode, 1);
-+      mem_addr = cselib_subst_to_values (XEXP (mem, 0));
-+    }
++  /* For alias_set != 0 canon_true_dependence should be never called.  */
++  if (spill_alias_set)
++    mem_addr = NULL_RTX;
 +  else
 +    {
-+      group_info_t group
-+	= VEC_index (group_info_t, rtx_group_vec, group_id);
-+      mem_addr = group->canon_base_mem;
++      if (group_id < 0)
++	mem_addr = base->val_rtx;
++      else
++	{
++	  group_info_t group
++	    = VEC_index (group_info_t, rtx_group_vec, group_id);
++	  mem_addr = group->canon_base_addr;
++	}
 +      if (offset)
-+	mem_addr = gen_rtx_PLUS (GET_MODE (mem_addr), mem_addr, GEN_INT (offset));
++	mem_addr = plus_constant (mem_addr, offset);
 +    }
  
    while (ptr)
      {
-@@ -1547,13 +1561,13 @@ record_store (rtx body, bb_info_t bb_inf
+@@ -1547,13 +1564,13 @@ record_store (rtx body, bb_info_t bb_inf
  	  if (canon_true_dependence (s_info->mem, 
  				     GET_MODE (s_info->mem),
  				     s_info->mem_addr,
@@ -92,7 +127,7 @@
        /* An insn can be deleted if every position of every one of
  	 its s_infos is zero.  */
        if (any_positions_needed_p (s_info)
-@@ -1580,9 +1594,9 @@ record_store (rtx body, bb_info_t bb_inf
+@@ -1580,9 +1597,9 @@ record_store (rtx body, bb_info_t bb_inf
    /* Finish filling in the store_info.  */
    store_info->next = insn_info->store_rec;
    insn_info->store_rec = store_info;
@@ -104,7 +139,7 @@
    store_info->cse_base = base;
    if (width > HOST_BITS_PER_WIDE_INT)
      {
-@@ -2006,7 +2020,7 @@ replace_read (store_info_t store_info, i
+@@ -2006,7 +2023,7 @@ replace_read (store_info_t store_info, i
  static int
  check_mem_read_rtx (rtx *loc, void *data)
  {
@@ -113,27 +148,30 @@
    bb_info_t bb_info;
    insn_info_t insn_info;
    HOST_WIDE_INT offset = 0;
-@@ -2058,6 +2072,19 @@ check_mem_read_rtx (rtx *loc, void *data
+@@ -2058,6 +2075,22 @@ check_mem_read_rtx (rtx *loc, void *data
    read_info->end = offset + width;
    read_info->next = insn_info->read_rec;
    insn_info->read_rec = read_info;
-+  if (spill_alias_set || group_id < 0)
-+    {
-+      cselib_lookup (XEXP (mem, 0), Pmode, 1);
-+      mem_addr = cselib_subst_to_values (XEXP (mem, 0));
-+    }
++  /* For alias_set != 0 canon_true_dependence should be never called.  */
++  if (spill_alias_set)
++    mem_addr = NULL_RTX;
 +  else
 +    {
-+      group_info_t group
-+	= VEC_index (group_info_t, rtx_group_vec, group_id);
-+      mem_addr = group->canon_base_mem;
++      if (group_id < 0)
++	mem_addr = base->val_rtx;
++      else
++	{
++	  group_info_t group
++	    = VEC_index (group_info_t, rtx_group_vec, group_id);
++	  mem_addr = group->canon_base_addr;
++	}
 +      if (offset)
-+	mem_addr = gen_rtx_PLUS (GET_MODE (mem_addr), mem_addr, GEN_INT (offset));
++	mem_addr = plus_constant (mem_addr, offset);
 +    }
  
    /* We ignore the clobbers in store_info.  The is mildly aggressive,
       but there really should not be a clobber followed by a read.  */
-@@ -2128,7 +2155,7 @@ check_mem_read_rtx (rtx *loc, void *data
+@@ -2128,7 +2161,7 @@ check_mem_read_rtx (rtx *loc, void *data
  	      = canon_true_dependence (store_info->mem, 
  				       GET_MODE (store_info->mem),
  				       store_info->mem_addr,
@@ -142,7 +180,7 @@
  	  
  	  else if (group_id == store_info->group_id)
  	    {
-@@ -2139,7 +2166,7 @@ check_mem_read_rtx (rtx *loc, void *data
+@@ -2139,7 +2172,7 @@ check_mem_read_rtx (rtx *loc, void *data
  		  = canon_true_dependence (store_info->mem, 
  					   GET_MODE (store_info->mem),
  					   store_info->mem_addr,
@@ -151,7 +189,7 @@
  	      
  	      /* If this read is just reading back something that we just
  		 stored, rewrite the read.  */
-@@ -2224,7 +2251,7 @@ check_mem_read_rtx (rtx *loc, void *data
+@@ -2224,7 +2257,7 @@ check_mem_read_rtx (rtx *loc, void *data
  	    remove = canon_true_dependence (store_info->mem, 
  					    GET_MODE (store_info->mem),
  					    store_info->mem_addr,
@@ -160,26 +198,20 @@
  	  
  	  if (remove)
  	    {
-@@ -3067,7 +3094,8 @@ scan_reads_nospill (insn_info_t insn_inf
+@@ -3066,8 +3099,9 @@ scan_reads_nospill (insn_info_t insn_inf
+ 		  if ((read_info->group_id < 0)
  		      && canon_true_dependence (group->base_mem, 
  						QImode,
- 						group->canon_base_mem,
+-						group->canon_base_mem,
 -						read_info->mem, rtx_varies_p))
++						group->canon_base_addr,
 +						read_info->mem, NULL_RTX,
 +						rtx_varies_p))
  		    {
  		      if (kill)
  			bitmap_ior_into (kill, group->group_kill);
---- gcc/cse.c.jj	2009-03-28 18:11:42.000000000 +0100
-+++ gcc/cse.c	2009-04-21 11:18:02.000000000 +0200
-@@ -1,6 +1,6 @@
- /* Common subexpression elimination for GNU compiler.
-    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998
--   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
- 
- This file is part of GCC.
+--- gcc/cse.c.jj	2009-04-22 22:20:23.000000000 +0200
++++ gcc/cse.c	2009-04-23 18:09:35.000000000 +0200
 @@ -1658,7 +1658,7 @@ check_dependence (rtx *x, void *data)
  {
    struct check_dependence_data *d = (struct check_dependence_data *) data;
@@ -189,9 +221,9 @@
  		    		  cse_rtx_varies_p);
    else
      return 0;
---- gcc/rtl.h.jj	2009-03-28 18:11:43.000000000 +0100
-+++ gcc/rtl.h	2009-04-21 11:17:04.000000000 +0200
-@@ -2282,7 +2282,7 @@ extern rtx canon_rtx (rtx);
+--- gcc/rtl.h.jj	2009-04-22 22:20:37.000000000 +0200
++++ gcc/rtl.h	2009-04-23 18:09:35.000000000 +0200
+@@ -2290,7 +2290,7 @@ extern rtx canon_rtx (rtx);
  extern int true_dependence (const_rtx, enum machine_mode, const_rtx, bool (*)(const_rtx, bool));
  extern rtx get_addr (rtx);
  extern int canon_true_dependence (const_rtx, enum machine_mode, rtx, const_rtx,
@@ -200,8 +232,8 @@
  extern int read_dependence (const_rtx, const_rtx);
  extern int anti_dependence (const_rtx, const_rtx);
  extern int output_dependence (const_rtx, const_rtx);
---- gcc/cselib.c.jj	2009-03-28 18:11:43.000000000 +0100
-+++ gcc/cselib.c	2009-04-21 11:18:25.000000000 +0200
+--- gcc/cselib.c.jj	2009-04-22 22:20:23.000000000 +0200
++++ gcc/cselib.c	2009-04-23 18:09:35.000000000 +0200
 @@ -1,6 +1,6 @@
  /* Common subexpression elimination library for GNU compiler.
     Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
@@ -219,8 +251,8 @@
  	    {
  	      has_mem = true;
  	      num_mems++;
---- gcc/gcse.c.jj	2009-03-28 18:11:42.000000000 +0100
-+++ gcc/gcse.c	2009-04-21 11:19:20.000000000 +0200
+--- gcc/gcse.c.jj	2009-04-22 22:20:23.000000000 +0200
++++ gcc/gcse.c	2009-04-23 18:09:35.000000000 +0200
 @@ -1,7 +1,7 @@
  /* Global common subexpression elimination/Partial redundancy elimination
     and global constant/copy propagation for GNU compiler.
@@ -230,7 +262,7 @@
  
  This file is part of GCC.
  
-@@ -2516,7 +2516,7 @@ compute_transp (const_rtx x, int indx, s
+@@ -2512,7 +2512,7 @@ compute_transp (const_rtx x, int indx, s
  		    dest_addr = XEXP (list_entry, 0);
  
  		    if (canon_true_dependence (dest, GET_MODE (dest), dest_addr,
@@ -239,10 +271,10 @@
  		      {
  			if (set_p)
  			  SET_BIT (bmap[bb_index], indx);
---- gcc/testsuite/gcc.dg/pr39794.c.jj	2009-04-21 13:08:45.000000000 +0200
-+++ gcc/testsuite/gcc.dg/pr39794.c	2009-04-21 13:07:29.000000000 +0200
+--- gcc/testsuite/gcc.dg/pr39794.c.jj	2009-04-23 18:09:35.000000000 +0200
++++ gcc/testsuite/gcc.dg/pr39794.c	2009-04-23 18:21:13.000000000 +0200
 @@ -0,0 +1,33 @@
-+/* PR middle-end/39794 */
++/* PR rtl-optimization/39794 */
 +/* { dg-do run } */
 +/* { dg-options "-O2 -funroll-loops" } */
 +


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/sources,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- sources	23 Apr 2009 07:34:34 -0000	1.274
+++ sources	24 Apr 2009 08:04:27 -0000	1.275
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-24abd4fb970849bf27e069a18e4d9e7e  gcc-4.4.0-20090423.tar.bz2
+441af0d1283e61c52f241a06710f56a3  gcc-4.4.0-20090424.tar.bz2



From dchen at fedoraproject.org  Fri Apr 24 08:12:53 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 24 Apr 2009 08:12:53 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.13, 1.14 ibus-chewing.spec,
	1.15, 1.16 import.log, 1.8, 1.9 sources, 1.13, 1.14
Message-ID: <20090424081253.C679B70106@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27887/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Support plain Zhuyin mode.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Apr 2009 08:11:17 -0000	1.13
+++ .cvsignore	24 Apr 2009 08:12:23 -0000	1.14
@@ -1 +1 @@
-ibus-chewing-1.0.7.20090414-Source.tar.gz
+ibus-chewing-1.0.8.20090424-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ibus-chewing.spec	14 Apr 2009 08:11:17 -0000	1.15
+++ ibus-chewing.spec	24 Apr 2009 08:12:23 -0000	1.16
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.7.20090414
+Version:    1.0.8.20090424
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -73,7 +73,8 @@
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Apr 14 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.7.20090414-1
+* Fri Apr 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090424-1
+Fix some bugs in cmake_modules/RPM.cmake
 
 
 * Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	14 Apr 2009 08:11:18 -0000	1.8
+++ import.log	24 Apr 2009 08:12:23 -0000	1.9
@@ -6,3 +6,4 @@
 ibus-chewing-1_0_5_20090330-1_fc10:HEAD:ibus-chewing-1.0.5.20090330-1.fc10.src.rpm:1238398686
 ibus-chewing-1_0_6_20090403-1_fc10:HEAD:ibus-chewing-1.0.6.20090403-1.fc10.src.rpm:1238737188
 ibus-chewing-1_0_7_20090414-1_fc10:HEAD:ibus-chewing-1.0.7.20090414-1.fc10.src.rpm:1239696303
+ibus-chewing-1_0_8_20090424-1_fc10:HEAD:ibus-chewing-1.0.8.20090424-1.fc10.src.rpm:1240560705


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Apr 2009 08:11:18 -0000	1.13
+++ sources	24 Apr 2009 08:12:23 -0000	1.14
@@ -1 +1 @@
-492f878fd0f17ad071799573068ded9e  ibus-chewing-1.0.7.20090414-Source.tar.gz
+8bf8753259e0e7ad2e91a9318d796c96  ibus-chewing-1.0.8.20090424-Source.tar.gz



From dchen at fedoraproject.org  Fri Apr 24 08:14:14 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 24 Apr 2009 08:14:14 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.13, 1.14 ibus-chewing.spec,
	1.15, 1.16 import.log, 1.8, 1.9 sources, 1.13, 1.14
Message-ID: <20090424081414.C68BD70106@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28231/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Support plain Zhuyin mode.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Apr 2009 08:11:17 -0000	1.13
+++ .cvsignore	24 Apr 2009 08:13:44 -0000	1.14
@@ -1 +1 @@
-ibus-chewing-1.0.7.20090414-Source.tar.gz
+ibus-chewing-1.0.8.20090424-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ibus-chewing.spec	14 Apr 2009 08:11:17 -0000	1.15
+++ ibus-chewing.spec	24 Apr 2009 08:13:44 -0000	1.16
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.7.20090414
+Version:    1.0.8.20090424
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -73,7 +73,8 @@
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Apr 14 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.7.20090414-1
+* Fri Apr 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090424-1
+Fix some bugs in cmake_modules/RPM.cmake
 
 
 * Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	14 Apr 2009 08:11:18 -0000	1.8
+++ import.log	24 Apr 2009 08:13:44 -0000	1.9
@@ -6,3 +6,4 @@
 ibus-chewing-1_0_5_20090330-1_fc10:HEAD:ibus-chewing-1.0.5.20090330-1.fc10.src.rpm:1238398686
 ibus-chewing-1_0_6_20090403-1_fc10:HEAD:ibus-chewing-1.0.6.20090403-1.fc10.src.rpm:1238737188
 ibus-chewing-1_0_7_20090414-1_fc10:HEAD:ibus-chewing-1.0.7.20090414-1.fc10.src.rpm:1239696303
+ibus-chewing-1_0_8_20090424-1_fc10:F-11:ibus-chewing-1.0.8.20090424-1.fc10.src.rpm:1240560774


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Apr 2009 08:11:18 -0000	1.13
+++ sources	24 Apr 2009 08:13:44 -0000	1.14
@@ -1 +1 @@
-492f878fd0f17ad071799573068ded9e  ibus-chewing-1.0.7.20090414-Source.tar.gz
+8bf8753259e0e7ad2e91a9318d796c96  ibus-chewing-1.0.8.20090424-Source.tar.gz



From jakub at fedoraproject.org  Fri Apr 24 08:22:02 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 24 Apr 2009 08:22:02 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.273, 1.274 glibc-fedora.patch, 1.306, 
	1.307 glibc.spec, 1.396, 1.397 import.log, 1.17, 1.18 sources,
	1.298, 1.299
Message-ID: <20090424082202.BFD8F70106@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30164/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- .cvsignore	16 Apr 2009 16:50:08 -0000	1.273
+++ .cvsignore	24 Apr 2009 08:21:30 -0000	1.274
@@ -1,2 +1,2 @@
-glibc-20090416T1610.tar.bz2
-glibc-fedora-20090416T1610.tar.bz2
+glibc-20090424T0747.tar.bz2
+glibc-fedora-20090424T0747.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- glibc-fedora.patch	16 Apr 2009 16:50:08 -0000	1.306
+++ glibc-fedora.patch	24 Apr 2009 08:21:30 -0000	1.307
@@ -1,6 +1,6 @@
---- glibc-20090416T1610/ChangeLog	16 Apr 2009 15:22:05 -0000	1.11597
-+++ glibc-20090416T1610-fedora/ChangeLog	16 Apr 2009 16:36:54 -0000	1.8782.2.331
-@@ -7274,6 +7274,13 @@
+--- glibc-20090424T0747/ChangeLog	24 Apr 2009 03:58:48 -0000	1.11618
++++ glibc-20090424T0747-fedora/ChangeLog	24 Apr 2009 08:00:29 -0000	1.8782.2.332
+@@ -7420,6 +7420,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7569,6 +7576,10 @@
+@@ -7715,6 +7722,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8826,6 +8837,15 @@
+@@ -8972,6 +8983,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090416T1610/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090416T1610-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090424T0747/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090424T0747-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090416T1610/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090416T1610-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090424T0747/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090424T0747-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090416T1610/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090416T1610-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090424T0747/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090424T0747-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090416T1610/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090416T1610-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090424T0747/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090424T0747-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090416T1610/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090416T1610-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090424T0747/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090424T0747-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090416T1610/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090416T1610-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090424T0747/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090424T0747-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090416T1610/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090416T1610-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090424T0747/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090424T0747-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090416T1610/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090416T1610-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090424T0747/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090424T0747-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090416T1610/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090424T0747/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090416T1610/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090424T0747/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090416T1610/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090416T1610-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090424T0747/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090424T0747-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090416T1610/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090416T1610-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090424T0747/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090424T0747-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090416T1610/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090416T1610-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090424T0747/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090424T0747-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090416T1610/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090416T1610-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090424T0747/locale/programs/locarchive.c	18 Apr 2009 12:12:22 -0000	1.26
++++ glibc-20090424T0747-fedora/locale/programs/locarchive.c	24 Apr 2009 08:00:32 -0000	1.21.2.5
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090416T1610/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090416T1610-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090424T0747/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090424T0747-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090416T1610/localedata/SUPPORTED	14 Mar 2009 18:33:15 -0000	1.116
-+++ glibc-20090416T1610-fedora/localedata/SUPPORTED	20 Mar 2009 20:00:15 -0000	1.71.2.24
+--- glibc-20090424T0747/localedata/SUPPORTED	18 Apr 2009 08:43:52 -0000	1.117
++++ glibc-20090424T0747-fedora/localedata/SUPPORTED	24 Apr 2009 08:00:32 -0000	1.71.2.25
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -672,7 +672,7 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -302,6 +305,8 @@ nl_NL/ISO-8859-1 \
+@@ -303,6 +306,8 @@ nl_NL/ISO-8859-1 \
  nl_NL at euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
@@ -681,7 +681,7 @@
  nr_ZA/UTF-8 \
  nso_ZA/UTF-8 \
  oc_FR.UTF-8/UTF-8 \
-@@ -360,6 +365,7 @@ sv_FI/ISO-8859-1 \
+@@ -361,6 +366,7 @@ sv_FI/ISO-8859-1 \
  sv_FI at euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090416T1610/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090416T1610-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090424T0747/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090424T0747-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090416T1610/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090416T1610-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090424T0747/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090424T0747-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090416T1610/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090424T0747/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090416T1610/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090416T1610-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090424T0747/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090424T0747-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090416T1610/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090416T1610-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090424T0747/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090424T0747-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090416T1610/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090416T1610-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090424T0747/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090424T0747-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090416T1610/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090416T1610-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090424T0747/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090424T0747-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,17 +952,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090416T1610/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090416T1610-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090424T0747/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090424T0747-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090416T1610/nptl/ChangeLog	15 Mar 2009 09:03:38 -0000	1.1109
-+++ glibc-20090416T1610-fedora/nptl/ChangeLog	20 Mar 2009 20:00:16 -0000	1.706.2.170
-@@ -3449,6 +3449,15 @@
+--- glibc-20090424T0747/nptl/ChangeLog	23 Apr 2009 04:11:38 -0000	1.1111
++++ glibc-20090424T0747-fedora/nptl/ChangeLog	24 Apr 2009 08:00:34 -0000	1.706.2.171
+@@ -3456,6 +3456,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -978,7 +978,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4185,6 +4194,11 @@
+@@ -4192,6 +4201,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -990,7 +990,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6259,6 +6273,11 @@
+@@ -6266,6 +6280,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090416T1610/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090416T1610-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090424T0747/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090424T0747-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090416T1610/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090416T1610-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090424T0747/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090424T0747-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090416T1610/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090424T0747/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090416T1610/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090416T1610-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090424T0747/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090424T0747-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090416T1610/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090416T1610-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090424T0747/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090424T0747-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090416T1610/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090416T1610-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090424T0747/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090424T0747-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090416T1610/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090416T1610-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090424T0747/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090424T0747-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090416T1610/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090424T0747/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090416T1610/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090416T1610-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090424T0747/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090424T0747-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090416T1610/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090416T1610-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090424T0747/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090424T0747-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090416T1610/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090416T1610-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090424T0747/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090424T0747-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090416T1610/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090416T1610-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090424T0747/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090424T0747-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090416T1610/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090416T1610-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090424T0747/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090424T0747-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090416T1610/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090424T0747/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090416T1610/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090416T1610-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090424T0747/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090424T0747-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090416T1610/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090416T1610-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090424T0747/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090424T0747-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,9 +1875,9 @@
  
  struct netlink_res
  {
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
-@@ -61,7 +61,7 @@
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/paths.h	23 Apr 2009 18:29:16 -0000	1.12
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/paths.h	24 Apr 2009 08:00:37 -0000	1.11.4.2
+@@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
  #define _PATH_UTMP	"/var/run/utmp"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090416T1610/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090416T1610-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090424T0747/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- glibc.spec	16 Apr 2009 16:50:09 -0000	1.396
+++ glibc.spec	24 Apr 2009 08:21:31 -0000	1.397
@@ -1,6 +1,6 @@
-%define glibcdate 20090416T1610
+%define glibcdate 20090424T0747
 %define glibcname glibc
-%define glibcsrcdir glibc-20090416T1610
+%define glibcsrcdir glibc-20090424T0747
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 19
+Release: 20
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,11 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-20
+- update from trunk
+  - fix p{read,write}v{,64} (#497429, #497434)
+  - fix strfmon (#496386)
+
 * Thu Apr 16 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-19
 - update from trunk
   - fix dlopen from statically linked binaries (#495830)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	16 Apr 2009 16:50:09 -0000	1.17
+++ import.log	24 Apr 2009 08:21:32 -0000	1.18
@@ -15,3 +15,4 @@
 glibc-2_9_90-17:F-11:glibc-2.9.90-17.src.rpm:1239814311
 glibc-2_9_90-18:F-11:glibc-2.9.90-18.src.rpm:1239866900
 glibc-2_9_90-19:F-11:glibc-2.9.90-19.src.rpm:1239900585
+glibc-2_9_90-20:F-11:glibc-2.9.90-20.src.rpm:1240561264


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- sources	16 Apr 2009 16:50:09 -0000	1.298
+++ sources	24 Apr 2009 08:21:32 -0000	1.299
@@ -1,2 +1,2 @@
-9a465730adc5a5e9c4881c163fec2109  glibc-20090416T1610.tar.bz2
-836d5b14a858a50db41641c7a81cfdc4  glibc-fedora-20090416T1610.tar.bz2
+8b30be7e6d3debdd00c2dc995545a639  glibc-20090424T0747.tar.bz2
+99d6e57ab755b5b6aab7da0fc14772a4  glibc-fedora-20090424T0747.tar.bz2



From dnovotny at fedoraproject.org  Fri Apr 24 08:25:11 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Fri, 24 Apr 2009 08:25:11 +0000 (UTC)
Subject: rpms/amanda/devel amanda.spec,1.59,1.60
Message-ID: <20090424082511.D28E370106@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30579

Modified Files:
	amanda.spec 
Log Message:

fix #497488



Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- amanda.spec	14 Apr 2009 14:40:46 -0000	1.59
+++ amanda.spec	24 Apr 2009 08:24:41 -0000	1.60
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -52,7 +52,7 @@
 Summary: The client component of the AMANDA tape backup system
 Group: Applications/System
 Requires: fileutils grep /sbin/service
-Requires(pre): amanda = %{version}
+Requires(pre): amanda = %{version}-%{release}
 Requires(post): grep sed
 
 %description client
@@ -65,7 +65,7 @@
 Summary: The server side of the AMANDA tape backup system
 Group: Applications/System
 Requires: fileutils grep /sbin/service
-Requires(pre): amanda = %{version}
+Requires(pre): amanda = %{version}-%{release}
 Requires(post): grep sed findutils
 
 %description server
@@ -78,7 +78,7 @@
 %package devel
 Summary: Libraries and documentation of the AMANDA tape backup system
 Group: Development/Libraries
-Requires(pre): amanda = %{version}
+Requires(pre): amanda = %{version}-%{release}
 
 %description devel
 The amanda-devel package should be installed on any machine that will
@@ -375,6 +375,10 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Fri Apr 24 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-9
+- fix #497488 -  amanda subpackages require only a specific version of amanda,
+      not also release
+
 * Tue Apr 14 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-8
 - fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") 
 



From pvrabec at fedoraproject.org  Fri Apr 24 08:40:21 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Fri, 24 Apr 2009 08:40:21 +0000 (UTC)
Subject: rpms/openscap/devel .cvsignore, 1.2, 1.3 openscap.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090424084021.9EC7A70106@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/openscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32749

Modified Files:
	.cvsignore openscap.spec sources 
Log Message:
uprgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2009 07:40:00 -0000	1.2
+++ .cvsignore	24 Apr 2009 08:39:51 -0000	1.3
@@ -1 +1 @@
-openscap-0.1.4.tar.gz
+openscap-0.3.2.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/openscap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openscap.spec	31 Mar 2009 07:40:00 -0000	1.1
+++ openscap.spec	24 Apr 2009 08:39:51 -0000	1.2
@@ -1,7 +1,8 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.1.4
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -38,11 +39,20 @@
 The %{name}-python package contains the bindings so that %{name}
 libraries can be used by python.
 
+%package        perl
+Summary:        Perl bindings for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    perl
+The %{name}-perl package contains the bindings so that %{name}
+libraries can be used by perl.
+
 %prep
 %setup -q
 
 %build
-%configure --disable-static --disable-oval
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -66,6 +76,11 @@
 %defattr(-,root,root,-)
 %{python_sitearch}/*
 
+%files perl
+%defattr(-,root,root,-)
+%{perl_vendorarch}/*
+%{perl_vendorlib}/*
+
 %files devel
 %defattr(-,root,root,-)
 %doc docs/{html,latex}
@@ -74,6 +89,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.3.2-1
+- upgrade
+
 * Sun Mar 29 2009 Peter Vrabec <pvrabec at redhat.com> 0.1.4-1
 - upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2009 07:40:00 -0000	1.2
+++ sources	24 Apr 2009 08:39:51 -0000	1.3
@@ -1 +1 @@
-346a1ab5485fe751f8de2b6660ec886b  openscap-0.1.4.tar.gz
+511064e5893ef6cc8bfed56b69d86186  openscap-0.3.2.tar.gz



From caolanm at fedoraproject.org  Fri Apr 24 08:42:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 08:42:54 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	1.1, 1.2 openoffice.org.spec, 1.1894,
	1.1895 workspace.hb18.patch, 1.2,
	1.3 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch,
	1.1, NONE
Message-ID: <20090424084254.7288370106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv780/devel

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
	openoffice.org.spec workspace.hb18.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
Log Message:
merge into upstream workspace, and extend xslt patch

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	16 Jan 2009 15:34:36 -0000	1.1
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	24 Apr 2009 08:42:53 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
---- ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml	2009-01-16 10:41:31.000000000 +0100
-+++ ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-01-16 10:48:01.000000000 +0100
+diff -ru filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+--- filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:57.000000000 +0100
 @@ -462,7 +462,7 @@
  	<xsl:template name="create-heading">
  		<xsl:param name="globalData"/>
@@ -27,3 +27,62 @@
  		<xsl:param name="listStyleName" select="@text:style-name"/>
  
  		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->
+diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
+--- filter.orig/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:57.000000000 +0100
+@@ -381,7 +381,7 @@
+ 					</xsl:when>
+ 					<xsl:otherwise>
+ 						<xsl:value-of select="$earlierCandidate" />
+-						<xsl:variable name="parameterCandidate">
++						<xsl:variable name="parameterCandidate2">
+ 							<xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
+ 							<xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
+ 							<xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
+@@ -405,8 +405,8 @@
+ 						<xsl:call-template name="getParameter">
+ 							<xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
+ 							<xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
+-							<xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
+-							<xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
++							<xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
++							<xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
+ 							<xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
+ 						</xsl:call-template>
+ 					</xsl:otherwise>
+diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
+--- filter.orig/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:32:29.000000000 +0100
+@@ -4016,26 +4016,26 @@
+ 									<xsl:attribute name="uof:locID">t0122</xsl:attribute>
+ 									<xsl:attribute name="uof:attrList">???????????????</xsl:attribute>
+ 								</xsl:element>
+-								<xsl:variable name="stt">
++								<xsl:variable name="stt1">
+ 									<xsl:value-of select="./text:a"/>
+ 								</xsl:variable>
+-								<xsl:variable name="end">
++								<xsl:variable name="end1">
+ 									<xsl:value-of select="."/>
+ 								</xsl:variable>
+ 								<xsl:variable name="bijiao">
+-									<xsl:value-of select="substring-after($end,$stt)"/>
++									<xsl:value-of select="substring-after($end1,$stt1)"/>
+ 								</xsl:variable>
+ 								<xsl:if test="not($bijiao='')">
+ 									<xsl:element name="???:?????????">
+ 										<xsl:attribute name="uof:locID">t0109</xsl:attribute>
+ 										<xsl:attribute name="uof:attrList">?????????</xsl:attribute>
+-										<xsl:variable name="stt">
++										<xsl:variable name="stt2">
+ 											<xsl:value-of select="./text:a"/>
+ 										</xsl:variable>
+-										<xsl:variable name="end">
++										<xsl:variable name="end2">
+ 											<xsl:value-of select="."/>
+ 										</xsl:variable>
+-										<xsl:value-of select="substring-after($end,$stt)"/>
++										<xsl:value-of select="substring-after($end2,$stt2)"/>
+ 									</xsl:element>
+ 								</xsl:if>
+ 							</???:???>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1894
retrieving revision 1.1895
diff -u -r1.1894 -r1.1895
--- openoffice.org.spec	24 Apr 2009 07:18:08 -0000	1.1894
+++ openoffice.org.spec	24 Apr 2009 08:42:53 -0000	1.1895
@@ -132,12 +132,11 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
-Patch61: workspace.vcl101.patch
-Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch63: workspace.slideshow1.patch
-Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch65: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: workspace.vcl101.patch
+Patch61: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch62: workspace.slideshow1.patch
+Patch63: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch64: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,12 +1627,11 @@
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch58 -p1 -b .ooo100991.pyuno-fix.patch
 %patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch61 -p1 -b .workspace.vcl101.patch
-%patch62 -p1 -b .ooo101152.solenv.kn.patch
-%patch63 -p2 -b .workspace.slideshow1.patch
-%patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch65 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p1 -b .workspace.vcl101.patch
+%patch61 -p1 -b .ooo101152.solenv.kn.patch
+%patch62 -p2 -b .workspace.slideshow1.patch
+%patch63 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch64 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.hb18.patch:

Index: workspace.hb18.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.hb18.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.hb18.patch	22 Apr 2009 10:22:28 -0000	1.2
+++ workspace.hb18.patch	24 Apr 2009 08:42:53 -0000	1.3
@@ -98,3 +98,65 @@
          case TXT_TXTBOX:
              pFldP = pFldTxtBxs;
              break;
+diff -ru sw.orig/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8esh.cxx
+--- sw.orig/source/filter/ww8/wrtw8esh.cxx	2009-04-15 11:34:27.000000000 +0100
++++ sw/source/filter/ww8/wrtw8esh.cxx	2009-04-15 12:09:10.000000000 +0100
+@@ -1137,11 +1137,11 @@
+                 if( nSlotId && nWhich != nSlotId &&
+                     0 != ( nWhich = pDstPool->GetWhich( nSlotId ) ) &&
+                     nWhich != nSlotId &&
+-                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] )
+-                    && ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
++                    ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
+                                       && nWhich < RES_TXTATR_END)
+                                    : (nWhich >= RES_PARATR_BEGIN
+-                                      && nWhich < RES_FRMATR_END) ) )
++                                      && nWhich < RES_FRMATR_END) ) &&
++                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] ) )
+                 {
+                     // use always the SW-Which Id !
+                     SfxPoolItem* pI = pItem->Clone();
+diff -ru sw.orig/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
+--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-15 11:34:26.000000000 +0100
++++ sw/source/filter/ww8/ww8atr.cxx	2009-04-15 12:34:07.000000000 +0100
+@@ -283,10 +283,10 @@
+     {
+         const SfxPoolItem *pItem = aI->second;
+         USHORT nWhich = pItem->Which();
++        if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
++            continue;
+         if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
+         {
+-            if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+-                continue;
+             if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
+                 (*pOut)(*this, *pItem);
+         }
+@@ -344,17 +344,17 @@
+         if (bChpFmt)
+             ExportPoolItemsToCHP(aItems, nScript);
+ 
+-        sw::cPoolItemIter aEnd = aItems.end();
+-        for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
++        if (bPapFmt)
+         {
+-            pItem = aI->second;
+-            USHORT nWhich = pItem->Which();
+-            pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
+-            if( 0 != pOut && (!bPapFmt || RES_PARATR_NUMRULE != nWhich ))
+-            {
+-                bool bPap = nWhich >= RES_PARATR_BEGIN
+-                            && nWhich < RES_FRMATR_END;
+-                if (bPapFmt && bPap)
++            sw::cPoolItemIter aEnd = aItems.end();
++            for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
++            {
++                pItem = aI->second;
++                USHORT nWhich = pItem->Which();
++                if (nWhich < RES_PARATR_BEGIN || nWhich >= RES_FRMATR_END || nWhich == RES_PARATR_NUMRULE)
++                    continue;
++                pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
++                if( 0 != pOut )
+                     (*pOut)(*this, *pItem);
+             }
+         }


--- openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch DELETED ---



From caolanm at fedoraproject.org  Fri Apr 24 08:43:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 08:43:23 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	1.1, 1.2 openoffice.org.spec, 1.1893,
	1.1894 workspace.hb18.patch, 1.2, 1.3
Message-ID: <20090424084323.987B770106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv780/F-11

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
	openoffice.org.spec workspace.hb18.patch 
Log Message:
merge into upstream workspace, and extend xslt patch

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	16 Jan 2009 15:34:36 -0000	1.1
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	24 Apr 2009 08:42:52 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
---- ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml	2009-01-16 10:41:31.000000000 +0100
-+++ ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-01-16 10:48:01.000000000 +0100
+diff -ru filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+--- filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:57.000000000 +0100
 @@ -462,7 +462,7 @@
  	<xsl:template name="create-heading">
  		<xsl:param name="globalData"/>
@@ -27,3 +27,62 @@
  		<xsl:param name="listStyleName" select="@text:style-name"/>
  
  		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->
+diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
+--- filter.orig/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:57.000000000 +0100
+@@ -381,7 +381,7 @@
+ 					</xsl:when>
+ 					<xsl:otherwise>
+ 						<xsl:value-of select="$earlierCandidate" />
+-						<xsl:variable name="parameterCandidate">
++						<xsl:variable name="parameterCandidate2">
+ 							<xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
+ 							<xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
+ 							<xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
+@@ -405,8 +405,8 @@
+ 						<xsl:call-template name="getParameter">
+ 							<xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
+ 							<xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
+-							<xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
+-							<xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
++							<xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
++							<xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
+ 							<xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
+ 						</xsl:call-template>
+ 					</xsl:otherwise>
+diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
+--- filter.orig/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:32:29.000000000 +0100
+@@ -4016,26 +4016,26 @@
+ 									<xsl:attribute name="uof:locID">t0122</xsl:attribute>
+ 									<xsl:attribute name="uof:attrList">???????????????</xsl:attribute>
+ 								</xsl:element>
+-								<xsl:variable name="stt">
++								<xsl:variable name="stt1">
+ 									<xsl:value-of select="./text:a"/>
+ 								</xsl:variable>
+-								<xsl:variable name="end">
++								<xsl:variable name="end1">
+ 									<xsl:value-of select="."/>
+ 								</xsl:variable>
+ 								<xsl:variable name="bijiao">
+-									<xsl:value-of select="substring-after($end,$stt)"/>
++									<xsl:value-of select="substring-after($end1,$stt1)"/>
+ 								</xsl:variable>
+ 								<xsl:if test="not($bijiao='')">
+ 									<xsl:element name="???:?????????">
+ 										<xsl:attribute name="uof:locID">t0109</xsl:attribute>
+ 										<xsl:attribute name="uof:attrList">?????????</xsl:attribute>
+-										<xsl:variable name="stt">
++										<xsl:variable name="stt2">
+ 											<xsl:value-of select="./text:a"/>
+ 										</xsl:variable>
+-										<xsl:variable name="end">
++										<xsl:variable name="end2">
+ 											<xsl:value-of select="."/>
+ 										</xsl:variable>
+-										<xsl:value-of select="substring-after($end,$stt)"/>
++										<xsl:value-of select="substring-after($end2,$stt2)"/>
+ 									</xsl:element>
+ 								</xsl:if>
+ 							</???:???>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1893
retrieving revision 1.1894
diff -u -r1.1893 -r1.1894
--- openoffice.org.spec	24 Apr 2009 07:18:06 -0000	1.1893
+++ openoffice.org.spec	24 Apr 2009 08:42:52 -0000	1.1894
@@ -132,12 +132,11 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
-Patch61: workspace.vcl101.patch
-Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch63: workspace.slideshow1.patch
-Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch65: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: workspace.vcl101.patch
+Patch61: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch62: workspace.slideshow1.patch
+Patch63: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch64: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,12 +1627,11 @@
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch58 -p1 -b .ooo100991.pyuno-fix.patch
 %patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch61 -p1 -b .workspace.vcl101.patch
-%patch62 -p1 -b .ooo101152.solenv.kn.patch
-%patch63 -p2 -b .workspace.slideshow1.patch
-%patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch65 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p1 -b .workspace.vcl101.patch
+%patch61 -p1 -b .ooo101152.solenv.kn.patch
+%patch62 -p2 -b .workspace.slideshow1.patch
+%patch63 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch64 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.hb18.patch:

Index: workspace.hb18.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.hb18.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.hb18.patch	22 Apr 2009 10:22:24 -0000	1.2
+++ workspace.hb18.patch	24 Apr 2009 08:42:53 -0000	1.3
@@ -98,3 +98,65 @@
          case TXT_TXTBOX:
              pFldP = pFldTxtBxs;
              break;
+diff -ru sw.orig/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8esh.cxx
+--- sw.orig/source/filter/ww8/wrtw8esh.cxx	2009-04-15 11:34:27.000000000 +0100
++++ sw/source/filter/ww8/wrtw8esh.cxx	2009-04-15 12:09:10.000000000 +0100
+@@ -1137,11 +1137,11 @@
+                 if( nSlotId && nWhich != nSlotId &&
+                     0 != ( nWhich = pDstPool->GetWhich( nSlotId ) ) &&
+                     nWhich != nSlotId &&
+-                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] )
+-                    && ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
++                    ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
+                                       && nWhich < RES_TXTATR_END)
+                                    : (nWhich >= RES_PARATR_BEGIN
+-                                      && nWhich < RES_FRMATR_END) ) )
++                                      && nWhich < RES_FRMATR_END) ) &&
++                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] ) )
+                 {
+                     // use always the SW-Which Id !
+                     SfxPoolItem* pI = pItem->Clone();
+diff -ru sw.orig/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
+--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-15 11:34:26.000000000 +0100
++++ sw/source/filter/ww8/ww8atr.cxx	2009-04-15 12:34:07.000000000 +0100
+@@ -283,10 +283,10 @@
+     {
+         const SfxPoolItem *pItem = aI->second;
+         USHORT nWhich = pItem->Which();
++        if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
++            continue;
+         if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
+         {
+-            if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+-                continue;
+             if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
+                 (*pOut)(*this, *pItem);
+         }
+@@ -344,17 +344,17 @@
+         if (bChpFmt)
+             ExportPoolItemsToCHP(aItems, nScript);
+ 
+-        sw::cPoolItemIter aEnd = aItems.end();
+-        for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
++        if (bPapFmt)
+         {
+-            pItem = aI->second;
+-            USHORT nWhich = pItem->Which();
+-            pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
+-            if( 0 != pOut && (!bPapFmt || RES_PARATR_NUMRULE != nWhich ))
+-            {
+-                bool bPap = nWhich >= RES_PARATR_BEGIN
+-                            && nWhich < RES_FRMATR_END;
+-                if (bPapFmt && bPap)
++            sw::cPoolItemIter aEnd = aItems.end();
++            for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
++            {
++                pItem = aI->second;
++                USHORT nWhich = pItem->Which();
++                if (nWhich < RES_PARATR_BEGIN || nWhich >= RES_FRMATR_END || nWhich == RES_PARATR_NUMRULE)
++                    continue;
++                pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
++                if( 0 != pOut )
+                     (*pOut)(*this, *pItem);
+             }
+         }



From mgrepl at fedoraproject.org  Fri Apr 24 08:45:06 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 24 Apr 2009 08:45:06 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.164,
	1.165 selinux-policy.spec, 1.791, 1.792
Message-ID: <20090424084506.C163A70106@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1138

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Rename milter_manage_spamass_state interface



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- policy-20080710.patch	23 Apr 2009 15:43:34 -0000	1.164
+++ policy-20080710.patch	24 Apr 2009 08:45:04 -0000	1.165
@@ -18904,7 +18904,7 @@
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.5.13/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/services/milter.if	2009-03-30 11:13:36.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/services/milter.if	2009-04-24 10:10:52.000000000 +0200
 @@ -0,0 +1,104 @@
 +## <summary>Milter mail filters</summary>
 +
@@ -19000,7 +19000,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`milter_spamass_manage_state',`
++interface(`milter_manage_spamass_state',`
 +	gen_require(`
 +		type spamass_milter_state_t;
 +	')
@@ -28664,7 +28664,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.13/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/spamassassin.te	2009-03-30 11:14:39.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.te	2009-04-24 10:11:36.000000000 +0200
 @@ -21,16 +21,24 @@
  gen_tunable(spamd_enable_home_dirs, true)
  
@@ -28852,7 +28852,7 @@
  ')
  
  optional_policy(`
-+	milter_spamass_manage_state(spamd_t)
++	milter_manage_spamass_state(spamd_t)
 +')
 +
 +optional_policy(`
@@ -28977,7 +28977,7 @@
 +')
 +
 +optional_policy(`
-+        milter_spamass_manage_state(spamc_t)
++        milter_manage_spamass_state(spamc_t)
 +')
 +
 +optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- selinux-policy.spec	16 Apr 2009 09:49:20 -0000	1.791
+++ selinux-policy.spec	24 Apr 2009 08:45:05 -0000	1.792
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 57%{?dist}
+Release: 58%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -460,6 +460,9 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-58
+- Allow nfs to share removable media
+
 * Thu Apr 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-57
 - Fix iptables labeling
 



From mjakubicek at fedoraproject.org  Fri Apr 24 09:13:34 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 09:13:34 +0000 (UTC)
Subject: rpms/postgis/F-11 postgis.spec,1.18,1.19
Message-ID: <20090424091334.46FFB70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/postgis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6140/F-11

Modified Files:
	postgis.spec 
Log Message:
- Fix FTBFS: added BR: java-1.5.0-gcj-devel in case of gcj_support




Index: postgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgis/F-11/postgis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- postgis.spec	27 Feb 2009 01:42:52 -0000	1.18
+++ postgis.spec	24 Apr 2009 09:13:03 -0000	1.19
@@ -5,7 +5,7 @@
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.3.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@
 
 %if %{gcj_support}
 BuildRequires:		gcc-java
+BuildRequires:		java-1.5.0-gcj-devel
 Requires(post):		%{_bindir}/rebuild-gcj-db
 Requires(postun):	%{_bindir}/rebuild-gcj-db
 %endif
@@ -149,6 +150,9 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.3.5-3
+- Fix FTBFS: added BR: java-1.5.0-gcj-devel in case of gcj_support
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 09:13:34 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 09:13:34 +0000 (UTC)
Subject: rpms/postgis/devel postgis.spec,1.18,1.19
Message-ID: <20090424091334.8F34970106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/postgis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6140/devel

Modified Files:
	postgis.spec 
Log Message:
- Fix FTBFS: added BR: java-1.5.0-gcj-devel in case of gcj_support




Index: postgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgis/devel/postgis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- postgis.spec	27 Feb 2009 01:42:52 -0000	1.18
+++ postgis.spec	24 Apr 2009 09:13:04 -0000	1.19
@@ -5,7 +5,7 @@
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.3.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@
 
 %if %{gcj_support}
 BuildRequires:		gcc-java
+BuildRequires:		java-1.5.0-gcj-devel
 Requires(post):		%{_bindir}/rebuild-gcj-db
 Requires(postun):	%{_bindir}/rebuild-gcj-db
 %endif
@@ -149,6 +150,9 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.3.5-3
+- Fix FTBFS: added BR: java-1.5.0-gcj-devel in case of gcj_support
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rhughes at fedoraproject.org  Fri Apr 24 09:18:01 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 24 Apr 2009 09:18:01 +0000 (UTC)
Subject: rpms/PackageKit/F-11
	PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch, NONE,
	1.1 PackageKit-0.4.6-Presto-handle-downloading-updates.patch,
	1.2, 1.3 PackageKit.spec, 1.105, 1.106
Message-ID: <20090424091801.110A370106@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6914

Modified Files:
	PackageKit-0.4.6-Presto-handle-downloading-updates.patch 
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch 
Log Message:
* Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-8
- Backport a patch from upstream to stop refresh-packagekit from running
  when the script is running under PackageKit. This fixes the bug where
  the update icon displays the wrong number of updates if all the updates
  are applied, and only affects the yum backend.
- The full problem and solution is described in #492005


PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch:

--- NEW FILE PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch ---
commit 5c3396990ea6e973b239a168828c4ad64c58e91b
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Apr 24 09:45:55 2009 +0100

    yum: disable the refresh-packagekit plugin when running under PackageKit

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index f5ea431..457b36b 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -2791,6 +2791,16 @@ class PackageKitYumBase(yum.YumBase):
 
     def __init__(self, backend):
         yum.YumBase.__init__(self)
+
+        # disable the PackageKit plugin when running under PackageKit
+        try:
+            pc = self.preconf
+            pc.disabled_plugins = ['refresh-packagekit']
+        except yum.Errors.ConfigError, e:
+            raise PkError(ERROR_REPO_CONFIGURATION_ERROR, _to_unicode(e))
+        except ValueError, e:
+            raise PkError(ERROR_FAILED_CONFIG_PARSING, _to_unicode(e))
+
         self.missingGPGKey = None
         self.dsCallback = DepSolveCallback(backend)
         self.backend = backend

PackageKit-0.4.6-Presto-handle-downloading-updates.patch:

Index: PackageKit-0.4.6-Presto-handle-downloading-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit-0.4.6-Presto-handle-downloading-updates.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PackageKit-0.4.6-Presto-handle-downloading-updates.patch	21 Apr 2009 10:19:55 -0000	1.2
+++ PackageKit-0.4.6-Presto-handle-downloading-updates.patch	24 Apr 2009 09:18:00 -0000	1.3
@@ -24,7 +24,7 @@
 +        #  - gnote-0.1.2-2.fc11.i586.rpm
 +        # and for Presto:
 +        #  - gnote-0.1.1-4.fc11_0.1.2-2.fc11.i586.drpm
-+        sections = name.rsplit('-', 3)
++        sections = name.rsplit('-', 2)
 +        if len(sections) < 3:
 +            return None
 +


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- PackageKit.spec	23 Apr 2009 11:29:06 -0000	1.105
+++ PackageKit.spec	24 Apr 2009 09:18:00 -0000	1.106
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -54,6 +54,9 @@
 # Already upstream: 33894239b42dcb6069ab3a99e3cb47667448d499..a782056c337562594155a9405adcd9d5e65be32d
 Patch11:   PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch
 
+# Already upstream: 5c3396990ea6e973b239a168828c4ad64c58e91b
+Patch12:   PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -264,6 +267,7 @@
 %patch9 -p1 -b .presto-downloading-updates
 %patch10 -p1 -b .send-package-finished
 %patch11 -p1 -b .disallow-sigkill
+%patch12 -p1 -b .no-plugin-under-pk
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -458,9 +462,16 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-8
+- Backport a patch from upstream to stop refresh-packagekit from running
+  when the script is running under PackageKit. This fixes the bug where
+  the update icon displays the wrong number of updates if all the updates
+  are applied, and only affects the yum backend.
+- The full problem and solution is described in #492005
+
 * Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-7
 - Backport a patch from upstream to disallow SIGKILL when using the yum
-  backend. This is recommended by Panu.
+  backend. This is recommended by Panu. Should fix #495087
 
 * Wed Apr 22 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-6
 - Send ::Package(finished) when we've finished downloading a file rather than



From hadess at fedoraproject.org  Fri Apr 24 09:38:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 09:38:03 +0000 (UTC)
Subject: rpms/python-gdata/devel .cvsignore, 1.8, 1.9 python-gdata.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <20090424093803.0E9AB70106@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10227

Modified Files:
	.cvsignore python-gdata.spec sources 
Log Message:
* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
- Update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Mar 2009 17:58:36 -0000	1.8
+++ .cvsignore	24 Apr 2009 09:37:32 -0000	1.9
@@ -1 +1 @@
-gdata-1.3.0.tar.gz
+gdata-1.3.1.tar.gz


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/python-gdata.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-gdata.spec	22 Mar 2009 18:43:33 -0000	1.15
+++ python-gdata.spec	24 Apr 2009 09:37:32 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-gdata
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        A Python module for accessing online Google services
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
+- Update to 1.3.1
+
 * Sun Mar 22 2009 - Bastien Nocera <bnocera at redhat.com> - 1.3.0-1
 - Update to 1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Mar 2009 17:58:37 -0000	1.8
+++ sources	24 Apr 2009 09:37:32 -0000	1.9
@@ -1 +1 @@
-77f84403f1d3bac6f48f634e46cb4d76  gdata-1.3.0.tar.gz
+70d60cdb43f6f49fc5a596f154f9cfbe  gdata-1.3.1.tar.gz



From rhughes at fedoraproject.org  Fri Apr 24 09:48:07 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 24 Apr 2009 09:48:07 +0000 (UTC)
Subject: rpms/pm-utils/F-11 pm-utils-1.2.5-fix-kms.patch, NONE,
	1.1 pm-utils.spec, 1.116, 1.117
Message-ID: <20090424094807.0A17C70106@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/pm-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11808

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-1.2.5-fix-kms.patch 
Log Message:
* Fri Apr 24 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-2
- Backport a patch from upstream to fix resume using KMS on 855GM.
- Fixes #496026


pm-utils-1.2.5-fix-kms.patch:

--- NEW FILE pm-utils-1.2.5-fix-kms.patch ---
>From e5cdb5bb6a573a36b0c872c889c8b8f25009cc45 Mon Sep 17 00:00:00 2001
From: Michael Biebl <mbiebl at gmail.com>
Date: Thu, 16 Apr 2009 22:23:46 +0000
Subject: Fix typo in have_kms()

The function is correctly called add_parameters.
Debian bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524243
---
diff --git a/pm/sleep.d/98smart-kernel-video b/pm/sleep.d/98smart-kernel-video
index 6ec301b..911896c 100755
--- a/pm/sleep.d/98smart-kernel-video
+++ b/pm/sleep.d/98smart-kernel-video
@@ -34,7 +34,7 @@ have_kms()
     # attempt to run any quirks
     [ -d /sys/class/drm/card0/device/graphics/fb0 ] || return 1
     remove_all_video_quirks
-    add_parameter --quirk-no-chvt
+    add_parameters --quirk-no-chvt
 }
 
 have_nvidia()
--
cgit v0.8.2


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-11/pm-utils.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- pm-utils.spec	14 Apr 2009 09:41:45 -0000	1.116
+++ pm-utils.spec	24 Apr 2009 09:47:36 -0000	1.117
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -25,6 +25,9 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Already upstream: e5cdb5bb6a573a36b0c872c889c8b8f25009cc45
+Patch0:    pm-utils-1.2.5-fix-kms.patch
+
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -43,6 +46,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .fix-kms
 
 %build
 %configure
@@ -104,6 +108,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-2
+- Backport a patch from upstream to fix resume using KMS on 855GM.
+- Fixes #496026
+
 * Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-1
 - New upstream version
 - If running on a system that is using KMS, we will refuse to handle any video



From kwizart at fedoraproject.org  Fri Apr 24 10:12:00 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 24 Apr 2009 10:12:00 +0000 (UTC)
Subject: rpms/opencv/devel opencv-1.0.0-autotools.diff, 1.2,
	NONE opencv-1.0.0-configure.in.diff, 1.1,
	NONE opencv-1.0.0-pkgconfig.diff, 1.1,
	NONE opencv-1.0.0-pythondir.diff, 1.2, NONE
Message-ID: <20090424101200.5ECEC70106@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15679

Removed Files:
	opencv-1.0.0-autotools.diff opencv-1.0.0-configure.in.diff 
	opencv-1.0.0-pkgconfig.diff opencv-1.0.0-pythondir.diff 
Log Message:
Remove previous version patches



--- opencv-1.0.0-autotools.diff DELETED ---


--- opencv-1.0.0-configure.in.diff DELETED ---


--- opencv-1.0.0-pkgconfig.diff DELETED ---


--- opencv-1.0.0-pythondir.diff DELETED ---



From mjakubicek at fedoraproject.org  Fri Apr 24 10:12:37 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 10:12:37 +0000 (UTC)
Subject: rpms/gnomesword/F-11 gnomesword-gcc44.patch, NONE,
	1.1 gnomesword.spec, 1.53, 1.54
Message-ID: <20090424101237.722DC70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/gnomesword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15740/F-11

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-gcc44.patch 
Log Message:
- Fix FTBFS: added gnomesword-gcc44.patch



gnomesword-gcc44.patch:

--- NEW FILE gnomesword-gcc44.patch ---
--- src/gecko/gecko-html.cpp.orig	2009-04-24 11:06:40.000000000 +0200
+++ src/gecko/gecko-html.cpp	2009-04-24 11:19:55.000000000 +0200
@@ -214,7 +214,7 @@
 
 	GeckoHtml *html = GECKO_HTML(embed);
 	GeckoHtmlPriv *priv = GECKO_HTML_GET_PRIVATE(html);
-	gchar *buf, *place;
+	const gchar *buf, *place;
 	gchar tmpbuf[1023];
 	gchar book[32];
 	GString *tmpstr = g_string_new(NULL);
--- src/main/sword.cc.orig	2009-04-24 11:24:29.000000000 +0200
+++ src/main/sword.cc	2009-04-24 11:28:43.000000000 +0200
@@ -184,9 +184,9 @@
 	// This is a sick. unreliable hack that should be removed
 	// after the underlying problem is fixed in Sword.
 	gchar *rework;
-	for (rework = strstr(note_str, "%20");
+	for (rework = (gchar *) strstr(note_str, "%20");
 	     rework;
-	     rework = strstr(rework+1, "%20")) {
+	     rework = (gchar *) strstr(rework+1, "%20")) {
 		*rework = ' ';
 		(void) strcpy(rework+1, rework+3);
 	}
--- src/main/url.cc.orig	2009-04-24 11:29:57.000000000 +0200
+++ src/main/url.cc	2009-04-24 11:30:27.000000000 +0200
@@ -1025,7 +1025,7 @@
 		 strstr(url, "gnomesword.url")) {
 
 		// another minor nightmare: re-encode / and : in hex.
-		gchar *place;
+		const gchar *place;
 		gchar tmpbuf[1023];
 		GString *tmpstr = g_string_new(NULL);
 
--- src/main/display.cc.orig	2009-04-24 11:20:27.000000000 +0200
+++ src/main/display.cc	2009-04-24 11:55:28.000000000 +0200
@@ -192,9 +192,9 @@
 	resized = "";
 	trail = text;
 
-	for (path = strcasestr(text, "<img src=\"");
+	for (path = (char *) strcasestr(text, "<img src=\"");
 	     path;
-	     path = strcasestr(path, "<img src=\"")) {
+	     path = (char *) strcasestr(path, "<img src=\"")) {
 
 		if (window_y == -999) {
 			/* we have images, but we don't know bounds yet */
@@ -512,7 +512,8 @@
 	   const char **morph)
 {
 	int wlen, slen, mlen, min_length;
-	char *s, *s0, *t;
+	char *s, *s0;
+	const char *t;
 
 	// unannotated words need no help.
 	if (*word && (*strongs == NULL) && (*morph == NULL)) {
@@ -531,11 +532,11 @@
 
 	rendered += "<span class=\"word\">";
 	if (*strongs) {
-		s = g_strrstr(*strongs, "</a>");
+		s = (char *) g_strrstr(*strongs, "</a>");
 		*s = '\0';
 		t = strrchr(*strongs, '>') + 1;
 		// correct weird NASB lexicon references.
-		if (s0 = strchr(*strongs, '!')) {
+		if (s0 = (char *) strchr(*strongs, '!')) {
 			do {
 				*s0 = *(s0+1);
 				++s0;
@@ -545,30 +546,30 @@
 		*s = '<';
 		slen = s - t;
 #ifdef USE_GTKMOZEMBED
-		s = strstr(*strongs, "&lt;");
+		s = (char *) strstr(*strongs, "&lt;");
 		*s = *(s+1) = *(s+2) = *(s+3) = ' ';
-		s = strstr(s, "&gt;");
+		s = (char *) strstr(s, "&gt;");
 		*s = *(s+1) = *(s+2) = *(s+3) = ' ';
 #endif /* USE_GTKMOZEMBED */
 	} else
 		slen = 0;
 	if (*morph) {
-		s = s0 = strstr(*morph, "\">") + 2;
+		s = s0 = (char *) strstr(*morph, "\">") + 2;
 		t = strchr(s, '<');
 		for (/* */; s < t; ++s)
 			if (isupper(*s))
 				*s = tolower(*s);
-		for (s = strchr(s0, ' '); s && (s < t); s = strchr(s, ' '))
+		for (s = (char *) strchr(s0, ' '); s && (s < t); s = (char *) strchr(s, ' '))
 			*s = '-';
-		s = g_strrstr(*morph, "</a>");
+		s = (char *) g_strrstr(*morph, "</a>");
 		*s = '\0';
-		t = strrchr(*morph, '>') + 1;
+		t = (char *) strrchr(*morph, '>') + 1;
 		*s = '<';
 		mlen = s - t;
 #ifdef USE_GTKMOZEMBED
-		s = strchr(*morph, '(');
+		s = (char *) strchr(*morph, '(');
 		*s = ' ';
-		s = strrchr(s, ')');
+		s = (char *) strrchr(s, ')');
 		*s = ' ';
 #endif /* USE_GTKMOZEMBED */
 	} else


Index: gnomesword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomesword/F-11/gnomesword.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnomesword.spec	24 Feb 2009 23:47:56 -0000	1.53
+++ gnomesword.spec	24 Apr 2009 10:12:07 -0000	1.54
@@ -1,12 +1,14 @@
 Name:		gnomesword           
 Version:	2.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GNOME-based Bible research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://gnomesword.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:		%{name}-gcc44.patch
+# Not upstreamed, package outdated, filed as BZ#497497
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -33,10 +35,11 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf %buildroot
@@ -77,6 +80,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.4.1-3
+- Fix FTBFS: added gnomesword-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 10:12:37 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 10:12:37 +0000 (UTC)
Subject: rpms/gnomesword/devel gnomesword-gcc44.patch, NONE,
	1.1 gnomesword.spec, 1.53, 1.54
Message-ID: <20090424101237.E13EB70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/gnomesword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15740/devel

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-gcc44.patch 
Log Message:
- Fix FTBFS: added gnomesword-gcc44.patch



gnomesword-gcc44.patch:

--- NEW FILE gnomesword-gcc44.patch ---
--- src/gecko/gecko-html.cpp.orig	2009-04-24 11:06:40.000000000 +0200
+++ src/gecko/gecko-html.cpp	2009-04-24 11:19:55.000000000 +0200
@@ -214,7 +214,7 @@
 
 	GeckoHtml *html = GECKO_HTML(embed);
 	GeckoHtmlPriv *priv = GECKO_HTML_GET_PRIVATE(html);
-	gchar *buf, *place;
+	const gchar *buf, *place;
 	gchar tmpbuf[1023];
 	gchar book[32];
 	GString *tmpstr = g_string_new(NULL);
--- src/main/sword.cc.orig	2009-04-24 11:24:29.000000000 +0200
+++ src/main/sword.cc	2009-04-24 11:28:43.000000000 +0200
@@ -184,9 +184,9 @@
 	// This is a sick. unreliable hack that should be removed
 	// after the underlying problem is fixed in Sword.
 	gchar *rework;
-	for (rework = strstr(note_str, "%20");
+	for (rework = (gchar *) strstr(note_str, "%20");
 	     rework;
-	     rework = strstr(rework+1, "%20")) {
+	     rework = (gchar *) strstr(rework+1, "%20")) {
 		*rework = ' ';
 		(void) strcpy(rework+1, rework+3);
 	}
--- src/main/url.cc.orig	2009-04-24 11:29:57.000000000 +0200
+++ src/main/url.cc	2009-04-24 11:30:27.000000000 +0200
@@ -1025,7 +1025,7 @@
 		 strstr(url, "gnomesword.url")) {
 
 		// another minor nightmare: re-encode / and : in hex.
-		gchar *place;
+		const gchar *place;
 		gchar tmpbuf[1023];
 		GString *tmpstr = g_string_new(NULL);
 
--- src/main/display.cc.orig	2009-04-24 11:20:27.000000000 +0200
+++ src/main/display.cc	2009-04-24 11:55:28.000000000 +0200
@@ -192,9 +192,9 @@
 	resized = "";
 	trail = text;
 
-	for (path = strcasestr(text, "<img src=\"");
+	for (path = (char *) strcasestr(text, "<img src=\"");
 	     path;
-	     path = strcasestr(path, "<img src=\"")) {
+	     path = (char *) strcasestr(path, "<img src=\"")) {
 
 		if (window_y == -999) {
 			/* we have images, but we don't know bounds yet */
@@ -512,7 +512,8 @@
 	   const char **morph)
 {
 	int wlen, slen, mlen, min_length;
-	char *s, *s0, *t;
+	char *s, *s0;
+	const char *t;
 
 	// unannotated words need no help.
 	if (*word && (*strongs == NULL) && (*morph == NULL)) {
@@ -531,11 +532,11 @@
 
 	rendered += "<span class=\"word\">";
 	if (*strongs) {
-		s = g_strrstr(*strongs, "</a>");
+		s = (char *) g_strrstr(*strongs, "</a>");
 		*s = '\0';
 		t = strrchr(*strongs, '>') + 1;
 		// correct weird NASB lexicon references.
-		if (s0 = strchr(*strongs, '!')) {
+		if (s0 = (char *) strchr(*strongs, '!')) {
 			do {
 				*s0 = *(s0+1);
 				++s0;
@@ -545,30 +546,30 @@
 		*s = '<';
 		slen = s - t;
 #ifdef USE_GTKMOZEMBED
-		s = strstr(*strongs, "&lt;");
+		s = (char *) strstr(*strongs, "&lt;");
 		*s = *(s+1) = *(s+2) = *(s+3) = ' ';
-		s = strstr(s, "&gt;");
+		s = (char *) strstr(s, "&gt;");
 		*s = *(s+1) = *(s+2) = *(s+3) = ' ';
 #endif /* USE_GTKMOZEMBED */
 	} else
 		slen = 0;
 	if (*morph) {
-		s = s0 = strstr(*morph, "\">") + 2;
+		s = s0 = (char *) strstr(*morph, "\">") + 2;
 		t = strchr(s, '<');
 		for (/* */; s < t; ++s)
 			if (isupper(*s))
 				*s = tolower(*s);
-		for (s = strchr(s0, ' '); s && (s < t); s = strchr(s, ' '))
+		for (s = (char *) strchr(s0, ' '); s && (s < t); s = (char *) strchr(s, ' '))
 			*s = '-';
-		s = g_strrstr(*morph, "</a>");
+		s = (char *) g_strrstr(*morph, "</a>");
 		*s = '\0';
-		t = strrchr(*morph, '>') + 1;
+		t = (char *) strrchr(*morph, '>') + 1;
 		*s = '<';
 		mlen = s - t;
 #ifdef USE_GTKMOZEMBED
-		s = strchr(*morph, '(');
+		s = (char *) strchr(*morph, '(');
 		*s = ' ';
-		s = strrchr(s, ')');
+		s = (char *) strrchr(s, ')');
 		*s = ' ';
 #endif /* USE_GTKMOZEMBED */
 	} else


Index: gnomesword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnomesword.spec	24 Feb 2009 23:47:56 -0000	1.53
+++ gnomesword.spec	24 Apr 2009 10:12:07 -0000	1.54
@@ -1,12 +1,14 @@
 Name:		gnomesword           
 Version:	2.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GNOME-based Bible research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://gnomesword.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:		%{name}-gcc44.patch
+# Not upstreamed, package outdated, filed as BZ#497497
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -33,10 +35,11 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf %buildroot
@@ -77,6 +80,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.4.1-3
+- Fix FTBFS: added gnomesword-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kwizart at fedoraproject.org  Fri Apr 24 10:15:22 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 24 Apr 2009 10:15:22 +0000 (UTC)
Subject: rpms/opencv/devel opencv-1.1-nooptim.patch, NONE,
	1.1 opencv-1.1.0-pythondir.diff, NONE,
	1.1 opencv-1.1.0-conflicts.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 opencv.spec, 1.27, 1.28
Message-ID: <20090424101522.DA7B570106@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16215

Modified Files:
	.cvsignore sources opencv.spec 
Added Files:
	opencv-1.1-nooptim.patch opencv-1.1.0-pythondir.diff 
	opencv-1.1.0-conflicts.patch 
Log Message:
Update to 1.1.0 pre1


opencv-1.1-nooptim.patch:

--- NEW FILE opencv-1.1-nooptim.patch ---
diff -up opencv-1.1.0/configure.in.nooptim opencv-1.1.0/configure.in
--- opencv-1.1.0/configure.in.nooptim	2008-10-15 17:47:43.000000000 +0200
+++ opencv-1.1.0/configure.in	2009-04-23 18:54:30.000000000 +0200
@@ -274,41 +274,41 @@ else
     AC_MSG_NOTICE( TARGET=$target )
     case $target in
     i*86-apple-*)
-        if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+        if test x"no" = "xyes"; then
             # apples g++ fails with '-march=i686' and there are no apple machines older than prescott/core anyway
             DEFAULT_CXXFLAGS="-g -march=prescott -ffast-math -fomit-frame-pointer $DEFAULT_CXXFLAGS"
         fi
         ;;
     i686-*-*)
-        if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+        if test x"no" = "xyes"; then
           # default to i686/pentiumpro -- people can override this
           DEFAULT_CXXFLAGS="-g -march=i686 -ffast-math -fomit-frame-pointer $DEFAULT_CXXFLAGS"
         fi
         ;;
     amd64-*-* | x86_64-*-*)
-        if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+        if test x"no" = "xyes"; then
           # default to i686/pentiumpro -- people can override this
           DEFAULT_CXXFLAGS="-g $DEFAULT_CXXFLAGS"
         fi
         ;;    
     powerpc-*-*)
-        if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+        if test x"no" = "xyes"; then
             # default to G3 processors -- people can override this
             DEFAULT_CXXFLAGS="-g -mcpu=G3 -mtune=G5 -fomit-frame-pointer $DEFAULT_CXXFLAGS"
         fi
         ;;
     *-*-*)
-        if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+        if test x"no" = "xyes"; then
             DEFAULT_CXXFLAGS="-fomit-frame-pointer $DEFAULT_CXXFLAGS"
         fi
         ;;
     esac
 
     CPPFLAGS="-DNDEBUG $CPPFLAGS"
-    DEFAULT_CXXFLAGS="-O3 $DEFAULT_CXXFLAGS"
+#    DEFAULT_CXXFLAGS="-O3 $DEFAULT_CXXFLAGS"
 fi
 
-if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+if test x"no" = "xyes"; then
     PY_CXXFLAGS="-Wall -pipe $DEFAULT_CXXFLAGS"
     OCT_CXXFLAGS="-fno-strict-aliasing -Wall -Wno-uninitialized -pipe $DEFAULT_CXXFLAGS"
     DEF_CXXFLAGS="-Wall -fno-rtti -pipe $DEFAULT_CXXFLAGS"

opencv-1.1.0-pythondir.diff:

--- NEW FILE opencv-1.1.0-pythondir.diff ---
--- opencv-1.0.0.orig/interfaces/swig/python/Makefile.am	2006-08-10 15:29:20.000000000 +0200
+++ opencv-1.0.0/interfaces/swig/python/Makefile.am	2007-03-22 04:04:45.000000000 +0100
@@ -92,9 +92,9 @@
 
 if BUILD_PYTHON_WRAPPERS
 
-pkgpython_LTLIBRARIES = _cv.la _highgui.la
+pkgpyexec_LTLIBRARIES = _cv.la _highgui.la
 
-pkgpython_PYTHON = \
+pkgpyexec_PYTHON = \
   __init__.py    \
   cv.py          \
   adaptors.py    \

opencv-1.1.0-conflicts.patch:

--- NEW FILE opencv-1.1.0-conflicts.patch ---
diff -up opencv-1.1.0/configure.in.conflicts opencv-1.1.0/configure.in
--- opencv-1.1.0/configure.in.conflicts	2009-04-24 12:01:24.000000000 +0200
+++ opencv-1.1.0/configure.in	2009-04-24 12:01:29.000000000 +0200
@@ -37,7 +37,7 @@ AC_PREREQ(2.60)
 AC_INIT([opencv],[opencv_version],[opencvlibrary-devel at lists.sourceforge.net])
 AC_CONFIG_SRCDIR([opencv.pc.in])
 AC_CONFIG_AUX_DIR([autotools])
-AC_CONFIG_MACRO_DIR([autotools/aclocal])
+
 
 # put CVS revision of this configure.in into the resulting configure script
 AC_REVISION($Revision: 1.60 $)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Dec 2006 16:39:48 -0000	1.5
+++ .cvsignore	24 Apr 2009 10:14:52 -0000	1.6
@@ -1 +1 @@
-opencv-1.0.0.tar.gz
+opencv-1.1pre1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Dec 2006 16:39:48 -0000	1.5
+++ sources	24 Apr 2009 10:14:52 -0000	1.6
@@ -1 +1 @@
-146a05005f2d2c16c4ee10ebd7f1dd58  opencv-1.0.0.tar.gz
+b147b7cd3c059831c415c5a2bcecdf95  opencv-1.1pre1.tar.gz


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- opencv.spec	23 Apr 2009 15:03:05 -0000	1.27
+++ opencv.spec	24 Apr 2009 10:14:52 -0000	1.28
@@ -2,23 +2,24 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           opencv
-Version:        1.0.0
-Release:        14%{?dist}
+Version:        1.1.0
+Release:        0.1.pre1%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
 # This is normal three clause BSD.
 License:        BSD
 URL:            http://opencv.willowgarage.com/wiki/
-Source0:        http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz
+Source0:        http://prdownloads.sourceforge.net/opencvlibrary/opencv-1.1pre1.tar.gz
 Source1:        opencv-samples-Makefile
-Patch0:         opencv-1.0.0-pythondir.diff
-Patch1:		opencv-1.0.0-configure.in.diff
-Patch2:         opencv-1.0.0-autotools.diff
-Patch3:         opencv-1.0.0-pkgconfig.diff
-Patch4:         opencv-1.0.0-gcc44.patch
+Patch0:         opencv-1.0.0-gcc44.patch
+Patch1:         opencv-1.1-nooptim.patch
+Patch2:         opencv-1.1.0-pythondir.diff
+Patch3:         opencv-1.1.0-conflicts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool
+
 BuildRequires:  gtk2-devel
 BuildRequires:  jasper-devel
 BuildRequires:  libpng-devel
@@ -27,6 +28,7 @@
 BuildRequires:  libtool
 BuildRequires:  swig >= 1.3.24, zlib-devel, pkgconfig
 BuildRequires:  python-devel
+BuildRequires:  python-imaging, numpy
 %{?_with_ffmpeg:BuildRequires:  ffmpeg-devel >= 0.4.9}
 
 
@@ -52,6 +54,8 @@
 Summary:        Python bindings for apps which use OpenCV
 Group:          Development/Libraries
 Requires:       opencv = %{version}-%{release}
+Requires:       python-imaging
+Requires:       numpy
 
 %description python
 This package contains Python bindings for the OpenCV library.
@@ -59,39 +63,49 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1 -b .gcc44
-%{__sed} -i 's/\r//' interfaces/swig/python/*.py \
-                     samples/python/*.py
-%{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
-                        interfaces/swig/python/__init__.py
-# Adjust timestamp on cvconfig.h.in
-touch -r configure.in cvconfig.h.in
+%patch0 -p1 -b .gcc44
+%patch1 -p1 -b .nooptim
+%patch2 -p1 -b .pydir
+#autotools conflicts between AC_CONFIG_MACRO_DIR and AM_FLAGS
+%patch3 -p1 -b .conflicts
+
+
+#Renew the autotools (and remove rpath).
+autoreconf -vif
 
 %build
-%configure --disable-static --enable-python --enable-apps
+%configure --disable-static --enable-apps \
+%ifarch i386 i586
+  --disable-sse2 \
+%endif
+
 make %{?_smp_mflags}
 
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
-      $RPM_BUILD_ROOT%{python_sitearch}/opencv/*.la \
-      $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/facedetect.cmd \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gcc \
       $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gen
-install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
+
+#Remove unversioned documentation
+rm -rf $RPM_BUILD_ROOT%{_docdir}/opencv
+#And Octave since we don't build against it yet
+rm -rf $RPM_BUILD_ROOT%{_datadir}/opencv/{samples/octave/,ChangeLog,THANKS}
 
 
 %check
-make check
+#Check fails since we don't support most video 
+#read/write capability and we don't provide a display
+make check || :
 
 
 %clean
@@ -131,11 +145,15 @@
 
 
 %changelog
+* Fri Apr 24 2009 kwizart < kwizart at gmail.com > - 1.1.0-0.1.pre1
+- Update to 1.1pre1
+- Disable CXXFLAGS hardcoded optimization
+- Add BR: python-imaging, numpy
+- Disable make check failure for now
+
 * Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 1.0.0-14
 - Fix for gcc44
 - Enable BR jasper-devel
-- Disable ldconfig run on python modules (uneeded)
-- Prevent timestamp change on install
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From mjakubicek at fedoraproject.org  Fri Apr 24 10:18:34 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 10:18:34 +0000 (UTC)
Subject: rpms/postgresql-pgpool-ha/F-11 postgresql-pgpool-ha.spec,1.3,1.4
Message-ID: <20090424101834.3DA7A70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/postgresql-pgpool-ha/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16694/F-11

Modified Files:
	postgresql-pgpool-ha.spec 
Log Message:
- Fix FTBFS: proper heartbeat location




Index: postgresql-pgpool-ha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-pgpool-ha/F-11/postgresql-pgpool-ha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgresql-pgpool-ha.spec	27 Feb 2009 01:51:11 -0000	1.3
+++ postgresql-pgpool-ha.spec	24 Apr 2009 10:18:03 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:	Pgpool-HA uses heartbeat to keep pgpool from being a single point of failure
 Name:		postgresql-%{short_name}
 Version:	1.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
@@ -23,6 +23,10 @@
 %setup -q -n %{short_name}-%{version}
 
 %build
+
+# fix heartbeat location:
+sed -i "s|/usr/lib/ocf/resource.d|%{_datadir}/ocf/resource.d|" configure
+
 %configure --bindir=%{_bindir} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir}
 make %{?smp_flags} -C src
 
@@ -31,10 +35,10 @@
 cd src
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}/ha.d/resource.d/heartbeat/
-install -d %{buildroot}%{_libdir}/ocf/resource.d/heartbeat/
+install -d %{buildroot}%{_datadir}/ocf/resource.d/heartbeat/
 install -m 755 pgpool.monitor %{buildroot}%{_bindir}/pgpool.monitor
 install -m 755 pgpool %{buildroot}%{_sysconfdir}/ha.d/resource.d/heartbeat/pgpool
-install -m 755 pgpool %{buildroot}%{_libdir}/ocf/resource.d/heartbeat/
+install -m 755 pgpool %{buildroot}%{_datadir}/ocf/resource.d/heartbeat/
 
 %clean
 rm -rf %{buildroot}
@@ -47,6 +51,9 @@
 %doc AUTHORS COPYING INSTALL README.ja ChangeLog doc README 
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.1.0-7
+- Fix FTBFS: proper heartbeat location
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 10:18:34 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 10:18:34 +0000 (UTC)
Subject: rpms/postgresql-pgpool-ha/devel postgresql-pgpool-ha.spec,1.3,1.4
Message-ID: <20090424101834.799E970106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/postgresql-pgpool-ha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16694/devel

Modified Files:
	postgresql-pgpool-ha.spec 
Log Message:
- Fix FTBFS: proper heartbeat location




Index: postgresql-pgpool-ha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-pgpool-ha/devel/postgresql-pgpool-ha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgresql-pgpool-ha.spec	27 Feb 2009 01:51:11 -0000	1.3
+++ postgresql-pgpool-ha.spec	24 Apr 2009 10:18:04 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:	Pgpool-HA uses heartbeat to keep pgpool from being a single point of failure
 Name:		postgresql-%{short_name}
 Version:	1.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
@@ -23,6 +23,10 @@
 %setup -q -n %{short_name}-%{version}
 
 %build
+
+# fix heartbeat location:
+sed -i "s|/usr/lib/ocf/resource.d|%{_datadir}/ocf/resource.d|" configure
+
 %configure --bindir=%{_bindir} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir}
 make %{?smp_flags} -C src
 
@@ -31,10 +35,10 @@
 cd src
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}/ha.d/resource.d/heartbeat/
-install -d %{buildroot}%{_libdir}/ocf/resource.d/heartbeat/
+install -d %{buildroot}%{_datadir}/ocf/resource.d/heartbeat/
 install -m 755 pgpool.monitor %{buildroot}%{_bindir}/pgpool.monitor
 install -m 755 pgpool %{buildroot}%{_sysconfdir}/ha.d/resource.d/heartbeat/pgpool
-install -m 755 pgpool %{buildroot}%{_libdir}/ocf/resource.d/heartbeat/
+install -m 755 pgpool %{buildroot}%{_datadir}/ocf/resource.d/heartbeat/
 
 %clean
 rm -rf %{buildroot}
@@ -47,6 +51,9 @@
 %doc AUTHORS COPYING INSTALL README.ja ChangeLog doc README 
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.1.0-7
+- Fix FTBFS: proper heartbeat location
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kwizart at fedoraproject.org  Fri Apr 24 10:19:59 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 24 Apr 2009 10:19:59 +0000 (UTC)
Subject: rpms/opencv/devel opencv.spec,1.28,1.29
Message-ID: <20090424101959.3DC3A70106@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17002

Modified Files:
	opencv.spec 
Log Message:
Resurect lost changelog



Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- opencv.spec	24 Apr 2009 10:14:52 -0000	1.28
+++ opencv.spec	24 Apr 2009 10:19:29 -0000	1.29
@@ -154,6 +154,8 @@
 * Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 1.0.0-14
 - Fix for gcc44
 - Enable BR jasper-devel
+- Disable ldconfig run on python modules (uneeded)
+- Prevent timestamp change on install
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From harald at fedoraproject.org  Fri Apr 24 10:33:37 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 24 Apr 2009 10:33:37 +0000 (UTC)
Subject: rpms/udev/F-11 udev.spec,1.271,1.272
Message-ID: <20090424103337.D39E770106@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19416

Modified Files:
	udev.spec 
Log Message:
* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 141-2
- cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id
  (bug #496298)
- Resolves: rhbz#496298



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- udev.spec	14 Apr 2009 13:47:31 -0000	1.271
+++ udev.spec	24 Apr 2009 10:33:07 -0000	1.272
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 141
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,6 +18,8 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
+Patch1: udev.git-f907449eee.patch
+
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -91,6 +93,8 @@
 %prep
 %setup -q  
 
+%patch1 -p1 -b .git1
+
 %patch102 -p1 -b .sysconf
 
 %build
@@ -379,6 +383,11 @@
 
 
 %changelog
+* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 141-2
+- cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id
+  (bug #496298)
+- Resolves: rhbz#496298
+
 * Tue Apr 14 2009 Harald Hoyer <harald at redhat.com> 141-1
 - version 141
 



From harald at fedoraproject.org  Fri Apr 24 10:35:46 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 24 Apr 2009 10:35:46 +0000 (UTC)
Subject: rpms/udev/F-11 udev.spec,1.272,1.273
Message-ID: <20090424103546.DF05270106@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19837

Modified Files:
	udev.spec 
Log Message:
tag inc


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- udev.spec	24 Apr 2009 10:33:07 -0000	1.272
+++ udev.spec	24 Apr 2009 10:35:16 -0000	1.273
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 141
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -383,7 +383,7 @@
 
 
 %changelog
-* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 141-2
+* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 141-3
 - cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id
   (bug #496298)
 - Resolves: rhbz#496298



From harald at fedoraproject.org  Fri Apr 24 10:39:08 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 24 Apr 2009 10:39:08 +0000 (UTC)
Subject: rpms/udev/F-11 udev.git-f907449eee.patch,NONE,1.1
Message-ID: <20090424103908.8767270106@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20554

Added Files:
	udev.git-f907449eee.patch 
Log Message:
* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 141-3
- cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id
  (bug #496298)
- Resolves: rhbz#496298


udev.git-f907449eee.patch:

--- NEW FILE udev.git-f907449eee.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 21 Apr 2009 01:27:14 +0000 (+0200)
Subject: cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=f907449eee

cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id

Some broken mobile phones offer a faked cdrom drive with a media
without any tracks.
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index c578f12..371d6a2 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -76,6 +76,7 @@ static unsigned int cd_mrw;
 static unsigned int cd_mrw_w;
 
 /* media info */
+static unsigned int cd_media;
 static unsigned int cd_media_cd_rom;
 static unsigned int cd_media_cd_r;
 static unsigned int cd_media_cd_rw;
@@ -325,6 +326,8 @@ static int cd_profiles(struct udev *udev, int fd)
 		return -1;
 	}
 
+	cd_media = 1;
+
 	switch (cur_profile) {
 	case 0x03:
 	case 0x04:
@@ -625,6 +628,8 @@ print:
 	if (cd_mrw_w)
 		printf("ID_CDROM_MRW_W=1\n");
 
+	if (cd_media)
+		printf("ID_CDROM_MEDIA=1\n");
 	if (cd_media_mo)
 		printf("ID_CDROM_MEDIA_MO=1\n");
 	if (cd_media_mrw)
diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
index 23c21f8..4095488 100644
--- a/rules/rules.d/60-persistent-storage.rules
+++ b/rules/rules.d/60-persistent-storage.rules
@@ -55,7 +55,7 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA
 ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end"
 
 # probe filesystem metadata of optical drives which have a media inserted
-KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}=="?*", IMPORT{program}="vol_id --export --skip-raid --offset=$env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
+KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", IMPORT{program}="vol_id --export --skip-raid --offset=$env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
 
 # probe filesystem metadata of disks
 KERNEL!="sr*", IMPORT{program}="vol_id --export $tempnode"



From kwizart at fedoraproject.org  Fri Apr 24 10:43:22 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 24 Apr 2009 10:43:22 +0000 (UTC)
Subject: rpms/opencv/devel opencv.spec,1.29,1.30
Message-ID: <20090424104322.A21F070106@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21129

Modified Files:
	opencv.spec 
Log Message:
hack



Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- opencv.spec	24 Apr 2009 10:19:29 -0000	1.29
+++ opencv.spec	24 Apr 2009 10:42:52 -0000	1.30
@@ -74,6 +74,7 @@
 autoreconf -vif
 
 %build
+export SWIG_PYTHON_LIBS=%{_libdir}
 %configure --disable-static --enable-apps \
 %ifarch i386 i586
   --disable-sse2 \



From mjakubicek at fedoraproject.org  Fri Apr 24 10:55:57 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 10:55:57 +0000 (UTC)
Subject: rpms/reciteword/F-11 reciteword-gcc44.patch, NONE,
	1.1 reciteword.spec, 1.10, 1.11
Message-ID: <20090424105557.92F9F7013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/reciteword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23112/F-11

Modified Files:
	reciteword.spec 
Added Files:
	reciteword-gcc44.patch 
Log Message:
- Fix FTBFS: added reciteword-gcc44.patch



reciteword-gcc44.patch:

--- NEW FILE reciteword-gcc44.patch ---
--- src/bookfile.cpp.orig	2009-04-24 12:31:47.000000000 +0200
+++ src/bookfile.cpp	2009-04-24 12:42:19.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	gchar tmp, *tmp1, *tmp2;
 
-	tmp1 = strstr (str1, str2);
+	tmp1 = (gchar *) strstr (str1, str2);
 	if (!tmp1)
 		return NULL;
 	else


Index: reciteword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reciteword/F-11/reciteword.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- reciteword.spec	25 Feb 2009 19:25:05 -0000	1.10
+++ reciteword.spec	24 Apr 2009 10:55:27 -0000	1.11
@@ -1,13 +1,16 @@
 Name: reciteword
 Summary: Recite Word Easily
 Version: 0.8.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Productivity
 License: GPLv3
 URL: http://reciteword.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1: http://downloads.sourceforge.net/%{name}/%{name}-books-0.8.4.tar.bz2
 Source2: http://downloads.sourceforge.net/%{name}/%{name}-dicts-0.8.2.tar.bz2
+# Filed in upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2780370&group_id=43722&atid=437209
+Patch0: %{name}-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2
@@ -25,10 +28,11 @@
 %setup -q
 %setup -q -n %{name}-%{version} -D -T -a 1
 %setup -q -n %{name}-%{version} -D -T -a 2
+%patch0
 
 %build
 %configure
-make
+make -k
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +52,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.4-5
+- Fix FTBFS: added reciteword-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 10:55:57 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 10:55:57 +0000 (UTC)
Subject: rpms/reciteword/devel reciteword-gcc44.patch, NONE,
	1.1 reciteword.spec, 1.10, 1.11
Message-ID: <20090424105557.D2E367013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/reciteword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23112/devel

Modified Files:
	reciteword.spec 
Added Files:
	reciteword-gcc44.patch 
Log Message:
- Fix FTBFS: added reciteword-gcc44.patch



reciteword-gcc44.patch:

--- NEW FILE reciteword-gcc44.patch ---
--- src/bookfile.cpp.orig	2009-04-24 12:31:47.000000000 +0200
+++ src/bookfile.cpp	2009-04-24 12:42:19.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	gchar tmp, *tmp1, *tmp2;
 
-	tmp1 = strstr (str1, str2);
+	tmp1 = (gchar *) strstr (str1, str2);
 	if (!tmp1)
 		return NULL;
 	else


Index: reciteword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reciteword/devel/reciteword.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- reciteword.spec	25 Feb 2009 19:25:05 -0000	1.10
+++ reciteword.spec	24 Apr 2009 10:55:27 -0000	1.11
@@ -1,13 +1,16 @@
 Name: reciteword
 Summary: Recite Word Easily
 Version: 0.8.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Productivity
 License: GPLv3
 URL: http://reciteword.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1: http://downloads.sourceforge.net/%{name}/%{name}-books-0.8.4.tar.bz2
 Source2: http://downloads.sourceforge.net/%{name}/%{name}-dicts-0.8.2.tar.bz2
+# Filed in upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2780370&group_id=43722&atid=437209
+Patch0: %{name}-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2
@@ -25,10 +28,11 @@
 %setup -q
 %setup -q -n %{name}-%{version} -D -T -a 1
 %setup -q -n %{name}-%{version} -D -T -a 2
+%patch0
 
 %build
 %configure
-make
+make -k
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +52,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.8.4-5
+- Fix FTBFS: added reciteword-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kwizart at fedoraproject.org  Fri Apr 24 11:05:06 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 24 Apr 2009 11:05:06 +0000 (UTC)
Subject: rpms/opencv/devel opencv-1.1.0-pythondir.diff, 1.1, 1.2 opencv.spec,
	1.30, 1.31
Message-ID: <20090424110506.8DC6570106@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25194

Modified Files:
	opencv-1.1.0-pythondir.diff opencv.spec 
Log Message:
pythondir patch was wrongly imported


opencv-1.1.0-pythondir.diff:

Index: opencv-1.1.0-pythondir.diff
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv-1.1.0-pythondir.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opencv-1.1.0-pythondir.diff	24 Apr 2009 10:14:52 -0000	1.1
+++ opencv-1.1.0-pythondir.diff	24 Apr 2009 11:05:05 -0000	1.2
@@ -1,14 +1,15 @@
---- opencv-1.0.0.orig/interfaces/swig/python/Makefile.am	2006-08-10 15:29:20.000000000 +0200
-+++ opencv-1.0.0/interfaces/swig/python/Makefile.am	2007-03-22 04:04:45.000000000 +0100
-@@ -92,9 +92,9 @@
- 
+diff -up opencv-1.1.0/interfaces/swig/python/Makefile.am.pydir opencv-1.1.0/interfaces/swig/python/Makefile.am
+--- opencv-1.1.0/interfaces/swig/python/Makefile.am.pydir	2009-04-24 10:48:47.000000000 +0200
++++ opencv-1.1.0/interfaces/swig/python/Makefile.am	2009-04-24 10:49:49.000000000 +0200
+@@ -107,9 +107,9 @@ endif
  if BUILD_PYTHON_WRAPPERS
  
--pkgpython_LTLIBRARIES = _cv.la _highgui.la
-+pkgpyexec_LTLIBRARIES = _cv.la _highgui.la
+ #pkgpython_LTLIBRARIES = _cv.la _highgui.la
+-pkgpython_LTLIBRARIES = _cv.la _ml.la _highgui.la
++pkgpyexec_LTLIBRARIES = _cv.la _ml.la _highgui.la
  
 -pkgpython_PYTHON = \
 +pkgpyexec_PYTHON = \
    __init__.py    \
    cv.py          \
-   adaptors.py    \
+   ml.py          \


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- opencv.spec	24 Apr 2009 10:42:52 -0000	1.30
+++ opencv.spec	24 Apr 2009 11:05:05 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           opencv
 Version:        1.1.0
-Release:        0.1.pre1%{?dist}
+Release:        0.1.pre1%{?dist}.1
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries



From pnemade at fedoraproject.org  Fri Apr 24 11:05:58 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Fri, 24 Apr 2009 11:05:58 +0000 (UTC)
Subject: rpms/fontmatrix/devel fontmatrix.spec,1.14,1.15 sources,1.9,1.10
Message-ID: <20090424110558.441F370106@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/fontmatrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25269

Modified Files:
	fontmatrix.spec sources 
Log Message:
* Fri Apr 24 2009 Parag <pnemade at redhat.com> - 0.5.0-2.r931
- update to svn revision 931




Index: fontmatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/fontmatrix.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fontmatrix.spec	20 Mar 2009 05:09:18 -0000	1.14
+++ fontmatrix.spec	24 Apr 2009 11:05:27 -0000	1.15
@@ -1,9 +1,9 @@
-%define svnrev 900
+%define svnrev 931
 
 Name: fontmatrix
 Summary: A fonts manager
 Version: 0.5.0
-Release: 1.r%{svnrev}%{?dist}
+Release: 2.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Parag <pnemade at redhat.com> - 0.5.0-2.r931
+- update to svn revision 931
+
 * Fri Mar 20 2009 Parag <pnemade at redhat.com> - 0.5.0-1.r900
 - update to svn revision 900
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Mar 2009 05:09:18 -0000	1.9
+++ sources	24 Apr 2009 11:05:27 -0000	1.10
@@ -1 +1 @@
-a5775528ba4995e6bb53be2daa6eb113  fontmatrix-0.5.0-Source.tar.gz
+5064020766f09da2aa4854e384dd0638  fontmatrix-0.5.0-Source.tar.gz



From phuang at fedoraproject.org  Fri Apr 24 11:06:37 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 24 Apr 2009 11:06:37 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.67,1.68
Message-ID: <20090424110637.73E4570106@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25416

Modified Files:
	ibus.spec 
Log Message:
Separate docs from devel subpackage


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ibus.spec	17 Apr 2009 10:57:05 -0000	1.67
+++ ibus.spec	24 Apr 2009 11:06:06 -0000	1.68
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090417
+Version:    1.1.0.20090423
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -97,12 +97,21 @@
 Requires:   %{name} = %{version}-%{release}
 Requires:   glib2-devel
 Requires:   dbus-devel
-Requires:   gtk-doc
 
 %description devel
 The ibus-devel package contains the header files and developer
 docs for ibus.
 
+%package devel-docs
+Summary:    Developer documents for ibus
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   gtk-doc
+
+%description devel-docs
+The ibus-devel-docs package contains developer documentation for ibus
+
+
 %prep
 %setup -q
 # %patch0 -p1
@@ -213,10 +222,18 @@
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_includedir}/*
-%{_datadir}/gtk-doc/html/*
 %{_libdir}/pkgconfig/*
 
+%files devel-docs
+%{_datadir}/gtk-doc/html/*
+
 %changelog
+* Thu Apr 23 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090423-1
+- Update to ibus-1.1.0.20090423.
+- Fix bug 497265 -  [mai_IN] Maithili language name is not correct.
+- Fix bug 497279 -  IBus does not works with evolution correctly.
+- Enhance authentication both in daemon & clients
+
 * Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
 - Update to ibus-1.1.0.20090417.
 - Fix bug 496199 -  cannot remove Ctrl+Space hotkey with ibus-setup



From pkgdb at fedoraproject.org  Fri Apr 24 11:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 11:32:35 +0000
Subject: [pkgdb] quassel: arbiter has requested watchbugzilla
Message-ID: <20090424113235.A286E10F88E@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on quassel (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Fri Apr 24 11:32:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 11:32:43 +0000
Subject: [pkgdb] quassel: arbiter has requested watchcommits
Message-ID: <20090424113243.F3E8810F886@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on quassel (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Fri Apr 24 11:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 11:32:47 +0000
Subject: [pkgdb] quassel: arbiter has requested commit
Message-ID: <20090424113247.DFCE810F890@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on quassel (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Fri Apr 24 11:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 11:32:51 +0000
Subject: [pkgdb] quassel: arbiter has requested watchbugzilla
Message-ID: <20090424113251.8672C10F88D@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on quassel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Fri Apr 24 11:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 11:32:52 +0000
Subject: [pkgdb] quassel: arbiter has requested watchcommits
Message-ID: <20090424113252.7BADE10F860@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on quassel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Fri Apr 24 11:32:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 11:32:53 +0000
Subject: [pkgdb] quassel: arbiter has requested commit
Message-ID: <20090424113253.2AF1610F895@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on quassel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From harald at fedoraproject.org  Fri Apr 24 11:38:48 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 24 Apr 2009 11:38:48 +0000 (UTC)
Subject: rpms/system-config-boot/F-11 .cvsignore, 1.19, 1.20 sources, 1.19, 
	1.20 system-config-boot.spec, 1.32, 1.33
Message-ID: <20090424113848.27EE870106@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv567

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 0.3.1
- translation updates
- removed kudzu import (bug #473798)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	28 Oct 2008 14:50:20 -0000	1.19
+++ .cvsignore	24 Apr 2009 11:38:16 -0000	1.20
@@ -1 +1 @@
-system-config-boot-0.3.0.tar.bz2
+system-config-boot-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	28 Oct 2008 14:50:20 -0000	1.19
+++ sources	24 Apr 2009 11:38:16 -0000	1.20
@@ -1 +1 @@
-91bfb1c55aba4c90c5c5711adc5cc015  system-config-boot-0.3.0.tar.bz2
+e63da9002315977c73aee6e147396fe3  system-config-boot-0.3.1.tar.bz2


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-11/system-config-boot.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-boot.spec	26 Feb 2009 04:59:24 -0000	1.32
+++ system-config-boot.spec	24 Apr 2009 11:38:16 -0000	1.33
@@ -3,8 +3,8 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.3.0
-Release: 4%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPLv2
 ExclusiveOS: Linux
@@ -66,11 +66,9 @@
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.0-3
-- Rebuild for Python 2.6
+* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 0.3.1
+- translation updates
+- removed kudzu import (bug #473798)
 
 * Tue Oct 28 2008 Harald Hoyer <harald at redhat.com> 0.3.0-2
 - reapplied changes by spot



From than at fedoraproject.org  Fri Apr 24 11:42:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 24 Apr 2009 11:42:40 +0000 (UTC)
Subject: rpms/qt/F-11 .cvsignore, 1.53, 1.54 qt.spec, 1.262, 1.263 sources, 
	1.55, 1.56
Message-ID: <20090424114240.2638270106@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1289

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
apply upstream patch to fix the svg rendering regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	25 Mar 2009 18:34:14 -0000	1.53
+++ .cvsignore	24 Apr 2009 11:42:09 -0000	1.54
@@ -2,3 +2,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.5.0.tar.bz2
 qt-copy-patches-20090325svn.tar.bz2
+qt-copy-patches-20090424svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- qt.spec	23 Apr 2009 12:18:08 -0000	1.262
+++ qt.spec	24 Apr 2009 11:42:09 -0000	1.263
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090423
+%define qt_copy 20090424
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -308,10 +308,6 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
-echo "0245" >> patches/DISABLED
-echo "0275" >> patches/DISABLED
-echo "0276" >> patches/DISABLED
-echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -809,6 +805,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
+- apply upstream patch to fix the svg rendering regression
+
 * Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
 - 4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	23 Apr 2009 12:18:08 -0000	1.55
+++ sources	24 Apr 2009 11:42:09 -0000	1.56
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
+e55de89fb6896d44325ee867d5747bc8  qt-copy-patches-20090424svn.tar.bz2



From dwalsh at fedoraproject.org  Fri Apr 24 11:42:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 11:42:44 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.95,
	1.96 selinux-policy.spec, 1.831, 1.832
Message-ID: <20090424114244.3203A70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1434

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
- Update to latest milter code from Paul Howarth


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- policy-20090105.patch	24 Apr 2009 04:09:22 -0000	1.95
+++ policy-20090105.patch	24 Apr 2009 11:42:41 -0000	1.96
@@ -14791,6 +14791,86 @@
  
  optional_policy(`
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
+--- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-24 07:20:31.000000000 -0400
+@@ -1,6 +1,8 @@
+-/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
+-/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
+ 
++/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
+ /usr/sbin/spamass-milter			--	gen_context(system_u:object_r:spamass_milter_exec_t,s0)
++/var/lib/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_state_t,s0)
+ /var/run/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_data_t,s0)
+ /var/run/spamass-milter\.pid			--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
++
++/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
+--- nsaserefpolicy/policy/modules/services/milter.if	2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 07:22:51.000000000 -0400
+@@ -77,3 +77,24 @@
+ 	getattr_dirs_pattern($1, milter_data_type, milter_data_type)
+ 	getattr_sock_files_pattern($1, milter_data_type, milter_data_type)
+ ')
++
++########################################
++## <summary>
++##	Manage spamassassin milter state
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`milter_manage_spamass_state',`
++	gen_require(`
++		type spamass_milter_state_t;
++	')
++
++	files_search_var_lib($1)
++	manage_files_pattern($1, spamass_milter_state_t, spamass_milter_state_t)
++	manage_dirs_pattern($1, spamass_milter_state_t, spamass_milter_state_t)
++	manage_lnk_files_pattern($1, spamass_milter_state_t, spamass_milter_state_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.te serefpolicy-3.6.12/policy/modules/services/milter.te
+--- nsaserefpolicy/policy/modules/services/milter.te	2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 07:22:01.000000000 -0400
+@@ -14,6 +14,12 @@
+ milter_template(regex)
+ milter_template(spamass)
+ 
++# Type for the spamass-milter home directory, under which spamassassin will
++# store system-wide preferences, bayes databases etc. if not configured to
++# use per-user configuration
++type spamass_milter_state_t;
++files_type(spamass_milter_state_t);
++
+ ########################################
+ #
+ # milter-regex local policy
+@@ -21,6 +27,10 @@
+ #   http://www.benzedrine.cx/milter-regex.html
+ #
+ 
++# The milter runs from /var/lib/spamass-milter
++files_search_var_lib(spamass_milter_t);
++allow spamass_milter_t spamass_milter_state_t:dir search_dir_perms;
++
+ # It removes any existing socket (not owned by root) whilst running as root
+ # and then calls setgid() and setuid() to drop privileges
+ allow regex_milter_t self:capability { setuid setgid dac_override };
+@@ -41,6 +51,10 @@
+ #   http://savannah.nongnu.org/projects/spamass-milt/
+ #
+ 
++# The milter runs from /var/lib/spamass-milter
++files_search_var_lib(spamass_milter_t);
++allow spamass_milter_t spamass_milter_state_t:dir search_dir_perms;
++
+ kernel_read_system_state(spamass_milter_t)
+ 
+ # When used with -b or -B options, the milter invokes sendmail to send mail
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.12/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/mta.fc	2009-04-23 09:44:57.000000000 -0400
@@ -14904,7 +14984,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.6.12/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/mta.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/mta.te	2009-04-24 07:24:07.000000000 -0400
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -14981,28 +15061,19 @@
  ')
  
  optional_policy(`
-@@ -95,16 +120,16 @@
+@@ -95,6 +120,11 @@
  ')
  
  optional_policy(`
--	logrotate_read_tmp_files(system_mail_t)
 +	exim_domtrans(system_mail_t)
 +	exim_manage_log(system_mail_t)
++')
++
++optional_policy(`
+ 	logrotate_read_tmp_files(system_mail_t)
  ')
  
- optional_policy(`
--	logwatch_read_tmp_files(system_mail_t)
-+	logrotate_read_tmp_files(system_mail_t)
- ')
- 
- optional_policy(`
--	# newaliases runs as system_mail_t when the sendmail initscript does a restart
--	milter_getattr_all_sockets(system_mail_t)
-+	logwatch_read_tmp_files(system_mail_t)
- ')
- 
- optional_policy(`
-@@ -132,10 +157,6 @@
+@@ -132,10 +162,6 @@
  		# compatability for old default main.cf
  		postfix_config_filetrans(system_mail_t, etc_aliases_t, { dir file lnk_file sock_file fifo_file })
  	')
@@ -15013,7 +15084,7 @@
  ')
  
  optional_policy(`
-@@ -155,6 +176,19 @@
+@@ -155,6 +181,19 @@
  ')
  
  optional_policy(`
@@ -15033,7 +15104,7 @@
  	smartmon_read_tmp_files(system_mail_t)
  ')
  
-@@ -174,6 +208,25 @@
+@@ -174,6 +213,25 @@
  	')
  ')
  
@@ -21751,7 +21822,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 07:23:40.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -22011,6 +22082,16 @@
  ')
  
  optional_policy(`
+@@ -454,5 +527,9 @@
+ ')
+ 
+ optional_policy(`
++	milter_manage_spamass_state(spamd_t)
++')
++
++optional_policy(`
+ 	udev_read_db(spamd_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.6.12/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2008-10-08 19:00:27.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/squid.fc	2009-04-23 09:44:57.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -r1.831 -r1.832
--- selinux-policy.spec	24 Apr 2009 03:16:44 -0000	1.831
+++ selinux-policy.spec	24 Apr 2009 11:42:43 -0000	1.832
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
+- Update to latest milter code from Paul Howarth
+
 * Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
 - Additional perms for readahead
 



From dwalsh at fedoraproject.org  Fri Apr 24 11:42:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 11:42:48 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.102,
	1.103 selinux-policy.spec, 1.837, 1.838
Message-ID: <20090424114248.3561670106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1468

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
- Update to latest milter code from Paul Howarth


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- policy-20090105.patch	24 Apr 2009 04:09:16 -0000	1.102
+++ policy-20090105.patch	24 Apr 2009 11:42:46 -0000	1.103
@@ -14791,6 +14791,86 @@
  
  optional_policy(`
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
+--- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-24 07:20:31.000000000 -0400
+@@ -1,6 +1,8 @@
+-/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
+-/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
+ 
++/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
+ /usr/sbin/spamass-milter			--	gen_context(system_u:object_r:spamass_milter_exec_t,s0)
++/var/lib/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_state_t,s0)
+ /var/run/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_data_t,s0)
+ /var/run/spamass-milter\.pid			--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
++
++/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
+--- nsaserefpolicy/policy/modules/services/milter.if	2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 07:22:51.000000000 -0400
+@@ -77,3 +77,24 @@
+ 	getattr_dirs_pattern($1, milter_data_type, milter_data_type)
+ 	getattr_sock_files_pattern($1, milter_data_type, milter_data_type)
+ ')
++
++########################################
++## <summary>
++##	Manage spamassassin milter state
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`milter_manage_spamass_state',`
++	gen_require(`
++		type spamass_milter_state_t;
++	')
++
++	files_search_var_lib($1)
++	manage_files_pattern($1, spamass_milter_state_t, spamass_milter_state_t)
++	manage_dirs_pattern($1, spamass_milter_state_t, spamass_milter_state_t)
++	manage_lnk_files_pattern($1, spamass_milter_state_t, spamass_milter_state_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.te serefpolicy-3.6.12/policy/modules/services/milter.te
+--- nsaserefpolicy/policy/modules/services/milter.te	2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 07:22:01.000000000 -0400
+@@ -14,6 +14,12 @@
+ milter_template(regex)
+ milter_template(spamass)
+ 
++# Type for the spamass-milter home directory, under which spamassassin will
++# store system-wide preferences, bayes databases etc. if not configured to
++# use per-user configuration
++type spamass_milter_state_t;
++files_type(spamass_milter_state_t);
++
+ ########################################
+ #
+ # milter-regex local policy
+@@ -21,6 +27,10 @@
+ #   http://www.benzedrine.cx/milter-regex.html
+ #
+ 
++# The milter runs from /var/lib/spamass-milter
++files_search_var_lib(spamass_milter_t);
++allow spamass_milter_t spamass_milter_state_t:dir search_dir_perms;
++
+ # It removes any existing socket (not owned by root) whilst running as root
+ # and then calls setgid() and setuid() to drop privileges
+ allow regex_milter_t self:capability { setuid setgid dac_override };
+@@ -41,6 +51,10 @@
+ #   http://savannah.nongnu.org/projects/spamass-milt/
+ #
+ 
++# The milter runs from /var/lib/spamass-milter
++files_search_var_lib(spamass_milter_t);
++allow spamass_milter_t spamass_milter_state_t:dir search_dir_perms;
++
+ kernel_read_system_state(spamass_milter_t)
+ 
+ # When used with -b or -B options, the milter invokes sendmail to send mail
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.12/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/mta.fc	2009-04-23 09:44:57.000000000 -0400
@@ -14904,7 +14984,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.6.12/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/mta.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/mta.te	2009-04-24 07:24:07.000000000 -0400
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -14981,28 +15061,19 @@
  ')
  
  optional_policy(`
-@@ -95,16 +120,16 @@
+@@ -95,6 +120,11 @@
  ')
  
  optional_policy(`
--	logrotate_read_tmp_files(system_mail_t)
 +	exim_domtrans(system_mail_t)
 +	exim_manage_log(system_mail_t)
++')
++
++optional_policy(`
+ 	logrotate_read_tmp_files(system_mail_t)
  ')
  
- optional_policy(`
--	logwatch_read_tmp_files(system_mail_t)
-+	logrotate_read_tmp_files(system_mail_t)
- ')
- 
- optional_policy(`
--	# newaliases runs as system_mail_t when the sendmail initscript does a restart
--	milter_getattr_all_sockets(system_mail_t)
-+	logwatch_read_tmp_files(system_mail_t)
- ')
- 
- optional_policy(`
-@@ -132,10 +157,6 @@
+@@ -132,10 +162,6 @@
  		# compatability for old default main.cf
  		postfix_config_filetrans(system_mail_t, etc_aliases_t, { dir file lnk_file sock_file fifo_file })
  	')
@@ -15013,7 +15084,7 @@
  ')
  
  optional_policy(`
-@@ -155,6 +176,19 @@
+@@ -155,6 +181,19 @@
  ')
  
  optional_policy(`
@@ -15033,7 +15104,7 @@
  	smartmon_read_tmp_files(system_mail_t)
  ')
  
-@@ -174,6 +208,25 @@
+@@ -174,6 +213,25 @@
  	')
  ')
  
@@ -21751,7 +21822,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 07:23:40.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -22011,6 +22082,16 @@
  ')
  
  optional_policy(`
+@@ -454,5 +527,9 @@
+ ')
+ 
+ optional_policy(`
++	milter_manage_spamass_state(spamd_t)
++')
++
++optional_policy(`
+ 	udev_read_db(spamd_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.6.12/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2008-10-08 19:00:27.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/squid.fc	2009-04-23 09:44:57.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- selinux-policy.spec	24 Apr 2009 04:09:16 -0000	1.837
+++ selinux-policy.spec	24 Apr 2009 11:42:47 -0000	1.838
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -213,8 +213,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs n y allow
-%installCmds targeted mcs n y allow
+%setupCmds targeted mcs y y allow
+%installCmds targeted mcs y y allow
 %endif
 
 %if %{BUILD_MINIMUM}
@@ -237,7 +237,7 @@
 %installCmds olpc mcs n y allow
 %endif
 
-make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 $RPM_SOURCE_DIR/policygentool %{buildroot}%{_usr}/share/selinux/devel/
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
+- Update to latest milter code from Paul Howarth
+
 * Thu Apr 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-15
 - Additional perms for readahead
 



From kwizart at fedoraproject.org  Fri Apr 24 11:43:42 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 24 Apr 2009 11:43:42 +0000 (UTC)
Subject: rpms/opencv/F-11 opencv.spec,1.27,1.28
Message-ID: <20090424114342.1A0C770106@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1363

Modified Files:
	opencv.spec 
Log Message:
Disable make check failure to see how it works for ppc64



Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/F-11/opencv.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- opencv.spec	22 Apr 2009 14:28:34 -0000	1.27
+++ opencv.spec	24 Apr 2009 11:43:11 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name:           opencv
 Version:        1.0.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -91,7 +91,11 @@
 
 
 %check
-make check
+#Known to fail on ppc
+make check \
+%ifnarch %{ix86} x86_64
+  || :
+%endif
 
 
 %clean
@@ -131,6 +135,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 kwizart < kwizart at gmail.com > - 1.0.0-15
+- Disable make check failure
+
 * Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 1.0.0-14
 - Fix for gcc44
 - Enable BR jasper-devel



From petersen at fedoraproject.org  Fri Apr 24 11:44:56 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 11:44:56 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.12,1.13
Message-ID: <20090424114456.C083170106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2062

Modified Files:
	ghc-X11.spec 
Log Message:
ghc_version is now in macros.ghc


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ghc-X11.spec	24 Apr 2009 00:45:56 -0000	1.12
+++ ghc-X11.spec	24 Apr 2009 11:44:26 -0000	1.13
@@ -3,14 +3,12 @@
 %bcond_without doc
 %bcond_without prof
 
-%{expand: %%global ghc_version %(ghc --numeric-version)}
-
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -30,7 +28,7 @@
 BuildRequires:  libXinerama-devel, libX11-devel, libXext-devel
 
 %description
-This package provides the Haskell %{pkg_name} library.
+This package provides the Haskell %{pkg_name} library for ghc.
 
 The library consists of bindings to direct translations of the C bindings; for
 documentation of these calls, refer to "The Xlib Programming
@@ -141,6 +139,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-10
+- ghc_version is now in macros.ghc
+
 * Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-9
 - try defining ghc_version with global
 



From harald at fedoraproject.org  Fri Apr 24 11:45:52 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 24 Apr 2009 11:45:52 +0000 (UTC)
Subject: rpms/system-config-boot/F-10 .cvsignore, 1.19, 1.20 sources, 1.19, 
	1.20 system-config-boot.spec, 1.30, 1.31
Message-ID: <20090424114552.086EB70106@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2344

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 0.3.1
- translation updates
- removed kudzu import (bug #473798)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	28 Oct 2008 14:50:20 -0000	1.19
+++ .cvsignore	24 Apr 2009 11:45:21 -0000	1.20
@@ -1 +1 @@
-system-config-boot-0.3.0.tar.bz2
+system-config-boot-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	28 Oct 2008 14:50:20 -0000	1.19
+++ sources	24 Apr 2009 11:45:21 -0000	1.20
@@ -1 +1 @@
-91bfb1c55aba4c90c5c5711adc5cc015  system-config-boot-0.3.0.tar.bz2
+e63da9002315977c73aee6e147396fe3  system-config-boot-0.3.1.tar.bz2


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/F-10/system-config-boot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-boot.spec	28 Oct 2008 15:37:22 -0000	1.30
+++ system-config-boot.spec	24 Apr 2009 11:45:21 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.3.0
-Release: 2%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPLv2
 ExclusiveOS: Linux
@@ -66,6 +66,10 @@
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Fri Apr 24 2009 Harald Hoyer <harald at redhat.com> 0.3.1
+- translation updates
+- removed kudzu import (bug #473798)
+
 * Tue Oct 28 2008 Harald Hoyer <harald at redhat.com> 0.3.0-2
 - reapplied changes by spot
 



From dwalsh at fedoraproject.org  Fri Apr 24 11:54:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 11:54:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.832,1.833
Message-ID: <20090424115426.CD8B170106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19675

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
- Update to latest milter code from Paul Howarth



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- selinux-policy.spec	24 Apr 2009 11:42:43 -0000	1.832
+++ selinux-policy.spec	24 Apr 2009 11:53:55 -0000	1.833
@@ -213,8 +213,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs y y allow
-%installCmds targeted mcs y y allow
+%setupCmds targeted mcs n y allow
+%installCmds targeted mcs n y allow
 %endif
 
 %if %{BUILD_MINIMUM}
@@ -237,7 +237,7 @@
 %installCmds olpc mcs n y allow
 %endif
 
-make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 $RPM_SOURCE_DIR/policygentool %{buildroot}%{_usr}/share/selinux/devel/



From dwalsh at fedoraproject.org  Fri Apr 24 11:57:41 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 11:57:41 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.838,1.839
Message-ID: <20090424115741.5979370106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11238

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
- Update to latest milter code from Paul Howarth



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- selinux-policy.spec	24 Apr 2009 11:42:47 -0000	1.838
+++ selinux-policy.spec	24 Apr 2009 11:57:10 -0000	1.839
@@ -213,8 +213,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs y y allow
-%installCmds targeted mcs y y allow
+%setupCmds targeted mcs n y allow
+%installCmds targeted mcs n y allow
 %endif
 
 %if %{BUILD_MINIMUM}
@@ -237,7 +237,7 @@
 %installCmds olpc mcs n y allow
 %endif
 
-make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 $RPM_SOURCE_DIR/policygentool %{buildroot}%{_usr}/share/selinux/devel/



From than at fedoraproject.org  Fri Apr 24 12:07:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 24 Apr 2009 12:07:44 +0000 (UTC)
Subject: rpms/qt/F-11 sources,1.56,1.57
Message-ID: <20090424120744.E8FCC70106@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24748

Modified Files:
	sources 
Log Message:
- apply upstream patch to fix the svg rendering regression



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	24 Apr 2009 11:42:09 -0000	1.56
+++ sources	24 Apr 2009 12:07:14 -0000	1.57
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
-e55de89fb6896d44325ee867d5747bc8  qt-copy-patches-20090424svn.tar.bz2
+d23cb5202eb028ebc7379c8616cd98eb  qt-copy-patches-20090424svn.tar.bz2



From than at fedoraproject.org  Fri Apr 24 12:09:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 24 Apr 2009 12:09:54 +0000 (UTC)
Subject: rpms/qt/F-10 qt.spec,1.225,1.226 sources,1.49,1.50
Message-ID: <20090424120954.4412570106@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25226

Modified Files:
	qt.spec sources 
Log Message:
apply upstream patch to fix the svg rendering regression



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/qt.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- qt.spec	23 Apr 2009 12:30:43 -0000	1.225
+++ qt.spec	24 Apr 2009 12:09:23 -0000	1.226
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090423
+%define qt_copy 20090424
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -308,10 +308,6 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
-echo "0245" >> patches/DISABLED
-echo "0275" >> patches/DISABLED
-echo "0276" >> patches/DISABLED
-echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -809,6 +805,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
+- apply upstream patch to fix the svg rendering regression
+
 * Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
 - 4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	23 Apr 2009 12:30:43 -0000	1.49
+++ sources	24 Apr 2009 12:09:23 -0000	1.50
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
+d23cb5202eb028ebc7379c8616cd98eb  qt-copy-patches-20090424svn.tar.bz2



From ellert at fedoraproject.org  Fri Apr 24 12:15:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:15:33 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/devel globus-gsi-openssl-error.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090424121533.102B170106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26002/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-openssl-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-openssl-error
%global _name %(tr - _ <<< %{name})
Version:	0.14
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Error Handling

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_error/source globus_gsi_openssl_error-0.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
#		tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Error Handling

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Error Handling Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Error Handling Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-openssl-error-0_14-1_fc9:HEAD:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575267


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:20:24 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:15:02 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_openssl_error-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:20:24 -0000	1.1
+++ sources	24 Apr 2009 12:15:02 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+52947cec87690ba308ebc4e14af8f2a6  globus_gsi_openssl_error-0.14.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 12:17:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:17:27 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/F-9 globus-gsi-openssl-error.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424121727.36B5370106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26428/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-openssl-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-openssl-error
%global _name %(tr - _ <<< %{name})
Version:	0.14
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Error Handling

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_error/source globus_gsi_openssl_error-0.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
#		tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Error Handling

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Error Handling Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Error Handling Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-openssl-error-0_14-1_fc9:F-9:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575376


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:20:24 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:16:56 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_openssl_error-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:20:24 -0000	1.1
+++ sources	24 Apr 2009 12:16:56 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+52947cec87690ba308ebc4e14af8f2a6  globus_gsi_openssl_error-0.14.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 12:19:06 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:19:06 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/F-10 globus-gsi-openssl-error.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424121906.F00BC70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26870/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-openssl-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-openssl-error
%global _name %(tr - _ <<< %{name})
Version:	0.14
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Error Handling

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_error/source globus_gsi_openssl_error-0.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
#		tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Error Handling

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Error Handling Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Error Handling Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-openssl-error-0_14-1_fc9:F-10:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575488


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:20:24 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:18:36 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_openssl_error-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:20:24 -0000	1.1
+++ sources	24 Apr 2009 12:18:36 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+52947cec87690ba308ebc4e14af8f2a6  globus_gsi_openssl_error-0.14.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 12:20:46 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:20:46 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/F-11 globus-gsi-openssl-error.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424122046.3AD0F70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27288/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-openssl-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-openssl-error
%global _name %(tr - _ <<< %{name})
Version:	0.14
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Error Handling

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_error/source globus_gsi_openssl_error-0.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
#		tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Error Handling

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Error Handling Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Error Handling Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-openssl-error-0_14-1_fc9:F-11:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575587


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:20:24 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:20:15 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_openssl_error-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:20:24 -0000	1.1
+++ sources	24 Apr 2009 12:20:16 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+52947cec87690ba308ebc4e14af8f2a6  globus_gsi_openssl_error-0.14.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 12:22:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:22:26 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/EL-4 globus-gsi-openssl-error.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424122226.3A83070106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27688/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-openssl-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-openssl-error
%global _name %(tr - _ <<< %{name})
Version:	0.14
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Error Handling

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_error/source globus_gsi_openssl_error-0.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
#		tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Error Handling

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Error Handling Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Error Handling Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-openssl-error-0_14-1_fc9:EL-4:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575686


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:20:24 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:21:55 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_openssl_error-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:20:24 -0000	1.1
+++ sources	24 Apr 2009 12:21:55 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+52947cec87690ba308ebc4e14af8f2a6  globus_gsi_openssl_error-0.14.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 12:24:04 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:24:04 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/EL-5 globus-gsi-openssl-error.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424122404.04AA670106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28103/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-openssl-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-openssl-error
%global _name %(tr - _ <<< %{name})
Version:	0.14
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Error Handling

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_error/source globus_gsi_openssl_error-0.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_openssl_error-0.14
#		tar -zcf globus_gsi_openssl_error-0.14.tar.gz globus_gsi_openssl_error-0.14
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Error Handling Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Error Handling

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Error Handling Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Error Handling Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-openssl-error-0_14-1_fc9:EL-5:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575783


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:20:24 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:23:33 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_openssl_error-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:20:24 -0000	1.1
+++ sources	24 Apr 2009 12:23:33 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+52947cec87690ba308ebc4e14af8f2a6  globus_gsi_openssl_error-0.14.tar.gz



From than at fedoraproject.org  Fri Apr 24 12:27:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 24 Apr 2009 12:27:19 +0000 (UTC)
Subject: rpms/qt/F-11 sources,1.57,1.58
Message-ID: <20090424122719.A54FA70106@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28669

Modified Files:
	sources 
Log Message:
apply upstream patch to fix the svg rendering regression



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	24 Apr 2009 12:07:14 -0000	1.57
+++ sources	24 Apr 2009 12:26:49 -0000	1.58
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
-d23cb5202eb028ebc7379c8616cd98eb  qt-copy-patches-20090424svn.tar.bz2
+8718da189e55c91a749ec9d142aea784  qt-copy-patches-20090424svn.tar.bz2



From than at fedoraproject.org  Fri Apr 24 12:27:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 24 Apr 2009 12:27:38 +0000 (UTC)
Subject: rpms/qt/F-10 sources,1.50,1.51
Message-ID: <20090424122738.7915370106@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28737

Modified Files:
	sources 
Log Message:
apply upstream patch to fix the svg rendering regression



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	24 Apr 2009 12:09:23 -0000	1.50
+++ sources	24 Apr 2009 12:27:08 -0000	1.51
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
-d23cb5202eb028ebc7379c8616cd98eb  qt-copy-patches-20090424svn.tar.bz2
+8718da189e55c91a749ec9d142aea784  qt-copy-patches-20090424svn.tar.bz2



From petersen at fedoraproject.org  Fri Apr 24 12:29:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 12:29:23 +0000 (UTC)
Subject: rpms/cabal2spec/devel .cvsignore, 1.8, 1.9 cabal2spec.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20090424122923.1CC8470106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29080

Modified Files:
	.cvsignore cabal2spec.spec sources 
Log Message:
ghc_version is now in macros.ghc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Apr 2009 04:13:46 -0000	1.8
+++ .cvsignore	24 Apr 2009 12:28:52 -0000	1.9
@@ -1 +1 @@
-cabal2spec-0.13.tar.gz
+cabal2spec-0.14.tar.gz


Index: cabal2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/cabal2spec.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cabal2spec.spec	24 Apr 2009 04:13:46 -0000	1.8
+++ cabal2spec.spec	24 Apr 2009 12:28:52 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		cabal2spec
-Version:	0.13
+Version:	0.14
 Release:	1%{?dist}
 Summary:	Tool for creating .spec files for Haskell Cabal Packages
 
@@ -9,8 +9,8 @@
 Source0:	https://fedorahosted.org/releases/c/a/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-# 6.10.2-2 has latest compatible macros
-Requires:	ghc > 6.10.2-2
+# 6.10.2-3 has latest compatible macros
+Requires:	ghc >= 6.10.2-3
 
 %description
 This package provides specfile templates and a script cabal2spec for easy
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.14-1
+- ghc_version is now in macros.ghc in ghc-6.10.2-3
+
 * Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.13-1
 - requires at least ghc-6.10.2-2
 - ghc_version is now set directly from ghc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Apr 2009 04:13:46 -0000	1.8
+++ sources	24 Apr 2009 12:28:52 -0000	1.9
@@ -1 +1 @@
-3537eecee92742e9e48124c4520f8c30  cabal2spec-0.13.tar.gz
+99d9f3aac43ba7d58354816c46469f1b  cabal2spec-0.14.tar.gz



From than at fedoraproject.org  Fri Apr 24 12:30:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 24 Apr 2009 12:30:51 +0000 (UTC)
Subject: rpms/qt/F-9 qt.spec,1.196,1.197 sources,1.44,1.45
Message-ID: <20090424123051.3FCF970106@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29572

Modified Files:
	qt.spec sources 
Log Message:
apply upstream patch to fix the svg rendering regression



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/qt.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- qt.spec	23 Apr 2009 14:22:01 -0000	1.196
+++ qt.spec	24 Apr 2009 12:30:20 -0000	1.197
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090423
+%define qt_copy 20090424
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -308,10 +308,6 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
-echo "0245" >> patches/DISABLED
-echo "0275" >> patches/DISABLED
-echo "0276" >> patches/DISABLED
-echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -809,6 +805,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
+- apply upstream patch to fix the svg rendering regression
+
 * Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
 - 4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	23 Apr 2009 14:22:01 -0000	1.44
+++ sources	24 Apr 2009 12:30:20 -0000	1.45
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
+8718da189e55c91a749ec9d142aea784  qt-copy-patches-20090424svn.tar.bz2



From ellert at fedoraproject.org  Fri Apr 24 12:58:10 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 12:58:10 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/devel globus-gsi-proxy-ssl-doxygen.patch, 
	NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424125810.BB84370106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1806/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:HEAD:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240577820


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:57:39 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 12:57:40 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz



From petersen at fedoraproject.org  Fri Apr 24 12:59:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 12:59:16 +0000 (UTC)
Subject: rpms/cpphs/devel cpphs.spec,1.3,1.4
Message-ID: <20090424125916.4904D70106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2106

Modified Files:
	cpphs.spec 
Log Message:
update to cabal2spec-0.14


Index: cpphs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpphs.spec	2 Mar 2009 02:23:34 -0000	1.3
+++ cpphs.spec	24 Apr 2009 12:58:45 -0000	1.4
@@ -1,8 +1,3 @@
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
-
 %bcond_without doc
 %bcond_without prof
 
@@ -11,7 +6,7 @@
 
 Name:           cpphs
 Version:        1.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
@@ -20,12 +15,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -53,9 +48,9 @@
 
 %if %{with doc}
 %package -n ghc-%{name}-doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -83,7 +78,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -138,9 +133,8 @@
 
 
 %if %{with doc}
-%files -n ghc-%{name}-doc
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -151,6 +145,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 1.6-7
+- update to cabal2spec-0.14
+
 * Mon Mar  2 2009 Jens Petersen <petersen at redhat.com> - 1.6-6
 - update to cabal2spec-0.12:
   - add devel subpackage



From ellert at fedoraproject.org  Fri Apr 24 13:00:14 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:00:14 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/F-9 globus-gsi-proxy-ssl-doxygen.patch,
	NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424130014.88FC870106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2460/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:F-9:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240577944


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 12:59:44 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 12:59:44 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:02:03 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:02:03 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/F-10 globus-gsi-proxy-ssl-doxygen.patch, 
	NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424130203.8B27170106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2970/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:F-10:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578059


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:01:32 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 13:01:33 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:03:49 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:03:49 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/F-11 globus-gsi-proxy-ssl-doxygen.patch, 
	NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424130349.66D9E70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3982/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:F-11:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578169


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:03:18 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 13:03:19 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz



From karsten at fedoraproject.org  Fri Apr 24 13:07:09 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 24 Apr 2009 13:07:09 +0000 (UTC)
Subject: rpms/pm-utils/devel pm-utils.spec,1.116,1.117
Message-ID: <20090424130709.1EAB570106@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4768

Modified Files:
	pm-utils.spec 
Log Message:
- we don't have kbd and hdparm on s390(x), disable build requirements


Index: pm-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- pm-utils.spec	14 Apr 2009 09:41:45 -0000	1.116
+++ pm-utils.spec	24 Apr 2009 13:06:38 -0000	1.117
@@ -2,14 +2,16 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
-Requires: kbd
 Requires: radeontool
+%ifnarch s390 s390x
+Requires: kbd
 # for hd apm settings
 Requires: hdparm
+%endif
 # for on_ac_power
 Requires: hal
 %ifarch %{ix86} x86_64
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Karsten Hopp <karsten at redhat.com> 1.2.5-1.1
+- we don't have kbd and hdparm on s390(x), disable build requirements
+
 * Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-1
 - New upstream version
 - If running on a system that is using KMS, we will refuse to handle any video



From ellert at fedoraproject.org  Fri Apr 24 13:08:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:08:23 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/EL-4 globus-gsi-proxy-ssl-doxygen.patch, 
	NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424130823.437AC70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5149/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:EL-4:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578440


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:07:52 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 13:07:53 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz



From pghmcfc at fedoraproject.org  Fri Apr 24 13:08:57 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 24 Apr 2009 13:08:57 +0000 (UTC)
Subject: rpms/bittorrent/devel bittorrent.spec,1.49,1.50
Message-ID: <20090424130857.6309870106@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/bittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5364

Modified Files:
	bittorrent.spec 
Log Message:
Add icon back in menu entry


Index: bittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bittorrent.spec	6 Apr 2009 14:33:09 -0000	1.49
+++ bittorrent.spec	24 Apr 2009 13:08:27 -0000	1.50
@@ -168,6 +168,8 @@
 %{__install} -m 0644 -D bittorrent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/bittorrent
 %{__install} -m 0644 -D bittorrent.png \
 	%{buildroot}%{_datadir}/pixmaps/bittorrent-%{version}/logo/bittorrent_48.png
+# add symlink for bittorrent.png required by desktop entry
+%{__ln_s} bittorrent-%{version}/logo/bittorrent_48.png %{buildroot}%{_datadir}/pixmaps/bittorrent.png
 # pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts
 %{__ln_s} bittorrent-tracker %{buildroot}%{_bindir}/bttrack
 %{__ln_s} launchmany-console %{buildroot}%{_bindir}/btseed
@@ -245,10 +247,14 @@
 %defattr(-,root,root,-)
 %{_bindir}/bittorrent
 %{_bindir}/maketorrent
+%{_datadir}/pixmaps/bittorrent.png
 %{_datadir}/pixmaps/bittorrent-%{version}/
 %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 
 %changelog
+* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 4.4.0-12
+- Add icon back in menu entry
+
 * Mon Apr  6 2009 Paul Howarth <paul at city-fan.org> 4.4.0-11
 - Add support for floating point values in bencode (#451496), resolving
   tracebacks with KeyError: <type 'float'>



From ellert at fedoraproject.org  Fri Apr 24 13:10:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:10:08 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/EL-5 globus-gsi-proxy-ssl-doxygen.patch, 
	NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424131008.5648770106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5760/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:EL-5:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578548


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:09:37 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 13:09:38 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz



From petersen at fedoraproject.org  Fri Apr 24 13:12:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 13:12:39 +0000 (UTC)
Subject: rpms/alex/devel alex.spec,1.13,1.14
Message-ID: <20090424131239.7576A70106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/alex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6340

Modified Files:
	alex.spec 
Log Message:
rebuild against ghc-6.10.2


Index: alex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alex/devel/alex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- alex.spec	9 Mar 2009 22:28:23 -0000	1.13
+++ alex.spec	24 Apr 2009 13:12:08 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           alex
 Version:        2.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A lexer generator for Haskell
 
 Group:          Development/Tools
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 2.3.1-4
+- rebuild against ghc-6.10.2
+
 * Tue Mar 10 2009 Jens Petersen <petersen at redhat.com> - 2.3.1-3
 - update arch list and bring closer to cabal2spec-0.12
 



From dwalsh at fedoraproject.org  Fri Apr 24 13:16:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 13:16:14 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.96,1.97
Message-ID: <20090424131614.0D4EE70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7207

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
- Update to latest milter code from Paul Howarth


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- policy-20090105.patch	24 Apr 2009 11:42:41 -0000	1.96
+++ policy-20090105.patch	24 Apr 2009 13:16:13 -0000	1.97
@@ -779,7 +779,7 @@
 +/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-23 17:21:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 09:02:26.000000000 -0400
 @@ -24,7 +24,7 @@
  
  allow readahead_t self:capability { fowner dac_override dac_read_search };
@@ -801,7 +801,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
-+logging_send_audit_msgs(readahead_t)
++logging_set_audit_parameters(readahead_t)
  logging_dontaudit_search_audit_config(readahead_t)
  
  miscfiles_read_localization(readahead_t)
@@ -5035,6 +5035,35 @@
  /dev/urandom		-c	gen_context(system_u:object_r:urandom_device_t,s0)
  /dev/ub[a-c]		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.12/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2009-03-05 12:28:56.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-04-24 09:05:52.000000000 -0400
+@@ -2268,6 +2268,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Delete the null device (/dev/null).
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_delete_null',`
++	gen_require(`
++		type device_t, null_device_t;
++	')
++
++	allow $1 device_t:dir del_entry_dir_perms;
++	allow $1 null_device_t:chr_file unlink;
++')
++
++########################################
++## <summary>
+ ##	Read and write to the null device (/dev/null).
+ ## </summary>
+ ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-23 09:44:57.000000000 -0400
@@ -14835,7 +14864,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.te serefpolicy-3.6.12/policy/modules/services/milter.te
 --- nsaserefpolicy/policy/modules/services/milter.te	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 07:22:01.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 08:31:02.000000000 -0400
 @@ -14,6 +14,12 @@
  milter_template(regex)
  milter_template(spamass)
@@ -14849,18 +14878,7 @@
  ########################################
  #
  # milter-regex local policy
-@@ -21,6 +27,10 @@
- #   http://www.benzedrine.cx/milter-regex.html
- #
- 
-+# The milter runs from /var/lib/spamass-milter
-+files_search_var_lib(spamass_milter_t);
-+allow spamass_milter_t spamass_milter_state_t:dir search_dir_perms;
-+
- # It removes any existing socket (not owned by root) whilst running as root
- # and then calls setgid() and setuid() to drop privileges
- allow regex_milter_t self:capability { setuid setgid dac_override };
-@@ -41,6 +51,10 @@
+@@ -41,6 +47,10 @@
  #   http://savannah.nongnu.org/projects/spamass-milt/
  #
  
@@ -19956,7 +19974,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.6.12/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2009-01-19 11:07:32.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/razor.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/razor.te	2009-04-24 08:32:37.000000000 -0400
 @@ -6,6 +6,32 @@
  # Declarations
  #
@@ -19990,12 +20008,24 @@
  type razor_exec_t;
  corecmd_executable_file(razor_exec_t)
  
-@@ -122,3 +148,5 @@
- optional_policy(`
- 	nscd_socket_use(razor_t)
- ')
+@@ -102,6 +128,8 @@
+ manage_files_pattern(razor_t, razor_tmp_t, razor_tmp_t)
+ files_tmp_filetrans(razor_t, razor_tmp_t, { file dir })
+ 
++auth_use_nsswitch(razor_t)
 +
+ logging_send_syslog_msg(razor_t)
+ 
+ userdom_search_user_home_dirs(razor_t)
+@@ -120,5 +148,7 @@
+ ')
+ 
+ optional_policy(`
+-	nscd_socket_use(razor_t)
++	milter_manage_spamass_state(razor_t)
 +')
++
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.12/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/ricci.te	2009-04-23 09:44:57.000000000 -0400
@@ -21822,7 +21852,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 07:23:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 08:31:39.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21935,7 +21965,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,31 +324,35 @@
+@@ -265,13 +324,16 @@
  
  sysnet_read_config(spamc_t)
  
@@ -21950,11 +21980,8 @@
 +	fs_manage_nfs_dirs(spamc_t)
 +	fs_manage_nfs_files(spamc_t)
 +	fs_manage_nfs_symlinks(spamc_t)
- ')
- 
--optional_policy(`
--	# Allow connection to spamd socket above
--	evolution_stream_connect(spamc_t)
++')
++
 +tunable_policy(`use_samba_home_dirs',`
 +	fs_manage_cifs_dirs(spamc_t)
 +	fs_manage_cifs_files(spamc_t)
@@ -21962,9 +21989,12 @@
  ')
  
  optional_policy(`
+@@ -280,16 +342,21 @@
+ ')
+ 
+ optional_policy(`
 -	nis_use_ypbind(spamc_t)
-+	# Allow connection to spamd socket above
-+	evolution_stream_connect(spamc_t)
++	milter_manage_spamass_state(spamc_t)
  ')
  
  optional_policy(`
@@ -21983,7 +22013,7 @@
  ')
  
  ########################################
-@@ -301,7 +364,7 @@
+@@ -301,7 +368,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -21992,7 +22022,7 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +380,13 @@
+@@ -317,10 +384,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -22007,7 +22037,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +395,11 @@
+@@ -329,10 +399,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -22020,7 +22050,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +449,27 @@
+@@ -382,22 +453,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -22052,7 +22082,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +487,7 @@
+@@ -415,6 +491,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -22060,7 +22090,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +497,6 @@
+@@ -424,10 +501,6 @@
  ')
  
  optional_policy(`
@@ -22071,7 +22101,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +511,10 @@
+@@ -442,6 +515,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22082,7 +22112,7 @@
  ')
  
  optional_policy(`
-@@ -454,5 +527,9 @@
+@@ -454,5 +531,9 @@
  ')
  
  optional_policy(`
@@ -25882,7 +25912,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-24 08:59:22.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -26020,7 +26050,7 @@
  corenet_tcp_sendrecv_all_ports(initrc_t)
  corenet_udp_sendrecv_all_ports(initrc_t)
  corenet_tcp_connect_all_ports(initrc_t)
-@@ -270,16 +308,19 @@
+@@ -270,16 +308,20 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -26032,6 +26062,7 @@
 -dev_read_lvm_control(initrc_t)
 +dev_rw_lvm_control(initrc_t)
  dev_delete_lvm_control_dev(initrc_t)
++dev_delete_null(initrc_t)
  dev_manage_generic_symlinks(initrc_t)
  dev_manage_generic_files(initrc_t)
  # Wants to remove udev.tbl:
@@ -26041,7 +26072,7 @@
  
  fs_register_binary_executable_type(initrc_t)
  # rhgb-console writes to ramfs
-@@ -328,7 +369,7 @@
+@@ -328,7 +370,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -26050,7 +26081,7 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -343,14 +384,14 @@
+@@ -343,14 +385,14 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -26067,7 +26098,7 @@
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -366,7 +407,9 @@
+@@ -366,7 +408,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -26077,7 +26108,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -451,7 +494,7 @@
+@@ -451,7 +495,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -26086,7 +26117,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -465,6 +508,7 @@
+@@ -465,6 +509,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -26094,7 +26125,7 @@
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -498,6 +542,7 @@
+@@ -498,6 +543,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -26102,7 +26133,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +561,33 @@
+@@ -516,6 +562,33 @@
  	')
  ')
  
@@ -26136,7 +26167,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +642,10 @@
+@@ -570,6 +643,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -26147,7 +26178,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +667,10 @@
+@@ -591,6 +668,10 @@
  ')
  
  optional_policy(`
@@ -26158,7 +26189,7 @@
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,6 +727,11 @@
+@@ -647,6 +728,11 @@
  ')
  
  optional_policy(`
@@ -26170,7 +26201,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +740,6 @@
+@@ -655,12 +741,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -26183,7 +26214,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -719,8 +798,6 @@
+@@ -719,8 +799,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -26192,7 +26223,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +810,12 @@
+@@ -733,10 +811,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -26205,7 +26236,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +833,11 @@
+@@ -754,6 +834,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -26217,7 +26248,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -765,6 +849,13 @@
+@@ -765,6 +850,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -26231,7 +26262,7 @@
  ')
  
  optional_policy(`
-@@ -790,3 +881,35 @@
+@@ -790,3 +882,35 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -26811,7 +26842,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.6.12/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/logging.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/logging.if	2009-04-24 09:01:14.000000000 -0400
 @@ -623,7 +623,7 @@
  	')
  



From dwalsh at fedoraproject.org  Fri Apr 24 13:16:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 13:16:28 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.103,
	1.104 selinux-policy.spec, 1.839, 1.840
Message-ID: <20090424131628.83FA970106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7261

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-17
- Allow initrc_t to delete dev_null
- Allow readahead to configure auditing


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- policy-20090105.patch	24 Apr 2009 11:42:46 -0000	1.103
+++ policy-20090105.patch	24 Apr 2009 13:16:27 -0000	1.104
@@ -779,7 +779,7 @@
 +/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-23 17:21:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 09:02:26.000000000 -0400
 @@ -24,7 +24,7 @@
  
  allow readahead_t self:capability { fowner dac_override dac_read_search };
@@ -801,7 +801,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
-+logging_send_audit_msgs(readahead_t)
++logging_set_audit_parameters(readahead_t)
  logging_dontaudit_search_audit_config(readahead_t)
  
  miscfiles_read_localization(readahead_t)
@@ -5035,6 +5035,35 @@
  /dev/urandom		-c	gen_context(system_u:object_r:urandom_device_t,s0)
  /dev/ub[a-c]		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.12/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2009-03-05 12:28:56.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-04-24 09:05:52.000000000 -0400
+@@ -2268,6 +2268,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Delete the null device (/dev/null).
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_delete_null',`
++	gen_require(`
++		type device_t, null_device_t;
++	')
++
++	allow $1 device_t:dir del_entry_dir_perms;
++	allow $1 null_device_t:chr_file unlink;
++')
++
++########################################
++## <summary>
+ ##	Read and write to the null device (/dev/null).
+ ## </summary>
+ ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-23 09:44:57.000000000 -0400
@@ -14835,7 +14864,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.te serefpolicy-3.6.12/policy/modules/services/milter.te
 --- nsaserefpolicy/policy/modules/services/milter.te	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 07:22:01.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 08:31:02.000000000 -0400
 @@ -14,6 +14,12 @@
  milter_template(regex)
  milter_template(spamass)
@@ -14849,18 +14878,7 @@
  ########################################
  #
  # milter-regex local policy
-@@ -21,6 +27,10 @@
- #   http://www.benzedrine.cx/milter-regex.html
- #
- 
-+# The milter runs from /var/lib/spamass-milter
-+files_search_var_lib(spamass_milter_t);
-+allow spamass_milter_t spamass_milter_state_t:dir search_dir_perms;
-+
- # It removes any existing socket (not owned by root) whilst running as root
- # and then calls setgid() and setuid() to drop privileges
- allow regex_milter_t self:capability { setuid setgid dac_override };
-@@ -41,6 +51,10 @@
+@@ -41,6 +47,10 @@
  #   http://savannah.nongnu.org/projects/spamass-milt/
  #
  
@@ -19956,7 +19974,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.6.12/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2009-01-19 11:07:32.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/razor.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/razor.te	2009-04-24 08:32:37.000000000 -0400
 @@ -6,6 +6,32 @@
  # Declarations
  #
@@ -19990,12 +20008,24 @@
  type razor_exec_t;
  corecmd_executable_file(razor_exec_t)
  
-@@ -122,3 +148,5 @@
- optional_policy(`
- 	nscd_socket_use(razor_t)
- ')
+@@ -102,6 +128,8 @@
+ manage_files_pattern(razor_t, razor_tmp_t, razor_tmp_t)
+ files_tmp_filetrans(razor_t, razor_tmp_t, { file dir })
+ 
++auth_use_nsswitch(razor_t)
 +
+ logging_send_syslog_msg(razor_t)
+ 
+ userdom_search_user_home_dirs(razor_t)
+@@ -120,5 +148,7 @@
+ ')
+ 
+ optional_policy(`
+-	nscd_socket_use(razor_t)
++	milter_manage_spamass_state(razor_t)
 +')
++
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.12/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/ricci.te	2009-04-23 09:44:57.000000000 -0400
@@ -21822,7 +21852,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 07:23:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 08:31:39.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21935,7 +21965,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,31 +324,35 @@
+@@ -265,13 +324,16 @@
  
  sysnet_read_config(spamc_t)
  
@@ -21950,11 +21980,8 @@
 +	fs_manage_nfs_dirs(spamc_t)
 +	fs_manage_nfs_files(spamc_t)
 +	fs_manage_nfs_symlinks(spamc_t)
- ')
- 
--optional_policy(`
--	# Allow connection to spamd socket above
--	evolution_stream_connect(spamc_t)
++')
++
 +tunable_policy(`use_samba_home_dirs',`
 +	fs_manage_cifs_dirs(spamc_t)
 +	fs_manage_cifs_files(spamc_t)
@@ -21962,9 +21989,12 @@
  ')
  
  optional_policy(`
+@@ -280,16 +342,21 @@
+ ')
+ 
+ optional_policy(`
 -	nis_use_ypbind(spamc_t)
-+	# Allow connection to spamd socket above
-+	evolution_stream_connect(spamc_t)
++	milter_manage_spamass_state(spamc_t)
  ')
  
  optional_policy(`
@@ -21983,7 +22013,7 @@
  ')
  
  ########################################
-@@ -301,7 +364,7 @@
+@@ -301,7 +368,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -21992,7 +22022,7 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +380,13 @@
+@@ -317,10 +384,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -22007,7 +22037,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +395,11 @@
+@@ -329,10 +399,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -22020,7 +22050,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +449,27 @@
+@@ -382,22 +453,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -22052,7 +22082,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +487,7 @@
+@@ -415,6 +491,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -22060,7 +22090,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +497,6 @@
+@@ -424,10 +501,6 @@
  ')
  
  optional_policy(`
@@ -22071,7 +22101,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +511,10 @@
+@@ -442,6 +515,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22082,7 +22112,7 @@
  ')
  
  optional_policy(`
-@@ -454,5 +527,9 @@
+@@ -454,5 +531,9 @@
  ')
  
  optional_policy(`
@@ -25882,7 +25912,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/init.te	2009-04-24 08:59:22.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -26020,7 +26050,7 @@
  corenet_tcp_sendrecv_all_ports(initrc_t)
  corenet_udp_sendrecv_all_ports(initrc_t)
  corenet_tcp_connect_all_ports(initrc_t)
-@@ -270,16 +308,19 @@
+@@ -270,16 +308,20 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -26032,6 +26062,7 @@
 -dev_read_lvm_control(initrc_t)
 +dev_rw_lvm_control(initrc_t)
  dev_delete_lvm_control_dev(initrc_t)
++dev_delete_null(initrc_t)
  dev_manage_generic_symlinks(initrc_t)
  dev_manage_generic_files(initrc_t)
  # Wants to remove udev.tbl:
@@ -26041,7 +26072,7 @@
  
  fs_register_binary_executable_type(initrc_t)
  # rhgb-console writes to ramfs
-@@ -328,7 +369,7 @@
+@@ -328,7 +370,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -26050,7 +26081,7 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -343,14 +384,14 @@
+@@ -343,14 +385,14 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -26067,7 +26098,7 @@
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -366,7 +407,9 @@
+@@ -366,7 +408,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -26077,7 +26108,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -451,7 +494,7 @@
+@@ -451,7 +495,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -26086,7 +26117,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -465,6 +508,7 @@
+@@ -465,6 +509,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -26094,7 +26125,7 @@
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -498,6 +542,7 @@
+@@ -498,6 +543,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -26102,7 +26133,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +561,33 @@
+@@ -516,6 +562,33 @@
  	')
  ')
  
@@ -26136,7 +26167,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +642,10 @@
+@@ -570,6 +643,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -26147,7 +26178,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +667,10 @@
+@@ -591,6 +668,10 @@
  ')
  
  optional_policy(`
@@ -26158,7 +26189,7 @@
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,6 +727,11 @@
+@@ -647,6 +728,11 @@
  ')
  
  optional_policy(`
@@ -26170,7 +26201,7 @@
  	mailman_list_data(initrc_t)
  	mailman_read_data_symlinks(initrc_t)
  ')
-@@ -655,12 +740,6 @@
+@@ -655,12 +741,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -26183,7 +26214,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -719,8 +798,6 @@
+@@ -719,8 +799,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -26192,7 +26223,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +810,12 @@
+@@ -733,10 +811,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -26205,7 +26236,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +833,11 @@
+@@ -754,6 +834,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -26217,7 +26248,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -765,6 +849,13 @@
+@@ -765,6 +850,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -26231,7 +26262,7 @@
  ')
  
  optional_policy(`
-@@ -790,3 +881,35 @@
+@@ -790,3 +882,35 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -26811,7 +26842,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.6.12/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/logging.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/logging.if	2009-04-24 09:01:14.000000000 -0400
 @@ -623,7 +623,7 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- selinux-policy.spec	24 Apr 2009 11:57:10 -0000	1.839
+++ selinux-policy.spec	24 Apr 2009 13:16:28 -0000	1.840
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,10 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-17
+- Allow initrc_t to delete dev_null
+- Allow readahead to configure auditing
+
 * Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
 - Update to latest milter code from Paul Howarth
 



From dwalsh at fedoraproject.org  Fri Apr 24 13:17:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 13:17:38 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.833,1.834
Message-ID: <20090424131738.BA23E70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7690

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-17
- Allow initrc_t to delete dev_null
- Allow readahead to configure auditing



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- selinux-policy.spec	24 Apr 2009 11:53:55 -0000	1.833
+++ selinux-policy.spec	24 Apr 2009 13:17:08 -0000	1.834
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,10 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-17
+- Allow initrc_t to delete dev_null
+- Allow readahead to configure auditing
+
 * Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
 - Update to latest milter code from Paul Howarth
 



From petersen at fedoraproject.org  Fri Apr 24 13:21:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 13:21:14 +0000 (UTC)
Subject: rpms/ghc-ghc-paths/devel ghc-ghc-paths.spec,1.1,1.2
Message-ID: <20090424132114.CCDC970106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-ghc-paths/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8489

Modified Files:
	ghc-ghc-paths.spec 
Log Message:
update to cabal2spec-0.14


Index: ghc-ghc-paths.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-ghc-paths/devel/ghc-ghc-paths.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-ghc-paths.spec	9 Mar 2009 05:10:56 -0000	1.1
+++ ghc-ghc-paths.spec	24 Apr 2009 13:20:44 -0000	1.2
@@ -1,8 +1,4 @@
 %global pkg_name ghc-paths
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -12,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.1.0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Interface to GHC's installation directories
 
 Group:          Development/Libraries
@@ -22,12 +18,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -79,7 +75,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -128,9 +124,8 @@
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -141,6 +136,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-6
+- update to cabal2spec-0.14
+
 * Mon Mar  9 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-5
 - package renamed from ghc-paths
 - update to cabal2spec-0.12



From karsten at fedoraproject.org  Fri Apr 24 13:32:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 24 Apr 2009 13:32:35 +0000 (UTC)
Subject: rpms/librx/F-11 librx.spec,1.12,1.13
Message-ID: <20090424133235.A970370106@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/librx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10231

Modified Files:
	librx.spec 
Log Message:
- add s390x to 64bit archs


Index: librx.spec
===================================================================
RCS file: /cvs/extras/rpms/librx/F-11/librx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- librx.spec	25 Feb 2009 17:55:57 -0000	1.12
+++ librx.spec	24 Apr 2009 13:32:05 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: POSIX regexp functions
 Name: librx
 Version: 1.5
-Release: 12%{?dist}
+Release: 12%{?dist}.1
 License: GPLv2+
 URL: http://www.gnu.org/software/rx/rx.html
 Group: Applications/Text
@@ -36,7 +36,7 @@
 %setup -q -n rx-%{version}
 %patch0 -p1
 %patch1 -p1 -b .texipatch
-%ifarch x86_64 ppc64 sparc64
+%ifarch x86_64 ppc64 sparc64 s390x
 %patch2 -p1 -b .64bit
 %endif
 %patch3 -p1 -b .libtoolmode
@@ -86,6 +86,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Apr 24 2009 Karsten Hopp <karsten at redhat.com> 1.5-12.1
+- add s390x to 64bit archs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From petersen at fedoraproject.org  Fri Apr 24 13:33:59 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 13:33:59 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel .cvsignore, 1.3, 1.4 ghc-HTTP.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090424133359.06D5A70107@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10482

Modified Files:
	.cvsignore ghc-HTTP.spec sources 
Log Message:
- update to 4000.0.6
- sync with cabal2spec-0.14




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Feb 2009 06:30:42 -0000	1.3
+++ .cvsignore	24 Apr 2009 13:33:28 -0000	1.4
@@ -1 +1 @@
-HTTP-4000.0.4.tar.gz
+HTTP-4000.0.6.tar.gz


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/ghc-HTTP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-HTTP.spec	27 Feb 2009 06:57:18 -0000	1.6
+++ ghc-HTTP.spec	24 Apr 2009 13:33:28 -0000	1.7
@@ -1,8 +1,4 @@
 %global pkg_name HTTP
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -11,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        4000.0.4
-Release:        3%{?dist}
+Version:        4000.0.6
+Release:        1%{?dist}
 Summary:        Haskell HTTP client library
 
 Group:          Development/Libraries
@@ -22,12 +18,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires:  ghc >= 6.10.2-3
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -52,7 +49,7 @@
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -63,13 +60,14 @@
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -78,7 +76,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -127,9 +125,8 @@
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -140,6 +137,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-1
+- update to 4000.0.6
+- sync with cabal2spec-0.14
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 4000.0.4-3
 - update url
 - update to cabal2spec-0.12:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2009 06:30:43 -0000	1.3
+++ sources	24 Apr 2009 13:33:28 -0000	1.4
@@ -1 +1 @@
-6526c1ee59cd3aedc7aa380673c80ef1  HTTP-4000.0.4.tar.gz
+cc8d3279f3b20856b7b915045f1e908b  HTTP-4000.0.6.tar.gz



From karsten at fedoraproject.org  Fri Apr 24 13:34:23 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 24 Apr 2009 13:34:23 +0000 (UTC)
Subject: rpms/librx/devel librx.spec,1.12,1.13
Message-ID: <20090424133423.B9AA470106@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/librx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10817

Modified Files:
	librx.spec 
Log Message:
- add s390x to 64bit archs


Index: librx.spec
===================================================================
RCS file: /cvs/extras/rpms/librx/devel/librx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- librx.spec	25 Feb 2009 17:55:57 -0000	1.12
+++ librx.spec	24 Apr 2009 13:33:53 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: POSIX regexp functions
 Name: librx
 Version: 1.5
-Release: 12%{?dist}
+Release: 12%{?dist}.1
 License: GPLv2+
 URL: http://www.gnu.org/software/rx/rx.html
 Group: Applications/Text
@@ -36,7 +36,7 @@
 %setup -q -n rx-%{version}
 %patch0 -p1
 %patch1 -p1 -b .texipatch
-%ifarch x86_64 ppc64 sparc64
+%ifarch x86_64 ppc64 sparc64 s390x
 %patch2 -p1 -b .64bit
 %endif
 %patch3 -p1 -b .libtoolmode
@@ -86,6 +86,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Apr 24 2009 Karsten Hopp <karsten at redhat.com> 1.5-12.1
+- add s390x to 64bit archs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From petersen at fedoraproject.org  Fri Apr 24 13:45:29 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 24 Apr 2009 13:45:29 +0000 (UTC)
Subject: rpms/ghc-zlib/devel ghc-zlib.spec,1.10,1.11
Message-ID: <20090424134529.7262870106@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12943

Modified Files:
	ghc-zlib.spec 
Log Message:
sync with cabal2spec-0.14


Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ghc-zlib.spec	27 Feb 2009 06:21:43 -0000	1.10
+++ ghc-zlib.spec	24 Apr 2009 13:44:58 -0000	1.11
@@ -1,8 +1,4 @@
 %global pkg_name zlib
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -12,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.5.0.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Haskell compression and decompression library binding
 
 Group:          Development/Libraries
@@ -22,12 +18,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires:  ghc >= 6.10.2-3
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 BuildRequires:  zlib-devel
 
@@ -56,9 +53,9 @@
 
 %if %{with doc}
 %package doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -69,13 +66,14 @@
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -84,7 +82,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -98,9 +96,6 @@
 %ghc_install_scripts
 %ghc_gen_filelists %{name}
 
-# no base package
-#rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,9 +131,8 @@
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -149,6 +143,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-8
+- sync with cabal2spec-0.14
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-7
 - update to cabal2spec-0.11:
 - add devel subpackage



From ellert at fedoraproject.org  Fri Apr 24 13:49:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:49:59 +0000 (UTC)
Subject: rpms/globus-usage/devel globus-usage.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424134959.4E4C270106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13741/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-usage.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-usage.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-usage
%global _name %(tr - _ <<< %{name})
Version:	1.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Usage Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.0
#		tar -zcf globus_usage-1.0.tar.gz globus_usage-1.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Usage Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Usage Library - client library for the Globus usage statistics collection
service

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Usage Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-usage-1_0-1_fc9:HEAD:globus-usage-1.0-1.fc9.src.rpm:1240580913


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:24:41 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:49:28 -0000	1.2
@@ -0,0 +1 @@
+globus_usage-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:24:41 -0000	1.1
+++ sources	24 Apr 2009 13:49:28 -0000	1.2
@@ -0,0 +1 @@
+2d83cdb9681eb3ce6676835475cbbedd  globus_usage-1.0.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:51:57 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:51:57 +0000 (UTC)
Subject: rpms/globus-usage/F-9 globus-usage.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424135157.204EF70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14242/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-usage.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-usage.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-usage
%global _name %(tr - _ <<< %{name})
Version:	1.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Usage Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.0
#		tar -zcf globus_usage-1.0.tar.gz globus_usage-1.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Usage Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Usage Library - client library for the Globus usage statistics collection
service

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Usage Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-usage-1_0-1_fc9:F-9:globus-usage-1.0-1.fc9.src.rpm:1240581043


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:24:41 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:51:26 -0000	1.2
@@ -0,0 +1 @@
+globus_usage-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:24:41 -0000	1.1
+++ sources	24 Apr 2009 13:51:26 -0000	1.2
@@ -0,0 +1 @@
+2d83cdb9681eb3ce6676835475cbbedd  globus_usage-1.0.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:53:32 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:53:32 +0000 (UTC)
Subject: rpms/globus-usage/F-10 globus-usage.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424135332.120E270106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14616/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-usage.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-usage.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-usage
%global _name %(tr - _ <<< %{name})
Version:	1.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Usage Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.0
#		tar -zcf globus_usage-1.0.tar.gz globus_usage-1.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Usage Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Usage Library - client library for the Globus usage statistics collection
service

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Usage Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-usage-1_0-1_fc9:F-10:globus-usage-1.0-1.fc9.src.rpm:1240581154


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:24:41 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:53:01 -0000	1.2
@@ -0,0 +1 @@
+globus_usage-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:24:41 -0000	1.1
+++ sources	24 Apr 2009 13:53:01 -0000	1.2
@@ -0,0 +1 @@
+2d83cdb9681eb3ce6676835475cbbedd  globus_usage-1.0.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:55:12 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:55:12 +0000 (UTC)
Subject: rpms/globus-usage/F-11 globus-usage.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424135512.396AF70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15021/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-usage.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-usage.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-usage
%global _name %(tr - _ <<< %{name})
Version:	1.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Usage Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.0
#		tar -zcf globus_usage-1.0.tar.gz globus_usage-1.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Usage Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Usage Library - client library for the Globus usage statistics collection
service

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Usage Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-usage-1_0-1_fc9:F-11:globus-usage-1.0-1.fc9.src.rpm:1240581252


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:24:41 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:54:41 -0000	1.2
@@ -0,0 +1 @@
+globus_usage-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:24:41 -0000	1.1
+++ sources	24 Apr 2009 13:54:41 -0000	1.2
@@ -0,0 +1 @@
+2d83cdb9681eb3ce6676835475cbbedd  globus_usage-1.0.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:57:21 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:57:21 +0000 (UTC)
Subject: rpms/globus-usage/EL-4 globus-usage.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424135721.B2CC270106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15469/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-usage.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-usage.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-usage
%global _name %(tr - _ <<< %{name})
Version:	1.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Usage Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.0
#		tar -zcf globus_usage-1.0.tar.gz globus_usage-1.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Usage Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Usage Library - client library for the Globus usage statistics collection
service

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Usage Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-usage-1_0-1_fc9:EL-4:globus-usage-1.0-1.fc9.src.rpm:1240581380


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:24:41 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:56:51 -0000	1.2
@@ -0,0 +1 @@
+globus_usage-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:24:41 -0000	1.1
+++ sources	24 Apr 2009 13:56:51 -0000	1.2
@@ -0,0 +1 @@
+2d83cdb9681eb3ce6676835475cbbedd  globus_usage-1.0.tar.gz



From ellert at fedoraproject.org  Fri Apr 24 13:58:55 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 24 Apr 2009 13:58:55 +0000 (UTC)
Subject: rpms/globus-usage/EL-5 globus-usage.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424135855.AF8EB70106@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15854/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-usage.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-usage.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-usage
%global _name %(tr - _ <<< %{name})
Version:	1.0
Release:	1%{?dist}
Summary:	Globus Toolkit - Usage Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.0
#		tar -zcf globus_usage-1.0.tar.gz globus_usage-1.0
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - Usage Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Usage Library - client library for the Globus usage statistics collection
service

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Usage Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-usage-1_0-1_fc9:EL-5:globus-usage-1.0-1.fc9.src.rpm:1240581477


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:24:41 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:58:25 -0000	1.2
@@ -0,0 +1 @@
+globus_usage-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:24:41 -0000	1.1
+++ sources	24 Apr 2009 13:58:25 -0000	1.2
@@ -0,0 +1 @@
+2d83cdb9681eb3ce6676835475cbbedd  globus_usage-1.0.tar.gz



From jcollie at fedoraproject.org  Fri Apr 24 14:06:27 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 24 Apr 2009 14:06:27 +0000 (UTC)
Subject: rpms/libpri/devel libpri-1.4.10-optimization.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 libpri.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <20090424140627.13CB370106@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libpri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18068

Modified Files:
	.cvsignore libpri.spec sources 
Added Files:
	libpri-1.4.10-optimization.patch 
Log Message:
* Fri Apr 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.10-1
- Update to 1.4.10


libpri-1.4.10-optimization.patch:

--- NEW FILE libpri-1.4.10-optimization.patch ---
>From 0e646e5c04b4bc4454b7ffb3868878eb965b602f Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 11 Jul 2008 14:38:28 -0500
Subject: [PATCH] Set optimization flags for Fedora.

Remove -g and add $(RPM_OPT_FLAGS).
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 15e01c6..f64a95c 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
 DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
 libdir?=$(INSTALL_BASE)/lib
-- 
1.6.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpri/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Aug 2008 05:00:45 -0000	1.8
+++ .cvsignore	24 Apr 2009 14:05:56 -0000	1.9
@@ -1 +1 @@
-libpri-1.4.7.tar.gz
+libpri-1.4.10.tar.gz


Index: libpri.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpri/devel/libpri.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libpri.spec	25 Feb 2009 17:37:14 -0000	1.16
+++ libpri.spec	24 Apr 2009 14:05:56 -0000	1.17
@@ -1,12 +1,12 @@
 Summary: An implementation of Primary Rate ISDN
 Name: libpri
-Version: 1.4.7
-Release: 2%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.asterisk.org/
 Source0: http://downloads.digium.com/pub/telephony/libpri/releases/libpri-%{version}.tar.gz
-Patch0: libpri-1.4.6-optimization.patch
+Patch0: libpri-1.4.10-optimization.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -28,7 +28,8 @@
 %prep
 %setup0 -q -n %{name}-%{version}
 %patch0 -p1
-%{__perl} -pi -e 's|\$\(INSTALL_BASE\)/lib|%{_libdir}|g' Makefile
+%{__sed} -ri -e 's@\$\(INSTALL_BASE\)\/lib@%{_libdir}@g' Makefile
+%{__sed} -ri -e '\@/sbin\/restorecon at d' Makefile
 
 %build
 make %{?_smp_mflags}
@@ -56,6 +57,9 @@
 %{_libdir}/libpri.so
 
 %changelog
+* Fri Apr 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.10-1
+- Update to 1.4.10
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpri/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Aug 2008 05:00:45 -0000	1.8
+++ sources	24 Apr 2009 14:05:56 -0000	1.9
@@ -1 +1 @@
-b770e6ecdc1f51fb53636f392ab26016  libpri-1.4.7.tar.gz
+2a80f0cea1271f3143aaad57c5de42e6  libpri-1.4.10.tar.gz



From hadess at fedoraproject.org  Fri Apr 24 14:17:27 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 14:17:27 +0000 (UTC)
Subject: rpms/totem/F-9 totem.spec,1.201,1.202
Message-ID: <20090424141727.AE2C970106@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19576

Modified Files:
	totem.spec 
Log Message:
* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 2.23.2-15
- Update youtube plugin to latest upstream (#487927)


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-9/totem.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- totem.spec	21 Apr 2009 23:23:11 -0000	1.201
+++ totem.spec	24 Apr 2009 14:16:57 -0000	1.202
@@ -11,12 +11,14 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
 Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.23/totem-%{version}.tar.bz2
 Source1: totem-bin-backend-ondemand.sh
+# http://svn.gnome.org/viewvc/totem/branches/gnome-2-24/src/plugins/youtube/youtube.py?view=markup
+Source2: youtube.py
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -196,6 +198,7 @@
 pushd totem-%{version}
 %patch0 -p0 -b .xulrunner
 %patch1 -p1
+cp -a %{SOURCE2} src/plugins/youtube/youtube.py
 
 # regen
 automake
@@ -438,6 +441,9 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 2.23.2-15
+- Update youtube plugin to latest upstream (#487927)
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.23.2-14
 - Rebuild against newer gecko
 



From hadess at fedoraproject.org  Fri Apr 24 14:21:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 14:21:31 +0000 (UTC)
Subject: rpms/totem/F-9 youtube.py,NONE,1.1
Message-ID: <20090424142131.922EB70106@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20203

Added Files:
	youtube.py 
Log Message:
* Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 2.23.2-15
- Update youtube plugin to latest upstream (#487927)


--- NEW FILE youtube.py ---
import totem
import gobject, gtk, gconf
gobject.threads_init()
import gdata.service
import urllib
import httplib
import atom
import threading
import time
import re
import os
import random

class DownloadThread (threading.Thread):
	def __init__ (self, youtube, url, treeview_name):
		self.youtube = youtube
		self.url = url
		self.treeview_name = treeview_name
		self._done = False
		self._lock = threading.Lock ()
		threading.Thread.__init__ (self)

	def run (self):
		try:
			res = self.youtube.service.Get (self.url).entry
		except gdata.service.RequestError:
			"""Probably a 503 service unavailable. Unfortunately we can't give an error message, as we're not in the GUI thread"""
			"""Just let the lock go and return"""
			res = None
		gobject.idle_add (self.publish_results, res)

	def publish_results(self, res):
		self._lock.acquire (True)
		self.youtube.entry[self.treeview_name] = res
		self._done = True
		self._lock.release ()
		return False

	@property
	def done (self):
		""" Thread-safe property to know whether the query is done or not """
		self._lock.acquire (True)
		res = self._done
		self._lock.release ()
		return res

class CallbackThread (threading.Thread):
	def __init__ (self, callback, *args, **kwargs):
		self.callback = callback
		self.args = args
		self.kwargs = kwargs
		threading.Thread.__init__ (self)

	def run (self):
		res = self.callback (*self.args, **self.kwargs)
		while res == True:
			res = self.callback (*self.args, **self.kwargs)

class YouTube (totem.Plugin):
	def __init__ (self):
		totem.Plugin.__init__ (self)
		self.debug = False
		self.gstreamer_plugins_present = True

		"""Search counters (per search type)"""
		self.in_search = {}
		self.search_token = {} # Used as an ID for a search thread

		self.max_results = 20
		self.button_down = False

		self.search_terms = ""
		self.youtube_id = ""

		self.start_index = {}
		self.results = {} # This is just the number of results from the last pagination query
		self.entry = {}

		self.current_treeview_name = ""
		self.notebook_pages = []

		self.vadjust = {}
		self.liststore = {}
		self.treeview = {}

	def activate (self, totem_object):
		"""Check for the availability of the flvdemux and souphttpsrc GStreamer plugins"""
		bvw_name = totem_object.get_video_widget_backend_name ()

		"""If the user's selected 1.5Mbps or greater as their connection speed, grab higher-quality videos
		   and drop the requirement for the flvdemux plugin."""
		self.gconf_client = gconf.client_get_default ()

		if bvw_name.find ("GStreamer") != -1:
			try:
				import pygst
				pygst.require ("0.10")
				import gst

				registry = gst.registry_get_default ()
				if registry.find_plugin ("soup") == None:
					"""This means an error will be displayed when they try to play anything"""
					self.gstreamer_plugins_present = False
			except ImportError:
				"""Do nothing; either it's using xine or python-gstreamer isn't installed"""

		"""Continue loading the plugin as before"""
		self.builder = self.load_interface ("youtube.ui", True, totem_object.get_main_window (), self)
		self.totem = totem_object

		self.search_entry = self.builder.get_object ("yt_search_entry")
		self.search_entry.connect ("activate", self.on_search_entry_activated)
		self.search_button = self.builder.get_object ("yt_search_button")
		self.search_button.connect ("clicked", self.on_search_button_clicked)
		self.progress_bar = self.builder.get_object ("yt_progress_bar")

		self.notebook = self.builder.get_object ("yt_notebook")
		self.notebook.connect ("switch-page", self.on_notebook_page_changed)

		self.notebook_pages = ["search", "related"]
		for page in self.notebook_pages:
			self.setup_treeview (page)
		self.current_treeview_name = "search"

		self.vbox = self.builder.get_object ("yt_vbox")
		self.vbox.show_all ()
		totem_object.add_sidebar_page ("youtube", _("YouTube"), self.vbox)

		"""Set up the service"""
		self.service = gdata.service.GDataService (account_type = "HOSTED_OR_GOOGLE", server = "gdata.youtube.com")

	def deactivate (self, totem):
		totem.remove_sidebar_page ("youtube")

	def setup_treeview (self, treeview_name):
		self.start_index[treeview_name] = 1
		self.results[treeview_name] = 0
		self.entry[treeview_name] = None
		self.in_search[treeview_name] = False

		"""This is done here rather than in the UI file, because UI files parsed in C and GObjects created in Python apparently don't mix."""
		renderer = totem.CellRendererVideo (use_placeholder = True)
		treeview = self.builder.get_object ("yt_treeview_" + treeview_name)
		treeview.set_property ("totem", self.totem)
		treeview.connect ("row-activated", self.on_row_activated)
		treeview.connect_after ("starting-video", self.on_starting_video)
		treeview.insert_column_with_attributes (0, _("Videos"), renderer, thumbnail=0, title=1)

		"""Add the extra popup menu options. This is done here rather than in the UI file, because it's done for multiple treeviews;
		if it were done in the UI file, the same action group would be used multiple times, which GTK+ doesn't like."""
		ui_manager = treeview.get_ui_manager ()
		action_group = gtk.ActionGroup ("youtube-action-group")
		action = gtk.Action ("open-in-web-browser", _("_Open in Web Browser"), _("Open the video in your web browser"), "gtk-jump-to")
		action_group.add_action_with_accel (action, None)

		ui_manager.insert_action_group (action_group, 1)
		ui_manager.add_ui (ui_manager.new_merge_id (),
				   "/ui/totem-video-list-popup/",
				   "open-in-web-browser",
				   "open-in-web-browser",
				   gtk.UI_MANAGER_MENUITEM,
				   False)
		menu_item = ui_manager.get_action ("/ui/totem-video-list-popup/open-in-web-browser")
		menu_item.connect ("activate", self.on_open_in_web_browser_activated)

		self.vadjust[treeview_name] = treeview.get_vadjustment ()
		self.vadjust[treeview_name].connect ("value-changed", self.on_value_changed)
		vscroll = self.builder.get_object ("yt_scrolled_window_" + treeview_name).get_vscrollbar ()
		vscroll.connect ("button-press-event", self.on_button_press_event)
		vscroll.connect ("button-release-event", self.on_button_release_event)

		self.liststore[treeview_name] = self.builder.get_object ("yt_liststore_" + treeview_name)
		self.treeview[treeview_name] = treeview
		treeview.set_model (self.liststore[treeview_name])

	def on_notebook_page_changed (self, notebook, notebook_page, page_num):
		self.current_treeview_name = self.notebook_pages[page_num]

	def on_row_activated (self, treeview, path, column):
		if self.debug:
			print "Activating row"

		model, rows = treeview.get_selection ().get_selected_rows ()
		iter = model.get_iter (rows[0])
		youtube_id = model.get_value (iter, 3)

		"""Get related videos"""
		self.youtube_id = youtube_id
		self.start_index["related"] = 1
		self.results["related"] = 0
		if self.in_search == False or self.current_treeview_name == "related":
			self.progress_bar.set_text (_("Fetching related videos..."))
		self.get_results ("/feeds/api/videos/" + urllib.quote (youtube_id) + "/related?max-results=" + str (self.max_results), "related")

		if self.debug:
			print "Done activating row"

	def get_fmt_string (self):
		if self.gconf_client.get_int ("/apps/totem/connection_speed") >= 10:
			return "&fmt=18"
		else:
			return ""

	def resolve_t_param (self, youtube_id):
		"""We have to get the t parameter from the actual video page, since Google changed how their URLs work"""
		stream = urllib.urlopen ("http://youtube.com/watch?v=" + urllib.quote (youtube_id))
		regexp1 = re.compile ("swfArgs.*\"t\": \"([^\"]+)\"")
		regexp2 = re.compile ("</head>")

		contents = stream.read ()
		if contents != "":
			"""Check for the t parameter, which is now in a JavaScript array on the video page"""
			matches = regexp1.search (contents)
			if (matches != None):
				stream.close ()
				return matches.group (1)

			"""Check to see if we've come to the end of the <head> tag; in which case, we should give up"""
			if (regexp2.search (contents) != None):
				stream.close ()
				return ""

		stream.close ()
		return ""

	def on_starting_video (self, treeview, path, user_data):
		"""Display an error if the required GStreamer plugins aren't installed"""
		if self.gstreamer_plugins_present == False:
			self.totem.interface_error_with_link (_("Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it.") % _("YouTube"),
							      _("Please install the necessary plugins and restart Totem to be able to play this media."),
							      "http://www.gnome.org/projects/totem/#codecs",
							      _("More information about media plugins"),
							      self.totem.get_main_window ())
			return False

		return True

	def on_open_in_web_browser_activated (self, action):
		model, rows = self.treeview[self.current_treeview_name].get_selection ().get_selected_rows ()
		iter = model.get_iter (rows[0])
		youtube_id = model.get_value (iter, 3)

		"""Open the video in the browser"""
		os.spawnlp (os.P_NOWAIT, "xdg-open", "xdg-open", "http://www.youtube.com/watch?v=" + urllib.quote (youtube_id) + self.get_fmt_string ())

	def on_button_press_event (self, widget, event):
		self.button_down = True

	def on_button_release_event (self, widget, event):
		self.button_down = False
		self.on_value_changed (self.vadjust[self.current_treeview_name])

	def on_value_changed (self, adjustment):
		"""Load more results when we get near the bottom of the treeview"""
		if not self.button_down and (adjustment.get_value () + adjustment.page_size) / adjustment.upper > 0.8 and self.results[self.current_treeview_name] >= self.max_results:
			if self.current_treeview_name == "search":
				if self.debug:
					print "Getting more results for search \"" + self.search_terms + "\" from offset " + str (self.start_index["search"])
				self.get_results ("/feeds/api/videos?vq=" + urllib.quote_plus (self.search_terms) + "&max-results=" + str (self.max_results) + "&orderby=relevance&start-index=" + str (self.start_index["search"]), "search", False)
			elif self.current_treeview_name == "related":
				if self.debug:
					print "Getting more related videos for video \"" + self.youtube_id + "\" from offset " + str (self.start_index["related"])
				self.get_results ("/feeds/api/videos/" + urllib.quote_plus (self.youtube_id) + "/related?max-results=" + str (self.max_results) + "&start-index=" + str (self.start_index["related"]), "related", False)

	def convert_url_to_id (self, url):
		"""Find the last clause in the URL; after the last /"""
		return url.split ("/").pop ()

	def populate_list_from_results (self, search_token, treeview_name, thread):
		"""Check to see if this search has been cancelled"""
		if search_token != self.search_token[treeview_name]:
			return False

		"""Check and acquire the lock"""
		if not thread.done:
			if self.current_treeview_name == treeview_name:
				self.progress_bar.pulse ()
			return True

		CallbackThread (self.process_next_thumbnail, search_token, treeview_name).start ()
		return False

	def process_next_thumbnail (self, search_token, treeview_name):
		"""Note that all the calls to gobject.idle_add are so that the respective
		   UI function calls are made in the main thread, since process_next_thumbnail
		   is run in the CallbackThread thread."""

		"""Check to see if this search has been cancelled"""
		if search_token != self.search_token[treeview_name]:
			return False

		"""Return if there are no results (or we've finished)"""
		if self.entry[treeview_name] == None or len (self.entry[treeview_name]) == 0:
			gobject.idle_add (self._clear_ui, treeview_name)

			self.entry[treeview_name] = None
			self.in_search[treeview_name] = False

			return False

		"""Only do one result at a time, as the thumbnail has to be downloaded; give them a temporary MRL until the real one is resolved before playing"""
		entry = self.entry[treeview_name].pop (0)
		self.results[treeview_name] += 1
		self.start_index[treeview_name] += 1
		youtube_id = self.convert_url_to_id (entry.id.text)

		"""Find the content tag"""
		for _element in entry.extension_elements:
			if _element.tag =="group":
				break

		content_elements = _element.FindChildren ("content")
		if len (content_elements) == 0:
			return True
		mrl = content_elements[0].attributes['url']

		"""Download the thumbnail and store it in a temporary location so we can get a pixbuf from it"""
		thumbnail_url = _element.FindChildren ("thumbnail")[0].attributes['url']
		try:
			filename, headers = urllib.urlretrieve (thumbnail_url)
		except IOError:
			return True

		try:
			pixbuf = gtk.gdk.pixbuf_new_from_file (filename)
		except gobject.GError:
			print "Could not open thumbnail " + filename + " for video. It has been left in place for investigation."
			return True

		"""Don't leak the temporary file"""
		os.unlink (filename)

		"""Get the video stream MRL"""
		t_param = self.resolve_t_param (youtube_id)

		if t_param != "":
			mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + urllib.quote (t_param) + self.get_fmt_string ()

		gobject.idle_add (self._append_to_liststore, treeview_name, pixbuf, entry.title.text, mrl, youtube_id, search_token)

		return True

	def _clear_ui (self, treeview_name):
		"""Revert the cursor"""
		window = self.vbox.window
		window.set_cursor (None)

		if self.in_search == True or self.current_treeview_name == treeview_name:
			"""Only blank the progress bar if we're the only search taking place"""
			self.progress_bar.set_fraction (0.0)
			self.progress_bar.set_text ("")

		return False

	def _append_to_liststore (self, treeview_name, pixbuf, title, mrl, id, search_token):
		"""Check to see if this search has been cancelled"""
		if search_token != self.search_token[treeview_name]:
			return False

		if self.in_search == True or self.current_treeview_name == treeview_name:
			self.progress_bar.set_fraction (float (self.results[treeview_name]) / float (self.max_results))
		self.liststore[treeview_name].append ([pixbuf, title, mrl, id])
		return False

	def on_search_button_clicked (self, button):
		search_terms = self.search_entry.get_text ()

		if self.debug:
			print "Searching for \"" + search_terms + "\""

		"""Focus the "Search" tab"""
		self.notebook.set_current_page (self.notebook_pages.index ("search"))

		self.search_terms = search_terms
		self.start_index["search"] = 1
		self.results["search"] = 0
		self.progress_bar.set_text (_("Fetching search results..."))
		self.get_results ("/feeds/api/videos?vq=" + urllib.quote_plus (search_terms) + "&orderby=relevance&max-results=" + str (self.max_results), "search")

	def on_search_entry_activated (self, entry):
		self.search_button.clicked ()

	def get_results (self, url, treeview_name, clear = True):
		if self.in_search[treeview_name] == True and clear == False:
			"""If we're trying to fetch more results while another search is happening, just cancel"""
			if self.debug:
				print "Cancelling getting more results due to existing incomplete search."
			self.in_search[treeview_name] = False
			return
		elif clear == False:
			self.results[self.current_treeview_name] = 0
			self.progress_bar.set_text (_("Fetching more videos..."))

		"""If we're trying to do another full search while one's already happening, just continue as
		   normal. The populate_list_from_results function will notice, and cancel the old search."""

		if clear:
			self.liststore[treeview_name].clear ()

		if self.debug:
			print "Getting results from URL \"" + url + "\""

		self.in_search[treeview_name] = True
		self.search_token[treeview_name] = random.random ()

		"""Give us a nice waiting cursor"""
		window = self.vbox.window
		window.set_cursor (gtk.gdk.Cursor (gtk.gdk.WATCH))
		if self.current_treeview_name == treeview_name:
			self.progress_bar.pulse ()

		thread = DownloadThread (self, url, treeview_name)
		gobject.timeout_add (350, self.populate_list_from_results, self.search_token[treeview_name], treeview_name, thread)
		thread.start()




From pkgdb at fedoraproject.org  Fri Apr 24 14:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:26:16 +0000
Subject: [pkgdb] schroedinger: kwizart has requested watchbugzilla
Message-ID: <20090424142616.763C010F886@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchbugzilla acl on schroedinger (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:26:16 +0000
Subject: [pkgdb] schroedinger: kwizart has requested watchcommits
Message-ID: <20090424142617.3EF2810F88C@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchcommits acl on schroedinger (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:26:17 +0000
Subject: [pkgdb] schroedinger: kwizart has requested commit
Message-ID: <20090424142617.6769510F88E@bastion2.fedora.phx.redhat.com>

kwizart has requested the commit acl on schroedinger (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:26:22 +0000
Subject: [pkgdb] schroedinger: kwizart has requested watchcommits
Message-ID: <20090424142622.BA4B610F891@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchcommits acl on schroedinger (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:26:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:26:23 +0000
Subject: [pkgdb] schroedinger: kwizart has requested commit
Message-ID: <20090424142623.D5AFC10F894@bastion2.fedora.phx.redhat.com>

kwizart has requested the commit acl on schroedinger (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:26:35 +0000
Subject: [pkgdb] schroedinger: kwizart has requested watchbugzilla
Message-ID: <20090424142635.4996210F897@bastion2.fedora.phx.redhat.com>

kwizart has requested the watchbugzilla acl on schroedinger (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From kyle at fedoraproject.org  Fri Apr 24 14:31:38 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 24 Apr 2009 14:31:38 +0000 (UTC)
Subject: rpms/kernel/F-11 hpet-fixes.patch, NONE, 1.1 kernel.spec, 1.1571,
	1.1572
Message-ID: <20090424143138.ABFF070106@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21701

Modified Files:
	kernel.spec 
Added Files:
	hpet-fixes.patch 
Log Message:
* Fri Apr 24 2009 Kyle McMartin <kyle at redhat.com>
- backport hpet fixes from 2.6.30-rc3.


hpet-fixes.patch:

--- NEW FILE hpet-fixes.patch ---
commit 7bad863035a98d0dd45ceb29c66b9c2ed90e595e
Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date:   Sat Feb 21 00:16:35 2009 +0100

    x86: hpet: stop HPET_COUNTER when programming periodic mode
    
    Impact: fix system hang on some systems operating with HZ_1000
    
    On a system that stalled with HZ_1000, the first value written to
    T0_CMP (when the main counter was not stopped) did not trigger an
    interrupt. Instead after the main counter wrapped around (after
    several minutes) an interrupt was triggered and afterwards the
    periodic interrupt took effect.
    
    This can be fixed by implementing HPET spec recommendation for
    programming the periodic mode (i.e. stopping the main counter).
    
    Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
    Cc: Mark Hounschell <markh at compro.net>
    Cc: Borislav Petkov <borislav.petkov at amd.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 91773c91e460964100bc2534a33569f71ea9bdd2
Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date:   Sat Feb 21 00:09:47 2009 +0100

    x86: hpet: print HPET registers during setup (if hpet=verbose is used)
    
    Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
    Cc: Mark Hounschell <markh at compro.net>
    Cc: Borislav Petkov <borislav.petkov at amd.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8c10fa6d34f8414c7c4efcdb39323150bdac82bc
Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date:   Sat Feb 21 00:10:44 2009 +0100

    x86: hpet: provide separate functions to stop and start the counter
    
    By splitting up existing hpet_start_counter function.
    
    Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
    Cc: Mark Hounschell <markh at compro.net>
    Cc: Borislav Petkov <borislav.petkov at amd.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 54f21a5..46d11a9 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -492,10 +492,12 @@ and is between 256 and 4096 characters. It is defined in the file
 			Default: 64
 
 	hpet=		[X86-32,HPET] option to control HPET usage
-			Format: { enable (default) | disable | force }
+			Format: { enable (default) | disable | force |
+				verbose }
 			disable: disable HPET and use PIT instead
 			force: allow force enabled of undocumented chips (ICH4,
 			VIA, nVidia)
+			verbose: show contents of HPET registers during setup
 
 	com20020=	[HW,NET] ARCnet - COM20020 chipset
 			Format:
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index a00545f..648b3a2 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -80,6 +80,7 @@ static inline void hpet_clear_mapping(void)
  */
 static int boot_hpet_disable;
 int hpet_force_user;
+static int hpet_verbose;
 
 static int __init hpet_setup(char *str)
 {
@@ -88,6 +89,8 @@ static int __init hpet_setup(char *str)
 			boot_hpet_disable = 1;
 		if (!strncmp("force", str, 5))
 			hpet_force_user = 1;
+		if (!strncmp("verbose", str, 7))
+			hpet_verbose = 1;
 	}
 	return 1;
 }
@@ -119,6 +122,43 @@ int is_hpet_enabled(void)
 }
 EXPORT_SYMBOL_GPL(is_hpet_enabled);
 
+static void _hpet_print_config(const char *function, int line)
+{
+	u32 i, timers, l, h;
+	printk(KERN_INFO "hpet: %s(%d):\n", function, line);
+	l = hpet_readl(HPET_ID);
+	h = hpet_readl(HPET_PERIOD);
+	timers = ((l & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;
+	printk(KERN_INFO "hpet: ID: 0x%x, PERIOD: 0x%x\n", l, h);
+	l = hpet_readl(HPET_CFG);
+	h = hpet_readl(HPET_STATUS);
+	printk(KERN_INFO "hpet: CFG: 0x%x, STATUS: 0x%x\n", l, h);
+	l = hpet_readl(HPET_COUNTER);
+	h = hpet_readl(HPET_COUNTER+4);
+	printk(KERN_INFO "hpet: COUNTER_l: 0x%x, COUNTER_h: 0x%x\n", l, h);
+
+	for (i = 0; i < timers; i++) {
+		l = hpet_readl(HPET_Tn_CFG(i));
+		h = hpet_readl(HPET_Tn_CFG(i)+4);
+		printk(KERN_INFO "hpet: T%d: CFG_l: 0x%x, CFG_h: 0x%x\n",
+		       i, l, h);
+		l = hpet_readl(HPET_Tn_CMP(i));
+		h = hpet_readl(HPET_Tn_CMP(i)+4);
+		printk(KERN_INFO "hpet: T%d: CMP_l: 0x%x, CMP_h: 0x%x\n",
+		       i, l, h);
+		l = hpet_readl(HPET_Tn_ROUTE(i));
+		h = hpet_readl(HPET_Tn_ROUTE(i)+4);
+		printk(KERN_INFO "hpet: T%d ROUTE_l: 0x%x, ROUTE_h: 0x%x\n",
+		       i, l, h);
+	}
+}
+
+#define hpet_print_config()					\
+do {								\
+	if (hpet_verbose)					\
+		_hpet_print_config(__FUNCTION__, __LINE__);	\
+} while (0)
+
 /*
  * When the hpet driver (/dev/hpet) is enabled, we need to reserve
  * timer 0 and timer 1 in case of RTC emulation.
@@ -191,27 +231,37 @@ static struct clock_event_device hpet_clockevent = {
 	.rating		= 50,
 };
 
-static void hpet_start_counter(void)
+static void hpet_stop_counter(void)
 {
 	unsigned long cfg = hpet_readl(HPET_CFG);
-
 	cfg &= ~HPET_CFG_ENABLE;
 	hpet_writel(cfg, HPET_CFG);
 	hpet_writel(0, HPET_COUNTER);
 	hpet_writel(0, HPET_COUNTER + 4);
+}
+
+static void hpet_start_counter(void)
+{
+	unsigned long cfg = hpet_readl(HPET_CFG);
 	cfg |= HPET_CFG_ENABLE;
 	hpet_writel(cfg, HPET_CFG);
 }
 
+static void hpet_restart_counter(void)
+{
+	hpet_stop_counter();
+	hpet_start_counter();
+}
+
 static void hpet_resume_device(void)
 {
 	force_hpet_resume();
 }
 
-static void hpet_restart_counter(void)
+static void hpet_resume_counter(void)
 {
 	hpet_resume_device();
-	hpet_start_counter();
+	hpet_restart_counter();
 }
 
 static void hpet_enable_legacy_int(void)
@@ -259,29 +309,23 @@ static int hpet_setup_msi_irq(unsigned int irq);
 static void hpet_set_mode(enum clock_event_mode mode,
 			  struct clock_event_device *evt, int timer)
 {
-	unsigned long cfg, cmp, now;
+	unsigned long cfg;
 	uint64_t delta;
 
 	switch (mode) {
 	case CLOCK_EVT_MODE_PERIODIC:
+		hpet_stop_counter();
 		delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult;
 		delta >>= evt->shift;
-		now = hpet_readl(HPET_COUNTER);
-		cmp = now + (unsigned long) delta;
 		cfg = hpet_readl(HPET_Tn_CFG(timer));
 		/* Make sure we use edge triggered interrupts */
 		cfg &= ~HPET_TN_LEVEL;
 		cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
 		       HPET_TN_SETVAL | HPET_TN_32BIT;
 		hpet_writel(cfg, HPET_Tn_CFG(timer));
-		/*
-		 * The first write after writing TN_SETVAL to the
-		 * config register sets the counter value, the second
-		 * write sets the period.
-		 */
-		hpet_writel(cmp, HPET_Tn_CMP(timer));
-		udelay(1);
 		hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer));
+		hpet_start_counter();
+		hpet_print_config();
 		break;
 
 	case CLOCK_EVT_MODE_ONESHOT:
@@ -308,6 +352,7 @@ static void hpet_set_mode(enum clock_event_mode mode,
 			irq_set_affinity(hdev->irq, cpumask_of(hdev->cpu));
 			enable_irq(hdev->irq);
 		}
+		hpet_print_config();
 		break;
 	}
 }
@@ -526,6 +571,7 @@ static void hpet_msi_capability_lookup(unsigned int start_timer)
 
 	num_timers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT);
 	num_timers++; /* Value read out starts from 0 */
+	hpet_print_config();
 
 	hpet_devs = kzalloc(sizeof(struct hpet_dev) * num_timers, GFP_KERNEL);
 	if (!hpet_devs)
@@ -695,7 +741,7 @@ static struct clocksource clocksource_hpet = {
 	.mask		= HPET_MASK,
 	.shift		= HPET_SHIFT,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
-	.resume		= hpet_restart_counter,
+	.resume		= hpet_resume_counter,
 #ifdef CONFIG_X86_64
 	.vread		= vread_hpet,
 #endif
@@ -707,7 +753,7 @@ static int hpet_clocksource_register(void)
 	cycle_t t1;
 
 	/* Start the counter */
-	hpet_start_counter();
+	hpet_restart_counter();
 
 	/* Verify whether hpet counter works */
 	t1 = read_hpet();
@@ -793,6 +839,7 @@ int __init hpet_enable(void)
 	 * information and the number of channels
 	 */
 	id = hpet_readl(HPET_ID);
+	hpet_print_config();
 
 #ifdef CONFIG_HPET_EMULATE_RTC
 	/*
@@ -845,6 +892,7 @@ static __init int hpet_late_init(void)
 		return -ENODEV;
 
 	hpet_reserve_platform_timers(hpet_readl(HPET_ID));
+	hpet_print_config();
 
 	for_each_online_cpu(cpu) {
 		hpet_cpuhp_notify(NULL, CPU_ONLINE, (void *)(long)cpu);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1571
retrieving revision 1.1572
diff -u -r1.1571 -r1.1572
--- kernel.spec	24 Apr 2009 04:34:34 -0000	1.1571
+++ kernel.spec	24 Apr 2009 14:31:07 -0000	1.1572
@@ -737,6 +737,8 @@
 Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 Patch7005: linux-2.6-i2c-fix-bit-algorithm-timeout.patch
 
+Patch9000: hpet-fixes.patch
+
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
@@ -1381,6 +1383,8 @@
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 ApplyPatch linux-2.6-i2c-fix-bit-algorithm-timeout.patch
 
+ApplyPatch hpet-fixes.patch
+
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1984,6 +1988,9 @@
 # and build.
 
 %changelog
+* Fri Apr 24 2009 Kyle McMartin <kyle at redhat.com>
+- backport hpet fixes from 2.6.30-rc3.
+
 * Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-109
 - linux-2.6-i2c-fix-bit-algorithm-timeout.patch - fix i2c EDID timeout
 



From kyle at fedoraproject.org  Fri Apr 24 14:32:50 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 24 Apr 2009 14:32:50 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1572,1.1573
Message-ID: <20090424143251.0035970106@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22040

Modified Files:
	kernel.spec 
Log Message:
push a build


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1572
retrieving revision 1.1573
diff -u -r1.1572 -r1.1573
--- kernel.spec	24 Apr 2009 14:31:07 -0000	1.1572
+++ kernel.spec	24 Apr 2009 14:32:20 -0000	1.1573
@@ -1988,7 +1988,7 @@
 # and build.
 
 %changelog
-* Fri Apr 24 2009 Kyle McMartin <kyle at redhat.com>
+* Fri Apr 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-111
 - backport hpet fixes from 2.6.30-rc3.
 
 * Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-109



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:06 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143306.51A2F10F88B@bastion2.fedora.phx.redhat.com>

jcollie has set the watchcommits acl on schroedinger (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:02 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143302.EF73010F886@bastion2.fedora.phx.redhat.com>

jcollie has set the watchbugzilla acl on schroedinger (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:19 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143320.04D2110F890@bastion2.fedora.phx.redhat.com>

jcollie has set the approveacls acl on schroedinger (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:09 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143309.5F86F10F88E@bastion2.fedora.phx.redhat.com>

jcollie has set the commit acl on schroedinger (Fedora devel) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:28 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143328.C542610F88A@bastion2.fedora.phx.redhat.com>

jcollie has set the watchbugzilla acl on schroedinger (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:31 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143331.2DA9F10F892@bastion2.fedora.phx.redhat.com>

jcollie has set the watchcommits acl on schroedinger (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:33 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143334.4133D10F894@bastion2.fedora.phx.redhat.com>

jcollie has set the commit acl on schroedinger (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From pkgdb at fedoraproject.org  Fri Apr 24 14:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 14:33:37 +0000
Subject: [pkgdb] schroedinger had acl change status
Message-ID: <20090424143337.DB1FC10F88F@bastion2.fedora.phx.redhat.com>

jcollie has set the approveacls acl on schroedinger (Fedora 11) to Approved for kwizart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/schroedinger



From davej at fedoraproject.org  Fri Apr 24 14:34:54 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 24 Apr 2009 14:34:54 +0000 (UTC)
Subject: rpms/kernel/devel TODO, 1.61, 1.62 fix-ppc-debug_kmap_atomic.patch, 
	1.1, NONE fix-staging-at76.patch, 1.1,
	NONE linux-2.6-v4l-pvrusb2-fixes.patch, 1.1, NONE
Message-ID: <20090424143454.E68FF70106@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22550

Modified Files:
	TODO 
Removed Files:
	fix-ppc-debug_kmap_atomic.patch fix-staging-at76.patch 
	linux-2.6-v4l-pvrusb2-fixes.patch 
Log Message:
clean up todo




Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- TODO	30 Mar 2009 15:08:54 -0000	1.61
+++ TODO	24 Apr 2009 14:34:24 -0000	1.62
@@ -20,9 +20,6 @@
 * linux-2.6-debug-vm-would-have-oomkilled.patch
 	Push for 2.6.29
 
-* linux-2.6-scsi-cpqarray-set-master.patch
-	Queued for 2.6.30 by Jens Axboe
-
 * linux-2.6-cdrom-door-status.patch
 	Getting some testing here before I go back to upstream with more
 	data.  See the thread at:
@@ -32,6 +29,10 @@
 * linux-2.6-hotfixes.patch
 	Empty
 
+* linux-2.6-crash-driver.patch
+	Unlikely to go upstream.
+	https://bugzilla.redhat.com/show_bug.cgi?id=492803
+
 * linux-2.6-debug-always-inline-kzalloc.patch
 	Sent upstream Sep 25 2008
 
@@ -66,8 +67,6 @@
 * linux-2.6.29-lirc.patch
 * linux-2.6-sysrq-c.patch
 	jarod working on upstreaming
-* linux-2.6-hdpvr.patch
-	jarod added, should be in upstream v4l-dvb by .28, linus' tree by .29
 
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch
@@ -84,19 +83,3 @@
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
 	http://lkml.org/lkml/2006/8/2/208
 
-* linux-2.6-net-tulip-interrupt.patch
-	Queued by DaveM for next release.
-
-* linux-2.6-pci-sysfs-remove-id.patch
-        In jbarnes linux-next tree for 2.6.30
-        Need for KVM PCI device assignment
-        https://bugzilla.redhat.com/487103
-
-* linux-2.6-net-fix-another-gro-bug.patch:
-        virtio_net guest->remote GSO busted with 2.6.29 host
-        https://bugzilla.redhat.com/490266
-        Should be in 2.6.29.1
-
-* linux-2.6.29-pat-fixes.patch:
-	http://bugs.freedesktop.org/show_bug.cgi?id=20803
-	ajax to follow up with jbarnes


--- fix-ppc-debug_kmap_atomic.patch DELETED ---


--- fix-staging-at76.patch DELETED ---


--- linux-2.6-v4l-pvrusb2-fixes.patch DELETED ---



From jcollie at fedoraproject.org  Fri Apr 24 14:40:31 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 24 Apr 2009 14:40:31 +0000 (UTC)
Subject: rpms/schroedinger/devel .cvsignore, 1.7, 1.8 schroedinger.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20090424144031.4E3C670106@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24645

Modified Files:
	.cvsignore schroedinger.spec sources 
Log Message:
* Fri Apr 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.7-1
- Update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Apr 2009 13:58:15 -0000	1.7
+++ .cvsignore	24 Apr 2009 14:40:00 -0000	1.8
@@ -1 +1 @@
-schroedinger-1.0.6.tar.gz
+schroedinger-1.0.7.tar.gz


Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- schroedinger.spec	2 Apr 2009 13:58:15 -0000	1.13
+++ schroedinger.spec	24 Apr 2009 14:40:00 -0000	1.14
@@ -1,7 +1,7 @@
 %define abi 1.0
 
 Name:           schroedinger
-Version:        1.0.6
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
@@ -80,6 +80,9 @@
 %{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
+* Fri Apr 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.7-1
+- Update to 1.0.7
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Apr 2009 13:58:15 -0000	1.7
+++ sources	24 Apr 2009 14:40:00 -0000	1.8
@@ -1 +1 @@
-e5d0f34d623f6fc3bbf9468c48935c97  schroedinger-1.0.6.tar.gz
+9a1132c54a58a6a040514f754b53ee44  schroedinger-1.0.7.tar.gz



From sharkcz at fedoraproject.org  Fri Apr 24 14:41:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 24 Apr 2009 14:41:33 +0000 (UTC)
Subject: rpms/scribus/F-11 .cvsignore, 1.18, 1.19 scribus.spec, 1.41,
	1.42 sources, 1.18, 1.19 scribus-x86_64.patch, 1.1,
	NONE scribus.xml, 1.2, NONE
Message-ID: <20090424144133.885DA70106@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24984

Modified Files:
	.cvsignore scribus.spec sources 
Removed Files:
	scribus-x86_64.patch scribus.xml 
Log Message:
* Wed Apr 22 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.12.beta
- update to 1.3.5.beta
- make docs subpackage noarch
- drop outdated Obsoletes/Provides



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	31 Mar 2009 13:50:51 -0000	1.18
+++ .cvsignore	24 Apr 2009 14:41:03 -0000	1.19
@@ -1 +1 @@
-scribus-svn13359.tar.bz2
+scribus-1.3.5.beta.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/scribus.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- scribus.spec	31 Mar 2009 13:50:51 -0000	1.41
+++ scribus.spec	24 Apr 2009 14:41:03 -0000	1.42
@@ -1,15 +1,13 @@
 Name:           scribus
 Version:        1.3.5
-Release:        0.11.20090329svn13359%{?dist}
+Release:        0.12.beta%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-# obtained via svn export -r 13359 svn://scribus.info/Scribus/trunk/Scribus scribus; tar cjvf ...
-Source0:        scribus-svn13359.tar.bz2
-Source1:        scribus.xml
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.beta.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -38,25 +36,6 @@
 Requires:       tkinter
 Requires:       shared-mime-info
 
-Obsoletes:     scribus-i18n-en
-Obsoletes:     scribus-svg
-Obsoletes:     scribus-scripting
-Obsoletes:     scribus-short-words
-Obsoletes:     scribus-vnla
-Obsoletes:     scribus-i18en
-Obsoletes:     scribus-i18de
-Obsoletes:     scribus-i18fr
-Obsoletes:     scribus-templates
-
-Provides:      scribus-i18n-en
-Provides:      scribus-svg
-Provides:      scribus-scripting
-Provides:      scribus-short-words
-Provides:      scribus-vnla
-Provides:      scribus-i18en
-Provides:      scribus-i18de
-Provides:      scribus-i18fr
-Provides:      scribus-templates
 
 %description
 Scribus is an desktop open source page layout program with
@@ -81,12 +60,16 @@
 Summary:        Documentation files for Scribus
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:      noarch
+%endif
+
 
 %description    doc
 %{summary}
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}.beta
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -144,7 +127,6 @@
 %{_bindir}/scribus
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
-#%{_datadir}/mimelnk/application/*scribus.desktop
 %{_datadir}/pixmaps/*
 %{_datadir}/scribus/
 %{_libdir}/scribus/
@@ -159,27 +141,32 @@
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5svn
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5svn/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5svn/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5svn/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5svn/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5svn/pl
-%{_datadir}/doc/%{name}-1.3.5svn/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5svn/BUILDING
-%{_datadir}/doc/%{name}-1.3.5svn/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5svn/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5svn/COPYING
-%{_datadir}/doc/%{name}-1.3.5svn/NEWS
-%{_datadir}/doc/%{name}-1.3.5svn/README*
-%{_datadir}/doc/%{name}-1.3.5svn/TODO
-%{_datadir}/doc/%{name}-1.3.5svn/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5svn/LINKS
-%{_datadir}/doc/%{name}-1.3.5svn/TRANSLATION
+%dir %{_datadir}/doc/%{name}-1.3.5.beta
+%lang(cd) %{_datadir}/doc/%{name}-1.3.5.beta/cs
+%lang(de) %{_datadir}/doc/%{name}-1.3.5.beta/de
+%lang(en) %{_datadir}/doc/%{name}-1.3.5.beta/en
+%lang(fr) %{_datadir}/doc/%{name}-1.3.5.beta/fr
+%lang(pl) %{_datadir}/doc/%{name}-1.3.5.beta/pl
+%{_datadir}/doc/%{name}-1.3.5.beta/AUTHORS
+%{_datadir}/doc/%{name}-1.3.5.beta/BUILDING
+%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLog
+%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLogSVN
+%{_datadir}/doc/%{name}-1.3.5.beta/COPYING
+%{_datadir}/doc/%{name}-1.3.5.beta/NEWS
+%{_datadir}/doc/%{name}-1.3.5.beta/README*
+%{_datadir}/doc/%{name}-1.3.5.beta/TODO
+%{_datadir}/doc/%{name}-1.3.5.beta/PACKAGING
+%{_datadir}/doc/%{name}-1.3.5.beta/LINKS
+%{_datadir}/doc/%{name}-1.3.5.beta/TRANSLATION
 
  
 
 %changelog
+* Wed Apr 22 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.12.beta
+- update to 1.3.5.beta
+- make docs subpackage noarch
+- drop outdated Obsoletes/Provides
+
 * Sun Mar 29 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.11.20090329svn13359
 - update to revision 13359
 - add aspell-devel and boost-devel as BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Mar 2009 13:50:51 -0000	1.18
+++ sources	24 Apr 2009 14:41:03 -0000	1.19
@@ -1 +1 @@
-33e602ff7969406987d86272fc8ce1c7  scribus-svn13359.tar.bz2
+ee097c2203ee86aac16cf820d3d698ce  scribus-1.3.5.beta.tar.bz2


--- scribus-x86_64.patch DELETED ---


--- scribus.xml DELETED ---



From sharkcz at fedoraproject.org  Fri Apr 24 14:45:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 24 Apr 2009 14:45:49 +0000 (UTC)
Subject: rpms/scribus/F-10 .cvsignore, 1.17, 1.18 scribus.spec, 1.35,
	1.36 sources, 1.17, 1.18 scribus-x86_64.patch, 1.1,
	NONE scribus.xml, 1.2, NONE
Message-ID: <20090424144549.25AE870106@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26091

Modified Files:
	.cvsignore scribus.spec sources 
Removed Files:
	scribus-x86_64.patch scribus.xml 
Log Message:
* Wed Apr 22 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.12.beta
- update to 1.3.5.beta
- make docs subpackage noarch
- drop outdated Obsoletes/Provides



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	5 Sep 2008 22:21:10 -0000	1.17
+++ .cvsignore	24 Apr 2009 14:45:18 -0000	1.18
@@ -1 +1 @@
-scribus-svn-12516.tar.bz2
+scribus-1.3.5.beta.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/scribus.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- scribus.spec	13 Oct 2008 16:29:45 -0000	1.35
+++ scribus.spec	24 Apr 2009 14:45:18 -0000	1.36
@@ -1,15 +1,13 @@
 Name:           scribus
 Version:        1.3.5
-Release:        0.5.12516svn%{?dist}
+Release:        0.12.beta%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-# obtained via svn co -r 12516 svn://scribus.info/Scribus/trunk/Scribus
-Source0:        scribus-svn-12516.tar.bz2
-Source1:        scribus.xml
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.beta.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -30,31 +28,14 @@
 BuildRequires:  freetype-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  cairo-devel
+BuildRequires:  aspell-devel
+BuildRequires:  boost-devel
 Requires:       ghostscript >= 7.07
 Requires:       python >= 2.3
 Requires:       python-imaging
 Requires:       tkinter
 Requires:       shared-mime-info
 
-Obsoletes:     scribus-i18n-en
-Obsoletes:     scribus-svg
-Obsoletes:     scribus-scripting
-Obsoletes:     scribus-short-words
-Obsoletes:     scribus-vnla
-Obsoletes:     scribus-i18en
-Obsoletes:     scribus-i18de
-Obsoletes:     scribus-i18fr
-Obsoletes:     scribus-templates
-
-Provides:      scribus-i18n-en
-Provides:      scribus-svg
-Provides:      scribus-scripting
-Provides:      scribus-short-words
-Provides:      scribus-vnla
-Provides:      scribus-i18en
-Provides:      scribus-i18de
-Provides:      scribus-i18fr
-Provides:      scribus-templates
 
 %description
 Scribus is an desktop open source page layout program with
@@ -79,12 +60,16 @@
 Summary:        Documentation files for Scribus
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch:      noarch
+%endif
+
 
 %description    doc
 %{summary}
 
 %prep
-%setup -q -n Scribus
+%setup -q -n %{name}-%{version}.beta
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -96,9 +81,6 @@
 # fix permissions
 chmod a-x scribus/pageitem_latexframe.h
 
-# remove zero-length source files
-rm -f scribus/canvasgesture_pan.*
-
 
 %build
 mkdir build
@@ -115,7 +97,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusicon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribusicon.png
+install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribus.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribus.png
 install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -145,7 +127,6 @@
 %{_bindir}/scribus
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
-#%{_datadir}/mimelnk/application/*scribus.desktop
 %{_datadir}/pixmaps/*
 %{_datadir}/scribus/
 %{_libdir}/scribus/
@@ -160,24 +141,52 @@
 
 %files doc
 %defattr(-,root,root,-)
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5svn/cs/*
-%lang(de) %{_datadir}/doc/%{name}-1.3.5svn/de/*
-%lang(en) %{_datadir}/doc/%{name}-1.3.5svn/en/*
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5svn/fr/*
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5svn/pl/*
-%{_datadir}/doc/%{name}-1.3.5svn/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5svn/BUILDING
-%{_datadir}/doc/%{name}-1.3.5svn/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5svn/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5svn/COPYING
-%{_datadir}/doc/%{name}-1.3.5svn/NEWS
-%{_datadir}/doc/%{name}-1.3.5svn/README*
-%{_datadir}/doc/%{name}-1.3.5svn/TODO
-%{_datadir}/doc/%{name}-1.3.5svn/PACKAGING
+%dir %{_datadir}/doc/%{name}-1.3.5.beta
+%lang(cd) %{_datadir}/doc/%{name}-1.3.5.beta/cs
+%lang(de) %{_datadir}/doc/%{name}-1.3.5.beta/de
+%lang(en) %{_datadir}/doc/%{name}-1.3.5.beta/en
+%lang(fr) %{_datadir}/doc/%{name}-1.3.5.beta/fr
+%lang(pl) %{_datadir}/doc/%{name}-1.3.5.beta/pl
+%{_datadir}/doc/%{name}-1.3.5.beta/AUTHORS
+%{_datadir}/doc/%{name}-1.3.5.beta/BUILDING
+%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLog
+%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLogSVN
+%{_datadir}/doc/%{name}-1.3.5.beta/COPYING
+%{_datadir}/doc/%{name}-1.3.5.beta/NEWS
+%{_datadir}/doc/%{name}-1.3.5.beta/README*
+%{_datadir}/doc/%{name}-1.3.5.beta/TODO
+%{_datadir}/doc/%{name}-1.3.5.beta/PACKAGING
+%{_datadir}/doc/%{name}-1.3.5.beta/LINKS
+%{_datadir}/doc/%{name}-1.3.5.beta/TRANSLATION
 
  
 
 %changelog
+* Wed Apr 22 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.12.beta
+- update to 1.3.5.beta
+- make docs subpackage noarch
+- drop outdated Obsoletes/Provides
+
+* Sun Mar 29 2009 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.11.20090329svn13359
+- update to revision 13359
+- add aspell-devel and boost-devel as BR
+- update release tag to conform to the pre-release versioning guideline
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-0.10.12516svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-0.9.12516svn
+- rebuild with new openssl
+
+* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.3.5-0.8.12516svn
+- Rebuild for Python 2.6
+
+* Tue Dec  2 2008 Dan Hor??k <dan[AT]danny.cz> - 1.3.5-0.7.12516svn
+- fix directory ownership in doc subpackage (#474041)
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.3.5-0.6.12516svn
+- Rebuild for Python 2.6
+
 * Mon Oct 13 2008 Dan Hor??k <dan[AT]danny.cz> 1.3.5-0.5.12516svn
 - install global desktop file instead of KDE-only one (#461124)
 - little cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Sep 2008 22:21:10 -0000	1.17
+++ sources	24 Apr 2009 14:45:18 -0000	1.18
@@ -1 +1 @@
-521c659bee0d94b334180572ab1f9e8d  scribus-svn-12516.tar.bz2
+ee097c2203ee86aac16cf820d3d698ce  scribus-1.3.5.beta.tar.bz2


--- scribus-x86_64.patch DELETED ---


--- scribus.xml DELETED ---



From rhughes at fedoraproject.org  Fri Apr 24 14:50:30 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 24 Apr 2009 14:50:30 +0000 (UTC)
Subject: rpms/PackageKit/F-11 PackageKit-0.4.6-fix-http_proxy-uris.patch,
	NONE, 1.1 PackageKit.spec, 1.106, 1.107
Message-ID: <20090424145030.46D3270106@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27194

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-fix-http_proxy-uris.patch 
Log Message:
* Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-9
- Backport a patch from upstream to fix URI escaping of http_proxy when
  using a proxy set in gnome-network-properties.
- Fixes #491859


PackageKit-0.4.6-fix-http_proxy-uris.patch:

--- NEW FILE PackageKit-0.4.6-fix-http_proxy-uris.patch ---
commit 7af1423a989cac5af9cada6fbc5972f2b769c56b
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Apr 24 15:42:55 2009 +0100

    bugfix: To fix spawned backends, http_proxy has to be a URI not a bare proxy. Fixes RH#491859

diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 2942584..a283e97 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -538,6 +538,33 @@ pk_backend_spawn_stderr_cb (PkBackendSpawn *spawn, const gchar *line, PkBackendS
 }
 
 /**
+ * pk_backend_spawn_convert_uri:
+ *
+ * Our proxy variable is typically 'username:password at server:port'
+ * but http_proxy expects 'http://username:password at server:port/'
+ **/
+static gchar *
+pk_backend_spawn_convert_uri (const gchar *proxy)
+{
+	GString *string;
+	string = g_string_new (proxy);
+
+	/* if we didn't specify a prefix, add a default one */
+	if (!g_str_has_prefix (proxy, "http://") &&
+	    !g_str_has_prefix (proxy, "https://") &&
+	    !g_str_has_prefix (proxy, "ftp://")) {
+		g_string_prepend (string, "http://");
+	}
+
+	/* if we didn't specify a trailing slash, add one */
+	if (!g_str_has_suffix (proxy, "/")) {
+		g_string_append_c (string, '/');
+	}
+
+	return g_string_free (string, FALSE);
+}
+
+/**
  * pk_backend_spawn_get_envp:
  *
  * Return all the environment variables the script will need
@@ -548,6 +575,7 @@ pk_backend_spawn_get_envp (PkBackendSpawn *backend_spawn)
 	gchar **envp;
 	gchar *value;
 	gchar *line;
+	gchar *uri;
 	GPtrArray *array;
 	gboolean ret;
 
@@ -556,18 +584,22 @@ pk_backend_spawn_get_envp (PkBackendSpawn *backend_spawn)
 	/* http_proxy */
 	value = pk_backend_get_proxy_http (backend_spawn->priv->backend);
 	if (!egg_strzero (value)) {
-		line = g_strdup_printf ("%s=%s", "http_proxy", value);
+		uri = pk_backend_spawn_convert_uri (value);
+		line = g_strdup_printf ("%s=%s", "http_proxy", uri);
 		egg_debug ("setting evp '%s'", line);
 		g_ptr_array_add (array, line);
+		g_free (uri);
 	}
 	g_free (value);
 
 	/* ftp_proxy */
 	value = pk_backend_get_proxy_ftp (backend_spawn->priv->backend);
 	if (!egg_strzero (value)) {
-		line = g_strdup_printf ("%s=%s", "ftp_proxy", value);
+		uri = pk_backend_spawn_convert_uri (value);
+		line = g_strdup_printf ("%s=%s", "ftp_proxy", uri);
 		egg_debug ("setting evp '%s'", line);
 		g_ptr_array_add (array, line);
+		g_free (uri);
 	}
 	g_free (value);
 
@@ -897,6 +929,7 @@ pk_backend_test_spawn (EggTest *test)
 	const gchar *text;
 	guint refcount;
 	gboolean ret;
+	gchar *uri;
 
 	loop = g_main_loop_new (NULL, FALSE);
 
@@ -1029,6 +1062,26 @@ pk_backend_test_spawn (EggTest *test)
 	egg_test_assert (test, !ret);
 
 	/************************************************************
+	 **********         Check uri conversion          ***********
+	 ************************************************************/
+	egg_test_title (test, "convert proxy uri (bare)");
+	uri = pk_backend_spawn_convert_uri ("username:password at server:port");
+	egg_test_assert (test, (g_strcmp0 (uri, "http://username:password at server:port/") == 0));
+	g_free (uri);
+
+	/************************************************************/
+	egg_test_title (test, "convert proxy uri (full)");
+	uri = pk_backend_spawn_convert_uri ("http://username:password at server:port/");
+	egg_test_assert (test, (g_strcmp0 (uri, "http://username:password at server:port/") == 0));
+	g_free (uri);
+
+	/************************************************************/
+	egg_test_title (test, "convert proxy uri (partial)");
+	uri = pk_backend_spawn_convert_uri ("ftp://username:password at server:port");
+	egg_test_assert (test, (g_strcmp0 (uri, "ftp://username:password at server:port/") == 0));
+	g_free (uri);
+
+	/************************************************************
 	 **********        Check parsing common out       ***********
 	 ************************************************************/
 	egg_test_title (test, "test pk_backend_spawn_parse_common_out Package");


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- PackageKit.spec	24 Apr 2009 09:18:00 -0000	1.106
+++ PackageKit.spec	24 Apr 2009 14:49:59 -0000	1.107
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   8%{?dist}
+Release:   9%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -57,6 +57,9 @@
 # Already upstream: 5c3396990ea6e973b239a168828c4ad64c58e91b
 Patch12:   PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch
 
+# Already upstream: 7af1423a989cac5af9cada6fbc5972f2b769c56b
+Patch13:   PackageKit-0.4.6-fix-http_proxy-uris.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -268,6 +271,7 @@
 %patch10 -p1 -b .send-package-finished
 %patch11 -p1 -b .disallow-sigkill
 %patch12 -p1 -b .no-plugin-under-pk
+%patch13 -p1 -b .http_proxy
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -462,6 +466,11 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-9
+- Backport a patch from upstream to fix URI escaping of http_proxy when
+  using a proxy set in gnome-network-properties.
+- Fixes #491859
+
 * Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-8
 - Backport a patch from upstream to stop refresh-packagekit from running
   when the script is running under PackageKit. This fixes the bug where



From cebbert at fedoraproject.org  Fri Apr 24 14:50:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 24 Apr 2009 14:50:57 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1529,1.1530
Message-ID: <20090424145057.B0DF070106@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27318

Modified Files:
	kernel.spec 
Log Message:
clean up code that applies optional patches


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1529
retrieving revision 1.1530
diff -u -r1.1529 -r1.1530
--- kernel.spec	22 Apr 2009 20:40:44 -0000	1.1529
+++ kernel.spec	24 Apr 2009 14:50:27 -0000	1.1530
@@ -593,7 +593,6 @@
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch50: rds-only-on-64-bit-or-x86.patch
-Patch51: fix-ppc-debug_kmap_atomic.patch
 
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
@@ -896,6 +895,20 @@
   esac
 }
 
+# don't apply patch if it's empty
+ApplyOptionalPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1
+  fi
+  local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
+  if [ "$C" -gt 9 ]; then
+    ApplyPatch $patch ${1+"$@"}
+  fi
+}
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1035,7 +1048,7 @@
   done
 %endif
 
-#ApplyPatch git-linus.diff
+#ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1047,18 +1060,12 @@
 #
 # misc small stuff to make things compile
 #
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-compile-fixes.patch
-fi
+ApplyOptionalPatch linux-2.6-compile-fixes.patch
 
 %if !%{nopatches}
 
 # revert patches from upstream that conflict or that we get via other means
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-upstream-reverts.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-upstream-reverts.patch -R
-fi
+ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
 #ApplyPatch git-cpufreq.patch
 #ApplyPatch git-bluetooth.patch
@@ -1208,10 +1215,7 @@
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-#if [ "$C" -gt 10 ]; then
-#ApplyPatch linux-2.6-firewire-git-pending.patch
-#fi
+#ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
 
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch



From veillard at fedoraproject.org  Fri Apr 24 14:57:51 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Fri, 24 Apr 2009 14:57:51 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.6.3-svirt-sound.patch, NONE,
	1.1 .cvsignore, 1.39, 1.40 libvirt.spec, 1.124, 1.125 sources,
	1.40, 1.41 libvirt-0.6.2-qemu-drive-format.patch, 1.1,
	NONE libvirt-0.6.2-svirt-sound.patch, 1.1, NONE
Message-ID: <20090424145752.021CD70106@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28775

Modified Files:
	.cvsignore libvirt.spec sources 
Added Files:
	libvirt-0.6.3-svirt-sound.patch 
Removed Files:
	libvirt-0.6.2-qemu-drive-format.patch 
	libvirt-0.6.2-svirt-sound.patch 
Log Message:
Upstream release, 0.6.3, Daniel


libvirt-0.6.3-svirt-sound.patch:

--- NEW FILE libvirt-0.6.3-svirt-sound.patch ---
--- src/qemu_conf.c.orig	2009-04-02 11:50:10.000000000 +0200
+++ src/qemu_conf.c	2009-04-03 17:46:59.000000000 +0200
@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr 
     char domid[50];
     char *pidfile;
     const char *cpu = NULL;
+    int skipSound = 0;
+
+    if (driver->securityDriver &&
+        driver->securityDriver->name &&
+        STREQ(driver->securityDriver->name, "selinux") &&
+        getuid() == 0) {
+        static int soundWarned = 0; 
+        skipSound = 1;
+        if (def->nsounds &&
+            !soundWarned) {
+            soundWarned = 1;
+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
+        }
+    }
 
     uname_normalize(&ut);
 
@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr 
     }
 
     /* Add sound hardware */
-    if (def->nsounds) {
+    if (def->nsounds &&
+        !skipSound) {
         int size = 100;
         char *modstr;
         if (VIR_ALLOC_N(modstr, size+1) < 0)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	3 Apr 2009 15:52:11 -0000	1.39
+++ .cvsignore	24 Apr 2009 14:57:21 -0000	1.40
@@ -6,3 +6,4 @@
 libvirt-0.6.0.tar.gz
 libvirt-0.6.1.tar.gz
 libvirt-0.6.2.tar.gz
+libvirt-0.6.3.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- libvirt.spec	16 Apr 2009 15:25:28 -0000	1.124
+++ libvirt.spec	24 Apr 2009 14:57:21 -0000	1.125
@@ -1,26 +1,14 @@
 # -*- rpm-spec -*-
 
-%define with_xen       0%{!?_without_xen:1}
-%define with_xen_proxy 0%{!?_without_xen_proxy:1}
-%define with_qemu      0%{!?_without_qemu:1}
-%define with_openvz    0%{!?_without_openvz:1}
-%define with_lxc       0%{!?_without_lxc:1}
-%define with_sasl      0%{!?_without_sasl:1}
-%define with_avahi     0%{!?_without_avahi:1}
-%define with_polkit    0%{!?_without_polkit:0}
-%define with_python    0%{!?_without_python:1}
-%define with_libvirtd  0%{!?_without_libvirtd:1}
-%define with_uml       0%{!?_without_uml:1}
-%define with_network   0%{!?_without_network:1}
-
 %define with_xen           0%{!?_without_xen:1}
 %define with_xen_proxy     0%{!?_without_xen_proxy:1}
 %define with_qemu          0%{!?_without_qemu:1}
 %define with_openvz        0%{!?_without_openvz:1}
 %define with_lxc           0%{!?_without_lxc:1}
+%define with_vbox          0%{!?_without_vbox:1}
 %define with_sasl          0%{!?_without_sasl:1}
 %define with_avahi         0%{!?_without_avahi:1}
-%define with_polkit        0%{!?_without_polkit:0}
+%define with_polkit        0%{!?_without_polkit:1}
 %define with_python        0%{!?_without_python:1}
 %define with_libvirtd      0%{!?_without_libvirtd:1}
 %define with_uml           0%{!?_without_uml:1}
@@ -60,23 +48,24 @@
 %define with_rhel5 0
 %else
 %define with_rhel5 1
+%define with_polkit 0
 %endif
 
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.6.2
-Release: 2%{?dist}%{?extra_release}
+Version: 0.6.3
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 
 # Patches cherry-picked from upstream
-Patch0: libvirt-0.6.2-qemu-drive-format.patch
+# N/A
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
-Patch200: libvirt-0.6.2-svirt-sound.patch
+Patch200: libvirt-0.6.3-svirt-sound.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -227,8 +216,6 @@
 %prep
 %setup -q
 
-%patch0 -p1
-
 %patch200 -p0
 
 mv NEWS NEWS.old
@@ -251,6 +238,10 @@
 %define _without_lxc --without-lxc
 %endif
 
+%if ! %{with_vbox}
+%define _without_vbox --without-vbox
+%endif
+
 %if ! %{with_sasl}
 %define _without_sasl --without-sasl
 %endif
@@ -307,6 +298,7 @@
            %{?_without_qemu} \
            %{?_without_openvz} \
            %{?_without_lxc} \
+           %{?_without_vbox} \
            %{?_without_sasl} \
            %{?_without_avahi} \
            %{?_without_polkit} \
@@ -341,7 +333,7 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
 # Default dir for disk images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
-# Default dir for kernel+initrd images defnied in SELinux policy
+# Default dir for kernel+initrd images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
 
 %if %{with_qemu}
@@ -414,8 +406,10 @@
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
-%doc %{_mandir}/man1/virsh.1*
+%{_mandir}/man1/virsh.1*
+%{_mandir}/man1/virt-xml-validate.1*
 %{_bindir}/virsh
+%{_bindir}/virt-xml-validate
 %{_libdir}/lib*.so.*
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
@@ -547,6 +541,12 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-1.fc12
+- release of 0.6.3
+- VirtualBox driver
+- new virt-xml-validate command
+- assorted bug fixes
+
 * Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc12
 - Fix qemu drive format specification (#496092)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	3 Apr 2009 15:52:11 -0000	1.40
+++ sources	24 Apr 2009 14:57:21 -0000	1.41
@@ -1 +1 @@
-3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz
+dd618bf0943a0be853ccc08308c7f427  libvirt-0.6.3.tar.gz


--- libvirt-0.6.2-qemu-drive-format.patch DELETED ---


--- libvirt-0.6.2-svirt-sound.patch DELETED ---



From caolanm at fedoraproject.org  Fri Apr 24 15:08:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 15:08:07 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.219, 1.220 sources, 1.361,
	1.362
Message-ID: <20090424150807.319D170106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30893

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- .cvsignore	17 Apr 2009 14:29:16 -0000	1.219
+++ .cvsignore	24 Apr 2009 15:07:36 -0000	1.220
@@ -9,3 +9,4 @@
 or-IN_DEV300_m40.sdf
 OOO310_m9.tar.bz2
 OOO310_m10.tar.bz2
+OOO310_m11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- sources	23 Apr 2009 08:29:14 -0000	1.361
+++ sources	24 Apr 2009 15:07:36 -0000	1.362
@@ -7,4 +7,4 @@
 f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-7e4822ad083efee8964fb739d2ad2277  OOO310_m10.tar.bz2
+5c2ea75bb826f5d807d74e176b7048ec  OOO310_m11.tar.bz2



From caolanm at fedoraproject.org  Fri Apr 24 15:11:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 15:11:23 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1894, 1.1895 sources,
	1.361, 1.362
Message-ID: <20090424151123.1167F70106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31992/F-11

Modified Files:
	openoffice.org.spec sources 
Log Message:
update


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1894
retrieving revision 1.1895
diff -u -r1.1894 -r1.1895
--- openoffice.org.spec	24 Apr 2009 08:42:52 -0000	1.1894
+++ openoffice.org.spec	24 Apr 2009 15:10:52 -0000	1.1895
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 10
-%define rh_rpm_release 3
+%define ooomilestone 11
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4126,7 +4126,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 23 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+* Fri Apr 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/sources,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- sources	23 Apr 2009 08:29:14 -0000	1.361
+++ sources	24 Apr 2009 15:10:52 -0000	1.362
@@ -7,4 +7,4 @@
 f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-7e4822ad083efee8964fb739d2ad2277  OOO310_m10.tar.bz2
+5c2ea75bb826f5d807d74e176b7048ec  OOO310_m11.tar.bz2



From caolanm at fedoraproject.org  Fri Apr 24 15:11:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 15:11:23 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1895,1.1896
Message-ID: <20090424151123.9F27670106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31992/devel

Modified Files:
	openoffice.org.spec 
Log Message:
update


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1895
retrieving revision 1.1896
diff -u -r1.1895 -r1.1896
--- openoffice.org.spec	24 Apr 2009 08:42:53 -0000	1.1895
+++ openoffice.org.spec	24 Apr 2009 15:10:52 -0000	1.1896
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 10
-%define rh_rpm_release 3
+%define ooomilestone 11
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4126,7 +4126,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 23 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+* Fri Apr 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately



From atkac at fedoraproject.org  Fri Apr 24 15:29:07 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri, 24 Apr 2009 15:29:07 +0000 (UTC)
Subject: rpms/bind/devel bind93-rh490837.patch, NONE, 1.1 bind-96-dyndb.patch,
	1.5, 1.6 bind.spec, 1.311, 1.312
Message-ID: <20090424152907.4655470106@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3670

Modified Files:
	bind-96-dyndb.patch bind.spec 
Added Files:
	bind93-rh490837.patch 
Log Message:
- useradd now takes "-N" instead of "-n" (atkac, #495726)
- print nicer error msg when zone file is actually a directory (atkac, #490837)


bind93-rh490837.patch:

--- NEW FILE bind93-rh490837.patch ---
? patch
? lib/isc/lex.c.rh490837
Index: lib/isc/lex.c
===================================================================
RCS file: /var/snap/bind9/lib/isc/lex.c,v
retrieving revision 1.86
diff -p -u -r1.86 lex.c
--- lib/isc/lex.c	17 Sep 2007 09:56:29 -0000	1.86
+++ lib/isc/lex.c	6 Apr 2009 13:24:15 -0000
@@ -425,17 +425,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigne
 			if (source->is_file) {
 				stream = source->input;
 
-#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
-				c = getc_unlocked(stream);
-#else
-				c = getc(stream);
-#endif
-				if (c == EOF) {
-					if (ferror(stream)) {
-						source->result = ISC_R_IOERROR;
-						result = source->result;
+				result = isc_stdio_fgetc(stream, &c);
+
+				if (result != ISC_R_SUCCESS) {
+					if (result != ISC_R_EOF) {
+						source->result = result;
 						goto done;
 					}
+
 					source->at_eof = ISC_TRUE;
 				}
 			} else {
Index: lib/isc/include/isc/stdio.h
===================================================================
RCS file: /var/snap/bind9/lib/isc/include/isc/stdio.h,v
retrieving revision 1.13
diff -p -u -r1.13 stdio.h
--- lib/isc/include/isc/stdio.h	19 Jun 2007 23:47:18 -0000	1.13
+++ lib/isc/include/isc/stdio.h	6 Apr 2009 13:24:15 -0000
@@ -72,6 +72,9 @@ isc_stdio_sync(FILE *f);
  * direct counterpart in the stdio library.
  */
 
+isc_result_t
+isc_stdio_fgetc(FILE *f, int *ret);
+
 ISC_LANG_ENDDECLS
 
 #endif /* ISC_STDIO_H */
Index: lib/isc/unix/errno2result.c
===================================================================
RCS file: /var/snap/bind9/lib/isc/unix/errno2result.c,v
retrieving revision 1.17
diff -p -u -r1.17 errno2result.c
--- lib/isc/unix/errno2result.c	19 Jun 2007 23:47:18 -0000	1.17
+++ lib/isc/unix/errno2result.c	6 Apr 2009 13:24:15 -0000
@@ -43,6 +43,7 @@ isc__errno2result(int posixerrno) {
 	case EINVAL:		/* XXX sometimes this is not for files */
 	case ENAMETOOLONG:
 	case EBADF:
+	case EISDIR:
 		return (ISC_R_INVALIDFILE);
 	case ENOENT:
 		return (ISC_R_FILENOTFOUND);
Index: lib/isc/unix/stdio.c
===================================================================
RCS file: /var/snap/bind9/lib/isc/unix/stdio.c,v
retrieving revision 1.8
diff -p -u -r1.8 stdio.c
--- lib/isc/unix/stdio.c	19 Jun 2007 23:47:18 -0000	1.8
+++ lib/isc/unix/stdio.c	6 Apr 2009 13:24:15 -0000
@@ -115,3 +115,22 @@ isc_stdio_sync(FILE *f) {
 		return (isc__errno2result(errno));
 }
 
+isc_result_t
+isc_stdio_fgetc(FILE *f, int *ret) {
+	int r;
+	isc_result_t result = ISC_R_SUCCESS;
+
+#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
+	r = fgetc_unlocked(f);
+#else
+	r = fgets(f);
+#endif
+
+	if (r == EOF)
+		result = ferror(f) ? isc__errno2result(errno) : ISC_R_EOF;
+
+	*ret = r;
+
+	return result;
+}
+

bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bind-96-dyndb.patch	22 Apr 2009 15:37:08 -0000	1.5
+++ bind-96-dyndb.patch	24 Apr 2009 15:29:06 -0000	1.6
@@ -1,7 +1,6 @@
-diff --git a/bin/named/main.c b/bin/named/main.c
-index aa6575a..aed2a55 100644
---- a/bin/named/main.c
-+++ b/bin/named/main.c
+diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
+--- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
++++ bind-9.6.1b1/bin/named/main.c	2009-04-24 17:09:55.747902371 +0200
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -19,11 +18,10 @@
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 31b2761..7670f1a 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -56,6 +56,7 @@
+diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
+--- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
++++ bind-9.6.1b1/bin/named/server.c	2009-04-24 17:12:06.467623220 +0200
+@@ -57,6 +57,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -31,7 +29,7 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
  }
  
  static isc_result_t
@@ -104,7 +102,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -112,8 +110,8 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1171,6 +1239,37 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
- #endif
+@@ -1238,6 +1306,37 @@ configure_view(dns_view_t *view, const c
+ 		view->maxncachettl = 7 * 24 * 3600;
  
  	/*
 +	 * Configure dynamic databases.
@@ -150,7 +148,7 @@
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
-@@ -2903,6 +3002,7 @@ load_configuration(const char *filename, ns_server_t *server,
+@@ -2942,6 +3041,7 @@ load_configuration(const char *filename,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
  
@@ -158,7 +156,7 @@
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4140,6 +4240,8 @@ loadconfig(ns_server_t *server) {
+@@ -4185,6 +4285,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -167,34 +165,9 @@
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
-index ef5c12a..0f7abba 100644
---- a/lib/dns/Makefile.in
-+++ b/lib/dns/Makefile.in
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
-new file mode 100644
-index 0000000..de2daf7
---- /dev/null
-+++ b/lib/dns/dynamic_db.c
+diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
+--- /dev/null	2009-04-24 12:29:41.524001256 +0200
++++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-04-24 17:09:55.751902027 +0200
 @@ -0,0 +1,347 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -543,24 +516,9 @@
 +
 +	return args->timermgr;
 +}
-diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
-index e9e049e..27fdc45 100644
---- a/lib/dns/include/dns/Makefile.in
-+++ b/lib/dns/include/dns/Makefile.in
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
-new file mode 100644
-index 0000000..7b1c1ce
---- /dev/null
-+++ b/lib/dns/include/dns/dynamic_db.h
+diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
+--- /dev/null	2009-04-24 12:29:41.524001256 +0200
++++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-04-24 17:09:55.755932610 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -612,11 +570,10 @@
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
-index 5adcedd..e171028 100644
---- a/lib/dns/include/dns/log.h
-+++ b/lib/dns/include/dns/log.h
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
+diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
+--- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-04-24 17:09:55.755932610 +0200
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -624,11 +581,22 @@
  
  ISC_LANG_BEGINDECLS
  
-diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
-index 5223397..f434188 100644
---- a/lib/dns/include/dns/types.h
-+++ b/lib/dns/include/dns/types.h
-@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable_t;
+diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
+--- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-04-24 17:09:55.755932610 +0200
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff -up bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb bind-9.6.1b1/lib/dns/include/dns/types.h
+--- bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb	2009-01-29 23:40:35.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/types.h	2009-04-24 17:09:55.755932610 +0200
+@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
  typedef struct dns_dlzdb			dns_dlzdb_t;
@@ -636,11 +604,10 @@
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff --git a/lib/dns/log.c b/lib/dns/log.c
-index 7551e15..b9864eb 100644
---- a/lib/dns/log.c
-+++ b/lib/dns/log.c
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
+diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
+--- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
++++ bind-9.6.1b1/lib/dns/log.c	2009-04-24 17:09:55.755932610 +0200
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -648,10 +615,31 @@
  	{ NULL, 		0 }
  };
  
-diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 0610489..a1dba32 100644
---- a/lib/isccfg/namedconf.c
-+++ b/lib/isccfg/namedconf.c
+diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
+--- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-04-24 17:09:55.739922815 +0200
++++ bind-9.6.1b1/lib/dns/Makefile.in	2009-04-24 17:09:55.751902027 +0200
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
+--- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
++++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-04-24 17:09:55.755932610 +0200
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -668,7 +656,7 @@
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- bind.spec	22 Apr 2009 15:37:08 -0000	1.311
+++ bind.spec	24 Apr 2009 15:29:06 -0000	1.312
@@ -52,6 +52,7 @@
 Patch99: bind-96-libtool2.patch
 Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
+Patch106:bind93-rh490837.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -216,6 +217,7 @@
 %patch99 -p1 -b .libtool2
 
 %patch102 -p1 -b .rh452060
+%patch106 -p0 -b .rh490837
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -363,7 +365,7 @@
 %pre
 if [ "$1" -eq 1 ]; then
   /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :;
-  /usr/sbin/useradd  -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
+  /usr/sbin/useradd  -u %{bind_uid} -r -N -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
 fi;
 :;
 
@@ -571,9 +573,11 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
-* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
+* Fri Apr 24 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends
 - fix dns_db_unregister()
+- useradd now takes "-N" instead of "-n" (atkac, #495726)
+- print nicer error msg when zone file is actually a directory (atkac, #490837)
 
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
 - 9.6.1b1 release



From atkac at fedoraproject.org  Fri Apr 24 15:30:40 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri, 24 Apr 2009 15:30:40 +0000 (UTC)
Subject: rpms/bind/F-11 bind93-rh490837.patch, NONE, 1.1 bind-96-dyndb.patch,
	1.5, 1.6 bind.spec, 1.311, 1.312
Message-ID: <20090424153040.9A64B70106@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4163

Modified Files:
	bind-96-dyndb.patch bind.spec 
Added Files:
	bind93-rh490837.patch 
Log Message:
- useradd now takes "-N" instead of "-n" (atkac, #495726)
- print nicer error msg when zone file is actually a directory (atkac, #490837)


bind93-rh490837.patch:

--- NEW FILE bind93-rh490837.patch ---
? patch
? lib/isc/lex.c.rh490837
Index: lib/isc/lex.c
===================================================================
RCS file: /var/snap/bind9/lib/isc/lex.c,v
retrieving revision 1.86
diff -p -u -r1.86 lex.c
--- lib/isc/lex.c	17 Sep 2007 09:56:29 -0000	1.86
+++ lib/isc/lex.c	6 Apr 2009 13:24:15 -0000
@@ -425,17 +425,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigne
 			if (source->is_file) {
 				stream = source->input;
 
-#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
-				c = getc_unlocked(stream);
-#else
-				c = getc(stream);
-#endif
-				if (c == EOF) {
-					if (ferror(stream)) {
-						source->result = ISC_R_IOERROR;
-						result = source->result;
+				result = isc_stdio_fgetc(stream, &c);
+
+				if (result != ISC_R_SUCCESS) {
+					if (result != ISC_R_EOF) {
+						source->result = result;
 						goto done;
 					}
+
 					source->at_eof = ISC_TRUE;
 				}
 			} else {
Index: lib/isc/include/isc/stdio.h
===================================================================
RCS file: /var/snap/bind9/lib/isc/include/isc/stdio.h,v
retrieving revision 1.13
diff -p -u -r1.13 stdio.h
--- lib/isc/include/isc/stdio.h	19 Jun 2007 23:47:18 -0000	1.13
+++ lib/isc/include/isc/stdio.h	6 Apr 2009 13:24:15 -0000
@@ -72,6 +72,9 @@ isc_stdio_sync(FILE *f);
  * direct counterpart in the stdio library.
  */
 
+isc_result_t
+isc_stdio_fgetc(FILE *f, int *ret);
+
 ISC_LANG_ENDDECLS
 
 #endif /* ISC_STDIO_H */
Index: lib/isc/unix/errno2result.c
===================================================================
RCS file: /var/snap/bind9/lib/isc/unix/errno2result.c,v
retrieving revision 1.17
diff -p -u -r1.17 errno2result.c
--- lib/isc/unix/errno2result.c	19 Jun 2007 23:47:18 -0000	1.17
+++ lib/isc/unix/errno2result.c	6 Apr 2009 13:24:15 -0000
@@ -43,6 +43,7 @@ isc__errno2result(int posixerrno) {
 	case EINVAL:		/* XXX sometimes this is not for files */
 	case ENAMETOOLONG:
 	case EBADF:
+	case EISDIR:
 		return (ISC_R_INVALIDFILE);
 	case ENOENT:
 		return (ISC_R_FILENOTFOUND);
Index: lib/isc/unix/stdio.c
===================================================================
RCS file: /var/snap/bind9/lib/isc/unix/stdio.c,v
retrieving revision 1.8
diff -p -u -r1.8 stdio.c
--- lib/isc/unix/stdio.c	19 Jun 2007 23:47:18 -0000	1.8
+++ lib/isc/unix/stdio.c	6 Apr 2009 13:24:15 -0000
@@ -115,3 +115,22 @@ isc_stdio_sync(FILE *f) {
 		return (isc__errno2result(errno));
 }
 
+isc_result_t
+isc_stdio_fgetc(FILE *f, int *ret) {
+	int r;
+	isc_result_t result = ISC_R_SUCCESS;
+
+#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
+	r = fgetc_unlocked(f);
+#else
+	r = fgets(f);
+#endif
+
+	if (r == EOF)
+		result = ferror(f) ? isc__errno2result(errno) : ISC_R_EOF;
+
+	*ret = r;
+
+	return result;
+}
+

bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind-96-dyndb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bind-96-dyndb.patch	22 Apr 2009 15:30:04 -0000	1.5
+++ bind-96-dyndb.patch	24 Apr 2009 15:30:40 -0000	1.6
@@ -1,7 +1,6 @@
-diff --git a/bin/named/main.c b/bin/named/main.c
-index aa6575a..aed2a55 100644
---- a/bin/named/main.c
-+++ b/bin/named/main.c
+diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
+--- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
++++ bind-9.6.1b1/bin/named/main.c	2009-04-24 17:09:55.747902371 +0200
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -19,11 +18,10 @@
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 31b2761..7670f1a 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -56,6 +56,7 @@
+diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
+--- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
++++ bind-9.6.1b1/bin/named/server.c	2009-04-24 17:12:06.467623220 +0200
+@@ -57,6 +57,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -31,7 +29,7 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
  }
  
  static isc_result_t
@@ -104,7 +102,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -112,8 +110,8 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1171,6 +1239,37 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
- #endif
+@@ -1238,6 +1306,37 @@ configure_view(dns_view_t *view, const c
+ 		view->maxncachettl = 7 * 24 * 3600;
  
  	/*
 +	 * Configure dynamic databases.
@@ -150,7 +148,7 @@
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
-@@ -2903,6 +3002,7 @@ load_configuration(const char *filename, ns_server_t *server,
+@@ -2942,6 +3041,7 @@ load_configuration(const char *filename,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
  
@@ -158,7 +156,7 @@
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4140,6 +4240,8 @@ loadconfig(ns_server_t *server) {
+@@ -4185,6 +4285,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -167,34 +165,9 @@
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
-index ef5c12a..0f7abba 100644
---- a/lib/dns/Makefile.in
-+++ b/lib/dns/Makefile.in
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
-new file mode 100644
-index 0000000..de2daf7
---- /dev/null
-+++ b/lib/dns/dynamic_db.c
+diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
+--- /dev/null	2009-04-24 12:29:41.524001256 +0200
++++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-04-24 17:09:55.751902027 +0200
 @@ -0,0 +1,347 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -543,24 +516,9 @@
 +
 +	return args->timermgr;
 +}
-diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
-index e9e049e..27fdc45 100644
---- a/lib/dns/include/dns/Makefile.in
-+++ b/lib/dns/include/dns/Makefile.in
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
-new file mode 100644
-index 0000000..7b1c1ce
---- /dev/null
-+++ b/lib/dns/include/dns/dynamic_db.h
+diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
+--- /dev/null	2009-04-24 12:29:41.524001256 +0200
++++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-04-24 17:09:55.755932610 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -612,11 +570,10 @@
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
-index 5adcedd..e171028 100644
---- a/lib/dns/include/dns/log.h
-+++ b/lib/dns/include/dns/log.h
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
+diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
+--- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-04-24 17:09:55.755932610 +0200
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -624,11 +581,22 @@
  
  ISC_LANG_BEGINDECLS
  
-diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
-index 5223397..f434188 100644
---- a/lib/dns/include/dns/types.h
-+++ b/lib/dns/include/dns/types.h
-@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable_t;
+diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
+--- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-04-24 17:09:55.755932610 +0200
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff -up bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb bind-9.6.1b1/lib/dns/include/dns/types.h
+--- bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb	2009-01-29 23:40:35.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/types.h	2009-04-24 17:09:55.755932610 +0200
+@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
  typedef struct dns_dlzdb			dns_dlzdb_t;
@@ -636,11 +604,10 @@
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff --git a/lib/dns/log.c b/lib/dns/log.c
-index 7551e15..b9864eb 100644
---- a/lib/dns/log.c
-+++ b/lib/dns/log.c
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
+diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
+--- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
++++ bind-9.6.1b1/lib/dns/log.c	2009-04-24 17:09:55.755932610 +0200
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -648,10 +615,31 @@
  	{ NULL, 		0 }
  };
  
-diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 0610489..a1dba32 100644
---- a/lib/isccfg/namedconf.c
-+++ b/lib/isccfg/namedconf.c
+diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
+--- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-04-24 17:09:55.739922815 +0200
++++ bind-9.6.1b1/lib/dns/Makefile.in	2009-04-24 17:09:55.751902027 +0200
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
+--- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
++++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-04-24 17:09:55.755932610 +0200
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -668,7 +656,7 @@
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- bind.spec	22 Apr 2009 15:30:04 -0000	1.311
+++ bind.spec	24 Apr 2009 15:30:40 -0000	1.312
@@ -52,6 +52,7 @@
 Patch99: bind-96-libtool2.patch
 Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
+Patch106:bind93-rh490837.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -216,6 +217,7 @@
 %patch99 -p1 -b .libtool2
 
 %patch102 -p1 -b .rh452060
+%patch106 -p0 -b .rh490837
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -363,7 +365,7 @@
 %pre
 if [ "$1" -eq 1 ]; then
   /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :;
-  /usr/sbin/useradd  -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
+  /usr/sbin/useradd  -u %{bind_uid} -r -N -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
 fi;
 :;
 
@@ -571,9 +573,11 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
-* Wed Apr 22 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
+* Fri Apr 24 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends
 - fix dns_db_unregister()
+- useradd now takes "-N" instead of "-n" (atkac, #495726)
+- print nicer error msg when zone file is actually a directory (atkac, #490837)
 
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
 - 9.6.1b1 release



From caolanm at fedoraproject.org  Fri Apr 24 15:32:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 15:32:26 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1896,1.1897
Message-ID: <20090424153226.7044670106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4541/devel

Modified Files:
	openoffice.org.spec 
Log Message:
fix up


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1896
retrieving revision 1.1897
diff -u -r1.1896 -r1.1897
--- openoffice.org.spec	24 Apr 2009 15:10:52 -0000	1.1896
+++ openoffice.org.spec	24 Apr 2009 15:32:23 -0000	1.1897
@@ -1605,7 +1605,7 @@
 %patch35 -p1 -b .workspace.sb109.patch
 %patch36 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch38 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch38 -p0 -b .ooo98137.filter.redeclared-variables.patch
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch



From caolanm at fedoraproject.org  Fri Apr 24 15:32:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 15:32:53 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1895,1.1896
Message-ID: <20090424153253.A8E1070106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4541/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
fix up


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1895
retrieving revision 1.1896
diff -u -r1.1895 -r1.1896
--- openoffice.org.spec	24 Apr 2009 15:10:52 -0000	1.1895
+++ openoffice.org.spec	24 Apr 2009 15:32:22 -0000	1.1896
@@ -1605,7 +1605,7 @@
 %patch35 -p1 -b .workspace.sb109.patch
 %patch36 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch38 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch38 -p0 -b .ooo98137.filter.redeclared-variables.patch
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch



From rstrode at fedoraproject.org  Fri Apr 24 15:36:18 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 24 Apr 2009 15:36:18 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.464,1.465
Message-ID: <20090424153618.98EF770106@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5787

Modified Files:
	gdm.spec 
Log Message:
- Add Requires for pam modules in plugins



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- gdm.spec	21 Apr 2009 20:42:41 -0000	1.464
+++ gdm.spec	24 Apr 2009 15:35:47 -0000	1.465
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -112,11 +112,13 @@
 Summary:   GDM smartcard plugin
 Group:     User Interface/Desktops
 Requires:  gdm = %{epoch}:%{version}-%{release}
+Requires:  pam_pkcs11
 
 %package plugin-fingerprint
 Summary:   GDM fingerprint plugin
 Group:     User Interface/Desktops
 Requires:  gdm = %{epoch}:%{version}-%{release}
+Requires:  fprintd-pam
 
 %description
 GDM provides the graphical login screen, shown shortly after boot up,
@@ -380,6 +382,9 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Apr 24 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-3
+- Add Requires for pam modules in plugins
+
 * Tue Apr 21 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-2
 - Stop inactive pam conversations when one succeeds.
   Should fix bug 496234



From sandeen at fedoraproject.org  Fri Apr 24 15:42:07 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 24 Apr 2009 15:42:07 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-etcblkid.patch, 1.3,
	1.4 e2fsprogs-1.40.4-sb_feature_check_ignore.patch, 1.3,
	1.4 e2fsprogs.spec, 1.134,
	1.135 e2fsprogs-1.41.4-debugfs-stat-segfault.patch, 1.1,
	NONE e2fsprogs-1.41.4-ext4-resize-fixes.patch, 1.1,
	NONE e2fsprogs-1.41.4-fix-blkid-segfault.patch, 1.1,
	NONE e2fsprogs-1.41.4-fix-external-journals.patch, 1.1,
	NONE e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch, 1.1,
	NONE e2fsprogs-1.41.4-libext2fs-info.patch, 1.1, NONE
Message-ID: <20090424154207.E652B70106@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8457

Modified Files:
	e2fsprogs-1.38-etcblkid.patch 
	e2fsprogs-1.40.4-sb_feature_check_ignore.patch e2fsprogs.spec 
Removed Files:
	e2fsprogs-1.41.4-debugfs-stat-segfault.patch 
	e2fsprogs-1.41.4-ext4-resize-fixes.patch 
	e2fsprogs-1.41.4-fix-blkid-segfault.patch 
	e2fsprogs-1.41.4-fix-external-journals.patch 
	e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch 
	e2fsprogs-1.41.4-libext2fs-info.patch 
Log Message:
* Fri Apr 24 2009 Eric Sandeen <sandeen at redhat.com> 1.41.5-1
- New upstream version


e2fsprogs-1.38-etcblkid.patch:

Index: e2fsprogs-1.38-etcblkid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-1.38-etcblkid.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- e2fsprogs-1.38-etcblkid.patch	2 Oct 2008 19:19:50 -0000	1.3
+++ e2fsprogs-1.38-etcblkid.patch	24 Apr 2009 15:41:36 -0000	1.4
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.41.1/doc/libblkid.txt
+Index: e2fsprogs-1.41.5/doc/libblkid.txt
 ===================================================================
---- e2fsprogs-1.41.1.orig/doc/libblkid.txt	2007-06-30 07:58:34.000000000 -0500
-+++ e2fsprogs-1.41.1/doc/libblkid.txt	2008-10-01 13:20:34.303063944 -0500
+--- e2fsprogs-1.41.5.orig/doc/libblkid.txt
++++ e2fsprogs-1.41.5/doc/libblkid.txt
 @@ -58,7 +58,7 @@ type, or label, or uuid for a particular
  	}
  
@@ -20,10 +20,10 @@
  
  If you have called blkid_get_cache(), you should call blkid_put_cache()
  when you are done using the blkid library functions.  This will save the
-Index: e2fsprogs-1.41.1/misc/blkid.8.in
+Index: e2fsprogs-1.41.5/misc/blkid.8.in
 ===================================================================
---- e2fsprogs-1.41.1.orig/misc/blkid.8.in	2008-08-24 23:19:56.000000000 -0500
-+++ e2fsprogs-1.41.1/misc/blkid.8.in	2008-10-01 13:20:34.303063944 -0500
+--- e2fsprogs-1.41.5.orig/misc/blkid.8.in
++++ e2fsprogs-1.41.5/misc/blkid.8.in
 @@ -55,7 +55,7 @@ more devices.
  Read from
  .I cachefile
@@ -42,10 +42,10 @@
  If you don't want to save the cache to the default file, specify
  .IR /dev/null.
  If not specified it will be the same file as that given by the
-Index: e2fsprogs-1.41.1/misc/blkid.c
+Index: e2fsprogs-1.41.5/misc/blkid.c
 ===================================================================
---- e2fsprogs-1.41.1.orig/misc/blkid.c	2008-08-28 09:26:31.000000000 -0500
-+++ e2fsprogs-1.41.1/misc/blkid.c	2008-10-01 13:20:54.787002093 -0500
+--- e2fsprogs-1.41.5.orig/misc/blkid.c
++++ e2fsprogs-1.41.5/misc/blkid.c
 @@ -52,7 +52,7 @@ static void usage(int error)
  	fprintf(out,
  		"usage:\t%s [-c <file>] [-ghlLv] [-o format] "
@@ -55,10 +55,10 @@
  		"\t-h\tprint this usage message and exit\n"
  		"\t-g\tgarbage collect the blkid cache\n"
  		"\t-s\tshow specified tag(s) (default show all tags)\n"
-Index: e2fsprogs-1.41.1/lib/blkid/Makefile.in
+Index: e2fsprogs-1.41.5/lib/blkid/Makefile.in
 ===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/Makefile.in	2008-08-28 09:26:31.000000000 -0500
-+++ e2fsprogs-1.41.1/lib/blkid/Makefile.in	2008-10-01 13:20:34.338002746 -0500
+--- e2fsprogs-1.41.5.orig/lib/blkid/Makefile.in
++++ e2fsprogs-1.41.5/lib/blkid/Makefile.in
 @@ -142,9 +142,10 @@ blkid.pc: $(srcdir)/blkid.pc.in $(top_bu
  	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
  
@@ -80,10 +80,10 @@
  	for i in $(SMANPAGES); do \
  		$(RM) -f $(DESTDIR)$(man3dir)/$$i; \
  	done
-Index: e2fsprogs-1.41.1/lib/blkid/libblkid.3.in
+Index: e2fsprogs-1.41.5/lib/blkid/libblkid.3.in
 ===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/libblkid.3.in	2008-08-24 23:19:56.000000000 -0500
-+++ e2fsprogs-1.41.1/lib/blkid/libblkid.3.in	2008-10-01 13:21:23.992001339 -0500
+--- e2fsprogs-1.41.5.orig/lib/blkid/libblkid.3.in
++++ e2fsprogs-1.41.5/lib/blkid/libblkid.3.in
 @@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
  specific block device names into configuration files.
  .P
@@ -102,10 +102,10 @@
  Caches data extracted from each recognized block device.
  .SH AVAILABILITY
  .B libblkid
-Index: e2fsprogs-1.41.1/lib/blkid/blkidP.h
+Index: e2fsprogs-1.41.5/lib/blkid/blkidP.h
 ===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/blkidP.h	2008-08-28 09:26:31.000000000 -0500
-+++ e2fsprogs-1.41.1/lib/blkid/blkidP.h	2008-10-01 13:21:39.192001091 -0500
+--- e2fsprogs-1.41.5.orig/lib/blkid/blkidP.h
++++ e2fsprogs-1.41.5/lib/blkid/blkidP.h
 @@ -104,7 +104,7 @@ struct blkid_struct_cache
  extern char *blkid_strdup(const char *s);
  extern char *blkid_strndup(const char *s, const int length);
@@ -115,11 +115,11 @@
  
  #define BLKID_ERR_IO	 5
  #define BLKID_ERR_PROC	 9
-Index: e2fsprogs-1.41.1/RELEASE-NOTES
+Index: e2fsprogs-1.41.5/RELEASE-NOTES
 ===================================================================
---- e2fsprogs-1.41.1.orig/RELEASE-NOTES	2008-09-01 15:01:14.000000000 -0500
-+++ e2fsprogs-1.41.1/RELEASE-NOTES	2008-10-01 13:20:34.383001892 -0500
-@@ -2460,7 +2460,7 @@ label.
+--- e2fsprogs-1.41.5.orig/RELEASE-NOTES
++++ e2fsprogs-1.41.5/RELEASE-NOTES
+@@ -2829,7 +2829,7 @@ label.
  
  Fixed a bug in the blkid library wihch could avoid an infinite loop
  in blkid_find_dev_with_tag() if /proc is not mounted and there the

e2fsprogs-1.40.4-sb_feature_check_ignore.patch:

Index: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-1.40.4-sb_feature_check_ignore.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- e2fsprogs-1.40.4-sb_feature_check_ignore.patch	30 Jan 2008 04:11:16 -0000	1.3
+++ e2fsprogs-1.40.4-sb_feature_check_ignore.patch	24 Apr 2009 15:41:36 -0000	1.4
@@ -1,8 +1,8 @@
-Index: e2fsprogs-1.40.5/e2fsck/super.c
+Index: e2fsprogs-1.41.5/e2fsck/super.c
 ===================================================================
---- e2fsprogs-1.40.5.orig/e2fsck/super.c
-+++ e2fsprogs-1.40.5/e2fsck/super.c
-@@ -793,7 +793,11 @@ void check_super_block(e2fsck_t ctx)
+--- e2fsprogs-1.41.5.orig/e2fsck/super.c
++++ e2fsprogs-1.41.5/e2fsck/super.c
+@@ -869,7 +869,11 @@ void check_super_block(e2fsck_t ctx)
   * unfortunately, we shouldn't ignore it since if it's not set in the
   * backup, the extended attributes in the filesystem will be stripped
   * away.
@@ -13,20 +13,20 @@
 +#define FEATURE_COMPAT_IGNORE          (EXT2_FEATURE_COMPAT_EXT_ATTR)
  #define FEATURE_RO_COMPAT_IGNORE	(EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
  					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
- #define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS)
-@@ -837,6 +841,9 @@ int check_backup_super_block(e2fsck_t ct
+ #define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS| \
+@@ -921,6 +925,9 @@ int check_backup_super_block(e2fsck_t ct
+ 		    (EXT2_INODE_SIZE(backup_sb) < EXT2_GOOD_OLD_INODE_SIZE))
  			continue;
- 		}
  
 +#define SUPER_COMPAT_DIFFERENT(x)	\
-+	(( fs->super->x & ~FEATURE_COMPAT_IGNORE) !=	\
-+	 (tfs->super->x & ~FEATURE_COMPAT_IGNORE))
++	((fs->super->x & ~FEATURE_COMPAT_IGNORE) !=	\
++	 (backup_sb->x & ~FEATURE_COMPAT_IGNORE))
  #define SUPER_INCOMPAT_DIFFERENT(x)	\
- 	(( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
- 	 (tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
-@@ -846,7 +853,7 @@ int check_backup_super_block(e2fsck_t ct
+ 	((fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
+ 	 (backup_sb->x & ~FEATURE_INCOMPAT_IGNORE))
+@@ -930,7 +937,7 @@ int check_backup_super_block(e2fsck_t ct
  #define SUPER_DIFFERENT(x)		\
- 	(fs->super->x != tfs->super->x)
+ 	(fs->super->x != backup_sb->x)
  
 -		if (SUPER_DIFFERENT(s_feature_compat) ||
 +		if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- e2fsprogs.spec	22 Apr 2009 16:45:47 -0000	1.134
+++ e2fsprogs.spec	24 Apr 2009 15:41:36 -0000	1.135
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
-Version: 1.41.4
-Release: 8%{?dist}
+Version: 1.41.5
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -15,12 +15,6 @@
 Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
-Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
-Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
-Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
-Patch7: e2fsprogs-1.41.4-ext4-resize-fixes.patch 
-Patch8: e2fsprogs-1.41.4-fix-external-journals.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,18 +92,6 @@
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# Fix segfault in debugfs "stat" if fs not open
-%patch3 -p1 -b .statfs
-# Fix up name of info file
-%patch4 -p1 -b .info
-# Fix blkid segfault in modules.dep scanning
-%patch5 -p1 -b .info
-# Ignore NEEDS_RECOVERY mismatch
-%patch6 -p1 -b .recovery
-# Fix ext4 resize issues
-%patch7 -p1 -b .resize
-# Fix external journals
-%patch8 -p1 -b .ext-journal
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -308,6 +290,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Fri Apr 24 2009 Eric Sandeen <sandeen at redhat.com> 1.41.5-1
+- New upstream version
+
 * Wed Apr 22 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-8
 - Fix support for external journals
 


--- e2fsprogs-1.41.4-debugfs-stat-segfault.patch DELETED ---


--- e2fsprogs-1.41.4-ext4-resize-fixes.patch DELETED ---


--- e2fsprogs-1.41.4-fix-blkid-segfault.patch DELETED ---


--- e2fsprogs-1.41.4-fix-external-journals.patch DELETED ---


--- e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch DELETED ---


--- e2fsprogs-1.41.4-libext2fs-info.patch DELETED ---



From sandeen at fedoraproject.org  Fri Apr 24 15:43:41 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 24 Apr 2009 15:43:41 +0000 (UTC)
Subject: rpms/e2fsprogs/devel .cvsignore,1.29,1.30 sources,1.29,1.30
Message-ID: <20090424154341.5BFE270106@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8939

Modified Files:
	.cvsignore sources 
Log Message:
And the ritual forgetting-of-the-new-tarball... add it.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	29 Jan 2009 22:20:37 -0000	1.29
+++ .cvsignore	24 Apr 2009 15:43:11 -0000	1.30
@@ -1 +1 @@
-e2fsprogs-1.41.4.tar.gz
+e2fsprogs-1.41.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	29 Jan 2009 22:20:37 -0000	1.29
+++ sources	24 Apr 2009 15:43:11 -0000	1.30
@@ -1 +1 @@
-59033388df36987d2b9c9bbf7e19bd57  e2fsprogs-1.41.4.tar.gz
+e218df6c84fc17c1126d31de9472a76c  e2fsprogs-1.41.5.tar.gz



From pghmcfc at fedoraproject.org  Fri Apr 24 16:01:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 24 Apr 2009 16:01:55 +0000 (UTC)
Subject: rpms/spamass-milter/F-11 spamass-milter-0.3.1-authuser.patch, NONE, 
	1.1 spamass-milter-0.3.1-bits.patch, NONE,
	1.1 spamass-milter-0.3.1-rcvd.patch, NONE,
	1.1 spamass-milter.spec, 1.19, 1.20
Message-ID: <20090424160155.2832E70106@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/spamass-milter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12882/F-11

Modified Files:
	spamass-milter.spec 
Added Files:
	spamass-milter-0.3.1-authuser.patch 
	spamass-milter-0.3.1-bits.patch 
	spamass-milter-0.3.1-rcvd.patch 
Log Message:
* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
- Fix Received-header generation (#496763)
- Add authentication info to dummy Received-header (#496769)
- Add option to skip checks for authenticated senders (#437506, #496767)
  (thanks to Habeeb J. Dihu for the reports and patches)


spamass-milter-0.3.1-authuser.patch:

--- NEW FILE spamass-milter-0.3.1-authuser.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.ori	2009-04-20 21:11:55.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 21:14:20.000000000 -0500
@@ -172,6 +172,7 @@
 bool flag_full_email = false;		/* pass full email address to spamc */
 bool flag_expand = false;	/* alias/virtusertable expansion */
 bool warnedmacro = false;	/* have we logged that we couldn't fetch a macro? */
+bool ignore_authenticated_senders = false;	/* authenticated users bypass spam checks */
 
 #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
 static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -183,7 +184,7 @@
 main(int argc, char* argv[])
 {
    int c, err = 0;
-   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xg:";
+   const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:xg:";
    char *sock = NULL;
    char *group = NULL;
    bool dofork = false;
@@ -216,6 +217,10 @@
 				debug(D_MISC, "Parsing ignore list");
 				parse_networklist(optarg, &ignorenets);
 				break;
+			case 'I':
+				debug(D_MISC, "Ignore authenticated senders");
+				ignore_authenticated_senders = true;
+				break;
 			case 'm':
 				dontmodifyspam = true;
 				smfilter.xxfi_flags &= ~SMFIF_CHGBODY;
@@ -286,7 +291,7 @@
       cout << PACKAGE_NAME << " - Version " << PACKAGE_VERSION << endl;
       cout << "SpamAssassin Sendmail Milter Plugin" << endl;
       cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl;
-      cout << "                      [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl;
+      cout << "                      [-e defaultdomain] [-f] [-i networks] [-I] [-m] [-M]" << endl;
       cout << "                      [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl;
       cout << "                      [-- spamc args ]" << endl;
       cout << "   -p socket: path to create socket" << endl;
@@ -301,6 +306,7 @@
       cout << "   -f: fork into background" << endl;
       cout << "   -i: skip (ignore) checks from these IPs or netblocks" << endl;
       cout << "          example: -i 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0" << endl;
+      cout << "   -I: skip (ignore) checks if sender is authenticated" << endl;
       cout << "   -m: don't modify body, Content-type: or Subject:" << endl;
       cout << "   -M: don't modify the message at all" << endl;
       cout << "   -P pidfile: Put processid in pidfile" << endl;
@@ -812,6 +818,22 @@
   }
   /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */
 
+  if (ignore_authenticated_senders)
+  {
+    char *auth_authen;
+
+    auth_authen = smfi_getsymval(ctx, "{auth_authen}");
+    debug(D_MISC, "auth_authen=%s", auth_authen ?: "<unauthenticated>");
+
+    if (auth_authen)
+    {
+      debug(D_MISC, "sender authenticated (%s) - accepting message",
+	    auth_authen);
+      debug(D_FUNC, "mlfi_envfrom: exit ignore");
+      return SMFIS_ACCEPT;
+    }
+  }
+
   debug(D_FUNC, "mlfi_envfrom: enter");
   try {
     // launch new SpamAssassin

--- spamass-milter-0.3.1/spamass-milter.1.in.ori	2009-04-20 21:11:55.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.1.in	2009-04-20 21:17:36.000000000 -0500
@@ -15,6 +15,7 @@
 .Op Fl f
 .Op Fl g Ar group
 .Op Fl i Ar networks
+.Op Fl I
 .Op Fl m
 .Op Fl M
 .Op Fl P Ar pidfile
@@ -126,6 +127,8 @@
 flags will append to the list.
 For example, if you list all your internal networks, no outgoing emails
 will be filtered.
+.It Fl I
+Ignores messages if the sender has authenticated via SMTP AUTH.
 .It Fl m
 Disables modification of the 
 .Ql Subject: 

spamass-milter-0.3.1-bits.patch:

--- NEW FILE spamass-milter-0.3.1-bits.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.orig	2009-04-20 21:29:57.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 22:07:51.000000000 -0500
@@ -975,7 +975,9 @@
 		   
 		*/
 		const char *macro_b, *macro_i, *macro_j, *macro_r,
-		           *macro_s, *macro_v, *macro_Z, *macro__;
+		           *macro_s, *macro_v, *macro_Z, *macro__,
+			   *macro_auth_ssf, *macro_auth_authen, *macro_auth_author,
+			   *macro_auth_type;
 		char date[32];
 
 		/* RFC 822 date. */
@@ -1013,6 +1015,36 @@
 			warnmacro("r", "ENVRCPT");
 		}
 			
+		/* Authenticated bits Information */
+		macro_auth_ssf = smfi_getsymval(ctx, "{auth_ssf}");
+		if (!macro_auth_ssf)
+		{
+			macro_auth_ssf = "";
+			warnmacro("auth_ssf", "ENVRCPT");
+		}
+			
+		macro_auth_authen = smfi_getsymval(ctx, "{auth_authen}");
+		if (!macro_auth_authen)
+		{
+			macro_auth_authen = "";
+			warnmacro("auth_authen", "ENVRCPT");
+		}
+			
+		macro_auth_author = smfi_getsymval(ctx, "{auth_author}");
+		if (!macro_auth_author)
+		{
+			macro_auth_author = "";
+			warnmacro("auth_author", "ENVRCPT");
+		}
+			
+		macro_auth_type = smfi_getsymval(ctx, "{auth_type}");
+		if (!macro_auth_type)
+		{
+			macro_auth_type = "";
+			warnmacro("auth_type", "ENVRCPT");
+		}
+			
+			
 		/* Sendmail currently cannot pass us the {s} macro, but
 		   I do not know why.  Leave this in for the day sendmail is
 		   fixed.  Until that day, use the value remembered by
@@ -1051,11 +1083,21 @@
 		assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n");
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
 
-		assassin->output((string)
-			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
-			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
-			macro_b+"\r\n\t"+
-			"(envelope-from "+assassin->from()+")\r\n");
+		string rec_header;
+
+		rec_header = (string) "Received: from " + macro_s + " (" + macro__ + ")\r\n\t";
+
+		if (strlen(macro_auth_ssf)) {
+			rec_header += (string) "(authenticated bits=" + macro_auth_ssf + ")\r\n\t";
+		}
+
+		rec_header += (string) "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " +
+			macro_r + " id " + macro_i + "\r\n\t" +
+			macro_b + "\r\n\t" +
+			"(envelope-from " + assassin->from() + ")\r\n";
+
+		debug(D_SPAMC, "Received header for spamc: %s", rec_header.c_str());
+		assassin->output(rec_header);
 
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");

spamass-milter-0.3.1-rcvd.patch:

--- NEW FILE spamass-milter-0.3.1-rcvd.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.ori	2006-03-23 15:41:36.000000000 -0600
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 20:03:31.000000000 -0500
@@ -1002,9 +1002,9 @@
 
 		assassin->output((string)
 			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
-			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
+			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
 			macro_b+"\r\n\t"+
-			"(envelope-from "+assassin->from()+"\r\n");
+			"(envelope-from "+assassin->from()+")\r\n");
 
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");


Index: spamass-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/F-11/spamass-milter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- spamass-milter.spec	18 Mar 2009 16:11:19 -0000	1.19
+++ spamass-milter.spec	24 Apr 2009 16:01:24 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -13,6 +13,9 @@
 Patch0:		spamass-milter-0.3.1-pathnames.patch
 Patch1:		spamass-milter-0.3.1-macros.patch
 Patch2:		spamass-milter-0.3.1-group.patch
+Patch3:		spamass-milter-0.3.1-rcvd.patch
+Patch4:		spamass-milter-0.3.1-bits.patch
+Patch5:		spamass-milter-0.3.1-authuser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	spamassassin, sendmail-devel
 Requires:	spamassassin, /usr/sbin/sendmail
@@ -46,6 +49,9 @@
 %patch0 -p1 -b .pathnames
 %patch1 -p1 -b .macros
 %patch2 -p1 -b .group
+%patch3 -p1 -b .rcvd
+%patch4 -p1 -b .bits
+%patch5 -p1 -b .authuser
 %{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 %{__sed} -i -e 's|%%{_localstatedir}|%{_localstatedir}|g;
 		s|%%{_initrddir}|%{_initrddir}|g;
@@ -117,6 +123,12 @@
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
+- Fix Received-header generation (#496763)
+- Add authentication info to dummy Received-header (#496769)
+- Add option to skip checks for authenticated senders (#437506, #496767)
+  (thanks to Habeeb J. Dihu for the reports and patches)
+
 * Wed Mar 18 2009 Paul Howarth <paul at city-fan.org> 0.3.1-13
 - Call initscripts directly instead of via /sbin/service and fine-tune scriptlet
   dependencies



From pghmcfc at fedoraproject.org  Fri Apr 24 16:01:54 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 24 Apr 2009 16:01:54 +0000 (UTC)
Subject: rpms/spamass-milter/F-10 spamass-milter-0.3.1-authuser.patch, NONE, 
	1.1 spamass-milter-0.3.1-bits.patch, NONE,
	1.1 spamass-milter-0.3.1-rcvd.patch, NONE,
	1.1 spamass-milter.spec, 1.16, 1.17
Message-ID: <20090424160154.E2A2E70106@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/spamass-milter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12882/F-10

Modified Files:
	spamass-milter.spec 
Added Files:
	spamass-milter-0.3.1-authuser.patch 
	spamass-milter-0.3.1-bits.patch 
	spamass-milter-0.3.1-rcvd.patch 
Log Message:
* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
- Fix Received-header generation (#496763)
- Add authentication info to dummy Received-header (#496769)
- Add option to skip checks for authenticated senders (#437506, #496767)
  (thanks to Habeeb J. Dihu for the reports and patches)


spamass-milter-0.3.1-authuser.patch:

--- NEW FILE spamass-milter-0.3.1-authuser.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.ori	2009-04-20 21:11:55.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 21:14:20.000000000 -0500
@@ -172,6 +172,7 @@
 bool flag_full_email = false;		/* pass full email address to spamc */
 bool flag_expand = false;	/* alias/virtusertable expansion */
 bool warnedmacro = false;	/* have we logged that we couldn't fetch a macro? */
+bool ignore_authenticated_senders = false;	/* authenticated users bypass spam checks */
 
 #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
 static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -183,7 +184,7 @@
 main(int argc, char* argv[])
 {
    int c, err = 0;
-   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xg:";
+   const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:xg:";
    char *sock = NULL;
    char *group = NULL;
    bool dofork = false;
@@ -216,6 +217,10 @@
 				debug(D_MISC, "Parsing ignore list");
 				parse_networklist(optarg, &ignorenets);
 				break;
+			case 'I':
+				debug(D_MISC, "Ignore authenticated senders");
+				ignore_authenticated_senders = true;
+				break;
 			case 'm':
 				dontmodifyspam = true;
 				smfilter.xxfi_flags &= ~SMFIF_CHGBODY;
@@ -286,7 +291,7 @@
       cout << PACKAGE_NAME << " - Version " << PACKAGE_VERSION << endl;
       cout << "SpamAssassin Sendmail Milter Plugin" << endl;
       cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl;
-      cout << "                      [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl;
+      cout << "                      [-e defaultdomain] [-f] [-i networks] [-I] [-m] [-M]" << endl;
       cout << "                      [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl;
       cout << "                      [-- spamc args ]" << endl;
       cout << "   -p socket: path to create socket" << endl;
@@ -301,6 +306,7 @@
       cout << "   -f: fork into background" << endl;
       cout << "   -i: skip (ignore) checks from these IPs or netblocks" << endl;
       cout << "          example: -i 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0" << endl;
+      cout << "   -I: skip (ignore) checks if sender is authenticated" << endl;
       cout << "   -m: don't modify body, Content-type: or Subject:" << endl;
       cout << "   -M: don't modify the message at all" << endl;
       cout << "   -P pidfile: Put processid in pidfile" << endl;
@@ -812,6 +818,22 @@
   }
   /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */
 
+  if (ignore_authenticated_senders)
+  {
+    char *auth_authen;
+
+    auth_authen = smfi_getsymval(ctx, "{auth_authen}");
+    debug(D_MISC, "auth_authen=%s", auth_authen ?: "<unauthenticated>");
+
+    if (auth_authen)
+    {
+      debug(D_MISC, "sender authenticated (%s) - accepting message",
+	    auth_authen);
+      debug(D_FUNC, "mlfi_envfrom: exit ignore");
+      return SMFIS_ACCEPT;
+    }
+  }
+
   debug(D_FUNC, "mlfi_envfrom: enter");
   try {
     // launch new SpamAssassin

--- spamass-milter-0.3.1/spamass-milter.1.in.ori	2009-04-20 21:11:55.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.1.in	2009-04-20 21:17:36.000000000 -0500
@@ -15,6 +15,7 @@
 .Op Fl f
 .Op Fl g Ar group
 .Op Fl i Ar networks
+.Op Fl I
 .Op Fl m
 .Op Fl M
 .Op Fl P Ar pidfile
@@ -126,6 +127,8 @@
 flags will append to the list.
 For example, if you list all your internal networks, no outgoing emails
 will be filtered.
+.It Fl I
+Ignores messages if the sender has authenticated via SMTP AUTH.
 .It Fl m
 Disables modification of the 
 .Ql Subject: 

spamass-milter-0.3.1-bits.patch:

--- NEW FILE spamass-milter-0.3.1-bits.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.orig	2009-04-20 21:29:57.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 22:07:51.000000000 -0500
@@ -975,7 +975,9 @@
 		   
 		*/
 		const char *macro_b, *macro_i, *macro_j, *macro_r,
-		           *macro_s, *macro_v, *macro_Z, *macro__;
+		           *macro_s, *macro_v, *macro_Z, *macro__,
+			   *macro_auth_ssf, *macro_auth_authen, *macro_auth_author,
+			   *macro_auth_type;
 		char date[32];
 
 		/* RFC 822 date. */
@@ -1013,6 +1015,36 @@
 			warnmacro("r", "ENVRCPT");
 		}
 			
+		/* Authenticated bits Information */
+		macro_auth_ssf = smfi_getsymval(ctx, "{auth_ssf}");
+		if (!macro_auth_ssf)
+		{
+			macro_auth_ssf = "";
+			warnmacro("auth_ssf", "ENVRCPT");
+		}
+			
+		macro_auth_authen = smfi_getsymval(ctx, "{auth_authen}");
+		if (!macro_auth_authen)
+		{
+			macro_auth_authen = "";
+			warnmacro("auth_authen", "ENVRCPT");
+		}
+			
+		macro_auth_author = smfi_getsymval(ctx, "{auth_author}");
+		if (!macro_auth_author)
+		{
+			macro_auth_author = "";
+			warnmacro("auth_author", "ENVRCPT");
+		}
+			
+		macro_auth_type = smfi_getsymval(ctx, "{auth_type}");
+		if (!macro_auth_type)
+		{
+			macro_auth_type = "";
+			warnmacro("auth_type", "ENVRCPT");
+		}
+			
+			
 		/* Sendmail currently cannot pass us the {s} macro, but
 		   I do not know why.  Leave this in for the day sendmail is
 		   fixed.  Until that day, use the value remembered by
@@ -1051,11 +1083,21 @@
 		assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n");
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
 
-		assassin->output((string)
-			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
-			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
-			macro_b+"\r\n\t"+
-			"(envelope-from "+assassin->from()+")\r\n");
+		string rec_header;
+
+		rec_header = (string) "Received: from " + macro_s + " (" + macro__ + ")\r\n\t";
+
+		if (strlen(macro_auth_ssf)) {
+			rec_header += (string) "(authenticated bits=" + macro_auth_ssf + ")\r\n\t";
+		}
+
+		rec_header += (string) "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " +
+			macro_r + " id " + macro_i + "\r\n\t" +
+			macro_b + "\r\n\t" +
+			"(envelope-from " + assassin->from() + ")\r\n";
+
+		debug(D_SPAMC, "Received header for spamc: %s", rec_header.c_str());
+		assassin->output(rec_header);
 
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");

spamass-milter-0.3.1-rcvd.patch:

--- NEW FILE spamass-milter-0.3.1-rcvd.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.ori	2006-03-23 15:41:36.000000000 -0600
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 20:03:31.000000000 -0500
@@ -1002,9 +1002,9 @@
 
 		assassin->output((string)
 			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
-			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
+			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
 			macro_b+"\r\n\t"+
-			"(envelope-from "+assassin->from()+"\r\n");
+			"(envelope-from "+assassin->from()+")\r\n");
 
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");


Index: spamass-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/F-10/spamass-milter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- spamass-milter.spec	3 Apr 2009 14:14:42 -0000	1.16
+++ spamass-milter.spec	24 Apr 2009 16:01:24 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -13,6 +13,9 @@
 Patch0:		spamass-milter-0.3.1-pathnames.patch
 Patch1:		spamass-milter-0.3.1-macros.patch
 Patch2:		spamass-milter-0.3.1-group.patch
+Patch3:		spamass-milter-0.3.1-rcvd.patch
+Patch4:		spamass-milter-0.3.1-bits.patch
+Patch5:		spamass-milter-0.3.1-authuser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	spamassassin, sendmail-devel
 Requires:	spamassassin, /usr/sbin/sendmail
@@ -46,6 +49,9 @@
 %patch0 -p1 -b .pathnames
 %patch1 -p1 -b .macros
 %patch2 -p1 -b .group
+%patch3 -p1 -b .rcvd
+%patch4 -p1 -b .bits
+%patch5 -p1 -b .authuser
 %{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 %{__sed} -i -e 's|%%{_localstatedir}|%{_localstatedir}|g;
 		s|%%{_initrddir}|%{_initrddir}|g;
@@ -117,6 +123,12 @@
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
+- Fix Received-header generation (#496763)
+- Add authentication info to dummy Received-header (#496769)
+- Add option to skip checks for authenticated senders (#437506, #496767)
+  (thanks to Habeeb J. Dihu for the reports and patches)
+
 * Wed Mar 18 2009 Paul Howarth <paul at city-fan.org> 0.3.1-13
 - Call initscripts directly instead of via /sbin/service and fine-tune scriptlet
   dependencies



From pghmcfc at fedoraproject.org  Fri Apr 24 16:01:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 24 Apr 2009 16:01:55 +0000 (UTC)
Subject: rpms/spamass-milter/devel spamass-milter-0.3.1-authuser.patch, NONE,
	1.1 spamass-milter-0.3.1-bits.patch, NONE,
	1.1 spamass-milter-0.3.1-rcvd.patch, NONE,
	1.1 spamass-milter.spec, 1.19, 1.20
Message-ID: <20090424160155.80ECE70106@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/spamass-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12882/devel

Modified Files:
	spamass-milter.spec 
Added Files:
	spamass-milter-0.3.1-authuser.patch 
	spamass-milter-0.3.1-bits.patch 
	spamass-milter-0.3.1-rcvd.patch 
Log Message:
* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
- Fix Received-header generation (#496763)
- Add authentication info to dummy Received-header (#496769)
- Add option to skip checks for authenticated senders (#437506, #496767)
  (thanks to Habeeb J. Dihu for the reports and patches)


spamass-milter-0.3.1-authuser.patch:

--- NEW FILE spamass-milter-0.3.1-authuser.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.ori	2009-04-20 21:11:55.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 21:14:20.000000000 -0500
@@ -172,6 +172,7 @@
 bool flag_full_email = false;		/* pass full email address to spamc */
 bool flag_expand = false;	/* alias/virtusertable expansion */
 bool warnedmacro = false;	/* have we logged that we couldn't fetch a macro? */
+bool ignore_authenticated_senders = false;	/* authenticated users bypass spam checks */
 
 #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
 static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -183,7 +184,7 @@
 main(int argc, char* argv[])
 {
    int c, err = 0;
-   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xg:";
+   const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:xg:";
    char *sock = NULL;
    char *group = NULL;
    bool dofork = false;
@@ -216,6 +217,10 @@
 				debug(D_MISC, "Parsing ignore list");
 				parse_networklist(optarg, &ignorenets);
 				break;
+			case 'I':
+				debug(D_MISC, "Ignore authenticated senders");
+				ignore_authenticated_senders = true;
+				break;
 			case 'm':
 				dontmodifyspam = true;
 				smfilter.xxfi_flags &= ~SMFIF_CHGBODY;
@@ -286,7 +291,7 @@
       cout << PACKAGE_NAME << " - Version " << PACKAGE_VERSION << endl;
       cout << "SpamAssassin Sendmail Milter Plugin" << endl;
       cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl;
-      cout << "                      [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl;
+      cout << "                      [-e defaultdomain] [-f] [-i networks] [-I] [-m] [-M]" << endl;
       cout << "                      [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl;
       cout << "                      [-- spamc args ]" << endl;
       cout << "   -p socket: path to create socket" << endl;
@@ -301,6 +306,7 @@
       cout << "   -f: fork into background" << endl;
       cout << "   -i: skip (ignore) checks from these IPs or netblocks" << endl;
       cout << "          example: -i 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0" << endl;
+      cout << "   -I: skip (ignore) checks if sender is authenticated" << endl;
       cout << "   -m: don't modify body, Content-type: or Subject:" << endl;
       cout << "   -M: don't modify the message at all" << endl;
       cout << "   -P pidfile: Put processid in pidfile" << endl;
@@ -812,6 +818,22 @@
   }
   /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */
 
+  if (ignore_authenticated_senders)
+  {
+    char *auth_authen;
+
+    auth_authen = smfi_getsymval(ctx, "{auth_authen}");
+    debug(D_MISC, "auth_authen=%s", auth_authen ?: "<unauthenticated>");
+
+    if (auth_authen)
+    {
+      debug(D_MISC, "sender authenticated (%s) - accepting message",
+	    auth_authen);
+      debug(D_FUNC, "mlfi_envfrom: exit ignore");
+      return SMFIS_ACCEPT;
+    }
+  }
+
   debug(D_FUNC, "mlfi_envfrom: enter");
   try {
     // launch new SpamAssassin

--- spamass-milter-0.3.1/spamass-milter.1.in.ori	2009-04-20 21:11:55.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.1.in	2009-04-20 21:17:36.000000000 -0500
@@ -15,6 +15,7 @@
 .Op Fl f
 .Op Fl g Ar group
 .Op Fl i Ar networks
+.Op Fl I
 .Op Fl m
 .Op Fl M
 .Op Fl P Ar pidfile
@@ -126,6 +127,8 @@
 flags will append to the list.
 For example, if you list all your internal networks, no outgoing emails
 will be filtered.
+.It Fl I
+Ignores messages if the sender has authenticated via SMTP AUTH.
 .It Fl m
 Disables modification of the 
 .Ql Subject: 

spamass-milter-0.3.1-bits.patch:

--- NEW FILE spamass-milter-0.3.1-bits.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.orig	2009-04-20 21:29:57.000000000 -0500
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 22:07:51.000000000 -0500
@@ -975,7 +975,9 @@
 		   
 		*/
 		const char *macro_b, *macro_i, *macro_j, *macro_r,
-		           *macro_s, *macro_v, *macro_Z, *macro__;
+		           *macro_s, *macro_v, *macro_Z, *macro__,
+			   *macro_auth_ssf, *macro_auth_authen, *macro_auth_author,
+			   *macro_auth_type;
 		char date[32];
 
 		/* RFC 822 date. */
@@ -1013,6 +1015,36 @@
 			warnmacro("r", "ENVRCPT");
 		}
 			
+		/* Authenticated bits Information */
+		macro_auth_ssf = smfi_getsymval(ctx, "{auth_ssf}");
+		if (!macro_auth_ssf)
+		{
+			macro_auth_ssf = "";
+			warnmacro("auth_ssf", "ENVRCPT");
+		}
+			
+		macro_auth_authen = smfi_getsymval(ctx, "{auth_authen}");
+		if (!macro_auth_authen)
+		{
+			macro_auth_authen = "";
+			warnmacro("auth_authen", "ENVRCPT");
+		}
+			
+		macro_auth_author = smfi_getsymval(ctx, "{auth_author}");
+		if (!macro_auth_author)
+		{
+			macro_auth_author = "";
+			warnmacro("auth_author", "ENVRCPT");
+		}
+			
+		macro_auth_type = smfi_getsymval(ctx, "{auth_type}");
+		if (!macro_auth_type)
+		{
+			macro_auth_type = "";
+			warnmacro("auth_type", "ENVRCPT");
+		}
+			
+			
 		/* Sendmail currently cannot pass us the {s} macro, but
 		   I do not know why.  Leave this in for the day sendmail is
 		   fixed.  Until that day, use the value remembered by
@@ -1051,11 +1083,21 @@
 		assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n");
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
 
-		assassin->output((string)
-			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
-			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
-			macro_b+"\r\n\t"+
-			"(envelope-from "+assassin->from()+")\r\n");
+		string rec_header;
+
+		rec_header = (string) "Received: from " + macro_s + " (" + macro__ + ")\r\n\t";
+
+		if (strlen(macro_auth_ssf)) {
+			rec_header += (string) "(authenticated bits=" + macro_auth_ssf + ")\r\n\t";
+		}
+
+		rec_header += (string) "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " +
+			macro_r + " id " + macro_i + "\r\n\t" +
+			macro_b + "\r\n\t" +
+			"(envelope-from " + assassin->from() + ")\r\n";
+
+		debug(D_SPAMC, "Received header for spamc: %s", rec_header.c_str());
+		assassin->output(rec_header);
 
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");

spamass-milter-0.3.1-rcvd.patch:

--- NEW FILE spamass-milter-0.3.1-rcvd.patch ---
--- spamass-milter-0.3.1/spamass-milter.cpp.ori	2006-03-23 15:41:36.000000000 -0600
+++ spamass-milter-0.3.1/spamass-milter.cpp	2009-04-20 20:03:31.000000000 -0500
@@ -1002,9 +1002,9 @@
 
 		assassin->output((string)
 			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
-			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
+			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
 			macro_b+"\r\n\t"+
-			"(envelope-from "+assassin->from()+"\r\n");
+			"(envelope-from "+assassin->from()+")\r\n");
 
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");


Index: spamass-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/devel/spamass-milter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- spamass-milter.spec	18 Mar 2009 16:11:19 -0000	1.19
+++ spamass-milter.spec	24 Apr 2009 16:01:25 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -13,6 +13,9 @@
 Patch0:		spamass-milter-0.3.1-pathnames.patch
 Patch1:		spamass-milter-0.3.1-macros.patch
 Patch2:		spamass-milter-0.3.1-group.patch
+Patch3:		spamass-milter-0.3.1-rcvd.patch
+Patch4:		spamass-milter-0.3.1-bits.patch
+Patch5:		spamass-milter-0.3.1-authuser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	spamassassin, sendmail-devel
 Requires:	spamassassin, /usr/sbin/sendmail
@@ -46,6 +49,9 @@
 %patch0 -p1 -b .pathnames
 %patch1 -p1 -b .macros
 %patch2 -p1 -b .group
+%patch3 -p1 -b .rcvd
+%patch4 -p1 -b .bits
+%patch5 -p1 -b .authuser
 %{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 %{__sed} -i -e 's|%%{_localstatedir}|%{_localstatedir}|g;
 		s|%%{_initrddir}|%{_initrddir}|g;
@@ -117,6 +123,12 @@
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
+- Fix Received-header generation (#496763)
+- Add authentication info to dummy Received-header (#496769)
+- Add option to skip checks for authenticated senders (#437506, #496767)
+  (thanks to Habeeb J. Dihu for the reports and patches)
+
 * Wed Mar 18 2009 Paul Howarth <paul at city-fan.org> 0.3.1-13
 - Call initscripts directly instead of via /sbin/service and fine-tune scriptlet
   dependencies



From remi at fedoraproject.org  Fri Apr 24 16:03:26 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 24 Apr 2009 16:03:26 +0000 (UTC)
Subject: rpms/ocsinventory-agent/devel ocsinventory-agent.README, 1.1,
	1.2 ocsinventory-agent.README.fr, 1.1,
	1.2 ocsinventory-agent.spec, 1.10, 1.11
Message-ID: <20090424160326.826B270106@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13343

Modified Files:
	ocsinventory-agent.README ocsinventory-agent.README.fr 
	ocsinventory-agent.spec 
Log Message:
updated README.RPM + Comment


Index: ocsinventory-agent.README
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/ocsinventory-agent.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README	24 Apr 2009 16:02:56 -0000	1.2
@@ -1,14 +1,17 @@
 Thie RPM install the OCS Inventory NG client
-It is configure to generate, daily, a local report:
+It is configure to generate a local report:
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-If you want it to automaticaly transfer the result
-to your organization communication server, or
-if you want to use the ocs TAG, edit the 
+If you want it to automaticaly and regularly transfer the 
+result to your organization communication server, edit the 
 configuration file:
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+The hourly "cron" will launch an inventory and send it 
+according to the server configuration (PROLOQ_FREQ)
+
 
 
 If you want to deploy this client on a important number of


Index: ocsinventory-agent.README.fr
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/ocsinventory-agent.README.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README.fr	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README.fr	24 Apr 2009 16:02:56 -0000	1.2
@@ -1,14 +1,17 @@
-Ce RPM installe l'agent d"OCS Inventory NG"
-Il est configur?? pour g??n??rer quotidiennement un rapport local :
+Ce RPM installe l'agent de "OCS Inventory NG"
+Il est configur?? pour g??n??rer un rapport local :
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-Si vous souhaitez transmettre ce rapport au serveur
-de communication de votre organisation, ou si vous 
-souhaitez utiliser le TAG ocs, ??ditez le fichier de 
+Si vous souhaitez envoyer le rapport de mani??re automatique
+et r??guli??re au serveur de communication, ??ditez le fichier de 
 configuration :
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+Le "cron" horaire d??clenchera l'inventaire et la transmission en
+fonction de la configuration du serveur (PROLOG_FREQ)
+
 
 
 Si vous d??sirez d??ployer ce client sur un parc important, vous


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/ocsinventory-agent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocsinventory-agent.spec	29 Mar 2009 09:02:04 -0000	1.10
+++ ocsinventory-agent.spec	24 Apr 2009 16:02:56 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Version:   1.0.1
-Release:   1%{?dist}%{?ocstag:.%{ocstag}}
+Release:   2%{?dist}%{?ocstag:.%{ocstag}}
 
 Source0:   http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:    http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
@@ -89,7 +89,7 @@
 %endif
 
 # can be used to override the %{name}.cfg setup.
-# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
+# OCSSERVER[0]=your.ocsserver.name
 # 
 # corresponds with --local=%{_localstatedir}/lib/%{name}
 # OCSSERVER[0]=local
@@ -112,7 +112,7 @@
 server = http://%{ocsserver}/ocsinventory
 %else
 # Server URL, unconmment if needed
-# server = http://your.ocsserver.name/ocsinventory
+# server = your.ocsserver.name
 local = %{_localstatedir}/lib/%{name}
 %endif
 
@@ -187,6 +187,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-2
+- update the README.RPM (new configuration file)
+- change from URL to only servername in config comment
+
 * Sun Mar 29 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-1
 - update to 1.0.1
 



From remi at fedoraproject.org  Fri Apr 24 16:09:12 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 24 Apr 2009 16:09:12 +0000 (UTC)
Subject: rpms/ocsinventory-agent/F-11 ocsinventory-agent.README, 1.1,
	1.2 ocsinventory-agent.README.fr, 1.1, 1.2
Message-ID: <20090424160912.C166270106@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14873

Modified Files:
	ocsinventory-agent.README ocsinventory-agent.README.fr 
Log Message:
updated README.RPM


Index: ocsinventory-agent.README
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-11/ocsinventory-agent.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README	24 Apr 2009 16:08:41 -0000	1.2
@@ -1,14 +1,17 @@
 Thie RPM install the OCS Inventory NG client
-It is configure to generate, daily, a local report:
+It is configure to generate a local report:
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-If you want it to automaticaly transfer the result
-to your organization communication server, or
-if you want to use the ocs TAG, edit the 
+If you want it to automaticaly and regularly transfer the 
+result to your organization communication server, edit the 
 configuration file:
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+The hourly "cron" will launch an inventory and send it 
+according to the server configuration (PROLOQ_FREQ)
+
 
 
 If you want to deploy this client on a important number of


Index: ocsinventory-agent.README.fr
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-11/ocsinventory-agent.README.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README.fr	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README.fr	24 Apr 2009 16:08:41 -0000	1.2
@@ -1,14 +1,17 @@
-Ce RPM installe l'agent d"OCS Inventory NG"
-Il est configur?? pour g??n??rer quotidiennement un rapport local :
+Ce RPM installe l'agent de "OCS Inventory NG"
+Il est configur?? pour g??n??rer un rapport local :
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-Si vous souhaitez transmettre ce rapport au serveur
-de communication de votre organisation, ou si vous 
-souhaitez utiliser le TAG ocs, ??ditez le fichier de 
+Si vous souhaitez envoyer le rapport de mani??re automatique
+et r??guli??re au serveur de communication, ??ditez le fichier de 
 configuration :
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+Le "cron" horaire d??clenchera l'inventaire et la transmission en
+fonction de la configuration du serveur (PROLOG_FREQ)
+
 
 
 Si vous d??sirez d??ployer ce client sur un parc important, vous



From remi at fedoraproject.org  Fri Apr 24 16:10:31 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 24 Apr 2009 16:10:31 +0000 (UTC)
Subject: rpms/ocsinventory-agent/F-10 ocsinventory-agent.README, 1.1,
	1.2 ocsinventory-agent.README.fr, 1.1, 1.2
Message-ID: <20090424161031.0F14A7013C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15248

Modified Files:
	ocsinventory-agent.README ocsinventory-agent.README.fr 
Log Message:
updated README.RPM


Index: ocsinventory-agent.README
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-10/ocsinventory-agent.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README	24 Apr 2009 16:10:00 -0000	1.2
@@ -1,14 +1,17 @@
 Thie RPM install the OCS Inventory NG client
-It is configure to generate, daily, a local report:
+It is configure to generate a local report:
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-If you want it to automaticaly transfer the result
-to your organization communication server, or
-if you want to use the ocs TAG, edit the 
+If you want it to automaticaly and regularly transfer the 
+result to your organization communication server, edit the 
 configuration file:
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+The hourly "cron" will launch an inventory and send it 
+according to the server configuration (PROLOQ_FREQ)
+
 
 
 If you want to deploy this client on a important number of


Index: ocsinventory-agent.README.fr
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-10/ocsinventory-agent.README.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README.fr	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README.fr	24 Apr 2009 16:10:00 -0000	1.2
@@ -1,14 +1,17 @@
-Ce RPM installe l'agent d"OCS Inventory NG"
-Il est configur?? pour g??n??rer quotidiennement un rapport local :
+Ce RPM installe l'agent de "OCS Inventory NG"
+Il est configur?? pour g??n??rer un rapport local :
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-Si vous souhaitez transmettre ce rapport au serveur
-de communication de votre organisation, ou si vous 
-souhaitez utiliser le TAG ocs, ??ditez le fichier de 
+Si vous souhaitez envoyer le rapport de mani??re automatique
+et r??guli??re au serveur de communication, ??ditez le fichier de 
 configuration :
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+Le "cron" horaire d??clenchera l'inventaire et la transmission en
+fonction de la configuration du serveur (PROLOG_FREQ)
+
 
 
 Si vous d??sirez d??ployer ce client sur un parc important, vous



From caolanm at fedoraproject.org  Fri Apr 24 16:11:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 16:11:42 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1896,
	1.1897 openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, 1.3, NONE
Message-ID: <20090424161142.1D42C7013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15790/F-11

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
Log Message:
sneaky master fix on pyuno


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1896
retrieving revision 1.1897
diff -u -r1.1896 -r1.1897
--- openoffice.org.spec	24 Apr 2009 15:32:22 -0000	1.1896
+++ openoffice.org.spec	24 Apr 2009 16:11:10 -0000	1.1897
@@ -130,13 +130,12 @@
 Patch55: ooo-build.ooo2497.filter.svg.patch
 Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60: workspace.vcl101.patch
-Patch61: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch62: workspace.slideshow1.patch
-Patch63: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch64: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch59: workspace.vcl101.patch
+Patch60: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch61: workspace.slideshow1.patch
+Patch62: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch63: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1625,13 +1624,12 @@
 %patch55 -p1 -b .ooo2497.filter.svg.patch
 %patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch58 -p1 -b .ooo100991.pyuno-fix.patch
-%patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch60 -p1 -b .workspace.vcl101.patch
-%patch61 -p1 -b .ooo101152.solenv.kn.patch
-%patch62 -p2 -b .workspace.slideshow1.patch
-%patch63 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch64 -p0 -b .ooo101274.opening-a-directory.patch
+%patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch59 -p1 -b .workspace.vcl101.patch
+%patch60 -p1 -b .ooo101152.solenv.kn.patch
+%patch61 -p2 -b .workspace.slideshow1.patch
+%patch62 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch63 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.ooo100991.pyuno-fix.patch DELETED ---



From caolanm at fedoraproject.org  Fri Apr 24 16:11:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 16:11:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1897,
	1.1898 openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, 1.3, NONE
Message-ID: <20090424161143.60D5B7013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15790/devel

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
Log Message:
sneaky master fix on pyuno


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1897
retrieving revision 1.1898
diff -u -r1.1897 -r1.1898
--- openoffice.org.spec	24 Apr 2009 15:32:23 -0000	1.1897
+++ openoffice.org.spec	24 Apr 2009 16:11:11 -0000	1.1898
@@ -130,13 +130,12 @@
 Patch55: ooo-build.ooo2497.filter.svg.patch
 Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60: workspace.vcl101.patch
-Patch61: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch62: workspace.slideshow1.patch
-Patch63: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch64: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch59: workspace.vcl101.patch
+Patch60: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch61: workspace.slideshow1.patch
+Patch62: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch63: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1625,13 +1624,12 @@
 %patch55 -p1 -b .ooo2497.filter.svg.patch
 %patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch58 -p1 -b .ooo100991.pyuno-fix.patch
-%patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch60 -p1 -b .workspace.vcl101.patch
-%patch61 -p1 -b .ooo101152.solenv.kn.patch
-%patch62 -p2 -b .workspace.slideshow1.patch
-%patch63 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch64 -p0 -b .ooo101274.opening-a-directory.patch
+%patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch59 -p1 -b .workspace.vcl101.patch
+%patch60 -p1 -b .ooo101152.solenv.kn.patch
+%patch61 -p2 -b .workspace.slideshow1.patch
+%patch62 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch63 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.ooo100991.pyuno-fix.patch DELETED ---



From remi at fedoraproject.org  Fri Apr 24 16:12:21 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 24 Apr 2009 16:12:21 +0000 (UTC)
Subject: rpms/ocsinventory-agent/F-9 ocsinventory-agent.README, 1.1,
	1.2 ocsinventory-agent.README.fr, 1.1, 1.2
Message-ID: <20090424161221.6A40570106@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16464

Modified Files:
	ocsinventory-agent.README ocsinventory-agent.README.fr 
Log Message:
updated README.RPM


Index: ocsinventory-agent.README
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-9/ocsinventory-agent.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README	24 Apr 2009 16:11:51 -0000	1.2
@@ -1,14 +1,17 @@
 Thie RPM install the OCS Inventory NG client
-It is configure to generate, daily, a local report:
+It is configure to generate a local report:
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-If you want it to automaticaly transfer the result
-to your organization communication server, or
-if you want to use the ocs TAG, edit the 
+If you want it to automaticaly and regularly transfer the 
+result to your organization communication server, edit the 
 configuration file:
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+The hourly "cron" will launch an inventory and send it 
+according to the server configuration (PROLOQ_FREQ)
+
 
 
 If you want to deploy this client on a important number of


Index: ocsinventory-agent.README.fr
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-9/ocsinventory-agent.README.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README.fr	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.README.fr	24 Apr 2009 16:11:51 -0000	1.2
@@ -1,14 +1,17 @@
-Ce RPM installe l'agent d"OCS Inventory NG"
-Il est configur?? pour g??n??rer quotidiennement un rapport local :
+Ce RPM installe l'agent de "OCS Inventory NG"
+Il est configur?? pour g??n??rer un rapport local :
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-Si vous souhaitez transmettre ce rapport au serveur
-de communication de votre organisation, ou si vous 
-souhaitez utiliser le TAG ocs, ??ditez le fichier de 
+Si vous souhaitez envoyer le rapport de mani??re automatique
+et r??guli??re au serveur de communication, ??ditez le fichier de 
 configuration :
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+Le "cron" horaire d??clenchera l'inventaire et la transmission en
+fonction de la configuration du serveur (PROLOG_FREQ)
+
 
 
 Si vous d??sirez d??ployer ce client sur un parc important, vous



From remi at fedoraproject.org  Fri Apr 24 16:15:00 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 24 Apr 2009 16:15:00 +0000 (UTC)
Subject: rpms/ocsinventory-agent/EL-5 ocsinventory-agent.README, 1.1,
	1.2 ocsinventory-agent.README.fr, 1.1, 1.2
Message-ID: <20090424161500.F39B770106@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17360

Modified Files:
	ocsinventory-agent.README ocsinventory-agent.README.fr 
Log Message:
updated README.RPM


Index: ocsinventory-agent.README
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-5/ocsinventory-agent.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README	10 Jun 2008 17:56:54 -0000	1.1
+++ ocsinventory-agent.README	24 Apr 2009 16:14:30 -0000	1.2
@@ -1,14 +1,17 @@
 Thie RPM install the OCS Inventory NG client
-It is configure to generate, daily, a local report:
+It is configure to generate a local report:
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-If you want it to automaticaly transfer the result
-to your organization communication server, or
-if you want to use the ocs TAG, edit the 
+If you want it to automaticaly and regularly transfer the 
+result to your organization communication server, edit the 
 configuration file:
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+The hourly "cron" will launch an inventory and send it 
+according to the server configuration (PROLOQ_FREQ)
+
 
 
 If you want to deploy this client on a important number of


Index: ocsinventory-agent.README.fr
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-5/ocsinventory-agent.README.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README.fr	10 Jun 2008 17:56:54 -0000	1.1
+++ ocsinventory-agent.README.fr	24 Apr 2009 16:14:30 -0000	1.2
@@ -1,14 +1,17 @@
-Ce RPM installe l'agent d"OCS Inventory NG"
-Il est configur?? pour g??n??rer quotidiennement un rapport local :
+Ce RPM installe l'agent de "OCS Inventory NG"
+Il est configur?? pour g??n??rer un rapport local :
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-Si vous souhaitez transmettre ce rapport au serveur
-de communication de votre organisation, ou si vous 
-souhaitez utiliser le TAG ocs, ??ditez le fichier de 
+Si vous souhaitez envoyer le rapport de mani??re automatique
+et r??guli??re au serveur de communication, ??ditez le fichier de 
 configuration :
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+Le "cron" horaire d??clenchera l'inventaire et la transmission en
+fonction de la configuration du serveur (PROLOG_FREQ)
+
 
 
 Si vous d??sirez d??ployer ce client sur un parc important, vous



From remi at fedoraproject.org  Fri Apr 24 16:17:58 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 24 Apr 2009 16:17:58 +0000 (UTC)
Subject: rpms/ocsinventory-agent/EL-4 ocsinventory-agent.README, 1.1,
	1.2 ocsinventory-agent.README.fr, 1.1, 1.2
Message-ID: <20090424161758.3E82070106@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17819

Modified Files:
	ocsinventory-agent.README ocsinventory-agent.README.fr 
Log Message:
updated README.RPM


Index: ocsinventory-agent.README
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-4/ocsinventory-agent.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README	10 Jun 2008 18:06:20 -0000	1.1
+++ ocsinventory-agent.README	24 Apr 2009 16:17:27 -0000	1.2
@@ -1,14 +1,17 @@
 Thie RPM install the OCS Inventory NG client
-It is configure to generate, daily, a local report:
+It is configure to generate a local report:
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-If you want it to automaticaly transfer the result
-to your organization communication server, or
-if you want to use the ocs TAG, edit the 
+If you want it to automaticaly and regularly transfer the 
+result to your organization communication server, edit the 
 configuration file:
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+The hourly "cron" will launch an inventory and send it 
+according to the server configuration (PROLOQ_FREQ)
+
 
 
 If you want to deploy this client on a important number of


Index: ocsinventory-agent.README.fr
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-4/ocsinventory-agent.README.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-agent.README.fr	10 Jun 2008 18:06:20 -0000	1.1
+++ ocsinventory-agent.README.fr	24 Apr 2009 16:17:27 -0000	1.2
@@ -1,14 +1,17 @@
-Ce RPM installe l'agent d"OCS Inventory NG"
-Il est configur?? pour g??n??rer quotidiennement un rapport local :
+Ce RPM installe l'agent de "OCS Inventory NG"
+Il est configur?? pour g??n??rer un rapport local :
 
 	/var/lib/ocsinventory-agent/<DEVIDE_ID>.ocs
 
-Si vous souhaitez transmettre ce rapport au serveur
-de communication de votre organisation, ou si vous 
-souhaitez utiliser le TAG ocs, ??ditez le fichier de 
+Si vous souhaitez envoyer le rapport de mani??re automatique
+et r??guli??re au serveur de communication, ??ditez le fichier de 
 configuration :
 
-	/etc/ocsinventory/ocsinventory-agent.cfg
+	/etc/sysconfig/ocsinventory-agent
+
+Le "cron" horaire d??clenchera l'inventaire et la transmission en
+fonction de la configuration du serveur (PROLOG_FREQ)
+
 
 
 Si vous d??sirez d??ployer ce client sur un parc important, vous



From orion at fedoraproject.org  Fri Apr 24 16:39:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 24 Apr 2009 16:39:06 +0000 (UTC)
Subject: rpms/kdesvn/devel .cvsignore, 1.28, 1.29 kdesvn.spec, 1.55,
	1.56 sources, 1.27, 1.28
Message-ID: <20090424163907.16C9670106@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20132

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
- Update to 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	4 Mar 2009 19:03:43 -0000	1.28
+++ .cvsignore	24 Apr 2009 16:38:35 -0000	1.29
@@ -1 +1 @@
-kdesvn-1.2.4.tar.bz2
+kdesvn-1.3.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdesvn.spec	4 Mar 2009 19:03:43 -0000	1.55
+++ kdesvn.spec	24 Apr 2009 16:38:35 -0000	1.56
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.2.4
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
+- Update to 1.3.0
+
 * Wed Mar 4 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.2.4-1
 - Update to 1.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Mar 2009 19:03:43 -0000	1.27
+++ sources	24 Apr 2009 16:38:35 -0000	1.28
@@ -1 +1 @@
-3e8879d61f59aff0d83c9c5472d64aae  kdesvn-1.2.4.tar.bz2
+141f0be28086fd3e031a2d9dcac3479d  kdesvn-1.3.0.tar.bz2



From caolanm at fedoraproject.org  Fri Apr 24 16:46:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 16:46:32 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1898,
	1.1899 openoffice.org-3.1.0.ooo101152.solenv.kn.patch, 1.1, NONE
Message-ID: <20090424164632.99D5770106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21539/devel

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch 
Log Message:
another master fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- openoffice.org.spec	24 Apr 2009 16:11:11 -0000	1.1898
+++ openoffice.org.spec	24 Apr 2009 16:46:02 -0000	1.1899
@@ -132,10 +132,9 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch59: workspace.vcl101.patch
-Patch60: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch61: workspace.slideshow1.patch
-Patch62: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch63: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: workspace.slideshow1.patch
+Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1626,10 +1625,9 @@
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch59 -p1 -b .workspace.vcl101.patch
-%patch60 -p1 -b .ooo101152.solenv.kn.patch
-%patch61 -p2 -b .workspace.slideshow1.patch
-%patch62 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch63 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p2 -b .workspace.slideshow1.patch
+%patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch62 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.ooo101152.solenv.kn.patch DELETED ---



From caolanm at fedoraproject.org  Fri Apr 24 16:46:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 24 Apr 2009 16:46:32 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec, 1.1897,
	1.1898 openoffice.org-3.1.0.ooo101152.solenv.kn.patch, 1.1, NONE
Message-ID: <20090424164632.6AD3670106@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21539/F-11

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch 
Log Message:
another master fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1897
retrieving revision 1.1898
diff -u -r1.1897 -r1.1898
--- openoffice.org.spec	24 Apr 2009 16:11:10 -0000	1.1897
+++ openoffice.org.spec	24 Apr 2009 16:46:01 -0000	1.1898
@@ -132,10 +132,9 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch59: workspace.vcl101.patch
-Patch60: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch61: workspace.slideshow1.patch
-Patch62: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch63: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: workspace.slideshow1.patch
+Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1626,10 +1625,9 @@
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch59 -p1 -b .workspace.vcl101.patch
-%patch60 -p1 -b .ooo101152.solenv.kn.patch
-%patch61 -p2 -b .workspace.slideshow1.patch
-%patch62 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch63 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p2 -b .workspace.slideshow1.patch
+%patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch62 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.ooo101152.solenv.kn.patch DELETED ---



From orion at fedoraproject.org  Fri Apr 24 16:48:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 24 Apr 2009 16:48:46 +0000 (UTC)
Subject: rpms/kdesvn/F-10 .cvsignore, 1.26, 1.27 kdesvn.spec, 1.50,
	1.51 sources, 1.26, 1.27
Message-ID: <20090424164846.C9AE970106@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21687/F-10

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
- Update to 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Mar 2009 23:18:24 -0000	1.26
+++ .cvsignore	24 Apr 2009 16:48:16 -0000	1.27
@@ -1 +1 @@
-kdesvn-1.2.4.tar.bz2
+kdesvn-1.3.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/kdesvn.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdesvn.spec	4 Mar 2009 23:18:24 -0000	1.50
+++ kdesvn.spec	24 Apr 2009 16:48:16 -0000	1.51
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.2.4
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
+- Update to 1.3.0
+
 * Wed Mar 4 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.2.4-1
 - Update to 1.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 Mar 2009 23:18:24 -0000	1.26
+++ sources	24 Apr 2009 16:48:16 -0000	1.27
@@ -1 +1 @@
-3e8879d61f59aff0d83c9c5472d64aae  kdesvn-1.2.4.tar.bz2
+141f0be28086fd3e031a2d9dcac3479d  kdesvn-1.3.0.tar.bz2



From orion at fedoraproject.org  Fri Apr 24 16:48:47 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 24 Apr 2009 16:48:47 +0000 (UTC)
Subject: rpms/kdesvn/F-11 .cvsignore, 1.28, 1.29 kdesvn.spec, 1.55,
	1.56 sources, 1.27, 1.28
Message-ID: <20090424164847.0097F70106@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21687/F-11

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
- Update to 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	4 Mar 2009 19:03:43 -0000	1.28
+++ .cvsignore	24 Apr 2009 16:48:16 -0000	1.29
@@ -1 +1 @@
-kdesvn-1.2.4.tar.bz2
+kdesvn-1.3.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/kdesvn.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdesvn.spec	4 Mar 2009 19:03:43 -0000	1.55
+++ kdesvn.spec	24 Apr 2009 16:48:16 -0000	1.56
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.2.4
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
+- Update to 1.3.0
+
 * Wed Mar 4 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.2.4-1
 - Update to 1.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Mar 2009 19:03:43 -0000	1.27
+++ sources	24 Apr 2009 16:48:16 -0000	1.28
@@ -1 +1 @@
-3e8879d61f59aff0d83c9c5472d64aae  kdesvn-1.2.4.tar.bz2
+141f0be28086fd3e031a2d9dcac3479d  kdesvn-1.3.0.tar.bz2



From markmc at fedoraproject.org  Fri Apr 24 17:09:39 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 24 Apr 2009 17:09:39 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.85,1.86
Message-ID: <20090424170939.EDD2270106@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23485

Modified Files:
	qemu.spec 
Log Message:
* Fri Apr 24 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-15
- Fix source numbering typos caused by make-release addition



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- qemu.spec	23 Apr 2009 10:23:08 -0000	1.85
+++ qemu.spec	24 Apr 2009 17:09:09 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 14%{?dist}
+Release: 15%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -292,7 +292,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
+install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
 install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/
@@ -308,7 +308,7 @@
      docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
      datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
 chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
+install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE
 
 install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf
@@ -466,6 +466,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Apr 24 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-15
+- Fix source numbering typos caused by make-release addition
+
 * Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
 - Improve instructions for generating the tarball
 



From markmc at fedoraproject.org  Fri Apr 24 17:12:07 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 24 Apr 2009 17:12:07 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.84,1.85
Message-ID: <20090424171207.1FF1670106@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23829

Modified Files:
	qemu.spec 
Log Message:
* Fri Apr 24 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
- Fix source numbering typos caused by make-release addition



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- qemu.spec	23 Apr 2009 10:22:54 -0000	1.84
+++ qemu.spec	24 Apr 2009 17:11:36 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -291,7 +291,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
+install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
 install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/
@@ -307,7 +307,7 @@
      docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
      datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
 chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
+install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE
 
 install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf
@@ -465,6 +465,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Apr 24 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
+- Fix source numbering typos caused by make-release addition
+
 * Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
 - Improve instructions for generating the tarball
 



From twaugh at fedoraproject.org  Fri Apr 24 17:14:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 24 Apr 2009 17:14:55 +0000 (UTC)
Subject: rpms/cups/F-10 cups-get-jobs-printer-uri-relax.patch, NONE,
	1.1 cups-str3167.patch, NONE, 1.1 cups.spec, 1.458, 1.459
Message-ID: <20090424171455.CA9FE70106@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24877

Modified Files:
	cups.spec 
Added Files:
	cups-get-jobs-printer-uri-relax.patch cups-str3167.patch 
Log Message:
* Fri Apr 24 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
- Accept Host: fields set to the ServerName value (bug #497301).
- Temporarily relax requirement to have printer-uri attribute in
  IPP-Get-Jobs request (bug #497519).


cups-get-jobs-printer-uri-relax.patch:

--- NEW FILE cups-get-jobs-printer-uri-relax.patch ---
diff -up cups-1.3.10/scheduler/ipp.c~ cups-1.3.10/scheduler/ipp.c
--- cups-1.3.10/scheduler/ipp.c~	2009-03-18 16:30:29.000000000 +0000
+++ cups-1.3.10/scheduler/ipp.c	2009-04-24 17:27:13.000000000 +0100
@@ -5976,15 +5976,16 @@ get_jobs(cupsd_client_t  *con,		/* I - C
 
   if (strcmp(uri->name, "printer-uri"))
   {
-    send_ipp_status(con, IPP_BAD_REQUEST, _("No printer-uri in request!"));
-    return;
+    cupsdLogMessage(CUPSD_LOG_WARN,
+		    "No printer-uri in IPP-Get-Jobs request!");
   }
 
   httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
                   sizeof(scheme), username, sizeof(username), host,
 		  sizeof(host), &port, resource, sizeof(resource));
 
-  if (!strcmp(resource, "/") || !strcmp(resource, "/jobs"))
+  if (!strcmp(resource, "/") ||
+      (!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6))
   {
     dest    = NULL;
     dtype   = (cups_ptype_t)0;

cups-str3167.patch:

--- NEW FILE cups-str3167.patch ---
diff -up cups-1.3.10/scheduler/conf.c.str3167 cups-1.3.10/scheduler/conf.c
--- cups-1.3.10/scheduler/conf.c.str3167	2009-04-16 20:32:04.000000000 +0100
+++ cups-1.3.10/scheduler/conf.c	2009-04-24 18:12:56.000000000 +0100
@@ -653,38 +653,44 @@ cupsdReadConfiguration(void)
     }
 
     cupsdSetString(&ServerName, temp);
-    add_alias(temp);
+  }
 
-    if (HostNameLookups || RemoteAccessEnabled)
-    {
-      struct hostent	*host;		/* Host entry to get FQDN */
 
-      if ((host = gethostbyname(temp)) != NULL)
+  add_alias(ServerName);
+
+  if (HostNameLookups || RemoteAccessEnabled)
+  {
+    struct hostent	*host;		/* Host entry to get FQDN */
+
+    if ((host = gethostbyname(ServerName)) != NULL)
+    {
+      if (strcasecmp(ServerName, host->h_name))
       {
-        if (strcasecmp(temp, host->h_name))
-        {
-	  cupsdSetString(&ServerName, host->h_name);
-	  add_alias(host->h_name);
-	}
+	cupsdSetString(&ServerName, host->h_name);
+	add_alias(host->h_name);
+      }
 
-        if (host->h_aliases)
-	{
-          for (i = 0; host->h_aliases[i]; i ++)
-	    if (strcasecmp(temp, host->h_aliases[i]))
-	      add_alias(host->h_aliases[i]);
-	}
+      if (host->h_aliases)
+      {
+	for (i = 0; host->h_aliases[i]; i ++)
+	  if (strcasecmp(ServerName, host->h_aliases[i]))
+	    add_alias(host->h_aliases[i]);
       }
     }
+  }
 
-   /*
-    * Make sure we have the base hostname added as an alias, too!
-    */
+ /*
+  * Make sure we have the base hostname added as an alias, too!
+  */
 
-    if ((slash = strchr(temp, '.')) != NULL)
-    {
-      *slash = '\0';
-      add_alias(temp);
-    }
+  if ((slash = strchr(ServerName, '.')) != NULL)
+  {
+    size_t n = slash - ServerName;
+    if (n > sizeof(temp) - 1)
+      n = sizeof(temp) - 1;
+    memcpy (temp, ServerName, n);
+    temp[n] = '\0';
+    add_alias(temp);
   }
 
   for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- cups.spec	21 Apr 2009 12:49:26 -0000	1.458
+++ cups.spec	24 Apr 2009 17:14:25 -0000	1.459
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 1%{?svn:.svn%{svn}}%{?dist}
+Release: 2%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -27,6 +27,8 @@
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
+Patch4: cups-str3167.patch
+Patch5: cups-get-jobs-printer-uri-relax.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
@@ -161,6 +163,8 @@
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
+%patch4 -p1 -b .str3167
+%patch5 -p1 -b .get-jobs-printer-uri-relax
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
@@ -474,6 +478,11 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Fri Apr 24 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
+- Accept Host: fields set to the ServerName value (bug #497301).
+- Temporarily relax requirement to have printer-uri attribute in
+  IPP-Get-Jobs request (bug #497519).
+
 * Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-1
 - 1.3.10.  No longer need ext, includeifexists, str2988,
   CVE-2008-5183, CVE-2008-5286, str3077, str3078, str3059, str3055 patches.



From rdieter at fedoraproject.org  Fri Apr 24 17:16:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 24 Apr 2009 17:16:53 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,
	NONE, 1.1 .cvsignore, 1.54, 1.55 qt.spec, 1.262, 1.263 sources, 1.55, 
	1.56 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch, 1.1, NONE
Message-ID: <20090424171653.B20A970106@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25040

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
Log Message:
* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
- enable FT_LCD_FILTER


qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
@@ -72,7 +72,7 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+#if defined(FT_LCD_FILTER_H) // && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
 #define QT_USE_FREETYPE_LCDFILTER
 #endif
 
@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
             Q_ASSERT(antialias);
             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
             bool useLegacyLcdFilter = false;
-#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
+#if defined(FT_LCD_FILTER_H) // && defined(FC_LCD_FILTER)
             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
 #endif
             uchar *buffer = bitmap.buffer;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	23 Apr 2009 11:43:37 -0000	1.54
+++ .cvsignore	24 Apr 2009 17:16:23 -0000	1.55
@@ -1,6 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.0.tar.bz2
-qt-copy-patches-20090325svn.tar.bz2
-qt-copy-patches-20090423svn.tar.bz2
 qt-x11-opensource-src-4.5.1.tar.bz2
+qt-copy-patches-20090424svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- qt.spec	23 Apr 2009 11:43:37 -0000	1.262
+++ qt.spec	24 Apr 2009 17:16:23 -0000	1.263
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,8 +41,7 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
-# http://bugzilla.redhat.com/490377
-Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
+Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -54,7 +53,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090423
+%define qt_copy 20090424
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -308,10 +307,6 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
-echo "0245" >> patches/DISABLED
-echo "0275" >> patches/DISABLED
-echo "0276" >> patches/DISABLED
-echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -324,7 +319,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
-%patch15 -p1 -b .disable_ft_lcdfilter
+%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -809,6 +804,12 @@
 
 
 %changelog
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
+- enable FT_LCD_FILTER
+
+* Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
+- apply upstream patch to fix the svg rendering regression
+
 * Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
 - 4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	23 Apr 2009 11:43:38 -0000	1.55
+++ sources	24 Apr 2009 17:16:23 -0000	1.56
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
 afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2
+8718da189e55c91a749ec9d142aea784  qt-copy-patches-20090424svn.tar.bz2


--- qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch DELETED ---



From rdieter at fedoraproject.org  Fri Apr 24 17:18:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 24 Apr 2009 17:18:21 +0000 (UTC)
Subject: rpms/qt/F-11 qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch, 
	NONE, 1.1 .cvsignore, 1.54, 1.55 qt.spec, 1.263,
	1.264 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch,
	1.1, NONE
Message-ID: <20090424171821.C429170106@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25202

Modified Files:
	.cvsignore qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
Log Message:
* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
- enable FT_LCD_FILTER


qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
@@ -72,7 +72,7 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+#if defined(FT_LCD_FILTER_H) // && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
 #define QT_USE_FREETYPE_LCDFILTER
 #endif
 
@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
             Q_ASSERT(antialias);
             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
             bool useLegacyLcdFilter = false;
-#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
+#if defined(FT_LCD_FILTER_H) // && defined(FC_LCD_FILTER)
             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
 #endif
             uchar *buffer = bitmap.buffer;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	24 Apr 2009 11:42:09 -0000	1.54
+++ .cvsignore	24 Apr 2009 17:17:51 -0000	1.55
@@ -1,5 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.0.tar.bz2
-qt-copy-patches-20090325svn.tar.bz2
+qt-x11-opensource-src-4.5.1.tar.bz2
 qt-copy-patches-20090424svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- qt.spec	24 Apr 2009 11:42:09 -0000	1.263
+++ qt.spec	24 Apr 2009 17:17:51 -0000	1.264
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,8 +41,7 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
-# http://bugzilla.redhat.com/490377
-Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
+Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -320,7 +319,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
-%patch15 -p1 -b .disable_ft_lcdfilter
+%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -805,6 +804,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
+- enable FT_LCD_FILTER
+
 * Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
 - apply upstream patch to fix the svg rendering regression
 


--- qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch DELETED ---



From twaugh at fedoraproject.org  Fri Apr 24 17:19:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 24 Apr 2009 17:19:20 +0000 (UTC)
Subject: rpms/cups/F-9 cups-get-jobs-printer-uri-relax.patch, NONE,
	1.1 cups-str3167.patch, NONE, 1.1 cups.spec, 1.438, 1.439
Message-ID: <20090424171920.8AC6570106@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25385

Modified Files:
	cups.spec 
Added Files:
	cups-get-jobs-printer-uri-relax.patch cups-str3167.patch 
Log Message:
* Fri Apr 24 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
- Accept Host: fields set to the ServerName value (bug #497301).
- Temporarily relax requirement to have printer-uri attribute in
  IPP-Get-Jobs request (bug #497519).


cups-get-jobs-printer-uri-relax.patch:

--- NEW FILE cups-get-jobs-printer-uri-relax.patch ---
diff -up cups-1.3.10/scheduler/ipp.c~ cups-1.3.10/scheduler/ipp.c
--- cups-1.3.10/scheduler/ipp.c~	2009-03-18 16:30:29.000000000 +0000
+++ cups-1.3.10/scheduler/ipp.c	2009-04-24 17:27:13.000000000 +0100
@@ -5976,15 +5976,16 @@ get_jobs(cupsd_client_t  *con,		/* I - C
 
   if (strcmp(uri->name, "printer-uri"))
   {
-    send_ipp_status(con, IPP_BAD_REQUEST, _("No printer-uri in request!"));
-    return;
+    cupsdLogMessage(CUPSD_LOG_WARN,
+		    "No printer-uri in IPP-Get-Jobs request!");
   }
 
   httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
                   sizeof(scheme), username, sizeof(username), host,
 		  sizeof(host), &port, resource, sizeof(resource));
 
-  if (!strcmp(resource, "/") || !strcmp(resource, "/jobs"))
+  if (!strcmp(resource, "/") ||
+      (!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6))
   {
     dest    = NULL;
     dtype   = (cups_ptype_t)0;

cups-str3167.patch:

--- NEW FILE cups-str3167.patch ---
diff -up cups-1.3.10/scheduler/conf.c.str3167 cups-1.3.10/scheduler/conf.c
--- cups-1.3.10/scheduler/conf.c.str3167	2009-04-16 20:32:04.000000000 +0100
+++ cups-1.3.10/scheduler/conf.c	2009-04-24 18:12:56.000000000 +0100
@@ -653,38 +653,44 @@ cupsdReadConfiguration(void)
     }
 
     cupsdSetString(&ServerName, temp);
-    add_alias(temp);
+  }
 
-    if (HostNameLookups || RemoteAccessEnabled)
-    {
-      struct hostent	*host;		/* Host entry to get FQDN */
 
-      if ((host = gethostbyname(temp)) != NULL)
+  add_alias(ServerName);
+
+  if (HostNameLookups || RemoteAccessEnabled)
+  {
+    struct hostent	*host;		/* Host entry to get FQDN */
+
+    if ((host = gethostbyname(ServerName)) != NULL)
+    {
+      if (strcasecmp(ServerName, host->h_name))
       {
-        if (strcasecmp(temp, host->h_name))
-        {
-	  cupsdSetString(&ServerName, host->h_name);
-	  add_alias(host->h_name);
-	}
+	cupsdSetString(&ServerName, host->h_name);
+	add_alias(host->h_name);
+      }
 
-        if (host->h_aliases)
-	{
-          for (i = 0; host->h_aliases[i]; i ++)
-	    if (strcasecmp(temp, host->h_aliases[i]))
-	      add_alias(host->h_aliases[i]);
-	}
+      if (host->h_aliases)
+      {
+	for (i = 0; host->h_aliases[i]; i ++)
+	  if (strcasecmp(ServerName, host->h_aliases[i]))
+	    add_alias(host->h_aliases[i]);
       }
     }
+  }
 
-   /*
-    * Make sure we have the base hostname added as an alias, too!
-    */
+ /*
+  * Make sure we have the base hostname added as an alias, too!
+  */
 
-    if ((slash = strchr(temp, '.')) != NULL)
-    {
-      *slash = '\0';
-      add_alias(temp);
-    }
+  if ((slash = strchr(ServerName, '.')) != NULL)
+  {
+    size_t n = slash - ServerName;
+    if (n > sizeof(temp) - 1)
+      n = sizeof(temp) - 1;
+    memcpy (temp, ServerName, n);
+    temp[n] = '\0';
+    add_alias(temp);
   }
 
   for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- cups.spec	21 Apr 2009 12:49:30 -0000	1.438
+++ cups.spec	24 Apr 2009 17:18:50 -0000	1.439
@@ -27,6 +27,8 @@
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
+Patch4: cups-str3167.patch
+Patch5: cups-get-jobs-printer-uri-relax.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
@@ -145,6 +147,8 @@
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
+%patch4 -p1 -b .str3167
+%patch5 -p1 -b .get-jobs-printer-uri-relax
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
@@ -445,6 +449,11 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr 24 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
+- Accept Host: fields set to the ServerName value (bug #497301).
+- Temporarily relax requirement to have printer-uri attribute in
+  IPP-Get-Jobs request (bug #497519).
+
 * Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-1
 - 1.3.10.  No longer need ext, includeifexists, str2988,
   CVE-2008-5183, CVE-2008-5286, str3077, str3078, str3059, str3055 patches.



From wtogami at fedoraproject.org  Fri Apr 24 17:34:21 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 17:34:21 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest-setup, 1.4, 1.5 memtest86+-2.11.tar.gz,
	NONE, 1.1 new-memtest-pkg, 1.2, 1.3 .cvsignore, 1.20,
	1.21 memtest86+.spec, 1.44, 1.45 sources, 1.20, 1.21
Message-ID: <20090424173421.7E1FE70106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26403

Modified Files:
	.cvsignore memtest86+.spec sources 
Added Files:
	memtest-setup memtest86+-2.11.tar.gz new-memtest-pkg 
Log Message:
- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
  during livecd-creator
- Put scripts into CVS



Index: memtest-setup
===================================================================
RCS file: memtest-setup
diff -N memtest-setup
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ memtest-setup	24 Apr 2009 17:33:50 -0000	1.5
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# package name
+PNAME="memtest86+"
+
+# executable
+ENAME="elf-memtest86+"
+
+if [ -d /sys/firmware/efi ]; then
+    echo "memtest86+ does not support EFI platforms."
+    exit 254
+fi
+
+MTVERSION=`rpm -q --qf '%{version}' $PNAME`
+MTPATH="/boot/$ENAME-$MTVERSION"
+
+MENT=`cat /boot/grub/grub.conf | grep "$ENAME-$MTVERSION"` &> /dev/null
+if [ "$MENT" != "" ]; then
+    echo "$MTPATH is already configured.  Exiting..."
+    exit 0
+fi
+
+if [ ! -f $MTPATH ]; then
+    echo "ERROR: $MTPATH does not exist."
+    exit 255
+fi
+
+/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+"
+RETVAL="$?"
+
+if [ "$RETVAL" != "0" ]; then
+    echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
+    exit $RETVAL
+else
+    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
+fi
+
+echo "Setup complete."


--- NEW FILE memtest86+-2.11.tar.gz ---
?
b??,I?X??&J7??P???gR??7???O<)???u????-?g??????????
?w>1+????????~?????C?_??[????L??y}?F_?q3?p????W??|OLc???i??????#C???n??|????????q{????>?#W&???????????og???????(??????+A?[m"?A?:?~??`(???N"?	?	N?c?V?]h?9	?_^?Q?W"???P?h???D??d??%~?G?%J??j
???SD?0?F??y4??2Mp?F???	?)Rh??4?;???T:??tS
???@?=1
????c???#??+??=??mA?????HO????
c??M{
?I?'/?1>0c&??"?????l?>'6???p5q.??H?	??63P?? K?K	??0P??<Y?;???XJ????'V?8	?????????NX????^????pb??A-3??^?0F?3Y ?Q?}4??/?+G?????A??C<???0z;?Pp??ZV?&"?????33Q?m?? =	
b?HO????HY?EJ?
?fs?%Q-?e
A?p??U???2q?A???	A8`??<?S?*?%&r4???n?0???????eX??fQ?J?P???
??A??"??;Q??%R?? 8??!5???_q<w?????B?:????
? ah
?B?Q6JK??? >?!?m*)^T#???????
f?P?wYZ9.?l?????cm?????? ?%Y<?8I?8???D??@??????.?~?1????5???O^?}(?????U????????s|?????????????[?????x5???K?F9??><?Wiy?QFp????S?#~8???~?
8??~??W?a? ?????s?0?J?L$?h)aIM?xF?0?$h???Q???#Y?
???F8z???^"?QFJ	2/

?c?N?x?,??!???J??xcy??PQ=?4?'??)??TLe?H?0????D_???p>???$?$Gx	??????ZUsp??tb_??4J?ter?pL|??0#)?Q?%Im??0-???g/~";:???_?O?N?_?b????=??:??????(???????w????oB???tq?h??H????EF'?q??:?????C+??g?~?k?s?%??V?????u??
????@??Np
???Rg??*?8J?F??8^?~e7k?o?r?5??????&?}`?s'ifXYG!V?9?d?yK2?bZN??%~???wb[I?????`q7??D4?7
???????+v??Na?+d??S5f??x?
?!?Lk?
7Lb?-????.aX???C???(?L?
?&?j>??<?e?<~?????????1?K?.??<?r???c???%?n-??F????L???0??nc?d????\??s?G?
??X-]F??q-???W?+??F2??????qW<?|?=????x?!X*{V??s?^????FY??_WW????H??7??f??N???BJ????Fc+?????QfL??b?Zs??z?????Vc?P?:?E?L?>U????3K(G=#;XF=?C?QG(??&p74C?cK?(:?6?X?4?9?
??'r)??N
?R????l?dG?Uq????oEw???	????I?Z??h?U?i-L?b?ON
??x??h?z????q:????{8??yNgK??Vr|"N??9
??i??9
?8
??IX???:i?v????w6??j?????????????I9U??!??????0t????C???/??g~????d?????^???B??(???5;k???N?W at J{?z??2??????]tM??}???l??s??E??+??w/P???B????q????0?i;h?????????z??mw:?|*]:??H4??{?-M??3?d ??O?_?????W?/-?xr"?@~g?~????q?Nml?f??|???Hy??a?,?????P??n??????y????????g??????J?%Vj????z?~?:????p;a8??^?????f???3?<?O*t???Rh!???2?????B????N~?H?????bG??d
?v???&?
:????U????}?KuM}?uP?K?_???}?@?VH]k?@? 
?^mc?l<q???#J>=??2J;?t???????p????F?0v
??????6>o?
??
J Q?
k4Hx?d?l??????5???v??d?????hH?q??J0|0??I????&F??t!r*?>F/?m??]SK?`?`?s??9K$?P?@?W?+!B??UV?s_`?T??!?????`????W2?TM??
=????3J?/5?sT???6AXC:?G??gR???Q????b???J4F?N5???^???FG?%2??0??u"??f?wE?%g??l??O?$\?#?R??!SZ??:WY??'??HU?????,eW?nj?l?/
?????0a>9???L?
???j????\???WW?u??m0'??$??EZ??????,???.Yzq???V??r?-^??
?
dLy?:g??hF??????vn??jz???:?I?<m?!U??h???y,?
Y??? -f?'?PB??!???#??
=Px?`o??????&??BG?pJ	??????A?v?3?l?7?
_?
5?S>C???V???6?nP7?????a?????X?0???V???-?
?A?O??B???r??s??????O?
~M?????
w????????A?#?????0??|?n4<\??`p?Yo??k?VFD???????z?9?u%??H@?
a?$e??????T???)K???_????????IO:?c?b?s????y;*?K??1??=??V>?
Q?[?s(??????1????<??4?Bc???VZt
pH#Qes?y?t&?????}Z*H??U??????RZ%??{%??N4,?t?
?????=ZF67('a*q????D?V????zm??z??'???C?p?/o???????-9??n?wo?stP???-|?W???~?h?[
v?????n?}????6;??s2????a?
???9?????m? K'?{?g?	?;????C!9?"?f?J^?[HkUj??4?J??A?t"?T2?kv??-
??V3,?????z?????*`???
k?]??2?[?]?v8???N?iWoq?U?/R at t*????????!,???????j??/E??l?? '?1??j-?V#?=??;%?rV???!??H9??H?Q?P??N?*?%????R?????N??;???????G??V??s?w&5????2oC?l?\???k9	??|?c?????v?] QXq?#Q?$|?4?@?
Z)??zB???3?1??a?~jy?????????B{??AUU?e'(?????????	>???	]???4??d?)???????z???t????????m9???=q`????O??R?E
? k??u??9??%?????<?5o??]??7=?/?I????e????v?j1?????????bz??a?u???+?a??a}3????$???4???sI
??+?!??????E~K??J@?
@??{?q?y??f?7y??F?F8???Q,do*?W???????:lc5??????8?!?l??	??2?%?
A????`?&?R?e??%z?`a3??g6??U5?????BL^??J???????pj??=Dx?Li_?E??^???(015
E?L92R
d?0E???8G??r??
?"????Kp?8???+?????????c(hCb??st?F'(??t&M??[?A6(t
??L#?b??lW??I?)????-??1G????L>?L?????y??R,?M?????cA?a?6
?Sd???4?e??N?Z?v
?<"???@?
???
;P?<???\?????d??,????????d ?LH,????????????B0Q??[[[9!Y??KK?	)fPJ?????L???dH?\?MA#????j>L?\(
?S???wu}>
??^?? J,O0(Q!W??|P?O??jiy[?5{y4?1?P??%-h?8_<=?:?S??j?^???L
???d??????i??3??x?HJ??Y!???Mfx?81b???\	?)?I???F.{?o?,3<???A??0G	??/?PE?y?A???????#?(???DQ??m"?(?E?
?e/&5??)?oL??Y??(&??????Qw???v??f?9fW??[?}?,?qg???rV???X??.y?^???dGs?n???{(??3??????%1Ef?d??`	?1??.?asV??H"??drU?j$?AJ?"?fv??0%?#.?3!?a?qu?)???EM??tH?tH,?[?+???	????X_??D??Iuo?b1????]???? D??0/eRw????A??-%j?D???hR?*?f?3o?C=G?????P
f5?$C?B?)
?p? q&xRl?Ni]??m??L(???
WsI??d	ah? ?]?nUDJ9I!F]u?kVR???),?>?H`?i???|?R=??	?A9+???Q\?$????X?v5r?K(?"x?*f?Uk?B|?.VzN2{Bf(???C??2??f+5??R??88<=IG?
?k?y*?D64?_?Y?d7???)?J?? )????e??S?????????Z)m#?"?.rj?@i???????#?#?R?i??`?a_q?Y?Cs?,n|???@G????Zo??)q?P??u???7?"XL_????u??????Pj??K/@?k?Y?`?Qq?4,Z?Q1q8|??????Z???BJ?fIlr?-]?8m-????,8_`P
U<??"h?\D?>????s#?!)???w?6d???SSE?q?>????}????6Y?,???`3aO?4J?;?8A?b??|?b4*?s-574?ni??-u"b1?A?xj
C????[[)?e6?qP;?????8l??ebq?[?bi?2??i?j}lG????H7???]b?c????
?#??>????UL;?s??^)K?UG}?6E???|???p???"?????3?4?Xl???
E?2??<mL?6`?c?????+???f??!C??P???*?"?I? ?qA???lQ?.????!???d?8?7????T???0?Ck-????'?F??`????????N??R?Y????
h?"v???.?Z???t
??JL
?s?????ZdW%b?2]?g?B?f??OK??l?#]
??Vl6?(??{
???MR?X
a.?? ?C?'m?j??w?O??%??kaJ(,a?${BE????/U??[NL???\?????GFr*X?'?9??$[Q?Ig?	b0??c?????20??>^Vp32???a?q???A???;M?mb??|??>?????u??f??N??????a???H???/o????A????M?????n??????U???d?o{>?1^???O|????k^????=????^?+???=????
??|???s
W??.3?M???eNq?Q
??4>?B?O=??S?????G6??~?b???;RO}p??????]L5??x;R
????c?????V?}?G7?~???oX?????>?)???f???S;?^??I?mj??S????]???\Gj?G??9
O?27????/7???T?:>??&??y??/=????????????q??C??}??????|X?n?mpq
^???n??:u-?????????&_??y????<?~????-?oi????H?*?{??z????#4???2?Y;????B?????lmh?
z??gi{`
?G?i???f??%?????z????we???????4??

?WR?=(???_?-?-??????S????|2V????(??-????B??[u??e2Q2?????y ??k0E?;AF?r^???
???[?? ????.?i????8/"????-rC????t,C??sY?h???2?R?d??
?x40E?K5?lR????2?O<?=?1E0??x3????????Pv???{C??^?I?????????&?????1??7)|?1e?TdP?r?b???8^??j?????????>'??????O?N??6???????5??l?l??K?2EsK&Txkx?nk?!?#????:???
)??c??#?"MqT?E?I?8??/??????s??C?N?y????8?????????l??????????????b??K????;@Rk???A?U?X???W???v/T? ;?
??CySt????D ???=:/||5?l2G??O	?G?&1??O?%;???????UVT<dlV??c???Li6?5z??????!??H????x?Lp?pw?i|?)e??<L
J???Ggw}?;??s?????5m?????"???,?=???d?\????|v?h??sV?7?k?l?%'s??????L???S?F?N??&?C???pAg??M?<???tQ????$w`8??X?K?0auh?;$O??????>????E???\+P?bn??-5&l????X????FRO?*???*????x?y????T?3
??>9Ti
?????=?0N(?o?m?)tb?@?Z????????,???Wd??Cc
?F??y
?s9?z?L?B??2d
{?q?#??L:?~????|&??QZg?4%K???y|??
?H14`??>0?L|?b?%??
?X#???]?????*?u?sY?{????k???okU??"????_?4176M??i"&?|b??tHWe?
??u9
?@?gK?;Sp?z?YI???7???f?ar
????z?7Sns??aE]??&??p???J???????p?b
?Y,??0dw??#]=??>????bINA&.??E?P`7??t??#`??Q???I?9o??u}?Zk????\??t)U
?L?^?]?`??????w`l???[x?[?????n
?w?????C??UKW>
?8OJ??Ek???Gh?C???E??????(????????????R	??
?r^????J?????<?f???s????1w??=???9}??6a?5?????s???vL??:@???YR???m?s.;m?o?l^c:{a?qNh????p??h!???+S?^??B
??.?????+?W??y?6>i?vx?Z?"????#??H??9o<???R	_	?????RC4y?rM???U???6H!?b?rI?w??????H?M???~?2?d}4??????U=(?k????q??H??????)???u2??R???5}????*8????????tw??.
D?p?I?Ei?%?<?,Tep?
?6
?$y???z??+???]?6????o??MZ??n?-e????M~w?d?????Q?|??.?A?=ce?Q?????+kk?????V??68|}??	?5a2???v#??=U?7h?DC???2??>????\1???o?Bq?????M^?|????*(N}M??j?(????b
?5=??E>????"?t??)??r??u;h?F??k??j)UoLss+n5?6V_???0?:??*?K???r??G?????G????^?$?KE[_C?Y?I?????,,M??O9?B?v@?#y???F? f??Jj_7 	?=??(l??p?K??+
m???p??
?+?}?D?z?/????-?L%?$C??u??EU???R???1???v8Q?Z?????b9^?Z'In??3?dg??Q3?_??=?qL?>??U??e??.c=Dj?7UK?:???t?#)k???R????-!k????Q'?????[???W0??U?<v???=f???,F6?s|??>?R)?*??]???p?t?R-|nQrb??S[?w?,????&=??????=?rl?c????????zS?~?e	?k??????ohA??????5V?K
"??v;???RL?L\?I?y`?B$??(????MK>?<?re???b???^?L?1?????L????????D2?????F#6Z??????t??d?h?B q?5
9???j|W
?Z?????8K,T???#???????es??ZR?^?:????+????,??B???nN??:Y?8k?;?z[?:??5??l7???????E???;??{?b?????? ?????uu?:?oh?}???????R?r????7??*??\}1>??e??p???b:??h??*[y*?YE?7&??b??"?W???????X?V??k???<-?6U??P?.w????
q??Y??fq??2???nF???p?????#?	:V????L??A?i??????r????#?*
??????z.3?u????=??2??z??[io??tU?"?.]?+?e??U)#??*l^?e???Swm????j*?PM???G'2???u??:?M??+6 ?ji*?????l???^SS?\?T?
M%??????R???y?0r(??%Ap'?X"????	R?	J??%ZE?gs???Ah?
?7`?}C????0?????????w??zEvU?
????{?g,?c?4??(??????7??W?Q?m`?}??????G??S??n?"?3=!]???x?,(????8????7T?p??7???X???M?s:????_?2?('??R???G?K???a??d?[b?{jK??J???%?.??????p?ul?????+????W&?Q????CN
???E'???+??Q???Jl???0????*?V0<R-?j???????`?]?????JP???r?r???????V???P8 CB4+u
5#?>oDrEx??~__??9-?kz<???xM??wo|??]k??????k#o?w?????Nq??tW???]???_???X????????????@??????r??.:???*Mo???F"?pL?`?
?c'!v?"?c?c0???k?????k?JZ?y+mv?x???????
?"??S???7:p?Y?/_?%?wbwW???us??{?A??f?;9l???????8r??Z?wW	??p\???X>k??2nq+?(???f?d=2???b9?????\?????'?1Ct?
X?1?{0'r????k???)?Uu?{~??5Rwj?|?"/_cAz?@hI???t=???+??X$3T???{??LG?V!T?/??F???]3???????Y3;?6b??1??Z??a???E?@
??F-?6j?kS?{m?zj?VH?y?Z??G?z$?U?????P[x??u??L???+???%_?B??k?
#??P???
?!!r???+??:???j????3_D???H?? ????EX??d??Y?`?D?t1:t`?(?h????y??
????C???|???g%c??#N?5??R?/~j?.?a?????f???P?S+-??4?WZ??'e=????%?i?????i??W??qt{
?????????Eb#U????$<Y?)???2{C??*L????U01?F>??o???x??-???s]??K?p???wd??y\?QPPS??

?%??:*???!D?l?????}a
?=??*?h??8{T??????}?????A?O?&?f,}?BNH0?}~HW.j6
R?j
???Z80?Hp?m?>????L:?f?????o?=????[?_??????????o?&???^??ob\??-S.???HmC{?
u?+Z?w8?6?D\3/?Q~???????$?`?U?X`?8?? n*????{???????????SG?F??#??M?Su)?9=}?I????$?w'[????ZV?q???J?Slg?O&Y??U?JvH?+(h#?|?g?p??EJ??)(???BW?r8?{^????fw8?!`?<:??	???#??X9S??@9?vAK??o??6??(???)?>???&? ??c??-2?k?7???u?G?0?'??S????+&??(????`??
P????Vs???????b??G??????l???7Yl?F?/??3?#y?r8??f??pf?=?t??)k&???(V???@0??????j??'
9?2??A*?V?L?F???}D3??q?xb6:4{??rD"AW???~}P??????????b?????/??????9f>?????%Ki;?D?NNeb3<?8? G???L ???Z??{X?' ?????wr^k??@?
???I???=?C?YPh?04???6

??jHY??	??1Pu#?&4A.?E???r?<X?^?M ?`A????(??w=H?"`$?6c??.??0?Z???t1??I?t?

???	??M??I?T at m?eU?f??^?Wo \????I???1A?
?z?QD{I????
%Bu?N('????????BR?c????v?63?g????Z	?6Ij???Lt7D?P??	???
???O?D??
???s|q?pE?ai??5???YdW?mG???C#??#????
?t??\UzC??p?]+Pb?~Z?mm?:u?B?n;S??D??t?d,Q??z?????:?FD,??N?d-??5?.??I?d?T@?????
`2??e??(??9??????)?K????[V?B???"???g???{X??o??!?>?N
??i??JU`?????
??Kc?A#As????m?\?!??)2?j????u ???Z???<i%????x???`I?qm4c???Bzf????k?j???g?X???}D5?A5?!I*R???W???E??i?!???*?U?W?????]IB???_?{My??f0??sN???mX?J??h????B?O??9?P?P9%??i%bP?*?yH?D???U??AJ?#?V??b??X? ?
G??9????5???/?nJ???S?????o"?v?]?N=??????"?l??q?}	W?????\?????=*??????@M?? ??\w??Yk?j?.m?p????"?????.)a1???r???c
Y?p?????1ve??a'?C????A???5Y???m7??i?6?UW??hG??2?oH?i=????uJW??u???9)zY??
?????@9h?x?<??N?/4?????????[S??"Sq????!Ag????FE???l??????fW
??L$?E??`?V?$?.
??C at 7;????R+???r??hB)~??Jk???V??????
m^??3o????i????VI@
}???????)?j??G-??Ex?D???|4????t-C??B????b???189:}_t|d??=???h:?c{??{????B??????&}^????#???L ??5YA?U6???????
?w4_h???p at n???????C??|^Y?Z?
+U0?????p???(c6?u??f??<pU???A?f?I??Z??b?????5??Y(?????????
8???U?\????\?@?0&?r??l'+?w?/?@M?
??????n =?! U
 =Uh@?zc?M8`???3???n?? ?;??M???9?W|\?FVl??????Al?M?.	"^DW5?x????"R
"Q?[?H??]
"Y?G?H??*i7??D???? ?U z9?5@?? g???SX??W?|?%r?r???O??gA??z??c??E;X?-?5??????t????t??*???5??????V3h??????v[?r??b?<?@???N???Qp???Y??8e?\A??c3TE???zo???/e?????%D?,????}Jc????????%-k?n~?#?/G?I???h?????U??J?,:??d?(?t?????ag?NC???t ?p,5???>p??x???
A/Y?0?.??r????
??h???%	???-Dv?|x??????
? +(9S??@?????????N??&n?????Z??????$??up>?f(???7????j???-?MM
???A2?&???0?????LZq(a??$A?J????p?????4)?YLR??v0???7?cG??nv)??R?bE???FD?_l?53
?VD???T??Y?m1d??@MB??=kV|D??@
?CU???9????5r?R~?vt??O?N??J?!V&h?????u?v?>??4???^???j?????????-_1????K?T?Zg??g??r?8-&?C?hBE?&???????? h0??p	??[????=N???Z??D?Bt?7??P???J???4?Y?p~??Q5??Tr?Yr?F?..9?,9_f7?<?,y?V?$?\??An8?????????x??M??v}>K5Ro?????nQ????)7!?????
?????c??l?n6T?????BX?`???????W??qV???jU?vV??+DjU?qV??+t????Ya?^??V?^g?^???Z????
??*?.????Q??\5c?5
C??????d?6???U???c??????@?1?V?6LW
?????>C?{?w??Xv??(hcqKIP!C?b9?J/???i???@?$B????dXG?%V??U??.??V??:?}???S?j+V:???.?
Pw,
>?)?Z???z?
!?t(?\?1W;?????EH?3A????%????YP2??A?]?}g????J?#?67??!SI?!??kb}??do_ahyL?Bh?J]!?
??<????U?\???PRD{???i.x:??9
j??n??uh?H?
?'	??"{??@??q?(?*??Te??}?m0'????????x?????J??=?S??
T?>(?????H???>(a???Ie??8^?#????]?f?H[?4H\
Z_?o???qk?????s??j???P???:???V(???.9}N??"h??AW.(?'?g?{?L? xI#???????1?K?????K?&?8??XV;g?b?????AC?5??vxl???[`l?v?P????f??<K???v?C ???8[;?,Iq>p???T?[2(??8???!A?-??$???????Fg??Z??zC?j4:???$??e??UA?????mzK??T?j?!9o????
?????h
???2?+??&]??3???8??*????????I
?&??b?)???????*???+?@????eHtwtDv??b??>vg??)?K..???{??|
	??ZT?gb?1T7s?:?O?:?Y?UD?8>8:=pd2zb|tzR?S?P7??d?c/71Z???l?qk~??A?n?[??????????#	+?/&??p???n?*????|,?????D???8?q????????8?o?6?x?E(??<?n??rc???Z??|E???E?(
??????$?????e

??
)@C
PRVS
?S?[?)hX
V?,I??4?N1?n;?
PJ?oJ@?)??c??
?
hFVSt??n;?
???Q?)@iI????;EML???
?iY?[???b???B??Q??Q?2?Z?4?N

d???P???y9!????S?L???6?
?(/??I@????S??4?
??T??R??;E?n3???$m????8{??B.-2?
PYVSy??b?M;?
?qhA????N?S?p?N!@'?
??l_????)?!$S?}
?}
?????t?;???)?~?~?]T)@Qw??e?)(?
H????*??]?)J5?2*??2EI???Rx@?QH??el?{?B?
??
???J???J??)jZ??J??)???J1? ???????LQ??]??%ST?wV?Dd?j??*?[?()??*?G??!|?;??
?)D??)B?(B????8??J??)j?[?R?d??{UJH?(??S#?Z?:O?u???????{%??BL??Q???U???Il????&'?	???fXh????????y?i?5?.?\$W?X?[?;???n??7???g2]??RK:???f??b??e((????'???d[c??*\?(??????o??a??8?nO?e??T???h>??~??}`WO{??\6??ytY 3
?(Av??1?>????E#Eo??k??G)?C??b?@A?????????d??eDtl2?h^y?:??????E?(?Y?V1D?J??'?0?T?????ymq???XV?~?I?taQ????Z?AL?{?R?c????G?????!E?j
Z?9?J?f?ZJ'???????e?i!?K??r???p5??lZM??????l???g?VFA6v\F???????:?JR?0????4X3W??9??
EVM?1?i??D?9^*??7t???J???)?2??=@????f??.3?????Y??????7=
G????opx;???????????BV?m?F??M?{^?c?V???3^??o??@?J?-???i G????????????6?H??4`???p1????*b??????w??3
{????Q}?yN?g???F?????+?????]??
???>[?????%PR? ?????n?,????`???j????>4g5?b???????	???B?X?o???2?v?ln?? t?
?????l?lV?=c?+?8??Q??X?Z?????l?7?g@???t?W???=??)p?Pos?k:{&?
?&/p?H??8?@?T????*??V?h??i??FUC3?B??`	?{V?fgPMpzW?U5,?.??K?3????UI?<?>?9.?hv?[5?<Y?5?P?wN?PR`??_??>:??4U??????G????O??MD'??????
?
?H?Wy?m??1???L???????	??????E'
?qu?u??Fz?
???"V??>?????????qV?p?zU?R??n??K?2??!??M?
?????H?;_?^/?*r?@??t?h???1??????^L??f??o??P????M9?}?N?
?8??^??	???
L7?>o`???zk??X???+?????-`??
??o???R!}???I?<???
?X:????N??k1c6W,
??????Os??T?b?<????xyff`??E?T4R??p7?As>?Eg??r?????|a???l?p:h?g1L??????4t??????M"?T??????N? D??Cb??????#?F?F?????0?J? ?)d|?2?mx?'G??D??V?Zj???y??+G???z!#J????\Or2??op(?3V6	?3~??&?1?k??|7X{SE??e?mg?
?e???????nj??~?k./
?<wD*?^SzU????????<??*????????"?E??v?f,?<o????:06@???P5??^???+??f??M59$?h!?a*S?????RF8w9q/CD?&????
???1?F7??\
V?$?+ 1??y?-?
??{???'??t?2???e??z??\2?J?n?a3";?9S?g??????????M?R-4?m????c??_????w?m?[???/?bH#?i?1[4??P????P?DoOt?????
???q5?ver?0E:?e??Fa???v_4?Y? ?????v?)?q)????U?Jw??)i???5?\?R?Hq?(U?Oyy?W9?Q?7?????????{?aG??F?i???G?F????:2??>2?
?
?1???`?#N?FNL{#???y#? ?;?????a&??g$?E!???????+???H???Fe$?"?4?9>fB??#?????????}????F(??b
?????????x??????uW???gT???J?|??3V"T??H?W?A??:?cP|?9N?"??????A{7C?!??Z??w?????vL?.?F2??`??+??ATt??H??#Nr?V??t????????c?F{?3???????kU=su,?v?X???c??k?????y?vl???c?o????];f???={????V?0??????U?????a?m?m???o[?|?? ????Iy@;? 9A???<?yD????i`?a?L??JB??N&FY?@?2????Q>??P?<?????i?A|A?Fx????m?G?r:???0?M:??????,	y???????U????F?AwdS=?
?????x?????c?????j??;?????H?4??+X?nz&??eT92t?D?i.?eS?t???axY?????\"????.?????9??
?j"??`h???0?&N|?	?]E??l????}q??????W?p)I?C??\P0?L??T?P?a?-????H:%?*?R!F???????1?r?"???N???]%???F?**??'??0?Kt??=???MA?Ghd??xj?w~x??? ???b!??& ?BZ??"dpFP??l?z?Ib?X`u???l????d??wG<?u?xq???(n????????? ????|???f?j??Ul???!F
[?~J>	;??(???????N-????2-+F???OtD?;(?A?S9I>?????g>,K(?h?????\t??'?[8????2?+??n?D?C?p!????v?(?Q5??Bu?DU?^U!?Z?yk?
????su?$tL????a8p`?	dd??q?????q
?J~ugz]	WEy[????=jQ_q???\???qqK$IF??.?.h????Q,A`!I@?6*????s?I?[?z?L?A??????	?)X?9&??????
?A??;k??????<?0k??kv?t????W?1
??8o?b??8=?????yI????F^?u?)OzQ?????]??`???????c???
7?Ix??(^?9F??8?'?c?D??	???N?G'??Q@??%5NH?>????u
??bl?????-????v???T??6?r???7Wj'k??O???????ghww?Y?? Dc?-C????X9S???????????
H?O????1??u??{Y?????Jf?????'?g_??9????N[??,?v????`?Hs??????????j??(:??
.??7v????"?????y?My?AF?E?#?}??}
??Y??
?Y?mz??P?v?z??6?D?z?l???????N4Ls??5??U??f?|????f?u???Y]?47?????in?9?u????f??eK?wc??????X???? ?I?rZM???9?N????????V??j?wZ??!?+]o;?????n???N^>???0t??N??C.????#??????1a???4?q???Ox???B.7OjRWOpv???*???@z!?:??1??p??????fwbe?
??

?|?K???????????4?Q[?<??)???`"??B?4?k?<?x???y.?J
hu?pU?^?:]rqU??????TZ??Uz"??*??i5???PU?4=?(?>?5?F??NL??R???????l??.???Nk?Jt???0<?q????3???
?D?????Vj$?L?^?????????%
9#?=?D?S??liop!???|??D?y??F~x???:?=???????N??:?#??t?x???n????\?
/)39?AU??????yE???B??Y?~?50}?**W?8??|
??|"??}?Vf???B	??	??<??nT????>?\?y6Sx?e?w?L??1??*bV?2?D??1?s-???^(???6????!????T<??y??y?a?Kn?
??|!W%?#?"D1=?,S?
?????:???"???Qzgrg}??	?e.????7>I)?:IG?
2?,???????????4&G??d??s9????g?
v?
uz1|???_?z?X|?nPj?H8{j4??'???tK4?x?????TVW??1??,q`??Z?h&=?A??5G???E?F?
K????????r}?)V?R???????Z?B???s???V~??R?":?q?r ?m^?3??k?4Z?(,@}????f??GF??Dl???}?-?Dt?Rw)';???
?M?4	?(??A 3?C~??N~]f?????'???e????Y?D?????"???0?h=??[?C?1/????b?+????o
?tRHc~@? ?????W?
?0?WN?????"C???????"?k???KfV?W?G$.#?#~Lf{3??w??7?f0v`0??(???D??Tu?H?#?Z/?W?I??_????4
.HWP?S8?T?",?}???i(????0?,????(??L/p???#S???}!? s.?`??i??A????W.$?4N??bFN?N???O???=?nFk?????p?????p??$6????X,|?9E?jI????Yk?*v ?E??
?P?0?A??l?#_?A??k?.??V??8?Y??B?ljs56????????%H?)???????+???????{"??|?%?4?g????#nF??!f?L?@h+?P"?s?|? ???\?{e????F r?c?b????????N~	??@????1 ?:W???
??!?x9?
???KP_?`G???,?|Y?D?OLb%?$v??T?+6???se???RpI?Z?2??v>K????k?4??,???D8??
?`?c????On\?????t??????C3?
?p???s6?o>??<?7?????zy?_???A?r?@[?????????$?@R?????I?
*cL'??o?#??)F4Jj????????i??;???????
32?:^??????A???^??8?hvs1Zn?~???Kx??t`rv??????^?)?G????u?????fw
????WQz7'P?[????ZE!?9??U'?M??IQ<???9|??X??s?\J	Z???i(???x?4???G0?E9???????Y??????lB????4????^???'?[????Y?	??f?A?@????Vr5??!????.????????'?y?Y1N?:?9|V2<w(???,??W?$?????I?Jg????SC?(?!R???????X??e???=y??I?n
`?????5?????]?O?>F?@O?f??.?V??4?tMrI5.?z?l?bUUND????
????!??+?I4????>?8?
?~?K?;??9N2????:????~??????%?;???q???G{*p?8???6@?~??G???BRz?????????)?
?Gk?O???4ba{Vtw?8j
???3P?@?jb?x?,B??h,??,?????F?j??	??H? q?6????4t???S?z6g??nD?^D?lqAgAJm????R???CJx?6???B?:=??h?????=?8?
E?????z???
]?2?T?/hbe?????R?z??RG:Nw/#????X?
	CC<??h
??
~&}?`7?zF?8+?Ya\Vb*????3{&??WOqW??^??
?@??w?????3??m?>8??F?4{L?????\S??Aw??????C?cX)?
?.?=?v??f??vP??>??B??5??k????i9ZZjNc??V8?
[?jX?????-k??b?A??w2?? #?>??r
???5o????d?f??_???9??l;?w?a+??a?B^y??#???}???	???????0j~#??#uh??6heK??e??'?"
?????~?/???j??4?&??s?~?_3T#?o8?????
?3??'H?Y???)3?3??{@G}??:o??!k7?n???=?B/?g??A????$`?=?P??G??????Q1O|;%v????'"??qX	T?X!IQ	
???U??????0@?>3??	?	?????c?c????#H?z 6?lxE%Q<?+?E?	???????????????5????U????\.?V??bRR????6nk?>>8:m M????;ETi+?&S#??D	&??q
?0?n?+?E?$??94&??N?? =ho?`???_\?????F???%?S?g???*???=?B??zJ4J???gM???q??
???IZ??????)?5KM???6???ttp???i~??F4??
x5(?Q??????:?!?q;R?}?ZXt)???y
h-<?3S?
??(=\??VP?8???\s*?M?M?H?!?7??qs?s???m&a??=r???!|z9?????
?^??????^?$8X??9???PA??d?W2Bgb??AC???j?tcx???(?f
?ybR??]H???;@??
T?????bQ?FJwc?H?????&?h???????,:?#?_?fz?~?r??g?e?OJ?O?????]a?q???~??o????~??9???RHOD?5z"??????????Cj??6Y???~}>??P??Qx??V??Bc???Fv?S@?%?{??+{?
h??t\}??????X????????GA?
???
????P?????????n?{+~????G??X??)??d at K??	v??&??y???(
??????)??C??l??????/????4?\?????z<?L?A1\m?L
??
?I???x??????
Q4?G3????????r"`<??B?>?t?[?F&e?P?5???yX+`?I??V?@^?A?c?S
????}$?d?|???
??}?????D????{h? 4?????=???8??????8??5??4?*(??????ih???x?_?N?G?????mm?P????1?Q`?$?LTq?lq?????????? ^??)K9?Nv???5!?
???N?=#???:
P????????
??J???N???u??+??d???@???????G?
c?x??a??1pW`M.X???s??r f2b?cJ?%?]?6?????|,2tJvXU?Q.??:??>?-???????&1??5??e?v?T??L???Ug??OI\R?UAB?@^???????>??Z$z??D??	o??'???qCC???x?.l???idjd????P?l?tS?T?c??@y???p????X?????i????{?/?G? ??dG&Y|?{?u??fOw?k??;????[?s???????
<??7[?TW?=??????'r'??1?n??e??T??|S#C??GO??C?
_?6?)??s????~?
h?;Z??|?3?A@?D?t?????x!G?<??????<???????<?A?6?????ag??.D?l?8+??D6??uc??
8?b
??V??a???g@?!b???^^$i?5????HR??gr%?U^$????0,??"I~???<?????2?qr?C
??A??C??qF?$??W?,(3K-$??"aO??)I?#?H?????l?:?9??@???[??$???8?S?A^????@?
x???1]??'????[??????n???g???????l?<c???k????tG
??0?/q?I???L??P??1?????l??(?3 ??	+[??q?????s?~c.3Z(Ezs?f??????OMv??:?}F???????S?r!
%:gs?Vg!?Nv&?;[?:x?h1?=	sl*??t?0t?)Nh??M????0zC???@?4???????v????r?\??P??R?|??s??G?NkQ
?]?]?v9?O8?<?f??*???N?d?N????u4?{8:<???A?OX<A?????f?&????????y?&?????{???=<<?_.?M??.a6#!??9I?={?E?? ?O?t??/`?L?W?7?ES .??Pn??5???wV?h???Z?n<U????:H)??*t?@?'rY??V2a0?;g?6?U??m?O?\8Ej?????57V3???L,S7
?P????tg?.?'H???
Ax
nX??%NU?Qe):?n
?A?
*f?
0N?????9?7?W,?SA??V?? %?
??5?$ktuC?????$L??
?????\???t?MkcM??+????o???P$?M???u????y???'?????'.~???V??w??K_??????????/>q???*?m????g<????]??Om?|???/U??s#??JV?J>~p??/<??'VB_
}??w?_??&?3?MO7nz???wM?t6T?z%?p"???W_|??_A?wA
??
X????6????r?46??!t?????z????//5<???????????[<+?
+???/z???O?H?x????T~????/?{?l???3
?u|??6???\??eo????-???/?xW"?xdul??????n??m~?Sn???s??????z????k???~????a??W?z?????0zq{l???y?o~?3????|?????#_?4|r???S/??p???[c?M?l?0M????V/}?FO???]y????=???Gn?????????/n_?????=?}??~???n?$?????T?g??????????/?45??????????_Y}n????!t?????
????????M>?Z????7z<_?!????|???M???65????45??Q?????=WK????dK??_-5n??????ky??V?<?o?+-???????_z?hM
??z??????<??Ai?l?????j
???Q9?}???_m????W.?4~?@??_n???M?c[/????|?v?c????|????lo??>?>???p??m???^9lT??\?EQ_?-?
??z???#O???f???C?/?????y??<-?Z??OBcO?=mya???g?????/m?)?d\L?
M+l?
?m[&0noz?H?p;??a?????Do/???i??V?k~?x?5I??^????#?b{??.??????\zu?? ?`*?@?\zv[?????^?????K/
??<P.?G??3??A2l#???????3?????+ec?l(??)???wo,oyu??????k
???^-o?L??g???????+? c}??5??PQ?????\x/??????^?????MW??????r??<??3?x?x
b<?!???C??m???jS?x?o?Ir?R/h?????????So??~P????%??q<cB?????a????	E?^??;??L?=Pg???	?\?~<?????a????'????M,?RD(?;??
??]???D?IL?\~lnT|?>lf???=8HsAH?1?m??:?????/W3??\7???,????*#?????MW?????M+???/'????????6hm?Jg?Lj?Lc??Ob???.??9???-???sB?????
$?h?]?i??//?|+o??y~V7K0u?????????$??-??V?g??7N?l?B??b+???yH???????N@???_????L%_^?l??5=??o?fl
??W??/?}??.2?v?????????W?Da(vw???????@??+?7?,??+??m?w?????"1>????1$Y??B?5??n??u4D[??y?!???????hD0??'?z?????M1????^y?- =+???C?
	_??? h??=????????????[eT>79?j?{???!?????)??????????s????|
5?=??}??R?	bA?~	]E??e?-???!?M??GH??1\Vaw???
,l??ga?1-w?~~m?<????GgP?o?{????
?7??{???????A??VV+?
????J?k?-]n|?R??????xo?*Y??+?????<???F`???
????`??
77?@??????(??+?@????Q??`???'A????????U?rg???w??J??_????u???{?MLM???J??=??}???y?}?_?~??:??????
?????E?W,???m?>??Aiz?????ZN?.}????k?
6?
??r???Vo|??rS???;*??!???wNN?j?S_?Q;q???W?*:??]???;??C???
j?W??#1?Ou ;??B6?4?e???gW}???MK?6??^?L??AD??mj<~u??n???OML?r{?++??*?
?

?}?}??6?-?????Pz~[?z????+??%^?o?????t?w
?_y?????w??vi/u????E?]??????f??.???6@?_21q5?+F
d??????7?[q?z??????h?[?_??-\?p??&?Kg??	?e?s?UD>???-xe?
H??R?li
f1?.]??y8?v?[.|r')?[*+?Vn??^9~K??m???W??-?????`?`?r0R9?[9????.|????g+
?p????4|???
????????z*?+\?St_\??N?O??l?o??^~??VR/k?A?=?????????I?g???R????n????uG0???OnG?B????4??K????????&??m?U??/A2-=?????&6y?K?\?
Y$?b?4???*????2?r??06??F??(4????????K?\'$<??S#?s?`???? uW+1J???h}S??^4?+4???^7???.4????b?X?^???E_>a??T??9??-K?'?"?r???q?_?????g???~;.?c-????(??i?DA?F?????[?????Q,?A?x??3?????Q@5"T?@???O???6U?-????d?9???J??????????o??{?/?Gr? 'Pf{,?????)?????k??b???F???8D??y
??ngn????e$??P$?B&???LH??ng?	?%??T__a?q? ?=???? T??"??L?{????_6]?????P??K
b;?/?sh`$?`H?????^??????~????7???\?ER?T??????_L??????[Q??????????d??????q0E	(?!?Q?.o????f,?g?"'?^?Cv?}????k?&???A?????=Jl?y??????e???[
v??H????L?!??_Zo??l??"?7?Fq?7q??{"?g??M?0(?:?<??????[NQ?}Qu???o}N;D?-??|?m}?r?O??^?????zS}?>?p(?"??X?"w_3?0^w?ats
Q?3Bq??{?[??B&?Vp??W?Xm???Y/
t}7????D?8a+?9ok=?\???=???+<g????
?|????????? ????
m?7?s???=????d??i???????~N??V????g????Sh<{l
a_?P]?y???Z0??'d????W?BI?*s{ ???YI]C??w?t#??7q7*????!O+g??p:
???z?ppe?w?jI??c????q??IQ???&????!???l????i????a???nvR???p?Fs?4??Wh??8?y?M?)????9????(??????L??	??p?p??sp???#??<?????5?Y??
V?;?\??:??	?\?e???O~???5n1?~?????<??iV????|yY?????????!t-#?&?t?x92??IV??q<?J-?.?g.???7?y?(??J?zs/?????:?*??k?o??-%?|????ca?K,zy?r?o???O??9??????n;?Yz?-?*?^?Dy???\???57x???UX??Y??Ad???)?=V4?VGG??'>;+??FJ???ipiP!??*????z??X?7??1M???gy?E????????o??6n}?U)R???n?????$?=?"??z??????Wn?|?i?\??g????0????????$?R?q?????|?7????&e???o?i?Ro?y?B=?Ky?t'?K~Y?t6??L?w???
|????'?????c]w???_??%Egl??BC?{=;?????m&7?>?y????s?t~???+??\E??`"??w%e??+????da???4?\"?v)??3?+((!d`???K?L@??=W+??|?n{????'(??I?yl???????'?=u?Q*?g
i9??2]y??e}G?????M,?U????,??(?:z?Z??]??????????6?{k9??R?
Xh???"Xf?L\???0????????????\$??Yy????????q?a?an???p)?'"???
???U9???P?j?e?Z??J??K-?3B[??:????|X?+,&?[2????EbNrw?xa??:_?+-?b????fcba?sM???????+(??3?.?b??G???????f?Z<?R??????t,?????I?r??Xc????*??8P??I??|f?g +?,?"??vr?RVl#?'l???S,???wO?16NI-?lmy???N???K?.??????j???$8???q?`??n???????VY??+I?????<z|a???(??=?8eE?t9?#?????:K??Y?!?3X??K??<7??g?kM}?wZ???SL?h????0??Bj?^???g?^}?2J????iu??s?????CM;??7d?KJ?9??S+D??*????{qA?????{??G????
?^????X?+?????W?a?N??/,\??
w?I?^Z????L???6?!c@?A?h^?s???G?}5H??t??Q$?o???Y?N??L????]A??XqI??
_);??}]E?????????????A?_??8?e}5YfG??ws_?????)???<????nb"?????
J????t??#??^?qu???L?!?????????`???????:???D???[-FP?;???`????@v;??*?be:?c)?c??m?'?zV?
'????Y6??hz??????d~OL?????-X;?bc??
?8??)?????4????P?)?R
??5??&[?,?<?G???xOrXF?'??{???G$?.V???Y?"??d???B}???J?)V???????I1???#????o7N?(\lm????w?
??BkKUX??
?Z[?????dk?}[?ZH????*?S
S?-bu*
3y??????<?V??Z[??:#:x?G?xk?s?a???z
?<?7T???2?'Z[~??A?WIU?????yIw?'Y[j?+Y??Z??H-,????:%?[
?[[??kO?^cm}?En??Vk?M,?P?lm?Vz????J?o?????Z[y??!nn???????k)t??uV????6k+?#?o<?? ??;?fk?[[??O?????????w?-q??;?-?x??Nkk*[??u?G???????????q?????Y????????7?[[?d~??[???u<e?2?s?3?&??????F<C??
????????
3??U??
.x0?P??j????N*? ???<?*j/?9B???.*j???"?,1@?X?"TdoJ[QZ?.k?z?E??GE??-Z?h{????K?V??z?????r?I?mz??????G8?]????[p?L???&?!????"????<?????t?2?0,?wk?X??4???NS???z???
??"~?3?	??#??|C??????8?Oc??,??????}??????I????A?(?,?=
?}^?~?:?5|l?G?k/?:????????*?.;???5+;?:?,??-}?????	Q??6??)?????)?\?d???ti???[X}^\L?2??Gv~?v??\???&???=?a?{4???1<??TJ?v?????=V??????n???_?D
???q???O??m???
x?z?$???M5???}?+_?-3d.|??E??RX/o??`?z?????????'G-?N???XO???>X??%RJ4???;e???,c???(W?C????>??O????X???zS-O?????,??/?lo?4e?}*'?.??Us^J?o???K?F??X)???"?tr?E]U?Wg?Qf
Q~}
?6??W???j?C>(,??j6{?3^A
v<??B?v}??o}l?wqM?6U+???*??gR;???^????????????????cBmQ?????T?g?(???F????n]?]P??+0??
?L?"C?$??t??e??Z??U?Vh????A?%?C?jh??fC????5???Z?[?f?Ck???HZ5?^?[?:????x?9?u3+???????Ip?[??Y????>]????Z?
?~????W????4??,?jfP*??z?F???vg???wi<?|G0???[??s???e?J?aY?????'cWqV??q????????oR?{??+;?C??Y?????S???????o}???p?M????Y?D&M??[S?=i?9e?y<??}p??4?7m?W?M???v????????"??V???sV%???h??_?m,?2{?J??Q????4cB~?*?]??W??7?i<O-??e?b?g?]??????{?7??v???/x?V??W+??!W???g?b????5?+?v}\?????5	?)&?>??d??eI?y?_GxBi?????????3?xv??{u?S??F????v0????@???	m???
b????O??f?LN6n?#?D??-???5r?]-?mC?F??8D??w??tN?a3??T???L??u??E?? /:K??R1$?Mj???OnLa{??B?Y??{;?m?pA?n????m??Y??????$?
?Q1Hx?DH?K?E??????!}??Vm??"kw?UFN????d?^??$????%?d[|????J???`?f????#??<c??!t?K?t^??z???.??N??z???e????QNf???????S?[k?	1?0Y?<B??q-??-4?6k7f?#?v?"^?"?????m??.^?I?L?????#???I???;Lb?H?{??_???m*?9W?"?????@Nwf?p&???Ir?8????x??$^????=???'m????7
M?&?M2?2????es??????zn<Q???\??r?U~???K?????la?z?\??&?2e?l???vS?I?}#h?po)????1=??=?7v>??h?v)??r?????!3???c????W???Y?1??Ol????-?1
???V???uMf??^?5?s????n??????\?0/!?????|??0?kRh??x.?
zv???????U??JIn?\	??I????}??7y??G??m}?3??I|@??=?{?v?9.'?1?Rs??w?N?8G?l0???N]-3?U??K?G??(?v????K?w????4??6????2/?????k???u?<z??P??x?O?]?	??2_?3%h??l0_9?H,??,?A?^????,k?[#d9???7o???9??6sb$????z??????Ro!+????Y?%23?*???C?7~9?z?h?^kD??????n?12/9?R??[Z???;?.?i?3?r????6?,+??r?????%???c?J`d??k`??#;.+????>Ft?m%????79~0?Z??6??w??v=?\'??k??V??f?H?6?gK???
#q
??V???????muj?'?H?>A??2>GeW?9??z:?\?S/?<E?W?^???O??S??t?X??????s?X~?{?I&??x&;
?????????P??1?e?@????t?dmM?????????Y}Ww?/??;?8?l?p????n~[?:9\??Y??	?????A8g??ih???,???w?Zc:~!??????V^??B+a?m|;6??s:q?-????}m
????9mY{=???????k??? 8?s:e?$VW?{N?Y;????<?S?g???E??}??????`??~k???&??9m]??????[Ck??X\?????Zx??R????%?d??????fR8MS?????|!_?*K?HKg????
n??M??	/?~?~ ?????~?C?rw???z0)?x?????
?*???>L?'???y??f]*???=??????<????y:\??|j??D???DL9
-???H?|??-gU?C2R???_??^?\?L5??py.??%?Z?w???)?y:??????I??8g"??ZpPyy?e	?R???t{???z?????R???~O_?7?1??ZV?GZ??|?????U??>?J???6?'??22
??????;!????i???+?l????F?r????__n?x6?????1@/3l<?Ydc?~?,g??l?\R???b????XI???xi?,?.,?S~m??Y?N??7a#M??a#?l???6??F?z?F:????d??6?W6???
3???6???`?)??B6???l????O<;???L/'??h|?B&s?]?????BN?s?g??Y??V}???????/????:??S?LC???9m?????C?7??l?g??????Y?3???!??(I?xv??????,??L?x??X??+J?t^?O???w???S??z?Q?va??H?N)????e??Z????8ti<??w???v??(??O?2<>??i?M????FY??1????Y????_T?C\~????q?????Yo???O0f]??/?g??\?D?j1?s4?????9??I?5o6?,?????B{??x???"?????=??#m+L?/{O??C?o????F??#A?R,???l?sD?}>??'
x=????qSkN??F:?{??Y?{?<??????<???B????k
?b?4??:]???;=??8?]????a?????{>C?d'T
????3'l|??3'2	z?v?M??????????y+Z/?????????????bW????<???|??s?C"?SU??????????x\??X?
?.)???.??U???????)?Y?O?=???#?g?????8?|o???]??d??8y??
P?|x[?O??"??;??cPJ???C@E<<??u?x^????l?FY?T?.E??H??}?/O&?????????????S\r?L?;3???kf?????gx6I???t?????????DU???S??ON???M?6{NT??%T3?l?????+????????ef?]??F??IN??n??Z?Q~?? e?o?????E?N????)ve?g?L??8?-i'?+?e????b????\????+??????3]J????L#?,?9???8L?W????;e?Fk??\??k????Nrv[?]??h?=DV????LT????e????9k?d?L??0????n??7q??j??x???6P??k?SJ?lwW?????Y?m????????gNpfe7?g????'o???=??k???M?+???W??`?#??S??n?????????u?<?????B_?????_R???6?d0????,Cg?y?7?????6????????????J&?f6???v?Iy??????i??????/Gj?%????????f??x???????vx?+0?????xu?~?d?a?????
?? j?k?K)?6?&????W???#??????w??FCkO?,??'4?????6??y	?}??o?I????!???????MQ?q???7j~k???
"???-?z?w	??;??9?j?P'?xv???8=??E???k?a?
??"X??J?|
??_????Vo???gK??SF??
'~ZO??F[?L|???NE'~?H|9o??O?$??\????xZ/?I?Q?????wE'~ZO??=:8?ppfE?N?H\#?????o???0?P?????k?#x/?`??K???O???G?s?????7fg?y??P?d?I=?/????>?????J?7Z?9R???2?.?V?}??u%???C??4????Z????V???
?fh
??????Hk6i??G?Mq??+?v&Y[>?~????N???D=?uy0|??3????gt\??-u&X[????Dk?zn;6rw?3??bO"?!?N????$?K????6r?]??e?PX[f	Ek??l^Bwz'?{e??7s?????xr???WZ?#u/3?>
??C?P8u?Rk?H??d????6O?????????L,g????6???)?????(??y?"?9???e?????>Z-	?w;^??y????"?)????3?E??^??_A/'o:B	?v!???z?G??)%???MBtE{???v%????????M?js??=U??????l????4KfR?g???%fq?b????d
|ry?
?}?Qn?G??p?????y??"?t?H???+??5r??_????F?.0???k?n??5s????
ge?}????R??-_???g???rf???u??nE??w?"?\?w?&??"?????C?????	Z??R+?<7???????t,?????y?????bv??&~cx'7??;?????nt?8)??????U???nx?ix?E?????;;??!?5{?8?{???????M???n?????F??kOPr??OT*7sG?????3???????i?~?w}?c???2tN????|l?3G???>???z???(??|?h<?}%????????B?8"?W????m??MR????i?????L?????J??+?D??'??;?Kv??]?)?n(????2^_????4
>?w??N??>Cl>'??????JC+.?????u???~??"\eh]u??"\fh??????@k+'K%%???
??????>E?qk??(??3?K???(dsm????m]?J'??u???:'5??y?H??M2?????????\???k?????D????{???M?Ea????????a?????8???w?"W??W??j??????:?8???I???
?u?E?C?E>?p??O?H????????|??O?Z???|z)Uv???F???K??lY??F????????~??K????`?x???.????????~??|?=??mK0G????Q?O?T???^??i~??????bx??2Gt?	?k?-<C(?F~;?	OY|0?? ?~???2?]L??sef?????????!?d}??u???^?]?K?????#8??????OLW?????0=?q?zN?\_??_?y??_&?H8Zv?nr??|q?e?]b?/??y?^,?????E??y??????r??v^??l????w??Bs???=????E^T??u???n??????~?|?P????{?4L??"??&M??5Y}vs?{N?i/???r??tg???4???	K???w??????gK?Iy?7s?j?d??????mT?)z????p???4?gOm3?^?)0?.?M2{t??<Q??H?]&?I~??h??[?n?=???5m??v??l?=v???)5v?gP??????[,?5??Ii???<??????Y?a??bG??K?????m?N?d?Y|?N?????P?E?????g?r????p?lC?xe?L??1c????uM'?z?|?}q?n???{?{2?????_?{O?????2?Q??i?$????B??PB?????A?fz?????'G???4???<
?1|?u???????D?????2??rCm[m?Sn??U?????)?}?G??{g?M9????N:?????r?;??T??RVxv?S?|???4??3Q?xwy????2pMj?????yo??`???F>??2?>nvMZ?+?sRY5?*??*k0???]I?'?snJ?q*k?????*Lox????Z[EVm?????Z
cG*>??u?Wm?e?G?=??f??#?$??w??;??-??1?O???j???Hz?v?V.?-R.o???U??4??[|??OQ
???????G?2|?xI?.??[W??m&N(5?r'??FR
)?%??yB??????Ro?f?E??l?)^?.?G~?????N?X??F?U?b?4???%?_?q???v|?BS?kyF?)?K?p+?e??L??b??R.?Oa&u?????????MqY????R?????)?&?e?5????r???????}jZ???8?N^E???A??'?T+?.??S???*^R?EOQK?Q??z?M=?x7???'$????n\?W??%t???b??B?w??[?FY?z????j??<???(z?????t`v??s??,H-?N???A??gu&?^~???|>/
????3M?x?h???v????C<?????`X??????v?O(?.Z???????b?*j????[?v=?+`?3=?Vve?oo???nS??{??+9??}L<!????????(?Y??~W(?}??q?RVe??s?FC?2?J?U??7g????X??????B?}K=?b$3 ?&?????C$??????{S??L%????>yrZ?Ik???mZ???J???s?1
????R??Y5?W???}
??Ny?|?gg:?M
)??9+>?;????8Si??{Jd1(?
?c????(w?Y[y?IT~?z7?R????/???0*.?+?s??)??D???7??o?1?f???@8?:?>??tE??D??wI???v8???Im?:???X?=z9i?X???r%??*yF???So]&u??	????d??\????z]x?2{w?????.???????????R???#
?????9 ????????#
???m?bo??R?|\u?h?-+k>???!???B?s?b???X\jm?m??Z0A4o??h?#6??^??????+?|?<?????C
^?l?x?A1M??L3??????d????;??j?:?s&????(O%?y???cR?3?*???H??#l??????z$???x?U?w/?m??????&????8$T?%?;?l??oRp?^?):&
???)??3??????(???z9P?|???T?#?????K??O=(????eD?+?l?JVO.G???t??u?????p?+?P<??????[M???d???|?o;'?\?o?=??[??-?NU??w?\?????z??????@???|ZT?	??m??N?~x/???4????-;???/??>?$?y????
^?4+??? ????~w??:??P??	?8?d??7s?IS^5????(?&g
+??????E
?j?4??P??o???$???w??????I]??=???C=???q???s
;??,~???RyA?:?Zq??????k?L?J??u/?"W?
i3??9J???G????}?;~;>f?3??F(8???,^???%?4??????!??E?+??\x?'?{?7,?Wu??&E?L???O??,4????	6*?}??	????Gq0W?<??6?+??)&?8?*u???;??J?%R?,????P{wm1y??+>?L|P?????v]?/???sDP?U???o???rG?~???a?}?k?h\????x?<???T?Rn?\i???d=C8?|>?!)??????p?wJ??%?ug??|?<???????4??<}?????#??Z?8'?q?2;&?%?I
?????u$8???n????s??????Xy;?~?s??\??,`??7?????(?=??\?5?X-?????i?k???)6)???=,?o?{?|?"6???3Cb??--??DW?8:?????v?N?}????Y??-????Vk???p?6??M???5"??9+?OGK??h??4Z?G&????3g?o???%??0?1????? ?0??x^*?X:??+>???%?????U(t??X?wM6?????%?q~?@Up?w
X??{8?????aG???Rm?k???m??B??`i??b??~??e?+??^F?d?\?Xo?w???3???X?;??????7}???>IO"G|?=;?????9N]"?k??6????wH6?H??
?w?&???Nuv=?xWfe??Nx?aB9dq?;??vj??Y^9'?,?b????"hi?q^?4????3|?????????r?????#????`vr?m???M7?U??ORP?q??~L??6?$/?Y>?fQy????L??????^B8!^?0????Y=)?7?Q???k?,y?k??????o??7c?6??%??{?Et????M?-owOw3EeW??????o???y-?D}???Cx?)<?s??j'?\V?j3?9o?sF?E?`S?Hfm??? ??.??????N??	?
F??'QH|-?:???'??z??W?N?Z?
??????;??????6?7??jj??KWm??:i???????5?wW?WG??????]
\?????rU??'
?
?-?t?????f?3E?g-??$???,???yQ???G?????????H????????	???8G;??H?r????Vr8?H
?=v%??e????????`?S??@???9?BL??????9p
E;?RM,?? ??'u?8&g?y>G?>_?UL??bJ???pS0r??Lj?\w?????????L?G???in?l?@???	!;?d???G??}[Y&4N?R??F?Ff?3/????????O6??mf????b?bW?][(??|4?r???l?wF?ml???<6??Q?1?7l?!f???-??????^?N??3????n???y??]7{I???l4??????p?Ebw??:???Lt
????????*G?V??%Q[^I?^{Ci?{~(T?K??????|??
	???????a=!b?:??V?)'^??2>?%?*I.?(???^??'?ei?dyt?Lny??2<???ty?6?I???*[y?C?5hN?'h$??]????%??f???
Y??^??BI-???'&?I??zv??]?d[w!??L?:3?g<??	8????8?u?u??"???0?,Q?_???Sv?s7??El?4?&r8e7$??f7?3???.??(???w??$?.?%???$6??j??7D????{
??s
???????c
????M_GZ_UG????+~?j+W{??]=??k?U?????^?b??Vh?k??rf????????%?i???????y????????,J?8?8??d?#W ?????x???NSL'?9Q
???C?<??
1j at a?L?V?6???*P{??$???=?x??05??1	g??%???u`l?q???jW?~?T?S{?TK19??{"\???B?/j?W????L?YF??5)/??W????????????m?r?J??/g?F?X??;`<?;?r=&?W???%r?xgM??D??(j^?'-???
?w5???p?fG??????
???o?????????Y????{??=|W?y??&w?M?W??i
??????g??????Uin3??w?5E????0??U)??#h??(qsz???^?R????J???????????Ti?Ff5?g}2{z??4x???b#????B???C?#_?W$??S(??R?w?2P|])?Tx?&??RFt?/?wN???3?????
??m??r8?? ?^???*Vl?P
?W?????G?x%???T?sD?>???????u5??F???z???C?!^??^a'????Q%'\j~????99?E????c=????a?>?[?????hx?????<3Z??K?U<??x,??a???/^v;?ox9?'/?????N???A?CC?R??????(?{*?s^??NxI??xBL??gI4?\J?mE&????E??
???s???j?{It$???M?????)?fY??b?????4???R?????8Q:3z*?k??^:n?)?????????J???z,?????#i????i????????[?????3/?????]Im?????????
~?K
2?d9{
???]P?Q?~?J ?B?4?P?P,N?H;????s?(V?U??<????????s????6??V??.!m/q???p????'????9???/?Gb^??????d?k:%?/V.?B?r9A>#u?^????E???8?Z_?]?1?6?4v?n?r??=?v?Fl??&P7:??k??K?h??E?j?????zBJ??^?n??K?Kee??H???T??V?GN??}?(O2?T??T%????Ti?"#=???l?9??m???h?S???h<?C:??H????:B??1??3|^??d?6??T*t??Q???<???~?s?r??+??P9???????????????\(;????34?>/}K??a??!-?????&2m?+j?\'d??>m?g/?M????g?7+??	?C??G??_????????R??0w at Q?U?l?PbL???H??_fR^?W??y?????^x??>?????Ne~V???,Y;????????????3^fW?QB??J?????????????/???P?Q?$?m???_?????=?-yIL?Y[??|bJ??????\???OE-4?X??????????4??Ym??"2"?9????n???\9????1?z??d???a?-"T&{??z??`R$?zp????H+g?{??
?>.w=%?=?G?7}????g??"??9?*xN1?f?
4R?D???~?l:c2???)??Y??L???wcv???,}???4????F)???R8H1i????_fx>?>??':?????^?u)??	?2??????E???C!???=?W?T?r<?g??????e9?!??4?????????8X??&?U??[K?q?E<h?????<8?????n???1tMH#?<?g??,??=r!k??b#???G??D}?VY?,?????g{{XmEG????N?
??S?y?R!?R7?[???3?Z?B?s?????????%R??
 ?g?????Rn?????^??yT$?????o?)?'????\???^???Q?%?W2"???vP?i???W???ww???=?*??K??2j?????R?3??/???/?c? 1j??Y~BXNS[=??_G???TR???????b0
?`ge??TF?HE??o????3?)?#???^{@$%E??4?9??h??)?/R?om???f???????RM?i~?
Q???`??'???????Yo?~?T???$x:?\S?;??^H?W?????
????t?'?sB=4??/uYzrX,??'?8x;??(??MCc*<??y??,?>qv?i??n?fR?k?i?????u.????~?Ay?J<???6gYzhu?S?_??Mg?6??/??[?S"?n???po??H??G?XQ?IW?\?sb??G???sl8.???q"????"J??ODm?**??.Y?/?-?????Y|????o??????Ep?xN?Y[x????k??jlYg??2S??L?ug??,UT?????e??
??6w??O??E??????????[???	???p??0?u???b=*????BY?J???g?g9FF^H???.Q?????????Cj?j?h???4V1
??????????zk????=GEeM]+l68^?u??L?O???????Qn?S??%?~?
??.U????7ys????M???5?F!??;?r??Gl????Y??q(??:??????e0??????7???T_?y????)?JC?xg??L?3?s&??L??9?I?I?(?????q???Hf/
?~4????{R?A8???&?/{??????????k????z????????>??1yPf}~W????I?W3-?b?]?3????"?????g)?vL"M?KS?{:?W???b???Qx?:j????d????`?'?9x??(?\9????z??SG{?????or???z??#??b?t"IE?i??h?$/????Q?B??P$X[???0??-??4V??????W??C?
??7F????19?KR??`[??'???eR!???,$??]???w+$n????|?DM??e6roP,??p?E???w?DJ?|.GS)??????Dc??`?~O?
??d? K?(=i(=?T]?Ru
J?`????J?+Gz-=??Sznx?????OQ?'*7?3rs??Mn?:????C	?O??O`Y|\?C??E?)O????????(O????a?R6???|(R?G?^?.D_?C?h????c???g/k??/
Q1??d??x???M?s4?tM(u?????z??1???g??????.???????p??!?????P???J???{(
??|@???8?????:???iJ???????>+??w?V
d?6x??v??/???e??n????y???
=?v%?:7???R????OM<?Y?a?@?-<1??/>1k;z??O~????s?-???]T&?.??fPd
\????o?l(K?l?R
^?????7YI<?N?bQU??o|?kD{g??=???v??JQSv[?a??o????D???-r6?#c????9?g???????M???	L????d[????Xc?3??tV?????-???-n??x???(?]??2q???j?Qy*5??<?7D??l?	????Af?_??59?:?????????,?P$??L5????;2<?N??yW????u??[$O2???~??X	???y?????g)?sHL?^?W9????E????????F?h?x?Wp?>??>???y??e?\1??????_?(?fsb?q??|???????p???[.'?U????h%?i?B(??"{???D????|"k???r?y???]#x???P?<???I?xgX??Ix6i??_??
?K??zX?)??'?&???8[?Ac?z??C???eV????|?2Jv?"#??n?	??6??5??{?Q??Vp^?x8?b6y%???~t	?p1??/b?yXH??	}???\?o?a??U?DU????"?????_?Vxg?[zw?evw??CQ???86???:&?
????k?*K^?
?B?,K??7?5?`8i?.s?x?{D?ei?zL?+?????-w???o??S?&7?\?7?9?^M??.??
R?2?`????^b1?o0?i?^d??2?\??????4C???w?-?b
G\??????NJ??Ix??k??k?8Y?~%???I?a?qB?^?E?q??/?r??}??]F????jc??.???2???????i???
3???=^???n???6??c???w<?]?'9?u???N#??M???d?x???K????Qm>????'?W????gW??M?g??&v?????;???`J???}$??h/?D???<q?xqV?Un?+??4^N???? ????1????s???????ed?4}g8=9??y>????1?d$h
?rC?G??M???????}d?W??????H?G<????^????^??????????????????EQ????????&?$?z?6s?oK
/?t?\?a?m?A???H,FEQ?wo???Y???}n?n7????b?|?p???*???w????#????n?h?? Z???????TgY&Reci??????9?_????:e??z???;???fMa?\Dc>?"?_??e?C?.????Q??(?)???#zar?
?=?V??j???r/?%???K??w??????	FR]7??2?!????T?????:?E?[?[??c?
>[??????i?<:???u?? ?????c?{?=?q?'?h?,>?0|?}???]?)???????8???u+?/???=???????????lc?????{??_?G%???1q?GW}?w???M?GWG?EL???????/?8??????j??j_.?N?????Fmc?7???C??xhc????&?V1????????bB?A???????]?D=???N??GO?k????(Q?o??GR4.Jt??Q????{????}rYJdOG?=n??c??%?????.1??*^8R?o?F#?Y???3???????=?z?{
1iw
??????U0?_4???????`T?????S??4P??Q?"B???yT,??Q[??M?+_???s??P$?-???J????9nSa??X?j???4c?'M???]?????9????i?}???W?X'?X??)???m?t???.????K?t6???A{??C?gO\C??6?4?R???m?]a?t!1y??pR??????r?q???A?n?]/???{???[????:>??*?A??cz?=? ~???b??
9?a??[kd????????????R?v??"T;u?HnX}???c?9c?????2a?????qgO??/?h?=?BTI??
???&??????
Q?L=??/Vk??c???#???In??zN??l3?;??3?A??????rODL{L??(K{????Kw?fi?????G?{??_?-??k?6??C?.Q?G}?|???l????"<D?8G??????r*???e%???????;??y?'bU?6>???????????pU???\m??=????r??{????k]???????f??46~.66?&?4?9???????x????(OO]??I?[????K?(?3z-]??Q?Z??y?h??y-????`?o??G?G?????!}?7{?^z??{`?!????%/?}???????;s???????2??N?1b???????B ?qo,??/????.?????3?????Rv^???gI???@??f9e4?????=#V??x??|/&?l?+??G?O??$??=p?????W???7???O?^?J???<&3?y?g??s?T??3?UQ??;Rg???d?
? ??u],j?^#????|??I?O???"{?V?K???<bD9?a?A$?ttkU?Y??v>-??????Sz)?z?=W;?N?q?^???\?7M????qN??????|?G?{?????=???&????(?}?????et???st???G???%]?m???????=F?j??vD?g??P??Ks??j????J??^?o??????[???p?.:=?L??[??;z??????>?S?????0??v&?????\?k???y??=?????s?S?8??????????A7>??u????Z(S??=e?????/??	??#?-??4?????y=????R????1??K?	1???&D?????????|??yT/???Q??N??????-F7??8???sr??$??zu=N?????1???Y????L??u????3?9???O??2?????e!
fm??4?1EN??DK-?+????A??=K?????B?{????t1Y[~??????zh???]????{?Si???]O?????V?g??5R?????????<?u?N?=???{|?????:K???D?et?w?Y???QQ?x>???8??p?l?2??Ya???M??z4O??#h?????McD)??b??29????z>??????S??vQn??M?????;/+z????#i;?=?[cL?c???????????<??V_U	??b?s+?:???sz??yD?~F?L???y??/4??fS??e??M?~?h?)??q?3??Mv??6?S0o}L??&???Hv??o6??[5??O>????92??????F??.C??[EPM?_?S??G%?E????????????Q???w?u????_????]?87???h/?<??.s???*?9??*???=??????g????5?My??Hq?k???*z?CA???\P?em?J?E???$7??C?>0??&?=W:?????Mb????????????g~V???EBz??<?gC??
k????>G??Y????l?????D???{???f?o??y?q??me??W?????>???;?'f?????%??????*????f?yj?CF?????'?,??	x?$~cc????J???E|???
'o?????iN???ZX??~???-$??y??(w?xF???=??3?R~?(?????
?s????$????[???w??%QF?
??Tvt?p?????7???Pg
n?k????,|?N
G????h????S?-i(?????g??K|?Ue?????$?l{?x?G~i]7?#??	?????n??()????/o?<?S+??????2i????????????	>????(d?8??;?4?*?_???z=???U?w??{~5?t?????S-????3~?L{??O?}????4?WkZ5g?w=;???~?B?UU?c[????J??KY8????KX???5??>?
?8??9K?-?*6?3????X???iw?L??7S???8??9x??L?T[?V??3?s&????l=??]?
?n?
????{w????:??V??LA?s:????;??{?F{N'I???%??i????N?&??T??V?e????9+?$}u??;?G%?t/`????=F^?????
??\??
6?H???m<??.?j?m?j??/??!:?????L?'??`J8U?J
?b???H"!?$????f??;???&#?{N????9-?L???{???/>????????Q~?w=Gy???^?e??o????a???v#??VY*I??n9??!?Q>
??i??}?Z????o??"?@?????????(?
'n_*e????t???':{???B'????t?:I???t?'t,??6?#Y?$;??????Y?????3}???Eh??t?Ch?uN???ghoP:^?Vk?K??N
>?-J?_?	?_??
??~?m?L???A?T???7????q????L??????????????3?????El?1?3+:3?????i??????I?{?
?W?ibo???Nq?JC^>s?sj(O?TKL?k?a?FD??T??'0T<???H??p?uNU?G??????/??p?^??K?x???fY??L?#?x=G??????C?i\?O?/?M?[3h??F~K3?(??9cd8?7gY.JS???w?GC???{X?k=N????????w??\	?????s??9iq}%??'???v?9???k??p??]???? ?o?_???=8??>R??,.??????????-??E?Ti????$?1????b~
/?x+	???n`????:???\g??:??????:?ZV?????-$???`?'?(??L??	%	????E??i??	%5=J?=????h?'?G??!??.U?s??	?jz|???'???A??N<8	?8^$?Y???FV???XQ3??3g??Y????$r?]>X?O?Z???B???????Z=?t?/???9?w????%??????q<?"?X??:gN't
n?9A??Tn?E:??l?w?????????\?NyG????$?(=?sJ??pM???{?=E?\?{?E%'x
?n*?`??7\U????$Q%???;A???Y
%(?[???;?Y	.??X??????,^	??*?ftW?5?4?5o???%\K3?t??f&.FT????G=??????b???{-?|?s???\??????o??T[T?L??6???m|?6???%80??1sa6??bkF1?#kF??D?Bak????????g?13?D:?I?$??????WQ	???^??S<Nlh?^}??L?????Jr????p?????&?bo?f?Fs??y??[??9??y?`??9o???H??*????
?x?????y??U?`???
??k	D9gD9oD?2Q?~??2??QQv??????Q3???F"E>??PXbj????|0*:?}?E??JO???>?\"B?qN???d??	?F??"OR?f?M?????q*??uI???DkK??"RZ??c?????	?r???????:??df?uo?[???G??39%???????%v???H?&???
?????+?5E|y???$???n{ >|?L?^?>S?`?'?I???D|?+??5?m[?!?C????1rI???<P?\r???t]??Q????w/???A?p?!??D?3(??????Ol??y>?A???????????????kE?R\$
???7?4?2n<oh
??UXjQ???3M??9v}?ZR??????3)J?z'I?
?g{???||KK
~?1q???E??$??e*?6r2[\h+w???I?(?m?????v???_H?????bX???k????W?3??V???YY?????????xP??????)?y???EX~????KA??
??7??{X?k???????????H????OC:M???>&??????nX???8?j???_?eX=
?-?Ra\w??N?W2_'?o?\N???J??6?????J??l?'K?g?_1???????k?#????v?????Q??%?H
0??(!?0????????DboF????/?E??o?[?_??A&?-]"??????1??{f??{??????7v???X??0|??n????H??=?#?}??????6OA??o???????????[????}Tw?Wm?~?5??;;???^p?x?g??^???T}Q??5V??M?u
	^Vm<CFP???
?U??7??W???E?ZSm<E??O???????
?a????p?6?^m$?o
?_V!?+??%$3?Nd?????L?N?>??C~k8K?u???E1???%????%?E??y3??D???E?x=?????a??Y????v?5??????ia??????Uz???<???b??/?^??????{-?^??????b???
?w??????1?J????^,??9???o????????E?2?P??,?(^
?f?y?UM????V?*?N??J???a{Sb?
????L5??b?}?????'{?sfo??#??h??8???L???b??KX(:??X???j^???(?_?X??^?y?h???????????	^# ??S????RM?kNw[$????E8?/-???,?.??}?-??/w?????k??Rh?7???I??D??/5"/?]????{????ny??{U5"/?]"/??e???%u??5?N~W???
?k??\??
???Qpo??Nv]??W
??S?D??K
?i?_?q=????&>
?rjfy?
?khM?V_?Ck???}?????7
?9t???.}???(?>?B??}{????}?bh?"???#NS?G7?D?????G?	|Z????>]???)?}ch?9/[T??????????'l?????{?????;M??,??}?X6W??K[?*5#7???<??,???T???g??F??c?i?eB,J???B?FG?	S??\?L?/?Us???}iE?4????n)?????o???????Q??+??~?-????[t!1??.?*??H??8???Dj?%U???'?????w?????}@??O?;?L15?~F??r????????
\U?	??qz:?3???????????>?d???{?z?}???????r??Dqv?G3??
?[S???)H]o?t |gHQ?9????oYy????$?-??M? J?|??K??s?g????]L??ue??w"???l|W?????%'V?#^e?????/??????o?l	?U&?7j?o?lr????>???2??6?9?V<R??1Y???*?lkKi[e+??????{>M??m'7g??>N??H???g??????d?Y^}?^~?=<=+???????????UI?oo?s?o???O3??B?y????(y??f?>??+??>T?|?po?op??\	?=??????I???????:/z?0?????v?'?8^?6.\???%????s|??L????-Im3M??,????)j
 n?p7????X[R???*?????'???d???nX???sf???M
	?)kJz???
?Q???Li????I?s;R??}W???=;,??{n=e??U<;?<????t??ap?b?x??D??4???D????}?x???????:ME?w?R?<?o??=?}g1?]l??
F???S??n???>?????b???8???m???P^?8Xf?G?8c????sE??Y?_???N???u??fJ??????Q??T</????V???W??G?8?{7?+e}?4???&-~????Y???????k?x???'??Y^?L?v???f?[H??9rf?#?;??Q?????????????-?a?M??!4l?\?(?l?u??y????W?d??^???k??!??e???2M????^M?_?|??6E?Y?d	?????+D?z?H&9?65????D???-?MM?W??????B??Jn!_O??$?6???r)5H?[?T?g?`i?z??P?!G??v?L???	??eD?s???*??{?s??Y??%<??3???A'?{c?
???jC?????I?????fik?^nhAk?>???
Z????(f?p???????`?^?k?????x?7mQVG?????}N%J^f???f????+??v????z?C??????9-??)0?'w??[??Y^*i?'~eQ??_x????}??=????7???????>W???R{%??????i@???BR??#D???A??,?.?G?}?G?u??=?<\?yY?Oi?b??I&????*??f?????V}v????H4~??FX?????~M/X?+dHC?
r<M??)0??)gV???S n?1
???
k???????QQ
????X?????;?V??3?%?8????c?y"??????I?u?k???E?!?#??I
*Y?2}?	
y???Z??)Ce8????:??N:???lh<?"+ at n??
7I????u??^???jxlA
{?+??A^-J?????/?\],??#??0?'??=?p'?fx????r???\?????????K??
?L_Y??????f?L?]?????Wy?b???^d??A?{E$G??????d?*v???O?1E??G?????,???
??@????Z?????????????sE?6s\???F??;?J?{.s??~?;_q}?^R\_?j?m?s?E??+??\???f?R???Ms%?o?_??O???'??Vj[????>???UB[j?$>.?????h?w?{]?iU?{]?????*?????Up?????t?g??G???xx?~V?M??X??4?????0??Z??bjKO???4`9I?R\?J??O?,??n@[c)?p?`W??94???[ijx??\?????4
???L???)
??R????1???kpr/???^?????????"<??)?????*?JE?&"?j?l???c????k??)??>?q^???????J??Z1? ?2?1???9?lL?>M?i????/O*S??kc??????T
??T????dk??Zq??}?????nC?pV??R????????+??_?(?????D?>???x}?T9?\O?Y[;x??7?
y???a{?d?????U??%???02>??8??:4????????R?????a???????O?_BZ?Z??I?	?^C??
????<?[Y^	???&
?A?U????`???I??K?????(J???b":?\?????oj?J\*?_L>+?oU?}??m?{v?C????)u[?5??????<?QVl???J??)?<?\,D???S;he?????y??~?a=???	??/???t??X?S????5T??R???hl0?R??2???H??W?KbV=?U?q?c?HqL???o?"???TWS????Yi&?9???uJ?X???.?K?????>????d#_??mSlR?B??}??!?????s?'/-??fT#?TMH??U?%??!??*b?.\?[??????n??Z???	i??rS??zW~?7?Zr??5r?:?s#??Ia?J?+\6?8?[??????8(Js???t?W%].\?YgB??8*?}&??,y?H???????#?>&??t??$???:J?t?9?????{??????????E???H?D?k?????u=]???>_;????gB???8??p;???VQ??????U?^??~P?27??zx???????=t}?Z?=@<LW']w7?k??gBG?_???$?U??	=x?T?A<LW??gB????KYw&4	???????????]??9??+??B?J???k???y=??k?=?????(?7B??}]??&?N?g??w??'??P/=???)???_?	M???*?????_Q??+,??N?Mt??5??Lh]?????Yt
?KQ?MV?3ET?????=IQ6??????????-tm?K?+?.]9t?t??r????<?Vq????G???4W.ac???????????0?C???P?>]]{?
?uT??? ??o???c0.%*??}t???(??n??`X(????B??G?^??h???Kk?Rl?5KW,?r?T+??6?^??d[?bY??g????????M#l
?5dT????$??uNe???j???ir????Z??n????k??k???E?5?7v??b?r[?????)???X??u?W?46?Q?F?l??n?i\
?=Z??-?s???????7?j??jy??e???yE?%?e+VRd??	EL?z?t????*????]??4??jnq?,_Tscw??]KW?F?????"r~qUu
? ???n??h???,??Wv????&??(+?0:?Q9o^?y?F_Ks??????-#e?2E?>?f????f[9zTn.?,??M?lo??|?r?*?ltw?1???M?|"arsE??m????y???O?\[??T?$???k?V?&??????a???rZMu]???Q???i?\????1$2iZ??,?;:J9rNQ?./Ji??#?T?uc%?
#G?k????r????]?b?-;g????????K?bWc??4?k?????6?D?????h??"?r
?w??r?
Wc]?&b?Y5???6g????
?k?;?\???F%j??qEXM'EK??9c?,P&?,??????5??Q??1,??q6?Q?uWF????pV9?????r??p?k??????????#(7????s;-|k????cb???J??*=&F?C%??f????y=?7v????Q???o??U?FYT^3?6y?mV?2W????mIu?r????=y????n???5MUuU??1}xL?qE???:wT?????6V??0?????,#w???qtq?7?6??V??%U????uTm???VtESTek?????C??????.V*??(?	PS5??r?J??6?j????eTIK??m?????Ta??`ZU?ad??L?l?Ig?/%? ?I?D??g??2?0TR????E?r?\???S?m???f??]2k?????+VP|?
??????]?UN??l?????5?X?t??	P(74\?YK)?1???be95r??????(?)?UK9?G?e?"Y???f??D?llt58?3+??bMC?x??????gK/??????Z?sG?XS???.????o?m65????Z?d?Bn?\c???5z??S&???u+??k8?5]7??>?R5.iX?TfP7g?????h?k9?
)f+?hP??_0??Y??p-\Z?`J?k??j????"?U??E?7?.CkSk?/???Ie?fC??(???(?1?^?LZZw??e?`+?i?jL?]?????6?U??4m?d???tU8?87????mFg??b7?(?c???-?Uw+gFv?pY?????Nu??????Y?+V???]c\?|?
%{?pQ???+?sX?U?N%;?????Z??E?5T?d??mjXZE???!?rV)?9?)?[??Qb?+?P\???A??IDa????dWc#%????b???s'q
w???????:/gd??T@?^L?H?)1me+V????e??????????$???K?2J?w?dHI5?f????????]3c=????G????3*?-k??4?Y$???6??lY??%?Y^?E?U?u?p????|?4?????LE??d??|??????5+????W-??]TS?@O????WE}??
?;U??*????????EfP=QFSj??GRD?Q???e)F????
??Q?X?????W?N??cD?N???b9>???4??K?K??????*??????[o?Qg??=??G?8{??dnS{?2?#??W?q?[?q???3&????@??!Z??Cc??`?F?U:?6c?r?m??Y?=j?He?H%o?r?R\\>r??;Z?.?|?d??ZZ3\?	m[v?h1<k??Pg1J#????(+#E?I?
5????8j>?_???????#?=?i
????n???F?n^ZS???zx?"?"Zz?-?b8eV??
?L?5??L??6?|3R?"Ezt????;u?S???X=??j?????T>?-????V9?h\FF]uF????iJVd??%????????t??N??N????c????}R??,????:|OU??1u?\s6??5N???T	??J??????R?pK??? ?3????????6??NW?????+??J?
??eV?,??p????F?X?4??10k0W?J?_9FJ\???<?>????qp?y???{??4HA.???????n?-/?nl????qyd^QG?q5??rsrl?L?G???s.?)??+?hhk[>eE?????????????*???
Lu?h?wz]E??1W?????\R
??J{?PT??????r4?#??\????`???????^Vb?]??q??'
'?????rrX??Nj??C5-???FrR5?PM.+1???|X?????F???H??`\T??k?????L?u3-r?kR?????(?F)K??z???D<?96???ne?'Ors??%Q??WVrct(??o?Fn?FnJ?X?:7??36?3:bg????????;??+(.??r?=?C??
??R????]1???,7?
?c?N?+?F??Ne??"??VIDO:o?yW??	;8??R?6?
??1?W??*?$<3?0????p???g??X*???????E?=J]???6"={V??9??,7??
?)S??N?]3?Z??~????????d?????%???.???????/?O??c??F??|>??{_??'?????D?`~N-???????=j??\?5???U4?l????Ku??p??I?B?2?"+??\M5??5MN??-?~5??u?5JC??E5?L???f
?y??X??DqR'?8????j8m??%n8????1?(kyKc"VH?jW4p=?$?s?#?4R????6?????????1?c??d?hM?#?f^dDP^????+G??h?<fT
?;????X????":??4???f5?<Jg?x?1i?H??/k?sP?H?{?4?Z???*?X?ZH(?????g[?.S?/?6?%??aC??2:,:??????62C?9?"?r?????A?$"???1d????[!r4??*<?? ???WrHr"A???x#yasy?&|?,?\L???v???J'gx?
-??dp???
E??!m2G?:v!56JGJ??&5??T^7)rG?(|??Q??H????YNO??%c???YKi??d?Q{\3?47\Q????MAD?Q^Q??(?4?O??S2?p?T???U??U??RF??VF?W??O1Fa??U??[e?R???SZ?H??K?n??I??%??K???U5-!?XM???pV-?L?[.?E???
?&??"?wrd~?k%?A??<?a?o???`<?5???????L?aJ???(??"?"2?F??:1z4F????+????? ?5R?FZEW^?6????m??'???,?q????????w??Q?UT???/?
qv??69?H9????nl+???UGO??e????b??????????n?????S?Y;?f??Z?=?h?mV5?4?.G4??<?*Y?@?????
?s?x??\????JI1???J?3??L)?4?T))?????????w??;???5?lS?????F??"?k??e?RL???nrCc]???":???Z??5?.*??m??YUf?(???wJ?Hq????xE9???_?U?+??????????????L??w b?????MQ??|8?%o%??S?(??|0???(??~t???2?????8AQ|?e??KT???????K??????????s
???????(?1??_!???*?4?W???????????,#??wM??8?7?{??TQ?????????2???{?++U??@?}???^q??
??H$~E???a?x??_IQ????+?	???s?e<????wl6????V??S"?L?}?(I???|?LQ>?y??M??????OqT|'P????o%?f?????{?#$????@T?q<??WE?
???{????it?Y?u????>??~t????????d??
?_???|??G?]??????&?R?nDz?),??e'??4*>.??pHQV?~??;?(g???;d?,??_??8r?J?????s??6HQ???!??(?,
?"?????K?2??????????A?7??(?p_?m???)+???C?zTx?"?n\?(?[?|Y\r?????t?E?????8??<?w??}????d??
?D?s?~?@???E?#?d?????Q?;@?O?S?? ??????}?g??1????;????7???-?==????)J??we?D?????????????{???z>
X?L?=^^??8"?}??I???_K?a???7???
Tn???,
?)?*?Q???~9??+U??`?M????N???????fY??F|R???????O??J.?.??MfQz???(?*???~'?C?e*?#??NQ?????)??!????????~G?;N???Q???
*??Px?x2?+(~???????????|*?_N????'??n???[???????`y;?}F??sH?+???{a?8???!??,??v ?|tRx???N??1?O??m???[H?wE??????H??'?*),<?md??Ey?h?H?}*L??~59t7?????vs7UJS??????????%Uy?8)????n$|?y??????Y?	e?7x^/!??S}	???j_E?W???Ty?@?????U????E??F??I<=-?_E?B?KGz$????e,?Y??o E?????????#???b?~?o????U??F
??????$??H?YL???????('???
?Q?*
?????h9q?#n/&%+U??????O&q?J?
??:E???7T?????M?.VD=??|??????? ?:y??jQ???:?.
Of?~???#??lja~%|?n$?D=?;I?L?+`????<??<,??????Hz????#?????_?:U?#}Ty??5?S?_???|????????/???gp??2?t??z??{???+P??&?????<?????H_J??????N?[??<o?&~V,?Z??#?O?y1?"?????????~??H??
~q]c??'??E??id]???????????|????|X?
?1?TR??E???++U??Z??U???[l?DC????????????d?%?tW?????H?V?V???"^??x?'?9?x?	yK???7?( Kkj?Zn?	?????????[??*?v?"?80????"N?&)S-??NYeQ?Rq???B?)4H??b????5?jW?v?3FC??2g???????]??,K?uw?<4?^iXT'????????J??=?m???N*/?????Q^?????+Vp?\??l[:?P???????\??U
J]Su???o]?j?h????T???Re?????r=?;^?[??9WT)UM???8W,XR?f???`
+#)?}??n?'a?*W??54?3.??nI&"'?Q???????|3Q
A??&z
V4??????y???ji??Mr?
??P?"'???ifdm??????A?D?i???_0???6?65?-?E+?-?h`?79-t????r????????rz]u?z?br?j?????ZLD??L?/??UV4?BU?3?MU+kF?[J
B?8l?7d?k2,o?'????|\?hA?\??4??X????Z?k?r.E?????:r??????A??/?,?]F)%n??????/y+??4Ekq
?????w5??]?E??????T??~??c)???]Ts6?????
T??????????5n?e???????????)??????y??5bjx???.?@y?"(J?o??
?Q`-???k???b#??A???;??}.?s<?O26????}	?~8?Q?+??L?
?5?}9??x???u?o????
?????	???"???"?5???C?S??X?i%?w?{N??P?[????(?K??A?<e?|?????w?)????.?>?|?h??t???)?9?qt-??Ct???9w??4???<~?
?;????Wa?(??K8*???)r<\?g?}?y??)r??<n?j?H????L????<>???]???????q??????<??G??mt]?t?=K?l??3??
????$?? ???R?????g1K?r???T??2??.?????????????p0)J?????c???8?]
'G???R??M?W???;?IQ?<vlR???W?5??p\C??t-???<F?y?:????q??+
??fH^.??i?r??$?	??~~&?+9\>>?
?4??x?????6??0?????'???U??#?8?
?????	???^ y.8d???`%x?Mr4?||<
?r?
??~p???z??%??z?n_
??
p-x? ?;?????[?A?8?R?Q?4?l??????}?
 x<v??@?sH?0?
??
p.8?@'?l7???{???????p????
;?S????f??`6????`!X
??
p.8?@'?l7???{???????p????
?m`????`1X
??s???\
??px?	?|
?\
6?n??
??K??	??A7?n
?U?
?A???
P.?!yP???
?U?
?A???
P.?!yP???
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
:@7?50
?A
?r	/??*?
?A
?b?(??*?
?A
?r?2??*?
?A
?r?-??*?
?A
?r???*?
?A
?b???*?
?A
?r???*?
?A
?b???*?
?A
?b+??*?
?A
?r?:??*?
?A
?r{??*?
?A
?r????*?
?A
?rk??*?
?A
?r?O??
:@7?50
?A
?bk??*?
?A
???!?U?
?A???
Pl?ayP???
?A
?b???*?
?A
?bK??*?
?A
?b??*?
?A
?r?#??*?
?A
?b?*??*?
?A
?r???*?
?A
?b???*?
?A
?r{/??*?
?A
?b?!??*?
?A
?r???At?n?j`
?A
????U?
?A???
P?@??
:@7?50
:@7?50
?A
?b?7??*?
:@7?50
:@7?50
?A
????U?
?A???
P????
:@7?50
?A
??H"?U?
?A???
PA??
:@7?50
?A
??8 ?U?
?A???
P???
:@7?50
?A
??H0?U?
?A???
P????
:@7?50
:@7?50
?A
??X8?U?
?A???
PK???
:@7?50
?A
??h??U?
?A???
P?G??
:@7?50
?A
??XM?U?
?A???
P7I??
:@7?50
?A
?rA???*?
?A
???X?U?
?A???
P????
:@7?50
:@7?50
:@7?50
?A
??,??t?~P?????*?
:@7?50
?A
????U?
?A???
Py??
:@7?50
:@7?50
?A
??~??*?
:@7?50
?A
??
??*?
?A
??S?,??t?~P??O??*?
?A
????U?
?A???
P|???At?n?j`
:@7?50
?A
????U?
?A???
P	BTA???@?0?At?n?j`
?A
???\,??t?~P??T&??*?
:@7?50
?A
????U?
?A???
P|*??At?n?j`
?A
????,??t?~P??	yP???
:@7?50
?A
??)??*?
?A
????,??t?~P?????*?
???W?@<L9??)2??!?L^????
?A^????S@^\?|????h?7???? /?
???? /??????~ /???;??\?xc?Lo?z??n?yV
.???y???M? o
?2	?????@~?SW&??}Wq?
~?|??3MTz???{v???????A???rm>??)?????????wu?^??l???????S???`??M??J???lq?Di&?H7#Y????E+?}2?M,mU~-???Za????(&?L?^?????EL?utU?u#]??ZA?j???????????]O??
]??z????]G?:1???????Y=X???H?=t]Dy"U
3b??????4O%?u1??
??=???us?
O??)?|????g???7#??C???Q?y=??'?W??????????|2R?9??s???,?%$???>??|
?_p?2?>??v2?9??L2???????gq,?????_t7???g1/!??g1/?o:??|6???,??$??????????_C????W??????B???b?H??b???RC??%??|??y?bj???b??K??;??????b>?G????y???}???'????'d?0u??6????????(?_???s???????|???y"5?	T??9?g???gd^|s5p??b?J?s?b???_x?????,??y???O??'g1????9[???g1??'?b???C?Y???9{?,?	??8p???????W?????#??gK_2J8?w??>k/????~?9]???2?~????????????}6I??????%?Ig1???????N???b~!uXk??D?????7??|???k??O*Z{s?4???????5;?>??????????]??????d_?????4F? O???g?W ?Y?y???g1??G???|?Y?y?g1?D???b??1??q??X???J?%??#?;[??????|"?y?2?9~???Mu?ni^F?????F2??????????????(???(??,?7??up???R?????h??*????? ??,??t???0????<?E????d???S(?v2??%~|???0O????tI_|?&??7?v)???c0??????g1o!?7z07?????`??????_??b????=????dn>?w?f2O?????n?@??L??[?|????????????a?g1??i?_?5?;6?????Mg1???b????D??S??|?Y?Y??????b?'???,?i??~<?9??~?2??Y?M*??`n???E????y<???,???|~s????Y??D??z7?K???b?'?T??<???????????w??|?t????G???'S&?|??h?????tm???????y?????<?,?a??M??0?_??CG?O?=??H}}????w#?Q?}??????3?
 ??G??@q?????(????1???]?rH???z?l\?E??lu??;???.z??n?v?{?KQfu?{??n???0????????U]??A?@z??Z??Fy4??c?&???c?jb[??r"?F?l???vZ=???T?????<?q??L??e;?uO??)WU??W?2U??d???~Fb+X???b??
R#
;$? ???Y3l?f????{???$??fh?.????s?9??s?=??u??WW??????????VWFxL<???=<7x\<s<??????x~????C<??7~qu?h??{????=A?/???x?
?_??<???x?????O<???#<??????????????????????|??????????Z]a?\]?6?_????1?*x???=???????????gH}x??????
?9??????m??w???6??????????au?Iu6?I????K????KhS??o??-??!????a??A??
>???#??&????`?o???H??3?????????????????fuKU?
??????1??:}??;j?S??k;+??*??F??4V?^k????'?????1*b)?}??G_??LL9?d]s:???{
???9????????/f9V`??_d????M??|?`s?
??c???I?????a{05????VPW???h6?h?32X?????????p?~Z ?]??90?????4??5v? 9z??"??Qs?=?vu-?id???>-?$?
?????##f;Ag8??7??u9??|&HI|????OG?+???*[
??	??=??{w?Z?%qae|?I-P???????u?n?p?????????v?????N??????????O???u	?}?F???;???g??%??wm??M.???hn?3S?.?_=????@V??5??>????|Z??v??2?:s?w???????i<?????-??i?659Q?????[Vze??
??p?Di?Z??
*?
?-???W>??u???????)yI??????T?5[??j??Z??k4???h??k???9??8?`?{???5V"l?vh??8?BG???x?W????1??8n??
?????O????rR???KPWeb]M??k????D??Y?6yc??????A?x8???8?x+0G$tB?b6((Tof?=9?l??twN&Wy????`)Z?L??x?????K???%!???N)?
?????^???Y?????T?. at 1&f??^?NNv~?:?n?^?;C????2?~?9
??s?	M???\Hu???z:j5{B?9?P?`?^????c7????6f?u~6????2?s6l???!??
?`i_?a?3h?SB0????q???)G2r??m?G??Y??I????q??b??yGh????? ??????P1%3w??P?u%g!Q??????D.D
???
?S
|??(Y????%???-?7????????<?????w??k?.?2???????????A9??
0{.?????O???6????$?0^?????l#x????w?;????6?cSt???/N?? ??0?0???6??s??z??0	?????W?^m???a???S?'??]d?w-G???wL?-??\ZW??????m?[?'	8cjP??????=?a?K?W?#???9?B?????X??u???'I ;?l?t'???6?w;?n?{?~>?!???	X^??l??qP?v-??\?q??K??b??0?7?v?|
???`?0<*?q?EDU"Bq??k?}??$??izT???@a4????P?y?fP?e?On?A????9??
}??????$RL?}?)7'''Bp??[??c9??%??i???M?R?5??????8O8R?|??A.@?ld??)P?F??|?CA?}?+)g????????ED%?/?k???|???LBW	?????+a????Zx???????????????\??#? f=?U???!?#
??<?`???,8?E at O?T??8d|???Y{????
???r?$????kx#?%??"????y#_??K???<??N;g??3?}??
?Zal????Ei?a:????/~??Q???????
d
4?n??>av-?
??n?g?????p<??Ja?sw??a???NF??8??????E?Q?A??zH}m7o`D??A?;2??4?S?????????e	???a'?)Q??qo?????Q??$6?B?????E?G?S???#?H?D.X??E^??y~?!??*???????E???N??)??e?]z?S???;??????=?????B?d????"
IKb????e?dO??=?6?uUX;??I?j?V?f|???N??E????_[?{?&??|p?????vB3YXD?$?:?n?uU)o?b???????%??F?7R`?A
?>X??7S`??
?>P?9"???)K^>P]@;|??w???????
h?je!?y
???F?|+???7t?^?I???L0????
&r???????(MX?lM?+??!;?8=Mz??????hdB?R??J4???*lObAk??l?)7??????HO?D???Z???3????ev?t????????g?v?????????>???3??0???'??
?[???JqmH1???>|??f?Tzk??)???H?F7y??+??&?sg?I?mn??mF?9????o???N{b?/???4o?????y ?F??oJJ(L*?E5l"X????L???o]?9JTU??(C?4u(r?I4I?dHTt??
\???3?@"xLr
jy at 5???V???Q?	z"??e????4???+kq9+~!?]?;?=?Hsu???Bi=?l?0pL??
????%O??{'7?`?s???Qb????l
q????I????P????L'??	?X????{?????f??????ft?@??)&Z????????	?L?F3w?9?;??????!?Z????
???#????\/?blHw???t??????????X???:??K?{????U?1k??A???t~0s}???	???	B??|??Y??A!?1;?????????R?~?`ao???f?Y?f??kyI
?}7,???\"?M???i]?]NU?kA???.????&??8?0????3K:?'?|?H??m??'V??X(?.?R7?!?x?pk?d?;xZa??S????Z6???Z??nl?????o?d?	7k?Qf%??9?k??<??lF???X?'???7?$g??=d?
??,\?????svr.?n?????!??%??VCe??C?i??9\S????	??1,UxA????s?-?]??7?I Bg?p??s/?????D]???6?5?+?<??O???r?0})??g"?b?Y?.L^5g?????r?4h???3???Fm]m(jY???x???
??q&??Y??????<|f?@??K
?rh??R;$y??n? ????<
&?H ?6?T???
?b?H???????l7,???'?
?nc???? FQ5%q*o?<
????sz.~?H?r?
?Sn?IOr???-???1??d?2?E???6(?\???xj?????El?$?YM?~??a??{9????V?Vr??n???+?!?o??-
??ft?/??&O?D??cW?6???j1\~C-?y????X??
?????r???????
??gEiy??K?F at ts?Uz???9w-??q????s<? OE'????X
:_mSn???m"??W{??%??@?gC??:
?e?7?|??/p??!Q1???
?l?Br?c??2o??/+??V?e?=\@%#?,+?,0c
2?]????sbhr??n???EW|?~{/J\q??????]?I?C?
7?=??N??_&4???){?k"?gSm?1_???H?/?7?1?A1]m?^PQ????IXg????]?????????L=}-?l#??>???GLS'0?bI|^Tx?I>??Z?J?p at .s??6b?@R??9???sb?????D9?e?????+?<
???f??Tm??N????????6???*???&?>?o&??X?=
?5???
#~???W?x?)??!??5;?VM??	??d?:c??=????;<]????????y???????E?????N?@???????NAy8????-Qq?d?H{?V???d>`??#|??c??0u???-?ttv??4?????
=0???????Dq?4F??Y??????LJ?
I??Q???<{?G???;????B:?????q?{???
9?e???\???p
?jt?
RA??W?7??A?N.U?? ?D
?%?z????>P^???m??I?J??
?z?p,?f? ???hn# ?
'???,??|?,?Q??t????%?a?X?R	?M??kf6?,?aV????$????,?pz~f
?????	|O?'????????8a{nb??}
M??C????????ARg??A=?vr??c??????M1?2??7????{Ch??=???k????x}??B?V?????S3????i
Jy???(<?-?????~??|u????i?^?????{?~????
??a??Tl??????????`???X?i_?d?
g4???b?"w?1_???z??Dn???C?\??????<?;?1f!?W?(Lo?6???s
a??5?;?6?????????[V??t]????K)???.?@????tz?K9?%|
5)?????????v?O??f?(z?_I-???.????~?e???2????C0?>???????O??W?a??j?Ai?;X?????~fA_?]r?'??U5N{Db??h?.JWhBi?????$?Y????UE;}i????w1????{?G??K??>?>??c??lxYW6????????|???t?Q?RN<?]0??7?????V??=??W??)Z?xd?{???3kC*??%=?i?hLV?Ib\R???G?????-????'?%?2?77??I.9M?7y???p?????X????;?\\???v?'?8??5E???1z??????????;?`d?y 8**??k*R?y?E! ?????`C6Hw??^???\N???T)=4]Q?E?????K???.S)r4??7V?Rh?W"???

`??X?1hJty
?Zr???>???,??Q?V??=?=M5?
?>??????|TTH?"
??kl?>??????!.y?I#y??2c????x
/w?`hi??_?y????9??C?
tA}??2?-B??&????3`l??c?	B???K??*?9tFD?
?w??-R?0??@o?.?p???	??O^8??4?3???.??
?;O??f?]?+:E?[?|
g2t{?.?]&??@???2????~L&?
>
?2?{???I0&?r?$?????k?????p ???@D-r0??gx????f??N.????uL=????5?\j??f?$??GL
M??
???!??4Z??c?????a??NO???k???	'KthO?cle?4??E?_&?O????1???F3????__?????z????|n??????o???????;?eG?y??1???'}D???2?tt???lC|?R7??rZ??PK\&?z9b?peeZ??PK\&?)??^????"??A??P[q]L????????e?A?]rB??2h?K.B.?]?vID?
?R???y?$?s??????it???`Y???`Y?e??????Q|?\??????r???4??,????????l?B??k?3`?mnGI,H)[?&??2???????M??z?G??j????~??_????f?$???m{6??)?H?2?????/???p'?^tB???{????m???a?n?????Y???????????e??5???T?_tIz?+{='??rL|????'0L??????
]??????{?;??!&?l??If;??g?z???a ;?
t???F????|7uQ??7??a?/_&????????;
!?']
=~=???P?(?^?????[?????&????v????[?L??R???'????~?k???N?d?]?nc???????[?M?<r?Q??d?z??f-1?f???Z?/?w????;??V5????q?6??a/A??nx3?I<?	SBo?|??k?"7?H=?????t?y??
(m???l?gE3YR?????????
?x?l
??b?HG%?4i|?VhpS6!????!?G$??C?7????RNgP7??_6?+?Q????x?XH?Ngj?0??????8???m???<???`?kn?692tRL?2?4:?J?????xn????je????Vc?Vt??^?????7
N[=???\0??$$:-.?e?
%	??km.(????|o.?7t?;?$@???Y?7
??'??0?5~?????R?C?+%???v??????0b?C?&?>????Tk?????????x???i~?l0Q?]4]?q?0??w?x0??f?(?~Q?G+???So
?W??F?`\??	????y????[?"PZI??? CG??i?%??"H?,??	??9gI?p?????o]?t?H|1?r~?Fx??/???$?U^???OV$????9;?V?<?*?fD???DY?? ?e??T:???4?????ZE?&?j?t10*Fn???????)??W?3a?T$???y?f
????w0?k?\?t-???W??-ND??`Vl?jc??)??VjQ?#?Ci?-?D?jM??-k???-z?-z_Y????`?????\?7e??E?a????*z???K1??d???+N???OF???x6?O??=d2????q^???0???
\?n??r?wO??V?????V????J;??}E??	{????F?'?{`TU!\b?Eb??s5?v3??R?D? ?M??EV?	?{?????
X??_zt??O??'????Y??F???c??]?6Y??s???l????"?T??>?1???*?^
??}?K???A???,??u_??? ????
n+??7;?D?t?E??????lg7X??l?ao?:???+q??9?b?U}0?????K?????/?f??3?ab_?'???O??b??g?{?	????"???'O??0?cvAPU_q?Um?t???Z???q???TMUj??????yc??{w6??W?V?x__?V!s??4
????=??A???.?????)???J?????@S?Ra??F^?f?B=?
??5??s?2????.?B???_??d??2b?z?hH????Jwy??????Z
?V???
?\?Ul?'x?5f?????P7c??'????h}X????u?????D7??Lz???O-4?C?&6603?|h?9??7?D???	???P??????c?y???
??R6i??So??S%?Ae??\G?????;?B?S??w?S????????Q	???N??)??-?Wzx?/}?? ??`
-?^H5????
??????I?z^?Fn?F?8
?I?8?????1g?yC??Z??i'??A?pB&?s
????qiL
x<????w?????pug??W2?Yn?o6?;>
?g?T[???????,$???6*=;X?Rw????m?sL?QV9c???8???o????h??????V~?9}?sk????v~?9}8??y?????????G.eo??#??????K??y}?R|??#?????4|D??9??K???I?'?yS?O???O??95??ykN?|rn?????j??s???\?W#??k?&gg^?\r?????
?p??j5??E$?Zd1QpHm??5	r???4)???zu???????????|?L???????????=gEc?%Vs?p1??U??_??	???O?{j??????<a?(?s???a???4R????1?Z???a
?r??o???Fo????]?????Y????.??????bJYz???\????|9????/??????%?4????B'???<W?t??\4?<??C?)]?v??X/h;_u???l(W?,?g[Ks??C?l?<????????<&;<??]?_j??o???)??,?^?e??5??????x_yFeB_???t??dOi??5?????N?????@Vd??[rK??-?l9'|q??;m????t?Zq?V?t&??o^,??????`???Y???\??o??0????0??$f5???}Ii???v??G%??v?y???????h???O?(l??Q?EUA???????(??na?N.????K?Nq???Y????s??Ci??V??l???@
`???]????9?r-??????y?r)?/??9s?wN??\??S?6???Tp?*8Zyd?L1?yGVtq??????/?2o??F????6OhL\??(??eM!{V??b???v?Fb???:??u?????????l??.??*??2??4???B??#+
)m??($?92?????F1?-M?~F,#ODF$wtP@:?$?
_V?*t????
???x??:&H?4+????
?#???EHFO*
??F?.??Pq?u???????N?6?(g?????p???X9-??????5(??zC???_?Pvdx?o^??~???R??_?U?;VN????>g?c
?F?o?_??4?[?K??.:-???
?G??Lf/N??+b?*???R?? ??P?vQ?N~???????Y?^A?"????|??-(_?s??q???P?i*?}.._??d????V???/?.????Efn?Z??????^????&%??:?V??U??&??\hqTYN?0?H??A?Sd(\h???s[???J?DKXP?X?????/?????pv,W?qE??&??
?h|_ KW?C=????c??:]??????D?t?SJJ????"J??D??;^?2J????d8????e/????-????E?7???x????(???5?(?)^?y???t??"?#f??U?-d?Ji??5?o?)%[n??m?1??????!?u2??NF?4???_sVl?O?[??ug5Y?9_Z6rd??is???????V??eL[????G??R?F?q?I?B5(?~~A
?d2k???????'?F?{
?j????????????_???o?????|?N0P?
A????^?N??n???nK??k??Yw?/???????<??/??
T???lt???Bq.0q??Arl??<}o????y???5??`???p]?Y??
T??vc??U?nmT????lg??~?G`m??Sk?[????r?A?z??????mB? T????3???f\?vbo?????v?
Ai?????????:hY/?<?k,vLa??B
??.?????H?4???(LA??
??????	t*?g5?
?+????;L?????<???
????sm?T+?C??l??O?t?=??o??V???"?w???????F???????g???)W???????-???+???/?sM??S{W!P?????UT???Gt?o??%???z.???iW?????{\zwr?/??1g?h?
?~????????wN+*?{#o6?????j\M??W??777=w???I!<Yo?u?.?8J>A????<???\@?t??a??Q?????;t??-?y?Q?5|???+????X?\?}??-H?<?Je?
?-^|????F??????1??Y at O??.x/?b???7L????.?????
w??????no<?~>????|?wy?w???%?l?7?u?>^???vV??M???T???y?{???9~?_??!??/??S??pf??????+???5????v??4??????'???p[??	?
?S????7fW>X!?L?F?rLs???;?
*DZ)g6????3??Sx??,???w%Wx??B??Uc{?????}Q??????A
?
 ?/?]0&?;uh?Qx??1}?-?????J???
J???Q,??#fJP??$???P
TgKZP?/????????N????????{???K?????????;???o;e?l??3/?????n/? *??????`J|{??L?j1~!ne?[????U__??y}??yBA??#1	??k??????4????v:'4P,~????e?"7??5?.?D???G.:?w??~?-F???0?????[??]?UA	?<??)?
?]??ac?^z?<??+?6?X???d;?/???k??.?P??f?wo??/)??S?zA??K???S??vu^???*??y??]?/?k???A???A???K?????J)[e}??4??l??,n?H^7`42??F_????~%?|???
?&B?;???PT9j??+?q?i???H??K??tm??u)]????>
??q?2K??=??N3@?A?????J;?Ay~x????G??????w?%39>?????
??O?8?{????k?????So1eb????h^????????Bc?w8?k?
????v??:g\d<M???Ru?b?].?Z?6??v?U5?~e{??L?~?j??G??H???A? ??	?@????g???6r}
?PG?#?[?N?6
???O??0?????b?E?
K???
???&<?p?M?+?4\`t??9?aw{??;,????????5???m???c?&????\?????9<M???'?O%?Ve(?6d???	AH8g?j-3'???{Yjv???l?-=???pM??????$?WJ=>*goSG???|&??jO]?h????WX?3?'.&S?=
!??z??Z?????????????E?? ???9???5??d?????T???}??????;?=?3?
???q??
`K?????6??f??K%H0???^zxc??0??1?IO$&?T~????T7???Z??PN?U}??8U????v?J?x?O??o<???4j?7?@???u?/??C8?Mo4?SQ??n????Zx??l6??k?
????QVO]W?;9R?uL??+???6?
???w??)~
??	??"f?????"??
?a?C????E(?k?????~?Z????5???dj??z@??O??a]'b@???'??1m????S?fK]
?:??H?
rY?\o??l?l????{[	??zc?????}??vr?H?????M?W00????~???w????J??{eV?^!???N5~???0??????/?[?????Fm
7???????F???jp@mW????j?[?$??w?=7??w????????mxP?`r?w
[??>?H?ZE???w??)?U _??,??????[%X???>??*????h?w????\?`??]?i??8}?[??6{?;?;?sjK??ma????????Eu????????zs????j?v~x????sXP???s?.?/???r??n??{eVn?x?5
?hk?????-??^?~????R??;w??7??~???J??:???X??E3??H? ?e???@G?1?3?g/????v?Zj"????,?????5?Q,5?1?.????Y.???????K????R[?<?~??Z?%Aj?5H??@:?9+?T*???.?-?8? ?j?S?s?t??#uR
?ej????Xs?Vk?;O'A??N?@U??F?YN?h??M??@??`???
,z?S???<n?WCo?#efp?Y???*????tU????m	??o??#?~d??N\?l???????#???????4a????k??M/????
hyc????vA????u)??|??}I??.??jJf?.b?m????{M????9?	.?????In????T???r#-f??L?q?\?'-*c2???t????|C?2_?S?h?????a2?d?U?q?`??W]???u?^???????v??~L)bN-??Z??,??6??d#?',]?Ga	B?*?<`???
?(??EX23?????_??M2D X??L6?e?Ytr_??j<M??9?8i???4????????_pk??/^?&?i?.|???????d?&?H?e??O?!????;?FH?\????8???i???/(l????d.??;o<????1????6Hx????9????j59FV?d?s?t??.js	A?^????Q{^"4I#d1yv
qhT?bib?	? G?!y0?jK?O??H,???-?^}I?j?k
6??hY
???R??a???&?U??Jv???Tj??Iv	&
'??m????M?j??_YfF???D?^?????j?a-?rZ?NT?'?Jv[K?[???^DT??A?Yh?????k+	f=??"??S+?f??)?]z-	L???-9????z
i?l? 1?A?g????Dy???????"	_?m;I?u/Yw?,?3??BF??%[K???|?N??V;g?0????f?~?????W?D????^??3??l?Fu?xn^?B?i??????a!??0?O?f???~rv?Z????'?E????mn.v?IJ??????5+?s,,?6?"?
jUbc??Y(?O???????$s??P????m??5_Z? ,???6?????
z?r?		X??s??S?|	K?????????R?z9?o???????j?3?68(????Nj?w?????xby.&??:m????y4?9-??fF6??1???"&?d?.??L??s'??????9h??????|D/R???+????\
NnA??5?(??????????m???^????F?}{?[???e{Y?fE???h6????LH??L??{???,??????	?M?F??,??&?f?O79_??=&g?^2A
?
<
?y???E???????z???C	fnc??Z??H[??(?p?vr?D0A~?:	I?t??T?+?'W?H???&?????????pg???H?I?}?n?+?ntx??3????w0N9??H;y?yT(?y?O#K???q-??????????`~g????Jh???\g"?p{z?"??H???M????ri???r4??em?????*?5??????ohs??? @}I
N??e4EZ???iZ??c *?/?1???N??????????b???????q?jm;????s????9??3<???????'?]??Z????2?G????k?#????o9??????????7?u??>??:?c?G5ZS?/o9??0<?[]-X?9??????-,9)[??l??N?????uy#|???!'s?f??h.??FV???????r?|??=a?5JyG??}s??Ob?i??cS?|?}Q????/q???@??_?93??8??\????zS?+????
??.0p?/?L?
?4H2?
u???d???b?U?z?t(G????J7+)/?	SNaZ?a/M??@?@???i ??tbU??i?s?s??/a???1??f?F????{??G?]uA
S
????l??(M???i0u?V#X>???+w8?R>?E?XD<?K5?}?8?~?"g??????'??kl?t??d???e}????(W?m?M?zA?5 ?g??'??u?p1+???:~????.I?TT?????rf??? N?)??xq'7	???41??%S?'qC????W????Y???+D???/1e??=????????L>??S[??oq???F??%W3?1I????????b
o??d{????????/?AW????v??/AW?G????+?4	?y???{??2?2????QTrU&S&?E??=??i.1?????>o.S?`%c??~??j???2U?y????)??b?P?Y|f?A?7?????jyi-????8?????OX{cL?cr?x?)??	h?
????^??	L?8??.(+%G?I????ZY?cZ?MU??tP??????oN???M?n#wve??z? ?????t?&TDt??(?wn????W??~?
U?+??^\Q??5v'?m???_Y??v)2?F?L???m?x?????Q9???y@??:??h?E????I?_?*h?h=h&?Y????
v?????)??<??N`?????e?d???7?V?<?s??????Z??zMwK?p?????gh?~??5??%?*Y???
?a	???q????????Gfe?%??????9???????E???e<?'??V#?M?????)2?(?
??|1Y???$??Y?C???z!f?d+&??-,Z?\4???p#UV?igw?(?<?????x??b?D???j(B:.??????F???s?DJ?8/????w????M?X?2??kC???????@???(?/?4?S?(?@??p?/g???????TI??n??Ze?b*Y??w??p???????[?]?r???J?~???jn???N\?U??/*?
pZ5?VTJ???"}???\??'[??X}????*???
:g]$???\?M{J?^???????n????Vat????D????
Q?P`?y??~FI??U-????6/?q??C3q???LUi??AZ"a???/Q???+?a"9dMe????C?????kL????P_'??w????}???@?
1??+C??+????N??
W?B??#???^???Q?hJ????D?V?????e)H???|????k ???u???u??
?C???D?'/7?U???^?2e??@??Lx3?{]??????K??l?b????.?r
\?f:?6??`L????X??GS#"o???u?A???Cs???+,??1??f]xp??/?Wd?!t?'????????x????i??U???
??????e?J?]?8???
???V1?%?????
?d???N6?r?_?z?5??p?/??/X??V??C???b?.??b?a??X????]1??E?5?4%L?
?qk?????????&-??s0_Mb?????g???3c?e?i ?????_??"?L?O+??\?Em>???1???K???"?)?[#???ye73????????????(??{??\n]??
k?W??r?f??????r?'a-???7t'x??#)s????
'co??7???no?$??b?-F???
'b??i?k??Z-??/Uu?9 ????f`?Z??
	??$??1?\?k????0?U?C^
mc"?/?u,?*_?c??????ZMC??"??`Cx???ky4????M??2
hR}sQ???????????????????W?????W?Z?z???_U????~???k|???????s|?9;1????wN??w?KNf??5N.?k??:H?y0???'?=?f???v??p????????F???Oz??#/`?=b???Vo????q~_?_?+?L?Z?????u???{/?pG??Q[Ut???7?\4?f?3Bu-j:???x?N???{???y???+???;?w?F?6t?w|F|?=b5y?=p?(?????????x?]?v??I???W??|?n??y??E8??|&??L????i'???M??[??????????w?+???b?{?T??f??77???????????????????n????}????
?X:??D??
c/????W?,?^???D??`????????????0????>?1???%??68?????/??k??1*q????L?c?/?ew|8??e?e?
?x??>
zlG????L>yI+cZ??????@???????y???>}???@?e???u???
6????V<?????o-??e<?R|]?{?Zc??"v?A??	?s??N.?5b>???{
??????6??-???
4??????>LV]??mh?Dn???_b?
t??{C7???]BF!???]& ??Ye??FMKQ)?nI????\u}%?H?E?$?Ag?l??#Hoc?(???-??F	FR|?fZY?[??.?M,c+)??Y1???,?M??x?;%??????????`?]B????????}??F?wC>Y?5G??=;?=??$??????~_sW?0??H,p}?R?C?fl?Iu??2??????
9)v??<?!GH??6?????c??e?mL??z?????|C4???S\q??
???j|&?N??C??7???LA?
u 6??5;?H#<kF?|mQ????Z<?Y"??k=s?!??5??9K?????????\])c4?1??v?F??x?3b
??
??WA???S?q?.
??|c?.??EI	Fn???q??vP??O0A?4??+??????gXW,$???+mD?J??j?r?,l??X(f????
?!??3pf(z?T?%??{y?Z????6z??????????+?0?,T2Hz)??pg+????????k???3???D?m??,y??o?b?c?|??\????0?`9?sl"?&C????j???cX??# ;?n??V?????m??G??Wv*?z???+<??4y
K
?5????3??????f??RI??|-?(???b??G??s?T??N
h??Jv?b???"??????+???q?s?m?+?F?]??)?I?6?{\Q??????
??????w?~?????:??????SM??n???U??????!???9?N9?C??lRW%?R??+
e.?G??????3w4&4????&??+?????V?f>????a?u?SP?????o?,?o???6?G?m?s[?G^?o
>??N?9??"o?U?(f-}??}?_?C4?K?@????????7?2??B*X8W????????g???_?????
?`??|?L4??"zk??9,Pq%??e?eZi&?????-"??(8v)?=?J?3?.%?O???F??L?Tw??5h}Q0&????,??|?q?T?1|?Re(S"`???b?k18
=?0K?4?
??^?D?*??p??E|?U\|?6
?<8H`?Y?l@"1??Z?U n}C???D????????????"????/_B
?qhq?????g???;??%G{b??~qg?e?[?0`t????Y?I?Rr?Y?Y&?1
3???l???G??
??o???0?????????^w#\??x?o?5???1H?g???cU??9?g?e"?U?????)?????5a
VF?????tA}???s^?m??3?WX?Q?U????Z3??\w??S??H??k???E?r???9?!?_N????W?????
????qW?S??~5,c???B%?KL?BJ%?????4)Tm0?zf?-1???? w?i/U?m?~d???A????y?G?N
c?jq??9,0E\??M??B?l*?y ???X?n?7??W???Gf?x?	?6EG?W_???????"??cr?14???$5A??xZ??bI4?8?????2Z?]????A??,?#?Y?TR?p???gi???Fsp?2A?c??i???=<???Rk??p?tr?lz???[????W3R?<?[?S???y=?p?V??????1?$?n?????????V?$|??T7?wxTZ?T???8?M????"?h??o?????c?<????-??"?aEtA??~Nr;m??I??\Ox[????
?????????v?h?8??x??????~?2Y
7??n??????
??S??E???i?2.bF?9??|???????&??Td???[?=?wo?)????xFC?q?xiH???!1??H????M?O}??k}pfb?S/??	?????i??E^0%F??n}}?[X?-??&???
|!>????????VM?b?? ?eC??????'?1??`Ur0???3?????2?p??g,;??}/?o#;%
m/??!Se[????<{?8???
?\????g?<{O-L???????????>?U?1 ?!n_???z0?B2??4Ry?J9{???S?*?^??IL????K?Q???4?
???}??:?_?Z?od?-??f\X?Wf{=??*?TGp??f?$???|??~???_RPnp??w???w????????q??l
?0??Z=?*??^?j??!?0??+S#c?6????[y(?j1?5?VA"?r????G?s(L?'rh?1?1:?L????M!??C?&?v??f?$3c?&jjf???X??wFU??A?\?p??>??o?|?hi???K???6vS????B??????)*????"?'??????2?yl,????????,N&??(?%??????LQ?\?v???$????P?%?qc????|?N??????1???k? =?	??????
???#'??P??J????4?=?6?????x c)??!\??????5??R0F??2??<s?hE?r??B?<?,v/9M+???N??B??X?PJ #S????\????gj??ej???0?i5???Tq~0?BN?e*?V?S1BV?0
????D?q??pd????N?~?'}???w???????z=}???4?????c3?/?5P@????9?oV?Y='?*??{?x??GN?oVj
?x?????| ?)??c@?p??"????w?Npc?????o?e?a<Di??F??#|?*?aE!g????????qc??G??{???eu3
R??Rc`?un????2???u???s	?=
?.?????8?^?Ge??>????iu8?????`XT`??z???K? ??
Y?Ax?(K??<d??S???7E??^U???QyC}@???Us?
?r<?!n?h?r2??????`?
*;?(????????po8?_
??drG?????^!?@?v
*??N<?9@?`???D?????i????9???Pq[?>(
???p@????
8M??xM<?4??^???P8??|X@??@??N?\??H?
G<???".???
e?b?\???*?i??
=kb???@'?07?;?$
?G?,??C???????*?d(fMO?*?%!???????)???xw?Q?d?9^?
????rPcp?v/aB G?6K3	%????M|??????H4??)"z8$??4?
?L;NM????J7????????R?l_??.?c????k3?op???0G~B???Y???5?bM^?gw?V?h2???P7d,???,?fPVg??7?Fv???m>?????o?c????{G?.?2?*??u???#?
9???ppI??}?uNw?0M????Nw?s????\I????7??K?F??}??_???]?????????a????aJ?4(?k?x??q?{?{??????$
q?-??BD??????????+?"?s,?	?u?>???aG%?U
?????}b????~?)??;?H!???"?????{????P?8???8??Y?pT?0#?]$t?O?Fm???????t
?0??B???2??mc???k??00???*??????mnD?q??"???pj?b??[?=???C?vNr??y;*

 {?&??3r?R????cAA?#?
?
d???R?\#?"YC	?cD&??v???
.
9????$?&?'??VQ?P??FW?\eg:n*?4T?
w????k/>E?HC????????,?)?SL??[?s?????????BtftM`??Qg?????S?3S?e??o???>??9j?c???E:e?!????*???????3??O(i#Q1G?"??/?
/'OY<CRb?????A ?Q?&=?VU`??1b?h??????=z??i??`????5??B+?-b??`0?R?vX?,#!??@p?c?1??u~?>Cf'?K?[????F??u
????????3U??	?l???H?Y??(.?b?b?C(?[!?+E??i???~b???&?P??R?i}???X?k?YU???|???WK?|?H`?F??//???td?? P??
?;'`??
???i????f?<P6?i?4 wd?\4??`?"z.S?2?WL?Z4???
?i??????P7k?m?c?l?-??<?Q<r(k?????R???:?-@@zQV$??.??L??UF???@???.MQ?Va?C(?z?8r??m1k???????? ?~Q/?<?4??C??7??[g?~ ?	xl$?\??U?[??eX???u	?l???[??U??f?>IM.k?%bJY?u???{?????:?g??;"|????=???X?ZEC?{????k\a??JA??!
??@?|???fL???????ib??
x???????n?????8?	??n@????AD?????'?a??1?g{K??	??q?L?e???P???]J????????T?^G'9??#??z>??E1?:?7?W????#WU??????
???f????6Y_??'?#L??|}l?s;aF?%?%`???n#??}?-????????-d??RU,??d7?#?	"?;GP??RT.??
?t???R??C[?x??????2H?
A?Z%K?`qT????P???\EWL2??>p*?N??V9?mPKr?y?????pi"? ??x??
z????kT??;.?%!? q!wB??L/??????	-M
?2k
??M?I?????BR??a??????
?????#?)mkQwZ?l??qq???.6?-??ps?v?8??L???"?9w??{k??L???e??s??B?Z?
??y?/0?o
?sq???D7?`??????????A?	/?1??s???
???f1?o$?M?^?w?z?{.?z???h???P?H??M?Q?@j?AtvP'D
???A?g??I???]?????B?*?w5??>?7???????`?$Z?T?????? ?pU ??&LQ	%???F?PD???"?
@??Y???
????Q???
	?9%?? )??'3z?D?M?!?
???,???@d at g?p2????? 7??T?????F?.?{??2a+?r ?Ik]d????6Y????h(j83??&??+??'h?j??DP??|?G,????u7$?rD?e????6b??`>?-????fZ??c?`????U?*?f?d?@??i???M)<? z? ?0?1
?????m??(?@???"{???0??$?-O?pf??(k????`?<???&>?
?\b????>?4?a??????XQt?1?!???[?;??=???9c?
<}4v??Y?T???{?n???1
???g??Q
????D?z???
?{??~???0: n?]D???!Y?Nyc4?hS??W
??e?.p??????b%?W#(:?????$
BFc?d??#I????F?0 @hh?8+pi????????????GfHd???`???J??jv?O`tv?a?t??S?
C???!P??r{???{?pUH?g?<???	d??b2??6Ay?C?8??(s9?F?g??[?????OX?f???f?E?e*????2?? ?	???
?
IA???]e??4???W1????
??ps??@????9^?G?h3]3???(??~??0Wu#YQ?H[??{??"?,u?
E7?!0??%+???$r?Ho?qL?Q??????0bH??V?m???
|?t?SF?w?VGp~?`??V7
Pn,{?8????n_????#??m?sa
S???zG??)??8??T??
fq\?a??3D^I??9'"DD+WV?t??)???3???YM??l????x??;??C:V`)????F??(?????T??:?
KV????d?-??G&?_("?-?t?>??m47w???.?6??h[1
&0?C+????g	????!????m?-f<Nz<,]? :?+K`????X?=Z??C??`??	2/dK????bK?1?`????S??d????I?x?32??x??vl?YB??v??N?b???ptl??~>N3Z?B?g?m0?b8LT?<???hE2!a`3????U?#s?}????????e%K? .q_??69?????(???	J'??$???sp5????a?f?rX?#?C'?]???b'/???+?T|???_?E[?L????p????8??iJ\?Cj?fE(??Z?????<??f??Ir\???5l??P?]?i0u?"+ln?:jJCn??_??3?J?????E!m?av<(??8x????mXh@???l`???l?????/???Mn????Gln??iU??,jHL$???????L???B$Ol?4??@?
??h??I?Rq?????-?M?
??j5?Kz??"?[Vq?5f???*????L?CN"???wLM?????z}o8?|/|??\8~??>wql?}??	?w??CW~*??DFS??@????`???[s?P)??????y?<>yEC?G?4?	1?h?aq????????
?q':??Z?v??L?\????+?/1??J??j?lC???:??3S?? ?????+?t?f?B?K?{?????$??p-a???????((??????Oe?n?>????eP?i6??]???c?p?hd	??J?????>???f? ??f?a???uN,
@?N0
??xm????mn????en?	]o&????S???s???j?%Z?????nLvh??????4?1?$X?m??
????c????|C?9HmE?lsN3???????a???&d ??y<O??K6???u?X ?Sh???t)r? {?S?F????T????xG??
??#sW_?)9??~??L?:??:?q?????????P?\?i_?+???
;?^?0/??8,?0???:????????mh82"?9
?????????????N??(??4??an)}?:?C=??/1?:?&@?'?N4????o??#X???????M?}r???R?1Z^'
??
R@??$?6????=	.?E!Q?lMS?????P??\l???8?D6y.?%??f?pL?'???!Jmy??%??%??~?????\),?L9s???N??o???????}????l5j[????z????_????7Wj?T???-?{H?7jrm?i2
?"????L?`??]?????n???????<d@??6?Uu&Yb^1D9w?EY?=sG3o??;???G?O???sZQQ?????+%0?????*Bm??
?+??i??k???.???.6?M?}?i??|?[?;??m?.
K?(???|?1???]<
u??;??TbHw?bAXa? V??b???
????>8r'9????N?}ww??]?s^A=|?T).?^?v?E???V????<??t8???n??6???w?????'^?{??Y5U??|??|t???]g??|??J???C^=????9.d?<ZYi8?r???????}
???????[)?}??????8)?\~8:Zq???^)m??????d???w+N;9bx?????'??????]??W?V??O+m?w
??j$?
r?Zy$?E	??????????z?I?vf?J??SQ???
?B>HS????r?q????VM?mj?????P???G??-????+0???????]?|???j?K??)??????`
?????.????
??%???
]?dF?[=?????~???????
3??2x|7U??]]t?&??_dI4?bS?[?
?c?nSS?.?K?b=]?g?7???lA??kw?,SK?fJ1Co?,^_????Ee0?.???PE:???v5]?????Oi???v??Z?lXJ????T^?o??=2X????4b??)?^
?NxQ????,z??????B
G?^L????T??U=?P?F??)?p???[n4:??"?+?[?b??J?J!p????????4t']?/>}-*vfQ????'??j
6?X???O<??0???`,"?????Q???l?Z^?Z??%??J2?q?$???	&0H?A&?tr??O/?iw????=,?????????4z9???!tg?`?F???&35>?RV???H?9T?"c??6S?{=?d(?(Gl?H?1??e?DWtK???#O
^???gh

!4?RH?ZH????M?FK?/-??~?.???X?Y???????z????=?B?eo\?????Pp?O?$?O???,Ly}_#??|CX1???
?;?????????t?t?I??V8NP)i??B???/??)?5???*??2??3??f??r)???#w???7??]???e???v?5?X?==|N
??G?.NJxG??????g?u?T5?-?=????g??$~??????Pr????/W?????{?{??v??q$`v??U2?H??|?y
w?v?o??\?L4??c?X?=/n4*????Mf???????u???>
?1T???J?X?>kA8T?_????e?(9J????}??b*r?P??]?No.@?????U]?^<??????l?-??x`8|K
7H??????????{??fz!???D@???$_????Vf^L?9 '??????(?n????d`~o?=?
0????????'L.e?J?????{?yw?y~??\?%??e$??????#?k%??>v???u?A&jEJ.?f?4}????^0???$?Q-X?????G?"?Te?
?????2!?????^??????3?y?]?V???O<????_?_?????!h???????=????%.D????????????0?h6?X?z?OQ???I?????a?s?N???w??{hi<h?M~?g?ml?U.|?~N)f?(p??N??SI??z?3?????88<=?aV???y?????????'{??PU?????????UL???M?/?;qG?M2M?-t?u???_z0?t???)????!??????W3?????7-q?????_????????n????1???Z??Z???V???=??k|>|<??x?=?pz?{^Z?????7???+Kk~??Z??(??????;???u????y??oVW6?kU??/hA??9?J?S?(??e?_??]???B?L?0>shvCa?+P????V?y????]D???U?^?+Q/??,?7oT?~?=8,????G???G?c??oUi?;?Zk?^???t?[???????:?GP?
5?;???Xl????xL???1?{~??fS????E?S???????w???:.|I@?d~?wG?????F3???v?????&?S?G?8i.7r[on?6??:??t??Q?E??\?{00?C{?-????????:??n???????l:??wZ??[??????|??)/??>fhE?.??D?>?X>^T(0??BT?%r]??mm\?YO????3???Lz~???%x??;WC???xe|5?^
K?_??:?O???
?V??F`(u??t1???vKkTz
???(P??^?k??5?????????3?T???n???I??>1?5P|??jr?Xl?Xe???h???????S
??r
u)0?????'?
w??c?2????A?D;?S$???d#??sh?j??????M?	9O??????T?5t5}?$???g{??2?m]9????x[t~???????H)???O??)???n?K8?????o??Q9?8>?.???WF?&?Z??`??&?,?????????8?_?F>
?}??n????3?|?o??6)7??5?*1??R?&????$????+?+???|???n~S?r????t??q;?u????`?p?????k??`???????d??g???C?z:?????UVi???????
????)??'?:?sW|?mu?>?0d-4?
?????	?|=???t??B??????I?????HL,??????]n?k5g???????.??i_&'f???Xz???De???x!g3/?K??????w8+
B%?,
?
?0?$???/??Fe,??}pS?Dqr?6??????4?]Lu,?"??????D??X??-???"gS????H?Q???j{??WG.??R?)?*?R?9
?????Ft?\?S[?Nma;?*?Q????Z!<???VKN?????d????
?.?0???????z?{?~?#vK???}?*??2? "?Q ??9?]K????
U,?J}?(?-?????_?%zbI??b?1K?@e|G?Z????}
???????<?????????.?Q??,?nU%L9>???au:e?W?x??????????_`?????I?-??~?9???A\????V??{??s?p?d???+o?4Y	??<?@s??$?I3/?;?4?C???Y%>?;$=6V?????,N=??????t}X???JiD??N?z$z;?x?????KE?+?Q??p???]?nw??5??????z?^????~?
?x??????z??????=dB?9?}*9?P??H;??x%Z?bR???=B??????&NR??eKV?3?_z????T??Wq??=xLK?f???m{??aG??
??h4??????0&X?;M<?????J??g??????[
??d?????/=C?{L??!_IX?*?:???????Baz?Q8?{????&?F?e???P ?m?=?o5?Kb???|?*9+Z?+??Zh
??$?? ????R`aS??????????y???????U*?p?
?8-?X:e??5?l????/mU=?R???lW?x?
??|Z???S3??gN?2?????}U????2/??????96x<o???F?Q??D?V~V??[-,????	?g?~???}\^R??;u|v?~??L';K?9[o+B4!?=??
f?? ???k=t????_???/}?K??2i??Y?367o???????WN6y?F?4?o7?>_@ ???S/n???)??}%f?Y???X??'???????????3?t'ny?0aB3]{?&jDq<???uQ??.N)	??7?8?h???C`O??f??B????Q
??[??/EM?$5Q??<r?t?E???????*??	gNQ????5???N?d?j??]?ai1??#)dV???w-?c?6W?????NVX???tu??J0?????V????[U^-pD????FC?^?????p?y?????1??,???????X?1??P\???V?????r??,?U?C?2??/Kmt????x????d%?&t?`$???o`?????YU?R
4????C?-???.NL^loZ?????\?wf
?????~ibVb?b????q\
?I???V-?i
??v??;?j?|6??g?C`??_;?B??|.?8????rW5??t?)?V??cO:????J???<o????v???;????e??C~[????i?????M???,?N,???U???????C?+????oY?
g??:?=?
?-V?Ksl?BR?I?V?)b??Bb? ????c2?9??N?1r
????Z?kO??n??%Xl????-?MD?u?A?e?VO??}?|Y?{_?[?z?Sf????[???f??i??????g???3W?}?
g????9??`????????_????/j??~?X0b;??w?7???e???C?q5?Z??7???4i??W?J?-5n$?-w?f?Z-???
?$??;?n?b";w?uZ"?????????3R??4????Sh.e??U??u???.?????8???(,?????Rv9*?????MZq????T????m?\??z??qV????z??
S??????9?????5?5?P?Z?W[{??G ??C??M??Z?y??5??	2??{K?$???$,???$M2.?.d??%??????7?}#??D?^"Ds??PHP'?([?=}??TU?????:??:???o????A?h??????;?N?ed?@??nY????????1`?_?m??@???e3	?k?????|[??9$?????e??#??????s?+?~	??D??S~'????L????
t??&?5)??z?n??wxR?????W
?'v n??????8<'????u?z?i-]?f*????7ks?????????<9Gp??{]^???+??????F]	??r??????0.?p?{??A?H??sOb??cr??P\T?z6?r?qt?Vc??+?n!?g1_?p???&9=??$??3l?^?(?P???>?6K???mq?f?+k???s?????????F??x???????N???R8?U???cS??P???C?????;?????XU?????m?9T?dT?V?????Sj?|?I??L|?y4a20????}????]???+8?,???t?$??8	A???hT/???]G2=??h5?s?z??U?RO?,?Raf
??????????????%??U??(Jg????-rM???w'_????	%N???v`????6T????x[?????w?J??i??Ty??????y????mfME????	
dLE?/?????V??????J?Vg?Y?????feL*????"?s?C?Y??)????yt6??oe?54
?C#V?????%?ELv?F??R.?S????~/???????>d????[p*??c|'gU????a ????f?-'?o????

FCX??:?0???9?m)???h>
?RKf~?R???S?*?Que??????oQ?nw????????e;????u???&-???+???a?[k?Z??g?Z?s???`E??h?)?]df`??Mg?D-'J?'5??[????c?5?f~{*<??bI?mky!z??m?XM??f5????/:qt~???Y??/i???6????;??????n?????{z?[qP?x?~K??QD???~?Fj??????k????5???????1~???~????????????c/?_??,?#??????1?/??|??R??3??"??XdGX???r1?????Zq??G^)t?#????^?{m??p[8?f???~I?S??????+?r??YQ????????<????????]8	??j??rP?+??4.
????G????z????]???SD?:uyL~?????X?????x????F~?
"?17W??????=/
z?????u??q? ?Q??Iw=i?<t????S????????;??=??0.??"LB???X\z????1]I5?^?#?????;*??????b
Bmw>q???
??`?????|??`%??G?zWA ??^?
???:???=?3?A?????U?????
&???f[*3???????n?????Py?vz?SG??|??2?????bp?????2p.?!??3????&?^?k???g?a?{?S:
=?<V?h:?35?B?????e??.??P??B?hQ?0???Nc	Y??UcO?@?a%????+U??:?!?~?j??0??-??:3??????U??[K???`????jK????B}?Zy-|&;??FxM????	1??0/O1-0???p?@
5AD?v
?j,lgy??L[??m???/j???-T`???4?5?E????K0???????v??~?R?????;v??Ca?	?A
nll?????}???b???Z??^?5????7L
C???E?")??f?d8<?CK??????%?/??W<??/?????????|??.?e?????!Z?v???f/"???????Q0???ePk???3?Q???zy????3???k???=?\???6?U=???\u&?l99zA??S??}?tC^\
???U??Y???????o?|??;??n???U??????i????&????????????yM????,7>Q????L???c??q??
?<(??N??jU???K??
???|??4?N?l<?v ?;??Mgj?^'$
???_HQ??V??Q?O?t???q?.G-U?h4??o???L? ??>?+?a?G?`t=e?=1?ln??_?????'???u??^lO	o?F?I]
??;}K?\N.y????[??B?uj"?jVn?????u?_???Z??.???8??v?j;?u7?u#??7?~$???
?E?6?=5H?N?$n???
??Y???Wr?T?T=]?J?T#Y?f?&?s?????{?
???g???z??C%????22?&?????8H????oW3??n???J?U?b????X71?R????
?W?????VM?`P?U?9???"?9K?????j?&?r??u.?Z?m-??3.{T2???
???Ec?73???k??=kDQ???_???=Yq??????\r!?6|??v??????r??(???Xa??X|????
xv?w??K?I?zFeAM???w?????%?,?)??.l??@5??cJg????(;??
???[8?fNc6????????\8"??????l?z?\??????^gcY?+?????? ??????j??Xd?%?c9????:?S
???^1?????
??t2??Q??e??Q??i?R?e?6u????B????*??B??????????W?B?b(?x?aR?]?Tw?xW?|??/??^??_J-/??VJ?????_F u??s??K???[??O?Za;t???S
???	%H??[??H?I???ds{??dZIs????:?^e[?%?J??o+?z#f????;?~??<4|?~+?W?~6????z?[?:?Ok?m???3????%'?????D?dK?4?Mj???&?lb??y|]?????@? T??[?p?q??iq??n]v??????a:??,2NY5??Hf???w??$?f?`]?Q?
???g?Y!r?|=/$?`M?oR%?0'?E?Z?2????H???R??8K??
2?Y,$ZU1L?????h???p?b?]?L/??X??+?'Z?n???J??
l???????B.?<??N??'??/??B?}f\X?3><?|W0??d8??wm??s(?Q??8??????????X?6
I?:?F?J{:P???qYI^?j??^8????BC????x????B???
I????/,`?<PQ0??Wx??2?"u?V`V??I\??u?b??l???
??p0?Gj?,?B??
?o<??M???\N[??2v_k????,r?7?pR?2?f=U??x
x?_U???i????k6?a?W???g*[?%??y]??j?Z??Q?]?G??B)*sL9/?????&,????? ^?j?????	=???W?c???R#?F?X
?>?[?-?"??u?{??6??ei?<1?R?Kg]?d?????R????Qesp??|3J???[?V?
i&Q???E?6?lN?B??g?L3%?rO???	??T"????l&?s?s???9?3:?v???????8?.?U??o???6????6va???\\?Fy?%?}r???Wx?}??P???{??AR???M?0??zF???????f????3???h?????;??v\t?'cP?W??"????&!
|?e#N???W???Fp8?W??T???4??t??:_t?d?'?H73K??P?$?p????M^??????=I^rjmJ?]?

???9M?
T ?M#???F?`????6w???????????uW??O?i?\?????^W(/??9u?2'xCZ?&Nv?X%?????_??????z?;?
^	2????*/??a?T#??!????
>?y'???3?w8?$K??D??????J?v\DyU????k!???l????]"????6?Z??BSH??l;?]UM?????:r???]???r??1wX79)??'???hg_?@:?$?Lr?BV?
~R7?&H????`
*MO???
Z/yK???$???O?tL??L??????G?!??v???|s.?Lf"A????q?;L?~???|*????8?PEs??QKz?y?}??k[>???r??f?8?????\AN?U?i?P?ok?A???????V????{s??,?#D?D!??.??z?K?m??
g??y?]5?????3?P>y??U`??[?l1??)$I3?\<?X??EXh?aQ?dX|?Zl??^?J!?/???W?6?n=Qwe???W??k$?K%p? ??
N???^+??6?6??3`??b?\
h8%?w??????~?l????b??N5x?bb???^?n?W??v??	j?u?<??????j???^A???????T???yw/O?`??6~%^7????s??c??c???????,q???5?MJ^?]aP?+?W?j???3????`=????n?I0?
A$?u?}z???)X?VI????U??
?jS]?5?.b9P?&
t??????????.?]???YD ??
?1??
?????i/n)?z?v?W0??y{L???1
?F<???,,???1,??i???
f	??!??
???m3xh<[?i????N?t?????-??J?u???~m??`|o????&???
6_
u???j6(????a/?.k.0W?Yg[?:??#??w?T?>??.?
x???????cv?????t?$Ll?o'?%??Y?v'>:?l?q?
?..?????s3??????@????-??9q?|t?8?'?????NQ??
>:'3F:????e?d
i?????0?%a?
:*?ur????Rek?Z?s??!?
e
???Y????jS|???-?y?a???,???I??}@{???,??W
?N?????*%???@?4?F?1??We/j??l??
??E????b???=B9??#????s? ?s??(?}I?i+3?%ZKhRVc-?A?????h6?c???8?????d??LK????B?^??\8~_??)^???????b?~5fQ?jf???Hp?V??Z???G??b~???''?E?T????????8Ui?^??
_??%,?\hY
?^????[B?Y??=?l???$?@??P??9s???c\?N??U???r???w?zx
??
??mh
???k?=?c?????c?$???o?,???W??B?X?<M???Z?,???e`???L??9??5ar?ww-??co|^ 2???V??`V-?['?k=??q???????0i?p?QxB??+tIA???_??4w?(?e7???'???xs)?Yy???Lqf$-?H???s"e?v~?D??S_6?2??E??yk>3?.eN4??j~A?????a??????t??:L"?????+????e)[???]?????K??	]R??G??^??7?Ups???t?l?0h7??&??????3??T?d??+?m??&??N*??
?=c?t???fz?=iO?xLM???	?W?????&i*xh'?????*O?I??N????izjf{z??4?I?<R'[g[O???z????3??q?i?5?#z?~?xr??c??6?????V????????????1??a6Y?=Z'????'??eX@?.?X?l?N??????$?==????|K+???f???v?=V???y??{k?{k>ao-??H?v???G?????j?O????W?n??j]z??NY??????]??vW???m7??~???5R2?????????????kk?#???????? {?S,L?[??????N??9dd6>?WWUb??GC??C???????????-???wc?:hq?*j??/?N??I???'??l??vt??BoO?Y??;;?????}?52????????0?L_?q_???h?tT????L=iO-C??X0P'a????i??:?g:~????9??Z{?????m?Jj?Vi???N}>U?N;??@???LzL|?Zq????T???????c?;?Ez?y{??????O?SM/?????vUu?:9o??D??VO?L|????k/?	?O??)?Z?
??????U??<???_?r???~?u?G???lN
?]??nq?5?C??o;M??????iz???q??z??G??	{$?]???W?q????5???&??????[s,?w??z??R??????F
?.2??f?M3?M??Jv??|?y??r|?~?v??/C]-F]-??Z3??fA_?????i?vcSC??????Zq_?l_[?z???jZ?r??????Z?/	?,?c????H???.???v5??>???S??=n'{|????]??=?&????=b?K???????}????=[h~I?a??l??\?U?2ln?a?????u{k?F??:?Kt?<YG???y?k}???
?
???7????????E??????d????0i??????(M???????O??)A_>$??RcjY????i??<?1?W{$~3???j?4??V??9?????'??Z?#??G??u??T???K??
l?
5?j.??7}??,5?'?y0???})???N?d?u??k?%U??v????w?Y?{?????????4??v3?d?[?Z?n?V2?4?t@[????o??a?:?Ku?y?m?S?l?N????tc?g???,?_7?IBh?m?????ie?i?~&???X???[?M?'?wq7??@??wO???%??S?G?d?&??t4?_O??S???P__??J?+?qk47[1??=m????b?V?H;?5?|/{?x??7?ey?n????1??	:????Xoo?H?^_??J???Eo?	???'AZ??X?@7??M??{?^,????#y??4?????1???i|???q7??59??????>UO??~?
3?????*?6??\?:?F?9???S?+7T/????x!????{???????
??Y??`6UW?s4?]?C?7?j????|????X?>~Qx?????\?2??/9??4=1?b??N??O????l??5%??q?L??????u???????? 5Y???v??~???w???
|4?QP?>?[?<?Er@????SHDe)?4?D?
??Z?K?< ?)?
}?N??`\Q'{???;?????U?????+A?????:?A????0?+?,u?F??????,?Q??VE???`P?f???}?s?v???:[)_wh????a_2N??0Y?!?B?n19?^
???
??????S?'3/4Vy???_3?z???x?????
???-?&?3?sF?bz?K??
Hr?
???Q
????z'???"	?9~?d????4O?????@?)?F?7??^C???????????????^???????4RZ?t?jn?s???n?0?(^??U?[????-R??j9
??kw?P?Z???5???3?~*S?s\?G??????)?ql???*j????H!??@???3?(????[?????????32????6g3??Ao???}`??V?????c????-?????n?Z?z????N????/U}T(
>`1???4"
?-z?o?????
g?a???}`?WoV??5x`?j?z?
?P??%V\?#??h?::???=??T????3U?????x?+??tO;G???D>?x$??x?????

????
_??Ba??-??	H8T??
??c?2Z?a??U??w??J???t??Qo???x??d?????X?^?b????	??{?T?hl
{/?t??*?????V?r???Un*S??u?V7P????Jv]???o??o/?\??rt0-??&D8-y?PK???Z???_?s?.:	??????????S ????????~0??F?W)??"?@?`?Gs?&?? ?>???{?;\???IyV???N????o?|8?;??=A?Y@w?NP	 d???0?a???;4??X?0?
#$???u??U????Z?????x\?|{?T
)????p?&??{?
pui?%?99??W? TU`??"?>`?tKV?F?k?G?w????????;???]r?8???s?????Nu???
;-E0B??o??8RS??V
H?Tq??C????*??k??\??P???????i
gcFWb9???+?U?
?U???N???x(V3??WWp?
p>?J???????1??????
u???ca?????d78??k?XMMRV?????i?????7?????Z??[??????G?#??z???}?:??}?????????I?Fz??R*??S???s???!????'????@??+h???R?:??S}?S\?????z?p?;?
]???#?!???9?M/?????Z^?O?K?H??j?[U|no???^5??g?HB??%?(?n0/??>??????J??k? ?d?W??t??><?z??J<?6q?~???1?}???H/??Y?y}??=?Wh??X0D??
|6bD?????????x?
???O?,{????
s??oS??-?{U?????{t?(?????VR??????bs
][?????? B?h??~Ba????A???s???5V?l??cK??zE????	?W?&??@?Lu??.
??"???=}?0??HU??E????D?-????[?A?F?3?1?M*/
?Q??????,???????ml???I?????|?>??????????Uw~_?_???~@?????* ????=;????cd??)?U\5??,?PO??@????+????q9G???
SZ?\???D??:??????`??e??$?%
?n0???/o]??1?(?b?N1R??%???t;:P9??i?G???????K?g[????HE???Sm ????F???????<"H??!??7C??V??V??F????8)h??$J?8^?? 	???<*?l??s?;
??!??R?H??L?7???(????3??RZ??????x?P??^?FW?i
Z??&???G?5???7c??????B??????/????xoz??;?n?E???gP
?D$??????????^?8?[??F??
???K?????_?UO?B?3?Gh??"?@??????>??NgcXCR]z \rT???7c%W?????F???A?{??iL??????f?W?QE???)5?????n????e????????;?4J??A???I	?y???b"?`???`s?5?B?_79X0w#w|g?|R3?*P^?\c??? ??B???????&??7?"VU3?
?
?^cO??%???u=??P?????mj?u???!X??`?????????{?????OG?h^?-l Q?4E?K?
?$????Q?T???i
???8?~]?F??O!R
y?Ngc??`L&w}???J!^I???y?
????Y,i
?????PG????p"??Zc????-????3b
G?E??
?#>???_??=S????A????????l??n
P[???f?????xu?:????????ZG??M???O????P?g??$Y?>=?JRM??h?????y}?%??8j)???,|??#T8???'??r??gu???	??=pL:mH?
F??A??8&???	??i\???l?B????%??tG?o?+???pG-??yj????3bHS?L?8n??$??A"?3???!???V?G?#P?/7???
M??+5??[
c904/2?P?J??@??Ah?d7Y?%??#{?O.>|??.?U )??4?R??K?'?<5dD????K????`?O&6?)?Sk?
0?%.O?g>????????????fZRcO??K???1J[??B???Au`/?.??
?q?i?????,q???cj?(t??????ap7??U0?A?T?I??
??C??5i?H???X?<????{?????hwr?_n0/??O
i/{?1/?Y
C??!?J?!M|XVT ???ojaD8c??B?}P1E
?????	?aLj?y??c??????:???QF??$?\6F?????p-]???????? ?
O?V?Wx`??????-|-FLz*t?V"m}?@*D?$z??E??Qy????6:?R????5?d??b??????r

?r?:?U?U9Y?Pu ?
??A?????????c??_U0??u??@?}?. ?	.?	|<{vz
X?g?s??q'U?
???????,?g?a?
???hL?!???P???
|??q{Z?\?|????#q?
3!?&??????_YvoreB?p?o?J??j?)S?p???4x.????=L?CeI<	>????D!??c
??i</?q??'??7???[?)??????
nb?9?	??.?B??/ZD?+qPE?>
c????\C??}??*??`2??%7?ME*??,\$?O????q,??I???????Sq?Z?y???????Gwc?5????<R??????h?????:?A???=?H??j????z????'?GZ?HtaHK:<?"HC???(2R???????Z??B???={?????h??.??x7??c??@EE??BY????7????1?qh{???
e??~???\?????KN?b???;cr{??W!??8H]|7ik???|q???s????
??h??l(
?1Fi???&???~??;u@|}?]??X{_'?T???B??;?>??$s{y??????$?
	??	?&X?vl???t
J<???????}??w;(?V8??!C?Vy+/????x??Y??+??d???AJV?o????z?/`W???z\?????"w??*$@
'W?????g??4???3y?????D?)(}(bCI??
???33D??UB#?B??m?f?J??i???3???4?\??f{?? r?$?p?!???!of
??@	j??Mn4uI??wf???2y???f??s??q?????o???n??dF???_??????EoX???@?:??B?p???-;1???otQJ????ZD???tI?v??%P????npA???`F?????e9??f_{$??[?&C:uE?G
P?n\XE?`?????+??@???UC??t???"??3 at 8??/?$8]T}?S3s??f?PAH??U?????SMc?(D??E,[1??hKVf4?
???? 3?@_?1?G?b?
??z??)??v?? W ?,a?n??8??'?A??????L	8??_,;?,t?????	P????|??3"3???%j??+??R6(r$?7?q.t??~0C????????A?`j??P??0??e? )1sV???o?C]?????-'j?/1?	?y?
?lt??4[ '??ixg??RTf?-V
[??fIuE\???
???UeKp??k??EC??<??v>?m?$??T?(?9???????'gJ?;?5??w?t?S??E7??( ?it?CNH?T(??ui??D?f?V,??e???F????QJ}$$????	e?C?O?U
??b`
?e3I??f*?d?????k????????kCb??U?!D?L????y?????;uc?:????w`?w?N??J??~??\???x#/??????P??UN_/??!???Gl??L????D?I?Ny?zDxqP?m??T?pV??t???}@^?x?????8M???3O?-?????A???"2?5O?L
?):???D??*?????aD{M:LP?6????0??2"??G?}??}?0U!2]"???J???%g??MXi???*&??}`??h???#0??J?,?
90??
?XFh??!py?#6?.??b^Lr?8$??D2????!??d???*?u?5b1?4a???????@??W?ovn)?S	c?5:,[????!I?O?%m????	mH??J2??B???!{F??Mf`?_????????:9???
????L????t??D*??r
{?fS?????,1??3?o??#?b4Jv?D??	.!?L?J??,???8??9???i??,?X?????????`???? ???#???4?V"`LF???g?\?MN??<??[????/
???C??!YZ???.?????
L<6Gb????????e?? ?K????znB#?Ww
J?z??TH?nvU?)8??O??u
$I?UA&)?)??heX0!?{&?I????7????@????"?j?ev?l???#u?"?Y?????
??t,???9/???h???sBys,OQ?HAGe1?.[X
?p??J??
???Q?t?????`|?xq{?N5??P^|??y???"??`?z???????>?b?/3A???w?=<?O?S4$?????{0?q??ICW?@?.Je??G0F:&????o??pG?D?????3? ??C4t/?ab??????x3??!f8?i0?e????"??niFo??}}???tP?+G'x??HM
??MbS??$I??A?Jz?G,M?B???h'
(R??k%*3`???????j???R???t????(???#v??????H?
???e?v?"? ???
?NtLcv??KDR?RpUq?Vl????&??V2pc?><?O??G??c?7?F???X`D??Y>?;R?,N
???*rZ????wWC????Cs9q?W?+e|Vb????u???#
?94???.?????Uw??-???wn"_6?T?????!??*?#???|??XV=?0???kU'}?Kkk???_???B?)?q???a????R??{???XU/????????}??Y3?
?g?R]??:?3F?5T{{???B?joC??O???z???k??:/?
????#zQ?n???????q????9;??VT??F????jc^b???t?js???f???Z????
????]???u5=N\??????????8?+??????\@r ???*Wb:?:C?y??????N#G?_???Ov6????qv???gl??ev6??@cw4KCl?l???z??Rwc;?????v'?nUI*?JU?R	?d?[??O???w?+??^?)??s??r?cn????6_???C1(?R?Q???_?w?^?.{/???@?s?KG?u?5gu??x?f9}o?h?^a? ???_
H?q??.???Q?M???!?ydzTF;???a)U??g7?Vl?0?)P?6?N^tPUm???
O?? ?fV?t???E?K???w??,?R0?`???5,;b]???0?i %d//? ?\6D?]?i@?T???)0?K?_$????7`z????_?/?????/??"|
??2??C?2?-?????V
? *?+w>???n9B?4??B???Y+?W1f???`<N\????v??c????A;\Yg?>~???~?|N?m??<??	? )???\??WD???U??????{?}??U?d1??X??Do??=}?jW??\_??????J??.??C()9]C????tQ?.?k
?????^??NF??j??>??8???????L??S? )?bR??$;6???????N]??c??,t?qx?u1L.?Y#??????D/q??d?1`z ??r??A?mxp??Q?o??=?*???????*??O???-??Q ?
^??@????S^?1??_KK???????s?????3L???5`^?f??$V`n?x,??W????uW(????Z??h1k 1l:?"(??n*D	Fg??????hj?d???m????@0?K?)??????u?Kl{??6?}?dY3~sS=H[???{?Y[???Y?z?6????@??#???G9??0??c\?Hj?e 
}??1,rD
e????s?t?=qg???I?]???w[x??????X????H_?S???64EI2????pT??QfZd???a
?n???q?"??QnH7O???XA$r?????????}h??M?????y?S??M?y?I?a_??.)?{???h??.zz>l???]i?
????`?5?A?|?(??=N???h?`??B)???0-Ez????I????w??Co?????????.??????z??hI.??<w[????p?3???M??G^??,"/|?i?FJG???oiW=?n9dmv????3m?>Z???Cm??w???E??p6_?l?N|???P{???;???Q?L??[???K??-9?)?b??SPm??????W??Z)??El?%Z-??a?????2f,??n?bv]???*?7l.??X?,??,???2?1?i?1??G?K?????h??<_?r???z3?HnS;?'#?????
.
???%b[?,????P???l???zP?z?lM??p5&??A!???KH???e?Zi??n?U????k???3w???e?v??Xn????s??e??&?_??
x??{???(??
?????3m???
?T??{?T<e????y@?s?????LU[Z]m??x[???8??|????G?p?1?:v[???????)$)???/Dk%???y??U?!3???QdR??A??<6??8??"'?B???????`?G???v?k?)63HV<bZ)?=j
:?
+?|?????????I?(:_Ib9?A?s??"????5?!r??#??!uxL9?????????F?d??~?[?h?$[5?_,??t??i?#???l_BL"???4=?????]Prz??@?bA?f?)4?#?k?u??????ol???I
???,??%$??fa?P???hd??Y?1??????????1?1p;?
???h?$P*????|???r?j?
??u??
?u???A?+9?3?2???????Ce???>p?
?
'???Eb????|<?Ig-A??u????????9??&?JF???jm:?&??
4s??>A?{
??RI3??X?T&?	0???NA?	?G#LI;??!fv??9{
??*!??/I4?v????F?he??B???L?[?
%Jr:?-Q<\,?:?.??V+?? &?Q?U???w?P???


Q?wlz?4;???Q?yI!a?Q????n?N@??A????1??????E??l?[mU?K6&?????Q?e??f?&I???????P5XmsW&?@zI?????f;K?M?T???%N???U????L????,F?GVe?????R????k??P]?:G?7??1
]J
?????????Y9?????!?:9???????pSd??o:??????>?????C?	??r|?wJ???????,?!2u??C?.?su5 ??x????????9|??=L???V?!l??????????9?e??k\2\?U	?6?p?<?v?????? /~????	????;w?~??<OU[???i?g?
?;?O?N?K[?E>(???????I?av
?G????CU99?l????ns_&?g?bT??~???
?????w?0?g?V????Qp?M??????>??a??????R??Yo?!??0
0?b??????|ecw????X{?6J?g5?????'????D6????????????s????8?nZeu?????0-?Ie?@???T?h????j`B?`6?0?V,???}6q{???)??)O??w???
????qDYb???????????|??%??A3n?z?[m??n?+???Ky??vcPC??L??.l??/??c?a?a??Q ?#W???OPEd?27>v<g???,c???W<z3?Gtx?q}bN8???T>??7???d
???_?
?oS?????)f?????i?{?????m???????{???`<????0d?????????bVp?M?
??RE;m?E.k?O???m??T?%4u#???r?q??[X????`<???????}5E?p??.??|?????Ez??.01????+0?1?????G?&Z?U?V??YI????1?#???:??????;?/?
?v?IvV??$???z???/?
[???;?Q?????@??G????G%.i???????[?G?A???+n???=J?}X<?e"?/+??m?i?=?.??8
G??6Fw????~Xdd?
???^?U?
)e6??UrJ'K??or7??u????h*~?Q???_??I???????E*?sA=?w5
;?mf???9??7?dxR?{????=y????G???c??:??)@?????y!????D?Yo??u??v?7???!R?80
? ??W????'?vi?kim????w?'?hW?0?XsL?m\??+js?????6p???$??
?bG+!J??cxi4UOtH??)???\m0;:Z????.?wb???M???%??'??>?t?
)????S???Mu?}?pm????Y>.f????????4?????/7??$????X??qo?2T??????#?<?N<???Y
??<?JZ??????Ysr?1??}0??g?]N$/i??x??=?n??x?MY?jxb???????i????]??8%Iu??I???????+????c???7??a?V?????Sa?R?{#"???o?IF??&x!CtB5?U~X,?\,?*2dX??&??x???
?????f?~?[:7?bW??SZ?{x??O?M??W?E????[[??@2?tj%x-?rb?k+???-"????~	4b??KN?gRZ???aT]?7?W?'5A?g???k
k
r?E??r??W?????'T
??5???Z|??fM???M6?9?????,e??;9?"??%	??,b@?`?'mDk??@??b
6???_SO?8H
?2?i8???r?%??:??
kG???v,??=G???T??f?v
U??y?S?????
)????H??n?:??V??????bFvY
????*?????]??)?N?X???\??????W??
?kU at V?2?C?au?gv?j?g(U?R?
?0???j
?w?sz'?x??????V?P?T???_?:??Q$`qh#v????8?N/;P?????.?
?$y]??f?<??c?(????EO????M|+?~????4????????/t???g?'<????an3=?{?E????????z?R??????;???????%?bj??B0?E?e?????Tx:?t???N?n???O?ge??&?4???@A?	?l?9?>?
??r!?Yj??_?z???J?j???v9??\?e???R6???5???Z?d'?gAe/?19N?=????????|??4i?fvJ??????C???oce?[g??S???c??q0???????%'?S?K???xC????N??ax&?????RC?o???<6??/
v?lx_A?/_A1?N0?Sx"?I??0??<?havv?% ?0?HL?
???;?c???B??????I?N\?
??	?Af????<[	???????8w???0:=??@???????_~?T?r9????Cq\
$4s?%????=?hV'?m??,Ve^?R???Zj?????lt`???h?
???g???U?F?j
,>?
?n?Je??u7?,!<???m]'?,
?2??T??#????n)
?X{?Nf?I??y????f2?rL?1???x1wg?D???qy???v??zhJ{?H???U?X+
<??)??P???~??x?j??._@]vh???O?????O??????????????
??????xd(9/????]f??????Z?s???;N?]f?????????????@??UV??P?<].?A#??K&	?Q?aU?_??_???1?t??????Oa}????5.M?L???r	Ct??I????T???$?,???x???b?<5j??\yj'??
>??k?????T??T?aU????e*ZM-'?????[????Gx??U?s?8:|/zQ*??Q?????P~?R???{???N???O??????O??????l^????c??A????kb?????c?f?
?2t?O?????n??S???v?r?-?x?7??2?z??x???N???%
?K0?_??IC????*h??.^??UoHS?,p?d??E%^L????1[??;?a}??s?????????f????KuIq0??b?F??':??*S???:a??QU?|????Qf?`S??H??F???/_6?Q??w?i???????#|??h????Q???F{Zg?x[?]?2o?????hc?
???eK?2??\?[??k7??????i7?;??AX??H?N?d?!?????HE??#????%a?b%?????xA?HN? <zz?(S?+?????i&?????.?X?p??;f???5?s?????=?????????????0TJQ?*i?(`??Z
d??\??4???w????????x5-???MF?d??Z?$?p?:G?tVC:??k2;+D?CD??????D??????????.x?(??A?S2-M1?;??
?5???e??{?????????^v(??z[??[???;?2?rew????????o??1????x????Q/?-???Bn??x+?r???lf	???O
^???t???]???$?7x?u??a?:?=<QN??RR?=`m?=?&c? H#

M?SkSkmj??9L?9tU??????5<????q?P?'???k????????z??????CJ?'??????&G?????>srD?_09L????L??'?	???????????+?!?f?3????Y??"?M??N%`?
?B~????<???_??Q??~????f???.?	????8.P?.??FJ??_?@??a+?8?-?B??I0@??hN??T??? ?5???~???*vQ?6*iw?J?3?????=??RD|?`+?????=b??????A}?`G`?;p
Si?iE?V4???l1?%???Q?O?~9=???HpcVs#k???j?&?f?l?d???
?h??xW?S#
?T???F???(??9?x??U??alx
????F??a'??tiMy?m?????5????n?u??Q^?yzqD`x/??&
_???4F~q.0?d????&?EH\??&?`,???????:?v????8-M? ??#HuEUi @?z&??h{c7?
?X	CC???L??V???
.???0}q??
[?N%?>r?????j???e?u?{?h?DW???V???G?1*?8C?j#E??e????y?????HZf????Iqs???????7???????/^?<?F??Z??,????N[????{2)?R??II????????1??h??pg?4wp??AU??a?h?~q?
?????fC?2?>??H???p?Nf1?~??8???\????cL<;????8;=:;?X(vMJg??O6??????5	Y?-????z?|}?z??%G?u?oM??%:????v?W??H?x.m?e??\?{?[?'????A?cb?r?d???F#?8???wx???'9
GI??KT?????????&t??5?? )????E?Qd??1\il???
F??FZ?SEQ5?R???^?}???xH*?%C O???W??j???v??D??v0^?l??%?'???(*F?)??
?}?v??el#,??H.Z??Y??????#~?@G???'g?vl$?s????u????G?p???S????N?9m?n%?S?????????j4?b?g??$????y"????Lqu??????L?????'???&???h;zv8?*?????VG_?????"?%??a\?+8??T???HN???<?e?O?????????R?j????@??x?????vud0?$Gb??dw???w?,s??	j^4h%Qd?HL'?????>???c[?????A?@?B???
?r??`%????*?E?c?)ag{?F	??Zy|??6??????!?bp?o
??UG??6????F9g_Z(?x?1~???Q??/?mK?3X at HO???s?R
??f?<uE?Z
?E??@?i?????7??tW???????A?*D???$bn??]??E??)??1{5U?@?????Z?f??~?L?^A?q:W????$?t?%A?w
"??
?F?Q???AYo?C?N???L?N??????????>yH?c?@j????????xq????y??????2?5?T??[??`?????????i???k?p?n	??M!r?k???;/?~???c?S?~?r?c#4F??v;????W(Z?b?c????P??Wl?RQ????~g??$??U!O????i8{x?.?????????;??ciu2D??????	!??_??D???5??t?4,?j???DI?@{+??y?V?O??
?+?
????'/&3
?
4
w?Iq5??t?^4??<?v???h4??7?s?M??F?????/??d'??????JYh;??N?]ccb??
h??adb0'_???8?G	?_?W???N?n$????kx?I? ???o>r??X????k?????ki- ?E?=m?p$??
??U??zY???u??????}??\$G?:Gg7??W?;#:??%*??3\Ub?%-???K?S'?H??V_??g???????VS???9Es?????U|=A
?/:&?N^?h?5?.???????t??p???T%L?????i???
M?@C4?
??F???n^?GZ?}*w?@??;v2
1?:x???V??(Q?????,???????& ???N??????'??V'?????J?4?r!qy??O???Y?R??\???<?DUbL?G?y??sK!?L? -?H4???yM?#cj^???lbV????h_J?O?S?
??	???_FY"r???V?A=?a?0?F?i?????????43 I??Q??]E?/C?pCx};~DJ"??%Ic<??	?BQJS?!~??UuwFk$??A??H~=?Td-`?'??K??:+??????|??5?Q|???_&????V??|?Uy
,P+	??????????????b?8??????s?????\???%?n???A??????[
??
($v?U(?F|?3??kvU?????
l?Z?d?b????	F?
?1?6??l?Mo?Sm{?W?D??.]??)0?=Y=??D1!>??8_???$???y9??Rr?3????fD?>?|P????K??Y??r0?l^??*^4???) 1???
??>F?F/?s?-?8??"0??x??U??X?????\?*,??QV???? /?Kq???
?????Z?bH#E?y?????pR????s????2???7??E57?K?????2??0?`?q??y??|>????k@=??`???UO???z??7sAi????
????uVa??=???<?1?=g??ak?_;}q????Zy<0?-n<?
?o\?f.??????z4P_?
????
N????????;??A0?Z

???W??'.???????u< ?????????????R?&????B?8)????????!???/??|??9???
q4w?w???Cx??;]b?D?
??G?b6[????,;?????? ?=???C??U??	???Z????????`?/6G(C7)?,&??i?I??@{????G;??Cn?.O?????O?????3k?d????W5:??~???|
??Xz?Y???`???}7D1?
?/??z_?7?	Y#??yQ!g?
X \??@????????{????wx?????;~??5=?-F-?W?n?_???'??x?o????????????9P?"?9????{?+????w???A?y??d]
???`??J4L?A?d	?\P?B?!?ClJ??P?y,???Q?
??s?a*N?*?P]?1r????n??x?

R?i?????d??"
??	H&eP???b???????(?PR?R?N?[???~J'BC?GO-7j??%[???
??0L@??5
Q????I?L?'?d%??c4?:?x:??:?s	T??o??T?C?|???????z7??xN?L?y?????v?????J	r????T#@!L9v#!1???????
Q??T???D?^Hh9?S,g?i|dP???a??:w????^x?????K??(??
??z?.??D?uAH?k0VE"t??e?Yy???Ta??PF^????|
d+?]????pa??<c???????)7u3Xn?T#'
?K?,W_<oL?.?j???/Ra	?M?-??s??d?S/|J????1<??????>?D?????#??AP??\??F4f?????!????q?Tz???)9????\K?V?
?iv_]v???<??????+????@?$B????	?B?=???f?M?2
mc?z??t1?E*??%?T" ?+i???????@??M???b??O??H?)&??j?????>?[D?{??e??@??p??I??????*??>s?????E???,??&??$??0?"?M1q?0~V
"
y??????+??????\???
p?
r?????w??vO??
?e?F]%???)h??????????W?z?j??,I?????A?U??A?]
?A?>????]??>n??h<#?v??j?9?(2?(???????x??hg??]U??6???F??E]R?????n????V??????c?X??Yl?????<q$?"??t=?t??z
????G??9?{??.uqKd?@??B
?????H??,?.?????
??U?~#????
??1??j????v?l"???F`a?[??????F]? fKJ???(??? 
????R)o?M??
??k?JQO??o???r???wYn??f7?H???r?Nn}??E????TJ6i*"M3y?I?
vu?V??vj?AR??p(rv+"1[??I????w?? ????00?
p?;???y??[P?G6???+???
???a?uH?wH?$??bx?$(D:??????E<
??
T?X	??x"???g?CJ?	'nH???4?F?U?F{??A?e)MxF?gx?{Z|?
??G<??;?}
]???y???^T7hD?f???h??~u???*r??Pr1/?f?*????.??5?j??0CLk??NHd0????@&('8??
?????g?[?M??!x??@????V?co{???`???`?^y??5R.z?B?{9?????e?A
M????p??DM
e??????g7??!??????`zZ*
??/?WA??.???]?]*h??p??b?????XzQ????c??KF???%w????|TgO>??j?n???z?Rj??;
???<F?o??????=On???#?}??O<?G??}?:???????????>r?????L??pL??#??r???y?S???Ct?8`???.>?E???B?l??>??&??????%Z\??p
*??j?cC{H_??m???a?cV???^O????VD??E?Po??V8??}@ ????r??u??:?0N??y7?#????
Af0??J?F?@?S
??U+*f????zq~????J??????7L?%?d?*??1	Y]?Bl????v?,-??[?F'???d??E??Uj???4Jx?VW?@J???J-y?J??vC?J??????M#?t???/??5!?D?)b9??l5_?7]??E;???F?u?L
???????
O?j
????Q>T?R
?4A??T??8????????w?Z??X?E?Rd~L&?'?'?{??#P?(T?r?`??'6?8D[??\????O?"?Nf???<]??{???S!?!f????C?`?R$????????`G??2=?w??????URuL?.?yk?
?P??~?']????F?%?I?>|?5~D???x??Y???7?oU???;=?W??#??du?P??????g?*yh>:???t?Hx??7T???V?m??#2K?p0???
?aT??}I.b
B??0z?4

??G(??L??3l???0?/?6?q?w9???? %?gi??????0?}??w????>2mqoczw??)??8W;?????4S?,?Rd?.C?I??E????i[`i??+?Q??
z?xU???l?}
?v@?????+?>?"??O6??v?%?(X???H?	;?8???v???_??	???S?????H	??^?a?(?W??|"??1M????
\???r??(?;???Q?U?jK. at J6?D??G7??&??DxT??M\?a6?`{?gr at lpLLjN?R+g?*^4?*???)9XV?b????^????[?X???K?u?
?????Yl?]?=?nk??su?#@

?>~????l??"??v?y?;zur?l?^?J?R??V>??^??j4QB?K~uv-??????ZF???
hr.?D??V??SX? ???R%?@K?Q?J.????w??????[???
??/h4??3P??m??????_??????t?????B~wgg??w??<???[???????7??g|~?~??O??kL'?{?????|?"?s?"??E??G??a?[??ob?
?ff?
/#??X{??{?????????&???L????u ?"f?x?}(???d???X??????E?:???T??b?V?|V???!?~??,?p?&q????i??A?????XdsDves?????L????????????_??Z????#??%X
?@Q</+?Q?|FU?B????z
SJ??r????X;????:???T?r???EXP??CT?B??X?d??EcK<???[???)???Q6?1i
?C???- ?;??k?????(???5&?`k{?pJ%????E0???7`?}o?
??????<??~}J?o??o??;?_??Y????_U?tleA???|?,?	??&?7|??? ??
?I??P0??|'?O_??????>?-??o?Z?\?(?[K??A??V\
_??F??F?,x?#F?y?x<?a3D??|?P??G?????
g,1?k?????{????S??+?J??)i?67V?MT??V?_??W????q _??I??A&???Szc>???????(,a????b?~x???????????z?P??`?Zy?e??J???????*????!|?w??????R???;?g???J|$}???E~KG??+y`?????9%?Z??!??????>???;?#E?+????????0N?Xvf6qg?u???u??hxK?eQ???W?._?!0]H??5???p4?q4?c?8?)k??
R? ?HE?Tl??????h?dG?Tc U
R?A?d7??Avm?]
R???4H??i??????A?4H=R? u??A?b G??9? ?1?c
rl?k?F??A6HC?4c M
??A??$r?ANl????4??????-??F,?\?R\/?
???	
??:???0??Y???KY?i??F???{N??Fr`p??~????u^Ot???M?\x=?y??T?GrB??/?=7??<?uIM????0?!?Q9r???<??=??=L???E\??iV?$P??qSNE?L|?????!d:/???Dv
???0*K??r?CH?q"???4??k?z??}??????n;S?`?38pd.6?X$???BrX8???:k???z?????x??<E8??U]?????+P? .?OD?e?????~F??e?
??z?f?{B? 8x?CjN??8h?"??1????~=??????0v?U???XOv?
?+?l???4??`2Sd(??c?p
,9?t37E
?6z?4?{?,g Q8$c???
???CDQ?!?~???$????]1???9L/?
H(?%?T?R???"?t`?????mf?????
 6??)???t??T?H????Fx?\x-?*7K'???<>????'???Y?{?#Y!????
N???H?2~C??N?iU?
[????B?l?????fs????h?Z????????:?9[!
?e??x????C??????G?^?rY?R??/wr???M12S????????????N???,??????f???P??)J?K?P?K??8?0?n??i?h\2??ECt???p?ZH??p'0
??^VB????????B?PP???O????d?9~??C???ZA?!?`
t?a:%?#???*U?B?c??	6^?????W?
MXI?x??q}HtQ${?p?y*FTV:;P?????^4{????fA?`?;ml85X""??#???c #??!T^????4???H???*N?????|?yfPB?+??r??!?k????YNQ,??n??n?2?t?tk c??U?????BN???????
?????pyf???2@]?hn8
?G?nz=?C??6.?????X???p???????*??[?M????0z??v????8?=???<???????^??T?V=EB???@?}!??dd?k???Z>Z??6?c0sD? ?KR`.P
???)???U?5??N?/?o	??|?-???m?\??C?e%?
_^???Q???bb?(??#*?+???sMID|M??9???????r????	>?-?eu?,$=?8?hi?D?"?I\I??b `A_?B	??????<??]>2F?y
????F??ZPe??,>#??0z?????&??t3????????R??y?e??\?^t???F?p?(?Q0???x
??????3?1 ???8R?8+??'!i?$??g3R{K?5??6vj?????i?G?hzb ON????7??|,?0?????X????~??~z?z?%????7?)???}?
<????????=??3o???s??-&???????*?tAh??S?4??Y?C??a??O?$??????r?V????L+?<	NZ%j[?%?b?%??F9[=#??[@?;cl?????[NzJ???o0?????'??|?I????
:??'A????w????O?a %??kw*:?z??:?X???q???W?QM%????#?
9?b??WM??$/??#?????Z+Qn???Y??q,"????Le??2(}????[?????8??!??.?E<m*?*??????????;??H?|?>?G?7?
????H?f?Df7???G???x3????.
9?3O?X?E?;t	_d?????`_??J??"	de)?@W?	q???x???5?r?????e???o`?5?k\B?,F?????]6??KA???[???H%?=
??=?8i??u:d?aIm?gL??w?3?4?#2?t????F<????????
iA??G???O????????~???_"???<???Z^?T???P4?
?????
??f????h?.Z?f??R??Xy?,Gy??N??}%>?:??6??????=?;e?Y????I??b:~?
%?}W?z/	MkP%?\?????(F???y??BrM?k^????|?F/?=???????>>%?U??????<????`??
?"Zp?u???????\
??>???g??mR?+!3J??
[g???~UF??,???V:?U9C)XA??S?q?V??ulx?e^b?I?}H??????1?Q{S?V1?
o?Z??Fuz9??p	???NU????c?/???`????R??m?6/T#?wLQ?e}W?]?f?;`?1????!?Qn??pi?????%?r[?t???tE??c*f???I??H??Y(?u(A?5=??'Y?dvSb????P?S?`j??m??u?
??E??????????? ??L4?
??Mvs???SHW?????r\0????#?G? ??q?<????q??`;??\????>>?C?$???p+?K???9${??c[?}^?{;^?3?W??^??B?????7?	?x7????`raF??C)?V?x?M?av9^+<U?YE-??
	?????{7TK*lR?T
??????>?????????????????????|?Y?

Index: new-memtest-pkg
===================================================================
RCS file: new-memtest-pkg
diff -N new-memtest-pkg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ new-memtest-pkg	24 Apr 2009 17:33:51 -0000	1.3
@@ -0,0 +1,339 @@
+#!/bin/bash
+#
+# Invoked upon installation or removal of a kernel package, the following
+# tasks are/can be done here:
+# creation/removal of initrd
+# run of depmod/removal of depmod generated files
+# addition/removal of kernel images from grub/lilo configuration (via grubby)
+#
+# Copyright (C) 2002, 2003 Red Hat, Inc.
+# 
+
+PATH=/sbin:/bin:$PATH
+
+lilo=/sbin/lilo
+
+# some defaults that are sane for most arches
+kernelName=elf-memtest86+
+
+if [ -x ./grubby ]; then
+    grubby=./grubby
+else
+    grubby=/sbin/grubby
+fi
+
+cfgGrub=""
+cfgLilo=""
+runLilo=""
+grubConfig=""
+
+ARCH=$(uname -m)
+
+if [ $ARCH = 'ia64' ]; then
+    liloConfig=/boot/efi/EFI/redhat/elilo.conf
+    bootPrefix=/boot/efi/EFI/redhat
+    liloFlag=elilo
+    isx86=""
+elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
+    liloConfig=/etc/yaboot.conf
+    bootPrefix=/boot
+    lilo=/sbin/ybin
+    kernelName=vmlinux
+    liloFlag=yaboot
+    runLilo="yes"
+    isx86=""
+elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then
+    liloConfig=/etc/silo.conf
+    bootPrefix=/boot
+    liloFlag=silo
+    lilo=/sbin/silo
+    isx86=""
+elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
+    liloConfig=/etc/zipl.conf
+    bootPrefix=/boot
+    liloFlag=zipl
+    lilo=/sbin/zipl
+    runLilo="yes"
+    isx86=""
+else
+    # this leaves i?86 and x86_64
+    liloConfig=/etc/lilo.conf
+    grubConfig=/boot/grub/grub.conf
+    bootPrefix=/boot
+    liloFlag=lilo
+    isx86="yes"
+fi
+
+mode=""
+version=""
+initrd=""
+initrdfile=""
+moddep=""
+verbose=""
+
+usage() {
+    echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 
+    echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
+    echo "       [--kernel-args=<args>] [--banner=<banner>]" >&2
+    echo "       <--install | --remove> <kernel-version>" >&2
+    echo "       (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
+    exit 1
+}
+
+install() {
+    # XXX kernel should be able to be specified also (or work right on ia64)
+    if [ ! -f $bootPrefix/$kernelName-$version ] ; then
+	[ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby"
+	return
+    fi
+    
+    INITRD=""
+    if [ -f $initrdfile ]; then
+	[ -n "$verbose" ] && echo "found $initrdfile and using it with grubby"
+	INITRD="--initrd $initrdfile"
+    fi
+
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, just making img file"
+	if [ -z $initrdfile  ]; then
+	    [ -n "$verbose" ] && echo "No initrd, just adding system map"
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version
+	else
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version
+	    /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null
+	    rm $bootPrefix/vmlinux.sm-$version
+	fi
+	return
+    fi
+
+    # get the root filesystem to use; if it's on a label make sure it's
+    # been configured. if not, get the root device from mount
+    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
+    short=$(echo $rootdevice | cut -d= -f1)
+    if [ "$short" == "LABEL" ]; then
+	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
+	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
+			awk '$2 == "'$label'" {print $1}')
+	if [ -z "$device" ]; then
+	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+	fi
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $grubConfig"
+
+	if [ -n "$banner" ]; then
+            title="$banner ($version)"
+	elif [ -f /etc/redhat-release ]; then
+	    title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)"
+	else
+	    title="Red Hat Linux ($version)"
+	fi
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title "$title"		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$title"
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $liloConfig"
+
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title $version		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$version"		    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+
+}
+
+remove() {
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, remove img file"
+	rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null
+	return
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $grubConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $liloConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version	    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+}
+
+mkinitrd() {
+    [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
+    /sbin/mkinitrd -f $initrdfile $version
+    rc=$?
+    if [ $rc != 0 ]; then
+	echo "mkinitrd failed" >&2
+	exit 1
+    fi
+}
+
+rminitrd() {
+    [ -n "$verbose" ] && echo "removing initrd $initrdfile"
+    [ -f $initrdfile ] && rm -f $initrdfile
+}
+
+doDepmod() {
+    [ -n "$verbose" ] && echo "running depmod for $version"
+    depmod -ae -F /boot/System.map-$version $version
+}
+
+doRmmoddep() {
+    [ -n "$verbose" ] && echo "removing modules.dep info for $version"
+    [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
+}
+
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--mkinitrd)
+	    initrd="make"
+	    ;;
+
+	--rminitrd)
+	    initrd="remove"
+	    ;;
+
+	--initrdfile*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	initrdfile=`echo $1 | sed 's/^--initrdfile=//'`
+	    else
+		initrdfile=$2
+		shift
+	    fi		    
+	    ;;
+
+	--kernel-args*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	kernargs=`echo $1 | sed 's/^--kernel-args=//'`
+	    else
+		kernargs=$2
+		shift
+	    fi		    
+	    ;;
+
+	--banner*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	banner=`echo $1 | sed 's/^--banner=//'`
+	    else
+		banner=$2
+		shift
+	    fi		    
+	    ;;
+
+	--depmod)
+	    moddep="make"
+	    ;;
+
+	--rmmoddep)
+	    moddep="remove"
+	    ;;
+
+	-v)
+	    verbose=-v
+	    ;;
+
+	*)
+	    if [ -z "$mode" ]; then
+		mode=$1
+	    elif [ -z "$version" ]; then
+		version=$1
+	    else
+		usage
+	    fi
+	    ;;
+    esac
+
+    shift
+done
+
+# make sure the mode is valid
+if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then
+    usage
+fi
+
+if [ -z "$version" ]; then
+    usage
+fi
+
+# set the initrd file based on arch; ia64 is the only currently known oddball
+if [ -z "$initrdfile" ]; then
+    if [ `uname -m` = "ia64" ]; then
+	initrdfile="/boot/efi/EFI/redhat/initrd-$version.img"
+    else
+	initrdfile="/boot/initrd-$version.img"
+    fi
+
+fi
+[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
+
+if [ "$moddep" == "make" ]; then
+    doDepmod
+elif [ "$moddep" == "remove" ]; then
+    doRmmoddep
+fi
+
+if [ "$initrd" == "make" ]; then
+    mkinitrd
+elif [ "$initrd" == "remove" ]; then
+    rminitrd
+fi
+
+if [ ! -x $grubby ] ; then
+    [ -n "$verbose" ] && echo "$grubby does not exist"
+    exit 0
+fi
+
+
+[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1;
+[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1;
+
+# if we have a lilo config on an x86 box, see if the default boot loader
+# is lilo to determine if it should be run
+if [ -n "$cfgLilo" -a -n "$isx86" ]; then
+    runLilo=$($grubby --bootloader-probe | grep lilo)
+fi
+
+if [ "$mode" == "--install" ]; then
+    install
+elif [ "$mode" == "--remove" ]; then
+    remove
+fi
+
+exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	6 Apr 2009 21:41:00 -0000	1.20
+++ .cvsignore	24 Apr 2009 17:33:50 -0000	1.21
@@ -1,2 +1 @@
 memtest86+-2.11.tar.gz
-temp.tar.gz


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- memtest86+.spec	6 Apr 2009 21:41:00 -0000	1.44
+++ memtest86+.spec	24 Apr 2009 17:33:51 -0000	1.45
@@ -7,12 +7,13 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-Source1:  temp.tar.gz
+Source1:  memtest-setup
+Source2:  new-memtest-pkg
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -37,7 +38,7 @@
 to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q -a 1
+%setup -q 
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -53,20 +54,20 @@
 mkdir -p %{buildroot}%{_sbindir}
 
 # the ELF (memtest) version.
-install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version}
 
 # the floppy (memtest.bin) version.
 install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
 
-install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
-install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
+install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -77,12 +78,16 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
-/boot/%{name}-elf-%{version}
+/boot/elf-%{name}-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
+- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
+  during livecd-creator
+- Put scripts into CVS
 
 * Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
 - adapted the spec file for building the elf and 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 Apr 2009 21:41:00 -0000	1.20
+++ sources	24 Apr 2009 17:33:51 -0000	1.21
@@ -1,2 +1 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
-518763b187bb85249120d06dfebd1235  temp.tar.gz



From wtogami at fedoraproject.org  Fri Apr 24 17:36:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 17:36:46 +0000 (UTC)
Subject: rpms/memtest86+/F-11 memtest-setup, 1.4, 1.5 new-memtest-pkg, 1.2, 
	1.3 .cvsignore, 1.20, 1.21 memtest86+.spec, 1.44, 1.45 sources,
	1.20, 1.21
Message-ID: <20090424173646.C3D3370106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26631

Modified Files:
	.cvsignore memtest86+.spec sources 
Added Files:
	memtest-setup new-memtest-pkg 
Log Message:
- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
  during livecd-creator
- Put scripts into CVS



Index: memtest-setup
===================================================================
RCS file: memtest-setup
diff -N memtest-setup
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ memtest-setup	24 Apr 2009 17:36:16 -0000	1.5
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# package name
+PNAME="memtest86+"
+
+# executable
+ENAME="elf-memtest86+"
+
+if [ -d /sys/firmware/efi ]; then
+    echo "memtest86+ does not support EFI platforms."
+    exit 254
+fi
+
+MTVERSION=`rpm -q --qf '%{version}' $PNAME`
+MTPATH="/boot/$ENAME-$MTVERSION"
+
+MENT=`cat /boot/grub/grub.conf | grep "$ENAME-$MTVERSION"` &> /dev/null
+if [ "$MENT" != "" ]; then
+    echo "$MTPATH is already configured.  Exiting..."
+    exit 0
+fi
+
+if [ ! -f $MTPATH ]; then
+    echo "ERROR: $MTPATH does not exist."
+    exit 255
+fi
+
+/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+"
+RETVAL="$?"
+
+if [ "$RETVAL" != "0" ]; then
+    echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
+    exit $RETVAL
+else
+    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
+fi
+
+echo "Setup complete."


Index: new-memtest-pkg
===================================================================
RCS file: new-memtest-pkg
diff -N new-memtest-pkg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ new-memtest-pkg	24 Apr 2009 17:36:16 -0000	1.3
@@ -0,0 +1,339 @@
+#!/bin/bash
+#
+# Invoked upon installation or removal of a kernel package, the following
+# tasks are/can be done here:
+# creation/removal of initrd
+# run of depmod/removal of depmod generated files
+# addition/removal of kernel images from grub/lilo configuration (via grubby)
+#
+# Copyright (C) 2002, 2003 Red Hat, Inc.
+# 
+
+PATH=/sbin:/bin:$PATH
+
+lilo=/sbin/lilo
+
+# some defaults that are sane for most arches
+kernelName=elf-memtest86+
+
+if [ -x ./grubby ]; then
+    grubby=./grubby
+else
+    grubby=/sbin/grubby
+fi
+
+cfgGrub=""
+cfgLilo=""
+runLilo=""
+grubConfig=""
+
+ARCH=$(uname -m)
+
+if [ $ARCH = 'ia64' ]; then
+    liloConfig=/boot/efi/EFI/redhat/elilo.conf
+    bootPrefix=/boot/efi/EFI/redhat
+    liloFlag=elilo
+    isx86=""
+elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
+    liloConfig=/etc/yaboot.conf
+    bootPrefix=/boot
+    lilo=/sbin/ybin
+    kernelName=vmlinux
+    liloFlag=yaboot
+    runLilo="yes"
+    isx86=""
+elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then
+    liloConfig=/etc/silo.conf
+    bootPrefix=/boot
+    liloFlag=silo
+    lilo=/sbin/silo
+    isx86=""
+elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
+    liloConfig=/etc/zipl.conf
+    bootPrefix=/boot
+    liloFlag=zipl
+    lilo=/sbin/zipl
+    runLilo="yes"
+    isx86=""
+else
+    # this leaves i?86 and x86_64
+    liloConfig=/etc/lilo.conf
+    grubConfig=/boot/grub/grub.conf
+    bootPrefix=/boot
+    liloFlag=lilo
+    isx86="yes"
+fi
+
+mode=""
+version=""
+initrd=""
+initrdfile=""
+moddep=""
+verbose=""
+
+usage() {
+    echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 
+    echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
+    echo "       [--kernel-args=<args>] [--banner=<banner>]" >&2
+    echo "       <--install | --remove> <kernel-version>" >&2
+    echo "       (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
+    exit 1
+}
+
+install() {
+    # XXX kernel should be able to be specified also (or work right on ia64)
+    if [ ! -f $bootPrefix/$kernelName-$version ] ; then
+	[ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby"
+	return
+    fi
+    
+    INITRD=""
+    if [ -f $initrdfile ]; then
+	[ -n "$verbose" ] && echo "found $initrdfile and using it with grubby"
+	INITRD="--initrd $initrdfile"
+    fi
+
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, just making img file"
+	if [ -z $initrdfile  ]; then
+	    [ -n "$verbose" ] && echo "No initrd, just adding system map"
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version
+	else
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version
+	    /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null
+	    rm $bootPrefix/vmlinux.sm-$version
+	fi
+	return
+    fi
+
+    # get the root filesystem to use; if it's on a label make sure it's
+    # been configured. if not, get the root device from mount
+    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
+    short=$(echo $rootdevice | cut -d= -f1)
+    if [ "$short" == "LABEL" ]; then
+	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
+	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
+			awk '$2 == "'$label'" {print $1}')
+	if [ -z "$device" ]; then
+	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+	fi
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $grubConfig"
+
+	if [ -n "$banner" ]; then
+            title="$banner ($version)"
+	elif [ -f /etc/redhat-release ]; then
+	    title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)"
+	else
+	    title="Red Hat Linux ($version)"
+	fi
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title "$title"		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$title"
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $liloConfig"
+
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title $version		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$version"		    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+
+}
+
+remove() {
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, remove img file"
+	rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null
+	return
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $grubConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $liloConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version	    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+}
+
+mkinitrd() {
+    [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
+    /sbin/mkinitrd -f $initrdfile $version
+    rc=$?
+    if [ $rc != 0 ]; then
+	echo "mkinitrd failed" >&2
+	exit 1
+    fi
+}
+
+rminitrd() {
+    [ -n "$verbose" ] && echo "removing initrd $initrdfile"
+    [ -f $initrdfile ] && rm -f $initrdfile
+}
+
+doDepmod() {
+    [ -n "$verbose" ] && echo "running depmod for $version"
+    depmod -ae -F /boot/System.map-$version $version
+}
+
+doRmmoddep() {
+    [ -n "$verbose" ] && echo "removing modules.dep info for $version"
+    [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
+}
+
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--mkinitrd)
+	    initrd="make"
+	    ;;
+
+	--rminitrd)
+	    initrd="remove"
+	    ;;
+
+	--initrdfile*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	initrdfile=`echo $1 | sed 's/^--initrdfile=//'`
+	    else
+		initrdfile=$2
+		shift
+	    fi		    
+	    ;;
+
+	--kernel-args*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	kernargs=`echo $1 | sed 's/^--kernel-args=//'`
+	    else
+		kernargs=$2
+		shift
+	    fi		    
+	    ;;
+
+	--banner*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	banner=`echo $1 | sed 's/^--banner=//'`
+	    else
+		banner=$2
+		shift
+	    fi		    
+	    ;;
+
+	--depmod)
+	    moddep="make"
+	    ;;
+
+	--rmmoddep)
+	    moddep="remove"
+	    ;;
+
+	-v)
+	    verbose=-v
+	    ;;
+
+	*)
+	    if [ -z "$mode" ]; then
+		mode=$1
+	    elif [ -z "$version" ]; then
+		version=$1
+	    else
+		usage
+	    fi
+	    ;;
+    esac
+
+    shift
+done
+
+# make sure the mode is valid
+if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then
+    usage
+fi
+
+if [ -z "$version" ]; then
+    usage
+fi
+
+# set the initrd file based on arch; ia64 is the only currently known oddball
+if [ -z "$initrdfile" ]; then
+    if [ `uname -m` = "ia64" ]; then
+	initrdfile="/boot/efi/EFI/redhat/initrd-$version.img"
+    else
+	initrdfile="/boot/initrd-$version.img"
+    fi
+
+fi
+[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
+
+if [ "$moddep" == "make" ]; then
+    doDepmod
+elif [ "$moddep" == "remove" ]; then
+    doRmmoddep
+fi
+
+if [ "$initrd" == "make" ]; then
+    mkinitrd
+elif [ "$initrd" == "remove" ]; then
+    rminitrd
+fi
+
+if [ ! -x $grubby ] ; then
+    [ -n "$verbose" ] && echo "$grubby does not exist"
+    exit 0
+fi
+
+
+[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1;
+[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1;
+
+# if we have a lilo config on an x86 box, see if the default boot loader
+# is lilo to determine if it should be run
+if [ -n "$cfgLilo" -a -n "$isx86" ]; then
+    runLilo=$($grubby --bootloader-probe | grep lilo)
+fi
+
+if [ "$mode" == "--install" ]; then
+    install
+elif [ "$mode" == "--remove" ]; then
+    remove
+fi
+
+exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	6 Apr 2009 21:41:00 -0000	1.20
+++ .cvsignore	24 Apr 2009 17:36:16 -0000	1.21
@@ -1,2 +1 @@
 memtest86+-2.11.tar.gz
-temp.tar.gz


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/memtest86+.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- memtest86+.spec	6 Apr 2009 21:41:00 -0000	1.44
+++ memtest86+.spec	24 Apr 2009 17:36:16 -0000	1.45
@@ -7,12 +7,13 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-Source1:  temp.tar.gz
+Source1:  memtest-setup
+Source2:  new-memtest-pkg
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -37,7 +38,7 @@
 to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q -a 1
+%setup -q 
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -53,20 +54,20 @@
 mkdir -p %{buildroot}%{_sbindir}
 
 # the ELF (memtest) version.
-install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version}
 
 # the floppy (memtest.bin) version.
 install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
 
-install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
-install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
+install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -77,12 +78,16 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
-/boot/%{name}-elf-%{version}
+/boot/elf-%{name}-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
+- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
+  during livecd-creator
+- Put scripts into CVS
 
 * Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
 - adapted the spec file for building the elf and 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 Apr 2009 21:41:00 -0000	1.20
+++ sources	24 Apr 2009 17:36:16 -0000	1.21
@@ -1,2 +1 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
-518763b187bb85249120d06dfebd1235  temp.tar.gz



From wtogami at fedoraproject.org  Fri Apr 24 17:42:15 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 17:42:15 +0000 (UTC)
Subject: rpms/memtest86+/F-10 .cvsignore, 1.20, 1.21 memtest86+.spec, 1.41, 
	1.42 sources, 1.20, 1.21
Message-ID: <20090424174215.B78CB70106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27006

Modified Files:
	.cvsignore memtest86+.spec sources 
Log Message:
- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
  during livecd-creator
- Put scripts into CVS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	9 Apr 2009 11:24:03 -0000	1.20
+++ .cvsignore	24 Apr 2009 17:41:45 -0000	1.21
@@ -1,2 +1 @@
 memtest86+-2.11.tar.gz
-temp.tar.gz


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/memtest86+.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- memtest86+.spec	9 Apr 2009 11:24:03 -0000	1.41
+++ memtest86+.spec	24 Apr 2009 17:41:45 -0000	1.42
@@ -7,12 +7,13 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-Source1:  temp.tar.gz
+Source1:  memtest-setup
+Source2:  new-memtest-pkg
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -37,7 +38,7 @@
 to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q -a 1
+%setup -q 
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -53,20 +54,20 @@
 mkdir -p %{buildroot}%{_sbindir}
 
 # the ELF (memtest) version.
-install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version}
 
 # the floppy (memtest.bin) version.
 install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
 
-install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
-install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
+install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -77,12 +78,16 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
-/boot/%{name}-elf-%{version}
+/boot/elf-%{name}-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
+- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
+  during livecd-creator
+- Put scripts into CVS
 
 * Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
 - adapted the spec file for building the elf and 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	9 Apr 2009 11:24:03 -0000	1.20
+++ sources	24 Apr 2009 17:41:45 -0000	1.21
@@ -1,2 +1 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
-518763b187bb85249120d06dfebd1235  temp.tar.gz



From wtogami at fedoraproject.org  Fri Apr 24 17:43:14 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 17:43:14 +0000 (UTC)
Subject: rpms/memtest86+/F-9 memtest-setup, 1.4, 1.5 new-memtest-pkg, 1.2,
	1.3 .cvsignore, 1.20, 1.21 memtest86+.spec, 1.41, 1.42 sources,
	1.20, 1.21
Message-ID: <20090424174314.6577770106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27140

Modified Files:
	.cvsignore memtest86+.spec sources 
Added Files:
	memtest-setup new-memtest-pkg 
Log Message:
- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
  during livecd-creator
- Put scripts into CVS



Index: memtest-setup
===================================================================
RCS file: memtest-setup
diff -N memtest-setup
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ memtest-setup	24 Apr 2009 17:42:43 -0000	1.5
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# package name
+PNAME="memtest86+"
+
+# executable
+ENAME="elf-memtest86+"
+
+if [ -d /sys/firmware/efi ]; then
+    echo "memtest86+ does not support EFI platforms."
+    exit 254
+fi
+
+MTVERSION=`rpm -q --qf '%{version}' $PNAME`
+MTPATH="/boot/$ENAME-$MTVERSION"
+
+MENT=`cat /boot/grub/grub.conf | grep "$ENAME-$MTVERSION"` &> /dev/null
+if [ "$MENT" != "" ]; then
+    echo "$MTPATH is already configured.  Exiting..."
+    exit 0
+fi
+
+if [ ! -f $MTPATH ]; then
+    echo "ERROR: $MTPATH does not exist."
+    exit 255
+fi
+
+/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+"
+RETVAL="$?"
+
+if [ "$RETVAL" != "0" ]; then
+    echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
+    exit $RETVAL
+else
+    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
+fi
+
+echo "Setup complete."


Index: new-memtest-pkg
===================================================================
RCS file: new-memtest-pkg
diff -N new-memtest-pkg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ new-memtest-pkg	24 Apr 2009 17:42:43 -0000	1.3
@@ -0,0 +1,339 @@
+#!/bin/bash
+#
+# Invoked upon installation or removal of a kernel package, the following
+# tasks are/can be done here:
+# creation/removal of initrd
+# run of depmod/removal of depmod generated files
+# addition/removal of kernel images from grub/lilo configuration (via grubby)
+#
+# Copyright (C) 2002, 2003 Red Hat, Inc.
+# 
+
+PATH=/sbin:/bin:$PATH
+
+lilo=/sbin/lilo
+
+# some defaults that are sane for most arches
+kernelName=elf-memtest86+
+
+if [ -x ./grubby ]; then
+    grubby=./grubby
+else
+    grubby=/sbin/grubby
+fi
+
+cfgGrub=""
+cfgLilo=""
+runLilo=""
+grubConfig=""
+
+ARCH=$(uname -m)
+
+if [ $ARCH = 'ia64' ]; then
+    liloConfig=/boot/efi/EFI/redhat/elilo.conf
+    bootPrefix=/boot/efi/EFI/redhat
+    liloFlag=elilo
+    isx86=""
+elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
+    liloConfig=/etc/yaboot.conf
+    bootPrefix=/boot
+    lilo=/sbin/ybin
+    kernelName=vmlinux
+    liloFlag=yaboot
+    runLilo="yes"
+    isx86=""
+elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then
+    liloConfig=/etc/silo.conf
+    bootPrefix=/boot
+    liloFlag=silo
+    lilo=/sbin/silo
+    isx86=""
+elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
+    liloConfig=/etc/zipl.conf
+    bootPrefix=/boot
+    liloFlag=zipl
+    lilo=/sbin/zipl
+    runLilo="yes"
+    isx86=""
+else
+    # this leaves i?86 and x86_64
+    liloConfig=/etc/lilo.conf
+    grubConfig=/boot/grub/grub.conf
+    bootPrefix=/boot
+    liloFlag=lilo
+    isx86="yes"
+fi
+
+mode=""
+version=""
+initrd=""
+initrdfile=""
+moddep=""
+verbose=""
+
+usage() {
+    echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 
+    echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
+    echo "       [--kernel-args=<args>] [--banner=<banner>]" >&2
+    echo "       <--install | --remove> <kernel-version>" >&2
+    echo "       (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
+    exit 1
+}
+
+install() {
+    # XXX kernel should be able to be specified also (or work right on ia64)
+    if [ ! -f $bootPrefix/$kernelName-$version ] ; then
+	[ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby"
+	return
+    fi
+    
+    INITRD=""
+    if [ -f $initrdfile ]; then
+	[ -n "$verbose" ] && echo "found $initrdfile and using it with grubby"
+	INITRD="--initrd $initrdfile"
+    fi
+
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, just making img file"
+	if [ -z $initrdfile  ]; then
+	    [ -n "$verbose" ] && echo "No initrd, just adding system map"
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version
+	else
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version
+	    /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null
+	    rm $bootPrefix/vmlinux.sm-$version
+	fi
+	return
+    fi
+
+    # get the root filesystem to use; if it's on a label make sure it's
+    # been configured. if not, get the root device from mount
+    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
+    short=$(echo $rootdevice | cut -d= -f1)
+    if [ "$short" == "LABEL" ]; then
+	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
+	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
+			awk '$2 == "'$label'" {print $1}')
+	if [ -z "$device" ]; then
+	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+	fi
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $grubConfig"
+
+	if [ -n "$banner" ]; then
+            title="$banner ($version)"
+	elif [ -f /etc/redhat-release ]; then
+	    title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)"
+	else
+	    title="Red Hat Linux ($version)"
+	fi
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title "$title"		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$title"
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $liloConfig"
+
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title $version		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$version"		    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+
+}
+
+remove() {
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, remove img file"
+	rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null
+	return
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $grubConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $liloConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version	    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+}
+
+mkinitrd() {
+    [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
+    /sbin/mkinitrd -f $initrdfile $version
+    rc=$?
+    if [ $rc != 0 ]; then
+	echo "mkinitrd failed" >&2
+	exit 1
+    fi
+}
+
+rminitrd() {
+    [ -n "$verbose" ] && echo "removing initrd $initrdfile"
+    [ -f $initrdfile ] && rm -f $initrdfile
+}
+
+doDepmod() {
+    [ -n "$verbose" ] && echo "running depmod for $version"
+    depmod -ae -F /boot/System.map-$version $version
+}
+
+doRmmoddep() {
+    [ -n "$verbose" ] && echo "removing modules.dep info for $version"
+    [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
+}
+
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--mkinitrd)
+	    initrd="make"
+	    ;;
+
+	--rminitrd)
+	    initrd="remove"
+	    ;;
+
+	--initrdfile*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	initrdfile=`echo $1 | sed 's/^--initrdfile=//'`
+	    else
+		initrdfile=$2
+		shift
+	    fi		    
+	    ;;
+
+	--kernel-args*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	kernargs=`echo $1 | sed 's/^--kernel-args=//'`
+	    else
+		kernargs=$2
+		shift
+	    fi		    
+	    ;;
+
+	--banner*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	banner=`echo $1 | sed 's/^--banner=//'`
+	    else
+		banner=$2
+		shift
+	    fi		    
+	    ;;
+
+	--depmod)
+	    moddep="make"
+	    ;;
+
+	--rmmoddep)
+	    moddep="remove"
+	    ;;
+
+	-v)
+	    verbose=-v
+	    ;;
+
+	*)
+	    if [ -z "$mode" ]; then
+		mode=$1
+	    elif [ -z "$version" ]; then
+		version=$1
+	    else
+		usage
+	    fi
+	    ;;
+    esac
+
+    shift
+done
+
+# make sure the mode is valid
+if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then
+    usage
+fi
+
+if [ -z "$version" ]; then
+    usage
+fi
+
+# set the initrd file based on arch; ia64 is the only currently known oddball
+if [ -z "$initrdfile" ]; then
+    if [ `uname -m` = "ia64" ]; then
+	initrdfile="/boot/efi/EFI/redhat/initrd-$version.img"
+    else
+	initrdfile="/boot/initrd-$version.img"
+    fi
+
+fi
+[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
+
+if [ "$moddep" == "make" ]; then
+    doDepmod
+elif [ "$moddep" == "remove" ]; then
+    doRmmoddep
+fi
+
+if [ "$initrd" == "make" ]; then
+    mkinitrd
+elif [ "$initrd" == "remove" ]; then
+    rminitrd
+fi
+
+if [ ! -x $grubby ] ; then
+    [ -n "$verbose" ] && echo "$grubby does not exist"
+    exit 0
+fi
+
+
+[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1;
+[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1;
+
+# if we have a lilo config on an x86 box, see if the default boot loader
+# is lilo to determine if it should be run
+if [ -n "$cfgLilo" -a -n "$isx86" ]; then
+    runLilo=$($grubby --bootloader-probe | grep lilo)
+fi
+
+if [ "$mode" == "--install" ]; then
+    install
+elif [ "$mode" == "--remove" ]; then
+    remove
+fi
+
+exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	9 Apr 2009 11:21:03 -0000	1.20
+++ .cvsignore	24 Apr 2009 17:42:43 -0000	1.21
@@ -1,2 +1 @@
 memtest86+-2.11.tar.gz
-temp.tar.gz


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/memtest86+.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- memtest86+.spec	9 Apr 2009 11:21:03 -0000	1.41
+++ memtest86+.spec	24 Apr 2009 17:42:43 -0000	1.42
@@ -7,12 +7,13 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-Source1:  temp.tar.gz
+Source1:  memtest-setup
+Source2:  new-memtest-pkg
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -37,7 +38,7 @@
 to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q -a 1
+%setup -q 
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -53,20 +54,20 @@
 mkdir -p %{buildroot}%{_sbindir}
 
 # the ELF (memtest) version.
-install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version}
 
 # the floppy (memtest.bin) version.
 install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
 
-install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
-install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
+install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -77,12 +78,16 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
-/boot/%{name}-elf-%{version}
+/boot/elf-%{name}-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
+- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
+  during livecd-creator
+- Put scripts into CVS
 
 * Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
 - adapted the spec file for building the elf and 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	9 Apr 2009 11:21:03 -0000	1.20
+++ sources	24 Apr 2009 17:42:44 -0000	1.21
@@ -1,2 +1 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
-518763b187bb85249120d06dfebd1235  temp.tar.gz



From wtogami at fedoraproject.org  Fri Apr 24 17:43:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 17:43:46 +0000 (UTC)
Subject: rpms/memtest86+/F-10 memtest-setup,1.4,1.5 new-memtest-pkg,1.2,1.3
Message-ID: <20090424174346.A8B4770107@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27184

Added Files:
	memtest-setup new-memtest-pkg 
Log Message:
oops, add scripts



Index: memtest-setup
===================================================================
RCS file: memtest-setup
diff -N memtest-setup
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ memtest-setup	24 Apr 2009 17:43:16 -0000	1.5
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# package name
+PNAME="memtest86+"
+
+# executable
+ENAME="elf-memtest86+"
+
+if [ -d /sys/firmware/efi ]; then
+    echo "memtest86+ does not support EFI platforms."
+    exit 254
+fi
+
+MTVERSION=`rpm -q --qf '%{version}' $PNAME`
+MTPATH="/boot/$ENAME-$MTVERSION"
+
+MENT=`cat /boot/grub/grub.conf | grep "$ENAME-$MTVERSION"` &> /dev/null
+if [ "$MENT" != "" ]; then
+    echo "$MTPATH is already configured.  Exiting..."
+    exit 0
+fi
+
+if [ ! -f $MTPATH ]; then
+    echo "ERROR: $MTPATH does not exist."
+    exit 255
+fi
+
+/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+"
+RETVAL="$?"
+
+if [ "$RETVAL" != "0" ]; then
+    echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
+    exit $RETVAL
+else
+    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
+fi
+
+echo "Setup complete."


Index: new-memtest-pkg
===================================================================
RCS file: new-memtest-pkg
diff -N new-memtest-pkg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ new-memtest-pkg	24 Apr 2009 17:43:16 -0000	1.3
@@ -0,0 +1,339 @@
+#!/bin/bash
+#
+# Invoked upon installation or removal of a kernel package, the following
+# tasks are/can be done here:
+# creation/removal of initrd
+# run of depmod/removal of depmod generated files
+# addition/removal of kernel images from grub/lilo configuration (via grubby)
+#
+# Copyright (C) 2002, 2003 Red Hat, Inc.
+# 
+
+PATH=/sbin:/bin:$PATH
+
+lilo=/sbin/lilo
+
+# some defaults that are sane for most arches
+kernelName=elf-memtest86+
+
+if [ -x ./grubby ]; then
+    grubby=./grubby
+else
+    grubby=/sbin/grubby
+fi
+
+cfgGrub=""
+cfgLilo=""
+runLilo=""
+grubConfig=""
+
+ARCH=$(uname -m)
+
+if [ $ARCH = 'ia64' ]; then
+    liloConfig=/boot/efi/EFI/redhat/elilo.conf
+    bootPrefix=/boot/efi/EFI/redhat
+    liloFlag=elilo
+    isx86=""
+elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
+    liloConfig=/etc/yaboot.conf
+    bootPrefix=/boot
+    lilo=/sbin/ybin
+    kernelName=vmlinux
+    liloFlag=yaboot
+    runLilo="yes"
+    isx86=""
+elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then
+    liloConfig=/etc/silo.conf
+    bootPrefix=/boot
+    liloFlag=silo
+    lilo=/sbin/silo
+    isx86=""
+elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
+    liloConfig=/etc/zipl.conf
+    bootPrefix=/boot
+    liloFlag=zipl
+    lilo=/sbin/zipl
+    runLilo="yes"
+    isx86=""
+else
+    # this leaves i?86 and x86_64
+    liloConfig=/etc/lilo.conf
+    grubConfig=/boot/grub/grub.conf
+    bootPrefix=/boot
+    liloFlag=lilo
+    isx86="yes"
+fi
+
+mode=""
+version=""
+initrd=""
+initrdfile=""
+moddep=""
+verbose=""
+
+usage() {
+    echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 
+    echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
+    echo "       [--kernel-args=<args>] [--banner=<banner>]" >&2
+    echo "       <--install | --remove> <kernel-version>" >&2
+    echo "       (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
+    exit 1
+}
+
+install() {
+    # XXX kernel should be able to be specified also (or work right on ia64)
+    if [ ! -f $bootPrefix/$kernelName-$version ] ; then
+	[ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby"
+	return
+    fi
+    
+    INITRD=""
+    if [ -f $initrdfile ]; then
+	[ -n "$verbose" ] && echo "found $initrdfile and using it with grubby"
+	INITRD="--initrd $initrdfile"
+    fi
+
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, just making img file"
+	if [ -z $initrdfile  ]; then
+	    [ -n "$verbose" ] && echo "No initrd, just adding system map"
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version
+	else
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version
+	    /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null
+	    rm $bootPrefix/vmlinux.sm-$version
+	fi
+	return
+    fi
+
+    # get the root filesystem to use; if it's on a label make sure it's
+    # been configured. if not, get the root device from mount
+    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
+    short=$(echo $rootdevice | cut -d= -f1)
+    if [ "$short" == "LABEL" ]; then
+	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
+	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
+			awk '$2 == "'$label'" {print $1}')
+	if [ -z "$device" ]; then
+	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+	fi
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $grubConfig"
+
+	if [ -n "$banner" ]; then
+            title="$banner ($version)"
+	elif [ -f /etc/redhat-release ]; then
+	    title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)"
+	else
+	    title="Red Hat Linux ($version)"
+	fi
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title "$title"		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$title"
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $liloConfig"
+
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title $version		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$version"		    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+
+}
+
+remove() {
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, remove img file"
+	rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null
+	return
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $grubConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $liloConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version	    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+}
+
+mkinitrd() {
+    [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
+    /sbin/mkinitrd -f $initrdfile $version
+    rc=$?
+    if [ $rc != 0 ]; then
+	echo "mkinitrd failed" >&2
+	exit 1
+    fi
+}
+
+rminitrd() {
+    [ -n "$verbose" ] && echo "removing initrd $initrdfile"
+    [ -f $initrdfile ] && rm -f $initrdfile
+}
+
+doDepmod() {
+    [ -n "$verbose" ] && echo "running depmod for $version"
+    depmod -ae -F /boot/System.map-$version $version
+}
+
+doRmmoddep() {
+    [ -n "$verbose" ] && echo "removing modules.dep info for $version"
+    [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
+}
+
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--mkinitrd)
+	    initrd="make"
+	    ;;
+
+	--rminitrd)
+	    initrd="remove"
+	    ;;
+
+	--initrdfile*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	initrdfile=`echo $1 | sed 's/^--initrdfile=//'`
+	    else
+		initrdfile=$2
+		shift
+	    fi		    
+	    ;;
+
+	--kernel-args*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	kernargs=`echo $1 | sed 's/^--kernel-args=//'`
+	    else
+		kernargs=$2
+		shift
+	    fi		    
+	    ;;
+
+	--banner*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	banner=`echo $1 | sed 's/^--banner=//'`
+	    else
+		banner=$2
+		shift
+	    fi		    
+	    ;;
+
+	--depmod)
+	    moddep="make"
+	    ;;
+
+	--rmmoddep)
+	    moddep="remove"
+	    ;;
+
+	-v)
+	    verbose=-v
+	    ;;
+
+	*)
+	    if [ -z "$mode" ]; then
+		mode=$1
+	    elif [ -z "$version" ]; then
+		version=$1
+	    else
+		usage
+	    fi
+	    ;;
+    esac
+
+    shift
+done
+
+# make sure the mode is valid
+if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then
+    usage
+fi
+
+if [ -z "$version" ]; then
+    usage
+fi
+
+# set the initrd file based on arch; ia64 is the only currently known oddball
+if [ -z "$initrdfile" ]; then
+    if [ `uname -m` = "ia64" ]; then
+	initrdfile="/boot/efi/EFI/redhat/initrd-$version.img"
+    else
+	initrdfile="/boot/initrd-$version.img"
+    fi
+
+fi
+[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
+
+if [ "$moddep" == "make" ]; then
+    doDepmod
+elif [ "$moddep" == "remove" ]; then
+    doRmmoddep
+fi
+
+if [ "$initrd" == "make" ]; then
+    mkinitrd
+elif [ "$initrd" == "remove" ]; then
+    rminitrd
+fi
+
+if [ ! -x $grubby ] ; then
+    [ -n "$verbose" ] && echo "$grubby does not exist"
+    exit 0
+fi
+
+
+[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1;
+[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1;
+
+# if we have a lilo config on an x86 box, see if the default boot loader
+# is lilo to determine if it should be run
+if [ -n "$cfgLilo" -a -n "$isx86" ]; then
+    runLilo=$($grubby --bootloader-probe | grep lilo)
+fi
+
+if [ "$mode" == "--install" ]; then
+    install
+elif [ "$mode" == "--remove" ]; then
+    remove
+fi
+
+exit 0



From dwalsh at fedoraproject.org  Fri Apr 24 17:50:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 17:50:36 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.97,
	1.98 selinux-policy.spec, 1.834, 1.835
Message-ID: <20090424175036.938D270106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28561

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-18
- Allow initrc_t to delete dev_null
- Allow readahead to configure auditing
- Fix milter policy
- Add /var/lib/readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- policy-20090105.patch	24 Apr 2009 13:16:13 -0000	1.97
+++ policy-20090105.patch	24 Apr 2009 17:50:35 -0000	1.98
@@ -770,26 +770,45 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.6.12/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-23 17:15:49.000000000 -0400
-@@ -1,3 +1,4 @@
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-24 13:03:55.000000000 -0400
+@@ -1,3 +1,7 @@
  /etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
  
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +/usr/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++
++/var/lib/readahead(/.*)?	gen_context(system_u:object_r:readahead_var_lib_t,s0)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 09:02:26.000000000 -0400
-@@ -24,7 +24,7 @@
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 13:45:16.000000000 -0400
+@@ -11,8 +11,8 @@
+ init_daemon_domain(readahead_t, readahead_exec_t)
+ application_domain(readahead_t, readahead_exec_t)
+ 
+-type readahead_etc_rw_t;
+-files_pid_file(readahead_etc_rw_t)
++type readahead_var_lib_t;
++files_type(readahead_var_lib_t)
+ 
+ type readahead_var_run_t;
+ files_pid_file(readahead_var_run_t)
+@@ -24,9 +24,11 @@
  
  allow readahead_t self:capability { fowner dac_override dac_read_search };
  dontaudit readahead_t self:capability sys_tty_config;
 -allow readahead_t self:process signal_perms;
 +allow readahead_t self:process { setsched signal_perms };
  
- manage_files_pattern(readahead_t, readahead_etc_rw_t, readahead_etc_rw_t)
- 
-@@ -58,6 +58,7 @@
+-manage_files_pattern(readahead_t, readahead_etc_rw_t, readahead_etc_rw_t)
++files_search_var_lib(readahead_t)
++manage_dirs_pattern(readahead_t, readahead_var_lib_t, readahead_var_lib_t)
++manage_files_pattern(readahead_t, readahead_var_lib_t, readahead_var_lib_t)
+ 
+ manage_files_pattern(readahead_t, readahead_var_run_t, readahead_var_run_t)
+ files_pid_filetrans(readahead_t, readahead_var_run_t, file)
+@@ -58,6 +60,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -797,7 +816,7 @@
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +73,7 @@
+@@ -72,6 +75,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -11791,7 +11810,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-23 10:31:43.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-24 13:45:56.000000000 -0400
 @@ -44,6 +44,7 @@
  
  		attribute session_bus_type;
@@ -11993,7 +12012,7 @@
 +
 +	ifdef(`hide_broken_symptoms', `
 +		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
-+	');
++	')
 +
 +	userdom_dontaudit_search_admin_dir($1)
 +')
@@ -14836,7 +14855,16 @@
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 07:22:51.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 13:45:41.000000000 -0400
+@@ -24,7 +24,7 @@
+ 
+ 	# Type for the milter data (e.g. the socket used to communicate with the MTA)
+ 	type $1_milter_data_t, milter_data_type;
+-	files_type($1_milter_data_t);
++	files_type($1_milter_data_t)
+ 
+ 	allow $1_milter_t self:fifo_file rw_fifo_file_perms;
+ 
 @@ -77,3 +77,24 @@
  	getattr_dirs_pattern($1, milter_data_type, milter_data_type)
  	getattr_sock_files_pattern($1, milter_data_type, milter_data_type)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- selinux-policy.spec	24 Apr 2009 13:17:08 -0000	1.834
+++ selinux-policy.spec	24 Apr 2009 17:50:36 -0000	1.835
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,9 +446,11 @@
 %endif
 
 %changelog
-* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-17
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-18
 - Allow initrc_t to delete dev_null
 - Allow readahead to configure auditing
+- Fix milter policy
+- Add /var/lib/readahead
 
 * Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
 - Update to latest milter code from Paul Howarth



From dwalsh at fedoraproject.org  Fri Apr 24 17:50:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 17:50:55 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.104,
	1.105 selinux-policy.spec, 1.840, 1.841
Message-ID: <20090424175055.30EAB70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28678

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-18
- Allow initrc_t to delete dev_null
- Allow readahead to configure auditing
- Fix milter policy
- Add /var/lib/readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- policy-20090105.patch	24 Apr 2009 13:16:27 -0000	1.104
+++ policy-20090105.patch	24 Apr 2009 17:50:54 -0000	1.105
@@ -770,26 +770,45 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.6.12/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-23 17:15:49.000000000 -0400
-@@ -1,3 +1,4 @@
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-24 13:03:55.000000000 -0400
+@@ -1,3 +1,7 @@
  /etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
  
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +/usr/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++
++/var/lib/readahead(/.*)?	gen_context(system_u:object_r:readahead_var_lib_t,s0)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 09:02:26.000000000 -0400
-@@ -24,7 +24,7 @@
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 13:45:16.000000000 -0400
+@@ -11,8 +11,8 @@
+ init_daemon_domain(readahead_t, readahead_exec_t)
+ application_domain(readahead_t, readahead_exec_t)
+ 
+-type readahead_etc_rw_t;
+-files_pid_file(readahead_etc_rw_t)
++type readahead_var_lib_t;
++files_type(readahead_var_lib_t)
+ 
+ type readahead_var_run_t;
+ files_pid_file(readahead_var_run_t)
+@@ -24,9 +24,11 @@
  
  allow readahead_t self:capability { fowner dac_override dac_read_search };
  dontaudit readahead_t self:capability sys_tty_config;
 -allow readahead_t self:process signal_perms;
 +allow readahead_t self:process { setsched signal_perms };
  
- manage_files_pattern(readahead_t, readahead_etc_rw_t, readahead_etc_rw_t)
- 
-@@ -58,6 +58,7 @@
+-manage_files_pattern(readahead_t, readahead_etc_rw_t, readahead_etc_rw_t)
++files_search_var_lib(readahead_t)
++manage_dirs_pattern(readahead_t, readahead_var_lib_t, readahead_var_lib_t)
++manage_files_pattern(readahead_t, readahead_var_lib_t, readahead_var_lib_t)
+ 
+ manage_files_pattern(readahead_t, readahead_var_run_t, readahead_var_run_t)
+ files_pid_filetrans(readahead_t, readahead_var_run_t, file)
+@@ -58,6 +60,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -797,7 +816,7 @@
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +73,7 @@
+@@ -72,6 +75,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -11791,7 +11810,7 @@
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-23 10:31:43.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-04-24 13:45:56.000000000 -0400
 @@ -44,6 +44,7 @@
  
  		attribute session_bus_type;
@@ -11993,7 +12012,7 @@
 +
 +	ifdef(`hide_broken_symptoms', `
 +		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
-+	');
++	')
 +
 +	userdom_dontaudit_search_admin_dir($1)
 +')
@@ -14836,7 +14855,16 @@
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 07:22:51.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 13:45:41.000000000 -0400
+@@ -24,7 +24,7 @@
+ 
+ 	# Type for the milter data (e.g. the socket used to communicate with the MTA)
+ 	type $1_milter_data_t, milter_data_type;
+-	files_type($1_milter_data_t);
++	files_type($1_milter_data_t)
+ 
+ 	allow $1_milter_t self:fifo_file rw_fifo_file_perms;
+ 
 @@ -77,3 +77,24 @@
  	getattr_dirs_pattern($1, milter_data_type, milter_data_type)
  	getattr_sock_files_pattern($1, milter_data_type, milter_data_type)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- selinux-policy.spec	24 Apr 2009 13:16:28 -0000	1.840
+++ selinux-policy.spec	24 Apr 2009 17:50:54 -0000	1.841
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,9 +446,11 @@
 %endif
 
 %changelog
-* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-17
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-18
 - Allow initrc_t to delete dev_null
 - Allow readahead to configure auditing
+- Fix milter policy
+- Add /var/lib/readahead
 
 * Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-16
 - Update to latest milter code from Paul Howarth



From dwalsh at fedoraproject.org  Fri Apr 24 17:57:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 17:57:48 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.416,
	1.417 policycoreutils-sepolgen.patch, 1.22,
	1.23 policycoreutils.spec, 1.604, 1.605
Message-ID: <20090424175748.46D5B70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29566

Modified Files:
	policycoreutils-rhat.patch policycoreutils-sepolgen.patch 
	policycoreutils.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.1
- Fix audit2allow -a to read /var/log/messages


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- policycoreutils-rhat.patch	16 Apr 2009 18:56:02 -0000	1.416
+++ policycoreutils-rhat.patch	24 Apr 2009 17:57:46 -0000	1.417
@@ -1,3 +1,14 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.62/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.62/audit2allow/audit2allow	2009-04-24 13:18:45.000000000 -0400
+@@ -126,6 +126,7 @@
+         elif self.__options.audit:
+             try:
+                 messages = audit.get_audit_msgs()
++                messages += audit.get_log_msgs()
+             except OSError, e:
+                 sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
+                 sys.exit(1)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list
 --- nsapolicycoreutils/debugfiles.list	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.62/debugfiles.list	2009-04-03 14:13:23.000000000 -0400

policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-sepolgen.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policycoreutils-sepolgen.patch	9 Apr 2009 02:05:30 -0000	1.22
+++ policycoreutils-sepolgen.patch	24 Apr 2009 17:57:47 -0000	1.23
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py
 --- nsasepolgen/src/sepolgen/access.py	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py	2009-04-01 10:03:43.000000000 -0400
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py	2009-04-21 14:54:12.000000000 -0400
 @@ -313,7 +313,7 @@
  
      def __len__(self):
@@ -10,9 +10,30 @@
  
      def add(self, role, type):
          if self.role_types.has_key(role):
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py
+--- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py	2009-04-24 13:19:39.000000000 -0400
+@@ -47,6 +47,17 @@
+                               stdout=subprocess.PIPE).communicate()[0]
+     return output
+ 
++def get_log_msgs():
++    """Obtain all of the avc and policy load messages from /var/log/messages.
++
++    Returns:
++       string contain all of the audit messages returned by /var/log/messages.
++    """
++    import subprocess
++    output = subprocess.Popen(["/bin/grep", "avc",  "/var/log/messages"],
++                              stdout=subprocess.PIPE).communicate()[0]
++    return output
++
+ # Classes representing audit messages
+ 
+ class AuditMessage:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-02-18 16:52:27.000000000 -0500
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-04-21 14:54:12.000000000 -0400
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -r1.604 -r1.605
--- policycoreutils.spec	16 Apr 2009 19:06:07 -0000	1.604
+++ policycoreutils.spec	24 Apr 2009 17:57:47 -0000	1.605
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 12%{?dist}
+Release: 12.1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.1
+- Fix audit2allow -a to read /var/log/messages
+
 * Thu Apr 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12
 - Add semanage module support
 



From rdieter at fedoraproject.org  Fri Apr 24 19:01:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 24 Apr 2009 19:01:26 +0000 (UTC)
Subject: rpms/qt/F-10 qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch, 
	NONE, 1.1 .cvsignore, 1.47, 1.48 qt.spec, 1.226,
	1.227 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch,
	1.1, NONE
Message-ID: <20090424190126.CBFCF70106@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2521

Modified Files:
	.cvsignore qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
Log Message:
* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
- enable FT_LCD_FILTER


qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
@@ -72,7 +72,7 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+#if defined(FT_LCD_FILTER_H) // && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
 #define QT_USE_FREETYPE_LCDFILTER
 #endif
 
@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
             Q_ASSERT(antialias);
             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
             bool useLegacyLcdFilter = false;
-#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
+#if defined(FT_LCD_FILTER_H) // && defined(FC_LCD_FILTER)
             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
 #endif
             uchar *buffer = bitmap.buffer;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	25 Mar 2009 18:42:33 -0000	1.47
+++ .cvsignore	24 Apr 2009 19:00:56 -0000	1.48
@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.0.tar.bz2
-qt-copy-patches-20090325svn.tar.bz2
+qt-x11-opensource-src-4.5.1.tar.bz2
+qt-copy-patches-20090424svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- qt.spec	24 Apr 2009 12:09:23 -0000	1.226
+++ qt.spec	24 Apr 2009 19:00:56 -0000	1.227
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,8 +41,7 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
-# http://bugzilla.redhat.com/490377
-Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
+Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -320,7 +319,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
-%patch15 -p1 -b .disable_ft_lcdfilter
+%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -805,6 +804,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
+- enable FT_LCD_FILTER
+
 * Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
 - apply upstream patch to fix the svg rendering regression
 


--- qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch DELETED ---



From rdieter at fedoraproject.org  Fri Apr 24 19:07:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 24 Apr 2009 19:07:42 +0000 (UTC)
Subject: rpms/qt/F-9 qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch, 
	NONE, 1.1 .cvsignore, 1.40, 1.41 qt.spec, 1.197,
	1.198 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch,
	1.1, NONE
Message-ID: <20090424190742.727DD70106@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3270

Modified Files:
	.cvsignore qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
Log Message:
* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
- enable FT_LCD_FILTER


qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
@@ -72,7 +72,7 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+#if defined(FT_LCD_FILTER_H) // && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
 #define QT_USE_FREETYPE_LCDFILTER
 #endif
 
@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
             Q_ASSERT(antialias);
             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
             bool useLegacyLcdFilter = false;
-#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
+#if defined(FT_LCD_FILTER_H) // && defined(FC_LCD_FILTER)
             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
 #endif
             uchar *buffer = bitmap.buffer;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Mar 2009 18:43:51 -0000	1.40
+++ .cvsignore	24 Apr 2009 19:07:11 -0000	1.41
@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.0.tar.bz2
-qt-copy-patches-20090325svn.tar.bz2
+qt-x11-opensource-src-4.5.1.tar.bz2
+qt-copy-patches-20090424svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- qt.spec	24 Apr 2009 12:30:20 -0000	1.197
+++ qt.spec	24 Apr 2009 19:07:12 -0000	1.198
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,8 +41,7 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
-# http://bugzilla.redhat.com/490377
-Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
+Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -320,7 +319,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
-%patch15 -p1 -b .disable_ft_lcdfilter
+%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -805,6 +804,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
+- enable FT_LCD_FILTER
+
 * Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
 - apply upstream patch to fix the svg rendering regression
 


--- qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch DELETED ---



From cebbert at fedoraproject.org  Fri Apr 24 19:12:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 24 Apr 2009 19:12:12 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch, NONE,
	1.1 linux-2.6-x86-hpet-stop-counter-when-programming.patch, NONE,
	1.1 kernel.spec, 1.1348, 1.1349
Message-ID: <20090424191212.E998A70106@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3607

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch 
	linux-2.6-x86-hpet-stop-counter-when-programming.patch 
Log Message:
Fix hang with HPET timer at boot (F11#497351)

linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch:

--- NEW FILE linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch ---
From: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date: Fri, 20 Feb 2009 23:10:44 +0000 (+0100)
Subject: x86: hpet: provide separate functions to stop and start the counter
X-Git-Tag: v2.6.30-rc2~102^4~4^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8d6f0c8214928f7c5083dd54ecb69c5d615b516e

x86: hpet: provide separate functions to stop and start the counter

By splitting up existing hpet_start_counter function.

Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
Cc: Mark Hounschell <markh at compro.net>
Cc: Borislav Petkov <borislav.petkov at amd.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 1d86ca3..7ae1f1e 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -231,27 +231,37 @@ static struct clock_event_device hpet_clockevent = {
 	.rating		= 50,
 };
 
-static void hpet_start_counter(void)
+static void hpet_stop_counter(void)
 {
 	unsigned long cfg = hpet_readl(HPET_CFG);
-
 	cfg &= ~HPET_CFG_ENABLE;
 	hpet_writel(cfg, HPET_CFG);
 	hpet_writel(0, HPET_COUNTER);
 	hpet_writel(0, HPET_COUNTER + 4);
+}
+
+static void hpet_start_counter(void)
+{
+	unsigned long cfg = hpet_readl(HPET_CFG);
 	cfg |= HPET_CFG_ENABLE;
 	hpet_writel(cfg, HPET_CFG);
 }
 
+static void hpet_restart_counter(void)
+{
+	hpet_stop_counter();
+	hpet_start_counter();
+}
+
 static void hpet_resume_device(void)
 {
 	force_hpet_resume();
 }
 
-static void hpet_restart_counter(void)
+static void hpet_resume_counter(void)
 {
 	hpet_resume_device();
-	hpet_start_counter();
+	hpet_restart_counter();
 }
 
 static void hpet_enable_legacy_int(void)
@@ -738,7 +748,7 @@ static struct clocksource clocksource_hpet = {
 	.mask		= HPET_MASK,
 	.shift		= HPET_SHIFT,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
-	.resume		= hpet_restart_counter,
+	.resume		= hpet_resume_counter,
 #ifdef CONFIG_X86_64
 	.vread		= vread_hpet,
 #endif
@@ -750,7 +760,7 @@ static int hpet_clocksource_register(void)
 	cycle_t t1;
 
 	/* Start the counter */
-	hpet_start_counter();
+	hpet_restart_counter();
 
 	/* Verify whether hpet counter works */
 	t1 = read_hpet();

linux-2.6-x86-hpet-stop-counter-when-programming.patch:

--- NEW FILE linux-2.6-x86-hpet-stop-counter-when-programming.patch ---
From: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date: Fri, 20 Feb 2009 23:16:35 +0000 (+0100)
Subject: x86: hpet: stop HPET_COUNTER when programming periodic mode
X-Git-Tag: v2.6.30-rc2~102^4~4^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c23e253e67c9d8a91a0ffa33c1f571a17f0a2403

x86: hpet: stop HPET_COUNTER when programming periodic mode

Impact: fix system hang on some systems operating with HZ_1000

On a system that stalled with HZ_1000, the first value written to
T0_CMP (when the main counter was not stopped) did not trigger an
interrupt. Instead after the main counter wrapped around (after
several minutes) an interrupt was triggered and afterwards the
periodic interrupt took effect.

This can be fixed by implementing HPET spec recommendation for
programming the periodic mode (i.e. stopping the main counter).

Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
Cc: Mark Hounschell <markh at compro.net>
Cc: Borislav Petkov <borislav.petkov at amd.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
[cebbert at redhat.com: backport to 2.6.29]
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 7ae1f1e..648b3a2 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -309,29 +309,22 @@ static int hpet_setup_msi_irq(unsigned int irq);
 static void hpet_set_mode(enum clock_event_mode mode,
 			  struct clock_event_device *evt, int timer)
 {
-	unsigned long cfg, cmp, now;
+	unsigned long cfg;
 	uint64_t delta;
 
 	switch (mode) {
 	case CLOCK_EVT_MODE_PERIODIC:
+		hpet_stop_counter();
 		delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult;
 		delta >>= evt->shift;
-		now = hpet_readl(HPET_COUNTER);
-		cmp = now + (unsigned long) delta;
 		cfg = hpet_readl(HPET_Tn_CFG(timer));
 		/* Make sure we use edge triggered interrupts */
 		cfg &= ~HPET_TN_LEVEL;
 		cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
 		       HPET_TN_SETVAL | HPET_TN_32BIT;
 		hpet_writel(cfg, HPET_Tn_CFG(timer));
-		/*
-		 * The first write after writing TN_SETVAL to the
-		 * config register sets the counter value, the second
-		 * write sets the period.
-		 */
-		hpet_writel(cmp, HPET_Tn_CMP(timer));
-		udelay(1);
 		hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer));
+		hpet_start_counter();
 		break;
 
 	case CLOCK_EVT_MODE_ONESHOT:


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1348
retrieving revision 1.1349
diff -u -r1.1348 -r1.1349
--- kernel.spec	23 Apr 2009 22:32:16 -0000	1.1348
+++ kernel.spec	24 Apr 2009 19:11:42 -0000	1.1349
@@ -715,6 +715,10 @@
 Patch9400: linux-2.6-crypto-aes-padlock-fix-autoload.patch
 Patch9401: linux-2.6-crypto-aes-padlock-fix-autoload-2.patch
 
+# fix hpet hang at boot
+Patch9500: linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch
+Patch9501: linux-2.6-x86-hpet-stop-counter-when-programming.patch
+
 # Backport of upstream memory reduction for ftrace
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
 
@@ -1330,6 +1334,10 @@
 ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload.patch
 ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload-2.patch
 
+# fix hpet hang at boot
+ApplyPatch linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch
+ApplyPatch linux-2.6-x86-hpet-stop-counter-when-programming.patch
+
 # Reduce the memory usage of ftrace if you don't use it.
 ApplyPatch linux-2.6-ftrace-memory-reduction.patch
 
@@ -1909,6 +1917,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Apr 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-49.rc1
+- Fix hang with HPET timer at boot (F11#497351)
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-48.rc1
 - Revert 2.6.29.2-rc1 patch that won't be in the final release.
 



From wtogami at fedoraproject.org  Fri Apr 24 19:12:57 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 19:12:57 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest86+.spec,1.45,1.46
Message-ID: <20090424191257.3766D70106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3587

Modified Files:
	memtest86+.spec 
Log Message:
Fix uninstall to remove stanza from grub.conf



Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- memtest86+.spec	24 Apr 2009 17:33:51 -0000	1.45
+++ memtest86+.spec	24 Apr 2009 19:12:27 -0000	1.46
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  8%{?dist}
+Release:  9%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -65,11 +65,11 @@
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
+%endif
 
 %preun
 sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-9
+- Fix uninstall to remove stanza from grub.conf
+
 * Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
 - Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
   during livecd-creator



From wtogami at fedoraproject.org  Fri Apr 24 19:15:58 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 19:15:58 +0000 (UTC)
Subject: rpms/memtest86+/F-11 memtest86+.spec,1.45,1.46
Message-ID: <20090424191558.9ACA270106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3929

Modified Files:
	memtest86+.spec 
Log Message:
Fix uninstall to remove stanza from grub.conf



Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/memtest86+.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- memtest86+.spec	24 Apr 2009 17:36:16 -0000	1.45
+++ memtest86+.spec	24 Apr 2009 19:15:28 -0000	1.46
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  8%{?dist}
+Release:  9%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -65,11 +65,11 @@
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
+%endif
 
 %preun
 sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-9
+- Fix uninstall to remove stanza from grub.conf
+
 * Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
 - Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
   during livecd-creator



From mjakubicek at fedoraproject.org  Fri Apr 24 19:19:11 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 19:19:11 +0000 (UTC)
Subject: rpms/velocity/F-11 velocity-enum.patch, NONE, 1.1 velocity.spec,
	1.25, 1.26
Message-ID: <20090424191911.C072D70106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/velocity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4967/F-11

Modified Files:
	velocity.spec 
Added Files:
	velocity-enum.patch 
Log Message:
- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)



velocity-enum.patch:

--- NEW FILE velocity-enum.patch ---
diff -Naur velocity-1.4-orig/docs/api/index-all.html velocity-1.4/docs/api/index-all.html
--- velocity-1.4-orig/docs/api/index-all.html	2009-04-24 20:09:34.000000000 +0200
+++ velocity-1.4/docs/api/index-all.html	2009-04-24 20:12:12.000000000 +0200
@@ -1476,7 +1476,7 @@
 <DD>Maps entries to the parent JAR File
  Key = the entry *excluding* plain directories
  Value = the JAR URL
-<DT><A HREF="org/apache/velocity/util/EnumerationIterator.html#enum"><B>enum</B></A> - 
+<DT><A HREF="org/apache/velocity/util/EnumerationIterator.html#enumer"><B>enumer</B></A> - 
 Variable in class org.apache.velocity.util.<A HREF="org/apache/velocity/util/EnumerationIterator.html">EnumerationIterator</A>
 <DD>The enumeration to iterate.
 <DT><A HREF="org/apache/velocity/runtime/resource/ResourceCacheImpl.html#enumerateKeys()"><B>enumerateKeys()</B></A> - 
diff -Naur velocity-1.4-orig/docs/api/org/apache/velocity/util/EnumerationIterator.html velocity-1.4/docs/api/org/apache/velocity/util/EnumerationIterator.html
--- velocity-1.4-orig/docs/api/org/apache/velocity/util/EnumerationIterator.html	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/docs/api/org/apache/velocity/util/EnumerationIterator.html	2009-04-24 20:11:56.000000000 +0200
@@ -94,7 +94,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>private &nbsp;java.util.Enumeration</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#enum">enum</A></B></CODE>
+<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#enumer">enumer</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The enumeration to iterate.</TD>
@@ -110,7 +110,7 @@
 <B>Constructor Summary</B></FONT></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#EnumerationIterator(java.util.Enumeration)">EnumerationIterator</A></B>(java.util.Enumeration&nbsp;enum)</CODE>
+<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#EnumerationIterator(java.util.Enumeration)">EnumerationIterator</A></B>(java.util.Enumeration&nbsp;enumer)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new iteratorwrapper instance for the specified 
@@ -173,10 +173,10 @@
 </TR>
 </TABLE>
 
-<A NAME="enum"><!-- --></A><H3>
-enum</H3>
+<A NAME="enumer"><!-- --></A><H3>
+enumer</H3>
 <PRE>
-private java.util.Enumeration <B>enum</B></PRE>
+private java.util.Enumeration <B>enumer</B></PRE>
 <DL>
 <DD>The enumeration to iterate.</DL>
 
@@ -193,11 +193,11 @@
 <A NAME="EnumerationIterator(java.util.Enumeration)"><!-- --></A><H3>
 EnumerationIterator</H3>
 <PRE>
-public <B>EnumerationIterator</B>(java.util.Enumeration&nbsp;enum)</PRE>
+public <B>EnumerationIterator</B>(java.util.Enumeration&nbsp;enumer)</PRE>
 <DL>
 <DD>Creates a new iteratorwrapper instance for the specified 
  Enumeration.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>enum</CODE> - The Enumeration to wrap.</DL>
+<DT><B>Parameters:</B><DD><CODE>enumer</CODE> - The Enumeration to wrap.</DL>
 </DD>
 </DL>
 
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/runtime/parser/Parser.java velocity-1.4/src/java/org/apache/velocity/runtime/parser/Parser.java
--- velocity-1.4-orig/src/java/org/apache/velocity/runtime/parser/Parser.java	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/runtime/parser/Parser.java	2009-04-24 20:12:51.000000000 +0200
@@ -3214,8 +3214,8 @@
         jj_expentry[i] = jj_lasttokens[i];
       }
       boolean exists = false;
-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-        int[] oldentry = (int[])(enum.nextElement());
+      for (java.util.Enumeration enumer = jj_expentries.elements(); enumer.hasMoreElements();) {
+        int[] oldentry = (int[])(enumer.nextElement());
         if (oldentry.length == jj_expentry.length) {
           exists = true;
           for (int i = 0; i < jj_expentry.length; i++) {
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/texen/Generator.java velocity-1.4/src/java/org/apache/velocity/texen/Generator.java
--- velocity-1.4-orig/src/java/org/apache/velocity/texen/Generator.java	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/texen/Generator.java	2009-04-24 20:12:36.000000000 +0200
@@ -451,10 +451,10 @@
      */
     protected void fillContextHash (Context context, Hashtable objs)
     {
-        Enumeration enum = objs.keys();
-        while (enum.hasMoreElements())
+        Enumeration enumer = objs.keys();
+        while (enumer.hasMoreElements())
         {
-            String key = enum.nextElement().toString();
+            String key = enumer.nextElement().toString();
             context.put (key, objs.get(key));
         }
     }
@@ -479,11 +479,11 @@
      */
     protected void fillContextProperties (Context context)
     {
-        Enumeration enum = props.propertyNames();
+        Enumeration enumer = props.propertyNames();
         
-        while (enum.hasMoreElements())
+        while (enumer.hasMoreElements())
         {
-            String nm = (String)enum.nextElement();
+            String nm = (String)enumer.nextElement();
             if (nm.startsWith ("context.objects."))
             {
                 
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/util/EnumerationIterator.java velocity-1.4/src/java/org/apache/velocity/util/EnumerationIterator.java
--- velocity-1.4-orig/src/java/org/apache/velocity/util/EnumerationIterator.java	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/util/EnumerationIterator.java	2009-04-24 20:12:26.000000000 +0200
@@ -30,17 +30,17 @@
     /**
      * The enumeration to iterate.
      */
-    private Enumeration enum = null;
+    private Enumeration enumer = null;
 
     /**
      * Creates a new iteratorwrapper instance for the specified 
      * Enumeration.
      *
-     * @param enum  The Enumeration to wrap.
+     * @param enumer  The Enumeration to wrap.
      */
-    public EnumerationIterator( Enumeration enum)
+    public EnumerationIterator( Enumeration enumer)
     {
-        this.enum = enum;
+        this.enumer = enumer;
     }
 
     /**
@@ -50,7 +50,7 @@
      */
     public Object next()
     {
-        return enum.nextElement();
+        return enumer.nextElement();
     }
     
     /**
@@ -60,7 +60,7 @@
      */
     public boolean hasNext()
     {
-        return enum.hasMoreElements();
+        return enumer.hasMoreElements();
     }
 
     /**


Index: velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/velocity/F-11/velocity.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- velocity.spec	26 Feb 2009 00:12:30 -0000	1.25
+++ velocity.spec	24 Apr 2009 19:18:41 -0000	1.26
@@ -37,24 +37,27 @@
 
 Name:           velocity
 Version:        1.4
-Release:        8.3%{?dist}
+Release:        8.4%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
 Source:         velocity-1.4-RHCLEAN.tar.bz2
-Patch0:		velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
-Patch1:		velocity-AnakiaTask-jdom-XMLOutputter.patch
-Patch2:		velocity-servletapi5.patch
+Patch0:			velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
+Patch1:			velocity-AnakiaTask-jdom-XMLOutputter.patch
+Patch2:			velocity-servletapi5.patch
 #Disable failure-on-tests rather than not running tests. 
-Patch3:		velocity-build-testcases.patch
+Patch3:			velocity-build-testcases.patch
 #Patch3:		velocity-notexentests.patch
+# Renames all "enum" variables to "enumer" because "enum" is a reserved word in java >= 1.5
+# Not upstreamed, package outdated.
+Patch4:			velocity-enum.patch
 URL:            http://jakarta.apache.org/velocity/
 Group:          Development/Libraries/Java
 Requires:       jakarta-commons-collections
 # Use servletapi5 instead of servletapi3
 Requires:       servletapi5
 Requires:       oro
-Requires:	werken.xpath
+Requires:		werken.xpath
 Requires:       jdom >= 0:1.0-1
 Requires:       bcel
 Requires:       log4j >= 0:1.1
@@ -151,6 +154,7 @@
 #Apply patch to remove explicit dependency on servletapi3
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 # -----------------------------------------------------------------------------
 
 %build
@@ -283,6 +287,9 @@
 #%endif
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.4-8.4
+- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.4-8.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 19:19:11 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 19:19:11 +0000 (UTC)
Subject: rpms/velocity/devel velocity-enum.patch, NONE, 1.1 velocity.spec,
	1.25, 1.26
Message-ID: <20090424191911.E72A070106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4967/devel

Modified Files:
	velocity.spec 
Added Files:
	velocity-enum.patch 
Log Message:
- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)



velocity-enum.patch:

--- NEW FILE velocity-enum.patch ---
diff -Naur velocity-1.4-orig/docs/api/index-all.html velocity-1.4/docs/api/index-all.html
--- velocity-1.4-orig/docs/api/index-all.html	2009-04-24 20:09:34.000000000 +0200
+++ velocity-1.4/docs/api/index-all.html	2009-04-24 20:12:12.000000000 +0200
@@ -1476,7 +1476,7 @@
 <DD>Maps entries to the parent JAR File
  Key = the entry *excluding* plain directories
  Value = the JAR URL
-<DT><A HREF="org/apache/velocity/util/EnumerationIterator.html#enum"><B>enum</B></A> - 
+<DT><A HREF="org/apache/velocity/util/EnumerationIterator.html#enumer"><B>enumer</B></A> - 
 Variable in class org.apache.velocity.util.<A HREF="org/apache/velocity/util/EnumerationIterator.html">EnumerationIterator</A>
 <DD>The enumeration to iterate.
 <DT><A HREF="org/apache/velocity/runtime/resource/ResourceCacheImpl.html#enumerateKeys()"><B>enumerateKeys()</B></A> - 
diff -Naur velocity-1.4-orig/docs/api/org/apache/velocity/util/EnumerationIterator.html velocity-1.4/docs/api/org/apache/velocity/util/EnumerationIterator.html
--- velocity-1.4-orig/docs/api/org/apache/velocity/util/EnumerationIterator.html	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/docs/api/org/apache/velocity/util/EnumerationIterator.html	2009-04-24 20:11:56.000000000 +0200
@@ -94,7 +94,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>private &nbsp;java.util.Enumeration</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#enum">enum</A></B></CODE>
+<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#enumer">enumer</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The enumeration to iterate.</TD>
@@ -110,7 +110,7 @@
 <B>Constructor Summary</B></FONT></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#EnumerationIterator(java.util.Enumeration)">EnumerationIterator</A></B>(java.util.Enumeration&nbsp;enum)</CODE>
+<TD><CODE><B><A HREF="../../../../org/apache/velocity/util/EnumerationIterator.html#EnumerationIterator(java.util.Enumeration)">EnumerationIterator</A></B>(java.util.Enumeration&nbsp;enumer)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new iteratorwrapper instance for the specified 
@@ -173,10 +173,10 @@
 </TR>
 </TABLE>
 
-<A NAME="enum"><!-- --></A><H3>
-enum</H3>
+<A NAME="enumer"><!-- --></A><H3>
+enumer</H3>
 <PRE>
-private java.util.Enumeration <B>enum</B></PRE>
+private java.util.Enumeration <B>enumer</B></PRE>
 <DL>
 <DD>The enumeration to iterate.</DL>
 
@@ -193,11 +193,11 @@
 <A NAME="EnumerationIterator(java.util.Enumeration)"><!-- --></A><H3>
 EnumerationIterator</H3>
 <PRE>
-public <B>EnumerationIterator</B>(java.util.Enumeration&nbsp;enum)</PRE>
+public <B>EnumerationIterator</B>(java.util.Enumeration&nbsp;enumer)</PRE>
 <DL>
 <DD>Creates a new iteratorwrapper instance for the specified 
  Enumeration.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>enum</CODE> - The Enumeration to wrap.</DL>
+<DT><B>Parameters:</B><DD><CODE>enumer</CODE> - The Enumeration to wrap.</DL>
 </DD>
 </DL>
 
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/runtime/parser/Parser.java velocity-1.4/src/java/org/apache/velocity/runtime/parser/Parser.java
--- velocity-1.4-orig/src/java/org/apache/velocity/runtime/parser/Parser.java	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/runtime/parser/Parser.java	2009-04-24 20:12:51.000000000 +0200
@@ -3214,8 +3214,8 @@
         jj_expentry[i] = jj_lasttokens[i];
       }
       boolean exists = false;
-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-        int[] oldentry = (int[])(enum.nextElement());
+      for (java.util.Enumeration enumer = jj_expentries.elements(); enumer.hasMoreElements();) {
+        int[] oldentry = (int[])(enumer.nextElement());
         if (oldentry.length == jj_expentry.length) {
           exists = true;
           for (int i = 0; i < jj_expentry.length; i++) {
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/texen/Generator.java velocity-1.4/src/java/org/apache/velocity/texen/Generator.java
--- velocity-1.4-orig/src/java/org/apache/velocity/texen/Generator.java	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/texen/Generator.java	2009-04-24 20:12:36.000000000 +0200
@@ -451,10 +451,10 @@
      */
     protected void fillContextHash (Context context, Hashtable objs)
     {
-        Enumeration enum = objs.keys();
-        while (enum.hasMoreElements())
+        Enumeration enumer = objs.keys();
+        while (enumer.hasMoreElements())
         {
-            String key = enum.nextElement().toString();
+            String key = enumer.nextElement().toString();
             context.put (key, objs.get(key));
         }
     }
@@ -479,11 +479,11 @@
      */
     protected void fillContextProperties (Context context)
     {
-        Enumeration enum = props.propertyNames();
+        Enumeration enumer = props.propertyNames();
         
-        while (enum.hasMoreElements())
+        while (enumer.hasMoreElements())
         {
-            String nm = (String)enum.nextElement();
+            String nm = (String)enumer.nextElement();
             if (nm.startsWith ("context.objects."))
             {
                 
diff -Naur velocity-1.4-orig/src/java/org/apache/velocity/util/EnumerationIterator.java velocity-1.4/src/java/org/apache/velocity/util/EnumerationIterator.java
--- velocity-1.4-orig/src/java/org/apache/velocity/util/EnumerationIterator.java	2009-04-24 20:09:31.000000000 +0200
+++ velocity-1.4/src/java/org/apache/velocity/util/EnumerationIterator.java	2009-04-24 20:12:26.000000000 +0200
@@ -30,17 +30,17 @@
     /**
      * The enumeration to iterate.
      */
-    private Enumeration enum = null;
+    private Enumeration enumer = null;
 
     /**
      * Creates a new iteratorwrapper instance for the specified 
      * Enumeration.
      *
-     * @param enum  The Enumeration to wrap.
+     * @param enumer  The Enumeration to wrap.
      */
-    public EnumerationIterator( Enumeration enum)
+    public EnumerationIterator( Enumeration enumer)
     {
-        this.enum = enum;
+        this.enumer = enumer;
     }
 
     /**
@@ -50,7 +50,7 @@
      */
     public Object next()
     {
-        return enum.nextElement();
+        return enumer.nextElement();
     }
     
     /**
@@ -60,7 +60,7 @@
      */
     public boolean hasNext()
     {
-        return enum.hasMoreElements();
+        return enumer.hasMoreElements();
     }
 
     /**


Index: velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- velocity.spec	26 Feb 2009 00:12:30 -0000	1.25
+++ velocity.spec	24 Apr 2009 19:18:41 -0000	1.26
@@ -37,24 +37,27 @@
 
 Name:           velocity
 Version:        1.4
-Release:        8.3%{?dist}
+Release:        8.4%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
 Source:         velocity-1.4-RHCLEAN.tar.bz2
-Patch0:		velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
-Patch1:		velocity-AnakiaTask-jdom-XMLOutputter.patch
-Patch2:		velocity-servletapi5.patch
+Patch0:			velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
+Patch1:			velocity-AnakiaTask-jdom-XMLOutputter.patch
+Patch2:			velocity-servletapi5.patch
 #Disable failure-on-tests rather than not running tests. 
-Patch3:		velocity-build-testcases.patch
+Patch3:			velocity-build-testcases.patch
 #Patch3:		velocity-notexentests.patch
+# Renames all "enum" variables to "enumer" because "enum" is a reserved word in java >= 1.5
+# Not upstreamed, package outdated.
+Patch4:			velocity-enum.patch
 URL:            http://jakarta.apache.org/velocity/
 Group:          Development/Libraries/Java
 Requires:       jakarta-commons-collections
 # Use servletapi5 instead of servletapi3
 Requires:       servletapi5
 Requires:       oro
-Requires:	werken.xpath
+Requires:		werken.xpath
 Requires:       jdom >= 0:1.0-1
 Requires:       bcel
 Requires:       log4j >= 0:1.1
@@ -151,6 +154,7 @@
 #Apply patch to remove explicit dependency on servletapi3
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 # -----------------------------------------------------------------------------
 
 %build
@@ -283,6 +287,9 @@
 #%endif
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.4-8.4
+- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.4-8.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wtogami at fedoraproject.org  Fri Apr 24 19:25:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 19:25:46 +0000 (UTC)
Subject: rpms/memtest86+/F-10 memtest86+.spec,1.42,1.43
Message-ID: <20090424192546.0A74D70106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6234

Modified Files:
	memtest86+.spec 
Log Message:
Fix uninstall to remove stanza from grub.conf



Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/memtest86+.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- memtest86+.spec	24 Apr 2009 17:41:45 -0000	1.42
+++ memtest86+.spec	24 Apr 2009 19:25:15 -0000	1.43
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  8%{?dist}
+Release:  9%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -65,11 +65,11 @@
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
+%endif
 
 %preun
 sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-9
+- Fix uninstall to remove stanza from grub.conf
+
 * Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
 - Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
   during livecd-creator



From wtogami at fedoraproject.org  Fri Apr 24 19:25:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 19:25:54 +0000 (UTC)
Subject: rpms/memtest86+/F-9 memtest86+.spec,1.42,1.43
Message-ID: <20090424192554.6AA0870106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6301

Modified Files:
	memtest86+.spec 
Log Message:
Fix uninstall to remove stanza from grub.conf



Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/memtest86+.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- memtest86+.spec	24 Apr 2009 17:42:43 -0000	1.42
+++ memtest86+.spec	24 Apr 2009 19:25:24 -0000	1.43
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  8%{?dist}
+Release:  9%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -65,11 +65,11 @@
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
+%endif
 
 %preun
 sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-9
+- Fix uninstall to remove stanza from grub.conf
+
 * Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
 - Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
   during livecd-creator



From dwalsh at fedoraproject.org  Fri Apr 24 19:28:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 19:28:36 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.98,
	1.99 selinux-policy.spec, 1.835, 1.836
Message-ID: <20090424192836.D283D70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7175

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-19
- Allow initrc_t to delete dev_null
- Allow readahead to configure auditing
- Fix milter policy
- Add /var/lib/readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- policy-20090105.patch	24 Apr 2009 17:50:35 -0000	1.98
+++ policy-20090105.patch	24 Apr 2009 19:28:35 -0000	1.99
@@ -770,16 +770,15 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.6.12/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-24 13:03:55.000000000 -0400
-@@ -1,3 +1,7 @@
- /etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
- 
--/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-24 15:26:39.000000000 -0400
+@@ -1,3 +1,5 @@
+-/etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
 +/usr/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +
 +/var/lib/readahead(/.*)?	gen_context(system_u:object_r:readahead_var_lib_t,s0)
-+
+ 
+-/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 13:45:16.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- selinux-policy.spec	24 Apr 2009 17:50:36 -0000	1.835
+++ selinux-policy.spec	24 Apr 2009 19:28:35 -0000	1.836
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,7 +446,7 @@
 %endif
 
 %changelog
-* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-18
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-19
 - Allow initrc_t to delete dev_null
 - Allow readahead to configure auditing
 - Fix milter policy



From dwalsh at fedoraproject.org  Fri Apr 24 19:28:43 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 24 Apr 2009 19:28:43 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.105,
	1.106 selinux-policy.spec, 1.841, 1.842
Message-ID: <20090424192843.5C2AD70106@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7254

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-19
- Allow initrc_t to delete dev_null
- Allow readahead to configure auditing
- Fix milter policy
- Add /var/lib/readahead


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- policy-20090105.patch	24 Apr 2009 17:50:54 -0000	1.105
+++ policy-20090105.patch	24 Apr 2009 19:28:42 -0000	1.106
@@ -770,16 +770,15 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.6.12/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-24 13:03:55.000000000 -0400
-@@ -1,3 +1,7 @@
- /etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
- 
--/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.fc	2009-04-24 15:26:39.000000000 -0400
+@@ -1,3 +1,5 @@
+-/etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
 +/usr/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +/sbin/readahead.*	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 +
 +/var/lib/readahead(/.*)?	gen_context(system_u:object_r:readahead_var_lib_t,s0)
-+
+ 
+-/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 13:45:16.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- selinux-policy.spec	24 Apr 2009 17:50:54 -0000	1.841
+++ selinux-policy.spec	24 Apr 2009 19:28:42 -0000	1.842
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,7 +446,7 @@
 %endif
 
 %changelog
-* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-18
+* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-19
 - Allow initrc_t to delete dev_null
 - Allow readahead to configure auditing
 - Fix milter policy



From wtogami at fedoraproject.org  Fri Apr 24 19:32:38 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 24 Apr 2009 19:32:38 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest86+-2.11.tar.gz,1.1,NONE
Message-ID: <20090424193238.8F49570106@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8211

Removed Files:
	memtest86+-2.11.tar.gz 
Log Message:
crap, that was a mistake =(



--- memtest86+-2.11.tar.gz DELETED ---



From jakub at fedoraproject.org  Fri Apr 24 19:38:53 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 24 Apr 2009 19:38:53 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.274, 1.275 glibc-fedora.patch, 1.307, 
	1.308 glibc.spec, 1.397, 1.398 import.log, 1.18, 1.19 sources,
	1.299, 1.300
Message-ID: <20090424193854.02CDD70106@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9334/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- .cvsignore	24 Apr 2009 08:21:30 -0000	1.274
+++ .cvsignore	24 Apr 2009 19:38:21 -0000	1.275
@@ -1,2 +1,2 @@
-glibc-20090424T0747.tar.bz2
-glibc-fedora-20090424T0747.tar.bz2
+glibc-20090424T1908.tar.bz2
+glibc-fedora-20090424T1908.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- glibc-fedora.patch	24 Apr 2009 08:21:30 -0000	1.307
+++ glibc-fedora.patch	24 Apr 2009 19:38:21 -0000	1.308
@@ -1,6 +1,6 @@
---- glibc-20090424T0747/ChangeLog	24 Apr 2009 03:58:48 -0000	1.11618
-+++ glibc-20090424T0747-fedora/ChangeLog	24 Apr 2009 08:00:29 -0000	1.8782.2.332
-@@ -7420,6 +7420,13 @@
+--- glibc-20090424T1908/ChangeLog	24 Apr 2009 19:00:54 -0000	1.11624
++++ glibc-20090424T1908-fedora/ChangeLog	24 Apr 2009 19:14:51 -0000	1.8782.2.333
+@@ -7457,6 +7457,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7715,6 +7722,10 @@
+@@ -7752,6 +7759,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -8972,6 +8983,15 @@
+@@ -9009,6 +9020,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090424T0747/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090424T0747-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090424T1908/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090424T1908-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090424T0747/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090424T0747-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090424T1908/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090424T1908-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090424T0747/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090424T0747-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090424T1908/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090424T1908-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090424T0747/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090424T0747-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090424T1908/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090424T1908-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090424T0747/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090424T0747-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090424T1908/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090424T1908-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090424T0747/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090424T0747-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090424T1908/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090424T1908-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090424T0747/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090424T0747-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090424T1908/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090424T1908-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090424T0747/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090424T0747-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
+--- glibc-20090424T1908/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
++++ glibc-20090424T1908-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
 @@ -297,8 +297,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090424T0747/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090424T1908/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090424T0747/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090424T1908/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090424T0747/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090424T0747-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090424T1908/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090424T1908-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090424T0747/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090424T0747-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090424T1908/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090424T1908-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090424T0747/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090424T0747-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090424T1908/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090424T1908-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,9 +603,9 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090424T0747/locale/programs/locarchive.c	18 Apr 2009 12:12:22 -0000	1.26
-+++ glibc-20090424T0747-fedora/locale/programs/locarchive.c	24 Apr 2009 08:00:32 -0000	1.21.2.5
-@@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
+--- glibc-20090424T1908/locale/programs/locarchive.c	24 Apr 2009 18:47:07 -0000	1.30
++++ glibc-20090424T1908-fedora/locale/programs/locarchive.c	24 Apr 2009 19:14:54 -0000	1.21.2.6
+@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
  			    locale_data_t data, bool replace);
@@ -616,9 +616,9 @@
 +		bool replace, const char *oldname,
 +		uint32_t *locrec_offset_p);
  
- static void
- enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
-@@ -542,7 +542,7 @@ close_archive (struct locarhandle *ah)
+ 
+ static bool
+@@ -628,7 +628,7 @@ close_archive (struct locarhandle *ah)
  #include "../../intl/explodename.c"
  #include "../../intl/l10nflist.c"
  
@@ -627,7 +627,7 @@
  insert_name (struct locarhandle *ah,
  	     const char *name, size_t name_len, bool replace)
  {
-@@ -600,7 +600,7 @@ insert_name (struct locarhandle *ah,
+@@ -686,7 +686,7 @@ insert_name (struct locarhandle *ah,
    return &namehashtab[idx];
  }
  
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090424T0747/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090424T0747-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090424T1908/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090424T1908-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090424T0747/localedata/SUPPORTED	18 Apr 2009 08:43:52 -0000	1.117
-+++ glibc-20090424T0747-fedora/localedata/SUPPORTED	24 Apr 2009 08:00:32 -0000	1.71.2.25
+--- glibc-20090424T1908/localedata/SUPPORTED	18 Apr 2009 08:43:52 -0000	1.117
++++ glibc-20090424T1908-fedora/localedata/SUPPORTED	24 Apr 2009 08:00:32 -0000	1.71.2.25
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090424T0747/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090424T0747-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090424T1908/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090424T1908-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090424T0747/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090424T0747-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090424T1908/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090424T1908-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090424T0747/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090424T1908/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090424T0747/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090424T0747-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090424T1908/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090424T1908-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090424T0747/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090424T0747-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090424T1908/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090424T1908-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090424T0747/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090424T0747-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090424T1908/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090424T1908-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090424T0747/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090424T0747-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090424T1908/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090424T1908-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090424T0747/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090424T0747-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090424T1908/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090424T1908-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090424T0747/nptl/ChangeLog	23 Apr 2009 04:11:38 -0000	1.1111
-+++ glibc-20090424T0747-fedora/nptl/ChangeLog	24 Apr 2009 08:00:34 -0000	1.706.2.171
+--- glibc-20090424T1908/nptl/ChangeLog	23 Apr 2009 04:11:38 -0000	1.1111
++++ glibc-20090424T1908-fedora/nptl/ChangeLog	24 Apr 2009 08:00:34 -0000	1.706.2.171
 @@ -3456,6 +3456,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090424T0747/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090424T0747-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090424T1908/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090424T1908-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090424T0747/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090424T0747-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090424T1908/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090424T1908-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090424T0747/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090424T1908/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090424T0747/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090424T0747-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090424T1908/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090424T1908-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090424T0747/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090424T0747-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090424T1908/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090424T1908-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090424T0747/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090424T0747-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090424T1908/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090424T1908-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090424T0747/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090424T0747-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090424T1908/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090424T1908-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090424T0747/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090424T1908/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090424T0747/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090424T0747-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090424T1908/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090424T1908-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090424T0747/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090424T0747-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090424T1908/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090424T1908-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090424T0747/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090424T0747-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090424T1908/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090424T1908-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090424T0747/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090424T0747-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090424T1908/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090424T1908-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090424T0747/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090424T0747-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090424T1908/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090424T1908-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090424T0747/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090424T1908/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090424T0747/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090424T0747-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090424T1908/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090424T1908-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090424T0747/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090424T0747-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090424T1908/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090424T1908-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/paths.h	23 Apr 2009 18:29:16 -0000	1.12
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/paths.h	24 Apr 2009 08:00:37 -0000	1.11.4.2
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/paths.h	23 Apr 2009 18:29:16 -0000	1.12
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/paths.h	24 Apr 2009 08:00:37 -0000	1.11.4.2
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090424T0747/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090424T0747-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090424T1908/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- glibc.spec	24 Apr 2009 08:21:31 -0000	1.397
+++ glibc.spec	24 Apr 2009 19:38:23 -0000	1.398
@@ -1,6 +1,6 @@
-%define glibcdate 20090424T0747
+%define glibcdate 20090424T1908
 %define glibcname glibc
-%define glibcsrcdir glibc-20090424T0747
+%define glibcsrcdir glibc-20090424T1908
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 20
+Release: 21
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,12 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-21
+- update from trunk
+  - fix localedef
+  - fix SHIFT_JIS iconv EILSEQ handling (#497267)
+  - misc fixes (BZ#10093, BZ#10100)
+
 * Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-20
 - update from trunk
   - fix p{read,write}v{,64} (#497429, #497434)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	24 Apr 2009 08:21:32 -0000	1.18
+++ import.log	24 Apr 2009 19:38:23 -0000	1.19
@@ -16,3 +16,4 @@
 glibc-2_9_90-18:F-11:glibc-2.9.90-18.src.rpm:1239866900
 glibc-2_9_90-19:F-11:glibc-2.9.90-19.src.rpm:1239900585
 glibc-2_9_90-20:F-11:glibc-2.9.90-20.src.rpm:1240561264
+glibc-2_9_90-21:F-11:glibc-2.9.90-21.src.rpm:1240601486


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- sources	24 Apr 2009 08:21:32 -0000	1.299
+++ sources	24 Apr 2009 19:38:23 -0000	1.300
@@ -1,2 +1,2 @@
-8b30be7e6d3debdd00c2dc995545a639  glibc-20090424T0747.tar.bz2
-99d6e57ab755b5b6aab7da0fc14772a4  glibc-fedora-20090424T0747.tar.bz2
+cceafa33a1c308f37cd679c0558f06de  glibc-20090424T1908.tar.bz2
+2e888704ea9f0d5f61cb1e8259dc9ab6  glibc-fedora-20090424T1908.tar.bz2



From cwickert at fedoraproject.org  Fri Apr 24 19:44:47 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 24 Apr 2009 19:44:47 +0000 (UTC)
Subject: rpms/lxpanel/devel lxpanel-0.4.0-manpages.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 lxpanel.spec, 1.18, 1.19 sources, 1.11,
	1.12 lxpanel-0.2.8-manpage.patch, 1.2, NONE
Message-ID: <20090424194447.BF70E70106@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10422

Modified Files:
	.cvsignore lxpanel.spec sources 
Added Files:
	lxpanel-0.4.0-manpages.patch 
Removed Files:
	lxpanel-0.2.8-manpage.patch 
Log Message:
* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.0-1
- Update to 0.4.0 final (fixes #496833)


lxpanel-0.4.0-manpages.patch:

--- NEW FILE lxpanel-0.4.0-manpages.patch ---
diff -dur lxpanel-0.4.0.orig/man/lxpanel.1 lxpanel-0.4.0/man/lxpanel.1
--- lxpanel-0.4.0.orig/man/lxpanel.1	2009-04-20 17:18:04.000000000 +0200
+++ lxpanel-0.4.0/man/lxpanel.1	2009-04-24 18:45:34.000000000 +0200
@@ -1,14 +1,60 @@
-Using catalogs: /etc/sgml/sgml-docbook-4.1-1.0-41.fc10.cat
-Using stylesheet: /usr/share/sgml/docbook/utils-0.6.14/docbook-utils.dsl#print
-Working on: /home/pcman/Projects/lxde/trunk/lxpanel/man/lxpanel.sgml
-.sp
-.RS
-.sp
-.nf
-      <grandpaul at gmail.com>
-    
-.sp
-.fi
-.RE
-.sp
-Ying-Chun Liu 2008paulliuDone.
+.TH "LXPANEL" "1" 
+.SH "NAME" 
+lxpanel \(em a lightweight GTK2-based panel for LXDE desktop. 
+.SH "SYNOPSIS" 
+.PP 
+\fBlxpanel\fR 
+.SH "DESCRIPTION" 
+.PP 
+This manual page documents briefly the 
+\fBlxpanel\fR command. 
+.PP 
+\fBlxpanel\fR is a program that provides a panel 
+for desktop, usually for LXDE. It is lightweight GTK+ 2.x based desktop  
+panel. 
+ 
+.PP 
+Features 
+.IP "   \(bu" 6 
+User-friendly application menu automatically generated from \fB.desktop\fP     		files on the system. 
+ 
+.IP "   \(bu" 6 
+Launcher bar (small icons clicked to launch apps) 
+.IP "   \(bu" 6 
+Task bar supporting urgency hint (can be flash when gaim gets new 
+incoming messages) 
+.IP "   \(bu" 6 
+Notification area (system tray) 
+.IP "   \(bu" 6 
+Digital clock 
+.IP "   \(bu" 6 
+Run dialog (a dialog let you type a command and run, can be called 
+in external programs) 
+.IP "   \(bu" 6 
+Net status icon plug-in (optional) 
+.IP "   \(bu" 6 
+Volume control plug-in (optional) 
+.IP "   \(bu" 6 
+lxpanelctl, an external controller let you control lxpanel in 
+other programs. For example, "lxpanelctl run" will show the Run 
+dialog in lxpanel, and "lxpanelctl menu" will show the application 
+menu. This is useful in key bindings provided by window managers.      
+.SH "FILES" 
+.IP "\fB~/.config/lxpanel\fP" 10 
+config file, can be edited by preference dialog. 
+.SH "SEE ALSO" 
+.PP 
+lxsession (1), lxpanelctl (1). 
+.SH "AUTHOR" 
+.PP 
+This manual page was written by paulliu grandpaul at gmail.com for 
+the \fBDebian\fP system (but may be used by others).  Permission is 
+granted to copy, distribute and/or modify this document under 
+the terms of the GNU General Public License, Version 2 any  
+later version published by the Free Software Foundation. 
+ 
+.PP 
+On Debian systems, the complete text of the GNU General Public 
+License can be found in /usr/share/common-licenses/GPL. 
+ 
+.\" created by instant / docbook-to-man, Sun 20 Apr 2008, 17:00 
diff -dur lxpanel-0.4.0.orig/man/lxpanelctl.1 lxpanel-0.4.0/man/lxpanelctl.1
--- lxpanel-0.4.0.orig/man/lxpanelctl.1	2009-04-20 17:18:04.000000000 +0200
+++ lxpanel-0.4.0/man/lxpanelctl.1	2009-04-24 18:45:34.000000000 +0200
@@ -1,14 +1,40 @@
-Using catalogs: /etc/sgml/sgml-docbook-4.1-1.0-41.fc10.cat
-Using stylesheet: /usr/share/sgml/docbook/utils-0.6.14/docbook-utils.dsl#print
-Working on: /home/pcman/Projects/lxde/trunk/lxpanel/man/lxpanelctl.sgml
-.sp
-.RS
-.sp
-.nf
-      <grandpaul at gmail.com>
-    
-.sp
-.fi
-.RE
-.sp
-Ying-Chun Liu 2008paulliuDone.
+.TH "LXPANEL" "1" 
+.SH "NAME" 
+lxpanelctl \(em controller for lxpanel. 
+.SH "SYNOPSIS" 
+.PP 
+\fBlxpanelctl\fR command 
+.SH "DESCRIPTION" 
+.PP 
+This manual page documents briefly the 
+\fBlxpanelctl\fR command. 
+.PP 
+\fBlxpanelctl\fR is a program that controls lxpanel. 
+ 
+.SH "COMMANDS" 
+.IP "\fBmenu\fR         " 10 
+show system menu 
+.IP "\fBrun\fR         " 10 
+show run dialog 
+.IP "\fBconfig\fR         " 10 
+show config dialog 
+.IP "\fBrestart\fR         " 10 
+restart lxpanel 
+.IP "\fBexit\fR         " 10 
+exit lxpanel 
+.SH "SEE ALSO" 
+.PP 
+lxpanel (1). 
+.SH "AUTHOR" 
+.PP 
+This manual page was written by paulliu grandpaul at gmail.com for 
+the \fBDebian\fP system (but may be used by others).  Permission is 
+granted to copy, distribute and/or modify this document under 
+the terms of the GNU General Public License, Version 2 any  
+later version published by the Free Software Foundation. 
+ 
+.PP 
+On Debian systems, the complete text of the GNU General Public 
+License can be found in /usr/share/common-licenses/GPL. 
+ 
+.\" created by instant / docbook-to-man, Sun 20 Apr 2008, 17:00 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Mar 2009 17:54:35 -0000	1.11
+++ .cvsignore	24 Apr 2009 19:44:16 -0000	1.12
@@ -1 +1 @@
-lxpanel-0.3.999.tar.gz
+lxpanel-0.4.0.tar.gz


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lxpanel.spec	22 Mar 2009 21:07:35 -0000	1.18
+++ lxpanel.spec	24 Apr 2009 19:44:17 -0000	1.19
@@ -4,7 +4,7 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.3.999
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
@@ -13,7 +13,7 @@
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Patch1:         lxpanel-default.patch
-Patch2:         lxpanel-0.2.8-manpage.patch
+Patch2:         lxpanel-0.4.0-manpages.patch
 Patch3:         lxpanel-0.3.8.1-system-config-network.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.0-1
+- Update to 0.4.0 final (fixes #496833)
+
 * Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.3.999-1
 - Update to 0.4.0 Beta 2
 - Build alsa mixer plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	23 Mar 2009 17:54:35 -0000	1.11
+++ sources	24 Apr 2009 19:44:17 -0000	1.12
@@ -1 +1 @@
-ba966c76811f2057198470567099d97d  lxpanel-0.3.999.tar.gz
+a03c7b21338a812207b035204f6dad6e  lxpanel-0.4.0.tar.gz


--- lxpanel-0.2.8-manpage.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Apr 24 19:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 19:49:29 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090424194929.2FEDB10F886@bastion2.fedora.phx.redhat.com>

Package js in Fedora 9 is now owned by hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Fri Apr 24 19:49:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 19:49:33 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090424194933.27BCF10F88D@bastion2.fedora.phx.redhat.com>

Package js in Fedora 10 is now owned by hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Fri Apr 24 19:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 19:49:37 +0000
Subject: [pkgdb] js ownership updated
Message-ID: <20090424194937.8436E10F884@bastion2.fedora.phx.redhat.com>

Package js in Fedora 11 is now owned by hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From cwickert at fedoraproject.org  Fri Apr 24 19:55:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 24 Apr 2009 19:55:27 +0000 (UTC)
Subject: rpms/lxpanel/devel lxpanel-default.patch,1.6,1.7
Message-ID: <20090424195527.4393C70106@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975

Modified Files:
	lxpanel-default.patch 
Log Message:
update default.patch

lxpanel-default.patch:

Index: lxpanel-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel-default.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lxpanel-default.patch	22 Mar 2009 21:07:35 -0000	1.6
+++ lxpanel-default.patch	24 Apr 2009 19:54:56 -0000	1.7
@@ -16,13 +16,4 @@
          }
      }
  }
-@@ -113,10 +110,6 @@
- }
  
- Plugin {
--    type = netstat
--}
--
--Plugin {
-     type = cpu
- }



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:00 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchbugzilla
Message-ID: <20090424200800.25F5D10F885@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on ImageMagick (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:00 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested commit
Message-ID: <20090424200801.1468210F88A@bastion2.fedora.phx.redhat.com>

hubbitus has requested the commit acl on ImageMagick (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:01 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested approveacls
Message-ID: <20090424200801.DF92D10F88D@bastion2.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on ImageMagick (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:02 +0000
Subject: [pkgdb] ImageMagick: hubbitus has given up commit
Message-ID: <20090424200802.2048E10F890@bastion2.fedora.phx.redhat.com>

hubbitus has given up the commit acl on ImageMagick (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:08 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchcommits
Message-ID: <20090424200808.2B36610F893@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on ImageMagick (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:10 +0000
Subject: [pkgdb] ImageMagick: hubbitus has given up approveacls
Message-ID: <20090424200810.EC50810F896@bastion2.fedora.phx.redhat.com>

hubbitus has given up the approveacls acl on ImageMagick (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:15 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchbugzilla
Message-ID: <20090424200816.0E78610F885@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on ImageMagick (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:17 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchcommits
Message-ID: <20090424200817.887A910F89A@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on ImageMagick (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:19 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested commit
Message-ID: <20090424200819.6151310F89D@bastion2.fedora.phx.redhat.com>

hubbitus has requested the commit acl on ImageMagick (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:25 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchbugzilla
Message-ID: <20090424200825.3C2CD10F888@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on ImageMagick (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:27 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchcommits
Message-ID: <20090424200827.477F910F88C@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on ImageMagick (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:28 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested commit
Message-ID: <20090424200829.0DB2110F8A1@bastion2.fedora.phx.redhat.com>

hubbitus has requested the commit acl on ImageMagick (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:31 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested approveacls
Message-ID: <20090424200831.1154C10F8A4@bastion2.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on ImageMagick (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Fri Apr 24 20:08:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 20:08:34 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested approveacls
Message-ID: <20090424200834.BA68010F892@bastion2.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on ImageMagick (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From jakub at fedoraproject.org  Fri Apr 24 20:08:35 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 24 Apr 2009 20:08:35 +0000 (UTC)
Subject: rpms/glibc/F-11 glibc-fedora.patch,1.308,1.309
Message-ID: <20090424200835.6863470106@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14702

Modified Files:
	glibc-fedora.patch 
Log Message:
2.9.90-21

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- glibc-fedora.patch	24 Apr 2009 19:38:21 -0000	1.308
+++ glibc-fedora.patch	24 Apr 2009 20:08:34 -0000	1.309
@@ -2090,3 +2090,27 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
+--- libc/fedora/build-locale-archive.c	24 May 2007 10:33:02 -0000	1.1.2.4
++++ libc/fedora/build-locale-archive.c	24 Apr 2009 20:06:55 -0000
+@@ -112,15 +112,16 @@ open_tmpl_archive (struct locarhandle *a
+     error (EXIT_FAILURE, errno, "cannot read archive header");
+ 
+   ah->fd = fd;
+-  ah->len = (head.sumhash_offset
+-	     + head.sumhash_size * sizeof (struct sumhashent));
+-  if (ah->len > st.st_size)
++  ah->mmaped = (head.sumhash_offset
++		+ head.sumhash_size * sizeof (struct sumhashent));
++  if (ah->mmaped > st.st_size)
+     error (EXIT_FAILURE, 0, "locale archite template file truncated");
+-  ah->len = st.st_size;
++  ah->mmaped = st.st_size;
++  ah->reserved = st.st_size;
+ 
+   /* Now we know how large the administrative information part is.
+      Map all of it.  */
+-  ah->addr = mmap64 (NULL, ah->len, PROT_READ, MAP_SHARED, fd, 0);
++  ah->addr = mmap64 (NULL, ah->mmaped, PROT_READ, MAP_SHARED, fd, 0);
+   if (ah->addr == MAP_FAILED)
+     error (EXIT_FAILURE, errno, "cannot map archive header");
+ }



From roland at fedoraproject.org  Fri Apr 24 20:09:56 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:09:56 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-0.141.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.47, 1.48 sources, 1.51, 1.52 elfutils-0.140.tar.bz2.sig, 1.1, NONE
Message-ID: <20090424200956.7E75B70106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14978

Modified Files:
	.cvsignore sources 
Added Files:
	elfutils-0.141.tar.bz2.sig 
Removed Files:
	elfutils-0.140.tar.bz2.sig 
Log Message:
0.141 tarball


--- NEW FILE elfutils-0.141.tar.bz2.sig ---
?F
	?(?:y?Dt??
5??4

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	16 Feb 2009 21:56:06 -0000	1.47
+++ .cvsignore	24 Apr 2009 20:09:26 -0000	1.48
@@ -1 +1 @@
-elfutils-0.140.tar.bz2
+elfutils-0.141.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Feb 2009 21:56:06 -0000	1.51
+++ sources	24 Apr 2009 20:09:26 -0000	1.52
@@ -1 +1 @@
-d4d64f9c05ba127a5a8b55beb6d88ab2  elfutils-0.140.tar.bz2
+2d0fe5651c0de1fd28e7dd006effe7d1  elfutils-0.141.tar.bz2


--- elfutils-0.140.tar.bz2.sig DELETED ---



From roland at fedoraproject.org  Fri Apr 24 20:13:29 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:13:29 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-portability.patch, 1.41,
	1.42 elfutils-robustify.patch, 1.14, 1.15 elfutils.spec, 1.115, 1.116
Message-ID: <20090424201329.6C58970106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15751

Modified Files:
	elfutils-portability.patch elfutils-robustify.patch 
	elfutils.spec 
Log Message:
Update to 0.141

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- elfutils-portability.patch	16 Feb 2009 21:56:06 -0000	1.41
+++ elfutils-portability.patch	24 Apr 2009 20:12:58 -0000	1.42
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -3,6 +3,10 @@
+@@ -33,6 +33,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -330,6 +334,11 @@
+@@ -360,6 +364,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -352,6 +361,9 @@
+@@ -382,6 +391,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -35,14 +35,6 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in
- ##
--## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
-+## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
- ## This file is part of Red Hat elfutils.
- ##
- ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -67,7 +59,7 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
-@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -115,7 +116,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -78,7 +70,7 @@
  # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -86,7 +78,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -185,6 +186,7 @@ SHELL = @SHELL@
+@@ -187,6 +188,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -94,7 +86,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
+@@ -245,9 +247,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -106,7 +98,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -650,7 +652,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -117,7 +109,8 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,5 +1,7 @@
+@@ -9,6 +9,8 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* configure.ac: Check for __builtin_popcount.
@@ -125,7 +118,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -80,6 +82,10 @@
+@@ -89,6 +91,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -136,7 +129,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -127,6 +133,17 @@
+@@ -136,6 +142,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -582,7 +575,8 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -5,6 +5,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
@@ -591,7 +585,7 @@
  	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
  	substitution that can produce leading whitespace.
  
-@@ -329,6 +332,11 @@
+@@ -334,6 +337,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -622,9 +616,9 @@
 -AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \
 +WEXTRA = @WEXTRA@
 +AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \
+ 	     -fdollars-in-identifiers \
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
 @@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -643,23 +637,25 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,11 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
-- at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
-+ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
-+ at MUDFLAP_FALSE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
+- at MUDFLAP_FALSE@	-fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \
+- at MUDFLAP_FALSE@	$(if $($(*F)_no_Werror),,-Werror)
 - at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \
++ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
++ at MUDFLAP_FALSE@	-std=gnu99 -fpic -fdollars-in-identifiers \
++ at MUDFLAP_FALSE@	$($(*F)_CFLAGS) $(if \
++ at MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
 + at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused $(WEXTRA) \
- @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
+ @MUDFLAP_TRUE@	-std=gnu99 -fpic -fdollars-in-identifiers \
+ @MUDFLAP_TRUE@	$($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -562,6 +562,11 @@
+@@ -571,6 +571,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -723,7 +719,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1013,6 +1013,11 @@
+@@ -1076,6 +1076,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -754,7 +750,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -762,7 +758,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -770,7 +766,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -784,7 +780,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -563,6 +563,11 @@
+@@ -569,6 +569,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -845,7 +841,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -529,6 +529,11 @@
+@@ -537,6 +537,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -963,21 +959,1367 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/po/es.po
++++ elfutils/po/es.po
+@@ -1,14 +1,10 @@
+-# Fedora Spanish Translation of elfutils.
+-# Domingo Becker <domingobecker at gmail.com>, 2009.
+-# H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>, 2009.
+-#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: elfutils\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
+-"POT-Creation-Date: 2009-04-24 14:08+0000\n"
++"POT-Creation-Date: 2009-04-09 14:04+0000\n"
+ "PO-Revision-Date: \n"
+-"Last-Translator: H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>\n"
++"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudio at pereyradiaz.com.ar>\n"
+ "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -19,7 +15,7 @@ msgstr ""
+ #: ../lib/xmalloc.c:65
+ #: ../lib/xmalloc.c:79
+ #: ../src/readelf.c:2703
+-#: ../src/readelf.c:3041
++#: ../src/readelf.c:3038
+ #: ../src/unstrip.c:2086
+ #: ../src/unstrip.c:2294
+ #, c-format
+@@ -60,7 +56,7 @@ msgid "invalid size of destination opera
+ msgstr "tama??o inv??lido del operando destino"
+ 
+ #: ../libelf/elf_error.c:108
+-#: ../src/readelf.c:4592
++#: ../src/readelf.c:4589
+ #, c-format
+ msgid "invalid encoding"
+ msgstr "codificaci??n inv??lida"
+@@ -96,7 +92,7 @@ msgstr "desplazamiento fuera de rango"
+ 
+ #: ../libelf/elf_error.c:136
+ msgid "invalid fmag field in archive header"
+-msgstr "campo fmag no v??lido en el encabezado del archivo"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:140
+ msgid "invalid archive file"
+@@ -136,7 +132,7 @@ msgstr "secci??n inv??lida"
+ 
+ #: ../libelf/elf_error.c:180
+ msgid "executable header not created first"
+-msgstr "no se ha creado primero el encabezado ejecutable"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:184
+ msgid "file descriptor disabled"
+@@ -159,8 +155,8 @@ msgid "invalid section header"
+ msgstr "cabecera de secci??n inv??lida"
+ 
+ #: ../libelf/elf_error.c:208
+-#: ../src/readelf.c:6062
+-#: ../src/readelf.c:6163
++#: ../src/readelf.c:6055
++#: ../src/readelf.c:6156
+ #, c-format
+ msgid "invalid data"
+ msgstr "datos inv??lidos"
+@@ -171,7 +167,7 @@ msgstr "codificaci??n de caracteres desc
+ 
+ #: ../libelf/elf_error.c:216
+ msgid "section `sh_size' too small for data"
+-msgstr "el tama??o de la secci??n `sh_size' es demasiado peque??o para los datos "
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:220
+ msgid "invalid section alignment"
+@@ -183,7 +179,7 @@ msgstr "tama??o de la entrada de la secc
+ 
+ #: ../libelf/elf_error.c:228
+ msgid "update() for write on read-only file"
+-msgstr "update() para escribir sobre archivo de s??lo lectura"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:232
+ msgid "no such file"
+@@ -191,11 +187,11 @@ msgstr "no hay tal archivo"
+ 
+ #: ../libelf/elf_error.c:236
+ msgid "only relocatable files can contain section groups"
+-msgstr "solo los archivos realojables pueden contener grupos de secci??n"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:241
+ msgid "program header only allowed in executables, shared objects, and core files"
+-msgstr "los encabezados de los programas solo son permitidos en archivos ejecutables, archivos principales, u objetos compartidos"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:248
+ msgid "file has no program header"
+@@ -415,19 +411,19 @@ msgstr "directorio NULL en find_file"
+ 
+ #: ../libdwfl/argp-std.c:70
+ msgid "Find addresses from signatures found in COREFILE"
+-msgstr "Busca direcciones desde firmas encontradas en COREFILE"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:72
+ msgid "Find addresses in files mapped into process PID"
+-msgstr "Busca direcciones en archivos mapeados sobre procesos PID"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:74
+ msgid "Find addresses in files mapped as read from FILE in Linux /proc/PID/maps format"
+-msgstr "Busca direcciones en archivos mapeados como le??dos desde FILE en formato Linux /proc/PID/maps"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:76
+ msgid "Find addresses in the running kernel"
+-msgstr "Busca direcciones en el kernel que est?? ejecut??ndose"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:78
+ #, fuzzy
+@@ -436,7 +432,7 @@ msgstr "Reemplazar todos los &espacios c
+ 
+ #: ../libdwfl/argp-std.c:80
+ msgid "Search path for separate debuginfo files"
+-msgstr "Busca caminos para deferentes arhivos debugingfo"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:163
+ #, fuzzy
+@@ -635,7 +631,7 @@ msgstr "`N' s??lo tiene significado con 
+ #: ../src/ar.c:197
+ #, c-format
+ msgid "MEMBER parameter required for 'a', 'b', and 'i' modifiers"
+-msgstr "Los modificadres 'a', 'b', e 'i', requieren par??metros MEMBR"
++msgstr ""
+ 
+ #: ../src/ar.c:213
+ #, fuzzy, c-format
+@@ -669,7 +665,7 @@ msgstr "%s: se requiere un nombre de se?
+ #: ../src/strip.c:203
+ #: ../src/ld.c:957
+ #: ../src/elflint.c:238
+-#: ../src/addr2line.c:185
++#: ../src/addr2line.c:180
+ #: ../src/findtextrel.c:170
+ #: ../src/elfcmp.c:522
+ #: ../src/ranlib.c:136
+@@ -682,9 +678,6 @@ msgid ""
+ "This is free software; see the source for copying conditions.  There is NO\n"
+ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+ msgstr ""
+-"Copyright (C) %s Red Hat, Inc.\n"
+-"El siguiente es un software libre; consulte el c??digo para conocer las condiciones de copiado. NO TIENE\n"
+-"garant??a, ni siquiera para SU COMERCIALIZACION o PARA SER USADO CON UN FIN DETERMINADO.\n"
+ 
+ #: ../src/ar.c:294
+ #: ../src/nm.c:258
+@@ -693,7 +686,7 @@ msgstr ""
+ #: ../src/strip.c:208
+ #: ../src/ld.c:962
+ #: ../src/elflint.c:243
+-#: ../src/addr2line.c:190
++#: ../src/addr2line.c:185
+ #: ../src/findtextrel.c:175
+ #: ../src/elfcmp.c:527
+ #: ../src/ranlib.c:141
+@@ -867,7 +860,7 @@ msgstr "Extra??amente s??lo hay %d parti
+ 
+ #: ../src/nm.c:79
+ msgid "Display dynamic symbols instead of normal symbols"
+-msgstr "Muestra s??mbolos din??micos en lugar de s??mbolos normales"
++msgstr ""
+ 
+ #: ../src/nm.c:80
+ #, fuzzy
+@@ -881,7 +874,7 @@ msgstr "Mostrar s??lo cuando el adaptado
+ 
+ #: ../src/nm.c:83
+ msgid "Include index for symbols from archive members"
+-msgstr "Incluye ??ndices para s??mbolos desde miembros de archivo"
++msgstr ""
+ 
+ #: ../src/nm.c:85
+ #: ../src/size.c:66
+@@ -895,7 +888,7 @@ msgstr "Imprimir el nombre del archivo d
+ 
+ #: ../src/nm.c:90
+ msgid "Use the output format FORMAT.  FORMAT can be `bsd', `sysv' or `posix'.  The default is `sysv'"
+-msgstr "Use el formato de salida FORMAT. FORMAT puede ser o bien `bsd', o `sysv', o `posix'. El establecido por defecto es `sysv'"
++msgstr ""
+ 
+ #: ../src/nm.c:92
+ #, fuzzy
+@@ -910,7 +903,7 @@ msgstr "lo mismo que --format=posix"
+ #: ../src/nm.c:94
+ #: ../src/size.c:72
+ msgid "Use RADIX for printing symbol values"
+-msgstr "Utilice RADIX para imprimir valores de s??mbolo"
++msgstr ""
+ 
+ #: ../src/nm.c:95
+ #, fuzzy
+@@ -946,7 +939,7 @@ msgid "Reverse the sense of the sort"
+ msgstr "_Invertir orden"
+ 
+ #: ../src/nm.c:103
+-#: ../src/addr2line.c:75
++#: ../src/addr2line.c:73
+ #: ../src/findtextrel.c:75
+ #: ../src/elfcmp.c:75
+ #: ../src/strings.c:83
+@@ -1002,7 +995,7 @@ msgstr ""
+ #: ../src/size.c:317
+ #: ../src/size.c:326
+ #: ../src/size.c:337
+-#: ../src/strip.c:1815
++#: ../src/strip.c:1814
+ #, fuzzy, c-format
+ msgid "while closing '%s'"
+ msgstr "error al cerrar la entrada `%s'"
+@@ -1065,17 +1058,17 @@ msgstr "No se puede crear el componente 
+ #: ../src/readelf.c:2722
+ #: ../src/readelf.c:2758
+ #: ../src/readelf.c:2820
+-#: ../src/readelf.c:6312
+-#: ../src/readelf.c:7178
+-#: ../src/readelf.c:7323
+-#: ../src/readelf.c:7392
++#: ../src/readelf.c:6305
++#: ../src/readelf.c:7171
++#: ../src/readelf.c:7316
++#: ../src/readelf.c:7385
+ #: ../src/size.c:425
+ #: ../src/size.c:499
+ #: ../src/strip.c:482
+ #: ../src/objdump.c:744
+-#, fuzzy, c-format
++#, c-format
+ msgid "cannot get section header string table index"
+-msgstr "no se puede obtener ??ndice de la tabla de la cadena del encabezado de secci??n"
++msgstr ""
+ 
+ #: ../src/nm.c:766
+ #, fuzzy, c-format
+@@ -1114,7 +1107,7 @@ msgstr "no se reconoce el tipo de secci?
+ #: ../src/nm.c:1012
+ #, c-format
+ msgid "%s: entry size in section `%s' is not what we expect"
+-msgstr "%s: el tama??o de la entrada en la secci??n `%s' no es el que esper??bamos "
++msgstr ""
+ 
+ #: ../src/nm.c:1016
+ #, fuzzy, c-format
+@@ -1148,9 +1141,8 @@ msgid "Display the ELF file header"
+ msgstr "encabezado del fichero BFD versi??n %s\n"
+ 
+ #: ../src/readelf.c:77
+-#, fuzzy
+ msgid "Display histogram of bucket list lengths"
+-msgstr "Muestra histograma de la longitud de las listas de almacenamiento"
++msgstr ""
+ 
+ #: ../src/readelf.c:78
+ #, fuzzy
+@@ -1182,9 +1174,8 @@ msgid "Display versioning information"
+ msgstr "Mostrar la informaci??n de la versi??n."
+ 
+ #: ../src/readelf.c:86
+-#, fuzzy
+ msgid "Display DWARF section content.  SECTION can be one of abbrev, aranges, frame, info, loc, line, ranges, pubnames, str, macinfo, or exception"
+-msgstr "Muestra el contenido de la seccion DWARF. SECTION puede ser algo de lo siguiente: abbrev, aranges, frame, info, loc, line, ranges, pubnames, str, macinfo, or exception"
++msgstr ""
+ 
+ #: ../src/readelf.c:89
+ #, fuzzy
+@@ -1193,11 +1184,11 @@ msgstr "_Ocultar notas"
+ 
+ #: ../src/readelf.c:91
+ msgid "Display architecture specific information (if any)"
+-msgstr "Muestra informaci??n espec??fica de la arquitectura (si es que hubiera)"
++msgstr ""
+ 
+ #: ../src/readelf.c:93
+ msgid "Dump the uninterpreted contents of SECTION, by number or name"
+-msgstr "Descarga los contenidos no interpretados de SECTION, por nombre o n??mero"
++msgstr ""
+ 
+ #: ../src/readelf.c:95
+ #, fuzzy
+@@ -1222,7 +1213,7 @@ msgstr "Control del resultado:"
+ #. Short description of program.
+ #: ../src/readelf.c:108
+ msgid "Print information from ELF file in human-readable form."
+-msgstr "Imprime informaci??n desde el archivo ELF en una forma comprensible para los seres humanos. "
++msgstr ""
+ 
+ #. Strings for arguments in help texts.
+ #: ../src/readelf.c:112
+@@ -1265,7 +1256,7 @@ msgstr "no se puede crear un descriptor 
+ #: ../src/readelf.c:460
+ #, c-format
+ msgid "'%s' is not an archive, cannot print archive index"
+-msgstr "'%s' no es un archivo, no se puede imprimir ??ndice de archivo"
++msgstr ""
+ 
+ #: ../src/readelf.c:465
+ #, fuzzy, c-format
+@@ -1439,22 +1430,22 @@ msgstr "%s (%s bytes)"
+ #: ../src/readelf.c:769
+ #, c-format
+ msgid "  Size of program header entries:    %<PRId16> %s\n"
+-msgstr "  Tama??o de las entradas en el encabezado del programa:    %<PRId16> %s\n"
++msgstr ""
+ 
+ #: ../src/readelf.c:772
+ #, c-format
+ msgid "  Number of program headers entries: %<PRId16>\n"
+-msgstr "  Cantidad de entradas en los encabezados del programa: %<PRId16>\n"
++msgstr ""
+ 
+ #: ../src/readelf.c:775
+ #, c-format
+ msgid "  Size of section header entries:    %<PRId16> %s\n"
+-msgstr "  Tama??o de las entradas en el encabezado de secci??n:    %<PRId16> %s\n"
++msgstr ""
+ 
+ #: ../src/readelf.c:778
+ #, c-format
+ msgid "  Number of section headers entries: %<PRId16>"
+-msgstr "  Cantidad de entradas en los encabezados de secci??n: %<PRId16>"
++msgstr ""
+ 
+ #: ../src/readelf.c:785
+ #, fuzzy, c-format
+@@ -1517,7 +1508,7 @@ msgstr "%s: no se puede encontrar la sec
+ 
+ #: ../src/readelf.c:871
+ #: ../src/readelf.c:1025
+-#: ../src/readelf.c:7343
++#: ../src/readelf.c:7336
+ #: ../src/unstrip.c:352
+ #: ../src/unstrip.c:376
+ #: ../src/unstrip.c:426
+@@ -1914,140 +1905,140 @@ msgstr[1] ""
+ msgid "       Library                       Time Stamp          Checksum Version Flags"
+ msgstr ""
+ 
+-#: ../src/readelf.c:2832
++#: ../src/readelf.c:2830
+ #, c-format
+ msgid ""
+ "\n"
+ "Object attributes section [%2zu] '%s' of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:2848
++#: ../src/readelf.c:2846
+ #, fuzzy
+ msgid "  Owner          Size\n"
+ msgstr "  Prop\t\tTama??o datos\tDescripci??n\n"
+ 
+-#: ../src/readelf.c:2874
++#: ../src/readelf.c:2872
+ #, fuzzy, c-format
+ msgid "  %-13s  %4<PRIu32>\n"
+ msgstr "Pedido de servidor desconocida %<PRIu32>"
+ 
+-#: ../src/readelf.c:2906
++#: ../src/readelf.c:2903
+ #, fuzzy, c-format
+ msgid "    %-4u %12<PRIu32>\n"
+ msgstr "12 x 11 in"
+ 
+ #. Tag_File
+-#: ../src/readelf.c:2911
++#: ../src/readelf.c:2908
+ #, fuzzy, c-format
+ msgid "    File: %11<PRIu32>\n"
+ msgstr "10 x 11 in"
+ 
+-#: ../src/readelf.c:2946
++#: ../src/readelf.c:2943
+ #, c-format
+ msgid "      %s: %<PRId64>, %s\n"
+ msgstr "      %s: %<PRId64>, %s\n"
+ 
+-#: ../src/readelf.c:2949
++#: ../src/readelf.c:2946
+ #, c-format
+ msgid "      %s: %<PRId64>\n"
+ msgstr "      %s: %<PRId64>\n"
+ 
+-#: ../src/readelf.c:2952
++#: ../src/readelf.c:2949
+ #, c-format
+ msgid "      %s: %s\n"
+ msgstr "      %s: %s\n"
+ 
+-#: ../src/readelf.c:2959
++#: ../src/readelf.c:2956
+ #, c-format
+ msgid "      %u: %<PRId64>\n"
+ msgstr "      %u: %<PRId64>\n"
+ 
+-#: ../src/readelf.c:2962
++#: ../src/readelf.c:2959
+ #, c-format
+ msgid "      %u: %s\n"
+ msgstr "      %u: %s\n"
+ 
+-#: ../src/readelf.c:2997
++#: ../src/readelf.c:2994
+ #, c-format
+ msgid "%s+%#<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%s+%#<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3000
++#: ../src/readelf.c:2997
+ #, c-format
+ msgid "%s+%#0*<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%s+%#0*<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3005
++#: ../src/readelf.c:3002
+ #, c-format
+ msgid "%#<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%#<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3008
++#: ../src/readelf.c:3005
+ #, c-format
+ msgid "%#0*<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%#0*<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3014
++#: ../src/readelf.c:3011
+ #, c-format
+ msgid "%s+%#<PRIx64> <%s>"
+ msgstr "%s+%#<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3017
++#: ../src/readelf.c:3014
+ #, c-format
+ msgid "%s+%#0*<PRIx64> <%s>"
+ msgstr "%s+%#0*<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3021
++#: ../src/readelf.c:3018
+ #, c-format
+ msgid "%#<PRIx64> <%s>"
+ msgstr "%#<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3024
++#: ../src/readelf.c:3021
+ #, c-format
+ msgid "%#0*<PRIx64> <%s>"
+ msgstr "%#0*<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3029
++#: ../src/readelf.c:3026
+ #, c-format
+ msgid "%s+%#<PRIx64>"
+ msgstr "%s+%#<PRIx64>"
+ 
+-#: ../src/readelf.c:3032
++#: ../src/readelf.c:3029
+ #, c-format
+ msgid "%s+%#0*<PRIx64>"
+ msgstr "%s+%#0*<PRIx64>"
+ 
+-#: ../src/readelf.c:3140
++#: ../src/readelf.c:3137
+ #, fuzzy, c-format
+ msgid "unknown tag %hx"
+ msgstr "l??nea %d: etiqueta desconocida: %s\n"
+ 
+-#: ../src/readelf.c:3142
++#: ../src/readelf.c:3139
+ #, fuzzy, c-format
+ msgid "unknown user tag %hx"
+ msgstr "Valor TAG desconocido: %lx"
+ 
+-#: ../src/readelf.c:3352
++#: ../src/readelf.c:3349
+ #, fuzzy, c-format
+ msgid "unknown attribute %hx"
+ msgstr "atributo de secci??n '%c' desconocido"
+ 
+-#: ../src/readelf.c:3355
++#: ../src/readelf.c:3352
+ #, fuzzy, c-format
+ msgid "unknown user attribute %hx"
+ msgstr "Nombres de atributos de usuario predeterminados:\n"
+ 
+-#: ../src/readelf.c:3401
++#: ../src/readelf.c:3398
+ #, fuzzy, c-format
+ msgid "unknown form %<PRIx64>"
+ msgstr "Valor FORM desconocido: %lx"
+ 
+-#: ../src/readelf.c:4017
++#: ../src/readelf.c:4014
+ #, fuzzy, c-format
+ msgid "%*s[%4<PRIuMAX>] %s  <TRUNCATED>\n"
+ msgstr "Fichero truncado"
+ 
+-#: ../src/readelf.c:4030
++#: ../src/readelf.c:4027
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2055,39 +2046,39 @@ msgid ""
+ " [ Code]\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4037
++#: ../src/readelf.c:4034
+ #, c-format
+ msgid ""
+ "\n"
+ "Abbreviation section at offset %<PRIu64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4050
++#: ../src/readelf.c:4047
+ #, fuzzy, c-format
+ msgid " *** error while reading abbreviation: %s\n"
+ msgstr "Error al leer el disco."
+ 
+-#: ../src/readelf.c:4066
++#: ../src/readelf.c:4063
+ #, c-format
+ msgid " [%5u] offset: %<PRId64>, children: %s, tag: %s\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4069
++#: ../src/readelf.c:4066
+ #, fuzzy
+ msgid "yes"
+ msgstr "s??"
+ 
+-#: ../src/readelf.c:4069
++#: ../src/readelf.c:4066
+ #, fuzzy
+ msgid "no"
+ msgstr "no"
+ 
+-#: ../src/readelf.c:4105
++#: ../src/readelf.c:4102
+ #, c-format
+ msgid "cannot get .debug_aranges content: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4110
++#: ../src/readelf.c:4107
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2098,130 +2089,130 @@ msgid_plural ""
+ msgstr[0] ""
+ msgstr[1] ""
+ 
+-#: ../src/readelf.c:4140
++#: ../src/readelf.c:4137
+ #, c-format
+ msgid " [%*zu] ???\n"
+ msgstr " [%*zu] ???\n"
+ 
+-#: ../src/readelf.c:4142
++#: ../src/readelf.c:4139
+ #, c-format
+ msgid " [%*zu] start: %0#*<PRIx64>, length: %5<PRIu64>, CU DIE offset: %6<PRId64>\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4161
++#: ../src/readelf.c:4158
+ #, c-format
+ msgid "cannot get .debug_ranges content: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4166
+-#: ../src/readelf.c:4623
+-#: ../src/readelf.c:5272
+-#: ../src/readelf.c:5717
+-#: ../src/readelf.c:5812
+-#: ../src/readelf.c:5984
++#: ../src/readelf.c:4163
++#: ../src/readelf.c:4620
++#: ../src/readelf.c:5265
++#: ../src/readelf.c:5710
++#: ../src/readelf.c:5805
++#: ../src/readelf.c:5977
+ #, c-format
+ msgid ""
+ "\n"
+ "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4180
+-#: ../src/readelf.c:5731
++#: ../src/readelf.c:4177
++#: ../src/readelf.c:5724
+ #, fuzzy, c-format
+ msgid " [%6tx]  <INVALID DATA>\n"
+ msgstr "%F%P: declaraci??n inv??lida de datos\n"
+ 
+-#: ../src/readelf.c:4202
+-#: ../src/readelf.c:5753
++#: ../src/readelf.c:4199
++#: ../src/readelf.c:5746
+ #, fuzzy, c-format
+ msgid " [%6tx]  base address %s\n"
+ msgstr "    %8.8lx %8.8lx %8.8lx (direcci??n base)\n"
+ 
+ #. We have an address range entry.
+ #. First address range entry in a list.
+-#: ../src/readelf.c:4213
++#: ../src/readelf.c:4210
+ #, c-format
+ msgid " [%6tx]  %s..%s\n"
+ msgstr " [%6tx]  %s..%s\n"
+ 
+-#: ../src/readelf.c:4215
++#: ../src/readelf.c:4212
+ #, c-format
+ msgid "           %s..%s\n"
+ msgstr "           %s..%s\n"
+ 
+-#: ../src/readelf.c:4612
+-#: ../src/readelf.c:6050
+-#: ../src/readelf.c:6152
++#: ../src/readelf.c:4609
++#: ../src/readelf.c:6043
++#: ../src/readelf.c:6145
+ #, fuzzy, c-format
+ msgid "cannot get %s content: %s"
+ msgstr "No se puede obtener el nombre de la m??quina (hostname)"
+ 
+-#: ../src/readelf.c:4619
++#: ../src/readelf.c:4616
+ #, c-format
+ msgid ""
+ "\n"
+ "Call frame information section [%2zu] '%s' at offset %#<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4646
+-#: ../src/readelf.c:5306
++#: ../src/readelf.c:4643
++#: ../src/readelf.c:5299
+ #, fuzzy, c-format
+ msgid "invalid data in section [%zu] '%s'"
+ msgstr "La secci??n BOUNDS en el archivo no es v??lida."
+ 
+-#: ../src/readelf.c:4668
++#: ../src/readelf.c:4665
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ " [%6tx] Zero terminator\n"
+ msgstr "terminador de linea desconocido"
+ 
+-#: ../src/readelf.c:4746
++#: ../src/readelf.c:4739
+ #, fuzzy
+ msgid "FDE address encoding: "
+ msgstr "Codificaci??n en una sola pasada"
+ 
+-#: ../src/readelf.c:4752
++#: ../src/readelf.c:4745
+ #, fuzzy
+ msgid "LSDA pointer encoding: "
+ msgstr "Codificaci??n en una sola pasada"
+ 
+-#: ../src/readelf.c:4797
++#: ../src/readelf.c:4790
+ #, fuzzy, c-format
+ msgid "invalid augmentation encoding"
+ msgstr "especificada una codificaci??n inv??lida"
+ 
+-#: ../src/readelf.c:4868
++#: ../src/readelf.c:4861
+ #, fuzzy, c-format
+ msgid " (offset: %#<PRIx64>)"
+ msgstr "Desplazamiento horizontal"
+ 
+-#: ../src/readelf.c:4875
++#: ../src/readelf.c:4868
+ #, fuzzy, c-format
+ msgid " (end offset: %#<PRIx64>)"
+ msgstr "    Desplaz  Inicio   Fin\n"
+ 
+-#: ../src/readelf.c:4902
++#: ../src/readelf.c:4895
+ #, fuzzy, c-format
+ msgid "   %-26sLSDA pointer: %#<PRIx64>\n"
+ msgstr "\tNombre de la Tabla de Punteros \t\t"
+ 
+-#: ../src/readelf.c:4948
++#: ../src/readelf.c:4941
+ #, fuzzy, c-format
+ msgid "cannot get attribute code: %s"
+ msgstr "No se puede inicializar el c??digo de libbonoboui"
+ 
+-#: ../src/readelf.c:4956
++#: ../src/readelf.c:4949
+ #, fuzzy, c-format
+ msgid "cannot get attribute form: %s"
+ msgstr "No se puede a??adir el atributo SMIMEEncKeyPrefs"
+ 
+-#: ../src/readelf.c:4969
++#: ../src/readelf.c:4962
+ #, fuzzy, c-format
+ msgid "cannot get attribute value: %s"
+ msgstr "No se puede a??adir el atributo SMIMEEncKeyPrefs"
+ 
+-#: ../src/readelf.c:5151
++#: ../src/readelf.c:5144
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2229,44 +2220,44 @@ msgid ""
+ " [Offset]\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5176
++#: ../src/readelf.c:5169
+ #, c-format
+ msgid ""
+ " Compilation unit at offset %<PRIu64>:\n"
+ " Version: %<PRIu16>, Abbreviation section offset: %<PRIu64>, Address size: %<PRIu8>, Offset size: %<PRIu8>\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5194
++#: ../src/readelf.c:5187
+ #, c-format
+ msgid "cannot get DIE at offset %<PRIu64> in section '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5205
++#: ../src/readelf.c:5198
+ #, fuzzy, c-format
+ msgid "cannot get DIE offset: %s"
+ msgstr "%s: no se puede desplazar a la posici??n %s"
+ 
+-#: ../src/readelf.c:5213
++#: ../src/readelf.c:5206
+ #, c-format
+ msgid "cannot get tag of DIE at offset %<PRIu64> in section '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5242
++#: ../src/readelf.c:5235
+ #, fuzzy, c-format
+ msgid "cannot get next DIE: %s\n"
+ msgstr "No se puede obtener el nombre oficial de la m??quina (hostname)"
+ 
+-#: ../src/readelf.c:5249
++#: ../src/readelf.c:5242
+ #, fuzzy, c-format
+ msgid "cannot get next DIE: %s"
+ msgstr "No se puede obtener el nombre oficial de la m??quina (hostname)"
+ 
+-#: ../src/readelf.c:5284
++#: ../src/readelf.c:5277
+ #, fuzzy, c-format
+ msgid "cannot get line data section data: %s"
+ msgstr "%C: No se puede obtener el contenido de la secci??n - excepci??n de auto-importaci??n\n"
+ 
+-#: ../src/readelf.c:5297
++#: ../src/readelf.c:5290
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+@@ -2274,7 +2265,7 @@ msgid ""
+ msgstr "%s: error al escribir en el desplazamiento %s"
+ 
+ #. Print what we got so far.
+-#: ../src/readelf.c:5349
++#: ../src/readelf.c:5342
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2290,33 +2281,33 @@ msgid ""
+ "Opcodes:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5368
++#: ../src/readelf.c:5361
+ #, c-format
+ msgid "invalid data at offset %tu in section [%zu] '%s'"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5383
++#: ../src/readelf.c:5376
+ #, fuzzy, c-format
+ msgid "  [%*<PRIuFAST8>]  %hhu argument\n"
+ msgid_plural "  [%*<PRIuFAST8>]  %hhu arguments\n"
+ msgstr[0] "argumento inv??lido en"
+ msgstr[1] ""
+ 
+-#: ../src/readelf.c:5391
++#: ../src/readelf.c:5384
+ #, fuzzy
+ msgid ""
+ "\n"
+ "Directory table:"
+ msgstr "Tabla del Cortafuegos:"
+ 
+-#: ../src/readelf.c:5407
++#: ../src/readelf.c:5400
+ msgid ""
+ "\n"
+ "File name table:\n"
+ " Entry Dir   Time      Size      Name"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5436
++#: ../src/readelf.c:5429
+ #, fuzzy
+ msgid ""
+ "\n"
+@@ -2325,94 +2316,94 @@ msgstr ""
+ "\n"
+ " Declaraciones de N??mero de L??nea:\n"
+ 
+-#: ../src/readelf.c:5497
++#: ../src/readelf.c:5490
+ #, c-format
+ msgid " special opcode %u: address+%u = %s, line%+d = %zu\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5517
++#: ../src/readelf.c:5510
+ #, fuzzy, c-format
+ msgid " extended opcode %u: "
+ msgstr "  C??digo de operaci??n extendido %d: "
+ 
+-#: ../src/readelf.c:5522
++#: ../src/readelf.c:5515
+ #, fuzzy
+ msgid "end of sequence"
+ msgstr ""
+ "Fin de la Secuencia\n"
+ "\n"
+ 
+-#: ../src/readelf.c:5537
++#: ../src/readelf.c:5530
+ #, fuzzy, c-format
+ msgid "set address to %s\n"
+ msgstr "La direcci??n de la secci??n %s se estableci?? a "
+ 
+-#: ../src/readelf.c:5558
++#: ../src/readelf.c:5551
+ #, c-format
+ msgid "define new file: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n"
+ msgstr ""
+ 
+ #. Unknown, ignore it.
+-#: ../src/readelf.c:5567
++#: ../src/readelf.c:5560
+ #, fuzzy
+ msgid "unknown opcode"
+ msgstr "c??digo de operaci??n desconocido"
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5579
++#: ../src/readelf.c:5572
+ #, fuzzy
+ msgid " copy"
+ msgstr "&Copiar"
+ 
+-#: ../src/readelf.c:5589
++#: ../src/readelf.c:5582
+ #, fuzzy, c-format
+ msgid "advance address by %u to %s\n"
+ msgstr "  L??nea de Avance por %d para %d\n"
+ 
+-#: ../src/readelf.c:5600
++#: ../src/readelf.c:5593
+ #, fuzzy, c-format
+ msgid " advance line by constant %d to %<PRId64>\n"
+ msgstr "  Avanzar el PC por la constante %lu a 0x%lx\n"
+ 
+-#: ../src/readelf.c:5608
++#: ../src/readelf.c:5601
+ #, fuzzy, c-format
+ msgid " set file to %<PRIu64>\n"
+ msgstr "No se pudieron cambiar permisos del archivo temporal"
+ 
+-#: ../src/readelf.c:5618
++#: ../src/readelf.c:5611
+ #, fuzzy, c-format
+ msgid " set column to %<PRIu64>\n"
+ msgstr "  Establecer la columna a %lu\n"
+ 
+-#: ../src/readelf.c:5625
++#: ../src/readelf.c:5618
+ #, fuzzy, c-format
+ msgid " set '%s' to %<PRIuFAST8>\n"
+ msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5631
++#: ../src/readelf.c:5624
+ #, fuzzy
+ msgid " set basic block flag"
+ msgstr "\t%d registro de cuenta de bloques b??sicos\n"
+ 
+-#: ../src/readelf.c:5641
++#: ../src/readelf.c:5634
+ #, fuzzy, c-format
+ msgid "advance address by constant %u to %s\n"
+ msgstr "  Avanzar el PC por %lu para %lx\n"
+ 
+-#: ../src/readelf.c:5657
++#: ../src/readelf.c:5650
+ #, c-format
+ msgid "advance address by fixed value %u to %s\n"
+ msgstr ""
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5666
++#: ../src/readelf.c:5659
+ #, fuzzy
+ msgid " set prologue end flag"
+ msgstr "  Establecer prologue_end a true\n"
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5671
++#: ../src/readelf.c:5664
+ #, fuzzy
+ msgid " set epilogue begin flag"
+ msgstr "  Establecer epilogue_begin a true\n"
+@@ -2420,45 +2411,45 @@ msgstr "  Establecer epilogue_begin a tr
+ #. This is a new opcode the generator but not we know about.
+ #. Read the parameters associated with it but then discard
+ #. everything.  Read all the parameters for this opcode.
+-#: ../src/readelf.c:5680
++#: ../src/readelf.c:5673
+ #, c-format
+ msgid " unknown opcode with %<PRIu8> parameter:"
+ msgid_plural " unknown opcode with %<PRIu8> parameters:"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
+-#: ../src/readelf.c:5712
++#: ../src/readelf.c:5705
+ #, c-format
+ msgid "cannot get .debug_loc content: %s"
+ msgstr ""
+ 
+ #. First entry in a list.
+-#: ../src/readelf.c:5767
++#: ../src/readelf.c:5760
+ #, c-format
+ msgid " [%6tx]  %s..%s"
+ msgstr " [%6tx]  %s..%s"
+ 
+-#: ../src/readelf.c:5769
++#: ../src/readelf.c:5762
+ #, c-format
+ msgid "           %s..%s"
+ msgstr "           %s..%s"
+ 
+-#: ../src/readelf.c:5822
++#: ../src/readelf.c:5815
+ #, c-format
+ msgid "cannot get macro information section data: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5901
++#: ../src/readelf.c:5894
+ #, c-format
+ msgid "%*s*** non-terminated string at end of section"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5969
++#: ../src/readelf.c:5962
+ #, c-format
+ msgid " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, name: %s\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6008
++#: ../src/readelf.c:6001
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2466,48 +2457,48 @@ msgid ""
+ " %*s  String\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6022
++#: ../src/readelf.c:6015
+ #, fuzzy, c-format
+ msgid " *** error while reading strings: %s\n"
+ msgstr "Error al leer el disco."
+ 
+-#: ../src/readelf.c:6042
++#: ../src/readelf.c:6035
+ #, c-format
+ msgid ""
+ "\n"
+ "Call frame search table section [%2zu] '.eh_frame_hdr':\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6144
++#: ../src/readelf.c:6137
+ #, c-format
+ msgid ""
+ "\n"
+ "Exception handling table section [%2zu] '.gcc_except_table':\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6167
++#: ../src/readelf.c:6160
+ #, fuzzy, c-format
+ msgid " LPStart encoding:    %#x "
+ msgstr ": codificaci??n desconocida"
+ 
+-#: ../src/readelf.c:6179
++#: ../src/readelf.c:6172
+ #, fuzzy, c-format
+ msgid " TType encoding:      %#x "
+ msgstr ": codificaci??n desconocida"
+ 
+-#: ../src/readelf.c:6193
++#: ../src/readelf.c:6186
+ #, fuzzy, c-format
+ msgid " Call site encoding:  %#x "
+ msgstr "Codificaci??n en una sola pasada"
+ 
+-#: ../src/readelf.c:6206
++#: ../src/readelf.c:6199
+ #, fuzzy
+ msgid ""
+ "\n"
+ " Call site table:"
+ msgstr "[<tipo>:][<tabla>:]<nombre_de_archivo>"
+ 
+-#: ../src/readelf.c:6220
++#: ../src/readelf.c:6213
+ #, c-format
+ msgid ""
+ " [%4u] Call site start:   %#<PRIx64>\n"
+@@ -2516,146 +2507,142 @@ msgid ""
+ "        Action:            %u\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6280
++#: ../src/readelf.c:6273
+ #, fuzzy, c-format
+ msgid "invalid TType encoding"
+ msgstr "especificada una codificaci??n inv??lida"
+ 
+-#: ../src/readelf.c:6303
++#: ../src/readelf.c:6296
+ #, c-format
+ msgid "cannot get debug context descriptor: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6438
+-#: ../src/readelf.c:7016
++#: ../src/readelf.c:6431
++#: ../src/readelf.c:7009
+ #, c-format
+ msgid "cannot convert core note data: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6743
++#: ../src/readelf.c:6736
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "%*s... <repeats %u more times> ..."
+ msgstr "Mostrar horas del d??a."
+ 
+-#: ../src/readelf.c:6785
++#: ../src/readelf.c:6778
+ #, fuzzy, c-format
+ msgid "unable to handle register number %d"
+ msgstr "No se puede asignar un n??mero de partici??n."
+ 
+-#: ../src/readelf.c:6932
+-#, fuzzy, c-format
+-msgid "cannot get register info: %s"
+-msgstr "No se pudo registrar el servicio"
+-
+-#: ../src/readelf.c:6956
++#: ../src/readelf.c:6925
++#: ../src/readelf.c:6949
+ #, fuzzy, c-format
+ msgid "cannot register info: %s"
+ msgstr "No se pudo registrar el servicio"
+ 
+-#: ../src/readelf.c:7114
++#: ../src/readelf.c:7107
+ #, fuzzy
+ msgid "  Owner          Data size  Type\n"
+ msgstr "Escribir un tama??o en puntos."
+ 
+-#: ../src/readelf.c:7132
++#: ../src/readelf.c:7125
+ #, fuzzy, c-format
+ msgid "  %-13.*s  %9<PRId32>  %s\n"
+ msgstr "13 lugares"
+ 
+-#: ../src/readelf.c:7163
++#: ../src/readelf.c:7156
+ #, fuzzy, c-format
+ msgid "cannot get content of note section: %s"
+ msgstr "%C: No se puede obtener el contenido de la secci??n - excepci??n de auto-importaci??n\n"
+ 
+-#: ../src/readelf.c:7190
++#: ../src/readelf.c:7183
+ #, c-format
+ msgid ""
+ "\n"
+ "Note section [%2zu] '%s' of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7213
++#: ../src/readelf.c:7206
+ #, c-format
+ msgid ""
+ "\n"
+ "Note segment of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7259
++#: ../src/readelf.c:7252
+ #, c-format
+ msgid ""
+ "\n"
+ "Section [%Zu] '%s' has no data to dump.\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7265
+-#: ../src/readelf.c:7287
++#: ../src/readelf.c:7258
++#: ../src/readelf.c:7280
+ #, c-format
+ msgid "cannot get data for section [%Zu] '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7269
++#: ../src/readelf.c:7262
+ #, c-format
+ msgid ""
+ "\n"
+ "Hex dump of section [%Zu] '%s', %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7282
++#: ../src/readelf.c:7275
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "Section [%Zu] '%s' is empty.\n"
+ msgstr " La historia de ??rdenes est?? vac??a "
+ 
+-#: ../src/readelf.c:7291
++#: ../src/readelf.c:7284
+ #, c-format
+ msgid ""
+ "\n"
+ "String section [%Zu] '%s' contains %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7338
++#: ../src/readelf.c:7331
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "section [%lu] does not exist"
+ msgstr "El anclaje HTML %s no existe."
+ 
+-#: ../src/readelf.c:7364
++#: ../src/readelf.c:7357
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "section '%s' does not exist"
+ msgstr ": ??el archivo no existe!"
+ 
+-#: ../src/readelf.c:7425
++#: ../src/readelf.c:7418
+ #, fuzzy, c-format
+ msgid "cannot get symbol index of archive '%s': %s"
+ msgstr "%s: no se pueden obtener las direcciones del archivo"
+ 
+-#: ../src/readelf.c:7428
++#: ../src/readelf.c:7421
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "Archive '%s' has no symbol index\n"
+ msgstr "la directiva .ent no tiene s??mbolo"
+ 
+-#: ../src/readelf.c:7432
++#: ../src/readelf.c:7425
+ #, c-format
+ msgid ""
+ "\n"
+ "Index of archive '%s' has %Zu entries:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7450
++#: ../src/readelf.c:7443
+ #, c-format
+ msgid "cannot extract member at offset %Zu in '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7455
++#: ../src/readelf.c:7448
+ #, fuzzy, c-format
+ msgid "Archive member '%s' contains:\n"
+ msgstr "Comprueba si el archivador contiene errores"
+@@ -2828,68 +2815,68 @@ msgstr "%s: no se puede crear un nuevo f
+ msgid "illformed file '%s'"
+ msgstr "Error de archivo"
+ 
+-#: ../src/strip.c:868
+-#: ../src/strip.c:955
++#: ../src/strip.c:867
++#: ../src/strip.c:954
+ #, fuzzy, c-format
+ msgid "while generating output file: %s"
+ msgstr "error al cerrar el fichero de salida"
+ 
+-#: ../src/strip.c:928
+-#: ../src/strip.c:1667
++#: ../src/strip.c:927
++#: ../src/strip.c:1666
+ #, fuzzy, c-format
+ msgid "%s: error while creating ELF header: %s"
+ msgstr "Error al crear el enlace hacia %B."
+ 
+-#: ../src/strip.c:942
++#: ../src/strip.c:941
+ #, fuzzy, c-format
+ msgid "while preparing output for '%s'"
+ msgstr "no se puede abrir `%s' para salida: %s"
+ 
+-#: ../src/strip.c:993
+-#: ../src/strip.c:1049
++#: ../src/strip.c:992
++#: ../src/strip.c:1048
+ #, fuzzy, c-format
+ msgid "while create section header section: %s"
+ msgstr "no se puede crear el encabezado precompilado %s: %m"
+ 
+-#: ../src/strip.c:999
++#: ../src/strip.c:998
+ #, fuzzy, c-format
+ msgid "cannot allocate section data: %s"
+ msgstr "no se puede asignar espacio para los datos del s??mbolo"
+ 
+-#: ../src/strip.c:1058
++#: ../src/strip.c:1057
+ #, fuzzy, c-format
+ msgid "while create section header string table: %s"
+ msgstr "fall?? la asignaci??n de la tabla de cadenas de cabeceras de secci??n"
+ 
+-#: ../src/strip.c:1592
+-#: ../src/strip.c:1689
++#: ../src/strip.c:1591
++#: ../src/strip.c:1688
+ #, fuzzy, c-format
+ msgid "while writing '%s': %s"
+ msgstr "%s: al escribir el resultado %s: %m:"
+ 
+-#: ../src/strip.c:1603
++#: ../src/strip.c:1602
+ #, fuzzy, c-format
+ msgid "while creating '%s'"
+ msgstr "Error al crear thread"
+ 
+-#: ../src/strip.c:1615
++#: ../src/strip.c:1614
+ #, c-format
+ msgid "while computing checksum for debug information"
+ msgstr ""
+ 
+-#: ../src/strip.c:1675
++#: ../src/strip.c:1674
+ #, fuzzy, c-format
+ msgid "%s: error while reading the file: %s"
+ msgstr "Error al leer archivo."
+ 
+-#: ../src/strip.c:1721
+-#: ../src/strip.c:1728
++#: ../src/strip.c:1720
++#: ../src/strip.c:1727
+ #, fuzzy, c-format
+ msgid "error while finishing '%s': %s"
+ msgstr "Error al copiar ??%B??."
+ 
+-#: ../src/strip.c:1751
+-#: ../src/strip.c:1808
++#: ../src/strip.c:1750
++#: ../src/strip.c:1807
+ #, c-format
+ msgid "cannot set access and modification date of '%s'"
+ msgstr ""
+@@ -5184,37 +5171,33 @@ msgstr "Mostrar los nombres de las ??rea
+ msgid "Also show symbol or section names"
+ msgstr ""
+ 
+-#: ../src/addr2line.c:73
+-msgid "Treat addresses as offsets relative to NAME section."
+-msgstr ""
+-
+ #. Short description of program.
+-#: ../src/addr2line.c:84
++#: ../src/addr2line.c:82
+ msgid "Locate source files and line information for ADDRs (in a.out by default)."
+ msgstr ""
+ 
+ #. Strings for arguments in help texts.
+-#: ../src/addr2line.c:88
++#: ../src/addr2line.c:86
+ #, fuzzy
+ msgid "[ADDR...]"
+ msgstr " Dir: "
+ 
+-#: ../src/addr2line.c:405
++#: ../src/addr2line.c:387
+ #, c-format
+ msgid "Section syntax requires exactly one module"
+ msgstr ""
+ 
+-#: ../src/addr2line.c:428
++#: ../src/addr2line.c:410
+ #, c-format
+ msgid "offset %#<PRIxMAX> lies outside section '%s'"
+ msgstr ""
+ 
+-#: ../src/addr2line.c:461
++#: ../src/addr2line.c:428
+ #, fuzzy, c-format
+ msgid "cannot find symbol '%s'"
+ msgstr "no se puede encontrar el preprocesador de C: %s \n"
+ 
+-#: ../src/addr2line.c:466
++#: ../src/addr2line.c:433
+ #, c-format
+ msgid "offset %#<PRIxMAX> lies outside contents of '%s'"
+ msgstr ""
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
-@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
        bool parsed = false;
        int n;
        char *name = NULL;
 -      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
  	  && string[n] == '\0')
- 	{
- 	  /* It was (section)+offset.  This makes sense if there is
-@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
- 		}
- 	    }
- 	}
+ 	parsed = adjust_to_section (name, &addr, dwfl);
 -      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
  	       && string[n] == '\0')
@@ -985,7 +2327,7 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -62,6 +62,8 @@
+@@ -91,6 +91,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -994,7 +2336,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -245,6 +247,11 @@
+@@ -274,6 +276,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -1006,7 +2348,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -496,6 +503,8 @@
+@@ -525,6 +532,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -1015,7 +2357,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -935,6 +944,10 @@
+@@ -964,6 +973,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1026,7 +2368,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1011,6 +1024,10 @@
+@@ -1040,6 +1053,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1037,7 +2379,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1359,6 +1376,11 @@
+@@ -1388,6 +1405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1139,7 +2481,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7436,7 +7436,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7443,7 +7443,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1209,7 +2551,7 @@
      }
  
    /* Open the file.  */
-@@ -1745,7 +1761,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1218,7 +2560,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1802,7 +1818,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -1229,7 +2571,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -95,6 +95,8 @@
+@@ -106,6 +106,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -1238,7 +2580,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -803,6 +805,11 @@
+@@ -814,6 +816,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1281,7 +2623,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -343,6 +343,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1289,7 +2631,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -371,6 +372,7 @@ SHELL = @SHELL@
+@@ -372,6 +373,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1297,7 +2639,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
+@@ -429,10 +431,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- elfutils-robustify.patch	16 Feb 2009 21:56:06 -0000	1.14
+++ elfutils-robustify.patch	24 Apr 2009 20:12:58 -0000	1.15
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -521,6 +521,49 @@
+@@ -529,6 +529,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -790,9 +790,1360 @@
 +#endif
 +
  #endif  /* libelfP.h */
+--- elfutils/po/es.po
++++ elfutils/po/es.po
+@@ -1,14 +1,10 @@
+-# Fedora Spanish Translation of elfutils.
+-# Domingo Becker <domingobecker at gmail.com>, 2009.
+-# H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>, 2009.
+-#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: elfutils\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
+-"POT-Creation-Date: 2009-04-24 14:08+0000\n"
++"POT-Creation-Date: 2009-04-09 14:04+0000\n"
+ "PO-Revision-Date: \n"
+-"Last-Translator: H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>\n"
++"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudio at pereyradiaz.com.ar>\n"
+ "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -19,7 +15,7 @@ msgstr ""
+ #: ../lib/xmalloc.c:65
+ #: ../lib/xmalloc.c:79
+ #: ../src/readelf.c:2703
+-#: ../src/readelf.c:3041
++#: ../src/readelf.c:3038
+ #: ../src/unstrip.c:2086
+ #: ../src/unstrip.c:2294
+ #, c-format
+@@ -60,7 +56,7 @@ msgid "invalid size of destination opera
+ msgstr "tama??o inv??lido del operando destino"
+ 
+ #: ../libelf/elf_error.c:108
+-#: ../src/readelf.c:4592
++#: ../src/readelf.c:4589
+ #, c-format
+ msgid "invalid encoding"
+ msgstr "codificaci??n inv??lida"
+@@ -96,7 +92,7 @@ msgstr "desplazamiento fuera de rango"
+ 
+ #: ../libelf/elf_error.c:136
+ msgid "invalid fmag field in archive header"
+-msgstr "campo fmag no v??lido en el encabezado del archivo"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:140
+ msgid "invalid archive file"
+@@ -136,7 +132,7 @@ msgstr "secci??n inv??lida"
+ 
+ #: ../libelf/elf_error.c:180
+ msgid "executable header not created first"
+-msgstr "no se ha creado primero el encabezado ejecutable"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:184
+ msgid "file descriptor disabled"
+@@ -159,8 +155,8 @@ msgid "invalid section header"
+ msgstr "cabecera de secci??n inv??lida"
+ 
+ #: ../libelf/elf_error.c:208
+-#: ../src/readelf.c:6062
+-#: ../src/readelf.c:6163
++#: ../src/readelf.c:6055
++#: ../src/readelf.c:6156
+ #, c-format
+ msgid "invalid data"
+ msgstr "datos inv??lidos"
+@@ -171,7 +167,7 @@ msgstr "codificaci??n de caracteres desc
+ 
+ #: ../libelf/elf_error.c:216
+ msgid "section `sh_size' too small for data"
+-msgstr "el tama??o de la secci??n `sh_size' es demasiado peque??o para los datos "
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:220
+ msgid "invalid section alignment"
+@@ -183,7 +179,7 @@ msgstr "tama??o de la entrada de la secc
+ 
+ #: ../libelf/elf_error.c:228
+ msgid "update() for write on read-only file"
+-msgstr "update() para escribir sobre archivo de s??lo lectura"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:232
+ msgid "no such file"
+@@ -191,11 +187,11 @@ msgstr "no hay tal archivo"
+ 
+ #: ../libelf/elf_error.c:236
+ msgid "only relocatable files can contain section groups"
+-msgstr "solo los archivos realojables pueden contener grupos de secci??n"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:241
+ msgid "program header only allowed in executables, shared objects, and core files"
+-msgstr "los encabezados de los programas solo son permitidos en archivos ejecutables, archivos principales, u objetos compartidos"
++msgstr ""
+ 
+ #: ../libelf/elf_error.c:248
+ msgid "file has no program header"
+@@ -415,19 +411,19 @@ msgstr "directorio NULL en find_file"
+ 
+ #: ../libdwfl/argp-std.c:70
+ msgid "Find addresses from signatures found in COREFILE"
+-msgstr "Busca direcciones desde firmas encontradas en COREFILE"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:72
+ msgid "Find addresses in files mapped into process PID"
+-msgstr "Busca direcciones en archivos mapeados sobre procesos PID"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:74
+ msgid "Find addresses in files mapped as read from FILE in Linux /proc/PID/maps format"
+-msgstr "Busca direcciones en archivos mapeados como le??dos desde FILE en formato Linux /proc/PID/maps"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:76
+ msgid "Find addresses in the running kernel"
+-msgstr "Busca direcciones en el kernel que est?? ejecut??ndose"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:78
+ #, fuzzy
+@@ -436,7 +432,7 @@ msgstr "Reemplazar todos los &espacios c
+ 
+ #: ../libdwfl/argp-std.c:80
+ msgid "Search path for separate debuginfo files"
+-msgstr "Busca caminos para deferentes arhivos debugingfo"
++msgstr ""
+ 
+ #: ../libdwfl/argp-std.c:163
+ #, fuzzy
+@@ -635,7 +631,7 @@ msgstr "`N' s??lo tiene significado con 
+ #: ../src/ar.c:197
+ #, c-format
+ msgid "MEMBER parameter required for 'a', 'b', and 'i' modifiers"
+-msgstr "Los modificadres 'a', 'b', e 'i', requieren par??metros MEMBR"
++msgstr ""
+ 
+ #: ../src/ar.c:213
+ #, fuzzy, c-format
+@@ -669,7 +665,7 @@ msgstr "%s: se requiere un nombre de se?
+ #: ../src/strip.c:203
+ #: ../src/ld.c:957
+ #: ../src/elflint.c:238
+-#: ../src/addr2line.c:185
++#: ../src/addr2line.c:180
+ #: ../src/findtextrel.c:170
+ #: ../src/elfcmp.c:522
+ #: ../src/ranlib.c:136
+@@ -682,9 +678,6 @@ msgid ""
+ "This is free software; see the source for copying conditions.  There is NO\n"
+ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+ msgstr ""
+-"Copyright (C) %s Red Hat, Inc.\n"
+-"El siguiente es un software libre; consulte el c??digo para conocer las condiciones de copiado. NO TIENE\n"
+-"garant??a, ni siquiera para SU COMERCIALIZACION o PARA SER USADO CON UN FIN DETERMINADO.\n"
+ 
+ #: ../src/ar.c:294
+ #: ../src/nm.c:258
+@@ -693,7 +686,7 @@ msgstr ""
+ #: ../src/strip.c:208
+ #: ../src/ld.c:962
+ #: ../src/elflint.c:243
+-#: ../src/addr2line.c:190
++#: ../src/addr2line.c:185
+ #: ../src/findtextrel.c:175
+ #: ../src/elfcmp.c:527
+ #: ../src/ranlib.c:141
+@@ -867,7 +860,7 @@ msgstr "Extra??amente s??lo hay %d parti
+ 
+ #: ../src/nm.c:79
+ msgid "Display dynamic symbols instead of normal symbols"
+-msgstr "Muestra s??mbolos din??micos en lugar de s??mbolos normales"
++msgstr ""
+ 
+ #: ../src/nm.c:80
+ #, fuzzy
+@@ -881,7 +874,7 @@ msgstr "Mostrar s??lo cuando el adaptado
+ 
+ #: ../src/nm.c:83
+ msgid "Include index for symbols from archive members"
+-msgstr "Incluye ??ndices para s??mbolos desde miembros de archivo"
++msgstr ""
+ 
+ #: ../src/nm.c:85
+ #: ../src/size.c:66
+@@ -895,7 +888,7 @@ msgstr "Imprimir el nombre del archivo d
+ 
+ #: ../src/nm.c:90
+ msgid "Use the output format FORMAT.  FORMAT can be `bsd', `sysv' or `posix'.  The default is `sysv'"
+-msgstr "Use el formato de salida FORMAT. FORMAT puede ser o bien `bsd', o `sysv', o `posix'. El establecido por defecto es `sysv'"
++msgstr ""
+ 
+ #: ../src/nm.c:92
+ #, fuzzy
+@@ -910,7 +903,7 @@ msgstr "lo mismo que --format=posix"
+ #: ../src/nm.c:94
+ #: ../src/size.c:72
+ msgid "Use RADIX for printing symbol values"
+-msgstr "Utilice RADIX para imprimir valores de s??mbolo"
++msgstr ""
+ 
+ #: ../src/nm.c:95
+ #, fuzzy
+@@ -946,7 +939,7 @@ msgid "Reverse the sense of the sort"
+ msgstr "_Invertir orden"
+ 
+ #: ../src/nm.c:103
+-#: ../src/addr2line.c:75
++#: ../src/addr2line.c:73
+ #: ../src/findtextrel.c:75
+ #: ../src/elfcmp.c:75
+ #: ../src/strings.c:83
+@@ -1002,7 +995,7 @@ msgstr ""
+ #: ../src/size.c:317
+ #: ../src/size.c:326
+ #: ../src/size.c:337
+-#: ../src/strip.c:1815
++#: ../src/strip.c:1814
+ #, fuzzy, c-format
+ msgid "while closing '%s'"
+ msgstr "error al cerrar la entrada `%s'"
+@@ -1065,17 +1058,17 @@ msgstr "No se puede crear el componente 
+ #: ../src/readelf.c:2722
+ #: ../src/readelf.c:2758
+ #: ../src/readelf.c:2820
+-#: ../src/readelf.c:6312
+-#: ../src/readelf.c:7178
+-#: ../src/readelf.c:7323
+-#: ../src/readelf.c:7392
++#: ../src/readelf.c:6305
++#: ../src/readelf.c:7171
++#: ../src/readelf.c:7316
++#: ../src/readelf.c:7385
+ #: ../src/size.c:425
+ #: ../src/size.c:499
+ #: ../src/strip.c:482
+ #: ../src/objdump.c:744
+-#, fuzzy, c-format
++#, c-format
+ msgid "cannot get section header string table index"
+-msgstr "no se puede obtener ??ndice de la tabla de la cadena del encabezado de secci??n"
++msgstr ""
+ 
+ #: ../src/nm.c:766
+ #, fuzzy, c-format
+@@ -1114,7 +1107,7 @@ msgstr "no se reconoce el tipo de secci?
+ #: ../src/nm.c:1012
+ #, c-format
+ msgid "%s: entry size in section `%s' is not what we expect"
+-msgstr "%s: el tama??o de la entrada en la secci??n `%s' no es el que esper??bamos "
++msgstr ""
+ 
+ #: ../src/nm.c:1016
+ #, fuzzy, c-format
+@@ -1148,9 +1141,8 @@ msgid "Display the ELF file header"
+ msgstr "encabezado del fichero BFD versi??n %s\n"
+ 
+ #: ../src/readelf.c:77
+-#, fuzzy
+ msgid "Display histogram of bucket list lengths"
+-msgstr "Muestra histograma de la longitud de las listas de almacenamiento"
++msgstr ""
+ 
+ #: ../src/readelf.c:78
+ #, fuzzy
+@@ -1182,9 +1174,8 @@ msgid "Display versioning information"
+ msgstr "Mostrar la informaci??n de la versi??n."
+ 
+ #: ../src/readelf.c:86
+-#, fuzzy
+ msgid "Display DWARF section content.  SECTION can be one of abbrev, aranges, frame, info, loc, line, ranges, pubnames, str, macinfo, or exception"
+-msgstr "Muestra el contenido de la seccion DWARF. SECTION puede ser algo de lo siguiente: abbrev, aranges, frame, info, loc, line, ranges, pubnames, str, macinfo, or exception"
++msgstr ""
+ 
+ #: ../src/readelf.c:89
+ #, fuzzy
+@@ -1193,11 +1184,11 @@ msgstr "_Ocultar notas"
+ 
+ #: ../src/readelf.c:91
+ msgid "Display architecture specific information (if any)"
+-msgstr "Muestra informaci??n espec??fica de la arquitectura (si es que hubiera)"
++msgstr ""
+ 
+ #: ../src/readelf.c:93
+ msgid "Dump the uninterpreted contents of SECTION, by number or name"
+-msgstr "Descarga los contenidos no interpretados de SECTION, por nombre o n??mero"
++msgstr ""
+ 
+ #: ../src/readelf.c:95
+ #, fuzzy
+@@ -1222,7 +1213,7 @@ msgstr "Control del resultado:"
+ #. Short description of program.
+ #: ../src/readelf.c:108
+ msgid "Print information from ELF file in human-readable form."
+-msgstr "Imprime informaci??n desde el archivo ELF en una forma comprensible para los seres humanos. "
++msgstr ""
+ 
+ #. Strings for arguments in help texts.
+ #: ../src/readelf.c:112
+@@ -1265,7 +1256,7 @@ msgstr "no se puede crear un descriptor 
+ #: ../src/readelf.c:460
+ #, c-format
+ msgid "'%s' is not an archive, cannot print archive index"
+-msgstr "'%s' no es un archivo, no se puede imprimir ??ndice de archivo"
++msgstr ""
+ 
+ #: ../src/readelf.c:465
+ #, fuzzy, c-format
+@@ -1439,22 +1430,22 @@ msgstr "%s (%s bytes)"
+ #: ../src/readelf.c:769
+ #, c-format
+ msgid "  Size of program header entries:    %<PRId16> %s\n"
+-msgstr "  Tama??o de las entradas en el encabezado del programa:    %<PRId16> %s\n"
++msgstr ""
+ 
+ #: ../src/readelf.c:772
+ #, c-format
+ msgid "  Number of program headers entries: %<PRId16>\n"
+-msgstr "  Cantidad de entradas en los encabezados del programa: %<PRId16>\n"
++msgstr ""
+ 
+ #: ../src/readelf.c:775
+ #, c-format
+ msgid "  Size of section header entries:    %<PRId16> %s\n"
+-msgstr "  Tama??o de las entradas en el encabezado de secci??n:    %<PRId16> %s\n"
++msgstr ""
+ 
+ #: ../src/readelf.c:778
+ #, c-format
+ msgid "  Number of section headers entries: %<PRId16>"
+-msgstr "  Cantidad de entradas en los encabezados de secci??n: %<PRId16>"
++msgstr ""
+ 
+ #: ../src/readelf.c:785
+ #, fuzzy, c-format
+@@ -1517,7 +1508,7 @@ msgstr "%s: no se puede encontrar la sec
+ 
+ #: ../src/readelf.c:871
+ #: ../src/readelf.c:1025
+-#: ../src/readelf.c:7343
++#: ../src/readelf.c:7336
+ #: ../src/unstrip.c:352
+ #: ../src/unstrip.c:376
+ #: ../src/unstrip.c:426
+@@ -1914,140 +1905,140 @@ msgstr[1] ""
+ msgid "       Library                       Time Stamp          Checksum Version Flags"
+ msgstr ""
+ 
+-#: ../src/readelf.c:2832
++#: ../src/readelf.c:2830
+ #, c-format
+ msgid ""
+ "\n"
+ "Object attributes section [%2zu] '%s' of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:2848
++#: ../src/readelf.c:2846
+ #, fuzzy
+ msgid "  Owner          Size\n"
+ msgstr "  Prop\t\tTama??o datos\tDescripci??n\n"
+ 
+-#: ../src/readelf.c:2874
++#: ../src/readelf.c:2872
+ #, fuzzy, c-format
+ msgid "  %-13s  %4<PRIu32>\n"
+ msgstr "Pedido de servidor desconocida %<PRIu32>"
+ 
+-#: ../src/readelf.c:2906
++#: ../src/readelf.c:2903
+ #, fuzzy, c-format
+ msgid "    %-4u %12<PRIu32>\n"
+ msgstr "12 x 11 in"
+ 
+ #. Tag_File
+-#: ../src/readelf.c:2911
++#: ../src/readelf.c:2908
+ #, fuzzy, c-format
+ msgid "    File: %11<PRIu32>\n"
+ msgstr "10 x 11 in"
+ 
+-#: ../src/readelf.c:2946
++#: ../src/readelf.c:2943
+ #, c-format
+ msgid "      %s: %<PRId64>, %s\n"
+ msgstr "      %s: %<PRId64>, %s\n"
+ 
+-#: ../src/readelf.c:2949
++#: ../src/readelf.c:2946
+ #, c-format
+ msgid "      %s: %<PRId64>\n"
+ msgstr "      %s: %<PRId64>\n"
+ 
+-#: ../src/readelf.c:2952
++#: ../src/readelf.c:2949
+ #, c-format
+ msgid "      %s: %s\n"
+ msgstr "      %s: %s\n"
+ 
+-#: ../src/readelf.c:2959
++#: ../src/readelf.c:2956
+ #, c-format
+ msgid "      %u: %<PRId64>\n"
+ msgstr "      %u: %<PRId64>\n"
+ 
+-#: ../src/readelf.c:2962
++#: ../src/readelf.c:2959
+ #, c-format
+ msgid "      %u: %s\n"
+ msgstr "      %u: %s\n"
+ 
+-#: ../src/readelf.c:2997
++#: ../src/readelf.c:2994
+ #, c-format
+ msgid "%s+%#<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%s+%#<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3000
++#: ../src/readelf.c:2997
+ #, c-format
+ msgid "%s+%#0*<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%s+%#0*<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3005
++#: ../src/readelf.c:3002
+ #, c-format
+ msgid "%#<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%#<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3008
++#: ../src/readelf.c:3005
+ #, c-format
+ msgid "%#0*<PRIx64> <%s+%#<PRIx64>>"
+ msgstr "%#0*<PRIx64> <%s+%#<PRIx64>>"
+ 
+-#: ../src/readelf.c:3014
++#: ../src/readelf.c:3011
+ #, c-format
+ msgid "%s+%#<PRIx64> <%s>"
+ msgstr "%s+%#<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3017
++#: ../src/readelf.c:3014
+ #, c-format
+ msgid "%s+%#0*<PRIx64> <%s>"
+ msgstr "%s+%#0*<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3021
++#: ../src/readelf.c:3018
+ #, c-format
+ msgid "%#<PRIx64> <%s>"
+ msgstr "%#<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3024
++#: ../src/readelf.c:3021
+ #, c-format
+ msgid "%#0*<PRIx64> <%s>"
+ msgstr "%#0*<PRIx64> <%s>"
+ 
+-#: ../src/readelf.c:3029
++#: ../src/readelf.c:3026
+ #, c-format
+ msgid "%s+%#<PRIx64>"
+ msgstr "%s+%#<PRIx64>"
+ 
+-#: ../src/readelf.c:3032
++#: ../src/readelf.c:3029
+ #, c-format
+ msgid "%s+%#0*<PRIx64>"
+ msgstr "%s+%#0*<PRIx64>"
+ 
+-#: ../src/readelf.c:3140
++#: ../src/readelf.c:3137
+ #, fuzzy, c-format
+ msgid "unknown tag %hx"
+ msgstr "l??nea %d: etiqueta desconocida: %s\n"
+ 
+-#: ../src/readelf.c:3142
++#: ../src/readelf.c:3139
+ #, fuzzy, c-format
+ msgid "unknown user tag %hx"
+ msgstr "Valor TAG desconocido: %lx"
+ 
+-#: ../src/readelf.c:3352
++#: ../src/readelf.c:3349
+ #, fuzzy, c-format
+ msgid "unknown attribute %hx"
+ msgstr "atributo de secci??n '%c' desconocido"
+ 
+-#: ../src/readelf.c:3355
++#: ../src/readelf.c:3352
+ #, fuzzy, c-format
+ msgid "unknown user attribute %hx"
+ msgstr "Nombres de atributos de usuario predeterminados:\n"
+ 
+-#: ../src/readelf.c:3401
++#: ../src/readelf.c:3398
+ #, fuzzy, c-format
+ msgid "unknown form %<PRIx64>"
+ msgstr "Valor FORM desconocido: %lx"
+ 
+-#: ../src/readelf.c:4017
++#: ../src/readelf.c:4014
+ #, fuzzy, c-format
+ msgid "%*s[%4<PRIuMAX>] %s  <TRUNCATED>\n"
+ msgstr "Fichero truncado"
+ 
+-#: ../src/readelf.c:4030
++#: ../src/readelf.c:4027
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2055,39 +2046,39 @@ msgid ""
+ " [ Code]\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4037
++#: ../src/readelf.c:4034
+ #, c-format
+ msgid ""
+ "\n"
+ "Abbreviation section at offset %<PRIu64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4050
++#: ../src/readelf.c:4047
+ #, fuzzy, c-format
+ msgid " *** error while reading abbreviation: %s\n"
+ msgstr "Error al leer el disco."
+ 
+-#: ../src/readelf.c:4066
++#: ../src/readelf.c:4063
+ #, c-format
+ msgid " [%5u] offset: %<PRId64>, children: %s, tag: %s\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4069
++#: ../src/readelf.c:4066
+ #, fuzzy
+ msgid "yes"
+ msgstr "s??"
+ 
+-#: ../src/readelf.c:4069
++#: ../src/readelf.c:4066
+ #, fuzzy
+ msgid "no"
+ msgstr "no"
+ 
+-#: ../src/readelf.c:4105
++#: ../src/readelf.c:4102
+ #, c-format
+ msgid "cannot get .debug_aranges content: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4110
++#: ../src/readelf.c:4107
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2098,130 +2089,130 @@ msgid_plural ""
+ msgstr[0] ""
+ msgstr[1] ""
+ 
+-#: ../src/readelf.c:4140
++#: ../src/readelf.c:4137
+ #, c-format
+ msgid " [%*zu] ???\n"
+ msgstr " [%*zu] ???\n"
+ 
+-#: ../src/readelf.c:4142
++#: ../src/readelf.c:4139
+ #, c-format
+ msgid " [%*zu] start: %0#*<PRIx64>, length: %5<PRIu64>, CU DIE offset: %6<PRId64>\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4161
++#: ../src/readelf.c:4158
+ #, c-format
+ msgid "cannot get .debug_ranges content: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4166
+-#: ../src/readelf.c:4623
+-#: ../src/readelf.c:5272
+-#: ../src/readelf.c:5717
+-#: ../src/readelf.c:5812
+-#: ../src/readelf.c:5984
++#: ../src/readelf.c:4163
++#: ../src/readelf.c:4620
++#: ../src/readelf.c:5265
++#: ../src/readelf.c:5710
++#: ../src/readelf.c:5805
++#: ../src/readelf.c:5977
+ #, c-format
+ msgid ""
+ "\n"
+ "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4180
+-#: ../src/readelf.c:5731
++#: ../src/readelf.c:4177
++#: ../src/readelf.c:5724
+ #, fuzzy, c-format
+ msgid " [%6tx]  <INVALID DATA>\n"
+ msgstr "%F%P: declaraci??n inv??lida de datos\n"
+ 
+-#: ../src/readelf.c:4202
+-#: ../src/readelf.c:5753
++#: ../src/readelf.c:4199
++#: ../src/readelf.c:5746
+ #, fuzzy, c-format
+ msgid " [%6tx]  base address %s\n"
+ msgstr "    %8.8lx %8.8lx %8.8lx (direcci??n base)\n"
+ 
+ #. We have an address range entry.
+ #. First address range entry in a list.
+-#: ../src/readelf.c:4213
++#: ../src/readelf.c:4210
+ #, c-format
+ msgid " [%6tx]  %s..%s\n"
+ msgstr " [%6tx]  %s..%s\n"
+ 
+-#: ../src/readelf.c:4215
++#: ../src/readelf.c:4212
+ #, c-format
+ msgid "           %s..%s\n"
+ msgstr "           %s..%s\n"
+ 
+-#: ../src/readelf.c:4612
+-#: ../src/readelf.c:6050
+-#: ../src/readelf.c:6152
++#: ../src/readelf.c:4609
++#: ../src/readelf.c:6043
++#: ../src/readelf.c:6145
+ #, fuzzy, c-format
+ msgid "cannot get %s content: %s"
+ msgstr "No se puede obtener el nombre de la m??quina (hostname)"
+ 
+-#: ../src/readelf.c:4619
++#: ../src/readelf.c:4616
+ #, c-format
+ msgid ""
+ "\n"
+ "Call frame information section [%2zu] '%s' at offset %#<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:4646
+-#: ../src/readelf.c:5306
++#: ../src/readelf.c:4643
++#: ../src/readelf.c:5299
+ #, fuzzy, c-format
+ msgid "invalid data in section [%zu] '%s'"
+ msgstr "La secci??n BOUNDS en el archivo no es v??lida."
+ 
+-#: ../src/readelf.c:4668
++#: ../src/readelf.c:4665
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ " [%6tx] Zero terminator\n"
+ msgstr "terminador de linea desconocido"
+ 
+-#: ../src/readelf.c:4746
++#: ../src/readelf.c:4739
+ #, fuzzy
+ msgid "FDE address encoding: "
+ msgstr "Codificaci??n en una sola pasada"
+ 
+-#: ../src/readelf.c:4752
++#: ../src/readelf.c:4745
+ #, fuzzy
+ msgid "LSDA pointer encoding: "
+ msgstr "Codificaci??n en una sola pasada"
+ 
+-#: ../src/readelf.c:4797
++#: ../src/readelf.c:4790
+ #, fuzzy, c-format
+ msgid "invalid augmentation encoding"
+ msgstr "especificada una codificaci??n inv??lida"
+ 
+-#: ../src/readelf.c:4868
++#: ../src/readelf.c:4861
+ #, fuzzy, c-format
+ msgid " (offset: %#<PRIx64>)"
+ msgstr "Desplazamiento horizontal"
+ 
+-#: ../src/readelf.c:4875
++#: ../src/readelf.c:4868
+ #, fuzzy, c-format
+ msgid " (end offset: %#<PRIx64>)"
+ msgstr "    Desplaz  Inicio   Fin\n"
+ 
+-#: ../src/readelf.c:4902
++#: ../src/readelf.c:4895
+ #, fuzzy, c-format
+ msgid "   %-26sLSDA pointer: %#<PRIx64>\n"
+ msgstr "\tNombre de la Tabla de Punteros \t\t"
+ 
+-#: ../src/readelf.c:4948
++#: ../src/readelf.c:4941
+ #, fuzzy, c-format
+ msgid "cannot get attribute code: %s"
+ msgstr "No se puede inicializar el c??digo de libbonoboui"
+ 
+-#: ../src/readelf.c:4956
++#: ../src/readelf.c:4949
+ #, fuzzy, c-format
+ msgid "cannot get attribute form: %s"
+ msgstr "No se puede a??adir el atributo SMIMEEncKeyPrefs"
+ 
+-#: ../src/readelf.c:4969
++#: ../src/readelf.c:4962
+ #, fuzzy, c-format
+ msgid "cannot get attribute value: %s"
+ msgstr "No se puede a??adir el atributo SMIMEEncKeyPrefs"
+ 
+-#: ../src/readelf.c:5151
++#: ../src/readelf.c:5144
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2229,44 +2220,44 @@ msgid ""
+ " [Offset]\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5176
++#: ../src/readelf.c:5169
+ #, c-format
+ msgid ""
+ " Compilation unit at offset %<PRIu64>:\n"
+ " Version: %<PRIu16>, Abbreviation section offset: %<PRIu64>, Address size: %<PRIu8>, Offset size: %<PRIu8>\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5194
++#: ../src/readelf.c:5187
+ #, c-format
+ msgid "cannot get DIE at offset %<PRIu64> in section '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5205
++#: ../src/readelf.c:5198
+ #, fuzzy, c-format
+ msgid "cannot get DIE offset: %s"
+ msgstr "%s: no se puede desplazar a la posici??n %s"
+ 
+-#: ../src/readelf.c:5213
++#: ../src/readelf.c:5206
+ #, c-format
+ msgid "cannot get tag of DIE at offset %<PRIu64> in section '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5242
++#: ../src/readelf.c:5235
+ #, fuzzy, c-format
+ msgid "cannot get next DIE: %s\n"
+ msgstr "No se puede obtener el nombre oficial de la m??quina (hostname)"
+ 
+-#: ../src/readelf.c:5249
++#: ../src/readelf.c:5242
+ #, fuzzy, c-format
+ msgid "cannot get next DIE: %s"
+ msgstr "No se puede obtener el nombre oficial de la m??quina (hostname)"
+ 
+-#: ../src/readelf.c:5284
++#: ../src/readelf.c:5277
+ #, fuzzy, c-format
+ msgid "cannot get line data section data: %s"
+ msgstr "%C: No se puede obtener el contenido de la secci??n - excepci??n de auto-importaci??n\n"
+ 
+-#: ../src/readelf.c:5297
++#: ../src/readelf.c:5290
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+@@ -2274,7 +2265,7 @@ msgid ""
+ msgstr "%s: error al escribir en el desplazamiento %s"
+ 
+ #. Print what we got so far.
+-#: ../src/readelf.c:5349
++#: ../src/readelf.c:5342
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2290,33 +2281,33 @@ msgid ""
+ "Opcodes:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5368
++#: ../src/readelf.c:5361
+ #, c-format
+ msgid "invalid data at offset %tu in section [%zu] '%s'"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5383
++#: ../src/readelf.c:5376
+ #, fuzzy, c-format
+ msgid "  [%*<PRIuFAST8>]  %hhu argument\n"
+ msgid_plural "  [%*<PRIuFAST8>]  %hhu arguments\n"
+ msgstr[0] "argumento inv??lido en"
+ msgstr[1] ""
+ 
+-#: ../src/readelf.c:5391
++#: ../src/readelf.c:5384
+ #, fuzzy
+ msgid ""
+ "\n"
+ "Directory table:"
+ msgstr "Tabla del Cortafuegos:"
+ 
+-#: ../src/readelf.c:5407
++#: ../src/readelf.c:5400
+ msgid ""
+ "\n"
+ "File name table:\n"
+ " Entry Dir   Time      Size      Name"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5436
++#: ../src/readelf.c:5429
+ #, fuzzy
+ msgid ""
+ "\n"
+@@ -2325,94 +2316,94 @@ msgstr ""
+ "\n"
+ " Declaraciones de N??mero de L??nea:\n"
+ 
+-#: ../src/readelf.c:5497
++#: ../src/readelf.c:5490
+ #, c-format
+ msgid " special opcode %u: address+%u = %s, line%+d = %zu\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5517
++#: ../src/readelf.c:5510
+ #, fuzzy, c-format
+ msgid " extended opcode %u: "
+ msgstr "  C??digo de operaci??n extendido %d: "
+ 
+-#: ../src/readelf.c:5522
++#: ../src/readelf.c:5515
+ #, fuzzy
+ msgid "end of sequence"
+ msgstr ""
+ "Fin de la Secuencia\n"
+ "\n"
+ 
+-#: ../src/readelf.c:5537
++#: ../src/readelf.c:5530
+ #, fuzzy, c-format
+ msgid "set address to %s\n"
+ msgstr "La direcci??n de la secci??n %s se estableci?? a "
+ 
+-#: ../src/readelf.c:5558
++#: ../src/readelf.c:5551
+ #, c-format
+ msgid "define new file: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n"
+ msgstr ""
+ 
+ #. Unknown, ignore it.
+-#: ../src/readelf.c:5567
++#: ../src/readelf.c:5560
+ #, fuzzy
+ msgid "unknown opcode"
+ msgstr "c??digo de operaci??n desconocido"
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5579
++#: ../src/readelf.c:5572
+ #, fuzzy
+ msgid " copy"
+ msgstr "&Copiar"
+ 
+-#: ../src/readelf.c:5589
++#: ../src/readelf.c:5582
+ #, fuzzy, c-format
+ msgid "advance address by %u to %s\n"
+ msgstr "  L??nea de Avance por %d para %d\n"
+ 
+-#: ../src/readelf.c:5600
++#: ../src/readelf.c:5593
+ #, fuzzy, c-format
+ msgid " advance line by constant %d to %<PRId64>\n"
+ msgstr "  Avanzar el PC por la constante %lu a 0x%lx\n"
+ 
+-#: ../src/readelf.c:5608
++#: ../src/readelf.c:5601
+ #, fuzzy, c-format
+ msgid " set file to %<PRIu64>\n"
+ msgstr "No se pudieron cambiar permisos del archivo temporal"
+ 
+-#: ../src/readelf.c:5618
++#: ../src/readelf.c:5611
+ #, fuzzy, c-format
+ msgid " set column to %<PRIu64>\n"
+ msgstr "  Establecer la columna a %lu\n"
+ 
+-#: ../src/readelf.c:5625
++#: ../src/readelf.c:5618
+ #, fuzzy, c-format
+ msgid " set '%s' to %<PRIuFAST8>\n"
+ msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5631
++#: ../src/readelf.c:5624
+ #, fuzzy
+ msgid " set basic block flag"
+ msgstr "\t%d registro de cuenta de bloques b??sicos\n"
+ 
+-#: ../src/readelf.c:5641
++#: ../src/readelf.c:5634
+ #, fuzzy, c-format
+ msgid "advance address by constant %u to %s\n"
+ msgstr "  Avanzar el PC por %lu para %lx\n"
+ 
+-#: ../src/readelf.c:5657
++#: ../src/readelf.c:5650
+ #, c-format
+ msgid "advance address by fixed value %u to %s\n"
+ msgstr ""
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5666
++#: ../src/readelf.c:5659
+ #, fuzzy
+ msgid " set prologue end flag"
+ msgstr "  Establecer prologue_end a true\n"
+ 
+ #. Takes no argument.
+-#: ../src/readelf.c:5671
++#: ../src/readelf.c:5664
+ #, fuzzy
+ msgid " set epilogue begin flag"
+ msgstr "  Establecer epilogue_begin a true\n"
+@@ -2420,45 +2411,45 @@ msgstr "  Establecer epilogue_begin a tr
+ #. This is a new opcode the generator but not we know about.
+ #. Read the parameters associated with it but then discard
+ #. everything.  Read all the parameters for this opcode.
+-#: ../src/readelf.c:5680
++#: ../src/readelf.c:5673
+ #, c-format
+ msgid " unknown opcode with %<PRIu8> parameter:"
+ msgid_plural " unknown opcode with %<PRIu8> parameters:"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
+-#: ../src/readelf.c:5712
++#: ../src/readelf.c:5705
+ #, c-format
+ msgid "cannot get .debug_loc content: %s"
+ msgstr ""
+ 
+ #. First entry in a list.
+-#: ../src/readelf.c:5767
++#: ../src/readelf.c:5760
+ #, c-format
+ msgid " [%6tx]  %s..%s"
+ msgstr " [%6tx]  %s..%s"
+ 
+-#: ../src/readelf.c:5769
++#: ../src/readelf.c:5762
+ #, c-format
+ msgid "           %s..%s"
+ msgstr "           %s..%s"
+ 
+-#: ../src/readelf.c:5822
++#: ../src/readelf.c:5815
+ #, c-format
+ msgid "cannot get macro information section data: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5901
++#: ../src/readelf.c:5894
+ #, c-format
+ msgid "%*s*** non-terminated string at end of section"
+ msgstr ""
+ 
+-#: ../src/readelf.c:5969
++#: ../src/readelf.c:5962
+ #, c-format
+ msgid " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, name: %s\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6008
++#: ../src/readelf.c:6001
+ #, c-format
+ msgid ""
+ "\n"
+@@ -2466,48 +2457,48 @@ msgid ""
+ " %*s  String\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6022
++#: ../src/readelf.c:6015
+ #, fuzzy, c-format
+ msgid " *** error while reading strings: %s\n"
+ msgstr "Error al leer el disco."
+ 
+-#: ../src/readelf.c:6042
++#: ../src/readelf.c:6035
+ #, c-format
+ msgid ""
+ "\n"
+ "Call frame search table section [%2zu] '.eh_frame_hdr':\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6144
++#: ../src/readelf.c:6137
+ #, c-format
+ msgid ""
+ "\n"
+ "Exception handling table section [%2zu] '.gcc_except_table':\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6167
++#: ../src/readelf.c:6160
+ #, fuzzy, c-format
+ msgid " LPStart encoding:    %#x "
+ msgstr ": codificaci??n desconocida"
+ 
+-#: ../src/readelf.c:6179
++#: ../src/readelf.c:6172
+ #, fuzzy, c-format
+ msgid " TType encoding:      %#x "
+ msgstr ": codificaci??n desconocida"
+ 
+-#: ../src/readelf.c:6193
++#: ../src/readelf.c:6186
+ #, fuzzy, c-format
+ msgid " Call site encoding:  %#x "
+ msgstr "Codificaci??n en una sola pasada"
+ 
+-#: ../src/readelf.c:6206
++#: ../src/readelf.c:6199
+ #, fuzzy
+ msgid ""
+ "\n"
+ " Call site table:"
+ msgstr "[<tipo>:][<tabla>:]<nombre_de_archivo>"
+ 
+-#: ../src/readelf.c:6220
++#: ../src/readelf.c:6213
+ #, c-format
+ msgid ""
+ " [%4u] Call site start:   %#<PRIx64>\n"
+@@ -2516,146 +2507,142 @@ msgid ""
+ "        Action:            %u\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6280
++#: ../src/readelf.c:6273
+ #, fuzzy, c-format
+ msgid "invalid TType encoding"
+ msgstr "especificada una codificaci??n inv??lida"
+ 
+-#: ../src/readelf.c:6303
++#: ../src/readelf.c:6296
+ #, c-format
+ msgid "cannot get debug context descriptor: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6438
+-#: ../src/readelf.c:7016
++#: ../src/readelf.c:6431
++#: ../src/readelf.c:7009
+ #, c-format
+ msgid "cannot convert core note data: %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:6743
++#: ../src/readelf.c:6736
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "%*s... <repeats %u more times> ..."
+ msgstr "Mostrar horas del d??a."
+ 
+-#: ../src/readelf.c:6785
++#: ../src/readelf.c:6778
+ #, fuzzy, c-format
+ msgid "unable to handle register number %d"
+ msgstr "No se puede asignar un n??mero de partici??n."
+ 
+-#: ../src/readelf.c:6932
+-#, fuzzy, c-format
+-msgid "cannot get register info: %s"
+-msgstr "No se pudo registrar el servicio"
+-
+-#: ../src/readelf.c:6956
++#: ../src/readelf.c:6925
++#: ../src/readelf.c:6949
+ #, fuzzy, c-format
+ msgid "cannot register info: %s"
+ msgstr "No se pudo registrar el servicio"
+ 
+-#: ../src/readelf.c:7114
++#: ../src/readelf.c:7107
+ #, fuzzy
+ msgid "  Owner          Data size  Type\n"
+ msgstr "Escribir un tama??o en puntos."
+ 
+-#: ../src/readelf.c:7132
++#: ../src/readelf.c:7125
+ #, fuzzy, c-format
+ msgid "  %-13.*s  %9<PRId32>  %s\n"
+ msgstr "13 lugares"
+ 
+-#: ../src/readelf.c:7163
++#: ../src/readelf.c:7156
+ #, fuzzy, c-format
+ msgid "cannot get content of note section: %s"
+ msgstr "%C: No se puede obtener el contenido de la secci??n - excepci??n de auto-importaci??n\n"
+ 
+-#: ../src/readelf.c:7190
++#: ../src/readelf.c:7183
+ #, c-format
+ msgid ""
+ "\n"
+ "Note section [%2zu] '%s' of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7213
++#: ../src/readelf.c:7206
+ #, c-format
+ msgid ""
+ "\n"
+ "Note segment of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7259
++#: ../src/readelf.c:7252
+ #, c-format
+ msgid ""
+ "\n"
+ "Section [%Zu] '%s' has no data to dump.\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7265
+-#: ../src/readelf.c:7287
++#: ../src/readelf.c:7258
++#: ../src/readelf.c:7280
+ #, c-format
+ msgid "cannot get data for section [%Zu] '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7269
++#: ../src/readelf.c:7262
+ #, c-format
+ msgid ""
+ "\n"
+ "Hex dump of section [%Zu] '%s', %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7282
++#: ../src/readelf.c:7275
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "Section [%Zu] '%s' is empty.\n"
+ msgstr " La historia de ??rdenes est?? vac??a "
+ 
+-#: ../src/readelf.c:7291
++#: ../src/readelf.c:7284
+ #, c-format
+ msgid ""
+ "\n"
+ "String section [%Zu] '%s' contains %<PRIu64> bytes at offset %#0<PRIx64>:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7338
++#: ../src/readelf.c:7331
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "section [%lu] does not exist"
+ msgstr "El anclaje HTML %s no existe."
+ 
+-#: ../src/readelf.c:7364
++#: ../src/readelf.c:7357
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "section '%s' does not exist"
+ msgstr ": ??el archivo no existe!"
+ 
+-#: ../src/readelf.c:7425
++#: ../src/readelf.c:7418
+ #, fuzzy, c-format
+ msgid "cannot get symbol index of archive '%s': %s"
+ msgstr "%s: no se pueden obtener las direcciones del archivo"
+ 
+-#: ../src/readelf.c:7428
++#: ../src/readelf.c:7421
+ #, fuzzy, c-format
+ msgid ""
+ "\n"
+ "Archive '%s' has no symbol index\n"
+ msgstr "la directiva .ent no tiene s??mbolo"
+ 
+-#: ../src/readelf.c:7432
++#: ../src/readelf.c:7425
+ #, c-format
+ msgid ""
+ "\n"
+ "Index of archive '%s' has %Zu entries:\n"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7450
++#: ../src/readelf.c:7443
+ #, c-format
+ msgid "cannot extract member at offset %Zu in '%s': %s"
+ msgstr ""
+ 
+-#: ../src/readelf.c:7455
++#: ../src/readelf.c:7448
+ #, fuzzy, c-format
+ msgid "Archive member '%s' contains:\n"
+ msgstr "Comprueba si el archivador contiene errores"
+@@ -2828,68 +2815,68 @@ msgstr "%s: no se puede crear un nuevo f
+ msgid "illformed file '%s'"
+ msgstr "Error de archivo"
+ 
+-#: ../src/strip.c:868
+-#: ../src/strip.c:955
++#: ../src/strip.c:867
++#: ../src/strip.c:954
+ #, fuzzy, c-format
+ msgid "while generating output file: %s"
+ msgstr "error al cerrar el fichero de salida"
+ 
+-#: ../src/strip.c:928
+-#: ../src/strip.c:1667
++#: ../src/strip.c:927
++#: ../src/strip.c:1666
+ #, fuzzy, c-format
+ msgid "%s: error while creating ELF header: %s"
+ msgstr "Error al crear el enlace hacia %B."
+ 
+-#: ../src/strip.c:942
++#: ../src/strip.c:941
+ #, fuzzy, c-format
+ msgid "while preparing output for '%s'"
+ msgstr "no se puede abrir `%s' para salida: %s"
+ 
+-#: ../src/strip.c:993
+-#: ../src/strip.c:1049
++#: ../src/strip.c:992
++#: ../src/strip.c:1048
+ #, fuzzy, c-format
+ msgid "while create section header section: %s"
+ msgstr "no se puede crear el encabezado precompilado %s: %m"
+ 
+-#: ../src/strip.c:999
++#: ../src/strip.c:998
+ #, fuzzy, c-format
+ msgid "cannot allocate section data: %s"
+ msgstr "no se puede asignar espacio para los datos del s??mbolo"
+ 
+-#: ../src/strip.c:1058
++#: ../src/strip.c:1057
+ #, fuzzy, c-format
+ msgid "while create section header string table: %s"
+ msgstr "fall?? la asignaci??n de la tabla de cadenas de cabeceras de secci??n"
+ 
+-#: ../src/strip.c:1592
+-#: ../src/strip.c:1689
++#: ../src/strip.c:1591
++#: ../src/strip.c:1688
+ #, fuzzy, c-format
+ msgid "while writing '%s': %s"
+ msgstr "%s: al escribir el resultado %s: %m:"
+ 
+-#: ../src/strip.c:1603
++#: ../src/strip.c:1602
+ #, fuzzy, c-format
+ msgid "while creating '%s'"
+ msgstr "Error al crear thread"
+ 
+-#: ../src/strip.c:1615
++#: ../src/strip.c:1614
+ #, c-format
+ msgid "while computing checksum for debug information"
+ msgstr ""
+ 
+-#: ../src/strip.c:1675
++#: ../src/strip.c:1674
+ #, fuzzy, c-format
+ msgid "%s: error while reading the file: %s"
+ msgstr "Error al leer archivo."
+ 
+-#: ../src/strip.c:1721
+-#: ../src/strip.c:1728
++#: ../src/strip.c:1720
++#: ../src/strip.c:1727
+ #, fuzzy, c-format
+ msgid "error while finishing '%s': %s"
+ msgstr "Error al copiar ??%B??."
+ 
+-#: ../src/strip.c:1751
+-#: ../src/strip.c:1808
++#: ../src/strip.c:1750
++#: ../src/strip.c:1807
+ #, c-format
+ msgid "cannot set access and modification date of '%s'"
+ msgstr ""
+@@ -5184,37 +5171,33 @@ msgstr "Mostrar los nombres de las ??rea
+ msgid "Also show symbol or section names"
+ msgstr ""
+ 
+-#: ../src/addr2line.c:73
+-msgid "Treat addresses as offsets relative to NAME section."
+-msgstr ""
+-
+ #. Short description of program.
+-#: ../src/addr2line.c:84
++#: ../src/addr2line.c:82
+ msgid "Locate source files and line information for ADDRs (in a.out by default)."
+ msgstr ""
+ 
+ #. Strings for arguments in help texts.
+-#: ../src/addr2line.c:88
++#: ../src/addr2line.c:86
+ #, fuzzy
+ msgid "[ADDR...]"
+ msgstr " Dir: "
+ 
+-#: ../src/addr2line.c:405
++#: ../src/addr2line.c:387
+ #, c-format
+ msgid "Section syntax requires exactly one module"
+ msgstr ""
+ 
+-#: ../src/addr2line.c:428
++#: ../src/addr2line.c:410
+ #, c-format
+ msgid "offset %#<PRIxMAX> lies outside section '%s'"
+ msgstr ""
+ 
+-#: ../src/addr2line.c:461
++#: ../src/addr2line.c:428
+ #, fuzzy, c-format
+ msgid "cannot find symbol '%s'"
+ msgstr "no se puede encontrar el preprocesador de C: %s \n"
+ 
+-#: ../src/addr2line.c:466
++#: ../src/addr2line.c:433
+ #, c-format
+ msgid "offset %#<PRIxMAX> lies outside contents of '%s'"
+ msgstr ""
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1347,6 +1347,16 @@
+@@ -1376,6 +1376,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +2160,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1392,6 +1402,19 @@
+@@ -1421,6 +1431,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1298,7 +2649,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4104,6 +4134,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4107,6 +4137,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1451,7 +2802,7 @@
  
  	      /* Mark the section as investigated.  */
  	      shdr_info[cnt].idx = 2;
-@@ -954,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -955,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
  
@@ -1460,7 +2811,7 @@
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -991,7 +1015,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -992,7 +1016,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1469,7 +2820,7 @@
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -1047,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1048,7 +1072,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1478,7 +2829,7 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1137,20 +1161,20 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1138,20 +1162,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1502,7 +2853,7 @@
  			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
-@@ -1205,7 +1229,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1206,7 +1230,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1511,7 +2862,7 @@
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1226,7 +1250,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1227,7 +1251,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1520,7 +2871,7 @@
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1250,7 +1274,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1251,7 +1275,7 @@ handle_elf (int fd, Elf *elf, const char
  			     || shdr_info[cnt].debug_data == NULL)
  		      /* This is a section symbol for a section which has
  			 been removed.  */
@@ -1529,7 +2880,7 @@
  		  }
  
  		if (destidx != inner)
-@@ -1437,11 +1461,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1438,11 +1462,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1543,7 +2894,7 @@
  		    size_t hidx = elf_hash (name) % nbucket;
  
  		    if (bucket[hidx] == 0)
-@@ -1460,7 +1484,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1461,7 +1485,7 @@ handle_elf (int fd, Elf *elf, const char
  	    else
  	      {
  		/* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1552,7 +2903,7 @@
  			== sizeof (Elf64_Xword));
  
  		Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
-@@ -1491,11 +1515,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1492,11 +1516,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- elfutils.spec	27 Feb 2009 22:29:32 -0000	1.115
+++ elfutils.spec	24 Apr 2009 20:12:58 -0000	1.116
@@ -1,5 +1,5 @@
-%define eu_version 0.140
-%define eu_release 2
+%define eu_version 0.141
+%define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -276,6 +276,18 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1
+- Update to 0.141
+  - libebl: sparc backend fixes (#490585)
+            some more arm backend support
+  - libdwfl: fix dwfl_module_build_id for prelinked DSO case (#489439)
+             fixes in core file support (#494858)
+             dwfl_module_getsym interface improved for non-address symbols
+  - eu-strip: fix infinite loop on strange inputs with -f
+  - eu-addr2line: take -j/--section=NAME option for binutils compatibility
+                  (same effect as '(NAME)0x123' syntax already supported)
+- Resolves: RHBZ #495213, RHBZ #465872, RHBZ #470055, RHBZ #484623
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.140-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -287,7 +299,7 @@
 - Update to 0.139
   - libcpu: Add Intel SSE4 disassembler support
   - readelf: Implement call frame information and exception handling dumping.
-    	     Add -e option.  Enable it implicitly for -a.
+             Add -e option.  Enable it implicitly for -a.
   - elflint: Check PT_GNU_EH_FRAME program header entry.
   - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
 



From cwickert at fedoraproject.org  Fri Apr 24 20:28:52 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 24 Apr 2009 20:28:52 +0000 (UTC)
Subject: rpms/lxpanel/F-11 lxpanel-0.4.0-manpages.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 lxpanel.spec, 1.18, 1.19 sources, 1.11, 1.12
Message-ID: <20090424202852.4865C70106@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19084

Modified Files:
	.cvsignore lxpanel.spec sources 
Added Files:
	lxpanel-0.4.0-manpages.patch 
Log Message:
* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.0-1
- Update to 0.4.0 final (fixes #496833)


lxpanel-0.4.0-manpages.patch:

--- NEW FILE lxpanel-0.4.0-manpages.patch ---
diff -dur lxpanel-0.4.0.orig/man/lxpanel.1 lxpanel-0.4.0/man/lxpanel.1
--- lxpanel-0.4.0.orig/man/lxpanel.1	2009-04-20 17:18:04.000000000 +0200
+++ lxpanel-0.4.0/man/lxpanel.1	2009-04-24 18:45:34.000000000 +0200
@@ -1,14 +1,60 @@
-Using catalogs: /etc/sgml/sgml-docbook-4.1-1.0-41.fc10.cat
-Using stylesheet: /usr/share/sgml/docbook/utils-0.6.14/docbook-utils.dsl#print
-Working on: /home/pcman/Projects/lxde/trunk/lxpanel/man/lxpanel.sgml
-.sp
-.RS
-.sp
-.nf
-      <grandpaul at gmail.com>
-    
-.sp
-.fi
-.RE
-.sp
-Ying-Chun Liu 2008paulliuDone.
+.TH "LXPANEL" "1" 
+.SH "NAME" 
+lxpanel \(em a lightweight GTK2-based panel for LXDE desktop. 
+.SH "SYNOPSIS" 
+.PP 
+\fBlxpanel\fR 
+.SH "DESCRIPTION" 
+.PP 
+This manual page documents briefly the 
+\fBlxpanel\fR command. 
+.PP 
+\fBlxpanel\fR is a program that provides a panel 
+for desktop, usually for LXDE. It is lightweight GTK+ 2.x based desktop  
+panel. 
+ 
+.PP 
+Features 
+.IP "   \(bu" 6 
+User-friendly application menu automatically generated from \fB.desktop\fP     		files on the system. 
+ 
+.IP "   \(bu" 6 
+Launcher bar (small icons clicked to launch apps) 
+.IP "   \(bu" 6 
+Task bar supporting urgency hint (can be flash when gaim gets new 
+incoming messages) 
+.IP "   \(bu" 6 
+Notification area (system tray) 
+.IP "   \(bu" 6 
+Digital clock 
+.IP "   \(bu" 6 
+Run dialog (a dialog let you type a command and run, can be called 
+in external programs) 
+.IP "   \(bu" 6 
+Net status icon plug-in (optional) 
+.IP "   \(bu" 6 
+Volume control plug-in (optional) 
+.IP "   \(bu" 6 
+lxpanelctl, an external controller let you control lxpanel in 
+other programs. For example, "lxpanelctl run" will show the Run 
+dialog in lxpanel, and "lxpanelctl menu" will show the application 
+menu. This is useful in key bindings provided by window managers.      
+.SH "FILES" 
+.IP "\fB~/.config/lxpanel\fP" 10 
+config file, can be edited by preference dialog. 
+.SH "SEE ALSO" 
+.PP 
+lxsession (1), lxpanelctl (1). 
+.SH "AUTHOR" 
+.PP 
+This manual page was written by paulliu grandpaul at gmail.com for 
+the \fBDebian\fP system (but may be used by others).  Permission is 
+granted to copy, distribute and/or modify this document under 
+the terms of the GNU General Public License, Version 2 any  
+later version published by the Free Software Foundation. 
+ 
+.PP 
+On Debian systems, the complete text of the GNU General Public 
+License can be found in /usr/share/common-licenses/GPL. 
+ 
+.\" created by instant / docbook-to-man, Sun 20 Apr 2008, 17:00 
diff -dur lxpanel-0.4.0.orig/man/lxpanelctl.1 lxpanel-0.4.0/man/lxpanelctl.1
--- lxpanel-0.4.0.orig/man/lxpanelctl.1	2009-04-20 17:18:04.000000000 +0200
+++ lxpanel-0.4.0/man/lxpanelctl.1	2009-04-24 18:45:34.000000000 +0200
@@ -1,14 +1,40 @@
-Using catalogs: /etc/sgml/sgml-docbook-4.1-1.0-41.fc10.cat
-Using stylesheet: /usr/share/sgml/docbook/utils-0.6.14/docbook-utils.dsl#print
-Working on: /home/pcman/Projects/lxde/trunk/lxpanel/man/lxpanelctl.sgml
-.sp
-.RS
-.sp
-.nf
-      <grandpaul at gmail.com>
-    
-.sp
-.fi
-.RE
-.sp
-Ying-Chun Liu 2008paulliuDone.
+.TH "LXPANEL" "1" 
+.SH "NAME" 
+lxpanelctl \(em controller for lxpanel. 
+.SH "SYNOPSIS" 
+.PP 
+\fBlxpanelctl\fR command 
+.SH "DESCRIPTION" 
+.PP 
+This manual page documents briefly the 
+\fBlxpanelctl\fR command. 
+.PP 
+\fBlxpanelctl\fR is a program that controls lxpanel. 
+ 
+.SH "COMMANDS" 
+.IP "\fBmenu\fR         " 10 
+show system menu 
+.IP "\fBrun\fR         " 10 
+show run dialog 
+.IP "\fBconfig\fR         " 10 
+show config dialog 
+.IP "\fBrestart\fR         " 10 
+restart lxpanel 
+.IP "\fBexit\fR         " 10 
+exit lxpanel 
+.SH "SEE ALSO" 
+.PP 
+lxpanel (1). 
+.SH "AUTHOR" 
+.PP 
+This manual page was written by paulliu grandpaul at gmail.com for 
+the \fBDebian\fP system (but may be used by others).  Permission is 
+granted to copy, distribute and/or modify this document under 
+the terms of the GNU General Public License, Version 2 any  
+later version published by the Free Software Foundation. 
+ 
+.PP 
+On Debian systems, the complete text of the GNU General Public 
+License can be found in /usr/share/common-licenses/GPL. 
+ 
+.\" created by instant / docbook-to-man, Sun 20 Apr 2008, 17:00 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Mar 2009 17:54:35 -0000	1.11
+++ .cvsignore	24 Apr 2009 20:28:21 -0000	1.12
@@ -1 +1 @@
-lxpanel-0.3.999.tar.gz
+lxpanel-0.4.0.tar.gz


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/lxpanel.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lxpanel.spec	22 Mar 2009 21:07:35 -0000	1.18
+++ lxpanel.spec	24 Apr 2009 20:28:21 -0000	1.19
@@ -4,7 +4,7 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.3.999
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
@@ -13,7 +13,7 @@
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Patch1:         lxpanel-default.patch
-Patch2:         lxpanel-0.2.8-manpage.patch
+Patch2:         lxpanel-0.4.0-manpages.patch
 Patch3:         lxpanel-0.3.8.1-system-config-network.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.0-1
+- Update to 0.4.0 final (fixes #496833)
+
 * Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.3.999-1
 - Update to 0.4.0 Beta 2
 - Build alsa mixer plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	23 Mar 2009 17:54:35 -0000	1.11
+++ sources	24 Apr 2009 20:28:21 -0000	1.12
@@ -1 +1 @@
-ba966c76811f2057198470567099d97d  lxpanel-0.3.999.tar.gz
+a03c7b21338a812207b035204f6dad6e  lxpanel-0.4.0.tar.gz



From cwickert at fedoraproject.org  Fri Apr 24 20:29:39 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 24 Apr 2009 20:29:39 +0000 (UTC)
Subject: rpms/lxpanel/F-11 lxpanel-default.patch,1.6,1.7
Message-ID: <20090424202939.EC30470106@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19270

Modified Files:
	lxpanel-default.patch 
Log Message:
update default.patch

lxpanel-default.patch:

Index: lxpanel-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/lxpanel-default.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lxpanel-default.patch	22 Mar 2009 21:07:35 -0000	1.6
+++ lxpanel-default.patch	24 Apr 2009 20:29:39 -0000	1.7
@@ -16,13 +16,4 @@
          }
      }
  }
-@@ -113,10 +110,6 @@
- }
  
- Plugin {
--    type = netstat
--}
--
--Plugin {
-     type = cpu
- }



From roland at fedoraproject.org  Fri Apr 24 20:36:54 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:36:54 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-portability.patch, 1.42,
	1.43 elfutils-robustify.patch, 1.15, 1.16
Message-ID: <20090424203654.0B3E370106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20396

Modified Files:
	elfutils-portability.patch elfutils-robustify.patch 
Log Message:
Oops; update the patches without the bogons.

elfutils-portability.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.42 -r 1.43 elfutils-portability.patch
Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- elfutils-portability.patch	24 Apr 2009 20:12:58 -0000	1.42
+++ elfutils-portability.patch	24 Apr 2009 20:36:23 -0000	1.43
@@ -961,1355 +961,928 @@
  YACC = @YACC@
 --- elfutils/po/es.po
 +++ elfutils/po/es.po
-@@ -1,14 +1,10 @@
--# Fedora Spanish Translation of elfutils.
--# Domingo Becker <domingobecker at gmail.com>, 2009.
--# H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>, 2009.
--#
- msgid ""
- msgstr ""
- "Project-Id-Version: elfutils\n"
- "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
--"POT-Creation-Date: 2009-04-24 14:08+0000\n"
-+"POT-Creation-Date: 2009-04-09 14:04+0000\n"
- "PO-Revision-Date: \n"
--"Last-Translator: H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>\n"
-+"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudio at pereyradiaz.com.ar>\n"
- "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,7 +15,7 @@ msgstr ""
- #: ../lib/xmalloc.c:65
- #: ../lib/xmalloc.c:79
- #: ../src/readelf.c:2703
--#: ../src/readelf.c:3041
-+#: ../src/readelf.c:3038
- #: ../src/unstrip.c:2086
- #: ../src/unstrip.c:2294
- #, c-format
-@@ -60,7 +56,7 @@ msgid "invalid size of destination opera
- msgstr "tama??o inv??lido del operando destino"
- 
- #: ../libelf/elf_error.c:108
--#: ../src/readelf.c:4592
-+#: ../src/readelf.c:4589
- #, c-format
- msgid "invalid encoding"
- msgstr "codificaci??n inv??lida"
-@@ -96,7 +92,7 @@ msgstr "desplazamiento fuera de rango"
- 
- #: ../libelf/elf_error.c:136
- msgid "invalid fmag field in archive header"
--msgstr "campo fmag no v??lido en el encabezado del archivo"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:140
- msgid "invalid archive file"
-@@ -136,7 +132,7 @@ msgstr "secci??n inv??lida"
- 
- #: ../libelf/elf_error.c:180
- msgid "executable header not created first"
--msgstr "no se ha creado primero el encabezado ejecutable"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:184
- msgid "file descriptor disabled"
-@@ -159,8 +155,8 @@ msgid "invalid section header"
- msgstr "cabecera de secci??n inv??lida"
- 
- #: ../libelf/elf_error.c:208
--#: ../src/readelf.c:6062
--#: ../src/readelf.c:6163
-+#: ../src/readelf.c:6055
-+#: ../src/readelf.c:6156
- #, c-format
- msgid "invalid data"
- msgstr "datos inv??lidos"
-@@ -171,7 +167,7 @@ msgstr "codificaci??n de caracteres desc
- 
- #: ../libelf/elf_error.c:216
- msgid "section `sh_size' too small for data"
--msgstr "el tama??o de la secci??n `sh_size' es demasiado peque??o para los datos "
-+msgstr ""
- 
- #: ../libelf/elf_error.c:220
- msgid "invalid section alignment"
-@@ -183,7 +179,7 @@ msgstr "tama??o de la entrada de la secc
- 
- #: ../libelf/elf_error.c:228
- msgid "update() for write on read-only file"
--msgstr "update() para escribir sobre archivo de s??lo lectura"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:232
- msgid "no such file"
-@@ -191,11 +187,11 @@ msgstr "no hay tal archivo"
- 
- #: ../libelf/elf_error.c:236
- msgid "only relocatable files can contain section groups"
--msgstr "solo los archivos realojables pueden contener grupos de secci??n"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:241
- msgid "program header only allowed in executables, shared objects, and core files"
--msgstr "los encabezados de los programas solo son permitidos en archivos ejecutables, archivos principales, u objetos compartidos"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:248
- msgid "file has no program header"
-@@ -415,19 +411,19 @@ msgstr "directorio NULL en find_file"
- 
- #: ../libdwfl/argp-std.c:70
- msgid "Find addresses from signatures found in COREFILE"
--msgstr "Busca direcciones desde firmas encontradas en COREFILE"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:72
- msgid "Find addresses in files mapped into process PID"
--msgstr "Busca direcciones en archivos mapeados sobre procesos PID"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:74
- msgid "Find addresses in files mapped as read from FILE in Linux /proc/PID/maps format"
--msgstr "Busca direcciones en archivos mapeados como le??dos desde FILE en formato Linux /proc/PID/maps"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:76
- msgid "Find addresses in the running kernel"
--msgstr "Busca direcciones en el kernel que est?? ejecut??ndose"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:78
- #, fuzzy
-@@ -436,7 +432,7 @@ msgstr "Reemplazar todos los &espacios c
- 
- #: ../libdwfl/argp-std.c:80
- msgid "Search path for separate debuginfo files"
--msgstr "Busca caminos para deferentes arhivos debugingfo"
-+msgstr ""
+@@ -2085,7 +2085,7 @@ msgstr "no"
+ #: ../src/readelf.c:4105
+ #, c-format
+ msgid "cannot get .debug_aranges content: %s"
+-msgstr ""
++msgstr "no se ha podido obtener contenido de .debug_aranges: %s"
  
- #: ../libdwfl/argp-std.c:163
- #, fuzzy
-@@ -635,7 +631,7 @@ msgstr "`N' s??lo tiene significado con 
- #: ../src/ar.c:197
+ #: ../src/readelf.c:4110
  #, c-format
- msgid "MEMBER parameter required for 'a', 'b', and 'i' modifiers"
--msgstr "Los modificadres 'a', 'b', e 'i', requieren par??metros MEMBR"
-+msgstr ""
- 
- #: ../src/ar.c:213
- #, fuzzy, c-format
-@@ -669,7 +665,7 @@ msgstr "%s: se requiere un nombre de se?
- #: ../src/strip.c:203
- #: ../src/ld.c:957
- #: ../src/elflint.c:238
--#: ../src/addr2line.c:185
-+#: ../src/addr2line.c:180
- #: ../src/findtextrel.c:170
- #: ../src/elfcmp.c:522
- #: ../src/ranlib.c:136
-@@ -682,9 +678,6 @@ msgid ""
- "This is free software; see the source for copying conditions.  There is NO\n"
- "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
- msgstr ""
--"Copyright (C) %s Red Hat, Inc.\n"
--"El siguiente es un software libre; consulte el c??digo para conocer las condiciones de copiado. NO TIENE\n"
--"garant??a, ni siquiera para SU COMERCIALIZACION o PARA SER USADO CON UN FIN DETERMINADO.\n"
- 
- #: ../src/ar.c:294
- #: ../src/nm.c:258
-@@ -693,7 +686,7 @@ msgstr ""
- #: ../src/strip.c:208
- #: ../src/ld.c:962
- #: ../src/elflint.c:243
--#: ../src/addr2line.c:190
-+#: ../src/addr2line.c:185
- #: ../src/findtextrel.c:175
- #: ../src/elfcmp.c:527
- #: ../src/ranlib.c:141
-@@ -867,7 +860,7 @@ msgstr "Extra??amente s??lo hay %d parti
- 
- #: ../src/nm.c:79
- msgid "Display dynamic symbols instead of normal symbols"
--msgstr "Muestra s??mbolos din??micos en lugar de s??mbolos normales"
-+msgstr ""
+@@ -2111,7 +2111,7 @@ msgstr ""
+ #: ../src/readelf.c:4161
+ #, c-format
+ msgid "cannot get .debug_ranges content: %s"
+-msgstr ""
++msgstr "no se ha podido obtener contenido de .debug_ranges: %s"
  
- #: ../src/nm.c:80
- #, fuzzy
[...1701 lines suppressed...]
- msgid "illformed file '%s'"
- msgstr "Error de archivo"
- 
--#: ../src/strip.c:868
--#: ../src/strip.c:955
-+#: ../src/strip.c:867
-+#: ../src/strip.c:954
- #, fuzzy, c-format
- msgid "while generating output file: %s"
- msgstr "error al cerrar el fichero de salida"
- 
--#: ../src/strip.c:928
--#: ../src/strip.c:1667
-+#: ../src/strip.c:927
-+#: ../src/strip.c:1666
- #, fuzzy, c-format
- msgid "%s: error while creating ELF header: %s"
- msgstr "Error al crear el enlace hacia %B."
- 
--#: ../src/strip.c:942
-+#: ../src/strip.c:941
- #, fuzzy, c-format
- msgid "while preparing output for '%s'"
- msgstr "no se puede abrir `%s' para salida: %s"
+ msgid "section [%2d] '%s': referenced as string table for section [%2d] '%s' but type is not SHT_STRTAB\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': est?? referenciado como una tabla de cadena para la secci??n [%2d] '%s' pero no es de tipo SHT_STRTAB\n"
  
--#: ../src/strip.c:993
--#: ../src/strip.c:1049
-+#: ../src/strip.c:992
-+#: ../src/strip.c:1048
- #, fuzzy, c-format
- msgid "while create section header section: %s"
- msgstr "no se puede crear el encabezado precompilado %s: %m"
+ #: ../src/elflint.c:604
+ #, c-format
+ msgid "section [%2d] '%s': symbol table cannot have more than one extended index section\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': la tabla de s??mbolo no puede tener m??s de una secci??n de ??ndice extendido\n"
  
--#: ../src/strip.c:999
-+#: ../src/strip.c:998
- #, fuzzy, c-format
- msgid "cannot allocate section data: %s"
- msgstr "no se puede asignar espacio para los datos del s??mbolo"
+ #: ../src/elflint.c:615
+ #, c-format
+ msgid "section [%2u] '%s': entry size is does not match ElfXX_Sym\n"
+-msgstr ""
++msgstr "secci??n [%2u] '%s': el tama??o de la entrada no cincide con ElfXX_Sym\n"
  
--#: ../src/strip.c:1058
-+#: ../src/strip.c:1057
+ #: ../src/elflint.c:624
  #, fuzzy, c-format
- msgid "while create section header string table: %s"
- msgstr "fall?? la asignaci??n de la tabla de cadenas de cabeceras de secci??n"
+@@ -3878,55 +3888,55 @@ msgstr "no se puede definir el s??mbolo 
+ #: ../src/elflint.c:638
+ #: ../src/elflint.c:641
+ #: ../src/elflint.c:644
+-#, c-format
++#, fuzzy, c-format
+ msgid "section [%2d] '%s': '%s' in zeroth entry not zero\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': '%s' en la entrada zeroth no es igual cero\n"
  
--#: ../src/strip.c:1592
--#: ../src/strip.c:1689
-+#: ../src/strip.c:1591
-+#: ../src/strip.c:1688
- #, fuzzy, c-format
- msgid "while writing '%s': %s"
- msgstr "%s: al escribir el resultado %s: %m:"
+ #: ../src/elflint.c:647
+-#, c-format
++#, fuzzy, c-format
+ msgid "section [%2d] '%s': XINDEX for zeroth entry not zero\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': XINDEX en la entrada zeroth no es igual cero\n"
  
--#: ../src/strip.c:1603
-+#: ../src/strip.c:1602
- #, fuzzy, c-format
- msgid "while creating '%s'"
- msgstr "Error al crear thread"
+ #: ../src/elflint.c:657
+ #, c-format
+ msgid "section [%2d] '%s': cannot get symbol %zu: %s\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': no es posible obtener el s??mbolo %zu: %s\n"
  
--#: ../src/strip.c:1615
-+#: ../src/strip.c:1614
+ #: ../src/elflint.c:666
  #, c-format
- msgid "while computing checksum for debug information"
- msgstr ""
+ msgid "section [%2d] '%s': symbol %zu: invalid name value\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: valor de nombre inv??lido\n"
  
--#: ../src/strip.c:1675
-+#: ../src/strip.c:1674
- #, fuzzy, c-format
- msgid "%s: error while reading the file: %s"
- msgstr "Error al leer archivo."
+ #: ../src/elflint.c:679
+-#, c-format
++#, fuzzy, c-format
+ msgid "section [%2d] '%s': symbol %zu: too large section index but no extended section index section\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: el ??ndice de secci??n es demasiado extenso, y no no existe una secci??n para ??ndice de secci??n extendido\n"
  
--#: ../src/strip.c:1721
--#: ../src/strip.c:1728
-+#: ../src/strip.c:1720
-+#: ../src/strip.c:1727
- #, fuzzy, c-format
- msgid "error while finishing '%s': %s"
- msgstr "Error al copiar ??%B??."
- 
--#: ../src/strip.c:1751
--#: ../src/strip.c:1808
-+#: ../src/strip.c:1750
-+#: ../src/strip.c:1807
+ #: ../src/elflint.c:685
  #, c-format
- msgid "cannot set access and modification date of '%s'"
- msgstr ""
-@@ -5184,37 +5171,33 @@ msgstr "Mostrar los nombres de las ??rea
- msgid "Also show symbol or section names"
- msgstr ""
- 
--#: ../src/addr2line.c:73
--msgid "Treat addresses as offsets relative to NAME section."
+ msgid "section [%2d] '%s': symbol %zu: XINDEX used for index which would fit in st_shndx (%<PRIu32>)\n"
 -msgstr ""
--
- #. Short description of program.
--#: ../src/addr2line.c:84
-+#: ../src/addr2line.c:82
- msgid "Locate source files and line information for ADDRs (in a.out by default)."
- msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolol %zu: XINDEX es utilizado para ??ndice que pueda caber en st_shndx (%<PRIu32>)\n"
  
- #. Strings for arguments in help texts.
--#: ../src/addr2line.c:88
-+#: ../src/addr2line.c:86
- #, fuzzy
- msgid "[ADDR...]"
- msgstr " Dir: "
+ #. || sym->st_shndx > SHN_HIRESERVE  always false
+ #: ../src/elflint.c:697
+ #, c-format
+ msgid "section [%2d] '%s': symbol %zu: invalid section index\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: ??ndice de secci??n inv??lido\n"
  
--#: ../src/addr2line.c:405
-+#: ../src/addr2line.c:387
+ #: ../src/elflint.c:705
  #, c-format
- msgid "Section syntax requires exactly one module"
- msgstr ""
+ msgid "section [%2d] '%s': symbol %zu: unknown type\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: tipo desconocido\n"
  
--#: ../src/addr2line.c:428
-+#: ../src/addr2line.c:410
+ #: ../src/elflint.c:709
  #, c-format
- msgid "offset %#<PRIxMAX> lies outside section '%s'"
- msgstr ""
+ msgid "section [%2d] '%s': symbol %zu: unknown symbol binding\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: asociaci??n de s??mbolo desconocida\n"
  
--#: ../src/addr2line.c:461
-+#: ../src/addr2line.c:428
- #, fuzzy, c-format
- msgid "cannot find symbol '%s'"
- msgstr "no se puede encontrar el preprocesador de C: %s \n"
+ #: ../src/elflint.c:717
+ #, c-format
+ msgid "section [%2d] '%s': symbol %zu: COMMON only allowed in relocatable files\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: COMMON solo es permitido en archivos realojables\n"
  
--#: ../src/addr2line.c:466
-+#: ../src/addr2line.c:433
+ #: ../src/elflint.c:721
  #, c-format
- msgid "offset %#<PRIxMAX> lies outside contents of '%s'"
- msgstr ""
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
 @@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl

elfutils-robustify.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.15 -r 1.16 elfutils-robustify.patch
Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- elfutils-robustify.patch	24 Apr 2009 20:12:58 -0000	1.15
+++ elfutils-robustify.patch	24 Apr 2009 20:36:23 -0000	1.16
@@ -792,1355 +792,928 @@
  #endif  /* libelfP.h */
 --- elfutils/po/es.po
 +++ elfutils/po/es.po
-@@ -1,14 +1,10 @@
--# Fedora Spanish Translation of elfutils.
--# Domingo Becker <domingobecker at gmail.com>, 2009.
--# H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>, 2009.
--#
- msgid ""
- msgstr ""
- "Project-Id-Version: elfutils\n"
- "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
--"POT-Creation-Date: 2009-04-24 14:08+0000\n"
-+"POT-Creation-Date: 2009-04-09 14:04+0000\n"
- "PO-Revision-Date: \n"
--"Last-Translator: H??ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>\n"
-+"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudio at pereyradiaz.com.ar>\n"
- "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,7 +15,7 @@ msgstr ""
- #: ../lib/xmalloc.c:65
- #: ../lib/xmalloc.c:79
- #: ../src/readelf.c:2703
--#: ../src/readelf.c:3041
-+#: ../src/readelf.c:3038
- #: ../src/unstrip.c:2086
- #: ../src/unstrip.c:2294
- #, c-format
-@@ -60,7 +56,7 @@ msgid "invalid size of destination opera
- msgstr "tama??o inv??lido del operando destino"
- 
- #: ../libelf/elf_error.c:108
--#: ../src/readelf.c:4592
-+#: ../src/readelf.c:4589
- #, c-format
- msgid "invalid encoding"
- msgstr "codificaci??n inv??lida"
-@@ -96,7 +92,7 @@ msgstr "desplazamiento fuera de rango"
- 
- #: ../libelf/elf_error.c:136
- msgid "invalid fmag field in archive header"
--msgstr "campo fmag no v??lido en el encabezado del archivo"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:140
- msgid "invalid archive file"
-@@ -136,7 +132,7 @@ msgstr "secci??n inv??lida"
- 
- #: ../libelf/elf_error.c:180
- msgid "executable header not created first"
--msgstr "no se ha creado primero el encabezado ejecutable"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:184
- msgid "file descriptor disabled"
-@@ -159,8 +155,8 @@ msgid "invalid section header"
- msgstr "cabecera de secci??n inv??lida"
- 
- #: ../libelf/elf_error.c:208
--#: ../src/readelf.c:6062
--#: ../src/readelf.c:6163
-+#: ../src/readelf.c:6055
-+#: ../src/readelf.c:6156
- #, c-format
- msgid "invalid data"
- msgstr "datos inv??lidos"
-@@ -171,7 +167,7 @@ msgstr "codificaci??n de caracteres desc
- 
- #: ../libelf/elf_error.c:216
- msgid "section `sh_size' too small for data"
--msgstr "el tama??o de la secci??n `sh_size' es demasiado peque??o para los datos "
-+msgstr ""
- 
- #: ../libelf/elf_error.c:220
- msgid "invalid section alignment"
-@@ -183,7 +179,7 @@ msgstr "tama??o de la entrada de la secc
- 
- #: ../libelf/elf_error.c:228
- msgid "update() for write on read-only file"
--msgstr "update() para escribir sobre archivo de s??lo lectura"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:232
- msgid "no such file"
-@@ -191,11 +187,11 @@ msgstr "no hay tal archivo"
- 
- #: ../libelf/elf_error.c:236
- msgid "only relocatable files can contain section groups"
--msgstr "solo los archivos realojables pueden contener grupos de secci??n"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:241
- msgid "program header only allowed in executables, shared objects, and core files"
--msgstr "los encabezados de los programas solo son permitidos en archivos ejecutables, archivos principales, u objetos compartidos"
-+msgstr ""
- 
- #: ../libelf/elf_error.c:248
- msgid "file has no program header"
-@@ -415,19 +411,19 @@ msgstr "directorio NULL en find_file"
- 
- #: ../libdwfl/argp-std.c:70
- msgid "Find addresses from signatures found in COREFILE"
--msgstr "Busca direcciones desde firmas encontradas en COREFILE"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:72
- msgid "Find addresses in files mapped into process PID"
--msgstr "Busca direcciones en archivos mapeados sobre procesos PID"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:74
- msgid "Find addresses in files mapped as read from FILE in Linux /proc/PID/maps format"
--msgstr "Busca direcciones en archivos mapeados como le??dos desde FILE en formato Linux /proc/PID/maps"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:76
- msgid "Find addresses in the running kernel"
--msgstr "Busca direcciones en el kernel que est?? ejecut??ndose"
-+msgstr ""
- 
- #: ../libdwfl/argp-std.c:78
- #, fuzzy
-@@ -436,7 +432,7 @@ msgstr "Reemplazar todos los &espacios c
- 
- #: ../libdwfl/argp-std.c:80
- msgid "Search path for separate debuginfo files"
--msgstr "Busca caminos para deferentes arhivos debugingfo"
-+msgstr ""
+@@ -2085,7 +2085,7 @@ msgstr "no"
+ #: ../src/readelf.c:4105
+ #, c-format
+ msgid "cannot get .debug_aranges content: %s"
+-msgstr ""
++msgstr "no se ha podido obtener contenido de .debug_aranges: %s"
  
- #: ../libdwfl/argp-std.c:163
- #, fuzzy
-@@ -635,7 +631,7 @@ msgstr "`N' s??lo tiene significado con 
- #: ../src/ar.c:197
+ #: ../src/readelf.c:4110
  #, c-format
- msgid "MEMBER parameter required for 'a', 'b', and 'i' modifiers"
--msgstr "Los modificadres 'a', 'b', e 'i', requieren par??metros MEMBR"
-+msgstr ""
- 
- #: ../src/ar.c:213
- #, fuzzy, c-format
-@@ -669,7 +665,7 @@ msgstr "%s: se requiere un nombre de se?
- #: ../src/strip.c:203
- #: ../src/ld.c:957
- #: ../src/elflint.c:238
--#: ../src/addr2line.c:185
-+#: ../src/addr2line.c:180
- #: ../src/findtextrel.c:170
- #: ../src/elfcmp.c:522
- #: ../src/ranlib.c:136
-@@ -682,9 +678,6 @@ msgid ""
- "This is free software; see the source for copying conditions.  There is NO\n"
- "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
- msgstr ""
--"Copyright (C) %s Red Hat, Inc.\n"
--"El siguiente es un software libre; consulte el c??digo para conocer las condiciones de copiado. NO TIENE\n"
--"garant??a, ni siquiera para SU COMERCIALIZACION o PARA SER USADO CON UN FIN DETERMINADO.\n"
- 
- #: ../src/ar.c:294
- #: ../src/nm.c:258
-@@ -693,7 +686,7 @@ msgstr ""
- #: ../src/strip.c:208
- #: ../src/ld.c:962
- #: ../src/elflint.c:243
--#: ../src/addr2line.c:190
-+#: ../src/addr2line.c:185
- #: ../src/findtextrel.c:175
- #: ../src/elfcmp.c:527
- #: ../src/ranlib.c:141
-@@ -867,7 +860,7 @@ msgstr "Extra??amente s??lo hay %d parti
- 
- #: ../src/nm.c:79
- msgid "Display dynamic symbols instead of normal symbols"
--msgstr "Muestra s??mbolos din??micos en lugar de s??mbolos normales"
-+msgstr ""
+@@ -2111,7 +2111,7 @@ msgstr ""
+ #: ../src/readelf.c:4161
+ #, c-format
+ msgid "cannot get .debug_ranges content: %s"
+-msgstr ""
++msgstr "no se ha podido obtener contenido de .debug_ranges: %s"
  
- #: ../src/nm.c:80
- #, fuzzy
[...1701 lines suppressed...]
- msgid "illformed file '%s'"
- msgstr "Error de archivo"
- 
--#: ../src/strip.c:868
--#: ../src/strip.c:955
-+#: ../src/strip.c:867
-+#: ../src/strip.c:954
- #, fuzzy, c-format
- msgid "while generating output file: %s"
- msgstr "error al cerrar el fichero de salida"
- 
--#: ../src/strip.c:928
--#: ../src/strip.c:1667
-+#: ../src/strip.c:927
-+#: ../src/strip.c:1666
- #, fuzzy, c-format
- msgid "%s: error while creating ELF header: %s"
- msgstr "Error al crear el enlace hacia %B."
- 
--#: ../src/strip.c:942
-+#: ../src/strip.c:941
- #, fuzzy, c-format
- msgid "while preparing output for '%s'"
- msgstr "no se puede abrir `%s' para salida: %s"
+ msgid "section [%2d] '%s': referenced as string table for section [%2d] '%s' but type is not SHT_STRTAB\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': est?? referenciado como una tabla de cadena para la secci??n [%2d] '%s' pero no es de tipo SHT_STRTAB\n"
  
--#: ../src/strip.c:993
--#: ../src/strip.c:1049
-+#: ../src/strip.c:992
-+#: ../src/strip.c:1048
- #, fuzzy, c-format
- msgid "while create section header section: %s"
- msgstr "no se puede crear el encabezado precompilado %s: %m"
+ #: ../src/elflint.c:604
+ #, c-format
+ msgid "section [%2d] '%s': symbol table cannot have more than one extended index section\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': la tabla de s??mbolo no puede tener m??s de una secci??n de ??ndice extendido\n"
  
--#: ../src/strip.c:999
-+#: ../src/strip.c:998
- #, fuzzy, c-format
- msgid "cannot allocate section data: %s"
- msgstr "no se puede asignar espacio para los datos del s??mbolo"
+ #: ../src/elflint.c:615
+ #, c-format
+ msgid "section [%2u] '%s': entry size is does not match ElfXX_Sym\n"
+-msgstr ""
++msgstr "secci??n [%2u] '%s': el tama??o de la entrada no cincide con ElfXX_Sym\n"
  
--#: ../src/strip.c:1058
-+#: ../src/strip.c:1057
+ #: ../src/elflint.c:624
  #, fuzzy, c-format
- msgid "while create section header string table: %s"
- msgstr "fall?? la asignaci??n de la tabla de cadenas de cabeceras de secci??n"
+@@ -3878,55 +3888,55 @@ msgstr "no se puede definir el s??mbolo 
+ #: ../src/elflint.c:638
+ #: ../src/elflint.c:641
+ #: ../src/elflint.c:644
+-#, c-format
++#, fuzzy, c-format
+ msgid "section [%2d] '%s': '%s' in zeroth entry not zero\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': '%s' en la entrada zeroth no es igual cero\n"
  
--#: ../src/strip.c:1592
--#: ../src/strip.c:1689
-+#: ../src/strip.c:1591
-+#: ../src/strip.c:1688
- #, fuzzy, c-format
- msgid "while writing '%s': %s"
- msgstr "%s: al escribir el resultado %s: %m:"
+ #: ../src/elflint.c:647
+-#, c-format
++#, fuzzy, c-format
+ msgid "section [%2d] '%s': XINDEX for zeroth entry not zero\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': XINDEX en la entrada zeroth no es igual cero\n"
  
--#: ../src/strip.c:1603
-+#: ../src/strip.c:1602
- #, fuzzy, c-format
- msgid "while creating '%s'"
- msgstr "Error al crear thread"
+ #: ../src/elflint.c:657
+ #, c-format
+ msgid "section [%2d] '%s': cannot get symbol %zu: %s\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': no es posible obtener el s??mbolo %zu: %s\n"
  
--#: ../src/strip.c:1615
-+#: ../src/strip.c:1614
+ #: ../src/elflint.c:666
  #, c-format
- msgid "while computing checksum for debug information"
- msgstr ""
+ msgid "section [%2d] '%s': symbol %zu: invalid name value\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: valor de nombre inv??lido\n"
  
--#: ../src/strip.c:1675
-+#: ../src/strip.c:1674
- #, fuzzy, c-format
- msgid "%s: error while reading the file: %s"
- msgstr "Error al leer archivo."
+ #: ../src/elflint.c:679
+-#, c-format
++#, fuzzy, c-format
+ msgid "section [%2d] '%s': symbol %zu: too large section index but no extended section index section\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: el ??ndice de secci??n es demasiado extenso, y no no existe una secci??n para ??ndice de secci??n extendido\n"
  
--#: ../src/strip.c:1721
--#: ../src/strip.c:1728
-+#: ../src/strip.c:1720
-+#: ../src/strip.c:1727
- #, fuzzy, c-format
- msgid "error while finishing '%s': %s"
- msgstr "Error al copiar ??%B??."
- 
--#: ../src/strip.c:1751
--#: ../src/strip.c:1808
-+#: ../src/strip.c:1750
-+#: ../src/strip.c:1807
+ #: ../src/elflint.c:685
  #, c-format
- msgid "cannot set access and modification date of '%s'"
- msgstr ""
-@@ -5184,37 +5171,33 @@ msgstr "Mostrar los nombres de las ??rea
- msgid "Also show symbol or section names"
- msgstr ""
- 
--#: ../src/addr2line.c:73
--msgid "Treat addresses as offsets relative to NAME section."
+ msgid "section [%2d] '%s': symbol %zu: XINDEX used for index which would fit in st_shndx (%<PRIu32>)\n"
 -msgstr ""
--
- #. Short description of program.
--#: ../src/addr2line.c:84
-+#: ../src/addr2line.c:82
- msgid "Locate source files and line information for ADDRs (in a.out by default)."
- msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolol %zu: XINDEX es utilizado para ??ndice que pueda caber en st_shndx (%<PRIu32>)\n"
  
- #. Strings for arguments in help texts.
--#: ../src/addr2line.c:88
-+#: ../src/addr2line.c:86
- #, fuzzy
- msgid "[ADDR...]"
- msgstr " Dir: "
+ #. || sym->st_shndx > SHN_HIRESERVE  always false
+ #: ../src/elflint.c:697
+ #, c-format
+ msgid "section [%2d] '%s': symbol %zu: invalid section index\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: ??ndice de secci??n inv??lido\n"
  
--#: ../src/addr2line.c:405
-+#: ../src/addr2line.c:387
+ #: ../src/elflint.c:705
  #, c-format
- msgid "Section syntax requires exactly one module"
- msgstr ""
+ msgid "section [%2d] '%s': symbol %zu: unknown type\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: tipo desconocido\n"
  
--#: ../src/addr2line.c:428
-+#: ../src/addr2line.c:410
+ #: ../src/elflint.c:709
  #, c-format
- msgid "offset %#<PRIxMAX> lies outside section '%s'"
- msgstr ""
+ msgid "section [%2d] '%s': symbol %zu: unknown symbol binding\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: asociaci??n de s??mbolo desconocida\n"
  
--#: ../src/addr2line.c:461
-+#: ../src/addr2line.c:428
- #, fuzzy, c-format
- msgid "cannot find symbol '%s'"
- msgstr "no se puede encontrar el preprocesador de C: %s \n"
+ #: ../src/elflint.c:717
+ #, c-format
+ msgid "section [%2d] '%s': symbol %zu: COMMON only allowed in relocatable files\n"
+-msgstr ""
++msgstr "secci??n [%2d] '%s': s??mbolo %zu: COMMON solo es permitido en archivos realojables\n"
  
--#: ../src/addr2line.c:466
-+#: ../src/addr2line.c:433
+ #: ../src/elflint.c:721
  #, c-format
- msgid "offset %#<PRIxMAX> lies outside contents of '%s'"
- msgstr ""
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
 @@ -1376,6 +1376,16 @@



From roland at fedoraproject.org  Fri Apr 24 20:44:21 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:44:21 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-portability.patch, 1.43,
	1.44 elfutils-robustify.patch, 1.16, 1.17
Message-ID: <20090424204421.1948270106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21497

Modified Files:
	elfutils-portability.patch elfutils-robustify.patch 
Log Message:
Sigh; third time's the charm.

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- elfutils-portability.patch	24 Apr 2009 20:36:23 -0000	1.43
+++ elfutils-portability.patch	24 Apr 2009 20:44:20 -0000	1.44
@@ -959,930 +959,6 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
---- elfutils/po/es.po
-+++ elfutils/po/es.po
-@@ -2085,7 +2085,7 @@ msgstr "no"
- #: ../src/readelf.c:4105
- #, c-format
- msgid "cannot get .debug_aranges content: %s"
--msgstr ""
-+msgstr "no se ha podido obtener contenido de .debug_aranges: %s"
- 
- #: ../src/readelf.c:4110
- #, c-format
-@@ -2111,7 +2111,7 @@ msgstr ""
- #: ../src/readelf.c:4161
- #, c-format
- msgid "cannot get .debug_ranges content: %s"
--msgstr ""
-+msgstr "no se ha podido obtener contenido de .debug_ranges: %s"
- 
- #: ../src/readelf.c:4166
- #: ../src/readelf.c:4623
-@@ -2237,9 +2237,9 @@ msgid ""
- msgstr ""
- 
- #: ../src/readelf.c:5194
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot get DIE at offset %<PRIu64> in section '%s': %s"
--msgstr ""
-+msgstr "no se ha podido obtener DIE en offset %<PRIu64> en la secci??n '%s': %s"
- 
- #: ../src/readelf.c:5205
- #, fuzzy, c-format
-@@ -2247,9 +2247,9 @@ msgid "cannot get DIE offset: %s"
- msgstr "%s: no se puede desplazar a la posici??n %s"
- 
- #: ../src/readelf.c:5213
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot get tag of DIE at offset %<PRIu64> in section '%s': %s"
--msgstr ""
-+msgstr "no se ha podido obtener etiqueta de DIE en offset %<PRIu64> en la secci??n '%s': %s"
- 
- #: ../src/readelf.c:5242
- #, fuzzy, c-format
-@@ -2291,9 +2291,9 @@ msgid ""
- msgstr ""
- 
- #: ../src/readelf.c:5368
--#, c-format
-+#, fuzzy, c-format
- msgid "invalid data at offset %tu in section [%zu] '%s'"
--msgstr ""
-+msgstr "datos inv??lidos en offset %ty en la secci??n [%zu] '%s'"
- 
- #: ../src/readelf.c:5383
- #, fuzzy, c-format
-@@ -2326,9 +2326,9 @@ msgstr ""
- " Declaraciones de N??mero de L??nea:\n"
- 
- #: ../src/readelf.c:5497
--#, c-format
-+#, fuzzy, c-format
- msgid " special opcode %u: address+%u = %s, line%+d = %zu\n"
--msgstr ""
-+msgstr " special opcode %u: address+%u = %s, line%+d = %zu\n"
- 
- #: ../src/readelf.c:5517
- #, fuzzy, c-format
-@@ -2348,9 +2348,9 @@ msgid "set address to %s\n"
- msgstr "La direcci??n de la secci??n %s se estableci?? a "
- 
- #: ../src/readelf.c:5558
--#, c-format
-+#, fuzzy, c-format
- msgid "define new file: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n"
--msgstr ""
-+msgstr "definir nuevo archivo: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n"
- 
- #. Unknown, ignore it.
- #: ../src/readelf.c:5567
-@@ -2403,7 +2403,7 @@ msgstr "  Avanzar el PC por %lu para %lx
- #: ../src/readelf.c:5657
- #, c-format
- msgid "advance address by fixed value %u to %s\n"
--msgstr ""
-+msgstr "direcci??n avanzada arreglando el valor %u a %s\n"
- 
- #. Takes no argument.
- #: ../src/readelf.c:5666
-@@ -2430,7 +2430,7 @@ msgstr[1] ""
- #: ../src/readelf.c:5712
- #, c-format
- msgid "cannot get .debug_loc content: %s"
--msgstr ""
-+msgstr "no es posible obtener contenido de .debug_loc: %s"
- 
- #. First entry in a list.
- #: ../src/readelf.c:5767
-@@ -2446,17 +2446,17 @@ msgstr "           %s..%s"
- #: ../src/readelf.c:5822
- #, c-format
- msgid "cannot get macro information section data: %s"
--msgstr ""
-+msgstr "no es posible obtener datos de la secci??n de macro informaci??n: %s"
- 
- #: ../src/readelf.c:5901
- #, c-format
- msgid "%*s*** non-terminated string at end of section"
--msgstr ""
-+msgstr "%*s*** cadena no finalizada al final de la secci??n"
- 
- #: ../src/readelf.c:5969
--#, c-format
-+#, fuzzy, c-format
- msgid " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, name: %s\n"
--msgstr ""
-+msgstr " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, nombre: %s\n"
- 
- #: ../src/readelf.c:6008
- #, c-format
-@@ -2522,15 +2522,15 @@ msgid "invalid TType encoding"
- msgstr "especificada una codificaci??n inv??lida"
- 
- #: ../src/readelf.c:6303
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot get debug context descriptor: %s"
--msgstr ""
-+msgstr "no es posible obtener un descriptor de contexto de debug: %s"
- 
- #: ../src/readelf.c:6438
- #: ../src/readelf.c:7016
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot convert core note data: %s"
--msgstr ""
-+msgstr "no es posible convertir datos de la nota proncipal: %s"
- 
- #: ../src/readelf.c:6743
- #, fuzzy, c-format
-@@ -2594,7 +2594,7 @@ msgstr ""
- #: ../src/readelf.c:7287
- #, c-format
- msgid "cannot get data for section [%Zu] '%s': %s"
--msgstr ""
-+msgstr "no es posible obtener datos de la secci??n [%Zu] '%s': %s"
- 
- #: ../src/readelf.c:7269
- #, c-format
-@@ -2651,9 +2651,9 @@ msgid ""
- msgstr ""
- 
- #: ../src/readelf.c:7450
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot extract member at offset %Zu in '%s': %s"
--msgstr ""
-+msgstr "no es posible extraer miembro en offset %Zu in '%s': %s"
- 
- #: ../src/readelf.c:7455
- #, fuzzy, c-format
-@@ -2662,7 +2662,7 @@ msgstr "Comprueba si el archivador conti
- 
- #: ../src/size.c:68
- msgid "Use the output format FORMAT.  FORMAT can be `bsd' or `sysv'.  The default is `bsd'"
--msgstr ""
-+msgstr "Utilice el formato de salida FORMAT. FORMAT puede set tanto `bsd' como `sysv'. El establecido por defecto es `bsd'"
- 
- #: ../src/size.c:70
- #, fuzzy
-@@ -2691,20 +2691,20 @@ msgstr "lo mismo que --format=posix"
- 
- #: ../src/size.c:78
- msgid "Similar to `--format=sysv' output but in one line"
--msgstr ""
-+msgstr "Similar a la salida `--format=sysv' pero en una sola l??nea"
- 
- #: ../src/size.c:82
- msgid "Print size and permission flags for loadable segments"
--msgstr ""
-+msgstr "Imprime el tama??o y las marcas de permiso para los segmentos posibles de ser cargados"
- 
- #: ../src/size.c:83
- msgid "Display the total sizes (bsd only)"
--msgstr ""
-+msgstr "Muestra el tama??o total (bsd solamente)"
- 
- #. Short description of program.
- #: ../src/size.c:88
- msgid "List section sizes of FILEs (a.out by default)."
--msgstr ""
-+msgstr "Lista los tama??os de secci??n de FILEs (por defecto a.out). "
- 
- #: ../src/size.c:269
- #, fuzzy, c-format
-@@ -2733,8 +2733,9 @@ msgid "(TOTALS)\n"
- msgstr "calcular totales"
- 
- #: ../src/strip.c:73
-+#, fuzzy
- msgid "Place stripped output into FILE"
--msgstr ""
-+msgstr "Coloca la salida obtenida en FILE"
- 
- #: ../src/strip.c:74
- #, fuzzy
-@@ -2773,7 +2774,7 @@ msgstr " Remueve s??mbolos y secciones d
- #: ../src/strip.c:185
- #, c-format
- msgid "Only one input file allowed together with '-o' and '-f'"
--msgstr ""
-+msgstr "Solo se permite ingresar un archivo junto con '-o' y '-f'"
- 
- #: ../src/strip.c:221
- #, fuzzy, c-format
-@@ -2794,7 +2795,7 @@ msgstr "se desconoce la opci??n -m%s= es
- #: ../src/strip.c:259
- #, c-format
- msgid "-R option supports only .comment section"
--msgstr ""
-+msgstr "la opci??n -R es soportada s??lo en la secci??n .comment"
- 
- #: ../src/strip.c:297
- #: ../src/strip.c:321
-@@ -2808,9 +2809,9 @@ msgid "while opening '%s'"
- msgstr "mientras se abr??a %s"
- 
- #: ../src/strip.c:349
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: cannot use -o or -f when stripping archive"
--msgstr ""
-+msgstr "%s: no puede utilzarse -o o -f cuando se extrae un archivo"
- 
- #: ../src/strip.c:447
- #, fuzzy, c-format
-@@ -2892,7 +2893,7 @@ msgstr "Error al copiar ??%B??."
- #: ../src/strip.c:1808
- #, c-format
- msgid "cannot set access and modification date of '%s'"
--msgstr ""
-+msgstr "no es posible establecer acceso y fecha de modificaci??n de '%s'"
- 
- #: ../src/ld.c:87
- #, fuzzy
-@@ -2903,11 +2904,11 @@ msgstr ""
- 
- #: ../src/ld.c:89
- msgid "Include whole archives in the output from now on."
--msgstr ""
-+msgstr "A partir de ahora incluye archivos completos en la salida."
- 
- #: ../src/ld.c:91
- msgid "Stop including the whole arhives in the output."
--msgstr ""
-+msgstr "Deja de incluir archivos completos en la salida."
- 
- #: ../src/ld.c:92
- #: ../src/ld.c:106
-@@ -2933,11 +2934,12 @@ msgstr "RUTA"
- 
- #: ../src/ld.c:96
- msgid "Add PATH to list of directories files are searched in."
--msgstr ""
-+msgstr "Agrega PATH a la lista de los directorios en los que se realiza la b??squeda"
- 
- #: ../src/ld.c:98
-+#, fuzzy
- msgid "Only set DT_NEEDED for following dynamic libs if actually used"
--msgstr ""
-+msgstr "Solo se define DT_NEEDED para las librer??as din??micas siguientes, est??n siendo utilizadas"
- 
- #: ../src/ld.c:100
- #, fuzzy
-@@ -2946,7 +2948,7 @@ msgstr "Siempre establece DT_NEEDED para
- 
- #: ../src/ld.c:102
- msgid "Ignore LD_LIBRARY_PATH environment variable."
--msgstr ""
-+msgstr "Ignora la variable de entorno LD_LIBRARY_PATH."
- 
- #: ../src/ld.c:105
- #, fuzzy
-@@ -2962,7 +2964,7 @@ msgstr "  -o <fichero>             Coloc
- 
- #: ../src/ld.c:109
- msgid "Object is marked to not use default search path at runtime."
--msgstr ""
-+msgstr "Los objetos son marcados para que no utilicen el camino de b??squeda establecido por defecto en el momento de su ejecuci??n."
- 
- #: ../src/ld.c:111
- #, fuzzy
-@@ -2971,23 +2973,23 @@ msgstr "Apaga --whole-archive"
- 
- #: ../src/ld.c:112
- msgid "Default rules of extracting from archive; weak references are not enough."
--msgstr ""
-+msgstr "Reglas establecidas por defecto para extraer desde el archivo; las referencias d??biles no son suficientes."
- 
- #: ../src/ld.c:116
- msgid "Weak references cause extraction from archive."
--msgstr ""
-+msgstr "Referencias d??biles causan extracci??n desde archivo."
- 
- #: ../src/ld.c:118
- msgid "Allow multiple definitions; first is used."
--msgstr ""
-+msgstr "Permite definiciones m??ltiples; es utilizada la primera."
- 
- #: ../src/ld.c:120
- msgid "Disallow/allow undefined symbols in DSOs."
--msgstr ""
-+msgstr "Habilita/deshabilita s??mbolos indefinidos en DSOs."
- 
- #: ../src/ld.c:123
- msgid "Object requires immediate handling of $ORIGIN."
--msgstr ""
-+msgstr "Los objetos requieren manipulaci??n inmediata de $ORIGIN."
- 
- #: ../src/ld.c:125
- #, fuzzy
-@@ -3001,23 +3003,24 @@ msgstr "La constante nombrada '%s' en %L
- 
- #: ../src/ld.c:129
- msgid "Mark object to be initialized first."
--msgstr ""
-+msgstr "Marca el objeto para ser inicializado primero."
- 
- #: ../src/ld.c:131
-+#, fuzzy
- msgid "Enable/disable lazy-loading flag for following dependencies."
--msgstr ""
-+msgstr "Activa/desactiva marca lazy-loading para las siguientes dependencias."
- 
- #: ../src/ld.c:133
- msgid "Mark object as not loadable with 'dlopen'."
--msgstr ""
-+msgstr "Marca el objeto como no cargable con 'dlopen'"
- 
- #: ../src/ld.c:135
- msgid "Ignore/record dependencies on unused DSOs."
--msgstr ""
-+msgstr "Ignora/registra dependencias sobre DSOs no utilizados."
- 
- #: ../src/ld.c:137
- msgid "Generated DSO will be a system library."
--msgstr ""
-+msgstr "El DSO generado ser?? una librer??a del sistema. "
- 
- #: ../src/ld.c:138
- #, fuzzy
-@@ -3055,8 +3058,9 @@ msgid "Strip debugging symbols."
- msgstr "Descarta los s??mbolos de depuraci??n"
- 
- #: ../src/ld.c:149
-+#, fuzzy
- msgid "Assume pagesize for the target system to be SIZE."
--msgstr ""
-+msgstr "Asume que ser?? SIZE el pagesize para el objeto del sistema."
- 
- #: ../src/ld.c:151
- #, fuzzy
-@@ -3079,8 +3083,9 @@ msgid "Generate relocatable object."
- msgstr "Genera salida reubicable"
- 
- #: ../src/ld.c:159
-+#, fuzzy
- msgid "Causes symbol not assigned to a version be reduced to local."
--msgstr ""
-+msgstr "Hace que un s??mbolo no asinado a ninguna versi??n sea reducido a local."
- 
- #: ../src/ld.c:160
- #, fuzzy
-@@ -3108,15 +3113,17 @@ msgstr ""
- 
- #: ../src/ld.c:171
- msgid "Create .eh_frame_hdr section"
--msgstr ""
-+msgstr "Crea una secci??n .eh_frame_hdr"
- 
- #: ../src/ld.c:173
-+#, fuzzy
- msgid "Set hash style to sysv, gnu or both."
--msgstr ""
-+msgstr "Establece el hash style a sysv, gnu o ambos."
- 
- #: ../src/ld.c:175
-+#, fuzzy
- msgid "Generate build ID note (md5, sha1 (default), uuid)."
--msgstr ""
-+msgstr "Crea una nota del ID de compilaci??n (md5, sha1 (por defecto), uuid)."
- 
- #: ../src/ld.c:177
- #, fuzzy
-@@ -3135,7 +3142,7 @@ msgstr "Rastrea la apertura de ficheros"
- 
- #: ../src/ld.c:181
- msgid "Trade speed for less memory usage"
--msgstr ""
-+msgstr "Intercambia velocidad por menor utilizaci??n de la memoria"
- 
- #: ../src/ld.c:182
- #, fuzzy
-@@ -3168,8 +3175,9 @@ msgstr "|NOMBRE|usa el juego de caracter
- 
- #. Short description of program.
- #: ../src/ld.c:197
-+#, fuzzy
- msgid "Combine object and archive files."
--msgstr ""
-+msgstr "Combina objeto y archivos de almacenamiento."
- 
- #. Strings for arguments in help texts.
- #: ../src/ld.c:200
-@@ -3232,7 +3240,7 @@ msgstr "estilo de numeraci??n de cuerpo 
- #: ../src/ld.c:785
- #, c-format
- msgid "More than one output file name given."
--msgstr ""
-+msgstr "Se ha dado m??s de un nombre de arhivo de salido. "
- 
- #: ../src/ld.c:802
- #, fuzzy, c-format
-@@ -3257,7 +3265,7 @@ msgstr "El par??metro '%s' es desconocid
- #: ../src/ld.c:1150
- #, c-format
- msgid "could not find input file to determine output file format"
--msgstr ""
-+msgstr "no se ha podido encontrar un archivo de entrada que determine el formato del archivo de salida"
- 
- #: ../src/ld.c:1152
- #, fuzzy, c-format
-@@ -3284,19 +3292,19 @@ msgid "cannot create string table"
- msgstr "<??ndice de la tabla de cadenas: %3ld>"
- 
- #: ../src/ldgeneric.c:255
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot load ld backend library '%s': %s"
--msgstr ""
-+msgstr "no se ha podido cargar la librer??a ld backend '%s': %s"
- 
- #: ../src/ldgeneric.c:265
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot find init function in ld backend library '%s': %s"
--msgstr ""
-+msgstr "no se ha podido encontrar la funci??n init en la librer??a ld backend '%s': %s"
- 
- #: ../src/ldgeneric.c:310
- #, c-format
- msgid "%s listed more than once as input"
--msgstr ""
-+msgstr "%s listado m??s de una vez como entrada"
- 
- #: ../src/ldgeneric.c:424
- #, fuzzy, c-format
-@@ -3337,14 +3345,14 @@ msgstr "no se puede obtener el grupo de 
- #. despite the SHF_GROUP flag.  This is an error in the input
- #. file.
- #: ../src/ldgeneric.c:840
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: section '%s' with group flag set does not belong to any group"
--msgstr ""
-+msgstr "%s: la secci??n '%s' con el grupo definir marca no pertenece a ning??n grupo"
- 
- #: ../src/ldgeneric.c:885
- #, c-format
- msgid "%s: section [%2d] '%s' is not in the correct section group"
--msgstr ""
-+msgstr "%s: la secci??n [%2d] '%s' no se encuentra en el grupo de secci??n correcto"
- 
- #. This should never happen.
- #: ../src/ldgeneric.c:1156
-@@ -3361,22 +3369,22 @@ msgstr "Versi??n de ABI del fichero ELF 
- #: ../src/ldgeneric.c:1250
- #, c-format
- msgid "%s: only files of type ET_REL might contain section groups"
--msgstr ""
-+msgstr "%s: solo archivos de tipo ET_REL pueden contener grupos de secci??n"
- 
- #: ../src/ldgeneric.c:1302
- #, c-format
- msgid "%s: cannot determine signature of section group [%2zd] '%s': %s"
--msgstr ""
-+msgstr "%s: no es posible determinar la firma del grupo de secci??n [%2zd] '%s': %s "
- 
- #: ../src/ldgeneric.c:1314
- #, c-format
- msgid "%s: cannot get content of section group [%2zd] '%s': %s'"
--msgstr ""
-+msgstr "%s: no es posible obtener el contenido de la secci??n del grupo [%2zd] '%s': %s'"
- 
- #: ../src/ldgeneric.c:1328
- #, c-format
- msgid "%s: group member %zu of section group [%2zd] '%s' has too high index: %<PRIu32>"
--msgstr ""
-+msgstr "%s el miembro del grupo %zu del grupo de secci??n [%2zd] '%s' posee el ??ndice demsiado alto: %<PRIu32>"
- 
- #: ../src/ldgeneric.c:1350
- #, fuzzy, c-format
-@@ -3386,7 +3394,7 @@ msgstr "%s tiene un tipo de fichero desc
- #: ../src/ldgeneric.c:1729
- #, c-format
- msgid "cannot get descriptor for ELF file (%s:%d): %s\n"
--msgstr ""
-+msgstr "no es posible obtener descriptor para el archivo ELF (%s:%d): %s\n"
- 
- #: ../src/ldgeneric.c:1899
- #, fuzzy, c-format
-@@ -3401,17 +3409,17 @@ msgstr "El archivo de zona no puede ser 
- #: ../src/ldgeneric.c:2032
- #, c-format
- msgid "%s: input file incompatible with ELF machine type %s\n"
--msgstr ""
-+msgstr "%s: el archivo ingresado es incompatible con una m??quina ELF tipo %s\n"
- 
- #: ../src/ldgeneric.c:2044
- #, c-format
- msgid "%s: cannot get section header string table index: %s\n"
--msgstr ""
-+msgstr "%s: no se ha podido obtener un ??ndice para la tabla de la cadena del encabezado de la secci??n: %s\n"
- 
- #: ../src/ldgeneric.c:2073
- #, c-format
- msgid "cannot use DSO '%s' when generating relocatable object file"
--msgstr ""
-+msgstr "no es posible utilizar DSO '%s' al general un archivo de objeto realojable"
- 
- #: ../src/ldgeneric.c:2158
- #, fuzzy, c-format
-@@ -3429,12 +3437,12 @@ msgstr "s??mbolo indefinido `%s' en la o
- #: ../src/ldgeneric.c:2702
- #, c-format
- msgid "cannot create ELF descriptor for output file: %s"
--msgstr ""
-+msgstr "no es posible crear un descriptor ELF para el archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:2709
- #, c-format
- msgid "could not create ELF header for output file: %s"
--msgstr ""
-+msgstr "no es posible crear un encabezado ELF para el archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:3224
- #: ../src/ldgeneric.c:3294
-@@ -3453,14 +3461,14 @@ msgid "cannot create section for output 
- msgstr "no se puede crear el fichero de salida `%s' para la categor??a `%s'"
- 
- #: ../src/ldgeneric.c:3444
--#, c-format
-+#, fuzzy, c-format
- msgid "address computation expression contains variable '%s'"
--msgstr ""
-+msgstr "las expresiones de direcci??n en lenguaje de computaci??n contienen la variable '%s'"
- 
- #: ../src/ldgeneric.c:3489
--#, c-format
-+#, fuzzy, c-format
- msgid "argument '%<PRIuMAX>' of ALIGN in address computation expression is no power of two"
--msgstr ""
-+msgstr "el argumento '%<PRIuMAX>' de ALIGN en direcciones de expresiones computacionales es no m??s poderoso que dos "
- 
- #: ../src/ldgeneric.c:3684
- #, fuzzy, c-format
-@@ -3470,17 +3478,17 @@ msgstr "%P: aviso: no se puede encontrar
- #: ../src/ldgeneric.c:3690
- #, c-format
- msgid "no entry symbol specified: defaulting to %#0*<PRIx64>"
--msgstr ""
-+msgstr "no se ha especificado una entrada de s??mbolo: estableciendo por defecto a %#0*<PRIx64>"
- 
- #: ../src/ldgeneric.c:3920
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot create GNU hash table section for output file: %s"
--msgstr ""
-+msgstr "no es posible crear una secci??n para la tabla GNU hash del archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:4071
- #, c-format
- msgid "cannot create hash table section for output file: %s"
--msgstr ""
-+msgstr "no es posible crear una secci??n para la tabla hash del archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:4114
- #, fuzzy, c-format
-@@ -3490,17 +3498,17 @@ msgstr "%F%P: no se puede crear la tabla
- #: ../src/ldgeneric.c:4191
- #, c-format
- msgid "cannot convert section data to file format: %s"
--msgstr ""
-+msgstr "no es posible convertir los datos de la secci??n en formato de archivo: %s"
- 
- #: ../src/ldgeneric.c:4200
- #, c-format
- msgid "cannot convert section data to memory format: %s"
--msgstr ""
-+msgstr "no es posible convertir datos de la secci??n en formato de memoria: %s"
- 
- #: ../src/ldgeneric.c:4261
- #, c-format
- msgid "cannot read enough data for UUID"
--msgstr ""
-+msgstr "no es posible leer suficientes datos para el UUID"
- 
- #: ../src/ldgeneric.c:4358
- #: ../src/ldgeneric.c:4379
-@@ -3508,13 +3516,13 @@ msgstr ""
- #: ../src/ldgeneric.c:6062
- #, c-format
- msgid "cannot create symbol table for output file: %s"
--msgstr ""
-+msgstr "no es posible crear tabla de s??mbolo para el comando de salida: %s"
- 
- #: ../src/ldgeneric.c:5300
- #: ../src/ldgeneric.c:5852
--#, c-format
-+#, fuzzy, c-format
- msgid "section index too large in dynamic symbol table"
--msgstr ""
-+msgstr "el ??ndice de la secci??n es demasiado extenso en la tabla din??mica de s??mbolo"
- 
- #: ../src/ldgeneric.c:5745
- #, fuzzy, c-format
-@@ -3524,7 +3532,7 @@ msgstr "%F%P: no se puede crear la tabla
- #: ../src/ldgeneric.c:5818
- #, c-format
- msgid "cannot create dynamic symbol table for output file: %s"
--msgstr ""
-+msgstr "no es posible crear tabla din??mica de s??mbolo para el archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:5994
- #, fuzzy, c-format
-@@ -3555,9 +3563,9 @@ msgid "while determining file layout: %s
- msgstr "Error al crear el archivo %B."
- 
- #: ../src/ldgeneric.c:6388
--#, c-format
-+#, fuzzy, c-format
- msgid "internal error: non-nobits section follows nobits section"
--msgstr ""
-+msgstr "error interno: secci??n non-nobits a continuaci??n de secci??n nobits"
- 
- #: ../src/ldgeneric.c:6925
- #, fuzzy, c-format
-@@ -3593,7 +3601,7 @@ msgstr "no se puede generar el fichero d
- #: ../src/ldgeneric.c:7011
- #, c-format
- msgid "WARNING: temporary output file overwritten before linking finished"
--msgstr ""
-+msgstr "AVISO: archivo de salida temporar sobreescrito antes que haya concluido el enlazamiento"
- 
- #. This cannot be implemented generally.  There should have been a
- #. machine dependent implementation and we should never have arrived
-@@ -3630,9 +3638,9 @@ msgid "cannot allocate GOTPLT section: %
- msgstr "No se puede asignar espacio para el b??fer"
- 
- #: ../src/i386_ld.c:661
--#, c-format
-+#, fuzzy, c-format
- msgid "initial-executable TLS relocation cannot be used "
--msgstr ""
-+msgstr "no es posible utilizar el realojamiento del TLS ejecutable en el inicio"
- 
- #: ../src/ldscript.y:178
- #, fuzzy
-@@ -3650,36 +3658,38 @@ msgid "while reading linker script '%s':
- msgstr "Se encontr?? fin de archivo en la l??nea %d, antes de terminar de leer los datos."
- 
- #: ../src/ldscript.y:745
--#, c-format
-+#, fuzzy, c-format
- msgid "symbol '%s' in declared both local and global for unnamed version"
--msgstr ""
-+msgstr "el s??mbolo '%s' en declarado tanto local como global para la versi??n no identificada"
- 
- #: ../src/ldscript.y:747
--#, c-format
-+#, fuzzy, c-format
- msgid "symbol '%s' in declared both local and global for version '%s'"
--msgstr ""
-+msgstr "el s??mbolo '%s' en declarado tanto local como global para la versi??n '%s'"
- 
- #: ../src/ldscript.y:767
- #: ../src/ldscript.y:774
--#, c-format
-+#, fuzzy, c-format
- msgid "default visibility set as local and global"
--msgstr ""
-+msgstr "la visibilidad establecida por defecto est?? definida tanto local como global"
- 
- #: ../src/elflint.c:71
- msgid "Be extremely strict, flag level 2 features."
--msgstr ""
-+msgstr "Sea extremadamente estricto, recursos de marca de nivel 2."
- 
- #: ../src/elflint.c:72
- msgid "Do not print anything if successful"
--msgstr ""
-+msgstr "No imprime nada si es exitoso"
- 
- #: ../src/elflint.c:73
-+#, fuzzy
- msgid "Binary is a separate debuginfo file"
--msgstr ""
-+msgstr "Binario es un archivo debuginfo diferente "
- 
- #: ../src/elflint.c:75
-+#, fuzzy
- msgid "Binary has been created with GNU ld and is therefore known to be broken in certain ways"
--msgstr ""
-+msgstr "Binario ha sido creado con GNU Id y por lo tanto es sabido que puede ser roto de determinadas maneras"
- 
- #. Short description of program.
- #: ../src/elflint.c:81
-@@ -3702,9 +3712,9 @@ msgid "No errors"
- msgstr "    NO SE HAN ENCONTRADO ERRORES\n"
- 
- #: ../src/elflint.c:301
--#, c-format
-+#, fuzzy, c-format
- msgid " error while freeing sub-ELF descriptor: %s\n"
--msgstr ""
-+msgstr " error al intentar liberar descriptor sub-ELF: %s\n"
- 
- #. We cannot do anything.
- #: ../src/elflint.c:309
-@@ -3715,17 +3725,17 @@ msgstr "No es un fichero ELF - tiene los
- #: ../src/elflint.c:368
- #, c-format
- msgid "e_ident[%d] == %d is no known class\n"
--msgstr ""
-+msgstr "e_ident[%d] == %d es una clase desconocida\n"
- 
- #: ../src/elflint.c:373
- #, c-format
- msgid "e_ident[%d] == %d is no known data encoding\n"
--msgstr ""
-+msgstr "e_ident[%d] == %d es una codificaci??n de datos desconocida\n"
- 
- #: ../src/elflint.c:377
- #, c-format
- msgid "unknown ELF header version number e_ident[%d] == %d\n"
--msgstr ""
-+msgstr "n??mero de versi??n de encabezado ELF desconocido e_ident[%d] == %d\n"
- 
- #: ../src/elflint.c:382
- #, fuzzy, c-format
-@@ -3763,14 +3773,14 @@ msgid "invalid program header offset\n"
- msgstr "Operando inv??lido para `OFFSET'"
- 
- #: ../src/elflint.c:417
--#, c-format
-+#, fuzzy, c-format
- msgid "executables and DSOs cannot have zero program header offset\n"
--msgstr ""
-+msgstr "tanto los ejecutables como los DSOs no pueden tener offset de encabezado de programa cero\n"
- 
- #: ../src/elflint.c:421
- #, c-format
- msgid "invalid number of program header entries\n"
--msgstr ""
-+msgstr "cantidad no v??lida de entradas del encabezado del programa\n"
- 
- #: ../src/elflint.c:429
- #, fuzzy, c-format
-@@ -3780,12 +3790,12 @@ msgstr "fall?? la asignaci??n de la tabl
- #: ../src/elflint.c:432
- #, c-format
- msgid "section header table must be present\n"
--msgstr ""
-+msgstr "debe encontrarse presente una tabla de encabezado de secci??n\n"
- 
- #: ../src/elflint.c:446
- #, c-format
- msgid "invalid number of section header table entries\n"
--msgstr ""
-+msgstr "cantidad no v??lida de entradas en la tabla del encabezado de secci??n\n"
- 
- #: ../src/elflint.c:463
- #, fuzzy, c-format
-@@ -3801,41 +3811,41 @@ msgstr "%P%F: sintaxis inv??lida en los 
- #: ../src/elflint.c:492
- #, c-format
- msgid "invalid ELF header size: %hd\n"
--msgstr ""
-+msgstr "tama??o inv??lido del encabezado ELF: %hd\n"
- 
- #: ../src/elflint.c:478
- #: ../src/elflint.c:495
- #, c-format
- msgid "invalid program header size: %hd\n"
--msgstr ""
-+msgstr "tama??o inv??lido del encabezado del programa: %hd\n"
- 
- #: ../src/elflint.c:481
- #: ../src/elflint.c:498
- #, c-format
- msgid "invalid program header position or size\n"
--msgstr ""
-+msgstr "tama??o o posici??n no v??lidos del encabezado del programa\n"
- 
- #: ../src/elflint.c:484
- #: ../src/elflint.c:501
- #, c-format
- msgid "invalid section header size: %hd\n"
--msgstr ""
-+msgstr "tama??o inv??lido del encabezado de secci??n: %hd\n"
- 
- #: ../src/elflint.c:487
- #: ../src/elflint.c:504
- #, c-format
- msgid "invalid section header position or size\n"
--msgstr ""
-+msgstr "tama??o o posici??n no v??lidos del encabezado de secci??n\n"
- 
- #: ../src/elflint.c:548
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': section with SHF_GROUP flag set not part of a section group\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': secci??n definida con la marca SHF_GROUP no es parte de una secci??n de grupo\n"
- 
- #: ../src/elflint.c:552
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': section group [%2zu] '%s' does not preceed group member\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': el grupo de secci??n [%2zu] '%s' no precede a ning??n miembro de grupo\n"
- 
- #: ../src/elflint.c:568
- #: ../src/elflint.c:1393
-@@ -3855,17 +3865,17 @@ msgstr "%C: No se puede obtener el conte
- #: ../src/elflint.c:1559
- #, c-format
- msgid "section [%2d] '%s': referenced as string table for section [%2d] '%s' but type is not SHT_STRTAB\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': est?? referenciado como una tabla de cadena para la secci??n [%2d] '%s' pero no es de tipo SHT_STRTAB\n"
- 
- #: ../src/elflint.c:604
- #, c-format
- msgid "section [%2d] '%s': symbol table cannot have more than one extended index section\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': la tabla de s??mbolo no puede tener m??s de una secci??n de ??ndice extendido\n"
- 
- #: ../src/elflint.c:615
- #, c-format
- msgid "section [%2u] '%s': entry size is does not match ElfXX_Sym\n"
--msgstr ""
-+msgstr "secci??n [%2u] '%s': el tama??o de la entrada no cincide con ElfXX_Sym\n"
- 
- #: ../src/elflint.c:624
- #, fuzzy, c-format
-@@ -3878,55 +3888,55 @@ msgstr "no se puede definir el s??mbolo 
- #: ../src/elflint.c:638
- #: ../src/elflint.c:641
- #: ../src/elflint.c:644
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': '%s' in zeroth entry not zero\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': '%s' en la entrada zeroth no es igual cero\n"
- 
- #: ../src/elflint.c:647
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': XINDEX for zeroth entry not zero\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': XINDEX en la entrada zeroth no es igual cero\n"
- 
- #: ../src/elflint.c:657
- #, c-format
- msgid "section [%2d] '%s': cannot get symbol %zu: %s\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': no es posible obtener el s??mbolo %zu: %s\n"
- 
- #: ../src/elflint.c:666
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: invalid name value\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: valor de nombre inv??lido\n"
- 
- #: ../src/elflint.c:679
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': symbol %zu: too large section index but no extended section index section\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: el ??ndice de secci??n es demasiado extenso, y no no existe una secci??n para ??ndice de secci??n extendido\n"
- 
- #: ../src/elflint.c:685
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: XINDEX used for index which would fit in st_shndx (%<PRIu32>)\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolol %zu: XINDEX es utilizado para ??ndice que pueda caber en st_shndx (%<PRIu32>)\n"
- 
- #. || sym->st_shndx > SHN_HIRESERVE  always false
- #: ../src/elflint.c:697
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: invalid section index\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: ??ndice de secci??n inv??lido\n"
- 
- #: ../src/elflint.c:705
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: unknown type\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: tipo desconocido\n"
- 
- #: ../src/elflint.c:709
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: unknown symbol binding\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: asociaci??n de s??mbolo desconocida\n"
- 
- #: ../src/elflint.c:717
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: COMMON only allowed in relocatable files\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: COMMON solo es permitido en archivos realojables\n"
- 
- #: ../src/elflint.c:721
- #, c-format
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
 @@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- elfutils-robustify.patch	24 Apr 2009 20:36:23 -0000	1.16
+++ elfutils-robustify.patch	24 Apr 2009 20:44:20 -0000	1.17
@@ -790,930 +790,6 @@
 +#endif
 +
  #endif  /* libelfP.h */
---- elfutils/po/es.po
-+++ elfutils/po/es.po
-@@ -2085,7 +2085,7 @@ msgstr "no"
- #: ../src/readelf.c:4105
- #, c-format
- msgid "cannot get .debug_aranges content: %s"
--msgstr ""
-+msgstr "no se ha podido obtener contenido de .debug_aranges: %s"
- 
- #: ../src/readelf.c:4110
- #, c-format
-@@ -2111,7 +2111,7 @@ msgstr ""
- #: ../src/readelf.c:4161
- #, c-format
- msgid "cannot get .debug_ranges content: %s"
--msgstr ""
-+msgstr "no se ha podido obtener contenido de .debug_ranges: %s"
- 
- #: ../src/readelf.c:4166
- #: ../src/readelf.c:4623
-@@ -2237,9 +2237,9 @@ msgid ""
- msgstr ""
- 
- #: ../src/readelf.c:5194
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot get DIE at offset %<PRIu64> in section '%s': %s"
--msgstr ""
-+msgstr "no se ha podido obtener DIE en offset %<PRIu64> en la secci??n '%s': %s"
- 
- #: ../src/readelf.c:5205
- #, fuzzy, c-format
-@@ -2247,9 +2247,9 @@ msgid "cannot get DIE offset: %s"
- msgstr "%s: no se puede desplazar a la posici??n %s"
- 
- #: ../src/readelf.c:5213
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot get tag of DIE at offset %<PRIu64> in section '%s': %s"
--msgstr ""
-+msgstr "no se ha podido obtener etiqueta de DIE en offset %<PRIu64> en la secci??n '%s': %s"
- 
- #: ../src/readelf.c:5242
- #, fuzzy, c-format
-@@ -2291,9 +2291,9 @@ msgid ""
- msgstr ""
- 
- #: ../src/readelf.c:5368
--#, c-format
-+#, fuzzy, c-format
- msgid "invalid data at offset %tu in section [%zu] '%s'"
--msgstr ""
-+msgstr "datos inv??lidos en offset %ty en la secci??n [%zu] '%s'"
- 
- #: ../src/readelf.c:5383
- #, fuzzy, c-format
-@@ -2326,9 +2326,9 @@ msgstr ""
- " Declaraciones de N??mero de L??nea:\n"
- 
- #: ../src/readelf.c:5497
--#, c-format
-+#, fuzzy, c-format
- msgid " special opcode %u: address+%u = %s, line%+d = %zu\n"
--msgstr ""
-+msgstr " special opcode %u: address+%u = %s, line%+d = %zu\n"
- 
- #: ../src/readelf.c:5517
- #, fuzzy, c-format
-@@ -2348,9 +2348,9 @@ msgid "set address to %s\n"
- msgstr "La direcci??n de la secci??n %s se estableci?? a "
- 
- #: ../src/readelf.c:5558
--#, c-format
-+#, fuzzy, c-format
- msgid "define new file: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n"
--msgstr ""
-+msgstr "definir nuevo archivo: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n"
- 
- #. Unknown, ignore it.
- #: ../src/readelf.c:5567
-@@ -2403,7 +2403,7 @@ msgstr "  Avanzar el PC por %lu para %lx
- #: ../src/readelf.c:5657
- #, c-format
- msgid "advance address by fixed value %u to %s\n"
--msgstr ""
-+msgstr "direcci??n avanzada arreglando el valor %u a %s\n"
- 
- #. Takes no argument.
- #: ../src/readelf.c:5666
-@@ -2430,7 +2430,7 @@ msgstr[1] ""
- #: ../src/readelf.c:5712
- #, c-format
- msgid "cannot get .debug_loc content: %s"
--msgstr ""
-+msgstr "no es posible obtener contenido de .debug_loc: %s"
- 
- #. First entry in a list.
- #: ../src/readelf.c:5767
-@@ -2446,17 +2446,17 @@ msgstr "           %s..%s"
- #: ../src/readelf.c:5822
- #, c-format
- msgid "cannot get macro information section data: %s"
--msgstr ""
-+msgstr "no es posible obtener datos de la secci??n de macro informaci??n: %s"
- 
- #: ../src/readelf.c:5901
- #, c-format
- msgid "%*s*** non-terminated string at end of section"
--msgstr ""
-+msgstr "%*s*** cadena no finalizada al final de la secci??n"
- 
- #: ../src/readelf.c:5969
--#, c-format
-+#, fuzzy, c-format
- msgid " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, name: %s\n"
--msgstr ""
-+msgstr " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, nombre: %s\n"
- 
- #: ../src/readelf.c:6008
- #, c-format
-@@ -2522,15 +2522,15 @@ msgid "invalid TType encoding"
- msgstr "especificada una codificaci??n inv??lida"
- 
- #: ../src/readelf.c:6303
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot get debug context descriptor: %s"
--msgstr ""
-+msgstr "no es posible obtener un descriptor de contexto de debug: %s"
- 
- #: ../src/readelf.c:6438
- #: ../src/readelf.c:7016
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot convert core note data: %s"
--msgstr ""
-+msgstr "no es posible convertir datos de la nota proncipal: %s"
- 
- #: ../src/readelf.c:6743
- #, fuzzy, c-format
-@@ -2594,7 +2594,7 @@ msgstr ""
- #: ../src/readelf.c:7287
- #, c-format
- msgid "cannot get data for section [%Zu] '%s': %s"
--msgstr ""
-+msgstr "no es posible obtener datos de la secci??n [%Zu] '%s': %s"
- 
- #: ../src/readelf.c:7269
- #, c-format
-@@ -2651,9 +2651,9 @@ msgid ""
- msgstr ""
- 
- #: ../src/readelf.c:7450
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot extract member at offset %Zu in '%s': %s"
--msgstr ""
-+msgstr "no es posible extraer miembro en offset %Zu in '%s': %s"
- 
- #: ../src/readelf.c:7455
- #, fuzzy, c-format
-@@ -2662,7 +2662,7 @@ msgstr "Comprueba si el archivador conti
- 
- #: ../src/size.c:68
- msgid "Use the output format FORMAT.  FORMAT can be `bsd' or `sysv'.  The default is `bsd'"
--msgstr ""
-+msgstr "Utilice el formato de salida FORMAT. FORMAT puede set tanto `bsd' como `sysv'. El establecido por defecto es `bsd'"
- 
- #: ../src/size.c:70
- #, fuzzy
-@@ -2691,20 +2691,20 @@ msgstr "lo mismo que --format=posix"
- 
- #: ../src/size.c:78
- msgid "Similar to `--format=sysv' output but in one line"
--msgstr ""
-+msgstr "Similar a la salida `--format=sysv' pero en una sola l??nea"
- 
- #: ../src/size.c:82
- msgid "Print size and permission flags for loadable segments"
--msgstr ""
-+msgstr "Imprime el tama??o y las marcas de permiso para los segmentos posibles de ser cargados"
- 
- #: ../src/size.c:83
- msgid "Display the total sizes (bsd only)"
--msgstr ""
-+msgstr "Muestra el tama??o total (bsd solamente)"
- 
- #. Short description of program.
- #: ../src/size.c:88
- msgid "List section sizes of FILEs (a.out by default)."
--msgstr ""
-+msgstr "Lista los tama??os de secci??n de FILEs (por defecto a.out). "
- 
- #: ../src/size.c:269
- #, fuzzy, c-format
-@@ -2733,8 +2733,9 @@ msgid "(TOTALS)\n"
- msgstr "calcular totales"
- 
- #: ../src/strip.c:73
-+#, fuzzy
- msgid "Place stripped output into FILE"
--msgstr ""
-+msgstr "Coloca la salida obtenida en FILE"
- 
- #: ../src/strip.c:74
- #, fuzzy
-@@ -2773,7 +2774,7 @@ msgstr " Remueve s??mbolos y secciones d
- #: ../src/strip.c:185
- #, c-format
- msgid "Only one input file allowed together with '-o' and '-f'"
--msgstr ""
-+msgstr "Solo se permite ingresar un archivo junto con '-o' y '-f'"
- 
- #: ../src/strip.c:221
- #, fuzzy, c-format
-@@ -2794,7 +2795,7 @@ msgstr "se desconoce la opci??n -m%s= es
- #: ../src/strip.c:259
- #, c-format
- msgid "-R option supports only .comment section"
--msgstr ""
-+msgstr "la opci??n -R es soportada s??lo en la secci??n .comment"
- 
- #: ../src/strip.c:297
- #: ../src/strip.c:321
-@@ -2808,9 +2809,9 @@ msgid "while opening '%s'"
- msgstr "mientras se abr??a %s"
- 
- #: ../src/strip.c:349
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: cannot use -o or -f when stripping archive"
--msgstr ""
-+msgstr "%s: no puede utilzarse -o o -f cuando se extrae un archivo"
- 
- #: ../src/strip.c:447
- #, fuzzy, c-format
-@@ -2892,7 +2893,7 @@ msgstr "Error al copiar ??%B??."
- #: ../src/strip.c:1808
- #, c-format
- msgid "cannot set access and modification date of '%s'"
--msgstr ""
-+msgstr "no es posible establecer acceso y fecha de modificaci??n de '%s'"
- 
- #: ../src/ld.c:87
- #, fuzzy
-@@ -2903,11 +2904,11 @@ msgstr ""
- 
- #: ../src/ld.c:89
- msgid "Include whole archives in the output from now on."
--msgstr ""
-+msgstr "A partir de ahora incluye archivos completos en la salida."
- 
- #: ../src/ld.c:91
- msgid "Stop including the whole arhives in the output."
--msgstr ""
-+msgstr "Deja de incluir archivos completos en la salida."
- 
- #: ../src/ld.c:92
- #: ../src/ld.c:106
-@@ -2933,11 +2934,12 @@ msgstr "RUTA"
- 
- #: ../src/ld.c:96
- msgid "Add PATH to list of directories files are searched in."
--msgstr ""
-+msgstr "Agrega PATH a la lista de los directorios en los que se realiza la b??squeda"
- 
- #: ../src/ld.c:98
-+#, fuzzy
- msgid "Only set DT_NEEDED for following dynamic libs if actually used"
--msgstr ""
-+msgstr "Solo se define DT_NEEDED para las librer??as din??micas siguientes, est??n siendo utilizadas"
- 
- #: ../src/ld.c:100
- #, fuzzy
-@@ -2946,7 +2948,7 @@ msgstr "Siempre establece DT_NEEDED para
- 
- #: ../src/ld.c:102
- msgid "Ignore LD_LIBRARY_PATH environment variable."
--msgstr ""
-+msgstr "Ignora la variable de entorno LD_LIBRARY_PATH."
- 
- #: ../src/ld.c:105
- #, fuzzy
-@@ -2962,7 +2964,7 @@ msgstr "  -o <fichero>             Coloc
- 
- #: ../src/ld.c:109
- msgid "Object is marked to not use default search path at runtime."
--msgstr ""
-+msgstr "Los objetos son marcados para que no utilicen el camino de b??squeda establecido por defecto en el momento de su ejecuci??n."
- 
- #: ../src/ld.c:111
- #, fuzzy
-@@ -2971,23 +2973,23 @@ msgstr "Apaga --whole-archive"
- 
- #: ../src/ld.c:112
- msgid "Default rules of extracting from archive; weak references are not enough."
--msgstr ""
-+msgstr "Reglas establecidas por defecto para extraer desde el archivo; las referencias d??biles no son suficientes."
- 
- #: ../src/ld.c:116
- msgid "Weak references cause extraction from archive."
--msgstr ""
-+msgstr "Referencias d??biles causan extracci??n desde archivo."
- 
- #: ../src/ld.c:118
- msgid "Allow multiple definitions; first is used."
--msgstr ""
-+msgstr "Permite definiciones m??ltiples; es utilizada la primera."
- 
- #: ../src/ld.c:120
- msgid "Disallow/allow undefined symbols in DSOs."
--msgstr ""
-+msgstr "Habilita/deshabilita s??mbolos indefinidos en DSOs."
- 
- #: ../src/ld.c:123
- msgid "Object requires immediate handling of $ORIGIN."
--msgstr ""
-+msgstr "Los objetos requieren manipulaci??n inmediata de $ORIGIN."
- 
- #: ../src/ld.c:125
- #, fuzzy
-@@ -3001,23 +3003,24 @@ msgstr "La constante nombrada '%s' en %L
- 
- #: ../src/ld.c:129
- msgid "Mark object to be initialized first."
--msgstr ""
-+msgstr "Marca el objeto para ser inicializado primero."
- 
- #: ../src/ld.c:131
-+#, fuzzy
- msgid "Enable/disable lazy-loading flag for following dependencies."
--msgstr ""
-+msgstr "Activa/desactiva marca lazy-loading para las siguientes dependencias."
- 
- #: ../src/ld.c:133
- msgid "Mark object as not loadable with 'dlopen'."
--msgstr ""
-+msgstr "Marca el objeto como no cargable con 'dlopen'"
- 
- #: ../src/ld.c:135
- msgid "Ignore/record dependencies on unused DSOs."
--msgstr ""
-+msgstr "Ignora/registra dependencias sobre DSOs no utilizados."
- 
- #: ../src/ld.c:137
- msgid "Generated DSO will be a system library."
--msgstr ""
-+msgstr "El DSO generado ser?? una librer??a del sistema. "
- 
- #: ../src/ld.c:138
- #, fuzzy
-@@ -3055,8 +3058,9 @@ msgid "Strip debugging symbols."
- msgstr "Descarta los s??mbolos de depuraci??n"
- 
- #: ../src/ld.c:149
-+#, fuzzy
- msgid "Assume pagesize for the target system to be SIZE."
--msgstr ""
-+msgstr "Asume que ser?? SIZE el pagesize para el objeto del sistema."
- 
- #: ../src/ld.c:151
- #, fuzzy
-@@ -3079,8 +3083,9 @@ msgid "Generate relocatable object."
- msgstr "Genera salida reubicable"
- 
- #: ../src/ld.c:159
-+#, fuzzy
- msgid "Causes symbol not assigned to a version be reduced to local."
--msgstr ""
-+msgstr "Hace que un s??mbolo no asinado a ninguna versi??n sea reducido a local."
- 
- #: ../src/ld.c:160
- #, fuzzy
-@@ -3108,15 +3113,17 @@ msgstr ""
- 
- #: ../src/ld.c:171
- msgid "Create .eh_frame_hdr section"
--msgstr ""
-+msgstr "Crea una secci??n .eh_frame_hdr"
- 
- #: ../src/ld.c:173
-+#, fuzzy
- msgid "Set hash style to sysv, gnu or both."
--msgstr ""
-+msgstr "Establece el hash style a sysv, gnu o ambos."
- 
- #: ../src/ld.c:175
-+#, fuzzy
- msgid "Generate build ID note (md5, sha1 (default), uuid)."
--msgstr ""
-+msgstr "Crea una nota del ID de compilaci??n (md5, sha1 (por defecto), uuid)."
- 
- #: ../src/ld.c:177
- #, fuzzy
-@@ -3135,7 +3142,7 @@ msgstr "Rastrea la apertura de ficheros"
- 
- #: ../src/ld.c:181
- msgid "Trade speed for less memory usage"
--msgstr ""
-+msgstr "Intercambia velocidad por menor utilizaci??n de la memoria"
- 
- #: ../src/ld.c:182
- #, fuzzy
-@@ -3168,8 +3175,9 @@ msgstr "|NOMBRE|usa el juego de caracter
- 
- #. Short description of program.
- #: ../src/ld.c:197
-+#, fuzzy
- msgid "Combine object and archive files."
--msgstr ""
-+msgstr "Combina objeto y archivos de almacenamiento."
- 
- #. Strings for arguments in help texts.
- #: ../src/ld.c:200
-@@ -3232,7 +3240,7 @@ msgstr "estilo de numeraci??n de cuerpo 
- #: ../src/ld.c:785
- #, c-format
- msgid "More than one output file name given."
--msgstr ""
-+msgstr "Se ha dado m??s de un nombre de arhivo de salido. "
- 
- #: ../src/ld.c:802
- #, fuzzy, c-format
-@@ -3257,7 +3265,7 @@ msgstr "El par??metro '%s' es desconocid
- #: ../src/ld.c:1150
- #, c-format
- msgid "could not find input file to determine output file format"
--msgstr ""
-+msgstr "no se ha podido encontrar un archivo de entrada que determine el formato del archivo de salida"
- 
- #: ../src/ld.c:1152
- #, fuzzy, c-format
-@@ -3284,19 +3292,19 @@ msgid "cannot create string table"
- msgstr "<??ndice de la tabla de cadenas: %3ld>"
- 
- #: ../src/ldgeneric.c:255
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot load ld backend library '%s': %s"
--msgstr ""
-+msgstr "no se ha podido cargar la librer??a ld backend '%s': %s"
- 
- #: ../src/ldgeneric.c:265
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot find init function in ld backend library '%s': %s"
--msgstr ""
-+msgstr "no se ha podido encontrar la funci??n init en la librer??a ld backend '%s': %s"
- 
- #: ../src/ldgeneric.c:310
- #, c-format
- msgid "%s listed more than once as input"
--msgstr ""
-+msgstr "%s listado m??s de una vez como entrada"
- 
- #: ../src/ldgeneric.c:424
- #, fuzzy, c-format
-@@ -3337,14 +3345,14 @@ msgstr "no se puede obtener el grupo de 
- #. despite the SHF_GROUP flag.  This is an error in the input
- #. file.
- #: ../src/ldgeneric.c:840
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: section '%s' with group flag set does not belong to any group"
--msgstr ""
-+msgstr "%s: la secci??n '%s' con el grupo definir marca no pertenece a ning??n grupo"
- 
- #: ../src/ldgeneric.c:885
- #, c-format
- msgid "%s: section [%2d] '%s' is not in the correct section group"
--msgstr ""
-+msgstr "%s: la secci??n [%2d] '%s' no se encuentra en el grupo de secci??n correcto"
- 
- #. This should never happen.
- #: ../src/ldgeneric.c:1156
-@@ -3361,22 +3369,22 @@ msgstr "Versi??n de ABI del fichero ELF 
- #: ../src/ldgeneric.c:1250
- #, c-format
- msgid "%s: only files of type ET_REL might contain section groups"
--msgstr ""
-+msgstr "%s: solo archivos de tipo ET_REL pueden contener grupos de secci??n"
- 
- #: ../src/ldgeneric.c:1302
- #, c-format
- msgid "%s: cannot determine signature of section group [%2zd] '%s': %s"
--msgstr ""
-+msgstr "%s: no es posible determinar la firma del grupo de secci??n [%2zd] '%s': %s "
- 
- #: ../src/ldgeneric.c:1314
- #, c-format
- msgid "%s: cannot get content of section group [%2zd] '%s': %s'"
--msgstr ""
-+msgstr "%s: no es posible obtener el contenido de la secci??n del grupo [%2zd] '%s': %s'"
- 
- #: ../src/ldgeneric.c:1328
- #, c-format
- msgid "%s: group member %zu of section group [%2zd] '%s' has too high index: %<PRIu32>"
--msgstr ""
-+msgstr "%s el miembro del grupo %zu del grupo de secci??n [%2zd] '%s' posee el ??ndice demsiado alto: %<PRIu32>"
- 
- #: ../src/ldgeneric.c:1350
- #, fuzzy, c-format
-@@ -3386,7 +3394,7 @@ msgstr "%s tiene un tipo de fichero desc
- #: ../src/ldgeneric.c:1729
- #, c-format
- msgid "cannot get descriptor for ELF file (%s:%d): %s\n"
--msgstr ""
-+msgstr "no es posible obtener descriptor para el archivo ELF (%s:%d): %s\n"
- 
- #: ../src/ldgeneric.c:1899
- #, fuzzy, c-format
-@@ -3401,17 +3409,17 @@ msgstr "El archivo de zona no puede ser 
- #: ../src/ldgeneric.c:2032
- #, c-format
- msgid "%s: input file incompatible with ELF machine type %s\n"
--msgstr ""
-+msgstr "%s: el archivo ingresado es incompatible con una m??quina ELF tipo %s\n"
- 
- #: ../src/ldgeneric.c:2044
- #, c-format
- msgid "%s: cannot get section header string table index: %s\n"
--msgstr ""
-+msgstr "%s: no se ha podido obtener un ??ndice para la tabla de la cadena del encabezado de la secci??n: %s\n"
- 
- #: ../src/ldgeneric.c:2073
- #, c-format
- msgid "cannot use DSO '%s' when generating relocatable object file"
--msgstr ""
-+msgstr "no es posible utilizar DSO '%s' al general un archivo de objeto realojable"
- 
- #: ../src/ldgeneric.c:2158
- #, fuzzy, c-format
-@@ -3429,12 +3437,12 @@ msgstr "s??mbolo indefinido `%s' en la o
- #: ../src/ldgeneric.c:2702
- #, c-format
- msgid "cannot create ELF descriptor for output file: %s"
--msgstr ""
-+msgstr "no es posible crear un descriptor ELF para el archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:2709
- #, c-format
- msgid "could not create ELF header for output file: %s"
--msgstr ""
-+msgstr "no es posible crear un encabezado ELF para el archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:3224
- #: ../src/ldgeneric.c:3294
-@@ -3453,14 +3461,14 @@ msgid "cannot create section for output 
- msgstr "no se puede crear el fichero de salida `%s' para la categor??a `%s'"
- 
- #: ../src/ldgeneric.c:3444
--#, c-format
-+#, fuzzy, c-format
- msgid "address computation expression contains variable '%s'"
--msgstr ""
-+msgstr "las expresiones de direcci??n en lenguaje de computaci??n contienen la variable '%s'"
- 
- #: ../src/ldgeneric.c:3489
--#, c-format
-+#, fuzzy, c-format
- msgid "argument '%<PRIuMAX>' of ALIGN in address computation expression is no power of two"
--msgstr ""
-+msgstr "el argumento '%<PRIuMAX>' de ALIGN en direcciones de expresiones computacionales es no m??s poderoso que dos "
- 
- #: ../src/ldgeneric.c:3684
- #, fuzzy, c-format
-@@ -3470,17 +3478,17 @@ msgstr "%P: aviso: no se puede encontrar
- #: ../src/ldgeneric.c:3690
- #, c-format
- msgid "no entry symbol specified: defaulting to %#0*<PRIx64>"
--msgstr ""
-+msgstr "no se ha especificado una entrada de s??mbolo: estableciendo por defecto a %#0*<PRIx64>"
- 
- #: ../src/ldgeneric.c:3920
--#, c-format
-+#, fuzzy, c-format
- msgid "cannot create GNU hash table section for output file: %s"
--msgstr ""
-+msgstr "no es posible crear una secci??n para la tabla GNU hash del archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:4071
- #, c-format
- msgid "cannot create hash table section for output file: %s"
--msgstr ""
-+msgstr "no es posible crear una secci??n para la tabla hash del archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:4114
- #, fuzzy, c-format
-@@ -3490,17 +3498,17 @@ msgstr "%F%P: no se puede crear la tabla
- #: ../src/ldgeneric.c:4191
- #, c-format
- msgid "cannot convert section data to file format: %s"
--msgstr ""
-+msgstr "no es posible convertir los datos de la secci??n en formato de archivo: %s"
- 
- #: ../src/ldgeneric.c:4200
- #, c-format
- msgid "cannot convert section data to memory format: %s"
--msgstr ""
-+msgstr "no es posible convertir datos de la secci??n en formato de memoria: %s"
- 
- #: ../src/ldgeneric.c:4261
- #, c-format
- msgid "cannot read enough data for UUID"
--msgstr ""
-+msgstr "no es posible leer suficientes datos para el UUID"
- 
- #: ../src/ldgeneric.c:4358
- #: ../src/ldgeneric.c:4379
-@@ -3508,13 +3516,13 @@ msgstr ""
- #: ../src/ldgeneric.c:6062
- #, c-format
- msgid "cannot create symbol table for output file: %s"
--msgstr ""
-+msgstr "no es posible crear tabla de s??mbolo para el comando de salida: %s"
- 
- #: ../src/ldgeneric.c:5300
- #: ../src/ldgeneric.c:5852
--#, c-format
-+#, fuzzy, c-format
- msgid "section index too large in dynamic symbol table"
--msgstr ""
-+msgstr "el ??ndice de la secci??n es demasiado extenso en la tabla din??mica de s??mbolo"
- 
- #: ../src/ldgeneric.c:5745
- #, fuzzy, c-format
-@@ -3524,7 +3532,7 @@ msgstr "%F%P: no se puede crear la tabla
- #: ../src/ldgeneric.c:5818
- #, c-format
- msgid "cannot create dynamic symbol table for output file: %s"
--msgstr ""
-+msgstr "no es posible crear tabla din??mica de s??mbolo para el archivo de salida: %s"
- 
- #: ../src/ldgeneric.c:5994
- #, fuzzy, c-format
-@@ -3555,9 +3563,9 @@ msgid "while determining file layout: %s
- msgstr "Error al crear el archivo %B."
- 
- #: ../src/ldgeneric.c:6388
--#, c-format
-+#, fuzzy, c-format
- msgid "internal error: non-nobits section follows nobits section"
--msgstr ""
-+msgstr "error interno: secci??n non-nobits a continuaci??n de secci??n nobits"
- 
- #: ../src/ldgeneric.c:6925
- #, fuzzy, c-format
-@@ -3593,7 +3601,7 @@ msgstr "no se puede generar el fichero d
- #: ../src/ldgeneric.c:7011
- #, c-format
- msgid "WARNING: temporary output file overwritten before linking finished"
--msgstr ""
-+msgstr "AVISO: archivo de salida temporar sobreescrito antes que haya concluido el enlazamiento"
- 
- #. This cannot be implemented generally.  There should have been a
- #. machine dependent implementation and we should never have arrived
-@@ -3630,9 +3638,9 @@ msgid "cannot allocate GOTPLT section: %
- msgstr "No se puede asignar espacio para el b??fer"
- 
- #: ../src/i386_ld.c:661
--#, c-format
-+#, fuzzy, c-format
- msgid "initial-executable TLS relocation cannot be used "
--msgstr ""
-+msgstr "no es posible utilizar el realojamiento del TLS ejecutable en el inicio"
- 
- #: ../src/ldscript.y:178
- #, fuzzy
-@@ -3650,36 +3658,38 @@ msgid "while reading linker script '%s':
- msgstr "Se encontr?? fin de archivo en la l??nea %d, antes de terminar de leer los datos."
- 
- #: ../src/ldscript.y:745
--#, c-format
-+#, fuzzy, c-format
- msgid "symbol '%s' in declared both local and global for unnamed version"
--msgstr ""
-+msgstr "el s??mbolo '%s' en declarado tanto local como global para la versi??n no identificada"
- 
- #: ../src/ldscript.y:747
--#, c-format
-+#, fuzzy, c-format
- msgid "symbol '%s' in declared both local and global for version '%s'"
--msgstr ""
-+msgstr "el s??mbolo '%s' en declarado tanto local como global para la versi??n '%s'"
- 
- #: ../src/ldscript.y:767
- #: ../src/ldscript.y:774
--#, c-format
-+#, fuzzy, c-format
- msgid "default visibility set as local and global"
--msgstr ""
-+msgstr "la visibilidad establecida por defecto est?? definida tanto local como global"
- 
- #: ../src/elflint.c:71
- msgid "Be extremely strict, flag level 2 features."
--msgstr ""
-+msgstr "Sea extremadamente estricto, recursos de marca de nivel 2."
- 
- #: ../src/elflint.c:72
- msgid "Do not print anything if successful"
--msgstr ""
-+msgstr "No imprime nada si es exitoso"
- 
- #: ../src/elflint.c:73
-+#, fuzzy
- msgid "Binary is a separate debuginfo file"
--msgstr ""
-+msgstr "Binario es un archivo debuginfo diferente "
- 
- #: ../src/elflint.c:75
-+#, fuzzy
- msgid "Binary has been created with GNU ld and is therefore known to be broken in certain ways"
--msgstr ""
-+msgstr "Binario ha sido creado con GNU Id y por lo tanto es sabido que puede ser roto de determinadas maneras"
- 
- #. Short description of program.
- #: ../src/elflint.c:81
-@@ -3702,9 +3712,9 @@ msgid "No errors"
- msgstr "    NO SE HAN ENCONTRADO ERRORES\n"
- 
- #: ../src/elflint.c:301
--#, c-format
-+#, fuzzy, c-format
- msgid " error while freeing sub-ELF descriptor: %s\n"
--msgstr ""
-+msgstr " error al intentar liberar descriptor sub-ELF: %s\n"
- 
- #. We cannot do anything.
- #: ../src/elflint.c:309
-@@ -3715,17 +3725,17 @@ msgstr "No es un fichero ELF - tiene los
- #: ../src/elflint.c:368
- #, c-format
- msgid "e_ident[%d] == %d is no known class\n"
--msgstr ""
-+msgstr "e_ident[%d] == %d es una clase desconocida\n"
- 
- #: ../src/elflint.c:373
- #, c-format
- msgid "e_ident[%d] == %d is no known data encoding\n"
--msgstr ""
-+msgstr "e_ident[%d] == %d es una codificaci??n de datos desconocida\n"
- 
- #: ../src/elflint.c:377
- #, c-format
- msgid "unknown ELF header version number e_ident[%d] == %d\n"
--msgstr ""
-+msgstr "n??mero de versi??n de encabezado ELF desconocido e_ident[%d] == %d\n"
- 
- #: ../src/elflint.c:382
- #, fuzzy, c-format
-@@ -3763,14 +3773,14 @@ msgid "invalid program header offset\n"
- msgstr "Operando inv??lido para `OFFSET'"
- 
- #: ../src/elflint.c:417
--#, c-format
-+#, fuzzy, c-format
- msgid "executables and DSOs cannot have zero program header offset\n"
--msgstr ""
-+msgstr "tanto los ejecutables como los DSOs no pueden tener offset de encabezado de programa cero\n"
- 
- #: ../src/elflint.c:421
- #, c-format
- msgid "invalid number of program header entries\n"
--msgstr ""
-+msgstr "cantidad no v??lida de entradas del encabezado del programa\n"
- 
- #: ../src/elflint.c:429
- #, fuzzy, c-format
-@@ -3780,12 +3790,12 @@ msgstr "fall?? la asignaci??n de la tabl
- #: ../src/elflint.c:432
- #, c-format
- msgid "section header table must be present\n"
--msgstr ""
-+msgstr "debe encontrarse presente una tabla de encabezado de secci??n\n"
- 
- #: ../src/elflint.c:446
- #, c-format
- msgid "invalid number of section header table entries\n"
--msgstr ""
-+msgstr "cantidad no v??lida de entradas en la tabla del encabezado de secci??n\n"
- 
- #: ../src/elflint.c:463
- #, fuzzy, c-format
-@@ -3801,41 +3811,41 @@ msgstr "%P%F: sintaxis inv??lida en los 
- #: ../src/elflint.c:492
- #, c-format
- msgid "invalid ELF header size: %hd\n"
--msgstr ""
-+msgstr "tama??o inv??lido del encabezado ELF: %hd\n"
- 
- #: ../src/elflint.c:478
- #: ../src/elflint.c:495
- #, c-format
- msgid "invalid program header size: %hd\n"
--msgstr ""
-+msgstr "tama??o inv??lido del encabezado del programa: %hd\n"
- 
- #: ../src/elflint.c:481
- #: ../src/elflint.c:498
- #, c-format
- msgid "invalid program header position or size\n"
--msgstr ""
-+msgstr "tama??o o posici??n no v??lidos del encabezado del programa\n"
- 
- #: ../src/elflint.c:484
- #: ../src/elflint.c:501
- #, c-format
- msgid "invalid section header size: %hd\n"
--msgstr ""
-+msgstr "tama??o inv??lido del encabezado de secci??n: %hd\n"
- 
- #: ../src/elflint.c:487
- #: ../src/elflint.c:504
- #, c-format
- msgid "invalid section header position or size\n"
--msgstr ""
-+msgstr "tama??o o posici??n no v??lidos del encabezado de secci??n\n"
- 
- #: ../src/elflint.c:548
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': section with SHF_GROUP flag set not part of a section group\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': secci??n definida con la marca SHF_GROUP no es parte de una secci??n de grupo\n"
- 
- #: ../src/elflint.c:552
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': section group [%2zu] '%s' does not preceed group member\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': el grupo de secci??n [%2zu] '%s' no precede a ning??n miembro de grupo\n"
- 
- #: ../src/elflint.c:568
- #: ../src/elflint.c:1393
-@@ -3855,17 +3865,17 @@ msgstr "%C: No se puede obtener el conte
- #: ../src/elflint.c:1559
- #, c-format
- msgid "section [%2d] '%s': referenced as string table for section [%2d] '%s' but type is not SHT_STRTAB\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': est?? referenciado como una tabla de cadena para la secci??n [%2d] '%s' pero no es de tipo SHT_STRTAB\n"
- 
- #: ../src/elflint.c:604
- #, c-format
- msgid "section [%2d] '%s': symbol table cannot have more than one extended index section\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': la tabla de s??mbolo no puede tener m??s de una secci??n de ??ndice extendido\n"
- 
- #: ../src/elflint.c:615
- #, c-format
- msgid "section [%2u] '%s': entry size is does not match ElfXX_Sym\n"
--msgstr ""
-+msgstr "secci??n [%2u] '%s': el tama??o de la entrada no cincide con ElfXX_Sym\n"
- 
- #: ../src/elflint.c:624
- #, fuzzy, c-format
-@@ -3878,55 +3888,55 @@ msgstr "no se puede definir el s??mbolo 
- #: ../src/elflint.c:638
- #: ../src/elflint.c:641
- #: ../src/elflint.c:644
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': '%s' in zeroth entry not zero\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': '%s' en la entrada zeroth no es igual cero\n"
- 
- #: ../src/elflint.c:647
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': XINDEX for zeroth entry not zero\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': XINDEX en la entrada zeroth no es igual cero\n"
- 
- #: ../src/elflint.c:657
- #, c-format
- msgid "section [%2d] '%s': cannot get symbol %zu: %s\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': no es posible obtener el s??mbolo %zu: %s\n"
- 
- #: ../src/elflint.c:666
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: invalid name value\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: valor de nombre inv??lido\n"
- 
- #: ../src/elflint.c:679
--#, c-format
-+#, fuzzy, c-format
- msgid "section [%2d] '%s': symbol %zu: too large section index but no extended section index section\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: el ??ndice de secci??n es demasiado extenso, y no no existe una secci??n para ??ndice de secci??n extendido\n"
- 
- #: ../src/elflint.c:685
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: XINDEX used for index which would fit in st_shndx (%<PRIu32>)\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolol %zu: XINDEX es utilizado para ??ndice que pueda caber en st_shndx (%<PRIu32>)\n"
- 
- #. || sym->st_shndx > SHN_HIRESERVE  always false
- #: ../src/elflint.c:697
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: invalid section index\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: ??ndice de secci??n inv??lido\n"
- 
- #: ../src/elflint.c:705
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: unknown type\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: tipo desconocido\n"
- 
- #: ../src/elflint.c:709
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: unknown symbol binding\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: asociaci??n de s??mbolo desconocida\n"
- 
- #: ../src/elflint.c:717
- #, c-format
- msgid "section [%2d] '%s': symbol %zu: COMMON only allowed in relocatable files\n"
--msgstr ""
-+msgstr "secci??n [%2d] '%s': s??mbolo %zu: COMMON solo es permitido en archivos realojables\n"
- 
- #: ../src/elflint.c:721
- #, c-format
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
 @@ -1376,6 +1376,16 @@



From cwickert at fedoraproject.org  Fri Apr 24 20:46:36 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 24 Apr 2009 20:46:36 +0000 (UTC)
Subject: rpms/lxpanel/F-11 lxpanel-0.2.8-manpage.patch,1.2,NONE
Message-ID: <20090424204636.4EE3A70106@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21889

Removed Files:
	lxpanel-0.2.8-manpage.patch 
Log Message:
remove obsolete patch


--- lxpanel-0.2.8-manpage.patch DELETED ---



From robert at fedoraproject.org  Fri Apr 24 20:48:37 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 20:48:37 +0000 (UTC)
Subject: rpms/sing/EL-4 sing-1.1-fedora.patch, NONE,
	1.1 sing-1.1-suid_log.patch, NONE, 1.1 sing.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424204837.1D50B70106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	sing-1.1-fedora.patch sing-1.1-suid_log.patch sing.spec 
Log Message:
Import sing into other Fedora/EPEL branches


sing-1.1-fedora.patch:

--- NEW FILE sing-1.1-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which removes
all references to internal libpcap and libnet to get the system libraries used. It
also removes internal CFLAGS definitation in favour of the system-wide one.

--- SING-1.1/configure.in			2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/configure.in.fedora		2009-04-18 04:33:04.000000000 +0200
@@ -7,20 +7,11 @@
 
 AM_CONFIG_HEADER(config.h)
 
-libpcapdir=libpcap-0.4
-libnetdir=Libnet-1.0.1b
-
-AC_SUBST(libpcapdir)
-AC_SUBST(libnetdir)
-
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(SING, 1.1)
 
 AC_PROG_CC
-if test -n "$GCC"; then
-      CFLAGS="-O3 -Wall"
-fi
 
 AC_STDC_HEADERS
 
@@ -44,45 +35,6 @@
 AC_CHECK_LIB(net, libnet_open_raw_sock, have_libnet=yes, have_libnet=no)
 
 dnl
-dnl libpcap...
-dnl
-PCAP_CLEAN="pcap_clean"
-PCAP_DISTCLEAN="pcap_distclean"
-CFLAGS="$CFLAGS -I$libpcapdir"
-
-if test $have_libpcap = yes; then
-  PCAP_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  PCAP_COMPILE="pcap_compile"
-  LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
-fi
-
-AC_SUBST(PCAP_CLEAN)
-AC_SUBST(PCAP_DISTCLEAN)
-AC_SUBST(PCAP_COMPILE)
-
-dnl
-dnl libnet...
-dnl
-LIBNET_CLEAN="libnet_clean"
-LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
-
-if test $have_libnet = yes; then
-  LIBNET_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  LIBNET_COMPILE="libnet_compile"
-  LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
-fi
-
-AC_SUBST(LIBNET_CLEAN)
-AC_SUBST(LIBNET_DISTCLEAN)
-AC_SUBST(LIBNET_COMPILE)
-
-
-dnl
 dnl Check headers
 dnl
 AC_CHECK_HEADERS(sys/sockio.h string.h strings.h bstring.h sys/ioctl.h)
@@ -144,7 +96,7 @@
            case "`uname -r`" in
                 2.4*)
                    AC_DEFINE(LINUX_24)
-                ;
+                ;;
                 2.2*)
                    AC_DEFINE(LINUX_22)
                 ;;
--- SING-1.1/Makefile.in			2001-04-18 13:11:06.000000000 +0200
+++ SING-1.1/Makefile.in.fedora			2009-04-18 04:18:04.000000000 +0200
@@ -67,18 +67,13 @@
 LIBNET_DISTCLEAN = @LIBNET_DISTCLEAN@
 MAKEDEPEND = @MAKEDEPEND@
 PACKAGE = @PACKAGE@
-PCAP_CLEAN = @PCAP_CLEAN@
-PCAP_COMPILE = @PCAP_COMPILE@
-PCAP_DISTCLEAN = @PCAP_DISTCLEAN@
 VERSION = @VERSION@
 getopt_OBJECTS = @getopt_OBJECTS@
 getopt_SOURCES = @getopt_SOURCES@
-libnetdir = @libnetdir@
-libpcapdir = @libpcapdir@
 
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
 
-LIBS = @LIBS@ -lpcap -lnet
+LIBS = @LIBS@ -lpcap `/usr/bin/libnet10-config --libs`
 
 bin_PROGRAMS = sing
 
@@ -94,7 +89,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `/usr/bin/libnet10-config --cflags --defines` -I.
 sing_OBJECTS =  sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
 sing_LDADD = $(LDADD)
 sing_DEPENDENCIES = 
@@ -111,7 +106,7 @@
 SOURCES = $(sing_SOURCES)
 OBJECTS = $(sing_OBJECTS)
 
-all: libpcap libnet all-redirect
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 
@@ -226,7 +221,7 @@
 
 
 help.o: help.c config.h
-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
+sing.o: sing.c config.h \
 	sing.h ipcompat.h misc.h packet.h dev_struct.h
 ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
 	misc.h
@@ -269,12 +264,12 @@
 
 clean-am:  clean-binPROGRAMS mostlyclean-am
 
-clean: clean-am pcap_clean libnet_clean
+clean: clean-am
 
 distclean-am:  distclean-hdr distclean-compile \
 		 distclean-generic clean-am
 
-distclean: distclean-am pcap_distclean libnet_distclean
+distclean: distclean-am
 	-rm -f config.status
 
 
@@ -290,38 +285,9 @@
 distclean-generic clean mostlyclean distclean
 
 
-clean-local:	@PCAP_CLEAN@ @LIBNET_CLEAN@
+clean-local:
 
-distclean-local:	@PCAP_DISTCLEAN@ @LIBNET_DISTCLEAN@
-
-libpcap:	pcap_conf @PCAP_COMPILE@
-
-pcap_conf:
-	@echo Configuring libpcap; cd $(libpcapdir); ./configure
-
-pcap_compile:
-	@echo Compiling libpcap; cd $(libpcapdir); $(MAKE)
-
-pcap_clean:
-	cd $(libpcapdir); $(MAKE) clean
-
-pcap_distclean:
-	cd $(libpcapdir); $(MAKE) distclean
-
-
-libnet: libnet_conf @LIBNET_COMPILE@
-
-libnet_conf:
-	@echo Configuring libnet; cd $(libnetdir); ./configure
-
-libnet_compile:
-	@echo Compiling libnet; cd $(libnetdir); $(MAKE)
-
-libnet_clean:
-	cd $(libnetdir); $(MAKE) clean
-
-libnet_distclean:
-	cd $(libnetdir); $(MAKE) distclean
+distclean-local:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

sing-1.1-suid_log.patch:

--- NEW FILE sing-1.1-suid_log.patch ---
Re-merged patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which
causes sing to drop privileges when opening log file and running sing suid; this is
CVE-2007-6211. The patch is originally from Nico Golde <nion at debian.org> and then
afterwards used by Alberto Gonzalez Iniesta <agi at inittab.org>.

Further information:
 - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6211
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454167

--- SING-1.1/parser.c				2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/parser.c.suid_log			2009-04-18 04:53:05.000000000 +0200
@@ -75,6 +75,8 @@
    struct protoent *proto;
    static struct mi_ifaz iface;
    struct sockaddr_in *aux2;
+   uid_t user_id;
+
    static struct option options[] =
    {
     { "help",    0, 0, 'h' },
@@ -380,8 +382,14 @@
        break;
        
        case 31:
+             user_id = getuid();
+             uid_t tmp_id = geteuid();
+
+             seteuid(user_id);
              if ( (packet->logfile = fopen(optarg, "a+")) == NULL )
                 go_out_error(1, "fopen");
+
+             seteuid(tmp_id);
        break;
        
        case 32:


--- NEW FILE sing.spec ---
Summary:	Sends fully customized ICMP packets from command line
Name:		sing
Version:	1.1
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.sourceforge.net/projects/%{name}/
Source:		http://downloads.sourceforge.net/%{name}/SING-%{version}.tgz
Patch0:		sing-1.1-fedora.patch
Patch1:		sing-1.1-suid_log.patch
BuildRequires:	%{_includedir}/pcap.h, libnet10-devel, automake, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sing is a little tool that sends fully customized ICMP packets from command
line. The main purpose is to replace/complement the nice ping command with
certain enhancements as:

 - Send fragmented and monster packets > 65534 bytes
 - Send/read spoofed packets
 - Send many ICMP Information types in addition to the echo request type,
   sent by default as address mask request, timestamp, information request,
   router solicitation and router advertisement
 - Send many ICMP error types: redirect, source quench, time exceeded,
   destination unreach and parameter problem
 - Send to host with loose or strict source routing
 - Use little fingerprinting techniques to discover Windows or Solaris boxes
 - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
   Unix and Windows at the moment

%prep
%setup -q -n SING-%{version}
%patch0 -p1 -b .fedora
%patch1 -p1 -b .sing_suid

# Rebuilding of configure file is needed for Patch0
autoconf

# Automake can't be run because of missing Makefile.am
cp -f %{_datadir}/automake-*/config.* .

%build
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o LEEME.utf8 LEEME
touch -c -r LEEME LEEME.utf8
mv -f LEEME.utf8 LEEME

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%lang(es) %doc LEEME
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

%changelog
* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.1-1
- Upgrade to 1.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sing/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:45:39 -0000	1.1
+++ .cvsignore	24 Apr 2009 20:48:06 -0000	1.2
@@ -0,0 +1 @@
+SING-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sing/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:45:39 -0000	1.1
+++ sources	24 Apr 2009 20:48:06 -0000	1.2
@@ -0,0 +1 @@
+f9f649c4b40174a983601d46e4a3daac  SING-1.1.tgz



From robert at fedoraproject.org  Fri Apr 24 20:48:38 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 20:48:38 +0000 (UTC)
Subject: rpms/sing/devel sing.spec,1.1,1.2
Message-ID: <20090424204838.D88C470106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985/devel

Modified Files:
	sing.spec 
Log Message:
Import sing into other Fedora/EPEL branches



Index: sing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sing/devel/sing.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sing.spec	24 Apr 2009 06:30:15 -0000	1.1
+++ sing.spec	24 Apr 2009 20:48:08 -0000	1.2
@@ -12,7 +12,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Sing is a little tool that sends ICMP packets fully customized from command
+Sing is a little tool that sends fully customized ICMP packets from command
 line. The main purpose is to replace/complement the nice ping command with
 certain enhancements as:
 
@@ -57,7 +57,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LEEME README THANKS
+%doc AUTHORS ChangeLog COPYING README THANKS
+%lang(es) %doc LEEME
 %{_sbindir}/%{name}
 %{_mandir}/man8/%{name}.8*
 



From robert at fedoraproject.org  Fri Apr 24 20:48:38 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 20:48:38 +0000 (UTC)
Subject: rpms/sing/F-9 sing-1.1-fedora.patch, NONE,
	1.1 sing-1.1-suid_log.patch, 
	NONE, 1.1 sing.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424204838.7CCE170106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	sing-1.1-fedora.patch sing-1.1-suid_log.patch sing.spec 
Log Message:
Import sing into other Fedora/EPEL branches


sing-1.1-fedora.patch:

--- NEW FILE sing-1.1-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which removes
all references to internal libpcap and libnet to get the system libraries used. It
also removes internal CFLAGS definitation in favour of the system-wide one.

--- SING-1.1/configure.in			2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/configure.in.fedora		2009-04-18 04:33:04.000000000 +0200
@@ -7,20 +7,11 @@
 
 AM_CONFIG_HEADER(config.h)
 
-libpcapdir=libpcap-0.4
-libnetdir=Libnet-1.0.1b
-
-AC_SUBST(libpcapdir)
-AC_SUBST(libnetdir)
-
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(SING, 1.1)
 
 AC_PROG_CC
-if test -n "$GCC"; then
-      CFLAGS="-O3 -Wall"
-fi
 
 AC_STDC_HEADERS
 
@@ -44,45 +35,6 @@
 AC_CHECK_LIB(net, libnet_open_raw_sock, have_libnet=yes, have_libnet=no)
 
 dnl
-dnl libpcap...
-dnl
-PCAP_CLEAN="pcap_clean"
-PCAP_DISTCLEAN="pcap_distclean"
-CFLAGS="$CFLAGS -I$libpcapdir"
-
-if test $have_libpcap = yes; then
-  PCAP_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  PCAP_COMPILE="pcap_compile"
-  LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
-fi
-
-AC_SUBST(PCAP_CLEAN)
-AC_SUBST(PCAP_DISTCLEAN)
-AC_SUBST(PCAP_COMPILE)
-
-dnl
-dnl libnet...
-dnl
-LIBNET_CLEAN="libnet_clean"
-LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
-
-if test $have_libnet = yes; then
-  LIBNET_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  LIBNET_COMPILE="libnet_compile"
-  LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
-fi
-
-AC_SUBST(LIBNET_CLEAN)
-AC_SUBST(LIBNET_DISTCLEAN)
-AC_SUBST(LIBNET_COMPILE)
-
-
-dnl
 dnl Check headers
 dnl
 AC_CHECK_HEADERS(sys/sockio.h string.h strings.h bstring.h sys/ioctl.h)
@@ -144,7 +96,7 @@
            case "`uname -r`" in
                 2.4*)
                    AC_DEFINE(LINUX_24)
-                ;
+                ;;
                 2.2*)
                    AC_DEFINE(LINUX_22)
                 ;;
--- SING-1.1/Makefile.in			2001-04-18 13:11:06.000000000 +0200
+++ SING-1.1/Makefile.in.fedora			2009-04-18 04:18:04.000000000 +0200
@@ -67,18 +67,13 @@
 LIBNET_DISTCLEAN = @LIBNET_DISTCLEAN@
 MAKEDEPEND = @MAKEDEPEND@
 PACKAGE = @PACKAGE@
-PCAP_CLEAN = @PCAP_CLEAN@
-PCAP_COMPILE = @PCAP_COMPILE@
-PCAP_DISTCLEAN = @PCAP_DISTCLEAN@
 VERSION = @VERSION@
 getopt_OBJECTS = @getopt_OBJECTS@
 getopt_SOURCES = @getopt_SOURCES@
-libnetdir = @libnetdir@
-libpcapdir = @libpcapdir@
 
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
 
-LIBS = @LIBS@ -lpcap -lnet
+LIBS = @LIBS@ -lpcap `/usr/bin/libnet10-config --libs`
 
 bin_PROGRAMS = sing
 
@@ -94,7 +89,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `/usr/bin/libnet10-config --cflags --defines` -I.
 sing_OBJECTS =  sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
 sing_LDADD = $(LDADD)
 sing_DEPENDENCIES = 
@@ -111,7 +106,7 @@
 SOURCES = $(sing_SOURCES)
 OBJECTS = $(sing_OBJECTS)
 
-all: libpcap libnet all-redirect
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 
@@ -226,7 +221,7 @@
 
 
 help.o: help.c config.h
-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
+sing.o: sing.c config.h \
 	sing.h ipcompat.h misc.h packet.h dev_struct.h
 ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
 	misc.h
@@ -269,12 +264,12 @@
 
 clean-am:  clean-binPROGRAMS mostlyclean-am
 
-clean: clean-am pcap_clean libnet_clean
+clean: clean-am
 
 distclean-am:  distclean-hdr distclean-compile \
 		 distclean-generic clean-am
 
-distclean: distclean-am pcap_distclean libnet_distclean
+distclean: distclean-am
 	-rm -f config.status
 
 
@@ -290,38 +285,9 @@
 distclean-generic clean mostlyclean distclean
 
 
-clean-local:	@PCAP_CLEAN@ @LIBNET_CLEAN@
+clean-local:
 
-distclean-local:	@PCAP_DISTCLEAN@ @LIBNET_DISTCLEAN@
-
-libpcap:	pcap_conf @PCAP_COMPILE@
-
-pcap_conf:
-	@echo Configuring libpcap; cd $(libpcapdir); ./configure
-
-pcap_compile:
-	@echo Compiling libpcap; cd $(libpcapdir); $(MAKE)
-
-pcap_clean:
-	cd $(libpcapdir); $(MAKE) clean
-
-pcap_distclean:
-	cd $(libpcapdir); $(MAKE) distclean
-
-
-libnet: libnet_conf @LIBNET_COMPILE@
-
-libnet_conf:
-	@echo Configuring libnet; cd $(libnetdir); ./configure
-
-libnet_compile:
-	@echo Compiling libnet; cd $(libnetdir); $(MAKE)
-
-libnet_clean:
-	cd $(libnetdir); $(MAKE) clean
-
-libnet_distclean:
-	cd $(libnetdir); $(MAKE) distclean
+distclean-local:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

sing-1.1-suid_log.patch:

--- NEW FILE sing-1.1-suid_log.patch ---
Re-merged patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which
causes sing to drop privileges when opening log file and running sing suid; this is
CVE-2007-6211. The patch is originally from Nico Golde <nion at debian.org> and then
afterwards used by Alberto Gonzalez Iniesta <agi at inittab.org>.

Further information:
 - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6211
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454167

--- SING-1.1/parser.c				2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/parser.c.suid_log			2009-04-18 04:53:05.000000000 +0200
@@ -75,6 +75,8 @@
    struct protoent *proto;
    static struct mi_ifaz iface;
    struct sockaddr_in *aux2;
+   uid_t user_id;
+
    static struct option options[] =
    {
     { "help",    0, 0, 'h' },
@@ -380,8 +382,14 @@
        break;
        
        case 31:
+             user_id = getuid();
+             uid_t tmp_id = geteuid();
+
+             seteuid(user_id);
              if ( (packet->logfile = fopen(optarg, "a+")) == NULL )
                 go_out_error(1, "fopen");
+
+             seteuid(tmp_id);
        break;
        
        case 32:


--- NEW FILE sing.spec ---
Summary:	Sends fully customized ICMP packets from command line
Name:		sing
Version:	1.1
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.sourceforge.net/projects/%{name}/
Source:		http://downloads.sourceforge.net/%{name}/SING-%{version}.tgz
Patch0:		sing-1.1-fedora.patch
Patch1:		sing-1.1-suid_log.patch
BuildRequires:	%{_includedir}/pcap.h, libnet10-devel, automake, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sing is a little tool that sends fully customized ICMP packets from command
line. The main purpose is to replace/complement the nice ping command with
certain enhancements as:

 - Send fragmented and monster packets > 65534 bytes
 - Send/read spoofed packets
 - Send many ICMP Information types in addition to the echo request type,
   sent by default as address mask request, timestamp, information request,
   router solicitation and router advertisement
 - Send many ICMP error types: redirect, source quench, time exceeded,
   destination unreach and parameter problem
 - Send to host with loose or strict source routing
 - Use little fingerprinting techniques to discover Windows or Solaris boxes
 - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
   Unix and Windows at the moment

%prep
%setup -q -n SING-%{version}
%patch0 -p1 -b .fedora
%patch1 -p1 -b .sing_suid

# Rebuilding of configure file is needed for Patch0
autoconf

# Automake can't be run because of missing Makefile.am
cp -f %{_datadir}/automake-*/config.* .

%build
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o LEEME.utf8 LEEME
touch -c -r LEEME LEEME.utf8
mv -f LEEME.utf8 LEEME

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%lang(es) %doc LEEME
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

%changelog
* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.1-1
- Upgrade to 1.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sing/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:45:39 -0000	1.1
+++ .cvsignore	24 Apr 2009 20:48:08 -0000	1.2
@@ -0,0 +1 @@
+SING-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sing/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:45:39 -0000	1.1
+++ sources	24 Apr 2009 20:48:08 -0000	1.2
@@ -0,0 +1 @@
+f9f649c4b40174a983601d46e4a3daac  SING-1.1.tgz



From robert at fedoraproject.org  Fri Apr 24 20:48:37 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 20:48:37 +0000 (UTC)
Subject: rpms/sing/F-10 sing-1.1-fedora.patch, NONE,
	1.1 sing-1.1-suid_log.patch, NONE, 1.1 sing.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424204837.C414F70106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	sing-1.1-fedora.patch sing-1.1-suid_log.patch sing.spec 
Log Message:
Import sing into other Fedora/EPEL branches


sing-1.1-fedora.patch:

--- NEW FILE sing-1.1-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which removes
all references to internal libpcap and libnet to get the system libraries used. It
also removes internal CFLAGS definitation in favour of the system-wide one.

--- SING-1.1/configure.in			2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/configure.in.fedora		2009-04-18 04:33:04.000000000 +0200
@@ -7,20 +7,11 @@
 
 AM_CONFIG_HEADER(config.h)
 
-libpcapdir=libpcap-0.4
-libnetdir=Libnet-1.0.1b
-
-AC_SUBST(libpcapdir)
-AC_SUBST(libnetdir)
-
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(SING, 1.1)
 
 AC_PROG_CC
-if test -n "$GCC"; then
-      CFLAGS="-O3 -Wall"
-fi
 
 AC_STDC_HEADERS
 
@@ -44,45 +35,6 @@
 AC_CHECK_LIB(net, libnet_open_raw_sock, have_libnet=yes, have_libnet=no)
 
 dnl
-dnl libpcap...
-dnl
-PCAP_CLEAN="pcap_clean"
-PCAP_DISTCLEAN="pcap_distclean"
-CFLAGS="$CFLAGS -I$libpcapdir"
-
-if test $have_libpcap = yes; then
-  PCAP_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  PCAP_COMPILE="pcap_compile"
-  LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
-fi
-
-AC_SUBST(PCAP_CLEAN)
-AC_SUBST(PCAP_DISTCLEAN)
-AC_SUBST(PCAP_COMPILE)
-
-dnl
-dnl libnet...
-dnl
-LIBNET_CLEAN="libnet_clean"
-LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
-
-if test $have_libnet = yes; then
-  LIBNET_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  LIBNET_COMPILE="libnet_compile"
-  LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
-fi
-
-AC_SUBST(LIBNET_CLEAN)
-AC_SUBST(LIBNET_DISTCLEAN)
-AC_SUBST(LIBNET_COMPILE)
-
-
-dnl
 dnl Check headers
 dnl
 AC_CHECK_HEADERS(sys/sockio.h string.h strings.h bstring.h sys/ioctl.h)
@@ -144,7 +96,7 @@
            case "`uname -r`" in
                 2.4*)
                    AC_DEFINE(LINUX_24)
-                ;
+                ;;
                 2.2*)
                    AC_DEFINE(LINUX_22)
                 ;;
--- SING-1.1/Makefile.in			2001-04-18 13:11:06.000000000 +0200
+++ SING-1.1/Makefile.in.fedora			2009-04-18 04:18:04.000000000 +0200
@@ -67,18 +67,13 @@
 LIBNET_DISTCLEAN = @LIBNET_DISTCLEAN@
 MAKEDEPEND = @MAKEDEPEND@
 PACKAGE = @PACKAGE@
-PCAP_CLEAN = @PCAP_CLEAN@
-PCAP_COMPILE = @PCAP_COMPILE@
-PCAP_DISTCLEAN = @PCAP_DISTCLEAN@
 VERSION = @VERSION@
 getopt_OBJECTS = @getopt_OBJECTS@
 getopt_SOURCES = @getopt_SOURCES@
-libnetdir = @libnetdir@
-libpcapdir = @libpcapdir@
 
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
 
-LIBS = @LIBS@ -lpcap -lnet
+LIBS = @LIBS@ -lpcap `/usr/bin/libnet10-config --libs`
 
 bin_PROGRAMS = sing
 
@@ -94,7 +89,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `/usr/bin/libnet10-config --cflags --defines` -I.
 sing_OBJECTS =  sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
 sing_LDADD = $(LDADD)
 sing_DEPENDENCIES = 
@@ -111,7 +106,7 @@
 SOURCES = $(sing_SOURCES)
 OBJECTS = $(sing_OBJECTS)
 
-all: libpcap libnet all-redirect
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 
@@ -226,7 +221,7 @@
 
 
 help.o: help.c config.h
-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
+sing.o: sing.c config.h \
 	sing.h ipcompat.h misc.h packet.h dev_struct.h
 ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
 	misc.h
@@ -269,12 +264,12 @@
 
 clean-am:  clean-binPROGRAMS mostlyclean-am
 
-clean: clean-am pcap_clean libnet_clean
+clean: clean-am
 
 distclean-am:  distclean-hdr distclean-compile \
 		 distclean-generic clean-am
 
-distclean: distclean-am pcap_distclean libnet_distclean
+distclean: distclean-am
 	-rm -f config.status
 
 
@@ -290,38 +285,9 @@
 distclean-generic clean mostlyclean distclean
 
 
-clean-local:	@PCAP_CLEAN@ @LIBNET_CLEAN@
+clean-local:
 
-distclean-local:	@PCAP_DISTCLEAN@ @LIBNET_DISTCLEAN@
-
-libpcap:	pcap_conf @PCAP_COMPILE@
-
-pcap_conf:
-	@echo Configuring libpcap; cd $(libpcapdir); ./configure
-
-pcap_compile:
-	@echo Compiling libpcap; cd $(libpcapdir); $(MAKE)
-
-pcap_clean:
-	cd $(libpcapdir); $(MAKE) clean
-
-pcap_distclean:
-	cd $(libpcapdir); $(MAKE) distclean
-
-
-libnet: libnet_conf @LIBNET_COMPILE@
-
-libnet_conf:
-	@echo Configuring libnet; cd $(libnetdir); ./configure
-
-libnet_compile:
-	@echo Compiling libnet; cd $(libnetdir); $(MAKE)
-
-libnet_clean:
-	cd $(libnetdir); $(MAKE) clean
-
-libnet_distclean:
-	cd $(libnetdir); $(MAKE) distclean
+distclean-local:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

sing-1.1-suid_log.patch:

--- NEW FILE sing-1.1-suid_log.patch ---
Re-merged patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which
causes sing to drop privileges when opening log file and running sing suid; this is
CVE-2007-6211. The patch is originally from Nico Golde <nion at debian.org> and then
afterwards used by Alberto Gonzalez Iniesta <agi at inittab.org>.

Further information:
 - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6211
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454167

--- SING-1.1/parser.c				2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/parser.c.suid_log			2009-04-18 04:53:05.000000000 +0200
@@ -75,6 +75,8 @@
    struct protoent *proto;
    static struct mi_ifaz iface;
    struct sockaddr_in *aux2;
+   uid_t user_id;
+
    static struct option options[] =
    {
     { "help",    0, 0, 'h' },
@@ -380,8 +382,14 @@
        break;
        
        case 31:
+             user_id = getuid();
+             uid_t tmp_id = geteuid();
+
+             seteuid(user_id);
              if ( (packet->logfile = fopen(optarg, "a+")) == NULL )
                 go_out_error(1, "fopen");
+
+             seteuid(tmp_id);
        break;
        
        case 32:


--- NEW FILE sing.spec ---
Summary:	Sends fully customized ICMP packets from command line
Name:		sing
Version:	1.1
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.sourceforge.net/projects/%{name}/
Source:		http://downloads.sourceforge.net/%{name}/SING-%{version}.tgz
Patch0:		sing-1.1-fedora.patch
Patch1:		sing-1.1-suid_log.patch
BuildRequires:	%{_includedir}/pcap.h, libnet10-devel, automake, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sing is a little tool that sends fully customized ICMP packets from command
line. The main purpose is to replace/complement the nice ping command with
certain enhancements as:

 - Send fragmented and monster packets > 65534 bytes
 - Send/read spoofed packets
 - Send many ICMP Information types in addition to the echo request type,
   sent by default as address mask request, timestamp, information request,
   router solicitation and router advertisement
 - Send many ICMP error types: redirect, source quench, time exceeded,
   destination unreach and parameter problem
 - Send to host with loose or strict source routing
 - Use little fingerprinting techniques to discover Windows or Solaris boxes
 - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
   Unix and Windows at the moment

%prep
%setup -q -n SING-%{version}
%patch0 -p1 -b .fedora
%patch1 -p1 -b .sing_suid

# Rebuilding of configure file is needed for Patch0
autoconf

# Automake can't be run because of missing Makefile.am
cp -f %{_datadir}/automake-*/config.* .

%build
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o LEEME.utf8 LEEME
touch -c -r LEEME LEEME.utf8
mv -f LEEME.utf8 LEEME

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%lang(es) %doc LEEME
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

%changelog
* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.1-1
- Upgrade to 1.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sing/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:45:39 -0000	1.1
+++ .cvsignore	24 Apr 2009 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+SING-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sing/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:45:39 -0000	1.1
+++ sources	24 Apr 2009 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+f9f649c4b40174a983601d46e4a3daac  SING-1.1.tgz



From robert at fedoraproject.org  Fri Apr 24 20:48:38 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 20:48:38 +0000 (UTC)
Subject: rpms/sing/F-11 sing-1.1-fedora.patch, NONE,
	1.1 sing-1.1-suid_log.patch, NONE, 1.1 sing.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424204838.2A79270106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	sing-1.1-fedora.patch sing-1.1-suid_log.patch sing.spec 
Log Message:
Import sing into other Fedora/EPEL branches


sing-1.1-fedora.patch:

--- NEW FILE sing-1.1-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which removes
all references to internal libpcap and libnet to get the system libraries used. It
also removes internal CFLAGS definitation in favour of the system-wide one.

--- SING-1.1/configure.in			2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/configure.in.fedora		2009-04-18 04:33:04.000000000 +0200
@@ -7,20 +7,11 @@
 
 AM_CONFIG_HEADER(config.h)
 
-libpcapdir=libpcap-0.4
-libnetdir=Libnet-1.0.1b
-
-AC_SUBST(libpcapdir)
-AC_SUBST(libnetdir)
-
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(SING, 1.1)
 
 AC_PROG_CC
-if test -n "$GCC"; then
-      CFLAGS="-O3 -Wall"
-fi
 
 AC_STDC_HEADERS
 
@@ -44,45 +35,6 @@
 AC_CHECK_LIB(net, libnet_open_raw_sock, have_libnet=yes, have_libnet=no)
 
 dnl
-dnl libpcap...
-dnl
-PCAP_CLEAN="pcap_clean"
-PCAP_DISTCLEAN="pcap_distclean"
-CFLAGS="$CFLAGS -I$libpcapdir"
-
-if test $have_libpcap = yes; then
-  PCAP_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  PCAP_COMPILE="pcap_compile"
-  LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
-fi
-
-AC_SUBST(PCAP_CLEAN)
-AC_SUBST(PCAP_DISTCLEAN)
-AC_SUBST(PCAP_COMPILE)
-
-dnl
-dnl libnet...
-dnl
-LIBNET_CLEAN="libnet_clean"
-LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
-
-if test $have_libnet = yes; then
-  LIBNET_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  LIBNET_COMPILE="libnet_compile"
-  LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
-fi
-
-AC_SUBST(LIBNET_CLEAN)
-AC_SUBST(LIBNET_DISTCLEAN)
-AC_SUBST(LIBNET_COMPILE)
-
-
-dnl
 dnl Check headers
 dnl
 AC_CHECK_HEADERS(sys/sockio.h string.h strings.h bstring.h sys/ioctl.h)
@@ -144,7 +96,7 @@
            case "`uname -r`" in
                 2.4*)
                    AC_DEFINE(LINUX_24)
-                ;
+                ;;
                 2.2*)
                    AC_DEFINE(LINUX_22)
                 ;;
--- SING-1.1/Makefile.in			2001-04-18 13:11:06.000000000 +0200
+++ SING-1.1/Makefile.in.fedora			2009-04-18 04:18:04.000000000 +0200
@@ -67,18 +67,13 @@
 LIBNET_DISTCLEAN = @LIBNET_DISTCLEAN@
 MAKEDEPEND = @MAKEDEPEND@
 PACKAGE = @PACKAGE@
-PCAP_CLEAN = @PCAP_CLEAN@
-PCAP_COMPILE = @PCAP_COMPILE@
-PCAP_DISTCLEAN = @PCAP_DISTCLEAN@
 VERSION = @VERSION@
 getopt_OBJECTS = @getopt_OBJECTS@
 getopt_SOURCES = @getopt_SOURCES@
-libnetdir = @libnetdir@
-libpcapdir = @libpcapdir@
 
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
 
-LIBS = @LIBS@ -lpcap -lnet
+LIBS = @LIBS@ -lpcap `/usr/bin/libnet10-config --libs`
 
 bin_PROGRAMS = sing
 
@@ -94,7 +89,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `/usr/bin/libnet10-config --cflags --defines` -I.
 sing_OBJECTS =  sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
 sing_LDADD = $(LDADD)
 sing_DEPENDENCIES = 
@@ -111,7 +106,7 @@
 SOURCES = $(sing_SOURCES)
 OBJECTS = $(sing_OBJECTS)
 
-all: libpcap libnet all-redirect
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 
@@ -226,7 +221,7 @@
 
 
 help.o: help.c config.h
-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
+sing.o: sing.c config.h \
 	sing.h ipcompat.h misc.h packet.h dev_struct.h
 ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
 	misc.h
@@ -269,12 +264,12 @@
 
 clean-am:  clean-binPROGRAMS mostlyclean-am
 
-clean: clean-am pcap_clean libnet_clean
+clean: clean-am
 
 distclean-am:  distclean-hdr distclean-compile \
 		 distclean-generic clean-am
 
-distclean: distclean-am pcap_distclean libnet_distclean
+distclean: distclean-am
 	-rm -f config.status
 
 
@@ -290,38 +285,9 @@
 distclean-generic clean mostlyclean distclean
 
 
-clean-local:	@PCAP_CLEAN@ @LIBNET_CLEAN@
+clean-local:
 
-distclean-local:	@PCAP_DISTCLEAN@ @LIBNET_DISTCLEAN@
-
-libpcap:	pcap_conf @PCAP_COMPILE@
-
-pcap_conf:
-	@echo Configuring libpcap; cd $(libpcapdir); ./configure
-
-pcap_compile:
-	@echo Compiling libpcap; cd $(libpcapdir); $(MAKE)
-
-pcap_clean:
-	cd $(libpcapdir); $(MAKE) clean
-
-pcap_distclean:
-	cd $(libpcapdir); $(MAKE) distclean
-
-
-libnet: libnet_conf @LIBNET_COMPILE@
-
-libnet_conf:
-	@echo Configuring libnet; cd $(libnetdir); ./configure
-
-libnet_compile:
-	@echo Compiling libnet; cd $(libnetdir); $(MAKE)
-
-libnet_clean:
-	cd $(libnetdir); $(MAKE) clean
-
-libnet_distclean:
-	cd $(libnetdir); $(MAKE) distclean
+distclean-local:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

sing-1.1-suid_log.patch:

--- NEW FILE sing-1.1-suid_log.patch ---
Re-merged patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which
causes sing to drop privileges when opening log file and running sing suid; this is
CVE-2007-6211. The patch is originally from Nico Golde <nion at debian.org> and then
afterwards used by Alberto Gonzalez Iniesta <agi at inittab.org>.

Further information:
 - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6211
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454167

--- SING-1.1/parser.c				2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/parser.c.suid_log			2009-04-18 04:53:05.000000000 +0200
@@ -75,6 +75,8 @@
    struct protoent *proto;
    static struct mi_ifaz iface;
    struct sockaddr_in *aux2;
+   uid_t user_id;
+
    static struct option options[] =
    {
     { "help",    0, 0, 'h' },
@@ -380,8 +382,14 @@
        break;
        
        case 31:
+             user_id = getuid();
+             uid_t tmp_id = geteuid();
+
+             seteuid(user_id);
              if ( (packet->logfile = fopen(optarg, "a+")) == NULL )
                 go_out_error(1, "fopen");
+
+             seteuid(tmp_id);
        break;
        
        case 32:


--- NEW FILE sing.spec ---
Summary:	Sends fully customized ICMP packets from command line
Name:		sing
Version:	1.1
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.sourceforge.net/projects/%{name}/
Source:		http://downloads.sourceforge.net/%{name}/SING-%{version}.tgz
Patch0:		sing-1.1-fedora.patch
Patch1:		sing-1.1-suid_log.patch
BuildRequires:	%{_includedir}/pcap.h, libnet10-devel, automake, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sing is a little tool that sends fully customized ICMP packets from command
line. The main purpose is to replace/complement the nice ping command with
certain enhancements as:

 - Send fragmented and monster packets > 65534 bytes
 - Send/read spoofed packets
 - Send many ICMP Information types in addition to the echo request type,
   sent by default as address mask request, timestamp, information request,
   router solicitation and router advertisement
 - Send many ICMP error types: redirect, source quench, time exceeded,
   destination unreach and parameter problem
 - Send to host with loose or strict source routing
 - Use little fingerprinting techniques to discover Windows or Solaris boxes
 - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
   Unix and Windows at the moment

%prep
%setup -q -n SING-%{version}
%patch0 -p1 -b .fedora
%patch1 -p1 -b .sing_suid

# Rebuilding of configure file is needed for Patch0
autoconf

# Automake can't be run because of missing Makefile.am
cp -f %{_datadir}/automake-*/config.* .

%build
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o LEEME.utf8 LEEME
touch -c -r LEEME LEEME.utf8
mv -f LEEME.utf8 LEEME

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%lang(es) %doc LEEME
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

%changelog
* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.1-1
- Upgrade to 1.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sing/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:45:39 -0000	1.1
+++ .cvsignore	24 Apr 2009 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+SING-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sing/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:45:39 -0000	1.1
+++ sources	24 Apr 2009 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+f9f649c4b40174a983601d46e4a3daac  SING-1.1.tgz



From robert at fedoraproject.org  Fri Apr 24 20:48:37 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 24 Apr 2009 20:48:37 +0000 (UTC)
Subject: rpms/sing/EL-5 sing-1.1-fedora.patch, NONE,
	1.1 sing-1.1-suid_log.patch, NONE, 1.1 sing.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090424204837.6C36C70106@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/sing/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	sing-1.1-fedora.patch sing-1.1-suid_log.patch sing.spec 
Log Message:
Import sing into other Fedora/EPEL branches


sing-1.1-fedora.patch:

--- NEW FILE sing-1.1-fedora.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which removes
all references to internal libpcap and libnet to get the system libraries used. It
also removes internal CFLAGS definitation in favour of the system-wide one.

--- SING-1.1/configure.in			2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/configure.in.fedora		2009-04-18 04:33:04.000000000 +0200
@@ -7,20 +7,11 @@
 
 AM_CONFIG_HEADER(config.h)
 
-libpcapdir=libpcap-0.4
-libnetdir=Libnet-1.0.1b
-
-AC_SUBST(libpcapdir)
-AC_SUBST(libnetdir)
-
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(SING, 1.1)
 
 AC_PROG_CC
-if test -n "$GCC"; then
-      CFLAGS="-O3 -Wall"
-fi
 
 AC_STDC_HEADERS
 
@@ -44,45 +35,6 @@
 AC_CHECK_LIB(net, libnet_open_raw_sock, have_libnet=yes, have_libnet=no)
 
 dnl
-dnl libpcap...
-dnl
-PCAP_CLEAN="pcap_clean"
-PCAP_DISTCLEAN="pcap_distclean"
-CFLAGS="$CFLAGS -I$libpcapdir"
-
-if test $have_libpcap = yes; then
-  PCAP_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  PCAP_COMPILE="pcap_compile"
-  LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
-fi
-
-AC_SUBST(PCAP_CLEAN)
-AC_SUBST(PCAP_DISTCLEAN)
-AC_SUBST(PCAP_COMPILE)
-
-dnl
-dnl libnet...
-dnl
-LIBNET_CLEAN="libnet_clean"
-LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
-
-if test $have_libnet = yes; then
-  LIBNET_COMPILE=""
-  LIBS="-L/usr/local/lib $LIBS"
-else
-  LIBNET_COMPILE="libnet_compile"
-  LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
-fi
-
-AC_SUBST(LIBNET_CLEAN)
-AC_SUBST(LIBNET_DISTCLEAN)
-AC_SUBST(LIBNET_COMPILE)
-
-
-dnl
 dnl Check headers
 dnl
 AC_CHECK_HEADERS(sys/sockio.h string.h strings.h bstring.h sys/ioctl.h)
@@ -144,7 +96,7 @@
            case "`uname -r`" in
                 2.4*)
                    AC_DEFINE(LINUX_24)
-                ;
+                ;;
                 2.2*)
                    AC_DEFINE(LINUX_22)
                 ;;
--- SING-1.1/Makefile.in			2001-04-18 13:11:06.000000000 +0200
+++ SING-1.1/Makefile.in.fedora			2009-04-18 04:18:04.000000000 +0200
@@ -67,18 +67,13 @@
 LIBNET_DISTCLEAN = @LIBNET_DISTCLEAN@
 MAKEDEPEND = @MAKEDEPEND@
 PACKAGE = @PACKAGE@
-PCAP_CLEAN = @PCAP_CLEAN@
-PCAP_COMPILE = @PCAP_COMPILE@
-PCAP_DISTCLEAN = @PCAP_DISTCLEAN@
 VERSION = @VERSION@
 getopt_OBJECTS = @getopt_OBJECTS@
 getopt_SOURCES = @getopt_SOURCES@
-libnetdir = @libnetdir@
-libpcapdir = @libpcapdir@
 
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
 
-LIBS = @LIBS@ -lpcap -lnet
+LIBS = @LIBS@ -lpcap `/usr/bin/libnet10-config --libs`
 
 bin_PROGRAMS = sing
 
@@ -94,7 +89,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `/usr/bin/libnet10-config --cflags --defines` -I.
 sing_OBJECTS =  sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
 sing_LDADD = $(LDADD)
 sing_DEPENDENCIES = 
@@ -111,7 +106,7 @@
 SOURCES = $(sing_SOURCES)
 OBJECTS = $(sing_OBJECTS)
 
-all: libpcap libnet all-redirect
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 
@@ -226,7 +221,7 @@
 
 
 help.o: help.c config.h
-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \
+sing.o: sing.c config.h \
 	sing.h ipcompat.h misc.h packet.h dev_struct.h
 ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \
 	misc.h
@@ -269,12 +264,12 @@
 
 clean-am:  clean-binPROGRAMS mostlyclean-am
 
-clean: clean-am pcap_clean libnet_clean
+clean: clean-am
 
 distclean-am:  distclean-hdr distclean-compile \
 		 distclean-generic clean-am
 
-distclean: distclean-am pcap_distclean libnet_distclean
+distclean: distclean-am
 	-rm -f config.status
 
 
@@ -290,38 +285,9 @@
 distclean-generic clean mostlyclean distclean
 
 
-clean-local:	@PCAP_CLEAN@ @LIBNET_CLEAN@
+clean-local:
 
-distclean-local:	@PCAP_DISTCLEAN@ @LIBNET_DISTCLEAN@
-
-libpcap:	pcap_conf @PCAP_COMPILE@
-
-pcap_conf:
-	@echo Configuring libpcap; cd $(libpcapdir); ./configure
-
-pcap_compile:
-	@echo Compiling libpcap; cd $(libpcapdir); $(MAKE)
-
-pcap_clean:
-	cd $(libpcapdir); $(MAKE) clean
-
-pcap_distclean:
-	cd $(libpcapdir); $(MAKE) distclean
-
-
-libnet: libnet_conf @LIBNET_COMPILE@
-
-libnet_conf:
-	@echo Configuring libnet; cd $(libnetdir); ./configure
-
-libnet_compile:
-	@echo Compiling libnet; cd $(libnetdir); $(MAKE)
-
-libnet_clean:
-	cd $(libnetdir); $(MAKE) clean
-
-libnet_distclean:
-	cd $(libnetdir); $(MAKE) distclean
+distclean-local:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

sing-1.1-suid_log.patch:

--- NEW FILE sing-1.1-suid_log.patch ---
Re-merged patch by Robert Scheck <robert at fedoraproject.org> for sing >= 1.1, which
causes sing to drop privileges when opening log file and running sing suid; this is
CVE-2007-6211. The patch is originally from Nico Golde <nion at debian.org> and then
afterwards used by Alberto Gonzalez Iniesta <agi at inittab.org>.

Further information:
 - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6211
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454167

--- SING-1.1/parser.c				2001-04-18 13:11:08.000000000 +0200
+++ SING-1.1/parser.c.suid_log			2009-04-18 04:53:05.000000000 +0200
@@ -75,6 +75,8 @@
    struct protoent *proto;
    static struct mi_ifaz iface;
    struct sockaddr_in *aux2;
+   uid_t user_id;
+
    static struct option options[] =
    {
     { "help",    0, 0, 'h' },
@@ -380,8 +382,14 @@
        break;
        
        case 31:
+             user_id = getuid();
+             uid_t tmp_id = geteuid();
+
+             seteuid(user_id);
              if ( (packet->logfile = fopen(optarg, "a+")) == NULL )
                 go_out_error(1, "fopen");
+
+             seteuid(tmp_id);
        break;
        
        case 32:


--- NEW FILE sing.spec ---
Summary:	Sends fully customized ICMP packets from command line
Name:		sing
Version:	1.1
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.sourceforge.net/projects/%{name}/
Source:		http://downloads.sourceforge.net/%{name}/SING-%{version}.tgz
Patch0:		sing-1.1-fedora.patch
Patch1:		sing-1.1-suid_log.patch
BuildRequires:	%{_includedir}/pcap.h, libnet10-devel, automake, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sing is a little tool that sends fully customized ICMP packets from command
line. The main purpose is to replace/complement the nice ping command with
certain enhancements as:

 - Send fragmented and monster packets > 65534 bytes
 - Send/read spoofed packets
 - Send many ICMP Information types in addition to the echo request type,
   sent by default as address mask request, timestamp, information request,
   router solicitation and router advertisement
 - Send many ICMP error types: redirect, source quench, time exceeded,
   destination unreach and parameter problem
 - Send to host with loose or strict source routing
 - Use little fingerprinting techniques to discover Windows or Solaris boxes
 - Send ICMP packets emulating certain OS: Cisco, Solaris, Linux, Shiva,
   Unix and Windows at the moment

%prep
%setup -q -n SING-%{version}
%patch0 -p1 -b .fedora
%patch1 -p1 -b .sing_suid

# Rebuilding of configure file is needed for Patch0
autoconf

# Automake can't be run because of missing Makefile.am
cp -f %{_datadir}/automake-*/config.* .

%build
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o LEEME.utf8 LEEME
touch -c -r LEEME LEEME.utf8
mv -f LEEME.utf8 LEEME

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%lang(es) %doc LEEME
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

%changelog
* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 1.1-1
- Upgrade to 1.1
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sing/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:45:39 -0000	1.1
+++ .cvsignore	24 Apr 2009 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+SING-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sing/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:45:39 -0000	1.1
+++ sources	24 Apr 2009 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+f9f649c4b40174a983601d46e4a3daac  SING-1.1.tgz



From roland at fedoraproject.org  Fri Apr 24 20:52:54 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:52:54 +0000 (UTC)
Subject: rpms/elfutils/F-11 .cvsignore, 1.47, 1.48 elfutils-portability.patch,
	1.41, 1.42 elfutils-robustify.patch, 1.14, 1.15 elfutils.spec,
	1.115, 1.116 sources, 1.51, 1.52 elfutils-0.140.tar.bz2.sig, 1.1, NONE
Message-ID: <20090424205254.6F20B70106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23178/F-11

Modified Files:
	.cvsignore elfutils-portability.patch elfutils-robustify.patch 
	elfutils.spec sources 
Removed Files:
	elfutils-0.140.tar.bz2.sig 
Log Message:
Update to 0.141


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	16 Feb 2009 21:56:06 -0000	1.47
+++ .cvsignore	24 Apr 2009 20:52:23 -0000	1.48
@@ -1 +1 @@
-elfutils-0.140.tar.bz2
+elfutils-0.141.tar.bz2

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/elfutils-portability.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- elfutils-portability.patch	16 Feb 2009 21:56:06 -0000	1.41
+++ elfutils-portability.patch	24 Apr 2009 20:52:23 -0000	1.42
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -3,6 +3,10 @@
+@@ -33,6 +33,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -330,6 +334,11 @@
+@@ -360,6 +364,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -352,6 +361,9 @@
+@@ -382,6 +391,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -35,14 +35,6 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in
- ##
--## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
-+## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
- ## This file is part of Red Hat elfutils.
- ##
- ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -67,7 +59,7 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
-@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -115,7 +116,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -78,7 +70,7 @@
  # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -86,7 +78,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -185,6 +186,7 @@ SHELL = @SHELL@
+@@ -187,6 +188,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -94,7 +86,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
+@@ -245,9 +247,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -106,7 +98,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -650,7 +652,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -117,7 +109,8 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,5 +1,7 @@
+@@ -9,6 +9,8 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* configure.ac: Check for __builtin_popcount.
@@ -125,7 +118,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -80,6 +82,10 @@
+@@ -89,6 +91,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -136,7 +129,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -127,6 +133,17 @@
+@@ -136,6 +142,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -582,7 +575,8 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -5,6 +5,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
@@ -591,7 +585,7 @@
  	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
  	substitution that can produce leading whitespace.
  
-@@ -329,6 +332,11 @@
+@@ -334,6 +337,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -622,9 +616,9 @@
 -AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \
 +WEXTRA = @WEXTRA@
 +AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \
+ 	     -fdollars-in-identifiers \
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
 @@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -643,23 +637,25 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,11 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
-- at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
-+ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
-+ at MUDFLAP_FALSE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
+- at MUDFLAP_FALSE@	-fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \
+- at MUDFLAP_FALSE@	$(if $($(*F)_no_Werror),,-Werror)
 - at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \
++ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
++ at MUDFLAP_FALSE@	-std=gnu99 -fpic -fdollars-in-identifiers \
++ at MUDFLAP_FALSE@	$($(*F)_CFLAGS) $(if \
++ at MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
 + at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused $(WEXTRA) \
- @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
+ @MUDFLAP_TRUE@	-std=gnu99 -fpic -fdollars-in-identifiers \
+ @MUDFLAP_TRUE@	$($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -562,6 +562,11 @@
+@@ -571,6 +571,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -723,7 +719,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1013,6 +1013,11 @@
+@@ -1076,6 +1076,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -754,7 +750,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -762,7 +758,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -770,7 +766,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -784,7 +780,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -563,6 +563,11 @@
+@@ -569,6 +569,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -845,7 +841,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -529,6 +529,11 @@
+@@ -537,6 +537,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -965,19 +961,14 @@
  YACC = @YACC@
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
-@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
        bool parsed = false;
        int n;
        char *name = NULL;
 -      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
  	  && string[n] == '\0')
- 	{
- 	  /* It was (section)+offset.  This makes sense if there is
-@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
- 		}
- 	    }
- 	}
+ 	parsed = adjust_to_section (name, &addr, dwfl);
 -      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
  	       && string[n] == '\0')
@@ -985,7 +976,7 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -62,6 +62,8 @@
+@@ -91,6 +91,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -994,7 +985,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -245,6 +247,11 @@
+@@ -274,6 +276,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -1006,7 +997,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -496,6 +503,8 @@
+@@ -525,6 +532,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -1015,7 +1006,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -935,6 +944,10 @@
+@@ -964,6 +973,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1026,7 +1017,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1011,6 +1024,10 @@
+@@ -1040,6 +1053,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1037,7 +1028,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1359,6 +1376,11 @@
+@@ -1388,6 +1405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1139,7 +1130,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7436,7 +7436,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7443,7 +7443,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1209,7 +1200,7 @@
      }
  
    /* Open the file.  */
-@@ -1745,7 +1761,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1218,7 +1209,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1802,7 +1818,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -1229,7 +1220,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -95,6 +95,8 @@
+@@ -106,6 +106,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -1238,7 +1229,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -803,6 +805,11 @@
+@@ -814,6 +816,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1281,7 +1272,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -343,6 +343,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1289,7 +1280,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -371,6 +372,7 @@ SHELL = @SHELL@
+@@ -372,6 +373,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1297,7 +1288,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
+@@ -429,10 +431,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/elfutils-robustify.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- elfutils-robustify.patch	16 Feb 2009 21:56:06 -0000	1.14
+++ elfutils-robustify.patch	24 Apr 2009 20:52:23 -0000	1.15
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -521,6 +521,49 @@
+@@ -529,6 +529,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -792,7 +792,7 @@
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1347,6 +1347,16 @@
+@@ -1376,6 +1376,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +809,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1392,6 +1402,19 @@
+@@ -1421,6 +1431,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1298,7 +1298,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4104,6 +4134,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4107,6 +4137,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1451,7 +1451,7 @@
  
  	      /* Mark the section as investigated.  */
  	      shdr_info[cnt].idx = 2;
-@@ -954,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -955,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
  
@@ -1460,7 +1460,7 @@
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -991,7 +1015,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -992,7 +1016,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1469,7 +1469,7 @@
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -1047,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1048,7 +1072,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1478,7 +1478,7 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1137,20 +1161,20 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1138,20 +1162,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1502,7 +1502,7 @@
  			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
-@@ -1205,7 +1229,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1206,7 +1230,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1511,7 +1511,7 @@
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1226,7 +1250,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1227,7 +1251,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1520,7 +1520,7 @@
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1250,7 +1274,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1251,7 +1275,7 @@ handle_elf (int fd, Elf *elf, const char
  			     || shdr_info[cnt].debug_data == NULL)
  		      /* This is a section symbol for a section which has
  			 been removed.  */
@@ -1529,7 +1529,7 @@
  		  }
  
  		if (destidx != inner)
-@@ -1437,11 +1461,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1438,11 +1462,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1543,7 +1543,7 @@
  		    size_t hidx = elf_hash (name) % nbucket;
  
  		    if (bucket[hidx] == 0)
-@@ -1460,7 +1484,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1461,7 +1485,7 @@ handle_elf (int fd, Elf *elf, const char
  	    else
  	      {
  		/* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1552,7 +1552,7 @@
  			== sizeof (Elf64_Xword));
  
  		Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
-@@ -1491,11 +1515,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1492,11 +1516,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/elfutils.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- elfutils.spec	27 Feb 2009 22:29:32 -0000	1.115
+++ elfutils.spec	24 Apr 2009 20:52:23 -0000	1.116
@@ -1,5 +1,5 @@
-%define eu_version 0.140
-%define eu_release 2
+%define eu_version 0.141
+%define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -276,6 +276,18 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1
+- Update to 0.141
+  - libebl: sparc backend fixes (#490585)
+            some more arm backend support
+  - libdwfl: fix dwfl_module_build_id for prelinked DSO case (#489439)
+             fixes in core file support (#494858)
+             dwfl_module_getsym interface improved for non-address symbols
+  - eu-strip: fix infinite loop on strange inputs with -f
+  - eu-addr2line: take -j/--section=NAME option for binutils compatibility
+                  (same effect as '(NAME)0x123' syntax already supported)
+- Resolves: RHBZ #495213, RHBZ #465872, RHBZ #470055, RHBZ #484623
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.140-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -287,7 +299,7 @@
 - Update to 0.139
   - libcpu: Add Intel SSE4 disassembler support
   - readelf: Implement call frame information and exception handling dumping.
-    	     Add -e option.  Enable it implicitly for -a.
+             Add -e option.  Enable it implicitly for -a.
   - elflint: Check PT_GNU_EH_FRAME program header entry.
   - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-11/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Feb 2009 21:56:06 -0000	1.51
+++ sources	24 Apr 2009 20:52:23 -0000	1.52
@@ -1 +1 @@
-d4d64f9c05ba127a5a8b55beb6d88ab2  elfutils-0.140.tar.bz2
+2d0fe5651c0de1fd28e7dd006effe7d1  elfutils-0.141.tar.bz2


--- elfutils-0.140.tar.bz2.sig DELETED ---



From roland at fedoraproject.org  Fri Apr 24 20:52:54 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:52:54 +0000 (UTC)
Subject: rpms/elfutils/F-10 .cvsignore, 1.47, 1.48 elfutils-portability.patch,
	1.41, 1.42 elfutils-robustify.patch, 1.14, 1.15 elfutils.spec,
	1.112, 1.113 sources, 1.51, 1.52
Message-ID: <20090424205254.1CCBA70106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23178/F-10

Modified Files:
	.cvsignore elfutils-portability.patch elfutils-robustify.patch 
	elfutils.spec sources 
Log Message:
Update to 0.141


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	16 Feb 2009 22:00:39 -0000	1.47
+++ .cvsignore	24 Apr 2009 20:52:23 -0000	1.48
@@ -1 +1 @@
-elfutils-0.140.tar.bz2
+elfutils-0.141.tar.bz2

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils-portability.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- elfutils-portability.patch	16 Feb 2009 22:00:39 -0000	1.41
+++ elfutils-portability.patch	24 Apr 2009 20:52:23 -0000	1.42
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -3,6 +3,10 @@
+@@ -33,6 +33,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -330,6 +334,11 @@
+@@ -360,6 +364,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -352,6 +361,9 @@
+@@ -382,6 +391,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -35,14 +35,6 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in
- ##
--## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
-+## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
- ## This file is part of Red Hat elfutils.
- ##
- ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -67,7 +59,7 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
-@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -115,7 +116,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -78,7 +70,7 @@
  # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -86,7 +78,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -185,6 +186,7 @@ SHELL = @SHELL@
+@@ -187,6 +188,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -94,7 +86,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
+@@ -245,9 +247,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -106,7 +98,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -650,7 +652,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -117,7 +109,8 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,5 +1,7 @@
+@@ -9,6 +9,8 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* configure.ac: Check for __builtin_popcount.
@@ -125,7 +118,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -80,6 +82,10 @@
+@@ -89,6 +91,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -136,7 +129,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -127,6 +133,17 @@
+@@ -136,6 +142,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -582,7 +575,8 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -5,6 +5,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
@@ -591,7 +585,7 @@
  	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
  	substitution that can produce leading whitespace.
  
-@@ -329,6 +332,11 @@
+@@ -334,6 +337,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -622,9 +616,9 @@
 -AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \
 +WEXTRA = @WEXTRA@
 +AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \
+ 	     -fdollars-in-identifiers \
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
 @@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -643,23 +637,25 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,11 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
-- at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
-+ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
-+ at MUDFLAP_FALSE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
+- at MUDFLAP_FALSE@	-fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \
+- at MUDFLAP_FALSE@	$(if $($(*F)_no_Werror),,-Werror)
 - at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \
++ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
++ at MUDFLAP_FALSE@	-std=gnu99 -fpic -fdollars-in-identifiers \
++ at MUDFLAP_FALSE@	$($(*F)_CFLAGS) $(if \
++ at MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
 + at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused $(WEXTRA) \
- @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
+ @MUDFLAP_TRUE@	-std=gnu99 -fpic -fdollars-in-identifiers \
+ @MUDFLAP_TRUE@	$($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -562,6 +562,11 @@
+@@ -571,6 +571,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -723,7 +719,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1013,6 +1013,11 @@
+@@ -1076,6 +1076,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -754,7 +750,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -762,7 +758,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -770,7 +766,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -784,7 +780,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -563,6 +563,11 @@
+@@ -569,6 +569,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -845,7 +841,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -529,6 +529,11 @@
+@@ -537,6 +537,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -965,19 +961,14 @@
  YACC = @YACC@
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
-@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
        bool parsed = false;
        int n;
        char *name = NULL;
 -      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
  	  && string[n] == '\0')
- 	{
- 	  /* It was (section)+offset.  This makes sense if there is
-@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
- 		}
- 	    }
- 	}
+ 	parsed = adjust_to_section (name, &addr, dwfl);
 -      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
  	       && string[n] == '\0')
@@ -985,7 +976,7 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -62,6 +62,8 @@
+@@ -91,6 +91,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -994,7 +985,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -245,6 +247,11 @@
+@@ -274,6 +276,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -1006,7 +997,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -496,6 +503,8 @@
+@@ -525,6 +532,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -1015,7 +1006,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -935,6 +944,10 @@
+@@ -964,6 +973,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1026,7 +1017,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1011,6 +1024,10 @@
+@@ -1040,6 +1053,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1037,7 +1028,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1359,6 +1376,11 @@
+@@ -1388,6 +1405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1139,7 +1130,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7436,7 +7436,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7443,7 +7443,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1209,7 +1200,7 @@
      }
  
    /* Open the file.  */
-@@ -1745,7 +1761,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1218,7 +1209,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1802,7 +1818,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -1229,7 +1220,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -95,6 +95,8 @@
+@@ -106,6 +106,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -1238,7 +1229,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -803,6 +805,11 @@
+@@ -814,6 +816,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1281,7 +1272,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -343,6 +343,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1289,7 +1280,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -371,6 +372,7 @@ SHELL = @SHELL@
+@@ -372,6 +373,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1297,7 +1288,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
+@@ -429,10 +431,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils-robustify.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- elfutils-robustify.patch	16 Feb 2009 22:00:39 -0000	1.14
+++ elfutils-robustify.patch	24 Apr 2009 20:52:23 -0000	1.15
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -521,6 +521,49 @@
+@@ -529,6 +529,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -792,7 +792,7 @@
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1347,6 +1347,16 @@
+@@ -1376,6 +1376,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +809,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1392,6 +1402,19 @@
+@@ -1421,6 +1431,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1298,7 +1298,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4104,6 +4134,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4107,6 +4137,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1451,7 +1451,7 @@
  
  	      /* Mark the section as investigated.  */
  	      shdr_info[cnt].idx = 2;
-@@ -954,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -955,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
  
@@ -1460,7 +1460,7 @@
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -991,7 +1015,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -992,7 +1016,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1469,7 +1469,7 @@
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -1047,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1048,7 +1072,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1478,7 +1478,7 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1137,20 +1161,20 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1138,20 +1162,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1502,7 +1502,7 @@
  			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
-@@ -1205,7 +1229,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1206,7 +1230,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1511,7 +1511,7 @@
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1226,7 +1250,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1227,7 +1251,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1520,7 +1520,7 @@
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1250,7 +1274,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1251,7 +1275,7 @@ handle_elf (int fd, Elf *elf, const char
  			     || shdr_info[cnt].debug_data == NULL)
  		      /* This is a section symbol for a section which has
  			 been removed.  */
@@ -1529,7 +1529,7 @@
  		  }
  
  		if (destidx != inner)
-@@ -1437,11 +1461,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1438,11 +1462,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1543,7 +1543,7 @@
  		    size_t hidx = elf_hash (name) % nbucket;
  
  		    if (bucket[hidx] == 0)
-@@ -1460,7 +1484,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1461,7 +1485,7 @@ handle_elf (int fd, Elf *elf, const char
  	    else
  	      {
  		/* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1552,7 +1552,7 @@
  			== sizeof (Elf64_Xword));
  
  		Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
-@@ -1491,11 +1515,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1492,11 +1516,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- elfutils.spec	16 Feb 2009 22:00:39 -0000	1.112
+++ elfutils.spec	24 Apr 2009 20:52:23 -0000	1.113
@@ -1,4 +1,4 @@
-%define eu_version 0.140
+%define eu_version 0.141
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -27,7 +27,7 @@
 %if !%{compat}
 Release: %{eu_release}%{?dist}
 %else
-Release: 0.%{eu_release}
+Release: 0.%{eu_release}.1
 %endif
 License: GPLv2 with exceptions
 Group: Development/Tools
@@ -276,6 +276,21 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1
+- Update to 0.141
+  - libebl: sparc backend fixes (#490585)
+            some more arm backend support
+  - libdwfl: fix dwfl_module_build_id for prelinked DSO case (#489439)
+             fixes in core file support (#494858)
+             dwfl_module_getsym interface improved for non-address symbols
+  - eu-strip: fix infinite loop on strange inputs with -f
+  - eu-addr2line: take -j/--section=NAME option for binutils compatibility
+                  (same effect as '(NAME)0x123' syntax already supported)
+- Resolves: RHBZ #495213, RHBZ #465872, RHBZ #470055, RHBZ #484623
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.140-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb 15 2009 Roland McGrath <roland at redhat.com> - 0.140-1
 - Update to 0.140
   - libelf: Fix regression in creation of section header. (#484946)
@@ -284,7 +299,7 @@
 - Update to 0.139
   - libcpu: Add Intel SSE4 disassembler support
   - readelf: Implement call frame information and exception handling dumping.
-    	     Add -e option.  Enable it implicitly for -a.
+             Add -e option.  Enable it implicitly for -a.
   - elflint: Check PT_GNU_EH_FRAME program header entry.
   - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Feb 2009 22:00:39 -0000	1.51
+++ sources	24 Apr 2009 20:52:23 -0000	1.52
@@ -1 +1 @@
-d4d64f9c05ba127a5a8b55beb6d88ab2  elfutils-0.140.tar.bz2
+2d0fe5651c0de1fd28e7dd006effe7d1  elfutils-0.141.tar.bz2



From roland at fedoraproject.org  Fri Apr 24 20:52:55 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri, 24 Apr 2009 20:52:55 +0000 (UTC)
Subject: rpms/elfutils/F-9 .cvsignore, 1.47, 1.48 elfutils-portability.patch,
	1.41, 1.42 elfutils-robustify.patch, 1.14, 1.15 elfutils.spec,
	1.112, 1.113 sources, 1.51, 1.52
Message-ID: <20090424205255.05F4070106@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23178/F-9

Modified Files:
	.cvsignore elfutils-portability.patch elfutils-robustify.patch 
	elfutils.spec sources 
Log Message:
Update to 0.141


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	16 Feb 2009 22:00:39 -0000	1.47
+++ .cvsignore	24 Apr 2009 20:52:24 -0000	1.48
@@ -1 +1 @@
-elfutils-0.140.tar.bz2
+elfutils-0.141.tar.bz2

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils-portability.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- elfutils-portability.patch	16 Feb 2009 22:00:39 -0000	1.41
+++ elfutils-portability.patch	24 Apr 2009 20:52:24 -0000	1.42
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -3,6 +3,10 @@
+@@ -33,6 +33,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper at redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -330,6 +334,11 @@
+@@ -360,6 +364,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -352,6 +361,9 @@
+@@ -382,6 +391,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -35,14 +35,6 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in
- ##
--## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
-+## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
- ## This file is part of Red Hat elfutils.
- ##
- ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -67,7 +59,7 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
-@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -115,7 +116,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -78,7 +70,7 @@
  # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -86,7 +78,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -185,6 +186,7 @@ SHELL = @SHELL@
+@@ -187,6 +188,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -94,7 +86,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
+@@ -245,9 +247,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -106,7 +98,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+@@ -650,7 +652,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
  		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -117,7 +109,8 @@
  # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,5 +1,7 @@
+@@ -9,6 +9,8 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* configure.ac: Check for __builtin_popcount.
@@ -125,7 +118,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -80,6 +82,10 @@
+@@ -89,6 +91,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -136,7 +129,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -127,6 +133,17 @@
+@@ -136,6 +142,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -582,7 +575,8 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -1,5 +1,8 @@
+@@ -5,6 +5,9 @@
+ 
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
 +	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
@@ -591,7 +585,7 @@
  	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
  	substitution that can produce leading whitespace.
  
-@@ -329,6 +332,11 @@
+@@ -334,6 +337,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -622,9 +616,9 @@
 -AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \
 +WEXTRA = @WEXTRA@
 +AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \
+ 	     -fdollars-in-identifiers \
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
 @@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -643,23 +637,25 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,11 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
-- at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
-+ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
-+ at MUDFLAP_FALSE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
+- at MUDFLAP_FALSE@	-fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \
+- at MUDFLAP_FALSE@	$(if $($(*F)_no_Werror),,-Werror)
 - at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \
++ at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
++ at MUDFLAP_FALSE@	-std=gnu99 -fpic -fdollars-in-identifiers \
++ at MUDFLAP_FALSE@	$($(*F)_CFLAGS) $(if \
++ at MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)
 + at MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused $(WEXTRA) \
- @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
+ @MUDFLAP_TRUE@	-std=gnu99 -fpic -fdollars-in-identifiers \
+ @MUDFLAP_TRUE@	$($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
- INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -562,6 +562,11 @@
+@@ -571,6 +571,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -723,7 +719,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1013,6 +1013,11 @@
+@@ -1076,6 +1076,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -754,7 +750,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -762,7 +758,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -770,7 +766,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -784,7 +780,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -563,6 +563,11 @@
+@@ -569,6 +569,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -845,7 +841,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -529,6 +529,11 @@
+@@ -537,6 +537,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -965,19 +961,14 @@
  YACC = @YACC@
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
-@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
        bool parsed = false;
        int n;
        char *name = NULL;
 -      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
  	  && string[n] == '\0')
- 	{
- 	  /* It was (section)+offset.  This makes sense if there is
-@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
- 		}
- 	    }
- 	}
+ 	parsed = adjust_to_section (name, &addr, dwfl);
 -      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
 +      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
  	       && string[n] == '\0')
@@ -985,7 +976,7 @@
  	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -62,6 +62,8 @@
+@@ -91,6 +91,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -994,7 +985,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -245,6 +247,11 @@
+@@ -274,6 +276,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -1006,7 +997,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -496,6 +503,8 @@
+@@ -525,6 +532,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -1015,7 +1006,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -935,6 +944,10 @@
+@@ -964,6 +973,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -1026,7 +1017,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1011,6 +1024,10 @@
+@@ -1040,6 +1053,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1037,7 +1028,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1359,6 +1376,11 @@
+@@ -1388,6 +1405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1139,7 +1130,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7436,7 +7436,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7443,7 +7443,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1209,7 +1200,7 @@
      }
  
    /* Open the file.  */
-@@ -1745,7 +1761,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1218,7 +1209,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1802,7 +1818,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -1229,7 +1220,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -95,6 +95,8 @@
+@@ -106,6 +106,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -1238,7 +1229,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -803,6 +805,11 @@
+@@ -814,6 +816,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1281,7 +1272,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -343,6 +343,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1289,7 +1280,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -371,6 +372,7 @@ SHELL = @SHELL@
+@@ -372,6 +373,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1297,7 +1288,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
+@@ -429,10 +431,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils-robustify.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- elfutils-robustify.patch	16 Feb 2009 22:00:39 -0000	1.14
+++ elfutils-robustify.patch	24 Apr 2009 20:52:24 -0000	1.15
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -521,6 +521,49 @@
+@@ -529,6 +529,49 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -792,7 +792,7 @@
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1347,6 +1347,16 @@
+@@ -1376,6 +1376,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -809,7 +809,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1392,6 +1402,19 @@
+@@ -1421,6 +1431,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1298,7 +1298,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4104,6 +4134,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4107,6 +4137,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1451,7 +1451,7 @@
  
  	      /* Mark the section as investigated.  */
  	      shdr_info[cnt].idx = 2;
-@@ -954,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -955,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
  
@@ -1460,7 +1460,7 @@
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -991,7 +1015,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -992,7 +1016,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1469,7 +1469,7 @@
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -1047,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1048,7 +1072,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1478,7 +1478,7 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1137,20 +1161,20 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1138,20 +1162,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1502,7 +1502,7 @@
  			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
-@@ -1205,7 +1229,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1206,7 +1230,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1511,7 +1511,7 @@
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1226,7 +1250,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1227,7 +1251,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1520,7 +1520,7 @@
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1250,7 +1274,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1251,7 +1275,7 @@ handle_elf (int fd, Elf *elf, const char
  			     || shdr_info[cnt].debug_data == NULL)
  		      /* This is a section symbol for a section which has
  			 been removed.  */
@@ -1529,7 +1529,7 @@
  		  }
  
  		if (destidx != inner)
-@@ -1437,11 +1461,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1438,11 +1462,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1543,7 +1543,7 @@
  		    size_t hidx = elf_hash (name) % nbucket;
  
  		    if (bucket[hidx] == 0)
-@@ -1460,7 +1484,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1461,7 +1485,7 @@ handle_elf (int fd, Elf *elf, const char
  	    else
  	      {
  		/* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1552,7 +1552,7 @@
  			== sizeof (Elf64_Xword));
  
  		Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
-@@ -1491,11 +1515,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1492,11 +1516,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- elfutils.spec	16 Feb 2009 22:00:39 -0000	1.112
+++ elfutils.spec	24 Apr 2009 20:52:24 -0000	1.113
@@ -1,4 +1,4 @@
-%define eu_version 0.140
+%define eu_version 0.141
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -27,7 +27,7 @@
 %if !%{compat}
 Release: %{eu_release}%{?dist}
 %else
-Release: 0.%{eu_release}
+Release: 0.%{eu_release}.1
 %endif
 License: GPLv2 with exceptions
 Group: Development/Tools
@@ -276,6 +276,21 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Thu Apr 23 2009 Roland McGrath <roland at redhat.com> - 0.141-1
+- Update to 0.141
+  - libebl: sparc backend fixes (#490585)
+            some more arm backend support
+  - libdwfl: fix dwfl_module_build_id for prelinked DSO case (#489439)
+             fixes in core file support (#494858)
+             dwfl_module_getsym interface improved for non-address symbols
+  - eu-strip: fix infinite loop on strange inputs with -f
+  - eu-addr2line: take -j/--section=NAME option for binutils compatibility
+                  (same effect as '(NAME)0x123' syntax already supported)
+- Resolves: RHBZ #495213, RHBZ #465872, RHBZ #470055, RHBZ #484623
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.140-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb 15 2009 Roland McGrath <roland at redhat.com> - 0.140-1
 - Update to 0.140
   - libelf: Fix regression in creation of section header. (#484946)
@@ -284,7 +299,7 @@
 - Update to 0.139
   - libcpu: Add Intel SSE4 disassembler support
   - readelf: Implement call frame information and exception handling dumping.
-    	     Add -e option.  Enable it implicitly for -a.
+             Add -e option.  Enable it implicitly for -a.
   - elflint: Check PT_GNU_EH_FRAME program header entry.
   - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	16 Feb 2009 22:00:39 -0000	1.51
+++ sources	24 Apr 2009 20:52:24 -0000	1.52
@@ -1 +1 @@
-d4d64f9c05ba127a5a8b55beb6d88ab2  elfutils-0.140.tar.bz2
+2d0fe5651c0de1fd28e7dd006effe7d1  elfutils-0.141.tar.bz2



From clumens at fedoraproject.org  Fri Apr 24 21:13:08 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri, 24 Apr 2009 21:13:08 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.637, 1.638 anaconda.spec, 1.785, 
	1.786 sources, 1.771, 1.772
Message-ID: <20090424211308.E088970106@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25995

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- .cvsignore	18 Apr 2009 00:21:16 -0000	1.637
+++ .cvsignore	24 Apr 2009 21:12:38 -0000	1.638
@@ -1,2 +1,3 @@
 clog
 anaconda-11.5.0.46.tar.bz2
+anaconda-11.5.0.48.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -r1.785 -r1.786
--- anaconda.spec	18 Apr 2009 00:21:16 -0000	1.785
+++ anaconda.spec	24 Apr 2009 21:12:38 -0000	1.786
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.46
+Version: 11.5.0.48
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -213,6 +213,76 @@
 %endif
 
 %changelog
+* Fri Apr 24 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.48-1
+- Fix handling of swap files. (#496529) (dlehman)
+- Pass anaconda to turnOnSwap so we can use swap files. (dlehman)
+- Fix incorrect attribute name use for retrofit flag. (dlehman)
+- Use slightly better checks when testing for 0 size (#493656, #497186,
+  #497389). (clumens)
+- If the LV has no child, don't attempt to grab its format (#497239).
+  (clumens)
+- Apply the global passphrase when doing kickstart autopart (#497533).
+  (clumens)
+- Add support for encryption passphrase retrofits. (dlehman)
+- Bring luks_add_key and luks_remove_key back into devicelibs.crypto.
+  (dlehman)
+- Don't let lvremove failures from incomplete vgs crash the install.
+  (#497401) (dlehman)
+- Allow setting a mountpoint w/o formatting an encrypted partition.
+  (#495417) (dlehman)
+- Remove encryption from preexisting device if "Encrypt" is deactivated.
+  (dlehman)
+- Fix indentation of preexisting partition handling block. (dlehman)
+- The device passed to the luks passphrase dialogs is a string. (#492123)
+  (dlehman)
+- Protect against tracebacks from the partition isFoo properties. (dlehman)
+- Fix handling of bind mounts. (#496406) (dlehman)
+- Add more filesystem checks. (clumens)
+- Support vfat filesystems in the partitioning UI (#496351). (clumens)
+- Remove devices in leaves first order (#496630) (hdegoede)
+- Don't remove an inconsistent lvm partition from the devicetree (#496638)
+  (hdegoede)
+- Move isEfi to be a property on Platform instead of on X86 (#497394).
+  (clumens)
+- Support --encrypted --useexisting on kickstart installs (#497147).
+  (clumens)
+- When making a RAID device, require that some members be selected
+  (#491932). (clumens)
+- When catching an OSError, handle it as an object instead of a tuple
+  (#497374). (clumens)
+- Enforce the fstype that holds /boot on kickstart installs (#497238).
+  (clumens)
+- Fix ps3 platform support (#497203) (katzj)
+- Clean up rpmdb locks at the end of the install (#496961) (katzj)
+- Don't allow /boot to be on an encrypted device (#496866). (clumens)
+- Use the correct unmount method (#496764). (clumens)
+
+* Tue Apr 21 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.47-1
+- Fix adding of fifth partition in UI (#496930). (rvykydal)
+- Define the fd variable before it can ever be referenced (#496930).
+  (clumens)
+- Fix preservation of format attrs for preexisting luks partitions. (dlehman)
+- Set md member devices' uuids after creating an array. (dlehman)
+- Don't try to get size for nodev and bind filesystems. (dlehman)
+- Include the device path in DeviceError exceptions. (dlehman)
+- Mdadm's incremental mode ignores the auto option, so don't use it.
+  (dlehman)
+- Use incremental mode for all md member addition during probing. (dlehman)
+- Try to name existing md arrays based on their preferred minor. (dlehman)
+- Reimplement mdexamine using a more easily parseable output format.
+  (dlehman)
+- Fix position of "--run" option to mdadm assemble. (dlehman)
+- Handle passphrase prompts without a traceback in cmdline mode. (#492123)
+  (dlehman)
+- Fix another device vs. string problem in EFI bootloader config (#496669).
+  (clumens)
+- Add the device's name to mdadm.conf (#496390). (clumens)
+- Show normal cursor during passphrase entry (#496534) (msivak)
+- Fix traceback in cmdline mode after exception handling cleanup (#496644)
+  (katzj)
+- DeviceError only returns a message, not (message, device) tuple (#496343).
+  (clumens)
+
 * Fri Apr 17 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.46-1
 - Clean up argument list after changing from rhpl to iutil for
   execWithRedirect (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- sources	18 Apr 2009 00:21:16 -0000	1.771
+++ sources	24 Apr 2009 21:12:38 -0000	1.772
@@ -1 +1 @@
-e350ffddc62e02b64751832711941c01  anaconda-11.5.0.46.tar.bz2
+934d124c37c45d6ac04e43c692d5fce8  anaconda-11.5.0.48.tar.bz2



From pkgdb at fedoraproject.org  Fri Apr 24 21:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 21:55:47 +0000
Subject: [pkgdb] mono: itamarjp has requested watchcommits
Message-ID: <20090424215547.AA7D010F885@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on mono (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Fri Apr 24 21:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 24 Apr 2009 21:55:48 +0000
Subject: [pkgdb] mono: itamarjp has requested watchbugzilla
Message-ID: <20090424215548.57D4C10F88A@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on mono (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From myoung at fedoraproject.org  Fri Apr 24 22:28:18 2009
From: myoung at fedoraproject.org (Michael Young)
Date: Fri, 24 Apr 2009 22:28:18 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc3.bz2.sign, NONE,
	1.1.2.2 rds-only-on-64-bit-or-x86.patch, NONE,
	1.1.10.2 .cvsignore, 1.1014.2.9, 1.1014.2.10 Makefile, 1.97.6.3,
	1.97.6.4 TODO, 1.54.6.5, 1.54.6.6 branch, 1.1.2.2,
	1.1.2.3 config-arm, 1.2, 1.2.6.1 config-generic, 1.238.6.16,
	1.238.6.17 config-ia64-generic, 1.21.6.2,
	1.21.6.3 config-nodebug, 1.31.6.1,
	1.31.6.2 config-powerpc-generic, 1.33.6.4,
	1.33.6.5 config-powerpc64, 1.27.6.1, 1.27.6.2 config-s390x,
	1.11.6.1, 1.11.6.2 config-sparc64-generic, 1.21.6.2,
	1.21.6.3 config-sparc64-smp, 1.2.16.1,
	1.2.16.2 config-x86-generic, 1.68.6.6,
	1.68.6.7 config-x86_64-generic, 1.68.2.6,
	1.68.2.7 drm-modesetting-radeon.patch, 1.54.6.8,
	1.54.6.9 drm-next.patch, 1.6.6.6, 1.6.6.7 drm-nouveau.patch,
	1.8.6.9, 1.8.6.10 kernel.spec, 1.1294.2.20,
	1.1294.2.21 linux-2.6-defaults-pci_no_msi.patch, 1.4,
	1.4.6.1 linux-2.6-execshield.patch, 1.102.6.1,
	1.102.6.2 linux-2.6-tracehook.patch, 1.8.6.2,
	1.8.6.3 linux-2.6-utrace.patch, 1.107.6.1,
	1.107.6.2 linux-2.6-v4l-dvb-fixes.patch, 1.2.8.8,
	1.2.8.9 sources, 1.976.2.10, 1.976.2.11 upstream, 1.888.2.9,
	1.888.2.10 xen.pvops.patch, 1.1.2.16,
	1.1.2.17 xen.pvops.post.patch, 1.1.2.10,
	1.1.2.11 xen.pvops.pre.patch, 1.1.2.9,
	1.1.2.10 alsa-dont-reset-stream-at-each-prepare-callb.patch,
	1.1.2.1, NONE alsa-hda-dont-reset-BDL-unnecessarily.patch, 1.1.2.1,
	NONE alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch,
	1.1.2.1, NONE alsa-pcm-always-reset-invalid-position.patch,
	1.1.2.2, NONE alsa-pcm-fix-delta-calc-at-overlap.patch, 1.1.2.2,
	NONE alsa-pcm-midlevel-add-more-strict-buffer-position.patch,
	1.1.2.1, NONE alsa-pcm-safer-boundary-checks.patch, 1.1.2.2,
	NONE alsa-rewrite-hw_ptr-updaters.patch, 1.1.2.2,
	NONE drm-intel-gen3-fb-hack.patch, 1.1.2.1,
	NONE drm-intel-lying-systems-without-lvds.patch, 1.1.2.1,
	NONE linux-2.6-acer-wmi-bail-on-aao.patch, 1.1.2.1,
	NONE linux-2.6-acpi-strict-resources.patch, 1.1,
	NONE linux-2.6-acpi-video-didl-intel-outputs.patch, 1.1.2.4,
	NONE linux-2.6-add-qcserial.patch, 1.1.2.1,
	NONE linux-2.6-btrfs-fix-umount-hang.patch, 1.2.2.2,
	NONE linux-2.6-dma-debug-fixes.patch, 1.1.2.1,
	NONE linux-2.6-dropwatch-protocol.patch, 1.1.2.2,
	NONE linux-2.6-e820-acpi3-bios-workaround.patch, 1.1.2.1,
	NONE linux-2.6-e820-guard-against-pre-acpi3.patch, 1.1.2.1,
	NONE linux-2.6-e820-mark-esi-clobbered.patch, 1.1.2.1,
	NONE linux-2.6-e820-save-restore-edi-ebp.patch, 1.1.2.1,
	NONE linux-2.6-ext4-flush-on-close.patch, 1.1.2.2,
	NONE linux-2.6-ext4-really-print-warning-once.patch, 1.1.2.1,
	NONE linux-2.6-fiemap-header-install.patch, 1.2.2.2,
	NONE linux-2.6-hwmon-atk0110.patch, 1.2,
	NONE linux-2.6-input-hid-extra-gamepad.patch, 1.1.2.2,
	NONE linux-2.6-input-wacom-bluetooth.patch, 1.1.2.1,
	NONE linux-2.6-iommu-fixes.patch, 1.1.2.1,
	NONE linux-2.6-ipw2x00-age-scan-results-on-resume.patch, 1.1.10.2,
	NONE
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch,
	1.1.2.1,
	NONE linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch,
	1.1.2.1, NONE linux-2.6-kvm-kconfig-irqchip.patch, 1.1.2.1,
	NONE linux-2.6-kvm-mask-notifiers.patch, 1.1.2.1,
	NONE linux-2.6-kvm-reset-pit-irq-on-unmask.patch, 1.1.2.1,
	NONE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, 1.1.2.1,
	NONE linux-2.6-mm-define-unique-value-for-as_unevictable.patch,
	1.1.2.1, NONE linux-2.6-net-fix-another-gro-bug.patch, 1.1.2.2,
	NONE linux-2.6-pci-sysfs-remove-id.patch, 1.1.6.2,
	NONE linux-2.6-posix-timers-fix-clock-monotonicity.patch,
	1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch,
	1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch,
	1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, 
	1.1.2.1, NONE linux-2.6-relatime-by-default.patch, 1.1.2.2,
	NONE linux-2.6-scsi-cpqarray-set-master.patch, 1.1,
	NONE linux-2.6-shut-up-efifb.patch, 1.1.2.1,
	NONE linux-2.6-sony-laptop-rfkill.patch, 1.2.6.3,
	NONE linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch,
	1.1.2.1, NONE linux-2.6-utrace-ftrace.patch, 1.2.6.2,
	NONE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, 1.1.2.1,
	NONE linux-2.6-v4l-pvrusb2-fixes.patch, 1.1.2.2,
	NONE linux-2.6.29-alsa-update-quirks.patch, 1.1.2.1,
	NONE linux-2.6.29.1-sparc-regression.patch, 1.1.2.1,
	NONE patch-2.6.29.1.bz2.sign, 1.1.2.1,
	NONE revert-fix-modules_install-via-nfs.patch, 1.1,
	NONE squashfs-broken-when-pagesize-greater-than-blocksize.patch,
	1.1.2.1, NONE
Message-ID: <20090424222818.B570F70106@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7735

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore Makefile TODO branch config-arm config-generic 
	config-ia64-generic config-nodebug config-powerpc-generic 
	config-powerpc64 config-s390x config-sparc64-generic 
	config-sparc64-smp config-x86-generic config-x86_64-generic 
	drm-modesetting-radeon.patch drm-next.patch drm-nouveau.patch 
	kernel.spec linux-2.6-defaults-pci_no_msi.patch 
	linux-2.6-execshield.patch linux-2.6-tracehook.patch 
	linux-2.6-utrace.patch linux-2.6-v4l-dvb-fixes.patch sources 
	upstream xen.pvops.patch xen.pvops.post.patch 
	xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.30-rc3.bz2.sign rds-only-on-64-bit-or-x86.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	alsa-dont-reset-stream-at-each-prepare-callb.patch 
	alsa-hda-dont-reset-BDL-unnecessarily.patch 
	alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch 
	alsa-pcm-always-reset-invalid-position.patch 
	alsa-pcm-fix-delta-calc-at-overlap.patch 
	alsa-pcm-midlevel-add-more-strict-buffer-position.patch 
	alsa-pcm-safer-boundary-checks.patch 
	alsa-rewrite-hw_ptr-updaters.patch 
	drm-intel-gen3-fb-hack.patch 
	drm-intel-lying-systems-without-lvds.patch 
	linux-2.6-acer-wmi-bail-on-aao.patch 
	linux-2.6-acpi-strict-resources.patch 
	linux-2.6-acpi-video-didl-intel-outputs.patch 
	linux-2.6-add-qcserial.patch 
	linux-2.6-btrfs-fix-umount-hang.patch 
	linux-2.6-dma-debug-fixes.patch 
	linux-2.6-dropwatch-protocol.patch 
	linux-2.6-e820-acpi3-bios-workaround.patch 
	linux-2.6-e820-guard-against-pre-acpi3.patch 
	linux-2.6-e820-mark-esi-clobbered.patch 
	linux-2.6-e820-save-restore-edi-ebp.patch 
	linux-2.6-ext4-flush-on-close.patch 
	linux-2.6-ext4-really-print-warning-once.patch 
	linux-2.6-fiemap-header-install.patch 
	linux-2.6-hwmon-atk0110.patch 
	linux-2.6-input-hid-extra-gamepad.patch 
	linux-2.6-input-wacom-bluetooth.patch 
	linux-2.6-iommu-fixes.patch 
	linux-2.6-ipw2x00-age-scan-results-on-resume.patch 
	linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch 
	linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch 
	linux-2.6-kvm-kconfig-irqchip.patch 
	linux-2.6-kvm-mask-notifiers.patch 
	linux-2.6-kvm-reset-pit-irq-on-unmask.patch 
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch 
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch 
	linux-2.6-net-fix-another-gro-bug.patch 
	linux-2.6-pci-sysfs-remove-id.patch 
	linux-2.6-posix-timers-fix-clock-monotonicity.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch 
	linux-2.6-relatime-by-default.patch 
	linux-2.6-scsi-cpqarray-set-master.patch 
	linux-2.6-shut-up-efifb.patch 
	linux-2.6-sony-laptop-rfkill.patch 
	linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch 
	linux-2.6-utrace-ftrace.patch 
	linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch 
	linux-2.6-v4l-pvrusb2-fixes.patch 
	linux-2.6.29-alsa-update-quirks.patch 
	linux-2.6.29.1-sparc-regression.patch patch-2.6.29.1.bz2.sign 
	revert-fix-modules_install-via-nfs.patch 
	squashfs-broken-when-pagesize-greater-than-blocksize.patch 
Log Message:
switch to xen-tip/next pvops patch and back to devel Fedora kernel branch



--- NEW FILE patch-2.6.30-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ7o+uyGugalF9Dw4RAtIiAJ9Q2FF0AUuE9wb5RVl3ZJRWHxiO4QCfYA6K
EEF3jM6hOhIw5XNsajDXYns=
=i1E9
-----END PGP SIGNATURE-----

rds-only-on-64-bit-or-x86.patch:

--- NEW FILE rds-only-on-64-bit-or-x86.patch ---
diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index 796773b..29811ac 100644
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -1,7 +1,7 @@
 
 config RDS
 	tristate "Reliable Datagram Sockets (RDS) (EXPERIMENTAL)"
-	depends on INET && INFINIBAND_IPOIB && EXPERIMENTAL
+	depends on INET && INFINIBAND_IPOIB && EXPERIMENTAL && (X86 || 64BIT)
 	depends on INFINIBAND && INFINIBAND_ADDR_TRANS
 	---help---
 	  RDS provides reliable, sequenced delivery of datagrams


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.9
retrieving revision 1.1014.2.10
diff -u -r1.1014.2.9 -r1.1014.2.10
--- .cvsignore	14 Apr 2009 22:09:05 -0000	1.1014.2.9
+++ .cvsignore	24 Apr 2009 22:27:02 -0000	1.1014.2.10
@@ -5,4 +5,5 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29.1.bz2
+patch-2.6.29-git15.bz2
+patch-2.6.30-rc3.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97.6.3
retrieving revision 1.97.6.4
diff -u -r1.97.6.3 -r1.97.6.4
--- Makefile	14 Apr 2009 22:09:05 -0000	1.97.6.3
+++ Makefile	24 Apr 2009 22:27:03 -0000	1.97.6.4
@@ -71,6 +71,7 @@
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
+	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -116,6 +117,7 @@
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
+	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.54.6.5
retrieving revision 1.54.6.6
diff -u -r1.54.6.5 -r1.54.6.6
--- TODO	14 Apr 2009 22:09:06 -0000	1.54.6.5
+++ TODO	24 Apr 2009 22:27:03 -0000	1.54.6.6
@@ -20,9 +20,6 @@
 * linux-2.6-debug-vm-would-have-oomkilled.patch
 	Push for 2.6.29
 
-* linux-2.6-scsi-cpqarray-set-master.patch
-	Queued for 2.6.30 by Jens Axboe
-
 * linux-2.6-cdrom-door-status.patch
 	Getting some testing here before I go back to upstream with more
 	data.  See the thread at:
@@ -32,6 +29,10 @@
 * linux-2.6-hotfixes.patch
 	Empty
 
+* linux-2.6-crash-driver.patch
+	Unlikely to go upstream.
+	https://bugzilla.redhat.com/show_bug.cgi?id=492803
+
 * linux-2.6-debug-always-inline-kzalloc.patch
 	Sent upstream Sep 25 2008
 
@@ -67,13 +68,6 @@
 * linux-2.6-sysrq-c.patch
 	jarod working on upstreaming
 
-* drm-intel-lying-systems-without-lvds.patch
-	will be used as a fallback for 2.6.30 if vbios probing doesn't
-	pan out in time, may go to 2.6.29.x at some point (jarod's doing)
-* linux-2.6-acer-wmi-bail-on-aao.patch
-	suck. something similar-but-less-pretty merged upstream on 20090304,
-	a day after I (jarod) wrote my version... Headed to stable too.
-
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch
 * linux-2.6-silence-noise.patch
@@ -89,24 +83,3 @@
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
 	http://lkml.org/lkml/2006/8/2/208
 
-* linux-2.6-net-tulip-interrupt.patch
-	Queued by DaveM for next release.
-
-* linux-2.6-pci-sysfs-remove-id.patch
-        In jbarnes linux-next tree for 2.6.30
-        Need for KVM PCI device assignment
-        https://bugzilla.redhat.com/487103
-
-* linux-2.6-net-fix-another-gro-bug.patch:
-        virtio_net guest->remote GSO busted with 2.6.29 host
-        https://bugzilla.redhat.com/490266
-        Should be in 2.6.29.1
-
-* linux-2.6-kvm-kconfig-irqchip.patch
-  linux-2.6-kvm-mask-notifiers.patch
-  linux-2.6-kvm-reset-pit-irq-on-unmask.patch
-	Unable to run RHEL-5 Xen within KVM guest
-	https://bugzilla.redhat.com/show_bug.cgi?id=491625
-	Should be in 2.6.29.2
-
-


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/branch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- branch	14 Apr 2009 22:09:07 -0000	1.1.2.2
+++ branch	24 Apr 2009 22:27:04 -0000	1.1.2.3
@@ -1 +1 @@
-F-11
+devel


Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-arm,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- config-arm	26 Jan 2009 20:24:02 -0000	1.2
+++ config-arm	24 Apr 2009 22:27:04 -0000	1.2.6.1
@@ -8,6 +8,8 @@
 CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
 
+CONFIG_HIGHMEM=y
+
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
@@ -91,3 +93,5 @@
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_LL is not set
+
+CONFIG_ARM_UNWIND=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.16
retrieving revision 1.238.6.17
diff -u -r1.238.6.16 -r1.238.6.17
--- config-generic	14 Apr 2009 22:09:07 -0000	1.238.6.16
+++ config-generic	24 Apr 2009 22:27:04 -0000	1.238.6.17
@@ -11,11 +11,12 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
 CONFIG_BUILD_DOCSRC=y
+CONFIG_DYNAMIC_DEBUG=y
 
 #
 # General setup
@@ -78,6 +79,7 @@
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=y
+CONFIG_PCI_IOV=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_DEFAULT_ON=y
@@ -515,6 +517,15 @@
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS_LOGGING=y
+
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
 
 CONFIG_ATA=y
 CONFIG_ATA_SFF=y
@@ -786,6 +797,9 @@
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_PIMSM_V2=y
 
+CONFIG_RDS=m
+# CONFIG_RDS_DEBUG is not set
+
 CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
@@ -816,6 +830,7 @@
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -846,6 +861,8 @@
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
 
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
@@ -1071,6 +1088,9 @@
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NETDEVICES=y
 
+# disable later --kyle
+CONFIG_COMPAT_NET_DEV_OPS=y
+
 #
 # ARCnet devices
 #
@@ -1231,6 +1251,7 @@
 CONFIG_DE620=m
 CONFIG_CASSINI=m
 # CONFIG_FEC_8XX is not set
+CONFIG_ETHOC=m
 
 #
 # Ethernet (1000 Mbit)
@@ -1245,6 +1266,7 @@
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
 CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -1278,6 +1300,8 @@
 CONFIG_NIU=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_TEHUTI=m
 CONFIG_ENIC=m
 CONFIG_MLX4_EN=m
@@ -1360,16 +1384,17 @@
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUG is not set
+CONFIG_AT76C50X_USB=m
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
 CONFIG_ATMEL=m
 # CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -1395,16 +1420,14 @@
 CONFIG_LIBERTAS_DEBUG=y
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_IWLCORE=m
-CONFIG_IWLCORE_RFKILL=y
+CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLWIFI_RUN_TIME_CALIB=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_RFKILL=y
+CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 CONFIG_IWLAGN=m
-CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y
-CONFIG_IWLAGN_LEDS=y
 CONFIG_IWL4965=y
 CONFIG_IWL5000=y
 CONFIG_IWL5000_RUN_TIME_CALIB=y
@@ -1421,6 +1444,7 @@
 CONFIG_PCI_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_PCI_ATMEL=m
+CONFIG_MWL8K=m
 CONFIG_PRISM54=m
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
@@ -1449,7 +1473,7 @@
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-
+CONFIG_AR9170_USB=m
 
 #
 # Token Ring devices
@@ -1811,6 +1835,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
@@ -1990,6 +2015,7 @@
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_HDAPS=m
@@ -2020,6 +2046,7 @@
 CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
@@ -2037,6 +2064,8 @@
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LM95241=m
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2107,6 +2136,7 @@
 CONFIG_WM8350_WATCHDOG=m
 
 CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_RTC_DEBUG is not set
@@ -2283,6 +2313,7 @@
 #
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_DYNAMIC_MINORS=y
 
 # CONFIG_DVB_FE_CUSTOMISE is not set
 
@@ -2300,7 +2331,12 @@
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_DM1105=m
-CONFIG_DVB_DYNAMIC_MINORS=y
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_LGDT3304=m
+CONFIG_DVB_S921=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_DUMMY_FE=m
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -2342,6 +2378,7 @@
 CONFIG_DVB_USB_GP8PSK=m
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
@@ -2351,7 +2388,6 @@
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_TUNER=m
-CONFIG_DVB_USB_CE6230=m
 # CONFIG_VIDEO_TUNER_CUSTOMISE is not set
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -2372,6 +2408,7 @@
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ARK is not set
 CONFIG_FB_ATY128=m
@@ -2443,6 +2480,7 @@
 CONFIG_FB_MB862XX_LIME=y
 # CONFIG_FB_PRE_INIT_FB is not set
 # CONFIG_FB_TMIO is not set
+# CONFIG_FB_BROADSHEET is not set
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -2512,6 +2550,8 @@
 #
 CONFIG_SND_AD1889=m
 # CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_MSND_PINNACLE is not set
+# CONFIG_SND_MSND_CLASSIC is not set
 
 #
 # PCI devices
@@ -2560,7 +2600,7 @@
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m
@@ -2695,10 +2735,10 @@
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
+CONFIG_DRAGONRISE_FF=m
 
 #
 # USB Imaging devices
@@ -2814,6 +2854,9 @@
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_EMPEG=m
@@ -2855,7 +2898,6 @@
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
@@ -2945,6 +2987,7 @@
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_RTC_DRV_PCF50633=m
@@ -2967,6 +3010,7 @@
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XIP=y
 CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
@@ -3009,6 +3053,18 @@
 # Autofsv3 is obsolete.
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=m
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NILFS2_FS=m
+
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -3033,6 +3089,7 @@
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
@@ -3089,6 +3146,7 @@
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
+CONFIG_NFS_FSCACHE=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
@@ -3142,8 +3200,7 @@
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
 CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_NOLOCK=m
-CONFIG_GFS2_FS_LOCKING_DLM=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
 
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_XATTR=y
@@ -3283,6 +3340,7 @@
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 
@@ -3294,7 +3352,6 @@
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
@@ -3361,6 +3418,7 @@
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=m
 
+CONFIG_CRYPTO_ZLIB=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -3414,6 +3472,8 @@
 
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
 CONFIG_KEXEC=y
 
@@ -3431,7 +3491,7 @@
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 
 ## BEGIN ISA Junk.
 
@@ -3457,7 +3517,6 @@
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_MVSAS=m
 
 # CONFIG_EL1 is not set
 # CONFIG_EL2 is not set
@@ -3585,6 +3644,8 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
 # CONFIG_SND_SOC is not set
 
 ## END of ISA options.
@@ -3602,6 +3663,8 @@
 # CONFIG_LEDS_NET48XX is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_S3C24XX is not set
 # CONFIG_LEDS_SPITZ is not set
 # CONFIG_LEDS_TOSA is not set
@@ -3619,6 +3682,7 @@
 CONFIG_DMA_ENGINE=y
 CONFIG_NET_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_ASYNC_TX_DMA=y
 
 CONFIG_UNUSED_SYMBOLS=y
 
@@ -3629,6 +3693,10 @@
 CONFIG_SCHED_TRACER=y
 CONFIG_PROCESS_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_WORKQUEUE_TRACER=y
+CONFIG_EVENT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_KMEMTRACE=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
@@ -3666,6 +3734,7 @@
 CONFIG_UIO_SMX=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 
 CONFIG_INSTRUMENTATION=y
@@ -3723,6 +3792,7 @@
 
 # CONFIG_INTEL_MENLOW is not set
 CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_ISL29003=m
 CONFIG_IPWIRELESS=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_CGROUP_MEM_CONT=y
@@ -3781,6 +3851,7 @@
 
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_WM8350=m
@@ -3831,6 +3902,16 @@
 # CONFIG_INPUT_MIMIO is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_EPL is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_USB_SERIAL_ATEN2011 is not set
+# CONFIG_B3DFG is not set
+# CONFIG_DST is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_HECI is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
+# CONFIG_RT3070 is not set
 
 #
 # Android
@@ -3847,7 +3928,7 @@
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-# CONFIG_BOOT_TRACER is not set
+CONFIG_BOOT_TRACER=y
 CONFIG_STACK_TRACER=y
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 CONFIG_EARLY_PRINTK_DBGP=y
@@ -3856,37 +3937,38 @@
 
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 
+CONFIG_NOP_USB_XCEIV=m
+
+# CONFIG_IMA is not set
+
+# CONFIG_PAGE_POISONING is not set
+
+CONFIG_SLOW_WORK=y
+
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRASH is not set
 
+CONFIG_STRIP_ASM_SYMS=y
+
 #
 # added for xen pvops patch
 #
 # CONFIG_PERF_COUNTERS is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_VSMP is not set
-# CONFIG_X86_UV is not set
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_ALLOW_WARNINGS=y
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 CONFIG_XEN_NETDEV_BACKEND=y
-# CONFIG_CC_STACKPROTECTOR is not set
-# CONFIG_X86_X2APIC is not set
 CONFIG_RD_GZIP=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
 # CONFIG_XEN_GNTDEV is not set
-# CONFIG_EVENT_TRACER is not set
 CONFIG_XEN_SYS_HYPERVISOR=y
-# CONFIG_X86_CPU_DEBUG is not set
-# CONFIG_KEXEC_JUMP is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_ENABLE_EVENT_TRACING is not set
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_CLASSIC_RCU=y


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.21.6.2
retrieving revision 1.21.6.3
diff -u -r1.21.6.2 -r1.21.6.3
--- config-ia64-generic	12 Mar 2009 20:38:55 -0000	1.21.6.2
+++ config-ia64-generic	24 Apr 2009 22:27:04 -0000	1.21.6.3
@@ -70,6 +70,7 @@
 # CONFIG_HW_RANDOM is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_EFI_RTC=y
+CONFIG_RTC_DRV_EFI=y
 
 
 #
@@ -203,9 +204,6 @@
 
 CONFIG_HP_ILO=m
 
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
 


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.31.6.1
retrieving revision 1.31.6.2
diff -u -r1.31.6.1 -r1.31.6.2
--- config-nodebug	14 Apr 2009 22:09:07 -0000	1.31.6.1
+++ config-nodebug	24 Apr 2009 22:27:04 -0000	1.31.6.2
@@ -2,50 +2,50 @@
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SPINLOCK=y
+
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAIL_IO_TIMEOUT is not set
 
-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG_ON=y
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
 # CONFIG_ACPI_DEBUG is not set
 
-# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_SG=y
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# CONFIG_DEBUG_OBJECTS_FREE is not set
-# CONFIG_DEBUG_OBJECTS_TIMERS is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-# CONFIG_X86_PTDUMP is not set
+CONFIG_X86_PTDUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 
-# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_NOTIFIERS=y
 
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 
-# CONFIG_MMIOTRACE is not set
+CONFIG_MMIOTRACE=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.33.6.4
retrieving revision 1.33.6.5
diff -u -r1.33.6.4 -r1.33.6.5
--- config-powerpc-generic	24 Mar 2009 22:57:41 -0000	1.33.6.4
+++ config-powerpc-generic	24 Apr 2009 22:27:04 -0000	1.33.6.5
@@ -36,6 +36,7 @@
 # CONFIG_GEN_RTC is not set
 # CONFIG_GEN_RTC_X is not set
 CONFIG_RTC_DRV_PPC=y
+CONFIG_RTC_DRV_GENERIC=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ELECTRA_IDE=y
@@ -111,11 +112,14 @@
 # CONFIG_PMAC_BACKLIGHT_LEGACY is not set
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
 
 # FIXME: Should depend on IA64/x86
 # CONFIG_SGI_IOC4 is not set
 
 CONFIG_PPC_EFIKA=y
+CONFIG_PPC_MEDIA5200=y
+
 # CONFIG_PPC_LITE5200 is not set
 CONFIG_PPC_BESTCOMM=y
 CONFIG_PMAC_RACKMETER=m
@@ -198,6 +202,8 @@
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_PASEMI=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 CONFIG_AXON_RAM=m
 CONFIG_OPROFILE_CELL=y
@@ -253,8 +259,10 @@
 # CONFIG_PPC_SMLPAR is not set
 
 CONFIG_MGCOGE=y
-### breaks usb on mac...? #486511
-# CONFIG_GEF_SBC610 is not set
+CONFIG_GEF_SBC610=y
+CONFIG_GEF_PPC9A=y
+CONFIG_GEF_SBC310=y
+
 CONFIG_QUICC_ENGINE=y
 CONFIG_QE_GPIO=y
 CONFIG_MPC8xxx_GPIO=y
@@ -288,6 +296,8 @@
 
 CONFIG_SIMPLE_GPIO=y
 
+CONFIG_FSL_PQ_MDIO=m
+
 CONFIG_PS3_VRAM=m
 CONFIG_MDIO_GPIO=m
 CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
@@ -300,3 +310,11 @@
 # CONFIG_FHCI_DEBUG is not set
 
 # CONFIG_DRM_RADEON_KMS is not set
+
+CONFIG_AMIGAONE=y
+
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+
+CONFIG_DTL=y
+
+CONFIG_MMC_SDHCI_OF=m


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.27.6.1
retrieving revision 1.27.6.2
diff -u -r1.27.6.1 -r1.27.6.2
--- config-powerpc64	12 Mar 2009 20:38:56 -0000	1.27.6.1
+++ config-powerpc64	24 Apr 2009 22:27:04 -0000	1.27.6.2
@@ -40,6 +40,7 @@
 CONFIG_CBE_THERM=m
 CONFIG_CBE_CPUFREQ=m
 CONFIG_CBE_CPUFREQ_PMI=m
+CONFIG_CBE_CPUFREQ_PMI_ENABLE=y
 CONFIG_PMAC_RACKMETER=m
 CONFIG_IBMEBUS=y
 CONFIG_SPU_FS=m
@@ -175,3 +176,7 @@
 CONFIG_PPC_IBM_CELL_POWERBUTTON=m
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
 
+CONFIG_RTC_DRV_PS3=y
+
+CONFIG_CRASH_DUMP=y
+CONFIG_RELOCATABLE=y


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.11.6.1
retrieving revision 1.11.6.2
diff -u -r1.11.6.1 -r1.11.6.2
--- config-s390x	12 Mar 2009 20:38:56 -0000	1.11.6.1
+++ config-s390x	24 Apr 2009 22:27:04 -0000	1.11.6.2
@@ -5,6 +5,11 @@
 CONFIG_NR_CPUS=64
 CONFIG_COMPAT=y
 
+# See bug 496596
+CONFIG_HZ_100=y
+# See bug 496605
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 
@@ -29,7 +34,7 @@
 CONFIG_IPL_VM=y
 # CONFIG_PROCESS_DEBUG is not set
 CONFIG_PFAULT=y
-# CONFIG_SHARED_KERNEL is not set
+CONFIG_SHARED_KERNEL=y
 CONFIG_CMM=m
 CONFIG_CMM_PROC=y
 CONFIG_VIRT_TIMER=y
@@ -40,7 +45,7 @@
 # SCSI low-level drivers
 #
 CONFIG_ZFCP=m
-CONFIG_ZFCPDUMP=m
+CONFIG_ZFCPDUMP=y
 CONFIG_CCW=y
 
 #
@@ -123,10 +128,6 @@
 # CONFIG_IEEE80211 is not set
 # CONFIG_B44 is not set
 
-# The s390 CPU does not have hardware support for big pages at all.
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-
 #
 # Partition Types
 #


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.21.6.2
retrieving revision 1.21.6.3
diff -u -r1.21.6.2 -r1.21.6.3
--- config-sparc64-generic	14 Apr 2009 22:09:07 -0000	1.21.6.2
+++ config-sparc64-generic	24 Apr 2009 22:27:04 -0000	1.21.6.3
@@ -151,7 +151,7 @@
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E_TX_RETRY=16
 # CONFIG_DRM_TDFX is not set
-CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_SPARCSPKR=m
@@ -197,5 +197,3 @@
 CONFIG_SENSORS_ULTRA45=m
 CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
-
-# CONFIG_KGDB is not set


Index: config-sparc64-smp
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-smp,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- config-sparc64-smp	14 Apr 2009 22:09:07 -0000	1.2.16.1
+++ config-sparc64-smp	24 Apr 2009 22:27:04 -0000	1.2.16.2
@@ -1,2 +1 @@
 CONFIG_SMP=y
-CONFIG_KGDB=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.6
retrieving revision 1.68.6.7
diff -u -r1.68.6.6 -r1.68.6.7
--- config-x86-generic	14 Apr 2009 22:09:07 -0000	1.68.6.6
+++ config-x86-generic	24 Apr 2009 22:27:04 -0000	1.68.6.7
@@ -9,6 +9,9 @@
 #
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_32_NON_STANDARD=y
+
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
@@ -67,6 +70,7 @@
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
+CONFIG_X86_CPU_DEBUG=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set
@@ -83,6 +87,11 @@
 CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 
+CONFIG_DMAR=y
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=y
 CONFIG_FB_GEODE_GX=y
@@ -100,6 +109,8 @@
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
+# CONFIG_CC_STACKPROTECTOR is not set
+
 CONFIG_SECCOMP=y
 
 CONFIG_CAPI_EICON=y
@@ -290,6 +301,8 @@
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I5400=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 CONFIG_SCHED_MC=y
 
@@ -322,6 +335,7 @@
 CONFIG_ACER_WMI=m
 CONFIG_TC1100_WMI=m
 CONFIG_HP_WMI=m
+CONFIG_DELL_WMI=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
@@ -383,6 +397,7 @@
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 
 CONFIG_MACINTOSH_DRIVERS=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.6
retrieving revision 1.68.2.7
diff -u -r1.68.2.6 -r1.68.2.7
--- config-x86_64-generic	14 Apr 2009 22:09:07 -0000	1.68.2.6
+++ config-x86_64-generic	24 Apr 2009 22:27:05 -0000	1.68.2.7
@@ -3,14 +3,18 @@
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_VSMP is not set
+# CONFIG_X86_UV is not set
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
+CONFIG_X86_CPU_DEBUG=m
 CONFIG_MTRR=y
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 
@@ -32,6 +36,8 @@
 CONFIG_DMAR_FLOPPY_WA=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 
+CONFIG_KEXEC_JUMP=y
+
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
@@ -111,6 +117,7 @@
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_HP_WMI=m
+CONFIG_DELL_WMI=m
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
@@ -118,6 +125,7 @@
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -152,6 +160,7 @@
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 # CONFIG_CRYPTO_SALSA20 is not set
 CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
 
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
@@ -193,6 +202,8 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
 
 CONFIG_SCHED_MC=y
 
@@ -346,5 +357,6 @@
 CONFIG_POWER_TRACER=y
 CONFIG_HW_BRANCH_TRACER=y
 
+CONFIG_X86_X2APIC=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_NUMA_MIGRATE_IRQ_DESC=y

drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.54.6.8 -r 1.54.6.9 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.54.6.8
retrieving revision 1.54.6.9
diff -u -r1.54.6.8 -r1.54.6.9
--- drm-modesetting-radeon.patch	14 Apr 2009 22:09:08 -0000	1.54.6.8
+++ drm-modesetting-radeon.patch	24 Apr 2009 22:27:05 -0000	1.54.6.9
@@ -1,184 +1,3 @@
-commit 02b2eac96ef3cd6a59bf2a13c9ae104f855ff582
-Merge: 1076a8a 24eacd0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 14 15:55:42 2009 +1000
-
-    Merge branch 'drm-rawhide' into drm-f11
-
-commit 24eacd0cf8cb65a038934c11ef8ae5da348f1365
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 14 15:52:28 2009 +1000
-
-    radeon: add another debugging hook to gem code
-
-commit e612721b43a6fb107aa74a41e9438f23bc833051
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 14 15:32:08 2009 +1000
-
-    radeon: add M7 thinkpad quirk
-
-commit 6a166a2d7b4a4d9ba8ee1535f5ab1d156df6743d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 14 13:59:29 2009 +1000
-
-    radeon: IGPs enable snooping in theory
-
-commit b954fe6e4c28e92e636afac1110c203148899129
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 14 13:19:32 2009 +1000
-
-    radeon: ack irqs before suspend in case any are pending
-
-commit 7ac7ebfef2088c943d20f683a7da1a5dcfe1bce3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 14 13:18:37 2009 +1000
-
-    radeon: add initial fixed point bandwidth calcs for legacy chips.
-    
-    This does the bandwidth calcs using a 20/12 fixed point representation,
-    and ports all the code from userspace, it needs testing, but it also
-    ICEs gcc so can't really test until that is fixed.
-
-commit 7db0b18f5cbc62b89f904b5f18d046e7bcac83cc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Apr 13 15:49:34 2009 +1000
-
-    radeon: feed back updated limits to userspace
-
-commit ca7f16ed835965f0f29f38958fa8547331eeba67
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Apr 13 15:45:14 2009 +1000
-
-    radeon: sync atom quirks
-
-commit 173bbeca616f4ffff4d8205f86bfb79c35151de1
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Apr 13 15:35:12 2009 +1000
-
-    radeon: agp mode quirks ported from userspace
-
-commit 1076a8a749c46b964ee49f5d4dc42070b1905e26
-Merge: e94c6e1 8765b83
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Apr 9 20:04:30 2009 +1000
-
-    Merge branch 'drm-rawhide' into drm-f11
-
-commit 8765b83462d03fcbd2b9d2eab647d7c2d362b12a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Apr 9 20:02:43 2009 +1000
-
-    radeon: commit missed change
-
-commit c6714d8fcdecbba304eb9e0745a4d8b6d0fb54b7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Apr 9 20:01:12 2009 +1000
-
-    radeon: temporary dac detection fix
-
-commit d96029a52d92bd307e93e4d917c9befff246f196
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Apr 9 20:00:49 2009 +1000
-
-    radeon: fixups ported from userspace tree
-
-commit f9db70a117cc498c20e567cf53b75ccb5ad79927
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Apr 6 13:32:03 2009 -0400
-
-    radeon: fix default sclk/mclk from combios
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 28c6f86ef07c8f0067ece9d7fe40718854b19422
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Apr 6 13:29:56 2009 -0400
-
-    radeon: fix crtc routing for CRT1 on r4xx ATOM
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 78bf4641b234a99deb3820b8d7baece35a54dce6
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Apr 9 18:41:47 2009 +1000
-
-    radeon: reset edid if none found
-
-commit a6fe700b5e32fd4db97fda76cb32977b5f381ebd
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Apr 9 18:40:57 2009 +1000
-
-    radeon: fix up dual head screens on atombios
-
-commit a6dd68b3a5dee15f59bdaabf37b6a36da18a03f4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 7 17:25:13 2009 +1000
-
-    radeon: fix pinning/unpinning for frontbuffer
-
-commit 828d4bc8e75d8e8ac532269521d2aeb3b50ee529
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Apr 7 16:58:35 2009 +1000
-
-    radeon: actually unpin cursor on freeing
-
-commit 70c85b35945d11fae318957c7fbc52ce566a6f03
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Apr 6 20:33:56 2009 +1000
-
-    radeon: add info ioctl
-
-commit e94c6e10efb4dec58e4c0ab419050b11a913eaf9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Apr 6 15:01:00 2009 +1000
-
-    drop initial config args
-
-commit 280d9ff29dead8e85ed603110ed431d99f07fb99
-Merge: 0221c81 54ed280
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Apr 6 14:35:32 2009 +1000
-
-    Merge branch 'drm-rawhide' into drm-f11
-    
-    Conflicts:
-    	drivers/gpu/drm/radeon/r300_cmdbuf.c
-    	drivers/gpu/drm/radeon/radeon_cp.c
-
-commit 54ed2800977d314d8af6c1c47cd718d82f734cb6
-Author: Jerome Glisse <glisse at freedesktop.org>
-Date:   Fri Apr 3 15:01:31 2009 +0200
-
-    radeon: cleanup userspace API
-    
-    Remove old userspace API we don't want to use and
-    rename wait_rendering to wait_idle
-    change mmap to using userspace mmap call
-
-commit 71c5ad46842fcd214a8e926eb9528e084622d488
-Author: Jerome Glisse <glisse at freedesktop.org>
-Date:   Fri Apr 3 13:48:20 2009 +0200
-
-    radeon: remove pin/unpin userspace ioctl
-
-commit 7628d2d9b66fc891fc0b030772a0ebae8e695561
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Apr 3 14:56:19 2009 +1000
-
-    radeon: fix two issues with uncached allocs on PCIE systems
-
-commit 79a5ca0c53c2a149f51f71352a6bbf73bcdc40df
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Apr 1 22:34:53 2009 +1000
-
-    radeon: reorder bm enable vs mode set
-
-commit c9e19d53bafaacd883ad9eafd3090eb6bc4e4837
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Mar 25 21:49:49 2009 +1000
-
-    radeon: add vram limit for testing lower vram
-
 commit dea27f6e83efabdc3e37bc5a91d29d6dab893853
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Mar 18 17:07:07 2009 +1000
@@ -1930,7 +1749,7 @@
 
     drm: import TTM basic objects
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index 640339e..fdc60ea 100644
+index e0ab173..69de2db 100644
 --- a/arch/x86/mm/pat.c
[...3122 lines suppressed...]
-+#define DRM_IOCTL_RADEON_GEM_WAIT_IDLE	DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle) 
-+#define DRM_IOCTL_RADEON_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+#define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
-+
  
++#define DRM_IOCTL_RADEON_GEM_INFO   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
++#define DRM_IOCTL_RADEON_GEM_CREATE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
++#define DRM_IOCTL_RADEON_GEM_MMAP   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
++#define DRM_IOCTL_RADEON_GEM_PIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PIN, struct drm_radeon_gem_pin)
++#define DRM_IOCTL_RADEON_GEM_UNPIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_UNPIN, struct drm_radeon_gem_unpin)
++#define DRM_IOCTL_RADEON_GEM_PREAD   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
++#define DRM_IOCTL_RADEON_GEM_PWRITE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
++#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
++#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
++#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++
++
  typedef struct drm_radeon_init {
  	enum {
-@@ -682,6 +703,7 @@ typedef struct drm_radeon_indirect {
+ 		RADEON_INIT_CP = 0x01,
+@@ -680,6 +713,8 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-+#define RADEON_PARAM_DEVICE_ID             16
++#define RADEON_PARAM_KERNEL_MM             16
++#define RADEON_PARAM_DEVICE_ID		   17
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -751,4 +773,112 @@ typedef struct drm_radeon_surface_free {
+@@ -734,6 +769,7 @@ typedef struct drm_radeon_setparam {
+ #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
+ #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
+ #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
++#define RADEON_SETPARAM_MM_INIT 7               /* DDX wants memory manager but has no modesetting */
+ /* 1.14: Clients can allocate/free a surface
+  */
+ typedef struct drm_radeon_surface_alloc {
+@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
-+/*
-+ * Kernel modesetting world below.
-+ */
-+#define RADEON_GEM_DOMAIN_CPU		0x1
-+#define RADEON_GEM_DOMAIN_GTT		0x2
-+#define RADEON_GEM_DOMAIN_VRAM		0x4
++#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
++#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
++#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
 +
++/* return to userspace start/size of gtt and vram apertures */
 +struct drm_radeon_gem_info {
-+	uint64_t	gart_size;
-+	uint64_t	vram_size;
-+	uint64_t	vram_visible;
++	uint64_t gart_start;
++	uint64_t gart_size;
++	uint64_t vram_start;
++	uint64_t vram_size;
++	uint64_t vram_visible;
 +};
 +
-+#define RADEON_GEM_NO_BACKING_STORE 1
-+
 +struct drm_radeon_gem_create {
-+	uint64_t	size;
-+	uint64_t	alignment;
-+	uint32_t	handle;
-+	uint32_t	initial_domain;
-+	uint32_t	flags;
++	uint64_t size;
++	uint64_t alignment;
++	uint32_t handle;
++	uint32_t initial_domain; // to allow VRAM to be created
++	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
++	// pretty much front/back/depth don't need it - other things do
 +};
 +
 +struct drm_radeon_gem_mmap {
-+	uint32_t	handle;
-+	uint32_t	pad;
-+	uint64_t	offset;
-+	uint64_t	size;
-+	uint64_t	addr_ptr;
++	uint32_t handle;
++	uint32_t pad;
++	uint64_t offset;
++	uint64_t size;
++	uint64_t addr_ptr;
 +};
 +
 +struct drm_radeon_gem_set_domain {
-+	uint32_t	handle;
-+	uint32_t		read_domains;
-+	uint32_t		write_domain;
++	uint32_t handle;
++	uint32_t read_domains;
++	uint32_t write_domain;
++};
++
++struct drm_radeon_gem_wait_rendering {
++	uint32_t handle;
++};
++
++struct drm_radeon_gem_pin {
++	uint32_t handle;
++	uint32_t pin_domain;
++	uint64_t alignment;
++	uint64_t offset;
 +};
 +
-+struct drm_radeon_gem_wait_idle {
-+	uint32_t	handle;
-+	uint32_t	pad;
++struct drm_radeon_gem_unpin {
++	uint32_t handle;
++	uint32_t pad;
 +};
 +
 +struct drm_radeon_gem_busy {
-+	uint32_t	handle;
-+	uint32_t	busy;
++	uint32_t handle;
++	uint32_t busy;
 +};
 +
 +struct drm_radeon_gem_pread {
@@ -39383,8 +38670,7 @@
 +	/** Length of data to read */
 +	uint64_t size;
 +	/** Pointer to write the data into. */
-+	/* void *, but pointers are not 32/64 compatible */
-+	uint64_t data_ptr;
++	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
 +};
 +
 +struct drm_radeon_gem_pwrite {
@@ -39396,43 +38682,28 @@
 +	/** Length of data to write */
 +	uint64_t size;
 +	/** Pointer to read the data from. */
-+	/* void *, but pointers are not 32/64 compatible */
-+	uint64_t data_ptr;
++	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
 +};
 +
-+#define RADEON_CHUNK_ID_RELOCS	0x01
-+#define RADEON_CHUNK_ID_IB	0x02
 +
-+struct drm_radeon_cs_chunk {
-+	uint32_t		chunk_id;
-+	uint32_t		length_dw;
-+	uint64_t		chunk_data;
-+};
++/* New interface which obsolete all previous interface.
++ */
++#define RADEON_CHUNK_ID_RELOCS 0x01
++#define RADEON_CHUNK_ID_IB     0x02
++#define RADEON_CHUNK_ID_OLD 0xff
 +
-+struct drm_radeon_cs_reloc {
-+	uint32_t		handle;
-+	uint32_t		read_domains;
-+	uint32_t		write_domain;
-+	uint32_t		flags;
++struct drm_radeon_cs_chunk {
++	uint32_t chunk_id;
++	uint32_t length_dw;
++	uint64_t chunk_data;
 +};
 +
 +struct drm_radeon_cs {
-+	uint32_t		num_chunks;
-+	uint32_t		cs_id;
-+	/* this points to uint64_t * which point to cs chunks */
-+	uint64_t		chunks;
-+	/* updates to the limits after this CS ioctl */
-+	uint64_t		gart_limit;
-+	uint64_t		vram_limit;
-+};
-+
-+#define RADEON_INFO_DEVICE_ID		0x00
-+#define RADEON_INFO_NUM_GB_PIPES	0x01
-+
-+struct drm_radeon_info {
-+	uint32_t		request;
-+	uint32_t		pad;
-+	uint64_t		value;
++	uint32_t	num_chunks;
++	uint32_t        cs_id;
++	uint64_t	chunks; /* this points to uint64_t * which point to
++				   cs chunks */
 +};
 +
++
  #endif

drm-next.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6.6.6 -r 1.6.6.7 drm-next.patch
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.6.6.6
retrieving revision 1.6.6.7
diff -u -r1.6.6.6 -r1.6.6.7
--- drm-next.patch	14 Apr 2009 22:09:11 -0000	1.6.6.6
+++ drm-next.patch	24 Apr 2009 22:27:07 -0000	1.6.6.7
@@ -1,3 +1,659 @@
+commit 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Mar 16 15:37:02 2009 -0400
+
+    drm/radeon: fix logic in r600_page_table_init() to match ati_gart
+    
+    This fixes page table init on rs600.
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 06f0a488c1b642d3cd7769da66600e5148c3fad8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 09:35:32 2009 +1000
+
+    drm/radeon: r600 ptes are 64-bit, cleanup cleanup function.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 03efb8853c35aff51c7b901bf412f32765fe0fd9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 10 18:36:38 2009 +1000
+
+    drm/radeon: don't call irq changes on r600 suspend/resume
+    
+    Until we sort out r600 IRQs don't do this.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit d02f7fa77d97a28a4276939f35e44ae995ad13d7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 10 18:34:23 2009 +1000
+
+    drm/radeon: fix r600 writeback across suspend/resume
+    
+    This update was done in mainline radeon, but not in the r600.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 6546bf6d6cbf1f9ac350fd278a1d937d4bb9ad06
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Mar 9 15:31:20 2009 +1000
+
+    drm/radeon: fix r600 writeback setup.
+    
+    This fixes 2 bugs:
+    1. the AGP calculation wasn't consistent with the PCI(E) calc for the
+    RPTR_ADDR registers. This consolidates the writes and fixes it up.
+    
+    2. The scratch address was being incorrectly calculated, this breaks
+    it out into a lot more linear steps.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 1847a549ac4db1272dea13d86331c492a2640b3b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Mar 9 12:47:18 2009 +1000
+
+    drm: fix warnings about new mappings in info code.
+    
+    This fixes up the warnings in the debugfs code that conflicted
+    with the mapping fixups.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 8f497aade8df2a619eacda927a43ebe82167a84c
+Author: Hannes Eder <hannes at hanneseder.net>
+Date:   Thu Mar 5 20:14:18 2009 +0100
+
+    drm/radeon: NULL noise: drivers/gpu/drm/radeon/radeon_*.c
+    
+    Fix this sparse warning:
+      drivers/gpu/drm/radeon/r600_cp.c:1811:52: warning: Using plain integer as NULL pointer
+      drivers/gpu/drm/radeon/radeon_cp.c:1363:52: warning: Using plain integer as NULL pointer
+      drivers/gpu/drm/radeon/radeon_state.c:1983:61: warning: Using plain integer as NULL pointer
+    
+    Signed-off-by: Hannes Eder <hannes at hanneseder.net>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit a763d7dc0adb1159c1a52d43e566409da9fa59f0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Mar 9 12:17:08 2009 +1000
+
+    drm/radeon: fix r600 pci mapping calls.
+    
+    This realigns the r600 pci mapping calls with the ati pcigart ones,
+    fixing the direction and using the correct interface.
+    
+    Suggested by Jerome Glisse.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 08932156cc2d4f8807dc5ca5c3d6ccd85080610a
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Sat Mar 7 18:21:21 2009 -0500
+
+    drm/radeon: r6xx/r7xx: fix possible oops in r600_page_table_cleanup()
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 53c379e9462b59d4e166429ff064aaf0e7743795
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Mar 9 12:12:28 2009 +1000
+
+    radeon: call the correct idle function, logic got inverted.
+    
+    This calls the correct idle function for the R600 and previous chips.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 800b69951174f7de294da575d7e7921041a7e783
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Fri Mar 6 11:47:54 2009 -0500
+
+    drm/radeon: RS600: fix interrupt handling
+    
+    the checks weren't updated when RS600 support
+    was added.
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Feb 26 10:15:24 2009 +1000
+
+    drm/r600: fix rptr address along lines of previous fixes to radeon.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit eb1d91954ededc00ddcfb51e2626f114ff351524
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Feb 26 10:14:40 2009 +1000
+
+    drm/r600: fixup r600 gart table accessor like ati_pcigart.c
+    
+    This attempts to fixup the r600 GART accessors so they work on other arches.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 6abf66018f7fe231720e50f9a47b142182388869
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Feb 26 10:13:47 2009 +1000
+
+    drm/ati_pcigart: use memset_io to reset the memory
+    
+    Also don't setup pci_gart if we aren't going to need it.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 87f0da55353e23826a54bff57c457a13b97d18f1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Feb 26 10:12:10 2009 +1000
+
+    drm: add DRM_READ/WRITE64 wrappers around readq/writeq.
+    
+    The readq/writeq stuff is from Dave Miller, and he
+    warns users to be careful about using these. Plans are only
+    r600 to use it so far.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 8ced9c75160947d2235fba75de9413e087e1171a
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Feb 25 17:02:19 2009 -0500
+
+    radeon: add RS600 pci ids
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit c1556f71513f2e660fb2bbdc29344361b1ebff35
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Feb 25 16:57:49 2009 -0500
+
+    radeon: add support for rs600 GPUs
+    
+    RS600s are an AMD IGP for Intel CPUs, that look like RS690s from
+    a lot of perspectives but look like r600s from a memory controller
+    point of view.
+    
+    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 7659e9804b7a66047433182d86393d38ba4eff79
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Wed Feb 25 15:55:01 2009 -0500
+
+    radeon: fix r600 AGP support
+    
[...6622 lines suppressed...]
- #define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
- 
- typedef struct _drm_mga_warp_index {
-@@ -310,7 +312,7 @@ typedef struct drm_mga_dma_bootstrap {
- 	 */
- 	/*@{ */
- 	unsigned long texture_handle; /**< Handle used to map AGP textures. */
--	uint32_t texture_size;	      /**< Size of the AGP texture region. */
-+	__u32 texture_size;	      /**< Size of the AGP texture region. */
- 	/*@} */
- 
- 	/**
-@@ -319,7 +321,7 @@ typedef struct drm_mga_dma_bootstrap {
- 	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
- 	 * filled in with the actual AGP mode.  If AGP was not available
- 	 */
--	uint32_t primary_size;
-+	__u32 primary_size;
- 
- 	/**
- 	 * Requested number of secondary DMA buffers.
-@@ -329,7 +331,7 @@ typedef struct drm_mga_dma_bootstrap {
- 	 * allocated.  Particularly when PCI DMA is used, this may be
- 	 * (subtantially) less than the number requested.
- 	 */
--	uint32_t secondary_bin_count;
-+	__u32 secondary_bin_count;
- 
- 	/**
- 	 * Requested size of each secondary DMA buffer.
-@@ -338,7 +340,7 @@ typedef struct drm_mga_dma_bootstrap {
- 	 * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
- 	 * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
- 	 */
--	uint32_t secondary_bin_size;
-+	__u32 secondary_bin_size;
- 
- 	/**
- 	 * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
-@@ -350,12 +352,12 @@ typedef struct drm_mga_dma_bootstrap {
- 	 * filled in with the actual AGP mode.  If AGP was not available
- 	 * (i.e., PCI DMA was used), this value will be zero.
- 	 */
--	uint32_t agp_mode;
-+	__u32 agp_mode;
- 
- 	/**
- 	 * Desired AGP GART size, measured in megabytes.
- 	 */
--	uint8_t agp_size;
-+	__u8 agp_size;
- } drm_mga_dma_bootstrap_t;
- 
- typedef struct drm_mga_clear {
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..fe3e3a4 100644
+index 73ff51f..937a275 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
-@@ -33,6 +33,8 @@
- #ifndef __RADEON_DRM_H__
- #define __RADEON_DRM_H__
- 
-+#include <linux/types.h>
-+
- /* WARNING: If you change any of these defines, make sure to change the
-  * defines in the X server file (radeon_sarea.h)
-  */
-@@ -304,6 +306,8 @@ typedef union {
+@@ -304,6 +304,8 @@ typedef union {
  
  #define RADEON_SCRATCH_REG_OFFSET	32
  
@@ -36314,7 +31890,7 @@
  #define RADEON_NR_SAREA_CLIPRECTS	12
  
  /* There are 2 heaps (local/GART).  Each region within a heap is a
-@@ -526,7 +530,8 @@ typedef struct drm_radeon_init {
+@@ -526,7 +528,8 @@ typedef struct drm_radeon_init {
  		RADEON_INIT_CP = 0x01,
  		RADEON_CLEANUP_CP = 0x02,
  		RADEON_INIT_R200_CP = 0x03,
@@ -36324,117 +31900,3 @@
  	} func;
  	unsigned long sarea_priv_offset;
  	int is_pci;
-@@ -722,7 +727,7 @@ typedef struct drm_radeon_irq_wait {
- 
- typedef struct drm_radeon_setparam {
- 	unsigned int param;
--	int64_t value;
-+	__s64 value;
- } drm_radeon_setparam_t;
- 
- #define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
-diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
-index a3b5c10..170786e 100644
---- a/include/drm/via_drm.h
-+++ b/include/drm/via_drm.h
-@@ -24,6 +24,8 @@
- #ifndef _VIA_DRM_H_
- #define _VIA_DRM_H_
- 
-+#include <linux/types.h>
-+
- /* WARNING: These defines must be the same as what the Xserver uses.
-  * if you change them, you must change the defines in the Xserver.
-  */
-@@ -114,19 +116,19 @@
- #define VIA_MEM_UNKNOWN 4
- 
- typedef struct {
--	uint32_t offset;
--	uint32_t size;
-+	__u32 offset;
-+	__u32 size;
- } drm_via_agp_t;
- 
- typedef struct {
--	uint32_t offset;
--	uint32_t size;
-+	__u32 offset;
-+	__u32 size;
- } drm_via_fb_t;
- 
- typedef struct {
--	uint32_t context;
--	uint32_t type;
--	uint32_t size;
-+	__u32 context;
-+	__u32 type;
-+	__u32 size;
- 	unsigned long index;
- 	unsigned long offset;
- } drm_via_mem_t;
-@@ -148,9 +150,9 @@ typedef struct _drm_via_futex {
- 		VIA_FUTEX_WAIT = 0x00,
- 		VIA_FUTEX_WAKE = 0X01
- 	} func;
--	uint32_t ms;
--	uint32_t lock;
--	uint32_t val;
-+	__u32 ms;
-+	__u32 lock;
-+	__u32 val;
- } drm_via_futex_t;
- 
- typedef struct _drm_via_dma_init {
-@@ -211,7 +213,7 @@ typedef struct _drm_via_cmdbuf_size {
- 		VIA_CMDBUF_LAG = 0x02
- 	} func;
- 	int wait;
--	uint32_t size;
-+	__u32 size;
- } drm_via_cmdbuf_size_t;
- 
- typedef enum {
-@@ -236,8 +238,8 @@ enum drm_via_irqs {
- struct drm_via_wait_irq_request {
- 	unsigned irq;
- 	via_irq_seq_type_t type;
--	uint32_t sequence;
--	uint32_t signal;
-+	__u32 sequence;
-+	__u32 signal;
- };
- 
- typedef union drm_via_irqwait {
-@@ -246,7 +248,7 @@ typedef union drm_via_irqwait {
- } drm_via_irqwait_t;
- 
- typedef struct drm_via_blitsync {
--	uint32_t sync_handle;
-+	__u32 sync_handle;
- 	unsigned engine;
- } drm_via_blitsync_t;
- 
-@@ -257,16 +259,16 @@ typedef struct drm_via_blitsync {
-  */
- 
- typedef struct drm_via_dmablit {
--	uint32_t num_lines;
--	uint32_t line_length;
-+	__u32 num_lines;
-+	__u32 line_length;
- 
--	uint32_t fb_addr;
--	uint32_t fb_stride;
-+	__u32 fb_addr;
-+	__u32 fb_stride;
- 
- 	unsigned char *mem_addr;
--	uint32_t mem_stride;
-+	__u32 mem_stride;
- 
--	uint32_t flags;
-+	__u32 flags;
- 	int to_fb;
- 
- 	drm_via_blitsync_t sync;

drm-nouveau.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.8.6.9 -r 1.8.6.10 drm-nouveau.patch
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.9
retrieving revision 1.8.6.10
diff -u -r1.8.6.9 -r1.8.6.10
--- drm-nouveau.patch	14 Apr 2009 22:09:12 -0000	1.8.6.9
+++ drm-nouveau.patch	24 Apr 2009 22:27:08 -0000	1.8.6.10
@@ -103,7 +103,7 @@
  	if (mask & ~fence->type) {
  		DRM_ERROR("Wait trying to extend fence type"
 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index 4984aa8..dee9b40 100644
+index c1173d8..2e4e667 100644
 --- a/drivers/gpu/drm/drm_gem.c
 +++ b/drivers/gpu/drm/drm_gem.c
 @@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
@@ -236,7 +236,7 @@
  		drm_put_minor(&dev->control);
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..06483d0
+index 0000000..12af41b
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,24 @@
@@ -249,8 +249,8 @@
 +             nouveau_object.o nouveau_irq.o nouveau_notifier.o \
 +             nouveau_swmthd.o nouveau_sgdma.o nouveau_dma.o \
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o \
-+             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
-+	     nouveau_display.o nouveau_fbcon.o nouveau_backlight.o \
++             nouveau_bios.o nouveau_display.o nouveau_fbcon.o \
++	     nouveau_backlight.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -259,17 +259,17 @@
 +             nv40_graph.o nv50_graph.o \
 +             nv04_instmem.o nv50_instmem.o \
 +             nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
-+             nv50_cursor.o nv50_display.o nv50_fbcon.o
++             nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
-index 0000000..e3d354f
+index 0000000..3fc521e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -0,0 +1,152 @@
+@@ -0,0 +1,156 @@
 +/*
 + * Copyright (C) 2009 Red Hat <mjg at redhat.com>
 + *
@@ -312,6 +312,7 @@
 +static int nv40_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = (nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16;
 +
 +	return val;
@@ -320,6 +321,7 @@
 +static int nv40_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +	int reg = nv_rd32(NV40_PMC_BACKLIGHT);
 +
@@ -338,6 +340,7 @@
 +static int nv50_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +
 +	return nv_rd32(NV50_PDISPLAY_BACKLIGHT);
 +}
@@ -345,6 +348,7 @@
 +static int nv50_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +
 +	nv_wr32(NV50_PDISPLAY_BACKLIGHT, val | NV50_PDISPLAY_BACKLIGHT_ENABLE);
@@ -424,65 +428,45 @@
 +}	
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..fd3e08a
+index 0000000..bcbedb7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,4577 @@
+@@ -0,0 +1,854 @@
 +/*
-+ * Copyright 2005-2006 Erik Waling
-+ * Copyright 2006 Stephane Marchesin
-+ * Copyright 2007-2009 Stuart Bennett
++ * Copyright (C) 2005-2006 Erik Waling
++ * Copyright (C) 2006 Stephane Marchesin
++ * Copyright (C) 2007-2008 Stuart Bennett
++ * Copyright (C) 2008 Maarten Maathuis.
++ * All Rights Reserved.
 + *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
 + *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
++ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
 + */
 +
-+#include "drmP.h"
++#include <asm/byteorder.h>
++#include "nouveau_bios.h"
 +#include "nouveau_drv.h"
-+#include "nouveau_hw.h"
-+
-+/* these defines are made up */
-+#define NV_CIO_CRE_44_HEADA 0x0
-+#define NV_CIO_CRE_44_HEADB 0x3
-+#define FEATURE_MOBILE 0x10	/* also FEATURE_QUADRO for BMP */
-+#define LEGACY_I2C_CRT 0x80
-+
-+#define EDID1_LEN 128
-+
-+#define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip, fmt, ##arg)
-+#define LOG_OLD_VALUE(x) //x
-+
-+#define BIOS_USLEEP(n) msleep((n)/1000)
-+
-+#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))
-+#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))
 +
-+static int crtchead = 0;
-+
-+/* this will need remembering across a suspend */
-+static uint32_t saved_nv_pfb_cfg0;
-+
-+typedef struct {
-+	bool execute;
-+	bool repeat;
-+} init_exec_t;
-+
-+static bool nv_cksum(const uint8_t *data, unsigned int length)
++/* returns true if it mismatches */
++static bool nv_checksum(const uint8_t *data, unsigned int length)
 +{
 +	/* there's a few checksums in the BIOS, so here's a generic checking function */
 +	int i;
@@ -497,74 +481,51 @@
 +	return false;
 +}
 +
-+static int
-+score_vbios(struct drm_device *dev, const uint8_t *data, const bool writeable)
++static int nv_valid_bios(struct drm_device *dev, uint8_t *data)
 +{
++	/* check for BIOS signature */
 +	if (!(data[0] == 0x55 && data[1] == 0xAA)) {
-+		NV_TRACEWARN(dev, "... BIOS signature not found\n");
++		DRM_ERROR("BIOS signature not found.\n");
 +		return 0;
 +	}
 +
[...20829 lines suppressed...]
-+#define NV_PRAMDAC_NVPLL_COEFF				0x00680500
-+#define NV_PRAMDAC_MPLL_COEFF				0x00680504
-+#define NV_PRAMDAC_VPLL_COEFF				0x00680508
-+#	define NV30_RAMDAC_ENABLE_VCO2				(8 << 4)
-+
-+#define NV_PRAMDAC_PLL_COEFF_SELECT			0x0068050c
-+#	define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE		(4 << 0)
-+#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_MPLL	(1 << 8)
-+#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_VPLL	(2 << 8)
-+#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_NVPLL	(4 << 8)
-+#	define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2		(8 << 8)
-+#	define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB2	(1 << 28)
-+#	define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2		(2 << 28)
-+
-+#define NV_PRAMDAC_PLL_SETUP_CONTROL			0x00680510
-+#define NV_RAMDAC_VPLL2					0x00680520
-+#define NV_PRAMDAC_SEL_CLK				0x00680524
-+#define NV_RAMDAC_DITHER_NV11				0x00680528
-+#define NV_PRAMDAC_DACCLK				0x0068052c
-+#	define NV_PRAMDAC_DACCLK_SEL_DACCLK			(1 << 0)
-+
-+#define NV_RAMDAC_NVPLL_B				0x00680570
-+#define NV_RAMDAC_MPLL_B				0x00680574
-+#define NV_RAMDAC_VPLL_B				0x00680578
-+#define NV_RAMDAC_VPLL2_B				0x0068057c
-+#	define NV31_RAMDAC_ENABLE_VCO2				(8 << 28)
-+#define NV_PRAMDAC_580					0x00680580
-+#	define NV_RAMDAC_580_VPLL1_ACTIVE			(1 << 8)
-+#	define NV_RAMDAC_580_VPLL2_ACTIVE			(1 << 28)
-+
-+#define NV_PRAMDAC_GENERAL_CONTROL			0x00680600
-+#define NV_PRAMDAC_TEST_CONTROL				0x00680608
-+#	define NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED	(1 << 12)
-+#	define NV_PRAMDAC_TEST_CONTROL_PWRDWN_DAC_OFF		(1 << 16)
-+#	define NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI		(1 << 28)
-+#define NV_PRAMDAC_TESTPOINT_DATA			0x00680610
-+#	define NV_PRAMDAC_TESTPOINT_DATA_NOTBLANK		(8 << 28)
-+#define NV_PRAMDAC_630					0x00680630
-+#define NV_PRAMDAC_634					0x00680634
-+
-+#define NV_PRAMDAC_FP_VDISPLAY_END			0x00680800
-+#define NV_PRAMDAC_FP_VTOTAL				0x00680804
-+#define NV_PRAMDAC_FP_VCRTC				0x00680808
-+#define NV_PRAMDAC_FP_VSYNC_START			0x0068080c
-+#define NV_PRAMDAC_FP_VSYNC_END				0x00680810
-+#define NV_PRAMDAC_FP_VVALID_START			0x00680814
-+#define NV_PRAMDAC_FP_VVALID_END			0x00680818
-+#define NV_PRAMDAC_FP_HDISPLAY_END			0x00680820
-+#define NV_PRAMDAC_FP_HTOTAL				0x00680824
-+#define NV_PRAMDAC_FP_HCRTC				0x00680828
-+#define NV_PRAMDAC_FP_HSYNC_START			0x0068082c
-+#define NV_PRAMDAC_FP_HSYNC_END				0x00680830
-+#define NV_PRAMDAC_FP_HVALID_START			0x00680834
-+#define NV_PRAMDAC_FP_HVALID_END			0x00680838
-+
-+#define NV_RAMDAC_FP_DITHER				0x0068083c
-+#define NV_PRAMDAC_FP_TG_CONTROL			0x00680848
-+#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS		(1 << 0)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_DISABLE		(2 << 0)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS		(1 << 4)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_DISABLE		(2 << 4)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_SCALE		(0 << 8)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_CENTER		(1 << 8)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_NATIVE		(2 << 8)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_READ_PROG		(1 << 20)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12		(1 << 24)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS		(1 << 28)
-+#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE		(2 << 28)
-+#define NV_PRAMDAC_850					0x00680850
-+#define NV_PRAMDAC_85C					0x0068085c
-+#define NV_PRAMDAC_FP_DEBUG_0				0x00680880
-+#	define NV_PRAMDAC_FP_DEBUG_0_XSCALE_ENABLE		(1 << 0)
-+#	define NV_PRAMDAC_FP_DEBUG_0_YSCALE_ENABLE		(1 << 4)
-+/* This doesn't seem to be essential for tmds, but still often set */
-+#	define NV_RAMDAC_FP_DEBUG_0_TMDS_ENABLED		(8 << 4)
-+#	define NV_PRAMDAC_FP_DEBUG_0_XINTERP_BILINEAR		(1 << 8)
-+#	define NV_PRAMDAC_FP_DEBUG_0_YINTERP_BILINEAR		(1 << 12)
-+#	define NV_PRAMDAC_FP_DEBUG_0_XWEIGHT_ROUND		(1 << 20)
-+#	define NV_PRAMDAC_FP_DEBUG_0_YWEIGHT_ROUND		(1 << 24)
-+#define NV_PRAMDAC_FP_DEBUG_1				0x00680884
-+#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_VALUE		11:0
-+#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_TESTMODE_ENABLE	(1 << 12)
-+#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_VALUE		27:16
-+#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_TESTMODE_ENABLE	(1 << 28)
-+#define NV_PRAMDAC_FP_DEBUG_2				0x00680888
-+#define NV_PRAMDAC_FP_DEBUG_3				0x0068088C
-+
-+/* Some unknown regs, purely for NV30 it seems. */
-+#define NV_PRAMDAC_890					0x00680890
-+#define NV_PRAMDAC_89C					0x0068089C
-+
-+/* see NV_PRAMDAC_INDIR_TMDS in rules.xml */
-+#define NV_PRAMDAC_FP_TMDS_CONTROL			0x006808b0
-+#	define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE		(1 << 16)
-+#define NV_PRAMDAC_FP_TMDS_DATA				0x006808b4
-+
-+/* Some kind of switch */
-+#define NV_PRAMDAC_900					0x00680900
-+#define NV_PRAMDAC_A20					0x00680A20
-+#define NV_PRAMDAC_A24					0x00680A24
-+#define NV_PRAMDAC_A34					0x00680A34
-+
-+/* names fabricated from NV_USER_DAC info */
-+#define NV_PRMDIO_PIXEL_MASK		0x006813c6
-+#	define NV_PRMDIO_PIXEL_MASK_MASK	0xff
-+#define NV_PRMDIO_READ_MODE_ADDRESS	0x006813c7
-+#define NV_PRMDIO_WRITE_MODE_ADDRESS	0x006813c8
-+#define NV_PRMDIO_PALETTE_DATA		0x006813c9
-+
-+#define NV_PGRAPH_DEBUG_0		0x00400080
-+#define NV_PGRAPH_DEBUG_1		0x00400084
-+#define NV_PGRAPH_DEBUG_2_NV04		0x00400088
-+#define NV_PGRAPH_DEBUG_2		0x00400620
-+#define NV_PGRAPH_DEBUG_3		0x0040008c
-+#define NV_PGRAPH_DEBUG_4		0x00400090
-+#define NV_PGRAPH_INTR			0x00400100
-+#define NV_PGRAPH_INTR_EN		0x00400140
-+#define NV_PGRAPH_CTX_CONTROL		0x00400144
-+#define NV_PGRAPH_CTX_CONTROL_NV04	0x00400170
-+#define NV_PGRAPH_ABS_UCLIP_XMIN	0x0040053C
-+#define NV_PGRAPH_ABS_UCLIP_YMIN	0x00400540
-+#define NV_PGRAPH_ABS_UCLIP_XMAX	0x00400544
-+#define NV_PGRAPH_ABS_UCLIP_YMAX	0x00400548
-+#define NV_PGRAPH_BETA_AND		0x00400608
-+#define NV_PGRAPH_LIMIT_VIOL_PIX	0x00400610
-+#define NV_PGRAPH_BOFFSET0		0x00400640
-+#define NV_PGRAPH_BOFFSET1		0x00400644
-+#define NV_PGRAPH_BOFFSET2		0x00400648
-+#define NV_PGRAPH_BLIMIT0		0x00400684
-+#define NV_PGRAPH_BLIMIT1		0x00400688
-+#define NV_PGRAPH_BLIMIT2		0x0040068c
-+#define NV_PGRAPH_STATUS		0x00400700
-+#define NV_PGRAPH_SURFACE		0x00400710
-+#define NV_PGRAPH_STATE			0x00400714
-+#define NV_PGRAPH_FIFO			0x00400720
-+#define NV_PGRAPH_PATTERN_SHAPE		0x00400810
-+#define NV_PGRAPH_TILE			0x00400b00
-+
-+#define NV_PVIDEO_INTR_EN		0x00008140
-+#define NV_PVIDEO_BUFFER		0x00008700
-+#define NV_PVIDEO_STOP			0x00008704
-+#define NV_PVIDEO_UVPLANE_BASE(buff)	(0x00008800+(buff)*4)
-+#define NV_PVIDEO_UVPLANE_LIMIT(buff)	(0x00008808+(buff)*4)
-+#define NV_PVIDEO_UVPLANE_OFFSET_BUFF(buff)	(0x00008820+(buff)*4)
-+#define NV_PVIDEO_BASE(buff)		(0x00008900+(buff)*4)
-+#define NV_PVIDEO_LIMIT(buff)		(0x00008908+(buff)*4)
-+#define NV_PVIDEO_LUMINANCE(buff)	(0x00008910+(buff)*4)
-+#define NV_PVIDEO_CHROMINANCE(buff)	(0x00008918+(buff)*4)
-+#define NV_PVIDEO_OFFSET_BUFF(buff)	(0x00008920+(buff)*4)
-+#define NV_PVIDEO_SIZE_IN(buff)		(0x00008928+(buff)*4)
-+#define NV_PVIDEO_POINT_IN(buff)	(0x00008930+(buff)*4)
-+#define NV_PVIDEO_DS_DX(buff)		(0x00008938+(buff)*4)
-+#define NV_PVIDEO_DT_DY(buff)		(0x00008940+(buff)*4)
-+#define NV_PVIDEO_POINT_OUT(buff)	(0x00008948+(buff)*4)
-+#define NV_PVIDEO_SIZE_OUT(buff)	(0x00008950+(buff)*4)
-+#define NV_PVIDEO_FORMAT(buff)		(0x00008958+(buff)*4)
-+#	define NV_PVIDEO_FORMAT_PLANAR			(1 << 0)
-+#	define NV_PVIDEO_FORMAT_COLOR_LE_CR8YB8CB8YA8	(1 << 16)
-+#	define NV_PVIDEO_FORMAT_DISPLAY_COLOR_KEY	(1 << 20)
-+#	define NV_PVIDEO_FORMAT_MATRIX_ITURBT709	(1 << 24)
-+#define NV_PVIDEO_COLOR_KEY		0x00008B00
-+
-+/* NV04 overlay defines from VIDIX & Haiku */
-+#define NV_PVIDEO_INTR_EN_0		0x00680140
-+#define NV_PVIDEO_STEP_SIZE		0x00680200
-+#define NV_PVIDEO_CONTROL_Y		0x00680204
-+#define NV_PVIDEO_CONTROL_X		0x00680208
-+#define NV_PVIDEO_BUFF0_START_ADDRESS	0x0068020c
-+#define NV_PVIDEO_BUFF0_PITCH_LENGTH	0x00680214
-+#define NV_PVIDEO_BUFF0_OFFSET		0x0068021c
-+#define NV_PVIDEO_BUFF1_START_ADDRESS	0x00680210
-+#define NV_PVIDEO_BUFF1_PITCH_LENGTH	0x00680218
-+#define NV_PVIDEO_BUFF1_OFFSET		0x00680220
-+#define NV_PVIDEO_OE_STATE		0x00680224
-+#define NV_PVIDEO_SU_STATE		0x00680228
-+#define NV_PVIDEO_RM_STATE		0x0068022c
-+#define NV_PVIDEO_WINDOW_START		0x00680230
-+#define NV_PVIDEO_WINDOW_SIZE		0x00680234
-+#define NV_PVIDEO_FIFO_THRES_SIZE	0x00680238
-+#define NV_PVIDEO_FIFO_BURST_LENGTH	0x0068023c
-+#define NV_PVIDEO_KEY			0x00680240
-+#define NV_PVIDEO_OVERLAY		0x00680244
-+#define NV_PVIDEO_RED_CSC_OFFSET	0x00680280
-+#define NV_PVIDEO_GREEN_CSC_OFFSET	0x00680284
-+#define NV_PVIDEO_BLUE_CSC_OFFSET	0x00680288
-+#define NV_PVIDEO_CSC_ADJUST		0x0068028c
-+
-+#endif
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
 index b940fdf..cfa6af4 100644
 --- a/include/drm/Kbuild
@@ -49125,7 +42929,7 @@
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 04fbd1e..f2a6bff 100644
+index b61b0c6..5b7ce2d 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.20
retrieving revision 1.1294.2.21
diff -u -r1.1294.2.20 -r1.1294.2.21
--- kernel.spec	14 Apr 2009 22:49:22 -0000	1.1294.2.20
+++ kernel.spec	24 Apr 2009 22:27:09 -0000	1.1294.2.21
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 1
+%define released_kernel 0
 
 # Versions of various parts
 
@@ -38,7 +38,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 0
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -57,7 +57,7 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 3
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -121,7 +121,7 @@
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -410,9 +410,6 @@
 #
 %define kernel_xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
 
-# upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise
-# now that the smp kernel offers this capability, obsolete the old kernel
-%define kernel_smp_obsoletes kernel-enterprise < 2.4.10
 %define kernel_PAE_obsoletes kernel-smp < 2.6.17, kernel-xen <= 2.6.27-0.2.rc0.git6.fc10
 %define kernel_PAE_provides kernel-xen = %{rpmversion}-%{pkg_release}
 
@@ -593,17 +590,10 @@
 
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
-Patch23: linux-2.6-utrace-ftrace.patch
-
-# Support suspend/resume, other crash fixes
-Patch30: linux-2.6-iommu-fixes.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
-Patch100: linux-2.6-e820-mark-esi-clobbered.patch
-Patch101: linux-2.6-e820-save-restore-edi-ebp.patch
-Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
-Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch
+Patch50: rds-only-on-64-bit-or-x86.patch
 
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
@@ -622,19 +612,10 @@
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
-Patch383: linux-2.6-pci-sysfs-remove-id.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch392: linux-2.6-acpi-strict-resources.patch
-Patch393: linux-2.6-hwmon-atk0110.patch
-Patch394: linux-2.6-acpi-video-didl-intel-outputs.patch
-Patch395: linux-2.6-sony-laptop-rfkill.patch
-Patch396: linux-2.6-acer-wmi-bail-on-aao.patch
-Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
-Patch452: linux-2.6-input-hid-extra-gamepad.patch
-Patch453: linux-2.6-input-wacom-bluetooth.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -642,32 +623,17 @@
 Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
 
 Patch510: linux-2.6-silence-noise.patch
-Patch511: linux-2.6-shut-up-efifb.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-Patch590: linux-2.6.29.1-sparc-regression.patch
+
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch601: alsa-rewrite-hw_ptr-updaters.patch
-Patch602: alsa-pcm-always-reset-invalid-position.patch
-Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
-Patch604: alsa-pcm-safer-boundary-checks.patch
-Patch605: alsa-hda-dont-reset-BDL-unnecessarily.patch
-Patch606: alsa-dont-reset-stream-at-each-prepare-callb.patch
-Patch607: alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
-Patch608: alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
-Patch611: linux-2.6.29-alsa-update-quirks.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
-Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-
-Patch700: linux-2.6-dma-debug-fixes.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -686,8 +652,6 @@
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
-Patch1821: drm-intel-lying-systems-without-lvds.patch
-Patch1822: drm-intel-gen3-fb-hack.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -703,51 +667,13 @@
 Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
-Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
-Patch2920: linux-2.6-ext4-flush-on-close.patch
-Patch2921: linux-2.6-ext4-really-print-warning-once.patch
-
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
-Patch3001: linux-2.6-btrfs-fix-umount-hang.patch
-Patch3010: linux-2.6-relatime-by-default.patch
-Patch3020: linux-2.6-fiemap-header-install.patch
-
-Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
-
-Patch5000: linux-2.6-add-qcserial.patch
-
-# patches headed for -stable
-# fix oops in md raid1 (#495550)
-Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-# fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
-Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
-# fix duplicated flags value
-Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
-# fix posix clock monotonicity
-Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
-# make RLIMIT_CPU work again
-Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
-Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
-
-Patch9001: revert-fix-modules_install-via-nfs.patch
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
-#Adding dropwatch into rawhide until we get to 2.6.30
-Patch9003: linux-2.6-dropwatch-protocol.patch
-
-# fix for net lockups, will be in 2.6.29.1
-Patch9101: linux-2.6-net-fix-another-gro-bug.patch
-
-# kvm fixes
-Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
-Patch9301: linux-2.6-kvm-mask-notifiers.patch
-Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
-
 Patch9997: xen.pvops.pre.patch
 Patch9998: xen.pvops.patch
 Patch9999: xen.pvops.post.patch
@@ -945,14 +871,12 @@
 %endif
 
 # more sanity checking; do it quietly
-if [ "%{patches}" != "%%{patches}" ] ; then
-  for patch in %{patches} ; do
-    if [ ! -f $patch ] ; then
-      echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
-      exit 1
-    fi
-  done
-fi 2>/dev/null
+for patch in %{patches} ; do
+  if [ ! -f $patch ] ; then
+    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+    exit 1
+  fi
+done 2>/dev/null
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -975,6 +899,20 @@
   esac
 }
 
+# don't apply patch if it's empty
+ApplyOptionalPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1
+  fi
+  local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
+  if [ "$C" -gt 9 ]; then
+    ApplyPatch $patch ${1+"$@"}
+  fi
+}
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1114,7 +1052,7 @@
   done
 %endif
 
-#ApplyPatch git-linus.diff
+#ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1126,41 +1064,29 @@
 #
 # misc small stuff to make things compile
 #
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-compile-fixes.patch
-fi
+ApplyOptionalPatch linux-2.6-compile-fixes.patch
 
 %if !%{nopatches}
 
 # revert patches from upstream that conflict or that we get via other means
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-upstream-reverts.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-upstream-reverts.patch -R
-fi
+ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
 #ApplyPatch git-cpufreq.patch
-ApplyPatch git-bluetooth.patch
+#ApplyPatch git-bluetooth.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
-#ApplyPatch linux-2.6-utrace-ftrace.patch
-
-# IOMMU fixes backported to 2.6.29
-ApplyPatch linux-2.6-iommu-fixes.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
+ApplyPatch rds-only-on-64-bit-or-x86.patch
+
 # Architecture patches
 # x86(-64)
-ApplyPatch linux-2.6-e820-mark-esi-clobbered.patch
-ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch
-ApplyPatch linux-2.6-e820-acpi3-bios-workaround.patch
-ApplyPatch linux-2.6-e820-guard-against-pre-acpi3.patch
 
 #
 # PowerPC
@@ -1180,51 +1106,34 @@
 #
 # SPARC64
 #
-
 ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-ApplyPatch linux-2.6.29.1-sparc-regression.patch
+
 #
 # Exec shield
 #
-#ApplyPatch linux-2.6-execshield.patch
+ApplyPatch linux-2.6-execshield.patch
 
 #
 # bugfixes to drivers and filesystems
 #
 
 # ext4
-ApplyPatch linux-2.6-ext4-flush-on-close.patch
-ApplyPatch linux-2.6-ext4-really-print-warning-once.patch
 
 # xfs
 
 # btrfs
-ApplyPatch linux-2.6-btrfs-experimental-branch.patch
-ApplyPatch linux-2.6-btrfs-fix-umount-hang.patch
-
-# relatime
-ApplyPatch linux-2.6-relatime-by-default.patch
-
-# put fiemap.h into kernel-headers
-ApplyPatch linux-2.6-fiemap-header-install.patch
+#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
 
 # USB
-ApplyPatch linux-2.6-add-qcserial.patch
-ApplyPatch linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acpi-strict-resources.patch
-ApplyPatch linux-2.6-hwmon-atk0110.patch
-ApplyPatch linux-2.6-acpi-video-didl-intel-outputs.patch
-ApplyPatch linux-2.6-sony-laptop-rfkill.patch
-ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
-ApplyPatch linux-2.6-debug-nmi-timeout.patch
-ApplyPatch linux-2.6-debug-taint-vm.patch
+#ApplyPatch linux-2.6-debug-nmi-timeout.patch
+#ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-spinlock-taint.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
@@ -1238,29 +1147,14 @@
 #ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
 #ApplyPatch linux-2.6-defaults-pciehp.patch
-# Add /sys/bus/pci/devices/*/remove_id
-ApplyPatch linux-2.6-pci-sysfs-remove-id.patch
 
 #
 # SCSI Bits.
 #
-# fix cpqarray pci enable
-ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 
 # ALSA
 # squelch hda_beep by default
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-ApplyPatch linux-2.6.29-alsa-update-quirks.patch
-
-# fix alsa for pulseaudio
-ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
-ApplyPatch alsa-pcm-always-reset-invalid-position.patch
-ApplyPatch alsa-pcm-fix-delta-calc-at-overlap.patch
-ApplyPatch alsa-pcm-safer-boundary-checks.patch
-ApplyPatch alsa-hda-dont-reset-BDL-unnecessarily.patch
-ApplyPatch alsa-dont-reset-stream-at-each-prepare-callb.patch
-ApplyPatch alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
-ApplyPatch alsa-pcm-midlevel-add-more-strict-buffer-position.patch
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
@@ -1272,12 +1166,6 @@
 # Get away from having to poll Toshibas
 ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
-# HID: add support for another version of 0e8f:0003 device in hid-pl
-ApplyPatch linux-2.6-input-hid-extra-gamepad.patch
-
-# HID: add support for Bluetooth Wacom pads
-ApplyPatch linux-2.6-input-wacom-bluetooth.patch
-
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
@@ -1286,16 +1174,13 @@
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
-# Avoid efifb spew
-ApplyPatch linux-2.6-shut-up-efifb.patch
-
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
 # Fix the SELinux mprotect checks on executable mappings
-ApplyPatch linux-2.6-selinux-mprotect-checks.patch
+#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
-ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
+#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
 
 # Changes to upstream defaults.
 
@@ -1304,18 +1189,10 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # rt2x00: back-port activity LED init patches
-ApplyPatch linux-2.6-rt2x00-asus-leds.patch
+#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
 # back-port scan result aging patches
-ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-
-# back-port iwlwifi rfkill while device down patches
-ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
-ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-
-# Fix up DMA debug code
-ApplyPatch linux-2.6-dma-debug-fixes.patch
+#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -1331,56 +1208,29 @@
 
 ApplyPatch agp-set_memory_ucwb.patch
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
-ApplyPatch drm-modesetting-radeon.patch
-ApplyPatch drm-nouveau.patch
+#ApplyPatch drm-next.patch
+#ApplyPatch drm-modesetting-radeon.patch
+#ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-intel-lying-systems-without-lvds.patch
-ApplyPatch drm-intel-gen3-fb-hack.patch
 
 # linux1394 git patches
-ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-#if [ "$C" -gt 10 ]; then
-#ApplyPatch linux-2.6-firewire-git-pending.patch
-#fi
+#ApplyPatch linux-2.6-firewire-git-update.patch
+#ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
 
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
 # V4L/DVB updates/fixes/experimental drivers
-ApplyPatch linux-2.6-v4l-dvb-fixes.patch
-ApplyPatch linux-2.6-v4l-dvb-update.patch
-ApplyPatch linux-2.6-v4l-dvb-experimental.patch
-ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
-ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
-
-# patches headed for -stable
-ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
-ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
-ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
-#ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
-
-# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
-ApplyPatch revert-fix-modules_install-via-nfs.patch
-
-ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
-
-#ApplyPatch linux-2.6-dropwatch-protocol.patch
-
-ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
-
-# kvm fixes
-ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
-ApplyPatch linux-2.6-kvm-mask-notifiers.patch
-ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+#ApplyPatch linux-2.6-v4l-dvb-fixes.patch
+#ApplyPatch linux-2.6-v4l-dvb-update.patch
+#ApplyPatch linux-2.6-v4l-dvb-experimental.patch
+#ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+
+#ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
@@ -1639,7 +1489,7 @@
     rm -f modinfo modnames
 
     # remove files that will be auto generated by depmod at rpm -i time
-    for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
+    for i in alias alias.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap
     do
       rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
     done
@@ -1969,177 +1819,172 @@
 # plz don't put in a version string unless you're going to tag
 # and build.
 
+#	 _______________________________
+#	< STOP! THIS BRANCH IS FOR F12! >
+#	 -------------------------------
+#	        \   ^__^
+#	         \  (oo)\_______
+#	            (__)\       )\/\
+#	                ||----w |
+#	                ||     ||
 %changelog
-* Tue Apr 14 2009 Michael Young <m.a.young at durham.ac.uk>
-- follow the 2.6.29.1 stable branch for the moment
-- reset a few config settings to Fedora defaults
-- drop the squashfs 3 patches as we can't build both
-- docs won't build, so don't build them
-
-* Tue Apr 14 2009 Marcelo Tosatti <mtosatti at redhat.com>
-- kvm fixes for bz#491625
-
-* Tue Apr 14 2009 Jarod Wilson <jarod at redhat.com>
-- Make squashfs behave on systems where pagesize > blocksize (Doug Chapman)
-
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
-- Add missing patch for broken RLIMIT_CPU
-
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
-- Fix warnings/errors in USB cdc-acm modem driver (#495446)
-
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
-- Timer fixes headed for -stable
-
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
-- Fix duplicated flag value in pagemap.h (-stable patch)
-
-* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
-- acer-wmi: use upstream code to blacklist an additional model
-- Trivial fix to drm-modesetting-radeon to fix failure to apply
-
-* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-73
-- drm-modesetting-radeon.patch: more bug fixes
-
-* Mon Apr 13 2009 Chuck Ebbert <cebbert at redhat.com>
-- Fix oops in md raid1 resync (#495550)
-
-* Mon Apr 13 2009 Eric Sandeen <sandeen at redhat.com>
-- Turn of CONFIG_SND_HDA_POWER_SAVE_DEFAULT again (#493972)
-
-* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-70
-- merge alsa fixes from wwoods:
-  alsa-hda-dont-reset-BDL-unnecessarily.patch
-  alsa-dont-reset-stream-at-each-prepare-callb.patch
-  alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
-  alsa-pcm-midlevel-add-more-strict-buffer-position.patch
-    bbf6ad13, fa00e046 from alsa-kernel/master (and deps)
-
-* Mon Apr 13 2009 John W. Linville <linville at redhat.com>
-- Remove back-port iwlwifi rfkill while device down patches (#495003)
-
-* Fri Apr 10 2009 David Woodhouse <David.Woodhouse at intel.com>
-- Fix suspend/resume with Intel IOMMU, handle devices behind PCI-PCI
-  bridges, cope with BIOS claiming IOMMU is at address zero.
-
-* Thu Apr 09 2009 Chuck Ebbert <cebbert at redhat.com>
-- Only print ext4 allocator fallback warning once.
-
-* Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> 2.6.29.1-59
-- add patch to fix regression on sparc
-
-* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com>
-- drm-intel-gen3-fb-hack.patch: Allow up to 4k framebuffers on 9[14]5.  3D
-  will be broken if you do that, but at least dualhead will be less broken.
+* Fri Apr 24 2009 Michael Young <m.a.young at durham.ac.uk>
+- switch back to devel kernel branch
+- switch pvops to xen-tip/next branch
+- remove added config options now in main fedora configuration
+- add in new config options required by new pvops patch
+- relocate the below comment stranded by the devel switch
+-* Tue Apr 14 2009 Michael Young <m.a.young at durham.ac.uk>
+-- follow the 2.6.29.1 stable branch for the moment
+-- reset a few config settings to Fedora defaults
+-- drop the squashfs 3 patches as we can't build both
+-- docs won't build, so don't build them
+
+* Wed Apr 22 2009 Dave Jones <davej at redhat.com> 2.6.30-0.67.rc3
+- Disable SYSFS_DEPRECATED on ia64
+
+* Wed Apr 22 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.30-rc3
+- PROC_VMCORE=y: Exports the dump image of crashed
+  kernel in ELF format
+
+* Wed Apr 22 2009 Neil Horman <nhorman at redhat.com>
+- Enable RELOCATABLE and CRASH_DUMP for powerpc64
+- With this we can remove the -kdump build variant
+- for the ppc64 arch
+
+* Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com>
+- Don't include the modules.*.bin files in the RPM package.
+
+* Tue Apr 21 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git7
+
+* Mon Apr 20 2009 Dave Jones <davej at redhat.com>
+- Various s390x config tweaks. (#496596, #496601, #496605, #496607)
+
+* Mon Apr 20 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git6
+
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
+- Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
+
+* Fri Apr 17 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git3
+
+* Thu Apr 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.58.rc2.git1
+- 2.6.30-rc2-git1
+
+* Wed Apr 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.57.rc2
+- 2.6.30-rc2
+
+* Tue Apr 14 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc1-git7
+- CONFIG_TOUCHSCREEN_AD7879_I2C=m
+- CONFIG_STRIP_ASM_SYMS=y, off for -debug
+
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
+- ppc-fix-parport_pc.patch: add from linuxppc-dev@
+
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
+- execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)
+
+* Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc1-git5
+- revert-fix-modules_install-via-nfs.patch: reverted upstream
+
+* Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
+- actually drop utrace-ftrace from srpm.
+
+* Thu Apr 09 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc1-git2
+- CONFIG_IGBVF=m
+- CONFIG_NETFILTER_XT_TARGET_LED=m
 
 * Thu Apr 09 2009 Dave Jones <davej at redhat.com>
 - Bring back the /dev/crash driver. (#492803)
 
-* Thu Apr 09 2009 Dave Airlie <airlied at redhat.com>
-- radeon: fix some kms bugs, dac detect + screen resize
-
-* Wed Apr 08 2009 Adam Jackson <ajax at redhat.com>
-- Drop the PAT patch, sufficiently upstreamed now.
-
-* Wed Apr 08 2009 Dave Jones <davej at redhat.com> 2.6.29.1-58
+* Wed Apr 08 2009 Dave Jones <davej at redhat.com>
 - disable MMIOTRACE in non-debug builds (#494584)
 
-* Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com>
-- drm-nouveau.patch: nv50 kms fixes (PROM access, i2c, clean some warnings)
+* Wed Apr 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.44.rc1
+- 2.6.30-rc1
+- linux-2.6-hwmon-atk0110.patch: drop
+- CONFIG_DETECT_HUNG_TASK=y
+- # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+
+* Tue Apr  7 2009 Roland McGrath <roland at redhat.com>
+- utrace update, drop unfinished utrace-ftrace
 
 * Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
-- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
+- Linux 2.6.29-git15
+- EXT3_DEFAULTS_TO_ORDERED on for now.
+- X86_X2APIC enabled.
+- LEDS_LP5521, LEDS_BD2802 off... look not generally relevant.
+- LIBFCOE on.
 
 * Tue Apr 07 2009 Dave Jones <davej at redhat.com>
 - Enable CONFIG_CIFS_STATS (#494545)
 
-* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com>
-- drm-modesetting-radeon: repair vt switch
+* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-execshield.patch: rebase for 2.6.30
 
-* Mon Apr 06 2009 Ben Skeggs <bskeggs at redhat.com>
-- drm-nouveau.patch: rebase on drm-f11
-
-* Mon Apr 06 2009 Dave Airlie <airlied at redhat.com>
-- radeon: bust APIs and move to what we want in the end.
-
-* Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
-- drm-nouveau.patch: big update.  mostly cleanups, few functional changes
-    Big code cleanup (the scary looking, but hopefully harmless part)
-    Now using "full-featured" VBIOS parser from DDX
-    Remove custom i2c code in favour of i2c_algo_bit
-    Refuse to suspend, we can't possibly resume just yet
-    Fix ramht insertions when a collision happens (rh#492427)
-    No kms warning on pre-nv50 when kms not acutally enabled (rh#493222)
-
-* Sat Apr 04 2009 Matthew Garrett <mjg at redhat.com>
-- linux-2.6-add-qcserial.patch: Add the qcserial driver for Qualcomm modems
-
-* Fri Apr 03 2009 Jarod Wilson <jarod at redhat.com>
-- Don't set up non-existent LVDS on systems with mobile Intel graphics chips
-  that lie about having LVDS (like my Dell Studio Hybrid). Makes plymouth
-  graphical boot function properly.
-- Don't let acer-wmi do stupid things on unsupported systems (like, create
-  a bogus rfkill entry in sysfs that effectively neuters wireless in
-  NetworkManager on the Aspire One)
-
-* Fri Apr 03 2009 Chuck Ebbert <cebbert at redhat.com>
-- x86 E820 fixes from 2.6.30
-
-* Fri Apr 03 2009 Dave Jones <davej at redhat.com>
-- x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
-
-* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-46
-- Enable debug builds and turn of debugging in the regular kernel.
-- Remove dma-debug patches.
-- Leave CONFIG_PCI_MSI_DEFAULT_ON set.
-
-* Thu Apr 02 2009 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.29.1
-- Removed upstream commit d64260d58865004c6354e024da3450fdd607ea07
-  from v4l-dvb-fixes: merged in 2.6.29.1
-
-* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
-- iwl3945: rely on priv->lock to protect priv access
-
-* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
-- back-port iwlwifi rfkill while device down patches
+* Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git13
+- drop patches merged upstream:
+  - fix-ppc-debug_kmap_atomic.patch
+  - fix-staging-at76.patch
+  - linux-2.6-acpi-video-didl-intel-outputs.patch
+  - linux-2.6-acpi-strict-resources.patch
+  - linux-2.6-sony-laptop-rfkill.patch
+  - linux-2.6-btrfs-fix-umount-hang.patch
+  - linux-2.6-fiemap-header-install.patch
+  - linux-2.6-debug-dma-api.patch
+  - dma-api-debug-fixes.patch
+  - linux-2.6-ext4-flush-on-close.patch
+  - linux-2.6-relatime-by-default.patch
+  - linux-2.6-pci-sysfs-remove-id.patch
+  - linux-2.6-scsi-cpqarray-set-master.patch
+  - alsa-rewrite-hw_ptr-updaters.patch
+  - alsa-pcm-always-reset-invalid-position.patch
+  - alsa-pcm-fix-delta-calc-at-overlap.patch
+  - alsa-pcm-safer-boundary-checks.patch
+  - linux-2.6-input-hid-extra-gamepad.patch
+  - linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+  - linux-2.6-dropwatch-protocol.patch
+  - linux-2.6-net-fix-gro-bug.patch
+  - linux-2.6-net-fix-another-gro-bug.patch
+  - linux-2.6-net-xfrm-fix-spin-unlock.patch
+  - linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
+  - linux-2.6.29-pat-pci-change-prot-for-inherit.patch
 
 * Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>
-- linux-2.6-btrfs-fix-umount-hang.patch: fix hang on umount
+- linux-2.6-btrfs-fix-umount-hang.patch: fix umount hang on btrfs
 
-* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
-- linux-2.6-shut-up-efifb.patch: avoid efifb errors on unsupported hardware
+* Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
+- fix-ppc-debug_kmap_atomic.patch: fix build failures on ppc.
 
-* Wed Apr 01 2009 Matthew Garrett <mjg at redhat.com>
-- linux-2.6-acpi-video-didl-intel-outputs.patch: fix enabling of asle
+* Thu Apr 02 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git9
 
-* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
-- drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards
+* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
+- rds-only-on-64-bit-or-x86.patch: add
+- at76-netdev_ops.patch: add
 
-* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-35.rc1
-- linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support
-
-* Tue Mar 31 2009 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.29.1-rc1
-- Dropped patches, merged upstream:
-    linux-2.6-net-fix-gro-bug.patch
-    linux-2.6-net-xfrm-fix-spin-unlock.patch
-    linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
-    linux-2.6.29-pat-pci-change-prot-for-inherit.patch
+* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git8
+- linux-2.6-net-fix-another-gro-bug.patch: upstream.
 
 * Tue Mar 31 2009 Eric Sandeen <sandeen at redhat.com>
 - add fiemap.h to kernel-headers
 - build ext4 (and jbd2 and crc16) into the kernel
 
-* Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com>
-- update the sony laptop code
-
-* Tue Mar 31 2009 Ben Skeggs <bskeggs at redhat.com>
-- drm-nouveau.patch: support version 3.0 pll limits table
-  may help with rh#492575
-
-* Mon Mar 30 2009 Matthew Garrett <mjg at redhat.com>
-- linux-2.6-input-wacom-bluetooth.patch: Add support for Bluetooth wacom pads
+* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git7
+- fix-staging-at76.patch: pull patch from linux-wireless to fix...
+
+* Mon Mar 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.28.rc0.git6
+- Linux 2.6.29-git6
+- Bunch of stuff disabled, most merged, some needs rebasing.
 
 * Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com>
 - Make the .shared-srctree file a list so more than two checkouts

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- linux-2.6-defaults-pci_no_msi.patch	4 Feb 2009 17:50:39 -0000	1.4
+++ linux-2.6-defaults-pci_no_msi.patch	24 Apr 2009 22:27:10 -0000	1.4.6.1
@@ -1,10 +1,8 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index d8362cf..30d6053 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -1674,6 +1674,9 @@ and is between 256 and 4096 characters. It is defined in the file
+--- linux-2.6.29.noarch/Documentation/kernel-parameters.txt~	2009-04-20 13:36:09.000000000 -0400
++++ linux-2.6.29.noarch/Documentation/kernel-parameters.txt	2009-04-20 13:36:33.000000000 -0400
+@@ -1723,6 +1723,9 @@ and is between 256 and 4096 characters. 
  				root domains (aka PCI segments, in ACPI-speak).
- 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
+ 		nommconf	[X86] Disable use of MMCONFIG for PCI
  				Configuration
 +		msi		[MSI] If the PCI_MSI kernel config parameter is
 +				enabled, this kernel boot option can be used to

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.102.6.1
retrieving revision 1.102.6.2
diff -u -r1.102.6.1 -r1.102.6.2
--- linux-2.6-execshield.patch	12 Mar 2009 20:38:57 -0000	1.102.6.1
+++ linux-2.6-execshield.patch	24 Apr 2009 22:27:10 -0000	1.102.6.2
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index dc27705..34ed3a2 100644
+index 5623c50..353a24e 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -10,7 +10,7 @@
  
  static inline void fill_ldt(struct desc_struct *desc,
  			    const struct user_desc *info)
-@@ -95,6 +96,9 @@ static inline int desc_empty(const void *ptr)
+@@ -94,6 +95,9 @@ static inline int desc_empty(const void *ptr)
  
  #define load_TLS(t, cpu) native_load_tls(t, cpu)
  #define set_ldt native_set_ldt
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -379,6 +383,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -380,6 +384,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -73,10 +73,10 @@
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index e299287..aaa8a35 100644
+index 7727aa8..5d6083c 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
-@@ -113,6 +113,9 @@ struct pv_cpu_ops {
+@@ -138,6 +138,9 @@ struct pv_cpu_ops {
  	void (*store_gdt)(struct desc_ptr *);
  	void (*store_idt)(struct desc_ptr *);
  	void (*set_ldt)(const void *desc, unsigned entries);
@@ -86,7 +86,7 @@
  	unsigned long (*store_tr)(void);
  	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
  #ifdef CONFIG_X86_64
-@@ -860,6 +863,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+@@ -953,6 +956,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
  {
  	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
  }
@@ -100,10 +100,10 @@
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 3bfd523..99c8119 100644
+index 34c5237..4fc080f 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
+@@ -159,6 +159,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -114,12 +114,12 @@
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 83492b1..a84c787 100644
+index c4f6678..0a680c0 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -708,6 +708,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
- 	 * we do "generic changes."
- 	 */
+@@ -789,6 +789,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+ 	/* Filter out anything that depends on CPUID levels we don't have */
+ 	filter_cpuid_features(c, true);
  
 +	/*
 +	 *  emulation of NX with segment limits unfortunately means
@@ -135,15 +135,14 @@
 +			clear_cpu_cap(c, X86_FEATURE_SEP);
 +	}
 +
-+
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
- 		char *p;
+ 		const char *p;
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index c6520a4..2066aa1 100644
+index 8e45f44..13c0535 100644
 --- a/arch/x86/kernel/paravirt.c
 +++ b/arch/x86/kernel/paravirt.c
-@@ -352,6 +352,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -369,6 +369,9 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.read_tscp = native_read_tscp,
  	.load_tr_desc = native_load_tr_desc,
  	.set_ldt = native_set_ldt,
@@ -154,19 +153,21 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index bd4da2a..60823d4 100644
+index 76f8f84..4118f17 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -343,6 +343,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+@@ -301,7 +301,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  void
  start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  {
 +	int cpu;
 +
- 	__asm__("movl %0, %%gs" : : "r"(0));
+ 	set_user_gs(regs, 0);
++
  	regs->fs		= 0;
  	set_fs(USER_DS);
-@@ -352,6 +354,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ 	regs->ds		= __USER_DS;
+@@ -310,6 +313,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -178,7 +179,7 @@
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -519,7 +526,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -356,7 +364,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -188,7 +189,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -692,3 +700,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -509,3 +518,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -230,34 +231,13 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
-diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
-index ce50546..bd6593a 100644
---- a/arch/x86/kernel/tlb_32.c
-+++ b/arch/x86/kernel/tlb_32.c
-@@ -2,6 +2,7 @@
- #include <linux/cpu.h>
- #include <linux/interrupt.h>
- 
-+#include <asm/desc.h>
- #include <asm/tlbflush.h>
- 
- DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -91,6 +92,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
- 	unsigned long cpu;
- 
- 	cpu = get_cpu();
-+	if (current->active_mm)
-+		load_user_cs_desc(cpu, current->active_mm);
- 
- 	if (!cpu_isset(cpu, flush_cpumask))
- 		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index a9e7548..af0f8f0 100644
+index a1d2883..453b616 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -160,6 +160,76 @@ static int lazy_iobitmap_copy(void)
- 
- 	return 0;
+@@ -118,6 +118,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
+ 	if (!user_mode_vm(regs))
+ 		die(str, regs, err);
  }
 +
 +static inline int
@@ -332,7 +312,7 @@
  #endif
  
  static void __kprobes
-@@ -323,6 +393,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -276,6 +346,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -362,7 +342,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -934,19 +1027,37 @@ dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs)
+@@ -888,19 +981,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -388,7 +368,7 @@
 -	info.si_signo = SIGILL;
 -	info.si_errno = 0;
 -	info.si_code = ILL_BADSTK;
--	info.si_addr = 0;
+-	info.si_addr = NULL;
 -	if (notify_die(DIE_TRAP, "iret exception",
 -			regs, error_code, 32, SIGILL) == NOTIFY_STOP)
 -		return;
@@ -409,11 +389,27 @@
  }
  #endif
  
+diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
+index fd3da1d..ac54294 100644
+--- a/arch/x86/mm/init.c
++++ b/arch/x86/mm/init.c
+@@ -163,7 +163,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+ 	set_nx();
+ 	if (nx_enabled)
+ 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
++	else
+ #endif
++	if (exec_shield)
++		printk(KERN_INFO "Using x86 segment limits to approximate "
++			"NX protection\n");
+ 
+ 	/* Enable PSE if available */
+ 	if (cpu_has_pse)
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 2cef050..a18ae07 100644
+index 749559e..ad9943c 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -617,7 +617,7 @@ static int disable_nx __initdata;
+@@ -602,7 +602,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -422,7 +418,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -626,14 +626,12 @@ static int __init noexec_setup(char *str)
+@@ -611,14 +611,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -443,20 +439,8 @@
  
  	return 0;
  }
-@@ -892,7 +890,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
- 	set_nx();
- 	if (nx_enabled)
- 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
-+	else
- #endif
-+	if (exec_shield)
-+		printk(KERN_INFO "Using x86 segment limits to approximate "
-+			"NX protection\n");
- 
- 	/* Enable PSE if available */
- 	if (cpu_has_pse)
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 56fe712..30d2be7 100644
+index 1658296..72056cf 100644
 --- a/arch/x86/mm/mmap.c
 +++ b/arch/x86/mm/mmap.c
 @@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void)
@@ -477,6 +461,31 @@
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
  }
+diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
+index 821e970..ea5a4c3 100644
+--- a/arch/x86/mm/tlb.c
++++ b/arch/x86/mm/tlb.c
+@@ -6,6 +6,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ 
++#include <asm/desc.h>
+ #include <asm/tlbflush.h>
+ #include <asm/mmu_context.h>
+ #include <asm/apic.h>
+@@ -129,6 +130,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+ 	union smp_flush_state *f;
+ 
+ 	cpu = smp_processor_id();
++
++#ifdef CONFIG_X86_32
++	if (current->active_mm)
++		load_user_cs_desc(cpu, current->active_mm);
++#endif
++
+ 	/*
+ 	 * orig_rax contains the negated interrupt vector.
+ 	 * Use that to determine where the sender put the data.
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
 index 1241f11..3f2c44c 100644
 --- a/arch/x86/vdso/vdso32-setup.c
@@ -491,10 +500,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index b58e963..cdc83ce 100644
+index 82cd39a..702e3a0 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -282,6 +282,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -519,7 +528,7 @@
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long *frames;
-@@ -1232,6 +1250,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -792,6 +810,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -530,10 +539,10 @@
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 33b7235..ce1f044 100644
+index 40381df..f856fab 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
+@@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -542,7 +551,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -735,6 +735,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -721,6 +721,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -554,7 +563,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -754,6 +759,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -740,6 +745,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -570,7 +579,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -761,7 +775,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -747,7 +761,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex);
@@ -580,7 +589,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -926,7 +941,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -912,7 +927,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -589,34 +598,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
-diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 7e4877d..0c368c1 100644
---- a/fs/proc/array.c
-+++ b/fs/proc/array.c
-@@ -424,8 +424,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
- 		unlock_task_sighand(task, &flags);
- 	}
- 
--	if (!whole || num_threads < 2)
--		wchan = get_wchan(task);
-+	if (!whole || num_threads < 2) {
-+		const struct cred *cred;
-+
-+		wchan = 0;
-+		cred = __task_cred(task);
-+		if (current_uid() == cred->uid || current_euid() == cred->uid ||
-+			capable(CAP_SYS_NICE))
-+				wchan = get_wchan(task);
-+	}
-+
- 	if (!whole) {
- 		min_flt = task->min_flt;
- 		maj_flt = task->maj_flt;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 065cdf8..aa94aa9 100644
+index bff1f0d..88c5efa 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1135,7 +1135,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1138,7 +1138,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -632,10 +618,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 92915e8..4bfd050 100644
+index 0e80e26..af904ea 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -194,6 +194,9 @@ struct mm_struct {
+@@ -198,6 +198,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -663,12 +649,12 @@
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 8c216e0..79eca33 100644
+index b94f354..aed6221 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -98,6 +98,9 @@ struct robust_list_head;
- struct bio;
+@@ -99,6 +99,9 @@ struct bio;
  struct bts_tracer;
+ struct fs_struct;
  
 +extern int exec_shield;
 +extern int print_fatal_signals;
@@ -676,7 +662,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -346,6 +349,10 @@ extern int sysctl_max_map_count;
+@@ -351,6 +354,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -688,10 +674,10 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index c5ef44f..f7abce4 100644
+index 82350f8..d89dd29 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -86,6 +86,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
  #ifndef CONFIG_MMU
  extern int sysctl_nr_trim_pages;
  #endif
@@ -718,7 +704,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -379,6 +399,14 @@ static struct ctl_table kern_table[] = {
+@@ -377,6 +397,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -734,10 +720,10 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 00ced3e..931bc3b 100644
+index 4a38411..12ca810 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
  #include <linux/mempolicy.h>
  #include <linux/rmap.h>
  #include <linux/mmu_notifier.h>
@@ -745,7 +731,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-@@ -43,6 +44,18 @@
+@@ -44,6 +45,18 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -764,7 +750,7 @@
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -391,6 +404,8 @@ static inline void
+@@ -392,6 +405,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -773,7 +759,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -782,7 +768,7 @@
  }
  
  /*
-@@ -802,6 +819,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -803,6 +820,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -791,7 +777,7 @@
  		return prev;
  	}
  
-@@ -956,7 +975,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -957,7 +976,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -801,7 +787,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1436,13 +1456,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -822,7 +808,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1456,8 +1480,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -900,7 +886,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1532,6 +1624,14 @@ out:
+@@ -1536,6 +1628,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -915,7 +901,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1548,7 +1648,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -924,7 +910,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1858,10 +1958,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -941,7 +927,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2110,6 +2214,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2114,6 +2218,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);

linux-2.6-tracehook.patch:

Index: linux-2.6-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v
retrieving revision 1.8.6.2
retrieving revision 1.8.6.3
diff -u -r1.8.6.2 -r1.8.6.3
--- linux-2.6-tracehook.patch	24 Mar 2009 22:57:43 -0000	1.8.6.2
+++ linux-2.6-tracehook.patch	24 Apr 2009 22:27:12 -0000	1.8.6.3
@@ -19,7 +19,7 @@
  2 files changed, 51 insertions(+), 43 deletions(-)
 
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 6186a78..b622498 100644  
+index c7aa154..4ec4821 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -1,7 +1,7 @@
@@ -31,7 +31,7 @@
   *
   * This copyrighted material is made available to anyone wishing to use,
   * modify, copy, or redistribute it subject to the terms and conditions
-@@ -469,22 +469,29 @@ static inline int tracehook_get_signal(s
+@@ -464,22 +464,29 @@ static inline int tracehook_get_signal(s
  
  /**
   * tracehook_notify_jctl - report about job control stop/continue
@@ -70,10 +70,10 @@
  
  #define DEATH_REAP			-1
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 2a74fe8..9a0d98f 100644  
+index d803473..424eff2 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -691,7 +691,7 @@ static int prepare_signal(int sig, struc
+@@ -702,7 +702,7 @@ static int prepare_signal(int sig, struc
  
  		if (why) {
  			/*
@@ -82,7 +82,7 @@
  			 * will take ->siglock, notice SIGNAL_CLD_MASK, and
  			 * notify its parent. See get_signal_to_deliver().
  			 */
-@@ -1629,29 +1629,6 @@ void ptrace_notify(int exit_code)
+@@ -1665,29 +1665,6 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -112,7 +112,7 @@
  /*
   * This performs the stopping for SIGSTOP and other stop signals.
   * We have to stop all threads in the thread group.
-@@ -1662,6 +1639,7 @@ static int do_signal_stop(int signr)
+@@ -1698,6 +1675,7 @@ static int do_signal_stop(int signr)
  {
  	struct signal_struct *sig = current->signal;
  	int stop_count;
@@ -120,7 +120,7 @@
  
  	if (sig->group_stop_count > 0) {
  		/*
-@@ -1701,8 +1679,30 @@ static int do_signal_stop(int signr)
+@@ -1737,8 +1715,30 @@ static int do_signal_stop(int signr)
  	current->exit_code = sig->group_exit_code;
  	__set_current_state(TASK_STOPPED);
  
@@ -152,7 +152,7 @@
  	return 1;
  }
  
-@@ -1771,14 +1771,15 @@ relock:
+@@ -1807,14 +1807,15 @@ relock:
  		int why = (signal->flags & SIGNAL_STOP_CONTINUED)
  				? CLD_CONTINUED : CLD_STOPPED;
  		signal->flags &= ~SIGNAL_CLD_MASK;
@@ -174,7 +174,7 @@
  		goto relock;
  	}
  
-@@ -1936,14 +1937,14 @@ void exit_signals(struct task_struct *ts
+@@ -1979,14 +1980,14 @@ void exit_signals(struct task_struct *ts
  	if (unlikely(tsk->signal->group_stop_count) &&
  			!--tsk->signal->group_stop_count) {
  		tsk->signal->flags = SIGNAL_STOP_STOPPED;

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.107.6.1
retrieving revision 1.107.6.2
diff -u -r1.107.6.1 -r1.107.6.2
--- linux-2.6-utrace.patch	24 Mar 2009 22:57:43 -0000	1.107.6.1
+++ linux-2.6-utrace.patch	24 Apr 2009 22:27:12 -0000	1.107.6.2
@@ -30,17 +30,17 @@
  fs/proc/array.c                   |    3 +
  include/linux/init_task.h         |    1 +
  include/linux/sched.h             |    6 +
- include/linux/tracehook.h         |   50 +-
+ include/linux/tracehook.h         |   61 +-
  include/linux/utrace.h            |  692 +++++++++++
  include/linux/utrace_struct.h     |   58 +
  init/Kconfig                      |    9 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |   18 +-
- kernel/utrace.c                   | 2348 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3756 insertions(+), 3 deletions(-)
+ kernel/utrace.c                   | 2351 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 3770 insertions(+), 3 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1462ed8..f5da1b4 100644  
+index a3a83d3..0a07ba9 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
@@ -51,7 +51,7 @@
 +	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
- 	    mac80211.xml debugobjects.xml sh.xml regulator.xml
+ 	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
 index ...b802c55 100644  
@@ -651,10 +651,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index e752d97..39eebc8 100644  
+index dcfb933..5625de6 100644  
 --- a/include/linux/init_task.h
 +++ b/include/linux/init_task.h
-@@ -181,6 +181,7 @@ extern struct cred init_cred;
+@@ -183,6 +183,7 @@ extern struct cred init_cred;
  		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
  	},								\
  	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
@@ -663,7 +663,7 @@
  	INIT_TRACE_IRQFLAGS						\
  	INIT_LOCKDEP							\
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 011db2f..786ef2d 100644  
+index 98e1fe5..e9c3350 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -59,6 +59,7 @@ struct sched_param {
@@ -674,7 +674,7 @@
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -1287,6 +1288,11 @@ struct task_struct {
+@@ -1290,6 +1291,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -687,7 +687,7 @@
     	u32 parent_exec_id;
     	u32 self_exec_id;
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index b622498..6ff7277 100644  
+index 4ec4821..a7de30f 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -796,18 +796,18 @@
  	if (stepping)
  		ptrace_notify(SIGTRAP);
  }
-@@ -400,6 +422,8 @@ static inline int tracehook_consider_ign
- 						    int sig,
- 						    void __user *handler)
+@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand
+ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
+ 						    int sig)
  {
 +	if (unlikely(task_utrace_flags(task) & UTRACE_EVENT(SIGNAL_IGN)))
 +		return 1;
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -421,6 +445,9 @@ static inline int tracehook_consider_fat
- 						  int sig,
- 						  void __user *handler)
+@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign
+ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
+ 						  int sig)
  {
 +	if (unlikely(task_utrace_flags(task) & (UTRACE_EVENT(SIGNAL_TERM) |
 +						UTRACE_EVENT(SIGNAL_CORE))))
@@ -815,7 +815,7 @@
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -435,6 +462,8 @@ static inline int tracehook_consider_fat
+@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat
   */
  static inline int tracehook_force_sigpending(void)
  {
@@ -824,7 +824,7 @@
  	return 0;
  }
  
-@@ -464,6 +493,8 @@ static inline int tracehook_get_signal(s
+@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s
  				       siginfo_t *info,
  				       struct k_sigaction *return_ka)
  {
@@ -833,7 +833,7 @@
  	return 0;
  }
  
-@@ -491,6 +522,8 @@ static inline int tracehook_get_signal(s
+@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s
   */
  static inline int tracehook_notify_jctl(int notify, int why)
  {
@@ -842,26 +842,37 @@
  	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
  }
  
-@@ -514,6 +547,8 @@ static inline int tracehook_notify_jctl(
+@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(
  static inline int tracehook_notify_death(struct task_struct *task,
  					 void **death_cookie, int group_dead)
  {
 +	*death_cookie = task_utrace_struct(task);
 +
- 	if (task->exit_signal == -1)
+ 	if (task_detached(task))
  		return task->ptrace ? SIGCHLD : DEATH_REAP;
  
-@@ -550,6 +585,9 @@ static inline void tracehook_report_deat
+@@ -545,6 +580,20 @@ static inline void tracehook_report_deat
  					  int signal, void *death_cookie,
  					  int group_dead)
  {
++	/*
++	 * This barrier ensures that our caller's setting of
++	 * @task->exit_state precedes checking @task->utrace_flags here.
++	 * If utrace_set_events() was just called to enable
++	 * UTRACE_EVENT(DEATH), then we are obliged to call
++	 * utrace_report_death() and not miss it.  utrace_set_events()
++	 * uses tasklist_lock to synchronize enabling the bit with the
++	 * actual change to @task->exit_state, but we need this barrier
++	 * to be sure we see a flags change made just before our caller
++	 * took the tasklist_lock.
++	 */
 +	smp_mb();
 +	if (task_utrace_flags(task) & _UTRACE_DEATH_EVENTS)
 +		utrace_report_death(task, death_cookie, group_dead, signal);
  }
  
  #ifdef TIF_NOTIFY_RESUME
-@@ -579,10 +617,20 @@ static inline void set_notify_resume(str
+@@ -574,10 +623,20 @@ static inline void set_notify_resume(str
   * asynchronously, this will be called again before we return to
   * user mode.
   *
@@ -1646,10 +1657,10 @@
 +
 +#endif	/* linux/utrace_struct.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 6a5c5fe..4b5ab3e 100644  
+index f2f9b53..0d104d9 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1060,6 +1060,15 @@ config STOP_MACHINE
+@@ -1141,6 +1141,15 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1666,7 +1677,7 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index e4791b3..7bff724 100644  
+index 4242366..a79634e 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1678,7 +1689,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index c9cf48b..41e9542 100644  
+index aaad0ec..8ba9b73 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1689,7 +1700,7 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/audit.h>
-@@ -172,6 +173,14 @@ bool ptrace_may_access(struct task_struc
+@@ -176,6 +177,14 @@ bool ptrace_may_access(struct task_struc
  	return (!err ? true : false);
  }
  
@@ -1704,7 +1715,7 @@
  int ptrace_attach(struct task_struct *task)
  {
  	int retval;
-@@ -210,6 +219,11 @@ repeat:
+@@ -214,6 +223,11 @@ repeat:
  		goto repeat;
  	}
  
@@ -1716,7 +1727,7 @@
  	if (!task->mm)
  		goto bad;
  	/* the same process cannot be attached many times */
-@@ -515,7 +529,9 @@ int ptrace_traceme(void)
+@@ -590,7 +604,9 @@ int ptrace_traceme(void)
  	 */
  repeat:
  	task_lock(current);
@@ -1729,10 +1740,10 @@
  		 */
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...115be79 100644  
+index ...c2bb162 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2348 @@
+@@ -0,0 +1,2351 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -3249,25 +3260,7 @@
 +		 */
 +		return true;
 +
-+	if (unlikely(report.result == UTRACE_SYSCALL_ABORT))
-+		return true;
-+
-+	if (signal_pending(task)) {
-+		/*
-+		 * Clear TIF_SIGPENDING if it no longer needs to be set.
-+		 * It may have been set as part of quiescence, and won't
-+		 * ever have been cleared by another thread.  For other
-+		 * reports, we can just leave it set and will go through
-+		 * utrace_get_signal() to reset things.  But here we are
-+		 * about to enter a syscall, which might bail out with an
-+		 * -ERESTART* error if it's set now.
-+		 */
-+		spin_lock_irq(&task->sighand->siglock);
-+		recalc_sigpending();
-+		spin_unlock_irq(&task->sighand->siglock);
-+	}
-+
-+	return false;
++	return report.result == UTRACE_SYSCALL_ABORT;
 +}
 +
 +/*
@@ -3498,12 +3491,29 @@
 +			set_tsk_thread_flag(task, TIF_SIGPENDING);
 +		break;
 +
-+	case UTRACE_SINGLESTEP:
-+		user_enable_single_step(task);
-+		break;
-+
 +	case UTRACE_BLOCKSTEP:
-+		user_enable_block_step(task);
++		if (likely(arch_has_block_step())) {
++			user_enable_block_step(task);
++			break;
++		}
++
++		/*
++		 * This means some callback is to blame for failing
++		 * to check arch_has_block_step() itself.  Warn and
++		 * then fall through to treat it as SINGLESTEP.
++		 */
++		WARN_ON(1);
++
++	case UTRACE_SINGLESTEP:
++		if (likely(arch_has_single_step()))
++			user_enable_single_step(task);
++		else
++			/*
++			 * This means some callback is to blame for failing
++			 * to check arch_has_single_step() itself.  Spew
++			 * about it so the loser will fix his module.
++			 */
++			WARN_ON(1);
 +		break;
 +
 +	case UTRACE_REPORT:
@@ -3548,11 +3558,15 @@
 +	}
 +
 +	/*
-+	 * If UTRACE_INTERRUPT was just used, we don't bother with a
-+	 * report here.  We will report and stop in utrace_get_signal().
++	 * If UTRACE_INTERRUPT was just used, we don't bother with a report
++	 * here.  We will report and stop in utrace_get_signal().  In case
++	 * of a race with utrace_control(), make sure we don't momentarily
++	 * return to user mode because TIF_SIGPENDING was not set yet.
 +	 */
-+	if (unlikely(utrace->interrupt))
++	if (unlikely(utrace->interrupt)) {
++		set_thread_flag(TIF_SIGPENDING);
 +		return;
++	}
 +
 +	/*
 +	 * Do a simple reporting pass, with no callback after report_quiesce.

linux-2.6-v4l-dvb-fixes.patch:

Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.2.8.8
retrieving revision 1.2.8.9
diff -u -r1.2.8.8 -r1.2.8.9
--- linux-2.6-v4l-dvb-fixes.patch	14 Apr 2009 22:09:18 -0000	1.2.8.8
+++ linux-2.6-v4l-dvb-fixes.patch	24 Apr 2009 22:27:13 -0000	1.2.8.9
@@ -315,6 +315,7 @@
       V4L/DVB (11051): v4l-dvb: replace remaining references to the old mailinglist.
       V4L/DVB (11052): bt819: remove an unused header
       V4L/DVB (11053): saa7134: set v4l2_dev field of video_device
+      V4L/DVB (11098): v4l2-common: remove incorrect MODULE test
       V4L/DVB (11100): au8522: fix compilation warning.
       V4L/DVB (11112): v4l2-subdev: add support for TRY_FMT, ENUM_FMT and G/S_PARM.
       V4L/DVB (11113): ov7670: convert to v4l2_subdev
@@ -98394,6 +98395,19 @@
     to high class IDs.
  
     This function returns the first ID that follows after the given ID.
+@@ -910,10 +797,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+ 	struct i2c_board_info info;
+ 
+ 	BUG_ON(!dev);
+-#ifdef MODULE
++
+ 	if (module_name)
+ 		request_module(module_name);
+-#endif
++
+ 	/* Setup the i2c board info with the device type and
+ 	   the device address. */
+ 	memset(&info, 0, sizeof(info));
 @@ -927,11 +814,11 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */
@@ -98423,6 +98437,19 @@
  }
  EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
  
+@@ -958,10 +850,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+ 	struct i2c_board_info info;
+ 
+ 	BUG_ON(!dev);
+-#ifdef MODULE
++
+ 	if (module_name)
+ 		request_module(module_name);
+-#endif
++
+ 	/* Setup the i2c board info with the device type and
+ 	   the device address. */
+ 	memset(&info, 0, sizeof(info));
 @@ -974,11 +866,11 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.10
retrieving revision 1.976.2.11
diff -u -r1.976.2.10 -r1.976.2.11
--- sources	14 Apr 2009 22:09:21 -0000	1.976.2.10
+++ sources	24 Apr 2009 22:27:15 -0000	1.976.2.11
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2
+cd69d16ea42bbf20d0a505690be45868  patch-2.6.30-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.9
retrieving revision 1.888.2.10
diff -u -r1.888.2.9 -r1.888.2.10
--- upstream	14 Apr 2009 22:09:22 -0000	1.888.2.9
+++ upstream	24 Apr 2009 22:27:16 -0000	1.888.2.10
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29.1.bz2
+patch-2.6.30-rc3.bz2

xen.pvops.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1.2.16 -r 1.1.2.17 xen.pvops.patch
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- xen.pvops.patch	14 Apr 2009 22:09:22 -0000	1.1.2.16
+++ xen.pvops.patch	24 Apr 2009 22:27:17 -0000	1.1.2.17
@@ -1,1843 +1,194 @@
-diff --git a/Documentation/ABI/testing/debugfs-kmemtrace b/Documentation/ABI/testing/debugfs-kmemtrace
+diff --git a/Documentation/ABI/testing/sysfs-devices-cache_disable b/Documentation/ABI/testing/sysfs-devices-cache_disable
 new file mode 100644
-index 0000000..5e6a92a
+index 0000000..175bb4f
 --- /dev/null
-+++ b/Documentation/ABI/testing/debugfs-kmemtrace
-@@ -0,0 +1,71 @@
-+What:		/sys/kernel/debug/kmemtrace/
-+Date:		July 2008
-+Contact:	Eduard - Gabriel Munteanu <eduard.munteanu at linux360.ro>
-+Description:
-+
-+In kmemtrace-enabled kernels, the following files are created:
-+
-+/sys/kernel/debug/kmemtrace/
-+	cpu<n>		(0400)	Per-CPU tracing data, see below. (binary)
-+	total_overruns	(0400)	Total number of bytes which were dropped from
-+				cpu<n> files because of full buffer condition,
-+				non-binary. (text)
-+	abi_version	(0400)	Kernel's kmemtrace ABI version. (text)
-+
-+Each per-CPU file should be read according to the relay interface. That is,
-+the reader should set affinity to that specific CPU and, as currently done by
-+the userspace application (though there are other methods), use poll() with
-+an infinite timeout before every read(). Otherwise, erroneous data may be
-+read. The binary data has the following _core_ format:
-+
-+	Event ID	(1 byte)	Unsigned integer, one of:
-+		0 - represents an allocation (KMEMTRACE_EVENT_ALLOC)
-+		1 - represents a freeing of previously allocated memory
-+		    (KMEMTRACE_EVENT_FREE)
-+	Type ID		(1 byte)	Unsigned integer, one of:
-+		0 - this is a kmalloc() / kfree()
-+		1 - this is a kmem_cache_alloc() / kmem_cache_free()
-+		2 - this is a __get_free_pages() et al.
-+	Event size	(2 bytes)	Unsigned integer representing the
-+					size of this event. Used to extend
-+					kmemtrace. Discard the bytes you
-+					don't know about.
-+	Sequence number	(4 bytes)	Signed integer used to reorder data
-+					logged on SMP machines. Wraparound
-+					must be taken into account, although
-+					it is unlikely.
-+	Caller address	(8 bytes)	Return address to the caller.
-+	Pointer to mem	(8 bytes)	Pointer to target memory area. Can be
-+					NULL, but not all such calls might be
-+					recorded.
-+
-+In case of KMEMTRACE_EVENT_ALLOC events, the next fields follow:
-+
-+	Requested bytes	(8 bytes)	Total number of requested bytes,
-+					unsigned, must not be zero.
-+	Allocated bytes (8 bytes)	Total number of actually allocated
-+					bytes, unsigned, must not be lower
-+					than requested bytes.
-+	Requested flags	(4 bytes)	GFP flags supplied by the caller.
-+	Target CPU	(4 bytes)	Signed integer, valid for event id 1.
-+					If equal to -1, target CPU is the same
-+					as origin CPU, but the reverse might
-+					not be true.
-+
-+The data is made available in the same endianness the machine has.
-+
-+Other event ids and type ids may be defined and added. Other fields may be
-+added by increasing event size, but see below for details.
-+Every modification to the ABI, including new id definitions, are followed
-+by bumping the ABI version by one.
-+
-+Adding new data to the packet (features) is done at the end of the mandatory
-+data:
-+	Feature size	(2 byte)
-+	Feature ID	(1 byte)
-+	Feature data	(Feature size - 3 bytes)
-+
-+
-+Users:
-+	kmemtrace-user - git://repo.or.cz/kmemtrace-user.git
-+
-diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
-index 2a3fcc5..d9aa43d 100644
---- a/Documentation/DMA-API.txt
-+++ b/Documentation/DMA-API.txt
-@@ -609,3 +609,109 @@ size is the size (and should be a page-sized multiple).
- The return value will be either a pointer to the processor virtual
- address of the memory, or an error (via PTR_ERR()) if any part of the
- region is occupied.
-+
-+Part III - Debug drivers use of the DMA-API
-+-------------------------------------------
-+
-+The DMA-API as described above as some constraints. DMA addresses must be
-+released with the corresponding function with the same size for example. With
-+the advent of hardware IOMMUs it becomes more and more important that drivers
-+do not violate those constraints. In the worst case such a violation can
-+result in data corruption up to destroyed filesystems.
-+
-+To debug drivers and find bugs in the usage of the DMA-API checking code can
-+be compiled into the kernel which will tell the developer about those
-+violations. If your architecture supports it you can select the "Enable
-+debugging of DMA-API usage" option in your kernel configuration. Enabling this
-+option has a performance impact. Do not enable it in production kernels.
-+
-+If you boot the resulting kernel will contain code which does some bookkeeping
-+about what DMA memory was allocated for which device. If this code detects an
-+error it prints a warning message with some details into your kernel log. An
-+example warning message may look like this:
-+
-+------------[ cut here ]------------
-+WARNING: at /data2/repos/linux-2.6-iommu/lib/dma-debug.c:448
-+	check_unmap+0x203/0x490()
-+Hardware name:
-+forcedeth 0000:00:08.0: DMA-API: device driver frees DMA memory with wrong
-+	function [device address=0x00000000640444be] [size=66 bytes] [mapped as
-+single] [unmapped as page]
-+Modules linked in: nfsd exportfs bridge stp llc r8169
-+Pid: 0, comm: swapper Tainted: G        W  2.6.28-dmatest-09289-g8bb99c0 #1
-+Call Trace:
-+ <IRQ>  [<ffffffff80240b22>] warn_slowpath+0xf2/0x130
-+ [<ffffffff80647b70>] _spin_unlock+0x10/0x30
-+ [<ffffffff80537e75>] usb_hcd_link_urb_to_ep+0x75/0xc0
-+ [<ffffffff80647c22>] _spin_unlock_irqrestore+0x12/0x40
-+ [<ffffffff8055347f>] ohci_urb_enqueue+0x19f/0x7c0
-+ [<ffffffff80252f96>] queue_work+0x56/0x60
-+ [<ffffffff80237e10>] enqueue_task_fair+0x20/0x50
-+ [<ffffffff80539279>] usb_hcd_submit_urb+0x379/0xbc0
-+ [<ffffffff803b78c3>] cpumask_next_and+0x23/0x40
-+ [<ffffffff80235177>] find_busiest_group+0x207/0x8a0
-+ [<ffffffff8064784f>] _spin_lock_irqsave+0x1f/0x50
-+ [<ffffffff803c7ea3>] check_unmap+0x203/0x490
-+ [<ffffffff803c8259>] debug_dma_unmap_page+0x49/0x50
-+ [<ffffffff80485f26>] nv_tx_done_optimized+0xc6/0x2c0
-+ [<ffffffff80486c13>] nv_nic_irq_optimized+0x73/0x2b0
-+ [<ffffffff8026df84>] handle_IRQ_event+0x34/0x70
-+ [<ffffffff8026ffe9>] handle_edge_irq+0xc9/0x150
-+ [<ffffffff8020e3ab>] do_IRQ+0xcb/0x1c0
-+ [<ffffffff8020c093>] ret_from_intr+0x0/0xa
-+ <EOI> <4>---[ end trace f6435a98e2a38c0e ]---
-+
-+The driver developer can find the driver and the device including a stacktrace
-+of the DMA-API call which caused this warning.
-+
-+Per default only the first error will result in a warning message. All other
-+errors will only silently counted. This limitation exist to prevent the code
-+from flooding your kernel log. To support debugging a device driver this can
-+be disabled via debugfs. See the debugfs interface documentation below for
-+details.
-+
-+The debugfs directory for the DMA-API debugging code is called dma-api/. In
-+this directory the following files can currently be found:
-+
-+	dma-api/all_errors	This file contains a numeric value. If this
-+				value is not equal to zero the debugging code
-+				will print a warning for every error it finds
-+				into the kernel log. Be carefull with this
-+				option. It can easily flood your logs.
-+
-+	dma-api/disabled	This read-only file contains the character 'Y'
-+				if the debugging code is disabled. This can
-+				happen when it runs out of memory or if it was
-+				disabled at boot time
-+
-+	dma-api/error_count	This file is read-only and shows the total
-+				numbers of errors found.
-+
-+	dma-api/num_errors	The number in this file shows how many
-+				warnings will be printed to the kernel log
-+				before it stops. This number is initialized to
-+				one at system boot and be set by writing into
-+				this file
-+
-+	dma-api/min_free_entries
-+				This read-only file can be read to get the
-+				minimum number of free dma_debug_entries the
-+				allocator has ever seen. If this value goes
-+				down to zero the code will disable itself
-+				because it is not longer reliable.
-+
-+	dma-api/num_free_entries
-+				The current number of free dma_debug_entries
-+				in the allocator.
-+
-+If you have this code compiled into your kernel it will be enabled by default.
-+If you want to boot without the bookkeeping anyway you can provide
-+'dma_debug=off' as a boot parameter. This will disable DMA-API debugging.
-+Notice that you can not enable it again at runtime. You have to reboot to do
-+so.
-+
-+When the code disables itself at runtime this is most likely because it ran
-+out of dma_debug_entries. These entries are preallocated at boot. The number
-+of preallocated entries is defined per architecture. If it is too low for you
[...210221 lines suppressed...]
-+	  Bzip2 uses a large amount of memory. For modern kernels you
-+	  will need at least 8MB RAM or more for booting.
-+
-+config INITRAMFS_COMPRESSION_LZMA
-+	bool "LZMA"
-+	depends on RD_LZMA
-+	help
-+	  The most recent compression algorithm.
-+	  Its ratio is best, decompression speed is between the other
-+	  two. Compression is slowest.	The initramfs size is about 33%
-+	  smaller with LZMA in comparison to gzip.
-+
-+endchoice
-diff --git a/usr/Makefile b/usr/Makefile
-index 201f27f..b84894b 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -6,13 +6,25 @@ klibcdirs:;
- PHONY += klibcdirs
- 
- 
-+# No compression
-+suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE)   =
-+
-+# Gzip, but no bzip2
-+suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP)   = .gz
-+
-+# Bzip2
-+suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2)  = .bz2
-+
-+# Lzma
-+suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA)   = .lzma
-+
- # Generate builtin.o based on initramfs_data.o
--obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
-+obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o
- 
--# initramfs_data.o contains the initramfs_data.cpio.gz image.
-+# initramfs_data.o contains the compressed initramfs_data.cpio image.
- # The image is included using .incbin, a dependency which is not
- # tracked automatically.
--$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
-+$(obj)/initramfs_data$(suffix_y).o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
- 
- #####
- # Generate the initramfs cpio archive
-@@ -25,28 +37,28 @@ ramfs-args  := \
-         $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
-         $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))
- 
--# .initramfs_data.cpio.gz.d is used to identify all files included
-+# .initramfs_data.cpio.d is used to identify all files included
- # in initramfs and to detect if any files are added/removed.
- # Removed files are identified by directory timestamp being updated
- # The dependency list is generated by gen_initramfs.sh -l
--ifneq ($(wildcard $(obj)/.initramfs_data.cpio.gz.d),)
--	include $(obj)/.initramfs_data.cpio.gz.d
-+ifneq ($(wildcard $(obj)/.initramfs_data.cpio.d),)
-+	include $(obj)/.initramfs_data.cpio.d
- endif
- 
- quiet_cmd_initfs = GEN     $@
-       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
- 
--targets := initramfs_data.cpio.gz
-+targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio
- # do not try to update files included in initramfs
- $(deps_initramfs): ;
- 
- $(deps_initramfs): klibcdirs
--# We rebuild initramfs_data.cpio.gz if:
--# 1) Any included file is newer then initramfs_data.cpio.gz
-+# We rebuild initramfs_data.cpio if:
-+# 1) Any included file is newer then initramfs_data.cpio
- # 2) There are changes in which files are included (added or deleted)
--# 3) If gen_init_cpio are newer than initramfs_data.cpio.gz
-+# 3) If gen_init_cpio are newer than initramfs_data.cpio
- # 4) arguments to gen_initramfs.sh changes
--$(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
--	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.gz.d
-+$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
-+	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
- 	$(call if_changed,initfs)
- 
-diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S
-index c2e1ad4..7c6973d 100644
---- a/usr/initramfs_data.S
-+++ b/usr/initramfs_data.S
-@@ -26,5 +26,5 @@ SECTIONS
- */
- 
- .section .init.ramfs,"a"
--.incbin "usr/initramfs_data.cpio.gz"
-+.incbin "usr/initramfs_data.cpio"
- 
-diff --git a/usr/initramfs_data.bz2.S b/usr/initramfs_data.bz2.S
-new file mode 100644
-index 0000000..bc54d09
---- /dev/null
-+++ b/usr/initramfs_data.bz2.S
-@@ -0,0 +1,29 @@
-+/*
-+  initramfs_data includes the compressed binary that is the
-+  filesystem used for early user space.
-+  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-+  released on 2001-07-14) dit not support .incbin.
-+  If you are forced to use older binutils than that then the
-+  following trick can be applied to create the resulting binary:
-+
-+
-+  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-+  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-+   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-+
-+  initramfs_data.scr looks like this:
-+SECTIONS
-+{
-+       .init.ramfs : { *(.data) }
-+}
-+
-+  The above example is for i386 - the parameters vary from architectures.
-+  Eventually look up LDFLAGS_BLOB in an older version of the
-+  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-+
-+  Using .incbin has the advantage over ld that the correct flags are set
-+  in the ELF header, as required by certain architectures.
-+*/
-+
-+.section .init.ramfs,"a"
-+.incbin "usr/initramfs_data.cpio.bz2"
-diff --git a/usr/initramfs_data.gz.S b/usr/initramfs_data.gz.S
-new file mode 100644
-index 0000000..890c8dd
---- /dev/null
-+++ b/usr/initramfs_data.gz.S
-@@ -0,0 +1,29 @@
-+/*
-+  initramfs_data includes the compressed binary that is the
-+  filesystem used for early user space.
-+  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-+  released on 2001-07-14) dit not support .incbin.
-+  If you are forced to use older binutils than that then the
-+  following trick can be applied to create the resulting binary:
-+
-+
-+  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-+  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-+   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-+
-+  initramfs_data.scr looks like this:
-+SECTIONS
-+{
-+       .init.ramfs : { *(.data) }
-+}
-+
-+  The above example is for i386 - the parameters vary from architectures.
-+  Eventually look up LDFLAGS_BLOB in an older version of the
-+  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-+
-+  Using .incbin has the advantage over ld that the correct flags are set
-+  in the ELF header, as required by certain architectures.
-+*/
-+
-+.section .init.ramfs,"a"
-+.incbin "usr/initramfs_data.cpio.gz"
-diff --git a/usr/initramfs_data.lzma.S b/usr/initramfs_data.lzma.S
-new file mode 100644
-index 0000000..e11469e
---- /dev/null
-+++ b/usr/initramfs_data.lzma.S
-@@ -0,0 +1,29 @@
-+/*
-+  initramfs_data includes the compressed binary that is the
-+  filesystem used for early user space.
-+  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-+  released on 2001-07-14) dit not support .incbin.
-+  If you are forced to use older binutils than that then the
-+  following trick can be applied to create the resulting binary:
-+
-+
-+  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-+  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-+   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-+
-+  initramfs_data.scr looks like this:
-+SECTIONS
-+{
-+       .init.ramfs : { *(.data) }
-+}
-+
-+  The above example is for i386 - the parameters vary from architectures.
-+  Eventually look up LDFLAGS_BLOB in an older version of the
-+  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-+
-+  Using .incbin has the advantage over ld that the correct flags are set
-+  in the ELF header, as required by certain architectures.
-+*/
-+
-+.section .init.ramfs,"a"
-+.incbin "usr/initramfs_data.cpio.lzma"

xen.pvops.post.patch:

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- xen.pvops.post.patch	14 Apr 2009 22:09:26 -0000	1.1.2.10
+++ xen.pvops.post.patch	24 Apr 2009 22:27:21 -0000	1.1.2.11
@@ -1,28 +1,41 @@
 Reapply and merge in Fedora changes
-fix a mismerge in arch/x86/kernel/cpu/mtrr/generic.c
 remove localversion-tip file to avoid -tip being added to the kernel name
 
---- a/arch/x86/mm/pat.c	2009-02-14 09:16:34.000000000 +0000
-+++ b/arch/x86/mm/pat.c	2009-02-14 12:49:46.000000000 +0000
-@@ -29,6 +30,7 @@
+--- a/arch/x86/mm/init.c	2009-04-23 20:13:34.000000000 +0100
++++ b/arch/x86/mm/init.c	2009-04-24 20:27:42.000000000 +0100
+@@ -163,6 +163,10 @@
+ 	set_nx();
+ 	if (nx_enabled)
+ 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
++	else
++	if (exec_shield)
++		printk(KERN_INFO "Using x86 segment limits to approximate "
++			"NX protection\n");
+ 
+ 	/* Enable PSE if available */
+ 	if (cpu_has_pse)
+--- a/include/linux/sched.h	2009-04-23 20:13:50.000000000 +0100
++++ b/include/linux/sched.h	2009-04-24 20:27:42.000000000 +0100
+@@ -99,6 +99,9 @@
+ struct fs_struct;
+ struct bts_context;
  
- #ifdef CONFIG_X86_PAT
- int __read_mostly pat_enabled = 1;
-+EXPORT_SYMBOL_GPL(pat_enabled);
++extern int exec_shield;
++extern int print_fatal_signals;
++
+ /*
+  * List of flags we want to share for kernel threads,
+  * if only because they are not used by them anyway.
+--- a/mm/mmap.c	2009-04-23 20:13:53.000000000 +0100
++++ b/mm/mmap.c	2009-04-24 20:27:42.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <linux/rmap.h>
+ #include <linux/mmu_notifier.h>
+ #include <linux/perf_counter.h>
++#include <linux/random.h>
  
- void __cpuinit pat_disable(const char *reason)
- {
---- a/arch/x86/kernel/apic/nmi.c	2009-02-17 20:51:37.000000000 +0000
-+++ b/arch/x86/kernel/apic/nmi.c	2009-02-18 20:51:13.000000000 +0000
-@@ -442,7 +442,7 @@
- 		 * wait a few IRQs (5 seconds) before doing the oops ...
- 		 */
- 		local_inc(&__get_cpu_var(alert_counter));
--		if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
-+		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
- 			/*
- 			 * die_nmi will return ONLY if NOTIFY_STOP happens..
- 			 */
+ #include <asm/uaccess.h>
+ #include <asm/cacheflush.h>
 --- a/drivers/pci/pci.h	2009-02-25 20:16:13.000000000 +0000
 +++ b/drivers/pci/pci.h	2009-02-25 20:40:21.000000000 +0000
 @@ -111,8 +111,10 @@
@@ -36,1130 +49,16 @@
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
  #endif
  
---- a/drivers/gpu/drm/drm_proc.c	2009-03-04 21:07:25.000000000 +0000
-+++ b/drivers/gpu/drm/drm_proc.c	2009-03-04 21:20:20.000000000 +0000
-@@ -37,697 +37,195 @@
-  * OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/seq_file.h>
- #include "drmP.h"
- 
--static int drm_name_info(char *buf, char **start, off_t offset,
--			 int request, int *eof, void *data);
--static int drm_vm_info(char *buf, char **start, off_t offset,
--		       int request, int *eof, void *data);
--static int drm_clients_info(char *buf, char **start, off_t offset,
--			    int request, int *eof, void *data);
--static int drm_queues_info(char *buf, char **start, off_t offset,
--			   int request, int *eof, void *data);
--static int drm_bufs_info(char *buf, char **start, off_t offset,
--			 int request, int *eof, void *data);
--static int drm_vblank_info(char *buf, char **start, off_t offset,
--			   int request, int *eof, void *data);
--static int drm_gem_name_info(char *buf, char **start, off_t offset,
--			     int request, int *eof, void *data);
--static int drm_gem_object_info(char *buf, char **start, off_t offset,
--			       int request, int *eof, void *data);
--#if DRM_DEBUG_CODE
--static int drm_vma_info(char *buf, char **start, off_t offset,
--			int request, int *eof, void *data);
--#endif
-+/***************************************************
-+ * Initialization, etc.
-+ **************************************************/
- 
- /**
-  * Proc file list.
-  */
--static struct drm_proc_list {
--	const char *name;	/**< file name */
--	int (*f) (char *, char **, off_t, int, int *, void *);		/**< proc callback*/
--	u32 driver_features; /**< Required driver features for this entry */
--} drm_proc_list[] = {
-+static struct drm_info_list drm_proc_list[] = {
- 	{"name", drm_name_info, 0},
--	{"mem", drm_mem_info, 0},
- 	{"vm", drm_vm_info, 0},
- 	{"clients", drm_clients_info, 0},
- 	{"queues", drm_queues_info, 0},
- 	{"bufs", drm_bufs_info, 0},
--	{"vblank", drm_vblank_info, 0},
- 	{"gem_names", drm_gem_name_info, DRIVER_GEM},
- 	{"gem_objects", drm_gem_object_info, DRIVER_GEM},
- #if DRM_DEBUG_CODE
--	{"vma", drm_vma_info},
-+	{"vma", drm_vma_info, 0},
- #endif
- };
--
- #define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list)
- 
-+static int drm_proc_open(struct inode *inode, struct file *file)
-+{
-+	struct drm_info_node* node = PDE(inode)->data;
-+
-+	return single_open(file, node->info_ent->show, node);
-+}
-+
-+static const struct file_operations drm_proc_fops = {
-+	.owner = THIS_MODULE,
-+	.open = drm_proc_open,
-+	.read = seq_read,
-+	.llseek = seq_lseek,
-+	.release = single_release,
-+};
-+
-+
- /**
-- * Initialize the DRI proc filesystem for a device.
-+ * Initialize a given set of proc files for a device
-  *
-- * \param dev DRM device.
-- * \param minor device minor number.
-+ * \param files The array of files to create
-+ * \param count The number of files given
-  * \param root DRI proc dir entry.
-- * \param dev_root resulting DRI device proc dir entry.
-- * \return root entry pointer on success, or NULL on failure.
-+ * \param minor device minor number
-+ * \return Zero on success, non-zero on failure
-  *
-- * Create the DRI proc root entry "/proc/dri", the device proc root entry
-- * "/proc/dri/%minor%/", and each entry in proc_list as
-- * "/proc/dri/%minor%/%name%".
-+ * Create a given set of proc files represented by an array of
-+ * gdm_proc_lists in the given root directory.
-  */
--int drm_proc_init(struct drm_minor *minor, int minor_id,
--		  struct proc_dir_entry *root)
-+int drm_proc_create_files(struct drm_info_list *files, int count,
-+			  struct proc_dir_entry *root, struct drm_minor *minor)
- {
- 	struct drm_device *dev = minor->dev;
- 	struct proc_dir_entry *ent;
--	int i, j, ret;
-+	struct drm_info_node *tmp;
- 	char name[64];
-+	int i, ret;
- 
--	sprintf(name, "%d", minor_id);
--	minor->dev_root = proc_mkdir(name, root);
--	if (!minor->dev_root) {
--		DRM_ERROR("Cannot create /proc/dri/%s\n", name);
--		return -1;
--	}
--
--	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
--		u32 features = drm_proc_list[i].driver_features;
-+	for (i = 0; i < count; i++) {
-+		u32 features = files[i].driver_features;
- 
- 		if (features != 0 &&
- 		    (dev->driver->driver_features & features) != features)
- 			continue;
- 
--		ent = create_proc_entry(drm_proc_list[i].name,
--					S_IFREG | S_IRUGO, minor->dev_root);
-+		tmp = drm_alloc(sizeof(struct drm_info_node), _DRM_DRIVER);
-+		ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root);
- 		if (!ent) {
- 			DRM_ERROR("Cannot create /proc/dri/%s/%s\n",
--				  name, drm_proc_list[i].name);
-+				  name, files[i].name);
-+			drm_free(tmp, sizeof(struct drm_info_node),
-+				 _DRM_DRIVER);
- 			ret = -1;
- 			goto fail;
- 		}
--		ent->read_proc = drm_proc_list[i].f;
--		ent->data = minor;
--	}
- 
--	if (dev->driver->proc_init) {
--		ret = dev->driver->proc_init(minor);
--		if (ret) {
--			DRM_ERROR("DRM: Driver failed to initialize "
--				  "/proc/dri.\n");
--			goto fail;
--		}
-+		ent->proc_fops = &drm_proc_fops;
-+		ent->data = tmp;
-+		tmp->minor = minor;
-+		tmp->info_ent = &files[i];
-+		list_add(&(tmp->list), &(minor->proc_nodes.list));
- 	}
--
- 	return 0;
-- fail:
- 
--	for (j = 0; j < i; j++)
--		remove_proc_entry(drm_proc_list[i].name,
--				  minor->dev_root);
--	remove_proc_entry(name, root);
--	minor->dev_root = NULL;
-+fail:
-+	for (i = 0; i < count; i++)
-+		remove_proc_entry(drm_proc_list[i].name, minor->proc_root);
- 	return ret;
- }
- 
- /**
-- * Cleanup the proc filesystem resources.
-+ * Initialize the DRI proc filesystem for a device
-  *
-- * \param minor device minor number.
-+ * \param dev DRM device
-+ * \param minor device minor number
-  * \param root DRI proc dir entry.
-- * \param dev_root DRI device proc dir entry.
-- * \return always zero.
-+ * \param dev_root resulting DRI device proc dir entry.
-+ * \return root entry pointer on success, or NULL on failure.
-  *
-- * Remove all proc entries created by proc_init().
-+ * Create the DRI proc root entry "/proc/dri", the device proc root entry
-+ * "/proc/dri/%minor%/", and each entry in proc_list as
-+ * "/proc/dri/%minor%/%name%".
-  */
--int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root)
-+int drm_proc_init(struct drm_minor *minor, int minor_id,
-+		  struct proc_dir_entry *root)
- {
- 	struct drm_device *dev = minor->dev;
--	int i;
- 	char name[64];
-+	int ret;
- 
--	if (!root || !minor->dev_root)
--		return 0;
--
--	if (dev->driver->proc_cleanup)
--		dev->driver->proc_cleanup(minor);
--
--	for (i = 0; i < DRM_PROC_ENTRIES; i++)
--		remove_proc_entry(drm_proc_list[i].name, minor->dev_root);
--	sprintf(name, "%d", minor->index);
--	remove_proc_entry(name, root);
--
--	return 0;
--}
--
--/**
-- * Called when "/proc/dri/.../name" is read.
-- *
-- * \param buf output buffer.
-- * \param start start of output data.
-- * \param offset requested start offset.
-- * \param request requested number of bytes.
-- * \param eof whether there is no more data to return.
-- * \param data private data.
-- * \return number of written bytes.
-- *
-- * Prints the device name together with the bus id if available.
-- */
--static int drm_name_info(char *buf, char **start, off_t offset, int request,
--			 int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_master *master = minor->master;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
--	}
--
--	if (!master)
--		return 0;
--
--	*start = &buf[offset];
--	*eof = 0;
--
--	if (master->unique) {
--		DRM_PROC_PRINT("%s %s %s\n",
--			       dev->driver->pci_driver.name,
--			       pci_name(dev->pdev), master->unique);
--	} else {
--		DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name,
--			       pci_name(dev->pdev));
-+	INIT_LIST_HEAD(&minor->proc_nodes.list);
-+	sprintf(name, "%d", minor_id);
-+	minor->proc_root = proc_mkdir(name, root);
-+	if (!minor->proc_root) {
-+		DRM_ERROR("Cannot create /proc/dri/%s\n", name);
-+		return -1;
- 	}
- 
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--/**
-- * Called when "/proc/dri/.../vm" is read.
-- *
-- * \param buf output buffer.
-- * \param start start of output data.
-- * \param offset requested start offset.
-- * \param request requested number of bytes.
-- * \param eof whether there is no more data to return.
-- * \param data private data.
-- * \return number of written bytes.
-- *
-- * Prints information about all mappings in drm_device::maplist.
-- */
--static int drm__vm_info(char *buf, char **start, off_t offset, int request,
--			int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--	struct drm_map *map;
--	struct drm_map_list *r_list;
--
--	/* Hardcoded from _DRM_FRAME_BUFFER,
--	   _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
--	   _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
--	const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
--	const char *type;
--	int i;
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
-+	ret = drm_proc_create_files(drm_proc_list, DRM_PROC_ENTRIES,
-+				    minor->proc_root, minor);
-+	if (ret) {
-+		remove_proc_entry(name, root);
-+		minor->proc_root = NULL;
-+		DRM_ERROR("Failed to create core drm proc files\n");
-+		return ret;
- 	}
- 
--	*start = &buf[offset];
--	*eof = 0;
--
--	DRM_PROC_PRINT("slot	 offset	      size type flags	 "
--		       "address mtrr\n\n");
--	i = 0;
--	list_for_each_entry(r_list, &dev->maplist, head) {
--		map = r_list->map;
--		if (!map)
--			continue;
--		if (map->type < 0 || map->type > 5)
--			type = "??";
--		else
--			type = types[map->type];
--		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
--			       i,
--			       map->offset,
--			       map->size, type, map->flags,
--			       (unsigned long) r_list->user_token);
--		if (map->mtrr < 0) {
--			DRM_PROC_PRINT("none\n");
--		} else {
--			DRM_PROC_PRINT("%4d\n", map->mtrr);
-+	if (dev->driver->proc_init) {
-+		ret = dev->driver->proc_init(minor);
-+		if (ret) {
-+			DRM_ERROR("DRM: Driver failed to initialize "
-+				  "/proc/dri.\n");
-+			return ret;
- 		}
--		i++;
--	}
--
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--/**
-- * Simply calls _vm_info() while holding the drm_device::struct_mutex lock.
-- */
--static int drm_vm_info(char *buf, char **start, off_t offset, int request,
--		       int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int ret;
--
--	mutex_lock(&dev->struct_mutex);
--	ret = drm__vm_info(buf, start, offset, request, eof, data);
--	mutex_unlock(&dev->struct_mutex);
--	return ret;
--}
--
--/**
-- * Called when "/proc/dri/.../queues" is read.
-- *
-- * \param buf output buffer.
-- * \param start start of output data.
-- * \param offset requested start offset.
-- * \param request requested number of bytes.
-- * \param eof whether there is no more data to return.
-- * \param data private data.
-- * \return number of written bytes.
-- */
--static int drm__queues_info(char *buf, char **start, off_t offset,
--			    int request, int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--	int i;
--	struct drm_queue *q;
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
- 	}
--
--	*start = &buf[offset];
--	*eof = 0;
--
--	DRM_PROC_PRINT("  ctx/flags   use   fin"
--		       "   blk/rw/rwf  wait    flushed	   queued"
--		       "      locks\n\n");
--	for (i = 0; i < dev->queue_count; i++) {
--		q = dev->queuelist[i];
--		atomic_inc(&q->use_count);
--		DRM_PROC_PRINT_RET(atomic_dec(&q->use_count),
--				   "%5d/0x%03x %5d %5d"
--				   " %5d/%c%c/%c%c%c %5Zd\n",
--				   i,
--				   q->flags,
--				   atomic_read(&q->use_count),
--				   atomic_read(&q->finalization),
--				   atomic_read(&q->block_count),
--				   atomic_read(&q->block_read) ? 'r' : '-',
--				   atomic_read(&q->block_write) ? 'w' : '-',
--				   waitqueue_active(&q->read_queue) ? 'r' : '-',
--				   waitqueue_active(&q->
--						    write_queue) ? 'w' : '-',
--				   waitqueue_active(&q->
--						    flush_queue) ? 'f' : '-',
--				   DRM_BUFCOUNT(&q->waitlist));
--		atomic_dec(&q->use_count);
--	}
--
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--/**
-- * Simply calls _queues_info() while holding the drm_device::struct_mutex lock.
-- */
--static int drm_queues_info(char *buf, char **start, off_t offset, int request,
--			   int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int ret;
--
--	mutex_lock(&dev->struct_mutex);
--	ret = drm__queues_info(buf, start, offset, request, eof, data);
--	mutex_unlock(&dev->struct_mutex);
--	return ret;
-+	return 0;
- }
- 
--/**
-- * Called when "/proc/dri/.../bufs" is read.
-- *
-- * \param buf output buffer.
-- * \param start start of output data.
-- * \param offset requested start offset.
-- * \param request requested number of bytes.
-- * \param eof whether there is no more data to return.
-- * \param data private data.
-- * \return number of written bytes.
-- */
--static int drm__bufs_info(char *buf, char **start, off_t offset, int request,
--			  int *eof, void *data)
-+int drm_proc_remove_files(struct drm_info_list *files, int count,
-+			  struct drm_minor *minor)
- {
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--	struct drm_device_dma *dma = dev->dma;
-+	struct list_head *pos, *q;
-+	struct drm_info_node *tmp;
- 	int i;
- 
--	if (!dma || offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
--	}
--
--	*start = &buf[offset];
--	*eof = 0;
--
--	DRM_PROC_PRINT(" o     size count  free	 segs pages    kB\n\n");
--	for (i = 0; i <= DRM_MAX_ORDER; i++) {
--		if (dma->bufs[i].buf_count)
--			DRM_PROC_PRINT("%2d %8d %5d %5d %5d %5d %5ld\n",
--				       i,
--				       dma->bufs[i].buf_size,
--				       dma->bufs[i].buf_count,
--				       atomic_read(&dma->bufs[i]
--						   .freelist.count),
--				       dma->bufs[i].seg_count,
--				       dma->bufs[i].seg_count
--				       * (1 << dma->bufs[i].page_order),
--				       (dma->bufs[i].seg_count
--					* (1 << dma->bufs[i].page_order))
--				       * PAGE_SIZE / 1024);
--	}
--	DRM_PROC_PRINT("\n");
--	for (i = 0; i < dma->buf_count; i++) {
--		if (i && !(i % 32))
--			DRM_PROC_PRINT("\n");
--		DRM_PROC_PRINT(" %d", dma->buflist[i]->list);
-+	for (i = 0; i < count; i++) {
-+		list_for_each_safe(pos, q, &minor->proc_nodes.list) {
-+			tmp = list_entry(pos, struct drm_info_node, list);
-+			if (tmp->info_ent == &files[i]) {
-+				remove_proc_entry(files[i].name,
-+						  minor->proc_root);
-+				list_del(pos);
-+				drm_free(tmp, sizeof(struct drm_info_node),
-+					 _DRM_DRIVER);
-+			}
-+		}
- 	}
--	DRM_PROC_PRINT("\n");
--
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--/**
-- * Simply calls _bufs_info() while holding the drm_device::struct_mutex lock.
-- */
--static int drm_bufs_info(char *buf, char **start, off_t offset, int request,
--			 int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int ret;
--
--	mutex_lock(&dev->struct_mutex);
--	ret = drm__bufs_info(buf, start, offset, request, eof, data);
--	mutex_unlock(&dev->struct_mutex);
--	return ret;
-+	return 0;
- }
- 
- /**
-- * Called when "/proc/dri/.../vblank" is read.
-+ * Cleanup the proc filesystem resources.
-  *
-- * \param buf output buffer.
-- * \param start start of output data.
-- * \param offset requested start offset.
-- * \param request requested number of bytes.
-- * \param eof whether there is no more data to return.
-- * \param data private data.
-- * \return number of written bytes.
-- */
--static int drm__vblank_info(char *buf, char **start, off_t offset, int request,
--			  int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--	int crtc;
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
--	}
--
--	*start = &buf[offset];
--	*eof = 0;
--
--	for (crtc = 0; crtc < dev->num_crtcs; crtc++) {
--		DRM_PROC_PRINT("CRTC %d enable:     %d\n",
--			       crtc, atomic_read(&dev->vblank_refcount[crtc]));
--		DRM_PROC_PRINT("CRTC %d counter:    %d\n",
--			       crtc, drm_vblank_count(dev, crtc));
--		DRM_PROC_PRINT("CRTC %d last wait:  %d\n",
--			       crtc, dev->last_vblank_wait[crtc]);
--		DRM_PROC_PRINT("CRTC %d in modeset: %d\n",
--			       crtc, dev->vblank_inmodeset[crtc]);
--	}
--
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--/**
-- * Simply calls _vblank_info() while holding the drm_device::struct_mutex lock.
-- */
--static int drm_vblank_info(char *buf, char **start, off_t offset, int request,
--			 int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int ret;
--
--	mutex_lock(&dev->struct_mutex);
--	ret = drm__vblank_info(buf, start, offset, request, eof, data);
--	mutex_unlock(&dev->struct_mutex);
--	return ret;
--}
--
--/**
-- * Called when "/proc/dri/.../clients" is read.
-+ * \param minor device minor number.
-+ * \param root DRI proc dir entry.
-+ * \param dev_root DRI device proc dir entry.
-+ * \return always zero.
-  *
-- * \param buf output buffer.
-- * \param start start of output data.
-- * \param offset requested start offset.
-- * \param request requested number of bytes.
-- * \param eof whether there is no more data to return.
-- * \param data private data.
-- * \return number of written bytes.
-+ * Remove all proc entries created by proc_init().
-  */
--static int drm__clients_info(char *buf, char **start, off_t offset,
--			     int request, int *eof, void *data)
-+int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root)
- {
--	struct drm_minor *minor = (struct drm_minor *) data;
- 	struct drm_device *dev = minor->dev;
--	int len = 0;
--	struct drm_file *priv;
-+	char name[64];
- 
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
-+	if (!root || !minor->proc_root)
- 		return 0;
--	}
--
--	*start = &buf[offset];
--	*eof = 0;
- 
--	DRM_PROC_PRINT("a dev	pid    uid	magic	  ioctls\n\n");
--	list_for_each_entry(priv, &dev->filelist, lhead) {
--		DRM_PROC_PRINT("%c %3d %5d %5d %10u %10lu\n",
--			       priv->authenticated ? 'y' : 'n',
--			       priv->minor->index,
--			       priv->pid,
--			       priv->uid, priv->magic, priv->ioctl_count);
--	}
--
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--/**
-- * Simply calls _clients_info() while holding the drm_device::struct_mutex lock.
-- */
--static int drm_clients_info(char *buf, char **start, off_t offset,
--			    int request, int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int ret;
--
--	mutex_lock(&dev->struct_mutex);
--	ret = drm__clients_info(buf, start, offset, request, eof, data);
--	mutex_unlock(&dev->struct_mutex);
--	return ret;
--}
--
--struct drm_gem_name_info_data {
--       int                     len;
--       char                    *buf;
--       int                     eof;
--};
-+	if (dev->driver->proc_cleanup)
-+		dev->driver->proc_cleanup(minor);
- 
--static int drm_gem_one_name_info(int id, void *ptr, void *data)
--{
--	struct drm_gem_object *obj = ptr;
--	struct drm_gem_name_info_data   *nid = data;
-+	drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor);
- 
--	DRM_INFO("name %d size %zd\n", obj->name, obj->size);
--	if (nid->eof)
--		return 0;
-+	sprintf(name, "%d", minor->index);
-+	remove_proc_entry(name, root);
- 
--	nid->len += sprintf(&nid->buf[nid->len],
--			    "%6d %8zd %7d %8d\n",
--			    obj->name, obj->size,
--			    atomic_read(&obj->handlecount.refcount),
--			    atomic_read(&obj->refcount.refcount));
--	if (nid->len > DRM_PROC_LIMIT) {
--		nid->eof = 1;
--		return 0;
--	}
- 	return 0;
- }
- 
--static int drm_gem_name_info(char *buf, char **start, off_t offset,
--			     int request, int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	struct drm_gem_name_info_data nid;
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
--	}
--
--	nid.len = sprintf(buf, "  name     size handles refcount\n");
--	nid.buf = buf;
--	nid.eof = 0;
--	idr_for_each(&dev->object_name_idr, drm_gem_one_name_info, &nid);
--
--	*start = &buf[offset];
--	*eof = 0;
--	if (nid.len > request + offset)
--		return request;
--	*eof = 1;
--	return nid.len - offset;
--}
--
--static int drm_gem_object_info(char *buf, char **start, off_t offset,
--			       int request, int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
--	}
--
--	*start = &buf[offset];
--	*eof = 0;
--	DRM_PROC_PRINT("%d objects\n", atomic_read(&dev->object_count));
--	DRM_PROC_PRINT("%d object bytes\n", atomic_read(&dev->object_memory));
--	DRM_PROC_PRINT("%d pinned\n", atomic_read(&dev->pin_count));
--	DRM_PROC_PRINT("%d pin bytes\n", atomic_read(&dev->pin_memory));
--	DRM_PROC_PRINT("%d gtt bytes\n", atomic_read(&dev->gtt_memory));
--	DRM_PROC_PRINT("%d gtt total\n", dev->gtt_total);
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--#if DRM_DEBUG_CODE
--
--static int drm__vma_info(char *buf, char **start, off_t offset, int request,
--			 int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int len = 0;
--	struct drm_vma_entry *pt;
--	struct vm_area_struct *vma;
--#if defined(__i386__)
--	unsigned int pgprot;
--#endif
--
--	if (offset > DRM_PROC_LIMIT) {
--		*eof = 1;
--		return 0;
--	}
--
--	*start = &buf[offset];
--	*eof = 0;
--
--	DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%llx\n",
--		       atomic_read(&dev->vma_count),
--		       high_memory, (u64)virt_to_phys(high_memory));
--	list_for_each_entry(pt, &dev->vmalist, head) {
--		if (!(vma = pt->vma))
--			continue;
--		DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000",
--			       pt->pid,
--			       vma->vm_start,
--			       vma->vm_end,
--			       vma->vm_flags & VM_READ ? 'r' : '-',
--			       vma->vm_flags & VM_WRITE ? 'w' : '-',
--			       vma->vm_flags & VM_EXEC ? 'x' : '-',
--			       vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
--			       vma->vm_flags & VM_LOCKED ? 'l' : '-',
--			       vma->vm_flags & VM_IO ? 'i' : '-',
--			       vma->vm_pgoff);
--
--#if defined(__i386__)
--		pgprot = pgprot_val(vma->vm_page_prot);
--		DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
--			       pgprot & _PAGE_PRESENT ? 'p' : '-',
--			       pgprot & _PAGE_RW ? 'w' : 'r',
--			       pgprot & _PAGE_USER ? 'u' : 's',
--			       pgprot & _PAGE_PWT ? 't' : 'b',
--			       pgprot & _PAGE_PCD ? 'u' : 'c',
--			       pgprot & _PAGE_ACCESSED ? 'a' : '-',
--			       pgprot & _PAGE_DIRTY ? 'd' : '-',
--			       pgprot & _PAGE_PSE ? 'm' : 'k',
--			       pgprot & _PAGE_GLOBAL ? 'g' : 'l');
--#endif
--		DRM_PROC_PRINT("\n");
--	}
--
--	if (len > request + offset)
--		return request;
--	*eof = 1;
--	return len - offset;
--}
--
--static int drm_vma_info(char *buf, char **start, off_t offset, int request,
--			int *eof, void *data)
--{
--	struct drm_minor *minor = (struct drm_minor *) data;
--	struct drm_device *dev = minor->dev;
--	int ret;
--
--	mutex_lock(&dev->struct_mutex);
--	ret = drm__vma_info(buf, start, offset, request, eof, data);
--	mutex_unlock(&dev->struct_mutex);
--	return ret;
--}
--#endif
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -194,6 +194,7 @@ const char *print_tainted(void)
- 
- 	return buf;
- }
-+EXPORT_SYMBOL(print_tainted);
- 
- int test_taint(unsigned flag)
- {
---- a/drivers/media/dvb/dvb-usb/Kconfig
-+++ b/drivers/media/dvb/dvb-usb/Kconfig
-@@ -235,8 +239,8 @@ config DVB_USB_OPERA1
- 	tristate "Afatech AF9005 DVB-T USB1.1 support"
- 	depends on DVB_USB && EXPERIMENTAL
- 	depends on 0
--	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
--	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
-+	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
-+	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
- 	help
- 	  Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
- 	  and the TerraTec Cinergy T USB XE (Rev.1)
---- a/include/linux/intel-iommu.h	2009-03-23 23:12:14.000000000 +0000
-+++ b/include/linux/intel-iommu.h	2009-04-11 17:05:51.000000000 +0100
-@@ -322,6 +332,7 @@
- extern void free_iommu(struct intel_iommu *iommu);
- extern int dmar_enable_qi(struct intel_iommu *iommu);
- extern void dmar_disable_qi(struct intel_iommu *iommu);
-+extern int dmar_reenable_qi(struct intel_iommu *iommu);
- extern void qi_global_iec(struct intel_iommu *iommu);
- 
- extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
---- a/arch/x86/kernel/cpu/mtrr/generic.c	2009-04-12 21:06:32.000000000 +0100
-+++ b/arch/x86/kernel/cpu/mtrr/generic.c	2009-04-12 21:14:30.000000000 +0100
-@@ -59,32 +59,6 @@
- 	}
- }
- 
--/**
-- * BIOS is expected to clear MtrrFixDramModEn bit, see for example
-- * "BIOS and Kernel Developer's Guide for the AMD Athlon 64 and AMD
-- * Opteron Processors" (26094 Rev. 3.30 February 2006), section
-- * "13.2.1.2 SYSCFG Register": "The MtrrFixDramModEn bit should be set
-- * to 1 during BIOS initalization of the fixed MTRRs, then cleared to
-- * 0 for operation."
-- */
--static inline void k8_check_syscfg_dram_mod_en(void)
--{
--	u32 lo, hi;
--
--	if (!((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&
--	      (boot_cpu_data.x86 >= 0x0f)))
--		return;
--
--	rdmsr(MSR_K8_SYSCFG, lo, hi);
--	if (lo & K8_MTRRFIXRANGE_DRAM_MODIFY) {
--		printk(KERN_ERR FW_WARN "MTRR: CPU %u: SYSCFG[MtrrFixDramModEn]"
--		       " not cleared by BIOS, clearing this bit\n",
--		       smp_processor_id());
--		lo &= ~K8_MTRRFIXRANGE_DRAM_MODIFY;
--		mtrr_wrmsr(MSR_K8_SYSCFG, lo, hi);
--	}
--}
--
- /*
-  * Returns the effective MTRR type for the region
-  * Error returns:
---- linux-2.6.29.x86_64/drivers/pci/dmar.c.orig	2009-04-12 21:24:15.000000000 +0100
-+++ linux-2.6.29.x86_64/drivers/pci/dmar.c	2009-04-12 22:13:45.000000000 +0100
-@@ -763,42 +763,6 @@
- }
- 
- /*
-- * Disable Queued Invalidation interface.
-- */
--void dmar_disable_qi(struct intel_iommu *iommu)
--{
--	unsigned long flags;
--	u32 sts;
--	cycles_t start_time = get_cycles();
--
--	if (!ecap_qis(iommu->ecap))
--		return;
--
--	spin_lock_irqsave(&iommu->register_lock, flags);
--
--	sts =  dmar_readq(iommu->reg + DMAR_GSTS_REG);
--	if (!(sts & DMA_GSTS_QIES))
--		goto end;
--
--	/*
--	 * Give a chance to HW to complete the pending invalidation requests.
--	 */
--	while ((readl(iommu->reg + DMAR_IQT_REG) !=
--		readl(iommu->reg + DMAR_IQH_REG)) &&
--		(DMAR_OPERATION_TIMEOUT > (get_cycles() - start_time)))
--		cpu_relax();
--
--	iommu->gcmd &= ~DMA_GCMD_QIE;
--
--	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
--
--	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl,
--		      !(sts & DMA_GSTS_QIES), sts);
--end:
--	spin_unlock_irqrestore(&iommu->register_lock, flags);
--}
--
--/*
-  * Enable queued invalidation.
-  */
- static void __dmar_enable_qi(struct intel_iommu *iommu)
-@@ -932,172 +896,6 @@
- };
- #define MAX_FAULT_REASON_IDX 	(ARRAY_SIZE(fault_reason_strings) - 1)
- 
--const char *dmar_get_fault_reason(u8 fault_reason)
--{
--	if (fault_reason > MAX_FAULT_REASON_IDX)
--		return "Unknown";
--	else
--		return fault_reason_strings[fault_reason];
--}
--
--void dmar_msi_unmask(unsigned int irq)
--{
--	struct intel_iommu *iommu = get_irq_data(irq);
--	unsigned long flag;
--
--	/* unmask it */
--	spin_lock_irqsave(&iommu->register_lock, flag);
--	writel(0, iommu->reg + DMAR_FECTL_REG);
--	/* Read a reg to force flush the post write */
--	readl(iommu->reg + DMAR_FECTL_REG);
--	spin_unlock_irqrestore(&iommu->register_lock, flag);
--}
--
--void dmar_msi_mask(unsigned int irq)
--{
--	unsigned long flag;
--	struct intel_iommu *iommu = get_irq_data(irq);
--
--	/* mask it */
--	spin_lock_irqsave(&iommu->register_lock, flag);
--	writel(DMA_FECTL_IM, iommu->reg + DMAR_FECTL_REG);
--	/* Read a reg to force flush the post write */
--	readl(iommu->reg + DMAR_FECTL_REG);
--	spin_unlock_irqrestore(&iommu->register_lock, flag);
--}
--
--void dmar_msi_write(int irq, struct msi_msg *msg)
--{
--	struct intel_iommu *iommu = get_irq_data(irq);
--	unsigned long flag;
--
--	spin_lock_irqsave(&iommu->register_lock, flag);
--	writel(msg->data, iommu->reg + DMAR_FEDATA_REG);
--	writel(msg->address_lo, iommu->reg + DMAR_FEADDR_REG);
--	writel(msg->address_hi, iommu->reg + DMAR_FEUADDR_REG);
--	spin_unlock_irqrestore(&iommu->register_lock, flag);
--}
--
--void dmar_msi_read(int irq, struct msi_msg *msg)
--{
--	struct intel_iommu *iommu = get_irq_data(irq);
--	unsigned long flag;
--
--	spin_lock_irqsave(&iommu->register_lock, flag);
--	msg->data = readl(iommu->reg + DMAR_FEDATA_REG);
--	msg->address_lo = readl(iommu->reg + DMAR_FEADDR_REG);
--	msg->address_hi = readl(iommu->reg + DMAR_FEUADDR_REG);
--	spin_unlock_irqrestore(&iommu->register_lock, flag);
--}
--
--static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
--		u8 fault_reason, u16 source_id, unsigned long long addr)
--{
--	const char *reason;
--
--	reason = dmar_get_fault_reason(fault_reason);
--
--	printk(KERN_ERR
--		"DMAR:[%s] Request device [%02x:%02x.%d] "
--		"fault addr %llx \n"
--		"DMAR:[fault reason %02d] %s\n",
--		(type ? "DMA Read" : "DMA Write"),
--		(source_id >> 8), PCI_SLOT(source_id & 0xFF),
--		PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
--	return 0;
--}
--
--#define PRIMARY_FAULT_REG_LEN (16)
--irqreturn_t dmar_fault(int irq, void *dev_id)
--{
--	struct intel_iommu *iommu = dev_id;
--	int reg, fault_index;
--	u32 fault_status;
--	unsigned long flag;
--
--	spin_lock_irqsave(&iommu->register_lock, flag);
--	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
--
--	/* TBD: ignore advanced fault log currently */
--	if (!(fault_status & DMA_FSTS_PPF))
--		goto clear_overflow;
--
--	fault_index = dma_fsts_fault_record_index(fault_status);
--	reg = cap_fault_reg_offset(iommu->cap);
--	while (1) {
--		u8 fault_reason;
--		u16 source_id;
--		u64 guest_addr;
--		int type;
--		u32 data;
--
--		/* highest 32 bits */
--		data = readl(iommu->reg + reg +
--				fault_index * PRIMARY_FAULT_REG_LEN + 12);
--		if (!(data & DMA_FRCD_F))
--			break;
--
--		fault_reason = dma_frcd_fault_reason(data);
--		type = dma_frcd_type(data);
--
--		data = readl(iommu->reg + reg +
--				fault_index * PRIMARY_FAULT_REG_LEN + 8);
--		source_id = dma_frcd_source_id(data);
--
--		guest_addr = dmar_readq(iommu->reg + reg +
--				fault_index * PRIMARY_FAULT_REG_LEN);
--		guest_addr = dma_frcd_page_addr(guest_addr);
--		/* clear the fault */
--		writel(DMA_FRCD_F, iommu->reg + reg +
--			fault_index * PRIMARY_FAULT_REG_LEN + 12);
--
--		spin_unlock_irqrestore(&iommu->register_lock, flag);
--
--		dmar_fault_do_one(iommu, type, fault_reason,
--				source_id, guest_addr);
--
--		fault_index++;
--		if (fault_index > cap_num_fault_regs(iommu->cap))
--			fault_index = 0;
--		spin_lock_irqsave(&iommu->register_lock, flag);
--	}
--clear_overflow:
--	/* clear primary fault overflow */
--	fault_status = readl(iommu->reg + DMAR_FSTS_REG);
--	if (fault_status & DMA_FSTS_PFO)
--		writel(DMA_FSTS_PFO, iommu->reg + DMAR_FSTS_REG);
--
--	spin_unlock_irqrestore(&iommu->register_lock, flag);
--	return IRQ_HANDLED;
--}
--
--int dmar_set_interrupt(struct intel_iommu *iommu)
--{
--	int irq, ret;
--
--	irq = create_irq();
--	if (!irq) {
--		printk(KERN_ERR "IOMMU: no free vectors\n");
--		return -EINVAL;
--	}
--
--	set_irq_data(irq, iommu);
--	iommu->irq = irq;
--
--	ret = arch_setup_dmar_msi(irq);
--	if (ret) {
--		set_irq_data(irq, NULL);
--		iommu->irq = 0;
--		destroy_irq(irq);
--		return 0;
--	}
--
--	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);
--	if (ret)
--		printk(KERN_ERR "IOMMU: can't request irq\n");
--	return ret;
--}
--
- /*
-  * Re-enable Queued Invalidation interface.
-  */
---- vanilla-2.6.29/kernel/sched.c	2009-03-23 23:12:14.000000000 +0000
-+++ linux.temp/kernel/sched.c	2009-04-14 21:42:33.000000000 +0100
-@@ -4134,9 +4134,25 @@
- EXPORT_PER_CPU_SYMBOL(kstat);
- 
- /*
-- * Return any ns on the sched_clock that have not yet been banked in
-+ * Return any ns on the sched_clock that have not yet been accounted in
-  * @p in case that task is currently running.
-+ *
-+ * Called with task_rq_lock() held on @rq.
-  */
-+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
-+{
-+	u64 ns = 0;
-+
-+	if (task_current(rq, p)) {
-+		update_rq_clock(rq);
-+		ns = rq->clock - p->se.exec_start;
-+		if ((s64)ns < 0)
-+			ns = 0;
-+	}
-+
-+	return ns;
-+}
-+
- unsigned long long task_delta_exec(struct task_struct *p)
- {
- 	unsigned long flags;
+--- a/include/linux/init_task.h	2009-04-23 20:13:50.000000000 +0100
++++ b/include/linux/init_task.h	2009-04-24 20:47:17.000000000 +0100
+@@ -170,6 +170,7 @@
+ 		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
+ 	},								\
+ 	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
++	INIT_UTRACE(tsk)						\
+ 	INIT_IDS							\
+ 	INIT_PERF_COUNTERS(tsk)						\
+ 	INIT_TRACE_IRQFLAGS						\
 --- a/localversion-tip	2009-02-17 19:49:34.000000000 +0000
 +++ /dev/null	2009-02-17 18:08:14.005240123 +0000
 @@ -1 +0,0 @@

xen.pvops.pre.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1.2.9 -r 1.1.2.10 xen.pvops.pre.patch
Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- xen.pvops.pre.patch	14 Apr 2009 22:09:26 -0000	1.1.2.9
+++ xen.pvops.pre.patch	24 Apr 2009 22:27:21 -0000	1.1.2.10
@@ -1,2184 +1,98 @@
 temporarily revert various Fedora changes so that the pvops patch applies cleanly
 Affected patches;
-drm-modesetting-radeon.patch - arch/x86/mm/pat.c
-linux-2.6-debug-nmi-timeout.patch - arch/x86/kernel/nmi.c (moved to arch/x86/kernel/apic/nmi.c)
+more linux-2.6-execshield.patch - arch/x86/mm/init.c arch/x86/mm/init_32.c include/linux/sched.h mm/mmap.c
 linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h
-drm-next.patch - drivers/gpu/drm/drm_proc.c
-linux-2.6-debug-taint-vm.patch - kernel/panic.c
-linux-2.6-v4l-dvb-update.patch - drivers/media/dvb/dvb-usb/Kconfig
-linux-2.6.29-pat-fixes.patch - arch/x86/pci/i386.c include/linux/mm.h mm/memory.c
-drm-next.patch - include/drm/drm.h include/drm/drm_mode.h include/drm/i915_drm.h include/drm/mga_drm.h include/drm/radeon_drm.h include/drm/via_drm.h include/linux/dvb/audio.h
-linux-2.6-iommu-fixes.patch - drivers/pci/dmar.c drivers/pci/intel-iommu.c drivers/pci/intr_remapping.c include/linux/dmar.h include/linux/intel-iommu.h
-linux-2.6-posix-timers-fix-clock-monotonicity.patch - kernel/sched.c
+linux-2.6-utrace.patch - include/linux/init_task.h
 
---- a/arch/x86/mm/pat.c	2009-02-14 12:49:46.000000000 +0000
-+++ b/arch/x86/mm/pat.c	2009-02-14 09:16:34.000000000 +0000
-@@ -30,7 +29,6 @@
- 
- #ifdef CONFIG_X86_PAT
- int __read_mostly pat_enabled = 1;
--EXPORT_SYMBOL_GPL(pat_enabled);
- 
- void __cpuinit pat_disable(char *reason)
- {
---- a/arch/x86/kernel/nmi.c	2009-02-18 20:51:13.000000000 +0000
-+++ b/arch/x86/kernel/nmi.c	2009-02-17 20:51:37.000000000 +0000
-@@ -442,7 +442,7 @@
- 		 * wait a few IRQs (5 seconds) before doing the oops ...
- 		 */
- 		local_inc(&__get_cpu_var(alert_counter));
--		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
-+		if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
- 			/*
- 			 * die_nmi will return ONLY if NOTIFY_STOP happens..
- 			 */
---- a/drivers/pci/pci.h	2009-02-25 20:40:21.000000000 +0000
-+++ b/drivers/pci/pci.h	2009-02-25 20:16:13.000000000 +0000
-@@ -111,11 +111,9 @@
- 
- #ifdef CONFIG_PCI_MSI
- void pci_no_msi(void);
--void pci_yes_msi(void);
- extern void pci_msi_init_pci_dev(struct pci_dev *dev);
- #else
- static inline void pci_no_msi(void) { }
--static inline void pci_yes_msi(void) { }
- static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
+--- a/arch/x86/mm/init.c	2009-04-24 20:27:42.000000000 +0100
++++ b/arch/x86/mm/init.c	2009-04-23 20:13:34.000000000 +0100
+@@ -163,11 +163,7 @@
+ 	set_nx();
+ 	if (nx_enabled)
+ 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
+-	else
  #endif
- 
---- a/drivers/gpu/drm/drm_proc.c	2009-03-04 18:43:07.000000000 +0000
-+++ b/drivers/gpu/drm/drm_proc.c	2009-03-04 18:35:48.000000000 +0000
-@@ -37,195 +37,697 @@
-  * OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
--#include <linux/seq_file.h>
- #include "drmP.h"
- 
--/***************************************************
-- * Initialization, etc.
-- **************************************************/
-+static int drm_name_info(char *buf, char **start, off_t offset,
-+			 int request, int *eof, void *data);
-+static int drm_vm_info(char *buf, char **start, off_t offset,
-+		       int request, int *eof, void *data);
-+static int drm_clients_info(char *buf, char **start, off_t offset,
-+			    int request, int *eof, void *data);
-+static int drm_queues_info(char *buf, char **start, off_t offset,
-+			   int request, int *eof, void *data);
-+static int drm_bufs_info(char *buf, char **start, off_t offset,
-+			 int request, int *eof, void *data);
-+static int drm_vblank_info(char *buf, char **start, off_t offset,
-+			   int request, int *eof, void *data);
-+static int drm_gem_name_info(char *buf, char **start, off_t offset,
-+			     int request, int *eof, void *data);
-+static int drm_gem_object_info(char *buf, char **start, off_t offset,
-+			       int request, int *eof, void *data);
-+#if DRM_DEBUG_CODE
-+static int drm_vma_info(char *buf, char **start, off_t offset,
-+			int request, int *eof, void *data);
-+#endif
- 
- /**
-  * Proc file list.
-  */
--static struct drm_info_list drm_proc_list[] = {
-+static struct drm_proc_list {
-+	const char *name;	/**< file name */
-+	int (*f) (char *, char **, off_t, int, int *, void *);		/**< proc callback*/
-+	u32 driver_features; /**< Required driver features for this entry */
-+} drm_proc_list[] = {
- 	{"name", drm_name_info, 0},
-+	{"mem", drm_mem_info, 0},
- 	{"vm", drm_vm_info, 0},
- 	{"clients", drm_clients_info, 0},
- 	{"queues", drm_queues_info, 0},
- 	{"bufs", drm_bufs_info, 0},
-+	{"vblank", drm_vblank_info, 0},
- 	{"gem_names", drm_gem_name_info, DRIVER_GEM},
- 	{"gem_objects", drm_gem_object_info, DRIVER_GEM},
- #if DRM_DEBUG_CODE
--	{"vma", drm_vma_info, 0},
-+	{"vma", drm_vma_info},
- #endif
- };
--#define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list)
--
--static int drm_proc_open(struct inode *inode, struct file *file)
--{
--	struct drm_info_node* node = PDE(inode)->data;
--
--	return single_open(file, node->info_ent->show, node);
--}
--
--static const struct file_operations drm_proc_fops = {
--	.owner = THIS_MODULE,
--	.open = drm_proc_open,
--	.read = seq_read,
--	.llseek = seq_lseek,
--	.release = single_release,
--};
- 
-+#define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list)
- 
- /**
-- * Initialize a given set of proc files for a device
-+ * Initialize the DRI proc filesystem for a device.
-  *
-- * \param files The array of files to create
-- * \param count The number of files given
-+ * \param dev DRM device.
-+ * \param minor device minor number.
-  * \param root DRI proc dir entry.
-- * \param minor device minor number
-- * \return Zero on success, non-zero on failure
-+ * \param dev_root resulting DRI device proc dir entry.
-+ * \return root entry pointer on success, or NULL on failure.
-  *
-- * Create a given set of proc files represented by an array of
-- * gdm_proc_lists in the given root directory.
-+ * Create the DRI proc root entry "/proc/dri", the device proc root entry
-+ * "/proc/dri/%minor%/", and each entry in proc_list as
-+ * "/proc/dri/%minor%/%name%".
-  */
--int drm_proc_create_files(struct drm_info_list *files, int count,
--			  struct proc_dir_entry *root, struct drm_minor *minor)
-+int drm_proc_init(struct drm_minor *minor, int minor_id,
-+		  struct proc_dir_entry *root)
- {
- 	struct drm_device *dev = minor->dev;
- 	struct proc_dir_entry *ent;
--	struct drm_info_node *tmp;
-+	int i, j, ret;
- 	char name[64];
--	int i, ret;
- 
--	for (i = 0; i < count; i++) {
--		u32 features = files[i].driver_features;
-+	sprintf(name, "%d", minor_id);
-+	minor->dev_root = proc_mkdir(name, root);
-+	if (!minor->dev_root) {
-+		DRM_ERROR("Cannot create /proc/dri/%s\n", name);
-+		return -1;
-+	}
-+
-+	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
-+		u32 features = drm_proc_list[i].driver_features;
- 
- 		if (features != 0 &&
- 		    (dev->driver->driver_features & features) != features)
- 			continue;
- 
--		tmp = drm_alloc(sizeof(struct drm_info_node), _DRM_DRIVER);
--		ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root);
-+		ent = create_proc_entry(drm_proc_list[i].name,
-+					S_IFREG | S_IRUGO, minor->dev_root);
- 		if (!ent) {
- 			DRM_ERROR("Cannot create /proc/dri/%s/%s\n",
--				  name, files[i].name);
--			drm_free(tmp, sizeof(struct drm_info_node),
--				 _DRM_DRIVER);
-+				  name, drm_proc_list[i].name);
- 			ret = -1;
[...1874 lines suppressed...]
-+{
-+	int irq, ret;
-+
-+	irq = create_irq();
-+	if (!irq) {
-+		printk(KERN_ERR "IOMMU: no free vectors\n");
-+		return -EINVAL;
-+	}
-+
-+	set_irq_data(irq, iommu);
-+	iommu->irq = irq;
-+
-+	ret = arch_setup_dmar_msi(irq);
-+	if (ret) {
-+		set_irq_data(irq, NULL);
-+		iommu->irq = 0;
-+		destroy_irq(irq);
-+		return 0;
-+	}
-+
-+	/* Force fault register is cleared */
-+	iommu_page_fault(irq, iommu);
-+
-+	ret = request_irq(irq, iommu_page_fault, 0, iommu->name, iommu);
-+	if (ret)
-+		printk(KERN_ERR "IOMMU: can't request irq\n");
-+	return ret;
-+}
- 
- static int iommu_init_domains(struct intel_iommu *iommu)
- {
-@@ -1855,40 +2043,11 @@ static int __init init_dmars(void)
- 		}
- 	}
- 
--	/*
--	 * Start from the sane iommu hardware state.
--	 */
- 	for_each_drhd_unit(drhd) {
- 		if (drhd->ignored)
- 			continue;
- 
- 		iommu = drhd->iommu;
--
--		/*
--		 * If the queued invalidation is already initialized by us
--		 * (for example, while enabling interrupt-remapping) then
--		 * we got the things already rolling from a sane state.
--		 */
--		if (iommu->qi)
--			continue;
--
--		/*
--		 * Clear any previous faults.
--		 */
--		dmar_fault(-1, iommu);
--		/*
--		 * Disable queued invalidation if supported and already enabled
--		 * before OS handover.
--		 */
--		dmar_disable_qi(iommu);
--	}
--
--	for_each_drhd_unit(drhd) {
--		if (drhd->ignored)
--			continue;
--
--		iommu = drhd->iommu;
--
- 		if (dmar_enable_qi(iommu)) {
- 			/*
- 			 * Queued Invalidate not enabled, use Register Based
-diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
-index 45effc5..b041a40 100644
---- a/drivers/pci/intr_remapping.c
-+++ b/drivers/pci/intr_remapping.c
-@@ -467,55 +458,11 @@ static int setup_intr_remapping(struct intel_iommu *iommu, int mode)
- 	return 0;
- }
- 
--/*
-- * Disable Interrupt Remapping.
-- */
--static void disable_intr_remapping(struct intel_iommu *iommu)
--{
--	unsigned long flags;
--	u32 sts;
--
--	if (!ecap_ir_support(iommu->ecap))
--		return;
--
--	spin_lock_irqsave(&iommu->register_lock, flags);
--
--	sts = dmar_readq(iommu->reg + DMAR_GSTS_REG);
--	if (!(sts & DMA_GSTS_IRES))
--		goto end;
--
--	iommu->gcmd &= ~DMA_GCMD_IRE;
--	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
--
--	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
--		      readl, !(sts & DMA_GSTS_IRES), sts);
--
--end:
--	spin_unlock_irqrestore(&iommu->register_lock, flags);
--}
--
- int __init enable_intr_remapping(int eim)
- {
- 	struct dmar_drhd_unit *drhd;
- 	int setup = 0;
- 
--	for_each_drhd_unit(drhd) {
--		struct intel_iommu *iommu = drhd->iommu;
--
--		/*
--		 * Clear previous faults.
--		 */
--		dmar_fault(-1, iommu);
--
--		/*
--		 * Disable intr remapping and queued invalidation, if already
--		 * enabled prior to OS handover.
--		 */
--		disable_intr_remapping(iommu);
--
--		dmar_disable_qi(iommu);
--	}
--
- 	/*
- 	 * check for the Interrupt-remapping support
- 	 */
---- a/include/linux/dmar.h	2009-04-11 17:05:51.000000000 +0100
-+++ b/include/linux/dmar.h	2009-03-23 23:12:14.000000000 +0000
-@@ -24,7 +24,6 @@
- #include <linux/acpi.h>
- #include <linux/types.h>
- #include <linux/msi.h>
--#include <linux/irqreturn.h>
- 
- #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
- struct intel_iommu;
-@@ -136,7 +127,6 @@
- extern void dmar_msi_read(int irq, struct msi_msg *msg);
- extern void dmar_msi_write(int irq, struct msi_msg *msg);
- extern int dmar_set_interrupt(struct intel_iommu *iommu);
--extern irqreturn_t dmar_fault(int irq, void *dev_id);
- extern int arch_setup_dmar_msi(unsigned int irq);
- 
- extern int iommu_detected, no_iommu;
---- a/include/linux/intel-iommu.h	2009-04-11 17:05:51.000000000 +0100
-+++ b/include/linux/intel-iommu.h	2009-03-23 23:12:14.000000000 +0000
-@@ -331,8 +321,6 @@
- extern int alloc_iommu(struct dmar_drhd_unit *drhd);
- extern void free_iommu(struct intel_iommu *iommu);
- extern int dmar_enable_qi(struct intel_iommu *iommu);
--extern void dmar_disable_qi(struct intel_iommu *iommu);
--extern int dmar_reenable_qi(struct intel_iommu *iommu);
- extern void qi_global_iec(struct intel_iommu *iommu);
- 
- extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
---- linux.temp/kernel/sched.c	2009-04-14 21:42:33.000000000 +0100
-+++ vanilla-2.6.29/kernel/sched.c	2009-03-23 23:12:14.000000000 +0000
-@@ -4134,25 +4134,9 @@
- EXPORT_PER_CPU_SYMBOL(kstat);
- 
- /*
-- * Return any ns on the sched_clock that have not yet been accounted in
-+ * Return any ns on the sched_clock that have not yet been banked in
-  * @p in case that task is currently running.
-- *
-- * Called with task_rq_lock() held on @rq.
-  */
--static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
--{
--	u64 ns = 0;
--
--	if (task_current(rq, p)) {
--		update_rq_clock(rq);
--		ns = rq->clock - p->se.exec_start;
--		if ((s64)ns < 0)
--			ns = 0;
--	}
--
--	return ns;
--}
--
- unsigned long long task_delta_exec(struct task_struct *p)
- {
- 	unsigned long flags;
+--- a/include/linux/init_task.h	2009-04-24 20:47:17.000000000 +0100
++++ b/include/linux/init_task.h	2009-04-23 20:13:50.000000000 +0100
+@@ -170,7 +170,6 @@
+ 		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
+ 	},								\
+ 	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
+-	INIT_UTRACE(tsk)						\
+ 	INIT_IDS							\
+ 	INIT_TRACE_IRQFLAGS						\
+ 	INIT_LOCKDEP							\


--- alsa-dont-reset-stream-at-each-prepare-callb.patch DELETED ---


--- alsa-hda-dont-reset-BDL-unnecessarily.patch DELETED ---


--- alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch DELETED ---


--- alsa-pcm-always-reset-invalid-position.patch DELETED ---


--- alsa-pcm-fix-delta-calc-at-overlap.patch DELETED ---


--- alsa-pcm-midlevel-add-more-strict-buffer-position.patch DELETED ---


--- alsa-pcm-safer-boundary-checks.patch DELETED ---


--- alsa-rewrite-hw_ptr-updaters.patch DELETED ---


--- drm-intel-gen3-fb-hack.patch DELETED ---


--- drm-intel-lying-systems-without-lvds.patch DELETED ---


--- linux-2.6-acer-wmi-bail-on-aao.patch DELETED ---


--- linux-2.6-acpi-strict-resources.patch DELETED ---


--- linux-2.6-acpi-video-didl-intel-outputs.patch DELETED ---


--- linux-2.6-add-qcserial.patch DELETED ---


--- linux-2.6-btrfs-fix-umount-hang.patch DELETED ---


--- linux-2.6-dma-debug-fixes.patch DELETED ---


--- linux-2.6-dropwatch-protocol.patch DELETED ---


--- linux-2.6-e820-acpi3-bios-workaround.patch DELETED ---


--- linux-2.6-e820-guard-against-pre-acpi3.patch DELETED ---


--- linux-2.6-e820-mark-esi-clobbered.patch DELETED ---


--- linux-2.6-e820-save-restore-edi-ebp.patch DELETED ---


--- linux-2.6-ext4-flush-on-close.patch DELETED ---


--- linux-2.6-ext4-really-print-warning-once.patch DELETED ---


--- linux-2.6-fiemap-header-install.patch DELETED ---


--- linux-2.6-hwmon-atk0110.patch DELETED ---


--- linux-2.6-input-hid-extra-gamepad.patch DELETED ---


--- linux-2.6-input-wacom-bluetooth.patch DELETED ---


--- linux-2.6-iommu-fixes.patch DELETED ---


--- linux-2.6-ipw2x00-age-scan-results-on-resume.patch DELETED ---


--- linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch DELETED ---


--- linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch DELETED ---


--- linux-2.6-kvm-kconfig-irqchip.patch DELETED ---


--- linux-2.6-kvm-mask-notifiers.patch DELETED ---


--- linux-2.6-kvm-reset-pit-irq-on-unmask.patch DELETED ---


--- linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch DELETED ---


--- linux-2.6-mm-define-unique-value-for-as_unevictable.patch DELETED ---


--- linux-2.6-net-fix-another-gro-bug.patch DELETED ---


--- linux-2.6-pci-sysfs-remove-id.patch DELETED ---


--- linux-2.6-posix-timers-fix-clock-monotonicity.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch DELETED ---


--- linux-2.6-relatime-by-default.patch DELETED ---


--- linux-2.6-scsi-cpqarray-set-master.patch DELETED ---


--- linux-2.6-shut-up-efifb.patch DELETED ---


--- linux-2.6-sony-laptop-rfkill.patch DELETED ---


--- linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch DELETED ---


--- linux-2.6-utrace-ftrace.patch DELETED ---


--- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch DELETED ---


--- linux-2.6-v4l-pvrusb2-fixes.patch DELETED ---


--- linux-2.6.29-alsa-update-quirks.patch DELETED ---


--- linux-2.6.29.1-sparc-regression.patch DELETED ---


--- patch-2.6.29.1.bz2.sign DELETED ---


--- revert-fix-modules_install-via-nfs.patch DELETED ---


--- squashfs-broken-when-pagesize-greater-than-blocksize.patch DELETED ---



From mjakubicek at fedoraproject.org  Fri Apr 24 22:32:50 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 22:32:50 +0000 (UTC)
Subject: rpms/fldigi/F-11 fldigi-gcc44.patch,NONE,1.1 fldigi.spec,1.10,1.11
Message-ID: <20090424223250.9C1D070106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fldigi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10448/F-11

Modified Files:
	fldigi.spec 
Added Files:
	fldigi-gcc44.patch 
Log Message:
- Fix FTBFS: added fldigi-gcc44.patch



fldigi-gcc44.patch:

--- NEW FILE fldigi-gcc44.patch ---
--- src/dialogs/font_browser.cxx.orig	2009-04-25 00:03:42.000000000 +0200
+++ src/dialogs/font_browser.cxx	2009-04-25 00:03:49.000000000 +0200
@@ -32,6 +32,7 @@
 #include <string>
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 
 #include "font_browser.h"
 
--- src/misc/qrzlib.cxx.orig	2009-04-25 00:11:54.000000000 +0200
+++ src/misc/qrzlib.cxx	2009-04-25 00:13:06.000000000 +0200
@@ -775,44 +775,44 @@
   
   if( found == 1 ) {
     Qcall = recbuffer;
-    comma = strchr( Qcall, ',' );
+    comma = (char *) strchr( Qcall, ',' );
     *comma = 0;
     Qlname = comma + 1;
-    comma = strchr( Qlname, ',' );
+    comma = (char *) strchr( Qlname, ',' );
     *comma = 0;
     Qfname = comma + 1;
-    comma = strchr( Qfname, ',' );
+    comma = (char *) strchr( Qfname, ',' );
     Qfname = comma + 1;      // skip JR field
-    comma = strchr( Qfname, ',' );
+    comma = (char *) strchr( Qfname, ',' );
     *comma = 0;
     Qdob = comma + 1;
-    comma = strchr( Qdob, ',' );
+    comma = (char *) strchr( Qdob, ',' );
     Qdob = comma + 1;        // skip MI field
-    comma = strchr( Qdob, ',' );
+    comma = (char *) strchr( Qdob, ',' );
     *comma = 0;
     Qefdate = comma + 1;
-    comma = strchr( Qefdate, ',' );
+    comma = (char *) strchr( Qefdate, ',' );
     *comma = 0;
     Qexpdate = comma + 1;
-    comma = strchr( Qexpdate, ',' );
+    comma = (char *) strchr( Qexpdate, ',' );
     *comma = 0;
     Qmail_str = comma + 1;
-    comma = strchr( Qmail_str, ',' );
+    comma = (char *) strchr( Qmail_str, ',' );
     *comma = 0;
     Qmail_city = comma + 1;
-    comma = strchr( Qmail_city, ',' );
+    comma = (char *) strchr( Qmail_city, ',' );
     *comma = 0;
     Qmail_st = comma + 1;
-    comma = strchr( Qmail_st, ',' );
+    comma = (char *) strchr( Qmail_st, ',' );
     *comma = 0;
     Qmail_zip = comma + 1;
-    comma = strchr( Qmail_zip, ',' );
+    comma = (char *) strchr( Qmail_zip, ',' );
     *comma = 0;
     Qopclass = comma + 1;
-    comma = strchr( Qopclass, ',' );
+    comma = (char *) strchr( Qopclass, ',' );
     *comma = 0;
     Qp_call = comma + 1;
-    comma = strchr( Qp_call, ',' );
+    comma = (char *) strchr( Qp_call, ',' );
     *comma = 0;
     Qp_class = comma + 1;
     //Qp_class[1] = 0;
--- src/widgets/picture.cxx.orig	2009-04-25 00:17:36.000000000 +0200
+++ src/widgets/picture.cxx	2009-04-25 00:17:51.000000000 +0200
@@ -384,7 +384,7 @@
 	if (strstr(text, "file://"))
 		text += strlen("file://");
 	char* p;
-	if ((p = strchr(text, '\r')))
+	if ((p = (char *) strchr(text, '\r')))
 		*p = '\0';
 
 	struct stat st;
--- src/misc/socket.cxx.orig	2009-04-25 00:13:57.000000000 +0200
+++ src/misc/socket.cxx	2009-04-25 00:19:03.000000000 +0200
@@ -39,6 +39,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
+#include <stdio.h>
 
 #ifndef NDEBUG
   #include "debug.h"


Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-11/fldigi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fldigi.spec	24 Feb 2009 17:28:01 -0000	1.10
+++ fldigi.spec	24 Apr 2009 22:32:20 -0000	1.11
@@ -1,12 +1,14 @@
 Name:		fldigi
 Version:	3.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Digital modem program for Linux
 
 Group:		Applications/Communications
 License:	GPLv2+	
 URL:		http://www.w1hkj.com/fldigi-distro/
 Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+# The package should be updated to current, patch re-diffed and send upstream!
+Patch0:		%{name}-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
@@ -22,10 +24,11 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +51,9 @@
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.10-3
+- Fix FTBFS: added fldigi-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 22:32:51 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 22:32:51 +0000 (UTC)
Subject: rpms/fldigi/devel fldigi-gcc44.patch, NONE, 1.1 fldigi.spec, 1.10,
	1.11
Message-ID: <20090424223251.2A71470106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fldigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10448/devel

Modified Files:
	fldigi.spec 
Added Files:
	fldigi-gcc44.patch 
Log Message:
- Fix FTBFS: added fldigi-gcc44.patch



fldigi-gcc44.patch:

--- NEW FILE fldigi-gcc44.patch ---
--- src/dialogs/font_browser.cxx.orig	2009-04-25 00:03:42.000000000 +0200
+++ src/dialogs/font_browser.cxx	2009-04-25 00:03:49.000000000 +0200
@@ -32,6 +32,7 @@
 #include <string>
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 
 #include "font_browser.h"
 
--- src/misc/qrzlib.cxx.orig	2009-04-25 00:11:54.000000000 +0200
+++ src/misc/qrzlib.cxx	2009-04-25 00:13:06.000000000 +0200
@@ -775,44 +775,44 @@
   
   if( found == 1 ) {
     Qcall = recbuffer;
-    comma = strchr( Qcall, ',' );
+    comma = (char *) strchr( Qcall, ',' );
     *comma = 0;
     Qlname = comma + 1;
-    comma = strchr( Qlname, ',' );
+    comma = (char *) strchr( Qlname, ',' );
     *comma = 0;
     Qfname = comma + 1;
-    comma = strchr( Qfname, ',' );
+    comma = (char *) strchr( Qfname, ',' );
     Qfname = comma + 1;      // skip JR field
-    comma = strchr( Qfname, ',' );
+    comma = (char *) strchr( Qfname, ',' );
     *comma = 0;
     Qdob = comma + 1;
-    comma = strchr( Qdob, ',' );
+    comma = (char *) strchr( Qdob, ',' );
     Qdob = comma + 1;        // skip MI field
-    comma = strchr( Qdob, ',' );
+    comma = (char *) strchr( Qdob, ',' );
     *comma = 0;
     Qefdate = comma + 1;
-    comma = strchr( Qefdate, ',' );
+    comma = (char *) strchr( Qefdate, ',' );
     *comma = 0;
     Qexpdate = comma + 1;
-    comma = strchr( Qexpdate, ',' );
+    comma = (char *) strchr( Qexpdate, ',' );
     *comma = 0;
     Qmail_str = comma + 1;
-    comma = strchr( Qmail_str, ',' );
+    comma = (char *) strchr( Qmail_str, ',' );
     *comma = 0;
     Qmail_city = comma + 1;
-    comma = strchr( Qmail_city, ',' );
+    comma = (char *) strchr( Qmail_city, ',' );
     *comma = 0;
     Qmail_st = comma + 1;
-    comma = strchr( Qmail_st, ',' );
+    comma = (char *) strchr( Qmail_st, ',' );
     *comma = 0;
     Qmail_zip = comma + 1;
-    comma = strchr( Qmail_zip, ',' );
+    comma = (char *) strchr( Qmail_zip, ',' );
     *comma = 0;
     Qopclass = comma + 1;
-    comma = strchr( Qopclass, ',' );
+    comma = (char *) strchr( Qopclass, ',' );
     *comma = 0;
     Qp_call = comma + 1;
-    comma = strchr( Qp_call, ',' );
+    comma = (char *) strchr( Qp_call, ',' );
     *comma = 0;
     Qp_class = comma + 1;
     //Qp_class[1] = 0;
--- src/widgets/picture.cxx.orig	2009-04-25 00:17:36.000000000 +0200
+++ src/widgets/picture.cxx	2009-04-25 00:17:51.000000000 +0200
@@ -384,7 +384,7 @@
 	if (strstr(text, "file://"))
 		text += strlen("file://");
 	char* p;
-	if ((p = strchr(text, '\r')))
+	if ((p = (char *) strchr(text, '\r')))
 		*p = '\0';
 
 	struct stat st;
--- src/misc/socket.cxx.orig	2009-04-25 00:13:57.000000000 +0200
+++ src/misc/socket.cxx	2009-04-25 00:19:03.000000000 +0200
@@ -39,6 +39,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
+#include <stdio.h>
 
 #ifndef NDEBUG
   #include "debug.h"


Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/devel/fldigi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fldigi.spec	24 Feb 2009 17:28:01 -0000	1.10
+++ fldigi.spec	24 Apr 2009 22:32:20 -0000	1.11
@@ -1,12 +1,14 @@
 Name:		fldigi
 Version:	3.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Digital modem program for Linux
 
 Group:		Applications/Communications
 License:	GPLv2+	
 URL:		http://www.w1hkj.com/fldigi-distro/
 Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+# The package should be updated to current, patch re-diffed and send upstream!
+Patch0:		%{name}-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
@@ -22,10 +24,11 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +51,9 @@
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.10-3
+- Fix FTBFS: added fldigi-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From grandcross at fedoraproject.org  Fri Apr 24 22:33:57 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri, 24 Apr 2009 22:33:57 +0000 (UTC)
Subject: rpms/python-arm4/devel python-arm4.spec,1.1,1.2
Message-ID: <20090424223357.6D6C970106@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10812

Modified Files:
	python-arm4.spec 
Log Message:
Add missing runtime dependency


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/python-arm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-arm4.spec	21 Apr 2009 22:24:42 -0000	1.1
+++ python-arm4.spec	24 Apr 2009 22:33:27 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name: python-arm4
 Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -17,7 +17,7 @@
 ### Build Dependencies ###
 
 BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4
+Requires: arm4 python-libs
 
 %description
 Arm4 is a python module that provides for application response measurement
@@ -46,6 +46,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-4 
+- Add missing runtime dependency
+
 * Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3 
 - Minor edits to correct review issues.
 



From grandcross at fedoraproject.org  Fri Apr 24 22:41:33 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri, 24 Apr 2009 22:41:33 +0000 (UTC)
Subject: rpms/python-arm4/devel python-arm4.spec,1.2,1.3
Message-ID: <20090424224133.8604670106@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12535

Modified Files:
	python-arm4.spec 
Log Message:
Add missing runtime dependency


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/python-arm4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-arm4.spec	24 Apr 2009 22:33:27 -0000	1.2
+++ python-arm4.spec	24 Apr 2009 22:41:02 -0000	1.3
@@ -17,7 +17,7 @@
 ### Build Dependencies ###
 
 BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4 python-libs
+Requires: arm4 python-libs python
 
 %description
 Arm4 is a python module that provides for application response measurement



From grandcross at fedoraproject.org  Fri Apr 24 22:43:49 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri, 24 Apr 2009 22:43:49 +0000 (UTC)
Subject: rpms/python-arm4/devel python-arm4.spec,1.3,1.4
Message-ID: <20090424224349.C01DA70106@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12983

Modified Files:
	python-arm4.spec 
Log Message:
Add missing runtime dependency


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/python-arm4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-arm4.spec	24 Apr 2009 22:41:02 -0000	1.3
+++ python-arm4.spec	24 Apr 2009 22:43:19 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name: python-arm4
 Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -46,6 +46,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-5 
+- Add missing runtime dependency
+
 * Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-4 
 - Add missing runtime dependency
 



From grandcross at fedoraproject.org  Fri Apr 24 22:50:48 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri, 24 Apr 2009 22:50:48 +0000 (UTC)
Subject: rpms/python-arm4/F-11 python-arm4.spec,1.1,1.2
Message-ID: <20090424225048.70EC270106@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14454

Modified Files:
	python-arm4.spec 
Log Message:
Add missing runtime dependencies


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-11/python-arm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-arm4.spec	21 Apr 2009 22:29:31 -0000	1.1
+++ python-arm4.spec	24 Apr 2009 22:50:18 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name: python-arm4
 Version: 1.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -17,7 +17,7 @@
 ### Build Dependencies ###
 
 BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4
+Requires: arm4 python-libs python
 
 %description
 Arm4 is a python module that provides for application response measurement
@@ -46,6 +46,12 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-5 
+- Add missing runtime dependency
+
+* Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-4 
+- Add missing runtime dependency
+
 * Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3 
 - Minor edits to correct review issues.
 



From grandcross at fedoraproject.org  Fri Apr 24 22:58:09 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Fri, 24 Apr 2009 22:58:09 +0000 (UTC)
Subject: rpms/python-arm4/F-10 python-arm4.spec,1.1,1.2
Message-ID: <20090424225809.36F1170106@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16612

Modified Files:
	python-arm4.spec 
Log Message:
Add missing runtime dependencies


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-10/python-arm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-arm4.spec	21 Apr 2009 22:26:37 -0000	1.1
+++ python-arm4.spec	24 Apr 2009 22:57:38 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name: python-arm4
 Version: 1.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -17,7 +17,7 @@
 ### Build Dependencies ###
 
 BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4
+Requires: arm4 python-libs python
 
 %description
 Arm4 is a python module that provides for application response measurement
@@ -46,6 +46,12 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-5 
+- Add missing runtime dependency
+
+* Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-4 
+- Add missing runtime dependency
+
 * Tue Apr 21 2009  David Carter <dcarter at davidcarter.ca> 1.1-3 
 - Minor edits to correct review issues.
 



From mjakubicek at fedoraproject.org  Fri Apr 24 23:29:19 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 23:29:19 +0000 (UTC)
Subject: rpms/stardict/F-11 stardict-3.0.1.gcc44.patch, NONE,
	1.1 stardict.spec, 1.63, 1.64
Message-ID: <20090424232920.0B91570106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/stardict/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22987/F-11

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.1.gcc44.patch 
Log Message:
- Fix FTBFS: added stardict-3.0.1.gcc44.patch



stardict-3.0.1.gcc44.patch:

--- NEW FILE stardict-3.0.1.gcc44.patch ---
--- src/lib/data.cpp.orig	2009-04-25 00:54:05.000000000 +0200
+++ src/lib/data.cpp	2009-04-25 00:54:23.000000000 +0200
@@ -23,6 +23,7 @@
 #endif
 
 #include "kmp.h"
+#include <cstdio>
 
 #include "data.hpp"
 #include "getuint32.h"
--- src/lib/stardict_client.cpp.orig	2009-04-25 01:07:27.000000000 +0200
+++ src/lib/stardict_client.cpp	2009-04-25 01:07:41.000000000 +0200
@@ -28,6 +28,7 @@
 #include "sockets.hpp"
 #include "md5.h"
 #include "getuint32.h"
+#include <cstdio>
 
 #include "stardict_client.hpp"
 


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-11/stardict.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- stardict.spec	26 Feb 2009 02:57:17 -0000	1.63
+++ stardict.spec	24 Apr 2009 23:28:48 -0000	1.64
@@ -14,6 +14,9 @@
 Patch1:		transparent_trayicon.patch
 Patch2:		stardict-3.0.1-10.gucharmap.patch
 Patch3:		stardict-3.0.1-13.bz441209.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2780881&group_id=80679&atid=560632
+Patch4:		stardict-3.0.1.gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
@@ -37,6 +40,7 @@
 %patch1 -p1 -b .2-trayicon
 %patch2 -p1 -b .3-gucharmap
 %patch3 -p1 -b .4-bz441209
+%patch4 -b .5-gcc44
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -50,7 +54,7 @@
 %{__autoconf}
 %{__libtoolize}
 %configure --disable-schemas-install --disable-festival
-make %{_smp_mflags}
+make -k %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +107,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.0.1-17
+- Fix FTBFS: added stardict-3.0.1.gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 23:29:19 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 23:29:19 +0000 (UTC)
Subject: rpms/stardict/devel stardict-3.0.1.gcc44.patch, NONE,
	1.1 stardict.spec, 1.63, 1.64
Message-ID: <20090424232920.1194B7013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22987/devel

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.1.gcc44.patch 
Log Message:
- Fix FTBFS: added stardict-3.0.1.gcc44.patch



stardict-3.0.1.gcc44.patch:

--- NEW FILE stardict-3.0.1.gcc44.patch ---
--- src/lib/data.cpp.orig	2009-04-25 00:54:05.000000000 +0200
+++ src/lib/data.cpp	2009-04-25 00:54:23.000000000 +0200
@@ -23,6 +23,7 @@
 #endif
 
 #include "kmp.h"
+#include <cstdio>
 
 #include "data.hpp"
 #include "getuint32.h"
--- src/lib/stardict_client.cpp.orig	2009-04-25 01:07:27.000000000 +0200
+++ src/lib/stardict_client.cpp	2009-04-25 01:07:41.000000000 +0200
@@ -28,6 +28,7 @@
 #include "sockets.hpp"
 #include "md5.h"
 #include "getuint32.h"
+#include <cstdio>
 
 #include "stardict_client.hpp"
 


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- stardict.spec	26 Feb 2009 02:57:17 -0000	1.63
+++ stardict.spec	24 Apr 2009 23:28:49 -0000	1.64
@@ -14,6 +14,9 @@
 Patch1:		transparent_trayicon.patch
 Patch2:		stardict-3.0.1-10.gucharmap.patch
 Patch3:		stardict-3.0.1-13.bz441209.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2780881&group_id=80679&atid=560632
+Patch4:		stardict-3.0.1.gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
@@ -37,6 +40,7 @@
 %patch1 -p1 -b .2-trayicon
 %patch2 -p1 -b .3-gucharmap
 %patch3 -p1 -b .4-bz441209
+%patch4 -b .5-gcc44
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -50,7 +54,7 @@
 %{__autoconf}
 %{__libtoolize}
 %configure --disable-schemas-install --disable-festival
-make %{_smp_mflags}
+make -k %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +107,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.0.1-17
+- Fix FTBFS: added stardict-3.0.1.gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 23:32:03 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 23:32:03 +0000 (UTC)
Subject: rpms/stardict/F-11 stardict.spec,1.64,1.65
Message-ID: <20090424233203.44B0970106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/stardict/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23741/F-11

Modified Files:
	stardict.spec 
Log Message:
- ...and bump release.




Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-11/stardict.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- stardict.spec	24 Apr 2009 23:28:48 -0000	1.64
+++ stardict.spec	24 Apr 2009 23:31:32 -0000	1.65
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	16%{?dist}
+Release:	17%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net



From mjakubicek at fedoraproject.org  Fri Apr 24 23:32:03 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 23:32:03 +0000 (UTC)
Subject: rpms/stardict/devel stardict.spec,1.64,1.65
Message-ID: <20090424233203.53A707013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23741/devel

Modified Files:
	stardict.spec 
Log Message:
- ...and bump release.




Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- stardict.spec	24 Apr 2009 23:28:49 -0000	1.64
+++ stardict.spec	24 Apr 2009 23:31:32 -0000	1.65
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	16%{?dist}
+Release:	17%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net



From hadess at fedoraproject.org  Fri Apr 24 23:40:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 23:40:41 +0000 (UTC)
Subject: rpms/libgdata/F-11 .cvsignore, 1.2, 1.3 libgdata.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090424234041.C6BED70106@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25378

Modified Files:
	.cvsignore libgdata.spec sources 
Log Message:
* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.2.0-1
- Update to 0.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Apr 2009 13:36:03 -0000	1.2
+++ .cvsignore	24 Apr 2009 23:40:11 -0000	1.3
@@ -1 +1 @@
-libgdata-0.1.1.tar.bz2
+libgdata-0.2.0.tar.bz2


Index: libgdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/libgdata.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgdata.spec	6 Apr 2009 13:36:03 -0000	1.1
+++ libgdata.spec	24 Apr 2009 23:40:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libgdata
-Version:        0.1.1
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Library for the GData protocol
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-doc/html/gdata/
 
 %changelog
+* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.2.0-1
+- Update to 0.2.0
+
 * Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.1-2
 - Add check, snippet from Jason Tibbitts
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Apr 2009 13:36:03 -0000	1.2
+++ sources	24 Apr 2009 23:40:11 -0000	1.3
@@ -1 +1 @@
-b1bde0dfa104c6457c97d7e09b4d0e86  libgdata-0.1.1.tar.bz2
+3772ccf571ee0f5113934d83e51579e3  libgdata-0.2.0.tar.bz2



From hadess at fedoraproject.org  Fri Apr 24 23:49:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 23:49:30 +0000 (UTC)
Subject: rpms/libgdata/F-11 libgdata.spec,1.2,1.3
Message-ID: <20090424234930.BCDCF70106@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26930

Modified Files:
	libgdata.spec 
Log Message:
Update file list


Index: libgdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/libgdata.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgdata.spec	24 Apr 2009 23:40:11 -0000	1.2
+++ libgdata.spec	24 Apr 2009 23:49:00 -0000	1.3
@@ -40,6 +40,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+%find_lang gdata
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +56,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files
+%files -f gdata.lang
 %defattr(-,root,root,-)
 %doc COPYING.LIB NEWS README AUTHORS
 %{_libdir}/*.so.*



From mjakubicek at fedoraproject.org  Fri Apr 24 23:52:17 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 23:52:17 +0000 (UTC)
Subject: rpms/rxvt-unicode/devel rxvt-unicode-gcc44.patch, NONE,
	1.1 rxvt-unicode.spec, 1.44, 1.45
Message-ID: <20090424235217.3E41770106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rxvt-unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27558/devel

Modified Files:
	rxvt-unicode.spec 
Added Files:
	rxvt-unicode-gcc44.patch 
Log Message:
- Fix FTBFS: added rxvt-unicode-gcc44.patch



rxvt-unicode-gcc44.patch:

--- NEW FILE rxvt-unicode-gcc44.patch ---
--- src/background.C.orig	2009-04-25 01:12:46.000000000 +0200
+++ src/background.C	2009-04-25 01:19:21.000000000 +0200
@@ -261,7 +261,7 @@
   unsigned int w = 0, h = 0;
   unsigned int n;
   unsigned long new_flags = (flags & (~geometryFlags));
-  char *p;
+  const char *p;
 #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
 
   if (geom == NULL)
@@ -677,7 +677,7 @@
       if (!target->asimman)
         target->asimman = create_generic_imageman (target->rs[Rs_path]);
 
-      if (char *f = strchr (file, ';'))
+      if (char *f = (char *) strchr (file, ';'))
         {
           size_t len = f - file;
           f = (char *)malloc (len + 1);
--- src/command.C.orig	2009-04-25 01:20:29.000000000 +0200
+++ src/command.C	2009-04-25 01:21:20.000000000 +0200
@@ -3336,7 +3336,7 @@
           }
         else
           {
-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
+            char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok
 
             if (eq)
               {
--- src/misc.C.orig	2009-04-25 01:41:05.000000000 +0200
+++ src/misc.C	2009-04-25 01:41:37.000000000 +0200
@@ -170,7 +170,7 @@
 char *
 rxvt_basename (const char *str) NOTHROW
 {
-  char *base = strrchr (str, '/');
+  char *base = (char *) strrchr (str, '/');
 
   return (char *) (base ? base + 1 : str);
 }


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rxvt-unicode.spec	25 Feb 2009 22:19:08 -0000	1.44
+++ rxvt-unicode.spec	24 Apr 2009 23:51:47 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -8,6 +8,8 @@
 URL:            http://software.schmorp.de/
 Source0:        http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2
 Source1:        rxvt-unicode.desktop
+# Sent to rxvt-unicode [AT] lists [DOT]??schmorp [DOT] de on 2009/04/25
+Patch0:			rxvt-unicode-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -33,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --enable-xft --enable-font-styles --enable-afterimage \
@@ -70,6 +73,9 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 9.06-3
+- Fix FTBFS: added rxvt-unicode-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Apr 24 23:52:17 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 24 Apr 2009 23:52:17 +0000 (UTC)
Subject: rpms/rxvt-unicode/F-11 rxvt-unicode-gcc44.patch, NONE,
	1.1 rxvt-unicode.spec, 1.44, 1.45
Message-ID: <20090424235217.0D49170106@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rxvt-unicode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27558/F-11

Modified Files:
	rxvt-unicode.spec 
Added Files:
	rxvt-unicode-gcc44.patch 
Log Message:
- Fix FTBFS: added rxvt-unicode-gcc44.patch



rxvt-unicode-gcc44.patch:

--- NEW FILE rxvt-unicode-gcc44.patch ---
--- src/background.C.orig	2009-04-25 01:12:46.000000000 +0200
+++ src/background.C	2009-04-25 01:19:21.000000000 +0200
@@ -261,7 +261,7 @@
   unsigned int w = 0, h = 0;
   unsigned int n;
   unsigned long new_flags = (flags & (~geometryFlags));
-  char *p;
+  const char *p;
 #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
 
   if (geom == NULL)
@@ -677,7 +677,7 @@
       if (!target->asimman)
         target->asimman = create_generic_imageman (target->rs[Rs_path]);
 
-      if (char *f = strchr (file, ';'))
+      if (char *f = (char *) strchr (file, ';'))
         {
           size_t len = f - file;
           f = (char *)malloc (len + 1);
--- src/command.C.orig	2009-04-25 01:20:29.000000000 +0200
+++ src/command.C	2009-04-25 01:21:20.000000000 +0200
@@ -3336,7 +3336,7 @@
           }
         else
           {
-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
+            char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok
 
             if (eq)
               {
--- src/misc.C.orig	2009-04-25 01:41:05.000000000 +0200
+++ src/misc.C	2009-04-25 01:41:37.000000000 +0200
@@ -170,7 +170,7 @@
 char *
 rxvt_basename (const char *str) NOTHROW
 {
-  char *base = strrchr (str, '/');
+  char *base = (char *) strrchr (str, '/');
 
   return (char *) (base ? base + 1 : str);
 }


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-11/rxvt-unicode.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rxvt-unicode.spec	25 Feb 2009 22:19:08 -0000	1.44
+++ rxvt-unicode.spec	24 Apr 2009 23:51:46 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -8,6 +8,8 @@
 URL:            http://software.schmorp.de/
 Source0:        http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2
 Source1:        rxvt-unicode.desktop
+# Sent to rxvt-unicode [AT] lists [DOT]??schmorp [DOT] de on 2009/04/25
+Patch0:			rxvt-unicode-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -33,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --enable-xft --enable-font-styles --enable-afterimage \
@@ -70,6 +73,9 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 9.06-3
+- Fix FTBFS: added rxvt-unicode-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hadess at fedoraproject.org  Fri Apr 24 23:57:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 24 Apr 2009 23:57:24 +0000 (UTC)
Subject: rpms/libgdata/devel .cvsignore, 1.2, 1.3 libgdata.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090424235724.89FAF700DD@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28635

Modified Files:
	.cvsignore libgdata.spec sources 
Log Message:
* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.2.0-1
- Update to 0.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Apr 2009 13:31:29 -0000	1.2
+++ .cvsignore	24 Apr 2009 23:56:54 -0000	1.3
@@ -1 +1 @@
-libgdata-0.1.1.tar.bz2
+libgdata-0.2.0.tar.bz2


Index: libgdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/libgdata.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgdata.spec	6 Apr 2009 13:31:29 -0000	1.1
+++ libgdata.spec	24 Apr 2009 23:56:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libgdata
-Version:        0.1.1
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Library for the GData protocol
 
 Group:          System Environment/Libraries
@@ -40,6 +40,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+%find_lang gdata
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +56,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files
+%files -f gdata.lang
 %defattr(-,root,root,-)
 %doc COPYING.LIB NEWS README AUTHORS
 %{_libdir}/*.so.*
@@ -67,6 +69,9 @@
 %{_datadir}/gtk-doc/html/gdata/
 
 %changelog
+* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.2.0-1
+- Update to 0.2.0
+
 * Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1.1-2
 - Add check, snippet from Jason Tibbitts
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Apr 2009 13:31:29 -0000	1.2
+++ sources	24 Apr 2009 23:56:54 -0000	1.3
@@ -1 +1 @@
-b1bde0dfa104c6457c97d7e09b4d0e86  libgdata-0.1.1.tar.bz2
+3772ccf571ee0f5113934d83e51579e3  libgdata-0.2.0.tar.bz2



From mclasen at fedoraproject.org  Sat Apr 25 00:55:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 25 Apr 2009 00:55:32 +0000 (UTC)
Subject: rpms/gdm/F-11 session-client.patch,NONE,1.1 gdm.spec,1.465,1.466
Message-ID: <20090425005532.C0614700DD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5393

Modified Files:
	gdm.spec 
Added Files:
	session-client.patch 
Log Message:
fix a problem with shutdown from the login screen


session-client.patch:

--- NEW FILE session-client.patch ---
--- gdm-2.26.1/gui/simple-greeter/greeter-main.c	2009-02-19 21:45:09.000000000 -0500
+++ hacked/gui/simple-greeter/greeter-main.c	2009-04-24 20:21:43.560229712 -0400
@@ -155,6 +155,46 @@
         return (sm_proxy != NULL);
 }
 
+static void
+stop_cb (gpointer data)
+{
+        gtk_main_quit ();
+}
+
+static gboolean
+end_session_response (gboolean is_okay, const gchar *reason)
+{
+        gboolean ret;
+        GError *error = NULL;
+
+        ret = dbus_g_proxy_call (client_proxy, "EndSessionResponse",
+                                 &error,
+                                 G_TYPE_BOOLEAN, is_okay,
+                                 G_TYPE_STRING, reason,
+                                 G_TYPE_INVALID,
+                                 G_TYPE_INVALID);
+
+        if (!ret) {
+                g_warning ("Failed to send session response %s", error->message);
+                g_error_free (error);
+        }
+
+        return ret;
+}
+
+static void
+query_end_session_cb (guint flags, gpointer data)
+{
+        end_session_response (TRUE, NULL);
+}
+
+static void
+end_session_cb (guint flags, gpointer data)
+{
+        end_session_response (TRUE, NULL);
+        gtk_main_quit ();
+}
+
 static gboolean
 register_client (void)
 {
@@ -186,6 +226,19 @@
                                                   SM_DBUS_NAME,
                                                   client_id,
                                                   SM_CLIENT_DBUS_INTERFACE);
+
+        dbus_g_proxy_add_signal (client_proxy, "Stop", G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (client_proxy, "Stop",
+                                     G_CALLBACK (stop_cb), NULL, NULL);
+
+        dbus_g_proxy_add_signal (client_proxy, "QueryEndSession", G_TYPE_UINT, G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (client_proxy, "QueryEndSession",
+                                     G_CALLBACK (query_end_session_cb), NULL, NULL);
+
+        dbus_g_proxy_add_signal (client_proxy, "EndSession", G_TYPE_UINT, G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (client_proxy, "EndSession",
+                                     G_CALLBACK (end_session_cb), NULL, NULL);
+
         g_unsetenv ("DESKTOP_AUTOSTART_ID");
 
         return TRUE;


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- gdm.spec	22 Apr 2009 14:21:38 -0000	1.465
+++ gdm.spec	25 Apr 2009 00:55:02 -0000	1.466
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -98,6 +98,9 @@
 
 Patch19: gdm-2.26.1-multistack.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=580189
+Patch20: session-client.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -140,6 +143,8 @@
 
 %patch19 -p1 -b .multistack
 
+%patch20 -p1 -b .session-client
+
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f
@@ -380,6 +385,9 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Apr 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-4
+- Make the greeter a well-behaved session client (#495738)
+
 * Wed Apr 22 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-3
 - Add temporary hack to smack down misbehaving PAM modules
 



From pkgdb at fedoraproject.org  Sat Apr 25 02:21:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:21:30 +0000
Subject: [pkgdb] quassel had acl change status
Message-ID: <20090425022130.259DA10F885@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchbugzilla acl on quassel (Fedora devel) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Sat Apr 25 02:21:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:21:34 +0000
Subject: [pkgdb] quassel had acl change status
Message-ID: <20090425022134.4037D10F88A@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchcommits acl on quassel (Fedora devel) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Sat Apr 25 02:21:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:21:34 +0000
Subject: [pkgdb] quassel had acl change status
Message-ID: <20090425022134.8746410F88D@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on quassel (Fedora devel) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Sat Apr 25 02:21:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:21:44 +0000
Subject: [pkgdb] quassel had acl change status
Message-ID: <20090425022144.BB38A10F896@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on quassel (Fedora 11) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Sat Apr 25 02:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:21:42 +0000
Subject: [pkgdb] quassel had acl change status
Message-ID: <20090425022142.8B70C10F885@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchbugzilla acl on quassel (Fedora 11) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From pkgdb at fedoraproject.org  Sat Apr 25 02:21:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:21:43 +0000
Subject: [pkgdb] quassel had acl change status
Message-ID: <20090425022143.6CDE610F892@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchcommits acl on quassel (Fedora 11) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quassel



From petersen at fedoraproject.org  Sat Apr 25 02:28:27 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 02:28:27 +0000 (UTC)
Subject: rpms/cabal2spec/devel .cvsignore, 1.9, 1.10 cabal2spec.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20090425022827.1C614700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18677

Modified Files:
	.cvsignore cabal2spec.spec sources 
Log Message:
- templates buildrequire at least ghc-6.10.2-3 for macros
- fix binlib doc filelist name




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Apr 2009 12:28:52 -0000	1.9
+++ .cvsignore	25 Apr 2009 02:27:56 -0000	1.10
@@ -1 +1 @@
-cabal2spec-0.14.tar.gz
+cabal2spec-0.15.tar.gz


Index: cabal2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/cabal2spec.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cabal2spec.spec	24 Apr 2009 12:28:52 -0000	1.9
+++ cabal2spec.spec	25 Apr 2009 02:27:56 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		cabal2spec
-Version:	0.14
+Version:	0.15
 Release:	1%{?dist}
 Summary:	Tool for creating .spec files for Haskell Cabal Packages
 
@@ -40,6 +40,10 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.15-1
+- templates buildrequire at least ghc-6.10.2-3 for macros
+- fix binlib doc filelist name
+
 * Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.14-1
 - ghc_version is now in macros.ghc in ghc-6.10.2-3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cabal2spec/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Apr 2009 12:28:52 -0000	1.9
+++ sources	25 Apr 2009 02:27:56 -0000	1.10
@@ -1 +1 @@
-99d9f3aac43ba7d58354816c46469f1b  cabal2spec-0.14.tar.gz
+bd23b26ef7cfb84de15bca5c9806a71e  cabal2spec-0.15.tar.gz



From pkgdb at fedoraproject.org  Sat Apr 25 02:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:57:58 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025758.86E1010F885@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 1 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:03 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025803.D1A6B10F889@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 2 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:06 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025806.B8CB910F88B@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 3 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:10 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025810.15AD310F88D@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 4 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:15 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025815.1DA8610F88F@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 6 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:13 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025813.3381E10F885@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 5 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:21 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025821.8F79810F891@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 02:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 02:58:27 +0000
Subject: [pkgdb] Inventor ownership updated
Message-ID: <20090425025827.6A96D10F88A@bastion2.fedora.phx.redhat.com>

Package Inventor in Fedora 7 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Apr 25 04:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 04:37:20 +0000
Subject: [pkgdb] sip: manickaselvam has requested watchcommits
Message-ID: <20090425043720.4482210F888@bastion2.fedora.phx.redhat.com>

manickaselvam has requested the watchcommits acl on sip (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Sat Apr 25 04:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 04:37:47 +0000
Subject: [pkgdb] sip: manickaselvam has given up watchcommits
Message-ID: <20090425043747.CC53810F888@bastion2.fedora.phx.redhat.com>

manickaselvam has given up the watchcommits acl on sip (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip



From remi at fedoraproject.org  Sat Apr 25 05:53:50 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 25 Apr 2009 05:53:50 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/devel php-pear-Auth-SASL.spec,1.3,1.4
Message-ID: <20090425055351.038C8700DD@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23277

Modified Files:
	php-pear-Auth-SASL.spec 
Log Message:
spec cleanup - remove php/httpd dependency


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/devel/php-pear-Auth-SASL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Auth-SASL.spec	26 Feb 2009 20:43:52 -0000	1.3
+++ php-pear-Auth-SASL.spec	25 Apr 2009 05:53:19 -0000	1.4
@@ -1,16 +1,11 @@
 # default values when new /etc/rpm/macros.pear not present
 %{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
 
-Summary:     PEAR: Abstraction of various SASL mechanism responses
-Summary(fr): PEAR: Abstraction de diff??rents m??canismes de r??ponse SASL
+Summary:     Abstraction of various SASL mechanism responses
+Summary(fr): Abstraction de diff??rents m??canismes de r??ponse SASL
 Name:        php-pear-Auth-SASL
 Version:     1.0.2
-Release:     5%{?dist}
+Release:     6%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -18,8 +13,8 @@
 URL:         http://pear.php.net/package/Auth_SASL
 
 BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.0.0
+BuildRequires:    php-pear >= 1:1.4.9-1.2
+Requires:         php-pear(PEAR) >= 1.4.9
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Provides:         php-pear(Auth_SASL) = %{version}
@@ -40,36 +35,43 @@
 o Anonymous (anonyme)
 o Login (Pseudo-m??canisme)
 
+
 %prep
 %setup -c -q
-mv package.xml Auth_SASL-%{version}/Auth_SASL.xml
+mv package.xml Auth_SASL-%{version}/%{name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
 cd Auth_SASL-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Auth_SASL.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Auth_SASL.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Auth_SASL.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -80,9 +82,14 @@
 %files
 %defattr(-,root,root,-)
 %{pear_phpdir}/Auth
-%{pear_xmldir}/Auth_SASL.xml
+%{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-6
+- remove PEAR from sumnary
+- remove php (httpd) dependency
+- spec clean up
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From remi at fedoraproject.org  Sat Apr 25 05:59:19 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 25 Apr 2009 05:59:19 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/F-11 php-pear-Auth-SASL.spec,1.3,1.4
Message-ID: <20090425055919.1BA6A700DD@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24229

Modified Files:
	php-pear-Auth-SASL.spec 
Log Message:
spec cleanup - remove php/httpd dependency


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/F-11/php-pear-Auth-SASL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Auth-SASL.spec	26 Feb 2009 20:43:52 -0000	1.3
+++ php-pear-Auth-SASL.spec	25 Apr 2009 05:58:48 -0000	1.4
@@ -1,16 +1,11 @@
 # default values when new /etc/rpm/macros.pear not present
 %{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
 
-Summary:     PEAR: Abstraction of various SASL mechanism responses
-Summary(fr): PEAR: Abstraction de diff??rents m??canismes de r??ponse SASL
+Summary:     Abstraction of various SASL mechanism responses
+Summary(fr): Abstraction de diff??rents m??canismes de r??ponse SASL
 Name:        php-pear-Auth-SASL
 Version:     1.0.2
-Release:     5%{?dist}
+Release:     6%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -18,8 +13,8 @@
 URL:         http://pear.php.net/package/Auth_SASL
 
 BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.0.0
+BuildRequires:    php-pear >= 1:1.4.9-1.2
+Requires:         php-pear(PEAR) >= 1.4.9
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Provides:         php-pear(Auth_SASL) = %{version}
@@ -40,36 +35,43 @@
 o Anonymous (anonyme)
 o Login (Pseudo-m??canisme)
 
+
 %prep
 %setup -c -q
-mv package.xml Auth_SASL-%{version}/Auth_SASL.xml
+mv package.xml Auth_SASL-%{version}/%{name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
 cd Auth_SASL-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Auth_SASL.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Auth_SASL.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Auth_SASL.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -80,9 +82,14 @@
 %files
 %defattr(-,root,root,-)
 %{pear_phpdir}/Auth
-%{pear_xmldir}/Auth_SASL.xml
+%{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-6
+- remove PEAR from sumnary
+- remove php (httpd) dependency
+- spec clean up
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From remi at fedoraproject.org  Sat Apr 25 06:05:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 25 Apr 2009 06:05:54 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/F-10 php-pear-Auth-SASL.spec,1.2,1.3
Message-ID: <20090425060554.783D8700DD@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25501

Modified Files:
	php-pear-Auth-SASL.spec 
Log Message:
spec cleanup - remove php/httpd dependency


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/F-10/php-pear-Auth-SASL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Auth-SASL.spec	8 Sep 2006 16:43:52 -0000	1.2
+++ php-pear-Auth-SASL.spec	25 Apr 2009 06:05:24 -0000	1.3
@@ -1,16 +1,11 @@
 # default values when new /etc/rpm/macros.pear not present
 %{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
 
-Summary:     PEAR: Abstraction of various SASL mechanism responses
-Summary(fr): PEAR: Abstraction de diff??rents m??canismes de r??ponse SASL
+Summary:     Abstraction of various SASL mechanism responses
+Summary(fr): Abstraction de diff??rents m??canismes de r??ponse SASL
 Name:        php-pear-Auth-SASL
 Version:     1.0.2
-Release:     4%{?dist}
+Release:     6%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -18,8 +13,8 @@
 URL:         http://pear.php.net/package/Auth_SASL
 
 BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.0.0
+BuildRequires:    php-pear >= 1:1.4.9-1.2
+Requires:         php-pear(PEAR) >= 1.4.9
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Provides:         php-pear(Auth_SASL) = %{version}
@@ -40,36 +35,43 @@
 o Anonymous (anonyme)
 o Login (Pseudo-m??canisme)
 
+
 %prep
 %setup -c -q
-mv package.xml Auth_SASL-%{version}/Auth_SASL.xml
+mv package.xml Auth_SASL-%{version}/%{name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
 cd Auth_SASL-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Auth_SASL.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Auth_SASL.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Auth_SASL.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -80,9 +82,14 @@
 %files
 %defattr(-,root,root,-)
 %{pear_phpdir}/Auth
-%{pear_xmldir}/Auth_SASL.xml
+%{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-6
+- remove PEAR from sumnary
+- remove php (httpd) dependency
+- spec clean up
+
 * Thu Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-4
 - last template.spec
 



From lkundrak at fedoraproject.org  Sat Apr 25 06:12:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 25 Apr 2009 06:12:04 +0000 (UTC)
Subject: rpms/kBuild/devel .cvsignore, 1.4, 1.5 kBuild.spec, 1.7, 1.8 sources,
	1.4, 1.5 kBuild-0.1.5-revert2027.patch, 1.1, NONE
Message-ID: <20090425061205.041E47013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26628

Modified Files:
	.cvsignore kBuild.spec sources 
Removed Files:
	kBuild-0.1.5-revert2027.patch 
Log Message:
* Sat Apr 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-5.p1
- Update to later patchlevel to support VirtualBox 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jan 2009 13:25:22 -0000	1.4
+++ .cvsignore	25 Apr 2009 06:11:34 -0000	1.5
@@ -1 +1 @@
-kBuild-0.1.5-src.tar.gz
+kBuild-0.1.5-p1-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/kBuild.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kBuild.spec	12 Apr 2009 23:26:15 -0000	1.7
+++ kBuild.spec	25 Apr 2009 06:11:34 -0000	1.8
@@ -1,6 +1,8 @@
+%global patchlevel p1
+
 Name:           kBuild
 Version:        0.1.5
-Release:        4%{?dist}
+Release:        5%{?patchlevel:.%{patchlevel}}%{?dist}
 Summary:        A cross-platform build environment
 
 Group:          Development/Tools
@@ -8,7 +10,7 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-0.1.5-dprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +29,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %patch0 -p1 -b .escape
 %patch1 -p1 -b .dprintf
 
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-5.p1
+- Update to later patchlevel to support VirtualBox 2.2.0
+
 * Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
 - Fix typoes (Robert P. J. Day, #495393)
 - Comment out the colliding dprintf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jan 2009 13:25:22 -0000	1.4
+++ sources	25 Apr 2009 06:11:34 -0000	1.5
@@ -1 +1 @@
-df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz
+148f821c0f9e729a1f65bc91e69f6e7a  kBuild-0.1.5-p1-src.tar.gz


--- kBuild-0.1.5-revert2027.patch DELETED ---



From remi at fedoraproject.org  Sat Apr 25 06:23:26 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 25 Apr 2009 06:23:26 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.4,1.5
Message-ID: <20090425062326.F1EED700DD@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28984

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
fix spec to avoid new NEVR breakage with F11


Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2-MozEmbed.spec	22 Apr 2009 00:51:23 -0000	1.4
+++ perl-Gtk2-MozEmbed.spec	25 Apr 2009 06:22:56 -0000	1.5
@@ -6,10 +6,14 @@
 %define gecko_version 1.9.0.9
 %endif
 
+# Using specfilever cause dumpspec to only increase 
+# right part of release (post dist tag)
+%global specfilever 6
+
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       5%{?dist}.2
+Release:       %{specfilever}%{?dist}
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -85,6 +89,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-6
+- fix release to avoid breaking NEVR in next dumpspec
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.08-5.2
 - Rebuild against newer gecko
 



From lkundrak at fedoraproject.org  Sat Apr 25 06:23:24 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 25 Apr 2009 06:23:24 +0000 (UTC)
Subject: rpms/kBuild/F-11 .cvsignore, 1.4, 1.5 kBuild.spec, 1.7, 1.8 sources,
	1.4, 1.5 kBuild-0.1.5-revert2027.patch, 1.1, NONE
Message-ID: <20090425062324.6FC1A700DD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28961

Modified Files:
	.cvsignore kBuild.spec sources 
Removed Files:
	kBuild-0.1.5-revert2027.patch 
Log Message:
* Sat Apr 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-5.p1
- Update to later patchlevel to support VirtualBox 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jan 2009 13:25:22 -0000	1.4
+++ .cvsignore	25 Apr 2009 06:22:53 -0000	1.5
@@ -1 +1 @@
-kBuild-0.1.5-src.tar.gz
+kBuild-0.1.5-p1-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-11/kBuild.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kBuild.spec	12 Apr 2009 23:26:15 -0000	1.7
+++ kBuild.spec	25 Apr 2009 06:22:54 -0000	1.8
@@ -1,6 +1,8 @@
+%global patchlevel p1
+
 Name:           kBuild
 Version:        0.1.5
-Release:        4%{?dist}
+Release:        5%{?patchlevel:.%{patchlevel}}%{?dist}
 Summary:        A cross-platform build environment
 
 Group:          Development/Tools
@@ -8,7 +10,7 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-0.1.5-dprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +29,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %patch0 -p1 -b .escape
 %patch1 -p1 -b .dprintf
 
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-5.p1
+- Update to later patchlevel to support VirtualBox 2.2.0
+
 * Mon Apr 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-4
 - Fix typoes (Robert P. J. Day, #495393)
 - Comment out the colliding dprintf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jan 2009 13:25:22 -0000	1.4
+++ sources	25 Apr 2009 06:22:54 -0000	1.5
@@ -1 +1 @@
-df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz
+148f821c0f9e729a1f65bc91e69f6e7a  kBuild-0.1.5-p1-src.tar.gz


--- kBuild-0.1.5-revert2027.patch DELETED ---



From remi at fedoraproject.org  Sat Apr 25 06:26:23 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 25 Apr 2009 06:26:23 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed.spec,1.1,1.2
Message-ID: <20090425062623.E8510700DD@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29580

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
fix spec to fix NEVR breakage (upgrade from F10)


Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-MozEmbed.spec	6 Mar 2009 14:55:06 -0000	1.1
+++ perl-Gtk2-MozEmbed.spec	25 Apr 2009 06:25:52 -0000	1.2
@@ -6,10 +6,14 @@
 %define gecko_version 1.9.0.6
 %endif
 
+# Using specfilever cause dumpspec to only increase 
+# right part of release (post dist tag)
+%global specfilever 6
+
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       3%{?dist}
+Release:       %{specfilever}%{?dist}
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -85,6 +89,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-6
+- fix release to fix NEVR issue (upgrade from F10)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-3
 - Fix from review : Gtk2 dir ownership
 



From remi at fedoraproject.org  Sat Apr 25 06:36:23 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 25 Apr 2009 06:36:23 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.1,1.2
Message-ID: <20090425063623.1459F700DD@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31302

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
fix spec to fix NEVR breakage (upgrade from F10)


Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-11/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-MozEmbed.spec	6 Mar 2009 14:55:06 -0000	1.1
+++ perl-Gtk2-MozEmbed.spec	25 Apr 2009 06:35:52 -0000	1.2
@@ -6,10 +6,14 @@
 %define gecko_version 1.9.0.6
 %endif
 
+# Using specfilever cause dumpspec to only increase 
+# right part of release (post dist tag)
+%global specfilever 6
+
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       3%{?dist}
+Release:       %{specfilever}%{?dist}
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -85,6 +89,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-6
+- fix release to fix NEVR issue (upgrade from F10)
+
 * Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-3
 - Fix from review : Gtk2 dir ownership
 



From emoret at fedoraproject.org  Sat Apr 25 07:18:20 2009
From: emoret at fedoraproject.org (Eric Moret)
Date: Sat, 25 Apr 2009 07:18:20 +0000 (UTC)
Subject: rpms/alsa-plugins/devel .cvsignore, 1.7, 1.8 alsa-plugins.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <20090425071820.CEEEC700DD@cvs1.fedora.phx.redhat.com>

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Log Message:
Upgrade to 1.0.19 and address #483322



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Dec 2008 07:49:11 -0000	1.7
+++ .cvsignore	25 Apr 2009 07:17:50 -0000	1.8
@@ -1 +1 @@
-alsa-plugins-1.0.18.tar.bz2
+alsa-plugins-1.0.19.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- alsa-plugins.spec	24 Feb 2009 00:46:50 -0000	1.20
+++ alsa-plugins.spec	25 Apr 2009 07:17:50 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
-Version:        1.0.18
-Release:        3%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -24,7 +24,7 @@
 This package includes plugins for ALSA.
 
 %package jack
-Requires:       jack-audio-connection-kit
+Requires:       jack-audio-connection-kit, alsa-utils
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -40,6 +40,7 @@
 This plugin provides the PCM type "jack"
 
 %package oss
+Requires:       alsa-utils
 BuildRequires:  alsa-lib-devel
 Summary:        Oss PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -51,8 +52,8 @@
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
+Requires:       pulseaudio, alsa-utils
 BuildRequires:  pulseaudio-lib-devel
-Requires:       pulseaudio
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -63,6 +64,7 @@
 one for mixer control.
 
 %package samplerate
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        External rate converter plugin for ALSA
 Group:          System Environment/Libraries
@@ -72,6 +74,7 @@
 Castro Lopo.
 
 %package upmix
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        Upmixer channel expander plugin for ALSA
 Group:          System Environment/Libraries
@@ -82,6 +85,7 @@
 by the slave PCM or explicitly via channel option.
 
 %package vdownmix
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        Downmixer to stereo plugin for ALSA
 Group:          System Environment/Libraries
@@ -135,12 +139,14 @@
 %files jack
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-jack
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
 
 %files oss
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-pcm-oss
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
@@ -156,6 +162,7 @@
 %files samplerate
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/samplerate.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so
@@ -166,12 +173,14 @@
 %files upmix
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/upmix.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
 
 %files vdownmix
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/vdownmix.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
@@ -181,6 +190,11 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
 
 %changelog
+* Fri Apr 24 2009 Eric Moret <eric.moret at gmail.com> - 1.0.19-1
+- Updated to 1.0.19
+- Added Requires: alsa-utils to address #483322
+- Added dir {_sysconfdir}/alsa/pcm to address #483322
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Dec 2008 07:49:12 -0000	1.7
+++ sources	25 Apr 2009 07:17:50 -0000	1.8
@@ -1 +1 @@
-4a798b47ba10c17aed66dff234d31b24  alsa-plugins-1.0.18.tar.bz2
+29ae9cac05423cf6a49f66eeb1a79eb6  alsa-plugins-1.0.19.tar.bz2



From petersen at fedoraproject.org  Sat Apr 25 09:10:44 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 09:10:44 +0000 (UTC)
Subject: rpms/happy/devel .cvsignore, 1.4, 1.5 happy.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <20090425091044.D6894700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/happy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23774

Modified Files:
	.cvsignore happy.spec sources 
Log Message:
- 1.18.4 release
- sync with cabal2spec-0.15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/happy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2008 06:35:56 -0000	1.4
+++ .cvsignore	25 Apr 2009 09:10:14 -0000	1.5
@@ -1 +1 @@
-happy-1.18.2.tar.gz
+happy-1.18.4.tar.gz


Index: happy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/happy/devel/happy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- happy.spec	26 Feb 2009 09:46:22 -0000	1.10
+++ happy.spec	25 Apr 2009 09:10:14 -0000	1.11
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           happy
-Version:        1.18.2
-Release:        3%{?dist}
+Version:        1.18.4
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Tools
 URL:            http://haskell.org/happy/
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, ghc, docbook-dtds, docbook-style-xsl, libxslt, libxml2
 Summary:        The LALR(1) Parser Generator for Haskell
-# ghc has only been bootstrapped on the following archs:
+# fedora ghc archs:
 ExclusiveArch:	%{ix86} x86_64 ppc alpha
 Requires(post): policycoreutils
 
@@ -43,12 +43,12 @@
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 %cabal_install
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 1.18.4-1
+- 1.18.4 release
+
 * Wed Feb 25 2009 Jens Petersen <petersen at redhat.com> - 1.18.2-3
 - rebuild with %%ix86 for i586
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/happy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2008 06:35:56 -0000	1.4
+++ sources	25 Apr 2009 09:10:14 -0000	1.5
@@ -1 +1 @@
-adb1679a1fa8cec74a6e621a4a277e98  happy-1.18.2.tar.gz
+614e3ef9623dbeefc4c8ca699912efb4  happy-1.18.4.tar.gz



From petersen at fedoraproject.org  Sat Apr 25 09:20:43 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 09:20:43 +0000 (UTC)
Subject: rpms/hscolour/devel hscolour.spec,1.1,1.2
Message-ID: <20090425092043.C187B700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hscolour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25557

Modified Files:
	hscolour.spec 
Log Message:
sync with cabal2spec-0.15 and rebuild for ghc-6.10.2


Index: hscolour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hscolour/devel/hscolour.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hscolour.spec	18 Mar 2009 04:32:25 -0000	1.1
+++ hscolour.spec	25 Apr 2009 09:20:13 -0000	1.2
@@ -1,8 +1,3 @@
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
-
 %bcond_without doc
 %bcond_without prof
 
@@ -11,7 +6,7 @@
 
 Name:           hscolour
 Version:        1.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
@@ -21,12 +16,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires:  ghc >= 6.10.2-3
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -77,7 +73,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -131,9 +127,8 @@
 
 
 %if %{with doc}
-%files -n ghc-%{name}-doc
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -144,6 +139,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 1.12-3
+- sync with cabal2spec-0.15
+
 * Tue Mar 10 2009 Jens Petersen <petersen at redhat.com> - 1.12-2
 - fix url (#488665)
 - fix HsColour permissions (#488665)



From petersen at fedoraproject.org  Sat Apr 25 09:26:32 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 09:26:32 +0000 (UTC)
Subject: rpms/haddock/devel haddock.spec,1.19,1.20
Message-ID: <20090425092632.2639D700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26453

Modified Files:
	haddock.spec 
Log Message:
- update to 2.4.2
- sync with cabal2spec-0.15




Index: haddock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- haddock.spec	9 Mar 2009 06:01:32 -0000	1.19
+++ haddock.spec	25 Apr 2009 09:26:01 -0000	1.20
@@ -1,8 +1,3 @@
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
-
 %bcond_without doc
 %bcond_without prof
 
@@ -10,8 +5,8 @@
 %global debug_package %{nil}
 
 Name:           haddock
-Version:        2.4.1
-Release:        4%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        Haskell documentation tool
 
 Group:          Development/Tools
@@ -21,14 +16,15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires:  ghc >= 6.10.2-3
 Buildrequires:  ghc-ghc-paths-devel
 %if %{with doc}
 BuildRequires:  libxslt, docbook-style-xsl, autoconf
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 BuildRequires:  ghc-ghc-paths-prof
 %endif
 
@@ -55,9 +51,9 @@
 
 %if %{with doc}
 %package -n ghc-%{name}-doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -83,7 +79,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -149,9 +145,8 @@
 
 
 %if %{with doc}
-%files -n ghc-%{name}-doc
+%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %doc doc/haddock/*
 %endif
 
@@ -163,6 +158,10 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 2.4.2-1
+- update to 2.4.2
+- sync with cabal2spec-0.15
+
 * Mon Mar  9 2009 Jens Petersen <petersen at redhat.com> - 2.4.1-4
 - update to cabal2spec-0.12:
   - use global and bcond



From petersen at fedoraproject.org  Sat Apr 25 09:28:47 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 09:28:47 +0000 (UTC)
Subject: rpms/haddock/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090425092847.A6F73700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26979

Modified Files:
	.cvsignore sources 
Log Message:
2.4.2 source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haddock/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Dec 2008 09:27:12 -0000	1.7
+++ .cvsignore	25 Apr 2009 09:28:17 -0000	1.8
@@ -1 +1 @@
-haddock-2.4.1.tar.gz
+haddock-2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haddock/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Dec 2008 09:27:13 -0000	1.7
+++ sources	25 Apr 2009 09:28:17 -0000	1.8
@@ -1 +1 @@
-f474065cd6996b633bbc180b32b04013  haddock-2.4.1.tar.gz
+c1d5238faac72727921130eb792041a2  haddock-2.4.2.tar.gz



From petersen at fedoraproject.org  Sat Apr 25 09:31:37 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 09:31:37 +0000 (UTC)
Subject: rpms/ghc-haskell-src-exts/devel ghc-haskell-src-exts.spec,1.3,1.4
Message-ID: <20090425093137.510C0700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27495

Modified Files:
	ghc-haskell-src-exts.spec 
Log Message:
sync with cabal2spec-0.15


Index: ghc-haskell-src-exts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/ghc-haskell-src-exts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-haskell-src-exts.spec	19 Mar 2009 21:26:08 -0000	1.3
+++ ghc-haskell-src-exts.spec	25 Apr 2009 09:31:06 -0000	1.4
@@ -1,8 +1,4 @@
 %global pkg_name haskell-src-exts
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -12,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for Manipulating Haskell source
 Group:          Development/Libraries
 License:        BSD
@@ -21,12 +17,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+# for latest macros.ghc
+BuildRequires:  ghc >= 6.10.2-3
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 BuildRequires:  ghc-cpphs-devel
 BuildRequires:  ghc-cpphs-prof
@@ -93,7 +90,7 @@
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -138,14 +135,12 @@
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-#%%doc LICENSE
 %{_docdir}/%{name}-%{version}
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -156,6 +151,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.4.8-5
+- sync with cabal2spec-0.15
+- buildrequires >= 6.10.2-3 for latest macros
+
 * Thu Mar 19 2009 Conrad Meyer <konrad at tylerc.org> - 0.4.8-4
 - Update to new cabal2spec template.
 



From petersen at fedoraproject.org  Sat Apr 25 09:38:15 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 09:38:15 +0000 (UTC)
Subject: rpms/darcs/devel darcs.spec,1.46,1.47
Message-ID: <20090425093815.E0FD5700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/darcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28348

Modified Files:
	darcs.spec 
Log Message:
rebuild against ghc-6.10.2


Index: darcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- darcs.spec	26 Feb 2009 09:13:47 -0000	1.46
+++ darcs.spec	25 Apr 2009 09:37:45 -0000	1.47
@@ -2,7 +2,7 @@
 
 Name:           darcs
 Version:        2.2.1
-Release:        1%{?alphatag:.%{alphatag}}%{?dist}
+Release:        2%{?alphatag:.%{alphatag}}%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 2.2.1-2
+- rebuild against ghc-6.10.2
+
 * Tue Feb 24 2009 Jens Petersen <petersen at redhat.com> - 2.2.1-1
 - update to 2.2.1
 - own bash_completion.d (#487012)



From mjakubicek at fedoraproject.org  Sat Apr 25 10:03:57 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 25 Apr 2009 10:03:57 +0000 (UTC)
Subject: rpms/vtk/devel vtk.spec,1.18,1.19
Message-ID: <20090425100357.3D420700DD@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/vtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31876

Modified Files:
	vtk.spec 
Log Message:
- Do not forget slash in cmake paths (resolves BZ#490879).




Index: vtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vtk/devel/vtk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vtk.spec	13 Mar 2009 03:32:33 -0000	1.18
+++ vtk.spec	25 Apr 2009 10:03:26 -0000	1.19
@@ -7,7 +7,7 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # This is a variant BSD license, a cross between BSD and ZLIB.
 # For all intents, it has the same rights and restrictions as BSD.
 # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
@@ -138,11 +138,11 @@
  -DBUILD_EXAMPLES:BOOL=ON \
  -DBUILD_TESTING:BOOL=ON \
  -DDESIRED_QT_VERSION:STRING=3 \
- -DVTK_INSTALL_BIN_DIR:PATH=bin \
- -DVTK_INSTALL_DOC_DIR:PATH=share/vtk-5.2/doc \
- -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
- -DVTK_INSTALL_LIB_DIR:PATH=%{_lib}/vtk-5.2 \
- -DVTK_DATA_ROOT:PATH=share/vtkdata-%{version} \
+ -DVTK_INSTALL_BIN_DIR:PATH=/bin \
+ -DVTK_INSTALL_DOC_DIR:PATH=/share/vtk-5.2/doc \
+ -DVTK_INSTALL_INCLUDE_DIR:PATH=/include/vtk \
+ -DVTK_INSTALL_LIB_DIR:PATH=/%{_lib}/vtk-5.2 \
+ -DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \
  -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \
 %if %{with OSMesa}
  -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
@@ -373,6 +373,9 @@
 %doc vtk-examples-5.2/Examples
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.2.1-2
+- Do not forget slash in cmake paths (resolves BZ#490879).
+
 * Thu Mar 12 2009 Orion Poplawski <orion at cora.nwra.com> - 5.2.1-1
 - Update to 5.2.1
 - Update pythondestdir patch to use RPM_BUILD_ROOT



From rhughes at fedoraproject.org  Sat Apr 25 10:16:37 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Sat, 25 Apr 2009 10:16:37 +0000 (UTC)
Subject: rpms/DeviceKit-power/F-11
	DeviceKit-power-007-make-suspend-sync.patch, 
	NONE, 1.1 DeviceKit-power.spec, 1.11,
	1.12 DeviceKit-power-007-fix-compile.patch, 1.1, NONE
Message-ID: <20090425101637.CB754700DD@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv979

Modified Files:
	DeviceKit-power.spec 
Added Files:
	DeviceKit-power-007-make-suspend-sync.patch 
Removed Files:
	DeviceKit-power-007-fix-compile.patch 
Log Message:
* Sat Apr 25 2009 Richard Hughes  <rhughes at redhat.com> - 008-0.2.20090401git
- Backport a trivial patch from upstream to make the suspend and hibernate
  scripts execute synchronously, which makes the unlock dialog do the right
  thing on resume.
- Fixes rh#497563


DeviceKit-power-007-make-suspend-sync.patch:

--- NEW FILE DeviceKit-power-007-make-suspend-sync.patch ---
commit 6b197ebd5e0f914071a03f5e3da21e9045df12bc
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Apr 25 11:06:52 2009 +0100

    Make the suspend and hibernate scripts execute synchronously. Fixes rh#497563

diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
index fdcd21e..bcc6504 100644
--- a/src/dkp-daemon.c
+++ b/src/dkp-daemon.c
@@ -624,6 +624,8 @@ dkp_daemon_suspend (DkpDaemon *daemon, DBusGMethodInvocation *context)
 	GError *error;
 	GError *error_local = NULL;
 	PolKitCaller *caller;
+	gchar *stdout = NULL;
+	gchar *stderr = NULL;
 
 	caller = dkp_polkit_get_caller (daemon->priv->polkit, context);
 	if (caller == NULL)
@@ -632,17 +634,19 @@ dkp_daemon_suspend (DkpDaemon *daemon, DBusGMethodInvocation *context)
 	if (!dkp_polkit_check_auth (daemon->priv->polkit, caller, "org.freedesktop.devicekit.power.suspend", context))
 		goto out;
 
-	ret = g_spawn_command_line_async ("/usr/sbin/pm-suspend", &error_local);
+	ret = g_spawn_command_line_sync ("/usr/sbin/pm-suspend", &stdout, &stderr, NULL, &error_local);
 	if (!ret) {
 		error = g_error_new (DKP_DAEMON_ERROR,
 				     DKP_DAEMON_ERROR_GENERAL,
-				     "Cannot spawn: %s", error_local->message);
+				     "Failed to spawn: %s, stdout:%s, stderr:%s", error_local->message, stdout, stderr);
 		g_error_free (error_local);
 		dbus_g_method_return_error (context, error);
 		goto out;
 	}
 	dbus_g_method_return (context, NULL);
 out:
+	g_free (stdout);
+	g_free (stderr);
 	if (caller != NULL)
 		polkit_caller_unref (caller);
 	return TRUE;
@@ -658,6 +662,8 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
 	GError *error;
 	GError *error_local = NULL;
 	PolKitCaller *caller;
+	gchar *stdout = NULL;
+	gchar *stderr = NULL;
 
 	caller = dkp_polkit_get_caller (daemon->priv->polkit, context);
 	if (caller == NULL)
@@ -666,17 +672,19 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
 	if (!dkp_polkit_check_auth (daemon->priv->polkit, caller, "org.freedesktop.devicekit.power.hibernate", context))
 		goto out;
 
-	ret = g_spawn_command_line_async ("/usr/sbin/pm-hibernate", &error_local);
+	ret = g_spawn_command_line_sync ("/usr/sbin/pm-hibernate", &stdout, &stderr, NULL, &error_local);
 	if (!ret) {
 		error = g_error_new (DKP_DAEMON_ERROR,
 				     DKP_DAEMON_ERROR_GENERAL,
-				     "Cannot spawn: %s", error_local->message);
+				     "Failed to spawn: %s, stdout:%s, stderr:%s", error_local->message, stdout, stderr);
 		g_error_free (error_local);
 		dbus_g_method_return_error (context, error);
 		goto out;
 	}
 	dbus_g_method_return (context, NULL);
 out:
+	g_free (stdout);
+	g_free (stderr);
 	if (caller != NULL)
 		polkit_caller_unref (caller);
 	return TRUE;


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-11/DeviceKit-power.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DeviceKit-power.spec	1 Apr 2009 08:29:22 -0000	1.11
+++ DeviceKit-power.spec	25 Apr 2009 10:16:07 -0000	1.12
@@ -9,7 +9,7 @@
 Summary: Power Management Service
 Name: DeviceKit-power
 Version: 008
-Release: 0.1.%{?alphatag}git%{?dist}
+Release: 0.2.%{?alphatag}git%{?dist}
 #Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -17,6 +17,9 @@
 Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 
+# Already upstream: 6b197ebd5e0f914071a03f5e3da21e9045df12bc
+Patch0:    DeviceKit-power-007-make-suspend-sync.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -54,6 +57,7 @@
 %prep
 #%setup -q
 %setup -q -n %{?name}-%{?version}-%{?alphatag}
+%patch0 -p1 -b .suspend-sync
 
 %build
 %configure
@@ -111,6 +115,12 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Apr 25 2009 Richard Hughes  <rhughes at redhat.com> - 008-0.2.20090401git
+- Backport a trivial patch from upstream to make the suspend and hibernate
+  scripts execute synchronously, which makes the unlock dialog do the right
+  thing on resume.
+- Fixes rh#497563
+
 * Tue Apr 01 2009 Richard Hughes  <rhughes at redhat.com> - 008-0.1.20090401git
 - Update to todays git snapshot which works with the new permissive DBus.
 


--- DeviceKit-power-007-fix-compile.patch DELETED ---



From petersen at fedoraproject.org  Sat Apr 25 10:22:07 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 10:22:07 +0000 (UTC)
Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.18,1.19
Message-ID: <20090425102207.550A7700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3361

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
rebuild against ghc-6.10.2


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ghc-gtk2hs.spec	14 Apr 2009 10:01:05 -0000	1.18
+++ ghc-gtk2hs.spec	25 Apr 2009 10:21:36 -0000	1.19
@@ -1,10 +1,6 @@
 #%%global snapdate 20090125
 
 %global pkg_name gtk2hs
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}
 
 %bcond_without docs
 %bcond_without prof
@@ -28,7 +24,7 @@
 Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-gtk2hs
 Version:        0.10.0
-Release:        4%{?snapdate:.%{snapdate}}%{?dist}
+Release:        5%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -49,14 +45,14 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
 BuildRequires:  happy, alex
 %if %{with docs}
 BuildRequires:  haddock >= 2.4.1
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview2-devel
@@ -137,8 +133,8 @@
 Requires:       ghc = %{ghc_version}\
 Requires:       %{name}-common = %{version}-%{release}\
 Requires:       %2-devel, %{?3:ghc-%3-devel = %{version}-%{release}}\
-Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\
-Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\
+Requires(post): ghc = %{ghc_version}\
+Requires(preun): ghc = %{ghc_version}\
 # added for F11\
 Obsoletes:      ghc-%1 < 0.10.0-3\
 %{?4:Obsoletes:      %4 < 0.10.0}\
@@ -293,6 +289,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-5
+- rebuild against ghc-6.10.2
+
 * Tue Apr 14 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-4
 - use define not global to define subpackage since it broke ?3: expansion
 - require the subpackage dependency with -devel suffix



From mjakubicek at fedoraproject.org  Sat Apr 25 12:11:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 25 Apr 2009 12:11:27 +0000 (UTC)
Subject: rpms/MyPasswordSafe/F-11 MyPasswordSafe-20090425-gcc44.patch, NONE, 
	1.1 MyPasswordSafe.spec, 1.8, 1.9
Message-ID: <20090425121127.ACCBF70125@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/MyPasswordSafe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1937/F-11

Modified Files:
	MyPasswordSafe.spec 
Added Files:
	MyPasswordSafe-20090425-gcc44.patch 
Log Message:
- Fix FTBFS: added MyPasswordSafe-20090425-gcc44.patch



MyPasswordSafe-20090425-gcc44.patch:

--- NEW FILE MyPasswordSafe-20090425-gcc44.patch ---
--- src/pwsafe/Util.h.orig	2009-04-25 13:35:52.000000000 +0200
+++ src/pwsafe/Util.h	2009-04-25 13:46:50.000000000 +0200
@@ -173,7 +173,7 @@
 
 inline char * strFind( const char *str, const char *fstr )
 {
-	return strstr( str, fstr );
+	return (char *) strstr( str, fstr );
 }
 
 #if defined(UNICODE)


Index: MyPasswordSafe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MyPasswordSafe/F-11/MyPasswordSafe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MyPasswordSafe.spec	23 Feb 2009 22:03:48 -0000	1.8
+++ MyPasswordSafe.spec	25 Apr 2009 12:10:56 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           MyPasswordSafe
 Version:        0.6.7
-Release:        7.%{datever}%{?dist}
+Release:        8.%{datever}%{?dist}
 Summary:        A graphical password management tool
 
 Group:          Applications/Databases
@@ -11,7 +11,9 @@
 Source0:        http://www.semanticgap.com/myps/release/MyPasswordSafe-%{datever}.src.tgz
 Source1:        MyPasswordSafe.desktop
 Patch0:         MyPasswordSafe-20061216-use-system-uuid.patch
+# Both patches have been sent to support [AT]??semanticgap [DOT] com on 2009/04/25
 Patch1:         MyPasswordSafe-20061216-gcc43.patch
+Patch2:         MyPasswordSafe-20090425-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel, qt3-devel, uuid-devel, libXScrnSaver-devel
@@ -43,6 +45,9 @@
 # Fix regressions due to stricter GCC 4.3 checking
 %patch1 -p1 -b .gcc43
 
+# GCC 4.4 patch
+%patch2 -b .gcc44
+
 %build
 
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -74,6 +79,9 @@
 %{_datadir}/applications/fedora-MyPasswordSafe.desktop
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.7-8.20061216
+- Fix FTBFS: added MyPasswordSafe-20090425-gcc44.patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7-7.20061216
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sat Apr 25 12:11:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 25 Apr 2009 12:11:27 +0000 (UTC)
Subject: rpms/MyPasswordSafe/devel MyPasswordSafe-20090425-gcc44.patch, NONE,
	1.1 MyPasswordSafe.spec, 1.8, 1.9
Message-ID: <20090425121127.A5623700DD@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/MyPasswordSafe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1937/devel

Modified Files:
	MyPasswordSafe.spec 
Added Files:
	MyPasswordSafe-20090425-gcc44.patch 
Log Message:
- Fix FTBFS: added MyPasswordSafe-20090425-gcc44.patch



MyPasswordSafe-20090425-gcc44.patch:

--- NEW FILE MyPasswordSafe-20090425-gcc44.patch ---
--- src/pwsafe/Util.h.orig	2009-04-25 13:35:52.000000000 +0200
+++ src/pwsafe/Util.h	2009-04-25 13:46:50.000000000 +0200
@@ -173,7 +173,7 @@
 
 inline char * strFind( const char *str, const char *fstr )
 {
-	return strstr( str, fstr );
+	return (char *) strstr( str, fstr );
 }
 
 #if defined(UNICODE)


Index: MyPasswordSafe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MyPasswordSafe/devel/MyPasswordSafe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MyPasswordSafe.spec	23 Feb 2009 22:03:48 -0000	1.8
+++ MyPasswordSafe.spec	25 Apr 2009 12:10:57 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           MyPasswordSafe
 Version:        0.6.7
-Release:        7.%{datever}%{?dist}
+Release:        8.%{datever}%{?dist}
 Summary:        A graphical password management tool
 
 Group:          Applications/Databases
@@ -11,7 +11,9 @@
 Source0:        http://www.semanticgap.com/myps/release/MyPasswordSafe-%{datever}.src.tgz
 Source1:        MyPasswordSafe.desktop
 Patch0:         MyPasswordSafe-20061216-use-system-uuid.patch
+# Both patches have been sent to support [AT]??semanticgap [DOT] com on 2009/04/25
 Patch1:         MyPasswordSafe-20061216-gcc43.patch
+Patch2:         MyPasswordSafe-20090425-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel, qt3-devel, uuid-devel, libXScrnSaver-devel
@@ -43,6 +45,9 @@
 # Fix regressions due to stricter GCC 4.3 checking
 %patch1 -p1 -b .gcc43
 
+# GCC 4.4 patch
+%patch2 -b .gcc44
+
 %build
 
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -74,6 +79,9 @@
 %{_datadir}/applications/fedora-MyPasswordSafe.desktop
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.7-8.20061216
+- Fix FTBFS: added MyPasswordSafe-20090425-gcc44.patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7-7.20061216
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From petersen at fedoraproject.org  Sat Apr 25 12:14:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 12:14:54 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel ghc-HTTP.spec,1.7,1.8
Message-ID: <20090425121454.41165700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2475

Modified Files:
	ghc-HTTP.spec 
Log Message:
compile Setup on ppc to workaround runghc failure


Index: ghc-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/ghc-HTTP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc-HTTP.spec	24 Apr 2009 13:33:28 -0000	1.7
+++ ghc-HTTP.spec	25 Apr 2009 12:14:23 -0000	1.8
@@ -6,6 +6,11 @@
 # ghc does not emit debug information
 %global debug_package %{nil}
 
+%ifarch ppc
+# hack around mysterious runghc fail
+%global cabal ./cabal
+%endif
+
 Name:           ghc-%{pkg_name}
 Version:        4000.0.6
 Release:        1%{?dist}
@@ -76,6 +81,9 @@
 
 
 %build
+%ifarch ppc
+ghc --make Setup -o cabal
+%endif
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
@@ -137,9 +145,10 @@
 
 
 %changelog
-* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-1
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 4000.0.6-1
 - update to 4000.0.6
 - sync with cabal2spec-0.14
+- compile Setup on ppc to workaround runghc failure
 
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 4000.0.4-3
 - update url



From petersen at fedoraproject.org  Sat Apr 25 12:24:32 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 12:24:32 +0000 (UTC)
Subject: rpms/haddock/devel haddock.spec,1.20,1.21
Message-ID: <20090425122432.53BC8700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3884

Modified Files:
	haddock.spec 
Log Message:
compile Setup on ppc to workaround runghc failure


Index: haddock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- haddock.spec	25 Apr 2009 09:26:01 -0000	1.20
+++ haddock.spec	25 Apr 2009 12:24:01 -0000	1.21
@@ -4,6 +4,11 @@
 # ghc does not emit debug information
 %global debug_package %{nil}
 
+%ifarch ppc
+# hack around mysterious runghc fail
+%global cabal ./cabal
+%endif
+
 Name:           haddock
 Version:        2.4.2
 Release:        1%{?dist}
@@ -79,6 +84,9 @@
 
 
 %build
+%ifarch ppc
+ghc --make Setup -o cabal
+%endif
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
@@ -161,6 +169,7 @@
 * Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 2.4.2-1
 - update to 2.4.2
 - sync with cabal2spec-0.15
+- compile Setup on ppc to workaround runghc failure
 
 * Mon Mar  9 2009 Jens Petersen <petersen at redhat.com> - 2.4.1-4
 - update to cabal2spec-0.12:



From caolanm at fedoraproject.org  Sat Apr 25 12:33:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 25 Apr 2009 12:33:49 +0000 (UTC)
Subject: rpms/jcommon/devel .cvsignore, 1.3, 1.4 jcommon.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090425123349.CDEE8700DD@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/jcommon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5830

Modified Files:
	.cvsignore jcommon.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 10:46:43 -0000	1.3
+++ .cvsignore	25 Apr 2009 12:33:17 -0000	1.4
@@ -1 +1 @@
-jcommon-1.0.15.tar.gz
+jcommon-1.0.16.tar.gz


Index: jcommon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon/devel/jcommon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jcommon.spec	9 Mar 2009 10:46:43 -0000	1.6
+++ jcommon.spec	25 Apr 2009 12:33:17 -0000	1.7
@@ -2,7 +2,7 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: jcommon
-Version: 1.0.15
+Version: 1.0.16
 Release: 1%{?dist}
 Summary: JFree Java utility classes
 License: LGPLv2+
@@ -123,6 +123,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 25 2009 Caolan McNamara <caolanm at redhat.com> 1.0.16-1
+- latest version
+
 * Mon Mar 09 2009 Caolan McNamara <caolanm at redhat.com> 1.0.15-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2009 10:46:43 -0000	1.3
+++ sources	25 Apr 2009 12:33:17 -0000	1.4
@@ -1 +1 @@
-171cd005bf7bdd527bdd559be423500f  jcommon-1.0.15.tar.gz
+5fb774c225cdc7d15a99c9702031ae05  jcommon-1.0.16.tar.gz



From hadess at fedoraproject.org  Sat Apr 25 12:55:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 25 Apr 2009 12:55:01 +0000 (UTC)
Subject: rpms/obexd/F-11 .cvsignore, 1.7, 1.8 obexd.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <20090425125501.87E1A700DD@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9401

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.11-1
- Update to 0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Apr 2009 21:35:17 -0000	1.7
+++ .cvsignore	25 Apr 2009 12:54:30 -0000	1.8
@@ -1 +1 @@
-obexd-0.10.tar.gz
+obexd-0.11.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/F-11/obexd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obexd.spec	6 Apr 2009 21:35:17 -0000	1.7
+++ obexd.spec	25 Apr 2009 12:54:31 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		obexd
-Version:	0.10
+Version:	0.11
 Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
@@ -43,6 +43,9 @@
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.11-1
+- Update to 0.11
+
 * Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10-1
 - Update to 0.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Apr 2009 21:35:17 -0000	1.7
+++ sources	25 Apr 2009 12:54:31 -0000	1.8
@@ -1 +1 @@
-b9fbc1386b24f59b36aeb9d764c11fb5  obexd-0.10.tar.gz
+15cc666cd60505d8522a8206dce563dd  obexd-0.11.tar.gz



From hadess at fedoraproject.org  Sat Apr 25 13:04:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 25 Apr 2009 13:04:54 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.7, 1.8 obexd.spec, 1.7, 1.8 sources, 
	1.7, 1.8
Message-ID: <20090425130454.2CC14700DD@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11631

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.11-1
- Update to 0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Apr 2009 21:35:17 -0000	1.7
+++ .cvsignore	25 Apr 2009 13:04:23 -0000	1.8
@@ -1 +1 @@
-obexd-0.10.tar.gz
+obexd-0.11.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obexd.spec	6 Apr 2009 21:35:17 -0000	1.7
+++ obexd.spec	25 Apr 2009 13:04:23 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		obexd
-Version:	0.10
+Version:	0.11
 Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
@@ -43,6 +43,9 @@
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Sat Apr 25 2009 Bastien Nocera <bnocera at redhat.com> 0.11-1
+- Update to 0.11
+
 * Mon Apr 06 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10-1
 - Update to 0.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Apr 2009 21:35:17 -0000	1.7
+++ sources	25 Apr 2009 13:04:23 -0000	1.8
@@ -1 +1 @@
-b9fbc1386b24f59b36aeb9d764c11fb5  obexd-0.10.tar.gz
+15cc666cd60505d8522a8206dce563dd  obexd-0.11.tar.gz



From robert at fedoraproject.org  Sat Apr 25 14:14:52 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 25 Apr 2009 14:14:52 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.36, 1.37 phpMyAdmin.spec, 1.40, 
	1.41 sources, 1.36, 1.37
Message-ID: <20090425141452.BF7A4700DD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597/F-10

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	14 Apr 2009 17:56:19 -0000	1.36
+++ .cvsignore	25 Apr 2009 14:14:22 -0000	1.37
@@ -1 +1 @@
-phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+phpMyAdmin-3.1.4-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- phpMyAdmin.spec	14 Apr 2009 17:56:20 -0000	1.40
+++ phpMyAdmin.spec	25 Apr 2009 14:14:22 -0000	1.41
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.2
+Version: 3.1.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sat Apr 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.4-1
+- Upstream released 3.1.4
+
 * Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
 - Upstream released 3.1.3.2 (#495768)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Apr 2009 17:56:20 -0000	1.36
+++ sources	25 Apr 2009 14:14:22 -0000	1.37
@@ -1 +1 @@
-8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+fb9dbcbf607bfc12ed974d7500f24934  phpMyAdmin-3.1.4-all-languages.tar.bz2



From robert at fedoraproject.org  Sat Apr 25 14:14:53 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 25 Apr 2009 14:14:53 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.36, 1.37 phpMyAdmin.spec, 1.40,
	1.41 sources, 1.36, 1.37
Message-ID: <20090425141453.36266700DD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597/F-9

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	14 Apr 2009 17:56:20 -0000	1.36
+++ .cvsignore	25 Apr 2009 14:14:22 -0000	1.37
@@ -1 +1 @@
-phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+phpMyAdmin-3.1.4-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- phpMyAdmin.spec	14 Apr 2009 17:56:20 -0000	1.40
+++ phpMyAdmin.spec	25 Apr 2009 14:14:22 -0000	1.41
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.2
+Version: 3.1.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sat Apr 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.4-1
+- Upstream released 3.1.4
+
 * Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
 - Upstream released 3.1.3.2 (#495768)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Apr 2009 17:56:20 -0000	1.36
+++ sources	25 Apr 2009 14:14:22 -0000	1.37
@@ -1 +1 @@
-8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+fb9dbcbf607bfc12ed974d7500f24934  phpMyAdmin-3.1.4-all-languages.tar.bz2



From robert at fedoraproject.org  Sat Apr 25 14:14:53 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 25 Apr 2009 14:14:53 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.36, 1.37 phpMyAdmin.spec, 1.41, 
	1.42 sources, 1.36, 1.37
Message-ID: <20090425141453.6FC11700DD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	14 Apr 2009 17:56:20 -0000	1.36
+++ .cvsignore	25 Apr 2009 14:14:23 -0000	1.37
@@ -1 +1 @@
-phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+phpMyAdmin-3.1.4-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- phpMyAdmin.spec	14 Apr 2009 17:56:21 -0000	1.41
+++ phpMyAdmin.spec	25 Apr 2009 14:14:23 -0000	1.42
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.2
+Version: 3.1.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sat Apr 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.4-1
+- Upstream released 3.1.4
+
 * Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
 - Upstream released 3.1.3.2 (#495768)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Apr 2009 17:56:21 -0000	1.36
+++ sources	25 Apr 2009 14:14:23 -0000	1.37
@@ -1 +1 @@
-8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+fb9dbcbf607bfc12ed974d7500f24934  phpMyAdmin-3.1.4-all-languages.tar.bz2



From robert at fedoraproject.org  Sat Apr 25 14:14:52 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 25 Apr 2009 14:14:52 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-11 .cvsignore, 1.36, 1.37 phpMyAdmin.spec, 1.41, 
	1.42 sources, 1.36, 1.37
Message-ID: <20090425141452.EC44F70125@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597/F-11

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	14 Apr 2009 17:56:20 -0000	1.36
+++ .cvsignore	25 Apr 2009 14:14:22 -0000	1.37
@@ -1 +1 @@
-phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+phpMyAdmin-3.1.4-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- phpMyAdmin.spec	14 Apr 2009 17:56:21 -0000	1.41
+++ phpMyAdmin.spec	25 Apr 2009 14:14:22 -0000	1.42
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.3.2
+Version: 3.1.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sat Apr 25 2009 Robert Scheck <robert at fedoraproject.org> 3.1.4-1
+- Upstream released 3.1.4
+
 * Tue Apr 14 2009 Robert Scheck <robert at fedoraproject.org> 3.1.3.2-1
 - Upstream released 3.1.3.2 (#495768)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Apr 2009 17:56:21 -0000	1.36
+++ sources	25 Apr 2009 14:14:22 -0000	1.37
@@ -1 +1 @@
-8039f9f97521f8af46293eac37d623a8  phpMyAdmin-3.1.3.2-all-languages.tar.bz2
+fb9dbcbf607bfc12ed974d7500f24934  phpMyAdmin-3.1.4-all-languages.tar.bz2



From thm at fedoraproject.org  Sat Apr 25 14:48:09 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 25 Apr 2009 14:48:09 +0000 (UTC)
Subject: rpms/waf/devel .cvsignore, 1.11, 1.12 import.log, 1.6, 1.7 sources, 
	1.11, 1.12 waf.spec, 1.14, 1.15
Message-ID: <20090425144809.30D58700DD@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27689/devel

Modified Files:
	.cvsignore import.log sources waf.spec 
Log Message:
Update to 1.5.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Apr 2009 19:37:02 -0000	1.11
+++ .cvsignore	25 Apr 2009 14:47:37 -0000	1.12
@@ -1 +1 @@
-waf-1.5.4.stripped.tar.bz2
+waf-1.5.5.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	7 Apr 2009 19:37:02 -0000	1.6
+++ import.log	25 Apr 2009 14:47:38 -0000	1.7
@@ -4,3 +4,4 @@
 waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.src.rpm:1232128440
 waf-1_5_3-1_fc10:HEAD:waf-1.5.3-1.fc10.src.rpm:1233608182
 waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971
+waf-1_5_5-1_fc10:HEAD:waf-1.5.5-1.fc10.src.rpm:1240670795


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Apr 2009 19:37:02 -0000	1.11
+++ sources	25 Apr 2009 14:47:38 -0000	1.12
@@ -1 +1 @@
-35ba50ea6bdcb711d48d1c8842da1750  waf-1.5.4.stripped.tar.bz2
+37e7124312f27a226feea9f7cac01ec2  waf-1.5.5.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- waf.spec	7 Apr 2009 19:37:02 -0000	1.14
+++ waf.spec	25 Apr 2009 14:47:38 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.5-1
+- Update to 1.5.5.
+
 * Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.4-1
 - Update to 1.5.4.
 



From thm at fedoraproject.org  Sat Apr 25 15:00:31 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 25 Apr 2009 15:00:31 +0000 (UTC)
Subject: rpms/waf/F-11 .cvsignore, 1.11, 1.12 import.log, 1.6, 1.7 sources, 
	1.11, 1.12 waf.spec, 1.14, 1.15
Message-ID: <20090425150031.5187E700DD@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30460/F-11

Modified Files:
	.cvsignore import.log sources waf.spec 
Log Message:
Update to 1.5.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Apr 2009 19:37:02 -0000	1.11
+++ .cvsignore	25 Apr 2009 15:00:00 -0000	1.12
@@ -1 +1 @@
-waf-1.5.4.stripped.tar.bz2
+waf-1.5.5.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	7 Apr 2009 19:37:02 -0000	1.6
+++ import.log	25 Apr 2009 15:00:00 -0000	1.7
@@ -4,3 +4,4 @@
 waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.src.rpm:1232128440
 waf-1_5_3-1_fc10:HEAD:waf-1.5.3-1.fc10.src.rpm:1233608182
 waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971
+waf-1_5_5-1_fc10:F-11:waf-1.5.5-1.fc10.src.rpm:1240671397


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Apr 2009 19:37:02 -0000	1.11
+++ sources	25 Apr 2009 15:00:00 -0000	1.12
@@ -1 +1 @@
-35ba50ea6bdcb711d48d1c8842da1750  waf-1.5.4.stripped.tar.bz2
+37e7124312f27a226feea9f7cac01ec2  waf-1.5.5.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/waf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- waf.spec	7 Apr 2009 19:37:02 -0000	1.14
+++ waf.spec	25 Apr 2009 15:00:00 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Apr 20 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.5-1
+- Update to 1.5.5.
+
 * Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.4-1
 - Update to 1.5.4.
 



From thm at fedoraproject.org  Sat Apr 25 16:25:16 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 25 Apr 2009 16:25:16 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.20, 1.21 ikiwiki.spec, 1.22,
	1.23 import.log, 1.20, 1.21 sources, 1.20, 1.21
Message-ID: <20090425162517.2B1C0700DD@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14606/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	7 Apr 2009 19:45:57 -0000	1.20
+++ .cvsignore	25 Apr 2009 16:24:45 -0000	1.21
@@ -1 +1 @@
-ikiwiki_3.09.tar.gz
+ikiwiki_3.10.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ikiwiki.spec	7 Apr 2009 19:45:57 -0000	1.22
+++ ikiwiki.spec	25 Apr 2009 16:24:45 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.09
+Version:        3.10
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.10-1
+- Update to 3.10.
+
 * Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.09-1
 - Update to 3.09.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	7 Apr 2009 19:45:57 -0000	1.20
+++ import.log	25 Apr 2009 16:24:45 -0000	1.21
@@ -18,3 +18,4 @@
 ikiwiki-3_07-1_fc10:HEAD:ikiwiki-3.07-1.fc10.src.rpm:1236593624
 ikiwiki-3_08-1_fc10:HEAD:ikiwiki-3.08-1.fc10.src.rpm:1238186789
 ikiwiki-3_09-1_fc10:HEAD:ikiwiki-3.09-1.fc10.src.rpm:1239133519
+ikiwiki-3_10-1_fc10:HEAD:ikiwiki-3.10-1.fc10.src.rpm:1240676654


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Apr 2009 19:45:57 -0000	1.20
+++ sources	25 Apr 2009 16:24:45 -0000	1.21
@@ -1 +1 @@
-d22a52c2a514a0c2147b2dcbcfa6ec12  ikiwiki_3.09.tar.gz
+cb4659afe5076518498d8ed2e0304993  ikiwiki_3.10.tar.gz



From thm at fedoraproject.org  Sat Apr 25 16:31:45 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 25 Apr 2009 16:31:45 +0000 (UTC)
Subject: rpms/ikiwiki/F-11 .cvsignore, 1.20, 1.21 ikiwiki.spec, 1.22,
	1.23 import.log, 1.20, 1.21 sources, 1.20, 1.21
Message-ID: <20090425163145.5F973700DD@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15577/F-11

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	7 Apr 2009 19:45:57 -0000	1.20
+++ .cvsignore	25 Apr 2009 16:31:14 -0000	1.21
@@ -1 +1 @@
-ikiwiki_3.09.tar.gz
+ikiwiki_3.10.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/ikiwiki.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ikiwiki.spec	7 Apr 2009 19:45:57 -0000	1.22
+++ ikiwiki.spec	25 Apr 2009 16:31:14 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.09
+Version:        3.10
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.10-1
+- Update to 3.10.
+
 * Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.09-1
 - Update to 3.09.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	7 Apr 2009 19:45:57 -0000	1.20
+++ import.log	25 Apr 2009 16:31:14 -0000	1.21
@@ -18,3 +18,4 @@
 ikiwiki-3_07-1_fc10:HEAD:ikiwiki-3.07-1.fc10.src.rpm:1236593624
 ikiwiki-3_08-1_fc10:HEAD:ikiwiki-3.08-1.fc10.src.rpm:1238186789
 ikiwiki-3_09-1_fc10:HEAD:ikiwiki-3.09-1.fc10.src.rpm:1239133519
+ikiwiki-3_10-1_fc10:F-11:ikiwiki-3.10-1.fc10.src.rpm:1240677044


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Apr 2009 19:45:57 -0000	1.20
+++ sources	25 Apr 2009 16:31:14 -0000	1.21
@@ -1 +1 @@
-d22a52c2a514a0c2147b2dcbcfa6ec12  ikiwiki_3.09.tar.gz
+cb4659afe5076518498d8ed2e0304993  ikiwiki_3.10.tar.gz



From hubbitus at fedoraproject.org  Sat Apr 25 17:56:04 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 25 Apr 2009 17:56:04 +0000 (UTC)
Subject: rpms/gloox/devel gloox-1.0-GCC4.4-missing_includes.patch, NONE,
	1.1 gloox-1.0-SVNr4003.glibc-private-symbol.patch, NONE,
	1.1 gloox-1.0-beta-SVNr4003-missed_header.patch, NONE,
	1.1 gloox.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090425175604.DC9EB700DD@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29934/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gloox-1.0-GCC4.4-missing_includes.patch 
	gloox-1.0-SVNr4003.glibc-private-symbol.patch 
	gloox-1.0-beta-SVNr4003-missed_header.patch gloox.spec 
	import.log 
Log Message:
Initial import of gloox into Fedora.



gloox-1.0-GCC4.4-missing_includes.patch:

--- NEW FILE gloox-1.0-GCC4.4-missing_includes.patch ---
diff -NaurEbBH gloox-1.0.orig/src/examples/adhoc_example.cpp gloox-1.0/src/examples/adhoc_example.cpp
--- gloox-1.0.orig/src/examples/adhoc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/adhoc_example.cpp	2009-04-07 18:05:16.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 
 class AdhocTest : public ConnectionListener, AdhocCommandProvider, LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/annotations_example.cpp gloox-1.0/src/examples/annotations_example.cpp
--- gloox-1.0.orig/src/examples/annotations_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/annotations_example.cpp	2009-04-07 18:05:36.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class AnnotationsTest : public AnnotationsHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp gloox-1.0/src/examples/bookmarkstorage_example.cpp
--- gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bookmarkstorage_example.cpp	2009-04-07 18:05:55.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class BookmarkStorageTest : public BookmarkHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bosh_example.cpp gloox-1.0/src/examples/bosh_example.cpp
--- gloox-1.0.orig/src/examples/bosh_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bosh_example.cpp	2009-04-07 18:06:09.000000000 +0400
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/component_example.cpp gloox-1.0/src/examples/component_example.cpp
--- gloox-1.0.orig/src/examples/component_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/component_example.cpp	2009-04-07 18:06:21.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class ComponentTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/disco_example.cpp gloox-1.0/src/examples/disco_example.cpp
--- gloox-1.0.orig/src/examples/disco_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/disco_example.cpp	2009-04-07 18:06:36.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class DiscoTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_client.cpp gloox-1.0/src/examples/e2ee_client.cpp
--- gloox-1.0.orig/src/examples/e2ee_client.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_client.cpp	2009-04-07 18:06:54.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_server.cpp gloox-1.0/src/examples/e2ee_server.cpp
--- gloox-1.0.orig/src/examples/e2ee_server.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_server.cpp	2009-04-07 18:07:05.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/flexoff_example.cpp gloox-1.0/src/examples/flexoff_example.cpp
--- gloox-1.0.orig/src/examples/flexoff_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/flexoff_example.cpp	2009-04-07 18:07:18.000000000 +0400
@@ -15,6 +15,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class FlexOffTest : public MessageHandler, ConnectionListener, FlexibleOfflineHandler,
                            LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_recv.cpp gloox-1.0/src/examples/ft_recv.cpp
--- gloox-1.0.orig/src/examples/ft_recv.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_recv.cpp	2009-04-07 18:07:29.000000000 +0400
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_send.cpp gloox-1.0/src/examples/ft_send.cpp
--- gloox-1.0.orig/src/examples/ft_send.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_send.cpp	2009-04-07 18:07:46.000000000 +0400
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <ios>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/message_example.cpp gloox-1.0/src/examples/message_example.cpp
--- gloox-1.0.orig/src/examples/message_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/message_example.cpp	2009-04-07 18:08:03.000000000 +0400
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/muc_example.cpp gloox-1.0/src/examples/muc_example.cpp
--- gloox-1.0.orig/src/examples/muc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/muc_example.cpp	2009-04-07 18:08:16.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/prep_example.cpp gloox-1.0/src/examples/prep_example.cpp
--- gloox-1.0.orig/src/examples/prep_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/prep_example.cpp	2009-04-07 18:08:30.000000000 +0400
@@ -4,6 +4,8 @@
 #include <string>
 #include <iostream>
 
+#include <cstdio> // [s]print[f]
+
 int main( int /*argc*/, char** /*argv*/ )
 {
   std::string test = "OLD\\Administrator";
diff -NaurEbBH gloox-1.0.orig/src/examples/privacylist_example.cpp gloox-1.0/src/examples/privacylist_example.cpp
--- gloox-1.0.orig/src/examples/privacylist_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privacylist_example.cpp	2009-04-07 18:08:41.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PLTest : public PrivacyListHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/privatexml_example.cpp gloox-1.0/src/examples/privatexml_example.cpp
--- gloox-1.0.orig/src/examples/privatexml_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privatexml_example.cpp	2009-04-07 18:08:56.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PrivateXMLTest : public PrivateXMLHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/register_example.cpp gloox-1.0/src/examples/register_example.cpp
--- gloox-1.0.orig/src/examples/register_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/register_example.cpp	2009-04-07 18:09:28.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RegTest : public RegistrationHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/reset_example.cpp gloox-1.0/src/examples/reset_example.cpp
--- gloox-1.0.orig/src/examples/reset_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/reset_example.cpp	2009-04-07 18:09:39.000000000 +0400
@@ -10,6 +10,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/roster_example.cpp gloox-1.0/src/examples/roster_example.cpp
--- gloox-1.0.orig/src/examples/roster_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/roster_example.cpp	2009-04-07 18:09:52.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public RosterListener, ConnectionListener, LogHandler, MessageHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/vcard_example.cpp gloox-1.0/src/examples/vcard_example.cpp
--- gloox-1.0.orig/src/examples/vcard_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/vcard_example.cpp	2009-04-07 18:10:04.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class VCardTest : public ConnectionListener, LogHandler, VCardHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/md5.cpp gloox-1.0/src/md5.cpp
--- gloox-1.0.orig/src/md5.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/md5.cpp	2009-04-07 18:10:34.000000000 +0400
@@ -74,6 +74,8 @@
 #include <cstdio>
 #include <string.h>
 
+#include <cstdio> // [s]print[f]
+
 namespace gloox
 {
 // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp gloox-1.0/src/tests/adhoc/adhoc_test.cpp
--- gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoc/adhoc_test.cpp	2009-04-07 18:14:26.000000000 +0400
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-07 18:14:42.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-07 18:15:09.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/amp/amp_test.cpp gloox-1.0/src/tests/amp/amp_test.cpp
--- gloox-1.0.orig/src/tests/amp/amp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/amp/amp_test.cpp	2009-04-07 18:15:36.000000000 +0400
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
+
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/amprule/amprule_test.cpp gloox-1.0/src/tests/amprule/amprule_test.cpp
--- gloox-1.0.orig/src/tests/amprule/amprule_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/amprule/amprule_test.cpp	2009-04-07 18:15:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/base64/base64_test.cpp gloox-1.0/src/tests/base64/base64_test.cpp
--- gloox-1.0.orig/src/tests/base64/base64_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/base64/base64_test.cpp	2009-04-07 18:15:57.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp
--- gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-07 18:16:08.000000000 +0400
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/client/client_test.cpp gloox-1.0/src/tests/client/client_test.cpp
--- gloox-1.0.orig/src/tests/client/client_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/client/client_test.cpp	2009-04-07 18:16:30.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientTest : public Client, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp gloox-1.0/src/tests/clientbase/clientbase_test.cpp
--- gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/clientbase/clientbase_test.cpp	2009-04-07 18:16:38.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientBaseTest : public ClientBase, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp
--- gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-07 18:16:47.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int g_test = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/dataform/dataform_test.cpp gloox-1.0/src/tests/dataform/dataform_test.cpp
--- gloox-1.0.orig/src/tests/dataform/dataform_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataform/dataform_test.cpp	2009-04-07 18:16:56.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp
--- gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp	2009-04-07 18:17:05.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp
--- gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp	2009-04-07 18:17:13.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp
--- gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp	2009-04-07 18:17:22.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp
--- gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-07 18:17:31.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/disco/disco_test.cpp gloox-1.0/src/tests/disco/disco_test.cpp
--- gloox-1.0.orig/src/tests/disco/disco_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/disco/disco_test.cpp	2009-04-07 18:17:39.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp
--- gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp	2009-04-07 18:17:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp gloox-1.0/src/tests/discoitems/discoitems_test.cpp
--- gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoitems/discoitems_test.cpp	2009-04-07 18:17:58.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_ITEMS_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/error/error_test.cpp gloox-1.0/src/tests/error/error_test.cpp
--- gloox-1.0.orig/src/tests/error/error_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/error/error_test.cpp	2009-04-07 18:18:06.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp gloox-1.0/src/tests/featureneg/featureneg_test.cpp
--- gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/featureneg/featureneg_test.cpp	2009-04-07 18:18:15.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp	2009-04-07 18:18:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-07 18:18:37.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp
--- gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-07 18:18:47.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp
--- gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-07 18:18:57.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-07 18:19:09.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-07 18:19:19.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/iq/iq_test.cpp gloox-1.0/src/tests/iq/iq_test.cpp
--- gloox-1.0.orig/src/tests/iq/iq_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/iq/iq_test.cpp	2009-04-07 18:19:28.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_perf.cpp gloox-1.0/src/tests/jid/jid_perf.cpp
--- gloox-1.0.orig/src/tests/jid/jid_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_perf.cpp	2009-04-07 18:19:40.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_test.cpp gloox-1.0/src/tests/jid/jid_test.cpp
--- gloox-1.0.orig/src/tests/jid/jid_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_test.cpp	2009-04-07 18:19:51.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp
--- gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-07 18:20:01.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp
--- gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-07 18:20:10.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp
--- gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp	2009-04-07 18:20:33.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp
--- gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp	2009-04-07 18:20:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp
--- gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-07 18:20:55.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp
--- gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp	2009-04-07 18:21:04.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp
--- gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-07 18:21:13.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/md5/md5_test.cpp gloox-1.0/src/tests/md5/md5_test.cpp
--- gloox-1.0.orig/src/tests/md5/md5_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/md5/md5_test.cpp	2009-04-07 18:21:27.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/message/message_test.cpp gloox-1.0/src/tests/message/message_test.cpp
--- gloox-1.0.orig/src/tests/message/message_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/message/message_test.cpp	2009-04-07 18:21:36.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp
--- gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-07 18:21:50.000000000 +0400
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp
--- gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-07 18:22:06.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-07 18:22:14.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-07 18:22:24.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-07 18:22:32.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/nickname/nickname_test.cpp gloox-1.0/src/tests/nickname/nickname_test.cpp
--- gloox-1.0.orig/src/tests/nickname/nickname_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nickname/nickname_test.cpp	2009-04-07 18:22:40.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-07 18:22:50.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-07 18:23:13.000000000 +0400
@@ -7,10 +7,11 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
-             gloox::JID g_jid( "foof" );
+gloox::JID g_jid( "foof" );
 
-         namespace gloox
+namespace gloox
 {
   class Disco;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/oob/oob_test.cpp gloox-1.0/src/tests/oob/oob_test.cpp
--- gloox-1.0.orig/src/tests/oob/oob_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/oob/oob_test.cpp	2009-04-07 18:23:23.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/parser/parser_test.cpp gloox-1.0/src/tests/parser/parser_test.cpp
--- gloox-1.0.orig/src/tests/parser/parser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/parser/parser_test.cpp	2009-04-07 18:23:32.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ParserTest : private TagHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/prep/prep_test.cpp gloox-1.0/src/tests/prep/prep_test.cpp
--- gloox-1.0.orig/src/tests/prep/prep_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/prep/prep_test.cpp	2009-04-07 18:23:41.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/presence/presence_test.cpp gloox-1.0/src/tests/presence/presence_test.cpp
--- gloox-1.0.orig/src/tests/presence/presence_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/presence/presence_test.cpp	2009-04-07 18:23:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp
--- gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp	2009-04-07 18:23:58.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-07 18:24:07.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp gloox-1.0/src/tests/privatexml/privatexml_test.cpp
--- gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privatexml/privatexml_test.cpp	2009-04-07 18:24:19.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 Tag* t1 = 0;
 Tag* t2 = 0;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp
--- gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-07 18:24:33.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubevent.h"
 #include "../../tag.h"
 
+#include <cstdio> // [s]print[f]
+
 static int failed = 0;
 
 using namespace gloox;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-07 18:24:49.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubmanager.h"
 #include "../../pubsubresulthandler.h"
 
+#include <cstdio> // [s]print[f]
+
 using namespace gloox;
 
 class RH : public PubSub::ResultHandler
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-07 15:47:48.000000000 +0400
@@ -7,7 +7,7 @@
 using namespace gloox;
 
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 static const JID jid( "aaa at bbb.ccc" );
 static const std::string node( "node" );
diff -NaurEbBH gloox-1.0.orig/src/tests/receipt/receipt_test.cpp gloox-1.0/src/tests/receipt/receipt_test.cpp
--- gloox-1.0.orig/src/tests/receipt/receipt_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/receipt/receipt_test.cpp	2009-04-07 18:25:11.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/registration/registration_test.cpp gloox-1.0/src/tests/registration/registration_test.cpp
--- gloox-1.0.orig/src/tests/registration/registration_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registration/registration_test.cpp	2009-04-07 18:25:26.000000000 +0400
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_server = "test.server";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp
--- gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp	2009-04-07 18:25:36.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp
--- gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp	2009-04-07 18:25:45.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-07 18:25:54.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define ROSTERMANAGER_TEST
 #include "../../rostermanager.h"
diff -NaurEbBH gloox-1.0.orig/src/tests/search/search_test.cpp gloox-1.0/src/tests/search/search_test.cpp
--- gloox-1.0.orig/src/tests/search/search_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/search/search_test.cpp	2009-04-07 18:26:02.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp gloox-1.0/src/tests/searchquery/searchquery_test.cpp
--- gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/searchquery/searchquery_test.cpp	2009-04-07 18:26:10.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/sha/sha_test.cpp gloox-1.0/src/tests/sha/sha_test.cpp
--- gloox-1.0.orig/src/tests/sha/sha_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/sha/sha_test.cpp	2009-04-07 18:26:18.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/shim/shim_test.cpp gloox-1.0/src/tests/shim/shim_test.cpp
--- gloox-1.0.orig/src/tests/shim/shim_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/shim/shim_test.cpp	2009-04-07 18:26:27.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/simanager/simanager_test.cpp gloox-1.0/src/tests/simanager/simanager_test.cpp
--- gloox-1.0.orig/src/tests/simanager/simanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanager/simanager_test.cpp	2009-04-07 18:26:36.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp
--- gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp	2009-04-07 18:26:45.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp
--- gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-07 18:26:53.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class SETest : public StanzaExtension
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/subscription/subscription_test.cpp gloox-1.0/src/tests/subscription/subscription_test.cpp
--- gloox-1.0.orig/src/tests/subscription/subscription_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/subscription/subscription_test.cpp	2009-04-07 18:27:07.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_perf.cpp gloox-1.0/src/tests/tag/tag_perf.cpp
--- gloox-1.0.orig/src/tests/tag/tag_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_perf.cpp	2009-04-07 18:27:24.000000000 +0400
@@ -7,6 +7,7 @@
 #include <locale.h>
 #include <cstdlib>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_test.cpp gloox-1.0/src/tests/tag/tag_test.cpp
--- gloox-1.0.orig/src/tests/tag/tag_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_test.cpp	2009-04-07 18:27:41.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp
--- gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-07 18:27:49.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp
--- gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-07 18:27:57.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp
--- gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-07 18:28:05.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define UNIQUEMUCROOM_TEST
 #include "../../uniquemucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/util/util_test.cpp gloox-1.0/src/tests/util/util_test.cpp
--- gloox-1.0.orig/src/tests/util/util_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/util/util_test.cpp	2009-04-07 18:28:17.000000000 +0400
@@ -1,6 +1,7 @@
 #include "../../util.h"
 
 #include <string>
+#include <cstdio> // [s]print[f]
 
 using namespace gloox;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/vcard/vcard_test.cpp gloox-1.0/src/tests/vcard/vcard_test.cpp
--- gloox-1.0.orig/src/tests/vcard/vcard_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcard/vcard_test.cpp	2009-04-07 18:28:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp
--- gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-07 18:28:36.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/xpath/xpath_test.cpp gloox-1.0/src/tests/xpath/xpath_test.cpp
--- gloox-1.0.orig/src/tests/xpath/xpath_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/xpath/xpath_test.cpp	2009-04-07 18:28:45.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int fail = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp gloox-1.0/src/tests/zlib/zlib_perf.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_perf.cpp	2009-04-07 18:29:28.000000000 +0400
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <string>
 #include <sys/time.h>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_test.cpp gloox-1.0/src/tests/zlib/zlib_test.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_test.cpp	2009-04-07 18:29:40.000000000 +0400
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 

gloox-1.0-SVNr4003.glibc-private-symbol.patch:

--- NEW FILE gloox-1.0-SVNr4003.glibc-private-symbol.patch ---
diff -NaurEbBH gloox-1.0.orig/src/dns.cpp gloox-1.0/src/dns.cpp
--- gloox-1.0.orig/src/dns.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/dns.cpp	2009-04-07 13:08:48.000000000 +0400
@@ -40,6 +40,8 @@
 # include <unistd.h>
 #endif
 
+#include <errno.h>
+
 #ifdef _WIN32
 # include <winsock.h>
 #elif defined( _WIN32_WCE )
@@ -77,8 +79,151 @@
 
 namespace gloox
 {
-
 #if defined( HAVE_RES_QUERYDOMAIN ) && defined( HAVE_DN_SKIPNAME ) && defined( HAVE_RES_QUERY )
+
+#define      EMSGSIZE        40
+#define __set_errno(e) (errno = (e))
+/*
+ THIS IS TEMPORRARY UGLY HACK!
+
+Function ns_name_ntop marked as PRIVATE in recent versions of glibc
+ (See Changelog.13 2002-02-01  Jakub Jelinek  <jakub at redhat.com> in it).
+
+So, untill author do not fix gloox implementation I just copy this function (and reffered specail and printable plus digits variable)
+ from glibc 2.8-8 (resolv/ns_name.c) source and add prefix in name _TMP_
+*/
+
+static const char	digits[] = "0123456789";
+
+/*
+ * special(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this characted special ("in need of quoting") ?
+ * return:
+ *	boolean.
+ */
+static int
+special(int ch) {
+	switch (ch) {
+	case 0x22: /* '"' */
+	case 0x2E: /* '.' */
+	case 0x3B: /* ';' */
+	case 0x5C: /* '\\' */
+	/* Special modifiers in zone files. */
+	case 0x40: /* '@' */
+	case 0x24: /* '$' */
+		return (1);
+	default:
+		return (0);
+	}
+}
+
+/*
+ * printable(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this character visible and not a space when printed ?
+ * return:
+ *	boolean.
+ */
+static int
+printable(int ch) {
+	return (ch > 0x20 && ch < 0x7f);
+}
+
+int
+_TMP_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
+	const u_char *cp;
+	char *dn, *eom;
+	u_char c;
+	u_int n;
+
+	cp = src;
+	dn = dst;
+	eom = dst + dstsiz;
+
+	while ((n = *cp++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {
+			/* Some kind of compression pointer. */
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		if (dn != dst) {
+			if (dn >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '.';
+		}
+
+		if (n == 0x41) {
+			n = *cp++ / 8;
+			if (dn + n * 2 + 4 >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '\\';
+			*dn++ = '[';
+			*dn++ = 'x';
+
+			while (n-- > 0) {
+				c = *cp++;
+				unsigned u = c >> 4;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+				u = c & 0xf;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+			}
+
+			*dn++ = ']';
+			continue;
+		}
+
+		if (dn + n >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		for ((void)NULL; n > 0; n--) {
+			c = *cp++;
+			if (special(c)) {
+				if (dn + 1 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = (char)c;
+			} else if (!printable(c)) {
+				if (dn + 3 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = digits[c / 100];
+				*dn++ = digits[(c % 100) / 10];
+				*dn++ = digits[c % 10];
+			} else {
+				if (dn >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = (char)c;
+			}
+		}
+	}
+	if (dn == dst) {
+		if (dn >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		*dn++ = '.';
+	}
+	if (dn >= eom) {
+		__set_errno (EMSGSIZE);
+		return (-1);
+	}
+	*dn++ = '\0';
+	return (dn - dst);
+}
+
+
   DNS::HostMap DNS::resolve( const std::string& service, const std::string& proto,
                              const std::string& domain, const LogSink& logInstance )
   {
@@ -141,7 +286,7 @@
     {
       name srvname;
 
-      if( ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
+      if( _TMP_ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
       {
         //FIXME do we need to handle this? How? Can it actually happen at all?
 //         printf( "handle this error!\n" );

gloox-1.0-beta-SVNr4003-missed_header.patch:

--- NEW FILE gloox-1.0-beta-SVNr4003-missed_header.patch ---
diff -NaurEbBH gloox-1.0.orig/src/Makefile.am gloox-1.0/src/Makefile.am
--- gloox-1.0.orig/src/Makefile.am	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/Makefile.am	2009-04-05 16:34:41.000000000 +0400
@@ -238,6 +238,7 @@
 			registrationhandler.h \
 			resource.h \
 			rosteritem.h \
+			rosteritemdata.h \
 			rosterlistener.h \
 			rostermanager.h \
 			search.h \
@@ -277,7 +278,6 @@
 			nonsaslauth.h \
 			mucmessagesession.h \
 			prep.h \
-			rosteritemdata.h \
 			stanzaextensionfactory.h \
 			tlsgnutlsbase.h \
 			tlsgnutlsclient.h \


--- NEW FILE gloox.spec ---
#% define beta 7
%define SVN 4003

Name:		gloox
Version:		1.0
Release:		0.5.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
Summary:		A rock-solid, full-featured Jabber/XMPP client library
Group:		System Environment/Libraries
License:		GPLv2
URL:			http://camaya.net/gloox
#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2

# svn co -r4003 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
#	pushd gloox-1.0 && DATE=$( svn info -r4003 | sed -nr '/Last Changed Date/ s/.+: (.+?) \(.+/\1/p' ) && \
#	find -exec touch -c -d"$DATE" {} \; && popd && tar --exclude='.svn' --preserve -cjf gloox-1.0-SVNr4003.tar.bz2 gloox-1.0
Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2

#Patch1:		gloox-no_ns_get16.patch
#Patch1:		gloox-getaddrinfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool, autoconf, automake
BuildRequires:	openssl-devel >= 0.9.8
BuildRequires:	gnutls-devel >= 1.2
BuildRequires:	zlib-devel >= 1.2.3
BuildRequires:	libidn-devel >= 0.5

Requires(postun):	/sbin/ldconfig
Requires(post):	/sbin/ldconfig

# Temporary UGLY HACK for http://bugs.camaya.net/horde/whups/ticket/?id=137
Patch1:		gloox-1.0-SVNr4003.glibc-private-symbol.patch
# http://bugs.camaya.net/horde/whups/ticket/?id=140
Patch2:		gloox-1.0-beta-SVNr4003-missed_header.patch
# GCC 4.4 compatibility http://bugs.camaya.net/horde/whups/ticket/?id=141
Patch3:		gloox-1.0-GCC4.4-missing_includes.patch

%description
gloox is a rock-solid, full-featured Jabber/XMPP client library, written in
C++. It makes writing spec-compliant clients easy and allows for hassle-free
integration of Jabber/XMPP functionality into existing applications.

%package		devel
Summary:		Development files for %{name}
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
%patch1 -p1 -b .private-glibc
%patch2 -p1 -b .missed-header
%patch3 -p1 -b .gcc4.4-missing-includes

%build
%if 0%{?SVN}
./autogen.sh
%endif

%configure --disable-static
make %{?_smp_mflags}
# recode to UTF
mv -f AUTHORS AUTHORS.old
iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%{_libdir}/*.so

%changelog
* Fri Apr 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.5.SVNr4003
- Add --exclude='.svn' to tar pack source and set time to last commit. This may allow pass hash checking soucre later.

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.4.SVNr4003
- Add Patch3: gloox-1.0-GCC4.4-missing_includes.patch to allow build on GCC4.4

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.3.SVNr4003
- REmade patch1. Instead of just comment private stuff I use temporray ugly hack - copy-past function implementation from glibc source until
	author do not reimplement it properly.

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.2.SVNr4003
- Add patch2 gloox-1.0-beta-SVNr4003-missed_header.patch - see bug http://bugs.camaya.net/horde/whups/ticket/?id=140

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.1.SVNr4003
- qutIM require gloox version 1.0 with SVN revision >= 3873. Try build current.
- Patch1 (http://bugs.camaya.net/horde/whups/ticket/?id=137) little adopted (gloox-1.0-beta7.glibc-private-symbol.patch -> gloox-1.0-SVNr4003.glibc-private-symbol.patch).
- Add SVN part into Release tag.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.0.beta3
- Import http://www.salstar.sk/pub/fedora/SRPMS/10/gloox-1.0-0.0beta3.fc10.src.rpm
- Step to 1.0-beta7 version
- Reformat with tabs spec file.
- %%beta (replace %%beta_version) now represent only number. According it change all mention of it.
- Add Requires(postun): /sbin/ldconfig and Requires(post): /sbin/ldconfig

* Fri Mar 7 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.4-1
- update to upstream

* Mon Feb 28 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.3-1
- update to upstream

* Sun Dec 2 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-2
- removed patch
- added undef for HAVE_RES_QUERY, HAVE_RES_QUERYDOMAIN, HAVE_DN_SKIPNAME
  see: https://mail.camaya.net/horde/whups/ticket/?id=52

* Wed Nov 28 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-1
- update upstream
- added patch to avoid dependecny problem on libresolv.so.2(GLIBC_PRIVATE)

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.4.1-1
- first release


--- NEW FILE import.log ---
gloox-1_0-0_5_SVNr4003_fc9:HEAD:gloox-1.0-0.5.SVNr4003.fc9.src.rpm:1240682088


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:02:10 -0000	1.1
+++ .cvsignore	25 Apr 2009 17:55:34 -0000	1.2
@@ -0,0 +1 @@
+gloox-1.0-SVNr4003.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:02:10 -0000	1.1
+++ sources	25 Apr 2009 17:55:34 -0000	1.2
@@ -0,0 +1 @@
+f3ea4b0a8fdb44d0ad8715ac8a51001f  gloox-1.0-SVNr4003.tar.bz2



From pkgdb at fedoraproject.org  Sat Apr 25 18:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:07:29 +0000
Subject: [pkgdb] sip: rdieter has given up watchbugzilla
Message-ID: <20090425180729.AB69010F88A@bastion2.fedora.phx.redhat.com>

rdieter has given up the watchbugzilla acl on sip (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Sat Apr 25 18:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:07:39 +0000
Subject: [pkgdb] sip: rdieter has given up watchcommits
Message-ID: <20090425180740.69ACD10F88B@bastion2.fedora.phx.redhat.com>

rdieter has given up the watchcommits acl on sip (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Sat Apr 25 18:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:07:51 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180751.CD47C10F888@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ImageMagick (Fedora 11) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:07:56 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180756.A86AC10F889@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ImageMagick (Fedora 11) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:07:57 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180757.C9FA710F88D@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ImageMagick (Fedora 11) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:07:58 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180758.DF27A10F890@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ImageMagick (Fedora 11) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:08:11 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180811.96B0E10F888@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ImageMagick (Fedora 10) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:08:12 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180812.5205B10F892@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ImageMagick (Fedora 10) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:08:15 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180815.A4F5510F895@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ImageMagick (Fedora 10) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:08:19 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090425180819.39C1510F88D@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ImageMagick (Fedora 10) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From hubbitus at fedoraproject.org  Sat Apr 25 18:09:33 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 25 Apr 2009 18:09:33 +0000 (UTC)
Subject: rpms/gloox/F-9 gloox-1.0-GCC4.4-missing_includes.patch, NONE,
	1.1 gloox-1.0-SVNr4003.glibc-private-symbol.patch, NONE,
	1.1 gloox-1.0-beta-SVNr4003-missed_header.patch, NONE,
	1.1 gloox.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090425180933.39CB3700DD@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv358/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gloox-1.0-GCC4.4-missing_includes.patch 
	gloox-1.0-SVNr4003.glibc-private-symbol.patch 
	gloox-1.0-beta-SVNr4003-missed_header.patch gloox.spec 
	import.log 
Log Message:
Initial import of gloox into Fedora.



gloox-1.0-GCC4.4-missing_includes.patch:

--- NEW FILE gloox-1.0-GCC4.4-missing_includes.patch ---
diff -NaurEbBH gloox-1.0.orig/src/examples/adhoc_example.cpp gloox-1.0/src/examples/adhoc_example.cpp
--- gloox-1.0.orig/src/examples/adhoc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/adhoc_example.cpp	2009-04-07 18:05:16.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 
 class AdhocTest : public ConnectionListener, AdhocCommandProvider, LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/annotations_example.cpp gloox-1.0/src/examples/annotations_example.cpp
--- gloox-1.0.orig/src/examples/annotations_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/annotations_example.cpp	2009-04-07 18:05:36.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class AnnotationsTest : public AnnotationsHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp gloox-1.0/src/examples/bookmarkstorage_example.cpp
--- gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bookmarkstorage_example.cpp	2009-04-07 18:05:55.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class BookmarkStorageTest : public BookmarkHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bosh_example.cpp gloox-1.0/src/examples/bosh_example.cpp
--- gloox-1.0.orig/src/examples/bosh_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bosh_example.cpp	2009-04-07 18:06:09.000000000 +0400
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/component_example.cpp gloox-1.0/src/examples/component_example.cpp
--- gloox-1.0.orig/src/examples/component_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/component_example.cpp	2009-04-07 18:06:21.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class ComponentTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/disco_example.cpp gloox-1.0/src/examples/disco_example.cpp
--- gloox-1.0.orig/src/examples/disco_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/disco_example.cpp	2009-04-07 18:06:36.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class DiscoTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_client.cpp gloox-1.0/src/examples/e2ee_client.cpp
--- gloox-1.0.orig/src/examples/e2ee_client.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_client.cpp	2009-04-07 18:06:54.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_server.cpp gloox-1.0/src/examples/e2ee_server.cpp
--- gloox-1.0.orig/src/examples/e2ee_server.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_server.cpp	2009-04-07 18:07:05.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/flexoff_example.cpp gloox-1.0/src/examples/flexoff_example.cpp
--- gloox-1.0.orig/src/examples/flexoff_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/flexoff_example.cpp	2009-04-07 18:07:18.000000000 +0400
@@ -15,6 +15,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class FlexOffTest : public MessageHandler, ConnectionListener, FlexibleOfflineHandler,
                            LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_recv.cpp gloox-1.0/src/examples/ft_recv.cpp
--- gloox-1.0.orig/src/examples/ft_recv.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_recv.cpp	2009-04-07 18:07:29.000000000 +0400
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_send.cpp gloox-1.0/src/examples/ft_send.cpp
--- gloox-1.0.orig/src/examples/ft_send.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_send.cpp	2009-04-07 18:07:46.000000000 +0400
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <ios>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/message_example.cpp gloox-1.0/src/examples/message_example.cpp
--- gloox-1.0.orig/src/examples/message_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/message_example.cpp	2009-04-07 18:08:03.000000000 +0400
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/muc_example.cpp gloox-1.0/src/examples/muc_example.cpp
--- gloox-1.0.orig/src/examples/muc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/muc_example.cpp	2009-04-07 18:08:16.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/prep_example.cpp gloox-1.0/src/examples/prep_example.cpp
--- gloox-1.0.orig/src/examples/prep_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/prep_example.cpp	2009-04-07 18:08:30.000000000 +0400
@@ -4,6 +4,8 @@
 #include <string>
 #include <iostream>
 
+#include <cstdio> // [s]print[f]
+
 int main( int /*argc*/, char** /*argv*/ )
 {
   std::string test = "OLD\\Administrator";
diff -NaurEbBH gloox-1.0.orig/src/examples/privacylist_example.cpp gloox-1.0/src/examples/privacylist_example.cpp
--- gloox-1.0.orig/src/examples/privacylist_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privacylist_example.cpp	2009-04-07 18:08:41.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PLTest : public PrivacyListHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/privatexml_example.cpp gloox-1.0/src/examples/privatexml_example.cpp
--- gloox-1.0.orig/src/examples/privatexml_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privatexml_example.cpp	2009-04-07 18:08:56.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PrivateXMLTest : public PrivateXMLHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/register_example.cpp gloox-1.0/src/examples/register_example.cpp
--- gloox-1.0.orig/src/examples/register_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/register_example.cpp	2009-04-07 18:09:28.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RegTest : public RegistrationHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/reset_example.cpp gloox-1.0/src/examples/reset_example.cpp
--- gloox-1.0.orig/src/examples/reset_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/reset_example.cpp	2009-04-07 18:09:39.000000000 +0400
@@ -10,6 +10,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/roster_example.cpp gloox-1.0/src/examples/roster_example.cpp
--- gloox-1.0.orig/src/examples/roster_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/roster_example.cpp	2009-04-07 18:09:52.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public RosterListener, ConnectionListener, LogHandler, MessageHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/vcard_example.cpp gloox-1.0/src/examples/vcard_example.cpp
--- gloox-1.0.orig/src/examples/vcard_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/vcard_example.cpp	2009-04-07 18:10:04.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class VCardTest : public ConnectionListener, LogHandler, VCardHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/md5.cpp gloox-1.0/src/md5.cpp
--- gloox-1.0.orig/src/md5.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/md5.cpp	2009-04-07 18:10:34.000000000 +0400
@@ -74,6 +74,8 @@
 #include <cstdio>
 #include <string.h>
 
+#include <cstdio> // [s]print[f]
+
 namespace gloox
 {
 // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp gloox-1.0/src/tests/adhoc/adhoc_test.cpp
--- gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoc/adhoc_test.cpp	2009-04-07 18:14:26.000000000 +0400
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-07 18:14:42.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-07 18:15:09.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/amp/amp_test.cpp gloox-1.0/src/tests/amp/amp_test.cpp
--- gloox-1.0.orig/src/tests/amp/amp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/amp/amp_test.cpp	2009-04-07 18:15:36.000000000 +0400
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
+
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/amprule/amprule_test.cpp gloox-1.0/src/tests/amprule/amprule_test.cpp
--- gloox-1.0.orig/src/tests/amprule/amprule_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/amprule/amprule_test.cpp	2009-04-07 18:15:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/base64/base64_test.cpp gloox-1.0/src/tests/base64/base64_test.cpp
--- gloox-1.0.orig/src/tests/base64/base64_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/base64/base64_test.cpp	2009-04-07 18:15:57.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp
--- gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-07 18:16:08.000000000 +0400
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/client/client_test.cpp gloox-1.0/src/tests/client/client_test.cpp
--- gloox-1.0.orig/src/tests/client/client_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/client/client_test.cpp	2009-04-07 18:16:30.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientTest : public Client, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp gloox-1.0/src/tests/clientbase/clientbase_test.cpp
--- gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/clientbase/clientbase_test.cpp	2009-04-07 18:16:38.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientBaseTest : public ClientBase, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp
--- gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-07 18:16:47.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int g_test = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/dataform/dataform_test.cpp gloox-1.0/src/tests/dataform/dataform_test.cpp
--- gloox-1.0.orig/src/tests/dataform/dataform_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataform/dataform_test.cpp	2009-04-07 18:16:56.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp
--- gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp	2009-04-07 18:17:05.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp
--- gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp	2009-04-07 18:17:13.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp
--- gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp	2009-04-07 18:17:22.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp
--- gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-07 18:17:31.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/disco/disco_test.cpp gloox-1.0/src/tests/disco/disco_test.cpp
--- gloox-1.0.orig/src/tests/disco/disco_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/disco/disco_test.cpp	2009-04-07 18:17:39.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp
--- gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp	2009-04-07 18:17:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp gloox-1.0/src/tests/discoitems/discoitems_test.cpp
--- gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoitems/discoitems_test.cpp	2009-04-07 18:17:58.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_ITEMS_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/error/error_test.cpp gloox-1.0/src/tests/error/error_test.cpp
--- gloox-1.0.orig/src/tests/error/error_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/error/error_test.cpp	2009-04-07 18:18:06.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp gloox-1.0/src/tests/featureneg/featureneg_test.cpp
--- gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/featureneg/featureneg_test.cpp	2009-04-07 18:18:15.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp	2009-04-07 18:18:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-07 18:18:37.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp
--- gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-07 18:18:47.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp
--- gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-07 18:18:57.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-07 18:19:09.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-07 18:19:19.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/iq/iq_test.cpp gloox-1.0/src/tests/iq/iq_test.cpp
--- gloox-1.0.orig/src/tests/iq/iq_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/iq/iq_test.cpp	2009-04-07 18:19:28.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_perf.cpp gloox-1.0/src/tests/jid/jid_perf.cpp
--- gloox-1.0.orig/src/tests/jid/jid_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_perf.cpp	2009-04-07 18:19:40.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_test.cpp gloox-1.0/src/tests/jid/jid_test.cpp
--- gloox-1.0.orig/src/tests/jid/jid_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_test.cpp	2009-04-07 18:19:51.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp
--- gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-07 18:20:01.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp
--- gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-07 18:20:10.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp
--- gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp	2009-04-07 18:20:33.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp
--- gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp	2009-04-07 18:20:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp
--- gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-07 18:20:55.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp
--- gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp	2009-04-07 18:21:04.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp
--- gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-07 18:21:13.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/md5/md5_test.cpp gloox-1.0/src/tests/md5/md5_test.cpp
--- gloox-1.0.orig/src/tests/md5/md5_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/md5/md5_test.cpp	2009-04-07 18:21:27.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/message/message_test.cpp gloox-1.0/src/tests/message/message_test.cpp
--- gloox-1.0.orig/src/tests/message/message_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/message/message_test.cpp	2009-04-07 18:21:36.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp
--- gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-07 18:21:50.000000000 +0400
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp
--- gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-07 18:22:06.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-07 18:22:14.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-07 18:22:24.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-07 18:22:32.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/nickname/nickname_test.cpp gloox-1.0/src/tests/nickname/nickname_test.cpp
--- gloox-1.0.orig/src/tests/nickname/nickname_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nickname/nickname_test.cpp	2009-04-07 18:22:40.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-07 18:22:50.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-07 18:23:13.000000000 +0400
@@ -7,10 +7,11 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
-             gloox::JID g_jid( "foof" );
+gloox::JID g_jid( "foof" );
 
-         namespace gloox
+namespace gloox
 {
   class Disco;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/oob/oob_test.cpp gloox-1.0/src/tests/oob/oob_test.cpp
--- gloox-1.0.orig/src/tests/oob/oob_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/oob/oob_test.cpp	2009-04-07 18:23:23.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/parser/parser_test.cpp gloox-1.0/src/tests/parser/parser_test.cpp
--- gloox-1.0.orig/src/tests/parser/parser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/parser/parser_test.cpp	2009-04-07 18:23:32.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ParserTest : private TagHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/prep/prep_test.cpp gloox-1.0/src/tests/prep/prep_test.cpp
--- gloox-1.0.orig/src/tests/prep/prep_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/prep/prep_test.cpp	2009-04-07 18:23:41.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/presence/presence_test.cpp gloox-1.0/src/tests/presence/presence_test.cpp
--- gloox-1.0.orig/src/tests/presence/presence_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/presence/presence_test.cpp	2009-04-07 18:23:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp
--- gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp	2009-04-07 18:23:58.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-07 18:24:07.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp gloox-1.0/src/tests/privatexml/privatexml_test.cpp
--- gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privatexml/privatexml_test.cpp	2009-04-07 18:24:19.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 Tag* t1 = 0;
 Tag* t2 = 0;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp
--- gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-07 18:24:33.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubevent.h"
 #include "../../tag.h"
 
+#include <cstdio> // [s]print[f]
+
 static int failed = 0;
 
 using namespace gloox;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-07 18:24:49.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubmanager.h"
 #include "../../pubsubresulthandler.h"
 
+#include <cstdio> // [s]print[f]
+
 using namespace gloox;
 
 class RH : public PubSub::ResultHandler
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-07 15:47:48.000000000 +0400
@@ -7,7 +7,7 @@
 using namespace gloox;
 
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 static const JID jid( "aaa at bbb.ccc" );
 static const std::string node( "node" );
diff -NaurEbBH gloox-1.0.orig/src/tests/receipt/receipt_test.cpp gloox-1.0/src/tests/receipt/receipt_test.cpp
--- gloox-1.0.orig/src/tests/receipt/receipt_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/receipt/receipt_test.cpp	2009-04-07 18:25:11.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/registration/registration_test.cpp gloox-1.0/src/tests/registration/registration_test.cpp
--- gloox-1.0.orig/src/tests/registration/registration_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registration/registration_test.cpp	2009-04-07 18:25:26.000000000 +0400
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_server = "test.server";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp
--- gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp	2009-04-07 18:25:36.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp
--- gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp	2009-04-07 18:25:45.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-07 18:25:54.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define ROSTERMANAGER_TEST
 #include "../../rostermanager.h"
diff -NaurEbBH gloox-1.0.orig/src/tests/search/search_test.cpp gloox-1.0/src/tests/search/search_test.cpp
--- gloox-1.0.orig/src/tests/search/search_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/search/search_test.cpp	2009-04-07 18:26:02.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp gloox-1.0/src/tests/searchquery/searchquery_test.cpp
--- gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/searchquery/searchquery_test.cpp	2009-04-07 18:26:10.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/sha/sha_test.cpp gloox-1.0/src/tests/sha/sha_test.cpp
--- gloox-1.0.orig/src/tests/sha/sha_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/sha/sha_test.cpp	2009-04-07 18:26:18.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/shim/shim_test.cpp gloox-1.0/src/tests/shim/shim_test.cpp
--- gloox-1.0.orig/src/tests/shim/shim_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/shim/shim_test.cpp	2009-04-07 18:26:27.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/simanager/simanager_test.cpp gloox-1.0/src/tests/simanager/simanager_test.cpp
--- gloox-1.0.orig/src/tests/simanager/simanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanager/simanager_test.cpp	2009-04-07 18:26:36.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp
--- gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp	2009-04-07 18:26:45.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp
--- gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-07 18:26:53.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class SETest : public StanzaExtension
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/subscription/subscription_test.cpp gloox-1.0/src/tests/subscription/subscription_test.cpp
--- gloox-1.0.orig/src/tests/subscription/subscription_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/subscription/subscription_test.cpp	2009-04-07 18:27:07.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_perf.cpp gloox-1.0/src/tests/tag/tag_perf.cpp
--- gloox-1.0.orig/src/tests/tag/tag_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_perf.cpp	2009-04-07 18:27:24.000000000 +0400
@@ -7,6 +7,7 @@
 #include <locale.h>
 #include <cstdlib>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_test.cpp gloox-1.0/src/tests/tag/tag_test.cpp
--- gloox-1.0.orig/src/tests/tag/tag_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_test.cpp	2009-04-07 18:27:41.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp
--- gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-07 18:27:49.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp
--- gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-07 18:27:57.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp
--- gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-07 18:28:05.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define UNIQUEMUCROOM_TEST
 #include "../../uniquemucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/util/util_test.cpp gloox-1.0/src/tests/util/util_test.cpp
--- gloox-1.0.orig/src/tests/util/util_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/util/util_test.cpp	2009-04-07 18:28:17.000000000 +0400
@@ -1,6 +1,7 @@
 #include "../../util.h"
 
 #include <string>
+#include <cstdio> // [s]print[f]
 
 using namespace gloox;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/vcard/vcard_test.cpp gloox-1.0/src/tests/vcard/vcard_test.cpp
--- gloox-1.0.orig/src/tests/vcard/vcard_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcard/vcard_test.cpp	2009-04-07 18:28:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp
--- gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-07 18:28:36.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/xpath/xpath_test.cpp gloox-1.0/src/tests/xpath/xpath_test.cpp
--- gloox-1.0.orig/src/tests/xpath/xpath_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/xpath/xpath_test.cpp	2009-04-07 18:28:45.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int fail = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp gloox-1.0/src/tests/zlib/zlib_perf.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_perf.cpp	2009-04-07 18:29:28.000000000 +0400
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <string>
 #include <sys/time.h>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_test.cpp gloox-1.0/src/tests/zlib/zlib_test.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_test.cpp	2009-04-07 18:29:40.000000000 +0400
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 

gloox-1.0-SVNr4003.glibc-private-symbol.patch:

--- NEW FILE gloox-1.0-SVNr4003.glibc-private-symbol.patch ---
diff -NaurEbBH gloox-1.0.orig/src/dns.cpp gloox-1.0/src/dns.cpp
--- gloox-1.0.orig/src/dns.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/dns.cpp	2009-04-07 13:08:48.000000000 +0400
@@ -40,6 +40,8 @@
 # include <unistd.h>
 #endif
 
+#include <errno.h>
+
 #ifdef _WIN32
 # include <winsock.h>
 #elif defined( _WIN32_WCE )
@@ -77,8 +79,151 @@
 
 namespace gloox
 {
-
 #if defined( HAVE_RES_QUERYDOMAIN ) && defined( HAVE_DN_SKIPNAME ) && defined( HAVE_RES_QUERY )
+
+#define      EMSGSIZE        40
+#define __set_errno(e) (errno = (e))
+/*
+ THIS IS TEMPORRARY UGLY HACK!
+
+Function ns_name_ntop marked as PRIVATE in recent versions of glibc
+ (See Changelog.13 2002-02-01  Jakub Jelinek  <jakub at redhat.com> in it).
+
+So, untill author do not fix gloox implementation I just copy this function (and reffered specail and printable plus digits variable)
+ from glibc 2.8-8 (resolv/ns_name.c) source and add prefix in name _TMP_
+*/
+
+static const char	digits[] = "0123456789";
+
+/*
+ * special(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this characted special ("in need of quoting") ?
+ * return:
+ *	boolean.
+ */
+static int
+special(int ch) {
+	switch (ch) {
+	case 0x22: /* '"' */
+	case 0x2E: /* '.' */
+	case 0x3B: /* ';' */
+	case 0x5C: /* '\\' */
+	/* Special modifiers in zone files. */
+	case 0x40: /* '@' */
+	case 0x24: /* '$' */
+		return (1);
+	default:
+		return (0);
+	}
+}
+
+/*
+ * printable(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this character visible and not a space when printed ?
+ * return:
+ *	boolean.
+ */
+static int
+printable(int ch) {
+	return (ch > 0x20 && ch < 0x7f);
+}
+
+int
+_TMP_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
+	const u_char *cp;
+	char *dn, *eom;
+	u_char c;
+	u_int n;
+
+	cp = src;
+	dn = dst;
+	eom = dst + dstsiz;
+
+	while ((n = *cp++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {
+			/* Some kind of compression pointer. */
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		if (dn != dst) {
+			if (dn >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '.';
+		}
+
+		if (n == 0x41) {
+			n = *cp++ / 8;
+			if (dn + n * 2 + 4 >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '\\';
+			*dn++ = '[';
+			*dn++ = 'x';
+
+			while (n-- > 0) {
+				c = *cp++;
+				unsigned u = c >> 4;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+				u = c & 0xf;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+			}
+
+			*dn++ = ']';
+			continue;
+		}
+
+		if (dn + n >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		for ((void)NULL; n > 0; n--) {
+			c = *cp++;
+			if (special(c)) {
+				if (dn + 1 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = (char)c;
+			} else if (!printable(c)) {
+				if (dn + 3 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = digits[c / 100];
+				*dn++ = digits[(c % 100) / 10];
+				*dn++ = digits[c % 10];
+			} else {
+				if (dn >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = (char)c;
+			}
+		}
+	}
+	if (dn == dst) {
+		if (dn >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		*dn++ = '.';
+	}
+	if (dn >= eom) {
+		__set_errno (EMSGSIZE);
+		return (-1);
+	}
+	*dn++ = '\0';
+	return (dn - dst);
+}
+
+
   DNS::HostMap DNS::resolve( const std::string& service, const std::string& proto,
                              const std::string& domain, const LogSink& logInstance )
   {
@@ -141,7 +286,7 @@
     {
       name srvname;
 
-      if( ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
+      if( _TMP_ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
       {
         //FIXME do we need to handle this? How? Can it actually happen at all?
 //         printf( "handle this error!\n" );

gloox-1.0-beta-SVNr4003-missed_header.patch:

--- NEW FILE gloox-1.0-beta-SVNr4003-missed_header.patch ---
diff -NaurEbBH gloox-1.0.orig/src/Makefile.am gloox-1.0/src/Makefile.am
--- gloox-1.0.orig/src/Makefile.am	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/Makefile.am	2009-04-05 16:34:41.000000000 +0400
@@ -238,6 +238,7 @@
 			registrationhandler.h \
 			resource.h \
 			rosteritem.h \
+			rosteritemdata.h \
 			rosterlistener.h \
 			rostermanager.h \
 			search.h \
@@ -277,7 +278,6 @@
 			nonsaslauth.h \
 			mucmessagesession.h \
 			prep.h \
-			rosteritemdata.h \
 			stanzaextensionfactory.h \
 			tlsgnutlsbase.h \
 			tlsgnutlsclient.h \


--- NEW FILE gloox.spec ---
#% define beta 7
%define SVN 4003

Name:		gloox
Version:		1.0
Release:		0.5.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
Summary:		A rock-solid, full-featured Jabber/XMPP client library
Group:		System Environment/Libraries
License:		GPLv2
URL:			http://camaya.net/gloox
#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2

# svn co -r4003 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
#	pushd gloox-1.0 && DATE=$( svn info -r4003 | sed -nr '/Last Changed Date/ s/.+: (.+?) \(.+/\1/p' ) && \
#	find -exec touch -c -d"$DATE" {} \; && popd && tar --exclude='.svn' --preserve -cjf gloox-1.0-SVNr4003.tar.bz2 gloox-1.0
Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2

#Patch1:		gloox-no_ns_get16.patch
#Patch1:		gloox-getaddrinfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool, autoconf, automake
BuildRequires:	openssl-devel >= 0.9.8
BuildRequires:	gnutls-devel >= 1.2
BuildRequires:	zlib-devel >= 1.2.3
BuildRequires:	libidn-devel >= 0.5

Requires(postun):	/sbin/ldconfig
Requires(post):	/sbin/ldconfig

# Temporary UGLY HACK for http://bugs.camaya.net/horde/whups/ticket/?id=137
Patch1:		gloox-1.0-SVNr4003.glibc-private-symbol.patch
# http://bugs.camaya.net/horde/whups/ticket/?id=140
Patch2:		gloox-1.0-beta-SVNr4003-missed_header.patch
# GCC 4.4 compatibility http://bugs.camaya.net/horde/whups/ticket/?id=141
Patch3:		gloox-1.0-GCC4.4-missing_includes.patch

%description
gloox is a rock-solid, full-featured Jabber/XMPP client library, written in
C++. It makes writing spec-compliant clients easy and allows for hassle-free
integration of Jabber/XMPP functionality into existing applications.

%package		devel
Summary:		Development files for %{name}
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
%patch1 -p1 -b .private-glibc
%patch2 -p1 -b .missed-header
%patch3 -p1 -b .gcc4.4-missing-includes

%build
%if 0%{?SVN}
./autogen.sh
%endif

%configure --disable-static
make %{?_smp_mflags}
# recode to UTF
mv -f AUTHORS AUTHORS.old
iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%{_libdir}/*.so

%changelog
* Fri Apr 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.5.SVNr4003
- Add --exclude='.svn' to tar pack source and set time to last commit. This may allow pass hash checking soucre later.

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.4.SVNr4003
- Add Patch3: gloox-1.0-GCC4.4-missing_includes.patch to allow build on GCC4.4

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.3.SVNr4003
- REmade patch1. Instead of just comment private stuff I use temporray ugly hack - copy-past function implementation from glibc source until
	author do not reimplement it properly.

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.2.SVNr4003
- Add patch2 gloox-1.0-beta-SVNr4003-missed_header.patch - see bug http://bugs.camaya.net/horde/whups/ticket/?id=140

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.1.SVNr4003
- qutIM require gloox version 1.0 with SVN revision >= 3873. Try build current.
- Patch1 (http://bugs.camaya.net/horde/whups/ticket/?id=137) little adopted (gloox-1.0-beta7.glibc-private-symbol.patch -> gloox-1.0-SVNr4003.glibc-private-symbol.patch).
- Add SVN part into Release tag.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.0.beta3
- Import http://www.salstar.sk/pub/fedora/SRPMS/10/gloox-1.0-0.0beta3.fc10.src.rpm
- Step to 1.0-beta7 version
- Reformat with tabs spec file.
- %%beta (replace %%beta_version) now represent only number. According it change all mention of it.
- Add Requires(postun): /sbin/ldconfig and Requires(post): /sbin/ldconfig

* Fri Mar 7 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.4-1
- update to upstream

* Mon Feb 28 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.3-1
- update to upstream

* Sun Dec 2 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-2
- removed patch
- added undef for HAVE_RES_QUERY, HAVE_RES_QUERYDOMAIN, HAVE_DN_SKIPNAME
  see: https://mail.camaya.net/horde/whups/ticket/?id=52

* Wed Nov 28 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-1
- update upstream
- added patch to avoid dependecny problem on libresolv.so.2(GLIBC_PRIVATE)

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.4.1-1
- first release


--- NEW FILE import.log ---
gloox-1_0-0_5_SVNr4003_fc9:F-9:gloox-1.0-0.5.SVNr4003.fc9.src.rpm:1240682750


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:02:10 -0000	1.1
+++ .cvsignore	25 Apr 2009 18:09:02 -0000	1.2
@@ -0,0 +1 @@
+gloox-1.0-SVNr4003.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:02:10 -0000	1.1
+++ sources	25 Apr 2009 18:09:02 -0000	1.2
@@ -0,0 +1 @@
+f3ea4b0a8fdb44d0ad8715ac8a51001f  gloox-1.0-SVNr4003.tar.bz2



From thm at fedoraproject.org  Sat Apr 25 18:23:25 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 25 Apr 2009 18:23:25 +0000 (UTC)
Subject: rpms/botan/devel .cvsignore, 1.3, 1.4 botan.spec, 1.5,
	1.6 import.log, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090425182325.A791C700DD@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3246/devel

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2009 14:13:29 -0000	1.3
+++ .cvsignore	25 Apr 2009 18:22:54 -0000	1.4
@@ -1 +1 @@
-Botan-1.8.1.tgz
+Botan-1.8.2.tgz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- botan.spec	16 Mar 2009 09:19:28 -0000	1.5
+++ botan.spec	25 Apr 2009 18:22:55 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.1
-Release:        4%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.2-1
+- Update to 1.8.2.
+
 * Mon Mar 16 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.1-4
 - Add missing requirements to -devel package.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	16 Mar 2009 09:19:28 -0000	1.3
+++ import.log	25 Apr 2009 18:22:55 -0000	1.4
@@ -1,3 +1,4 @@
 botan-1_8_0-2_fc10:HEAD:botan-1.8.0-2.fc10.src.rpm:1232354502
 botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc10.src.rpm:1232633562
 botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc10.src.rpm:1237195036
+botan-1_8_2-1_fc10:HEAD:botan-1.8.2-1.fc10.src.rpm:1240683730


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2009 14:13:29 -0000	1.3
+++ sources	25 Apr 2009 18:22:55 -0000	1.4
@@ -1 +1 @@
-ff5ddc348cc306d4e5674b8be12ac836  Botan-1.8.1.tgz
+f2eff7f7d35662c8242a569a124a65f5  Botan-1.8.2.tgz



From tuxbrewr at fedoraproject.org  Sat Apr 25 18:25:01 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 25 Apr 2009 18:25:01 +0000 (UTC)
Subject: rpms/quassel/F-10 .cvsignore, 1.7, 1.8 quassel.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20090425182501.AFF7A700DD@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3536

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Feb 2009 20:28:41 -0000	1.7
+++ .cvsignore	25 Apr 2009 18:24:31 -0000	1.8
@@ -1 +1 @@
-quassel-0.4.0.tar.bz2
+quassel-0.4.1.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-10/quassel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- quassel.spec	14 Apr 2009 23:53:13 -0000	1.8
+++ quassel.spec	25 Apr 2009 18:24:31 -0000	1.9
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
-Version: 0.4.0
-Release: 2%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -153,6 +153,9 @@
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Fri Apr 24 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.1-1
+- New upstream release
+
 * Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-2
 - Enabled KDE integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2009 20:28:42 -0000	1.7
+++ sources	25 Apr 2009 18:24:31 -0000	1.8
@@ -1 +1 @@
-441295f4c47b3d68b930152026d14694  quassel-0.4.0.tar.bz2
+bf89e3ff2e12c64d9cf8b1445e46039f  quassel-0.4.1.tar.bz2



From thm at fedoraproject.org  Sat Apr 25 18:30:44 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 25 Apr 2009 18:30:44 +0000 (UTC)
Subject: rpms/monotone/devel monotone.spec,1.45,1.46
Message-ID: <20090425183044.56CC9700DD@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3978

Modified Files:
	monotone.spec 
Log Message:
Rebuilt for new botan version.


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- monotone.spec	28 Mar 2009 10:57:55 -0000	1.45
+++ monotone.spec	25 Apr 2009 18:30:13 -0000	1.46
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.43
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -191,6 +191,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.43-2
+- Rebuilt for new botan version.
+
 * Fri Mar 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.43-1
 - Update to 0.43.
 - Add BRs for libraries monotone doesn't bundle anylonger.



From tuxbrewr at fedoraproject.org  Sat Apr 25 18:36:33 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 25 Apr 2009 18:36:33 +0000 (UTC)
Subject: rpms/quassel/F-11 .cvsignore, 1.7, 1.8 quassel.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090425183633.5D126700DD@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4878

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Feb 2009 20:20:51 -0000	1.7
+++ .cvsignore	25 Apr 2009 18:36:02 -0000	1.8
@@ -1 +1 @@
-quassel-0.4.0.tar.bz2
+quassel-0.4.1.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-11/quassel.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- quassel.spec	14 Apr 2009 23:40:24 -0000	1.9
+++ quassel.spec	25 Apr 2009 18:36:03 -0000	1.10
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
-Version: 0.4.0
-Release: 3%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -113,7 +113,6 @@
 %attr(755,root,root) %{_bindir}/quasselcore
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
 
-
 %files client 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselclient
@@ -154,11 +153,11 @@
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
-* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-3
-- Enabled KDE integration
+* Fri Apr 24 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.1-1
+- New upstream release
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-2
+- Enabled KDE integration
 
 * Fri Feb 20 2009 Steven M. Parirsh <tuxbrewr at fedoraproject.org> 0.4.0-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2009 20:20:51 -0000	1.7
+++ sources	25 Apr 2009 18:36:03 -0000	1.8
@@ -1 +1 @@
-441295f4c47b3d68b930152026d14694  quassel-0.4.0.tar.bz2
+bf89e3ff2e12c64d9cf8b1445e46039f  quassel-0.4.1.tar.bz2



From hubbitus at fedoraproject.org  Sat Apr 25 18:44:47 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 25 Apr 2009 18:44:47 +0000 (UTC)
Subject: rpms/gloox/F-10 gloox-1.0-GCC4.4-missing_includes.patch, NONE,
	1.1 gloox-1.0-SVNr4003.glibc-private-symbol.patch, NONE,
	1.1 gloox-1.0-beta-SVNr4003-missed_header.patch, NONE,
	1.1 gloox.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090425184448.00E64700DD@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5420/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gloox-1.0-GCC4.4-missing_includes.patch 
	gloox-1.0-SVNr4003.glibc-private-symbol.patch 
	gloox-1.0-beta-SVNr4003-missed_header.patch gloox.spec 
	import.log 
Log Message:
Initial import of gloox into Fedora.



gloox-1.0-GCC4.4-missing_includes.patch:

--- NEW FILE gloox-1.0-GCC4.4-missing_includes.patch ---
diff -NaurEbBH gloox-1.0.orig/src/examples/adhoc_example.cpp gloox-1.0/src/examples/adhoc_example.cpp
--- gloox-1.0.orig/src/examples/adhoc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/adhoc_example.cpp	2009-04-07 18:05:16.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 
 class AdhocTest : public ConnectionListener, AdhocCommandProvider, LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/annotations_example.cpp gloox-1.0/src/examples/annotations_example.cpp
--- gloox-1.0.orig/src/examples/annotations_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/annotations_example.cpp	2009-04-07 18:05:36.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class AnnotationsTest : public AnnotationsHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp gloox-1.0/src/examples/bookmarkstorage_example.cpp
--- gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bookmarkstorage_example.cpp	2009-04-07 18:05:55.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class BookmarkStorageTest : public BookmarkHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bosh_example.cpp gloox-1.0/src/examples/bosh_example.cpp
--- gloox-1.0.orig/src/examples/bosh_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bosh_example.cpp	2009-04-07 18:06:09.000000000 +0400
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/component_example.cpp gloox-1.0/src/examples/component_example.cpp
--- gloox-1.0.orig/src/examples/component_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/component_example.cpp	2009-04-07 18:06:21.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class ComponentTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/disco_example.cpp gloox-1.0/src/examples/disco_example.cpp
--- gloox-1.0.orig/src/examples/disco_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/disco_example.cpp	2009-04-07 18:06:36.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class DiscoTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_client.cpp gloox-1.0/src/examples/e2ee_client.cpp
--- gloox-1.0.orig/src/examples/e2ee_client.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_client.cpp	2009-04-07 18:06:54.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_server.cpp gloox-1.0/src/examples/e2ee_server.cpp
--- gloox-1.0.orig/src/examples/e2ee_server.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_server.cpp	2009-04-07 18:07:05.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/flexoff_example.cpp gloox-1.0/src/examples/flexoff_example.cpp
--- gloox-1.0.orig/src/examples/flexoff_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/flexoff_example.cpp	2009-04-07 18:07:18.000000000 +0400
@@ -15,6 +15,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class FlexOffTest : public MessageHandler, ConnectionListener, FlexibleOfflineHandler,
                            LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_recv.cpp gloox-1.0/src/examples/ft_recv.cpp
--- gloox-1.0.orig/src/examples/ft_recv.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_recv.cpp	2009-04-07 18:07:29.000000000 +0400
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_send.cpp gloox-1.0/src/examples/ft_send.cpp
--- gloox-1.0.orig/src/examples/ft_send.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_send.cpp	2009-04-07 18:07:46.000000000 +0400
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <ios>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/message_example.cpp gloox-1.0/src/examples/message_example.cpp
--- gloox-1.0.orig/src/examples/message_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/message_example.cpp	2009-04-07 18:08:03.000000000 +0400
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/muc_example.cpp gloox-1.0/src/examples/muc_example.cpp
--- gloox-1.0.orig/src/examples/muc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/muc_example.cpp	2009-04-07 18:08:16.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/prep_example.cpp gloox-1.0/src/examples/prep_example.cpp
--- gloox-1.0.orig/src/examples/prep_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/prep_example.cpp	2009-04-07 18:08:30.000000000 +0400
@@ -4,6 +4,8 @@
 #include <string>
 #include <iostream>
 
+#include <cstdio> // [s]print[f]
+
 int main( int /*argc*/, char** /*argv*/ )
 {
   std::string test = "OLD\\Administrator";
diff -NaurEbBH gloox-1.0.orig/src/examples/privacylist_example.cpp gloox-1.0/src/examples/privacylist_example.cpp
--- gloox-1.0.orig/src/examples/privacylist_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privacylist_example.cpp	2009-04-07 18:08:41.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PLTest : public PrivacyListHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/privatexml_example.cpp gloox-1.0/src/examples/privatexml_example.cpp
--- gloox-1.0.orig/src/examples/privatexml_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privatexml_example.cpp	2009-04-07 18:08:56.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PrivateXMLTest : public PrivateXMLHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/register_example.cpp gloox-1.0/src/examples/register_example.cpp
--- gloox-1.0.orig/src/examples/register_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/register_example.cpp	2009-04-07 18:09:28.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RegTest : public RegistrationHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/reset_example.cpp gloox-1.0/src/examples/reset_example.cpp
--- gloox-1.0.orig/src/examples/reset_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/reset_example.cpp	2009-04-07 18:09:39.000000000 +0400
@@ -10,6 +10,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/roster_example.cpp gloox-1.0/src/examples/roster_example.cpp
--- gloox-1.0.orig/src/examples/roster_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/roster_example.cpp	2009-04-07 18:09:52.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public RosterListener, ConnectionListener, LogHandler, MessageHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/vcard_example.cpp gloox-1.0/src/examples/vcard_example.cpp
--- gloox-1.0.orig/src/examples/vcard_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/vcard_example.cpp	2009-04-07 18:10:04.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class VCardTest : public ConnectionListener, LogHandler, VCardHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/md5.cpp gloox-1.0/src/md5.cpp
--- gloox-1.0.orig/src/md5.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/md5.cpp	2009-04-07 18:10:34.000000000 +0400
@@ -74,6 +74,8 @@
 #include <cstdio>
 #include <string.h>
 
+#include <cstdio> // [s]print[f]
+
 namespace gloox
 {
 // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp gloox-1.0/src/tests/adhoc/adhoc_test.cpp
--- gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoc/adhoc_test.cpp	2009-04-07 18:14:26.000000000 +0400
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-07 18:14:42.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-07 18:15:09.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/amp/amp_test.cpp gloox-1.0/src/tests/amp/amp_test.cpp
--- gloox-1.0.orig/src/tests/amp/amp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/amp/amp_test.cpp	2009-04-07 18:15:36.000000000 +0400
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
+
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/amprule/amprule_test.cpp gloox-1.0/src/tests/amprule/amprule_test.cpp
--- gloox-1.0.orig/src/tests/amprule/amprule_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/amprule/amprule_test.cpp	2009-04-07 18:15:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/base64/base64_test.cpp gloox-1.0/src/tests/base64/base64_test.cpp
--- gloox-1.0.orig/src/tests/base64/base64_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/base64/base64_test.cpp	2009-04-07 18:15:57.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp
--- gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-07 18:16:08.000000000 +0400
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/client/client_test.cpp gloox-1.0/src/tests/client/client_test.cpp
--- gloox-1.0.orig/src/tests/client/client_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/client/client_test.cpp	2009-04-07 18:16:30.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientTest : public Client, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp gloox-1.0/src/tests/clientbase/clientbase_test.cpp
--- gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/clientbase/clientbase_test.cpp	2009-04-07 18:16:38.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientBaseTest : public ClientBase, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp
--- gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-07 18:16:47.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int g_test = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/dataform/dataform_test.cpp gloox-1.0/src/tests/dataform/dataform_test.cpp
--- gloox-1.0.orig/src/tests/dataform/dataform_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataform/dataform_test.cpp	2009-04-07 18:16:56.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp
--- gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp	2009-04-07 18:17:05.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp
--- gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp	2009-04-07 18:17:13.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp
--- gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp	2009-04-07 18:17:22.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp
--- gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-07 18:17:31.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/disco/disco_test.cpp gloox-1.0/src/tests/disco/disco_test.cpp
--- gloox-1.0.orig/src/tests/disco/disco_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/disco/disco_test.cpp	2009-04-07 18:17:39.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp
--- gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp	2009-04-07 18:17:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp gloox-1.0/src/tests/discoitems/discoitems_test.cpp
--- gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoitems/discoitems_test.cpp	2009-04-07 18:17:58.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_ITEMS_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/error/error_test.cpp gloox-1.0/src/tests/error/error_test.cpp
--- gloox-1.0.orig/src/tests/error/error_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/error/error_test.cpp	2009-04-07 18:18:06.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp gloox-1.0/src/tests/featureneg/featureneg_test.cpp
--- gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/featureneg/featureneg_test.cpp	2009-04-07 18:18:15.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp	2009-04-07 18:18:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-07 18:18:37.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp
--- gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-07 18:18:47.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp
--- gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-07 18:18:57.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-07 18:19:09.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-07 18:19:19.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/iq/iq_test.cpp gloox-1.0/src/tests/iq/iq_test.cpp
--- gloox-1.0.orig/src/tests/iq/iq_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/iq/iq_test.cpp	2009-04-07 18:19:28.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_perf.cpp gloox-1.0/src/tests/jid/jid_perf.cpp
--- gloox-1.0.orig/src/tests/jid/jid_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_perf.cpp	2009-04-07 18:19:40.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_test.cpp gloox-1.0/src/tests/jid/jid_test.cpp
--- gloox-1.0.orig/src/tests/jid/jid_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_test.cpp	2009-04-07 18:19:51.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp
--- gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-07 18:20:01.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp
--- gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-07 18:20:10.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp
--- gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp	2009-04-07 18:20:33.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp
--- gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp	2009-04-07 18:20:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp
--- gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-07 18:20:55.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp
--- gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp	2009-04-07 18:21:04.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp
--- gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-07 18:21:13.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/md5/md5_test.cpp gloox-1.0/src/tests/md5/md5_test.cpp
--- gloox-1.0.orig/src/tests/md5/md5_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/md5/md5_test.cpp	2009-04-07 18:21:27.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/message/message_test.cpp gloox-1.0/src/tests/message/message_test.cpp
--- gloox-1.0.orig/src/tests/message/message_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/message/message_test.cpp	2009-04-07 18:21:36.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp
--- gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-07 18:21:50.000000000 +0400
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp
--- gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-07 18:22:06.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-07 18:22:14.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-07 18:22:24.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-07 18:22:32.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/nickname/nickname_test.cpp gloox-1.0/src/tests/nickname/nickname_test.cpp
--- gloox-1.0.orig/src/tests/nickname/nickname_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nickname/nickname_test.cpp	2009-04-07 18:22:40.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-07 18:22:50.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-07 18:23:13.000000000 +0400
@@ -7,10 +7,11 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
-             gloox::JID g_jid( "foof" );
+gloox::JID g_jid( "foof" );
 
-         namespace gloox
+namespace gloox
 {
   class Disco;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/oob/oob_test.cpp gloox-1.0/src/tests/oob/oob_test.cpp
--- gloox-1.0.orig/src/tests/oob/oob_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/oob/oob_test.cpp	2009-04-07 18:23:23.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/parser/parser_test.cpp gloox-1.0/src/tests/parser/parser_test.cpp
--- gloox-1.0.orig/src/tests/parser/parser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/parser/parser_test.cpp	2009-04-07 18:23:32.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ParserTest : private TagHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/prep/prep_test.cpp gloox-1.0/src/tests/prep/prep_test.cpp
--- gloox-1.0.orig/src/tests/prep/prep_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/prep/prep_test.cpp	2009-04-07 18:23:41.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/presence/presence_test.cpp gloox-1.0/src/tests/presence/presence_test.cpp
--- gloox-1.0.orig/src/tests/presence/presence_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/presence/presence_test.cpp	2009-04-07 18:23:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp
--- gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp	2009-04-07 18:23:58.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-07 18:24:07.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp gloox-1.0/src/tests/privatexml/privatexml_test.cpp
--- gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privatexml/privatexml_test.cpp	2009-04-07 18:24:19.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 Tag* t1 = 0;
 Tag* t2 = 0;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp
--- gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-07 18:24:33.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubevent.h"
 #include "../../tag.h"
 
+#include <cstdio> // [s]print[f]
+
 static int failed = 0;
 
 using namespace gloox;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-07 18:24:49.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubmanager.h"
 #include "../../pubsubresulthandler.h"
 
+#include <cstdio> // [s]print[f]
+
 using namespace gloox;
 
 class RH : public PubSub::ResultHandler
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-07 15:47:48.000000000 +0400
@@ -7,7 +7,7 @@
 using namespace gloox;
 
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 static const JID jid( "aaa at bbb.ccc" );
 static const std::string node( "node" );
diff -NaurEbBH gloox-1.0.orig/src/tests/receipt/receipt_test.cpp gloox-1.0/src/tests/receipt/receipt_test.cpp
--- gloox-1.0.orig/src/tests/receipt/receipt_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/receipt/receipt_test.cpp	2009-04-07 18:25:11.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/registration/registration_test.cpp gloox-1.0/src/tests/registration/registration_test.cpp
--- gloox-1.0.orig/src/tests/registration/registration_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registration/registration_test.cpp	2009-04-07 18:25:26.000000000 +0400
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_server = "test.server";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp
--- gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp	2009-04-07 18:25:36.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp
--- gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp	2009-04-07 18:25:45.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-07 18:25:54.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define ROSTERMANAGER_TEST
 #include "../../rostermanager.h"
diff -NaurEbBH gloox-1.0.orig/src/tests/search/search_test.cpp gloox-1.0/src/tests/search/search_test.cpp
--- gloox-1.0.orig/src/tests/search/search_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/search/search_test.cpp	2009-04-07 18:26:02.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp gloox-1.0/src/tests/searchquery/searchquery_test.cpp
--- gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/searchquery/searchquery_test.cpp	2009-04-07 18:26:10.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/sha/sha_test.cpp gloox-1.0/src/tests/sha/sha_test.cpp
--- gloox-1.0.orig/src/tests/sha/sha_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/sha/sha_test.cpp	2009-04-07 18:26:18.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/shim/shim_test.cpp gloox-1.0/src/tests/shim/shim_test.cpp
--- gloox-1.0.orig/src/tests/shim/shim_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/shim/shim_test.cpp	2009-04-07 18:26:27.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/simanager/simanager_test.cpp gloox-1.0/src/tests/simanager/simanager_test.cpp
--- gloox-1.0.orig/src/tests/simanager/simanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanager/simanager_test.cpp	2009-04-07 18:26:36.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp
--- gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp	2009-04-07 18:26:45.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp
--- gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-07 18:26:53.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class SETest : public StanzaExtension
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/subscription/subscription_test.cpp gloox-1.0/src/tests/subscription/subscription_test.cpp
--- gloox-1.0.orig/src/tests/subscription/subscription_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/subscription/subscription_test.cpp	2009-04-07 18:27:07.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_perf.cpp gloox-1.0/src/tests/tag/tag_perf.cpp
--- gloox-1.0.orig/src/tests/tag/tag_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_perf.cpp	2009-04-07 18:27:24.000000000 +0400
@@ -7,6 +7,7 @@
 #include <locale.h>
 #include <cstdlib>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_test.cpp gloox-1.0/src/tests/tag/tag_test.cpp
--- gloox-1.0.orig/src/tests/tag/tag_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_test.cpp	2009-04-07 18:27:41.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp
--- gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-07 18:27:49.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp
--- gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-07 18:27:57.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp
--- gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-07 18:28:05.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define UNIQUEMUCROOM_TEST
 #include "../../uniquemucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/util/util_test.cpp gloox-1.0/src/tests/util/util_test.cpp
--- gloox-1.0.orig/src/tests/util/util_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/util/util_test.cpp	2009-04-07 18:28:17.000000000 +0400
@@ -1,6 +1,7 @@
 #include "../../util.h"
 
 #include <string>
+#include <cstdio> // [s]print[f]
 
 using namespace gloox;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/vcard/vcard_test.cpp gloox-1.0/src/tests/vcard/vcard_test.cpp
--- gloox-1.0.orig/src/tests/vcard/vcard_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcard/vcard_test.cpp	2009-04-07 18:28:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp
--- gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-07 18:28:36.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/xpath/xpath_test.cpp gloox-1.0/src/tests/xpath/xpath_test.cpp
--- gloox-1.0.orig/src/tests/xpath/xpath_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/xpath/xpath_test.cpp	2009-04-07 18:28:45.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int fail = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp gloox-1.0/src/tests/zlib/zlib_perf.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_perf.cpp	2009-04-07 18:29:28.000000000 +0400
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <string>
 #include <sys/time.h>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_test.cpp gloox-1.0/src/tests/zlib/zlib_test.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_test.cpp	2009-04-07 18:29:40.000000000 +0400
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 

gloox-1.0-SVNr4003.glibc-private-symbol.patch:

--- NEW FILE gloox-1.0-SVNr4003.glibc-private-symbol.patch ---
diff -NaurEbBH gloox-1.0.orig/src/dns.cpp gloox-1.0/src/dns.cpp
--- gloox-1.0.orig/src/dns.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/dns.cpp	2009-04-07 13:08:48.000000000 +0400
@@ -40,6 +40,8 @@
 # include <unistd.h>
 #endif
 
+#include <errno.h>
+
 #ifdef _WIN32
 # include <winsock.h>
 #elif defined( _WIN32_WCE )
@@ -77,8 +79,151 @@
 
 namespace gloox
 {
-
 #if defined( HAVE_RES_QUERYDOMAIN ) && defined( HAVE_DN_SKIPNAME ) && defined( HAVE_RES_QUERY )
+
+#define      EMSGSIZE        40
+#define __set_errno(e) (errno = (e))
+/*
+ THIS IS TEMPORRARY UGLY HACK!
+
+Function ns_name_ntop marked as PRIVATE in recent versions of glibc
+ (See Changelog.13 2002-02-01  Jakub Jelinek  <jakub at redhat.com> in it).
+
+So, untill author do not fix gloox implementation I just copy this function (and reffered specail and printable plus digits variable)
+ from glibc 2.8-8 (resolv/ns_name.c) source and add prefix in name _TMP_
+*/
+
+static const char	digits[] = "0123456789";
+
+/*
+ * special(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this characted special ("in need of quoting") ?
+ * return:
+ *	boolean.
+ */
+static int
+special(int ch) {
+	switch (ch) {
+	case 0x22: /* '"' */
+	case 0x2E: /* '.' */
+	case 0x3B: /* ';' */
+	case 0x5C: /* '\\' */
+	/* Special modifiers in zone files. */
+	case 0x40: /* '@' */
+	case 0x24: /* '$' */
+		return (1);
+	default:
+		return (0);
+	}
+}
+
+/*
+ * printable(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this character visible and not a space when printed ?
+ * return:
+ *	boolean.
+ */
+static int
+printable(int ch) {
+	return (ch > 0x20 && ch < 0x7f);
+}
+
+int
+_TMP_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
+	const u_char *cp;
+	char *dn, *eom;
+	u_char c;
+	u_int n;
+
+	cp = src;
+	dn = dst;
+	eom = dst + dstsiz;
+
+	while ((n = *cp++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {
+			/* Some kind of compression pointer. */
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		if (dn != dst) {
+			if (dn >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '.';
+		}
+
+		if (n == 0x41) {
+			n = *cp++ / 8;
+			if (dn + n * 2 + 4 >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '\\';
+			*dn++ = '[';
+			*dn++ = 'x';
+
+			while (n-- > 0) {
+				c = *cp++;
+				unsigned u = c >> 4;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+				u = c & 0xf;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+			}
+
+			*dn++ = ']';
+			continue;
+		}
+
+		if (dn + n >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		for ((void)NULL; n > 0; n--) {
+			c = *cp++;
+			if (special(c)) {
+				if (dn + 1 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = (char)c;
+			} else if (!printable(c)) {
+				if (dn + 3 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = digits[c / 100];
+				*dn++ = digits[(c % 100) / 10];
+				*dn++ = digits[c % 10];
+			} else {
+				if (dn >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = (char)c;
+			}
+		}
+	}
+	if (dn == dst) {
+		if (dn >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		*dn++ = '.';
+	}
+	if (dn >= eom) {
+		__set_errno (EMSGSIZE);
+		return (-1);
+	}
+	*dn++ = '\0';
+	return (dn - dst);
+}
+
+
   DNS::HostMap DNS::resolve( const std::string& service, const std::string& proto,
                              const std::string& domain, const LogSink& logInstance )
   {
@@ -141,7 +286,7 @@
     {
       name srvname;
 
-      if( ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
+      if( _TMP_ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
       {
         //FIXME do we need to handle this? How? Can it actually happen at all?
 //         printf( "handle this error!\n" );

gloox-1.0-beta-SVNr4003-missed_header.patch:

--- NEW FILE gloox-1.0-beta-SVNr4003-missed_header.patch ---
diff -NaurEbBH gloox-1.0.orig/src/Makefile.am gloox-1.0/src/Makefile.am
--- gloox-1.0.orig/src/Makefile.am	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/Makefile.am	2009-04-05 16:34:41.000000000 +0400
@@ -238,6 +238,7 @@
 			registrationhandler.h \
 			resource.h \
 			rosteritem.h \
+			rosteritemdata.h \
 			rosterlistener.h \
 			rostermanager.h \
 			search.h \
@@ -277,7 +278,6 @@
 			nonsaslauth.h \
 			mucmessagesession.h \
 			prep.h \
-			rosteritemdata.h \
 			stanzaextensionfactory.h \
 			tlsgnutlsbase.h \
 			tlsgnutlsclient.h \


--- NEW FILE gloox.spec ---
#% define beta 7
%define SVN 4003

Name:		gloox
Version:		1.0
Release:		0.5.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
Summary:		A rock-solid, full-featured Jabber/XMPP client library
Group:		System Environment/Libraries
License:		GPLv2
URL:			http://camaya.net/gloox
#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2

# svn co -r4003 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
#	pushd gloox-1.0 && DATE=$( svn info -r4003 | sed -nr '/Last Changed Date/ s/.+: (.+?) \(.+/\1/p' ) && \
#	find -exec touch -c -d"$DATE" {} \; && popd && tar --exclude='.svn' --preserve -cjf gloox-1.0-SVNr4003.tar.bz2 gloox-1.0
Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2

#Patch1:		gloox-no_ns_get16.patch
#Patch1:		gloox-getaddrinfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool, autoconf, automake
BuildRequires:	openssl-devel >= 0.9.8
BuildRequires:	gnutls-devel >= 1.2
BuildRequires:	zlib-devel >= 1.2.3
BuildRequires:	libidn-devel >= 0.5

Requires(postun):	/sbin/ldconfig
Requires(post):	/sbin/ldconfig

# Temporary UGLY HACK for http://bugs.camaya.net/horde/whups/ticket/?id=137
Patch1:		gloox-1.0-SVNr4003.glibc-private-symbol.patch
# http://bugs.camaya.net/horde/whups/ticket/?id=140
Patch2:		gloox-1.0-beta-SVNr4003-missed_header.patch
# GCC 4.4 compatibility http://bugs.camaya.net/horde/whups/ticket/?id=141
Patch3:		gloox-1.0-GCC4.4-missing_includes.patch

%description
gloox is a rock-solid, full-featured Jabber/XMPP client library, written in
C++. It makes writing spec-compliant clients easy and allows for hassle-free
integration of Jabber/XMPP functionality into existing applications.

%package		devel
Summary:		Development files for %{name}
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
%patch1 -p1 -b .private-glibc
%patch2 -p1 -b .missed-header
%patch3 -p1 -b .gcc4.4-missing-includes

%build
%if 0%{?SVN}
./autogen.sh
%endif

%configure --disable-static
make %{?_smp_mflags}
# recode to UTF
mv -f AUTHORS AUTHORS.old
iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%{_libdir}/*.so

%changelog
* Fri Apr 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.5.SVNr4003
- Add --exclude='.svn' to tar pack source and set time to last commit. This may allow pass hash checking soucre later.

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.4.SVNr4003
- Add Patch3: gloox-1.0-GCC4.4-missing_includes.patch to allow build on GCC4.4

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.3.SVNr4003
- REmade patch1. Instead of just comment private stuff I use temporray ugly hack - copy-past function implementation from glibc source until
	author do not reimplement it properly.

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.2.SVNr4003
- Add patch2 gloox-1.0-beta-SVNr4003-missed_header.patch - see bug http://bugs.camaya.net/horde/whups/ticket/?id=140

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.1.SVNr4003
- qutIM require gloox version 1.0 with SVN revision >= 3873. Try build current.
- Patch1 (http://bugs.camaya.net/horde/whups/ticket/?id=137) little adopted (gloox-1.0-beta7.glibc-private-symbol.patch -> gloox-1.0-SVNr4003.glibc-private-symbol.patch).
- Add SVN part into Release tag.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.0.beta3
- Import http://www.salstar.sk/pub/fedora/SRPMS/10/gloox-1.0-0.0beta3.fc10.src.rpm
- Step to 1.0-beta7 version
- Reformat with tabs spec file.
- %%beta (replace %%beta_version) now represent only number. According it change all mention of it.
- Add Requires(postun): /sbin/ldconfig and Requires(post): /sbin/ldconfig

* Fri Mar 7 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.4-1
- update to upstream

* Mon Feb 28 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.3-1
- update to upstream

* Sun Dec 2 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-2
- removed patch
- added undef for HAVE_RES_QUERY, HAVE_RES_QUERYDOMAIN, HAVE_DN_SKIPNAME
  see: https://mail.camaya.net/horde/whups/ticket/?id=52

* Wed Nov 28 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-1
- update upstream
- added patch to avoid dependecny problem on libresolv.so.2(GLIBC_PRIVATE)

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.4.1-1
- first release


--- NEW FILE import.log ---
gloox-1_0-0_5_SVNr4003_fc9:F-10:gloox-1.0-0.5.SVNr4003.fc9.src.rpm:1240683449


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:02:10 -0000	1.1
+++ .cvsignore	25 Apr 2009 18:44:17 -0000	1.2
@@ -0,0 +1 @@
+gloox-1.0-SVNr4003.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:02:10 -0000	1.1
+++ sources	25 Apr 2009 18:44:17 -0000	1.2
@@ -0,0 +1 @@
+f3ea4b0a8fdb44d0ad8715ac8a51001f  gloox-1.0-SVNr4003.tar.bz2



From pkgdb at fedoraproject.org  Sat Apr 25 18:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:47:53 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchbugzilla
Message-ID: <20090425184753.2DCBD10F888@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchbugzilla acl on ImageMagick (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:47:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:47:56 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested watchcommits
Message-ID: <20090425184756.3D4CF10F88B@bastion2.fedora.phx.redhat.com>

hubbitus has requested the watchcommits acl on ImageMagick (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:48:00 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested commit
Message-ID: <20090425184800.D4E1610F88E@bastion2.fedora.phx.redhat.com>

hubbitus has requested the commit acl on ImageMagick (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Apr 25 18:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 25 Apr 2009 18:48:04 +0000
Subject: [pkgdb] ImageMagick: hubbitus has requested approveacls
Message-ID: <20090425184804.447E210F890@bastion2.fedora.phx.redhat.com>

hubbitus has requested the approveacls acl on ImageMagick (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From hubbitus at fedoraproject.org  Sat Apr 25 18:54:56 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 25 Apr 2009 18:54:56 +0000 (UTC)
Subject: rpms/gloox/F-11 gloox-1.0-GCC4.4-missing_includes.patch, NONE,
	1.1 gloox-1.0-SVNr4003.glibc-private-symbol.patch, NONE,
	1.1 gloox-1.0-beta-SVNr4003-missed_header.patch, NONE,
	1.1 gloox.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090425185456.D8AF3700DD@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7238/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gloox-1.0-GCC4.4-missing_includes.patch 
	gloox-1.0-SVNr4003.glibc-private-symbol.patch 
	gloox-1.0-beta-SVNr4003-missed_header.patch gloox.spec 
	import.log 
Log Message:
Initial import of gloox into Fedora.



gloox-1.0-GCC4.4-missing_includes.patch:

--- NEW FILE gloox-1.0-GCC4.4-missing_includes.patch ---
diff -NaurEbBH gloox-1.0.orig/src/examples/adhoc_example.cpp gloox-1.0/src/examples/adhoc_example.cpp
--- gloox-1.0.orig/src/examples/adhoc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/adhoc_example.cpp	2009-04-07 18:05:16.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 
 class AdhocTest : public ConnectionListener, AdhocCommandProvider, LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/annotations_example.cpp gloox-1.0/src/examples/annotations_example.cpp
--- gloox-1.0.orig/src/examples/annotations_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/annotations_example.cpp	2009-04-07 18:05:36.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class AnnotationsTest : public AnnotationsHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp gloox-1.0/src/examples/bookmarkstorage_example.cpp
--- gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bookmarkstorage_example.cpp	2009-04-07 18:05:55.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class BookmarkStorageTest : public BookmarkHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/bosh_example.cpp gloox-1.0/src/examples/bosh_example.cpp
--- gloox-1.0.orig/src/examples/bosh_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/bosh_example.cpp	2009-04-07 18:06:09.000000000 +0400
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/component_example.cpp gloox-1.0/src/examples/component_example.cpp
--- gloox-1.0.orig/src/examples/component_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/component_example.cpp	2009-04-07 18:06:21.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class ComponentTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/disco_example.cpp gloox-1.0/src/examples/disco_example.cpp
--- gloox-1.0.orig/src/examples/disco_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/disco_example.cpp	2009-04-07 18:06:36.000000000 +0400
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class DiscoTest : public DiscoHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_client.cpp gloox-1.0/src/examples/e2ee_client.cpp
--- gloox-1.0.orig/src/examples/e2ee_client.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_client.cpp	2009-04-07 18:06:54.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_server.cpp gloox-1.0/src/examples/e2ee_server.cpp
--- gloox-1.0.orig/src/examples/e2ee_server.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/e2ee_server.cpp	2009-04-07 18:07:05.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/flexoff_example.cpp gloox-1.0/src/examples/flexoff_example.cpp
--- gloox-1.0.orig/src/examples/flexoff_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/flexoff_example.cpp	2009-04-07 18:07:18.000000000 +0400
@@ -15,6 +15,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class FlexOffTest : public MessageHandler, ConnectionListener, FlexibleOfflineHandler,
                            LogHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_recv.cpp gloox-1.0/src/examples/ft_recv.cpp
--- gloox-1.0.orig/src/examples/ft_recv.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_recv.cpp	2009-04-07 18:07:29.000000000 +0400
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/ft_send.cpp gloox-1.0/src/examples/ft_send.cpp
--- gloox-1.0.orig/src/examples/ft_send.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/ft_send.cpp	2009-04-07 18:07:46.000000000 +0400
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <ios>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/message_example.cpp gloox-1.0/src/examples/message_example.cpp
--- gloox-1.0.orig/src/examples/message_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/message_example.cpp	2009-04-07 18:08:03.000000000 +0400
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #if defined( WIN32 ) || defined( _WIN32 )
 # include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/muc_example.cpp gloox-1.0/src/examples/muc_example.cpp
--- gloox-1.0.orig/src/examples/muc_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/muc_example.cpp	2009-04-07 18:08:16.000000000 +0400
@@ -16,6 +16,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 #ifdef WIN32
 #include <windows.h>
 #endif
diff -NaurEbBH gloox-1.0.orig/src/examples/prep_example.cpp gloox-1.0/src/examples/prep_example.cpp
--- gloox-1.0.orig/src/examples/prep_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/prep_example.cpp	2009-04-07 18:08:30.000000000 +0400
@@ -4,6 +4,8 @@
 #include <string>
 #include <iostream>
 
+#include <cstdio> // [s]print[f]
+
 int main( int /*argc*/, char** /*argv*/ )
 {
   std::string test = "OLD\\Administrator";
diff -NaurEbBH gloox-1.0.orig/src/examples/privacylist_example.cpp gloox-1.0/src/examples/privacylist_example.cpp
--- gloox-1.0.orig/src/examples/privacylist_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privacylist_example.cpp	2009-04-07 18:08:41.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PLTest : public PrivacyListHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/privatexml_example.cpp gloox-1.0/src/examples/privatexml_example.cpp
--- gloox-1.0.orig/src/examples/privatexml_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/privatexml_example.cpp	2009-04-07 18:08:56.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class PrivateXMLTest : public PrivateXMLHandler, ConnectionListener
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/register_example.cpp gloox-1.0/src/examples/register_example.cpp
--- gloox-1.0.orig/src/examples/register_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/register_example.cpp	2009-04-07 18:09:28.000000000 +0400
@@ -9,6 +9,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RegTest : public RegistrationHandler, ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/reset_example.cpp gloox-1.0/src/examples/reset_example.cpp
--- gloox-1.0.orig/src/examples/reset_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/reset_example.cpp	2009-04-07 18:09:39.000000000 +0400
@@ -10,6 +10,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public ConnectionListener, LogHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/roster_example.cpp gloox-1.0/src/examples/roster_example.cpp
--- gloox-1.0.orig/src/examples/roster_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/roster_example.cpp	2009-04-07 18:09:52.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class RosterTest : public RosterListener, ConnectionListener, LogHandler, MessageHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/examples/vcard_example.cpp gloox-1.0/src/examples/vcard_example.cpp
--- gloox-1.0.orig/src/examples/vcard_example.cpp	2009-04-05 12:55:50.000000000 +0400
+++ gloox-1.0/src/examples/vcard_example.cpp	2009-04-07 18:10:04.000000000 +0400
@@ -14,6 +14,8 @@
 #include <locale.h>
 #include <string>
 
+#include <cstdio> // [s]print[f]
+
 class VCardTest : public ConnectionListener, LogHandler, VCardHandler
 {
   public:
diff -NaurEbBH gloox-1.0.orig/src/md5.cpp gloox-1.0/src/md5.cpp
--- gloox-1.0.orig/src/md5.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/md5.cpp	2009-04-07 18:10:34.000000000 +0400
@@ -74,6 +74,8 @@
 #include <cstdio>
 #include <string.h>
 
+#include <cstdio> // [s]print[f]
+
 namespace gloox
 {
 // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp gloox-1.0/src/tests/adhoc/adhoc_test.cpp
--- gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoc/adhoc_test.cpp	2009-04-07 18:14:26.000000000 +0400
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp	2009-04-07 18:14:42.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp
--- gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp	2009-04-07 18:15:09.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/amp/amp_test.cpp gloox-1.0/src/tests/amp/amp_test.cpp
--- gloox-1.0.orig/src/tests/amp/amp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/amp/amp_test.cpp	2009-04-07 18:15:36.000000000 +0400
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
+
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/amprule/amprule_test.cpp gloox-1.0/src/tests/amprule/amprule_test.cpp
--- gloox-1.0.orig/src/tests/amprule/amprule_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/amprule/amprule_test.cpp	2009-04-07 18:15:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/base64/base64_test.cpp gloox-1.0/src/tests/base64/base64_test.cpp
--- gloox-1.0.orig/src/tests/base64/base64_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/base64/base64_test.cpp	2009-04-07 18:15:57.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp
--- gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp	2009-04-07 18:16:08.000000000 +0400
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/client/client_test.cpp gloox-1.0/src/tests/client/client_test.cpp
--- gloox-1.0.orig/src/tests/client/client_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/client/client_test.cpp	2009-04-07 18:16:30.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientTest : public Client, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp gloox-1.0/src/tests/clientbase/clientbase_test.cpp
--- gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/clientbase/clientbase_test.cpp	2009-04-07 18:16:38.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ClientBaseTest : public ClientBase, /*LogHandler,*/ ConnectionListener
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp
--- gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp	2009-04-07 18:16:47.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int g_test = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/dataform/dataform_test.cpp gloox-1.0/src/tests/dataform/dataform_test.cpp
--- gloox-1.0.orig/src/tests/dataform/dataform_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataform/dataform_test.cpp	2009-04-07 18:16:56.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp
--- gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp	2009-04-07 18:17:05.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp
--- gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp	2009-04-07 18:17:13.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp
--- gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp	2009-04-07 18:17:22.000000000 +0400
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp
--- gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp	2009-04-07 18:17:31.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/disco/disco_test.cpp gloox-1.0/src/tests/disco/disco_test.cpp
--- gloox-1.0.orig/src/tests/disco/disco_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/disco/disco_test.cpp	2009-04-07 18:17:39.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp
--- gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp	2009-04-07 18:17:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_INFO_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp gloox-1.0/src/tests/discoitems/discoitems_test.cpp
--- gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/discoitems/discoitems_test.cpp	2009-04-07 18:17:58.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define DISCO_TEST
 #define DISCO_ITEMS_TEST
diff -NaurEbBH gloox-1.0.orig/src/tests/error/error_test.cpp gloox-1.0/src/tests/error/error_test.cpp
--- gloox-1.0.orig/src/tests/error/error_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/error/error_test.cpp	2009-04-07 18:18:06.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp gloox-1.0/src/tests/featureneg/featureneg_test.cpp
--- gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/featureneg/featureneg_test.cpp	2009-04-07 18:18:15.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
              int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp	2009-04-07 18:18:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp
--- gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp	2009-04-07 18:18:37.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp
--- gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp	2009-04-07 18:18:47.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp
--- gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp	2009-04-07 18:18:57.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp	2009-04-07 18:19:09.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp
--- gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp	2009-04-07 18:19:19.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/iq/iq_test.cpp gloox-1.0/src/tests/iq/iq_test.cpp
--- gloox-1.0.orig/src/tests/iq/iq_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/iq/iq_test.cpp	2009-04-07 18:19:28.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_perf.cpp gloox-1.0/src/tests/jid/jid_perf.cpp
--- gloox-1.0.orig/src/tests/jid/jid_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_perf.cpp	2009-04-07 18:19:40.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_test.cpp gloox-1.0/src/tests/jid/jid_test.cpp
--- gloox-1.0.orig/src/tests/jid/jid_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jid/jid_test.cpp	2009-04-07 18:19:51.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp
--- gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp	2009-04-07 18:20:01.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp
--- gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp	2009-04-07 18:20:10.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp
--- gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp	2009-04-07 18:20:33.000000000 +0400
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp
--- gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp	2009-04-07 18:20:47.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp
--- gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp	2009-04-07 18:20:55.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp
--- gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp	2009-04-07 18:21:04.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp
--- gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp	2009-04-07 18:21:13.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/md5/md5_test.cpp gloox-1.0/src/tests/md5/md5_test.cpp
--- gloox-1.0.orig/src/tests/md5/md5_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/md5/md5_test.cpp	2009-04-07 18:21:27.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/message/message_test.cpp gloox-1.0/src/tests/message/message_test.cpp
--- gloox-1.0.orig/src/tests/message/message_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/message/message_test.cpp	2009-04-07 18:21:36.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp
--- gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp	2009-04-07 18:21:50.000000000 +0400
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp
--- gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp	2009-04-07 18:22:06.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp	2009-04-07 18:22:14.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp	2009-04-07 18:22:24.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp
--- gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp	2009-04-07 18:22:32.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define MUCROOM_TEST
 #include "../../mucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/nickname/nickname_test.cpp gloox-1.0/src/tests/nickname/nickname_test.cpp
--- gloox-1.0.orig/src/tests/nickname/nickname_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nickname/nickname_test.cpp	2009-04-07 18:22:40.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp	2009-04-07 18:22:50.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp
--- gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp	2009-04-07 18:23:13.000000000 +0400
@@ -7,10 +7,11 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
-             gloox::JID g_jid( "foof" );
+gloox::JID g_jid( "foof" );
 
-         namespace gloox
+namespace gloox
 {
   class Disco;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/oob/oob_test.cpp gloox-1.0/src/tests/oob/oob_test.cpp
--- gloox-1.0.orig/src/tests/oob/oob_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/oob/oob_test.cpp	2009-04-07 18:23:23.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/parser/parser_test.cpp gloox-1.0/src/tests/parser/parser_test.cpp
--- gloox-1.0.orig/src/tests/parser/parser_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/parser/parser_test.cpp	2009-04-07 18:23:32.000000000 +0400
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class ParserTest : private TagHandler
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/prep/prep_test.cpp gloox-1.0/src/tests/prep/prep_test.cpp
--- gloox-1.0.orig/src/tests/prep/prep_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/prep/prep_test.cpp	2009-04-07 18:23:41.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/presence/presence_test.cpp gloox-1.0/src/tests/presence/presence_test.cpp
--- gloox-1.0.orig/src/tests/presence/presence_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/presence/presence_test.cpp	2009-04-07 18:23:49.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp
--- gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp	2009-04-07 18:23:58.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp	2009-04-07 18:24:07.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp gloox-1.0/src/tests/privatexml/privatexml_test.cpp
--- gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/privatexml/privatexml_test.cpp	2009-04-07 18:24:19.000000000 +0400
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 Tag* t1 = 0;
 Tag* t2 = 0;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp
--- gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp	2009-04-07 18:24:33.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubevent.h"
 #include "../../tag.h"
 
+#include <cstdio> // [s]print[f]
+
 static int failed = 0;
 
 using namespace gloox;
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp	2009-04-07 18:24:49.000000000 +0400
@@ -1,6 +1,8 @@
 #include "../../pubsubmanager.h"
 #include "../../pubsubresulthandler.h"
 
+#include <cstdio> // [s]print[f]
+
 using namespace gloox;
 
 class RH : public PubSub::ResultHandler
diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp
--- gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp	2009-04-07 15:47:48.000000000 +0400
@@ -7,7 +7,7 @@
 using namespace gloox;
 
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 static const JID jid( "aaa at bbb.ccc" );
 static const std::string node( "node" );
diff -NaurEbBH gloox-1.0.orig/src/tests/receipt/receipt_test.cpp gloox-1.0/src/tests/receipt/receipt_test.cpp
--- gloox-1.0.orig/src/tests/receipt/receipt_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/receipt/receipt_test.cpp	2009-04-07 18:25:11.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/registration/registration_test.cpp gloox-1.0/src/tests/registration/registration_test.cpp
--- gloox-1.0.orig/src/tests/registration/registration_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registration/registration_test.cpp	2009-04-07 18:25:26.000000000 +0400
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_server = "test.server";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp
--- gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp	2009-04-07 18:25:36.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp
--- gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp	2009-04-07 18:25:45.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp
--- gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp	2009-04-07 18:25:54.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define ROSTERMANAGER_TEST
 #include "../../rostermanager.h"
diff -NaurEbBH gloox-1.0.orig/src/tests/search/search_test.cpp gloox-1.0/src/tests/search/search_test.cpp
--- gloox-1.0.orig/src/tests/search/search_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/search/search_test.cpp	2009-04-07 18:26:02.000000000 +0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp gloox-1.0/src/tests/searchquery/searchquery_test.cpp
--- gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/searchquery/searchquery_test.cpp	2009-04-07 18:26:10.000000000 +0400
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 namespace gloox
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/sha/sha_test.cpp gloox-1.0/src/tests/sha/sha_test.cpp
--- gloox-1.0.orig/src/tests/sha/sha_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/sha/sha_test.cpp	2009-04-07 18:26:18.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/shim/shim_test.cpp gloox-1.0/src/tests/shim/shim_test.cpp
--- gloox-1.0.orig/src/tests/shim/shim_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/shim/shim_test.cpp	2009-04-07 18:26:27.000000000 +0400
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
-
+#include <cstdio> // [s]print[f]
 
 
 int main( int /*argc*/, char** /*argv*/ )
diff -NaurEbBH gloox-1.0.orig/src/tests/simanager/simanager_test.cpp gloox-1.0/src/tests/simanager/simanager_test.cpp
--- gloox-1.0.orig/src/tests/simanager/simanager_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanager/simanager_test.cpp	2009-04-07 18:26:36.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 const std::string& g_dir = "test.dir";
 const std::string& g_inst = "the instructions";
diff -NaurEbBH gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp
--- gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp	2009-04-07 18:26:45.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 gloox::JID g_jid( "foof" );
 
diff -NaurEbBH gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp
--- gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp	2009-04-07 18:26:53.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 class SETest : public StanzaExtension
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/subscription/subscription_test.cpp gloox-1.0/src/tests/subscription/subscription_test.cpp
--- gloox-1.0.orig/src/tests/subscription/subscription_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/subscription/subscription_test.cpp	2009-04-07 18:27:07.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_perf.cpp gloox-1.0/src/tests/tag/tag_perf.cpp
--- gloox-1.0.orig/src/tests/tag/tag_perf.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_perf.cpp	2009-04-07 18:27:24.000000000 +0400
@@ -7,6 +7,7 @@
 #include <locale.h>
 #include <cstdlib>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #include <sys/time.h>
 
diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_test.cpp gloox-1.0/src/tests/tag/tag_test.cpp
--- gloox-1.0.orig/src/tests/tag/tag_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tag/tag_test.cpp	2009-04-07 18:27:41.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp
--- gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp	2009-04-07 18:27:49.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp
--- gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp	2009-04-07 18:27:57.000000000 +0400
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef WIN32
 # include "../../config.h.win"
diff -NaurEbBH gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp
--- gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp	2009-04-07 18:28:05.000000000 +0400
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #define UNIQUEMUCROOM_TEST
 #include "../../uniquemucroom.cpp"
diff -NaurEbBH gloox-1.0.orig/src/tests/util/util_test.cpp gloox-1.0/src/tests/util/util_test.cpp
--- gloox-1.0.orig/src/tests/util/util_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/util/util_test.cpp	2009-04-07 18:28:17.000000000 +0400
@@ -1,6 +1,7 @@
 #include "../../util.h"
 
 #include <string>
+#include <cstdio> // [s]print[f]
 
 using namespace gloox;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/vcard/vcard_test.cpp gloox-1.0/src/tests/vcard/vcard_test.cpp
--- gloox-1.0.orig/src/tests/vcard/vcard_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcard/vcard_test.cpp	2009-04-07 18:28:27.000000000 +0400
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp
--- gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp	2009-04-07 18:28:36.000000000 +0400
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int main( int /*argc*/, char** /*argv*/ )
 {
diff -NaurEbBH gloox-1.0.orig/src/tests/xpath/xpath_test.cpp gloox-1.0/src/tests/xpath/xpath_test.cpp
--- gloox-1.0.orig/src/tests/xpath/xpath_test.cpp	2009-04-05 12:55:52.000000000 +0400
+++ gloox-1.0/src/tests/xpath/xpath_test.cpp	2009-04-07 18:28:45.000000000 +0400
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 int fail = 0;
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp gloox-1.0/src/tests/zlib/zlib_perf.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_perf.cpp	2009-04-07 18:29:28.000000000 +0400
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <string>
 #include <sys/time.h>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 
diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_test.cpp gloox-1.0/src/tests/zlib/zlib_test.cpp
--- gloox-1.0.orig/src/tests/zlib/zlib_test.cpp	2009-04-05 12:55:51.000000000 +0400
+++ gloox-1.0/src/tests/zlib/zlib_test.cpp	2009-04-07 18:29:40.000000000 +0400
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdio> // [s]print[f]
 
 #ifdef HAVE_ZLIB
 

gloox-1.0-SVNr4003.glibc-private-symbol.patch:

--- NEW FILE gloox-1.0-SVNr4003.glibc-private-symbol.patch ---
diff -NaurEbBH gloox-1.0.orig/src/dns.cpp gloox-1.0/src/dns.cpp
--- gloox-1.0.orig/src/dns.cpp	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/dns.cpp	2009-04-07 13:08:48.000000000 +0400
@@ -40,6 +40,8 @@
 # include <unistd.h>
 #endif
 
+#include <errno.h>
+
 #ifdef _WIN32
 # include <winsock.h>
 #elif defined( _WIN32_WCE )
@@ -77,8 +79,151 @@
 
 namespace gloox
 {
-
 #if defined( HAVE_RES_QUERYDOMAIN ) && defined( HAVE_DN_SKIPNAME ) && defined( HAVE_RES_QUERY )
+
+#define      EMSGSIZE        40
+#define __set_errno(e) (errno = (e))
+/*
+ THIS IS TEMPORRARY UGLY HACK!
+
+Function ns_name_ntop marked as PRIVATE in recent versions of glibc
+ (See Changelog.13 2002-02-01  Jakub Jelinek  <jakub at redhat.com> in it).
+
+So, untill author do not fix gloox implementation I just copy this function (and reffered specail and printable plus digits variable)
+ from glibc 2.8-8 (resolv/ns_name.c) source and add prefix in name _TMP_
+*/
+
+static const char	digits[] = "0123456789";
+
+/*
+ * special(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this characted special ("in need of quoting") ?
+ * return:
+ *	boolean.
+ */
+static int
+special(int ch) {
+	switch (ch) {
+	case 0x22: /* '"' */
+	case 0x2E: /* '.' */
+	case 0x3B: /* ';' */
+	case 0x5C: /* '\\' */
+	/* Special modifiers in zone files. */
+	case 0x40: /* '@' */
+	case 0x24: /* '$' */
+		return (1);
+	default:
+		return (0);
+	}
+}
+
+/*
+ * printable(ch)
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this character visible and not a space when printed ?
+ * return:
+ *	boolean.
+ */
+static int
+printable(int ch) {
+	return (ch > 0x20 && ch < 0x7f);
+}
+
+int
+_TMP_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
+	const u_char *cp;
+	char *dn, *eom;
+	u_char c;
+	u_int n;
+
+	cp = src;
+	dn = dst;
+	eom = dst + dstsiz;
+
+	while ((n = *cp++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {
+			/* Some kind of compression pointer. */
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		if (dn != dst) {
+			if (dn >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '.';
+		}
+
+		if (n == 0x41) {
+			n = *cp++ / 8;
+			if (dn + n * 2 + 4 >= eom) {
+				__set_errno (EMSGSIZE);
+				return (-1);
+			}
+			*dn++ = '\\';
+			*dn++ = '[';
+			*dn++ = 'x';
+
+			while (n-- > 0) {
+				c = *cp++;
+				unsigned u = c >> 4;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+				u = c & 0xf;
+				*dn++ = u > 9 ? 'a' + u - 10 : '0' + u;
+			}
+
+			*dn++ = ']';
+			continue;
+		}
+
+		if (dn + n >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		for ((void)NULL; n > 0; n--) {
+			c = *cp++;
+			if (special(c)) {
+				if (dn + 1 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = (char)c;
+			} else if (!printable(c)) {
+				if (dn + 3 >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = digits[c / 100];
+				*dn++ = digits[(c % 100) / 10];
+				*dn++ = digits[c % 10];
+			} else {
+				if (dn >= eom) {
+					__set_errno (EMSGSIZE);
+					return (-1);
+				}
+				*dn++ = (char)c;
+			}
+		}
+	}
+	if (dn == dst) {
+		if (dn >= eom) {
+			__set_errno (EMSGSIZE);
+			return (-1);
+		}
+		*dn++ = '.';
+	}
+	if (dn >= eom) {
+		__set_errno (EMSGSIZE);
+		return (-1);
+	}
+	*dn++ = '\0';
+	return (dn - dst);
+}
+
+
   DNS::HostMap DNS::resolve( const std::string& service, const std::string& proto,
                              const std::string& domain, const LogSink& logInstance )
   {
@@ -141,7 +286,7 @@
     {
       name srvname;
 
-      if( ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
+      if( _TMP_ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 )
       {
         //FIXME do we need to handle this? How? Can it actually happen at all?
 //         printf( "handle this error!\n" );

gloox-1.0-beta-SVNr4003-missed_header.patch:

--- NEW FILE gloox-1.0-beta-SVNr4003-missed_header.patch ---
diff -NaurEbBH gloox-1.0.orig/src/Makefile.am gloox-1.0/src/Makefile.am
--- gloox-1.0.orig/src/Makefile.am	2009-04-05 12:55:54.000000000 +0400
+++ gloox-1.0/src/Makefile.am	2009-04-05 16:34:41.000000000 +0400
@@ -238,6 +238,7 @@
 			registrationhandler.h \
 			resource.h \
 			rosteritem.h \
+			rosteritemdata.h \
 			rosterlistener.h \
 			rostermanager.h \
 			search.h \
@@ -277,7 +278,6 @@
 			nonsaslauth.h \
 			mucmessagesession.h \
 			prep.h \
-			rosteritemdata.h \
 			stanzaextensionfactory.h \
 			tlsgnutlsbase.h \
 			tlsgnutlsclient.h \


--- NEW FILE gloox.spec ---
#% define beta 7
%define SVN 4003

Name:		gloox
Version:		1.0
Release:		0.5.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
Summary:		A rock-solid, full-featured Jabber/XMPP client library
Group:		System Environment/Libraries
License:		GPLv2
URL:			http://camaya.net/gloox
#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2

# svn co -r4003 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
#	pushd gloox-1.0 && DATE=$( svn info -r4003 | sed -nr '/Last Changed Date/ s/.+: (.+?) \(.+/\1/p' ) && \
#	find -exec touch -c -d"$DATE" {} \; && popd && tar --exclude='.svn' --preserve -cjf gloox-1.0-SVNr4003.tar.bz2 gloox-1.0
Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2

#Patch1:		gloox-no_ns_get16.patch
#Patch1:		gloox-getaddrinfo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool, autoconf, automake
BuildRequires:	openssl-devel >= 0.9.8
BuildRequires:	gnutls-devel >= 1.2
BuildRequires:	zlib-devel >= 1.2.3
BuildRequires:	libidn-devel >= 0.5

Requires(postun):	/sbin/ldconfig
Requires(post):	/sbin/ldconfig

# Temporary UGLY HACK for http://bugs.camaya.net/horde/whups/ticket/?id=137
Patch1:		gloox-1.0-SVNr4003.glibc-private-symbol.patch
# http://bugs.camaya.net/horde/whups/ticket/?id=140
Patch2:		gloox-1.0-beta-SVNr4003-missed_header.patch
# GCC 4.4 compatibility http://bugs.camaya.net/horde/whups/ticket/?id=141
Patch3:		gloox-1.0-GCC4.4-missing_includes.patch

%description
gloox is a rock-solid, full-featured Jabber/XMPP client library, written in
C++. It makes writing spec-compliant clients easy and allows for hassle-free
integration of Jabber/XMPP functionality into existing applications.

%package		devel
Summary:		Development files for %{name}
Group:		Development/Libraries
Requires:		%{name} = %{version}-%{release}
Requires:		pkgconfig

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
%patch1 -p1 -b .private-glibc
%patch2 -p1 -b .missed-header
%patch3 -p1 -b .gcc4.4-missing-includes

%build
%if 0%{?SVN}
./autogen.sh
%endif

%configure --disable-static
make %{?_smp_mflags}
# recode to UTF
mv -f AUTHORS AUTHORS.old
iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_libdir}/pkgconfig/%{name}.pc
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%{_libdir}/*.so

%changelog
* Fri Apr 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.5.SVNr4003
- Add --exclude='.svn' to tar pack source and set time to last commit. This may allow pass hash checking soucre later.

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.4.SVNr4003
- Add Patch3: gloox-1.0-GCC4.4-missing_includes.patch to allow build on GCC4.4

* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.3.SVNr4003
- REmade patch1. Instead of just comment private stuff I use temporray ugly hack - copy-past function implementation from glibc source until
	author do not reimplement it properly.

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.2.SVNr4003
- Add patch2 gloox-1.0-beta-SVNr4003-missed_header.patch - see bug http://bugs.camaya.net/horde/whups/ticket/?id=140

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.1.SVNr4003
- qutIM require gloox version 1.0 with SVN revision >= 3873. Try build current.
- Patch1 (http://bugs.camaya.net/horde/whups/ticket/?id=137) little adopted (gloox-1.0-beta7.glibc-private-symbol.patch -> gloox-1.0-SVNr4003.glibc-private-symbol.patch).
- Add SVN part into Release tag.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.0.beta3
- Import http://www.salstar.sk/pub/fedora/SRPMS/10/gloox-1.0-0.0beta3.fc10.src.rpm
- Step to 1.0-beta7 version
- Reformat with tabs spec file.
- %%beta (replace %%beta_version) now represent only number. According it change all mention of it.
- Add Requires(postun): /sbin/ldconfig and Requires(post): /sbin/ldconfig

* Fri Mar 7 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.4-1
- update to upstream

* Mon Feb 28 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.3-1
- update to upstream

* Sun Dec 2 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-2
- removed patch
- added undef for HAVE_RES_QUERY, HAVE_RES_QUERYDOMAIN, HAVE_DN_SKIPNAME
  see: https://mail.camaya.net/horde/whups/ticket/?id=52

* Wed Nov 28 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-1
- update upstream
- added patch to avoid dependecny problem on libresolv.so.2(GLIBC_PRIVATE)

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.4.1-1
- first release


--- NEW FILE import.log ---
gloox-1_0-0_5_SVNr4003_fc9:F-11:gloox-1.0-0.5.SVNr4003.fc9.src.rpm:1240683846


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 20:02:10 -0000	1.1
+++ .cvsignore	25 Apr 2009 18:54:26 -0000	1.2
@@ -0,0 +1 @@
+gloox-1.0-SVNr4003.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2009 20:02:10 -0000	1.1
+++ sources	25 Apr 2009 18:54:26 -0000	1.2
@@ -0,0 +1 @@
+f3ea4b0a8fdb44d0ad8715ac8a51001f  gloox-1.0-SVNr4003.tar.bz2



From leigh123linux at fedoraproject.org  Sat Apr 25 19:02:31 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 25 Apr 2009 19:02:31 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec, 1.10,
	1.11 qbittorrent_flag.patch, 1.1, 1.2
Message-ID: <20090425190231.44DF0700DD@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7965

Modified Files:
	qbittorrent.spec qbittorrent_flag.patch 
Log Message:
update for 1.4



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qbittorrent.spec	9 Apr 2009 17:26:09 -0000	1.10
+++ qbittorrent.spec	25 Apr 2009 19:02:00 -0000	1.11
@@ -1,8 +1,16 @@
+%define bzr_rev 1511
+
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.3.3
-Release: 2%{dist}
-Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+Release: 3.1.%{bzr_rev}bzr%{?dist}
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+# bzr branch -r %{bzr_rev} lp:qbittorrent
+# rm -rf qbittorrent/.bzr*
+# tar -czvf qbittorrent-%{bzr_rev}bzr.tar.gz qbittorrent
+Source0:  %{name}-%{bzr_rev}bzr.tar.gz
+#Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
@@ -23,7 +31,7 @@
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1 -b .qbittorrent_flag
 
 
@@ -77,6 +85,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.1.1511bzr
+- Update to bzr 1511 
+
 * Thu Apr 9 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-2
 - Remember to update Source in spec file 
 

qbittorrent_flag.patch:

Index: qbittorrent_flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent_flag.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qbittorrent_flag.patch	10 Feb 2009 22:52:11 -0000	1.1
+++ qbittorrent_flag.patch	25 Apr 2009 19:02:00 -0000	1.2
@@ -1,9 +1,9 @@
---- qbittorrent-1.3.1/src/icons.qrc.old 
-+++ qbittorrent-1.3.1/src/icons.qrc 
-@@ -47,33 +47,6 @@
+--- qbittorrent-1.3.3/src/icons.qrc.old 
++++ qbittorrent-1.3.3/src/icons.qrc 
+@@ -15,33 +15,6 @@
+   <file>Icons/sphere2.png</file>
    <file>Icons/uparrow.png</file>
    <file>Icons/url.png</file>
-   <file>Icons/wizard.png</file>
 -  <file>Icons/flags/brazil.png</file>
 -  <file>Icons/flags/bulgaria.png</file>
 -  <file>Icons/flags/china.png</file>
@@ -31,6 +31,6 @@
 -  <file>Icons/flags/turkey.png</file>
 -  <file>Icons/flags/ukraine.png</file>
 -  <file>Icons/flags/united_kingdom.png</file>
-   <file>Icons/skin/add.png</file>
-   <file>Icons/skin/connected.png</file>
-   <file>Icons/skin/decrease.png</file>
+   <file>Icons/oxygen/browse.png</file>
+   <file>Icons/oxygen/bt_settings.png</file>
+   <file>Icons/oxygen/bug.png</file>



From leigh123linux at fedoraproject.org  Sat Apr 25 19:09:39 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 25 Apr 2009 19:09:39 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090425190939.27CCE700DD@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8931

Modified Files:
	.cvsignore sources 
Log Message:
update to bzr 1511



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Apr 2009 17:10:52 -0000	1.4
+++ .cvsignore	25 Apr 2009 19:09:08 -0000	1.5
@@ -1 +1 @@
-qbittorrent-1.3.3.tar.gz
+qbittorrent-1511bzr.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Apr 2009 17:10:52 -0000	1.4
+++ sources	25 Apr 2009 19:09:08 -0000	1.5
@@ -1 +1 @@
-863f963beefc3c93dfe25ee6a6b0ed47  qbittorrent-1.3.3.tar.gz
+cd87b89d11105d232460f3e86a7fdbe1  qbittorrent-1511bzr.tar.gz



From tuxbrewr at fedoraproject.org  Sat Apr 25 19:36:17 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 25 Apr 2009 19:36:17 +0000 (UTC)
Subject: rpms/quassel/devel .cvsignore, 1.7, 1.8 quassel.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090425193617.2FEEC700DD@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11738

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Feb 2009 20:20:51 -0000	1.7
+++ .cvsignore	25 Apr 2009 19:35:46 -0000	1.8
@@ -1 +1 @@
-quassel-0.4.0.tar.bz2
+quassel-0.4.1.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- quassel.spec	14 Apr 2009 23:40:24 -0000	1.9
+++ quassel.spec	25 Apr 2009 19:35:46 -0000	1.10
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
-Version: 0.4.0
-Release: 3%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -113,7 +113,6 @@
 %attr(755,root,root) %{_bindir}/quasselcore
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
 
-
 %files client 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselclient
@@ -154,11 +153,11 @@
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
-* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-3
-- Enabled KDE integration
+* Fri Apr 24 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.1-1
+- New upstream release
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.0-2
+- Enabled KDE integration
 
 * Fri Feb 20 2009 Steven M. Parirsh <tuxbrewr at fedoraproject.org> 0.4.0-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2009 20:20:51 -0000	1.7
+++ sources	25 Apr 2009 19:35:46 -0000	1.8
@@ -1 +1 @@
-441295f4c47b3d68b930152026d14694  quassel-0.4.0.tar.bz2
+bf89e3ff2e12c64d9cf8b1445e46039f  quassel-0.4.1.tar.bz2



From mjakubicek at fedoraproject.org  Sat Apr 25 20:26:47 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 25 Apr 2009 20:26:47 +0000 (UTC)
Subject: rpms/log4cxx/devel log4cxx-cstring.patch, 1.2, 1.3 log4cxx.spec, 1.2,
	1.3
Message-ID: <20090425202647.73478700DD@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/log4cxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17678/devel

Modified Files:
	log4cxx-cstring.patch log4cxx.spec 
Log Message:
- Fix FTBFS: updated log4cxx-cstring.patch for gcc 4.4



log4cxx-cstring.patch:

Index: log4cxx-cstring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/devel/log4cxx-cstring.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx-cstring.patch	26 Feb 2009 12:20:17 -0000	1.2
+++ log4cxx-cstring.patch	25 Apr 2009 20:26:47 -0000	1.3
@@ -1,12 +1,13 @@
 diff -ur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0.new/src/examples/cpp/console.cpp
 --- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-03-31 18:34:52.000000000 -0400
 +++ apache-log4cxx-0.10.0.new/src/examples/cpp/console.cpp	2008-11-16 17:01:37.000000000 -0500
-@@ -22,6 +22,8 @@
+@@ -22,6 +22,9 @@
  #include <log4cxx/logmanager.h>
  #include <iostream>
  #include <locale.h>
 +#include <cstring>
 +#include <cstdio>
++#include <stdint.h>
  
  using namespace log4cxx;
  using namespace log4cxx::helpers;


Index: log4cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/devel/log4cxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx.spec	25 Feb 2009 20:50:05 -0000	1.2
+++ log4cxx.spec	25 Apr 2009 20:26:47 -0000	1.3
@@ -1,12 +1,14 @@
 Name: log4cxx
 Version: 0.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A port to C++ of the Log4j project
 
 Group: System Environment/Libraries
 License: ASL 2.0
 URL: http://logging.apache.org/log4cxx/index.html
 Source0: http://www.apache.org/dist/logging/log4cxx/%{version}/apache-%{name}-%{version}.tar.gz
+# Filed into upstream bugtracker at:
+# https://issues.apache.org/jira/browse/LOGCXX-332
 Patch0: log4cxx-cstring.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +30,7 @@
  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
  configure
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +69,9 @@
 %doc html/
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.10.0-7
+- Fix FTBFS: updated log4cxx-cstring.patch for gcc 4.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sat Apr 25 20:27:17 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 25 Apr 2009 20:27:17 +0000 (UTC)
Subject: rpms/log4cxx/F-11 log4cxx-cstring.patch, 1.2, 1.3 log4cxx.spec, 1.2,
	1.3
Message-ID: <20090425202717.2A1F3700DD@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/log4cxx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17678/F-11

Modified Files:
	log4cxx-cstring.patch log4cxx.spec 
Log Message:
- Fix FTBFS: updated log4cxx-cstring.patch for gcc 4.4



log4cxx-cstring.patch:

Index: log4cxx-cstring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/F-11/log4cxx-cstring.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx-cstring.patch	26 Feb 2009 12:20:17 -0000	1.2
+++ log4cxx-cstring.patch	25 Apr 2009 20:26:46 -0000	1.3
@@ -1,12 +1,13 @@
 diff -ur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0.new/src/examples/cpp/console.cpp
 --- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-03-31 18:34:52.000000000 -0400
 +++ apache-log4cxx-0.10.0.new/src/examples/cpp/console.cpp	2008-11-16 17:01:37.000000000 -0500
-@@ -22,6 +22,8 @@
+@@ -22,6 +22,9 @@
  #include <log4cxx/logmanager.h>
  #include <iostream>
  #include <locale.h>
 +#include <cstring>
 +#include <cstdio>
++#include <stdint.h>
  
  using namespace log4cxx;
  using namespace log4cxx::helpers;


Index: log4cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/F-11/log4cxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx.spec	25 Feb 2009 20:50:05 -0000	1.2
+++ log4cxx.spec	25 Apr 2009 20:26:46 -0000	1.3
@@ -1,12 +1,14 @@
 Name: log4cxx
 Version: 0.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A port to C++ of the Log4j project
 
 Group: System Environment/Libraries
 License: ASL 2.0
 URL: http://logging.apache.org/log4cxx/index.html
 Source0: http://www.apache.org/dist/logging/log4cxx/%{version}/apache-%{name}-%{version}.tar.gz
+# Filed into upstream bugtracker at:
+# https://issues.apache.org/jira/browse/LOGCXX-332
 Patch0: log4cxx-cstring.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +30,7 @@
  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
  configure
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +69,9 @@
 %doc html/
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.10.0-7
+- Fix FTBFS: updated log4cxx-cstring.patch for gcc 4.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sat Apr 25 20:41:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 25 Apr 2009 20:41:20 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.263,1.264 qt4.csh,1.2,NONE qt4.sh,1.2,NONE
Message-ID: <20090425204120.CD0D3700DD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18770

Modified Files:
	qt.spec 
Removed Files:
	qt4.csh qt4.sh 
Log Message:
* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-4
- qt-doc noarch
- qt-demos, qt-examples (split from -doc)
- (cosmetic) re-order subpkgs in alphabetical order
- drop unused profile.d bits



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- qt.spec	24 Apr 2009 17:16:23 -0000	1.263
+++ qt.spec	25 Apr 2009 20:40:50 -0000	1.264
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -59,9 +59,6 @@
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
 %{?qt_copy:Provides: qt4-copy = %{qt_copy}}
 
-Source11: qt4.sh
-Source12: qt4.csh
-
 Source20: assistant.desktop
 Source21: designer.desktop
 Source22: linguist.desktop
@@ -187,6 +184,30 @@
 This package contains base tools, like string, xml, and network
 handling.
 
+
+%package demos
+Summary: Demonstration applications for %{name}
+Group:   Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description demos
+%{summary}.
+
+%package doc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-assistant
+%if "%{name}" != "qt4"
+Obsoletes: qt4-doc < %{version}-%{release}
+Provides:  qt4-doc = %{version}-%{release}
+%endif
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description doc
+%{summary}.  Includes:
+Qt Assistant
+
 %package devel
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
@@ -222,19 +243,30 @@
 applications using the Qt toolkit.  Includes:
 Qt Linguist
 
-%package doc
-Summary: API documentation, demos and example programs for %{name}
+
+%package examples
+Summary: Programming examples for %{name}
 Group: Documentation
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-assistant
+
+%description examples
+%{summary}.
+
+
+%package mysql
+Summary: MySQL driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-MySQL < %{version}-%{release}
+Provides:  qt4-MySQL = %{version}-%{release}
 %if "%{name}" != "qt4"
-Obsoletes: qt4-doc < %{version}-%{release}
-Provides:  qt4-doc = %{version}-%{release}
+Obsoletes: qt4-mysql < %{version}-%{release}
+Provides:  qt4-mysql = %{version}-%{release}
 %endif
 
-%description doc
-%{summary}.  Includes:
-Qt Assistant, Qt Demo
+%description mysql 
+%{summary}.
+
 
 %package odbc 
 Summary: ODBC driver for Qt's SQL classes
@@ -250,19 +282,6 @@
 %description odbc 
 %{summary}.
 
-%package mysql 
-Summary: MySQL driver for Qt's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: qt4-MySQL < %{version}-%{release}
-Provides:  qt4-MySQL = %{version}-%{release}
-%if "%{name}" != "qt4"
-Obsoletes: qt4-mysql < %{version}-%{release}
-Provides:  qt4-mysql = %{version}-%{release}
-%endif
-
-%description mysql 
-%{summary}.
 
 %package postgresql 
 Summary: PostgreSQL driver for Qt's SQL classes
@@ -278,6 +297,7 @@
 %description postgresql 
 %{summary}.
 
+
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
@@ -299,7 +319,7 @@
 %endif
 
 %description x11
-Qt libraries which are used for drawing widgets and OpenGL items.
+Qt libraries used for drawing widgets and OpenGL items.
 
 
 %prep
@@ -512,17 +532,6 @@
 %endif
 %endif
 
-# qt4.(sh|csh), currently unused
-%if 0
-install -p -m644 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m644 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
-sed -i \
-  -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \
-  -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \
-  %{buildroot}/etc/profile.d/qt4.*
-%endif
-
-
 %if "%{_qt4_libdir}" != "%{_libdir}"
   mkdir -p %{buildroot}/etc/ld.so.conf.d
   echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{_arch}.conf
@@ -628,7 +637,6 @@
 %files
 %defattr(-,root,root,-)
 %doc README* LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
-#config /etc/profile.d/qt4.*
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -668,35 +676,14 @@
 %{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
-%files x11 
+%files demos
 %defattr(-,root,root,-)
-%{_sysconfdir}/rpm/macros.*
-%if 0%{?phonon:1}
-#{_qt4_libdir}/libphonon.so.4*
-%endif
-%{_qt4_libdir}/libQt3Support.so.*
-%{_qt4_libdir}/libQtAssistantClient.so.*
-%{_qt4_libdir}/libQtCLucene.so.*
-%{_qt4_libdir}/libQtDesigner.so.*
-%{_qt4_libdir}/libQtDesignerComponents.so.*
-%{_qt4_libdir}/libQtGui.so.*
-%{_qt4_libdir}/libQtHelp.so.*
-%{_qt4_libdir}/libQtOpenGL.so.*
-%{_qt4_libdir}/libQtScriptTools.so.*
-%{_qt4_libdir}/libQtSvg.so.*
-%{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
-%{_qt4_plugindir}/*
-%exclude %{_qt4_plugindir}/sqldrivers
+%{_qt4_bindir}/qt*demo*
 %if "%{_qt4_bindir}" != "%{_bindir}"
-%{_bindir}/assistant*
-%{?dbus:%{_bindir}/qdbusviewer}
-%{_bindir}/qt*config*
+%{_bindir}/qt*demo*
 %endif
-%{_qt4_bindir}/assistant*
-%{?dbus:%{_qt4_bindir}/qdbusviewer}
-%{_qt4_bindir}/qt*config*
-%{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
+%{_datadir}/applications/*qtdemo*.desktop
+%{_qt4_demosdir}/
 
 %files devel
 %defattr(-,root,root,-)
@@ -773,16 +760,18 @@
 %{_qt4_docdir}/qch/
 %{_qt4_docdir}/src/
 %{_qt4_prefix}/doc
-%{_qt4_demosdir}/
-%{_qt4_examplesdir}/
 # Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant*.desktop
-# Qt Demo
-%{_qt4_bindir}/qt*demo*
-%if "%{_qt4_bindir}" != "%{_bindir}"
-%{_bindir}/qt*demo*
+
+%files examples
+%defattr(-,root,root,-)
+%{_qt4_examplesdir}/
+
+%if "%{?mysql}" == "-plugin-sql-mysql"
+%files mysql
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
 %endif
-%{_datadir}/applications/*qtdemo*.desktop
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -796,14 +785,44 @@
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
-%if "%{?mysql}" == "-plugin-sql-mysql"
-%files mysql 
+%files x11 
 %defattr(-,root,root,-)
-%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
+%{_sysconfdir}/rpm/macros.*
+%if 0%{?phonon:1}
+#{_qt4_libdir}/libphonon.so.4*
+%endif
+%{_qt4_libdir}/libQt3Support.so.*
+%{_qt4_libdir}/libQtAssistantClient.so.*
+%{_qt4_libdir}/libQtCLucene.so.*
+%{_qt4_libdir}/libQtDesigner.so.*
+%{_qt4_libdir}/libQtDesignerComponents.so.*
+%{_qt4_libdir}/libQtGui.so.*
+%{_qt4_libdir}/libQtHelp.so.*
+%{_qt4_libdir}/libQtOpenGL.so.*
+%{_qt4_libdir}/libQtScriptTools.so.*
+%{_qt4_libdir}/libQtSvg.so.*
+%{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
+%{_qt4_plugindir}/*
+%exclude %{_qt4_plugindir}/sqldrivers
+%if "%{_qt4_bindir}" != "%{_bindir}"
+%{_bindir}/assistant*
+%{?dbus:%{_bindir}/qdbusviewer}
+%{_bindir}/qt*config*
 %endif
+%{_qt4_bindir}/assistant*
+%{?dbus:%{_qt4_bindir}/qdbusviewer}
+%{_qt4_bindir}/qt*config*
+%{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 
 %changelog
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-4
+- qt-doc noarch
+- qt-demos, qt-examples (split from -doc)
+- (cosmetic) re-order subpkgs in alphabetical order
+- drop unused profile.d bits
+
 * Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
 - enable FT_LCD_FILTER
 


--- qt4.csh DELETED ---


--- qt4.sh DELETED ---



From rdieter at fedoraproject.org  Sat Apr 25 22:20:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 25 Apr 2009 22:20:57 +0000 (UTC)
Subject: rpms/pinentry/devel .cvsignore, 1.6, 1.7 pinentry.spec, 1.22,
	1.23 sources, 1.6, 1.7 pinentry-0.7.4-glib2.patch, 1.1, NONE
Message-ID: <20090425222057.71779700DD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28277

Modified Files:
	.cvsignore pinentry.spec sources 
Removed Files:
	pinentry-0.7.4-glib2.patch 
Log Message:
* Sat Apr 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.5-1
- pinentry-0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Dec 2007 05:02:28 -0000	1.6
+++ .cvsignore	25 Apr 2009 22:20:26 -0000	1.7
@@ -1,6 +1,2 @@
-pinentry-0.7.2.tar.gz
-pinentry-0.7.2.tar.gz.sig
-pinentry-0.7.3.tar.gz
-pinentry-0.7.3.tar.gz.sig
-pinentry-0.7.4.tar.gz
-pinentry-0.7.4.tar.gz.sig
+pinentry-0.7.5.tar.gz
+pinentry-0.7.5.tar.gz.sig


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pinentry.spec	27 Feb 2009 00:30:36 -0000	1.22
+++ pinentry.spec	25 Apr 2009 22:20:26 -0000	1.23
@@ -1,14 +1,20 @@
 
+%if 0%{?fedora} > 8
+%define qt3 qt3
+%else
+%define qt3 qt
+%endif
+
 Name:    pinentry
-Version: 0.7.4
-Release: 6%{?dist}
+Version: 0.7.5
+Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
 License: GPLv2+
 URL:     http://www.gnupg.org/aegypten/
-Source0: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
-Source1: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
+Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: pinentry-0.7.4-glib2.patch
@@ -16,11 +22,7 @@
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
-%if 0%{?fedora} > 8
-BuildRequires: qt3-devel
-%else
-BuildRequires: qt-devel
-%endif
+BuildRequires: %{qt3}-devel
 
 Requires(post): %{_sbindir}/update-alternatives
 Requires(post): /sbin/install-info
@@ -65,7 +67,7 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .glib2
+#patch1 -p1 -b .glib2
 
 
 %build
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.5-1
+- pinentry-0.7.5
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Dec 2007 05:02:28 -0000	1.6
+++ sources	25 Apr 2009 22:20:26 -0000	1.7
@@ -1,2 +1,2 @@
-d7709fe7c48a24c34c5948725cef7d93  pinentry-0.7.4.tar.gz
-300e7d19f60b6f10d004825e7e3be42f  pinentry-0.7.4.tar.gz.sig
+ca492afbbb59cd19f1c875533f18b269  pinentry-0.7.5.tar.gz
+afe88ce56cd02924a292f9f5f6f40cd6  pinentry-0.7.5.tar.gz.sig


--- pinentry-0.7.4-glib2.patch DELETED ---



From petersen at fedoraproject.org  Sat Apr 25 23:23:24 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 23:23:24 +0000 (UTC)
Subject: rpms/haddock/devel haddock.spec,1.21,1.22
Message-ID: <20090425232324.44780700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2092

Modified Files:
	haddock.spec 
Log Message:
haddock requires the version of ghc it was built for


Index: haddock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- haddock.spec	25 Apr 2009 12:24:01 -0000	1.21
+++ haddock.spec	25 Apr 2009 23:22:53 -0000	1.22
@@ -11,7 +11,7 @@
 
 Name:           haddock
 Version:        2.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell documentation tool
 
 Group:          Development/Tools
@@ -32,6 +32,8 @@
 BuildRequires:  ghc-prof
 BuildRequires:  ghc-ghc-paths-prof
 %endif
+# haddock only works for the version of ghc it is built for
+Requires:       ghc = %{ghc_version}
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -166,6 +168,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Jens Petersen <petersen at redhat.com> - 2.4.2-2
+- haddock requires the version of ghc it was built for
+
 * Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 2.4.2-1
 - update to 2.4.2
 - sync with cabal2spec-0.15



From rdieter at fedoraproject.org  Sat Apr 25 23:31:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 25 Apr 2009 23:31:34 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.264,1.265
Message-ID: <20090425233134.52C68700DD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2839

Modified Files:
	qt.spec 
Log Message:
omit %_qt4_prefix/doc symlink (which breaks qt-doc.noarch build)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- qt.spec	25 Apr 2009 20:40:50 -0000	1.264
+++ qt.spec	25 Apr 2009 23:31:03 -0000	1.265
@@ -479,7 +479,8 @@
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
 
-%if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
+%if 0
+#if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
 rm -rf %{buildroot}%{_qt4_prefix}/doc
 ln -s  ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
@@ -759,7 +760,7 @@
 %{_qt4_docdir}/html
 %{_qt4_docdir}/qch/
 %{_qt4_docdir}/src/
-%{_qt4_prefix}/doc
+#{_qt4_prefix}/doc
 # Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant*.desktop
 



From petersen at fedoraproject.org  Sat Apr 25 23:33:02 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 25 Apr 2009 23:33:02 +0000 (UTC)
Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.19,1.20
Message-ID: <20090425233302.0BC92700DD@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3182

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
use haddock-2.4.2


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ghc-gtk2hs.spec	25 Apr 2009 10:21:36 -0000	1.19
+++ ghc-gtk2hs.spec	25 Apr 2009 23:32:31 -0000	1.20
@@ -214,7 +214,7 @@
 
 %build
 %if %{with docs}
-export HADDOCK=%{_bindir}/haddock-2.4.1
+export HADDOCK=%{_bindir}/haddock-2.4.2
 %endif
 %configure \
         --with-hc=ghc-%{ghc_version} \
@@ -291,6 +291,7 @@
 %changelog
 * Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-5
 - rebuild against ghc-6.10.2
+- use haddock-2.4.2
 
 * Tue Apr 14 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-4
 - use define not global to define subpackage since it broke ?3: expansion



From itamarjp at fedoraproject.org  Sat Apr 25 23:38:47 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 25 Apr 2009 23:38:47 +0000 (UTC)
Subject: rpms/qt-creator/devel import.log,1.2,1.3 qt-creator.spec,1.2,1.3
Message-ID: <20090425233847.4671E700DD@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3694/devel

Modified Files:
	import.log qt-creator.spec 
Log Message:
fix icons



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Apr 2009 18:23:40 -0000	1.2
+++ import.log	25 Apr 2009 23:38:16 -0000	1.3
@@ -1,2 +1,3 @@
 qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
 qt-creator-1_1_0-1_fc11:HEAD:qt-creator-1.1.0-1.fc11.src.rpm:1240510779
+qt-creator-1_1_0-2_fc11:HEAD:qt-creator-1.1.0-2.fc11.src.rpm:1240702375


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-creator.spec	23 Apr 2009 18:23:40 -0000	1.2
+++ qt-creator.spec	25 Apr 2009 23:38:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           qt-creator
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -16,7 +16,7 @@
 
 #temporary disabled docs
 Patch8:       no-docu.diff
-
+Requires:       hicolor-icon-theme
 BuildRequires:  qt4-devel >= 4.5.0
 BuildRequires:  desktop-file-utils
 
@@ -45,6 +45,15 @@
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}
 
+for i in 16 24 32 48 64 128
+do
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps
+# link it to %{_datadir}/pixmaps/qtcreator_logo_${i}.png
+ln -s ../../../../pixmaps/qtcreator_logo_${i}.png \
+ $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps/Nokia-QtCreator.png
+
+done
+
 desktop-file-install                                    \
 --add-category="Development"                            \
 --dir=%{buildroot}%{_datadir}/applications              \
@@ -64,9 +73,12 @@
 %{_datadir}/qtcreator
 %{_datadir}/pixmaps/qtcreator_logo_*.png
 %{_datadir}/applications/qtcreator.desktop
-
+%{_datadir}/icons/hicolor/*/apps/Nokia-QtCreator.png
 
 %changelog
+* Sat Apr 25 2009 Muayyad Saleh Alsadi <alsadi at ojuba.org> - 1.1.0-2
+- fix icons
+
 * Thu Apr 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1.0-1
 - qt-creator 1.1.0
 - include missing BuildRequires desktop-file-utils



From pbrobinson at fedoraproject.org  Sun Apr 26 00:01:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 26 Apr 2009 00:01:02 +0000 (UTC)
Subject: rpms/opal/devel opal-3.6.2.patch,NONE,1.1 opal.spec,1.47,1.48
Message-ID: <20090426000102.14C9670129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5654

Modified Files:
	opal.spec 
Added Files:
	opal-3.6.2.patch 
Log Message:
- pull in some upstream fixes for possible crashes

opal-3.6.2.patch:

--- NEW FILE opal-3.6.2.patch ---
--- opal/src/codec/rfc2833.cxx	2009/03/18 22:44:26	22219
+++ opal/src/codec/rfc2833.cxx	2009/03/18 22:51:48	22220
@@ -156,6 +156,12 @@
     }
   }
 
+  // if transmittter is ever in this state, then stop the duration timer
+  if (m_payloadType == RTP_DataFrame::IllegalPayloadType) {
+    PTRACE(2, "RFC2833\tNo payload type, cannot send packet.");
+    return false;
+  }
+
   // convert tone to correct code
   PINDEX code = ASCIIToRFC2833(tone, m_txCapabilitySet[NSECodeBase]);
 
--- opal/src/sip/sipcon.cxx	2009/03/19 00:07:23	22223
+++ opal/src/sip/sipcon.cxx	2009/03/19 00:07:41	22224
@@ -146,6 +146,7 @@
   { SIP_PDU::Failure_RequestEntityTooLarge      , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_RequestURITooLong          , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_UnsupportedMediaType       , OpalConnection::EndedByCapabilityExchange,  79 }, // Service/option not implemented (+)
+  { SIP_PDU::Failure_NotAcceptableHere          , OpalConnection::EndedByCapabilityExchange,  79 }, // Service/option not implemented (+)
   { SIP_PDU::Failure_UnsupportedURIScheme       , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_BadExtension               , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_ExtensionRequired          , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
--- opal/src/opal/call.cxx	2009/03/19 01:36:24	22227
+++ opal/src/opal/call.cxx	2009/03/19 03:16:14	22228
@@ -353,6 +353,7 @@
   PSafePtr<OpalConnection> otherConnection;
   while (EnumerateConnections(otherConnection, PSafeReadOnly, includeSpecifiedConnection ? NULL : &connection)) {
     OpalMediaFormatList possibleFormats = OpalTranscoder::GetPossibleFormats(otherConnection->GetMediaFormats());
+    otherConnection->AdjustMediaFormats(possibleFormats);
     if (first) {
       commonFormats = possibleFormats;
       first = PFalse;
--- opal/src/sip/sippdu.cxx	2009/03/24 01:30:32	22259
+++ opal/src/sip/sippdu.cxx	2009/03/24 02:19:47	22260
@@ -2706,13 +2706,11 @@
 {
   PSafeLockReadWrite lock(*this);
 
-  if (!lock.IsLocked() || (state != Trying && state != Cancelling))
+  if (!lock.IsLocked() || state > Cancelling || (state == Proceeding && method == Method_INVITE))
     return;
 
   retry++;
 
-  PTRACE(3, "SIP\tTransaction " << mime.GetCSeq() << " timeout, making retry " << retry);
-
   if (retry >= endpoint.GetMaxRetries()) {
     SetTerminated(Terminated_RetriesExceeded);
     return;
@@ -2727,11 +2725,16 @@
       return;
   }
 
-  PTimeInterval timeout = retryTimeoutMin*(1<<retry);
-  if (timeout > retryTimeoutMax)
+  if (state > Trying)
     retryTimer = retryTimeoutMax;
-  else
+  else {
+    PTimeInterval timeout = retryTimeoutMin*(1<<retry);
+    if (timeout > retryTimeoutMax)
+      timeout = retryTimeoutMax;
     retryTimer = timeout;
+  }
+
+  PTRACE(3, "SIP\tTransaction " << mime.GetCSeq() << " timeout, making retry " << retry << ", timeout " << retryTimer);
 }
 
 
--- opal/plugins/video/common/dyna.cxx	2009/03/24 04:35:50	22264
+++ opal/plugins/video/common/dyna.cxx	2009/03/24 04:36:35	22265
@@ -59,17 +59,17 @@
 bool DynaLink::InternalOpen(const char * dir, const char *name)
 {
   char path[1024];
-  memset(path, 0, sizeof(path));
+  path[0] = '\0';
 
   // Copy the directory to "path" and add a separator if necessary
-  if (strlen(path) > 0) {
+  if (dir != NULL && *dir != '\0') {
     strcpy(path, dir);
     if (path[strlen(path)-1] != DIR_SEPARATOR[0]) 
-    strcat(path, DIR_SEPARATOR);
+      strcat(path, DIR_SEPARATOR);
   }
   strcat(path, name);
 
-  if (strlen(path) == 0) {
+  if (path[0] == '\0') {
     TRACE(1, _codecString << "\tDYNA\tdir '" << (dir != NULL ? dir : "(NULL)") << "', name '" << (name != NULL ? name : "(NULL)") << "' resulted in empty path");
     return false;
   }
--- opal/src/rtp/jitter.cxx	2009/03/25 00:52:00	22271
+++ opal/src/rtp/jitter.cxx	2009/03/25 00:58:03	22272
@@ -244,6 +244,7 @@
 
 void OpalJitterBuffer::DeInit(Entry * & /*currentReadFrame*/, PBoolean & /*markerWarning*/)
 {
+  bufferMutex.Signal();
 }
 
 PBoolean OpalJitterBuffer::PreRead(OpalJitterBuffer::Entry * & currentReadFrame, PBoolean & /*markerWarning*/)
--- opal/src/sip/handlers.cxx	2009/03/10 04:27:59	22186
+++ opal/src/sip/handlers.cxx	2009/04/14 03:00:56	22421
@@ -252,7 +252,6 @@
 PBoolean SIPHandler::SendRequest(SIPHandler::State newState)
 {
   expireTimer.Stop(false); // Stop automatic retry
-  bool retryLater = false;
 
   if (expire == 0)
     newState = Unsubscribing;
@@ -275,8 +274,6 @@
     case Subscribing :
     case Refreshing :
     case Restoring :
-      if (GetTransport() == NULL) 
-        retryLater = true;
       break;
 
     default :
@@ -286,7 +283,7 @@
 
   SetState(newState);
 
-  if (!retryLater) {
+  if (GetTransport() != NULL) {
     // Restoring or first time, try every interface
     if (newState == Restoring || m_transport->GetInterface().IsEmpty()) {
       PWaitAndSignal mutex(m_transport->GetWriteMutex());
@@ -298,19 +295,21 @@
       if (WriteSIPHandler(*m_transport))
         return true;
     }
+
     OnFailed(SIP_PDU::Local_TransportError);
-    retryLater = true;
   }
 
-  if (retryLater) {
-    PTRACE(4, "SIP\tRetrying " << GetMethod() << " in " << offlineExpire << " seconds.");
-    OnFailed(SIP_PDU::Local_BadTransportAddress);
-    expireTimer.SetInterval(0, offlineExpire); // Keep trying to get it back
-    SetState(Unavailable);
+  if (newState == Unsubscribing) {
+    // Transport level error, probably never going to get the unsubscribe through
+    SetState(Unsubscribed);
     return true;
   }
 
-  return false;
+  PTRACE(4, "SIP\tRetrying " << GetMethod() << " in " << offlineExpire << " seconds.");
+  OnFailed(SIP_PDU::Local_BadTransportAddress);
+  expireTimer.SetInterval(0, offlineExpire); // Keep trying to get it back
+  SetState(Unavailable);
+  return true;
 }
 
 
--- opal/src/sip/handlers.cxx	2009/04/15 02:31:56	22427
+++ opal/src/sip/handlers.cxx	2009/04/15 02:34:55	22428
@@ -114,12 +114,21 @@
     if (remote.IsEmpty())
       m_remoteAddress = m_addressOfRecord;
     else if (remote.Find('@') != P_MAX_INDEX)
-      m_remoteAddress = remote;
-    else if (m_addressOfRecord.GetHostAddress().IsEquivalent(remote))
-      m_remoteAddress = m_addressOfRecord;
+      m_remoteAddress = remote; // For third party registrations
     else {
-      m_remoteAddress = m_proxy = remote;
-      m_remoteAddress.SetUserName(m_addressOfRecord.GetUserName());
+      SIPURL remoteURL = remote;
+      if (m_addressOfRecord.GetHostAddress().IsEquivalent(remoteURL.GetHostAddress()))
+        m_remoteAddress = m_addressOfRecord;
+      else {
+        /* Note this sets the proxy field because the user has givena full AOR
+           with a domain for "target" and then specified a specific host name
+           which as far as we are concered is the host to talk to. Setting the
+           proxy will prevent SRV lookups or other things that might stop uis
+           from going to that very specific host.
+         */
+        m_remoteAddress = m_proxy = remoteURL;
+        m_remoteAddress.SetUserName(m_addressOfRecord.GetUserName());
+      }
     }
   }
 
--- opal/src/sip/sipep.cxx.orig	2009-04-26 00:20:26.000000000 +0100
+++ opal/src/sip/sipep.cxx	2009-04-26 00:33:00.000000000 +0100
@@ -523,8 +523,17 @@
       break;
   }
 
-  if (hasFromConnection && hasToConnection)
-    token = pdu->GetMethod() != SIP_PDU::NumMethods ? fromToken : toToken;
+  if (hasFromConnection && hasToConnection) {
+    switch (pdu->GetMethod()) {
+      case SIP_PDU::Method_ACK :
+      case SIP_PDU::NumMethods :
+        token = toToken;
+        break;
+
+      default :
+        token = fromToken;
+    }
+  }
   else if (hasFromConnection)
     token = fromToken;
   else if (hasToConnection)


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- opal.spec	21 Apr 2009 18:03:43 -0000	1.47
+++ opal.spec	26 Apr 2009 00:00:31 -0000	1.48
@@ -1,15 +1,16 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 # We cannot use unmodified upstream source code because it contains the 
 # non-free iLBC codec.
 # rm -rf plugins/audio/iLBC/
 # rm -rf src/codec/iLBCmf.cxx
-# Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+#Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
 Source0:	%{name}-%{version}-noilbc.tar.bz2
 Patch0:		opal-3.6.1-noilbc.patch
+Patch1:		opal-3.6.2.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRequires:	ptlib-devel = 2.6.1
@@ -41,6 +42,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .noilbc
+%patch1 -p1 -b .3.6.2
 
 %build
 %configure --prefix=/usr
@@ -75,6 +77,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Sun Apr 26 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.1-3
+- pull in some upstream fixes for possible crashes
+
 * Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.1-2
 - pull out ilbc codec due to legal issues
 



From pbrobinson at fedoraproject.org  Sun Apr 26 00:03:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 26 Apr 2009 00:03:02 +0000 (UTC)
Subject: rpms/opal/F-11 opal-3.6.2.patch,NONE,1.1 opal.spec,1.47,1.48
Message-ID: <20090426000302.DF31D70129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5947

Modified Files:
	opal.spec 
Added Files:
	opal-3.6.2.patch 
Log Message:
- pull in some upstream fixes for possible crashes

opal-3.6.2.patch:

--- NEW FILE opal-3.6.2.patch ---
--- opal/src/codec/rfc2833.cxx	2009/03/18 22:44:26	22219
+++ opal/src/codec/rfc2833.cxx	2009/03/18 22:51:48	22220
@@ -156,6 +156,12 @@
     }
   }
 
+  // if transmittter is ever in this state, then stop the duration timer
+  if (m_payloadType == RTP_DataFrame::IllegalPayloadType) {
+    PTRACE(2, "RFC2833\tNo payload type, cannot send packet.");
+    return false;
+  }
+
   // convert tone to correct code
   PINDEX code = ASCIIToRFC2833(tone, m_txCapabilitySet[NSECodeBase]);
 
--- opal/src/sip/sipcon.cxx	2009/03/19 00:07:23	22223
+++ opal/src/sip/sipcon.cxx	2009/03/19 00:07:41	22224
@@ -146,6 +146,7 @@
   { SIP_PDU::Failure_RequestEntityTooLarge      , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_RequestURITooLong          , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_UnsupportedMediaType       , OpalConnection::EndedByCapabilityExchange,  79 }, // Service/option not implemented (+)
+  { SIP_PDU::Failure_NotAcceptableHere          , OpalConnection::EndedByCapabilityExchange,  79 }, // Service/option not implemented (+)
   { SIP_PDU::Failure_UnsupportedURIScheme       , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_BadExtension               , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
   { SIP_PDU::Failure_ExtensionRequired          , OpalConnection::EndedByQ931Cause         , 127 }, // Interworking (+)
--- opal/src/opal/call.cxx	2009/03/19 01:36:24	22227
+++ opal/src/opal/call.cxx	2009/03/19 03:16:14	22228
@@ -353,6 +353,7 @@
   PSafePtr<OpalConnection> otherConnection;
   while (EnumerateConnections(otherConnection, PSafeReadOnly, includeSpecifiedConnection ? NULL : &connection)) {
     OpalMediaFormatList possibleFormats = OpalTranscoder::GetPossibleFormats(otherConnection->GetMediaFormats());
+    otherConnection->AdjustMediaFormats(possibleFormats);
     if (first) {
       commonFormats = possibleFormats;
       first = PFalse;
--- opal/src/sip/sippdu.cxx	2009/03/24 01:30:32	22259
+++ opal/src/sip/sippdu.cxx	2009/03/24 02:19:47	22260
@@ -2706,13 +2706,11 @@
 {
   PSafeLockReadWrite lock(*this);
 
-  if (!lock.IsLocked() || (state != Trying && state != Cancelling))
+  if (!lock.IsLocked() || state > Cancelling || (state == Proceeding && method == Method_INVITE))
     return;
 
   retry++;
 
-  PTRACE(3, "SIP\tTransaction " << mime.GetCSeq() << " timeout, making retry " << retry);
-
   if (retry >= endpoint.GetMaxRetries()) {
     SetTerminated(Terminated_RetriesExceeded);
     return;
@@ -2727,11 +2725,16 @@
       return;
   }
 
-  PTimeInterval timeout = retryTimeoutMin*(1<<retry);
-  if (timeout > retryTimeoutMax)
+  if (state > Trying)
     retryTimer = retryTimeoutMax;
-  else
+  else {
+    PTimeInterval timeout = retryTimeoutMin*(1<<retry);
+    if (timeout > retryTimeoutMax)
+      timeout = retryTimeoutMax;
     retryTimer = timeout;
+  }
+
+  PTRACE(3, "SIP\tTransaction " << mime.GetCSeq() << " timeout, making retry " << retry << ", timeout " << retryTimer);
 }
 
 
--- opal/plugins/video/common/dyna.cxx	2009/03/24 04:35:50	22264
+++ opal/plugins/video/common/dyna.cxx	2009/03/24 04:36:35	22265
@@ -59,17 +59,17 @@
 bool DynaLink::InternalOpen(const char * dir, const char *name)
 {
   char path[1024];
-  memset(path, 0, sizeof(path));
+  path[0] = '\0';
 
   // Copy the directory to "path" and add a separator if necessary
-  if (strlen(path) > 0) {
+  if (dir != NULL && *dir != '\0') {
     strcpy(path, dir);
     if (path[strlen(path)-1] != DIR_SEPARATOR[0]) 
-    strcat(path, DIR_SEPARATOR);
+      strcat(path, DIR_SEPARATOR);
   }
   strcat(path, name);
 
-  if (strlen(path) == 0) {
+  if (path[0] == '\0') {
     TRACE(1, _codecString << "\tDYNA\tdir '" << (dir != NULL ? dir : "(NULL)") << "', name '" << (name != NULL ? name : "(NULL)") << "' resulted in empty path");
     return false;
   }
--- opal/src/rtp/jitter.cxx	2009/03/25 00:52:00	22271
+++ opal/src/rtp/jitter.cxx	2009/03/25 00:58:03	22272
@@ -244,6 +244,7 @@
 
 void OpalJitterBuffer::DeInit(Entry * & /*currentReadFrame*/, PBoolean & /*markerWarning*/)
 {
+  bufferMutex.Signal();
 }
 
 PBoolean OpalJitterBuffer::PreRead(OpalJitterBuffer::Entry * & currentReadFrame, PBoolean & /*markerWarning*/)
--- opal/src/sip/handlers.cxx	2009/03/10 04:27:59	22186
+++ opal/src/sip/handlers.cxx	2009/04/14 03:00:56	22421
@@ -252,7 +252,6 @@
 PBoolean SIPHandler::SendRequest(SIPHandler::State newState)
 {
   expireTimer.Stop(false); // Stop automatic retry
-  bool retryLater = false;
 
   if (expire == 0)
     newState = Unsubscribing;
@@ -275,8 +274,6 @@
     case Subscribing :
     case Refreshing :
     case Restoring :
-      if (GetTransport() == NULL) 
-        retryLater = true;
       break;
 
     default :
@@ -286,7 +283,7 @@
 
   SetState(newState);
 
-  if (!retryLater) {
+  if (GetTransport() != NULL) {
     // Restoring or first time, try every interface
     if (newState == Restoring || m_transport->GetInterface().IsEmpty()) {
       PWaitAndSignal mutex(m_transport->GetWriteMutex());
@@ -298,19 +295,21 @@
       if (WriteSIPHandler(*m_transport))
         return true;
     }
+
     OnFailed(SIP_PDU::Local_TransportError);
-    retryLater = true;
   }
 
-  if (retryLater) {
-    PTRACE(4, "SIP\tRetrying " << GetMethod() << " in " << offlineExpire << " seconds.");
-    OnFailed(SIP_PDU::Local_BadTransportAddress);
-    expireTimer.SetInterval(0, offlineExpire); // Keep trying to get it back
-    SetState(Unavailable);
+  if (newState == Unsubscribing) {
+    // Transport level error, probably never going to get the unsubscribe through
+    SetState(Unsubscribed);
     return true;
   }
 
-  return false;
+  PTRACE(4, "SIP\tRetrying " << GetMethod() << " in " << offlineExpire << " seconds.");
+  OnFailed(SIP_PDU::Local_BadTransportAddress);
+  expireTimer.SetInterval(0, offlineExpire); // Keep trying to get it back
+  SetState(Unavailable);
+  return true;
 }
 
 
--- opal/src/sip/handlers.cxx	2009/04/15 02:31:56	22427
+++ opal/src/sip/handlers.cxx	2009/04/15 02:34:55	22428
@@ -114,12 +114,21 @@
     if (remote.IsEmpty())
       m_remoteAddress = m_addressOfRecord;
     else if (remote.Find('@') != P_MAX_INDEX)
-      m_remoteAddress = remote;
-    else if (m_addressOfRecord.GetHostAddress().IsEquivalent(remote))
-      m_remoteAddress = m_addressOfRecord;
+      m_remoteAddress = remote; // For third party registrations
     else {
-      m_remoteAddress = m_proxy = remote;
-      m_remoteAddress.SetUserName(m_addressOfRecord.GetUserName());
+      SIPURL remoteURL = remote;
+      if (m_addressOfRecord.GetHostAddress().IsEquivalent(remoteURL.GetHostAddress()))
+        m_remoteAddress = m_addressOfRecord;
+      else {
+        /* Note this sets the proxy field because the user has givena full AOR
+           with a domain for "target" and then specified a specific host name
+           which as far as we are concered is the host to talk to. Setting the
+           proxy will prevent SRV lookups or other things that might stop uis
+           from going to that very specific host.
+         */
+        m_remoteAddress = m_proxy = remoteURL;
+        m_remoteAddress.SetUserName(m_addressOfRecord.GetUserName());
+      }
     }
   }
 
--- opal/src/sip/sipep.cxx.orig	2009-04-26 00:20:26.000000000 +0100
+++ opal/src/sip/sipep.cxx	2009-04-26 00:33:00.000000000 +0100
@@ -523,8 +523,17 @@
       break;
   }
 
-  if (hasFromConnection && hasToConnection)
-    token = pdu->GetMethod() != SIP_PDU::NumMethods ? fromToken : toToken;
+  if (hasFromConnection && hasToConnection) {
+    switch (pdu->GetMethod()) {
+      case SIP_PDU::Method_ACK :
+      case SIP_PDU::NumMethods :
+        token = toToken;
+        break;
+
+      default :
+        token = fromToken;
+    }
+  }
   else if (hasFromConnection)
     token = fromToken;
   else if (hasToConnection)


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-11/opal.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- opal.spec	21 Apr 2009 18:03:40 -0000	1.47
+++ opal.spec	26 Apr 2009 00:02:32 -0000	1.48
@@ -1,15 +1,16 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 # We cannot use unmodified upstream source code because it contains the 
 # non-free iLBC codec.
 # rm -rf plugins/audio/iLBC/
 # rm -rf src/codec/iLBCmf.cxx
-# Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
+#Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2
 Source0:	%{name}-%{version}-noilbc.tar.bz2
 Patch0:		opal-3.6.1-noilbc.patch
+Patch1:		opal-3.6.2.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRequires:	ptlib-devel = 2.6.1
@@ -41,6 +42,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .noilbc
+%patch1 -p1 -b .3.6.2
 
 %build
 %configure --prefix=/usr
@@ -75,6 +77,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Sun Apr 26 2009 Peter Robinson <pbrobinson at gmail.com> - 3.6.1-3
+- pull in some upstream fixes for possible crashes
+
 * Tue Apr 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.1-2
 - pull out ilbc codec due to legal issues
 



From itamarjp at fedoraproject.org  Sun Apr 26 00:18:14 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sun, 26 Apr 2009 00:18:14 +0000 (UTC)
Subject: rpms/qt-creator/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 qt-creator.spec, 1.1, 1.2 sources, 1.2,
	1.3 disable_private_header_check.patch, 1.1,
	NONE enable-signal-slot.patch, 1.1, NONE pluginPaths.patch, 1.1,
	NONE qtcreator-qworkbenchlibrary_lib64.patch, 1.1,
	NONE qtcreator-qworkbenchplugin_lib64.patch, 1.1,
	NONE qtcreator_rpath.patch, 1.1, NONE qworkbench_lib64.patch,
	1.1, NONE
Message-ID: <20090426001814.2EA2170129@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6851/F-11

Modified Files:
	.cvsignore import.log qt-creator.spec sources 
Removed Files:
	disable_private_header_check.patch enable-signal-slot.patch 
	pluginPaths.patch qtcreator-qworkbenchlibrary_lib64.patch 
	qtcreator-qworkbenchplugin_lib64.patch qtcreator_rpath.patch 
	qworkbench_lib64.patch 
Log Message:
qt-creator 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Apr 2009 03:06:11 -0000	1.2
+++ .cvsignore	26 Apr 2009 00:17:43 -0000	1.3
@@ -1 +1 @@
-qt-creator-1.0.0-src.zip
+qt-creator-1.1.0-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Apr 2009 03:06:11 -0000	1.1
+++ import.log	26 Apr 2009 00:17:43 -0000	1.2
@@ -1 +1,2 @@
 qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
+qt-creator-1_1_0-2_fc11:F-11:qt-creator-1.1.0-2.fc11.src.rpm:1240704397


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/qt-creator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-creator.spec	5 Apr 2009 03:06:11 -0000	1.1
+++ qt-creator.spec	26 Apr 2009 00:17:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           qt-creator
-Version:        1.0.0
-Release:        4%{?dist}
+Version:        1.1.0
+Release:        2%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -11,29 +11,14 @@
 
 Source1:       qtcreator.desktop
 
-#make ui editor works
-#patch from http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff;h=f3f20d96bdfb5266cc25ac91ae0def8a33875a81
-Patch0:         disable_private_header_check.patch
-
 #fix qdoc3 executable location in fedora
 Patch1:         qtdoc3_location.patch
 
-#make it install into lib64
-Patch2:         qtcreator-qworkbenchlibrary_lib64.patch
-Patch3:         qtcreator-qworkbenchplugin_lib64.patch
-Patch4:         qworkbench_lib64.patch
-Patch5:         qtcreator_rpath.patch
-
-#enable signal/slot editor  http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff_plain;h=bf118eba1ee1f5b6e19c6f29cd7d114c121a20ef
-Patch6:        enable-signal-slot.patch
-
-#search for plugins in lib64 dir
-Patch7:        pluginPaths.patch
-
 #temporary disabled docs
 Patch8:       no-docu.diff
-
+Requires:       hicolor-icon-theme
 BuildRequires:  qt4-devel >= 4.5.0
+BuildRequires:  desktop-file-utils
 
 %description
 Qt Creator (previously known as Project Greenhouse) is a new,
@@ -43,20 +28,7 @@
 
 %prep
 %setup -q -n %name-%version-src
-%patch0 -p0
 %patch1 -p0
-
-#make it install into lib64
-%if "%{_lib}" == "lib64"
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch7 -p0
-%endif
-
-%patch6 -p0
-
 %patch8 -p0
 
 %build
@@ -73,17 +45,20 @@
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}
 
+for i in 16 24 32 48 64 128
+do
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps
+# link it to %{_datadir}/pixmaps/qtcreator_logo_${i}.png
+ln -s ../../../../pixmaps/qtcreator_logo_${i}.png \
+ $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps/Nokia-QtCreator.png
+
+done
+
 desktop-file-install                                    \
 --add-category="Development"                            \
 --dir=%{buildroot}%{_datadir}/applications              \
 %{SOURCE1}
 
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,12 +67,22 @@
 %defattr(-,root,root,-)
 %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
 %{_bindir}/qtcreator
+%{_bindir}/qtcreator.bin
+%{_bindir}/qtcreator_process_stub
 %{_libdir}/qtcreator
 %{_datadir}/qtcreator
 %{_datadir}/pixmaps/qtcreator_logo_*.png
 %{_datadir}/applications/qtcreator.desktop
+%{_datadir}/icons/hicolor/*/apps/Nokia-QtCreator.png
 
 %changelog
+* Sat Apr 25 2009 Muayyad Saleh Alsadi <alsadi at ojuba.org> - 1.1.0-2
+- fix icons
+
+* Thu Apr 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1.0-1
+- qt-creator 1.1.0
+- include missing BuildRequires desktop-file-utils
+
 * Tue Mar 20 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-4
 - fix lib's loading in 64 bit machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Apr 2009 03:06:12 -0000	1.2
+++ sources	26 Apr 2009 00:17:43 -0000	1.3
@@ -1 +1 @@
-5478124035d80a90e66a3db67ab4477a  qt-creator-1.0.0-src.zip
+f0fd01f7c5a1f50c479bed13db2134bf  qt-creator-1.1.0-src.zip


--- disable_private_header_check.patch DELETED ---


--- enable-signal-slot.patch DELETED ---


--- pluginPaths.patch DELETED ---


--- qtcreator-qworkbenchlibrary_lib64.patch DELETED ---


--- qtcreator-qworkbenchplugin_lib64.patch DELETED ---


--- qtcreator_rpath.patch DELETED ---


--- qworkbench_lib64.patch DELETED ---



From petersen at fedoraproject.org  Sun Apr 26 00:20:36 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 26 Apr 2009 00:20:36 +0000 (UTC)
Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.20,1.21
Message-ID: <20090426002036.7C60A70129@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
update to new ghcpkgdir and ghcdocdir macros


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ghc-gtk2hs.spec	25 Apr 2009 23:32:31 -0000	1.20
+++ ghc-gtk2hs.spec	26 Apr 2009 00:20:06 -0000	1.21
@@ -158,7 +158,7 @@
 %endif\
 \
 %post -n ghc-%1-devel\
-ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \
+ghc-pkg-%{ghc_version} update %{ghcpkgdir}/%1.package.conf &>/dev/null || : \
 \
 %preun -n ghc-%1-devel\
 if [ "$1" = 0 ]; then\
@@ -167,16 +167,16 @@
 \
 %files -n ghc-%1-devel\
 %defattr(-,root,root,-)\
-%{pkg_libdir}/%1.cabal\
-%{pkg_libdir}/%1.package.conf\
-%{pkg_libdir}/libHS%1.a\
-%{pkg_libdir}/HS%1.o\
-%{pkg_libdir}/imports/%1\
+%{ghcpkgdir}/%1.cabal\
+%{ghcpkgdir}/%1.package.conf\
+%{ghcpkgdir}/libHS%1.a\
+%{ghcpkgdir}/HS%1.o\
+%{ghcpkgdir}/imports/%1\
 \
 %if %{with prof}\
 %files -n ghc-%1-prof\
 %defattr(-,root,root,-)\
-%{pkg_libdir}/libHS%{1}_p.a\
+%{ghcpkgdir}/libHS%{1}_p.a\
 %endif
 
 %subpackage cairo cairo glib
@@ -246,12 +246,12 @@
 %{nil}
 
 # C locale to workaround c2hs failing in CJK locale
-LANG=C make all pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
+LANG=C make all pkglibdir=%{ghcpkgdir} htmldocdir=%{ghcdocdir}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
+make install DESTDIR=%{buildroot} pkglibdir=%{ghcpkgdir} htmldocdir=%{ghcdocdir}
 
 
 %clean
@@ -274,17 +274,17 @@
 %files common
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING*
-%dir %{pkg_libdir}
-%dir %{pkg_libdir}/imports
-%dir %{pkg_libdir}/include
-%{pkg_libdir}/include/gtk2hs-config.h
+%dir %{ghcpkgdir}
+%dir %{ghcpkgdir}/imports
+%dir %{ghcpkgdir}/include
+%{ghcpkgdir}/include/gtk2hs-config.h
 
 
 %if %{with docs}
 %files doc
 %defattr(-,root,root,-)
 %doc ChangeLog TODO demo
-%{pkg_docdir}
+%{ghcdocdir}
 %endif
 
 
@@ -292,6 +292,7 @@
 * Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-5
 - rebuild against ghc-6.10.2
 - use haddock-2.4.2
+- update to new ghcpkgdir and ghcdocdir macros
 
 * Tue Apr 14 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-4
 - use define not global to define subpackage since it broke ?3: expansion



From petersen at fedoraproject.org  Sun Apr 26 00:57:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 26 Apr 2009 00:57:17 +0000 (UTC)
Subject: rpms/cabal-install/devel cabal-install.spec,1.3,1.4
Message-ID: <20090426005718.0DCE470125@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cabal-install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10101

Modified Files:
	cabal-install.spec 
Log Message:
rebuild against ghc-6.10.2


Index: cabal-install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cabal-install/devel/cabal-install.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cabal-install.spec	27 Feb 2009 07:18:31 -0000	1.3
+++ cabal-install.spec	26 Apr 2009 00:56:46 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           cabal-install
 Version:        0.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Haskell package tool
 
 Group:          Development/Tools
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-3
+- rebuild against ghc-6.10.2
+
 * Fri Feb 27 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-2
 - update for cabal2spec-0.11:
 - use global



From pkgdb at fedoraproject.org  Sun Apr 26 01:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 01:14:16 +0000
Subject: [pkgdb] clement: robert has requested watchcommits
Message-ID: <20090426011417.13DE310F888@bastion2.fedora.phx.redhat.com>

robert has requested the watchcommits acl on clement (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From pkgdb at fedoraproject.org  Sun Apr 26 01:14:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 01:14:26 +0000
Subject: [pkgdb] clement: robert has requested watchcommits
Message-ID: <20090426011426.58E5510F88B@bastion2.fedora.phx.redhat.com>

robert has requested the watchcommits acl on clement (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From pkgdb at fedoraproject.org  Sun Apr 26 01:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 01:14:37 +0000
Subject: [pkgdb] clement: robert has requested watchcommits
Message-ID: <20090426011437.7CDB310F88F@bastion2.fedora.phx.redhat.com>

robert has requested the watchcommits acl on clement (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From pkgdb at fedoraproject.org  Sun Apr 26 01:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 01:14:34 +0000
Subject: [pkgdb] clement: robert has requested watchcommits
Message-ID: <20090426011434.96E2710F888@bastion2.fedora.phx.redhat.com>

robert has requested the watchcommits acl on clement (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From mikep at fedoraproject.org  Sun Apr 26 02:33:00 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:33:00 +0000 (UTC)
Subject: rpms/fmt-ptrn/devel fmt-ptrn.spec,1.10,1.11
Message-ID: <20090426023300.4B2A870125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28292

Modified Files:
	fmt-ptrn.spec 
Log Message:
Fix post script.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/devel/fmt-ptrn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fmt-ptrn.spec	24 Feb 2009 17:44:46 -0000	1.10
+++ fmt-ptrn.spec	26 Apr 2009 02:32:28 -0000	1.11
@@ -54,6 +54,16 @@
 %{_libdir}/libnewtemplate.so.%{PACKAGE_VERSION}
 %{_datadir}/fmt-ptrn
 %{_mandir}/*/*
+
+
+%post
+/sbin/ldconfig
+
+
+
+%postun
+/sbin/ldconfig
+
 %doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ 
 
 
@@ -79,6 +89,10 @@
 %{_libdir}/libnewfmt-ptrn.so
 %{_libdir}/libnewtemplate.so
 
+
+
+
+
 %package java
 Summary: Files needed to develop applications using fmt-ptrn's Java classes
 Group: Development/Libraries
@@ -100,6 +114,16 @@
 %{_libdir}/libnewfmt-ptrnjava.so*
 %{_datadir}/java/*
 
+
+%post -n fmt-ptrn-java
+/sbin/ldconfig
+
+
+
+%postun -n fmt-ptrn-java
+/sbin/ldconfig
+
+
 %prep
 
 
@@ -126,132 +150,126 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-java -p /sbin/ldconfig
-
-%postun
-java -p /sbin/ldconfig
-
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
+- Fix ldconfig post for java package.
 
 * Sat Feb 14 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-1
-   - Updated to fmt-ptrn 1.3.20.
+- Updated to fmt-ptrn 1.3.20.
 
-   - Integrate stack_t solution upstream, pull previous patch.
+- Integrate stack_t solution upstream, pull previous patch.
 
 * Thu Feb 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1.3.17-3
-   - rebuild for dependencies, rename stack_t to my_stack_t to avoid conflict with /usr/include/bits/sigstack.h's stack_t.
+- rebuild for dependencies, rename stack_t to my_stack_t to avoid conflict with /usr/include/bits/sigstack.h's stack_t.
 
 * Sun May 25 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-2
-   - Fixed placement of %%doc in RPM specification.
+- Fixed placement of %%doc in RPM specification.
 
 * Wed Apr 02 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-1
-   - Updated to fmt-ptrn 1.3.17.
+- Updated to fmt-ptrn 1.3.17.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.16-1
-   - Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
+- Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.15-1
-   - Updated to fmt-ptrn 1.3.15.
+- Updated to fmt-ptrn 1.3.15.
 
 * Tue Feb 12 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.14-1
-   - Updated to new 1.3.14.
+- Updated to new 1.3.14.
 
 * Mon Feb 11 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-2
-   - Update to use java-1.5.0-gcj-devel.
+- Update to use java-1.5.0-gcj-devel.
 
 * Sat Dec 22 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-1
-   - Updated to new 1.3.13.
+- Updated to new 1.3.13.
 
-   - License GPLv2+.
+- License GPLv2+.
 
-   - Update make install command.
+- Update make install command.
 
 * Thu Dec 13 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.12-1
-   - Updated to new 1.3.12.
+- Updated to new 1.3.12.
 
-   - Change package name to fmt-ptrn.
+- Change package name to fmt-ptrn.
 
 * Mon Oct 02 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-2
-   - Don't build static libraries.
+- Don't build static libraries.
 
 * Tue Aug 21 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-1
-   - Updated to fmt-ptrn 1.3.11.
+- Updated to fmt-ptrn 1.3.11.
 
 * Sun Aug 19 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-2
-   - Don't install INSTALL.
+- Don't install INSTALL.
 
-   - Another %% fix.
+- Another %% fix.
 
-   - Run ldconfig for java package.
+- Run ldconfig for java package.
 
 * Sat Aug 18 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-1
-   - Updated to new 1.3.10.
+- Updated to new 1.3.10.
 
-   - Change license to GPLv2.
+- Change license to GPLv2.
 
-   - Use %% in ChangeLog.
+- Use %% in ChangeLog.
 
-   - Don't use %%makeinstall.
+- Don't use %%makeinstall.
 
-   - deffattr(-,root,root,-).
+- deffattr(-,root,root,-).
 
-   - Don't install FmtPtrnTest.
+- Don't install FmtPtrnTest.
 
-   - Don't use SMP build flags for now.
+- Don't use SMP build flags for now.
 
 * Tue Aug 14 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-2
-   - Fix build (junit.o should not be distributed.)
+- Fix build (junit.o should not be distributed.)
 
 * Sun Jul 29 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-1
-   - Updated to new 1.3.9.
+- Updated to new 1.3.9.
 
-   - Build the Java package.
+- Build the Java package.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-2
-   - BuildRequires Java tools.
+- BuildRequires Java tools.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-1
-   - Updated to new 1.3.8.
+- Updated to new 1.3.8.
 
-   - Create new Java package, comment out for now.
+- Create new Java package, comment out for now.
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-4
-   - Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
+- Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-3
-   - Rebuild for Fedora Extras 6.
+- Rebuild for Fedora Extras 6.
 
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-2
-   - Rebuild for Fedora Extras 5.
+- Rebuild for Fedora Extras 5.
 
 * Thu Feb 02 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-1
-   - Updated to new 1.3.7.
+- Updated to new 1.3.7.
 
 * Wed Feb 01 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.6-1
-   - Updated to new 1.3.6.
+- Updated to new 1.3.6.
 
 * Sat Dec 24 2005  <W. Michael Petullo> - 1.3.5-3
-   - Add %%defattr for %%files devel.
+- Add %%defattr for %%files devel.
 
 * Tue Dec 13 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-2
-   - Broke out -devel package.
+- Broke out -devel package.
 
-   - Simplifies %%files block.
+- Simplifies %%files block.
 
-   - Don't use %%doc %%{_mandir}.
+- Don't use %%doc %%{_mandir}.
 
-   - No empty NEWS or FAQ.
+- No empty NEWS or FAQ.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 
 



From mikep at fedoraproject.org  Sun Apr 26 02:34:14 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:34:14 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-11 fmt-ptrn.spec,1.10,1.11
Message-ID: <20090426023414.6408D70125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28512

Modified Files:
	fmt-ptrn.spec 
Log Message:
Fix post script.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-11/fmt-ptrn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fmt-ptrn.spec	24 Feb 2009 17:44:46 -0000	1.10
+++ fmt-ptrn.spec	26 Apr 2009 02:33:44 -0000	1.11
@@ -54,6 +54,16 @@
 %{_libdir}/libnewtemplate.so.%{PACKAGE_VERSION}
 %{_datadir}/fmt-ptrn
 %{_mandir}/*/*
+
+
+%post
+/sbin/ldconfig
+
+
+
+%postun
+/sbin/ldconfig
+
 %doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ 
 
 
@@ -79,6 +89,10 @@
 %{_libdir}/libnewfmt-ptrn.so
 %{_libdir}/libnewtemplate.so
 
+
+
+
+
 %package java
 Summary: Files needed to develop applications using fmt-ptrn's Java classes
 Group: Development/Libraries
@@ -100,6 +114,16 @@
 %{_libdir}/libnewfmt-ptrnjava.so*
 %{_datadir}/java/*
 
+
+%post -n fmt-ptrn-java
+/sbin/ldconfig
+
+
+
+%postun -n fmt-ptrn-java
+/sbin/ldconfig
+
+
 %prep
 
 
@@ -126,132 +150,126 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-java -p /sbin/ldconfig
-
-%postun
-java -p /sbin/ldconfig
-
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
+- Fix ldconfig post for java package.
 
 * Sat Feb 14 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-1
-   - Updated to fmt-ptrn 1.3.20.
+- Updated to fmt-ptrn 1.3.20.
 
-   - Integrate stack_t solution upstream, pull previous patch.
+- Integrate stack_t solution upstream, pull previous patch.
 
 * Thu Feb 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1.3.17-3
-   - rebuild for dependencies, rename stack_t to my_stack_t to avoid conflict with /usr/include/bits/sigstack.h's stack_t.
+- rebuild for dependencies, rename stack_t to my_stack_t to avoid conflict with /usr/include/bits/sigstack.h's stack_t.
 
 * Sun May 25 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-2
-   - Fixed placement of %%doc in RPM specification.
+- Fixed placement of %%doc in RPM specification.
 
 * Wed Apr 02 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-1
-   - Updated to fmt-ptrn 1.3.17.
+- Updated to fmt-ptrn 1.3.17.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.16-1
-   - Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
+- Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.15-1
-   - Updated to fmt-ptrn 1.3.15.
+- Updated to fmt-ptrn 1.3.15.
 
 * Tue Feb 12 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.14-1
-   - Updated to new 1.3.14.
+- Updated to new 1.3.14.
 
 * Mon Feb 11 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-2
-   - Update to use java-1.5.0-gcj-devel.
+- Update to use java-1.5.0-gcj-devel.
 
 * Sat Dec 22 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-1
-   - Updated to new 1.3.13.
+- Updated to new 1.3.13.
 
-   - License GPLv2+.
+- License GPLv2+.
 
-   - Update make install command.
+- Update make install command.
 
 * Thu Dec 13 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.12-1
-   - Updated to new 1.3.12.
+- Updated to new 1.3.12.
 
-   - Change package name to fmt-ptrn.
+- Change package name to fmt-ptrn.
 
 * Mon Oct 02 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-2
-   - Don't build static libraries.
+- Don't build static libraries.
 
 * Tue Aug 21 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-1
-   - Updated to fmt-ptrn 1.3.11.
+- Updated to fmt-ptrn 1.3.11.
 
 * Sun Aug 19 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-2
-   - Don't install INSTALL.
+- Don't install INSTALL.
 
-   - Another %% fix.
+- Another %% fix.
 
-   - Run ldconfig for java package.
+- Run ldconfig for java package.
 
 * Sat Aug 18 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-1
-   - Updated to new 1.3.10.
+- Updated to new 1.3.10.
 
-   - Change license to GPLv2.
+- Change license to GPLv2.
 
-   - Use %% in ChangeLog.
+- Use %% in ChangeLog.
 
-   - Don't use %%makeinstall.
+- Don't use %%makeinstall.
 
-   - deffattr(-,root,root,-).
+- deffattr(-,root,root,-).
 
-   - Don't install FmtPtrnTest.
+- Don't install FmtPtrnTest.
 
-   - Don't use SMP build flags for now.
+- Don't use SMP build flags for now.
 
 * Tue Aug 14 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-2
-   - Fix build (junit.o should not be distributed.)
+- Fix build (junit.o should not be distributed.)
 
 * Sun Jul 29 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-1
-   - Updated to new 1.3.9.
+- Updated to new 1.3.9.
 
-   - Build the Java package.
+- Build the Java package.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-2
-   - BuildRequires Java tools.
+- BuildRequires Java tools.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-1
-   - Updated to new 1.3.8.
+- Updated to new 1.3.8.
 
-   - Create new Java package, comment out for now.
+- Create new Java package, comment out for now.
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-4
-   - Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
+- Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-3
-   - Rebuild for Fedora Extras 6.
+- Rebuild for Fedora Extras 6.
 
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-2
-   - Rebuild for Fedora Extras 5.
+- Rebuild for Fedora Extras 5.
 
 * Thu Feb 02 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-1
-   - Updated to new 1.3.7.
+- Updated to new 1.3.7.
 
 * Wed Feb 01 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.6-1
-   - Updated to new 1.3.6.
+- Updated to new 1.3.6.
 
 * Sat Dec 24 2005  <W. Michael Petullo> - 1.3.5-3
-   - Add %%defattr for %%files devel.
+- Add %%defattr for %%files devel.
 
 * Tue Dec 13 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-2
-   - Broke out -devel package.
+- Broke out -devel package.
 
-   - Simplifies %%files block.
+- Simplifies %%files block.
 
-   - Don't use %%doc %%{_mandir}.
+- Don't use %%doc %%{_mandir}.
 
-   - No empty NEWS or FAQ.
+- No empty NEWS or FAQ.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 
 



From mikep at fedoraproject.org  Sun Apr 26 02:35:21 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:35:21 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-10 fmt-ptrn.spec,1.7,1.8
Message-ID: <20090426023521.5658A70125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28706

Modified Files:
	fmt-ptrn.spec 
Log Message:
Fix post script.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-10/fmt-ptrn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fmt-ptrn.spec	26 May 2008 01:29:44 -0000	1.7
+++ fmt-ptrn.spec	26 Apr 2009 02:34:51 -0000	1.8
@@ -1,5 +1,5 @@
 Name: fmt-ptrn
-Version: 1.3.17
+Version: 1.3.20
 Release: 2%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
@@ -54,6 +54,16 @@
 %{_libdir}/libnewtemplate.so.%{PACKAGE_VERSION}
 %{_datadir}/fmt-ptrn
 %{_mandir}/*/*
+
+
+%post
+/sbin/ldconfig
+
+
+
+%postun
+/sbin/ldconfig
+
 %doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ 
 
 
@@ -79,6 +89,10 @@
 %{_libdir}/libnewfmt-ptrn.so
 %{_libdir}/libnewtemplate.so
 
+
+
+
+
 %package java
 Summary: Files needed to develop applications using fmt-ptrn's Java classes
 Group: Development/Libraries
@@ -100,6 +114,16 @@
 %{_libdir}/libnewfmt-ptrnjava.so*
 %{_datadir}/java/*
 
+
+%post -n fmt-ptrn-java
+/sbin/ldconfig
+
+
+
+%postun -n fmt-ptrn-java
+/sbin/ldconfig
+
+
 %prep
 
 
@@ -126,121 +150,126 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-java -p /sbin/ldconfig
 
-%postun
-java -p /sbin/ldconfig
 
+%changelog
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
+- Fix ldconfig post for java package.
+
+* Sat Feb 14 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-1
+- Updated to fmt-ptrn 1.3.20.
 
+- Integrate stack_t solution upstream, pull previous patch.
+
+* Thu Feb 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1.3.17-3
+- rebuild for dependencies, rename stack_t to my_stack_t to avoid conflict with /usr/include/bits/sigstack.h's stack_t.
 
-%changelog
 * Sun May 25 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-2
-   - Fixed placement of %%doc in RPM specification.
+- Fixed placement of %%doc in RPM specification.
 
 * Wed Apr 02 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-1
-   - Updated to fmt-ptrn 1.3.17.
+- Updated to fmt-ptrn 1.3.17.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.16-1
-   - Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
+- Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.15-1
-   - Updated to fmt-ptrn 1.3.15.
+- Updated to fmt-ptrn 1.3.15.
 
 * Tue Feb 12 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.14-1
-   - Updated to new 1.3.14.
+- Updated to new 1.3.14.
 
 * Mon Feb 11 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-2
-   - Update to use java-1.5.0-gcj-devel.
+- Update to use java-1.5.0-gcj-devel.
 
 * Sat Dec 22 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-1
-   - Updated to new 1.3.13.
+- Updated to new 1.3.13.
 
-   - License GPLv2+.
+- License GPLv2+.
 
-   - Update make install command.
+- Update make install command.
 
 * Thu Dec 13 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.12-1
-   - Updated to new 1.3.12.
+- Updated to new 1.3.12.
 
-   - Change package name to fmt-ptrn.
+- Change package name to fmt-ptrn.
 
 * Mon Oct 02 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-2
-   - Don't build static libraries.
+- Don't build static libraries.
 
 * Tue Aug 21 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-1
-   - Updated to fmt-ptrn 1.3.11.
+- Updated to fmt-ptrn 1.3.11.
 
 * Sun Aug 19 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-2
-   - Don't install INSTALL.
+- Don't install INSTALL.
 
-   - Another %% fix.
+- Another %% fix.
 
-   - Run ldconfig for java package.
+- Run ldconfig for java package.
 
 * Sat Aug 18 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-1
-   - Updated to new 1.3.10.
+- Updated to new 1.3.10.
 
-   - Change license to GPLv2.
+- Change license to GPLv2.
 
-   - Use %% in ChangeLog.
+- Use %% in ChangeLog.
 
-   - Don't use %%makeinstall.
+- Don't use %%makeinstall.
 
-   - deffattr(-,root,root,-).
+- deffattr(-,root,root,-).
 
-   - Don't install FmtPtrnTest.
+- Don't install FmtPtrnTest.
 
-   - Don't use SMP build flags for now.
+- Don't use SMP build flags for now.
 
 * Tue Aug 14 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-2
-   - Fix build (junit.o should not be distributed.)
+- Fix build (junit.o should not be distributed.)
 
 * Sun Jul 29 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-1
-   - Updated to new 1.3.9.
+- Updated to new 1.3.9.
 
-   - Build the Java package.
+- Build the Java package.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-2
-   - BuildRequires Java tools.
+- BuildRequires Java tools.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-1
-   - Updated to new 1.3.8.
+- Updated to new 1.3.8.
 
-   - Create new Java package, comment out for now.
+- Create new Java package, comment out for now.
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-4
-   - Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
+- Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-3
-   - Rebuild for Fedora Extras 6.
+- Rebuild for Fedora Extras 6.
 
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-2
-   - Rebuild for Fedora Extras 5.
+- Rebuild for Fedora Extras 5.
 
 * Thu Feb 02 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-1
-   - Updated to new 1.3.7.
+- Updated to new 1.3.7.
 
 * Wed Feb 01 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.6-1
-   - Updated to new 1.3.6.
+- Updated to new 1.3.6.
 
 * Sat Dec 24 2005  <W. Michael Petullo> - 1.3.5-3
-   - Add %%defattr for %%files devel.
+- Add %%defattr for %%files devel.
 
 * Tue Dec 13 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-2
-   - Broke out -devel package.
+- Broke out -devel package.
 
-   - Simplifies %%files block.
+- Simplifies %%files block.
 
-   - Don't use %%doc %%{_mandir}.
+- Don't use %%doc %%{_mandir}.
 
-   - No empty NEWS or FAQ.
+- No empty NEWS or FAQ.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 
 



From mikep at fedoraproject.org  Sun Apr 26 02:36:18 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:36:18 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-9 fmt-ptrn.spec,1.7,1.8
Message-ID: <20090426023618.6828270125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28816

Modified Files:
	fmt-ptrn.spec 
Log Message:
Fix post script.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-9/fmt-ptrn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fmt-ptrn.spec	26 May 2008 01:37:22 -0000	1.7
+++ fmt-ptrn.spec	26 Apr 2009 02:35:47 -0000	1.8
@@ -1,5 +1,5 @@
 Name: fmt-ptrn
-Version: 1.3.17
+Version: 1.3.20
 Release: 2%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
@@ -54,6 +54,16 @@
 %{_libdir}/libnewtemplate.so.%{PACKAGE_VERSION}
 %{_datadir}/fmt-ptrn
 %{_mandir}/*/*
+
+
+%post
+/sbin/ldconfig
+
+
+
+%postun
+/sbin/ldconfig
+
 %doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ 
 
 
@@ -79,6 +89,10 @@
 %{_libdir}/libnewfmt-ptrn.so
 %{_libdir}/libnewtemplate.so
 
+
+
+
+
 %package java
 Summary: Files needed to develop applications using fmt-ptrn's Java classes
 Group: Development/Libraries
@@ -100,6 +114,16 @@
 %{_libdir}/libnewfmt-ptrnjava.so*
 %{_datadir}/java/*
 
+
+%post -n fmt-ptrn-java
+/sbin/ldconfig
+
+
+
+%postun -n fmt-ptrn-java
+/sbin/ldconfig
+
+
 %prep
 
 
@@ -126,121 +150,126 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-java -p /sbin/ldconfig
 
-%postun
-java -p /sbin/ldconfig
 
+%changelog
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
+- Fix ldconfig post for java package.
+
+* Sat Feb 14 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-1
+- Updated to fmt-ptrn 1.3.20.
 
+- Integrate stack_t solution upstream, pull previous patch.
+
+* Thu Feb 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1.3.17-3
+- rebuild for dependencies, rename stack_t to my_stack_t to avoid conflict with /usr/include/bits/sigstack.h's stack_t.
 
-%changelog
 * Sun May 25 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-2
-   - Fixed placement of %%doc in RPM specification.
+- Fixed placement of %%doc in RPM specification.
 
 * Wed Apr 02 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.17-1
-   - Updated to fmt-ptrn 1.3.17.
+- Updated to fmt-ptrn 1.3.17.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.16-1
-   - Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
+- Updated to fmt-ptrn 1.3.16, should fix ppc64 build.
 
 * Tue Apr 01 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.15-1
-   - Updated to fmt-ptrn 1.3.15.
+- Updated to fmt-ptrn 1.3.15.
 
 * Tue Feb 12 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.14-1
-   - Updated to new 1.3.14.
+- Updated to new 1.3.14.
 
 * Mon Feb 11 2008 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-2
-   - Update to use java-1.5.0-gcj-devel.
+- Update to use java-1.5.0-gcj-devel.
 
 * Sat Dec 22 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.13-1
-   - Updated to new 1.3.13.
+- Updated to new 1.3.13.
 
-   - License GPLv2+.
+- License GPLv2+.
 
-   - Update make install command.
+- Update make install command.
 
 * Thu Dec 13 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.12-1
-   - Updated to new 1.3.12.
+- Updated to new 1.3.12.
 
-   - Change package name to fmt-ptrn.
+- Change package name to fmt-ptrn.
 
 * Mon Oct 02 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-2
-   - Don't build static libraries.
+- Don't build static libraries.
 
 * Tue Aug 21 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.11-1
-   - Updated to fmt-ptrn 1.3.11.
+- Updated to fmt-ptrn 1.3.11.
 
 * Sun Aug 19 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-2
-   - Don't install INSTALL.
+- Don't install INSTALL.
 
-   - Another %% fix.
+- Another %% fix.
 
-   - Run ldconfig for java package.
+- Run ldconfig for java package.
 
 * Sat Aug 18 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.10-1
-   - Updated to new 1.3.10.
+- Updated to new 1.3.10.
 
-   - Change license to GPLv2.
+- Change license to GPLv2.
 
-   - Use %% in ChangeLog.
+- Use %% in ChangeLog.
 
-   - Don't use %%makeinstall.
+- Don't use %%makeinstall.
 
-   - deffattr(-,root,root,-).
+- deffattr(-,root,root,-).
 
-   - Don't install FmtPtrnTest.
+- Don't install FmtPtrnTest.
 
-   - Don't use SMP build flags for now.
+- Don't use SMP build flags for now.
 
 * Tue Aug 14 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-2
-   - Fix build (junit.o should not be distributed.)
+- Fix build (junit.o should not be distributed.)
 
 * Sun Jul 29 2007 W. Michael Petullo <mike[@]flyn.org> - 1.3.9-1
-   - Updated to new 1.3.9.
+- Updated to new 1.3.9.
 
-   - Build the Java package.
+- Build the Java package.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-2
-   - BuildRequires Java tools.
+- BuildRequires Java tools.
 
 * Sun Sep 10 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.8-1
-   - Updated to new 1.3.8.
+- Updated to new 1.3.8.
 
-   - Create new Java package, comment out for now.
+- Create new Java package, comment out for now.
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-4
-   - Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
+- Use _libdir macro for rm -rf of .a and .la (fix 64-bit build.)
 
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-3
-   - Rebuild for Fedora Extras 6.
+- Rebuild for Fedora Extras 6.
 
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-2
-   - Rebuild for Fedora Extras 5.
+- Rebuild for Fedora Extras 5.
 
 * Thu Feb 02 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.7-1
-   - Updated to new 1.3.7.
+- Updated to new 1.3.7.
 
 * Wed Feb 01 2006 W. Michael Petullo <mike[@]flyn.org> - 1.3.6-1
-   - Updated to new 1.3.6.
+- Updated to new 1.3.6.
 
 * Sat Dec 24 2005  <W. Michael Petullo> - 1.3.5-3
-   - Add %%defattr for %%files devel.
+- Add %%defattr for %%files devel.
 
 * Tue Dec 13 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-2
-   - Broke out -devel package.
+- Broke out -devel package.
 
-   - Simplifies %%files block.
+- Simplifies %%files block.
 
-   - Don't use %%doc %%{_mandir}.
+- Don't use %%doc %%{_mandir}.
 
-   - No empty NEWS or FAQ.
+- No empty NEWS or FAQ.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 * Sun Dec 11 2005 W. Michael Petullo <mike[@]flyn.org> - 1.3.5-1
-   - Updated to new 1.3.5.
+- Updated to new 1.3.5.
 
 
 



From kkofler at fedoraproject.org  Sun Apr 26 02:52:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 02:52:36 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-11
	kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE,
	1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch,
	NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,
	NONE,
	1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,
	NONE, 1.1 kde-plasma-weather.spec, 1.3, 1.4
Message-ID: <20090426025236.C0B4170125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529/F-11

Modified Files:
	kde-plasma-weather.spec 
Added Files:
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch 
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
- backport 2 more layout fixes from trunk
- backport patch from trunk to honor preferred browser
- fix configuration issue: PopupApplet is not a city (#495998)

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev936021-init-order.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp	2009-04-26 04:31:00.000000000 +0200
@@ -77,6 +77,8 @@
         return m_graphicsWidget;
     }
 
+    m_graphicsWidget = new QGraphicsWidget(this);
+
     switch (formFactor()) {
     case Plasma::Horizontal:
     case Plasma::Vertical:
@@ -198,7 +200,6 @@
         setConfigurationRequired(false);
     }
 
-    m_graphicsWidget = new QGraphicsWidget(this);
     m_graphicsWidget->setLayout(m_layout);
 
     return m_graphicsWidget;

kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp	2009-04-26 04:31:48.000000000 +0200
@@ -180,6 +180,8 @@
     m_titleFrame->setLayout(m_titlePanel);
     m_layout->addItem(m_titleFrame);
 
+    m_courtesyLabel->nativeWidget()->setWordWrap(false);
+    m_courtesyLabel->nativeWidget()->setAlignment(Qt::AlignRight);
     connect(m_courtesyLabel, SIGNAL(linkActivated(QString)), this, SLOT(creditLink(QString)));
 
     // If we have any weather observations set them up here.
@@ -767,7 +769,7 @@
     m_courtesyLabel->setText(data["Credit"].toString());
 
     if (!data["Credit Url"].toString().isEmpty()) {
-        QString creditUrl = QString("<A HREF=\"%1\">%2</A>").arg(data["Credit Url"].toString()).arg(data["Credit"].toString());
+        QString creditUrl = QString("<A HREF=\"%1\" ><FONT size=\"-0.5\" color=\"%2\">%3</FONT></A>").arg(data["Credit Url"].toString()).arg(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor).rgb()).arg(data["Credit"].toString());
         m_courtesyLabel->nativeWidget()->setTextInteractionFlags(Qt::TextBrowserInteraction);
         //m_courtesyLabel->setAcceptHoverEvents(true);
         //m_courtesyLabel->nativeWidget()->setMouseTracking(true);

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
@@ -21,7 +21,7 @@
 #include "weatherapplet.h"
 #include <QCheckBox>
 #include <KMessageBox>
-#include <KRun>
+#include <KToolInvocation>
 #include <KDialog>
 #include <KConfigDialog>
 #include <KLocale>
@@ -274,12 +274,12 @@
 
 void WeatherApplet::creditLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 void WeatherApplet::weatherNoticeLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 QList<QAction*> WeatherApplet::contextualActions()

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp	2009-04-26 04:40:59.000000000 +0200
@@ -184,6 +184,9 @@
 
     // If we have any weather observations set them up here.
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         m_activePlace = place;
         m_activeIon = placeConfig.readEntry("ion");
@@ -1229,6 +1232,9 @@
 {
     KConfigGroup generalConfig = config();
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         placeConfig.deleteGroup();
     }


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-weather.spec	5 Mar 2009 23:36:50 -0000	1.3
+++ kde-plasma-weather.spec	26 Apr 2009 02:52:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 URL:            http://www.kdedevelopers.org/blog/4267
 
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
+# configuration fix: PopupApplet is not a city (#495998)
+Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -17,6 +19,14 @@
 Patch102:       kde-plasma-weather-1.0.0-rev926205-no-update-now.patch
 # use only 1 decimal place for the wind gust
 Patch103:       kde-plasma-weather-1.0.0-rev930258-wind-gust.patch
+# assign m_graphicsWidget ASAP to avoid graphicsWidget() calling itself
+Patch104:       kde-plasma-weather-1.0.0-rev936021-init-order.patch
+# less space at the bottom
+Patch105:       kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch
+# use KToolInvocation rather than KRun on text/html to run browser
+# honors the setting to use another browser than the text/html file association
+Patch106:       kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The weather dataengine is in kdebase-workspace.
@@ -29,10 +39,14 @@
 
 %prep
 %setup -qn plasma-applet-weather-%{version}
+%patch0 -p1 -b .popupapplet-not-city
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
 %patch103 -p1 -b .wind-gust
+%patch104 -p1 -b .init-order
+%patch105 -p1 -b .less-space-at-bottom
+%patch106 -p1 -b .ktoolinvocation
 
 %build
 mkdir -p %{_target_platform}
@@ -56,6 +70,11 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
+- backport 2 more layout fixes from trunk
+- backport patch from trunk to honor preferred browser
+- fix configuration issue: PopupApplet is not a city (#495998)
+
 * Thu Mar 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-3
 - backport 2 fixes for rendering issues with Qt 4.5 from trunk
 - don't show the non-functional "Update now" menu entry (backported from trunk)



From kkofler at fedoraproject.org  Sun Apr 26 02:52:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 02:52:36 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-10
	kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE,
	1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch,
	NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,
	NONE,
	1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,
	NONE, 1.1 kde-plasma-weather.spec, 1.2, 1.3
Message-ID: <20090426025236.C74C170129@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529/F-10

Modified Files:
	kde-plasma-weather.spec 
Added Files:
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch 
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
- backport 2 more layout fixes from trunk
- backport patch from trunk to honor preferred browser
- fix configuration issue: PopupApplet is not a city (#495998)

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev936021-init-order.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp	2009-04-26 04:31:00.000000000 +0200
@@ -77,6 +77,8 @@
         return m_graphicsWidget;
     }
 
+    m_graphicsWidget = new QGraphicsWidget(this);
+
     switch (formFactor()) {
     case Plasma::Horizontal:
     case Plasma::Vertical:
@@ -198,7 +200,6 @@
         setConfigurationRequired(false);
     }
 
-    m_graphicsWidget = new QGraphicsWidget(this);
     m_graphicsWidget->setLayout(m_layout);
 
     return m_graphicsWidget;

kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp	2009-04-26 04:31:48.000000000 +0200
@@ -180,6 +180,8 @@
     m_titleFrame->setLayout(m_titlePanel);
     m_layout->addItem(m_titleFrame);
 
+    m_courtesyLabel->nativeWidget()->setWordWrap(false);
+    m_courtesyLabel->nativeWidget()->setAlignment(Qt::AlignRight);
     connect(m_courtesyLabel, SIGNAL(linkActivated(QString)), this, SLOT(creditLink(QString)));
 
     // If we have any weather observations set them up here.
@@ -767,7 +769,7 @@
     m_courtesyLabel->setText(data["Credit"].toString());
 
     if (!data["Credit Url"].toString().isEmpty()) {
-        QString creditUrl = QString("<A HREF=\"%1\">%2</A>").arg(data["Credit Url"].toString()).arg(data["Credit"].toString());
+        QString creditUrl = QString("<A HREF=\"%1\" ><FONT size=\"-0.5\" color=\"%2\">%3</FONT></A>").arg(data["Credit Url"].toString()).arg(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor).rgb()).arg(data["Credit"].toString());
         m_courtesyLabel->nativeWidget()->setTextInteractionFlags(Qt::TextBrowserInteraction);
         //m_courtesyLabel->setAcceptHoverEvents(true);
         //m_courtesyLabel->nativeWidget()->setMouseTracking(true);

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
@@ -21,7 +21,7 @@
 #include "weatherapplet.h"
 #include <QCheckBox>
 #include <KMessageBox>
-#include <KRun>
+#include <KToolInvocation>
 #include <KDialog>
 #include <KConfigDialog>
 #include <KLocale>
@@ -274,12 +274,12 @@
 
 void WeatherApplet::creditLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 void WeatherApplet::weatherNoticeLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 QList<QAction*> WeatherApplet::contextualActions()

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp	2009-04-26 04:40:59.000000000 +0200
@@ -184,6 +184,9 @@
 
     // If we have any weather observations set them up here.
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         m_activePlace = place;
         m_activeIon = placeConfig.readEntry("ion");
@@ -1229,6 +1232,9 @@
 {
     KConfigGroup generalConfig = config();
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         placeConfig.deleteGroup();
     }


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-weather.spec	5 Mar 2009 23:47:01 -0000	1.2
+++ kde-plasma-weather.spec	26 Apr 2009 02:52:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 URL:            http://www.kdedevelopers.org/blog/4267
 
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
+# configuration fix: PopupApplet is not a city (#495998)
+Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -17,6 +19,14 @@
 Patch102:       kde-plasma-weather-1.0.0-rev926205-no-update-now.patch
 # use only 1 decimal place for the wind gust
 Patch103:       kde-plasma-weather-1.0.0-rev930258-wind-gust.patch
+# assign m_graphicsWidget ASAP to avoid graphicsWidget() calling itself
+Patch104:       kde-plasma-weather-1.0.0-rev936021-init-order.patch
+# less space at the bottom
+Patch105:       kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch
+# use KToolInvocation rather than KRun on text/html to run browser
+# honors the setting to use another browser than the text/html file association
+Patch106:       kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The weather dataengine is in kdebase-workspace.
@@ -29,10 +39,14 @@
 
 %prep
 %setup -qn plasma-applet-weather-%{version}
+%patch0 -p1 -b .popupapplet-not-city
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
 %patch103 -p1 -b .wind-gust
+%patch104 -p1 -b .init-order
+%patch105 -p1 -b .less-space-at-bottom
+%patch106 -p1 -b .ktoolinvocation
 
 %build
 mkdir -p %{_target_platform}
@@ -56,6 +70,11 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
+- backport 2 more layout fixes from trunk
+- backport patch from trunk to honor preferred browser
+- fix configuration issue: PopupApplet is not a city (#495998)
+
 * Thu Mar 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-3
 - backport 2 fixes for rendering issues with Qt 4.5 from trunk
 - don't show the non-functional "Update now" menu entry (backported from trunk)



From kkofler at fedoraproject.org  Sun Apr 26 02:52:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 02:52:36 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-9
	kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE,
	1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch,
	NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,
	NONE,
	1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,
	NONE, 1.1 kde-plasma-weather.spec, 1.2, 1.3
Message-ID: <20090426025236.D4ED27013F@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529/F-9

Modified Files:
	kde-plasma-weather.spec 
Added Files:
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch 
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
- backport 2 more layout fixes from trunk
- backport patch from trunk to honor preferred browser
- fix configuration issue: PopupApplet is not a city (#495998)

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev936021-init-order.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp	2009-04-26 04:31:00.000000000 +0200
@@ -77,6 +77,8 @@
         return m_graphicsWidget;
     }
 
+    m_graphicsWidget = new QGraphicsWidget(this);
+
     switch (formFactor()) {
     case Plasma::Horizontal:
     case Plasma::Vertical:
@@ -198,7 +200,6 @@
         setConfigurationRequired(false);
     }
 
-    m_graphicsWidget = new QGraphicsWidget(this);
     m_graphicsWidget->setLayout(m_layout);
 
     return m_graphicsWidget;

kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp	2009-04-26 04:31:48.000000000 +0200
@@ -180,6 +180,8 @@
     m_titleFrame->setLayout(m_titlePanel);
     m_layout->addItem(m_titleFrame);
 
+    m_courtesyLabel->nativeWidget()->setWordWrap(false);
+    m_courtesyLabel->nativeWidget()->setAlignment(Qt::AlignRight);
     connect(m_courtesyLabel, SIGNAL(linkActivated(QString)), this, SLOT(creditLink(QString)));
 
     // If we have any weather observations set them up here.
@@ -767,7 +769,7 @@
     m_courtesyLabel->setText(data["Credit"].toString());
 
     if (!data["Credit Url"].toString().isEmpty()) {
-        QString creditUrl = QString("<A HREF=\"%1\">%2</A>").arg(data["Credit Url"].toString()).arg(data["Credit"].toString());
+        QString creditUrl = QString("<A HREF=\"%1\" ><FONT size=\"-0.5\" color=\"%2\">%3</FONT></A>").arg(data["Credit Url"].toString()).arg(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor).rgb()).arg(data["Credit"].toString());
         m_courtesyLabel->nativeWidget()->setTextInteractionFlags(Qt::TextBrowserInteraction);
         //m_courtesyLabel->setAcceptHoverEvents(true);
         //m_courtesyLabel->nativeWidget()->setMouseTracking(true);

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
@@ -21,7 +21,7 @@
 #include "weatherapplet.h"
 #include <QCheckBox>
 #include <KMessageBox>
-#include <KRun>
+#include <KToolInvocation>
 #include <KDialog>
 #include <KConfigDialog>
 #include <KLocale>
@@ -274,12 +274,12 @@
 
 void WeatherApplet::creditLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 void WeatherApplet::weatherNoticeLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 QList<QAction*> WeatherApplet::contextualActions()

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp	2009-04-26 04:40:59.000000000 +0200
@@ -184,6 +184,9 @@
 
     // If we have any weather observations set them up here.
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         m_activePlace = place;
         m_activeIon = placeConfig.readEntry("ion");
@@ -1229,6 +1232,9 @@
 {
     KConfigGroup generalConfig = config();
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         placeConfig.deleteGroup();
     }


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-weather.spec	5 Mar 2009 23:47:01 -0000	1.2
+++ kde-plasma-weather.spec	26 Apr 2009 02:52:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 URL:            http://www.kdedevelopers.org/blog/4267
 
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
+# configuration fix: PopupApplet is not a city (#495998)
+Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -17,6 +19,14 @@
 Patch102:       kde-plasma-weather-1.0.0-rev926205-no-update-now.patch
 # use only 1 decimal place for the wind gust
 Patch103:       kde-plasma-weather-1.0.0-rev930258-wind-gust.patch
+# assign m_graphicsWidget ASAP to avoid graphicsWidget() calling itself
+Patch104:       kde-plasma-weather-1.0.0-rev936021-init-order.patch
+# less space at the bottom
+Patch105:       kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch
+# use KToolInvocation rather than KRun on text/html to run browser
+# honors the setting to use another browser than the text/html file association
+Patch106:       kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The weather dataengine is in kdebase-workspace.
@@ -29,10 +39,14 @@
 
 %prep
 %setup -qn plasma-applet-weather-%{version}
+%patch0 -p1 -b .popupapplet-not-city
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
 %patch103 -p1 -b .wind-gust
+%patch104 -p1 -b .init-order
+%patch105 -p1 -b .less-space-at-bottom
+%patch106 -p1 -b .ktoolinvocation
 
 %build
 mkdir -p %{_target_platform}
@@ -56,6 +70,11 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
+- backport 2 more layout fixes from trunk
+- backport patch from trunk to honor preferred browser
+- fix configuration issue: PopupApplet is not a city (#495998)
+
 * Thu Mar 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-3
 - backport 2 fixes for rendering issues with Qt 4.5 from trunk
 - don't show the non-functional "Update now" menu entry (backported from trunk)



From kkofler at fedoraproject.org  Sun Apr 26 02:52:37 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 02:52:37 +0000 (UTC)
Subject: rpms/kde-plasma-weather/devel
	kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE,
	1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch,
	NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,
	NONE,
	1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,
	NONE, 1.1 kde-plasma-weather.spec, 1.3, 1.4
Message-ID: <20090426025237.6368F70125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529/devel

Modified Files:
	kde-plasma-weather.spec 
Added Files:
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch 
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
- backport 2 more layout fixes from trunk
- backport patch from trunk to honor preferred browser
- fix configuration issue: PopupApplet is not a city (#495998)

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev936021-init-order.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp	2009-04-26 04:31:00.000000000 +0200
@@ -77,6 +77,8 @@
         return m_graphicsWidget;
     }
 
+    m_graphicsWidget = new QGraphicsWidget(this);
+
     switch (formFactor()) {
     case Plasma::Horizontal:
     case Plasma::Vertical:
@@ -198,7 +200,6 @@
         setConfigurationRequired(false);
     }
 
-    m_graphicsWidget = new QGraphicsWidget(this);
     m_graphicsWidget->setLayout(m_layout);
 
     return m_graphicsWidget;

kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp	2009-04-26 04:31:48.000000000 +0200
@@ -180,6 +180,8 @@
     m_titleFrame->setLayout(m_titlePanel);
     m_layout->addItem(m_titleFrame);
 
+    m_courtesyLabel->nativeWidget()->setWordWrap(false);
+    m_courtesyLabel->nativeWidget()->setAlignment(Qt::AlignRight);
     connect(m_courtesyLabel, SIGNAL(linkActivated(QString)), this, SLOT(creditLink(QString)));
 
     // If we have any weather observations set them up here.
@@ -767,7 +769,7 @@
     m_courtesyLabel->setText(data["Credit"].toString());
 
     if (!data["Credit Url"].toString().isEmpty()) {
-        QString creditUrl = QString("<A HREF=\"%1\">%2</A>").arg(data["Credit Url"].toString()).arg(data["Credit"].toString());
+        QString creditUrl = QString("<A HREF=\"%1\" ><FONT size=\"-0.5\" color=\"%2\">%3</FONT></A>").arg(data["Credit Url"].toString()).arg(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor).rgb()).arg(data["Credit"].toString());
         m_courtesyLabel->nativeWidget()->setTextInteractionFlags(Qt::TextBrowserInteraction);
         //m_courtesyLabel->setAcceptHoverEvents(true);
         //m_courtesyLabel->nativeWidget()->setMouseTracking(true);

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
@@ -21,7 +21,7 @@
 #include "weatherapplet.h"
 #include <QCheckBox>
 #include <KMessageBox>
-#include <KRun>
+#include <KToolInvocation>
 #include <KDialog>
 #include <KConfigDialog>
 #include <KLocale>
@@ -274,12 +274,12 @@
 
 void WeatherApplet::creditLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 void WeatherApplet::weatherNoticeLink(const QString& url)
 {
-    KRun::runUrl(KUrl(url), "text/html", 0);
+    KToolInvocation::invokeBrowser(url);
 }
 
 QList<QAction*> WeatherApplet::contextualActions()

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

--- NEW FILE kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp	2009-04-26 04:40:59.000000000 +0200
@@ -184,6 +184,9 @@
 
     // If we have any weather observations set them up here.
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         m_activePlace = place;
         m_activeIon = placeConfig.readEntry("ion");
@@ -1229,6 +1232,9 @@
 {
     KConfigGroup generalConfig = config();
     foreach(const QString& place, generalConfig.groupList()) {
+        if (place == QLatin1String("PopupApplet") {
+            continue; // not a place
+        }
         KConfigGroup placeConfig(&generalConfig, place);
         placeConfig.deleteGroup();
     }


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-weather.spec	5 Mar 2009 23:36:50 -0000	1.3
+++ kde-plasma-weather.spec	26 Apr 2009 02:52:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 URL:            http://www.kdedevelopers.org/blog/4267
 
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
+# configuration fix: PopupApplet is not a city (#495998)
+Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -17,6 +19,14 @@
 Patch102:       kde-plasma-weather-1.0.0-rev926205-no-update-now.patch
 # use only 1 decimal place for the wind gust
 Patch103:       kde-plasma-weather-1.0.0-rev930258-wind-gust.patch
+# assign m_graphicsWidget ASAP to avoid graphicsWidget() calling itself
+Patch104:       kde-plasma-weather-1.0.0-rev936021-init-order.patch
+# less space at the bottom
+Patch105:       kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch
+# use KToolInvocation rather than KRun on text/html to run browser
+# honors the setting to use another browser than the text/html file association
+Patch106:       kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The weather dataengine is in kdebase-workspace.
@@ -29,10 +39,14 @@
 
 %prep
 %setup -qn plasma-applet-weather-%{version}
+%patch0 -p1 -b .popupapplet-not-city
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
 %patch103 -p1 -b .wind-gust
+%patch104 -p1 -b .init-order
+%patch105 -p1 -b .less-space-at-bottom
+%patch106 -p1 -b .ktoolinvocation
 
 %build
 mkdir -p %{_target_platform}
@@ -56,6 +70,11 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
+- backport 2 more layout fixes from trunk
+- backport patch from trunk to honor preferred browser
+- fix configuration issue: PopupApplet is not a city (#495998)
+
 * Thu Mar 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-3
 - backport 2 fixes for rendering issues with Qt 4.5 from trunk
 - don't show the non-functional "Update now" menu entry (backported from trunk)



From mikep at fedoraproject.org  Sun Apr 26 02:55:50 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:55:50 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-10 sources,1.6,1.7
Message-ID: <20090426025550.EF47270125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32040

Modified Files:
	sources 
Log Message:
Update source.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Apr 2008 07:34:34 -0000	1.6
+++ sources	26 Apr 2009 02:55:20 -0000	1.7
@@ -1 +1 @@
-de8584722c01938a4f9f2b5870bc9e97  fmt-ptrn-1.3.17.tar.gz
+5d76dc4720b86c65c3f92494247a2fea  fmt-ptrn-1.3.20.tar.gz



From petersen at fedoraproject.org  Sun Apr 26 02:56:56 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 26 Apr 2009 02:56:56 +0000 (UTC)
Subject: rpms/hscolour/F-10 hscolour.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090426025656.0F01B70125@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hscolour/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32331

Modified Files:
	.cvsignore sources 
Added Files:
	hscolour.spec 
Log Message:
import from F-11


--- NEW FILE hscolour.spec ---
%global ghc_version 6.10.1

%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           hscolour
Version:        1.12
Release:        2%{?dist}
Summary:        Colourizes Haskell code

Group:          Development/Tools
License:        GPLv2+
URL:            http://www.cs.york.ac.uk/fp/darcs/hscolour/
Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc = %{ghc_version}
%if %{with doc}
BuildRequires:  ghc-doc = %{ghc_version}
%endif
%if %{with prof}
BuildRequires:  ghc-prof = %{ghc_version}
%endif

%description
hscolour is a small Haskell script to colourize Haskell code.
It currently has five output formats: ANSI terminal codes,
HTML 3.2 with font tags, HTML 4.01 with CSS, LaTeX, and mIRC chat codes.


%package -n ghc-%{name}-devel
Summary:        Haskell %{name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description -n ghc-%{name}-devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package -n ghc-%{name}-doc
Summary: Documentation for %{name}
Group: Development/Libraries
Requires: ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description -n ghc-%{name}-doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package -n ghc-%{name}-prof
Summary: Profiling libraries for %{name}
Group: Development/Libraries
Requires: ghc-%{name}-devel = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}

%description -n ghc-%{name}-prof
This package contains profiling libraries for %{name}.
%endif


%prep
%setup -q


%build
%cabal_configure --ghc %{!?without_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
%endif
%ghc_gen_scripts


%install
rm -rf $RPM_BUILD_ROOT
%cabal_install
%ghc_install_scripts
%ghc_gen_filelists ghc-%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post -n ghc-%{name}-devel
%ghc_register_pkg


%if %{with doc}
%post -n ghc-%{name}-doc
%ghc_reindex_haddock
%endif


%preun -n ghc-%{name}-devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun -n ghc-%{name}-doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENCE-GPL README
%attr(755,root,root) %{_bindir}/HsColour
%{_datadir}/%{name}-%{version}

%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%defattr(-,root,root,-)


%if %{with doc}
%files -n ghc-%{name}-doc
%defattr(-,root,root,-)
%{pkg_docdir}
%endif


%if %{with prof}
%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Tue Mar 10 2009 Jens Petersen <petersen at redhat.com> - 1.12-2
- fix url (#488665)
- fix HsColour permissions (#488665)

* Thu Mar  5 2009 Jens Petersen <petersen at redhat.com> - 1.12-1
- initial packaging for Fedora created by cabal2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hscolour/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2009 03:34:07 -0000	1.1
+++ .cvsignore	26 Apr 2009 02:56:25 -0000	1.2
@@ -0,0 +1 @@
+hscolour-1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hscolour/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2009 03:34:07 -0000	1.1
+++ sources	26 Apr 2009 02:56:25 -0000	1.2
@@ -0,0 +1 @@
+4328a84b87b245693bcf10b49c608e43  hscolour-1.12.tar.gz



From mikep at fedoraproject.org  Sun Apr 26 02:57:31 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:57:31 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-10 fmt-ptrn.spec,1.8,1.9
Message-ID: <20090426025731.D45DA70125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32457

Modified Files:
	fmt-ptrn.spec 
Log Message:
Bump release.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-10/fmt-ptrn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fmt-ptrn.spec	26 Apr 2009 02:34:51 -0000	1.8
+++ fmt-ptrn.spec	26 Apr 2009 02:57:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name: fmt-ptrn
 Version: 1.3.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-3
+- Bump release.
+
 * Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
 - Fix ldconfig post for java package.
 



From mikep at fedoraproject.org  Sun Apr 26 02:59:49 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 02:59:49 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-9 fmt-ptrn.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090426025949.136B57013C@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv385

Modified Files:
	fmt-ptrn.spec sources 
Log Message:
Update sources and bump release.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-9/fmt-ptrn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fmt-ptrn.spec	26 Apr 2009 02:35:47 -0000	1.8
+++ fmt-ptrn.spec	26 Apr 2009 02:59:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name: fmt-ptrn
 Version: 1.3.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-3
+- Bump release.
+
 * Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
 - Fix ldconfig post for java package.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Apr 2008 07:34:34 -0000	1.6
+++ sources	26 Apr 2009 02:59:18 -0000	1.7
@@ -1 +1 @@
-de8584722c01938a4f9f2b5870bc9e97  fmt-ptrn-1.3.17.tar.gz
+5d76dc4720b86c65c3f92494247a2fea  fmt-ptrn-1.3.20.tar.gz



From mikep at fedoraproject.org  Sun Apr 26 03:03:06 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 03:03:06 +0000 (UTC)
Subject: rpms/fmt-ptrn/devel fmt-ptrn.spec,1.11,1.12
Message-ID: <20090426030306.7CF5870125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1599

Modified Files:
	fmt-ptrn.spec 
Log Message:
Bump release and restore previous changelog entry.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/devel/fmt-ptrn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fmt-ptrn.spec	26 Apr 2009 02:32:28 -0000	1.11
+++ fmt-ptrn.spec	26 Apr 2009 03:02:36 -0000	1.12
@@ -1,6 +1,6 @@
 Name: fmt-ptrn
 Version: 1.3.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,9 +153,13 @@
 
 
 %changelog
-* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-3
 - Fix ldconfig post for java package.
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+
 * Sat Feb 14 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-1
 - Updated to fmt-ptrn 1.3.20.
 



From mikep at fedoraproject.org  Sun Apr 26 03:06:48 2009
From: mikep at fedoraproject.org (W. Michael Petullo)
Date: Sun, 26 Apr 2009 03:06:48 +0000 (UTC)
Subject: rpms/fmt-ptrn/F-11 fmt-ptrn.spec,1.11,1.12
Message-ID: <20090426030648.C590970125@cvs1.fedora.phx.redhat.com>

Author: mikep

Update of /cvs/pkgs/rpms/fmt-ptrn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2223

Modified Files:
	fmt-ptrn.spec 
Log Message:
Bump release and restore previous changelog entry.



Index: fmt-ptrn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmt-ptrn/F-11/fmt-ptrn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fmt-ptrn.spec	26 Apr 2009 02:33:44 -0000	1.11
+++ fmt-ptrn.spec	26 Apr 2009 03:06:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name: fmt-ptrn
 Version: 1.3.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,9 +153,13 @@
 
 
 %changelog
-* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-2
+* Sat Apr 25 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-3
 - Fix ldconfig post for java package.
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+
 * Sat Feb 14 2009 W. Michael Petullo <mike[@]flyn.org> - 1.3.20-1
 - Updated to fmt-ptrn 1.3.20.
 



From petersen at fedoraproject.org  Sun Apr 26 03:07:21 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sun, 26 Apr 2009 03:07:21 +0000 (UTC)
Subject: rpms/hscolour/F-10 hscolour.spec,1.1,1.2
Message-ID: <20090426030721.1B0BB70125@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hscolour/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2379

Modified Files:
	hscolour.spec 
Log Message:
fix devel filelist name


Index: hscolour.spec
===================================================================
RCS file: /cvs/extras/rpms/hscolour/F-10/hscolour.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hscolour.spec	26 Apr 2009 02:56:25 -0000	1.1
+++ hscolour.spec	26 Apr 2009 03:06:50 -0000	1.2
@@ -126,7 +126,7 @@
 %attr(755,root,root) %{_bindir}/HsColour
 %{_datadir}/%{name}-%{version}
 
-%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
+%files -n ghc-%{name}-devel -f ghc-%{name}.files
 %defattr(-,root,root,-)
 
 



From kkofler at fedoraproject.org  Sun Apr 26 03:09:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:09:31 +0000 (UTC)
Subject: rpms/kde-plasma-weather/devel
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, 1.1, 1.2
Message-ID: <20090426030931.F082070125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2843/devel

Modified Files:
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
Log Message:
Make patch apply in the sequence without fuzz.

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

Index: kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 02:52:06 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 03:09:31 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
---- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
+--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-04-26 05:05:51.000000000 +0200
++++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 05:06:27.000000000 +0200
 @@ -21,7 +21,7 @@
  #include "weatherapplet.h"
  #include <QCheckBox>
@@ -10,7 +10,7 @@
  #include <KDialog>
  #include <KConfigDialog>
  #include <KLocale>
-@@ -274,12 +274,12 @@
+@@ -282,12 +282,12 @@
  
  void WeatherApplet::creditLink(const QString& url)
  {
@@ -24,4 +24,4 @@
 +    KToolInvocation::invokeBrowser(url);
  }
  
- QList<QAction*> WeatherApplet::contextualActions()
+ /*



From kkofler at fedoraproject.org  Sun Apr 26 03:10:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:10:00 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-10
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, 1.1, 1.2
Message-ID: <20090426031000.DE77F70125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2843/F-10

Modified Files:
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
Log Message:
Make patch apply in the sequence without fuzz.

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

Index: kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 02:52:04 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 03:09:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
---- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
+--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-04-26 05:05:51.000000000 +0200
++++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 05:06:27.000000000 +0200
 @@ -21,7 +21,7 @@
  #include "weatherapplet.h"
  #include <QCheckBox>
@@ -10,7 +10,7 @@
  #include <KDialog>
  #include <KConfigDialog>
  #include <KLocale>
-@@ -274,12 +274,12 @@
+@@ -282,12 +282,12 @@
  
  void WeatherApplet::creditLink(const QString& url)
  {
@@ -24,4 +24,4 @@
 +    KToolInvocation::invokeBrowser(url);
  }
  
- QList<QAction*> WeatherApplet::contextualActions()
+ /*



From kkofler at fedoraproject.org  Sun Apr 26 03:10:01 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:10:01 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-11
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, 1.1, 1.2
Message-ID: <20090426031001.541B670125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2843/F-11

Modified Files:
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
Log Message:
Make patch apply in the sequence without fuzz.

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

Index: kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 02:52:05 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 03:09:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
---- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
+--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-04-26 05:05:51.000000000 +0200
++++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 05:06:27.000000000 +0200
 @@ -21,7 +21,7 @@
  #include "weatherapplet.h"
  #include <QCheckBox>
@@ -10,7 +10,7 @@
  #include <KDialog>
  #include <KConfigDialog>
  #include <KLocale>
-@@ -274,12 +274,12 @@
+@@ -282,12 +282,12 @@
  
  void WeatherApplet::creditLink(const QString& url)
  {
@@ -24,4 +24,4 @@
 +    KToolInvocation::invokeBrowser(url);
  }
  
- QList<QAction*> WeatherApplet::contextualActions()
+ /*



From kkofler at fedoraproject.org  Sun Apr 26 03:10:01 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:10:01 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-9
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, 1.1, 1.2
Message-ID: <20090426031001.9323170125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2843/F-9

Modified Files:
	kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch 
Log Message:
Make patch apply in the sequence without fuzz.

kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:

Index: kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 02:52:06 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch	26 Apr 2009 03:09:31 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
---- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 04:33:19.000000000 +0200
+--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-04-26 05:05:51.000000000 +0200
++++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp	2009-04-26 05:06:27.000000000 +0200
 @@ -21,7 +21,7 @@
  #include "weatherapplet.h"
  #include <QCheckBox>
@@ -10,7 +10,7 @@
  #include <KDialog>
  #include <KConfigDialog>
  #include <KLocale>
-@@ -274,12 +274,12 @@
+@@ -282,12 +282,12 @@
  
  void WeatherApplet::creditLink(const QString& url)
  {
@@ -24,4 +24,4 @@
 +    KToolInvocation::invokeBrowser(url);
  }
  
- QList<QAction*> WeatherApplet::contextualActions()
+ /*



From kkofler at fedoraproject.org  Sun Apr 26 03:18:11 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:18:11 +0000 (UTC)
Subject: rpms/kde-plasma-weather/devel
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, 1.1, 1.2
Message-ID: <20090426031811.B607070125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4023/devel

Modified Files:
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
Fix typo in the patch so it actually builds.

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

Index: kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 02:52:06 -0000	1.1
+++ kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 03:18:11 -0000	1.2
@@ -5,7 +5,7 @@
  
      // If we have any weather observations set them up here.
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);
@@ -15,7 +15,7 @@
  {
      KConfigGroup generalConfig = config();
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);



From kkofler at fedoraproject.org  Sun Apr 26 03:18:40 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:18:40 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-10
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, 1.1, 1.2
Message-ID: <20090426031840.B676870125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4023/F-10

Modified Files:
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
Fix typo in the patch so it actually builds.

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

Index: kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 02:52:05 -0000	1.1
+++ kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 03:18:10 -0000	1.2
@@ -5,7 +5,7 @@
  
      // If we have any weather observations set them up here.
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);
@@ -15,7 +15,7 @@
  {
      KConfigGroup generalConfig = config();
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);



From kkofler at fedoraproject.org  Sun Apr 26 03:18:40 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:18:40 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-11
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, 1.1, 1.2
Message-ID: <20090426031840.E5D7E70125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4023/F-11

Modified Files:
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
Fix typo in the patch so it actually builds.

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

Index: kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 02:52:05 -0000	1.1
+++ kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 03:18:10 -0000	1.2
@@ -5,7 +5,7 @@
  
      // If we have any weather observations set them up here.
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);
@@ -15,7 +15,7 @@
  {
      KConfigGroup generalConfig = config();
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);



From kkofler at fedoraproject.org  Sun Apr 26 03:18:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 03:18:41 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-9
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, 1.1, 1.2
Message-ID: <20090426031841.477F370125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4023/F-9

Modified Files:
	kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch 
Log Message:
Fix typo in the patch so it actually builds.

kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:

Index: kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 02:52:06 -0000	1.1
+++ kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch	26 Apr 2009 03:18:10 -0000	1.2
@@ -5,7 +5,7 @@
  
      // If we have any weather observations set them up here.
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);
@@ -15,7 +15,7 @@
  {
      KConfigGroup generalConfig = config();
      foreach(const QString& place, generalConfig.groupList()) {
-+        if (place == QLatin1String("PopupApplet") {
++        if (place == QLatin1String("PopupApplet")) {
 +            continue; // not a place
 +        }
          KConfigGroup placeConfig(&generalConfig, place);



From cweyl at fedoraproject.org  Sun Apr 26 03:48:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 26 Apr 2009 03:48:00 +0000 (UTC)
Subject: rpms/perl-MooseX-Getopt/devel .cvsignore, 1.5,
	1.6 perl-MooseX-Getopt.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090426034800.789F770125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Getopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559

Modified Files:
	.cvsignore perl-MooseX-Getopt.spec sources 
Log Message:
* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
- update to 0.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2008 06:01:32 -0000	1.5
+++ .cvsignore	26 Apr 2009 03:47:29 -0000	1.6
@@ -1 +1 @@
-MooseX-Getopt-0.15.tar.gz
+MooseX-Getopt-0.18.tar.gz


Index: perl-MooseX-Getopt.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MooseX-Getopt.spec	26 Feb 2009 22:23:17 -0000	1.8
+++ perl-MooseX-Getopt.spec	26 Apr 2009 03:47:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Getopt
-Version:        0.15
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Moose role for processing command line options
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 BuildRequires:  perl(Getopt::Long::Descriptive)
 # 2.35 is what we have in F-8 perl -- tests all pass
 BuildRequires:  perl(Getopt::Long)              >= 2.35
-BuildRequires:  perl(Moose)                     >= 0.43
+BuildRequires:  perl(Moose)                     >= 0.56
 
 # tests...
 BuildRequires:  perl(Test::More)      >= 0.62
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
+- update to 0.18
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2008 06:01:32 -0000	1.5
+++ sources	26 Apr 2009 03:47:29 -0000	1.6
@@ -1 +1 @@
-b3269f83b588f1bdcbe25ea450ec3b96  MooseX-Getopt-0.15.tar.gz
+10dff3c6b5c5dfb3f1dafed05229437c  MooseX-Getopt-0.18.tar.gz



From kkofler at fedoraproject.org  Sun Apr 26 04:27:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:27:41 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-11 kde-plasma-weather.spec,1.4,1.5
Message-ID: <20090426042742.062C17013C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16214/F-11

Modified Files:
	kde-plasma-weather.spec 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-weather.spec	26 Apr 2009 02:52:05 -0000	1.4
+++ kde-plasma-weather.spec	26 Apr 2009 04:27:11 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
 # configuration fix: PopupApplet is not a city (#495998)
 Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
+# workaround for layout issue
+Patch1:         kde-plasma-weather-1.0.0-fix-layout.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -40,6 +42,7 @@
 %prep
 %setup -qn plasma-applet-weather-%{version}
 %patch0 -p1 -b .popupapplet-not-city
+%patch1 -p1 -b .fix-layout
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
@@ -70,6 +73,9 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+- work around layout issue
+
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
 - backport 2 more layout fixes from trunk
 - backport patch from trunk to honor preferred browser



From kkofler at fedoraproject.org  Sun Apr 26 04:27:42 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:27:42 +0000 (UTC)
Subject: rpms/kde-plasma-weather/devel kde-plasma-weather.spec,1.4,1.5
Message-ID: <20090426042742.4559170125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16214/devel

Modified Files:
	kde-plasma-weather.spec 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-weather.spec	26 Apr 2009 02:52:07 -0000	1.4
+++ kde-plasma-weather.spec	26 Apr 2009 04:27:11 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
 # configuration fix: PopupApplet is not a city (#495998)
 Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
+# workaround for layout issue
+Patch1:         kde-plasma-weather-1.0.0-fix-layout.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -40,6 +42,7 @@
 %prep
 %setup -qn plasma-applet-weather-%{version}
 %patch0 -p1 -b .popupapplet-not-city
+%patch1 -p1 -b .fix-layout
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
@@ -70,6 +73,9 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+- work around layout issue
+
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
 - backport 2 more layout fixes from trunk
 - backport patch from trunk to honor preferred browser



From kkofler at fedoraproject.org  Sun Apr 26 04:27:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:27:41 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-9 kde-plasma-weather.spec,1.3,1.4
Message-ID: <20090426042742.0CE767013F@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16214/F-9

Modified Files:
	kde-plasma-weather.spec 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-weather.spec	26 Apr 2009 02:52:06 -0000	1.3
+++ kde-plasma-weather.spec	26 Apr 2009 04:27:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
 # configuration fix: PopupApplet is not a city (#495998)
 Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
+# workaround for layout issue
+Patch1:         kde-plasma-weather-1.0.0-fix-layout.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -40,6 +42,7 @@
 %prep
 %setup -qn plasma-applet-weather-%{version}
 %patch0 -p1 -b .popupapplet-not-city
+%patch1 -p1 -b .fix-layout
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
@@ -70,6 +73,9 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+- work around layout issue
+
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
 - backport 2 more layout fixes from trunk
 - backport patch from trunk to honor preferred browser



From kkofler at fedoraproject.org  Sun Apr 26 04:27:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:27:41 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-10 kde-plasma-weather.spec,1.3,1.4
Message-ID: <20090426042742.005D370125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16214/F-10

Modified Files:
	kde-plasma-weather.spec 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-weather.spec	26 Apr 2009 02:52:05 -0000	1.3
+++ kde-plasma-weather.spec	26 Apr 2009 04:27:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
 # configuration fix: PopupApplet is not a city (#495998)
 Patch0:         kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
+# workaround for layout issue
+Patch1:         kde-plasma-weather-1.0.0-fix-layout.patch
 # backports from trunk:
 # fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
 Patch100:       kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -40,6 +42,7 @@
 %prep
 %setup -qn plasma-applet-weather-%{version}
 %patch0 -p1 -b .popupapplet-not-city
+%patch1 -p1 -b .fix-layout
 %patch100 -p1 -b .qt45
 %patch101 -p1 -b .qt45-clip
 %patch102 -p1 -b .no-update-now
@@ -70,6 +73,9 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+- work around layout issue
+
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
 - backport 2 more layout fixes from trunk
 - backport patch from trunk to honor preferred browser



From kkofler at fedoraproject.org  Sun Apr 26 04:28:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:28:35 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-10
	kde-plasma-weather-1.0.0-fix-layout.patch, NONE, 1.1
Message-ID: <20090426042835.E50BE70125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16502/F-10

Added Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue

kde-plasma-weather-1.0.0-fix-layout.patch:

--- NEW FILE kde-plasma-weather-1.0.0-fix-layout.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
@@ -194,6 +194,7 @@
     if (m_activePlace.isEmpty()) {
         setConfigurationRequired(true);
     } else {
+        setVisibleLayout(false); // FIXME: work around strange breakage
         getWeather();
         setConfigurationRequired(false);
     }



From kkofler at fedoraproject.org  Sun Apr 26 04:28:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:28:36 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-9
	kde-plasma-weather-1.0.0-fix-layout.patch, NONE, 1.1
Message-ID: <20090426042836.7C9C770125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16502/F-9

Added Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue

kde-plasma-weather-1.0.0-fix-layout.patch:

--- NEW FILE kde-plasma-weather-1.0.0-fix-layout.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
@@ -194,6 +194,7 @@
     if (m_activePlace.isEmpty()) {
         setConfigurationRequired(true);
     } else {
+        setVisibleLayout(false); // FIXME: work around strange breakage
         getWeather();
         setConfigurationRequired(false);
     }



From kkofler at fedoraproject.org  Sun Apr 26 04:28:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:28:36 +0000 (UTC)
Subject: rpms/kde-plasma-weather/devel
	kde-plasma-weather-1.0.0-fix-layout.patch, NONE, 1.1
Message-ID: <20090426042836.C9EBC70125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16502/devel

Added Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue

kde-plasma-weather-1.0.0-fix-layout.patch:

--- NEW FILE kde-plasma-weather-1.0.0-fix-layout.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
@@ -194,6 +194,7 @@
     if (m_activePlace.isEmpty()) {
         setConfigurationRequired(true);
     } else {
+        setVisibleLayout(false); // FIXME: work around strange breakage
         getWeather();
         setConfigurationRequired(false);
     }



From kkofler at fedoraproject.org  Sun Apr 26 04:28:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 04:28:36 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-11
	kde-plasma-weather-1.0.0-fix-layout.patch, NONE, 1.1
Message-ID: <20090426042836.2CAE770125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16502/F-11

Added Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
- work around layout issue

kde-plasma-weather-1.0.0-fix-layout.patch:

--- NEW FILE kde-plasma-weather-1.0.0-fix-layout.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
@@ -194,6 +194,7 @@
     if (m_activePlace.isEmpty()) {
         setConfigurationRequired(true);
     } else {
+        setVisibleLayout(false); // FIXME: work around strange breakage
         getWeather();
         setConfigurationRequired(false);
     }



From kkofler at fedoraproject.org  Sun Apr 26 05:01:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 05:01:49 +0000 (UTC)
Subject: rpms/kde-plasma-weather/devel
	kde-plasma-weather-1.0.0-fix-layout.patch, 1.1,
	1.2 kde-plasma-weather-1.0.0-rev936021-init-order.patch, 1.1,
	1.2 kde-plasma-weather.spec, 1.5, 1.6
Message-ID: <20090426050149.C0D8370125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956/devel

Modified Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather.spec 
Log Message:
Try another workaround for the layout issue.

kde-plasma-weather-1.0.0-fix-layout.patch:

Index: kde-plasma-weather-1.0.0-fix-layout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather-1.0.0-fix-layout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 04:28:36 -0000	1.1
+++ kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 05:01:48 -0000	1.2
@@ -1,11 +1,11 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
 --- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
-@@ -194,6 +194,7 @@
-     if (m_activePlace.isEmpty()) {
-         setConfigurationRequired(true);
-     } else {
-+        setVisibleLayout(false); // FIXME: work around strange breakage
-         getWeather();
-         setConfigurationRequired(false);
-     }
++++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:57:23.000000000 +0200
+@@ -200,6 +200,7 @@
+ 
+     m_graphicsWidget = new QGraphicsWidget(this);
+     m_graphicsWidget->setLayout(m_layout);
++    m_graphicsWidget->resize(400,300);
+ 
+     return m_graphicsWidget;
+ }

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

Index: kde-plasma-weather-1.0.0-rev936021-init-order.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather-1.0.0-rev936021-init-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 02:52:06 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 05:01:48 -0000	1.2
@@ -16,5 +16,5 @@
  
 -    m_graphicsWidget = new QGraphicsWidget(this);
      m_graphicsWidget->setLayout(m_layout);
+     m_graphicsWidget->resize(400,300);
  
-     return m_graphicsWidget;


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-plasma-weather.spec	26 Apr 2009 04:27:11 -0000	1.5
+++ kde-plasma-weather.spec	26 Apr 2009 05:01:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -73,7 +73,7 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
-* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-6
 - work around layout issue
 
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4



From kkofler at fedoraproject.org  Sun Apr 26 05:02:14 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 05:02:14 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-10
	kde-plasma-weather-1.0.0-fix-layout.patch, 1.1,
	1.2 kde-plasma-weather-1.0.0-rev936021-init-order.patch, 1.1,
	1.2 kde-plasma-weather.spec, 1.4, 1.5
Message-ID: <20090426050214.E86D870125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956/F-10

Modified Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather.spec 
Log Message:
Try another workaround for the layout issue.

kde-plasma-weather-1.0.0-fix-layout.patch:

Index: kde-plasma-weather-1.0.0-fix-layout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather-1.0.0-fix-layout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 04:28:35 -0000	1.1
+++ kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 05:01:43 -0000	1.2
@@ -1,11 +1,11 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
 --- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
-@@ -194,6 +194,7 @@
-     if (m_activePlace.isEmpty()) {
-         setConfigurationRequired(true);
-     } else {
-+        setVisibleLayout(false); // FIXME: work around strange breakage
-         getWeather();
-         setConfigurationRequired(false);
-     }
++++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:57:23.000000000 +0200
+@@ -200,6 +200,7 @@
+ 
+     m_graphicsWidget = new QGraphicsWidget(this);
+     m_graphicsWidget->setLayout(m_layout);
++    m_graphicsWidget->resize(400,300);
+ 
+     return m_graphicsWidget;
+ }

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

Index: kde-plasma-weather-1.0.0-rev936021-init-order.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather-1.0.0-rev936021-init-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 02:52:04 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 05:01:44 -0000	1.2
@@ -16,5 +16,5 @@
  
 -    m_graphicsWidget = new QGraphicsWidget(this);
      m_graphicsWidget->setLayout(m_layout);
+     m_graphicsWidget->resize(400,300);
  
-     return m_graphicsWidget;


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-weather.spec	26 Apr 2009 04:27:10 -0000	1.4
+++ kde-plasma-weather.spec	26 Apr 2009 05:01:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -73,7 +73,7 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
-* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-6
 - work around layout issue
 
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4



From kkofler at fedoraproject.org  Sun Apr 26 05:02:18 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 05:02:18 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-11
	kde-plasma-weather-1.0.0-fix-layout.patch, 1.1,
	1.2 kde-plasma-weather-1.0.0-rev936021-init-order.patch, 1.1,
	1.2 kde-plasma-weather.spec, 1.5, 1.6
Message-ID: <20090426050218.4DFC970125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956/F-11

Modified Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather.spec 
Log Message:
Try another workaround for the layout issue.

kde-plasma-weather-1.0.0-fix-layout.patch:

Index: kde-plasma-weather-1.0.0-fix-layout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather-1.0.0-fix-layout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 04:28:36 -0000	1.1
+++ kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 05:01:44 -0000	1.2
@@ -1,11 +1,11 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
 --- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
-@@ -194,6 +194,7 @@
-     if (m_activePlace.isEmpty()) {
-         setConfigurationRequired(true);
-     } else {
-+        setVisibleLayout(false); // FIXME: work around strange breakage
-         getWeather();
-         setConfigurationRequired(false);
-     }
++++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:57:23.000000000 +0200
+@@ -200,6 +200,7 @@
+ 
+     m_graphicsWidget = new QGraphicsWidget(this);
+     m_graphicsWidget->setLayout(m_layout);
++    m_graphicsWidget->resize(400,300);
+ 
+     return m_graphicsWidget;
+ }

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

Index: kde-plasma-weather-1.0.0-rev936021-init-order.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather-1.0.0-rev936021-init-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 02:52:05 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 05:01:47 -0000	1.2
@@ -16,5 +16,5 @@
  
 -    m_graphicsWidget = new QGraphicsWidget(this);
      m_graphicsWidget->setLayout(m_layout);
+     m_graphicsWidget->resize(400,300);
  
-     return m_graphicsWidget;


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-11/kde-plasma-weather.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-plasma-weather.spec	26 Apr 2009 04:27:11 -0000	1.5
+++ kde-plasma-weather.spec	26 Apr 2009 05:01:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -73,7 +73,7 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
-* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-6
 - work around layout issue
 
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4



From kkofler at fedoraproject.org  Sun Apr 26 05:02:18 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 26 Apr 2009 05:02:18 +0000 (UTC)
Subject: rpms/kde-plasma-weather/F-9
	kde-plasma-weather-1.0.0-fix-layout.patch, 
	1.1, 1.2 kde-plasma-weather-1.0.0-rev936021-init-order.patch,
	1.1, 1.2 kde-plasma-weather.spec, 1.4, 1.5
Message-ID: <20090426050218.DC23870125@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956/F-9

Modified Files:
	kde-plasma-weather-1.0.0-fix-layout.patch 
	kde-plasma-weather-1.0.0-rev936021-init-order.patch 
	kde-plasma-weather.spec 
Log Message:
Try another workaround for the layout issue.

kde-plasma-weather-1.0.0-fix-layout.patch:

Index: kde-plasma-weather-1.0.0-fix-layout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather-1.0.0-fix-layout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 04:28:36 -0000	1.1
+++ kde-plasma-weather-1.0.0-fix-layout.patch	26 Apr 2009 05:01:48 -0000	1.2
@@ -1,11 +1,11 @@
 diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp
 --- plasma-applet-weather-1.0.0/weatherapplet.cpp	2009-02-03 07:20:28.000000000 +0100
-+++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:25:00.000000000 +0200
-@@ -194,6 +194,7 @@
-     if (m_activePlace.isEmpty()) {
-         setConfigurationRequired(true);
-     } else {
-+        setVisibleLayout(false); // FIXME: work around strange breakage
-         getWeather();
-         setConfigurationRequired(false);
-     }
++++ plasma-applet-weather-1.0.0-fix-layout/weatherapplet.cpp	2009-04-26 06:57:23.000000000 +0200
+@@ -200,6 +200,7 @@
+ 
+     m_graphicsWidget = new QGraphicsWidget(this);
+     m_graphicsWidget->setLayout(m_layout);
++    m_graphicsWidget->resize(400,300);
+ 
+     return m_graphicsWidget;
+ }

kde-plasma-weather-1.0.0-rev936021-init-order.patch:

Index: kde-plasma-weather-1.0.0-rev936021-init-order.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather-1.0.0-rev936021-init-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 02:52:06 -0000	1.1
+++ kde-plasma-weather-1.0.0-rev936021-init-order.patch	26 Apr 2009 05:01:48 -0000	1.2
@@ -16,5 +16,5 @@
  
 -    m_graphicsWidget = new QGraphicsWidget(this);
      m_graphicsWidget->setLayout(m_layout);
+     m_graphicsWidget->resize(400,300);
  
-     return m_graphicsWidget;


Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-weather.spec	26 Apr 2009 04:27:11 -0000	1.4
+++ kde-plasma-weather.spec	26 Apr 2009 05:01:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-weather
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma applet for weather forecasts
 
 Group:          User Interface/Desktops
@@ -73,7 +73,7 @@
 %{_kde4_appsdir}/desktoptheme/default/weather/
 
 %changelog
-* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-6
 - work around layout issue
 
 * Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4



From cebbert at fedoraproject.org  Sun Apr 26 05:19:05 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 26 Apr 2009 05:19:05 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc3-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1055, 1.1056 kernel.spec, 1.1530, 1.1531 sources, 1.1015,
	1.1016 upstream, 1.928, 1.929
Message-ID: <20090426051905.78F7F70125@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26541

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc3-git1.bz2.sign 
Log Message:
Linux 2.6.30-rc3-git1


--- NEW FILE patch-2.6.30-rc3-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ8lbfyGugalF9Dw4RAijCAJ95Zc3ACuEpchYRQvAwv/l6cDQn5QCfQ9BH
jO3wOjDB1oBTccJoo13Fw00=
=TBI6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1055
retrieving revision 1.1056
diff -u -r1.1055 -r1.1056
--- .cvsignore	22 Apr 2009 15:40:04 -0000	1.1055
+++ .cvsignore	26 Apr 2009 05:18:33 -0000	1.1056
@@ -7,3 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc3.bz2
+patch-2.6.30-rc3-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1530
retrieving revision 1.1531
diff -u -r1.1530 -r1.1531
--- kernel.spec	24 Apr 2009 14:50:27 -0000	1.1530
+++ kernel.spec	26 Apr 2009 05:18:33 -0000	1.1531
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1821,6 +1821,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Sun Apr 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30-0.68.rc3.git1
+- Linux 2.6.30-rc3-git1
+
 * Wed Apr 22 2009 Dave Jones <davej at redhat.com> 2.6.30-0.67.rc3
 - Disable SYSFS_DEPRECATED on ia64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -r1.1015 -r1.1016
--- sources	22 Apr 2009 15:40:05 -0000	1.1015
+++ sources	26 Apr 2009 05:18:34 -0000	1.1016
@@ -1,2 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 cd69d16ea42bbf20d0a505690be45868  patch-2.6.30-rc3.bz2
+e605eb05fc597c882fcb9098355a9da5  patch-2.6.30-rc3-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- upstream	22 Apr 2009 15:40:06 -0000	1.928
+++ upstream	26 Apr 2009 05:18:34 -0000	1.929
@@ -1,2 +1,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc3.bz2
+patch-2.6.30-rc3-git1.bz2
+



From cweyl at fedoraproject.org  Sun Apr 26 05:43:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 26 Apr 2009 05:43:28 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/devel .cvsignore, 1.3,
	1.4 perl-Fedora-Bugzilla.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090426054328.D2CE070125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Fedora-Bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30826

Modified Files:
	.cvsignore perl-Fedora-Bugzilla.spec sources 
Log Message:
* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10
- alter source0 to point to the CPAN



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2009 05:07:31 -0000	1.3
+++ .cvsignore	26 Apr 2009 05:42:57 -0000	1.4
@@ -1 +1 @@
-Fedora-Bugzilla-0.05.tar.gz
+Fedora-Bugzilla-0.10.tar.gz


Index: perl-Fedora-Bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/devel/perl-Fedora-Bugzilla.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Fedora-Bugzilla.spec	25 Feb 2009 05:07:31 -0000	1.3
+++ perl-Fedora-Bugzilla.spec	26 Apr 2009 05:42:57 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           perl-Fedora-Bugzilla
-Version:        0.05
+Version:        0.10
 Release:        1%{?dist}
 Summary:        Access Fedora's Bugzilla
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://camelus.fedorahosted.org
-Source0:        http://fedorahosted.org/releases/c/a/camelus/Fedora-Bugzilla-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Fedora-Bugzilla-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -16,7 +16,7 @@
 
 BuildRequires:  perl(namespace::clean)
 BuildRequires:  perl(Crypt::SSLeay)
-BuildRequires:  perl(DateTime::Format::Builder)
+BuildRequires:  perl(DateTime::Format::Pg)
 BuildRequires:  perl(Email::Address)
 BuildRequires:  perl(HTTP::Cookies)
 BuildRequires:  perl(MIME::Base64)
@@ -90,6 +90,13 @@
 
 
 %changelog
+* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+- alter source0 to point to the CPAN
+
+* Sun Mar 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
+- update to 0.08
+
 * Tue Feb 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - update to 0.05
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2009 05:07:31 -0000	1.3
+++ sources	26 Apr 2009 05:42:57 -0000	1.4
@@ -1 +1 @@
-f5fcdb82db18ecb4c65f968493056c8c  Fedora-Bugzilla-0.05.tar.gz
+26e69789213fc01c22396d1898232fc4  Fedora-Bugzilla-0.10.tar.gz



From cweyl at fedoraproject.org  Sun Apr 26 05:50:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 26 Apr 2009 05:50:08 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/F-10 .cvsignore, 1.2,
	1.3 perl-Fedora-Bugzilla.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090426055008.6AD4370125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31811

Modified Files:
	.cvsignore perl-Fedora-Bugzilla.spec sources 
Log Message:
* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10
- alter source0 to point to the CPAN



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2009 07:41:39 -0000	1.2
+++ .cvsignore	26 Apr 2009 05:49:37 -0000	1.3
@@ -1 +1,8 @@
-Fedora-Bugzilla-0.04.tar.gz
+Fedora-Bugzilla-0.05.tar.gz
+Fedora-Bugzilla-*
+*.gz
+*.tar
+*.rpm
+noarch
+clog
+.build*


Index: perl-Fedora-Bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10/perl-Fedora-Bugzilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Fedora-Bugzilla.spec	28 Feb 2009 01:28:37 -0000	1.2
+++ perl-Fedora-Bugzilla.spec	26 Apr 2009 05:49:37 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Fedora-Bugzilla
-Version:        0.05
+Version:        0.10
 Release:        1%{?dist}
 Summary:        Access Fedora's Bugzilla
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://camelus.fedorahosted.org
-Source0:        http://fedorahosted.org/releases/c/a/camelus/Fedora-Bugzilla-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Fedora-Bugzilla-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -16,7 +16,7 @@
 
 BuildRequires:  perl(namespace::clean)
 BuildRequires:  perl(Crypt::SSLeay)
-BuildRequires:  perl(DateTime::Format::Builder)
+BuildRequires:  perl(DateTime::Format::Pg)
 BuildRequires:  perl(Email::Address)
 BuildRequires:  perl(HTTP::Cookies)
 BuildRequires:  perl(MIME::Base64)
@@ -90,6 +90,13 @@
 
 
 %changelog
+* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+- alter source0 to point to the CPAN
+
+* Sun Mar 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
+- update to 0.08
+
 * Tue Feb 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - update to 0.05
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2009 01:28:37 -0000	1.3
+++ sources	26 Apr 2009 05:49:37 -0000	1.4
@@ -1 +1 @@
-f5fcdb82db18ecb4c65f968493056c8c  Fedora-Bugzilla-0.05.tar.gz
+26e69789213fc01c22396d1898232fc4  Fedora-Bugzilla-0.10.tar.gz



From corsepiu at fedoraproject.org  Sun Apr 26 06:09:01 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sun, 26 Apr 2009 06:09:01 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-11 .cvsignore, 1.4,
	1.5 perl-Perl-MinimumVersion.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090426060902.1FC137013F@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2824/F-11

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2008 01:46:11 -0000	1.4
+++ .cvsignore	26 Apr 2009 06:08:30 -0000	1.5
@@ -1 +1 @@
-Perl-MinimumVersion-1.19.tar.gz
+Perl-MinimumVersion-1.20.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-11/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Perl-MinimumVersion.spec	27 Feb 2009 00:26:31 -0000	1.10
+++ perl-Perl-MinimumVersion.spec	26 Apr 2009 06:08:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2008 01:46:11 -0000	1.4
+++ sources	26 Apr 2009 06:08:30 -0000	1.5
@@ -1 +1 @@
-dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz
+6c69ce485db4ca399f29638c34f84da6  Perl-MinimumVersion-1.20.tar.gz



From corsepiu at fedoraproject.org  Sun Apr 26 06:09:01 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sun, 26 Apr 2009 06:09:01 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/devel .cvsignore, 1.4,
	1.5 perl-Perl-MinimumVersion.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090426060902.193BE70129@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2824/devel

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2008 01:46:11 -0000	1.4
+++ .cvsignore	26 Apr 2009 06:08:29 -0000	1.5
@@ -1 +1 @@
-Perl-MinimumVersion-1.19.tar.gz
+Perl-MinimumVersion-1.20.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Perl-MinimumVersion.spec	27 Feb 2009 00:26:31 -0000	1.10
+++ perl-Perl-MinimumVersion.spec	26 Apr 2009 06:08:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2008 01:46:11 -0000	1.4
+++ sources	26 Apr 2009 06:08:29 -0000	1.5
@@ -1 +1 @@
-dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz
+6c69ce485db4ca399f29638c34f84da6  Perl-MinimumVersion-1.20.tar.gz



From corsepiu at fedoraproject.org  Sun Apr 26 06:09:01 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sun, 26 Apr 2009 06:09:01 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-9 .cvsignore, 1.4,
	1.5 perl-Perl-MinimumVersion.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090426060902.2EF3070142@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2824/F-9

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2008 01:46:11 -0000	1.4
+++ .cvsignore	26 Apr 2009 06:08:31 -0000	1.5
@@ -1 +1 @@
-Perl-MinimumVersion-1.19.tar.gz
+Perl-MinimumVersion-1.20.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Perl-MinimumVersion.spec	16 Sep 2008 01:48:28 -0000	1.9
+++ perl-Perl-MinimumVersion.spec	26 Apr 2009 06:08:31 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.19
+Version:        1.20
 Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+
 * Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2008 01:46:11 -0000	1.4
+++ sources	26 Apr 2009 06:08:31 -0000	1.5
@@ -1 +1 @@
-dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz
+6c69ce485db4ca399f29638c34f84da6  Perl-MinimumVersion-1.20.tar.gz



From corsepiu at fedoraproject.org  Sun Apr 26 06:09:01 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sun, 26 Apr 2009 06:09:01 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/F-10 .cvsignore, 1.4,
	1.5 perl-Perl-MinimumVersion.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090426060902.262AF70141@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2824/F-10

Modified Files:
	.cvsignore perl-Perl-MinimumVersion.spec sources 
Log Message:
* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2008 01:46:11 -0000	1.4
+++ .cvsignore	26 Apr 2009 06:08:31 -0000	1.5
@@ -1 +1 @@
-Perl-MinimumVersion-1.19.tar.gz
+Perl-MinimumVersion-1.20.tar.gz


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-10/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Perl-MinimumVersion.spec	16 Sep 2008 01:48:27 -0000	1.9
+++ perl-Perl-MinimumVersion.spec	26 Apr 2009 06:08:31 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Perl-MinimumVersion
-Version:        1.19
+Version:        1.20
 Release:        1%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Apr 26 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+
 * Tue Sep 16 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.19-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2008 01:46:11 -0000	1.4
+++ sources	26 Apr 2009 06:08:31 -0000	1.5
@@ -1 +1 @@
-dfce4d3fbb12bc6a23fdaf78b1195a3f  Perl-MinimumVersion-1.19.tar.gz
+6c69ce485db4ca399f29638c34f84da6  Perl-MinimumVersion-1.20.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 26 06:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 06:10:26 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090426061026.9E76A10F881@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ImageMagick (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sun Apr 26 06:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 06:10:29 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090426061029.1E92C10F895@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ImageMagick (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sun Apr 26 06:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 06:10:29 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090426061030.2D8D610F898@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ImageMagick (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sun Apr 26 06:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 06:10:30 +0000
Subject: [pkgdb] ImageMagick had acl change status
Message-ID: <20090426061030.A1E4710F89B@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ImageMagick (Fedora devel) to Approved for hubbitus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ImageMagick



From cweyl at fedoraproject.org  Sun Apr 26 07:31:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 26 Apr 2009 07:31:54 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/F-11 perl-Fedora-Bugzilla.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090426073154.894D970125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Fedora-Bugzilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22043

Modified Files:
	perl-Fedora-Bugzilla.spec sources 
Log Message:
* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- update to 0.10
- alter source0 to point to the CPAN



Index: perl-Fedora-Bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-11/perl-Fedora-Bugzilla.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Fedora-Bugzilla.spec	25 Feb 2009 05:07:31 -0000	1.3
+++ perl-Fedora-Bugzilla.spec	26 Apr 2009 07:31:21 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           perl-Fedora-Bugzilla
-Version:        0.05
+Version:        0.10
 Release:        1%{?dist}
 Summary:        Access Fedora's Bugzilla
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://camelus.fedorahosted.org
-Source0:        http://fedorahosted.org/releases/c/a/camelus/Fedora-Bugzilla-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/Fedora-Bugzilla-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -16,7 +16,7 @@
 
 BuildRequires:  perl(namespace::clean)
 BuildRequires:  perl(Crypt::SSLeay)
-BuildRequires:  perl(DateTime::Format::Builder)
+BuildRequires:  perl(DateTime::Format::Pg)
 BuildRequires:  perl(Email::Address)
 BuildRequires:  perl(HTTP::Cookies)
 BuildRequires:  perl(MIME::Base64)
@@ -90,6 +90,13 @@
 
 
 %changelog
+* Sat Apr 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- update to 0.10
+- alter source0 to point to the CPAN
+
+* Sun Mar 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
+- update to 0.08
+
 * Tue Feb 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - update to 0.05
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2009 05:07:31 -0000	1.3
+++ sources	26 Apr 2009 07:31:21 -0000	1.4
@@ -1 +1 @@
-f5fcdb82db18ecb4c65f968493056c8c  Fedora-Bugzilla-0.05.tar.gz
+26e69789213fc01c22396d1898232fc4  Fedora-Bugzilla-0.10.tar.gz



From cweyl at fedoraproject.org  Sun Apr 26 07:55:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 26 Apr 2009 07:55:07 +0000 (UTC)
Subject: rpms/perl-Module-Install/devel .cvsignore, 1.14,
	1.15 perl-Module-Install.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20090426075507.3679D70125@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26713

Modified Files:
	.cvsignore perl-Module-Install.spec sources 
Log Message:
* Sun Apr 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.85-1
- update to 0.85
- add BR on File::Spec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Apr 2009 04:46:16 -0000	1.14
+++ .cvsignore	26 Apr 2009 07:54:35 -0000	1.15
@@ -1 +1 @@
-Module-Install-0.82.tar.gz
+Module-Install-0.85.tar.gz


Index: perl-Module-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install/devel/perl-Module-Install.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Module-Install.spec	10 Apr 2009 04:46:16 -0000	1.18
+++ perl-Module-Install.spec	26 Apr 2009 07:54:35 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           perl-Module-Install
-Version:        0.82
+Version:        0.85
 Release:        1%{?dist}
 Summary:        Standalone, extensible Perl module installer
 License:        GPL+ or Artistic
@@ -20,6 +20,7 @@
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(ExtUtils::ParseXS)
 BuildRequires:  perl(File::Remove) >= 1.42
+BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::CoreList)
 BuildRequires:  perl(Module::ScanDeps)
@@ -75,6 +76,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Apr 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.85-1
+- update to 0.85
+- add BR on File::Spec
+
 * Thu Apr 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.82-1
 - update to 0.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Install/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Apr 2009 04:46:16 -0000	1.14
+++ sources	26 Apr 2009 07:54:35 -0000	1.15
@@ -1 +1 @@
-2f59ef8113eaedababebf111460086f2  Module-Install-0.82.tar.gz
+849e7cff274c4fb674ac26d4f3c23cb3  Module-Install-0.85.tar.gz



From kwizart at fedoraproject.org  Sun Apr 26 09:10:07 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 26 Apr 2009 09:10:07 +0000 (UTC)
Subject: rpms/lcdproc/F-10 import.log, NONE,
	1.1 lcdproc-0.5.2-novalidate.patch, 
	NONE, 1.1 lcdproc-0.5.2-initscripts.patch, 1.2, 1.3 lcdproc.spec,
	1.8, 1.9
Message-ID: <20090426091007.B95DD70125@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcdproc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6939/F-10

Modified Files:
	lcdproc-0.5.2-initscripts.patch lcdproc.spec 
Added Files:
	import.log lcdproc-0.5.2-novalidate.patch 
Log Message:
Backport fixed for branches



--- NEW FILE import.log ---
lcdproc-0_5_2-11_fc12:F-10:lcdproc-0.5.2-11.fc12.src.rpm:1240736949

lcdproc-0.5.2-novalidate.patch:

--- NEW FILE lcdproc-0.5.2-novalidate.patch ---
diff -up lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate	2007-04-14 16:39:53.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am	2009-04-14 15:28:01.000000000 +0200
@@ -18,6 +18,6 @@ developerguidedir = $(DESTDIR)$(htmldir)
 
 install-html-developerguide: $(xmlto) lcdproc-dev.docbook
 	$(mkinstalldirs) $(developerguidedir)
-	$(xmlto) html -o $(developerguidedir) lcdproc-dev.docbook
+	$(xmlto) html -o $(developerguidedir) --skip-validation lcdproc-dev.docbook
 
 ## EOF
diff -up lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-user/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate	2009-04-14 15:32:24.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-user/Makefile.am	2009-04-14 15:32:44.000000000 +0200
@@ -21,6 +21,6 @@ userguidedir = $(DESTDIR)$(htmldir)/user
 
 install-html-userguide: $(xmlto) lcdproc-user.docbook
 	$(mkinstalldirs) $(userguidedir)
-	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
+	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
 
 ## EOF

lcdproc-0.5.2-initscripts.patch:

Index: lcdproc-0.5.2-initscripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/F-10/lcdproc-0.5.2-initscripts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lcdproc-0.5.2-initscripts.patch	7 Nov 2008 17:53:40 -0000	1.2
+++ lcdproc-0.5.2-initscripts.patch	26 Apr 2009 09:10:05 -0000	1.3
@@ -1,140 +1,251 @@
-diff -Naurp lcdproc-0.5.2.orig/scripts/init-LCDd.LSB.in lcdproc-0.5.2/scripts/init-LCDd.LSB.in
---- lcdproc-0.5.2.orig/scripts/init-LCDd.LSB.in	2007-04-14 10:41:20.000000000 -0400
-+++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2008-11-07 12:07:34.597854268 -0500
-@@ -4,6 +4,7 @@
+diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/scripts/init-LCDd.LSB.in
+--- lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
++++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-04-14 16:15:46.000000000 +0200
+@@ -1,10 +1,18 @@
+ #! /bin/sh
++#
++# chkconfig: - 70 21
++# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \
++#	Apart from the main client lcdproc(1) there are various clients. \
++#	See http://lcdproc.omnipotent.net for details.
++# processname: LCDd
++#
++# config: /etc/sysconfig/lcdproc/LCDd.conf
+ 
+-#### BEGIN INIT INFO
++### BEGIN INIT INFO
  # Provides:          LCDd
  # Required-Start:    $syslog $local_fs $network $remote_fs
  # Required-Stop:     $syslog $local_fs $network $remote_fs
-+# Should-Start:      udev
- # Default-Start:     2 3 4 5
+-# Default-Start:     2 3 4 5
++# Default-Start:     
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc Server Daemon
-@@ -23,8 +24,10 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
- NAME=LCDd
- DAEMON=${sbindir}/$NAME
- DESC="LCDproc display server daemon"
+ # Description:       LSB init script for LCDd, the display
+@@ -12,57 +20,62 @@
+ ### END INIT INFO
+ 
+ 
+-# local variables
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-sbindir=@sbindir@
+-etc=@sysconfdir@
+-
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+-NAME=LCDd
+-DAEMON=${sbindir}/$NAME
+-DESC="LCDproc display server daemon"
 -DEFAULTS=/etc/default/$NAME
-+DEFAULTS=@sysconfdir@/${NAME}
- START=yes
+-START=yes
+-
+-# Source defaults file; edit that file to configure this script.
+-if [ -e "${DEFAULTS}" ]; then
+-  . "${DEFAULTS}"
+-fi
++prog=LCDd
++lockfile=/var/lock/subsys/$prog
++configfile=@sysconfdir@/$prog.conf
 +RETVAL=0
 +
  
- # Source defaults file; edit that file to configure this script.
- if [ -e "${DEFAULTS}" ]; then
-@@ -40,29 +43,39 @@ fi
- test -x $DAEMON || exit 5
- 
- # load LSB 3.x init functions
--. /lib/lsb/init-functions
+-# If we're not to start the daemon, simply exit
+-if [ "${START}" != "yes" ]; then
+-    exit 0
++# load LSB 3.x init functions
 +if [ -e /lib/lsb/init-functions ]; then
 +  . /lib/lsb/init-functions
-+fi
-+
+ fi
+ 
+-# installation check
+-test -x $DAEMON || exit 5
 +# Source function library.
 +if [ -e /etc/rc.d/init.d/functions ]; then
 +  . /etc/rc.d/init.d/functions
 +fi
  
+-# load LSB 3.x init functions
+-. /lib/lsb/init-functions
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
+ 
  
  case "$1" in
    start)
 -	log_daemon_msg "Starting $DESC" "$NAME"
 -	start_daemon $DAEMON $OPTIONS
 -	log_end_msg $?
-+	echo -n $"Starting $DESC $NAME :"
-+	daemon $DAEMON $OPTIONS
++	echo -n $"Starting $prog: "
++	daemon $prog -c $configfile
 +	RETVAL=$?
 +        echo
++	[ $RETVAL -eq 0 ] && touch $lockfile
++	return $RETVAL
  	;;
    stop)
 -	log_daemon_msg "Stopping $DESC" "$NAME"
-+	echo -n $"Stopping $DESC $NAME :"
- 	killproc $DAEMON
+-	killproc $DAEMON
 -	log_end_msg $?
+-	;;
+-  restart|reload|force-reload)
+-	$0 stop
+-	sleep 1
+-	$0 start
++	echo -n $"Shutting down $prog: "
++	killproc $prog
 +	RETVAL=$?
 +        echo
- 	;;
-   restart|reload|force-reload)
- 	$0 stop
- 	sleep 1
-+        RETVAL=0
- 	$0 start
++	[ $RETVAL -eq 0 ] && rm -f $lockfile
++	return $RETVAL
++	;;
++  status)
++	status $prog
++	;;
++  restart|force-reload)
++	stop
++	start
++	;;
++  try-restart|condrestart)
++	if [ -f $lockfile ]; then
++	    stop
++	    start
++	fi
++	;;
++  reload)
++	exit 3
  	;;
    *)
 -	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-+	echo $"Usage: $0 {start|stop|restart|reload|force-reload}" >&2
++	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
  	exit 2
- 	;;
+-	;;
  esac
  
 -exit 0
 +exit $RETVAL
-diff -Naurp lcdproc-0.5.2.orig/scripts/init-lcdproc.LSB.in lcdproc-0.5.2/scripts/init-lcdproc.LSB.in
---- lcdproc-0.5.2.orig/scripts/init-lcdproc.LSB.in	2007-04-14 10:41:20.000000000 -0400
-+++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2008-11-07 12:06:30.333851207 -0500
-@@ -4,6 +4,7 @@
+diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scripts/init-lcdproc.LSB.in
+--- lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
++++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-04-14 16:16:19.000000000 +0200
+@@ -1,10 +1,19 @@
+ #! /bin/sh
++#
++# chkconfig: - 71 20
++# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \
++#	Apart from the main client lcdproc(1) there are various clients. \
++#	See http://lcdproc.omnipotent.net for details.
++# processname: lcdproc
++#
++# config: /etc/sysconfig/lcdproc/lcdproc.conf
+ 
+-#### BEGIN INIT INFO
++### BEGIN INIT INFO
  # Provides:          lcdproc
  # Required-Start:    $syslog $local_fs $network $remote_fs
  # Required-Stop:     $syslog $local_fs $network $remote_fs
+-# Default-Start:     2 3 4 5
 +# Should-Start:      LCDd
- # Default-Start:     2 3 4 5
++# Default-Start:     
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc system status information viewer
-@@ -23,8 +24,9 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
- NAME=lcdproc
- DAEMON=${bindir}/$NAME
- DESC="LCDproc system status monitor"
+ # Description:       LSB init script for lcdproc, the system
+@@ -12,57 +21,60 @@
+ ### END INIT INFO
+ 
+ 
+-# local variables
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-sbindir=@sbindir@
+-etc=@sysconfdir@
+-
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+-NAME=lcdproc
+-DAEMON=${bindir}/$NAME
+-DESC="LCDproc system status monitor"
 -DEFAULTS=/etc/default/$NAME
-+DEFAULTS=@sysconfdir@/${NAME}
- START=yes
+-START=yes
+-
+-# Source defaults file; edit that file to configure this script.
+-if [ -e "${DEFAULTS}" ]; then
+-  . "${DEFAULTS}"
+-fi
++prog=lcdproc
++lockfile=/var/lock/subsys/$prog
++configfile=@sysconfdir@/$prog.conf
 +RETVAL=0
  
- # Source defaults file; edit that file to configure this script.
- if [ -e "${DEFAULTS}" ]; then
-@@ -40,29 +42,39 @@ fi
- test -x $DAEMON || exit 5
- 
- # load LSB 3.x init functions
--. /lib/lsb/init-functions
+-# If we're not to start the daemon, simply exit
+-if [ "${START}" != "yes" ]; then
+-    exit 0
++# load LSB 3.x init functions
 +if [ -e /lib/lsb/init-functions ]; then
 +  . /lib/lsb/init-functions
-+fi
-+
+ fi
+ 
+-# installation check
+-test -x $DAEMON || exit 5
+-
+-# load LSB 3.x init functions
+-. /lib/lsb/init-functions
 +# Source function library.
 +if [ -e /etc/rc.d/init.d/functions ]; then
 +  . /etc/rc.d/init.d/functions
 +fi
  
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
  
  case "$1" in
    start)
 -	log_daemon_msg "Starting $DESC" "$NAME"
 -	start_daemon $DAEMON $OPTIONS
 -	log_end_msg $?
-+	echo -n $"Starting $DESC $NAME :"
-+	daemon $DAEMON $OPTIONS
++	echo -n $"Starting $prog: "
++	daemon $prog -c $configfile
 +	RETVAL=$?
 +        echo
++	[ $RETVAL -eq 0 ] && touch $lockfile
++	return $RETVAL
  	;;
    stop)
 -	log_daemon_msg "Stopping $DESC" "$NAME"
-+	echo -n $"Stopping $DESC $NAME :"
- 	killproc $DAEMON
+-	killproc $DAEMON
 -	log_end_msg $?
+-	;;
+-  restart|reload|force-reload)
+-	$0 stop
+-	sleep 1
+-	$0 start
++	echo -n $"Shutting down $prog: "
++	killproc $prog
 +	RETVAL=$?
 +        echo
- 	;;
-   restart|reload|force-reload)
- 	$0 stop
- 	sleep 1
-+        RETVAL=0
- 	$0 start
++	[ $RETVAL -eq 0 ] && rm -f $lockfile
++	return $RETVAL
++	;;
++  status)
++	status $prog
++	;;
++  restart|force-reload)
++	stop
++	start
++	;;
++  try-restart|condrestart)
++	if [ -f $lockfile ]; then
++	    stop
++	    start
++	fi
++	;;
++  reload)
++	exit 3
  	;;
    *)
 -	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-+	echo $"Usage: $0 {start|stop|restart|reload|force-reload}" >&2
++	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
  	exit 2
- 	;;
+-	;;
  esac
  
 -exit 0


Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/F-10/lcdproc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lcdproc.spec	7 Nov 2008 17:53:40 -0000	1.8
+++ lcdproc.spec	26 Apr 2009 09:10:06 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
 Name:           lcdproc
 Version:        0.5.2
-Release:        7%{?dist}
+Release:        11%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries
@@ -9,15 +9,15 @@
 Patch0:         lcdproc-0.5.2-initscripts.patch
 Patch1:         lcdproc-0.5.2-memset_swp.patch
 Patch2:         lcdproc-0.5.2-imonlcd.patch
+Patch3:         lcdproc-0.5.2-novalidate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 
 # necessary for imonlcd patch
-BuildRequires:  automake
+BuildRequires:  libtool
 
-BuildRequires:  glibc-headers
 BuildRequires:  libusb-devel
 BuildRequires:  lirc-devel
 BuildRequires:  ncurses-devel
@@ -54,18 +54,20 @@
 
 %prep
 %setup -q
-#patch0 -p1 -b .initscripts
+%patch0 -p1 -b .initscripts
 %patch1 -p1 -b .memset_swp
 %patch2 -p1 -b .imonlcd
+%patch3 -p1 -b .novalidate
 chmod 644 server/drivers/timing.h
 
 sed -i -e 's|server/drivers|%{_libdir}/lcdproc|' LCDd.conf
 touch -r TODO LCDd.conf
 
 %build
-# run aclocal and automake to pick up the imon lcd additions
-aclocal
-automake
+# run autoreconf to pick up the imon lcd additions
+# liboolize to refresh libtool
+autoreconf -f -i
+libtoolize --force
 %configure \
   --sysconfdir=%{_sysconfdir}/sysconfig/%{name} \
   --enable-libusb \
@@ -77,21 +79,19 @@
   --enable-stat-smbfs \
   --with-lcdport=13666
 
-sed -i -e 's|-L/usr/lib|-L%{_libdir}|g' Makefile
-
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __doc
-make install DESTDIR=$RPM_BUILD_ROOT
-make install-html-guides DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install-html-guides DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Fix docs
 mkdir -p __doc/developer-guide
 mkdir -p __doc/user-guide
-install -m 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/user-guide/*  __doc/user-guide
-install -m 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/developer-guide/*  __doc/developer-guide
+install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/user-guide/*  __doc/user-guide
+install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/developer-guide/*  __doc/developer-guide
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 # init
@@ -99,6 +99,15 @@
 install -pm 0755 scripts/init-LCDd.LSB  $RPM_BUILD_ROOT%{_initrddir}/LCDd
 install -pm 0755 scripts/init-lcdproc.LSB  $RPM_BUILD_ROOT%{_initrddir}/lcdproc
 
+#Disable default configuration
+#Thoses are only provided as an example since ncurses isn't a suitable default configuration.
+for f in LCDd.conf lcdproc.conf ; do
+mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}.example
+touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}
+done
+
+
 
 
 %post
@@ -132,12 +141,28 @@
 %{_sbindir}/*
 %{_mandir}/man?/*
 %dir %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}/*.conf
+%ghost %{_sysconfdir}/sysconfig/%{name}/*.conf
+%config %{_sysconfdir}/sysconfig/%{name}/*.conf.example
 %{_initrddir}/LCDd
 %{_initrddir}/lcdproc
 
 
 %changelog
+* Tue Apr 14 2009 kwizart < kwizart at gmail.com > - 0.5.2-11
+- Disable xmlto validation (Fix FTBFS)
+- Disable default configuration (only provided as examples)
+
+* Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 0.5.2-10
+- Disable LCDd lcdproc initscript by default.
+  (It needs to be configured first).
+
+* Mon Mar  2 2009 kwizart < kwizart at gmail.com > - 0.5.2-9
+- re-enable patch0
+- Prevent some timestamps changes.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Nov 07 2008 Jarod Wilson <jarod at redhat.com> - 0.5.2-7
 - Add SoundGraph iMon and Antec Veris LCD device support
 - Replace start_daemon w/daemon in initscripts (#468611)



From kwizart at fedoraproject.org  Sun Apr 26 09:12:18 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 26 Apr 2009 09:12:18 +0000 (UTC)
Subject: rpms/lcdproc/F-9 import.log, NONE, 1.1 lcdproc-0.5.2-imonlcd.patch, 
	NONE, 1.1 lcdproc-0.5.2-initscripts.patch, NONE,
	1.1 lcdproc-0.5.2-novalidate.patch, NONE, 1.1 lcdproc.spec, 1.5,
	1.6 lcdproc-0.5.2-scripts.patch, 1.1, NONE
Message-ID: <20090426091218.DFFE270125@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/lcdproc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7476/F-9

Modified Files:
	lcdproc.spec 
Added Files:
	import.log lcdproc-0.5.2-imonlcd.patch 
	lcdproc-0.5.2-initscripts.patch lcdproc-0.5.2-novalidate.patch 
Removed Files:
	lcdproc-0.5.2-scripts.patch 
Log Message:
Backport some fixes



--- NEW FILE import.log ---
lcdproc-0_5_2-11_fc12:F-9:lcdproc-0.5.2-11.fc12.src.rpm:1240737065

lcdproc-0.5.2-imonlcd.patch:

--- NEW FILE lcdproc-0.5.2-imonlcd.patch ---
diff -Naurp lcdproc-0.5.2/acinclude.m4 lcdproc-0.5.2.imonlcd/acinclude.m4
--- lcdproc-0.5.2/acinclude.m4	2007-04-14 10:39:28.000000000 -0400
+++ lcdproc-0.5.2.imonlcd/acinclude.m4	2008-11-07 10:31:38.374066457 -0500
@@ -6,7 +6,7 @@ AC_ARG_ENABLE(drivers,
 	[                  which is a comma-separated list of drivers.]
 	[                  Possible drivers are:]
 	[                    bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,]
-	[                    EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,]
+	[                    EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,imonlcd,imonlcd2,IOWarrior,]
 	[                    irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,]
 	[                    mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330]
 	[                    sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,]
@@ -16,7 +16,7 @@ AC_ARG_ENABLE(drivers,
 	drivers="$enableval",
 	drivers=[bayrad,CFontz,CFontz633,curses,CwLnx,glk,lb216,lcdm001,MtxOrb,pyramid,text])
 
-allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd]
+allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,imonlcd,imonlcd2,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd]
 
 drivers=`echo $drivers | sed -e 's/,/ /g'`
 
@@ -207,6 +207,14 @@ dnl			else
 			DRIVERS="$DRIVERS imon${SO}"
 			actdrivers=["$actdrivers imon"]
 			;;
+		imonlcd)
+			DRIVERS="$DRIVERS imonlcd${SO}"
+			actdrivers=["$actdrivers imonlcd"]
+			;;
+		imonlcd2)
+			DRIVERS="$DRIVERS imonlcd2${SO}"
+			actdrivers=["$actdrivers imonlcd2"]
+			;;
 		IOWarrior)
 			if test "$enable_libusb" = yes ; then
 				DRIVERS="$DRIVERS IOWarrior${SO}"
diff -Naurp lcdproc-0.5.2/server/drivers/imonlcd2.c lcdproc-0.5.2.imonlcd/server/drivers/imonlcd2.c
--- lcdproc-0.5.2/server/drivers/imonlcd2.c	1969-12-31 19:00:00.000000000 -0500
+++ lcdproc-0.5.2.imonlcd/server/drivers/imonlcd2.c	2008-11-07 10:39:57.741816312 -0500
@@ -0,0 +1,1347 @@
+/**
+ * Driver for SoundGraph iMON OEM (and others) LCD Module, newer version
+ *
+ * In order to be able to use it, you have to install the lirc_imon
+ * kernel module for LIRC (http://www.lirc.org)
+ *
+ * Copyright (c) 2007, Dean Harding <dean at codeka.com>, but (heavily :p)
+ * on the work of Venky Raju.
+ * Vastly (hopefully) improved by Christian Leuschen <christian.leuschenATgmx.de>.
+ *
+ * This source code is being released under the GPL.
+ * Please see the file COPYING in this package for details.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <termios.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <stdint.h>
+#include <math.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "lcd.h"
+#include "lcd_lib.h"
+#include "shared/debug.h"
+//#define DEBUG
+#include "report.h"
+
+
+#include "imonlcd.h"
+
+#define DEFAULT_DEVICE    "/dev/lcd0"
+#define DEFAULT_SIZE      "96x16"        // This is the size in "pixels"...
+#define DEFAULT_CONTRAST  "625"
+#define DEFAULT_BACKLIGHT "1"            // default: turn backlight on
+#define DEFAULT_DISCMODE  "0"            // default: spin the "slim" disc
+
+#define LCD_DEFAULT_CELL_WIDTH    6
+#define LCD_DEFAULT_CELL_HEIGHT   8
+
+#define ON_EXIT_SHOWMSG      0    // Do nothing -- just leave the "shutdown" message there
+#define ON_EXIT_SHOWCLOCK    1    // Show the big clock
+#define ON_EXIT_BLANKSCREEN  2    // Blank the device completely
+
+#define DEFAULT_ON_EXIT        "1"
+
+// Vars for the server core
+MODULE_EXPORT char *api_version = API_VERSION;
+MODULE_EXPORT int stay_in_foreground = 0;
+MODULE_EXPORT int supports_multiple = 0;
+MODULE_EXPORT char *symbol_prefix = "imonlcd_";
+
+// Our private data
+typedef struct {
+    char info[255];
+    int imon_fd;
+    unsigned char *framebuf;
+    int height;
+    int width;
+    int cellwidth;
+    int cellheight;
+    int on_exit;
+    int contrast;      // 0 = lowest contrast, 1000 = highest
+    int backlightOn;   // stores the backlight state
+    int discMode;      // 0 = two disc-segments spinning as default,
+                       // 1 = their complement spinning
+
+    /*
+     * Here we record the last "state" of the CD icon so that we can "animate" it.
+     */
+    int last_cd_state;
+    time_t last_cd_state_change;
+    uint64_t last_icon_state;
+    int lastPrivateIconState; // remind the last state for setting the icons
+} PrivateData;
+
+/**
+ * Just for convenience and to have the commands at one place.
+ */
+#define COMMANDS_SET_ICONS      (uint64_t) 0x0100000000000000
+#define COMMANDS_SET_CONTRAST   (uint64_t) 0x0300000000000000
+#define COMMANDS_DISPLAY        (uint64_t) 0x8800000000000000
+#define COMMANDS_SHUTDOWN       (uint64_t) 0x8800000000000008
+#define COMMANDS_DISPLAY_ON     (uint64_t) 0x8800000000000040
+#define COMMANDS_CLEAR_ALARM    (uint64_t) 0x8a00000000000000
+#define COMMANDS_SET_LINES0     (uint64_t) 0x1000000000000000
+#define COMMANDS_SET_LINES1     (uint64_t) 0x1100000000000000
+#define COMMANDS_SET_LINES2     (uint64_t) 0x1200000000000000
+
+/*
+ * These are used with the imon_output function to determine which icons to turn on/off. Because we
+ * only get a 32-bit integer to play, some of the icons are grouped into "sets" from which you can
+ * only select to turn one on at a time.
+ */
+#define IMON_OUTPUT_CD_MASK         0x00000001
+#define IMON_OUTPUT_TOPROW_MASK     0x0000000E
+#define IMON_OUTPUT_SPEAKER_MASK    0x00000030
+#define IMON_OUTPUT_SPDIF_MASK      0x00000040
+#define IMON_OUTPUT_SRC_MASK        0x00000080
+#define IMON_OUTPUT_FIT_MASK        0x00000100
+#define IMON_OUTPUT_TV_MASK         0x00000200
+#define IMON_OUTPUT_HDTV_MASK       0x00000400
+#define IMON_OUTPUT_SCR1_MASK       0x00000800
+#define IMON_OUTPUT_SCR2_MASK       0x00001000
+#define IMON_OUTPUT_BRICONS_MASK    0x0000E000
+#define IMON_OUTPUT_BMICONS_MASK    0x00070000
+#define IMON_OUTPUT_BLICONS_MASK    0x00380000
+#define IMON_OUTPUT_VOL_MASK        0x00400000
+#define IMON_OUTPUT_TIME_MASK       0x00800000
+#define IMON_OUTPUT_ALARM_MASK      0x01000000
+#define IMON_OUTPUT_REC_MASK        0x02000000
+#define IMON_OUTPUT_REP_MASK        0x04000000
+#define IMON_OUTPUT_SFL_MASK        0x08000000
+
+#define IMON_OUTPUT_PBARS_MASK      0x10000000
+#define IMON_OUTPUT_DISK_IN_MASK    0x20000000
+
+
+#define IMON_ICON_ALL      (uint64_t) 0x00FFFFFFFFFFFFFF
+//Byte 6
+#define IMON_ICON_DISK_OFF (uint64_t) 0x7F7000FFFFFFFFFF
+#define IMON_ICON_DISK_ON  (uint64_t) 0x0080FF0000000000
+
+#define IMON_ICON_DISK_IN  (uint64_t) 0x0080000000000000
+#define IMON_ICON_CD_IN    (uint64_t) 0x00806B0000000000
+#define IMON_ICON_DVD_IN   (uint64_t) 0x0080550000000000
+
+// Byte 5
+#define IMON_ICON_WMA2    ((uint64_t) 0x1 << 39)
+#define IMON_ICON_WAV     ((uint64_t) 0x1 << 38)
+#define IMON_ICON_REP     ((uint64_t) 0x1 << 37)
+#define IMON_ICON_SFL     ((uint64_t) 0x1 << 36)
+#define IMON_ICON_ALARM   ((uint64_t) 0x1 << 35)
+#define IMON_ICON_REC     ((uint64_t) 0x1 << 34)
+#define IMON_ICON_VOL     ((uint64_t) 0x1 << 33)
+#define IMON_ICON_TIME    ((uint64_t) 0x1 << 32)
+// Byte 4
+#define IMON_ICON_XVID    ((uint64_t) 0x1 << 31)
+#define IMON_ICON_WMV     ((uint64_t) 0x1 << 30)
+#define IMON_ICON_MPG2    ((uint64_t) 0x1 << 29)
+#define IMON_ICON_AC3     ((uint64_t) 0x1 << 28)
+#define IMON_ICON_DTS     ((uint64_t) 0x1 << 27)
+#define IMON_ICON_WMA     ((uint64_t) 0x1 << 26)
+#define IMON_ICON_MP3     ((uint64_t) 0x1 << 25)
+#define IMON_ICON_OGG     ((uint64_t) 0x1 << 24)
+
+//Byte 3
+#define IMON_ICON_SRC     ((uint64_t) 0x1 << 23)
+#define IMON_ICON_FIT     ((uint64_t) 0x1 << 22)
+#define IMON_ICON_TV_2    ((uint64_t) 0x1 << 21)
+#define IMON_ICON_HDTV    ((uint64_t) 0x1 << 20)
[...2460 lines suppressed...]
+ */
+static void setLineLength( int topLine, int botLine, int topProgress, int botProgress, int fd )
+{
+    setBuiltinProgressBars( lengthToPixels( topLine ),
+            lengthToPixels( botLine ),
+            lengthToPixels( topProgress ),
+            lengthToPixels( botProgress ),
+            fd
+    );
+}
+
+/**
+ * Sets the length of the built-in progress-bars and lines.
+ * Values from -32 to 32 are allowed. Positive values indicate that bars extend
+ * from left to right, negative values indicate that the run from right to left.
+ *   
+ * \param topLine
+ * \param botLine
+ * \param topProgress
+ * \param botProgress
+ * \param fd A file descriptor pointing to the /dev/lcd* file that we write to.
+ */
+static void setBuiltinProgressBars( int topLine, int botLine,
+        int topProgress, int botProgress, int fd )
+{
+    // Least sig. bit is on the right
+    uint64_t data;
+
+    data = ( (uint64_t) topProgress ) << 8 * 4;
+    data |= (uint64_t) topLine & 0x00000000FFFFFFFF;
+    data &= 0x00FFFFFFFFFFFFFF;
+    send_command_data( COMMANDS_SET_LINES0 | data, fd );
+
+    data = ( ( (uint64_t) topProgress ) >> 8 * 3 ) & 0x00000000000000FF;
+    data |= ( ( (uint64_t) botProgress ) << 8 )    & 0x000000FFFFFFFF00;
+    data |= ( ( (uint64_t) botLine ) << 8 * 5 )    & 0x00FFFF0000000000;
+    send_command_data( COMMANDS_SET_LINES1 | data, fd );
+
+    data = ( (uint64_t) botLine ) >> 8 * 2;
+    send_command_data( COMMANDS_SET_LINES2 | data, fd );
+}
+
+/**
+ * Maps values to corresponding pixmaps for the built-in progress bars.
+ * Values from -32 to 32 are allowed. Positive values indicate that bars extend
+ * from left to right, negative values indicate that they run from right to left.
+ * 
+ * \param length The length of the bar.
+ * \return The pixmap that represents the given length. 
+ * 
+ */ 
+static int lengthToPixels( int length )
+{           
+    int pixLen[] =
+    {           
+            0x00, 0x00000080, 0x000000c0, 0x000000e0, 0x000000f0,
+            0x000000f8, 0x000000fc, 0x000000fe, 0x000000ff,
+            0x000080ff, 0x0000c0ff, 0x0000e0ff, 0x0000f0ff,
+            0x0000f8ff, 0x0000fcff, 0x0000feff, 0x0000ffff,
+            0x0080ffff, 0x00c0ffff, 0x00e0ffff, 0x00f0ffff,
+            0x00f8ffff, 0x00fcffff, 0x00feffff, 0x00ffffff,
+            0x80ffffff, 0xc0ffffff, 0xe0ffffff, 0xf0ffffff,
+            0xf8ffffff, 0xfcffffff, 0xfeffffff, 0xffffffff
+    };
+
+    if ( abs( length ) > 32 )
+    {
+        return (0);
+    }
+    if ( length >= 0 )
+    {
+        return pixLen[ length ];
+    }
+    else
+    {
+        return ( pixLen[ 32 + length ] ^ 0xffffffff );
+    }
+}
+
+// EOF
+
diff -Naurp lcdproc-0.5.2/server/drivers/imonlcd.h lcdproc-0.5.2.imonlcd/server/drivers/imonlcd.h
--- lcdproc-0.5.2/server/drivers/imonlcd.h	1969-12-31 19:00:00.000000000 -0500
+++ lcdproc-0.5.2.imonlcd/server/drivers/imonlcd.h	2008-11-07 10:30:16.286851426 -0500
@@ -0,0 +1,49 @@
+/**
+ * Driver for SoundGraph iMON OEM (and others) LCD Module
+ *
+ * In order to be able to use it, you have to install the lirc_imonlcd
+ * kernel module for LIRC (http://www.lirc.org) -- until that module is
+ * available in the main LIRC branch, you can get a patch for it from
+ * the same place you got this patch.
+ *
+ * Copyright (c) 2007, Dean Harding <dean at codeka.com>, but (heavily :p)
+ * on the work of Venky Raju.
+ *
+ * This source code is being released under the GPL.
+ * Please see the file COPYING in this package for details.
+ *
+ */
+
+#ifndef IMONLCD_H
+#define IMONLCD_H
+
+#include "lcd.h"
+
+MODULE_EXPORT int  imonlcd_init (Driver *drvthis);
+MODULE_EXPORT void imonlcd_close (Driver *drvthis);
+MODULE_EXPORT int  imonlcd_width (Driver *drvthis);
+MODULE_EXPORT int  imonlcd_height (Driver *drvthis);
+MODULE_EXPORT int  imonlcd_cellwidth (Driver *drvthis);
+MODULE_EXPORT int  imonlcd_cellheight (Driver *drvthis);
+MODULE_EXPORT void imonlcd_clear (Driver *drvthis);
+MODULE_EXPORT void imonlcd_flush (Driver *drvthis);
+MODULE_EXPORT void imonlcd_string (Driver *drvthis, int x, int y, const char string[]);
+MODULE_EXPORT void imonlcd_chr (Driver *drvthis, int x, int y, char c);
+MODULE_EXPORT const char *imonlcd_get_info (Driver *drvthis);
+MODULE_EXPORT void imonlcd_vbar (Driver *drvthis, int x, int y, int len, int promille, int options);
+MODULE_EXPORT void imonlcd_hbar (Driver *drvthis, int x, int y, int len, int promille, int options);
+MODULE_EXPORT void imonlcd_num (Driver *drvthis, int x, int num);
+MODULE_EXPORT void imonlcd_output (Driver *drvthis, int state);
+MODULE_EXPORT int  imonlcd_set_contrast (Driver *drvthis, int promille);
+MODULE_EXPORT int  imonlcd_get_contrast (Driver *drvthis);
+MODULE_EXPORT void imonlcd_backlight(Driver *drvthis, int on);
+
+/**
+ * These are not supported by the iMON LCD module
+ */
+//MODULE_EXPORT int  imonlcd_get_free_chars (Driver *drvthis);
+//MODULE_EXPORT void imonlcd_set_char (Driver *drvthis, int n, char *dat);
+//MODULE_EXPORT int  imonlcd_icon (Driver *drvthis, int x, int y, int icon);
+
+#endif
+
diff -Naurp lcdproc-0.5.2/server/drivers/Makefile.am lcdproc-0.5.2.imonlcd/server/drivers/Makefile.am
--- lcdproc-0.5.2/server/drivers/Makefile.am	2007-04-14 10:39:53.000000000 -0400
+++ lcdproc-0.5.2.imonlcd/server/drivers/Makefile.am	2008-11-07 10:32:58.927066724 -0500
@@ -19,7 +19,7 @@ AM_LDFLAGS = @LDSHARED@
 #LIBS =
 
 pkglib_PROGRAMS = @DRIVERS@
-EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD stv5730 svga t6963 text tyan sli ula200 xosd
+EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd imonlcd2 IOWarrior irman joy lb216 lcdm001 lcterm lirc MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD stv5730 svga t6963 text tyan sli ula200 xosd
 noinst_LIBRARIES = libLCD.a libbignum.a
 
 IOWarrior_CFLAGS =   @libusb_cflags@ $(AM_CFLAGS)
@@ -37,6 +37,8 @@ hd44780_LDADD =      libLCD.a @HD44780_D
 hd44780_DEPENDENCIES = @HD44780_DRIVERS@
 icp_a106_LDADD =     libLCD.a
 imon_LDADD =         libLCD.a
+imonlcd_LDADD =      libLCD.a
+imonlcd2_LDADD =      libLCD.a
 IOWarrior_LDADD =    @libusb_libs@ libLCD.a libbignum.a
 irman_LDADD =        @LIBIRMAN@
 lcterm_LDADD =       libLCD.a
@@ -75,6 +77,8 @@ EXTRA_hd44780_SOURCES = hd44780-4bit.c h
 
 icp_a106_SOURCES =   lcd.h lcd_lib.h icp_a106.c icp_a106.h report.h
 imon_SOURCES =       lcd.h lcd_lib.h imon.h imon.c report.h
+imonlcd_SOURCES =    lcd.h lcd_lib.h imonlcd.h imonlcd.c report.h
+imonlcd2_SOURCES =    lcd.h lcd_lib.h imonlcd.h imonlcd2.c report.h
 IOWarrior_SOURCES =  lcd.h lcd_lib.h hd44780-charmap.h IOWarrior.c IOWarrior.h report.h adv_bignum.h
 irman_SOURCES =      lcd.h irmanin.c irmanin.h report.h
 joy_SOURCES =        lcd.h joy.c joy.h port.h report.h
--- lcdproc-0.5.2/LCDd.conf	2007-04-14 10:41:51.000000000 -0400
+++ lcdproc-0.5.2.imonlcd/LCDd.conf	2008-11-07 12:01:18.193816869 -0500
@@ -37,7 +37,7 @@
 #
 # The following drivers are supported:
 #   bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, ea65, 
-#   EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior,
+#   EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, imonlcd, imonlcd2, IOWarrior,
 #   irman, joy, lb216, lcdm001, lcterm, lirc, MD8800, ms6931, mtc_s16209x,
 #   MtxOrb, NoritakeVFD, picolcd, pyramid, sed1330, sed1520, serialPOS,
 #   serialVFD, sli, stv5730, svga, t6963, text, tyan, ula200, xosd
@@ -508,7 +508,7 @@ Size=20x4
 
 
 
-## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
+## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON VFD driver ##
 [imon]
 
 # select the device to use
@@ -517,6 +517,15 @@ Device=/dev/lcd0
 # display dimensions
 Size=16x2
 
+## Soundgraph first-gen lcd device ##
+[imonlcd]
+Device=/dev/lcd0
+Contrast=200
+
+## Soundgraph second-gen lcd device ##
+[imonlcd2]
+Device=/dev/lcd0
+Contrast=200
 
 
 ## IrMan driver ##

lcdproc-0.5.2-initscripts.patch:

--- NEW FILE lcdproc-0.5.2-initscripts.patch ---
diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/scripts/init-LCDd.LSB.in
--- lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
+++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-04-14 16:15:46.000000000 +0200
@@ -1,10 +1,18 @@
 #! /bin/sh
+#
+# chkconfig: - 70 21
+# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \
+#	Apart from the main client lcdproc(1) there are various clients. \
+#	See http://lcdproc.omnipotent.net for details.
+# processname: LCDd
+#
+# config: /etc/sysconfig/lcdproc/LCDd.conf
 
-#### BEGIN INIT INFO
+### BEGIN INIT INFO
 # Provides:          LCDd
 # Required-Start:    $syslog $local_fs $network $remote_fs
 # Required-Stop:     $syslog $local_fs $network $remote_fs
-# Default-Start:     2 3 4 5
+# Default-Start:     
 # Default-Stop:      S 0 1 6
 # Short-Description: LCDproc Server Daemon
 # Description:       LSB init script for LCDd, the display
@@ -12,57 +20,62 @@
 ### END INIT INFO
 
 
-# local variables
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-etc=@sysconfdir@
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=LCDd
-DAEMON=${sbindir}/$NAME
-DESC="LCDproc display server daemon"
-DEFAULTS=/etc/default/$NAME
-START=yes
-
-# Source defaults file; edit that file to configure this script.
-if [ -e "${DEFAULTS}" ]; then
-  . "${DEFAULTS}"
-fi
+prog=LCDd
+lockfile=/var/lock/subsys/$prog
+configfile=@sysconfdir@/$prog.conf
+RETVAL=0
+
 
-# If we're not to start the daemon, simply exit
-if [ "${START}" != "yes" ]; then
-    exit 0
+# load LSB 3.x init functions
+if [ -e /lib/lsb/init-functions ]; then
+  . /lib/lsb/init-functions
 fi
 
-# installation check
-test -x $DAEMON || exit 5
+# Source function library.
+if [ -e /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+fi
 
-# load LSB 3.x init functions
-. /lib/lsb/init-functions
+# check that non-default config file exists.
+ [ -f $configfile ] || exit 6
 
 
 case "$1" in
   start)
-	log_daemon_msg "Starting $DESC" "$NAME"
-	start_daemon $DAEMON $OPTIONS
-	log_end_msg $?
+	echo -n $"Starting $prog: "
+	daemon $prog -c $configfile
+	RETVAL=$?
+        echo
+	[ $RETVAL -eq 0 ] && touch $lockfile
+	return $RETVAL
 	;;
   stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	killproc $DAEMON
-	log_end_msg $?
-	;;
-  restart|reload|force-reload)
-	$0 stop
-	sleep 1
-	$0 start
+	echo -n $"Shutting down $prog: "
+	killproc $prog
+	RETVAL=$?
+        echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
+	;;
+  status)
+	status $prog
+	;;
+  restart|force-reload)
+	stop
+	start
+	;;
+  try-restart|condrestart)
+	if [ -f $lockfile ]; then
+	    stop
+	    start
+	fi
+	;;
+  reload)
+	exit 3
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
 	exit 2
-	;;
 esac
 
-exit 0
+exit $RETVAL
diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scripts/init-lcdproc.LSB.in
--- lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
+++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-04-14 16:16:19.000000000 +0200
@@ -1,10 +1,19 @@
 #! /bin/sh
+#
+# chkconfig: - 71 20
+# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \
+#	Apart from the main client lcdproc(1) there are various clients. \
+#	See http://lcdproc.omnipotent.net for details.
+# processname: lcdproc
+#
+# config: /etc/sysconfig/lcdproc/lcdproc.conf
 
-#### BEGIN INIT INFO
+### BEGIN INIT INFO
 # Provides:          lcdproc
 # Required-Start:    $syslog $local_fs $network $remote_fs
 # Required-Stop:     $syslog $local_fs $network $remote_fs
-# Default-Start:     2 3 4 5
+# Should-Start:      LCDd
+# Default-Start:     
 # Default-Stop:      S 0 1 6
 # Short-Description: LCDproc system status information viewer
 # Description:       LSB init script for lcdproc, the system
@@ -12,57 +21,60 @@
 ### END INIT INFO
 
 
-# local variables
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-etc=@sysconfdir@
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=lcdproc
-DAEMON=${bindir}/$NAME
-DESC="LCDproc system status monitor"
-DEFAULTS=/etc/default/$NAME
-START=yes
-
-# Source defaults file; edit that file to configure this script.
-if [ -e "${DEFAULTS}" ]; then
-  . "${DEFAULTS}"
-fi
+prog=lcdproc
+lockfile=/var/lock/subsys/$prog
+configfile=@sysconfdir@/$prog.conf
+RETVAL=0
 
-# If we're not to start the daemon, simply exit
-if [ "${START}" != "yes" ]; then
-    exit 0
+# load LSB 3.x init functions
+if [ -e /lib/lsb/init-functions ]; then
+  . /lib/lsb/init-functions
 fi
 
-# installation check
-test -x $DAEMON || exit 5
-
-# load LSB 3.x init functions
-. /lib/lsb/init-functions
+# Source function library.
+if [ -e /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+fi
 
+# check that non-default config file exists.
+ [ -f $configfile ] || exit 6
 
 case "$1" in
   start)
-	log_daemon_msg "Starting $DESC" "$NAME"
-	start_daemon $DAEMON $OPTIONS
-	log_end_msg $?
+	echo -n $"Starting $prog: "
+	daemon $prog -c $configfile
+	RETVAL=$?
+        echo
+	[ $RETVAL -eq 0 ] && touch $lockfile
+	return $RETVAL
 	;;
   stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	killproc $DAEMON
-	log_end_msg $?
-	;;
-  restart|reload|force-reload)
-	$0 stop
-	sleep 1
-	$0 start
+	echo -n $"Shutting down $prog: "
+	killproc $prog
+	RETVAL=$?
+        echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
+	;;
+  status)
+	status $prog
+	;;
+  restart|force-reload)
+	stop
+	start
+	;;
+  try-restart|condrestart)
+	if [ -f $lockfile ]; then
+	    stop
+	    start
+	fi
+	;;
+  reload)
+	exit 3
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
 	exit 2
-	;;
 esac
 
-exit 0
+exit $RETVAL

lcdproc-0.5.2-novalidate.patch:

--- NEW FILE lcdproc-0.5.2-novalidate.patch ---
diff -up lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate	2007-04-14 16:39:53.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am	2009-04-14 15:28:01.000000000 +0200
@@ -18,6 +18,6 @@ developerguidedir = $(DESTDIR)$(htmldir)
 
 install-html-developerguide: $(xmlto) lcdproc-dev.docbook
 	$(mkinstalldirs) $(developerguidedir)
-	$(xmlto) html -o $(developerguidedir) lcdproc-dev.docbook
+	$(xmlto) html -o $(developerguidedir) --skip-validation lcdproc-dev.docbook
 
 ## EOF
diff -up lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-user/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate	2009-04-14 15:32:24.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-user/Makefile.am	2009-04-14 15:32:44.000000000 +0200
@@ -21,6 +21,6 @@ userguidedir = $(DESTDIR)$(htmldir)/user
 
 install-html-userguide: $(xmlto) lcdproc-user.docbook
 	$(mkinstalldirs) $(userguidedir)
-	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
+	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
 
 ## EOF


Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/F-9/lcdproc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lcdproc.spec	9 Feb 2008 15:24:00 -0000	1.5
+++ lcdproc.spec	26 Apr 2009 09:11:48 -0000	1.6
@@ -1,19 +1,23 @@
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
-Name:           lcdproc	
+Name:           lcdproc
 Version:        0.5.2
-Release:        4%{?dist}
+Release:        11%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
-Group:          System Environment/Libraries	
+Group:          System Environment/Libraries
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         lcdproc-0.5.2-scripts.patch
+Patch0:         lcdproc-0.5.2-initscripts.patch
 Patch1:         lcdproc-0.5.2-memset_swp.patch
+Patch2:         lcdproc-0.5.2-imonlcd.patch
+Patch3:         lcdproc-0.5.2-novalidate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 
-BuildRequires:  glibc-headers
+# necessary for imonlcd patch
+BuildRequires:  libtool
+
 BuildRequires:  libusb-devel
 BuildRequires:  lirc-devel
 BuildRequires:  ncurses-devel
@@ -21,6 +25,9 @@
 BuildRequires:  openldap-devel
 BuildRequires:  pth-devel
 BuildRequires:  xmlto
+%if 0%{?fedora} > 9
+BuildRequires:  docbook-dtds
+%endif
 BuildRequires:  xosd-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
@@ -37,22 +44,30 @@
 %description
 LCDproc is a client/server suite inclduding drivers for all
 kinds of nifty LCD displays. The server supports several
-serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, 
-LCDM001 (kernelconcepts.de), Wirz-SLI and PIC-an-LCD; and some 
-devices connected to the LPT port: HD44780, STV5730, T6963, 
-SED1520 and SED1330. Various clients are available that display 
-things like CPU load, system load, memory usage, uptime, and a lot more. 
-See also http://lcdproc.omnipotent.net. 
+serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216,
+LCDM001 (kernelconcepts.de), Wirz-SLI and PIC-an-LCD; and some
+devices connected to the LPT port: HD44780, STV5730, T6963,
+SED1520 and SED1330. Various clients are available that display
+things like CPU load, system load, memory usage, uptime, and a lot more.
+See also http://lcdproc.omnipotent.net.
 
 
 %prep
 %setup -q
 %patch0 -p1 -b .initscripts
 %patch1 -p1 -b .memset_swp
+%patch2 -p1 -b .imonlcd
+%patch3 -p1 -b .novalidate
 chmod 644 server/drivers/timing.h
 
+sed -i -e 's|server/drivers|%{_libdir}/lcdproc|' LCDd.conf
+touch -r TODO LCDd.conf
 
 %build
+# run autoreconf to pick up the imon lcd additions
+# liboolize to refresh libtool
+autoreconf -f -i
+libtoolize --force
 %configure \
   --sysconfdir=%{_sysconfdir}/sysconfig/%{name} \
   --enable-libusb \
@@ -64,34 +79,41 @@
   --enable-stat-smbfs \
   --with-lcdport=13666
 
-sed -i -e 's|-L/usr/lib|-L%{_libdir}|g' Makefile
-  
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __doc
-make install DESTDIR=$RPM_BUILD_ROOT
-make install-html-guides DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install-html-guides DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Fix docs
 mkdir -p __doc/developer-guide
 mkdir -p __doc/user-guide
-install -m 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/user-guide/*  __doc/user-guide
-install -m 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/developer-guide/*  __doc/developer-guide
+install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/user-guide/*  __doc/user-guide
+install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/developer-guide/*  __doc/developer-guide
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 # init
 install -d $RPM_BUILD_ROOT%{_initrddir}
-install -pm 0755 scripts/init-LCDd.rpm  $RPM_BUILD_ROOT%{_initrddir}/LCDd
-install -pm 0755 scripts/init-lcdproc.rpm  $RPM_BUILD_ROOT%{_initrddir}/lcdproc
+install -pm 0755 scripts/init-LCDd.LSB  $RPM_BUILD_ROOT%{_initrddir}/LCDd
+install -pm 0755 scripts/init-lcdproc.LSB  $RPM_BUILD_ROOT%{_initrddir}/lcdproc
+
+#Disable default configuration
+#Thoses are only provided as an example since ncurses isn't a suitable default configuration.
+for f in LCDd.conf lcdproc.conf ; do
+mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}.example
+touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}
+done
+
 
 
 
 %post
 if [ $1 -eq 1 ]; then
 # Add init script but don't start it
-  /sbin/chkconfig --add LCDd 
+  /sbin/chkconfig --add LCDd
   /sbin/chkconfig --add lcdproc ||:
 fi
 
@@ -119,12 +141,39 @@
 %{_sbindir}/*
 %{_mandir}/man?/*
 %dir %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}/*.conf
+%ghost %{_sysconfdir}/sysconfig/%{name}/*.conf
+%config %{_sysconfdir}/sysconfig/%{name}/*.conf.example
 %{_initrddir}/LCDd
 %{_initrddir}/lcdproc
 
 
 %changelog
+* Tue Apr 14 2009 kwizart < kwizart at gmail.com > - 0.5.2-11
+- Disable xmlto validation (Fix FTBFS)
+- Disable default configuration (only provided as examples)
+
+* Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 0.5.2-10
+- Disable LCDd lcdproc initscript by default.
+  (It needs to be configured first).
+
+* Mon Mar  2 2009 kwizart < kwizart at gmail.com > - 0.5.2-9
+- re-enable patch0
+- Prevent some timestamps changes.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Nov 07 2008 Jarod Wilson <jarod at redhat.com> - 0.5.2-7
+- Add SoundGraph iMon and Antec Veris LCD device support
+- Replace start_daemon w/daemon in initscripts (#468611)
+
+* Tue Jul  8 2008 kwizart < kwizart at gmail.com > - 0.5.2-6
+- Add BR on Fedora > 9 : docbook-dtds
+
+* Tue Jul  8 2008 kwizart < kwizart at gmail.com > - 0.5.2-5
+- Fix RETVAL for LSB compliant initscripts - #246971
+- Fix Default driver path - #454194
+
 * Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 0.5.2-4
 - Rebuild for gcc43
 
@@ -134,7 +183,7 @@
 * Sun Aug 12 2007 kwizart < kwizart at gmail.com > 0.5.2-2
 - Fix memset swap from djones advice
 - License is GPLv2
-- Fix #246971 
+- Fix #246971
 
 * Sat May 19 2007 kwizart < kwizart at gmail.com > 0.5.2-1
 - Update to 0.5.2


--- lcdproc-0.5.2-scripts.patch DELETED ---



From leigh123linux at fedoraproject.org  Sun Apr 26 09:49:53 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 26 Apr 2009 09:49:53 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.5, 1.6 qbittorrent.spec, 1.11, 
	1.12 sources, 1.5, 1.6
Message-ID: <20090426094953.8F08270125@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13463

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
Update to latest svn build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Apr 2009 19:09:08 -0000	1.5
+++ .cvsignore	26 Apr 2009 09:49:21 -0000	1.6
@@ -1 +1 @@
-qbittorrent-1511bzr.tar.gz
+qbittorrent-2340svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qbittorrent.spec	25 Apr 2009 19:02:00 -0000	1.11
+++ qbittorrent.spec	26 Apr 2009 09:49:21 -0000	1.12
@@ -1,15 +1,16 @@
-%define bzr_rev 1511
+%define svn_rev 2340
+
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.3.3
-Release: 3.1.%{bzr_rev}bzr%{?dist}
+Release: 3.2.%{svn_rev}svn%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# bzr branch -r %{bzr_rev} lp:qbittorrent
-# rm -rf qbittorrent/.bzr*
-# tar -czvf qbittorrent-%{bzr_rev}bzr.tar.gz qbittorrent
-Source0:  %{name}-%{bzr_rev}bzr.tar.gz
+# svn checkout https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
+# rm -rf qbittorrent/.svn
+# tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
+Source0:  %{name}-%{svn_rev}svn.tar.gz
 #Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.2.2340svn
+- Fixes peference UI bug and splash screen  (launchpad 366957)
+
 * Sat Apr 25 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.1.1511bzr
 - Update to bzr 1511 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2009 19:09:08 -0000	1.5
+++ sources	26 Apr 2009 09:49:21 -0000	1.6
@@ -1 +1 @@
-cd87b89d11105d232460f3e86a7fdbe1  qbittorrent-1511bzr.tar.gz
+10a09a5bdf709ecc69ec9873b670a4d2  qbittorrent-2340svn.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 26 10:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 10:07:11 +0000
Subject: [pkgdb] mono had acl change status
Message-ID: <20090426100711.3930F10F895@bastion2.fedora.phx.redhat.com>

laxathom has set the watchbugzilla acl on mono (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Apr 26 10:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 10:07:05 +0000
Subject: [pkgdb] mono had acl change status
Message-ID: <20090426100705.B674210F881@bastion2.fedora.phx.redhat.com>

laxathom has set the watchcommits acl on mono (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From leigh123linux at fedoraproject.org  Sun Apr 26 10:40:03 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 26 Apr 2009 10:40:03 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.12,1.13
Message-ID: <20090426104003.D5EAF70125@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23245

Modified Files:
	qbittorrent.spec 
Log Message:
Fix command to generate tarball



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qbittorrent.spec	26 Apr 2009 09:49:21 -0000	1.12
+++ qbittorrent.spec	26 Apr 2009 10:39:57 -0000	1.13
@@ -4,10 +4,10 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.3.3
-Release: 3.2.%{svn_rev}svn%{?dist}
+Release: 3.3.%{svn_rev}svn%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn checkout https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
+# svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 Source0:  %{name}-%{svn_rev}svn.tar.gz
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.3.2340svn
+- Fix command to generate tarball
+
 * Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.2.2340svn
 - Fixes peference UI bug and splash screen  (launchpad 366957)
 



From twaugh at fedoraproject.org  Sun Apr 26 12:20:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sun, 26 Apr 2009 12:20:01 +0000 (UTC)
Subject: rpms/cups/F-10 cups-localhost-ipv6.patch, NONE, 1.1 cups.spec, 1.459,
	1.460
Message-ID: <20090426122001.5048770125@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27801

Modified Files:
	cups.spec 
Added Files:
	cups-localhost-ipv6.patch 
Log Message:
* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
- Accept "Host: ::1" (bug #497393).


cups-localhost-ipv6.patch:

--- NEW FILE cups-localhost-ipv6.patch ---
diff -up cups-1.3.10/scheduler/client.c.localhost-ipv6 cups-1.3.10/scheduler/client.c
--- cups-1.3.10/scheduler/client.c.localhost-ipv6	2009-04-24 18:13:29.000000000 +0100
+++ cups-1.3.10/scheduler/client.c	2009-04-26 12:40:49.000000000 +0100
@@ -5050,7 +5050,8 @@ valid_host(cupsd_client_t *con)		/* I - 
             !strcmp(host, "127.0.0.1") ||
 	    !strncmp(host, "127.0.0.1:", 10) ||
 	    !strcmp(host, "[::1]") ||
-	    !strncmp(host, "[::1]:", 6));
+	    !strncmp(host, "[::1]:", 6) ||
+	    !strcmp(host, "::1"));
   }
 
 #ifdef HAVE_DNSSD


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- cups.spec	24 Apr 2009 17:14:25 -0000	1.459
+++ cups.spec	26 Apr 2009 12:19:29 -0000	1.460
@@ -48,6 +48,7 @@
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2101.patch
 Patch24: cups-str2536.patch
+Patch25: cups-localhost-ipv6.patch
 Patch26: cups-str3023.patch
 Patch29: cups-str2831.patch
 Patch100: cups-lspp.patch
@@ -184,6 +185,7 @@
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2101
 %patch24 -p1 -b .str2536
+%patch25 -p1 -b .localhost-ipv6
 %patch26 -p1 -b .str3023
 %patch29 -p1 -b .str2831
 
@@ -478,7 +480,8 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Fri Apr 24 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
+* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
+- Accept "Host: ::1" (bug #497393).
 - Accept Host: fields set to the ServerName value (bug #497301).
 - Temporarily relax requirement to have printer-uri attribute in
   IPP-Get-Jobs request (bug #497519).



From twaugh at fedoraproject.org  Sun Apr 26 12:24:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sun, 26 Apr 2009 12:24:58 +0000 (UTC)
Subject: rpms/cups/F-9 cups-localhost-ipv6.patch, NONE, 1.1 cups.spec, 1.439,
	1.440
Message-ID: <20090426122458.4D76B70125@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28608

Modified Files:
	cups.spec 
Added Files:
	cups-localhost-ipv6.patch 
Log Message:
* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
- Accept "Host: ::1" (bug #497393).


cups-localhost-ipv6.patch:

--- NEW FILE cups-localhost-ipv6.patch ---
diff -up cups-1.3.10/scheduler/client.c.localhost-ipv6 cups-1.3.10/scheduler/client.c
--- cups-1.3.10/scheduler/client.c.localhost-ipv6	2009-04-16 20:32:04.000000000 +0100
+++ cups-1.3.10/scheduler/client.c	2009-04-26 13:19:58.000000000 +0100
@@ -4879,7 +4879,8 @@ valid_host(cupsd_client_t *con)		/* I - 
             !strcmp(host, "127.0.0.1") ||
 	    !strncmp(host, "127.0.0.1:", 10) ||
 	    !strcmp(host, "[::1]") ||
-	    !strncmp(host, "[::1]:", 6));
+	    !strncmp(host, "[::1]:", 6) ||
+	    !strcmp(host, "::1"));
   }
 
 #ifdef HAVE_DNSSD


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- cups.spec	24 Apr 2009 17:18:50 -0000	1.439
+++ cups.spec	26 Apr 2009 12:24:27 -0000	1.440
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 1%{?svn:.svn%{svn}}%{?dist}
+Release: 2%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -47,6 +47,7 @@
 Patch21: cups-usb-paperout.patch
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2536.patch
+Patch24: cups-localhost-ipv6.patch
 Patch25: cups-str3023.patch
 Patch28: cups-str2831.patch
 Patch100: cups-lspp.patch
@@ -167,6 +168,7 @@
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2536
+%patch24 -p1 -b .localhost-ipv6
 %patch25 -p1 -b .str3023
 %patch28 -p1 -b .str2831
 
@@ -449,7 +451,8 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Apr 24 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
+* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
+- Accept "Host: ::1" (bug #497393).
 - Accept Host: fields set to the ServerName value (bug #497301).
 - Temporarily relax requirement to have printer-uri attribute in
   IPP-Get-Jobs request (bug #497519).



From twaugh at fedoraproject.org  Sun Apr 26 12:56:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sun, 26 Apr 2009 12:56:00 +0000 (UTC)
Subject: rpms/cups/F-11 cups-CVE-2009-0164.patch, 1.1, 1.2 cups.spec, 1.471, 
	1.472
Message-ID: <20090426125600.9E19070125@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2337

Modified Files:
	cups-CVE-2009-0164.patch cups.spec 
Log Message:
* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.15
- Accept "Host: ::1" (bug #497393).
- Accept Host: fields set to the ServerName value (bug #497301).


cups-CVE-2009-0164.patch:

Index: cups-CVE-2009-0164.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-CVE-2009-0164.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-CVE-2009-0164.patch	17 Apr 2009 16:29:10 -0000	1.1
+++ cups-CVE-2009-0164.patch	26 Apr 2009 12:55:27 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164 cups-1.4b2-svn8404/CHANGES-1.3.txt
 --- cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/CHANGES-1.3.txt	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/CHANGES-1.3.txt	2009-04-26 13:22:11.000000000 +0100
 @@ -69,11 +69,6 @@ CHANGES IN CUPS V1.3.10
  	- The scheduler now rejects ATTR: messages with empty values.
  	- The scheduler could consume all CPU handling closed connections
@@ -15,7 +15,7 @@
  	- The Epson sample driver PPDs contained errors (STR #2979)
 diff -up cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http-addr.c
 --- cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/cups/http-addr.c	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/cups/http-addr.c	2009-04-26 13:22:11.000000000 +0100
 @@ -154,7 +154,7 @@ httpAddrLocalhost(
  #endif /* AF_LOCAL */
  
@@ -26,8 +26,8 @@
  
    return (0);
 diff -up cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http.c
---- cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/cups/http.c	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/cups/http.c	2009-04-26 13:22:11.000000000 +0100
 @@ -1842,18 +1842,35 @@ httpSetField(http_t       *http,	/* I - 
  
    strlcpy(http->fields[field], value, HTTP_MAX_VALUE);
@@ -71,7 +71,7 @@
  
 diff -up cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164 cups-1.4b2-svn8404/man/cupsd.conf.man.in
 --- cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/man/cupsd.conf.man.in	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/man/cupsd.conf.man.in	2009-04-26 13:22:11.000000000 +0100
 @@ -617,6 +617,11 @@ ServerAdmin user at domain.com
  .br
  Specifies the email address of the server administrator.
@@ -86,7 +86,7 @@
  Specifies the directory where backends, CGIs, daemons, and filters may
 diff -up cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/client.c
 --- cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-17 16:47:48.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-26 13:38:34.000000000 +0100
 @@ -39,6 +39,7 @@
   *   is_path_absolute()      - Is a path absolute and free of relative elements.
   *   make_certificate()      - Make a self-signed SSL/TLS certificate.
@@ -138,7 +138,7 @@
      {
        unlink(seedfile);
        return (0);
-@@ -4862,6 +4862,165 @@ pipe_command(cupsd_client_t *con,	/* I -
+@@ -4862,6 +4862,166 @@ pipe_command(cupsd_client_t *con,	/* I -
  
  
  /*
@@ -174,7 +174,8 @@
 +            !strcmp(host, "127.0.0.1") ||
 +	    !strncmp(host, "127.0.0.1:", 10) ||
 +	    !strcmp(host, "[::1]") ||
-+	    !strncmp(host, "[::1]:", 6));
++	    !strncmp(host, "[::1]:", 6) ||
++	    !strcmp(host, "::1"));
 +  }
 +
 +#ifdef HAVE_DNSSD
@@ -305,8 +306,8 @@
   */
  
 diff -up cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.c
---- cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-26 13:43:59.000000000 +0100
 @@ -14,13 +14,15 @@
   *
   * Contents:
@@ -411,58 +412,62 @@
      {
        cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get hostname: %s",
                        strerror(errno));
-@@ -684,6 +731,50 @@ cupsdReadConfiguration(void)
-     }
- 
+@@ -686,6 +733,54 @@ cupsdReadConfiguration(void)
      cupsdSetString(&ServerName, temp);
+   }
+ 
++  if (!ServerAlias)
++    ServerAlias = cupsArrayNew(NULL, NULL);
 +
-+    if (!ServerAlias)
-+      ServerAlias = cupsArrayNew(NULL, NULL);
++  cupsdAddAlias(ServerAlias, ServerName);
++  cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", ServerName);
 +
-+    cupsdAddAlias(ServerAlias, temp);
-+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
++  if (HostNameLookups || RemoteAccessEnabled)
++  {
++    struct hostent	*host;		/* Host entry to get FQDN */
 +
-+    if (HostNameLookups || RemoteAccessEnabled)
++    if ((host = gethostbyname(ServerName)) != NULL)
 +    {
-+      struct hostent	*host;		/* Host entry to get FQDN */
++      if (strcasecmp(ServerName, host->h_name))
++      {
++	cupsdSetString(&ServerName, host->h_name);
++	cupsdAddAlias(ServerAlias, host->h_name);
++	cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
++			host->h_name);
++      }
 +
-+      if ((host = gethostbyname(temp)) != NULL)
++      if (host->h_aliases)
 +      {
-+        if (strcasecmp(temp, host->h_name))
-+        {
-+	  cupsdSetString(&ServerName, host->h_name);
-+	  cupsdAddAlias(ServerAlias, host->h_name);
-+          cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
-+	                  host->h_name);
-+	}
-+
-+        if (host->h_aliases)
-+	{
-+          for (i = 0; host->h_aliases[i]; i ++)
-+	    if (strcasecmp(temp, host->h_aliases[i]))
-+	    {
-+	      cupsdAddAlias(ServerAlias, host->h_aliases[i]);
-+	      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
-+	                      host->h_aliases[i]);
-+	    }
-+	}
++	for (i = 0; host->h_aliases[i]; i ++)
++	  if (strcasecmp(ServerName, host->h_aliases[i]))
++	  {
++	    cupsdAddAlias(ServerAlias, host->h_aliases[i]);
++	    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
++			    host->h_aliases[i]);
++	  }
 +      }
 +    }
++  }
 +
-+   /*
-+    * Make sure we have the base hostname added as an alias, too!
-+    */
++ /*
++  * Make sure we have the base hostname added as an alias, too!
++  */
++
++  if ((slash = strchr(ServerName, '.')) != NULL)
++  {
++    size_t n = slash - ServerName;
++    if (n > sizeof(temp) - 1)
++      n = sizeof(temp) - 1;
++    memcpy (temp, ServerName, n);
++    temp[n] = '\0';
++    cupsdAddAlias(ServerAlias, temp);
++    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
++  }
 +
-+    if ((slash = strchr(temp, '.')) != NULL)
-+    {
-+      *slash = '\0';
-+      cupsdAddAlias(ServerAlias, temp);
-+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
-+    }
-   }
- 
    for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);
-@@ -3278,6 +3369,13 @@ read_configuration(cups_file_t *fp)	/* I
+ 
+   ServerNameIsIP = !*slash;
+@@ -3278,6 +3373,13 @@ read_configuration(cups_file_t *fp)	/* I
  	    break;
        }
      }
@@ -477,8 +482,8 @@
      {
       /*
 diff -up cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.h
---- cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-26 13:22:11.000000000 +0100
 @@ -82,6 +82,17 @@ typedef enum
  
  
@@ -520,8 +525,8 @@
  #ifdef HAVE_GSSAPI
  extern int	cupsdLogGSSMessage(int level, int major_status,
 diff -up cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.c
---- cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/scheduler/dirsvc.c	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/dirsvc.c	2009-04-26 13:22:11.000000000 +0100
 @@ -38,6 +38,7 @@
   *   cupsdUpdateLDAPBrowse()    - Scan for new printers via LDAP...
   *   cupsdUpdateSLPBrowse()     - Get browsing information via SLP.
@@ -582,7 +587,7 @@
   */
 diff -up cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.h
 --- cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/dirsvc.h	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/dirsvc.h	2009-04-26 13:22:11.000000000 +0100
 @@ -4,7 +4,7 @@
   *   Directory services definitions for the Common UNIX Printing System
   *   (CUPS) scheduler.
@@ -603,7 +608,7 @@
  VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
 diff -up cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.c
 --- cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164	2009-02-05 10:57:28.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/network.c	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/network.c	2009-04-26 13:22:11.000000000 +0100
 @@ -101,6 +101,7 @@ cupsdNetIFUpdate(void)
    struct ifaddrs	*addrs,		/* Interface address list */
  			*addr;		/* Current interface address */
@@ -633,7 +638,7 @@
      if (addr->ifa_addr->sa_family == AF_INET)
 diff -up cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.h
 --- cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164	2008-12-03 15:39:53.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/network.h	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/network.h	2009-04-26 13:22:11.000000000 +0100
 @@ -4,7 +4,7 @@
   *   Network interface definitions for the Common UNIX Printing System
   *   (CUPS) scheduler.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- cups.spec	21 Apr 2009 15:53:53 -0000	1.471
+++ cups.spec	26 Apr 2009 12:55:28 -0000	1.472
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.14%{?dist}
+Release: 0.%{pre}.15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -478,7 +478,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com>
+* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.15
+- Accept "Host: ::1" (bug #497393).
+- Accept Host: fields set to the ServerName value (bug #497301).
 - Specify that we want poppler's pdftops (not ghostscript) for the
   pdftops wrapper when calling configure.
 



From twaugh at fedoraproject.org  Sun Apr 26 12:58:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sun, 26 Apr 2009 12:58:49 +0000 (UTC)
Subject: rpms/cups/devel cups-CVE-2009-0164.patch, 1.1, 1.2 cups.spec, 1.471,
	1.472
Message-ID: <20090426125849.558B270125@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2802

Modified Files:
	cups-CVE-2009-0164.patch cups.spec 
Log Message:
* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.15
- Accept "Host: ::1" (bug #497393).
- Accept Host: fields set to the ServerName value (bug #497301).


cups-CVE-2009-0164.patch:

Index: cups-CVE-2009-0164.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-CVE-2009-0164.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-CVE-2009-0164.patch	17 Apr 2009 16:34:28 -0000	1.1
+++ cups-CVE-2009-0164.patch	26 Apr 2009 12:58:48 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164 cups-1.4b2-svn8404/CHANGES-1.3.txt
 --- cups-1.4b2-svn8404/CHANGES-1.3.txt.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/CHANGES-1.3.txt	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/CHANGES-1.3.txt	2009-04-26 13:22:11.000000000 +0100
 @@ -69,11 +69,6 @@ CHANGES IN CUPS V1.3.10
  	- The scheduler now rejects ATTR: messages with empty values.
  	- The scheduler could consume all CPU handling closed connections
@@ -15,7 +15,7 @@
  	- The Epson sample driver PPDs contained errors (STR #2979)
 diff -up cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http-addr.c
 --- cups-1.4b2-svn8404/cups/http-addr.c.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/cups/http-addr.c	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/cups/http-addr.c	2009-04-26 13:22:11.000000000 +0100
 @@ -154,7 +154,7 @@ httpAddrLocalhost(
  #endif /* AF_LOCAL */
  
@@ -26,8 +26,8 @@
  
    return (0);
 diff -up cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164 cups-1.4b2-svn8404/cups/http.c
---- cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/cups/http.c	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/cups/http.c.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/cups/http.c	2009-04-26 13:22:11.000000000 +0100
 @@ -1842,18 +1842,35 @@ httpSetField(http_t       *http,	/* I - 
  
    strlcpy(http->fields[field], value, HTTP_MAX_VALUE);
@@ -71,7 +71,7 @@
  
 diff -up cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164 cups-1.4b2-svn8404/man/cupsd.conf.man.in
 --- cups-1.4b2-svn8404/man/cupsd.conf.man.in.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/man/cupsd.conf.man.in	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/man/cupsd.conf.man.in	2009-04-26 13:22:11.000000000 +0100
 @@ -617,6 +617,11 @@ ServerAdmin user at domain.com
  .br
  Specifies the email address of the server administrator.
@@ -86,7 +86,7 @@
  Specifies the directory where backends, CGIs, daemons, and filters may
 diff -up cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/client.c
 --- cups-1.4b2-svn8404/scheduler/client.c.CVE-2009-0164	2009-03-05 10:54:00.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-17 16:47:48.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/client.c	2009-04-26 13:38:34.000000000 +0100
 @@ -39,6 +39,7 @@
   *   is_path_absolute()      - Is a path absolute and free of relative elements.
   *   make_certificate()      - Make a self-signed SSL/TLS certificate.
@@ -138,7 +138,7 @@
      {
        unlink(seedfile);
        return (0);
-@@ -4862,6 +4862,165 @@ pipe_command(cupsd_client_t *con,	/* I -
+@@ -4862,6 +4862,166 @@ pipe_command(cupsd_client_t *con,	/* I -
  
  
  /*
@@ -174,7 +174,8 @@
 +            !strcmp(host, "127.0.0.1") ||
 +	    !strncmp(host, "127.0.0.1:", 10) ||
 +	    !strcmp(host, "[::1]") ||
-+	    !strncmp(host, "[::1]:", 6));
++	    !strncmp(host, "[::1]:", 6) ||
++	    !strcmp(host, "::1"));
 +  }
 +
 +#ifdef HAVE_DNSSD
@@ -305,8 +306,8 @@
   */
  
 diff -up cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.c
---- cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/scheduler/conf.c.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.c	2009-04-26 13:43:59.000000000 +0100
 @@ -14,13 +14,15 @@
   *
   * Contents:
@@ -411,58 +412,62 @@
      {
        cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get hostname: %s",
                        strerror(errno));
-@@ -684,6 +731,50 @@ cupsdReadConfiguration(void)
-     }
- 
+@@ -686,6 +733,54 @@ cupsdReadConfiguration(void)
      cupsdSetString(&ServerName, temp);
+   }
+ 
++  if (!ServerAlias)
++    ServerAlias = cupsArrayNew(NULL, NULL);
 +
-+    if (!ServerAlias)
-+      ServerAlias = cupsArrayNew(NULL, NULL);
++  cupsdAddAlias(ServerAlias, ServerName);
++  cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", ServerName);
 +
-+    cupsdAddAlias(ServerAlias, temp);
-+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
++  if (HostNameLookups || RemoteAccessEnabled)
++  {
++    struct hostent	*host;		/* Host entry to get FQDN */
 +
-+    if (HostNameLookups || RemoteAccessEnabled)
++    if ((host = gethostbyname(ServerName)) != NULL)
 +    {
-+      struct hostent	*host;		/* Host entry to get FQDN */
++      if (strcasecmp(ServerName, host->h_name))
++      {
++	cupsdSetString(&ServerName, host->h_name);
++	cupsdAddAlias(ServerAlias, host->h_name);
++	cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
++			host->h_name);
++      }
 +
-+      if ((host = gethostbyname(temp)) != NULL)
++      if (host->h_aliases)
 +      {
-+        if (strcasecmp(temp, host->h_name))
-+        {
-+	  cupsdSetString(&ServerName, host->h_name);
-+	  cupsdAddAlias(ServerAlias, host->h_name);
-+          cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
-+	                  host->h_name);
-+	}
-+
-+        if (host->h_aliases)
-+	{
-+          for (i = 0; host->h_aliases[i]; i ++)
-+	    if (strcasecmp(temp, host->h_aliases[i]))
-+	    {
-+	      cupsdAddAlias(ServerAlias, host->h_aliases[i]);
-+	      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
-+	                      host->h_aliases[i]);
-+	    }
-+	}
++	for (i = 0; host->h_aliases[i]; i ++)
++	  if (strcasecmp(ServerName, host->h_aliases[i]))
++	  {
++	    cupsdAddAlias(ServerAlias, host->h_aliases[i]);
++	    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s",
++			    host->h_aliases[i]);
++	  }
 +      }
 +    }
++  }
 +
-+   /*
-+    * Make sure we have the base hostname added as an alias, too!
-+    */
++ /*
++  * Make sure we have the base hostname added as an alias, too!
++  */
++
++  if ((slash = strchr(ServerName, '.')) != NULL)
++  {
++    size_t n = slash - ServerName;
++    if (n > sizeof(temp) - 1)
++      n = sizeof(temp) - 1;
++    memcpy (temp, ServerName, n);
++    temp[n] = '\0';
++    cupsdAddAlias(ServerAlias, temp);
++    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
++  }
 +
-+    if ((slash = strchr(temp, '.')) != NULL)
-+    {
-+      *slash = '\0';
-+      cupsdAddAlias(ServerAlias, temp);
-+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
-+    }
-   }
- 
    for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);
-@@ -3278,6 +3369,13 @@ read_configuration(cups_file_t *fp)	/* I
+ 
+   ServerNameIsIP = !*slash;
+@@ -3278,6 +3373,13 @@ read_configuration(cups_file_t *fp)	/* I
  	    break;
        }
      }
@@ -477,8 +482,8 @@
      {
       /*
 diff -up cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/conf.h
---- cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/scheduler/conf.h.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/conf.h	2009-04-26 13:22:11.000000000 +0100
 @@ -82,6 +82,17 @@ typedef enum
  
  
@@ -520,8 +525,8 @@
  #ifdef HAVE_GSSAPI
  extern int	cupsdLogGSSMessage(int level, int major_status,
 diff -up cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.c
---- cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164	2009-04-17 16:47:18.000000000 +0100
-+++ cups-1.4b2-svn8404/scheduler/dirsvc.c	2009-04-17 16:47:18.000000000 +0100
+--- cups-1.4b2-svn8404/scheduler/dirsvc.c.CVE-2009-0164	2009-04-26 13:22:11.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/dirsvc.c	2009-04-26 13:22:11.000000000 +0100
 @@ -38,6 +38,7 @@
   *   cupsdUpdateLDAPBrowse()    - Scan for new printers via LDAP...
   *   cupsdUpdateSLPBrowse()     - Get browsing information via SLP.
@@ -582,7 +587,7 @@
   */
 diff -up cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/dirsvc.h
 --- cups-1.4b2-svn8404/scheduler/dirsvc.h.CVE-2009-0164	2009-02-17 17:45:27.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/dirsvc.h	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/dirsvc.h	2009-04-26 13:22:11.000000000 +0100
 @@ -4,7 +4,7 @@
   *   Directory services definitions for the Common UNIX Printing System
   *   (CUPS) scheduler.
@@ -603,7 +608,7 @@
  VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
 diff -up cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.c
 --- cups-1.4b2-svn8404/scheduler/network.c.CVE-2009-0164	2009-02-05 10:57:28.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/network.c	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/network.c	2009-04-26 13:22:11.000000000 +0100
 @@ -101,6 +101,7 @@ cupsdNetIFUpdate(void)
    struct ifaddrs	*addrs,		/* Interface address list */
  			*addr;		/* Current interface address */
@@ -633,7 +638,7 @@
      if (addr->ifa_addr->sa_family == AF_INET)
 diff -up cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164 cups-1.4b2-svn8404/scheduler/network.h
 --- cups-1.4b2-svn8404/scheduler/network.h.CVE-2009-0164	2008-12-03 15:39:53.000000000 +0000
-+++ cups-1.4b2-svn8404/scheduler/network.h	2009-04-17 16:47:18.000000000 +0100
++++ cups-1.4b2-svn8404/scheduler/network.h	2009-04-26 13:22:11.000000000 +0100
 @@ -4,7 +4,7 @@
   *   Network interface definitions for the Common UNIX Printing System
   *   (CUPS) scheduler.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- cups.spec	21 Apr 2009 15:44:21 -0000	1.471
+++ cups.spec	26 Apr 2009 12:58:48 -0000	1.472
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.14%{?dist}
+Release: 0.%{pre}.15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -478,7 +478,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com>
+* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.15
+- Accept "Host: ::1" (bug #497393).
+- Accept Host: fields set to the ServerName value (bug #497301).
 - Specify that we want poppler's pdftops (not ghostscript) for the
   pdftops wrapper when calling configure.
 



From remi at fedoraproject.org  Sun Apr 26 14:28:45 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 14:28:45 +0000 (UTC)
Subject: rpms/glpi/devel glpi-0.71.5.patch,NONE,1.1 glpi.spec,1.22,1.23
Message-ID: <20090426142846.02F8170125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16731

Modified Files:
	glpi.spec 
Added Files:
	glpi-0.71.5.patch 
Log Message:
post 0.71.5 patches from SVN

glpi-0.71.5.patch:

--- NEW FILE glpi-0.71.5.patch ---
Commits in branches/0.71-bugfixes after 0.71.5 released

	7917 Cache clean when rule is deleted see #1227
	7938 More security test
	7963 correct styles
	7978 restore problem 
	7985 Remove space when trying to build a user's dn
	7994 fix memory_limit = -1 detection
	7997 fix externalImportDropdown for phone
	8060 fix cartridge time in stock / used computation - Fixed #1243
	8100 don't delete dropdown ID=0
	8186 Error when making an ldap request and login field is not present 
	8202 default profil with CAS - fixed #1259
	8236 fix type in SQL request

Index: branches/0.71-bugfixes/ajax/dropdownValue.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7938)
@@ -52,4 +52,8 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 if (isset($_POST["entity_restrict"])&&!is_numeric($_POST["entity_restrict"])&&!is_array($_POST["entity_restrict"])){
Index: branches/0.71-bugfixes/ajax/dropdownUsersTracking.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7938)
@@ -47,4 +47,9 @@
 
 checkCentralAccess();
+
+// Security
+if ( ! FieldExists("glpi_tracking",$_POST['field']) ){
+	exit();
+}
 
 // Make a select box with all glpi users
Index: branches/0.71-bugfixes/ajax/autocompletion.php
===================================================================
--- branches/0.71-bugfixes/ajax/autocompletion.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/autocompletion.php (revision 7938)
@@ -45,4 +45,10 @@
 
 checkLoginUser();
+
+// Security
+if (! TableExists($_POST['table']) || ! FieldExists($_POST['table'],$_POST['field']) ){
+	exit();
+}
+
 $entity="";
 if (isset($_POST['entity_restrict'])&&$_POST['entity_restrict']>=0&&in_array($_POST['table'],$CFG_GLPI["specif_entities_tables"])){
Index: branches/0.71-bugfixes/ajax/dropdownFindNum.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7938)
@@ -41,4 +41,9 @@
 
 checkRight("create_ticket","1");
+
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 $where="";
Index: branches/0.71-bugfixes/ajax/comments.php
===================================================================
--- branches/0.71-bugfixes/ajax/comments.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/comments.php (revision 7938)
@@ -44,4 +44,9 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
+
 if (isset($_POST["table"])&&isset($_POST["value"])){	
 	switch ($_POST["table"]){
Index: branches/0.71-bugfixes/front/backup.php
===================================================================
--- branches/0.71-bugfixes/front/backup.php (revision 7883)
+++ branches/0.71-bugfixes/front/backup.php (revision 7978)
@@ -288,5 +288,6 @@
 		$buffer=fgets($fileHandle,102400);
 
-		if(substr($buffer, 0, 1) != "#")
+		// do not strip comments due to problems when # in begin of a data line
+		//if(substr($buffer, 0, 1) != "#")
 		{
 			$formattedQuery .= $buffer;
@@ -295,5 +296,5 @@
 
 				// Do not use the $DB->query 
-				if ($DB->query($formattedQuery)) //r???ssie sinon continue ???conca&t???er
+				if ($DB->query($formattedQuery)) //if no success continue to concatenate
 				{
 
Index: branches/0.71-bugfixes/front/setup.dropdowns.php
===================================================================
--- branches/0.71-bugfixes/front/setup.dropdowns.php (revision 7763)
+++ branches/0.71-bugfixes/front/setup.dropdowns.php (revision 8100)
@@ -52,4 +52,15 @@
 elseif (isset($_GET["which"]))$which=$_GET["which"];
 else $which="";
+
+
+// Security
+if (!empty($which) && ! TableExists($which) ){
+	exit();
+}
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
 
 if (isset($_GET["where"]))$where=$_GET["where"];
@@ -104,5 +115,5 @@
 	glpi_header($_SERVER['PHP_SELF']."?which=$which&value2=$value2&tomove=$tomove&where=$where&type=$type&FK_entities=$FK_entities");
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST["delete"]) && $_POST["ID"]>0) {
 	if(dropdownUsed($_POST["tablename"], $_POST["ID"]) && empty($_POST["forcedelete"])) {
 		if (!ereg("popup",$_SERVER['PHP_SELF'])){
Index: branches/0.71-bugfixes/front/entity.tree.php
===================================================================
--- branches/0.71-bugfixes/front/entity.tree.php (revision 7763)
+++ branches/0.71-bugfixes/front/entity.tree.php (revision 7938)
@@ -46,4 +46,10 @@
 
 $which=ENTITY_TYPE;
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
+
 
 if (isset($_GET["where"]))$where=$_GET["where"];
Index: branches/0.71-bugfixes/css/styles.css
===================================================================
--- branches/0.71-bugfixes/css/styles.css (revision 7763)
+++ branches/0.71-bugfixes/css/styles.css (revision 7963)
@@ -39,4 +39,5 @@
 	margin: 0;
 	padding: 0;
+	background: white;
 }
 
@@ -156,11 +157,14 @@
 	font-size: 11px;
 	border: 1px solid #888888;
+	color: black; 
+	background-color: white; 
 }
 
 
 textarea, input {
-background-color:#FAFAFA;
-border: 1px solid #888888;
-font-size: 11px;
+	background-color:#FAFAFA;
+	color: black; 
+	border: 1px solid #888888;
+	font-size: 11px;
 }
 
Index: branches/0.71-bugfixes/inc/search.function.php
===================================================================
--- branches/0.71-bugfixes/inc/search.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/search.function.php (revision 7929)
@@ -1473,4 +1473,9 @@
 function addOrderBy($type,$ID,$order,$key=0){
 	global $SEARCH_OPTION,$CFG_GLPI,$PLUGIN_HOOKS;
+
+	// Security test for order
+	if ($order!="ASC"){
+		$order="DESC";
+	}
 
 	$table=$SEARCH_OPTION[$type][$ID]["table"];
Index: branches/0.71-bugfixes/inc/ldap.function.php
===================================================================
--- branches/0.71-bugfixes/inc/ldap.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/ldap.function.php (revision 8186)
@@ -433,12 +433,18 @@
 				if (!$sync)
 				{
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 				else
 				{
 				//If ldap synchronisation
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 			}	
Index: branches/0.71-bugfixes/inc/user.class.php
===================================================================
--- branches/0.71-bugfixes/inc/user.class.php (revision 7875)
+++ branches/0.71-bugfixes/inc/user.class.php (revision 8202)
@@ -239,8 +239,8 @@
 
 		$this->syncLdapGroups($input);
-		$this->applyRightRules($input);
+		$rulesplayed = $this->applyRightRules($input);
 
 		// Add default profile
-		if ($input['auth_method']==AUTH_DB_GLPI || (isAlternateAuthWithLdap($input['auth_method']))){
+		if (!$rulesplayed){
 			$sql_default_profile = "SELECT ID FROM glpi_profiles WHERE is_default=1";
 			$result = $DB->query($sql_default_profile);
@@ -322,4 +322,6 @@
 	 *
 	 *@param $input data used to apply rules
+	 *
+	 *@return boolean : true if we play the Rule Engine
 	**/	
 	function applyRightRules($input){
@@ -388,6 +390,9 @@
 			//Unset all the temporary tables
 			unset($input["_ldap_rules"]);
-		}
-
+			
+			return true;
+		} 
+		return false;
+		 
 	}
 	/**
Index: branches/0.71-bugfixes/inc/tracking.function.php
===================================================================
--- branches/0.71-bugfixes/inc/tracking.function.php (revision 7899)
+++ branches/0.71-bugfixes/inc/tracking.function.php (revision 7946)
@@ -834,5 +834,5 @@
 			dropdownValue("glpi_groups", "assign_group", $assign_group,1,$_SESSION["glpiactive_entity"]);
 
-		} else if (haveRight("steal_ticket","1")) {
+		} else { // steal active
 			echo $LANG["job"][6].": ";
 			dropdownUsers("assign",$assign,"ID",0,1,$_SESSION["glpiactive_entity"]);
Index: branches/0.71-bugfixes/inc/cartridge.function.php
===================================================================
--- branches/0.71-bugfixes/inc/cartridge.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/cartridge.function.php (revision 8060)
@@ -345,6 +345,6 @@
 		echo $date_use;
 
-		$tmp_dbeg=split("-",$date_in);
-		$tmp_dend=split("-",$date_use);
+		$tmp_dbeg=split("-",$data["date_in"]);
+		$tmp_dend=split("-",$data["date_use"]);
 
 		$stock_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
@@ -356,6 +356,6 @@
 
 		if ($old!=0){
-			$tmp_dbeg=split("-",$date_use);
-			$tmp_dend=split("-",$date_out);
+			$tmp_dbeg=split("-",$data["date_use"]);
+			$tmp_dend=split("-",$data["date_out"]);
 
 			$use_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
Index: branches/0.71-bugfixes/inc/reminder.class.php
===================================================================
--- branches/0.71-bugfixes/inc/reminder.class.php (revision 7763)
+++ branches/0.71-bugfixes/inc/reminder.class.php (revision 7926)
@@ -56,5 +56,9 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 		$input["begin"] = $input["end"] = "0000-00-00 00:00:00";
@@ -84,5 +88,8 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 
Index: branches/0.71-bugfixes/inc/common.function.php
===================================================================
--- branches/0.71-bugfixes/inc/common.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/common.function.php (revision 7994)
@@ -563,5 +563,5 @@
 	//if(empty($mem)) {$mem=get_cfg_var("memory_limit");}  // Sous Win l'ini_get ne retourne rien.....
 
-	preg_match("/([0-9]+)([KMG]*)/",$mem,$matches);
+	preg_match("/([-0-9]+)([KMG]*)/",$mem,$matches);
 
 	// no K M or G 
@@ -666,5 +666,5 @@
 	$value = is_array($value) ?
 		array_map('addslashes_deep', $value) :
-			(is_null($value) ? NULL : addslashes($value));
+			(is_null($value) ? NULL : mysql_real_escape_string($value));
 	return $value;
 }
@@ -680,6 +680,6 @@
  */
 function clean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
 		array_map('clean_cross_side_scripting_deep', $value) :
@@ -695,8 +695,8 @@
  */
 function unclean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
-		array_map('clean_cross_side_scripting_deep', $value) :
+		array_map('unclean_cross_side_scripting_deep', $value) :
 			(is_null($value) ? NULL : str_replace($out,$in,$value));
 	return $value;
Index: branches/0.71-bugfixes/inc/software.function.php
===================================================================
--- branches/0.71-bugfixes/inc/software.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/software.function.php (revision 8236)
@@ -1173,5 +1173,5 @@
 			$query .= " AND expire IS NULL";
 		} else {
-			$query .= " AND .expire = '" . addslashes($lic->fields['expire']) . "'";
+			$query .= " AND expire = '" . addslashes($lic->fields['expire']) . "'";
 		}
 
Index: branches/0.71-bugfixes/inc/rulesengine.class.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7901)
+++ branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7917)
@@ -2093,4 +2093,9 @@
 	}
 
+	function cleanDBonPurge($ID){
+		parent::cleanDBonPurge($ID);
+		$this->deleteCacheByRuleId($ID);
+	}
+
 	function post_updateItem($input,$updates,$history=1) {
 		if(isset($updates['match']))
Index: branches/0.71-bugfixes/inc/auth.function.php
===================================================================
--- branches/0.71-bugfixes/inc/auth.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/auth.function.php (revision 7985)
@@ -993,5 +993,5 @@
 			return $info[0]['dn'];
 		} else { // Si echec, essayer de deviner le DN / Flat LDAP
-			$dn = "$login_attr=$login, " . $basedn;
+			$dn = "$login_attr=$login," . $basedn;
 			return $dn;
 		}
Index: branches/0.71-bugfixes/inc/includes.php
===================================================================
--- branches/0.71-bugfixes/inc/includes.php (revision 7763)
+++ branches/0.71-bugfixes/inc/includes.php (revision 7934)
@@ -95,16 +95,18 @@
 // Security system
 if (isset($_POST)){
-	if (!get_magic_quotes_gpc()){
-		$_POST = array_map('addslashes_deep', $_POST);
+	if (get_magic_quotes_gpc()){
+		$_POST = array_map('stripslashes_deep', $_POST);
 	}
+
+	$_POST = array_map('addslashes_deep', $_POST);
 	$_POST = array_map('clean_cross_side_scripting_deep', $_POST);
 }
 if (isset($_GET)){
-	if (!get_magic_quotes_gpc()){
-		$_GET = array_map('addslashes_deep', $_GET);
+	if (get_magic_quotes_gpc()){
+		$_GET = array_map('stripslashes_deep', $_GET);
 	}
+	$_GET = array_map('addslashes_deep', $_GET);
 	$_GET = array_map('clean_cross_side_scripting_deep', $_GET);
 }
-
 
 
Index: branches/0.71-bugfixes/inc/rulesengine.function.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7997)
@@ -367,5 +367,5 @@
 		case "glpi_type_networking":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_NETWORKING);
-		case "glpi_dropdown_type_phone":
+		case "glpi_type_phones":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_PHONE);
 		case "glpi_dropdown_os":


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- glpi.spec	24 Feb 2009 22:13:59 -0000	1.22
+++ glpi.spec	26 Apr 2009 14:28:13 -0000	1.23
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -23,6 +23,9 @@
 # backport from 0.72 (Changeset 7208)
 Patch0:         glpi-check.patch
 
+# Post 0.71.5 patches from SVN
+# https://dev.indepnet.net/glpi/changeset?format=diff&new=8236&old=7910&new_path=branches/0.71-bugfixes&old_path=branches/0.71-bugfixes
+Patch1:         glpi-0.71.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +70,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p2
 
 %if 0%{?rhel} == 4
 
@@ -230,6 +234,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-3
+- post 0.71.5 patches
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From remi at fedoraproject.org  Sun Apr 26 14:41:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 14:41:32 +0000 (UTC)
Subject: rpms/glpi/F-11 glpi-0.71.5.patch,NONE,1.1 glpi.spec,1.22,1.23
Message-ID: <20090426144132.A6E9870125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19169

Modified Files:
	glpi.spec 
Added Files:
	glpi-0.71.5.patch 
Log Message:
post 0.71.5 patches from SVN

glpi-0.71.5.patch:

--- NEW FILE glpi-0.71.5.patch ---
Commits in branches/0.71-bugfixes after 0.71.5 released

	7917 Cache clean when rule is deleted see #1227
	7938 More security test
	7963 correct styles
	7978 restore problem 
	7985 Remove space when trying to build a user's dn
	7994 fix memory_limit = -1 detection
	7997 fix externalImportDropdown for phone
	8060 fix cartridge time in stock / used computation - Fixed #1243
	8100 don't delete dropdown ID=0
	8186 Error when making an ldap request and login field is not present 
	8202 default profil with CAS - fixed #1259
	8236 fix type in SQL request

Index: branches/0.71-bugfixes/ajax/dropdownValue.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7938)
@@ -52,4 +52,8 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 if (isset($_POST["entity_restrict"])&&!is_numeric($_POST["entity_restrict"])&&!is_array($_POST["entity_restrict"])){
Index: branches/0.71-bugfixes/ajax/dropdownUsersTracking.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7938)
@@ -47,4 +47,9 @@
 
 checkCentralAccess();
+
+// Security
+if ( ! FieldExists("glpi_tracking",$_POST['field']) ){
+	exit();
+}
 
 // Make a select box with all glpi users
Index: branches/0.71-bugfixes/ajax/autocompletion.php
===================================================================
--- branches/0.71-bugfixes/ajax/autocompletion.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/autocompletion.php (revision 7938)
@@ -45,4 +45,10 @@
 
 checkLoginUser();
+
+// Security
+if (! TableExists($_POST['table']) || ! FieldExists($_POST['table'],$_POST['field']) ){
+	exit();
+}
+
 $entity="";
 if (isset($_POST['entity_restrict'])&&$_POST['entity_restrict']>=0&&in_array($_POST['table'],$CFG_GLPI["specif_entities_tables"])){
Index: branches/0.71-bugfixes/ajax/dropdownFindNum.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7938)
@@ -41,4 +41,9 @@
 
 checkRight("create_ticket","1");
+
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 $where="";
Index: branches/0.71-bugfixes/ajax/comments.php
===================================================================
--- branches/0.71-bugfixes/ajax/comments.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/comments.php (revision 7938)
@@ -44,4 +44,9 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
+
 if (isset($_POST["table"])&&isset($_POST["value"])){	
 	switch ($_POST["table"]){
Index: branches/0.71-bugfixes/front/backup.php
===================================================================
--- branches/0.71-bugfixes/front/backup.php (revision 7883)
+++ branches/0.71-bugfixes/front/backup.php (revision 7978)
@@ -288,5 +288,6 @@
 		$buffer=fgets($fileHandle,102400);
 
-		if(substr($buffer, 0, 1) != "#")
+		// do not strip comments due to problems when # in begin of a data line
+		//if(substr($buffer, 0, 1) != "#")
 		{
 			$formattedQuery .= $buffer;
@@ -295,5 +296,5 @@
 
 				// Do not use the $DB->query 
-				if ($DB->query($formattedQuery)) //r???ssie sinon continue ???conca&t???er
+				if ($DB->query($formattedQuery)) //if no success continue to concatenate
 				{
 
Index: branches/0.71-bugfixes/front/setup.dropdowns.php
===================================================================
--- branches/0.71-bugfixes/front/setup.dropdowns.php (revision 7763)
+++ branches/0.71-bugfixes/front/setup.dropdowns.php (revision 8100)
@@ -52,4 +52,15 @@
 elseif (isset($_GET["which"]))$which=$_GET["which"];
 else $which="";
+
+
+// Security
+if (!empty($which) && ! TableExists($which) ){
+	exit();
+}
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
 
 if (isset($_GET["where"]))$where=$_GET["where"];
@@ -104,5 +115,5 @@
 	glpi_header($_SERVER['PHP_SELF']."?which=$which&value2=$value2&tomove=$tomove&where=$where&type=$type&FK_entities=$FK_entities");
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST["delete"]) && $_POST["ID"]>0) {
 	if(dropdownUsed($_POST["tablename"], $_POST["ID"]) && empty($_POST["forcedelete"])) {
 		if (!ereg("popup",$_SERVER['PHP_SELF'])){
Index: branches/0.71-bugfixes/front/entity.tree.php
===================================================================
--- branches/0.71-bugfixes/front/entity.tree.php (revision 7763)
+++ branches/0.71-bugfixes/front/entity.tree.php (revision 7938)
@@ -46,4 +46,10 @@
 
 $which=ENTITY_TYPE;
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
+
 
 if (isset($_GET["where"]))$where=$_GET["where"];
Index: branches/0.71-bugfixes/css/styles.css
===================================================================
--- branches/0.71-bugfixes/css/styles.css (revision 7763)
+++ branches/0.71-bugfixes/css/styles.css (revision 7963)
@@ -39,4 +39,5 @@
 	margin: 0;
 	padding: 0;
+	background: white;
 }
 
@@ -156,11 +157,14 @@
 	font-size: 11px;
 	border: 1px solid #888888;
+	color: black; 
+	background-color: white; 
 }
 
 
 textarea, input {
-background-color:#FAFAFA;
-border: 1px solid #888888;
-font-size: 11px;
+	background-color:#FAFAFA;
+	color: black; 
+	border: 1px solid #888888;
+	font-size: 11px;
 }
 
Index: branches/0.71-bugfixes/inc/search.function.php
===================================================================
--- branches/0.71-bugfixes/inc/search.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/search.function.php (revision 7929)
@@ -1473,4 +1473,9 @@
 function addOrderBy($type,$ID,$order,$key=0){
 	global $SEARCH_OPTION,$CFG_GLPI,$PLUGIN_HOOKS;
+
+	// Security test for order
+	if ($order!="ASC"){
+		$order="DESC";
+	}
 
 	$table=$SEARCH_OPTION[$type][$ID]["table"];
Index: branches/0.71-bugfixes/inc/ldap.function.php
===================================================================
--- branches/0.71-bugfixes/inc/ldap.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/ldap.function.php (revision 8186)
@@ -433,12 +433,18 @@
 				if (!$sync)
 				{
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 				else
 				{
 				//If ldap synchronisation
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 			}	
Index: branches/0.71-bugfixes/inc/user.class.php
===================================================================
--- branches/0.71-bugfixes/inc/user.class.php (revision 7875)
+++ branches/0.71-bugfixes/inc/user.class.php (revision 8202)
@@ -239,8 +239,8 @@
 
 		$this->syncLdapGroups($input);
-		$this->applyRightRules($input);
+		$rulesplayed = $this->applyRightRules($input);
 
 		// Add default profile
-		if ($input['auth_method']==AUTH_DB_GLPI || (isAlternateAuthWithLdap($input['auth_method']))){
+		if (!$rulesplayed){
 			$sql_default_profile = "SELECT ID FROM glpi_profiles WHERE is_default=1";
 			$result = $DB->query($sql_default_profile);
@@ -322,4 +322,6 @@
 	 *
 	 *@param $input data used to apply rules
+	 *
+	 *@return boolean : true if we play the Rule Engine
 	**/	
 	function applyRightRules($input){
@@ -388,6 +390,9 @@
 			//Unset all the temporary tables
 			unset($input["_ldap_rules"]);
-		}
-
+			
+			return true;
+		} 
+		return false;
+		 
 	}
 	/**
Index: branches/0.71-bugfixes/inc/tracking.function.php
===================================================================
--- branches/0.71-bugfixes/inc/tracking.function.php (revision 7899)
+++ branches/0.71-bugfixes/inc/tracking.function.php (revision 7946)
@@ -834,5 +834,5 @@
 			dropdownValue("glpi_groups", "assign_group", $assign_group,1,$_SESSION["glpiactive_entity"]);
 
-		} else if (haveRight("steal_ticket","1")) {
+		} else { // steal active
 			echo $LANG["job"][6].": ";
 			dropdownUsers("assign",$assign,"ID",0,1,$_SESSION["glpiactive_entity"]);
Index: branches/0.71-bugfixes/inc/cartridge.function.php
===================================================================
--- branches/0.71-bugfixes/inc/cartridge.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/cartridge.function.php (revision 8060)
@@ -345,6 +345,6 @@
 		echo $date_use;
 
-		$tmp_dbeg=split("-",$date_in);
-		$tmp_dend=split("-",$date_use);
+		$tmp_dbeg=split("-",$data["date_in"]);
+		$tmp_dend=split("-",$data["date_use"]);
 
 		$stock_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
@@ -356,6 +356,6 @@
 
 		if ($old!=0){
-			$tmp_dbeg=split("-",$date_use);
-			$tmp_dend=split("-",$date_out);
+			$tmp_dbeg=split("-",$data["date_use"]);
+			$tmp_dend=split("-",$data["date_out"]);
 
 			$use_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
Index: branches/0.71-bugfixes/inc/reminder.class.php
===================================================================
--- branches/0.71-bugfixes/inc/reminder.class.php (revision 7763)
+++ branches/0.71-bugfixes/inc/reminder.class.php (revision 7926)
@@ -56,5 +56,9 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 		$input["begin"] = $input["end"] = "0000-00-00 00:00:00";
@@ -84,5 +88,8 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 
Index: branches/0.71-bugfixes/inc/common.function.php
===================================================================
--- branches/0.71-bugfixes/inc/common.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/common.function.php (revision 7994)
@@ -563,5 +563,5 @@
 	//if(empty($mem)) {$mem=get_cfg_var("memory_limit");}  // Sous Win l'ini_get ne retourne rien.....
 
-	preg_match("/([0-9]+)([KMG]*)/",$mem,$matches);
+	preg_match("/([-0-9]+)([KMG]*)/",$mem,$matches);
 
 	// no K M or G 
@@ -666,5 +666,5 @@
 	$value = is_array($value) ?
 		array_map('addslashes_deep', $value) :
-			(is_null($value) ? NULL : addslashes($value));
+			(is_null($value) ? NULL : mysql_real_escape_string($value));
 	return $value;
 }
@@ -680,6 +680,6 @@
  */
 function clean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
 		array_map('clean_cross_side_scripting_deep', $value) :
@@ -695,8 +695,8 @@
  */
 function unclean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
-		array_map('clean_cross_side_scripting_deep', $value) :
+		array_map('unclean_cross_side_scripting_deep', $value) :
 			(is_null($value) ? NULL : str_replace($out,$in,$value));
 	return $value;
Index: branches/0.71-bugfixes/inc/software.function.php
===================================================================
--- branches/0.71-bugfixes/inc/software.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/software.function.php (revision 8236)
@@ -1173,5 +1173,5 @@
 			$query .= " AND expire IS NULL";
 		} else {
-			$query .= " AND .expire = '" . addslashes($lic->fields['expire']) . "'";
+			$query .= " AND expire = '" . addslashes($lic->fields['expire']) . "'";
 		}
 
Index: branches/0.71-bugfixes/inc/rulesengine.class.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7901)
+++ branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7917)
@@ -2093,4 +2093,9 @@
 	}
 
+	function cleanDBonPurge($ID){
+		parent::cleanDBonPurge($ID);
+		$this->deleteCacheByRuleId($ID);
+	}
+
 	function post_updateItem($input,$updates,$history=1) {
 		if(isset($updates['match']))
Index: branches/0.71-bugfixes/inc/auth.function.php
===================================================================
--- branches/0.71-bugfixes/inc/auth.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/auth.function.php (revision 7985)
@@ -993,5 +993,5 @@
 			return $info[0]['dn'];
 		} else { // Si echec, essayer de deviner le DN / Flat LDAP
-			$dn = "$login_attr=$login, " . $basedn;
+			$dn = "$login_attr=$login," . $basedn;
 			return $dn;
 		}
Index: branches/0.71-bugfixes/inc/includes.php
===================================================================
--- branches/0.71-bugfixes/inc/includes.php (revision 7763)
+++ branches/0.71-bugfixes/inc/includes.php (revision 7934)
@@ -95,16 +95,18 @@
 // Security system
 if (isset($_POST)){
-	if (!get_magic_quotes_gpc()){
-		$_POST = array_map('addslashes_deep', $_POST);
+	if (get_magic_quotes_gpc()){
+		$_POST = array_map('stripslashes_deep', $_POST);
 	}
+
+	$_POST = array_map('addslashes_deep', $_POST);
 	$_POST = array_map('clean_cross_side_scripting_deep', $_POST);
 }
 if (isset($_GET)){
-	if (!get_magic_quotes_gpc()){
-		$_GET = array_map('addslashes_deep', $_GET);
+	if (get_magic_quotes_gpc()){
+		$_GET = array_map('stripslashes_deep', $_GET);
 	}
+	$_GET = array_map('addslashes_deep', $_GET);
 	$_GET = array_map('clean_cross_side_scripting_deep', $_GET);
 }
-
 
 
Index: branches/0.71-bugfixes/inc/rulesengine.function.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7997)
@@ -367,5 +367,5 @@
 		case "glpi_type_networking":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_NETWORKING);
-		case "glpi_dropdown_type_phone":
+		case "glpi_type_phones":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_PHONE);
 		case "glpi_dropdown_os":


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-11/glpi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- glpi.spec	24 Feb 2009 22:13:59 -0000	1.22
+++ glpi.spec	26 Apr 2009 14:41:01 -0000	1.23
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -23,6 +23,9 @@
 # backport from 0.72 (Changeset 7208)
 Patch0:         glpi-check.patch
 
+# Post 0.71.5 patches from SVN
+# https://dev.indepnet.net/glpi/changeset?format=diff&new=8236&old=7910&new_path=branches/0.71-bugfixes&old_path=branches/0.71-bugfixes
+Patch1:         glpi-0.71.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +70,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p2
 
 %if 0%{?rhel} == 4
 
@@ -230,6 +234,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-3
+- post 0.71.5 patches
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From remi at fedoraproject.org  Sun Apr 26 14:49:38 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 14:49:38 +0000 (UTC)
Subject: rpms/glpi/F-10 glpi.spec,1.21,1.22
Message-ID: <20090426144938.3A5B070125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21109

Modified Files:
	glpi.spec 
Log Message:
post 0.71.5 patches from upstream


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- glpi.spec	26 Jan 2009 21:24:31 -0000	1.21
+++ glpi.spec	26 Apr 2009 14:49:07 -0000	1.22
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -23,6 +23,9 @@
 # backport from 0.72 (Changeset 7208)
 Patch0:         glpi-check.patch
 
+# Post 0.71.5 patches from SVN
+# https://dev.indepnet.net/glpi/changeset?format=diff&new=8236&old=7910&new_path=branches/0.71-bugfixes&old_path=branches/0.71-bugfixes
+Patch1:         glpi-0.71.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +70,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p2
 
 %if 0%{?rhel} == 4
 
@@ -230,6 +234,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-3
+- post 0.71.5 patches
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
 - update to 0.71.5 (Fix regression in 0.71.4)
 



From remi at fedoraproject.org  Sun Apr 26 14:50:06 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 14:50:06 +0000 (UTC)
Subject: rpms/glpi/F-10 glpi-0.71.5.patch,NONE,1.1
Message-ID: <20090426145006.F1DB770125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21306

Added Files:
	glpi-0.71.5.patch 
Log Message:
post 0.71.5 patches from upstream

glpi-0.71.5.patch:

--- NEW FILE glpi-0.71.5.patch ---
Commits in branches/0.71-bugfixes after 0.71.5 released

	7917 Cache clean when rule is deleted see #1227
	7938 More security test
	7963 correct styles
	7978 restore problem 
	7985 Remove space when trying to build a user's dn
	7994 fix memory_limit = -1 detection
	7997 fix externalImportDropdown for phone
	8060 fix cartridge time in stock / used computation - Fixed #1243
	8100 don't delete dropdown ID=0
	8186 Error when making an ldap request and login field is not present 
	8202 default profil with CAS - fixed #1259
	8236 fix type in SQL request

Index: branches/0.71-bugfixes/ajax/dropdownValue.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7938)
@@ -52,4 +52,8 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 if (isset($_POST["entity_restrict"])&&!is_numeric($_POST["entity_restrict"])&&!is_array($_POST["entity_restrict"])){
Index: branches/0.71-bugfixes/ajax/dropdownUsersTracking.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7938)
@@ -47,4 +47,9 @@
 
 checkCentralAccess();
+
+// Security
+if ( ! FieldExists("glpi_tracking",$_POST['field']) ){
+	exit();
+}
 
 // Make a select box with all glpi users
Index: branches/0.71-bugfixes/ajax/autocompletion.php
===================================================================
--- branches/0.71-bugfixes/ajax/autocompletion.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/autocompletion.php (revision 7938)
@@ -45,4 +45,10 @@
 
 checkLoginUser();
+
+// Security
+if (! TableExists($_POST['table']) || ! FieldExists($_POST['table'],$_POST['field']) ){
+	exit();
+}
+
 $entity="";
 if (isset($_POST['entity_restrict'])&&$_POST['entity_restrict']>=0&&in_array($_POST['table'],$CFG_GLPI["specif_entities_tables"])){
Index: branches/0.71-bugfixes/ajax/dropdownFindNum.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7938)
@@ -41,4 +41,9 @@
 
 checkRight("create_ticket","1");
+
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 $where="";
Index: branches/0.71-bugfixes/ajax/comments.php
===================================================================
--- branches/0.71-bugfixes/ajax/comments.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/comments.php (revision 7938)
@@ -44,4 +44,9 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
+
 if (isset($_POST["table"])&&isset($_POST["value"])){	
 	switch ($_POST["table"]){
Index: branches/0.71-bugfixes/front/backup.php
===================================================================
--- branches/0.71-bugfixes/front/backup.php (revision 7883)
+++ branches/0.71-bugfixes/front/backup.php (revision 7978)
@@ -288,5 +288,6 @@
 		$buffer=fgets($fileHandle,102400);
 
-		if(substr($buffer, 0, 1) != "#")
+		// do not strip comments due to problems when # in begin of a data line
+		//if(substr($buffer, 0, 1) != "#")
 		{
 			$formattedQuery .= $buffer;
@@ -295,5 +296,5 @@
 
 				// Do not use the $DB->query 
-				if ($DB->query($formattedQuery)) //r???ssie sinon continue ???conca&t???er
+				if ($DB->query($formattedQuery)) //if no success continue to concatenate
 				{
 
Index: branches/0.71-bugfixes/front/setup.dropdowns.php
===================================================================
--- branches/0.71-bugfixes/front/setup.dropdowns.php (revision 7763)
+++ branches/0.71-bugfixes/front/setup.dropdowns.php (revision 8100)
@@ -52,4 +52,15 @@
 elseif (isset($_GET["which"]))$which=$_GET["which"];
 else $which="";
+
+
+// Security
+if (!empty($which) && ! TableExists($which) ){
+	exit();
+}
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
 
 if (isset($_GET["where"]))$where=$_GET["where"];
@@ -104,5 +115,5 @@
 	glpi_header($_SERVER['PHP_SELF']."?which=$which&value2=$value2&tomove=$tomove&where=$where&type=$type&FK_entities=$FK_entities");
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST["delete"]) && $_POST["ID"]>0) {
 	if(dropdownUsed($_POST["tablename"], $_POST["ID"]) && empty($_POST["forcedelete"])) {
 		if (!ereg("popup",$_SERVER['PHP_SELF'])){
Index: branches/0.71-bugfixes/front/entity.tree.php
===================================================================
--- branches/0.71-bugfixes/front/entity.tree.php (revision 7763)
+++ branches/0.71-bugfixes/front/entity.tree.php (revision 7938)
@@ -46,4 +46,10 @@
 
 $which=ENTITY_TYPE;
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
+
 
 if (isset($_GET["where"]))$where=$_GET["where"];
Index: branches/0.71-bugfixes/css/styles.css
===================================================================
--- branches/0.71-bugfixes/css/styles.css (revision 7763)
+++ branches/0.71-bugfixes/css/styles.css (revision 7963)
@@ -39,4 +39,5 @@
 	margin: 0;
 	padding: 0;
+	background: white;
 }
 
@@ -156,11 +157,14 @@
 	font-size: 11px;
 	border: 1px solid #888888;
+	color: black; 
+	background-color: white; 
 }
 
 
 textarea, input {
-background-color:#FAFAFA;
-border: 1px solid #888888;
-font-size: 11px;
+	background-color:#FAFAFA;
+	color: black; 
+	border: 1px solid #888888;
+	font-size: 11px;
 }
 
Index: branches/0.71-bugfixes/inc/search.function.php
===================================================================
--- branches/0.71-bugfixes/inc/search.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/search.function.php (revision 7929)
@@ -1473,4 +1473,9 @@
 function addOrderBy($type,$ID,$order,$key=0){
 	global $SEARCH_OPTION,$CFG_GLPI,$PLUGIN_HOOKS;
+
+	// Security test for order
+	if ($order!="ASC"){
+		$order="DESC";
+	}
 
 	$table=$SEARCH_OPTION[$type][$ID]["table"];
Index: branches/0.71-bugfixes/inc/ldap.function.php
===================================================================
--- branches/0.71-bugfixes/inc/ldap.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/ldap.function.php (revision 8186)
@@ -433,12 +433,18 @@
 				if (!$sync)
 				{
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 				else
 				{
 				//If ldap synchronisation
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 			}	
Index: branches/0.71-bugfixes/inc/user.class.php
===================================================================
--- branches/0.71-bugfixes/inc/user.class.php (revision 7875)
+++ branches/0.71-bugfixes/inc/user.class.php (revision 8202)
@@ -239,8 +239,8 @@
 
 		$this->syncLdapGroups($input);
-		$this->applyRightRules($input);
+		$rulesplayed = $this->applyRightRules($input);
 
 		// Add default profile
-		if ($input['auth_method']==AUTH_DB_GLPI || (isAlternateAuthWithLdap($input['auth_method']))){
+		if (!$rulesplayed){
 			$sql_default_profile = "SELECT ID FROM glpi_profiles WHERE is_default=1";
 			$result = $DB->query($sql_default_profile);
@@ -322,4 +322,6 @@
 	 *
 	 *@param $input data used to apply rules
+	 *
+	 *@return boolean : true if we play the Rule Engine
 	**/	
 	function applyRightRules($input){
@@ -388,6 +390,9 @@
 			//Unset all the temporary tables
 			unset($input["_ldap_rules"]);
-		}
-
+			
+			return true;
+		} 
+		return false;
+		 
 	}
 	/**
Index: branches/0.71-bugfixes/inc/tracking.function.php
===================================================================
--- branches/0.71-bugfixes/inc/tracking.function.php (revision 7899)
+++ branches/0.71-bugfixes/inc/tracking.function.php (revision 7946)
@@ -834,5 +834,5 @@
 			dropdownValue("glpi_groups", "assign_group", $assign_group,1,$_SESSION["glpiactive_entity"]);
 
-		} else if (haveRight("steal_ticket","1")) {
+		} else { // steal active
 			echo $LANG["job"][6].": ";
 			dropdownUsers("assign",$assign,"ID",0,1,$_SESSION["glpiactive_entity"]);
Index: branches/0.71-bugfixes/inc/cartridge.function.php
===================================================================
--- branches/0.71-bugfixes/inc/cartridge.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/cartridge.function.php (revision 8060)
@@ -345,6 +345,6 @@
 		echo $date_use;
 
-		$tmp_dbeg=split("-",$date_in);
-		$tmp_dend=split("-",$date_use);
+		$tmp_dbeg=split("-",$data["date_in"]);
+		$tmp_dend=split("-",$data["date_use"]);
 
 		$stock_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
@@ -356,6 +356,6 @@
 
 		if ($old!=0){
-			$tmp_dbeg=split("-",$date_use);
-			$tmp_dend=split("-",$date_out);
+			$tmp_dbeg=split("-",$data["date_use"]);
+			$tmp_dend=split("-",$data["date_out"]);
 
 			$use_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
Index: branches/0.71-bugfixes/inc/reminder.class.php
===================================================================
--- branches/0.71-bugfixes/inc/reminder.class.php (revision 7763)
+++ branches/0.71-bugfixes/inc/reminder.class.php (revision 7926)
@@ -56,5 +56,9 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 		$input["begin"] = $input["end"] = "0000-00-00 00:00:00";
@@ -84,5 +88,8 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 
Index: branches/0.71-bugfixes/inc/common.function.php
===================================================================
--- branches/0.71-bugfixes/inc/common.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/common.function.php (revision 7994)
@@ -563,5 +563,5 @@
 	//if(empty($mem)) {$mem=get_cfg_var("memory_limit");}  // Sous Win l'ini_get ne retourne rien.....
 
-	preg_match("/([0-9]+)([KMG]*)/",$mem,$matches);
+	preg_match("/([-0-9]+)([KMG]*)/",$mem,$matches);
 
 	// no K M or G 
@@ -666,5 +666,5 @@
 	$value = is_array($value) ?
 		array_map('addslashes_deep', $value) :
-			(is_null($value) ? NULL : addslashes($value));
+			(is_null($value) ? NULL : mysql_real_escape_string($value));
 	return $value;
 }
@@ -680,6 +680,6 @@
  */
 function clean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
 		array_map('clean_cross_side_scripting_deep', $value) :
@@ -695,8 +695,8 @@
  */
 function unclean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
-		array_map('clean_cross_side_scripting_deep', $value) :
+		array_map('unclean_cross_side_scripting_deep', $value) :
 			(is_null($value) ? NULL : str_replace($out,$in,$value));
 	return $value;
Index: branches/0.71-bugfixes/inc/software.function.php
===================================================================
--- branches/0.71-bugfixes/inc/software.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/software.function.php (revision 8236)
@@ -1173,5 +1173,5 @@
 			$query .= " AND expire IS NULL";
 		} else {
-			$query .= " AND .expire = '" . addslashes($lic->fields['expire']) . "'";
+			$query .= " AND expire = '" . addslashes($lic->fields['expire']) . "'";
 		}
 
Index: branches/0.71-bugfixes/inc/rulesengine.class.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7901)
+++ branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7917)
@@ -2093,4 +2093,9 @@
 	}
 
+	function cleanDBonPurge($ID){
+		parent::cleanDBonPurge($ID);
+		$this->deleteCacheByRuleId($ID);
+	}
+
 	function post_updateItem($input,$updates,$history=1) {
 		if(isset($updates['match']))
Index: branches/0.71-bugfixes/inc/auth.function.php
===================================================================
--- branches/0.71-bugfixes/inc/auth.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/auth.function.php (revision 7985)
@@ -993,5 +993,5 @@
 			return $info[0]['dn'];
 		} else { // Si echec, essayer de deviner le DN / Flat LDAP
-			$dn = "$login_attr=$login, " . $basedn;
+			$dn = "$login_attr=$login," . $basedn;
 			return $dn;
 		}
Index: branches/0.71-bugfixes/inc/includes.php
===================================================================
--- branches/0.71-bugfixes/inc/includes.php (revision 7763)
+++ branches/0.71-bugfixes/inc/includes.php (revision 7934)
@@ -95,16 +95,18 @@
 // Security system
 if (isset($_POST)){
-	if (!get_magic_quotes_gpc()){
-		$_POST = array_map('addslashes_deep', $_POST);
+	if (get_magic_quotes_gpc()){
+		$_POST = array_map('stripslashes_deep', $_POST);
 	}
+
+	$_POST = array_map('addslashes_deep', $_POST);
 	$_POST = array_map('clean_cross_side_scripting_deep', $_POST);
 }
 if (isset($_GET)){
-	if (!get_magic_quotes_gpc()){
-		$_GET = array_map('addslashes_deep', $_GET);
+	if (get_magic_quotes_gpc()){
+		$_GET = array_map('stripslashes_deep', $_GET);
 	}
+	$_GET = array_map('addslashes_deep', $_GET);
 	$_GET = array_map('clean_cross_side_scripting_deep', $_GET);
 }
-
 
 
Index: branches/0.71-bugfixes/inc/rulesengine.function.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7997)
@@ -367,5 +367,5 @@
 		case "glpi_type_networking":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_NETWORKING);
-		case "glpi_dropdown_type_phone":
+		case "glpi_type_phones":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_PHONE);
 		case "glpi_dropdown_os":



From remi at fedoraproject.org  Sun Apr 26 14:55:47 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 14:55:47 +0000 (UTC)
Subject: rpms/glpi/F-9 glpi-0.71.5.patch,NONE,1.1 glpi.spec,1.21,1.22
Message-ID: <20090426145547.6C8C270125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22405

Modified Files:
	glpi.spec 
Added Files:
	glpi-0.71.5.patch 
Log Message:
post 0.71.5 patches from upstream

glpi-0.71.5.patch:

--- NEW FILE glpi-0.71.5.patch ---
Commits in branches/0.71-bugfixes after 0.71.5 released

	7917 Cache clean when rule is deleted see #1227
	7938 More security test
	7963 correct styles
	7978 restore problem 
	7985 Remove space when trying to build a user's dn
	7994 fix memory_limit = -1 detection
	7997 fix externalImportDropdown for phone
	8060 fix cartridge time in stock / used computation - Fixed #1243
	8100 don't delete dropdown ID=0
	8186 Error when making an ldap request and login field is not present 
	8202 default profil with CAS - fixed #1259
	8236 fix type in SQL request

Index: branches/0.71-bugfixes/ajax/dropdownValue.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7938)
@@ -52,4 +52,8 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 if (isset($_POST["entity_restrict"])&&!is_numeric($_POST["entity_restrict"])&&!is_array($_POST["entity_restrict"])){
Index: branches/0.71-bugfixes/ajax/dropdownUsersTracking.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7938)
@@ -47,4 +47,9 @@
 
 checkCentralAccess();
+
+// Security
+if ( ! FieldExists("glpi_tracking",$_POST['field']) ){
+	exit();
+}
 
 // Make a select box with all glpi users
Index: branches/0.71-bugfixes/ajax/autocompletion.php
===================================================================
--- branches/0.71-bugfixes/ajax/autocompletion.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/autocompletion.php (revision 7938)
@@ -45,4 +45,10 @@
 
 checkLoginUser();
+
+// Security
+if (! TableExists($_POST['table']) || ! FieldExists($_POST['table'],$_POST['field']) ){
+	exit();
+}
+
 $entity="";
 if (isset($_POST['entity_restrict'])&&$_POST['entity_restrict']>=0&&in_array($_POST['table'],$CFG_GLPI["specif_entities_tables"])){
Index: branches/0.71-bugfixes/ajax/dropdownFindNum.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7938)
@@ -41,4 +41,9 @@
 
 checkRight("create_ticket","1");
+
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 $where="";
Index: branches/0.71-bugfixes/ajax/comments.php
===================================================================
--- branches/0.71-bugfixes/ajax/comments.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/comments.php (revision 7938)
@@ -44,4 +44,9 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
+
 if (isset($_POST["table"])&&isset($_POST["value"])){	
 	switch ($_POST["table"]){
Index: branches/0.71-bugfixes/front/backup.php
===================================================================
--- branches/0.71-bugfixes/front/backup.php (revision 7883)
+++ branches/0.71-bugfixes/front/backup.php (revision 7978)
@@ -288,5 +288,6 @@
 		$buffer=fgets($fileHandle,102400);
 
-		if(substr($buffer, 0, 1) != "#")
+		// do not strip comments due to problems when # in begin of a data line
+		//if(substr($buffer, 0, 1) != "#")
 		{
 			$formattedQuery .= $buffer;
@@ -295,5 +296,5 @@
 
 				// Do not use the $DB->query 
-				if ($DB->query($formattedQuery)) //r???ssie sinon continue ???conca&t???er
+				if ($DB->query($formattedQuery)) //if no success continue to concatenate
 				{
 
Index: branches/0.71-bugfixes/front/setup.dropdowns.php
===================================================================
--- branches/0.71-bugfixes/front/setup.dropdowns.php (revision 7763)
+++ branches/0.71-bugfixes/front/setup.dropdowns.php (revision 8100)
@@ -52,4 +52,15 @@
 elseif (isset($_GET["which"]))$which=$_GET["which"];
 else $which="";
+
+
+// Security
+if (!empty($which) && ! TableExists($which) ){
+	exit();
+}
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
 
 if (isset($_GET["where"]))$where=$_GET["where"];
@@ -104,5 +115,5 @@
 	glpi_header($_SERVER['PHP_SELF']."?which=$which&value2=$value2&tomove=$tomove&where=$where&type=$type&FK_entities=$FK_entities");
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST["delete"]) && $_POST["ID"]>0) {
 	if(dropdownUsed($_POST["tablename"], $_POST["ID"]) && empty($_POST["forcedelete"])) {
 		if (!ereg("popup",$_SERVER['PHP_SELF'])){
Index: branches/0.71-bugfixes/front/entity.tree.php
===================================================================
--- branches/0.71-bugfixes/front/entity.tree.php (revision 7763)
+++ branches/0.71-bugfixes/front/entity.tree.php (revision 7938)
@@ -46,4 +46,10 @@
 
 $which=ENTITY_TYPE;
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
+
 
 if (isset($_GET["where"]))$where=$_GET["where"];
Index: branches/0.71-bugfixes/css/styles.css
===================================================================
--- branches/0.71-bugfixes/css/styles.css (revision 7763)
+++ branches/0.71-bugfixes/css/styles.css (revision 7963)
@@ -39,4 +39,5 @@
 	margin: 0;
 	padding: 0;
+	background: white;
 }
 
@@ -156,11 +157,14 @@
 	font-size: 11px;
 	border: 1px solid #888888;
+	color: black; 
+	background-color: white; 
 }
 
 
 textarea, input {
-background-color:#FAFAFA;
-border: 1px solid #888888;
-font-size: 11px;
+	background-color:#FAFAFA;
+	color: black; 
+	border: 1px solid #888888;
+	font-size: 11px;
 }
 
Index: branches/0.71-bugfixes/inc/search.function.php
===================================================================
--- branches/0.71-bugfixes/inc/search.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/search.function.php (revision 7929)
@@ -1473,4 +1473,9 @@
 function addOrderBy($type,$ID,$order,$key=0){
 	global $SEARCH_OPTION,$CFG_GLPI,$PLUGIN_HOOKS;
+
+	// Security test for order
+	if ($order!="ASC"){
+		$order="DESC";
+	}
 
 	$table=$SEARCH_OPTION[$type][$ID]["table"];
Index: branches/0.71-bugfixes/inc/ldap.function.php
===================================================================
--- branches/0.71-bugfixes/inc/ldap.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/ldap.function.php (revision 8186)
@@ -433,12 +433,18 @@
 				if (!$sync)
 				{
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 				else
 				{
 				//If ldap synchronisation
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 			}	
Index: branches/0.71-bugfixes/inc/user.class.php
===================================================================
--- branches/0.71-bugfixes/inc/user.class.php (revision 7875)
+++ branches/0.71-bugfixes/inc/user.class.php (revision 8202)
@@ -239,8 +239,8 @@
 
 		$this->syncLdapGroups($input);
-		$this->applyRightRules($input);
+		$rulesplayed = $this->applyRightRules($input);
 
 		// Add default profile
-		if ($input['auth_method']==AUTH_DB_GLPI || (isAlternateAuthWithLdap($input['auth_method']))){
+		if (!$rulesplayed){
 			$sql_default_profile = "SELECT ID FROM glpi_profiles WHERE is_default=1";
 			$result = $DB->query($sql_default_profile);
@@ -322,4 +322,6 @@
 	 *
 	 *@param $input data used to apply rules
+	 *
+	 *@return boolean : true if we play the Rule Engine
 	**/	
 	function applyRightRules($input){
@@ -388,6 +390,9 @@
 			//Unset all the temporary tables
 			unset($input["_ldap_rules"]);
-		}
-
+			
+			return true;
+		} 
+		return false;
+		 
 	}
 	/**
Index: branches/0.71-bugfixes/inc/tracking.function.php
===================================================================
--- branches/0.71-bugfixes/inc/tracking.function.php (revision 7899)
+++ branches/0.71-bugfixes/inc/tracking.function.php (revision 7946)
@@ -834,5 +834,5 @@
 			dropdownValue("glpi_groups", "assign_group", $assign_group,1,$_SESSION["glpiactive_entity"]);
 
-		} else if (haveRight("steal_ticket","1")) {
+		} else { // steal active
 			echo $LANG["job"][6].": ";
 			dropdownUsers("assign",$assign,"ID",0,1,$_SESSION["glpiactive_entity"]);
Index: branches/0.71-bugfixes/inc/cartridge.function.php
===================================================================
--- branches/0.71-bugfixes/inc/cartridge.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/cartridge.function.php (revision 8060)
@@ -345,6 +345,6 @@
 		echo $date_use;
 
-		$tmp_dbeg=split("-",$date_in);
-		$tmp_dend=split("-",$date_use);
+		$tmp_dbeg=split("-",$data["date_in"]);
+		$tmp_dend=split("-",$data["date_use"]);
 
 		$stock_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
@@ -356,6 +356,6 @@
 
 		if ($old!=0){
-			$tmp_dbeg=split("-",$date_use);
-			$tmp_dend=split("-",$date_out);
+			$tmp_dbeg=split("-",$data["date_use"]);
+			$tmp_dend=split("-",$data["date_out"]);
 
 			$use_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
Index: branches/0.71-bugfixes/inc/reminder.class.php
===================================================================
--- branches/0.71-bugfixes/inc/reminder.class.php (revision 7763)
+++ branches/0.71-bugfixes/inc/reminder.class.php (revision 7926)
@@ -56,5 +56,9 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 		$input["begin"] = $input["end"] = "0000-00-00 00:00:00";
@@ -84,5 +88,8 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 
Index: branches/0.71-bugfixes/inc/common.function.php
===================================================================
--- branches/0.71-bugfixes/inc/common.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/common.function.php (revision 7994)
@@ -563,5 +563,5 @@
 	//if(empty($mem)) {$mem=get_cfg_var("memory_limit");}  // Sous Win l'ini_get ne retourne rien.....
 
-	preg_match("/([0-9]+)([KMG]*)/",$mem,$matches);
+	preg_match("/([-0-9]+)([KMG]*)/",$mem,$matches);
 
 	// no K M or G 
@@ -666,5 +666,5 @@
 	$value = is_array($value) ?
 		array_map('addslashes_deep', $value) :
-			(is_null($value) ? NULL : addslashes($value));
+			(is_null($value) ? NULL : mysql_real_escape_string($value));
 	return $value;
 }
@@ -680,6 +680,6 @@
  */
 function clean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
 		array_map('clean_cross_side_scripting_deep', $value) :
@@ -695,8 +695,8 @@
  */
 function unclean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
-		array_map('clean_cross_side_scripting_deep', $value) :
+		array_map('unclean_cross_side_scripting_deep', $value) :
 			(is_null($value) ? NULL : str_replace($out,$in,$value));
 	return $value;
Index: branches/0.71-bugfixes/inc/software.function.php
===================================================================
--- branches/0.71-bugfixes/inc/software.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/software.function.php (revision 8236)
@@ -1173,5 +1173,5 @@
 			$query .= " AND expire IS NULL";
 		} else {
-			$query .= " AND .expire = '" . addslashes($lic->fields['expire']) . "'";
+			$query .= " AND expire = '" . addslashes($lic->fields['expire']) . "'";
 		}
 
Index: branches/0.71-bugfixes/inc/rulesengine.class.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7901)
+++ branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7917)
@@ -2093,4 +2093,9 @@
 	}
 
+	function cleanDBonPurge($ID){
+		parent::cleanDBonPurge($ID);
+		$this->deleteCacheByRuleId($ID);
+	}
+
 	function post_updateItem($input,$updates,$history=1) {
 		if(isset($updates['match']))
Index: branches/0.71-bugfixes/inc/auth.function.php
===================================================================
--- branches/0.71-bugfixes/inc/auth.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/auth.function.php (revision 7985)
@@ -993,5 +993,5 @@
 			return $info[0]['dn'];
 		} else { // Si echec, essayer de deviner le DN / Flat LDAP
-			$dn = "$login_attr=$login, " . $basedn;
+			$dn = "$login_attr=$login," . $basedn;
 			return $dn;
 		}
Index: branches/0.71-bugfixes/inc/includes.php
===================================================================
--- branches/0.71-bugfixes/inc/includes.php (revision 7763)
+++ branches/0.71-bugfixes/inc/includes.php (revision 7934)
@@ -95,16 +95,18 @@
 // Security system
 if (isset($_POST)){
-	if (!get_magic_quotes_gpc()){
-		$_POST = array_map('addslashes_deep', $_POST);
+	if (get_magic_quotes_gpc()){
+		$_POST = array_map('stripslashes_deep', $_POST);
 	}
+
+	$_POST = array_map('addslashes_deep', $_POST);
 	$_POST = array_map('clean_cross_side_scripting_deep', $_POST);
 }
 if (isset($_GET)){
-	if (!get_magic_quotes_gpc()){
-		$_GET = array_map('addslashes_deep', $_GET);
+	if (get_magic_quotes_gpc()){
+		$_GET = array_map('stripslashes_deep', $_GET);
 	}
+	$_GET = array_map('addslashes_deep', $_GET);
 	$_GET = array_map('clean_cross_side_scripting_deep', $_GET);
 }
-
 
 
Index: branches/0.71-bugfixes/inc/rulesengine.function.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7997)
@@ -367,5 +367,5 @@
 		case "glpi_type_networking":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_NETWORKING);
-		case "glpi_dropdown_type_phone":
+		case "glpi_type_phones":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_PHONE);
 		case "glpi_dropdown_os":


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- glpi.spec	26 Jan 2009 21:27:47 -0000	1.21
+++ glpi.spec	26 Apr 2009 14:55:46 -0000	1.22
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -23,6 +23,9 @@
 # backport from 0.72 (Changeset 7208)
 Patch0:         glpi-check.patch
 
+# Post 0.71.5 patches from SVN
+# https://dev.indepnet.net/glpi/changeset?format=diff&new=8236&old=7910&new_path=branches/0.71-bugfixes&old_path=branches/0.71-bugfixes
+Patch1:         glpi-0.71.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +70,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p2
 
 %if 0%{?rhel} == 4
 
@@ -230,6 +234,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-3
+- post 0.71.5 patches
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
 - update to 0.71.5 (Fix regression in 0.71.4)
 



From remi at fedoraproject.org  Sun Apr 26 15:02:31 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 15:02:31 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi-0.71.5.patch,NONE,1.1 glpi.spec,1.12,1.13
Message-ID: <20090426150231.C305770125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23733

Modified Files:
	glpi.spec 
Added Files:
	glpi-0.71.5.patch 
Log Message:
post 0.71.5 patches from upstream

glpi-0.71.5.patch:

--- NEW FILE glpi-0.71.5.patch ---
Commits in branches/0.71-bugfixes after 0.71.5 released

	7917 Cache clean when rule is deleted see #1227
	7938 More security test
	7963 correct styles
	7978 restore problem 
	7985 Remove space when trying to build a user's dn
	7994 fix memory_limit = -1 detection
	7997 fix externalImportDropdown for phone
	8060 fix cartridge time in stock / used computation - Fixed #1243
	8100 don't delete dropdown ID=0
	8186 Error when making an ldap request and login field is not present 
	8202 default profil with CAS - fixed #1259
	8236 fix type in SQL request

Index: branches/0.71-bugfixes/ajax/dropdownValue.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7938)
@@ -52,4 +52,8 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 if (isset($_POST["entity_restrict"])&&!is_numeric($_POST["entity_restrict"])&&!is_array($_POST["entity_restrict"])){
Index: branches/0.71-bugfixes/ajax/dropdownUsersTracking.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7938)
@@ -47,4 +47,9 @@
 
 checkCentralAccess();
+
+// Security
+if ( ! FieldExists("glpi_tracking",$_POST['field']) ){
+	exit();
+}
 
 // Make a select box with all glpi users
Index: branches/0.71-bugfixes/ajax/autocompletion.php
===================================================================
--- branches/0.71-bugfixes/ajax/autocompletion.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/autocompletion.php (revision 7938)
@@ -45,4 +45,10 @@
 
 checkLoginUser();
+
+// Security
+if (! TableExists($_POST['table']) || ! FieldExists($_POST['table'],$_POST['field']) ){
+	exit();
+}
+
 $entity="";
 if (isset($_POST['entity_restrict'])&&$_POST['entity_restrict']>=0&&in_array($_POST['table'],$CFG_GLPI["specif_entities_tables"])){
Index: branches/0.71-bugfixes/ajax/dropdownFindNum.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7938)
@@ -41,4 +41,9 @@
 
 checkRight("create_ticket","1");
+
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 $where="";
Index: branches/0.71-bugfixes/ajax/comments.php
===================================================================
--- branches/0.71-bugfixes/ajax/comments.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/comments.php (revision 7938)
@@ -44,4 +44,9 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
+
 if (isset($_POST["table"])&&isset($_POST["value"])){	
 	switch ($_POST["table"]){
Index: branches/0.71-bugfixes/front/backup.php
===================================================================
--- branches/0.71-bugfixes/front/backup.php (revision 7883)
+++ branches/0.71-bugfixes/front/backup.php (revision 7978)
@@ -288,5 +288,6 @@
 		$buffer=fgets($fileHandle,102400);
 
-		if(substr($buffer, 0, 1) != "#")
+		// do not strip comments due to problems when # in begin of a data line
+		//if(substr($buffer, 0, 1) != "#")
 		{
 			$formattedQuery .= $buffer;
@@ -295,5 +296,5 @@
 
 				// Do not use the $DB->query 
-				if ($DB->query($formattedQuery)) //r???ssie sinon continue ???conca&t???er
+				if ($DB->query($formattedQuery)) //if no success continue to concatenate
 				{
 
Index: branches/0.71-bugfixes/front/setup.dropdowns.php
===================================================================
--- branches/0.71-bugfixes/front/setup.dropdowns.php (revision 7763)
+++ branches/0.71-bugfixes/front/setup.dropdowns.php (revision 8100)
@@ -52,4 +52,15 @@
 elseif (isset($_GET["which"]))$which=$_GET["which"];
 else $which="";
+
+
+// Security
+if (!empty($which) && ! TableExists($which) ){
+	exit();
+}
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
 
 if (isset($_GET["where"]))$where=$_GET["where"];
@@ -104,5 +115,5 @@
 	glpi_header($_SERVER['PHP_SELF']."?which=$which&value2=$value2&tomove=$tomove&where=$where&type=$type&FK_entities=$FK_entities");
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST["delete"]) && $_POST["ID"]>0) {
 	if(dropdownUsed($_POST["tablename"], $_POST["ID"]) && empty($_POST["forcedelete"])) {
 		if (!ereg("popup",$_SERVER['PHP_SELF'])){
Index: branches/0.71-bugfixes/front/entity.tree.php
===================================================================
--- branches/0.71-bugfixes/front/entity.tree.php (revision 7763)
+++ branches/0.71-bugfixes/front/entity.tree.php (revision 7938)
@@ -46,4 +46,10 @@
 
 $which=ENTITY_TYPE;
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
+
 
 if (isset($_GET["where"]))$where=$_GET["where"];
Index: branches/0.71-bugfixes/css/styles.css
===================================================================
--- branches/0.71-bugfixes/css/styles.css (revision 7763)
+++ branches/0.71-bugfixes/css/styles.css (revision 7963)
@@ -39,4 +39,5 @@
 	margin: 0;
 	padding: 0;
+	background: white;
 }
 
@@ -156,11 +157,14 @@
 	font-size: 11px;
 	border: 1px solid #888888;
+	color: black; 
+	background-color: white; 
 }
 
 
 textarea, input {
-background-color:#FAFAFA;
-border: 1px solid #888888;
-font-size: 11px;
+	background-color:#FAFAFA;
+	color: black; 
+	border: 1px solid #888888;
+	font-size: 11px;
 }
 
Index: branches/0.71-bugfixes/inc/search.function.php
===================================================================
--- branches/0.71-bugfixes/inc/search.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/search.function.php (revision 7929)
@@ -1473,4 +1473,9 @@
 function addOrderBy($type,$ID,$order,$key=0){
 	global $SEARCH_OPTION,$CFG_GLPI,$PLUGIN_HOOKS;
+
+	// Security test for order
+	if ($order!="ASC"){
+		$order="DESC";
+	}
 
 	$table=$SEARCH_OPTION[$type][$ID]["table"];
Index: branches/0.71-bugfixes/inc/ldap.function.php
===================================================================
--- branches/0.71-bugfixes/inc/ldap.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/ldap.function.php (revision 8186)
@@ -433,12 +433,18 @@
 				if (!$sync)
 				{
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 				else
 				{
 				//If ldap synchronisation
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 			}	
Index: branches/0.71-bugfixes/inc/user.class.php
===================================================================
--- branches/0.71-bugfixes/inc/user.class.php (revision 7875)
+++ branches/0.71-bugfixes/inc/user.class.php (revision 8202)
@@ -239,8 +239,8 @@
 
 		$this->syncLdapGroups($input);
-		$this->applyRightRules($input);
+		$rulesplayed = $this->applyRightRules($input);
 
 		// Add default profile
-		if ($input['auth_method']==AUTH_DB_GLPI || (isAlternateAuthWithLdap($input['auth_method']))){
+		if (!$rulesplayed){
 			$sql_default_profile = "SELECT ID FROM glpi_profiles WHERE is_default=1";
 			$result = $DB->query($sql_default_profile);
@@ -322,4 +322,6 @@
 	 *
 	 *@param $input data used to apply rules
+	 *
+	 *@return boolean : true if we play the Rule Engine
 	**/	
 	function applyRightRules($input){
@@ -388,6 +390,9 @@
 			//Unset all the temporary tables
 			unset($input["_ldap_rules"]);
-		}
-
+			
+			return true;
+		} 
+		return false;
+		 
 	}
 	/**
Index: branches/0.71-bugfixes/inc/tracking.function.php
===================================================================
--- branches/0.71-bugfixes/inc/tracking.function.php (revision 7899)
+++ branches/0.71-bugfixes/inc/tracking.function.php (revision 7946)
@@ -834,5 +834,5 @@
 			dropdownValue("glpi_groups", "assign_group", $assign_group,1,$_SESSION["glpiactive_entity"]);
 
-		} else if (haveRight("steal_ticket","1")) {
+		} else { // steal active
 			echo $LANG["job"][6].": ";
 			dropdownUsers("assign",$assign,"ID",0,1,$_SESSION["glpiactive_entity"]);
Index: branches/0.71-bugfixes/inc/cartridge.function.php
===================================================================
--- branches/0.71-bugfixes/inc/cartridge.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/cartridge.function.php (revision 8060)
@@ -345,6 +345,6 @@
 		echo $date_use;
 
-		$tmp_dbeg=split("-",$date_in);
-		$tmp_dend=split("-",$date_use);
+		$tmp_dbeg=split("-",$data["date_in"]);
+		$tmp_dend=split("-",$data["date_use"]);
 
 		$stock_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
@@ -356,6 +356,6 @@
 
 		if ($old!=0){
-			$tmp_dbeg=split("-",$date_use);
-			$tmp_dend=split("-",$date_out);
+			$tmp_dbeg=split("-",$data["date_use"]);
+			$tmp_dend=split("-",$data["date_out"]);
 
 			$use_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
Index: branches/0.71-bugfixes/inc/reminder.class.php
===================================================================
--- branches/0.71-bugfixes/inc/reminder.class.php (revision 7763)
+++ branches/0.71-bugfixes/inc/reminder.class.php (revision 7926)
@@ -56,5 +56,9 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 		$input["begin"] = $input["end"] = "0000-00-00 00:00:00";
@@ -84,5 +88,8 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 
Index: branches/0.71-bugfixes/inc/common.function.php
===================================================================
--- branches/0.71-bugfixes/inc/common.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/common.function.php (revision 7994)
@@ -563,5 +563,5 @@
 	//if(empty($mem)) {$mem=get_cfg_var("memory_limit");}  // Sous Win l'ini_get ne retourne rien.....
 
-	preg_match("/([0-9]+)([KMG]*)/",$mem,$matches);
+	preg_match("/([-0-9]+)([KMG]*)/",$mem,$matches);
 
 	// no K M or G 
@@ -666,5 +666,5 @@
 	$value = is_array($value) ?
 		array_map('addslashes_deep', $value) :
-			(is_null($value) ? NULL : addslashes($value));
+			(is_null($value) ? NULL : mysql_real_escape_string($value));
 	return $value;
 }
@@ -680,6 +680,6 @@
  */
 function clean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
 		array_map('clean_cross_side_scripting_deep', $value) :
@@ -695,8 +695,8 @@
  */
 function unclean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
-		array_map('clean_cross_side_scripting_deep', $value) :
+		array_map('unclean_cross_side_scripting_deep', $value) :
 			(is_null($value) ? NULL : str_replace($out,$in,$value));
 	return $value;
Index: branches/0.71-bugfixes/inc/software.function.php
===================================================================
--- branches/0.71-bugfixes/inc/software.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/software.function.php (revision 8236)
@@ -1173,5 +1173,5 @@
 			$query .= " AND expire IS NULL";
 		} else {
-			$query .= " AND .expire = '" . addslashes($lic->fields['expire']) . "'";
+			$query .= " AND expire = '" . addslashes($lic->fields['expire']) . "'";
 		}
 
Index: branches/0.71-bugfixes/inc/rulesengine.class.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7901)
+++ branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7917)
@@ -2093,4 +2093,9 @@
 	}
 
+	function cleanDBonPurge($ID){
+		parent::cleanDBonPurge($ID);
+		$this->deleteCacheByRuleId($ID);
+	}
+
 	function post_updateItem($input,$updates,$history=1) {
 		if(isset($updates['match']))
Index: branches/0.71-bugfixes/inc/auth.function.php
===================================================================
--- branches/0.71-bugfixes/inc/auth.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/auth.function.php (revision 7985)
@@ -993,5 +993,5 @@
 			return $info[0]['dn'];
 		} else { // Si echec, essayer de deviner le DN / Flat LDAP
-			$dn = "$login_attr=$login, " . $basedn;
+			$dn = "$login_attr=$login," . $basedn;
 			return $dn;
 		}
Index: branches/0.71-bugfixes/inc/includes.php
===================================================================
--- branches/0.71-bugfixes/inc/includes.php (revision 7763)
+++ branches/0.71-bugfixes/inc/includes.php (revision 7934)
@@ -95,16 +95,18 @@
 // Security system
 if (isset($_POST)){
-	if (!get_magic_quotes_gpc()){
-		$_POST = array_map('addslashes_deep', $_POST);
+	if (get_magic_quotes_gpc()){
+		$_POST = array_map('stripslashes_deep', $_POST);
 	}
+
+	$_POST = array_map('addslashes_deep', $_POST);
 	$_POST = array_map('clean_cross_side_scripting_deep', $_POST);
 }
 if (isset($_GET)){
-	if (!get_magic_quotes_gpc()){
-		$_GET = array_map('addslashes_deep', $_GET);
+	if (get_magic_quotes_gpc()){
+		$_GET = array_map('stripslashes_deep', $_GET);
 	}
+	$_GET = array_map('addslashes_deep', $_GET);
 	$_GET = array_map('clean_cross_side_scripting_deep', $_GET);
 }
-
 
 
Index: branches/0.71-bugfixes/inc/rulesengine.function.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7997)
@@ -367,5 +367,5 @@
 		case "glpi_type_networking":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_NETWORKING);
-		case "glpi_dropdown_type_phone":
+		case "glpi_type_phones":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_PHONE);
 		case "glpi_dropdown_os":


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- glpi.spec	26 Jan 2009 21:26:34 -0000	1.12
+++ glpi.spec	26 Apr 2009 15:02:01 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -23,6 +23,9 @@
 # backport from 0.72 (Changeset 7208)
 Patch0:         glpi-check.patch
 
+# Post 0.71.5 patches from SVN
+# https://dev.indepnet.net/glpi/changeset?format=diff&new=8236&old=7910&new_path=branches/0.71-bugfixes&old_path=branches/0.71-bugfixes
+Patch1:         glpi-0.71.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +70,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p2
 
 %if 0%{?rhel} == 4
 
@@ -230,6 +234,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-3
+- post 0.71.5 patches
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
 - update to 0.71.5 (Fix regression in 0.71.4)
 



From remi at fedoraproject.org  Sun Apr 26 15:04:39 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 15:04:39 +0000 (UTC)
Subject: rpms/glpi/EL-4 glpi.spec,1.10,1.11
Message-ID: <20090426150439.8139F70125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24304

Modified Files:
	glpi.spec 
Log Message:
post 0.71.5 patches from upstream


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- glpi.spec	26 Jan 2009 21:30:37 -0000	1.10
+++ glpi.spec	26 Apr 2009 15:04:09 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -23,6 +23,9 @@
 # backport from 0.72 (Changeset 7208)
 Patch0:         glpi-check.patch
 
+# Post 0.71.5 patches from SVN
+# https://dev.indepnet.net/glpi/changeset?format=diff&new=8236&old=7910&new_path=branches/0.71-bugfixes&old_path=branches/0.71-bugfixes
+Patch1:         glpi-0.71.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -67,6 +70,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p2
 
 %if 0%{?rhel} == 4
 
@@ -230,6 +234,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-3
+- post 0.71.5 patches
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
 - update to 0.71.5 (Fix regression in 0.71.4)
 



From remi at fedoraproject.org  Sun Apr 26 15:05:22 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 26 Apr 2009 15:05:22 +0000 (UTC)
Subject: rpms/glpi/EL-4 glpi-0.71.5.patch,NONE,1.1
Message-ID: <20090426150522.2C43070125@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24514

Added Files:
	glpi-0.71.5.patch 
Log Message:
post 0.71.5 patches from upstream

glpi-0.71.5.patch:

--- NEW FILE glpi-0.71.5.patch ---
Commits in branches/0.71-bugfixes after 0.71.5 released

	7917 Cache clean when rule is deleted see #1227
	7938 More security test
	7963 correct styles
	7978 restore problem 
	7985 Remove space when trying to build a user's dn
	7994 fix memory_limit = -1 detection
	7997 fix externalImportDropdown for phone
	8060 fix cartridge time in stock / used computation - Fixed #1243
	8100 don't delete dropdown ID=0
	8186 Error when making an ldap request and login field is not present 
	8202 default profil with CAS - fixed #1259
	8236 fix type in SQL request

Index: branches/0.71-bugfixes/ajax/dropdownValue.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownValue.php (revision 7938)
@@ -52,4 +52,8 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 if (isset($_POST["entity_restrict"])&&!is_numeric($_POST["entity_restrict"])&&!is_array($_POST["entity_restrict"])){
Index: branches/0.71-bugfixes/ajax/dropdownUsersTracking.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/dropdownUsersTracking.php (revision 7938)
@@ -47,4 +47,9 @@
 
 checkCentralAccess();
+
+// Security
+if ( ! FieldExists("glpi_tracking",$_POST['field']) ){
+	exit();
+}
 
 // Make a select box with all glpi users
Index: branches/0.71-bugfixes/ajax/autocompletion.php
===================================================================
--- branches/0.71-bugfixes/ajax/autocompletion.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/autocompletion.php (revision 7938)
@@ -45,4 +45,10 @@
 
 checkLoginUser();
+
+// Security
+if (! TableExists($_POST['table']) || ! FieldExists($_POST['table'],$_POST['field']) ){
+	exit();
+}
+
 $entity="";
 if (isset($_POST['entity_restrict'])&&$_POST['entity_restrict']>=0&&in_array($_POST['table'],$CFG_GLPI["specif_entities_tables"])){
Index: branches/0.71-bugfixes/ajax/dropdownFindNum.php
===================================================================
--- branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7882)
+++ branches/0.71-bugfixes/ajax/dropdownFindNum.php (revision 7938)
@@ -41,4 +41,9 @@
 
 checkRight("create_ticket","1");
+
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
 
 $where="";
Index: branches/0.71-bugfixes/ajax/comments.php
===================================================================
--- branches/0.71-bugfixes/ajax/comments.php (revision 7763)
+++ branches/0.71-bugfixes/ajax/comments.php (revision 7938)
@@ -44,4 +44,9 @@
 checkLoginUser();
 
+// Security
+if (! TableExists($_POST['table']) ){
+	exit();
+}
+
 if (isset($_POST["table"])&&isset($_POST["value"])){	
 	switch ($_POST["table"]){
Index: branches/0.71-bugfixes/front/backup.php
===================================================================
--- branches/0.71-bugfixes/front/backup.php (revision 7883)
+++ branches/0.71-bugfixes/front/backup.php (revision 7978)
@@ -288,5 +288,6 @@
 		$buffer=fgets($fileHandle,102400);
 
-		if(substr($buffer, 0, 1) != "#")
+		// do not strip comments due to problems when # in begin of a data line
+		//if(substr($buffer, 0, 1) != "#")
 		{
 			$formattedQuery .= $buffer;
@@ -295,5 +296,5 @@
 
 				// Do not use the $DB->query 
-				if ($DB->query($formattedQuery)) //r???ssie sinon continue ???conca&t???er
+				if ($DB->query($formattedQuery)) //if no success continue to concatenate
 				{
 
Index: branches/0.71-bugfixes/front/setup.dropdowns.php
===================================================================
--- branches/0.71-bugfixes/front/setup.dropdowns.php (revision 7763)
+++ branches/0.71-bugfixes/front/setup.dropdowns.php (revision 8100)
@@ -52,4 +52,15 @@
 elseif (isset($_GET["which"]))$which=$_GET["which"];
 else $which="";
+
+
+// Security
+if (!empty($which) && ! TableExists($which) ){
+	exit();
+}
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
 
 if (isset($_GET["where"]))$where=$_GET["where"];
@@ -104,5 +115,5 @@
 	glpi_header($_SERVER['PHP_SELF']."?which=$which&value2=$value2&tomove=$tomove&where=$where&type=$type&FK_entities=$FK_entities");
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST["delete"]) && $_POST["ID"]>0) {
 	if(dropdownUsed($_POST["tablename"], $_POST["ID"]) && empty($_POST["forcedelete"])) {
 		if (!ereg("popup",$_SERVER['PHP_SELF'])){
Index: branches/0.71-bugfixes/front/entity.tree.php
===================================================================
--- branches/0.71-bugfixes/front/entity.tree.php (revision 7763)
+++ branches/0.71-bugfixes/front/entity.tree.php (revision 7938)
@@ -46,4 +46,10 @@
 
 $which=ENTITY_TYPE;
+
+// Security
+if (isset($_POST["tablename"]) && ! TableExists($_POST["tablename"]) ){
+	exit();
+}
+
 
 if (isset($_GET["where"]))$where=$_GET["where"];
Index: branches/0.71-bugfixes/css/styles.css
===================================================================
--- branches/0.71-bugfixes/css/styles.css (revision 7763)
+++ branches/0.71-bugfixes/css/styles.css (revision 7963)
@@ -39,4 +39,5 @@
 	margin: 0;
 	padding: 0;
+	background: white;
 }
 
@@ -156,11 +157,14 @@
 	font-size: 11px;
 	border: 1px solid #888888;
+	color: black; 
+	background-color: white; 
 }
 
 
 textarea, input {
-background-color:#FAFAFA;
-border: 1px solid #888888;
-font-size: 11px;
+	background-color:#FAFAFA;
+	color: black; 
+	border: 1px solid #888888;
+	font-size: 11px;
 }
 
Index: branches/0.71-bugfixes/inc/search.function.php
===================================================================
--- branches/0.71-bugfixes/inc/search.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/search.function.php (revision 7929)
@@ -1473,4 +1473,9 @@
 function addOrderBy($type,$ID,$order,$key=0){
 	global $SEARCH_OPTION,$CFG_GLPI,$PLUGIN_HOOKS;
+
+	// Security test for order
+	if ($order!="ASC"){
+		$order="DESC";
+	}
 
 	$table=$SEARCH_OPTION[$type][$ID]["table"];
Index: branches/0.71-bugfixes/inc/ldap.function.php
===================================================================
--- branches/0.71-bugfixes/inc/ldap.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/ldap.function.php (revision 8186)
@@ -433,12 +433,18 @@
 				if (!$sync)
 				{
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = $info[$ligne][$config_ldap->fields['ldap_login']][0];
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 				else
 				{
 				//If ldap synchronisation
-					$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
-					$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					if (in_array($config_ldap->fields['ldap_login'],$info[$ligne]))
+					{
+						$ldap_users[$info[$ligne][$config_ldap->fields['ldap_login']][0]] = ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+						$user_infos[$info[$ligne][$config_ldap->fields['ldap_login']][0]]["timestamp"]=ldapStamp2UnixStamp($info[$ligne]['modifytimestamp'][0],$config_ldap->fields['timezone'],true);
+					}
 				}
 			}	
Index: branches/0.71-bugfixes/inc/user.class.php
===================================================================
--- branches/0.71-bugfixes/inc/user.class.php (revision 7875)
+++ branches/0.71-bugfixes/inc/user.class.php (revision 8202)
@@ -239,8 +239,8 @@
 
 		$this->syncLdapGroups($input);
-		$this->applyRightRules($input);
+		$rulesplayed = $this->applyRightRules($input);
 
 		// Add default profile
-		if ($input['auth_method']==AUTH_DB_GLPI || (isAlternateAuthWithLdap($input['auth_method']))){
+		if (!$rulesplayed){
 			$sql_default_profile = "SELECT ID FROM glpi_profiles WHERE is_default=1";
 			$result = $DB->query($sql_default_profile);
@@ -322,4 +322,6 @@
 	 *
 	 *@param $input data used to apply rules
+	 *
+	 *@return boolean : true if we play the Rule Engine
 	**/	
 	function applyRightRules($input){
@@ -388,6 +390,9 @@
 			//Unset all the temporary tables
 			unset($input["_ldap_rules"]);
-		}
-
+			
+			return true;
+		} 
+		return false;
+		 
 	}
 	/**
Index: branches/0.71-bugfixes/inc/tracking.function.php
===================================================================
--- branches/0.71-bugfixes/inc/tracking.function.php (revision 7899)
+++ branches/0.71-bugfixes/inc/tracking.function.php (revision 7946)
@@ -834,5 +834,5 @@
 			dropdownValue("glpi_groups", "assign_group", $assign_group,1,$_SESSION["glpiactive_entity"]);
 
-		} else if (haveRight("steal_ticket","1")) {
+		} else { // steal active
 			echo $LANG["job"][6].": ";
 			dropdownUsers("assign",$assign,"ID",0,1,$_SESSION["glpiactive_entity"]);
Index: branches/0.71-bugfixes/inc/cartridge.function.php
===================================================================
--- branches/0.71-bugfixes/inc/cartridge.function.php (revision 7763)
+++ branches/0.71-bugfixes/inc/cartridge.function.php (revision 8060)
@@ -345,6 +345,6 @@
 		echo $date_use;
 
-		$tmp_dbeg=split("-",$date_in);
-		$tmp_dend=split("-",$date_use);
+		$tmp_dbeg=split("-",$data["date_in"]);
+		$tmp_dend=split("-",$data["date_use"]);
 
 		$stock_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
@@ -356,6 +356,6 @@
 
 		if ($old!=0){
-			$tmp_dbeg=split("-",$date_use);
-			$tmp_dend=split("-",$date_out);
+			$tmp_dbeg=split("-",$data["date_use"]);
+			$tmp_dend=split("-",$data["date_out"]);
 
 			$use_time_tmp= mktime(0,0,0,$tmp_dend[1],$tmp_dend[2],$tmp_dend[0]) 
Index: branches/0.71-bugfixes/inc/reminder.class.php
===================================================================
--- branches/0.71-bugfixes/inc/reminder.class.php (revision 7763)
+++ branches/0.71-bugfixes/inc/reminder.class.php (revision 7926)
@@ -56,5 +56,9 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 		$input["begin"] = $input["end"] = "0000-00-00 00:00:00";
@@ -84,5 +88,8 @@
 		global $LANG;
 
-		if(empty($input["name"])) $input["name"]=$LANG["reminder"][15];
+		$input["name"] = trim($input["name"]);
+		if(empty($input["name"])) {
+			$input["name"]=$LANG["reminder"][15];
+		}
 
 
Index: branches/0.71-bugfixes/inc/common.function.php
===================================================================
--- branches/0.71-bugfixes/inc/common.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/common.function.php (revision 7994)
@@ -563,5 +563,5 @@
 	//if(empty($mem)) {$mem=get_cfg_var("memory_limit");}  // Sous Win l'ini_get ne retourne rien.....
 
-	preg_match("/([0-9]+)([KMG]*)/",$mem,$matches);
+	preg_match("/([-0-9]+)([KMG]*)/",$mem,$matches);
 
 	// no K M or G 
@@ -666,5 +666,5 @@
 	$value = is_array($value) ?
 		array_map('addslashes_deep', $value) :
-			(is_null($value) ? NULL : addslashes($value));
+			(is_null($value) ? NULL : mysql_real_escape_string($value));
 	return $value;
 }
@@ -680,6 +680,6 @@
  */
 function clean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
 		array_map('clean_cross_side_scripting_deep', $value) :
@@ -695,8 +695,8 @@
  */
 function unclean_cross_side_scripting_deep($value) {
-	$in=array("<",">");
-	$out=array("&lt;","&gt;");
+	$in=array('<','>'); 
+	$out=array("&lt;","&gt;"); 
 	$value = is_array($value) ?
-		array_map('clean_cross_side_scripting_deep', $value) :
+		array_map('unclean_cross_side_scripting_deep', $value) :
 			(is_null($value) ? NULL : str_replace($out,$in,$value));
 	return $value;
Index: branches/0.71-bugfixes/inc/software.function.php
===================================================================
--- branches/0.71-bugfixes/inc/software.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/software.function.php (revision 8236)
@@ -1173,5 +1173,5 @@
 			$query .= " AND expire IS NULL";
 		} else {
-			$query .= " AND .expire = '" . addslashes($lic->fields['expire']) . "'";
+			$query .= " AND expire = '" . addslashes($lic->fields['expire']) . "'";
 		}
 
Index: branches/0.71-bugfixes/inc/rulesengine.class.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7901)
+++ branches/0.71-bugfixes/inc/rulesengine.class.php (revision 7917)
@@ -2093,4 +2093,9 @@
 	}
 
+	function cleanDBonPurge($ID){
+		parent::cleanDBonPurge($ID);
+		$this->deleteCacheByRuleId($ID);
+	}
+
 	function post_updateItem($input,$updates,$history=1) {
 		if(isset($updates['match']))
Index: branches/0.71-bugfixes/inc/auth.function.php
===================================================================
--- branches/0.71-bugfixes/inc/auth.function.php (revision 7882)
+++ branches/0.71-bugfixes/inc/auth.function.php (revision 7985)
@@ -993,5 +993,5 @@
 			return $info[0]['dn'];
 		} else { // Si echec, essayer de deviner le DN / Flat LDAP
-			$dn = "$login_attr=$login, " . $basedn;
+			$dn = "$login_attr=$login," . $basedn;
 			return $dn;
 		}
Index: branches/0.71-bugfixes/inc/includes.php
===================================================================
--- branches/0.71-bugfixes/inc/includes.php (revision 7763)
+++ branches/0.71-bugfixes/inc/includes.php (revision 7934)
@@ -95,16 +95,18 @@
 // Security system
 if (isset($_POST)){
-	if (!get_magic_quotes_gpc()){
-		$_POST = array_map('addslashes_deep', $_POST);
+	if (get_magic_quotes_gpc()){
+		$_POST = array_map('stripslashes_deep', $_POST);
 	}
+
+	$_POST = array_map('addslashes_deep', $_POST);
 	$_POST = array_map('clean_cross_side_scripting_deep', $_POST);
 }
 if (isset($_GET)){
-	if (!get_magic_quotes_gpc()){
-		$_GET = array_map('addslashes_deep', $_GET);
+	if (get_magic_quotes_gpc()){
+		$_GET = array_map('stripslashes_deep', $_GET);
 	}
+	$_GET = array_map('addslashes_deep', $_GET);
 	$_GET = array_map('clean_cross_side_scripting_deep', $_GET);
 }
-
 
 
Index: branches/0.71-bugfixes/inc/rulesengine.function.php
===================================================================
--- branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7875)
+++ branches/0.71-bugfixes/inc/rulesengine.function.php (revision 7997)
@@ -367,5 +367,5 @@
 		case "glpi_type_networking":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_NETWORKING);
-		case "glpi_dropdown_type_phone":
+		case "glpi_type_phones":
 			return getRuleCollectionClass(RULE_DICTIONNARY_TYPE_PHONE);
 		case "glpi_dropdown_os":



From mtasaka at fedoraproject.org  Sun Apr 26 16:19:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 26 Apr 2009 16:19:17 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.361, 1.362 jd.spec, 1.419, 1.420 sources,
	1.362, 1.363
Message-ID: <20090426161917.87F5C70125@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3622/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- .cvsignore	23 Apr 2009 16:42:20 -0000	1.361
+++ .cvsignore	26 Apr 2009 16:18:45 -0000	1.362
@@ -1 +1 @@
-jd-2.4.0-svn2783_trunk.tgz
+jd-2.4.0-svn2786_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- jd.spec	23 Apr 2009 16:42:20 -0000	1.419
+++ jd.spec	26 Apr 2009 16:18:45 -0000	1.420
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2783_trunk
+%define         strtag        svn2786_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- sources	23 Apr 2009 16:42:20 -0000	1.362
+++ sources	26 Apr 2009 16:18:45 -0000	1.363
@@ -1 +1 @@
-518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz
+8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz



From mtasaka at fedoraproject.org  Sun Apr 26 16:19:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 26 Apr 2009 16:19:17 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.361, 1.362 jd.spec, 1.410, 1.411 sources, 
	1.362, 1.363
Message-ID: <20090426161917.9742C7013F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3622/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- .cvsignore	23 Apr 2009 16:42:21 -0000	1.361
+++ .cvsignore	26 Apr 2009 16:18:46 -0000	1.362
@@ -1 +1 @@
-jd-2.4.0-svn2783_trunk.tgz
+jd-2.4.0-svn2786_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- jd.spec	23 Apr 2009 16:42:21 -0000	1.410
+++ jd.spec	26 Apr 2009 16:18:46 -0000	1.411
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2783_trunk
+%define         strtag        svn2786_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- sources	23 Apr 2009 16:42:21 -0000	1.362
+++ sources	26 Apr 2009 16:18:46 -0000	1.363
@@ -1 +1 @@
-518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz
+8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz



From mtasaka at fedoraproject.org  Sun Apr 26 16:19:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 26 Apr 2009 16:19:17 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.351, 1.352 jd.spec, 1.411, 1.412 sources,
	1.352, 1.353
Message-ID: <20090426161917.A2BEE70141@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3622/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- .cvsignore	23 Apr 2009 16:42:21 -0000	1.351
+++ .cvsignore	26 Apr 2009 16:18:47 -0000	1.352
@@ -1 +1 @@
-jd-2.4.0-svn2783_trunk.tgz
+jd-2.4.0-svn2786_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- jd.spec	23 Apr 2009 16:42:21 -0000	1.411
+++ jd.spec	26 Apr 2009 16:18:47 -0000	1.412
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2783_trunk
+%define         strtag        svn2786_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- sources	23 Apr 2009 16:42:22 -0000	1.352
+++ sources	26 Apr 2009 16:18:47 -0000	1.353
@@ -1 +1 @@
-518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz
+8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz



From mtasaka at fedoraproject.org  Sun Apr 26 16:19:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 26 Apr 2009 16:19:17 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.354, 1.355 jd.spec, 1.414, 1.415 sources,
	1.355, 1.356
Message-ID: <20090426161917.923CA70129@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3622/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
Update to the latest


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- .cvsignore	23 Apr 2009 16:42:21 -0000	1.354
+++ .cvsignore	26 Apr 2009 16:18:46 -0000	1.355
@@ -1 +1 @@
-jd-2.4.0-svn2783_trunk.tgz
+jd-2.4.0-svn2786_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- jd.spec	23 Apr 2009 16:42:21 -0000	1.414
+++ jd.spec	26 Apr 2009 16:18:46 -0000	1.415
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2783_trunk
+%define         strtag        svn2786_trunk
 %define         repoid        38008
 # Define this if this is pre-version
 %define         pre_release   1
@@ -138,7 +138,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Apr 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to latest trunk
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- sources	23 Apr 2009 16:42:21 -0000	1.355
+++ sources	26 Apr 2009 16:18:46 -0000	1.356
@@ -1 +1 @@
-518c9388ddc27d99f86b28809d7b0385  jd-2.4.0-svn2783_trunk.tgz
+8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz



From james at fedoraproject.org  Sun Apr 26 17:07:18 2009
From: james at fedoraproject.org (James Antill)
Date: Sun, 26 Apr 2009 17:07:18 +0000 (UTC)
Subject: rpms/yum-presto/devel cleanup.patch, NONE, 1.1 yum-presto.spec, 1.11,
	1.12
Message-ID: <20090426170719.498D670125@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10770

Modified Files:
	yum-presto.spec 
Added Files:
	cleanup.patch 
Log Message:
* Sun Apr 26 2009 James Antill <james at fedoraproject.org> - 0.4.5-5
- Added cleanup patch from upstream.
- Adds progress for rebuilding.


cleanup.patch:

--- NEW FILE cleanup.patch ---
commit 07aa63c211c76738b9b98e75831f8bd041feb2f7
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Apr 17 10:49:53 2009 -0400

    Cleanup, add doclines, add verbose messages

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index b545b9e..8f769ae 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -21,7 +21,6 @@
 # Copyright 2007 Red Hat, Inc.  -- Jeremy Katz <katzj at redhat.com>
 
 import os
-import sys
 import subprocess
 import gzip
 import thread
@@ -36,6 +35,7 @@ from yum.plugins import TYPE_CORE, PluginYumExit
 import yum.Errors
 import yum.misc
 from urlgrabber.grabber import URLGrabError
+from urlgrabber.progress import format_number
 
 complete_download_size = 0
 actual_download_size   = 0
@@ -47,26 +47,30 @@ plugin_type = (TYPE_CORE,)
 pinfo = {}
 
 def verifyDelta(sequence, arch):
+    """checks that the deltarpm can be applied"""
     if subprocess.call(["/usr/bin/applydeltarpm", "-a", arch,
                         "-C", "-s", sequence], close_fds=True):
         return False
     return True
 
 def applyDelta(deltarpmfile, newrpmfile, arch):
+    """applies the deltarpm to create the new rpm"""
     if subprocess.call(["/usr/bin/applydeltarpm", "-a", arch,
                         deltarpmfile, newrpmfile], close_fds=True):
         return False
     return True
 
 def reconstruct(conduit, rpmlocal, rpmarch, deltalocal):
+    """logic around applyDelta"""
     retlist = ""
     global actual_download_size
 
     if not applyDelta(deltalocal, rpmlocal, rpmarch):
-        retlist += "Error rebuilding rpm from %s! Will download full package.\n" % os.path.basename(deltalocal)
+        retlist += "Error rebuilding rpm from %s! Will " \
+                      "download full package.\n" % os.path.basename(deltalocal)
         try:
             os.unlink(rpmlocal)
-        except:
+        except (OSError, IOError), e:
             pass
     else:
         # Calculate new download size
@@ -76,24 +80,19 @@ def reconstruct(conduit, rpmlocal, rpmarch, deltalocal):
         actual_download_size = actual_download_size - rpm_size + drpm_size
         
         # Check to see whether or not we should keep the drpms
-        # FIXME: Is there any way to see whether or not a Boolean option was not set?
-        if conduit.confBool('main', 'neverkeepdeltas'):
-            delete = True
-        elif conduit.confBool('main', 'keepdeltas'):
+        delete = not conduit.getConf().keepcache
+        if conduit.confBool('main', 'keepdeltas'):
             delete = False
-        elif conduit.getConf().keepcache != 0:
-            delete = False
-        else:
-            delete = True
         
         if delete:
             try:
                 os.unlink(deltalocal)
-            except:
+            except (OSError, IOError), e:
                 pass
     return retlist
 
 class ReconstructionThread(threading.Thread):
+    """Threaded process to create rpms from deltarpms"""
     def __init__(self, queue, lock, run_function):
         threading.Thread.__init__(self)
         self.run_function = run_function
@@ -128,28 +127,36 @@ class ReconstructionThread(threading.Thread):
                     self.lock.release()
  
 
-def getDelta(po, presto, rpmdb):
+def getDelta(po, presto, conduit):
     """Does the package have a reasonable delta for us to use?"""
     global complete_download_size
     global actual_download_size
+    rpmdb = conduit.getRpmDB()
 
     # local packages don't make sense to use a delta for...
     if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
+        conduit.info(5, "Package %s.%s is local, not using a delta" 
+                         % (po.name, po.arch))
         return None
     if po.remote_url.startswith("file:/"):
         # kind of a hack, but file:/ repos are basically local
+        conduit.info(5, "Package %s.%s is in a file:// repo, not using a delta"
+                         % (po.name, po.arch))
         return None
 
     # if there's not presto info for the repo, we don't have a delta for
     # the package
     if not presto.has_key(po.repo.id):
+        conduit.info(5, "No delta information for repository %s." % po.repo.id)
         return None
     deltainfo = presto[po.repo.id]
 
     # any deltas for the new package in the repo?
-    nevra = "%s-%s:%s-%s.%s" %(po.name, po.epoch, po.version,
-                               po.release, po.arch)    
+    nevra = "%s-%s:%s-%s.%s" % (po.name, po.epoch, po.version,
+                               po.release, po.arch)
     if not deltainfo.has_key(nevra):
+        conduit.info(5, "Could not find delta rpm for package %s.%s." 
+                         % (po.name, po.arch))
         return None
     deltas = deltainfo[nevra]
 
@@ -161,21 +168,27 @@ def getDelta(po, presto, rpmdb):
         if po.verifyLocalPkg(): # we've got it.
             actual_download_size   -= cursize
             complete_download_size -= cursize
+            conduit.info(5, "Already have package for %s.%s." 
+                             % (po.name, po.arch))
             return None
         if cursize < totsize: # we have part of the file; do a reget
+            conduit.info(5, "Already have part of package for %s.%s." 
+                             % (po.name, po.arch))
             return None
         os.unlink(local)
 
     # did we have a previous package of the same arch installed?
     installed = rpmdb.searchNevra(po.name, None, None, None, po.arch)
     if len(installed) == 0:
+        conduit.info(5, "Package for %s.%s of the same arch not installed." 
+                         % (po.name, po.arch))
         return None
             
     # now, let's see if there's a delta for us...
     bestdelta = None
 
     for oldpo in installed:
-        evr = "%s:%s-%s" %(oldpo.epoch, oldpo.version, oldpo.release)        
+        evr = "%s:%s-%s" % (oldpo.epoch, oldpo.version, oldpo.release)
         if not deltas.has_key(evr):
             continue
         delta = deltas[evr]
@@ -188,7 +201,8 @@ def getDelta(po, presto, rpmdb):
             continue
 
         bestdelta = delta
-
+    if not bestdelta:
+        conduit.info(5, "No delta rpm for %s.%s." % (po.name, po.arch))
     return bestdelta
     
 
@@ -212,7 +226,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     # see which deltas we need to download; if the delta is already
     # downloaded, we can start it reconstructing in the background
     for po in download_pkgs:
-        delta = getDelta(po, presto, conduit.getRpmDB())
+        delta = getDelta(po, presto, conduit)
         if delta is None:
             continue
 
@@ -231,7 +245,9 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                                              delta['checksum'])
             except URLGrabError, e:
                 if po.repo.cache:
-                    raise yum.Errors.RepoError, "Caching enabled and local cache for %s doesn't match checksum" %(deltapath,)
+                    msg = "Caching enabled and local cache for " \
+                               "%sdoesn't match checksum" % deltapath
+                    raise yum.Errors.RepoError, msg
                 else:
                     cursize = os.stat(deltapath)[6]
                     totsize = long(delta['size'])
@@ -268,7 +284,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                     'to download' % (deltadir,))
             continue
         try:
-            text = "(%s/%s): %s" %(i, len(remote_pkgs),
+            text = "(%s/%s): %s" % (i, len(remote_pkgs),
                                    os.path.basename(delta['filename']))
             deltafile = po.repo._getFile(url=po.basepath,
                                     relative=delta['filename'],
@@ -305,12 +321,16 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     return errors
 
 class DeltaInfo(object):
+    """Base Delta rpm info object"""
     def __init__(self, elem):
         self.epoch = elem.get("oldepoch")
         self.version = elem.get("oldversion")
         self.release = elem.get("oldrelease")
-
-        self.filename = self.sequence = self.size = self.checksum = self.checksum_type = None
+        self.filename = None
+        self.sequence = None
+        self.size = None
+        self.checksum = None
+        self.checksum_type = None
 
         for x in elem.getchildren():
             if x.tag == "checksum":
@@ -318,10 +338,12 @@ class DeltaInfo(object):
             setattr(self, x.tag, x.text)
 
     def evr(self):
-        return "%s:%s-%s" %(self.epoch, self.version, self.release)
+        return "%s:%s-%s" % (self.epoch, self.version, self.release)
 
     def __str__(self):
-        return "filename: %s, sequence: %s, size: %s, checksum (%s) = %s" % (self.filename, self.sequence, self.size, self.checksum_type, self.checksum)
+        return "filename: %s, sequence: %s, size: %s, checksum (%s) = %s" \
+                         % (self.filename, self.sequence, self.size, 
+                            self.checksum_type, self.checksum)
 
     def __getitem__(self, key):
         return getattr(self, key)
@@ -339,7 +361,7 @@ class NewPackage(object):
             self.deltas[d.evr()] = d
 
     def nevra(self):
-        return "%s-%s:%s-%s.%s" %(self.name, self.epoch, self.version,
+        return "%s-%s:%s-%s.%s" % (self.name, self.epoch, self.version,
                                   self.release, self.arch)
 
     def __str__(self):
@@ -366,46 +388,6 @@ class PrestoParser(object):
     def getDeltas(self):
         return self.deltainfo
 
-def format_number(number, SI=False, space=''):
-    """Turn numbers into human-readable metric-like numbers"""
-    symbols = ['',  # (none)
-                'K', # kilo
-                'M', # mega
-                'G', # giga
-                'T', # tera
-                'P', # peta
-                'E', # exa
-                'Z', # zetta
-                'Y'] # yotta
-
-    if SI: step = 1000.0
-    else: step = 1024.0
-
-    thresh = 999
-    depth = 0
-
-    # we want numbers between 
-    while number > thresh:
-        depth  = depth + 1
-        number = number / step
-
-    # just in case someone needs more than 1000 yottabytes!
-    diff = depth - len(symbols) + 1
-    if diff > 0:
-        depth = depth - diff
-        number = number * thresh**depth
-
-    if type(number) == type(1) or type(number) == type(1L):
-        format = '%i%s%s'
-    elif number < 9.95:
-        # must use 9.95 for proper sizing.  For example, 9.99 will be
-        # rounded to 10.0 with the .1f format string (which is too long)
-        format = '%.1f%s%s'
-    else:
-        format = '%.0f%s%s'
-
-    return(format % (number, space, symbols[depth]))
-
 # Configuration stuff
 def config_hook(conduit):
     # Add --disable-presto option
@@ -431,8 +413,8 @@ def xpostreposetup_hook(conduit, repos=None):
     for active_repo in repos:
         try:
             deltamd = active_repo.retrieveMD("prestodelta")
-        except:
-            conduit.info(2, "No Presto metadata available for %s" %(active_repo,))
+        except yum.Errors.RepoError, e:
+            conduit.info(2, "No Presto metadata available for %s" % active_repo)
             continue
         pinfo[active_repo.id] = PrestoParser(deltamd).getDeltas()
 
@@ -490,6 +472,9 @@ def posttrans_hook(conduit):
     drpm_string = format_number(actual_download_size)
     rpm_string = format_number(complete_download_size)
         
-    conduit.info(2, "Size of all updates downloaded from Presto-enabled repositories: %s" % drpm_string)
-    conduit.info(2, "Size of updates that would have been downloaded if Presto wasn't enabled: %s" % rpm_string)
-    conduit.info(2, "This is a savings of %i percent" % (100 - ((actual_download_size * 100) / complete_download_size)))
+    conduit.info(2, "Size of all updates downloaded from Presto-enabled " \
+                    "repositories: %s" % drpm_string)
+    conduit.info(2, "Size of updates that would have been downloaded if " \
+                    "Presto wasn't enabled: %s" % rpm_string)
+    saveper = 100 - ((actual_download_size * 100) / complete_download_size)
+    conduit.info(2, "This is a savings of %i percent" % saveper)
commit 427b294b95dcb1dda24638c1470c3a7f9dbbe15c
Author: James Antill <james at and.org>
Date:   Fri Apr 17 10:51:48 2009 -0400

    Document the config. change, and how it works

diff --git a/yum-presto/presto.conf b/yum-presto/presto.conf
index b7dc4a9..a066321 100644
--- a/yum-presto/presto.conf
+++ b/yum-presto/presto.conf
@@ -3,5 +3,6 @@
 
 [main]
 enabled=1
-neverkeepdeltas=1
+# This defaults to yum's keepcache option, if not set.
+# keepdeltas = false
 
commit 4355d92b82a129e922269de1efcc6f24caa9b27b
Author: James Antill <james at and.org>
Date:   Fri Apr 24 01:02:13 2009 -0400

    Can't trust applydeltarpm for if the pkg is good, use verifyLocalPkg()

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index 8f769ae..bb9052d 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -60,12 +60,14 @@ def applyDelta(deltarpmfile, newrpmfile, arch):
         return False
     return True
 
-def reconstruct(conduit, rpmlocal, rpmarch, deltalocal):
+def reconstruct(conduit, po, deltalocal):
     """logic around applyDelta"""
     retlist = ""
     global actual_download_size
 
-    if not applyDelta(deltalocal, rpmlocal, rpmarch):
+    rpmlocal = po.localpath
+    rpmarch  = po.arch
+    if not applyDelta(deltalocal, rpmlocal, rpmarch) or not po.verifyLocalPkg():
         retlist += "Error rebuilding rpm from %s! Will " \
                       "download full package.\n" % os.path.basename(deltalocal)
         try:
@@ -258,7 +260,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
             else:
                 # Deltarpm is local and good, put it in the rebuild thread.
                 conduit.info(5, "using local copy of deltarpm for %s" % po)
-                queue.put((conduit, po.localpath, po.arch, deltapath))
+                queue.put((conduit, po, deltapath))
                 continue
         else:
             remote_pkgs.append( (po, delta) )
@@ -295,7 +297,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
         except yum.Errors.RepoError, e:
             adderror(po, str(e))
         else:
-            queue.put((conduit, po.localpath, po.arch, deltafile))
+            queue.put((conduit, po, deltafile))
 
             if errors.has_key(po):
                 del errors[po]
commit a5b0c51b5d2fe31182554455dc4fb108af42fc12
Author: James Antill <james at and.org>
Date:   Fri Apr 24 02:00:03 2009 -0400

    Add progress for drpm rebuilds, uses repo. "download" callback

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index bb9052d..e48e498 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -23,6 +23,7 @@
 import os
 import subprocess
 import gzip
+import time
 import thread
 import threading
 import Queue
@@ -40,6 +41,11 @@ from urlgrabber.progress import format_number
 complete_download_size = 0
 actual_download_size   = 0
 
+process_lock     = None # For progress, updated in thread
+processed_t_size = 0    # For progress, updated in thread
+processed_f_size = 0    # For progress, updated in thread
+processing_fname = None # For progress, updated in thread
+
 requires_api_version = '2.1'
 plugin_type = (TYPE_CORE,)
 
@@ -60,14 +66,22 @@ def applyDelta(deltarpmfile, newrpmfile, arch):
         return False
     return True
 
-def reconstruct(conduit, po, deltalocal):
+def reconstruct(conduit, po, deltalocal, deltasize):
     """logic around applyDelta"""
     retlist = ""
     global actual_download_size
 
     rpmlocal = po.localpath
     rpmarch  = po.arch
+    process_lock.acquire()
+    processing_fname = rpmlocal
+    process_lock.release()
     if not applyDelta(deltalocal, rpmlocal, rpmarch) or not po.verifyLocalPkg():
+        process_lock.acquire()
+        processing_fname = None
+        processed_f_size += po.size
+        process_lock.release()
+
         retlist += "Error rebuilding rpm from %s! Will " \
                       "download full package.\n" % os.path.basename(deltalocal)
         try:
@@ -75,11 +89,13 @@ def reconstruct(conduit, po, deltalocal):
         except (OSError, IOError), e:
             pass
     else:
+        process_lock.acquire()
+        processing_fname = None
+        processed_t_size += po.size
+        process_lock.release()
+
         # Calculate new download size
-        rpm_size = os.stat(rpmlocal)[6]
-        drpm_size = os.stat(deltalocal)[6]
-        
-        actual_download_size = actual_download_size - rpm_size + drpm_size
+        actual_download_size -= po.size - deltasize
         
         # Check to see whether or not we should keep the drpms
         delete = not conduit.getConf().keepcache
@@ -206,17 +222,37 @@ def getDelta(po, presto, conduit):
     if not bestdelta:
         conduit.info(5, "No delta rpm for %s.%s." % (po.name, po.arch))
     return bestdelta
-    
+
+def _processing_data():
+    process_lock.acquire()
+    ptsz = processed_t_size
+    pfsz = processed_f_size
+    pfnm = processing_fname
+    process_lock.release()
+    return ptsz, pfsz, pfnm
+
+def _safe_stat_size(fname):
+    if fname is None:
+        return 0
+
+    try:
+        return os.stat(fname)[6]
+    except:
+        return 0
 
 def downloadPkgs(conduit, presto, download_pkgs=None):
     """download list of package objects handed to you, return errors"""
+    global process_lock
 
     errors = {}
     def adderror(po, msg):
         errors.setdefault(po, []).append(msg)
 
+    rebuild_size = 0 # Size of packages we are going to rebuild.
+
     # Set up thread for applying drpms
     queue = Queue.Queue(0)
+    process_lock = thread.allocate_lock()
     lock = thread.allocate_lock()
     curthread = ReconstructionThread(queue, lock, reconstruct)
     curthread.start()
@@ -225,6 +261,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
 
     if download_pkgs is None:
         download_pkgs = conduit.getDownloadPackages()
+
     # see which deltas we need to download; if the delta is already
     # downloaded, we can start it reconstructing in the background
     for po in download_pkgs:
@@ -260,7 +297,10 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
             else:
                 # Deltarpm is local and good, put it in the rebuild thread.
                 conduit.info(5, "using local copy of deltarpm for %s" % po)
-                queue.put((conduit, po, deltapath))
+                # HACK: Use the download progress, at least we get something
+                cb = po.repo.callback
+                queue.put((conduit, po, deltapath, long(delta['size'])))
+                rebuild_size += po.size
                 continue
         else:
             remote_pkgs.append( (po, delta) )
@@ -281,7 +321,8 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
 
         # FIXME: this should be moved into _getFile
         dirstat = os.statvfs(deltadir)
-        if (dirstat.f_bavail * dirstat.f_bsize) <= long(po.size):
+        if (dirstat.f_bavail * dirstat.f_bsize) <= (long(po.size) +
+                                                    long(delta['size'])):
             adderror(po, 'Insufficient space in download directory %s '
                     'to download' % (deltadir,))
             continue
@@ -297,7 +338,10 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
         except yum.Errors.RepoError, e:
             adderror(po, str(e))
         else:
-            queue.put((conduit, po, deltafile))
+            # HACK: Use the download progress, at least we get something
+            cb = po.repo.callback
+            queue.put((conduit, po, deltafile, long(delta['size'])))
+            rebuild_size += po.size
 
             if errors.has_key(po):
                 del errors[po]
@@ -309,12 +353,26 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
             curthread.messages = ""
         lock.release()
         
-    conduit.info(2, "Rebuilding rpms from deltarpms")
+    conduit.info(2, "Finishing rebuild of rpms, from deltarpms")
+    if cb and curthread.isAlive():
+        ptsz, pfsz, pfnm = _processing_data()
+        cb.start(text="<delta rebuild>", size=rebuild_size)
+        sofar_sz = ptsz + pfsz
+        cb.update(sofar)
+        while sofar_sz < rebuild_size and curthread.isAlive():
+            ptsz, pfsz, pfnm = _processing_data()
+            sz = ptsz + pfsz + _safe_stat_size(pfnm)
+            if sz > sofar_sz:
+                cb.update(sz - sofar_sz)
+                sofar_sz = sz
+            time.sleep(0.5)
+        cb.end(0)
     
     # Tell build thread that there are no more drpms and wait for it to exit
     curthread.can_exit = True
     queue.put(None)
     curthread.join()
+    process_lock = None
     
     if curthread.messages != "":
         conduit.info(2, curthread.messages[:-1])
@@ -400,7 +458,7 @@ def config_hook(conduit):
             help="disable Presto plugin and don't download any deltarpms")
 
 # Set up Presto repositories
-#  Don't do this whn repos. are setup as that happens a lot, but we only
+#  Don't do this when repos. are setup as that happens a lot, but we only
 # care about presto when we are about to download packages. Eventaully if
 # we have MD deltas we'll want to trigger then too.
 def xpostreposetup_hook(conduit, repos=None):
commit 4f2a5a2f042729e4970fd185d935e0fe29aa858d
Author: James Antill <james at and.org>
Date:   Fri Apr 24 02:04:51 2009 -0400

    Cleanup saved message, output it in postdownload_hook

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index e48e498..530c957 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -519,7 +519,7 @@ def predownload_hook(conduit):
                 errstring += '  %s: %s\n' % (key, error)
         raise PluginYumExit(errstring)
 
-def posttrans_hook(conduit):
+def postdownload_hook(conduit):
     global complete_download_size
     global actual_download_size
 
@@ -529,12 +529,11 @@ def posttrans_hook(conduit):
        (complete_download_size == actual_download_size):
         return
 
-    drpm_string = format_number(actual_download_size)
-    rpm_string = format_number(complete_download_size)
+    drpm_string  = format_number(actual_download_size)
+    rpm_string   = format_number(complete_download_size)
+    saved_string = format_number(complete_download_size - actual_download_size)
         
-    conduit.info(2, "Size of all updates downloaded from Presto-enabled " \
-                    "repositories: %s" % drpm_string)
-    conduit.info(2, "Size of updates that would have been downloaded if " \
-                    "Presto wasn't enabled: %s" % rpm_string)
+    conduit.info(2, "Size of deltarpms downloaded: %s" % drpm_string)
+    conduit.info(2, "Size of rebuilt rpms on disk: %s" % rpm_string)
     saveper = 100 - ((actual_download_size * 100) / complete_download_size)
-    conduit.info(2, "This is a savings of %i percent" % saveper)
+    conduit.info(2, "Saved: %s (%i%%)" % (saved_string, saveper))
commit 7e2d80a83ecf848854f0f6f6b1317cc3ae36e81b
Author: James Antill <james at and.org>
Date:   Fri Apr 24 12:08:28 2009 -0400

    Fix progress and verifyLocalPkg()

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index 530c957..957b87b 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -70,12 +70,16 @@ def reconstruct(conduit, po, deltalocal, deltasize):
     """logic around applyDelta"""
     retlist = ""
     global actual_download_size
+    global processed_t_size
+    global processed_f_size
 
     rpmlocal = po.localpath
     rpmarch  = po.arch
     process_lock.acquire()
     processing_fname = rpmlocal
     process_lock.release()
+    # applyDelta can think it's succeeded when it hasn't due to signing
+    # changes. Also have to be careful about SQL issues, see below.
     if not applyDelta(deltalocal, rpmlocal, rpmarch) or not po.verifyLocalPkg():
         process_lock.acquire()
         processing_fname = None
@@ -249,6 +253,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
         errors.setdefault(po, []).append(msg)
 
     rebuild_size = 0 # Size of packages we are going to rebuild.
+    cb = None
 
     # Set up thread for applying drpms
     queue = Queue.Queue(0)
@@ -299,6 +304,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                 conduit.info(5, "using local copy of deltarpm for %s" % po)
                 # HACK: Use the download progress, at least we get something
                 cb = po.repo.callback
+                po.returnChecksums() # Magic, see below
                 queue.put((conduit, po, deltapath, long(delta['size'])))
                 rebuild_size += po.size
                 continue
@@ -340,6 +346,10 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
         else:
             # HACK: Use the download progress, at least we get something
             cb = po.repo.callback
+            #  Magic: What happens here is that the checksum data is loaded
+            # from the SQL db in this thread, so that the other thread can call
+            # .verifyLocalPkg() without having to hit sqlite.
+            po.returnChecksums()
             queue.put((conduit, po, deltafile, long(delta['size'])))
             rebuild_size += po.size
 
@@ -353,20 +363,21 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
             curthread.messages = ""
         lock.release()
         
-    conduit.info(2, "Finishing rebuild of rpms, from deltarpms")
-    if cb and curthread.isAlive():
-        ptsz, pfsz, pfnm = _processing_data()
+    ptsz, pfsz, pfnm = _processing_data()
+    if cb and rebuild_size > (ptsz + pfsz):
+        conduit.info(2, "Finishing rebuild of rpms, from deltarpms")
         cb.start(text="<delta rebuild>", size=rebuild_size)
         sofar_sz = ptsz + pfsz
-        cb.update(sofar)
+        cb.update(sofar_sz)
         while sofar_sz < rebuild_size and curthread.isAlive():
             ptsz, pfsz, pfnm = _processing_data()
             sz = ptsz + pfsz + _safe_stat_size(pfnm)
             if sz > sofar_sz:
-                cb.update(sz - sofar_sz)
+                cb.update(sz)
                 sofar_sz = sz
             time.sleep(0.5)
-        cb.end(0)
+        ptsz, pfsz, pfnm = _processing_data()
+        cb.end(ptsz + pfsz + _safe_stat_size(pfnm))
     
     # Tell build thread that there are no more drpms and wait for it to exit
     curthread.can_exit = True
commit 65b26f0107b3b19a7427d75b346b06cba22a584a
Author: James Antill <james at and.org>
Date:   Fri Apr 24 12:27:26 2009 -0400

    Don't die on repos. which don't have prestodelta md

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index 957b87b..1e2c4ee 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -484,8 +484,11 @@ def xpostreposetup_hook(conduit, repos=None):
     for active_repo in repos:
         try:
             deltamd = active_repo.retrieveMD("prestodelta")
+        except yum.Errors.RepoMDError, e: # Needed pre. 3.2.23
+            conduit.info(3, "No Presto metadata available for %s" % active_repo)
+            continue
         except yum.Errors.RepoError, e:
-            conduit.info(2, "No Presto metadata available for %s" % active_repo)
+            conduit.info(3, "No Presto metadata available for %s" % active_repo)
             continue
         pinfo[active_repo.id] = PrestoParser(deltamd).getDeltas()
 


Index: yum-presto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yum-presto.spec	11 Mar 2009 18:18:41 -0000	1.11
+++ yum-presto.spec	26 Apr 2009 17:06:47 -0000	1.12
@@ -3,11 +3,12 @@
 Summary: Presto plugin for yum
 Name: yum-presto
 Version: 0.4.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2
 Patch0: speedup.patch
+Patch1: cleanup.patch
 URL: http://www.lesbg.com/jdieter/presto/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %setup -q
 
 %patch0 -p2
+%patch1 -p2
 
 %build
 
@@ -48,6 +50,10 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Sun Apr 26 2009 James Antill <james at fedoraproject.org> - 0.4.5-5
+- Added cleanup patch from upstream.
+- Adds progress for rebuilding.
+
 * Wed Mar 11 2009 James Antill <james at fedoraproject.org> - 0.4.5-4
 - Added speedup patch from upstream.
 



From rdieter at fedoraproject.org  Sun Apr 26 17:27:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 26 Apr 2009 17:27:28 +0000 (UTC)
Subject: rpms/PyQt4/devel PyQt4.spec,1.21,1.22
Message-ID: <20090426172728.78A0E70125@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13742/devel

Modified Files:
	PyQt4.spec 
Log Message:
* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
- rebuild for phonon bindings (#497680)



Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PyQt4.spec	4 Mar 2009 19:07:48 -0000	1.21
+++ PyQt4.spec	26 Apr 2009 17:26:56 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -17,10 +17,11 @@
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
 
-BuildRequires: qt4-devel >= 4.4.0-10
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
+BuildRequires: phonon-devel
+BuildRequires: qt4-devel >= 4.5.0-7
 
 BuildRequires: python-devel
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -122,6 +123,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
+- rebuild for phonon bindings (#497680)
+
 * Wed Mar 05 2009 Rex Dieter <rdieter at fedorproject.org> - 4.4.4-5
 - move designer plugins to main/runtime (#487622)
 



From rdieter at fedoraproject.org  Sun Apr 26 17:27:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 26 Apr 2009 17:27:28 +0000 (UTC)
Subject: rpms/PyQt4/F-11 PyQt4.spec,1.21,1.22
Message-ID: <20090426172728.8013D70129@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13742/F-11

Modified Files:
	PyQt4.spec 
Log Message:
* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
- rebuild for phonon bindings (#497680)



Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/PyQt4.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PyQt4.spec	4 Mar 2009 19:07:48 -0000	1.21
+++ PyQt4.spec	26 Apr 2009 17:26:57 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -17,10 +17,11 @@
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
 
-BuildRequires: qt4-devel >= 4.4.0-10
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
+BuildRequires: phonon-devel
+BuildRequires: qt4-devel >= 4.5.0-7
 
 BuildRequires: python-devel
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -122,6 +123,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
+- rebuild for phonon bindings (#497680)
+
 * Wed Mar 05 2009 Rex Dieter <rdieter at fedorproject.org> - 4.4.4-5
 - move designer plugins to main/runtime (#487622)
 



From rdieter at fedoraproject.org  Sun Apr 26 17:42:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 26 Apr 2009 17:42:48 +0000 (UTC)
Subject: rpms/PyQt4/F-10 PyQt4.spec,1.17,1.18
Message-ID: <20090426174248.75D7070125@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16222

Modified Files:
	PyQt4.spec 
Log Message:
* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
- rebuild for phonon bindings (#497680)



Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/PyQt4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PyQt4.spec	5 Mar 2009 01:30:07 -0000	1.17
+++ PyQt4.spec	26 Apr 2009 17:42:17 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -17,10 +17,11 @@
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
 
-BuildRequires: qt4-devel >= 4.4.0-10
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
+BuildRequires: phonon-devel
+BuildRequires: qt4-devel >= 4.5.0-7
 
 BuildRequires: python-devel
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -122,6 +123,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
+- rebuild for phonon bindings (#497680)
+
 * Wed Mar 05 2009 Rex Dieter <rdieter at fedorproject.org> - 4.4.4-5
 - move designer plugins to main/runtime (#487622)
 



From mathstuf at fedoraproject.org  Sun Apr 26 18:25:09 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 26 Apr 2009 18:25:09 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.4, 1.5
Message-ID: <20090426182509.C02BB70125@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23627

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
New snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-networkmanagement.spec	9 Apr 2009 03:17:27 -0000	1.4
+++ kde-plasma-networkmanagement.spec	26 Apr 2009 18:24:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-networkmanagement
 Version:        0.1
-Release:        0.9.20090403svn%{?dist}
+Release:        0.10.20090424svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          User Interface/Desktops
@@ -8,7 +8,7 @@
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 951288 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
+#  svn export -r 958775 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
 #  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,7 +26,8 @@
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
-the default NetworkManager service.
+the default NetworkManager service. This is alpha software with known issues.
+It is not a replacement for nm-applet yet.
 
 %package devel
 Summary:        Files needed to develop programs which use the Network Manager plasmoid
@@ -150,6 +151,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.10.20090424svn
+- Respin snapshot
+- Add disclaimer to %description
+
 * Wed Apr 8 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.9.20090403svn
 - Respin snapshot
 



From devrim at fedoraproject.org  Sun Apr 26 18:47:05 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:47:05 +0000 (UTC)
Subject: rpms/pgfouine/devel .cvsignore, 1.4, 1.5 pgfouine.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090426184705.F2EA070125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27124

Modified Files:
	.cvsignore pgfouine.spec sources 
Log Message:
Update to 1.1 .



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Apr 2007 11:19:35 -0000	1.4
+++ .cvsignore	26 Apr 2009 18:46:34 -0000	1.5
@@ -1 +1,2 @@
 pgfouine-1.0.tar.gz
+pgfouine-1.1.tar.gz


Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/pgfouine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pgfouine.spec	26 Feb 2009 19:47:53 -0000	1.7
+++ pgfouine.spec	26 Apr 2009 18:46:34 -0000	1.8
@@ -1,11 +1,11 @@
 Summary:	PgFouine PostgreSQL log analyzer
 Name:		pgfouine
-Version:	1.0
-Release:	4%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 BuildArch:	noarch
 License:	GPLv2+
 Group:		Development/Tools
-Source0:	http://pgfoundry.org/frs/download.php/1334/%{name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2178/%{name}-%{version}.tar.gz
 Source2:	pgfouine-tutorial.txt
 URL: 		http://pgfouine.projects.postgresql.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 26 2009 Devrim Gunduz <devrim at CommandPrompt.com> - 1.1-1
+- Update to 1.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2007 11:19:35 -0000	1.4
+++ sources	26 Apr 2009 18:46:34 -0000	1.5
@@ -1 +1,2 @@
 a6c10e69582f7beef74e8de9313675e9  pgfouine-1.0.tar.gz
+6cbdad4ddc511f0a23db7614fbd66867  pgfouine-1.1.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 18:48:35 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:48:35 +0000 (UTC)
Subject: rpms/pgfouine/devel pgfouine.spec,1.8,1.9
Message-ID: <20090426184835.B5B6570125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27294

Modified Files:
	pgfouine.spec 
Log Message:
Add one more file to be installed.



Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/pgfouine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pgfouine.spec	26 Apr 2009 18:46:34 -0000	1.8
+++ pgfouine.spec	26 Apr 2009 18:48:05 -0000	1.9
@@ -55,7 +55,7 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING THANKS README pgfouine-tutorial.txt
+%doc AUTHORS ChangeLog COPYING THANKS README RELEASE pgfouine-tutorial.txt
 %attr(0755, root, root) %{_bindir}/pgfouine.php
 %attr(0755, root, root) %{_bindir}/pgfouine_vacuum.php
 %{_datadir}/%{name}



From devrim at fedoraproject.org  Sun Apr 26 18:55:49 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:55:49 +0000 (UTC)
Subject: rpms/pgfouine/F-10 .cvsignore, 1.4, 1.5 pgfouine.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090426185549.6D8DF70125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28980/F-10

Modified Files:
	.cvsignore pgfouine.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Apr 2007 11:19:35 -0000	1.4
+++ .cvsignore	26 Apr 2009 18:55:18 -0000	1.5
@@ -1 +1,2 @@
 pgfouine-1.0.tar.gz
+pgfouine-1.1.tar.gz


Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-10/pgfouine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pgfouine.spec	28 Aug 2008 18:26:15 -0000	1.6
+++ pgfouine.spec	26 Apr 2009 18:55:19 -0000	1.7
@@ -1,11 +1,11 @@
 Summary:	PgFouine PostgreSQL log analyzer
 Name:		pgfouine
-Version:	1.0
-Release:	3%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 BuildArch:	noarch
 License:	GPLv2+
 Group:		Development/Tools
-Source0:	http://pgfoundry.org/frs/download.php/1334/%{name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2178/%{name}-%{version}.tar.gz
 Source2:	pgfouine-tutorial.txt
 URL: 		http://pgfouine.projects.postgresql.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,12 +55,15 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING THANKS README pgfouine-tutorial.txt
+%doc AUTHORS ChangeLog COPYING THANKS README RELEASE pgfouine-tutorial.txt
 %attr(0755, root, root) %{_bindir}/pgfouine.php
 %attr(0755, root, root) %{_bindir}/pgfouine_vacuum.php
 %{_datadir}/%{name}
 
 %changelog 
+* Sun Apr 26 2009 Devrim Gunduz <devrim at CommandPrompt.com> - 1.1-1
+- Update to 1.1
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2007 11:19:35 -0000	1.4
+++ sources	26 Apr 2009 18:55:19 -0000	1.5
@@ -1 +1,2 @@
 a6c10e69582f7beef74e8de9313675e9  pgfouine-1.0.tar.gz
+6cbdad4ddc511f0a23db7614fbd66867  pgfouine-1.1.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 18:55:49 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:55:49 +0000 (UTC)
Subject: rpms/pgfouine/F-11 .cvsignore, 1.4, 1.5 pgfouine.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090426185549.E13DB70125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28980/F-11

Modified Files:
	.cvsignore pgfouine.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Apr 2007 11:19:35 -0000	1.4
+++ .cvsignore	26 Apr 2009 18:55:19 -0000	1.5
@@ -1 +1,2 @@
 pgfouine-1.0.tar.gz
+pgfouine-1.1.tar.gz


Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-11/pgfouine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pgfouine.spec	26 Feb 2009 19:47:53 -0000	1.7
+++ pgfouine.spec	26 Apr 2009 18:55:19 -0000	1.8
@@ -1,11 +1,11 @@
 Summary:	PgFouine PostgreSQL log analyzer
 Name:		pgfouine
-Version:	1.0
-Release:	4%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 BuildArch:	noarch
 License:	GPLv2+
 Group:		Development/Tools
-Source0:	http://pgfoundry.org/frs/download.php/1334/%{name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2178/%{name}-%{version}.tar.gz
 Source2:	pgfouine-tutorial.txt
 URL: 		http://pgfouine.projects.postgresql.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,12 +55,15 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING THANKS README pgfouine-tutorial.txt
+%doc AUTHORS ChangeLog COPYING THANKS README RELEASE pgfouine-tutorial.txt
 %attr(0755, root, root) %{_bindir}/pgfouine.php
 %attr(0755, root, root) %{_bindir}/pgfouine_vacuum.php
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 26 2009 Devrim Gunduz <devrim at CommandPrompt.com> - 1.1-1
+- Update to 1.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2007 11:19:35 -0000	1.4
+++ sources	26 Apr 2009 18:55:19 -0000	1.5
@@ -1 +1,2 @@
 a6c10e69582f7beef74e8de9313675e9  pgfouine-1.0.tar.gz
+6cbdad4ddc511f0a23db7614fbd66867  pgfouine-1.1.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 18:55:50 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:55:50 +0000 (UTC)
Subject: rpms/pgfouine/F-9 .cvsignore, 1.4, 1.5 pgfouine.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090426185550.39FA170125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28980/F-9

Modified Files:
	.cvsignore pgfouine.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Apr 2007 11:19:35 -0000	1.4
+++ .cvsignore	26 Apr 2009 18:55:19 -0000	1.5
@@ -1 +1,2 @@
 pgfouine-1.0.tar.gz
+pgfouine-1.1.tar.gz


Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-9/pgfouine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgfouine.spec	3 Jun 2007 08:31:13 -0000	1.5
+++ pgfouine.spec	26 Apr 2009 18:55:19 -0000	1.6
@@ -1,11 +1,11 @@
 Summary:	PgFouine PostgreSQL log analyzer
 Name:		pgfouine
-Version:	1.0
-Release:	2%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 BuildArch:	noarch
 License:	GPL
 Group:		Development/Tools
-Source0:	http://pgfoundry.org/frs/download.php/1334/%{name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2178/%{name}-%{version}.tar.gz
 Source2:	pgfouine-tutorial.txt
 URL: 		http://pgfouine.projects.postgresql.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,12 +55,15 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING THANKS README pgfouine-tutorial.txt
+%doc AUTHORS ChangeLog COPYING THANKS README RELEASE pgfouine-tutorial.txt
 %attr(0755, root, root) %{_bindir}/pgfouine.php
 %attr(0755, root, root) %{_bindir}/pgfouine_vacuum.php
 %{_datadir}/%{name}
 
 %changelog 
+* Sun Apr 26 2009 Devrim Gunduz <devrim at CommandPrompt.com> - 1.1-1
+- Update to 1.1         
+
 * Sun Jun 3 2007 Devrim Gunduz <devrim at CommandPrompt.com> - 1.0-2
 - Bumped up spec version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2007 11:19:35 -0000	1.4
+++ sources	26 Apr 2009 18:55:19 -0000	1.5
@@ -1 +1,2 @@
 a6c10e69582f7beef74e8de9313675e9  pgfouine-1.0.tar.gz
+6cbdad4ddc511f0a23db7614fbd66867  pgfouine-1.1.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 18:57:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:57:55 +0000 (UTC)
Subject: rpms/pgfouine/EL-5 .cvsignore, 1.4, 1.5 pgfouine.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090426185755.E5C737013C@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29757/EL-5

Modified Files:
	.cvsignore pgfouine.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Apr 2007 11:19:25 -0000	1.4
+++ .cvsignore	26 Apr 2009 18:57:24 -0000	1.5
@@ -1 +1,2 @@
 pgfouine-1.0.tar.gz
+pgfouine-1.1.tar.gz


Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/EL-5/pgfouine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgfouine.spec	1 Apr 2007 11:19:25 -0000	1.5
+++ pgfouine.spec	26 Apr 2009 18:57:24 -0000	1.6
@@ -1,11 +1,11 @@
 Summary:	PgFouine PostgreSQL log analyzer
 Name:		pgfouine
-Version:	1.0
+Version:	1.1
 Release:	1%{?dist}
 BuildArch:	noarch
 License:	GPL
 Group:		Development/Tools
-Source0:	http://pgfoundry.org/frs/download.php/1334/%{name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2178/%{name}-%{version}.tar.gz
 Source2:	pgfouine-tutorial.txt
 URL: 		http://pgfouine.projects.postgresql.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 %{_datadir}/%{name}
 
 %changelog 
+* Sun Apr 26 2009 Devrim Gunduz <devrim at CommandPrompt.com> - 1.1-1
+- Update to 1.1         
+
 * Sun Apr 1 2007 Devrim Gunduz <devrim at CommandPrompt.com> - 1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2007 11:19:25 -0000	1.4
+++ sources	26 Apr 2009 18:57:24 -0000	1.5
@@ -1 +1,2 @@
 a6c10e69582f7beef74e8de9313675e9  pgfouine-1.0.tar.gz
+6cbdad4ddc511f0a23db7614fbd66867  pgfouine-1.1.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 18:57:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 18:57:55 +0000 (UTC)
Subject: rpms/pgfouine/EL-4 .cvsignore, 1.4, 1.5 pgfouine.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090426185755.7177570125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29757/EL-4

Modified Files:
	.cvsignore pgfouine.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Apr 2007 11:19:21 -0000	1.4
+++ .cvsignore	26 Apr 2009 18:57:24 -0000	1.5
@@ -1 +1,2 @@
 pgfouine-1.0.tar.gz
+pgfouine-1.1.tar.gz


Index: pgfouine.spec
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/EL-4/pgfouine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgfouine.spec	1 Apr 2007 11:19:21 -0000	1.4
+++ pgfouine.spec	26 Apr 2009 18:57:24 -0000	1.5
@@ -1,11 +1,11 @@
 Summary:	PgFouine PostgreSQL log analyzer
 Name:		pgfouine
-Version:	1.0
+Version:	1.1
 Release:	1%{?dist}
 BuildArch:	noarch
 License:	GPL
 Group:		Development/Tools
-Source0:	http://pgfoundry.org/frs/download.php/1334/%{name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2178/%{name}-%{version}.tar.gz
 Source2:	pgfouine-tutorial.txt
 URL: 		http://pgfouine.projects.postgresql.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 %{_datadir}/%{name}
 
 %changelog 
+* Sun Apr 26 2009 Devrim Gunduz <devrim at CommandPrompt.com> - 1.1-1
+- Update to 1.1         
+
 * Sun Apr 1 2007 Devrim Gunduz <devrim at CommandPrompt.com> - 1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2007 11:19:21 -0000	1.4
+++ sources	26 Apr 2009 18:57:24 -0000	1.5
@@ -1 +1,2 @@
 a6c10e69582f7beef74e8de9313675e9  pgfouine-1.0.tar.gz
+6cbdad4ddc511f0a23db7614fbd66867  pgfouine-1.1.tar.gz



From slankes at fedoraproject.org  Sun Apr 26 19:19:00 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sun, 26 Apr 2009 19:19:00 +0000 (UTC)
Subject: rpms/merkaartor/devel .cvsignore, 1.6, 1.7 merkaartor.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090426191900.D0DB770125@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv877

Modified Files:
	.cvsignore merkaartor.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 19:47:10 -0000	1.6
+++ .cvsignore	26 Apr 2009 19:18:30 -0000	1.7
@@ -1 +1 @@
-merkaartor-0.13.1.tar.bz2
+merkaartor-0.13.2.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merkaartor.spec	4 Apr 2009 19:47:11 -0000	1.10
+++ merkaartor.spec	26 Apr 2009 19:18:30 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           merkaartor
-Version:        0.13.1
+Version:        0.13.2
 Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
@@ -57,6 +57,9 @@
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+- new upstream release
+
 * Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Apr 2009 19:47:11 -0000	1.6
+++ sources	26 Apr 2009 19:18:30 -0000	1.7
@@ -1 +1 @@
-b3eccc1ccf1534a80258f5a24b13e661  merkaartor-0.13.1.tar.bz2
+0e6a65d723a7fa29f1e8c921a74d1893  merkaartor-0.13.2.tar.bz2



From devrim at fedoraproject.org  Sun Apr 26 19:19:11 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 19:19:11 +0000 (UTC)
Subject: rpms/mapserver/devel .cvsignore, 1.7, 1.8 mapserver.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <20090426191911.6D42770125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv929

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
- Update to 5.4.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Apr 2009 21:49:19 -0000	1.7
+++ .cvsignore	26 Apr 2009 19:18:41 -0000	1.8
@@ -1 +1,2 @@
 mapserver-5.2.2.tar.gz
+mapserver-5.4.0.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mapserver.spec	4 Apr 2009 23:47:21 -0000	1.24
+++ mapserver.spec	26 Apr 2009 19:18:41 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        5.2.2
+Version:        5.4.0
 Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
@@ -240,6 +240,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sun Apr 26 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.4.0-1
+- Update to 5.4.0
+
 * Sun Apr 5 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.2-1
 - Update to 5.2.2 which fixes :
   CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842, 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Apr 2009 21:49:19 -0000	1.8
+++ sources	26 Apr 2009 19:18:41 -0000	1.9
@@ -1 +1,2 @@
 87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz
+9863c89dcbbac0779e462b0924c0e981  mapserver-5.4.0.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 19:20:37 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 19:20:37 +0000 (UTC)
Subject: rpms/mapserver/EL-5 .cvsignore, NONE, 1.1 mapserver.spec, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090426192037.3415870125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1195

Modified Files:
	mapserver.spec sources 
Added Files:
	.cvsignore 
Log Message:
Update to 4.10.4 to fix various security issues.



--- NEW FILE .cvsignore ---
mapserver-5.2.2.tar.gz
mapserver-5.4.0.tar.gz
mapserver-4.10.4.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/mapserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapserver.spec	10 Aug 2007 13:42:10 -0000	1.1
+++ mapserver.spec	26 Apr 2009 19:20:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mapserver
-Version:        4.10.2
-Release:        4%{?dist}
+Version:        4.10.4
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -218,6 +218,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sun Apr 26 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.4-1
+- Update to 4.10.4 to fix several security issues.
+
 * Fri May 11 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-4
 - update require list properly.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Aug 2007 13:42:10 -0000	1.1
+++ sources	26 Apr 2009 19:20:07 -0000	1.2
@@ -1 +1,2 @@
 5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
+bde51fbe3f2218f965ee512ecba675e3  mapserver-4.10.4.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 19:21:48 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 19:21:48 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.2,1.3 sources,1.1,1.2
Message-ID: <20090426192148.4289270125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1567

Modified Files:
	mapserver.spec sources 
Log Message:
Update to 4.10.4 to fix various security issues.




Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapserver.spec	11 May 2007 21:58:53 -0000	1.2
+++ mapserver.spec	26 Apr 2009 19:21:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mapserver
-Version:        4.10.2
-Release:        4%{?dist}
+Version:        4.10.4
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -218,6 +218,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sun Apr 26 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.4-1
+- Update to 4.10.4 to fix several security issues.
+
 * Fri May 11 2007 Balint Cristian <cbalint at redhat.com> 4.10.2-4
 - update require list properly.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 May 2007 09:50:50 -0000	1.1
+++ sources	26 Apr 2009 19:21:18 -0000	1.2
@@ -1 +1,2 @@
 5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
+bde51fbe3f2218f965ee512ecba675e3  mapserver-4.10.4.tar.gz



From devrim at fedoraproject.org  Sun Apr 26 19:31:41 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 19:31:41 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.3,1.4
Message-ID: <20090426193142.1F00270125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3965

Modified Files:
	mapserver.spec 
Log Message:
Add byacc as a BR



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mapserver.spec	26 Apr 2009 19:21:18 -0000	1.3
+++ mapserver.spec	26 Apr 2009 19:31:10 -0000	1.4
@@ -17,7 +17,7 @@
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  java-gcj-compat-devel swig > 1.3.24
-
+BuildRequires:	byacc
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 



From devrim at fedoraproject.org  Sun Apr 26 19:33:06 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 19:33:06 +0000 (UTC)
Subject: rpms/mapserver/EL-5 mapserver.spec,1.2,1.3
Message-ID: <20090426193306.8094570125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4373

Modified Files:
	mapserver.spec 
Log Message:
Add byacc as BR



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/mapserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapserver.spec	26 Apr 2009 19:20:06 -0000	1.2
+++ mapserver.spec	26 Apr 2009 19:32:36 -0000	1.3
@@ -17,7 +17,7 @@
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  java-gcj-compat-devel swig > 1.3.24
-
+BuildRequires:	byacc
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 



From rdieter at fedoraproject.org  Sun Apr 26 19:42:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 26 Apr 2009 19:42:28 +0000 (UTC)
Subject: rpms/kaffeine/devel kaffeine-1.0-pre1-kernel_headers.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 kaffeine.spec, 1.25, 1.26 sources, 1.7,
	1.8 kaffeine-0.8.7-codecs.patch, 1.1,
	NONE kaffeine-0.8.7-epg.patch, 1.1,
	NONE kaffeine-0.8.7-optflags.patch, 1.1, NONE
Message-ID: <20090426194228.D370370125@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6243

Modified Files:
	.cvsignore kaffeine.spec sources 
Added Files:
	kaffeine-1.0-pre1-kernel_headers.patch 
Removed Files:
	kaffeine-0.8.7-codecs.patch kaffeine-0.8.7-epg.patch 
	kaffeine-0.8.7-optflags.patch 
Log Message:
* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.1.pre1
- kaffeine-1.0-pre1 


kaffeine-1.0-pre1-kernel_headers.patch:

--- NEW FILE kaffeine-1.0-pre1-kernel_headers.patch ---
diff -up kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp
--- kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers	2009-04-26 13:38:11.000000000 -0500
+++ kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp	2009-04-26 14:34:24.526814875 -0500
@@ -24,7 +24,7 @@
  * workaround buggy kernel includes
  * asm/types.h doesn't define __u64 in ansi mode, but linux/dvb/dmx.h needs it
  */
-typedef quint64 __u64;
+//typedef quint64 __u64;
 
 #include <cmath>
 #include <errno.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jul 2008 19:28:34 -0000	1.7
+++ .cvsignore	26 Apr 2009 19:41:58 -0000	1.8
@@ -1 +1 @@
-kaffeine-0.8.7.tar.bz2
+kaffeine-1.0-pre1.tar.gz


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kaffeine.spec	12 Apr 2009 18:25:20 -0000	1.25
+++ kaffeine.spec	26 Apr 2009 19:41:58 -0000	1.26
@@ -1,233 +1,88 @@
 
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-%define kdelibs3 kdelibs3
-BuildRequires: libxcb-devel
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-## define to build freeworld bits (for that other repo)
-#define freeworld 1
-
-# FIXME 
-#if 0%{?fedora} > 10
-#define _without_dvb --without-dvb
-#endif
+%define pre pre1
 
-Version: 0.8.7
-Release: 7%{?dist}
-
-%if 0%{?freeworld:1} == 0 
-# Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
-%else
-Name:    kaffeine-freeworld
-%endif
+Version: 1.0 
+Release: 0.1.%{pre}%{?dist}
 
 License: GPLv2+
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:  kaffeine-0.8.7-optflags.patch
-Patch1:  kaffeine-0.8.7-codecs.patch
-Patch2:  kaffeine-0.8.7-epg.patch
+Patch1: kaffeine-1.0-pre1-kernel_headers.patch
 
-BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: gettext
-BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
-BuildRequires: %{kdelibs3}-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
-BuildRequires: xine-lib-devel
-
-%if 0%{?freeworld:1}
-Requires: kaffeine = %{version}
-%define _with_lame --with-lame
-%{?_with_lame:BuildRequires: lame-devel}
-%if 0%{?fedora} > 4
-# can view dvd's if libdvdcss is available
-#Requires(hint): libdvdcss
-# extra/freeworld codec support
-Requires(hint): xine-lib-extras-freeworld
-%endif
-
-%description
-Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
+BuildRequires: kdelibs4-devel
+BuildRequires: phonon-devel
 
-%else
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-%endif
+Obsoletes: kaffeine-libs < 1.0
+Obsoletes: kaffeine-devel < 1.0
 
 %description
-Kaffeine is a xine-based media player for KDE.  It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats 
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%package devel
-Summary: Development files for %{name}
-Group:   Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{kdelibs3}-devel
-%description devel
-%{summary}.
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%endif
-
+Kaffeine is a xine-based media player for KDE.
 
 
 %prep
-%setup -q -n kaffeine-%{version}
-
-%patch0 -p1 -b .optflags
-# FIXME
-#patch1 -p1 -b .codecs
-#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
-%patch2 -p1 -b .epg
+%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
 
-# FIXME, must be a better workaround here
-sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
+%patch1 -p1 -b .kernel_headers
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
-  --with-extra-includes=%{_includedir}/cdda \
-  --with-gstreamer \
-  %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
-  %{?_with_lame} %{!?_with_lame:--without-lame}
-
-%if 0%{?freeworld:1}
-make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
-%else
-make %{?_smp_mflags}
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?freeworld:1}
-make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
-%else
-make install DESTDIR=%{buildroot}
-
-## File lists
-# locale's
-%find_lang %{name} 
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+mv %{buildroot}%{_kde4_iconsdir}/oxygen \
+   %{buildroot}%{_kde4_iconsdir}/hicolor
 
-# Unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
-%endif
+%find_lang %{name}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%if 0%{?freeworld:1}
-%files 
-%defattr(-,root,root,-)
-%{_libdir}/kde3/libkaffeinemp3lame.*
-%{_datadir}/services/kaffeinemp3lame.desktop
-%else
-
 %post
-%{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-%{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-    update-desktop-database %{_datadir}/applications &>/dev/null
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  update-desktop-database %{_datadir}/applications &>/dev/null
+  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
 update-desktop-database %{_datadir}/applications &>/dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%if 0%{?libs}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-%endif
-
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kaffeine
-%{_libdir}/libkaffeinepart.so
-%{_libdir}/kde3/lib*.*
-%{_datadir}/appl*/*/*.desktop
-%{_datadir}/apps/gstreamerpart/
-%{_datadir}/apps/kaffeine/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/profiles/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/service*/*.desktop
-
-%if 0%{?libs}
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kaffeine/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
-
-%endif
+%doc AUTHORS COPYING TODO
+%{_kde4_bindir}/kaffeine
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/kaffeine/
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1 
+
 * Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-7
 - re-enable dvb (#495379)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jul 2008 19:28:34 -0000	1.7
+++ sources	26 Apr 2009 19:41:58 -0000	1.8
@@ -1 +1 @@
-3ce644c3c5a9583e9df7187f2cf1d8de  kaffeine-0.8.7.tar.bz2
+ecae6fd84103a268daf17b61784d837f  kaffeine-1.0-pre1.tar.gz


--- kaffeine-0.8.7-codecs.patch DELETED ---


--- kaffeine-0.8.7-epg.patch DELETED ---


--- kaffeine-0.8.7-optflags.patch DELETED ---



From slankes at fedoraproject.org  Sun Apr 26 19:46:10 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sun, 26 Apr 2009 19:46:10 +0000 (UTC)
Subject: rpms/merkaartor/F-10 .cvsignore, 1.6, 1.7 merkaartor.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090426194610.0CE7D70125@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6914/F-10

Modified Files:
	.cvsignore merkaartor.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 19:58:40 -0000	1.6
+++ .cvsignore	26 Apr 2009 19:45:39 -0000	1.7
@@ -1 +1 @@
-merkaartor-0.13.1.tar.bz2
+merkaartor-0.13.2.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/merkaartor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merkaartor.spec	11 Apr 2009 11:58:53 -0000	1.10
+++ merkaartor.spec	26 Apr 2009 19:45:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           merkaartor
-Version:        0.13.1
-Release:        1%{?dist}.1
+Version:        0.13.2
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -57,6 +57,9 @@
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Apr 25 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+- new upstream release
+
 * Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> 0.13.1-1.1
 - rebuild against qt-4.4.x (#495182)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Apr 2009 19:58:41 -0000	1.6
+++ sources	26 Apr 2009 19:45:39 -0000	1.7
@@ -1 +1 @@
-b3eccc1ccf1534a80258f5a24b13e661  merkaartor-0.13.1.tar.bz2
+0e6a65d723a7fa29f1e8c921a74d1893  merkaartor-0.13.2.tar.bz2



From slankes at fedoraproject.org  Sun Apr 26 19:46:10 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sun, 26 Apr 2009 19:46:10 +0000 (UTC)
Subject: rpms/merkaartor/F-11 .cvsignore, 1.6, 1.7 merkaartor.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090426194610.405FF70125@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6914/F-11

Modified Files:
	.cvsignore merkaartor.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 19:47:10 -0000	1.6
+++ .cvsignore	26 Apr 2009 19:45:39 -0000	1.7
@@ -1 +1 @@
-merkaartor-0.13.1.tar.bz2
+merkaartor-0.13.2.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/merkaartor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merkaartor.spec	4 Apr 2009 19:47:11 -0000	1.10
+++ merkaartor.spec	26 Apr 2009 19:45:39 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           merkaartor
-Version:        0.13.1
+Version:        0.13.2
 Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
@@ -57,6 +57,9 @@
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+- new upstream release
+
 * Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Apr 2009 19:47:11 -0000	1.6
+++ sources	26 Apr 2009 19:45:39 -0000	1.7
@@ -1 +1 @@
-b3eccc1ccf1534a80258f5a24b13e661  merkaartor-0.13.1.tar.bz2
+0e6a65d723a7fa29f1e8c921a74d1893  merkaartor-0.13.2.tar.bz2



From slankes at fedoraproject.org  Sun Apr 26 19:46:10 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sun, 26 Apr 2009 19:46:10 +0000 (UTC)
Subject: rpms/merkaartor/F-9 .cvsignore, 1.2, 1.3 merkaartor.spec, 1.3,
	1.4 sources, 1.3, 1.4 merkaartor.desktop, 1.1,
	NONE merkaartor.xpm, 1.1, NONE
Message-ID: <20090426194610.B9BBF70125@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6914/F-9

Modified Files:
	.cvsignore merkaartor.spec sources 
Removed Files:
	merkaartor.desktop merkaartor.xpm 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2008 20:17:53 -0000	1.2
+++ .cvsignore	26 Apr 2009 19:45:40 -0000	1.3
@@ -1 +1 @@
-merkaartor-0.12.tar.bz2
+merkaartor-0.13.2.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/merkaartor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merkaartor.spec	13 Oct 2008 20:08:46 -0000	1.3
+++ merkaartor.spec	26 Apr 2009 19:45:40 -0000	1.4
@@ -1,19 +1,20 @@
 Name:           merkaartor
-Version:        0.12
+Version:        0.13.2
 Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        http://www.merkaartor.org/downloads/source/merkaartor-0.12.tar.bz2
-Source1:        %{name}.desktop
-Source2:        %{name}.xpm
+Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
+Patch0:         merkaartor-eslang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiv2-devel
+BuildRequires:  gdal-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -24,21 +25,20 @@
 
 %prep
 %setup -q 
-sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
-chmod 644 LICENSE
+%patch0 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
-install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
+install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
 desktop-file-install --vendor="fedora" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,14 +49,24 @@
 %{_bindir}/%{name}
 %dir %{_datadir}/merkaartor
 %dir %{_datadir}/merkaartor/translations
+%dir %{_datadir}/merkaartor/world_shp
+%dir %{_datadir}/merkaartor/world_shp/*
 %{_datadir}/merkaartor/translations/%{name}_*.qm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
+%changelog
+* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+- new upstream release
 
+* Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
+- new upstream release
+
+* Wed Oct 15 2008 Sven Lankes <sven at lank.es> - 0.12-2
+- remove additional source merkaartor.xpm - now included
+- minor update of .desktop-file
 
-%changelog
 * Mon Oct 13 2008 Sven Lankes <sven at lank.es> - 0.12-1
 - new upstream release
 - enable geotagging support (requires exiv2)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2008 20:17:53 -0000	1.3
+++ sources	26 Apr 2009 19:45:40 -0000	1.4
@@ -1 +1 @@
-662320392a7efe427ac1de1a891bdc05  merkaartor-0.12.tar.bz2
+0e6a65d723a7fa29f1e8c921a74d1893  merkaartor-0.13.2.tar.bz2


--- merkaartor.desktop DELETED ---


--- merkaartor.xpm DELETED ---



From slankes at fedoraproject.org  Sun Apr 26 19:47:07 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sun, 26 Apr 2009 19:47:07 +0000 (UTC)
Subject: rpms/merkaartor/F-9 merkaartor-eslang.patch,NONE,1.1
Message-ID: <20090426194707.45A8370125@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7189

Added Files:
	merkaartor-eslang.patch 
Log Message:
forgot this patch for f-9

merkaartor-eslang.patch:

--- NEW FILE merkaartor-eslang.patch ---
--- Merkaartor.pro.orig	2009-04-04 21:32:24.832409395 +0200
+++ Merkaartor.pro	2009-04-04 21:30:33.499410121 +0200
@@ -85,7 +85,7 @@
 	translations/merkaartor_ar.qm \
 	translations/merkaartor_cs.qm \
 	translations/merkaartor_de.qm \
-	translations/merkaartor_es.ts \
+	translations/merkaartor_es.qm \
 	translations/merkaartor_fr.qm \
 	translations/merkaartor_it.qm \
 	translations/merkaartor_pl.qm \



From jmrcpn at fedoraproject.org  Sun Apr 26 19:52:36 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Sun, 26 Apr 2009 19:52:36 +0000 (UTC)
Subject: rpms/clement/F-11 clement.spec,1.24,1.25
Message-ID: <20090426195236.13B8370129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8058/clement/F-11

Modified Files:
	clement.spec 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/clement.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- clement.spec	24 Feb 2009 07:48:25 -0000	1.24
+++ clement.spec	26 Apr 2009 19:52:05 -0000	1.25
@@ -1,19 +1,42 @@
+#-----------------------------------------------------------
+#to define the revision numer
+%define revision %(R="$Revision$"; RR="${R##: }"; echo ${RR%% ?})
+%define rversion %(echo %{revision} | cut -d'.' -f1-2)
+%define subversion %(echo %{revision}| cut -d'.' -f4)
+#-----------------------------------------------------------
+#to define locmark according RPM builder
+%{?!mark:%define mark fedora}
+
+%if "%mark" == "fedora"
+%define locmark %{dist}
+%endif
+
+%if "%mark" == "safe"
+%define locmark .%{dist}.%{mark}
+%endif
+#-----------------------------------------------------------
+#Standard spec file
+#-----------------------------------------------------------
 Name: clement
-Version: 2.1
-Release: 242%{?dist}.2
+Version: %{rversion}.%{subversion}
+Release: 1%{?locmark}
 URL: http://www.clement.safe.ca
-# No version specified
-License: GPL+
+License: GPLv2
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
+Source: ftp://ftp.safe.ca/pub/srctgz/%{name}-%{version}.tar.gz
+
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
-BuildRequires: clamav-devel >= 0.87-1
 BuildRequires: openssl-devel,bzip2-devel,gmp-devel,glibc-devel,pam-devel
-Requires: clamav >= 0.87-1
-Requires: iptables
+%if "%mark" == "fedora"
+Requires: clamav-server
+%else
+Requires: clamd
+%endif
+Requires: perl-Crypt-PasswdMD5
+Requires: iptables, php
 Requires(post): chkconfig, initscripts
 Requires(preun): chkconfig, initscripts
 Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
@@ -21,8 +44,7 @@
 %description
 Clement is an email firewall. Its purpose is to filter all email, 
 rejecting viruses and unwelcome messages at the SMTP protocol level 
-(and avoids bouncing to forged originators).  Dubious emails are 
-centrally quarantined.
+(and avoids bouncing to forged originators).
 
 Clement extracts "email sending contexts" and can use a remote mentor 
 process to further analyze message context while still connected to the 
@@ -33,12 +55,25 @@
 %setup -q
 
 %build
-%{__make} %{?_smp_mflags}
+%{?_smp_mflags:%define _smp_mflags -j `/usr/bin/getconf _NPROCESSORS_ONLN`}
+%{__make} OPTIMIZE_FLAGS="$RPM_OPT_FLAGS" -s %{?_smp_mflags} prod
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+%if "%mark" == "safe"
+install -dm 755 %{buildroot}/%{_sysconfdir}/yum.repos.d
+cat > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{name}.repo << !EOT
+[clement]
+name=SAFE clement "An SMTP firewall" - Released Updates
+baseurl=ftp://ftp.safe.ca/pub/linux/%{ddist}/\$releasever/%{name}/\$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=ftp://ftp.safe.ca/gpgkey/RPM-GPG-KEY-SAFE-CLEMENT-2006
+!EOT
+%endif
+
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -56,7 +91,7 @@
 %pre 
 if [ "$1" = 1 ]; then
   /usr/sbin/groupadd -r %{name} 2>/dev/null || :
-  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{version} \
+  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{rversion} \
         -g %{name} -c "Clement daemon" \
         -s /sbin/nologin %{name} 2>/dev/null || :
   fi
@@ -67,9 +102,9 @@
     %{_initrddir}/%{name} stop 2>/dev/null || :
     fi
   export APPNAME=%{name}
-  %{_usr}/lib/%{name}-%{version}/support/remove.sh \
-    %{_sysconfdir}/pki/%{name}-%{version}/%{name}.pem \
-    %{_sysconfdir}/%{name}-%{version}/config.done 2>/dev/null || :
+  %{_usr}/lib/%{name}-%{rversion}/support/remove.sh \
+    %{_sysconfdir}/pki/%{name}-%{rversion}/%{name}.pem \
+    %{_sysconfdir}/%{name}-%{rversion}/config.done 2>/dev/null || :
   /sbin/chkconfig --del %{name} 2>/dev/null || :
   (
   /bin/echo -n "$APPNAME has been removed on "; date
@@ -78,45 +113,193 @@
   /bin/echo "these files _may_ be removed too, but that they could"
   /bin/echo "contain valuable data and admin should be careful"
   /bin/echo "when removing them."
-  ) > %{_var}/spool/%{name}-%{version}/README-%{name}-removed
+  ) > %{_var}/spool/%{name}-%{rversion}/README-%{name}-removed
   fi
 
 
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/cron.daily/%{name}
-%{_usr}/lib/%{name}-%{version}/
-%{_datadir}/%{name}-%{version}/
+%{_usr}/lib/%{name}-%{rversion}/
+%{_datadir}/%{name}-%{rversion}/
 %{_bindir}/pibsmtp
 %{_bindir}/clrquar
 %{_bindir}/clxtract
 
 %attr(-,%{name},%{name}) %{_bindir}/%{name}
-%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{version}/
+%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{rversion}/
 
-%doc %{name}-%{version}-*.build_date
+%doc %{name}-%{version}.build_date
 %doc doc/*.txt Changes FAQ LICENCE README
 
 %attr(0755,root,root) %{_initrddir}/%{name}
-%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
-# No, no, no.  Touch the following line, you die. -- FESCo (bug #220497)
-%exclude %config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{rversion}/
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
+%config(noreplace) %{_sysconfdir}/pki/%{name}-%{rversion}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
+%if "%mark" == "safe"
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%endif
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-242.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
+- Improvement
+   * Spec file update to require clamav-server under 
+     fedora release while requiring clamd otherwise.
+
+* Fri Apr 24 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.318-1
+- Improvement
+   * Spec file update to generate clement.repo file
+   * resolving asprintf warning
+   * adding Copyright Notice to PHP and "C" files
+
+* Tue Apr 21 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.315-2
+- Improvement
+    * fine tuning spec file
+    * using clamd-0.95.2 to detect virus.
 
-* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-241.2
-- fix license tag
+* Sun Apr 19 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.314
+- Improvement
+    * Adjusting Spec file to included within Fedora
+      extra packages (version release numbering).
+
+* Sun Mar 1 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-312
+- Bug Fix for Clement and its WEB interface.
+    * Aliases where too limited in number, cause By a line lenght
+      hard-coded both in WEB and gesque.c
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-311
+- Improvement
+    * rcpt <postmaster> without domain qualification is
+      now accepted and routed to domain which own
+      the local interface.
+      Reverse Address MUST be set properly.
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-310
+- Improvement
+    * Clement is accepting user 'post,aster' and 'abuse'
+      regardless mentor stat of mind regarding the originator.
+      according:
+      Network Working Group             J. Klensin
+      Request for Comments: 5321        October 2008
+      as interpreted by rfc-ignorant.org
 
-* Thu Dec 21 2006 Rex Dieter <rdieter at fedoraproject.org> 2.1-241.1
-- %%exclude yum.repos.d/* (bug #220497)
+* Fri Feb 06 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-309
+- Improvement
+    * Clement is using clamav-0.94.2 now
+
+* Sat Jun 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-290
+- Improvement
+    * Clement is using clamav-0.93.1 now
+
+* Tue May 27 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-289
+- Marker
+    * Production Marker
+
+* Wed May 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-288
+- Improvement
+    * adjustement within clement/shell/daily.sh to
+      avoid cron warning.
+
+* Sat May 03 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-287
+- Improvement
+    * Compiled with clamav-0.93 libraries
+
+* Sun Apr 06 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-280
+- Improvement
+    * Rejecting to big email received if one of
+      recipient can't accept it
+
+* Fri Jan 30 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-277
+- Improvement
+    * added a shell script to remove old mail pending
+      within mails/domain.name/user.name/{new,cur}
+      clement's directory
+
+* Fri Dec 21 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-275
+- Improvement
+    * clement require now php rather than php-cli
+
+* Tue Dec 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-274
+- Improvement
+    * Using Clamav-0.92
+
+* Sat Dec  1 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-273
+- Improvement
+   * web log show the server origin information when
+     and E-mail is rejected or delayed.
+
+* Mon Nov 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-270
+- Bug-Fix:
+   * Properly receiving E-mail contents if E-mail
+     lines are very long and splited by '\r' instead
+     of '\n'
+- Improvement
+   * Scanning E-mail for Spam (spamassassin) only
+     if E-mail is smaller than 500K
+
+* Sat Oct 27 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-269
+- Bug-Fix:
+   * Removing Debug trace about WEBGOOD from source
+
+* Fri Oct 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-268
+- Improvement
+   * Insert domain definition witin configuration file
+     (clement.conf) to set reference to goodmail website.
+
+* Sun Aug 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-266
+-Bug-Fix:
+   * "CRLF" was not transmitted in the E-mail data-part,
+      causing trouble with FirstClass  server.
+
+* Fri Aug 24 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-264
+-Improvement:
+   * A new process "virus scanner" is now dedicated
+     to detect virus, previously each clement iteration
+     was doing it. This reduce memory consumption
+     a lot
+
+* Thu Aug 22 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-258
+-Bug-Fix:
+   * Closed numeros Memory Leak.
+
+* Thu Jul 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-256
+-Bug-Fix:
+   * Do not use CL_DB_PHISHING_URLS flag to scan E-mail
+     for viruses.
+
+* Fri Jun 15 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-253
+-Bug-Fix:
+   * Clement was not handling very long line (above 5K)
+     coming from some remote SMTP client in E-mail data 
+     part. (RFC 2821 say line 1000 bytes long at max 
+     for data-part, does it?)
+
+* Mon Apr 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-251
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do check
+     if freshclam is up and running anymore. clamav
+     signatures library are back refresh via a daemon.
+
+* Mon Apr 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-250
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do not check
+     if freshclam is up and running anymore. clamav
+     signatures library is now updated via a cron
+     process.
+
+* Mon Apr 17 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-248
+-Improvement:
+   * Quarantined E-mail are now embedded within a
+     MIME part in a new E-mail.
+
+* Mon Mar 12 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-243
+-Improvement:
+    * added a delay on RSET command reply (answer was
+      to quick for Outlook to follow).
 
 * Mon Nov 27 2006 Jean-Marc Pigeon <jmp at safe.ca> 2.1-241
 - Marker:



From jmrcpn at fedoraproject.org  Sun Apr 26 19:52:35 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Sun, 26 Apr 2009 19:52:35 +0000 (UTC)
Subject: rpms/clement/F-10 clement.spec,1.23,1.24
Message-ID: <20090426195235.DCE1D70125@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8058/clement/F-10

Modified Files:
	clement.spec 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/clement.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- clement.spec	15 Jul 2008 14:39:42 -0000	1.23
+++ clement.spec	26 Apr 2009 19:52:05 -0000	1.24
@@ -1,19 +1,42 @@
+#-----------------------------------------------------------
+#to define the revision numer
+%define revision %(R="$Revision$"; RR="${R##: }"; echo ${RR%% ?})
+%define rversion %(echo %{revision} | cut -d'.' -f1-2)
+%define subversion %(echo %{revision}| cut -d'.' -f4)
+#-----------------------------------------------------------
+#to define locmark according RPM builder
+%{?!mark:%define mark fedora}
+
+%if "%mark" == "fedora"
+%define locmark %{dist}
+%endif
+
+%if "%mark" == "safe"
+%define locmark .%{dist}.%{mark}
+%endif
+#-----------------------------------------------------------
+#Standard spec file
+#-----------------------------------------------------------
 Name: clement
-Version: 2.1
-Release: 241%{?dist}.2
+Version: %{rversion}.%{subversion}
+Release: 1%{?locmark}
 URL: http://www.clement.safe.ca
-# No version specified
-License: GPL+
+License: GPLv2
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
+Source: ftp://ftp.safe.ca/pub/srctgz/%{name}-%{version}.tar.gz
+
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
-BuildRequires: clamav-devel >= 0.87-1
 BuildRequires: openssl-devel,bzip2-devel,gmp-devel,glibc-devel,pam-devel
-Requires: clamav >= 0.87-1
-Requires: iptables
+%if "%mark" == "fedora"
+Requires: clamav-server
+%else
+Requires: clamd
+%endif
+Requires: perl-Crypt-PasswdMD5
+Requires: iptables, php
 Requires(post): chkconfig, initscripts
 Requires(preun): chkconfig, initscripts
 Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
@@ -21,8 +44,7 @@
 %description
 Clement is an email firewall. Its purpose is to filter all email, 
 rejecting viruses and unwelcome messages at the SMTP protocol level 
-(and avoids bouncing to forged originators).  Dubious emails are 
-centrally quarantined.
+(and avoids bouncing to forged originators).
 
 Clement extracts "email sending contexts" and can use a remote mentor 
 process to further analyze message context while still connected to the 
@@ -33,12 +55,25 @@
 %setup -q
 
 %build
-%{__make} %{?_smp_mflags}
+%{?_smp_mflags:%define _smp_mflags -j `/usr/bin/getconf _NPROCESSORS_ONLN`}
+%{__make} OPTIMIZE_FLAGS="$RPM_OPT_FLAGS" -s %{?_smp_mflags} prod
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+%if "%mark" == "safe"
+install -dm 755 %{buildroot}/%{_sysconfdir}/yum.repos.d
+cat > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{name}.repo << !EOT
+[clement]
+name=SAFE clement "An SMTP firewall" - Released Updates
+baseurl=ftp://ftp.safe.ca/pub/linux/%{ddist}/\$releasever/%{name}/\$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=ftp://ftp.safe.ca/gpgkey/RPM-GPG-KEY-SAFE-CLEMENT-2006
+!EOT
+%endif
+
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -56,7 +91,7 @@
 %pre 
 if [ "$1" = 1 ]; then
   /usr/sbin/groupadd -r %{name} 2>/dev/null || :
-  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{version} \
+  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{rversion} \
         -g %{name} -c "Clement daemon" \
         -s /sbin/nologin %{name} 2>/dev/null || :
   fi
@@ -67,9 +102,9 @@
     %{_initrddir}/%{name} stop 2>/dev/null || :
     fi
   export APPNAME=%{name}
-  %{_usr}/lib/%{name}-%{version}/support/remove.sh \
-    %{_sysconfdir}/pki/%{name}-%{version}/%{name}.pem \
-    %{_sysconfdir}/%{name}-%{version}/config.done 2>/dev/null || :
+  %{_usr}/lib/%{name}-%{rversion}/support/remove.sh \
+    %{_sysconfdir}/pki/%{name}-%{rversion}/%{name}.pem \
+    %{_sysconfdir}/%{name}-%{rversion}/config.done 2>/dev/null || :
   /sbin/chkconfig --del %{name} 2>/dev/null || :
   (
   /bin/echo -n "$APPNAME has been removed on "; date
@@ -78,42 +113,193 @@
   /bin/echo "these files _may_ be removed too, but that they could"
   /bin/echo "contain valuable data and admin should be careful"
   /bin/echo "when removing them."
-  ) > %{_var}/spool/%{name}-%{version}/README-%{name}-removed
+  ) > %{_var}/spool/%{name}-%{rversion}/README-%{name}-removed
   fi
 
 
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/cron.daily/%{name}
-%{_usr}/lib/%{name}-%{version}/
-%{_datadir}/%{name}-%{version}/
+%{_usr}/lib/%{name}-%{rversion}/
+%{_datadir}/%{name}-%{rversion}/
 %{_bindir}/pibsmtp
 %{_bindir}/clrquar
 %{_bindir}/clxtract
 
 %attr(-,%{name},%{name}) %{_bindir}/%{name}
-%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{version}/
+%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{rversion}/
 
-%doc %{name}-%{version}-*.build_date
+%doc %{name}-%{version}.build_date
 %doc doc/*.txt Changes FAQ LICENCE README
 
 %attr(0755,root,root) %{_initrddir}/%{name}
-%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
-# No, no, no.  Touch the following line, you die. -- FESCo (bug #220497)
-%exclude %config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{rversion}/
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
+%config(noreplace) %{_sysconfdir}/pki/%{name}-%{rversion}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
+%if "%mark" == "safe"
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%endif
 
 
 %changelog
-* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-241.2
-- fix license tag
+* Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
+- Improvement
+   * Spec file update to require clamav-server under 
+     fedora release while requiring clamd otherwise.
+
+* Fri Apr 24 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.318-1
+- Improvement
+   * Spec file update to generate clement.repo file
+   * resolving asprintf warning
+   * adding Copyright Notice to PHP and "C" files
+
+* Tue Apr 21 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.315-2
+- Improvement
+    * fine tuning spec file
+    * using clamd-0.95.2 to detect virus.
+
+* Sun Apr 19 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.314
+- Improvement
+    * Adjusting Spec file to included within Fedora
+      extra packages (version release numbering).
+
+* Sun Mar 1 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-312
+- Bug Fix for Clement and its WEB interface.
+    * Aliases where too limited in number, cause By a line lenght
+      hard-coded both in WEB and gesque.c
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-311
+- Improvement
+    * rcpt <postmaster> without domain qualification is
+      now accepted and routed to domain which own
+      the local interface.
+      Reverse Address MUST be set properly.
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-310
+- Improvement
+    * Clement is accepting user 'post,aster' and 'abuse'
+      regardless mentor stat of mind regarding the originator.
+      according:
+      Network Working Group             J. Klensin
+      Request for Comments: 5321        October 2008
+      as interpreted by rfc-ignorant.org
+
+* Fri Feb 06 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-309
+- Improvement
+    * Clement is using clamav-0.94.2 now
+
+* Sat Jun 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-290
+- Improvement
+    * Clement is using clamav-0.93.1 now
+
+* Tue May 27 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-289
+- Marker
+    * Production Marker
+
+* Wed May 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-288
+- Improvement
+    * adjustement within clement/shell/daily.sh to
+      avoid cron warning.
+
+* Sat May 03 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-287
+- Improvement
+    * Compiled with clamav-0.93 libraries
+
+* Sun Apr 06 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-280
+- Improvement
+    * Rejecting to big email received if one of
+      recipient can't accept it
 
-* Thu Dec 21 2006 Rex Dieter <rdieter at fedoraproject.org> 2.1-241.1
-- %%exclude yum.repos.d/* (bug #220497)
+* Fri Jan 30 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-277
+- Improvement
+    * added a shell script to remove old mail pending
+      within mails/domain.name/user.name/{new,cur}
+      clement's directory
+
+* Fri Dec 21 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-275
+- Improvement
+    * clement require now php rather than php-cli
+
+* Tue Dec 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-274
+- Improvement
+    * Using Clamav-0.92
+
+* Sat Dec  1 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-273
+- Improvement
+   * web log show the server origin information when
+     and E-mail is rejected or delayed.
+
+* Mon Nov 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-270
+- Bug-Fix:
+   * Properly receiving E-mail contents if E-mail
+     lines are very long and splited by '\r' instead
+     of '\n'
+- Improvement
+   * Scanning E-mail for Spam (spamassassin) only
+     if E-mail is smaller than 500K
+
+* Sat Oct 27 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-269
+- Bug-Fix:
+   * Removing Debug trace about WEBGOOD from source
+
+* Fri Oct 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-268
+- Improvement
+   * Insert domain definition witin configuration file
+     (clement.conf) to set reference to goodmail website.
+
+* Sun Aug 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-266
+-Bug-Fix:
+   * "CRLF" was not transmitted in the E-mail data-part,
+      causing trouble with FirstClass  server.
+
+* Fri Aug 24 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-264
+-Improvement:
+   * A new process "virus scanner" is now dedicated
+     to detect virus, previously each clement iteration
+     was doing it. This reduce memory consumption
+     a lot
+
+* Thu Aug 22 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-258
+-Bug-Fix:
+   * Closed numeros Memory Leak.
+
+* Thu Jul 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-256
+-Bug-Fix:
+   * Do not use CL_DB_PHISHING_URLS flag to scan E-mail
+     for viruses.
+
+* Fri Jun 15 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-253
+-Bug-Fix:
+   * Clement was not handling very long line (above 5K)
+     coming from some remote SMTP client in E-mail data 
+     part. (RFC 2821 say line 1000 bytes long at max 
+     for data-part, does it?)
+
+* Mon Apr 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-251
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do check
+     if freshclam is up and running anymore. clamav
+     signatures library are back refresh via a daemon.
+
+* Mon Apr 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-250
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do not check
+     if freshclam is up and running anymore. clamav
+     signatures library is now updated via a cron
+     process.
+
+* Mon Apr 17 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-248
+-Improvement:
+   * Quarantined E-mail are now embedded within a
+     MIME part in a new E-mail.
+
+* Mon Mar 12 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-243
+-Improvement:
+    * added a delay on RSET command reply (answer was
+      to quick for Outlook to follow).
 
 * Mon Nov 27 2006 Jean-Marc Pigeon <jmp at safe.ca> 2.1-241
 - Marker:



From jmrcpn at fedoraproject.org  Sun Apr 26 19:52:36 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Sun, 26 Apr 2009 19:52:36 +0000 (UTC)
Subject: rpms/clement/F-9 clement.spec,1.22,1.23
Message-ID: <20090426195236.7B03870125@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8058/clement/F-9

Modified Files:
	clement.spec 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/clement.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- clement.spec	21 Dec 2006 19:46:24 -0000	1.22
+++ clement.spec	26 Apr 2009 19:52:06 -0000	1.23
@@ -1,18 +1,42 @@
+#-----------------------------------------------------------
+#to define the revision numer
+%define revision %(R="$Revision$"; RR="${R##: }"; echo ${RR%% ?})
+%define rversion %(echo %{revision} | cut -d'.' -f1-2)
+%define subversion %(echo %{revision}| cut -d'.' -f4)
+#-----------------------------------------------------------
+#to define locmark according RPM builder
+%{?!mark:%define mark fedora}
+
+%if "%mark" == "fedora"
+%define locmark %{dist}
+%endif
+
+%if "%mark" == "safe"
+%define locmark .%{dist}.%{mark}
+%endif
+#-----------------------------------------------------------
+#Standard spec file
+#-----------------------------------------------------------
 Name: clement
-Version: 2.1
-Release: 241%{?dist}.1
+Version: %{rversion}.%{subversion}
+Release: 1%{?locmark}
 URL: http://www.clement.safe.ca
-License: GPL
+License: GPLv2
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
+Source: ftp://ftp.safe.ca/pub/srctgz/%{name}-%{version}.tar.gz
+
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
-BuildRequires: clamav-devel >= 0.87-1
 BuildRequires: openssl-devel,bzip2-devel,gmp-devel,glibc-devel,pam-devel
-Requires: clamav >= 0.87-1
-Requires: iptables
+%if "%mark" == "fedora"
+Requires: clamav-server
+%else
+Requires: clamd
+%endif
+Requires: perl-Crypt-PasswdMD5
+Requires: iptables, php
 Requires(post): chkconfig, initscripts
 Requires(preun): chkconfig, initscripts
 Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
@@ -20,8 +44,7 @@
 %description
 Clement is an email firewall. Its purpose is to filter all email, 
 rejecting viruses and unwelcome messages at the SMTP protocol level 
-(and avoids bouncing to forged originators).  Dubious emails are 
-centrally quarantined.
+(and avoids bouncing to forged originators).
 
 Clement extracts "email sending contexts" and can use a remote mentor 
 process to further analyze message context while still connected to the 
@@ -32,12 +55,25 @@
 %setup -q
 
 %build
-%{__make} %{?_smp_mflags}
+%{?_smp_mflags:%define _smp_mflags -j `/usr/bin/getconf _NPROCESSORS_ONLN`}
+%{__make} OPTIMIZE_FLAGS="$RPM_OPT_FLAGS" -s %{?_smp_mflags} prod
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+%if "%mark" == "safe"
+install -dm 755 %{buildroot}/%{_sysconfdir}/yum.repos.d
+cat > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{name}.repo << !EOT
+[clement]
+name=SAFE clement "An SMTP firewall" - Released Updates
+baseurl=ftp://ftp.safe.ca/pub/linux/%{ddist}/\$releasever/%{name}/\$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=ftp://ftp.safe.ca/gpgkey/RPM-GPG-KEY-SAFE-CLEMENT-2006
+!EOT
+%endif
+
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -55,7 +91,7 @@
 %pre 
 if [ "$1" = 1 ]; then
   /usr/sbin/groupadd -r %{name} 2>/dev/null || :
-  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{version} \
+  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{rversion} \
         -g %{name} -c "Clement daemon" \
         -s /sbin/nologin %{name} 2>/dev/null || :
   fi
@@ -66,9 +102,9 @@
     %{_initrddir}/%{name} stop 2>/dev/null || :
     fi
   export APPNAME=%{name}
-  %{_usr}/lib/%{name}-%{version}/support/remove.sh \
-    %{_sysconfdir}/pki/%{name}-%{version}/%{name}.pem \
-    %{_sysconfdir}/%{name}-%{version}/config.done 2>/dev/null || :
+  %{_usr}/lib/%{name}-%{rversion}/support/remove.sh \
+    %{_sysconfdir}/pki/%{name}-%{rversion}/%{name}.pem \
+    %{_sysconfdir}/%{name}-%{rversion}/config.done 2>/dev/null || :
   /sbin/chkconfig --del %{name} 2>/dev/null || :
   (
   /bin/echo -n "$APPNAME has been removed on "; date
@@ -77,39 +113,193 @@
   /bin/echo "these files _may_ be removed too, but that they could"
   /bin/echo "contain valuable data and admin should be careful"
   /bin/echo "when removing them."
-  ) > %{_var}/spool/%{name}-%{version}/README-%{name}-removed
+  ) > %{_var}/spool/%{name}-%{rversion}/README-%{name}-removed
   fi
 
 
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/cron.daily/%{name}
-%{_usr}/lib/%{name}-%{version}/
-%{_datadir}/%{name}-%{version}/
+%{_usr}/lib/%{name}-%{rversion}/
+%{_datadir}/%{name}-%{rversion}/
 %{_bindir}/pibsmtp
 %{_bindir}/clrquar
 %{_bindir}/clxtract
 
 %attr(-,%{name},%{name}) %{_bindir}/%{name}
-%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{version}/
+%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{rversion}/
 
-%doc %{name}-%{version}-*.build_date
+%doc %{name}-%{version}.build_date
 %doc doc/*.txt Changes FAQ LICENCE README
 
 %attr(0755,root,root) %{_initrddir}/%{name}
-%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
-# No, no, no.  Touch the following line, you die. -- FESCo (bug #220497)
-%exclude %config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{rversion}/
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
+%config(noreplace) %{_sysconfdir}/pki/%{name}-%{rversion}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
+%if "%mark" == "safe"
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%endif
 
 
 %changelog
-* Thu Dec 21 2006 Rex Dieter <rdieter at fedoraproject.org> 2.1-241.1
-- %%exclude yum.repos.d/* (bug #220497)
+* Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
+- Improvement
+   * Spec file update to require clamav-server under 
+     fedora release while requiring clamd otherwise.
+
+* Fri Apr 24 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.318-1
+- Improvement
+   * Spec file update to generate clement.repo file
+   * resolving asprintf warning
+   * adding Copyright Notice to PHP and "C" files
+
+* Tue Apr 21 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.315-2
+- Improvement
+    * fine tuning spec file
+    * using clamd-0.95.2 to detect virus.
+
+* Sun Apr 19 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.314
+- Improvement
+    * Adjusting Spec file to included within Fedora
+      extra packages (version release numbering).
+
+* Sun Mar 1 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-312
+- Bug Fix for Clement and its WEB interface.
+    * Aliases where too limited in number, cause By a line lenght
+      hard-coded both in WEB and gesque.c
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-311
+- Improvement
+    * rcpt <postmaster> without domain qualification is
+      now accepted and routed to domain which own
+      the local interface.
+      Reverse Address MUST be set properly.
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-310
+- Improvement
+    * Clement is accepting user 'post,aster' and 'abuse'
+      regardless mentor stat of mind regarding the originator.
+      according:
+      Network Working Group             J. Klensin
+      Request for Comments: 5321        October 2008
+      as interpreted by rfc-ignorant.org
+
+* Fri Feb 06 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-309
+- Improvement
+    * Clement is using clamav-0.94.2 now
+
+* Sat Jun 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-290
+- Improvement
+    * Clement is using clamav-0.93.1 now
+
+* Tue May 27 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-289
+- Marker
+    * Production Marker
+
+* Wed May 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-288
+- Improvement
+    * adjustement within clement/shell/daily.sh to
+      avoid cron warning.
+
+* Sat May 03 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-287
+- Improvement
+    * Compiled with clamav-0.93 libraries
+
+* Sun Apr 06 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-280
+- Improvement
+    * Rejecting to big email received if one of
+      recipient can't accept it
+
+* Fri Jan 30 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-277
+- Improvement
+    * added a shell script to remove old mail pending
+      within mails/domain.name/user.name/{new,cur}
+      clement's directory
+
+* Fri Dec 21 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-275
+- Improvement
+    * clement require now php rather than php-cli
+
+* Tue Dec 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-274
+- Improvement
+    * Using Clamav-0.92
+
+* Sat Dec  1 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-273
+- Improvement
+   * web log show the server origin information when
+     and E-mail is rejected or delayed.
+
+* Mon Nov 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-270
+- Bug-Fix:
+   * Properly receiving E-mail contents if E-mail
+     lines are very long and splited by '\r' instead
+     of '\n'
+- Improvement
+   * Scanning E-mail for Spam (spamassassin) only
+     if E-mail is smaller than 500K
+
+* Sat Oct 27 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-269
+- Bug-Fix:
+   * Removing Debug trace about WEBGOOD from source
+
+* Fri Oct 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-268
+- Improvement
+   * Insert domain definition witin configuration file
+     (clement.conf) to set reference to goodmail website.
+
+* Sun Aug 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-266
+-Bug-Fix:
+   * "CRLF" was not transmitted in the E-mail data-part,
+      causing trouble with FirstClass  server.
+
+* Fri Aug 24 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-264
+-Improvement:
+   * A new process "virus scanner" is now dedicated
+     to detect virus, previously each clement iteration
+     was doing it. This reduce memory consumption
+     a lot
+
+* Thu Aug 22 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-258
+-Bug-Fix:
+   * Closed numeros Memory Leak.
+
+* Thu Jul 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-256
+-Bug-Fix:
+   * Do not use CL_DB_PHISHING_URLS flag to scan E-mail
+     for viruses.
+
+* Fri Jun 15 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-253
+-Bug-Fix:
+   * Clement was not handling very long line (above 5K)
+     coming from some remote SMTP client in E-mail data 
+     part. (RFC 2821 say line 1000 bytes long at max 
+     for data-part, does it?)
+
+* Mon Apr 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-251
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do check
+     if freshclam is up and running anymore. clamav
+     signatures library are back refresh via a daemon.
+
+* Mon Apr 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-250
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do not check
+     if freshclam is up and running anymore. clamav
+     signatures library is now updated via a cron
+     process.
+
+* Mon Apr 17 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-248
+-Improvement:
+   * Quarantined E-mail are now embedded within a
+     MIME part in a new E-mail.
+
+* Mon Mar 12 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-243
+-Improvement:
+    * added a delay on RSET command reply (answer was
+      to quick for Outlook to follow).
 
 * Mon Nov 27 2006 Jean-Marc Pigeon <jmp at safe.ca> 2.1-241
 - Marker:



From jmrcpn at fedoraproject.org  Sun Apr 26 19:52:36 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Sun, 26 Apr 2009 19:52:36 +0000 (UTC)
Subject: rpms/clement/devel clement.spec,1.24,1.25
Message-ID: <20090426195236.CBE7970125@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8058/clement/devel

Modified Files:
	clement.spec 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/clement.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- clement.spec	24 Feb 2009 07:48:25 -0000	1.24
+++ clement.spec	26 Apr 2009 19:52:06 -0000	1.25
@@ -1,19 +1,42 @@
+#-----------------------------------------------------------
+#to define the revision numer
+%define revision %(R="$Revision$"; RR="${R##: }"; echo ${RR%% ?})
+%define rversion %(echo %{revision} | cut -d'.' -f1-2)
+%define subversion %(echo %{revision}| cut -d'.' -f4)
+#-----------------------------------------------------------
+#to define locmark according RPM builder
+%{?!mark:%define mark fedora}
+
+%if "%mark" == "fedora"
+%define locmark %{dist}
+%endif
+
+%if "%mark" == "safe"
+%define locmark .%{dist}.%{mark}
+%endif
+#-----------------------------------------------------------
+#Standard spec file
+#-----------------------------------------------------------
 Name: clement
-Version: 2.1
-Release: 242%{?dist}.2
+Version: %{rversion}.%{subversion}
+Release: 1%{?locmark}
 URL: http://www.clement.safe.ca
-# No version specified
-License: GPL+
+License: GPLv2
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
+Source: ftp://ftp.safe.ca/pub/srctgz/%{name}-%{version}.tar.gz
+
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
-BuildRequires: clamav-devel >= 0.87-1
 BuildRequires: openssl-devel,bzip2-devel,gmp-devel,glibc-devel,pam-devel
-Requires: clamav >= 0.87-1
-Requires: iptables
+%if "%mark" == "fedora"
+Requires: clamav-server
+%else
+Requires: clamd
+%endif
+Requires: perl-Crypt-PasswdMD5
+Requires: iptables, php
 Requires(post): chkconfig, initscripts
 Requires(preun): chkconfig, initscripts
 Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
@@ -21,8 +44,7 @@
 %description
 Clement is an email firewall. Its purpose is to filter all email, 
 rejecting viruses and unwelcome messages at the SMTP protocol level 
-(and avoids bouncing to forged originators).  Dubious emails are 
-centrally quarantined.
+(and avoids bouncing to forged originators).
 
 Clement extracts "email sending contexts" and can use a remote mentor 
 process to further analyze message context while still connected to the 
@@ -33,12 +55,25 @@
 %setup -q
 
 %build
-%{__make} %{?_smp_mflags}
+%{?_smp_mflags:%define _smp_mflags -j `/usr/bin/getconf _NPROCESSORS_ONLN`}
+%{__make} OPTIMIZE_FLAGS="$RPM_OPT_FLAGS" -s %{?_smp_mflags} prod
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+%if "%mark" == "safe"
+install -dm 755 %{buildroot}/%{_sysconfdir}/yum.repos.d
+cat > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{name}.repo << !EOT
+[clement]
+name=SAFE clement "An SMTP firewall" - Released Updates
+baseurl=ftp://ftp.safe.ca/pub/linux/%{ddist}/\$releasever/%{name}/\$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=ftp://ftp.safe.ca/gpgkey/RPM-GPG-KEY-SAFE-CLEMENT-2006
+!EOT
+%endif
+
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -56,7 +91,7 @@
 %pre 
 if [ "$1" = 1 ]; then
   /usr/sbin/groupadd -r %{name} 2>/dev/null || :
-  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{version} \
+  /usr/sbin/useradd -r -M -d /var/spool/%{name}-%{rversion} \
         -g %{name} -c "Clement daemon" \
         -s /sbin/nologin %{name} 2>/dev/null || :
   fi
@@ -67,9 +102,9 @@
     %{_initrddir}/%{name} stop 2>/dev/null || :
     fi
   export APPNAME=%{name}
-  %{_usr}/lib/%{name}-%{version}/support/remove.sh \
-    %{_sysconfdir}/pki/%{name}-%{version}/%{name}.pem \
-    %{_sysconfdir}/%{name}-%{version}/config.done 2>/dev/null || :
+  %{_usr}/lib/%{name}-%{rversion}/support/remove.sh \
+    %{_sysconfdir}/pki/%{name}-%{rversion}/%{name}.pem \
+    %{_sysconfdir}/%{name}-%{rversion}/config.done 2>/dev/null || :
   /sbin/chkconfig --del %{name} 2>/dev/null || :
   (
   /bin/echo -n "$APPNAME has been removed on "; date
@@ -78,45 +113,193 @@
   /bin/echo "these files _may_ be removed too, but that they could"
   /bin/echo "contain valuable data and admin should be careful"
   /bin/echo "when removing them."
-  ) > %{_var}/spool/%{name}-%{version}/README-%{name}-removed
+  ) > %{_var}/spool/%{name}-%{rversion}/README-%{name}-removed
   fi
 
 
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/cron.daily/%{name}
-%{_usr}/lib/%{name}-%{version}/
-%{_datadir}/%{name}-%{version}/
+%{_usr}/lib/%{name}-%{rversion}/
+%{_datadir}/%{name}-%{rversion}/
 %{_bindir}/pibsmtp
 %{_bindir}/clrquar
 %{_bindir}/clxtract
 
 %attr(-,%{name},%{name}) %{_bindir}/%{name}
-%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{version}/
-%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{version}/
+%attr(-,%{name},%{name}) %{_var}/spool/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/crash/%{name}-%{rversion}/
+%attr(-,%{name},%{name}) %{_var}/lock/%{name}-%{rversion}/
 
-%doc %{name}-%{version}-*.build_date
+%doc %{name}-%{version}.build_date
 %doc doc/*.txt Changes FAQ LICENCE README
 
 %attr(0755,root,root) %{_initrddir}/%{name}
-%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
-# No, no, no.  Touch the following line, you die. -- FESCo (bug #220497)
-%exclude %config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{rversion}/
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
+%config(noreplace) %{_sysconfdir}/pki/%{name}-%{rversion}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
+%if "%mark" == "safe"
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
+%endif
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-242.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
+- Improvement
+   * Spec file update to require clamav-server under 
+     fedora release while requiring clamd otherwise.
+
+* Fri Apr 24 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.318-1
+- Improvement
+   * Spec file update to generate clement.repo file
+   * resolving asprintf warning
+   * adding Copyright Notice to PHP and "C" files
+
+* Tue Apr 21 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.315-2
+- Improvement
+    * fine tuning spec file
+    * using clamd-0.95.2 to detect virus.
 
-* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-241.2
-- fix license tag
+* Sun Apr 19 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.314
+- Improvement
+    * Adjusting Spec file to included within Fedora
+      extra packages (version release numbering).
+
+* Sun Mar 1 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-312
+- Bug Fix for Clement and its WEB interface.
+    * Aliases where too limited in number, cause By a line lenght
+      hard-coded both in WEB and gesque.c
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-311
+- Improvement
+    * rcpt <postmaster> without domain qualification is
+      now accepted and routed to domain which own
+      the local interface.
+      Reverse Address MUST be set properly.
+
+* Fri Feb 23 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-310
+- Improvement
+    * Clement is accepting user 'post,aster' and 'abuse'
+      regardless mentor stat of mind regarding the originator.
+      according:
+      Network Working Group             J. Klensin
+      Request for Comments: 5321        October 2008
+      as interpreted by rfc-ignorant.org
 
-* Thu Dec 21 2006 Rex Dieter <rdieter at fedoraproject.org> 2.1-241.1
-- %%exclude yum.repos.d/* (bug #220497)
+* Fri Feb 06 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1-309
+- Improvement
+    * Clement is using clamav-0.94.2 now
+
+* Sat Jun 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-290
+- Improvement
+    * Clement is using clamav-0.93.1 now
+
+* Tue May 27 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-289
+- Marker
+    * Production Marker
+
+* Wed May 14 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-288
+- Improvement
+    * adjustement within clement/shell/daily.sh to
+      avoid cron warning.
+
+* Sat May 03 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-287
+- Improvement
+    * Compiled with clamav-0.93 libraries
+
+* Sun Apr 06 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-280
+- Improvement
+    * Rejecting to big email received if one of
+      recipient can't accept it
+
+* Fri Jan 30 2008 Jean-Marc Pigeon <jmp at safe.ca> 2.1-277
+- Improvement
+    * added a shell script to remove old mail pending
+      within mails/domain.name/user.name/{new,cur}
+      clement's directory
+
+* Fri Dec 21 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-275
+- Improvement
+    * clement require now php rather than php-cli
+
+* Tue Dec 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-274
+- Improvement
+    * Using Clamav-0.92
+
+* Sat Dec  1 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-273
+- Improvement
+   * web log show the server origin information when
+     and E-mail is rejected or delayed.
+
+* Mon Nov 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-270
+- Bug-Fix:
+   * Properly receiving E-mail contents if E-mail
+     lines are very long and splited by '\r' instead
+     of '\n'
+- Improvement
+   * Scanning E-mail for Spam (spamassassin) only
+     if E-mail is smaller than 500K
+
+* Sat Oct 27 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-269
+- Bug-Fix:
+   * Removing Debug trace about WEBGOOD from source
+
+* Fri Oct 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-268
+- Improvement
+   * Insert domain definition witin configuration file
+     (clement.conf) to set reference to goodmail website.
+
+* Sun Aug 26 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-266
+-Bug-Fix:
+   * "CRLF" was not transmitted in the E-mail data-part,
+      causing trouble with FirstClass  server.
+
+* Fri Aug 24 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-264
+-Improvement:
+   * A new process "virus scanner" is now dedicated
+     to detect virus, previously each clement iteration
+     was doing it. This reduce memory consumption
+     a lot
+
+* Thu Aug 22 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-258
+-Bug-Fix:
+   * Closed numeros Memory Leak.
+
+* Thu Jul 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-256
+-Bug-Fix:
+   * Do not use CL_DB_PHISHING_URLS flag to scan E-mail
+     for viruses.
+
+* Fri Jun 15 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-253
+-Bug-Fix:
+   * Clement was not handling very long line (above 5K)
+     coming from some remote SMTP client in E-mail data 
+     part. (RFC 2821 say line 1000 bytes long at max 
+     for data-part, does it?)
+
+* Mon Apr 19 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-251
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do check
+     if freshclam is up and running anymore. clamav
+     signatures library are back refresh via a daemon.
+
+* Mon Apr 18 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-250
+-Improvement:
+   * Initshell (/etc/rc.d/init.d/clement) do not check
+     if freshclam is up and running anymore. clamav
+     signatures library is now updated via a cron
+     process.
+
+* Mon Apr 17 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-248
+-Improvement:
+   * Quarantined E-mail are now embedded within a
+     MIME part in a new E-mail.
+
+* Mon Mar 12 2007 Jean-Marc Pigeon <jmp at safe.ca> 2.1-243
+-Improvement:
+    * added a delay on RSET command reply (answer was
+      to quick for Outlook to follow).
 
 * Mon Nov 27 2006 Jean-Marc Pigeon <jmp at safe.ca> 2.1-241
 - Marker:



From devrim at fedoraproject.org  Sun Apr 26 19:53:49 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 19:53:49 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.25,1.26 sources,1.9,1.10
Message-ID: <20090426195349.AC07770125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8284

Modified Files:
	mapserver.spec sources 
Log Message:
Some fixes for 5.4.0



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mapserver.spec	26 Apr 2009 19:18:41 -0000	1.25
+++ mapserver.spec	26 Apr 2009 19:53:19 -0000	1.26
@@ -72,7 +72,6 @@
 %setup -q
 # fix spurious perm bits
 chmod -x tests/home.png
-chmod -x rfc/ms-rfc-8.txt
 chmod -x mapscript/php3/php_mapscript.c
 chmod -x mappluginlayer.c
 chmod -x mapscript/php3/mapscript_i.c
@@ -203,7 +202,7 @@
 %defattr(-,root,root)
 %doc README COMMITERS GD-COPYING HISTORY.TXT  
 %doc INSTALL MIGRATION_GUIDE.TXT
-%doc rfc symbols tests
+%doc symbols tests
 %doc fonts
 %{_bindir}/shp2img
 %{_bindir}/shptree


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Apr 2009 19:18:41 -0000	1.9
+++ sources	26 Apr 2009 19:53:19 -0000	1.10
@@ -1,2 +1 @@
-87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz
 9863c89dcbbac0779e462b0924c0e981  mapserver-5.4.0.tar.gz



From kanarip at fedoraproject.org  Sun Apr 26 19:56:29 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 26 Apr 2009 19:56:29 +0000 (UTC)
Subject: rpms/rubygem-rack/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 rubygem-rack.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090426195629.E49407013C@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8949/devel

Modified Files:
	.cvsignore import.log rubygem-rack.spec sources 
Log Message:
1.0.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Mar 2009 11:32:43 -0000	1.3
+++ .cvsignore	26 Apr 2009 19:55:59 -0000	1.4
@@ -1 +1 @@
-rack-0.9.1.gem
+rack-1.0.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Mar 2009 11:32:43 -0000	1.2
+++ import.log	26 Apr 2009 19:55:59 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-rack-0_4_0-2_fc10:HEAD:rubygem-rack-0.4.0-2.fc10.src.rpm:1228230958
 rubygem-rack-0_9_1-1_fc10:HEAD:rubygem-rack-0.9.1-1.fc10.src.rpm:1237203146
+rubygem-rack-1_0_0-1_fc11:HEAD:rubygem-rack-1.0.0-1.fc11.src.rpm:1240775742


Index: rubygem-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/rubygem-rack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygem-rack.spec	16 Mar 2009 11:32:43 -0000	1.3
+++ rubygem-rack.spec	26 Apr 2009 19:55:59 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           rubygem-%{gemname}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
-Version:        0.9.1
+Version:        1.0.0
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
@@ -66,7 +66,6 @@
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/AUTHORS
 %doc %{geminstdir}/COPYING
 %doc %{geminstdir}/README
 %doc %{geminstdir}/RDOX
@@ -76,6 +75,7 @@
 %doc %{geminstdir}/example
 %doc %{geminstdir}/test
 %doc %{geminstdir}/contrib
+%{geminstdir}/%{gemname}.gemspec
 %{geminstdir}/lib
 %{geminstdir}/bin
 %{_bindir}/rackup
@@ -83,6 +83,9 @@
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Apr 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.0.0-1
+- New upstream version
+
 * Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Mar 2009 11:32:43 -0000	1.3
+++ sources	26 Apr 2009 19:55:59 -0000	1.4
@@ -1 +1 @@
-355ea9c30e8ff9a1c02ef227b39319b5  rack-0.9.1.gem
+014e29fa0aad84dd0fb4fc9707be7b8a  rack-1.0.0.gem



From kanarip at fedoraproject.org  Sun Apr 26 19:57:35 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 26 Apr 2009 19:57:35 +0000 (UTC)
Subject: rpms/rubygem-rack/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 rubygem-rack.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090426195735.BAA2070125@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9873/F-11

Modified Files:
	.cvsignore import.log rubygem-rack.spec sources 
Log Message:
1.0.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Mar 2009 11:32:43 -0000	1.3
+++ .cvsignore	26 Apr 2009 19:57:05 -0000	1.4
@@ -1 +1 @@
-rack-0.9.1.gem
+rack-1.0.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Mar 2009 11:32:43 -0000	1.2
+++ import.log	26 Apr 2009 19:57:05 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-rack-0_4_0-2_fc10:HEAD:rubygem-rack-0.4.0-2.fc10.src.rpm:1228230958
 rubygem-rack-0_9_1-1_fc10:HEAD:rubygem-rack-0.9.1-1.fc10.src.rpm:1237203146
+rubygem-rack-1_0_0-1_fc11:F-11:rubygem-rack-1.0.0-1.fc11.src.rpm:1240775808


Index: rubygem-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-11/rubygem-rack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygem-rack.spec	16 Mar 2009 11:32:43 -0000	1.3
+++ rubygem-rack.spec	26 Apr 2009 19:57:05 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           rubygem-%{gemname}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
-Version:        0.9.1
+Version:        1.0.0
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
@@ -66,7 +66,6 @@
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/AUTHORS
 %doc %{geminstdir}/COPYING
 %doc %{geminstdir}/README
 %doc %{geminstdir}/RDOX
@@ -76,6 +75,7 @@
 %doc %{geminstdir}/example
 %doc %{geminstdir}/test
 %doc %{geminstdir}/contrib
+%{geminstdir}/%{gemname}.gemspec
 %{geminstdir}/lib
 %{geminstdir}/bin
 %{_bindir}/rackup
@@ -83,6 +83,9 @@
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Apr 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.0.0-1
+- New upstream version
+
 * Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Mar 2009 11:32:43 -0000	1.3
+++ sources	26 Apr 2009 19:57:05 -0000	1.4
@@ -1 +1 @@
-355ea9c30e8ff9a1c02ef227b39319b5  rack-0.9.1.gem
+014e29fa0aad84dd0fb4fc9707be7b8a  rack-1.0.0.gem



From kanarip at fedoraproject.org  Sun Apr 26 19:59:06 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 26 Apr 2009 19:59:06 +0000 (UTC)
Subject: rpms/rubygem-rack/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rubygem-rack.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090426195906.E74B270125@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10247/F-10

Modified Files:
	.cvsignore import.log rubygem-rack.spec sources 
Log Message:
1.0.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2008 15:17:51 -0000	1.2
+++ .cvsignore	26 Apr 2009 19:58:36 -0000	1.3
@@ -1 +1 @@
-rack-0.4.0.gem
+rack-1.0.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Dec 2008 15:17:51 -0000	1.1
+++ import.log	26 Apr 2009 19:58:36 -0000	1.2
@@ -1 +1,2 @@
 rubygem-rack-0_4_0-2_fc10:F-10:rubygem-rack-0.4.0-2.fc10.src.rpm:1228231047
+rubygem-rack-1_0_0-1_fc11:F-10:rubygem-rack-1.0.0-1.fc11.src.rpm:1240775895


Index: rubygem-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-10/rubygem-rack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-rack.spec	2 Dec 2008 15:17:51 -0000	1.1
+++ rubygem-rack.spec	26 Apr 2009 19:58:36 -0000	1.2
@@ -4,8 +4,8 @@
 
 Name:           rubygem-%{gemname}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/%{gemname}/
@@ -32,10 +32,27 @@
 gem install --local --install-dir %{buildroot}/%{gemdir} \
             --force %{SOURCE0}
 
-chmod 755 %{buildroot}/%{geminstdir}/test/cgi/test.fcgi
-chmod 755 %{buildroot}/%{geminstdir}/test/cgi/test.ru
-chmod 755 %{buildroot}/%{geminstdir}/test/cgi/test
-chmod 755 %{buildroot}/%{geminstdir}/bin/rackup
+# Remove backup files
+find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+
+# Delete zero-length files
+find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+
+# Fix anything executable that does not have a shebang
+for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
+done
+
+# Find files with a shebang that do not have executable permissions
+for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
+done
+
+# Find files that have non-standard-executable-perm
+find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;
+
+# Find files that are not readable
+find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;
 
 # Move %{gemdir}/bin/rackup to %{_bindir}
 mkdir -p %{buildroot}/%{_bindir}
@@ -49,7 +66,6 @@
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/AUTHORS
 %doc %{geminstdir}/COPYING
 %doc %{geminstdir}/README
 %doc %{geminstdir}/RDOX
@@ -59,6 +75,7 @@
 %doc %{geminstdir}/example
 %doc %{geminstdir}/test
 %doc %{geminstdir}/contrib
+%{geminstdir}/%{gemname}.gemspec
 %{geminstdir}/lib
 %{geminstdir}/bin
 %{_bindir}/rackup
@@ -66,6 +83,15 @@
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Apr 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.0.0-1
+- New upstream version
+
+* Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.1-1
+- New upstream version
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Nov 09 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.4.0-2
 - Remove unused macro (#470694)
 - Add ruby(abi) = 1.8 as required by package guidelines (#470694)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2008 15:17:51 -0000	1.2
+++ sources	26 Apr 2009 19:58:36 -0000	1.3
@@ -1 +1 @@
-193b18066b640a499117107873ab490c  rack-0.4.0.gem
+014e29fa0aad84dd0fb4fc9707be7b8a  rack-1.0.0.gem



From kanarip at fedoraproject.org  Sun Apr 26 20:00:49 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 26 Apr 2009 20:00:49 +0000 (UTC)
Subject: rpms/rubygem-rack/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rubygem-rack.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090426200049.E7C3070125@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10738/F-9

Modified Files:
	.cvsignore import.log rubygem-rack.spec sources 
Log Message:
1.0.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2008 15:19:17 -0000	1.2
+++ .cvsignore	26 Apr 2009 20:00:19 -0000	1.3
@@ -1 +1 @@
-rack-0.4.0.gem
+rack-1.0.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Dec 2008 15:19:17 -0000	1.1
+++ import.log	26 Apr 2009 20:00:19 -0000	1.2
@@ -1 +1,2 @@
 rubygem-rack-0_4_0-2_fc10:F-9:rubygem-rack-0.4.0-2.fc10.src.rpm:1228231134
+rubygem-rack-1_0_0-1_fc11:F-9:rubygem-rack-1.0.0-1.fc11.src.rpm:1240775986


Index: rubygem-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-9/rubygem-rack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-rack.spec	2 Dec 2008 15:19:17 -0000	1.1
+++ rubygem-rack.spec	26 Apr 2009 20:00:19 -0000	1.2
@@ -4,8 +4,8 @@
 
 Name:           rubygem-%{gemname}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/%{gemname}/
@@ -32,10 +32,27 @@
 gem install --local --install-dir %{buildroot}/%{gemdir} \
             --force %{SOURCE0}
 
-chmod 755 %{buildroot}/%{geminstdir}/test/cgi/test.fcgi
-chmod 755 %{buildroot}/%{geminstdir}/test/cgi/test.ru
-chmod 755 %{buildroot}/%{geminstdir}/test/cgi/test
-chmod 755 %{buildroot}/%{geminstdir}/bin/rackup
+# Remove backup files
+find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+
+# Delete zero-length files
+find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+
+# Fix anything executable that does not have a shebang
+for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
+done
+
+# Find files with a shebang that do not have executable permissions
+for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
+done
+
+# Find files that have non-standard-executable-perm
+find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;
+
+# Find files that are not readable
+find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;
 
 # Move %{gemdir}/bin/rackup to %{_bindir}
 mkdir -p %{buildroot}/%{_bindir}
@@ -49,7 +66,6 @@
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/AUTHORS
 %doc %{geminstdir}/COPYING
 %doc %{geminstdir}/README
 %doc %{geminstdir}/RDOX
@@ -59,6 +75,7 @@
 %doc %{geminstdir}/example
 %doc %{geminstdir}/test
 %doc %{geminstdir}/contrib
+%{geminstdir}/%{gemname}.gemspec
 %{geminstdir}/lib
 %{geminstdir}/bin
 %{_bindir}/rackup
@@ -66,6 +83,15 @@
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Apr 26 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.0.0-1
+- New upstream version
+
+* Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.9.1-1
+- New upstream version
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Nov 09 2008 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.4.0-2
 - Remove unused macro (#470694)
 - Add ruby(abi) = 1.8 as required by package guidelines (#470694)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2008 15:19:17 -0000	1.2
+++ sources	26 Apr 2009 20:00:19 -0000	1.3
@@ -1 +1 @@
-193b18066b640a499117107873ab490c  rack-0.4.0.gem
+014e29fa0aad84dd0fb4fc9707be7b8a  rack-1.0.0.gem



From devrim at fedoraproject.org  Sun Apr 26 20:19:16 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 26 Apr 2009 20:19:16 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.26,1.27
Message-ID: <20090426201916.91AEC70125@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12841

Modified Files:
	mapserver.spec 
Log Message:
Another attempt to fix build failure.



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mapserver.spec	26 Apr 2009 19:53:19 -0000	1.26
+++ mapserver.spec	26 Apr 2009 20:18:45 -0000	1.27
@@ -14,7 +14,7 @@
 BuildRequires:  httpd-devel php-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  postgresql-devel mysql-devel java-1.6.0-openjdk-devel
-BuildRequires:  java-devel swig > 1.3.24 java
+BuildRequires:  java-devel swig > 1.3.24 java java-1.5.0-gcj-devel
 BuildRequires:  geos-devel proj-devel gdal-devel agg-devel
 BuildRequires:  php-devel freetype-devel gd-devel >= 2.0.16
 BuildRequires:  python-devel curl-devel zlib-devel libxml2-devel



From verdurin at fedoraproject.org  Sun Apr 26 20:51:13 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Sun, 26 Apr 2009 20:51:13 +0000 (UTC)
Subject: rpms/gnomint/F-11 gnomint.spec,1.5,1.6
Message-ID: <20090426205114.0EFD570125@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17183

Modified Files:
	gnomint.spec 
Log Message:
really fix 496518



Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-11/gnomint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomint.spec	21 Apr 2009 22:34:06 -0000	1.5
+++ gnomint.spec	26 Apr 2009 20:50:42 -0000	1.6
@@ -1,12 +1,13 @@
 Name:		gnomint
 Version:	0.9.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
 License:	GPLv3+
 URL:		http://gnomint.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-cflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,11 +32,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
-sed -i -e 's|CFLAGS="-Wall -Werror -g "|true|' configure
-%configure --disable-schemas-install
+%configure --disable-dependency-tracking --disable-schemas-install
 make %{?_smp_mflags}
 
 
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Sun Apr 26 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-4
+- really fix 496518
+
 * Tue Apr 21 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-3
 - fix for bug 496518 - $RPM_OPT_FLAGS not used
 



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:37 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchcommits
Message-ID: <20090426205837.F1A7E10F893@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-conch (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:42 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested commit
Message-ID: <20090426205842.D275D10F895@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-conch (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:50 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchbugzilla
Message-ID: <20090426205850.A591210F897@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-conch (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:51 +0000
Subject: [pkgdb] python-twisted: jsteffan has given up approveacls
Message-ID: <20090426205851.33B7310F89A@bastion2.fedora.phx.redhat.com>

jsteffan has given up the approveacls acl on python-twisted (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:54 +0000
Subject: [pkgdb] python-twisted: jsteffan has given up approveacls
Message-ID: <20090426205854.C285110F89B@bastion2.fedora.phx.redhat.com>

jsteffan has given up the approveacls acl on python-twisted (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:56 +0000
Subject: [pkgdb] python-twisted: jsteffan has given up approveacls
Message-ID: <20090426205856.1E7F610F89F@bastion2.fedora.phx.redhat.com>

jsteffan has given up the approveacls acl on python-twisted (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted



From pkgdb at fedoraproject.org  Sun Apr 26 20:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:58:56 +0000
Subject: [pkgdb] python-twisted: jsteffan has given up approveacls
Message-ID: <20090426205857.0B5A910F8A0@bastion2.fedora.phx.redhat.com>

jsteffan has given up the approveacls acl on python-twisted (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:12 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchcommits
Message-ID: <20090426205912.97F1B10F893@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-conch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:13 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested commit
Message-ID: <20090426205913.A316110F896@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-conch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:16 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchbugzilla
Message-ID: <20090426205917.00E0010F89A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-conch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:23 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchbugzilla
Message-ID: <20090426205923.B133710F8A2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-conch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:24 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchcommits
Message-ID: <20090426205924.57DD610F8A6@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-conch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:27 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested commit
Message-ID: <20090426205927.645D810F8A3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-conch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:33 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchbugzilla
Message-ID: <20090426205933.2ED4810F8A8@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-conch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:34 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested commit
Message-ID: <20090426205934.60FAA10F8AD@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-conch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:36 +0000
Subject: [pkgdb] python-twisted-conch: jsteffan has requested watchcommits
Message-ID: <20090426205936.8597F10F85F@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-conch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-conch



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:40 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchbugzilla
Message-ID: <20090426205940.3C3F710F8AF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:42 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchcommits
Message-ID: <20090426205943.1783E10F8B2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:49 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchbugzilla
Message-ID: <20090426205949.2A91B10F896@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-core (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:50 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested commit
Message-ID: <20090426205950.3A90810F8B3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-core (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:51 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchcommits
Message-ID: <20090426205951.67A7710F8B6@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-core (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:56 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchbugzilla
Message-ID: <20090426205957.08C8010F8BA@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:58 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested commit
Message-ID: <20090426205958.8238710F8BB@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 20:59:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 20:59:59 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchcommits
Message-ID: <20090426210000.0DC6710F8BF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-core (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:01 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchbugzilla
Message-ID: <20090426210001.E449610F8C1@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-core (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:01 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchcommits
Message-ID: <20090426210002.4EEB010F8C4@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-core (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:03 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested commit
Message-ID: <20090426210003.9FC3810F8C7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-core (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:07 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchbugzilla
Message-ID: <20090426210007.8E5AD10F8CA@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-core (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:08 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested commit
Message-ID: <20090426210008.893AD10F8CC@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-core (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:08 +0000
Subject: [pkgdb] python-twisted-core: jsteffan has requested watchcommits
Message-ID: <20090426210008.B7D2110F8CF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-core (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:18 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested commit
Message-ID: <20090426210019.122F610F8D3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-lore (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:23 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested commit
Message-ID: <20090426210023.3CEAC10F8A7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-lore (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:24 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchcommits
Message-ID: <20090426210024.B7A0910F8D5@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-lore (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:26 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchcommits
Message-ID: <20090426210026.C8D5910F8D8@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-lore (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:27 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchbugzilla
Message-ID: <20090426210027.A893810F8DB@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-lore (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:30 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchbugzilla
Message-ID: <20090426210030.D3A8910F8DD@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-lore (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:31 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested commit
Message-ID: <20090426210031.EB78E10F8AC@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-lore (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:33 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchbugzilla
Message-ID: <20090426210033.5836410F8E0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-lore (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:33 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested commit
Message-ID: <20090426210033.A5DDF10F8AA@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-lore (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:33 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchcommits
Message-ID: <20090426210034.5817610F8E3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-lore (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:37 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchcommits
Message-ID: <20090426210037.7B7FF10F8E8@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-mail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:40 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchbugzilla
Message-ID: <20090426210041.0E48010F8ED@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-mail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:41 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested commit
Message-ID: <20090426210041.4D1B510F8F0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-mail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:43 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchcommits
Message-ID: <20090426210043.C52ED10F8F2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-mail (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:47 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchbugzilla
Message-ID: <20090426210048.1A1AA10F8F4@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-mail (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:47 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested commit
Message-ID: <20090426210049.BEF0A10F8F9@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-mail (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:49 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchbugzilla
Message-ID: <20090426210050.1B91110F8FC@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-mail (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:50 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested commit
Message-ID: <20090426210050.4BD6A10F900@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-mail (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:50 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchcommits
Message-ID: <20090426210050.7A33B10F902@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-mail (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:53 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchcommits
Message-ID: <20090426210054.4883010F903@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-mail (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:57 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested commit
Message-ID: <20090426210057.50BC910F904@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-mail (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:18 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchbugzilla
Message-ID: <20090426210018.BBC2410F8D2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-lore (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:00 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchcommits
Message-ID: <20090426210100.A862110F90A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-names (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:57 +0000
Subject: [pkgdb] python-twisted-mail: jsteffan has requested watchbugzilla
Message-ID: <20090426210057.8008610F907@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-mail (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-mail



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:01 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchbugzilla
Message-ID: <20090426210101.49C2510F90D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-names (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:00:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:00:15 +0000
Subject: [pkgdb] python-twisted-lore: jsteffan has requested watchcommits
Message-ID: <20090426210015.234AB10F8A4@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-lore (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-lore



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:07 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested commit
Message-ID: <20090426210107.9780010F897@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-names (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:10 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested commit
Message-ID: <20090426210110.5CA2010F90F@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-names (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:15 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchbugzilla
Message-ID: <20090426210115.A9CAB10F911@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-names (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:16 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested commit
Message-ID: <20090426210116.3EA5B10F914@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-names (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:16 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchcommits
Message-ID: <20090426210116.EE50810F916@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-names (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:23 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchcommits
Message-ID: <20090426210123.DAF7A10F919@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-names (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:27 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchcommits
Message-ID: <20090426210127.BB17D10F8B9@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-names (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:25 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested commit
Message-ID: <20090426210128.3EA9810F91C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-names (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:27 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchbugzilla
Message-ID: <20090426210128.E8F2C10F923@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-names (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:33 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchbugzilla
Message-ID: <20090426210133.8B69210F926@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-names (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:35 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested commit
Message-ID: <20090426210135.A73A010F92B@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-names (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:35 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchcommits
Message-ID: <20090426210135.A359710F92A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-names (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:45 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchbugzilla
Message-ID: <20090426210145.4DD4110F92C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-news (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:24 +0000
Subject: [pkgdb] python-twisted-names: jsteffan has requested watchbugzilla
Message-ID: <20090426210127.4245B10F922@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-names (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:45 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchcommits
Message-ID: <20090426210146.0597C10F92F@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-news (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:48 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested commit
Message-ID: <20090426210148.A1CB410F8BF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-news (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:54 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchbugzilla
Message-ID: <20090426210154.1A62210F931@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-news (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:54 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested commit
Message-ID: <20090426210154.BD5F710F934@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-news (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:59 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchbugzilla
Message-ID: <20090426210159.3B4BC10F8C6@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-news (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:59 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested commit
Message-ID: <20090426210159.92C9910F937@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-news (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:01:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:01:56 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchcommits
Message-ID: <20090426210200.220E310F939@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-news (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:01 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchcommits
Message-ID: <20090426210203.2DA8410F93C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-news (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:05 +0000
Subject: [pkgdb] python-twisted-news: jsteffan has requested watchbugzilla
Message-ID: <20090426210205.A970010F93F@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-news (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-news



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:13 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchbugzilla
Message-ID: <20090426210213.806D510F943@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-runner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:13 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested commit
Message-ID: <20090426210213.2676B10F8C8@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-runner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:13 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchcommits
Message-ID: <20090426210213.6513E10F940@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-runner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:19 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchcommits
Message-ID: <20090426210219.8D43910F946@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-runner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:20 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested commit
Message-ID: <20090426210220.9F98510F948@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-runner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:21 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchbugzilla
Message-ID: <20090426210222.EEDE210F8CE@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-runner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:24 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchcommits
Message-ID: <20090426210224.74F0810F94A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-runner (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:25 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchbugzilla
Message-ID: <20090426210227.A642B10F94D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-runner (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:28 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested commit
Message-ID: <20090426210229.0345710F950@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-runner (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:30 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchcommits
Message-ID: <20090426210230.9CA8310F952@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-runner (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:32 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested commit
Message-ID: <20090426210232.5A7B910F8D0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-runner (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:32 +0000
Subject: [pkgdb] python-twisted-runner: jsteffan has requested watchbugzilla
Message-ID: <20090426210232.C052410F955@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-runner (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-runner



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:44 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchcommits
Message-ID: <20090426210244.B5B6510F8D1@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-web (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:45 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested commit
Message-ID: <20090426210245.8807C10F95D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-web (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:45 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchbugzilla
Message-ID: <20090426210245.AD6B010F960@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-web (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:46 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchbugzilla
Message-ID: <20090426210246.8EEB210F963@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-web (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:48 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchcommits
Message-ID: <20090426210248.A004A10F966@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-web (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:50 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested commit
Message-ID: <20090426210251.EB0F810F969@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-web (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:52 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchcommits
Message-ID: <20090426210252.E048D10F96C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-web (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:52 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchbugzilla
Message-ID: <20090426210253.7403510F96F@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-web (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:54 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested commit
Message-ID: <20090426210254.4534810F971@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-web (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:54 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchbugzilla
Message-ID: <20090426210254.5FF7010F974@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-web (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:56 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchcommits
Message-ID: <20090426210256.F314B10F8D5@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-web (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:00 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested commit
Message-ID: <20090426210300.1A59810F977@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-web (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:01 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchbugzilla
Message-ID: <20090426210301.213A810F97A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-web (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:07 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchcommits
Message-ID: <20090426210307.4876010F8D8@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-words (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:39 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested watchcommits
Message-ID: <20090426210239.3919710F959@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-web (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:02:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:02:40 +0000
Subject: [pkgdb] python-twisted-web: jsteffan has requested commit
Message-ID: <20090426210240.4E6EC10F95C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-web (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:08 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested commit
Message-ID: <20090426210308.823D010F97B@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-words (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:14 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchbugzilla
Message-ID: <20090426210314.48A9B10F97E@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-words (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:14 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchbugzilla
Message-ID: <20090426210314.8E6CD10F981@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-words (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:16 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchcommits
Message-ID: <20090426210316.31A7710F983@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-words (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:18 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchbugzilla
Message-ID: <20090426210318.65BC210F8DC@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-words (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:18 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchcommits
Message-ID: <20090426210318.F16DB10F985@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-words (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:21 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested commit
Message-ID: <20090426210321.ECCE810F988@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-words (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:22 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested commit
Message-ID: <20090426210322.481E810F98C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-words (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:26 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested commit
Message-ID: <20090426210326.5656010F992@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-words (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:23 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchbugzilla
Message-ID: <20090426210323.DB04C10F98F@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-words (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:30 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested commit
Message-ID: <20090426210330.8215510F8DE@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-twisted-words (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:31 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchbugzilla
Message-ID: <20090426210331.DC04010F993@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-twisted-words (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:32 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchcommits
Message-ID: <20090426210333.0E58010F996@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-words (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From pkgdb at fedoraproject.org  Sun Apr 26 21:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:03:33 +0000
Subject: [pkgdb] python-twisted-words: jsteffan has requested watchcommits
Message-ID: <20090426210333.59CF310F999@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-twisted-words (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-words



From bpepple at fedoraproject.org  Sun Apr 26 21:05:05 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 26 Apr 2009 21:05:05 +0000 (UTC)
Subject: rpms/nautilus-sound-converter/devel .cvsignore, 1.5,
	1.6 nautilus-sound-converter.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090426210505.EAB3D70125@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/nautilus-sound-converter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19714

Modified Files:
	.cvsignore nautilus-sound-converter.spec sources 
Log Message:
* Sat Apr 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.0.2-1
- Update to 1.0.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Feb 2009 03:08:53 -0000	1.5
+++ .cvsignore	26 Apr 2009 21:04:35 -0000	1.6
@@ -1 +1 @@
-nautilus-sound-converter-1.0.1.tar.bz2
+nautilus-sound-converter-1.0.2.tar.bz2


Index: nautilus-sound-converter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/devel/nautilus-sound-converter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nautilus-sound-converter.spec	26 Feb 2009 04:27:58 -0000	1.7
+++ nautilus-sound-converter.spec	26 Apr 2009 21:04:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nautilus-sound-converter
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Nautilus extension to convert audio files
 
 Group:          User Interface/Desktops
@@ -42,6 +42,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
 
@@ -49,7 +50,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README NEWS
 %{_datadir}/%{name}/
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Sat Apr 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Feb 2009 03:08:53 -0000	1.5
+++ sources	26 Apr 2009 21:04:35 -0000	1.6
@@ -1 +1 @@
-1113514e14fc24a8c9eb81a1c55602a9  nautilus-sound-converter-1.0.1.tar.bz2
+b34b840ad4f511ba3506172d4d926954  nautilus-sound-converter-1.0.2.tar.bz2



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:17 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchbugzilla
Message-ID: <20090426210518.06C0710F8A0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pyjigdo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:18 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchcommits
Message-ID: <20090426210518.8ABA410F8B0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pyjigdo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:19 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested approveacls
Message-ID: <20090426210519.C4A6E10F8EF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pyjigdo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:20 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested commit
Message-ID: <20090426210520.F04FA10F8EB@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pyjigdo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:26 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchcommits
Message-ID: <20090426210526.BC16210F8F0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pyjigdo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:27 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchbugzilla
Message-ID: <20090426210527.D22A910F8F3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pyjigdo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:27 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested commit
Message-ID: <20090426210527.EE7D610F8F9@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pyjigdo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:29 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested approveacls
Message-ID: <20090426210530.32A8110F8FC@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pyjigdo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:33 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchcommits
Message-ID: <20090426210533.8CD1710F901@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pyjigdo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:34 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchbugzilla
Message-ID: <20090426210534.4612E10F904@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pyjigdo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:34 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested commit
Message-ID: <20090426210534.89E1610F905@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pyjigdo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:34 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested approveacls
Message-ID: <20090426210535.15AE310F90B@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pyjigdo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:40 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchcommits
Message-ID: <20090426210541.19F6510F99B@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pyjigdo (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:41 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested watchbugzilla
Message-ID: <20090426210541.D831F10F99D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pyjigdo (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:49 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested approveacls
Message-ID: <20090426210549.9B42410F9A6@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pyjigdo (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From verdurin at fedoraproject.org  Sun Apr 26 21:16:12 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Sun, 26 Apr 2009 21:16:12 +0000 (UTC)
Subject: rpms/gnomint/devel gnomint-0.9.1-cflags.patch,NONE,1.1
Message-ID: <20090426211612.CBAA370125@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21649

Added Files:
	gnomint-0.9.1-cflags.patch 
Log Message:
really fix 496518


gnomint-0.9.1-cflags.patch:

--- NEW FILE gnomint-0.9.1-cflags.patch ---
diff -up gnomint-0.9.1/configure~ gnomint-0.9.1/configure
--- gnomint-0.9.1/configure~	2008-12-18 08:35:02.000000000 +0200
+++ gnomint-0.9.1/configure	2009-04-20 00:05:17.000000000 +0300
@@ -16926,12 +16926,6 @@ fi
 
 
 
-if test "x$GCC" = "xyes"; then
-	CFLAGS="-Wall -Werror"
-	if test "x$use_debug" = "xYes"; then
-   	   CFLAGS="$CFLAGS -g -O0"
-	fi
-fi




From pkgdb at fedoraproject.org  Sun Apr 26 21:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:17:58 +0000
Subject: [pkgdb] fabric: jsteffan has requested watchbugzilla
Message-ID: <20090426211758.9686610F8A6@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on fabric (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:17:58 +0000
Subject: [pkgdb] fabric: jsteffan has requested watchcommits
Message-ID: <20090426211758.DFA3E10F8AD@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on fabric (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:17:58 +0000
Subject: [pkgdb] fabric: jsteffan has requested commit
Message-ID: <20090426211758.EE39E10F8B0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on fabric (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:17:59 +0000
Subject: [pkgdb] fabric: jsteffan has requested approveacls
Message-ID: <20090426211759.C2A2F10F8B5@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on fabric (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:04 +0000
Subject: [pkgdb] fabric: jsteffan has requested watchbugzilla
Message-ID: <20090426211804.903A110F8B9@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on fabric (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:07 +0000
Subject: [pkgdb] fabric: jsteffan has requested approveacls
Message-ID: <20090426211807.911B710F8BD@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on fabric (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:09 +0000
Subject: [pkgdb] fabric: jsteffan has requested commit
Message-ID: <20090426211809.127FF10F8C0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on fabric (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:09 +0000
Subject: [pkgdb] fabric: jsteffan has requested watchcommits
Message-ID: <20090426211809.26AB910F8C3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on fabric (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Sun Apr 26 21:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:05:50 +0000
Subject: [pkgdb] pyjigdo: jsteffan has requested commit
Message-ID: <20090426210550.9066410F9A9@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pyjigdo (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:12 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested watchbugzilla
Message-ID: <20090426211812.9600910F8C4@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pyftpdlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:14 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested approveacls
Message-ID: <20090426211814.82D9710F8C7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pyftpdlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:18 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested watchcommits
Message-ID: <20090426211818.97AB310F8C9@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pyftpdlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:19 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested watchcommits
Message-ID: <20090426211819.7829E10F8CF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pyftpdlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:20 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested commit
Message-ID: <20090426211820.1C9D710F8D2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pyftpdlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:20 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested approveacls
Message-ID: <20090426211820.7ACDA10F8D7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pyftpdlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:20 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested commit
Message-ID: <20090426211820.9B8FD10F8DB@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pyftpdlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:20 +0000
Subject: [pkgdb] pyftpdlib: jsteffan has requested watchbugzilla
Message-ID: <20090426211820.ACCE410F8E7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pyftpdlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:25 +0000
Subject: [pkgdb] pytc: jsteffan has requested watchbugzilla
Message-ID: <20090426211825.107C110F8F1@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pytc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:25 +0000
Subject: [pkgdb] pytc: jsteffan has requested watchcommits
Message-ID: <20090426211825.5A1C410F8F2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pytc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:27 +0000
Subject: [pkgdb] pytc: jsteffan has requested approveacls
Message-ID: <20090426211827.97CC810F8DF@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pytc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:28 +0000
Subject: [pkgdb] pytc: jsteffan has requested commit
Message-ID: <20090426211828.A9A1B10F8FB@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pytc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:32 +0000
Subject: [pkgdb] pytc: jsteffan has requested watchbugzilla
Message-ID: <20090426211832.9EB8E10F8FD@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pytc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:32 +0000
Subject: [pkgdb] pytc: jsteffan has requested commit
Message-ID: <20090426211832.AA0C410F900@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pytc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:32 +0000
Subject: [pkgdb] pytc: jsteffan has requested approveacls
Message-ID: <20090426211833.1109F10F902@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pytc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:36 +0000
Subject: [pkgdb] pytc: jsteffan has requested watchcommits
Message-ID: <20090426211836.DF44E10F8E2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pytc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:38 +0000
Subject: [pkgdb] python-cly: jsteffan has requested commit
Message-ID: <20090426211838.B57B210F904@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-cly (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:39 +0000
Subject: [pkgdb] python-cly: jsteffan has requested watchcommits
Message-ID: <20090426211840.1AC3910F90A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-cly (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:39 +0000
Subject: [pkgdb] python-cly: jsteffan has requested watchbugzilla
Message-ID: <20090426211839.875C510F907@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-cly (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:40 +0000
Subject: [pkgdb] python-cly: jsteffan has requested approveacls
Message-ID: <20090426211840.2D9A110F90D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-cly (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:42 +0000
Subject: [pkgdb] python-cly: jsteffan has requested watchbugzilla
Message-ID: <20090426211842.C491410F910@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-cly (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:43 +0000
Subject: [pkgdb] python-cly: jsteffan has requested watchcommits
Message-ID: <20090426211843.8A7BA10F913@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-cly (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:43 +0000
Subject: [pkgdb] python-cly: jsteffan has requested commit
Message-ID: <20090426211843.B160A10F916@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-cly (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:44 +0000
Subject: [pkgdb] python-cly: jsteffan has requested approveacls
Message-ID: <20090426211844.58D8110F919@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-cly (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:51 +0000
Subject: [pkgdb] python-hash_ring: jsteffan has requested approveacls
Message-ID: <20090426211851.C30DB10F89A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-hash_ring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:52 +0000
Subject: [pkgdb] python-hash_ring: jsteffan has requested watchbugzilla
Message-ID: <20090426211852.D30FC10F91D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-hash_ring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:52 +0000
Subject: [pkgdb] python-hash_ring: jsteffan has requested watchcommits
Message-ID: <20090426211852.C656B10F91A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-hash_ring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:56 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchbugzilla
Message-ID: <20090426211856.D5BF910F89D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:57 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchcommits
Message-ID: <20090426211858.180F410F922@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:58 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested commit
Message-ID: <20090426211858.2CE4810F926@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:00 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested approveacls
Message-ID: <20090426211900.0A9A010F92A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:10 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchcommits
Message-ID: <20090426211910.9B51E10F8A2@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-mutagen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:11 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested commit
Message-ID: <20090426211911.7645410F92E@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-mutagen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:13 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchbugzilla
Message-ID: <20090426211913.BE94810F932@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-mutagen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:15 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchbugzilla
Message-ID: <20090426211915.69B3410F936@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-mutagen (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:17 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchcommits
Message-ID: <20090426211917.3035110F8A8@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-mutagen (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:17 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested approveacls
Message-ID: <20090426211917.9ACA010F93E@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-mutagen (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:19 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested approveacls
Message-ID: <20090426211919.5E96710F941@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-mutagen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:20 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchbugzilla
Message-ID: <20090426211920.8E4C410F945@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:22 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested commit
Message-ID: <20090426211922.44AE210F949@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:18:52 +0000
Subject: [pkgdb] python-hash_ring: jsteffan has requested commit
Message-ID: <20090426211852.DDBEA10F920@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-hash_ring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:17 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested commit
Message-ID: <20090426211917.6B87210F93A@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-mutagen (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:27 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested watchcommits
Message-ID: <20090426211927.4483510F94D@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:27 +0000
Subject: [pkgdb] python-mutagen: jsteffan has requested approveacls
Message-ID: <20090426211927.600BD10F951@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:29 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested watchcommits
Message-ID: <20090426211929.E51EC10F8AA@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-stomper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:30 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested watchbugzilla
Message-ID: <20090426211930.E9AE110F953@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-stomper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:33 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested approveacls
Message-ID: <20090426211933.111C310F956@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-stomper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:35 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested watchcommits
Message-ID: <20090426211935.5739E10F959@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on python-stomper (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:35 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested watchbugzilla
Message-ID: <20090426211935.BEEDF10F95C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on python-stomper (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:37 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested commit
Message-ID: <20090426211937.9011810F960@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-stomper (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:32 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested commit
Message-ID: <20090426211937.E59F210F962@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on python-stomper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:41 +0000
Subject: [pkgdb] python-stomper: jsteffan has requested approveacls
Message-ID: <20090426211941.916EB10F8B0@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on python-stomper (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:44 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested watchbugzilla
Message-ID: <20090426211944.1D31D10F963@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pytyrant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:44 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested watchcommits
Message-ID: <20090426211944.B746F10F966@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pytyrant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:47 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested approveacls
Message-ID: <20090426211947.6A1BA10F969@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pytyrant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:48 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested commit
Message-ID: <20090426211949.6525410F96C@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pytyrant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:50 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested watchbugzilla
Message-ID: <20090426211950.D8A5A10F8B6@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on pytyrant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:50 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested watchcommits
Message-ID: <20090426211950.EC50010F971@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on pytyrant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:51 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested commit
Message-ID: <20090426211951.298DC10F974@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on pytyrant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Sun Apr 26 21:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:19:51 +0000
Subject: [pkgdb] pytyrant: jsteffan has requested approveacls
Message-ID: <20090426211952.2602E10F8B7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the approveacls acl on pytyrant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytyrant



From verdurin at fedoraproject.org  Sun Apr 26 21:25:03 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Sun, 26 Apr 2009 21:25:03 +0000 (UTC)
Subject: rpms/gnomint/devel gnomint.spec,1.5,1.6
Message-ID: <20090426212503.F1D7070125@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874

Modified Files:
	gnomint.spec 
Log Message:
increment release properly



Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/devel/gnomint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomint.spec	21 Apr 2009 23:11:58 -0000	1.5
+++ gnomint.spec	26 Apr 2009 21:24:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gnomint
 Version:	0.9.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Sun Apr 26 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-4
+- really fix 496518
+
 * Tue Apr 21 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-3
 - fix for bug 496518 - $RPM_OPT_FLAGS not used
 



From sciurius at fedoraproject.org  Sun Apr 26 21:35:44 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 26 Apr 2009 21:35:44 +0000 (UTC)
Subject: rpms/EekBoek/devel EekBoek-1.04.03-script.patch, NONE,
	1.1 EekBoek.spec, NONE, 1.1 README.postgres, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090426213544.6CC0170125@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25111/devel

Modified Files:
	.cvsignore sources 
Added Files:
	EekBoek-1.04.03-script.patch EekBoek.spec README.postgres 
	import.log 
Log Message:
Initial import of EekBoek package.


EekBoek-1.04.03-script.patch:

--- NEW FILE EekBoek-1.04.03-script.patch ---
--- lib/EB/migrate/001000008001000009.pl~	2009-01-25 21:04:57.000000000 +0100
+++ lib/EB/migrate/001000008001000009.pl	2009-01-30 23:32:48.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-
 # -- Migratie EekBoek database van versie 1.0.8 naar 1.0.9 (EB 0.92).
 
 package main;


--- NEW FILE EekBoek.spec ---
# -*- rpm-spec -*-

################ Build Options ###################
%define dbtests 1
%{?_with_dbtests:    %{expand: %%global dbtests 1}}
%{?_without_dbtests: %{expand: %%global dbtests 0}}
################ End Build Options ################

Name: EekBoek
Summary: Bookkeeping software for small and medium-size businesses
License: GPL+ or Artistic
Group: Applications/Productivity
Version: 1.04.03
Release: 3%{?dist}
Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
Source1: README.postgres
Patch0: %{name}-%{version}-script.patch
URL: http://www.eekboek.nl
BuildRoot: %{_tmppath}/rpm-buildroot-%{name}-%{version}-%{release}

# The package name is CamelCased. However, for convenience some
# of its data is located in files and directories that are all
# lowercase. See the %%install section.
%global lcname eekboek

# It's all plain perl, nothing architecture dependent.
BuildArch: noarch

# This package would provide many (perl) modules, but these are
# note intended for general use.
AutoReqProv: 0

Requires: perl >= 5.8
Requires: perl(Archive::Zip)
Requires: perl(Term::ReadLine)
Requires: perl(Term::ReadLine::Gnu)
Requires: perl(DBI) >= 1.40
Requires: perl(DBD::SQLite) >= 1.12

BuildRequires: perl >= 5.8.8
BuildRequires: perl(Module::Build)
BuildRequires: perl(IPC::Run3)
BuildRequires: perl(Term::ReadLine)
BuildRequires: perl(Term::ReadLine::Gnu)
BuildRequires: perl(DBI) >= 1.40
BuildRequires: perl(DBD::SQLite) >= 1.12
BuildRequires: perl(Test::More)
BuildRequires: zip

# For symmetry.
%global __zip   /usr/bin/zip
%global __find  /usr/bin/find
%global __iconv /usr/bin/iconv

%description
EekBoek is a bookkeeping package for small and medium-size businesses.
Unlike other accounting software, EekBoek has both a command-line
interface (CLI) and a graphical user-interface (GUI, currently under
development and not included in this package). Furthermore, it has a
complete Perl API to create your own custom applications. EekBoek is
designed for the Dutch/European market and currently available in
Dutch only. An English translation is in the works (help appreciated).

EekBoek can make use of several database systems for its storage.
Support for the SQLite database is included.
For production use, you are invited to install the %{name}-db-postgresql
database package.

%package db-postgresql

# This package only contains the necessary module(s) for EekBoek
# to use the PostgreSQL database.
# Installing this package will pull in the main package and
# the Perl PostgreSQL modules.
# No %%doc required.

Summary: PostgreSQL database driver for %{name}
Group: Applications/Productivity
AutoReqProv: 0
Requires: %{name} = %{version}-%{release}
Requires: perl(DBD::Pg) >= 1.41

%description db-postgresql
EekBoek can make use of several database systems for its storage.
This package contains the PostgreSQL database driver for %{name}.

%prep
%setup -q

# Remove a #! from a harmless Perl file.
%patch0 -p0 -b .script

# Create docs for the subpackage.
cp -p %SOURCE1 .

# Remove some build helper sources since we BuildRequire them.
%{__rm} -fr inc/IPC inc/Module
%{__perl} -ni~ -e 'print unless m;^inc/(Module|IPC)/;;' MANIFEST

# Convert some files to utf8.
%{__mv} CHANGES CHANGES.latin1
%{__iconv} -f latin1 -t utf8 CHANGES.latin1 > CHANGES

# DO NOT convert examples/mutaties.eb and html/intro/mutaties.eb!
# These files NEED to be Latin-1 (ISO 8859.1).

%build
%{__perl} Build.PL
%{__perl} Build

# Move some files into better places.
mv blib/lib/EB/examples .
( cd examples;
  %{__mv} ../eekboek-mode.el .;
  %{__rm} -f ../blib/lib/EB/schema/sampledb.ebz;
  %{__zip} -q ../blib/lib/EB/schema/sampledb.ebz *.eb schema.dat )

%install
%{__rm} -rf %{buildroot}

# Short names for our libraries.
%global ebconf  %{_sysconfdir}/%{lcname}
%global ebshare %{_datadir}/%{name}-%{version}

%{__mkdir_p} %{buildroot}%{ebconf}
%{__mkdir_p} %{buildroot}%{ebshare}/lib
%{__mkdir_p} %{buildroot}%{_bindir}

# Install the default, system-wide config file.
%{__install} -p -m 0644 examples/%{lcname}.conf %{buildroot}%{ebconf}/%{lcname}.conf

# Create lib dirs and copy files.
%{__find} blib/lib -type d -printf "%{__mkdir} %{buildroot}%{ebshare}/lib/%%P\n" | sh -x
%{__find} blib/lib ! -type d -printf "%{__install} -p -m 0644 %p %{buildroot}%{ebshare}/lib/%%P\n" | sh -x

# Create the main script.
echo "#!%{__perl}" > %{buildroot}%{_bindir}/ebshell
%{__sed} -s "s;# use lib qw(EekBoekLibrary;use lib qw(%{ebshare}/lib;" \
  < script/ebshell >> %{buildroot}%{_bindir}/ebshell
%{__chmod} 0755 %{buildroot}%{_bindir}/ebshell

# And its manual page.
%{__mkdir_p} %{buildroot}%{_mandir}/man1
pod2man blib/script/ebshell > %{buildroot}%{_mandir}/man1/ebshell.1

# End of install section.

%check
%if %{dbtests}
%{__perl} Build test
%else
%{__perl} Build test --skipdbtests
%endif

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES README examples/ doc/html/ TODO
%dir %{_sysconfdir}/%{lcname}
%config(noreplace) %{_sysconfdir}/%{lcname}/%{lcname}.conf
%{ebshare}/
%exclude %{ebshare}/lib/EB/DB/Postgres.pm
%{_bindir}/ebshell
%{_mandir}/man1/*

%files db-postgresql
%defattr(-,root,root,-)
%doc README.postgres
%{ebshare}/lib/EB/DB/Postgres.pm

%changelog
* Wed Apr 22 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.03-3
- Remove Epoch: since it it not needed.
- Make subpackage depend on EVR.

* Mon Apr 20 2009 Johan Vromans <jvromans at squirrel.nl> - 1:1.04.03-2
- Use Epoch: to tighten dependency between basepackage and subpackage.
- Use %%global instead of %%define.
- Provide README.postgres as source, not as a patch.
- Keep timestamps when copying and installing.
- Simplify filelist building.
- Remove INSTALL from %%doc.

* Fri Apr 17 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.03-1
- Upgrade to upstream 1.04.03.
- Include SQLite with the base package.
- Enable database tests since we now require a db driver.

* Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02-1
- Adapt to Fedora guidelines

* Sun Jan 26 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02
- Remove QUICKSTART.

* Sat Jul 19 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.90
- Remove debian stuff
- Don't use unstable.

* Fri Apr 11 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.12
- Simplify by setting variables from the .in template

* Sun Apr 01 2007 Johan Vromans <jvromans at squirrel.nl> - 1.03.03
- Exclude some Wx files.

* Sun Nov 05 2006 Johan Vromans <jvromans at squirrel.nl> - 1.03.00
- Move DB drivers to separate package, and adjust req/prov.

* Mon Oct 16 2006 Johan Vromans <jvromans at squirrel.nl> - 1.01.02
- Prepare (but don't use) suffixes to separate production and unstable versions.

* Wed Aug 02 2006 Johan Vromans <jvromans at squirrel.nl> 0.92
- New URL. Add Vendor.

* Fri Jun 09 2006 Johan Vromans <jvromans at squirrel.nl> 0.60
- Remove man3.

* Thu Jun 08 2006 Johan Vromans <jvromans at squirrel.nl> 0.60
- Fix example.

* Mon Jun 05 2006 Johan Vromans <jvromans at squirrel.nl> 0.59
- Better script handling.

* Mon Apr 17 2006 Johan Vromans <jvromans at squirrel.nl> 0.56
- Initial provisions for GUI.

* Wed Apr 12 2006 Johan Vromans <jvromans at squirrel.nl> 0.56
- %%config(noreplace) for eekboek.conf.

* Tue Mar 28 2006 Johan Vromans <jvromans at squirrel.nl> 0.52
- Perl Independent Install

* Mon Mar 27 2006 Johan Vromans <jvromans at squirrel.nl> 0.52
- Add "--with dbtests" parameter for rpmbuild.
- Resultant rpm may be signed.

* Sun Mar 19 2006 Johan Vromans <jvromans at squirrel.nl> 0.50
- Switch to Build.PL instead of Makefile.PL.

* Mon Jan 30 2006 Johan Vromans <jvromans at squirrel.nl> 0.37
- Add build dep perl(Config::IniFiles).

* Fri Dec 23 2005 Wytze van der Raay <wytze at nlnet.nl> 0.23
- Fixes for x86_64 building problems.

* Wed Dec 12 2005 Johan Vromans <jvromans at squirrel.nl> 0.22
- Change some wordings.
- Add man1.

* Tue Dec 11 2005 Johan Vromans <jvromans at squirrel.nl> 0.21
- Add INSTALL QUICKSTART

* Thu Dec 08 2005 Johan Vromans <jvromans at squirrel.nl> 0.20
- Include doc/html.

* Tue Nov 22 2005 Johan Vromans <jvromans at squirrel.nl> 0.19
- More.

* Sun Nov 20 2005 Jos Vos <jos at xos.nl> 0.17-XOS.0beta1
- Initial version.


--- NEW FILE README.postgres ---
EekBoek database driver voor PostgreSQL.


--- NEW FILE import.log ---
EekBoek-1_04_03-3_fc11:HEAD:EekBoek-1.04.03-3.fc11.src.rpm:1240781588


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:26:24 -0000	1.1
+++ .cvsignore	26 Apr 2009 21:35:13 -0000	1.2
@@ -0,0 +1 @@
+EekBoek-1.04.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:26:24 -0000	1.1
+++ sources	26 Apr 2009 21:35:13 -0000	1.2
@@ -0,0 +1 @@
+f336cd89bec5a5aced9bedf5d8b25a86  EekBoek-1.04.03.tar.gz



From sciurius at fedoraproject.org  Sun Apr 26 21:39:47 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 26 Apr 2009 21:39:47 +0000 (UTC)
Subject: rpms/EekBoek/F-11 EekBoek-1.04.03-script.patch, NONE,
	1.1 EekBoek.spec, 
	NONE, 1.1 README.postgres, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090426213947.D39B070125@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25836/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	EekBoek-1.04.03-script.patch EekBoek.spec README.postgres 
	import.log 
Log Message:
Initial import of EekBoek package.


EekBoek-1.04.03-script.patch:

--- NEW FILE EekBoek-1.04.03-script.patch ---
--- lib/EB/migrate/001000008001000009.pl~	2009-01-25 21:04:57.000000000 +0100
+++ lib/EB/migrate/001000008001000009.pl	2009-01-30 23:32:48.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-
 # -- Migratie EekBoek database van versie 1.0.8 naar 1.0.9 (EB 0.92).
 
 package main;


--- NEW FILE EekBoek.spec ---
# -*- rpm-spec -*-

################ Build Options ###################
%define dbtests 1
%{?_with_dbtests:    %{expand: %%global dbtests 1}}
%{?_without_dbtests: %{expand: %%global dbtests 0}}
################ End Build Options ################

Name: EekBoek
Summary: Bookkeeping software for small and medium-size businesses
License: GPL+ or Artistic
Group: Applications/Productivity
Version: 1.04.03
Release: 3%{?dist}
Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
Source1: README.postgres
Patch0: %{name}-%{version}-script.patch
URL: http://www.eekboek.nl
BuildRoot: %{_tmppath}/rpm-buildroot-%{name}-%{version}-%{release}

# The package name is CamelCased. However, for convenience some
# of its data is located in files and directories that are all
# lowercase. See the %%install section.
%global lcname eekboek

# It's all plain perl, nothing architecture dependent.
BuildArch: noarch

# This package would provide many (perl) modules, but these are
# note intended for general use.
AutoReqProv: 0

Requires: perl >= 5.8
Requires: perl(Archive::Zip)
Requires: perl(Term::ReadLine)
Requires: perl(Term::ReadLine::Gnu)
Requires: perl(DBI) >= 1.40
Requires: perl(DBD::SQLite) >= 1.12

BuildRequires: perl >= 5.8.8
BuildRequires: perl(Module::Build)
BuildRequires: perl(IPC::Run3)
BuildRequires: perl(Term::ReadLine)
BuildRequires: perl(Term::ReadLine::Gnu)
BuildRequires: perl(DBI) >= 1.40
BuildRequires: perl(DBD::SQLite) >= 1.12
BuildRequires: perl(Test::More)
BuildRequires: zip

# For symmetry.
%global __zip   /usr/bin/zip
%global __find  /usr/bin/find
%global __iconv /usr/bin/iconv

%description
EekBoek is a bookkeeping package for small and medium-size businesses.
Unlike other accounting software, EekBoek has both a command-line
interface (CLI) and a graphical user-interface (GUI, currently under
development and not included in this package). Furthermore, it has a
complete Perl API to create your own custom applications. EekBoek is
designed for the Dutch/European market and currently available in
Dutch only. An English translation is in the works (help appreciated).

EekBoek can make use of several database systems for its storage.
Support for the SQLite database is included.
For production use, you are invited to install the %{name}-db-postgresql
database package.

%package db-postgresql

# This package only contains the necessary module(s) for EekBoek
# to use the PostgreSQL database.
# Installing this package will pull in the main package and
# the Perl PostgreSQL modules.
# No %%doc required.

Summary: PostgreSQL database driver for %{name}
Group: Applications/Productivity
AutoReqProv: 0
Requires: %{name} = %{version}-%{release}
Requires: perl(DBD::Pg) >= 1.41

%description db-postgresql
EekBoek can make use of several database systems for its storage.
This package contains the PostgreSQL database driver for %{name}.

%prep
%setup -q

# Remove a #! from a harmless Perl file.
%patch0 -p0 -b .script

# Create docs for the subpackage.
cp -p %SOURCE1 .

# Remove some build helper sources since we BuildRequire them.
%{__rm} -fr inc/IPC inc/Module
%{__perl} -ni~ -e 'print unless m;^inc/(Module|IPC)/;;' MANIFEST

# Convert some files to utf8.
%{__mv} CHANGES CHANGES.latin1
%{__iconv} -f latin1 -t utf8 CHANGES.latin1 > CHANGES

# DO NOT convert examples/mutaties.eb and html/intro/mutaties.eb!
# These files NEED to be Latin-1 (ISO 8859.1).

%build
%{__perl} Build.PL
%{__perl} Build

# Move some files into better places.
mv blib/lib/EB/examples .
( cd examples;
  %{__mv} ../eekboek-mode.el .;
  %{__rm} -f ../blib/lib/EB/schema/sampledb.ebz;
  %{__zip} -q ../blib/lib/EB/schema/sampledb.ebz *.eb schema.dat )

%install
%{__rm} -rf %{buildroot}

# Short names for our libraries.
%global ebconf  %{_sysconfdir}/%{lcname}
%global ebshare %{_datadir}/%{name}-%{version}

%{__mkdir_p} %{buildroot}%{ebconf}
%{__mkdir_p} %{buildroot}%{ebshare}/lib
%{__mkdir_p} %{buildroot}%{_bindir}

# Install the default, system-wide config file.
%{__install} -p -m 0644 examples/%{lcname}.conf %{buildroot}%{ebconf}/%{lcname}.conf

# Create lib dirs and copy files.
%{__find} blib/lib -type d -printf "%{__mkdir} %{buildroot}%{ebshare}/lib/%%P\n" | sh -x
%{__find} blib/lib ! -type d -printf "%{__install} -p -m 0644 %p %{buildroot}%{ebshare}/lib/%%P\n" | sh -x

# Create the main script.
echo "#!%{__perl}" > %{buildroot}%{_bindir}/ebshell
%{__sed} -s "s;# use lib qw(EekBoekLibrary;use lib qw(%{ebshare}/lib;" \
  < script/ebshell >> %{buildroot}%{_bindir}/ebshell
%{__chmod} 0755 %{buildroot}%{_bindir}/ebshell

# And its manual page.
%{__mkdir_p} %{buildroot}%{_mandir}/man1
pod2man blib/script/ebshell > %{buildroot}%{_mandir}/man1/ebshell.1

# End of install section.

%check
%if %{dbtests}
%{__perl} Build test
%else
%{__perl} Build test --skipdbtests
%endif

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES README examples/ doc/html/ TODO
%dir %{_sysconfdir}/%{lcname}
%config(noreplace) %{_sysconfdir}/%{lcname}/%{lcname}.conf
%{ebshare}/
%exclude %{ebshare}/lib/EB/DB/Postgres.pm
%{_bindir}/ebshell
%{_mandir}/man1/*

%files db-postgresql
%defattr(-,root,root,-)
%doc README.postgres
%{ebshare}/lib/EB/DB/Postgres.pm

%changelog
* Wed Apr 22 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.03-3
- Remove Epoch: since it it not needed.
- Make subpackage depend on EVR.

* Mon Apr 20 2009 Johan Vromans <jvromans at squirrel.nl> - 1:1.04.03-2
- Use Epoch: to tighten dependency between basepackage and subpackage.
- Use %%global instead of %%define.
- Provide README.postgres as source, not as a patch.
- Keep timestamps when copying and installing.
- Simplify filelist building.
- Remove INSTALL from %%doc.

* Fri Apr 17 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.03-1
- Upgrade to upstream 1.04.03.
- Include SQLite with the base package.
- Enable database tests since we now require a db driver.

* Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02-1
- Adapt to Fedora guidelines

* Sun Jan 26 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02
- Remove QUICKSTART.

* Sat Jul 19 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.90
- Remove debian stuff
- Don't use unstable.

* Fri Apr 11 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.12
- Simplify by setting variables from the .in template

* Sun Apr 01 2007 Johan Vromans <jvromans at squirrel.nl> - 1.03.03
- Exclude some Wx files.

* Sun Nov 05 2006 Johan Vromans <jvromans at squirrel.nl> - 1.03.00
- Move DB drivers to separate package, and adjust req/prov.

* Mon Oct 16 2006 Johan Vromans <jvromans at squirrel.nl> - 1.01.02
- Prepare (but don't use) suffixes to separate production and unstable versions.

* Wed Aug 02 2006 Johan Vromans <jvromans at squirrel.nl> 0.92
- New URL. Add Vendor.

* Fri Jun 09 2006 Johan Vromans <jvromans at squirrel.nl> 0.60
- Remove man3.

* Thu Jun 08 2006 Johan Vromans <jvromans at squirrel.nl> 0.60
- Fix example.

* Mon Jun 05 2006 Johan Vromans <jvromans at squirrel.nl> 0.59
- Better script handling.

* Mon Apr 17 2006 Johan Vromans <jvromans at squirrel.nl> 0.56
- Initial provisions for GUI.

* Wed Apr 12 2006 Johan Vromans <jvromans at squirrel.nl> 0.56
- %%config(noreplace) for eekboek.conf.

* Tue Mar 28 2006 Johan Vromans <jvromans at squirrel.nl> 0.52
- Perl Independent Install

* Mon Mar 27 2006 Johan Vromans <jvromans at squirrel.nl> 0.52
- Add "--with dbtests" parameter for rpmbuild.
- Resultant rpm may be signed.

* Sun Mar 19 2006 Johan Vromans <jvromans at squirrel.nl> 0.50
- Switch to Build.PL instead of Makefile.PL.

* Mon Jan 30 2006 Johan Vromans <jvromans at squirrel.nl> 0.37
- Add build dep perl(Config::IniFiles).

* Fri Dec 23 2005 Wytze van der Raay <wytze at nlnet.nl> 0.23
- Fixes for x86_64 building problems.

* Wed Dec 12 2005 Johan Vromans <jvromans at squirrel.nl> 0.22
- Change some wordings.
- Add man1.

* Tue Dec 11 2005 Johan Vromans <jvromans at squirrel.nl> 0.21
- Add INSTALL QUICKSTART

* Thu Dec 08 2005 Johan Vromans <jvromans at squirrel.nl> 0.20
- Include doc/html.

* Tue Nov 22 2005 Johan Vromans <jvromans at squirrel.nl> 0.19
- More.

* Sun Nov 20 2005 Jos Vos <jos at xos.nl> 0.17-XOS.0beta1
- Initial version.


--- NEW FILE README.postgres ---
EekBoek database driver voor PostgreSQL.


--- NEW FILE import.log ---
EekBoek-1_04_03-3_fc11:F-11:EekBoek-1.04.03-3.fc11.src.rpm:1240781827


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:26:24 -0000	1.1
+++ .cvsignore	26 Apr 2009 21:39:46 -0000	1.2
@@ -0,0 +1 @@
+EekBoek-1.04.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:26:24 -0000	1.1
+++ sources	26 Apr 2009 21:39:46 -0000	1.2
@@ -0,0 +1 @@
+f336cd89bec5a5aced9bedf5d8b25a86  EekBoek-1.04.03.tar.gz



From sciurius at fedoraproject.org  Sun Apr 26 21:42:10 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 26 Apr 2009 21:42:10 +0000 (UTC)
Subject: rpms/EekBoek/F-10 EekBoek-1.04.03-script.patch, NONE,
	1.1 EekBoek.spec, 
	NONE, 1.1 README.postgres, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090426214210.8FB0970125@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26507/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	EekBoek-1.04.03-script.patch EekBoek.spec README.postgres 
	import.log 
Log Message:
Initial import of EekBoek package.


EekBoek-1.04.03-script.patch:

--- NEW FILE EekBoek-1.04.03-script.patch ---
--- lib/EB/migrate/001000008001000009.pl~	2009-01-25 21:04:57.000000000 +0100
+++ lib/EB/migrate/001000008001000009.pl	2009-01-30 23:32:48.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-
 # -- Migratie EekBoek database van versie 1.0.8 naar 1.0.9 (EB 0.92).
 
 package main;


--- NEW FILE EekBoek.spec ---
# -*- rpm-spec -*-

################ Build Options ###################
%define dbtests 1
%{?_with_dbtests:    %{expand: %%global dbtests 1}}
%{?_without_dbtests: %{expand: %%global dbtests 0}}
################ End Build Options ################

Name: EekBoek
Summary: Bookkeeping software for small and medium-size businesses
License: GPL+ or Artistic
Group: Applications/Productivity
Version: 1.04.03
Release: 3%{?dist}
Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
Source1: README.postgres
Patch0: %{name}-%{version}-script.patch
URL: http://www.eekboek.nl
BuildRoot: %{_tmppath}/rpm-buildroot-%{name}-%{version}-%{release}

# The package name is CamelCased. However, for convenience some
# of its data is located in files and directories that are all
# lowercase. See the %%install section.
%global lcname eekboek

# It's all plain perl, nothing architecture dependent.
BuildArch: noarch

# This package would provide many (perl) modules, but these are
# note intended for general use.
AutoReqProv: 0

Requires: perl >= 5.8
Requires: perl(Archive::Zip)
Requires: perl(Term::ReadLine)
Requires: perl(Term::ReadLine::Gnu)
Requires: perl(DBI) >= 1.40
Requires: perl(DBD::SQLite) >= 1.12

BuildRequires: perl >= 5.8.8
BuildRequires: perl(Module::Build)
BuildRequires: perl(IPC::Run3)
BuildRequires: perl(Term::ReadLine)
BuildRequires: perl(Term::ReadLine::Gnu)
BuildRequires: perl(DBI) >= 1.40
BuildRequires: perl(DBD::SQLite) >= 1.12
BuildRequires: perl(Test::More)
BuildRequires: zip

# For symmetry.
%global __zip   /usr/bin/zip
%global __find  /usr/bin/find
%global __iconv /usr/bin/iconv

%description
EekBoek is a bookkeeping package for small and medium-size businesses.
Unlike other accounting software, EekBoek has both a command-line
interface (CLI) and a graphical user-interface (GUI, currently under
development and not included in this package). Furthermore, it has a
complete Perl API to create your own custom applications. EekBoek is
designed for the Dutch/European market and currently available in
Dutch only. An English translation is in the works (help appreciated).

EekBoek can make use of several database systems for its storage.
Support for the SQLite database is included.
For production use, you are invited to install the %{name}-db-postgresql
database package.

%package db-postgresql

# This package only contains the necessary module(s) for EekBoek
# to use the PostgreSQL database.
# Installing this package will pull in the main package and
# the Perl PostgreSQL modules.
# No %%doc required.

Summary: PostgreSQL database driver for %{name}
Group: Applications/Productivity
AutoReqProv: 0
Requires: %{name} = %{version}-%{release}
Requires: perl(DBD::Pg) >= 1.41

%description db-postgresql
EekBoek can make use of several database systems for its storage.
This package contains the PostgreSQL database driver for %{name}.

%prep
%setup -q

# Remove a #! from a harmless Perl file.
%patch0 -p0 -b .script

# Create docs for the subpackage.
cp -p %SOURCE1 .

# Remove some build helper sources since we BuildRequire them.
%{__rm} -fr inc/IPC inc/Module
%{__perl} -ni~ -e 'print unless m;^inc/(Module|IPC)/;;' MANIFEST

# Convert some files to utf8.
%{__mv} CHANGES CHANGES.latin1
%{__iconv} -f latin1 -t utf8 CHANGES.latin1 > CHANGES

# DO NOT convert examples/mutaties.eb and html/intro/mutaties.eb!
# These files NEED to be Latin-1 (ISO 8859.1).

%build
%{__perl} Build.PL
%{__perl} Build

# Move some files into better places.
mv blib/lib/EB/examples .
( cd examples;
  %{__mv} ../eekboek-mode.el .;
  %{__rm} -f ../blib/lib/EB/schema/sampledb.ebz;
  %{__zip} -q ../blib/lib/EB/schema/sampledb.ebz *.eb schema.dat )

%install
%{__rm} -rf %{buildroot}

# Short names for our libraries.
%global ebconf  %{_sysconfdir}/%{lcname}
%global ebshare %{_datadir}/%{name}-%{version}

%{__mkdir_p} %{buildroot}%{ebconf}
%{__mkdir_p} %{buildroot}%{ebshare}/lib
%{__mkdir_p} %{buildroot}%{_bindir}

# Install the default, system-wide config file.
%{__install} -p -m 0644 examples/%{lcname}.conf %{buildroot}%{ebconf}/%{lcname}.conf

# Create lib dirs and copy files.
%{__find} blib/lib -type d -printf "%{__mkdir} %{buildroot}%{ebshare}/lib/%%P\n" | sh -x
%{__find} blib/lib ! -type d -printf "%{__install} -p -m 0644 %p %{buildroot}%{ebshare}/lib/%%P\n" | sh -x

# Create the main script.
echo "#!%{__perl}" > %{buildroot}%{_bindir}/ebshell
%{__sed} -s "s;# use lib qw(EekBoekLibrary;use lib qw(%{ebshare}/lib;" \
  < script/ebshell >> %{buildroot}%{_bindir}/ebshell
%{__chmod} 0755 %{buildroot}%{_bindir}/ebshell

# And its manual page.
%{__mkdir_p} %{buildroot}%{_mandir}/man1
pod2man blib/script/ebshell > %{buildroot}%{_mandir}/man1/ebshell.1

# End of install section.

%check
%if %{dbtests}
%{__perl} Build test
%else
%{__perl} Build test --skipdbtests
%endif

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES README examples/ doc/html/ TODO
%dir %{_sysconfdir}/%{lcname}
%config(noreplace) %{_sysconfdir}/%{lcname}/%{lcname}.conf
%{ebshare}/
%exclude %{ebshare}/lib/EB/DB/Postgres.pm
%{_bindir}/ebshell
%{_mandir}/man1/*

%files db-postgresql
%defattr(-,root,root,-)
%doc README.postgres
%{ebshare}/lib/EB/DB/Postgres.pm

%changelog
* Wed Apr 22 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.03-3
- Remove Epoch: since it it not needed.
- Make subpackage depend on EVR.

* Mon Apr 20 2009 Johan Vromans <jvromans at squirrel.nl> - 1:1.04.03-2
- Use Epoch: to tighten dependency between basepackage and subpackage.
- Use %%global instead of %%define.
- Provide README.postgres as source, not as a patch.
- Keep timestamps when copying and installing.
- Simplify filelist building.
- Remove INSTALL from %%doc.

* Fri Apr 17 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.03-1
- Upgrade to upstream 1.04.03.
- Include SQLite with the base package.
- Enable database tests since we now require a db driver.

* Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02-1
- Adapt to Fedora guidelines

* Sun Jan 26 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02
- Remove QUICKSTART.

* Sat Jul 19 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.90
- Remove debian stuff
- Don't use unstable.

* Fri Apr 11 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.12
- Simplify by setting variables from the .in template

* Sun Apr 01 2007 Johan Vromans <jvromans at squirrel.nl> - 1.03.03
- Exclude some Wx files.

* Sun Nov 05 2006 Johan Vromans <jvromans at squirrel.nl> - 1.03.00
- Move DB drivers to separate package, and adjust req/prov.

* Mon Oct 16 2006 Johan Vromans <jvromans at squirrel.nl> - 1.01.02
- Prepare (but don't use) suffixes to separate production and unstable versions.

* Wed Aug 02 2006 Johan Vromans <jvromans at squirrel.nl> 0.92
- New URL. Add Vendor.

* Fri Jun 09 2006 Johan Vromans <jvromans at squirrel.nl> 0.60
- Remove man3.

* Thu Jun 08 2006 Johan Vromans <jvromans at squirrel.nl> 0.60
- Fix example.

* Mon Jun 05 2006 Johan Vromans <jvromans at squirrel.nl> 0.59
- Better script handling.

* Mon Apr 17 2006 Johan Vromans <jvromans at squirrel.nl> 0.56
- Initial provisions for GUI.

* Wed Apr 12 2006 Johan Vromans <jvromans at squirrel.nl> 0.56
- %%config(noreplace) for eekboek.conf.

* Tue Mar 28 2006 Johan Vromans <jvromans at squirrel.nl> 0.52
- Perl Independent Install

* Mon Mar 27 2006 Johan Vromans <jvromans at squirrel.nl> 0.52
- Add "--with dbtests" parameter for rpmbuild.
- Resultant rpm may be signed.

* Sun Mar 19 2006 Johan Vromans <jvromans at squirrel.nl> 0.50
- Switch to Build.PL instead of Makefile.PL.

* Mon Jan 30 2006 Johan Vromans <jvromans at squirrel.nl> 0.37
- Add build dep perl(Config::IniFiles).

* Fri Dec 23 2005 Wytze van der Raay <wytze at nlnet.nl> 0.23
- Fixes for x86_64 building problems.

* Wed Dec 12 2005 Johan Vromans <jvromans at squirrel.nl> 0.22
- Change some wordings.
- Add man1.

* Tue Dec 11 2005 Johan Vromans <jvromans at squirrel.nl> 0.21
- Add INSTALL QUICKSTART

* Thu Dec 08 2005 Johan Vromans <jvromans at squirrel.nl> 0.20
- Include doc/html.

* Tue Nov 22 2005 Johan Vromans <jvromans at squirrel.nl> 0.19
- More.

* Sun Nov 20 2005 Jos Vos <jos at xos.nl> 0.17-XOS.0beta1
- Initial version.


--- NEW FILE README.postgres ---
EekBoek database driver voor PostgreSQL.


--- NEW FILE import.log ---
EekBoek-1_04_03-3_fc11:F-10:EekBoek-1.04.03-3.fc11.src.rpm:1240782023


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:26:24 -0000	1.1
+++ .cvsignore	26 Apr 2009 21:41:39 -0000	1.2
@@ -0,0 +1 @@
+EekBoek-1.04.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:26:24 -0000	1.1
+++ sources	26 Apr 2009 21:41:40 -0000	1.2
@@ -0,0 +1 @@
+f336cd89bec5a5aced9bedf5d8b25a86  EekBoek-1.04.03.tar.gz



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:33 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215133.3BBF310F881@bastion2.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on pyjigdo (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:33 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215133.C9F4A10F895@bastion2.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on pyjigdo (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:38 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215138.B99A010F898@bastion2.fedora.phx.redhat.com>

kanarip has set the commit acl on pyjigdo (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:38 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215138.CD2C110F89B@bastion2.fedora.phx.redhat.com>

kanarip has set the approveacls acl on pyjigdo (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:44 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215144.7160710F89E@bastion2.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on pyjigdo (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:51 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215151.32B5010F8A2@bastion2.fedora.phx.redhat.com>

kanarip has set the commit acl on pyjigdo (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:46 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215146.28B9710F89F@bastion2.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on pyjigdo (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:51 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215152.80E6310F8A8@bastion2.fedora.phx.redhat.com>

kanarip has set the approveacls acl on pyjigdo (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:52 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215152.2BEB110F8A7@bastion2.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on pyjigdo (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:53 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215153.AEF8B10F8AB@bastion2.fedora.phx.redhat.com>

kanarip has set the commit acl on pyjigdo (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:51:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:51:54 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215154.DF18210F8AE@bastion2.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on pyjigdo (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:52:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:52:00 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215200.6085E10F894@bastion2.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on pyjigdo (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:52:02 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215202.5B45310F8AF@bastion2.fedora.phx.redhat.com>

kanarip has set the approveacls acl on pyjigdo (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:52:02 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215203.942EA10F8B2@bastion2.fedora.phx.redhat.com>

kanarip has set the approveacls acl on pyjigdo (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:52:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:52:03 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215204.B782410F8B5@bastion2.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on pyjigdo (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From pkgdb at fedoraproject.org  Sun Apr 26 21:52:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 26 Apr 2009 21:52:07 +0000
Subject: [pkgdb] pyjigdo had acl change status
Message-ID: <20090426215207.D9E8B10F899@bastion2.fedora.phx.redhat.com>

kanarip has set the commit acl on pyjigdo (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyjigdo



From phuang at fedoraproject.org  Mon Apr 27 00:22:18 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 00:22:18 +0000 (UTC)
Subject: rpms/ibus/F-10 ibus-HEAD.patch, NONE, 1.1 .cvsignore, 1.21,
	1.22 ibus.spec, 1.35, 1.36 sources, 1.24, 1.25
Message-ID: <20090427002218.C6B8D70110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855

Modified Files:
	.cvsignore ibus.spec sources 
Added Files:
	ibus-HEAD.patch 
Log Message:
Port F-11 branch to F-10

ibus-HEAD.patch:

--- NEW FILE ibus-HEAD.patch ---
diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in
index fcf2f21..cd2ad60 100644
--- a/bus/ibus.desktop.in
+++ b/bus/ibus.desktop.in
@@ -7,7 +7,7 @@ Exec=ibus-daemon --xim
 Icon=ibus
 Terminal=false
 Type=Application
-X-GNOME-Autostart-Phase=Panel
+X-GNOME-Autostart-Phase=Applications
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
 X-KDE-autostart-after=panel
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 456e049..7003bd7 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2091,10 +2091,10 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
         return TRUE;
     }
     else if (event == next_factory) {
-        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
-        if (priv->engine && !priv->enabled) {
-            bus_input_context_enable (context);
+        if (priv->engine == NULL || priv->enabled == FALSE) {
+            return FALSE;
         }
+        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
         return TRUE;
     }
     else if (event == prev_factory) {
diff --git a/bus/server.c b/bus/server.c
index 7245bd3..1c796f2 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -86,21 +86,23 @@ bus_server_listen (BusServer *server)
 
     // const gchar *address = "unix:abstract=/tmp/ibus-c"
     const gchar *address;
-    gchar *path;
+    const gchar *path;
     gboolean retval;
 
-    path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
-    mkdir (path, 0775);
+    path = ibus_get_socket_folder ();
+    mkdir (path, 0700);
+    chmod (path, 0700);
+
     address = ibus_get_address ();
 
     retval = ibus_server_listen (IBUS_SERVER (server), address);
+    chmod (ibus_get_socket_path (), 0600);
 
     if (!retval) {
         g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
         exit (-1);
     }
 
-    g_free(path);
     return retval;
 }
 
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 5da4dec..168e45a 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -190,14 +190,20 @@ _key_snooper_cb (GtkWidget   *widget,
     IBusIMContext *ibusimcontext;
     ibusimcontext = (IBusIMContext *) _focus_im_context;
 
-    if (!_use_key_snooper)
+    if (G_UNLIKELY (!_use_key_snooper))
         return retval;
 
     if (ibusimcontext == NULL)
-        return retval;
+        return FALSE;
 
-    if (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE)
-        return retval;
+    if (G_UNLIKELY (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE))
+        return FALSE;
+
+    if (G_UNLIKELY (event->state & IBUS_HANDLED_MASK))
+        return TRUE;
+
+    if (G_UNLIKELY (event->state & IBUS_IGNORED_MASK))
+        return FALSE;
 
     switch (event->type) {
     case GDK_KEY_RELEASE:
@@ -212,6 +218,14 @@ _key_snooper_cb (GtkWidget   *widget,
         break;
     default:
         retval = FALSE;
+        break;
+    }
+
+    if (retval) {
+        event->state |= IBUS_HANDLED_MASK;
+    }
+    else {
+        event->state |= IBUS_IGNORED_MASK;
     }
 
     return retval;
@@ -383,11 +397,18 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
 
     IBusIMContext *ibusimcontext = (IBusIMContext *) context;
 
-    if (ibusimcontext->ibuscontext && ibusimcontext->has_focus) {
+    if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
         /* If context does not have focus, ibus will process key event in sync mode.
          * It is a workaround for increase search in treeview.
          */
-        gboolean retval;
+        gboolean retval = FALSE;
+
+        if (event->state & IBUS_HANDLED_MASK)
+            return TRUE;
+
+        if (event->state & IBUS_IGNORED_MASK)
+            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+
         switch (event->type) {
         case GDK_KEY_RELEASE:
             retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
@@ -404,9 +425,13 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
         }
 
         if (retval) {
+            event->state |= IBUS_HANDLED_MASK;
             return TRUE;
         }
-        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+        else {
+            event->state |= IBUS_IGNORED_MASK;
+            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+        }
     }
     else {
         return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index be4b980..a976eec 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -18,7 +18,7 @@
       <owner>ibus</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul]</default>
+      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul,Alt+Release+Alt_R]</default>
       <locale name="C">
         <short>Trigger Hotkey</short>
 	    <long>Trigger hotkey for enable or disable input context</long>
diff --git a/ibus/common.py b/ibus/common.py
index 527d3a5..571ebaa 100644
--- a/ibus/common.py
+++ b/ibus/common.py
@@ -67,7 +67,12 @@ if not __username:
 if not __username:
     __username = os.getenv ("USERNAME")
 
-IBUS_ADDR = "unix:path=/tmp/ibus-%s/ibus-%s-%s" % (__username, __hostname, __display_number)
+__session_id = os.getenv ("IBUS_SESSION_ID")
+
+IBUS_ADDR = "unix:path=/tmp/ibus-%s%s/ibus-%s-%s" % (__username,
+                                                     "-" + __session_id if __session_id else "",
+                                                     __hostname,
+                                                     __display_number)
 # IBUS_ADDR  = "tcp:host=localhost,port=7799"
 
 IBUS_IFACE_IBUS     = "org.freedesktop.IBus"
diff --git a/ibus/modifier.py b/ibus/modifier.py
index 7f6afad..56d8be9 100644
--- a/ibus/modifier.py
+++ b/ibus/modifier.py
@@ -33,11 +33,15 @@ BUTTON2_MASK = 1 << 9
 BUTTON3_MASK = 1 << 10
 BUTTON4_MASK = 1 << 11
 BUTTON5_MASK = 1 << 12
-  
+
+HANDLED_MASK = 1 << 24
+IGNORED_MASK = 1 << 25
+FORWARD_MASK = 1 << 25
+
 SUPER_MASK = 1 << 26
 HYPER_MASK = 1 << 27
 META_MASK = 1 << 28
-  
+
 RELEASE_MASK = 1 << 30
 
 MODIFIER_MASK = 0x5c001fff
diff --git a/po/as.po b/po/as.po
index 8e33ca2..9b81669 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ibus.as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-02 02:13+0000\n"
-"PO-Revision-Date: 2009-04-08 15:55+0530\n"
+"POT-Creation-Date: 2009-04-06 11:45+0800\n"
+"PO-Revision-Date: 2009-04-09 19:03+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
 "Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,163 +16,19 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/keyname-table.h:3940
-msgid "keyboard label|BackSpace"
-msgstr "keyboard label|BackSpace"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../src/keyname-table.h:3941
-msgid "keyboard label|Tab"
-msgstr "keyboard label|Tab"
-
-#: ../src/keyname-table.h:3942
-msgid "keyboard label|Return"
-msgstr "keyboard label|Return"
-
-#: ../src/keyname-table.h:3943
-msgid "keyboard label|Pause"
-msgstr "keyboard label|Pause"
-
-#: ../src/keyname-table.h:3944
-msgid "keyboard label|Scroll_Lock"
-msgstr "keyboard label|Scroll_Lock"
-
-#: ../src/keyname-table.h:3945
-msgid "keyboard label|Sys_Req"
-msgstr "keyboard label|Sys_Req"
-
-#: ../src/keyname-table.h:3946
-msgid "keyboard label|Escape"
-msgstr "keyboard label|Escape"
-
-#: ../src/keyname-table.h:3947
-msgid "keyboard label|Multi_key"
-msgstr "keyboard label|Multi_key"
-
-#: ../src/keyname-table.h:3948
-msgid "keyboard label|Home"
-msgstr "keyboard label|Home"
-
-#: ../src/keyname-table.h:3949
-msgid "keyboard label|Left"
-msgstr "keyboard label|Left"
-
-#: ../src/keyname-table.h:3950
-msgid "keyboard label|Up"
-msgstr "keyboard label|Up"
-
-#: ../src/keyname-table.h:3951
-msgid "keyboard label|Right"
-msgstr "keyboard label|Right"
-
-#: ../src/keyname-table.h:3952
-msgid "keyboard label|Down"
-msgstr "keyboard label|Down"
-
-#: ../src/keyname-table.h:3953
-msgid "keyboard label|Page_Up"
-msgstr "keyboard label|Page_Up"
-
-#: ../src/keyname-table.h:3954
-msgid "keyboard label|Page_Down"
-msgstr "keyboard label|Page_Down"
-
-#: ../src/keyname-table.h:3955
-msgid "keyboard label|End"
-msgstr "keyboard label|End"
-
-#: ../src/keyname-table.h:3956
-msgid "keyboard label|Begin"
-msgstr "keyboard label|Begin"
-
-#: ../src/keyname-table.h:3957
-msgid "keyboard label|Print"
-msgstr "keyboard label|Print"
-
-#: ../src/keyname-table.h:3958
-msgid "keyboard label|Insert"
-msgstr "keyboard label|Insert"
-
-#: ../src/keyname-table.h:3959
-msgid "keyboard label|Num_Lock"
-msgstr "keyboard label|Num_Lock"
-
-#: ../src/keyname-table.h:3960
-msgid "keyboard label|KP_Space"
-msgstr "keyboard label|KP_Space"
-
-#: ../src/keyname-table.h:3961
-msgid "keyboard label|KP_Tab"
-msgstr "keyboard label|KP_Tab"
-
-#: ../src/keyname-table.h:3962
-msgid "keyboard label|KP_Enter"
-msgstr "keyboard label|KP_Enter"
-
-#: ../src/keyname-table.h:3963
-msgid "keyboard label|KP_Home"
-msgstr "keyboard label|KP_Home"
-
-#: ../src/keyname-table.h:3964
-msgid "keyboard label|KP_Left"
-msgstr "keyboard label|KP_Left"
-
-#: ../src/keyname-table.h:3965
-msgid "keyboard label|KP_Up"
-msgstr "keyboard label|KP_Up"
-
-#: ../src/keyname-table.h:3966
-msgid "keyboard label|KP_Right"
-msgstr "keyboard label|KP_Right"
-
-#: ../src/keyname-table.h:3967
-msgid "keyboard label|KP_Down"
-msgstr "keyboard label|KP_Down"
-
-#: ../src/keyname-table.h:3968
-msgid "keyboard label|KP_Page_Up"
-msgstr "keyboard label|KP_Page_Up"
-
-#: ../src/keyname-table.h:3969
-msgid "keyboard label|KP_Prior"
-msgstr "keyboard label|KP_Prior"
-
-#: ../src/keyname-table.h:3970
-msgid "keyboard label|KP_Page_Down"
-msgstr "keyboard label|KP_Page_Down"
-
-#: ../src/keyname-table.h:3971
-msgid "keyboard label|KP_Next"
-msgstr "keyboard label|KP_Next"
-
-#: ../src/keyname-table.h:3972
-msgid "keyboard label|KP_End"
-msgstr "keyboard label|KP_End"
-
-#: ../src/keyname-table.h:3973
-msgid "keyboard label|KP_Begin"
-msgstr "keyboard label|KP_Begin"
-
-#: ../src/keyname-table.h:3974
-msgid "keyboard label|KP_Insert"
-msgstr "keyboard label|KP_Insert"
-
-#: ../src/keyname-table.h:3975
-msgid "keyboard label|KP_Delete"
-msgstr "keyboard label|KP_Delete"
-
-#: ../src/keyname-table.h:3976
-msgid "keyboard label|Delete"
-msgstr "keyboard label|Delete"
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:97
+msgid "IBus input method framework"
+msgstr "IBus input method framework"
 
 #: ../ibus/lang.py:40 ../ui/gtk/panel.py:307 ../ui/gtk/panel.py:308
 #: ../ui/gtk/panel.py:309 ../ui/gtk/panel.py:310
 msgid "Other"
 msgstr "????????????"
 
-#: ../ui/gtk/panel.py:97
-msgid "IBus input method framework"
-msgstr "IBus input method framework"
-
 #: ../ui/gtk/panel.py:282
 msgid "Restart"
 msgstr "???????????????????????????"
@@ -191,25 +47,24 @@ msgstr "???????????????????????? ???????????? (aphukan at fedoraproject.org)"
 
 #. create input methods menu
 #: ../ui/gtk/languagebar.py:84
-msgid "Switch engine"
-msgstr "???????????? ???????????? ?????????"
+msgid "Switch input method"
+msgstr "??????????????? ?????????????????? ???????????? ?????????"
 
 #: ../setup/main.py:103
 msgid "trigger"
 msgstr "?????????????????????"
 
 #: ../setup/main.py:113
-msgid "next engine"
-msgstr "???????????? ????????????"
+msgid "next input method"
+msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../setup/main.py:123
-msgid "prev engine"
-msgstr "????????? ????????????"
+msgid "previous input method"
+msgstr "????????? ??????????????? ??????????????????"
 
 #: ../setup/main.py:204
 msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr ""
-"IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
+msgstr "IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
 
 #: ../setup/main.py:219
 msgid ""
@@ -219,8 +74,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????"
-"$HOME/.bashrc ??? ????????? ????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
+"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????$HOME/.bashrc ??? ????????? "
+"????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -318,7 +173,7 @@ msgstr ""
 "????????????????????????\n"
 "???????????????"
 
-#: ../setup/setup.glade.h:19
+#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus ???????????????"
 
@@ -341,21 +196,21 @@ msgid "Next input method:"
 msgstr "???????????? ??????????????? ??????????????????:"
 
 #: ../setup/setup.glade.h:25
+msgid "Previous input method:"
+msgstr "????????? ??????????????? ??????????????????"
+
+#: ../setup/setup.glade.h:26
 msgid "Show language panel:"
 msgstr "??????????????? ??????????????? ????????????????????????:"
 
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:27
 msgid "Start ibus on login"
 msgstr "????????????????????? ibus ??????????????? ?????????"
 
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:28
 msgid "Use custom font"
 msgstr "???????????????????????????????????? ???????????? ????????????????????? ????????? ???'???"
 
-#: ../setup/setup.glade.h:28
-msgid "previous input method:"
-msgstr "????????? ??????????????? ??????????????????:"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Auto Hide"
 msgstr "?????????????????????????????????????????? ??????????????????"
@@ -405,8 +260,7 @@ msgid ""
 "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? "
-"????????????????????????"
+"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? ????????????????????????"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Trigger Hotkey"
@@ -428,4 +282,122 @@ msgstr "??????????????? ?????????????????? ???????????? ????????????????????????
 msgid "[Control+space]"
 msgstr "[Control+space]"
 
+#~ msgid "keyboard label|BackSpace"
+#~ msgstr "keyboard label|BackSpace"
+
+#~ msgid "keyboard label|Tab"
+#~ msgstr "keyboard label|Tab"
+
+#~ msgid "keyboard label|Return"
+#~ msgstr "keyboard label|Return"
+
+#~ msgid "keyboard label|Pause"
+#~ msgstr "keyboard label|Pause"
+
+#~ msgid "keyboard label|Scroll_Lock"
+#~ msgstr "keyboard label|Scroll_Lock"
+
+#~ msgid "keyboard label|Sys_Req"
+#~ msgstr "keyboard label|Sys_Req"
+
+#~ msgid "keyboard label|Escape"
+#~ msgstr "keyboard label|Escape"
+
+#~ msgid "keyboard label|Multi_key"
+#~ msgstr "keyboard label|Multi_key"
+
+#~ msgid "keyboard label|Home"
+#~ msgstr "keyboard label|Home"
+
+#~ msgid "keyboard label|Left"
+#~ msgstr "keyboard label|Left"
+
+#~ msgid "keyboard label|Up"
+#~ msgstr "keyboard label|Up"
+
+#~ msgid "keyboard label|Right"
+#~ msgstr "keyboard label|Right"
+
+#~ msgid "keyboard label|Down"
+#~ msgstr "keyboard label|Down"
+
+#~ msgid "keyboard label|Page_Up"
+#~ msgstr "keyboard label|Page_Up"
+
+#~ msgid "keyboard label|Page_Down"
+#~ msgstr "keyboard label|Page_Down"
+
+#~ msgid "keyboard label|End"
+#~ msgstr "keyboard label|End"
+
+#~ msgid "keyboard label|Begin"
+#~ msgstr "keyboard label|Begin"
+
+#~ msgid "keyboard label|Print"
+#~ msgstr "keyboard label|Print"
+
+#~ msgid "keyboard label|Insert"
+#~ msgstr "keyboard label|Insert"
+
+#~ msgid "keyboard label|Num_Lock"
+#~ msgstr "keyboard label|Num_Lock"
+
+#~ msgid "keyboard label|KP_Space"
+#~ msgstr "keyboard label|KP_Space"
+
+#~ msgid "keyboard label|KP_Tab"
+#~ msgstr "keyboard label|KP_Tab"
+
+#~ msgid "keyboard label|KP_Enter"
+#~ msgstr "keyboard label|KP_Enter"
+
+#~ msgid "keyboard label|KP_Home"
+#~ msgstr "keyboard label|KP_Home"
+
+#~ msgid "keyboard label|KP_Left"
+#~ msgstr "keyboard label|KP_Left"
+
+#~ msgid "keyboard label|KP_Up"
+#~ msgstr "keyboard label|KP_Up"
+
+#~ msgid "keyboard label|KP_Right"
+#~ msgstr "keyboard label|KP_Right"
+
+#~ msgid "keyboard label|KP_Down"
+#~ msgstr "keyboard label|KP_Down"
+
+#~ msgid "keyboard label|KP_Page_Up"
+#~ msgstr "keyboard label|KP_Page_Up"
+
+#~ msgid "keyboard label|KP_Prior"
+#~ msgstr "keyboard label|KP_Prior"
+
+#~ msgid "keyboard label|KP_Page_Down"
+#~ msgstr "keyboard label|KP_Page_Down"
+
+#~ msgid "keyboard label|KP_Next"
+#~ msgstr "keyboard label|KP_Next"
+
+#~ msgid "keyboard label|KP_End"
+#~ msgstr "keyboard label|KP_End"
+
+#~ msgid "keyboard label|KP_Begin"
+#~ msgstr "keyboard label|KP_Begin"
+
+#~ msgid "keyboard label|KP_Insert"
+#~ msgstr "keyboard label|KP_Insert"
+
+#~ msgid "keyboard label|KP_Delete"
+#~ msgstr "keyboard label|KP_Delete"
+
+#~ msgid "keyboard label|Delete"
+#~ msgstr "keyboard label|Delete"
+
+#~ msgid "Switch engine"
+#~ msgstr "???????????? ???????????? ?????????"
+
+#~ msgid "next engine"
+#~ msgstr "???????????? ????????????"
 
+#~ msgid "prev engine"
+#~ msgstr "????????? ????????????"
diff --git a/po/te.po b/po/te.po
index 3b8c0da..9c65afd 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,21 +1,21 @@
-# translation of ibus.master.ibus.po to Telugu
+# translation of ibus.master.te.po to Telugu
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Krishna Babu K <kkrothap at redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.ibus\n"
+"Project-Id-Version: ibus.master.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-07 15:38+0800\n"
-"PO-Revision-Date: 2009-04-07 00:39+0530\n"
+"POT-Creation-Date: 2009-04-06 11:45+0800\n"
+"PO-Revision-Date: 2009-04-14 15:04+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 
 #: ../bus/ibus.desktop.in.h:1
@@ -49,23 +49,20 @@ msgstr "??????????????????????????? ?????? <kkrothap at redhat.com> 2009."
 
 #. create input methods menu
 #: ../ui/gtk/languagebar.py:84
-#, fuzzy
 msgid "Switch input method"
-msgstr "????????????????????? ????????????????????? ??????????????????????????????"
+msgstr "????????????????????? ?????????????????? ????????????????????????"
 
 #: ../setup/main.py:103
 msgid "trigger"
 msgstr "????????? (???????????????????????????)"
 
 #: ../setup/main.py:113
-#, fuzzy
 msgid "next input method"
-msgstr "????????????????????? ????????????????????? ??????????????????:"
+msgstr "????????????????????? ????????????????????? ??????????????????"
 
 #: ../setup/main.py:123
-#, fuzzy
 msgid "previous input method"
-msgstr "????????????????????? ????????????????????? ??????????????????:"
+msgstr "????????????????????? ????????????????????? ??????????????????"
 
 #: ../setup/main.py:204
 msgid "IBus daemon is not started. Do you want to start it now?"
@@ -201,7 +198,6 @@ msgid "Next input method:"
 msgstr "????????????????????? ????????????????????? ??????????????????:"
 
 #: ../setup/setup.glade.h:25
-#, fuzzy
 msgid "Previous input method:"
 msgstr "????????????????????? ????????????????????? ??????????????????:"
 
@@ -285,14 +281,7 @@ msgstr "??????????????????????????? ??????????????? ???????????????????????????
 msgid "Use custom font name for language panel"
 msgstr "???????????? ????????????????????? ??????????????? ??????????????????????????? ??????????????? ??????????????? ????????????????????????????????????"
 
-#~ msgid "Switch engine"
-#~ msgstr "???????????????????????? ????????????????????????"
-
-#~ msgid "next engine"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "prev engine"
-#~ msgstr "????????????????????? ??????????????????"
+#: ../data/ibus.schemas.in.h:17
+msgid "[Control+space]"
+msgstr "[Control+space]"
 
-#~ msgid "[Control+space]"
-#~ msgstr "[Control+space]"
diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index a9e2233..f954343 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -27,6 +27,7 @@ __all__ = (
 import gobject
 import gtk
 from gtk import gdk
+from gtk import keysyms
 
 from gettext import dgettext
 _  = lambda a : dgettext("ibus", a)
@@ -217,8 +218,29 @@ class KeyboardShortcutSelection(gtk.VBox):
         if id != gtk.RESPONSE_OK or not out:
             return
         keyevent = out[0]
+        state = keyevent.state & (gdk.CONTROL_MASK | \
+                                  gdk.SHIFT_MASK   | \
+                                  gdk.MOD1_MASK    | \
+                                  gdk.META_MASK    | \
+                                  gdk.SUPER_MASK   | \
+                                  gdk.HYPER_MASK)
+        if state == 0:
+            state = state | gdk.RELEASE_MASK
+        elif keyevent.keyval in (keysyms.Control_L, keysyms.Control_R) and state == gdk.CONTROL_MASK:
+            state = state | gdk.RELEASE_MASK
+        elif keyevent.keyval in (keysyms.Shift_L, keysyms.Shift_R) and state == gdk.SHIFT_MASK:
+            state = state | gdk.RELEASE_MASK
+        elif keyevent.keyval in (keysyms.Alt_L, keysyms.Alt_R) and state == gdk.MOD1_MASK:
+            state = state | gdk.RELEASE_MASK
+        elif keyevent.keyval in (keysyms.Meta_L, keysyms.Meta_R) and state == gdk.META_MASK:
+            state = state | gdk.RELEASE_MASK
+        elif keyevent.keyval in (keysyms.Super_L, keysyms.Super_R) and state == gdk.SUPER_MASK:
+            state = state | gdk.RELEASE_MASK
+        elif keyevent.keyval in (keysyms.Hyper_L, keysyms.Hyper_R) and state == gdk.HYPER_MASK:
+            state = state | gdk.RELEASE_MASK
+
         for name, button, mask in self.__modifier_buttons:
-            if keyevent.state & mask:
+            if state & mask:
                 button.set_active(True)
             else:
                 button.set_active(False)
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 373e5d4..756f8e5 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -220,14 +220,17 @@ ibus_bus_init (IBusBus *bus)
 
     ibus_bus_connect (bus);
 
-    path = g_strdup_printf ("/tmp/ibus-%s/", ibus_get_user_name ());
+    path = ibus_get_socket_folder ();
+    mkdir (path, 0700);
+    chmod (path, 0700);
+
+
     file = g_file_new_for_path (path);
     priv->monitor = g_file_monitor_directory (file, 0, NULL, NULL);
 
     g_signal_connect (priv->monitor, "changed", (GCallback) _changed_cb, bus);
 
     g_object_unref (file);
-    g_free (path);
 }
 
 static void
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 95754cf..52547ff 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -553,7 +553,10 @@ ibus_input_context_process_key_event (IBusInputContext *context,
     IBusError *error = NULL;
     gboolean retval;
 
-    if (state & IBUS_FORWARD_MASK)
+    if (state & IBUS_HANDLED_MASK)
+        return TRUE;
+
+    if (state & IBUS_IGNORED_MASK)
         return FALSE;
 
     retval = ibus_proxy_call_with_reply ((IBusProxy *) context,
diff --git a/src/ibusshare.c b/src/ibusshare.c
index c7aa1fe..186be85 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -69,6 +69,31 @@ ibus_get_user_name (void)
 }
 
 const gchar *
+ibus_get_session_id (void)
+{
+    return g_getenv("IBUS_SESSION_ID");
+}
+
+const gchar *
+ibus_get_socket_folder (void)
+{
+    static gchar *folder = NULL;
+
+    if (folder == NULL) {
+        const gchar *session = ibus_get_session_id ();
+        if (session && session[0] != '\0') {
+            folder = g_strdup_printf ("/tmp/ibus-%s-%s",
+                ibus_get_user_name (), session);
+        }
+        else {
+            folder = g_strdup_printf ("/tmp/ibus-%s",
+                ibus_get_user_name ());
+        }
+    }
+    return folder;
+}
+
+const gchar *
 ibus_get_socket_path (void)
 {
     static gchar *path = NULL;
@@ -78,7 +103,7 @@ ibus_get_socket_path (void)
         gchar *display;
         gchar *displaynumber = "0";
         gchar *screennumber = "0";
-        const gchar *username = NULL;
+        const gchar *folder= NULL;
         gchar *p;
 
         if (_display == NULL) {
@@ -111,14 +136,14 @@ ibus_get_socket_path (void)
             }
         }
 
-        username = ibus_get_user_name ();
+        folder = ibus_get_socket_folder ();
 
         if (hostname[0] == '\0')
             hostname = "unix";
 
         path = g_strdup_printf (
-            "/tmp/ibus-%s/ibus-%s-%s",
-            username, hostname, displaynumber);
+            "%s/ibus-%s-%s",
+            folder, hostname, displaynumber);
         g_free (display);
     }
     return path;
diff --git a/src/ibusshare.h b/src/ibusshare.h
index f3b34c4..4c0c645 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -49,6 +49,7 @@ void             ibus_set_display       (const gchar    *display);
 const gchar     *ibus_get_address       (void);
 const gchar     *ibus_get_user_name     (void);
 const gchar     *ibus_get_socket_path   (void);
+const gchar     *ibus_get_socket_folder (void);
 
 const gchar     *ibus_keyval_name       (guint           keyval);
 guint            ibus_keyval_from_name  (const gchar    *keyval_name);
diff --git a/src/ibustypes.h b/src/ibustypes.h
index d2f15ba..2f7c0bf 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -69,11 +69,13 @@ typedef enum
     IBUS_BUTTON5_MASK  = 1 << 12,
 
     /* The next few modifiers are used by XKB, so we skip to the end.
-     * Bits 15 - 24 are currently unused. Bit 29 is used internally.
+     * Bits 15 - 23 are currently unused. Bit 29 is used internally.
      */
 
-    /* forward mask */
+    /* ibus mask */
+    IBUS_HANDLED_MASK  = 1 << 24,
     IBUS_FORWARD_MASK  = 1 << 25,
+    IBUS_IGNORED_MASK  = IBUS_FORWARD_MASK,
 
     IBUS_SUPER_MASK    = 1 << 26,
     IBUS_HYPER_MASK    = 1 << 27,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	3 Feb 2009 09:20:22 -0000	1.21
+++ .cvsignore	27 Apr 2009 00:21:45 -0000	1.22
@@ -1 +1 @@
-ibus-0.1.1.20090203.tar.gz
+ibus-1.1.0.20090423.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ibus.spec	3 Feb 2009 09:20:22 -0000	1.35
+++ ibus.spec	27 Apr 2009 00:21:45 -0000	1.36
@@ -1,8 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?gtk_binary_version: %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
-%define mod_path ibus-0.1
+
+%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+%define gconf2_version 2.12.0
+%define dbus_python_version 0.83.0
+%define im_chooser_version 1.2.5
+
 Name:       ibus
-Version:    0.1.1.20090203
+Version:    1.1.0.20090423
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -10,71 +15,120 @@
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
 
+BuildRequires:  cvs
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
 BuildRequires:  python
 BuildRequires:  gtk2-devel
-BuildRequires:  qt-devel
 BuildRequires:  dbus-glib-devel
+BuildRequires:  dbus-python-devel >= %{dbus_python_version}
 BuildRequires:  desktop-file-utils
+BuildRequires:  gtk-doc
+BuildRequires:  GConf2-devel
+BuildRequires:  pygobject2-devel
+BuildRequires:  intltool
+# BuildRequires:  qt-devel
 
-Requires(post):  desktop-file-utils
-Requires(post):  %{_sbindir}/alternatives
-Requires(postun):  desktop-file-utils
-Requires(postun):  %{_sbindir}/alternatives
+Requires:   %{name}-libs = %{version}-%{release}
 
-Requires:   glib2 >= %{glib_ver}
 Requires:   pygtk2
-Requires:   dbus-python >= 0.83.0
-Requires:   gnome-python2-gconf
 Requires:   notification-daemon
-Requires:   imsettings
-Requires:   im-chooser
 Requires:   pyxdg
 Requires:   iso-codes
+Requires:   dbus-python >= %{dbus_python_version}
+Requires:   im-chooser >= %{im_chooser_version}
+Requires:   GConf2 >= %{gconf2_version}
+
+Requires(post):  desktop-file-utils
+Requires(postun):  desktop-file-utils
+
+Requires(pre): GConf2 >= %{gconf2_version}
+Requires(post): GConf2 >= %{gconf2_version}
+Requires(preun): GConf2 >= %{gconf2_version}
+
+Requires(post):  %{_sbindir}/alternatives
+Requires(postun):  %{_sbindir}/alternatives
+
+Obsoletes:  ibus-qt < 1.1.0
+
+%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
 
 %description
 IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
 full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 
+%package libs
+Summary:    IBus libraries
+Group:      System Environment/Libraries
+
+Requires:   glib2 >= %{glib_ver}
+Requires:   dbus >= 1.2.4
+
+%description libs
+This package contains the libraries for IBus
+
 %package gtk
 Summary:    IBus im module for gtk2
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires(post): glib2 >= %{glib_ver}
 
 %description gtk
 This package contains ibus im module for gtk2
 
-%package qt
-Summary:    IBus im module for qt4
-Group:      System Environment/Libraries
+# %package qt
+# Summary:    IBus im module for qt4
+# Group:      System Environment/Libraries
+# Requires:   %{name} = %{version}-%{release}
+# Requires:   qt >= 4.4.2
+# 
+# %description qt
+# This package contains ibus im module for qt4
+
+%package devel
+Summary:    Development tools for ibus
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   glib2-devel
+Requires:   dbus-devel
+
+%description devel
+The ibus-devel package contains the header files and developer
+docs for ibus.
+
+%package devel-docs
+Summary:    Developer documents for ibus
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires:   qt >= 4.4.2
+Requires:   gtk-doc
 
-%description qt
-This package contains ibus im module for qt4
+%description devel-docs
+The ibus-devel-docs package contains developer documentation for ibus
 
-%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
 
 %prep
 %setup -q
+# %patch0 -p1
+# ./autogen.sh --help
 
 %build
-%configure --disable-static --disable-iso-codes-check
+%configure --disable-static \
+		   --disable-iso-codes-check \
+		   --enable-gtk-doc \
+		   --disable-qt4-immodule
 # make -C po update-gmo
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
 # install xinput config file
@@ -84,6 +138,8 @@
 # install .desktop files
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
+echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
 desktop-file-install --delete-original          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
@@ -97,9 +153,20 @@
 update-desktop-database -q
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
 
-%post gtk
-/sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_host} || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+fi
 
 %postun
 update-desktop-database -q
@@ -109,8 +176,16 @@
   [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
 fi
 
-%postun gtk
+%post libs
 /sbin/ldconfig
+
+%postun libs
+/sbin/ldconfig
+
+%post gtk
+%{_bindir}/update-gtk-immodules %{_host} || :
+
+%postun gtk
 %{_bindir}/update-gtk-immodules %{_host} || :
 
 %files -f %{name}.lang
@@ -119,40 +194,163 @@
 %dir %{python_sitelib}/ibus
 %{python_sitelib}/ibus/*
 %dir %{_datadir}/ibus/
-%dir %{_datadir}/ibus/daemon/
-%dir %{_datadir}/ibus/gconf/
-%dir %{_datadir}/ibus/ui/
-%dir %{_datadir}/ibus/setup/
-%dir %{_datadir}/ibus/engine/
-%dir %{_datadir}/ibus/icons/
-%{_bindir}/ibus
+%{_bindir}/ibus-daemon
 %{_bindir}/ibus-setup
-%{_datadir}/ibus/daemon/*
-%{_datadir}/ibus/gconf/*
-%{_datadir}/ibus/ui/*
-%{_datadir}/ibus/setup/*
-%{_datadir}/ibus/icons/*
+%{_datadir}/ibus/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_bindir}/ibus-x11
-%{_bindir}/ibus-daemon
-%{_bindir}/ibus-gconf
-%{_bindir}/ibus-ui-gtk
+%{_libexecdir}/ibus-gconf
+%{_libexecdir}/ibus-ui-gtk
+%{_libexecdir}/ibus-x11
+# %{_sysconfdir}/xdg/autostart/ibus.desktop
+%{_sysconfdir}/gconf/schemas/ibus.schemas
 %config %{_xinputconf}
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libibus.so*
+
 %files gtk
 %defattr(-,root,root,-)
-%{_libdir}/libibus-gtk.so*
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
 
-%files qt
+# %files qt
+# %defattr(-,root,root,-)
+# %{_libdir}/qt4/plugins/inputmethods/libibus.so
+
+%files devel
 %defattr(-,root,root,-)
-%{_libdir}/qt4/plugins/inputmethods/libibus.so
+%{_libdir}/lib*.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+
+%files devel-docs
+%{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Apr 23 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090423-1
+- Update to ibus-1.1.0.20090423.
+- Fix bug 497265 -  [mai_IN] Maithili language name is not correct.
+- Fix bug 497279 -  IBus does not works with evolution correctly.
+- Enhance authentication both in daemon & clients
+
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090417-1
+- Update to ibus-1.1.0.20090417.
+- Fix bug 496199 -  cannot remove Ctrl+Space hotkey with ibus-setup
+
+* Fri Apr 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-4
+- Update ibus-HEAD.patch.
+- Next Engine hotkey will do nothing if the IM is not active.
+
+* Wed Apr 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-3
+- Update ibus-HEAD.patch.
+- Fix bug 495431 -  ibus Release modifier doesn't work with Alt
+- Fix bug 494445 -  ibus-hangul missing Hangul Han/En mode
+  (and Alt_R+release hotkey)
+- Update te.po
+
+* Tue Apr 14 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-2
+- Update ibus-HEAD.patch.
+- Change the mode of /tmp/ibus-$USER to 0700 to improve security
+- Change the mode of /tmp/ibus-$USER/socket-address to 0600 to improve security
+- Update as.po
+
+* Mon Apr 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090413-1
+- Update to ibus-1.1.0.20090413.
+- Fix crash when restart the ibus-daemon
+- Add some translations.
+
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-3
+- Update the tarball.
+- Fix bug 494511 - ibus-gtk makes gnome-terminal abort 
+  when a key is pressed
+
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-2
+- Update default hotkey settings.
+
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090407-1
+- Update to ibus-1.1.0.20090407.
+- Fix bug 491042 - ibus default trigger hotkeys
+- Fix bug 492929 - ibus-hangul can cause gtk app to lockup
+- Fix bug 493701 -  (ibus) imsettings disconnect/reconnect kills gtk app
+- Fix bug 493687 -  ibus-hangul should default to vertical candidate selection
+- Fix bug 493449 -  ibus broke Alt-F2 command auto-completion
+
+* Tue Mar 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090331-1
+- Update to ibus-1.1.0.20090331.
+- Fix bug 492956 - screws up keyboard input in firefox
+- Fix bug 490143 - ibus issue with gnome-keyring
+
+* Sun Mar 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-3
+- Recreate the ibus-HEAD.patch from upstream git source tree
+- Fix bug 491999 - up/down arrow keys broken in xchat
+
+* Sat Mar 28 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-2
+- Recreate the ibus-HEAD.patch from upstream git source tree.
+- Fix bug 490009 - Deleting Next Engine shortcuts doesn't work
+- Fix bug 490381 - Change "Next/Previous engine" labels
+
+* Wed Mar 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090311-1
+- Update to ibus-1.1.0.20090311.
+- Update setup ui follow GNOME Human Interface Guidelines 2.2 (#489497).
+
+* Fri Mar  6 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090306-1
+- Update to ibus-1.1.0.20090306.
+
+* Tue Mar  3 2009 Jens Petersen <petersen at redhat.com>
+- use post for ibus-gtk requires glib2
+
+* Mon Mar  2 2009 Jens Petersen <petersen at redhat.com> - 1.1.0.20090225-2
+- drop the superfluous ibus-0.1 engine obsoletes
+- move glib2 requires to gtk package
+
+* Tue Feb 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
+- Update to ibus-1.1.0.20090225.
+- Fix problems in %post and %postun scripts.
+- Hide ibus & ibus preferences menu items.
+
+* Tue Feb 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-10
+- Recreate the ibus-HEAD.patch from upstream git source tree.
+- Put 'Select an input method' in engine select combobox (#485861).
+
+* Tue Feb 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-9
+- Add requires im-chooser >= 1.2.5.
+
+* Tue Feb 17 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-8
+- Recreate the ibus-HEAD.patch from upstream git source tree.
+- Fix ibus-hangul segfault (#485438).
+
+* Mon Feb 16 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-6
+- Recreate the ibus-HEAD.patch from upstream git source tree.
+- The new patch fixes ibus-x11 segfault (#485661).
+
+* Sun Feb 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-5
+- Recreate the ibus-HEAD.patch from upstream git source tree.
+
+* Sun Feb 15 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-4
+- Remove gnome-python2-gconf from requires.
+
+* Fri Feb 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-3
+- Update ibus-HEAD.patch, to fix bug 484652.
+
+* Fri Feb 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
+- Add patch ibus-HEAD.patch, to update ibus to HEAD version.
+
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+- Add --xim argument in xinput-ibus
+- Add Obsoletes:  ibus-qt <= 1.1.0
+- Move libibus.so.* to ibus-libs to make ibus multilib.
+- Update to 1.1.0.20090211.
+
+* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+- Update to 1.1.0.20090205.
+
 * Tue Feb 03 2009 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20090203-1
 - Update to 0.1.1.20090203.
 
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081023-3
+- Rebuild for Python 2.6
+
 * Wed Nov 19 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-2
 - Move libibus-gtk.so from ibus.rpm to ibus-gtk.rpm to fix bug 472146.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Feb 2009 09:20:22 -0000	1.24
+++ sources	27 Apr 2009 00:21:45 -0000	1.25
@@ -1 +1 @@
-8925808933024a70c29908461180b65a  ibus-0.1.1.20090203.tar.gz
+7c04c5244e6b5c392590d62f09443682  ibus-1.1.0.20090423.tar.gz



From phuang at fedoraproject.org  Mon Apr 27 00:31:08 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 00:31:08 +0000 (UTC)
Subject: rpms/ibus-anthy/F-10 .cvsignore, 1.11, 1.12 ibus-anthy.spec, 1.10, 
	1.11 sources, 1.11, 1.12
Message-ID: <20090427003108.DA1AE70110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11575

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Port F-11 branch to F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Feb 2009 06:11:06 -0000	1.11
+++ .cvsignore	27 Apr 2009 00:30:38 -0000	1.12
@@ -1 +1 @@
-ibus-anthy-0.1.1.20090203.tar.gz
+ibus-anthy-1.1.0.20090402.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-10/ibus-anthy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ibus-anthy.spec	3 Feb 2009 06:11:06 -0000	1.10
+++ ibus-anthy.spec	27 Apr 2009 00:30:38 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-0.1
+%define mod_path ibus-1.1
 Name:       ibus-anthy
-Version:    0.1.1.20090203
+Version:    1.1.0.20090402
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -49,15 +49,32 @@
 # %dir %{python_sitearch}/ibus
 %{python_sitearch}/anthy.py*
 %{python_sitearch}/_anthy.so
-%dir %{_datadir}/ibus-anthy
-%{_bindir}/ibus-engine-anthy
-%{_datadir}/ibus-anthy/*
-%{_datadir}/ibus/engine/anthy.engine
+%{_libexecdir}/ibus-engine-anthy
+%{_datadir}/ibus-anthy
+%{_datadir}/ibus/component/*
 
 %changelog
+* Thu Apr 02 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090402-1
+- Update to 1.1.0.20090402.
+- Fix bug 490747 - Muhenkan (no-conversion) key does not undo conversion
+- Fix bug 490750 - Henkan key for candidate conversion doesn't do anything
+- Fix bug 490748 - Kana key doesn't do anything
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+- Update to 1.1.0.20090211.
+
+* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+- Update to 1.1.0.20090205.
+
 * Tue Feb 03 2009 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20090203-1
 - Update to 0.1.1.20090203.
 
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20080912-2
+- Rebuild for Python 2.6
+
 * Fri Sep 12 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080912-1
 - Update to 0.1.1.20080912.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Feb 2009 06:11:07 -0000	1.11
+++ sources	27 Apr 2009 00:30:38 -0000	1.12
@@ -1 +1 @@
-bad4cb5373eeb203bbea72d8ac06fa21  ibus-anthy-0.1.1.20090203.tar.gz
+2d5ae290174ed2f326006659deabc127  ibus-anthy-1.1.0.20090402.tar.gz



From phuang at fedoraproject.org  Mon Apr 27 00:43:33 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 00:43:33 +0000 (UTC)
Subject: rpms/ibus-hangul/F-10
	ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch, NONE,
	1.1 ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 ibus-hangul.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090427004333.9BD3C70110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-hangul/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13306

Modified Files:
	.cvsignore ibus-hangul.spec sources 
Added Files:
	ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch 
	ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch 
Log Message:
Port F-11 beanch to F-10

ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch:

--- NEW FILE ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch ---
diff -urN ibus-hangul-1.1.0.20090328.orig/src/engine.c ibus-hangul-1.1.0.20090328/src/engine.c
--- ibus-hangul-1.1.0.20090328.orig/src/engine.c	2009-04-06 16:21:46.663081165 -0400
+++ ibus-hangul-1.1.0.20090328/src/engine.c	2009-04-06 16:50:00.163321101 -0400
@@ -384,19 +384,19 @@
 
 	ibus_hangul_engine_commit_current_candidate (hangul);
         ibus_hangul_engine_close_lookup_table (hangul);
-    } else if (keyval == IBUS_Left) {
+    } else if (keyval == IBUS_Up) {
         ibus_lookup_table_cursor_up (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Right) {
+    } else if (keyval == IBUS_Down) {
         ibus_lookup_table_cursor_down (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Up) {
+    } else if (keyval == IBUS_Left) {
         ibus_lookup_table_page_up (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Down) {
+    } else if (keyval == IBUS_Right) {
         ibus_lookup_table_page_down (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);

ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch:

--- NEW FILE ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch ---
diff -urN ibus-hangul-1.1.0.20090328.orig/src/engine.c ibus-hangul-1.1.0.20090328/src/engine.c
--- ibus-hangul-1.1.0.20090328.orig/src/engine.c	2009-03-26 01:50:18.000000000 -0400
+++ ibus-hangul-1.1.0.20090328/src/engine.c	2009-04-06 16:20:44.935321507 -0400
@@ -450,7 +450,7 @@
     if (keyval == IBUS_Shift_L || keyval == IBUS_Shift_R)
         return FALSE;
 
-    if (keyval == IBUS_F9 || keyval == IBUS_Hangul_Hanja) {
+    if (keyval == IBUS_F9 || keyval == IBUS_Hangul_Hanja || keyval == IBUS_Control_R) {
 	ibus_hangul_engine_toggle_lookup_table (hangul);
 	return TRUE;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 06:53:39 -0000	1.4
+++ .cvsignore	27 Apr 2009 00:43:03 -0000	1.5
@@ -1 +1 @@
-ibus-hangul-0.1.1.20081023.tar.gz
+ibus-hangul-1.1.0.20090328.tar.gz


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-10/ibus-hangul.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-hangul.spec	23 Oct 2008 06:53:39 -0000	1.3
+++ ibus-hangul.spec	27 Apr 2009 00:43:03 -0000	1.4
@@ -1,22 +1,21 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-0.1
 Name:       ibus-hangul
-Version:    0.1.1.20081023
-Release:    1%{?dist}
+Version:    1.1.0.20090328
+Release:    2%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:     ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch
+Patch1:     ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
-BuildRequires:  python-devel
 BuildRequires:  libhangul-devel
-BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  ibus-devel
 
 Requires:   ibus
 
@@ -26,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -35,7 +36,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/_hangul.la
 
 %find_lang %{name}
 
@@ -45,15 +45,35 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-# %dir %{python_sitearch}/ibus
-%{python_sitearch}/hangul.py*
-%{python_sitearch}/_hangul.so
-%dir %{_datadir}/ibus-hangul
-%{_bindir}/ibus-engine-hangul
-%{_datadir}/ibus-hangul/*
-%{_datadir}/ibus/engine/hangul.engine
+%{_libexecdir}/ibus-engine-hangul
+%{_libexecdir}/ibus-setup-hangul
+%{_datadir}/ibus-hangul
+%{_datadir}/ibus/component/*
 
 %changelog
+* Sun Apr 12 2009 Warren Togami <wtogami at redhat.com> - 1.1.0.20090330-2
+- Bug 493706: ibus-hangul Hanja arrow keys are wrong
+- Bug 493509: ibus-hangul missing right Ctrl for Hanja button
+  These fixes are not ideal, but they make it usable for Fedora 11.
+  These must become configurable in a future version.
+
+* Mon Mar 30 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090330-1
+- Update version to 1.1.0.20090330.
+- Fix bug 486056 - missing options for 2bul, 3bul and other Korean layouts
+- Fix bug 487269 - missing Hanja Conversion
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+- Update version to 1.1.0.20090211.
+
+* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+- Update version to 1.1.0.20090205.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081023-2
+- Rebuild for Python 2.6
+
 * Thu Oct 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - Update to 0.1.1.20081023.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 06:53:39 -0000	1.4
+++ sources	27 Apr 2009 00:43:03 -0000	1.5
@@ -1 +1 @@
-8ff5552dddfdd58085596ad874a1e39d  ibus-hangul-0.1.1.20081023.tar.gz
+4b7e737fce25202b6338794988f53a18  ibus-hangul-1.1.0.20090328.tar.gz



From phuang at fedoraproject.org  Mon Apr 27 00:48:07 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 00:48:07 +0000 (UTC)
Subject: rpms/ibus-pinyin/F-10 .cvsignore, 1.8, 1.9 ibus-pinyin.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20090427004807.E7BBA70110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13708

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Port F-11 branch to F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Oct 2008 02:38:42 -0000	1.8
+++ .cvsignore	27 Apr 2009 00:47:37 -0000	1.9
@@ -1,2 +1,2 @@
-ibus-pinyin-0.1.1.20081004.tar.gz
+ibus-pinyin-1.1.0.20090303.tar.gz
 pinyin-database-0.1.10.6.tar.bz2


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-10/ibus-pinyin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ibus-pinyin.spec	4 Oct 2008 02:38:43 -0000	1.7
+++ ibus-pinyin.spec	27 Apr 2009 00:47:37 -0000	1.8
@@ -1,5 +1,5 @@
 Name:       ibus-pinyin
-Version:    0.1.1.20081004
+Version:    1.1.0.20090303
 Release:    1%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
@@ -43,13 +43,30 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/ibus-pinyin
-%{_datadir}/ibus-pinyin/*
-%{_datadir}/ibus/engine/pinyin.engine
-%{_bindir}/ibus-engine-pinyin
-%{_bindir}/ibus-setup-pinyin
+%{_datadir}/ibus-pinyin
+%{_datadir}/ibus/component/*
+%{_libexecdir}/ibus-engine-pinyin
+%{_libexecdir}/ibus-setup-pinyin
 
 %changelog
+* Tue Mar 3 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090303-1
+- Update to 1.1.0.20090303.
+
+* Wed Feb 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
+- Update to 1.1.0.20090225.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+- Update version to 1.1.0.20090211.
+
+* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+- Update version to 1.1.0.20090205.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081004-2
+- Rebuild for Python 2.6
+
 * Sat Oct 04 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081004-1
 - Update version to 0.1.1.20081004.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Oct 2008 02:38:43 -0000	1.8
+++ sources	27 Apr 2009 00:47:37 -0000	1.9
@@ -1,2 +1,2 @@
-ea3920f70b34cd33c4dd9f885b23c046  ibus-pinyin-0.1.1.20081004.tar.gz
+f14c1110310598f0c332661d4a1a1a99  ibus-pinyin-1.1.0.20090303.tar.gz
 ebd8d2381993372bb97a877b549e14a0  pinyin-database-0.1.10.6.tar.bz2



From airlied at fedoraproject.org  Mon Apr 27 01:25:34 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 27 Apr 2009 01:25:34 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-fix-xv-warning.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.181, 1.182
Message-ID: <20090427012534.1CC3C70110@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16877

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.2-fix-xv-warning.patch 
Log Message:
* Mon Apr 27 2009 Dave Airlie <airlied at redhat.com> 6.12.2-7
- revert rs690 fixes for now until we can research properly
- fix xv warning


radeon-6.12.2-fix-xv-warning.patch:

--- NEW FILE radeon-6.12.2-fix-xv-warning.patch ---
diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dma xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
--- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dma	2009-04-27 11:23:13.000000000 +1000
+++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-27 11:23:22.000000000 +1000
@@ -1601,7 +1601,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
 	    }
 	}
 
-	qwords = info->new_cs ? 8 : 6;
+	qwords = info->new_cs ? 7 : 6;
 	BEGIN_ACCEL(qwords);
 	OUT_ACCEL_REG(R300_TX_INVALTAGS, 0);
 	OUT_ACCEL_REG(R300_TX_ENABLE, txenable);


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- xorg-x11-drv-ati.spec	24 Apr 2009 05:59:20 -0000	1.181
+++ xorg-x11-drv-ati.spec	27 Apr 2009 01:25:03 -0000	1.182
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,7 +18,8 @@
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 Patch8:	    radeon-6.12.2-kms-gamma.patch
-Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
+#Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
+Patch10:    radeon-6.12.2-fix-xv-warning.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,7 +46,8 @@
 %patch7 -p1 -b .r600-fb-size
 # don't do this yet, kernel will oops if you do
 #patch8 -p1 -b .kms-gamma
-%patch9 -p1 -b .rs690clamp
+#patch9 -p1 -b .rs690clamp
+%patch10 -p1 -b .fix-xvwarn
 
 %build
 autoreconf -iv
@@ -77,6 +79,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 27 2009 Dave Airlie <airlied at redhat.com> 6.12.2-7
+- revert rs690 fixes for now until we can research properly
+- fix xv warning
+
 * Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 6.12.2-6
 - rs690: fix clamps patch so it doesn't break other cards
 



From corsepiu at fedoraproject.org  Mon Apr 27 02:31:22 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 02:31:22 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/F-11 .cvsignore, 1.2,
	1.3 perl-Test-MockTime.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090427023122.B916F7013C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23469/F-11

Modified Files:
	.cvsignore perl-Test-MockTime.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2008 19:56:05 -0000	1.2
+++ .cvsignore	27 Apr 2009 02:30:51 -0000	1.3
@@ -1 +1 @@
-Test-MockTime-0.09.tar.gz
+Test-MockTime-0.12.tar.gz


Index: perl-Test-MockTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-11/perl-Test-MockTime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-MockTime.spec	27 Feb 2009 02:40:49 -0000	1.2
+++ perl-Test-MockTime.spec	27 Apr 2009 02:30:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-MockTime
-Version:        0.09
-Release:        2%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Replaces actual time with simulated time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2008 19:56:05 -0000	1.2
+++ sources	27 Apr 2009 02:30:51 -0000	1.3
@@ -1 +1 @@
-cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz
+de726192bcdd0cef68a07ffdf11d7300  Test-MockTime-0.12.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 02:31:22 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 02:31:22 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/devel .cvsignore, 1.2,
	1.3 perl-Test-MockTime.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090427023122.B90C570110@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23469/devel

Modified Files:
	.cvsignore perl-Test-MockTime.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2008 19:56:05 -0000	1.2
+++ .cvsignore	27 Apr 2009 02:30:50 -0000	1.3
@@ -1 +1 @@
-Test-MockTime-0.09.tar.gz
+Test-MockTime-0.12.tar.gz


Index: perl-Test-MockTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/devel/perl-Test-MockTime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-MockTime.spec	27 Feb 2009 02:40:49 -0000	1.2
+++ perl-Test-MockTime.spec	27 Apr 2009 02:30:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-MockTime
-Version:        0.09
-Release:        2%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Replaces actual time with simulated time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2008 19:56:05 -0000	1.2
+++ sources	27 Apr 2009 02:30:50 -0000	1.3
@@ -1 +1 @@
-cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz
+de726192bcdd0cef68a07ffdf11d7300  Test-MockTime-0.12.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 02:31:22 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 02:31:22 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/F-10 .cvsignore, 1.2,
	1.3 perl-Test-MockTime.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090427023122.B92B57013F@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23469/F-10

Modified Files:
	.cvsignore perl-Test-MockTime.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2008 19:56:05 -0000	1.2
+++ .cvsignore	27 Apr 2009 02:30:52 -0000	1.3
@@ -1 +1 @@
-Test-MockTime-0.09.tar.gz
+Test-MockTime-0.12.tar.gz


Index: perl-Test-MockTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-10/perl-Test-MockTime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-MockTime.spec	22 Sep 2008 19:56:05 -0000	1.1
+++ perl-Test-MockTime.spec	27 Apr 2009 02:30:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockTime
-Version:        0.09
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Replaces actual time with simulated time
 License:        GPL+ or Artistic
@@ -58,6 +58,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
+- Upstream update.
+
 * Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
 - Cleanup spec file.
 - Specfile autogenerated by cpanspec 1.77.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2008 19:56:05 -0000	1.2
+++ sources	27 Apr 2009 02:30:52 -0000	1.3
@@ -1 +1 @@
-cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz
+de726192bcdd0cef68a07ffdf11d7300  Test-MockTime-0.12.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 02:31:22 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 02:31:22 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/F-9 .cvsignore, 1.2,
	1.3 perl-Test-MockTime.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090427023122.EA6F870141@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-MockTime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23469/F-9

Modified Files:
	.cvsignore perl-Test-MockTime.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2008 19:58:45 -0000	1.2
+++ .cvsignore	27 Apr 2009 02:30:52 -0000	1.3
@@ -1 +1 @@
-Test-MockTime-0.09.tar.gz
+Test-MockTime-0.12.tar.gz


Index: perl-Test-MockTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-9/perl-Test-MockTime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-MockTime.spec	22 Sep 2008 19:58:46 -0000	1.1
+++ perl-Test-MockTime.spec	27 Apr 2009 02:30:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockTime
-Version:        0.09
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Replaces actual time with simulated time
 License:        GPL+ or Artistic
@@ -58,6 +58,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.12-1
+- Upstream update.
+
 * Mon Sep 22 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.09-1
 - Cleanup spec file.
 - Specfile autogenerated by cpanspec 1.77.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2008 19:58:46 -0000	1.2
+++ sources	27 Apr 2009 02:30:52 -0000	1.3
@@ -1 +1 @@
-cc3945c4f8d333a1a9314c0a987ef33a  Test-MockTime-0.09.tar.gz
+de726192bcdd0cef68a07ffdf11d7300  Test-MockTime-0.12.tar.gz



From konradm at fedoraproject.org  Mon Apr 27 02:32:42 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Mon, 27 Apr 2009 02:32:42 +0000 (UTC)
Subject: rpms/python-ZConfig/devel import.log, NONE, 1.1 python-ZConfig.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427023242.1C11970110@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-ZConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24090/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-ZConfig.spec 
Log Message:
Import.



--- NEW FILE import.log ---
python-ZConfig-2_6_1-1_fc10:HEAD:python-ZConfig-2.6.1-1.fc10.src.rpm:1240799522


--- NEW FILE python-ZConfig.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ZConfig
Version:        2.6.1
Release:        1%{?dist}
Summary:        Structured Configuration Library
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://www.zope.org/Members/fdrake/zconfig/
Source0:        http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-zope-testing


%description
ZConfig is a configuration library intended for general use. It supports
a hierarchical schema-driven configuration model that allows a schema to
specify data conversion routines written in Python. ZConfig's model is
very different from the model supported by the ConfigParser module found
in Python's standard library, and is more suitable to
configuration-intensive applications.


%prep
%setup -q -n ZConfig-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%check
%{__python} setup.py test

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc NEWS.txt doc/zconfig.pdf
%{python_sitelib}/*
%{_bindir}/zconfig
%{_bindir}/zconfig_schema2html


%changelog
* Sun Dec 14 2008 Conrad Meyer <konrad at tylerc.org> - 2.6.1-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ZConfig/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:23:01 -0000	1.1
+++ .cvsignore	27 Apr 2009 02:32:41 -0000	1.2
@@ -0,0 +1 @@
+ZConfig-2.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ZConfig/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:23:01 -0000	1.1
+++ sources	27 Apr 2009 02:32:41 -0000	1.2
@@ -0,0 +1 @@
+9fcf43f4fe3432d49baa59f65b5d3b2c  ZConfig-2.6.1.tar.gz



From konradm at fedoraproject.org  Mon Apr 27 02:33:21 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Mon, 27 Apr 2009 02:33:21 +0000 (UTC)
Subject: rpms/python-zope-testing/devel import.log, NONE,
	1.1 python-zope-testing.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427023321.DE1F770110@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-zope-testing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24223/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-zope-testing.spec 
Log Message:
Import.



--- NEW FILE import.log ---
python-zope-testing-3_7_3-1_fc10:HEAD:python-zope-testing-3.7.3-1.fc10.src.rpm:1240799558


--- NEW FILE python-zope-testing.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zope-testing
Version:        3.7.3
Release:        1%{?dist}
Summary:        Zope Testing Framework
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://pypi.python.org/pypi/zope.testing
Source0:        http://pypi.python.org/packages/source/z/zope.testing/zope.testing-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-zope-filesystem


%description
This package provides a number of testing frameworks. It includes a
flexible test runner, and supports both doctest and unittest.


%prep
%setup -q -n zope.testing-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc documentation.txt CHANGES.txt README.txt
%{python_sitelib}/zope/*
%{python_sitelib}/zope.testing*


%changelog
* Wed Apr 22 2009 Conrad Meyer <konrad at tylerc.org> - 3.7.3-1
- Bump to 3.7.3.

* Sun Dec 14 2008 Conrad Meyer <konrad at tylerc.org> - 3.7.1-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-testing/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:22:01 -0000	1.1
+++ .cvsignore	27 Apr 2009 02:32:51 -0000	1.2
@@ -0,0 +1 @@
+zope.testing-3.7.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-testing/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:22:01 -0000	1.1
+++ sources	27 Apr 2009 02:32:51 -0000	1.2
@@ -0,0 +1 @@
+5b4beacff550fb306fb49500679080cf  zope.testing-3.7.3.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 03:46:23 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 03:46:23 +0000 (UTC)
Subject: rpms/perl-CSS-Squish/F-9 .cvsignore, 1.2, 1.3 perl-CSS-Squish.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090427034623.CCBD070141@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-CSS-Squish/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29350/F-9

Modified Files:
	.cvsignore perl-CSS-Squish.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Feb 2008 02:43:04 -0000	1.2
+++ .cvsignore	27 Apr 2009 03:45:53 -0000	1.3
@@ -1 +1 @@
-CSS-Squish-0.07.tar.gz
+CSS-Squish-0.08.tar.gz


Index: perl-CSS-Squish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-9/perl-CSS-Squish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-CSS-Squish.spec	5 Mar 2008 14:59:29 -0000	1.2
+++ perl-CSS-Squish.spec	27 Apr 2009 03:45:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Squish
-Version:        0.07
-Release:        2%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Compact many CSS files into one big file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
+- Upstream update.
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Feb 2008 02:43:04 -0000	1.2
+++ sources	27 Apr 2009 03:45:53 -0000	1.3
@@ -1 +1 @@
-d992129bf96368a504fe9c67b6d3e622  CSS-Squish-0.07.tar.gz
+6924fdf59b09e006e5a97e45fce48046  CSS-Squish-0.08.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 03:46:23 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 03:46:23 +0000 (UTC)
Subject: rpms/perl-CSS-Squish/F-10 .cvsignore, 1.2, 1.3 perl-CSS-Squish.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090427034623.C70357013F@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-CSS-Squish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29350/F-10

Modified Files:
	.cvsignore perl-CSS-Squish.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Feb 2008 02:43:04 -0000	1.2
+++ .cvsignore	27 Apr 2009 03:45:52 -0000	1.3
@@ -1 +1 @@
-CSS-Squish-0.07.tar.gz
+CSS-Squish-0.08.tar.gz


Index: perl-CSS-Squish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-10/perl-CSS-Squish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-CSS-Squish.spec	5 Mar 2008 14:59:29 -0000	1.2
+++ perl-CSS-Squish.spec	27 Apr 2009 03:45:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Squish
-Version:        0.07
-Release:        2%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Compact many CSS files into one big file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
+- Upstream update.
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Feb 2008 02:43:04 -0000	1.2
+++ sources	27 Apr 2009 03:45:53 -0000	1.3
@@ -1 +1 @@
-d992129bf96368a504fe9c67b6d3e622  CSS-Squish-0.07.tar.gz
+6924fdf59b09e006e5a97e45fce48046  CSS-Squish-0.08.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 03:46:23 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 03:46:23 +0000 (UTC)
Subject: rpms/perl-CSS-Squish/F-11 .cvsignore, 1.2, 1.3 perl-CSS-Squish.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090427034623.C19F97013C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-CSS-Squish/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29350/F-11

Modified Files:
	.cvsignore perl-CSS-Squish.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Feb 2008 02:43:04 -0000	1.2
+++ .cvsignore	27 Apr 2009 03:45:52 -0000	1.3
@@ -1 +1 @@
-CSS-Squish-0.07.tar.gz
+CSS-Squish-0.08.tar.gz


Index: perl-CSS-Squish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-11/perl-CSS-Squish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-CSS-Squish.spec	26 Feb 2009 11:47:28 -0000	1.3
+++ perl-CSS-Squish.spec	27 Apr 2009 03:45:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Squish
-Version:        0.07
-Release:        3%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Compact many CSS files into one big file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Feb 2008 02:43:04 -0000	1.2
+++ sources	27 Apr 2009 03:45:52 -0000	1.3
@@ -1 +1 @@
-d992129bf96368a504fe9c67b6d3e622  CSS-Squish-0.07.tar.gz
+6924fdf59b09e006e5a97e45fce48046  CSS-Squish-0.08.tar.gz



From corsepiu at fedoraproject.org  Mon Apr 27 03:46:23 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 03:46:23 +0000 (UTC)
Subject: rpms/perl-CSS-Squish/devel .cvsignore, 1.2, 1.3 perl-CSS-Squish.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090427034623.BE4E570110@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-CSS-Squish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29350/devel

Modified Files:
	.cvsignore perl-CSS-Squish.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Feb 2008 02:43:04 -0000	1.2
+++ .cvsignore	27 Apr 2009 03:45:52 -0000	1.3
@@ -1 +1 @@
-CSS-Squish-0.07.tar.gz
+CSS-Squish-0.08.tar.gz


Index: perl-CSS-Squish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/devel/perl-CSS-Squish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-CSS-Squish.spec	26 Feb 2009 11:47:28 -0000	1.3
+++ perl-CSS-Squish.spec	27 Apr 2009 03:45:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Squish
-Version:        0.07
-Release:        3%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Compact many CSS files into one big file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.08-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Feb 2008 02:43:04 -0000	1.2
+++ sources	27 Apr 2009 03:45:52 -0000	1.3
@@ -1 +1 @@
-d992129bf96368a504fe9c67b6d3e622  CSS-Squish-0.07.tar.gz
+6924fdf59b09e006e5a97e45fce48046  CSS-Squish-0.08.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 27 05:05:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:05:51 +0000
Subject: [pkgdb] globus-xio-popen-driver was added for ellert
Message-ID: <20090427050553.F0DAA10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-xio-popen-driver with summary Globus Toolkit - Globus XIO Pipe Open Driver
kevin has approved Package globus-xio-popen-driver
kevin has added a Fedora devel branch for globus-xio-popen-driver with an owner of ellert
kevin has approved globus-xio-popen-driver in Fedora devel
kevin has approved Package globus-xio-popen-driver
kevin has set commit to Approved for provenpackager on globus-xio-popen-driver (Fedora devel)
kevin has set build to Approved for provenpackager on globus-xio-popen-driver (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-xio-popen-driver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio-popen-driver



From pkgdb at fedoraproject.org  Mon Apr 27 05:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:05:54 +0000
Subject: [pkgdb] globus-xio-popen-driver (Fedora EPEL, 4) updated by kevin
Message-ID: <20090427050554.EE32410F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-xio-popen-driver
kevin has set commit to Approved for provenpackager on globus-xio-popen-driver (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-xio-popen-driver (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-xio-popen-driver (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio-popen-driver



From pkgdb at fedoraproject.org  Mon Apr 27 05:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:05:54 +0000
Subject: [pkgdb] globus-xio-popen-driver (Fedora, 10) updated by kevin
Message-ID: <20090427050554.F3F3210F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-xio-popen-driver
kevin has set commit to Approved for provenpackager on globus-xio-popen-driver (Fedora 10)
kevin has set build to Approved for provenpackager on globus-xio-popen-driver (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-xio-popen-driver (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio-popen-driver



From pkgdb at fedoraproject.org  Mon Apr 27 05:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:05:54 +0000
Subject: [pkgdb] globus-xio-popen-driver (Fedora, 11) updated by kevin
Message-ID: <20090427050555.069BA10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-xio-popen-driver
kevin has set commit to Approved for provenpackager on globus-xio-popen-driver (Fedora 11)
kevin has set build to Approved for provenpackager on globus-xio-popen-driver (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-xio-popen-driver (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio-popen-driver



From pkgdb at fedoraproject.org  Mon Apr 27 05:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:05:54 +0000
Subject: [pkgdb] globus-xio-popen-driver (Fedora, 9) updated by kevin
Message-ID: <20090427050555.1111210F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-xio-popen-driver
kevin has set commit to Approved for provenpackager on globus-xio-popen-driver (Fedora 9)
kevin has set build to Approved for provenpackager on globus-xio-popen-driver (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-xio-popen-driver (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio-popen-driver



From kevin at fedoraproject.org  Mon Apr 27 05:06:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:06:06 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver - New directory
Message-ID: <20090427050606.BD0A270110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio-popen-driver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEa5393/rpms/globus-xio-popen-driver

Log Message:
Directory /cvs/pkgs/rpms/globus-xio-popen-driver added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:06:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:06:06 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/devel - New directory
Message-ID: <20090427050606.EF5E070110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEa5393/rpms/globus-xio-popen-driver/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-xio-popen-driver/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:06:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:06:16 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver Makefile,NONE,1.1
Message-ID: <20090427050616.35FB270110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio-popen-driver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEa5393/rpms/globus-xio-popen-driver

Added Files:
	Makefile 
Log Message:
Setup of module globus-xio-popen-driver


--- NEW FILE Makefile ---
# Top level Makefile for module globus-xio-popen-driver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:06:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:06:16 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090427050616.B038070110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEa5393/rpms/globus-xio-popen-driver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-xio-popen-driver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-xio-popen-driver
# $Id: Makefile,v 1.1 2009/04/27 05:06:16 kevin Exp $
NAME := globus-xio-popen-driver
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:05:54 +0000
Subject: [pkgdb] globus-xio-popen-driver (Fedora EPEL, 5) updated by kevin
Message-ID: <20090427050555.18EBF10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-xio-popen-driver
kevin has set commit to Approved for provenpackager on globus-xio-popen-driver (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-xio-popen-driver (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-xio-popen-driver (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-xio-popen-driver



From pkgdb at fedoraproject.org  Mon Apr 27 05:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:06:46 +0000
Subject: [pkgdb] globus-rsl-assist was added for ellert
Message-ID: <20090427050646.2A2C910F894@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-rsl-assist with summary Globus Toolkit - RSL Manipulation Library
kevin has approved Package globus-rsl-assist
kevin has added a Fedora devel branch for globus-rsl-assist with an owner of ellert
kevin has approved globus-rsl-assist in Fedora devel
kevin has approved Package globus-rsl-assist
kevin has set commit to Approved for provenpackager on globus-rsl-assist (Fedora devel)
kevin has set build to Approved for provenpackager on globus-rsl-assist (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-rsl-assist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl-assist



From pkgdb at fedoraproject.org  Mon Apr 27 05:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:06:47 +0000
Subject: [pkgdb] globus-rsl-assist (Fedora EPEL, 4) updated by kevin
Message-ID: <20090427050648.176AC10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-rsl-assist
kevin has set commit to Approved for provenpackager on globus-rsl-assist (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-rsl-assist (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-rsl-assist (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl-assist



From pkgdb at fedoraproject.org  Mon Apr 27 05:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:06:47 +0000
Subject: [pkgdb] globus-rsl-assist (Fedora, 10) updated by kevin
Message-ID: <20090427050648.1A82110F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-rsl-assist
kevin has set commit to Approved for provenpackager on globus-rsl-assist (Fedora 10)
kevin has set build to Approved for provenpackager on globus-rsl-assist (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-rsl-assist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl-assist



From pkgdb at fedoraproject.org  Mon Apr 27 05:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:06:48 +0000
Subject: [pkgdb] globus-rsl-assist (Fedora, 9) updated by kevin
Message-ID: <20090427050648.2470110F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-rsl-assist
kevin has set commit to Approved for provenpackager on globus-rsl-assist (Fedora 9)
kevin has set build to Approved for provenpackager on globus-rsl-assist (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-rsl-assist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl-assist



From pkgdb at fedoraproject.org  Mon Apr 27 05:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:06:48 +0000
Subject: [pkgdb] globus-rsl-assist (Fedora EPEL, 5) updated by kevin
Message-ID: <20090427050648.3023510F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-rsl-assist
kevin has set commit to Approved for provenpackager on globus-rsl-assist (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-rsl-assist (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-rsl-assist (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl-assist



From pkgdb at fedoraproject.org  Mon Apr 27 05:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:06:48 +0000
Subject: [pkgdb] globus-rsl-assist (Fedora, 11) updated by kevin
Message-ID: <20090427050648.39DF410F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-rsl-assist
kevin has set commit to Approved for provenpackager on globus-rsl-assist (Fedora 11)
kevin has set build to Approved for provenpackager on globus-rsl-assist (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-rsl-assist (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-rsl-assist



From kevin at fedoraproject.org  Mon Apr 27 05:07:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:07:00 +0000 (UTC)
Subject: rpms/globus-rsl-assist - New directory
Message-ID: <20090427050700.7BA2D70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl-assist
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLd5768/rpms/globus-rsl-assist

Log Message:
Directory /cvs/pkgs/rpms/globus-rsl-assist added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:07:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:07:00 +0000 (UTC)
Subject: rpms/globus-rsl-assist/devel - New directory
Message-ID: <20090427050700.B785F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl-assist/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLd5768/rpms/globus-rsl-assist/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-rsl-assist/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:07:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:07:09 +0000 (UTC)
Subject: rpms/globus-rsl-assist Makefile,NONE,1.1
Message-ID: <20090427050709.8965070110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl-assist
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLd5768/rpms/globus-rsl-assist

Added Files:
	Makefile 
Log Message:
Setup of module globus-rsl-assist


--- NEW FILE Makefile ---
# Top level Makefile for module globus-rsl-assist
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:07:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:07:09 +0000 (UTC)
Subject: rpms/globus-rsl-assist/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090427050709.C99C570110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-rsl-assist/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLd5768/rpms/globus-rsl-assist/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-rsl-assist


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-rsl-assist
# $Id: Makefile,v 1.1 2009/04/27 05:07:09 kevin Exp $
NAME := globus-rsl-assist
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:08:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:08:23 +0000
Subject: [pkgdb] php-ezc-File was added for llaumgui
Message-ID: <20090427050823.1A98C10F893@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-File with summary Provides support for file operations which are not covered by PHP
kevin has approved Package php-ezc-File
kevin has added a Fedora devel branch for php-ezc-File with an owner of llaumgui
kevin has approved php-ezc-File in Fedora devel
kevin has approved Package php-ezc-File
kevin has set commit to Approved for provenpackager on php-ezc-File (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-File (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-File (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-File



From pkgdb at fedoraproject.org  Mon Apr 27 05:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:08:25 +0000
Subject: [pkgdb] php-ezc-File (Fedora, 10) updated by kevin
Message-ID: <20090427050825.4DB5110F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-File
kevin has set commit to Approved for provenpackager on php-ezc-File (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-File (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-File (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-File



From pkgdb at fedoraproject.org  Mon Apr 27 05:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:08:25 +0000
Subject: [pkgdb] php-ezc-File (Fedora, 9) updated by kevin
Message-ID: <20090427050825.55FBB10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-File
kevin has set commit to Approved for provenpackager on php-ezc-File (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-File (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-File (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-File



From kevin at fedoraproject.org  Mon Apr 27 05:08:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:08:38 +0000 (UTC)
Subject: rpms/php-ezc-File - New directory
Message-ID: <20090427050838.2162470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-File
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRB6250/rpms/php-ezc-File

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-File added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:08:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:08:38 +0000 (UTC)
Subject: rpms/php-ezc-File/devel - New directory
Message-ID: <20090427050838.6381970110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-File/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRB6250/rpms/php-ezc-File/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-File/devel added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:08:25 +0000
Subject: [pkgdb] php-ezc-File (Fedora, 11) updated by kevin
Message-ID: <20090427050825.5DC5710F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-File
kevin has set commit to Approved for provenpackager on php-ezc-File (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-File (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-File (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-File



From kevin at fedoraproject.org  Mon Apr 27 05:08:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:08:46 +0000 (UTC)
Subject: rpms/php-ezc-File Makefile,NONE,1.1
Message-ID: <20090427050846.B221570110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-File
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRB6250/rpms/php-ezc-File

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-File


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-File
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:08:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:08:47 +0000 (UTC)
Subject: rpms/php-ezc-File/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427050847.0DCDF70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-File/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRB6250/rpms/php-ezc-File/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-File


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-File
# $Id: Makefile,v 1.1 2009/04/27 05:08:46 kevin Exp $
NAME := php-ezc-File
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:09:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:09:58 +0000
Subject: [pkgdb] php-ezc-Authentication was added for llaumgui
Message-ID: <20090427050958.8865E10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-Authentication with summary Support for different means of identification & authentication
kevin has approved Package php-ezc-Authentication
kevin has added a Fedora devel branch for php-ezc-Authentication with an owner of llaumgui
kevin has approved php-ezc-Authentication in Fedora devel
kevin has approved Package php-ezc-Authentication
kevin has set commit to Approved for provenpackager on php-ezc-Authentication (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-Authentication (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-Authentication (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Authentication



From pkgdb at fedoraproject.org  Mon Apr 27 05:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:10:00 +0000
Subject: [pkgdb] php-ezc-Authentication (Fedora, 10) updated by kevin
Message-ID: <20090427051000.5C7E210F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-Authentication
kevin has set commit to Approved for provenpackager on php-ezc-Authentication (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-Authentication (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-Authentication (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Authentication



From pkgdb at fedoraproject.org  Mon Apr 27 05:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:10:00 +0000
Subject: [pkgdb] php-ezc-Authentication (Fedora, 9) updated by kevin
Message-ID: <20090427051000.6F8F010F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-Authentication
kevin has set commit to Approved for provenpackager on php-ezc-Authentication (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-Authentication (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-Authentication (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Authentication



From pkgdb at fedoraproject.org  Mon Apr 27 05:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:10:00 +0000
Subject: [pkgdb] php-ezc-Authentication (Fedora, 11) updated by kevin
Message-ID: <20090427051000.64F5810F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-Authentication
kevin has set commit to Approved for provenpackager on php-ezc-Authentication (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-Authentication (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-Authentication (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Authentication



From kevin at fedoraproject.org  Mon Apr 27 05:10:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:10:14 +0000 (UTC)
Subject: rpms/php-ezc-Authentication - New directory
Message-ID: <20090427051014.29D6570110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Authentication
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrA6624/rpms/php-ezc-Authentication

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Authentication added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:10:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:10:14 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/devel - New directory
Message-ID: <20090427051014.5F90F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrA6624/rpms/php-ezc-Authentication/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Authentication/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:10:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:10:22 +0000 (UTC)
Subject: rpms/php-ezc-Authentication Makefile,NONE,1.1
Message-ID: <20090427051022.BA7FD70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Authentication
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrA6624/rpms/php-ezc-Authentication

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Authentication


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Authentication
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:10:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:10:22 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090427051022.EC6AD70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrA6624/rpms/php-ezc-Authentication/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Authentication


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Authentication
# $Id: Makefile,v 1.1 2009/04/27 05:10:22 kevin Exp $
NAME := php-ezc-Authentication
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:11:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:11:29 +0000
Subject: [pkgdb] php-ezc-Configuration was added for llaumgui
Message-ID: <20090427051129.645B010F894@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-Configuration with summary Allows you to use configuration files in different formats
kevin has approved Package php-ezc-Configuration
kevin has added a Fedora devel branch for php-ezc-Configuration with an owner of llaumgui
kevin has approved php-ezc-Configuration in Fedora devel
kevin has approved Package php-ezc-Configuration
kevin has set commit to Approved for provenpackager on php-ezc-Configuration (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-Configuration (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-Configuration (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Configuration



From pkgdb at fedoraproject.org  Mon Apr 27 05:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:11:31 +0000
Subject: [pkgdb] php-ezc-Configuration (Fedora, 9) updated by kevin
Message-ID: <20090427051131.A25D210F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-Configuration
kevin has set commit to Approved for provenpackager on php-ezc-Configuration (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-Configuration (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-Configuration (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Configuration



From pkgdb at fedoraproject.org  Mon Apr 27 05:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:11:31 +0000
Subject: [pkgdb] php-ezc-Configuration (Fedora, 10) updated by kevin
Message-ID: <20090427051131.AD0DB10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-Configuration
kevin has set commit to Approved for provenpackager on php-ezc-Configuration (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-Configuration (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-Configuration (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Configuration



From pkgdb at fedoraproject.org  Mon Apr 27 05:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:11:31 +0000
Subject: [pkgdb] php-ezc-Configuration (Fedora, 11) updated by kevin
Message-ID: <20090427051131.B69B810F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-Configuration
kevin has set commit to Approved for provenpackager on php-ezc-Configuration (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-Configuration (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-Configuration (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Configuration



From kevin at fedoraproject.org  Mon Apr 27 05:11:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:11:48 +0000 (UTC)
Subject: rpms/php-ezc-Configuration - New directory
Message-ID: <20090427051148.247D170110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Configuration
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYb7030/rpms/php-ezc-Configuration

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Configuration added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:11:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:11:48 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/devel - New directory
Message-ID: <20090427051148.5B3D970110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Configuration/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYb7030/rpms/php-ezc-Configuration/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Configuration/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:11:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:11:57 +0000 (UTC)
Subject: rpms/php-ezc-Configuration Makefile,NONE,1.1
Message-ID: <20090427051157.C8F9D70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Configuration
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYb7030/rpms/php-ezc-Configuration

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Configuration


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Configuration
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:11:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:11:58 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090427051158.255C970110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Configuration/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYb7030/rpms/php-ezc-Configuration/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Configuration


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Configuration
# $Id: Makefile,v 1.1 2009/04/27 05:11:57 kevin Exp $
NAME := php-ezc-Configuration
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:13:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:13:57 +0000
Subject: [pkgdb] php-ezc-Database was added for llaumgui
Message-ID: <20090427051357.CB16510F881@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-Database with summary A lightweight database layer on top of PHP's PDO
kevin has approved Package php-ezc-Database
kevin has added a Fedora devel branch for php-ezc-Database with an owner of llaumgui
kevin has approved php-ezc-Database in Fedora devel
kevin has approved Package php-ezc-Database
kevin has set commit to Approved for provenpackager on php-ezc-Database (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-Database (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-Database (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Database



From pkgdb at fedoraproject.org  Mon Apr 27 05:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:14:03 +0000
Subject: [pkgdb] php-ezc-Database (Fedora, 10) updated by kevin
Message-ID: <20090427051403.9FE0810F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-Database
kevin has set commit to Approved for provenpackager on php-ezc-Database (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-Database (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-Database (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Database



From pkgdb at fedoraproject.org  Mon Apr 27 05:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:14:03 +0000
Subject: [pkgdb] php-ezc-Database (Fedora, 9) updated by kevin
Message-ID: <20090427051403.C5B6110F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-Database
kevin has set commit to Approved for provenpackager on php-ezc-Database (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-Database (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-Database (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Database



From pkgdb at fedoraproject.org  Mon Apr 27 05:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:14:03 +0000
Subject: [pkgdb] php-ezc-Database (Fedora, 11) updated by kevin
Message-ID: <20090427051403.ACB2710F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-Database
kevin has set commit to Approved for provenpackager on php-ezc-Database (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-Database (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-Database (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Database



From kevin at fedoraproject.org  Mon Apr 27 05:14:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:14:13 +0000 (UTC)
Subject: rpms/php-ezc-Database - New directory
Message-ID: <20090427051413.22CB670110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Database
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSQ7470/rpms/php-ezc-Database

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Database added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:14:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:14:13 +0000 (UTC)
Subject: rpms/php-ezc-Database/devel - New directory
Message-ID: <20090427051413.5B1D070110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Database/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSQ7470/rpms/php-ezc-Database/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Database/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:14:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:14:21 +0000 (UTC)
Subject: rpms/php-ezc-Database Makefile,NONE,1.1
Message-ID: <20090427051421.8793570110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Database
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSQ7470/rpms/php-ezc-Database

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Database


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Database
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:14:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:14:21 +0000 (UTC)
Subject: rpms/php-ezc-Database/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427051421.B97D870110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Database/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSQ7470/rpms/php-ezc-Database/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Database


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Database
# $Id: Makefile,v 1.1 2009/04/27 05:14:21 kevin Exp $
NAME := php-ezc-Database
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:15:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:15:17 +0000
Subject: [pkgdb] php-ezc-EventLog was added for llaumgui
Message-ID: <20090427051518.8162D10F895@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-EventLog with summary Allows you to log events or audit trails
kevin has approved Package php-ezc-EventLog
kevin has added a Fedora devel branch for php-ezc-EventLog with an owner of llaumgui
kevin has approved php-ezc-EventLog in Fedora devel
kevin has approved Package php-ezc-EventLog
kevin has set commit to Approved for provenpackager on php-ezc-EventLog (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-EventLog (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-EventLog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLog



From pkgdb at fedoraproject.org  Mon Apr 27 05:15:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:15:20 +0000
Subject: [pkgdb] php-ezc-EventLog (Fedora, 10) updated by kevin
Message-ID: <20090427051520.973F210F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-EventLog
kevin has set commit to Approved for provenpackager on php-ezc-EventLog (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-EventLog (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-EventLog (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLog



From pkgdb at fedoraproject.org  Mon Apr 27 05:15:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:15:20 +0000
Subject: [pkgdb] php-ezc-EventLog (Fedora, 11) updated by kevin
Message-ID: <20090427051520.ADC4210F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-EventLog
kevin has set commit to Approved for provenpackager on php-ezc-EventLog (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-EventLog (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-EventLog (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLog



From kevin at fedoraproject.org  Mon Apr 27 05:15:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:15:33 +0000 (UTC)
Subject: rpms/php-ezc-EventLog - New directory
Message-ID: <20090427051533.2405C70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgm7784/rpms/php-ezc-EventLog

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-EventLog added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:15:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:15:20 +0000
Subject: [pkgdb] php-ezc-EventLog (Fedora, 9) updated by kevin
Message-ID: <20090427051521.29A5410F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-EventLog
kevin has set commit to Approved for provenpackager on php-ezc-EventLog (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-EventLog (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-EventLog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLog



From kevin at fedoraproject.org  Mon Apr 27 05:15:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:15:33 +0000 (UTC)
Subject: rpms/php-ezc-EventLog/devel - New directory
Message-ID: <20090427051533.5E71370110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgm7784/rpms/php-ezc-EventLog/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-EventLog/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:15:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:15:42 +0000 (UTC)
Subject: rpms/php-ezc-EventLog Makefile,NONE,1.1
Message-ID: <20090427051542.0D1E370110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgm7784/rpms/php-ezc-EventLog

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-EventLog


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-EventLog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:15:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:15:42 +0000 (UTC)
Subject: rpms/php-ezc-EventLog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427051542.47A5970110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgm7784/rpms/php-ezc-EventLog/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-EventLog


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-EventLog
# $Id: Makefile,v 1.1 2009/04/27 05:15:42 kevin Exp $
NAME := php-ezc-EventLog
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:16:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:16:32 +0000
Subject: [pkgdb] backintime was added for cassmodiah
Message-ID: <20090427051632.838EE10F897@bastion2.fedora.phx.redhat.com>

kevin has added Package backintime with summary Simple backup system
kevin has approved Package backintime
kevin has added a Fedora devel branch for backintime with an owner of cassmodiah
kevin has approved backintime in Fedora devel
kevin has approved Package backintime
kevin has set commit to Approved for provenpackager on backintime (Fedora devel)
kevin has set build to Approved for provenpackager on backintime (Fedora devel)
kevin has set checkout to Approved for provenpackager on backintime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From pkgdb at fedoraproject.org  Mon Apr 27 05:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:16:34 +0000
Subject: [pkgdb] backintime (Fedora, 10) updated by kevin
Message-ID: <20090427051634.327B210F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for backintime
kevin has set commit to Approved for provenpackager on backintime (Fedora 10)
kevin has set build to Approved for provenpackager on backintime (Fedora 10)
kevin has set checkout to Approved for provenpackager on backintime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From pkgdb at fedoraproject.org  Mon Apr 27 05:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:16:34 +0000
Subject: [pkgdb] backintime (Fedora, 11) updated by kevin
Message-ID: <20090427051634.5069310F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for backintime
kevin has set commit to Approved for provenpackager on backintime (Fedora 11)
kevin has set build to Approved for provenpackager on backintime (Fedora 11)
kevin has set checkout to Approved for provenpackager on backintime (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From kevin at fedoraproject.org  Mon Apr 27 05:16:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:16:43 +0000 (UTC)
Subject: rpms/backintime - New directory
Message-ID: <20090427051643.2CF0770110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backintime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFm8123/rpms/backintime

Log Message:
Directory /cvs/pkgs/rpms/backintime added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:16:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:16:43 +0000 (UTC)
Subject: rpms/backintime/devel - New directory
Message-ID: <20090427051643.64D3D70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backintime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFm8123/rpms/backintime/devel

Log Message:
Directory /cvs/pkgs/rpms/backintime/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:16:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:16:52 +0000 (UTC)
Subject: rpms/backintime Makefile,NONE,1.1
Message-ID: <20090427051652.ADE5C70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backintime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFm8123/rpms/backintime

Added Files:
	Makefile 
Log Message:
Setup of module backintime


--- NEW FILE Makefile ---
# Top level Makefile for module backintime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:16:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:16:53 +0000 (UTC)
Subject: rpms/backintime/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427051653.38C9670110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backintime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFm8123/rpms/backintime/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module backintime


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: backintime
# $Id: Makefile,v 1.1 2009/04/27 05:16:53 kevin Exp $
NAME := backintime
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:17:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:17:35 +0000
Subject: [pkgdb] qt-creator (Fedora, 9) updated by kevin
Message-ID: <20090427051735.A1C3210F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for qt-creator
kevin has set commit to Approved for provenpackager on qt-creator (Fedora 9)
kevin has set build to Approved for provenpackager on qt-creator (Fedora 9)
kevin has set checkout to Approved for provenpackager on qt-creator (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qt-creator



From pkgdb at fedoraproject.org  Mon Apr 27 05:17:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:17:35 +0000
Subject: [pkgdb] qt-creator (Fedora, 10) updated by kevin
Message-ID: <20090427051735.BD06710F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for qt-creator
kevin has set commit to Approved for provenpackager on qt-creator (Fedora 10)
kevin has set build to Approved for provenpackager on qt-creator (Fedora 10)
kevin has set checkout to Approved for provenpackager on qt-creator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qt-creator



From pkgdb at fedoraproject.org  Mon Apr 27 05:18:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:18:41 +0000
Subject: [pkgdb] minicomputer was added for oget
Message-ID: <20090427051841.E121910F881@bastion2.fedora.phx.redhat.com>

kevin has added Package minicomputer with summary Software Synthesizer
kevin has approved Package minicomputer
kevin has added a Fedora devel branch for minicomputer with an owner of oget
kevin has approved minicomputer in Fedora devel
kevin has approved Package minicomputer
kevin has set commit to Approved for provenpackager on minicomputer (Fedora devel)
kevin has set build to Approved for provenpackager on minicomputer (Fedora devel)
kevin has set checkout to Approved for provenpackager on minicomputer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicomputer



From pkgdb at fedoraproject.org  Mon Apr 27 05:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:18:45 +0000
Subject: [pkgdb] minicomputer (Fedora, 10) updated by kevin
Message-ID: <20090427051845.EDB6310F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for minicomputer
kevin has set commit to Approved for provenpackager on minicomputer (Fedora 10)
kevin has set build to Approved for provenpackager on minicomputer (Fedora 10)
kevin has set checkout to Approved for provenpackager on minicomputer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicomputer



From kevin at fedoraproject.org  Mon Apr 27 05:19:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:19:02 +0000 (UTC)
Subject: rpms/minicomputer - New directory
Message-ID: <20090427051902.24E2470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/minicomputer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRf8601/rpms/minicomputer

Log Message:
Directory /cvs/pkgs/rpms/minicomputer added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:18:45 +0000
Subject: [pkgdb] minicomputer (Fedora, 9) updated by kevin
Message-ID: <20090427051846.02F5910F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for minicomputer
kevin has set commit to Approved for provenpackager on minicomputer (Fedora 9)
kevin has set build to Approved for provenpackager on minicomputer (Fedora 9)
kevin has set checkout to Approved for provenpackager on minicomputer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicomputer



From kevin at fedoraproject.org  Mon Apr 27 05:19:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:19:02 +0000 (UTC)
Subject: rpms/minicomputer/devel - New directory
Message-ID: <20090427051902.6723470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/minicomputer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRf8601/rpms/minicomputer/devel

Log Message:
Directory /cvs/pkgs/rpms/minicomputer/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:19:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:19:11 +0000 (UTC)
Subject: rpms/minicomputer Makefile,NONE,1.1
Message-ID: <20090427051911.2148F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/minicomputer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRf8601/rpms/minicomputer

Added Files:
	Makefile 
Log Message:
Setup of module minicomputer


--- NEW FILE Makefile ---
# Top level Makefile for module minicomputer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:19:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:19:11 +0000 (UTC)
Subject: rpms/minicomputer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427051911.6472470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/minicomputer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRf8601/rpms/minicomputer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module minicomputer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: minicomputer
# $Id: Makefile,v 1.1 2009/04/27 05:19:11 kevin Exp $
NAME := minicomputer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:18:45 +0000
Subject: [pkgdb] minicomputer (Fedora, 11) updated by kevin
Message-ID: <20090427051846.0E39210F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for minicomputer
kevin has set commit to Approved for provenpackager on minicomputer (Fedora 11)
kevin has set build to Approved for provenpackager on minicomputer (Fedora 11)
kevin has set checkout to Approved for provenpackager on minicomputer (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicomputer



From pkgdb at fedoraproject.org  Mon Apr 27 05:21:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:21:20 +0000
Subject: [pkgdb] jjack was added for oget
Message-ID: <20090427052120.6709F10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package jjack with summary JACK audio driver for the Java Sound API
kevin has approved Package jjack
kevin has added a Fedora devel branch for jjack with an owner of oget
kevin has approved jjack in Fedora devel
kevin has approved Package jjack
kevin has set commit to Approved for provenpackager on jjack (Fedora devel)
kevin has set build to Approved for provenpackager on jjack (Fedora devel)
kevin has set checkout to Approved for provenpackager on jjack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jjack



From pkgdb at fedoraproject.org  Mon Apr 27 05:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:21:27 +0000
Subject: [pkgdb] jjack (Fedora, 10) updated by kevin
Message-ID: <20090427052127.AC69310F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jjack
kevin has set commit to Approved for provenpackager on jjack (Fedora 10)
kevin has set build to Approved for provenpackager on jjack (Fedora 10)
kevin has set checkout to Approved for provenpackager on jjack (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jjack



From pkgdb at fedoraproject.org  Mon Apr 27 05:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:21:27 +0000
Subject: [pkgdb] jjack (Fedora, 11) updated by kevin
Message-ID: <20090427052127.B6B8410F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jjack
kevin has set commit to Approved for provenpackager on jjack (Fedora 11)
kevin has set build to Approved for provenpackager on jjack (Fedora 11)
kevin has set checkout to Approved for provenpackager on jjack (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jjack



From kevin at fedoraproject.org  Mon Apr 27 05:21:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:21:37 +0000 (UTC)
Subject: rpms/jjack - New directory
Message-ID: <20090427052137.286E170110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jjack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIB9116/rpms/jjack

Log Message:
Directory /cvs/pkgs/rpms/jjack added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:21:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:21:37 +0000 (UTC)
Subject: rpms/jjack/devel - New directory
Message-ID: <20090427052137.5FA1370110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jjack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIB9116/rpms/jjack/devel

Log Message:
Directory /cvs/pkgs/rpms/jjack/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:21:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:21:45 +0000 (UTC)
Subject: rpms/jjack Makefile,NONE,1.1
Message-ID: <20090427052145.EEEC370110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jjack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIB9116/rpms/jjack

Added Files:
	Makefile 
Log Message:
Setup of module jjack


--- NEW FILE Makefile ---
# Top level Makefile for module jjack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:21:46 +0000 (UTC)
Subject: rpms/jjack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090427052146.54CA370110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jjack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIB9116/rpms/jjack/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jjack


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jjack
# $Id: Makefile,v 1.1 2009/04/27 05:21:46 kevin Exp $
NAME := jjack
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:21:27 +0000
Subject: [pkgdb] jjack (Fedora, 9) updated by kevin
Message-ID: <20090427052127.C486D10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for jjack
kevin has set commit to Approved for provenpackager on jjack (Fedora 9)
kevin has set build to Approved for provenpackager on jjack (Fedora 9)
kevin has set checkout to Approved for provenpackager on jjack (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jjack



From pkgdb at fedoraproject.org  Mon Apr 27 05:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:23:16 +0000
Subject: [pkgdb] camcardsync was added for grof
Message-ID: <20090427052316.E706310F881@bastion2.fedora.phx.redhat.com>

kevin has added Package camcardsync with summary tool for copying photos from a camera card
kevin has approved Package camcardsync
kevin has added a Fedora devel branch for camcardsync with an owner of grof
kevin has approved camcardsync in Fedora devel
kevin has approved Package camcardsync
kevin has set commit to Approved for provenpackager on camcardsync (Fedora devel)
kevin has set build to Approved for provenpackager on camcardsync (Fedora devel)
kevin has set checkout to Approved for provenpackager on camcardsync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/camcardsync



From pkgdb at fedoraproject.org  Mon Apr 27 05:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:23:18 +0000
Subject: [pkgdb] camcardsync (Fedora, 10) updated by kevin
Message-ID: <20090427052318.BEA9910F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for camcardsync
kevin has set commit to Approved for provenpackager on camcardsync (Fedora 10)
kevin has set build to Approved for provenpackager on camcardsync (Fedora 10)
kevin has set checkout to Approved for provenpackager on camcardsync (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/camcardsync



From pkgdb at fedoraproject.org  Mon Apr 27 05:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:23:18 +0000
Subject: [pkgdb] camcardsync (Fedora, 9) updated by kevin
Message-ID: <20090427052318.C754E10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for camcardsync
kevin has set commit to Approved for provenpackager on camcardsync (Fedora 9)
kevin has set build to Approved for provenpackager on camcardsync (Fedora 9)
kevin has set checkout to Approved for provenpackager on camcardsync (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/camcardsync



From pkgdb at fedoraproject.org  Mon Apr 27 05:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:23:18 +0000
Subject: [pkgdb] camcardsync (Fedora, 11) updated by kevin
Message-ID: <20090427052319.76E8C10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for camcardsync
kevin has set commit to Approved for provenpackager on camcardsync (Fedora 11)
kevin has set build to Approved for provenpackager on camcardsync (Fedora 11)
kevin has set checkout to Approved for provenpackager on camcardsync (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/camcardsync



From kevin at fedoraproject.org  Mon Apr 27 05:23:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:23:31 +0000 (UTC)
Subject: rpms/camcardsync - New directory
Message-ID: <20090427052331.26A7C70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/camcardsync
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM10264/rpms/camcardsync

Log Message:
Directory /cvs/pkgs/rpms/camcardsync added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:23:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:23:31 +0000 (UTC)
Subject: rpms/camcardsync/devel - New directory
Message-ID: <20090427052331.6F2FF70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/camcardsync/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM10264/rpms/camcardsync/devel

Log Message:
Directory /cvs/pkgs/rpms/camcardsync/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:23:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:23:41 +0000 (UTC)
Subject: rpms/camcardsync Makefile,NONE,1.1
Message-ID: <20090427052341.0E88670110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/camcardsync
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM10264/rpms/camcardsync

Added Files:
	Makefile 
Log Message:
Setup of module camcardsync


--- NEW FILE Makefile ---
# Top level Makefile for module camcardsync
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:23:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:23:41 +0000 (UTC)
Subject: rpms/camcardsync/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427052341.7E58770110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/camcardsync/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM10264/rpms/camcardsync/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module camcardsync


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: camcardsync
# $Id: Makefile,v 1.1 2009/04/27 05:23:41 kevin Exp $
NAME := camcardsync
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:24:36 +0000
Subject: [pkgdb] lv2-swh-plugins was added for oget
Message-ID: <20090427052436.E85E410F893@bastion2.fedora.phx.redhat.com>

kevin has added Package lv2-swh-plugins with summary LV2 ports of LADSPA swh plugins
kevin has approved Package lv2-swh-plugins
kevin has added a Fedora devel branch for lv2-swh-plugins with an owner of oget
kevin has approved lv2-swh-plugins in Fedora devel
kevin has approved Package lv2-swh-plugins
kevin has set commit to Approved for provenpackager on lv2-swh-plugins (Fedora devel)
kevin has set build to Approved for provenpackager on lv2-swh-plugins (Fedora devel)
kevin has set checkout to Approved for provenpackager on lv2-swh-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-swh-plugins



From pkgdb at fedoraproject.org  Mon Apr 27 05:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:24:39 +0000
Subject: [pkgdb] lv2-swh-plugins (Fedora, 10) updated by kevin
Message-ID: <20090427052439.A64D610F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lv2-swh-plugins
kevin has set commit to Approved for provenpackager on lv2-swh-plugins (Fedora 10)
kevin has set build to Approved for provenpackager on lv2-swh-plugins (Fedora 10)
kevin has set checkout to Approved for provenpackager on lv2-swh-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-swh-plugins



From pkgdb at fedoraproject.org  Mon Apr 27 05:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:24:39 +0000
Subject: [pkgdb] lv2-swh-plugins (Fedora, 11) updated by kevin
Message-ID: <20090427052439.B010F10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lv2-swh-plugins
kevin has set commit to Approved for provenpackager on lv2-swh-plugins (Fedora 11)
kevin has set build to Approved for provenpackager on lv2-swh-plugins (Fedora 11)
kevin has set checkout to Approved for provenpackager on lv2-swh-plugins (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-swh-plugins



From kevin at fedoraproject.org  Mon Apr 27 05:24:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:24:52 +0000 (UTC)
Subject: rpms/lv2-swh-plugins - New directory
Message-ID: <20090427052452.2B2AA70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-swh-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10605/rpms/lv2-swh-plugins

Log Message:
Directory /cvs/pkgs/rpms/lv2-swh-plugins added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:24:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:24:52 +0000 (UTC)
Subject: rpms/lv2-swh-plugins/devel - New directory
Message-ID: <20090427052452.64CAE70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-swh-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10605/rpms/lv2-swh-plugins/devel

Log Message:
Directory /cvs/pkgs/rpms/lv2-swh-plugins/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:25:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:25:02 +0000 (UTC)
Subject: rpms/lv2-swh-plugins Makefile,NONE,1.1
Message-ID: <20090427052502.2EC0B70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-swh-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10605/rpms/lv2-swh-plugins

Added Files:
	Makefile 
Log Message:
Setup of module lv2-swh-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module lv2-swh-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:25:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:25:02 +0000 (UTC)
Subject: rpms/lv2-swh-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427052502.887C770110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-swh-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10605/rpms/lv2-swh-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lv2-swh-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lv2-swh-plugins
# $Id: Makefile,v 1.1 2009/04/27 05:25:02 kevin Exp $
NAME := lv2-swh-plugins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:25:27 +0000
Subject: [pkgdb] lv2-vocoder-plugins was added for oget
Message-ID: <20090427052527.C880E10F893@bastion2.fedora.phx.redhat.com>

kevin has added Package lv2-vocoder-plugins with summary Add a robotic effect to vocals
kevin has approved Package lv2-vocoder-plugins
kevin has added a Fedora devel branch for lv2-vocoder-plugins with an owner of oget
kevin has approved lv2-vocoder-plugins in Fedora devel
kevin has approved Package lv2-vocoder-plugins
kevin has set commit to Approved for provenpackager on lv2-vocoder-plugins (Fedora devel)
kevin has set build to Approved for provenpackager on lv2-vocoder-plugins (Fedora devel)
kevin has set checkout to Approved for provenpackager on lv2-vocoder-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-vocoder-plugins



From pkgdb at fedoraproject.org  Mon Apr 27 05:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:25:31 +0000
Subject: [pkgdb] lv2-vocoder-plugins (Fedora, 10) updated by kevin
Message-ID: <20090427052531.9192C10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lv2-vocoder-plugins
kevin has set commit to Approved for provenpackager on lv2-vocoder-plugins (Fedora 10)
kevin has set build to Approved for provenpackager on lv2-vocoder-plugins (Fedora 10)
kevin has set checkout to Approved for provenpackager on lv2-vocoder-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-vocoder-plugins



From pkgdb at fedoraproject.org  Mon Apr 27 05:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:25:31 +0000
Subject: [pkgdb] lv2-vocoder-plugins (Fedora, 11) updated by kevin
Message-ID: <20090427052531.9C1BE10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lv2-vocoder-plugins
kevin has set commit to Approved for provenpackager on lv2-vocoder-plugins (Fedora 11)
kevin has set build to Approved for provenpackager on lv2-vocoder-plugins (Fedora 11)
kevin has set checkout to Approved for provenpackager on lv2-vocoder-plugins (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-vocoder-plugins



From kevin at fedoraproject.org  Mon Apr 27 05:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:25:41 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins - New directory
Message-ID: <20090427052541.2852F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10834/rpms/lv2-vocoder-plugins

Log Message:
Directory /cvs/pkgs/rpms/lv2-vocoder-plugins added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:25:41 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins/devel - New directory
Message-ID: <20090427052541.65C6870110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10834/rpms/lv2-vocoder-plugins/devel

Log Message:
Directory /cvs/pkgs/rpms/lv2-vocoder-plugins/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:25:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:25:51 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427052551.ED97970110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10834/rpms/lv2-vocoder-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lv2-vocoder-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lv2-vocoder-plugins
# $Id: Makefile,v 1.1 2009/04/27 05:25:51 kevin Exp $
NAME := lv2-vocoder-plugins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Apr 27 05:25:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:25:51 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins Makefile,NONE,1.1
Message-ID: <20090427052551.6B03C70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10834/rpms/lv2-vocoder-plugins

Added Files:
	Makefile 
Log Message:
Setup of module lv2-vocoder-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module lv2-vocoder-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Apr 27 05:26:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:26:21 +0000
Subject: [pkgdb] lv2-zynadd-plugins was added for oget
Message-ID: <20090427052622.238B110F881@bastion2.fedora.phx.redhat.com>

kevin has added Package lv2-zynadd-plugins with summary LV2 port of the ZynAddSubFX engine
kevin has approved Package lv2-zynadd-plugins
kevin has added a Fedora devel branch for lv2-zynadd-plugins with an owner of oget
kevin has approved lv2-zynadd-plugins in Fedora devel
kevin has approved Package lv2-zynadd-plugins
kevin has set commit to Approved for provenpackager on lv2-zynadd-plugins (Fedora devel)
kevin has set build to Approved for provenpackager on lv2-zynadd-plugins (Fedora devel)
kevin has set checkout to Approved for provenpackager on lv2-zynadd-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-zynadd-plugins



From pkgdb at fedoraproject.org  Mon Apr 27 05:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:26:24 +0000
Subject: [pkgdb] lv2-zynadd-plugins (Fedora, 10) updated by kevin
Message-ID: <20090427052624.D971D10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lv2-zynadd-plugins
kevin has set commit to Approved for provenpackager on lv2-zynadd-plugins (Fedora 10)
kevin has set build to Approved for provenpackager on lv2-zynadd-plugins (Fedora 10)
kevin has set checkout to Approved for provenpackager on lv2-zynadd-plugins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-zynadd-plugins



From kevin at fedoraproject.org  Mon Apr 27 05:26:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:26:35 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins - New directory
Message-ID: <20090427052635.24E9E70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu11089/rpms/lv2-zynadd-plugins

Log Message:
Directory /cvs/pkgs/rpms/lv2-zynadd-plugins added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:26:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:26:35 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins/devel - New directory
Message-ID: <20090427052635.5CE9770110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu11089/rpms/lv2-zynadd-plugins/devel

Log Message:
Directory /cvs/pkgs/rpms/lv2-zynadd-plugins/devel added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:26:24 +0000
Subject: [pkgdb] lv2-zynadd-plugins (Fedora, 11) updated by kevin
Message-ID: <20090427052624.E36CF10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lv2-zynadd-plugins
kevin has set commit to Approved for provenpackager on lv2-zynadd-plugins (Fedora 11)
kevin has set build to Approved for provenpackager on lv2-zynadd-plugins (Fedora 11)
kevin has set checkout to Approved for provenpackager on lv2-zynadd-plugins (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lv2-zynadd-plugins



From kevin at fedoraproject.org  Mon Apr 27 05:26:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:26:44 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins Makefile,NONE,1.1
Message-ID: <20090427052644.5F1E070110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu11089/rpms/lv2-zynadd-plugins

Added Files:
	Makefile 
Log Message:
Setup of module lv2-zynadd-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module lv2-zynadd-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:26:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:26:44 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090427052644.A81E770110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu11089/rpms/lv2-zynadd-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lv2-zynadd-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lv2-zynadd-plugins
# $Id: Makefile,v 1.1 2009/04/27 05:26:44 kevin Exp $
NAME := lv2-zynadd-plugins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:27:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:27:52 +0000
Subject: [pkgdb] bareftp was added for itamarjp
Message-ID: <20090427052752.D859B10F893@bastion2.fedora.phx.redhat.com>

kevin has added Package bareftp with summary File transfer client supporting ftp, ftps and sftp protocols
kevin has approved Package bareftp
kevin has added a Fedora devel branch for bareftp with an owner of itamarjp
kevin has approved bareftp in Fedora devel
kevin has approved Package bareftp
kevin has set commit to Approved for provenpackager on bareftp (Fedora devel)
kevin has set build to Approved for provenpackager on bareftp (Fedora devel)
kevin has set checkout to Approved for provenpackager on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Mon Apr 27 05:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:27:55 +0000
Subject: [pkgdb] bareftp (Fedora, 10) updated by kevin
Message-ID: <20090427052755.B390410F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for bareftp
kevin has set commit to Approved for provenpackager on bareftp (Fedora 10)
kevin has set build to Approved for provenpackager on bareftp (Fedora 10)
kevin has set checkout to Approved for provenpackager on bareftp (Fedora 10)
kevin approved watchbugzilla on bareftp (Fedora 10) for cassmodiah
kevin approved watchcommits on bareftp (Fedora 10) for cassmodiah
kevin approved commit on bareftp (Fedora 10) for cassmodiah
kevin approved build on bareftp (Fedora 10) for cassmodiah
kevin approved approveacls on bareftp (Fedora 10) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Mon Apr 27 05:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:27:55 +0000
Subject: [pkgdb] bareftp (Fedora, 9) updated by kevin
Message-ID: <20090427052755.BBF6C10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for bareftp
kevin has set commit to Approved for provenpackager on bareftp (Fedora 9)
kevin has set build to Approved for provenpackager on bareftp (Fedora 9)
kevin has set checkout to Approved for provenpackager on bareftp (Fedora 9)
kevin approved watchbugzilla on bareftp (Fedora 9) for cassmodiah
kevin approved watchcommits on bareftp (Fedora 9) for cassmodiah
kevin approved commit on bareftp (Fedora 9) for cassmodiah
kevin approved build on bareftp (Fedora 9) for cassmodiah
kevin approved approveacls on bareftp (Fedora 9) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Mon Apr 27 05:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:27:55 +0000
Subject: [pkgdb] bareftp (Fedora, devel) updated by kevin
Message-ID: <20090427052755.D449E10F89E@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on bareftp (Fedora devel) for cassmodiah
kevin approved watchcommits on bareftp (Fedora devel) for cassmodiah
kevin approved commit on bareftp (Fedora devel) for cassmodiah
kevin approved build on bareftp (Fedora devel) for cassmodiah
kevin approved approveacls on bareftp (Fedora devel) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From kevin at fedoraproject.org  Mon Apr 27 05:28:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:28:06 +0000 (UTC)
Subject: rpms/bareftp - New directory
Message-ID: <20090427052806.23ADB70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bareftp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11407/rpms/bareftp

Log Message:
Directory /cvs/pkgs/rpms/bareftp added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:28:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:28:06 +0000 (UTC)
Subject: rpms/bareftp/devel - New directory
Message-ID: <20090427052806.631E470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bareftp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11407/rpms/bareftp/devel

Log Message:
Directory /cvs/pkgs/rpms/bareftp/devel added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:27:55 +0000
Subject: [pkgdb] bareftp (Fedora, 11) updated by kevin
Message-ID: <20090427052755.E26F710F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for bareftp
kevin has set commit to Approved for provenpackager on bareftp (Fedora 11)
kevin has set build to Approved for provenpackager on bareftp (Fedora 11)
kevin has set checkout to Approved for provenpackager on bareftp (Fedora 11)
kevin approved watchbugzilla on bareftp (Fedora 11) for cassmodiah
kevin approved watchcommits on bareftp (Fedora 11) for cassmodiah
kevin approved commit on bareftp (Fedora 11) for cassmodiah
kevin approved build on bareftp (Fedora 11) for cassmodiah
kevin approved approveacls on bareftp (Fedora 11) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From kevin at fedoraproject.org  Mon Apr 27 05:28:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:28:14 +0000 (UTC)
Subject: rpms/bareftp Makefile,NONE,1.1
Message-ID: <20090427052814.DA21F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bareftp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11407/rpms/bareftp

Added Files:
	Makefile 
Log Message:
Setup of module bareftp


--- NEW FILE Makefile ---
# Top level Makefile for module bareftp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:28:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:28:15 +0000 (UTC)
Subject: rpms/bareftp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090427052815.2130770110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bareftp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11407/rpms/bareftp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bareftp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bareftp
# $Id: Makefile,v 1.1 2009/04/27 05:28:15 kevin Exp $
NAME := bareftp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:29:19 +0000
Subject: [pkgdb] rapid-photo-downloader was added for fab
Message-ID: <20090427052920.2204C10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package rapid-photo-downloader with summary Images downloader for external devices
kevin has approved Package rapid-photo-downloader
kevin has added a Fedora devel branch for rapid-photo-downloader with an owner of fab
kevin has approved rapid-photo-downloader in Fedora devel
kevin has approved Package rapid-photo-downloader
kevin has set commit to Approved for provenpackager on rapid-photo-downloader (Fedora devel)
kevin has set build to Approved for provenpackager on rapid-photo-downloader (Fedora devel)
kevin has set checkout to Approved for provenpackager on rapid-photo-downloader (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rapid-photo-downloader



From pkgdb at fedoraproject.org  Mon Apr 27 05:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:29:23 +0000
Subject: [pkgdb] rapid-photo-downloader (Fedora, 9) updated by kevin
Message-ID: <20090427052923.3CE5C10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rapid-photo-downloader
kevin has set commit to Approved for provenpackager on rapid-photo-downloader (Fedora 9)
kevin has set build to Approved for provenpackager on rapid-photo-downloader (Fedora 9)
kevin has set checkout to Approved for provenpackager on rapid-photo-downloader (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rapid-photo-downloader



From pkgdb at fedoraproject.org  Mon Apr 27 05:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:29:23 +0000
Subject: [pkgdb] rapid-photo-downloader (Fedora, 10) updated by kevin
Message-ID: <20090427052923.44E5210F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rapid-photo-downloader
kevin has set commit to Approved for provenpackager on rapid-photo-downloader (Fedora 10)
kevin has set build to Approved for provenpackager on rapid-photo-downloader (Fedora 10)
kevin has set checkout to Approved for provenpackager on rapid-photo-downloader (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rapid-photo-downloader



From pkgdb at fedoraproject.org  Mon Apr 27 05:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:29:23 +0000
Subject: [pkgdb] rapid-photo-downloader (Fedora, 11) updated by kevin
Message-ID: <20090427052923.51C4C10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rapid-photo-downloader
kevin has set commit to Approved for provenpackager on rapid-photo-downloader (Fedora 11)
kevin has set build to Approved for provenpackager on rapid-photo-downloader (Fedora 11)
kevin has set checkout to Approved for provenpackager on rapid-photo-downloader (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rapid-photo-downloader



From kevin at fedoraproject.org  Mon Apr 27 05:29:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:29:32 +0000 (UTC)
Subject: rpms/rapid-photo-downloader - New directory
Message-ID: <20090427052932.2538A70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rapid-photo-downloader
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11727/rpms/rapid-photo-downloader

Log Message:
Directory /cvs/pkgs/rpms/rapid-photo-downloader added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:29:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:29:32 +0000 (UTC)
Subject: rpms/rapid-photo-downloader/devel - New directory
Message-ID: <20090427052932.5CA9F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rapid-photo-downloader/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11727/rpms/rapid-photo-downloader/devel

Log Message:
Directory /cvs/pkgs/rpms/rapid-photo-downloader/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:29:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:29:41 +0000 (UTC)
Subject: rpms/rapid-photo-downloader Makefile,NONE,1.1
Message-ID: <20090427052941.01CF270110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rapid-photo-downloader
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11727/rpms/rapid-photo-downloader

Added Files:
	Makefile 
Log Message:
Setup of module rapid-photo-downloader


--- NEW FILE Makefile ---
# Top level Makefile for module rapid-photo-downloader
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:29:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:29:41 +0000 (UTC)
Subject: rpms/rapid-photo-downloader/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090427052941.843E070110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rapid-photo-downloader/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11727/rpms/rapid-photo-downloader/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rapid-photo-downloader


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rapid-photo-downloader
# $Id: Makefile,v 1.1 2009/04/27 05:29:41 kevin Exp $
NAME := rapid-photo-downloader
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:33:08 +0000
Subject: [pkgdb] guimup was added for th0br0
Message-ID: <20090427053308.4173B10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package guimup with summary A GTKmm based drag-&-drop oriented client for MPD
kevin has approved Package guimup
kevin has added a Fedora devel branch for guimup with an owner of th0br0
kevin has approved guimup in Fedora devel
kevin has approved Package guimup
kevin has set commit to Approved for provenpackager on guimup (Fedora devel)
kevin has set build to Approved for provenpackager on guimup (Fedora devel)
kevin has set checkout to Approved for provenpackager on guimup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guimup



From kevin at fedoraproject.org  Mon Apr 27 05:33:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:33:23 +0000 (UTC)
Subject: rpms/guimup - New directory
Message-ID: <20090427053323.26FA870110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/guimup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm12501/rpms/guimup

Log Message:
Directory /cvs/pkgs/rpms/guimup added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:33:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:33:23 +0000 (UTC)
Subject: rpms/guimup/devel - New directory
Message-ID: <20090427053323.877D470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/guimup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm12501/rpms/guimup/devel

Log Message:
Directory /cvs/pkgs/rpms/guimup/devel added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:33:10 +0000
Subject: [pkgdb] guimup (Fedora, 10) updated by kevin
Message-ID: <20090427053310.5E1CB10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for guimup
kevin has set commit to Approved for provenpackager on guimup (Fedora 10)
kevin has set build to Approved for provenpackager on guimup (Fedora 10)
kevin has set checkout to Approved for provenpackager on guimup (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guimup



From pkgdb at fedoraproject.org  Mon Apr 27 05:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:33:10 +0000
Subject: [pkgdb] guimup (Fedora, 11) updated by kevin
Message-ID: <20090427053310.64AE710F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for guimup
kevin has set commit to Approved for provenpackager on guimup (Fedora 11)
kevin has set build to Approved for provenpackager on guimup (Fedora 11)
kevin has set checkout to Approved for provenpackager on guimup (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guimup



From kevin at fedoraproject.org  Mon Apr 27 05:33:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:33:32 +0000 (UTC)
Subject: rpms/guimup Makefile,NONE,1.1
Message-ID: <20090427053332.B686470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/guimup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm12501/rpms/guimup

Added Files:
	Makefile 
Log Message:
Setup of module guimup


--- NEW FILE Makefile ---
# Top level Makefile for module guimup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:33:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:33:33 +0000 (UTC)
Subject: rpms/guimup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090427053333.040E470110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/guimup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm12501/rpms/guimup/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guimup


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: guimup
# $Id: Makefile,v 1.1 2009/04/27 05:33:32 kevin Exp $
NAME := guimup
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:34:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:34:04 +0000
Subject: [pkgdb] termit was added for cwickert
Message-ID: <20090427053404.7C36310F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package termit with summary Simple terminal emulator based on vte library
kevin has approved Package termit
kevin has added a Fedora devel branch for termit with an owner of cwickert
kevin has approved termit in Fedora devel
kevin has approved Package termit
kevin has set commit to Approved for provenpackager on termit (Fedora devel)
kevin has set build to Approved for provenpackager on termit (Fedora devel)
kevin has set checkout to Approved for provenpackager on termit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/termit



From pkgdb at fedoraproject.org  Mon Apr 27 05:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:34:10 +0000
Subject: [pkgdb] termit (Fedora, 10) updated by kevin
Message-ID: <20090427053411.0A9C510F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for termit
kevin has set commit to Approved for provenpackager on termit (Fedora 10)
kevin has set build to Approved for provenpackager on termit (Fedora 10)
kevin has set checkout to Approved for provenpackager on termit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/termit



From pkgdb at fedoraproject.org  Mon Apr 27 05:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:34:10 +0000
Subject: [pkgdb] termit (Fedora, 11) updated by kevin
Message-ID: <20090427053411.2A1CC10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for termit
kevin has set commit to Approved for provenpackager on termit (Fedora 11)
kevin has set build to Approved for provenpackager on termit (Fedora 11)
kevin has set checkout to Approved for provenpackager on termit (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/termit



From pkgdb at fedoraproject.org  Mon Apr 27 05:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:34:10 +0000
Subject: [pkgdb] termit (Fedora, 9) updated by kevin
Message-ID: <20090427053411.3B5AD10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for termit
kevin has set commit to Approved for provenpackager on termit (Fedora 9)
kevin has set build to Approved for provenpackager on termit (Fedora 9)
kevin has set checkout to Approved for provenpackager on termit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/termit



From kevin at fedoraproject.org  Mon Apr 27 05:34:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:34:21 +0000 (UTC)
Subject: rpms/termit - New directory
Message-ID: <20090427053421.2E8DB70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/termit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12776/rpms/termit

Log Message:
Directory /cvs/pkgs/rpms/termit added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:34:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:34:21 +0000 (UTC)
Subject: rpms/termit/devel - New directory
Message-ID: <20090427053421.6983B70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/termit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12776/rpms/termit/devel

Log Message:
Directory /cvs/pkgs/rpms/termit/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:34:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:34:31 +0000 (UTC)
Subject: rpms/termit Makefile,NONE,1.1
Message-ID: <20090427053431.64F2A70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/termit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12776/rpms/termit

Added Files:
	Makefile 
Log Message:
Setup of module termit


--- NEW FILE Makefile ---
# Top level Makefile for module termit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From corsepiu at fedoraproject.org  Mon Apr 27 05:34:19 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 05:34:19 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/devel .cvsignore, 1.3,
	1.4 perl-Parse-CPAN-Meta.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090427053419.14EA170110@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12690

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2009 01:47:41 -0000	1.3
+++ .cvsignore	27 Apr 2009 05:33:48 -0000	1.4
@@ -1 +1 @@
-Parse-CPAN-Meta-0.04.tar.gz
+Parse-CPAN-Meta-0.05.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Parse-CPAN-Meta.spec	27 Feb 2009 00:18:25 -0000	1.3
+++ perl-Parse-CPAN-Meta.spec	27 Apr 2009 05:33:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        0.04
-Release:        2%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2009 01:47:41 -0000	1.3
+++ sources	27 Apr 2009 05:33:48 -0000	1.4
@@ -1 +1 @@
-93876624d5cb4df9f9c4a51f6381499b  Parse-CPAN-Meta-0.04.tar.gz
+9901187114135db25d2d8c7e181dcf4c  Parse-CPAN-Meta-0.05.tar.gz



From kevin at fedoraproject.org  Mon Apr 27 05:34:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:34:31 +0000 (UTC)
Subject: rpms/termit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090427053431.B3C2B70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/termit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12776/rpms/termit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module termit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: termit
# $Id: Makefile,v 1.1 2009/04/27 05:34:31 kevin Exp $
NAME := termit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:35:06 +0000
Subject: [pkgdb] gxmessage was added for cwickert
Message-ID: <20090427053507.0DE8410F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package gxmessage with summary GTK2 based xmessage clone
kevin has approved Package gxmessage
kevin has added a Fedora devel branch for gxmessage with an owner of cwickert
kevin has approved gxmessage in Fedora devel
kevin has approved Package gxmessage
kevin has set commit to Approved for provenpackager on gxmessage (Fedora devel)
kevin has set build to Approved for provenpackager on gxmessage (Fedora devel)
kevin has set checkout to Approved for provenpackager on gxmessage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gxmessage



From pkgdb at fedoraproject.org  Mon Apr 27 05:35:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:35:14 +0000
Subject: [pkgdb] gxmessage (Fedora, 10) updated by kevin
Message-ID: <20090427053514.D98B910F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gxmessage
kevin has set commit to Approved for provenpackager on gxmessage (Fedora 10)
kevin has set build to Approved for provenpackager on gxmessage (Fedora 10)
kevin has set checkout to Approved for provenpackager on gxmessage (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gxmessage



From pkgdb at fedoraproject.org  Mon Apr 27 05:35:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:35:14 +0000
Subject: [pkgdb] gxmessage (Fedora, 11) updated by kevin
Message-ID: <20090427053515.186F110F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gxmessage
kevin has set commit to Approved for provenpackager on gxmessage (Fedora 11)
kevin has set build to Approved for provenpackager on gxmessage (Fedora 11)
kevin has set checkout to Approved for provenpackager on gxmessage (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gxmessage



From pkgdb at fedoraproject.org  Mon Apr 27 05:35:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:35:14 +0000
Subject: [pkgdb] gxmessage (Fedora, 9) updated by kevin
Message-ID: <20090427053514.F294B10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gxmessage
kevin has set commit to Approved for provenpackager on gxmessage (Fedora 9)
kevin has set build to Approved for provenpackager on gxmessage (Fedora 9)
kevin has set checkout to Approved for provenpackager on gxmessage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gxmessage



From kevin at fedoraproject.org  Mon Apr 27 05:35:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:35:29 +0000 (UTC)
Subject: rpms/gxmessage - New directory
Message-ID: <20090427053529.2ABFC70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gxmessage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13178/rpms/gxmessage

Log Message:
Directory /cvs/pkgs/rpms/gxmessage added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:35:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:35:29 +0000 (UTC)
Subject: rpms/gxmessage/devel - New directory
Message-ID: <20090427053529.D416670110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13178/rpms/gxmessage/devel

Log Message:
Directory /cvs/pkgs/rpms/gxmessage/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:35:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:35:40 +0000 (UTC)
Subject: rpms/gxmessage Makefile,NONE,1.1
Message-ID: <20090427053540.6580570110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gxmessage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13178/rpms/gxmessage

Added Files:
	Makefile 
Log Message:
Setup of module gxmessage


--- NEW FILE Makefile ---
# Top level Makefile for module gxmessage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:35:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:35:40 +0000 (UTC)
Subject: rpms/gxmessage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427053540.B456A70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13178/rpms/gxmessage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gxmessage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gxmessage
# $Id: Makefile,v 1.1 2009/04/27 05:35:40 kevin Exp $
NAME := gxmessage
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:36:33 +0000
Subject: [pkgdb] php-simplepie (Fedora, 9) updated by kevin
Message-ID: <20090427053633.5B6BB10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-simplepie
kevin has set commit to Approved for provenpackager on php-simplepie (Fedora 9)
kevin has set build to Approved for provenpackager on php-simplepie (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-simplepie (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-simplepie



From pkgdb at fedoraproject.org  Mon Apr 27 05:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:36:29 +0000
Subject: [pkgdb] php-simplepie was added for ke4qqq
Message-ID: <20090427053630.3F02610F881@bastion2.fedora.phx.redhat.com>

kevin has added Package php-simplepie with summary Simple RSS Library in PHP
kevin has approved Package php-simplepie
kevin has added a Fedora devel branch for php-simplepie with an owner of ke4qqq
kevin has approved php-simplepie in Fedora devel
kevin has approved Package php-simplepie
kevin has set commit to Approved for provenpackager on php-simplepie (Fedora devel)
kevin has set build to Approved for provenpackager on php-simplepie (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-simplepie (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-simplepie



From pkgdb at fedoraproject.org  Mon Apr 27 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:36:33 +0000
Subject: [pkgdb] php-simplepie (Fedora, 10) updated by kevin
Message-ID: <20090427053633.620FE10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-simplepie
kevin has set commit to Approved for provenpackager on php-simplepie (Fedora 10)
kevin has set build to Approved for provenpackager on php-simplepie (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-simplepie (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-simplepie



From pkgdb at fedoraproject.org  Mon Apr 27 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:36:33 +0000
Subject: [pkgdb] php-simplepie (Fedora EPEL, 5) updated by kevin
Message-ID: <20090427053633.6512410F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-simplepie
kevin has set commit to Approved for provenpackager on php-simplepie (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on php-simplepie (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on php-simplepie (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-simplepie



From pkgdb at fedoraproject.org  Mon Apr 27 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:36:33 +0000
Subject: [pkgdb] php-simplepie (Fedora, 11) updated by kevin
Message-ID: <20090427053633.6F93210F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-simplepie
kevin has set commit to Approved for provenpackager on php-simplepie (Fedora 11)
kevin has set build to Approved for provenpackager on php-simplepie (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-simplepie (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-simplepie



From kevin at fedoraproject.org  Mon Apr 27 05:36:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:36:43 +0000 (UTC)
Subject: rpms/php-simplepie - New directory
Message-ID: <20090427053643.2748170110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-simplepie
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13561/rpms/php-simplepie

Log Message:
Directory /cvs/pkgs/rpms/php-simplepie added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:36:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:36:43 +0000 (UTC)
Subject: rpms/php-simplepie/devel - New directory
Message-ID: <20090427053643.6F2EF70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-simplepie/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13561/rpms/php-simplepie/devel

Log Message:
Directory /cvs/pkgs/rpms/php-simplepie/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:36:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:36:52 +0000 (UTC)
Subject: rpms/php-simplepie Makefile,NONE,1.1
Message-ID: <20090427053652.E869870110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-simplepie
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13561/rpms/php-simplepie

Added Files:
	Makefile 
Log Message:
Setup of module php-simplepie


--- NEW FILE Makefile ---
# Top level Makefile for module php-simplepie
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:36:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:36:53 +0000 (UTC)
Subject: rpms/php-simplepie/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090427053653.31FD270110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-simplepie/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13561/rpms/php-simplepie/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-simplepie


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-simplepie
# $Id: Makefile,v 1.1 2009/04/27 05:36:53 kevin Exp $
NAME := php-simplepie
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:37:37 +0000
Subject: [pkgdb] perl-Crypt-CipherSaber was added for xavierb
Message-ID: <20090427053737.F1BB410F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Crypt-CipherSaber with summary Perl module implementing CipherSaber encryption
kevin has approved Package perl-Crypt-CipherSaber
kevin has added a Fedora devel branch for perl-Crypt-CipherSaber with an owner of xavierb
kevin has approved perl-Crypt-CipherSaber in Fedora devel
kevin has approved Package perl-Crypt-CipherSaber
kevin has set commit to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-CipherSaber



From pkgdb at fedoraproject.org  Mon Apr 27 05:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:37:40 +0000
Subject: [pkgdb] perl-Crypt-CipherSaber (Fedora, 10) updated by kevin
Message-ID: <20090427053740.AFAB210F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Crypt-CipherSaber
kevin has set commit to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 10)
kevin approved watchbugzilla on perl-Crypt-CipherSaber (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Crypt-CipherSaber (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-CipherSaber



From pkgdb at fedoraproject.org  Mon Apr 27 05:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:37:40 +0000
Subject: [pkgdb] perl-Crypt-CipherSaber (Fedora, devel) updated by kevin
Message-ID: <20090427053740.B76AE10F899@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Crypt-CipherSaber (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Crypt-CipherSaber (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-CipherSaber



From pkgdb at fedoraproject.org  Mon Apr 27 05:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:37:40 +0000
Subject: [pkgdb] perl-Crypt-CipherSaber (Fedora, 11) updated by kevin
Message-ID: <20090427053740.BD69A10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Crypt-CipherSaber
kevin has set commit to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 11)
kevin approved watchbugzilla on perl-Crypt-CipherSaber (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Crypt-CipherSaber (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-CipherSaber



From pkgdb at fedoraproject.org  Mon Apr 27 05:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:37:40 +0000
Subject: [pkgdb] perl-Crypt-CipherSaber (Fedora EPEL, 5) updated by kevin
Message-ID: <20090427053740.C5D9910F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Crypt-CipherSaber
kevin has set commit to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora EPEL 5)
kevin approved watchbugzilla on perl-Crypt-CipherSaber (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Crypt-CipherSaber (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-CipherSaber



From kevin at fedoraproject.org  Mon Apr 27 05:37:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:37:57 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber - New directory
Message-ID: <20090427053757.368BE70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13918/rpms/perl-Crypt-CipherSaber

Log Message:
Directory /cvs/pkgs/rpms/perl-Crypt-CipherSaber added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:37:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:37:57 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/devel - New directory
Message-ID: <20090427053757.73E6A70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13918/rpms/perl-Crypt-CipherSaber/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel added to the repository




From kevin at fedoraproject.org  Mon Apr 27 05:38:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:38:06 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber Makefile,NONE,1.1
Message-ID: <20090427053806.5683F70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13918/rpms/perl-Crypt-CipherSaber

Added Files:
	Makefile 
Log Message:
Setup of module perl-Crypt-CipherSaber


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-CipherSaber
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:38:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:38:06 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090427053806.96D5D70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO13918/rpms/perl-Crypt-CipherSaber/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-CipherSaber


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Crypt-CipherSaber
# $Id: Makefile,v 1.1 2009/04/27 05:38:06 kevin Exp $
NAME := perl-Crypt-CipherSaber
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:37:40 +0000
Subject: [pkgdb] perl-Crypt-CipherSaber (Fedora, 9) updated by kevin
Message-ID: <20090427053740.CC7E410F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Crypt-CipherSaber
kevin has set commit to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Crypt-CipherSaber (Fedora 9)
kevin approved watchbugzilla on perl-Crypt-CipherSaber (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Crypt-CipherSaber (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Crypt-CipherSaber



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:35 +0000
Subject: [pkgdb] spawn was added for fab
Message-ID: <20090427053835.DD30810F897@bastion2.fedora.phx.redhat.com>

kevin has added Package spawn with summary Simple tool to run several Linux command-lines in parallel
kevin has approved Package spawn
kevin has added a Fedora devel branch for spawn with an owner of fab
kevin has approved spawn in Fedora devel
kevin has approved Package spawn
kevin has set commit to Approved for provenpackager on spawn (Fedora devel)
kevin has set build to Approved for provenpackager on spawn (Fedora devel)
kevin has set checkout to Approved for provenpackager on spawn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spawn



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:39 +0000
Subject: [pkgdb] spawn (Fedora, 10) updated by kevin
Message-ID: <20090427053839.69C3410F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for spawn
kevin has set commit to Approved for provenpackager on spawn (Fedora 10)
kevin has set build to Approved for provenpackager on spawn (Fedora 10)
kevin has set checkout to Approved for provenpackager on spawn (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spawn



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:39 +0000
Subject: [pkgdb] spawn (Fedora, 11) updated by kevin
Message-ID: <20090427053839.715DE10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for spawn
kevin has set commit to Approved for provenpackager on spawn (Fedora 11)
kevin has set build to Approved for provenpackager on spawn (Fedora 11)
kevin has set checkout to Approved for provenpackager on spawn (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spawn



From kevin at fedoraproject.org  Mon Apr 27 05:38:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:38:49 +0000 (UTC)
Subject: rpms/spawn - New directory
Message-ID: <20090427053849.26C4670110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa14239/rpms/spawn

Log Message:
Directory /cvs/pkgs/rpms/spawn added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:39 +0000
Subject: [pkgdb] spawn (Fedora, 9) updated by kevin
Message-ID: <20090427053839.77AC910F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for spawn
kevin has set commit to Approved for provenpackager on spawn (Fedora 9)
kevin has set build to Approved for provenpackager on spawn (Fedora 9)
kevin has set checkout to Approved for provenpackager on spawn (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spawn



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:48 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchbugzilla
Message-ID: <20090427053848.C922F10F8A3@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From kevin at fedoraproject.org  Mon Apr 27 05:38:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:38:49 +0000 (UTC)
Subject: rpms/spawn/devel - New directory
Message-ID: <20090427053849.5A66B70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa14239/rpms/spawn/devel

Log Message:
Directory /cvs/pkgs/rpms/spawn/devel added to the repository




From pkgdb at fedoraproject.org  Mon Apr 27 05:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:49 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchcommits
Message-ID: <20090427053849.6A21F10F8A9@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Parse-CPAN-Meta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:52 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested commit
Message-ID: <20090427053852.DC41210F8AE@bastion2.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-Parse-CPAN-Meta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:53 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested approveacls
Message-ID: <20090427053853.477D410F8B2@bastion2.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-Parse-CPAN-Meta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From kevin at fedoraproject.org  Mon Apr 27 05:39:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:39:00 +0000 (UTC)
Subject: rpms/spawn Makefile,NONE,1.1
Message-ID: <20090427053900.1963670110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa14239/rpms/spawn

Added Files:
	Makefile 
Log Message:
Setup of module spawn


--- NEW FILE Makefile ---
# Top level Makefile for module spawn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Apr 27 05:39:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 27 Apr 2009 05:39:00 +0000 (UTC)
Subject: rpms/spawn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090427053900.5AAEB70110@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/spawn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa14239/rpms/spawn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spawn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: spawn
# $Id: Makefile,v 1.1 2009/04/27 05:39:00 kevin Exp $
NAME := spawn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:55 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchcommits
Message-ID: <20090427053855.B3B1310F8B3@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Parse-CPAN-Meta (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:01 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested approveacls
Message-ID: <20090427053901.807DB10F8B8@bastion2.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-Parse-CPAN-Meta (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:38:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:38:59 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchbugzilla
Message-ID: <20090427053902.759F310F8BA@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:02 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested commit
Message-ID: <20090427053902.E450510F8BD@bastion2.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-Parse-CPAN-Meta (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:08 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchcommits
Message-ID: <20090427053908.52E0110F89D@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Parse-CPAN-Meta (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:11 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested commit
Message-ID: <20090427053911.DD6D310F8C5@bastion2.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-Parse-CPAN-Meta (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:13 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchcommits
Message-ID: <20090427053913.F3FFA10F8C6@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-Parse-CPAN-Meta (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:14 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchbugzilla
Message-ID: <20090427053915.2920010F8C8@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:15 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested commit
Message-ID: <20090427053915.79BE210F8CB@bastion2.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-Parse-CPAN-Meta (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:18 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested approveacls
Message-ID: <20090427053918.6493E10F8A0@bastion2.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-Parse-CPAN-Meta (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From corsepiu at fedoraproject.org  Mon Apr 27 05:41:37 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 05:41:37 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/F-11 .cvsignore, 1.3,
	1.4 perl-Parse-CPAN-Meta.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090427054137.F0D3370110@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14706

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2009 01:47:41 -0000	1.3
+++ .cvsignore	27 Apr 2009 05:41:07 -0000	1.4
@@ -1 +1 @@
-Parse-CPAN-Meta-0.04.tar.gz
+Parse-CPAN-Meta-0.05.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-11/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Parse-CPAN-Meta.spec	27 Feb 2009 00:18:25 -0000	1.3
+++ perl-Parse-CPAN-Meta.spec	27 Apr 2009 05:41:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        0.04
-Release:        2%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2009 01:47:41 -0000	1.3
+++ sources	27 Apr 2009 05:41:07 -0000	1.4
@@ -1 +1 @@
-93876624d5cb4df9f9c4a51f6381499b  Parse-CPAN-Meta-0.04.tar.gz
+9901187114135db25d2d8c7e181dcf4c  Parse-CPAN-Meta-0.05.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:11 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested approveacls
Message-ID: <20090427053911.77EFF10F8BE@bastion2.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-Parse-CPAN-Meta (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From pkgdb at fedoraproject.org  Mon Apr 27 05:39:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 05:39:11 +0000
Subject: [pkgdb] perl-Parse-CPAN-Meta: corsepiu has requested watchbugzilla
Message-ID: <20090427053911.84CC910F8C1@bastion2.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-Parse-CPAN-Meta (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-CPAN-Meta



From dtardon at fedoraproject.org  Mon Apr 27 05:52:19 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 05:52:19 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch,
	NONE, 1.1 openoffice.org.spec, 1.1726, 1.1727
Message-ID: <20090427055219.B6F1970110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16036

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 
Log Message:
Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch

openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch ---
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 270524)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
@@ -1028,7 +1027,11 @@
 		<xsl:param name="minLabelWidth"/>
 		<xsl:param name="listIndent" />
 
-
+        <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
+            "The <text:list-header> element represents a list header and is a special kind of list item. It
+            contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
+            like list items but they do not have a preceding number or bullet." -->
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
 		<xsl:variable name="listIndentNew">
 			<xsl:choose>
 				<xsl:when test="$listIndent">
@@ -1046,13 +1049,16 @@
 		<xsl:variable name="itemNumberNew">
 			<xsl:if test="$listStyle/text:list-level-style-number">
 				<xsl:choose>
+                    <xsl:when test="$isListHeader">0</xsl:when>
 					<xsl:when test="$isEmptyList">
 						<!--  An empty list item (no text:h/text:p as child), will not count as item and does not increment the count.  -->
 						<xsl:variable name="tempItemNumber">
 							<xsl:choose>
 								<!-- siblings will be incremented by one -->
 								<xsl:when test="$itemNumber">
-									<xsl:value-of select="$itemNumber + 1"/>
+                                    <xsl:if test="not($isListHeader)">
+                                        <xsl:value-of select="$itemNumber + 1"/>
+                                    </xsl:if>
 								</xsl:when>
 								<!-- if a higher list level had content the numbering starts with 1 -->
 								<xsl:when test="$isListNumberingReset and $listLevel &gt; 1">
@@ -1132,6 +1138,7 @@
 							<xsl:when test="$display">
 								<xsl:value-of select="$display"/>
 							</xsl:when>
+                            <xsl:when test="$isListHeader">0</xsl:when>
 							<xsl:otherwise>1</xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
@@ -1144,9 +1151,10 @@
 		</xsl:variable>
 		<xsl:element name="li">
 			<xsl:choose>
-				<xsl:when test="$isEmptyList">
+				<xsl:when test="$isEmptyList or $isListHeader">
 					<xsl:apply-templates>
 						<xsl:with-param name="globalData" select="$globalData"/>
+                        <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
 						<xsl:with-param name="listLevel" select="$listLevel + 1"/>
 						<xsl:with-param name="listStyleName" select="$listStyleName"/>
@@ -1181,7 +1189,7 @@
 					<xsl:apply-templates mode="first-list-child-margin-adaption" select="*[1]">
 						<xsl:with-param name="globalData" select="$globalData"/>
 						<xsl:with-param name="isEmptyList" select="$isEmptyList"/>
-						<xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
+						<xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
 						<!-- The new created label is given to the children -->
 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
 						<xsl:with-param name="listLabelElement" select="$listLabelElement"/>
@@ -1225,7 +1233,7 @@
 
 
 	<!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
-	but have to be reused on following item/headers with no text:start-value -->
+	but have to be reused on following items with no text:start-value -->
 	<xsl:template name="getItemNumber">
 		<xsl:param name="listLevel"/>
 		<xsl:param name="listLevelStyle"/>
@@ -1261,6 +1269,9 @@
 			the level 3 gets a 'pseudoLevel' -->
 		<xsl:param name="pseudoLevel" select="0" />
 
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
 		<!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
 		<xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
 		<xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
@@ -1293,7 +1304,7 @@
 								<xsl:when test="$currentListLevel &lt; $listLevel">
 									<xsl:choose>
 										<!-- if it has content the counting is ended -->
-										<xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
+										<xsl:when test="not($isEmptyList or $isListHeader)">
 											<!-- 2DO: Perhaps the children still have to be processed -->
 											<xsl:value-of select="$itemNumber + $pseudoLevel"/>
 										</xsl:when>
@@ -1348,7 +1359,7 @@
 										<xsl:with-param name="pseudoLevel">
 											<xsl:choose>
 												<!-- empty list item does not count -->
-												<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+												<xsl:when test="$isEmptyList or $isListHeader">
 													<xsl:value-of select="$pseudoLevel"/>
 												</xsl:when>
 												<xsl:otherwise>1</xsl:otherwise>
@@ -1381,11 +1392,14 @@
 		<xsl:param name="precedingListItemsOfSameStyleCount"/>
 		<xsl:param name="pseudoLevel" />
 
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
 		<xsl:choose>
 			<xsl:when test="@text:start-value">
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+					<xsl:when test="$isEmptyList or $isListHeader">
+						<!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1407,8 +1421,8 @@
 			</xsl:when>
 			<xsl:when test="$listLevelStyle/@text:start-value">
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+                    <xsl:when test="$isEmptyList or $isListHeader">
+                        <!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1430,8 +1444,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+                    <xsl:when test="$isEmptyList or $isListHeader">
+                        <!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1911,4 +1925,4 @@
 
 	<xsl:template match="math:annotation" mode="math"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -r1.1726 -r1.1727
--- openoffice.org.spec	21 Apr 2009 08:08:05 -0000	1.1726
+++ openoffice.org.spec	27 Apr 2009 05:51:48 -0000	1.1727
@@ -147,6 +147,7 @@
 Patch74: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch75: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 Patch76: openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
+Patch77: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1417,6 +1418,7 @@
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch76 -p1 -b .oooXXXXX.sfx2.badexception.patch
+%patch77 -p1 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3787,6 +3789,7 @@
 - Resolves: rhbz#494643 EMF polypolygons issue
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 - Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
+- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 * Mon Mar 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch



From dtardon at fedoraproject.org  Mon Apr 27 05:56:27 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 05:56:27 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 openoffice.org.spec,1.1727,1.1728
Message-ID: <20090427055627.77FA770110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17371

Modified Files:
	openoffice.org.spec 
Log Message:
Related: rhbz#484177. Grr, I messed %patch again...


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1727
retrieving revision 1.1728
diff -u -r1.1727 -r1.1728
--- openoffice.org.spec	27 Apr 2009 05:51:48 -0000	1.1727
+++ openoffice.org.spec	27 Apr 2009 05:55:56 -0000	1.1728
@@ -1418,7 +1418,7 @@
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch76 -p1 -b .oooXXXXX.sfx2.badexception.patch
-%patch77 -p1 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch77 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From llaumgui at fedoraproject.org  Mon Apr 27 05:57:54 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 05:57:54 +0000 (UTC)
Subject: rpms/php-ezc-File/devel import.log, NONE, 1.1 php-ezc-File.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427055754.79C9570110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-File/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17522/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-File.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-File-1_2-2_fc10:HEAD:php-ezc-File-1.2-2.fc10.src.rpm:1240811754


--- NEW FILE php-ezc-File.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File
%define channel components.ez.no

Name:           php-ezc-File
Version:        1.2
Release:        2%{?dist}
Summary:        Provides support for file operations which are not covered by PHP

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.4
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides support for file operations which are not covered by PHP or are just
missing.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/file_autoload.php


%changelog
* Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-2
- Fix requires

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:08:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 05:57:23 -0000	1.2
@@ -0,0 +1 @@
+File-1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:08:46 -0000	1.1
+++ sources	27 Apr 2009 05:57:24 -0000	1.2
@@ -0,0 +1 @@
+36ff7eeb3699b2bf36ccf9b64c224154  File-1.2.tgz



From dtardon at fedoraproject.org  Mon Apr 27 05:59:25 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 05:59:25 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch,
	NONE, 1.1 openoffice.org.spec, 1.1898, 1.1899
Message-ID: <20090427055925.1612770110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17996

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 
Log Message:
Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch

openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch ---
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 270524)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
@@ -1028,7 +1027,11 @@
 		<xsl:param name="minLabelWidth"/>
 		<xsl:param name="listIndent" />
 
-
+        <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
+            "The <text:list-header> element represents a list header and is a special kind of list item. It
+            contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
+            like list items but they do not have a preceding number or bullet." -->
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
 		<xsl:variable name="listIndentNew">
 			<xsl:choose>
 				<xsl:when test="$listIndent">
@@ -1046,13 +1049,16 @@
 		<xsl:variable name="itemNumberNew">
 			<xsl:if test="$listStyle/text:list-level-style-number">
 				<xsl:choose>
+                    <xsl:when test="$isListHeader">0</xsl:when>
 					<xsl:when test="$isEmptyList">
 						<!--  An empty list item (no text:h/text:p as child), will not count as item and does not increment the count.  -->
 						<xsl:variable name="tempItemNumber">
 							<xsl:choose>
 								<!-- siblings will be incremented by one -->
 								<xsl:when test="$itemNumber">
-									<xsl:value-of select="$itemNumber + 1"/>
+                                    <xsl:if test="not($isListHeader)">
+                                        <xsl:value-of select="$itemNumber + 1"/>
+                                    </xsl:if>
 								</xsl:when>
 								<!-- if a higher list level had content the numbering starts with 1 -->
 								<xsl:when test="$isListNumberingReset and $listLevel &gt; 1">
@@ -1132,6 +1138,7 @@
 							<xsl:when test="$display">
 								<xsl:value-of select="$display"/>
 							</xsl:when>
+                            <xsl:when test="$isListHeader">0</xsl:when>
 							<xsl:otherwise>1</xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
@@ -1144,9 +1151,10 @@
 		</xsl:variable>
 		<xsl:element name="li">
 			<xsl:choose>
-				<xsl:when test="$isEmptyList">
+				<xsl:when test="$isEmptyList or $isListHeader">
 					<xsl:apply-templates>
 						<xsl:with-param name="globalData" select="$globalData"/>
+                        <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
 						<xsl:with-param name="listLevel" select="$listLevel + 1"/>
 						<xsl:with-param name="listStyleName" select="$listStyleName"/>
@@ -1181,7 +1189,7 @@
 					<xsl:apply-templates mode="first-list-child-margin-adaption" select="*[1]">
 						<xsl:with-param name="globalData" select="$globalData"/>
 						<xsl:with-param name="isEmptyList" select="$isEmptyList"/>
-						<xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
+						<xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
 						<!-- The new created label is given to the children -->
 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
 						<xsl:with-param name="listLabelElement" select="$listLabelElement"/>
@@ -1225,7 +1233,7 @@
 
 
 	<!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
-	but have to be reused on following item/headers with no text:start-value -->
+	but have to be reused on following items with no text:start-value -->
 	<xsl:template name="getItemNumber">
 		<xsl:param name="listLevel"/>
 		<xsl:param name="listLevelStyle"/>
@@ -1261,6 +1269,9 @@
 			the level 3 gets a 'pseudoLevel' -->
 		<xsl:param name="pseudoLevel" select="0" />
 
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
 		<!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
 		<xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
 		<xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
@@ -1293,7 +1304,7 @@
 								<xsl:when test="$currentListLevel &lt; $listLevel">
 									<xsl:choose>
 										<!-- if it has content the counting is ended -->
-										<xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
+										<xsl:when test="not($isEmptyList or $isListHeader)">
 											<!-- 2DO: Perhaps the children still have to be processed -->
 											<xsl:value-of select="$itemNumber + $pseudoLevel"/>
 										</xsl:when>
@@ -1348,7 +1359,7 @@
 										<xsl:with-param name="pseudoLevel">
 											<xsl:choose>
 												<!-- empty list item does not count -->
-												<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+												<xsl:when test="$isEmptyList or $isListHeader">
 													<xsl:value-of select="$pseudoLevel"/>
 												</xsl:when>
 												<xsl:otherwise>1</xsl:otherwise>
@@ -1381,11 +1392,14 @@
 		<xsl:param name="precedingListItemsOfSameStyleCount"/>
 		<xsl:param name="pseudoLevel" />
 
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
 		<xsl:choose>
 			<xsl:when test="@text:start-value">
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+					<xsl:when test="$isEmptyList or $isListHeader">
+						<!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1407,8 +1421,8 @@
 			</xsl:when>
 			<xsl:when test="$listLevelStyle/@text:start-value">
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+                    <xsl:when test="$isEmptyList or $isListHeader">
+                        <!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1430,8 +1444,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+                    <xsl:when test="$isEmptyList or $isListHeader">
+                        <!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1911,4 +1925,4 @@
 
 	<xsl:template match="math:annotation" mode="math"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- openoffice.org.spec	24 Apr 2009 16:46:01 -0000	1.1898
+++ openoffice.org.spec	27 Apr 2009 05:58:54 -0000	1.1899
@@ -135,6 +135,7 @@
 Patch60: workspace.slideshow1.patch
 Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p2 -b .workspace.slideshow1.patch
 %patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
+%patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4128,6 +4130,7 @@
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
+- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From llaumgui at fedoraproject.org  Mon Apr 27 06:00:13 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:00:13 +0000 (UTC)
Subject: rpms/php-ezc-File/F-9 import.log, NONE, 1.1 php-ezc-File.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427060013.43FCE70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-File/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18096/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-File.spec 
Log Message:
Initial import branch F9



--- NEW FILE import.log ---
php-ezc-File-1_2-2_fc10:F-9:php-ezc-File-1.2-2.fc10.src.rpm:1240811919


--- NEW FILE php-ezc-File.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File
%define channel components.ez.no

Name:           php-ezc-File
Version:        1.2
Release:        2%{?dist}
Summary:        Provides support for file operations which are not covered by PHP

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.4
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides support for file operations which are not covered by PHP or are just
missing.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/file_autoload.php


%changelog
* Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-2
- Fix requires

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:08:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 05:59:42 -0000	1.2
@@ -0,0 +1 @@
+File-1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:08:46 -0000	1.1
+++ sources	27 Apr 2009 05:59:42 -0000	1.2
@@ -0,0 +1 @@
+36ff7eeb3699b2bf36ccf9b64c224154  File-1.2.tgz



From dtardon at fedoraproject.org  Mon Apr 27 06:03:05 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 06:03:05 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch,
	NONE, 1.1 openoffice.org.spec, 1.1899, 1.1900
Message-ID: <20090427060305.C93EC70110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18706

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 
Log Message:
Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch

openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch ---
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 270524)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
@@ -1028,7 +1027,11 @@
 		<xsl:param name="minLabelWidth"/>
 		<xsl:param name="listIndent" />
 
-
+        <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
+            "The <text:list-header> element represents a list header and is a special kind of list item. It
+            contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
+            like list items but they do not have a preceding number or bullet." -->
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
 		<xsl:variable name="listIndentNew">
 			<xsl:choose>
 				<xsl:when test="$listIndent">
@@ -1046,13 +1049,16 @@
 		<xsl:variable name="itemNumberNew">
 			<xsl:if test="$listStyle/text:list-level-style-number">
 				<xsl:choose>
+                    <xsl:when test="$isListHeader">0</xsl:when>
 					<xsl:when test="$isEmptyList">
 						<!--  An empty list item (no text:h/text:p as child), will not count as item and does not increment the count.  -->
 						<xsl:variable name="tempItemNumber">
 							<xsl:choose>
 								<!-- siblings will be incremented by one -->
 								<xsl:when test="$itemNumber">
-									<xsl:value-of select="$itemNumber + 1"/>
+                                    <xsl:if test="not($isListHeader)">
+                                        <xsl:value-of select="$itemNumber + 1"/>
+                                    </xsl:if>
 								</xsl:when>
 								<!-- if a higher list level had content the numbering starts with 1 -->
 								<xsl:when test="$isListNumberingReset and $listLevel &gt; 1">
@@ -1132,6 +1138,7 @@
 							<xsl:when test="$display">
 								<xsl:value-of select="$display"/>
 							</xsl:when>
+                            <xsl:when test="$isListHeader">0</xsl:when>
 							<xsl:otherwise>1</xsl:otherwise>
 						</xsl:choose>
 					</xsl:with-param>
@@ -1144,9 +1151,10 @@
 		</xsl:variable>
 		<xsl:element name="li">
 			<xsl:choose>
-				<xsl:when test="$isEmptyList">
+				<xsl:when test="$isEmptyList or $isListHeader">
 					<xsl:apply-templates>
 						<xsl:with-param name="globalData" select="$globalData"/>
+                        <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
 						<xsl:with-param name="listLevel" select="$listLevel + 1"/>
 						<xsl:with-param name="listStyleName" select="$listStyleName"/>
@@ -1181,7 +1189,7 @@
 					<xsl:apply-templates mode="first-list-child-margin-adaption" select="*[1]">
 						<xsl:with-param name="globalData" select="$globalData"/>
 						<xsl:with-param name="isEmptyList" select="$isEmptyList"/>
-						<xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
+						<xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
 						<!-- The new created label is given to the children -->
 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
 						<xsl:with-param name="listLabelElement" select="$listLabelElement"/>
@@ -1225,7 +1233,7 @@
 
 
 	<!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
-	but have to be reused on following item/headers with no text:start-value -->
+	but have to be reused on following items with no text:start-value -->
 	<xsl:template name="getItemNumber">
 		<xsl:param name="listLevel"/>
 		<xsl:param name="listLevelStyle"/>
@@ -1261,6 +1269,9 @@
 			the level 3 gets a 'pseudoLevel' -->
 		<xsl:param name="pseudoLevel" select="0" />
 
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
 		<!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
 		<xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
 		<xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
@@ -1293,7 +1304,7 @@
 								<xsl:when test="$currentListLevel &lt; $listLevel">
 									<xsl:choose>
 										<!-- if it has content the counting is ended -->
-										<xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
+										<xsl:when test="not($isEmptyList or $isListHeader)">
 											<!-- 2DO: Perhaps the children still have to be processed -->
 											<xsl:value-of select="$itemNumber + $pseudoLevel"/>
 										</xsl:when>
@@ -1348,7 +1359,7 @@
 										<xsl:with-param name="pseudoLevel">
 											<xsl:choose>
 												<!-- empty list item does not count -->
-												<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+												<xsl:when test="$isEmptyList or $isListHeader">
 													<xsl:value-of select="$pseudoLevel"/>
 												</xsl:when>
 												<xsl:otherwise>1</xsl:otherwise>
@@ -1381,11 +1392,14 @@
 		<xsl:param name="precedingListItemsOfSameStyleCount"/>
 		<xsl:param name="pseudoLevel" />
 
+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
+
 		<xsl:choose>
 			<xsl:when test="@text:start-value">
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+					<xsl:when test="$isEmptyList or $isListHeader">
+						<!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1407,8 +1421,8 @@
 			</xsl:when>
 			<xsl:when test="$listLevelStyle/@text:start-value">
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+                    <xsl:when test="$isEmptyList or $isListHeader">
+                        <!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1430,8 +1444,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
-					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-						<!-- empty list item does not count -->
+                    <xsl:when test="$isEmptyList or $isListHeader">
+                        <!-- empty list item does not count. neither does list header -->
 						<xsl:call-template name="countListItemTillStartValue">
 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
@@ -1911,4 +1925,4 @@
 
 	<xsl:template match="math:annotation" mode="math"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1899
retrieving revision 1.1900
diff -u -r1.1899 -r1.1900
--- openoffice.org.spec	24 Apr 2009 16:46:02 -0000	1.1899
+++ openoffice.org.spec	27 Apr 2009 06:02:35 -0000	1.1900
@@ -135,6 +135,7 @@
 Patch60: workspace.slideshow1.patch
 Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p2 -b .workspace.slideshow1.patch
 %patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
+%patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4128,6 +4130,7 @@
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
+- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From llaumgui at fedoraproject.org  Mon Apr 27 06:03:27 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:03:27 +0000 (UTC)
Subject: rpms/php-ezc-File/F-10 import.log, NONE, 1.1 php-ezc-File.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427060327.5D7AC70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-File/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18768/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-File.spec 
Log Message:
Initial import branch F10 



--- NEW FILE import.log ---
php-ezc-File-1_2-2_fc10:F-10:php-ezc-File-1.2-2.fc10.src.rpm:1240812112


--- NEW FILE php-ezc-File.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File
%define channel components.ez.no

Name:           php-ezc-File
Version:        1.2
Release:        2%{?dist}
Summary:        Provides support for file operations which are not covered by PHP

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.4
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides support for file operations which are not covered by PHP or are just
missing.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/file_autoload.php


%changelog
* Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-2
- Fix requires

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:08:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:02:57 -0000	1.2
@@ -0,0 +1 @@
+File-1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:08:46 -0000	1.1
+++ sources	27 Apr 2009 06:02:57 -0000	1.2
@@ -0,0 +1 @@
+36ff7eeb3699b2bf36ccf9b64c224154  File-1.2.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 06:04:15 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:04:15 +0000 (UTC)
Subject: rpms/php-ezc-File/F-11 import.log, NONE, 1.1 php-ezc-File.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427060415.6811D70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-File/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19010/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-File.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-File-1_2-2_fc10:F-11:php-ezc-File-1.2-2.fc10.src.rpm:1240812190


--- NEW FILE php-ezc-File.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File
%define channel components.ez.no

Name:           php-ezc-File
Version:        1.2
Release:        2%{?dist}
Summary:        Provides support for file operations which are not covered by PHP

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.4
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides support for file operations which are not covered by PHP or are just
missing.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/file_autoload.php


%changelog
* Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-2
- Fix requires

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:08:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:03:45 -0000	1.2
@@ -0,0 +1 @@
+File-1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-File/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:08:46 -0000	1.1
+++ sources	27 Apr 2009 06:03:45 -0000	1.2
@@ -0,0 +1 @@
+36ff7eeb3699b2bf36ccf9b64c224154  File-1.2.tgz



From mclasen at fedoraproject.org  Mon Apr 27 06:10:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:10:06 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.271,1.272
Message-ID: <20090427061006.936A470110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19994

Modified Files:
	nautilus.spec 
Log Message:
Don't drop schemas translations 



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- nautilus.spec	16 Apr 2009 08:48:21 -0000	1.271
+++ nautilus.spec	27 Apr 2009 06:09:36 -0000	1.272
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -147,7 +147,7 @@
 
 # strip unneeded translations from .mo files
 cd po
-grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -167,8 +167,6 @@
 ## (uncomment when we patch the source to look in the right place)
 ## /bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/nautilus/patterns
 
-# make sure desktop files validate by ignoring sr at Latn
-perl -pi -e 's/sr\@Latn/sp/g' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 # desktop-file-install can't handle empty OnlyShowIn correctly
 perl -pi -e 's/OnlyShowIn=;/OnlyShowIn=GNOME;/' $RPM_BUILD_ROOT%{_datadir}/applications/nautilus-folder-default-handler.desktop
 
@@ -265,6 +263,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.2-3
+- Don't drop schemas translations from po files anymore
+
 * Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
 - Fix whitespace on the right in icon view when zooming
 



From corsepiu at fedoraproject.org  Mon Apr 27 06:11:52 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 06:11:52 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/F-10 .cvsignore, 1.2,
	1.3 perl-Parse-CPAN-Meta.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090427061152.4B21070110@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20440

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 May 2008 23:00:51 -0000	1.2
+++ .cvsignore	27 Apr 2009 06:11:21 -0000	1.3
@@ -1 +1 @@
-Parse-CPAN-Meta-0.03.tar.gz
+Parse-CPAN-Meta-0.05.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-10/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Parse-CPAN-Meta.spec	19 May 2008 23:00:51 -0000	1.1
+++ perl-Parse-CPAN-Meta.spec	27 Apr 2009 06:11:21 -0000	1.2
@@ -1,15 +1,15 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        0.03
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Parse-CPAN-Meta/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Parse-CPAN-Meta-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/Parse-CPAN-Meta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More) >= 0.47
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,11 +41,20 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README
+%doc Changes
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
+- Upstream update.
+
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 0.04-1
+- Update to 0.04.
+- Update Source0 URL.
+- Add version to Test::More dep.
+- LICENSE and README went away.
+
 * Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.03-1
 - Specfile autogenerated by cpanspec 1.75.
 - BR Test::More.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 May 2008 23:00:51 -0000	1.2
+++ sources	27 Apr 2009 06:11:21 -0000	1.3
@@ -1 +1 @@
-6085074818ee8242b15a099c0339defa  Parse-CPAN-Meta-0.03.tar.gz
+9901187114135db25d2d8c7e181dcf4c  Parse-CPAN-Meta-0.05.tar.gz



From llaumgui at fedoraproject.org  Mon Apr 27 06:12:55 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:12:55 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/devel import.log, NONE,
	1.1 php-ezc-Authentication.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427061255.05A3A70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20788/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Authentication.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-Authentication-1_2_3-1_fc10:HEAD:php-ezc-Authentication-1.2.3-1.fc10.src.rpm:1240812674


--- NEW FILE php-ezc-Authentication.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Authentication
%define channel components.ez.no

Name:           php-ezc-Authentication
Version:        1.2.3
Release:        1%{?dist}
Summary:        Support for different means of identification and authentication

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:10:22 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:12:24 -0000	1.2
@@ -0,0 +1 @@
+Authentication-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:10:22 -0000	1.1
+++ sources	27 Apr 2009 06:12:24 -0000	1.2
@@ -0,0 +1 @@
+a736fac4611c5d8e495fb7d8831b4fa8  Authentication-1.2.3.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 06:13:03 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:13:03 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/F-9 import.log, NONE,
	1.1 php-ezc-Authentication.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427061303.3CE3470110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20864/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Authentication.spec 
Log Message:
Initial import branch F9



--- NEW FILE import.log ---
php-ezc-Authentication-1_2_3-1_fc10:F-9:php-ezc-Authentication-1.2.3-1.fc10.src.rpm:1240812685


--- NEW FILE php-ezc-Authentication.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Authentication
%define channel components.ez.no

Name:           php-ezc-Authentication
Version:        1.2.3
Release:        1%{?dist}
Summary:        Support for different means of identification and authentication

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:10:22 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:12:32 -0000	1.2
@@ -0,0 +1 @@
+Authentication-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:10:22 -0000	1.1
+++ sources	27 Apr 2009 06:12:33 -0000	1.2
@@ -0,0 +1 @@
+a736fac4611c5d8e495fb7d8831b4fa8  Authentication-1.2.3.tgz



From mclasen at fedoraproject.org  Mon Apr 27 06:13:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:13:26 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.191,1.192
Message-ID: <20090427061326.00A1F70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21130

Modified Files:
	gedit.spec 
Log Message:
don't drop schemas translations



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gedit.spec	13 Apr 2009 17:13:39 -0000	1.191
+++ gedit.spec	27 Apr 2009 06:12:55 -0000	1.192
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.26.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -123,14 +123,14 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
   msgmerge $p %{name}.pot > $p.out
   msgfmt -o `basename $p .po`.gmo $p.out
 done
-
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
+- Don't drop schemas translations from po files
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gedit/2.26/gedit-2.26.1.news



From llaumgui at fedoraproject.org  Mon Apr 27 06:13:40 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:13:40 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/F-10 import.log, NONE,
	1.1 php-ezc-Authentication.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427061340.EB4ED70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21158/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Authentication.spec 
Log Message:
Initial import branch F10



--- NEW FILE import.log ---
php-ezc-Authentication-1_2_3-1_fc10:F-10:php-ezc-Authentication-1.2.3-1.fc10.src.rpm:1240812723


--- NEW FILE php-ezc-Authentication.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Authentication
%define channel components.ez.no

Name:           php-ezc-Authentication
Version:        1.2.3
Release:        1%{?dist}
Summary:        Support for different means of identification and authentication

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:10:22 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:13:10 -0000	1.2
@@ -0,0 +1 @@
+Authentication-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:10:22 -0000	1.1
+++ sources	27 Apr 2009 06:13:10 -0000	1.2
@@ -0,0 +1 @@
+a736fac4611c5d8e495fb7d8831b4fa8  Authentication-1.2.3.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 06:14:24 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:14:24 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/F-11 import.log, NONE,
	1.1 php-ezc-Authentication.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427061424.83A8170110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21363/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Authentication.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-Authentication-1_2_3-1_fc10:F-11:php-ezc-Authentication-1.2.3-1.fc10.src.rpm:1240812738


--- NEW FILE php-ezc-Authentication.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Authentication
%define channel components.ez.no

Name:           php-ezc-Authentication
Version:        1.2.3
Release:        1%{?dist}
Summary:        Support for different means of identification and authentication

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:10:22 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:13:54 -0000	1.2
@@ -0,0 +1 @@
+Authentication-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:10:22 -0000	1.1
+++ sources	27 Apr 2009 06:13:54 -0000	1.2
@@ -0,0 +1 @@
+a736fac4611c5d8e495fb7d8831b4fa8  Authentication-1.2.3.tgz



From corsepiu at fedoraproject.org  Mon Apr 27 06:15:10 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 27 Apr 2009 06:15:10 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/F-9 .cvsignore, 1.2,
	1.3 perl-Parse-CPAN-Meta.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090427061510.BB85870110@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21652

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2008 14:02:01 -0000	1.2
+++ .cvsignore	27 Apr 2009 06:14:40 -0000	1.3
@@ -1 +1 @@
-Parse-CPAN-Meta-0.03.tar.gz
+Parse-CPAN-Meta-0.05.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-9/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Parse-CPAN-Meta.spec	20 May 2008 14:05:56 -0000	1.1
+++ perl-Parse-CPAN-Meta.spec	27 Apr 2009 06:14:40 -0000	1.2
@@ -1,15 +1,15 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        0.03
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Parse-CPAN-Meta/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Parse-CPAN-Meta-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/Parse-CPAN-Meta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More) >= 0.47
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,11 +41,20 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README
+%doc Changes
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2009 Ralf Cors??pius <corsepiu at fedoraproject> - 0.05-1
+- Upstream update.
+
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 0.04-1
+- Update to 0.04.
+- Update Source0 URL.
+- Add version to Test::More dep.
+- LICENSE and README went away.
+
 * Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.03-1
 - Specfile autogenerated by cpanspec 1.75.
 - BR Test::More.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2008 14:02:01 -0000	1.2
+++ sources	27 Apr 2009 06:14:40 -0000	1.3
@@ -1 +1 @@
-6085074818ee8242b15a099c0339defa  Parse-CPAN-Meta-0.03.tar.gz
+9901187114135db25d2d8c7e181dcf4c  Parse-CPAN-Meta-0.05.tar.gz



From mclasen at fedoraproject.org  Mon Apr 27 06:15:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:15:39 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.226,1.227
Message-ID: <20090427061539.933AF70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21734

Modified Files:
	epiphany.spec 
Log Message:
Don't drop schemas translations



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- epiphany.spec	13 Apr 2009 04:53:24 -0000	1.226
+++ epiphany.spec	27 Apr 2009 06:15:08 -0000	1.227
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.26
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -130,7 +130,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -255,6 +255,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Don't drop schemas translations from po files
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/epiphany/2.26/epiphany-2.26.1.changes



From mclasen at fedoraproject.org  Mon Apr 27 06:18:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:18:52 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.382,1.383
Message-ID: <20090427061852.7833B70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22280

Modified Files:
	evolution.spec 
Log Message:
don't drop schemas translations



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- evolution.spec	15 Apr 2009 15:05:41 -0000	1.382
+++ evolution.spec	27 Apr 2009 06:18:21 -0000	1.383
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.26.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -322,7 +322,7 @@
 # Strip unneeded translations from .mo files.
 # This reduces the RPM size by several megabytes.
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -691,6 +691,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2.fc11
+- Don't drop schemas translations from po files
+
 * Wed Apr 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.1.1-1.fc11
 - Update to 2.26.1.1
 - Remove patch for GNOME bug #578685 (fixed upstream).



From mclasen at fedoraproject.org  Mon Apr 27 06:19:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:19:53 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.465,1.466
Message-ID: <20090427061953.9072970110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22385

Modified Files:
	gdm.spec 
Log Message:
don't drop schemas translations



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- gdm.spec	24 Apr 2009 15:35:47 -0000	1.465
+++ gdm.spec	27 Apr 2009 06:19:23 -0000	1.466
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -169,7 +169,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -382,6 +382,9 @@
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-4
+- Don't drop schemas translations from po files
+
 * Fri Apr 24 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-3
 - Add Requires for pam modules in plugins
 



From mclasen at fedoraproject.org  Mon Apr 27 06:20:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:20:58 +0000 (UTC)
Subject: rpms/glade3/devel glade3.spec,1.26,1.27
Message-ID: <20090427062058.4854370110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22558

Modified Files:
	glade3.spec 
Log Message:
don't drop schemas translations



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- glade3.spec	17 Apr 2009 19:17:25 -0000	1.26
+++ glade3.spec	27 Apr 2009 06:20:28 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.6.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
@@ -87,7 +87,7 @@
 # http://bugzilla.gnome.org/474987
 pushd ./po
   grep --invert-match \
-    ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" \
+    ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" \
     POTFILES.in > POTFILES.keep
   mv POTFILES.keep POTFILES.in
   intltool-update --pot
@@ -193,6 +193,9 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 3.6.2-2
+- Don't drop schemas translations from po files
+
 * Fri Apr 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.6.2-1
 - Version bump to 3.6.2.
   * Fixed missing properties/attributes when serializing a GtkWindow. (GNOME



From mclasen at fedoraproject.org  Mon Apr 27 06:22:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:22:25 +0000 (UTC)
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.337,1.338
Message-ID: <20090427062225.67D4C70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22705

Modified Files:
	gnome-applets.spec 
Log Message:
don;t drop schemas translations



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- gnome-applets.spec	15 Apr 2009 23:14:43 -0000	1.337
+++ gnome-applets.spec	27 Apr 2009 06:21:54 -0000	1.338
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.26.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -176,7 +176,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 # some files go missing due to our modemlights surgery
 grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
 mv POTFILES.keep2 POTFILES.in
@@ -342,6 +342,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-3
+- Don't drop schemas translations from po files
+
 * Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
 - Make gweather network status tracking work
 



From llaumgui at fedoraproject.org  Mon Apr 27 06:23:23 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:23:23 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/devel import.log, NONE,
	1.1 php-ezc-Configuration.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427062323.E6ADF70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23403/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Configuration.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-Configuration-1_3_2-1_fc10:HEAD:php-ezc-Configuration-1.3.2-1.fc10.src.rpm:1240813330


--- NEW FILE php-ezc-Configuration.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Configuration
%define channel components.ez.no

Name:           php-ezc-Configuration
Version:        1.3.2
Release:        1%{?dist}
Summary:        A component that allows you to use configuration files in different formats

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A component that allows you to use configuration files in different formats.
The formats include the standard .ini file, and an array based format.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/configuration_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:11:57 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:22:53 -0000	1.2
@@ -0,0 +1 @@
+Configuration-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:11:57 -0000	1.1
+++ sources	27 Apr 2009 06:22:53 -0000	1.2
@@ -0,0 +1 @@
+e588fc7317e45674998d42d064ae731a  Configuration-1.3.2.tgz



From mclasen at fedoraproject.org  Mon Apr 27 06:23:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:23:34 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.205,1.206
Message-ID: <20090427062334.AA6BD70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23385

Modified Files:
	gnome-games.spec 
Log Message:
don't drop schemas translations



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- gnome-games.spec	14 Apr 2009 05:11:49 -0000	1.205
+++ gnome-games.spec	27 Apr 2009 06:23:04 -0000	1.206
@@ -44,7 +44,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -144,7 +144,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -355,6 +355,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-2
+- don't drop schemas translations from po files
+
 * Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-games/2.26/gnome-games-2.26.1.news



From llaumgui at fedoraproject.org  Mon Apr 27 06:23:34 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:23:34 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/F-9 import.log, NONE,
	1.1 php-ezc-Configuration.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427062334.C7C5E70129@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23426/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Configuration.spec 
Log Message:
Initial import branch F9



--- NEW FILE import.log ---
php-ezc-Configuration-1_3_2-1_fc10:F-9:php-ezc-Configuration-1.3.2-1.fc10.src.rpm:1240813336


--- NEW FILE php-ezc-Configuration.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Configuration
%define channel components.ez.no

Name:           php-ezc-Configuration
Version:        1.3.2
Release:        1%{?dist}
Summary:        A component that allows you to use configuration files in different formats

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A component that allows you to use configuration files in different formats.
The formats include the standard .ini file, and an array based format.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/configuration_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:11:57 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:23:04 -0000	1.2
@@ -0,0 +1 @@
+Configuration-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:11:57 -0000	1.1
+++ sources	27 Apr 2009 06:23:04 -0000	1.2
@@ -0,0 +1 @@
+e588fc7317e45674998d42d064ae731a  Configuration-1.3.2.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 06:23:39 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:23:39 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/F-10 import.log, NONE,
	1.1 php-ezc-Configuration.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427062339.F256670110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23446/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Configuration.spec 
Log Message:
Initial import branch F10



--- NEW FILE import.log ---
php-ezc-Configuration-1_3_2-1_fc10:F-10:php-ezc-Configuration-1.3.2-1.fc10.src.rpm:1240813343


--- NEW FILE php-ezc-Configuration.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Configuration
%define channel components.ez.no

Name:           php-ezc-Configuration
Version:        1.3.2
Release:        1%{?dist}
Summary:        A component that allows you to use configuration files in different formats

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A component that allows you to use configuration files in different formats.
The formats include the standard .ini file, and an array based format.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/configuration_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:11:57 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:23:08 -0000	1.2
@@ -0,0 +1 @@
+Configuration-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:11:57 -0000	1.1
+++ sources	27 Apr 2009 06:23:09 -0000	1.2
@@ -0,0 +1 @@
+e588fc7317e45674998d42d064ae731a  Configuration-1.3.2.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 06:23:57 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 06:23:57 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/F-11 import.log, NONE,
	1.1 php-ezc-Configuration.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427062357.84C6170110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23606/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Configuration.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-Configuration-1_3_2-1_fc10:F-11:php-ezc-Configuration-1.3.2-1.fc10.src.rpm:1240813349


--- NEW FILE php-ezc-Configuration.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Configuration
%define channel components.ez.no

Name:           php-ezc-Configuration
Version:        1.3.2
Release:        1%{?dist}
Summary:        A component that allows you to use configuration files in different formats

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A component that allows you to use configuration files in different formats.
The formats include the standard .ini file, and an array based format.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/configuration_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:11:57 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:23:27 -0000	1.2
@@ -0,0 +1 @@
+Configuration-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:11:57 -0000	1.1
+++ sources	27 Apr 2009 06:23:27 -0000	1.2
@@ -0,0 +1 @@
+e588fc7317e45674998d42d064ae731a  Configuration-1.3.2.tgz



From mclasen at fedoraproject.org  Mon Apr 27 06:24:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:24:40 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.166,1.167
Message-ID: <20090427062440.03AFD7013C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23871

Modified Files:
	gnome-media.spec 
Log Message:
don't drop schemas translations



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-media.spec	17 Mar 2009 01:55:24 -0000	1.166
+++ gnome-media.spec	27 Apr 2009 06:24:09 -0000	1.167
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
@@ -95,7 +95,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$\|.*[.]schemas[.]in[.]$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -256,6 +256,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Don't drop schemas translations from po files
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From dtardon at fedoraproject.org  Mon Apr 27 06:24:58 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 06:24:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	1.2, 1.3
Message-ID: <20090427062458.70CA57013C@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24336

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
Log Message:
simplify the XSLT patch

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	24 Apr 2009 08:42:53 -0000	1.2
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	27 Apr 2009 06:24:57 -0000	1.3
@@ -53,36 +53,18 @@
 diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
 --- filter.orig/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:31:14.000000000 +0100
 +++ filter/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:32:29.000000000 +0100
-@@ -4016,26 +4016,26 @@
- 									<xsl:attribute name="uof:locID">t0122</xsl:attribute>
- 									<xsl:attribute name="uof:attrList">???????????????</xsl:attribute>
- 								</xsl:element>
--								<xsl:variable name="stt">
-+								<xsl:variable name="stt1">
- 									<xsl:value-of select="./text:a"/>
- 								</xsl:variable>
--								<xsl:variable name="end">
-+								<xsl:variable name="end1">
- 									<xsl:value-of select="."/>
- 								</xsl:variable>
- 								<xsl:variable name="bijiao">
--									<xsl:value-of select="substring-after($end,$stt)"/>
-+									<xsl:value-of select="substring-after($end1,$stt1)"/>
- 								</xsl:variable>
- 								<xsl:if test="not($bijiao='')">
+@@ -4029,13 +4029,7 @@
  									<xsl:element name="???:?????????">
  										<xsl:attribute name="uof:locID">t0109</xsl:attribute>
  										<xsl:attribute name="uof:attrList">?????????</xsl:attribute>
 -										<xsl:variable name="stt">
-+										<xsl:variable name="stt2">
- 											<xsl:value-of select="./text:a"/>
- 										</xsl:variable>
+-											<xsl:value-of select="./text:a"/>
+-										</xsl:variable>
 -										<xsl:variable name="end">
-+										<xsl:variable name="end2">
- 											<xsl:value-of select="."/>
- 										</xsl:variable>
+-											<xsl:value-of select="."/>
+-										</xsl:variable>
 -										<xsl:value-of select="substring-after($end,$stt)"/>
-+										<xsl:value-of select="substring-after($end2,$stt2)"/>
++										<xsl:value-of select="$bijiao"/>
  									</xsl:element>
  								</xsl:if>
  							</???:???>



From dtardon at fedoraproject.org  Mon Apr 27 06:26:15 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 06:26:15 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	1.2, 1.3
Message-ID: <20090427062615.49BBD70110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25110

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
Log Message:
simplify the XSLT patch

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	24 Apr 2009 08:42:52 -0000	1.2
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	27 Apr 2009 06:26:14 -0000	1.3
@@ -53,36 +53,18 @@
 diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
 --- filter.orig/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:31:14.000000000 +0100
 +++ filter/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:32:29.000000000 +0100
-@@ -4016,26 +4016,26 @@
- 									<xsl:attribute name="uof:locID">t0122</xsl:attribute>
- 									<xsl:attribute name="uof:attrList">???????????????</xsl:attribute>
- 								</xsl:element>
--								<xsl:variable name="stt">
-+								<xsl:variable name="stt1">
- 									<xsl:value-of select="./text:a"/>
- 								</xsl:variable>
--								<xsl:variable name="end">
-+								<xsl:variable name="end1">
- 									<xsl:value-of select="."/>
- 								</xsl:variable>
- 								<xsl:variable name="bijiao">
--									<xsl:value-of select="substring-after($end,$stt)"/>
-+									<xsl:value-of select="substring-after($end1,$stt1)"/>
- 								</xsl:variable>
- 								<xsl:if test="not($bijiao='')">
+@@ -4029,13 +4029,7 @@
  									<xsl:element name="???:?????????">
  										<xsl:attribute name="uof:locID">t0109</xsl:attribute>
  										<xsl:attribute name="uof:attrList">?????????</xsl:attribute>
 -										<xsl:variable name="stt">
-+										<xsl:variable name="stt2">
- 											<xsl:value-of select="./text:a"/>
- 										</xsl:variable>
+-											<xsl:value-of select="./text:a"/>
+-										</xsl:variable>
 -										<xsl:variable name="end">
-+										<xsl:variable name="end2">
- 											<xsl:value-of select="."/>
- 										</xsl:variable>
+-											<xsl:value-of select="."/>
+-										</xsl:variable>
 -										<xsl:value-of select="substring-after($end,$stt)"/>
-+										<xsl:value-of select="substring-after($end2,$stt2)"/>
++										<xsl:value-of select="$bijiao"/>
  									</xsl:element>
  								</xsl:if>
  							</???:???>



From mclasen at fedoraproject.org  Mon Apr 27 06:26:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:26:58 +0000 (UTC)
Subject: rpms/gnome-panel/devel clock-network.patch, NONE,
	1.1 gnome-panel.spec, 1.351, 1.352
Message-ID: <20090427062658.8140370110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24600

Modified Files:
	gnome-panel.spec 
Added Files:
	clock-network.patch 
Log Message:
don't drop schemas translations


clock-network.patch:

--- NEW FILE clock-network.patch ---
diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network gnome-panel-2.26.1/applets/clock/clock-location.c
--- gnome-panel-2.26.1/applets/clock/clock-location.c.network	2009-04-15 17:28:26.760634154 -0400
+++ gnome-panel-2.26.1/applets/clock/clock-location.c	2009-04-15 17:43:41.869383882 -0400
@@ -12,6 +12,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <math.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending, 
 					   DBUS_TYPE_UINT32, &result,
 					   DBUS_TYPE_INVALID)) {
 			if (result == NM_STATE_CONNECTED) {
+				/* thank you, glibc */
+				res_init ();
 				update_weather_infos ();
 			}
 		}


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- gnome-panel.spec	14 Apr 2009 21:03:40 -0000	1.351
+++ gnome-panel.spec	27 Apr 2009 06:26:28 -0000	1.352
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
 
@@ -115,6 +115,9 @@
 
 Patch35: clock-wakeups.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579092
+Patch38: clock-network.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -161,6 +164,7 @@
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
+%patch38 -p1 -b .clock-network
 
 libtoolize --force --copy
 
@@ -174,7 +178,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -362,6 +366,12 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-3
+- Don't drop schemas translations from po files
+
+* Wed Apr 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Fix the clock applets network tracking code
+
 * Tue Apr 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 



From mclasen at fedoraproject.org  Mon Apr 27 06:27:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:27:05 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.154,
	1.155
Message-ID: <20090427062705.2BE0C70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25146

Modified Files:
	gnome-power-manager.spec 
Log Message:
don't drop schemas translations



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-power-manager.spec	18 Apr 2009 10:40:20 -0000	1.154
+++ gnome-power-manager.spec	27 Apr 2009 06:26:34 -0000	1.155
@@ -4,7 +4,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
@@ -71,7 +71,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -164,6 +164,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
+- Don't drop schemas translations from po files
+
 * Sat Apr 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.26.0-2
 - Fix broken battery capacity percentage reporting
 



From mclasen at fedoraproject.org  Mon Apr 27 06:29:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:29:05 +0000 (UTC)
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.122,1.123
Message-ID: <20090427062905.E5ED170110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25425

Modified Files:
	gnome-terminal.spec 
Log Message:
don't drop schemas translations



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnome-terminal.spec	14 Apr 2009 00:59:40 -0000	1.122
+++ gnome-terminal.spec	27 Apr 2009 06:28:35 -0000	1.123
@@ -11,7 +11,7 @@
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -65,7 +65,7 @@
 
 # strip unneeded translations from .mo files
 cd po
-grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -132,6 +132,9 @@
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Don't drop schemas translations from po files
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-terminal/2.26/gnome-terminal-2.26.1.news



From mclasen at fedoraproject.org  Mon Apr 27 06:29:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:29:12 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.100, 
	1.101
Message-ID: <20090427062912.C483A70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25494

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
don't drop schemas translations



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-settings-daemon.spec	14 Apr 2009 18:27:49 -0000	1.100
+++ gnome-settings-daemon.spec	27 Apr 2009 06:28:42 -0000	1.101
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -69,7 +69,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -170,6 +170,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
+- Don't drop schemas translations from po files
+
 * Tue Apr 14 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 



From mclasen at fedoraproject.org  Mon Apr 27 06:31:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:31:52 +0000 (UTC)
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.189,1.190
Message-ID: <20090427063152.71E5970110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25844

Modified Files:
	gnome-utils.spec 
Log Message:
don't drop schemas translations



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gnome-utils.spec	17 Mar 2009 03:13:06 -0000	1.189
+++ gnome-utils.spec	27 Apr 2009 06:31:22 -0000	1.190
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -91,7 +91,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -270,6 +270,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-2
+- Don't drop schemas translations from po files
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.0-1
 - Update to 2.26.0
 



From mclasen at fedoraproject.org  Mon Apr 27 06:31:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:31:58 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.73,1.74
Message-ID: <20090427063158.74FCD70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25947

Modified Files:
	gok.spec 
Log Message:
don't drop schemas translations



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gok.spec	16 Mar 2009 18:33:33 -0000	1.73
+++ gok.spec	27 Apr 2009 06:31:28 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://www.gok.ca/
@@ -77,7 +77,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -139,6 +139,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Don't drop schemas translations from po files
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From mclasen at fedoraproject.org  Mon Apr 27 06:34:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:34:17 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.143,1.144
Message-ID: <20090427063417.586DD70110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26180

Modified Files:
	libgnome.spec 
Log Message:
Don't drop schemas translations



Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- libgnome.spec	18 Mar 2009 00:46:23 -0000	1.143
+++ libgnome.spec	27 Apr 2009 06:33:46 -0000	1.144
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.26/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -122,7 +122,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 sed -ie 's|POT-Creation-Date.*|POT-Creation-Date: 2008-10-01 00:00-0400\\n"|g' %{po_package}.pot
@@ -199,6 +199,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Don't drop schemas translations from po files
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From mclasen at fedoraproject.org  Mon Apr 27 06:34:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:34:24 +0000 (UTC)
Subject: rpms/libgweather/devel libgweather.spec,1.39,1.40
Message-ID: <20090427063424.1C9D070110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26271

Modified Files:
	libgweather.spec 
Log Message:
Don't drop schemas translations



Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libgweather.spec	14 Apr 2009 00:39:08 -0000	1.39
+++ libgweather.spec	27 Apr 2009 06:33:53 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           libgweather
 Version:        2.26.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
@@ -57,7 +57,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-2
+- Don't drop schemas translations from po files
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/libgweather/2.26/libgweather-2.26.1.news



From mclasen at fedoraproject.org  Mon Apr 27 06:35:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 06:35:55 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.188,1.189
Message-ID: <20090427063555.CE1B770110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474

Modified Files:
	metacity.spec 
Log Message:
Don't drop schemas translations from po files



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- metacity.spec	17 Mar 2009 02:39:48 -0000	1.188
+++ metacity.spec	27 Apr 2009 06:35:25 -0000	1.189
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.26/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -106,7 +106,7 @@
 %if 0
 # strip unneeded translations from .mo files
 cd po
-grep -v ".*[.]desktop[.]in$\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in$\|.*[.]server[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -182,6 +182,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-2
+- Don't drop schemas translations from po files
+
 * Mon Mar 16 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 



From oget at fedoraproject.org  Mon Apr 27 06:42:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 06:42:10 +0000 (UTC)
Subject: rpms/jjack/devel import.log, NONE, 1.1 jjack.sh, NONE,
	1.1 jjack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427064210.4084C70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jjack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27265/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jjack.sh jjack.spec 
Log Message:
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build



--- NEW FILE import.log ---
jjack-0_3-2_fc10:HEAD:jjack-0.3-2.fc10.src.rpm:1240814378


--- NEW FILE jjack.sh ---
#! /bin/sh
#
# Shell script to run the JJack Shell Application.
#

JAVA_HOME=/usr/lib/jvm/java
LIBRARY_PATH=/usr/lib
for arch in x86_64 ppc64; do
    if [[ $(uname -i) == "$arch" ]]; then
        LIBRARY_PATH=/usr/lib64
    fi
done
JJACK_HOME=${LIBRARY_PATH}/jjack
CP=${JAVA_HOME}/lib/dt.jar:${JJACK_HOME}/jjack.jar:${JJACK_HOME}/jjack-clients.jar
LP=${CP}
${JAVA_HOME}/bin/java -cp ${CP} -Djava.library.path=${LP} JJack "$@"


--- NEW FILE jjack.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jjack
Version:        0.3
Release:        2%{?dist}
Summary:        JACK audio driver for the Java Sound API
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://jjack.berlios.de/
# The original source file is 
# http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
# We re-encoded the MP3 files in the tarball in OGG format to produce
Source0:        %{name}-%{version}-FE.tar.gz
# Shell script to run the JJack Shell Application. Derived from the bin/jjack.sh
# script in the tarball
Source1:        %{name}.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  java-devel >= 1.5
BuildRequires:  ant
BuildRequires:  jpackage-utils
%if %{with_gcj}
BuildRequires:  java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%endif
Requires:       jpackage-utils
Requires:       java >= 1.5


%description
JJack is a JACK audio driver for the Java Sound API  and a framework for the
Java programming language  that allows Java applications to use the JACK Audio
Connection Kit. Audio processor clients can be designed to:

  * create their own sounds (as a synthesizer or sample-player)
  * change the sound-output of other clients (e.g. as an effects-device)
  * analyse the audio streams generated by other clients (e.g. display 
    the wave form)

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove percompiled binaries
for ext in class jar jnilib o so; do
   find -name "*.$ext" -exec rm -f '{}' \;
done

# Ugly hack to impose optflags
for flag in $RPM_OPT_FLAGS; do
   ANT_GCC_FLAGS+="<arg value=\"$flag\"/>\n      "
done
sed -i "s|\(<arg value=\"-fPIC\"/>\)|\1\n      $ANT_GCC_FLAGS|" make/build.xml

# We don't want do deal with complications during %%install
sed -i 's|/\${os.arch}/\${os.name}||' make/build.xml

# To dlopen the library correctly
sed -i 's|File(.*|File("%{_libdir}/%{name}/lib%{name}.so");|' \
   src/de/gulden/framework/jjack/JJackSystem.java

# We replace mp3 with ogg
for file in doc/www/examples.html README; do
   sed -i 's|mp3|ogg|g' $file
done

# Fix encoding
iconv -f iso8859-1 -t utf8 CHANGELOG -o tmpfile
touch -r CHANGELOG tmpfile
mv -f tmpfile CHANGELOG

%build
pushd make
   %ant -v all
popd

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}

# jar files
pushd lib
   for jarfile in %{name}*.jar; do
      jarname=${jarfile%.*}
      install -pm 644 $jarfile \
              $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarname-%{version}.jar
      ln -s $jarname-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarfile
   done
# native lib
   install -pm 755 lib%{name}.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/*  \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}/

# the wrapper script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}

# aot bits
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README
%{_libdir}/%{name}/
%{_bindir}/%{name}

%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:21:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 06:41:38 -0000	1.2
@@ -0,0 +1 @@
+jjack-0.3-FE.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:21:46 -0000	1.1
+++ sources	27 Apr 2009 06:41:39 -0000	1.2
@@ -0,0 +1 @@
+5c45d272344923ee8282c9b39783288c  jjack-0.3-FE.tar.gz



From phuang at fedoraproject.org  Mon Apr 27 06:56:52 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 06:56:52 +0000 (UTC)
Subject: rpms/ibus-chewing/F-10 .cvsignore, 1.9, 1.10 ibus-chewing.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20090427065652.F196D70110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-chewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29166

Modified Files:
	.cvsignore ibus-chewing.spec sources 
Log Message:
Port F-11 branch to F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Mar 2009 01:32:37 -0000	1.9
+++ .cvsignore	27 Apr 2009 06:56:22 -0000	1.10
@@ -1 +1 @@
-ibus-chewing-0.1.1.20090129.tar.gz
+ibus-chewing-1.0.8.20090424-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ibus-chewing.spec	10 Mar 2009 02:07:38 -0000	1.9
+++ ibus-chewing.spec	27 Apr 2009 06:56:22 -0000	1.10
@@ -1,67 +1,144 @@
-#%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-0.1
 Name:       ibus-chewing
-Version:    0.1.1.20090129
-Release:    2%{?dist}
+Version:    1.0.8.20090424
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-Source0:    http://cloud.github.com/downloads/definite/%{name}/%{name}-%{version}.tar.gz
+Source0:    http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext-devel
-BuildRequires:  libtool
-BuildRequires:  python-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  ibus-devel >= 1.1
+BuildRequires:  cmake >= 2.4
+BuildRequires:  gob2
 BuildRequires:  libchewing-devel >= 0.3.2-4
-BuildRequires:  swig
 BuildRequires:  pkgconfig
-Requires:   ibus
+BuildRequires:  GConf2-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXtst-devel
+Requires:   ibus >= 1.1
 Requires:  libchewing >= 0.3.2-4
+Requires:  GConf2
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 The Chewing engine for IBus platform. It provides Chinese input method from
 libchewing.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-Source
 
 %build
-%configure --disable-static
-# make -C po update-gmo
-make %{?_smp_mflags}
+%cmake -DCMAKE_INSTALL_PREFIX=%{_usr}
+make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/_chewing.la
-
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+%pre
+if [ "$1" -gt 1 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+fi
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+
+%preun
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-# %dir %{python_sitearch}/ibus
-#%{python_sitearch}/chewing.py*
-#%{python_sitearch}/_chewing.so
-%dir %{_datadir}/ibus-chewing
-%{_bindir}/ibus-engine-chewing
-%{_datadir}/ibus-chewing/*
-%{_datadir}/ibus/engine/chewing.engine
+%doc AUTHORS README ChangeLog NEWS COPYING
+%{_libexecdir}/ibus-engine-chewing
+%{_datadir}/%{name}
+%{_datadir}/ibus/component/chewing.xml
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Mar 10 2009 Ding-Yi Chen <dchen at redhat.com> - 0.1.1.20090129-2
-- Fix koji build.
+* Fri Apr 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090424-1
+Fix some bugs in cmake_modules/RPM.cmake
+
+
+* Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1
+- Added tooltips.
+- Revealed the sync caps lock setting.
+- Fixed Right key bug.
+- Added CMake policy 0011 as OLD.
+
+* Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.4.20090323-2
+- Fix koji build issues.
+
+* Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.4.20090323-1
+- Various Settings are now in dialog.
+- Integer settings are now revealed.
+- MakerDialog.gob is now available.
+- Work around of easy symbol input.
+- Fix iBus Google issue 310.
+
+
+* Wed Mar 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.3.20090311-1
+- IBus Google issue 305:  ibus-chewing.schema -> ibus-chewing.schemas
+- IBus Google issue 307:  hardcoded chewing datadir
+    - Sync chewing candPerPage and IBusTable->page_size
+- Sync between IM and keyboard (Experimental)
+    - ibus-chewing.schema -> ibus-chewing.schemas
+
+* Tue Mar 03 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.2.20090303-1
+- Required gconf2 -> GConf2.
+- Fix RPM install issues.
+
+* Fri Feb 27 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.1.20090227-1
+- Setting shows/hides KBType, selKeys, and various settings.
+- Add gconf schema.
+- Fix some memory leaking checked.
+- Move some function to cmake_modules.
+- Fix Google code issue 281
 
-* Tue Mar 10 2009 Ding-Yi Chen <dchen at redhat.com> - 0.1.1.20090129-1
-- Revert F-10 branch to ibus-chewing-0.1.1, as ibus in F-10 is still 0.1.1.
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1.20081023-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Jan 28 2009 Ding-Yi Chen <dchen at redhat.com> - 0.1.1.20090127-1
+* Wed Feb 18 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.0.20090220-1
+- First working version for IBus C
+
+* Wed Jan 28 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.0.20090128-1
 - Fix the binding with libchewing 0.3.2.
 
-* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081023-2
+- Rebuild for Python 2.6
+
+* Thu Oct 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
+- Update to 0.1.1.20080923.
+
+* Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
+- Update to 0.1.1.20080917.
+
+* Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
+- Update to 0.1.1.20080916.
+
+* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+- Update to 0.1.1.20080901.
+
+* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - The first version.
+
+
+
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Mar 2009 02:07:39 -0000	1.10
+++ sources	27 Apr 2009 06:56:22 -0000	1.11
@@ -1 +1 @@
-bad42a04f8be87a5e0376aa1347a5d08  ibus-chewing-0.1.1.20090129.tar.gz
+8bf8753259e0e7ad2e91a9318d796c96  ibus-chewing-1.0.8.20090424-Source.tar.gz



From phuang at fedoraproject.org  Mon Apr 27 07:01:02 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 07:01:02 +0000 (UTC)
Subject: rpms/ibus-m17n/F-10 ibus-m17n-HEAD.patch, NONE,
	1.1 ibus-m17n-iok.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 ibus-m17n.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090427070103.06D3670110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29942

Modified Files:
	.cvsignore ibus-m17n.spec sources 
Added Files:
	ibus-m17n-HEAD.patch ibus-m17n-iok.patch 
Log Message:
Port F-11 branch to F-10

ibus-m17n-HEAD.patch:

--- NEW FILE ibus-m17n-HEAD.patch ---
diff --git a/src/engine.c b/src/engine.c
index 5c5f56f..06501bb 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -53,9 +53,10 @@ static void ibus_m17n_engine_page_up        (IBusEngine             *engine);
 static void ibus_m17n_engine_page_down      (IBusEngine             *engine);
 static void ibus_m17n_engine_cursor_up      (IBusEngine             *engine);
 static void ibus_m17n_engine_cursor_down    (IBusEngine             *engine);
-static void ibus_m17n_property_activate     (IBusEngine             *engine,
+static void ibus_m17n_engine_property_activate
+                                            (IBusEngine             *engine,
                                              const gchar            *prop_name,
-                                             gint                    prop_state);
+                                             guint                   prop_state);
 static void ibus_m17n_engine_property_show
 											(IBusEngine             *engine,
                                              const gchar            *prop_name);
@@ -126,6 +127,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
     engine_class->cursor_up = ibus_m17n_engine_cursor_up;
     engine_class->cursor_down = ibus_m17n_engine_cursor_down;
 
+    // engine_class->property_activate = ibus_m17n_engine_property_activate;
 }
 
 static void
@@ -277,47 +279,67 @@ MSymbol
 ibus_m17n_key_event_to_symbol (guint keyval,
                                guint modifiers)
 {
-    GString *key;
-    MSymbol mkey = Mnil;
+    GString *keysym;
+    MSymbol mkeysym = Mnil;
     guint mask = 0;
 
+    if (keyval >= IBUS_Shift_L && keyval <= IBUS_Hyper_R) {
+        return Mnil;
+    }
+
+    keysym = g_string_new ("");
+
     if (keyval >= IBUS_space && keyval <= IBUS_asciitilde) {
+        gint c = keyval;
         if (keyval == IBUS_space && modifiers & IBUS_SHIFT_MASK)
             mask |= IBUS_SHIFT_MASK;
 
         if (modifiers & IBUS_CONTROL_MASK) {
-            if (keyval >= IBUS_a && keyval <= IBUS_z)
-                keyval += IBUS_A - IBUS_a;
+            if (c >= IBUS_a && c <= IBUS_z)
+                c += IBUS_A - IBUS_a;
             mask |= IBUS_CONTROL_MASK;
         }
+
+        g_string_append_c (keysym, c);
     }
-    else if (keyval >= IBUS_Shift_L && keyval <= IBUS_Hyper_R) {
-        return Mnil;
+    else {
+        mask |= modifiers & (IBUS_CONTROL_MASK | IBUS_SHIFT_MASK);
+        g_string_append (keysym, ibus_keyval_name (keyval));
+        if (keysym->len == 0) {
+            g_string_free (keysym, TRUE);
+            return Mnil;
+        }
     }
 
-    mask |= modifiers & (IBUS_MOD1_MASK | IBUS_META_MASK);
+    mask |= modifiers & (IBUS_MOD1_MASK |
+                         IBUS_META_MASK |
+                         IBUS_SUPER_MASK |
+                         IBUS_HYPER_MASK);
 
-    key = g_string_new ("");
 
+    if (mask & IBUS_HYPER_MASK) {
+        g_string_prepend (keysym, "H-");
+    }
+    if (mask & IBUS_SUPER_MASK) {
+        g_string_prepend (keysym, "s-");
+    }
     if (mask & IBUS_MOD1_MASK) {
-        g_string_append (key, "A-");
+        g_string_prepend (keysym, "A-");
     }
     if (mask & IBUS_META_MASK) {
-        g_string_append (key, "M-");
+        g_string_prepend (keysym, "M-");
     }
     if (mask & IBUS_CONTROL_MASK) {
-        g_string_append (key, "C-");
+        g_string_prepend (keysym, "C-");
     }
     if (mask & IBUS_SHIFT_MASK) {
-        g_string_append (key, "S-");
+        g_string_prepend (keysym, "S-");
     }
 
-    g_string_append (key, ibus_keyval_name (keyval));
-
-    mkey = msymbol (key->str);
-    g_string_free (key, TRUE);
+    mkeysym = msymbol (keysym->str);
+    g_string_free (keysym, TRUE);
 
-    return mkey;
+    return mkeysym;
 }
 
 static gboolean
@@ -457,6 +479,15 @@ ibus_m17n_engine_cursor_down (IBusEngine *engine)
 }
 
 static void
+ibus_m17n_engine_property_activate (IBusEngine  *engine,
+                                    const gchar *prop_name,
+                                    guint        prop_state)
+{
+    g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
+    parent_class->property_activate (engine, prop_name, prop_state);
+}
+
+static void
 ibus_m17n_engine_update_lookup_table (IBusM17NEngine *m17n)
 {
    ibus_lookup_table_clear (m17n->table);

ibus-m17n-iok.patch:

--- NEW FILE ibus-m17n-iok.patch ---
--- src/engine.c.orig	2009-03-02 10:54:14.000000000 +0530
+++ src/engine.c	2009-03-02 13:12:42.000000000 +0530
@@ -17,6 +17,8 @@
     IBusLookupTable *table;
     IBusProperty    *status_prop;
     IBusPropList    *prop_list;
+    IBusProperty    *show_iok_prop;
+    gchar *keymap_name;
 };
 
 struct _IBusM17NEngineClass {
@@ -127,12 +129,14 @@
     engine_class->cursor_up = ibus_m17n_engine_cursor_up;
     engine_class->cursor_down = ibus_m17n_engine_cursor_down;
 
-    // engine_class->property_activate = ibus_m17n_engine_property_activate;
+    engine_class->property_activate = ibus_m17n_engine_property_activate;
 }
 
 static void
 ibus_m17n_engine_init (IBusM17NEngine *m17n)
 {
+    IBusText *text;
+
     m17n->status_prop = ibus_property_new ("status",
                                            PROP_TYPE_NORMAL,
                                            NULL,
@@ -143,8 +147,21 @@
                                            0,
                                            NULL);
 
+    text = ibus_text_new_from_string ("iok");
+    m17n->show_iok_prop = ibus_property_new ("iok",
+                                           PROP_TYPE_NORMAL,
+                                           text,
+                                           "/usr/share/pixmaps/iok.xpm",
+                                           text,
+                                           TRUE,
+                                           FALSE,
+                                           0,
+                                           NULL);
+    g_object_unref (text);
+
     m17n->prop_list = ibus_prop_list_new ();
     ibus_prop_list_append (m17n->prop_list,  m17n->status_prop);
+    ibus_prop_list_append (m17n->prop_list,  m17n->show_iok_prop);
 
     m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
     m17n->context = NULL;
@@ -165,6 +182,7 @@
 
     engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
     g_assert (engine_name);
+    m17n->keymap_name =  g_strdup (engine_name);
 
     if (im_table == NULL) {
         im_table = g_hash_table_new_full (g_str_hash,
@@ -185,7 +203,9 @@
 
         lang = strv[0];
         name = strv[1];
-
+ 
+        if(strcmp(name,"inscript")==0)
+            ibus_property_set_visible(m17n->show_iok_prop,TRUE);
         im = minput_open_im (msymbol (lang), msymbol (name), NULL);
         if (im != NULL) {
             mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
@@ -247,6 +267,7 @@
         m17n->prop_list = NULL;
     }
 
+
     if (m17n->status_prop) {
         g_object_unref (m17n->status_prop);
         m17n->status_prop = NULL;
@@ -398,6 +419,7 @@
     IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
 
     ibus_engine_register_properties (engine, m17n->prop_list);
+
     ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
 
     parent_class->focus_in (engine);
@@ -483,7 +505,20 @@
                                     const gchar *prop_name,
                                     guint        prop_state)
 {
-    g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
+    gchar *langi;
+    gchar **strv;
+    gchar cmd[80];
+
+    IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
+
+    strv = g_strsplit (m17n->keymap_name, ":", 2);
+    g_assert (g_strv_length (strv) == 2);
+    langi = strv[0];
+
+    sprintf(cmd,"/usr/bin/iok -n %s",langi);
+    g_debug ("keymap name = %s,prop_name=%s, prop_state=%d",m17n->keymap_name, prop_name, prop_state);
+
+    g_spawn_command_line_async(cmd, NULL );
     parent_class->property_activate (engine, prop_name, prop_state);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Oct 2008 06:24:30 -0000	1.8
+++ .cvsignore	27 Apr 2009 07:00:32 -0000	1.9
@@ -1 +1 @@
-ibus-m17n-0.1.1.20081013.tar.gz
+ibus-m17n-1.1.0.20090211.tar.gz


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-10/ibus-m17n.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ibus-m17n.spec	16 Oct 2008 04:24:37 -0000	1.9
+++ ibus-m17n.spec	27 Apr 2009 07:00:32 -0000	1.10
@@ -1,30 +1,34 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-0.1
 Name:       ibus-m17n
-Version:    0.1.1.20081013
-Release:    3%{?dist}
+Version:    1.1.0.20090211
+Release:    4%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
+Patch0:     ibus-m17n-HEAD.patch
+Patch1:     ibus-m17n-iok.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
-BuildRequires:  python-devel
-BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  m17n-lib-devel
+BuildRequires:  ibus-devel
+
 Requires:   ibus
 Requires:   m17n-lib
+Requires:   iok > 1.3.1
 
 %description
-M17N engine for IBus input platform. It allows input of many languages using
-input maps from m17n-db.
+M17N engine for IBus input platform. It allows input of many launguaes using
+the input table maps from m17n-db.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p0
 
 %build
 %configure --disable-static
@@ -34,10 +38,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/_m17n.la
-
-# .engine files are now in m17n-db and m17n-contrib
-rm -f $RPM_BUILD_ROOT%{_datadir}/ibus/engine/m17n-*.engine
 
 %find_lang %{name}
 
@@ -47,13 +47,30 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{python_sitearch}/_m17n.so
-%{python_sitearch}/m17n.py*
-%dir %{_datadir}/ibus-m17n
-%{_datadir}/ibus-m17n/*
-%{_bindir}/ibus-engine-m17n
+%{_datadir}/ibus-m17n
+%{_libexecdir}/ibus-engine-m17n
+%{_datadir}/ibus/component/*
 
 %changelog
+* Thu Mar 05 2009 Parag <pnemade at redhat.com> - 1.1.0.20090211-4
+- Add iok support to ibus-m17n.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
+- Add patch ibus-m17n-HEAD.patch from upstream git tree.
+- Make Control + Alt + ... available. (#482789)
+
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+- Update to 1.1.0.20090211.
+
+* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+- Update to 1.1.0.20090205.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081013-4
+- Rebuild for Python 2.6
+
 * Thu Oct 16 2008 Jens Petersen <petersen at redhat.com> - 0.1.1.20081013-3
 - move the .engine files to m17n-db and m17n-contrib (#466410)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Oct 2008 06:24:30 -0000	1.8
+++ sources	27 Apr 2009 07:00:32 -0000	1.9
@@ -1 +1 @@
-c3a126998697322fbd115882a0f3f60d  ibus-m17n-0.1.1.20081013.tar.gz
+fd3da5bcf3c58aa5266a31882040ca41  ibus-m17n-1.1.0.20090211.tar.gz



From phuang at fedoraproject.org  Mon Apr 27 07:09:20 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 27 Apr 2009 07:09:20 +0000 (UTC)
Subject: rpms/ibus-table/F-10
	ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch, NONE,
	1.1 ibus-table-pkgconfig-noarch.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 ibus-table.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090427070920.BA00970110@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-table/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30931

Modified Files:
	.cvsignore ibus-table.spec sources 
Added Files:
	ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch 
	ibus-table-pkgconfig-noarch.patch 
Log Message:
Port F-11 branch to F-10

ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch:

--- NEW FILE ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch ---
diff -up ibus-table-1.1.0.20090316/engine/ibus-engine-table.in.orig ibus-table-1.1.0.20090316/engine/ibus-engine-table.in
--- ibus-table-1.1.0.20090316/engine/ibus-engine-table.in.orig	2009-03-16 15:11:57.000000000 +1000
+++ ibus-table-1.1.0.20090316/engine/ibus-engine-table.in	2009-03-16 15:12:41.000000000 +1000
@@ -35,7 +35,8 @@ for arg in $@; do
 done
 
 # first running speedmeter as a daemon
-python @datarootdir@/ibus-table/engine/speedmeter.py -d
+# (temporary disabled until config option is implemented)
+#python @datarootdir@/ibus-table/engine/speedmeter.py -d
 
 # then start our IME
 exec python @datarootdir@/ibus-table/engine/main.py $@

ibus-table-pkgconfig-noarch.patch:

--- NEW FILE ibus-table-pkgconfig-noarch.patch ---
diff -u ibus-table-1.1.0.20090220/ibus-table.pc.in\~ ibus-table-1.1.0.20090220/ibus-table.pc.in
--- ibus-table-1.1.0.20090220/ibus-table.pc.in~	2009-02-20 11:42:40.000000000 +1000
+++ ibus-table-1.1.0.20090220/ibus-table.pc.in	2009-03-06 11:45:18.001898774 +1000
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@datadir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 

Diff finished.  Fri Mar  6 11:46:24 2009


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2008 07:33:53 -0000	1.5
+++ .cvsignore	27 Apr 2009 07:08:50 -0000	1.6
@@ -1 +1 @@
-ibus-table-0.1.1.20081014.tar.gz
+ibus-table-1.1.0.20090316.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-10/ibus-table.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ibus-table.spec	17 Oct 2008 07:33:53 -0000	1.4
+++ ibus-table.spec	27 Apr 2009 07:08:50 -0000	1.5
@@ -1,32 +1,22 @@
 Name:       ibus-table
-Version:    0.1.1.20081014
+Version:    1.1.0.20090316 
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
-License:    GPLv2+
+License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
-
-BuildRequires:  gettext-devel
-
-Requires:   ibus
+BuildRequires:  ibus-devel > 1.1.0
+Requires:   ibus > 1.1.0
+Patch1:     ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch 
 
 %description
 The package contains general Table engine for IBus platform.
 
-%package chinese
-Summary:    Chinese tables for general table engine of IBus.
-Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description chinese
-This package contains Chineses tables.
-
 %package additional
-Summary:    Additional tables for general table engine of IBus.
+Summary:    Additional tables for general table engine of IBus
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -35,36 +25,21 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-bz490396.no_speedmeter
 
 %build
-%configure \
-	--disable-static \
-	--enable-zhengma \
-	--enable-wubi86 \
-	--enable-wubi98 \
-	--enable-cangjie5 \
-	--enable-erbi-qs \
-	--enable-additional
-#	--enable-extra-phrases
-
+%configure --disable-static --enable-additional
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
+make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post chinese
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi86.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi98.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie5.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi_qs.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/zhengma.db
-
 %post additional
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
@@ -72,54 +47,104 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_datadir}/ibus-table/engine/*
-%{_datadir}/ibus-table/tables/template.txt
-%{_datadir}/ibus-table/icons/ibus-table.svg
-%{_datadir}/ibus-table/icons/full-letter.svg
-%{_datadir}/ibus-table/icons/full-punct.svg
-%{_datadir}/ibus-table/icons/half-letter.svg
-%{_datadir}/ibus-table/icons/half-punct.svg
-%{_datadir}/ibus-table/icons/onechar.svg
-%{_datadir}/ibus-table/icons/phrase.svg
-%{_datadir}/ibus-table/icons/py-mode.svg
-%{_datadir}/ibus-table/icons/tab-mode.svg
-%{_datadir}/ibus-table/icons/chinese.svg
-%{_datadir}/ibus-table/icons/dcommit.svg
-%{_datadir}/ibus-table/icons/english.svg
-%{_datadir}/ibus-table/icons/ncommit.svg
-%{_bindir}/ibus-engine-table
-%{_bindir}/ibus-table-createdb
-
-%files chinese
-%defattr(-,root,root,-)
-%{_datadir}/ibus-table/data/pinyin_table.txt.bz2
-%{_datadir}/ibus-table/tables/extra_phrase.txt.bz2
-%{_datadir}/ibus-table/tables/wubi86.db
-%{_datadir}/ibus-table/tables/wubi98.db
-%{_datadir}/ibus-table/tables/cangjie5.db
-%{_datadir}/ibus-table/tables/erbi_qs.db
-%{_datadir}/ibus-table/tables/zhengma.db
-%{_datadir}/ibus-table/icons/wubi86.svg
-%{_datadir}/ibus-table/icons/wubi98.svg
-%{_datadir}/ibus-table/icons/cangjie5.svg
-%{_datadir}/ibus-table/icons/erbi-qs.svg
-%{_datadir}/ibus-table/icons/zhengma.svg
-%{_datadir}/ibus/engine/wubi86.engine
-%{_datadir}/ibus/engine/wubi98.engine
-%{_datadir}/ibus/engine/cangjie5.engine
-%{_datadir}/ibus/engine/erbi_qs.engine
-%{_datadir}/ibus/engine/zhengma.engine
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/engine
+%dir %{_datadir}/%{name}/tables
+%dir %{_datadir}/%{name}/icons
+%dir %{_datadir}/%{name}/data
+%{_datadir}/ibus/component/table.xml
+%{_datadir}/pkgconfig/%{name}.pc
+%{_libexecdir}/ibus-engine-table
+%{_bindir}/%{name}-createdb
+%{_datadir}/%{name}/tables/template.txt
+%{_datadir}/%{name}/icons/%{name}.svg
+%{_datadir}/%{name}/icons/full-letter.svg
+%{_datadir}/%{name}/icons/full-punct.svg
+%{_datadir}/%{name}/icons/half-letter.svg
+%{_datadir}/%{name}/icons/half-punct.svg
+%{_datadir}/%{name}/icons/onechar.svg
+%{_datadir}/%{name}/icons/phrase.svg
+%{_datadir}/%{name}/icons/py-mode.svg
+%{_datadir}/%{name}/icons/tab-mode.svg
+%{_datadir}/%{name}/icons/chinese.svg
+%{_datadir}/%{name}/icons/dcommit.svg
+%{_datadir}/%{name}/icons/english.svg
+%{_datadir}/%{name}/icons/ncommit.svg
+%{_datadir}/%{name}/data/pinyin_table.txt.bz2
+%{_datadir}/%{name}/engine/factory.py
+%{_datadir}/%{name}/engine/factory.pyc
+%{_datadir}/%{name}/engine/factory.pyo
+%{_datadir}/%{name}/engine/main.py
+%{_datadir}/%{name}/engine/main.pyc
+%{_datadir}/%{name}/engine/main.pyo
+%{_datadir}/%{name}/engine/speedmeter.py
+%{_datadir}/%{name}/engine/speedmeter.pyc
+%{_datadir}/%{name}/engine/speedmeter.pyo
+%{_datadir}/%{name}/engine/tabcreatedb.py
+%{_datadir}/%{name}/engine/tabcreatedb.pyc
+%{_datadir}/%{name}/engine/tabcreatedb.pyo
+%{_datadir}/%{name}/engine/tabdict.py
+%{_datadir}/%{name}/engine/tabdict.pyc
+%{_datadir}/%{name}/engine/tabdict.pyo
+%{_datadir}/%{name}/engine/table.py
+%{_datadir}/%{name}/engine/table.pyc
+%{_datadir}/%{name}/engine/table.pyo
+%{_datadir}/%{name}/engine/tabsqlitedb.py
+%{_datadir}/%{name}/engine/tabsqlitedb.pyc
+%{_datadir}/%{name}/engine/tabsqlitedb.pyo
+%{_datadir}/%{name}/icons/cb-mode.svg
+%{_datadir}/%{name}/icons/sc-mode.svg
+%{_datadir}/%{name}/icons/scb-mode.svg
+%{_datadir}/%{name}/icons/tc-mode.svg
+%{_datadir}/%{name}/icons/tcb-mode.svg
 
 %files additional
 %defattr(-,root,root,-)
-%{_datadir}/ibus-table/tables/compose.db
-%{_datadir}/ibus-table/tables/latex.db
-%{_datadir}/ibus-table/icons/compose.svg
-%{_datadir}/ibus-table/icons/latex.svg
-%{_datadir}/ibus/engine/compose.engine
-%{_datadir}/ibus/engine/latex.engine
+%{_datadir}/%{name}/tables/compose.db
+%{_datadir}/%{name}/tables/latex.db
+%{_datadir}/%{name}/icons/compose.svg
+%{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Mon Mar 16 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-1.fc11
+- Resolves: rhbz#490396
+- Updated source tarball.
+- Disabled speedmeter until config option is implemented.
+
+* Fri Mar  6 2009 Jens Petersen <petersen at redhat.com> - 1.1.0.20090220-5
+- make pkgconfig noarch with ibus-table-pkgconfig-noarch.patch
+- fix license field: actually LGPL
+- drop gettext-devel BR
+- require ibus > 1.1.0
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-4.fc11
+- Rebuilt.
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-3.fc11
+- Rebuilt.
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-2.fc11
+- Rebuilt.
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-1.fc11
+- Resolves: rhbz#484650
+- Updated to latest upstream release.
+- Splitted chinese input methods into modules.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1.20081014-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 04 2009 Caius Chance <cchance at redhat.com> - 0.1.1.20081014-4
+- Resolves: rhbz#466430 rhbz#466844
+- Added wildcard features.
+- Added preedit clearance on refocus.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081014-3
+- Rebuild for Python 2.6
+
+* Mon Dec 1 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081014-2
+- Modified spec file to own all directories created by ibus-table.
+
 * Fri Oct 14 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081014-1
 - Update to 0.1.1.20081014.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2008 07:33:53 -0000	1.5
+++ sources	27 Apr 2009 07:08:50 -0000	1.6
@@ -1 +1 @@
-8c72c6ec97a0dcc822784e42ed6625c8  ibus-table-0.1.1.20081014.tar.gz
+f512ac6bd166c68c8308a255fcd77d48  ibus-table-1.1.0.20090316.tar.gz



From kdudka at fedoraproject.org  Mon Apr 27 07:30:05 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Mon, 27 Apr 2009 07:30:05 +0000 (UTC)
Subject: rpms/curl/F-10 curl-7.19.4-debug.patch, NONE, 1.1 curl.spec, 1.87,
	1.88
Message-ID: <20090427073005.18D2470110@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1471

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-debug.patch 
Log Message:
fix configure.ac to not discard -g in CFLAGS (#496778)

curl-7.19.4-debug.patch:

--- NEW FILE curl-7.19.4-debug.patch ---
diff -ruNp curl-7.19.4.orig/configure.ac curl-7.19.4/configure.ac
--- curl-7.19.4.orig/configure.ac	2009-02-13 15:25:15.000000000 +0100
+++ curl-7.19.4/configure.ac	2009-04-22 11:56:32.171305420 +0200
@@ -241,7 +241,10 @@ dnl ************************************
 
 CURL_CHECK_COMPILER
 CURL_SET_COMPILER_BASIC_OPTS
-CURL_SET_COMPILER_DEBUG_OPTS
+
+dnl do not perturb CFLAGS given by the build system
+dnl CURL_SET_COMPILER_DEBUG_OPTS
+
 CURL_SET_COMPILER_OPTIMIZE_OPTS
 CURL_SET_COMPILER_WARNING_OPTS
 


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-10/curl.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- curl.spec	16 Mar 2009 08:12:34 -0000	1.87
+++ curl.spec	27 Apr 2009 07:29:34 -0000	1.88
@@ -1,16 +1,18 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 Patch1: curl-7.15.3-multilib.patch
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.17.1-badsocket.patch
+Patch4: curl-7.19.4-debug.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
 BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
 
@@ -49,6 +51,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
+%patch4 -p1 -b .debug
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -57,6 +60,7 @@
 done
 
 %build
+autoconf
 export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
 %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
@@ -140,6 +144,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Apr 27 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-4
+- fix configure.ac to not discard -g in CFLAGS, thanks to Debarshi Ray (#496778)
+
 * Mon Mar 16 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-3
 - make libcurl-devel multilib-ready (bug #488922)
 



From kdudka at fedoraproject.org  Mon Apr 27 07:30:12 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Mon, 27 Apr 2009 07:30:12 +0000 (UTC)
Subject: rpms/curl/F-9 curl-7.19.4-debug.patch,NONE,1.1 curl.spec,1.84,1.85
Message-ID: <20090427073012.6C70270110@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1508

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-debug.patch 
Log Message:
fix configure.ac to not discard -g in CFLAGS (#496778)

curl-7.19.4-debug.patch:

--- NEW FILE curl-7.19.4-debug.patch ---
diff -ruNp curl-7.19.4.orig/configure.ac curl-7.19.4/configure.ac
--- curl-7.19.4.orig/configure.ac	2009-02-13 15:25:15.000000000 +0100
+++ curl-7.19.4/configure.ac	2009-04-22 11:56:32.171305420 +0200
@@ -241,7 +241,10 @@ dnl ************************************
 
 CURL_CHECK_COMPILER
 CURL_SET_COMPILER_BASIC_OPTS
-CURL_SET_COMPILER_DEBUG_OPTS
+
+dnl do not perturb CFLAGS given by the build system
+dnl CURL_SET_COMPILER_DEBUG_OPTS
+
 CURL_SET_COMPILER_OPTIMIZE_OPTS
 CURL_SET_COMPILER_WARNING_OPTS
 


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-9/curl.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- curl.spec	16 Mar 2009 08:18:03 -0000	1.84
+++ curl.spec	27 Apr 2009 07:29:42 -0000	1.85
@@ -1,16 +1,18 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 Patch1: curl-7.15.3-multilib.patch
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.17.1-badsocket.patch
+Patch4: curl-7.19.4-debug.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
 BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
 
@@ -49,6 +51,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
+%patch4 -p1 -b .debug
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -57,6 +60,7 @@
 done
 
 %build
+autoconf
 export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
 %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
@@ -140,6 +144,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Apr 27 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-4
+- fix configure.ac to not discard -g in CFLAGS, thanks to Debarshi Ray (#496778)
+
 * Mon Mar 16 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-3
 - make libcurl-devel multilib-ready (bug #488922)
 



From oget at fedoraproject.org  Mon Apr 27 07:44:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 07:44:41 +0000 (UTC)
Subject: rpms/jjack/F-11 import.log, NONE, 1.1 jjack.sh, NONE, 1.1 jjack.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427074441.E776270110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jjack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3311/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jjack.sh jjack.spec 
Log Message:
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build



--- NEW FILE import.log ---
jjack-0_3-2_fc10:F-11:jjack-0.3-2.fc10.src.rpm:1240818228


--- NEW FILE jjack.sh ---
#! /bin/sh
#
# Shell script to run the JJack Shell Application.
#

JAVA_HOME=/usr/lib/jvm/java
LIBRARY_PATH=/usr/lib
for arch in x86_64 ppc64; do
    if [[ $(uname -i) == "$arch" ]]; then
        LIBRARY_PATH=/usr/lib64
    fi
done
JJACK_HOME=${LIBRARY_PATH}/jjack
CP=${JAVA_HOME}/lib/dt.jar:${JJACK_HOME}/jjack.jar:${JJACK_HOME}/jjack-clients.jar
LP=${CP}
${JAVA_HOME}/bin/java -cp ${CP} -Djava.library.path=${LP} JJack "$@"


--- NEW FILE jjack.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jjack
Version:        0.3
Release:        2%{?dist}
Summary:        JACK audio driver for the Java Sound API
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://jjack.berlios.de/
# The original source file is 
# http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
# We re-encoded the MP3 files in the tarball in OGG format to produce
Source0:        %{name}-%{version}-FE.tar.gz
# Shell script to run the JJack Shell Application. Derived from the bin/jjack.sh
# script in the tarball
Source1:        %{name}.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  java-devel >= 1.5
BuildRequires:  ant
BuildRequires:  jpackage-utils
%if %{with_gcj}
BuildRequires:  java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%endif
Requires:       jpackage-utils
Requires:       java >= 1.5


%description
JJack is a JACK audio driver for the Java Sound API  and a framework for the
Java programming language  that allows Java applications to use the JACK Audio
Connection Kit. Audio processor clients can be designed to:

  * create their own sounds (as a synthesizer or sample-player)
  * change the sound-output of other clients (e.g. as an effects-device)
  * analyse the audio streams generated by other clients (e.g. display 
    the wave form)

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove percompiled binaries
for ext in class jar jnilib o so; do
   find -name "*.$ext" -exec rm -f '{}' \;
done

# Ugly hack to impose optflags
for flag in $RPM_OPT_FLAGS; do
   ANT_GCC_FLAGS+="<arg value=\"$flag\"/>\n      "
done
sed -i "s|\(<arg value=\"-fPIC\"/>\)|\1\n      $ANT_GCC_FLAGS|" make/build.xml

# We don't want do deal with complications during %%install
sed -i 's|/\${os.arch}/\${os.name}||' make/build.xml

# To dlopen the library correctly
sed -i 's|File(.*|File("%{_libdir}/%{name}/lib%{name}.so");|' \
   src/de/gulden/framework/jjack/JJackSystem.java

# We replace mp3 with ogg
for file in doc/www/examples.html README; do
   sed -i 's|mp3|ogg|g' $file
done

# Fix encoding
iconv -f iso8859-1 -t utf8 CHANGELOG -o tmpfile
touch -r CHANGELOG tmpfile
mv -f tmpfile CHANGELOG

%build
pushd make
   %ant -v all
popd

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}

# jar files
pushd lib
   for jarfile in %{name}*.jar; do
      jarname=${jarfile%.*}
      install -pm 644 $jarfile \
              $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarname-%{version}.jar
      ln -s $jarname-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarfile
   done
# native lib
   install -pm 755 lib%{name}.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/*  \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}/

# the wrapper script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}

# aot bits
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README
%{_libdir}/%{name}/
%{_bindir}/%{name}

%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:21:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 07:44:11 -0000	1.2
@@ -0,0 +1 @@
+jjack-0.3-FE.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:21:46 -0000	1.1
+++ sources	27 Apr 2009 07:44:11 -0000	1.2
@@ -0,0 +1 @@
+5c45d272344923ee8282c9b39783288c  jjack-0.3-FE.tar.gz



From oget at fedoraproject.org  Mon Apr 27 07:46:34 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 07:46:34 +0000 (UTC)
Subject: rpms/jjack/F-10 import.log, NONE, 1.1 jjack.sh, NONE, 1.1 jjack.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427074634.A02F170110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jjack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3901/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jjack.sh jjack.spec 
Log Message:
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build



--- NEW FILE import.log ---
jjack-0_3-2_fc10:F-10:jjack-0.3-2.fc10.src.rpm:1240818315


--- NEW FILE jjack.sh ---
#! /bin/sh
#
# Shell script to run the JJack Shell Application.
#

JAVA_HOME=/usr/lib/jvm/java
LIBRARY_PATH=/usr/lib
for arch in x86_64 ppc64; do
    if [[ $(uname -i) == "$arch" ]]; then
        LIBRARY_PATH=/usr/lib64
    fi
done
JJACK_HOME=${LIBRARY_PATH}/jjack
CP=${JAVA_HOME}/lib/dt.jar:${JJACK_HOME}/jjack.jar:${JJACK_HOME}/jjack-clients.jar
LP=${CP}
${JAVA_HOME}/bin/java -cp ${CP} -Djava.library.path=${LP} JJack "$@"


--- NEW FILE jjack.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jjack
Version:        0.3
Release:        2%{?dist}
Summary:        JACK audio driver for the Java Sound API
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://jjack.berlios.de/
# The original source file is 
# http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
# We re-encoded the MP3 files in the tarball in OGG format to produce
Source0:        %{name}-%{version}-FE.tar.gz
# Shell script to run the JJack Shell Application. Derived from the bin/jjack.sh
# script in the tarball
Source1:        %{name}.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  java-devel >= 1.5
BuildRequires:  ant
BuildRequires:  jpackage-utils
%if %{with_gcj}
BuildRequires:  java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%endif
Requires:       jpackage-utils
Requires:       java >= 1.5


%description
JJack is a JACK audio driver for the Java Sound API  and a framework for the
Java programming language  that allows Java applications to use the JACK Audio
Connection Kit. Audio processor clients can be designed to:

  * create their own sounds (as a synthesizer or sample-player)
  * change the sound-output of other clients (e.g. as an effects-device)
  * analyse the audio streams generated by other clients (e.g. display 
    the wave form)

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove percompiled binaries
for ext in class jar jnilib o so; do
   find -name "*.$ext" -exec rm -f '{}' \;
done

# Ugly hack to impose optflags
for flag in $RPM_OPT_FLAGS; do
   ANT_GCC_FLAGS+="<arg value=\"$flag\"/>\n      "
done
sed -i "s|\(<arg value=\"-fPIC\"/>\)|\1\n      $ANT_GCC_FLAGS|" make/build.xml

# We don't want do deal with complications during %%install
sed -i 's|/\${os.arch}/\${os.name}||' make/build.xml

# To dlopen the library correctly
sed -i 's|File(.*|File("%{_libdir}/%{name}/lib%{name}.so");|' \
   src/de/gulden/framework/jjack/JJackSystem.java

# We replace mp3 with ogg
for file in doc/www/examples.html README; do
   sed -i 's|mp3|ogg|g' $file
done

# Fix encoding
iconv -f iso8859-1 -t utf8 CHANGELOG -o tmpfile
touch -r CHANGELOG tmpfile
mv -f tmpfile CHANGELOG

%build
pushd make
   %ant -v all
popd

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}

# jar files
pushd lib
   for jarfile in %{name}*.jar; do
      jarname=${jarfile%.*}
      install -pm 644 $jarfile \
              $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarname-%{version}.jar
      ln -s $jarname-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarfile
   done
# native lib
   install -pm 755 lib%{name}.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/*  \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}/

# the wrapper script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}

# aot bits
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README
%{_libdir}/%{name}/
%{_bindir}/%{name}

%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:21:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 07:46:03 -0000	1.2
@@ -0,0 +1 @@
+jjack-0.3-FE.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:21:46 -0000	1.1
+++ sources	27 Apr 2009 07:46:04 -0000	1.2
@@ -0,0 +1 @@
+5c45d272344923ee8282c9b39783288c  jjack-0.3-FE.tar.gz



From oget at fedoraproject.org  Mon Apr 27 07:48:01 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 07:48:01 +0000 (UTC)
Subject: rpms/jjack/F-9 import.log, NONE, 1.1 jjack.sh, NONE, 1.1 jjack.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427074801.16C5B70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jjack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4416/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jjack.sh jjack.spec 
Log Message:
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build



--- NEW FILE import.log ---
jjack-0_3-2_fc10:F-9:jjack-0.3-2.fc10.src.rpm:1240818430


--- NEW FILE jjack.sh ---
#! /bin/sh
#
# Shell script to run the JJack Shell Application.
#

JAVA_HOME=/usr/lib/jvm/java
LIBRARY_PATH=/usr/lib
for arch in x86_64 ppc64; do
    if [[ $(uname -i) == "$arch" ]]; then
        LIBRARY_PATH=/usr/lib64
    fi
done
JJACK_HOME=${LIBRARY_PATH}/jjack
CP=${JAVA_HOME}/lib/dt.jar:${JJACK_HOME}/jjack.jar:${JJACK_HOME}/jjack-clients.jar
LP=${CP}
${JAVA_HOME}/bin/java -cp ${CP} -Djava.library.path=${LP} JJack "$@"


--- NEW FILE jjack.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jjack
Version:        0.3
Release:        2%{?dist}
Summary:        JACK audio driver for the Java Sound API
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://jjack.berlios.de/
# The original source file is 
# http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
# We re-encoded the MP3 files in the tarball in OGG format to produce
Source0:        %{name}-%{version}-FE.tar.gz
# Shell script to run the JJack Shell Application. Derived from the bin/jjack.sh
# script in the tarball
Source1:        %{name}.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  java-devel >= 1.5
BuildRequires:  ant
BuildRequires:  jpackage-utils
%if %{with_gcj}
BuildRequires:  java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%endif
Requires:       jpackage-utils
Requires:       java >= 1.5


%description
JJack is a JACK audio driver for the Java Sound API  and a framework for the
Java programming language  that allows Java applications to use the JACK Audio
Connection Kit. Audio processor clients can be designed to:

  * create their own sounds (as a synthesizer or sample-player)
  * change the sound-output of other clients (e.g. as an effects-device)
  * analyse the audio streams generated by other clients (e.g. display 
    the wave form)

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q

# Remove percompiled binaries
for ext in class jar jnilib o so; do
   find -name "*.$ext" -exec rm -f '{}' \;
done

# Ugly hack to impose optflags
for flag in $RPM_OPT_FLAGS; do
   ANT_GCC_FLAGS+="<arg value=\"$flag\"/>\n      "
done
sed -i "s|\(<arg value=\"-fPIC\"/>\)|\1\n      $ANT_GCC_FLAGS|" make/build.xml

# We don't want do deal with complications during %%install
sed -i 's|/\${os.arch}/\${os.name}||' make/build.xml

# To dlopen the library correctly
sed -i 's|File(.*|File("%{_libdir}/%{name}/lib%{name}.so");|' \
   src/de/gulden/framework/jjack/JJackSystem.java

# We replace mp3 with ogg
for file in doc/www/examples.html README; do
   sed -i 's|mp3|ogg|g' $file
done

# Fix encoding
iconv -f iso8859-1 -t utf8 CHANGELOG -o tmpfile
touch -r CHANGELOG tmpfile
mv -f tmpfile CHANGELOG

%build
pushd make
   %ant -v all
popd

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}

# jar files
pushd lib
   for jarfile in %{name}*.jar; do
      jarname=${jarfile%.*}
      install -pm 644 $jarfile \
              $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarname-%{version}.jar
      ln -s $jarname-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/$jarfile
   done
# native lib
   install -pm 755 lib%{name}.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/*  \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}/

# the wrapper script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}

# aot bits
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ] 
then
%{_bindir}/rebuild-gcj-db
fi
%endif


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README
%{_libdir}/%{name}/
%{_bindir}/%{name}

%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Sun Apr 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-2
- Minor update on the wrapper script

* Sun Mar 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:21:46 -0000	1.1
+++ .cvsignore	27 Apr 2009 07:47:30 -0000	1.2
@@ -0,0 +1 @@
+jjack-0.3-FE.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jjack/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:21:46 -0000	1.1
+++ sources	27 Apr 2009 07:47:30 -0000	1.2
@@ -0,0 +1 @@
+5c45d272344923ee8282c9b39783288c  jjack-0.3-FE.tar.gz



From cassmodiah at fedoraproject.org  Mon Apr 27 07:48:11 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 27 Apr 2009 07:48:11 +0000 (UTC)
Subject: rpms/backintime/devel backintime-0.9.22-remove-checks.patch, NONE, 
	1.1 backintime.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427074811.D1BD970110@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/backintime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4481/devel

Modified Files:
	.cvsignore sources 
Added Files:
	backintime-0.9.22-remove-checks.patch backintime.spec 
	import.log 
Log Message:


backintime-0.9.22-remove-checks.patch:

--- NEW FILE backintime-0.9.22-remove-checks.patch ---
diff -Naur backintime-0.9.22.orig/configure backintime-0.9.22/configure
--- backintime-0.9.22.orig/configure	2009-04-11 15:18:57.000000000 +0200
+++ backintime-0.9.22/configure	2009-04-24 19:17:57.000000000 +0200
@@ -27,36 +27,36 @@
 fi
 
 #check GNOME
-if [ $gnome = "--gnome" ]; then
-	if [ -z `which gnome-session` ]; then
-		echo "ERROR: Can't find GNOME !"
-		exit 1
-	fi
-fi
-
-if [ $gnome = "--auto-gnome" ]; then
-	if [ -z `which gnome-session` ]; then
-		gnome="--no-gnome"
-	else
-		gnome="--gnome"
-	fi
-fi
+#if [ $gnome = "--gnome" ]; then
+#	if [ -z `which gnome-session` ]; then
+#		echo "ERROR: Can't find GNOME !"
+#		exit 1
+#	fi
+#fi
+
+#if [ $gnome = "--auto-gnome" ]; then
+#	if [ -z `which gnome-session` ]; then
+#		gnome="--no-gnome"
+#	else
+#		gnome="--gnome"
+#	fi
+#fi
 
 #check KDE4
-if [ $kde4 = "--kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		echo "ERROR: Can't find KDE4 !"
-		exit 1
-	fi
-fi
-
-if [ $kde4 = "--auto-kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		kde4="--no-kde4"
-	else
-		kde4="--kde4"
-	fi
-fi
+#if [ $kde4 = "--kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		echo "ERROR: Can't find KDE4 !"
+#		exit 1
+#	fi
+#fi
+
+#if [ $kde4 = "--auto-kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		kde4="--no-kde4"
+#	else
+#		kde4="--kde4"
+#	fi
+#fi
 
 #print config
 echo "Common: $common"


--- NEW FILE backintime.spec ---
Name:            backintime
Version:         0.9.22
Release:         2%{?dist}
Summary:         Simple backup system 

Group:           Applications/Archiving
License:         GPLv2+
URL:             http://www.le-web.org/back-in-time/
Source0:         http://www.le-web.org/download/%{name}/%{name}-%{version}_src.tar.gz
Patch0:          backintime-0.9.22-remove-checks.patch
BuildArch:       noarch
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   desktop-file-utils
BuildRequires:   gettext


%description
Back In Time is a simple backup system for Linux inspired from 
???flyback project??? and ???TimeVault???. The backup is done by taking 
snapshots of a specified set of directories.


%package         common
Summary:         Common files for %{name}
Group:           Applications/Archiving
Requires:        python
Requires:        rsync


%description     common
This package contains non GUI files used by different GUI fontends.


%package         gnome
Summary:         Frontend for %{name}
Group:           Applications/Archiving
Requires:        %{name}-common = %{version}-%{release}
Requires:        pygtk2-libglade
Requires:        gnome-python2
Requires:        meld
Requires:        usermode-gtk


%description     gnome
Gnome frontend for %{name}


%package         kde
Summary:         Frontend for %{name}
Group:           Applications/Archiving
Requires:        %{name}-common = %{version}-%{release}
Requires:        xorg-x11-utils
Requires:        PyKDE4
Requires:        usermode-gtk


%description     kde
KDE frontend for %{name}


%prep
%setup -q
%patch0 -p1

sed -i 's|Exec=gksu backintime-gnome|Exec=backintime-gnome-root|g' \
       %{name}-gnome-root.desktop

sed -i 's|Exec=kdesudo -c backintime-kde4|Exec=backintime-kde4-root|g' \
       %{name}-kde4-root.desktop

%build
%configure --common --gnome --kde4
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     PREFIX="%{_prefix}" \
     DEST="%{buildroot}/%{_prefix}"

rm -rf %{buildroot}/%{_docdir}/%{name}*

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications \
        %{buildroot}/%{_datadir}/applications/%{name}-gnome.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/ \
        --add-category="Settings;" \
        %{buildroot}/%{_datadir}/applications/%{name}-gnome-root.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/kde4 \
        %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/kde4 \
        --add-category="Settings;" \
        %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4-root.desktop

mkdir -p %{buildroot}%{_sbindir}
cp -p %{buildroot}%{_bindir}/%{name}-gnome \
      %{buildroot}%{_sbindir}/%{name}-gnome-root
cp -p %{buildroot}%{_bindir}/%{name}-kde4 \
      %{buildroot}%{_sbindir}/%{name}-kde4-root

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-gnome-root

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-kde4-root

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-gnome-root
USER=root
PROGRAM=%{_sbindir}/%{name}-gnome-root
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-kde4-root
USER=root
PROGRAM=%{_sbindir}/%{name}-kde4-root
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-gnome-root
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-kde4-root
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

%find_lang %{name}

%clean
rm -rf %{buildroot}


%files common -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE README TODO TRANSLATIONS
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/applicationinstance.*
%{_datadir}/%{name}/%{name}.*
%{_datadir}/%{name}/config.*
%{_datadir}/%{name}/configfile.*
%{_datadir}/%{name}/guiapplicationinstance.*
%{_datadir}/%{name}/logger.*
%{_datadir}/%{name}/snapshots.*
%{_datadir}/%{name}/tools.*
%{_mandir}/man1/%{name}.1.gz


%files gnome
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}-gnome
%{_bindir}/%{name}-gnome-root
%{_sbindir}/%{name}-gnome-root
%{_datadir}/applications/%{name}-gnome.desktop
%{_datadir}/applications/%{name}-gnome-root.desktop
%{_datadir}/%{name}/gnome*
%doc %{_datadir}/gnome/help/%{name}/
%{_datadir}/omf/%{name}/
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-gnome-root
%config %{_sysconfdir}/security/console.apps/%{name}-gnome-root


%files kde
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}-kde4
%{_bindir}/%{name}-kde4-root
%{_sbindir}/%{name}-kde4-root
%{_datadir}/applications/kde4/%{name}-kde4.desktop
%{_datadir}/applications/kde4/%{name}-kde4-root.desktop
%{_datadir}/backintime/kde4*
%doc %{_datadir}/doc/kde4/HTML/en/%{name}/
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-kde4-root
%config %{_sysconfdir}/security/console.apps/%{name}-kde4-root


%changelog
* Sat Apr 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-2
- Remove Patch for desktop-files and do the changes in spec-file
- Change description of gnome package to "Gnome frontend for NAME" 
- Change description of kde package to "KDE frontend for NAME"
- Add TRANSLATIONS to DOC of common package
- Mark _DATADIR/gnome/help/NAME as DOC
- Mark _DATADIR/doc/kde4/HTML/en/NAME as DOC
- Use cp -p when copying from bindir to sbindir

* Wed Apr 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-1
- New upstream release
- Add Patch to remove the Desktopchecks in configure

* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.20-1
- New upstream release
- Add consolehelperstuff for root-access

* Tue Mar 17 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.16.1-1
- New upstream release

* Tue Mar 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.14-1
- Initial Package build


--- NEW FILE import.log ---
backintime-0_9_22-2_fc10:HEAD:backintime-0.9.22-2.fc10.src.rpm:1240818291


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:16:53 -0000	1.1
+++ .cvsignore	27 Apr 2009 07:47:41 -0000	1.2
@@ -0,0 +1 @@
+backintime-0.9.22_src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:16:53 -0000	1.1
+++ sources	27 Apr 2009 07:47:41 -0000	1.2
@@ -0,0 +1 @@
+d29aca14d0158f72e9585a895aa7bf10  backintime-0.9.22_src.tar.gz



From cassmodiah at fedoraproject.org  Mon Apr 27 07:51:04 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 27 Apr 2009 07:51:04 +0000 (UTC)
Subject: rpms/backintime/F-11 backintime-0.9.22-remove-checks.patch, NONE,
	1.1 backintime.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427075104.6F7D670110@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/backintime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5155/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	backintime-0.9.22-remove-checks.patch backintime.spec 
	import.log 
Log Message:


backintime-0.9.22-remove-checks.patch:

--- NEW FILE backintime-0.9.22-remove-checks.patch ---
diff -Naur backintime-0.9.22.orig/configure backintime-0.9.22/configure
--- backintime-0.9.22.orig/configure	2009-04-11 15:18:57.000000000 +0200
+++ backintime-0.9.22/configure	2009-04-24 19:17:57.000000000 +0200
@@ -27,36 +27,36 @@
 fi
 
 #check GNOME
-if [ $gnome = "--gnome" ]; then
-	if [ -z `which gnome-session` ]; then
-		echo "ERROR: Can't find GNOME !"
-		exit 1
-	fi
-fi
-
-if [ $gnome = "--auto-gnome" ]; then
-	if [ -z `which gnome-session` ]; then
-		gnome="--no-gnome"
-	else
-		gnome="--gnome"
-	fi
-fi
+#if [ $gnome = "--gnome" ]; then
+#	if [ -z `which gnome-session` ]; then
+#		echo "ERROR: Can't find GNOME !"
+#		exit 1
+#	fi
+#fi
+
+#if [ $gnome = "--auto-gnome" ]; then
+#	if [ -z `which gnome-session` ]; then
+#		gnome="--no-gnome"
+#	else
+#		gnome="--gnome"
+#	fi
+#fi
 
 #check KDE4
-if [ $kde4 = "--kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		echo "ERROR: Can't find KDE4 !"
-		exit 1
-	fi
-fi
-
-if [ $kde4 = "--auto-kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		kde4="--no-kde4"
-	else
-		kde4="--kde4"
-	fi
-fi
+#if [ $kde4 = "--kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		echo "ERROR: Can't find KDE4 !"
+#		exit 1
+#	fi
+#fi
+
+#if [ $kde4 = "--auto-kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		kde4="--no-kde4"
+#	else
+#		kde4="--kde4"
+#	fi
+#fi
 
 #print config
 echo "Common: $common"


--- NEW FILE backintime.spec ---
Name:            backintime
Version:         0.9.22
Release:         2%{?dist}
Summary:         Simple backup system 

Group:           Applications/Archiving
License:         GPLv2+
URL:             http://www.le-web.org/back-in-time/
Source0:         http://www.le-web.org/download/%{name}/%{name}-%{version}_src.tar.gz
Patch0:          backintime-0.9.22-remove-checks.patch
BuildArch:       noarch
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   desktop-file-utils
BuildRequires:   gettext


%description
Back In Time is a simple backup system for Linux inspired from 
???flyback project??? and ???TimeVault???. The backup is done by taking 
snapshots of a specified set of directories.


%package         common
Summary:         Common files for %{name}
Group:           Applications/Archiving
Requires:        python
Requires:        rsync


%description     common
This package contains non GUI files used by different GUI fontends.


%package         gnome
Summary:         Frontend for %{name}
Group:           Applications/Archiving
Requires:        %{name}-common = %{version}-%{release}
Requires:        pygtk2-libglade
Requires:        gnome-python2
Requires:        meld
Requires:        usermode-gtk


%description     gnome
Gnome frontend for %{name}


%package         kde
Summary:         Frontend for %{name}
Group:           Applications/Archiving
Requires:        %{name}-common = %{version}-%{release}
Requires:        xorg-x11-utils
Requires:        PyKDE4
Requires:        usermode-gtk


%description     kde
KDE frontend for %{name}


%prep
%setup -q
%patch0 -p1

sed -i 's|Exec=gksu backintime-gnome|Exec=backintime-gnome-root|g' \
       %{name}-gnome-root.desktop

sed -i 's|Exec=kdesudo -c backintime-kde4|Exec=backintime-kde4-root|g' \
       %{name}-kde4-root.desktop

%build
%configure --common --gnome --kde4
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     PREFIX="%{_prefix}" \
     DEST="%{buildroot}/%{_prefix}"

rm -rf %{buildroot}/%{_docdir}/%{name}*

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications \
        %{buildroot}/%{_datadir}/applications/%{name}-gnome.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/ \
        --add-category="Settings;" \
        %{buildroot}/%{_datadir}/applications/%{name}-gnome-root.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/kde4 \
        %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/kde4 \
        --add-category="Settings;" \
        %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4-root.desktop

mkdir -p %{buildroot}%{_sbindir}
cp -p %{buildroot}%{_bindir}/%{name}-gnome \
      %{buildroot}%{_sbindir}/%{name}-gnome-root
cp -p %{buildroot}%{_bindir}/%{name}-kde4 \
      %{buildroot}%{_sbindir}/%{name}-kde4-root

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-gnome-root

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-kde4-root

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-gnome-root
USER=root
PROGRAM=%{_sbindir}/%{name}-gnome-root
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-kde4-root
USER=root
PROGRAM=%{_sbindir}/%{name}-kde4-root
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-gnome-root
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-kde4-root
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

%find_lang %{name}

%clean
rm -rf %{buildroot}


%files common -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE README TODO TRANSLATIONS
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/applicationinstance.*
%{_datadir}/%{name}/%{name}.*
%{_datadir}/%{name}/config.*
%{_datadir}/%{name}/configfile.*
%{_datadir}/%{name}/guiapplicationinstance.*
%{_datadir}/%{name}/logger.*
%{_datadir}/%{name}/snapshots.*
%{_datadir}/%{name}/tools.*
%{_mandir}/man1/%{name}.1.gz


%files gnome
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}-gnome
%{_bindir}/%{name}-gnome-root
%{_sbindir}/%{name}-gnome-root
%{_datadir}/applications/%{name}-gnome.desktop
%{_datadir}/applications/%{name}-gnome-root.desktop
%{_datadir}/%{name}/gnome*
%doc %{_datadir}/gnome/help/%{name}/
%{_datadir}/omf/%{name}/
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-gnome-root
%config %{_sysconfdir}/security/console.apps/%{name}-gnome-root


%files kde
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}-kde4
%{_bindir}/%{name}-kde4-root
%{_sbindir}/%{name}-kde4-root
%{_datadir}/applications/kde4/%{name}-kde4.desktop
%{_datadir}/applications/kde4/%{name}-kde4-root.desktop
%{_datadir}/backintime/kde4*
%doc %{_datadir}/doc/kde4/HTML/en/%{name}/
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-kde4-root
%config %{_sysconfdir}/security/console.apps/%{name}-kde4-root


%changelog
* Sat Apr 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-2
- Remove Patch for desktop-files and do the changes in spec-file
- Change description of gnome package to "Gnome frontend for NAME" 
- Change description of kde package to "KDE frontend for NAME"
- Add TRANSLATIONS to DOC of common package
- Mark _DATADIR/gnome/help/NAME as DOC
- Mark _DATADIR/doc/kde4/HTML/en/NAME as DOC
- Use cp -p when copying from bindir to sbindir

* Wed Apr 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-1
- New upstream release
- Add Patch to remove the Desktopchecks in configure

* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.20-1
- New upstream release
- Add consolehelperstuff for root-access

* Tue Mar 17 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.16.1-1
- New upstream release

* Tue Mar 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.14-1
- Initial Package build


--- NEW FILE import.log ---
backintime-0_9_22-2_fc10:F-11:backintime-0.9.22-2.fc10.src.rpm:1240818532


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:16:53 -0000	1.1
+++ .cvsignore	27 Apr 2009 07:50:33 -0000	1.2
@@ -0,0 +1 @@
+backintime-0.9.22_src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:16:53 -0000	1.1
+++ sources	27 Apr 2009 07:50:33 -0000	1.2
@@ -0,0 +1 @@
+d29aca14d0158f72e9585a895aa7bf10  backintime-0.9.22_src.tar.gz



From cassmodiah at fedoraproject.org  Mon Apr 27 07:52:57 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 27 Apr 2009 07:52:57 +0000 (UTC)
Subject: rpms/backintime/F-10 backintime-0.9.22-remove-checks.patch, NONE,
	1.1 backintime.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427075257.37ECE70110@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/backintime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5631/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	backintime-0.9.22-remove-checks.patch backintime.spec 
	import.log 
Log Message:


backintime-0.9.22-remove-checks.patch:

--- NEW FILE backintime-0.9.22-remove-checks.patch ---
diff -Naur backintime-0.9.22.orig/configure backintime-0.9.22/configure
--- backintime-0.9.22.orig/configure	2009-04-11 15:18:57.000000000 +0200
+++ backintime-0.9.22/configure	2009-04-24 19:17:57.000000000 +0200
@@ -27,36 +27,36 @@
 fi
 
 #check GNOME
-if [ $gnome = "--gnome" ]; then
-	if [ -z `which gnome-session` ]; then
-		echo "ERROR: Can't find GNOME !"
-		exit 1
-	fi
-fi
-
-if [ $gnome = "--auto-gnome" ]; then
-	if [ -z `which gnome-session` ]; then
-		gnome="--no-gnome"
-	else
-		gnome="--gnome"
-	fi
-fi
+#if [ $gnome = "--gnome" ]; then
+#	if [ -z `which gnome-session` ]; then
+#		echo "ERROR: Can't find GNOME !"
+#		exit 1
+#	fi
+#fi
+
+#if [ $gnome = "--auto-gnome" ]; then
+#	if [ -z `which gnome-session` ]; then
+#		gnome="--no-gnome"
+#	else
+#		gnome="--gnome"
+#	fi
+#fi
 
 #check KDE4
-if [ $kde4 = "--kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		echo "ERROR: Can't find KDE4 !"
-		exit 1
-	fi
-fi
-
-if [ $kde4 = "--auto-kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		kde4="--no-kde4"
-	else
-		kde4="--kde4"
-	fi
-fi
+#if [ $kde4 = "--kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		echo "ERROR: Can't find KDE4 !"
+#		exit 1
+#	fi
+#fi
+
+#if [ $kde4 = "--auto-kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		kde4="--no-kde4"
+#	else
+#		kde4="--kde4"
+#	fi
+#fi
 
 #print config
 echo "Common: $common"


--- NEW FILE backintime.spec ---
Name:            backintime
Version:         0.9.22
Release:         2%{?dist}
Summary:         Simple backup system 

Group:           Applications/Archiving
License:         GPLv2+
URL:             http://www.le-web.org/back-in-time/
Source0:         http://www.le-web.org/download/%{name}/%{name}-%{version}_src.tar.gz
Patch0:          backintime-0.9.22-remove-checks.patch
BuildArch:       noarch
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   desktop-file-utils
BuildRequires:   gettext


%description
Back In Time is a simple backup system for Linux inspired from 
???flyback project??? and ???TimeVault???. The backup is done by taking 
snapshots of a specified set of directories.


%package         common
Summary:         Common files for %{name}
Group:           Applications/Archiving
Requires:        python
Requires:        rsync


%description     common
This package contains non GUI files used by different GUI fontends.


%package         gnome
Summary:         Frontend for %{name}
Group:           Applications/Archiving
Requires:        %{name}-common = %{version}-%{release}
Requires:        pygtk2-libglade
Requires:        gnome-python2
Requires:        meld
Requires:        usermode-gtk


%description     gnome
Gnome frontend for %{name}


%package         kde
Summary:         Frontend for %{name}
Group:           Applications/Archiving
Requires:        %{name}-common = %{version}-%{release}
Requires:        xorg-x11-utils
Requires:        PyKDE4
Requires:        usermode-gtk


%description     kde
KDE frontend for %{name}


%prep
%setup -q
%patch0 -p1

sed -i 's|Exec=gksu backintime-gnome|Exec=backintime-gnome-root|g' \
       %{name}-gnome-root.desktop

sed -i 's|Exec=kdesudo -c backintime-kde4|Exec=backintime-kde4-root|g' \
       %{name}-kde4-root.desktop

%build
%configure --common --gnome --kde4
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     PREFIX="%{_prefix}" \
     DEST="%{buildroot}/%{_prefix}"

rm -rf %{buildroot}/%{_docdir}/%{name}*

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications \
        %{buildroot}/%{_datadir}/applications/%{name}-gnome.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/ \
        --add-category="Settings;" \
        %{buildroot}/%{_datadir}/applications/%{name}-gnome-root.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/kde4 \
        %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4.desktop

desktop-file-install \
        --dir=%{buildroot}/%{_datadir}/applications/kde4 \
        --add-category="Settings;" \
        %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4-root.desktop

mkdir -p %{buildroot}%{_sbindir}
cp -p %{buildroot}%{_bindir}/%{name}-gnome \
      %{buildroot}%{_sbindir}/%{name}-gnome-root
cp -p %{buildroot}%{_bindir}/%{name}-kde4 \
      %{buildroot}%{_sbindir}/%{name}-kde4-root

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-gnome-root

ln -s consolehelper \
      %{buildroot}%{_bindir}/%{name}-kde4-root

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-gnome-root
USER=root
PROGRAM=%{_sbindir}/%{name}-gnome-root
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-kde4-root
USER=root
PROGRAM=%{_sbindir}/%{name}-kde4-root
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-gnome-root
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-kde4-root
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

%find_lang %{name}

%clean
rm -rf %{buildroot}


%files common -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE README TODO TRANSLATIONS
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/applicationinstance.*
%{_datadir}/%{name}/%{name}.*
%{_datadir}/%{name}/config.*
%{_datadir}/%{name}/configfile.*
%{_datadir}/%{name}/guiapplicationinstance.*
%{_datadir}/%{name}/logger.*
%{_datadir}/%{name}/snapshots.*
%{_datadir}/%{name}/tools.*
%{_mandir}/man1/%{name}.1.gz


%files gnome
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}-gnome
%{_bindir}/%{name}-gnome-root
%{_sbindir}/%{name}-gnome-root
%{_datadir}/applications/%{name}-gnome.desktop
%{_datadir}/applications/%{name}-gnome-root.desktop
%{_datadir}/%{name}/gnome*
%doc %{_datadir}/gnome/help/%{name}/
%{_datadir}/omf/%{name}/
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-gnome-root
%config %{_sysconfdir}/security/console.apps/%{name}-gnome-root


%files kde
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}-kde4
%{_bindir}/%{name}-kde4-root
%{_sbindir}/%{name}-kde4-root
%{_datadir}/applications/kde4/%{name}-kde4.desktop
%{_datadir}/applications/kde4/%{name}-kde4-root.desktop
%{_datadir}/backintime/kde4*
%doc %{_datadir}/doc/kde4/HTML/en/%{name}/
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-kde4-root
%config %{_sysconfdir}/security/console.apps/%{name}-kde4-root


%changelog
* Sat Apr 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-2
- Remove Patch for desktop-files and do the changes in spec-file
- Change description of gnome package to "Gnome frontend for NAME" 
- Change description of kde package to "KDE frontend for NAME"
- Add TRANSLATIONS to DOC of common package
- Mark _DATADIR/gnome/help/NAME as DOC
- Mark _DATADIR/doc/kde4/HTML/en/NAME as DOC
- Use cp -p when copying from bindir to sbindir

* Wed Apr 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-1
- New upstream release
- Add Patch to remove the Desktopchecks in configure

* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.20-1
- New upstream release
- Add consolehelperstuff for root-access

* Tue Mar 17 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.16.1-1
- New upstream release

* Tue Mar 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.14-1
- Initial Package build


--- NEW FILE import.log ---
backintime-0_9_22-2_fc10:F-10:backintime-0.9.22-2.fc10.src.rpm:1240818703


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:16:53 -0000	1.1
+++ .cvsignore	27 Apr 2009 07:52:26 -0000	1.2
@@ -0,0 +1 @@
+backintime-0.9.22_src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:16:53 -0000	1.1
+++ sources	27 Apr 2009 07:52:26 -0000	1.2
@@ -0,0 +1 @@
+d29aca14d0158f72e9585a895aa7bf10  backintime-0.9.22_src.tar.gz



From kdudka at fedoraproject.org  Mon Apr 27 08:37:55 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Mon, 27 Apr 2009 08:37:55 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.4-nss-leak2.patch, NONE, 1.1 curl.spec,
	1.96, 1.97
Message-ID: <20090427083755.BCA5370110@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12028

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.4-nss-leak2.patch 
Log Message:
fix curl/nss memory leaks while using client certificate (#453612)

curl-7.19.4-nss-leak2.patch:

--- NEW FILE curl-7.19.4-nss-leak2.patch ---
diff -ruNp curl-7.19.4.orig/lib/nss.c curl-7.19.4/lib/nss.c
--- curl-7.19.4.orig/lib/nss.c	2009-04-27 09:48:12.548102000 +0200
+++ curl-7.19.4/lib/nss.c	2009-04-27 09:48:32.993420443 +0200
@@ -527,6 +527,7 @@ static int nss_load_key(struct connectda
     return 0;
   }
   free(parg);
+  PK11_FreeSlot(slot);
 
   return 1;
 #else
@@ -819,9 +820,9 @@ static SECStatus SelectClientCert(void *
                                   struct CERTCertificateStr **pRetCert,
                                   struct SECKEYPrivateKeyStr **pRetKey)
 {
-  CERTCertificate *cert;
   SECKEYPrivateKey *privKey;
-  char *nickname = (char *)arg;
+  struct ssl_connect_data *connssl = (struct ssl_connect_data *) arg;
+  char *nickname = connssl->client_nickname;
   void *proto_win = NULL;
   SECStatus secStatus = SECFailure;
   PK11SlotInfo *slot;
@@ -832,34 +833,35 @@ static SECStatus SelectClientCert(void *
   if(!nickname)
     return secStatus;
 
-  cert = PK11_FindCertFromNickname(nickname, proto_win);
-  if(cert) {
+  connssl->client_cert = PK11_FindCertFromNickname(nickname, proto_win);
+  if(connssl->client_cert) {
 
     if(!strncmp(nickname, "PEM Token", 9)) {
       CK_SLOT_ID slotID = 1; /* hardcoded for now */
       char slotname[SLOTSIZE];
       snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
       slot = PK11_FindSlotByName(slotname);
-      privKey = PK11_FindPrivateKeyFromCert(slot, cert, NULL);
+      privKey = PK11_FindPrivateKeyFromCert(slot, connssl->client_cert, NULL);
       PK11_FreeSlot(slot);
       if(privKey) {
         secStatus = SECSuccess;
       }
     }
     else {
-      privKey = PK11_FindKeyByAnyCert(cert, proto_win);
+      privKey = PK11_FindKeyByAnyCert(connssl->client_cert, proto_win);
       if(privKey)
         secStatus = SECSuccess;
     }
   }
 
   if(secStatus == SECSuccess) {
-    *pRetCert = cert;
+    *pRetCert = connssl->client_cert;
     *pRetKey = privKey;
   }
   else {
-    if(cert)
-      CERT_DestroyCertificate(cert);
+    if(connssl->client_cert)
+      CERT_DestroyCertificate(connssl->client_cert);
+    connssl->client_cert = NULL;
   }
 
   return secStatus;
@@ -891,8 +893,12 @@ void Curl_nss_cleanup(void)
    * as a safety feature.
    */
   PR_Lock(nss_initlock);
-  if (initialized)
+  if (initialized) {
+    if(mod)
+      SECMOD_DestroyModule(mod);
+    mod = NULL;
     NSS_Shutdown();
+  }
   PR_Unlock(nss_initlock);
 
   PR_DestroyLock(nss_initlock);
@@ -940,6 +946,8 @@ void Curl_nss_close(struct connectdata *
       free(connssl->client_nickname);
       connssl->client_nickname = NULL;
     }
+    if(connssl->client_cert)
+      CERT_DestroyCertificate(connssl->client_cert);
     if(connssl->key)
       (void)PK11_DestroyGenericObject(connssl->key);
     if(connssl->cacert[1])
@@ -981,6 +989,7 @@ CURLcode Curl_nss_connect(struct connect
   if (connssl->state == ssl_connection_complete)
     return CURLE_OK;
 
+  connssl->client_cert = NULL;
   connssl->cacert[0] = NULL;
   connssl->cacert[1] = NULL;
   connssl->key = NULL;
@@ -1207,8 +1216,7 @@ CURLcode Curl_nss_connect(struct connect
 
     if(SSL_GetClientAuthDataHook(model,
                                  (SSLGetClientAuthData) SelectClientCert,
-                                 (void *)connssl->client_nickname) !=
-       SECSuccess) {
+                                 (void *)connssl) != SECSuccess) {
       curlerr = CURLE_SSL_CERTPROBLEM;
       goto error;
     }
diff -ruNp curl-7.19.4.orig/lib/urldata.h curl-7.19.4/lib/urldata.h
--- curl-7.19.4.orig/lib/urldata.h	2009-04-27 09:48:12.550102000 +0200
+++ curl-7.19.4/lib/urldata.h	2009-04-27 09:48:19.821215391 +0200
@@ -211,6 +211,7 @@ struct ssl_connect_data {
 #ifdef USE_NSS
   PRFileDesc *handle;
   char *client_nickname;
+  CERTCertificate *client_cert;
 #ifdef HAVE_PK11_CREATEGENERICOBJECT
   PK11GenericObject *key;
   PK11GenericObject *cacert[2];


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- curl.spec	22 Apr 2009 10:40:17 -0000	1.96
+++ curl.spec	27 Apr 2009 08:37:25 -0000	1.97
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Patch5: curl-7.19.4-enable-aes.patch
 Patch6: curl-7.19.4-nss-leak.patch
 Patch7: curl-7.19.4-debug.patch
+Patch8: curl-7.19.4-nss-leak2.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 %patch5 -p1 -b .enableaes
 %patch6 -p1 -b .nssleak
 %patch7 -p1 -b .debug
+%patch8 -p1 -b .nssleak2
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -150,6 +152,10 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Apr 27 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-10
+- fix curl/nss memory leaks while using client certificate (#453612, accepted
+  by upstream)
+
 * Wed Apr 22 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-9
 - add missing BuildRequire for autoconf
 



From sciurius at fedoraproject.org  Mon Apr 27 09:03:24 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 27 Apr 2009 09:03:24 +0000 (UTC)
Subject: rpms/perl-Text-CSV/devel import.log, NONE, 1.1 perl-Text-CSV.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427090324.1A8EE70110@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Text-CSV/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15623/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-CSV.spec 
Log Message:
Setup of perl-Text-CSV.



--- NEW FILE import.log ---
perl-Text-CSV-1_10-1_fc11:HEAD:perl-Text-CSV-1.10-1.fc11.src.rpm:1240822891


--- NEW FILE perl-Text-CSV.spec ---
Name:		perl-Text-CSV
Version:	1.10
Release:	1%{?dist}
Summary:	Comma-separated values manipulator

Group:		Development/Libraries
License:	GPL+ or Artistic
URL:		http://search.cpan.org/dist/Text-CSV/
Source0:	http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/Text-CSV-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(IO::Handle)

BuildArch:	noarch

BuildRequires:	perl(ExtUtils::MakeMaker)

# For test suite
BuildRequires:	perl(Test::More)
BuildRequires:	perl(IO::Handle)

%description
Text::CSV provides facilities for the composition and decomposition of
comma-separated values.  An instance of the Text::CSV class can combine
fields into a CSV string and parse a CSV string into fields.

The module accepts either strings or files as input and can utilize any
user-specified characters as delimiters, separators, and escapes so it is
perhaps better called ASV (anything separated values) rather than just CSV.

%prep
%setup -q -n Text-CSV-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test TEST_VERBOSE=1

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Sat Jan 31 2009 Johan Vromans <jvromans at squirrel.nl> 1.10-1
- Initial Fedora RPM version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:27:55 -0000	1.1
+++ .cvsignore	27 Apr 2009 09:02:53 -0000	1.2
@@ -0,0 +1 @@
+Text-CSV-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:27:55 -0000	1.1
+++ sources	27 Apr 2009 09:02:53 -0000	1.2
@@ -0,0 +1 @@
+ea28c3e4d37125b34c68ce2a03e6315a  Text-CSV-1.10.tar.gz



From sciurius at fedoraproject.org  Mon Apr 27 09:05:27 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 27 Apr 2009 09:05:27 +0000 (UTC)
Subject: rpms/perl-Text-CSV/F-11 import.log, NONE, 1.1 perl-Text-CSV.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427090528.03EBB70110@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Text-CSV/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16090/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-CSV.spec 
Log Message:
Setup of perl-Text-CSV.



--- NEW FILE import.log ---
perl-Text-CSV-1_10-1_fc11:F-11:perl-Text-CSV-1.10-1.fc11.src.rpm:1240823019


--- NEW FILE perl-Text-CSV.spec ---
Name:		perl-Text-CSV
Version:	1.10
Release:	1%{?dist}
Summary:	Comma-separated values manipulator

Group:		Development/Libraries
License:	GPL+ or Artistic
URL:		http://search.cpan.org/dist/Text-CSV/
Source0:	http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/Text-CSV-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(IO::Handle)

BuildArch:	noarch

BuildRequires:	perl(ExtUtils::MakeMaker)

# For test suite
BuildRequires:	perl(Test::More)
BuildRequires:	perl(IO::Handle)

%description
Text::CSV provides facilities for the composition and decomposition of
comma-separated values.  An instance of the Text::CSV class can combine
fields into a CSV string and parse a CSV string into fields.

The module accepts either strings or files as input and can utilize any
user-specified characters as delimiters, separators, and escapes so it is
perhaps better called ASV (anything separated values) rather than just CSV.

%prep
%setup -q -n Text-CSV-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test TEST_VERBOSE=1

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Sat Jan 31 2009 Johan Vromans <jvromans at squirrel.nl> 1.10-1
- Initial Fedora RPM version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:27:55 -0000	1.1
+++ .cvsignore	27 Apr 2009 09:04:57 -0000	1.2
@@ -0,0 +1 @@
+Text-CSV-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:27:55 -0000	1.1
+++ sources	27 Apr 2009 09:04:57 -0000	1.2
@@ -0,0 +1 @@
+ea28c3e4d37125b34c68ce2a03e6315a  Text-CSV-1.10.tar.gz



From sciurius at fedoraproject.org  Mon Apr 27 09:08:20 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 27 Apr 2009 09:08:20 +0000 (UTC)
Subject: rpms/perl-Text-CSV/F-10 import.log, NONE, 1.1 perl-Text-CSV.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427090820.6A90970110@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Text-CSV/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16547/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Text-CSV.spec 
Log Message:
Setup for perl-Text-CSV.



--- NEW FILE import.log ---
perl-Text-CSV-1_10-1_fc11:F-10:perl-Text-CSV-1.10-1.fc11.src.rpm:1240823127


--- NEW FILE perl-Text-CSV.spec ---
Name:		perl-Text-CSV
Version:	1.10
Release:	1%{?dist}
Summary:	Comma-separated values manipulator

Group:		Development/Libraries
License:	GPL+ or Artistic
URL:		http://search.cpan.org/dist/Text-CSV/
Source0:	http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/Text-CSV-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(IO::Handle)

BuildArch:	noarch

BuildRequires:	perl(ExtUtils::MakeMaker)

# For test suite
BuildRequires:	perl(Test::More)
BuildRequires:	perl(IO::Handle)

%description
Text::CSV provides facilities for the composition and decomposition of
comma-separated values.  An instance of the Text::CSV class can combine
fields into a CSV string and parse a CSV string into fields.

The module accepts either strings or files as input and can utilize any
user-specified characters as delimiters, separators, and escapes so it is
perhaps better called ASV (anything separated values) rather than just CSV.

%prep
%setup -q -n Text-CSV-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test TEST_VERBOSE=1

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Sat Jan 31 2009 Johan Vromans <jvromans at squirrel.nl> 1.10-1
- Initial Fedora RPM version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:27:55 -0000	1.1
+++ .cvsignore	27 Apr 2009 09:07:49 -0000	1.2
@@ -0,0 +1 @@
+Text-CSV-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:27:55 -0000	1.1
+++ sources	27 Apr 2009 09:07:50 -0000	1.2
@@ -0,0 +1 @@
+ea28c3e4d37125b34c68ce2a03e6315a  Text-CSV-1.10.tar.gz



From sciurius at fedoraproject.org  Mon Apr 27 09:22:28 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 27 Apr 2009 09:22:28 +0000 (UTC)
Subject: rpms/perl-Data-Report/devel import.log, NONE,
	1.1 perl-Data-Report-0.10-csv.patch, NONE,
	1.1 perl-Data-Report.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427092228.90E0070110@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17979/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Data-Report-0.10-csv.patch 
	perl-Data-Report.spec 
Log Message:
Setup for perl-Data-Report.



--- NEW FILE import.log ---
perl-Data-Report-0_10-1_fc11:HEAD:perl-Data-Report-0.10-1.fc11.src.rpm:1240823954

perl-Data-Report-0.10-csv.patch:

--- NEW FILE perl-Data-Report-0.10-csv.patch ---
--- Build.PL~	2008-08-18 11:52:11.000000000 +0200
+++ Build.PL	2009-01-30 18:27:55.000000000 +0100
@@ -16,7 +16,7 @@
 
     build_requires => {
         'Test::More' => 0,
-        'Text::CSV'  => 1.00,
+        'Text::CSV_XS'  => 0.30,
     },
 
 #    auto_features => {


--- NEW FILE perl-Data-Report.spec ---
Name:		perl-Data-Report
Version:	0.10
Release:	1%{?dist}
Summary:	A flexible plugin-driven reporting framework

Group:		Development/Libraries
License:	GPL+ or Artistic
URL:		http://search.cpan.org/dist/Data-Report/
Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
Patch0:		%{name}-%{version}-csv.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(Text::CSV_XS)

BuildArch:	noarch

BuildRequires:	perl(Module::Build)

# For test suite
BuildRequires:	perl(Test::More)
BuildRequires:	perl(Text::CSV_XS)

%description
Data::Report is a framework for report generation.

You define the columns, add the data row by row, and get reports in
text, HTML, CSV and so on. Textual ornaments like extra empty lines,
dashed lines, and cell lines can be added in a way similar to HTML
style sheets.

%prep
%setup -q -n Data-Report-%{version}

# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
%patch0 -p0 -b .csv

%build
%{__perl} Build.PL --installdirs=vendor
./Build

%check
./Build test verbose=1

%install
%{__rm} -rf $RPM_BUILD_ROOT
./Build install --installdirs=vendor --destdir %{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
/usr/bin/find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> 0.10-1
- Initial Fedora RPM version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:25:34 -0000	1.1
+++ .cvsignore	27 Apr 2009 09:21:57 -0000	1.2
@@ -0,0 +1 @@
+Data-Report-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:25:34 -0000	1.1
+++ sources	27 Apr 2009 09:21:58 -0000	1.2
@@ -0,0 +1 @@
+5cc5a3872c4c2d59b3461d30505a22ef  Data-Report-0.10.tar.gz



From sciurius at fedoraproject.org  Mon Apr 27 09:25:22 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 27 Apr 2009 09:25:22 +0000 (UTC)
Subject: rpms/perl-Data-Report/F-11 import.log, NONE,
	1.1 perl-Data-Report-0.10-csv.patch, NONE,
	1.1 perl-Data-Report.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427092522.E689770110@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18474/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Data-Report-0.10-csv.patch 
	perl-Data-Report.spec 
Log Message:
Setup for perl-Data-Report.



--- NEW FILE import.log ---
perl-Data-Report-0_10-1_fc11:F-11:perl-Data-Report-0.10-1.fc11.src.rpm:1240824217

perl-Data-Report-0.10-csv.patch:

--- NEW FILE perl-Data-Report-0.10-csv.patch ---
--- Build.PL~	2008-08-18 11:52:11.000000000 +0200
+++ Build.PL	2009-01-30 18:27:55.000000000 +0100
@@ -16,7 +16,7 @@
 
     build_requires => {
         'Test::More' => 0,
-        'Text::CSV'  => 1.00,
+        'Text::CSV_XS'  => 0.30,
     },
 
 #    auto_features => {


--- NEW FILE perl-Data-Report.spec ---
Name:		perl-Data-Report
Version:	0.10
Release:	1%{?dist}
Summary:	A flexible plugin-driven reporting framework

Group:		Development/Libraries
License:	GPL+ or Artistic
URL:		http://search.cpan.org/dist/Data-Report/
Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
Patch0:		%{name}-%{version}-csv.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(Text::CSV_XS)

BuildArch:	noarch

BuildRequires:	perl(Module::Build)

# For test suite
BuildRequires:	perl(Test::More)
BuildRequires:	perl(Text::CSV_XS)

%description
Data::Report is a framework for report generation.

You define the columns, add the data row by row, and get reports in
text, HTML, CSV and so on. Textual ornaments like extra empty lines,
dashed lines, and cell lines can be added in a way similar to HTML
style sheets.

%prep
%setup -q -n Data-Report-%{version}

# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
%patch0 -p0 -b .csv

%build
%{__perl} Build.PL --installdirs=vendor
./Build

%check
./Build test verbose=1

%install
%{__rm} -rf $RPM_BUILD_ROOT
./Build install --installdirs=vendor --destdir %{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
/usr/bin/find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> 0.10-1
- Initial Fedora RPM version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:25:34 -0000	1.1
+++ .cvsignore	27 Apr 2009 09:24:52 -0000	1.2
@@ -0,0 +1 @@
+Data-Report-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:25:34 -0000	1.1
+++ sources	27 Apr 2009 09:24:52 -0000	1.2
@@ -0,0 +1 @@
+5cc5a3872c4c2d59b3461d30505a22ef  Data-Report-0.10.tar.gz



From sciurius at fedoraproject.org  Mon Apr 27 09:33:20 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 27 Apr 2009 09:33:20 +0000 (UTC)
Subject: rpms/perl-Data-Report/F-10 import.log, NONE,
	1.1 perl-Data-Report-0.10-csv.patch, NONE,
	1.1 perl-Data-Report.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427093320.143587013C@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19531/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Data-Report-0.10-csv.patch 
	perl-Data-Report.spec 
Log Message:
Setup for perl-Data-Report.



--- NEW FILE import.log ---
perl-Data-Report-0_10-1_fc11:F-10:perl-Data-Report-0.10-1.fc11.src.rpm:1240824550

perl-Data-Report-0.10-csv.patch:

--- NEW FILE perl-Data-Report-0.10-csv.patch ---
--- Build.PL~	2008-08-18 11:52:11.000000000 +0200
+++ Build.PL	2009-01-30 18:27:55.000000000 +0100
@@ -16,7 +16,7 @@
 
     build_requires => {
         'Test::More' => 0,
-        'Text::CSV'  => 1.00,
+        'Text::CSV_XS'  => 0.30,
     },
 
 #    auto_features => {


--- NEW FILE perl-Data-Report.spec ---
Name:		perl-Data-Report
Version:	0.10
Release:	1%{?dist}
Summary:	A flexible plugin-driven reporting framework

Group:		Development/Libraries
License:	GPL+ or Artistic
URL:		http://search.cpan.org/dist/Data-Report/
Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
Patch0:		%{name}-%{version}-csv.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(Text::CSV_XS)

BuildArch:	noarch

BuildRequires:	perl(Module::Build)

# For test suite
BuildRequires:	perl(Test::More)
BuildRequires:	perl(Text::CSV_XS)

%description
Data::Report is a framework for report generation.

You define the columns, add the data row by row, and get reports in
text, HTML, CSV and so on. Textual ornaments like extra empty lines,
dashed lines, and cell lines can be added in a way similar to HTML
style sheets.

%prep
%setup -q -n Data-Report-%{version}

# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
%patch0 -p0 -b .csv

%build
%{__perl} Build.PL --installdirs=vendor
./Build

%check
./Build test verbose=1

%install
%{__rm} -rf $RPM_BUILD_ROOT
./Build install --installdirs=vendor --destdir %{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
/usr/bin/find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> 0.10-1
- Initial Fedora RPM version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:25:34 -0000	1.1
+++ .cvsignore	27 Apr 2009 09:32:49 -0000	1.2
@@ -0,0 +1 @@
+Data-Report-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:25:34 -0000	1.1
+++ sources	27 Apr 2009 09:32:49 -0000	1.2
@@ -0,0 +1 @@
+5cc5a3872c4c2d59b3461d30505a22ef  Data-Report-0.10.tar.gz



From jzeleny at fedoraproject.org  Mon Apr 27 09:56:18 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 27 Apr 2009 09:56:18 +0000 (UTC)
Subject: rpms/fcoe-utils/F-11 fcoe-utils.spec,1.1,1.2
Message-ID: <20090427095618.CD72870110@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22361

Modified Files:
	fcoe-utils.spec 
Log Message:
added libhbalinux to Requires (#497605)


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/F-11/fcoe-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcoe-utils.spec	10 Apr 2009 07:31:57 -0000	1.1
+++ fcoe-utils.spec	27 Apr 2009 09:55:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libhbaapi-devel dcbd-devel
-Requires:         dcbd
+Requires:         dcbd libhbalinux
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Wed Apr 27 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-4
+- added libhbalinux to Requires (#497605)
+
 * Wed Apr 8 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-3
 - more minor corrections in spec file
 



From mmaslano at fedoraproject.org  Mon Apr 27 10:22:53 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 27 Apr 2009 10:22:53 +0000 (UTC)
Subject: rpms/cronie/devel .cvsignore, 1.4, 1.5 cronie.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <20090427102253.7E92C70110@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27441

Modified Files:
	.cvsignore cronie.spec sources 
Log Message:
* Mon Apr 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 1.3-1
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Jun 2008 14:07:20 -0000	1.4
+++ .cvsignore	27 Apr 2009 10:22:21 -0000	1.5
@@ -1 +1 @@
-cronie-1.2.tar.gz
+cronie-1.3.tar.gz


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cronie.spec	9 Mar 2009 08:12:18 -0000	1.16
+++ cronie.spec	27 Apr 2009 10:22:22 -0000	1.17
@@ -5,21 +5,18 @@
 
 Summary: Cron daemon for executing programs at set times
 Name: cronie
-Version: 1.2
-Release: 7%{?dist}
+Version: 1.3
+Release: 1%{?dist}
 License: MIT and BSD
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
-#Source0: https://fedorahosted.org/cronie/%{name}-%{version}.tar.gz
-Source0: http://mmaslano.fedorapeople.org/cronie/%{name}-%{version}.tar.gz
-Patch0:	init.patch
-Patch1: nofollow.patch
-Patch2: cronie-1.2-reload.patch
-Patch3: 0001-Update-manual-for-symlink.patch
+Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
+#Source0: http://mmaslano.fedorapeople.org/cronie/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
 Requires: /usr/sbin/sendmail
+Requires: anacron
 Conflicts: sysklogd < 1.4.1
 Provides: vixie-cron = 4:4.4
 Obsoletes: vixie-cron <= 4:4.3
@@ -50,10 +47,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 
@@ -133,6 +126,12 @@
 %config(noreplace) %{_sysconfdir}/cron.deny
 
 %changelog
+* Mon Apr 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 1.3-1
+- new release
+
+* Fri Apr 24 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 1.2-8
+- 496973 close file descriptors after exec
+
 * Mon Mar  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-7
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2008 14:07:20 -0000	1.4
+++ sources	27 Apr 2009 10:22:22 -0000	1.5
@@ -1 +1 @@
-8b4283a5bea2f503b419ad16f46a6592  cronie-1.2.tar.gz
+dbb21448103e80c61d0a2c0f6ec2475c  cronie-1.3.tar.gz



From abompard at fedoraproject.org  Mon Apr 27 10:36:15 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 27 Apr 2009 10:36:15 +0000 (UTC)
Subject: rpms/pure-ftpd/F-11 .cvsignore, 1.3, 1.4 pure-ftpd.spec, 1.24,
	1.25 sources, 1.3, 1.4
Message-ID: <20090427103615.6430E7013C@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28971/F-11

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Log Message:
* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
- version 1.0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Feb 2006 18:56:27 -0000	1.3
+++ .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
@@ -1 +1 @@
-pure-ftpd-1.0.21.tar.bz2
+pure-ftpd-1.0.22.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/pure-ftpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pure-ftpd.spec	4 Mar 2009 02:19:01 -0000	1.24
+++ pure-ftpd.spec	27 Apr 2009 10:35:45 -0000	1.25
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.21
-Release:    20%{?dist}
+Version:    1.0.22
+Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.21.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -80,34 +80,34 @@
 
 
 %build
-%configure  --with-paranoidmsg \
+%configure  \
+            --sysconfdir=%{_sysconfdir}/%{name} \
             --with-capabilities \
-            --with-privsep \
-            --with-pam \
-            --with-puredb \
             --with-sendfile \
+            --with-cork \
+            --with-paranoidmsg \
             --with-altlog \
+            --with-puredb \
+            %{!?_without_extauth:--with-extauth} \
+            --with-pam \
             --with-cookie \
-            --with-diraliases \
             --with-throttling \
             --with-ratios \
             --with-quotas \
             --with-ftpwho \
             --with-welcomemsg \
             --with-uploadscript \
-            --with-peruserlimits \
             --with-virtualhosts \
             --with-virtualchroot \
-            --with-largefile \
-            --sysconfdir=%{_sysconfdir}/%{name} \
-            --without-bonjour \
-            --with-cork \
-            --with-rfc2640 \
-            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-diraliases \
+            --with-peruserlimits \
             %{!?_without_ldap:--with-ldap} \
             %{!?_without_mysql:--with-mysql} \
             %{!?_without_pgsql:--with-pgsql} \
-            %{!?_without_extauth:--with-extauth}
+            --with-privsep \
+            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-rfc2640 \
+            --without-bonjour \
 
 make %{?_smp_mflags}
 
@@ -228,9 +228,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
-%doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
-%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
+%doc FAQ THANKS AUTHORS CONTACT HISTORY NEWS
+%doc README README.Authentication-Modules README.Configuration-File
+%doc README.Contrib README.Donations README.LDAP README.MySQL
+%doc README.PGSQL README.TLS README.Virtual-Users
 %doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
 %{_bindir}/pure-*
 %{_sbindir}/pure-*
@@ -253,6 +254,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
+- version 1.0.22
+
 * Wed Mar 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-20
 - make pam and consolehelper's conf files noreplace
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Feb 2006 18:56:27 -0000	1.3
+++ sources	27 Apr 2009 10:35:45 -0000	1.4
@@ -1 +1 @@
-ca8a8dbec0cd9c8ea92fc4c37ea9c410  pure-ftpd-1.0.21.tar.bz2
+7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2



From abompard at fedoraproject.org  Mon Apr 27 10:36:15 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 27 Apr 2009 10:36:15 +0000 (UTC)
Subject: rpms/pure-ftpd/F-10 .cvsignore, 1.3, 1.4 pure-ftpd.spec, 1.21,
	1.22 sources, 1.3, 1.4
Message-ID: <20090427103615.20E5F7013C@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28971/F-10

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Log Message:
* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
- version 1.0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Feb 2006 18:56:27 -0000	1.3
+++ .cvsignore	27 Apr 2009 10:35:44 -0000	1.4
@@ -1 +1 @@
-pure-ftpd-1.0.21.tar.bz2
+pure-ftpd-1.0.22.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-10/pure-ftpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pure-ftpd.spec	4 Mar 2009 02:20:34 -0000	1.21
+++ pure-ftpd.spec	27 Apr 2009 10:35:44 -0000	1.22
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.21
-Release:    20%{?dist}
+Version:    1.0.22
+Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.21.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -80,34 +80,34 @@
 
 
 %build
-%configure  --with-paranoidmsg \
+%configure  \
+            --sysconfdir=%{_sysconfdir}/%{name} \
             --with-capabilities \
-            --with-privsep \
-            --with-pam \
-            --with-puredb \
             --with-sendfile \
+            --with-cork \
+            --with-paranoidmsg \
             --with-altlog \
+            --with-puredb \
+            %{!?_without_extauth:--with-extauth} \
+            --with-pam \
             --with-cookie \
-            --with-diraliases \
             --with-throttling \
             --with-ratios \
             --with-quotas \
             --with-ftpwho \
             --with-welcomemsg \
             --with-uploadscript \
-            --with-peruserlimits \
             --with-virtualhosts \
             --with-virtualchroot \
-            --with-largefile \
-            --sysconfdir=%{_sysconfdir}/%{name} \
-            --without-bonjour \
-            --with-cork \
-            --with-rfc2640 \
-            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-diraliases \
+            --with-peruserlimits \
             %{!?_without_ldap:--with-ldap} \
             %{!?_without_mysql:--with-mysql} \
             %{!?_without_pgsql:--with-pgsql} \
-            %{!?_without_extauth:--with-extauth}
+            --with-privsep \
+            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-rfc2640 \
+            --without-bonjour \
 
 make %{?_smp_mflags}
 
@@ -228,9 +228,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
-%doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
-%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
+%doc FAQ THANKS AUTHORS CONTACT HISTORY NEWS
+%doc README README.Authentication-Modules README.Configuration-File
+%doc README.Contrib README.Donations README.LDAP README.MySQL
+%doc README.PGSQL README.TLS README.Virtual-Users
 %doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
 %{_bindir}/pure-*
 %{_sbindir}/pure-*
@@ -253,6 +254,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
+- version 1.0.22
+
 * Wed Mar 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-20
 - make pam and consolehelper's conf files noreplace
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Feb 2006 18:56:27 -0000	1.3
+++ sources	27 Apr 2009 10:35:44 -0000	1.4
@@ -1 +1 @@
-ca8a8dbec0cd9c8ea92fc4c37ea9c410  pure-ftpd-1.0.21.tar.bz2
+7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2



From abompard at fedoraproject.org  Mon Apr 27 10:36:16 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 27 Apr 2009 10:36:16 +0000 (UTC)
Subject: rpms/pure-ftpd/devel .cvsignore, 1.3, 1.4 pure-ftpd.spec, 1.24,
	1.25 sources, 1.3, 1.4
Message-ID: <20090427103616.408B37013C@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28971/devel

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Log Message:
* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
- version 1.0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Feb 2006 18:56:27 -0000	1.3
+++ .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
@@ -1 +1 @@
-pure-ftpd-1.0.21.tar.bz2
+pure-ftpd-1.0.22.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pure-ftpd.spec	4 Mar 2009 02:19:01 -0000	1.24
+++ pure-ftpd.spec	27 Apr 2009 10:35:45 -0000	1.25
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.21
-Release:    20%{?dist}
+Version:    1.0.22
+Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.21.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -80,34 +80,34 @@
 
 
 %build
-%configure  --with-paranoidmsg \
+%configure  \
+            --sysconfdir=%{_sysconfdir}/%{name} \
             --with-capabilities \
-            --with-privsep \
-            --with-pam \
-            --with-puredb \
             --with-sendfile \
+            --with-cork \
+            --with-paranoidmsg \
             --with-altlog \
+            --with-puredb \
+            %{!?_without_extauth:--with-extauth} \
+            --with-pam \
             --with-cookie \
-            --with-diraliases \
             --with-throttling \
             --with-ratios \
             --with-quotas \
             --with-ftpwho \
             --with-welcomemsg \
             --with-uploadscript \
-            --with-peruserlimits \
             --with-virtualhosts \
             --with-virtualchroot \
-            --with-largefile \
-            --sysconfdir=%{_sysconfdir}/%{name} \
-            --without-bonjour \
-            --with-cork \
-            --with-rfc2640 \
-            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-diraliases \
+            --with-peruserlimits \
             %{!?_without_ldap:--with-ldap} \
             %{!?_without_mysql:--with-mysql} \
             %{!?_without_pgsql:--with-pgsql} \
-            %{!?_without_extauth:--with-extauth}
+            --with-privsep \
+            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-rfc2640 \
+            --without-bonjour \
 
 make %{?_smp_mflags}
 
@@ -228,9 +228,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
-%doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
-%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
+%doc FAQ THANKS AUTHORS CONTACT HISTORY NEWS
+%doc README README.Authentication-Modules README.Configuration-File
+%doc README.Contrib README.Donations README.LDAP README.MySQL
+%doc README.PGSQL README.TLS README.Virtual-Users
 %doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
 %{_bindir}/pure-*
 %{_sbindir}/pure-*
@@ -253,6 +254,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
+- version 1.0.22
+
 * Wed Mar 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-20
 - make pam and consolehelper's conf files noreplace
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Feb 2006 18:56:27 -0000	1.3
+++ sources	27 Apr 2009 10:35:45 -0000	1.4
@@ -1 +1 @@
-ca8a8dbec0cd9c8ea92fc4c37ea9c410  pure-ftpd-1.0.21.tar.bz2
+7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2



From abompard at fedoraproject.org  Mon Apr 27 10:36:15 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 27 Apr 2009 10:36:15 +0000 (UTC)
Subject: rpms/pure-ftpd/F-9 .cvsignore, 1.3, 1.4 pure-ftpd.spec, 1.19,
	1.20 sources, 1.3, 1.4
Message-ID: <20090427103615.D2C557013C@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28971/F-9

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Log Message:
* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
- version 1.0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Feb 2006 18:56:27 -0000	1.3
+++ .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
@@ -1 +1 @@
-pure-ftpd-1.0.21.tar.bz2
+pure-ftpd-1.0.22.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-9/pure-ftpd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pure-ftpd.spec	18 Feb 2008 18:26:47 -0000	1.19
+++ pure-ftpd.spec	27 Apr 2009 10:35:45 -0000	1.20
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.21
-Release:    15%{?dist}
+Version:    1.0.22
+Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.21.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -80,34 +80,34 @@
 
 
 %build
-%configure  --with-paranoidmsg \
+%configure  \
+            --sysconfdir=%{_sysconfdir}/%{name} \
             --with-capabilities \
-            --with-privsep \
-            --with-pam \
-            --with-puredb \
             --with-sendfile \
+            --with-cork \
+            --with-paranoidmsg \
             --with-altlog \
+            --with-puredb \
+            %{!?_without_extauth:--with-extauth} \
+            --with-pam \
             --with-cookie \
-            --with-diraliases \
             --with-throttling \
             --with-ratios \
             --with-quotas \
             --with-ftpwho \
             --with-welcomemsg \
             --with-uploadscript \
-            --with-peruserlimits \
             --with-virtualhosts \
             --with-virtualchroot \
-            --with-largefile \
-            --sysconfdir=%{_sysconfdir}/%{name} \
-            --without-bonjour \
-            --with-cork \
-            --with-rfc2640 \
-            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-diraliases \
+            --with-peruserlimits \
             %{!?_without_ldap:--with-ldap} \
             %{!?_without_mysql:--with-mysql} \
             %{!?_without_pgsql:--with-pgsql} \
-            %{!?_without_extauth:--with-extauth}
+            --with-privsep \
+            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            --with-rfc2640 \
+            --without-bonjour \
 
 make %{?_smp_mflags}
 
@@ -228,9 +228,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
-%doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
-%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
+%doc FAQ THANKS AUTHORS CONTACT HISTORY NEWS
+%doc README README.Authentication-Modules README.Configuration-File
+%doc README.Contrib README.Donations README.LDAP README.MySQL
+%doc README.PGSQL README.TLS README.Virtual-Users
 %doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
 %{_bindir}/pure-*
 %{_sbindir}/pure-*
@@ -239,8 +240,8 @@
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
-%config %{_sysconfdir}/pam.d/pure-ftpwho
-%config %{_sysconfdir}/security/console.apps/pure-ftpwho
+%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho
+%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{!?_without_tls:%{_sysconfdir}/pki/%{name}}
 %{_mandir}/man8/*
 %dir /var/ftp/
@@ -253,6 +254,24 @@
 
 
 %changelog
+* Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
+- version 1.0.22
+
+* Wed Mar 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-20
+- make pam and consolehelper's conf files noreplace
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.21-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-18
+- Rebuild for mysql
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.21-17
+- Rebuild for Python 2.6
+
+* Thu Jun 05 2008 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-16
+- Rebuild for libcap.so.2 (bug 450086)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.21-15
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Feb 2006 18:56:27 -0000	1.3
+++ sources	27 Apr 2009 10:35:45 -0000	1.4
@@ -1 +1 @@
-ca8a8dbec0cd9c8ea92fc4c37ea9c410  pure-ftpd-1.0.21.tar.bz2
+7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2



From pbrobinson at fedoraproject.org  Mon Apr 27 10:39:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 27 Apr 2009 10:39:56 +0000 (UTC)
Subject: rpms/gupnp/devel .cvsignore, 1.7, 1.8 gupnp.spec, 1.18, 1.19 sources,
	1.7, 1.8
Message-ID: <20090427103956.2C0AC70110@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30457

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2009 16:28:09 -0000	1.7
+++ .cvsignore	27 Apr 2009 10:39:25 -0000	1.8
@@ -1 +1 @@
-gupnp-0.12.6.tar.gz
+gupnp-0.12.7.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gupnp.spec	4 Mar 2009 22:53:54 -0000	1.18
+++ gupnp.spec	27 Apr 2009 10:39:25 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gupnp
-Version:        0.12.6
-Release:        4%{?dist}
+Version:        0.12.7
+Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 %{_datadir}/gtk-doc/html/gupnp
 
 %changelog
+* Mon Apr 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.7-1
+- New upstream release
+
 * Wed Mar  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.6-4
 - Move docs to noarch sub package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2009 16:28:10 -0000	1.7
+++ sources	27 Apr 2009 10:39:25 -0000	1.8
@@ -1 +1 @@
-651c72e2c7353aa9aa9cea24c54b40c0  gupnp-0.12.6.tar.gz
+6ee6ab98b5447477e5a66210a4938bd6  gupnp-0.12.7.tar.gz



From jussilehtola at fedoraproject.org  Mon Apr 27 10:40:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 27 Apr 2009 10:40:15 +0000 (UTC)
Subject: rpms/latex2rtf/EL-5 latex2rtf-imgh.patch, NONE, 1.1 latex2rtf.spec, 
	1.4, 1.5
Message-ID: <20090427104015.EC45B70110@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/latex2rtf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30396/EL-5

Modified Files:
	latex2rtf.spec 
Added Files:
	latex2rtf-imgh.patch 
Log Message:
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
- Fix image height problem on 64-bit architectures.


latex2rtf-imgh.patch:

--- NEW FILE latex2rtf-imgh.patch ---
Fix wrong height of pictures on x86_64

On 64-bit Fedora latex2rtf produced RTFs with insanely large pictures.
The dimensions of a PNG are stored in the header as 4-byte values.
GetPngSize() reads them as consecutive unsigned longs.
The problem is that sizeof(unsigned long) != 4 bytes. It's 8 bytes on
x86_64 Linux.
Use standard ISO C uint32_t instead.
With this patch the figures have their normal size.

Index: graphics.c
===================================================================
--- graphics.c	(revision 894)
+++ graphics.c	(working copy)
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #ifdef UNIX
 #include <unistd.h>
 #endif
@@ -755,7 +756,7 @@
 
 static unsigned char * getPngChunk(FILE *fp, char *s)
 {
-	unsigned long size, crc;
+	uint32_t size, crc;
 	char head[5];
 	unsigned char *data;
 	
@@ -777,7 +778,7 @@
 
 		if (strcmp(head,"IEND") == 0) return NULL;
 		
-		diagnostics(6,"found chunk '%s' size %ld bytes",head,size);
+		diagnostics(6,"found chunk '%s' size %ld bytes",head,(unsigned long)size);
 		data = malloc(size);
 		if (data == NULL) return NULL;
 		
@@ -798,7 +799,7 @@
 static void GetPngSize(char *s, unsigned long *w, unsigned long *h, unsigned long *xres, unsigned long *yres, int *bad_res)
 {
     FILE *fp;
-    unsigned long *p;
+    uint32_t *p;
     unsigned char buffer[16];
     char reftag[9] = "\211PNG\r\n\032\n";
     unsigned char *data = NULL;
@@ -833,7 +834,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*w = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*h = (g_little_endian) ? LETONL(*p) : *p;
@@ -846,7 +847,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*xres = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*yres = (g_little_endian) ? LETONL(*p) : *p;


Index: latex2rtf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/EL-5/latex2rtf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- latex2rtf.spec	24 Mar 2009 22:22:17 -0000	1.4
+++ latex2rtf.spec	27 Apr 2009 10:39:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		latex2rtf
 Version:	1.9.19
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	LaTeX to RTF converter that handles equations, figures, and cross-references
 Group:		Applications/File
 License:	GPLv2+
@@ -8,6 +8,9 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Patch to makefile changing man and info file locations and compiler flags
 Patch0:		latex2rtf.patch
+# Patch to fix wrong height of images on 64-bit architectures
+# Bug https://bugzilla.redhat.com/attachment.cgi?id=341372
+Patch1:		latex2rtf-imgh.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For running the tests
@@ -33,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 chmod a-x cfg/*.cfg
 
 %build
@@ -80,8 +84,13 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
+- Added patch to fix image height on 64-bit architectures.
+  https://bugzilla.redhat.com/show_bug.cgi?id=497752
+
 * Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-7
-- Retry EPEL fix: disable check phase which doesn't seem to work for some reason on EPEL 5 ppc (segfault in list.tex).
+- Retry EPEL fix: disable check phase which doesn't seem to work 
+  for some reason on EPEL 5 ppc (segfault in list.tex).
 
 * Sun Mar 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-6
 - Fix EPEL build.



From jussilehtola at fedoraproject.org  Mon Apr 27 10:40:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 27 Apr 2009 10:40:16 +0000 (UTC)
Subject: rpms/latex2rtf/devel latex2rtf-imgh.patch, NONE, 1.1 latex2rtf.spec,
	1.4, 1.5
Message-ID: <20090427104016.E11527013F@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/latex2rtf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30396/devel

Modified Files:
	latex2rtf.spec 
Added Files:
	latex2rtf-imgh.patch 
Log Message:
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
- Fix image height problem on 64-bit architectures.


latex2rtf-imgh.patch:

--- NEW FILE latex2rtf-imgh.patch ---
Fix wrong height of pictures on x86_64

On 64-bit Fedora latex2rtf produced RTFs with insanely large pictures.
The dimensions of a PNG are stored in the header as 4-byte values.
GetPngSize() reads them as consecutive unsigned longs.
The problem is that sizeof(unsigned long) != 4 bytes. It's 8 bytes on
x86_64 Linux.
Use standard ISO C uint32_t instead.
With this patch the figures have their normal size.

Index: graphics.c
===================================================================
--- graphics.c	(revision 894)
+++ graphics.c	(working copy)
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #ifdef UNIX
 #include <unistd.h>
 #endif
@@ -755,7 +756,7 @@
 
 static unsigned char * getPngChunk(FILE *fp, char *s)
 {
-	unsigned long size, crc;
+	uint32_t size, crc;
 	char head[5];
 	unsigned char *data;
 	
@@ -777,7 +778,7 @@
 
 		if (strcmp(head,"IEND") == 0) return NULL;
 		
-		diagnostics(6,"found chunk '%s' size %ld bytes",head,size);
+		diagnostics(6,"found chunk '%s' size %ld bytes",head,(unsigned long)size);
 		data = malloc(size);
 		if (data == NULL) return NULL;
 		
@@ -798,7 +799,7 @@
 static void GetPngSize(char *s, unsigned long *w, unsigned long *h, unsigned long *xres, unsigned long *yres, int *bad_res)
 {
     FILE *fp;
-    unsigned long *p;
+    uint32_t *p;
     unsigned char buffer[16];
     char reftag[9] = "\211PNG\r\n\032\n";
     unsigned char *data = NULL;
@@ -833,7 +834,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*w = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*h = (g_little_endian) ? LETONL(*p) : *p;
@@ -846,7 +847,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*xres = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*yres = (g_little_endian) ? LETONL(*p) : *p;


Index: latex2rtf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/devel/latex2rtf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- latex2rtf.spec	24 Mar 2009 22:22:18 -0000	1.4
+++ latex2rtf.spec	27 Apr 2009 10:39:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		latex2rtf
 Version:	1.9.19
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	LaTeX to RTF converter that handles equations, figures, and cross-references
 Group:		Applications/File
 License:	GPLv2+
@@ -8,6 +8,9 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Patch to makefile changing man and info file locations and compiler flags
 Patch0:		latex2rtf.patch
+# Patch to fix wrong height of images on 64-bit architectures
+# Bug https://bugzilla.redhat.com/attachment.cgi?id=341372
+Patch1:		latex2rtf-imgh.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For running the tests
@@ -33,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 chmod a-x cfg/*.cfg
 
 %build
@@ -80,8 +84,13 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
+- Added patch to fix image height on 64-bit architectures.
+  https://bugzilla.redhat.com/show_bug.cgi?id=497752
+
 * Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-7
-- Retry EPEL fix: disable check phase which doesn't seem to work for some reason on EPEL 5 ppc (segfault in list.tex).
+- Retry EPEL fix: disable check phase which doesn't seem to work 
+  for some reason on EPEL 5 ppc (segfault in list.tex).
 
 * Sun Mar 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-6
 - Fix EPEL build.



From jussilehtola at fedoraproject.org  Mon Apr 27 10:40:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 27 Apr 2009 10:40:16 +0000 (UTC)
Subject: rpms/latex2rtf/F-10 latex2rtf-imgh.patch, NONE, 1.1 latex2rtf.spec, 
	1.2, 1.3
Message-ID: <20090427104016.53B7270110@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/latex2rtf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30396/F-10

Modified Files:
	latex2rtf.spec 
Added Files:
	latex2rtf-imgh.patch 
Log Message:
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
- Fix image height problem on 64-bit architectures.


latex2rtf-imgh.patch:

--- NEW FILE latex2rtf-imgh.patch ---
Fix wrong height of pictures on x86_64

On 64-bit Fedora latex2rtf produced RTFs with insanely large pictures.
The dimensions of a PNG are stored in the header as 4-byte values.
GetPngSize() reads them as consecutive unsigned longs.
The problem is that sizeof(unsigned long) != 4 bytes. It's 8 bytes on
x86_64 Linux.
Use standard ISO C uint32_t instead.
With this patch the figures have their normal size.

Index: graphics.c
===================================================================
--- graphics.c	(revision 894)
+++ graphics.c	(working copy)
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #ifdef UNIX
 #include <unistd.h>
 #endif
@@ -755,7 +756,7 @@
 
 static unsigned char * getPngChunk(FILE *fp, char *s)
 {
-	unsigned long size, crc;
+	uint32_t size, crc;
 	char head[5];
 	unsigned char *data;
 	
@@ -777,7 +778,7 @@
 
 		if (strcmp(head,"IEND") == 0) return NULL;
 		
-		diagnostics(6,"found chunk '%s' size %ld bytes",head,size);
+		diagnostics(6,"found chunk '%s' size %ld bytes",head,(unsigned long)size);
 		data = malloc(size);
 		if (data == NULL) return NULL;
 		
@@ -798,7 +799,7 @@
 static void GetPngSize(char *s, unsigned long *w, unsigned long *h, unsigned long *xres, unsigned long *yres, int *bad_res)
 {
     FILE *fp;
-    unsigned long *p;
+    uint32_t *p;
     unsigned char buffer[16];
     char reftag[9] = "\211PNG\r\n\032\n";
     unsigned char *data = NULL;
@@ -833,7 +834,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*w = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*h = (g_little_endian) ? LETONL(*p) : *p;
@@ -846,7 +847,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*xres = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*yres = (g_little_endian) ? LETONL(*p) : *p;


Index: latex2rtf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/F-10/latex2rtf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- latex2rtf.spec	22 Mar 2009 09:32:29 -0000	1.2
+++ latex2rtf.spec	27 Apr 2009 10:39:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		latex2rtf
 Version:	1.9.19
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	LaTeX to RTF converter that handles equations, figures, and cross-references
 Group:		Applications/File
 License:	GPLv2+
@@ -8,6 +8,9 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Patch to makefile changing man and info file locations and compiler flags
 Patch0:		latex2rtf.patch
+# Patch to fix wrong height of images on 64-bit architectures
+# Bug https://bugzilla.redhat.com/attachment.cgi?id=341372
+Patch1:		latex2rtf-imgh.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For running the tests
@@ -33,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 chmod a-x cfg/*.cfg
 
 %build
@@ -52,7 +56,13 @@
 make install-info
 
 %check
+%if 0%{?rhel} != 0
+# Don't do anything since make check fails in a segfault at least on ppc
+%else
+# Otherwise perform check
 make check
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +84,14 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
+- Added patch to fix image height on 64-bit architectures.
+  https://bugzilla.redhat.com/show_bug.cgi?id=497752
+
+* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-7
+- Retry EPEL fix: disable check phase which doesn't seem to work 
+  for some reason on EPEL 5 ppc (segfault in list.tex).
+
 * Sun Mar 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-6
 - Fix EPEL build.
 



From jussilehtola at fedoraproject.org  Mon Apr 27 10:40:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 27 Apr 2009 10:40:16 +0000 (UTC)
Subject: rpms/latex2rtf/F-9 latex2rtf-imgh.patch, NONE, 1.1 latex2rtf.spec,
	1.2, 1.3
Message-ID: <20090427104016.A31947013C@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/latex2rtf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30396/F-9

Modified Files:
	latex2rtf.spec 
Added Files:
	latex2rtf-imgh.patch 
Log Message:
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
- Fix image height problem on 64-bit architectures.


latex2rtf-imgh.patch:

--- NEW FILE latex2rtf-imgh.patch ---
Fix wrong height of pictures on x86_64

On 64-bit Fedora latex2rtf produced RTFs with insanely large pictures.
The dimensions of a PNG are stored in the header as 4-byte values.
GetPngSize() reads them as consecutive unsigned longs.
The problem is that sizeof(unsigned long) != 4 bytes. It's 8 bytes on
x86_64 Linux.
Use standard ISO C uint32_t instead.
With this patch the figures have their normal size.

Index: graphics.c
===================================================================
--- graphics.c	(revision 894)
+++ graphics.c	(working copy)
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #ifdef UNIX
 #include <unistd.h>
 #endif
@@ -755,7 +756,7 @@
 
 static unsigned char * getPngChunk(FILE *fp, char *s)
 {
-	unsigned long size, crc;
+	uint32_t size, crc;
 	char head[5];
 	unsigned char *data;
 	
@@ -777,7 +778,7 @@
 
 		if (strcmp(head,"IEND") == 0) return NULL;
 		
-		diagnostics(6,"found chunk '%s' size %ld bytes",head,size);
+		diagnostics(6,"found chunk '%s' size %ld bytes",head,(unsigned long)size);
 		data = malloc(size);
 		if (data == NULL) return NULL;
 		
@@ -798,7 +799,7 @@
 static void GetPngSize(char *s, unsigned long *w, unsigned long *h, unsigned long *xres, unsigned long *yres, int *bad_res)
 {
     FILE *fp;
-    unsigned long *p;
+    uint32_t *p;
     unsigned char buffer[16];
     char reftag[9] = "\211PNG\r\n\032\n";
     unsigned char *data = NULL;
@@ -833,7 +834,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*w = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*h = (g_little_endian) ? LETONL(*p) : *p;
@@ -846,7 +847,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*xres = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*yres = (g_little_endian) ? LETONL(*p) : *p;


Index: latex2rtf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/F-9/latex2rtf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- latex2rtf.spec	22 Mar 2009 09:32:29 -0000	1.2
+++ latex2rtf.spec	27 Apr 2009 10:39:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		latex2rtf
 Version:	1.9.19
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	LaTeX to RTF converter that handles equations, figures, and cross-references
 Group:		Applications/File
 License:	GPLv2+
@@ -8,6 +8,9 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Patch to makefile changing man and info file locations and compiler flags
 Patch0:		latex2rtf.patch
+# Patch to fix wrong height of images on 64-bit architectures
+# Bug https://bugzilla.redhat.com/attachment.cgi?id=341372
+Patch1:		latex2rtf-imgh.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For running the tests
@@ -33,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 chmod a-x cfg/*.cfg
 
 %build
@@ -52,7 +56,13 @@
 make install-info
 
 %check
+%if 0%{?rhel} != 0
+# Don't do anything since make check fails in a segfault at least on ppc
+%else
+# Otherwise perform check
 make check
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +84,14 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
+- Added patch to fix image height on 64-bit architectures.
+  https://bugzilla.redhat.com/show_bug.cgi?id=497752
+
+* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-7
+- Retry EPEL fix: disable check phase which doesn't seem to work 
+  for some reason on EPEL 5 ppc (segfault in list.tex).
+
 * Sun Mar 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-6
 - Fix EPEL build.
 



From pbrobinson at fedoraproject.org  Mon Apr 27 10:48:46 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 27 Apr 2009 10:48:46 +0000 (UTC)
Subject: rpms/gupnp/F-11 .cvsignore, 1.7, 1.8 gupnp.spec, 1.18, 1.19 sources,
	1.7, 1.8
Message-ID: <20090427104846.A351E70110@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31681

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2009 16:28:09 -0000	1.7
+++ .cvsignore	27 Apr 2009 10:48:16 -0000	1.8
@@ -1 +1 @@
-gupnp-0.12.6.tar.gz
+gupnp-0.12.7.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-11/gupnp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gupnp.spec	4 Mar 2009 22:53:54 -0000	1.18
+++ gupnp.spec	27 Apr 2009 10:48:16 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gupnp
-Version:        0.12.6
-Release:        4%{?dist}
+Version:        0.12.7
+Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 %{_datadir}/gtk-doc/html/gupnp
 
 %changelog
+* Mon Apr 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.7-1
+- New upstream release
+
 * Wed Mar  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.6-4
 - Move docs to noarch sub package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2009 16:28:10 -0000	1.7
+++ sources	27 Apr 2009 10:48:16 -0000	1.8
@@ -1 +1 @@
-651c72e2c7353aa9aa9cea24c54b40c0  gupnp-0.12.6.tar.gz
+6ee6ab98b5447477e5a66210a4938bd6  gupnp-0.12.7.tar.gz



From dtardon at fedoraproject.org  Mon Apr 27 10:49:58 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 10:49:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch,
	NONE, 1.1 openoffice.org.spec, 1.1900, 1.1901
Message-ID: <20090427104958.9572970110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31823

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch 
Log Message:
add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch

openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch ---
Index: filter/source/docbook/sofftodocbookheadings.xsl
===================================================================
--- filter/source/docbook/sofftodocbookheadings.xsl	(revision 270724)
+++ filter/source/docbook/sofftodocbookheadings.xsl	(working copy)
@@ -73,11 +73,6 @@
 			 match="text:h"
 			 use="generate-id(preceding::text:h[@text:level &lt; current()/@text:level][1])"/>
 
-	<!-- All those headings have not the lowest outline level (mapped to section1), but come before the first heading mapped to section1  -->
-	<xsl:key name="preludingHeadings"
-			 match="text:h"
-			 use="generate-id(following::text:h[@text:level = $section1_OutlineLevel][1])"/>
-
 	<!-- The key function "getHeadingsByOutline" returns all headings of a certain outline level -->
 	<xsl:key name="getHeadingsByOutline"
 			 match="text:h"
@@ -175,7 +170,7 @@
 				<xsl:text disable-output-escaping="yes">&lt;sect1&gt;</xsl:text>
 				<title></title>
 				<!-- create sections for all the first section1 preluding headings -->
-				<xsl:for-each select="key('preludingHeadings', generate-id())">
+                <xsl:for-each select="key('getHeadingsByOutline', $section1_OutlineLevel)[1]/preceding::text:h">
 					<xsl:call-template name="make-section">
 						<xsl:with-param name="previousSectionLevel" select="$section1_OutlineLevel"/>
 						<xsl:with-param name="currentSectionLevel">
@@ -1186,4 +1181,4 @@
 			<xsl:with-param name="whitespaces" select="8"/>
 		</xsl:call-template>
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1900
retrieving revision 1.1901
diff -u -r1.1900 -r1.1901
--- openoffice.org.spec	27 Apr 2009 06:02:35 -0000	1.1900
+++ openoffice.org.spec	27 Apr 2009 10:49:28 -0000	1.1901
@@ -136,6 +136,7 @@
 Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1630,6 +1631,7 @@
 %patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
 %patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,7 @@
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From dtardon at fedoraproject.org  Mon Apr 27 10:51:38 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 27 Apr 2009 10:51:38 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch,
	NONE, 1.1 openoffice.org.spec, 1.1899, 1.1900
Message-ID: <20090427105138.CA77370110@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32061

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch 
Log Message:
add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch

openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch ---
Index: filter/source/docbook/sofftodocbookheadings.xsl
===================================================================
--- filter/source/docbook/sofftodocbookheadings.xsl	(revision 270724)
+++ filter/source/docbook/sofftodocbookheadings.xsl	(working copy)
@@ -73,11 +73,6 @@
 			 match="text:h"
 			 use="generate-id(preceding::text:h[@text:level &lt; current()/@text:level][1])"/>
 
-	<!-- All those headings have not the lowest outline level (mapped to section1), but come before the first heading mapped to section1  -->
-	<xsl:key name="preludingHeadings"
-			 match="text:h"
-			 use="generate-id(following::text:h[@text:level = $section1_OutlineLevel][1])"/>
-
 	<!-- The key function "getHeadingsByOutline" returns all headings of a certain outline level -->
 	<xsl:key name="getHeadingsByOutline"
 			 match="text:h"
@@ -175,7 +170,7 @@
 				<xsl:text disable-output-escaping="yes">&lt;sect1&gt;</xsl:text>
 				<title></title>
 				<!-- create sections for all the first section1 preluding headings -->
-				<xsl:for-each select="key('preludingHeadings', generate-id())">
+                <xsl:for-each select="key('getHeadingsByOutline', $section1_OutlineLevel)[1]/preceding::text:h">
 					<xsl:call-template name="make-section">
 						<xsl:with-param name="previousSectionLevel" select="$section1_OutlineLevel"/>
 						<xsl:with-param name="currentSectionLevel">
@@ -1186,4 +1181,4 @@
 			<xsl:with-param name="whitespaces" select="8"/>
 		</xsl:call-template>
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1899
retrieving revision 1.1900
diff -u -r1.1899 -r1.1900
--- openoffice.org.spec	27 Apr 2009 05:58:54 -0000	1.1899
+++ openoffice.org.spec	27 Apr 2009 10:51:07 -0000	1.1900
@@ -136,6 +136,7 @@
 Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1630,6 +1631,7 @@
 %patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
 %patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,7 @@
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From pbrobinson at fedoraproject.org  Mon Apr 27 11:00:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 27 Apr 2009 11:00:22 +0000 (UTC)
Subject: rpms/gupnp/F-10 .cvsignore, 1.5, 1.6 gupnp.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <20090427110022.9C14C70110@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv529

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Feb 2009 23:41:14 -0000	1.5
+++ .cvsignore	27 Apr 2009 10:59:52 -0000	1.6
@@ -1 +1 @@
-gupnp-0.12.6.tar.gz
+gupnp-0.12.7.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-10/gupnp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gupnp.spec	2 Mar 2009 17:57:21 -0000	1.13
+++ gupnp.spec	27 Apr 2009 10:59:52 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gupnp
-Version:        0.12.6
-Release:        2%{?dist}
+Version:        0.12.7
+Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
@@ -26,10 +26,9 @@
 %package devel
 Summary: Development package for gupnp
 Group: Development/Libraries
-Requires: gupnp = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: gssdp-devel
 Requires: pkgconfig
-Requires: gtk-doc
 Requires: libsoup-devel
 Requires: libxml2-devel
 Requires: e2fsprogs-devel
@@ -38,6 +37,16 @@
 %description devel
 Files for development with gupnp.
 
+%package docs
+Summary: Documentation files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk-doc
+BuildArch: noarch
+
+%description docs
+This package contains developer documentation for %{name}.
+
 %prep
 %setup -q
 
@@ -66,15 +75,27 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/gupnp
 %{_libdir}/pkgconfig/gupnp-1.0.pc
 %{_libdir}/libgupnp-1.0.so
 %{_includedir}/gupnp-1.0
 
+%files docs
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/gupnp
+
 %changelog
-* Mon Mar  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.6-2
+* Mon Apr 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.7-1
+- New upstream release
+
+* Wed Mar  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.6-4
+- Move docs to noarch sub package
+
+* Mon Mar  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.6-3
 - Add some extra -devel Requires packages
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.6-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Feb 2009 23:41:14 -0000	1.7
+++ sources	27 Apr 2009 10:59:52 -0000	1.8
@@ -1 +1 @@
-651c72e2c7353aa9aa9cea24c54b40c0  gupnp-0.12.6.tar.gz
+6ee6ab98b5447477e5a66210a4938bd6  gupnp-0.12.7.tar.gz



From mjakubicek at fedoraproject.org  Mon Apr 27 11:02:48 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 11:02:48 +0000 (UTC)
Subject: rpms/javahelp2/F-11 javahelp2-jhindexer.sh, 1.1,
	1.2 javahelp2-jhsearch.sh, 1.1, 1.2 javahelp2.spec, 1.2, 1.3
Message-ID: <20090427110248.AE7C170110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/javahelp2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891/F-11

Modified Files:
	javahelp2-jhindexer.sh javahelp2-jhsearch.sh javahelp2.spec 
Log Message:
- Fix FTBFS: added BR: servletapi5.
- Fixed wrapper scripts, resolves BZ#479341.




Index: javahelp2-jhindexer.sh
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/F-11/javahelp2-jhindexer.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2-jhindexer.sh	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2-jhindexer.sh	27 Apr 2009 11:02:17 -0000	1.2
@@ -19,7 +19,7 @@
 
 # Configuration
 MAIN_CLASS=com.sun.java.help.search.Indexer
-BASE_JARS=javahelp
+BASE_JARS=javahelp2
 
 # Set parameters
 set_jvm


Index: javahelp2-jhsearch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/F-11/javahelp2-jhsearch.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2-jhsearch.sh	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2-jhsearch.sh	27 Apr 2009 11:02:17 -0000	1.2
@@ -19,7 +19,7 @@
 
 # Configuration
 MAIN_CLASS=com.sun.java.help.search.QueryEngine
-BASE_JARS=javahelp
+BASE_JARS=javahelp2
 
 # Set parameters
 set_jvm


Index: javahelp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/F-11/javahelp2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- javahelp2.spec	25 Feb 2009 09:02:48 -0000	1.2
+++ javahelp2.spec	27 Apr 2009 11:02:17 -0000	1.3
@@ -30,7 +30,7 @@
 
 Name:		javahelp2
 Version:	2.0.05
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	JavaHelp is a full-featured, platform-independent, extensible help system 
 License:	GPLv2 with exceptions
 Url:		https://javahelp.dev.java.net/
@@ -45,6 +45,7 @@
 BuildRequires:	jpackage-utils >= 0:1.5.32
 BuildRequires:  jsp >= 0:2.0
 BuildRequires:	java-devel >= 1:1.6.0 ant ant-nodeps
+BuildRequires:	servletapi5
 Requires:	java >= 1:1.6.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -116,6 +117,10 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.0.05-7
+- Fix FTBFS: added BR: servletapi5.
+- Fixed wrapper scripts, resolves BZ#479341.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Mon Apr 27 11:02:48 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 11:02:48 +0000 (UTC)
Subject: rpms/javahelp2/devel javahelp2-jhindexer.sh, 1.1,
	1.2 javahelp2-jhsearch.sh, 1.1, 1.2 javahelp2.spec, 1.2, 1.3
Message-ID: <20090427110248.E33C670110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/javahelp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891/devel

Modified Files:
	javahelp2-jhindexer.sh javahelp2-jhsearch.sh javahelp2.spec 
Log Message:
- Fix FTBFS: added BR: servletapi5.
- Fixed wrapper scripts, resolves BZ#479341.




Index: javahelp2-jhindexer.sh
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/devel/javahelp2-jhindexer.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2-jhindexer.sh	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2-jhindexer.sh	27 Apr 2009 11:02:18 -0000	1.2
@@ -19,7 +19,7 @@
 
 # Configuration
 MAIN_CLASS=com.sun.java.help.search.Indexer
-BASE_JARS=javahelp
+BASE_JARS=javahelp2
 
 # Set parameters
 set_jvm


Index: javahelp2-jhsearch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/devel/javahelp2-jhsearch.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2-jhsearch.sh	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2-jhsearch.sh	27 Apr 2009 11:02:18 -0000	1.2
@@ -19,7 +19,7 @@
 
 # Configuration
 MAIN_CLASS=com.sun.java.help.search.QueryEngine
-BASE_JARS=javahelp
+BASE_JARS=javahelp2
 
 # Set parameters
 set_jvm


Index: javahelp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/devel/javahelp2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- javahelp2.spec	25 Feb 2009 09:02:48 -0000	1.2
+++ javahelp2.spec	27 Apr 2009 11:02:18 -0000	1.3
@@ -30,7 +30,7 @@
 
 Name:		javahelp2
 Version:	2.0.05
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	JavaHelp is a full-featured, platform-independent, extensible help system 
 License:	GPLv2 with exceptions
 Url:		https://javahelp.dev.java.net/
@@ -45,6 +45,7 @@
 BuildRequires:	jpackage-utils >= 0:1.5.32
 BuildRequires:  jsp >= 0:2.0
 BuildRequires:	java-devel >= 1:1.6.0 ant ant-nodeps
+BuildRequires:	servletapi5
 Requires:	java >= 1:1.6.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -116,6 +117,10 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.0.05-7
+- Fix FTBFS: added BR: servletapi5.
+- Fixed wrapper scripts, resolves BZ#479341.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jzeleny at fedoraproject.org  Mon Apr 27 11:25:25 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 27 Apr 2009 11:25:25 +0000 (UTC)
Subject: rpms/fcoe-utils/devel fcoe-utils.spec,1.1,1.2
Message-ID: <20090427112525.DF88B70110@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3841

Modified Files:
	fcoe-utils.spec 
Log Message:
- added libhbalinux to Requires (#497605)
- correction of spec file (_initddir -> initrddir)




Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcoe-utils.spec	10 Apr 2009 07:31:57 -0000	1.1
+++ fcoe-utils.spec	27 Apr 2009 11:24:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libhbaapi-devel dcbd-devel
-Requires:         dcbd
+Requires:         dcbd libhbalinux
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -34,8 +34,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
-mv $RPM_BUILD_ROOT/etc/init.d/fcoe $RPM_BUILD_ROOT%{_initddir}/fcoe-utils
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+mv $RPM_BUILD_ROOT/etc/init.d/fcoe $RPM_BUILD_ROOT%{_initrddir}/fcoe-utils
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 
 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Wed Apr 27 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-4
+- added libhbalinux to Requires (#497605)
+- correction of spec file (_initddir -> _initrddir)
+
 * Wed Apr 8 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.7-3
 - more minor corrections in spec file
 



From xhorak at fedoraproject.org  Mon Apr 27 12:08:22 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 27 Apr 2009 12:08:22 +0000 (UTC)
Subject: rpms/xulrunner/F-10 .cvsignore, 1.68, 1.69 sources, 1.71,
	1.72 xulrunner.spec, 1.145, 1.146
Message-ID: <20090427120822.2546470110@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27565

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	21 Apr 2009 19:16:28 -0000	1.68
+++ .cvsignore	27 Apr 2009 12:07:51 -0000	1.69
@@ -1 +1,2 @@
 xulrunner-1.9.0.9-source.tar.bz2
+xulrunner-1.9.0.10-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	21 Apr 2009 19:16:29 -0000	1.71
+++ sources	27 Apr 2009 12:07:51 -0000	1.72
@@ -1 +1 @@
-f80b085699db8201e5db6b30fc63c60d  xulrunner-1.9.0.9-source.tar.bz2
+1012e835a5c130d18479bccdee240640  xulrunner-1.9.0.10-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- xulrunner.spec	21 Apr 2009 19:16:29 -0000	1.145
+++ xulrunner.spec	27 Apr 2009 12:07:51 -0000	1.146
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.9
+Version:        1.9.0.10
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -423,6 +423,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.10-1
+- Update to 1.9.0.10
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.9-1
 - Update to 1.9.0.9
 



From xhorak at fedoraproject.org  Mon Apr 27 12:10:54 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 27 Apr 2009 12:10:54 +0000 (UTC)
Subject: rpms/xulrunner/F-9 .cvsignore, 1.57, 1.58 sources, 1.59,
	1.60 xulrunner.spec, 1.139, 1.140
Message-ID: <20090427121054.9784E70110@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27927

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-9/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	21 Apr 2009 19:16:31 -0000	1.57
+++ .cvsignore	27 Apr 2009 12:10:23 -0000	1.58
@@ -1 +1,2 @@
 xulrunner-1.9.0.9-source.tar.bz2
+xulrunner-1.9.0.10-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-9/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	21 Apr 2009 19:16:31 -0000	1.59
+++ sources	27 Apr 2009 12:10:23 -0000	1.60
@@ -1 +1 @@
-f80b085699db8201e5db6b30fc63c60d  xulrunner-1.9.0.9-source.tar.bz2
+1012e835a5c130d18479bccdee240640  xulrunner-1.9.0.10-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- xulrunner.spec	21 Apr 2009 19:16:31 -0000	1.139
+++ xulrunner.spec	27 Apr 2009 12:10:24 -0000	1.140
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.9
+Version:        1.9.0.10
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -381,6 +381,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.10-1
+- Update to 1.9.0.10
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.9.0.9-1
 - Update to 1.9.0.9
 



From grof at fedoraproject.org  Mon Apr 27 12:15:11 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 12:15:11 +0000 (UTC)
Subject: rpms/photoprint-borders/devel import.log, NONE,
	1.1 photoprint-borders.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427121511.A3D1D70110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint-borders/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log photoprint-borders.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-borders-0_0_2-4_fc11:HEAD:photoprint-borders-0.0.2-4.fc11.src.rpm:1240834617


--- NEW FILE photoprint-borders.spec ---
Name:           photoprint-borders
Version:        0.0.2
Release:        4%{?dist}
Summary:        PhotoPrint Borders are the printing frames for use with PhotoPrint

Group:          Applications/Multimedia
License:        CC-BY
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       photoprint

BuildArch:      noarch

%description
PhotoPrint Borders are the printing frames for use 
with PhotoPrint utility


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

%clean
rm -rf $RPM_BUILD_ROOT



%files 
%defattr(-,root,root,-)
%doc COPYING
%{_datadir}/photoprint/borders/


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-4
- Resolved timestamps and owning issues

* Mon Mar 30 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-3
- License changed to Creative Commons Attribution

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-2
- add Requires: photoprint

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-1
- initial release 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:29:43 -0000	1.1
+++ .cvsignore	27 Apr 2009 12:14:41 -0000	1.2
@@ -0,0 +1 @@
+photoprint-borders-0.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:29:43 -0000	1.1
+++ sources	27 Apr 2009 12:14:41 -0000	1.2
@@ -0,0 +1 @@
+8e95fe31068558815f453e9161c37bb0  photoprint-borders-0.0.2.tar.gz



From grof at fedoraproject.org  Mon Apr 27 12:23:24 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 12:23:24 +0000 (UTC)
Subject: rpms/photoprint-borders/F-11 import.log, NONE,
	1.1 photoprint-borders.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427122324.897B370110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint-borders/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30645/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log photoprint-borders.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-borders-0_0_2-4_fc11:F-11:photoprint-borders-0.0.2-4.fc11.src.rpm:1240835144


--- NEW FILE photoprint-borders.spec ---
Name:           photoprint-borders
Version:        0.0.2
Release:        4%{?dist}
Summary:        PhotoPrint Borders are the printing frames for use with PhotoPrint

Group:          Applications/Multimedia
License:        CC-BY
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       photoprint

BuildArch:      noarch

%description
PhotoPrint Borders are the printing frames for use 
with PhotoPrint utility


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

%clean
rm -rf $RPM_BUILD_ROOT



%files 
%defattr(-,root,root,-)
%doc COPYING
%{_datadir}/photoprint/borders/


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-4
- Resolved timestamps and owning issues

* Mon Mar 30 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-3
- License changed to Creative Commons Attribution

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-2
- add Requires: photoprint

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-1
- initial release 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:29:43 -0000	1.1
+++ .cvsignore	27 Apr 2009 12:22:54 -0000	1.2
@@ -0,0 +1 @@
+photoprint-borders-0.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:29:43 -0000	1.1
+++ sources	27 Apr 2009 12:22:54 -0000	1.2
@@ -0,0 +1 @@
+8e95fe31068558815f453e9161c37bb0  photoprint-borders-0.0.2.tar.gz



From grof at fedoraproject.org  Mon Apr 27 12:25:19 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 12:25:19 +0000 (UTC)
Subject: rpms/photoprint-borders/F-10 import.log, NONE,
	1.1 photoprint-borders.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427122519.1B52170110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint-borders/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31018/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log photoprint-borders.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-borders-0_0_2-4_fc11:F-10:photoprint-borders-0.0.2-4.fc11.src.rpm:1240835251


--- NEW FILE photoprint-borders.spec ---
Name:           photoprint-borders
Version:        0.0.2
Release:        4%{?dist}
Summary:        PhotoPrint Borders are the printing frames for use with PhotoPrint

Group:          Applications/Multimedia
License:        CC-BY
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       photoprint

BuildArch:      noarch

%description
PhotoPrint Borders are the printing frames for use 
with PhotoPrint utility


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

%clean
rm -rf $RPM_BUILD_ROOT



%files 
%defattr(-,root,root,-)
%doc COPYING
%{_datadir}/photoprint/borders/


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-4
- Resolved timestamps and owning issues

* Mon Mar 30 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-3
- License changed to Creative Commons Attribution

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-2
- add Requires: photoprint

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-1
- initial release 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:29:43 -0000	1.1
+++ .cvsignore	27 Apr 2009 12:24:48 -0000	1.2
@@ -0,0 +1 @@
+photoprint-borders-0.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:29:43 -0000	1.1
+++ sources	27 Apr 2009 12:24:48 -0000	1.2
@@ -0,0 +1 @@
+8e95fe31068558815f453e9161c37bb0  photoprint-borders-0.0.2.tar.gz



From grof at fedoraproject.org  Mon Apr 27 12:27:05 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 12:27:05 +0000 (UTC)
Subject: rpms/photoprint-borders/F-9 import.log, NONE,
	1.1 photoprint-borders.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427122705.2588870110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/photoprint-borders/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31388/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log photoprint-borders.spec 
Log Message:



--- NEW FILE import.log ---
photoprint-borders-0_0_2-4_fc11:F-9:photoprint-borders-0.0.2-4.fc11.src.rpm:1240835369


--- NEW FILE photoprint-borders.spec ---
Name:           photoprint-borders
Version:        0.0.2
Release:        4%{?dist}
Summary:        PhotoPrint Borders are the printing frames for use with PhotoPrint

Group:          Applications/Multimedia
License:        CC-BY
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
Source0:        http://www.blackfiveimaging.co.uk/photoprint/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       photoprint

BuildArch:      noarch

%description
PhotoPrint Borders are the printing frames for use 
with PhotoPrint utility


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

%clean
rm -rf $RPM_BUILD_ROOT



%files 
%defattr(-,root,root,-)
%doc COPYING
%{_datadir}/photoprint/borders/


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-4
- Resolved timestamps and owning issues

* Mon Mar 30 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-3
- License changed to Creative Commons Attribution

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-2
- add Requires: photoprint

* Thu Mar 26 2009 Zarko <zarko.pintar at gmail.com> - 0.0.2-1
- initial release 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:29:43 -0000	1.1
+++ .cvsignore	27 Apr 2009 12:26:34 -0000	1.2
@@ -0,0 +1 @@
+photoprint-borders-0.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/photoprint-borders/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:29:43 -0000	1.1
+++ sources	27 Apr 2009 12:26:34 -0000	1.2
@@ -0,0 +1 @@
+8e95fe31068558815f453e9161c37bb0  photoprint-borders-0.0.2.tar.gz



From mjakubicek at fedoraproject.org  Mon Apr 27 12:40:20 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 12:40:20 +0000 (UTC)
Subject: rpms/javahelp2/F-10 javahelp2-jhindexer.sh, 1.1,
	1.2 javahelp2-jhsearch.sh, 1.1, 1.2 javahelp2.spec, 1.1, 1.2
Message-ID: <20090427124020.537EF70110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/javahelp2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv567

Modified Files:
	javahelp2-jhindexer.sh javahelp2-jhsearch.sh javahelp2.spec 
Log Message:
- Added BR: servletapi5.
- Fixed wrapper scripts, resolves BZ#479341.




Index: javahelp2-jhindexer.sh
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/F-10/javahelp2-jhindexer.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2-jhindexer.sh	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2-jhindexer.sh	27 Apr 2009 12:39:49 -0000	1.2
@@ -19,7 +19,7 @@
 
 # Configuration
 MAIN_CLASS=com.sun.java.help.search.Indexer
-BASE_JARS=javahelp
+BASE_JARS=javahelp2
 
 # Set parameters
 set_jvm


Index: javahelp2-jhsearch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/F-10/javahelp2-jhsearch.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2-jhsearch.sh	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2-jhsearch.sh	27 Apr 2009 12:39:49 -0000	1.2
@@ -19,7 +19,7 @@
 
 # Configuration
 MAIN_CLASS=com.sun.java.help.search.QueryEngine
-BASE_JARS=javahelp
+BASE_JARS=javahelp2
 
 # Set parameters
 set_jvm


Index: javahelp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javahelp2/F-10/javahelp2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javahelp2.spec	9 Jun 2008 08:12:56 -0000	1.1
+++ javahelp2.spec	27 Apr 2009 12:39:49 -0000	1.2
@@ -30,7 +30,7 @@
 
 Name:		javahelp2
 Version:	2.0.05
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	JavaHelp is a full-featured, platform-independent, extensible help system 
 License:	GPLv2 with exceptions
 Url:		https://javahelp.dev.java.net/
@@ -45,6 +45,7 @@
 BuildRequires:	jpackage-utils >= 0:1.5.32
 BuildRequires:  jsp >= 0:2.0
 BuildRequires:	java-devel >= 1:1.6.0 ant ant-nodeps
+BuildRequires:	servletapi5
 Requires:	java >= 1:1.6.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -116,6 +117,10 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> 2.0.05-6
+- Added BR: servletapi5.
+- Fixed wrapper scripts, resolves BZ#479341.
+
 * Wed Apr 30 2008 Jaroslav Tulach <jtulach at netbeans.org> 2.0.05-5
 - Removed epoch and did other stuff as per Fedora review
 



From jakub at fedoraproject.org  Mon Apr 27 12:44:02 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 27 Apr 2009 12:44:02 +0000 (UTC)
Subject: rpms/gcc/F-11 gcc44-power7-2.patch, 1.2, 1.3 gcc44-power7-3.patch, 
	NONE, 1.1 gcc44-pr39856.patch, NONE, 1.1 gcc44-pr39903.patch,
	NONE, 1.1 .cvsignore, 1.272, 1.273 gcc.spec, 1.46, 1.47 sources,
	1.275, 1.276 gcc44-cswtch.patch, 1.1, NONE gcc44-pr39543.patch,
	1.3, NONE gcc44-pr39794.patch, 1.2, NONE gcc44-pr39867.patch,
	1.1, NONE gcc44-rh459374-1.patch, 1.1,
	NONE gcc44-rh459374-2.patch, 1.1, NONE gcc44-rh459374-3.patch,
	1.1, NONE
Message-ID: <20090427124402.C1EB970110@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1758

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-power7-2.patch gcc44-power7-3.patch gcc44-pr39856.patch 
	gcc44-pr39903.patch 
Removed Files:
	gcc44-cswtch.patch gcc44-pr39543.patch gcc44-pr39794.patch 
	gcc44-pr39867.patch gcc44-rh459374-1.patch 
	gcc44-rh459374-2.patch gcc44-rh459374-3.patch 
Log Message:
4.4.0-3

gcc44-power7-2.patch:

Index: gcc44-power7-2.patch
===================================================================
RCS file: gcc44-power7-2.patch
diff -N gcc44-power7-2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gcc44-power7-2.patch	27 Apr 2009 12:43:31 -0000	1.3
@@ -0,0 +1,328 @@
+2009-04-14  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* config/rs6000/rs6000.c (rs6000_secondary_reload_inner): Handle
+	more possible combinations of addresses.
+
+	* config/rs6000/vector.md (vec_reload_and_plus_<mptrsize>): Allow
+	register+small constant in addition to register+register, and
+	restrict the insn to only match during reload and afterwards.
+	(vec_reload_and_reg_<mptrsize>): Allow for and of register
+	indirect to not generate insn not found message.
+
+	PR testsuite/39769
+	* gcc.dg/vmx/3a-04.c (test): Don't rely on floating point equality
+	for testing the results of estimate instructions.
+	* gcc.dg/vmx/3a-04m.c (test): Ditto.
+	* gcc.dg/vmx/3a-05.c (test): Ditto.
+
+--- gcc/testsuite/gcc.dg/vmx/3a-05.c	(revision 146069)
++++ gcc/testsuite/gcc.dg/vmx/3a-05.c	(revision 146118)
+@@ -14,9 +14,13 @@ f(vector float a, vector float b, vector
+ 
+ static void test()
+ {
+-  check(vec_all_eq(f(((vector float){2,3,5,7}),
++  check(vec_all_gt(f(((vector float){2,3,5,7}),
+ 		     ((vector float){11,13,17,19}),
+ 		     ((vector float){23,29,31,37})),
+-		   ((vector float){16.9092026, 18.7693329, -2.8233242, -92.9472198})),
+-		   "f");
++		   ((vector float){16.90, 18.76, -2.83, -92.95}))
++	&& vec_all_lt(f(((vector float){2,3,5,7}),
++		     ((vector float){11,13,17,19}),
++		     ((vector float){23,29,31,37})),
++		   ((vector float){16.91, 18.77, -2.82, -92.94})),
++	"f");
+ }
+--- gcc/testsuite/gcc.dg/vmx/3a-04m.c	(revision 146069)
++++ gcc/testsuite/gcc.dg/vmx/3a-04m.c	(revision 146118)
+@@ -10,9 +10,13 @@ f(vector float a, vector float b, vector
+ 
+ static void test()
+ {
+-  check(vec_all_eq(f(((vector float){2,3,5,7}),
++  check(vec_all_gt(f(((vector float){2,3,5,7}),
+ 		     ((vector float){11,13,17,19}),
+ 		     ((vector float){23,29,31,37})),
+-		   ((vector float){23.1818085, 29.2307587, 32.2940826, 128.368393})),
++		   ((vector float){23.18, 29.23, 32.29, 128.36}))
++	&& vec_all_lt(f(((vector float){2,3,5,7}),
++			((vector float){11,13,17,19}),
++			((vector float){23,29,31,37})),
++		      ((vector float){23.19, 29.24, 32.30, 128.37})),
+ 	"f");
+ }
+--- gcc/testsuite/gcc.dg/vmx/3a-04.c	(revision 146069)
++++ gcc/testsuite/gcc.dg/vmx/3a-04.c	(revision 146118)
+@@ -10,9 +10,13 @@ f(vector float a, vector float b, vector
+ 
+ static void test()
+ {
+-  check(vec_all_eq(f(((vector float){2,3,5,7}),
++  check(vec_all_gt(f(((vector float){2,3,5,7}),
+ 		     ((vector float){11,13,17,19}),
+ 		     ((vector float){23,29,31,37})),
+-		   ((vector float){23.1818085, 29.2307587, 32.2940826, 128.368393})),
++		   ((vector float){23.18, 29.23, 32.29, 128.36}))
++	&& vec_all_lt(f(((vector float){2,3,5,7}),
++			((vector float){11,13,17,19}),
++			((vector float){23,29,31,37})),
++		      ((vector float){23.19, 29.24, 32.30, 128.37})),
+ 	"f");
+ }
+--- gcc/config/rs6000/vector.md	(revision 146069)
++++ gcc/config/rs6000/vector.md	(revision 146118)
+@@ -129,14 +129,15 @@ (define_expand "reload_<VEC_R:mode>_<P:m
+ })
+ 
+ ;; Reload sometimes tries to move the address to a GPR, and can generate
+-;; invalid RTL for addresses involving AND -16.
++;; invalid RTL for addresses involving AND -16.  Allow addresses involving
++;; reg+reg, reg+small constant, or just reg, all wrapped in an AND -16.
+ 
+ (define_insn_and_split "*vec_reload_and_plus_<mptrsize>"
+   [(set (match_operand:P 0 "gpc_reg_operand" "=b")
+ 	(and:P (plus:P (match_operand:P 1 "gpc_reg_operand" "r")
+-		       (match_operand:P 2 "gpc_reg_operand" "r"))
++		       (match_operand:P 2 "reg_or_cint_operand" "rI"))
+ 	       (const_int -16)))]
+-  "TARGET_ALTIVEC || TARGET_VSX"
++  "(TARGET_ALTIVEC || TARGET_VSX) && (reload_in_progress || reload_completed)"
+   "#"
+   "&& reload_completed"
+   [(set (match_dup 0)
+@@ -146,6 +147,21 @@ (define_insn_and_split "*vec_reload_and_
+ 		   (and:P (match_dup 0)
+ 			  (const_int -16)))
+ 	      (clobber:CC (scratch:CC))])])
++
++;; The normal ANDSI3/ANDDI3 won't match if reload decides to move an AND -16
++;; address to a register because there is no clobber of a (scratch), so we add
++;; it here.
++(define_insn_and_split "*vec_reload_and_reg_<mptrsize>"
++  [(set (match_operand:P 0 "gpc_reg_operand" "=b")
++	(and:P (match_operand:P 1 "gpc_reg_operand" "r")
++	       (const_int -16)))]
++  "(TARGET_ALTIVEC || TARGET_VSX) && (reload_in_progress || reload_completed)"
++  "#"
++  "&& reload_completed"
++  [(parallel [(set (match_dup 0)
++		   (and:P (match_dup 1)
++			  (const_int -16)))
++	      (clobber:CC (scratch:CC))])])
+ 
+ ;; Generic floating point vector arithmetic support
+ (define_expand "add<mode>3"
+--- gcc/config/rs6000/rs6000.c	(revision 146069)
++++ gcc/config/rs6000/rs6000.c	(revision 146118)
+@@ -12574,6 +12574,11 @@ rs6000_secondary_reload_inner (rtx reg, 
+   enum reg_class rclass;
+   rtx addr;
+   rtx and_op2 = NULL_RTX;
++  rtx addr_op1;
++  rtx addr_op2;
++  rtx scratch_or_premodify = scratch;
++  rtx and_rtx;
++  rtx cc_clobber;
+ 
+   if (TARGET_DEBUG_ADDR)
+     {
+@@ -12595,7 +12600,8 @@ rs6000_secondary_reload_inner (rtx reg, 
+ 
+   switch (rclass)
+     {
+-      /* Move reg+reg addresses into a scratch register for GPRs.  */
++      /* GPRs can handle reg + small constant, all other addresses need to use
++	 the scratch register.  */
+     case GENERAL_REGS:
+     case BASE_REGS:
+       if (GET_CODE (addr) == AND)
+@@ -12603,70 +12609,152 @@ rs6000_secondary_reload_inner (rtx reg, 
+ 	  and_op2 = XEXP (addr, 1);
+ 	  addr = XEXP (addr, 0);
+ 	}
++
++      if (GET_CODE (addr) == PRE_MODIFY)
++	{
++	  scratch_or_premodify = XEXP (addr, 0);
++	  gcc_assert (REG_P (scratch_or_premodify));
++	  gcc_assert (GET_CODE (XEXP (addr, 1)) == PLUS);
++	  addr = XEXP (addr, 1);
++	}
++
+       if (GET_CODE (addr) == PLUS
+ 	  && (!rs6000_legitimate_offset_address_p (TImode, addr, true)
+ 	      || and_op2 != NULL_RTX))
+ 	{
+-	  if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
+-	      || GET_CODE (addr) == CONST_INT)
+-	    rs6000_emit_move (scratch, addr, GET_MODE (addr));
+-	  else
+-	    emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
+-	  addr = scratch;
++	  addr_op1 = XEXP (addr, 0);
++	  addr_op2 = XEXP (addr, 1);
++	  gcc_assert (legitimate_indirect_address_p (addr_op1, true));
++
++	  if (!REG_P (addr_op2)
++	      && (GET_CODE (addr_op2) != CONST_INT
++		  || !satisfies_constraint_I (addr_op2)))
++	    {
++	      rs6000_emit_move (scratch, addr_op2, Pmode);
++	      addr_op2 = scratch;
++	    }
++
++	  emit_insn (gen_rtx_SET (VOIDmode,
++				  scratch_or_premodify,
++				  gen_rtx_PLUS (Pmode,
++						addr_op1,
++						addr_op2)));
++
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
+ 	}
+-      else if (GET_CODE (addr) == PRE_MODIFY
+-	       && REG_P (XEXP (addr, 0))
+-	       && GET_CODE (XEXP (addr, 1)) == PLUS)
++      else if (!legitimate_indirect_address_p (addr, true)
++	       && !rs6000_legitimate_offset_address_p (TImode, addr, true))
+ 	{
+-	  emit_insn (gen_rtx_SET (VOIDmode, XEXP (addr, 0), XEXP (addr, 1)));
+-	  addr = XEXP (addr, 0);
++	  rs6000_emit_move (scratch_or_premodify, addr, Pmode);
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
+ 	}
+       break;
+ 
++      /* Float/Altivec registers can only handle reg+reg addressing.  Move
++	 other addresses into a scratch register.  */
++    case FLOAT_REGS:
++    case VSX_REGS:
++    case ALTIVEC_REGS:
++
+       /* With float regs, we need to handle the AND ourselves, since we can't
+ 	 use the Altivec instruction with an implicit AND -16.  Allow scalar
+ 	 loads to float registers to use reg+offset even if VSX.  */
+-    case FLOAT_REGS:
+-    case VSX_REGS:
+-      if (GET_CODE (addr) == AND)
++      if (GET_CODE (addr) == AND
++	  && (rclass != ALTIVEC_REGS || GET_MODE_SIZE (mode) != 16))
+ 	{
+ 	  and_op2 = XEXP (addr, 1);
+ 	  addr = XEXP (addr, 0);
+ 	}
+-      /* fall through */
+ 
+-      /* Move reg+offset addresses into a scratch register.  */
+-    case ALTIVEC_REGS:
+-      if (!legitimate_indirect_address_p (addr, true)
+-	  && !legitimate_indexed_address_p (addr, true)
+-	  && (GET_CODE (addr) != PRE_MODIFY
+-	      || !legitimate_indexed_address_p (XEXP (addr, 1), true))
+-	  && (rclass != FLOAT_REGS
+-	      || GET_MODE_SIZE (mode) != 8
++      /* If we aren't using a VSX load, save the PRE_MODIFY register and use it
++	 as the address later.  */
++      if (GET_CODE (addr) == PRE_MODIFY
++	  && (!VECTOR_MEM_VSX_P (mode)
+ 	      || and_op2 != NULL_RTX
+-	      || !rs6000_legitimate_offset_address_p (mode, addr, true)))
++	      || !legitimate_indexed_address_p (XEXP (addr, 1), true)))
+ 	{
+-	  if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
+-	      || GET_CODE (addr) == CONST_INT)
+-	    rs6000_emit_move (scratch, addr, GET_MODE (addr));
+-	  else
+-	    emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
+-	  addr = scratch;
++	  scratch_or_premodify = XEXP (addr, 0);
++	  gcc_assert (legitimate_indirect_address_p (scratch_or_premodify,
++						     true));
++	  gcc_assert (GET_CODE (XEXP (addr, 1)) == PLUS);
++	  addr = XEXP (addr, 1);
++	}
++
++      if (legitimate_indirect_address_p (addr, true)	/* reg */
++	  || legitimate_indexed_address_p (addr, true)	/* reg+reg */
++	  || GET_CODE (addr) == PRE_MODIFY		/* VSX pre-modify */
++	  || GET_CODE (addr) == AND			/* Altivec memory */
++	  || (rclass == FLOAT_REGS			/* legacy float mem */
++	      && GET_MODE_SIZE (mode) == 8
++	      && and_op2 == NULL_RTX
++	      && scratch_or_premodify == scratch
++	      && rs6000_legitimate_offset_address_p (mode, addr, true)))
++	;
++
++      else if (GET_CODE (addr) == PLUS)
++	{
++	  addr_op1 = XEXP (addr, 0);
++	  addr_op2 = XEXP (addr, 1);
++	  gcc_assert (REG_P (addr_op1));
++
++	  rs6000_emit_move (scratch, addr_op2, Pmode);
++	  emit_insn (gen_rtx_SET (VOIDmode,
++				  scratch_or_premodify,
++				  gen_rtx_PLUS (Pmode,
++						addr_op1,
++						scratch)));
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
+ 	}
++
++      else if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
++	       || GET_CODE (addr) == CONST_INT)
++	{
++	  rs6000_emit_move (scratch_or_premodify, addr, Pmode);
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
++	}
++
++      else
++	gcc_unreachable ();
++
+       break;
+ 
+     default:
+       gcc_unreachable ();
+     }
+ 
+-  /* If the original address involved an AND -16 that is part of the Altivec
+-     addresses, recreate the and now.  */
++  /* If the original address involved a pre-modify that we couldn't use the VSX
++     memory instruction with update, and we haven't taken care of already,
++     store the address in the pre-modify register and use that as the
++     address.  */
++  if (scratch_or_premodify != scratch && scratch_or_premodify != addr)
++    {
++      emit_insn (gen_rtx_SET (VOIDmode, scratch_or_premodify, addr));
++      addr = scratch_or_premodify;
++    }
++
++  /* If the original address involved an AND -16 and we couldn't use an ALTIVEC
++     memory instruction, recreate the AND now, including the clobber which is
++     generated by the general ANDSI3/ANDDI3 patterns for the
++     andi. instruction.  */
+   if (and_op2 != NULL_RTX)
+     {
+-      rtx and_rtx = gen_rtx_SET (VOIDmode,
+-				 scratch,
+-				 gen_rtx_AND (Pmode, addr, and_op2));
+-      rtx cc_clobber = gen_rtx_CLOBBER (CCmode, gen_rtx_SCRATCH (CCmode));
++      if (! legitimate_indirect_address_p (addr, true))
++	{
++	  emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
++	  addr = scratch;
++	}
++
++      and_rtx = gen_rtx_SET (VOIDmode,
++			     scratch,
++			     gen_rtx_AND (Pmode,
++					  addr,
++					  and_op2));
++
++      cc_clobber = gen_rtx_CLOBBER (CCmode, gen_rtx_SCRATCH (CCmode));
+       emit_insn (gen_rtx_PARALLEL (VOIDmode,
+ 				   gen_rtvec (2, and_rtx, cc_clobber)));
+       addr = scratch;

gcc44-power7-3.patch:

--- NEW FILE gcc44-power7-3.patch ---
--- gcc/doc/extend.texi	(revision 146119)
+++ gcc/doc/extend.texi	(revision 146798)
@@ -7094,7 +7094,7 @@ instructions, but allow the compiler to 
 * MIPS Loongson Built-in Functions::
 * Other MIPS Built-in Functions::
 * picoChip Built-in Functions::
-* PowerPC AltiVec Built-in Functions::
+* PowerPC AltiVec/VSX Built-in Functions::
 * SPARC VIS Built-in Functions::
 * SPU Built-in Functions::
 @end menu
@@ -9571,7 +9571,7 @@ GCC defines the preprocessor macro @code
 when this function is available.
 @end table
 
- at node PowerPC AltiVec Built-in Functions
+ at node PowerPC AltiVec/VSX Built-in Functions
 @subsection PowerPC AltiVec Built-in Functions
 
 GCC provides an interface for the PowerPC family of processors to access
@@ -9597,6 +9597,19 @@ vector bool int
 vector float
 @end smallexample
 
+If @option{-mvsx} is used the following additional vector types are
+implemented.
+
+ at smallexample
+vector unsigned long
+vector signed long
+vector double
+ at end smallexample
+
+The long types are only implemented for 64-bit code generation, and
+the long type is only used in the floating point/integer conversion
+instructions.
+
 GCC's implementation of the high-level language interface available from
 C and C++ code differs from Motorola's documentation in several ways.
 
--- gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c	(revision 0)
+++ gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c	(revision 146798)
@@ -0,0 +1,212 @@
+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mcpu=power7" } */
+/* { dg-final { scan-assembler "xxsel" } } */
+/* { dg-final { scan-assembler "vperm" } } */
+/* { dg-final { scan-assembler "xvrdpi" } } */
+/* { dg-final { scan-assembler "xvrdpic" } } */
+/* { dg-final { scan-assembler "xvrdpim" } } */
+/* { dg-final { scan-assembler "xvrdpip" } } */
+/* { dg-final { scan-assembler "xvrdpiz" } } */
+/* { dg-final { scan-assembler "xvrspi" } } */
+/* { dg-final { scan-assembler "xvrspic" } } */
+/* { dg-final { scan-assembler "xvrspim" } } */
+/* { dg-final { scan-assembler "xvrspip" } } */
+/* { dg-final { scan-assembler "xvrspiz" } } */
+/* { dg-final { scan-assembler "xsrdpi" } } */
+/* { dg-final { scan-assembler "xsrdpic" } } */
+/* { dg-final { scan-assembler "xsrdpim" } } */
+/* { dg-final { scan-assembler "xsrdpip" } } */
+/* { dg-final { scan-assembler "xsrdpiz" } } */
+/* { dg-final { scan-assembler "xsmaxdp" } } */
+/* { dg-final { scan-assembler "xsmindp" } } */
+/* { dg-final { scan-assembler "xxland" } } */
+/* { dg-final { scan-assembler "xxlandc" } } */
+/* { dg-final { scan-assembler "xxlnor" } } */
+/* { dg-final { scan-assembler "xxlor" } } */
+/* { dg-final { scan-assembler "xxlxor" } } */
+/* { dg-final { scan-assembler "xvcmpeqdp" } } */
+/* { dg-final { scan-assembler "xvcmpgtdp" } } */
+/* { dg-final { scan-assembler "xvcmpgedp" } } */
+/* { dg-final { scan-assembler "xvcmpeqsp" } } */
+/* { dg-final { scan-assembler "xvcmpgtsp" } } */
+/* { dg-final { scan-assembler "xvcmpgesp" } } */
+/* { dg-final { scan-assembler "xxsldwi" } } */
+/* { dg-final { scan-assembler-not "call" } } */
+
+extern __vector int si[][4];
+extern __vector short ss[][4];
+extern __vector signed char sc[][4];
+extern __vector float f[][4];
+extern __vector unsigned int ui[][4];
+extern __vector unsigned short us[][4];
+extern __vector unsigned char uc[][4];
+extern __vector __bool int bi[][4];
+extern __vector __bool short bs[][4];
+extern __vector __bool char bc[][4];
+extern __vector __pixel p[][4];
+#ifdef __VSX__
+extern __vector double d[][4];
+extern __vector long sl[][4];
+extern __vector unsigned long ul[][4];
+extern __vector __bool long bl[][4];
+#endif
+
+int do_sel(void)
+{
+  int i = 0;
+
+  si[i][0] = __builtin_vsx_xxsel_4si (si[i][1], si[i][2], si[i][3]); i++;
+  ss[i][0] = __builtin_vsx_xxsel_8hi (ss[i][1], ss[i][2], ss[i][3]); i++;
+  sc[i][0] = __builtin_vsx_xxsel_16qi (sc[i][1], sc[i][2], sc[i][3]); i++;
+  f[i][0] = __builtin_vsx_xxsel_4sf (f[i][1], f[i][2], f[i][3]); i++;
+  d[i][0] = __builtin_vsx_xxsel_2df (d[i][1], d[i][2], d[i][3]); i++;
+
+  si[i][0] = __builtin_vsx_xxsel (si[i][1], si[i][2], bi[i][3]); i++;
+  ss[i][0] = __builtin_vsx_xxsel (ss[i][1], ss[i][2], bs[i][3]); i++;
+  sc[i][0] = __builtin_vsx_xxsel (sc[i][1], sc[i][2], bc[i][3]); i++;
+  f[i][0] = __builtin_vsx_xxsel (f[i][1], f[i][2], bi[i][3]); i++;
+  d[i][0] = __builtin_vsx_xxsel (d[i][1], d[i][2], bl[i][3]); i++;
+
+  si[i][0] = __builtin_vsx_xxsel (si[i][1], si[i][2], ui[i][3]); i++;
+  ss[i][0] = __builtin_vsx_xxsel (ss[i][1], ss[i][2], us[i][3]); i++;
+  sc[i][0] = __builtin_vsx_xxsel (sc[i][1], sc[i][2], uc[i][3]); i++;
+  f[i][0] = __builtin_vsx_xxsel (f[i][1], f[i][2], ui[i][3]); i++;
+  d[i][0] = __builtin_vsx_xxsel (d[i][1], d[i][2], ul[i][3]); i++;
+
+  return i;
+}
+
+int do_perm(void)
+{
+  int i = 0;
+
+  si[i][0] = __builtin_vsx_vperm_4si (si[i][1], si[i][2], sc[i][3]); i++;
+  ss[i][0] = __builtin_vsx_vperm_8hi (ss[i][1], ss[i][2], sc[i][3]); i++;
+  sc[i][0] = __builtin_vsx_vperm_16qi (sc[i][1], sc[i][2], sc[i][3]); i++;
+  f[i][0] = __builtin_vsx_vperm_4sf (f[i][1], f[i][2], sc[i][3]); i++;
+  d[i][0] = __builtin_vsx_vperm_2df (d[i][1], d[i][2], sc[i][3]); i++;
+
+  si[i][0] = __builtin_vsx_vperm (si[i][1], si[i][2], uc[i][3]); i++;
+  ss[i][0] = __builtin_vsx_vperm (ss[i][1], ss[i][2], uc[i][3]); i++;
+  sc[i][0] = __builtin_vsx_vperm (sc[i][1], sc[i][2], uc[i][3]); i++;
+  f[i][0] = __builtin_vsx_vperm (f[i][1], f[i][2], uc[i][3]); i++;
+  d[i][0] = __builtin_vsx_vperm (d[i][1], d[i][2], uc[i][3]); i++;
+
+  return i;
+}
+
+int do_xxperm (void)
+{
+  int i = 0;
+
+  d[i][0] = __builtin_vsx_xxpermdi_2df (d[i][1], d[i][2], 0); i++;
+  d[i][0] = __builtin_vsx_xxpermdi (d[i][1], d[i][2], 1); i++;
+  return i;
+}
+
+double x, y;
+void do_concat (void)
+{
+  d[0][0] = __builtin_vsx_concat_2df (x, y);
+}
+
+void do_set (void)
+{
+  d[0][0] = __builtin_vsx_set_2df (d[0][1], x, 0);
+  d[1][0] = __builtin_vsx_set_2df (d[1][1], y, 1);
+}
+
+extern double z[][4];
+
+int do_math (void)
+{
+  int i = 0;
+
+  d[i][0] = __builtin_vsx_xvrdpi  (d[i][1]); i++;
+  d[i][0] = __builtin_vsx_xvrdpic (d[i][1]); i++;
+  d[i][0] = __builtin_vsx_xvrdpim (d[i][1]); i++;
+  d[i][0] = __builtin_vsx_xvrdpip (d[i][1]); i++;
+  d[i][0] = __builtin_vsx_xvrdpiz (d[i][1]); i++;
+
+  f[i][0] = __builtin_vsx_xvrspi  (f[i][1]); i++;
+  f[i][0] = __builtin_vsx_xvrspic (f[i][1]); i++;
+  f[i][0] = __builtin_vsx_xvrspim (f[i][1]); i++;
+  f[i][0] = __builtin_vsx_xvrspip (f[i][1]); i++;
+  f[i][0] = __builtin_vsx_xvrspiz (f[i][1]); i++;
+
+  z[i][0] = __builtin_vsx_xsrdpi  (z[i][1]); i++;
+  z[i][0] = __builtin_vsx_xsrdpic (z[i][1]); i++;
+  z[i][0] = __builtin_vsx_xsrdpim (z[i][1]); i++;
+  z[i][0] = __builtin_vsx_xsrdpip (z[i][1]); i++;
+  z[i][0] = __builtin_vsx_xsrdpiz (z[i][1]); i++;
+  z[i][0] = __builtin_vsx_xsmaxdp (z[i][1], z[i][0]); i++;
+  z[i][0] = __builtin_vsx_xsmindp (z[i][1], z[i][0]); i++;
+  return i;
+}
+
+int do_cmp (void)
+{
+  int i = 0;
+
+  d[i][0] = __builtin_vsx_xvcmpeqdp (d[i][1], d[i][2]); i++;
+  d[i][0] = __builtin_vsx_xvcmpgtdp (d[i][1], d[i][2]); i++;
+  d[i][0] = __builtin_vsx_xvcmpgedp (d[i][1], d[i][2]); i++;
+
[...3124 lines suppressed...]
 
   /* VSX overloaded builtins, add the overloaded functions not present in
      Altivec.  */
@@ -3395,7 +3411,13 @@ enum rs6000_builtins
   VSX_BUILTIN_VEC_NMADD,
   VSX_BUITLIN_VEC_NMSUB,
   VSX_BUILTIN_VEC_DIV,
-  VSX_BUILTIN_OVERLOADED_LAST = VSX_BUILTIN_VEC_DIV,
+  VSX_BUILTIN_VEC_XXMRGHW,
+  VSX_BUILTIN_VEC_XXMRGLW,
+  VSX_BUILTIN_VEC_XXPERMDI,
+  VSX_BUILTIN_VEC_XXSLDWI,
+  VSX_BUILTIN_VEC_XXSPLTD,
+  VSX_BUILTIN_VEC_XXSPLTW,
+  VSX_BUILTIN_OVERLOADED_LAST = VSX_BUILTIN_VEC_XXSPLTW,
 
   /* Combined VSX/Altivec builtins.  */
   VECTOR_BUILTIN_FLOAT_V4SI_V4SF,
@@ -3425,13 +3447,16 @@ enum rs6000_builtin_type_index
   RS6000_BTI_unsigned_V16QI,
   RS6000_BTI_unsigned_V8HI,
   RS6000_BTI_unsigned_V4SI,
+  RS6000_BTI_unsigned_V2DI,
   RS6000_BTI_bool_char,          /* __bool char */
   RS6000_BTI_bool_short,         /* __bool short */
   RS6000_BTI_bool_int,           /* __bool int */
+  RS6000_BTI_bool_long,		 /* __bool long */
   RS6000_BTI_pixel,              /* __pixel */
   RS6000_BTI_bool_V16QI,         /* __vector __bool char */
   RS6000_BTI_bool_V8HI,          /* __vector __bool short */
   RS6000_BTI_bool_V4SI,          /* __vector __bool int */
+  RS6000_BTI_bool_V2DI,          /* __vector __bool long */
   RS6000_BTI_pixel_V8HI,         /* __vector __pixel */
   RS6000_BTI_long,	         /* long_integer_type_node */
   RS6000_BTI_unsigned_long,      /* long_unsigned_type_node */
@@ -3466,13 +3491,16 @@ enum rs6000_builtin_type_index
 #define unsigned_V16QI_type_node      (rs6000_builtin_types[RS6000_BTI_unsigned_V16QI])
 #define unsigned_V8HI_type_node       (rs6000_builtin_types[RS6000_BTI_unsigned_V8HI])
 #define unsigned_V4SI_type_node       (rs6000_builtin_types[RS6000_BTI_unsigned_V4SI])
+#define unsigned_V2DI_type_node       (rs6000_builtin_types[RS6000_BTI_unsigned_V2DI])
 #define bool_char_type_node           (rs6000_builtin_types[RS6000_BTI_bool_char])
 #define bool_short_type_node          (rs6000_builtin_types[RS6000_BTI_bool_short])
 #define bool_int_type_node            (rs6000_builtin_types[RS6000_BTI_bool_int])
+#define bool_long_type_node           (rs6000_builtin_types[RS6000_BTI_bool_long])
 #define pixel_type_node               (rs6000_builtin_types[RS6000_BTI_pixel])
 #define bool_V16QI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V16QI])
 #define bool_V8HI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V8HI])
 #define bool_V4SI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V4SI])
+#define bool_V2DI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V2DI])
 #define pixel_V8HI_type_node	      (rs6000_builtin_types[RS6000_BTI_pixel_V8HI])
 
 #define long_integer_type_internal_node  (rs6000_builtin_types[RS6000_BTI_long])
--- gcc/config/rs6000/altivec.md	(revision 146119)
+++ gcc/config/rs6000/altivec.md	(revision 146798)
@@ -166,12 +166,15 @@ (define_mode_iterator V [V4SI V8HI V16QI
 ;; otherwise handled by altivec (v2df, v2di, ti)
 (define_mode_iterator VM [V4SI V8HI V16QI V4SF V2DF V2DI TI])
 
+;; Like VM, except don't do TImode
+(define_mode_iterator VM2 [V4SI V8HI V16QI V4SF V2DF V2DI])
+
 (define_mode_attr VI_char [(V4SI "w") (V8HI "h") (V16QI "b")])
 
 ;; Vector move instructions.
 (define_insn "*altivec_mov<mode>"
-  [(set (match_operand:V 0 "nonimmediate_operand" "=Z,v,v,*o,*r,*r,v,v")
-	(match_operand:V 1 "input_operand" "v,Z,v,r,o,r,j,W"))]
+  [(set (match_operand:VM2 0 "nonimmediate_operand" "=Z,v,v,*o,*r,*r,v,v")
+	(match_operand:VM2 1 "input_operand" "v,Z,v,r,o,r,j,W"))]
   "VECTOR_MEM_ALTIVEC_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
        || register_operand (operands[1], <MODE>mode))"
@@ -191,6 +194,31 @@ (define_insn "*altivec_mov<mode>"
 }
   [(set_attr "type" "vecstore,vecload,vecsimple,store,load,*,vecsimple,*")])
 
+;; Unlike other altivec moves, allow the GPRs, since a normal use of TImode
+;; is for unions.  However for plain data movement, slightly favor the vector
+;; loads
+(define_insn "*altivec_movti"
+  [(set (match_operand:TI 0 "nonimmediate_operand" "=Z,v,v,?o,?r,?r,v,v")
+	(match_operand:TI 1 "input_operand" "v,Z,v,r,o,r,j,W"))]
+  "VECTOR_MEM_ALTIVEC_P (TImode)
+   && (register_operand (operands[0], TImode) 
+       || register_operand (operands[1], TImode))"
+{
+  switch (which_alternative)
+    {
+    case 0: return "stvx %1,%y0";
+    case 1: return "lvx %0,%y1";
+    case 2: return "vor %0,%1,%1";
+    case 3: return "#";
+    case 4: return "#";
+    case 5: return "#";
+    case 6: return "vxor %0,%0,%0";
+    case 7: return output_vec_const_move (operands);
+    default: gcc_unreachable ();
+    }
+}
+  [(set_attr "type" "vecstore,vecload,vecsimple,store,load,*,vecsimple,*")])
+
 (define_split
   [(set (match_operand:VM 0 "altivec_register_operand" "")
 	(match_operand:VM 1 "easy_vector_constant_add_self" ""))]
@@ -434,13 +462,13 @@ (define_insn "*altivec_gev4sf"
   "vcmpgefp %0,%1,%2"
   [(set_attr "type" "veccmp")])
 
-(define_insn "altivec_vsel<mode>"
+(define_insn "*altivec_vsel<mode>"
   [(set (match_operand:VM 0 "altivec_register_operand" "=v")
 	(if_then_else:VM (ne (match_operand:VM 1 "altivec_register_operand" "v")
 			     (const_int 0))
 			 (match_operand:VM 2 "altivec_register_operand" "v")
 			 (match_operand:VM 3 "altivec_register_operand" "v")))]
-  "VECTOR_UNIT_ALTIVEC_P (<MODE>mode)"
+  "VECTOR_MEM_ALTIVEC_P (<MODE>mode)"
   "vsel %0,%3,%2,%1"
   [(set_attr "type" "vecperm")])
 
@@ -780,7 +808,7 @@ (define_insn "altivec_vmrghw"
 						    (const_int 3)
 						    (const_int 1)]))
 		      (const_int 5)))]
-  "TARGET_ALTIVEC"
+  "VECTOR_MEM_ALTIVEC_P (V4SImode)"
   "vmrghw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
@@ -797,7 +825,7 @@ (define_insn "*altivec_vmrghsf"
                                                     (const_int 3)
                                                     (const_int 1)]))
                       (const_int 5)))]
-  "VECTOR_UNIT_ALTIVEC_P (V4SFmode)"
+  "VECTOR_MEM_ALTIVEC_P (V4SFmode)"
   "vmrghw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
@@ -881,7 +909,7 @@ (define_insn "altivec_vmrglw"
 				     (const_int 1)
 				     (const_int 3)]))
 	 (const_int 5)))]
-  "TARGET_ALTIVEC"
+  "VECTOR_MEM_ALTIVEC_P (V4SImode)"
   "vmrglw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
@@ -899,7 +927,7 @@ (define_insn "*altivec_vmrglsf"
 				     (const_int 1)
 				     (const_int 3)]))
 	 (const_int 5)))]
-  "VECTOR_UNIT_ALTIVEC_P (V4SFmode)"
+  "VECTOR_MEM_ALTIVEC_P (V4SFmode)"
   "vmrglw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
--- gcc/config/rs6000/rs6000.md	(revision 146119)
+++ gcc/config/rs6000/rs6000.md	(revision 146798)
@@ -14667,7 +14667,11 @@ (define_insn "return"
   [(set_attr "type" "jmpreg")])
 
 (define_expand "indirect_jump"
-  [(set (pc) (match_operand 0 "register_operand" ""))])
+  [(set (pc) (match_operand 0 "register_operand" ""))]
+  ""
+{
+  rs6000_set_indirect_jump ();
+})
 
 (define_insn "*indirect_jump<mode>"
   [(set (pc) (match_operand:P 0 "register_operand" "c,*l"))]
@@ -14682,14 +14686,14 @@ (define_expand "tablejump"
   [(use (match_operand 0 "" ""))
    (use (label_ref (match_operand 1 "" "")))]
   ""
-  "
 {
+  rs6000_set_indirect_jump ();
   if (TARGET_32BIT)
     emit_jump_insn (gen_tablejumpsi (operands[0], operands[1]));
   else
     emit_jump_insn (gen_tablejumpdi (operands[0], operands[1]));
   DONE;
-}")
+})
 
 (define_expand "tablejumpsi"
   [(set (match_dup 3)
@@ -14749,6 +14753,11 @@ (define_expand "doloop_end"
   /* Only use this on innermost loops.  */
   if (INTVAL (operands[3]) > 1)
     FAIL;
+  /* Do not try to use decrement and count on code that has an indirect
+     jump or a table jump, because the ctr register is preferred over the
+     lr register.  */
+  if (rs6000_has_indirect_jump_p ())
+    FAIL;
   if (TARGET_64BIT)
     {
       if (GET_MODE (operands[0]) != DImode)

gcc44-pr39856.patch:

--- NEW FILE gcc44-pr39856.patch ---
2009-04-24  Vladimir Makarov  <vmakarov at redhat.com>

	PR target/39856
	* reg-stack.c (subst_stack_regs_pat): Remove gcc_assert for note
	for clobber.

--- gcc/reg-stack.c	(revision 146648)
+++ gcc/reg-stack.c	(working copy)
@@ -1371,21 +1371,23 @@ subst_stack_regs_pat (rtx insn, stack re
 
 	    if (pat != PATTERN (insn))
 	      {
-		/* The fix_truncdi_1 pattern wants to be able to allocate
-		   its own scratch register.  It does this by clobbering
-		   an fp reg so that it is assured of an empty reg-stack
-		   register.  If the register is live, kill it now.
-		   Remove the DEAD/UNUSED note so we don't try to kill it
-		   later too.  */
+		/* The fix_truncdi_1 pattern wants to be able to
+		   allocate its own scratch register.  It does this by
+		   clobbering an fp reg so that it is assured of an
+		   empty reg-stack register.  If the register is live,
+		   kill it now.  Remove the DEAD/UNUSED note so we
+		   don't try to kill it later too.
+
+		   In reality the UNUSED note can be absent in some
+		   complicated cases when the register is reused for
+		   partially set variable.  */
 
 		if (note)
 		  emit_pop_insn (insn, regstack, *dest, EMIT_BEFORE);
 		else
-		  {
-		    note = find_reg_note (insn, REG_UNUSED, *dest);
-		    gcc_assert (note);
-		  }
-		remove_note (insn, note);
+		  note = find_reg_note (insn, REG_UNUSED, *dest);
+		if (note)
+		  remove_note (insn, note);
 		replace_reg (dest, FIRST_STACK_REG + 1);
 	      }
 	    else

gcc44-pr39903.patch:

--- NEW FILE gcc44-pr39903.patch ---
2009-04-26  H.J. Lu  <hongjiu.lu at intel.com>

	PR target/39903
	* config/i386/i386.c (construct_container): Don't call
	gen_reg_or_parallel with BLKmode for X86_64_SSE_CLASS,
	X86_64_SSESF_CLASS and X86_64_SSEDF_CLASS.

	PR target/39903
	* gcc.dg/torture/pr39903-1.c: New.
	* gcc.dg/torture/pr39903-2.c: Likewise.

--- gcc/config/i386/i386.c	(revision 146817)
+++ gcc/config/i386/i386.c	(working copy)
@@ -5466,7 +5466,10 @@ construct_container (enum machine_mode m
       case X86_64_SSE_CLASS:
       case X86_64_SSESF_CLASS:
       case X86_64_SSEDF_CLASS:
-	return gen_reg_or_parallel (mode, orig_mode, SSE_REGNO (sse_regno));
+	if (mode != BLKmode)
+	  return gen_reg_or_parallel (mode, orig_mode, 
+				      SSE_REGNO (sse_regno));
+	break;
       case X86_64_X87_CLASS:
       case X86_64_COMPLEX_X87_CLASS:
 	return gen_rtx_REG (mode, FIRST_STACK_REG);
--- gcc/testsuite/gcc.dg/torture/pr39903-1.c	(revision 0)
+++ gcc/testsuite/gcc.dg/torture/pr39903-1.c	(revision 0)
@@ -0,0 +1,24 @@
+/* PR target/39903 */
+/* { dg-do run } */
+/* { dg-options "-Wno-psabi" } */
+
+struct X {
+  double d;
+  double b[];
+};
+
+struct X __attribute__((noinline))
+foo (double d)
+{
+  struct X x;
+  x.d = d;
+  return x;
+}
+extern void abort (void);
+int main()
+{
+  struct X x = foo(3.0);
+  if (x.d != 3.0)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/gcc.dg/torture/pr39903-2.c	(revision 0)
+++ gcc/testsuite/gcc.dg/torture/pr39903-2.c	(revision 0)
@@ -0,0 +1,24 @@
+/* PR target/39903 */
+/* { dg-do run } */
+/* { dg-options "-Wno-psabi" } */
+
+struct X {
+  float d;
+  float b[];
+};
+
+struct X __attribute__((noinline))
+foo (float d)
+{
+  struct X x;
+  x.d = d;
+  return x;
+}
+extern void abort (void);
+int main()
+{
+  struct X x = foo(3.0);
+  if (x.d != 3.0)
+    abort ();
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/.cvsignore,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- .cvsignore	24 Apr 2009 08:04:27 -0000	1.272
+++ .cvsignore	27 Apr 2009 12:43:31 -0000	1.273
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090424.tar.bz2
+gcc-4.4.0-20090427.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/gcc.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gcc.spec	24 Apr 2009 08:04:27 -0000	1.46
+++ gcc.spec	27 Apr 2009 12:43:31 -0000	1.47
@@ -1,9 +1,9 @@
-%define DATE 20090424
-%define SVNREV 146674
+%define DATE 20090427
+%define SVNREV 146836
 %define gcc_version 4.4.0
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 2
+%define gcc_release 3
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -147,15 +147,12 @@
 Patch21: gcc44-cloog-dl.patch
 Patch22: gcc44-raw-string.patch
 Patch24: gcc44-atom.patch
-Patch26: gcc44-power7.patch
+Patch25: gcc44-power7.patch
+Patch26: gcc44-power7-2.patch
+Patch27: gcc44-power7-3.patch
 Patch28: gcc44-pr38757.patch
-Patch30: gcc44-pr39543.patch
-Patch31: gcc44-pr39794.patch
-Patch32: gcc44-rh459374-1.patch
-Patch33: gcc44-rh459374-2.patch
-Patch34: gcc44-rh459374-3.patch
-Patch35: gcc44-cswtch.patch
-Patch36: gcc44-pr39867.patch
+Patch29: gcc44-pr39856.patch
+Patch30: gcc44-pr39903.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -441,15 +438,12 @@
 %endif
 %patch22 -p0 -b .raw-string~
 %patch24 -p0 -b .atom~
-%patch26 -p0 -b .power7~
+%patch25 -p0 -b .power7~
+%patch26 -p0 -b .power7-2~
+%patch27 -p0 -b .power7-3~
 %patch28 -p0 -b .pr38757~
-%patch30 -p0 -b .pr39543~
-%patch31 -p0 -b .pr39794~
-%patch32 -p0 -b .rh459374-1~
-%patch33 -p0 -b .rh459374-2~
-%patch34 -p0 -b .rh459374-3~
-%patch35 -p0 -b .cswtch~
-%patch36 -p0 -b .pr39867~
+%patch29 -p0 -b .pr39856~
+%patch30 -p0 -b .pr39903~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1760,6 +1754,16 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Apr 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-3
+- update from gcc-4_4-branch
+  - PR bootstrap/39739
+  - fix -Wunused-value (#497545, PR c/39889)
+- backport further power7-meissner branch changes (#497816)
+- fix reg-stack ICE on SPEC2k6 453.povray with -m32 -O3 -msse3
+  (PR target/39856)
+- fix x86_64 ICE on passing structure with flexible array member
+  (PR target/39903)
+
 * Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-2
 - update from gcc-4_4-branch
   - PR c++/38228
@@ -1818,7 +1822,7 @@
 	tree-optimization/39557
 - emit debuginfo for block local externs in C (PR debug/39563)
 - fix -maltivec conditional vector macro (PR target/39558)
-- teach fwprop to handle asm (PR rtl-optimization/39543)
+- teach fwprop to handle asm (PR inline-asm/39543)
 
 * Tue Mar 24 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.29
 - update from trunk


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-11/sources,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- sources	24 Apr 2009 08:04:27 -0000	1.275
+++ sources	27 Apr 2009 12:43:32 -0000	1.276
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-441af0d1283e61c52f241a06710f56a3  gcc-4.4.0-20090424.tar.bz2
+373986714230ac85e2d6d6e4abb107e0  gcc-4.4.0-20090427.tar.bz2


--- gcc44-cswtch.patch DELETED ---


--- gcc44-pr39543.patch DELETED ---


--- gcc44-pr39794.patch DELETED ---


--- gcc44-pr39867.patch DELETED ---


--- gcc44-rh459374-1.patch DELETED ---


--- gcc44-rh459374-2.patch DELETED ---


--- gcc44-rh459374-3.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:04 +0000
Subject: [pkgdb] python-chardet: sundaram has requested commit
Message-ID: <20090427125004.C5A5010F881@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on python-chardet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:01 +0000
Subject: [pkgdb] clement had acl change status
Message-ID: <20090427125007.4247810F894@bastion2.fedora.phx.redhat.com>

jmrcpn has set the watchcommits acl on clement (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:07 +0000
Subject: [pkgdb] python-chardet: sundaram has requested approveacls
Message-ID: <20090427125007.C8C9910F89B@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on python-chardet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:07 +0000
Subject: [pkgdb] python-chardet: sundaram has requested watchcommits
Message-ID: <20090427125007.74A5C10F898@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on python-chardet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:18 +0000
Subject: [pkgdb] python-chardet: sundaram has requested watchbugzilla
Message-ID: <20090427125018.9FD6510F89C@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on python-chardet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:27 +0000
Subject: [pkgdb] python-chardet had acl change status
Message-ID: <20090427125027.84EB710F89F@bastion2.fedora.phx.redhat.com>

kushal has set the watchcommits acl on python-chardet (Fedora 10) to Approved for sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:30 +0000
Subject: [pkgdb] python-chardet had acl change status
Message-ID: <20090427125030.83D7F10F894@bastion2.fedora.phx.redhat.com>

kushal has set the approveacls acl on python-chardet (Fedora 10) to Approved for sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:31 +0000
Subject: [pkgdb] clement had acl change status
Message-ID: <20090427125031.90A2510F896@bastion2.fedora.phx.redhat.com>

jmrcpn has set the watchcommits acl on clement (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:37 +0000
Subject: [pkgdb] python-chardet had acl change status
Message-ID: <20090427125037.6DBA910F8A3@bastion2.fedora.phx.redhat.com>

kushal has set the commit acl on python-chardet (Fedora 10) to Approved for sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:37 +0000
Subject: [pkgdb] python-chardet had acl change status
Message-ID: <20090427125037.E917210F8A6@bastion2.fedora.phx.redhat.com>

kushal has set the watchbugzilla acl on python-chardet (Fedora 10) to Approved for sundaram

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-chardet



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:37 +0000
Subject: [pkgdb] clement had acl change status
Message-ID: <20090427125038.0234310F8A8@bastion2.fedora.phx.redhat.com>

jmrcpn has set the watchcommits acl on clement (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From pkgdb at fedoraproject.org  Mon Apr 27 12:50:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:50:43 +0000
Subject: [pkgdb] clement had acl change status
Message-ID: <20090427125043.D214A10F89A@bastion2.fedora.phx.redhat.com>

jmrcpn has set the watchcommits acl on clement (Fedora 11) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From grof at fedoraproject.org  Mon Apr 27 12:50:53 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 12:50:53 +0000 (UTC)
Subject: rpms/camcardsync/devel camcardsync-0.1.1-g++44.patch, NONE,
	1.1 camcardsync.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427125053.E723870110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/camcardsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3244/devel

Modified Files:
	.cvsignore sources 
Added Files:
	camcardsync-0.1.1-g++44.patch camcardsync.spec import.log 
Log Message:


camcardsync-0.1.1-g++44.patch:

--- NEW FILE camcardsync-0.1.1-g++44.patch ---
--- camcardsync-0.1.1/daystamp.h.debug	2008-10-20 07:24:27.000000000 +0900
+++ camcardsync-0.1.1/daystamp.h	2009-04-19 01:39:54.000000000 +0900
@@ -1,6 +1,7 @@
 #ifndef DAYSTAMP_H
 #define DAYSTAMP_H
 
+#include <cstdio>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- camcardsync-0.1.1/imagefile.cpp.debug	2009-03-29 03:51:07.000000000 +0900
+++ camcardsync-0.1.1/imagefile.cpp	2009-04-19 01:40:53.000000000 +0900
@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include <cstdio>
 #include <string.h>
 #include <stdlib.h>
 
--- camcardsync-0.1.1/pathsupport.cpp.debug	2009-03-29 03:53:18.000000000 +0900
+++ camcardsync-0.1.1/pathsupport.cpp	2009-04-19 01:41:28.000000000 +0900
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string.h>


--- NEW FILE camcardsync.spec ---
Name:           camcardsync
Version:        0.1.1
Release:        2%{?dist}
Summary:        A tool for copying photos from a camera card

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F04CamCardSync
Source0:        http://www.blackfiveimaging.co.uk/camcardsync/%{name}-%{version}.tar.gz
Patch0:         camcardsync-0.1.1-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  hal-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
CamCardSync is a tool for copying photos from a camera card
Features:
* Keeping track of which photos have been copied onto the computer
  and which haven't.
* For speed and efficiency, automatically figure out which ones need 
  copying.
* Allows that photos copied into a folder grouped neatly and conveniently 
  by date.
* To selectively  editing and printing some and deleting others.
* Recognizing deleted images, so they do not copy them again at 
  the next time when sync the camera card!


%prep
%setup -q
%patch0 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc NEWS ChangeLog COPYING TODO
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-2
- License, Summary, Description cleaning
- gcc4.4 patch applied
- resolved icon cache
- added  BuildRequires: hal-devel

* Sun Mar 29 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-1
- initial release



--- NEW FILE import.log ---
camcardsync-0_1_1-2_fc10:HEAD:camcardsync-0.1.1-2.fc10.src.rpm:1240836789


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:23:41 -0000	1.1
+++ .cvsignore	27 Apr 2009 12:50:23 -0000	1.2
@@ -0,0 +1 @@
+camcardsync-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:23:41 -0000	1.1
+++ sources	27 Apr 2009 12:50:23 -0000	1.2
@@ -0,0 +1 @@
+4cf0602648800de23012f091c12d8e19  camcardsync-0.1.1.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 27 12:51:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 12:51:11 +0000
Subject: [pkgdb] clement: jmrcpn has requested watchcommits
Message-ID: <20090427125111.A461410F89D@bastion2.fedora.phx.redhat.com>

jmrcpn has requested the watchcommits acl on clement (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From xhorak at fedoraproject.org  Mon Apr 27 12:53:39 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 27 Apr 2009 12:53:39 +0000 (UTC)
Subject: rpms/firefox/F-10 .cvsignore, 1.99, 1.100 firefox.spec, 1.323,
	1.324 sources, 1.113, 1.114
Message-ID: <20090427125339.F1CCA70110@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3684

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	21 Apr 2009 21:28:46 -0000	1.99
+++ .cvsignore	27 Apr 2009 12:53:09 -0000	1.100
@@ -1,2 +1,4 @@
 firefox-3.0.9-source.tar.bz2
 firefox-langpacks-3.0.9-20090421.tar.bz2
+firefox-3.0.10-source.tar.bz2
+firefox-langpacks-3.0.10-20090427.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- firefox.spec	21 Apr 2009 21:28:46 -0000	1.323
+++ firefox.spec	27 Apr 2009 12:53:09 -0000	1.324
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.9
+Version:        3.0.10
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -29,7 +29,7 @@
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090421.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090427.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -322,6 +322,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Jan Horak <jhorak at redhat.com> - 3.0.10-1
+- Update to 3.0.10
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 3.0.9-1
 - Update to 3.0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- sources	21 Apr 2009 21:28:46 -0000	1.113
+++ sources	27 Apr 2009 12:53:09 -0000	1.114
@@ -1,2 +1,2 @@
-f80b085699db8201e5db6b30fc63c60d  firefox-3.0.9-source.tar.bz2
-f93948a5769aba9be3128811b537a587  firefox-langpacks-3.0.9-20090421.tar.bz2
+1012e835a5c130d18479bccdee240640  firefox-3.0.10-source.tar.bz2
+29381a37f154831b9f57b6c2f9926e26  firefox-langpacks-3.0.10-20090427.tar.bz2



From rdieter at fedoraproject.org  Mon Apr 27 12:55:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 12:55:26 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.265,1.266
Message-ID: <20090427125526.2095470110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3934

Modified Files:
	qt.spec 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
- -devel: Provides: *-static for libQtUiTools.a



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- qt.spec	25 Apr 2009 23:31:03 -0000	1.265
+++ qt.spec	27 Apr 2009 12:54:55 -0000	1.266
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -233,9 +233,12 @@
 #Requires: dbus-devel
 Obsoletes: qt4-designer < %{version}-%{release}
 Provides:  qt4-designer = %{version}-%{release}
+# as long as libQtUiTools.a is included
+Provides:  %{name}-static = %{version}-%{release}
 %if "%{name}" != "qt4"
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
+Provides:  qt4-static = %{version}-%{release}
 %endif
 
 %description devel
@@ -742,8 +745,7 @@
 #{_qt4_libdir}/libphonon.so
 %endif
 %{_qt4_libdir}/libQt*.so
-# remaining static lib: libQtUiTools.a 
-%{_qt4_libdir}/libQt*.a
+%{_qt4_libdir}/libQtUiTools.a
 %{_qt4_libdir}/libQt*.prl
 %{_libdir}/pkgconfig/*.pc
 # Qt designer
@@ -818,6 +820,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
+- -devel: Provides: *-static for libQtUiTools.a
+
 * Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-4
 - qt-doc noarch
 - qt-demos, qt-examples (split from -doc)



From xhorak at fedoraproject.org  Mon Apr 27 12:56:38 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 27 Apr 2009 12:56:38 +0000 (UTC)
Subject: rpms/firefox/F-9 .cvsignore, 1.89, 1.90 firefox.spec, 1.314,
	1.315 sources, 1.102, 1.103
Message-ID: <20090427125638.4751070110@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4159

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-9/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	21 Apr 2009 21:29:09 -0000	1.89
+++ .cvsignore	27 Apr 2009 12:56:07 -0000	1.90
@@ -1,2 +1,4 @@
 firefox-3.0.9-source.tar.bz2
 firefox-langpacks-3.0.9-20090421.tar.bz2
+firefox-3.0.10-source.tar.bz2
+firefox-langpacks-3.0.10-20090427.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-9/firefox.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- firefox.spec	21 Apr 2009 21:29:09 -0000	1.314
+++ firefox.spec	27 Apr 2009 12:56:07 -0000	1.315
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.9
+Version:        3.0.10
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -29,7 +29,7 @@
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090421.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090427.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -322,6 +322,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Jan Horak <jhorak at redhat.com> - 3.0.10-1
+- Update to 3.0.10
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 3.0.9-1
 - Update to 3.0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-9/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	21 Apr 2009 21:29:10 -0000	1.102
+++ sources	27 Apr 2009 12:56:07 -0000	1.103
@@ -1,2 +1,2 @@
-f80b085699db8201e5db6b30fc63c60d  firefox-3.0.9-source.tar.bz2
-f93948a5769aba9be3128811b537a587  firefox-langpacks-3.0.9-20090421.tar.bz2
+1012e835a5c130d18479bccdee240640  firefox-3.0.10-source.tar.bz2
+29381a37f154831b9f57b6c2f9926e26  firefox-langpacks-3.0.10-20090427.tar.bz2



From grof at fedoraproject.org  Mon Apr 27 13:03:00 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 13:03:00 +0000 (UTC)
Subject: rpms/camcardsync/F-11 camcardsync-0.1.1-g++44.patch, NONE,
	1.1 camcardsync.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427130300.8D9BF70110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/camcardsync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5090/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	camcardsync-0.1.1-g++44.patch camcardsync.spec import.log 
Log Message:


camcardsync-0.1.1-g++44.patch:

--- NEW FILE camcardsync-0.1.1-g++44.patch ---
--- camcardsync-0.1.1/daystamp.h.debug	2008-10-20 07:24:27.000000000 +0900
+++ camcardsync-0.1.1/daystamp.h	2009-04-19 01:39:54.000000000 +0900
@@ -1,6 +1,7 @@
 #ifndef DAYSTAMP_H
 #define DAYSTAMP_H
 
+#include <cstdio>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- camcardsync-0.1.1/imagefile.cpp.debug	2009-03-29 03:51:07.000000000 +0900
+++ camcardsync-0.1.1/imagefile.cpp	2009-04-19 01:40:53.000000000 +0900
@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include <cstdio>
 #include <string.h>
 #include <stdlib.h>
 
--- camcardsync-0.1.1/pathsupport.cpp.debug	2009-03-29 03:53:18.000000000 +0900
+++ camcardsync-0.1.1/pathsupport.cpp	2009-04-19 01:41:28.000000000 +0900
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string.h>


--- NEW FILE camcardsync.spec ---
Name:           camcardsync
Version:        0.1.1
Release:        2%{?dist}
Summary:        A tool for copying photos from a camera card

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F04CamCardSync
Source0:        http://www.blackfiveimaging.co.uk/camcardsync/%{name}-%{version}.tar.gz
Patch0:         camcardsync-0.1.1-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  hal-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
CamCardSync is a tool for copying photos from a camera card
Features:
* Keeping track of which photos have been copied onto the computer
  and which haven't.
* For speed and efficiency, automatically figure out which ones need 
  copying.
* Allows that photos copied into a folder grouped neatly and conveniently 
  by date.
* To selectively  editing and printing some and deleting others.
* Recognizing deleted images, so they do not copy them again at 
  the next time when sync the camera card!


%prep
%setup -q
%patch0 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc NEWS ChangeLog COPYING TODO
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-2
- License, Summary, Description cleaning
- gcc4.4 patch applied
- resolved icon cache
- added  BuildRequires: hal-devel

* Sun Mar 29 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-1
- initial release



--- NEW FILE import.log ---
camcardsync-0_1_1-2_fc10:F-11:camcardsync-0.1.1-2.fc10.src.rpm:1240837525


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:23:41 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:02:30 -0000	1.2
@@ -0,0 +1 @@
+camcardsync-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:23:41 -0000	1.1
+++ sources	27 Apr 2009 13:02:30 -0000	1.2
@@ -0,0 +1 @@
+4cf0602648800de23012f091c12d8e19  camcardsync-0.1.1.tar.gz



From cwickert at fedoraproject.org  Mon Apr 27 13:03:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:03:32 +0000 (UTC)
Subject: rpms/gxmessage/devel gxmessage.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427130332.4B27670110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5170/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gxmessage.spec import.log 
Log Message:
Initial Import of gxmessage. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=496701



--- NEW FILE gxmessage.spec ---
Name:           gxmessage
Version:        2.12.1
Release:        1%{?dist}
Summary:        GTK2 based xmessage clone

Group:          User Interface/X
License:        GPLv3+
URL:            http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
Requires:       info
Requires(post): info
Requires(preun): info


%description
Gxmassage is a GTK2 based xmessage clone. It pops up a dialog window, displays
a given message or question, then waits for the user's response. That response
is returned as the program's exit code. Because gxmessage is a drop-in 
alternative to xmessage, gxmessage accepts any option xmessage would, and 
returns the same exit codes.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}
# make sure none of the example scripts is executable
chmod 0644 examples/*


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# we don't need this
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :


%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
%doc examples/
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}.*
%{_infodir}/%{name}.info.gz
%{_datadir}/icons/hicolor/*/apps/%{name}.*


%changelog
* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.1-1
- Update to 2.12.1
- License change to GPLv3+
- Update icon cache scriptlets

* Sat Dec 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.6.2-1
- Update to 2.6.2

* Sun Apr 02 2006 Christoph Wickert <fedora wickert at arcor de> - 2.6.0-1
- Update to 2.6.0
- Install examples

* Sun Nov 06 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-2
- Rebuild against newer gtk
- BuildRequire gettext

* Sat Jul 16 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-1
- Initial RPM release.


--- NEW FILE import.log ---
gxmessage-2_12_1-1_fc11:HEAD:gxmessage-2.12.1-1.fc11.src.rpm:1240837333


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:35:40 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:03:01 -0000	1.2
@@ -0,0 +1 @@
+gxmessage-2.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:35:40 -0000	1.1
+++ sources	27 Apr 2009 13:03:02 -0000	1.2
@@ -0,0 +1 @@
+48c0f8b2a18fa92724c1cec83a9aa46c  gxmessage-2.12.1.tar.gz



From jwrdegoede at fedoraproject.org  Mon Apr 27 13:04:37 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 27 Apr 2009 13:04:37 +0000 (UTC)
Subject: rpms/quake3/devel .cvsignore, 1.2,
	1.3 quake3-1.34-no-pak0-check.patch, 
	1.1, 1.2 quake3-1.34-rc4-demo-pak.patch, 1.2,
	1.3 quake3-1.34-syslibs.patch, 1.2, 1.3 quake3.spec, 1.9,
	1.10 sources, 1.2,
	1.3 quake3-1.34-configurable-client-masterserver.patch, 1.1, NONE
Message-ID: <20090427130437.EE63670110@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5643

Modified Files:
	.cvsignore quake3-1.34-no-pak0-check.patch 
	quake3-1.34-rc4-demo-pak.patch quake3-1.34-syslibs.patch 
	quake3.spec sources 
Removed Files:
	quake3-1.34-configurable-client-masterserver.patch 
Log Message:
* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 1.36-1
- New upstream release 1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2007 08:04:58 -0000	1.2
+++ .cvsignore	27 Apr 2009 13:04:06 -0000	1.3
@@ -1 +1 @@
-quake3-1.34-rc4.tar.bz2
+quake3-1.36.tar.bz2

quake3-1.34-no-pak0-check.patch:

Index: quake3-1.34-no-pak0-check.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-no-pak0-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-no-pak0-check.patch	11 Jan 2008 16:26:10 -0000	1.1
+++ quake3-1.34-no-pak0-check.patch	27 Apr 2009 13:04:07 -0000	1.2
@@ -1,6 +1,7 @@
---- quake3-1.34-rc4/code/qcommon/files.c~	2008-01-11 17:11:00.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2008-01-11 17:11:00.000000000 +0100
-@@ -2903,6 +2903,13 @@ static void FS_CheckPak0( void )
+diff -up quake3-1.36/code/qcommon/files.c.orig quake3-1.36/code/qcommon/files.c
+--- quake3-1.36/code/qcommon/files.c.orig	2009-04-27 09:39:11.000000000 +0200
++++ quake3-1.36/code/qcommon/files.c	2009-04-27 09:41:12.000000000 +0200
+@@ -2859,6 +2859,13 @@ static void FS_CheckPak0( void )
  	searchpath_t	*path;
  	qboolean founddemo = qfalse;
  	unsigned foundPak = 0;
@@ -12,5 +13,5 @@
 +			!strcmp(fs_gamedirvar->string, "wop"))
 +		return;
  
- 	for( path = fs_searchpaths; path; path = path->next ) {
- 		const char* pakBasename = path->pack->pakBasename;
+ 	for( path = fs_searchpaths; path; path = path->next )
+ 	{

quake3-1.34-rc4-demo-pak.patch:

Index: quake3-1.34-rc4-demo-pak.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-rc4-demo-pak.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quake3-1.34-rc4-demo-pak.patch	27 Jan 2009 09:24:35 -0000	1.2
+++ quake3-1.34-rc4-demo-pak.patch	27 Apr 2009 13:04:07 -0000	1.3
@@ -1,17 +1,18 @@
-diff -up quake3-1.34-rc4/code/qcommon/files.c.foobar quake3-1.34-rc4/code/qcommon/files.c
---- quake3-1.34-rc4/code/qcommon/files.c.foobar	2009-01-27 09:56:46.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2009-01-27 09:57:29.000000000 +0100
-@@ -2917,18 +2917,16 @@ static void FS_CheckPak0( void )
+--- quake3-1.36/code/qcommon/files.c.orig	2009-04-27 09:43:28.000000000 +0200
++++ quake3-1.36/code/qcommon/files.c	2009-04-27 09:44:48.000000000 +0200
+@@ -2874,20 +2874,17 @@ static void FS_CheckPak0( void )
  		if(!path->pack)
  			continue;
  
 -		if(!Q_stricmpn( path->pack->pakGamename, "demoq3", MAX_OSPATH )
--		&& !Q_stricmpn( pakBasename, "pak0", MAX_OSPATH )) {
+-		   && !Q_stricmpn( pakBasename, "pak0", MAX_OSPATH ))
 +		if(!Q_stricmpn( pakBasename, "pak0", MAX_OSPATH ) &&
-+		   path->pack->checksum == DEMO_PAK0_CHECKSUM ) {
++		   path->pack->checksum == DEMO_PAK0_CHECKSUM )
+ 		{
  			founddemo = qtrue;
  
--			if( path->pack->checksum == DEMO_PAK0_CHECKSUM ) {
+-			if( path->pack->checksum == DEMO_PAK0_CHECKSUM )
+-			{
  				Com_Printf( "\n\n"
  						"**************************************************\n"
  						"WARNING: It looks like you're using pak0.pk3\n"
@@ -19,6 +20,6 @@
  						"guaranteed or supported.\n"
  						"**************************************************\n\n\n" );
 -			}
- 		} else if(!Q_stricmpn( path->pack->pakGamename, BASEGAME, MAX_OSPATH )
- 		&& strlen(pakBasename) == 4 && !Q_stricmpn( pakBasename, "pak", 3 )
- 		&& pakBasename[3] >= '0' && pakBasename[3] <= '8') {
+ 		}
+ 
+ 		else if(!Q_stricmpn( path->pack->pakGamename, BASEGAME, MAX_OSPATH )

quake3-1.34-syslibs.patch:

Index: quake3-1.34-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-syslibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quake3-1.34-syslibs.patch	27 Jan 2009 09:24:35 -0000	1.2
+++ quake3-1.34-syslibs.patch	27 Apr 2009 13:04:07 -0000	1.3
@@ -1,65 +1,68 @@
-diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
---- quake3-1.34-rc4/Makefile.syslibs	2007-09-26 16:29:52.000000000 +0200
-+++ quake3-1.34-rc4/Makefile	2009-01-27 09:55:12.000000000 +0100
-@@ -96,6 +96,10 @@ ifndef USE_OPENAL
- USE_OPENAL=1
+diff -up quake3-1.36/Makefile.syslibs quake3-1.36/Makefile
+--- quake3-1.36/Makefile.syslibs	2009-04-27 08:42:39.000000000 +0200
++++ quake3-1.36/Makefile	2009-04-27 09:19:52.000000000 +0200
+@@ -103,6 +103,10 @@ ifndef GENERATE_DEPENDENCIES
+ GENERATE_DEPENDENCIES=1
  endif
  
 +ifndef USE_SYSTEM_JPEG
 +USE_SYSTEM_JPEG=1
 +endif
 +
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
+ ifndef USE_OPENAL
+ USE_OPENAL=1
  endif
-@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
+@@ -237,8 +241,11 @@ ifeq ($(PLATFORM),linux)
    endif
    endif
  
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+-    -pipe -DUSE_ICON $(shell sdl-config --cflags)
++  BASE_CFLAGS = -DUSE_ICON $(shell sdl-config --cflags)
++
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
  
    ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   endif
+     BASE_CFLAGS += -DUSE_OPENAL
+@@ -301,6 +308,10 @@ ifeq ($(PLATFORM),linux)
+ 
+   CLIENT_LIBS=$(shell sdl-config --libs) -lGL
  
 +  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++    CLIENT_LIBS += -ljpeg
 +  endif
 +
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+   ifeq ($(USE_OPENAL),1)
+     ifneq ($(USE_OPENAL_DLOPEN),1)
+       CLIENT_LIBS += -lopenal
+@@ -844,7 +844,7 @@ ifeq ($(USE_VOIP),1)
+   ifeq ($(USE_INTERNAL_SPEEX),1)
+     BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
    else
-@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+-    CLIENT_LIBS += -lspeex
++    CLIENT_LIBS += -lspeex -lspeexdsp
    endif
+ endif
  
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),i386)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -970,40 +982,7 @@ Q3OBJ = \
+@@ -1297,41 +1308,7 @@ Q3OBJ = \
    $(B)/client/l_script.o \
    $(B)/client/l_struct.o \
    \
 -  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
+-  $(B)/client/jcapistd.o \
 -  $(B)/client/jccoefct.o  \
 -  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
 -  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
 -  $(B)/client/jcmainct.o \
 -  $(B)/client/jcmarker.o \
 -  $(B)/client/jcmaster.o \
 -  $(B)/client/jcomapi.o \
 -  $(B)/client/jcparam.o \
+-  $(B)/client/jcphuff.o \
 -  $(B)/client/jcprepct.o \
 -  $(B)/client/jcsample.o \
 -  $(B)/client/jdapimin.o \
@@ -77,6 +80,7 @@
 -  $(B)/client/jdsample.o \
 -  $(B)/client/jdtrans.o \
 -  $(B)/client/jerror.o \
+-  $(B)/client/jfdctflt.o \
 -  $(B)/client/jidctflt.o \
 -  $(B)/client/jmemmgr.o \
    $(B)/client/jmemnobs.o \
@@ -84,28 +88,25 @@
    \
    $(B)/client/tr_animation.o \
    $(B)/client/tr_backend.o \
-@@ -1027,7 +1006,46 @@ Q3OBJ = \
-   $(B)/client/tr_shadows.o \
-   $(B)/client/tr_sky.o \
-   $(B)/client/tr_surface.o \
--  $(B)/client/tr_world.o \
-+  $(B)/client/tr_world.o
-+
+@@ -1370,6 +1347,46 @@ Q3OBJ = \
+   $(B)/client/con_log.o \
+   $(B)/client/sys_main.o
+ 
 +ifneq ($(USE_SYSTEM_JPEG),1)
 +  Q3OBJ += \
 +    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
++    $(B)/client/jcapistd.o \
 +    $(B)/client/jccoefct.o  \
 +    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
 +    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
 +    $(B)/client/jcmainct.o \
 +    $(B)/client/jcmarker.o \
 +    $(B)/client/jcmaster.o \
 +    $(B)/client/jcomapi.o \
 +    $(B)/client/jcparam.o \
++    $(B)/client/jcphuff.o \
 +    $(B)/client/jcprepct.o \
 +    $(B)/client/jcsample.o \
 +    $(B)/client/jdapimin.o \
@@ -123,19 +124,21 @@
 +    $(B)/client/jdsample.o \
 +    $(B)/client/jdtrans.o \
 +    $(B)/client/jerror.o \
++    $(B)/client/jfdctflt.o \
 +    $(B)/client/jidctflt.o \
 +    $(B)/client/jmemmgr.o \
 +    $(B)/client/jutils.o
 +else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
++  Q3OBJ += $(B)/client/jpeg_memsrc.o
 +endif
- 
++
  ifeq ($(ARCH),i386)
    Q3OBJ += \
-diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
---- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:29:40.000000000 +0200
-+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2009-01-27 09:55:12.000000000 +0100
-@@ -17,10 +17,23 @@
+     $(B)/client/snd_mixa.o \
+diff -up quake3-1.36/code/jpeg-6b/jmemnobs.c.syslibs quake3-1.36/code/jpeg-6b/jmemnobs.c
+--- quake3-1.36/code/jpeg-6b/jmemnobs.c.syslibs	2009-04-27 08:42:28.000000000 +0200
++++ quake3-1.36/code/jpeg-6b/jmemnobs.c	2009-04-27 08:52:42.000000000 +0200
+@@ -17,11 +17,26 @@
  
  #include "../renderer/tr_local.h"
  
@@ -145,21 +148,24 @@
 +#include <jpeglib.h>
 +
 +#undef GLOBAL
-+#define GLOBAL
++#define GLOBAL(x) x
 +#define FAR
 +
 +typedef void * backing_store_ptr;
 +
 +#else
++
  #define JPEG_INTERNALS
  #include "jinclude.h"
  #include "jpeglib.h"
  #include "jmemsys.h"		/* import the system-dependent declarations */
-+#endif
  
++#endif
++
  /*
-  * Memory allocation and ri.Freeing are controlled by the regular library
-@@ -83,7 +96,13 @@ GLOBAL void
+  * Memory allocation and freeing are controlled by the regular library
+  * routines ri.Malloc() and ri.Free().
+@@ -83,7 +98,13 @@ GLOBAL(void)
  jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
  			 long total_bytes_needed)
  {
@@ -173,9 +179,9 @@
  }
  
  
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
---- /dev/null	2009-01-27 08:51:13.290004978 +0100
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2009-01-27 09:55:12.000000000 +0100
+diff -up /dev/null quake3-1.36/code/renderer/jpeg_memsrc.c
+--- /dev/null	2009-04-27 08:18:28.430258242 +0200
++++ quake3-1.36/code/renderer/jpeg_memsrc.c	2009-04-27 08:51:16.000000000 +0200
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -218,7 +224,7 @@
 +METHODDEF(void)
 +init_source (j_decompress_ptr cinfo)
 +{
-+/* No work, since jpeg_memory_src set up the buffer pointer and count.
++/* No work, since jpeg_mem_src set up the buffer pointer and count.
 +* Indeed, if we want to read multiple JPEG images from one buffer,
 +* this *must* not do anything to the pointer.
 +*/
@@ -314,12 +320,12 @@
 +*/
 +
 +GLOBAL(void)
-+jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
++jpeg_mem_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
 +{
 +my_src_ptr src;
 +
 +/* The source object is made permanent so that a series of JPEG images
-+* can be read from a single buffer by calling jpeg_memory_src
++* can be read from a single buffer by calling jpeg_mem_src
 +* only before the first one.
 +* This makes it unsafe to use this manager and a different source
 +* manager serially with the same JPEG object. Caveat programmer.
@@ -340,19 +346,20 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
---- /dev/null	2009-01-27 08:51:13.290004978 +0100
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2009-01-27 09:55:12.000000000 +0100
+diff -up /dev/null quake3-1.36/code/renderer/jpeg_memsrc.h
+--- /dev/null	2009-04-27 08:18:28.430258242 +0200
++++ quake3-1.36/code/renderer/jpeg_memsrc.h	2009-04-27 08:51:16.000000000 +0200
 @@ -0,0 +1,5 @@
 +#include <stdio.h>
 +#include <jpeglib.h>
 +
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++void jpeg_mem_src (j_decompress_ptr cinfo, const JOCTET * buffer,
 +  size_t bufsize);
-diff -up quake3-1.34-rc4/code/renderer/tr_image.c.syslibs quake3-1.34-rc4/code/renderer/tr_image.c
---- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-26 16:29:48.000000000 +0200
-+++ quake3-1.34-rc4/code/renderer/tr_image.c	2009-01-27 09:55:12.000000000 +0100
-@@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
+diff -up quake3-1.36/code/renderer/tr_image.c.syslibs quake3-1.36/code/renderer/tr_image.c
+diff -up quake3-1.36/code/renderer/tr_image_jpg.c.syslibs quake3-1.36/code/renderer/tr_image_jpg.c
+--- quake3-1.36/code/renderer/tr_image_jpg.c.syslibs	2009-04-27 08:42:30.000000000 +0200
++++ quake3-1.36/code/renderer/tr_image_jpg.c	2009-04-27 08:59:40.000000000 +0200
+@@ -30,8 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
   * You may also wish to include "jerror.h".
   */
  
@@ -361,17 +368,15 @@
 +#include "jpeg_memsrc.h"
 +#else
  #define JPEG_INTERNALS
- #include "../jpeg-6/jpeglib.h"
--
+ #include "../jpeg-6b/jpeglib.h"
 +#endif
  
- static void LoadBMP( const char *name, byte **pic, int *width, int *height );
- static void LoadTGA( const char *name, byte **pic, int *width, int *height );
-@@ -1405,6 +1409,11 @@ static void LoadJPG( const char *filenam
-   unsigned char *out;
-   byte	*fbuffer;
+ void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
+   /* This struct contains the JPEG decompression parameters and pointers to
+@@ -62,6 +67,10 @@ void R_LoadJPG( const char *filename, un
+ 		void *v;
+ 	} fbuffer;
    byte  *buf;
-+  size_t bufsize;
 +#ifdef USE_SYSTEM_JPEG
 +  int i,j;
 +  byte *inptr, *outptr;
@@ -379,29 +384,7 @@
  
    /* In this example we want to open the input file before doing anything else,
     * so that the setjmp() error recovery below can assume the file is open.
-@@ -1412,7 +1421,7 @@ static void LoadJPG( const char *filenam
-    * requires it in order to read binary files.
-    */
- 
--  ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-+  bufsize = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-   if (!fbuffer) {
- 	return;
-   }
-@@ -1430,8 +1439,11 @@ static void LoadJPG( const char *filenam
-   jpeg_create_decompress(&cinfo);
- 
-   /* Step 2: specify data source (eg, a file) */
--
-+#ifdef USE_SYSTEM_JPEG
-+  jpeg_memory_src(&cinfo, fbuffer, bufsize);
-+#else /* ???????? */
-   jpeg_stdio_src(&cinfo, fbuffer);
-+#endif
- 
-   /* Step 3: read file parameters with jpeg_read_header() */
- 
-@@ -1474,7 +1486,7 @@ static void LoadJPG( const char *filenam
+@@ -131,7 +143,7 @@ void R_LoadJPG( const char *filename, un
    }
  
    memcount = pixelcount * 4;
@@ -410,7 +393,7 @@
  
    out = ri.Malloc(memcount);
  
-@@ -1495,6 +1507,21 @@ static void LoadJPG( const char *filenam
+@@ -152,6 +164,21 @@ void R_LoadJPG( const char *filename, un
  	buf = ((out+(row_stride*cinfo.output_scanline)));
  	buffer = &buf;
      (void) jpeg_read_scanlines(&cinfo, buffer, 1);
@@ -432,21 +415,3 @@
    }
    
    buf = out;
-@@ -1614,6 +1641,8 @@ boolean empty_output_buffer (j_compress_
- }
- 
- 
-+#ifndef USE_SYSTEM_JPEG
-+
- /*
-  * Compression initialization.
-  * Before calling this, all parameters and a data destination must be set up.
-@@ -1705,6 +1734,8 @@ jpeg_write_scanlines (j_compress_ptr cin
-   return row_ctr;
- }
- 
-+#endif
-+
- /*
-  * Terminate destination --- called by jpeg_finish_compress
-  * after all data has been written.  Usually needs to flush buffer.


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- quake3.spec	25 Feb 2009 18:19:15 -0000	1.9
+++ quake3.spec	27 Apr 2009 13:04:07 -0000	1.10
@@ -1,22 +1,20 @@
-%define prever rc4
-
 Name:           quake3
-Version:        1.34
-Release:        0.11.%{prever}%{?dist}
+Version:        1.36
+Release:        1%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ioquake3.org/
 # to regenerate (note included systemlib copies are removed for size, lcc
 # is removed as it is not Free software):
-# svn co svn://svn.icculus.org/quake3/tags/%{version}-%{prever} %{name}-%{version}-%{prever}
-# pushd %{name}-%{version}-%{prever}
+# svn co svn://svn.icculus.org/quake3/tags/%{version} %{name}-%{version}
+# pushd %{name}-%{version}
 # rm -fr `find -name .svn` code/AL code/SDL12 code/libcurl code/libs
-# mv code/jpeg-6/jmemnobs.c .; rm code/jpeg-6/*; mv jmemnobs.c code/jpeg-6
+# mv code/jpeg-6b/jmemnobs.c .; rm code/jpeg-6b/*; mv jmemnobs.c code/jpeg-6b
 # rm -fr code/tools/lcc
 # popd
-# tar cvfj %{name}-%{version}-%{prever}.tar.bz2 %{name}-%{version}-%{prever}
-Source0:        %{name}-%{version}-%{prever}.tar.bz2
+# tar cvfj %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-demo.sh
 Source2:        %{name}.autodlrc
 Source3:        %{name}.desktop
@@ -32,13 +30,12 @@
 Source13:       worldofpadman.desktop
 Source14:       wop.png
 Patch0:         quake3-1.34-syslibs.patch
-Patch1:         quake3-1.34-configurable-client-masterserver.patch
 Patch2:         quake3-1.34-fix-empty-fs_game-from-server.patch
 Patch3:         quake3-1.34-dont-ask-openarena-cdkey.patch
 Patch4:         quake3-1.34-no-pak0-check.patch
 Patch5:         quake3-1.34-rc4-demo-pak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
+BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel speex-devel
 BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
 %ifarch %{ix86} x86_64
 BuildRequires:  nasm
@@ -132,9 +129,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{prever}
+%setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -145,10 +141,10 @@
 # the CROSS_COMPILING=1 is a hack to not build q3cc and qvm files
 # since we've stripped out q3cc as this is not Free Software.
 make %{?_smp_mflags} \
-    OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing -ffast-math" \
+    OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing" \
     DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
     USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
-    CROSS_COMPILING=1
+    USE_INTERNAL_SPEEX=0 BUILD_CLIENT_SMP=1 CROSS_COMPILING=1 
 
 
 %install
@@ -240,7 +236,7 @@
 %files
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
-%doc TODO code/jpeg-6/README
+%doc TODO
 %{_bindir}/%{name}
 %{_bindir}/%{name}-smp
 %{_bindir}/%{name}-update
@@ -271,6 +267,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 1.36-1
+- New upstream release 1.36
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-0.11.rc4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2007 08:04:58 -0000	1.2
+++ sources	27 Apr 2009 13:04:07 -0000	1.3
@@ -1 +1 @@
-14d75cb93a77423fdc6f77c40ddfa12f  quake3-1.34-rc4.tar.bz2
+a5c41f756ed4c68b45ad25f496cee318  quake3-1.36.tar.bz2


--- quake3-1.34-configurable-client-masterserver.patch DELETED ---



From grof at fedoraproject.org  Mon Apr 27 13:04:50 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 13:04:50 +0000 (UTC)
Subject: rpms/camcardsync/F-10 camcardsync-0.1.1-g++44.patch, NONE,
	1.1 camcardsync.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427130450.4E9EA70110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/camcardsync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5699/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	camcardsync-0.1.1-g++44.patch camcardsync.spec import.log 
Log Message:


camcardsync-0.1.1-g++44.patch:

--- NEW FILE camcardsync-0.1.1-g++44.patch ---
--- camcardsync-0.1.1/daystamp.h.debug	2008-10-20 07:24:27.000000000 +0900
+++ camcardsync-0.1.1/daystamp.h	2009-04-19 01:39:54.000000000 +0900
@@ -1,6 +1,7 @@
 #ifndef DAYSTAMP_H
 #define DAYSTAMP_H
 
+#include <cstdio>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- camcardsync-0.1.1/imagefile.cpp.debug	2009-03-29 03:51:07.000000000 +0900
+++ camcardsync-0.1.1/imagefile.cpp	2009-04-19 01:40:53.000000000 +0900
@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include <cstdio>
 #include <string.h>
 #include <stdlib.h>
 
--- camcardsync-0.1.1/pathsupport.cpp.debug	2009-03-29 03:53:18.000000000 +0900
+++ camcardsync-0.1.1/pathsupport.cpp	2009-04-19 01:41:28.000000000 +0900
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string.h>


--- NEW FILE camcardsync.spec ---
Name:           camcardsync
Version:        0.1.1
Release:        2%{?dist}
Summary:        A tool for copying photos from a camera card

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F04CamCardSync
Source0:        http://www.blackfiveimaging.co.uk/camcardsync/%{name}-%{version}.tar.gz
Patch0:         camcardsync-0.1.1-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  hal-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
CamCardSync is a tool for copying photos from a camera card
Features:
* Keeping track of which photos have been copied onto the computer
  and which haven't.
* For speed and efficiency, automatically figure out which ones need 
  copying.
* Allows that photos copied into a folder grouped neatly and conveniently 
  by date.
* To selectively  editing and printing some and deleting others.
* Recognizing deleted images, so they do not copy them again at 
  the next time when sync the camera card!


%prep
%setup -q
%patch0 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc NEWS ChangeLog COPYING TODO
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-2
- License, Summary, Description cleaning
- gcc4.4 patch applied
- resolved icon cache
- added  BuildRequires: hal-devel

* Sun Mar 29 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-1
- initial release



--- NEW FILE import.log ---
camcardsync-0_1_1-2_fc10:F-10:camcardsync-0.1.1-2.fc10.src.rpm:1240837635


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:23:41 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:04:19 -0000	1.2
@@ -0,0 +1 @@
+camcardsync-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:23:41 -0000	1.1
+++ sources	27 Apr 2009 13:04:20 -0000	1.2
@@ -0,0 +1 @@
+4cf0602648800de23012f091c12d8e19  camcardsync-0.1.1.tar.gz



From grof at fedoraproject.org  Mon Apr 27 13:06:43 2009
From: grof at fedoraproject.org (zarko pintar)
Date: Mon, 27 Apr 2009 13:06:43 +0000 (UTC)
Subject: rpms/camcardsync/F-9 camcardsync-0.1.1-g++44.patch, NONE,
	1.1 camcardsync.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427130643.4C7B470110@cvs1.fedora.phx.redhat.com>

Author: grof

Update of /cvs/pkgs/rpms/camcardsync/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6329/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	camcardsync-0.1.1-g++44.patch camcardsync.spec import.log 
Log Message:


camcardsync-0.1.1-g++44.patch:

--- NEW FILE camcardsync-0.1.1-g++44.patch ---
--- camcardsync-0.1.1/daystamp.h.debug	2008-10-20 07:24:27.000000000 +0900
+++ camcardsync-0.1.1/daystamp.h	2009-04-19 01:39:54.000000000 +0900
@@ -1,6 +1,7 @@
 #ifndef DAYSTAMP_H
 #define DAYSTAMP_H
 
+#include <cstdio>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- camcardsync-0.1.1/imagefile.cpp.debug	2009-03-29 03:51:07.000000000 +0900
+++ camcardsync-0.1.1/imagefile.cpp	2009-04-19 01:40:53.000000000 +0900
@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include <cstdio>
 #include <string.h>
 #include <stdlib.h>
 
--- camcardsync-0.1.1/pathsupport.cpp.debug	2009-03-29 03:53:18.000000000 +0900
+++ camcardsync-0.1.1/pathsupport.cpp	2009-04-19 01:41:28.000000000 +0900
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string.h>


--- NEW FILE camcardsync.spec ---
Name:           camcardsync
Version:        0.1.1
Release:        2%{?dist}
Summary:        A tool for copying photos from a camera card

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://blackfiveimaging.co.uk/index.php?article=02Software%2F04CamCardSync
Source0:        http://www.blackfiveimaging.co.uk/camcardsync/%{name}-%{version}.tar.gz
Patch0:         camcardsync-0.1.1-g++44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  hal-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils


%description
CamCardSync is a tool for copying photos from a camera card
Features:
* Keeping track of which photos have been copied onto the computer
  and which haven't.
* For speed and efficiency, automatically figure out which ones need 
  copying.
* Allows that photos copied into a folder grouped neatly and conveniently 
  by date.
* To selectively  editing and printing some and deleting others.
* Recognizing deleted images, so they do not copy them again at 
  the next time when sync the camera card!


%prep
%setup -q
%patch0 -p1 -b .g++44

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc NEWS ChangeLog COPYING TODO
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Tue Apr 21 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-2
- License, Summary, Description cleaning
- gcc4.4 patch applied
- resolved icon cache
- added  BuildRequires: hal-devel

* Sun Mar 29 2009 Zarko <zarko.pintar at gmail.com> - 0.1.1-1
- initial release



--- NEW FILE import.log ---
camcardsync-0_1_1-2_fc10:F-9:camcardsync-0.1.1-2.fc10.src.rpm:1240837745


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:23:41 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:06:12 -0000	1.2
@@ -0,0 +1 @@
+camcardsync-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/camcardsync/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:23:41 -0000	1.1
+++ sources	27 Apr 2009 13:06:12 -0000	1.2
@@ -0,0 +1 @@
+4cf0602648800de23012f091c12d8e19  camcardsync-0.1.1.tar.gz



From cwickert at fedoraproject.org  Mon Apr 27 13:07:07 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:07:07 +0000 (UTC)
Subject: rpms/gxmessage/devel gxmessage.spec,1.1,1.2
Message-ID: <20090427130707.38B6670110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6465

Modified Files:
	gxmessage.spec 
Log Message:
remove Requires: info


Index: gxmessage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/devel/gxmessage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxmessage.spec	27 Apr 2009 13:03:02 -0000	1.1
+++ gxmessage.spec	27 Apr 2009 13:06:37 -0000	1.2
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
-Requires:       info
 Requires(post): info
 Requires(preun): info
 



From than at fedoraproject.org  Mon Apr 27 13:16:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 27 Apr 2009 13:16:25 +0000 (UTC)
Subject: rpms/qt/devel qt.spec, 1.266,
	1.267 qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch, 1.1, NONE
Message-ID: <20090427131625.7CCE470110@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8165

Modified Files:
	qt.spec 
Removed Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Log Message:
drop useless qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- qt.spec	27 Apr 2009 12:54:55 -0000	1.266
+++ qt.spec	27 Apr 2009 13:15:55 -0000	1.267
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,7 +41,6 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
-Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -342,7 +341,6 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
-%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -820,6 +818,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
+- drop useless qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
 - -devel: Provides: *-static for libQtUiTools.a
 


--- qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch DELETED ---



From cwickert at fedoraproject.org  Mon Apr 27 13:21:40 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:21:40 +0000 (UTC)
Subject: rpms/termit/devel import.log, NONE, 1.1 termit.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427132140.2589070110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/termit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log termit.spec 
Log Message:
Initial import of termit. https://bugzilla.redhat.com/496168



--- NEW FILE import.log ---
termit-2_2_0-1_fc11:HEAD:termit-2.2.0-1.fc11.src.rpm:1240838375


--- NEW FILE termit.spec ---
Name:           termit
Version:        2.2.0
Release:        1%{?dist}
Summary:        Simple terminal emulator based on vte library

Group:          User Interface/X
License:        GPLv2
URL:            http://termit.googlecode.com/
Source0:        http://termit.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  vte-devel >= 0.17.4
BuildRequires:  lua-devel >= 5.1
BuildRequires:  cmake desktop-file-utils gettext

%description
TermIt is a simple terminal emulator based on vte library with a lot of 
features:
 * tabs
 * bookmarks
 * sessions
 * changing tab name
 * changing font for tabs
 * encodings (all available from GTK2)
 * integrated lua interpreter
Configuration can be changed via $HOME/.config/termit/termit.cfg file.


%prep
%setup -q
# fix paths in the README
sed -i 's!doc/!%{_docdir}/%{name}-%{version}!' ./doc/README
# add a generic icon to the desktop file
echo Icon=terminal >> ./doc/termit.desktop

%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake DCMAKE_INSTALL_DOCDIR=%{_docdir} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/termit/


#%check
#ctest


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING TODO
%doc doc/README doc/init.lua.example doc/lua_api.txt doc/termit.svg
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0

* Wed Oct 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.5-1
- Update to 1.3.5

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/termit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:34:31 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:21:09 -0000	1.2
@@ -0,0 +1 @@
+termit-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/termit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:34:31 -0000	1.1
+++ sources	27 Apr 2009 13:21:09 -0000	1.2
@@ -0,0 +1 @@
+5f00b7c77930749c0d3af358e201b674  termit-2.2.0.tar.bz2



From cwickert at fedoraproject.org  Mon Apr 27 13:26:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:26:20 +0000 (UTC)
Subject: rpms/gxmessage/F-10 gxmessage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427132620.E6B2570110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9515/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gxmessage.spec 
Log Message:
Initial release of gxmessage for this branch


--- NEW FILE gxmessage.spec ---
Name:           gxmessage
Version:        2.12.1
Release:        1%{?dist}
Summary:        GTK2 based xmessage clone

Group:          User Interface/X
License:        GPLv3+
URL:            http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
Requires(post): info
Requires(preun): info


%description
Gxmassage is a GTK2 based xmessage clone. It pops up a dialog window, displays
a given message or question, then waits for the user's response. That response
is returned as the program's exit code. Because gxmessage is a drop-in 
alternative to xmessage, gxmessage accepts any option xmessage would, and 
returns the same exit codes.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}
# make sure none of the example scripts is executable
chmod 0644 examples/*


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# we don't need this
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :


%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
%doc examples/
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}.*
%{_infodir}/%{name}.info.gz
%{_datadir}/icons/hicolor/*/apps/%{name}.*


%changelog
* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.1-1
- Update to 2.12.1
- License change to GPLv3+
- Update icon cache scriptlets

* Sat Dec 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.6.2-1
- Update to 2.6.2

* Sun Apr 02 2006 Christoph Wickert <fedora wickert at arcor de> - 2.6.0-1
- Update to 2.6.0
- Install examples

* Sun Nov 06 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-2
- Rebuild against newer gtk
- BuildRequire gettext

* Sat Jul 16 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:35:40 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:25:50 -0000	1.2
@@ -0,0 +1 @@
+gxmessage-2.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:35:40 -0000	1.1
+++ sources	27 Apr 2009 13:25:50 -0000	1.2
@@ -0,0 +1 @@
+48c0f8b2a18fa92724c1cec83a9aa46c  gxmessage-2.12.1.tar.gz



From cwickert at fedoraproject.org  Mon Apr 27 13:26:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:26:21 +0000 (UTC)
Subject: rpms/gxmessage/F-11 gxmessage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427132621.229AD70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9515/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gxmessage.spec 
Log Message:
Initial release of gxmessage for this branch


--- NEW FILE gxmessage.spec ---
Name:           gxmessage
Version:        2.12.1
Release:        1%{?dist}
Summary:        GTK2 based xmessage clone

Group:          User Interface/X
License:        GPLv3+
URL:            http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
Requires(post): info
Requires(preun): info


%description
Gxmassage is a GTK2 based xmessage clone. It pops up a dialog window, displays
a given message or question, then waits for the user's response. That response
is returned as the program's exit code. Because gxmessage is a drop-in 
alternative to xmessage, gxmessage accepts any option xmessage would, and 
returns the same exit codes.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}
# make sure none of the example scripts is executable
chmod 0644 examples/*


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# we don't need this
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :


%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
%doc examples/
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}.*
%{_infodir}/%{name}.info.gz
%{_datadir}/icons/hicolor/*/apps/%{name}.*


%changelog
* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.1-1
- Update to 2.12.1
- License change to GPLv3+
- Update icon cache scriptlets

* Sat Dec 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.6.2-1
- Update to 2.6.2

* Sun Apr 02 2006 Christoph Wickert <fedora wickert at arcor de> - 2.6.0-1
- Update to 2.6.0
- Install examples

* Sun Nov 06 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-2
- Rebuild against newer gtk
- BuildRequire gettext

* Sat Jul 16 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:35:40 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:25:50 -0000	1.2
@@ -0,0 +1 @@
+gxmessage-2.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:35:40 -0000	1.1
+++ sources	27 Apr 2009 13:25:50 -0000	1.2
@@ -0,0 +1 @@
+48c0f8b2a18fa92724c1cec83a9aa46c  gxmessage-2.12.1.tar.gz



From cwickert at fedoraproject.org  Mon Apr 27 13:26:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:26:21 +0000 (UTC)
Subject: rpms/gxmessage/F-9 gxmessage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427132621.7925B70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gxmessage/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9515/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gxmessage.spec 
Log Message:
Initial release of gxmessage for this branch


--- NEW FILE gxmessage.spec ---
Name:           gxmessage
Version:        2.12.1
Release:        1%{?dist}
Summary:        GTK2 based xmessage clone

Group:          User Interface/X
License:        GPLv3+
URL:            http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
Source0:        http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.6.0, gettext, perl(XML::Parser)
Requires(post): info
Requires(preun): info


%description
Gxmassage is a GTK2 based xmessage clone. It pops up a dialog window, displays
a given message or question, then waits for the user's response. That response
is returned as the program's exit code. Because gxmessage is a drop-in 
alternative to xmessage, gxmessage accepts any option xmessage would, and 
returns the same exit codes.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}
# make sure none of the example scripts is executable
chmod 0644 examples/*


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# we don't need this
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :


%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
%doc examples/
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}.*
%{_infodir}/%{name}.info.gz
%{_datadir}/icons/hicolor/*/apps/%{name}.*


%changelog
* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.12.1-1
- Update to 2.12.1
- License change to GPLv3+
- Update icon cache scriptlets

* Sat Dec 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.6.2-1
- Update to 2.6.2

* Sun Apr 02 2006 Christoph Wickert <fedora wickert at arcor de> - 2.6.0-1
- Update to 2.6.0
- Install examples

* Sun Nov 06 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-2
- Rebuild against newer gtk
- BuildRequire gettext

* Sat Jul 16 2005 Christoph Wickert <fedora wickert at arcor de> - 2.4.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:35:40 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:25:51 -0000	1.2
@@ -0,0 +1 @@
+gxmessage-2.12.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmessage/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:35:40 -0000	1.1
+++ sources	27 Apr 2009 13:25:51 -0000	1.2
@@ -0,0 +1 @@
+48c0f8b2a18fa92724c1cec83a9aa46c  gxmessage-2.12.1.tar.gz



From pkgdb at fedoraproject.org  Mon Apr 27 13:30:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 13:30:44 +0000
Subject: [pkgdb] clement: jmrcpn has given up watchcommits
Message-ID: <20090427133044.72DB510F881@bastion2.fedora.phx.redhat.com>

jmrcpn has given up the watchcommits acl on clement (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clement



From cwickert at fedoraproject.org  Mon Apr 27 13:32:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:32:08 +0000 (UTC)
Subject: rpms/termit/F-10 termit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090427133208.4891970110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/termit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10298/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	termit.spec 
Log Message:
Initial termit release for this branch


--- NEW FILE termit.spec ---
Name:           termit
Version:        2.2.0
Release:        1%{?dist}
Summary:        Simple terminal emulator based on vte library

Group:          User Interface/X
License:        GPLv2
URL:            http://termit.googlecode.com/
Source0:        http://termit.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  vte-devel >= 0.17.4
BuildRequires:  lua-devel >= 5.1
BuildRequires:  cmake desktop-file-utils gettext

%description
TermIt is a simple terminal emulator based on vte library with a lot of 
features:
 * tabs
 * bookmarks
 * sessions
 * changing tab name
 * changing font for tabs
 * encodings (all available from GTK2)
 * integrated lua interpreter
Configuration can be changed via $HOME/.config/termit/termit.cfg file.


%prep
%setup -q
# fix paths in the README
sed -i 's!doc/!%{_docdir}/%{name}-%{version}!' ./doc/README
# add a generic icon to the desktop file
echo Icon=terminal >> ./doc/termit.desktop

%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake DCMAKE_INSTALL_DOCDIR=%{_docdir} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/termit/


#%check
#ctest


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING TODO
%doc doc/README doc/init.lua.example doc/lua_api.txt doc/termit.svg
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0

* Wed Oct 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.5-1
- Update to 1.3.5

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/termit/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:34:31 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:31:37 -0000	1.2
@@ -0,0 +1 @@
+termit-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/termit/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:34:31 -0000	1.1
+++ sources	27 Apr 2009 13:31:37 -0000	1.2
@@ -0,0 +1 @@
+5f00b7c77930749c0d3af358e201b674  termit-2.2.0.tar.bz2



From cwickert at fedoraproject.org  Mon Apr 27 13:32:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:32:08 +0000 (UTC)
Subject: rpms/termit/F-11 termit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090427133208.6DE3770110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/termit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10298/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	termit.spec 
Log Message:
Initial termit release for this branch


--- NEW FILE termit.spec ---
Name:           termit
Version:        2.2.0
Release:        1%{?dist}
Summary:        Simple terminal emulator based on vte library

Group:          User Interface/X
License:        GPLv2
URL:            http://termit.googlecode.com/
Source0:        http://termit.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  vte-devel >= 0.17.4
BuildRequires:  lua-devel >= 5.1
BuildRequires:  cmake desktop-file-utils gettext

%description
TermIt is a simple terminal emulator based on vte library with a lot of 
features:
 * tabs
 * bookmarks
 * sessions
 * changing tab name
 * changing font for tabs
 * encodings (all available from GTK2)
 * integrated lua interpreter
Configuration can be changed via $HOME/.config/termit/termit.cfg file.


%prep
%setup -q
# fix paths in the README
sed -i 's!doc/!%{_docdir}/%{name}-%{version}!' ./doc/README
# add a generic icon to the desktop file
echo Icon=terminal >> ./doc/termit.desktop

%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake DCMAKE_INSTALL_DOCDIR=%{_docdir} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/termit/


#%check
#ctest


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING TODO
%doc doc/README doc/init.lua.example doc/lua_api.txt doc/termit.svg
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0

* Wed Oct 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.5-1
- Update to 1.3.5

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/termit/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:34:31 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:31:38 -0000	1.2
@@ -0,0 +1 @@
+termit-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/termit/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:34:31 -0000	1.1
+++ sources	27 Apr 2009 13:31:38 -0000	1.2
@@ -0,0 +1 @@
+5f00b7c77930749c0d3af358e201b674  termit-2.2.0.tar.bz2



From cwickert at fedoraproject.org  Mon Apr 27 13:32:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 13:32:08 +0000 (UTC)
Subject: rpms/termit/F-9 termit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090427133208.DADDA70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/termit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10298/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	termit.spec 
Log Message:
Initial termit release for this branch


--- NEW FILE termit.spec ---
Name:           termit
Version:        2.2.0
Release:        1%{?dist}
Summary:        Simple terminal emulator based on vte library

Group:          User Interface/X
License:        GPLv2
URL:            http://termit.googlecode.com/
Source0:        http://termit.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  vte-devel >= 0.17.4
BuildRequires:  lua-devel >= 5.1
BuildRequires:  cmake desktop-file-utils gettext

%description
TermIt is a simple terminal emulator based on vte library with a lot of 
features:
 * tabs
 * bookmarks
 * sessions
 * changing tab name
 * changing font for tabs
 * encodings (all available from GTK2)
 * integrated lua interpreter
Configuration can be changed via $HOME/.config/termit/termit.cfg file.


%prep
%setup -q
# fix paths in the README
sed -i 's!doc/!%{_docdir}/%{name}-%{version}!' ./doc/README
# add a generic icon to the desktop file
echo Icon=terminal >> ./doc/termit.desktop

%build
find . -type f -name CMakeCache.txt -exec rm -rf {} \;
%cmake DCMAKE_INSTALL_DOCDIR=%{_docdir} .
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install                                       \
  --delete-original                                        \
  --remove-category=Utility                                \
  --add-category=System                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# we install the docfiles versioned
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/termit/


#%check
#ctest


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING TODO
%doc doc/README doc/init.lua.example doc/lua_api.txt doc/termit.svg
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Apr 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0

* Wed Oct 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.5-1
- Update to 1.3.5

* Mon May 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3-1
- Initial Fedora RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/termit/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:34:31 -0000	1.1
+++ .cvsignore	27 Apr 2009 13:31:38 -0000	1.2
@@ -0,0 +1 @@
+termit-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/termit/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:34:31 -0000	1.1
+++ sources	27 Apr 2009 13:31:38 -0000	1.2
@@ -0,0 +1 @@
+5f00b7c77930749c0d3af358e201b674  termit-2.2.0.tar.bz2



From atkac at fedoraproject.org  Mon Apr 27 13:34:28 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 27 Apr 2009 13:34:28 +0000 (UTC)
Subject: rpms/tigervnc/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tigervnc.spec, 1.4, 1.5 tigervnc-newfbsize.patch, 1.1,
	NONE tigervnc-rh494801.patch, 1.1, NONE
Message-ID: <20090427133428.E9D5870110@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10666

Modified Files:
	.cvsignore sources tigervnc.spec 
Removed Files:
	tigervnc-newfbsize.patch tigervnc-rh494801.patch 
Log Message:
- update to r3789
  - tigervnc-rh494801.patch merged
- tigervnc-newfbsize.patch is no longer needed
- fix problems when vncviewer and Xvnc run on different endianess (#496653)
- UltraVNC and TightVNC clients work fine again (#496786)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Apr 2009 17:07:49 -0000	1.3
+++ .cvsignore	27 Apr 2009 13:33:58 -0000	1.4
@@ -1 +1 @@
-tigervnc-0.0.90-20090403svn3751.tar.bz2
+tigervnc-0.0.90-20090427svn3789.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Apr 2009 17:07:49 -0000	1.3
+++ sources	27 Apr 2009 13:33:58 -0000	1.4
@@ -1 +1 @@
-34f63ea8b071b0e1996ac467455ee4c2  tigervnc-0.0.90-20090403svn3751.tar.bz2
+a34b291684a09148b8059450d2543d40  tigervnc-0.0.90-20090427svn3789.tar.bz2


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tigervnc.spec	8 Apr 2009 14:09:45 -0000	1.4
+++ tigervnc.spec	27 Apr 2009 13:33:58 -0000	1.5
@@ -1,10 +1,10 @@
-%define	revision	3751
-%define	date		20090403
+%define	revision	3789
+%define	date		20090427
 %define	releasetag	%{date}svn%{revision}
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.5.%{releasetag}%{?dist}
+Release:	0.6.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -51,9 +51,7 @@
 Patch1:		tigervnc-bounds.patch
 Patch4:		tigervnc-cookie.patch
 Patch5:		tigervnc-manminor.patch
-Patch6:		tigervnc-newfbsize.patch
 Patch8:		tigervnc-viewer-reparent.patch
-Patch9:		tigervnc-rh494801.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -109,9 +107,7 @@
 %patch1 -p1 -b .bounds
 %patch4 -p1 -b .cookie
 %patch5 -p1 -b .manminor
-%patch6 -p1 -b .newfbsize
 %patch8 -p1 -b .viewer-reparent
-%patch9 -p1 -b .rh494801
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -135,7 +131,7 @@
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
 	--disable-xorgcfg --disable-xprint --disable-static \
-	--disable-composite --disable-xtrap --enable-xcsecurity \
+	--disable-composite --disable-xtrap \
 	--disable-{a,c,m}fb \
 	--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
@@ -251,6 +247,13 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Mon Apr 27 2009 Adam Tkac <atkac redhat com> 0.0.90-0.6.20090427svn3789
+- update to r3789
+  - tigervnc-rh494801.patch merged
+- tigervnc-newfbsize.patch is no longer needed
+- fix problems when vncviewer and Xvnc run on different endianess (#496653)
+- UltraVNC and TightVNC clients work fine again (#496786)
+
 * Wed Apr 08 2009 Adam Tkac <atkac redhat com> 0.0.90-0.5.20090403svn3751
 - workaround broken fontpath handling in vncserver script (#494801)
 


--- tigervnc-newfbsize.patch DELETED ---


--- tigervnc-rh494801.patch DELETED ---



From atkac at fedoraproject.org  Mon Apr 27 13:36:14 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 27 Apr 2009 13:36:14 +0000 (UTC)
Subject: rpms/tigervnc/F-11 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tigervnc.spec, 1.4, 1.5 tigervnc-newfbsize.patch, 1.1,
	NONE tigervnc-rh494801.patch, 1.1, NONE
Message-ID: <20090427133614.DBE6170110@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11134

Modified Files:
	.cvsignore sources tigervnc.spec 
Removed Files:
	tigervnc-newfbsize.patch tigervnc-rh494801.patch 
Log Message:
- update to r3789
  - tigervnc-rh494801.patch merged
- tigervnc-newfbsize.patch is no longer needed
- fix problems when vncviewer and Xvnc run on different endianess (#496653)
- UltraVNC and TightVNC clients work fine again (#496786)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Apr 2009 17:07:49 -0000	1.3
+++ .cvsignore	27 Apr 2009 13:35:44 -0000	1.4
@@ -1 +1 @@
-tigervnc-0.0.90-20090403svn3751.tar.bz2
+tigervnc-0.0.90-20090427svn3789.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Apr 2009 17:07:49 -0000	1.3
+++ sources	27 Apr 2009 13:35:44 -0000	1.4
@@ -1 +1 @@
-34f63ea8b071b0e1996ac467455ee4c2  tigervnc-0.0.90-20090403svn3751.tar.bz2
+a34b291684a09148b8059450d2543d40  tigervnc-0.0.90-20090427svn3789.tar.bz2


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tigervnc.spec	8 Apr 2009 14:09:45 -0000	1.4
+++ tigervnc.spec	27 Apr 2009 13:35:44 -0000	1.5
@@ -1,10 +1,10 @@
-%define	revision	3751
-%define	date		20090403
+%define	revision	3789
+%define	date		20090427
 %define	releasetag	%{date}svn%{revision}
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.5.%{releasetag}%{?dist}
+Release:	0.6.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -51,9 +51,7 @@
 Patch1:		tigervnc-bounds.patch
 Patch4:		tigervnc-cookie.patch
 Patch5:		tigervnc-manminor.patch
-Patch6:		tigervnc-newfbsize.patch
 Patch8:		tigervnc-viewer-reparent.patch
-Patch9:		tigervnc-rh494801.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -109,9 +107,7 @@
 %patch1 -p1 -b .bounds
 %patch4 -p1 -b .cookie
 %patch5 -p1 -b .manminor
-%patch6 -p1 -b .newfbsize
 %patch8 -p1 -b .viewer-reparent
-%patch9 -p1 -b .rh494801
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -135,7 +131,7 @@
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
 	--disable-xorgcfg --disable-xprint --disable-static \
-	--disable-composite --disable-xtrap --enable-xcsecurity \
+	--disable-composite --disable-xtrap \
 	--disable-{a,c,m}fb \
 	--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
@@ -251,6 +247,13 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Mon Apr 27 2009 Adam Tkac <atkac redhat com> 0.0.90-0.6.20090427svn3789
+- update to r3789
+  - tigervnc-rh494801.patch merged
+- tigervnc-newfbsize.patch is no longer needed
+- fix problems when vncviewer and Xvnc run on different endianess (#496653)
+- UltraVNC and TightVNC clients work fine again (#496786)
+
 * Wed Apr 08 2009 Adam Tkac <atkac redhat com> 0.0.90-0.5.20090403svn3751
 - workaround broken fontpath handling in vncserver script (#494801)
 


--- tigervnc-newfbsize.patch DELETED ---


--- tigervnc-rh494801.patch DELETED ---



From silfreed at fedoraproject.org  Mon Apr 27 13:54:56 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 27 Apr 2009 13:54:56 +0000 (UTC)
Subject: rpms/qtpfsgui/devel .cvsignore, 1.8, 1.9 qtpfsgui.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <20090427135456.36F5270110@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qtpfsgui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14566

Modified Files:
	.cvsignore qtpfsgui.spec sources 
Log Message:
* Mon Apr 27 2009 Douglas E. Warner <silfreed at silfreed.net> 1.9.3-1
- update to 1.9.3
- Performance improvements on MultiCore Machines
- Integrated pfstmo 1.3.x changes, including better Mantiuk performance
- Integration of Exiv 0.18 (tiff write capabilities in the "Copy Exif Data"
  panel).
- Added Hungarian language (thanks to Peter Gaal)
- Added Indonesian language (thanks to Teddy Widhi Laksono)
- Drag and Drop support for HDR creation/opening
- UI improvements: new icons, cleanup of tonemapping panel
- added detail factor option to the mantiuk06 tmo, thanks to Dejan Beric
- Now using native file saving dialogs on Windows and Mac
- 'Save all' feature in tonemapping dialog.
- Many bugfixes, including the old filename problem
- Integrated pfstmo 1.3.x changes: mantiuk06: Ed Brambley's bug-fix and
  convergence patch mantiuk06: Ed Brambley's OpenMP patch all: Fixes and
  optimization - see pfstmo ChangeLog for more information
- Renamed reinhard04 to reinhard05 (src directory and references)
- Improved linux packaging system: docs and html target directories can be
  specified separately



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 May 2008 14:08:25 -0000	1.8
+++ .cvsignore	27 Apr 2009 13:54:25 -0000	1.9
@@ -1 +1 @@
-qtpfsgui-1.9.2.tar.gz
+qtpfsgui-1.9.3.tar.gz


Index: qtpfsgui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/qtpfsgui.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qtpfsgui.spec	25 Feb 2009 18:16:04 -0000	1.15
+++ qtpfsgui.spec	27 Apr 2009 13:54:25 -0000	1.16
@@ -1,6 +1,6 @@
 Name: qtpfsgui
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 Summary: A graphical tool for creating and tone-mapping HDR images
 
 Group: Applications/Productivity
@@ -72,6 +72,27 @@
 
 
 %changelog
+* Mon Apr 27 2009 Douglas E. Warner <silfreed at silfreed.net> 1.9.3-1
+- update to 1.9.3
+- Performance improvements on MultiCore Machines
+- Integrated pfstmo 1.3.x changes, including better Mantiuk performance
+- Integration of Exiv 0.18 (tiff write capabilities in the "Copy Exif Data"
+  panel).
+- Added Hungarian language (thanks to Peter Gaal)
+- Added Indonesian language (thanks to Teddy Widhi Laksono)
+- Drag and Drop support for HDR creation/opening
+- UI improvements: new icons, cleanup of tonemapping panel
+- added detail factor option to the mantiuk06 tmo, thanks to Dejan Beric
+- Now using native file saving dialogs on Windows and Mac
+- 'Save all' feature in tonemapping dialog.
+- Many bugfixes, including the old filename problem
+- Integrated pfstmo 1.3.x changes: mantiuk06: Ed Brambley's bug-fix and
+  convergence patch mantiuk06: Ed Brambley's OpenMP patch all: Fixes and
+  optimization - see pfstmo ChangeLog for more information
+- Renamed reinhard04 to reinhard05 (src directory and references)
+- Improved linux packaging system: docs and html target directories can be
+  specified separately
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 May 2008 14:08:25 -0000	1.8
+++ sources	27 Apr 2009 13:54:25 -0000	1.9
@@ -1 +1 @@
-8a037c1dc75f04752dc36a59e7237fc4  qtpfsgui-1.9.2.tar.gz
+5a6421391e373c912e4a793e131151c8  qtpfsgui-1.9.3.tar.gz



From davej at fedoraproject.org  Mon Apr 27 13:55:53 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 27 Apr 2009 13:55:53 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc3-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1056, 1.1057 kernel.spec, 1.1531, 1.1532 upstream, 1.929,
	1.930 patch-2.6.30-rc3-git1.bz2.sign, 1.1, NONE
Message-ID: <20090427135553.7036770110@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14773

Modified Files:
	.cvsignore kernel.spec upstream 
Added Files:
	patch-2.6.30-rc3-git2.bz2.sign 
Removed Files:
	patch-2.6.30-rc3-git1.bz2.sign 
Log Message:
2.6.30-rc3-git2


--- NEW FILE patch-2.6.30-rc3-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ9PY5yGugalF9Dw4RAkwCAJ4g2THwnVVPt//1nmZ8k7ZHz2MY3gCePF5y
Pqa+uCaCPhjF60SkoB9izLA=
=IpOJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1056
retrieving revision 1.1057
diff -u -r1.1056 -r1.1057
--- .cvsignore	26 Apr 2009 05:18:33 -0000	1.1056
+++ .cvsignore	27 Apr 2009 13:55:22 -0000	1.1057
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git1.bz2
+patch-2.6.30-rc3-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1531
retrieving revision 1.1532
diff -u -r1.1531 -r1.1532
--- kernel.spec	26 Apr 2009 05:18:33 -0000	1.1531
+++ kernel.spec	27 Apr 2009 13:55:22 -0000	1.1532
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -102,7 +102,7 @@
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1821,6 +1821,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Mon Apr 27 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc3-git2
+
 * Sun Apr 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30-0.68.rc3.git1
 - Linux 2.6.30-rc3-git1
 


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- upstream	26 Apr 2009 05:18:34 -0000	1.929
+++ upstream	27 Apr 2009 13:55:23 -0000	1.930
@@ -1,4 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git1.bz2
-
+patch-2.6.30-rc3-git2.bz2


--- patch-2.6.30-rc3-git1.bz2.sign DELETED ---



From cwickert at fedoraproject.org  Mon Apr 27 14:05:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 14:05:14 +0000 (UTC)
Subject: rpms/termit/F-9 .cvsignore, 1.2, NONE sources, 1.2, NONE termit.spec,
	1.1, NONE
Message-ID: <20090427140514.78E0670110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/termit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16291

Removed Files:
	.cvsignore sources termit.spec 
Log Message:
F-9 does not meet BuildRequires libvte-devel >= 0.17.4


--- .cvsignore DELETED ---


--- sources DELETED ---


--- termit.spec DELETED ---



From caolanm at fedoraproject.org  Mon Apr 27 14:08:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 27 Apr 2009 14:08:30 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch, NONE,
	1.1 openoffice.org.spec, 1.1900, 1.1901
Message-ID: <20090427140830.43ADF70110@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16960/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch 
Log Message:
Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch

openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch ---
diff -ru vcl.orig/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
--- vcl.orig/unx/source/app/sm.cxx	2009-04-27 08:31:01.000000000 +0100
+++ vcl/unx/source/app/sm.cxx	2009-04-27 14:38:55.000000000 +0100
@@ -48,6 +48,7 @@
 #include <saldisp.hxx>
 #include <salframe.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <salinst.h>
 
 #include <osl/conditn.h>
@@ -187,6 +188,7 @@
 static SmProp*	pSmProps = NULL;
 static SmProp**	ppSmProps = NULL;
 static int		nSmProps = 0;
+static unsigned char   *pSmRestartHint = NULL;
 
 
 static void BuildSmPropertyList()
@@ -195,7 +197,7 @@
 	{
 		ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
 
-		nSmProps = 4;
+		nSmProps = 5;
 		pSmProps = new SmProp[ nSmProps ];
 
 		pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
@@ -243,6 +245,15 @@
 		pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
 		pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
 
+		pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+		pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+		pSmProps[ 4 ].num_vals	= 1;
+		pSmProps[ 4 ].vals		= new SmPropValue;
+		pSmProps[ 4 ].vals->value	= malloc(1);
+		pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
+		*pSmRestartHint = SmRestartIfRunning;
+		pSmProps[ 4 ].vals->length	= 1;
+
 		ppSmProps = new SmProp*[ nSmProps ];
 		for( int i = 0; i < nSmProps; i++ )
 			ppSmProps[ i ] = &pSmProps[i];
@@ -257,6 +268,31 @@
 IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
 {
     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+
+    static bool bFirstShutdown=true;
+    if (pThis != 0 && bFirstShutdown) //first shutdown request
+    {
+        bFirstShutdown = false;
+        /*
+          If we have no actual frames open, e.g. we launched a quickstarter,
+          and then shutdown all our frames leaving just a quickstarter running,
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
+          task of the quick-starter)
+        */
+        *pSmRestartHint = SmRestartNever;
+        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
+        {
+            Window *pWindow = (*it)->GetWindow();
+            if (pWindow && pWindow->IsVisible())
+            {
+                *pSmRestartHint = SmRestartIfRunning;
+                break;
+            }
+        }
+    }
+
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( pThis != 0, false );
@@ -385,7 +421,7 @@
         ICEConnectionObserver::lock();
         SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
         SmcSaveYourselfDone( aSmcConnection, True );
-        SMprintf( "sent SaveYourselfDone\n" );
+        SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
         bDocSaveDone = true;
         ICEConnectionObserver::unlock();
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1900
retrieving revision 1.1901
diff -u -r1.1900 -r1.1901
--- openoffice.org.spec	27 Apr 2009 10:51:07 -0000	1.1900
+++ openoffice.org.spec	27 Apr 2009 14:07:59 -0000	1.1901
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch65: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
 %patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch65 -p0 -b .ooo101379.vcl.qstart.SM.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2240,8 +2242,10 @@
 echo "TryExec=oowriter" >> writer.desktop
 echo "TryExec=oomath" >> math.desktop
 echo "TryExec=oodraw" >> draw.desktop
-# rh#156677# / rh#186515#
+# rhbz#156677# / rhbz#186515#
 echo "NoDisplay=true" >> math.desktop
+# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop
+sed -i -e "/NoDisplay=true/d" qstart.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-base.desktop
@@ -2308,8 +2312,10 @@
 echo "StartupNotify=true" >> writer.desktop
 echo "StartupNotify=true" >> math.desktop
 echo "StartupNotify=true" >> draw.desktop
-# rh#156677# / rh#186515#
+# rhbz#156677# / rhbz#186515#
 echo "NoDisplay=true" >> math.desktop
+# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop
+sed -i -e "/NoDisplay=true/d" qstart.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-base.desktop
@@ -4126,14 +4132,17 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+- Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+
 * Fri Apr 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
-- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From caolanm at fedoraproject.org  Mon Apr 27 14:08:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 27 Apr 2009 14:08:29 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch, NONE,
	1.1 openoffice.org.spec, 1.1728, 1.1729
Message-ID: <20090427140829.DFFC070110@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16960/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch 
Log Message:
Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch

openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch ---
diff -ru vcl.orig/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
--- vcl.orig/unx/source/app/sm.cxx	2009-04-27 08:31:01.000000000 +0100
+++ vcl/unx/source/app/sm.cxx	2009-04-27 14:38:55.000000000 +0100
@@ -48,6 +48,7 @@
 #include <saldisp.hxx>
 #include <salframe.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <salinst.h>
 
 #include <osl/conditn.h>
@@ -187,6 +188,7 @@
 static SmProp*	pSmProps = NULL;
 static SmProp**	ppSmProps = NULL;
 static int		nSmProps = 0;
+static unsigned char   *pSmRestartHint = NULL;
 
 
 static void BuildSmPropertyList()
@@ -195,7 +197,7 @@
 	{
 		ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
 
-		nSmProps = 4;
+		nSmProps = 5;
 		pSmProps = new SmProp[ nSmProps ];
 
 		pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
@@ -243,6 +245,15 @@
 		pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
 		pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
 
+		pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+		pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+		pSmProps[ 4 ].num_vals	= 1;
+		pSmProps[ 4 ].vals		= new SmPropValue;
+		pSmProps[ 4 ].vals->value	= malloc(1);
+		pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
+		*pSmRestartHint = SmRestartIfRunning;
+		pSmProps[ 4 ].vals->length	= 1;
+
 		ppSmProps = new SmProp*[ nSmProps ];
 		for( int i = 0; i < nSmProps; i++ )
 			ppSmProps[ i ] = &pSmProps[i];
@@ -257,6 +268,31 @@
 IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
 {
     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+
+    static bool bFirstShutdown=true;
+    if (pThis != 0 && bFirstShutdown) //first shutdown request
+    {
+        bFirstShutdown = false;
+        /*
+          If we have no actual frames open, e.g. we launched a quickstarter,
+          and then shutdown all our frames leaving just a quickstarter running,
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
+          task of the quick-starter)
+        */
+        *pSmRestartHint = SmRestartNever;
+        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
+        {
+            Window *pWindow = (*it)->GetWindow();
+            if (pWindow && pWindow->IsVisible())
+            {
+                *pSmRestartHint = SmRestartIfRunning;
+                break;
+            }
+        }
+    }
+
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( pThis != 0, false );
@@ -385,7 +421,7 @@
         ICEConnectionObserver::lock();
         SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
         SmcSaveYourselfDone( aSmcConnection, True );
-        SMprintf( "sent SaveYourselfDone\n" );
+        SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
         bDocSaveDone = true;
         ICEConnectionObserver::unlock();
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1728
retrieving revision 1.1729
diff -u -r1.1728 -r1.1729
--- openoffice.org.spec	27 Apr 2009 05:55:56 -0000	1.1728
+++ openoffice.org.spec	27 Apr 2009 14:07:59 -0000	1.1729
@@ -148,6 +148,7 @@
 Patch75: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 Patch76: openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 Patch77: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch78: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1419,6 +1420,7 @@
 %patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch76 -p1 -b .oooXXXXX.sfx2.badexception.patch
 %patch77 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch78 -p0 -b .ooo101379.vcl.qstart.SM.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2023,6 +2025,8 @@
 echo "TryExec=oodraw" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
+# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop
+sed -i -e "/NoDisplay=true/d" qstart.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
@@ -2084,6 +2088,8 @@
 echo "StartupNotify=true" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
+# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop
+sed -i -e "/NoDisplay=true/d" qstart.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-base.desktop
@@ -3785,11 +3791,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 21 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
+* Mon Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
 - Resolves: rhbz#494643 EMF polypolygons issue
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 - Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+- Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 
 * Mon Mar 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch



From caolanm at fedoraproject.org  Mon Apr 27 14:08:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 27 Apr 2009 14:08:30 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch, NONE,
	1.1 openoffice.org.spec, 1.1901, 1.1902
Message-ID: <20090427140830.D6FCF70110@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16960/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch 
Log Message:
Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch

openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch ---
diff -ru vcl.orig/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
--- vcl.orig/unx/source/app/sm.cxx	2009-04-27 08:31:01.000000000 +0100
+++ vcl/unx/source/app/sm.cxx	2009-04-27 14:38:55.000000000 +0100
@@ -48,6 +48,7 @@
 #include <saldisp.hxx>
 #include <salframe.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <salinst.h>
 
 #include <osl/conditn.h>
@@ -187,6 +188,7 @@
 static SmProp*	pSmProps = NULL;
 static SmProp**	ppSmProps = NULL;
 static int		nSmProps = 0;
+static unsigned char   *pSmRestartHint = NULL;
 
 
 static void BuildSmPropertyList()
@@ -195,7 +197,7 @@
 	{
 		ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
 
-		nSmProps = 4;
+		nSmProps = 5;
 		pSmProps = new SmProp[ nSmProps ];
 
 		pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
@@ -243,6 +245,15 @@
 		pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
 		pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
 
+		pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+		pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+		pSmProps[ 4 ].num_vals	= 1;
+		pSmProps[ 4 ].vals		= new SmPropValue;
+		pSmProps[ 4 ].vals->value	= malloc(1);
+		pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
+		*pSmRestartHint = SmRestartIfRunning;
+		pSmProps[ 4 ].vals->length	= 1;
+
 		ppSmProps = new SmProp*[ nSmProps ];
 		for( int i = 0; i < nSmProps; i++ )
 			ppSmProps[ i ] = &pSmProps[i];
@@ -257,6 +268,31 @@
 IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
 {
     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+
+    static bool bFirstShutdown=true;
+    if (pThis != 0 && bFirstShutdown) //first shutdown request
+    {
+        bFirstShutdown = false;
+        /*
+          If we have no actual frames open, e.g. we launched a quickstarter,
+          and then shutdown all our frames leaving just a quickstarter running,
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
+          task of the quick-starter)
+        */
+        *pSmRestartHint = SmRestartNever;
+        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
+        {
+            Window *pWindow = (*it)->GetWindow();
+            if (pWindow && pWindow->IsVisible())
+            {
+                *pSmRestartHint = SmRestartIfRunning;
+                break;
+            }
+        }
+    }
+
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( pThis != 0, false );
@@ -385,7 +421,7 @@
         ICEConnectionObserver::lock();
         SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
         SmcSaveYourselfDone( aSmcConnection, True );
-        SMprintf( "sent SaveYourselfDone\n" );
+        SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
         bDocSaveDone = true;
         ICEConnectionObserver::unlock();
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1901
retrieving revision 1.1902
diff -u -r1.1901 -r1.1902
--- openoffice.org.spec	27 Apr 2009 10:49:28 -0000	1.1901
+++ openoffice.org.spec	27 Apr 2009 14:08:00 -0000	1.1902
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch65: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
 %patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch65 -p0 -b .ooo101379.vcl.qstart.SM.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2240,8 +2242,10 @@
 echo "TryExec=oowriter" >> writer.desktop
 echo "TryExec=oomath" >> math.desktop
 echo "TryExec=oodraw" >> draw.desktop
-# rh#156677# / rh#186515#
+# rhbz#156677# / rhbz#186515#
 echo "NoDisplay=true" >> math.desktop
+# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop
+sed -i -e "/NoDisplay=true/d" qstart.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-base.desktop
@@ -2308,8 +2312,10 @@
 echo "StartupNotify=true" >> writer.desktop
 echo "StartupNotify=true" >> math.desktop
 echo "StartupNotify=true" >> draw.desktop
-# rh#156677# / rh#186515#
+# rhbz#156677# / rhbz#186515#
 echo "NoDisplay=true" >> math.desktop
+# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop
+sed -i -e "/NoDisplay=true/d" qstart.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-base.desktop
@@ -4126,14 +4132,17 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+- Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+
 * Fri Apr 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 - Resolves: rhbz#473985 - "oocalc this-is-a-dir" finishes immediately
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
-- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 * Sun Apr 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors



From than at fedoraproject.org  Mon Apr 27 14:11:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 27 Apr 2009 14:11:25 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,
	1.2, 1.3 qt.spec, 1.267, 1.268
Message-ID: <20090427141125.2BC9770110@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17305

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Log Message:
- enable Freetype subpixel rendering at compile time



qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

Index: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
===================================================================
RCS file: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
diff -N qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	27 Apr 2009 14:10:54 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
+--- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
++++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
+@@ -72,7 +72,7 @@
+ #include FT_CONFIG_OPTIONS_H
+ #endif
+ 
+-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
++#if defined(FT_LCD_FILTER_H)
+ #define QT_USE_FREETYPE_LCDFILTER
+ #endif
+ 


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- qt.spec	27 Apr 2009 13:15:55 -0000	1.267
+++ qt.spec	27 Apr 2009 14:10:54 -0000	1.268
@@ -41,6 +41,7 @@
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
+Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -341,6 +342,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
+%patch15 -p1 -b .enable_ft_lcdfilter
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -819,6 +821,9 @@
 
 %changelog
 * Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
+- enable Freetype subpixel rendering at compile time  
+
+* Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
 - drop useless qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5



From than at fedoraproject.org  Mon Apr 27 14:14:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 27 Apr 2009 14:14:25 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.268,1.269
Message-ID: <20090427141425.258CC70110@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17670

Modified Files:
	qt.spec 
Log Message:
- enable Freetype subpixel rendering at compile time



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- qt.spec	27 Apr 2009 14:10:54 -0000	1.268
+++ qt.spec	27 Apr 2009 14:13:54 -0000	1.269
@@ -823,9 +823,6 @@
 * Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
 - enable Freetype subpixel rendering at compile time  
 
-* Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
-- drop useless qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
-
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
 - -devel: Provides: *-static for libQtUiTools.a
 



From silfreed at fedoraproject.org  Mon Apr 27 14:23:16 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 27 Apr 2009 14:23:16 +0000 (UTC)
Subject: rpms/qtpfsgui/devel qtpfsgui.spec,1.16,1.17
Message-ID: <20090427142316.B868570110@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qtpfsgui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19830

Modified Files:
	qtpfsgui.spec 
Log Message:
fixing icon path


Index: qtpfsgui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/qtpfsgui.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qtpfsgui.spec	27 Apr 2009 13:54:25 -0000	1.16
+++ qtpfsgui.spec	27 Apr 2009 14:22:46 -0000	1.17
@@ -68,7 +68,7 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:13 +0000
Subject: [pkgdb] libgweather: danw has requested watchbugzilla
Message-ID: <20090427142413.BABDD10F897@bastion2.fedora.phx.redhat.com>

danw has requested the watchbugzilla acl on libgweather (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:26 +0000
Subject: [pkgdb] libgweather: danw has requested commit
Message-ID: <20090427142426.626BC10F893@bastion2.fedora.phx.redhat.com>

danw has requested the commit acl on libgweather (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:33 +0000
Subject: [pkgdb] libgweather had acl change status
Message-ID: <20090427142433.D76CD10F896@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on libgweather (Fedora devel) to Approved for danw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:39 +0000
Subject: [pkgdb] libgweather had acl change status
Message-ID: <20090427142439.7889A10F899@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on libgweather (Fedora devel) to Approved for danw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:39 +0000
Subject: [pkgdb] libgweather had acl change status
Message-ID: <20090427142439.CA6D910F89C@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on libgweather (Fedora devel) to Approved for danw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:42 +0000
Subject: [pkgdb] libgweather: danw has requested watchbugzilla
Message-ID: <20090427142442.8C11A10F89D@bastion2.fedora.phx.redhat.com>

danw has requested the watchbugzilla acl on libgweather (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:24:44 +0000
Subject: [pkgdb] libgweather: danw has requested commit
Message-ID: <20090427142444.8E12710F8A0@bastion2.fedora.phx.redhat.com>

danw has requested the commit acl on libgweather (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:25:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:25:20 +0000
Subject: [pkgdb] libgweather had acl change status
Message-ID: <20090427142520.584B610F898@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on libgweather (Fedora 11) to Approved for danw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:25:21 +0000
Subject: [pkgdb] libgweather had acl change status
Message-ID: <20090427142521.C610C10F89A@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on libgweather (Fedora 11) to Approved for danw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From pkgdb at fedoraproject.org  Mon Apr 27 14:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 14:25:24 +0000
Subject: [pkgdb] libgweather had acl change status
Message-ID: <20090427142524.C2CE010F89C@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on libgweather (Fedora 11) to Approved for danw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgweather



From markmc at fedoraproject.org  Mon Apr 27 14:26:24 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 27 Apr 2009 14:26:24 +0000 (UTC)
Subject: rpms/qemu/devel qemu-disable-preadv.patch, NONE,
	1.1 qemu-fix-arm-framebuffer-build.patch, NONE,
	1.1 qemu-virtio-blk-boot-on.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 qemu-fix-qcow2-corruption.patch, 1.2, 1.3 qemu.spec, 1.86,
	1.87 sources, 1.14, 1.15 01-tls-handshake-fix.patch, 1.1,
	NONE 02-vnc-monitor-info.patch, 1.1,
	NONE 03-display-keymaps.patch, 1.1, NONE 04-vnc-struct.patch,
	1.1, NONE 05-vnc-tls-vencrypt.patch, 1.1, NONE 06-vnc-sasl.patch,
	1.1, NONE 07-vnc-monitor-authinfo.patch, 1.1,
	NONE 08-vnc-acl-mgmt.patch, 1.1, NONE make-release, 1.1,
	NONE qemu-fix-debuginfo.patch, 1.1,
	NONE qemu-fix-display-breakage.patch, 1.2,
	NONE qemu-fix-gcc.patch, 1.1, NONE qemu-fix-qcow2-2TB.patch, 1.1,
	NONE qemu-roms-more-room.patch, 1.1, NONE
Message-ID: <20090427142624.84E6870110@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20399

Modified Files:
	.cvsignore qemu-fix-qcow2-corruption.patch qemu.spec sources 
Added Files:
	qemu-disable-preadv.patch qemu-fix-arm-framebuffer-build.patch 
	qemu-virtio-blk-boot-on.patch 
Removed Files:
	01-tls-handshake-fix.patch 02-vnc-monitor-info.patch 
	03-display-keymaps.patch 04-vnc-struct.patch 
	05-vnc-tls-vencrypt.patch 06-vnc-sasl.patch 
	07-vnc-monitor-authinfo.patch 08-vnc-acl-mgmt.patch 
	make-release qemu-fix-debuginfo.patch 
	qemu-fix-display-breakage.patch qemu-fix-gcc.patch 
	qemu-fix-qcow2-2TB.patch qemu-roms-more-room.patch 
Log Message:
* Mon Apr 27 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-1.kvm85
- Update to qemu-kvm-devel-85
- kvm-85 is based on qemu development branch, currently version 0.10.50
- Include new qemu-io utility in qemu-img package
- Re-instate -help string for boot=on to fix virtio booting with libvirt
- Drop upstreamed patches
- Fix missing kernel/include/asm symlink in upstream tarball
- Fix target-arm build
- Disable preadv()/pwritev() until bug #497429 is fixed
- Kill more .kernelrelease uselessness
- Make non-kvm qemu build verbose


qemu-disable-preadv.patch:

--- NEW FILE qemu-disable-preadv.patch ---
diff -up qemu-kvm-devel-85/qemu/configure.disable-preadv qemu-kvm-devel-85/qemu/configure
--- qemu-kvm-devel-85/qemu/configure.disable-preadv	2009-04-27 16:09:05.000000000 +0100
+++ qemu-kvm-devel-85/qemu/configure	2009-04-27 16:09:36.000000000 +0100
@@ -1189,9 +1189,9 @@ cat > $TMPC <<EOF
 int main(void) { preadv; }
 EOF
 preadv=no
-if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
-  preadv=yes
-fi
+#if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
+#  preadv=yes
+#fi
 
 ##########################################
 # fdt probe

qemu-fix-arm-framebuffer-build.patch:

--- NEW FILE qemu-fix-arm-framebuffer-build.patch ---
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 27 Apr 2009 10:18:14 +0100
Subject: [PATCH] kvm: qemu: framebuffer: build fix for target-arm

Include qemu-kvm.h for non-KVM_UPSTREAM building and surround the
kvm code with USE_KVM guards.

Fixes target-arm:

 qemu/hw/framebuffer.c: In function 'framebuffer_update_display':
 qemu/hw/framebuffer.c:53: warning: implicit declaration of function 'kvm_enabled'
 qemu/hw/framebuffer.c:54: warning: implicit declaration of function 'kvm_physical_sync_dirty_bitmap'

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
---
 qemu/hw/framebuffer.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/qemu/hw/framebuffer.c b/qemu/hw/framebuffer.c
index 1086ba9..e2d7604 100644
--- a/qemu/hw/framebuffer.c
+++ b/qemu/hw/framebuffer.c
@@ -18,6 +18,7 @@
 #include "console.h"
 #include "framebuffer.h"
 #include "kvm.h"
+#include "qemu-kvm.h"
 
 /* Render an image from a shared memory framebuffer.  */
    
@@ -50,9 +51,11 @@ void framebuffer_update_display(
     *first_row = -1;
     src_len = src_width * rows;
 
+#ifdef USE_KVM
     if (kvm_enabled()) {
         kvm_physical_sync_dirty_bitmap(base, src_len);
     }
+#endif
     pd = cpu_get_physical_page_desc(base);
     pd2 = cpu_get_physical_page_desc(base + src_len - 1);
     /* We should reall check that this is a continuous ram region.
-- 
1.6.0.6


qemu-virtio-blk-boot-on.patch:

--- NEW FILE qemu-virtio-blk-boot-on.patch ---
From: Pauline Middelink <middelink at polyware.nl>
To: kvm at vger.kernel.org
Subject: kvm-85 won't boot guests with virtio block device

Hi,

To follow up on the issues with kvm-85 and libvirt I discovered the following
issue: libvirt detects from the help of qemu which options it can give to
qemu. (in this case obviously /usr/kvm/bin/qemu-system-x86_64 -help)

If you look carefully to the output of the -help of qemu from kvm-84 and
kvm-85, you will notice the boot flag to the -drive option has disappeared!
Hence letting libvirt believe it isnt allowed to use it, hence the unable
to boot error.

A small patch which fixes the problem for me, is attached.

    Met vriendelijke groet,
        Pauline Middelink

diff -ur kvm-85/qemu/qemu-options.hx kvm-85a/qemu/qemu-options.hx
--- kvm-85/qemu/qemu-options.hx 2009-04-21 11:57:31.000000000 +0200
+++ kvm-85a/qemu/qemu-options.hx        2009-04-24 19:04:50.000000000 +0200
@@ -77,6 +77,7 @@
     "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
     "       [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
     "       [,cache=writethrough|writeback|none][,format=f][,serial=s]\n"
+    "       [,boot=on|off]\n"
     "                use 'file' as a drive image\n")
 STEXI
 @item -drive @var{option}[, at var{option}[, at var{option}[,...]]]



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	2 Apr 2009 01:07:39 -0000	1.14
+++ .cvsignore	27 Apr 2009 14:25:53 -0000	1.15
@@ -1 +1 @@
-qemu-kvm-0.10.tar.gz
+qemu-kvm-*.tar.gz

qemu-fix-qcow2-corruption.patch:

Index: qemu-fix-qcow2-corruption.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-qcow2-corruption.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu-fix-qcow2-corruption.patch	21 Apr 2009 09:03:39 -0000	1.2
+++ qemu-fix-qcow2-corruption.patch	27 Apr 2009 14:25:53 -0000	1.3
@@ -1,26 +1,3 @@
-From: Nolan Leake <nolan <at> sigbus.net>
-Subject: [PATCH] Fix (at least one cause of) qcow2 corruption.
-
-qcow2's get_cluster_offset() scans forward in the l2 table to find other
-clusters that have the same allocation status as the first cluster.
-This is used by (among others) qcow_is_allocated().
-
-Unfortunately, it was not checking to be sure that it didn't fall off
-the end of the l2 table.  This patch adds that check.
-
-The symptom that motivated me to look into this was that
-bdrv_is_allocated() was returning false when there was in fact data
-there.  This is one of many ways this bug could lead to data corruption.
-
-I checked the other place that scans for consecutive unallocated blocks
-(alloc_cluster_offset()) and it appears to be OK:
-    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
-appears to prevent the same problem from occurring.
-
-Signed-off-by: Nolan Leake <nolan <at> sigbus.net>
-
----
-
 From: Kevin Wolf <kwolf at redhat.com>
 Subject: [PATCH] qcow2 corruption: Fix alloc_cluster_link_l2
 
@@ -41,22 +18,10 @@
 
 Signed-off-by: Kevin Wolf <kwolf at redhat.com>
 
-diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
-diff -up qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-0.10/qemu/block-qcow2.c
---- qemu-kvm-0.10/qemu/block-qcow2.c.qcow2-corruption	2009-04-21 09:57:21.000000000 +0100
-+++ qemu-kvm-0.10/qemu/block-qcow2.c	2009-04-21 09:58:27.000000000 +0100
-@@ -670,6 +670,10 @@ static uint64_t get_cluster_offset(Block
- 
-     nb_available = (nb_available >> 9) + index_in_cluster;
- 
-+    if (nb_needed > nb_available) {
-+        nb_needed = nb_available;
-+    }
-+
-     cluster_offset = 0;
- 
-     /* seek the the l2 offset in the l1 table */
-@@ -912,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
+diff -up qemu-kvm-devel-85/qemu/block-qcow2.c.qcow2-corruption qemu-kvm-devel-85/qemu/block-qcow2.c
+--- qemu-kvm-devel-85/qemu/block-qcow2.c.qcow2-corruption	2009-04-21 10:57:31.000000000 +0100
++++ qemu-kvm-devel-85/qemu/block-qcow2.c	2009-04-24 19:29:44.000000000 +0100
+@@ -1007,7 +1007,7 @@ static int alloc_cluster_link_l2(BlockDr
          goto err;
  
      for (i = 0; i < j; i++)


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- qemu.spec	24 Apr 2009 17:09:09 -0000	1.86
+++ qemu.spec	27 Apr 2009 14:25:54 -0000	1.87
@@ -1,42 +1,41 @@
+%define kvmvernum  85
+%define kvmvertag  kvm%{kvmvernum}
+%define kvmverfull kvm-devel-%{kvmvernum}
+
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10
-Release: 15%{?dist}
-# I have mistakenly thought the revision name would be 1.0.
-# So 0.10 series get Epoch = 1
+Version: 0.10.50
+Release: 1.%{kvmvertag}%{?dist}
+# Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
 
-# To re-create the tarball below:
-#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
-#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
-#   $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \
-#                                              $(pwd)/kvm-userspace kvm-84-196-ga01bd3f
-Source0: qemu-kvm-%{version}.tar.gz
-Source1: make-release
-Source2: qemu.init
-Source3: kvm.modules
-
-Patch1: 01-tls-handshake-fix.patch
-Patch2: 02-vnc-monitor-info.patch
-Patch3: 03-display-keymaps.patch
-Patch4: 04-vnc-struct.patch
-Patch5: 05-vnc-tls-vencrypt.patch
-Patch6: 06-vnc-sasl.patch
-Patch7: 07-vnc-monitor-authinfo.patch
-Patch8: 08-vnc-acl-mgmt.patch
-
-Patch9: kvm-upstream-ppc.patch
-Patch10: qemu-fix-debuginfo.patch
-Patch11: qemu-fix-gcc.patch
-Patch12: qemu-roms-more-room.patch
-Patch13: qemu-roms-more-room-fix-vga-align.patch
-Patch14: qemu-bios-bigger-roms.patch
-Patch15: qemu-fix-display-breakage.patch
-Patch16: qemu-fix-qcow2-2TB.patch
-Patch17: qemu-fix-qcow2-corruption.patch
+Source0: http://download.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
+Source1: qemu.init
+Source2: kvm.modules
+
+# Hack until merge happens upstream
+Patch01: kvm-upstream-ppc.patch
+
+# Not upstream, why?
+Patch02: qemu-bios-bigger-roms.patch
+
+# Fixed upstream by f753ff1638
+Patch03: qemu-roms-more-room-fix-vga-align.patch
+
+# Fixed upstream by 641636d19e
+Patch04: qemu-fix-qcow2-corruption.patch
+
+# Seen on kvm list
+Patch05: qemu-virtio-blk-boot-on.patch
+
+# kvm-85 build fix, submitted upstream
+Patch06: qemu-fix-arm-framebuffer-build.patch
+
+# Disable preadv()/pwritev() until bug #497429 is fixed
+Patch07: qemu-disable-preadv.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -206,25 +205,20 @@
 %endif
 
 %prep
-%setup -q -n qemu-kvm-%{version}
+%setup -q -n qemu-%{kvmverfull}
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
+#
+# Hack - kvm-85 missing kernel/include/asm symlink
+#
+(cd kernel/include && ln -s asm-x86 asm)
+
+%patch01 -p1 -b .kvm-upstream-ppc
+%patch02 -p1 -b .bios-bigger-roms
+%patch03 -p1 -b .roms-more-room-fix-vga-align
+%patch04 -p1 -b .fix-qcow2-corruption
+%patch05 -p1 -b .virtio-blk-boot-on
+%patch06 -p1 -b .framebuffer-build-fix
+%patch07 -p1 -b .disable-preadv
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -262,7 +256,6 @@
 make clean
 %endif
 
-echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
 cd qemu
 ./configure \
     --target-list="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu \
@@ -282,8 +275,7 @@
     --audio-drv-list=pa,sdl,alsa,oss \
     --extra-cflags="$RPM_OPT_FLAGS"
 
-
-make %{?_smp_mflags} $buildldflags
+make V=1 %{?_smp_mflags} $buildldflags
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -292,7 +284,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
+install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
 install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/
@@ -308,7 +300,7 @@
      docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
      datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
 chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
+install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE
 
 install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf
@@ -339,8 +331,6 @@
 ln -s ../openbios/openbios-sparc32 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc32
 ln -s ../openbios/openbios-sparc64 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc64
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -463,9 +453,22 @@
 %files img
 %defattr(-,root,root)
 %{_bindir}/qemu-img
+%{_bindir}/qemu-io
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Apr 27 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-1.kvm85
+- Update to qemu-kvm-devel-85
+- kvm-85 is based on qemu development branch, currently version 0.10.50
+- Include new qemu-io utility in qemu-img package
+- Re-instate -help string for boot=on to fix virtio booting with libvirt
+- Drop upstreamed patches
+- Fix missing kernel/include/asm symlink in upstream tarball
+- Fix target-arm build
+- Disable preadv()/pwritev() until bug #497429 is fixed
+- Kill more .kernelrelease uselessness
+- Make non-kvm qemu build verbose
+
 * Fri Apr 24 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-15
 - Fix source numbering typos caused by make-release addition
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	2 Apr 2009 01:07:39 -0000	1.14
+++ sources	27 Apr 2009 14:25:54 -0000	1.15
@@ -1 +1 @@
-04c32fb43c722f180654f53e04ad17dd  qemu-kvm-0.10.tar.gz
+3b671f64b66e7e6e571516193c184653  qemu-kvm-devel-85.tar.gz


--- 01-tls-handshake-fix.patch DELETED ---


--- 02-vnc-monitor-info.patch DELETED ---


--- 03-display-keymaps.patch DELETED ---


--- 04-vnc-struct.patch DELETED ---


--- 05-vnc-tls-vencrypt.patch DELETED ---


--- 06-vnc-sasl.patch DELETED ---


--- 07-vnc-monitor-authinfo.patch DELETED ---


--- 08-vnc-acl-mgmt.patch DELETED ---


--- make-release DELETED ---


--- qemu-fix-debuginfo.patch DELETED ---


--- qemu-fix-display-breakage.patch DELETED ---


--- qemu-fix-gcc.patch DELETED ---


--- qemu-fix-qcow2-2TB.patch DELETED ---


--- qemu-roms-more-room.patch DELETED ---



From dwalsh at fedoraproject.org  Mon Apr 27 14:45:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 27 Apr 2009 14:45:46 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.99,
	1.100 selinux-policy.spec, 1.836, 1.837
Message-ID: <20090427144546.CD80070110@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23786

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20
- Fix labeling on /var/lib/misc/prelink*
- Allow xserver to rw_shm_perms with all x_clients
- Allow prelink to execute files in the users home directory


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- policy-20090105.patch	24 Apr 2009 19:28:35 -0000	1.99
+++ policy-20090105.patch	27 Apr 2009 14:45:15 -0000	1.100
@@ -663,16 +663,16 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-3.6.12/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/prelink.fc	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/prelink.fc	2009-04-27 08:28:48.000000000 -0400
 @@ -5,3 +5,5 @@
  
  /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
  /var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 +
-+/var/lib/misc/prelink\*		--	gen_context(system_u:object_r:prelink_var_lib_t,s0)
++/var/lib/misc/prelink.*		--	gen_context(system_u:object_r:prelink_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.12/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/prelink.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/prelink.if	2009-04-27 09:47:06.000000000 -0400
 @@ -120,3 +120,23 @@
  	logging_search_logs($1)
  	manage_files_pattern($1, prelink_log_t, prelink_log_t)
@@ -699,7 +699,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.12/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/prelink.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/prelink.te	2009-04-27 08:32:37.000000000 -0400
 @@ -21,12 +21,15 @@
  type prelink_tmp_t;
  files_tmp_file(prelink_tmp_t)
@@ -750,17 +750,18 @@
  
  fs_getattr_xattr_fs(prelink_t)
  
-@@ -81,6 +89,9 @@
+@@ -81,6 +89,10 @@
  
  userdom_use_user_terminals(prelink_t)
  
 +# prelink executables in the user homedir
 +userdom_manage_home_role(system_r, prelink_t)
++userdom_exec_user_home_content_files(prelink_t)
 +
  optional_policy(`
  	amanda_manage_lib(prelink_t)
  ')
-@@ -88,3 +99,7 @@
+@@ -88,3 +100,7 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
@@ -6425,7 +6426,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-24 00:02:59.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-27 09:47:43.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6578,18 +6579,16 @@
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,10 +250,6 @@
+@@ -308,7 +250,7 @@
  ')
  
  optional_policy(`
 -	pyzor_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	quota_run(sysadm_t, sysadm_r)
++	prelink_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,10 +258,6 @@
+ optional_policy(`
+@@ -320,10 +262,6 @@
  ')
  
  optional_policy(`
@@ -6600,7 +6599,7 @@
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
-@@ -332,10 +266,6 @@
+@@ -332,10 +270,6 @@
  ')
  
  optional_policy(`
@@ -6611,7 +6610,7 @@
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +275,6 @@
+@@ -345,10 +279,6 @@
  ')
  
  optional_policy(`
@@ -6622,7 +6621,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +284,15 @@
+@@ -358,35 +288,15 @@
  ')
  
  optional_policy(`
@@ -6658,7 +6657,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +300,10 @@
+@@ -394,18 +304,10 @@
  ')
  
  optional_policy(`
@@ -6677,7 +6676,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +316,12 @@
+@@ -418,20 +320,12 @@
  ')
  
  optional_policy(`
@@ -6698,7 +6697,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +330,7 @@
+@@ -440,13 +334,7 @@
  ')
  
  optional_policy(`
@@ -14840,7 +14839,7 @@
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-24 07:20:31.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 10:00:53.000000000 -0400
 @@ -1,6 +1,8 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
@@ -20707,7 +20706,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.12/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-04-27 08:59:49.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -20833,7 +20832,14 @@
  
  manage_dirs_pattern(smbd_t, samba_var_t, samba_var_t)
  manage_files_pattern(smbd_t, samba_var_t, samba_var_t)
-@@ -256,7 +278,7 @@
+@@ -250,13 +272,14 @@
+ files_tmp_filetrans(smbd_t, smbd_tmp_t, { file dir })
+ 
+ allow smbd_t nmbd_var_run_t:file rw_file_perms;
++allow smbd_t nmbd_t:process { signal signull };
+ 
+ manage_dirs_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
+ manage_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
  manage_sock_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
  files_pid_filetrans(smbd_t, smbd_var_run_t, file)
  
@@ -20842,7 +20848,7 @@
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -298,6 +320,7 @@
+@@ -298,6 +321,7 @@
  
  auth_use_nsswitch(smbd_t)
  auth_domtrans_chk_passwd(smbd_t)
@@ -20850,7 +20856,7 @@
  
  domain_use_interactive_fds(smbd_t)
  domain_dontaudit_list_all_domains_state(smbd_t)
-@@ -321,6 +344,10 @@
+@@ -321,6 +345,10 @@
  userdom_use_unpriv_users_fds(smbd_t)
  userdom_dontaudit_search_user_home_dirs(smbd_t)
  
@@ -20861,7 +20867,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -333,25 +360,33 @@
+@@ -333,25 +361,33 @@
  
  tunable_policy(`samba_domain_controller',`
  	usermanage_domtrans_passwd(smbd_t)
@@ -20901,7 +20907,7 @@
  optional_policy(`
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
-@@ -359,6 +394,16 @@
+@@ -359,6 +395,16 @@
  
  optional_policy(`
  	kerberos_use(smbd_t)
@@ -20918,7 +20924,7 @@
  ')
  
  optional_policy(`
-@@ -376,13 +421,15 @@
+@@ -376,13 +422,15 @@
  tunable_policy(`samba_create_home_dirs',`
  	allow smbd_t self:capability chown;
  	userdom_create_user_home_dirs(smbd_t)
@@ -20935,7 +20941,7 @@
  	auth_read_all_files_except_shadow(nmbd_t)
  ')
  
-@@ -391,8 +438,8 @@
+@@ -391,8 +439,8 @@
  	auth_manage_all_files_except_shadow(smbd_t)
  	fs_read_noxattr_fs_files(nmbd_t) 
  	auth_manage_all_files_except_shadow(nmbd_t)
@@ -20945,7 +20951,7 @@
  
  ########################################
  #
-@@ -417,14 +464,11 @@
+@@ -417,14 +465,11 @@
  files_pid_filetrans(nmbd_t, nmbd_var_run_t, file)
  
  read_files_pattern(nmbd_t, samba_etc_t, samba_etc_t)
@@ -20961,7 +20967,7 @@
  manage_files_pattern(nmbd_t, samba_var_t, samba_var_t)
  
  allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
-@@ -454,6 +498,7 @@
+@@ -454,6 +499,7 @@
  dev_getattr_mtrr_dev(nmbd_t)
  
  fs_getattr_all_fs(nmbd_t)
@@ -20969,7 +20975,7 @@
  fs_search_auto_mountpoints(nmbd_t)
  
  domain_use_interactive_fds(nmbd_t)
-@@ -553,21 +598,36 @@
+@@ -553,21 +599,36 @@
  userdom_use_user_terminals(smbmount_t)
  userdom_use_all_users_fds(smbmount_t)
  
@@ -21009,7 +21015,7 @@
  
  append_files_pattern(swat_t, samba_log_t, samba_log_t)
  
-@@ -585,6 +645,9 @@
+@@ -585,6 +646,9 @@
  files_pid_filetrans(swat_t, swat_var_run_t, file)
  
  allow swat_t winbind_exec_t:file mmap_file_perms;
@@ -21019,7 +21025,7 @@
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -609,15 +672,18 @@
+@@ -609,15 +673,18 @@
  
  dev_read_urand(swat_t)
  
@@ -21038,7 +21044,7 @@
  logging_search_logs(swat_t)
  
  miscfiles_read_localization(swat_t)
-@@ -635,6 +701,17 @@
+@@ -635,6 +702,17 @@
  	kerberos_use(swat_t)
  ')
  
@@ -21056,7 +21062,7 @@
  ########################################
  #
  # Winbind local policy
-@@ -642,7 +719,7 @@
+@@ -642,7 +720,7 @@
  
  allow winbind_t self:capability { dac_override ipc_lock setuid };
  dontaudit winbind_t self:capability sys_tty_config;
@@ -21065,7 +21071,7 @@
  allow winbind_t self:fifo_file rw_fifo_file_perms;
  allow winbind_t self:unix_dgram_socket create_socket_perms;
  allow winbind_t self:unix_stream_socket create_stream_socket_perms;
-@@ -683,9 +760,10 @@
+@@ -683,9 +761,10 @@
  manage_sock_files_pattern(winbind_t, winbind_var_run_t, winbind_var_run_t)
  files_pid_filetrans(winbind_t, winbind_var_run_t, file)
  
@@ -21078,7 +21084,7 @@
  
  corenet_all_recvfrom_unlabeled(winbind_t)
  corenet_all_recvfrom_netlabel(winbind_t)
-@@ -709,10 +787,12 @@
+@@ -709,10 +788,12 @@
  
  auth_domtrans_chk_passwd(winbind_t)
  auth_use_nsswitch(winbind_t)
@@ -21091,7 +21097,7 @@
  
  logging_send_syslog_msg(winbind_t)
  
-@@ -768,8 +848,13 @@
+@@ -768,8 +849,13 @@
  userdom_use_user_terminals(winbind_helper_t)
  
  optional_policy(`
@@ -21105,7 +21111,7 @@
  ')
  
  ########################################
-@@ -778,6 +863,16 @@
+@@ -778,6 +864,16 @@
  #
  
  optional_policy(`
@@ -21122,7 +21128,7 @@
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -788,9 +883,43 @@
+@@ -788,9 +884,43 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  
@@ -24450,7 +24456,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-27 08:35:28.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -24946,7 +24952,14 @@
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -622,7 +746,7 @@
+@@ -616,13 +740,14 @@
+ type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
+ 
+ allow xserver_t { rootwindow_t x_domain }:x_drawable send;
++allow xserver_t x_domain:shm rw_shm_perms;
+ 
+ manage_dirs_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
+ manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
  
@@ -24955,7 +24968,7 @@
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +759,19 @@
+@@ -635,9 +760,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -24975,7 +24988,7 @@
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -680,9 +814,14 @@
+@@ -680,9 +815,14 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -24990,7 +25003,7 @@
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +836,13 @@
+@@ -697,8 +837,13 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -25004,7 +25017,7 @@
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +864,7 @@
+@@ -720,6 +865,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -25012,7 +25025,7 @@
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -742,7 +887,7 @@
+@@ -742,7 +888,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -25021,7 +25034,7 @@
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -774,12 +919,16 @@
+@@ -774,12 +920,16 @@
  ')
  
  optional_policy(`
@@ -25039,7 +25052,7 @@
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -806,7 +955,7 @@
+@@ -806,7 +956,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -25048,7 +25061,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -827,9 +976,14 @@
+@@ -827,9 +977,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -25063,7 +25076,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +998,14 @@
+@@ -844,11 +999,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -25079,7 +25092,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +1013,11 @@
+@@ -856,6 +1014,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -25091,7 +25104,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -881,6 +1043,8 @@
+@@ -881,6 +1044,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -25100,7 +25113,7 @@
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -905,6 +1069,8 @@
+@@ -905,6 +1070,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -25109,7 +25122,7 @@
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -972,17 +1138,49 @@
+@@ -972,17 +1139,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -29642,7 +29655,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 23:55:27.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-27 08:32:47.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -r1.836 -r1.837
--- selinux-policy.spec	24 Apr 2009 19:28:35 -0000	1.836
+++ selinux-policy.spec	27 Apr 2009 14:45:15 -0000	1.837
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,11 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20
+- Fix labeling on /var/lib/misc/prelink*
+- Allow xserver to rw_shm_perms with all x_clients
+- Allow prelink to execute files in the users home directory
+
 * Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-19
 - Allow initrc_t to delete dev_null
 - Allow readahead to configure auditing



From dwalsh at fedoraproject.org  Mon Apr 27 14:45:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 27 Apr 2009 14:45:53 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.106,
	1.107 selinux-policy.spec, 1.842, 1.843
Message-ID: <20090427144553.3F4E570110@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23924

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20
- Fix labeling on /var/lib/misc/prelink*
- Allow xserver to rw_shm_perms with all x_clients
- Allow prelink to execute files in the users home directory


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- policy-20090105.patch	24 Apr 2009 19:28:42 -0000	1.106
+++ policy-20090105.patch	27 Apr 2009 14:45:51 -0000	1.107
@@ -663,16 +663,16 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-3.6.12/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/admin/prelink.fc	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/prelink.fc	2009-04-27 08:28:48.000000000 -0400
 @@ -5,3 +5,5 @@
  
  /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
  /var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
 +
-+/var/lib/misc/prelink\*		--	gen_context(system_u:object_r:prelink_var_lib_t,s0)
++/var/lib/misc/prelink.*		--	gen_context(system_u:object_r:prelink_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.12/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/prelink.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/prelink.if	2009-04-27 09:47:06.000000000 -0400
 @@ -120,3 +120,23 @@
  	logging_search_logs($1)
  	manage_files_pattern($1, prelink_log_t, prelink_log_t)
@@ -699,7 +699,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.12/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/prelink.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/prelink.te	2009-04-27 08:32:37.000000000 -0400
 @@ -21,12 +21,15 @@
  type prelink_tmp_t;
  files_tmp_file(prelink_tmp_t)
@@ -750,17 +750,18 @@
  
  fs_getattr_xattr_fs(prelink_t)
  
-@@ -81,6 +89,9 @@
+@@ -81,6 +89,10 @@
  
  userdom_use_user_terminals(prelink_t)
  
 +# prelink executables in the user homedir
 +userdom_manage_home_role(system_r, prelink_t)
++userdom_exec_user_home_content_files(prelink_t)
 +
  optional_policy(`
  	amanda_manage_lib(prelink_t)
  ')
-@@ -88,3 +99,7 @@
+@@ -88,3 +100,7 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
@@ -6425,7 +6426,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.12/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-24 00:02:59.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/roles/sysadm.te	2009-04-27 09:47:43.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6578,18 +6579,16 @@
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,10 +250,6 @@
+@@ -308,7 +250,7 @@
  ')
  
  optional_policy(`
 -	pyzor_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	quota_run(sysadm_t, sysadm_r)
++	prelink_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,10 +258,6 @@
+ optional_policy(`
+@@ -320,10 +262,6 @@
  ')
  
  optional_policy(`
@@ -6600,7 +6599,7 @@
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
-@@ -332,10 +266,6 @@
+@@ -332,10 +270,6 @@
  ')
  
  optional_policy(`
@@ -6611,7 +6610,7 @@
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +275,6 @@
+@@ -345,10 +279,6 @@
  ')
  
  optional_policy(`
@@ -6622,7 +6621,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +284,15 @@
+@@ -358,35 +288,15 @@
  ')
  
  optional_policy(`
@@ -6658,7 +6657,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +300,10 @@
+@@ -394,18 +304,10 @@
  ')
  
  optional_policy(`
@@ -6677,7 +6676,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +316,12 @@
+@@ -418,20 +320,12 @@
  ')
  
  optional_policy(`
@@ -6698,7 +6697,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +330,7 @@
+@@ -440,13 +334,7 @@
  ')
  
  optional_policy(`
@@ -14840,7 +14839,7 @@
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-24 07:20:31.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 10:00:53.000000000 -0400
 @@ -1,6 +1,8 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
@@ -20707,7 +20706,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.12/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/samba.te	2009-04-27 08:59:49.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -20833,7 +20832,14 @@
  
  manage_dirs_pattern(smbd_t, samba_var_t, samba_var_t)
  manage_files_pattern(smbd_t, samba_var_t, samba_var_t)
-@@ -256,7 +278,7 @@
+@@ -250,13 +272,14 @@
+ files_tmp_filetrans(smbd_t, smbd_tmp_t, { file dir })
+ 
+ allow smbd_t nmbd_var_run_t:file rw_file_perms;
++allow smbd_t nmbd_t:process { signal signull };
+ 
+ manage_dirs_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
+ manage_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
  manage_sock_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
  files_pid_filetrans(smbd_t, smbd_var_run_t, file)
  
@@ -20842,7 +20848,7 @@
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -298,6 +320,7 @@
+@@ -298,6 +321,7 @@
  
  auth_use_nsswitch(smbd_t)
  auth_domtrans_chk_passwd(smbd_t)
@@ -20850,7 +20856,7 @@
  
  domain_use_interactive_fds(smbd_t)
  domain_dontaudit_list_all_domains_state(smbd_t)
-@@ -321,6 +344,10 @@
+@@ -321,6 +345,10 @@
  userdom_use_unpriv_users_fds(smbd_t)
  userdom_dontaudit_search_user_home_dirs(smbd_t)
  
@@ -20861,7 +20867,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -333,25 +360,33 @@
+@@ -333,25 +361,33 @@
  
  tunable_policy(`samba_domain_controller',`
  	usermanage_domtrans_passwd(smbd_t)
@@ -20901,7 +20907,7 @@
  optional_policy(`
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
-@@ -359,6 +394,16 @@
+@@ -359,6 +395,16 @@
  
  optional_policy(`
  	kerberos_use(smbd_t)
@@ -20918,7 +20924,7 @@
  ')
  
  optional_policy(`
-@@ -376,13 +421,15 @@
+@@ -376,13 +422,15 @@
  tunable_policy(`samba_create_home_dirs',`
  	allow smbd_t self:capability chown;
  	userdom_create_user_home_dirs(smbd_t)
@@ -20935,7 +20941,7 @@
  	auth_read_all_files_except_shadow(nmbd_t)
  ')
  
-@@ -391,8 +438,8 @@
+@@ -391,8 +439,8 @@
  	auth_manage_all_files_except_shadow(smbd_t)
  	fs_read_noxattr_fs_files(nmbd_t) 
  	auth_manage_all_files_except_shadow(nmbd_t)
@@ -20945,7 +20951,7 @@
  
  ########################################
  #
-@@ -417,14 +464,11 @@
+@@ -417,14 +465,11 @@
  files_pid_filetrans(nmbd_t, nmbd_var_run_t, file)
  
  read_files_pattern(nmbd_t, samba_etc_t, samba_etc_t)
@@ -20961,7 +20967,7 @@
  manage_files_pattern(nmbd_t, samba_var_t, samba_var_t)
  
  allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
-@@ -454,6 +498,7 @@
+@@ -454,6 +499,7 @@
  dev_getattr_mtrr_dev(nmbd_t)
  
  fs_getattr_all_fs(nmbd_t)
@@ -20969,7 +20975,7 @@
  fs_search_auto_mountpoints(nmbd_t)
  
  domain_use_interactive_fds(nmbd_t)
-@@ -553,21 +598,36 @@
+@@ -553,21 +599,36 @@
  userdom_use_user_terminals(smbmount_t)
  userdom_use_all_users_fds(smbmount_t)
  
@@ -21009,7 +21015,7 @@
  
  append_files_pattern(swat_t, samba_log_t, samba_log_t)
  
-@@ -585,6 +645,9 @@
+@@ -585,6 +646,9 @@
  files_pid_filetrans(swat_t, swat_var_run_t, file)
  
  allow swat_t winbind_exec_t:file mmap_file_perms;
@@ -21019,7 +21025,7 @@
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -609,15 +672,18 @@
+@@ -609,15 +673,18 @@
  
  dev_read_urand(swat_t)
  
@@ -21038,7 +21044,7 @@
  logging_search_logs(swat_t)
  
  miscfiles_read_localization(swat_t)
-@@ -635,6 +701,17 @@
+@@ -635,6 +702,17 @@
  	kerberos_use(swat_t)
  ')
  
@@ -21056,7 +21062,7 @@
  ########################################
  #
  # Winbind local policy
-@@ -642,7 +719,7 @@
+@@ -642,7 +720,7 @@
  
  allow winbind_t self:capability { dac_override ipc_lock setuid };
  dontaudit winbind_t self:capability sys_tty_config;
@@ -21065,7 +21071,7 @@
  allow winbind_t self:fifo_file rw_fifo_file_perms;
  allow winbind_t self:unix_dgram_socket create_socket_perms;
  allow winbind_t self:unix_stream_socket create_stream_socket_perms;
-@@ -683,9 +760,10 @@
+@@ -683,9 +761,10 @@
  manage_sock_files_pattern(winbind_t, winbind_var_run_t, winbind_var_run_t)
  files_pid_filetrans(winbind_t, winbind_var_run_t, file)
  
@@ -21078,7 +21084,7 @@
  
  corenet_all_recvfrom_unlabeled(winbind_t)
  corenet_all_recvfrom_netlabel(winbind_t)
-@@ -709,10 +787,12 @@
+@@ -709,10 +788,12 @@
  
  auth_domtrans_chk_passwd(winbind_t)
  auth_use_nsswitch(winbind_t)
@@ -21091,7 +21097,7 @@
  
  logging_send_syslog_msg(winbind_t)
  
-@@ -768,8 +848,13 @@
+@@ -768,8 +849,13 @@
  userdom_use_user_terminals(winbind_helper_t)
  
  optional_policy(`
@@ -21105,7 +21111,7 @@
  ')
  
  ########################################
-@@ -778,6 +863,16 @@
+@@ -778,6 +864,16 @@
  #
  
  optional_policy(`
@@ -21122,7 +21128,7 @@
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -788,9 +883,43 @@
+@@ -788,9 +884,43 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  
@@ -24450,7 +24456,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-04-27 08:35:28.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -24946,7 +24952,14 @@
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -622,7 +746,7 @@
+@@ -616,13 +740,14 @@
+ type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
+ 
+ allow xserver_t { rootwindow_t x_domain }:x_drawable send;
++allow xserver_t x_domain:shm rw_shm_perms;
+ 
+ manage_dirs_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
+ manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
  
@@ -24955,7 +24968,7 @@
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +759,19 @@
+@@ -635,9 +760,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -24975,7 +24988,7 @@
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -680,9 +814,14 @@
+@@ -680,9 +815,14 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -24990,7 +25003,7 @@
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +836,13 @@
+@@ -697,8 +837,13 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -25004,7 +25017,7 @@
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +864,7 @@
+@@ -720,6 +865,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -25012,7 +25025,7 @@
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -742,7 +887,7 @@
+@@ -742,7 +888,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -25021,7 +25034,7 @@
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -774,12 +919,16 @@
+@@ -774,12 +920,16 @@
  ')
  
  optional_policy(`
@@ -25039,7 +25052,7 @@
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -806,7 +955,7 @@
+@@ -806,7 +956,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -25048,7 +25061,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -827,9 +976,14 @@
+@@ -827,9 +977,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -25063,7 +25076,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +998,14 @@
+@@ -844,11 +999,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -25079,7 +25092,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +1013,11 @@
+@@ -856,6 +1014,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -25091,7 +25104,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -881,6 +1043,8 @@
+@@ -881,6 +1044,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -25100,7 +25113,7 @@
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -905,6 +1069,8 @@
+@@ -905,6 +1070,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -25109,7 +25122,7 @@
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -972,17 +1138,49 @@
+@@ -972,17 +1139,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -29642,7 +29655,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-23 23:55:27.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-27 08:32:47.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- selinux-policy.spec	24 Apr 2009 19:28:42 -0000	1.842
+++ selinux-policy.spec	27 Apr 2009 14:45:52 -0000	1.843
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,11 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20
+- Fix labeling on /var/lib/misc/prelink*
+- Allow xserver to rw_shm_perms with all x_clients
+- Allow prelink to execute files in the users home directory
+
 * Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-19
 - Allow initrc_t to delete dev_null
 - Allow readahead to configure auditing



From jakub at fedoraproject.org  Mon Apr 27 14:51:41 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 27 Apr 2009 14:51:41 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.275, 1.276 glibc-fedora.patch, 1.309, 
	1.310 glibc.spec, 1.398, 1.399 import.log, 1.19, 1.20 sources,
	1.300, 1.301
Message-ID: <20090427145141.933F670110@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25470/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- .cvsignore	24 Apr 2009 19:38:21 -0000	1.275
+++ .cvsignore	27 Apr 2009 14:51:10 -0000	1.276
@@ -1,2 +1,2 @@
-glibc-20090424T1908.tar.bz2
-glibc-fedora-20090424T1908.tar.bz2
+glibc-20090427T1419.tar.bz2
+glibc-fedora-20090427T1419.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- glibc-fedora.patch	24 Apr 2009 20:08:34 -0000	1.309
+++ glibc-fedora.patch	27 Apr 2009 14:51:10 -0000	1.310
@@ -1,6 +1,6 @@
---- glibc-20090424T1908/ChangeLog	24 Apr 2009 19:00:54 -0000	1.11624
-+++ glibc-20090424T1908-fedora/ChangeLog	24 Apr 2009 19:14:51 -0000	1.8782.2.333
-@@ -7457,6 +7457,13 @@
+--- glibc-20090427T1419/ChangeLog	27 Apr 2009 14:07:57 -0000	1.11645
++++ glibc-20090427T1419-fedora/ChangeLog	27 Apr 2009 14:33:39 -0000	1.8782.2.334
+@@ -7592,6 +7592,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7752,6 +7759,10 @@
+@@ -7887,6 +7894,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -9009,6 +9020,15 @@
+@@ -9144,6 +9155,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090424T1908/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090424T1908-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090427T1419/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090427T1419-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090424T1908/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090424T1908-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090427T1419/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090427T1419-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090424T1908/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090424T1908-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090427T1419/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090427T1419-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090424T1908/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090424T1908-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090427T1419/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090427T1419-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090424T1908/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090424T1908-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090427T1419/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090427T1419-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090424T1908/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
-+++ glibc-20090424T1908-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
+--- glibc-20090427T1419/elf/ldconfig.c	6 Feb 2009 20:09:33 -0000	1.65
++++ glibc-20090427T1419-fedora/elf/ldconfig.c	18 Feb 2009 15:49:28 -0000	1.47.2.20
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090424T1908/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090424T1908-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090427T1419/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090427T1419-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,9 +458,9 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090424T1908/include/features.h	26 Feb 2009 01:43:33 -0000	1.53
-+++ glibc-20090424T1908-fedora/include/features.h	9 Mar 2009 14:35:16 -0000	1.35.2.22
-@@ -297,8 +297,13 @@
+--- glibc-20090427T1419/include/features.h	25 Apr 2009 08:29:50 -0000	1.54
++++ glibc-20090427T1419-fedora/include/features.h	27 Apr 2009 14:33:46 -0000	1.35.2.23
+@@ -299,8 +299,13 @@
  #endif
  
  #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090424T1908/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090427T1419/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090424T1908/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090427T1419/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090424T1908/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090424T1908-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090427T1419/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090427T1419-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090424T1908/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
-+++ glibc-20090424T1908-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
+--- glibc-20090427T1419/libio/stdio.h	26 Feb 2009 15:43:58 -0000	1.94
++++ glibc-20090427T1419-fedora/libio/stdio.h	9 Mar 2009 14:35:17 -0000	1.78.2.15
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090424T1908/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090424T1908-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090427T1419/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090427T1419-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090424T1908/locale/programs/locarchive.c	24 Apr 2009 18:47:07 -0000	1.30
-+++ glibc-20090424T1908-fedora/locale/programs/locarchive.c	24 Apr 2009 19:14:54 -0000	1.21.2.6
+--- glibc-20090427T1419/locale/programs/locarchive.c	27 Apr 2009 14:07:47 -0000	1.31
++++ glibc-20090427T1419-fedora/locale/programs/locarchive.c	27 Apr 2009 14:33:47 -0000	1.21.2.7
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -618,7 +618,7 @@
  
  
  static bool
-@@ -628,7 +628,7 @@ close_archive (struct locarhandle *ah)
+@@ -649,7 +649,7 @@ close_archive (struct locarhandle *ah)
  #include "../../intl/explodename.c"
  #include "../../intl/l10nflist.c"
  
@@ -627,7 +627,7 @@
  insert_name (struct locarhandle *ah,
  	     const char *name, size_t name_len, bool replace)
  {
-@@ -686,7 +686,7 @@ insert_name (struct locarhandle *ah,
+@@ -707,7 +707,7 @@ insert_name (struct locarhandle *ah,
    return &namehashtab[idx];
  }
  
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090424T1908/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
-+++ glibc-20090424T1908-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
+--- glibc-20090427T1419/localedata/Makefile	7 Feb 2009 05:28:00 -0000	1.110
++++ glibc-20090427T1419-fedora/localedata/Makefile	18 Feb 2009 15:49:33 -0000	1.101.2.10
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090424T1908/localedata/SUPPORTED	18 Apr 2009 08:43:52 -0000	1.117
-+++ glibc-20090424T1908-fedora/localedata/SUPPORTED	24 Apr 2009 08:00:32 -0000	1.71.2.25
+--- glibc-20090427T1419/localedata/SUPPORTED	18 Apr 2009 08:43:52 -0000	1.117
++++ glibc-20090427T1419-fedora/localedata/SUPPORTED	24 Apr 2009 08:00:32 -0000	1.71.2.25
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090424T1908/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090424T1908-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090427T1419/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090427T1419-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090424T1908/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090424T1908-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090427T1419/localedata/locales/en_GB	25 Apr 2009 04:43:43 -0000	1.19
++++ glibc-20090427T1419-fedora/localedata/locales/en_GB	27 Apr 2009 14:33:48 -0000	1.10.2.8
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090424T1908/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090427T1419/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090424T1908/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090424T1908-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090427T1419/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090427T1419-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090424T1908/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090424T1908-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090427T1419/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090427T1419-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090424T1908/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090424T1908-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090427T1419/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090427T1419-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090424T1908/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
-+++ glibc-20090424T1908-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
+--- glibc-20090427T1419/misc/sys/cdefs.h	2 Mar 2009 15:56:03 -0000	1.74
++++ glibc-20090427T1419-fedora/misc/sys/cdefs.h	9 Mar 2009 14:35:17 -0000	1.58.2.11
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,17 +952,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090424T1908/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090424T1908-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090427T1419/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090427T1419-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090424T1908/nptl/ChangeLog	23 Apr 2009 04:11:38 -0000	1.1111
-+++ glibc-20090424T1908-fedora/nptl/ChangeLog	24 Apr 2009 08:00:34 -0000	1.706.2.171
-@@ -3456,6 +3456,15 @@
+--- glibc-20090427T1419/nptl/ChangeLog	26 Apr 2009 18:37:05 -0000	1.1113
++++ glibc-20090427T1419-fedora/nptl/ChangeLog	27 Apr 2009 14:33:50 -0000	1.706.2.172
+@@ -3464,6 +3464,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -978,7 +978,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4192,6 +4201,11 @@
+@@ -4200,6 +4209,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -990,7 +990,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6266,6 +6280,11 @@
+@@ -6274,6 +6288,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090424T1908/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090424T1908-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090427T1419/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090427T1419-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090424T1908/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090424T1908-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090427T1419/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090427T1419-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090424T1908/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090427T1419/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090424T1908/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
-+++ glibc-20090424T1908-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
+--- glibc-20090427T1419/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	26 Feb 2009 16:22:45 -0000	1.18
++++ glibc-20090427T1419-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	9 Mar 2009 14:35:18 -0000	1.8.2.10
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-20090424T1908/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090424T1908-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090427T1419/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090427T1419-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090424T1908/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090424T1908-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090427T1419/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090427T1419-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090424T1908/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
-+++ glibc-20090424T1908-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
+--- glibc-20090427T1419/posix/Makefile	7 Feb 2009 08:18:49 -0000	1.204
++++ glibc-20090427T1419-fedora/posix/Makefile	18 Feb 2009 15:49:37 -0000	1.171.2.28
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090424T1908/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
+--- glibc-20090427T1419/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/posix/getconf.speclist.h	18 Feb 2009 16:47:01 -0000	1.1.2.3
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090424T1908/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090424T1908-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090427T1419/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090427T1419-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090424T1908/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090424T1908-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090427T1419/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090427T1419-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090424T1908/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090424T1908-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090427T1419/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090427T1419-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090424T1908/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090424T1908-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090427T1419/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090427T1419-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-20090424T1908/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090424T1908-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090427T1419/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090427T1419-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090424T1908/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090427T1419/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090424T1908/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090424T1908-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090427T1419/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090427T1419-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090424T1908/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090424T1908-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090427T1419/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090427T1419-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/dl-osinfo.h	11 Jan 2009 04:42:04 -0000	1.29
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	4 Feb 2009 22:36:00 -0000	1.14.2.15
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/dl-osinfo.h	26 Apr 2009 20:09:24 -0000	1.30
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	27 Apr 2009 14:33:57 -0000	1.14.2.16
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1875,8 +1875,8 @@
  
  struct netlink_res
  {
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/paths.h	23 Apr 2009 18:29:16 -0000	1.12
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/paths.h	24 Apr 2009 08:00:37 -0000	1.11.4.2
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/paths.h	23 Apr 2009 18:29:16 -0000	1.12
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/paths.h	24 Apr 2009 08:00:37 -0000	1.11.4.2
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1886,8 +1886,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1933,8 +1933,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1953,8 +1953,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2015,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2049,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090424T1908/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090424T1908-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090427T1419/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090427T1419-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2090,27 +2090,3 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- libc/fedora/build-locale-archive.c	24 May 2007 10:33:02 -0000	1.1.2.4
-+++ libc/fedora/build-locale-archive.c	24 Apr 2009 20:06:55 -0000
-@@ -112,15 +112,16 @@ open_tmpl_archive (struct locarhandle *a
-     error (EXIT_FAILURE, errno, "cannot read archive header");
- 
-   ah->fd = fd;
--  ah->len = (head.sumhash_offset
--	     + head.sumhash_size * sizeof (struct sumhashent));
--  if (ah->len > st.st_size)
-+  ah->mmaped = (head.sumhash_offset
-+		+ head.sumhash_size * sizeof (struct sumhashent));
-+  if (ah->mmaped > st.st_size)
-     error (EXIT_FAILURE, 0, "locale archite template file truncated");
--  ah->len = st.st_size;
-+  ah->mmaped = st.st_size;
-+  ah->reserved = st.st_size;
- 
-   /* Now we know how large the administrative information part is.
-      Map all of it.  */
--  ah->addr = mmap64 (NULL, ah->len, PROT_READ, MAP_SHARED, fd, 0);
-+  ah->addr = mmap64 (NULL, ah->mmaped, PROT_READ, MAP_SHARED, fd, 0);
-   if (ah->addr == MAP_FAILED)
-     error (EXIT_FAILURE, errno, "cannot map archive header");
- }


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- glibc.spec	24 Apr 2009 19:38:23 -0000	1.398
+++ glibc.spec	27 Apr 2009 14:51:10 -0000	1.399
@@ -1,6 +1,6 @@
-%define glibcdate 20090424T1908
+%define glibcdate 20090427T1419
 %define glibcname glibc
-%define glibcsrcdir glibc-20090424T1908
+%define glibcsrcdir glibc-20090427T1419
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 21
+Release: 22
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1013,6 +1013,11 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-22
+- update from trunk
+  - further localedef fixes
+- fix build-locale-archive
+
 * Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-21
 - update from trunk
   - fix localedef


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	24 Apr 2009 19:38:23 -0000	1.19
+++ import.log	27 Apr 2009 14:51:11 -0000	1.20
@@ -17,3 +17,4 @@
 glibc-2_9_90-19:F-11:glibc-2.9.90-19.src.rpm:1239900585
 glibc-2_9_90-20:F-11:glibc-2.9.90-20.src.rpm:1240561264
 glibc-2_9_90-21:F-11:glibc-2.9.90-21.src.rpm:1240601486
+glibc-2_9_90-22:F-11:glibc-2.9.90-22.src.rpm:1240843823


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- sources	24 Apr 2009 19:38:23 -0000	1.300
+++ sources	27 Apr 2009 14:51:11 -0000	1.301
@@ -1,2 +1,2 @@
-cceafa33a1c308f37cd679c0558f06de  glibc-20090424T1908.tar.bz2
-2e888704ea9f0d5f61cb1e8259dc9ab6  glibc-fedora-20090424T1908.tar.bz2
+68effde1dae76513f4803789e587305f  glibc-20090427T1419.tar.bz2
+a24a729a6d7340e4c22099fd02c64bcd  glibc-fedora-20090427T1419.tar.bz2



From nalin at fedoraproject.org  Mon Apr 27 14:54:46 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 14:54:46 +0000 (UTC)
Subject: rpms/slapi-nis/F-9 slapi-nis.spec, 1.6, 1.7 sources, 1.7,
	1.8 slapi-nis-paths.patch, 1.1, NONE
Message-ID: <20090427145446.281947013C@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25832/F-9

Modified Files:
	slapi-nis.spec sources 
Removed Files:
	slapi-nis-paths.patch 
Log Message:
- rebase to the F11 version, to get recursive attribute dereferencing and
  additional functions



Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/slapi-nis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapi-nis.spec	9 Dec 2008 16:44:20 -0000	1.6
+++ slapi-nis.spec	27 Apr 2009 14:54:15 -0000	1.7
@@ -1,12 +1,11 @@
 Name:		slapi-nis
-Version:	0.8.5
-Release:	2%{?dist}
+Version:	0.10
+Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://slapi-nis.fedorahosted.org/
 Source0:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
-Patch0:		slapi-nis-paths.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	fedora-ds-base-devel, mozldap-devel, tcp_wrappers-devel
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .paths
 
 %build
 %configure --disable-static --with-tcp-wrappers
@@ -43,32 +41,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING STATUS doc/*.txt doc/*.ldif
+%doc COPYING NEWS README STATUS doc/*.txt doc/*.ldif
 %{_libdir}/dirsrv/plugins/*.so
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
-* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
-- make the example nsslapd-pluginpath values the same on 32- and 64-bit
-  systems, because we can depend on the directory server "knowing" which
-  directory to search for the plugins
-
-* Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
-- update to 0.8.5 to suppress duplicate values for attributes in the schema
-  compatibility plugin
-
-* Thu Dec  4 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.4-1
-- update to 0.8.4 to fix:
-  - problems updating references, particularly those for %%referred() (#474478)
-  - inability to notice internal add/modify/modrdn/delete operations (really
-    this time) (#474426)
-
-* Wed Dec  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.3-1
-- update to 0.8.3 to also notice and reflect changes caused by internal
-  add/modify/modrdn/delete operations
+* Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
+- update to 0.10
 
-* Wed Nov 19 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.2-1
-- update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
+- update to 0.9
 
 * Fri Oct  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.1-1
 - update to 0.8.1 to fix a heap corruption (Rich Megginson)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Dec 2008 19:07:32 -0000	1.7
+++ sources	27 Apr 2009 14:54:15 -0000	1.8
@@ -1 +1 @@
-5278f6b65c55793bd22a1a88db67efaa  slapi-nis-0.8.5.tar.gz
+9e949c3845e18f71c58499565da6948a  slapi-nis-0.10.tar.gz


--- slapi-nis-paths.patch DELETED ---



From nalin at fedoraproject.org  Mon Apr 27 14:54:45 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 14:54:45 +0000 (UTC)
Subject: rpms/slapi-nis/F-10 slapi-nis.spec, 1.6, 1.7 sources, 1.6,
	1.7 slapi-nis-paths.patch, 1.1, NONE
Message-ID: <20090427145446.08A7D70110@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25832/F-10

Modified Files:
	slapi-nis.spec sources 
Removed Files:
	slapi-nis-paths.patch 
Log Message:
- rebase to the F11 version, to get recursive attribute dereferencing and
  additional functions



Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-10/slapi-nis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapi-nis.spec	9 Dec 2008 16:44:20 -0000	1.6
+++ slapi-nis.spec	27 Apr 2009 14:54:15 -0000	1.7
@@ -1,12 +1,11 @@
 Name:		slapi-nis
-Version:	0.8.5
-Release:	2%{?dist}
+Version:	0.10
+Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://slapi-nis.fedorahosted.org/
 Source0:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
-Patch0:		slapi-nis-paths.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	fedora-ds-base-devel, mozldap-devel, tcp_wrappers-devel
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .paths
 
 %build
 %configure --disable-static --with-tcp-wrappers
@@ -43,32 +41,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING STATUS doc/*.txt doc/*.ldif
+%doc COPYING NEWS README STATUS doc/*.txt doc/*.ldif
 %{_libdir}/dirsrv/plugins/*.so
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
-* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
-- make the example nsslapd-pluginpath values the same on 32- and 64-bit
-  systems, because we can depend on the directory server "knowing" which
-  directory to search for the plugins
-
-* Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
-- update to 0.8.5 to suppress duplicate values for attributes in the schema
-  compatibility plugin
-
-* Thu Dec  4 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.4-1
-- update to 0.8.4 to fix:
-  - problems updating references, particularly those for %%referred() (#474478)
-  - inability to notice internal add/modify/modrdn/delete operations (really
-    this time) (#474426)
-
-* Wed Dec  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.3-1
-- update to 0.8.3 to also notice and reflect changes caused by internal
-  add/modify/modrdn/delete operations
+* Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
+- update to 0.10
 
-* Wed Nov 19 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.2-1
-- update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
+- update to 0.9
 
 * Fri Oct  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.1-1
 - update to 0.8.1 to fix a heap corruption (Rich Megginson)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Dec 2008 19:07:31 -0000	1.6
+++ sources	27 Apr 2009 14:54:15 -0000	1.7
@@ -1 +1 @@
-5278f6b65c55793bd22a1a88db67efaa  slapi-nis-0.8.5.tar.gz
+9e949c3845e18f71c58499565da6948a  slapi-nis-0.10.tar.gz


--- slapi-nis-paths.patch DELETED ---



From markmc at fedoraproject.org  Mon Apr 27 14:57:07 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 27 Apr 2009 14:57:07 +0000 (UTC)
Subject: rpms/qemu/devel qemu-add-cache-utils-to-block-objs.patch, NONE,
	1.1 qemu.spec, 1.87, 1.88
Message-ID: <20090427145707.0D9B570110@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26576

Modified Files:
	qemu.spec 
Added Files:
	qemu-add-cache-utils-to-block-objs.patch 
Log Message:
Fix build on ppc


qemu-add-cache-utils-to-block-objs.patch:

--- NEW FILE qemu-add-cache-utils-to-block-objs.patch ---
diff -up ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs ./qemu-kvm-devel-85/qemu/Makefile
--- ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs	2009-04-27 15:54:16.000000000 +0100
+++ ./qemu-kvm-devel-85/qemu/Makefile	2009-04-27 15:53:51.000000000 +0100
@@ -49,7 +49,7 @@ recurse-all: $(SUBDIR_RULES)
 #######################################################################
 # BLOCK_OBJS is code used by both qemu system emulation and qemu-img
 
-BLOCK_OBJS=cutils.o qemu-malloc.o
+BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o
 BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
 BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
 BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- qemu.spec	27 Apr 2009 14:25:54 -0000	1.87
+++ qemu.spec	27 Apr 2009 14:56:36 -0000	1.88
@@ -37,6 +37,9 @@
 # Disable preadv()/pwritev() until bug #497429 is fixed
 Patch07: qemu-disable-preadv.patch
 
+# Fix build on ppc; cutils.c needs cache-utils.c
+Patch08: qemu-add-cache-utils-to-block-objs.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -219,6 +222,7 @@
 %patch05 -p1 -b .virtio-blk-boot-on
 %patch06 -p1 -b .framebuffer-build-fix
 %patch07 -p1 -b .disable-preadv
+%patch08 -p1 -b .add-cache-utils-to-block-objs
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -465,6 +469,7 @@
 - Drop upstreamed patches
 - Fix missing kernel/include/asm symlink in upstream tarball
 - Fix target-arm build
+- Fix build on ppc
 - Disable preadv()/pwritev() until bug #497429 is fixed
 - Kill more .kernelrelease uselessness
 - Make non-kvm qemu build verbose



From spot at fedoraproject.org  Mon Apr 27 14:59:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 14:59:57 +0000 (UTC)
Subject: rpms/fuseiso/F-10 fuseiso.spec,1.4,1.5
Message-ID: <20090427145957.E07B470110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuseiso/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258/F-10

Modified Files:
	fuseiso.spec 
Log Message:
add explicit requires on fuse (bz 497681)


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/F-10/fuseiso.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuseiso.spec	12 Sep 2008 15:34:19 -0000	1.4
+++ fuseiso.spec	27 Apr 2009 14:59:27 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		fuseiso
 Summary: 	FUSE support for ISO filesystem images
 Version:	20070708
-Release:	4%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 URL:		http://fuse.sourceforge.net/wiki/index.php/FuseIso
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel, glib2-devel, zlib-devel
+Requires:	fuse
 
 %description
 Mount ISO filesystem images as a non-root user. Currently supports
@@ -37,6 +38,12 @@
 %{_bindir}/fuseiso
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 20070708-6
+- add explicit requires on fuse (bz 497681)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070708-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Apr  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20070708-4
 - handle larger than 4GB isos (thanks to Thomas Bittermann, resolves 
   bz440436)



From spot at fedoraproject.org  Mon Apr 27 14:59:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 14:59:58 +0000 (UTC)
Subject: rpms/fuseiso/devel fuseiso.spec,1.5,1.6
Message-ID: <20090427145958.B195B70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuseiso/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258/devel

Modified Files:
	fuseiso.spec 
Log Message:
add explicit requires on fuse (bz 497681)


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/devel/fuseiso.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuseiso.spec	24 Feb 2009 19:00:05 -0000	1.5
+++ fuseiso.spec	27 Apr 2009 14:59:28 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		fuseiso
 Summary: 	FUSE support for ISO filesystem images
 Version:	20070708
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 URL:		http://fuse.sourceforge.net/wiki/index.php/FuseIso
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel, glib2-devel, zlib-devel
+Requires:	fuse
 
 %description
 Mount ISO filesystem images as a non-root user. Currently supports
@@ -37,6 +38,9 @@
 %{_bindir}/fuseiso
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 20070708-6
+- add explicit requires on fuse (bz 497681)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070708-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Apr 27 14:59:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 14:59:58 +0000 (UTC)
Subject: rpms/fuseiso/F-11 fuseiso.spec,1.5,1.6
Message-ID: <20090427145958.324E270110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuseiso/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258/F-11

Modified Files:
	fuseiso.spec 
Log Message:
add explicit requires on fuse (bz 497681)


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/F-11/fuseiso.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuseiso.spec	24 Feb 2009 19:00:05 -0000	1.5
+++ fuseiso.spec	27 Apr 2009 14:59:27 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		fuseiso
 Summary: 	FUSE support for ISO filesystem images
 Version:	20070708
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 URL:		http://fuse.sourceforge.net/wiki/index.php/FuseIso
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel, glib2-devel, zlib-devel
+Requires:	fuse
 
 %description
 Mount ISO filesystem images as a non-root user. Currently supports
@@ -37,6 +38,9 @@
 %{_bindir}/fuseiso
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 20070708-6
+- add explicit requires on fuse (bz 497681)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070708-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Apr 27 14:59:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 14:59:58 +0000 (UTC)
Subject: rpms/fuseiso/F-9 fuseiso.spec,1.3,1.4
Message-ID: <20090427145958.722AA70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuseiso/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258/F-9

Modified Files:
	fuseiso.spec 
Log Message:
add explicit requires on fuse (bz 497681)


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/F-9/fuseiso.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuseiso.spec	3 Apr 2008 17:03:25 -0000	1.3
+++ fuseiso.spec	27 Apr 2009 14:59:28 -0000	1.4
@@ -1,14 +1,16 @@
 Name:		fuseiso
 Summary: 	FUSE support for ISO filesystem images
 Version:	20070708
-Release:	4%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
+# Upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1933445&group_id=215002&atid=1031924
 Patch0:		fuseiso-largeiso.patch
 URL:		http://fuse.sourceforge.net/wiki/index.php/FuseIso
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel, glib2-devel, zlib-devel
+Requires:	fuse
 
 %description
 Mount ISO filesystem images as a non-root user. Currently supports
@@ -36,6 +38,12 @@
 %{_bindir}/fuseiso
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 20070708-6
+- add explicit requires on fuse (bz 497681)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070708-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Apr  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20070708-4
 - handle larger than 4GB isos (thanks to Thomas Bittermann, resolves 
   bz440436)



From markmc at fedoraproject.org  Mon Apr 27 15:09:37 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 27 Apr 2009 15:09:37 +0000 (UTC)
Subject: rpms/qemu/devel qemu-add-cache-utils-to-block-objs.patch,1.1,1.2
Message-ID: <20090427150937.7F07170110@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29185

Modified Files:
	qemu-add-cache-utils-to-block-objs.patch 
Log Message:
Fix patch strip level


qemu-add-cache-utils-to-block-objs.patch:

Index: qemu-add-cache-utils-to-block-objs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-cache-utils-to-block-objs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-add-cache-utils-to-block-objs.patch	27 Apr 2009 14:56:36 -0000	1.1
+++ qemu-add-cache-utils-to-block-objs.patch	27 Apr 2009 15:09:35 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs ./qemu-kvm-devel-85/qemu/Makefile
---- ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs	2009-04-27 15:54:16.000000000 +0100
-+++ ./qemu-kvm-devel-85/qemu/Makefile	2009-04-27 15:53:51.000000000 +0100
+diff -up qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs qemu-kvm-devel-85/qemu/Makefile
+--- qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs	2009-04-27 15:54:16.000000000 +0100
++++ qemu-kvm-devel-85/qemu/Makefile	2009-04-27 15:53:51.000000000 +0100
 @@ -49,7 +49,7 @@ recurse-all: $(SUBDIR_RULES)
  #######################################################################
  # BLOCK_OBJS is code used by both qemu system emulation and qemu-img



From rdieter at fedoraproject.org  Mon Apr 27 15:14:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 15:14:05 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 kdegraphics.spec,1.196,1.197
Message-ID: <20090427151405.71C0F70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29836/F-11

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kdegraphics.spec	22 Apr 2009 12:21:37 -0000	1.196
+++ kdegraphics.spec	27 Apr 2009 15:13:34 -0000	1.197
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -52,6 +52,9 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+# used by okular
+Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Requires: cups
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
@@ -92,16 +95,19 @@
 %description devel
 %{summary}.
 
+%package -n kio_msits
+Group: System Environment/Libraries
+Summary: A kioslave for displaying WinHelp files 
+%description -n kio_msits
+%{summary}.
+
 
 %prep
 %setup -q -n kdegraphics-%{version}
 %patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
-# upstream patches
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -164,7 +170,8 @@
 %{_kde4_configdir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/camera.protocol
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -179,7 +186,6 @@
 %{_kde4_libdir}/kde4/ksaneplugin.so
 %endif
 %{_kde4_libdir}/kde4/kcm_kgamma.so
-%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -212,7 +218,6 @@
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %if ! 0%{?omit_kde3_conflicts}
@@ -229,8 +234,16 @@
 %{_kde4_appsdir}/cmake/modules/FindOkular.cmake
 %{_libdir}/pkgconfig/*.pc
 
+%files -n kio_msits
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kio_msits.so
+%{_kde4_datadir}/kde4/services/msits.protocol
+
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
+
 * Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - fix build issue on s390(x)
 



From rdieter at fedoraproject.org  Mon Apr 27 15:14:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 15:14:05 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.196,1.197
Message-ID: <20090427151405.A0BC570110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29836/devel

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kdegraphics.spec	22 Apr 2009 12:18:53 -0000	1.196
+++ kdegraphics.spec	27 Apr 2009 15:13:35 -0000	1.197
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -52,6 +52,9 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+# used by okular
+Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Requires: cups
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
@@ -92,16 +95,19 @@
 %description devel
 %{summary}.
 
+%package -n kio_msits
+Group: System Environment/Libraries
+Summary: A kioslave for displaying WinHelp files 
+%description -n kio_msits
+%{summary}.
+
 
 %prep
 %setup -q -n kdegraphics-%{version}
 %patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
-# upstream patches
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -164,7 +170,8 @@
 %{_kde4_configdir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/camera.protocol
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -179,7 +186,6 @@
 %{_kde4_libdir}/kde4/ksaneplugin.so
 %endif
 %{_kde4_libdir}/kde4/kcm_kgamma.so
-%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -212,7 +218,6 @@
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %if ! 0%{?omit_kde3_conflicts}
@@ -229,8 +234,16 @@
 %{_kde4_appsdir}/cmake/modules/FindOkular.cmake
 %{_libdir}/pkgconfig/*.pc
 
+%files -n kio_msits
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kio_msits.so
+%{_kde4_datadir}/kde4/services/msits.protocol
+
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
+
 * Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - fix build issue on s390(x)
 



From pkgdb at fedoraproject.org  Mon Apr 27 15:14:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 15:14:45 +0000
Subject: [pkgdb] kchmviewer ownership updated
Message-ID: <20090427151445.8006210F87D@bastion2.fedora.phx.redhat.com>

Package kchmviewer in Fedora devel is now owned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 15:14:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 15:14:46 +0000
Subject: [pkgdb] kchmviewer ownership updated
Message-ID: <20090427151446.3F4F510F898@bastion2.fedora.phx.redhat.com>

Package kchmviewer in Fedora devel was orphaned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 15:15:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 15:15:44 +0000
Subject: [pkgdb] kchmviewer ownership updated
Message-ID: <20090427151544.C64D410F899@bastion2.fedora.phx.redhat.com>

Package kchmviewer in Fedora 11 is now owned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 15:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 15:15:57 +0000
Subject: [pkgdb] kchmviewer ownership updated
Message-ID: <20090427151557.0D74110F85F@bastion2.fedora.phx.redhat.com>

Package kchmviewer in Fedora devel is now owned by rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From jkratoch at fedoraproject.org  Mon Apr 27 15:22:01 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 27 Apr 2009 15:22:01 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.3-gstack-20050411.patch, 1.4,
	1.5 gdb-6.3-gstack-without-path-20060414.patch, 1.2,
	1.3 gdb.spec, 1.345, 1.346
Message-ID: <20090427152201.D54D470110@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31783

Modified Files:
	gdb-6.3-gstack-20050411.patch 
	gdb-6.3-gstack-without-path-20060414.patch gdb.spec 
Log Message:
* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-22
- Fix pstack/gstack cutting very long lines (BZ 497849).


gdb-6.3-gstack-20050411.patch:

Index: gdb-6.3-gstack-20050411.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gstack-20050411.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdb-6.3-gstack-20050411.patch	2 Mar 2009 00:11:34 -0000	1.4
+++ gdb-6.3-gstack-20050411.patch	27 Apr 2009 15:22:01 -0000	1.5
@@ -67,7 +67,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ gdb-6.8.50.20090226/gdb/gstack.sh	2009-02-26 22:10:05.000000000 +0100
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,48 @@
 +#!/bin/sh
 +
 +if test $# -ne 1; then
@@ -107,6 +107,9 @@
 +
 +# Run GDB, strip out unwanted noise.
 +$GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
++set width 0
++set height 0
++set pagination no
 +$backtrace
 +EOF
 +sed -n \

gdb-6.3-gstack-without-path-20060414.patch:

Index: gdb-6.3-gstack-without-path-20060414.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gstack-without-path-20060414.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-gstack-without-path-20060414.patch	27 May 2006 07:34:28 -0000	1.2
+++ gdb-6.3-gstack-without-path-20060414.patch	27 Apr 2009 15:22:01 -0000	1.3
@@ -24,7 +24,7 @@
  if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
      readnever=--readnever
 @@ -39,7 +39,7 @@ fi
- $GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
+ set pagination no
  $backtrace
  EOF
 -sed -n \


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- gdb.spec	19 Apr 2009 14:36:39 -0000	1.345
+++ gdb.spec	27 Apr 2009 15:22:01 -0000	1.346
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 21%{?_with_upstream:.upstream}%{?dist}
+Release: 22%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -861,6 +861,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-22
+- Fix pstack/gstack cutting very long lines (BZ 497849).
+
 * Sun Apr 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-21
 - New test for parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187).
 



From kkofler at fedoraproject.org  Mon Apr 27 15:27:52 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 27 Apr 2009 15:27:52 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,
	1.3, 1.4
Message-ID: <20090427152752.18B4370110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32639/devel

Modified Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch 
Log Message:
Also readd second hunk of the patch, probably still needed.

qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

Index: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	27 Apr 2009 14:10:54 -0000	1.3
+++ qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	27 Apr 2009 15:27:21 -0000	1.4
@@ -10,3 +10,12 @@
  #define QT_USE_FREETYPE_LCDFILTER
  #endif
  
+@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
+             Q_ASSERT(antialias);
+             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
+             bool useLegacyLcdFilter = false;
+-#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
++#if defined(FT_LCD_FILTER_H)
+             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
+ #endif
+             uchar *buffer = bitmap.buffer;



From kkofler at fedoraproject.org  Mon Apr 27 15:30:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 27 Apr 2009 15:30:54 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.269,1.270
Message-ID: <20090427153054.2971970110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv568/devel

Modified Files:
	qt.spec 
Log Message:
Remove the changelog entry as -6 didn't actually change anything (the patch just got dropped and readded), clarify the changelog entry for -3.


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- qt.spec	27 Apr 2009 14:13:54 -0000	1.269
+++ qt.spec	27 Apr 2009 15:30:23 -0000	1.270
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 6%{?dist}
+Release: 5%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -820,9 +820,6 @@
 
 
 %changelog
-* Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
-- enable Freetype subpixel rendering at compile time  
-
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
 - -devel: Provides: *-static for libQtUiTools.a
 
@@ -833,7 +830,7 @@
 - drop unused profile.d bits
 
 * Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
-- enable FT_LCD_FILTER
+- enable FT_LCD_FILTER (uses freetype subpixel filters if available at runtime)
 
 * Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
 - apply upstream patch to fix the svg rendering regression



From rdieter at fedoraproject.org  Mon Apr 27 15:36:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 15:36:37 +0000 (UTC)
Subject: rpms/kchmviewer/devel kchmviewer-4.0-no_msits.patch, NONE,
	1.1 kchmviewer.spec, 1.20, 1.21
Message-ID: <20090427153637.9340E70129@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1261/devel

Modified Files:
	kchmviewer.spec 
Added Files:
	kchmviewer-4.0-no_msits.patch 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
- fix conflicts with kdegraphics (#484861)
- optmize scriptlets
- ship only hicolor icons 
- cleanup, use kde4-macros


kchmviewer-4.0-no_msits.patch:

--- NEW FILE kchmviewer-4.0-no_msits.patch ---
diff -up kchmviewer-4.0/CMakeLists.txt.no_msits kchmviewer-4.0/CMakeLists.txt
--- kchmviewer-4.0/CMakeLists.txt.no_msits	2008-12-01 20:31:22.000000000 -0600
+++ kchmviewer-4.0/CMakeLists.txt	2009-04-27 10:23:02.371525695 -0500
@@ -18,6 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
 
 # Run in those subdirectories
 ADD_SUBDIRECTORY( lib/libchmfile )
-ADD_SUBDIRECTORY( lib/kio-msits )
+#ADD_SUBDIRECTORY( lib/kio-msits )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kchmviewer.spec	25 Feb 2009 10:23:20 -0000	1.20
+++ kchmviewer.spec	27 Apr 2009 15:36:07 -0000	1.21
@@ -1,7 +1,8 @@
+
 Name:           kchmviewer
 Version:        4.0
-Release:        3%{?dist}
-Summary:        CHM viewer with Qt support
+Release:        4%{?dist}
+Summary:        CHM viewer
 
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -10,27 +11,26 @@
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel chmlib-devel
-BuildRequires:  desktop-file-utils kdelibs4-devel
-# for the %%cmake_kde4 macro (it is also a kdelibs4 dependency)
-# BuildRequires:  kde-filesystem
-
-# for directories owning
-Requires:       kde-filesystem
-# for the crystalsvg directory owning.
-# in F10 owned by kdelibs3, hopefully this will change in the future.
-Requires:       %{_datadir}/icons/crystalsvg
+Patch1: kchmviewer-4.0-no_msits.patch
+
+BuildRequires:  chmlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+
+Requires: kio_msits
 
 %description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
-It uses the Qt widget library. 
-#It is compiled with full KDE support, including KDE widgets 
-#and KIO/KHTML.
+KchmViewer is a chm (MS HTML help file format) viewer.
 
 
 %prep
 %setup -q -n kchmviewer-%{version}
 
+%patch1 -p1 -b .no_msits
+
+#chmod -x lib/kio-msits/msits.*
+
 # don't know what the encoding is. The strange character sequence is
 # <EF><BF><BD>, which could be in utf8 U-0000FFFD, a boundary condition
 # http://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
@@ -38,42 +38,28 @@
 #touch -r FAQ FAQ.utf8
 #mv FAQ.utf8 FAQ
 
-chmod -x lib/kio-msits/msits.*
-
 
 %build
-%cmake_kde4 .
-# with qmake-qt4 install is done by hand, and without kde4 support.
-#qmake-qt4
-make VERBOSE=1 
-#%{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_bindir}
-#install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
-
-# not installed in the default case in hicolor, only in crystalsvg.
-for r in 48 64 128; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
-  install -p -m644 src/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
-done
-
-# let the application do it itself
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --vendor fedora                            \
-#        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-#        src/kde/kchmviewer.desktop
+rm -rf $RPM_BUILD_ROOT 
 
-#        --delete-original                                    \
-#        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
+# make icons available for all themes/desktops
+mv $RPM_BUILD_ROOT%{_kde4_iconsdir}/crystalsvg \
+   $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor
 
 
-#%%find_lang %{name}
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
 
 
 %clean
@@ -81,34 +67,36 @@
 
 
 %post
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files
 # -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
-%{_bindir}/kchmviewer
-%{_datadir}/applications/kde4/*.desktop
-#%{_datadir}/applications/*.desktop
-%{_libdir}/kde4/kio_msits.so
-%{_datadir}/kde4/services/msits.protocol
-%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{_datadir}/icons/hicolor/*/apps/kchmviewer.png
+%{_kde4_bindir}/kchmviewer
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kchmviewer.*
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
+- fix conflicts with kdegraphics (#484861)
+- optmize scriptlets
+- ship only hicolor icons 
+- cleanup, use kde4-macros
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Apr 27 15:36:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 15:36:37 +0000 (UTC)
Subject: rpms/kchmviewer/F-11 kchmviewer-4.0-no_msits.patch, NONE,
	1.1 kchmviewer.spec, 1.20, 1.21
Message-ID: <20090427153637.6E9B370110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1261/F-11

Modified Files:
	kchmviewer.spec 
Added Files:
	kchmviewer-4.0-no_msits.patch 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
- fix conflicts with kdegraphics (#484861)
- optmize scriptlets
- ship only hicolor icons 
- cleanup, use kde4-macros


kchmviewer-4.0-no_msits.patch:

--- NEW FILE kchmviewer-4.0-no_msits.patch ---
diff -up kchmviewer-4.0/CMakeLists.txt.no_msits kchmviewer-4.0/CMakeLists.txt
--- kchmviewer-4.0/CMakeLists.txt.no_msits	2008-12-01 20:31:22.000000000 -0600
+++ kchmviewer-4.0/CMakeLists.txt	2009-04-27 10:23:02.371525695 -0500
@@ -18,6 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
 
 # Run in those subdirectories
 ADD_SUBDIRECTORY( lib/libchmfile )
-ADD_SUBDIRECTORY( lib/kio-msits )
+#ADD_SUBDIRECTORY( lib/kio-msits )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/F-11/kchmviewer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kchmviewer.spec	25 Feb 2009 10:23:20 -0000	1.20
+++ kchmviewer.spec	27 Apr 2009 15:36:07 -0000	1.21
@@ -1,7 +1,8 @@
+
 Name:           kchmviewer
 Version:        4.0
-Release:        3%{?dist}
-Summary:        CHM viewer with Qt support
+Release:        4%{?dist}
+Summary:        CHM viewer
 
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -10,27 +11,26 @@
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel chmlib-devel
-BuildRequires:  desktop-file-utils kdelibs4-devel
-# for the %%cmake_kde4 macro (it is also a kdelibs4 dependency)
-# BuildRequires:  kde-filesystem
-
-# for directories owning
-Requires:       kde-filesystem
-# for the crystalsvg directory owning.
-# in F10 owned by kdelibs3, hopefully this will change in the future.
-Requires:       %{_datadir}/icons/crystalsvg
+Patch1: kchmviewer-4.0-no_msits.patch
+
+BuildRequires:  chmlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+
+Requires: kio_msits
 
 %description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
-It uses the Qt widget library. 
-#It is compiled with full KDE support, including KDE widgets 
-#and KIO/KHTML.
+KchmViewer is a chm (MS HTML help file format) viewer.
 
 
 %prep
 %setup -q -n kchmviewer-%{version}
 
+%patch1 -p1 -b .no_msits
+
+#chmod -x lib/kio-msits/msits.*
+
 # don't know what the encoding is. The strange character sequence is
 # <EF><BF><BD>, which could be in utf8 U-0000FFFD, a boundary condition
 # http://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
@@ -38,42 +38,28 @@
 #touch -r FAQ FAQ.utf8
 #mv FAQ.utf8 FAQ
 
-chmod -x lib/kio-msits/msits.*
-
 
 %build
-%cmake_kde4 .
-# with qmake-qt4 install is done by hand, and without kde4 support.
-#qmake-qt4
-make VERBOSE=1 
-#%{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_bindir}
-#install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
-
-# not installed in the default case in hicolor, only in crystalsvg.
-for r in 48 64 128; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
-  install -p -m644 src/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
-done
-
-# let the application do it itself
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --vendor fedora                            \
-#        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-#        src/kde/kchmviewer.desktop
+rm -rf $RPM_BUILD_ROOT 
 
-#        --delete-original                                    \
-#        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
+# make icons available for all themes/desktops
+mv $RPM_BUILD_ROOT%{_kde4_iconsdir}/crystalsvg \
+   $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor
 
 
-#%%find_lang %{name}
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
 
 
 %clean
@@ -81,34 +67,36 @@
 
 
 %post
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files
 # -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
-%{_bindir}/kchmviewer
-%{_datadir}/applications/kde4/*.desktop
-#%{_datadir}/applications/*.desktop
-%{_libdir}/kde4/kio_msits.so
-%{_datadir}/kde4/services/msits.protocol
-%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{_datadir}/icons/hicolor/*/apps/kchmviewer.png
+%{_kde4_bindir}/kchmviewer
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kchmviewer.*
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
+- fix conflicts with kdegraphics (#484861)
+- optmize scriptlets
+- ship only hicolor icons 
+- cleanup, use kde4-macros
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kkofler at fedoraproject.org  Mon Apr 27 15:39:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 27 Apr 2009 15:39:03 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,
	1.4, 1.5 qt.spec, 1.270, 1.271
Message-ID: <20090427153903.D9CA070110@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1645/devel

Modified Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch qt.spec 
Log Message:
And remove the second hunk again, Than ensures me it's not needed, sorry for the repeated reversions.

qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

Index: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	27 Apr 2009 15:27:21 -0000	1.4
+++ qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	27 Apr 2009 15:39:03 -0000	1.5
@@ -10,12 +10,3 @@
  #define QT_USE_FREETYPE_LCDFILTER
  #endif
  
-@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
-             Q_ASSERT(antialias);
-             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
-             bool useLegacyLcdFilter = false;
--#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
-+#if defined(FT_LCD_FILTER_H)
-             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
- #endif
-             uchar *buffer = bitmap.buffer;


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- qt.spec	27 Apr 2009 15:30:23 -0000	1.270
+++ qt.spec	27 Apr 2009 15:39:03 -0000	1.271
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -820,6 +820,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
+- drop useless hunk of qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
 - -devel: Provides: *-static for libQtUiTools.a
 



From rdieter at fedoraproject.org  Mon Apr 27 15:43:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 15:43:53 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 kdegraphics.spec,1.197,1.198
Message-ID: <20090427154353.5EED970110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2215/F-11

Modified Files:
	kdegraphics.spec 
Log Message:
fixup %%files



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- kdegraphics.spec	27 Apr 2009 15:13:34 -0000	1.197
+++ kdegraphics.spec	27 Apr 2009 15:43:23 -0000	1.198
@@ -172,6 +172,7 @@
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/camera.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/



From rdieter at fedoraproject.org  Mon Apr 27 15:43:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 15:43:53 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.197,1.198
Message-ID: <20090427154353.B970870110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2215/devel

Modified Files:
	kdegraphics.spec 
Log Message:
fixup %%files



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- kdegraphics.spec	27 Apr 2009 15:13:35 -0000	1.197
+++ kdegraphics.spec	27 Apr 2009 15:43:23 -0000	1.198
@@ -172,6 +172,7 @@
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/camera.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/



From jussilehtola at fedoraproject.org  Mon Apr 27 15:44:08 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 27 Apr 2009 15:44:08 +0000 (UTC)
Subject: rpms/latex2rtf/F-11 latex2rtf-imgh.patch, NONE, 1.1 latex2rtf.spec, 
	1.4, 1.5
Message-ID: <20090427154408.96DD470110@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/latex2rtf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2319/F-11

Modified Files:
	latex2rtf.spec 
Added Files:
	latex2rtf-imgh.patch 
Log Message:
Add patch to F-11 branch too.


latex2rtf-imgh.patch:

--- NEW FILE latex2rtf-imgh.patch ---
Fix wrong height of pictures on x86_64

On 64-bit Fedora latex2rtf produced RTFs with insanely large pictures.
The dimensions of a PNG are stored in the header as 4-byte values.
GetPngSize() reads them as consecutive unsigned longs.
The problem is that sizeof(unsigned long) != 4 bytes. It's 8 bytes on
x86_64 Linux.
Use standard ISO C uint32_t instead.
With this patch the figures have their normal size.

Index: graphics.c
===================================================================
--- graphics.c	(revision 894)
+++ graphics.c	(working copy)
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #ifdef UNIX
 #include <unistd.h>
 #endif
@@ -755,7 +756,7 @@
 
 static unsigned char * getPngChunk(FILE *fp, char *s)
 {
-	unsigned long size, crc;
+	uint32_t size, crc;
 	char head[5];
 	unsigned char *data;
 	
@@ -777,7 +778,7 @@
 
 		if (strcmp(head,"IEND") == 0) return NULL;
 		
-		diagnostics(6,"found chunk '%s' size %ld bytes",head,size);
+		diagnostics(6,"found chunk '%s' size %ld bytes",head,(unsigned long)size);
 		data = malloc(size);
 		if (data == NULL) return NULL;
 		
@@ -798,7 +799,7 @@
 static void GetPngSize(char *s, unsigned long *w, unsigned long *h, unsigned long *xres, unsigned long *yres, int *bad_res)
 {
     FILE *fp;
-    unsigned long *p;
+    uint32_t *p;
     unsigned char buffer[16];
     char reftag[9] = "\211PNG\r\n\032\n";
     unsigned char *data = NULL;
@@ -833,7 +834,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*w = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*h = (g_little_endian) ? LETONL(*p) : *p;
@@ -846,7 +847,7 @@
         return;
 	}
 
-	p = (unsigned long *) data;	
+	p = (uint32_t *) data;
 	*xres = (g_little_endian) ? LETONL(*p) : *p;
 	p++;
 	*yres = (g_little_endian) ? LETONL(*p) : *p;


Index: latex2rtf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/F-11/latex2rtf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- latex2rtf.spec	24 Mar 2009 22:22:18 -0000	1.4
+++ latex2rtf.spec	27 Apr 2009 15:43:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		latex2rtf
 Version:	1.9.19
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	LaTeX to RTF converter that handles equations, figures, and cross-references
 Group:		Applications/File
 License:	GPLv2+
@@ -8,6 +8,9 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Patch to makefile changing man and info file locations and compiler flags
 Patch0:		latex2rtf.patch
+# Patch to fix wrong height of images on 64-bit architectures
+# Bug https://bugzilla.redhat.com/attachment.cgi?id=341372
+Patch1:		latex2rtf-imgh.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For running the tests
@@ -33,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 chmod a-x cfg/*.cfg
 
 %build
@@ -80,8 +84,13 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
+- Added patch to fix image height on 64-bit architectures.
+  https://bugzilla.redhat.com/show_bug.cgi?id=497752
+
 * Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-7
-- Retry EPEL fix: disable check phase which doesn't seem to work for some reason on EPEL 5 ppc (segfault in list.tex).
+- Retry EPEL fix: disable check phase which doesn't seem to work 
+  for some reason on EPEL 5 ppc (segfault in list.tex).
 
 * Sun Mar 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-6
 - Fix EPEL build.



From twaugh at fedoraproject.org  Mon Apr 27 15:42:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 27 Apr 2009 15:42:17 +0000 (UTC)
Subject: rpms/cups/F-10 cups.spec,1.460,1.461
Message-ID: <20090427154217.2A1DA70110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1965

Modified Files:
	cups.spec 
Log Message:
* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
- Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
  (part of bug #497301).  The default cupsd.conf now includes this
  line as well.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- cups.spec	26 Apr 2009 12:19:29 -0000	1.460
+++ cups.spec	27 Apr 2009 15:41:46 -0000	1.461
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 2%{?svn:.svn%{svn}}%{?dist}
+Release: 3%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -292,6 +292,16 @@
 # Handle https:// device URIs (bug #478677, STR #3122).
 ln -s ipp $RPM_BUILD_ROOT%{cups_serverbin}/backend/https
 
+# Disable Host: checking by default for compatibility.  The
+# ServerAlias directive was added in 1.3.10.
+cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd.conf
+
+# You should list each hostname alias used for this server so that it
+# can verify the correct name is used for it.  Using "ServerAlias *"
+# disables checking.
+ServerAlias *
+EOF
+
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -353,6 +363,21 @@
 fi
 exit 0
 
+%triggerpostun -- %{name} < 1:1.3.10-3
+if [ "$1" -gt 0 ]; then
+    CONF=%{_sysconfdir}/cups/cupsd.conf
+    if ! grep -q ServerAlias "$CONF"; then
+        cp -a "$CONF" "$CONF".rpmorig
+        cat <<"EOF" >> "$CONF"
+
+# You should list each hostname alias used for this server so that it
+# can verify the correct name is used for it.  Using "ServerAlias *"
+# disables checking.
+ServerAlias *
+EOF
+    fi
+fi
+
 %triggerin -- samba-client
 ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || :
 exit 0
@@ -480,6 +505,11 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
+- Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
+  (part of bug #497301).  The default cupsd.conf now includes this
+  line as well.
+
 * Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
 - Accept "Host: ::1" (bug #497393).
 - Accept Host: fields set to the ServerName value (bug #497301).



From twaugh at fedoraproject.org  Mon Apr 27 15:46:37 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 27 Apr 2009 15:46:37 +0000 (UTC)
Subject: rpms/cups/F-9 cups.spec,1.440,1.441
Message-ID: <20090427154637.5046470110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2761

Modified Files:
	cups.spec 
Log Message:
* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
- Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
  (part of bug #497301).  The default cupsd.conf now includes this
  line as well.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- cups.spec	26 Apr 2009 12:24:27 -0000	1.440
+++ cups.spec	27 Apr 2009 15:46:06 -0000	1.441
@@ -267,6 +267,16 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
 ln -s ../../ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
 
+# Disable Host: checking by default for compatibility.  The
+# ServerAlias directive was added in 1.3.10.
+cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd.conf
+
+# You should list each hostname alias used for this server so that it
+# can verify the correct name is used for it.  Using "ServerAlias *"
+# disables checking.
+ServerAlias *
+EOF
+
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -328,6 +338,21 @@
 fi
 exit 0
 
+%triggerpostun -- %{name} < 1:1.3.10-3
+if [ "$1" -gt 0 ]; then
+    CONF=%{_sysconfdir}/cups/cupsd.conf
+    if ! grep -q ServerAlias "$CONF"; then
+        cp -a "$CONF" "$CONF".rpmorig
+        cat <<"EOF" >> "$CONF"
+
+# You should list each hostname alias used for this server so that it
+# can verify the correct name is used for it.  Using "ServerAlias *"
+# disables checking.
+ServerAlias *
+EOF
+    fi
+fi
+
 %triggerin -- samba-client
 ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || :
 exit 0
@@ -451,6 +476,11 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
+- Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
+  (part of bug #497301).  The default cupsd.conf now includes this
+  line as well.
+
 * Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
 - Accept "Host: ::1" (bug #497393).
 - Accept Host: fields set to the ServerName value (bug #497301).



From nbecker at fedoraproject.org  Mon Apr 27 15:47:11 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon, 27 Apr 2009 15:47:11 +0000 (UTC)
Subject: rpms/igraph/devel .cvsignore, 1.5, 1.6 igraph.spec, 1.25,
	1.26 sources, 1.6, 1.7
Message-ID: <20090427154711.9D2BC70110@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2941

Modified Files:
	.cvsignore igraph.spec sources 
Log Message:
Update to 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Nov 2008 15:10:55 -0000	1.5
+++ .cvsignore	27 Apr 2009 15:46:41 -0000	1.6
@@ -1 +1 @@
-igraph-0.5.1.tar.gz
+igraph_0.5.2.tar.gz


Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/igraph.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- igraph.spec	26 Feb 2009 19:31:04 -0000	1.25
+++ igraph.spec	27 Apr 2009 15:46:41 -0000	1.26
@@ -1,12 +1,12 @@
 Name:		igraph
-Version:	0.5.1
-Release:	6%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://cneurocvs.rmki.kfki.hu/igraph
-Source0:	http://igraph.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:	http://igraph.googlecode.com/files/%{name}_%{version}.tar.gz
 #Patch1:		igraph-cstdlib.patch
 #Patch2:		igraph-test.patch
 # Needed for gcc-4.4
@@ -95,6 +95,9 @@
 make check
 
 %changelog
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
+- Update to 0.5.2
+
 * Thu Feb 26 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-6
 - Make that 0.5.1-6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Nov 2008 15:10:56 -0000	1.6
+++ sources	27 Apr 2009 15:46:41 -0000	1.7
@@ -1 +1 @@
-19f9c193fc7c8b88a0e8d98aef9f9bb5  igraph-0.5.1.tar.gz
+75ccd63731e4e1ef258ad65631783439  igraph_0.5.2.tar.gz



From twaugh at fedoraproject.org  Mon Apr 27 15:47:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 27 Apr 2009 15:47:43 +0000 (UTC)
Subject: rpms/cups/F-9 cups.spec,1.441,1.442
Message-ID: <20090427154743.5048770110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3071

Modified Files:
	cups.spec 
Log Message:
1:1.3.10-3.fc9


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- cups.spec	27 Apr 2009 15:46:06 -0000	1.441
+++ cups.spec	27 Apr 2009 15:47:13 -0000	1.442
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 2%{?svn:.svn%{svn}}%{?dist}
+Release: 3%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2



From katzj at fedoraproject.org  Mon Apr 27 15:53:22 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Mon, 27 Apr 2009 15:53:22 +0000 (UTC)
Subject: rpms/mkinitrd/F-11 .cvsignore, 1.222, 1.223 mkinitrd.spec, 1.316,
	1.317 sources, 1.264, 1.265
Message-ID: <20090427155322.36E3B70110@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/mkinitrd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4525

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Mon Apr 27 2009 Jeremy Katz <katzj at redhat.com> - 6.0.83-1
- Fix up syntax error in udev rules for live image (#497762)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-11/.cvsignore,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- .cvsignore	16 Apr 2009 20:11:56 -0000	1.222
+++ .cvsignore	27 Apr 2009 15:52:51 -0000	1.223
@@ -1 +1 @@
-mkinitrd-6.0.82.tar.bz2
+mkinitrd-6.0.83.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-11/mkinitrd.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- mkinitrd.spec	16 Apr 2009 20:11:56 -0000	1.316
+++ mkinitrd.spec	27 Apr 2009 15:52:51 -0000	1.317
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.82
+Version: 6.0.83
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -136,6 +136,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Mon Apr 27 2009 Jeremy Katz <katzj at redhat.com> - 6.0.83-1
+- Fix up syntax error in udev rules for live image (#497762)
+
 * Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 6.0.82-1
 - Don't show live snapshot dev with devkit-disks (#495170)
 - grubby: Don't crash showing "other" sections (hans, #491622)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-11/sources,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- sources	16 Apr 2009 20:11:56 -0000	1.264
+++ sources	27 Apr 2009 15:52:51 -0000	1.265
@@ -1 +1 @@
-7ef6f036e514a53cc050f1976942c8b1  mkinitrd-6.0.82.tar.bz2
+1997ef7f5ca4d6576fc6e98fb4b648ce  mkinitrd-6.0.83.tar.bz2



From twaugh at fedoraproject.org  Mon Apr 27 15:57:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 27 Apr 2009 15:57:44 +0000 (UTC)
Subject: rpms/cups/F-9 cups.spec,1.442,1.443
Message-ID: <20090427155744.757D770110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5238

Modified Files:
	cups.spec 
Log Message:
Better grep pattern for ServerAlias.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- cups.spec	27 Apr 2009 15:47:13 -0000	1.442
+++ cups.spec	27 Apr 2009 15:57:14 -0000	1.443
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 3%{?svn:.svn%{svn}}%{?dist}
+Release: 4%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -341,7 +341,7 @@
 %triggerpostun -- %{name} < 1:1.3.10-3
 if [ "$1" -gt 0 ]; then
     CONF=%{_sysconfdir}/cups/cupsd.conf
-    if ! grep -q ServerAlias "$CONF"; then
+    if ! grep -qiw ServerAlias "$CONF"; then
         cp -a "$CONF" "$CONF".rpmorig
         cat <<"EOF" >> "$CONF"
 
@@ -476,7 +476,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
+* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-4
 - Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
   (part of bug #497301).  The default cupsd.conf now includes this
   line as well.



From mjakubicek at fedoraproject.org  Mon Apr 27 15:57:49 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 15:57:49 +0000 (UTC)
Subject: rpms/jakarta-commons-el/F-11 jakarta-commons-el.spec,1.43,1.44
Message-ID: <20090427155749.7717870110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/jakarta-commons-el/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5219/F-11

Modified Files:
	jakarta-commons-el.spec 
Log Message:
- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).




Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-el/F-11/jakarta-commons-el.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jakarta-commons-el.spec	25 Feb 2009 08:44:02 -0000	1.43
+++ jakarta-commons-el.spec	27 Apr 2009 15:57:19 -0000	1.44
@@ -39,7 +39,7 @@
 
 Name:           jakarta-commons-el
 Version:        1.0
-Release:        10.4%{?dist}
+Release:        10.5%{?dist}
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        ASL 1.1
@@ -58,6 +58,7 @@
 BuildRequires:  jsp
 BuildRequires:  servletapi5
 BuildRequires:  junit
+BuildRequires:	tomcat5-jsp-2.0-api
 
 %if %{gcj_support}
 BuildRequires:          java-gcj-compat-devel
@@ -179,6 +180,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.0-10.5
+- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-10.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Mon Apr 27 15:57:49 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 15:57:49 +0000 (UTC)
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.43,1.44
Message-ID: <20090427155749.B9CA370110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/jakarta-commons-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5219/devel

Modified Files:
	jakarta-commons-el.spec 
Log Message:
- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).




Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jakarta-commons-el.spec	25 Feb 2009 08:44:02 -0000	1.43
+++ jakarta-commons-el.spec	27 Apr 2009 15:57:19 -0000	1.44
@@ -39,7 +39,7 @@
 
 Name:           jakarta-commons-el
 Version:        1.0
-Release:        10.4%{?dist}
+Release:        10.5%{?dist}
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        ASL 1.1
@@ -58,6 +58,7 @@
 BuildRequires:  jsp
 BuildRequires:  servletapi5
 BuildRequires:  junit
+BuildRequires:	tomcat5-jsp-2.0-api
 
 %if %{gcj_support}
 BuildRequires:          java-gcj-compat-devel
@@ -179,6 +180,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.0-10.5
+- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-10.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Apr 27 15:58:12 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 27 Apr 2009 15:58:12 +0000 (UTC)
Subject: rpms/cups/F-10 cups.spec,1.461,1.462
Message-ID: <20090427155812.E482970110@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	cups.spec 
Log Message:
Better grep pattern for ServerAlias.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- cups.spec	27 Apr 2009 15:41:46 -0000	1.461
+++ cups.spec	27 Apr 2009 15:57:42 -0000	1.462
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 3%{?svn:.svn%{svn}}%{?dist}
+Release: 4%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -55,7 +55,7 @@
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-PreReq: /sbin/chkconfig /sbin/service
+PreReq: /sbin/chkconfig /sbin/service /bin/grep
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %if %use_alternatives
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
@@ -366,7 +366,7 @@
 %triggerpostun -- %{name} < 1:1.3.10-3
 if [ "$1" -gt 0 ]; then
     CONF=%{_sysconfdir}/cups/cupsd.conf
-    if ! grep -q ServerAlias "$CONF"; then
+    if ! grep -qiw ServerAlias "$CONF"; then
         cp -a "$CONF" "$CONF".rpmorig
         cat <<"EOF" >> "$CONF"
 
@@ -505,7 +505,7 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
+* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-4
 - Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
   (part of bug #497301).  The default cupsd.conf now includes this
   line as well.



From rdieter at fedoraproject.org  Mon Apr 27 16:03:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 16:03:52 +0000 (UTC)
Subject: rpms/kchmviewer/devel kchmviewer.spec,1.21,1.22
Message-ID: <20090427160352.60D6E70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6162

Modified Files:
	kchmviewer.spec 
Log Message:
restore the fixed permissions (though mostly harmless, they're not installed anymore)



Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kchmviewer.spec	27 Apr 2009 15:36:07 -0000	1.21
+++ kchmviewer.spec	27 Apr 2009 16:03:22 -0000	1.22
@@ -29,7 +29,7 @@
 
 %patch1 -p1 -b .no_msits
 
-#chmod -x lib/kio-msits/msits.*
+chmod -x lib/kio-msits/msits.*
 
 # don't know what the encoding is. The strange character sequence is
 # <EF><BF><BD>, which could be in utf8 U-0000FFFD, a boundary condition



From nbecker at fedoraproject.org  Mon Apr 27 16:05:55 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon, 27 Apr 2009 16:05:55 +0000 (UTC)
Subject: rpms/igraph/devel igraph.spec,1.26,1.27
Message-ID: <20090427160555.81B8C70110@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6474

Modified Files:
	igraph.spec 
Log Message:
Try not applying patch #3



Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/igraph.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- igraph.spec	27 Apr 2009 15:46:41 -0000	1.26
+++ igraph.spec	27 Apr 2009 16:05:25 -0000	1.27
@@ -10,7 +10,7 @@
 #Patch1:		igraph-cstdlib.patch
 #Patch2:		igraph-test.patch
 # Needed for gcc-4.4
-Patch3:		igraph-cstdio.patch
+#Patch3:		igraph-cstdio.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libxml2-devel
@@ -38,10 +38,10 @@
 documentation needed to develop application with %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 #%patch1 -p1
 #%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 
 %build
 %configure
@@ -97,6 +97,7 @@
 %changelog
 * Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
 - Update to 0.5.2
+- Try not applying patch #3
 
 * Thu Feb 26 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-6
 - Make that 0.5.1-6



From rdieter at fedoraproject.org  Mon Apr 27 16:07:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 16:07:23 +0000 (UTC)
Subject: rpms/kchmviewer/devel kchmviewer.spec,1.22,1.23
Message-ID: <20090427160723.11F5170110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6821

Modified Files:
	kchmviewer.spec 
Log Message:
typo



Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kchmviewer.spec	27 Apr 2009 16:03:22 -0000	1.22
+++ kchmviewer.spec	27 Apr 2009 16:06:52 -0000	1.23
@@ -93,7 +93,7 @@
 %changelog
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
 - fix conflicts with kdegraphics (#484861)
-- optmize scriptlets
+- optimize scriptlets
 - ship only hicolor icons 
 - cleanup, use kde4-macros
 



From mjakubicek at fedoraproject.org  Mon Apr 27 16:07:53 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 16:07:53 +0000 (UTC)
Subject: rpms/trousers/F-11 trousers-0.3.1-gcc44.patch, NONE,
	1.1 trousers.spec, 1.13, 1.14
Message-ID: <20090427160753.7DC2270110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/trousers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6892/F-11

Modified Files:
	trousers.spec 
Added Files:
	trousers-0.3.1-gcc44.patch 
Log Message:
- Fix FTBFS: added trousers-0.3.1-gcc44.patch



trousers-0.3.1-gcc44.patch:

--- NEW FILE trousers-0.3.1-gcc44.patch ---
--- tools/ps_convert.c.orig	2009-04-27 16:33:31.000000000 +0200
+++ tools/ps_convert.c	2009-04-27 16:33:53.000000000 +0200
@@ -136,13 +136,14 @@
 version_0_convert(FILE *in, FILE *out)
 {
 	int rc, members = 0;
-	UINT32 i, u32 = *(UINT32 *)buf;
+	UINT32 i;
+	UINT32 *u32 = (UINT32 *) &buf;
 
 	/* output the PS version */
 	OUT(out, "\1", 1);
 
 	/* number of keys */
-	OUT(out, &u32, sizeof(UINT32));
+	OUT(out, u32, sizeof(UINT32));
 
 	/* The +- 1's below account for the byte we read in to determine
 	 * if the PS file had a version byte at the beginning */
@@ -163,7 +163,7 @@
 		return -1;
 	}
 
-	for (i = 1; i < u32; i++) {
+	for (i = 1; i < *u32; i++) {
 		/* read in subsequent key's headers */
 		if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
 					1, in)) != 1) {
--- tools/ps_inspect.c.orig	2009-04-27 17:49:46.000000000 +0200
+++ tools/ps_inspect.c	2009-04-27 17:51:52.000000000 +0200
@@ -179,10 +179,11 @@
 version_0_print(FILE *f)
 {
 	int rc, members = 0;
-	UINT32 i, u32 = *(UINT32 *)buf;
+	UINT32 i;
+	UINT32 *u32 = (UINT32 *) &buf;
 
 	PRINT("version:        0\n");
-	PRINT("number of keys: %u\n", u32);
+	PRINT("number of keys: %u\n", *u32);
 
 	/* The +- 1's below account for the byte we read in to determine
 	 * if the PS file had a version byte at the beginning */
@@ -203,7 +204,7 @@
 		return -1;
 	}
 
-	for (i = 1; i < u32; i++) {
+	for (i = 1; i < *u32; i++) {
 		/* read in subsequent key's headers */
 		if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
 					1, f)) != 1) {


Index: trousers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trousers/F-11/trousers.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- trousers.spec	25 Feb 2009 21:56:48 -0000	1.13
+++ trousers.spec	27 Apr 2009 16:07:23 -0000	1.14
@@ -3,7 +3,7 @@
 
 %define name		trousers
 %define version		0.3.1
-%define release		14
+%define release		15
 
 Name:			%{name}
 Summary:		TCG's Software Stack v1.2 
@@ -29,6 +29,9 @@
 Patch4:			trousers-0.3.1-workaround-selinux-namespace-pollution.patch
 Patch5:			trousers-0.3.1-reuseaddr.patch
 Patch6:			trousers-0.3.1-use-tpm-emu.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2782253&group_id=126012&atid=704358
+Patch7:			trousers-0.3.1-gcc44.patch
 
 %description
 TrouSerS is an implementation of the Trusted Computing Group's Software Stack
@@ -66,10 +69,11 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7
 
 %build
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -131,6 +135,9 @@
 %{_libdir}/libtddl.a
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.1-15
+- Fix FTBFS: added trousers-0.3.1-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Mon Apr 27 16:07:53 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 27 Apr 2009 16:07:53 +0000 (UTC)
Subject: rpms/trousers/devel trousers-0.3.1-gcc44.patch, NONE,
	1.1 trousers.spec, 1.13, 1.14
Message-ID: <20090427160753.B70A670110@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/trousers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6892/devel

Modified Files:
	trousers.spec 
Added Files:
	trousers-0.3.1-gcc44.patch 
Log Message:
- Fix FTBFS: added trousers-0.3.1-gcc44.patch



trousers-0.3.1-gcc44.patch:

--- NEW FILE trousers-0.3.1-gcc44.patch ---
--- tools/ps_convert.c.orig	2009-04-27 16:33:31.000000000 +0200
+++ tools/ps_convert.c	2009-04-27 16:33:53.000000000 +0200
@@ -136,13 +136,14 @@
 version_0_convert(FILE *in, FILE *out)
 {
 	int rc, members = 0;
-	UINT32 i, u32 = *(UINT32 *)buf;
+	UINT32 i;
+	UINT32 *u32 = (UINT32 *) &buf;
 
 	/* output the PS version */
 	OUT(out, "\1", 1);
 
 	/* number of keys */
-	OUT(out, &u32, sizeof(UINT32));
+	OUT(out, u32, sizeof(UINT32));
 
 	/* The +- 1's below account for the byte we read in to determine
 	 * if the PS file had a version byte at the beginning */
@@ -163,7 +163,7 @@
 		return -1;
 	}
 
-	for (i = 1; i < u32; i++) {
+	for (i = 1; i < *u32; i++) {
 		/* read in subsequent key's headers */
 		if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
 					1, in)) != 1) {
--- tools/ps_inspect.c.orig	2009-04-27 17:49:46.000000000 +0200
+++ tools/ps_inspect.c	2009-04-27 17:51:52.000000000 +0200
@@ -179,10 +179,11 @@
 version_0_print(FILE *f)
 {
 	int rc, members = 0;
-	UINT32 i, u32 = *(UINT32 *)buf;
+	UINT32 i;
+	UINT32 *u32 = (UINT32 *) &buf;
 
 	PRINT("version:        0\n");
-	PRINT("number of keys: %u\n", u32);
+	PRINT("number of keys: %u\n", *u32);
 
 	/* The +- 1's below account for the byte we read in to determine
 	 * if the PS file had a version byte at the beginning */
@@ -203,7 +204,7 @@
 		return -1;
 	}
 
-	for (i = 1; i < u32; i++) {
+	for (i = 1; i < *u32; i++) {
 		/* read in subsequent key's headers */
 		if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
 					1, f)) != 1) {


Index: trousers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trousers/devel/trousers.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- trousers.spec	25 Feb 2009 21:56:48 -0000	1.13
+++ trousers.spec	27 Apr 2009 16:07:23 -0000	1.14
@@ -3,7 +3,7 @@
 
 %define name		trousers
 %define version		0.3.1
-%define release		14
+%define release		15
 
 Name:			%{name}
 Summary:		TCG's Software Stack v1.2 
@@ -29,6 +29,9 @@
 Patch4:			trousers-0.3.1-workaround-selinux-namespace-pollution.patch
 Patch5:			trousers-0.3.1-reuseaddr.patch
 Patch6:			trousers-0.3.1-use-tpm-emu.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2782253&group_id=126012&atid=704358
+Patch7:			trousers-0.3.1-gcc44.patch
 
 %description
 TrouSerS is an implementation of the Trusted Computing Group's Software Stack
@@ -66,10 +69,11 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7
 
 %build
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -131,6 +135,9 @@
 %{_libdir}/libtddl.a
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.1-15
+- Fix FTBFS: added trousers-0.3.1-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Apr 27 16:09:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 16:09:50 +0000 (UTC)
Subject: rpms/kchmviewer/F-10 kchmviewer-4.0-no_msits.patch, NONE,
	1.1 kchmviewer.spec, 1.20, 1.21 kchmviewer-4.0-desktop_fix.patch,
	1.1, NONE kchmviewer-4.0-plugin_install.patch, 1.1, NONE
Message-ID: <20090427160950.9F46470110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7156

Modified Files:
	kchmviewer.spec 
Added Files:
	kchmviewer-4.0-no_msits.patch 
Removed Files:
	kchmviewer-4.0-desktop_fix.patch 
	kchmviewer-4.0-plugin_install.patch 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
- fix conflicts with kdegraphics (#484861)
- optimize scriptlets
- ship only hicolor icons 
- cleanup, use kde4-macros


kchmviewer-4.0-no_msits.patch:

--- NEW FILE kchmviewer-4.0-no_msits.patch ---
diff -up kchmviewer-4.0/CMakeLists.txt.no_msits kchmviewer-4.0/CMakeLists.txt
--- kchmviewer-4.0/CMakeLists.txt.no_msits	2008-12-01 20:31:22.000000000 -0600
+++ kchmviewer-4.0/CMakeLists.txt	2009-04-27 10:23:02.371525695 -0500
@@ -18,6 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
 
 # Run in those subdirectories
 ADD_SUBDIRECTORY( lib/libchmfile )
-ADD_SUBDIRECTORY( lib/kio-msits )
+#ADD_SUBDIRECTORY( lib/kio-msits )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/F-10/kchmviewer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kchmviewer.spec	4 Dec 2008 10:15:44 -0000	1.20
+++ kchmviewer.spec	27 Apr 2009 16:09:20 -0000	1.21
@@ -1,7 +1,8 @@
+
 Name:           kchmviewer
 Version:        4.0
-Release:        1%{?dist}
-Summary:        CHM viewer with Qt support
+Release:        4%{?dist}
+Summary:        CHM viewer
 
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -10,24 +11,26 @@
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel chmlib-devel
-BuildRequires:  desktop-file-utils kdelibs4-devel
-# for the %%cmake_kde4 macro (it is also a kdelibs4 dependency)
-# BuildRequires:  kde-filesystem
+Patch1: kchmviewer-4.0-no_msits.patch
+
+BuildRequires:  chmlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
 
-# for directories owning
-Requires:       kde-filesystem
+Requires: kio_msits
 
 %description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
-It uses the Qt widget library. 
-#It is compiled with full KDE support, including KDE widgets 
-#and KIO/KHTML.
+KchmViewer is a chm (MS HTML help file format) viewer.
 
 
 %prep
 %setup -q -n kchmviewer-%{version}
 
+%patch1 -p1 -b .no_msits
+
+chmod -x lib/kio-msits/msits.*
+
 # don't know what the encoding is. The strange character sequence is
 # <EF><BF><BD>, which could be in utf8 U-0000FFFD, a boundary condition
 # http://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
@@ -35,39 +38,28 @@
 #touch -r FAQ FAQ.utf8
 #mv FAQ.utf8 FAQ
 
-chmod -x lib/kio-msits/msits.*
-
 
 %build
-#%%cmake_kde4 .
-# with qmake-qt4 install is done by hand, and without kde4 support.
-qmake-qt4
-make VERBOSE=1 
-#%{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
-
-# not installed in the default case in hicolor, only in crystalsvg.
-for r in 48 64 128; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
-  install -p -m644 src/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
-done
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-        src/kde/kchmviewer.desktop
-# let the application do it itself
-#        --delete-original                                    \
-#        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+rm -rf $RPM_BUILD_ROOT 
+
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
+# make icons available for all themes/desktops
+mv $RPM_BUILD_ROOT%{_kde4_iconsdir}/crystalsvg \
+   $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor
 
-#%%find_lang %{name}
+
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
 
 
 %clean
@@ -75,34 +67,42 @@
 
 
 %post
-update-desktop-database &> /dev/null ||:
-#touch --no-create %{_datadir}/icons/crystalsvg || :
-#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-update-desktop-database &> /dev/null ||:
-#touch --no-create %{_datadir}/icons/crystalsvg || :
-#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
-#-f %{name}.lang
-%files 
+%files
+# -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
-%{_bindir}/kchmviewer
-#%{_datadir}/applications/kde4/*.desktop
-%{_datadir}/applications/*.desktop
-#%{_libdir}/kde4/kio_msits.so
-#%{_datadir}/kde4/services/msits.protocol
-#%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{_datadir}/icons/hicolor/*/apps/kchmviewer.png
+%{_kde4_bindir}/kchmviewer
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kchmviewer.*
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
+- fix conflicts with kdegraphics (#484861)
+- optimize scriptlets
+- ship only hicolor icons 
+- cleanup, use kde4-macros
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec  8 2008 Patrice Dumas <pertusus at free.fr> 4.0-2
+- reenable kde support
+
 * Thu Dec  4 2008 Patrice Dumas <pertusus at free.fr> 4.0-1
 - update to 4.0
 


--- kchmviewer-4.0-desktop_fix.patch DELETED ---


--- kchmviewer-4.0-plugin_install.patch DELETED ---



From rdieter at fedoraproject.org  Mon Apr 27 16:11:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 16:11:08 +0000 (UTC)
Subject: rpms/kchmviewer/F-9 kchmviewer-4.0-no_msits.patch, NONE,
	1.1 kchmviewer.spec, 1.17, 1.18 kchmviewer-4.0-desktop_fix.patch,
	1.1, NONE kchmviewer-4.0-plugin_install.patch, 1.1, NONE
Message-ID: <20090427161108.7B82470110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7442

Modified Files:
	kchmviewer.spec 
Added Files:
	kchmviewer-4.0-no_msits.patch 
Removed Files:
	kchmviewer-4.0-desktop_fix.patch 
	kchmviewer-4.0-plugin_install.patch 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
- fix conflicts with kdegraphics (#484861)
- optimize scriptlets
- ship only hicolor icons 
- cleanup, use kde4-macros


kchmviewer-4.0-no_msits.patch:

--- NEW FILE kchmviewer-4.0-no_msits.patch ---
diff -up kchmviewer-4.0/CMakeLists.txt.no_msits kchmviewer-4.0/CMakeLists.txt
--- kchmviewer-4.0/CMakeLists.txt.no_msits	2008-12-01 20:31:22.000000000 -0600
+++ kchmviewer-4.0/CMakeLists.txt	2009-04-27 10:23:02.371525695 -0500
@@ -18,6 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
 
 # Run in those subdirectories
 ADD_SUBDIRECTORY( lib/libchmfile )
-ADD_SUBDIRECTORY( lib/kio-msits )
+#ADD_SUBDIRECTORY( lib/kio-msits )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/F-9/kchmviewer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kchmviewer.spec	4 Dec 2008 10:15:44 -0000	1.17
+++ kchmviewer.spec	27 Apr 2009 16:10:38 -0000	1.18
@@ -1,7 +1,8 @@
+
 Name:           kchmviewer
 Version:        4.0
-Release:        1%{?dist}
-Summary:        CHM viewer with Qt support
+Release:        4%{?dist}
+Summary:        CHM viewer
 
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -10,24 +11,26 @@
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel chmlib-devel
-BuildRequires:  desktop-file-utils kdelibs4-devel
-# for the %%cmake_kde4 macro (it is also a kdelibs4 dependency)
-# BuildRequires:  kde-filesystem
+Patch1: kchmviewer-4.0-no_msits.patch
+
+BuildRequires:  chmlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
 
-# for directories owning
-Requires:       kde-filesystem
+Requires: kio_msits
 
 %description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
-It uses the Qt widget library. 
-#It is compiled with full KDE support, including KDE widgets 
-#and KIO/KHTML.
+KchmViewer is a chm (MS HTML help file format) viewer.
 
 
 %prep
 %setup -q -n kchmviewer-%{version}
 
+%patch1 -p1 -b .no_msits
+
+chmod -x lib/kio-msits/msits.*
+
 # don't know what the encoding is. The strange character sequence is
 # <EF><BF><BD>, which could be in utf8 U-0000FFFD, a boundary condition
 # http://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
@@ -35,39 +38,28 @@
 #touch -r FAQ FAQ.utf8
 #mv FAQ.utf8 FAQ
 
-chmod -x lib/kio-msits/msits.*
-
 
 %build
-#%%cmake_kde4 .
-# with qmake-qt4 install is done by hand, and without kde4 support.
-qmake-qt4
-make VERBOSE=1 
-#%{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
-
-# not installed in the default case in hicolor, only in crystalsvg.
-for r in 48 64 128; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
-  install -p -m644 src/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
-done
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-        src/kde/kchmviewer.desktop
-# let the application do it itself
-#        --delete-original                                    \
-#        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+rm -rf $RPM_BUILD_ROOT 
+
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
+# make icons available for all themes/desktops
+mv $RPM_BUILD_ROOT%{_kde4_iconsdir}/crystalsvg \
+   $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor
 
-#%%find_lang %{name}
+
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
 
 
 %clean
@@ -75,34 +67,42 @@
 
 
 %post
-update-desktop-database &> /dev/null ||:
-#touch --no-create %{_datadir}/icons/crystalsvg || :
-#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-update-desktop-database &> /dev/null ||:
-#touch --no-create %{_datadir}/icons/crystalsvg || :
-#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
-#-f %{name}.lang
-%files 
+%files
+# -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
-%{_bindir}/kchmviewer
-#%{_datadir}/applications/kde4/*.desktop
-%{_datadir}/applications/*.desktop
-#%{_libdir}/kde4/kio_msits.so
-#%{_datadir}/kde4/services/msits.protocol
-#%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{_datadir}/icons/hicolor/*/apps/kchmviewer.png
+%{_kde4_bindir}/kchmviewer
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kchmviewer.*
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
+- fix conflicts with kdegraphics (#484861)
+- optimize scriptlets
+- ship only hicolor icons 
+- cleanup, use kde4-macros
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec  8 2008 Patrice Dumas <pertusus at free.fr> 4.0-2
+- reenable kde support
+
 * Thu Dec  4 2008 Patrice Dumas <pertusus at free.fr> 4.0-1
 - update to 4.0
 


--- kchmviewer-4.0-desktop_fix.patch DELETED ---


--- kchmviewer-4.0-plugin_install.patch DELETED ---



From itamarjp at fedoraproject.org  Mon Apr 27 16:16:01 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 27 Apr 2009 16:16:01 +0000 (UTC)
Subject: rpms/bareftp/F-9 bareftp.spec, NONE, 1.1 bareftp_libdir.patch, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427161601.EEC0670110@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bareftp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8643/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	bareftp.spec bareftp_libdir.patch import.log 
Log Message:
initial rpm version



--- NEW FILE bareftp.spec ---
%global debug_package %{nil}

Name:           bareftp
Version:        0.2.2
Release:        2%{?dist}
Summary:        File transfer client supporting the FTP, FTP over SSL/TLS (FTPS) and SSH

Group:          Applications/Internet

#  <spot> cassmodiah: okay, so the code from SharpSSH and JSch is BSD, the Banshee
#  bits are MIT, the Classpath bits are GPLv2+ with exceptions
#  <spot> cassmodiah: if you combine all of that with GPLv2 only code, you end up
#  with GPLv2 with exceptions
#  <spot> cassmodiah: feel free to put that in comments above the License tag to
#  explain it. :)

License:        GPLv2 with exceptions
URL:            http://www.bareftp.org/
Source0:        http://www.bareftp.org/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         bareftp_libdir.patch

BuildRequires:  gnome-sharp-devel
BuildRequires:  gettext
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-desktop-sharp-devel
BuildRequires:  gtk-sharp2-gapi
BuildRequires:  gtk-sharp2-devel
BuildRequires:  mono-devel

Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils


# Mono only available on these:
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparcv9 alpha

%description
bareFTP is a file transfer client supporting the FTP, FTP over SSL/TLS (FTPS)
and SSH File Transfer Protocol (SFTP). It is written in C#, targeting the Mono
framework and the GNOME desktop environment. bareFTP is free and open source
software released under the terms of the GPL license.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
do
   desktop-file-validate $file
done

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%postun
update-desktop-database &> /dev/null ||:

if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
        gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS README
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bareFTP.Common.Utils.dll
%{_libdir}/%{name}/bareFTP.Connection.dll
%{_libdir}/%{name}/bareFTP.Gui.Dialog.dll
%{_libdir}/%{name}/bareFTP.Gui.FileManager.dll
%{_libdir}/%{name}/bareFTP.Gui.Preferences.dll
%{_libdir}/%{name}/bareFTP.Gui.ProgressMonitor.dll
%{_libdir}/%{name}/bareFTP.Gui.dll
%{_libdir}/%{name}/bareFTP.Preferences.dll
%{_libdir}/%{name}/bareFTP.Protocol.Ftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.Sftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.dll
%{_libdir}/%{name}/bareftp.exe
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop


%changelog
* Sat Apr 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-2
- fix from rhbz #495001 Comment #1 From  Simon Wesp (cassmodiah at fedoraproject.org)
- include ExclusiveArch, disable creation of debuginfo package

* Wed Apr 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-1
- Initial RPM release

bareftp_libdir.patch:

--- NEW FILE bareftp_libdir.patch ---
--- a/script.in	2009-04-08 22:46:44.000000000 -0300
+++ b/script.in	2009-04-08 22:54:48.000000000 -0300
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @MONO@ @prefix@/lib/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"
+exec @MONO@ @pkglibdir@/bareftp.exe $MONO_EXTRA_ARGS "$@"


--- NEW FILE import.log ---
bareftp-0_2_2-2_fc11:F-9:bareftp-0.2.2-2.fc11.src.rpm:1240848777


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:28:14 -0000	1.1
+++ .cvsignore	27 Apr 2009 16:15:31 -0000	1.2
@@ -0,0 +1 @@
+bareftp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:28:15 -0000	1.1
+++ sources	27 Apr 2009 16:15:31 -0000	1.2
@@ -0,0 +1 @@
+d19c2cb8ea26703e4d9314772a0acc94  bareftp-0.2.2.tar.gz



From jjames at fedoraproject.org  Mon Apr 27 16:17:14 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 27 Apr 2009 16:17:14 +0000 (UTC)
Subject: rpms/gcl/devel gcl-2.6.8-alloca.patch, 1.1,
	1.2 gcl-2.6.8-extension.patch, 1.1,
	1.2 gcl-2.6.8-infrastructure.patch, 1.1,
	1.2 gcl-2.6.8-unrandomize.patch, 1.1, 1.2 gcl.spec, 1.35,
	1.36 sources, 1.5, 1.6 gcl-2.6.8-bfd.patch, 1.2, NONE
Message-ID: <20090427161714.A2A3570110@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8995/devel

Modified Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-extension.patch 
	gcl-2.6.8-infrastructure.patch gcl-2.6.8-unrandomize.patch 
	gcl.spec sources 
Removed Files:
	gcl-2.6.8-bfd.patch 
Log Message:
* Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
- Update to 20090303 CVS snapshot
- Drop upstreamed BFD patch
- Make separate -selinux subpackage


gcl-2.6.8-alloca.patch:

Index: gcl-2.6.8-alloca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-alloca.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-alloca.patch	10 Jan 2009 05:23:17 -0000	1.1
+++ gcl-2.6.8-alloca.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2008-07-30 22:58:25.000000000 -0600
-+++ gcl-2.6.8/acconfig.h	2008-12-29 16:06:08.000000000 -0700
+--- gcl-2.6.8.ORIG/acconfig.h	2009-02-23 12:39:42.000000000 -0700
++++ gcl-2.6.8/acconfig.h	2009-04-27 09:46:14.000000000 -0600
 @@ -53,11 +53,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -16,8 +16,8 @@
  #endif
  
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:06:55.000000000 -0700
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:47:15.000000000 -0600
 @@ -645,6 +645,7 @@
  NIFLAGS
  FINAL_CFLAGS
@@ -26,7 +26,7 @@
  NOTIFY
  TCL_LIBS
  TCL_DL_LIBS
-@@ -13784,10 +13785,12 @@
+@@ -13928,10 +13929,12 @@
  
  # alloca
  
@@ -43,7 +43,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13795,16 +13798,17 @@
+@@ -13939,16 +13942,17 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -64,7 +64,7 @@
  if { (ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -13812,44 +13816,141 @@
+@@ -13956,44 +13960,141 @@
  esac
  eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  $as_echo "$ac_try_echo") >&5
@@ -223,7 +223,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13857,17 +13958,163 @@
+@@ -14001,17 +14102,163 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -389,7 +389,7 @@
  rm -f conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
-@@ -13890,43 +14137,30 @@
+@@ -14034,43 +14281,30 @@
    ac_status=$?
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -442,9 +442,9 @@
  
  # dlopen etc
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:06:43.000000000 -0700
-@@ -1852,33 +1852,7 @@
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:46:14.000000000 -0600
+@@ -1869,33 +1869,7 @@
  
  # alloca
  
@@ -480,8 +480,8 @@
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:06:55.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:46:14.000000000 -0600
 @@ -54,11 +54,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -496,9 +496,9 @@
  #include <alloca.h>
  #endif
  
-@@ -259,6 +258,21 @@
- #undef HAVE_MALLOC_MALLOC_H
+@@ -260,6 +259,21 @@
  #undef HAVE_OBJC_MALLOC_H
+ #undef HAVE_OUTPUT_BFD
  
 +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
 +   systems. This function is required for `alloca.c' support on those systems.
@@ -518,7 +518,7 @@
  /* Define to 1 if you have the <asm/sigcontext.h> header file. */
  #undef HAVE_ASM_SIGCONTEXT_H
  
-@@ -343,6 +357,14 @@
+@@ -344,6 +358,14 @@
  /* The size of `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  

gcl-2.6.8-extension.patch:

Index: gcl-2.6.8-extension.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-extension.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-extension.patch	10 Jan 2009 05:23:17 -0000	1.1
+++ gcl-2.6.8-extension.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/acconfig.h	2008-12-29 16:17:50.000000000 -0700
+--- gcl-2.6.8.ORIG/acconfig.h	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/acconfig.h	2009-04-27 09:49:25.000000000 -0600
 @@ -1,3 +1,6 @@
 +/* Whether compiling on a glibc-based system */
 +#undef _GNU_SOURCE
@@ -25,8 +25,8 @@
  #define ISFINITE(a) isfinite(a)
  #else
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:19:59.000000000 -0700
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:49:53.000000000 -0600
 @@ -691,9 +691,9 @@
  GMPDIR
  GMP
@@ -1805,7 +1805,7 @@
    { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
  $as_echo_n "checking for malloc/malloc.h... " >&6; }
  if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
-@@ -11349,7 +12566,6 @@
+@@ -11493,7 +12710,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -1813,7 +1813,7 @@
  		#include <math.h>
  
  int
-@@ -11488,7 +12704,6 @@
+@@ -11632,7 +12848,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -1822,8 +1822,8 @@
  
  int
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:19:46.000000000 -0700
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:49:25.000000000 -0600
 @@ -442,6 +442,7 @@
  	LDFLAGS=" "
  fi
@@ -1832,7 +1832,7 @@
  AC_PROG_CC
  AC_PROG_CPP
  AC_SUBST(CC)
-@@ -1339,7 +1340,6 @@
+@@ -1356,7 +1357,6 @@
  #
  AC_MSG_CHECKING([for isnormal])
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1840,7 +1840,7 @@
  		#include <math.h>
  		]],[[
  		float f;
-@@ -1367,7 +1367,6 @@
+@@ -1384,7 +1384,6 @@
  
  AC_MSG_CHECKING([for isfinite])
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1849,8 +1849,8 @@
  		]],[[
  		float f;
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:19:33.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:49:25.000000000 -0600
 @@ -1,4 +1,7 @@
  /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
 +/* Whether compiling on a glibc-based system */
@@ -1875,7 +1875,7 @@
  #include <math.h>
  #define ISFINITE(a) isfinite(a)
  #else
-@@ -368,5 +369,37 @@
+@@ -369,5 +370,37 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
  

gcl-2.6.8-infrastructure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 gcl-2.6.8-infrastructure.patch
Index: gcl-2.6.8-infrastructure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-infrastructure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-infrastructure.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-infrastructure.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
 --- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
-+++ gcl-2.6.8/config.guess	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/config.guess	2009-04-27 09:34:38.000000000 -0600
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -10,7 +10,7 @@
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-04-22'
-+timestamp='2008-12-19'
++timestamp='2009-04-27'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@ -205,7 +205,7 @@
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +313,45 @@
+@@ -338,32 +313,48 @@
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -224,6 +224,9 @@
 -	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 +	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
@@ -261,7 +264,7 @@
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -372,10 +360,10 @@
+@@ -372,10 +363,10 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -274,7 +277,7 @@
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +375,10 @@
+@@ -387,10 +378,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -287,7 +290,7 @@
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +389,40 @@
+@@ -401,40 +392,40 @@
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
@@ -340,7 +343,7 @@
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +446,33 @@
+@@ -458,32 +449,33 @@
  	  exit (-1);
  	}
  EOF
@@ -385,7 +388,7 @@
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +488,29 @@
+@@ -499,29 +491,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -424,7 +427,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +518,7 @@
+@@ -529,7 +521,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -433,7 +436,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -544,15 +533,19 @@
+@@ -544,15 +536,19 @@
  			exit(0);
  			}
  EOF
@@ -457,7 +460,7 @@
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -565,28 +558,28 @@
+@@ -565,28 +561,28 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -494,7 +497,7 @@
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -648,9 +641,19 @@
+@@ -648,9 +644,19 @@
  	esac
  	if [ ${HP_ARCH} = "hppa2.0w" ]
  	then
@@ -517,7 +520,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -658,11 +661,11 @@
+@@ -658,11 +664,11 @@
  	    fi
  	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -531,7 +534,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +693,192 @@
+@@ -690,161 +696,192 @@
  	  exit (0);
  	}
  EOF
@@ -775,7 +778,7 @@
      mips:Linux:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -861,8 +895,12 @@
+@@ -861,8 +898,12 @@
  	#endif
  	#endif
  EOF
@@ -790,7 +793,7 @@
  	;;
      mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -880,15 +918,22 @@
+@@ -880,15 +921,22 @@
  	#endif
  	#endif
  EOF
@@ -817,7 +820,7 @@
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +947,10 @@
+@@ -902,7 +950,10 @@
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -829,7 +832,7 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +958,31 @@
+@@ -910,25 +961,31 @@
  	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
@@ -868,7 +871,7 @@
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +1000,12 @@
+@@ -946,15 +1003,12 @@
  		;;
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
@@ -886,7 +889,7 @@
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
-@@ -971,7 +1022,7 @@
+@@ -971,7 +1025,7 @@
  	LIBC=gnulibc1
  	# endif
  	#else
@@ -895,7 +898,7 @@
  	LIBC=gnu
  	#else
[...2914 lines suppressed...]
  
-@@ -1334,7 +1413,6 @@
+@@ -1350,7 +1430,6 @@
  #	   To get around this problem, check for both libraries together
  #	   if -lsocket doesn't work by itself.
  #--------------------------------------------------------------------
@@ -21251,7 +21488,7 @@
  tcl_checkBoth=0
  AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
  if test "$tcl_checkSocket" = 1; then
-@@ -1371,8 +1449,8 @@
+@@ -1387,8 +1466,8 @@
  AC_SUBST(RL_OBJS)
  AC_SUBST(RL_LIB)
  
@@ -21262,7 +21499,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -1389,24 +1467,25 @@
+@@ -1405,24 +1484,25 @@
  #include <netinet/in.h>		/* struct in_addr, struct sockaddr_in */
  #include <arpa/inet.h>		/* inet_ntoa() */
  #include <netdb.h>		/* gethostbyname() */
@@ -21295,7 +21532,7 @@
  [AC_DEFINE(LISTEN_USE_FCNTL)
   AC_MSG_RESULT(yes)],
  AC_MSG_RESULT(no))
-@@ -1427,7 +1506,7 @@
+@@ -1443,7 +1523,7 @@
  AC_SUBST(USE_CLEANUP)
  gcl_ok=no
  
@@ -21304,7 +21541,7 @@
  if test $gcl_ok = yes ; then
  AC_DEFINE(ENDIAN_ALREADY_DEFINED)
  fi
-@@ -1459,32 +1538,35 @@
+@@ -1475,32 +1555,35 @@
  esac
  
  
@@ -21352,7 +21589,7 @@
  [AC_DEFINE(HAVE_SIGEMT)
   AC_SUBST(HAVE_SIGEMT)
   AC_MSG_RESULT(yes)],
-@@ -1495,13 +1577,14 @@
+@@ -1511,13 +1594,14 @@
  
  #if test $use = "386-linux" ; then
  	AC_CHECK_HEADERS(asm/sigcontext.h)
@@ -21373,7 +21610,7 @@
         [
          sigcontext_works=1;
          AC_DEFINE(SIGNAL_H_HAS_SIGCONTEXT)
-@@ -1512,18 +1595,19 @@
+@@ -1528,18 +1612,19 @@
           AC_MSG_RESULT(sigcontext NOT in signal.h)]
         )
         if test "$sigcontext_works" = 0 ; then
@@ -21398,7 +21635,7 @@
          [
          AC_DEFINE(HAVE_SIGCONTEXT)
  	AC_MSG_RESULT(sigcontext in asm files)
-@@ -1631,6 +1715,8 @@
+@@ -1647,6 +1732,8 @@
  AC_MSG_RESULT($INFO_DIR)
  AC_SUBST(INFO_DIR)
  
@@ -21407,7 +21644,7 @@
  AC_MSG_CHECKING([for tcl/tk])
  
  
-@@ -1651,9 +1737,6 @@
+@@ -1667,9 +1754,6 @@
  EOF
  #cp conftest.tcl foo.tcl
  
@@ -21417,7 +21654,7 @@
  if test "${TCLSH}" = "" ; then true ; else
  TCL_CONFIG_PREFIX=`${TCLSH} < conftest.tcl`
  fi
-@@ -1724,7 +1807,6 @@
+@@ -1740,7 +1824,6 @@
      TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
    fi
  fi
@@ -21425,7 +21662,7 @@
  if test "$have_ieee" = "0" ; then
   TCL_LIBS=`echo ${TCL_LIBS} | sed -e "s:-lieee::g" `
  fi
-@@ -1768,15 +1850,18 @@
+@@ -1784,15 +1867,18 @@
  
  # the time handling for unixtime, add timezone
  
@@ -21448,7 +21685,7 @@
    ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
   if test $gcl_ok = yes ; then
      AC_MSG_RESULT(yes)
-@@ -1795,8 +1880,6 @@
+@@ -1811,8 +1897,6 @@
  
  
  
@@ -21457,7 +21694,7 @@
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
  # then dlload("foo.o") a lisp file can refer to things in libX.so
-@@ -1820,7 +1903,7 @@
+@@ -1836,7 +1920,7 @@
  
  # redhat/cygnus released for some reason a buggy version of gcc,
  # which no one else released.   Catch that here.
@@ -21466,7 +21703,7 @@
  if  2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null 
     then 
          BROKEN_O4_OPT=1
-@@ -1853,7 +1936,8 @@
+@@ -1869,7 +1953,8 @@
  if test -f h/$use.defs  ; then
  
    AC_SUBST(use)
@@ -21477,8 +21714,8 @@
    cat makedefc
  
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-07-30 22:58:31.000000000 -0600
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 21:48:11.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-02-23 12:39:43.000000000 -0700
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:41:02.000000000 -0600
 @@ -1,15 +1,15 @@
 -/* h/gclincl.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
 +/* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
@@ -21634,9 +21871,9 @@
  #undef USE_DLOPEN
  
  #define MP_LIMB_BYTES 0
-@@ -212,50 +259,92 @@
- #undef HAVE_MALLOC_MALLOC_H
+@@ -213,47 +260,92 @@
  #undef HAVE_OBJC_MALLOC_H
+ #undef HAVE_OUTPUT_BFD
  
 -/* The number of bytes in a long.  */
 -#undef SIZEOF_LONG
@@ -21662,20 +21899,18 @@
  
 -/* Define if you have the <elf_abi.h> header file.  */
 -#undef HAVE_ELF_ABI_H
+-
+-/* Define if you have the <float.h> header file.  */
 +/* Define to 1 if you have the <float.h> header file. */
-+#undef HAVE_FLOAT_H
+ #undef HAVE_FLOAT_H
  
--/* Define if you have the <endian.h> header file.  */
--#undef HAVE_ENDIAN_H
+-/* Define if you have the <japi.h> header file.  */
 +/* Define to 1 if you have the `getcwd' function. */
 +#undef HAVE_GETCWD
- 
--/* Define if you have the <float.h> header file.  */
--#undef HAVE_FLOAT_H
++
 +/* Define to 1 if you have the `getwd' function. */
 +#undef HAVE_GETWD
- 
--/* Define if you have the <japi.h> header file.  */
++
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#undef HAVE_INTTYPES_H
 +
@@ -21755,7 +21990,7 @@
 +#undef X_DISPLAY_MISSING
 diff -dur gcl-2.6.8.ORIG/info/texinfo.tex gcl-2.6.8/info/texinfo.tex
 --- gcl-2.6.8.ORIG/info/texinfo.tex	2002-10-26 09:14:15.000000000 -0600
-+++ gcl-2.6.8/info/texinfo.tex	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/info/texinfo.tex	2009-04-27 09:37:11.000000000 -0600
 @@ -3,10 +3,11 @@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
@@ -32212,7 +32447,7 @@
 + at end ignore
 diff -dur gcl-2.6.8.ORIG/install.sh gcl-2.6.8/install.sh
 --- gcl-2.6.8.ORIG/install.sh	1999-12-06 15:43:54.000000000 -0700
-+++ gcl-2.6.8/install.sh	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/install.sh	2009-04-27 09:37:11.000000000 -0600
 @@ -1,19 +1,38 @@
 -#! /bin/sh
 -#
@@ -32917,7 +33152,7 @@
 +# End:
 diff -dur gcl-2.6.8.ORIG/ltmain.sh gcl-2.6.8/ltmain.sh
 --- gcl-2.6.8.ORIG/ltmain.sh	2002-08-08 23:49:32.000000000 -0600
-+++ gcl-2.6.8/ltmain.sh	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/ltmain.sh	2009-04-27 09:37:11.000000000 -0600
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun ltconfig.

gcl-2.6.8-unrandomize.patch:

Index: gcl-2.6.8-unrandomize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-unrandomize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-unrandomize.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-unrandomize.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,7 +1,7 @@
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:24:30.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:45:51.000000000 -0700
-@@ -9880,9 +9880,11 @@
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:50:47.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:51:31.000000000 -0600
+@@ -10024,9 +10024,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14,7 +14,7 @@
  		    return 0;}
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -9947,12 +9949,11 @@
+@@ -10091,12 +10093,11 @@
  /* end confdefs.h.  */
  
  		    #include <stdio.h>
@@ -29,7 +29,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}
-@@ -10009,12 +10010,11 @@
+@@ -10153,12 +10154,11 @@
  /* end confdefs.h.  */
  
  		    #include <stdio.h>
@@ -44,7 +44,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}
-@@ -10165,6 +10165,7 @@
+@@ -10309,6 +10309,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -52,7 +52,7 @@
  
  void gprof_cleanup() {}
  int
-@@ -10173,9 +10174,7 @@
+@@ -10317,9 +10318,7 @@
    char *b,*b1;
    FILE *fp;
  
@@ -64,9 +64,9 @@
    fp = fopen("conftest1","w");
  
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:24:30.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:37:26.000000000 -0700
-@@ -1087,9 +1087,11 @@
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:50:47.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:51:09.000000000 -0600
+@@ -1104,9 +1104,11 @@
  
  	AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -79,7 +79,7 @@
  		    return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
  
  	if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
-@@ -1102,12 +1104,11 @@
+@@ -1119,12 +1121,11 @@
  	AC_MSG_CHECKING([that sbrk is (now) non-random])
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  		    #include <stdio.h>
@@ -94,7 +94,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
-@@ -1116,12 +1117,11 @@
+@@ -1133,12 +1134,11 @@
  	fi
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  		    #include <stdio.h>
@@ -109,7 +109,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
-@@ -1163,6 +1163,7 @@
+@@ -1180,6 +1180,7 @@
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <stdlib.h>
@@ -117,7 +117,7 @@
  
  void gprof_cleanup() {}
  int
-@@ -1171,9 +1172,7 @@
+@@ -1188,9 +1189,7 @@
    char *b,*b1;
    FILE *fp;
  
@@ -130,7 +130,7 @@
  
 diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
 --- gcl-2.6.8.ORIG/h/unrandomize.h	2008-08-20 19:13:58.000000000 -0600
-+++ gcl-2.6.8/h/unrandomize.h	2008-12-29 16:42:15.000000000 -0700
++++ gcl-2.6.8/h/unrandomize.h	2009-04-27 09:51:09.000000000 -0600
 @@ -1,25 +1,33 @@
 +#include <stdlib.h>
  #include <sys/personality.h>
@@ -185,7 +185,7 @@
 -}
 diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
 --- gcl-2.6.8.ORIG/o/main.c	2008-07-31 13:12:59.000000000 -0600
-+++ gcl-2.6.8/o/main.c	2008-12-29 16:43:14.000000000 -0700
++++ gcl-2.6.8/o/main.c	2009-04-27 09:51:09.000000000 -0600
 @@ -51,6 +51,7 @@
  #include <signal.h>
  #endif


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gcl.spec	24 Feb 2009 19:49:28 -0000	1.35
+++ gcl.spec	27 Apr 2009 16:17:14 -0000	1.36
@@ -3,7 +3,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
 
 # Prerelease of 2.6.8
-%define alphatag 20080902cvs
+%define alphatag 20090303cvs
 
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
@@ -37,7 +37,7 @@
 # The source for this package was pulled from upstream's CVS repository.  Use
 # the following commands to generate the tarball:
 #   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
-#     -r Version_2_6_8pre -D 2008-09-02 -d gcl-2.6.8 gcl
+#     -r Version_2_6_8pre -D 2009-03-04 -d gcl-2.6.8 gcl
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
@@ -93,14 +93,9 @@
 # error on newer GCC systems due to an include inside a function.  This affects
 # the "unrandomize" sbrk() functionality, hence the name of the patch.
 Patch12:        gcl-2.6.8-unrandomize.patch
-# This patch was last sent upstream on 17 Jan 2009.  It fixes compilation with
-# a system BFD library that comes from a newer binutils distribution.  It also
-# updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
-# the GPL version 2.
-Patch13:        gcl-2.6.8-bfd.patch
 # This is a Fedora-specific patch.  Do not delete C files produced from D files
 # so they can be pulled into the debuginfo package.
-Patch14:        gcl-2.6.8-debuginfo.patch
+Patch13:        gcl-2.6.8-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libSM-devel
 BuildRequires:  libXext-devel
@@ -110,13 +105,14 @@
 BuildRequires:  tk-devel
 BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:  texlive, texlive-latex
+BuildRequires:  tex(latex)
 BuildRequires:  texinfo
 BuildRequires:  emacs, emacs-el
 BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
 BuildRequires:  selinux-policy
-Requires(post): /sbin/install-info, policycoreutils
-Requires(postun): /sbin/install-info, policycoreutils
+Requires:       gcl-selinux
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
 
 # GCL currently fails to build on PPC64 platforms.  See bugzilla #480519.
 ExcludeArch: ppc64
@@ -132,6 +128,7 @@
 Group:          Development/Languages
 Summary:        Emacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+BuildArch:      noarch
 
 %description emacs
 Emacs mode for interacting with GCL
@@ -140,6 +137,7 @@
 Group:          Development/Languages
 Summary:        Source for Emacs mode for interacting with GCL
 Requires:       %{name}-emacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 Source Elisp code for Emacs mode for interacting with GCL
@@ -150,6 +148,7 @@
 Summary:        XEmacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}
 Requires:       xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
+BuildArch:      noarch
 
 %description xemacs
 XEmacs mode for interacting with GCL
@@ -158,11 +157,24 @@
 Group:          Development/Languages
 Summary:        Source for XEmacs mode for interacting with GCL
 Requires:       %{name}-xemacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 Source Elisp code for XEmacs mode for interacting with GCL
 
 
+%package selinux
+Group:          Development/Languages
+Summary:        SELinux policy for GCL images
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
+
+%description selinux
+SELinux policy for GCL images.  All programs that dump GCL images to be run on
+SELinux-enabled hosts should Require this package, and give the image the type
+gcl_exec_t.
+
+
 %prep
 %setup -q
 %setup -q -T -D -a 2
@@ -180,7 +192,6 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 # Don't let the configure script add compiler flags we don't want
 sed -i -e 's/fomit-frame-pointer/fno-strict-aliasing/' -e 's/-O3/-O2/g' configure
@@ -280,6 +291,9 @@
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
   --entry="* gcl-tk: (gcl-tk).	GNU Common Lisp Tk Manual." \
   2>/dev/null || :
+
+
+%post selinux
 /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
 /sbin/fixfiles -R gcl restore || :
 
@@ -289,6 +303,11 @@
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+fi
+
+
+%postun selinux
+if [ $1 = 0 ]; then
     /usr/sbin/semodule -r gcl || :
 fi
 
@@ -299,7 +318,6 @@
 %{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
-%{_datadir}/selinux/packages/gcl
 %doc COPYING* readme readme.xgcl RELEASE* ChangeLog* faq doc
 %doc gcl*.jpg gcl.ico gcl.png
 %doc --parent html
@@ -326,8 +344,17 @@
 %defattr(-,root,root,-)
 %{xemacs_lispdir}/gcl/*.el
 
+%files selinux
+%defattr(-,root,root,-)
+%{_datadir}/selinux/packages/gcl
+
 
 %changelog
+* Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
+- Update to 20090303 CVS snapshot
+- Drop upstreamed BFD patch
+- Make separate -selinux subpackage
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.8-0.3.20080902cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jan 2009 20:54:32 -0000	1.5
+++ sources	27 Apr 2009 16:17:14 -0000	1.6
@@ -1,2 +1,2 @@
-6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2
+ead10281e7dff246c686c410b29caad6  gcl-2.6.8.tar.bz2
 70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2


--- gcl-2.6.8-bfd.patch DELETED ---



From jjames at fedoraproject.org  Mon Apr 27 16:17:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 27 Apr 2009 16:17:43 +0000 (UTC)
Subject: rpms/gcl/F-10 gcl-2.6.8-alloca.patch, 1.1,
	1.2 gcl-2.6.8-extension.patch, 1.1,
	1.2 gcl-2.6.8-infrastructure.patch, 1.1,
	1.2 gcl-2.6.8-unrandomize.patch, 1.1, 1.2 gcl.spec, 1.30,
	1.31 sources, 1.5, 1.6 gcl-2.6.8-bfd.patch, 1.2, NONE
Message-ID: <20090427161743.8B1CD70110@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8995/F-10

Modified Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-extension.patch 
	gcl-2.6.8-infrastructure.patch gcl-2.6.8-unrandomize.patch 
	gcl.spec sources 
Removed Files:
	gcl-2.6.8-bfd.patch 
Log Message:
* Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
- Update to 20090303 CVS snapshot
- Drop upstreamed BFD patch
- Make separate -selinux subpackage


gcl-2.6.8-alloca.patch:

Index: gcl-2.6.8-alloca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl-2.6.8-alloca.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-alloca.patch	16 Jan 2009 22:22:38 -0000	1.1
+++ gcl-2.6.8-alloca.patch	27 Apr 2009 16:17:12 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2008-07-30 22:58:25.000000000 -0600
-+++ gcl-2.6.8/acconfig.h	2008-12-29 16:06:08.000000000 -0700
+--- gcl-2.6.8.ORIG/acconfig.h	2009-02-23 12:39:42.000000000 -0700
++++ gcl-2.6.8/acconfig.h	2009-04-27 09:46:14.000000000 -0600
 @@ -53,11 +53,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -16,8 +16,8 @@
  #endif
  
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:06:55.000000000 -0700
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:47:15.000000000 -0600
 @@ -645,6 +645,7 @@
  NIFLAGS
  FINAL_CFLAGS
@@ -26,7 +26,7 @@
  NOTIFY
  TCL_LIBS
  TCL_DL_LIBS
-@@ -13784,10 +13785,12 @@
+@@ -13928,10 +13929,12 @@
  
  # alloca
  
@@ -43,7 +43,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13795,16 +13798,17 @@
+@@ -13939,16 +13942,17 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -64,7 +64,7 @@
  if { (ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -13812,44 +13816,141 @@
+@@ -13956,44 +13960,141 @@
  esac
  eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  $as_echo "$ac_try_echo") >&5
@@ -223,7 +223,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13857,17 +13958,163 @@
+@@ -14001,17 +14102,163 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -389,7 +389,7 @@
  rm -f conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
-@@ -13890,43 +14137,30 @@
+@@ -14034,43 +14281,30 @@
    ac_status=$?
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -442,9 +442,9 @@
  
  # dlopen etc
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:06:43.000000000 -0700
-@@ -1852,33 +1852,7 @@
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:46:14.000000000 -0600
+@@ -1869,33 +1869,7 @@
  
  # alloca
  
@@ -480,8 +480,8 @@
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:06:55.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:46:14.000000000 -0600
 @@ -54,11 +54,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -496,9 +496,9 @@
  #include <alloca.h>
  #endif
  
-@@ -259,6 +258,21 @@
- #undef HAVE_MALLOC_MALLOC_H
+@@ -260,6 +259,21 @@
  #undef HAVE_OBJC_MALLOC_H
+ #undef HAVE_OUTPUT_BFD
  
 +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
 +   systems. This function is required for `alloca.c' support on those systems.
@@ -518,7 +518,7 @@
  /* Define to 1 if you have the <asm/sigcontext.h> header file. */
  #undef HAVE_ASM_SIGCONTEXT_H
  
-@@ -343,6 +357,14 @@
+@@ -344,6 +358,14 @@
  /* The size of `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  

gcl-2.6.8-extension.patch:

Index: gcl-2.6.8-extension.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl-2.6.8-extension.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-extension.patch	16 Jan 2009 22:22:38 -0000	1.1
+++ gcl-2.6.8-extension.patch	27 Apr 2009 16:17:12 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/acconfig.h	2008-12-29 16:17:50.000000000 -0700
+--- gcl-2.6.8.ORIG/acconfig.h	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/acconfig.h	2009-04-27 09:49:25.000000000 -0600
 @@ -1,3 +1,6 @@
 +/* Whether compiling on a glibc-based system */
 +#undef _GNU_SOURCE
@@ -25,8 +25,8 @@
  #define ISFINITE(a) isfinite(a)
  #else
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:19:59.000000000 -0700
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:49:53.000000000 -0600
 @@ -691,9 +691,9 @@
  GMPDIR
  GMP
@@ -1805,7 +1805,7 @@
    { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
  $as_echo_n "checking for malloc/malloc.h... " >&6; }
  if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
-@@ -11349,7 +12566,6 @@
+@@ -11493,7 +12710,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -1813,7 +1813,7 @@
  		#include <math.h>
  
  int
-@@ -11488,7 +12704,6 @@
+@@ -11632,7 +12848,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -1822,8 +1822,8 @@
  
  int
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:19:46.000000000 -0700
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:49:25.000000000 -0600
 @@ -442,6 +442,7 @@
  	LDFLAGS=" "
  fi
@@ -1832,7 +1832,7 @@
  AC_PROG_CC
  AC_PROG_CPP
  AC_SUBST(CC)
-@@ -1339,7 +1340,6 @@
+@@ -1356,7 +1357,6 @@
  #
  AC_MSG_CHECKING([for isnormal])
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1840,7 +1840,7 @@
  		#include <math.h>
  		]],[[
  		float f;
-@@ -1367,7 +1367,6 @@
+@@ -1384,7 +1384,6 @@
  
  AC_MSG_CHECKING([for isfinite])
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1849,8 +1849,8 @@
  		]],[[
  		float f;
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:19:33.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:49:25.000000000 -0600
 @@ -1,4 +1,7 @@
  /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
 +/* Whether compiling on a glibc-based system */
@@ -1875,7 +1875,7 @@
  #include <math.h>
  #define ISFINITE(a) isfinite(a)
  #else
-@@ -368,5 +369,37 @@
+@@ -369,5 +370,37 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
  

gcl-2.6.8-infrastructure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 gcl-2.6.8-infrastructure.patch
Index: gcl-2.6.8-infrastructure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl-2.6.8-infrastructure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-infrastructure.patch	16 Jan 2009 22:22:38 -0000	1.1
+++ gcl-2.6.8-infrastructure.patch	27 Apr 2009 16:17:12 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
 --- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
-+++ gcl-2.6.8/config.guess	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/config.guess	2009-04-27 09:34:38.000000000 -0600
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -10,7 +10,7 @@
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-04-22'
-+timestamp='2008-12-19'
++timestamp='2009-04-27'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@ -205,7 +205,7 @@
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +313,45 @@
+@@ -338,32 +313,48 @@
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -224,6 +224,9 @@
 -	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 +	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
@@ -261,7 +264,7 @@
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -372,10 +360,10 @@
+@@ -372,10 +363,10 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -274,7 +277,7 @@
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +375,10 @@
+@@ -387,10 +378,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -287,7 +290,7 @@
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +389,40 @@
+@@ -401,40 +392,40 @@
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
@@ -340,7 +343,7 @@
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +446,33 @@
+@@ -458,32 +449,33 @@
  	  exit (-1);
  	}
  EOF
@@ -385,7 +388,7 @@
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +488,29 @@
+@@ -499,29 +491,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -424,7 +427,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +518,7 @@
+@@ -529,7 +521,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -433,7 +436,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -544,15 +533,19 @@
+@@ -544,15 +536,19 @@
  			exit(0);
  			}
  EOF
@@ -457,7 +460,7 @@
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -565,28 +558,28 @@
+@@ -565,28 +561,28 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -494,7 +497,7 @@
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -648,9 +641,19 @@
+@@ -648,9 +644,19 @@
  	esac
  	if [ ${HP_ARCH} = "hppa2.0w" ]
  	then
@@ -517,7 +520,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -658,11 +661,11 @@
+@@ -658,11 +664,11 @@
  	    fi
  	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -531,7 +534,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +693,192 @@
+@@ -690,161 +696,192 @@
  	  exit (0);
  	}
  EOF
@@ -775,7 +778,7 @@
      mips:Linux:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -861,8 +895,12 @@
+@@ -861,8 +898,12 @@
  	#endif
  	#endif
  EOF
@@ -790,7 +793,7 @@
  	;;
      mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -880,15 +918,22 @@
+@@ -880,15 +921,22 @@
  	#endif
  	#endif
  EOF
@@ -817,7 +820,7 @@
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +947,10 @@
+@@ -902,7 +950,10 @@
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -829,7 +832,7 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +958,31 @@
+@@ -910,25 +961,31 @@
  	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
@@ -868,7 +871,7 @@
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +1000,12 @@
+@@ -946,15 +1003,12 @@
  		;;
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
@@ -886,7 +889,7 @@
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
-@@ -971,7 +1022,7 @@
+@@ -971,7 +1025,7 @@
  	LIBC=gnulibc1
  	# endif
  	#else
@@ -895,7 +898,7 @@
  	LIBC=gnu
  	#else
[...2914 lines suppressed...]
  
-@@ -1334,7 +1413,6 @@
+@@ -1350,7 +1430,6 @@
  #	   To get around this problem, check for both libraries together
  #	   if -lsocket doesn't work by itself.
  #--------------------------------------------------------------------
@@ -21251,7 +21488,7 @@
  tcl_checkBoth=0
  AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
  if test "$tcl_checkSocket" = 1; then
-@@ -1371,8 +1449,8 @@
+@@ -1387,8 +1466,8 @@
  AC_SUBST(RL_OBJS)
  AC_SUBST(RL_LIB)
  
@@ -21262,7 +21499,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -1389,24 +1467,25 @@
+@@ -1405,24 +1484,25 @@
  #include <netinet/in.h>		/* struct in_addr, struct sockaddr_in */
  #include <arpa/inet.h>		/* inet_ntoa() */
  #include <netdb.h>		/* gethostbyname() */
@@ -21295,7 +21532,7 @@
  [AC_DEFINE(LISTEN_USE_FCNTL)
   AC_MSG_RESULT(yes)],
  AC_MSG_RESULT(no))
-@@ -1427,7 +1506,7 @@
+@@ -1443,7 +1523,7 @@
  AC_SUBST(USE_CLEANUP)
  gcl_ok=no
  
@@ -21304,7 +21541,7 @@
  if test $gcl_ok = yes ; then
  AC_DEFINE(ENDIAN_ALREADY_DEFINED)
  fi
-@@ -1459,32 +1538,35 @@
+@@ -1475,32 +1555,35 @@
  esac
  
  
@@ -21352,7 +21589,7 @@
  [AC_DEFINE(HAVE_SIGEMT)
   AC_SUBST(HAVE_SIGEMT)
   AC_MSG_RESULT(yes)],
-@@ -1495,13 +1577,14 @@
+@@ -1511,13 +1594,14 @@
  
  #if test $use = "386-linux" ; then
  	AC_CHECK_HEADERS(asm/sigcontext.h)
@@ -21373,7 +21610,7 @@
         [
          sigcontext_works=1;
          AC_DEFINE(SIGNAL_H_HAS_SIGCONTEXT)
-@@ -1512,18 +1595,19 @@
+@@ -1528,18 +1612,19 @@
           AC_MSG_RESULT(sigcontext NOT in signal.h)]
         )
         if test "$sigcontext_works" = 0 ; then
@@ -21398,7 +21635,7 @@
          [
          AC_DEFINE(HAVE_SIGCONTEXT)
  	AC_MSG_RESULT(sigcontext in asm files)
-@@ -1631,6 +1715,8 @@
+@@ -1647,6 +1732,8 @@
  AC_MSG_RESULT($INFO_DIR)
  AC_SUBST(INFO_DIR)
  
@@ -21407,7 +21644,7 @@
  AC_MSG_CHECKING([for tcl/tk])
  
  
-@@ -1651,9 +1737,6 @@
+@@ -1667,9 +1754,6 @@
  EOF
  #cp conftest.tcl foo.tcl
  
@@ -21417,7 +21654,7 @@
  if test "${TCLSH}" = "" ; then true ; else
  TCL_CONFIG_PREFIX=`${TCLSH} < conftest.tcl`
  fi
-@@ -1724,7 +1807,6 @@
+@@ -1740,7 +1824,6 @@
      TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
    fi
  fi
@@ -21425,7 +21662,7 @@
  if test "$have_ieee" = "0" ; then
   TCL_LIBS=`echo ${TCL_LIBS} | sed -e "s:-lieee::g" `
  fi
-@@ -1768,15 +1850,18 @@
+@@ -1784,15 +1867,18 @@
  
  # the time handling for unixtime, add timezone
  
@@ -21448,7 +21685,7 @@
    ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
   if test $gcl_ok = yes ; then
      AC_MSG_RESULT(yes)
-@@ -1795,8 +1880,6 @@
+@@ -1811,8 +1897,6 @@
  
  
  
@@ -21457,7 +21694,7 @@
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
  # then dlload("foo.o") a lisp file can refer to things in libX.so
-@@ -1820,7 +1903,7 @@
+@@ -1836,7 +1920,7 @@
  
  # redhat/cygnus released for some reason a buggy version of gcc,
  # which no one else released.   Catch that here.
@@ -21466,7 +21703,7 @@
  if  2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null 
     then 
          BROKEN_O4_OPT=1
-@@ -1853,7 +1936,8 @@
+@@ -1869,7 +1953,8 @@
  if test -f h/$use.defs  ; then
  
    AC_SUBST(use)
@@ -21477,8 +21714,8 @@
    cat makedefc
  
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-07-30 22:58:31.000000000 -0600
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 21:48:11.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-02-23 12:39:43.000000000 -0700
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:41:02.000000000 -0600
 @@ -1,15 +1,15 @@
 -/* h/gclincl.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
 +/* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
@@ -21634,9 +21871,9 @@
  #undef USE_DLOPEN
  
  #define MP_LIMB_BYTES 0
-@@ -212,50 +259,92 @@
- #undef HAVE_MALLOC_MALLOC_H
+@@ -213,47 +260,92 @@
  #undef HAVE_OBJC_MALLOC_H
+ #undef HAVE_OUTPUT_BFD
  
 -/* The number of bytes in a long.  */
 -#undef SIZEOF_LONG
@@ -21662,20 +21899,18 @@
  
 -/* Define if you have the <elf_abi.h> header file.  */
 -#undef HAVE_ELF_ABI_H
+-
+-/* Define if you have the <float.h> header file.  */
 +/* Define to 1 if you have the <float.h> header file. */
-+#undef HAVE_FLOAT_H
+ #undef HAVE_FLOAT_H
  
--/* Define if you have the <endian.h> header file.  */
--#undef HAVE_ENDIAN_H
+-/* Define if you have the <japi.h> header file.  */
 +/* Define to 1 if you have the `getcwd' function. */
 +#undef HAVE_GETCWD
- 
--/* Define if you have the <float.h> header file.  */
--#undef HAVE_FLOAT_H
++
 +/* Define to 1 if you have the `getwd' function. */
 +#undef HAVE_GETWD
- 
--/* Define if you have the <japi.h> header file.  */
++
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#undef HAVE_INTTYPES_H
 +
@@ -21755,7 +21990,7 @@
 +#undef X_DISPLAY_MISSING
 diff -dur gcl-2.6.8.ORIG/info/texinfo.tex gcl-2.6.8/info/texinfo.tex
 --- gcl-2.6.8.ORIG/info/texinfo.tex	2002-10-26 09:14:15.000000000 -0600
-+++ gcl-2.6.8/info/texinfo.tex	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/info/texinfo.tex	2009-04-27 09:37:11.000000000 -0600
 @@ -3,10 +3,11 @@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
@@ -32212,7 +32447,7 @@
 + at end ignore
 diff -dur gcl-2.6.8.ORIG/install.sh gcl-2.6.8/install.sh
 --- gcl-2.6.8.ORIG/install.sh	1999-12-06 15:43:54.000000000 -0700
-+++ gcl-2.6.8/install.sh	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/install.sh	2009-04-27 09:37:11.000000000 -0600
 @@ -1,19 +1,38 @@
 -#! /bin/sh
 -#
@@ -32917,7 +33152,7 @@
 +# End:
 diff -dur gcl-2.6.8.ORIG/ltmain.sh gcl-2.6.8/ltmain.sh
 --- gcl-2.6.8.ORIG/ltmain.sh	2002-08-08 23:49:32.000000000 -0600
-+++ gcl-2.6.8/ltmain.sh	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/ltmain.sh	2009-04-27 09:37:11.000000000 -0600
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun ltconfig.

gcl-2.6.8-unrandomize.patch:

Index: gcl-2.6.8-unrandomize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl-2.6.8-unrandomize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-unrandomize.patch	16 Jan 2009 22:22:38 -0000	1.1
+++ gcl-2.6.8-unrandomize.patch	27 Apr 2009 16:17:12 -0000	1.2
@@ -1,7 +1,7 @@
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:24:30.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:45:51.000000000 -0700
-@@ -9880,9 +9880,11 @@
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:50:47.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:51:31.000000000 -0600
+@@ -10024,9 +10024,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14,7 +14,7 @@
  		    return 0;}
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -9947,12 +9949,11 @@
+@@ -10091,12 +10093,11 @@
  /* end confdefs.h.  */
  
  		    #include <stdio.h>
@@ -29,7 +29,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}
-@@ -10009,12 +10010,11 @@
+@@ -10153,12 +10154,11 @@
  /* end confdefs.h.  */
  
  		    #include <stdio.h>
@@ -44,7 +44,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}
-@@ -10165,6 +10165,7 @@
+@@ -10309,6 +10309,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -52,7 +52,7 @@
  
  void gprof_cleanup() {}
  int
-@@ -10173,9 +10174,7 @@
+@@ -10317,9 +10318,7 @@
    char *b,*b1;
    FILE *fp;
  
@@ -64,9 +64,9 @@
    fp = fopen("conftest1","w");
  
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:24:30.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:37:26.000000000 -0700
-@@ -1087,9 +1087,11 @@
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:50:47.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:51:09.000000000 -0600
+@@ -1104,9 +1104,11 @@
  
  	AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -79,7 +79,7 @@
  		    return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
  
  	if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
-@@ -1102,12 +1104,11 @@
+@@ -1119,12 +1121,11 @@
  	AC_MSG_CHECKING([that sbrk is (now) non-random])
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  		    #include <stdio.h>
@@ -94,7 +94,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
-@@ -1116,12 +1117,11 @@
+@@ -1133,12 +1134,11 @@
  	fi
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  		    #include <stdio.h>
@@ -109,7 +109,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
-@@ -1163,6 +1163,7 @@
+@@ -1180,6 +1180,7 @@
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <stdlib.h>
@@ -117,7 +117,7 @@
  
  void gprof_cleanup() {}
  int
-@@ -1171,9 +1172,7 @@
+@@ -1188,9 +1189,7 @@
    char *b,*b1;
    FILE *fp;
  
@@ -130,7 +130,7 @@
  
 diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
 --- gcl-2.6.8.ORIG/h/unrandomize.h	2008-08-20 19:13:58.000000000 -0600
-+++ gcl-2.6.8/h/unrandomize.h	2008-12-29 16:42:15.000000000 -0700
++++ gcl-2.6.8/h/unrandomize.h	2009-04-27 09:51:09.000000000 -0600
 @@ -1,25 +1,33 @@
 +#include <stdlib.h>
  #include <sys/personality.h>
@@ -185,7 +185,7 @@
 -}
 diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
 --- gcl-2.6.8.ORIG/o/main.c	2008-07-31 13:12:59.000000000 -0600
-+++ gcl-2.6.8/o/main.c	2008-12-29 16:43:14.000000000 -0700
++++ gcl-2.6.8/o/main.c	2009-04-27 09:51:09.000000000 -0600
 @@ -51,6 +51,7 @@
  #include <signal.h>
  #endif


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gcl.spec	26 Jan 2009 20:54:31 -0000	1.30
+++ gcl.spec	27 Apr 2009 16:17:12 -0000	1.31
@@ -3,7 +3,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
 
 # Prerelease of 2.6.8
-%define alphatag 20080902cvs
+%define alphatag 20090303cvs
 
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}.2%{?dist}
+Release:        0.3.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -37,7 +37,7 @@
 # The source for this package was pulled from upstream's CVS repository.  Use
 # the following commands to generate the tarball:
 #   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
-#     -r Version_2_6_8pre -D 2008-09-02 -d gcl-2.6.8 gcl
+#     -r Version_2_6_8pre -D 2009-03-04 -d gcl-2.6.8 gcl
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
@@ -93,14 +93,9 @@
 # error on newer GCC systems due to an include inside a function.  This affects
 # the "unrandomize" sbrk() functionality, hence the name of the patch.
 Patch12:        gcl-2.6.8-unrandomize.patch
-# This patch was last sent upstream on 17 Jan 2009.  It fixes compilation with
-# a system BFD library that comes from a newer binutils distribution.  It also
-# updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
-# the GPL version 2.
-Patch13:        gcl-2.6.8-bfd.patch
 # This is a Fedora-specific patch.  Do not delete C files produced from D files
 # so they can be pulled into the debuginfo package.
-Patch14:        gcl-2.6.8-debuginfo.patch
+Patch13:        gcl-2.6.8-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libSM-devel
 BuildRequires:  libXext-devel
@@ -110,13 +105,14 @@
 BuildRequires:  tk-devel
 BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:  texlive, texlive-latex
+BuildRequires:  tex(latex)
 BuildRequires:  texinfo
 BuildRequires:  emacs, emacs-el
 BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
 BuildRequires:  selinux-policy
-Requires(post): /sbin/install-info, policycoreutils
-Requires(postun): /sbin/install-info, policycoreutils
+Requires:       gcl-selinux
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
 
 # GCL currently fails to build on PPC64 platforms.  See bugzilla #480519.
 ExcludeArch: ppc64
@@ -132,6 +128,7 @@
 Group:          Development/Languages
 Summary:        Emacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+BuildArch:      noarch
 
 %description emacs
 Emacs mode for interacting with GCL
@@ -140,6 +137,7 @@
 Group:          Development/Languages
 Summary:        Source for Emacs mode for interacting with GCL
 Requires:       %{name}-emacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 Source Elisp code for Emacs mode for interacting with GCL
@@ -150,6 +148,7 @@
 Summary:        XEmacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}
 Requires:       xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
+BuildArch:      noarch
 
 %description xemacs
 XEmacs mode for interacting with GCL
@@ -158,11 +157,24 @@
 Group:          Development/Languages
 Summary:        Source for XEmacs mode for interacting with GCL
 Requires:       %{name}-xemacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 Source Elisp code for XEmacs mode for interacting with GCL
 
 
+%package selinux
+Group:          Development/Languages
+Summary:        SELinux policy for GCL images
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
+
+%description selinux
+SELinux policy for GCL images.  All programs that dump GCL images to be run on
+SELinux-enabled hosts should Require this package, and give the image the type
+gcl_exec_t.
+
+
 %prep
 %setup -q
 %setup -q -T -D -a 2
@@ -180,10 +192,9 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 # Don't let the configure script add compiler flags we don't want
-sed -i -e 's/-fomit-frame-pointer//' -e 's/-O3/-O2/g' configure
+sed -i -e 's/fomit-frame-pointer/fno-strict-aliasing/' -e 's/-O3/-O2/g' configure
 
 # Fix a path in the launch script
 sed -i -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh
@@ -280,6 +291,9 @@
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
   --entry="* gcl-tk: (gcl-tk).	GNU Common Lisp Tk Manual." \
   2>/dev/null || :
+
+
+%post selinux
 /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
 /sbin/fixfiles -R gcl restore || :
 
@@ -289,6 +303,11 @@
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+fi
+
+
+%postun selinux
+if [ $1 = 0 ]; then
     /usr/sbin/semodule -r gcl || :
 fi
 
@@ -299,7 +318,6 @@
 %{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
-%{_datadir}/selinux/packages/gcl
 %doc COPYING* readme readme.xgcl RELEASE* ChangeLog* faq doc
 %doc gcl*.jpg gcl.ico gcl.png
 %doc --parent html
@@ -326,8 +344,21 @@
 %defattr(-,root,root,-)
 %{xemacs_lispdir}/gcl/*.el
 
+%files selinux
+%defattr(-,root,root,-)
+%{_datadir}/selinux/packages/gcl
+
 
 %changelog
+* Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
+- Update to 20090303 CVS snapshot
+- Drop upstreamed BFD patch
+- Make separate -selinux subpackage
+
+* Sat Feb 21 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.2.20080902cvs
+- Add -fno-strict-aliasing to fix build problems in Rawhide.
+- Fix the broken version number scheme I used on the last two releases.
+
 * Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
 - Add missing files required to build gcl.info, which is needed for the
   DESCRIBE function to work properly.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jan 2009 20:54:31 -0000	1.5
+++ sources	27 Apr 2009 16:17:12 -0000	1.6
@@ -1,2 +1,2 @@
-6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2
+ead10281e7dff246c686c410b29caad6  gcl-2.6.8.tar.bz2
 70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2


--- gcl-2.6.8-bfd.patch DELETED ---



From jjames at fedoraproject.org  Mon Apr 27 16:17:44 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 27 Apr 2009 16:17:44 +0000 (UTC)
Subject: rpms/gcl/F-11 gcl-2.6.8-alloca.patch, 1.1,
	1.2 gcl-2.6.8-extension.patch, 1.1,
	1.2 gcl-2.6.8-infrastructure.patch, 1.1,
	1.2 gcl-2.6.8-unrandomize.patch, 1.1, 1.2 gcl.spec, 1.35,
	1.36 sources, 1.5, 1.6 gcl-2.6.8-bfd.patch, 1.2, NONE
Message-ID: <20090427161744.32F0D70110@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8995/F-11

Modified Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-extension.patch 
	gcl-2.6.8-infrastructure.patch gcl-2.6.8-unrandomize.patch 
	gcl.spec sources 
Removed Files:
	gcl-2.6.8-bfd.patch 
Log Message:
* Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
- Update to 20090303 CVS snapshot
- Drop upstreamed BFD patch
- Make separate -selinux subpackage


gcl-2.6.8-alloca.patch:

Index: gcl-2.6.8-alloca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-alloca.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-alloca.patch	10 Jan 2009 05:23:17 -0000	1.1
+++ gcl-2.6.8-alloca.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2008-07-30 22:58:25.000000000 -0600
-+++ gcl-2.6.8/acconfig.h	2008-12-29 16:06:08.000000000 -0700
+--- gcl-2.6.8.ORIG/acconfig.h	2009-02-23 12:39:42.000000000 -0700
++++ gcl-2.6.8/acconfig.h	2009-04-27 09:46:14.000000000 -0600
 @@ -53,11 +53,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -16,8 +16,8 @@
  #endif
  
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:06:55.000000000 -0700
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:47:15.000000000 -0600
 @@ -645,6 +645,7 @@
  NIFLAGS
  FINAL_CFLAGS
@@ -26,7 +26,7 @@
  NOTIFY
  TCL_LIBS
  TCL_DL_LIBS
-@@ -13784,10 +13785,12 @@
+@@ -13928,10 +13929,12 @@
  
  # alloca
  
@@ -43,7 +43,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13795,16 +13798,17 @@
+@@ -13939,16 +13942,17 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -64,7 +64,7 @@
  if { (ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -13812,44 +13816,141 @@
+@@ -13956,44 +13960,141 @@
  esac
  eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  $as_echo "$ac_try_echo") >&5
@@ -223,7 +223,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13857,17 +13958,163 @@
+@@ -14001,17 +14102,163 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -389,7 +389,7 @@
  rm -f conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
-@@ -13890,43 +14137,30 @@
+@@ -14034,43 +14281,30 @@
    ac_status=$?
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -442,9 +442,9 @@
  
  # dlopen etc
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:06:43.000000000 -0700
-@@ -1852,33 +1852,7 @@
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:46:14.000000000 -0600
+@@ -1869,33 +1869,7 @@
  
  # alloca
  
@@ -480,8 +480,8 @@
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:05:13.000000000 -0700
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:06:55.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:45:41.000000000 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:46:14.000000000 -0600
 @@ -54,11 +54,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -496,9 +496,9 @@
  #include <alloca.h>
  #endif
  
-@@ -259,6 +258,21 @@
- #undef HAVE_MALLOC_MALLOC_H
+@@ -260,6 +259,21 @@
  #undef HAVE_OBJC_MALLOC_H
+ #undef HAVE_OUTPUT_BFD
  
 +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
 +   systems. This function is required for `alloca.c' support on those systems.
@@ -518,7 +518,7 @@
  /* Define to 1 if you have the <asm/sigcontext.h> header file. */
  #undef HAVE_ASM_SIGCONTEXT_H
  
-@@ -343,6 +357,14 @@
+@@ -344,6 +358,14 @@
  /* The size of `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  

gcl-2.6.8-extension.patch:

Index: gcl-2.6.8-extension.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-extension.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-extension.patch	10 Jan 2009 05:23:17 -0000	1.1
+++ gcl-2.6.8-extension.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/acconfig.h	2008-12-29 16:17:50.000000000 -0700
+--- gcl-2.6.8.ORIG/acconfig.h	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/acconfig.h	2009-04-27 09:49:25.000000000 -0600
 @@ -1,3 +1,6 @@
 +/* Whether compiling on a glibc-based system */
 +#undef _GNU_SOURCE
@@ -25,8 +25,8 @@
  #define ISFINITE(a) isfinite(a)
  #else
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:19:59.000000000 -0700
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:49:53.000000000 -0600
 @@ -691,9 +691,9 @@
  GMPDIR
  GMP
@@ -1805,7 +1805,7 @@
    { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
  $as_echo_n "checking for malloc/malloc.h... " >&6; }
  if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
-@@ -11349,7 +12566,6 @@
+@@ -11493,7 +12710,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -1813,7 +1813,7 @@
  		#include <math.h>
  
  int
-@@ -11488,7 +12704,6 @@
+@@ -11632,7 +12848,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -1822,8 +1822,8 @@
  
  int
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:19:46.000000000 -0700
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:49:25.000000000 -0600
 @@ -442,6 +442,7 @@
  	LDFLAGS=" "
  fi
@@ -1832,7 +1832,7 @@
  AC_PROG_CC
  AC_PROG_CPP
  AC_SUBST(CC)
-@@ -1339,7 +1340,6 @@
+@@ -1356,7 +1357,6 @@
  #
  AC_MSG_CHECKING([for isnormal])
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1840,7 +1840,7 @@
  		#include <math.h>
  		]],[[
  		float f;
-@@ -1367,7 +1367,6 @@
+@@ -1384,7 +1384,6 @@
  
  AC_MSG_CHECKING([for isfinite])
  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1849,8 +1849,8 @@
  		]],[[
  		float f;
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:11:21.000000000 -0700
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:19:33.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:49:00.000000000 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:49:25.000000000 -0600
 @@ -1,4 +1,7 @@
  /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
 +/* Whether compiling on a glibc-based system */
@@ -1875,7 +1875,7 @@
  #include <math.h>
  #define ISFINITE(a) isfinite(a)
  #else
-@@ -368,5 +369,37 @@
+@@ -369,5 +370,37 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
  

gcl-2.6.8-infrastructure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 gcl-2.6.8-infrastructure.patch
Index: gcl-2.6.8-infrastructure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-infrastructure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-infrastructure.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-infrastructure.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
 --- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
-+++ gcl-2.6.8/config.guess	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/config.guess	2009-04-27 09:34:38.000000000 -0600
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -10,7 +10,7 @@
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-04-22'
-+timestamp='2008-12-19'
++timestamp='2009-04-27'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@ -205,7 +205,7 @@
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +313,45 @@
+@@ -338,32 +313,48 @@
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -224,6 +224,9 @@
 -	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 +	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
@@ -261,7 +264,7 @@
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -372,10 +360,10 @@
+@@ -372,10 +363,10 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -274,7 +277,7 @@
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +375,10 @@
+@@ -387,10 +378,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -287,7 +290,7 @@
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -401,40 +389,40 @@
+@@ -401,40 +392,40 @@
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
@@ -340,7 +343,7 @@
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -458,32 +446,33 @@
+@@ -458,32 +449,33 @@
  	  exit (-1);
  	}
  EOF
@@ -385,7 +388,7 @@
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +488,29 @@
+@@ -499,29 +491,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -424,7 +427,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +518,7 @@
+@@ -529,7 +521,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -433,7 +436,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -544,15 +533,19 @@
+@@ -544,15 +536,19 @@
  			exit(0);
  			}
  EOF
@@ -457,7 +460,7 @@
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -565,28 +558,28 @@
+@@ -565,28 +561,28 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -494,7 +497,7 @@
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -648,9 +641,19 @@
+@@ -648,9 +644,19 @@
  	esac
  	if [ ${HP_ARCH} = "hppa2.0w" ]
  	then
@@ -517,7 +520,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -658,11 +661,11 @@
+@@ -658,11 +664,11 @@
  	    fi
  	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -531,7 +534,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -690,161 +693,192 @@
+@@ -690,161 +696,192 @@
  	  exit (0);
  	}
  EOF
@@ -775,7 +778,7 @@
      mips:Linux:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -861,8 +895,12 @@
+@@ -861,8 +898,12 @@
  	#endif
  	#endif
  EOF
@@ -790,7 +793,7 @@
  	;;
      mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -880,15 +918,22 @@
+@@ -880,15 +921,22 @@
  	#endif
  	#endif
  EOF
@@ -817,7 +820,7 @@
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -902,7 +947,10 @@
+@@ -902,7 +950,10 @@
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -829,7 +832,7 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -910,25 +958,31 @@
+@@ -910,25 +961,31 @@
  	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
@@ -868,7 +871,7 @@
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us. cd to the root directory to prevent
-@@ -946,15 +1000,12 @@
+@@ -946,15 +1003,12 @@
  		;;
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
@@ -886,7 +889,7 @@
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
-@@ -971,7 +1022,7 @@
+@@ -971,7 +1025,7 @@
  	LIBC=gnulibc1
  	# endif
  	#else
@@ -895,7 +898,7 @@
  	LIBC=gnu
  	#else
[...2914 lines suppressed...]
  
-@@ -1334,7 +1413,6 @@
+@@ -1350,7 +1430,6 @@
  #	   To get around this problem, check for both libraries together
  #	   if -lsocket doesn't work by itself.
  #--------------------------------------------------------------------
@@ -21251,7 +21488,7 @@
  tcl_checkBoth=0
  AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
  if test "$tcl_checkSocket" = 1; then
-@@ -1371,8 +1449,8 @@
+@@ -1387,8 +1466,8 @@
  AC_SUBST(RL_OBJS)
  AC_SUBST(RL_LIB)
  
@@ -21262,7 +21499,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -1389,24 +1467,25 @@
+@@ -1405,24 +1484,25 @@
  #include <netinet/in.h>		/* struct in_addr, struct sockaddr_in */
  #include <arpa/inet.h>		/* inet_ntoa() */
  #include <netdb.h>		/* gethostbyname() */
@@ -21295,7 +21532,7 @@
  [AC_DEFINE(LISTEN_USE_FCNTL)
   AC_MSG_RESULT(yes)],
  AC_MSG_RESULT(no))
-@@ -1427,7 +1506,7 @@
+@@ -1443,7 +1523,7 @@
  AC_SUBST(USE_CLEANUP)
  gcl_ok=no
  
@@ -21304,7 +21541,7 @@
  if test $gcl_ok = yes ; then
  AC_DEFINE(ENDIAN_ALREADY_DEFINED)
  fi
-@@ -1459,32 +1538,35 @@
+@@ -1475,32 +1555,35 @@
  esac
  
  
@@ -21352,7 +21589,7 @@
  [AC_DEFINE(HAVE_SIGEMT)
   AC_SUBST(HAVE_SIGEMT)
   AC_MSG_RESULT(yes)],
-@@ -1495,13 +1577,14 @@
+@@ -1511,13 +1594,14 @@
  
  #if test $use = "386-linux" ; then
  	AC_CHECK_HEADERS(asm/sigcontext.h)
@@ -21373,7 +21610,7 @@
         [
          sigcontext_works=1;
          AC_DEFINE(SIGNAL_H_HAS_SIGCONTEXT)
-@@ -1512,18 +1595,19 @@
+@@ -1528,18 +1612,19 @@
           AC_MSG_RESULT(sigcontext NOT in signal.h)]
         )
         if test "$sigcontext_works" = 0 ; then
@@ -21398,7 +21635,7 @@
          [
          AC_DEFINE(HAVE_SIGCONTEXT)
  	AC_MSG_RESULT(sigcontext in asm files)
-@@ -1631,6 +1715,8 @@
+@@ -1647,6 +1732,8 @@
  AC_MSG_RESULT($INFO_DIR)
  AC_SUBST(INFO_DIR)
  
@@ -21407,7 +21644,7 @@
  AC_MSG_CHECKING([for tcl/tk])
  
  
-@@ -1651,9 +1737,6 @@
+@@ -1667,9 +1754,6 @@
  EOF
  #cp conftest.tcl foo.tcl
  
@@ -21417,7 +21654,7 @@
  if test "${TCLSH}" = "" ; then true ; else
  TCL_CONFIG_PREFIX=`${TCLSH} < conftest.tcl`
  fi
-@@ -1724,7 +1807,6 @@
+@@ -1740,7 +1824,6 @@
      TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
    fi
  fi
@@ -21425,7 +21662,7 @@
  if test "$have_ieee" = "0" ; then
   TCL_LIBS=`echo ${TCL_LIBS} | sed -e "s:-lieee::g" `
  fi
-@@ -1768,15 +1850,18 @@
+@@ -1784,15 +1867,18 @@
  
  # the time handling for unixtime, add timezone
  
@@ -21448,7 +21685,7 @@
    ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
   if test $gcl_ok = yes ; then
      AC_MSG_RESULT(yes)
-@@ -1795,8 +1880,6 @@
+@@ -1811,8 +1897,6 @@
  
  
  
@@ -21457,7 +21694,7 @@
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
  # then dlload("foo.o") a lisp file can refer to things in libX.so
-@@ -1820,7 +1903,7 @@
+@@ -1836,7 +1920,7 @@
  
  # redhat/cygnus released for some reason a buggy version of gcc,
  # which no one else released.   Catch that here.
@@ -21466,7 +21703,7 @@
  if  2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null 
     then 
          BROKEN_O4_OPT=1
-@@ -1853,7 +1936,8 @@
+@@ -1869,7 +1953,8 @@
  if test -f h/$use.defs  ; then
  
    AC_SUBST(use)
@@ -21477,8 +21714,8 @@
    cat makedefc
  
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-07-30 22:58:31.000000000 -0600
-+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 21:48:11.000000000 -0700
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-02-23 12:39:43.000000000 -0700
++++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:41:02.000000000 -0600
 @@ -1,15 +1,15 @@
 -/* h/gclincl.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
 +/* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
@@ -21634,9 +21871,9 @@
  #undef USE_DLOPEN
  
  #define MP_LIMB_BYTES 0
-@@ -212,50 +259,92 @@
- #undef HAVE_MALLOC_MALLOC_H
+@@ -213,47 +260,92 @@
  #undef HAVE_OBJC_MALLOC_H
+ #undef HAVE_OUTPUT_BFD
  
 -/* The number of bytes in a long.  */
 -#undef SIZEOF_LONG
@@ -21662,20 +21899,18 @@
  
 -/* Define if you have the <elf_abi.h> header file.  */
 -#undef HAVE_ELF_ABI_H
+-
+-/* Define if you have the <float.h> header file.  */
 +/* Define to 1 if you have the <float.h> header file. */
-+#undef HAVE_FLOAT_H
+ #undef HAVE_FLOAT_H
  
--/* Define if you have the <endian.h> header file.  */
--#undef HAVE_ENDIAN_H
+-/* Define if you have the <japi.h> header file.  */
 +/* Define to 1 if you have the `getcwd' function. */
 +#undef HAVE_GETCWD
- 
--/* Define if you have the <float.h> header file.  */
--#undef HAVE_FLOAT_H
++
 +/* Define to 1 if you have the `getwd' function. */
 +#undef HAVE_GETWD
- 
--/* Define if you have the <japi.h> header file.  */
++
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#undef HAVE_INTTYPES_H
 +
@@ -21755,7 +21990,7 @@
 +#undef X_DISPLAY_MISSING
 diff -dur gcl-2.6.8.ORIG/info/texinfo.tex gcl-2.6.8/info/texinfo.tex
 --- gcl-2.6.8.ORIG/info/texinfo.tex	2002-10-26 09:14:15.000000000 -0600
-+++ gcl-2.6.8/info/texinfo.tex	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/info/texinfo.tex	2009-04-27 09:37:11.000000000 -0600
 @@ -3,10 +3,11 @@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
@@ -32212,7 +32447,7 @@
 + at end ignore
 diff -dur gcl-2.6.8.ORIG/install.sh gcl-2.6.8/install.sh
 --- gcl-2.6.8.ORIG/install.sh	1999-12-06 15:43:54.000000000 -0700
-+++ gcl-2.6.8/install.sh	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/install.sh	2009-04-27 09:37:11.000000000 -0600
 @@ -1,19 +1,38 @@
 -#! /bin/sh
 -#
@@ -32917,7 +33152,7 @@
 +# End:
 diff -dur gcl-2.6.8.ORIG/ltmain.sh gcl-2.6.8/ltmain.sh
 --- gcl-2.6.8.ORIG/ltmain.sh	2002-08-08 23:49:32.000000000 -0600
-+++ gcl-2.6.8/ltmain.sh	2008-12-29 21:48:11.000000000 -0700
++++ gcl-2.6.8/ltmain.sh	2009-04-27 09:37:11.000000000 -0600
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun ltconfig.

gcl-2.6.8-unrandomize.patch:

Index: gcl-2.6.8-unrandomize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-unrandomize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-unrandomize.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-unrandomize.patch	27 Apr 2009 16:17:13 -0000	1.2
@@ -1,7 +1,7 @@
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2008-12-29 16:24:30.000000000 -0700
-+++ gcl-2.6.8/configure	2008-12-29 16:45:51.000000000 -0700
-@@ -9880,9 +9880,11 @@
+--- gcl-2.6.8.ORIG/configure	2009-04-27 09:50:47.000000000 -0600
++++ gcl-2.6.8/configure	2009-04-27 09:51:31.000000000 -0600
+@@ -10024,9 +10024,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14,7 +14,7 @@
  		    return 0;}
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -9947,12 +9949,11 @@
+@@ -10091,12 +10093,11 @@
  /* end confdefs.h.  */
  
  		    #include <stdio.h>
@@ -29,7 +29,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}
-@@ -10009,12 +10010,11 @@
+@@ -10153,12 +10154,11 @@
  /* end confdefs.h.  */
  
  		    #include <stdio.h>
@@ -44,7 +44,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}
-@@ -10165,6 +10165,7 @@
+@@ -10309,6 +10309,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -52,7 +52,7 @@
  
  void gprof_cleanup() {}
  int
-@@ -10173,9 +10174,7 @@
+@@ -10317,9 +10318,7 @@
    char *b,*b1;
    FILE *fp;
  
@@ -64,9 +64,9 @@
    fp = fopen("conftest1","w");
  
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:24:30.000000000 -0700
-+++ gcl-2.6.8/configure.in	2008-12-29 16:37:26.000000000 -0700
-@@ -1087,9 +1087,11 @@
+--- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:50:47.000000000 -0600
++++ gcl-2.6.8/configure.in	2009-04-27 09:51:09.000000000 -0600
+@@ -1104,9 +1104,11 @@
  
  	AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -79,7 +79,7 @@
  		    return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
  
  	if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
-@@ -1102,12 +1104,11 @@
+@@ -1119,12 +1121,11 @@
  	AC_MSG_CHECKING([that sbrk is (now) non-random])
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  		    #include <stdio.h>
@@ -94,7 +94,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
-@@ -1116,12 +1117,11 @@
+@@ -1133,12 +1134,11 @@
  	fi
  	AC_RUN_IFELSE([AC_LANG_SOURCE([[
  		    #include <stdio.h>
@@ -109,7 +109,7 @@
  			if (!(f=fopen("conftest1","w"))) return -1;
  			fprintf(f,"%u",sbrk(0));
  			return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
-@@ -1163,6 +1163,7 @@
+@@ -1180,6 +1180,7 @@
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <stdlib.h>
@@ -117,7 +117,7 @@
  
  void gprof_cleanup() {}
  int
-@@ -1171,9 +1172,7 @@
+@@ -1188,9 +1189,7 @@
    char *b,*b1;
    FILE *fp;
  
@@ -130,7 +130,7 @@
  
 diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
 --- gcl-2.6.8.ORIG/h/unrandomize.h	2008-08-20 19:13:58.000000000 -0600
-+++ gcl-2.6.8/h/unrandomize.h	2008-12-29 16:42:15.000000000 -0700
++++ gcl-2.6.8/h/unrandomize.h	2009-04-27 09:51:09.000000000 -0600
 @@ -1,25 +1,33 @@
 +#include <stdlib.h>
  #include <sys/personality.h>
@@ -185,7 +185,7 @@
 -}
 diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
 --- gcl-2.6.8.ORIG/o/main.c	2008-07-31 13:12:59.000000000 -0600
-+++ gcl-2.6.8/o/main.c	2008-12-29 16:43:14.000000000 -0700
++++ gcl-2.6.8/o/main.c	2009-04-27 09:51:09.000000000 -0600
 @@ -51,6 +51,7 @@
  #include <signal.h>
  #endif


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gcl.spec	24 Feb 2009 19:49:28 -0000	1.35
+++ gcl.spec	27 Apr 2009 16:17:13 -0000	1.36
@@ -3,7 +3,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
 
 # Prerelease of 2.6.8
-%define alphatag 20080902cvs
+%define alphatag 20090303cvs
 
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
@@ -37,7 +37,7 @@
 # The source for this package was pulled from upstream's CVS repository.  Use
 # the following commands to generate the tarball:
 #   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
-#     -r Version_2_6_8pre -D 2008-09-02 -d gcl-2.6.8 gcl
+#     -r Version_2_6_8pre -D 2009-03-04 -d gcl-2.6.8 gcl
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
@@ -93,14 +93,9 @@
 # error on newer GCC systems due to an include inside a function.  This affects
 # the "unrandomize" sbrk() functionality, hence the name of the patch.
 Patch12:        gcl-2.6.8-unrandomize.patch
-# This patch was last sent upstream on 17 Jan 2009.  It fixes compilation with
-# a system BFD library that comes from a newer binutils distribution.  It also
-# updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
-# the GPL version 2.
-Patch13:        gcl-2.6.8-bfd.patch
 # This is a Fedora-specific patch.  Do not delete C files produced from D files
 # so they can be pulled into the debuginfo package.
-Patch14:        gcl-2.6.8-debuginfo.patch
+Patch13:        gcl-2.6.8-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libSM-devel
 BuildRequires:  libXext-devel
@@ -110,13 +105,14 @@
 BuildRequires:  tk-devel
 BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:  texlive, texlive-latex
+BuildRequires:  tex(latex)
 BuildRequires:  texinfo
 BuildRequires:  emacs, emacs-el
 BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
 BuildRequires:  selinux-policy
-Requires(post): /sbin/install-info, policycoreutils
-Requires(postun): /sbin/install-info, policycoreutils
+Requires:       gcl-selinux
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
 
 # GCL currently fails to build on PPC64 platforms.  See bugzilla #480519.
 ExcludeArch: ppc64
@@ -132,6 +128,7 @@
 Group:          Development/Languages
 Summary:        Emacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+BuildArch:      noarch
 
 %description emacs
 Emacs mode for interacting with GCL
@@ -140,6 +137,7 @@
 Group:          Development/Languages
 Summary:        Source for Emacs mode for interacting with GCL
 Requires:       %{name}-emacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 Source Elisp code for Emacs mode for interacting with GCL
@@ -150,6 +148,7 @@
 Summary:        XEmacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}
 Requires:       xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
+BuildArch:      noarch
 
 %description xemacs
 XEmacs mode for interacting with GCL
@@ -158,11 +157,24 @@
 Group:          Development/Languages
 Summary:        Source for XEmacs mode for interacting with GCL
 Requires:       %{name}-xemacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 Source Elisp code for XEmacs mode for interacting with GCL
 
 
+%package selinux
+Group:          Development/Languages
+Summary:        SELinux policy for GCL images
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
+
+%description selinux
+SELinux policy for GCL images.  All programs that dump GCL images to be run on
+SELinux-enabled hosts should Require this package, and give the image the type
+gcl_exec_t.
+
+
 %prep
 %setup -q
 %setup -q -T -D -a 2
@@ -180,7 +192,6 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 # Don't let the configure script add compiler flags we don't want
 sed -i -e 's/fomit-frame-pointer/fno-strict-aliasing/' -e 's/-O3/-O2/g' configure
@@ -280,6 +291,9 @@
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
   --entry="* gcl-tk: (gcl-tk).	GNU Common Lisp Tk Manual." \
   2>/dev/null || :
+
+
+%post selinux
 /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
 /sbin/fixfiles -R gcl restore || :
 
@@ -289,6 +303,11 @@
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+fi
+
+
+%postun selinux
+if [ $1 = 0 ]; then
     /usr/sbin/semodule -r gcl || :
 fi
 
@@ -299,7 +318,6 @@
 %{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
-%{_datadir}/selinux/packages/gcl
 %doc COPYING* readme readme.xgcl RELEASE* ChangeLog* faq doc
 %doc gcl*.jpg gcl.ico gcl.png
 %doc --parent html
@@ -326,8 +344,17 @@
 %defattr(-,root,root,-)
 %{xemacs_lispdir}/gcl/*.el
 
+%files selinux
+%defattr(-,root,root,-)
+%{_datadir}/selinux/packages/gcl
+
 
 %changelog
+* Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
+- Update to 20090303 CVS snapshot
+- Drop upstreamed BFD patch
+- Make separate -selinux subpackage
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.8-0.3.20080902cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jan 2009 20:54:32 -0000	1.5
+++ sources	27 Apr 2009 16:17:13 -0000	1.6
@@ -1,2 +1,2 @@
-6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2
+ead10281e7dff246c686c410b29caad6  gcl-2.6.8.tar.bz2
 70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2


--- gcl-2.6.8-bfd.patch DELETED ---



From rdieter at fedoraproject.org  Mon Apr 27 16:20:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 16:20:37 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 kdegraphics.spec,1.167,1.168
Message-ID: <20090427162037.B13D370129@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9949

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdegraphics.spec	3 Apr 2009 17:19:15 -0000	1.167
+++ kdegraphics.spec	27 Apr 2009 16:20:07 -0000	1.168
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        5%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -32,11 +32,14 @@
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
+%ifnarch s390 s390x
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
 BuildRequires:  gphoto2-devel
 %endif
+BuildRequires:  sane-backends-devel
+%endif
 BuildRequires:  libspectre-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXxf86vm-devel
@@ -44,12 +47,14 @@
 BuildRequires:  poppler-qt4-devel
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
-BuildRequires:  sane-backends-devel
 BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+# used by okular
+Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Requires: cups
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
@@ -90,16 +95,19 @@
 %description devel
 %{summary}.
 
+%package -n kio_msits
+Group: System Environment/Libraries
+Summary: A kioslave for displaying WinHelp files 
+%description -n kio_msits
+%{summary}.
+
 
 %prep
 %setup -q -n kdegraphics-%{version}
 %patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
-# upstream patches
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -162,7 +170,9 @@
 %{_kde4_configdir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/camera.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -171,11 +181,12 @@
 %{_kde4_appsdir}/svgpart/
 %{_kde4_libdir}/kde4/gsthumbnail.so
 %{_kde4_libdir}/kde4/gvpart.so
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/kio_kamera.so
-%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/ksaneplugin.so
+%endif
+%{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -202,11 +213,12 @@
 %{_kde4_libdir}/libkexiv2.so.7*
 %{_kde4_libdir}/libkipi.so.6*
 %{_kde4_libdir}/libkolourpaint_lgpl.so.4*
+%ifnarch s390 s390x
 %{_kde4_libdir}/libksane.so.0*
+%endif
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %if ! 0%{?omit_kde3_conflicts}
@@ -214,15 +226,28 @@
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
 %endif
+%ifnarch s390 s390x
 %{_kde4_includedir}/libksane/
+%endif
 %{_kde4_includedir}/okular/
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/FindKSane.cmake
 %{_kde4_appsdir}/cmake/modules/FindOkular.cmake
 %{_libdir}/pkgconfig/*.pc
 
+%files -n kio_msits
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kio_msits.so
+%{_kde4_datadir}/kde4/services/msits.protocol
+
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
+
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- fix build issue on s390(x)
+
 * Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
 - work around Kolourpaint crash with Qt 4.5 (kde#183850)
 



From itamarjp at fedoraproject.org  Mon Apr 27 16:21:01 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 27 Apr 2009 16:21:01 +0000 (UTC)
Subject: rpms/bareftp/devel bareftp.spec, NONE, 1.1 bareftp_libdir.patch,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427162101.4091370110@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bareftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10123/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bareftp.spec bareftp_libdir.patch import.log 
Log Message:
initial rpm version



--- NEW FILE bareftp.spec ---
%global debug_package %{nil}

Name:           bareftp
Version:        0.2.2
Release:        2%{?dist}
Summary:        File transfer client supporting the FTP, FTP over SSL/TLS (FTPS) and SSH

Group:          Applications/Internet

#  <spot> cassmodiah: okay, so the code from SharpSSH and JSch is BSD, the Banshee
#  bits are MIT, the Classpath bits are GPLv2+ with exceptions
#  <spot> cassmodiah: if you combine all of that with GPLv2 only code, you end up
#  with GPLv2 with exceptions
#  <spot> cassmodiah: feel free to put that in comments above the License tag to
#  explain it. :)

License:        GPLv2 with exceptions
URL:            http://www.bareftp.org/
Source0:        http://www.bareftp.org/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         bareftp_libdir.patch

BuildRequires:  gnome-sharp-devel
BuildRequires:  gettext
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-desktop-sharp-devel
BuildRequires:  gtk-sharp2-gapi
BuildRequires:  gtk-sharp2-devel
BuildRequires:  mono-devel

Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils


# Mono only available on these:
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparcv9 alpha

%description
bareFTP is a file transfer client supporting the FTP, FTP over SSL/TLS (FTPS)
and SSH File Transfer Protocol (SFTP). It is written in C#, targeting the Mono
framework and the GNOME desktop environment. bareFTP is free and open source
software released under the terms of the GPL license.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
do
   desktop-file-validate $file
done

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%postun
update-desktop-database &> /dev/null ||:

if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
        gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS README
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bareFTP.Common.Utils.dll
%{_libdir}/%{name}/bareFTP.Connection.dll
%{_libdir}/%{name}/bareFTP.Gui.Dialog.dll
%{_libdir}/%{name}/bareFTP.Gui.FileManager.dll
%{_libdir}/%{name}/bareFTP.Gui.Preferences.dll
%{_libdir}/%{name}/bareFTP.Gui.ProgressMonitor.dll
%{_libdir}/%{name}/bareFTP.Gui.dll
%{_libdir}/%{name}/bareFTP.Preferences.dll
%{_libdir}/%{name}/bareFTP.Protocol.Ftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.Sftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.dll
%{_libdir}/%{name}/bareftp.exe
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop


%changelog
* Sat Apr 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-2
- fix from rhbz #495001 Comment #1 From  Simon Wesp (cassmodiah at fedoraproject.org)
- include ExclusiveArch, disable creation of debuginfo package

* Wed Apr 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-1
- Initial RPM release

bareftp_libdir.patch:

--- NEW FILE bareftp_libdir.patch ---
--- a/script.in	2009-04-08 22:46:44.000000000 -0300
+++ b/script.in	2009-04-08 22:54:48.000000000 -0300
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @MONO@ @prefix@/lib/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"
+exec @MONO@ @pkglibdir@/bareftp.exe $MONO_EXTRA_ARGS "$@"


--- NEW FILE import.log ---
bareftp-0_2_2-2_fc11:HEAD:bareftp-0.2.2-2.fc11.src.rpm:1240849107


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:28:14 -0000	1.1
+++ .cvsignore	27 Apr 2009 16:20:30 -0000	1.2
@@ -0,0 +1 @@
+bareftp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:28:15 -0000	1.1
+++ sources	27 Apr 2009 16:20:30 -0000	1.2
@@ -0,0 +1 @@
+d19c2cb8ea26703e4d9314772a0acc94  bareftp-0.2.2.tar.gz



From itamarjp at fedoraproject.org  Mon Apr 27 16:24:43 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 27 Apr 2009 16:24:43 +0000 (UTC)
Subject: rpms/bareftp/F-11 bareftp.spec, NONE, 1.1 bareftp_libdir.patch, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427162443.DCF7470110@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bareftp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11303/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	bareftp.spec bareftp_libdir.patch import.log 
Log Message:
initial rpm version



--- NEW FILE bareftp.spec ---
%global debug_package %{nil}

Name:           bareftp
Version:        0.2.2
Release:        2%{?dist}
Summary:        File transfer client supporting the FTP, FTP over SSL/TLS (FTPS) and SSH

Group:          Applications/Internet

#  <spot> cassmodiah: okay, so the code from SharpSSH and JSch is BSD, the Banshee
#  bits are MIT, the Classpath bits are GPLv2+ with exceptions
#  <spot> cassmodiah: if you combine all of that with GPLv2 only code, you end up
#  with GPLv2 with exceptions
#  <spot> cassmodiah: feel free to put that in comments above the License tag to
#  explain it. :)

License:        GPLv2 with exceptions
URL:            http://www.bareftp.org/
Source0:        http://www.bareftp.org/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         bareftp_libdir.patch

BuildRequires:  gnome-sharp-devel
BuildRequires:  gettext
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-desktop-sharp-devel
BuildRequires:  gtk-sharp2-gapi
BuildRequires:  gtk-sharp2-devel
BuildRequires:  mono-devel

Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils


# Mono only available on these:
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparcv9 alpha

%description
bareFTP is a file transfer client supporting the FTP, FTP over SSL/TLS (FTPS)
and SSH File Transfer Protocol (SFTP). It is written in C#, targeting the Mono
framework and the GNOME desktop environment. bareFTP is free and open source
software released under the terms of the GPL license.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
do
   desktop-file-validate $file
done

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%postun
update-desktop-database &> /dev/null ||:

if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
        gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS README
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bareFTP.Common.Utils.dll
%{_libdir}/%{name}/bareFTP.Connection.dll
%{_libdir}/%{name}/bareFTP.Gui.Dialog.dll
%{_libdir}/%{name}/bareFTP.Gui.FileManager.dll
%{_libdir}/%{name}/bareFTP.Gui.Preferences.dll
%{_libdir}/%{name}/bareFTP.Gui.ProgressMonitor.dll
%{_libdir}/%{name}/bareFTP.Gui.dll
%{_libdir}/%{name}/bareFTP.Preferences.dll
%{_libdir}/%{name}/bareFTP.Protocol.Ftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.Sftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.dll
%{_libdir}/%{name}/bareftp.exe
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop


%changelog
* Sat Apr 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-2
- fix from rhbz #495001 Comment #1 From  Simon Wesp (cassmodiah at fedoraproject.org)
- include ExclusiveArch, disable creation of debuginfo package

* Wed Apr 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-1
- Initial RPM release

bareftp_libdir.patch:

--- NEW FILE bareftp_libdir.patch ---
--- a/script.in	2009-04-08 22:46:44.000000000 -0300
+++ b/script.in	2009-04-08 22:54:48.000000000 -0300
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @MONO@ @prefix@/lib/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"
+exec @MONO@ @pkglibdir@/bareftp.exe $MONO_EXTRA_ARGS "$@"


--- NEW FILE import.log ---
bareftp-0_2_2-2_fc11:F-11:bareftp-0.2.2-2.fc11.src.rpm:1240849368


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:28:14 -0000	1.1
+++ .cvsignore	27 Apr 2009 16:24:13 -0000	1.2
@@ -0,0 +1 @@
+bareftp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:28:15 -0000	1.1
+++ sources	27 Apr 2009 16:24:13 -0000	1.2
@@ -0,0 +1 @@
+d19c2cb8ea26703e4d9314772a0acc94  bareftp-0.2.2.tar.gz



From itamarjp at fedoraproject.org  Mon Apr 27 16:32:24 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 27 Apr 2009 16:32:24 +0000 (UTC)
Subject: rpms/qt-creator/F-9 import.log,1.3,1.4
Message-ID: <20090427163224.5FBF570110@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12360/F-9

Modified Files:
	import.log 
Log Message:
qt-creator 1.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	25 Apr 2009 23:38:16 -0000	1.3
+++ import.log	27 Apr 2009 16:31:53 -0000	1.4
@@ -1,3 +1,4 @@
 qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
 qt-creator-1_1_0-1_fc11:HEAD:qt-creator-1.1.0-1.fc11.src.rpm:1240510779
 qt-creator-1_1_0-2_fc11:HEAD:qt-creator-1.1.0-2.fc11.src.rpm:1240702375
+qt-creator-1_1_0-2_fc11:F-9:qt-creator-1.1.0-2.fc11.src.rpm:1240849850



From jkratoch at fedoraproject.org  Mon Apr 27 16:32:38 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 27 Apr 2009 16:32:38 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.346,1.347
Message-ID: <20090427163238.D673970110@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12440

Modified Files:
	gdb.spec 
Log Message:
* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-23
- Fix BuildRequires for new Koji.



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- gdb.spec	27 Apr 2009 15:22:01 -0000	1.346
+++ gdb.spec	27 Apr 2009 16:32:08 -0000	1.347
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 22%{?_with_upstream:.upstream}%{?dist}
+Release: 23%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -390,7 +390,7 @@
 BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
-BuildRequires: python-devel
+BuildRequires: python python-devel
 # Temporarily before it gets moved to libstdc++.rpm
 BuildRequires: libstdc++
 
@@ -861,6 +861,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-23
+- Fix BuildRequires for new Koji.
+
 * Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-22
 - Fix pstack/gstack cutting very long lines (BZ 497849).
 



From rdieter at fedoraproject.org  Mon Apr 27 16:12:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 16:12:59 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 kdegraphics.spec,1.190,1.191
Message-ID: <20090427161259.98E1270110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8092

Modified Files:
	kdegraphics.spec 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kdegraphics.spec	3 Apr 2009 17:19:14 -0000	1.190
+++ kdegraphics.spec	27 Apr 2009 16:12:29 -0000	1.191
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        3%{?dist}
+Release:        5%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -32,11 +32,14 @@
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
+%ifnarch s390 s390x
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
 BuildRequires:  gphoto2-devel
 %endif
+BuildRequires:  sane-backends-devel
+%endif
 BuildRequires:  libspectre-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXxf86vm-devel
@@ -44,12 +47,14 @@
 BuildRequires:  poppler-qt4-devel
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
-BuildRequires:  sane-backends-devel
 BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+# used by okular
+Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Requires: cups
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
@@ -90,16 +95,19 @@
 %description devel
 %{summary}.
 
+%package -n kio_msits
+Group: System Environment/Libraries
+Summary: A kioslave for displaying WinHelp files 
+%description -n kio_msits
+%{summary}.
+
 
 %prep
 %setup -q -n kdegraphics-%{version}
 %patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
-# upstream patches
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -162,7 +170,9 @@
 %{_kde4_configdir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/camera.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -171,11 +181,12 @@
 %{_kde4_appsdir}/svgpart/
 %{_kde4_libdir}/kde4/gsthumbnail.so
 %{_kde4_libdir}/kde4/gvpart.so
+%ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/kio_kamera.so
-%{_kde4_libdir}/kde4/kio_msits.so
 %{_kde4_libdir}/kde4/ksaneplugin.so
+%endif
+%{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
 %{_kde4_libdir}/kde4/svgpart.so
@@ -202,11 +213,12 @@
 %{_kde4_libdir}/libkexiv2.so.7*
 %{_kde4_libdir}/libkipi.so.6*
 %{_kde4_libdir}/libkolourpaint_lgpl.so.4*
+%ifnarch s390 s390x
 %{_kde4_libdir}/libksane.so.0*
+%endif
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %if ! 0%{?omit_kde3_conflicts}
@@ -214,15 +226,28 @@
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
 %endif
+%ifnarch s390 s390x
 %{_kde4_includedir}/libksane/
+%endif
 %{_kde4_includedir}/okular/
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/FindKSane.cmake
 %{_kde4_appsdir}/cmake/modules/FindOkular.cmake
 %{_libdir}/pkgconfig/*.pc
 
+%files -n kio_msits
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kio_msits.so
+%{_kde4_datadir}/kde4/services/msits.protocol
+
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
+
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- fix build issue on s390(x)
+
 * Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
 - work around Kolourpaint crash with Qt 4.5 (kde#183850)
 



From itamarjp at fedoraproject.org  Mon Apr 27 16:13:02 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 27 Apr 2009 16:13:02 +0000 (UTC)
Subject: rpms/bareftp/F-10 bareftp.spec, NONE, 1.1 bareftp_libdir.patch, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427161302.70B1070110@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/bareftp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8004/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	bareftp.spec bareftp_libdir.patch import.log 
Log Message:
initial rpm version



--- NEW FILE bareftp.spec ---
%global debug_package %{nil}

Name:           bareftp
Version:        0.2.2
Release:        2%{?dist}
Summary:        File transfer client supporting the FTP, FTP over SSL/TLS (FTPS) and SSH

Group:          Applications/Internet

#  <spot> cassmodiah: okay, so the code from SharpSSH and JSch is BSD, the Banshee
#  bits are MIT, the Classpath bits are GPLv2+ with exceptions
#  <spot> cassmodiah: if you combine all of that with GPLv2 only code, you end up
#  with GPLv2 with exceptions
#  <spot> cassmodiah: feel free to put that in comments above the License tag to
#  explain it. :)

License:        GPLv2 with exceptions
URL:            http://www.bareftp.org/
Source0:        http://www.bareftp.org/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         bareftp_libdir.patch

BuildRequires:  gnome-sharp-devel
BuildRequires:  gettext
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-desktop-sharp-devel
BuildRequires:  gtk-sharp2-gapi
BuildRequires:  gtk-sharp2-devel
BuildRequires:  mono-devel

Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils


# Mono only available on these:
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparcv9 alpha

%description
bareFTP is a file transfer client supporting the FTP, FTP over SSL/TLS (FTPS)
and SSH File Transfer Protocol (SFTP). It is written in C#, targeting the Mono
framework and the GNOME desktop environment. bareFTP is free and open source
software released under the terms of the GPL license.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"


for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
do
   desktop-file-validate $file
done

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%postun
update-desktop-database &> /dev/null ||:

if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
        gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS README
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bareFTP.Common.Utils.dll
%{_libdir}/%{name}/bareFTP.Connection.dll
%{_libdir}/%{name}/bareFTP.Gui.Dialog.dll
%{_libdir}/%{name}/bareFTP.Gui.FileManager.dll
%{_libdir}/%{name}/bareFTP.Gui.Preferences.dll
%{_libdir}/%{name}/bareFTP.Gui.ProgressMonitor.dll
%{_libdir}/%{name}/bareFTP.Gui.dll
%{_libdir}/%{name}/bareFTP.Preferences.dll
%{_libdir}/%{name}/bareFTP.Protocol.Ftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.Sftp.dll
%{_libdir}/%{name}/bareFTP.Protocol.dll
%{_libdir}/%{name}/bareftp.exe
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop


%changelog
* Sat Apr 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-2
- fix from rhbz #495001 Comment #1 From  Simon Wesp (cassmodiah at fedoraproject.org)
- include ExclusiveArch, disable creation of debuginfo package

* Wed Apr 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.2.2-1
- Initial RPM release

bareftp_libdir.patch:

--- NEW FILE bareftp_libdir.patch ---
--- a/script.in	2009-04-08 22:46:44.000000000 -0300
+++ b/script.in	2009-04-08 22:54:48.000000000 -0300
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @MONO@ @prefix@/lib/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"
+exec @MONO@ @pkglibdir@/bareftp.exe $MONO_EXTRA_ARGS "$@"


--- NEW FILE import.log ---
bareftp-0_2_2-2_fc11:F-10:bareftp-0.2.2-2.fc11.src.rpm:1240848705


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:28:14 -0000	1.1
+++ .cvsignore	27 Apr 2009 16:12:32 -0000	1.2
@@ -0,0 +1 @@
+bareftp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:28:15 -0000	1.1
+++ sources	27 Apr 2009 16:12:32 -0000	1.2
@@ -0,0 +1 @@
+d19c2cb8ea26703e4d9314772a0acc94  bareftp-0.2.2.tar.gz



From itamarjp at fedoraproject.org  Mon Apr 27 16:37:50 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 27 Apr 2009 16:37:50 +0000 (UTC)
Subject: rpms/qt-creator/F-10 import.log,1.3,1.4
Message-ID: <20090427163750.152ED70110@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13099/F-10

Modified Files:
	import.log 
Log Message:
qt-creator 1.1.0



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	25 Apr 2009 23:38:16 -0000	1.3
+++ import.log	27 Apr 2009 16:37:19 -0000	1.4
@@ -1,3 +1,4 @@
 qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
 qt-creator-1_1_0-1_fc11:HEAD:qt-creator-1.1.0-1.fc11.src.rpm:1240510779
 qt-creator-1_1_0-2_fc11:HEAD:qt-creator-1.1.0-2.fc11.src.rpm:1240702375
+qt-creator-1_1_0-2_fc11:F-10:qt-creator-1.1.0-2.fc11.src.rpm:1240850030



From ellert at fedoraproject.org  Mon Apr 27 16:46:18 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 16:46:18 +0000 (UTC)
Subject: rpms/globus-core/devel globus-spec-creator, NONE,
	1.1 globus-core.spec, 1.3, 1.4 import.log, 1.3, 1.4
Message-ID: <20090427164618.1D00670110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14158/devel

Modified Files:
	globus-core.spec import.log 
Added Files:
	globus-spec-creator 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script



--- NEW FILE globus-spec-creator ---
#!/usr/bin/perl

use Getopt::Long;
use POSIX;
use XML::DOM;
use User::pwent;
use Sys::Hostname;
use Pod::Usage;

my $gptfile;
my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
my $toolkitversion = "4.2.1";
my $email;
my $nodoc;
my $help;

GetOptions('gptfile=s' => \$gptfile,
	   'setupfile=s' => \$setupfile,
	   'release=s' => \$release,
	   'directory=s' => \$directory,
	   'toolkitversion=s' => \$toolkitversion,
	   'email=s' => \$email,
	   'nodoc' => \$nodoc,
	   'help' => \$help);

Pod::Usage::pod2usage() if defined $help;

die "Missing --gptfile option" unless defined $gptfile;

setlocale(LC_TIME, 'C');

my $login = getlogin || getpwuid($<);
my $pw = getpwnam($login);
my ($fullname, $location, $phone) = split(/,/, $pw->gecos);
my $host = hostname;

$email = "$login\@$host" unless defined $email;

if (defined $directory) {
    $setupdirectory = $directory;
    $setupdirectory =~ s![^/]*$!setup!;
}

my $parser = new XML::DOM::Parser;

my %srcdeps;
my %setupdeps;

my $gptdoc = $parser->parsefile($gptfile);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptmeta->item(0)->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;

for my $srcdep ($gptmeta->item(0)
		->getElementsByTagName("Source_Dependencies")) {
    my $type = $srcdep->getAttributeNode("Type")->getValue;
    $srcdeps{$type} = {} unless defined $srcdeps{$type};
    for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	my $deppkg = $dep->getAttributeNode("Package")->getValue
	    if defined $dep->getAttributeNode("Package");
	$depname = $depname . "-progs" if ($deppkg eq "pgm");
	$depname = $depname . "-doc" if ($deppkg eq "doc");
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$srcdeps{$type}{$depname} = $depver
	    unless (defined $srcdeps{$type}{$depname}
		    and $srcdeps{$type}{$depname} >= $depver);
    }
}

for my $setupdep ($gptmeta->item(0)
		  ->getElementsByTagName("Source_Setup_Dependency")) {
    my $type = $setupdep->getAttributeNode("PkgType")->getValue;
    $setupdeps{$type} = {} unless defined $setupdeps{$type};
    for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$setupdeps{$type}{$depname} = $depver
	    unless (defined $setupdeps{$type}{$depname}
		    and $setupdeps{$type}{$depname} >= $depver);
    }
}

my $pkglibs = $gptmeta->item(0)->getElementsByTagName("Build_Environment")
    ->item(0)->getElementsByTagName("pkg_libs")->item(0);
$pkglibs = $pkglibs->getFirstChild if defined $pkglibs;

my $setupname;
my $setupversion;
my $setupdescription;
my $postinstall;

if (defined $setupfile) {

    my $setupdoc = $parser->parsefile($setupfile);

    my $setupmeta = $setupdoc->getElementsByTagName("gpt_package_metadata");
    $setupname = $setupmeta->item(0)->getAttributeNode("Name")->getValue;

    die "Setup package name does not match main package name"
	if ($setupname ne $gptname . '_setup');

    my $setupagingver = $setupmeta->item(0)
	->getElementsByTagName("Aging_Version");
    my $setupmajorver = $setupagingver->item(0)
	->getAttributeNode("Major")->getValue;
    my $setupminorver = $setupagingver->item(0)
	->getAttributeNode("Minor")->getValue;

    my $setupdesc = $setupmeta->item(0)->getElementsByTagName("Description");
    $setupdescription = $setupdesc->item(0)->getFirstChild->getData;
    $setupdescription =~ s!^\s+|\s+$!!g;

    for my $srcdep ($setupmeta->item(0)
		    ->getElementsByTagName("Source_Dependencies")) {
	my $type = $srcdep->getAttributeNode("Type")->getValue;
	$srcdeps{$type} = {} unless defined $srcdeps{$type};
	for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    my $deppkg = $dep->getAttributeNode("Package")->getValue
		if defined $dep->getAttributeNode("Package");
	    $depname = $depname . "-progs" if ($deppkg eq "pgm");
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $srcdeps{$type}{$depname} = $depver
		unless (defined $srcdeps{$type}{$depname}
			and $srcdeps{$type}{$depname} >= $depver);
	}
    }

    for my $setupdep ($setupmeta->item(0)
		      ->getElementsByTagName("Source_Setup_Dependency")) {
	my $type = $setupdep->getAttributeNode("PkgType")->getValue;
	$setupdeps{$type} = {} unless defined $setupdeps{$type};
	for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $setupdeps{$type}{$depname} = $depver
		unless (defined $setupdeps{$type}{$depname}
			and $setupdeps{$type}{$depname} >= $depver);
	}
    }

    my $setuppostinstall = $setupmeta->item(0)
	->getElementsByTagName("Post_Install_Program");
    $postinstall = $setuppostinstall->item(0)->getFirstChild->getData
	if defined $setuppostinstall->item(0);
    $postinstall =~ s!^\s+|\s+$!!g;

    $setupversion = $setupmajorver . '.' . $setupminorver;
}

my $name = $gptname;
$name =~ tr/_/-/;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = 1;
if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
    $libs = 0;
}

my $develpkg = 1;
my $docpkg = 1;
my $progspkg = 0;

if (!$libs) {
    $develpkg = 0;
    $docpkg = 0;
}
else {
    $docpkg = 0 if defined $nodoc;
    $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
}

print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
print "%global flavor gcc64pthr\n";
print "%else\n";
print "%global flavor gcc32pthr\n";
print "%endif\n\n";

print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
print "%global setupversion $setupversion\n" if defined $setupfile;
print "Release:\t$release%{?dist}\n";
print "Summary:\tGlobus Toolkit - $description\n";
print "\n";

if ($libs) {
    print "Group:\t\tSystem Environment/Libraries\n";
}
else {
    print "Group:\t\tApplications/Internet\n";
}
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
    if ($name ne "globus-core");
print "#\t\ttar -zcf $gptname-$version.tar.gz $gptname-$version\n";
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
    print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
    print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
    print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
    print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
    print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
if ($docpkg) {
    print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
    print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
    print "Source9:\tepstopdf-2.9.5gw\n";
}
my $p = 0;
while ($ARGV[$p]) {
    print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
    print "#\t\thttp://bugzilla.globus.org/bugzilla/show_bug.cgi?id=###BUG NUMBER###\n";
    print "Patch$p:" . ($p < 10 ? "\t\t" : "\t") . "$ARGV[$p]\n";
    $p++;
}
print "BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n";
print "\n";

if (!$libs) {
    print "Provides:\t%{name}-setup = %{setupversion}\n"
	if defined $setupfile;
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}
else {
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'lib_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
    while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
	print "BuildRequires:\t$key" .
	    ($value > 0 ? " >= $value\n" : "\n");
    }
    if ($docpkg) {
	print "BuildRequires:\tdoxygen\n";
	print "%if %{?fedora}%{!?fedora:0} >= 3\n";
	print  "BuildRequires:\tgraphviz\n";
	print  "BuildRequires:\tghostscript\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 5\n";
	print   "BuildRequires:\tgraphviz\n";
	print   "BuildRequires:\tghostscript\n";
	print   "%if \"%{?rhel}\" == \"5\"\n";
	print    "BuildRequires:\tgraphviz-gd\n";
	print   "%endif\n";
	print  "%endif\n";
	print "%endif\n";
	print "%if %{?fedora}%{!?fedora:0} >= 9\n";
	print  "BuildRequires:\ttex(latex)\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 6\n";
	print   "BuildRequires:\ttex(latex)\n";
	print  "%else\n";
	print   "BuildRequires:\ttetex-latex\n";
	print  "%endif\n";
	print "%endif\n";
    }
    if ($progspkg) {
	print "\n";
	print "%package progs\n";
	print "Summary:\tGlobus Toolkit - $description Programs\n";
	print "Group:\t\tApplications/Internet\n";
	print "Provides:\t%{name}-setup = %{setupversion}\n"
	    if defined $setupfile;
	print "Requires:\t%{name} = %{version}-%{release}\n";
	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	    # Explicit Requires for libraries should not be used according
	    # to the packaging guidelines. The autogenerated Requires on
	    # sonames make them redundant.
	    # Only add Requires for GPT glue packages and XIO plugins.
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
		   $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
		   $key =~ /^globus-xio-/;
	}
	while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq $name;
	}
	while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq 'trusted-ca-setup' or $key eq $name;
	}
    }
}

if ($develpkg) {
    print "\n";
    print "%package devel\n";
    print "Summary:\tGlobus Toolkit - $description Development Files\n";
    print "Group:\t\tDevelopment/Libraries\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "Requires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "Requires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}

if ($docpkg) {
    print "\n";
    print "%package doc\n";
    print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
    print "Group:\t\tDocumentation\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
}

print "
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
$description
";

print "
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
$description Programs
" if ($progspkg);

print "$setupdescription\n" if defined $setupfile;

print "
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
$description Development Files
" if ($develpkg);

print "
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
$description Documentation Files
" if ($docpkg);

print "
%prep
%setup -q -n %{_name}-%{version}
";

print "%setup -D -T -q -n %{_name}-%{version} -a 1\n" if defined $setupfile;

$p = 0;
while ($ARGV[$p]) {
    print "%patch$p -p1\n";
    $p++;
}

print "
%if \"%{rhel}\" == \"5\"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
" if ($docpkg);

print "
%build";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
";

print "
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \\
      -e 's!\\(lib[a-zA-Z_]*\\)_\$(GLOBUS_FLAVOR_NAME)\\.la!\\1.la!g' \\
      -e 's!^\\(lib[a-zA-Z_]*\\)___GLOBUS_FLAVOR_NAME__la_!\\1_la_!' -i \$f
done
sed -e \"s!<With_Flavors!<With_Flavors ColocateLibraries=\\\"no\\\"!\" \\
  -i pkgdata/pkg_data_src.gpt.in
" if ($libs);

print "
%{_datadir}/globus/globus-bootstrap.sh
";

if ($docpkg) {
    print "
%configure --with-flavor=%{flavor} --enable-doxygen
";
}
else {
    print "
%configure --with-flavor=%{flavor}
";
}

print "
make %{?_smp_mflags}
";

print "
# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -
" if defined $setupfile;

print "
%install";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
rm -rf \$RPM_BUILD_ROOT
make install DESTDIR=\$RPM_BUILD_ROOT
";

print "
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=\$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
				     globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
\\\$metadata->finish();
EOF

# Create setup files

### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;

if (not defined $pkglibs) {
    print "
# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" -i \$lib
done
" if ($libs);
}
else {
    print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
sed '/lib.*\\.la\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}

print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
sed '/lib.*\\.a\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
" if ($libs);

print "
# Generate pkg-config file from GPT metadata
mkdir -p \$RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \\
  \$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
# Move documentation to default RPM location
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
  \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\\.3/d' \\
    -e '/_%{_name}-%{version}_.*\\.3/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
" if ($docpkg);

print"
# Install license file
mkdir -p \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
";

if (!$libs) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}

if ($progspkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package-progs.filelist\n";
}

if ($develpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package-devel.filelist\n";
}

if ($docpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
    print "  | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}

print "
%clean
rm -rf \$RPM_BUILD_ROOT
";

print "
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
" if ($libs);

print "
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
";

print "
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
" if ($progspkg);

print "%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
" if defined $setupfile;

print "
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
" if ($docpkg);

print "
%changelog
* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"

__END__

=head1 NAME

B<globus-spec-creator> - Generate an RPM spec file from a GPT source
package description

=head1 SYNOPSIS

B<globus-spec-creator> [options] [patches ...]

Options:

=over

=item B<-gptfile> filename

The package's GPT source package description file (mandatory)

=item B<-setupfile> filename

The corresponding setup package's GPT source package description file
(default: none)

=item B<-release> releasenumber

The RPM release number (default: 1)

=item B<-directory> directory

The package's source directory in the toolkit installer

=item B<-toolkitversion> versionnumber

Globus toolkit version (default: 4.2.1)

=item B<-email> emailaddress

The packagers e-mail address (default: username at hostname)

=item B<-nodoc>

Disable the generation of the doc RPM

=item B<-help>

Show help

=back

Arguments:

Each additional argument will be added as a patch in the generated
specfile.

=head1 EXAMPLE

globus-spec-creator -g globus_common-10.2/pkgdata/pkg_data_src.gpt.in
-s globus_common_setup-2.6/pkgdata/pkg_data_src.gpt.in -r 3 -d
common/source

=head1 SEE ALSO

See http://fedoraproject.org/wiki/PackagingDrafts/Globus for
additional information and examples.

=head1 AUTHOR

Mattias Ellert E<lt>mattias.ellert at fysast.uu.seE<gt>

=cut


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/globus-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-core.spec	21 Apr 2009 14:47:00 -0000	1.3
+++ globus-core.spec	27 Apr 2009 16:45:47 -0000	1.4
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@
 #		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
+Source2:	globus-spec-creator
 #		Make file locations configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
 Patch0:		%{name}-conf.patch
@@ -124,9 +125,25 @@
 # These scripts are intended to be sourced, not executed
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Add -Wl,--as-needed to the libtool script if supported
+%if %{?fedora}%{!?fedora:0} >= 2
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+%if %{?rhel}%{!?rhel:0} >= 4
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+
 # Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Install the Globus RPM specfile creator script
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
@@ -164,10 +181,16 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%{_bindir}/globus-spec-creator
+%doc %{_mandir}/man1/globus-spec-creator.1*
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
+- Install the globus-spec-creator script
+- Add -Wl,--as-needed to the libtool script
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
 - Update after clarification of packaging guidelines
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 14:47:01 -0000	1.3
+++ import.log	27 Apr 2009 16:45:47 -0000	1.4
@@ -1,3 +1,4 @@
 globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693
 globus-core-5_15-2_fc9:HEAD:globus-core-5.15-2.fc9.src.rpm:1240003266
 globus-core-5_15-3_fc9:HEAD:globus-core-5.15-3.fc9.src.rpm:1240325051
+globus-core-5_15-4_fc9:HEAD:globus-core-5.15-4.fc9.src.rpm:1240850699



From ellert at fedoraproject.org  Mon Apr 27 16:48:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 16:48:11 +0000 (UTC)
Subject: rpms/globus-core/F-9 globus-spec-creator, NONE, 1.1 globus-core.spec,
	1.3, 1.4 import.log, 1.3, 1.4
Message-ID: <20090427164811.861F970110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14545/F-9

Modified Files:
	globus-core.spec import.log 
Added Files:
	globus-spec-creator 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script



--- NEW FILE globus-spec-creator ---
#!/usr/bin/perl

use Getopt::Long;
use POSIX;
use XML::DOM;
use User::pwent;
use Sys::Hostname;
use Pod::Usage;

my $gptfile;
my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
my $toolkitversion = "4.2.1";
my $email;
my $nodoc;
my $help;

GetOptions('gptfile=s' => \$gptfile,
	   'setupfile=s' => \$setupfile,
	   'release=s' => \$release,
	   'directory=s' => \$directory,
	   'toolkitversion=s' => \$toolkitversion,
	   'email=s' => \$email,
	   'nodoc' => \$nodoc,
	   'help' => \$help);

Pod::Usage::pod2usage() if defined $help;

die "Missing --gptfile option" unless defined $gptfile;

setlocale(LC_TIME, 'C');

my $login = getlogin || getpwuid($<);
my $pw = getpwnam($login);
my ($fullname, $location, $phone) = split(/,/, $pw->gecos);
my $host = hostname;

$email = "$login\@$host" unless defined $email;

if (defined $directory) {
    $setupdirectory = $directory;
    $setupdirectory =~ s![^/]*$!setup!;
}

my $parser = new XML::DOM::Parser;

my %srcdeps;
my %setupdeps;

my $gptdoc = $parser->parsefile($gptfile);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptmeta->item(0)->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;

for my $srcdep ($gptmeta->item(0)
		->getElementsByTagName("Source_Dependencies")) {
    my $type = $srcdep->getAttributeNode("Type")->getValue;
    $srcdeps{$type} = {} unless defined $srcdeps{$type};
    for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	my $deppkg = $dep->getAttributeNode("Package")->getValue
	    if defined $dep->getAttributeNode("Package");
	$depname = $depname . "-progs" if ($deppkg eq "pgm");
	$depname = $depname . "-doc" if ($deppkg eq "doc");
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$srcdeps{$type}{$depname} = $depver
	    unless (defined $srcdeps{$type}{$depname}
		    and $srcdeps{$type}{$depname} >= $depver);
    }
}

for my $setupdep ($gptmeta->item(0)
		  ->getElementsByTagName("Source_Setup_Dependency")) {
    my $type = $setupdep->getAttributeNode("PkgType")->getValue;
    $setupdeps{$type} = {} unless defined $setupdeps{$type};
    for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$setupdeps{$type}{$depname} = $depver
	    unless (defined $setupdeps{$type}{$depname}
		    and $setupdeps{$type}{$depname} >= $depver);
    }
}

my $pkglibs = $gptmeta->item(0)->getElementsByTagName("Build_Environment")
    ->item(0)->getElementsByTagName("pkg_libs")->item(0);
$pkglibs = $pkglibs->getFirstChild if defined $pkglibs;

my $setupname;
my $setupversion;
my $setupdescription;
my $postinstall;

if (defined $setupfile) {

    my $setupdoc = $parser->parsefile($setupfile);

    my $setupmeta = $setupdoc->getElementsByTagName("gpt_package_metadata");
    $setupname = $setupmeta->item(0)->getAttributeNode("Name")->getValue;

    die "Setup package name does not match main package name"
	if ($setupname ne $gptname . '_setup');

    my $setupagingver = $setupmeta->item(0)
	->getElementsByTagName("Aging_Version");
    my $setupmajorver = $setupagingver->item(0)
	->getAttributeNode("Major")->getValue;
    my $setupminorver = $setupagingver->item(0)
	->getAttributeNode("Minor")->getValue;

    my $setupdesc = $setupmeta->item(0)->getElementsByTagName("Description");
    $setupdescription = $setupdesc->item(0)->getFirstChild->getData;
    $setupdescription =~ s!^\s+|\s+$!!g;

    for my $srcdep ($setupmeta->item(0)
		    ->getElementsByTagName("Source_Dependencies")) {
	my $type = $srcdep->getAttributeNode("Type")->getValue;
	$srcdeps{$type} = {} unless defined $srcdeps{$type};
	for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    my $deppkg = $dep->getAttributeNode("Package")->getValue
		if defined $dep->getAttributeNode("Package");
	    $depname = $depname . "-progs" if ($deppkg eq "pgm");
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $srcdeps{$type}{$depname} = $depver
		unless (defined $srcdeps{$type}{$depname}
			and $srcdeps{$type}{$depname} >= $depver);
	}
    }

    for my $setupdep ($setupmeta->item(0)
		      ->getElementsByTagName("Source_Setup_Dependency")) {
	my $type = $setupdep->getAttributeNode("PkgType")->getValue;
	$setupdeps{$type} = {} unless defined $setupdeps{$type};
	for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $setupdeps{$type}{$depname} = $depver
		unless (defined $setupdeps{$type}{$depname}
			and $setupdeps{$type}{$depname} >= $depver);
	}
    }

    my $setuppostinstall = $setupmeta->item(0)
	->getElementsByTagName("Post_Install_Program");
    $postinstall = $setuppostinstall->item(0)->getFirstChild->getData
	if defined $setuppostinstall->item(0);
    $postinstall =~ s!^\s+|\s+$!!g;

    $setupversion = $setupmajorver . '.' . $setupminorver;
}

my $name = $gptname;
$name =~ tr/_/-/;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = 1;
if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
    $libs = 0;
}

my $develpkg = 1;
my $docpkg = 1;
my $progspkg = 0;

if (!$libs) {
    $develpkg = 0;
    $docpkg = 0;
}
else {
    $docpkg = 0 if defined $nodoc;
    $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
}

print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
print "%global flavor gcc64pthr\n";
print "%else\n";
print "%global flavor gcc32pthr\n";
print "%endif\n\n";

print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
print "%global setupversion $setupversion\n" if defined $setupfile;
print "Release:\t$release%{?dist}\n";
print "Summary:\tGlobus Toolkit - $description\n";
print "\n";

if ($libs) {
    print "Group:\t\tSystem Environment/Libraries\n";
}
else {
    print "Group:\t\tApplications/Internet\n";
}
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
    if ($name ne "globus-core");
print "#\t\ttar -zcf $gptname-$version.tar.gz $gptname-$version\n";
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
    print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
    print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
    print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
    print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
    print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
if ($docpkg) {
    print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
    print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
    print "Source9:\tepstopdf-2.9.5gw\n";
}
my $p = 0;
while ($ARGV[$p]) {
    print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
    print "#\t\thttp://bugzilla.globus.org/bugzilla/show_bug.cgi?id=###BUG NUMBER###\n";
    print "Patch$p:" . ($p < 10 ? "\t\t" : "\t") . "$ARGV[$p]\n";
    $p++;
}
print "BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n";
print "\n";

if (!$libs) {
    print "Provides:\t%{name}-setup = %{setupversion}\n"
	if defined $setupfile;
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}
else {
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'lib_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
    while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
	print "BuildRequires:\t$key" .
	    ($value > 0 ? " >= $value\n" : "\n");
    }
    if ($docpkg) {
	print "BuildRequires:\tdoxygen\n";
	print "%if %{?fedora}%{!?fedora:0} >= 3\n";
	print  "BuildRequires:\tgraphviz\n";
	print  "BuildRequires:\tghostscript\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 5\n";
	print   "BuildRequires:\tgraphviz\n";
	print   "BuildRequires:\tghostscript\n";
	print   "%if \"%{?rhel}\" == \"5\"\n";
	print    "BuildRequires:\tgraphviz-gd\n";
	print   "%endif\n";
	print  "%endif\n";
	print "%endif\n";
	print "%if %{?fedora}%{!?fedora:0} >= 9\n";
	print  "BuildRequires:\ttex(latex)\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 6\n";
	print   "BuildRequires:\ttex(latex)\n";
	print  "%else\n";
	print   "BuildRequires:\ttetex-latex\n";
	print  "%endif\n";
	print "%endif\n";
    }
    if ($progspkg) {
	print "\n";
	print "%package progs\n";
	print "Summary:\tGlobus Toolkit - $description Programs\n";
	print "Group:\t\tApplications/Internet\n";
	print "Provides:\t%{name}-setup = %{setupversion}\n"
	    if defined $setupfile;
	print "Requires:\t%{name} = %{version}-%{release}\n";
	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	    # Explicit Requires for libraries should not be used according
	    # to the packaging guidelines. The autogenerated Requires on
	    # sonames make them redundant.
	    # Only add Requires for GPT glue packages and XIO plugins.
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
		   $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
		   $key =~ /^globus-xio-/;
	}
	while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq $name;
	}
	while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq 'trusted-ca-setup' or $key eq $name;
	}
    }
}

if ($develpkg) {
    print "\n";
    print "%package devel\n";
    print "Summary:\tGlobus Toolkit - $description Development Files\n";
    print "Group:\t\tDevelopment/Libraries\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "Requires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "Requires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}

if ($docpkg) {
    print "\n";
    print "%package doc\n";
    print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
    print "Group:\t\tDocumentation\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
}

print "
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
$description
";

print "
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
$description Programs
" if ($progspkg);

print "$setupdescription\n" if defined $setupfile;

print "
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
$description Development Files
" if ($develpkg);

print "
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
$description Documentation Files
" if ($docpkg);

print "
%prep
%setup -q -n %{_name}-%{version}
";

print "%setup -D -T -q -n %{_name}-%{version} -a 1\n" if defined $setupfile;

$p = 0;
while ($ARGV[$p]) {
    print "%patch$p -p1\n";
    $p++;
}

print "
%if \"%{rhel}\" == \"5\"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
" if ($docpkg);

print "
%build";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
";

print "
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \\
      -e 's!\\(lib[a-zA-Z_]*\\)_\$(GLOBUS_FLAVOR_NAME)\\.la!\\1.la!g' \\
      -e 's!^\\(lib[a-zA-Z_]*\\)___GLOBUS_FLAVOR_NAME__la_!\\1_la_!' -i \$f
done
sed -e \"s!<With_Flavors!<With_Flavors ColocateLibraries=\\\"no\\\"!\" \\
  -i pkgdata/pkg_data_src.gpt.in
" if ($libs);

print "
%{_datadir}/globus/globus-bootstrap.sh
";

if ($docpkg) {
    print "
%configure --with-flavor=%{flavor} --enable-doxygen
";
}
else {
    print "
%configure --with-flavor=%{flavor}
";
}

print "
make %{?_smp_mflags}
";

print "
# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -
" if defined $setupfile;

print "
%install";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
rm -rf \$RPM_BUILD_ROOT
make install DESTDIR=\$RPM_BUILD_ROOT
";

print "
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=\$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
				     globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
\\\$metadata->finish();
EOF

# Create setup files

### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;

if (not defined $pkglibs) {
    print "
# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" -i \$lib
done
" if ($libs);
}
else {
    print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
sed '/lib.*\\.la\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}

print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
sed '/lib.*\\.a\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
" if ($libs);

print "
# Generate pkg-config file from GPT metadata
mkdir -p \$RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \\
  \$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
# Move documentation to default RPM location
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
  \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\\.3/d' \\
    -e '/_%{_name}-%{version}_.*\\.3/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
" if ($docpkg);

print"
# Install license file
mkdir -p \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
";

if (!$libs) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}

if ($progspkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package-progs.filelist\n";
}

if ($develpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package-devel.filelist\n";
}

if ($docpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
    print "  | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}

print "
%clean
rm -rf \$RPM_BUILD_ROOT
";

print "
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
" if ($libs);

print "
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
";

print "
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
" if ($progspkg);

print "%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
" if defined $setupfile;

print "
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
" if ($docpkg);

print "
%changelog
* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"

__END__

=head1 NAME

B<globus-spec-creator> - Generate an RPM spec file from a GPT source
package description

=head1 SYNOPSIS

B<globus-spec-creator> [options] [patches ...]

Options:

=over

=item B<-gptfile> filename

The package's GPT source package description file (mandatory)

=item B<-setupfile> filename

The corresponding setup package's GPT source package description file
(default: none)

=item B<-release> releasenumber

The RPM release number (default: 1)

=item B<-directory> directory

The package's source directory in the toolkit installer

=item B<-toolkitversion> versionnumber

Globus toolkit version (default: 4.2.1)

=item B<-email> emailaddress

The packagers e-mail address (default: username at hostname)

=item B<-nodoc>

Disable the generation of the doc RPM

=item B<-help>

Show help

=back

Arguments:

Each additional argument will be added as a patch in the generated
specfile.

=head1 EXAMPLE

globus-spec-creator -g globus_common-10.2/pkgdata/pkg_data_src.gpt.in
-s globus_common_setup-2.6/pkgdata/pkg_data_src.gpt.in -r 3 -d
common/source

=head1 SEE ALSO

See http://fedoraproject.org/wiki/PackagingDrafts/Globus for
additional information and examples.

=head1 AUTHOR

Mattias Ellert E<lt>mattias.ellert at fysast.uu.seE<gt>

=cut


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/globus-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-core.spec	21 Apr 2009 14:50:40 -0000	1.3
+++ globus-core.spec	27 Apr 2009 16:47:41 -0000	1.4
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@
 #		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
+Source2:	globus-spec-creator
 #		Make file locations configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
 Patch0:		%{name}-conf.patch
@@ -124,9 +125,25 @@
 # These scripts are intended to be sourced, not executed
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Add -Wl,--as-needed to the libtool script if supported
+%if %{?fedora}%{!?fedora:0} >= 2
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+%if %{?rhel}%{!?rhel:0} >= 4
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+
 # Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Install the Globus RPM specfile creator script
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
@@ -164,10 +181,16 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%{_bindir}/globus-spec-creator
+%doc %{_mandir}/man1/globus-spec-creator.1*
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
+- Install the globus-spec-creator script
+- Add -Wl,--as-needed to the libtool script
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
 - Update after clarification of packaging guidelines
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 14:50:40 -0000	1.3
+++ import.log	27 Apr 2009 16:47:41 -0000	1.4
@@ -1,3 +1,4 @@
 globus-core-5_15-1_fc9:F-9:globus-core-5.15-1.fc9.src.rpm:1237533936
 globus-core-5_15-2_fc9:F-9:globus-core-5.15-2.fc9.src.rpm:1240003398
 globus-core-5_15-3_fc9:F-9:globus-core-5.15-3.fc9.src.rpm:1240325336
+globus-core-5_15-4_fc9:F-9:globus-core-5.15-4.fc9.src.rpm:1240850808



From ellert at fedoraproject.org  Mon Apr 27 16:49:48 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 16:49:48 +0000 (UTC)
Subject: rpms/globus-core/F-10 globus-spec-creator, NONE,
	1.1 globus-core.spec, 1.3, 1.4 import.log, 1.3, 1.4
Message-ID: <20090427164948.5341770110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14832/F-10

Modified Files:
	globus-core.spec import.log 
Added Files:
	globus-spec-creator 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script



--- NEW FILE globus-spec-creator ---
#!/usr/bin/perl

use Getopt::Long;
use POSIX;
use XML::DOM;
use User::pwent;
use Sys::Hostname;
use Pod::Usage;

my $gptfile;
my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
my $toolkitversion = "4.2.1";
my $email;
my $nodoc;
my $help;

GetOptions('gptfile=s' => \$gptfile,
	   'setupfile=s' => \$setupfile,
	   'release=s' => \$release,
	   'directory=s' => \$directory,
	   'toolkitversion=s' => \$toolkitversion,
	   'email=s' => \$email,
	   'nodoc' => \$nodoc,
	   'help' => \$help);

Pod::Usage::pod2usage() if defined $help;

die "Missing --gptfile option" unless defined $gptfile;

setlocale(LC_TIME, 'C');

my $login = getlogin || getpwuid($<);
my $pw = getpwnam($login);
my ($fullname, $location, $phone) = split(/,/, $pw->gecos);
my $host = hostname;

$email = "$login\@$host" unless defined $email;

if (defined $directory) {
    $setupdirectory = $directory;
    $setupdirectory =~ s![^/]*$!setup!;
}

my $parser = new XML::DOM::Parser;

my %srcdeps;
my %setupdeps;

my $gptdoc = $parser->parsefile($gptfile);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptmeta->item(0)->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;

for my $srcdep ($gptmeta->item(0)
		->getElementsByTagName("Source_Dependencies")) {
    my $type = $srcdep->getAttributeNode("Type")->getValue;
    $srcdeps{$type} = {} unless defined $srcdeps{$type};
    for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	my $deppkg = $dep->getAttributeNode("Package")->getValue
	    if defined $dep->getAttributeNode("Package");
	$depname = $depname . "-progs" if ($deppkg eq "pgm");
	$depname = $depname . "-doc" if ($deppkg eq "doc");
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$srcdeps{$type}{$depname} = $depver
	    unless (defined $srcdeps{$type}{$depname}
		    and $srcdeps{$type}{$depname} >= $depver);
    }
}

for my $setupdep ($gptmeta->item(0)
		  ->getElementsByTagName("Source_Setup_Dependency")) {
    my $type = $setupdep->getAttributeNode("PkgType")->getValue;
    $setupdeps{$type} = {} unless defined $setupdeps{$type};
    for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$setupdeps{$type}{$depname} = $depver
	    unless (defined $setupdeps{$type}{$depname}
		    and $setupdeps{$type}{$depname} >= $depver);
    }
}

my $pkglibs = $gptmeta->item(0)->getElementsByTagName("Build_Environment")
    ->item(0)->getElementsByTagName("pkg_libs")->item(0);
$pkglibs = $pkglibs->getFirstChild if defined $pkglibs;

my $setupname;
my $setupversion;
my $setupdescription;
my $postinstall;

if (defined $setupfile) {

    my $setupdoc = $parser->parsefile($setupfile);

    my $setupmeta = $setupdoc->getElementsByTagName("gpt_package_metadata");
    $setupname = $setupmeta->item(0)->getAttributeNode("Name")->getValue;

    die "Setup package name does not match main package name"
	if ($setupname ne $gptname . '_setup');

    my $setupagingver = $setupmeta->item(0)
	->getElementsByTagName("Aging_Version");
    my $setupmajorver = $setupagingver->item(0)
	->getAttributeNode("Major")->getValue;
    my $setupminorver = $setupagingver->item(0)
	->getAttributeNode("Minor")->getValue;

    my $setupdesc = $setupmeta->item(0)->getElementsByTagName("Description");
    $setupdescription = $setupdesc->item(0)->getFirstChild->getData;
    $setupdescription =~ s!^\s+|\s+$!!g;

    for my $srcdep ($setupmeta->item(0)
		    ->getElementsByTagName("Source_Dependencies")) {
	my $type = $srcdep->getAttributeNode("Type")->getValue;
	$srcdeps{$type} = {} unless defined $srcdeps{$type};
	for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    my $deppkg = $dep->getAttributeNode("Package")->getValue
		if defined $dep->getAttributeNode("Package");
	    $depname = $depname . "-progs" if ($deppkg eq "pgm");
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $srcdeps{$type}{$depname} = $depver
		unless (defined $srcdeps{$type}{$depname}
			and $srcdeps{$type}{$depname} >= $depver);
	}
    }

    for my $setupdep ($setupmeta->item(0)
		      ->getElementsByTagName("Source_Setup_Dependency")) {
	my $type = $setupdep->getAttributeNode("PkgType")->getValue;
	$setupdeps{$type} = {} unless defined $setupdeps{$type};
	for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $setupdeps{$type}{$depname} = $depver
		unless (defined $setupdeps{$type}{$depname}
			and $setupdeps{$type}{$depname} >= $depver);
	}
    }

    my $setuppostinstall = $setupmeta->item(0)
	->getElementsByTagName("Post_Install_Program");
    $postinstall = $setuppostinstall->item(0)->getFirstChild->getData
	if defined $setuppostinstall->item(0);
    $postinstall =~ s!^\s+|\s+$!!g;

    $setupversion = $setupmajorver . '.' . $setupminorver;
}

my $name = $gptname;
$name =~ tr/_/-/;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = 1;
if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
    $libs = 0;
}

my $develpkg = 1;
my $docpkg = 1;
my $progspkg = 0;

if (!$libs) {
    $develpkg = 0;
    $docpkg = 0;
}
else {
    $docpkg = 0 if defined $nodoc;
    $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
}

print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
print "%global flavor gcc64pthr\n";
print "%else\n";
print "%global flavor gcc32pthr\n";
print "%endif\n\n";

print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
print "%global setupversion $setupversion\n" if defined $setupfile;
print "Release:\t$release%{?dist}\n";
print "Summary:\tGlobus Toolkit - $description\n";
print "\n";

if ($libs) {
    print "Group:\t\tSystem Environment/Libraries\n";
}
else {
    print "Group:\t\tApplications/Internet\n";
}
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
    if ($name ne "globus-core");
print "#\t\ttar -zcf $gptname-$version.tar.gz $gptname-$version\n";
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
    print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
    print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
    print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
    print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
    print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
if ($docpkg) {
    print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
    print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
    print "Source9:\tepstopdf-2.9.5gw\n";
}
my $p = 0;
while ($ARGV[$p]) {
    print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
    print "#\t\thttp://bugzilla.globus.org/bugzilla/show_bug.cgi?id=###BUG NUMBER###\n";
    print "Patch$p:" . ($p < 10 ? "\t\t" : "\t") . "$ARGV[$p]\n";
    $p++;
}
print "BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n";
print "\n";

if (!$libs) {
    print "Provides:\t%{name}-setup = %{setupversion}\n"
	if defined $setupfile;
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}
else {
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'lib_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
    while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
	print "BuildRequires:\t$key" .
	    ($value > 0 ? " >= $value\n" : "\n");
    }
    if ($docpkg) {
	print "BuildRequires:\tdoxygen\n";
	print "%if %{?fedora}%{!?fedora:0} >= 3\n";
	print  "BuildRequires:\tgraphviz\n";
	print  "BuildRequires:\tghostscript\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 5\n";
	print   "BuildRequires:\tgraphviz\n";
	print   "BuildRequires:\tghostscript\n";
	print   "%if \"%{?rhel}\" == \"5\"\n";
	print    "BuildRequires:\tgraphviz-gd\n";
	print   "%endif\n";
	print  "%endif\n";
	print "%endif\n";
	print "%if %{?fedora}%{!?fedora:0} >= 9\n";
	print  "BuildRequires:\ttex(latex)\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 6\n";
	print   "BuildRequires:\ttex(latex)\n";
	print  "%else\n";
	print   "BuildRequires:\ttetex-latex\n";
	print  "%endif\n";
	print "%endif\n";
    }
    if ($progspkg) {
	print "\n";
	print "%package progs\n";
	print "Summary:\tGlobus Toolkit - $description Programs\n";
	print "Group:\t\tApplications/Internet\n";
	print "Provides:\t%{name}-setup = %{setupversion}\n"
	    if defined $setupfile;
	print "Requires:\t%{name} = %{version}-%{release}\n";
	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	    # Explicit Requires for libraries should not be used according
	    # to the packaging guidelines. The autogenerated Requires on
	    # sonames make them redundant.
	    # Only add Requires for GPT glue packages and XIO plugins.
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
		   $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
		   $key =~ /^globus-xio-/;
	}
	while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq $name;
	}
	while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq 'trusted-ca-setup' or $key eq $name;
	}
    }
}

if ($develpkg) {
    print "\n";
    print "%package devel\n";
    print "Summary:\tGlobus Toolkit - $description Development Files\n";
    print "Group:\t\tDevelopment/Libraries\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "Requires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "Requires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}

if ($docpkg) {
    print "\n";
    print "%package doc\n";
    print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
    print "Group:\t\tDocumentation\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
}

print "
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
$description
";

print "
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
$description Programs
" if ($progspkg);

print "$setupdescription\n" if defined $setupfile;

print "
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
$description Development Files
" if ($develpkg);

print "
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
$description Documentation Files
" if ($docpkg);

print "
%prep
%setup -q -n %{_name}-%{version}
";

print "%setup -D -T -q -n %{_name}-%{version} -a 1\n" if defined $setupfile;

$p = 0;
while ($ARGV[$p]) {
    print "%patch$p -p1\n";
    $p++;
}

print "
%if \"%{rhel}\" == \"5\"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
" if ($docpkg);

print "
%build";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
";

print "
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \\
      -e 's!\\(lib[a-zA-Z_]*\\)_\$(GLOBUS_FLAVOR_NAME)\\.la!\\1.la!g' \\
      -e 's!^\\(lib[a-zA-Z_]*\\)___GLOBUS_FLAVOR_NAME__la_!\\1_la_!' -i \$f
done
sed -e \"s!<With_Flavors!<With_Flavors ColocateLibraries=\\\"no\\\"!\" \\
  -i pkgdata/pkg_data_src.gpt.in
" if ($libs);

print "
%{_datadir}/globus/globus-bootstrap.sh
";

if ($docpkg) {
    print "
%configure --with-flavor=%{flavor} --enable-doxygen
";
}
else {
    print "
%configure --with-flavor=%{flavor}
";
}

print "
make %{?_smp_mflags}
";

print "
# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -
" if defined $setupfile;

print "
%install";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
rm -rf \$RPM_BUILD_ROOT
make install DESTDIR=\$RPM_BUILD_ROOT
";

print "
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=\$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
				     globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
\\\$metadata->finish();
EOF

# Create setup files

### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;

if (not defined $pkglibs) {
    print "
# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" -i \$lib
done
" if ($libs);
}
else {
    print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
sed '/lib.*\\.la\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}

print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
sed '/lib.*\\.a\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
" if ($libs);

print "
# Generate pkg-config file from GPT metadata
mkdir -p \$RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \\
  \$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
# Move documentation to default RPM location
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
  \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\\.3/d' \\
    -e '/_%{_name}-%{version}_.*\\.3/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
" if ($docpkg);

print"
# Install license file
mkdir -p \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
";

if (!$libs) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}

if ($progspkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package-progs.filelist\n";
}

if ($develpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package-devel.filelist\n";
}

if ($docpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
    print "  | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}

print "
%clean
rm -rf \$RPM_BUILD_ROOT
";

print "
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
" if ($libs);

print "
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
";

print "
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
" if ($progspkg);

print "%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
" if defined $setupfile;

print "
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
" if ($docpkg);

print "
%changelog
* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"

__END__

=head1 NAME

B<globus-spec-creator> - Generate an RPM spec file from a GPT source
package description

=head1 SYNOPSIS

B<globus-spec-creator> [options] [patches ...]

Options:

=over

=item B<-gptfile> filename

The package's GPT source package description file (mandatory)

=item B<-setupfile> filename

The corresponding setup package's GPT source package description file
(default: none)

=item B<-release> releasenumber

The RPM release number (default: 1)

=item B<-directory> directory

The package's source directory in the toolkit installer

=item B<-toolkitversion> versionnumber

Globus toolkit version (default: 4.2.1)

=item B<-email> emailaddress

The packagers e-mail address (default: username at hostname)

=item B<-nodoc>

Disable the generation of the doc RPM

=item B<-help>

Show help

=back

Arguments:

Each additional argument will be added as a patch in the generated
specfile.

=head1 EXAMPLE

globus-spec-creator -g globus_common-10.2/pkgdata/pkg_data_src.gpt.in
-s globus_common_setup-2.6/pkgdata/pkg_data_src.gpt.in -r 3 -d
common/source

=head1 SEE ALSO

See http://fedoraproject.org/wiki/PackagingDrafts/Globus for
additional information and examples.

=head1 AUTHOR

Mattias Ellert E<lt>mattias.ellert at fysast.uu.seE<gt>

=cut


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/globus-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-core.spec	21 Apr 2009 14:54:22 -0000	1.3
+++ globus-core.spec	27 Apr 2009 16:49:18 -0000	1.4
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@
 #		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
+Source2:	globus-spec-creator
 #		Make file locations configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
 Patch0:		%{name}-conf.patch
@@ -124,9 +125,25 @@
 # These scripts are intended to be sourced, not executed
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Add -Wl,--as-needed to the libtool script if supported
+%if %{?fedora}%{!?fedora:0} >= 2
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+%if %{?rhel}%{!?rhel:0} >= 4
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+
 # Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Install the Globus RPM specfile creator script
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
@@ -164,10 +181,16 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%{_bindir}/globus-spec-creator
+%doc %{_mandir}/man1/globus-spec-creator.1*
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
+- Install the globus-spec-creator script
+- Add -Wl,--as-needed to the libtool script
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
 - Update after clarification of packaging guidelines
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 14:54:24 -0000	1.3
+++ import.log	27 Apr 2009 16:49:18 -0000	1.4
@@ -1,3 +1,4 @@
 globus-core-5_15-1_fc9:F-10:globus-core-5.15-1.fc9.src.rpm:1237534087
 globus-core-5_15-2_fc9:F-10:globus-core-5.15-2.fc9.src.rpm:1240003514
 globus-core-5_15-3_fc9:F-10:globus-core-5.15-3.fc9.src.rpm:1240325513
+globus-core-5_15-4_fc9:F-10:globus-core-5.15-4.fc9.src.rpm:1240850929



From ellert at fedoraproject.org  Mon Apr 27 16:51:48 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 16:51:48 +0000 (UTC)
Subject: rpms/globus-core/F-11 globus-spec-creator, NONE,
	1.1 globus-core.spec, 1.3, 1.4 import.log, 1.3, 1.4
Message-ID: <20090427165148.4960C7013C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15341/F-11

Modified Files:
	globus-core.spec import.log 
Added Files:
	globus-spec-creator 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script



--- NEW FILE globus-spec-creator ---
#!/usr/bin/perl

use Getopt::Long;
use POSIX;
use XML::DOM;
use User::pwent;
use Sys::Hostname;
use Pod::Usage;

my $gptfile;
my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
my $toolkitversion = "4.2.1";
my $email;
my $nodoc;
my $help;

GetOptions('gptfile=s' => \$gptfile,
	   'setupfile=s' => \$setupfile,
	   'release=s' => \$release,
	   'directory=s' => \$directory,
	   'toolkitversion=s' => \$toolkitversion,
	   'email=s' => \$email,
	   'nodoc' => \$nodoc,
	   'help' => \$help);

Pod::Usage::pod2usage() if defined $help;

die "Missing --gptfile option" unless defined $gptfile;

setlocale(LC_TIME, 'C');

my $login = getlogin || getpwuid($<);
my $pw = getpwnam($login);
my ($fullname, $location, $phone) = split(/,/, $pw->gecos);
my $host = hostname;

$email = "$login\@$host" unless defined $email;

if (defined $directory) {
    $setupdirectory = $directory;
    $setupdirectory =~ s![^/]*$!setup!;
}

my $parser = new XML::DOM::Parser;

my %srcdeps;
my %setupdeps;

my $gptdoc = $parser->parsefile($gptfile);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptmeta->item(0)->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;

for my $srcdep ($gptmeta->item(0)
		->getElementsByTagName("Source_Dependencies")) {
    my $type = $srcdep->getAttributeNode("Type")->getValue;
    $srcdeps{$type} = {} unless defined $srcdeps{$type};
    for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	my $deppkg = $dep->getAttributeNode("Package")->getValue
	    if defined $dep->getAttributeNode("Package");
	$depname = $depname . "-progs" if ($deppkg eq "pgm");
	$depname = $depname . "-doc" if ($deppkg eq "doc");
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$srcdeps{$type}{$depname} = $depver
	    unless (defined $srcdeps{$type}{$depname}
		    and $srcdeps{$type}{$depname} >= $depver);
    }
}

for my $setupdep ($gptmeta->item(0)
		  ->getElementsByTagName("Source_Setup_Dependency")) {
    my $type = $setupdep->getAttributeNode("PkgType")->getValue;
    $setupdeps{$type} = {} unless defined $setupdeps{$type};
    for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$setupdeps{$type}{$depname} = $depver
	    unless (defined $setupdeps{$type}{$depname}
		    and $setupdeps{$type}{$depname} >= $depver);
    }
}

my $pkglibs = $gptmeta->item(0)->getElementsByTagName("Build_Environment")
    ->item(0)->getElementsByTagName("pkg_libs")->item(0);
$pkglibs = $pkglibs->getFirstChild if defined $pkglibs;

my $setupname;
my $setupversion;
my $setupdescription;
my $postinstall;

if (defined $setupfile) {

    my $setupdoc = $parser->parsefile($setupfile);

    my $setupmeta = $setupdoc->getElementsByTagName("gpt_package_metadata");
    $setupname = $setupmeta->item(0)->getAttributeNode("Name")->getValue;

    die "Setup package name does not match main package name"
	if ($setupname ne $gptname . '_setup');

    my $setupagingver = $setupmeta->item(0)
	->getElementsByTagName("Aging_Version");
    my $setupmajorver = $setupagingver->item(0)
	->getAttributeNode("Major")->getValue;
    my $setupminorver = $setupagingver->item(0)
	->getAttributeNode("Minor")->getValue;

    my $setupdesc = $setupmeta->item(0)->getElementsByTagName("Description");
    $setupdescription = $setupdesc->item(0)->getFirstChild->getData;
    $setupdescription =~ s!^\s+|\s+$!!g;

    for my $srcdep ($setupmeta->item(0)
		    ->getElementsByTagName("Source_Dependencies")) {
	my $type = $srcdep->getAttributeNode("Type")->getValue;
	$srcdeps{$type} = {} unless defined $srcdeps{$type};
	for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    my $deppkg = $dep->getAttributeNode("Package")->getValue
		if defined $dep->getAttributeNode("Package");
	    $depname = $depname . "-progs" if ($deppkg eq "pgm");
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $srcdeps{$type}{$depname} = $depver
		unless (defined $srcdeps{$type}{$depname}
			and $srcdeps{$type}{$depname} >= $depver);
	}
    }

    for my $setupdep ($setupmeta->item(0)
		      ->getElementsByTagName("Source_Setup_Dependency")) {
	my $type = $setupdep->getAttributeNode("PkgType")->getValue;
	$setupdeps{$type} = {} unless defined $setupdeps{$type};
	for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $setupdeps{$type}{$depname} = $depver
		unless (defined $setupdeps{$type}{$depname}
			and $setupdeps{$type}{$depname} >= $depver);
	}
    }

    my $setuppostinstall = $setupmeta->item(0)
	->getElementsByTagName("Post_Install_Program");
    $postinstall = $setuppostinstall->item(0)->getFirstChild->getData
	if defined $setuppostinstall->item(0);
    $postinstall =~ s!^\s+|\s+$!!g;

    $setupversion = $setupmajorver . '.' . $setupminorver;
}

my $name = $gptname;
$name =~ tr/_/-/;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = 1;
if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
    $libs = 0;
}

my $develpkg = 1;
my $docpkg = 1;
my $progspkg = 0;

if (!$libs) {
    $develpkg = 0;
    $docpkg = 0;
}
else {
    $docpkg = 0 if defined $nodoc;
    $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
}

print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
print "%global flavor gcc64pthr\n";
print "%else\n";
print "%global flavor gcc32pthr\n";
print "%endif\n\n";

print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
print "%global setupversion $setupversion\n" if defined $setupfile;
print "Release:\t$release%{?dist}\n";
print "Summary:\tGlobus Toolkit - $description\n";
print "\n";

if ($libs) {
    print "Group:\t\tSystem Environment/Libraries\n";
}
else {
    print "Group:\t\tApplications/Internet\n";
}
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
    if ($name ne "globus-core");
print "#\t\ttar -zcf $gptname-$version.tar.gz $gptname-$version\n";
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
    print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
    print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
    print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
    print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
    print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
if ($docpkg) {
    print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
    print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
    print "Source9:\tepstopdf-2.9.5gw\n";
}
my $p = 0;
while ($ARGV[$p]) {
    print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
    print "#\t\thttp://bugzilla.globus.org/bugzilla/show_bug.cgi?id=###BUG NUMBER###\n";
    print "Patch$p:" . ($p < 10 ? "\t\t" : "\t") . "$ARGV[$p]\n";
    $p++;
}
print "BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n";
print "\n";

if (!$libs) {
    print "Provides:\t%{name}-setup = %{setupversion}\n"
	if defined $setupfile;
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}
else {
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'lib_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
    while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
	print "BuildRequires:\t$key" .
	    ($value > 0 ? " >= $value\n" : "\n");
    }
    if ($docpkg) {
	print "BuildRequires:\tdoxygen\n";
	print "%if %{?fedora}%{!?fedora:0} >= 3\n";
	print  "BuildRequires:\tgraphviz\n";
	print  "BuildRequires:\tghostscript\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 5\n";
	print   "BuildRequires:\tgraphviz\n";
	print   "BuildRequires:\tghostscript\n";
	print   "%if \"%{?rhel}\" == \"5\"\n";
	print    "BuildRequires:\tgraphviz-gd\n";
	print   "%endif\n";
	print  "%endif\n";
	print "%endif\n";
	print "%if %{?fedora}%{!?fedora:0} >= 9\n";
	print  "BuildRequires:\ttex(latex)\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 6\n";
	print   "BuildRequires:\ttex(latex)\n";
	print  "%else\n";
	print   "BuildRequires:\ttetex-latex\n";
	print  "%endif\n";
	print "%endif\n";
    }
    if ($progspkg) {
	print "\n";
	print "%package progs\n";
	print "Summary:\tGlobus Toolkit - $description Programs\n";
	print "Group:\t\tApplications/Internet\n";
	print "Provides:\t%{name}-setup = %{setupversion}\n"
	    if defined $setupfile;
	print "Requires:\t%{name} = %{version}-%{release}\n";
	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	    # Explicit Requires for libraries should not be used according
	    # to the packaging guidelines. The autogenerated Requires on
	    # sonames make them redundant.
	    # Only add Requires for GPT glue packages and XIO plugins.
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
		   $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
		   $key =~ /^globus-xio-/;
	}
	while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq $name;
	}
	while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq 'trusted-ca-setup' or $key eq $name;
	}
    }
}

if ($develpkg) {
    print "\n";
    print "%package devel\n";
    print "Summary:\tGlobus Toolkit - $description Development Files\n";
    print "Group:\t\tDevelopment/Libraries\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "Requires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "Requires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}

if ($docpkg) {
    print "\n";
    print "%package doc\n";
    print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
    print "Group:\t\tDocumentation\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
}

print "
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
$description
";

print "
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
$description Programs
" if ($progspkg);

print "$setupdescription\n" if defined $setupfile;

print "
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
$description Development Files
" if ($develpkg);

print "
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
$description Documentation Files
" if ($docpkg);

print "
%prep
%setup -q -n %{_name}-%{version}
";

print "%setup -D -T -q -n %{_name}-%{version} -a 1\n" if defined $setupfile;

$p = 0;
while ($ARGV[$p]) {
    print "%patch$p -p1\n";
    $p++;
}

print "
%if \"%{rhel}\" == \"5\"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
" if ($docpkg);

print "
%build";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
";

print "
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \\
      -e 's!\\(lib[a-zA-Z_]*\\)_\$(GLOBUS_FLAVOR_NAME)\\.la!\\1.la!g' \\
      -e 's!^\\(lib[a-zA-Z_]*\\)___GLOBUS_FLAVOR_NAME__la_!\\1_la_!' -i \$f
done
sed -e \"s!<With_Flavors!<With_Flavors ColocateLibraries=\\\"no\\\"!\" \\
  -i pkgdata/pkg_data_src.gpt.in
" if ($libs);

print "
%{_datadir}/globus/globus-bootstrap.sh
";

if ($docpkg) {
    print "
%configure --with-flavor=%{flavor} --enable-doxygen
";
}
else {
    print "
%configure --with-flavor=%{flavor}
";
}

print "
make %{?_smp_mflags}
";

print "
# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -
" if defined $setupfile;

print "
%install";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
rm -rf \$RPM_BUILD_ROOT
make install DESTDIR=\$RPM_BUILD_ROOT
";

print "
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=\$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
				     globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
\\\$metadata->finish();
EOF

# Create setup files

### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;

if (not defined $pkglibs) {
    print "
# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" -i \$lib
done
" if ($libs);
}
else {
    print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
sed '/lib.*\\.la\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}

print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
sed '/lib.*\\.a\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
" if ($libs);

print "
# Generate pkg-config file from GPT metadata
mkdir -p \$RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \\
  \$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
# Move documentation to default RPM location
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
  \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\\.3/d' \\
    -e '/_%{_name}-%{version}_.*\\.3/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
" if ($docpkg);

print"
# Install license file
mkdir -p \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
";

if (!$libs) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}

if ($progspkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package-progs.filelist\n";
}

if ($develpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package-devel.filelist\n";
}

if ($docpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
    print "  | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}

print "
%clean
rm -rf \$RPM_BUILD_ROOT
";

print "
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
" if ($libs);

print "
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
";

print "
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
" if ($progspkg);

print "%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
" if defined $setupfile;

print "
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
" if ($docpkg);

print "
%changelog
* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"

__END__

=head1 NAME

B<globus-spec-creator> - Generate an RPM spec file from a GPT source
package description

=head1 SYNOPSIS

B<globus-spec-creator> [options] [patches ...]

Options:

=over

=item B<-gptfile> filename

The package's GPT source package description file (mandatory)

=item B<-setupfile> filename

The corresponding setup package's GPT source package description file
(default: none)

=item B<-release> releasenumber

The RPM release number (default: 1)

=item B<-directory> directory

The package's source directory in the toolkit installer

=item B<-toolkitversion> versionnumber

Globus toolkit version (default: 4.2.1)

=item B<-email> emailaddress

The packagers e-mail address (default: username at hostname)

=item B<-nodoc>

Disable the generation of the doc RPM

=item B<-help>

Show help

=back

Arguments:

Each additional argument will be added as a patch in the generated
specfile.

=head1 EXAMPLE

globus-spec-creator -g globus_common-10.2/pkgdata/pkg_data_src.gpt.in
-s globus_common_setup-2.6/pkgdata/pkg_data_src.gpt.in -r 3 -d
common/source

=head1 SEE ALSO

See http://fedoraproject.org/wiki/PackagingDrafts/Globus for
additional information and examples.

=head1 AUTHOR

Mattias Ellert E<lt>mattias.ellert at fysast.uu.seE<gt>

=cut


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-11/globus-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-core.spec	21 Apr 2009 14:58:19 -0000	1.3
+++ globus-core.spec	27 Apr 2009 16:51:17 -0000	1.4
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@
 #		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
+Source2:	globus-spec-creator
 #		Make file locations configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
 Patch0:		%{name}-conf.patch
@@ -124,9 +125,25 @@
 # These scripts are intended to be sourced, not executed
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Add -Wl,--as-needed to the libtool script if supported
+%if %{?fedora}%{!?fedora:0} >= 2
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+%if %{?rhel}%{!?rhel:0} >= 4
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+
 # Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Install the Globus RPM specfile creator script
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
@@ -164,10 +181,16 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%{_bindir}/globus-spec-creator
+%doc %{_mandir}/man1/globus-spec-creator.1*
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
+- Install the globus-spec-creator script
+- Add -Wl,--as-needed to the libtool script
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
 - Update after clarification of packaging guidelines
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 14:58:20 -0000	1.3
+++ import.log	27 Apr 2009 16:51:17 -0000	1.4
@@ -1,3 +1,4 @@
 globus-core-5_15-1_fc9:HEAD:globus-core-5.15-1.fc9.src.rpm:1237533693
 globus-core-5_15-2_fc9:F-11:globus-core-5.15-2.fc9.src.rpm:1240003593
 globus-core-5_15-3_fc9:F-11:globus-core-5.15-3.fc9.src.rpm:1240325750
+globus-core-5_15-4_fc9:F-11:globus-core-5.15-4.fc9.src.rpm:1240851043



From mclasen at fedoraproject.org  Mon Apr 27 16:53:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 16:53:04 +0000 (UTC)
Subject: rpms/GConf2/devel GConf-gettext.patch, NONE, 1.1 GConf2.spec, 1.101,
	1.102
Message-ID: <20090427165304.60EE370110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16225

Modified Files:
	GConf2.spec 
Added Files:
	GConf-gettext.patch 
Log Message:
Support client-side translations


GConf-gettext.patch:

--- NEW FILE GConf-gettext.patch ---
diff -up GConf-2.26.0/backends/markup-tree.c.gettext GConf-2.26.0/backends/markup-tree.c
--- GConf-2.26.0/backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
+++ GConf-2.26.0/backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
@@ -52,6 +52,7 @@ struct _MarkupEntry
   char       *schema_name;
   char       *mod_user;
   GTime       mod_time;
+  const char *gettext_domain;
 };
 
 static LocalSchemaInfo* local_schema_info_new  (void);
@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
                              gconf_schema_get_type (schema));
       gconf_schema_set_owner (current_schema,
                               gconf_schema_get_owner (schema));
+      gconf_schema_set_gettext_domain (current_schema,
+                              gconf_schema_get_gettext_domain (schema));
     }
 
   /* Update mod time */
@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
       else if (c_local_schema && c_local_schema->long_desc)
         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
 
+      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
+
       return retval;
     }
 }
@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
   const char *ltype;
   const char *list_type;
   const char *owner;
+
   GConfValueType vtype;
-  const char *dummy1, *dummy2, *dummy3, *dummy4;
+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
   
 #if 0
   g_assert (ELEMENT_IS ("entry") ||
@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
                           "muser", &dummy2,
                           "mtime", &dummy3,
                           "schema", &dummy4,
+                          "gettext_domain", &dummy5,
 
                           NULL))
     return;
@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
       const char *mtime;
       const char *schema;
       const char *type;
+      const char *gettext_domain;
       const char *dummy1, *dummy2, *dummy3, *dummy4;
       const char *dummy5, *dummy6, *dummy7;
       GConfValue *value;
@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
       mtime = NULL;
       schema = NULL;
       type = NULL;
+      gettext_domain = NULL;
 
       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
                               error,
@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
                               "mtime", &mtime,
                               "schema", &schema,
                               "type", &type,
+                              "gettext_domain", &gettext_domain,
                           
                               /* These are allowed but we don't use them until
                                * parse_value_element
@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
        */
       if (schema)
         entry->schema_name = g_strdup (schema);
+
+      if (gettext_domain)
+        entry->gettext_domain = g_intern_string (gettext_domain);
     }
   else
     {
@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
         GConfSchema *schema;
         GConfValueType stype;
         const char *owner;
+        const char *gettext_domain;
         
         schema = gconf_value_get_schema (value);
 
@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
             
             g_free (s);
           }
+
+        gettext_domain = gconf_schema_get_gettext_domain (schema);
+        
+        if (gettext_domain)
+          {
+            char *s;
+
+            s = g_markup_escape_text (gettext_domain, -1);
+            
+            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
+              {
+                g_free (s);
+                return FALSE;
+              }
+            
+            g_free (s);
+          }
         
         if (stype == GCONF_VALUE_LIST)
           {
diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
--- GConf-2.26.0/doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
+++ GConf-2.26.0/doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
@@ -7,7 +7,7 @@
 <!-- A single schema. What I am trying to say is "this set of
 elements, in any order". Duplicate elements (apart from <locale>) are
 not allowed). -->
-<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
+<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
 
 <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
 <!ELEMENT key     (#PCDATA)>
diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
--- GConf-2.26.0/gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
+++ GConf-2.26.0/gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
   cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
   cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
   cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
+  cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
 
   {
     gchar* encoded;
@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
         gconf_schema_set_owner(sc, cs->owner);
     }
       
+  if (*cs->gettext_domain != '\0')
+    {
+      if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
+        gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
+      else
+        gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
+    }
+      
   {
     GConfValue* val;
 
diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
--- GConf-2.26.0/gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
+++ GConf-2.26.0/gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
@@ -32,9 +32,10 @@ typedef struct {
   GConfValueType car_type; /* Pair car type of the described entry */
   GConfValueType cdr_type; /* Pair cdr type of the described entry */
   gchar* locale;       /* Schema locale */
-  gchar* owner;        /* Name of creating application */
+  const gchar* owner;        /* Name of creating application */
   gchar* short_desc;   /* 40 char or less description, no newlines */
   gchar* long_desc;    /* could be a paragraph or so */
+  const gchar* gettext_domain; /* description gettext domain */
   GConfValue* default_value; /* Default value of the key */
 } GConfRealSchema;
 
@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
   g_free (real->locale);
   g_free (real->short_desc);
   g_free (real->long_desc);
-  g_free (real->owner);
 
   if (real->default_value)
     gconf_value_free (real->default_value);
@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
 
   dest->long_desc = g_strdup (real->long_desc);
 
-  dest->owner = g_strdup (real->owner);
+  dest->gettext_domain = real->gettext_domain;
+
+  dest->owner = real->owner;
 
   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
   
@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
     REAL_SCHEMA (sc)->locale = NULL;
 }
 
+void
+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
+{
+  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
+  
+  if (domain)
+    REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
+  else 
+    REAL_SCHEMA (sc)->gettext_domain = NULL;
+}
+
 void          
 gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
 {
@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
 {
   g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
   
-  if (REAL_SCHEMA (sc)->owner)
-    g_free (REAL_SCHEMA (sc)->owner);
-
   if (owner)
-    REAL_SCHEMA (sc)->owner = g_strdup (owner);
+    REAL_SCHEMA (sc)->owner = g_intern_string (owner);
   else
     REAL_SCHEMA (sc)->owner = NULL;
 }
@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
       return FALSE;
     }
 
+  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
+    {
+      g_set_error (err, GCONF_ERROR,
+                   GCONF_ERROR_FAILED,
+                   _("Schema contains invalid UTF-8"));
+      return FALSE;
+    }
+
   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
     {
       g_set_error (err, GCONF_ERROR,
@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
 }
 
 const char*
+gconf_schema_get_gettext_domain (const GConfSchema *schema)
+{
+  g_return_val_if_fail (schema != NULL, NULL);
+
+  return REAL_SCHEMA (schema)->gettext_domain;
+}
+
+static inline const char *
+schema_translate (const GConfSchema *schema,
+                  const char        *string)
+{
+  if (REAL_SCHEMA (schema)->gettext_domain)
+    {
+      bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
+      return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
+    }
+  else
+    return string;
+}
+
+const char*
 gconf_schema_get_short_desc (const GConfSchema *schema)
 {
   g_return_val_if_fail (schema != NULL, NULL);
 
-  return REAL_SCHEMA (schema)->short_desc;
+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
 }
 
 const char*
@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
 {
   g_return_val_if_fail (schema != NULL, NULL);
 
-  return REAL_SCHEMA (schema)->long_desc;
+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
 }
 
 const char*
diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
--- GConf-2.26.0/gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
+++ GConf-2.26.0/gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
                                             GConfValueType  type);
 void gconf_schema_set_locale               (GConfSchema    *sc,
                                             const gchar    *locale);
+void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
+                                            const gchar    *domain);
 void gconf_schema_set_short_desc           (GConfSchema    *sc,
                                             const gchar    *desc);
 void gconf_schema_set_long_desc            (GConfSchema    *sc,
@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
 GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
 GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
 const char*    gconf_schema_get_locale        (const GConfSchema *schema);
+const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
 const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
 const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
 const char*    gconf_schema_get_owner         (const GConfSchema *schema);
diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
--- GConf-2.26.0/gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
+++ GConf-2.26.0/gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
   GConfValueType cdr_type;
   GConfValue* global_default;
   GHashTable* hash;
+  gchar* gettext_domain;
 };
 
 static int
@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
               else
                 g_printerr (_("WARNING: empty <applyto> node"));
             }
+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
+            {
+              tmp = (char *)xmlNodeGetContent(iter);
+              if (tmp)
+                {
+                  info->gettext_domain = g_strdup(tmp);
+                  xmlFree(tmp);
+                }
+            }
           else
             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
 			iter->name);
@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
   if (info->owner != NULL)
     gconf_schema_set_owner(schema, info->owner);
 
+  if (info->gettext_domain != NULL)
+    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
+
   xmlFree(name);
 
   /* Locale-specific info */
@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
   info.apply_to = NULL;
   info.owner = NULL;
   info.global_default = NULL;
+  info.gettext_domain = NULL;
   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
   
   extract_global_info(node, &info);
@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
             ;  /* nothing */
           else if (strcmp((char *)iter->name, "applyto") == 0)
             ;  /* nothing */
+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
+            ;  /* nothing */
           else if (strcmp((char *)iter->name, "locale") == 0)
             {
               process_locale_info(iter, &info);
diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
--- GConf-2.26.0/gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
+++ GConf-2.26.0/gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
@@ -16,6 +16,7 @@ struct ConfigSchema {
   string short_desc;
   string long_desc;
   string owner;
+  string gettext_domain;
   // Work around lack of recursive data types
   string encoded_default_value;
 };


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- GConf2.spec	13 Apr 2009 19:33:10 -0000	1.101
+++ GConf2.spec	27 Apr 2009 16:52:33 -0000	1.102
@@ -33,11 +33,15 @@
 Conflicts: GConf2-dbus
 
 Patch0: GConf-2.18.0.1-reload.patch
+# from upstream
 Patch1: gconf-less-work.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=568845
+Patch2: GConf-gettext.patch
+
 
 %description
-GConf is a process-transparent configuration database API used to 
-store user preferences. It has pluggable backends and features to 
+GConf is a process-transparent configuration database API used to
+store user preferences. It has pluggable backends and features to
 support workgroup administration.
 
 %package devel
@@ -70,6 +74,7 @@
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .less-work
+%patch2 -p1 -b .gettext
 
 %build
 %configure --disable-static --enable-defaults-service
@@ -144,6 +149,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-3
+- Support client-side translations
+
 * Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.26.0-2
 - Explicit Conflicts: GConf2-dbus (#492636)
 



From ellert at fedoraproject.org  Mon Apr 27 16:53:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 16:53:37 +0000 (UTC)
Subject: rpms/globus-core/EL-4 globus-spec-creator, NONE,
	1.1 globus-core.spec, 1.3, 1.4 import.log, 1.3, 1.4
Message-ID: <20090427165337.B5F1170110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16348/EL-4

Modified Files:
	globus-core.spec import.log 
Added Files:
	globus-spec-creator 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script



--- NEW FILE globus-spec-creator ---
#!/usr/bin/perl

use Getopt::Long;
use POSIX;
use XML::DOM;
use User::pwent;
use Sys::Hostname;
use Pod::Usage;

my $gptfile;
my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
my $toolkitversion = "4.2.1";
my $email;
my $nodoc;
my $help;

GetOptions('gptfile=s' => \$gptfile,
	   'setupfile=s' => \$setupfile,
	   'release=s' => \$release,
	   'directory=s' => \$directory,
	   'toolkitversion=s' => \$toolkitversion,
	   'email=s' => \$email,
	   'nodoc' => \$nodoc,
	   'help' => \$help);

Pod::Usage::pod2usage() if defined $help;

die "Missing --gptfile option" unless defined $gptfile;

setlocale(LC_TIME, 'C');

my $login = getlogin || getpwuid($<);
my $pw = getpwnam($login);
my ($fullname, $location, $phone) = split(/,/, $pw->gecos);
my $host = hostname;

$email = "$login\@$host" unless defined $email;

if (defined $directory) {
    $setupdirectory = $directory;
    $setupdirectory =~ s![^/]*$!setup!;
}

my $parser = new XML::DOM::Parser;

my %srcdeps;
my %setupdeps;

my $gptdoc = $parser->parsefile($gptfile);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptmeta->item(0)->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;

for my $srcdep ($gptmeta->item(0)
		->getElementsByTagName("Source_Dependencies")) {
    my $type = $srcdep->getAttributeNode("Type")->getValue;
    $srcdeps{$type} = {} unless defined $srcdeps{$type};
    for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	my $deppkg = $dep->getAttributeNode("Package")->getValue
	    if defined $dep->getAttributeNode("Package");
	$depname = $depname . "-progs" if ($deppkg eq "pgm");
	$depname = $depname . "-doc" if ($deppkg eq "doc");
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$srcdeps{$type}{$depname} = $depver
	    unless (defined $srcdeps{$type}{$depname}
		    and $srcdeps{$type}{$depname} >= $depver);
    }
}

for my $setupdep ($gptmeta->item(0)
		  ->getElementsByTagName("Source_Setup_Dependency")) {
    my $type = $setupdep->getAttributeNode("PkgType")->getValue;
    $setupdeps{$type} = {} unless defined $setupdeps{$type};
    for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$setupdeps{$type}{$depname} = $depver
	    unless (defined $setupdeps{$type}{$depname}
		    and $setupdeps{$type}{$depname} >= $depver);
    }
}

my $pkglibs = $gptmeta->item(0)->getElementsByTagName("Build_Environment")
    ->item(0)->getElementsByTagName("pkg_libs")->item(0);
$pkglibs = $pkglibs->getFirstChild if defined $pkglibs;

my $setupname;
my $setupversion;
my $setupdescription;
my $postinstall;

if (defined $setupfile) {

    my $setupdoc = $parser->parsefile($setupfile);

    my $setupmeta = $setupdoc->getElementsByTagName("gpt_package_metadata");
    $setupname = $setupmeta->item(0)->getAttributeNode("Name")->getValue;

    die "Setup package name does not match main package name"
	if ($setupname ne $gptname . '_setup');

    my $setupagingver = $setupmeta->item(0)
	->getElementsByTagName("Aging_Version");
    my $setupmajorver = $setupagingver->item(0)
	->getAttributeNode("Major")->getValue;
    my $setupminorver = $setupagingver->item(0)
	->getAttributeNode("Minor")->getValue;

    my $setupdesc = $setupmeta->item(0)->getElementsByTagName("Description");
    $setupdescription = $setupdesc->item(0)->getFirstChild->getData;
    $setupdescription =~ s!^\s+|\s+$!!g;

    for my $srcdep ($setupmeta->item(0)
		    ->getElementsByTagName("Source_Dependencies")) {
	my $type = $srcdep->getAttributeNode("Type")->getValue;
	$srcdeps{$type} = {} unless defined $srcdeps{$type};
	for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    my $deppkg = $dep->getAttributeNode("Package")->getValue
		if defined $dep->getAttributeNode("Package");
	    $depname = $depname . "-progs" if ($deppkg eq "pgm");
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $srcdeps{$type}{$depname} = $depver
		unless (defined $srcdeps{$type}{$depname}
			and $srcdeps{$type}{$depname} >= $depver);
	}
    }

    for my $setupdep ($setupmeta->item(0)
		      ->getElementsByTagName("Source_Setup_Dependency")) {
	my $type = $setupdep->getAttributeNode("PkgType")->getValue;
	$setupdeps{$type} = {} unless defined $setupdeps{$type};
	for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $setupdeps{$type}{$depname} = $depver
		unless (defined $setupdeps{$type}{$depname}
			and $setupdeps{$type}{$depname} >= $depver);
	}
    }

    my $setuppostinstall = $setupmeta->item(0)
	->getElementsByTagName("Post_Install_Program");
    $postinstall = $setuppostinstall->item(0)->getFirstChild->getData
	if defined $setuppostinstall->item(0);
    $postinstall =~ s!^\s+|\s+$!!g;

    $setupversion = $setupmajorver . '.' . $setupminorver;
}

my $name = $gptname;
$name =~ tr/_/-/;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = 1;
if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
    $libs = 0;
}

my $develpkg = 1;
my $docpkg = 1;
my $progspkg = 0;

if (!$libs) {
    $develpkg = 0;
    $docpkg = 0;
}
else {
    $docpkg = 0 if defined $nodoc;
    $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
}

print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
print "%global flavor gcc64pthr\n";
print "%else\n";
print "%global flavor gcc32pthr\n";
print "%endif\n\n";

print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
print "%global setupversion $setupversion\n" if defined $setupfile;
print "Release:\t$release%{?dist}\n";
print "Summary:\tGlobus Toolkit - $description\n";
print "\n";

if ($libs) {
    print "Group:\t\tSystem Environment/Libraries\n";
}
else {
    print "Group:\t\tApplications/Internet\n";
}
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
    if ($name ne "globus-core");
print "#\t\ttar -zcf $gptname-$version.tar.gz $gptname-$version\n";
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
    print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
    print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
    print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
    print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
    print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
if ($docpkg) {
    print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
    print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
    print "Source9:\tepstopdf-2.9.5gw\n";
}
my $p = 0;
while ($ARGV[$p]) {
    print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
    print "#\t\thttp://bugzilla.globus.org/bugzilla/show_bug.cgi?id=###BUG NUMBER###\n";
    print "Patch$p:" . ($p < 10 ? "\t\t" : "\t") . "$ARGV[$p]\n";
    $p++;
}
print "BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n";
print "\n";

if (!$libs) {
    print "Provides:\t%{name}-setup = %{setupversion}\n"
	if defined $setupfile;
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}
else {
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'lib_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
    while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
	print "BuildRequires:\t$key" .
	    ($value > 0 ? " >= $value\n" : "\n");
    }
    if ($docpkg) {
	print "BuildRequires:\tdoxygen\n";
	print "%if %{?fedora}%{!?fedora:0} >= 3\n";
	print  "BuildRequires:\tgraphviz\n";
	print  "BuildRequires:\tghostscript\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 5\n";
	print   "BuildRequires:\tgraphviz\n";
	print   "BuildRequires:\tghostscript\n";
	print   "%if \"%{?rhel}\" == \"5\"\n";
	print    "BuildRequires:\tgraphviz-gd\n";
	print   "%endif\n";
	print  "%endif\n";
	print "%endif\n";
	print "%if %{?fedora}%{!?fedora:0} >= 9\n";
	print  "BuildRequires:\ttex(latex)\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 6\n";
	print   "BuildRequires:\ttex(latex)\n";
	print  "%else\n";
	print   "BuildRequires:\ttetex-latex\n";
	print  "%endif\n";
	print "%endif\n";
    }
    if ($progspkg) {
	print "\n";
	print "%package progs\n";
	print "Summary:\tGlobus Toolkit - $description Programs\n";
	print "Group:\t\tApplications/Internet\n";
	print "Provides:\t%{name}-setup = %{setupversion}\n"
	    if defined $setupfile;
	print "Requires:\t%{name} = %{version}-%{release}\n";
	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	    # Explicit Requires for libraries should not be used according
	    # to the packaging guidelines. The autogenerated Requires on
	    # sonames make them redundant.
	    # Only add Requires for GPT glue packages and XIO plugins.
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
		   $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
		   $key =~ /^globus-xio-/;
	}
	while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq $name;
	}
	while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq 'trusted-ca-setup' or $key eq $name;
	}
    }
}

if ($develpkg) {
    print "\n";
    print "%package devel\n";
    print "Summary:\tGlobus Toolkit - $description Development Files\n";
    print "Group:\t\tDevelopment/Libraries\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "Requires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "Requires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}

if ($docpkg) {
    print "\n";
    print "%package doc\n";
    print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
    print "Group:\t\tDocumentation\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
}

print "
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
$description
";

print "
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
$description Programs
" if ($progspkg);

print "$setupdescription\n" if defined $setupfile;

print "
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
$description Development Files
" if ($develpkg);

print "
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
$description Documentation Files
" if ($docpkg);

print "
%prep
%setup -q -n %{_name}-%{version}
";

print "%setup -D -T -q -n %{_name}-%{version} -a 1\n" if defined $setupfile;

$p = 0;
while ($ARGV[$p]) {
    print "%patch$p -p1\n";
    $p++;
}

print "
%if \"%{rhel}\" == \"5\"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
" if ($docpkg);

print "
%build";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
";

print "
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \\
      -e 's!\\(lib[a-zA-Z_]*\\)_\$(GLOBUS_FLAVOR_NAME)\\.la!\\1.la!g' \\
      -e 's!^\\(lib[a-zA-Z_]*\\)___GLOBUS_FLAVOR_NAME__la_!\\1_la_!' -i \$f
done
sed -e \"s!<With_Flavors!<With_Flavors ColocateLibraries=\\\"no\\\"!\" \\
  -i pkgdata/pkg_data_src.gpt.in
" if ($libs);

print "
%{_datadir}/globus/globus-bootstrap.sh
";

if ($docpkg) {
    print "
%configure --with-flavor=%{flavor} --enable-doxygen
";
}
else {
    print "
%configure --with-flavor=%{flavor}
";
}

print "
make %{?_smp_mflags}
";

print "
# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -
" if defined $setupfile;

print "
%install";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
rm -rf \$RPM_BUILD_ROOT
make install DESTDIR=\$RPM_BUILD_ROOT
";

print "
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=\$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
				     globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
\\\$metadata->finish();
EOF

# Create setup files

### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;

if (not defined $pkglibs) {
    print "
# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" -i \$lib
done
" if ($libs);
}
else {
    print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
sed '/lib.*\\.la\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}

print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
sed '/lib.*\\.a\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
" if ($libs);

print "
# Generate pkg-config file from GPT metadata
mkdir -p \$RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \\
  \$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
# Move documentation to default RPM location
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
  \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\\.3/d' \\
    -e '/_%{_name}-%{version}_.*\\.3/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
" if ($docpkg);

print"
# Install license file
mkdir -p \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
";

if (!$libs) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}

if ($progspkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package-progs.filelist\n";
}

if ($develpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package-devel.filelist\n";
}

if ($docpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
    print "  | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}

print "
%clean
rm -rf \$RPM_BUILD_ROOT
";

print "
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
" if ($libs);

print "
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
";

print "
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
" if ($progspkg);

print "%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
" if defined $setupfile;

print "
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
" if ($docpkg);

print "
%changelog
* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"

__END__

=head1 NAME

B<globus-spec-creator> - Generate an RPM spec file from a GPT source
package description

=head1 SYNOPSIS

B<globus-spec-creator> [options] [patches ...]

Options:

=over

=item B<-gptfile> filename

The package's GPT source package description file (mandatory)

=item B<-setupfile> filename

The corresponding setup package's GPT source package description file
(default: none)

=item B<-release> releasenumber

The RPM release number (default: 1)

=item B<-directory> directory

The package's source directory in the toolkit installer

=item B<-toolkitversion> versionnumber

Globus toolkit version (default: 4.2.1)

=item B<-email> emailaddress

The packagers e-mail address (default: username at hostname)

=item B<-nodoc>

Disable the generation of the doc RPM

=item B<-help>

Show help

=back

Arguments:

Each additional argument will be added as a patch in the generated
specfile.

=head1 EXAMPLE

globus-spec-creator -g globus_common-10.2/pkgdata/pkg_data_src.gpt.in
-s globus_common_setup-2.6/pkgdata/pkg_data_src.gpt.in -r 3 -d
common/source

=head1 SEE ALSO

See http://fedoraproject.org/wiki/PackagingDrafts/Globus for
additional information and examples.

=head1 AUTHOR

Mattias Ellert E<lt>mattias.ellert at fysast.uu.seE<gt>

=cut


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/globus-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-core.spec	21 Apr 2009 15:02:14 -0000	1.3
+++ globus-core.spec	27 Apr 2009 16:53:07 -0000	1.4
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@
 #		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
+Source2:	globus-spec-creator
 #		Make file locations configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
 Patch0:		%{name}-conf.patch
@@ -124,9 +125,25 @@
 # These scripts are intended to be sourced, not executed
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Add -Wl,--as-needed to the libtool script if supported
+%if %{?fedora}%{!?fedora:0} >= 2
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+%if %{?rhel}%{!?rhel:0} >= 4
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+
 # Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Install the Globus RPM specfile creator script
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
@@ -164,10 +181,16 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%{_bindir}/globus-spec-creator
+%doc %{_mandir}/man1/globus-spec-creator.1*
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
+- Install the globus-spec-creator script
+- Add -Wl,--as-needed to the libtool script
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
 - Update after clarification of packaging guidelines
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:02:15 -0000	1.3
+++ import.log	27 Apr 2009 16:53:07 -0000	1.4
@@ -1,3 +1,4 @@
 globus-core-5_15-1_fc9:EL-4:globus-core-5.15-1.fc9.src.rpm:1237534237
 globus-core-5_15-2_fc9:EL-4:globus-core-5.15-2.fc9.src.rpm:1240003699
 globus-core-5_15-3_fc9:EL-4:globus-core-5.15-3.fc9.src.rpm:1240325969
+globus-core-5_15-4_fc9:EL-4:globus-core-5.15-4.fc9.src.rpm:1240851135



From ellert at fedoraproject.org  Mon Apr 27 16:55:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 16:55:15 +0000 (UTC)
Subject: rpms/globus-core/EL-5 globus-spec-creator, NONE,
	1.1 globus-core.spec, 1.3, 1.4 import.log, 1.3, 1.4
Message-ID: <20090427165515.24F6C70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16672/EL-5

Modified Files:
	globus-core.spec import.log 
Added Files:
	globus-spec-creator 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script



--- NEW FILE globus-spec-creator ---
#!/usr/bin/perl

use Getopt::Long;
use POSIX;
use XML::DOM;
use User::pwent;
use Sys::Hostname;
use Pod::Usage;

my $gptfile;
my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
my $toolkitversion = "4.2.1";
my $email;
my $nodoc;
my $help;

GetOptions('gptfile=s' => \$gptfile,
	   'setupfile=s' => \$setupfile,
	   'release=s' => \$release,
	   'directory=s' => \$directory,
	   'toolkitversion=s' => \$toolkitversion,
	   'email=s' => \$email,
	   'nodoc' => \$nodoc,
	   'help' => \$help);

Pod::Usage::pod2usage() if defined $help;

die "Missing --gptfile option" unless defined $gptfile;

setlocale(LC_TIME, 'C');

my $login = getlogin || getpwuid($<);
my $pw = getpwnam($login);
my ($fullname, $location, $phone) = split(/,/, $pw->gecos);
my $host = hostname;

$email = "$login\@$host" unless defined $email;

if (defined $directory) {
    $setupdirectory = $directory;
    $setupdirectory =~ s![^/]*$!setup!;
}

my $parser = new XML::DOM::Parser;

my %srcdeps;
my %setupdeps;

my $gptdoc = $parser->parsefile($gptfile);

my $gptmeta = $gptdoc->getElementsByTagName("gpt_package_metadata");
my $gptname = $gptmeta->item(0)->getAttributeNode("Name")->getValue;

my $gptagingver = $gptmeta->item(0)->getElementsByTagName("Aging_Version");
my $gptmajorver = $gptagingver->item(0)->getAttributeNode("Major")->getValue;
my $gptminorver = $gptagingver->item(0)->getAttributeNode("Minor")->getValue;

my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;

for my $srcdep ($gptmeta->item(0)
		->getElementsByTagName("Source_Dependencies")) {
    my $type = $srcdep->getAttributeNode("Type")->getValue;
    $srcdeps{$type} = {} unless defined $srcdeps{$type};
    for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	my $deppkg = $dep->getAttributeNode("Package")->getValue
	    if defined $dep->getAttributeNode("Package");
	$depname = $depname . "-progs" if ($deppkg eq "pgm");
	$depname = $depname . "-doc" if ($deppkg eq "doc");
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$srcdeps{$type}{$depname} = $depver
	    unless (defined $srcdeps{$type}{$depname}
		    and $srcdeps{$type}{$depname} >= $depver);
    }
}

for my $setupdep ($gptmeta->item(0)
		  ->getElementsByTagName("Source_Setup_Dependency")) {
    my $type = $setupdep->getAttributeNode("PkgType")->getValue;
    $setupdeps{$type} = {} unless defined $setupdeps{$type};
    for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	my $depname = $dep->getAttributeNode("Name")->getValue;
	$depname =~ tr/_/-/;
	my $depver = $dep->getElementsByTagName("Simple_Version")
	    ->item(0)->getAttributeNode("Major")->getValue;
	$setupdeps{$type}{$depname} = $depver
	    unless (defined $setupdeps{$type}{$depname}
		    and $setupdeps{$type}{$depname} >= $depver);
    }
}

my $pkglibs = $gptmeta->item(0)->getElementsByTagName("Build_Environment")
    ->item(0)->getElementsByTagName("pkg_libs")->item(0);
$pkglibs = $pkglibs->getFirstChild if defined $pkglibs;

my $setupname;
my $setupversion;
my $setupdescription;
my $postinstall;

if (defined $setupfile) {

    my $setupdoc = $parser->parsefile($setupfile);

    my $setupmeta = $setupdoc->getElementsByTagName("gpt_package_metadata");
    $setupname = $setupmeta->item(0)->getAttributeNode("Name")->getValue;

    die "Setup package name does not match main package name"
	if ($setupname ne $gptname . '_setup');

    my $setupagingver = $setupmeta->item(0)
	->getElementsByTagName("Aging_Version");
    my $setupmajorver = $setupagingver->item(0)
	->getAttributeNode("Major")->getValue;
    my $setupminorver = $setupagingver->item(0)
	->getAttributeNode("Minor")->getValue;

    my $setupdesc = $setupmeta->item(0)->getElementsByTagName("Description");
    $setupdescription = $setupdesc->item(0)->getFirstChild->getData;
    $setupdescription =~ s!^\s+|\s+$!!g;

    for my $srcdep ($setupmeta->item(0)
		    ->getElementsByTagName("Source_Dependencies")) {
	my $type = $srcdep->getAttributeNode("Type")->getValue;
	$srcdeps{$type} = {} unless defined $srcdeps{$type};
	for my $dep ($srcdep->getElementsByTagName("Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    my $deppkg = $dep->getAttributeNode("Package")->getValue
		if defined $dep->getAttributeNode("Package");
	    $depname = $depname . "-progs" if ($deppkg eq "pgm");
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $srcdeps{$type}{$depname} = $depver
		unless (defined $srcdeps{$type}{$depname}
			and $srcdeps{$type}{$depname} >= $depver);
	}
    }

    for my $setupdep ($setupmeta->item(0)
		      ->getElementsByTagName("Source_Setup_Dependency")) {
	my $type = $setupdep->getAttributeNode("PkgType")->getValue;
	$setupdeps{$type} = {} unless defined $setupdeps{$type};
	for my $dep ($setupdep->getElementsByTagName("Setup_Dependency")) {
	    my $depname = $dep->getAttributeNode("Name")->getValue;
	    $depname =~ tr/_/-/;
	    my $depver = $dep->getElementsByTagName("Simple_Version")
		->item(0)->getAttributeNode("Major")->getValue;
	    $setupdeps{$type}{$depname} = $depver
		unless (defined $setupdeps{$type}{$depname}
			and $setupdeps{$type}{$depname} >= $depver);
	}
    }

    my $setuppostinstall = $setupmeta->item(0)
	->getElementsByTagName("Post_Install_Program");
    $postinstall = $setuppostinstall->item(0)->getFirstChild->getData
	if defined $setuppostinstall->item(0);
    $postinstall =~ s!^\s+|\s+$!!g;

    $setupversion = $setupmajorver . '.' . $setupminorver;
}

my $name = $gptname;
$name =~ tr/_/-/;

my $version = $gptmajorver . '.' . $gptminorver;

my $libs = 1;
if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
    $libs = 0;
}

my $develpkg = 1;
my $docpkg = 1;
my $progspkg = 0;

if (!$libs) {
    $develpkg = 0;
    $docpkg = 0;
}
else {
    $docpkg = 0 if defined $nodoc;
    $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
}

print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
print "%global flavor gcc64pthr\n";
print "%else\n";
print "%global flavor gcc32pthr\n";
print "%endif\n\n";

print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
print "%global setupversion $setupversion\n" if defined $setupfile;
print "Release:\t$release%{?dist}\n";
print "Summary:\tGlobus Toolkit - $description\n";
print "\n";

if ($libs) {
    print "Group:\t\tSystem Environment/Libraries\n";
}
else {
    print "Group:\t\tApplications/Internet\n";
}
print "License:\tASL 2.0\n";
print "URL:\t\thttp://www.globus.org/\n";
print "#\t\tSource is extracted from the globus toolkit installer:\n";
print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($directory ? $directory : "###DIRECTORY###") . " $gptname-$version\n";
print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $gptname-$version\n"
    if ($name ne "globus-core");
print "#\t\ttar -zcf $gptname-$version.tar.gz $gptname-$version\n";
print "Source:\t\t%{_name}-%{version}.tar.gz\n";
if (defined $setupfile) {
    print "#\t\tSource1 is extracted from the globus toolkit installer:\n";
    print "#\t\twget -N http://www-unix.globus.org/ftppub/gt4/$toolkitversion/installers/src/gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\ttar -jxf gt$toolkitversion-all-source-installer.tar.bz2\n";
    print "#\t\tmv gt$toolkitversion-all-source-installer/source-trees/" . ($setupdirectory ? $setupdirectory : "###DIRECTORY###") . " $setupname-$setupversion\n";
    print "#\t\tcp -p gt$toolkitversion-all-source-installer/source-trees/core/source/GLOBUS_LICENSE $setupname-$setupversion\n";
    print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
    print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
if ($docpkg) {
    print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
    print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
    print "Source9:\tepstopdf-2.9.5gw\n";
}
my $p = 0;
while ($ARGV[$p]) {
    print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
    print "#\t\thttp://bugzilla.globus.org/bugzilla/show_bug.cgi?id=###BUG NUMBER###\n";
    print "Patch$p:" . ($p < 10 ? "\t\t" : "\t") . "$ARGV[$p]\n";
    $p++;
}
print "BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n";
print "\n";

if (!$libs) {
    print "Provides:\t%{name}-setup = %{setupversion}\n"
	if defined $setupfile;
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}
else {
    my $hasrequires = 0;
    while (($key, $value) = each(%{$srcdeps{'lib_link'}})) {
	# Explicit Requires for libraries should not be used according to the
	# packaging guidelines. The autogenerated Requires on sonames make them
	# redundant. Only add Requires for GPT glue packages and XIO plugins.
	if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
	    $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
	    $key =~ /^globus-xio-/) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
	    $hasrequires = 1;
	}
    }
    # Need at least one Requires to own directories
    print "Requires:\tglobus-common\n" unless $hasrequires;
    while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
    }
    while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
	print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
	    unless $key eq 'trusted-ca-setup';
    }
    print "BuildRequires:\tgrid-packaging-tools\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "BuildRequires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "BuildRequires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
    while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
	print "BuildRequires:\t$key" .
	    ($value > 0 ? " >= $value\n" : "\n");
    }
    if ($docpkg) {
	print "BuildRequires:\tdoxygen\n";
	print "%if %{?fedora}%{!?fedora:0} >= 3\n";
	print  "BuildRequires:\tgraphviz\n";
	print  "BuildRequires:\tghostscript\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 5\n";
	print   "BuildRequires:\tgraphviz\n";
	print   "BuildRequires:\tghostscript\n";
	print   "%if \"%{?rhel}\" == \"5\"\n";
	print    "BuildRequires:\tgraphviz-gd\n";
	print   "%endif\n";
	print  "%endif\n";
	print "%endif\n";
	print "%if %{?fedora}%{!?fedora:0} >= 9\n";
	print  "BuildRequires:\ttex(latex)\n";
	print "%else\n";
	print  "%if %{?rhel}%{!?rhel:0} >= 6\n";
	print   "BuildRequires:\ttex(latex)\n";
	print  "%else\n";
	print   "BuildRequires:\ttetex-latex\n";
	print  "%endif\n";
	print "%endif\n";
    }
    if ($progspkg) {
	print "\n";
	print "%package progs\n";
	print "Summary:\tGlobus Toolkit - $description Programs\n";
	print "Group:\t\tApplications/Internet\n";
	print "Provides:\t%{name}-setup = %{setupversion}\n"
	    if defined $setupfile;
	print "Requires:\t%{name} = %{version}-%{release}\n";
	while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
	    # Explicit Requires for libraries should not be used according
	    # to the packaging guidelines. The autogenerated Requires on
	    # sonames make them redundant.
	    # Only add Requires for GPT glue packages and XIO plugins.
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
		   $key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
		   $key =~ /^globus-xio-/;
	}
	while (($key, $value) = each(%{$srcdeps{'pgm_runtime'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq $name;
	}
	while (($key, $value) = each(%{$setupdeps{'pgm'}})) {
	    print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
		unless $key eq 'trusted-ca-setup' or $key eq $name;
	}
    }
}

if ($develpkg) {
    print "\n";
    print "%package devel\n";
    print "Summary:\tGlobus Toolkit - $description Development Files\n";
    print "Group:\t\tDevelopment/Libraries\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
    while (($key, $value) = each(%{$srcdeps{'compile'}})) {
	if ($key eq "globus-core") {
	    print "Requires:\t$key" .
		($value > 0 ? " >= $value\n" : "\n");
	}
	else {
	    print "Requires:\t$key-devel" .
		($value > 0 ? " >= $value\n" : "\n");
	}
    }
}

if ($docpkg) {
    print "\n";
    print "%package doc\n";
    print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
    print "Group:\t\tDocumentation\n";
    print "Requires:\t%{name} = %{version}-%{release}\n";
}

print "
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
$description
";

print "
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
$description Programs
" if ($progspkg);

print "$setupdescription\n" if defined $setupfile;

print "
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
$description Development Files
" if ($develpkg);

print "
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
$description Documentation Files
" if ($docpkg);

print "
%prep
%setup -q -n %{_name}-%{version}
";

print "%setup -D -T -q -n %{_name}-%{version} -a 1\n" if defined $setupfile;

$p = 0;
while ($ARGV[$p]) {
    print "%patch$p -p1\n";
    $p++;
}

print "
%if \"%{rhel}\" == \"5\"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
" if ($docpkg);

print "
%build";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
";

print "
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \\
      -e 's!\\(lib[a-zA-Z_]*\\)_\$(GLOBUS_FLAVOR_NAME)\\.la!\\1.la!g' \\
      -e 's!^\\(lib[a-zA-Z_]*\\)___GLOBUS_FLAVOR_NAME__la_!\\1_la_!' -i \$f
done
sed -e \"s!<With_Flavors!<With_Flavors ColocateLibraries=\\\"no\\\"!\" \\
  -i pkgdata/pkg_data_src.gpt.in
" if ($libs);

print "
%{_datadir}/globus/globus-bootstrap.sh
";

if ($docpkg) {
    print "
%configure --with-flavor=%{flavor} --enable-doxygen
";
}
else {
    print "
%configure --with-flavor=%{flavor}
";
}

print "
make %{?_smp_mflags}
";

print "
# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -
" if defined $setupfile;

print "
%install";

print "
%if \"%{rhel}\" == \"5\"
export PATH=\$PWD/bin:\$PATH
%endif
" if ($docpkg);

print "
rm -rf \$RPM_BUILD_ROOT
make install DESTDIR=\$RPM_BUILD_ROOT
";

print "
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=\$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
				     globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
\\\$metadata->finish();
EOF

# Create setup files

### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;

if (not defined $pkglibs) {
    print "
# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" -i \$lib
done
" if ($libs);
}
else {
    print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
sed '/lib.*\\.la\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}

print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
sed '/lib.*\\.a\$/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
" if ($libs);

print "
# Generate pkg-config file from GPT metadata
mkdir -p \$RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \\
  \$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
# Move documentation to default RPM location
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
  \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\\.3/d' \\
    -e '/_%{_name}-%{version}_.*\\.3/d' \\
  -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
" if ($docpkg);

print"
# Install license file
mkdir -p \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
";

if (!$libs) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package.filelist\n";
}

if ($progspkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
    print "    \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
    print "  | sed s!^!%{_prefix}! > package-progs.filelist\n";
}

if ($develpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
    print "  | sed s!^!%{_prefix}! > package-devel.filelist\n";
}

if ($docpkg) {
    print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
    print "  | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}

print "
%clean
rm -rf \$RPM_BUILD_ROOT
";

print "
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
" if ($libs);

print "
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
";

print "
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
" if ($progspkg);

print "%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
" if defined $setupfile;

print "
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
" if ($develpkg);

print "
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
" if ($docpkg);

print "
%changelog
* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"

__END__

=head1 NAME

B<globus-spec-creator> - Generate an RPM spec file from a GPT source
package description

=head1 SYNOPSIS

B<globus-spec-creator> [options] [patches ...]

Options:

=over

=item B<-gptfile> filename

The package's GPT source package description file (mandatory)

=item B<-setupfile> filename

The corresponding setup package's GPT source package description file
(default: none)

=item B<-release> releasenumber

The RPM release number (default: 1)

=item B<-directory> directory

The package's source directory in the toolkit installer

=item B<-toolkitversion> versionnumber

Globus toolkit version (default: 4.2.1)

=item B<-email> emailaddress

The packagers e-mail address (default: username at hostname)

=item B<-nodoc>

Disable the generation of the doc RPM

=item B<-help>

Show help

=back

Arguments:

Each additional argument will be added as a patch in the generated
specfile.

=head1 EXAMPLE

globus-spec-creator -g globus_common-10.2/pkgdata/pkg_data_src.gpt.in
-s globus_common_setup-2.6/pkgdata/pkg_data_src.gpt.in -r 3 -d
common/source

=head1 SEE ALSO

See http://fedoraproject.org/wiki/PackagingDrafts/Globus for
additional information and examples.

=head1 AUTHOR

Mattias Ellert E<lt>mattias.ellert at fysast.uu.seE<gt>

=cut


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-core.spec	21 Apr 2009 15:04:24 -0000	1.3
+++ globus-core.spec	27 Apr 2009 16:54:44 -0000	1.4
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@
 #		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
+Source2:	globus-spec-creator
 #		Make file locations configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
 Patch0:		%{name}-conf.patch
@@ -124,9 +125,25 @@
 # These scripts are intended to be sourced, not executed
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Add -Wl,--as-needed to the libtool script if supported
+%if %{?fedora}%{!?fedora:0} >= 2
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+%if %{?rhel}%{!?rhel:0} >= 4
+sed 's! -shared ! \\\${wl}--as-needed&!g' \
+  -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
+%endif
+
 # Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Install the Globus RPM specfile creator script
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
@@ -164,10 +181,16 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%{_bindir}/globus-spec-creator
+%doc %{_mandir}/man1/globus-spec-creator.1*
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
+- Install the globus-spec-creator script
+- Add -Wl,--as-needed to the libtool script
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
 - Update after clarification of packaging guidelines
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:04:24 -0000	1.3
+++ import.log	27 Apr 2009 16:54:44 -0000	1.4
@@ -1,3 +1,4 @@
 globus-core-5_15-1_fc9:EL-5:globus-core-5.15-1.fc9.src.rpm:1237534383
 globus-core-5_15-2_fc9:EL-5:globus-core-5.15-2.fc9.src.rpm:1240003791
 globus-core-5_15-3_fc9:EL-5:globus-core-5.15-3.fc9.src.rpm:1240326177
+globus-core-5_15-4_fc9:EL-5:globus-core-5.15-4.fc9.src.rpm:1240851250



From mclasen at fedoraproject.org  Mon Apr 27 16:57:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 16:57:39 +0000 (UTC)
Subject: rpms/GConf2/devel GConf2.spec,1.102,1.103
Message-ID: <20090427165739.3961670110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17110

Modified Files:
	GConf2.spec 
Log Message:
bump rev



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- GConf2.spec	27 Apr 2009 16:52:33 -0000	1.102
+++ GConf2.spec	27 Apr 2009 16:57:08 -0000	1.103
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.25/GConf-%{version}.tar.bz2



From th0br0 at fedoraproject.org  Mon Apr 27 16:59:09 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Mon, 27 Apr 2009 16:59:09 +0000 (UTC)
Subject: rpms/canto/F-10 canto.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427165909.4814B70110@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/canto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17499/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	canto.spec import.log 
Log Message:
Initial F-10 cvs import for canto 



--- NEW FILE canto.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		canto
Version:	0.6.9
Release:	2%{?dist}
Summary:	Atom/RSS feed reader based on ncurses
Group:		Applications/Internet
License:	GPLv2
URL:		http://codezen.org/canto/
Source0:	http://codezen.org/static/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel 
BuildRequires:	ncurses-devel
BuildRequires:	python-feedparser
BuildRequires:	python-chardet
BuildRequires:	python-setuptools-devel
Requires:	python-chardet

%description
Canto is an Atom/RSS feed reader for the console that is meant to be quick,
concise, and colorful. It's meant to allow you to crank through feeds like
you've never cranked before by providing a minimal, yet information packed
interface. No navigating menus. No dense blocks of unreadable white text.
An interface with almost infinite customization and extensibility using
the excellent Python programming language.

%prep
%setup -q -n %{name}-%{version}

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
sed -i -e '/#\!/d' %{buildroot}/%{python_sitearch}/%{name}/canto_html.py

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}*
%attr(0644,root,root) %{python_sitearch}/%{name}/widecurse.so
%{python_sitearch}/*.egg-info
%{python_sitearch}/%{name}/*

%changelog
* Fri Apr 17 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-2
- Changed python_sitelib to python_sitearch due to problems on 64bit archs.

* Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.9-1
- Updated to 0.6.9

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.8-2
- Changed License
- rpmlint fixes
- Added BuildRequires: python-setuptools-devel
- Added Requires: python-chardet

* Fri Mar 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.8-1
- Initial package build


--- NEW FILE import.log ---
canto-0_6_9-2_fc10:F-10:canto-0.6.9-2.fc10.src.rpm:1240851462


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2009 16:46:28 -0000	1.1
+++ .cvsignore	27 Apr 2009 16:58:38 -0000	1.2
@@ -0,0 +1 @@
+canto-0.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canto/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2009 16:46:28 -0000	1.1
+++ sources	27 Apr 2009 16:58:39 -0000	1.2
@@ -0,0 +1 @@
+b81a552f8577e3401f32487802807323  canto-0.6.9.tar.gz



From oget at fedoraproject.org  Mon Apr 27 17:00:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 17:00:30 +0000 (UTC)
Subject: rpms/minicomputer/devel import.log, NONE, 1.1 minicomputer.desktop, 
	NONE, 1.1 minicomputer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427170030.CB19D70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/minicomputer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17915/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log minicomputer.desktop minicomputer.spec 
Log Message:
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build




--- NEW FILE import.log ---
minicomputer-1_3-3_fc10:HEAD:minicomputer-1.3-3.fc10.src.rpm:1240851578


--- NEW FILE minicomputer.desktop ---
[Desktop Entry]
Name=Minicomputer
GenericName=Software Synthesizer
Comment=Software Synthesizer
Icon=minicomputer
Type=Application
Exec=minicomputer
Terminal=false
Categories=AudioVideo;Audio;Midi;X-Jack;


--- NEW FILE minicomputer.spec ---
Name:		minicomputer
Version:	1.3
Release:	3%{?dist}
Summary:	Software Synthesizer
Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://minicomputer.sourceforge.net/
Source0:	http://downloads.sourceforge.net/minicomputer/MinicomputerV%{version}.tar.gz
Source1:	%{name}.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	alsa-lib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	fltk-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	liblo-devel
BuildRequires:	scons

Requires:	hicolor-icon-theme

%description
Minicomputer is a standalone Linux softwaresynthesizer for creating 
experimental electronic sounds as its often used in but not limited to
Industrial music, IDM, EBM, Glitch, sound design and minimal electronic. It is
monophonic but can produce up to 8 different sounds at the same time. It uses
Jack as realtime audio infrastructure and can be controlled via Midi.

%prep
%setup -q -n MinicomputerV%{version}

# Fix optflags
# SSE instruction set, which provides improved functionality, is only available in these archs:
%ifnarch %{ix86} x86_64 ia64
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct
%else
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split(),'-msse','-mfpmath=sse' ])|" SConstruct
%endif
sed -i "s|\(^guienv.Append(CPPFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct

%build
scons %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm 755 %{name}{,CPU} %{buildroot}%{_bindir}/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install				\
--dir=%{buildroot}%{_datadir}/applications	\
%{SOURCE1}

mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -pm 644 %{name}.xpm \
	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README doc/*
%{_bindir}/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm

%changelog
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:19:11 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:00:00 -0000	1.2
@@ -0,0 +1 @@
+MinicomputerV1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:19:11 -0000	1.1
+++ sources	27 Apr 2009 17:00:00 -0000	1.2
@@ -0,0 +1 @@
+15d59368abae7c35cefc90c5fac3fda7  MinicomputerV1.3.tar.gz



From oget at fedoraproject.org  Mon Apr 27 17:02:03 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 17:02:03 +0000 (UTC)
Subject: rpms/minicomputer/F-11 import.log, NONE, 1.1 minicomputer.desktop, 
	NONE, 1.1 minicomputer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427170203.E276070110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/minicomputer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18321/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log minicomputer.desktop minicomputer.spec 
Log Message:
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build




--- NEW FILE import.log ---
minicomputer-1_3-3_fc10:F-11:minicomputer-1.3-3.fc10.src.rpm:1240851670


--- NEW FILE minicomputer.desktop ---
[Desktop Entry]
Name=Minicomputer
GenericName=Software Synthesizer
Comment=Software Synthesizer
Icon=minicomputer
Type=Application
Exec=minicomputer
Terminal=false
Categories=AudioVideo;Audio;Midi;X-Jack;


--- NEW FILE minicomputer.spec ---
Name:		minicomputer
Version:	1.3
Release:	3%{?dist}
Summary:	Software Synthesizer
Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://minicomputer.sourceforge.net/
Source0:	http://downloads.sourceforge.net/minicomputer/MinicomputerV%{version}.tar.gz
Source1:	%{name}.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	alsa-lib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	fltk-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	liblo-devel
BuildRequires:	scons

Requires:	hicolor-icon-theme

%description
Minicomputer is a standalone Linux softwaresynthesizer for creating 
experimental electronic sounds as its often used in but not limited to
Industrial music, IDM, EBM, Glitch, sound design and minimal electronic. It is
monophonic but can produce up to 8 different sounds at the same time. It uses
Jack as realtime audio infrastructure and can be controlled via Midi.

%prep
%setup -q -n MinicomputerV%{version}

# Fix optflags
# SSE instruction set, which provides improved functionality, is only available in these archs:
%ifnarch %{ix86} x86_64 ia64
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct
%else
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split(),'-msse','-mfpmath=sse' ])|" SConstruct
%endif
sed -i "s|\(^guienv.Append(CPPFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct

%build
scons %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm 755 %{name}{,CPU} %{buildroot}%{_bindir}/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install				\
--dir=%{buildroot}%{_datadir}/applications	\
%{SOURCE1}

mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -pm 644 %{name}.xpm \
	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README doc/*
%{_bindir}/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm

%changelog
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:19:11 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:01:33 -0000	1.2
@@ -0,0 +1 @@
+MinicomputerV1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:19:11 -0000	1.1
+++ sources	27 Apr 2009 17:01:33 -0000	1.2
@@ -0,0 +1 @@
+15d59368abae7c35cefc90c5fac3fda7  MinicomputerV1.3.tar.gz



From nbecker at fedoraproject.org  Mon Apr 27 17:02:59 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon, 27 Apr 2009 17:02:59 +0000 (UTC)
Subject: rpms/igraph/devel .cvsignore, 1.6, 1.7 igraph.spec, 1.27,
	1.28 sources, 1.7, 1.8
Message-ID: <20090427170259.522AF70110@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18601

Modified Files:
	.cvsignore igraph.spec sources 
Log Message:
Update to 0.5.2 (again)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Apr 2009 15:46:41 -0000	1.6
+++ .cvsignore	27 Apr 2009 17:02:29 -0000	1.7
@@ -1 +1 @@
-igraph_0.5.2.tar.gz
+igraph-0.5.2.tar.gz


Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/igraph.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- igraph.spec	27 Apr 2009 16:05:25 -0000	1.27
+++ igraph.spec	27 Apr 2009 17:02:29 -0000	1.28
@@ -6,7 +6,7 @@
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://cneurocvs.rmki.kfki.hu/igraph
-Source0:	http://igraph.googlecode.com/files/%{name}_%{version}.tar.gz
+Source0:	http://igraph.googlecode.com/files/%{name}-%{version}.tar.gz
 #Patch1:		igraph-cstdlib.patch
 #Patch2:		igraph-test.patch
 # Needed for gcc-4.4
@@ -38,7 +38,7 @@
 documentation needed to develop application with %{name}.
 
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
 #%patch1 -p1
 #%patch2 -p1
 #%patch3 -p1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2009 15:46:41 -0000	1.7
+++ sources	27 Apr 2009 17:02:29 -0000	1.8
@@ -1 +1 @@
-75ccd63731e4e1ef258ad65631783439  igraph_0.5.2.tar.gz
+092fcd018d35da599e250990e9b64e6f  igraph-0.5.2.tar.gz



From oget at fedoraproject.org  Mon Apr 27 17:03:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 17:03:23 +0000 (UTC)
Subject: rpms/minicomputer/F-10 import.log, NONE, 1.1 minicomputer.desktop, 
	NONE, 1.1 minicomputer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427170323.A144570110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/minicomputer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18809/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log minicomputer.desktop minicomputer.spec 
Log Message:
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build




--- NEW FILE import.log ---
minicomputer-1_3-3_fc10:F-10:minicomputer-1.3-3.fc10.src.rpm:1240851754


--- NEW FILE minicomputer.desktop ---
[Desktop Entry]
Name=Minicomputer
GenericName=Software Synthesizer
Comment=Software Synthesizer
Icon=minicomputer
Type=Application
Exec=minicomputer
Terminal=false
Categories=AudioVideo;Audio;Midi;X-Jack;


--- NEW FILE minicomputer.spec ---
Name:		minicomputer
Version:	1.3
Release:	3%{?dist}
Summary:	Software Synthesizer
Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://minicomputer.sourceforge.net/
Source0:	http://downloads.sourceforge.net/minicomputer/MinicomputerV%{version}.tar.gz
Source1:	%{name}.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	alsa-lib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	fltk-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	liblo-devel
BuildRequires:	scons

Requires:	hicolor-icon-theme

%description
Minicomputer is a standalone Linux softwaresynthesizer for creating 
experimental electronic sounds as its often used in but not limited to
Industrial music, IDM, EBM, Glitch, sound design and minimal electronic. It is
monophonic but can produce up to 8 different sounds at the same time. It uses
Jack as realtime audio infrastructure and can be controlled via Midi.

%prep
%setup -q -n MinicomputerV%{version}

# Fix optflags
# SSE instruction set, which provides improved functionality, is only available in these archs:
%ifnarch %{ix86} x86_64 ia64
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct
%else
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split(),'-msse','-mfpmath=sse' ])|" SConstruct
%endif
sed -i "s|\(^guienv.Append(CPPFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct

%build
scons %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm 755 %{name}{,CPU} %{buildroot}%{_bindir}/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install				\
--dir=%{buildroot}%{_datadir}/applications	\
%{SOURCE1}

mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -pm 644 %{name}.xpm \
	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README doc/*
%{_bindir}/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm

%changelog
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:19:11 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:02:53 -0000	1.2
@@ -0,0 +1 @@
+MinicomputerV1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:19:11 -0000	1.1
+++ sources	27 Apr 2009 17:02:53 -0000	1.2
@@ -0,0 +1 @@
+15d59368abae7c35cefc90c5fac3fda7  MinicomputerV1.3.tar.gz



From oget at fedoraproject.org  Mon Apr 27 17:04:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 17:04:49 +0000 (UTC)
Subject: rpms/minicomputer/F-9 import.log, NONE, 1.1 minicomputer.desktop,
	NONE, 
	1.1 minicomputer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090427170449.B682070110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/minicomputer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19283/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log minicomputer.desktop minicomputer.spec 
Log Message:
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build




--- NEW FILE import.log ---
minicomputer-1_3-3_fc10:F-9:minicomputer-1.3-3.fc10.src.rpm:1240851838


--- NEW FILE minicomputer.desktop ---
[Desktop Entry]
Name=Minicomputer
GenericName=Software Synthesizer
Comment=Software Synthesizer
Icon=minicomputer
Type=Application
Exec=minicomputer
Terminal=false
Categories=AudioVideo;Audio;Midi;X-Jack;


--- NEW FILE minicomputer.spec ---
Name:		minicomputer
Version:	1.3
Release:	3%{?dist}
Summary:	Software Synthesizer
Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://minicomputer.sourceforge.net/
Source0:	http://downloads.sourceforge.net/minicomputer/MinicomputerV%{version}.tar.gz
Source1:	%{name}.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	alsa-lib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	fltk-devel
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	liblo-devel
BuildRequires:	scons

Requires:	hicolor-icon-theme

%description
Minicomputer is a standalone Linux softwaresynthesizer for creating 
experimental electronic sounds as its often used in but not limited to
Industrial music, IDM, EBM, Glitch, sound design and minimal electronic. It is
monophonic but can produce up to 8 different sounds at the same time. It uses
Jack as realtime audio infrastructure and can be controlled via Midi.

%prep
%setup -q -n MinicomputerV%{version}

# Fix optflags
# SSE instruction set, which provides improved functionality, is only available in these archs:
%ifnarch %{ix86} x86_64 ia64
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct
%else
sed -i "s|\(^env.Append(CCFLAGS =\).*|\1 ['%{optflags}'.split(),'-msse','-mfpmath=sse' ])|" SConstruct
%endif
sed -i "s|\(^guienv.Append(CPPFLAGS =\).*|\1 ['%{optflags}'.split() ])|" SConstruct

%build
scons %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm 755 %{name}{,CPU} %{buildroot}%{_bindir}/

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install				\
--dir=%{buildroot}%{_datadir}/applications	\
%{SOURCE1}

mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -pm 644 %{name}.xpm \
	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README doc/*
%{_bindir}/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm

%changelog
* Sat Apr 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-3
- Cleanup the compiler flags

* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-2
- Disable SSE on unsupported architectures

* Tue Mar 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:19:11 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:04:19 -0000	1.2
@@ -0,0 +1 @@
+MinicomputerV1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:19:11 -0000	1.1
+++ sources	27 Apr 2009 17:04:19 -0000	1.2
@@ -0,0 +1 @@
+15d59368abae7c35cefc90c5fac3fda7  MinicomputerV1.3.tar.gz



From mclasen at fedoraproject.org  Mon Apr 27 17:11:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 17:11:01 +0000 (UTC)
Subject: rpms/intltool/devel schemas-merge.patch, NONE, 1.1 intltool.spec,
	1.54, 1.55
Message-ID: <20090427171102.05BC870110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/intltool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19900

Modified Files:
	intltool.spec 
Added Files:
	schemas-merge.patch 
Log Message:
Don't merge translations back into GConf schemas


schemas-merge.patch:

--- NEW FILE schemas-merge.patch ---
diff -up intltool-0.40.6/intltool-merge.in.schemas intltool-0.40.6/intltool-merge.in
--- intltool-0.40.6/intltool-merge.in.schemas	2009-02-14 17:12:28.000000000 -0500
+++ intltool-0.40.6/intltool-merge.in	2009-04-27 01:41:11.099450891 -0400
@@ -38,8 +38,9 @@ my $PACKAGE = "@PACKAGE@";
 my $VERSION = "@VERSION@";
 
 ## Loaded modules
-use strict; 
+use strict;
 use Getopt::Long;
+use Cwd;
 use Text::Wrap;
 use File::Basename;
 use Encode;
@@ -68,6 +69,9 @@ my $PASS_THROUGH_ARG = 0;
 my $UTF8_ARG = 0;
 my $MULTIPLE_OUTPUT = 0;
 my $cache_file;
+my $GETTEXT_PACKAGE = "";
+my %varhash = ();
+my $SRCDIR = $ENV{"srcdir"} || ".";
 
 ## Handle options
 GetOptions 
@@ -87,7 +91,8 @@ GetOptions 
  "pass-through|p" => \$PASS_THROUGH_ARG,
  "utf8|u" => \$UTF8_ARG,
  "multiple-output|m" => \$MULTIPLE_OUTPUT,
- "cache|c=s" => \$cache_file
+ "cache|c=s" => \$cache_file,
+ "gettext-package|g=s" => \$GETTEXT_PACKAGE
  ) or &error;
 
 my $PO_DIR;
@@ -103,6 +108,8 @@ my $w = "[-A-Za-z0-9._:]";
 # XML quoted string contents
 my $q = "[^\\\"]*";
 
+my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown";
+
 ## Check for options. 
 
 if ($VERSION_ARG) 
@@ -216,6 +223,8 @@ Other options:
 	                 a single file containing all localized elements
   -c, --cache=FILE       specify cache file name
                          (usually \$top_builddir/po/.intltool-merge-cache)
+  -g, --gettext-package=NAME
+                         specify gettext domain, needed for --schemas-style
   -q, --quiet            suppress most messages
       --help             display this help and exit
       --version          output version information and exit
@@ -241,6 +250,25 @@ sub print_message 
 }
 
 
+sub FindPackageName
+{
+    my $name = "";
+
+    my $conf_source; {
+        local (*IN);
+        open (IN, "<Makefile") || return $name;
+        seek (IN, 0, 0);
+        local $/; # slurp mode
+        $conf_source = <IN>;
+        close IN;
+    }
+
+    $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE = \[?([^\n\]]+)/m;
+
+    return $name if $name;
+}
+
+
 sub preparation 
 {
     $PO_DIR = $ARGV[0];
@@ -1246,50 +1274,41 @@ sub schemas_merge_translations
 	my $short_string = $9 ? $9 : '';
 	my $long_string = $12 ? $12 : '';
 
-	print OUTPUT "$locale_start_spaces$c_default_block";
-
         $default_string =~ s/\s+/ /g;
-        $default_string = entity_decode($default_string);
 	$short_string =~ s/\s+/ /g;
-	$short_string = entity_decode($short_string);
 	$long_string =~ s/\s+/ /g;
-	$long_string = entity_decode($long_string);
 
-	for my $lang (sort keys %po_files_by_lang) 
-        {
-	    my $default_translation = $translations{$lang, $default_string};
-	    my $short_translation = $translations{$lang, $short_string};
-	    my $long_translation  = $translations{$lang, $long_string};
-
-	    next if (!$default_translation && !$short_translation && 
-                     !$long_translation);
-
-	    print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
+	print OUTPUT "$locale_start_spaces<gettext_domain>$MODULE</gettext_domain>";
 
+	print OUTPUT "$locale_start_spaces<locale name=\"C\">";
         print OUTPUT "$default_spaces";    
-
-        if ($default_translation)
-        {
-            $default_translation = entity_encode($default_translation);
-            print OUTPUT "<default>$default_translation</default>";
+        if ($default_string) {
+            print OUTPUT "<default>$default_string</default>";
         }
+        print OUTPUT "$short_spaces";    
+        if ($short_string) {
+            print OUTPUT "<short>$short_string</short>";
+        }
+        print OUTPUT "$long_spaces";    
+        if ($long_string) {
+            print OUTPUT "<long>$long_string</long>";
+        }
+	print OUTPUT "$locale_end_spaces</locale>";
 
-	    print OUTPUT "$short_spaces";
+        $default_string = entity_decode($default_string);
+	$short_string = entity_decode($short_string);
+	$long_string = entity_decode($long_string);
 
-	    if ($short_translation)
-	    {
-			$short_translation = entity_encode($short_translation);
-			print OUTPUT "<short>$short_translation</short>";
-	    }
+	for my $lang (sort keys %po_files_by_lang)
+        {
+	    my $default_translation = $translations{$lang, $default_string};
 
-	    print OUTPUT "$long_spaces";
+            next if (!$default_translation || ($default_translation eq $default_string));
 
-	    if ($long_translation)
-	    {
-			$long_translation = entity_encode($long_translation);
-			print OUTPUT "<long>$long_translation</long>";
-	    }	    
+            $default_translation = entity_encode($default_translation);
 
+	    print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
+            print OUTPUT "$default_spaces<default>$default_translation</default>";
 	    print OUTPUT "$locale_end_spaces</locale>";
         }
     }
diff -up intltool-0.40.6/tests/results/test.schemas intltool-0.40.6/tests/results/test


Index: intltool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- intltool.spec	16 Mar 2009 04:07:00 -0000	1.54
+++ intltool.spec	27 Apr 2009 17:10:31 -0000	1.55
@@ -4,7 +4,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
 Version: 0.40.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
 Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2
@@ -20,6 +20,8 @@
 Requires: perl(XML::Parser)
 BuildRequires: perl(XML::Parser)
 BuildRequires: gettext
+# http://bugzilla.gnome.org/show_bug.cgi?id=568845
+Patch0: schemas-merge.patch
 
 %description
 This tool automatically extracts translatable strings from oaf, glade,
@@ -28,11 +30,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .schemas-merge
 
 %build
 %configure
 
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +54,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 0.40.6-2
+- Don't merge translations back into GConf schemas
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 0.40.6-1
 - Update to 0.40.6
 



From nbecker at fedoraproject.org  Mon Apr 27 17:14:52 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon, 27 Apr 2009 17:14:52 +0000 (UTC)
Subject: rpms/python-igraph/devel .cvsignore, 1.4, 1.5 python-igraph.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <20090427171452.100B570110@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/python-igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20461

Modified Files:
	.cvsignore python-igraph.spec sources 
Log Message:
Update to 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Nov 2008 15:25:30 -0000	1.4
+++ .cvsignore	27 Apr 2009 17:14:21 -0000	1.5
@@ -1 +1 @@
-python-igraph-0.5.1.tar.gz
+python-igraph-0.5.2.tar.gz


Index: python-igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/devel/python-igraph.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-igraph.spec	26 Feb 2009 21:43:54 -0000	1.11
+++ python-igraph.spec	27 Apr 2009 17:14:21 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_archlib: %define python_archlib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-igraph
-Version:	0.5.1
-Release:	4%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Python bindings for igraph
 
 Group:		Development/Languages
@@ -31,7 +31,7 @@
 %setup -q
 #%patch0 -p1
 #%patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 %patch3 -p0
 #%patch4 -p0
 
@@ -55,6 +55,10 @@
 %{_bindir}/igraph
 
 %changelog
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
+- Update to 0.5.2
+- Try building without patch2
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2008 15:25:30 -0000	1.4
+++ sources	27 Apr 2009 17:14:21 -0000	1.5
@@ -1 +1 @@
-9cc4364d656db67add07dd474c8b0f11  python-igraph-0.5.1.tar.gz
+8e80ddff5a7a3b7c25e293d4daaee6c0  python-igraph-0.5.2.tar.gz



From spot at fedoraproject.org  Mon Apr 27 17:27:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:27:49 +0000 (UTC)
Subject: rpms/logjam/F-10 logjam-4.5.3-keep-drafts.patch, NONE,
	1.1 logjam-4.5.3-lj-embed.patch, NONE,
	1.1 logjam-4.5.3-mpris.diff, NONE,
	1.1 logjam-4.5.3-save-tags.diff, NONE, 1.1 logjam.spec, 1.48, 1.49
Message-ID: <20090427172749.2FEFB70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648/F-10

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-keep-drafts.patch logjam-4.5.3-lj-embed.patch 
	logjam-4.5.3-mpris.diff logjam-4.5.3-save-tags.diff 
Log Message:
update logjam with new features, bugfixes

logjam-4.5.3-keep-drafts.patch:

--- NEW FILE logjam-4.5.3-keep-drafts.patch ---
diff -up logjam-4.5.3/src/conf.h.keep_drafts logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2009-04-02 13:08:45.000000000 -0400
@@ -62,6 +62,7 @@ typedef struct {
 	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
+	gboolean keepsaveddrafts;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/conf_xml.c.keep_drafts logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2009-04-02 13:08:15.000000000 -0400
@@ -181,6 +181,7 @@ parseoptions(Configuration *c, xmlDocPtr
 #endif
 		READOPTION(revertusejournal)
 		READOPTION(autosave)
+		READOPTION(keepsaveddrafts)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(close_when_send)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 #endif
 	WRITEOPTION(revertusejournal);
 	WRITEOPTION(autosave);
+	WRITEOPTION(keepsaveddrafts);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(close_when_send);
diff -up logjam-4.5.3/src/jam.c.keep_drafts logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2009-04-02 13:06:49.000000000 -0400
@@ -340,7 +340,7 @@ jam_submit_entry(JamWin *jw) {
 	ctx = net_ctx_gtk_new(GTK_WINDOW(jw), NULL);
 	if (jam_host_do_post(jam_account_get_host(acc), ctx, jw->doc, NULL)) {
 		gint type = jam_doc_get_entry_type(jw->doc);
-		if (type == ENTRY_DRAFT) {
+		if (type == ENTRY_DRAFT && !conf.options.keepsaveddrafts) {
 			if (jam_confirm(GTK_WINDOW(jw),
 					_("Delete"), _("Delete this draft from disk?")))
 				delete_draft(jw);
diff -up logjam-4.5.3/src/settings.c.keep_drafts logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2009-04-02 13:06:49.000000000 -0400
@@ -74,6 +74,10 @@ static SettingsWidget settingswidgets[] 
 
 	{ "ui_allowmultipleinstances", &conf.options.allowmultipleinstances,
 		SW_TOGGLE, N_("Allow multiple _instances of LogJam to run simultaneously") },
+	
+	{ "ui_keepsaveddrafts", &conf.options.keepsaveddrafts, 
+		SW_TOGGLE, N_("_Keep saved drafts after posting") },
+	
 #ifdef HAVE_GTKSPELL
 	{ "ui_spellcheck", &conf.options.usespellcheck, 
 		SW_TOGGLE, N_("_Use spell check") },
@@ -409,6 +413,8 @@ uisettings(JamWin *jw) {
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_autosave"), FALSE);
+	
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_keepsaveddrafts"), FALSE);
 
 #ifdef HAVE_GTKSPELL
 	{

logjam-4.5.3-lj-embed.patch:

--- NEW FILE logjam-4.5.3-lj-embed.patch ---
diff -up logjam-4.5.3/src/menu.c.lj-embed logjam-4.5.3/src/menu.c
--- logjam-4.5.3/src/menu.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/menu.c	2009-04-27 11:21:06.000000000 -0400
@@ -274,6 +274,12 @@ static void
 menu_ljcut(JamWin *jw) {
 	tools_ljcut(GTK_WINDOW(jw), jw->doc);
 }
+
+static void
+menu_embedded_media(JamWin *jw) {
+	tools_embedded_media(GTK_WINDOW(jw), jw->doc);
+}
+
 static void
 menu_validate_xml(JamWin *jw) {
 	tools_validate_xml(GTK_WINDOW(jw), jw->doc);
@@ -415,6 +421,7 @@ static GtkItemFactoryEntry menu_items[] 
 { N_("/Insert/_Image..."),        NULL,          menu_insert_image },
 { N_("/Insert/_Journal Link..."), "<ctl><alt>L", menu_make_journal_link },
 { N_("/Insert/lj-_cut..."),       "<ctl><alt>X", menu_ljcut, 0, NULL },
+{ N_("/Insert/_Embedded Media..."), "<ctl><alt>E", menu_embedded_media },
 
 { N_("/_View"),                   NULL, NULL, ACTION_VIEW, "<Branch>" },
 { N_("/View/_Security"),          NULL, menu_view_cb, ACTION_VIEW_SECURITY,     "<CheckItem>" },
diff -up logjam-4.5.3/src/tools.c.lj-embed logjam-4.5.3/src/tools.c
--- logjam-4.5.3/src/tools.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/tools.c	2009-04-27 12:24:39.000000000 -0400
@@ -322,6 +322,65 @@ tools_validate_xml(GtkWindow *win, JamDo
 	g_free(str);
 }
 
+/* FIXME: These two functions are practically identical. Abstract them to minimize code duplication. */
+
+void
+tools_embedded_media(GtkWindow *win, JamDoc *doc) {
+	GtkTextBuffer *buffer, *new_buffer;
+	GtkWidget *dlg, *vbox, *hbox, *label, *entry;
+	gchar *text;
+	GtkTextIter start;
+	GtkTextIter end;
+
+	dlg = gtk_dialog_new_with_buttons(_("Embedded Media"), win,
+			GTK_DIALOG_MODAL,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OK,     GTK_RESPONSE_OK,
+			NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
+	gtk_window_set_default_size (GTK_WINDOW (dlg), 450, 140);
+
+	vbox = gtk_vbox_new(FALSE, 2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+
+	entry = gtk_text_view_new();
+	gtk_text_view_set_wrap_mode(entry, TRUE);
+	//gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+	hbox = labelled_box_new(_("E_mbedded code:"), entry);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label),
+			_("<small>This is where you paste the embedded code, e.g. for a YouTube video.</small>"));
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	jam_dialog_set_contents(GTK_DIALOG(dlg), vbox);
+
+	if (gtk_dialog_run(GTK_DIALOG(dlg)) != GTK_RESPONSE_OK) {
+		gtk_widget_destroy(dlg);
+		return;
+	}
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+	gtk_text_buffer_get_start_iter (buffer, &start);
+	gtk_text_buffer_get_end_iter (buffer, &end);
+	text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+	gtk_widget_destroy(dlg);
+	if (text[0] == 0) {
+		g_free(text);
+		text = NULL;
+	}
+	//xml_escape(&text);
+	new_buffer = jam_doc_get_text_buffer(doc);
+	
+	gtk_text_buffer_begin_user_action(new_buffer); /* start undo action */
+	gtk_text_buffer_insert_at_cursor(new_buffer, "<lj-embed>", -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, text, -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, "</lj-embed>", -1);
+	g_free(text);
+
+	gtk_text_buffer_end_user_action(new_buffer);
+}
+
 void
 tools_ljcut(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
diff -up logjam-4.5.3/src/tools.h.lj-embed logjam-4.5.3/src/tools.h
--- logjam-4.5.3/src/tools.h.lj-embed	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/src/tools.h	2009-04-27 11:21:06.000000000 -0400
@@ -16,5 +16,6 @@ void tools_insert_command_output
                             (GtkWindow *win, JamDoc *doc);
 void tools_validate_xml     (GtkWindow *win, JamDoc *doc);
 void tools_ljcut            (GtkWindow *win, JamDoc *doc);
+void tools_embedded_media   (GtkWindow *win, JamDoc *doc);
 
 #endif /* tools_h */

logjam-4.5.3-mpris.diff:

--- NEW FILE logjam-4.5.3-mpris.diff ---
diff -up logjam-4.5.3/configure.in.dbus logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/configure.in	2009-04-23 00:38:34.000000000 +0300
@@ -220,6 +220,13 @@ AC_SUBST(LIVEJOURNAL_CFLAGS)
 AC_SUBST(LIVEJOURNAL_LIBS)
 dnl end liblivejournal dependencies.
 
+dnl D-Bus API
+MODULES="dbus-1 dbus-glib-1"
+PKG_CHECK_MODULES(DBUSAPI, $MODULES)
+AC_SUBST(DBUSAPI_CFLAGS)
+AC_SUBST(DBUSAPI_LIBS)
+dnl D-Bus API
+
 AM_CONDITIONAL(WITH_XMMS, test "$with_xmms" = "yes")
 AM_CONDITIONAL(WITH_HTML, test "$with_gtkhtml" != "no")
 AM_CONDITIONAL(WITH_RSVG, test "$with_librsvg" = "yes")
diff -up logjam-4.5.3/src/conf.h.dbus logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2009-04-23 22:10:14.000000000 +0300
@@ -92,6 +92,7 @@ typedef struct {
 	char *spawn_command;
 
 	char *music_command;
+	gboolean music_mpris;
 
 	char *proxy;
 	char *proxyuser, *proxypass;
diff -up logjam-4.5.3/src/conf_xml.c.dbus logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.dbus	2009-04-23 22:19:10.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2009-04-24 15:40:45.000000000 +0300
@@ -257,6 +257,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node
 		XML_GET_CONF("proxyauth", parseproxyauth)
 		XML_GET_STR("spawncommand", c->spawn_command)
 		XML_GET_STR("musiccommand", c->music_command)
+		XML_GET_BOOL("musicmpris", c->music_mpris)
 #endif /* G_OS_WIN32 */
 		XML_GET_INT("cfuserinterval", c->cfuserinterval)
 		XML_GET_INT("cfthreshold", c->cfthreshold)
@@ -396,6 +397,8 @@ conf_write(Configuration *c, char *base)
 
 	if (c->music_command)
 		xmlAddTN(root, "musiccommand", c->music_command);
+	if (c->music_mpris)
+		xmlNewChild(root, NULL, BAD_CAST "musicmpris", NULL);
 #endif
 
 	if (c->cfuserinterval) {
diff -up logjam-4.5.3/src/init.c.dbus logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/init.c	2009-04-25 11:56:05.000000000 +0300
@@ -29,6 +29,7 @@
 #include "conf_xml.h"
 #include "jamdoc.h"
 #include "cmdline.h"
+#include "lj_dbus.h"
 
 #ifdef HAVE_GTK
 #include "login.h"
@@ -120,6 +121,9 @@ init_app(int *argc, gchar *argv[]) {
 }
 
 #ifdef HAVE_GTK
+
+extern JamDBus *jdbus;
+
 static void
 run_gtk(JamDoc *doc) {
 	gchar *accelpath;
@@ -148,8 +152,20 @@ run_gtk(JamDoc *doc) {
 		jam_doc_set_account(doc, acc);
 	}
 
+	jdbus = lj_dbus_new();
+	if (conf.music_mpris) {
+		GError *error = NULL;
+		if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+			g_printerr("Error: %s\n", error->message);
+			g_error_free(error);
+		}
+	}
+
 	jam_run(doc);
 
+	lj_dbus_close(jdbus);
+	jdbus = NULL;
+
 	g_object_unref(G_OBJECT(app.remote));
 
 	gtk_accel_map_save(accelpath);
diff -up logjam-4.5.3/src/jamview.c.dbus logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.dbus	2009-04-25 13:39:45.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-25 14:27:56.000000000 +0300
@@ -20,6 +20,7 @@
 #include "marshalers.h"
 #include "datesel.h"
 #include "tags.h"
+#include "lj_dbus.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -356,7 +357,12 @@ picture_store(JamView *view) {
 static void
 music_refresh_cb(JamView *view) {
 	GError *err = NULL;
-	gchar *music = music_detect(&err);
+	gchar *music;
+
+	if (conf.music_mpris)
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	else
+		music = music_detect(&err);
 
 	if (music) {
 		gtk_entry_set_text(GTK_ENTRY(view->music), music);
@@ -373,7 +379,7 @@ static void
 music_add(JamView *view) {
 	view->music = gtk_entry_new();
 	view->musicbar = labelled_box_new_sg(_("_Music:"), view->music, view->sizegroup);
-	if (music_can_detect(NULL)) {
+	if (conf.music_mpris || music_can_detect(NULL)) {
 		GtkWidget *refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 		g_signal_connect_swapped(G_OBJECT(refresh), "clicked",
 				G_CALLBACK(music_refresh_cb), view);
diff -up logjam-4.5.3/src/lj_dbus.c.dbus logjam-4.5.3/src/lj_dbus.c
--- logjam-4.5.3/src/lj_dbus.c.dbus	2009-04-25 13:40:31.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.c	2009-04-25 14:21:30.000000000 +0300
@@ -0,0 +1,244 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ *
+ * See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification
+ */
+
+#include <string.h>		/* memset */
+
+#include "lj_dbus.h"
+
+#define MPRIS_IF	"org.freedesktop.MediaPlayer"
+
+/* Internal prototypes */
+static gboolean lj_dbus_open(JamDBus *jd);
+static gboolean lj_dbus_append_player(JamDBus *jd, gchar *dest);
+static void lj_dbus_players_clear(JamDBus *jd);
+static gboolean lj_dbus_players_find(JamDBus *jd, GError **error);
+
+/* Implementation */
+static gboolean
+lj_dbus_open(JamDBus *jd) {
+	GError *error = NULL;
+
+	jd->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (jd->bus == NULL) {
+		g_printerr("Failed to open connection to bus: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+    }
+	return TRUE;
+}
+
+void lj_dbus_close(JamDBus *jd) {
+	if (jd == NULL)
+		return;
+	lj_dbus_players_clear(jd);
+	dbus_g_connection_unref(jd->bus);
+}
+
+JamDBus *
+lj_dbus_new(void) {
+	JamDBus *jd = (JamDBus *) g_malloc0(sizeof(JamDBus));
+
+	if (lj_dbus_open(jd) == FALSE) {
+		g_free(jd);
+		return NULL;
+	}
+	return jd;
+}
+
+static gboolean
+lj_dbus_append_player(JamDBus *jd, gchar *dest) {
+	MediaPlayer *player;
+	DBusGProxy *proxy;
+	GError *error = NULL;
+	gchar *name;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/", MPRIS_IF);
+
+	if (!dbus_g_proxy_call(proxy, "Identity", &error, G_TYPE_INVALID,
+						   G_TYPE_STRING, &name, G_TYPE_INVALID)) {
+		g_printerr("Error: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	player = (MediaPlayer *) g_malloc0(sizeof(MediaPlayer));
+	player->dest = g_strdup(dest);
+	player->name = g_strdup(name);
+	player->proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/Player", MPRIS_IF);
+
+	if (g_str_has_suffix(dest, "audacious"))
+		player->hint |= MPRIS_HINT_BAD_STATUS;
+
+	jd->player = g_list_append(jd->player, (gpointer) player);
+
+	g_free(name);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+static void
+lj_dbus_players_clear(JamDBus *jd) {
+	GList *list;
+
+	if (jd->player == NULL)
+		return;
+
+	for (list = g_list_first(jd->player); list; list = g_list_next(list)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		g_object_unref(player->proxy);
+		if (player->name)
+			g_free(player->name);
+		if (player->dest)
+			g_free(player->dest);
+	}
+	g_list_free(jd->player);
+	jd->player = NULL;
+}
+
+static gboolean
+lj_dbus_players_find(JamDBus *jd, GError **error) {
+	DBusGProxy *proxy;
+	gchar **names, **p;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+	if (!dbus_g_proxy_call(proxy, "ListNames", error, G_TYPE_INVALID,
+						   G_TYPE_STRV, &names, G_TYPE_INVALID)) {
+		return FALSE;
+	}
+
+	for (p = names; *p; p++) {
+		if (g_str_has_prefix(*p, "org.mpris.")) {
+			lj_dbus_append_player(jd, *p);
+		}
+	}
+
+	g_strfreev(names);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+gboolean
+lj_dbus_mpris_update_list(JamDBus *jd, GError **error) {
+	if (jd == NULL)
+		return FALSE;
+	lj_dbus_players_clear(jd);
+	return lj_dbus_players_find(jd, error);
+}
+
+#define DBUS_TYPE_MPRIS_STATUS \
+	(dbus_g_type_get_struct("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE \
+	(dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+
+/* TODO: Connect to status change signal */
+
+gboolean
+lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error) {
+	GValueArray *array = NULL;
+	GHashTable *info = NULL;
+	GValue *value;
+	MediaPlayer *player;
+
+	if (jd == NULL)
+		return FALSE;
+
+	if (list == NULL)
+		return FALSE;
+
+	if ((player = (MediaPlayer *) list->data) == NULL)
+		return FALSE;
+
+	memset((void *) &player->info, 0, sizeof(MetaInfo));
+
+	if (player->hint & MPRIS_HINT_BAD_STATUS) {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   G_TYPE_INT, &player->info.status, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+	} else {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   DBUS_TYPE_MPRIS_STATUS, &array, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+
+		value = g_value_array_get_nth(array, 0);
+		player->info.status = g_value_get_int(value);
+		g_value_array_free(array);
+	}
+
+	if (player->info.status == MPRIS_STATUS_PLAYING) {
+		if (!dbus_g_proxy_call(player->proxy, "GetMetadata", error, G_TYPE_INVALID,
+							   DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &info, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+		value = (GValue *) g_hash_table_lookup(info, "artist");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.artist, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "album");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.album, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "title");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.title, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+	}
+
+	return TRUE;
+}
+
+GQuark
+lj_dbus_error_quark(void) {
+	static GQuark quark = 0;
+	if (quark == 0)
+		quark = g_quark_from_static_string("dbus-error-quark");
+	return quark;
+}
+
+/* TODO: User defined format */
+
+gchar *
+lj_dbus_mpris_current_music(JamDBus *jd, GError **error) {
+	gchar *music;
+	GList *list;
+
+	if (!lj_dbus_mpris_update_list(jd, error))
+		return NULL;
+
+	list = jd ? jd->player : NULL;
+
+	if (lj_dbus_mpris_update_info(jd, list, error)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		if (player->info.status == MPRIS_STATUS_PLAYING) {
+			music = g_strdup_printf("%s - %s - %s",
+						player->info.artist[0] ? player->info.artist : _("Unknown Artist"),
+						player->info.album[0] ? player->info.album: _("Unknown Album"),
+						player->info.title[0] ? player->info.title: _("Unknown Track"));
+			return music;
+		} else {
+			g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NOT_PLAYING,
+				_("Player is stopped."));
+		}
+	} else if (error == NULL || *error == NULL) {
+		g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NO_PLAYER,
+			_("No players found."));
+	}
+	return NULL;
+}
+
+/* lj_dbus.c */
+
diff -up logjam-4.5.3/src/lj_dbus.h.dbus logjam-4.5.3/src/lj_dbus.h
--- logjam-4.5.3/src/lj_dbus.h.dbus	2009-04-25 13:40:36.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.h	2009-04-25 14:25:27.000000000 +0300
@@ -0,0 +1,68 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef lj_dbus_h
+#define lj_dbus_h
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+/* Take care about i18n strings */
+#ifndef _
+#ifdef GETTEXT_PACKAGE
+#include <glib/gi18n-lib.h>
+#else
+#define _(x)	x
+#endif
+#endif		/* _ */
+
+#define MPRIS_INFO_LEN	128
+
+typedef struct _MetaInfo MetaInfo;
+struct _MetaInfo {
+	gchar artist[MPRIS_INFO_LEN];
+	gchar album[MPRIS_INFO_LEN];
+	gchar title[MPRIS_INFO_LEN];
+
+#define	MPRIS_STATUS_PLAYING	0
+#define	MPRIS_STATUS_PAUSED		1
+#define	MPRIS_STATUS_STOPPED	2
+
+	gint status;
+};
+
+typedef struct _MediaPlayer MediaPlayer;
+struct _MediaPlayer {
+	gchar *name;
+	gchar *dest;
+	DBusGProxy *proxy;
+	MetaInfo info;
+
+#define MPRIS_HINT_BAD_STATUS	1 << 0
+
+	gint hint;
+};
+
+typedef struct _JamDBus JamDBus;
+struct _JamDBus {
+	DBusGConnection *bus;
+	GList *player;
+};
+
+void lj_dbus_close(JamDBus *jd);
+JamDBus *lj_dbus_new(void);
+
+gboolean lj_dbus_mpris_update_list(JamDBus *jd, GError **error);
+gboolean lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error);
+
+#define MPRIS_ERROR_NOT_PLAYING		1
+#define MPRIS_ERROR_NO_PLAYER		2
+
+gchar *lj_dbus_mpris_current_music(JamDBus *jd, GError **error);
+
+#endif /* lj_dbus_h */
+
diff -up logjam-4.5.3/src/Makefile.am.dbus logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.dbus	2009-04-23 00:44:11.000000000 +0300
+++ logjam-4.5.3/src/Makefile.am	2009-04-24 15:59:08.000000000 +0300
@@ -3,7 +3,7 @@ bin_PROGRAMS = logjam
 localedir=$(datadir)/locale
 
 # AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/protocol/blogger -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@ @DBUSAPI_CFLAGS@
 
 ACCOUNT = account.h account.c host.c livejournal.c
 # blogger.c
@@ -50,6 +50,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           settings.c settings.h $(GROUPEDBOX) tie.c tie.h \
           $(HISTORY) $(OFFLINE) \
           jam.c jam.h $(USEJOURNAL) \
+          lj_dbus.c lj_dbus.h \
           security.c security.h about.c thanks.h \
           menu.c menu.h $(TOOLS) smartquotes.c smartquotes.h \
           $(LOGIN) manager.c \
@@ -116,7 +117,7 @@ logjam_SOURCES += journalstore-xml.c
 endif
 
 # logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la $(top_builddir)/protocol/blogger/libblogger.la @LOGJAM_LIBS@ @NETWORK_LIBS@
-logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@
+logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@ @DBUSAPI_LIBS@
 
 ctags:
 	@version=`ctags --version | head -1`; \
diff -up logjam-4.5.3/src/music.c.dbus logjam-4.5.3/src/music.c
--- logjam-4.5.3/src/music.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/music.c	2009-04-25 01:11:29.000000000 +0300
@@ -9,8 +9,11 @@
 #include "gtk-all.h"
 
 #include "conf.h"
+#include "lj_dbus.h"
 #include "music.h"
 
+JamDBus *jdbus = NULL;
+
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
diff -up logjam-4.5.3/src/music.h.dbus logjam-4.5.3/src/music.h
--- logjam-4.5.3/src/music.h.dbus	2005-02-21 20:30:27.000000000 +0200
+++ logjam-4.5.3/src/music.h	2009-04-25 01:05:55.000000000 +0300
@@ -8,6 +8,9 @@
 #define music_h
 
 #include "conf.h" /* CommandList */
+#include "lj_dbus.h"
+
+extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
diff -up logjam-4.5.3/src/settings.c.dbus logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.dbus	2009-04-25 13:41:03.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2009-04-25 15:19:42.000000000 +0300
@@ -24,6 +24,7 @@
 #include "tie.h"
 #include "account.h"
 #include "jamview.h"
+#include "lj_dbus.h"
 
 /* what's this?  all of these funny structures in the settings box?
  * well, instead of creating and tearing down all of these widgets, i
@@ -101,6 +102,8 @@ static SettingsWidget settingswidgets[] 
 
 	{ "music_command", &conf.music_command,
 		SW_COMMAND, N_("Detect music from:"), (gpointer)music_commands },
+	{ "music_mpris", &conf.music_mpris,
+		SW_TOGGLE, N_("Detect music via MPRIS") },
 
 	{ "net_useproxy", &conf.options.useproxy, 
 		SW_TOGGLE, N_("Use _proxy server") },
@@ -169,6 +172,19 @@ toggle_tie_enable(GtkWidget *toggle, Gtk
 }
 
 static void
+toggle_disable_cb(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+}
+static void
+toggle_tie_disable(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+	g_signal_connect(G_OBJECT(toggle), "toggled",
+			G_CALLBACK(toggle_disable_cb), target);
+}
+
+static void
 toggle_tie(SettingsWidget *sw) {
 	tie_toggle(GTK_TOGGLE_BUTTON(sw->widget), (gboolean*)sw->conf);
 }
@@ -499,16 +515,21 @@ static void
 music_diagnose(GtkWidget *button) {
 	GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(button));
 	GError *err = NULL;
-	char *music, *result;
-	MusicSource source = music_current_source();
+	char *music = NULL, *result;
+	MusicSource source = MUSIC_SOURCE_NONE;
 
-	if (!music_can_detect(&err)) {
-		jam_warning(dlg, "%s", err->message);
-		g_error_free(err);
-		return;
+	if (conf.music_mpris) {
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	} else {
+		source = music_current_source();
+		if (!music_can_detect(&err)) {
+			jam_warning(dlg, "%s", err->message);
+			g_error_free(err);
+			return;
+		}
+		music = music_detect(&err);
 	}
 
-	music = music_detect(&err);
 	if (!music) {
 		if (source == MUSIC_SOURCE_XMMS &&
 				err->domain == G_SPAWN_ERROR && err->code == G_SPAWN_ERROR_NOENT) {
@@ -555,21 +576,40 @@ proxysettings(void) {
 	return group;
 }
 
+static void
+mpris_update_cb(GtkToggleButton *button, JamDBus *jd) {
+	GError *error = NULL;
+	if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+		GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+		jam_warning(dlg, _("Error detecting music: %s"), error->message);
+		g_error_free(error);
+	}
+}
+
 static GtkWidget*
 programsettings(JamWin *jw) {
 	GtkWidget *group;
-	GtkWidget *button, *hbox;
+	GtkWidget *button, *vbox, *hbox;
 	SettingsWidget *sw;
 	JamView *jv = jam_win_get_cur_view(jw);
 	
 	group = groupedbox_new_with_text(_("Programs"));
 	groupedbox_pack(GROUPEDBOX(group), sw_make("web_spawn"), FALSE);
 
-	groupedbox_pack(GROUPEDBOX(group), sw_make("music_command"), FALSE);
+	vbox = sw_make("music_command");
+	groupedbox_pack(GROUPEDBOX(group), vbox, FALSE);
 	sw = sw_lookup("music_command");
 	g_signal_connect_swapped(G_OBJECT(sw->widget), "changed",
 			G_CALLBACK(jam_view_settings_changed), jv);
 
+	button = sw_make("music_mpris");
+	groupedbox_pack(GROUPEDBOX(group), button, FALSE);
+	g_signal_connect(G_OBJECT(button), "toggled",
+			G_CALLBACK(mpris_update_cb), jdbus);
+	toggle_tie_disable(button, vbox);
+	g_signal_connect_swapped(G_OBJECT(button), "toggled",
+			G_CALLBACK(jam_view_settings_changed), jv);
+
 	button = gtk_button_new_with_mnemonic(_("_Diagnose"));
 	g_signal_connect(G_OBJECT(button), "clicked",
 			G_CALLBACK(music_diagnose), NULL);

logjam-4.5.3-save-tags.diff:

--- NEW FILE logjam-4.5.3-save-tags.diff ---
diff -up logjam-4.5.3/src/jamview.c.save logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.save	2009-04-26 10:26:39.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-26 10:28:00.000000000 +0300
@@ -418,7 +424,8 @@ tags_select_cb(JamView *view) {
 
   tags = tags_dialog(toplevel,
 		     JAM_ACCOUNT_LJ(view->account), 
-		     jam_doc_get_usejournal(view->doc));
+		     jam_doc_get_usejournal(view->doc),
+		     (gchar *) gtk_entry_get_text(GTK_ENTRY(view->tags)));
 
   if (tags) {
       gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
diff -up logjam-4.5.3/src/tags.c.save logjam-4.5.3/src/tags.c
--- logjam-4.5.3/src/tags.c.save	2009-04-26 10:05:38.000000000 +0300
+++ logjam-4.5.3/src/tags.c	2009-04-26 15:15:13.000000000 +0300
@@ -78,8 +78,23 @@ create_tag_string (GtkTreeModel *model,
   return FALSE;
 }
 
+static void
+tags_set_fg(GtkTreeViewColumn *column, GtkCellRenderer *cell,
+	    GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+  GSList *prev = (GSList *) data;
+  gchar *text;
+
+  gtk_tree_model_get(model, iter, 1, &text, -1);
+  if (prev && g_slist_find_custom(prev, text, g_utf8_collate))
+    g_object_set(G_OBJECT(cell), "foreground", "Red", NULL);
+  else
+    g_object_set(G_OBJECT(cell), "foreground", "Black", NULL);
+  g_free(text);
+}
+
 GtkWidget* 
-taglist_create (GSList *l)
+taglist_create (GSList *l, GSList **head)
 {
   GtkWidget *treeview;
   GtkListStore *store;
@@ -87,20 +102,37 @@ taglist_create (GSList *l)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   guint i;
+  GSList *prev = *head, *p;
 
   /* create model */
   store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
   for (i = 0; i < g_slist_length (l); i++)
     {
       LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+      gboolean check = FALSE;
 
+      if (prev && (p = g_slist_find_custom(prev, t->tag, g_utf8_collate)) != NULL) {
+        check = TRUE;
+        prev = g_slist_remove_link(prev, p);
+        g_free(p->data);
+        g_slist_free1(p);
+      }
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  0, FALSE,
+			  0, check,
 			  1, t->tag,
 			  -1);
     }
 
+  /* rest of the typed tags */
+  for (p = prev; p; p = g_slist_next(p)) {
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter,
+      		  0, TRUE,
+      		  1, p->data,
+      		  -1);
+  }
+
   /* create treeview */
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
@@ -120,20 +152,44 @@ taglist_create (GSList *l)
   column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
 						     renderer, "text", 1,
 						     NULL);
+
+  gtk_tree_view_column_set_cell_data_func(column, renderer, tags_set_fg,
+					  prev, NULL);
+
   gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (treeview, column);
  
+  /* update head of the prev list */
+  *head = prev;
   g_object_unref (store);
 
   return treeview;
 }
 
+static GSList *
+tags_split(gchar *typed) {
+  GSList *head = NULL;
+  gchar **result, **p;
+
+  if (typed == NULL || *typed == '\0')
+    return NULL;
+
+  for (p = result = g_strsplit(typed, ",", 0); *p; p++) {
+    gchar *token = g_strstrip(*p);
+    if (*token)
+      head = g_slist_prepend(head, g_utf8_strdown(token, -1));
+  }
+  g_strfreev(result);
+  return head;
+}
+
 gchar* 
-tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed)
 {
   GtkWidget *dlg, *sw, *tv;
   GSList *list = NULL;
   gchar *taglist = NULL;
+  GSList *prev;
 
   if (acc == NULL) return NULL;
 
@@ -156,7 +212,8 @@ tags_dialog (GtkWidget *win, JamAccountL
 				  GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
 
-  tv = taglist_create (list);
+  prev = tags_split(typed);
+  tv = taglist_create (list, &prev);
   gtk_container_add (GTK_CONTAINER (sw), tv);
 
   gtk_window_resize(dlg, 60, 210);
@@ -177,5 +234,14 @@ tags_dialog (GtkWidget *win, JamAccountL
 
   gtk_widget_destroy (dlg);
   
+  /* free rest of prev list */
+  if (prev) {
+    GSList *p;
+    for (p = prev; p; p = g_slist_next(p)) {
+      g_free(p->data);
+    }
+    g_slist_free(prev);
+  }
+
   return taglist;
 }
diff -up logjam-4.5.3/src/tags.h.save logjam-4.5.3/src/tags.h
--- logjam-4.5.3/src/tags.h.save	2009-04-26 10:22:25.000000000 +0300
+++ logjam-4.5.3/src/tags.h	2009-04-26 10:22:03.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef _TAGS_H_
 #define _TAGS_H_
 
-gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed);
 
 #endif /* _TAGS_H_ */


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- logjam.spec	28 Jul 2008 18:45:42 -0000	1.48
+++ logjam.spec	27 Apr 2009 17:27:18 -0000	1.49
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	25%{?dist}
+Release:	29%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -16,7 +16,8 @@
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
-BuildRequires:	autoconf, automake, libtool, intltool, popt-devel
+BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	dbus-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch2:		logjam-4.4.1-backdated.patch
@@ -39,6 +40,11 @@
 Patch19:	logjam-4.5.3-close_when_send.patch
 Patch20:	logjam-4.5.3-imageresize.patch
 Patch21:	logjam-4.5.3-showloginhistory.patch
+Patch22:	logjam-4.5.3-libtool.patch
+Patch23:	logjam-4.5.3-keep-drafts.patch
+Patch24:	logjam-4.5.3-lj-embed.patch
+Patch25:	logjam-4.5.3-mpris.diff
+Patch26:	logjam-4.5.3-save-tags.diff
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -77,6 +83,16 @@
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
+%patch22 -p1 -b .libtool
+%patch23 -p1 -b .keep_drafts
+%patch24 -p1 -b .lj-embed
+%patch25 -p1 -b .mpris
+%patch26 -p1 -b .save-tags
+
+libtoolize
+rm -rf aclocal.m4
+autoupdate
+intltoolize --force
 
 %build
 touch NEWS README AUTHORS
@@ -121,6 +137,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
+- add support for lj-embed tags
+- add support for MPRIS music detection (Andy Shevchenko)
+- improve tag handling (Andy Shevchenko)
+
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-28
+- add patch to enable "keep drafts" functionality
+  see: http://community.livejournal.com/logjam_dev/37274.html
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-26
+- libtoolize to support newer libtool
+- intltoolize so we get translations
+
 * Mon Jul 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-25
 - fix docked behavior again (bz 447146)
 - fix config option to start in dock again (bz 445998)



From spot at fedoraproject.org  Mon Apr 27 17:27:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:27:49 +0000 (UTC)
Subject: rpms/logjam/F-11 logjam-4.5.3-keep-drafts.patch, NONE,
	1.1 logjam-4.5.3-lj-embed.patch, NONE,
	1.1 logjam-4.5.3-mpris.diff, NONE,
	1.1 logjam-4.5.3-save-tags.diff, NONE, 1.1 logjam.spec, 1.50, 1.51
Message-ID: <20090427172749.5419E70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648/F-11

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-keep-drafts.patch logjam-4.5.3-lj-embed.patch 
	logjam-4.5.3-mpris.diff logjam-4.5.3-save-tags.diff 
Log Message:
update logjam with new features, bugfixes

logjam-4.5.3-keep-drafts.patch:

--- NEW FILE logjam-4.5.3-keep-drafts.patch ---
diff -up logjam-4.5.3/src/conf.h.keep_drafts logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2009-04-02 13:08:45.000000000 -0400
@@ -62,6 +62,7 @@ typedef struct {
 	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
+	gboolean keepsaveddrafts;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/conf_xml.c.keep_drafts logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2009-04-02 13:08:15.000000000 -0400
@@ -181,6 +181,7 @@ parseoptions(Configuration *c, xmlDocPtr
 #endif
 		READOPTION(revertusejournal)
 		READOPTION(autosave)
+		READOPTION(keepsaveddrafts)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(close_when_send)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 #endif
 	WRITEOPTION(revertusejournal);
 	WRITEOPTION(autosave);
+	WRITEOPTION(keepsaveddrafts);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(close_when_send);
diff -up logjam-4.5.3/src/jam.c.keep_drafts logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2009-04-02 13:06:49.000000000 -0400
@@ -340,7 +340,7 @@ jam_submit_entry(JamWin *jw) {
 	ctx = net_ctx_gtk_new(GTK_WINDOW(jw), NULL);
 	if (jam_host_do_post(jam_account_get_host(acc), ctx, jw->doc, NULL)) {
 		gint type = jam_doc_get_entry_type(jw->doc);
-		if (type == ENTRY_DRAFT) {
+		if (type == ENTRY_DRAFT && !conf.options.keepsaveddrafts) {
 			if (jam_confirm(GTK_WINDOW(jw),
 					_("Delete"), _("Delete this draft from disk?")))
 				delete_draft(jw);
diff -up logjam-4.5.3/src/settings.c.keep_drafts logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2009-04-02 13:06:49.000000000 -0400
@@ -74,6 +74,10 @@ static SettingsWidget settingswidgets[] 
 
 	{ "ui_allowmultipleinstances", &conf.options.allowmultipleinstances,
 		SW_TOGGLE, N_("Allow multiple _instances of LogJam to run simultaneously") },
+	
+	{ "ui_keepsaveddrafts", &conf.options.keepsaveddrafts, 
+		SW_TOGGLE, N_("_Keep saved drafts after posting") },
+	
 #ifdef HAVE_GTKSPELL
 	{ "ui_spellcheck", &conf.options.usespellcheck, 
 		SW_TOGGLE, N_("_Use spell check") },
@@ -409,6 +413,8 @@ uisettings(JamWin *jw) {
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_autosave"), FALSE);
+	
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_keepsaveddrafts"), FALSE);
 
 #ifdef HAVE_GTKSPELL
 	{

logjam-4.5.3-lj-embed.patch:

--- NEW FILE logjam-4.5.3-lj-embed.patch ---
diff -up logjam-4.5.3/src/menu.c.lj-embed logjam-4.5.3/src/menu.c
--- logjam-4.5.3/src/menu.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/menu.c	2009-04-27 11:21:06.000000000 -0400
@@ -274,6 +274,12 @@ static void
 menu_ljcut(JamWin *jw) {
 	tools_ljcut(GTK_WINDOW(jw), jw->doc);
 }
+
+static void
+menu_embedded_media(JamWin *jw) {
+	tools_embedded_media(GTK_WINDOW(jw), jw->doc);
+}
+
 static void
 menu_validate_xml(JamWin *jw) {
 	tools_validate_xml(GTK_WINDOW(jw), jw->doc);
@@ -415,6 +421,7 @@ static GtkItemFactoryEntry menu_items[] 
 { N_("/Insert/_Image..."),        NULL,          menu_insert_image },
 { N_("/Insert/_Journal Link..."), "<ctl><alt>L", menu_make_journal_link },
 { N_("/Insert/lj-_cut..."),       "<ctl><alt>X", menu_ljcut, 0, NULL },
+{ N_("/Insert/_Embedded Media..."), "<ctl><alt>E", menu_embedded_media },
 
 { N_("/_View"),                   NULL, NULL, ACTION_VIEW, "<Branch>" },
 { N_("/View/_Security"),          NULL, menu_view_cb, ACTION_VIEW_SECURITY,     "<CheckItem>" },
diff -up logjam-4.5.3/src/tools.c.lj-embed logjam-4.5.3/src/tools.c
--- logjam-4.5.3/src/tools.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/tools.c	2009-04-27 12:24:39.000000000 -0400
@@ -322,6 +322,65 @@ tools_validate_xml(GtkWindow *win, JamDo
 	g_free(str);
 }
 
+/* FIXME: These two functions are practically identical. Abstract them to minimize code duplication. */
+
+void
+tools_embedded_media(GtkWindow *win, JamDoc *doc) {
+	GtkTextBuffer *buffer, *new_buffer;
+	GtkWidget *dlg, *vbox, *hbox, *label, *entry;
+	gchar *text;
+	GtkTextIter start;
+	GtkTextIter end;
+
+	dlg = gtk_dialog_new_with_buttons(_("Embedded Media"), win,
+			GTK_DIALOG_MODAL,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OK,     GTK_RESPONSE_OK,
+			NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
+	gtk_window_set_default_size (GTK_WINDOW (dlg), 450, 140);
+
+	vbox = gtk_vbox_new(FALSE, 2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+
+	entry = gtk_text_view_new();
+	gtk_text_view_set_wrap_mode(entry, TRUE);
+	//gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+	hbox = labelled_box_new(_("E_mbedded code:"), entry);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label),
+			_("<small>This is where you paste the embedded code, e.g. for a YouTube video.</small>"));
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	jam_dialog_set_contents(GTK_DIALOG(dlg), vbox);
+
+	if (gtk_dialog_run(GTK_DIALOG(dlg)) != GTK_RESPONSE_OK) {
+		gtk_widget_destroy(dlg);
+		return;
+	}
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+	gtk_text_buffer_get_start_iter (buffer, &start);
+	gtk_text_buffer_get_end_iter (buffer, &end);
+	text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+	gtk_widget_destroy(dlg);
+	if (text[0] == 0) {
+		g_free(text);
+		text = NULL;
+	}
+	//xml_escape(&text);
+	new_buffer = jam_doc_get_text_buffer(doc);
+	
+	gtk_text_buffer_begin_user_action(new_buffer); /* start undo action */
+	gtk_text_buffer_insert_at_cursor(new_buffer, "<lj-embed>", -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, text, -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, "</lj-embed>", -1);
+	g_free(text);
+
+	gtk_text_buffer_end_user_action(new_buffer);
+}
+
 void
 tools_ljcut(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
diff -up logjam-4.5.3/src/tools.h.lj-embed logjam-4.5.3/src/tools.h
--- logjam-4.5.3/src/tools.h.lj-embed	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/src/tools.h	2009-04-27 11:21:06.000000000 -0400
@@ -16,5 +16,6 @@ void tools_insert_command_output
                             (GtkWindow *win, JamDoc *doc);
 void tools_validate_xml     (GtkWindow *win, JamDoc *doc);
 void tools_ljcut            (GtkWindow *win, JamDoc *doc);
+void tools_embedded_media   (GtkWindow *win, JamDoc *doc);
 
 #endif /* tools_h */

logjam-4.5.3-mpris.diff:

--- NEW FILE logjam-4.5.3-mpris.diff ---
diff -up logjam-4.5.3/configure.in.dbus logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/configure.in	2009-04-23 00:38:34.000000000 +0300
@@ -220,6 +220,13 @@ AC_SUBST(LIVEJOURNAL_CFLAGS)
 AC_SUBST(LIVEJOURNAL_LIBS)
 dnl end liblivejournal dependencies.
 
+dnl D-Bus API
+MODULES="dbus-1 dbus-glib-1"
+PKG_CHECK_MODULES(DBUSAPI, $MODULES)
+AC_SUBST(DBUSAPI_CFLAGS)
+AC_SUBST(DBUSAPI_LIBS)
+dnl D-Bus API
+
 AM_CONDITIONAL(WITH_XMMS, test "$with_xmms" = "yes")
 AM_CONDITIONAL(WITH_HTML, test "$with_gtkhtml" != "no")
 AM_CONDITIONAL(WITH_RSVG, test "$with_librsvg" = "yes")
diff -up logjam-4.5.3/src/conf.h.dbus logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2009-04-23 22:10:14.000000000 +0300
@@ -92,6 +92,7 @@ typedef struct {
 	char *spawn_command;
 
 	char *music_command;
+	gboolean music_mpris;
 
 	char *proxy;
 	char *proxyuser, *proxypass;
diff -up logjam-4.5.3/src/conf_xml.c.dbus logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.dbus	2009-04-23 22:19:10.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2009-04-24 15:40:45.000000000 +0300
@@ -257,6 +257,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node
 		XML_GET_CONF("proxyauth", parseproxyauth)
 		XML_GET_STR("spawncommand", c->spawn_command)
 		XML_GET_STR("musiccommand", c->music_command)
+		XML_GET_BOOL("musicmpris", c->music_mpris)
 #endif /* G_OS_WIN32 */
 		XML_GET_INT("cfuserinterval", c->cfuserinterval)
 		XML_GET_INT("cfthreshold", c->cfthreshold)
@@ -396,6 +397,8 @@ conf_write(Configuration *c, char *base)
 
 	if (c->music_command)
 		xmlAddTN(root, "musiccommand", c->music_command);
+	if (c->music_mpris)
+		xmlNewChild(root, NULL, BAD_CAST "musicmpris", NULL);
 #endif
 
 	if (c->cfuserinterval) {
diff -up logjam-4.5.3/src/init.c.dbus logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/init.c	2009-04-25 11:56:05.000000000 +0300
@@ -29,6 +29,7 @@
 #include "conf_xml.h"
 #include "jamdoc.h"
 #include "cmdline.h"
+#include "lj_dbus.h"
 
 #ifdef HAVE_GTK
 #include "login.h"
@@ -120,6 +121,9 @@ init_app(int *argc, gchar *argv[]) {
 }
 
 #ifdef HAVE_GTK
+
+extern JamDBus *jdbus;
+
 static void
 run_gtk(JamDoc *doc) {
 	gchar *accelpath;
@@ -148,8 +152,20 @@ run_gtk(JamDoc *doc) {
 		jam_doc_set_account(doc, acc);
 	}
 
+	jdbus = lj_dbus_new();
+	if (conf.music_mpris) {
+		GError *error = NULL;
+		if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+			g_printerr("Error: %s\n", error->message);
+			g_error_free(error);
+		}
+	}
+
 	jam_run(doc);
 
+	lj_dbus_close(jdbus);
+	jdbus = NULL;
+
 	g_object_unref(G_OBJECT(app.remote));
 
 	gtk_accel_map_save(accelpath);
diff -up logjam-4.5.3/src/jamview.c.dbus logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.dbus	2009-04-25 13:39:45.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-25 14:27:56.000000000 +0300
@@ -20,6 +20,7 @@
 #include "marshalers.h"
 #include "datesel.h"
 #include "tags.h"
+#include "lj_dbus.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -356,7 +357,12 @@ picture_store(JamView *view) {
 static void
 music_refresh_cb(JamView *view) {
 	GError *err = NULL;
-	gchar *music = music_detect(&err);
+	gchar *music;
+
+	if (conf.music_mpris)
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	else
+		music = music_detect(&err);
 
 	if (music) {
 		gtk_entry_set_text(GTK_ENTRY(view->music), music);
@@ -373,7 +379,7 @@ static void
 music_add(JamView *view) {
 	view->music = gtk_entry_new();
 	view->musicbar = labelled_box_new_sg(_("_Music:"), view->music, view->sizegroup);
-	if (music_can_detect(NULL)) {
+	if (conf.music_mpris || music_can_detect(NULL)) {
 		GtkWidget *refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 		g_signal_connect_swapped(G_OBJECT(refresh), "clicked",
 				G_CALLBACK(music_refresh_cb), view);
diff -up logjam-4.5.3/src/lj_dbus.c.dbus logjam-4.5.3/src/lj_dbus.c
--- logjam-4.5.3/src/lj_dbus.c.dbus	2009-04-25 13:40:31.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.c	2009-04-25 14:21:30.000000000 +0300
@@ -0,0 +1,244 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ *
+ * See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification
+ */
+
+#include <string.h>		/* memset */
+
+#include "lj_dbus.h"
+
+#define MPRIS_IF	"org.freedesktop.MediaPlayer"
+
+/* Internal prototypes */
+static gboolean lj_dbus_open(JamDBus *jd);
+static gboolean lj_dbus_append_player(JamDBus *jd, gchar *dest);
+static void lj_dbus_players_clear(JamDBus *jd);
+static gboolean lj_dbus_players_find(JamDBus *jd, GError **error);
+
+/* Implementation */
+static gboolean
+lj_dbus_open(JamDBus *jd) {
+	GError *error = NULL;
+
+	jd->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (jd->bus == NULL) {
+		g_printerr("Failed to open connection to bus: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+    }
+	return TRUE;
+}
+
+void lj_dbus_close(JamDBus *jd) {
+	if (jd == NULL)
+		return;
+	lj_dbus_players_clear(jd);
+	dbus_g_connection_unref(jd->bus);
+}
+
+JamDBus *
+lj_dbus_new(void) {
+	JamDBus *jd = (JamDBus *) g_malloc0(sizeof(JamDBus));
+
+	if (lj_dbus_open(jd) == FALSE) {
+		g_free(jd);
+		return NULL;
+	}
+	return jd;
+}
+
+static gboolean
+lj_dbus_append_player(JamDBus *jd, gchar *dest) {
+	MediaPlayer *player;
+	DBusGProxy *proxy;
+	GError *error = NULL;
+	gchar *name;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/", MPRIS_IF);
+
+	if (!dbus_g_proxy_call(proxy, "Identity", &error, G_TYPE_INVALID,
+						   G_TYPE_STRING, &name, G_TYPE_INVALID)) {
+		g_printerr("Error: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	player = (MediaPlayer *) g_malloc0(sizeof(MediaPlayer));
+	player->dest = g_strdup(dest);
+	player->name = g_strdup(name);
+	player->proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/Player", MPRIS_IF);
+
+	if (g_str_has_suffix(dest, "audacious"))
+		player->hint |= MPRIS_HINT_BAD_STATUS;
+
+	jd->player = g_list_append(jd->player, (gpointer) player);
+
+	g_free(name);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+static void
+lj_dbus_players_clear(JamDBus *jd) {
+	GList *list;
+
+	if (jd->player == NULL)
+		return;
+
+	for (list = g_list_first(jd->player); list; list = g_list_next(list)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		g_object_unref(player->proxy);
+		if (player->name)
+			g_free(player->name);
+		if (player->dest)
+			g_free(player->dest);
+	}
+	g_list_free(jd->player);
+	jd->player = NULL;
+}
+
+static gboolean
+lj_dbus_players_find(JamDBus *jd, GError **error) {
+	DBusGProxy *proxy;
+	gchar **names, **p;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+	if (!dbus_g_proxy_call(proxy, "ListNames", error, G_TYPE_INVALID,
+						   G_TYPE_STRV, &names, G_TYPE_INVALID)) {
+		return FALSE;
+	}
+
+	for (p = names; *p; p++) {
+		if (g_str_has_prefix(*p, "org.mpris.")) {
+			lj_dbus_append_player(jd, *p);
+		}
+	}
+
+	g_strfreev(names);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+gboolean
+lj_dbus_mpris_update_list(JamDBus *jd, GError **error) {
+	if (jd == NULL)
+		return FALSE;
+	lj_dbus_players_clear(jd);
+	return lj_dbus_players_find(jd, error);
+}
+
+#define DBUS_TYPE_MPRIS_STATUS \
+	(dbus_g_type_get_struct("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE \
+	(dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+
+/* TODO: Connect to status change signal */
+
+gboolean
+lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error) {
+	GValueArray *array = NULL;
+	GHashTable *info = NULL;
+	GValue *value;
+	MediaPlayer *player;
+
+	if (jd == NULL)
+		return FALSE;
+
+	if (list == NULL)
+		return FALSE;
+
+	if ((player = (MediaPlayer *) list->data) == NULL)
+		return FALSE;
+
+	memset((void *) &player->info, 0, sizeof(MetaInfo));
+
+	if (player->hint & MPRIS_HINT_BAD_STATUS) {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   G_TYPE_INT, &player->info.status, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+	} else {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   DBUS_TYPE_MPRIS_STATUS, &array, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+
+		value = g_value_array_get_nth(array, 0);
+		player->info.status = g_value_get_int(value);
+		g_value_array_free(array);
+	}
+
+	if (player->info.status == MPRIS_STATUS_PLAYING) {
+		if (!dbus_g_proxy_call(player->proxy, "GetMetadata", error, G_TYPE_INVALID,
+							   DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &info, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+		value = (GValue *) g_hash_table_lookup(info, "artist");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.artist, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "album");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.album, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "title");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.title, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+	}
+
+	return TRUE;
+}
+
+GQuark
+lj_dbus_error_quark(void) {
+	static GQuark quark = 0;
+	if (quark == 0)
+		quark = g_quark_from_static_string("dbus-error-quark");
+	return quark;
+}
+
+/* TODO: User defined format */
+
+gchar *
+lj_dbus_mpris_current_music(JamDBus *jd, GError **error) {
+	gchar *music;
+	GList *list;
+
+	if (!lj_dbus_mpris_update_list(jd, error))
+		return NULL;
+
+	list = jd ? jd->player : NULL;
+
+	if (lj_dbus_mpris_update_info(jd, list, error)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		if (player->info.status == MPRIS_STATUS_PLAYING) {
+			music = g_strdup_printf("%s - %s - %s",
+						player->info.artist[0] ? player->info.artist : _("Unknown Artist"),
+						player->info.album[0] ? player->info.album: _("Unknown Album"),
+						player->info.title[0] ? player->info.title: _("Unknown Track"));
+			return music;
+		} else {
+			g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NOT_PLAYING,
+				_("Player is stopped."));
+		}
+	} else if (error == NULL || *error == NULL) {
+		g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NO_PLAYER,
+			_("No players found."));
+	}
+	return NULL;
+}
+
+/* lj_dbus.c */
+
diff -up logjam-4.5.3/src/lj_dbus.h.dbus logjam-4.5.3/src/lj_dbus.h
--- logjam-4.5.3/src/lj_dbus.h.dbus	2009-04-25 13:40:36.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.h	2009-04-25 14:25:27.000000000 +0300
@@ -0,0 +1,68 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef lj_dbus_h
+#define lj_dbus_h
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+/* Take care about i18n strings */
+#ifndef _
+#ifdef GETTEXT_PACKAGE
+#include <glib/gi18n-lib.h>
+#else
+#define _(x)	x
+#endif
+#endif		/* _ */
+
+#define MPRIS_INFO_LEN	128
+
+typedef struct _MetaInfo MetaInfo;
+struct _MetaInfo {
+	gchar artist[MPRIS_INFO_LEN];
+	gchar album[MPRIS_INFO_LEN];
+	gchar title[MPRIS_INFO_LEN];
+
+#define	MPRIS_STATUS_PLAYING	0
+#define	MPRIS_STATUS_PAUSED		1
+#define	MPRIS_STATUS_STOPPED	2
+
+	gint status;
+};
+
+typedef struct _MediaPlayer MediaPlayer;
+struct _MediaPlayer {
+	gchar *name;
+	gchar *dest;
+	DBusGProxy *proxy;
+	MetaInfo info;
+
+#define MPRIS_HINT_BAD_STATUS	1 << 0
+
+	gint hint;
+};
+
+typedef struct _JamDBus JamDBus;
+struct _JamDBus {
+	DBusGConnection *bus;
+	GList *player;
+};
+
+void lj_dbus_close(JamDBus *jd);
+JamDBus *lj_dbus_new(void);
+
+gboolean lj_dbus_mpris_update_list(JamDBus *jd, GError **error);
+gboolean lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error);
+
+#define MPRIS_ERROR_NOT_PLAYING		1
+#define MPRIS_ERROR_NO_PLAYER		2
+
+gchar *lj_dbus_mpris_current_music(JamDBus *jd, GError **error);
+
+#endif /* lj_dbus_h */
+
diff -up logjam-4.5.3/src/Makefile.am.dbus logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.dbus	2009-04-23 00:44:11.000000000 +0300
+++ logjam-4.5.3/src/Makefile.am	2009-04-24 15:59:08.000000000 +0300
@@ -3,7 +3,7 @@ bin_PROGRAMS = logjam
 localedir=$(datadir)/locale
 
 # AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/protocol/blogger -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@ @DBUSAPI_CFLAGS@
 
 ACCOUNT = account.h account.c host.c livejournal.c
 # blogger.c
@@ -50,6 +50,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           settings.c settings.h $(GROUPEDBOX) tie.c tie.h \
           $(HISTORY) $(OFFLINE) \
           jam.c jam.h $(USEJOURNAL) \
+          lj_dbus.c lj_dbus.h \
           security.c security.h about.c thanks.h \
           menu.c menu.h $(TOOLS) smartquotes.c smartquotes.h \
           $(LOGIN) manager.c \
@@ -116,7 +117,7 @@ logjam_SOURCES += journalstore-xml.c
 endif
 
 # logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la $(top_builddir)/protocol/blogger/libblogger.la @LOGJAM_LIBS@ @NETWORK_LIBS@
-logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@
+logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@ @DBUSAPI_LIBS@
 
 ctags:
 	@version=`ctags --version | head -1`; \
diff -up logjam-4.5.3/src/music.c.dbus logjam-4.5.3/src/music.c
--- logjam-4.5.3/src/music.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/music.c	2009-04-25 01:11:29.000000000 +0300
@@ -9,8 +9,11 @@
 #include "gtk-all.h"
 
 #include "conf.h"
+#include "lj_dbus.h"
 #include "music.h"
 
+JamDBus *jdbus = NULL;
+
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
diff -up logjam-4.5.3/src/music.h.dbus logjam-4.5.3/src/music.h
--- logjam-4.5.3/src/music.h.dbus	2005-02-21 20:30:27.000000000 +0200
+++ logjam-4.5.3/src/music.h	2009-04-25 01:05:55.000000000 +0300
@@ -8,6 +8,9 @@
 #define music_h
 
 #include "conf.h" /* CommandList */
+#include "lj_dbus.h"
+
+extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
diff -up logjam-4.5.3/src/settings.c.dbus logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.dbus	2009-04-25 13:41:03.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2009-04-25 15:19:42.000000000 +0300
@@ -24,6 +24,7 @@
 #include "tie.h"
 #include "account.h"
 #include "jamview.h"
+#include "lj_dbus.h"
 
 /* what's this?  all of these funny structures in the settings box?
  * well, instead of creating and tearing down all of these widgets, i
@@ -101,6 +102,8 @@ static SettingsWidget settingswidgets[] 
 
 	{ "music_command", &conf.music_command,
 		SW_COMMAND, N_("Detect music from:"), (gpointer)music_commands },
+	{ "music_mpris", &conf.music_mpris,
+		SW_TOGGLE, N_("Detect music via MPRIS") },
 
 	{ "net_useproxy", &conf.options.useproxy, 
 		SW_TOGGLE, N_("Use _proxy server") },
@@ -169,6 +172,19 @@ toggle_tie_enable(GtkWidget *toggle, Gtk
 }
 
 static void
+toggle_disable_cb(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+}
+static void
+toggle_tie_disable(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+	g_signal_connect(G_OBJECT(toggle), "toggled",
+			G_CALLBACK(toggle_disable_cb), target);
+}
+
+static void
 toggle_tie(SettingsWidget *sw) {
 	tie_toggle(GTK_TOGGLE_BUTTON(sw->widget), (gboolean*)sw->conf);
 }
@@ -499,16 +515,21 @@ static void
 music_diagnose(GtkWidget *button) {
 	GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(button));
 	GError *err = NULL;
-	char *music, *result;
-	MusicSource source = music_current_source();
+	char *music = NULL, *result;
+	MusicSource source = MUSIC_SOURCE_NONE;
 
-	if (!music_can_detect(&err)) {
-		jam_warning(dlg, "%s", err->message);
-		g_error_free(err);
-		return;
+	if (conf.music_mpris) {
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	} else {
+		source = music_current_source();
+		if (!music_can_detect(&err)) {
+			jam_warning(dlg, "%s", err->message);
+			g_error_free(err);
+			return;
+		}
+		music = music_detect(&err);
 	}
 
-	music = music_detect(&err);
 	if (!music) {
 		if (source == MUSIC_SOURCE_XMMS &&
 				err->domain == G_SPAWN_ERROR && err->code == G_SPAWN_ERROR_NOENT) {
@@ -555,21 +576,40 @@ proxysettings(void) {
 	return group;
 }
 
+static void
+mpris_update_cb(GtkToggleButton *button, JamDBus *jd) {
+	GError *error = NULL;
+	if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+		GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+		jam_warning(dlg, _("Error detecting music: %s"), error->message);
+		g_error_free(error);
+	}
+}
+
 static GtkWidget*
 programsettings(JamWin *jw) {
 	GtkWidget *group;
-	GtkWidget *button, *hbox;
+	GtkWidget *button, *vbox, *hbox;
 	SettingsWidget *sw;
 	JamView *jv = jam_win_get_cur_view(jw);
 	
 	group = groupedbox_new_with_text(_("Programs"));
 	groupedbox_pack(GROUPEDBOX(group), sw_make("web_spawn"), FALSE);
 
-	groupedbox_pack(GROUPEDBOX(group), sw_make("music_command"), FALSE);
+	vbox = sw_make("music_command");
+	groupedbox_pack(GROUPEDBOX(group), vbox, FALSE);
 	sw = sw_lookup("music_command");
 	g_signal_connect_swapped(G_OBJECT(sw->widget), "changed",
 			G_CALLBACK(jam_view_settings_changed), jv);
 
+	button = sw_make("music_mpris");
+	groupedbox_pack(GROUPEDBOX(group), button, FALSE);
+	g_signal_connect(G_OBJECT(button), "toggled",
+			G_CALLBACK(mpris_update_cb), jdbus);
+	toggle_tie_disable(button, vbox);
+	g_signal_connect_swapped(G_OBJECT(button), "toggled",
+			G_CALLBACK(jam_view_settings_changed), jv);
+
 	button = gtk_button_new_with_mnemonic(_("_Diagnose"));
 	g_signal_connect(G_OBJECT(button), "clicked",
 			G_CALLBACK(music_diagnose), NULL);

logjam-4.5.3-save-tags.diff:

--- NEW FILE logjam-4.5.3-save-tags.diff ---
diff -up logjam-4.5.3/src/jamview.c.save logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.save	2009-04-26 10:26:39.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-26 10:28:00.000000000 +0300
@@ -418,7 +424,8 @@ tags_select_cb(JamView *view) {
 
   tags = tags_dialog(toplevel,
 		     JAM_ACCOUNT_LJ(view->account), 
-		     jam_doc_get_usejournal(view->doc));
+		     jam_doc_get_usejournal(view->doc),
+		     (gchar *) gtk_entry_get_text(GTK_ENTRY(view->tags)));
 
   if (tags) {
       gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
diff -up logjam-4.5.3/src/tags.c.save logjam-4.5.3/src/tags.c
--- logjam-4.5.3/src/tags.c.save	2009-04-26 10:05:38.000000000 +0300
+++ logjam-4.5.3/src/tags.c	2009-04-26 15:15:13.000000000 +0300
@@ -78,8 +78,23 @@ create_tag_string (GtkTreeModel *model,
   return FALSE;
 }
 
+static void
+tags_set_fg(GtkTreeViewColumn *column, GtkCellRenderer *cell,
+	    GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+  GSList *prev = (GSList *) data;
+  gchar *text;
+
+  gtk_tree_model_get(model, iter, 1, &text, -1);
+  if (prev && g_slist_find_custom(prev, text, g_utf8_collate))
+    g_object_set(G_OBJECT(cell), "foreground", "Red", NULL);
+  else
+    g_object_set(G_OBJECT(cell), "foreground", "Black", NULL);
+  g_free(text);
+}
+
 GtkWidget* 
-taglist_create (GSList *l)
+taglist_create (GSList *l, GSList **head)
 {
   GtkWidget *treeview;
   GtkListStore *store;
@@ -87,20 +102,37 @@ taglist_create (GSList *l)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   guint i;
+  GSList *prev = *head, *p;
 
   /* create model */
   store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
   for (i = 0; i < g_slist_length (l); i++)
     {
       LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+      gboolean check = FALSE;
 
+      if (prev && (p = g_slist_find_custom(prev, t->tag, g_utf8_collate)) != NULL) {
+        check = TRUE;
+        prev = g_slist_remove_link(prev, p);
+        g_free(p->data);
+        g_slist_free1(p);
+      }
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  0, FALSE,
+			  0, check,
 			  1, t->tag,
 			  -1);
     }
 
+  /* rest of the typed tags */
+  for (p = prev; p; p = g_slist_next(p)) {
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter,
+      		  0, TRUE,
+      		  1, p->data,
+      		  -1);
+  }
+
   /* create treeview */
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
@@ -120,20 +152,44 @@ taglist_create (GSList *l)
   column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
 						     renderer, "text", 1,
 						     NULL);
+
+  gtk_tree_view_column_set_cell_data_func(column, renderer, tags_set_fg,
+					  prev, NULL);
+
   gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (treeview, column);
  
+  /* update head of the prev list */
+  *head = prev;
   g_object_unref (store);
 
   return treeview;
 }
 
+static GSList *
+tags_split(gchar *typed) {
+  GSList *head = NULL;
+  gchar **result, **p;
+
+  if (typed == NULL || *typed == '\0')
+    return NULL;
+
+  for (p = result = g_strsplit(typed, ",", 0); *p; p++) {
+    gchar *token = g_strstrip(*p);
+    if (*token)
+      head = g_slist_prepend(head, g_utf8_strdown(token, -1));
+  }
+  g_strfreev(result);
+  return head;
+}
+
 gchar* 
-tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed)
 {
   GtkWidget *dlg, *sw, *tv;
   GSList *list = NULL;
   gchar *taglist = NULL;
+  GSList *prev;
 
   if (acc == NULL) return NULL;
 
@@ -156,7 +212,8 @@ tags_dialog (GtkWidget *win, JamAccountL
 				  GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
 
-  tv = taglist_create (list);
+  prev = tags_split(typed);
+  tv = taglist_create (list, &prev);
   gtk_container_add (GTK_CONTAINER (sw), tv);
 
   gtk_window_resize(dlg, 60, 210);
@@ -177,5 +234,14 @@ tags_dialog (GtkWidget *win, JamAccountL
 
   gtk_widget_destroy (dlg);
   
+  /* free rest of prev list */
+  if (prev) {
+    GSList *p;
+    for (p = prev; p; p = g_slist_next(p)) {
+      g_free(p->data);
+    }
+    g_slist_free(prev);
+  }
+
   return taglist;
 }
diff -up logjam-4.5.3/src/tags.h.save logjam-4.5.3/src/tags.h
--- logjam-4.5.3/src/tags.h.save	2009-04-26 10:22:25.000000000 +0300
+++ logjam-4.5.3/src/tags.h	2009-04-26 10:22:03.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef _TAGS_H_
 #define _TAGS_H_
 
-gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed);
 
 #endif /* _TAGS_H_ */


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-11/logjam.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- logjam.spec	25 Feb 2009 20:52:45 -0000	1.50
+++ logjam.spec	27 Apr 2009 17:27:19 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	27%{?dist}
+Release:	29%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -17,6 +17,7 @@
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	dbus-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch2:		logjam-4.4.1-backdated.patch
@@ -40,6 +41,10 @@
 Patch20:	logjam-4.5.3-imageresize.patch
 Patch21:	logjam-4.5.3-showloginhistory.patch
 Patch22:	logjam-4.5.3-libtool.patch
+Patch23:	logjam-4.5.3-keep-drafts.patch
+Patch24:	logjam-4.5.3-lj-embed.patch
+Patch25:	logjam-4.5.3-mpris.diff
+Patch26:	logjam-4.5.3-save-tags.diff
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -79,6 +84,10 @@
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
 %patch22 -p1 -b .libtool
+%patch23 -p1 -b .keep_drafts
+%patch24 -p1 -b .lj-embed
+%patch25 -p1 -b .mpris
+%patch26 -p1 -b .save-tags
 
 libtoolize
 rm -rf aclocal.m4
@@ -128,6 +137,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
+- add support for lj-embed tags
+- add support for MPRIS music detection (Andy Shevchenko)
+- improve tag handling (Andy Shevchenko)
+
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-28
+- add patch to enable "keep drafts" functionality
+  see: http://community.livejournal.com/logjam_dev/37274.html
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Apr 27 17:27:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:27:49 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam-4.5.3-keep-drafts.patch, NONE,
	1.1 logjam-4.5.3-lj-embed.patch, NONE,
	1.1 logjam-4.5.3-save-tags.diff, NONE, 1.1 logjam.spec, 1.48, 1.49
Message-ID: <20090427172749.9812E70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648/F-9

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-keep-drafts.patch logjam-4.5.3-lj-embed.patch 
	logjam-4.5.3-save-tags.diff 
Log Message:
update logjam with new features, bugfixes

logjam-4.5.3-keep-drafts.patch:

--- NEW FILE logjam-4.5.3-keep-drafts.patch ---
diff -up logjam-4.5.3/src/conf.h.keep_drafts logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2009-04-02 13:08:45.000000000 -0400
@@ -62,6 +62,7 @@ typedef struct {
 	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
+	gboolean keepsaveddrafts;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/conf_xml.c.keep_drafts logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2009-04-02 13:08:15.000000000 -0400
@@ -181,6 +181,7 @@ parseoptions(Configuration *c, xmlDocPtr
 #endif
 		READOPTION(revertusejournal)
 		READOPTION(autosave)
+		READOPTION(keepsaveddrafts)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(close_when_send)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 #endif
 	WRITEOPTION(revertusejournal);
 	WRITEOPTION(autosave);
+	WRITEOPTION(keepsaveddrafts);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(close_when_send);
diff -up logjam-4.5.3/src/jam.c.keep_drafts logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2009-04-02 13:06:49.000000000 -0400
@@ -340,7 +340,7 @@ jam_submit_entry(JamWin *jw) {
 	ctx = net_ctx_gtk_new(GTK_WINDOW(jw), NULL);
 	if (jam_host_do_post(jam_account_get_host(acc), ctx, jw->doc, NULL)) {
 		gint type = jam_doc_get_entry_type(jw->doc);
-		if (type == ENTRY_DRAFT) {
+		if (type == ENTRY_DRAFT && !conf.options.keepsaveddrafts) {
 			if (jam_confirm(GTK_WINDOW(jw),
 					_("Delete"), _("Delete this draft from disk?")))
 				delete_draft(jw);
diff -up logjam-4.5.3/src/settings.c.keep_drafts logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2009-04-02 13:06:49.000000000 -0400
@@ -74,6 +74,10 @@ static SettingsWidget settingswidgets[] 
 
 	{ "ui_allowmultipleinstances", &conf.options.allowmultipleinstances,
 		SW_TOGGLE, N_("Allow multiple _instances of LogJam to run simultaneously") },
+	
+	{ "ui_keepsaveddrafts", &conf.options.keepsaveddrafts, 
+		SW_TOGGLE, N_("_Keep saved drafts after posting") },
+	
 #ifdef HAVE_GTKSPELL
 	{ "ui_spellcheck", &conf.options.usespellcheck, 
 		SW_TOGGLE, N_("_Use spell check") },
@@ -409,6 +413,8 @@ uisettings(JamWin *jw) {
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_autosave"), FALSE);
+	
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_keepsaveddrafts"), FALSE);
 
 #ifdef HAVE_GTKSPELL
 	{

logjam-4.5.3-lj-embed.patch:

--- NEW FILE logjam-4.5.3-lj-embed.patch ---
diff -up logjam-4.5.3/src/menu.c.lj-embed logjam-4.5.3/src/menu.c
--- logjam-4.5.3/src/menu.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/menu.c	2009-04-27 11:21:06.000000000 -0400
@@ -274,6 +274,12 @@ static void
 menu_ljcut(JamWin *jw) {
 	tools_ljcut(GTK_WINDOW(jw), jw->doc);
 }
+
+static void
+menu_embedded_media(JamWin *jw) {
+	tools_embedded_media(GTK_WINDOW(jw), jw->doc);
+}
+
 static void
 menu_validate_xml(JamWin *jw) {
 	tools_validate_xml(GTK_WINDOW(jw), jw->doc);
@@ -415,6 +421,7 @@ static GtkItemFactoryEntry menu_items[] 
 { N_("/Insert/_Image..."),        NULL,          menu_insert_image },
 { N_("/Insert/_Journal Link..."), "<ctl><alt>L", menu_make_journal_link },
 { N_("/Insert/lj-_cut..."),       "<ctl><alt>X", menu_ljcut, 0, NULL },
+{ N_("/Insert/_Embedded Media..."), "<ctl><alt>E", menu_embedded_media },
 
 { N_("/_View"),                   NULL, NULL, ACTION_VIEW, "<Branch>" },
 { N_("/View/_Security"),          NULL, menu_view_cb, ACTION_VIEW_SECURITY,     "<CheckItem>" },
diff -up logjam-4.5.3/src/tools.c.lj-embed logjam-4.5.3/src/tools.c
--- logjam-4.5.3/src/tools.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/tools.c	2009-04-27 12:24:39.000000000 -0400
@@ -322,6 +322,65 @@ tools_validate_xml(GtkWindow *win, JamDo
 	g_free(str);
 }
 
+/* FIXME: These two functions are practically identical. Abstract them to minimize code duplication. */
+
+void
+tools_embedded_media(GtkWindow *win, JamDoc *doc) {
+	GtkTextBuffer *buffer, *new_buffer;
+	GtkWidget *dlg, *vbox, *hbox, *label, *entry;
+	gchar *text;
+	GtkTextIter start;
+	GtkTextIter end;
+
+	dlg = gtk_dialog_new_with_buttons(_("Embedded Media"), win,
+			GTK_DIALOG_MODAL,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OK,     GTK_RESPONSE_OK,
+			NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
+	gtk_window_set_default_size (GTK_WINDOW (dlg), 450, 140);
+
+	vbox = gtk_vbox_new(FALSE, 2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+
+	entry = gtk_text_view_new();
+	gtk_text_view_set_wrap_mode(entry, TRUE);
+	//gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+	hbox = labelled_box_new(_("E_mbedded code:"), entry);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label),
+			_("<small>This is where you paste the embedded code, e.g. for a YouTube video.</small>"));
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	jam_dialog_set_contents(GTK_DIALOG(dlg), vbox);
+
+	if (gtk_dialog_run(GTK_DIALOG(dlg)) != GTK_RESPONSE_OK) {
+		gtk_widget_destroy(dlg);
+		return;
+	}
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+	gtk_text_buffer_get_start_iter (buffer, &start);
+	gtk_text_buffer_get_end_iter (buffer, &end);
+	text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+	gtk_widget_destroy(dlg);
+	if (text[0] == 0) {
+		g_free(text);
+		text = NULL;
+	}
+	//xml_escape(&text);
+	new_buffer = jam_doc_get_text_buffer(doc);
+	
+	gtk_text_buffer_begin_user_action(new_buffer); /* start undo action */
+	gtk_text_buffer_insert_at_cursor(new_buffer, "<lj-embed>", -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, text, -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, "</lj-embed>", -1);
+	g_free(text);
+
+	gtk_text_buffer_end_user_action(new_buffer);
+}
+
 void
 tools_ljcut(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
diff -up logjam-4.5.3/src/tools.h.lj-embed logjam-4.5.3/src/tools.h
--- logjam-4.5.3/src/tools.h.lj-embed	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/src/tools.h	2009-04-27 11:21:06.000000000 -0400
@@ -16,5 +16,6 @@ void tools_insert_command_output
                             (GtkWindow *win, JamDoc *doc);
 void tools_validate_xml     (GtkWindow *win, JamDoc *doc);
 void tools_ljcut            (GtkWindow *win, JamDoc *doc);
+void tools_embedded_media   (GtkWindow *win, JamDoc *doc);
 
 #endif /* tools_h */

logjam-4.5.3-save-tags.diff:

--- NEW FILE logjam-4.5.3-save-tags.diff ---
diff -up logjam-4.5.3/src/jamview.c.save logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.save	2009-04-26 10:26:39.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-26 10:28:00.000000000 +0300
@@ -418,7 +424,8 @@ tags_select_cb(JamView *view) {
 
   tags = tags_dialog(toplevel,
 		     JAM_ACCOUNT_LJ(view->account), 
-		     jam_doc_get_usejournal(view->doc));
+		     jam_doc_get_usejournal(view->doc),
+		     (gchar *) gtk_entry_get_text(GTK_ENTRY(view->tags)));
 
   if (tags) {
       gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
diff -up logjam-4.5.3/src/tags.c.save logjam-4.5.3/src/tags.c
--- logjam-4.5.3/src/tags.c.save	2009-04-26 10:05:38.000000000 +0300
+++ logjam-4.5.3/src/tags.c	2009-04-26 15:15:13.000000000 +0300
@@ -78,8 +78,23 @@ create_tag_string (GtkTreeModel *model,
   return FALSE;
 }
 
+static void
+tags_set_fg(GtkTreeViewColumn *column, GtkCellRenderer *cell,
+	    GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+  GSList *prev = (GSList *) data;
+  gchar *text;
+
+  gtk_tree_model_get(model, iter, 1, &text, -1);
+  if (prev && g_slist_find_custom(prev, text, g_utf8_collate))
+    g_object_set(G_OBJECT(cell), "foreground", "Red", NULL);
+  else
+    g_object_set(G_OBJECT(cell), "foreground", "Black", NULL);
+  g_free(text);
+}
+
 GtkWidget* 
-taglist_create (GSList *l)
+taglist_create (GSList *l, GSList **head)
 {
   GtkWidget *treeview;
   GtkListStore *store;
@@ -87,20 +102,37 @@ taglist_create (GSList *l)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   guint i;
+  GSList *prev = *head, *p;
 
   /* create model */
   store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
   for (i = 0; i < g_slist_length (l); i++)
     {
       LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+      gboolean check = FALSE;
 
+      if (prev && (p = g_slist_find_custom(prev, t->tag, g_utf8_collate)) != NULL) {
+        check = TRUE;
+        prev = g_slist_remove_link(prev, p);
+        g_free(p->data);
+        g_slist_free1(p);
+      }
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  0, FALSE,
+			  0, check,
 			  1, t->tag,
 			  -1);
     }
 
+  /* rest of the typed tags */
+  for (p = prev; p; p = g_slist_next(p)) {
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter,
+      		  0, TRUE,
+      		  1, p->data,
+      		  -1);
+  }
+
   /* create treeview */
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
@@ -120,20 +152,44 @@ taglist_create (GSList *l)
   column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
 						     renderer, "text", 1,
 						     NULL);
+
+  gtk_tree_view_column_set_cell_data_func(column, renderer, tags_set_fg,
+					  prev, NULL);
+
   gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (treeview, column);
  
+  /* update head of the prev list */
+  *head = prev;
   g_object_unref (store);
 
   return treeview;
 }
 
+static GSList *
+tags_split(gchar *typed) {
+  GSList *head = NULL;
+  gchar **result, **p;
+
+  if (typed == NULL || *typed == '\0')
+    return NULL;
+
+  for (p = result = g_strsplit(typed, ",", 0); *p; p++) {
+    gchar *token = g_strstrip(*p);
+    if (*token)
+      head = g_slist_prepend(head, g_utf8_strdown(token, -1));
+  }
+  g_strfreev(result);
+  return head;
+}
+
 gchar* 
-tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed)
 {
   GtkWidget *dlg, *sw, *tv;
   GSList *list = NULL;
   gchar *taglist = NULL;
+  GSList *prev;
 
   if (acc == NULL) return NULL;
 
@@ -156,7 +212,8 @@ tags_dialog (GtkWidget *win, JamAccountL
 				  GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
 
-  tv = taglist_create (list);
+  prev = tags_split(typed);
+  tv = taglist_create (list, &prev);
   gtk_container_add (GTK_CONTAINER (sw), tv);
 
   gtk_window_resize(dlg, 60, 210);
@@ -177,5 +234,14 @@ tags_dialog (GtkWidget *win, JamAccountL
 
   gtk_widget_destroy (dlg);
   
+  /* free rest of prev list */
+  if (prev) {
+    GSList *p;
+    for (p = prev; p; p = g_slist_next(p)) {
+      g_free(p->data);
+    }
+    g_slist_free(prev);
+  }
+
   return taglist;
 }
diff -up logjam-4.5.3/src/tags.h.save logjam-4.5.3/src/tags.h
--- logjam-4.5.3/src/tags.h.save	2009-04-26 10:22:25.000000000 +0300
+++ logjam-4.5.3/src/tags.h	2009-04-26 10:22:03.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef _TAGS_H_
 #define _TAGS_H_
 
-gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed);
 
 #endif /* _TAGS_H_ */


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- logjam.spec	28 Jul 2008 18:45:42 -0000	1.48
+++ logjam.spec	27 Apr 2009 17:27:19 -0000	1.49
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	25%{?dist}
+Release:	29%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -16,7 +16,8 @@
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
-BuildRequires:	autoconf, automake, libtool, intltool, popt-devel
+BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	dbus-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch2:		logjam-4.4.1-backdated.patch
@@ -39,6 +40,11 @@
 Patch19:	logjam-4.5.3-close_when_send.patch
 Patch20:	logjam-4.5.3-imageresize.patch
 Patch21:	logjam-4.5.3-showloginhistory.patch
+Patch22:	logjam-4.5.3-libtool.patch
+Patch23:	logjam-4.5.3-keep-drafts.patch
+Patch24:	logjam-4.5.3-lj-embed.patch
+Patch25:	logjam-4.5.3-mpris.diff
+Patch26:	logjam-4.5.3-save-tags.diff
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -77,6 +83,16 @@
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
+%patch22 -p1 -b .libtool
+%patch23 -p1 -b .keep_drafts
+%patch24 -p1 -b .lj-embed
+%patch25 -p1 -b .mpris
+%patch26 -p1 -b .save-tags
+
+libtoolize
+rm -rf aclocal.m4
+autoupdate
+intltoolize --force
 
 %build
 touch NEWS README AUTHORS
@@ -121,6 +137,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
+- add support for lj-embed tags
+- add support for MPRIS music detection (Andy Shevchenko)
+- improve tag handling (Andy Shevchenko)
+
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-28
+- add patch to enable "keep drafts" functionality
+  see: http://community.livejournal.com/logjam_dev/37274.html
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-26
+- libtoolize to support newer libtool
+- intltoolize so we get translations
+
 * Mon Jul 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-25
 - fix docked behavior again (bz 447146)
 - fix config option to start in dock again (bz 445998)



From spot at fedoraproject.org  Mon Apr 27 17:27:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:27:49 +0000 (UTC)
Subject: rpms/logjam/devel logjam-4.5.3-lj-embed.patch, NONE,
	1.1 logjam-4.5.3-mpris.diff, NONE,
	1.1 logjam-4.5.3-save-tags.diff, NONE, 1.1 logjam.spec, 1.50, 1.51
Message-ID: <20090427172749.DE46E70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648/devel

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-lj-embed.patch logjam-4.5.3-mpris.diff 
	logjam-4.5.3-save-tags.diff 
Log Message:
update logjam with new features, bugfixes

logjam-4.5.3-lj-embed.patch:

--- NEW FILE logjam-4.5.3-lj-embed.patch ---
diff -up logjam-4.5.3/src/menu.c.lj-embed logjam-4.5.3/src/menu.c
--- logjam-4.5.3/src/menu.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/menu.c	2009-04-27 11:21:06.000000000 -0400
@@ -274,6 +274,12 @@ static void
 menu_ljcut(JamWin *jw) {
 	tools_ljcut(GTK_WINDOW(jw), jw->doc);
 }
+
+static void
+menu_embedded_media(JamWin *jw) {
+	tools_embedded_media(GTK_WINDOW(jw), jw->doc);
+}
+
 static void
 menu_validate_xml(JamWin *jw) {
 	tools_validate_xml(GTK_WINDOW(jw), jw->doc);
@@ -415,6 +421,7 @@ static GtkItemFactoryEntry menu_items[] 
 { N_("/Insert/_Image..."),        NULL,          menu_insert_image },
 { N_("/Insert/_Journal Link..."), "<ctl><alt>L", menu_make_journal_link },
 { N_("/Insert/lj-_cut..."),       "<ctl><alt>X", menu_ljcut, 0, NULL },
+{ N_("/Insert/_Embedded Media..."), "<ctl><alt>E", menu_embedded_media },
 
 { N_("/_View"),                   NULL, NULL, ACTION_VIEW, "<Branch>" },
 { N_("/View/_Security"),          NULL, menu_view_cb, ACTION_VIEW_SECURITY,     "<CheckItem>" },
diff -up logjam-4.5.3/src/tools.c.lj-embed logjam-4.5.3/src/tools.c
--- logjam-4.5.3/src/tools.c.lj-embed	2009-04-27 11:21:06.000000000 -0400
+++ logjam-4.5.3/src/tools.c	2009-04-27 12:24:39.000000000 -0400
@@ -322,6 +322,65 @@ tools_validate_xml(GtkWindow *win, JamDo
 	g_free(str);
 }
 
+/* FIXME: These two functions are practically identical. Abstract them to minimize code duplication. */
+
+void
+tools_embedded_media(GtkWindow *win, JamDoc *doc) {
+	GtkTextBuffer *buffer, *new_buffer;
+	GtkWidget *dlg, *vbox, *hbox, *label, *entry;
+	gchar *text;
+	GtkTextIter start;
+	GtkTextIter end;
+
+	dlg = gtk_dialog_new_with_buttons(_("Embedded Media"), win,
+			GTK_DIALOG_MODAL,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OK,     GTK_RESPONSE_OK,
+			NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
+	gtk_window_set_default_size (GTK_WINDOW (dlg), 450, 140);
+
+	vbox = gtk_vbox_new(FALSE, 2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+
+	entry = gtk_text_view_new();
+	gtk_text_view_set_wrap_mode(entry, TRUE);
+	//gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+	hbox = labelled_box_new(_("E_mbedded code:"), entry);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label),
+			_("<small>This is where you paste the embedded code, e.g. for a YouTube video.</small>"));
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	jam_dialog_set_contents(GTK_DIALOG(dlg), vbox);
+
+	if (gtk_dialog_run(GTK_DIALOG(dlg)) != GTK_RESPONSE_OK) {
+		gtk_widget_destroy(dlg);
+		return;
+	}
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+	gtk_text_buffer_get_start_iter (buffer, &start);
+	gtk_text_buffer_get_end_iter (buffer, &end);
+	text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+	gtk_widget_destroy(dlg);
+	if (text[0] == 0) {
+		g_free(text);
+		text = NULL;
+	}
+	//xml_escape(&text);
+	new_buffer = jam_doc_get_text_buffer(doc);
+	
+	gtk_text_buffer_begin_user_action(new_buffer); /* start undo action */
+	gtk_text_buffer_insert_at_cursor(new_buffer, "<lj-embed>", -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, text, -1);
+	gtk_text_buffer_insert_at_cursor(new_buffer, "</lj-embed>", -1);
+	g_free(text);
+
+	gtk_text_buffer_end_user_action(new_buffer);
+}
+
 void
 tools_ljcut(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
diff -up logjam-4.5.3/src/tools.h.lj-embed logjam-4.5.3/src/tools.h
--- logjam-4.5.3/src/tools.h.lj-embed	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/src/tools.h	2009-04-27 11:21:06.000000000 -0400
@@ -16,5 +16,6 @@ void tools_insert_command_output
                             (GtkWindow *win, JamDoc *doc);
 void tools_validate_xml     (GtkWindow *win, JamDoc *doc);
 void tools_ljcut            (GtkWindow *win, JamDoc *doc);
+void tools_embedded_media   (GtkWindow *win, JamDoc *doc);
 
 #endif /* tools_h */

logjam-4.5.3-mpris.diff:

--- NEW FILE logjam-4.5.3-mpris.diff ---
diff -up logjam-4.5.3/configure.in.dbus logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/configure.in	2009-04-23 00:38:34.000000000 +0300
@@ -220,6 +220,13 @@ AC_SUBST(LIVEJOURNAL_CFLAGS)
 AC_SUBST(LIVEJOURNAL_LIBS)
 dnl end liblivejournal dependencies.
 
+dnl D-Bus API
+MODULES="dbus-1 dbus-glib-1"
+PKG_CHECK_MODULES(DBUSAPI, $MODULES)
+AC_SUBST(DBUSAPI_CFLAGS)
+AC_SUBST(DBUSAPI_LIBS)
+dnl D-Bus API
+
 AM_CONDITIONAL(WITH_XMMS, test "$with_xmms" = "yes")
 AM_CONDITIONAL(WITH_HTML, test "$with_gtkhtml" != "no")
 AM_CONDITIONAL(WITH_RSVG, test "$with_librsvg" = "yes")
diff -up logjam-4.5.3/src/conf.h.dbus logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2009-04-23 22:10:14.000000000 +0300
@@ -92,6 +92,7 @@ typedef struct {
 	char *spawn_command;
 
 	char *music_command;
+	gboolean music_mpris;
 
 	char *proxy;
 	char *proxyuser, *proxypass;
diff -up logjam-4.5.3/src/conf_xml.c.dbus logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.dbus	2009-04-23 22:19:10.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2009-04-24 15:40:45.000000000 +0300
@@ -257,6 +257,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node
 		XML_GET_CONF("proxyauth", parseproxyauth)
 		XML_GET_STR("spawncommand", c->spawn_command)
 		XML_GET_STR("musiccommand", c->music_command)
+		XML_GET_BOOL("musicmpris", c->music_mpris)
 #endif /* G_OS_WIN32 */
 		XML_GET_INT("cfuserinterval", c->cfuserinterval)
 		XML_GET_INT("cfthreshold", c->cfthreshold)
@@ -396,6 +397,8 @@ conf_write(Configuration *c, char *base)
 
 	if (c->music_command)
 		xmlAddTN(root, "musiccommand", c->music_command);
+	if (c->music_mpris)
+		xmlNewChild(root, NULL, BAD_CAST "musicmpris", NULL);
 #endif
 
 	if (c->cfuserinterval) {
diff -up logjam-4.5.3/src/init.c.dbus logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/init.c	2009-04-25 11:56:05.000000000 +0300
@@ -29,6 +29,7 @@
 #include "conf_xml.h"
 #include "jamdoc.h"
 #include "cmdline.h"
+#include "lj_dbus.h"
 
 #ifdef HAVE_GTK
 #include "login.h"
@@ -120,6 +121,9 @@ init_app(int *argc, gchar *argv[]) {
 }
 
 #ifdef HAVE_GTK
+
+extern JamDBus *jdbus;
+
 static void
 run_gtk(JamDoc *doc) {
 	gchar *accelpath;
@@ -148,8 +152,20 @@ run_gtk(JamDoc *doc) {
 		jam_doc_set_account(doc, acc);
 	}
 
+	jdbus = lj_dbus_new();
+	if (conf.music_mpris) {
+		GError *error = NULL;
+		if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+			g_printerr("Error: %s\n", error->message);
+			g_error_free(error);
+		}
+	}
+
 	jam_run(doc);
 
+	lj_dbus_close(jdbus);
+	jdbus = NULL;
+
 	g_object_unref(G_OBJECT(app.remote));
 
 	gtk_accel_map_save(accelpath);
diff -up logjam-4.5.3/src/jamview.c.dbus logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.dbus	2009-04-25 13:39:45.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-25 14:27:56.000000000 +0300
@@ -20,6 +20,7 @@
 #include "marshalers.h"
 #include "datesel.h"
 #include "tags.h"
+#include "lj_dbus.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -356,7 +357,12 @@ picture_store(JamView *view) {
 static void
 music_refresh_cb(JamView *view) {
 	GError *err = NULL;
-	gchar *music = music_detect(&err);
+	gchar *music;
+
+	if (conf.music_mpris)
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	else
+		music = music_detect(&err);
 
 	if (music) {
 		gtk_entry_set_text(GTK_ENTRY(view->music), music);
@@ -373,7 +379,7 @@ static void
 music_add(JamView *view) {
 	view->music = gtk_entry_new();
 	view->musicbar = labelled_box_new_sg(_("_Music:"), view->music, view->sizegroup);
-	if (music_can_detect(NULL)) {
+	if (conf.music_mpris || music_can_detect(NULL)) {
 		GtkWidget *refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 		g_signal_connect_swapped(G_OBJECT(refresh), "clicked",
 				G_CALLBACK(music_refresh_cb), view);
diff -up logjam-4.5.3/src/lj_dbus.c.dbus logjam-4.5.3/src/lj_dbus.c
--- logjam-4.5.3/src/lj_dbus.c.dbus	2009-04-25 13:40:31.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.c	2009-04-25 14:21:30.000000000 +0300
@@ -0,0 +1,244 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ *
+ * See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification
+ */
+
+#include <string.h>		/* memset */
+
+#include "lj_dbus.h"
+
+#define MPRIS_IF	"org.freedesktop.MediaPlayer"
+
+/* Internal prototypes */
+static gboolean lj_dbus_open(JamDBus *jd);
+static gboolean lj_dbus_append_player(JamDBus *jd, gchar *dest);
+static void lj_dbus_players_clear(JamDBus *jd);
+static gboolean lj_dbus_players_find(JamDBus *jd, GError **error);
+
+/* Implementation */
+static gboolean
+lj_dbus_open(JamDBus *jd) {
+	GError *error = NULL;
+
+	jd->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (jd->bus == NULL) {
+		g_printerr("Failed to open connection to bus: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+    }
+	return TRUE;
+}
+
+void lj_dbus_close(JamDBus *jd) {
+	if (jd == NULL)
+		return;
+	lj_dbus_players_clear(jd);
+	dbus_g_connection_unref(jd->bus);
+}
+
+JamDBus *
+lj_dbus_new(void) {
+	JamDBus *jd = (JamDBus *) g_malloc0(sizeof(JamDBus));
+
+	if (lj_dbus_open(jd) == FALSE) {
+		g_free(jd);
+		return NULL;
+	}
+	return jd;
+}
+
+static gboolean
+lj_dbus_append_player(JamDBus *jd, gchar *dest) {
+	MediaPlayer *player;
+	DBusGProxy *proxy;
+	GError *error = NULL;
+	gchar *name;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/", MPRIS_IF);
+
+	if (!dbus_g_proxy_call(proxy, "Identity", &error, G_TYPE_INVALID,
+						   G_TYPE_STRING, &name, G_TYPE_INVALID)) {
+		g_printerr("Error: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	player = (MediaPlayer *) g_malloc0(sizeof(MediaPlayer));
+	player->dest = g_strdup(dest);
+	player->name = g_strdup(name);
+	player->proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/Player", MPRIS_IF);
+
+	if (g_str_has_suffix(dest, "audacious"))
+		player->hint |= MPRIS_HINT_BAD_STATUS;
+
+	jd->player = g_list_append(jd->player, (gpointer) player);
+
+	g_free(name);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+static void
+lj_dbus_players_clear(JamDBus *jd) {
+	GList *list;
+
+	if (jd->player == NULL)
+		return;
+
+	for (list = g_list_first(jd->player); list; list = g_list_next(list)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		g_object_unref(player->proxy);
+		if (player->name)
+			g_free(player->name);
+		if (player->dest)
+			g_free(player->dest);
+	}
+	g_list_free(jd->player);
+	jd->player = NULL;
+}
+
+static gboolean
+lj_dbus_players_find(JamDBus *jd, GError **error) {
+	DBusGProxy *proxy;
+	gchar **names, **p;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+	if (!dbus_g_proxy_call(proxy, "ListNames", error, G_TYPE_INVALID,
+						   G_TYPE_STRV, &names, G_TYPE_INVALID)) {
+		return FALSE;
+	}
+
+	for (p = names; *p; p++) {
+		if (g_str_has_prefix(*p, "org.mpris.")) {
+			lj_dbus_append_player(jd, *p);
+		}
+	}
+
+	g_strfreev(names);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+gboolean
+lj_dbus_mpris_update_list(JamDBus *jd, GError **error) {
+	if (jd == NULL)
+		return FALSE;
+	lj_dbus_players_clear(jd);
+	return lj_dbus_players_find(jd, error);
+}
+
+#define DBUS_TYPE_MPRIS_STATUS \
+	(dbus_g_type_get_struct("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE \
+	(dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+
+/* TODO: Connect to status change signal */
+
+gboolean
+lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error) {
+	GValueArray *array = NULL;
+	GHashTable *info = NULL;
+	GValue *value;
+	MediaPlayer *player;
+
+	if (jd == NULL)
+		return FALSE;
+
+	if (list == NULL)
+		return FALSE;
+
+	if ((player = (MediaPlayer *) list->data) == NULL)
+		return FALSE;
+
+	memset((void *) &player->info, 0, sizeof(MetaInfo));
+
+	if (player->hint & MPRIS_HINT_BAD_STATUS) {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   G_TYPE_INT, &player->info.status, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+	} else {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   DBUS_TYPE_MPRIS_STATUS, &array, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+
+		value = g_value_array_get_nth(array, 0);
+		player->info.status = g_value_get_int(value);
+		g_value_array_free(array);
+	}
+
+	if (player->info.status == MPRIS_STATUS_PLAYING) {
+		if (!dbus_g_proxy_call(player->proxy, "GetMetadata", error, G_TYPE_INVALID,
+							   DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &info, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+		value = (GValue *) g_hash_table_lookup(info, "artist");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.artist, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "album");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.album, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "title");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.title, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+	}
+
+	return TRUE;
+}
+
+GQuark
+lj_dbus_error_quark(void) {
+	static GQuark quark = 0;
+	if (quark == 0)
+		quark = g_quark_from_static_string("dbus-error-quark");
+	return quark;
+}
+
+/* TODO: User defined format */
+
+gchar *
+lj_dbus_mpris_current_music(JamDBus *jd, GError **error) {
+	gchar *music;
+	GList *list;
+
+	if (!lj_dbus_mpris_update_list(jd, error))
+		return NULL;
+
+	list = jd ? jd->player : NULL;
+
+	if (lj_dbus_mpris_update_info(jd, list, error)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		if (player->info.status == MPRIS_STATUS_PLAYING) {
+			music = g_strdup_printf("%s - %s - %s",
+						player->info.artist[0] ? player->info.artist : _("Unknown Artist"),
+						player->info.album[0] ? player->info.album: _("Unknown Album"),
+						player->info.title[0] ? player->info.title: _("Unknown Track"));
+			return music;
+		} else {
+			g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NOT_PLAYING,
+				_("Player is stopped."));
+		}
+	} else if (error == NULL || *error == NULL) {
+		g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NO_PLAYER,
+			_("No players found."));
+	}
+	return NULL;
+}
+
+/* lj_dbus.c */
+
diff -up logjam-4.5.3/src/lj_dbus.h.dbus logjam-4.5.3/src/lj_dbus.h
--- logjam-4.5.3/src/lj_dbus.h.dbus	2009-04-25 13:40:36.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.h	2009-04-25 14:25:27.000000000 +0300
@@ -0,0 +1,68 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef lj_dbus_h
+#define lj_dbus_h
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+/* Take care about i18n strings */
+#ifndef _
+#ifdef GETTEXT_PACKAGE
+#include <glib/gi18n-lib.h>
+#else
+#define _(x)	x
+#endif
+#endif		/* _ */
+
+#define MPRIS_INFO_LEN	128
+
+typedef struct _MetaInfo MetaInfo;
+struct _MetaInfo {
+	gchar artist[MPRIS_INFO_LEN];
+	gchar album[MPRIS_INFO_LEN];
+	gchar title[MPRIS_INFO_LEN];
+
+#define	MPRIS_STATUS_PLAYING	0
+#define	MPRIS_STATUS_PAUSED		1
+#define	MPRIS_STATUS_STOPPED	2
+
+	gint status;
+};
+
+typedef struct _MediaPlayer MediaPlayer;
+struct _MediaPlayer {
+	gchar *name;
+	gchar *dest;
+	DBusGProxy *proxy;
+	MetaInfo info;
+
+#define MPRIS_HINT_BAD_STATUS	1 << 0
+
+	gint hint;
+};
+
+typedef struct _JamDBus JamDBus;
+struct _JamDBus {
+	DBusGConnection *bus;
+	GList *player;
+};
+
+void lj_dbus_close(JamDBus *jd);
+JamDBus *lj_dbus_new(void);
+
+gboolean lj_dbus_mpris_update_list(JamDBus *jd, GError **error);
+gboolean lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error);
+
+#define MPRIS_ERROR_NOT_PLAYING		1
+#define MPRIS_ERROR_NO_PLAYER		2
+
+gchar *lj_dbus_mpris_current_music(JamDBus *jd, GError **error);
+
+#endif /* lj_dbus_h */
+
diff -up logjam-4.5.3/src/Makefile.am.dbus logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.dbus	2009-04-23 00:44:11.000000000 +0300
+++ logjam-4.5.3/src/Makefile.am	2009-04-24 15:59:08.000000000 +0300
@@ -3,7 +3,7 @@ bin_PROGRAMS = logjam
 localedir=$(datadir)/locale
 
 # AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/protocol/blogger -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@ @DBUSAPI_CFLAGS@
 
 ACCOUNT = account.h account.c host.c livejournal.c
 # blogger.c
@@ -50,6 +50,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           settings.c settings.h $(GROUPEDBOX) tie.c tie.h \
           $(HISTORY) $(OFFLINE) \
           jam.c jam.h $(USEJOURNAL) \
+          lj_dbus.c lj_dbus.h \
           security.c security.h about.c thanks.h \
           menu.c menu.h $(TOOLS) smartquotes.c smartquotes.h \
           $(LOGIN) manager.c \
@@ -116,7 +117,7 @@ logjam_SOURCES += journalstore-xml.c
 endif
 
 # logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la $(top_builddir)/protocol/blogger/libblogger.la @LOGJAM_LIBS@ @NETWORK_LIBS@
-logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@
+logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@ @DBUSAPI_LIBS@
 
 ctags:
 	@version=`ctags --version | head -1`; \
diff -up logjam-4.5.3/src/music.c.dbus logjam-4.5.3/src/music.c
--- logjam-4.5.3/src/music.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/music.c	2009-04-25 01:11:29.000000000 +0300
@@ -9,8 +9,11 @@
 #include "gtk-all.h"
 
 #include "conf.h"
+#include "lj_dbus.h"
 #include "music.h"
 
+JamDBus *jdbus = NULL;
+
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
diff -up logjam-4.5.3/src/music.h.dbus logjam-4.5.3/src/music.h
--- logjam-4.5.3/src/music.h.dbus	2005-02-21 20:30:27.000000000 +0200
+++ logjam-4.5.3/src/music.h	2009-04-25 01:05:55.000000000 +0300
@@ -8,6 +8,9 @@
 #define music_h
 
 #include "conf.h" /* CommandList */
+#include "lj_dbus.h"
+
+extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
diff -up logjam-4.5.3/src/settings.c.dbus logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.dbus	2009-04-25 13:41:03.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2009-04-25 15:19:42.000000000 +0300
@@ -24,6 +24,7 @@
 #include "tie.h"
 #include "account.h"
 #include "jamview.h"
+#include "lj_dbus.h"
 
 /* what's this?  all of these funny structures in the settings box?
  * well, instead of creating and tearing down all of these widgets, i
@@ -101,6 +102,8 @@ static SettingsWidget settingswidgets[] 
 
 	{ "music_command", &conf.music_command,
 		SW_COMMAND, N_("Detect music from:"), (gpointer)music_commands },
+	{ "music_mpris", &conf.music_mpris,
+		SW_TOGGLE, N_("Detect music via MPRIS") },
 
 	{ "net_useproxy", &conf.options.useproxy, 
 		SW_TOGGLE, N_("Use _proxy server") },
@@ -169,6 +172,19 @@ toggle_tie_enable(GtkWidget *toggle, Gtk
 }
 
 static void
+toggle_disable_cb(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+}
+static void
+toggle_tie_disable(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+	g_signal_connect(G_OBJECT(toggle), "toggled",
+			G_CALLBACK(toggle_disable_cb), target);
+}
+
+static void
 toggle_tie(SettingsWidget *sw) {
 	tie_toggle(GTK_TOGGLE_BUTTON(sw->widget), (gboolean*)sw->conf);
 }
@@ -499,16 +515,21 @@ static void
 music_diagnose(GtkWidget *button) {
 	GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(button));
 	GError *err = NULL;
-	char *music, *result;
-	MusicSource source = music_current_source();
+	char *music = NULL, *result;
+	MusicSource source = MUSIC_SOURCE_NONE;
 
-	if (!music_can_detect(&err)) {
-		jam_warning(dlg, "%s", err->message);
-		g_error_free(err);
-		return;
+	if (conf.music_mpris) {
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	} else {
+		source = music_current_source();
+		if (!music_can_detect(&err)) {
+			jam_warning(dlg, "%s", err->message);
+			g_error_free(err);
+			return;
+		}
+		music = music_detect(&err);
 	}
 
-	music = music_detect(&err);
 	if (!music) {
 		if (source == MUSIC_SOURCE_XMMS &&
 				err->domain == G_SPAWN_ERROR && err->code == G_SPAWN_ERROR_NOENT) {
@@ -555,21 +576,40 @@ proxysettings(void) {
 	return group;
 }
 
+static void
+mpris_update_cb(GtkToggleButton *button, JamDBus *jd) {
+	GError *error = NULL;
+	if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+		GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+		jam_warning(dlg, _("Error detecting music: %s"), error->message);
+		g_error_free(error);
+	}
+}
+
 static GtkWidget*
 programsettings(JamWin *jw) {
 	GtkWidget *group;
-	GtkWidget *button, *hbox;
+	GtkWidget *button, *vbox, *hbox;
 	SettingsWidget *sw;
 	JamView *jv = jam_win_get_cur_view(jw);
 	
 	group = groupedbox_new_with_text(_("Programs"));
 	groupedbox_pack(GROUPEDBOX(group), sw_make("web_spawn"), FALSE);
 
-	groupedbox_pack(GROUPEDBOX(group), sw_make("music_command"), FALSE);
+	vbox = sw_make("music_command");
+	groupedbox_pack(GROUPEDBOX(group), vbox, FALSE);
 	sw = sw_lookup("music_command");
 	g_signal_connect_swapped(G_OBJECT(sw->widget), "changed",
 			G_CALLBACK(jam_view_settings_changed), jv);
 
+	button = sw_make("music_mpris");
+	groupedbox_pack(GROUPEDBOX(group), button, FALSE);
+	g_signal_connect(G_OBJECT(button), "toggled",
+			G_CALLBACK(mpris_update_cb), jdbus);
+	toggle_tie_disable(button, vbox);
+	g_signal_connect_swapped(G_OBJECT(button), "toggled",
+			G_CALLBACK(jam_view_settings_changed), jv);
+
 	button = gtk_button_new_with_mnemonic(_("_Diagnose"));
 	g_signal_connect(G_OBJECT(button), "clicked",
 			G_CALLBACK(music_diagnose), NULL);

logjam-4.5.3-save-tags.diff:

--- NEW FILE logjam-4.5.3-save-tags.diff ---
diff -up logjam-4.5.3/src/jamview.c.save logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.save	2009-04-26 10:26:39.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-26 10:28:00.000000000 +0300
@@ -418,7 +424,8 @@ tags_select_cb(JamView *view) {
 
   tags = tags_dialog(toplevel,
 		     JAM_ACCOUNT_LJ(view->account), 
-		     jam_doc_get_usejournal(view->doc));
+		     jam_doc_get_usejournal(view->doc),
+		     (gchar *) gtk_entry_get_text(GTK_ENTRY(view->tags)));
 
   if (tags) {
       gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
diff -up logjam-4.5.3/src/tags.c.save logjam-4.5.3/src/tags.c
--- logjam-4.5.3/src/tags.c.save	2009-04-26 10:05:38.000000000 +0300
+++ logjam-4.5.3/src/tags.c	2009-04-26 15:15:13.000000000 +0300
@@ -78,8 +78,23 @@ create_tag_string (GtkTreeModel *model,
   return FALSE;
 }
 
+static void
+tags_set_fg(GtkTreeViewColumn *column, GtkCellRenderer *cell,
+	    GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+  GSList *prev = (GSList *) data;
+  gchar *text;
+
+  gtk_tree_model_get(model, iter, 1, &text, -1);
+  if (prev && g_slist_find_custom(prev, text, g_utf8_collate))
+    g_object_set(G_OBJECT(cell), "foreground", "Red", NULL);
+  else
+    g_object_set(G_OBJECT(cell), "foreground", "Black", NULL);
+  g_free(text);
+}
+
 GtkWidget* 
-taglist_create (GSList *l)
+taglist_create (GSList *l, GSList **head)
 {
   GtkWidget *treeview;
   GtkListStore *store;
@@ -87,20 +102,37 @@ taglist_create (GSList *l)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   guint i;
+  GSList *prev = *head, *p;
 
   /* create model */
   store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
   for (i = 0; i < g_slist_length (l); i++)
     {
       LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+      gboolean check = FALSE;
 
+      if (prev && (p = g_slist_find_custom(prev, t->tag, g_utf8_collate)) != NULL) {
+        check = TRUE;
+        prev = g_slist_remove_link(prev, p);
+        g_free(p->data);
+        g_slist_free1(p);
+      }
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  0, FALSE,
+			  0, check,
 			  1, t->tag,
 			  -1);
     }
 
+  /* rest of the typed tags */
+  for (p = prev; p; p = g_slist_next(p)) {
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter,
+      		  0, TRUE,
+      		  1, p->data,
+      		  -1);
+  }
+
   /* create treeview */
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
@@ -120,20 +152,44 @@ taglist_create (GSList *l)
   column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
 						     renderer, "text", 1,
 						     NULL);
+
+  gtk_tree_view_column_set_cell_data_func(column, renderer, tags_set_fg,
+					  prev, NULL);
+
   gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (treeview, column);
  
+  /* update head of the prev list */
+  *head = prev;
   g_object_unref (store);
 
   return treeview;
 }
 
+static GSList *
+tags_split(gchar *typed) {
+  GSList *head = NULL;
+  gchar **result, **p;
+
+  if (typed == NULL || *typed == '\0')
+    return NULL;
+
+  for (p = result = g_strsplit(typed, ",", 0); *p; p++) {
+    gchar *token = g_strstrip(*p);
+    if (*token)
+      head = g_slist_prepend(head, g_utf8_strdown(token, -1));
+  }
+  g_strfreev(result);
+  return head;
+}
+
 gchar* 
-tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed)
 {
   GtkWidget *dlg, *sw, *tv;
   GSList *list = NULL;
   gchar *taglist = NULL;
+  GSList *prev;
 
   if (acc == NULL) return NULL;
 
@@ -156,7 +212,8 @@ tags_dialog (GtkWidget *win, JamAccountL
 				  GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
 
-  tv = taglist_create (list);
+  prev = tags_split(typed);
+  tv = taglist_create (list, &prev);
   gtk_container_add (GTK_CONTAINER (sw), tv);
 
   gtk_window_resize(dlg, 60, 210);
@@ -177,5 +234,14 @@ tags_dialog (GtkWidget *win, JamAccountL
 
   gtk_widget_destroy (dlg);
   
+  /* free rest of prev list */
+  if (prev) {
+    GSList *p;
+    for (p = prev; p; p = g_slist_next(p)) {
+      g_free(p->data);
+    }
+    g_slist_free(prev);
+  }
+
   return taglist;
 }
diff -up logjam-4.5.3/src/tags.h.save logjam-4.5.3/src/tags.h
--- logjam-4.5.3/src/tags.h.save	2009-04-26 10:22:25.000000000 +0300
+++ logjam-4.5.3/src/tags.h	2009-04-26 10:22:03.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef _TAGS_H_
 #define _TAGS_H_
 
-gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed);
 
 #endif /* _TAGS_H_ */


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- logjam.spec	25 Feb 2009 20:52:45 -0000	1.50
+++ logjam.spec	27 Apr 2009 17:27:19 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	27%{?dist}
+Release:	29%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -17,6 +17,7 @@
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	dbus-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch2:		logjam-4.4.1-backdated.patch
@@ -40,6 +41,10 @@
 Patch20:	logjam-4.5.3-imageresize.patch
 Patch21:	logjam-4.5.3-showloginhistory.patch
 Patch22:	logjam-4.5.3-libtool.patch
+Patch23:	logjam-4.5.3-keep-drafts.patch
+Patch24:	logjam-4.5.3-lj-embed.patch
+Patch25:	logjam-4.5.3-mpris.diff
+Patch26:	logjam-4.5.3-save-tags.diff
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -79,6 +84,10 @@
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
 %patch22 -p1 -b .libtool
+%patch23 -p1 -b .keep_drafts
+%patch24 -p1 -b .lj-embed
+%patch25 -p1 -b .mpris
+%patch26 -p1 -b .save-tags
 
 libtoolize
 rm -rf aclocal.m4
@@ -128,6 +137,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
+- add support for lj-embed tags
+- add support for MPRIS music detection (Andy Shevchenko)
+- improve tag handling (Andy Shevchenko)
+
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-28
+- add patch to enable "keep drafts" functionality
+  see: http://community.livejournal.com/logjam_dev/37274.html
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cwickert at fedoraproject.org  Mon Apr 27 17:36:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 17:36:55 +0000 (UTC)
Subject: rpms/lxsession-lite/devel
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch, NONE,
	1.1 lxsession-lite-0.3.6-new-gdm.patch, NONE,
	1.1 lxsession-lite.spec, 1.2, 1.3
Message-ID: <20090427173655.85BCB70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23886

Modified Files:
	lxsession-lite.spec 
Added Files:
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch 
	lxsession-lite-0.3.6-new-gdm.patch 
Log Message:
* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
- Support user switching also with newer gdm
- Add patch to fix icon search path (Marty Jack)


lxsession-lite-0.3.6-icon_search_path_fix-1.patch:

--- NEW FILE lxsession-lite-0.3.6-icon_search_path_fix-1.patch ---
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/main.c lxsession-lite-0.3.6/lxsession-logout/main.c
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2009-04-20 15:03:34.000000000 -0400
@@ -350,7 +350,7 @@
     back = create_background();
 
     gtk_icon_theme_append_search_path( gtk_icon_theme_get_default(),
-                                            PACKAGE_DATA_DIR "/images" );
+                                            PACKAGE_DATA_DIR "/lxsession/images" );
 
     dlg = gtk_dialog_new_with_buttons( _("Logout"), (GtkWindow*)back, GTK_DIALOG_MODAL,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL );
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am lxsession-lite-0.3.6/lxsession-logout/Makefile.am
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.am	2009-04-20 15:05:25.000000000 -0400
@@ -2,7 +2,7 @@
 
 lxsession_logout_CFLAGS =  $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in lxsession-lite-0.3.6/lxsession-logout/Makefile.in
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in	2008-06-08 12:58:13.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.in	2009-04-20 15:04:53.000000000 -0400
@@ -200,7 +200,7 @@
 top_srcdir = @top_srcdir@
 lxsession_logout_CFLAGS = $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 lxsession_logout_SOURCES = \

 	  	 

lxsession-lite-0.3.6-new-gdm.patch:

--- NEW FILE lxsession-lite-0.3.6-new-gdm.patch ---
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 18:47:19.000000000 +0200
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2008-11-01 06:19:05.000000000 +0100
@@ -435,6 +435,7 @@
 
     /* If GDM is running */
     if( g_file_test("/var/run/gdm_socket", G_FILE_TEST_EXISTS)
+        || g_file_test("/var/run/gdm.pid", G_FILE_TEST_EXISTS)
         || g_file_test("/tmp/.gdm_socket", G_FILE_TEST_EXISTS) )
     {
         btn = create_dlg_btn(_("S_witch User"), "gnome-session-switch", LOGOUT_ACTION_SWITCH_USER );


Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/devel/lxsession-lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lxsession-lite.spec	25 Feb 2009 22:22:04 -0000	1.2
+++ lxsession-lite.spec	27 Apr 2009 17:36:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lxsession-lite
 Version:        0.3.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -8,11 +8,13 @@
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
+Patch1:         lxsession-lite-0.3.6-new-gdm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel > 2.6 libICE-devel libSM-devel dbus-glib-devel
 BuildRequires:  docbook-utils intltool gettext-devel
-Requires:       dbus
+Requires:       hal
 Obsoletes:      lxsession <= 0.3.2-2
 Provides:       lxsession = %{version}-%{release}
 
@@ -32,14 +34,15 @@
 Sitzungen zu speichern.
 
 LXSession Lite ist von XSM abgeleitet und wird als Sitzungsverwalter von LXDE,
-der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Auch wenn er Teil von 
-von LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
+der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Obwohl er Teil von 
+LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
 Abh??ngigkeiten.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .icon-path
+%patch1 -p1 -b .new-gdm
 
 %build
 %configure
@@ -67,6 +70,10 @@
 %dir %{_sysconfdir}/xdg/lxsession
 
 %changelog
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
+- Support user switching also with newer gdm
+- Add patch to fix icon search path (Marty Jack)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jkratoch at fedoraproject.org  Mon Apr 27 17:38:55 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 27 Apr 2009 17:38:55 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.347,1.348
Message-ID: <20090427173855.7990570110@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24239

Modified Files:
	gdb.spec 
Log Message:
* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-24
- Another new Koji build fix attempt now by: BuildPreReq: python



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- gdb.spec	27 Apr 2009 16:32:08 -0000	1.347
+++ gdb.spec	27 Apr 2009 17:38:25 -0000	1.348
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 23%{?_with_upstream:.upstream}%{?dist}
+Release: 24%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -390,7 +390,8 @@
 BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
-BuildRequires: python python-devel
+BuildPreReq: python
+BuildRequires: python-devel
 # Temporarily before it gets moved to libstdc++.rpm
 BuildRequires: libstdc++
 
@@ -861,6 +862,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-24
+- Another new Koji build fix attempt now by: BuildPreReq: python
+
 * Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-23
 - Fix BuildRequires for new Koji.
 



From spot at fedoraproject.org  Mon Apr 27 17:41:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:41:52 +0000 (UTC)
Subject: rpms/banshee/F-10 banshee-1.4.3-coverart_query.patch, NONE,
	1.1 banshee-1.4.3-podcast_download.patch, NONE, 1.1 banshee.spec,
	1.68, 1.69
Message-ID: <20090427174152.9CBC170110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/banshee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24646

Modified Files:
	banshee.spec 
Added Files:
	banshee-1.4.3-coverart_query.patch 
	banshee-1.4.3-podcast_download.patch 
Log Message:
apply patches for fixes covered in F-11, rawhide

banshee-1.4.3-coverart_query.patch:

--- NEW FILE banshee-1.4.3-coverart_query.patch ---
# https://bugzilla.redhat.com/show_bug.cgi?id=492707
Index: src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
===================================================================
--- src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(revision 4857)
+++ src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(working copy)
@@ -58,10 +58,12 @@
 
         private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
             SELECT count(DISTINCT CoreTracks.AlbumID)
-            FROM CoreTracks
+            FROM CoreTracks, CoreArtists, CoreAlbums
             WHERE
                 CoreTracks.PrimarySourceID = ? AND
                 CoreTracks.DateUpdatedStamp > ? AND
+                CoreTracks.AlbumID = CoreAlbums.AlbumID AND 
+                CoreAlbums.ArtistID = CoreArtists.ArtistID AND
                 CoreTracks.AlbumID NOT IN (
                     SELECT AlbumID FROM CoverArtDownloads WHERE
                         LastAttempt > ? OR Downloaded = 1)");

banshee-1.4.3-podcast_download.patch:

--- NEW FILE banshee-1.4.3-podcast_download.patch ---
# http://bugzilla.gnome.org/show_bug.cgi?id=536047
Index: src/Libraries/Migo/Migo.Net/AsyncWebClient.cs
===================================================================
--- src/Libraries/Migo/Migo.Net/AsyncWebClient.cs	(revision 5091)
+++ src/Libraries/Migo/Migo.Net/AsyncWebClient.cs	(working copy)
@@ -687,22 +687,20 @@
             
             while (nread != 0)
             {        
-                try {
-                    readTimeoutHandle.Reset ();
-                    
-                    // <hack> 
-                    // Yeah, Yeah, Yeah, I'll change this later, 
-                    // it's here to get around abort issues.
-                    
-                    ar = st.BeginRead (buffer, offset, length, null, null);
-                    nread = st.EndRead (ar);
-                    
-                    // need an auxiliary downloader class to replace this. 
-                    // </hack>
-                    
-                    readTimeoutHandle.Set ();
-                } catch { return; }
+                readTimeoutHandle.Reset ();
                 
+                // <hack> 
+                // Yeah, Yeah, Yeah, I'll change this later, 
+                // it's here to get around abort issues.
+                
+                ar = st.BeginRead (buffer, offset, length, null, null);
+                nread = st.EndRead (ar);
+                
+                // need an auxiliary downloader class to replace this. 
+                // </hack>
+                
+                readTimeoutHandle.Set ();
+                
                 if (writeToStream) {
                     dest.Write (buffer, 0, nread);
                 } else {
Index: src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs
===================================================================
--- src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs	(revision 5091)
+++ src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs	(working copy)
@@ -419,7 +419,7 @@
 	            
                 try {                        
                     if (e.Error != null) {
-                        //Console.WriteLine ("DT {1} Error:  {0}", e.Error, this.Name);
+                        Hyena.Log.WarningFormat ("HttpDownloadTask {1} Error:  {0}", e.Error, this.Name);
                         WebException we = e.Error as WebException;
                         
                         if (we != null) {


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/banshee.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- banshee.spec	3 Mar 2009 03:26:46 -0000	1.68
+++ banshee.spec	27 Apr 2009 17:41:22 -0000	1.69
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.2
-Release: 3%{?dist}.1
+Release: 4%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -10,6 +10,8 @@
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Patch0:  banshee-1-1.4.2-podcast.patch
+Patch1:  banshee-1.4.3-podcast_download.patch
+Patch2:  banshee-1.4.3-coverart_query.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -112,6 +114,10 @@
 %prep
 %setup -q -n %{name}-1-%{version}
 %patch0 -p0 -b .podcast
+# This only improves error handling for downloads
+%patch1 -p0 -b .patch
+# This fixes the 100% CPU usage bug while fetching cover art
+%patch2 -p0 -b .coverart
 cp -p %{SOURCE1} .
 
 %build
@@ -197,6 +203,10 @@
 
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.2-4
+- add patch to fix rh#492707 - Banshee use 100% when fetching cover art
+- add patch for gnomebz #536047
+
 * Mon Mar  2 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-3.1
 - Rebuild for new mono-zeroconf
 



From spot at fedoraproject.org  Mon Apr 27 17:49:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:49:17 +0000 (UTC)
Subject: rpms/logjam/F-10 logjam-4.5.3-libtool.patch, NONE, 1.1 logjam.spec, 
	1.49, 1.50
Message-ID: <20090427174918.00B2C70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464/F-10

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-libtool.patch 
Log Message:
rebuild with all patches in place

logjam-4.5.3-libtool.patch:

--- NEW FILE logjam-4.5.3-libtool.patch ---
diff -up logjam-4.5.3/configure.in.libtool logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.libtool	2009-02-16 12:03:43.000000000 -0500
+++ logjam-4.5.3/configure.in	2009-02-16 12:04:00.000000000 -0500
@@ -1,5 +1,6 @@
 AC_PREREQ(2.52)
 AC_INIT(logjam, 4.5.3, evan at livejournal.com)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/jam.c)
diff -up logjam-4.5.3/Makefile.am.libtool logjam-4.5.3/Makefile.am
--- logjam-4.5.3/Makefile.am.libtool	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/Makefile.am	2009-02-16 12:03:44.000000000 -0500
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 if WITH_GTK
 MAYBE_IMAGES = images


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- logjam.spec	27 Apr 2009 17:27:18 -0000	1.49
+++ logjam.spec	27 Apr 2009 17:48:47 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	29%{?dist}
+Release:	30%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -137,6 +137,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
+- rebuild with all patches in place
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
 - add support for lj-embed tags
 - add support for MPRIS music detection (Andy Shevchenko)



From spot at fedoraproject.org  Mon Apr 27 17:49:18 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:49:18 +0000 (UTC)
Subject: rpms/logjam/F-11 logjam.spec,1.51,1.52
Message-ID: <20090427174918.1240F70129@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464/F-11

Modified Files:
	logjam.spec 
Log Message:
rebuild with all patches in place


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-11/logjam.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- logjam.spec	27 Apr 2009 17:27:19 -0000	1.51
+++ logjam.spec	27 Apr 2009 17:48:47 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	29%{?dist}
+Release:	30%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -137,6 +137,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
+- rebuild with all patches in place
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
 - add support for lj-embed tags
 - add support for MPRIS music detection (Andy Shevchenko)



From spot at fedoraproject.org  Mon Apr 27 17:49:18 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:49:18 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam-4.5.3-libtool.patch, NONE, 1.1 logjam.spec, 
	1.49, 1.50
Message-ID: <20090427174918.59B6870110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464/F-9

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-libtool.patch 
Log Message:
rebuild with all patches in place

logjam-4.5.3-libtool.patch:

--- NEW FILE logjam-4.5.3-libtool.patch ---
diff -up logjam-4.5.3/configure.in.libtool logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.libtool	2009-02-16 12:03:43.000000000 -0500
+++ logjam-4.5.3/configure.in	2009-02-16 12:04:00.000000000 -0500
@@ -1,5 +1,6 @@
 AC_PREREQ(2.52)
 AC_INIT(logjam, 4.5.3, evan at livejournal.com)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/jam.c)
diff -up logjam-4.5.3/Makefile.am.libtool logjam-4.5.3/Makefile.am
--- logjam-4.5.3/Makefile.am.libtool	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/Makefile.am	2009-02-16 12:03:44.000000000 -0500
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 if WITH_GTK
 MAYBE_IMAGES = images


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- logjam.spec	27 Apr 2009 17:27:19 -0000	1.49
+++ logjam.spec	27 Apr 2009 17:48:48 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	29%{?dist}
+Release:	30%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -137,6 +137,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
+- rebuild with all patches in place
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
 - add support for lj-embed tags
 - add support for MPRIS music detection (Andy Shevchenko)



From spot at fedoraproject.org  Mon Apr 27 17:49:18 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 17:49:18 +0000 (UTC)
Subject: rpms/logjam/devel logjam-4.5.3-keep-drafts.patch, NONE,
	1.1 logjam.spec, 1.51, 1.52
Message-ID: <20090427174918.9850570110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464/devel

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-keep-drafts.patch 
Log Message:
rebuild with all patches in place

logjam-4.5.3-keep-drafts.patch:

--- NEW FILE logjam-4.5.3-keep-drafts.patch ---
diff -up logjam-4.5.3/src/conf.h.keep_drafts logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2009-04-02 13:08:45.000000000 -0400
@@ -62,6 +62,7 @@ typedef struct {
 	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
+	gboolean keepsaveddrafts;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/conf_xml.c.keep_drafts logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2009-04-02 13:08:15.000000000 -0400
@@ -181,6 +181,7 @@ parseoptions(Configuration *c, xmlDocPtr
 #endif
 		READOPTION(revertusejournal)
 		READOPTION(autosave)
+		READOPTION(keepsaveddrafts)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(close_when_send)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 #endif
 	WRITEOPTION(revertusejournal);
 	WRITEOPTION(autosave);
+	WRITEOPTION(keepsaveddrafts);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(close_when_send);
diff -up logjam-4.5.3/src/jam.c.keep_drafts logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2009-04-02 13:06:49.000000000 -0400
@@ -340,7 +340,7 @@ jam_submit_entry(JamWin *jw) {
 	ctx = net_ctx_gtk_new(GTK_WINDOW(jw), NULL);
 	if (jam_host_do_post(jam_account_get_host(acc), ctx, jw->doc, NULL)) {
 		gint type = jam_doc_get_entry_type(jw->doc);
-		if (type == ENTRY_DRAFT) {
+		if (type == ENTRY_DRAFT && !conf.options.keepsaveddrafts) {
 			if (jam_confirm(GTK_WINDOW(jw),
 					_("Delete"), _("Delete this draft from disk?")))
 				delete_draft(jw);
diff -up logjam-4.5.3/src/settings.c.keep_drafts logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2009-04-02 13:06:49.000000000 -0400
@@ -74,6 +74,10 @@ static SettingsWidget settingswidgets[] 
 
 	{ "ui_allowmultipleinstances", &conf.options.allowmultipleinstances,
 		SW_TOGGLE, N_("Allow multiple _instances of LogJam to run simultaneously") },
+	
+	{ "ui_keepsaveddrafts", &conf.options.keepsaveddrafts, 
+		SW_TOGGLE, N_("_Keep saved drafts after posting") },
+	
 #ifdef HAVE_GTKSPELL
 	{ "ui_spellcheck", &conf.options.usespellcheck, 
 		SW_TOGGLE, N_("_Use spell check") },
@@ -409,6 +413,8 @@ uisettings(JamWin *jw) {
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_autosave"), FALSE);
+	
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_keepsaveddrafts"), FALSE);
 
 #ifdef HAVE_GTKSPELL
 	{


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- logjam.spec	27 Apr 2009 17:27:19 -0000	1.51
+++ logjam.spec	27 Apr 2009 17:48:48 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	29%{?dist}
+Release:	30%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -137,6 +137,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
+- rebuild with all patches in place
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
 - add support for lj-embed tags
 - add support for MPRIS music detection (Andy Shevchenko)



From llaumgui at fedoraproject.org  Mon Apr 27 17:50:43 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 17:50:43 +0000 (UTC)
Subject: rpms/php-ezc-Database/devel import.log, NONE,
	1.1 php-ezc-Database.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427175043.E844670110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Database/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26156/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Database.spec 
Log Message:
Initial import branch F12



--- NEW FILE import.log ---
php-ezc-Database-1_4_4-1_fc10:HEAD:php-ezc-Database-1.4.4-1.fc10.src.rpm:1240854580


--- NEW FILE php-ezc-Database.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Database
%define channel components.ez.no

Name:           php-ezc-Database
Version:        1.4.4
Release:        1%{?dist}
Summary:        A lightweight database layer on top of PHP's PDO

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pdo
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A lightweight database layer on top of PHP's PDO that allows you to utilize
a database without having to take care of differences in SQL dialects.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/db_autoload.php
%{pear_phpdir}/ezc/autoload/query_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.4-1
- Update to 1.4.4

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:14:21 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:50:13 -0000	1.2
@@ -0,0 +1 @@
+Database-1.4.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:14:21 -0000	1.1
+++ sources	27 Apr 2009 17:50:13 -0000	1.2
@@ -0,0 +1 @@
+b48377b4153f49da304337a7e768bf38  Database-1.4.4.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 17:50:55 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 17:50:55 +0000 (UTC)
Subject: rpms/php-ezc-Database/F-9 import.log, NONE,
	1.1 php-ezc-Database.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427175055.6F45670110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Database/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26179/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Database.spec 
Log Message:
Initial import branch F-9



--- NEW FILE import.log ---
php-ezc-Database-1_4_4-1_fc10:F-9:php-ezc-Database-1.4.4-1.fc10.src.rpm:1240854584


--- NEW FILE php-ezc-Database.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Database
%define channel components.ez.no

Name:           php-ezc-Database
Version:        1.4.4
Release:        1%{?dist}
Summary:        A lightweight database layer on top of PHP's PDO

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pdo
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A lightweight database layer on top of PHP's PDO that allows you to utilize
a database without having to take care of differences in SQL dialects.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/db_autoload.php
%{pear_phpdir}/ezc/autoload/query_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.4-1
- Update to 1.4.4

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:14:21 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:50:25 -0000	1.2
@@ -0,0 +1 @@
+Database-1.4.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:14:21 -0000	1.1
+++ sources	27 Apr 2009 17:50:25 -0000	1.2
@@ -0,0 +1 @@
+b48377b4153f49da304337a7e768bf38  Database-1.4.4.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 17:51:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 17:51:41 +0000 (UTC)
Subject: rpms/php-ezc-Database/F-10 import.log, NONE,
	1.1 php-ezc-Database.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427175141.26C7E70110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Database/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26482/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Database.spec 
Log Message:
Initial import branch F10



--- NEW FILE import.log ---
php-ezc-Database-1_4_4-1_fc10:F-10:php-ezc-Database-1.4.4-1.fc10.src.rpm:1240854598


--- NEW FILE php-ezc-Database.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Database
%define channel components.ez.no

Name:           php-ezc-Database
Version:        1.4.4
Release:        1%{?dist}
Summary:        A lightweight database layer on top of PHP's PDO

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pdo
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A lightweight database layer on top of PHP's PDO that allows you to utilize
a database without having to take care of differences in SQL dialects.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/db_autoload.php
%{pear_phpdir}/ezc/autoload/query_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.4-1
- Update to 1.4.4

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:14:21 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:51:10 -0000	1.2
@@ -0,0 +1 @@
+Database-1.4.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:14:21 -0000	1.1
+++ sources	27 Apr 2009 17:51:10 -0000	1.2
@@ -0,0 +1 @@
+b48377b4153f49da304337a7e768bf38  Database-1.4.4.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 17:51:46 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 17:51:46 +0000 (UTC)
Subject: rpms/php-ezc-Database/F-11 import.log, NONE,
	1.1 php-ezc-Database.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427175146.CEC8270110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Database/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26628/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Database.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
php-ezc-Database-1_4_4-1_fc10:F-11:php-ezc-Database-1.4.4-1.fc10.src.rpm:1240854608


--- NEW FILE php-ezc-Database.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Database
%define channel components.ez.no

Name:           php-ezc-Database
Version:        1.4.4
Release:        1%{?dist}
Summary:        A lightweight database layer on top of PHP's PDO

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pdo
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A lightweight database layer on top of PHP's PDO that allows you to utilize
a database without having to take care of differences in SQL dialects.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/db_autoload.php
%{pear_phpdir}/ezc/autoload/query_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.4-1
- Update to 1.4.4

* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:14:21 -0000	1.1
+++ .cvsignore	27 Apr 2009 17:51:16 -0000	1.2
@@ -0,0 +1 @@
+Database-1.4.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Database/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:14:21 -0000	1.1
+++ sources	27 Apr 2009 17:51:16 -0000	1.2
@@ -0,0 +1 @@
+b48377b4153f49da304337a7e768bf38  Database-1.4.4.tgz



From limb at fedoraproject.org  Mon Apr 27 17:54:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 27 Apr 2009 17:54:22 +0000 (UTC)
Subject: rpms/bacula/devel .cvsignore, 1.7, 1.8 bacula.spec, 1.24,
	1.25 sources, 1.6, 1.7
Message-ID: <20090427175422.B8BF270110@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27588

Modified Files:
	.cvsignore bacula.spec sources 
Log Message:
3.0.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jan 2009 14:27:16 -0000	1.7
+++ .cvsignore	27 Apr 2009 17:53:52 -0000	1.8
@@ -1,2 +1,2 @@
-bacula-2.4.4.tar.gz
-bacula-docs-2.4.4.tar.bz2
+bacula-3.0.0.tar.gz
+bacula-docs-3.0.0.tar.bz2


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bacula.spec	24 Feb 2009 03:54:47 -0000	1.24
+++ bacula.spec	27 Apr 2009 17:53:52 -0000	1.25
@@ -7,8 +7,8 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.4.4
-Release: 3%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -423,6 +423,7 @@
 	--with-x \
 	--enable-bat \
 	--with-qwt=/usr/lib \
+	--disable-libtool \
 	$*
 # Scratch this, it is trouble
 #	--with-readline \
@@ -623,6 +624,9 @@
 chmod 755 %{buildroot}%{_libexecdir}/bacula/*
 chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 
+# Remove extra docs
+rm -rf %{buildroot}%{_datadir}/doc/bacula/
+
 %clean
 rm -rf %{buildroot}
 
@@ -795,7 +799,9 @@
 %{_mandir}/man8/btraceback.8*
 %dir %attr(750, bacula, bacula) %{_localstatedir}/log/bacula
 %dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula
-
+%{_sbindir}/bacula
+%{_libdir}/bpipe-fd.so
+/usr/libexec/bacula/mtx-changer.conf
 
 %files client
 %defattr(-,root,root,-)
@@ -971,12 +977,13 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf
-%doc bacula-docs-%{docs_version}/bacula-web/bacula-web/
-%doc bacula-docs-%{docs_version}/developers/developers.pdf
-%doc bacula-docs-%{docs_version}/developers/developers/
-%doc bacula-docs-%{docs_version}/manual/bacula.pdf
-%doc bacula-docs-%{docs_version}/manual/bacula/
+%doc bacula-docs-%{docs_version}/manuals/en/install/install.pdf
+%doc bacula-docs-%{docs_version}/manuals/en/problems/problems.pdf
+%doc bacula-docs-%{docs_version}/manuals/en/console/console.pdf
+%doc bacula-docs-%{docs_version}/manuals/en/utility/utility.pdf
+%doc bacula-docs-%{docs_version}/manuals/en/concepts/concepts.pdf
+%doc bacula-docs-%{docs_version}/manuals/en/catalog/catalog.pdf
+%doc bacula-docs-%{docs_version}/manuals/en/developers/developers.pdf
 
 
 #%files web
@@ -990,6 +997,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Jon Ciesla <limb at jcomserv.net - 3.0.0-1
+- Update to new upstream, 3.0.0.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2009 14:27:16 -0000	1.6
+++ sources	27 Apr 2009 17:53:52 -0000	1.7
@@ -1,2 +1,2 @@
-4eb6155b45611018af03002d37a2ffde  bacula-2.4.4.tar.gz
-d9bb3e8ca8c9a4c741b83569c21a4806  bacula-docs-2.4.4.tar.bz2
+5ea5294c4f66f0d8ba1414f1ca9dc79b  bacula-3.0.0.tar.gz
+2c3a1c6ba46b1371240a9b8d053fdf61  bacula-docs-3.0.0.tar.bz2



From jkratoch at fedoraproject.org  Mon Apr 27 17:56:04 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 27 Apr 2009 17:56:04 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.8-bz457187-largefile-test.patch, NONE,
	1.1 gdb.spec, 1.348, 1.349
Message-ID: <20090427175604.D3E1370110@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28258

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.8-bz457187-largefile-test.patch 
Log Message:
* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-25
- The Koji build failures may have been by forgotten check-in of the Patch360.


gdb-6.8-bz457187-largefile-test.patch:

--- NEW FILE gdb-6.8-bz457187-largefile-test.patch ---
--- /dev/null	2009-04-19 14:49:00.974648389 +0200
+++ gdb-6.8/gdb/testsuite/gdb.arch/i386-biarch-core.exp	2009-04-19 16:30:12.000000000 +0200
@@ -0,0 +1,61 @@
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# Test ability to load an elf64-i386 core file.  The provided core file was
+# elf64-x8664 one but it got binary patched to i386:
+# Elf32_Ehdr.e_machine @0x12..0x13
+# Elf64_Ehdr.e_machine @0x12..0x13
+# #define EM_386           3              /* Intel 80386 */
+# #define EM_X86_64       62              /* AMD x86-64 architecture */
+# patch @0x12: 0x3E -> 0x03
+
+if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+    verbose "Skipping i386-biarch-core test."
+    return
+}
+
+set testfile "i386-biarch-core"
+set corebz2uufile ${srcdir}/${subdir}/${testfile}.core.bz2.uu
+set corefile ${objdir}/${subdir}/${testfile}.core
+# Entry point of the original executable.
+set address 0x400078
+
+if {[catch "system \"uudecode -o - ${corebz2uufile} | bzip2 -dc >${corefile}\""] != 0} {
+    untested "failed uudecode or bzip2"
+    return -1
+}
+file stat ${corefile} corestat
+if {$corestat(size) != 102400} {
+    untested "uudecode or bzip2 produce invalid result"
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+
+# Wrongly built GDB complains by:
+# "..." is not a core dump: File format not recognized
+# As the provided test core has 64bit PRSTATUS i386 built GDB cannot parse it.
+# This is just a problem of the test care, real-world elf64-i386 file will have
+# 32bit PRSTATUS.  One cannot prepare elf64-i386 core file from elf32-i386 by
+# objcopy as it corrupts the core file beyond all recognition.
+# "\r\nCore was generated by `\[^\r\n\]*'\\.\r\nProgram terminated with signal 11, Segmentation fault\\.\r\n.*"
+gdb_test "core-file ${corefile}"
+
+gdb_test "x/i $address" "\r\n$address:\[ \t\]*hlt\[ \t\]*" ".text is readable"
--- /dev/null	2009-04-19 14:49:00.974648389 +0200
+++ gdb-6.8/gdb/testsuite/gdb.arch/i386-biarch-core.S	2009-04-19 14:52:28.000000000 +0200
@@ -0,0 +1,22 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2009 Free Software Foundation, Inc.
+  
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+  
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+	.globl _start
+_start:
+	hlt
--- /dev/null	2009-04-19 14:49:00.974648389 +0200
+++ gdb-6.8/gdb/testsuite/gdb.arch/i386-biarch-core.core.bz2.uu	2009-04-19 15:02:12.000000000 +0200
@@ -0,0 +1,13 @@
+begin 600 i386-biarch-core.core.bz2
+M0EIH.3%!629361`P1\P`!)?_____\9'@"8Q)6P380'9@'&#`0D@``"``%(``
+M@`#`"!<(L`%F"(:$GH13::F-)M&D&U,AD:`--#)M0&FT0XR9--,)D9`P(Q-&
+M",(-&F``02)%38HT]0T`&AH```'H@``T^>9T*(,("&)SE`>`9 at +GP=[,N)KB
+M'I8BL(L]N5TCY\%V]/?DB.BN*UZ'U@]TN7-]UJ5\_%0QTT<*086#%MHT7XVJ
+M9D"+C!"2*L:8D1XPD!`--M@*XT1H5RFYN&)(!0P0#:`I:;2;$5M&\*9"0@%:
+MK at X[T()M)9N7`D$VA!^63)%,;@8LT`(7\K&[7G;U:"B6'!GG+46ALOZF.2F-
+M!@>C*%86X$-]C2`KE;HG)UL(913VR2G]0BD:J=Z_`G at S,`W%.8RMS-#5P:J0
+MAJ2\8&X?@DE;UF68QHM<,D`('::J65/S:PAG*R-09["8DBI)'V]Y.[(/AM*L
+M"X_O^V;%FY.S6Q]FM=D37>5F,%4-F1ZF#,CFJVU;H*^IT<(%<V`.32$`JU["
+/G`68?\7<D4X4)`0,$?,`
+`
+end


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- gdb.spec	27 Apr 2009 17:38:25 -0000	1.348
+++ gdb.spec	27 Apr 2009 17:55:34 -0000	1.349
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 24%{?_with_upstream:.upstream}%{?dist}
+Release: 25%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -390,7 +390,6 @@
 BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
-BuildPreReq: python
 BuildRequires: python-devel
 # Temporarily before it gets moved to libstdc++.rpm
 BuildRequires: libstdc++
@@ -862,6 +861,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-25
+- The Koji build failures may have been by forgotten check-in of the Patch360.
+
 * Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-24
 - Another new Koji build fix attempt now by: BuildPreReq: python
 



From oget at fedoraproject.org  Mon Apr 27 18:03:34 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:03:34 +0000 (UTC)
Subject: rpms/lv2-swh-plugins/devel import.log, NONE,
	1.1 lv2-swh-plugins.spec, 
	NONE, 1.1 swh-lv2-resolve-symbols.patch, NONE,
	1.1 swh-lv2-time-and-perm.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427180334.2714A70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-swh-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-swh-plugins.spec swh-lv2-resolve-symbols.patch 
	swh-lv2-time-and-perm.patch 
Log Message:
* Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
- Fix unresolved symbols

* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-1
- Initial build



--- NEW FILE import.log ---
lv2-swh-plugins-1_0_15-2_fc10:HEAD:lv2-swh-plugins-1.0.15-2.fc10.src.rpm:1240855346


--- NEW FILE lv2-swh-plugins.spec ---
%global pkgname swh-lv2

Name:		lv2-swh-plugins
Version:	1.0.15
Release:	2%{?dist}
Summary:	LV2 ports of LADSPA swh plugins
Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://lv2plug.in/
Source0:	http://plugin.org.uk/lv2/%{pkgname}-%{version}.tar.gz
# The following two patches are sent to the author via email (there is no bugtracker)
# This patch fixes unresolved symbols errors
Patch0:		swh-lv2-resolve-symbols.patch
# This is for preserving timestamps of the installed files and to correct
# the permissions of .ttl files
Patch1:		swh-lv2-time-and-perm.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	fftw-devel
BuildRequires:	lv2core-devel
Requires:	lv2core

%description
This is an early experimental port of my LADSPA plugins to the LV2
specification, c.f. http://lv2plug.in/ . It's still quite early days, but most
things should work as well or not as they did in LADSPA.


%prep
%setup -q -n %{pkgname}-%{version}
%patch0 -p1 -b .symbols
%patch1 -p1 -b .timeandperm

# We are using the system header:
rm -f include/lv2.h

%build
make %{?_smp_mflags} \
	CFLAGS="-I%{_includedir} $RPM_OPT_FLAGS" \
	LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install-system INSTALL_DIR="$RPM_BUILD_ROOT%{_libdir}/lv2"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/lv2/*


%changelog
* Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
- Fix unresolved symbols

* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-1
- Initial build

swh-lv2-resolve-symbols.patch:

--- NEW FILE swh-lv2-resolve-symbols.patch ---
diff -rupN swh-lv2-1.0.15.old/extra.mk swh-lv2-1.0.15/extra.mk
--- swh-lv2-1.0.15.old/extra.mk	2008-01-09 16:02:08.000000000 -0500
+++ swh-lv2-1.0.15/extra.mk	2009-04-23 14:14:10.000000000 -0400
@@ -1,6 +1,6 @@
-analogue_osc_LDFLAGS = util/blo.o
-fm_osc_LDFLAGS = util/blo.o
-hermes_filter_LDFLAGS = util/blo.o
+analogue_osc_LDFLAGS = util/blo.o -lrt
+fm_osc_LDFLAGS = util/blo.o -lrt
+hermes_filter_LDFLAGS = util/blo.o -lrt
 
 bandpass_iir_LDFLAGS = util/iir.o
 bandpass_a_iir_LDFLAGS = util/iir.o
@@ -21,3 +21,6 @@ se4_LDFLAGS = util/db.o util/rms.o
 
 mbeq_CFLAGS = `pkg-config fftw3f --cflags`
 mbeq_LDFLAGS = `pkg-config fftw3f --libs`
+
+pitch_scale_CFLAGS = `pkg-config fftw3f --cflags`
+pitch_scale_LDFLAGS = util/pitchscale.o `pkg-config fftw3f --libs`
diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
--- swh-lv2-1.0.15.old/Makefile	2008-01-09 16:02:08.000000000 -0500
+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:17:41.000000000 -0400
@@ -44,8 +44,8 @@ PLUGIN_LDFLAGS = -arch i386 -arch ppc -d
 BUILD_PLUGINS = $(PLUGINS)
 else
 EXT = so
-PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC $(CFLAGS)
-PLUGIN_LDFLAGS = -shared $(LDFLAGS)
+PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC -DFFTW3 $(CFLAGS)
+PLUGIN_LDFLAGS = -shared -lm $(LDFLAGS)
 BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS)
 endif
 
@@ -56,7 +56,7 @@ all: util gverb $(OBJECTS)
 gverb: gverb/gverb.c gverb/gverbdsp.c gverb/gverb.o gverb/gverbdsp.o
 	(cd gverb && make -w CFLAGS="$(PLUGIN_CFLAGS)" LDFLAGS="$(PLUGIN_LDFLAGS)")
 
-util: util/blo.o util/iir.o util/db.o util/rms.o
+util: util/blo.o util/iir.o util/db.o util/rms.o util/pitchscale.o
 
 %.c: OBJ = $(shell echo $@ | sed 's/\.c$$/- at OS@.$(EXT)/')
 %.c: %.xml
diff -rupN swh-lv2-1.0.15.old/util/pitchscale.c swh-lv2-1.0.15/util/pitchscale.c
--- swh-lv2-1.0.15.old/util/pitchscale.c	2008-01-09 16:02:07.000000000 -0500
+++ swh-lv2-1.0.15/util/pitchscale.c	2009-04-23 14:08:52.000000000 -0400
@@ -36,7 +36,7 @@
 *****************************************************************************/
 
 #include <string.h>
-#include "../config.h"
+//#include "../config.h"
 #include <math.h>
 
 #include "pitchscale.h"

swh-lv2-time-and-perm.patch:

--- NEW FILE swh-lv2-time-and-perm.patch ---
diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
--- swh-lv2-1.0.15.old/Makefile	2009-04-23 14:26:07.000000000 -0400
+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:25:11.000000000 -0400
@@ -96,13 +96,14 @@ install-user: all install-really
 install-really:
 	for plugin in $(BUILD_PLUGINS); do \
 		echo Installing $$plugin; \
-		install -d $(INSTALL_DIR_REALLY)/$$plugin; \
-		install plugins/$$plugin/*-$(OS).$(EXT) plugins/$$plugin/*.ttl $(INSTALL_DIR_REALLY)/$$plugin/ ; \
+		install -pd $(INSTALL_DIR_REALLY)/$$plugin; \
+		install -pm 755 plugins/$$plugin/*-$(OS).$(EXT) $(INSTALL_DIR_REALLY)/$$plugin/ ; \
+		install -pm 644 plugins/$$plugin/*.ttl $(INSTALL_DIR_REALLY)/$$plugin/ ; \
 	done
 
 dist: real-clean all dist-clean
 	cd .. && \
-	cp -r lv2 swh-lv2-$(VERSION) && \
+	cp -pr lv2 swh-lv2-$(VERSION) && \
 	tar cfz swh-lv2-$(VERSION).tar.gz swh-lv2-$(VERSION)/{Makefile,README,*.mk,plugins/*/*,util/*,gverb/*,xslt/*,include/*} && \
 	rm -rf swh-lv2-$(VERSION)
 	mv ../swh-lv2-$(VERSION).tar.gz .


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:25:02 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:03:03 -0000	1.2
@@ -0,0 +1 @@
+swh-lv2-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:25:02 -0000	1.1
+++ sources	27 Apr 2009 18:03:03 -0000	1.2
@@ -0,0 +1 @@
+c78f42c36d7bf2fb5b17f795ef9636d1  swh-lv2-1.0.15.tar.gz



From oget at fedoraproject.org  Mon Apr 27 18:05:53 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:05:53 +0000 (UTC)
Subject: rpms/lv2-swh-plugins/F-11 import.log, NONE, 1.1 lv2-swh-plugins.spec,
	NONE, 1.1 swh-lv2-resolve-symbols.patch, NONE,
	1.1 swh-lv2-time-and-perm.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427180553.B120570110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-swh-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29852/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-swh-plugins.spec swh-lv2-resolve-symbols.patch 
	swh-lv2-time-and-perm.patch 
Log Message:
* Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
- Fix unresolved symbols

* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-1
- Initial build



--- NEW FILE import.log ---
lv2-swh-plugins-1_0_15-2_fc10:F-11:lv2-swh-plugins-1.0.15-2.fc10.src.rpm:1240855502


--- NEW FILE lv2-swh-plugins.spec ---
%global pkgname swh-lv2

Name:		lv2-swh-plugins
Version:	1.0.15
Release:	2%{?dist}
Summary:	LV2 ports of LADSPA swh plugins
Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://lv2plug.in/
Source0:	http://plugin.org.uk/lv2/%{pkgname}-%{version}.tar.gz
# The following two patches are sent to the author via email (there is no bugtracker)
# This patch fixes unresolved symbols errors
Patch0:		swh-lv2-resolve-symbols.patch
# This is for preserving timestamps of the installed files and to correct
# the permissions of .ttl files
Patch1:		swh-lv2-time-and-perm.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	fftw-devel
BuildRequires:	lv2core-devel
Requires:	lv2core

%description
This is an early experimental port of my LADSPA plugins to the LV2
specification, c.f. http://lv2plug.in/ . It's still quite early days, but most
things should work as well or not as they did in LADSPA.


%prep
%setup -q -n %{pkgname}-%{version}
%patch0 -p1 -b .symbols
%patch1 -p1 -b .timeandperm

# We are using the system header:
rm -f include/lv2.h

%build
make %{?_smp_mflags} \
	CFLAGS="-I%{_includedir} $RPM_OPT_FLAGS" \
	LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install-system INSTALL_DIR="$RPM_BUILD_ROOT%{_libdir}/lv2"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/lv2/*


%changelog
* Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
- Fix unresolved symbols

* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-1
- Initial build

swh-lv2-resolve-symbols.patch:

--- NEW FILE swh-lv2-resolve-symbols.patch ---
diff -rupN swh-lv2-1.0.15.old/extra.mk swh-lv2-1.0.15/extra.mk
--- swh-lv2-1.0.15.old/extra.mk	2008-01-09 16:02:08.000000000 -0500
+++ swh-lv2-1.0.15/extra.mk	2009-04-23 14:14:10.000000000 -0400
@@ -1,6 +1,6 @@
-analogue_osc_LDFLAGS = util/blo.o
-fm_osc_LDFLAGS = util/blo.o
-hermes_filter_LDFLAGS = util/blo.o
+analogue_osc_LDFLAGS = util/blo.o -lrt
+fm_osc_LDFLAGS = util/blo.o -lrt
+hermes_filter_LDFLAGS = util/blo.o -lrt
 
 bandpass_iir_LDFLAGS = util/iir.o
 bandpass_a_iir_LDFLAGS = util/iir.o
@@ -21,3 +21,6 @@ se4_LDFLAGS = util/db.o util/rms.o
 
 mbeq_CFLAGS = `pkg-config fftw3f --cflags`
 mbeq_LDFLAGS = `pkg-config fftw3f --libs`
+
+pitch_scale_CFLAGS = `pkg-config fftw3f --cflags`
+pitch_scale_LDFLAGS = util/pitchscale.o `pkg-config fftw3f --libs`
diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
--- swh-lv2-1.0.15.old/Makefile	2008-01-09 16:02:08.000000000 -0500
+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:17:41.000000000 -0400
@@ -44,8 +44,8 @@ PLUGIN_LDFLAGS = -arch i386 -arch ppc -d
 BUILD_PLUGINS = $(PLUGINS)
 else
 EXT = so
-PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC $(CFLAGS)
-PLUGIN_LDFLAGS = -shared $(LDFLAGS)
+PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC -DFFTW3 $(CFLAGS)
+PLUGIN_LDFLAGS = -shared -lm $(LDFLAGS)
 BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS)
 endif
 
@@ -56,7 +56,7 @@ all: util gverb $(OBJECTS)
 gverb: gverb/gverb.c gverb/gverbdsp.c gverb/gverb.o gverb/gverbdsp.o
 	(cd gverb && make -w CFLAGS="$(PLUGIN_CFLAGS)" LDFLAGS="$(PLUGIN_LDFLAGS)")
 
-util: util/blo.o util/iir.o util/db.o util/rms.o
+util: util/blo.o util/iir.o util/db.o util/rms.o util/pitchscale.o
 
 %.c: OBJ = $(shell echo $@ | sed 's/\.c$$/- at OS@.$(EXT)/')
 %.c: %.xml
diff -rupN swh-lv2-1.0.15.old/util/pitchscale.c swh-lv2-1.0.15/util/pitchscale.c
--- swh-lv2-1.0.15.old/util/pitchscale.c	2008-01-09 16:02:07.000000000 -0500
+++ swh-lv2-1.0.15/util/pitchscale.c	2009-04-23 14:08:52.000000000 -0400
@@ -36,7 +36,7 @@
 *****************************************************************************/
 
 #include <string.h>
-#include "../config.h"
+//#include "../config.h"
 #include <math.h>
 
 #include "pitchscale.h"

swh-lv2-time-and-perm.patch:

--- NEW FILE swh-lv2-time-and-perm.patch ---
diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
--- swh-lv2-1.0.15.old/Makefile	2009-04-23 14:26:07.000000000 -0400
+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:25:11.000000000 -0400
@@ -96,13 +96,14 @@ install-user: all install-really
 install-really:
 	for plugin in $(BUILD_PLUGINS); do \
 		echo Installing $$plugin; \
-		install -d $(INSTALL_DIR_REALLY)/$$plugin; \
-		install plugins/$$plugin/*-$(OS).$(EXT) plugins/$$plugin/*.ttl $(INSTALL_DIR_REALLY)/$$plugin/ ; \
+		install -pd $(INSTALL_DIR_REALLY)/$$plugin; \
+		install -pm 755 plugins/$$plugin/*-$(OS).$(EXT) $(INSTALL_DIR_REALLY)/$$plugin/ ; \
+		install -pm 644 plugins/$$plugin/*.ttl $(INSTALL_DIR_REALLY)/$$plugin/ ; \
 	done
 
 dist: real-clean all dist-clean
 	cd .. && \
-	cp -r lv2 swh-lv2-$(VERSION) && \
+	cp -pr lv2 swh-lv2-$(VERSION) && \
 	tar cfz swh-lv2-$(VERSION).tar.gz swh-lv2-$(VERSION)/{Makefile,README,*.mk,plugins/*/*,util/*,gverb/*,xslt/*,include/*} && \
 	rm -rf swh-lv2-$(VERSION)
 	mv ../swh-lv2-$(VERSION).tar.gz .


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:25:02 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:05:23 -0000	1.2
@@ -0,0 +1 @@
+swh-lv2-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:25:02 -0000	1.1
+++ sources	27 Apr 2009 18:05:23 -0000	1.2
@@ -0,0 +1 @@
+c78f42c36d7bf2fb5b17f795ef9636d1  swh-lv2-1.0.15.tar.gz



From ajax at fedoraproject.org  Mon Apr 27 18:07:07 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 27 Apr 2009 18:07:07 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mga/F-11 .cvsignore, 1.12, 1.13 import.log, 1.1, 
	1.2 sources, 1.12, 1.13 xorg-x11-drv-mga.spec, 1.30,
	1.31 mga-1.4.7-alloca.patch, 1.1,
	NONE mga-1.4.7-death-to-cfb.patch, 1.1, NONE
Message-ID: <20090427180707.5F28570110@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mga/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30429/F-11

Modified Files:
	.cvsignore import.log sources xorg-x11-drv-mga.spec 
Removed Files:
	mga-1.4.7-alloca.patch mga-1.4.7-death-to-cfb.patch 
Log Message:
mga 1.4.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Feb 2009 07:59:42 -0000	1.12
+++ .cvsignore	27 Apr 2009 18:06:36 -0000	1.13
@@ -1 +1 @@
-xf86-video-mga-1.4.9.tar.bz2
+xf86-video-mga-1.4.10.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Feb 2009 07:59:42 -0000	1.1
+++ import.log	27 Apr 2009 18:06:37 -0000	1.2
@@ -1 +1,2 @@
 xorg-x11-drv-mga-1_4_9-1_fc11:HEAD:xorg-x11-drv-mga-1.4.9-1.fc11.src.rpm:1234080142
+xorg-x11-drv-mga-1_4_10-1_fc11:F-11:xorg-x11-drv-mga-1.4.10-1.fc11.src.rpm:1240855561


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Feb 2009 07:59:42 -0000	1.12
+++ sources	27 Apr 2009 18:06:37 -0000	1.13
@@ -1 +1 @@
-11066b84b949cd04300ec819c9c51532  xf86-video-mga-1.4.9.tar.bz2
+e2515e7476185a2d0482a3004a84cfd9  xf86-video-mga-1.4.10.tar.bz2


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-11/xorg-x11-drv-mga.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-mga.spec	24 Feb 2009 15:09:48 -0000	1.30
+++ xorg-x11-drv-mga.spec	27 Apr 2009 18:06:37 -0000	1.31
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
-Version:   1.4.9
-Release:   2%{?dist}
+Version:   1.4.10
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -63,6 +63,9 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Mon Apr 27 2009 Adam Jackson <ajax at redhat.com> 1.4.10-1
+- mga 1.4.10
+
 * Tue Feb 24 2009 Adam Jackson <ajax at redhat.com> 1.4.9-2
 - Fix ftbfs
 


--- mga-1.4.7-alloca.patch DELETED ---


--- mga-1.4.7-death-to-cfb.patch DELETED ---



From oget at fedoraproject.org  Mon Apr 27 18:07:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:07:23 +0000 (UTC)
Subject: rpms/lv2-swh-plugins/F-10 import.log, NONE, 1.1 lv2-swh-plugins.spec,
	NONE, 1.1 swh-lv2-resolve-symbols.patch, NONE,
	1.1 swh-lv2-time-and-perm.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427180723.8970570110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-swh-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30565/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-swh-plugins.spec swh-lv2-resolve-symbols.patch 
	swh-lv2-time-and-perm.patch 
Log Message:
* Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
- Fix unresolved symbols

* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-1
- Initial build



--- NEW FILE import.log ---
lv2-swh-plugins-1_0_15-2_fc10:F-10:lv2-swh-plugins-1.0.15-2.fc10.src.rpm:1240855593


--- NEW FILE lv2-swh-plugins.spec ---
%global pkgname swh-lv2

Name:		lv2-swh-plugins
Version:	1.0.15
Release:	2%{?dist}
Summary:	LV2 ports of LADSPA swh plugins
Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://lv2plug.in/
Source0:	http://plugin.org.uk/lv2/%{pkgname}-%{version}.tar.gz
# The following two patches are sent to the author via email (there is no bugtracker)
# This patch fixes unresolved symbols errors
Patch0:		swh-lv2-resolve-symbols.patch
# This is for preserving timestamps of the installed files and to correct
# the permissions of .ttl files
Patch1:		swh-lv2-time-and-perm.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	fftw-devel
BuildRequires:	lv2core-devel
Requires:	lv2core

%description
This is an early experimental port of my LADSPA plugins to the LV2
specification, c.f. http://lv2plug.in/ . It's still quite early days, but most
things should work as well or not as they did in LADSPA.


%prep
%setup -q -n %{pkgname}-%{version}
%patch0 -p1 -b .symbols
%patch1 -p1 -b .timeandperm

# We are using the system header:
rm -f include/lv2.h

%build
make %{?_smp_mflags} \
	CFLAGS="-I%{_includedir} $RPM_OPT_FLAGS" \
	LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install-system INSTALL_DIR="$RPM_BUILD_ROOT%{_libdir}/lv2"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/lv2/*


%changelog
* Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
- Fix unresolved symbols

* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-1
- Initial build

swh-lv2-resolve-symbols.patch:

--- NEW FILE swh-lv2-resolve-symbols.patch ---
diff -rupN swh-lv2-1.0.15.old/extra.mk swh-lv2-1.0.15/extra.mk
--- swh-lv2-1.0.15.old/extra.mk	2008-01-09 16:02:08.000000000 -0500
+++ swh-lv2-1.0.15/extra.mk	2009-04-23 14:14:10.000000000 -0400
@@ -1,6 +1,6 @@
-analogue_osc_LDFLAGS = util/blo.o
-fm_osc_LDFLAGS = util/blo.o
-hermes_filter_LDFLAGS = util/blo.o
+analogue_osc_LDFLAGS = util/blo.o -lrt
+fm_osc_LDFLAGS = util/blo.o -lrt
+hermes_filter_LDFLAGS = util/blo.o -lrt
 
 bandpass_iir_LDFLAGS = util/iir.o
 bandpass_a_iir_LDFLAGS = util/iir.o
@@ -21,3 +21,6 @@ se4_LDFLAGS = util/db.o util/rms.o
 
 mbeq_CFLAGS = `pkg-config fftw3f --cflags`
 mbeq_LDFLAGS = `pkg-config fftw3f --libs`
+
+pitch_scale_CFLAGS = `pkg-config fftw3f --cflags`
+pitch_scale_LDFLAGS = util/pitchscale.o `pkg-config fftw3f --libs`
diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
--- swh-lv2-1.0.15.old/Makefile	2008-01-09 16:02:08.000000000 -0500
+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:17:41.000000000 -0400
@@ -44,8 +44,8 @@ PLUGIN_LDFLAGS = -arch i386 -arch ppc -d
 BUILD_PLUGINS = $(PLUGINS)
 else
 EXT = so
-PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC $(CFLAGS)
-PLUGIN_LDFLAGS = -shared $(LDFLAGS)
+PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC -DFFTW3 $(CFLAGS)
+PLUGIN_LDFLAGS = -shared -lm $(LDFLAGS)
 BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS)
 endif
 
@@ -56,7 +56,7 @@ all: util gverb $(OBJECTS)
 gverb: gverb/gverb.c gverb/gverbdsp.c gverb/gverb.o gverb/gverbdsp.o
 	(cd gverb && make -w CFLAGS="$(PLUGIN_CFLAGS)" LDFLAGS="$(PLUGIN_LDFLAGS)")
 
-util: util/blo.o util/iir.o util/db.o util/rms.o
+util: util/blo.o util/iir.o util/db.o util/rms.o util/pitchscale.o
 
 %.c: OBJ = $(shell echo $@ | sed 's/\.c$$/- at OS@.$(EXT)/')
 %.c: %.xml
diff -rupN swh-lv2-1.0.15.old/util/pitchscale.c swh-lv2-1.0.15/util/pitchscale.c
--- swh-lv2-1.0.15.old/util/pitchscale.c	2008-01-09 16:02:07.000000000 -0500
+++ swh-lv2-1.0.15/util/pitchscale.c	2009-04-23 14:08:52.000000000 -0400
@@ -36,7 +36,7 @@
 *****************************************************************************/
 
 #include <string.h>
-#include "../config.h"
+//#include "../config.h"
 #include <math.h>
 
 #include "pitchscale.h"

swh-lv2-time-and-perm.patch:

--- NEW FILE swh-lv2-time-and-perm.patch ---
diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
--- swh-lv2-1.0.15.old/Makefile	2009-04-23 14:26:07.000000000 -0400
+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:25:11.000000000 -0400
@@ -96,13 +96,14 @@ install-user: all install-really
 install-really:
 	for plugin in $(BUILD_PLUGINS); do \
 		echo Installing $$plugin; \
-		install -d $(INSTALL_DIR_REALLY)/$$plugin; \
-		install plugins/$$plugin/*-$(OS).$(EXT) plugins/$$plugin/*.ttl $(INSTALL_DIR_REALLY)/$$plugin/ ; \
+		install -pd $(INSTALL_DIR_REALLY)/$$plugin; \
+		install -pm 755 plugins/$$plugin/*-$(OS).$(EXT) $(INSTALL_DIR_REALLY)/$$plugin/ ; \
+		install -pm 644 plugins/$$plugin/*.ttl $(INSTALL_DIR_REALLY)/$$plugin/ ; \
 	done
 
 dist: real-clean all dist-clean
 	cd .. && \
-	cp -r lv2 swh-lv2-$(VERSION) && \
+	cp -pr lv2 swh-lv2-$(VERSION) && \
 	tar cfz swh-lv2-$(VERSION).tar.gz swh-lv2-$(VERSION)/{Makefile,README,*.mk,plugins/*/*,util/*,gverb/*,xslt/*,include/*} && \
 	rm -rf swh-lv2-$(VERSION)
 	mv ../swh-lv2-$(VERSION).tar.gz .


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:25:02 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:06:53 -0000	1.2
@@ -0,0 +1 @@
+swh-lv2-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:25:02 -0000	1.1
+++ sources	27 Apr 2009 18:06:53 -0000	1.2
@@ -0,0 +1 @@
+c78f42c36d7bf2fb5b17f795ef9636d1  swh-lv2-1.0.15.tar.gz



From scop at fedoraproject.org  Mon Apr 27 18:10:20 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 27 Apr 2009 18:10:20 +0000 (UTC)
Subject: rpms/libmodplug/F-10 .cvsignore, 1.5, 1.6 libmodplug.spec, 1.15,
	1.16 sources, 1.5, 1.6
Message-ID: <20090427181020.CFC9E70110@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31060/F-10

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
- Update to 0.8.7 (security, #496834).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2009 15:23:06 -0000	1.5
+++ .cvsignore	27 Apr 2009 18:09:50 -0000	1.6
@@ -1 +1 @@
-libmodplug-0.8.5.tar.gz
+libmodplug-0.8.7.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-10/libmodplug.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libmodplug.spec	14 Apr 2009 15:23:06 -0000	1.15
+++ libmodplug.spec	27 Apr 2009 18:09:50 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           libmodplug
-Version:        0.8.5
+Version:        0.8.7
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
@@ -27,8 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
-chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
-sed -i -e 's/\r//g' ChangeLog
+chmod -c -x src/tables.h
 
 
 %build
@@ -68,6 +67,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
+- Update to 0.8.7 (security, #496834).
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
 - Update to 0.8.5, should fix #483146.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2009 15:23:06 -0000	1.5
+++ sources	27 Apr 2009 18:09:50 -0000	1.6
@@ -1 +1 @@
-f4143aaebe6163fa359d6a6f848296da  libmodplug-0.8.5.tar.gz
+d2d9ccd8da22412999caed076140f786  libmodplug-0.8.7.tar.gz



From scop at fedoraproject.org  Mon Apr 27 18:10:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 27 Apr 2009 18:10:21 +0000 (UTC)
Subject: rpms/libmodplug/F-11 .cvsignore, 1.5, 1.6 libmodplug.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <20090427181021.39C5B70110@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31060/F-11

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
- Update to 0.8.7 (security, #496834).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2009 11:47:54 -0000	1.5
+++ .cvsignore	27 Apr 2009 18:09:50 -0000	1.6
@@ -1 +1 @@
-libmodplug-0.8.5.tar.gz
+libmodplug-0.8.7.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-11/libmodplug.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libmodplug.spec	14 Apr 2009 11:47:54 -0000	1.16
+++ libmodplug.spec	27 Apr 2009 18:09:50 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           libmodplug
-Version:        0.8.5
+Version:        0.8.7
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
@@ -27,8 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
-chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
-sed -i -e 's/\r//g' ChangeLog
+chmod -c -x src/tables.h
 
 
 %build
@@ -68,6 +67,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
+- Update to 0.8.7 (security, #496834).
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
 - Update to 0.8.5, should fix #483146.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2009 11:47:54 -0000	1.5
+++ sources	27 Apr 2009 18:09:50 -0000	1.6
@@ -1 +1 @@
-f4143aaebe6163fa359d6a6f848296da  libmodplug-0.8.5.tar.gz
+d2d9ccd8da22412999caed076140f786  libmodplug-0.8.7.tar.gz



From scop at fedoraproject.org  Mon Apr 27 18:10:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 27 Apr 2009 18:10:21 +0000 (UTC)
Subject: rpms/libmodplug/devel .cvsignore, 1.5, 1.6 libmodplug.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <20090427181021.AA7EC70110@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31060/devel

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
- Update to 0.8.7 (security, #496834).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2009 11:47:54 -0000	1.5
+++ .cvsignore	27 Apr 2009 18:09:51 -0000	1.6
@@ -1 +1 @@
-libmodplug-0.8.5.tar.gz
+libmodplug-0.8.7.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libmodplug.spec	14 Apr 2009 11:47:54 -0000	1.16
+++ libmodplug.spec	27 Apr 2009 18:09:51 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           libmodplug
-Version:        0.8.5
+Version:        0.8.7
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
@@ -27,8 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
-chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
-sed -i -e 's/\r//g' ChangeLog
+chmod -c -x src/tables.h
 
 
 %build
@@ -68,6 +67,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
+- Update to 0.8.7 (security, #496834).
+
 * Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
 - Update to 0.8.5, should fix #483146.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2009 11:47:54 -0000	1.5
+++ sources	27 Apr 2009 18:09:51 -0000	1.6
@@ -1 +1 @@
-f4143aaebe6163fa359d6a6f848296da  libmodplug-0.8.5.tar.gz
+d2d9ccd8da22412999caed076140f786  libmodplug-0.8.7.tar.gz



From cwickert at fedoraproject.org  Mon Apr 27 18:11:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 18:11:31 +0000 (UTC)
Subject: rpms/lxsession-lite/devel
	lxsession-lite-0.3.6-session_name_fix.patch, 
	NONE, 1.1 lxsession-lite.spec, 1.3, 1.4
Message-ID: <20090427181131.EB7B170110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31480

Modified Files:
	lxsession-lite.spec 
Added Files:
	lxsession-lite-0.3.6-session_name_fix.patch 
Log Message:
* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
- Fix Session name (Andrew Lee)


lxsession-lite-0.3.6-session_name_fix.patch:

--- NEW FILE lxsession-lite-0.3.6-session_name_fix.patch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_session_name_fix.dpatch by Andrew Lee <andrew at linux.org.tw>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix session name other than LXDE can be used.

@DPATCH@
diff -urNad lxsession-lite-0.3.6~/lxsession/lxsession.c lxsession-lite-0.3.6/lxsession/lxsession.c
--- lxsession-lite-0.3.6~/lxsession/lxsession.c	2008-06-08 21:43:07.000000000 +0800
+++ lxsession-lite-0.3.6/lxsession/lxsession.c	2008-12-29 11:48:56.476492960 +0800
@@ -340,7 +340,7 @@
 
     register_signals();
 
-    if ( session_name )
+    if ( !session_name )
         session_name = "LXDE";
 
     g_setenv( "DESKTOP_SESSION", session_name, TRUE );



Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/devel/lxsession-lite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lxsession-lite.spec	27 Apr 2009 17:36:25 -0000	1.3
+++ lxsession-lite.spec	27 Apr 2009 18:11:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           lxsession-lite
 Version:        0.3.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -9,7 +9,8 @@
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
-Patch1:         lxsession-lite-0.3.6-new-gdm.patch
+Patch1:         lxsession-lite-0.3.6-session_name_fix.patch
+Patch2:         lxsession-lite-0.3.6-new-gdm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel > 2.6 libICE-devel libSM-devel dbus-glib-devel
@@ -42,7 +43,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .icon-path
-%patch1 -p1 -b .new-gdm
+%patch1 -p1 -b .session-name
+%patch2 -p1 -b .new-gdm
 
 %build
 %configure
@@ -70,6 +72,9 @@
 %dir %{_sysconfdir}/xdg/lxsession
 
 %changelog
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
+- Fix Session name (Andrew Lee)
+
 * Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
 - Support user switching also with newer gdm
 - Add patch to fix icon search path (Marty Jack)



From oget at fedoraproject.org  Mon Apr 27 18:11:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:11:41 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins/devel import.log, NONE,
	1.1 lv2-vocoder-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427181141.C6A9D70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31456/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-vocoder-plugins.spec 
Log Message:
* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1-1
- Initial build



--- NEW FILE import.log ---
lv2-vocoder-plugins-1-1_fc10:HEAD:lv2-vocoder-plugins-1-1.fc10.src.rpm:1240855838


--- NEW FILE lv2-vocoder-plugins.spec ---
%global pkgname lv2vocoder

Name:		lv2-vocoder-plugins
Version:	1
Release:	1%{?dist}
Summary:	Add a robotic effect to vocals
Group:		Applications/Multimedia
License:	GPLv2
URL:		http://download.gna.org/lv2vocoder/
Source0:	http://download.gna.org/lv2vocoder/%{pkgname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	lv2core-devel
Requires:	lv2core

%description
Perhaps you don't know what a vocoder is, but you have heard one before for
sure. Vocoders are often used to add a robotic effect to vocals in music. 

%prep
%setup -q -n %{pkgname}-%{version}

# Don't hide anything
sed -i 's|\t@|\t|' GNUmakefile

%build
make %{?_smp_mflags} \
	CFLAGS="-c $RPM_OPT_FLAGS -fPIC -DPIC" \
	LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/lv2
make install LV2_INSTALL_PATH="$RPM_BUILD_ROOT%{_libdir}/lv2"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README gpl.txt *.png
%{_libdir}/lv2/*


%changelog
* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-vocoder-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:25:51 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:11:11 -0000	1.2
@@ -0,0 +1 @@
+lv2vocoder-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-vocoder-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:25:51 -0000	1.1
+++ sources	27 Apr 2009 18:11:11 -0000	1.2
@@ -0,0 +1 @@
+8c0096978e9c58a252f247e1f7f7ed63  lv2vocoder-1.tar.bz2



From mclasen at fedoraproject.org  Mon Apr 27 18:13:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 18:13:04 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.272,1.273
Message-ID: <20090427181304.5160770110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31535

Modified Files:
	nautilus.spec 
Log Message:
temporary BR change



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- nautilus.spec	27 Apr 2009 06:09:36 -0000	1.272
+++ nautilus.spec	27 Apr 2009 18:12:34 -0000	1.273
@@ -42,7 +42,7 @@
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:	gamin-devel
 BuildRequires:	gvfs-devel
-BuildRequires:  intltool
+BuildRequires:  intltool >= 0.40.6-2
 BuildRequires:  libX11-devel
 BuildRequires:  libXt-devel
 BuildRequires:  fontconfig



From oget at fedoraproject.org  Mon Apr 27 18:13:02 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:13:02 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins/F-11 import.log, NONE,
	1.1 lv2-vocoder-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427181302.6C0EB70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32033/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-vocoder-plugins.spec 
Log Message:
* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1-1
- Initial build



--- NEW FILE import.log ---
lv2-vocoder-plugins-1-1_fc10:F-11:lv2-vocoder-plugins-1-1.fc10.src.rpm:1240855931


--- NEW FILE lv2-vocoder-plugins.spec ---
%global pkgname lv2vocoder

Name:		lv2-vocoder-plugins
Version:	1
Release:	1%{?dist}
Summary:	Add a robotic effect to vocals
Group:		Applications/Multimedia
License:	GPLv2
URL:		http://download.gna.org/lv2vocoder/
Source0:	http://download.gna.org/lv2vocoder/%{pkgname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	lv2core-devel
Requires:	lv2core

%description
Perhaps you don't know what a vocoder is, but you have heard one before for
sure. Vocoders are often used to add a robotic effect to vocals in music. 

%prep
%setup -q -n %{pkgname}-%{version}

# Don't hide anything
sed -i 's|\t@|\t|' GNUmakefile

%build
make %{?_smp_mflags} \
	CFLAGS="-c $RPM_OPT_FLAGS -fPIC -DPIC" \
	LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/lv2
make install LV2_INSTALL_PATH="$RPM_BUILD_ROOT%{_libdir}/lv2"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README gpl.txt *.png
%{_libdir}/lv2/*


%changelog
* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-vocoder-plugins/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:25:51 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:12:32 -0000	1.2
@@ -0,0 +1 @@
+lv2vocoder-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-vocoder-plugins/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:25:51 -0000	1.1
+++ sources	27 Apr 2009 18:12:32 -0000	1.2
@@ -0,0 +1 @@
+8c0096978e9c58a252f247e1f7f7ed63  lv2vocoder-1.tar.bz2



From oget at fedoraproject.org  Mon Apr 27 18:14:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:14:30 +0000 (UTC)
Subject: rpms/lv2-vocoder-plugins/F-10 import.log, NONE,
	1.1 lv2-vocoder-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427181430.1C9C770110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-vocoder-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32580/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-vocoder-plugins.spec 
Log Message:
* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1-1
- Initial build



--- NEW FILE import.log ---
lv2-vocoder-plugins-1-1_fc10:F-10:lv2-vocoder-plugins-1-1.fc10.src.rpm:1240856019


--- NEW FILE lv2-vocoder-plugins.spec ---
%global pkgname lv2vocoder

Name:		lv2-vocoder-plugins
Version:	1
Release:	1%{?dist}
Summary:	Add a robotic effect to vocals
Group:		Applications/Multimedia
License:	GPLv2
URL:		http://download.gna.org/lv2vocoder/
Source0:	http://download.gna.org/lv2vocoder/%{pkgname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	lv2core-devel
Requires:	lv2core

%description
Perhaps you don't know what a vocoder is, but you have heard one before for
sure. Vocoders are often used to add a robotic effect to vocals in music. 

%prep
%setup -q -n %{pkgname}-%{version}

# Don't hide anything
sed -i 's|\t@|\t|' GNUmakefile

%build
make %{?_smp_mflags} \
	CFLAGS="-c $RPM_OPT_FLAGS -fPIC -DPIC" \
	LDFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/lv2
make install LV2_INSTALL_PATH="$RPM_BUILD_ROOT%{_libdir}/lv2"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README gpl.txt *.png
%{_libdir}/lv2/*


%changelog
* Sun Mar 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-vocoder-plugins/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:25:51 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:13:59 -0000	1.2
@@ -0,0 +1 @@
+lv2vocoder-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-vocoder-plugins/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:25:51 -0000	1.1
+++ sources	27 Apr 2009 18:13:59 -0000	1.2
@@ -0,0 +1 @@
+8c0096978e9c58a252f247e1f7f7ed63  lv2vocoder-1.tar.bz2



From llaumgui at fedoraproject.org  Mon Apr 27 18:15:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 18:15:01 +0000 (UTC)
Subject: rpms/php-ezc-EventLog/devel import.log, NONE,
	1.1 php-ezc-EventLog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427181501.1495770110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv458/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLog.spec 
Log Message:
Initial import branch devel


--- NEW FILE import.log ---
php-ezc-EventLog-1_3-1_fc10:HEAD:php-ezc-EventLog-1.3-1.fc10.src.rpm:1240856032


--- NEW FILE php-ezc-EventLog.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLog
%define channel components.ez.no

Name:           php-ezc-EventLog
Version:        1.3
Release:        1%{?dist}
Summary:        Allows you to log events or audit trails

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Allows you to log events or audit trails into files or other storage spaces in
different formats.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_autoload.php


%changelog
* Wed Mar 04 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:15:42 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:14:30 -0000	1.2
@@ -0,0 +1 @@
+EventLog-1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:15:42 -0000	1.1
+++ sources	27 Apr 2009 18:14:30 -0000	1.2
@@ -0,0 +1 @@
+fc076796311c9571a6fe62774d288ef0  EventLog-1.3.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 18:15:02 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 18:15:02 +0000 (UTC)
Subject: rpms/php-ezc-EventLog/F-9 import.log, NONE,
	1.1 php-ezc-EventLog.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427181502.8EBB270110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv504/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLog.spec 
Log Message:
Initial import branch F-9


--- NEW FILE import.log ---
php-ezc-EventLog-1_3-1_fc10:F-9:php-ezc-EventLog-1.3-1.fc10.src.rpm:1240856048


--- NEW FILE php-ezc-EventLog.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLog
%define channel components.ez.no

Name:           php-ezc-EventLog
Version:        1.3
Release:        1%{?dist}
Summary:        Allows you to log events or audit trails

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Allows you to log events or audit trails into files or other storage spaces in
different formats.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_autoload.php


%changelog
* Wed Mar 04 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:15:42 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:14:32 -0000	1.2
@@ -0,0 +1 @@
+EventLog-1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:15:42 -0000	1.1
+++ sources	27 Apr 2009 18:14:32 -0000	1.2
@@ -0,0 +1 @@
+fc076796311c9571a6fe62774d288ef0  EventLog-1.3.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 18:16:35 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 18:16:35 +0000 (UTC)
Subject: rpms/php-ezc-EventLog/F-10 import.log, NONE,
	1.1 php-ezc-EventLog.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427181635.0942970110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1125/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLog.spec 
Log Message:
Initial import branch F-10


--- NEW FILE import.log ---
php-ezc-EventLog-1_3-1_fc10:F-10:php-ezc-EventLog-1.3-1.fc10.src.rpm:1240856065


--- NEW FILE php-ezc-EventLog.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLog
%define channel components.ez.no

Name:           php-ezc-EventLog
Version:        1.3
Release:        1%{?dist}
Summary:        Allows you to log events or audit trails

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Allows you to log events or audit trails into files or other storage spaces in
different formats.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_autoload.php


%changelog
* Wed Mar 04 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:15:42 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:16:04 -0000	1.2
@@ -0,0 +1 @@
+EventLog-1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:15:42 -0000	1.1
+++ sources	27 Apr 2009 18:16:04 -0000	1.2
@@ -0,0 +1 @@
+fc076796311c9571a6fe62774d288ef0  EventLog-1.3.tgz



From llaumgui at fedoraproject.org  Mon Apr 27 18:16:37 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 27 Apr 2009 18:16:37 +0000 (UTC)
Subject: rpms/php-ezc-EventLog/F-11 import.log, NONE,
	1.1 php-ezc-EventLog.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427181637.1DAE370110@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1146/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLog.spec 
Log Message:
Initial import branch F-11


--- NEW FILE import.log ---
php-ezc-EventLog-1_3-1_fc10:F-11:php-ezc-EventLog-1.3-1.fc10.src.rpm:1240856078


--- NEW FILE php-ezc-EventLog.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLog
%define channel components.ez.no

Name:           php-ezc-EventLog
Version:        1.3
Release:        1%{?dist}
Summary:        Allows you to log events or audit trails

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Allows you to log events or audit trails into files or other storage spaces in
different formats.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_autoload.php


%changelog
* Wed Mar 04 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:15:42 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:16:06 -0000	1.2
@@ -0,0 +1 @@
+EventLog-1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLog/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:15:42 -0000	1.1
+++ sources	27 Apr 2009 18:16:06 -0000	1.2
@@ -0,0 +1 @@
+fc076796311c9571a6fe62774d288ef0  EventLog-1.3.tgz



From scop at fedoraproject.org  Mon Apr 27 18:17:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 27 Apr 2009 18:17:04 +0000 (UTC)
Subject: rpms/libmodplug/EL-5 .cvsignore, 1.4, 1.5 libmodplug.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <20090427181704.48A1970110@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1215/EL-5

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
- Update to 0.8.7 (security, #496834).

* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
- Update to 0.8.5, should fix #483146.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2007 18:28:06 -0000	1.4
+++ .cvsignore	27 Apr 2009 18:16:33 -0000	1.5
@@ -1 +1 @@
-libmodplug-0.8.4.tar.gz
+libmodplug-0.8.7.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/EL-5/libmodplug.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libmodplug.spec	6 Apr 2007 18:28:06 -0000	1.12
+++ libmodplug.spec	27 Apr 2009 18:16:33 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           libmodplug
-Version:        0.8.4
+Version:        0.8.7
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
@@ -27,8 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
-chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
-sed -i -e 's/\r//g' ChangeLog
+chmod -c -x src/tables.h
 
 
 %build
@@ -68,6 +67,21 @@
 
 
 %changelog
+* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
+- Update to 0.8.7 (security, #496834).
+
+* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
+- Update to 0.8.5, should fix #483146.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb  9 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.4-3
+- Rebuild.
+
+* Tue Aug 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.4-2
+- Rebuild.
+
 * Wed Apr  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.4-1
 - 0.8.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2007 18:28:06 -0000	1.4
+++ sources	27 Apr 2009 18:16:33 -0000	1.5
@@ -1 +1 @@
-091bd1168a524a4f36fc61f95209e7e4  libmodplug-0.8.4.tar.gz
+d2d9ccd8da22412999caed076140f786  libmodplug-0.8.7.tar.gz



From scop at fedoraproject.org  Mon Apr 27 18:17:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 27 Apr 2009 18:17:04 +0000 (UTC)
Subject: rpms/libmodplug/F-9 .cvsignore, 1.4, 1.5 libmodplug.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <20090427181704.B0B8170110@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libmodplug/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1215/F-9

Modified Files:
	.cvsignore libmodplug.spec sources 
Log Message:
* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
- Update to 0.8.7 (security, #496834).

* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
- Update to 0.8.5, should fix #483146.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Apr 2007 10:10:05 -0000	1.4
+++ .cvsignore	27 Apr 2009 18:16:34 -0000	1.5
@@ -1 +1 @@
-libmodplug-0.8.4.tar.gz
+libmodplug-0.8.7.tar.gz


Index: libmodplug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-9/libmodplug.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libmodplug.spec	9 Feb 2008 19:23:53 -0000	1.14
+++ libmodplug.spec	27 Apr 2009 18:16:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libmodplug
-Version:        0.8.4
-Release:        3%{?dist}
+Version:        0.8.7
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -27,8 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
-chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
-sed -i -e 's/\r//g' ChangeLog
+chmod -c -x src/tables.h
 
 
 %build
@@ -68,6 +67,15 @@
 
 
 %changelog
+* Mon Apr 27 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.7-1
+- Update to 0.8.7 (security, #496834).
+
+* Tue Apr 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.5-1
+- Update to 0.8.5, should fix #483146.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb  9 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8.4-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmodplug/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Apr 2007 10:10:05 -0000	1.4
+++ sources	27 Apr 2009 18:16:34 -0000	1.5
@@ -1 +1 @@
-091bd1168a524a4f36fc61f95209e7e4  libmodplug-0.8.4.tar.gz
+d2d9ccd8da22412999caed076140f786  libmodplug-0.8.7.tar.gz



From cwickert at fedoraproject.org  Mon Apr 27 18:18:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 27 Apr 2009 18:18:02 +0000 (UTC)
Subject: rpms/lxsession-lite/devel lxsession-lite.spec,1.4,1.5
Message-ID: <20090427181802.4D1BF70110@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1644

Modified Files:
	lxsession-lite.spec 
Log Message:
add patch url


Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/devel/lxsession-lite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lxsession-lite.spec	27 Apr 2009 18:11:01 -0000	1.4
+++ lxsession-lite.spec	27 Apr 2009 18:17:32 -0000	1.5
@@ -8,6 +8,7 @@
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://sourceforge.net/tracker/?func=detail&aid=2778757&group_id=180858&atid=894871
 Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
 Patch1:         lxsession-lite-0.3.6-session_name_fix.patch
 Patch2:         lxsession-lite-0.3.6-new-gdm.patch



From oget at fedoraproject.org  Mon Apr 27 18:18:55 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:18:55 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins/devel import.log, NONE,
	1.1 lv2-zynadd-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427181855.9053870110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1884/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-zynadd-plugins.spec 
Log Message:
* Thu Apr 23 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-3
- Remove unnecessary BR: jack-audio-connection-kit-devel
- Fix mixed tabs&spaces warnings
- Add Requires: lv2core

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-2
- prepare package for Fedora submission. SPEC file is courtesy of PlanetCCRMA.

* Thu Aug 07 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build



--- NEW FILE import.log ---
lv2-zynadd-plugins-1-3_fc10:HEAD:lv2-zynadd-plugins-1-3.fc10.src.rpm:1240856272


--- NEW FILE lv2-zynadd-plugins.spec ---
%global pkgname zyn

Summary:	LV2 port of the ZynAddSubFX engine
Name:		lv2-zynadd-plugins
Version:	1
Release:	3%{?dist}
# lv2-midi*.h is LGPLv2+
# but the rest is GPLv2. The whole plugin will be then:
License:	GPLv2
Group:		Applications/Multimedia
URL:		http://home.gna.org/zyn/
Source:		http://download.gna.org/%{pkgname}/%{pkgname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	fftw-devel
BuildRequires:	lv2core-devel
BuildRequires:	lv2dynparam-devel
Requires:	lv2core
Provides:	%{pkgname} = %{version}-%{release}

%description
The zyn project main goal is to extract synth engines from ZynAddSubFX and pack
them in LV2 plugin format. Resulting plugins are heavily based on work made by
Nasca Octavian Paul. If you like the amazing sounds these plugins generate you
should thank Paul for this.

%prep
%setup -q -n %{pkgname}-%{version}

# Don't hide anything
sed -i 's|\t@|\t|' GNUmakefile

%build
make %{?_smp_mflags} \
	CFLAGS="%{optflags} -fPIC -DPIC \
	$(pkg-config --cflags fftw3 lv2core lv2dynparamplugin1)" \
	CXXFLAGS="%{optflags}" \
	LDFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/lv2
make LV2_INSTALL_PATH=%{buildroot}%{_libdir}/lv2 install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS README gpl.txt
%{_libdir}/lv2/zynadd.lv2/

%changelog
* Thu Apr 23 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-3
- Remove unnecessary BR: jack-audio-connection-kit-devel
- Fix mixed tabs&spaces warnings
- Add Requires: lv2core

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-2
- prepare package for Fedora submission. SPEC file is courtesy of PlanetCCRMA.

* Thu Aug 07 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-zynadd-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:26:44 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:18:25 -0000	1.2
@@ -0,0 +1 @@
+zyn-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-zynadd-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:26:44 -0000	1.1
+++ sources	27 Apr 2009 18:18:25 -0000	1.2
@@ -0,0 +1 @@
+ead0a8db5440e480c8a23441195a76df  zyn-1.tar.bz2



From oget at fedoraproject.org  Mon Apr 27 18:20:53 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:20:53 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins/F-11 import.log, NONE,
	1.1 lv2-zynadd-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427182053.6B85B70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2651/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-zynadd-plugins.spec 
Log Message:
* Thu Apr 23 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-3
- Remove unnecessary BR: jack-audio-connection-kit-devel
- Fix mixed tabs&spaces warnings
- Add Requires: lv2core

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-2
- prepare package for Fedora submission. SPEC file is courtesy of PlanetCCRMA.

* Thu Aug 07 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build



--- NEW FILE import.log ---
lv2-zynadd-plugins-1-3_fc10:F-11:lv2-zynadd-plugins-1-3.fc10.src.rpm:1240856399


--- NEW FILE lv2-zynadd-plugins.spec ---
%global pkgname zyn

Summary:	LV2 port of the ZynAddSubFX engine
Name:		lv2-zynadd-plugins
Version:	1
Release:	3%{?dist}
# lv2-midi*.h is LGPLv2+
# but the rest is GPLv2. The whole plugin will be then:
License:	GPLv2
Group:		Applications/Multimedia
URL:		http://home.gna.org/zyn/
Source:		http://download.gna.org/%{pkgname}/%{pkgname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	fftw-devel
BuildRequires:	lv2core-devel
BuildRequires:	lv2dynparam-devel
Requires:	lv2core
Provides:	%{pkgname} = %{version}-%{release}

%description
The zyn project main goal is to extract synth engines from ZynAddSubFX and pack
them in LV2 plugin format. Resulting plugins are heavily based on work made by
Nasca Octavian Paul. If you like the amazing sounds these plugins generate you
should thank Paul for this.

%prep
%setup -q -n %{pkgname}-%{version}

# Don't hide anything
sed -i 's|\t@|\t|' GNUmakefile

%build
make %{?_smp_mflags} \
	CFLAGS="%{optflags} -fPIC -DPIC \
	$(pkg-config --cflags fftw3 lv2core lv2dynparamplugin1)" \
	CXXFLAGS="%{optflags}" \
	LDFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/lv2
make LV2_INSTALL_PATH=%{buildroot}%{_libdir}/lv2 install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS README gpl.txt
%{_libdir}/lv2/zynadd.lv2/

%changelog
* Thu Apr 23 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-3
- Remove unnecessary BR: jack-audio-connection-kit-devel
- Fix mixed tabs&spaces warnings
- Add Requires: lv2core

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-2
- prepare package for Fedora submission. SPEC file is courtesy of PlanetCCRMA.

* Thu Aug 07 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-zynadd-plugins/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:26:44 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:20:22 -0000	1.2
@@ -0,0 +1 @@
+zyn-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-zynadd-plugins/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:26:44 -0000	1.1
+++ sources	27 Apr 2009 18:20:23 -0000	1.2
@@ -0,0 +1 @@
+ead0a8db5440e480c8a23441195a76df  zyn-1.tar.bz2



From caillon at fedoraproject.org  Mon Apr 27 18:21:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 18:21:40 +0000 (UTC)
Subject: rpms/xulrunner/F-11 .cvsignore, 1.66,
	1.67 mozilla-191-pkgconfig.patch, 
	1.2, 1.3 sources, 1.69, 1.70 xulrunner.spec, 1.154,
	1.155 mfsa-2009-12.patch, 1.1, NONE mfsa-2009-13.patch, 1.1,
	NONE xulrunner-elif.patch, 1.1, NONE xulrunner-pango.patch, 1.1, NONE
Message-ID: <20090427182140.BD43970110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2801

Modified Files:
	.cvsignore mozilla-191-pkgconfig.patch sources xulrunner.spec 
Removed Files:
	mfsa-2009-12.patch mfsa-2009-13.patch xulrunner-elif.patch 
	xulrunner-pango.patch 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.20
- 1.9.1 beta 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-11/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	13 Mar 2009 23:35:53 -0000	1.66
+++ .cvsignore	27 Apr 2009 18:21:10 -0000	1.67
@@ -1 +1 @@
-xulrunner-1.9.1b3-source.tar.bz2
+xulrunner-1.9.1b4-source.tar.bz2

mozilla-191-pkgconfig.patch:

Index: mozilla-191-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-11/mozilla-191-pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-191-pkgconfig.patch	22 Dec 2008 16:32:22 -0000	1.2
+++ mozilla-191-pkgconfig.patch	27 Apr 2009 18:21:10 -0000	1.3
@@ -138,5 +138,5 @@
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Cflags: -I${includedir}/stable
-+Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	13 Mar 2009 23:35:53 -0000	1.69
+++ sources	27 Apr 2009 18:21:10 -0000	1.70
@@ -1 +1 @@
-61cd1a7fc587f6d2a33c564033198e2c  xulrunner-1.9.1b3-source.tar.bz2
+ff6bf463300cb56bcf750973b2af3d80  xulrunner-1.9.1b4-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- xulrunner.spec	27 Mar 2009 22:59:24 -0000	1.154
+++ xulrunner.spec	27 Apr 2009 18:21:10 -0000	1.155
@@ -3,7 +3,7 @@
 %define cairo_version 1.6.0
 %define lcms_version 1.17
 %define freetype_version 2.1.9
-%define sqlite_version 3.6.7
+%define sqlite_version 3.6.10
 %define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
@@ -12,11 +12,11 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.11.beta3%{?dist}
+Release:        0.20.beta4%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}b3-source.tar.bz2
+Source0:        xulrunner-%{version}b4-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -27,16 +27,12 @@
 Patch1:         mozilla-build.patch
 Patch2:         mozilla-191-path.patch
 Patch3:         mozilla-jemalloc.patch
-Patch4:         xulrunner-pango.patch
-Patch5:         xulrunner-elif.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
 
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
-Patch101:       mfsa-2009-12.patch
-Patch102:       mfsa-2009-13.patch
 
 # ---------------------------------------------------
 
@@ -151,15 +147,11 @@
 %patch1  -p1 -b .build
 %patch2  -p1 -b .path
 %patch3  -p1 -b .jemalloc
-%patch4  -p1 -b .pango
-%patch5  -p1 -b .elif
 
 %patch10 -p1 -b .pk
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
 
-%patch101 -p1 -b .mfsa-2009-12
-%patch102 -p1 -b .mfsa-2009-13
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -452,6 +444,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.20
+- 1.9.1 beta 4
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.11
 - Add patches for MFSA-2009-12, MFSA-2009-13
 


--- mfsa-2009-12.patch DELETED ---


--- mfsa-2009-13.patch DELETED ---


--- xulrunner-elif.patch DELETED ---


--- xulrunner-pango.patch DELETED ---



From oget at fedoraproject.org  Mon Apr 27 18:22:11 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon, 27 Apr 2009 18:22:11 +0000 (UTC)
Subject: rpms/lv2-zynadd-plugins/F-10 import.log, NONE,
	1.1 lv2-zynadd-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427182211.E35FA70110@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lv2-zynadd-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3085/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-zynadd-plugins.spec 
Log Message:
* Thu Apr 23 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-3
- Remove unnecessary BR: jack-audio-connection-kit-devel
- Fix mixed tabs&spaces warnings
- Add Requires: lv2core

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-2
- prepare package for Fedora submission. SPEC file is courtesy of PlanetCCRMA.

* Thu Aug 07 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build



--- NEW FILE import.log ---
lv2-zynadd-plugins-1-3_fc10:F-10:lv2-zynadd-plugins-1-3.fc10.src.rpm:1240856482


--- NEW FILE lv2-zynadd-plugins.spec ---
%global pkgname zyn

Summary:	LV2 port of the ZynAddSubFX engine
Name:		lv2-zynadd-plugins
Version:	1
Release:	3%{?dist}
# lv2-midi*.h is LGPLv2+
# but the rest is GPLv2. The whole plugin will be then:
License:	GPLv2
Group:		Applications/Multimedia
URL:		http://home.gna.org/zyn/
Source:		http://download.gna.org/%{pkgname}/%{pkgname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	fftw-devel
BuildRequires:	lv2core-devel
BuildRequires:	lv2dynparam-devel
Requires:	lv2core
Provides:	%{pkgname} = %{version}-%{release}

%description
The zyn project main goal is to extract synth engines from ZynAddSubFX and pack
them in LV2 plugin format. Resulting plugins are heavily based on work made by
Nasca Octavian Paul. If you like the amazing sounds these plugins generate you
should thank Paul for this.

%prep
%setup -q -n %{pkgname}-%{version}

# Don't hide anything
sed -i 's|\t@|\t|' GNUmakefile

%build
make %{?_smp_mflags} \
	CFLAGS="%{optflags} -fPIC -DPIC \
	$(pkg-config --cflags fftw3 lv2core lv2dynparamplugin1)" \
	CXXFLAGS="%{optflags}" \
	LDFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/lv2
make LV2_INSTALL_PATH=%{buildroot}%{_libdir}/lv2 install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS README gpl.txt
%{_libdir}/lv2/zynadd.lv2/

%changelog
* Thu Apr 23 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-3
- Remove unnecessary BR: jack-audio-connection-kit-devel
- Fix mixed tabs&spaces warnings
- Add Requires: lv2core

* Mon Mar 30 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1-2
- prepare package for Fedora submission. SPEC file is courtesy of PlanetCCRMA.

* Thu Aug 07 2008 Arnaud Gomes-do-Vale <Arnaud.Gomes at ircam.fr> - 1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-zynadd-plugins/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:26:44 -0000	1.1
+++ .cvsignore	27 Apr 2009 18:21:41 -0000	1.2
@@ -0,0 +1 @@
+zyn-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-zynadd-plugins/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:26:44 -0000	1.1
+++ sources	27 Apr 2009 18:21:41 -0000	1.2
@@ -0,0 +1 @@
+ead0a8db5440e480c8a23441195a76df  zyn-1.tar.bz2



From rdieter at fedoraproject.org  Mon Apr 27 18:25:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 18:25:25 +0000 (UTC)
Subject: rpms/PyQt4/F-9 PyQt4.spec,1.11,1.12
Message-ID: <20090427182525.C72DA70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4192

Modified Files:
	PyQt4.spec 
Log Message:
* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
- rebuild for phonon bindings (#497680)



Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-9/PyQt4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PyQt4.spec	5 Mar 2009 01:30:32 -0000	1.11
+++ PyQt4.spec	27 Apr 2009 18:24:55 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -17,10 +17,11 @@
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
 
-BuildRequires: qt4-devel >= 4.4.0-10
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
+BuildRequires: phonon-devel
+BuildRequires: qt4-devel >= 4.5.0-7
 
 BuildRequires: python-devel
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -122,6 +123,9 @@
 
 
 %changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
+- rebuild for phonon bindings (#497680)
+
 * Wed Mar 05 2009 Rex Dieter <rdieter at fedorproject.org> - 4.4.4-5
 - move designer plugins to main/runtime (#487622)
 



From laxathom at fedoraproject.org  Mon Apr 27 18:30:55 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Mon, 27 Apr 2009 18:30:55 +0000 (UTC)
Subject: rpms/python-sqlite2/F-11 python-sqlite2.spec, 1.21, 1.22 sources,
	1.11, 1.12
Message-ID: <20090427183055.35AE770110@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/python-sqlite2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4884

Modified Files:
	python-sqlite2.spec sources 
Log Message:
update release


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/F-11/python-sqlite2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-sqlite2.spec	26 Feb 2009 23:34:55 -0000	1.21
+++ python-sqlite2.spec	27 Apr 2009 18:30:24 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.3.3
-Release:        6%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Xavier Lamien <lxtnow at gmail.com> - 1:2.3.5-1
+- Update release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Mar 2007 17:29:03 -0000	1.11
+++ sources	27 Apr 2009 18:30:24 -0000	1.12
@@ -1 +1 @@
-cac3e827f22befff8b6302109c6eff34  pysqlite-2.3.3.tar.gz
+b4a185e936848370fcc1a5b17755b641  pysqlite-2.3.5.tar.gz



From mclasen at fedoraproject.org  Mon Apr 27 18:32:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 18:32:39 +0000 (UTC)
Subject: rpms/gnome-media/F-11 fix-alignment-of-sliders.patch, 1.1,
	1.2 gnome-media.spec, 1.169, 1.170
Message-ID: <20090427183239.CFD2470110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5083

Modified Files:
	fix-alignment-of-sliders.patch gnome-media.spec 
Log Message:
Fix alignment of sliders on the application tab as well


fix-alignment-of-sliders.patch:

Index: fix-alignment-of-sliders.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/fix-alignment-of-sliders.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-alignment-of-sliders.patch	16 Apr 2009 04:45:09 -0000	1.1
+++ fix-alignment-of-sliders.patch	27 Apr 2009 18:32:39 -0000	1.2
@@ -1,7 +1,7 @@
-diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c hacked/gnome-volume-control/src/gvc-balance-bar.c
---- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-03-03 16:26:48.000000000 -0500
-+++ hacked/gnome-volume-control/src/gvc-balance-bar.c	2009-04-16 00:00:36.451383748 -0400
-@@ -385,7 +385,7 @@
+diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c
+--- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders	2009-03-03 16:26:48.000000000 -0500
++++ gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-04-27 14:00:51.205166047 -0400
+@@ -385,7 +385,7 @@ gvc_balance_bar_init (GvcBalanceBar *bar
          bar->priv->label = gtk_label_new_with_mnemonic (_("_Balance:"));
          gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
                                  0.0,
@@ -10,10 +10,10 @@
          /* frame */
          frame = gtk_frame_new (NULL);
          gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c hacked/gnome-volume-control/src/gvc-channel-bar.c
---- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:10:01.957634048 -0400
-+++ hacked/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:01:58.002641476 -0400
-@@ -102,6 +102,7 @@
+diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c
+--- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders	2009-04-27 14:00:51.192165593 -0400
++++ gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-27 14:25:21.855382395 -0400
+@@ -102,6 +102,7 @@ _scale_box_new (GvcChannelBar *bar)
          GtkWidget            *box;
          GtkWidget            *sbox;
          GtkWidget            *ebox;
@@ -21,7 +21,7 @@
  
          if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
                  bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
-@@ -143,7 +144,6 @@
+@@ -143,7 +144,6 @@ _scale_box_new (GvcChannelBar *bar)
  
                  gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
                  gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
@@ -29,39 +29,35 @@
                  gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
  
                  bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
-@@ -578,6 +578,7 @@
+@@ -578,9 +578,20 @@ gvc_channel_bar_set_is_amplified (GvcCha
          	str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
          	gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
          			    GTK_POS_BOTTOM, str);
 +		gtk_widget_queue_resize (bar->priv->scale);
          	g_free (str);
++                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0, 0, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0);
++
++
  	} else {
  		gtk_scale_clear_marks (GTK_SCALE (bar->priv->scale));
-@@ -812,23 +813,23 @@
-                           "toggled",
-                           G_CALLBACK (on_mute_button_toggled),
-                           bar);
--        bar->priv->mute_box = gtk_alignment_new (0.5, 0.5, 0, 0);
-+        bar->priv->mute_box = gtk_alignment_new (0.5, 0, 0, 0);
-         gtk_container_add (GTK_CONTAINER (bar->priv->mute_box), bar->priv->mute_button);
- 
-         bar->priv->low_image = gtk_image_new_from_icon_name ("audio-volume-low",
-                                                              GTK_ICON_SIZE_BUTTON);
-+        gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0);
-         gtk_widget_set_no_show_all (bar->priv->low_image, TRUE);
-         bar->priv->high_image = gtk_image_new_from_icon_name ("audio-volume-high",
-                                                               GTK_ICON_SIZE_BUTTON);
-+        gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0);
-         gtk_widget_set_no_show_all (bar->priv->high_image, TRUE);
++                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0.5, 0, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.5);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0.5);
+ 	}
+ }
  
-         bar->priv->image = gtk_image_new ();
+@@ -826,9 +837,7 @@ gvc_channel_bar_init (GvcChannelBar *bar
          gtk_widget_set_no_show_all (bar->priv->image, TRUE);
  
          bar->priv->label = gtk_label_new (NULL);
 -        gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
 -                                0.0,
 -                                0.5);
-+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.0);
++        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
          gtk_widget_set_no_show_all (bar->priv->label, TRUE);
  
          /* frame */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gnome-media.spec	23 Apr 2009 14:17:53 -0000	1.169
+++ gnome-media.spec	27 Apr 2009 18:32:39 -0000	1.170
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.26.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
@@ -258,6 +258,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
+- Fix alignment of sliders on the application tab as well
+
 * Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-3
 - Don't show debug when disabling the debug output (#493138)
 



From jwrdegoede at fedoraproject.org  Mon Apr 27 18:38:59 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 27 Apr 2009 18:38:59 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel
	open-iscsi-2.0-870.1-fwparam-ppc-crash.patch, NONE,
	1.1 iscsi-initiator-utils.spec, 1.43,
	1.44 open-iscsi-2.0-870.1-490515-workaround.patch, 1.2, NONE
Message-ID: <20090427183859.C951A70110@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6248

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-2.0-870.1-fwparam-ppc-crash.patch 
Removed Files:
	open-iscsi-2.0-870.1-490515-workaround.patch 
Log Message:
* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-9
- Don't crash when asked to parse the ppc firmware table more then
  once (which can be done from libiscsi) (#491363)


open-iscsi-2.0-870.1-fwparam-ppc-crash.patch:

--- NEW FILE open-iscsi-2.0-870.1-fwparam-ppc-crash.patch ---
diff -up open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c.crash open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c
--- open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c.crash	2008-11-22 18:06:46.000000000 +0100
+++ open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c	2009-04-27 20:33:33.000000000 +0200
@@ -341,6 +341,7 @@ static int loop_devs(const char *devtree
 	int i;
 	char prefix[256];
 
+	nic_count = 0;
 	error = nftw(devtree, find_nics, 20, 0);
 	if (error)
 		return error;
@@ -352,6 +353,7 @@ static int loop_devs(const char *devtree
 	qsort(niclist, nic_count, sizeof(char *), nic_cmp);
 
 	snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
+	dev_count = 0;
 	error = nftw(prefix, find_initiator, 20, 0);
 	if (error)
 		return error;
@@ -366,8 +368,6 @@ static int loop_devs(const char *devtree
 
 		}
 	}
-	if (!error)
-		putchar('\n');
 	return error;
 }
 
@@ -425,7 +425,7 @@ static void fill_context(struct boot_con
 int fwparam_ppc(struct boot_context *context, const char *filepath)
 {
 	int error;
-	int fplen = 0;
+	int dev_count;
 	char *devtree;
 
 	/*
@@ -435,13 +435,10 @@ int fwparam_ppc(struct boot_context *con
 	 * systems that can support iscsi are the ones that provide
 	 * the appropriate FCODE with a load method.
 	 */
-	if (filepath) {
-		strncat(filename, filepath, FILENAMESZ);
-		fplen = strlen(filename);
-	} else
-		strncat(filename, DT_TOP, FILENAMESZ);
-
-	strncat(filename + fplen, BOOTPATH, FILENAMESZ - fplen);
+	if (filepath)  
+		snprintf(filename, FILENAMESZ, "%s%s", filepath, BOOTPATH);
+	else
+		snprintf(filename, FILENAMESZ, "%s%s", DT_TOP, BOOTPATH);
 
 	if (debug)
 		fprintf(stderr, "%s: file:%s; debug:%d\n", __func__, filename,


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- iscsi-initiator-utils.spec	3 Apr 2009 07:29:43 -0000	1.43
+++ iscsi-initiator-utils.spec	27 Apr 2009 18:38:29 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -19,7 +19,7 @@
 Patch8: open-iscsi-2.0-870.1-no-exit.patch
 Patch9: open-iscsi-2.0-870.1-ibft-newer-kernel.patch
 Patch10: open-iscsi-2.0-870.1-485217.patch
-Patch11: open-iscsi-2.0-870.1-490515-workaround.patch
+Patch11: open-iscsi-2.0-870.1-fwparam-ppc-crash.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -162,6 +162,10 @@
 %{_includedir}/libiscsi.h
 
 %changelog
+* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-9
+- Don't crash when asked to parse the ppc firmware table more then
+  once (which can be done from libiscsi) (#491363)
+
 * Fri Apr  3 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-8
 - Stop the NM script from exiting with an error status when it
   didn't do anything (#493411)


--- open-iscsi-2.0-870.1-490515-workaround.patch DELETED ---



From notting at fedoraproject.org  Mon Apr 27 18:40:08 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 27 Apr 2009 18:40:08 +0000 (UTC)
Subject: rpms/mash/F-11 .cvsignore, 1.43, 1.44 mash.spec, 1.49, 1.50 sources,
	1.45, 1.46
Message-ID: <20090427184008.EBF7470110@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6514

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
0.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	17 Apr 2009 19:15:54 -0000	1.43
+++ .cvsignore	27 Apr 2009 18:39:38 -0000	1.44
@@ -1 +1 @@
-mash-0.5.2.tar.gz
+mash-0.5.3.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/mash.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mash.spec	17 Apr 2009 19:15:54 -0000	1.49
+++ mash.spec	27 Apr 2009 18:39:38 -0000	1.50
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,10 @@
 /var/cache/mash
 
 %changelog
+* Mon Apr 27 2009 Bill Nottingham <notting at redhat.com> 0.5.3-1
+- when copying in old deltas, make sure the signatures match current packages
+- don't delta source and debuginfo packages
+
 * Fri Apr 17 2009 Bill Nottingham <notting at redhat.com> 0.5.2-1
 - set a max size for deltarpm-able packages (#496242)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-11/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	17 Apr 2009 19:15:54 -0000	1.45
+++ sources	27 Apr 2009 18:39:38 -0000	1.46
@@ -1 +1 @@
-87c775930ffb2eac9e04236d713342f2  mash-0.5.2.tar.gz
+a487d6e4192fb01b44dfb6aa46caa571  mash-0.5.3.tar.gz



From mclasen at fedoraproject.org  Mon Apr 27 18:45:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 18:45:43 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.79,1.80
Message-ID: <20090427184543.8D55070110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7529

Modified Files:
	ekiga.spec 
Log Message:
Rebuild against newer GConf/intltool



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ekiga.spec	20 Apr 2009 14:17:01 -0000	1.79
+++ ekiga.spec	27 Apr 2009 18:45:12 -0000	1.80
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.2.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
 Patch1:		ekiga-3.2.0-malloc.patch
@@ -143,6 +143,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 3.2.0-3
+- Rebuild against newer GConf/intltool
+
 * Mon Apr 20 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-2
 - Add a couple of upstream patches from 3.2.1
 



From dwalsh at fedoraproject.org  Mon Apr 27 18:56:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 27 Apr 2009 18:56:59 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.100,
	1.101 selinux-policy.spec, 1.837, 1.838
Message-ID: <20090427185659.766C070110@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9650

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-21
- Allow confined users to manace virt_content_t, since this is home dir content
- Allow all domains to read rpm_script_tmp_t which is what shell creates on redirection


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- policy-20090105.patch	27 Apr 2009 14:45:15 -0000	1.100
+++ policy-20090105.patch	27 Apr 2009 18:56:58 -0000	1.101
@@ -782,7 +782,7 @@
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 13:45:16.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-27 11:01:26.000000000 -0400
 @@ -11,8 +11,8 @@
  init_daemon_domain(readahead_t, readahead_exec_t)
  application_domain(readahead_t, readahead_exec_t)
@@ -808,7 +808,15 @@
  
  manage_files_pattern(readahead_t, readahead_var_run_t, readahead_var_run_t)
  files_pid_filetrans(readahead_t, readahead_var_run_t, file)
-@@ -58,6 +60,7 @@
+@@ -46,6 +48,7 @@
+ storage_raw_read_fixed_disk(readahead_t)
+ 
+ domain_use_interactive_fds(readahead_t)
++domain_read_all_domains_state(readahead_t)
+ 
+ files_dontaudit_getattr_all_sockets(readahead_t)
+ files_list_non_security(readahead_t)
+@@ -58,6 +61,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -816,7 +824,7 @@
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +75,7 @@
+@@ -72,6 +76,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -5184,7 +5192,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-27 11:30:40.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5255,7 +5263,7 @@
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +172,45 @@
+@@ -153,3 +172,46 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5280,6 +5288,7 @@
 +	rpm_rw_pipes(domain)
 +	rpm_dontaudit_use_script_fds(domain)
 +	rpm_dontaudit_write_pid_files(domain)
++	rpm_read_script_tmp_files(domain)
 +')
 +
 +optional_policy(`
@@ -14839,8 +14848,8 @@
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 10:00:53.000000000 -0400
-@@ -1,6 +1,8 @@
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 11:46:55.000000000 -0400
+@@ -1,6 +1,9 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
  
@@ -14849,6 +14858,7 @@
 +/var/lib/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_state_t,s0)
  /var/run/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_data_t,s0)
  /var/run/spamass-milter\.pid			--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
++/var/lib/miltermilter.*					gen_context(system_u:object_r:spamass_milter_state_t,s0)
 +
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
@@ -21885,7 +21895,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 08:31:39.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-27 11:45:25.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21982,7 +21992,15 @@
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -255,9 +308,15 @@
+@@ -239,6 +292,7 @@
+ corenet_sendrecv_all_client_packets(spamc_t)
+ 
+ fs_search_auto_mountpoints(spamc_t)
++fs_list_inotifyfs(spamc_t)
+ 
+ # cjp: these should probably be removed:
+ corecmd_list_bin(spamc_t)
+@@ -255,9 +309,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -21998,7 +22016,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,13 +324,16 @@
+@@ -265,13 +325,16 @@
  
  sysnet_read_config(spamc_t)
  
@@ -22022,7 +22040,7 @@
  ')
  
  optional_policy(`
-@@ -280,16 +342,21 @@
+@@ -280,16 +343,21 @@
  ')
  
  optional_policy(`
@@ -22046,7 +22064,7 @@
  ')
  
  ########################################
-@@ -301,7 +368,7 @@
+@@ -301,7 +369,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -22055,7 +22073,7 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +384,13 @@
+@@ -317,10 +385,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -22070,7 +22088,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +399,11 @@
+@@ -329,10 +400,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -22083,7 +22101,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +453,27 @@
+@@ -382,22 +454,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -22115,7 +22133,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +491,7 @@
+@@ -415,6 +492,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -22123,7 +22141,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +501,6 @@
+@@ -424,10 +502,6 @@
  ')
  
  optional_policy(`
@@ -22134,7 +22152,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +515,10 @@
+@@ -442,6 +516,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22145,7 +22163,7 @@
  ')
  
  optional_policy(`
-@@ -454,5 +531,9 @@
+@@ -454,5 +532,9 @@
  ')
  
  optional_policy(`
@@ -23420,7 +23438,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-27 11:40:19.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23449,7 +23467,7 @@
  
  type virt_etc_t;
  files_config_file(virt_etc_t)
-@@ -29,8 +34,12 @@
+@@ -29,8 +34,13 @@
  files_type(virt_etc_rw_t)
  
  # virt Image files
@@ -23461,10 +23479,11 @@
 +# virt Image files
 +type virt_content_t;
 +virtual_image(virt_content_t)
++userdom_user_home_content(virt_content_t)
  
  type virt_log_t;
  logging_log_file(virt_log_t)
-@@ -48,17 +57,39 @@
+@@ -48,17 +58,39 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -23506,7 +23525,7 @@
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
-@@ -67,7 +98,11 @@
+@@ -67,7 +99,11 @@
  manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
  filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir)
  
@@ -23519,7 +23538,7 @@
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -86,6 +121,7 @@
+@@ -86,6 +122,7 @@
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
  kernel_load_module(virtd_t)
@@ -23527,7 +23546,7 @@
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -96,7 +132,7 @@
+@@ -96,7 +133,7 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -23536,7 +23555,7 @@
  corenet_tcp_bind_vnc_port(virtd_t)
  corenet_tcp_connect_vnc_port(virtd_t)
  corenet_tcp_connect_soundd_port(virtd_t)
-@@ -104,21 +140,39 @@
+@@ -104,21 +141,39 @@
  
  dev_read_sysfs(virtd_t)
  dev_read_rand(virtd_t)
@@ -23577,7 +23596,7 @@
  term_getattr_pty_fs(virtd_t)
  term_use_ptmx(virtd_t)
  
-@@ -129,6 +183,13 @@
+@@ -129,6 +184,13 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -23591,7 +23610,7 @@
  userdom_read_all_users_state(virtd_t)
  
  tunable_policy(`virt_use_nfs',`
-@@ -167,22 +228,34 @@
+@@ -167,22 +229,34 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -23631,7 +23650,7 @@
  ')
  
  optional_policy(`
-@@ -198,5 +271,80 @@
+@@ -198,5 +272,80 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- selinux-policy.spec	27 Apr 2009 14:45:15 -0000	1.837
+++ selinux-policy.spec	27 Apr 2009 18:56:58 -0000	1.838
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,10 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-21
+- Allow confined users to manace virt_content_t, since this is home dir content
+- Allow all domains to read rpm_script_tmp_t which is what shell creates on redirection
+
 * Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20
 - Fix labeling on /var/lib/misc/prelink*
 - Allow xserver to rw_shm_perms with all x_clients



From dwalsh at fedoraproject.org  Mon Apr 27 18:57:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 27 Apr 2009 18:57:24 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.107,
	1.108 selinux-policy.spec, 1.843, 1.844
Message-ID: <20090427185724.216F970110@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9799

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-21
- Allow confined users to manace virt_content_t, since this is home dir content
- Allow all domains to read rpm_script_tmp_t which is what shell creates on redirection


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- policy-20090105.patch	27 Apr 2009 14:45:51 -0000	1.107
+++ policy-20090105.patch	27 Apr 2009 18:57:23 -0000	1.108
@@ -782,7 +782,7 @@
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-24 13:45:16.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-27 11:01:26.000000000 -0400
 @@ -11,8 +11,8 @@
  init_daemon_domain(readahead_t, readahead_exec_t)
  application_domain(readahead_t, readahead_exec_t)
@@ -808,7 +808,15 @@
  
  manage_files_pattern(readahead_t, readahead_var_run_t, readahead_var_run_t)
  files_pid_filetrans(readahead_t, readahead_var_run_t, file)
-@@ -58,6 +60,7 @@
+@@ -46,6 +48,7 @@
+ storage_raw_read_fixed_disk(readahead_t)
+ 
+ domain_use_interactive_fds(readahead_t)
++domain_read_all_domains_state(readahead_t)
+ 
+ files_dontaudit_getattr_all_sockets(readahead_t)
+ files_list_non_security(readahead_t)
+@@ -58,6 +61,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -816,7 +824,7 @@
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +75,7 @@
+@@ -72,6 +76,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -5184,7 +5192,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-27 11:30:40.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5255,7 +5263,7 @@
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +172,45 @@
+@@ -153,3 +172,46 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5280,6 +5288,7 @@
 +	rpm_rw_pipes(domain)
 +	rpm_dontaudit_use_script_fds(domain)
 +	rpm_dontaudit_write_pid_files(domain)
++	rpm_read_script_tmp_files(domain)
 +')
 +
 +optional_policy(`
@@ -14839,8 +14848,8 @@
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 10:00:53.000000000 -0400
-@@ -1,6 +1,8 @@
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 11:46:55.000000000 -0400
+@@ -1,6 +1,9 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
  
@@ -14849,6 +14858,7 @@
 +/var/lib/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_state_t,s0)
  /var/run/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_data_t,s0)
  /var/run/spamass-milter\.pid			--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
++/var/lib/miltermilter.*					gen_context(system_u:object_r:spamass_milter_state_t,s0)
 +
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
@@ -21885,7 +21895,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-24 08:31:39.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-27 11:45:25.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21982,7 +21992,15 @@
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -255,9 +308,15 @@
+@@ -239,6 +292,7 @@
+ corenet_sendrecv_all_client_packets(spamc_t)
+ 
+ fs_search_auto_mountpoints(spamc_t)
++fs_list_inotifyfs(spamc_t)
+ 
+ # cjp: these should probably be removed:
+ corecmd_list_bin(spamc_t)
+@@ -255,9 +309,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -21998,7 +22016,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,13 +324,16 @@
+@@ -265,13 +325,16 @@
  
  sysnet_read_config(spamc_t)
  
@@ -22022,7 +22040,7 @@
  ')
  
  optional_policy(`
-@@ -280,16 +342,21 @@
+@@ -280,16 +343,21 @@
  ')
  
  optional_policy(`
@@ -22046,7 +22064,7 @@
  ')
  
  ########################################
-@@ -301,7 +368,7 @@
+@@ -301,7 +369,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -22055,7 +22073,7 @@
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +384,13 @@
+@@ -317,10 +385,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -22070,7 +22088,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +399,11 @@
+@@ -329,10 +400,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -22083,7 +22101,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +453,27 @@
+@@ -382,22 +454,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -22115,7 +22133,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +491,7 @@
+@@ -415,6 +492,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -22123,7 +22141,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +501,6 @@
+@@ -424,10 +502,6 @@
  ')
  
  optional_policy(`
@@ -22134,7 +22152,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +515,10 @@
+@@ -442,6 +516,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22145,7 +22163,7 @@
  ')
  
  optional_policy(`
-@@ -454,5 +531,9 @@
+@@ -454,5 +532,9 @@
  ')
  
  optional_policy(`
@@ -23420,7 +23438,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-27 11:40:19.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23449,7 +23467,7 @@
  
  type virt_etc_t;
  files_config_file(virt_etc_t)
-@@ -29,8 +34,12 @@
+@@ -29,8 +34,13 @@
  files_type(virt_etc_rw_t)
  
  # virt Image files
@@ -23461,10 +23479,11 @@
 +# virt Image files
 +type virt_content_t;
 +virtual_image(virt_content_t)
++userdom_user_home_content(virt_content_t)
  
  type virt_log_t;
  logging_log_file(virt_log_t)
-@@ -48,17 +57,39 @@
+@@ -48,17 +58,39 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -23506,7 +23525,7 @@
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
-@@ -67,7 +98,11 @@
+@@ -67,7 +99,11 @@
  manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
  filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir)
  
@@ -23519,7 +23538,7 @@
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -86,6 +121,7 @@
+@@ -86,6 +122,7 @@
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
  kernel_load_module(virtd_t)
@@ -23527,7 +23546,7 @@
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -96,7 +132,7 @@
+@@ -96,7 +133,7 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -23536,7 +23555,7 @@
  corenet_tcp_bind_vnc_port(virtd_t)
  corenet_tcp_connect_vnc_port(virtd_t)
  corenet_tcp_connect_soundd_port(virtd_t)
-@@ -104,21 +140,39 @@
+@@ -104,21 +141,39 @@
  
  dev_read_sysfs(virtd_t)
  dev_read_rand(virtd_t)
@@ -23577,7 +23596,7 @@
  term_getattr_pty_fs(virtd_t)
  term_use_ptmx(virtd_t)
  
-@@ -129,6 +183,13 @@
+@@ -129,6 +184,13 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -23591,7 +23610,7 @@
  userdom_read_all_users_state(virtd_t)
  
  tunable_policy(`virt_use_nfs',`
-@@ -167,22 +228,34 @@
+@@ -167,22 +229,34 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -23631,7 +23650,7 @@
  ')
  
  optional_policy(`
-@@ -198,5 +271,80 @@
+@@ -198,5 +272,80 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.843
retrieving revision 1.844
diff -u -r1.843 -r1.844
--- selinux-policy.spec	27 Apr 2009 14:45:52 -0000	1.843
+++ selinux-policy.spec	27 Apr 2009 18:57:23 -0000	1.844
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,10 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-21
+- Allow confined users to manace virt_content_t, since this is home dir content
+- Allow all domains to read rpm_script_tmp_t which is what shell creates on redirection
+
 * Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20
 - Fix labeling on /var/lib/misc/prelink*
 - Allow xserver to rw_shm_perms with all x_clients



From mclasen at fedoraproject.org  Mon Apr 27 18:58:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 18:58:29 +0000 (UTC)
Subject: rpms/gnome-media/devel fix-alignment-of-sliders.patch, NONE,
	1.1 gnome-media.spec, 1.167, 1.168
Message-ID: <20090427185829.D260170110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8885

Modified Files:
	gnome-media.spec 
Added Files:
	fix-alignment-of-sliders.patch 
Log Message:
fix alignment of sliders


fix-alignment-of-sliders.patch:

--- NEW FILE fix-alignment-of-sliders.patch ---
diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders	2009-03-03 16:26:48.000000000 -0500
+++ gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-04-27 14:00:51.205166047 -0400
@@ -385,7 +385,7 @@ gvc_balance_bar_init (GvcBalanceBar *bar
         bar->priv->label = gtk_label_new_with_mnemonic (_("_Balance:"));
         gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
                                 0.0,
-                                0.5);
+                                0.0);
         /* frame */
         frame = gtk_frame_new (NULL);
         gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders	2009-04-27 14:00:51.192165593 -0400
+++ gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-27 14:25:21.855382395 -0400
@@ -102,6 +102,7 @@ _scale_box_new (GvcChannelBar *bar)
         GtkWidget            *box;
         GtkWidget            *sbox;
         GtkWidget            *ebox;
+        GtkWidget            *alignment;
 
         if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
                 bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
@@ -143,7 +144,6 @@ _scale_box_new (GvcChannelBar *bar)
 
                 gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
                 gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
-
                 gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
 
                 bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
@@ -578,9 +578,20 @@ gvc_channel_bar_set_is_amplified (GvcCha
         	str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
         	gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
         			    GTK_POS_BOTTOM, str);
+		gtk_widget_queue_resize (bar->priv->scale);
         	g_free (str);
+                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0, 0, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0);
+
+
 	} else {
 		gtk_scale_clear_marks (GTK_SCALE (bar->priv->scale));
+                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0.5, 0, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.5);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0.5);
 	}
 }
 
@@ -826,9 +837,7 @@ gvc_channel_bar_init (GvcChannelBar *bar
         gtk_widget_set_no_show_all (bar->priv->image, TRUE);
 
         bar->priv->label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
-                                0.0,
-                                0.5);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
         gtk_widget_set_no_show_all (bar->priv->label, TRUE);
 
         /* frame */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-media.spec	27 Apr 2009 06:24:09 -0000	1.167
+++ gnome-media.spec	27 Apr 2009 18:57:59 -0000	1.168
@@ -21,6 +21,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=574312
 Patch3:		gnome-media-add-100-mark.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579115
+Patch4:         fix-alignment-of-sliders.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
 URL:            http://www.gnome.org
@@ -81,6 +84,7 @@
 pushd gnome-volume-control/src
 %patch3 -p0 -b .amplified-mark
 popd
+%patch4 -p1 -b .fix-alignment-of-sliders
 
 autoreconf -f -i
 
@@ -258,6 +262,7 @@
 %changelog
 * Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Don't drop schemas translations from po files
+- Fix alignment of sliders
 
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0



From cebbert at fedoraproject.org  Mon Apr 27 18:59:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 27 Apr 2009 18:59:55 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.29.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.1004, 1.1005 kernel.spec, 1.1349,
	1.1350 linux-2.6-upstream-reverts.patch, 1.8, 1.9 sources, 1.965,
	1.966 upstream, 1.876, 1.877 patch-2.6.29.1.bz2.sign, 1.1,
	NONE patch-2.6.29.2-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090427185955.78D6470110@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10297

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.29.2.bz2.sign 
Removed Files:
	patch-2.6.29.1.bz2.sign patch-2.6.29.2-rc1.bz2.sign 
Log Message:
Linux 2.6.29.2


--- NEW FILE patch-2.6.29.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ9fvQyGugalF9Dw4RAsB/AKCOOk344x+bwLrUgSXgLb0V0bsmigCfRXVj
v9JWzcbgEEo+r6kMQyEnngE=
=UsGN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -r1.1004 -r1.1005
--- .cvsignore	23 Apr 2009 14:24:17 -0000	1.1004
+++ .cvsignore	27 Apr 2009 18:59:24 -0000	1.1005
@@ -5,5 +5,4 @@
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29.1.bz2
-patch-2.6.29.2-rc1.bz2
+patch-2.6.29.2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1349
retrieving revision 1.1350
diff -u -r1.1349 -r1.1350
--- kernel.spec	24 Apr 2009 19:11:42 -0000	1.1349
+++ kernel.spec	27 Apr 2009 18:59:24 -0000	1.1350
@@ -38,7 +38,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 2
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1917,6 +1917,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-50
+- Linux 2.6.29.2
+
 * Fri Apr 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-49.rc1
 - Fix hang with HPET timer at boot (F11#497351)
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-upstream-reverts.patch	23 Apr 2009 22:32:16 -0000	1.8
+++ linux-2.6-upstream-reverts.patch	27 Apr 2009 18:59:24 -0000	1.9
@@ -1,228 +0,0 @@
--stable review patch.  If anyone has any objections, please let us know.
----------------------
-
-From: alex.shi <alex.shi at intel.com>
-
-upstream commit: ff69f2bba67bd45514923aaedbf40fe351787c59
-
-We found Cx states time abnormal in our some of machines which have 16
-LCPUs, the C0 take too many time while system is really idle when kernel
-enabled tickless and highres.  powertop output is below:
-
-     PowerTOP version 1.9       (C) 2007 Intel Corporation
-
-Cn                Avg residency       P-states (frequencies)
-C0 (cpu running)        (40.5%)         2.53 Ghz     0.0%
-C1                0.0ms ( 0.0%)         2.53 Ghz     0.0%
-C2              128.8ms (59.5%)         2.40 Ghz     0.0%
-                                        1.60 Ghz   100.0%
-
-Wakeups-from-idle per second :  4.7     interval: 20.0s
-no ACPI power usage estimate available
-
-Top causes for wakeups:
-  41.4% ( 24.9)       <interrupt> : extra timer interrupt
-  20.2% ( 12.2)     <kernel core> : usb_hcd_poll_rh_status
-(rh_timer_func)
-
-After tacking detailed for this issue, Yakui and I find it is due to 24
-bit PM timer overflows when some of cpu sleep more than 4 seconds.  With
-tickless kernel, the CPU want to sleep as much as possible when system
-idle.  But the Cx sleep time are recorded by pmtimer which length is
-determined by BIOS.  The current Cx time was gotten in the following
-function from driver/acpi/processor_idle.c:
-
-static inline u32 ticks_elapsed(u32 t1, u32 t2)
-{
-       if (t2 >= t1)
-               return (t2 - t1);
-       else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
-               return (((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
-       else
-               return ((0xFFFFFFFF - t1) + t2);
-}
-
-If pmtimer is 24 bits and it take 5 seconds from t1 to t2, in above
-function, just about 1 seconds ticks was recorded.  So the Cx time will be
-reduced about 4 seconds.  and this is why we see above powertop output.
-
-To resolve this problem, Yakui and I use ktime_get() to record the Cx
-states time instead of PM timer as the following patch.  the patch was
-tested with i386/x86_64 modes on several platforms.
-
-Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
-Tested-by: Alex Shi <alex.shi at intel.com>
-Signed-off-by: Alex Shi <alex.shi at intel.com>
-Signed-off-by: Yakui.zhao <yakui.zhao at intel.com>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Len Brown <len.brown at intel.com>
-Signed-off-by: Chris Wright <chrisw at sous-sol.org>
----
- drivers/acpi/processor_idle.c |   63 ++++++++++++++++++------------------------
- 1 file changed, 27 insertions(+), 36 deletions(-)
-
---- a/drivers/acpi/processor_idle.c
-+++ b/drivers/acpi/processor_idle.c
-@@ -64,7 +64,6 @@
- #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
- ACPI_MODULE_NAME("processor_idle");
- #define ACPI_PROCESSOR_FILE_POWER	"power"
--#define US_TO_PM_TIMER_TICKS(t)		((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
- #define PM_TIMER_TICK_NS		(1000000000ULL/PM_TIMER_FREQUENCY)
- #define C2_OVERHEAD			1	/* 1us */
- #define C3_OVERHEAD			1	/* 1us */
-@@ -78,6 +77,10 @@ module_param(nocst, uint, 0000);
- static unsigned int latency_factor __read_mostly = 2;
- module_param(latency_factor, uint, 0644);
- 
-+static s64 us_to_pm_timer_ticks(s64 t)
-+{
-+	return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);
-+}
- /*
-  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
-  * For now disable this. Probably a bug somewhere else.
-@@ -159,25 +162,6 @@ static struct dmi_system_id __cpuinitdat
- 	{},
- };
- 
--static inline u32 ticks_elapsed(u32 t1, u32 t2)
--{
--	if (t2 >= t1)
--		return (t2 - t1);
--	else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
--		return (((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
--	else
--		return ((0xFFFFFFFF - t1) + t2);
--}
--
--static inline u32 ticks_elapsed_in_us(u32 t1, u32 t2)
--{
--	if (t2 >= t1)
--		return PM_TIMER_TICKS_TO_US(t2 - t1);
--	else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
--		return PM_TIMER_TICKS_TO_US(((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
--	else
--		return PM_TIMER_TICKS_TO_US((0xFFFFFFFF - t1) + t2);
--}
- 
- /*
-  * Callers should disable interrupts before the call and enable
-@@ -853,7 +837,8 @@ static inline void acpi_idle_do_entry(st
- static int acpi_idle_enter_c1(struct cpuidle_device *dev,
- 			      struct cpuidle_state *state)
- {
--	u32 t1, t2;
-+	ktime_t  kt1, kt2;
-+	s64 idle_time;
- 	struct acpi_processor *pr;
- 	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
- 
-@@ -871,14 +856,15 @@ static int acpi_idle_enter_c1(struct cpu
- 		return 0;
- 	}
- 
--	t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-+	kt1 = ktime_get_real();
- 	acpi_idle_do_entry(cx);
--	t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-+	kt2 = ktime_get_real();
-+	idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
- 
- 	local_irq_enable();
- 	cx->usage++;
- 
--	return ticks_elapsed_in_us(t1, t2);
-+	return idle_time;
- }
- 
- /**
-@@ -891,8 +877,9 @@ static int acpi_idle_enter_simple(struct
- {
- 	struct acpi_processor *pr;
- 	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
--	u32 t1, t2;
--	int sleep_ticks = 0;
-+	ktime_t  kt1, kt2;
-+	s64 idle_time;
-+	s64 sleep_ticks = 0;
- 
- 	pr = __get_cpu_var(processors);
- 
-@@ -925,18 +912,19 @@ static int acpi_idle_enter_simple(struct
- 	if (cx->type == ACPI_STATE_C3)
- 		ACPI_FLUSH_CPU_CACHE();
- 
--	t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-+	kt1 = ktime_get_real();
- 	/* Tell the scheduler that we are going deep-idle: */
- 	sched_clock_idle_sleep_event();
- 	acpi_idle_do_entry(cx);
--	t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-+	kt2 = ktime_get_real();
-+	idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
- 
- #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
- 	/* TSC could halt in idle, so notify users */
- 	if (tsc_halts_in_c(cx->type))
- 		mark_tsc_unstable("TSC halts in idle");;
- #endif
--	sleep_ticks = ticks_elapsed(t1, t2);
-+	sleep_ticks = us_to_pm_timer_ticks(idle_time);
- 
- 	/* Tell the scheduler how much we idled: */
- 	sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-@@ -948,7 +936,7 @@ static int acpi_idle_enter_simple(struct
- 
- 	acpi_state_timer_broadcast(pr, cx, 0);
- 	cx->time += sleep_ticks;
--	return ticks_elapsed_in_us(t1, t2);
-+	return idle_time;
- }
- 
- static int c3_cpu_count;
-@@ -966,8 +954,10 @@ static int acpi_idle_enter_bm(struct cpu
- {
- 	struct acpi_processor *pr;
- 	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
--	u32 t1, t2;
--	int sleep_ticks = 0;
-+	ktime_t  kt1, kt2;
-+	s64 idle_time;
-+	s64 sleep_ticks = 0;
-+
- 
- 	pr = __get_cpu_var(processors);
- 
-@@ -1034,9 +1024,10 @@ static int acpi_idle_enter_bm(struct cpu
- 		ACPI_FLUSH_CPU_CACHE();
- 	}
- 
--	t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-+	kt1 = ktime_get_real();
- 	acpi_idle_do_entry(cx);
--	t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-+	kt2 = ktime_get_real();
-+	idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
- 
- 	/* Re-enable bus master arbitration */
- 	if (pr->flags.bm_check && pr->flags.bm_control) {
-@@ -1051,7 +1042,7 @@ static int acpi_idle_enter_bm(struct cpu
- 	if (tsc_halts_in_c(ACPI_STATE_C3))
- 		mark_tsc_unstable("TSC halts in idle");
- #endif
--	sleep_ticks = ticks_elapsed(t1, t2);
-+	sleep_ticks = us_to_pm_timer_ticks(idle_time);
- 	/* Tell the scheduler how much we idled: */
- 	sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
- 
-@@ -1062,7 +1053,7 @@ static int acpi_idle_enter_bm(struct cpu
- 
- 	acpi_state_timer_broadcast(pr, cx, 0);
- 	cx->time += sleep_ticks;
--	return ticks_elapsed_in_us(t1, t2);
-+	return idle_time;
- }
- 
- struct cpuidle_driver acpi_idle_driver = {
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -r1.965 -r1.966
--- sources	23 Apr 2009 14:24:18 -0000	1.965
+++ sources	27 Apr 2009 18:59:24 -0000	1.966
@@ -1,3 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2
-b1c47bcaa6a72dfd4adaa5630ae75585  patch-2.6.29.2-rc1.bz2
+a3e79545ef18ff2a172f82fffef92deb  patch-2.6.29.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- upstream	23 Apr 2009 14:24:18 -0000	1.876
+++ upstream	27 Apr 2009 18:59:25 -0000	1.877
@@ -1,3 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29.1.bz2
-patch-2.6.29.2-rc1.bz2
+patch-2.6.29.2.bz2


--- patch-2.6.29.1.bz2.sign DELETED ---


--- patch-2.6.29.2-rc1.bz2.sign DELETED ---



From notting at fedoraproject.org  Mon Apr 27 19:01:03 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 27 Apr 2009 19:01:03 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.200,1.201
Message-ID: <20090427190103.F035D70110@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10558

Modified Files:
	comps-f11.xml.in 
Log Message:
fix langsupport (#486031)


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- comps-f11.xml.in	27 Apr 2009 11:47:06 -0000	1.200
+++ comps-f11.xml.in	27 Apr 2009 19:00:33 -0000	1.201
@@ -43,7 +43,7 @@
     <_name>Afrikaans Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>af</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-af</packagereq>
@@ -58,7 +58,7 @@
     <_name>Albanian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sq</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-sq</packagereq>
@@ -70,7 +70,7 @@
     <_name>Amazigh Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ber</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ber</packagereq>
@@ -81,7 +81,7 @@
     <_name>Arabic Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ar</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
@@ -105,7 +105,7 @@
     <_name>Armenian Support</_name>
     <_description>This group is a collection of tools and resources of Armenian environments.</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>hy</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -119,7 +119,7 @@
     <_name>Assamese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>as</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
@@ -387,7 +387,7 @@
     <_name>Basque Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>eu</langonly>
     <packagelist>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-eu</packagereq>
@@ -403,7 +403,7 @@
     <_name>Belarusian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>be</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-be</packagereq>
@@ -417,7 +417,7 @@
     <_name>Bengali Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>bn</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
@@ -437,7 +437,7 @@
     <_name>Bhutanese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>dz</langonly>
     <packagelist>
       <packagereq type="mandatory">jomolhari-fonts</packagereq>
@@ -449,7 +449,7 @@
     <_name>Bosnian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>bs</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-bs</packagereq>
@@ -460,7 +460,7 @@
     <_name>Brazilian Portuguese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>pt_BR</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pt</packagereq>
@@ -478,7 +478,7 @@
     <_name>Breton Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>br</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-br</packagereq>
@@ -491,7 +491,7 @@
     <_name>English (UK) Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>en_GB</langonly>
     <packagelist>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-British</packagereq>
@@ -536,7 +536,7 @@
     <_name>Bulgarian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>bg</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-bg</packagereq>
@@ -558,7 +558,7 @@
     <_name>Myanmar (Burmese) Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>my</langonly>
     <packagelist>
       <packagereq type="default">padauk-fonts</packagereq>
@@ -570,7 +570,7 @@
     <_name>Catalan Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ca</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ca</packagereq>
@@ -587,7 +587,7 @@
     <_name>Chinese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>zh</langonly>
     <packagelist>
       <packagereq type="mandatory">cjkuni-ukai-fonts</packagereq>
@@ -705,7 +705,7 @@
     <_name>Croatian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>hr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-hr</packagereq>
@@ -724,7 +724,7 @@
     <_name>Czech Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>cs</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-cs</packagereq>
@@ -748,7 +748,7 @@
     <_name>Danish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>da</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-da</packagereq>
@@ -1068,7 +1068,7 @@
     <_name>Dutch Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>nl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-nl</packagereq>
@@ -1397,7 +1397,7 @@
     <_name>Esperanto Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>eo</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-eo</packagereq>
@@ -1410,7 +1410,7 @@
     <_name>Estonian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>et</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ee</packagereq>
@@ -1431,7 +1431,7 @@
     <_name>Ethiopic Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>am</langonly>
     <packagelist>
       <packagereq type="default">abyssinica-fonts</packagereq>
@@ -1445,7 +1445,7 @@
     <_name>Faeroese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fo</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-fo</packagereq>
@@ -1479,7 +1479,7 @@
     <_name>Filipino Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fil</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-tl</packagereq>
@@ -1491,7 +1491,7 @@
     <_name>Finnish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-fi</packagereq>
@@ -1757,7 +1757,7 @@
     <_name>French Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-fr</packagereq>
@@ -1783,7 +1783,7 @@
     <_name>Frisian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fy</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-fy</packagereq>
@@ -1794,7 +1794,7 @@
     <_name>Friulian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fur</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-fur</packagereq>
@@ -1818,7 +1818,7 @@
     <_name>Gaelic Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>gd</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-gd</packagereq>
@@ -1830,7 +1830,7 @@
     <_name>Galician Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>gl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-gl</packagereq>
@@ -2107,7 +2107,7 @@
     <_name>Georgian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ka</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -2121,7 +2121,7 @@
     <_name>German Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>de</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-de</packagereq>
@@ -2529,7 +2529,7 @@
     <_name>Greek Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>el</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-el</packagereq>
@@ -2577,7 +2577,7 @@
     <_name>Gujarati Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>gu</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-gujarati-fonts</packagereq>
@@ -2667,7 +2667,7 @@
     <_name>Hebrew Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>he</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -2698,7 +2698,7 @@
     <_name>Hindi Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>hi</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-hindi-fonts</packagereq>
@@ -2723,7 +2723,7 @@
     <_name>Hungarian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>hu</langonly>
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-hu</packagereq>
@@ -2745,7 +2745,7 @@
     <_name>Icelandic Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>is</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-is</packagereq>
@@ -2759,7 +2759,7 @@
     <_name>Indonesian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>id</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-id</packagereq>
@@ -2891,7 +2891,7 @@
     <_name>Inuktitut Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>iu</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -2902,7 +2902,7 @@
     <_name>Irish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ga</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ga</packagereq>
@@ -2919,7 +2919,7 @@
     <_name>Italian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>it</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-it</packagereq>
@@ -2942,7 +2942,7 @@
     <_name>Japanese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ja</langonly>
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ja</packagereq>
@@ -3155,7 +3155,7 @@
     <_name>Kannada Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>kn</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
@@ -3173,7 +3173,7 @@
     <_name>Kashmiri Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ks</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-kashmiri-fonts</packagereq>
@@ -3188,7 +3188,7 @@
     <_name>Kashubian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>csb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-csb</packagereq>
@@ -3331,7 +3331,7 @@
     <_name>Khmer Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>km</langonly>
     <packagelist>
       <packagereq type="mandatory">khmeros-base-fonts</packagereq>
@@ -3353,7 +3353,7 @@
     <_name>Kinyarwanda Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>rw</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-rw</packagereq>
@@ -3364,7 +3364,7 @@
     <_name>Konkani Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>kok</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-konkani-fonts</packagereq>
@@ -3379,7 +3379,7 @@
     <_name>Korean Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ko</langonly>
     <packagelist>
       <packagereq type="mandatory">un-core-fonts-dotum</packagereq>
@@ -3422,7 +3422,7 @@
     <_name>Kurdish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ku</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ku</packagereq>
@@ -3434,7 +3434,7 @@
     <_name>Lao Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>lo</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -3447,7 +3447,7 @@
     <_name>Latvian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>lv</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-lv</packagereq>
@@ -3567,7 +3567,7 @@
     <_name>Lithuanian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>lt</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-lt</packagereq>
@@ -3582,7 +3582,7 @@
     <_name>Low Saxon Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>nds</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-nds</packagereq>
@@ -3623,7 +3623,7 @@
     <_name>Macedonian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>mk</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-mk</packagereq>
@@ -3675,7 +3675,7 @@
     <_name>Maithili Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>mai</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
@@ -3690,7 +3690,7 @@
     <_name>Malagasy Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>mg</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-mg</packagereq>
@@ -3701,7 +3701,7 @@
     <_name>Malay Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ms</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ms</packagereq>
@@ -3715,7 +3715,7 @@
     <_name>Malayalam Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ml</langonly>
     <packagelist>
       <packagereq type="mandatory">m17n-contrib-malayalam</packagereq>
@@ -3743,7 +3743,7 @@
     <_name>Maori Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>mi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-mi</packagereq>
@@ -3756,7 +3756,7 @@
     <_name>Marathi Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>mr</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-marathi-fonts</packagereq>
@@ -3819,7 +3819,7 @@
     <_name>Mongolian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>mn</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-mn</packagereq>
@@ -3855,7 +3855,7 @@
     <_name>Nepali Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ne</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-nepali-fonts</packagereq>
@@ -3937,7 +3937,7 @@
     <_name>Northern Sami Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>se</langonly>
     <packagelist>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-NorthernSami</packagereq>
@@ -3948,7 +3948,7 @@
     <_name>Northern Sotho Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>nso</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-nso</packagereq>
@@ -3960,7 +3960,7 @@
     <_name>Norwegian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>nb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-no</packagereq>
@@ -4022,7 +4022,7 @@
     <_name>Occitan Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>oc</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-oc</packagereq>
@@ -4126,7 +4126,7 @@
     <_name>Oriya Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>or</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-oriya-fonts</packagereq>
@@ -4146,7 +4146,7 @@
     <_name>Persian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>fa</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-fa</packagereq>
@@ -4160,7 +4160,7 @@
     <_name>Polish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>pl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pl</packagereq>
@@ -4184,7 +4184,7 @@
     <_name>Portuguese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>pt</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pt</packagereq>
@@ -4225,7 +4225,7 @@
     <_name>Punjabi Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>pa</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-punjabi-fonts</packagereq>
@@ -4246,7 +4246,7 @@
     <_name>Romanian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ro</langonly>
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
@@ -4263,7 +4263,7 @@
     <_name>Ruby</_name>
     <_description>Basic support for the Ruby programming language.</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">ruby</packagereq>
       <packagereq type="default">ruby-devel</packagereq>
@@ -4277,7 +4277,7 @@
     <_name>Russian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ru</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ru</packagereq>
@@ -4308,7 +4308,7 @@
     <_name>Samoan Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sm</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-sm</packagereq>
@@ -4319,7 +4319,7 @@
     <_name>Serbian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sr</packagereq>
@@ -4361,7 +4361,7 @@
     <_name>Sindhi Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sd</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-sindhi-fonts</packagereq>
@@ -4374,7 +4374,7 @@
     <_name>Sinhala Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>si</langonly>
     <packagelist>
       <packagereq type="mandatory">lklug-fonts</packagereq>
@@ -4390,7 +4390,7 @@
     <_name>Slovak Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sk</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sk</packagereq>
@@ -4410,7 +4410,7 @@
     <_name>Slovenian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sl</packagereq>
@@ -4443,7 +4443,7 @@
     <_name>Somali Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-so</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-so</packagereq>
@@ -4584,7 +4584,7 @@
     <_name>Southern Ndebele Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>nr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-nr</packagereq>
@@ -4596,7 +4596,7 @@
     <_name>Southern Sotho Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>st</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-st</packagereq>
@@ -4608,7 +4608,7 @@
     <_name>Spanish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>es</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-es</packagereq>
@@ -4682,7 +4682,7 @@
     <_name>Swati Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ss</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ss</packagereq>
@@ -4694,7 +4694,7 @@
     <_name>Swedish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>sv</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sv</packagereq>
@@ -4908,7 +4908,7 @@
     <_name>Tagalog Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>tl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-tl</packagereq>
@@ -4920,7 +4920,7 @@
     <_name>Tajik Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>tg</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -4933,7 +4933,7 @@
     <_name>Tamil Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ta</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-tamil-fonts</packagereq>
@@ -4958,7 +4958,7 @@
     <_name>Telugu Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>te</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-telugu-fonts</packagereq>
@@ -5026,7 +5026,7 @@
     <_name>Thai Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>th</langonly>
     <packagelist>
       <packagereq type="mandatory">m17n-db-thai</packagereq>
@@ -5055,7 +5055,7 @@
     <_name>Tibetan Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>bo</langonly>
     <packagelist>
       <packagereq type="mandatory">m17n-db-tibetan</packagereq>
@@ -5069,7 +5069,7 @@
     <_name>Tonga Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>to</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-to</packagereq>
@@ -5080,7 +5080,7 @@
     <_name>Tsonga Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ts</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ts</packagereq>
@@ -5092,7 +5092,7 @@
     <_name>Tswana Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>tn</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-tn</packagereq>
@@ -5104,7 +5104,7 @@
     <_name>Turkish Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>tr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-tr</packagereq>
@@ -5123,7 +5123,7 @@
     <_name>Turkmen Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>tk</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-tk</packagereq>
@@ -5134,7 +5134,7 @@
     <_name>Ukrainian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>uk</langonly>
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-uk</packagereq>
@@ -5157,7 +5157,7 @@
     <_name>Upper Sorbian Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>hsb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-hsb</packagereq>
@@ -5168,7 +5168,7 @@
     <_name>Urdu Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ur</langonly>
     <packagelist>
       <packagereq type="mandatory">m17n-contrib-urdu</packagereq>
@@ -5186,7 +5186,7 @@
     <_name>Uzbek Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>uz</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-uz</packagereq>
@@ -5198,7 +5198,7 @@
     <_name>Venda Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>ve</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
@@ -5213,7 +5213,7 @@
     <_name>Vietnamese Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>vi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-vi</packagereq>
@@ -5243,7 +5243,7 @@
     <_name>Walloon Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>wa</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-wa</packagereq>
@@ -5336,7 +5336,7 @@
     <_name>Welsh Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>cy</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-cy</packagereq>
@@ -5531,7 +5531,7 @@
     <_name>Xhosa Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>xh</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-xh</packagereq>
@@ -5543,7 +5543,7 @@
     <_name>Zulu Support</_name>
     <_description/>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <langonly>zu</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-zu</packagereq>



From mclasen at fedoraproject.org  Mon Apr 27 19:01:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 19:01:47 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.190,1.191
Message-ID: <20090427190148.0099470110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10681

Modified Files:
	gnome-vfs2.spec 
Log Message:
don't drop schemas translations from po files



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- gnome-vfs2.spec	2 Apr 2009 11:52:23 -0000	1.190
+++ gnome-vfs2.spec	27 Apr 2009 19:01:17 -0000	1.191
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -141,7 +141,7 @@
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
 cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -239,6 +239,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-3
+- Don't drop schemas translations from po files anymore
+
 * Thu Apr  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-2
 - Rebuilt to solve multilib issues (#492926)
 



From caillon at fedoraproject.org  Mon Apr 27 19:02:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:02:30 +0000 (UTC)
Subject: rpms/epiphany/F-9 epiphany.spec,1.200,1.201
Message-ID: <20090427190230.8403A70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10866

Modified Files:
	epiphany.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.2-11
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-9/epiphany.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- epiphany.spec	21 Apr 2009 22:59:06 -0000	1.200
+++ epiphany.spec	27 Apr 2009 19:02:00 -0000	1.201
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.22.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -214,6 +214,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.2-11
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.2-10
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:03:03 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:03:03 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.226,1.227
Message-ID: <20090427190303.312ED70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10977

Modified Files:
	epiphany.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.3-6
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- epiphany.spec	21 Apr 2009 21:37:07 -0000	1.226
+++ epiphany.spec	27 Apr 2009 19:02:32 -0000	1.227
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -259,6 +259,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.3-6
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.3-5
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:03:14 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:03:14 +0000 (UTC)
Subject: rpms/blam/F-9 blam.spec,1.34,1.35
Message-ID: <20090427190314.AD94D70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11174

Modified Files:
	blam.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-9.1
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-9/blam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- blam.spec	21 Apr 2009 23:00:09 -0000	1.34
+++ blam.spec	27 Apr 2009 19:02:44 -0000	1.35
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.0.9
+%define	gecko_version		1.9.0.10
 
 Name:		blam
 Version:	1.8.5
-Release:	8%{?dist}.1
+Release:	9%{?dist}.1
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -136,6 +136,9 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-9.1
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-8.1
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:03:52 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:03:52 +0000 (UTC)
Subject: rpms/blam/F-10 blam.spec,1.32,1.33
Message-ID: <20090427190352.7392470110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11336

Modified Files:
	blam.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-10
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-10/blam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- blam.spec	21 Apr 2009 21:38:37 -0000	1.32
+++ blam.spec	27 Apr 2009 19:03:22 -0000	1.33
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.0.9
+%define	gecko_version		1.9.0.10
 
 Name:		blam
 Version:	1.8.5
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-10
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:03:58 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:03:58 +0000 (UTC)
Subject: rpms/cairo-dock/F-9 cairo-dock.spec,1.31,1.32
Message-ID: <20090427190358.BC8C070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11433

Modified Files:
	cairo-dock.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.6.3.1-1.7
- Rebuild against newer gecko



Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cairo-dock.spec	21 Apr 2009 23:01:35 -0000	1.31
+++ cairo-dock.spec	27 Apr 2009 19:03:28 -0000	1.32
@@ -38,7 +38,7 @@
 
 Name:		cairo-dock
 Version:	%{mainver}
-Release:	%{fedora_rel}%{?dist}.6
+Release:	%{fedora_rel}%{?dist}.7
 Summary:	Light eye-candy fully themable animated dock
 
 Group:		User Interface/Desktops
@@ -606,6 +606,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.6.3.1-1.7
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.6.3.1-1.6
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:04:41 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:04:41 +0000 (UTC)
Subject: rpms/devhelp/F-10 devhelp.spec,1.106,1.107
Message-ID: <20090427190441.9216170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/devhelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11761

Modified Files:
	devhelp.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.22-8
- Rebuild against newer gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/F-10/devhelp.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- devhelp.spec	21 Apr 2009 21:40:08 -0000	1.106
+++ devhelp.spec	27 Apr 2009 19:04:11 -0000	1.107
@@ -6,7 +6,7 @@
 
 Name: devhelp
 Version: 0.22
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -135,6 +135,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.22-8
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.22-7
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:04:42 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:04:42 +0000 (UTC)
Subject: rpms/chmsee/F-9 chmsee.spec,1.35,1.36
Message-ID: <20090427190442.D279B70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/chmsee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11785

Modified Files:
	chmsee.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-12
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/F-9/chmsee.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- chmsee.spec	21 Apr 2009 23:03:29 -0000	1.35
+++ chmsee.spec	27 Apr 2009 19:04:12 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary(zh_CN):	CHM ??????????????????, ?????? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-12
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-11
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:05:27 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:05:27 +0000 (UTC)
Subject: rpms/devhelp/F-9 devhelp.spec,1.99,1.100
Message-ID: <20090427190527.11D0370110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/devhelp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12075

Modified Files:
	devhelp.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-12
- Rebuild against newer gecko



Index: devhelp.spec
===================================================================
RCS file: /cvs/extras/rpms/devhelp/F-9/devhelp.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- devhelp.spec	21 Apr 2009 23:04:50 -0000	1.99
+++ devhelp.spec	27 Apr 2009 19:04:56 -0000	1.100
@@ -1,5 +1,5 @@
 # Last updated for 0.17
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 %define gtk2_version 2.8.0
 %define libwnck_version 2.10.0
 
@@ -7,7 +7,7 @@
 
 Name: devhelp
 Version: 0.19.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -138,6 +138,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-12
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-11
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:05:31 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:05:31 +0000 (UTC)
Subject: rpms/galeon/F-10 galeon.spec,1.62,1.63
Message-ID: <20090427190531.1C77070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12104

Modified Files:
	galeon.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-10
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-10/galeon.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- galeon.spec	21 Apr 2009 21:42:33 -0000	1.62
+++ galeon.spec	27 Apr 2009 19:05:00 -0000	1.63
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-10
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:06:08 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:06:08 +0000 (UTC)
Subject: rpms/evolution-rss/F-9 evolution-rss.spec,1.25,1.26
Message-ID: <20090427190608.EF7CA70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12313

Modified Files:
	evolution-rss.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.0-11
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/F-9/evolution-rss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- evolution-rss.spec	21 Apr 2009 23:05:57 -0000	1.25
+++ evolution-rss.spec	27 Apr 2009 19:05:38 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %doc TODO
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.0-11
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.1.0-10
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:06:21 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:06:21 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-10 gecko-sharp2.spec,1.33,1.34
Message-ID: <20090427190621.8E90070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gecko-sharp2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12454

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.13-8
- Rebuild against newer gecko



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/extras/rpms/gecko-sharp2/F-10/gecko-sharp2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gecko-sharp2.spec	21 Apr 2009 21:44:37 -0000	1.33
+++ gecko-sharp2.spec	27 Apr 2009 19:05:51 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.13-8
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.13-7
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:06:50 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:06:50 +0000 (UTC)
Subject: rpms/galeon/F-9 galeon.spec,1.61,1.62
Message-ID: <20090427190650.8A3CF70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12617

Modified Files:
	galeon.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-10
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- galeon.spec	21 Apr 2009 23:08:13 -0000	1.61
+++ galeon.spec	27 Apr 2009 19:06:20 -0000	1.62
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-10
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:07:08 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:07:08 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.41,1.42
Message-ID: <20090427190708.55B2270110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12755

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-30
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-10/gnome-python2-extras.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-python2-extras.spec	21 Apr 2009 21:46:21 -0000	1.41
+++ gnome-python2-extras.spec	27 Apr 2009 19:06:38 -0000	1.42
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -191,6 +191,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-30
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-29
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:07:34 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:07:34 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.39,1.40
Message-ID: <20090427190734.2D64270110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12906

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-27
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-python2-extras.spec	21 Apr 2009 23:09:44 -0000	1.39
+++ gnome-python2-extras.spec	27 Apr 2009 19:07:03 -0000	1.40
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -183,6 +183,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-27
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.19.1-26
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:07:54 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:07:54 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-10 gnome-web-photo.spec,1.18,1.19
Message-ID: <20090427190754.EE59170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13024

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3-18
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-10/gnome-web-photo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-web-photo.spec	21 Apr 2009 21:48:09 -0000	1.18
+++ gnome-web-photo.spec	27 Apr 2009 19:07:24 -0000	1.19
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -80,6 +80,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3-18
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3-17
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:08:17 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:08:17 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-9 gnome-web-photo.spec,1.20,1.21
Message-ID: <20090427190817.8794C70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13149

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3-21
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-9/gnome-web-photo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-web-photo.spec	21 Apr 2009 23:11:53 -0000	1.20
+++ gnome-web-photo.spec	27 Apr 2009 19:07:47 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -81,6 +81,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3-21
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3-20
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:08:42 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:08:42 +0000 (UTC)
Subject: rpms/google-gadgets/F-10 google-gadgets.spec,1.12,1.13
Message-ID: <20090427190842.3783470110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13298

Modified Files:
	google-gadgets.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-10/google-gadgets.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- google-gadgets.spec	21 Apr 2009 21:49:32 -0000	1.12
+++ google-gadgets.spec	27 Apr 2009 19:08:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-5
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:09:00 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:09:00 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.14,1.15
Message-ID: <20090427190900.1EE1D70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13422

Modified Files:
	google-gadgets.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- google-gadgets.spec	21 Apr 2009 23:14:13 -0000	1.14
+++ google-gadgets.spec	27 Apr 2009 19:08:29 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-5
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:09:29 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:09:29 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.77,1.78
Message-ID: <20090427190929.746EB70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13580

Modified Files:
	kazehakase.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.2
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kazehakase.spec	21 Apr 2009 21:50:54 -0000	1.77
+++ kazehakase.spec	27 Apr 2009 19:08:59 -0000	1.78
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.1
+Release:	%{_release}%{?dist}.2
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -303,6 +303,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.2
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.1
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:09:42 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:09:42 +0000 (UTC)
Subject: rpms/gtkmozembedmm/F-9 gtkmozembedmm.spec,1.36,1.37
Message-ID: <20090427190942.22D9970110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gtkmozembedmm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13698

Modified Files:
	gtkmozembedmm.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-29
- Rebuild against newer gecko



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/F-9/gtkmozembedmm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gtkmozembedmm.spec	21 Apr 2009 23:16:09 -0000	1.36
+++ gtkmozembedmm.spec	27 Apr 2009 19:09:11 -0000	1.37
@@ -1,7 +1,7 @@
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        28%{?dist}
+Release:        29%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-29
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.4.2.cvs20060817-28
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:10:16 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:10:16 +0000 (UTC)
Subject: rpms/Miro/F-10 Miro.spec,1.52,1.53
Message-ID: <20090427191016.6450970110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13829

Modified Files:
	Miro.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-4
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Miro.spec	21 Apr 2009 21:52:22 -0000	1.52
+++ Miro.spec	27 Apr 2009 19:09:46 -0000	1.53
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 
 Name:           Miro
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-4
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:10:32 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:10:32 +0000 (UTC)
Subject: rpms/kazehakase/F-9 kazehakase.spec,1.76,1.77
Message-ID: <20090427191032.083FF70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13965

Modified Files:
	kazehakase.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.2
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kazehakase.spec	21 Apr 2009 23:17:20 -0000	1.76
+++ kazehakase.spec	27 Apr 2009 19:10:01 -0000	1.77
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.1
+Release:	%{_release}%{?dist}.2
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -303,6 +303,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.2
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-4.1
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:11:08 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:11:08 +0000 (UTC)
Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.10,1.11
Message-ID: <20090427191108.0F89670110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14116

Modified Files:
	mozvoikko.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-10
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-10/mozvoikko.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mozvoikko.spec	21 Apr 2009 21:53:52 -0000	1.10
+++ mozvoikko.spec	27 Apr 2009 19:10:37 -0000	1.11
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-10
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:11:25 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:11:25 +0000 (UTC)
Subject: rpms/Miro/F-9 Miro.spec,1.43,1.44
Message-ID: <20090427191125.4502B70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14291

Modified Files:
	Miro.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-4
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Miro.spec	21 Apr 2009 23:18:54 -0000	1.43
+++ Miro.spec	27 Apr 2009 19:10:54 -0000	1.44
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 
 Name:           Miro
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-4
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:11:59 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:11:59 +0000 (UTC)
Subject: rpms/mugshot/F-10 mugshot.spec,1.47,1.48
Message-ID: <20090427191159.7392070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14533

Modified Files:
	mugshot.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-10/mugshot.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mugshot.spec	21 Apr 2009 21:55:32 -0000	1.47
+++ mugshot.spec	27 Apr 2009 19:11:29 -0000	1.48
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:12:13 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:12:13 +0000 (UTC)
Subject: rpms/mozvoikko/F-9 mozvoikko.spec,1.11,1.12
Message-ID: <20090427191213.13C9070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14686

Modified Files:
	mozvoikko.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-10
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-9/mozvoikko.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mozvoikko.spec	21 Apr 2009 23:20:25 -0000	1.11
+++ mozvoikko.spec	27 Apr 2009 19:11:42 -0000	1.12
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.9
+%define gecko_ver 1.9.0.10
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-10
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.9.5-9
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:12:52 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:12:52 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.14,1.15
Message-ID: <20090427191252.722E070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/pcmanx-gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14962

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3.8-9
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pcmanx-gtk2.spec	21 Apr 2009 21:57:11 -0000	1.14
+++ pcmanx-gtk2.spec	27 Apr 2009 19:12:22 -0000	1.15
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.0.9
+%define xulver 1.9.0.10
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   8%{?dist}
+Release:   9%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -124,6 +124,9 @@
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.3.8-9
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.3.8-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:13:01 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:13:01 +0000 (UTC)
Subject: rpms/mugshot/F-9 mugshot.spec,1.48,1.49
Message-ID: <20090427191301.3D78770110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15011

Modified Files:
	mugshot.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-9/mugshot.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mugshot.spec	21 Apr 2009 23:21:16 -0000	1.48
+++ mugshot.spec	27 Apr 2009 19:12:30 -0000	1.49
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -168,6 +168,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:13:49 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:13:49 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-9 ruby-gnome2.spec,1.36,1.37
Message-ID: <20090427191349.EC99070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15265

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.17.0-9
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ruby-gnome2.spec	21 Apr 2009 23:21:56 -0000	1.36
+++ ruby-gnome2.spec	27 Apr 2009 19:13:19 -0000	1.37
@@ -10,7 +10,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -700,6 +700,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.17.0-9
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.17.0-8
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:14:02 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:14:02 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.5,1.6
Message-ID: <20090427191402.1F5BD70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15312

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.1
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Gtk2-MozEmbed.spec	25 Apr 2009 06:22:56 -0000	1.5
+++ perl-Gtk2-MozEmbed.spec	27 Apr 2009 19:13:31 -0000	1.6
@@ -3,7 +3,7 @@
 %if 0%{?fedora} >= 11
 %define gecko_version 1.9.1
 %else
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 %endif
 
 # Using specfilever cause dumpspec to only increase 
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}
+Release:       %{specfilever}%{?dist}.1
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.1
+- Rebuild against newer gecko
+
 * Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-6
 - fix release to avoid breaking NEVR in next dumpspec
 
@@ -99,7 +102,7 @@
 - Rebuild against newer gecko
 
 * Sun Mar 29 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-3.fc10.2
-- Rebuild against xulrunner 1.9.0.9
+- Rebuild against xulrunner 1.9.0.10
 
 * Fri Mar 06 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-3.fc10.1
 - Rebuild against xulrunner 1.9.0.7



From caillon at fedoraproject.org  Mon Apr 27 19:14:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:14:40 +0000 (UTC)
Subject: rpms/totem/F-9 totem.spec,1.202,1.203
Message-ID: <20090427191440.C2F2070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/totem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15462

Modified Files:
	totem.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.23.2-16
- Rebuild against newer gecko



Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/F-9/totem.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- totem.spec	24 Apr 2009 14:16:57 -0000	1.202
+++ totem.spec	27 Apr 2009 19:14:10 -0000	1.203
@@ -11,7 +11,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -441,6 +441,9 @@
 %endif
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.23.2-16
+- Rebuild against newer gecko
+
 * Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 2.23.2-15
 - Update youtube plugin to latest upstream (#487927)
 



From caillon at fedoraproject.org  Mon Apr 27 19:14:58 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:14:58 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.40,1.41
Message-ID: <20090427191458.BE23670110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15584

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5.2
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ruby-gnome2.spec	21 Apr 2009 22:03:12 -0000	1.40
+++ ruby-gnome2.spec	27 Apr 2009 19:14:28 -0000	1.41
@@ -13,7 +13,7 @@
 
 Name:           ruby-gnome2
 Version:        0.18.1
-Release:        %{mainrel}%{?dist}.1
+Release:        %{mainrel}%{?dist}.2
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -741,6 +741,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5.2
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5.1
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:15:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:15:30 +0000 (UTC)
Subject: rpms/yelp/F-9 yelp.spec,1.145,1.146
Message-ID: <20090427191530.47C5370110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15726

Modified Files:
	yelp.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-12
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-9/yelp.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- yelp.spec	21 Apr 2009 23:25:04 -0000	1.145
+++ yelp.spec	27 Apr 2009 19:14:59 -0000	1.146
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.22.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -165,6 +165,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-12
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-11
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:15:46 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:15:46 +0000 (UTC)
Subject: rpms/yelp/F-10 yelp.spec,1.152,1.153
Message-ID: <20090427191546.5C12170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15843

Modified Files:
	yelp.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-9
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-10/yelp.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- yelp.spec	21 Apr 2009 22:06:11 -0000	1.152
+++ yelp.spec	27 Apr 2009 19:15:16 -0000	1.153
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.0.9
+%define gecko_version 1.9.0.10
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.24.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -157,6 +157,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-9
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-8
 - Rebuild against newer gecko
 



From laxathom at fedoraproject.org  Mon Apr 27 19:21:12 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Mon, 27 Apr 2009 19:21:12 +0000 (UTC)
Subject: rpms/python-sqlite2/devel python-sqlite2.spec, 1.21, 1.22 sources, 
	1.11, 1.12
Message-ID: <20090427192112.DC51470110@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/python-sqlite2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16644

Modified Files:
	python-sqlite2.spec sources 
Log Message:
update release


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-sqlite2.spec	26 Feb 2009 23:34:55 -0000	1.21
+++ python-sqlite2.spec	27 Apr 2009 19:20:42 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.3.3
-Release:        6%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Xavier Lamien <lxtnow at gmail.com> - 1:2.3.5-1
+- Update release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Mar 2007 17:29:03 -0000	1.11
+++ sources	27 Apr 2009 19:20:42 -0000	1.12
@@ -1 +1 @@
-cac3e827f22befff8b6302109c6eff34  pysqlite-2.3.3.tar.gz
+b4a185e936848370fcc1a5b17755b641  pysqlite-2.3.5.tar.gz



From cebbert at fedoraproject.org  Mon Apr 27 19:25:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 27 Apr 2009 19:25:12 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch, NONE,
	1.1 kernel.spec, 1.1350, 1.1351
Message-ID: <20090427192513.06AE570110@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17340

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch 
Log Message:
Fix HPET hang at boot on AMD 81xx, caused by backported 2.6.30 HPET fixes.

linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch:

--- NEW FILE linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch ---
From: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date: Tue, 21 Apr 2009 18:00:37 +0000 (+0200)
Subject: x86: hpet: fix periodic mode programming on AMD 81xx
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7a6f9cbb37120c745fc187083fb5c3de4dca4f97

x86: hpet: fix periodic mode programming on AMD 81xx

(See http://bugzilla.kernel.org/show_bug.cgi?id=12961)

It partially reverts commit c23e253e67c9d8a91a0ffa33c1f571a17f0a2403
(x86: hpet: stop HPET_COUNTER when programming periodic mode)

HPET on AMD 81xx chipset needs a second write (with HPET_TN_SETVAL
cleared) to T0_CMP register to set the period in periodic mode.

With this patch HPET_COUNTER is still stopped but not reset when HPET
is programmed in periodic mode. This should help to avoid races when
HPET is programmed in periodic mode and fixes a boot time hang that
I've observed on a machine when using 1000HZ.

[ Impact: fix boot time hang on machines with AMD 81xx chipset ]

Reported-by: Jeff Mahoney <jeffm at suse.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
Tested-by: Jeff Mahoney <jeffm at suse.com>
LKML-Reference: <20090421180037.GA2763 at alberich.amd.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 3f0019e..81408b9 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -236,6 +236,10 @@ static void hpet_stop_counter(void)
 	unsigned long cfg = hpet_readl(HPET_CFG);
 	cfg &= ~HPET_CFG_ENABLE;
 	hpet_writel(cfg, HPET_CFG);
+}
+
+static void hpet_reset_counter(void)
+{
 	hpet_writel(0, HPET_COUNTER);
 	hpet_writel(0, HPET_COUNTER + 4);
 }
@@ -250,6 +254,7 @@ static void hpet_start_counter(void)
 static void hpet_restart_counter(void)
 {
 	hpet_stop_counter();
+	hpet_reset_counter();
 	hpet_start_counter();
 }
 
@@ -309,7 +314,7 @@ static int hpet_setup_msi_irq(unsigned int irq);
 static void hpet_set_mode(enum clock_event_mode mode,
 			  struct clock_event_device *evt, int timer)
 {
-	unsigned long cfg;
+	unsigned long cfg, cmp, now;
 	uint64_t delta;
 
 	switch (mode) {
@@ -317,12 +322,23 @@ static void hpet_set_mode(enum clock_event_mode mode,
 		hpet_stop_counter();
 		delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult;
 		delta >>= evt->shift;
+		now = hpet_readl(HPET_COUNTER);
+		cmp = now + (unsigned long) delta;
 		cfg = hpet_readl(HPET_Tn_CFG(timer));
 		/* Make sure we use edge triggered interrupts */
 		cfg &= ~HPET_TN_LEVEL;
 		cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
 		       HPET_TN_SETVAL | HPET_TN_32BIT;
 		hpet_writel(cfg, HPET_Tn_CFG(timer));
+		hpet_writel(cmp, HPET_Tn_CMP(timer));
+		udelay(1);
+		/*
+		 * HPET on AMD 81xx needs a second write (with HPET_TN_SETVAL
+		 * cleared) to T0_CMP to set the period. The HPET_TN_SETVAL
+		 * bit is automatically cleared after the first write.
+		 * (See AMD-8111 HyperTransport I/O Hub Data Sheet,
+		 * Publication # 24674)
+		 */
 		hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer));
 		hpet_start_counter();
 		hpet_print_config();


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1350
retrieving revision 1.1351
diff -u -r1.1350 -r1.1351
--- kernel.spec	27 Apr 2009 18:59:24 -0000	1.1350
+++ kernel.spec	27 Apr 2009 19:24:42 -0000	1.1351
@@ -718,6 +718,7 @@
 # fix hpet hang at boot
 Patch9500: linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch
 Patch9501: linux-2.6-x86-hpet-stop-counter-when-programming.patch
+Patch9502: linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch
 
 # Backport of upstream memory reduction for ftrace
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
@@ -1337,6 +1338,7 @@
 # fix hpet hang at boot
 ApplyPatch linux-2.6-x86-hpet-provide-separate-start-stop-fns.patch
 ApplyPatch linux-2.6-x86-hpet-stop-counter-when-programming.patch
+ApplyPatch linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch
 
 # Reduce the memory usage of ftrace if you don't use it.
 ApplyPatch linux-2.6-ftrace-memory-reduction.patch
@@ -1917,6 +1919,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-51
+- Fix HPET hang at boot on AMD 81xx, caused by backported 2.6.30 HPET fixes.
+
 * Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-50
 - Linux 2.6.29.2
 



From xavierb at fedoraproject.org  Mon Apr 27 19:27:56 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon, 27 Apr 2009 19:27:56 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/devel import.log, NONE,
	1.1 perl-Crypt-CipherSaber.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090427192756.5E7C070110@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Crypt-CipherSaber.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
perl-Crypt-CipherSaber-1_00-1_fc10:HEAD:perl-Crypt-CipherSaber-1.00-1.fc10.src.rpm:1240859817


--- NEW FILE perl-Crypt-CipherSaber.spec ---
Name:           perl-Crypt-CipherSaber
Version:        1.00
Release:        1%{?dist}
Summary:        Perl module implementing CipherSaber encryption
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-CipherSaber/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-CipherSaber-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Simple) >= 0.60
BuildRequires:  perl(Test::Warn)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# FIXME : Next BR: enhance the tests, but fails.
#BuildRequires:  perl(Module::Signature)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Crypt::CipherSaber module implements CipherSaber encryption, described
at http://ciphersaber.gurus.com/. It is simple, fairly speedy, and
relatively secure algorithm based on RC4.

%prep
%setup -q -n Crypt-CipherSaber-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.00-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:38:06 -0000	1.1
+++ .cvsignore	27 Apr 2009 19:27:25 -0000	1.2
@@ -0,0 +1 @@
+Crypt-CipherSaber-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2009 05:38:06 -0000	1.1
+++ sources	27 Apr 2009 19:27:25 -0000	1.2
@@ -0,0 +1 @@
+a00b3e2591cc5f880a110cc53a0b2c7b  Crypt-CipherSaber-1.00.tar.gz



From kyle at fedoraproject.org  Mon Apr 27 19:31:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 27 Apr 2009 19:31:04 +0000 (UTC)
Subject: rpms/kernel/F-11 hpet-fixes.patch, 1.1, 1.2 kernel.spec, 1.1573,
	1.1574
Message-ID: <20090427193104.80CA870110@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18839

Modified Files:
	hpet-fixes.patch kernel.spec 
Log Message:
* Mon Apr 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-112
- 7a6f9cbb: x86: hpet: fix periodic mode programming on AMD 81xx


hpet-fixes.patch:

Index: hpet-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/hpet-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hpet-fixes.patch	24 Apr 2009 14:31:07 -0000	1.1
+++ hpet-fixes.patch	27 Apr 2009 19:30:33 -0000	1.2
@@ -1,3 +1,30 @@
+commit ef1e38c25baa3e6867270f207367bebcffab31b8
+Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
+Date:   Tue Apr 21 20:00:37 2009 +0200
+
+    x86: hpet: fix periodic mode programming on AMD 81xx
+    
+    (See http://bugzilla.kernel.org/show_bug.cgi?id=12961)
+    
+    It partially reverts commit c23e253e67c9d8a91a0ffa33c1f571a17f0a2403
+    (x86: hpet: stop HPET_COUNTER when programming periodic mode)
+    
+    HPET on AMD 81xx chipset needs a second write (with HPET_TN_SETVAL
+    cleared) to T0_CMP register to set the period in periodic mode.
+    
+    With this patch HPET_COUNTER is still stopped but not reset when HPET
+    is programmed in periodic mode. This should help to avoid races when
+    HPET is programmed in periodic mode and fixes a boot time hang that
+    I've observed on a machine when using 1000HZ.
+    
+    [ Impact: fix boot time hang on machines with AMD 81xx chipset ]
+    
+    Reported-by: Jeff Mahoney <jeffm at suse.com>
+    Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
+    Tested-by: Jeff Mahoney <jeffm at suse.com>
+    LKML-Reference: <20090421180037.GA2763 at alberich.amd.com>
+    Signed-off-by: Ingo Molnar <mingo at elte.hu>
+
 commit 7bad863035a98d0dd45ceb29c66b9c2ed90e595e
 Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
 Date:   Sat Feb 21 00:16:35 2009 +0100
@@ -63,7 +90,7 @@
  	com20020=	[HW,NET] ARCnet - COM20020 chipset
  			Format:
 diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
-index a00545f..648b3a2 100644
+index a00545f..b30f79c 100644
 --- a/arch/x86/kernel/hpet.c
 +++ b/arch/x86/kernel/hpet.c
 @@ -80,6 +80,7 @@ static inline void hpet_clear_mapping(void)
@@ -127,7 +154,7 @@
  /*
   * When the hpet driver (/dev/hpet) is enabled, we need to reserve
   * timer 0 and timer 1 in case of RTC emulation.
-@@ -191,27 +231,37 @@ static struct clock_event_device hpet_clockevent = {
+@@ -191,27 +231,42 @@ static struct clock_event_device hpet_clockevent = {
  	.rating		= 50,
  };
  
@@ -138,6 +165,10 @@
 -
  	cfg &= ~HPET_CFG_ENABLE;
  	hpet_writel(cfg, HPET_CFG);
++}
++
++static void hpet_reset_counter(void)
++{
  	hpet_writel(0, HPET_COUNTER);
  	hpet_writel(0, HPET_COUNTER + 4);
 +}
@@ -152,6 +183,7 @@
 +static void hpet_restart_counter(void)
 +{
 +	hpet_stop_counter();
++	hpet_reset_counter();
 +	hpet_start_counter();
 +}
 +
@@ -169,24 +201,15 @@
  }
  
  static void hpet_enable_legacy_int(void)
-@@ -259,29 +309,23 @@ static int hpet_setup_msi_irq(unsigned int irq);
- static void hpet_set_mode(enum clock_event_mode mode,
- 			  struct clock_event_device *evt, int timer)
- {
--	unsigned long cfg, cmp, now;
-+	unsigned long cfg;
- 	uint64_t delta;
+@@ -264,6 +319,7 @@ static void hpet_set_mode(enum clock_event_mode mode,
  
  	switch (mode) {
  	case CLOCK_EVT_MODE_PERIODIC:
 +		hpet_stop_counter();
  		delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult;
  		delta >>= evt->shift;
--		now = hpet_readl(HPET_COUNTER);
--		cmp = now + (unsigned long) delta;
- 		cfg = hpet_readl(HPET_Tn_CFG(timer));
- 		/* Make sure we use edge triggered interrupts */
- 		cfg &= ~HPET_TN_LEVEL;
+ 		now = hpet_readl(HPET_COUNTER);
+@@ -274,14 +330,18 @@ static void hpet_set_mode(enum clock_event_mode mode,
  		cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
  		       HPET_TN_SETVAL | HPET_TN_32BIT;
  		hpet_writel(cfg, HPET_Tn_CFG(timer));
@@ -195,15 +218,22 @@
 -		 * config register sets the counter value, the second
 -		 * write sets the period.
 -		 */
--		hpet_writel(cmp, HPET_Tn_CMP(timer));
--		udelay(1);
+ 		hpet_writel(cmp, HPET_Tn_CMP(timer));
+ 		udelay(1);
++		/*
++		 * HPET on AMD 81xx needs a second write (with HPET_TN_SETVAL
++		 * cleared) to T0_CMP to set the period. The HPET_TN_SETVAL
++		 * bit is automatically cleared after the first write.
++		 * (See AMD-8111 HyperTransport I/O Hub Data Sheet,
++		 * Publication # 24674)
++		 */
  		hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer));
 +		hpet_start_counter();
 +		hpet_print_config();
  		break;
  
  	case CLOCK_EVT_MODE_ONESHOT:
-@@ -308,6 +352,7 @@ static void hpet_set_mode(enum clock_event_mode mode,
+@@ -308,6 +368,7 @@ static void hpet_set_mode(enum clock_event_mode mode,
  			irq_set_affinity(hdev->irq, cpumask_of(hdev->cpu));
  			enable_irq(hdev->irq);
  		}
@@ -211,7 +241,7 @@
  		break;
  	}
  }
-@@ -526,6 +571,7 @@ static void hpet_msi_capability_lookup(unsigned int start_timer)
+@@ -526,6 +587,7 @@ static void hpet_msi_capability_lookup(unsigned int start_timer)
  
  	num_timers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT);
  	num_timers++; /* Value read out starts from 0 */
@@ -219,7 +249,7 @@
  
  	hpet_devs = kzalloc(sizeof(struct hpet_dev) * num_timers, GFP_KERNEL);
  	if (!hpet_devs)
-@@ -695,7 +741,7 @@ static struct clocksource clocksource_hpet = {
+@@ -695,7 +757,7 @@ static struct clocksource clocksource_hpet = {
  	.mask		= HPET_MASK,
  	.shift		= HPET_SHIFT,
  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
@@ -228,7 +258,7 @@
  #ifdef CONFIG_X86_64
  	.vread		= vread_hpet,
  #endif
-@@ -707,7 +753,7 @@ static int hpet_clocksource_register(void)
+@@ -707,7 +769,7 @@ static int hpet_clocksource_register(void)
  	cycle_t t1;
  
  	/* Start the counter */
@@ -237,7 +267,7 @@
  
  	/* Verify whether hpet counter works */
  	t1 = read_hpet();
-@@ -793,6 +839,7 @@ int __init hpet_enable(void)
+@@ -793,6 +855,7 @@ int __init hpet_enable(void)
  	 * information and the number of channels
  	 */
  	id = hpet_readl(HPET_ID);
@@ -245,7 +275,7 @@
  
  #ifdef CONFIG_HPET_EMULATE_RTC
  	/*
-@@ -845,6 +892,7 @@ static __init int hpet_late_init(void)
+@@ -845,6 +908,7 @@ static __init int hpet_late_init(void)
  		return -ENODEV;
  
  	hpet_reserve_platform_timers(hpet_readl(HPET_ID));


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1573
retrieving revision 1.1574
diff -u -r1.1573 -r1.1574
--- kernel.spec	24 Apr 2009 14:32:20 -0000	1.1573
+++ kernel.spec	27 Apr 2009 19:30:33 -0000	1.1574
@@ -1988,6 +1988,9 @@
 # and build.
 
 %changelog
+* Mon Apr 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-112
+- 7a6f9cbb: x86: hpet: fix periodic mode programming on AMD 81xx
+
 * Fri Apr 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-111
 - backport hpet fixes from 2.6.30-rc3.
 



From mnagy at fedoraproject.org  Mon Apr 27 19:36:10 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Mon, 27 Apr 2009 19:36:10 +0000 (UTC)
Subject: rpms/bind/devel bind-96-dyndb.patch,1.6,1.7 bind.spec,1.312,1.313
Message-ID: <20090427193610.2E07F70110@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19638

Modified Files:
	bind-96-dyndb.patch bind.spec 
Log Message:
* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
- update the patch for dynamic loading of database backends
- create %{_libdir}/bind directory


bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bind-96-dyndb.patch	24 Apr 2009 15:29:06 -0000	1.6
+++ bind-96-dyndb.patch	27 Apr 2009 19:35:39 -0000	1.7
@@ -1,6 +1,7 @@
-diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
---- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
-+++ bind-9.6.1b1/bin/named/main.c	2009-04-24 17:09:55.747902371 +0200
+diff --git a/bin/named/main.c b/bin/named/main.c
+index aa6575a..aed2a55 100644
+--- a/bin/named/main.c
++++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -18,10 +19,11 @@
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
---- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
-+++ bind-9.6.1b1/bin/named/server.c	2009-04-24 17:12:06.467623220 +0200
-@@ -57,6 +57,7 @@
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 31b2761..7670f1a 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -56,6 +56,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -29,7 +31,7 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
  }
  
  static isc_result_t
@@ -102,7 +104,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
+@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -110,8 +112,8 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1238,6 +1306,37 @@ configure_view(dns_view_t *view, const c
- 		view->maxncachettl = 7 * 24 * 3600;
+@@ -1171,6 +1239,37 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+ #endif
  
  	/*
 +	 * Configure dynamic databases.
@@ -148,7 +150,7 @@
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
-@@ -2942,6 +3041,7 @@ load_configuration(const char *filename,
+@@ -2903,6 +3002,7 @@ load_configuration(const char *filename, ns_server_t *server,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
  
@@ -156,7 +158,7 @@
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4185,6 +4285,8 @@ loadconfig(ns_server_t *server) {
+@@ -4140,6 +4240,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -165,10 +167,47 @@
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
---- /dev/null	2009-04-24 12:29:41.524001256 +0200
-+++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-04-24 17:09:55.751902027 +0200
-@@ -0,0 +1,347 @@
+diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
+index ef5c12a..97cc9fa 100644
+--- a/lib/dns/Makefile.in
++++ b/lib/dns/Makefile.in
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+@@ -114,6 +115,11 @@ version. at O@: version.c
+ 		-DLIBAGE=${LIBAGE} \
+ 		-c ${srcdir}/version.c
+ 
++dynamic_db. at O@: dynamic_db.c
++	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
++	-c ${srcdir}/dynamic_db.c
++
+ libdns. at SA@: ${OBJS}
+ 	${AR} ${ARFLAGS} $@ ${OBJS}
+ 	${RANLIB} $@
+diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
+new file mode 100644
+index 0000000..25afaf5
+--- /dev/null
++++ b/lib/dns/dynamic_db.c
+@@ -0,0 +1,364 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
@@ -188,10 +227,12 @@
 +
 +#include <config.h>
 +
++#include <isc/buffer.h>
 +#include <isc/mem.h>
 +#include <isc/mutex.h>
 +#include <isc/once.h>
 +#include <isc/result.h>
++#include <isc/region.h>
 +#include <isc/task.h>
 +#include <isc/types.h>
 +#include <isc/util.h>
@@ -208,6 +249,10 @@
 +#include <dlfcn.h>
 +#endif
 +
++#ifndef DYNDB_LIBDIR
++#define DYNDB_LIBDIR ""
++#endif
++
 +#define CHECK(op)						\
 +	do { result = (op);					\
 +		if (result != ISC_R_SUCCESS) goto cleanup;	\
@@ -280,6 +325,9 @@
 +load_library(isc_mem_t *mctx, const char *filename, dyndb_implementation_t **impp)
 +{
 +	isc_result_t result;
++	size_t module_size;
++	isc_buffer_t *module_buf = NULL;
++	isc_region_t module_region;
 +	void *handle;
 +	dyndb_implementation_t *imp;
 +	register_func_t register_function = NULL;
@@ -287,7 +335,15 @@
 +
 +	REQUIRE(impp != NULL && *impp == NULL);
 +
-+	handle = dlopen(filename, RTLD_LAZY);
++	/* Build up the full path. */
++	module_size = strlen(DYNDB_LIBDIR) + strlen(filename) + 1;
++	CHECK(isc_buffer_allocate(mctx, &module_buf, module_size));
++	isc_buffer_putstr(module_buf, DYNDB_LIBDIR);
++	isc_buffer_putstr(module_buf, filename);
++	isc_buffer_putuint8(module_buf, 0);
++	isc_buffer_region(module_buf, &module_region);
++
++	handle = dlopen((char *)module_region.base, RTLD_LAZY);
 +	if (handle == NULL) {
 +		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
 +			      DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
@@ -318,11 +374,11 @@
 +
 +	*impp = imp;
 +
-+	return ISC_R_SUCCESS;
-+
 +cleanup:
-+	if (handle != NULL)
++	if (result != ISC_R_SUCCESS && handle != NULL)
 +		dlclose(handle);
++	if (module_buf != NULL)
++		isc_buffer_free(&module_buf);
 +
 +	return result;
 +}
@@ -516,9 +572,24 @@
 +
 +	return args->timermgr;
 +}
-diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
---- /dev/null	2009-04-24 12:29:41.524001256 +0200
-+++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-04-24 17:09:55.755932610 +0200
+diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
+index e9e049e..27fdc45 100644
+--- a/lib/dns/include/dns/Makefile.in
++++ b/lib/dns/include/dns/Makefile.in
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
+new file mode 100644
+index 0000000..7b1c1ce
+--- /dev/null
++++ b/lib/dns/include/dns/dynamic_db.h
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -570,10 +641,11 @@
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
---- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-04-24 17:09:55.755932610 +0200
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
+diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
+index 5adcedd..e171028 100644
+--- a/lib/dns/include/dns/log.h
++++ b/lib/dns/include/dns/log.h
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -581,22 +653,11 @@
  
  ISC_LANG_BEGINDECLS
  
-diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-04-24 17:09:55.755932610 +0200
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff -up bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb bind-9.6.1b1/lib/dns/include/dns/types.h
---- bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb	2009-01-29 23:40:35.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/types.h	2009-04-24 17:09:55.755932610 +0200
-@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
+diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
+index 5223397..f434188 100644
+--- a/lib/dns/include/dns/types.h
++++ b/lib/dns/include/dns/types.h
+@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable_t;
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
  typedef struct dns_dlzdb			dns_dlzdb_t;
@@ -604,10 +665,11 @@
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
---- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
-+++ bind-9.6.1b1/lib/dns/log.c	2009-04-24 17:09:55.755932610 +0200
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
+diff --git a/lib/dns/log.c b/lib/dns/log.c
+index 7551e15..b9864eb 100644
+--- a/lib/dns/log.c
++++ b/lib/dns/log.c
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -615,31 +677,10 @@
  	{ NULL, 		0 }
  };
  
-diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-04-24 17:09:55.739922815 +0200
-+++ bind-9.6.1b1/lib/dns/Makefile.in	2009-04-24 17:09:55.751902027 +0200
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
---- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
-+++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-04-24 17:09:55.755932610 +0200
+diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
+index 0610489..a1dba32 100644
+--- a/lib/isccfg/namedconf.c
++++ b/lib/isccfg/namedconf.c
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -656,7 +697,7 @@
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- bind.spec	24 Apr 2009 15:29:06 -0000	1.312
+++ bind.spec	27 Apr 2009 19:35:39 -0000	1.313
@@ -20,7 +20,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  0.2.%{PREVER}%{?dist}
+Release:  0.3.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -301,6 +301,7 @@
 # Build directory hierarchy
 mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
 mkdir -p ${RPM_BUILD_ROOT}/usr/{bin,lib,sbin,include}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
 mkdir -p ${RPM_BUILD_ROOT}/var/run/named
@@ -482,6 +483,7 @@
 %defattr(-,named,named,-)
 %dir %{_localstatedir}/run/named
 %defattr(-,root,root,-)
+%{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
 %{_sbindir}/dnssec*
@@ -573,6 +575,10 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
+- update the patch for dynamic loading of database backends
+- create %%{_libdir}/bind directory
+
 * Fri Apr 24 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends
 - fix dns_db_unregister()



From cebbert at fedoraproject.org  Mon Apr 27 19:36:30 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 27 Apr 2009 19:36:30 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch,
	NONE, 1.1 kernel.spec, 1.1351, 1.1352
Message-ID: <20090427193630.564FD70110@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19699

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch 
Log Message:
Fix possible FPU context corruption on x86-64.

linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch:

--- NEW FILE linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch ---
From: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Thu, 9 Apr 2009 22:24:34 +0000 (-0700)
Subject: x86-64: fix FPU corruption with signals and preemption
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=06c38d5e36b12d040839ff224e805146c0368556

x86-64: fix FPU corruption with signals and preemption

In 64bit signal delivery path, clear_used_math() was happening before saving
the current active FPU state on to the user stack for signal handling. Between
clear_used_math() and the state store on to the user stack, potentially we
can get a page fault for the user address and can block. Infact, while testing
we were hitting the might_fault() in __clear_user() which can do a schedule().

At a later point in time, we will schedule back into this process and
resume the save state (using "xsave/fxsave" instruction) which can lead
to DNA fault. And as used_math was cleared before, we will reinit the FP state
in the DNA fault and continue. This reinit will result in loosing the
FPU state of the process.

Move clear_used_math() to a point after the FPU state has been stored
onto the user stack.

This issue is present from a long time (even before the xsave changes
and the x86 merge). But it can easily be exposed in 2.6.28.x and 2.6.29.x
series because of the __clear_user() in this path, which has an explicit
__cond_resched() leading to a context switch with CONFIG_PREEMPT_VOLUNTARY.

[ Impact: fix FPU state corruption ]

Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Cc: <stable at kernel.org>			[2.6.28.x, 2.6.29.x]
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---

diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index 0a5b04a..c5ee17e 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -89,7 +89,7 @@ int save_i387_xstate(void __user *buf)
 
 	if (!used_math())
 		return 0;
-	clear_used_math(); /* trigger finit */
+
 	if (task_thread_info(tsk)->status & TS_USEDFPU) {
 		/*
 	 	 * Start with clearing the user buffer. This will present a
@@ -114,6 +114,8 @@ int save_i387_xstate(void __user *buf)
 			return -1;
 	}
 
+	clear_used_math(); /* trigger finit */
+
 	if (task_thread_info(tsk)->status & TS_XSAVE) {
 		struct _fpstate __user *fx = buf;
 		struct _xstate __user *x = buf;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1351
retrieving revision 1.1352
diff -u -r1.1351 -r1.1352
--- kernel.spec	27 Apr 2009 19:24:42 -0000	1.1351
+++ kernel.spec	27 Apr 2009 19:35:59 -0000	1.1352
@@ -720,6 +720,9 @@
 Patch9501: linux-2.6-x86-hpet-stop-counter-when-programming.patch
 Patch9502: linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch
 
+# FPU state can become corrupt
+Patch9510: linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
+
 # Backport of upstream memory reduction for ftrace
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
 
@@ -1340,6 +1343,8 @@
 ApplyPatch linux-2.6-x86-hpet-stop-counter-when-programming.patch
 ApplyPatch linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch
 
+ApplyPatch linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
+
 # Reduce the memory usage of ftrace if you don't use it.
 ApplyPatch linux-2.6-ftrace-memory-reduction.patch
 
@@ -1919,6 +1924,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-52
+- Fix possible FPU context corruption on x86-64.
+
 * Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-51
 - Fix HPET hang at boot on AMD 81xx, caused by backported 2.6.30 HPET fixes.
 



From mnagy at fedoraproject.org  Mon Apr 27 19:37:56 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Mon, 27 Apr 2009 19:37:56 +0000 (UTC)
Subject: rpms/bind/F-11 bind.spec,1.312,1.313
Message-ID: <20090427193756.C433A70110@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20020

Modified Files:
	bind.spec 
Log Message:
* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
- update the patch for dynamic loading of database backends
- create %{_libdir}/bind directory



Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- bind.spec	24 Apr 2009 15:30:40 -0000	1.312
+++ bind.spec	27 Apr 2009 19:37:26 -0000	1.313
@@ -20,7 +20,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  0.2.%{PREVER}%{?dist}
+Release:  0.3.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -301,6 +301,7 @@
 # Build directory hierarchy
 mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
 mkdir -p ${RPM_BUILD_ROOT}/usr/{bin,lib,sbin,include}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
 mkdir -p ${RPM_BUILD_ROOT}/var/run/named
@@ -482,6 +483,7 @@
 %defattr(-,named,named,-)
 %dir %{_localstatedir}/run/named
 %defattr(-,root,root,-)
+%{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
 %{_sbindir}/dnssec*
@@ -573,6 +575,10 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
+- update the patch for dynamic loading of database backends
+- create %%{_libdir}/bind directory
+
 * Fri Apr 24 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends
 - fix dns_db_unregister()



From limb at fedoraproject.org  Mon Apr 27 19:39:07 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 27 Apr 2009 19:39:07 +0000 (UTC)
Subject: rpms/calcurse/devel .cvsignore, 1.8, 1.9 calcurse.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20090427193907.8347D70110@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/calcurse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20181

Modified Files:
	.cvsignore calcurse.spec sources 
Log Message:
2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Jan 2009 15:39:01 -0000	1.8
+++ .cvsignore	27 Apr 2009 19:38:36 -0000	1.9
@@ -1 +1 @@
-calcurse-2.4.tar.gz
+calcurse-2.5.tar.gz


Index: calcurse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/calcurse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- calcurse.spec	24 Feb 2009 06:30:56 -0000	1.9
+++ calcurse.spec	27 Apr 2009 19:38:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           calcurse
-Version:        2.4
-Release:        2%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Text-based personal organizer
 
 Group:          Applications/Productivity
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> 2.5-1
+- Update to 2.5.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Jan 2009 15:39:01 -0000	1.8
+++ sources	27 Apr 2009 19:38:37 -0000	1.9
@@ -1 +1 @@
-90e31917bdd1c8b6a700e762a3ce46b9  calcurse-2.4.tar.gz
+7868f67c49b426e3ab4a4d34ce16ef1d  calcurse-2.5.tar.gz



From spot at fedoraproject.org  Mon Apr 27 19:39:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 19:39:27 +0000 (UTC)
Subject: rpms/logjam/F-10 logjam.spec,1.50,1.51
Message-ID: <20090427193927.EA78F70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20210/F-10

Modified Files:
	logjam.spec 
Log Message:
conditionalize libtool fun for F11+


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- logjam.spec	27 Apr 2009 17:48:47 -0000	1.50
+++ logjam.spec	27 Apr 2009 19:38:57 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	30%{?dist}
+Release:	31%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -83,16 +83,20 @@
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
+%if 0%{fedora} >= 11
 %patch22 -p1 -b .libtool
+%endif
 %patch23 -p1 -b .keep_drafts
 %patch24 -p1 -b .lj-embed
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
+%if 0%{fedora} >= 11
 libtoolize
 rm -rf aclocal.m4
 autoupdate
 intltoolize --force
+%endif
 
 %build
 touch NEWS README AUTHORS
@@ -137,6 +141,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
+- conditionalize libtool fun for F11+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
 - rebuild with all patches in place
 



From spot at fedoraproject.org  Mon Apr 27 19:39:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 19:39:28 +0000 (UTC)
Subject: rpms/logjam/F-11 logjam.spec,1.52,1.53
Message-ID: <20090427193928.8BBE270110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20210/F-11

Modified Files:
	logjam.spec 
Log Message:
conditionalize libtool fun for F11+


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-11/logjam.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- logjam.spec	27 Apr 2009 17:48:47 -0000	1.52
+++ logjam.spec	27 Apr 2009 19:38:58 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	30%{?dist}
+Release:	31%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -83,16 +83,20 @@
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
+%if 0%{fedora} >= 11
 %patch22 -p1 -b .libtool
+%endif
 %patch23 -p1 -b .keep_drafts
 %patch24 -p1 -b .lj-embed
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
+%if 0%{fedora} >= 11
 libtoolize
 rm -rf aclocal.m4
 autoupdate
 intltoolize --force
+%endif
 
 %build
 touch NEWS README AUTHORS
@@ -137,6 +141,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
+- conditionalize libtool fun for F11+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
 - rebuild with all patches in place
 



From spot at fedoraproject.org  Mon Apr 27 19:39:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 19:39:29 +0000 (UTC)
Subject: rpms/logjam/devel logjam.spec,1.52,1.53
Message-ID: <20090427193929.82C3970110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20210/devel

Modified Files:
	logjam.spec 
Log Message:
conditionalize libtool fun for F11+


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- logjam.spec	27 Apr 2009 17:48:48 -0000	1.52
+++ logjam.spec	27 Apr 2009 19:38:59 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	30%{?dist}
+Release:	31%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -83,16 +83,20 @@
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
+%if 0%{fedora} >= 11
 %patch22 -p1 -b .libtool
+%endif
 %patch23 -p1 -b .keep_drafts
 %patch24 -p1 -b .lj-embed
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
+%if 0%{fedora} >= 11
 libtoolize
 rm -rf aclocal.m4
 autoupdate
 intltoolize --force
+%endif
 
 %build
 touch NEWS README AUTHORS
@@ -137,6 +141,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
+- conditionalize libtool fun for F11+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
 - rebuild with all patches in place
 



From spot at fedoraproject.org  Mon Apr 27 19:39:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 19:39:29 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam.spec,1.50,1.51
Message-ID: <20090427193929.0064370110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20210/F-9

Modified Files:
	logjam.spec 
Log Message:
conditionalize libtool fun for F11+


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- logjam.spec	27 Apr 2009 17:48:48 -0000	1.50
+++ logjam.spec	27 Apr 2009 19:38:58 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	30%{?dist}
+Release:	31%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -83,16 +83,20 @@
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
 %patch21 -p1 -b .showloginhistory
+%if 0%{fedora} >= 11
 %patch22 -p1 -b .libtool
+%endif
 %patch23 -p1 -b .keep_drafts
 %patch24 -p1 -b .lj-embed
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
+%if 0%{fedora} >= 11
 libtoolize
 rm -rf aclocal.m4
 autoupdate
 intltoolize --force
+%endif
 
 %build
 touch NEWS README AUTHORS
@@ -137,6 +141,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
+- conditionalize libtool fun for F11+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
 - rebuild with all patches in place
 



From steved at fedoraproject.org  Mon Apr 27 19:42:29 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 27 Apr 2009 19:42:29 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec, 1.222, 1.223 nfslock.init, 1.24,
	1.25
Message-ID: <20090427194229.26D3D70110@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20591

Modified Files:
	nfs-utils.spec nfslock.init 
Log Message:
- nfslock.init: options not correctly parsed (bz 459591)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- nfs-utils.spec	20 Apr 2009 18:20:40 -0000	1.222
+++ nfs-utils.spec	27 Apr 2009 19:41:58 -0000	1.223
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -229,6 +229,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Apr 27 2009 Steve Dickson <steved at redhat.com> 1.1.6-2
+- nfslock.init: options not correctly parsed (bz 459591)
+
 * Mon Apr 20 2009 Steve Dickson <steved at redhat.com> 1.1.6-1
 - Updated to latest upstream release: 1.1.6
 


Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nfslock.init	6 Mar 2009 12:31:06 -0000	1.24
+++ nfslock.init	27 Apr 2009 19:41:58 -0000	1.25
@@ -53,9 +53,6 @@
 	fi
 
 	echo -n $"Starting NFS statd: "
-	# Set statd's local hostname if defined
-	[ -n "${STATD_HOSTNAME}" ] && STATDARG="$STATDARG -n ${STATD_HOSTNAME}"
-
 	# See if a statd's ports has been defined
 	[ -n "$STATD_PORT" ] && STATDARG="$STATDARG -p $STATD_PORT"
 	[ -n "$STATD_OUTGOING_PORT" ] \



From rdieter at fedoraproject.org  Mon Apr 27 19:47:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 19:47:11 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.53, 1.54 kde-settings.spec,
	1.72, 1.73 sources, 1.54, 1.55
Message-ID: <20090427194711.2361A70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21165/F-11

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-8.20090427svn
- -kdm: Requires: xterm (#491251), touchup Summary a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	16 Apr 2009 19:34:47 -0000	1.53
+++ .cvsignore	27 Apr 2009 19:46:40 -0000	1.54
@@ -1 +1 @@
-kde-settings-4.2-20090416svn.tar.bz2
+kde-settings-4.2-20090427svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kde-settings.spec	21 Apr 2009 13:46:07 -0000	1.72
+++ kde-settings.spec	27 Apr 2009 19:46:40 -0000	1.73
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090416svn
+%define rel 20090427svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 7.%{rel}%{?dist}
+Release: 8.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -41,16 +41,17 @@
 %{summary}.
 
 %package kdm
-Summary: Config files for kdebase-workspace(kdm)
+Summary: Configuration files for kdm
 Group:	 System Environment/Base
-Obsoletes: kde-config-kdm < %{version}-%{release}
+Obsoletes: kde-config-kdm < 4.0 
 # leonidas theme for KDM
 Requires: leonidas-kde-theme
-#Requires: kdebase-workspace
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
 Requires(post): kde4-macros(api) = %{_kde4_macros_api}
+# failsafe session (rhbz#491251)
+Requires: xterm
 %description kdm
 %{summary}.
 
@@ -157,6 +158,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-8.20090427svn
+- -kdm: Requires: xterm (#491251), touchup Summary a bit
+
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2-7.20090416svn
 - get rid of requires on solar-kde-theme, it should leonidas-kde-theme for F11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	16 Apr 2009 19:34:47 -0000	1.54
+++ sources	27 Apr 2009 19:46:40 -0000	1.55
@@ -1 +1 @@
-39bbab8d9be8e5a134f326f51f281bbb  kde-settings-4.2-20090416svn.tar.bz2
+e377f820d77558babb42c50183fb03fb  kde-settings-4.2-20090427svn.tar.bz2



From rdieter at fedoraproject.org  Mon Apr 27 19:47:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 27 Apr 2009 19:47:11 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.53, 1.54 kde-settings.spec,
	1.72, 1.73 sources, 1.54, 1.55
Message-ID: <20090427194711.6699E70110@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21165/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-8.20090427svn
- -kdm: Requires: xterm (#491251), touchup Summary a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	16 Apr 2009 19:34:47 -0000	1.53
+++ .cvsignore	27 Apr 2009 19:46:41 -0000	1.54
@@ -1 +1 @@
-kde-settings-4.2-20090416svn.tar.bz2
+kde-settings-4.2-20090427svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kde-settings.spec	21 Apr 2009 14:58:08 -0000	1.72
+++ kde-settings.spec	27 Apr 2009 19:46:41 -0000	1.73
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090416svn
+%define rel 20090427svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 7.%{rel}%{?dist}
+Release: 8.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -41,16 +41,17 @@
 %{summary}.
 
 %package kdm
-Summary: Config files for kdebase-workspace(kdm)
+Summary: Configuration files for kdm
 Group:	 System Environment/Base
-Obsoletes: kde-config-kdm < %{version}-%{release}
+Obsoletes: kde-config-kdm < 4.0 
 # leonidas theme for KDM
 Requires: leonidas-kde-theme
-#Requires: kdebase-workspace
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
 Requires(post): kde4-macros(api) = %{_kde4_macros_api}
+# failsafe session (rhbz#491251)
+Requires: xterm
 %description kdm
 %{summary}.
 
@@ -157,6 +158,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-8.20090427svn
+- -kdm: Requires: xterm (#491251), touchup Summary a bit
+
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2-7.20090416svn
 - get rid of requires on solar-kde-theme, it should leonidas-kde-theme for F11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	16 Apr 2009 19:34:47 -0000	1.54
+++ sources	27 Apr 2009 19:46:41 -0000	1.55
@@ -1 +1 @@
-39bbab8d9be8e5a134f326f51f281bbb  kde-settings-4.2-20090416svn.tar.bz2
+e377f820d77558babb42c50183fb03fb  kde-settings-4.2-20090427svn.tar.bz2



From limb at fedoraproject.org  Mon Apr 27 19:50:09 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 27 Apr 2009 19:50:09 +0000 (UTC)
Subject: rpms/gonvert/devel .cvsignore, 1.7, 1.8 gonvert.spec, 1.17,
	1.18 sources, 1.7, 1.8
Message-ID: <20090427195009.63CC270110@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gonvert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21786

Modified Files:
	.cvsignore gonvert.spec sources 
Log Message:
0.2.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gonvert/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Oct 2007 03:22:57 -0000	1.7
+++ .cvsignore	27 Apr 2009 19:49:38 -0000	1.8
@@ -1 +1 @@
-gonvert-0.2.19.tar.gz
+gonvert-0.2.20.tar.gz


Index: gonvert.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gonvert/devel/gonvert.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gonvert.spec	25 Feb 2009 00:19:10 -0000	1.17
+++ gonvert.spec	27 Apr 2009 19:49:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gonvert
-Version:        0.2.19
-Release:        4%{?dist}
+Version:        0.2.20
+Release:        1%{?dist}
 Summary:        Units conversion utility
 Group:          Applications/Engineering
 License:        GPL+
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 0.2.20-1
+- New upstream.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gonvert/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Oct 2007 03:22:57 -0000	1.7
+++ sources	27 Apr 2009 19:49:38 -0000	1.8
@@ -1 +1 @@
-5fa0df1ee4b4783d9093dd0a707d805c  gonvert-0.2.19.tar.gz
+d586ccb474443945f954e8032e8835d5  gonvert-0.2.20.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 19:54:32 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:54:32 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.58,1.59
Message-ID: <20090427195432.CE1D370110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22464/F-10

Modified Files:
	epiphany-extensions.spec 
Log Message:
Rebuild against newer gecko


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- epiphany-extensions.spec	22 Apr 2009 00:21:58 -0000	1.58
+++ epiphany-extensions.spec	27 Apr 2009 19:54:02 -0000	1.59
@@ -1,10 +1,10 @@
 %global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.9
+%global gecko_version       1.9.0.10
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-8
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-7
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 19:54:33 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 19:54:33 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-9 epiphany-extensions.spec,1.56,1.57
Message-ID: <20090427195433.0581670110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22464/F-9

Modified Files:
	epiphany-extensions.spec 
Log Message:
Rebuild against newer gecko


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-9/epiphany-extensions.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- epiphany-extensions.spec	22 Apr 2009 00:21:45 -0000	1.56
+++ epiphany-extensions.spec	27 Apr 2009 19:54:02 -0000	1.57
@@ -1,10 +1,10 @@
 %global ephy_major          2.22
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.9
+%global gecko_version       1.9.0.10
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-11
+- Rebuild against newer gecko
+
 * Tue Apr 21 2009 Christopher Aillon <caillon at redhat.com> - 2.22.1-10
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Mon Apr 27 20:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:03:49 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested watchbugzilla
Message-ID: <20090427200349.C2C9110F894@bastion2.fedora.phx.redhat.com>

alsadi has requested the watchbugzilla acl on kchmviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:03:56 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested watchcommits
Message-ID: <20090427200357.1A7AD10F899@bastion2.fedora.phx.redhat.com>

alsadi has requested the watchcommits acl on kchmviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:03:59 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested commit
Message-ID: <20090427200359.B515A10F89E@bastion2.fedora.phx.redhat.com>

alsadi has requested the commit acl on kchmviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:05:31 +0000
Subject: [pkgdb] kchmviewer had acl change status
Message-ID: <20090427200531.8304610F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kchmviewer (Fedora 10) to Approved for alsadi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:05:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:05:32 +0000
Subject: [pkgdb] kchmviewer had acl change status
Message-ID: <20090427200532.7720510F89A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kchmviewer (Fedora 10) to Approved for alsadi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:05:33 +0000
Subject: [pkgdb] kchmviewer had acl change status
Message-ID: <20090427200535.277EF10F8A0@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kchmviewer (Fedora 10) to Approved for alsadi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From spot at fedoraproject.org  Mon Apr 27 20:05:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 20:05:59 +0000 (UTC)
Subject: rpms/logjam/F-10 logjam.spec,1.51,1.52
Message-ID: <20090427200559.421C870110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24495/F-10

Modified Files:
	logjam.spec 
Log Message:
only move dir when it exists


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- logjam.spec	27 Apr 2009 19:38:57 -0000	1.51
+++ logjam.spec	27 Apr 2009 20:05:28 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	31%{?dist}
+Release:	32%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -116,7 +116,9 @@
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Rename locale dir, bugzilla 210206
-mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+if [ -d $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 ]; then
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+fi
 %find_lang %{name}
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -141,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
+- only move broken locale dir if it gets created
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
 - conditionalize libtool fun for F11+
 



From spot at fedoraproject.org  Mon Apr 27 20:05:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 20:05:59 +0000 (UTC)
Subject: rpms/logjam/F-11 logjam.spec,1.53,1.54
Message-ID: <20090427200559.7A85C70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24495/F-11

Modified Files:
	logjam.spec 
Log Message:
only move dir when it exists


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-11/logjam.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- logjam.spec	27 Apr 2009 19:38:58 -0000	1.53
+++ logjam.spec	27 Apr 2009 20:05:29 -0000	1.54
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	31%{?dist}
+Release:	32%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -116,7 +116,9 @@
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Rename locale dir, bugzilla 210206
-mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+if [ -d $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 ]; then
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+fi
 %find_lang %{name}
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -141,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
+- only move broken locale dir if it gets created
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
 - conditionalize libtool fun for F11+
 



From spot at fedoraproject.org  Mon Apr 27 20:05:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 20:05:59 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam.spec,1.51,1.52
Message-ID: <20090427200559.D23AF70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24495/F-9

Modified Files:
	logjam.spec 
Log Message:
only move dir when it exists


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- logjam.spec	27 Apr 2009 19:38:58 -0000	1.51
+++ logjam.spec	27 Apr 2009 20:05:29 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	31%{?dist}
+Release:	32%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -116,7 +116,9 @@
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Rename locale dir, bugzilla 210206
-mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+if [ -d $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 ]; then
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+fi
 %find_lang %{name}
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -141,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
+- only move broken locale dir if it gets created
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
 - conditionalize libtool fun for F11+
 



From spot at fedoraproject.org  Mon Apr 27 20:06:00 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 20:06:00 +0000 (UTC)
Subject: rpms/logjam/devel logjam.spec,1.53,1.54
Message-ID: <20090427200600.34D4970110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24495/devel

Modified Files:
	logjam.spec 
Log Message:
only move dir when it exists


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- logjam.spec	27 Apr 2009 19:38:59 -0000	1.53
+++ logjam.spec	27 Apr 2009 20:05:29 -0000	1.54
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	31%{?dist}
+Release:	32%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -116,7 +116,9 @@
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Rename locale dir, bugzilla 210206
-mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+if [ -d $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 ]; then
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+fi
 %find_lang %{name}
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -141,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
+- only move broken locale dir if it gets created
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
 - conditionalize libtool fun for F11+
 



From notting at fedoraproject.org  Mon Apr 27 20:07:30 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 27 Apr 2009 20:07:30 +0000 (UTC)
Subject: rpms/upstart/F-11 upstart-audit-events.patch, 1.1,
	1.2 upstart-fedora-buglist.patch, 1.1,
	1.2 upstart-save-state-across-reexec.patch, 1.1,
	1.2 upstart-tty-stack.patch, 1.2, 1.3 upstart.spec, 1.29, 1.30
Message-ID: <20090427200730.7CABF70110@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/upstart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24841

Modified Files:
	upstart-audit-events.patch upstart-fedora-buglist.patch 
	upstart-save-state-across-reexec.patch upstart-tty-stack.patch 
	upstart.spec 
Log Message:
Apply the audit patch correctly (#470661)

Also, rediff/rework everything else, so we don't end up re-running the
autotools, which only causes pain.


upstart-audit-events.patch:

Index: upstart-audit-events.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-audit-events.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-audit-events.patch	3 Apr 2009 23:32:49 -0000	1.1
+++ upstart-audit-events.patch	27 Apr 2009 20:06:59 -0000	1.2
@@ -1,27 +1,3 @@
-diff -urp upstart-0.3.9.orig/compat/sysv/Makefile.am upstart-0.3.9/compat/sysv/Makefile.am
---- upstart-0.3.9.orig/compat/sysv/Makefile.am	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/compat/sysv/Makefile.am	2008-11-05 08:16:22.000000000 -0500
-@@ -28,15 +28,17 @@ endif
- 
- reboot_SOURCES = reboot.c
- reboot_LDFLAGS = -static
--reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
-+	@LIBAUDIT@
- 
- runlevel_SOURCES = runlevel.c
- runlevel_LDFLAGS = -static
--runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
-+runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) @LIBAUDIT@
- 
- shutdown_SOURCES = shutdown.c
- shutdown_LDFLAGS = -static
--shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
-+	@LIBAUDIT@
- 
- telinit_SOURCES = telinit.c
- telinit_LDFLAGS = -static
 diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/reboot.c
 --- upstart-0.3.9.orig/compat/sysv/reboot.c	2008-11-03 12:29:30.000000000 -0500
 +++ upstart-0.3.9/compat/sysv/reboot.c	2008-11-05 08:16:22.000000000 -0500
@@ -29,7 +5,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <utmp.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -63,7 +39,7 @@
 +static void
 +send_audit_event (void)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +        int fd = audit_open ();
 +        if (fd < 0)
 +                return;
@@ -82,7 +58,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -128,7 +104,7 @@
 +static void
 +send_audit_event (int old, int level)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +        int fd = audit_open ();
 +
 +        if (fd < 0)
@@ -155,7 +131,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -173,7 +149,7 @@
 +static void
 +send_audit_event (void)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +	int fd = audit_open ();
 +	if (fd < 0)
 +		return;
@@ -201,45 +177,23 @@
  	unlink (ETC_NOLOGIN);
  	nih_main_unlink_pidfile ();
  
-diff -urp upstart-0.3.9.orig/config.h.in upstart-0.3.9/config.h.in
---- upstart-0.3.9.orig/config.h.in	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/config.h.in	2008-11-05 08:16:22.000000000 -0500
-@@ -250,6 +250,9 @@
- /* Define to 1 if your C compiler doesn't accept -c and -o together. */
- #undef NO_MINUS_C_MINUS_O
- 
-+/* Define to 1 if you want audit support */
-+#undef HAVE_LIBAUDIT
-+
- /* Name of package */
- #undef PACKAGE
- 
-diff -urp upstart-0.3.9.orig/configure.ac upstart-0.3.9/configure.ac
---- upstart-0.3.9.orig/configure.ac	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/configure.ac	2008-11-05 08:16:22.000000000 -0500
-@@ -38,6 +38,25 @@ AC_ARG_ENABLE(compat,
- esac], [compat_sysv=none])dnl
- AM_CONDITIONAL(COMPAT_SYSV, test "x$compat" = "xsysv")dnl
- 
-+AC_ARG_WITH(libaudit,
-+  [  --with-libaudit=[auto/yes/no]  Add Linux audit support [default=auto]],,
-+  with_libaudit=auto)
-+
-+# Check for Linux auditing API
-+#
-+# libaudit detection
-+if test x$with_libaudit = xno ; then
-+    have_libaudit=no;
-+else
-+    # See if we have audit daemon library
-+    AC_CHECK_LIB(audit, audit_log_user_message,
-+                 LIBAUDIT=-laudit, LIBAUDIT="")
-+fi
-+AC_SUBST(LIBAUDIT)
-+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$LIBAUDIT != x)
-+if test x$LIBAUDIT != x ; then
-+    AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support])
-+fi
- 
- AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in intl/Makefile
- 		  nih/Makefile upstart/Makefile init/Makefile util/Makefile
+diff -up upstart-0.3.9/compat/sysv/Makefile.in.foo upstart-0.3.9/compat/sysv/Makefile.in
+--- upstart-0.3.9/compat/sysv/Makefile.in.foo	2009-04-27 15:53:35.000000000 -0400
++++ upstart-0.3.9/compat/sysv/Makefile.in	2009-04-27 15:53:55.000000000 -0400
+@@ -280,13 +280,13 @@ EXTRA_DIST = $(manpages)
+ @COMPAT_SYSV_TRUE at man_MANS = $(manpages)
+ reboot_SOURCES = reboot.c
+ reboot_LDFLAGS = -static
+-reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ runlevel_SOURCES = runlevel.c
+ runlevel_LDFLAGS = -static
+-runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
++runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) -laudit
+ shutdown_SOURCES = shutdown.c
+ shutdown_LDFLAGS = -static
+-shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ telinit_SOURCES = telinit.c
+ telinit_LDFLAGS = -static
+ telinit_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)

upstart-fedora-buglist.patch:

Index: upstart-fedora-buglist.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-fedora-buglist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-fedora-buglist.patch	3 Apr 2008 15:30:44 -0000	1.1
+++ upstart-fedora-buglist.patch	27 Apr 2009 20:06:59 -0000	1.2
@@ -19,15 +19,3 @@
  _ACEOF
  ac_status=$?
  fi
-diff -urN upstart-0.3.9/configure.ac upstart-0.3.9-adj/configure.ac
---- upstart-0.3.9/configure.ac	2007-10-11 17:11:27.000000000 -0400
-+++ upstart-0.3.9-adj/configure.ac	2008-04-03 11:22:20.000000000 -0400
-@@ -1,7 +1,7 @@
- # Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ(2.60)
--AC_INIT([upstart], [0.3.9], [upstart-devel at lists.ubuntu.com])
-+AC_INIT([upstart], [0.3.9], [fedora-devel-list at redhat.com])
- AC_COPYRIGHT([[Copyright ?? 2007 Canonical Ltd.]])
- AC_CONFIG_SRCDIR([init/main.c])
- AC_CONFIG_MACRO_DIR([m4])

upstart-save-state-across-reexec.patch:

Index: upstart-save-state-across-reexec.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-save-state-across-reexec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-save-state-across-reexec.patch	7 Mar 2009 23:32:31 -0000	1.1
+++ upstart-save-state-across-reexec.patch	27 Apr 2009 20:06:59 -0000	1.2
@@ -51,19 +51,6 @@
  	nih_error_raise_system ();
  
  	err = nih_error_get ();
-diff -uNr upstart-0.3.9.orig/init/Makefile.am upstart-0.3.9/init/Makefile.am
---- upstart-0.3.9.orig/init/Makefile.am	2009-01-23 13:44:32.000000000 -0500
-+++ upstart-0.3.9/init/Makefile.am	2009-01-23 13:44:54.000000000 -0500
-@@ -23,7 +23,8 @@
- 	event.c event.h \
- 	control.c control.h \
- 	notify.c notify.h \
--	cfgfile.c cfgfile.h
-+	cfgfile.c cfgfile.h \
-+	restore.c restore.h
- 
- init_LDFLAGS = -static
- init_LDADD = \
 diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in
 --- upstart-0.3.9.orig/init/Makefile.in	2009-01-23 13:44:32.000000000 -0500
 +++ upstart-0.3.9/init/Makefile.in	2009-01-23 13:44:54.000000000 -0500

upstart-tty-stack.patch:

Index: upstart-tty-stack.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-tty-stack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upstart-tty-stack.patch	2 Mar 2008 23:29:26 -0000	1.2
+++ upstart-tty-stack.patch	27 Apr 2009 20:06:59 -0000	1.3
@@ -1,15 +1,3 @@
-=== modified file 'init/Makefile.am'
---- init/Makefile.am	2007-10-11 21:00:43 +0000
-+++ init/Makefile.am	2008-02-29 21:38:58 +0000
-@@ -16,6 +16,7 @@
- 
- init_SOURCES = \
- 	main.c \
-+	tty.c tty.h\
- 	errors.h paths.h \
- 	process.c process.h \
- 	job.c job.h \
-
 === modified file 'init/Makefile.in'
 --- init/Makefile.in	2008-03-02 23:21:30 +0000
 +++ init/Makefile.in	2008-02-29 21:39:16 +0000


Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- upstart.spec	3 Apr 2009 23:32:49 -0000	1.29
+++ upstart.spec	27 Apr 2009 20:06:59 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -16,10 +16,11 @@
 Patch5:         upstart-telinit-u.patch
 Patch6:	        upstart-initctl-man.patch
 Patch7:		upstart-save-state-across-reexec.patch
+Patch8:		upstart-audit-events.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
-BuildRequires:  gettext
+BuildRequires:  gettext audit-libs-devel
 
 %description
 Upstart is an event-based replacement for the /sbin/init daemon which
@@ -36,6 +37,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -101,6 +103,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Mon Apr 27 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-24
+- Apply the audit patch correctly (#470661)
+
 * Fri Apr 3 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-23
 - Add audit events patch from Steve Grubb <sgrubb at redhat.com> (Bug #470661)
 



From pkgdb at fedoraproject.org  Mon Apr 27 20:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:07:57 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested watchcommits
Message-ID: <20090427200757.A318D10F897@bastion2.fedora.phx.redhat.com>

alsadi has requested the watchcommits acl on kchmviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:07:57 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested watchbugzilla
Message-ID: <20090427200757.DBCAC10F89C@bastion2.fedora.phx.redhat.com>

alsadi has requested the watchbugzilla acl on kchmviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:08:04 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested commit
Message-ID: <20090427200804.9D8C910F8A3@bastion2.fedora.phx.redhat.com>

alsadi has requested the commit acl on kchmviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From notting at fedoraproject.org  Mon Apr 27 20:08:17 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 27 Apr 2009 20:08:17 +0000 (UTC)
Subject: rpms/upstart/devel upstart-audit-events.patch, 1.1,
	1.2 upstart-fedora-buglist.patch, 1.1,
	1.2 upstart-save-state-across-reexec.patch, 1.1,
	1.2 upstart-tty-stack.patch, 1.2, 1.3 upstart.spec, 1.29, 1.30
Message-ID: <20090427200817.0941370110@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25306

Modified Files:
	upstart-audit-events.patch upstart-fedora-buglist.patch 
	upstart-save-state-across-reexec.patch upstart-tty-stack.patch 
	upstart.spec 
Log Message:
sync with F-11

upstart-audit-events.patch:

Index: upstart-audit-events.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart-audit-events.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-audit-events.patch	3 Apr 2009 23:32:49 -0000	1.1
+++ upstart-audit-events.patch	27 Apr 2009 20:07:46 -0000	1.2
@@ -1,27 +1,3 @@
-diff -urp upstart-0.3.9.orig/compat/sysv/Makefile.am upstart-0.3.9/compat/sysv/Makefile.am
---- upstart-0.3.9.orig/compat/sysv/Makefile.am	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/compat/sysv/Makefile.am	2008-11-05 08:16:22.000000000 -0500
-@@ -28,15 +28,17 @@ endif
- 
- reboot_SOURCES = reboot.c
- reboot_LDFLAGS = -static
--reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
-+	@LIBAUDIT@
- 
- runlevel_SOURCES = runlevel.c
- runlevel_LDFLAGS = -static
--runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
-+runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) @LIBAUDIT@
- 
- shutdown_SOURCES = shutdown.c
- shutdown_LDFLAGS = -static
--shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
-+	@LIBAUDIT@
- 
- telinit_SOURCES = telinit.c
- telinit_LDFLAGS = -static
 diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/reboot.c
 --- upstart-0.3.9.orig/compat/sysv/reboot.c	2008-11-03 12:29:30.000000000 -0500
 +++ upstart-0.3.9/compat/sysv/reboot.c	2008-11-05 08:16:22.000000000 -0500
@@ -29,7 +5,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <utmp.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -63,7 +39,7 @@
 +static void
 +send_audit_event (void)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +        int fd = audit_open ();
 +        if (fd < 0)
 +                return;
@@ -82,7 +58,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -128,7 +104,7 @@
 +static void
 +send_audit_event (int old, int level)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +        int fd = audit_open ();
 +
 +        if (fd < 0)
@@ -155,7 +131,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -173,7 +149,7 @@
 +static void
 +send_audit_event (void)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +	int fd = audit_open ();
 +	if (fd < 0)
 +		return;
@@ -201,45 +177,23 @@
  	unlink (ETC_NOLOGIN);
  	nih_main_unlink_pidfile ();
  
-diff -urp upstart-0.3.9.orig/config.h.in upstart-0.3.9/config.h.in
---- upstart-0.3.9.orig/config.h.in	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/config.h.in	2008-11-05 08:16:22.000000000 -0500
-@@ -250,6 +250,9 @@
- /* Define to 1 if your C compiler doesn't accept -c and -o together. */
- #undef NO_MINUS_C_MINUS_O
- 
-+/* Define to 1 if you want audit support */
-+#undef HAVE_LIBAUDIT
-+
- /* Name of package */
- #undef PACKAGE
- 
-diff -urp upstart-0.3.9.orig/configure.ac upstart-0.3.9/configure.ac
---- upstart-0.3.9.orig/configure.ac	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/configure.ac	2008-11-05 08:16:22.000000000 -0500
-@@ -38,6 +38,25 @@ AC_ARG_ENABLE(compat,
- esac], [compat_sysv=none])dnl
- AM_CONDITIONAL(COMPAT_SYSV, test "x$compat" = "xsysv")dnl
- 
-+AC_ARG_WITH(libaudit,
-+  [  --with-libaudit=[auto/yes/no]  Add Linux audit support [default=auto]],,
-+  with_libaudit=auto)
-+
-+# Check for Linux auditing API
-+#
-+# libaudit detection
-+if test x$with_libaudit = xno ; then
-+    have_libaudit=no;
-+else
-+    # See if we have audit daemon library
-+    AC_CHECK_LIB(audit, audit_log_user_message,
-+                 LIBAUDIT=-laudit, LIBAUDIT="")
-+fi
-+AC_SUBST(LIBAUDIT)
-+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$LIBAUDIT != x)
-+if test x$LIBAUDIT != x ; then
-+    AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support])
-+fi
- 
- AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in intl/Makefile
- 		  nih/Makefile upstart/Makefile init/Makefile util/Makefile
+diff -up upstart-0.3.9/compat/sysv/Makefile.in.foo upstart-0.3.9/compat/sysv/Makefile.in
+--- upstart-0.3.9/compat/sysv/Makefile.in.foo	2009-04-27 15:53:35.000000000 -0400
++++ upstart-0.3.9/compat/sysv/Makefile.in	2009-04-27 15:53:55.000000000 -0400
+@@ -280,13 +280,13 @@ EXTRA_DIST = $(manpages)
+ @COMPAT_SYSV_TRUE at man_MANS = $(manpages)
+ reboot_SOURCES = reboot.c
+ reboot_LDFLAGS = -static
+-reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ runlevel_SOURCES = runlevel.c
+ runlevel_LDFLAGS = -static
+-runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
++runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) -laudit
+ shutdown_SOURCES = shutdown.c
+ shutdown_LDFLAGS = -static
+-shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ telinit_SOURCES = telinit.c
+ telinit_LDFLAGS = -static
+ telinit_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)

upstart-fedora-buglist.patch:

Index: upstart-fedora-buglist.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart-fedora-buglist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-fedora-buglist.patch	3 Apr 2008 15:30:44 -0000	1.1
+++ upstart-fedora-buglist.patch	27 Apr 2009 20:07:46 -0000	1.2
@@ -19,15 +19,3 @@
  _ACEOF
  ac_status=$?
  fi
-diff -urN upstart-0.3.9/configure.ac upstart-0.3.9-adj/configure.ac
---- upstart-0.3.9/configure.ac	2007-10-11 17:11:27.000000000 -0400
-+++ upstart-0.3.9-adj/configure.ac	2008-04-03 11:22:20.000000000 -0400
-@@ -1,7 +1,7 @@
- # Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ(2.60)
--AC_INIT([upstart], [0.3.9], [upstart-devel at lists.ubuntu.com])
-+AC_INIT([upstart], [0.3.9], [fedora-devel-list at redhat.com])
- AC_COPYRIGHT([[Copyright ?? 2007 Canonical Ltd.]])
- AC_CONFIG_SRCDIR([init/main.c])
- AC_CONFIG_MACRO_DIR([m4])

upstart-save-state-across-reexec.patch:

Index: upstart-save-state-across-reexec.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart-save-state-across-reexec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-save-state-across-reexec.patch	7 Mar 2009 23:32:31 -0000	1.1
+++ upstart-save-state-across-reexec.patch	27 Apr 2009 20:07:46 -0000	1.2
@@ -51,19 +51,6 @@
  	nih_error_raise_system ();
  
  	err = nih_error_get ();
-diff -uNr upstart-0.3.9.orig/init/Makefile.am upstart-0.3.9/init/Makefile.am
---- upstart-0.3.9.orig/init/Makefile.am	2009-01-23 13:44:32.000000000 -0500
-+++ upstart-0.3.9/init/Makefile.am	2009-01-23 13:44:54.000000000 -0500
-@@ -23,7 +23,8 @@
- 	event.c event.h \
- 	control.c control.h \
- 	notify.c notify.h \
--	cfgfile.c cfgfile.h
-+	cfgfile.c cfgfile.h \
-+	restore.c restore.h
- 
- init_LDFLAGS = -static
- init_LDADD = \
 diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in
 --- upstart-0.3.9.orig/init/Makefile.in	2009-01-23 13:44:32.000000000 -0500
 +++ upstart-0.3.9/init/Makefile.in	2009-01-23 13:44:54.000000000 -0500

upstart-tty-stack.patch:

Index: upstart-tty-stack.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart-tty-stack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upstart-tty-stack.patch	2 Mar 2008 23:29:26 -0000	1.2
+++ upstart-tty-stack.patch	27 Apr 2009 20:07:46 -0000	1.3
@@ -1,15 +1,3 @@
-=== modified file 'init/Makefile.am'
---- init/Makefile.am	2007-10-11 21:00:43 +0000
-+++ init/Makefile.am	2008-02-29 21:38:58 +0000
-@@ -16,6 +16,7 @@
- 
- init_SOURCES = \
- 	main.c \
-+	tty.c tty.h\
- 	errors.h paths.h \
- 	process.c process.h \
- 	job.c job.h \
-
 === modified file 'init/Makefile.in'
 --- init/Makefile.in	2008-03-02 23:21:30 +0000
 +++ init/Makefile.in	2008-02-29 21:39:16 +0000


Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- upstart.spec	3 Apr 2009 23:32:49 -0000	1.29
+++ upstart.spec	27 Apr 2009 20:07:46 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -16,10 +16,11 @@
 Patch5:         upstart-telinit-u.patch
 Patch6:	        upstart-initctl-man.patch
 Patch7:		upstart-save-state-across-reexec.patch
+Patch8:		upstart-audit-events.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
-BuildRequires:  gettext
+BuildRequires:  gettext audit-libs-devel
 
 %description
 Upstart is an event-based replacement for the /sbin/init daemon which
@@ -36,6 +37,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -101,6 +103,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Mon Apr 27 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-24
+- Apply the audit patch correctly (#470661)
+
 * Fri Apr 3 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-23
 - Add audit events patch from Steve Grubb <sgrubb at redhat.com> (Bug #470661)
 



From pkgdb at fedoraproject.org  Mon Apr 27 20:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:08:17 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested watchbugzilla
Message-ID: <20090427200817.C2DF110F8A5@bastion2.fedora.phx.redhat.com>

alsadi has requested the watchbugzilla acl on kchmviewer (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:08:20 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested watchcommits
Message-ID: <20090427200820.4DA8C10F8AA@bastion2.fedora.phx.redhat.com>

alsadi has requested the watchcommits acl on kchmviewer (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From pkgdb at fedoraproject.org  Mon Apr 27 20:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:08:22 +0000
Subject: [pkgdb] kchmviewer: alsadi has requested commit
Message-ID: <20090427200822.D57C610F89B@bastion2.fedora.phx.redhat.com>

alsadi has requested the commit acl on kchmviewer (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kchmviewer



From mclasen at fedoraproject.org  Mon Apr 27 20:13:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 27 Apr 2009 20:13:20 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel
	gnome-system-monitor-2.25.91-polkit.patch, 1.1,
	1.2 gnome-system-monitor.spec, 1.140, 1.141
Message-ID: <20090427201320.CA0D370110@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25925

Modified Files:
	gnome-system-monitor-2.25.91-polkit.patch 
	gnome-system-monitor.spec 
Log Message:
Build against newer GConf/intltool


gnome-system-monitor-2.25.91-polkit.patch:

Index: gnome-system-monitor-2.25.91-polkit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor-2.25.91-polkit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-system-monitor-2.25.91-polkit.patch	19 Feb 2009 06:06:57 -0000	1.1
+++ gnome-system-monitor-2.25.91-polkit.patch	27 Apr 2009 20:12:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gnome-system-monitor-2.25.91/configure.in.polkit gnome-system-monitor-2.25.91/configure.in
---- gnome-system-monitor-2.25.91/configure.in.polkit	2009-02-16 13:07:36.000000000 -0500
-+++ gnome-system-monitor-2.25.91/configure.in	2009-02-19 01:04:23.775985963 -0500
+diff -up gnome-system-monitor-2.26.1/configure.in.polkit gnome-system-monitor-2.26.1/configure.in
+--- gnome-system-monitor-2.26.1/configure.in.polkit	2009-04-10 18:33:14.000000000 -0400
++++ gnome-system-monitor-2.26.1/configure.in	2009-04-23 15:01:02.779508852 -0400
 @@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0
  GLIBMM_REQUIRED=2.14
  LIBXML_REQUIRED=2.0
@@ -54,9 +54,9 @@
  	Maintainer mode:	${USER_MAINTAINER_MODE}
  	Languages:		${ALL_LINGUAS}
  "
-diff -up gnome-system-monitor-2.25.91/po/POTFILES.in.polkit gnome-system-monitor-2.25.91/po/POTFILES.in
---- gnome-system-monitor-2.25.91/po/POTFILES.in.polkit	2009-02-16 13:36:20.000000000 -0500
-+++ gnome-system-monitor-2.25.91/po/POTFILES.in	2009-02-19 01:04:23.777985747 -0500
+diff -up gnome-system-monitor-2.26.1/po/POTFILES.in.polkit gnome-system-monitor-2.26.1/po/POTFILES.in
+--- gnome-system-monitor-2.26.1/po/POTFILES.in.polkit	2009-04-13 15:36:22.000000000 -0400
++++ gnome-system-monitor-2.26.1/po/POTFILES.in	2009-04-23 15:01:02.779508852 -0400
 @@ -8,6 +8,7 @@ src/callbacks.cpp
  src/defaulttable.h
  src/disks.cpp
@@ -65,9 +65,9 @@
  src/gnome-system-monitor.schemas.in
  src/gsm_color_button.c
  src/interface.cpp
-diff -up gnome-system-monitor-2.25.91/src/callbacks.cpp.polkit gnome-system-monitor-2.25.91/src/callbacks.cpp
---- gnome-system-monitor-2.25.91/src/callbacks.cpp.polkit	2009-01-20 16:00:27.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/callbacks.cpp	2009-02-19 01:04:23.779986089 -0500
+diff -up gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit gnome-system-monitor-2.26.1/src/callbacks.cpp
+--- gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit	2009-01-20 16:00:27.000000000 -0500
++++ gnome-system-monitor-2.26.1/src/callbacks.cpp	2009-04-23 15:01:24.243745907 -0400
 @@ -210,11 +210,13 @@ cb_app_delete (GtkWidget *window, GdkEve
  
  
@@ -82,9 +82,17 @@
  
  
  static void change_gconf_color(GConfClient *client, const char *key,
-diff -up /dev/null gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.c
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.c	2009-02-19 01:04:23.785987256 -0500
+@@ -286,6 +288,7 @@ cb_row_selected (GtkTreeSelection *selec
+ 	ProcData * const procdata = static_cast<ProcData*>(data);
+ 
+ 	procdata->selection = selection;
++	procdata->selected_process = NULL;
+ 
+ 	/* get the most recent selected process and determine if there are
+ 	** no selected processes
+diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c	2009-04-23 15:01:02.782492856 -0400
 @@ -0,0 +1,640 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -726,9 +734,9 @@
 +out:
 +        return ret;
 +}
-diff -up /dev/null gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.xml
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.xml	2009-02-19 01:04:23.788989062 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml	2009-04-23 15:01:02.782492856 -0400
 @@ -0,0 +1,15 @@
 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 +<node name="/">
@@ -745,9 +753,9 @@
 +    </method>
 +  </interface>
 +</node>
-diff -up gnome-system-monitor-2.25.91/src/interface.cpp.polkit gnome-system-monitor-2.25.91/src/interface.cpp
---- gnome-system-monitor-2.25.91/src/interface.cpp.polkit	2009-01-24 05:37:45.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/interface.cpp	2009-02-19 01:04:23.792990166 -0500
+diff -up gnome-system-monitor-2.26.1/src/interface.cpp.polkit gnome-system-monitor-2.26.1/src/interface.cpp
+--- gnome-system-monitor-2.26.1/src/interface.cpp.polkit	2009-04-10 18:33:14.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/interface.cpp	2009-04-23 15:02:01.567746154 -0400
 @@ -30,6 +30,10 @@
  #include <gdk/gdkkeysyms.h>
  #include <math.h>
@@ -867,15 +875,14 @@
  	for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
  						     selected_actions[i]);
--		gtk_action_set_sensitive(action, selected_sensitivity);
 +#ifdef HAVE_POLKIT
 +                if (POLKIT_GNOME_IS_ACTION (action)) {
-+                        polkit_gnome_action_set_sensitive (POLKIT_GNOME_ACTION (action), processes_sensitivity);
++                        polkit_gnome_action_set_sensitive (POLKIT_GNOME_ACTION (action), selected_sensitivity);
 +                } else {
-+                        gtk_action_set_sensitive(action, processes_sensitivity);
++                        gtk_action_set_sensitive(action, selected_sensitivity);
 +                }
 +#else
-+		gtk_action_set_sensitive(action, processes_sensitivity);
+ 		gtk_action_set_sensitive(action, selected_sensitivity);
 +#endif
  	}
 +
@@ -901,9 +908,9 @@
  }
  
  static void		
-diff -up gnome-system-monitor-2.25.91/src/Makefile.am.polkit gnome-system-monitor-2.25.91/src/Makefile.am
---- gnome-system-monitor-2.25.91/src/Makefile.am.polkit	2008-08-08 15:55:59.000000000 -0400
-+++ gnome-system-monitor-2.25.91/src/Makefile.am	2009-02-19 01:04:23.800988043 -0500
+diff -up gnome-system-monitor-2.26.1/src/Makefile.am.polkit gnome-system-monitor-2.26.1/src/Makefile.am
+--- gnome-system-monitor-2.26.1/src/Makefile.am.polkit	2008-08-08 15:55:59.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/Makefile.am	2009-04-23 15:01:02.784504169 -0400
 @@ -4,7 +4,9 @@ INCLUDES = \
  	-DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -974,9 +981,9 @@
  
  CLEANFILES = \
  	$(schema_DATA)
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.conf
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.conf	2009-02-19 01:04:23.801989995 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf	2009-04-23 15:01:02.786494180 -0400
 @@ -0,0 +1,11 @@
 +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
 +
@@ -989,17 +996,17 @@
 +    <allow own="org.gnome.SystemMonitor.Mechanism"/>
 +  </policy>
 +</busconfig>
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.service.in
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-02-19 01:04:23.802984823 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-04-23 15:01:02.786494180 -0400
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.gnome.SystemMonitor.Mechanism
 +Exec=libexecdir/gnome-system-monitor-mechanism
 +User=root
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.system-monitor.policy.in
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.system-monitor.policy.in	2009-02-19 01:04:23.803984610 -0500
+diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in
+--- /dev/null	2009-04-23 10:50:49.279044520 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in	2009-04-23 15:01:02.787520999 -0400
 @@ -0,0 +1,50 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +
@@ -1051,9 +1058,9 @@
 +  </action>
 +  
 +</policyconfig>
-diff -up gnome-system-monitor-2.25.91/src/procactions.cpp.polkit gnome-system-monitor-2.25.91/src/procactions.cpp
---- gnome-system-monitor-2.25.91/src/procactions.cpp.polkit	2007-01-02 17:15:36.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procactions.cpp	2009-02-19 01:04:23.804984817 -0500
+diff -up gnome-system-monitor-2.26.1/src/procactions.cpp.polkit gnome-system-monitor-2.26.1/src/procactions.cpp
+--- gnome-system-monitor-2.26.1/src/procactions.cpp.polkit	2007-01-02 17:15:36.000000000 -0500
++++ gnome-system-monitor-2.26.1/src/procactions.cpp	2009-04-23 15:01:02.788493760 -0400
 @@ -31,6 +31,10 @@
  #include "procdialogs.h"
  #include "callbacks.h"
@@ -1166,9 +1173,9 @@
  	proctable_update_all (procdata);
  }
 +
-diff -up gnome-system-monitor-2.25.91/src/procdialogs.cpp.polkit gnome-system-monitor-2.25.91/src/procdialogs.cpp
---- gnome-system-monitor-2.25.91/src/procdialogs.cpp.polkit	2008-05-23 17:44:00.000000000 -0400
-+++ gnome-system-monitor-2.25.91/src/procdialogs.cpp	2009-02-19 01:04:23.805984464 -0500
+diff -up gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit gnome-system-monitor-2.26.1/src/procdialogs.cpp
+--- gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit	2008-05-23 17:44:00.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/procdialogs.cpp	2009-04-23 15:01:02.789493899 -0400
 @@ -35,6 +35,11 @@
  #include "procman_gnomesu.h"
  #include "procman_gksu.h"
@@ -1362,9 +1369,9 @@
  }
  
  static void
-diff -up gnome-system-monitor-2.25.91/src/procman.cpp.polkit gnome-system-monitor-2.25.91/src/procman.cpp
---- gnome-system-monitor-2.25.91/src/procman.cpp.polkit	2009-01-03 07:06:10.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procman.cpp	2009-02-19 01:04:23.807984667 -0500
+diff -up gnome-system-monitor-2.26.1/src/procman.cpp.polkit gnome-system-monitor-2.26.1/src/procman.cpp
+--- gnome-system-monitor-2.26.1/src/procman.cpp.polkit	2009-03-31 17:57:18.000000000 -0400
++++ gnome-system-monitor-2.26.1/src/procman.cpp	2009-04-23 15:01:02.790494038 -0400
 @@ -36,6 +36,10 @@
  #include <glibtop/close.h>
  #include <glibtop/loadavg.h>
@@ -1412,9 +1419,9 @@
  
  
  ProcData* ProcData::get_instance()
-diff -up gnome-system-monitor-2.25.91/src/procman.h.polkit gnome-system-monitor-2.25.91/src/procman.h
---- gnome-system-monitor-2.25.91/src/procman.h.polkit	2009-01-20 15:53:35.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procman.h	2009-02-19 01:04:23.808984593 -0500
+diff -up gnome-system-monitor-2.26.1/src/procman.h.polkit gnome-system-monitor-2.26.1/src/procman.h
+--- gnome-system-monitor-2.26.1/src/procman.h.polkit	2009-01-20 15:53:35.000000000 -0500
++++ gnome-system-monitor-2.26.1/src/procman.h	2009-04-23 15:01:02.791493688 -0400
 @@ -33,6 +33,11 @@
  #include <map>
  #include <string>


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-system-monitor.spec	14 Apr 2009 01:33:43 -0000	1.140
+++ gnome-system-monitor.spec	27 Apr 2009 20:12:50 -0000	1.141
@@ -13,7 +13,7 @@
 Summary: Process and resource monitor
 Name: gnome-system-monitor
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Rebuild against newer GConf/intltool
+- Pick up fixes from F-11
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-system-monitor/2.26/gnome-system-monitor-2.26.1.news



From jskala at fedoraproject.org  Mon Apr 27 20:17:08 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Mon, 27 Apr 2009 20:17:08 +0000 (UTC)
Subject: rpms/radvd/devel radvd-1.2-posix.patch, NONE, 1.1 .cvsignore, 1.11, 
	1.12 radvd.init, 1.3, 1.4 radvd.spec, 1.49, 1.50 sources, 1.11,
	1.12 radvd-1.1-stale_pid.patch, 1.1, NONE
Message-ID: <20090427201708.53AE670110@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26520

Modified Files:
	.cvsignore radvd.init radvd.spec sources 
Added Files:
	radvd-1.2-posix.patch 
Removed Files:
	radvd-1.1-stale_pid.patch 
Log Message:
* Mon Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
- updated to latest upstream version


radvd-1.2-posix.patch:

--- NEW FILE radvd-1.2-posix.patch ---
diff -up radvd-1.2/redhat/radvd.init.posix radvd-1.2/redhat/radvd.init
--- radvd-1.2/redhat/radvd.init.posix	2009-04-27 21:56:39.000000000 +0200
+++ radvd-1.2/redhat/radvd.init	2009-04-27 21:59:22.000000000 +0200
@@ -28,12 +28,6 @@
 
 [ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
 
-if [ "$1" == "status" ]; then
-	[ -f /usr/sbin/radvd ] || exit 4
-else 
-	[ -f /usr/sbin/radvd ] || exit 1
-fi
-
 RETVAL=0
 PROG="radvd"
 LOCKFILE=/var/lock/subsys/radvd
@@ -41,10 +35,14 @@ LOCKFILE=/var/lock/subsys/radvd
 # See how we were called.
 case "$1" in
   start)
-
-	# Check that networking is up.	
-	[ "${NETWORKING_IPV6}" = "yes" ] || exit 1
-
+	if [ ! -f /etc/radvd.conf ]; then
+		echo "Configuration file /etc/radvd.conf missing" 1>&2
+		exit 6
+		fi
+	if [ ! -x /usr/sbin/radvd ]; then
+		echo "Insufficient privilege" 1>&2
+		exit 4
+	fi
 	echo -n $"Starting $PROG: "
 	daemon radvd $OPTIONS
 	RETVAL=$?


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Feb 2008 09:55:04 -0000	1.11
+++ .cvsignore	27 Apr 2009 20:16:37 -0000	1.12
@@ -1 +1 @@
-radvd-1.1.tar.gz
+radvd-1.2.tar.gz


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- radvd.init	2 Feb 2009 13:30:24 -0000	1.3
+++ radvd.init	27 Apr 2009 20:16:37 -0000	1.4
@@ -43,7 +43,6 @@
       echo "Insufficient privilege" 1>&2
       exit 4
     fi
-    echo -n $"Starting $prog: "
     echo -n $"Starting $PROG: "
     daemon radvd $OPTIONS
     RETVAL=$?


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- radvd.spec	27 Feb 2009 07:55:49 -0000	1.49
+++ radvd.spec	27 Apr 2009 20:16:37 -0000	1.50
@@ -4,8 +4,8 @@
 %define RADVD_UID 75
 Summary:    A Router Advertisement daemon
 Name:       radvd
-Version:    1.1
-Release:    8%{?dist}
+Version:    1.2
+Release:    1%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -18,8 +18,7 @@
 BuildRequires:      flex, byacc
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: radvd-1.1-posix.patch
-Patch1: radvd-1.1-stale_pid.patch
+Patch0: radvd-1.2-posix.patch
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -35,7 +34,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .posix
-%patch1 -p1 -b .stale_pid
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" 
@@ -97,6 +95,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Mon Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
+- updated to latest upstream version
+
 * Fri Feb 27 2009 Jiri Skala <jskala at redhat.com> - 1.1-8
 - regenerated posix patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Feb 2008 09:55:04 -0000	1.11
+++ sources	27 Apr 2009 20:16:37 -0000	1.12
@@ -1 +1 @@
-9ee449e4b89171432cb9e9100e0b5648  radvd-1.1.tar.gz
+614876420d76cd2bb5bcb49760c8b9e3  radvd-1.2.tar.gz


--- radvd-1.1-stale_pid.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:28 +0000
Subject: [pkgdb] python-twisted-core had acl change status
Message-ID: <20090427202228.4889B10F895@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on python-twisted-core (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:28 +0000
Subject: [pkgdb] python-twisted-core had acl change status
Message-ID: <20090427202228.4B2D610F896@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on python-twisted-core (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:29 +0000
Subject: [pkgdb] python-twisted-core had acl change status
Message-ID: <20090427202229.6F1C910F899@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on python-twisted-core (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:43 +0000
Subject: [pkgdb] python-twisted-names had acl change status
Message-ID: <20090427202243.2F1A310F89E@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on python-twisted-names (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:31 +0000
Subject: [pkgdb] python-twisted-core had acl change status
Message-ID: <20090427202231.8C63E10F89B@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on python-twisted-core (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-core



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:44 +0000
Subject: [pkgdb] python-twisted-names had acl change status
Message-ID: <20090427202244.5F37F10F89C@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on python-twisted-names (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:45 +0000
Subject: [pkgdb] python-twisted-names had acl change status
Message-ID: <20090427202245.97CD610F89F@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on python-twisted-names (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:52 +0000
Subject: [pkgdb] python-twisted-web had acl change status
Message-ID: <20090427202252.8B05B10F8A5@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on python-twisted-web (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:48 +0000
Subject: [pkgdb] python-twisted-names had acl change status
Message-ID: <20090427202248.3908110F8A3@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on python-twisted-names (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-names



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:53 +0000
Subject: [pkgdb] python-twisted-web had acl change status
Message-ID: <20090427202253.295B810F8A8@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on python-twisted-web (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:54 +0000
Subject: [pkgdb] python-twisted-web had acl change status
Message-ID: <20090427202255.2F96710F8AB@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on python-twisted-web (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From pkgdb at fedoraproject.org  Mon Apr 27 20:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 27 Apr 2009 20:22:56 +0000
Subject: [pkgdb] python-twisted-web had acl change status
Message-ID: <20090427202256.6CCDC10F899@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on python-twisted-web (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twisted-web



From limb at fedoraproject.org  Mon Apr 27 20:27:40 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 27 Apr 2009 20:27:40 +0000 (UTC)
Subject: rpms/cfdg/devel contextfree-2.2-mktemp.patch, NONE,
	1.1 contextfree-2.2-optflags.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 cfdg.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090427202740.4F56370110@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/cfdg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27931

Modified Files:
	.cvsignore cfdg.spec sources 
Added Files:
	contextfree-2.2-mktemp.patch contextfree-2.2-optflags.patch 
Log Message:
2.2


contextfree-2.2-mktemp.patch:

--- NEW FILE contextfree-2.2-mktemp.patch ---
--- src-unix/posixSystem.cpp~	2009-04-27 15:06:36.000000000 -0500
+++ src-unix/posixSystem.cpp	2009-04-27 15:06:36.000000000 -0500
@@ -107 +107 @@
-	if (mktemp(b)) {
+	if (mkstemp(b)) {

contextfree-2.2-optflags.patch:

--- NEW FILE contextfree-2.2-optflags.patch ---
--- Makefile~	2009-04-27 15:15:01.000000000 -0500
+++ Makefile	2009-04-27 15:15:01.000000000 -0500
@@ -106,0 +107 @@
+OPTFLAGS = -03 -Wall
@@ -108 +109 @@
-CPPFLAGS += -O3 -Wall
++CPPFLAGS += $(OPTFLAGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Oct 2008 12:32:05 -0000	1.2
+++ .cvsignore	27 Apr 2009 20:27:09 -0000	1.3
@@ -1 +1 @@
-ContextFreeSource2.1.tar.gz
+ContextFreeSource2.2.tgz


Index: cfdg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/devel/cfdg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfdg.spec	24 Feb 2009 07:05:32 -0000	1.2
+++ cfdg.spec	27 Apr 2009 20:27:09 -0000	1.3
@@ -1,14 +1,14 @@
 Name: cfdg
-Version:  2.1
-Release:  6%{?dist}
+Version:  2.2
+Release:  1%{?dist}
 Summary: Context Free Design Grammar
 
 Group: Amusements/Games 
 License: GPLv2+
 URL: http://www.contextfreeart.org/
 
-Source0: ContextFreeSource%{version}.tar.gz
-#Source0: http://www.contextfreeart.org/download/ContextFreeSource%{version}.tgz
+#Source0: ContextFreeSource%{version}.tar.gz
+Source0: http://www.contextfreeart.org/download/ContextFreeSource%{version}.tgz
 #Modified tarball due to licensing issues, to be fixed in 2.2
 #To create from upstream:
 #gunzip ContextFreeSource2.1.tgz
@@ -20,15 +20,15 @@
 #gzip ContextFreeSource2.1.tar
 
 #GCC 4.3 compatibility patches.  Submitted upstream via email 2008-06-25.
-Patch0: contextfree-2.1-builder-includes.patch
-Patch1: contextfree-2.1-yglue-includes.patch
-Patch2: contextfree-2.1-SVGCanvas-includes.patch
-Patch3: contextfree-2.1-tiledCanvas-includes.patch
-Patch4: contextfree-2.1-posixSystem-includes.patch
+#Patch0: contextfree-2.1-builder-includes.patch
+#Patch1: contextfree-2.1-yglue-includes.patch
+#Patch2: contextfree-2.1-SVGCanvas-includes.patch
+#Patch3: contextfree-2.1-tiledCanvas-includes.patch
+#Patch4: contextfree-2.1-posixSystem-includes.patch
 #Strip patch.
 Patch5: contextfree-2.1-Makefile-nostrip.patch
-Patch6: contextfree-2.1-mktemp.patch
-Patch7: contextfree-2.1-optflags.patch
+Patch6: contextfree-2.2-mktemp.patch
+Patch7: contextfree-2.2-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 BuildRequires: libpng-devel, byacc, flex
 
@@ -40,11 +40,11 @@
 %prep
 %setup -qn ContextFreeSource%{version}
 
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
+#%patch0 -p0
+#%patch1 -p0
+#%patch2 -p0
+#%patch3 -p0
+#%patch4 -p0
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
@@ -67,6 +67,10 @@
 %doc input/* LICENSE.txt README.txt
 
 %changelog
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 2.2-1
+- 2.2, fixed licencing and gcc issues.
+- Updated mktemp, optflag patches.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Oct 2008 12:32:05 -0000	1.2
+++ sources	27 Apr 2009 20:27:09 -0000	1.3
@@ -1 +1 @@
-3b0b1eb495def73b8dfcbce3dfbe0985  ContextFreeSource2.1.tar.gz
+e48c1967e4ec0b7764ef698b4a887ae5  ContextFreeSource2.2.tgz



From ellert at fedoraproject.org  Mon Apr 27 20:31:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 20:31:00 +0000 (UTC)
Subject: rpms/globus-common/devel globus-common.spec, 1.3, 1.4 import.log,
	1.3, 1.4
Message-ID: <20090427203100.4715170110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29258/devel

Modified Files:
	globus-common.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
- Rebuild with updated libtool



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/globus-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-common.spec	21 Apr 2009 15:43:29 -0000	1.3
+++ globus-common.spec	27 Apr 2009 20:30:29 -0000	1.4
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -370,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
+- Rebuild with updated libtool
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:43:29 -0000	1.3
+++ import.log	27 Apr 2009 20:30:29 -0000	1.4
@@ -1,3 +1,4 @@
 globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760
 globus-common-10_2-2_fc9:HEAD:globus-common-10.2-2.fc9.src.rpm:1240004909
 globus-common-10_2-3_fc9:HEAD:globus-common-10.2-3.fc9.src.rpm:1240328457
+globus-common-10_2-4_fc9:HEAD:globus-common-10.2-4.fc9.src.rpm:1240864187



From ellert at fedoraproject.org  Mon Apr 27 20:34:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 20:34:24 +0000 (UTC)
Subject: rpms/globus-common/F-9 globus-common.spec, 1.3, 1.4 import.log, 1.3,
	1.4
Message-ID: <20090427203424.88B9570110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29754/F-9

Modified Files:
	globus-common.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
- Rebuild with updated libtool



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/globus-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-common.spec	21 Apr 2009 15:45:52 -0000	1.3
+++ globus-common.spec	27 Apr 2009 20:33:54 -0000	1.4
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -370,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
+- Rebuild with updated libtool
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:45:52 -0000	1.3
+++ import.log	27 Apr 2009 20:33:54 -0000	1.4
@@ -1,3 +1,4 @@
 globus-common-10_2-1_fc9:F-9:globus-common-10.2-1.fc9.src.rpm:1239090158
 globus-common-10_2-2_fc9:F-9:globus-common-10.2-2.fc9.src.rpm:1240005128
 globus-common-10_2-3_fc9:F-9:globus-common-10.2-3.fc9.src.rpm:1240328671
+globus-common-10_2-4_fc9:F-9:globus-common-10.2-4.fc9.src.rpm:1240864394



From ellert at fedoraproject.org  Mon Apr 27 20:35:46 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 20:35:46 +0000 (UTC)
Subject: rpms/globus-common/F-10 globus-common.spec, 1.3, 1.4 import.log, 1.3,
	1.4
Message-ID: <20090427203546.DFB6E70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30006/F-10

Modified Files:
	globus-common.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
- Rebuild with updated libtool



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-common.spec	21 Apr 2009 15:49:33 -0000	1.3
+++ globus-common.spec	27 Apr 2009 20:35:16 -0000	1.4
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -370,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
+- Rebuild with updated libtool
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:49:33 -0000	1.3
+++ import.log	27 Apr 2009 20:35:16 -0000	1.4
@@ -1,3 +1,4 @@
 globus-common-10_2-1_fc9:F-10:globus-common-10.2-1.fc9.src.rpm:1239093082
 globus-common-10_2-2_fc9:F-10:globus-common-10.2-2.fc9.src.rpm:1240005254
 globus-common-10_2-3_fc9:F-10:globus-common-10.2-3.fc9.src.rpm:1240328836
+globus-common-10_2-4_fc9:F-10:globus-common-10.2-4.fc9.src.rpm:1240864485



From ellert at fedoraproject.org  Mon Apr 27 20:37:13 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 20:37:13 +0000 (UTC)
Subject: rpms/globus-common/F-11 globus-common.spec, 1.3, 1.4 import.log, 1.3,
	1.4
Message-ID: <20090427203713.AF1F370110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30334/F-11

Modified Files:
	globus-common.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
- Rebuild with updated libtool



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-common.spec	21 Apr 2009 15:51:13 -0000	1.3
+++ globus-common.spec	27 Apr 2009 20:36:43 -0000	1.4
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -370,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
+- Rebuild with updated libtool
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:51:13 -0000	1.3
+++ import.log	27 Apr 2009 20:36:43 -0000	1.4
@@ -1,3 +1,4 @@
 globus-common-10_2-1_fc9:HEAD:globus-common-10.2-1.fc9.src.rpm:1239089760
 globus-common-10_2-2_fc9:F-11:globus-common-10.2-2.fc9.src.rpm:1240005358
 globus-common-10_2-3_fc9:F-11:globus-common-10.2-3.fc9.src.rpm:1240329014
+globus-common-10_2-4_fc9:F-11:globus-common-10.2-4.fc9.src.rpm:1240864567



From ellert at fedoraproject.org  Mon Apr 27 20:38:40 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 20:38:40 +0000 (UTC)
Subject: rpms/globus-common/EL-4 globus-common.spec, 1.3, 1.4 import.log, 1.3,
	1.4
Message-ID: <20090427203840.34E7070110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30593/EL-4

Modified Files:
	globus-common.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
- Rebuild with updated libtool



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/globus-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-common.spec	21 Apr 2009 15:54:28 -0000	1.3
+++ globus-common.spec	27 Apr 2009 20:38:09 -0000	1.4
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -370,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
+- Rebuild with updated libtool
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:54:29 -0000	1.3
+++ import.log	27 Apr 2009 20:38:09 -0000	1.4
@@ -1,3 +1,4 @@
 globus-common-10_2-1_fc9:EL-4:globus-common-10.2-1.fc9.src.rpm:1239090310
 globus-common-10_2-2_fc9:EL-4:globus-common-10.2-2.fc9.src.rpm:1240005453
 globus-common-10_2-3_fc9:EL-4:globus-common-10.2-3.fc9.src.rpm:1240329175
+globus-common-10_2-4_fc9:EL-4:globus-common-10.2-4.fc9.src.rpm:1240864659



From ellert at fedoraproject.org  Mon Apr 27 20:40:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 20:40:08 +0000 (UTC)
Subject: rpms/globus-common/EL-5 globus-common.spec, 1.3, 1.4 import.log, 1.3,
	1.4
Message-ID: <20090427204008.EADF070110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30889/EL-5

Modified Files:
	globus-common.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
- Rebuild with updated libtool



Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/globus-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globus-common.spec	21 Apr 2009 15:56:47 -0000	1.3
+++ globus-common.spec	27 Apr 2009 20:39:38 -0000	1.4
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -370,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-4
+- Rebuild with updated libtool
+
 * Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Apr 2009 15:56:47 -0000	1.3
+++ import.log	27 Apr 2009 20:39:38 -0000	1.4
@@ -1,3 +1,4 @@
 globus-common-10_2-1_fc9:EL-5:globus-common-10.2-1.fc9.src.rpm:1239090450
 globus-common-10_2-2_fc9:EL-5:globus-common-10.2-2.fc9.src.rpm:1240005583
 globus-common-10_2-3_fc9:EL-5:globus-common-10.2-3.fc9.src.rpm:1240329334
+globus-common-10_2-4_fc9:EL-5:globus-common-10.2-4.fc9.src.rpm:1240864741



From nalin at fedoraproject.org  Mon Apr 27 20:51:27 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 20:51:27 +0000 (UTC)
Subject: rpms/slapi-nis/devel .cvsignore, 1.5, 1.6 slapi-nis.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090427205127.4590D70110@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32240

Modified Files:
	.cvsignore slapi-nis.spec sources 
Log Message:
update to 0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Mar 2009 00:57:35 -0000	1.5
+++ .cvsignore	27 Apr 2009 20:50:56 -0000	1.6
@@ -2,3 +2,4 @@
 slapi-nis-0.8.1.tar.gz
 slapi-nis-0.9.tar.gz
 slapi-nis-0.10.tar.gz
+slapi-nis-0.11.tar.gz


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/devel/slapi-nis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slapi-nis.spec	5 Mar 2009 00:57:35 -0000	1.5
+++ slapi-nis.spec	27 Apr 2009 20:50:56 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.10
+Version:	0.11
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,14 +46,39 @@
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
+- update to 0.11
+
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
+- make the example nsslapd-pluginpath values the same on 32- and 64-bit
+  systems, because we can depend on the directory server "knowing" which
+  directory to search for the plugins
+
+* Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
+- update to 0.8.5 to suppress duplicate values for attributes in the schema
+  compatibility plugin
+
+* Thu Dec  4 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.4-1
+- update to 0.8.4 to fix:
+  - problems updating references, particularly those for %%referred() (#474478)
+  - inability to notice internal add/modify/modrdn/delete operations (really
+    this time) (#474426)
+
+* Wed Dec  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.3-1
+- update to 0.8.3 to also notice and reflect changes caused by internal
+  add/modify/modrdn/delete operations
+ 
+* Wed Nov 19 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.2-1
+- update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
+
 * Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
-- update to 0.9
+ update to 0.9
 
 * Fri Oct  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.1-1
 - update to 0.8.1 to fix a heap corruption (Rich Megginson)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Mar 2009 00:57:35 -0000	1.5
+++ sources	27 Apr 2009 20:50:56 -0000	1.6
@@ -1 +1 @@
-9e949c3845e18f71c58499565da6948a  slapi-nis-0.10.tar.gz
+e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz



From nalin at fedoraproject.org  Mon Apr 27 20:52:54 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 20:52:54 +0000 (UTC)
Subject: rpms/slapi-nis/devel slapi-nis.spec,1.6,1.7
Message-ID: <20090427205254.D179170110@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32399

Modified Files:
	slapi-nis.spec 
Log Message:
fixup a formatting typo in the changelog


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/devel/slapi-nis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapi-nis.spec	27 Apr 2009 20:50:56 -0000	1.6
+++ slapi-nis.spec	27 Apr 2009 20:52:24 -0000	1.7
@@ -78,7 +78,7 @@
 - update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
 
 * Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
- update to 0.9
+- update to 0.9
 
 * Fri Oct  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.1-1
 - update to 0.8.1 to fix a heap corruption (Rich Megginson)



From nalin at fedoraproject.org  Mon Apr 27 20:55:18 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 20:55:18 +0000 (UTC)
Subject: rpms/slapi-nis/F-10 slapi-nis.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20090427205518.B2FBD70110@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv458/F-10

Modified Files:
	slapi-nis.spec sources 
Log Message:
update to 0.11


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-10/slapi-nis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slapi-nis.spec	27 Apr 2009 14:54:15 -0000	1.7
+++ slapi-nis.spec	27 Apr 2009 20:54:48 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.10
+Version:	0.11
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,12 +46,37 @@
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
+- update to 0.11
+
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
+- make the example nsslapd-pluginpath values the same on 32- and 64-bit
+  systems, because we can depend on the directory server "knowing" which
+  directory to search for the plugins
+
+* Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
+- update to 0.8.5 to suppress duplicate values for attributes in the schema
+  compatibility plugin
+
+* Thu Dec  4 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.4-1
+- update to 0.8.4 to fix:
+  - problems updating references, particularly those for %%referred() (#474478)
+  - inability to notice internal add/modify/modrdn/delete operations (really
+    this time) (#474426)
+
+* Wed Dec  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.3-1
+- update to 0.8.3 to also notice and reflect changes caused by internal
+  add/modify/modrdn/delete operations
+ 
+* Wed Nov 19 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.2-1
+- update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
+
 * Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
 - update to 0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2009 14:54:15 -0000	1.7
+++ sources	27 Apr 2009 20:54:48 -0000	1.8
@@ -1 +1 @@
-9e949c3845e18f71c58499565da6948a  slapi-nis-0.10.tar.gz
+e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz



From nalin at fedoraproject.org  Mon Apr 27 20:55:18 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 20:55:18 +0000 (UTC)
Subject: rpms/slapi-nis/F-11 slapi-nis.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090427205518.D751070129@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv458/F-11

Modified Files:
	slapi-nis.spec sources 
Log Message:
update to 0.11


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-11/slapi-nis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slapi-nis.spec	5 Mar 2009 00:57:35 -0000	1.5
+++ slapi-nis.spec	27 Apr 2009 20:54:48 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.10
+Version:	0.11
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,12 +46,37 @@
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
+- update to 0.11
+
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
+- make the example nsslapd-pluginpath values the same on 32- and 64-bit
+  systems, because we can depend on the directory server "knowing" which
+  directory to search for the plugins
+
+* Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
+- update to 0.8.5 to suppress duplicate values for attributes in the schema
+  compatibility plugin
+
+* Thu Dec  4 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.4-1
+- update to 0.8.4 to fix:
+  - problems updating references, particularly those for %%referred() (#474478)
+  - inability to notice internal add/modify/modrdn/delete operations (really
+    this time) (#474426)
+
+* Wed Dec  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.3-1
+- update to 0.8.3 to also notice and reflect changes caused by internal
+  add/modify/modrdn/delete operations
+ 
+* Wed Nov 19 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.2-1
+- update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
+
 * Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
 - update to 0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Mar 2009 00:57:35 -0000	1.5
+++ sources	27 Apr 2009 20:54:48 -0000	1.6
@@ -1 +1 @@
-9e949c3845e18f71c58499565da6948a  slapi-nis-0.10.tar.gz
+e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz



From nalin at fedoraproject.org  Mon Apr 27 20:55:19 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 27 Apr 2009 20:55:19 +0000 (UTC)
Subject: rpms/slapi-nis/F-9 slapi-nis.spec,1.7,1.8 sources,1.8,1.9
Message-ID: <20090427205519.21C4F70110@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/slapi-nis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv458/F-9

Modified Files:
	slapi-nis.spec sources 
Log Message:
update to 0.11


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/slapi-nis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slapi-nis.spec	27 Apr 2009 14:54:15 -0000	1.7
+++ slapi-nis.spec	27 Apr 2009 20:54:48 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.10
+Version:	0.11
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,12 +46,37 @@
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
+- update to 0.11
+
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Tue Dec  9 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-2
+- make the example nsslapd-pluginpath values the same on 32- and 64-bit
+  systems, because we can depend on the directory server "knowing" which
+  directory to search for the plugins
+
+* Mon Dec  8 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.5-1
+- update to 0.8.5 to suppress duplicate values for attributes in the schema
+  compatibility plugin
+
+* Thu Dec  4 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.4-1
+- update to 0.8.4 to fix:
+  - problems updating references, particularly those for %%referred() (#474478)
+  - inability to notice internal add/modify/modrdn/delete operations (really
+    this time) (#474426)
+
+* Wed Dec  3 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.3-1
+- update to 0.8.3 to also notice and reflect changes caused by internal
+  add/modify/modrdn/delete operations
+ 
+* Wed Nov 19 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.8.2-1
+- update to 0.8.2 to remove a redundant read lock in the schema-compat plugin
+
 * Fri Nov  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 0.9-1
 - update to 0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slapi-nis/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Apr 2009 14:54:15 -0000	1.8
+++ sources	27 Apr 2009 20:54:48 -0000	1.9
@@ -1 +1 @@
-9e949c3845e18f71c58499565da6948a  slapi-nis-0.10.tar.gz
+e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 21:04:44 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:04:44 +0000 (UTC)
Subject: rpms/globus-callout/F-9 globus-callout.spec, 1.2, 1.3 import.log,
	1.2, 1.3
Message-ID: <20090427210444.CB10670110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2511/F-9

Modified Files:
	globus-callout.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/globus-callout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-callout.spec	22 Apr 2009 05:51:38 -0000	1.2
+++ globus-callout.spec	27 Apr 2009 21:04:14 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -199,6 +199,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Apr 2009 05:51:38 -0000	1.2
+++ import.log	27 Apr 2009 21:04:14 -0000	1.3
@@ -1,2 +1,3 @@
 globus-callout-0_7-1_fc9:F-9:globus-callout-0.7-1.fc9.src.rpm:1240006610
 globus-callout-0_7-2_fc9:F-9:globus-callout-0.7-2.fc9.src.rpm:1240379427
+globus-callout-0_7-3_fc9:F-9:globus-callout-0.7-3.fc9.src.rpm:1240866177



From ellert at fedoraproject.org  Mon Apr 27 21:06:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:06:52 +0000 (UTC)
Subject: rpms/globus-callout/F-10 globus-callout.spec, 1.2, 1.3 import.log,
	1.2, 1.3
Message-ID: <20090427210652.0995F70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2956/F-10

Modified Files:
	globus-callout.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/globus-callout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-callout.spec	22 Apr 2009 05:53:10 -0000	1.2
+++ globus-callout.spec	27 Apr 2009 21:06:21 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -199,6 +199,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Apr 2009 05:53:11 -0000	1.2
+++ import.log	27 Apr 2009 21:06:21 -0000	1.3
@@ -1,2 +1,3 @@
 globus-callout-0_7-1_fc9:F-10:globus-callout-0.7-1.fc9.src.rpm:1240006742
 globus-callout-0_7-2_fc9:F-10:globus-callout-0.7-2.fc9.src.rpm:1240379542
+globus-callout-0_7-3_fc9:F-10:globus-callout-0.7-3.fc9.src.rpm:1240866306



From ellert at fedoraproject.org  Mon Apr 27 21:08:34 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:08:34 +0000 (UTC)
Subject: rpms/globus-callout/F-11 globus-callout.spec, 1.2, 1.3 import.log,
	1.2, 1.3
Message-ID: <20090427210834.0917670110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3229/F-11

Modified Files:
	globus-callout.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/globus-callout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-callout.spec	22 Apr 2009 05:56:01 -0000	1.2
+++ globus-callout.spec	27 Apr 2009 21:08:03 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -199,6 +199,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Apr 2009 05:56:01 -0000	1.2
+++ import.log	27 Apr 2009 21:08:03 -0000	1.3
@@ -1,2 +1,3 @@
 globus-callout-0_7-1_fc9:F-11:globus-callout-0.7-1.fc9.src.rpm:1240006866
 globus-callout-0_7-2_fc9:F-11:globus-callout-0.7-2.fc9.src.rpm:1240379635
+globus-callout-0_7-3_fc9:F-11:globus-callout-0.7-3.fc9.src.rpm:1240866431



From ellert at fedoraproject.org  Mon Apr 27 21:10:06 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:10:06 +0000 (UTC)
Subject: rpms/globus-callout/EL-4 globus-callout.spec, 1.2, 1.3 import.log,
	1.2, 1.3
Message-ID: <20090427211006.275AB70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3529/EL-4

Modified Files:
	globus-callout.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/globus-callout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-callout.spec	22 Apr 2009 05:57:49 -0000	1.2
+++ globus-callout.spec	27 Apr 2009 21:09:35 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -199,6 +199,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Apr 2009 05:57:49 -0000	1.2
+++ import.log	27 Apr 2009 21:09:35 -0000	1.3
@@ -1,2 +1,3 @@
 globus-callout-0_7-1_fc9:EL-4:globus-callout-0.7-1.fc9.src.rpm:1240006984
 globus-callout-0_7-2_fc9:EL-4:globus-callout-0.7-2.fc9.src.rpm:1240379810
+globus-callout-0_7-3_fc9:EL-4:globus-callout-0.7-3.fc9.src.rpm:1240866540



From ellert at fedoraproject.org  Mon Apr 27 21:12:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:12:23 +0000 (UTC)
Subject: rpms/globus-callout/EL-5 globus-callout.spec, 1.2, 1.3 import.log,
	1.2, 1.3
Message-ID: <20090427211223.16B5170110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3904/EL-5

Modified Files:
	globus-callout.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/globus-callout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-callout.spec	22 Apr 2009 05:59:54 -0000	1.2
+++ globus-callout.spec	27 Apr 2009 21:11:52 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -199,6 +199,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Apr 2009 05:59:54 -0000	1.2
+++ import.log	27 Apr 2009 21:11:52 -0000	1.3
@@ -1,2 +1,3 @@
 globus-callout-0_7-1_fc9:EL-5:globus-callout-0.7-1.fc9.src.rpm:1240007094
 globus-callout-0_7-2_fc9:EL-5:globus-callout-0.7-2.fc9.src.rpm:1240379949
+globus-callout-0_7-3_fc9:EL-5:globus-callout-0.7-3.fc9.src.rpm:1240866654



From ellert at fedoraproject.org  Mon Apr 27 21:02:35 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:02:35 +0000 (UTC)
Subject: rpms/globus-callout/devel globus-callout.spec, 1.2, 1.3 import.log, 
	1.2, 1.3
Message-ID: <20090427210235.3292C70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2181/devel

Modified Files:
	globus-callout.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/globus-callout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-callout.spec	22 Apr 2009 05:49:19 -0000	1.2
+++ globus-callout.spec	27 Apr 2009 21:02:04 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -199,6 +199,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Apr 2009 05:49:20 -0000	1.2
+++ import.log	27 Apr 2009 21:02:04 -0000	1.3
@@ -1,2 +1,3 @@
 globus-callout-0_7-1_fc9:HEAD:globus-callout-0.7-1.fc9.src.rpm:1240006486
 globus-callout-0_7-2_fc9:HEAD:globus-callout-0.7-2.fc9.src.rpm:1240379277
+globus-callout-0_7-3_fc9:HEAD:globus-callout-0.7-3.fc9.src.rpm:1240866046



From verdurin at fedoraproject.org  Mon Apr 27 21:21:33 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Mon, 27 Apr 2009 21:21:33 +0000 (UTC)
Subject: rpms/gnomint/devel gnomint-0.9.1-cflags.patch,1.1,NONE
Message-ID: <20090427212133.48F0B70110@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5479

Removed Files:
	gnomint-0.9.1-cflags.patch 
Log Message:
Removed file added from incorrect location



--- gnomint-0.9.1-cflags.patch DELETED ---



From verdurin at fedoraproject.org  Mon Apr 27 21:22:52 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Mon, 27 Apr 2009 21:22:52 +0000 (UTC)
Subject: rpms/gnomint/devel gnomint-0.9.1-cflags.patch,1.2,1.3
Message-ID: <20090427212252.4F10870110@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5630

Added Files:
	gnomint-0.9.1-cflags.patch 
Log Message:
Re-add patch


gnomint-0.9.1-cflags.patch:

Index: gnomint-0.9.1-cflags.patch
===================================================================
RCS file: gnomint-0.9.1-cflags.patch
diff -N gnomint-0.9.1-cflags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnomint-0.9.1-cflags.patch	27 Apr 2009 21:22:22 -0000	1.3
@@ -0,0 +1,14 @@
+diff -up gnomint-0.9.1/configure~ gnomint-0.9.1/configure
+--- gnomint-0.9.1/configure~	2008-12-18 08:35:02.000000000 +0200
++++ gnomint-0.9.1/configure	2009-04-20 00:05:17.000000000 +0300
+@@ -16926,12 +16926,6 @@ fi
+ 
+ 
+ 
+-if test "x$GCC" = "xyes"; then
+-	CFLAGS="-Wall -Werror"
+-	if test "x$use_debug" = "xYes"; then
+-   	   CFLAGS="$CFLAGS -g -O0"
+-	fi
+-fi
+



From ellert at fedoraproject.org  Mon Apr 27 21:26:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:26:52 +0000 (UTC)
Subject: rpms/globus-xio/devel globus-xio.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427212652.2EB3070110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6044/devel

Modified Files:
	globus-xio.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
- Rebuild with updated libtool



Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/globus-xio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-xio.spec	22 Apr 2009 09:27:50 -0000	1.1
+++ globus-xio.spec	27 Apr 2009 21:26:21 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -216,6 +216,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 09:27:50 -0000	1.1
+++ import.log	27 Apr 2009 21:26:21 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-2_7-2_fc9:HEAD:globus-xio-2.7-2.fc9.src.rpm:1240392400
+globus-xio-2_7-3_fc9:HEAD:globus-xio-2.7-3.fc9.src.rpm:1240867509



From ellert at fedoraproject.org  Mon Apr 27 21:28:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:28:24 +0000 (UTC)
Subject: rpms/globus-xio/F-9 globus-xio.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427212824.E42C770110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6452/F-9

Modified Files:
	globus-xio.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
- Rebuild with updated libtool



Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-9/globus-xio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-xio.spec	22 Apr 2009 09:30:11 -0000	1.1
+++ globus-xio.spec	27 Apr 2009 21:27:54 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -216,6 +216,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 09:30:11 -0000	1.1
+++ import.log	27 Apr 2009 21:27:54 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-2_7-2_fc9:F-9:globus-xio-2.7-2.fc9.src.rpm:1240392561
+globus-xio-2_7-3_fc9:F-9:globus-xio-2.7-3.fc9.src.rpm:1240867637



From ellert at fedoraproject.org  Mon Apr 27 21:30:28 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:30:28 +0000 (UTC)
Subject: rpms/globus-xio/F-10 globus-xio.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427213028.63F357013C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6825/F-10

Modified Files:
	globus-xio.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
- Rebuild with updated libtool



Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/globus-xio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-xio.spec	22 Apr 2009 09:32:56 -0000	1.1
+++ globus-xio.spec	27 Apr 2009 21:29:58 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -216,6 +216,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 09:32:56 -0000	1.1
+++ import.log	27 Apr 2009 21:29:58 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-2_7-2_fc9:F-10:globus-xio-2.7-2.fc9.src.rpm:1240392699
+globus-xio-2_7-3_fc9:F-10:globus-xio-2.7-3.fc9.src.rpm:1240867733



From ellert at fedoraproject.org  Mon Apr 27 21:32:04 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:32:04 +0000 (UTC)
Subject: rpms/globus-xio/F-11 globus-xio.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427213204.DB3D570110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7907/F-11

Modified Files:
	globus-xio.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
- Rebuild with updated libtool



Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/globus-xio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-xio.spec	22 Apr 2009 09:35:35 -0000	1.1
+++ globus-xio.spec	27 Apr 2009 21:31:34 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -216,6 +216,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 09:35:35 -0000	1.1
+++ import.log	27 Apr 2009 21:31:34 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-2_7-2_fc9:F-11:globus-xio-2.7-2.fc9.src.rpm:1240392872
+globus-xio-2_7-3_fc9:F-11:globus-xio-2.7-3.fc9.src.rpm:1240867856



From ellert at fedoraproject.org  Mon Apr 27 21:33:29 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:33:29 +0000 (UTC)
Subject: rpms/globus-xio/EL-4 globus-xio.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427213329.8A31F70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8157/EL-4

Modified Files:
	globus-xio.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
- Rebuild with updated libtool



Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/globus-xio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-xio.spec	22 Apr 2009 09:39:06 -0000	1.1
+++ globus-xio.spec	27 Apr 2009 21:32:59 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -216,6 +216,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 09:39:06 -0000	1.1
+++ import.log	27 Apr 2009 21:32:59 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-2_7-2_fc9:EL-4:globus-xio-2.7-2.fc9.src.rpm:1240393052
+globus-xio-2_7-3_fc9:EL-4:globus-xio-2.7-3.fc9.src.rpm:1240867946



From caillon at fedoraproject.org  Mon Apr 27 21:33:27 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 21:33:27 +0000 (UTC)
Subject: rpms/firefox/F-11 .cvsignore, 1.95, 1.96 firefox.spec, 1.326,
	1.327 sources, 1.108, 1.109
Message-ID: <20090427213327.75F2A70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8187

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 3.5-0.20
- 3.5 beta 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-11/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	13 Mar 2009 23:35:56 -0000	1.95
+++ .cvsignore	27 Apr 2009 21:32:57 -0000	1.96
@@ -1 +1,2 @@
-firefox-3.1b3-source.tar.bz2
+firefox-3.5b4-source.tar.bz2
+firefox-langpacks-3.5-20090427.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- firefox.spec	28 Mar 2009 00:44:08 -0000	1.326
+++ firefox.spec	27 Apr 2009 21:32:57 -0000	1.327
@@ -5,11 +5,11 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define gecko_version 1.9.1-0.11
-%define internal_version 3.1b3
+%define gecko_version 1.9.1-0.20
+%define internal_version 3.5b4
 
 %define official_branding    1
-%define build_langpacks      0
+%define build_langpacks      1
 
 %if ! %{official_branding}
 %define cvsdate 20080327
@@ -18,19 +18,19 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.1
-Release:        0.11.beta3%{?dist}
+Version:        3.5
+Release:        0.20.beta4%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball firefox-%{internal_version}-source.tar.bz2
 %else
-%define tarball firefox-3.1b3-source.tar.bz2
+%define tarball firefox-3.1b4-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20080923.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090427.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -321,6 +321,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 3.5-0.20
+- 3.5 beta 4
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 3.1-0.11
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-11/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- sources	13 Mar 2009 23:35:56 -0000	1.108
+++ sources	27 Apr 2009 21:32:57 -0000	1.109
@@ -1 +1,2 @@
-61cd1a7fc587f6d2a33c564033198e2c  firefox-3.1b3-source.tar.bz2
+ff6bf463300cb56bcf750973b2af3d80  firefox-3.5b4-source.tar.bz2
+ea9b2b8e3ecbf5eb4245d26546211ba6  firefox-langpacks-3.5-20090427.tar.bz2



From ellert at fedoraproject.org  Mon Apr 27 21:34:50 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:34:50 +0000 (UTC)
Subject: rpms/globus-xio/EL-5 globus-xio.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427213450.92C9670110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8588/EL-5

Modified Files:
	globus-xio.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
- Rebuild with updated libtool



Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/globus-xio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-xio.spec	22 Apr 2009 09:41:53 -0000	1.1
+++ globus-xio.spec	27 Apr 2009 21:34:20 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -216,6 +216,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 09:41:53 -0000	1.1
+++ import.log	27 Apr 2009 21:34:20 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-2_7-2_fc9:EL-5:globus-xio-2.7-2.fc9.src.rpm:1240393234
+globus-xio-2_7-3_fc9:EL-5:globus-xio-2.7-3.fc9.src.rpm:1240868029



From spot at fedoraproject.org  Mon Apr 27 21:39:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 21:39:05 +0000 (UTC)
Subject: rpms/logjam/F-10 logjam.spec,1.52,1.53
Message-ID: <20090427213905.3023E70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9286/F-10

Modified Files:
	logjam.spec 
Log Message:
fix conditionalization


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- logjam.spec	27 Apr 2009 20:05:28 -0000	1.52
+++ logjam.spec	27 Apr 2009 21:38:34 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	32%{?dist}
+Release:	33%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -91,7 +91,7 @@
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
-%if 0%{fedora} >= 11
+%if 0%{fedora} >= 10
 libtoolize
 rm -rf aclocal.m4
 autoupdate
@@ -143,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
+- conditionalize libtool fun for F10+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
 - only move broken locale dir if it gets created
 



From spot at fedoraproject.org  Mon Apr 27 21:39:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 21:39:05 +0000 (UTC)
Subject: rpms/logjam/F-11 logjam.spec,1.54,1.55
Message-ID: <20090427213905.5430970110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9286/F-11

Modified Files:
	logjam.spec 
Log Message:
fix conditionalization


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-11/logjam.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- logjam.spec	27 Apr 2009 20:05:29 -0000	1.54
+++ logjam.spec	27 Apr 2009 21:38:35 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	32%{?dist}
+Release:	33%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -91,7 +91,7 @@
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
-%if 0%{fedora} >= 11
+%if 0%{fedora} >= 10
 libtoolize
 rm -rf aclocal.m4
 autoupdate
@@ -143,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
+- conditionalize libtool fun for F10+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
 - only move broken locale dir if it gets created
 



From spot at fedoraproject.org  Mon Apr 27 21:39:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 21:39:05 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam.spec,1.52,1.53
Message-ID: <20090427213905.A657C70110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9286/F-9

Modified Files:
	logjam.spec 
Log Message:
fix conditionalization


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- logjam.spec	27 Apr 2009 20:05:29 -0000	1.52
+++ logjam.spec	27 Apr 2009 21:38:35 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	32%{?dist}
+Release:	33%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -91,7 +91,7 @@
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
-%if 0%{fedora} >= 11
+%if 0%{fedora} >= 10
 libtoolize
 rm -rf aclocal.m4
 autoupdate
@@ -143,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
+- conditionalize libtool fun for F10+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
 - only move broken locale dir if it gets created
 



From spot at fedoraproject.org  Mon Apr 27 21:39:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 27 Apr 2009 21:39:05 +0000 (UTC)
Subject: rpms/logjam/devel logjam.spec,1.54,1.55
Message-ID: <20090427213905.EDE0570110@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9286/devel

Modified Files:
	logjam.spec 
Log Message:
fix conditionalization


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- logjam.spec	27 Apr 2009 20:05:29 -0000	1.54
+++ logjam.spec	27 Apr 2009 21:38:35 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	32%{?dist}
+Release:	33%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -91,7 +91,7 @@
 %patch25 -p1 -b .mpris
 %patch26 -p1 -b .save-tags
 
-%if 0%{fedora} >= 11
+%if 0%{fedora} >= 10
 libtoolize
 rm -rf aclocal.m4
 autoupdate
@@ -143,6 +143,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
+- conditionalize libtool fun for F10+
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
 - only move broken locale dir if it gets created
 



From simo at fedoraproject.org  Mon Apr 27 21:40:03 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 27 Apr 2009 21:40:03 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 sssd.spec,
	1.12, 1.13
Message-ID: <20090427214003.DE7DB70110@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9721

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
* Mon Apr 27 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-0
- Version 0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Apr 2009 19:27:26 -0000	1.8
+++ .cvsignore	27 Apr 2009 21:39:33 -0000	1.9
@@ -1 +1 @@
-sssd-0.3.2.tar.gz
+sssd-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Apr 2009 19:27:26 -0000	1.8
+++ sources	27 Apr 2009 21:39:33 -0000	1.9
@@ -1 +1 @@
-abbd20c64724894fcfc52b1f82eaa904  sssd-0.3.2.tar.gz
+39c3d5096081523dd41d1e68803620ff  sssd-0.3.3.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sssd.spec	20 Apr 2009 19:27:26 -0000	1.12
+++ sssd.spec	27 Apr 2009 21:39:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name: sssd
-Version: 0.3.2
-Release: 2%{?dist}
+Version: 0.3.3
+Release: 0%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -139,6 +139,9 @@
 fi
 
 %changelog
+* Mon Apr 27 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-0
+- Version 0.3.3
+
 * Mon Apr 20 2009 Simo Sorce <ssorce at redhat.com> - 0.3.2-2
 - release out of the official 0.3.2 tarball
 



From ellert at fedoraproject.org  Mon Apr 27 21:41:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:41:24 +0000 (UTC)
Subject: rpms/globus-rsl/devel globus-rsl.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427214124.2945770110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9600/devel

Modified Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
- Rebuild with updated libtool



Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/devel/globus-rsl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-rsl.spec	22 Apr 2009 11:10:59 -0000	1.1
+++ globus-rsl.spec	27 Apr 2009 21:40:53 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
 Version:	5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
@@ -125,6 +125,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 11:11:00 -0000	1.1
+++ import.log	27 Apr 2009 21:40:53 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-5_0-2_fc9:HEAD:globus-rsl-5.0-2.fc9.src.rpm:1240398529
+globus-rsl-5_0-3_fc9:HEAD:globus-rsl-5.0-3.fc9.src.rpm:1240868331



From ellert at fedoraproject.org  Mon Apr 27 21:42:45 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:42:45 +0000 (UTC)
Subject: rpms/globus-rsl/F-9 globus-rsl.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427214245.0FD9670110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10426/F-9

Modified Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
- Rebuild with updated libtool



Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-9/globus-rsl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-rsl.spec	22 Apr 2009 11:13:35 -0000	1.1
+++ globus-rsl.spec	27 Apr 2009 21:42:14 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
 Version:	5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
@@ -125,6 +125,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2009 11:13:35 -0000	1.1
+++ import.log	27 Apr 2009 21:42:14 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-5_0-2_fc9:F-9:globus-rsl-5.0-2.fc9.src.rpm:1240398731
+globus-rsl-5_0-3_fc9:F-9:globus-rsl-5.0-3.fc9.src.rpm:1240868505



From ellert at fedoraproject.org  Mon Apr 27 21:44:04 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:44:04 +0000 (UTC)
Subject: rpms/globus-rsl/F-10 globus-rsl.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427214404.2281870110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10710/F-10

Modified Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
- Rebuild with updated libtool



Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-10/globus-rsl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rsl.spec	22 Apr 2009 11:16:15 -0000	1.1
+++ globus-rsl.spec	27 Apr 2009 21:43:33 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
 Version:	5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Apr 2009 11:16:16 -0000	1.1
+++ import.log	27 Apr 2009 21:43:33 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-5_0-2_fc9:F-10:globus-rsl-5.0-2.fc9.src.rpm:1240398884
+globus-rsl-5_0-3_fc9:F-10:globus-rsl-5.0-3.fc9.src.rpm:1240868586



From ellert at fedoraproject.org  Mon Apr 27 21:46:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:46:00 +0000 (UTC)
Subject: rpms/globus-rsl/F-11 globus-rsl.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427214600.C568A70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11070/F-11

Modified Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
- Rebuild with updated libtool



Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-11/globus-rsl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rsl.spec	22 Apr 2009 11:18:56 -0000	1.1
+++ globus-rsl.spec	27 Apr 2009 21:45:09 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
 Version:	5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Apr 2009 11:18:56 -0000	1.1
+++ import.log	27 Apr 2009 21:45:09 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-5_0-2_fc9:F-11:globus-rsl-5.0-2.fc9.src.rpm:1240399037
+globus-rsl-5_0-3_fc9:F-11:globus-rsl-5.0-3.fc9.src.rpm:1240868665



From ellert at fedoraproject.org  Mon Apr 27 21:48:03 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:48:03 +0000 (UTC)
Subject: rpms/globus-rsl/EL-4 globus-rsl.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427214803.7C89470110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11686/EL-4

Modified Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
- Rebuild with updated libtool



Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/globus-rsl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rsl.spec	22 Apr 2009 11:21:54 -0000	1.1
+++ globus-rsl.spec	27 Apr 2009 21:47:33 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
 Version:	5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Apr 2009 11:21:54 -0000	1.1
+++ import.log	27 Apr 2009 21:47:33 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-5_0-2_fc9:EL-4:globus-rsl-5.0-2.fc9.src.rpm:1240399238
+globus-rsl-5_0-3_fc9:EL-4:globus-rsl-5.0-3.fc9.src.rpm:1240868816



From ellert at fedoraproject.org  Mon Apr 27 21:49:21 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:49:21 +0000 (UTC)
Subject: rpms/globus-rsl/EL-5 globus-rsl.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427214921.C730F70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12000/EL-5

Modified Files:
	globus-rsl.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
- Rebuild with updated libtool



Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-5/globus-rsl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rsl.spec	22 Apr 2009 11:27:34 -0000	1.1
+++ globus-rsl.spec	27 Apr 2009 21:48:51 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl
 %global _name %(tr - _ <<< %{name})
 Version:	5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Resource Specification Language Library
 
 Group:		System Environment/Libraries
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-3
+- Rebuild with updated libtool
+
 * Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-2
 - Put GLOBUS_LICENSE file in extracted source tarball
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Apr 2009 11:27:34 -0000	1.1
+++ import.log	27 Apr 2009 21:48:51 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-5_0-2_fc9:EL-5:globus-rsl-5.0-2.fc9.src.rpm:1240399582
+globus-rsl-5_0-3_fc9:EL-5:globus-rsl-5.0-3.fc9.src.rpm:1240868902



From ellert at fedoraproject.org  Mon Apr 27 21:57:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:57:59 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/devel globus-gsi-openssl-error.spec,
	1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090427215759.C766A70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12993/devel

Modified Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
- Rebuild with updated libtool



Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/devel/globus-gsi-openssl-error.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-openssl-error.spec	24 Apr 2009 12:15:02 -0000	1.1
+++ globus-gsi-openssl-error.spec	27 Apr 2009 21:57:29 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:15:02 -0000	1.1
+++ import.log	27 Apr 2009 21:57:29 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-openssl-error-0_14-1_fc9:HEAD:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575267
+globus-gsi-openssl-error-0_14-2_fc9:HEAD:globus-gsi-openssl-error-0.14-2.fc9.src.rpm:1240869378



From cebbert at fedoraproject.org  Mon Apr 27 21:59:04 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 27 Apr 2009 21:59:04 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch,
	NONE, 1.1 kernel.spec, 1.1574, 1.1575
Message-ID: <20090427215904.9132F70110@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13293

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch 
Log Message:
Fix possible FPU context corruption on x86-64.

linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch:

--- NEW FILE linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch ---
From: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Thu, 9 Apr 2009 22:24:34 +0000 (-0700)
Subject: x86-64: fix FPU corruption with signals and preemption
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=06c38d5e36b12d040839ff224e805146c0368556

x86-64: fix FPU corruption with signals and preemption

In 64bit signal delivery path, clear_used_math() was happening before saving
the current active FPU state on to the user stack for signal handling. Between
clear_used_math() and the state store on to the user stack, potentially we
can get a page fault for the user address and can block. Infact, while testing
we were hitting the might_fault() in __clear_user() which can do a schedule().

At a later point in time, we will schedule back into this process and
resume the save state (using "xsave/fxsave" instruction) which can lead
to DNA fault. And as used_math was cleared before, we will reinit the FP state
in the DNA fault and continue. This reinit will result in loosing the
FPU state of the process.

Move clear_used_math() to a point after the FPU state has been stored
onto the user stack.

This issue is present from a long time (even before the xsave changes
and the x86 merge). But it can easily be exposed in 2.6.28.x and 2.6.29.x
series because of the __clear_user() in this path, which has an explicit
__cond_resched() leading to a context switch with CONFIG_PREEMPT_VOLUNTARY.

[ Impact: fix FPU state corruption ]

Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Cc: <stable at kernel.org>			[2.6.28.x, 2.6.29.x]
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---

diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index 0a5b04a..c5ee17e 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -89,7 +89,7 @@ int save_i387_xstate(void __user *buf)
 
 	if (!used_math())
 		return 0;
-	clear_used_math(); /* trigger finit */
+
 	if (task_thread_info(tsk)->status & TS_USEDFPU) {
 		/*
 	 	 * Start with clearing the user buffer. This will present a
@@ -114,6 +114,8 @@ int save_i387_xstate(void __user *buf)
 			return -1;
 	}
 
+	clear_used_math(); /* trigger finit */
+
 	if (task_thread_info(tsk)->status & TS_XSAVE) {
 		struct _fpstate __user *fx = buf;
 		struct _xstate __user *x = buf;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1574
retrieving revision 1.1575
diff -u -p -r1.1574 -r1.1575
--- kernel.spec	27 Apr 2009 19:30:33 -0000	1.1574
+++ kernel.spec	27 Apr 2009 21:58:34 -0000	1.1575
@@ -758,6 +758,9 @@ Patch9304: linux-2.6-xen-check-for-nx-su
 
 Patch9400: pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
 
+# FPU state can become corrupt
+Patch9510: linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1403,6 +1406,8 @@ ApplyPatch linux-2.6-xen-check-for-nx-su
 
 ApplyPatch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
 
+ApplyPatch linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1988,6 +1993,9 @@ fi
 # and build.
 
 %changelog
+* Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-113
+- Fix possible FPU context corruption on x86-64.
+
 * Mon Apr 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-112
 - 7a6f9cbb: x86: hpet: fix periodic mode programming on AMD 81xx
 



From ellert at fedoraproject.org  Mon Apr 27 21:59:18 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 21:59:18 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/F-9 globus-gsi-openssl-error.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427215918.71CEF70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13361/F-9

Modified Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
- Rebuild with updated libtool



Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-9/globus-gsi-openssl-error.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-openssl-error.spec	24 Apr 2009 12:16:56 -0000	1.1
+++ globus-gsi-openssl-error.spec	27 Apr 2009 21:58:48 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:16:56 -0000	1.1
+++ import.log	27 Apr 2009 21:58:48 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-openssl-error-0_14-1_fc9:F-9:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575376
+globus-gsi-openssl-error-0_14-2_fc9:F-9:globus-gsi-openssl-error-0.14-2.fc9.src.rpm:1240869500



From ellert at fedoraproject.org  Mon Apr 27 22:00:38 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:00:38 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/F-10 globus-gsi-openssl-error.spec,
	1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090427220038.091ED70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13614/F-10

Modified Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
- Rebuild with updated libtool



Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-10/globus-gsi-openssl-error.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-openssl-error.spec	24 Apr 2009 12:18:36 -0000	1.1
+++ globus-gsi-openssl-error.spec	27 Apr 2009 22:00:07 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:18:36 -0000	1.1
+++ import.log	27 Apr 2009 22:00:07 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-openssl-error-0_14-1_fc9:F-10:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575488
+globus-gsi-openssl-error-0_14-2_fc9:F-10:globus-gsi-openssl-error-0.14-2.fc9.src.rpm:1240869579



From ellert at fedoraproject.org  Mon Apr 27 22:01:55 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:01:55 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/F-11 globus-gsi-openssl-error.spec,
	1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090427220155.EB7447013C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149/F-11

Modified Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
- Rebuild with updated libtool



Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-11/globus-gsi-openssl-error.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-openssl-error.spec	24 Apr 2009 12:20:15 -0000	1.1
+++ globus-gsi-openssl-error.spec	27 Apr 2009 22:01:25 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:20:15 -0000	1.1
+++ import.log	27 Apr 2009 22:01:25 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-openssl-error-0_14-1_fc9:F-11:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575587
+globus-gsi-openssl-error-0_14-2_fc9:F-11:globus-gsi-openssl-error-0.14-2.fc9.src.rpm:1240869657



From ellert at fedoraproject.org  Mon Apr 27 22:03:17 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:03:17 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/EL-4 globus-gsi-openssl-error.spec,
	1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090427220317.3202270110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15127/EL-4

Modified Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
- Rebuild with updated libtool



Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-4/globus-gsi-openssl-error.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-openssl-error.spec	24 Apr 2009 12:21:55 -0000	1.1
+++ globus-gsi-openssl-error.spec	27 Apr 2009 22:02:46 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:21:55 -0000	1.1
+++ import.log	27 Apr 2009 22:02:46 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-openssl-error-0_14-1_fc9:EL-4:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575686
+globus-gsi-openssl-error-0_14-2_fc9:EL-4:globus-gsi-openssl-error-0.14-2.fc9.src.rpm:1240869736



From ellert at fedoraproject.org  Mon Apr 27 22:04:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:04:33 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/EL-5 globus-gsi-openssl-error.spec,
	1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090427220433.8F56E70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15378/EL-5

Modified Files:
	globus-gsi-openssl-error.spec import.log 
Log Message:
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
- Rebuild with updated libtool



Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-5/globus-gsi-openssl-error.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-openssl-error.spec	24 Apr 2009 12:23:33 -0000	1.1
+++ globus-gsi-openssl-error.spec	27 Apr 2009 22:04:03 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:23:33 -0000	1.1
+++ import.log	27 Apr 2009 22:04:03 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-openssl-error-0_14-1_fc9:EL-5:globus-gsi-openssl-error-0.14-1.fc9.src.rpm:1240575783
+globus-gsi-openssl-error-0_14-2_fc9:EL-5:globus-gsi-openssl-error-0.14-2.fc9.src.rpm:1240869816



From xavierb at fedoraproject.org  Mon Apr 27 22:07:42 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon, 27 Apr 2009 22:07:42 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/EL-5 perl-Crypt-CipherSaber.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090427220742.8E36670110@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799/EL-5

Modified Files:
	sources 
Added Files:
	perl-Crypt-CipherSaber.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-Crypt-CipherSaber.spec ---
Name:           perl-Crypt-CipherSaber
Version:        1.00
Release:        1%{?dist}
Summary:        Perl module implementing CipherSaber encryption
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-CipherSaber/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-CipherSaber-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Simple) >= 0.60
BuildRequires:  perl(Test::Warn)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# FIXME : Next BR: enhance the tests, but fails.
#BuildRequires:  perl(Module::Signature)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Crypt::CipherSaber module implements CipherSaber encryption, described
at http://ciphersaber.gurus.com/. It is simple, fairly speedy, and
relatively secure algorithm based on RC4.

%prep
%setup -q -n Crypt-CipherSaber-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.00-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:38:06 -0000	1.1
+++ sources	27 Apr 2009 22:07:12 -0000	1.2
@@ -0,0 +1 @@
+a00b3e2591cc5f880a110cc53a0b2c7b  Crypt-CipherSaber-1.00.tar.gz



From xavierb at fedoraproject.org  Mon Apr 27 22:07:42 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon, 27 Apr 2009 22:07:42 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/F-10 perl-Crypt-CipherSaber.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090427220742.C59AD70110@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799/F-10

Modified Files:
	sources 
Added Files:
	perl-Crypt-CipherSaber.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-Crypt-CipherSaber.spec ---
Name:           perl-Crypt-CipherSaber
Version:        1.00
Release:        1%{?dist}
Summary:        Perl module implementing CipherSaber encryption
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-CipherSaber/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-CipherSaber-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Simple) >= 0.60
BuildRequires:  perl(Test::Warn)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# FIXME : Next BR: enhance the tests, but fails.
#BuildRequires:  perl(Module::Signature)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Crypt::CipherSaber module implements CipherSaber encryption, described
at http://ciphersaber.gurus.com/. It is simple, fairly speedy, and
relatively secure algorithm based on RC4.

%prep
%setup -q -n Crypt-CipherSaber-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.00-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:38:06 -0000	1.1
+++ sources	27 Apr 2009 22:07:12 -0000	1.2
@@ -0,0 +1 @@
+a00b3e2591cc5f880a110cc53a0b2c7b  Crypt-CipherSaber-1.00.tar.gz



From xavierb at fedoraproject.org  Mon Apr 27 22:07:43 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon, 27 Apr 2009 22:07:43 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/F-9 perl-Crypt-CipherSaber.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090427220743.6461770110@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799/F-9

Modified Files:
	sources 
Added Files:
	perl-Crypt-CipherSaber.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-Crypt-CipherSaber.spec ---
Name:           perl-Crypt-CipherSaber
Version:        1.00
Release:        1%{?dist}
Summary:        Perl module implementing CipherSaber encryption
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-CipherSaber/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-CipherSaber-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Simple) >= 0.60
BuildRequires:  perl(Test::Warn)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# FIXME : Next BR: enhance the tests, but fails.
#BuildRequires:  perl(Module::Signature)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Crypt::CipherSaber module implements CipherSaber encryption, described
at http://ciphersaber.gurus.com/. It is simple, fairly speedy, and
relatively secure algorithm based on RC4.

%prep
%setup -q -n Crypt-CipherSaber-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.00-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:38:06 -0000	1.1
+++ sources	27 Apr 2009 22:07:13 -0000	1.2
@@ -0,0 +1 @@
+a00b3e2591cc5f880a110cc53a0b2c7b  Crypt-CipherSaber-1.00.tar.gz



From xavierb at fedoraproject.org  Mon Apr 27 22:07:43 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon, 27 Apr 2009 22:07:43 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/F-11 perl-Crypt-CipherSaber.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090427220743.1EFEB70110@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799/F-11

Modified Files:
	sources 
Added Files:
	perl-Crypt-CipherSaber.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-Crypt-CipherSaber.spec ---
Name:           perl-Crypt-CipherSaber
Version:        1.00
Release:        1%{?dist}
Summary:        Perl module implementing CipherSaber encryption
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-CipherSaber/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-CipherSaber-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Simple) >= 0.60
BuildRequires:  perl(Test::Warn)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# FIXME : Next BR: enhance the tests, but fails.
#BuildRequires:  perl(Module::Signature)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Crypt::CipherSaber module implements CipherSaber encryption, described
at http://ciphersaber.gurus.com/. It is simple, fairly speedy, and
relatively secure algorithm based on RC4.

%prep
%setup -q -n Crypt-CipherSaber-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.00-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:38:06 -0000	1.1
+++ sources	27 Apr 2009 22:07:12 -0000	1.2
@@ -0,0 +1 @@
+a00b3e2591cc5f880a110cc53a0b2c7b  Crypt-CipherSaber-1.00.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 22:10:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:10:24 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/devel globus-gsi-proxy-ssl.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427221024.E34BD70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16236/devel

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
- Rebuild with updated libtool



Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-proxy-ssl.spec	24 Apr 2009 12:57:40 -0000	1.1
+++ globus-gsi-proxy-ssl.spec	27 Apr 2009 22:09:54 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:57:40 -0000	1.1
+++ import.log	27 Apr 2009 22:09:54 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:HEAD:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240577820
+globus-gsi-proxy-ssl-1_5-2_fc9:HEAD:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870152



From ellert at fedoraproject.org  Mon Apr 27 22:11:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:11:52 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/F-9 globus-gsi-proxy-ssl.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427221152.0749D70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16507/F-9

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
- Rebuild with updated libtool



Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-9/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-proxy-ssl.spec	24 Apr 2009 12:59:44 -0000	1.1
+++ globus-gsi-proxy-ssl.spec	27 Apr 2009 22:11:21 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 12:59:44 -0000	1.1
+++ import.log	27 Apr 2009 22:11:21 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:F-9:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240577944
+globus-gsi-proxy-ssl-1_5-2_fc9:F-9:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870249



From ellert at fedoraproject.org  Mon Apr 27 22:13:12 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:13:12 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/F-10 globus-gsi-proxy-ssl.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427221312.9B2AD70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16914/F-10

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
- Rebuild with updated libtool



Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-10/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-proxy-ssl.spec	24 Apr 2009 13:01:33 -0000	1.1
+++ globus-gsi-proxy-ssl.spec	27 Apr 2009 22:12:42 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:01:33 -0000	1.1
+++ import.log	27 Apr 2009 22:12:42 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:F-10:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578059
+globus-gsi-proxy-ssl-1_5-2_fc9:F-10:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870334



From ellert at fedoraproject.org  Mon Apr 27 22:14:34 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:14:34 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/F-11 globus-gsi-proxy-ssl.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427221434.B651370110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17198/F-11

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
- Rebuild with updated libtool



Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-proxy-ssl.spec	24 Apr 2009 13:03:19 -0000	1.1
+++ globus-gsi-proxy-ssl.spec	27 Apr 2009 22:14:04 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:03:19 -0000	1.1
+++ import.log	27 Apr 2009 22:14:04 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:F-11:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578169
+globus-gsi-proxy-ssl-1_5-2_fc9:F-11:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870417



From ellert at fedoraproject.org  Mon Apr 27 22:16:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:16:09 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/EL-4 globus-gsi-proxy-ssl.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427221609.2E35370110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17491/EL-4

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
- Rebuild with updated libtool



Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-proxy-ssl.spec	24 Apr 2009 13:07:52 -0000	1.1
+++ globus-gsi-proxy-ssl.spec	27 Apr 2009 22:15:38 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:07:52 -0000	1.1
+++ import.log	27 Apr 2009 22:15:38 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:EL-4:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578440
+globus-gsi-proxy-ssl-1_5-2_fc9:EL-4:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870505



From ellert at fedoraproject.org  Mon Apr 27 22:17:32 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:17:32 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/EL-5 globus-gsi-proxy-ssl.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090427221732.EAE6F70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17765/EL-5

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
- Rebuild with updated libtool



Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-5/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-proxy-ssl.spec	24 Apr 2009 13:09:38 -0000	1.1
+++ globus-gsi-proxy-ssl.spec	27 Apr 2009 22:17:02 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Rebuild with updated libtool
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:09:38 -0000	1.1
+++ import.log	27 Apr 2009 22:17:02 -0000	1.2
@@ -1 +1,2 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:EL-5:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578548
+globus-gsi-proxy-ssl-1_5-2_fc9:EL-5:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870593



From ellert at fedoraproject.org  Mon Apr 27 22:22:25 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:22:25 +0000 (UTC)
Subject: rpms/globus-usage/devel globus-usage.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090427222225.8796570110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18556/devel

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
- Rebuild with updated libtool



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/devel/globus-usage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-usage.spec	24 Apr 2009 13:49:28 -0000	1.1
+++ globus-usage.spec	27 Apr 2009 22:21:55 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:49:28 -0000	1.1
+++ import.log	27 Apr 2009 22:21:55 -0000	1.2
@@ -1 +1,2 @@
 globus-usage-1_0-1_fc9:HEAD:globus-usage-1.0-1.fc9.src.rpm:1240580913
+globus-usage-1_0-2_fc9:HEAD:globus-usage-1.0-2.fc9.src.rpm:1240870860



From ellert at fedoraproject.org  Mon Apr 27 22:24:01 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:24:01 +0000 (UTC)
Subject: rpms/globus-usage/F-9 globus-usage.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090427222401.2F68D70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/F-9

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
- Rebuild with updated libtool



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-9/globus-usage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-usage.spec	24 Apr 2009 13:51:26 -0000	1.1
+++ globus-usage.spec	27 Apr 2009 22:23:30 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:51:26 -0000	1.1
+++ import.log	27 Apr 2009 22:23:30 -0000	1.2
@@ -1 +1,2 @@
 globus-usage-1_0-1_fc9:F-9:globus-usage-1.0-1.fc9.src.rpm:1240581043
+globus-usage-1_0-2_fc9:F-9:globus-usage-1.0-2.fc9.src.rpm:1240870972



From ellert at fedoraproject.org  Mon Apr 27 22:25:25 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:25:25 +0000 (UTC)
Subject: rpms/globus-usage/F-10 globus-usage.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090427222525.C506D70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19205/F-10

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
- Rebuild with updated libtool



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-10/globus-usage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-usage.spec	24 Apr 2009 13:53:01 -0000	1.1
+++ globus-usage.spec	27 Apr 2009 22:24:55 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:53:01 -0000	1.1
+++ import.log	27 Apr 2009 22:24:55 -0000	1.2
@@ -1 +1,2 @@
 globus-usage-1_0-1_fc9:F-10:globus-usage-1.0-1.fc9.src.rpm:1240581154
+globus-usage-1_0-2_fc9:F-10:globus-usage-1.0-2.fc9.src.rpm:1240871061



From ellert at fedoraproject.org  Mon Apr 27 22:26:44 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:26:44 +0000 (UTC)
Subject: rpms/globus-usage/F-11 globus-usage.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090427222644.81C0F70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19546/F-11

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
- Rebuild with updated libtool



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-11/globus-usage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-usage.spec	24 Apr 2009 13:54:41 -0000	1.1
+++ globus-usage.spec	27 Apr 2009 22:26:14 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:54:41 -0000	1.1
+++ import.log	27 Apr 2009 22:26:14 -0000	1.2
@@ -1 +1,2 @@
 globus-usage-1_0-1_fc9:F-11:globus-usage-1.0-1.fc9.src.rpm:1240581252
+globus-usage-1_0-2_fc9:F-11:globus-usage-1.0-2.fc9.src.rpm:1240871145



From ellert at fedoraproject.org  Mon Apr 27 22:28:03 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:28:03 +0000 (UTC)
Subject: rpms/globus-usage/EL-4 globus-usage.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090427222803.D4DFB70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19880/EL-4

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
- Rebuild with updated libtool



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-4/globus-usage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-usage.spec	24 Apr 2009 13:56:51 -0000	1.1
+++ globus-usage.spec	27 Apr 2009 22:27:33 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:56:51 -0000	1.1
+++ import.log	27 Apr 2009 22:27:33 -0000	1.2
@@ -1 +1,2 @@
 globus-usage-1_0-1_fc9:EL-4:globus-usage-1.0-1.fc9.src.rpm:1240581380
+globus-usage-1_0-2_fc9:EL-4:globus-usage-1.0-2.fc9.src.rpm:1240871225



From ellert at fedoraproject.org  Mon Apr 27 22:29:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:29:24 +0000 (UTC)
Subject: rpms/globus-usage/EL-5 globus-usage.spec, 1.1, 1.2 import.log, 1.1,
	1.2
Message-ID: <20090427222924.24E6570110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-usage/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20135/EL-5

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
- Rebuild with updated libtool



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-5/globus-usage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-usage.spec	24 Apr 2009 13:58:25 -0000	1.1
+++ globus-usage.spec	27 Apr 2009 22:28:53 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Apr 2009 13:58:25 -0000	1.1
+++ import.log	27 Apr 2009 22:28:53 -0000	1.2
@@ -1 +1,2 @@
 globus-usage-1_0-1_fc9:EL-5:globus-usage-1.0-1.fc9.src.rpm:1240581477
+globus-usage-1_0-2_fc9:EL-5:globus-usage-1.0-2.fc9.src.rpm:1240871303



From caillon at fedoraproject.org  Mon Apr 27 22:36:09 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 22:36:09 +0000 (UTC)
Subject: rpms/blam/F-11 blam.spec,1.27,1.28
Message-ID: <20090427223609.E701870110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21854

Modified Files:
	blam.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-10
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-11/blam.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- blam.spec	24 Feb 2009 04:58:07 -0000	1.27
+++ blam.spec	27 Apr 2009 22:35:39 -0000	1.28
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.5
-Release:	6%{?dist}
+Release:	10%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-10
+- Rebuild against newer gecko
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jkratoch at fedoraproject.org  Mon Apr 27 22:40:12 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 27 Apr 2009 22:40:12 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.349,1.350
Message-ID: <20090427224012.1080070110@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22590

Modified Files:
	gdb.spec 
Log Message:
* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-26
- Support a new rpmbuild option: --without python



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -p -r1.349 -r1.350
--- gdb.spec	27 Apr 2009 17:55:34 -0000	1.349
+++ gdb.spec	27 Apr 2009 22:39:41 -0000	1.350
@@ -2,6 +2,7 @@
 # --with testsuite: Run the testsuite (biarch if possible).  Default is without.
 # --with debug: Build without optimizations and without splitting the debuginfo.
 # --with upstream: No Fedora specific patches get applied.
+# --without python: No python support.
 
 Summary: A GNU source-level debugger for C, C++, Java and other languages
 Name: gdb%{?_with_debug:-debug}
@@ -13,7 +14,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 25%{?_with_upstream:.upstream}%{?dist}
+Release: 26%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -388,9 +389,11 @@ BuildRequires: readline-devel
 # dlopen() no longer makes rpm-libs a mandatory dependency.
 #Requires: rpm-libs
 BuildRequires: rpm-devel
+%if 0%{!?_without_python:1}
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
+%endif	# 0%{!?_without_python:1}
 # Temporarily before it gets moved to libstdc++.rpm
 BuildRequires: libstdc++
 
@@ -647,7 +650,11 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 	--with-system-readline				\
 	--with-expat					\
 	--enable-tui					\
+%if 0%{!?_without_python:1}
 	--with-python					\
+%else
+	--without-python				\
+%endif
 	--with-rpm=librpm.so				\
 %ifarch ia64
 	--with-libunwind				\
@@ -774,6 +781,7 @@ ln -sf gdb $RPM_BUILD_ROOT%{_prefix}/bin
 cmp $RPM_BUILD_ROOT%{_mandir}/*/gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 
+%if 0%{!?_without_python:1}
 # In the future:
 #%# A part of the libstdc++ rpm.
 #%rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
@@ -785,6 +793,7 @@ for LIB in lib lib64;do
   sed -e 's, at dir@,%{python_sitelib}/gdb,' <$RPM_BUILD_DIR/%{gdb_src}/gdb/python/lib/gdb/libstdcxx/v6/hook.in \
       >$LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py
 done
+%endif	# 0%{!?_without_python:1}
 
 # Remove the files that are part of a gdb build but that are owned and
 # provided by other packages.
@@ -844,7 +853,9 @@ fi
 %{_bindir}/pstack
 %{_mandir}/*/gstack.1*
 %{_mandir}/*/pstack.1*
+%if 0%{!?_without_python:1}
 %{python_sitelib}/gdb
+%endif	# 0%{!?_without_python:1}
 %{_datadir}/gdb
 %endif	# 0%{!?_with_upstream:1}
 %{_infodir}/annotate.info*
@@ -861,6 +872,9 @@ fi
 %endif
 
 %changelog
+* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-26
+- Support a new rpmbuild option: --without python
+
 * Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-25
 - The Koji build failures may have been by forgotten check-in of the Patch360.
 



From jkratoch at fedoraproject.org  Mon Apr 27 22:41:10 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 27 Apr 2009 22:41:10 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.350,1.351
Message-ID: <20090427224110.EB92B70110@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22706

Modified Files:
	gdb.spec 
Log Message:
* Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-26
- Support a new rpmbuild option: --without python



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -p -r1.350 -r1.351
--- gdb.spec	27 Apr 2009 22:39:41 -0000	1.350
+++ gdb.spec	27 Apr 2009 22:40:40 -0000	1.351
@@ -393,9 +393,9 @@ BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
-%endif	# 0%{!?_without_python:1}
 # Temporarily before it gets moved to libstdc++.rpm
 BuildRequires: libstdc++
+%endif	# 0%{!?_without_python:1}
 
 %if 0%{?_with_testsuite:1}
 BuildRequires: sharutils dejagnu



From ellert at fedoraproject.org  Mon Apr 27 22:42:24 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:42:24 +0000 (UTC)
Subject: rpms/globus-rsl-assist/devel globus-rsl-assist.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427224224.31B0C70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22973/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl-assist.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl-assist.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl-assist
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - RSL Manipulation Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-rsl-devel >= 2
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - RSL Manipulation Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-rsl-devel >= 2
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
RSL Manipulation Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
RSL Manipulation Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-assist-2_1-1_fc9:HEAD:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872080


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:07:09 -0000	1.1
+++ .cvsignore	27 Apr 2009 22:41:53 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl_assist-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:07:09 -0000	1.1
+++ sources	27 Apr 2009 22:41:53 -0000	1.2
@@ -0,0 +1 @@
+8c541cd75b653a4afc4b8893eb3abea8  globus_rsl_assist-2.1.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 22:44:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:44:05 +0000 (UTC)
Subject: rpms/globus-rsl-assist/F-9 globus-rsl-assist.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427224405.C9D1070110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23361/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl-assist.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl-assist.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl-assist
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - RSL Manipulation Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-rsl-devel >= 2
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - RSL Manipulation Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-rsl-devel >= 2
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
RSL Manipulation Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
RSL Manipulation Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-assist-2_1-1_fc9:F-9:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872181


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:07:09 -0000	1.1
+++ .cvsignore	27 Apr 2009 22:43:35 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl_assist-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:07:09 -0000	1.1
+++ sources	27 Apr 2009 22:43:35 -0000	1.2
@@ -0,0 +1 @@
+8c541cd75b653a4afc4b8893eb3abea8  globus_rsl_assist-2.1.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 22:45:43 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:45:43 +0000 (UTC)
Subject: rpms/globus-rsl-assist/F-10 globus-rsl-assist.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427224543.8C54070110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23810/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl-assist.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl-assist.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl-assist
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - RSL Manipulation Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-rsl-devel >= 2
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - RSL Manipulation Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-rsl-devel >= 2
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
RSL Manipulation Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
RSL Manipulation Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-assist-2_1-1_fc9:F-10:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872285


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:07:09 -0000	1.1
+++ .cvsignore	27 Apr 2009 22:45:13 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl_assist-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:07:09 -0000	1.1
+++ sources	27 Apr 2009 22:45:13 -0000	1.2
@@ -0,0 +1 @@
+8c541cd75b653a4afc4b8893eb3abea8  globus_rsl_assist-2.1.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 22:47:20 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:47:20 +0000 (UTC)
Subject: rpms/globus-rsl-assist/F-11 globus-rsl-assist.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427224720.1D5D570110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24280/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl-assist.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl-assist.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl-assist
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - RSL Manipulation Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-rsl-devel >= 2
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - RSL Manipulation Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-rsl-devel >= 2
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
RSL Manipulation Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
RSL Manipulation Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-assist-2_1-1_fc9:F-11:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872380


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:07:09 -0000	1.1
+++ .cvsignore	27 Apr 2009 22:46:49 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl_assist-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:07:09 -0000	1.1
+++ sources	27 Apr 2009 22:46:49 -0000	1.2
@@ -0,0 +1 @@
+8c541cd75b653a4afc4b8893eb3abea8  globus_rsl_assist-2.1.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 22:49:02 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:49:02 +0000 (UTC)
Subject: rpms/globus-rsl-assist/EL-4 globus-rsl-assist.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427224902.6E50970110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24737/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl-assist.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl-assist.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl-assist
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - RSL Manipulation Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-rsl-devel >= 2
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - RSL Manipulation Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-rsl-devel >= 2
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
RSL Manipulation Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
RSL Manipulation Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-assist-2_1-1_fc9:EL-4:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872480


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:07:09 -0000	1.1
+++ .cvsignore	27 Apr 2009 22:48:31 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl_assist-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:07:09 -0000	1.1
+++ sources	27 Apr 2009 22:48:32 -0000	1.2
@@ -0,0 +1 @@
+8c541cd75b653a4afc4b8893eb3abea8  globus_rsl_assist-2.1.tar.gz



From ellert at fedoraproject.org  Mon Apr 27 22:50:35 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 22:50:35 +0000 (UTC)
Subject: rpms/globus-rsl-assist/EL-5 globus-rsl-assist.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427225035.40DDD70110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25123/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rsl-assist.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-rsl-assist.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-rsl-assist
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - RSL Manipulation Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-rsl-devel >= 2
BuildRequires:	globus-core >= 4

%package devel
Summary:	Globus Toolkit - RSL Manipulation Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-rsl-devel >= 2
Requires:	globus-core >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
RSL Manipulation Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
RSL Manipulation Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-rsl-assist-2_1-1_fc9:EL-5:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872576


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:07:09 -0000	1.1
+++ .cvsignore	27 Apr 2009 22:50:04 -0000	1.2
@@ -0,0 +1 @@
+globus_rsl_assist-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:07:09 -0000	1.1
+++ sources	27 Apr 2009 22:50:04 -0000	1.2
@@ -0,0 +1 @@
+8c541cd75b653a4afc4b8893eb3abea8  globus_rsl_assist-2.1.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:00:04 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:00:04 +0000 (UTC)
Subject: rpms/chmsee/F-11 chmsee.spec,1.28,1.29
Message-ID: <20090427230004.1DFE170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/chmsee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26432

Modified Files:
	chmsee.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-6
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- chmsee.spec	24 Feb 2009 07:29:13 -0000	1.28
+++ chmsee.spec	27 Apr 2009 22:59:33 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary(zh_CN):	CHM ??????????????????, ?????? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-6
+- Rebuild against newer gecko
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Mon Apr 27 23:00:50 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:00:50 +0000 (UTC)
Subject: rpms/epiphany/F-11 epiphany.spec,1.226,1.227
Message-ID: <20090427230050.6909170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26853

Modified Files:
	epiphany.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-2
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-11/epiphany.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- epiphany.spec	13 Apr 2009 04:53:24 -0000	1.226
+++ epiphany.spec	27 Apr 2009 23:00:19 -0000	1.227
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.26
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-2
+- Rebuild against newer gecko
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/epiphany/2.26/epiphany-2.26.1.changes



From caillon at fedoraproject.org  Mon Apr 27 23:01:36 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:01:36 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-11 epiphany-extensions.spec,1.58,1.59
Message-ID: <20090427230136.C78D170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27081

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-2
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-11/epiphany-extensions.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- epiphany-extensions.spec	13 Apr 2009 05:14:10 -0000	1.58
+++ epiphany-extensions.spec	27 Apr 2009 23:01:06 -0000	1.59
@@ -5,7 +5,7 @@
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-2
+- Rebuild against newer gecko
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
 - Update to 2.26.1
 



From ellert at fedoraproject.org  Mon Apr 27 23:01:48 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 23:01:48 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/devel
	globus-xio-popen-driver-wrong-dep.patch, NONE,
	1.1 globus-xio-popen-driver-wrong-desc.patch, NONE,
	1.1 globus-xio-popen-driver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427230148.D521270110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27106/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-popen-driver-wrong-dep.patch 
	globus-xio-popen-driver-wrong-desc.patch 
	globus-xio-popen-driver.spec import.log 
Log Message:
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description


globus-xio-popen-driver-wrong-dep.patch:

--- NEW FILE globus-xio-popen-driver-wrong-dep.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2008-10-21 11:46:51.000000000 +0200
@@ -18,7 +18,7 @@
 
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>
@@ -26,14 +26,6 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="doc_runtime">
-            <Dependency Name="globus_xio" Package="doc">
-                <Version>
-                    <Simple_Version Major="0"/>
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
-
         <With_Flavors build="yes"/>
 
         <Build_Environment>
@@ -46,5 +38,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~

globus-xio-popen-driver-wrong-desc.patch:

--- NEW FILE globus-xio-popen-driver-wrong-desc.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2009-04-24 12:55:34.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_xio_popen_driver" Format_Version="0.01">
 
     <Aging_Version Major="0" Minor="2" Age="0"/>
-    <Description> Globus XIO BW Limit Driver</Description>
+    <Description> Globus XIO Pipe Open Driver</Description>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 
     <src_pkg>


--- NEW FILE globus-xio-popen-driver.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source globus_xio_popen_driver-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.2
#		tar -zcf globus_xio_popen_driver-0.2.tar.gz globus_xio_popen_driver-0.2
Source:		%{_name}-%{version}.tar.gz
#		Wrong dependency information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0:		%{name}-wrong-dep.patch
#		Correct package description:
#		Already fixed in upstream CVS
Patch1:		%{name}-wrong-desc.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel

%package devel
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Pipe Open Driver - allows a user to execute a program and treat it
as a transport driver by routing data through pipes

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Pipe Open Driver Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-popen-driver-0_2-2_fc9:HEAD:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873209


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:06:16 -0000	1.1
+++ .cvsignore	27 Apr 2009 23:01:18 -0000	1.2
@@ -0,0 +1 @@
+globus_xio_popen_driver-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:06:16 -0000	1.1
+++ sources	27 Apr 2009 23:01:18 -0000	1.2
@@ -0,0 +1 @@
+44cbff33736c042a66e4d09721863ce8  globus_xio_popen_driver-0.2.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:02:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:02:20 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss.spec,1.25,1.26
Message-ID: <20090427230220.2944270110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27317

Modified Files:
	evolution-rss.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-9
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- evolution-rss.spec	12 Apr 2009 17:50:17 -0000	1.25
+++ evolution-rss.spec	27 Apr 2009 23:01:49 -0000	1.26
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -83,6 +83,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-9
+- Rebuild against newer gecko
+
 * Sun Apr 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-8
 - EVR bump
 



From caillon at fedoraproject.org  Mon Apr 27 23:03:05 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:03:05 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon.spec,1.61,1.62
Message-ID: <20090427230305.AB0A670110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27686

Modified Files:
	galeon.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-10
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- galeon.spec	20 Apr 2009 12:20:55 -0000	1.61
+++ galeon.spec	27 Apr 2009 23:02:35 -0000	1.62
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	8%{?dist}
+Release:	10%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -125,6 +125,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-10
+- Rebuild against newer gecko
+
 * Mon Apr 20 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-8
 - Moz 191 update and rebuild for favicon.ico behavior fix
 



From caillon at fedoraproject.org  Mon Apr 27 23:03:55 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:03:55 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-11 gnome-python2-extras.spec,1.49,1.50
Message-ID: <20090427230355.BA7B47013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28009

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-3
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-11/gnome-python2-extras.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gnome-python2-extras.spec	24 Feb 2009 23:19:01 -0000	1.49
+++ gnome-python2-extras.spec	27 Apr 2009 23:03:25 -0000	1.50
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-3
+- Rebuild against newer gecko
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Mon Apr 27 23:04:45 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:04:45 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-11 gnome-web-photo.spec,1.21,1.22
Message-ID: <20090427230445.998B87013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28404

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.7-2
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-11/gnome-web-photo.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-web-photo.spec	13 Apr 2009 05:08:46 -0000	1.21
+++ gnome-web-photo.spec	27 Apr 2009 23:04:15 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.7-2
+- Rebuild against newer gecko
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.7-1
 - Update to 0.7
 



From ellert at fedoraproject.org  Mon Apr 27 23:04:50 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 23:04:50 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/F-9
	globus-xio-popen-driver-wrong-dep.patch, NONE,
	1.1 globus-xio-popen-driver-wrong-desc.patch, NONE,
	1.1 globus-xio-popen-driver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427230450.D53507013C@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28425/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-popen-driver-wrong-dep.patch 
	globus-xio-popen-driver-wrong-desc.patch 
	globus-xio-popen-driver.spec import.log 
Log Message:
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description


globus-xio-popen-driver-wrong-dep.patch:

--- NEW FILE globus-xio-popen-driver-wrong-dep.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2008-10-21 11:46:51.000000000 +0200
@@ -18,7 +18,7 @@
 
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>
@@ -26,14 +26,6 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="doc_runtime">
-            <Dependency Name="globus_xio" Package="doc">
-                <Version>
-                    <Simple_Version Major="0"/>
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
-
         <With_Flavors build="yes"/>
 
         <Build_Environment>
@@ -46,5 +38,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~

globus-xio-popen-driver-wrong-desc.patch:

--- NEW FILE globus-xio-popen-driver-wrong-desc.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2009-04-24 12:55:34.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_xio_popen_driver" Format_Version="0.01">
 
     <Aging_Version Major="0" Minor="2" Age="0"/>
-    <Description> Globus XIO BW Limit Driver</Description>
+    <Description> Globus XIO Pipe Open Driver</Description>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 
     <src_pkg>


--- NEW FILE globus-xio-popen-driver.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source globus_xio_popen_driver-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.2
#		tar -zcf globus_xio_popen_driver-0.2.tar.gz globus_xio_popen_driver-0.2
Source:		%{_name}-%{version}.tar.gz
#		Wrong dependency information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0:		%{name}-wrong-dep.patch
#		Correct package description:
#		Already fixed in upstream CVS
Patch1:		%{name}-wrong-desc.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel

%package devel
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Pipe Open Driver - allows a user to execute a program and treat it
as a transport driver by routing data through pipes

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Pipe Open Driver Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-popen-driver-0_2-2_fc9:F-9:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873357


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:06:16 -0000	1.1
+++ .cvsignore	27 Apr 2009 23:04:20 -0000	1.2
@@ -0,0 +1 @@
+globus_xio_popen_driver-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:06:16 -0000	1.1
+++ sources	27 Apr 2009 23:04:20 -0000	1.2
@@ -0,0 +1 @@
+44cbff33736c042a66e4d09721863ce8  globus_xio_popen_driver-0.2.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:05:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:05:30 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets.spec,1.11,1.12
Message-ID: <20090427230530.26A8B70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29080

Modified Files:
	google-gadgets.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- google-gadgets.spec	15 Apr 2009 14:33:39 -0000	1.11
+++ google-gadgets.spec	27 Apr 2009 23:04:59 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-4
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Apr 27 23:06:15 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:06:15 +0000 (UTC)
Subject: rpms/hulahop/F-11 hulahop.spec,1.11,1.12
Message-ID: <20090427230615.0CD5670110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/hulahop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29562

Modified Files:
	hulahop.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-4
- Rebuild against newer gecko



Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/F-11/hulahop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hulahop.spec	30 Mar 2009 14:59:44 -0000	1.11
+++ hulahop.spec	27 Apr 2009 23:05:44 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-4
+- Rebuild against newer gecko
+
 * Mon Mar 30 2009 Simon Schampijer <simon at schampijer.de> - 0.4.9-3
 - Rebuild
 



From caillon at fedoraproject.org  Mon Apr 27 23:06:59 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:06:59 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-11 java-1.6.0-openjdk.spec,1.116,1.117
Message-ID: <20090427230659.872AE70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/java-1.6.0-openjdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29824

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-20.b14
- Rebuild against newer gecko



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/extras/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- java-1.6.0-openjdk.spec	6 Apr 2009 14:06:42 -0000	1.116
+++ java-1.6.0-openjdk.spec	27 Apr 2009 23:06:29 -0000	1.117
@@ -120,7 +120,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 19.%{openjdkver}%{?dist}
+Release: 20.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -927,6 +927,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-20.b14
+- Rebuild against newer gecko
+
 * Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b14
 - Updated java-1.6.0-openjdk-lcms.patch
 



From ellert at fedoraproject.org  Mon Apr 27 23:06:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 23:06:53 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/F-10
	globus-xio-popen-driver-wrong-dep.patch, NONE,
	1.1 globus-xio-popen-driver-wrong-desc.patch, NONE,
	1.1 globus-xio-popen-driver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427230653.E0A0670110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29682/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-popen-driver-wrong-dep.patch 
	globus-xio-popen-driver-wrong-desc.patch 
	globus-xio-popen-driver.spec import.log 
Log Message:
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description


globus-xio-popen-driver-wrong-dep.patch:

--- NEW FILE globus-xio-popen-driver-wrong-dep.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2008-10-21 11:46:51.000000000 +0200
@@ -18,7 +18,7 @@
 
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>
@@ -26,14 +26,6 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="doc_runtime">
-            <Dependency Name="globus_xio" Package="doc">
-                <Version>
-                    <Simple_Version Major="0"/>
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
-
         <With_Flavors build="yes"/>
 
         <Build_Environment>
@@ -46,5 +38,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~

globus-xio-popen-driver-wrong-desc.patch:

--- NEW FILE globus-xio-popen-driver-wrong-desc.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2009-04-24 12:55:34.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_xio_popen_driver" Format_Version="0.01">
 
     <Aging_Version Major="0" Minor="2" Age="0"/>
-    <Description> Globus XIO BW Limit Driver</Description>
+    <Description> Globus XIO Pipe Open Driver</Description>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 
     <src_pkg>


--- NEW FILE globus-xio-popen-driver.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source globus_xio_popen_driver-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.2
#		tar -zcf globus_xio_popen_driver-0.2.tar.gz globus_xio_popen_driver-0.2
Source:		%{_name}-%{version}.tar.gz
#		Wrong dependency information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0:		%{name}-wrong-dep.patch
#		Correct package description:
#		Already fixed in upstream CVS
Patch1:		%{name}-wrong-desc.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel

%package devel
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Pipe Open Driver - allows a user to execute a program and treat it
as a transport driver by routing data through pipes

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Pipe Open Driver Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-popen-driver-0_2-2_fc9:F-10:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873540


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:06:16 -0000	1.1
+++ .cvsignore	27 Apr 2009 23:06:23 -0000	1.2
@@ -0,0 +1 @@
+globus_xio_popen_driver-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:06:16 -0000	1.1
+++ sources	27 Apr 2009 23:06:23 -0000	1.2
@@ -0,0 +1 @@
+44cbff33736c042a66e4d09721863ce8  globus_xio_popen_driver-0.2.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:07:44 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:07:44 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase.spec,1.81,1.82
Message-ID: <20090427230744.0C02070110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30081

Modified Files:
	kazehakase.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- kazehakase.spec	21 Apr 2009 17:55:39 -0000	1.81
+++ kazehakase.spec	27 Apr 2009 23:07:13 -0000	1.82
@@ -45,7 +45,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -319,6 +319,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.1
+- Rebuild against newer gecko
+
 * Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-11.svn3771_trunk
 - rev 3771
 - Fix crash when downloading is cancalled



From caillon at fedoraproject.org  Mon Apr 27 23:08:29 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:08:29 +0000 (UTC)
Subject: rpms/liferea/F-11 liferea.spec,1.131,1.132
Message-ID: <20090427230829.7AA2970110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/liferea/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30436

Modified Files:
	liferea.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.26-2
- Rebuild against newer gecko



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/F-11/liferea.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- liferea.spec	8 Mar 2009 15:26:31 -0000	1.131
+++ liferea.spec	27 Apr 2009 23:07:59 -0000	1.132
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.4.26
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -130,6 +130,9 @@ fi
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.26-2
+- Rebuild against newer gecko
+
 * Sun Mar 08 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.26-1
 - New upstream release
 



From ellert at fedoraproject.org  Mon Apr 27 23:08:42 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 23:08:42 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/F-11
	globus-xio-popen-driver-wrong-dep.patch, NONE,
	1.1 globus-xio-popen-driver-wrong-desc.patch, NONE,
	1.1 globus-xio-popen-driver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427230842.BA5B970110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30498/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-popen-driver-wrong-dep.patch 
	globus-xio-popen-driver-wrong-desc.patch 
	globus-xio-popen-driver.spec import.log 
Log Message:
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description


globus-xio-popen-driver-wrong-dep.patch:

--- NEW FILE globus-xio-popen-driver-wrong-dep.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2008-10-21 11:46:51.000000000 +0200
@@ -18,7 +18,7 @@
 
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>
@@ -26,14 +26,6 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="doc_runtime">
-            <Dependency Name="globus_xio" Package="doc">
-                <Version>
-                    <Simple_Version Major="0"/>
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
-
         <With_Flavors build="yes"/>
 
         <Build_Environment>
@@ -46,5 +38,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~

globus-xio-popen-driver-wrong-desc.patch:

--- NEW FILE globus-xio-popen-driver-wrong-desc.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2009-04-24 12:55:34.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_xio_popen_driver" Format_Version="0.01">
 
     <Aging_Version Major="0" Minor="2" Age="0"/>
-    <Description> Globus XIO BW Limit Driver</Description>
+    <Description> Globus XIO Pipe Open Driver</Description>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 
     <src_pkg>


--- NEW FILE globus-xio-popen-driver.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source globus_xio_popen_driver-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.2
#		tar -zcf globus_xio_popen_driver-0.2.tar.gz globus_xio_popen_driver-0.2
Source:		%{_name}-%{version}.tar.gz
#		Wrong dependency information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0:		%{name}-wrong-dep.patch
#		Correct package description:
#		Already fixed in upstream CVS
Patch1:		%{name}-wrong-desc.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel

%package devel
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Pipe Open Driver - allows a user to execute a program and treat it
as a transport driver by routing data through pipes

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Pipe Open Driver Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-popen-driver-0_2-2_fc9:F-11:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873664


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:06:16 -0000	1.1
+++ .cvsignore	27 Apr 2009 23:08:12 -0000	1.2
@@ -0,0 +1 @@
+globus_xio_popen_driver-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:06:16 -0000	1.1
+++ sources	27 Apr 2009 23:08:12 -0000	1.2
@@ -0,0 +1 @@
+44cbff33736c042a66e4d09721863ce8  globus_xio_popen_driver-0.2.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:09:19 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:09:19 +0000 (UTC)
Subject: rpms/Miro/F-11 Miro.spec,1.52,1.53
Message-ID: <20090427230919.82F4170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30688

Modified Files:
	Miro.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-2
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- Miro.spec	16 Mar 2009 09:42:52 -0000	1.52
+++ Miro.spec	27 Apr 2009 23:08:49 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-2
+- Rebuild against newer gecko
+
 * Mon Mar 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.3-1
 - Update to upstream 2.0.3
 - Add patch to disable xine-hack, hopefully fixes #480527



From caillon at fedoraproject.org  Mon Apr 27 23:10:07 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:10:07 +0000 (UTC)
Subject: rpms/monodevelop/F-11 monodevelop-2.spec,1.15,1.16
Message-ID: <20090427231007.8BFAA70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/monodevelop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31081

Modified Files:
	monodevelop-2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0-2
- Rebuild against newer gecko



Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/F-11/monodevelop-2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- monodevelop-2.spec	26 Mar 2009 23:24:43 -0000	1.15
+++ monodevelop-2.spec	27 Apr 2009 23:09:37 -0000	1.16
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -158,6 +158,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0-2
+- Rebuild against newer gecko
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - Full 2.0 release
 



From ellert at fedoraproject.org  Mon Apr 27 23:10:28 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 23:10:28 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/EL-4
	globus-xio-popen-driver-wrong-dep.patch, NONE,
	1.1 globus-xio-popen-driver-wrong-desc.patch, NONE,
	1.1 globus-xio-popen-driver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427231028.49B7970110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31186/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-popen-driver-wrong-dep.patch 
	globus-xio-popen-driver-wrong-desc.patch 
	globus-xio-popen-driver.spec import.log 
Log Message:
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description


globus-xio-popen-driver-wrong-dep.patch:

--- NEW FILE globus-xio-popen-driver-wrong-dep.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2008-10-21 11:46:51.000000000 +0200
@@ -18,7 +18,7 @@
 
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>
@@ -26,14 +26,6 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="doc_runtime">
-            <Dependency Name="globus_xio" Package="doc">
-                <Version>
-                    <Simple_Version Major="0"/>
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
-
         <With_Flavors build="yes"/>
 
         <Build_Environment>
@@ -46,5 +38,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~

globus-xio-popen-driver-wrong-desc.patch:

--- NEW FILE globus-xio-popen-driver-wrong-desc.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2009-04-24 12:55:34.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_xio_popen_driver" Format_Version="0.01">
 
     <Aging_Version Major="0" Minor="2" Age="0"/>
-    <Description> Globus XIO BW Limit Driver</Description>
+    <Description> Globus XIO Pipe Open Driver</Description>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 
     <src_pkg>


--- NEW FILE globus-xio-popen-driver.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source globus_xio_popen_driver-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.2
#		tar -zcf globus_xio_popen_driver-0.2.tar.gz globus_xio_popen_driver-0.2
Source:		%{_name}-%{version}.tar.gz
#		Wrong dependency information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0:		%{name}-wrong-dep.patch
#		Correct package description:
#		Already fixed in upstream CVS
Patch1:		%{name}-wrong-desc.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel

%package devel
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Pipe Open Driver - allows a user to execute a program and treat it
as a transport driver by routing data through pipes

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Pipe Open Driver Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-popen-driver-0_2-2_fc9:EL-4:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873770


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:06:16 -0000	1.1
+++ .cvsignore	27 Apr 2009 23:09:57 -0000	1.2
@@ -0,0 +1 @@
+globus_xio_popen_driver-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:06:16 -0000	1.1
+++ sources	27 Apr 2009 23:09:58 -0000	1.2
@@ -0,0 +1 @@
+44cbff33736c042a66e4d09721863ce8  globus_xio_popen_driver-0.2.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:10:51 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:10:51 +0000 (UTC)
Subject: rpms/mozvoikko/F-11 mozvoikko.spec,1.8,1.9
Message-ID: <20090427231051.2F58170110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31342

Modified Files:
	mozvoikko.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.3.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-11/mozvoikko.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mozvoikko.spec	26 Feb 2009 02:53:26 -0000	1.8
+++ mozvoikko.spec	27 Apr 2009 23:10:20 -0000	1.9
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.7
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc1%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.3.rc1
+- Rebuild against newer gecko
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-0.2.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Mon Apr 27 23:11:36 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:11:36 +0000 (UTC)
Subject: rpms/mugshot/F-11 mugshot.spec,1.42,1.43
Message-ID: <20090427231136.8DBDC70110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31652

Modified Files:
	mugshot.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-11/mugshot.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mugshot.spec	26 Feb 2009 03:18:27 -0000	1.42
+++ mugshot.spec	27 Apr 2009 23:11:06 -0000	1.43
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        9%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
+- Rebuild against newer gecko
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ellert at fedoraproject.org  Mon Apr 27 23:12:13 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 27 Apr 2009 23:12:13 +0000 (UTC)
Subject: rpms/globus-xio-popen-driver/EL-5
	globus-xio-popen-driver-wrong-dep.patch, NONE,
	1.1 globus-xio-popen-driver-wrong-desc.patch, NONE,
	1.1 globus-xio-popen-driver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090427231213.545E770110@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31864/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-popen-driver-wrong-dep.patch 
	globus-xio-popen-driver-wrong-desc.patch 
	globus-xio-popen-driver.spec import.log 
Log Message:
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description


globus-xio-popen-driver-wrong-dep.patch:

--- NEW FILE globus-xio-popen-driver-wrong-dep.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2008-10-21 11:46:51.000000000 +0200
@@ -18,7 +18,7 @@
 
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>
@@ -26,14 +26,6 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="doc_runtime">
-            <Dependency Name="globus_xio" Package="doc">
-                <Version>
-                    <Simple_Version Major="0"/>
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
-
         <With_Flavors build="yes"/>
 
         <Build_Environment>
@@ -46,5 +38,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~

globus-xio-popen-driver-wrong-desc.patch:

--- NEW FILE globus-xio-popen-driver-wrong-desc.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_xio_popen_driver-0.2.orig/pkgdata/pkg_data_src.gpt.in	2006-12-07 23:58:11.000000000 +0100
+++ globus_xio_popen_driver-0.2/pkgdata/pkg_data_src.gpt.in	2009-04-24 12:55:34.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_xio_popen_driver" Format_Version="0.01">
 
     <Aging_Version Major="0" Minor="2" Age="0"/>
-    <Description> Globus XIO BW Limit Driver</Description>
+    <Description> Globus XIO Pipe Open Driver</Description>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 
     <src_pkg>


--- NEW FILE globus-xio-popen-driver.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	2%{?dist}
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source globus_xio_popen_driver-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.2
#		tar -zcf globus_xio_popen_driver-0.2.tar.gz globus_xio_popen_driver-0.2
Source:		%{_name}-%{version}.tar.gz
#		Wrong dependency information:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0:		%{name}-wrong-dep.patch
#		Correct package description:
#		Already fixed in upstream CVS
Patch1:		%{name}-wrong-desc.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel

%package devel
Summary:	Globus Toolkit - Globus XIO Pipe Open Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-devel

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus XIO Pipe Open Driver - allows a user to execute a program and treat it
as a transport driver by routing data through pipes

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus XIO Pipe Open Driver Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Correct package description

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.4
- Add s390x to the list of 64 bit platforms

* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.3
- Adapt to updated GPT package

* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-popen-driver-0_2-2_fc9:EL-5:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873874


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:06:16 -0000	1.1
+++ .cvsignore	27 Apr 2009 23:11:42 -0000	1.2
@@ -0,0 +1 @@
+globus_xio_popen_driver-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:06:16 -0000	1.1
+++ sources	27 Apr 2009 23:11:43 -0000	1.2
@@ -0,0 +1 @@
+44cbff33736c042a66e4d09721863ce8  globus_xio_popen_driver-0.2.tar.gz



From caillon at fedoraproject.org  Mon Apr 27 23:12:21 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:12:21 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2.spec,1.36,1.37
Message-ID: <20090427231221.7D2E470110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31987

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-7
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ruby-gnome2.spec	28 Mar 2009 14:43:47 -0000	1.36
+++ ruby-gnome2.spec	27 Apr 2009 23:11:51 -0000	1.37
@@ -11,7 +11,7 @@
 
 Name:           ruby-gnome2
 Version:        0.18.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -742,6 +742,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-7
+- Rebuild against newer gecko
+
 * Sat Mar 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.18.1-6
 - Bump release again
 



From caillon at fedoraproject.org  Mon Apr 27 23:13:05 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:13:05 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.2,1.3
Message-ID: <20090427231305.D69A670110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32225

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.1
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-11/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Gtk2-MozEmbed.spec	25 Apr 2009 06:35:52 -0000	1.2
+++ perl-Gtk2-MozEmbed.spec	27 Apr 2009 23:12:35 -0000	1.3
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}
+Release:       %{specfilever}%{?dist}.1
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.1
+- Rebuild against newer gecko
+
 * Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-6
 - fix release to fix NEVR issue (upgrade from F10)
 



From caillon at fedoraproject.org  Mon Apr 27 23:13:58 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:13:58 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 seahorse-plugins.spec,1.25,1.26
Message-ID: <20090427231358.3D27370110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32438

Modified Files:
	seahorse-plugins.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-3
- Rebuild against newer gecko



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/F-11/seahorse-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- seahorse-plugins.spec	22 Apr 2009 19:42:28 -0000	1.25
+++ seahorse-plugins.spec	27 Apr 2009 23:13:27 -0000	1.26
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -176,6 +176,9 @@ fi
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-3
+- Rebuild against newer gecko
+
 * Wed Apr 22 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
 - Make seahorse-agent clean up its tempdir
 



From caillon at fedoraproject.org  Mon Apr 27 23:14:46 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:14:46 +0000 (UTC)
Subject: rpms/yelp/F-11 yelp.spec,1.156,1.157
Message-ID: <20090427231446.5D06470110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32596

Modified Files:
	yelp.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-3
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-11/yelp.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- yelp.spec	6 Apr 2009 05:49:56 -0000	1.156
+++ yelp.spec	27 Apr 2009 23:14:16 -0000	1.157
@@ -19,7 +19,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.26/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -148,6 +148,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-3
+- Rebuild against newer gecko
+
 * Mon Apr  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Clean up Requires a bit
 



From caillon at fedoraproject.org  Mon Apr 27 23:49:45 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon, 27 Apr 2009 23:49:45 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-11 icedtea-nsIProcess.patch, NONE,
	1.1 java-1.6.0-openjdk.spec, 1.117, 1.118
Message-ID: <20090427234945.CB69870110@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/java-1.6.0-openjdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4641

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	icedtea-nsIProcess.patch 
Log Message:
Add patch needed to account for XULRunner API changes:
http://hg.mozilla.org/mozilla-central/rev/83603fbe4be1
https://bugzilla.mozilla.org/show_bug.cgi?id=442393



icedtea-nsIProcess.patch:

--- NEW FILE icedtea-nsIProcess.patch ---
This patch is needed to account for XULRunner API changes:
http://hg.mozilla.org/mozilla-central/rev/83603fbe4be1
https://bugzilla.mozilla.org/show_bug.cgi?id=442393

diff -up icedtea6-1.4.1/IcedTeaPlugin.cc.nsIProcess icedtea6-1.4.1/IcedTeaPlugin.cc
--- icedtea6-1.4.1/IcedTeaPlugin.cc.nsIProcess	2009-04-27 16:41:25.845010840 -0700
+++ icedtea6-1.4.1/IcedTeaPlugin.cc	2009-04-27 16:41:43.876260182 -0700
@@ -3765,7 +3765,7 @@ IcedTeaPluginFactory::StartAppletviewer 
     }
   PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name);
 
-  result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull);
+  result = applet_viewer_process->Run (PR_FALSE, args, numArgs);
   PLUGIN_CHECK_RETURN ("run process", result);
 
   out_to_appletviewer = g_io_channel_new_file (out_pipe_name,


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/extras/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- java-1.6.0-openjdk.spec	27 Apr 2009 23:06:29 -0000	1.117
+++ java-1.6.0-openjdk.spec	27 Apr 2009 23:49:15 -0000	1.118
@@ -160,6 +160,7 @@ Patch7:   java-1.6.0-openjdk-sparc-hotsp
 Patch8:   java-1.6.0-openjdk-lcms.patch
 Patch9:   java-1.6.0-openjdk-securitypatches.patch
 Patch10:  java-1.6.0-openjdk-pulsejava.patch
+Patch20:  icedtea-nsIProcess.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -372,6 +373,7 @@ The OpenJDK web browser plugin.
 %patch2
 %patch6 -p1
 %patch9
+%patch20 -p1 -b .nsIProcess
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .



From pkgdb at fedoraproject.org  Tue Apr 28 00:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:17:58 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchbugzilla
Message-ID: <20090428001758.DB61610F87D@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-vm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:17:59 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchcommits
Message-ID: <20090428001759.C988210F894@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-vm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:00 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested commit
Message-ID: <20090428001800.5A90F10F897@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-vm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:03 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchbugzilla
Message-ID: <20090428001803.E90C910F89A@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-vm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:04 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchcommits
Message-ID: <20090428001804.24ADD10F89D@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-vm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:06 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested commit
Message-ID: <20090428001806.3333C10F8A0@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-vm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:11 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchbugzilla
Message-ID: <20090428001811.83DA410F87D@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-vm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:16 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested commit
Message-ID: <20090428001816.BD82810F8A4@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-vm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:18 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchcommits
Message-ID: <20090428001818.9086E10F8A7@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-vm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:25 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchbugzilla
Message-ID: <20090428001825.C8D9510F886@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-vm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:26 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested watchcommits
Message-ID: <20090428001826.68FBB10F896@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-vm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From pkgdb at fedoraproject.org  Tue Apr 28 00:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:18:28 +0000
Subject: [pkgdb] squeak-vm: tuxbrewr has requested commit
Message-ID: <20090428001828.8C8AE10F8AB@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-vm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-vm



From jmrcpn at fedoraproject.org  Tue Apr 28 00:19:51 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:19:51 +0000 (UTC)
Subject: rpms/clement/F-9 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090428001951.913EB70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9202

Modified Files:
	.cvsignore sources 
Log Message:
Updated clement-2.1.320


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Nov 2006 15:52:55 -0000	1.5
+++ .cvsignore	28 Apr 2009 00:19:21 -0000	1.6
@@ -1 +1 @@
-clement-2.1-241.tar.gz
+clement-2.1.320.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Nov 2006 15:52:55 -0000	1.5
+++ sources	28 Apr 2009 00:19:21 -0000	1.6
@@ -1 +1 @@
-277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz
+1a8dff43fb11f10bf28f7efa1a7ffe43  clement-2.1.320.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 28 00:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:19:59 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002000.014C310F895@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:01 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested commit
Message-ID: <20090428002001.C1D8610F897@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:05 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchcommits
Message-ID: <20090428002005.2811A10F89A@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:08 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002009.038FF10F89C@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-image (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:10 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchcommits
Message-ID: <20090428002010.18FEC10F89E@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-image (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:11 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested commit
Message-ID: <20090428002011.A92F910F8A2@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-image (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:16 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002016.EE41110F886@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-image (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:17 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchcommits
Message-ID: <20090428002017.E638510F8A3@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-image (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:21 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested commit
Message-ID: <20090428002021.ECCC710F8A6@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-image (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:23 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002023.F39C210F8AA@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on squeak-image (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:25 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested watchcommits
Message-ID: <20090428002025.1CF2B10F899@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on squeak-image (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:20:26 +0000
Subject: [pkgdb] squeak-image: tuxbrewr has requested commit
Message-ID: <20090428002026.3582F10F8AC@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on squeak-image (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squeak-image



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:04 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002204.53A0510F894@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on etoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:07 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested commit
Message-ID: <20090428002207.8EE4910F87D@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on etoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:05 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchcommits
Message-ID: <20090428002205.BC9F110F89A@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on etoys (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:12 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002212.C3E4510F89B@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on etoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:13 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchcommits
Message-ID: <20090428002213.C718110F89E@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on etoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:15 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested commit
Message-ID: <20090428002215.6157D10F8A1@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on etoys (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:19 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002219.6DCAD10F886@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on etoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:20 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchcommits
Message-ID: <20090428002221.1AF8010F898@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on etoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:22 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested commit
Message-ID: <20090428002222.62DA310F8A5@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on etoys (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:27 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchbugzilla
Message-ID: <20090428002227.CDB2A10F8A7@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on etoys (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:29 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested watchcommits
Message-ID: <20090428002229.C82CB10F87D@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on etoys (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Apr 28 00:22:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:22:31 +0000
Subject: [pkgdb] etoys: tuxbrewr has requested commit
Message-ID: <20090428002231.A21B110F8AB@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on etoys (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From cebbert at fedoraproject.org  Tue Apr 28 00:23:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 28 Apr 2009 00:23:23 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch,
	NONE, 1.1 kernel.spec, 1.1352, 1.1353
Message-ID: <20090428002323.CDCF270129@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9874

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch 
Log Message:
Fix some broken bluetooth USB adapters

linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch:

--- NEW FILE linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch ---
From: Marcel Holtmann <marcel at holtmann.org>
Date: Wed, 4 Feb 2009 16:41:38 +0000 (+0100)
Subject: Bluetooth: Submit bulk URBs along with interrupt URBs
X-Git-Tag: v2.6.30-rc1~662^2~538^2~20
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=43c2e57f94c15744495fee564610aa24602b3824

Bluetooth: Submit bulk URBs along with interrupt URBs

Submitting the bulk URBs for ACL data transfers only on demand has no
real benefit compared to just submit them when a Bluetooth device gets
opened. So when submitting the interrupt URBs for HCI events, just
submit the bulk URBs, too.

This solves a problem with some Bluetooth USB dongles that has been
reported over the last few month. These devices require that the bulk
URBs are actually present. These devices are really broken, but there
is nothing we can do about it.

Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
---

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b5fbda6..e70c57e 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -35,7 +35,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#define VERSION "0.4"
+#define VERSION "0.5"
 
 static int ignore_dga;
 static int ignore_csr;
@@ -171,6 +171,7 @@ struct btusb_data {
 
 	__u8 cmdreq_type;
 
+	unsigned int sco_num;
 	int isoc_altsetting;
 	int suspend_count;
 };
@@ -496,11 +497,23 @@ static int btusb_open(struct hci_dev *hdev)
 		return 0;
 
 	err = btusb_submit_intr_urb(hdev, GFP_KERNEL);
+	if (err < 0)
+		goto failed;
+
+	err = btusb_submit_bulk_urb(hdev, GFP_KERNEL);
 	if (err < 0) {
-		clear_bit(BTUSB_INTR_RUNNING, &data->flags);
-		clear_bit(HCI_RUNNING, &hdev->flags);
+		usb_kill_anchored_urbs(&data->intr_anchor);
+		goto failed;
 	}
 
+	set_bit(BTUSB_BULK_RUNNING, &data->flags);
+	btusb_submit_bulk_urb(hdev, GFP_KERNEL);
+
+	return 0;
+
+failed:
+	clear_bit(BTUSB_INTR_RUNNING, &data->flags);
+	clear_bit(HCI_RUNNING, &hdev->flags);
 	return err;
 }
 
@@ -655,19 +668,10 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt)
 
 	BT_DBG("%s evt %d", hdev->name, evt);
 
-	if (hdev->conn_hash.acl_num > 0) {
-		if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) {
-			if (btusb_submit_bulk_urb(hdev, GFP_ATOMIC) < 0)
-				clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-			else
-				btusb_submit_bulk_urb(hdev, GFP_ATOMIC);
-		}
-	} else {
-		clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-		usb_unlink_anchored_urbs(&data->bulk_anchor);
+	if (hdev->conn_hash.sco_num != data->sco_num) {
+		data->sco_num = hdev->conn_hash.sco_num;
+		schedule_work(&data->work);
 	}
-
-	schedule_work(&data->work);
 }
 
 static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)
@@ -982,9 +986,11 @@ static int btusb_resume(struct usb_interface *intf)
 	}
 
 	if (test_bit(BTUSB_BULK_RUNNING, &data->flags)) {
-		if (btusb_submit_bulk_urb(hdev, GFP_NOIO) < 0)
+		err = btusb_submit_bulk_urb(hdev, GFP_NOIO);
+		if (err < 0) {
 			clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-		else
+			return err;
+		} else
 			btusb_submit_bulk_urb(hdev, GFP_NOIO);
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1352
retrieving revision 1.1353
diff -u -p -r1.1352 -r1.1353
--- kernel.spec	27 Apr 2009 19:35:59 -0000	1.1352
+++ kernel.spec	28 Apr 2009 00:22:53 -0000	1.1353
@@ -723,6 +723,9 @@ Patch9502: linux-2.6-x86-hpet-fix-period
 # FPU state can become corrupt
 Patch9510: linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
 
+# fix some broken bluetooth dongles
+Patch9600: linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch
+
 # Backport of upstream memory reduction for ftrace
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
 
@@ -1345,6 +1348,8 @@ ApplyPatch linux-2.6-x86-hpet-fix-period
 
 ApplyPatch linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
 
+ApplyPatch linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch
+
 # Reduce the memory usage of ftrace if you don't use it.
 ApplyPatch linux-2.6-ftrace-memory-reduction.patch
 
@@ -1924,6 +1929,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-53
+- Fix some broken bluetooth USB adapters
+
 * Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-52
 - Fix possible FPU context corruption on x86-64.
 



From jmrcpn at fedoraproject.org  Tue Apr 28 00:26:01 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:26:01 +0000 (UTC)
Subject: rpms/clement/F-11 .cvsignore, 1.5, 1.6 clement.spec, 1.25,
	1.26 sources, 1.5, 1.6
Message-ID: <20090428002601.94C6A70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10396/F-11

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Nov 2006 15:52:55 -0000	1.5
+++ .cvsignore	28 Apr 2009 00:25:31 -0000	1.6
@@ -1 +1 @@
-clement-2.1-241.tar.gz
+clement-2.1.320.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/clement.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- clement.spec	26 Apr 2009 19:52:05 -0000	1.25
+++ clement.spec	28 Apr 2009 00:25:31 -0000	1.26
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 1%{?locmark}
+Release: 2%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,6 +145,10 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+- adjustement
+    * new version to check CVS behavior for Fedora
+
 * Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
 - Improvement
    * Spec file update to require clamav-server under 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Nov 2006 15:52:55 -0000	1.5
+++ sources	28 Apr 2009 00:25:31 -0000	1.6
@@ -1 +1 @@
-277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz
+b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:26:01 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:26:01 +0000 (UTC)
Subject: rpms/clement/F-10 .cvsignore, 1.5, 1.6 clement.spec, 1.24,
	1.25 sources, 1.5, 1.6
Message-ID: <20090428002601.54F0470129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10396/F-10

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Nov 2006 15:52:55 -0000	1.5
+++ .cvsignore	28 Apr 2009 00:25:30 -0000	1.6
@@ -1 +1 @@
-clement-2.1-241.tar.gz
+clement-2.1.320.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/clement.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- clement.spec	26 Apr 2009 19:52:05 -0000	1.24
+++ clement.spec	28 Apr 2009 00:25:31 -0000	1.25
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 1%{?locmark}
+Release: 2%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,6 +145,10 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+- adjustement
+    * new version to check CVS behavior for Fedora
+
 * Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
 - Improvement
    * Spec file update to require clamav-server under 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Nov 2006 15:52:55 -0000	1.5
+++ sources	28 Apr 2009 00:25:31 -0000	1.6
@@ -1 +1 @@
-277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz
+b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:26:01 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:26:01 +0000 (UTC)
Subject: rpms/clement/F-9 clement.spec,1.23,1.24 sources,1.6,1.7
Message-ID: <20090428002601.BC49B70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10396/F-9

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/clement.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- clement.spec	26 Apr 2009 19:52:06 -0000	1.23
+++ clement.spec	28 Apr 2009 00:25:31 -0000	1.24
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 1%{?locmark}
+Release: 2%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,6 +145,10 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+- adjustement
+    * new version to check CVS behavior for Fedora
+
 * Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
 - Improvement
    * Spec file update to require clamav-server under 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Apr 2009 00:19:21 -0000	1.6
+++ sources	28 Apr 2009 00:25:31 -0000	1.7
@@ -1 +1 @@
-1a8dff43fb11f10bf28f7efa1a7ffe43  clement-2.1.320.tar.gz
+b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:26:02 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:26:02 +0000 (UTC)
Subject: rpms/clement/devel .cvsignore, 1.5, 1.6 clement.spec, 1.25,
	1.26 sources, 1.5, 1.6
Message-ID: <20090428002602.21FE670129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10396/devel

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Nov 2006 15:52:55 -0000	1.5
+++ .cvsignore	28 Apr 2009 00:25:31 -0000	1.6
@@ -1 +1 @@
-clement-2.1-241.tar.gz
+clement-2.1.320.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/clement.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- clement.spec	26 Apr 2009 19:52:06 -0000	1.25
+++ clement.spec	28 Apr 2009 00:25:31 -0000	1.26
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 1%{?locmark}
+Release: 2%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,6 +145,10 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+- adjustement
+    * new version to check CVS behavior for Fedora
+
 * Sun Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-1
 - Improvement
    * Spec file update to require clamav-server under 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Nov 2006 15:52:55 -0000	1.5
+++ sources	28 Apr 2009 00:25:31 -0000	1.6
@@ -1 +1 @@
-277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz
+b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz



From nbecker at fedoraproject.org  Tue Apr 28 00:34:40 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 00:34:40 +0000 (UTC)
Subject: rpms/igraph/F-10 .cvsignore, 1.5, 1.6 igraph.spec, 1.20,
	1.21 sources, 1.6, 1.7
Message-ID: <20090428003440.097B770129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12764

Modified Files:
	.cvsignore igraph.spec sources 
Log Message:
update to 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Dec 2008 12:02:37 -0000	1.5
+++ .cvsignore	28 Apr 2009 00:34:09 -0000	1.6
@@ -1 +1 @@
-igraph-0.5.1.tar.gz
+igraph-0.5.2.tar.gz


Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-10/igraph.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- igraph.spec	22 Dec 2008 12:06:02 -0000	1.20
+++ igraph.spec	28 Apr 2009 00:34:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		igraph
-Version:	0.5.1
-Release:	4%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -9,6 +9,8 @@ URL:		http://cneurocvs.rmki.kfki.hu/igra
 Source0:	http://igraph.googlecode.com/files/%{name}-%{version}.tar.gz
 #Patch1:		igraph-cstdlib.patch
 #Patch2:		igraph-test.patch
+# Needed for gcc-4.4
+#Patch3:		igraph-cstdio.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libxml2-devel
@@ -39,6 +41,7 @@ documentation needed to develop applicat
 %setup -q
 #%patch1 -p1
 #%patch2 -p1
+#%patch3 -p1
 
 %build
 %configure
@@ -92,6 +95,19 @@ fi
 make check
 
 %changelog
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
+- Update to 0.5.2
+- Try not applying patch #3
+
+* Thu Feb 26 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-6
+- Make that 0.5.1-6
+
+* Thu Feb 26 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-5
+- Patch3 for gcc-4.4 (cstdio)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 22 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-4
 - Bump tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Dec 2008 12:02:38 -0000	1.6
+++ sources	28 Apr 2009 00:34:09 -0000	1.7
@@ -1 +1 @@
-19f9c193fc7c8b88a0e8d98aef9f9bb5  igraph-0.5.1.tar.gz
+092fcd018d35da599e250990e9b64e6f  igraph-0.5.2.tar.gz



From glommer at fedoraproject.org  Tue Apr 28 00:37:41 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Tue, 28 Apr 2009 00:37:41 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.85,1.86
Message-ID: <20090428003741.A91A870132@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13353

Modified Files:
	qemu.spec 
Log Message:
qemu-kvm metapackage




Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- qemu.spec	24 Apr 2009 17:11:36 -0000	1.85
+++ qemu.spec	28 Apr 2009 00:37:11 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 14%{?dist}
+Release: 15%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -68,6 +68,22 @@ emulation speed by using dynamic transla
 
 As QEMU requires no host kernel patches to run, it is safe and easy to use.
 
+%package kvm
+Summary: QEMU metapackage for KVM support
+Group: Development/Tools
+%ifarch %{ix86} x86_64
+Requires: qemu-system-x86 = %{epoch}:%{version}-%{release}
+%endif
+%ifarch ppc ppc64
+Requires: qemu-system-ppc = %{epoch}:%{version}-%{release}
+%endif
+
+%description kvm
+This is a meta-package that provides a qemu-system-<arch> package for native
+architectures where kvm can be enabled. For example, in an x86 system, this
+will install qemu-system-x86
+
+
 %package  img
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
@@ -108,9 +124,6 @@ Requires: vgabios
 Requires: bochs-bios >= 2.3.8-0.5
 Provides: kvm = 85
 Obsoletes: kvm < 85
-%ifarch %{ix86} x86_64
-Provides: qemu-kvm = %{epoch}:%{version}-%{release}
-%endif
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -125,9 +138,6 @@ Summary: QEMU system emulator for ppc
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: openbios-ppc
-%ifarch ppc ppc64
-Provides: qemu-kvm = %{epoch}:%{version}-%{release}
-%endif
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
@@ -465,6 +475,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Apr 27 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-15
+- provide qemu-kvm as a metapackage
+
 * Fri Apr 24 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
 - Fix source numbering typos caused by make-release addition
 



From pkgdb at fedoraproject.org  Tue Apr 28 00:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:41:15 +0000
Subject: [pkgdb] ghc: ynemoy has requested commit
Message-ID: <20090428004116.1B44B10F886@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From pkgdb at fedoraproject.org  Tue Apr 28 00:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:41:31 +0000
Subject: [pkgdb] ghc: ynemoy has requested approveacls
Message-ID: <20090428004131.6604C10F899@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From pkgdb at fedoraproject.org  Tue Apr 28 00:41:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:41:16 +0000
Subject: [pkgdb] ghc: ynemoy has requested approveacls
Message-ID: <20090428004116.26F4D10F897@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From pkgdb at fedoraproject.org  Tue Apr 28 00:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:41:32 +0000
Subject: [pkgdb] ghc: ynemoy has requested commit
Message-ID: <20090428004132.65C6110F89D@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From pkgdb at fedoraproject.org  Tue Apr 28 00:41:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:41:37 +0000
Subject: [pkgdb] ghc: ynemoy has requested commit
Message-ID: <20090428004137.31CAB10F8A1@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From pkgdb at fedoraproject.org  Tue Apr 28 00:41:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 00:41:40 +0000
Subject: [pkgdb] ghc: ynemoy has requested approveacls
Message-ID: <20090428004140.7473C10F895@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From nbecker at fedoraproject.org  Tue Apr 28 00:42:31 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 00:42:31 +0000 (UTC)
Subject: rpms/igraph/F-9 .cvsignore, 1.5, 1.6 igraph.spec, 1.20, 1.21 sources,
	1.6, 1.7
Message-ID: <20090428004231.89ED970129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15102

Modified Files:
	.cvsignore igraph.spec sources 
Log Message:
update to 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Jan 2009 00:33:44 -0000	1.5
+++ .cvsignore	28 Apr 2009 00:42:00 -0000	1.6
@@ -1 +1 @@
-igraph-0.5.1.tar.gz
+igraph-0.5.2.tar.gz


Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-9/igraph.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- igraph.spec	23 Jan 2009 00:33:44 -0000	1.20
+++ igraph.spec	28 Apr 2009 00:42:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		igraph
-Version:	0.5.1
-Release:	4%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -9,6 +9,8 @@ URL:		http://cneurocvs.rmki.kfki.hu/igra
 Source0:	http://igraph.googlecode.com/files/%{name}-%{version}.tar.gz
 #Patch1:		igraph-cstdlib.patch
 #Patch2:		igraph-test.patch
+# Needed for gcc-4.4
+#Patch3:		igraph-cstdio.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libxml2-devel
@@ -39,6 +41,7 @@ documentation needed to develop applicat
 %setup -q
 #%patch1 -p1
 #%patch2 -p1
+#%patch3 -p1
 
 %build
 %configure
@@ -92,6 +95,19 @@ fi
 make check
 
 %changelog
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
+- Update to 0.5.2
+- Try not applying patch #3
+
+* Thu Feb 26 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-6
+- Make that 0.5.1-6
+
+* Thu Feb 26 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-5
+- Patch3 for gcc-4.4 (cstdio)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 22 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-4
 - Bump tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Nov 2008 16:57:45 -0000	1.6
+++ sources	28 Apr 2009 00:42:01 -0000	1.7
@@ -1 +1 @@
-19f9c193fc7c8b88a0e8d98aef9f9bb5  igraph-0.5.1.tar.gz
+092fcd018d35da599e250990e9b64e6f  igraph-0.5.2.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:56:35 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:56:35 +0000 (UTC)
Subject: rpms/clement/F-11 clement.spec,1.26,1.27 sources,1.6,1.7
Message-ID: <20090428005635.A960B70132@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18575/F-11

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/clement.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- clement.spec	28 Apr 2009 00:25:31 -0000	1.26
+++ clement.spec	28 Apr 2009 00:56:05 -0000	1.27
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 2%{?locmark}
+Release: 3%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Apr 2009 00:25:31 -0000	1.6
+++ sources	28 Apr 2009 00:56:05 -0000	1.7
@@ -1 +1 @@
-b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz
+6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:56:35 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:56:35 +0000 (UTC)
Subject: rpms/clement/F-10 clement.spec,1.25,1.26 sources,1.6,1.7
Message-ID: <20090428005635.A394270129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18575/F-10

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/clement.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- clement.spec	28 Apr 2009 00:25:31 -0000	1.25
+++ clement.spec	28 Apr 2009 00:56:04 -0000	1.26
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 2%{?locmark}
+Release: 3%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Apr 2009 00:25:31 -0000	1.6
+++ sources	28 Apr 2009 00:56:04 -0000	1.7
@@ -1 +1 @@
-b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz
+6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:56:35 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:56:35 +0000 (UTC)
Subject: rpms/clement/F-9 clement.spec,1.24,1.25 sources,1.7,1.8
Message-ID: <20090428005635.BC2467013F@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18575/F-9

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/clement.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- clement.spec	28 Apr 2009 00:25:31 -0000	1.24
+++ clement.spec	28 Apr 2009 00:56:05 -0000	1.25
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 2%{?locmark}
+Release: 3%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Apr 2009 00:25:31 -0000	1.7
+++ sources	28 Apr 2009 00:56:05 -0000	1.8
@@ -1 +1 @@
-b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz
+6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 00:56:36 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 00:56:36 +0000 (UTC)
Subject: rpms/clement/devel clement.spec,1.26,1.27 sources,1.6,1.7
Message-ID: <20090428005636.0ADDF70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18575/devel

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/clement.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- clement.spec	28 Apr 2009 00:25:31 -0000	1.26
+++ clement.spec	28 Apr 2009 00:56:05 -0000	1.27
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 2%{?locmark}
+Release: 3%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-2
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Apr 2009 00:25:31 -0000	1.6
+++ sources	28 Apr 2009 00:56:05 -0000	1.7
@@ -1 +1 @@
-b66647c1963817ac7b74cc63f8d44b1e  clement-2.1.320.tar.gz
+6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz



From mclasen at fedoraproject.org  Tue Apr 28 01:00:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 28 Apr 2009 01:00:19 +0000 (UTC)
Subject: rpms/notification-daemon/F-11 nodoka.patch, NONE,
	1.1 notification-daemon.spec, 1.27, 1.28
Message-ID: <20090428010019.A910D70129@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19407

Modified Files:
	notification-daemon.spec 
Added Files:
	nodoka.patch 
Log Message:
Make nodoka theme the default


nodoka.patch:

--- NEW FILE nodoka.patch ---
diff -up notification-daemon-0.4.0/data/notification-daemon.schemas.in.nodoka notification-daemon-0.4.0/data/notification-daemon.schemas.in
--- notification-daemon-0.4.0/data/notification-daemon.schemas.in.nodoka	2009-04-27 20:55:23.593078616 -0400
+++ notification-daemon-0.4.0/data/notification-daemon.schemas.in	2009-04-27 20:55:38.186830065 -0400
@@ -18,7 +18,7 @@
    <applyto>/apps/notification-daemon/theme</applyto>
    <owner>notification-daemon</owner>
    <type>string</type>
-   <default>standard</default>
+   <default>nodoka</default>
    <locale name="C">
     <short>Current theme</short>
     <long>The theme used when displaying notifications.</long>


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/F-11/notification-daemon.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- notification-daemon.spec	26 Feb 2009 05:59:20 -0000	1.27
+++ notification-daemon.spec	28 Apr 2009 00:59:49 -0000	1.28
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -36,14 +36,17 @@ Obsoletes: notify-daemon
 
 Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2
 
+Patch0: nodoka.patch
+
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop
-notification specification. Notifications can be used to inform the user 
-about an event or display some form of information without getting in the 
+notification specification. Notifications can be used to inform the user
+about an event or display some form of information without getting in the
 user's way.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1 -b .nodoka
 
 %build
 ./autogen.sh
@@ -104,6 +107,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-3
+- Select the nodoka theme by default
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jmrcpn at fedoraproject.org  Tue Apr 28 01:01:04 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 01:01:04 +0000 (UTC)
Subject: rpms/clement/F-10 clement.spec,1.26,1.27 sources,1.7,1.8
Message-ID: <20090428010104.0733A70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645/F-10

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/clement.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- clement.spec	28 Apr 2009 00:56:04 -0000	1.26
+++ clement.spec	28 Apr 2009 01:00:33 -0000	1.27
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 3%{?locmark}
+Release: 4%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-4
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Apr 2009 00:56:04 -0000	1.7
+++ sources	28 Apr 2009 01:00:33 -0000	1.8
@@ -1 +1 @@
-6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz
+a756210d2c2d999c37869c399fa4692e  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 01:01:04 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 01:01:04 +0000 (UTC)
Subject: rpms/clement/F-9 clement.spec,1.25,1.26 sources,1.8,1.9
Message-ID: <20090428010104.8B00B70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645/F-9

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/clement.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- clement.spec	28 Apr 2009 00:56:05 -0000	1.25
+++ clement.spec	28 Apr 2009 01:00:34 -0000	1.26
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 3%{?locmark}
+Release: 4%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-4
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Apr 2009 00:56:05 -0000	1.8
+++ sources	28 Apr 2009 01:00:34 -0000	1.9
@@ -1 +1 @@
-6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz
+a756210d2c2d999c37869c399fa4692e  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 01:01:04 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 01:01:04 +0000 (UTC)
Subject: rpms/clement/F-11 clement.spec,1.27,1.28 sources,1.7,1.8
Message-ID: <20090428010104.441DE70129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645/F-11

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/clement.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- clement.spec	28 Apr 2009 00:56:05 -0000	1.27
+++ clement.spec	28 Apr 2009 01:00:34 -0000	1.28
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 3%{?locmark}
+Release: 4%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-4
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Apr 2009 00:56:05 -0000	1.7
+++ sources	28 Apr 2009 01:00:34 -0000	1.8
@@ -1 +1 @@
-6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz
+a756210d2c2d999c37869c399fa4692e  clement-2.1.320.tar.gz



From jmrcpn at fedoraproject.org  Tue Apr 28 01:01:04 2009
From: jmrcpn at fedoraproject.org (Jean-Marc Pigeon)
Date: Tue, 28 Apr 2009 01:01:04 +0000 (UTC)
Subject: rpms/clement/devel clement.spec,1.27,1.28 sources,1.7,1.8
Message-ID: <20090428010104.CDC3970129@cvs1.fedora.phx.redhat.com>

Author: jmrcpn

Update of /cvs/pkgs/rpms/clement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645/devel

Modified Files:
	clement.spec sources 
Log Message:
Updated clement-2.1.320


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/clement.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- clement.spec	28 Apr 2009 00:56:05 -0000	1.27
+++ clement.spec	28 Apr 2009 01:00:34 -0000	1.28
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 3%{?locmark}
+Release: 4%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,7 +145,7 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
-* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-3
+* Mon Apr 26 2009 Jean-Marc Pigeon <jmp at safe.ca> 2.1.320-4
 - adjustement
     * new version to check CVS behavior for Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Apr 2009 00:56:05 -0000	1.7
+++ sources	28 Apr 2009 01:00:34 -0000	1.8
@@ -1 +1 @@
-6a75cf382030d16068947069636f27f9  clement-2.1.320.tar.gz
+a756210d2c2d999c37869c399fa4692e  clement-2.1.320.tar.gz



From nbecker at fedoraproject.org  Tue Apr 28 01:11:14 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 01:11:14 +0000 (UTC)
Subject: rpms/python-igraph/F-10 python-igraph.spec,1.7,1.8
Message-ID: <20090428011114.B581470129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/python-igraph/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22863

Modified Files:
	python-igraph.spec 
Log Message:
Try running check



Index: python-igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/F-10/python-igraph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-igraph.spec	25 Dec 2008 00:24:45 -0000	1.7
+++ python-igraph.spec	28 Apr 2009 01:10:44 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_archlib: %define python_archlib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-igraph
-Version:	0.5.1
-Release:	3%{?dist}
+Version:	0.5.2
+Release:	2%{?dist}
 Summary:	Python bindings for igraph
 
 Group:		Development/Languages
@@ -31,7 +31,7 @@ around.
 %setup -q
 #%patch0 -p1
 #%patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 %patch3 -p0
 #%patch4 -p0
 
@@ -54,7 +54,20 @@ rm -rf $RPM_BUILD_ROOT
 %{python_archlib}/python_igraph-%{version}-py*.egg-info
 %{_bindir}/igraph
 
+%check
+( %{__python} -c 'import test; test.test(); )
+
 %changelog
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-2
+- Try running check
+
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
+- Update to 0.5.2
+- Try building without patch2
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 21 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-3
 - Bump tag
 



From nbecker at fedoraproject.org  Tue Apr 28 01:14:49 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 01:14:49 +0000 (UTC)
Subject: rpms/python-igraph/F-10 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090428011449.027BC70129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/python-igraph/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23976

Modified Files:
	.cvsignore sources 
Log Message:
update to 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Dec 2008 00:24:45 -0000	1.4
+++ .cvsignore	28 Apr 2009 01:14:18 -0000	1.5
@@ -1 +1 @@
-python-igraph-0.5.1.tar.gz
+python-igraph-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Dec 2008 00:24:45 -0000	1.4
+++ sources	28 Apr 2009 01:14:18 -0000	1.5
@@ -1 +1 @@
-9cc4364d656db67add07dd474c8b0f11  python-igraph-0.5.1.tar.gz
+8e80ddff5a7a3b7c25e293d4daaee6c0  python-igraph-0.5.2.tar.gz



From mclasen at fedoraproject.org  Tue Apr 28 01:14:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 28 Apr 2009 01:14:42 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/F-11 fedora-gnome-theme.spec,1.10,1.11
Message-ID: <20090428011442.AFA0970129@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/fedora-gnome-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23873

Modified Files:
	fedora-gnome-theme.spec 
Log Message:
Make Fedora theme match GConf defaults



Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/F-11/fedora-gnome-theme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-gnome-theme.spec	24 Feb 2009 16:29:03 -0000	1.10
+++ fedora-gnome-theme.spec	28 Apr 2009 01:14:12 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
 Version: 8.0.0
-Release: 8%{?dist} 
+Release: 9%{?dist}
 BuildArch: noarch
 # No version given, no license attribution.
 License: GPL+
@@ -9,7 +9,7 @@ Group: User Interface/Desktops
 # There is no official upstream yet
 Source0: %{name}-%{version}.tar.bz2
 URL: http://www.redhat.com
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: nodoka-metacity-theme
 Requires: gtk-nodoka-engine
@@ -26,11 +26,13 @@ Obsoletes: redhat-artwork
 This package contains the Fedora GNOME meta theme.
 
 %prep
-%setup -q 
+%setup -q
 echo 'NotificationTheme=nodoka' >> theme/index.theme.in
+echo 'CursorTheme=Bluecurve' >> theme/index.theme.in
+echo 'CursorSize=24' >> theme/index.theme.in
 
 %build
-%configure 
+%configure
 make
 
 %install
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-9
+- Add cursor theme settings matching the gconf defaults
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nbecker at fedoraproject.org  Tue Apr 28 01:16:40 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 01:16:40 +0000 (UTC)
Subject: rpms/python-igraph/F-10 python-igraph.spec,1.8,1.9
Message-ID: <20090428011640.2E58570129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/python-igraph/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24601

Modified Files:
	python-igraph.spec 
Log Message:
fix typo


Index: python-igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/F-10/python-igraph.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-igraph.spec	28 Apr 2009 01:10:44 -0000	1.8
+++ python-igraph.spec	28 Apr 2009 01:16:09 -0000	1.9
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/igraph
 
 %check
-( %{__python} -c 'import test; test.test(); )
+%{__python} -c 'import test; test.test();'
 
 %changelog
 * Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-2



From nbecker at fedoraproject.org  Tue Apr 28 01:33:04 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 01:33:04 +0000 (UTC)
Subject: rpms/python-igraph/F-10 python-igraph.spec,1.9,1.10
Message-ID: <20090428013304.E69B670129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/python-igraph/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26974

Modified Files:
	python-igraph.spec 
Log Message:
fix check


Index: python-igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/F-10/python-igraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-igraph.spec	28 Apr 2009 01:16:09 -0000	1.9
+++ python-igraph.spec	28 Apr 2009 01:32:33 -0000	1.10
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/igraph
 
 %check
-%{__python} -c 'import test; test.test();'
+PYTHONPATH=$RPM_BUILD_ROOT%{python_archlib} %{__python} -c 'import igraph.test; igraph.test.test();'
 
 %changelog
 * Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-2



From nbecker at fedoraproject.org  Tue Apr 28 01:35:48 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 01:35:48 +0000 (UTC)
Subject: rpms/python-igraph/devel python-igraph.spec,1.12,1.13
Message-ID: <20090428013548.0A5CA70129@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/python-igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27518

Modified Files:
	python-igraph.spec 
Log Message:
fix check


Index: python-igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-igraph/devel/python-igraph.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-igraph.spec	27 Apr 2009 17:14:21 -0000	1.12
+++ python-igraph.spec	28 Apr 2009 01:35:17 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:		python-igraph
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Python bindings for igraph
 
 Group:		Development/Languages
@@ -54,7 +54,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_archlib}/python_igraph-%{version}-py*.egg-info
 %{_bindir}/igraph
 
+%check
+PYTHONPATH=$RPM_BUILD_ROOT%{python_archlib} %{__python} -c 'import igraph.test; igraph.test.test();'
+
 %changelog
+* Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-2
+- Try running check
+
 * Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
 - Update to 0.5.2
 - Try building without patch2



From limb at fedoraproject.org  Tue Apr 28 01:45:15 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 28 Apr 2009 01:45:15 +0000 (UTC)
Subject: rpms/ddd/devel .cvsignore, 1.3, 1.4 ddd.spec, 1.12, 1.13 sources,
	1.3, 1.4
Message-ID: <20090428014516.08B5870129@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30742

Modified Files:
	.cvsignore ddd.spec sources 
Log Message:
3.3.12 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Jan 2009 22:11:24 -0000	1.3
+++ .cvsignore	28 Apr 2009 01:44:45 -0000	1.4
@@ -1 +1 @@
-ddd-3.3.12-rc1.tar.gz
+ddd-3.3.12.tar.gz


Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ddd.spec	2 Mar 2009 15:54:34 -0000	1.12
+++ ddd.spec	28 Apr 2009 01:44:45 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
 Version: 3.3.12
-Release: 1.rc1%{?dist}.3
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
@@ -100,6 +100,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 3.3.12-2
+- 3.3.12 final.
+
 * Mon Mar 02 2009 Jon Ciesla <limb at jcomserv.net> - 3.3.12-1.rc1.3
 - Desktop file fix, BZ 487811.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jan 2009 22:11:24 -0000	1.3
+++ sources	28 Apr 2009 01:44:45 -0000	1.4
@@ -1 +1 @@
-2ef027a540c9ecbcc6ec44b8eaa2828b  ddd-3.3.12-rc1.tar.gz
+c50396db7bac3862a6d2555b3b22c34e  ddd-3.3.12.tar.gz



From caillon at fedoraproject.org  Tue Apr 28 02:56:24 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 02:56:24 +0000 (UTC)
Subject: rpms/firefox/devel .cvsignore, 1.95, 1.96 firefox.spec, 1.326,
	1.327 sources, 1.108, 1.109
Message-ID: <20090428025625.099DB70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14171

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 3.5-0.20
- 3.5 beta 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	13 Mar 2009 23:35:56 -0000	1.95
+++ .cvsignore	28 Apr 2009 02:55:53 -0000	1.96
@@ -1 +1,2 @@
-firefox-3.1b3-source.tar.bz2
+firefox-3.5b4-source.tar.bz2
+firefox-langpacks-3.5-20090427.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- firefox.spec	28 Mar 2009 00:44:08 -0000	1.326
+++ firefox.spec	28 Apr 2009 02:55:53 -0000	1.327
@@ -5,11 +5,11 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define gecko_version 1.9.1-0.11
-%define internal_version 3.1b3
+%define gecko_version 1.9.1-0.20
+%define internal_version 3.5b4
 
 %define official_branding    1
-%define build_langpacks      0
+%define build_langpacks      1
 
 %if ! %{official_branding}
 %define cvsdate 20080327
@@ -18,19 +18,19 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.1
-Release:        0.11.beta3%{?dist}
+Version:        3.5
+Release:        0.20.beta4%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball firefox-%{internal_version}-source.tar.bz2
 %else
-%define tarball firefox-3.1b3-source.tar.bz2
+%define tarball firefox-3.1b4-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20080923.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090427.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -321,6 +321,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 3.5-0.20
+- 3.5 beta 4
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 3.1-0.11
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	13 Mar 2009 23:35:56 -0000	1.108
+++ sources	28 Apr 2009 02:55:53 -0000	1.109
@@ -1 +1,2 @@
-61cd1a7fc587f6d2a33c564033198e2c  firefox-3.1b3-source.tar.bz2
+ff6bf463300cb56bcf750973b2af3d80  firefox-3.5b4-source.tar.bz2
+ea9b2b8e3ecbf5eb4245d26546211ba6  firefox-langpacks-3.5-20090427.tar.bz2



From caillon at fedoraproject.org  Tue Apr 28 02:56:32 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 02:56:32 +0000 (UTC)
Subject: rpms/xulrunner/devel .cvsignore, 1.66, 1.67 sources, 1.69,
	1.70 xulrunner.spec, 1.154, 1.155 mfsa-2009-12.patch, 1.1,
	NONE mfsa-2009-13.patch, 1.1, NONE xulrunner-elif.patch, 1.1,
	NONE xulrunner-pango.patch, 1.1, NONE
Message-ID: <20090428025632.0A4DE70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14200

Modified Files:
	.cvsignore sources xulrunner.spec 
Removed Files:
	mfsa-2009-12.patch mfsa-2009-13.patch xulrunner-elif.patch 
	xulrunner-pango.patch 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.20
- 1.9.1 beta 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	13 Mar 2009 23:35:53 -0000	1.66
+++ .cvsignore	28 Apr 2009 02:56:01 -0000	1.67
@@ -1 +1 @@
-xulrunner-1.9.1b3-source.tar.bz2
+xulrunner-1.9.1b4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	13 Mar 2009 23:35:53 -0000	1.69
+++ sources	28 Apr 2009 02:56:01 -0000	1.70
@@ -1 +1 @@
-61cd1a7fc587f6d2a33c564033198e2c  xulrunner-1.9.1b3-source.tar.bz2
+ff6bf463300cb56bcf750973b2af3d80  xulrunner-1.9.1b4-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- xulrunner.spec	27 Mar 2009 22:59:24 -0000	1.154
+++ xulrunner.spec	28 Apr 2009 02:56:01 -0000	1.155
@@ -3,7 +3,7 @@
 %define cairo_version 1.6.0
 %define lcms_version 1.17
 %define freetype_version 2.1.9
-%define sqlite_version 3.6.7
+%define sqlite_version 3.6.10
 %define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
@@ -12,11 +12,11 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.11.beta3%{?dist}
+Release:        0.20.beta4%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}b3-source.tar.bz2
+Source0:        xulrunner-%{version}b4-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -27,16 +27,12 @@ Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch2:         mozilla-191-path.patch
 Patch3:         mozilla-jemalloc.patch
-Patch4:         xulrunner-pango.patch
-Patch5:         xulrunner-elif.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
 
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
-Patch101:       mfsa-2009-12.patch
-Patch102:       mfsa-2009-13.patch
 
 # ---------------------------------------------------
 
@@ -151,15 +147,11 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch1  -p1 -b .build
 %patch2  -p1 -b .path
 %patch3  -p1 -b .jemalloc
-%patch4  -p1 -b .pango
-%patch5  -p1 -b .elif
 
 %patch10 -p1 -b .pk
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
 
-%patch101 -p1 -b .mfsa-2009-12
-%patch102 -p1 -b .mfsa-2009-13
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -452,6 +444,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.20
+- 1.9.1 beta 4
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.11
 - Add patches for MFSA-2009-12, MFSA-2009-13
 


--- mfsa-2009-12.patch DELETED ---


--- mfsa-2009-13.patch DELETED ---


--- xulrunner-elif.patch DELETED ---


--- xulrunner-pango.patch DELETED ---



From cwickert at fedoraproject.org  Tue Apr 28 03:02:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 28 Apr 2009 03:02:50 +0000 (UTC)
Subject: rpms/lxsession-lite/F-9
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch, NONE,
	1.1 lxsession-lite-0.3.6-new-gdm.patch, NONE,
	1.1 lxsession-lite-0.3.6-session_name_fix.patch, NONE,
	1.1 lxsession-lite.spec, 1.1, 1.2
Message-ID: <20090428030250.399D870129@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15410/F-9

Modified Files:
	lxsession-lite.spec 
Added Files:
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch 
	lxsession-lite-0.3.6-new-gdm.patch 
	lxsession-lite-0.3.6-session_name_fix.patch 
Log Message:
* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
- Fix Session name (Andrew Lee)


lxsession-lite-0.3.6-icon_search_path_fix-1.patch:

--- NEW FILE lxsession-lite-0.3.6-icon_search_path_fix-1.patch ---
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/main.c lxsession-lite-0.3.6/lxsession-logout/main.c
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2009-04-20 15:03:34.000000000 -0400
@@ -350,7 +350,7 @@
     back = create_background();
 
     gtk_icon_theme_append_search_path( gtk_icon_theme_get_default(),
-                                            PACKAGE_DATA_DIR "/images" );
+                                            PACKAGE_DATA_DIR "/lxsession/images" );
 
     dlg = gtk_dialog_new_with_buttons( _("Logout"), (GtkWindow*)back, GTK_DIALOG_MODAL,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL );
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am lxsession-lite-0.3.6/lxsession-logout/Makefile.am
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.am	2009-04-20 15:05:25.000000000 -0400
@@ -2,7 +2,7 @@
 
 lxsession_logout_CFLAGS =  $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in lxsession-lite-0.3.6/lxsession-logout/Makefile.in
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in	2008-06-08 12:58:13.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.in	2009-04-20 15:04:53.000000000 -0400
@@ -200,7 +200,7 @@
 top_srcdir = @top_srcdir@
 lxsession_logout_CFLAGS = $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 lxsession_logout_SOURCES = \

 	  	 

lxsession-lite-0.3.6-new-gdm.patch:

--- NEW FILE lxsession-lite-0.3.6-new-gdm.patch ---
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 18:47:19.000000000 +0200
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2008-11-01 06:19:05.000000000 +0100
@@ -435,6 +435,7 @@
 
     /* If GDM is running */
     if( g_file_test("/var/run/gdm_socket", G_FILE_TEST_EXISTS)
+        || g_file_test("/var/run/gdm.pid", G_FILE_TEST_EXISTS)
         || g_file_test("/tmp/.gdm_socket", G_FILE_TEST_EXISTS) )
     {
         btn = create_dlg_btn(_("S_witch User"), "gnome-session-switch", LOGOUT_ACTION_SWITCH_USER );

lxsession-lite-0.3.6-session_name_fix.patch:

--- NEW FILE lxsession-lite-0.3.6-session_name_fix.patch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_session_name_fix.dpatch by Andrew Lee <andrew at linux.org.tw>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix session name other than LXDE can be used.

@DPATCH@
diff -urNad lxsession-lite-0.3.6~/lxsession/lxsession.c lxsession-lite-0.3.6/lxsession/lxsession.c
--- lxsession-lite-0.3.6~/lxsession/lxsession.c	2008-06-08 21:43:07.000000000 +0800
+++ lxsession-lite-0.3.6/lxsession/lxsession.c	2008-12-29 11:48:56.476492960 +0800
@@ -340,7 +340,7 @@
 
     register_signals();
 
-    if ( session_name )
+    if ( !session_name )
         session_name = "LXDE";
 
     g_setenv( "DESKTOP_SESSION", session_name, TRUE );



Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/F-9/lxsession-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxsession-lite.spec	11 Oct 2008 00:03:34 -0000	1.1
+++ lxsession-lite.spec	28 Apr 2009 03:02:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lxsession-lite
 Version:        0.3.6
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -8,11 +8,15 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://sourceforge.net/tracker/?func=detail&aid=2778757&group_id=180858&atid=894871
+Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
+Patch1:         lxsession-lite-0.3.6-session_name_fix.patch
+Patch2:         lxsession-lite-0.3.6-new-gdm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel > 2.6 libICE-devel libSM-devel dbus-glib-devel
 BuildRequires:  docbook-utils intltool gettext-devel
-Requires:       dbus
+Requires:       hal
 Obsoletes:      lxsession <= 0.3.2-2
 Provides:       lxsession = %{version}-%{release}
 
@@ -32,14 +36,16 @@ GDM. Er ist eine abgespeckte Version von
 Sitzungen zu speichern.
 
 LXSession Lite ist von XSM abgeleitet und wird als Sitzungsverwalter von LXDE,
-der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Auch wenn er Teil von 
-von LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
+der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Obwohl er Teil von 
+LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
 Abh??ngigkeiten.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .icon-path
+%patch1 -p1 -b .session-name
+%patch2 -p1 -b .new-gdm
 
 %build
 %configure
@@ -67,6 +73,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/xdg/lxsession
 
 %changelog
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
+- Fix Session name (Andrew Lee)
+
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
+- Support user switching also with newer gdm
+- Add patch to fix icon search path (Marty Jack)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 09 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-2
 - Preserve timestamps during install
 



From cwickert at fedoraproject.org  Tue Apr 28 03:03:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 28 Apr 2009 03:03:15 +0000 (UTC)
Subject: rpms/lxsession-lite/F-10
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch, NONE,
	1.1 lxsession-lite-0.3.6-new-gdm.patch, NONE,
	1.1 lxsession-lite-0.3.6-session_name_fix.patch, NONE,
	1.1 lxsession-lite.spec, 1.1, 1.2
Message-ID: <20090428030315.F0EDE70129@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15410/F-10

Modified Files:
	lxsession-lite.spec 
Added Files:
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch 
	lxsession-lite-0.3.6-new-gdm.patch 
	lxsession-lite-0.3.6-session_name_fix.patch 
Log Message:
* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
- Fix Session name (Andrew Lee)


lxsession-lite-0.3.6-icon_search_path_fix-1.patch:

--- NEW FILE lxsession-lite-0.3.6-icon_search_path_fix-1.patch ---
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/main.c lxsession-lite-0.3.6/lxsession-logout/main.c
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2009-04-20 15:03:34.000000000 -0400
@@ -350,7 +350,7 @@
     back = create_background();
 
     gtk_icon_theme_append_search_path( gtk_icon_theme_get_default(),
-                                            PACKAGE_DATA_DIR "/images" );
+                                            PACKAGE_DATA_DIR "/lxsession/images" );
 
     dlg = gtk_dialog_new_with_buttons( _("Logout"), (GtkWindow*)back, GTK_DIALOG_MODAL,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL );
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am lxsession-lite-0.3.6/lxsession-logout/Makefile.am
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.am	2009-04-20 15:05:25.000000000 -0400
@@ -2,7 +2,7 @@
 
 lxsession_logout_CFLAGS =  $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in lxsession-lite-0.3.6/lxsession-logout/Makefile.in
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in	2008-06-08 12:58:13.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.in	2009-04-20 15:04:53.000000000 -0400
@@ -200,7 +200,7 @@
 top_srcdir = @top_srcdir@
 lxsession_logout_CFLAGS = $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 lxsession_logout_SOURCES = \

 	  	 

lxsession-lite-0.3.6-new-gdm.patch:

--- NEW FILE lxsession-lite-0.3.6-new-gdm.patch ---
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 18:47:19.000000000 +0200
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2008-11-01 06:19:05.000000000 +0100
@@ -435,6 +435,7 @@
 
     /* If GDM is running */
     if( g_file_test("/var/run/gdm_socket", G_FILE_TEST_EXISTS)
+        || g_file_test("/var/run/gdm.pid", G_FILE_TEST_EXISTS)
         || g_file_test("/tmp/.gdm_socket", G_FILE_TEST_EXISTS) )
     {
         btn = create_dlg_btn(_("S_witch User"), "gnome-session-switch", LOGOUT_ACTION_SWITCH_USER );

lxsession-lite-0.3.6-session_name_fix.patch:

--- NEW FILE lxsession-lite-0.3.6-session_name_fix.patch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_session_name_fix.dpatch by Andrew Lee <andrew at linux.org.tw>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix session name other than LXDE can be used.

@DPATCH@
diff -urNad lxsession-lite-0.3.6~/lxsession/lxsession.c lxsession-lite-0.3.6/lxsession/lxsession.c
--- lxsession-lite-0.3.6~/lxsession/lxsession.c	2008-06-08 21:43:07.000000000 +0800
+++ lxsession-lite-0.3.6/lxsession/lxsession.c	2008-12-29 11:48:56.476492960 +0800
@@ -340,7 +340,7 @@
 
     register_signals();
 
-    if ( session_name )
+    if ( !session_name )
         session_name = "LXDE";
 
     g_setenv( "DESKTOP_SESSION", session_name, TRUE );



Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/F-10/lxsession-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxsession-lite.spec	10 Oct 2008 23:46:29 -0000	1.1
+++ lxsession-lite.spec	28 Apr 2009 03:02:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lxsession-lite
 Version:        0.3.6
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -8,11 +8,15 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://sourceforge.net/tracker/?func=detail&aid=2778757&group_id=180858&atid=894871
+Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
+Patch1:         lxsession-lite-0.3.6-session_name_fix.patch
+Patch2:         lxsession-lite-0.3.6-new-gdm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel > 2.6 libICE-devel libSM-devel dbus-glib-devel
 BuildRequires:  docbook-utils intltool gettext-devel
-Requires:       dbus
+Requires:       hal
 Obsoletes:      lxsession <= 0.3.2-2
 Provides:       lxsession = %{version}-%{release}
 
@@ -32,14 +36,16 @@ GDM. Er ist eine abgespeckte Version von
 Sitzungen zu speichern.
 
 LXSession Lite ist von XSM abgeleitet und wird als Sitzungsverwalter von LXDE,
-der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Auch wenn er Teil von 
-von LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
+der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Obwohl er Teil von 
+LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
 Abh??ngigkeiten.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .icon-path
+%patch1 -p1 -b .session-name
+%patch2 -p1 -b .new-gdm
 
 %build
 %configure
@@ -67,6 +73,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/xdg/lxsession
 
 %changelog
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
+- Fix Session name (Andrew Lee)
+
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
+- Support user switching also with newer gdm
+- Add patch to fix icon search path (Marty Jack)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 09 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-2
 - Preserve timestamps during install
 



From cwickert at fedoraproject.org  Tue Apr 28 03:03:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 28 Apr 2009 03:03:17 +0000 (UTC)
Subject: rpms/lxsession-lite/F-11
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch, NONE,
	1.1 lxsession-lite-0.3.6-new-gdm.patch, NONE,
	1.1 lxsession-lite-0.3.6-session_name_fix.patch, NONE,
	1.1 lxsession-lite.spec, 1.2, 1.3
Message-ID: <20090428030317.36AB370129@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15410/F-11

Modified Files:
	lxsession-lite.spec 
Added Files:
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch 
	lxsession-lite-0.3.6-new-gdm.patch 
	lxsession-lite-0.3.6-session_name_fix.patch 
Log Message:
* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
- Fix Session name (Andrew Lee)


lxsession-lite-0.3.6-icon_search_path_fix-1.patch:

--- NEW FILE lxsession-lite-0.3.6-icon_search_path_fix-1.patch ---
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/main.c lxsession-lite-0.3.6/lxsession-logout/main.c
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2009-04-20 15:03:34.000000000 -0400
@@ -350,7 +350,7 @@
     back = create_background();
 
     gtk_icon_theme_append_search_path( gtk_icon_theme_get_default(),
-                                            PACKAGE_DATA_DIR "/images" );
+                                            PACKAGE_DATA_DIR "/lxsession/images" );
 
     dlg = gtk_dialog_new_with_buttons( _("Logout"), (GtkWindow*)back, GTK_DIALOG_MODAL,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL );
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am lxsession-lite-0.3.6/lxsession-logout/Makefile.am
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.am	2009-04-20 15:05:25.000000000 -0400
@@ -2,7 +2,7 @@
 
 lxsession_logout_CFLAGS =  $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in lxsession-lite-0.3.6/lxsession-logout/Makefile.in
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in	2008-06-08 12:58:13.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.in	2009-04-20 15:04:53.000000000 -0400
@@ -200,7 +200,7 @@
 top_srcdir = @top_srcdir@
 lxsession_logout_CFLAGS = $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 lxsession_logout_SOURCES = \

 	  	 

lxsession-lite-0.3.6-new-gdm.patch:

--- NEW FILE lxsession-lite-0.3.6-new-gdm.patch ---
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 18:47:19.000000000 +0200
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2008-11-01 06:19:05.000000000 +0100
@@ -435,6 +435,7 @@
 
     /* If GDM is running */
     if( g_file_test("/var/run/gdm_socket", G_FILE_TEST_EXISTS)
+        || g_file_test("/var/run/gdm.pid", G_FILE_TEST_EXISTS)
         || g_file_test("/tmp/.gdm_socket", G_FILE_TEST_EXISTS) )
     {
         btn = create_dlg_btn(_("S_witch User"), "gnome-session-switch", LOGOUT_ACTION_SWITCH_USER );

lxsession-lite-0.3.6-session_name_fix.patch:

--- NEW FILE lxsession-lite-0.3.6-session_name_fix.patch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_session_name_fix.dpatch by Andrew Lee <andrew at linux.org.tw>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix session name other than LXDE can be used.

@DPATCH@
diff -urNad lxsession-lite-0.3.6~/lxsession/lxsession.c lxsession-lite-0.3.6/lxsession/lxsession.c
--- lxsession-lite-0.3.6~/lxsession/lxsession.c	2008-06-08 21:43:07.000000000 +0800
+++ lxsession-lite-0.3.6/lxsession/lxsession.c	2008-12-29 11:48:56.476492960 +0800
@@ -340,7 +340,7 @@
 
     register_signals();
 
-    if ( session_name )
+    if ( !session_name )
         session_name = "LXDE";
 
     g_setenv( "DESKTOP_SESSION", session_name, TRUE );



Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/F-11/lxsession-lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxsession-lite.spec	25 Feb 2009 22:22:04 -0000	1.2
+++ lxsession-lite.spec	28 Apr 2009 03:02:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lxsession-lite
 Version:        0.3.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -8,11 +8,15 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://sourceforge.net/tracker/?func=detail&aid=2778757&group_id=180858&atid=894871
+Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
+Patch1:         lxsession-lite-0.3.6-session_name_fix.patch
+Patch2:         lxsession-lite-0.3.6-new-gdm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel > 2.6 libICE-devel libSM-devel dbus-glib-devel
 BuildRequires:  docbook-utils intltool gettext-devel
-Requires:       dbus
+Requires:       hal
 Obsoletes:      lxsession <= 0.3.2-2
 Provides:       lxsession = %{version}-%{release}
 
@@ -32,14 +36,16 @@ GDM. Er ist eine abgespeckte Version von
 Sitzungen zu speichern.
 
 LXSession Lite ist von XSM abgeleitet und wird als Sitzungsverwalter von LXDE,
-der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Auch wenn er Teil von 
-von LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
+der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Obwohl er Teil von 
+LXDE ist, ist er komplett Desktop unabh??ngig und hat nur wenige 
 Abh??ngigkeiten.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .icon-path
+%patch1 -p1 -b .session-name
+%patch2 -p1 -b .new-gdm
 
 %build
 %configure
@@ -67,6 +73,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/xdg/lxsession
 
 %changelog
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
+- Fix Session name (Andrew Lee)
+
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
+- Support user switching also with newer gdm
+- Add patch to fix icon search path (Marty Jack)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:09:23 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:09:23 +0000 (UTC)
Subject: rpms/xulrunner/devel mozilla-191-pkgconfig.patch,1.2,1.3
Message-ID: <20090428030923.4734370129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17672

Modified Files:
	mozilla-191-pkgconfig.patch 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.20
- 1.9.1 beta 4


mozilla-191-pkgconfig.patch:

Index: mozilla-191-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-191-pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mozilla-191-pkgconfig.patch	22 Dec 2008 16:32:22 -0000	1.2
+++ mozilla-191-pkgconfig.patch	28 Apr 2009 03:09:22 -0000	1.3
@@ -138,5 +138,5 @@ diff -r f1af606531f5 xulrunner/installer
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Cflags: -I${includedir}/stable
-+Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin



From seanf at fedoraproject.org  Tue Apr 28 03:12:27 2009
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Tue, 28 Apr 2009 03:12:27 +0000 (UTC)
Subject: rpms/eclipse-nls/F-10 .cvsignore, 1.3, 1.4 eclipse-nls.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090428031227.E785870129@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18306

Modified Files:
	.cvsignore eclipse-nls.spec sources 
Log Message:
- Upstream langpack have working downloads again - updated to latest version
- Added subpackages for en_AU, et, hi and mn langpacks
- Changed filenames back to newer format (as in rawhide spec)
- Made base package eclipse-nls owner of babel dropins directories



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Apr 2009 03:00:00 -0000	1.3
+++ .cvsignore	28 Apr 2009 03:11:57 -0000	1.4
@@ -1 +1 @@
-BabelLanguagePack-3.4.0.v20081026043401.tar.bz2
+BabelLanguagePack-3.4.0.v20090423085802.tar.bz2


Index: eclipse-nls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-10/eclipse-nls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-nls.spec	24 Apr 2009 03:00:00 -0000	1.2
+++ eclipse-nls.spec	28 Apr 2009 03:11:57 -0000	1.3
@@ -9,22 +9,39 @@ Group: Text Editors/Integrated Developme
 License: EPL
 URL: http://babel.eclipse.org/
 
-Version: 3.4.0.v20081026043401
+Version: 3.4.0.v20090423085802
 Release: 1%{?dist}
-## The source for this package is taken from http://download.eclipse.org/technology/babel/babel_language_packs/
+## The source for this package is taken from
+# http://download.eclipse.org/technology/babel/babel_language_packs/ *.zip
+# http://download.eclipse.org/releases/ganymede/site.xml
 Source0: BabelLanguagePack-%{version}.tar.bz2
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
+Requires:   eclipse-platform >= 3.4.0-18
 
 %description
 Babel language packs include translations for the Eclipse platform and other 
 Eclipse-related packages.
 
+%files
+%defattr(-,root,root,-)
+%dir %{eclipse_data}/dropins/babel
+%dir %{eclipse_data}/dropins/babel/eclipse
+#%{eclipse_data}/dropins/babel/eclipse/artifacts.jar
+#%{eclipse_data}/dropins/babel/eclipse/content.jar
+%dir %{eclipse_data}/dropins/babel/eclipse/features
+%dir %{eclipse_data}/dropins/babel/eclipse/plugins
+
+
+# %1 subpackage id (ie Linux locale id)
+# %2 Java locale id (mostly the same as Linux)
+# %3 language name
 %define lang_meta_pkg() \
 %package %1 \
 Summary:    Eclipse/Babel language pack for %3 \
 Group:      Text Editors/Integrated Development Environments (IDE) \
-Requires:   eclipse-platform >= 3.4.0-18 \
+Requires:   eclipse-nls = %{version}-%{release} \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
 \
 %description %1 \
@@ -38,12 +55,8 @@ have a translation for a given string. \
 \
 %files %1 \
 %defattr(-,root,root,-) \
-%dir %{eclipse_data}/dropins/babel \
-%dir %{eclipse_data}/dropins/babel/eclipse \
-%dir %{eclipse_data}/dropins/babel/eclipse/features \
-%{eclipse_data}/dropins/babel/eclipse/features/*.nl-%{2}_%{version} \
-%dir %{eclipse_data}/dropins/babel/eclipse/plugins \
-%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl-%{2}_%{version}.jar
+%{eclipse_data}/dropins/babel/eclipse/features/org.eclipse.babel.nls_*_%{2}_%{version} \
+%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl_%{2}_%{version}.jar
 
 
 # Note that no licence %%doc files are listed under %%files.  Upstream 
@@ -60,22 +73,23 @@ have a translation for a given string. \
 %lang_meta_pkg cs cs Czech
 %lang_meta_pkg da da Danish
 %lang_meta_pkg nl nl Dutch
-#% lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg et et Estonian
 %lang_meta_pkg fi fi Finnish
 %lang_meta_pkg fr fr French
 %lang_meta_pkg de de German
 %lang_meta_pkg el el Greek
-# NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
+# NB 'he' is 'iw' as far as Java is concerned.
 # similarly, yi -> ji, id -> in
 %lang_meta_pkg he iw Hebrew
-#% lang_meta_pkg hi hi Hindi
+%lang_meta_pkg hi hi Hindi
 %lang_meta_pkg hu hu Hungarian
 %lang_meta_pkg it it Italian
 %lang_meta_pkg ja ja Japanese
 # tl should be Tagalog.  Klingon has < 1% coverage at present in Babel.  Tagalog is unsupported.
 #% lang_meta_pkg tlh tl Klingon
 %lang_meta_pkg ko ko Korean
-#% lang_meta_pkg mn mn Mongolian
+%lang_meta_pkg mn mn Mongolian
 %lang_meta_pkg no no Norwegian
 %lang_meta_pkg pl pl Polish
 %lang_meta_pkg pt pt Portuguese
@@ -91,16 +105,18 @@ have a translation for a given string. \
 %prep
 # extract langpack zips from tarball
 %setup -q -n %{name}
+mkdir -p eclipse/features eclipse/plugins
 # remove unsupported langpacks (currently Klingon)
 unsupported="tl"
 for locale in $unsupported; do
-   rm Babel*-${locale}_%{version}.zip
+   rm -f Babel*-${locale}_%{version}.zip
 done
 # extract remaining zips - to eclipse/{features,plugins}
 for f in Babel*.zip; do
    unzip -qq $f
    rm $f
 done
+#mv artifacts.jar content.jar eclipse
 
 %build
 # nothing to build
@@ -115,7 +131,13 @@ cp -a eclipse $RPM_BUILD_ROOT%{eclipse_d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Apr 24 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20081026043401
+* Tue Apr 28 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20090423085802-1
+- Upstream langpack have working downloads again - updated to latest version
+- Added subpackages for en_AU, et, hi and mn langpacks
+- Changed filenames back to newer format (as in rawhide spec)
+- Made base package eclipse-nls owner of babel dropins directories
+
+* Fri Apr 24 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20081026043401-1
 - Backported from rawhide spec (3.5.0.v20090417091040-1), changed filenames
  to suit older langpacks
 - Updated to use Babel's zipped langpacks instead of fetch-babel.sh


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Apr 2009 03:00:00 -0000	1.3
+++ sources	28 Apr 2009 03:11:57 -0000	1.4
@@ -1 +1 @@
-749455df33da1718530c66796249b7f5  BabelLanguagePack-3.4.0.v20081026043401.tar.bz2
+5abd9072331ccce3f0eb7f97ccb9e612  BabelLanguagePack-3.4.0.v20090423085802.tar.bz2



From caillon at fedoraproject.org  Tue Apr 28 03:21:53 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:21:53 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.27,1.28
Message-ID: <20090428032153.B086D70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20843

Modified Files:
	blam.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-10
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/blam.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- blam.spec	24 Feb 2009 04:58:07 -0000	1.27
+++ blam.spec	28 Apr 2009 03:21:22 -0000	1.28
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.5
-Release:	6%{?dist}
+Release:	10%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-10
+- Rebuild against newer gecko
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:22:37 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:22:37 +0000 (UTC)
Subject: rpms/chmsee/devel chmsee.spec,1.28,1.29
Message-ID: <20090428032237.45D0870129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/chmsee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20968

Modified Files:
	chmsee.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-6
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- chmsee.spec	24 Feb 2009 07:29:13 -0000	1.28
+++ chmsee.spec	28 Apr 2009 03:22:06 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary(zh_CN):	CHM ??????????????????, ?????? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-6
+- Rebuild against newer gecko
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:23:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:23:26 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.58,1.59
Message-ID: <20090428032326.1276E70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21183

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-2
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- epiphany-extensions.spec	13 Apr 2009 05:14:10 -0000	1.58
+++ epiphany-extensions.spec	28 Apr 2009 03:22:55 -0000	1.59
@@ -5,7 +5,7 @@
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-2
+- Rebuild against newer gecko
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-1
 - Update to 2.26.1
 



From caillon at fedoraproject.org  Tue Apr 28 03:24:07 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:24:07 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss.spec,1.25,1.26
Message-ID: <20090428032407.2FA0470129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21327

Modified Files:
	evolution-rss.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-9
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- evolution-rss.spec	12 Apr 2009 17:50:17 -0000	1.25
+++ evolution-rss.spec	28 Apr 2009 03:23:36 -0000	1.26
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -83,6 +83,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-9
+- Rebuild against newer gecko
+
 * Sun Apr 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.2-8
 - EVR bump
 



From caillon at fedoraproject.org  Tue Apr 28 03:24:47 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:24:47 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.49,
	1.50
Message-ID: <20090428032447.EF70870129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21460

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-3
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gnome-python2-extras.spec	24 Feb 2009 23:19:01 -0000	1.49
+++ gnome-python2-extras.spec	28 Apr 2009 03:24:17 -0000	1.50
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-3
+- Rebuild against newer gecko
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:25:27 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:25:27 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.21,1.22
Message-ID: <20090428032527.826E070129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21649

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.7-2
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-web-photo.spec	13 Apr 2009 05:08:46 -0000	1.21
+++ gnome-web-photo.spec	28 Apr 2009 03:24:57 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.7-2
+- Rebuild against newer gecko
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.7-1
 - Update to 0.7
 



From seanf at fedoraproject.org  Tue Apr 28 03:25:33 2009
From: seanf at fedoraproject.org (Sean Flanigan)
Date: Tue, 28 Apr 2009 03:25:33 +0000 (UTC)
Subject: rpms/eclipse-nls/F-11 .cvsignore, 1.3, 1.4 eclipse-nls.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090428032533.B618170129@cvs1.fedora.phx.redhat.com>

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21071

Modified Files:
	.cvsignore eclipse-nls.spec sources 
Log Message:
- Upstream has working langpack downloads again - updated to latest version
- Added subpackages for en_AU, et, hi and mn langpacks
- Changed filenames back to newer format (as in rawhide spec)
- Made base package eclipse-nls owner of babel dropins directories



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Apr 2009 02:24:19 -0000	1.3
+++ .cvsignore	28 Apr 2009 03:25:03 -0000	1.4
@@ -1 +1 @@
-BabelLanguagePack-3.4.0.v20081026043401.tar.bz2
+BabelLanguagePack-3.4.0.v20090423085802.tar.bz2


Index: eclipse-nls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-11/eclipse-nls.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-nls.spec	24 Apr 2009 02:24:19 -0000	1.3
+++ eclipse-nls.spec	28 Apr 2009 03:25:03 -0000	1.4
@@ -9,22 +9,39 @@ Group: Text Editors/Integrated Developme
 License: EPL
 URL: http://babel.eclipse.org/
 
-Version: 3.4.0.v20081026043401
+Version: 3.4.0.v20090423085802
 Release: 1%{?dist}
-## The source for this package is taken from http://download.eclipse.org/technology/babel/babel_language_packs/
+## The source for this package is taken from
+# http://download.eclipse.org/technology/babel/babel_language_packs/ *.zip
+# http://download.eclipse.org/releases/ganymede/site.xml
 Source0: BabelLanguagePack-%{version}.tar.bz2
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
+Requires:   eclipse-platform >= 3.4.0-18
 
 %description
 Babel language packs include translations for the Eclipse platform and other 
 Eclipse-related packages.
 
+%files
+%defattr(-,root,root,-)
+%dir %{eclipse_data}/dropins/babel
+%dir %{eclipse_data}/dropins/babel/eclipse
+#%{eclipse_data}/dropins/babel/eclipse/artifacts.jar
+#%{eclipse_data}/dropins/babel/eclipse/content.jar
+%dir %{eclipse_data}/dropins/babel/eclipse/features
+%dir %{eclipse_data}/dropins/babel/eclipse/plugins
+
+
+# %1 subpackage id (ie Linux locale id)
+# %2 Java locale id (mostly the same as Linux)
+# %3 language name
 %define lang_meta_pkg() \
 %package %1 \
 Summary:    Eclipse/Babel language pack for %3 \
 Group:      Text Editors/Integrated Development Environments (IDE) \
-Requires:   eclipse-platform >= 3.4.0-18 \
+Requires:   eclipse-nls = %{version}-%{release} \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
 \
 %description %1 \
@@ -38,12 +55,8 @@ have a translation for a given string. \
 \
 %files %1 \
 %defattr(-,root,root,-) \
-%dir %{eclipse_data}/dropins/babel \
-%dir %{eclipse_data}/dropins/babel/eclipse \
-%dir %{eclipse_data}/dropins/babel/eclipse/features \
-%{eclipse_data}/dropins/babel/eclipse/features/*.nl-%{2}_%{version} \
-%dir %{eclipse_data}/dropins/babel/eclipse/plugins \
-%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl-%{2}_%{version}.jar
+%{eclipse_data}/dropins/babel/eclipse/features/org.eclipse.babel.nls_*_%{2}_%{version} \
+%{eclipse_data}/dropins/babel/eclipse/plugins/*.nl_%{2}_%{version}.jar
 
 
 # Note that no licence %%doc files are listed under %%files.  Upstream 
@@ -60,22 +73,23 @@ have a translation for a given string. \
 %lang_meta_pkg cs cs Czech
 %lang_meta_pkg da da Danish
 %lang_meta_pkg nl nl Dutch
-#% lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg et et Estonian
 %lang_meta_pkg fi fi Finnish
 %lang_meta_pkg fr fr French
 %lang_meta_pkg de de German
 %lang_meta_pkg el el Greek
-# NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
+# NB 'he' is 'iw' as far as Java is concerned.
 # similarly, yi -> ji, id -> in
 %lang_meta_pkg he iw Hebrew
-#% lang_meta_pkg hi hi Hindi
+%lang_meta_pkg hi hi Hindi
 %lang_meta_pkg hu hu Hungarian
 %lang_meta_pkg it it Italian
 %lang_meta_pkg ja ja Japanese
 # tl should be Tagalog.  Klingon has < 1% coverage at present in Babel.  Tagalog is unsupported.
 #% lang_meta_pkg tlh tl Klingon
 %lang_meta_pkg ko ko Korean
-#% lang_meta_pkg mn mn Mongolian
+%lang_meta_pkg mn mn Mongolian
 %lang_meta_pkg no no Norwegian
 %lang_meta_pkg pl pl Polish
 %lang_meta_pkg pt pt Portuguese
@@ -91,16 +105,18 @@ have a translation for a given string. \
 %prep
 # extract langpack zips from tarball
 %setup -q -n %{name}
+mkdir -p eclipse/features eclipse/plugins
 # remove unsupported langpacks (currently Klingon)
 unsupported="tl"
 for locale in $unsupported; do
-   rm Babel*-${locale}_%{version}.zip
+   rm -f Babel*-${locale}_%{version}.zip
 done
 # extract remaining zips - to eclipse/{features,plugins}
 for f in Babel*.zip; do
    unzip -qq $f
    rm $f
 done
+#mv artifacts.jar content.jar eclipse
 
 %build
 # nothing to build
@@ -115,7 +131,13 @@ cp -a eclipse $RPM_BUILD_ROOT%{eclipse_d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Apr 24 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20081026043401
+* Tue Apr 28 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20090423085802-1
+- Upstream has working langpack downloads again - updated to latest version
+- Added subpackages for en_AU, et, hi and mn langpacks
+- Changed filenames back to newer format (as in rawhide spec)
+- Made base package eclipse-nls owner of babel dropins directories
+
+* Fri Apr 24 2009 Sean Flanigan <sflaniga at redhat.com> - 3.4.0.v20081026043401-1
 - Backported from rawhide spec (3.5.0.v20090417091040-1), changed filenames
  to suit older langpacks
 - Updated to use Babel's zipped langpacks instead of fetch-babel.sh


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Apr 2009 02:24:19 -0000	1.3
+++ sources	28 Apr 2009 03:25:03 -0000	1.4
@@ -1 +1 @@
-749455df33da1718530c66796249b7f5  BabelLanguagePack-3.4.0.v20081026043401.tar.bz2
+5abd9072331ccce3f0eb7f97ccb9e612  BabelLanguagePack-3.4.0.v20090423085802.tar.bz2



From caillon at fedoraproject.org  Tue Apr 28 03:26:07 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:26:07 +0000 (UTC)
Subject: rpms/google-gadgets/devel google-gadgets.spec,1.11,1.12
Message-ID: <20090428032607.96D2070129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21782

Modified Files:
	google-gadgets.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- google-gadgets.spec	15 Apr 2009 14:33:41 -0000	1.11
+++ google-gadgets.spec	28 Apr 2009 03:25:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
+- Rebuild against newer gecko
+
 * Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-4
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Tue Apr 28 03:26:46 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:26:46 +0000 (UTC)
Subject: rpms/hulahop/devel hulahop.spec,1.11,1.12
Message-ID: <20090428032646.F1D7A70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/hulahop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21940

Modified Files:
	hulahop.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-4
- Rebuild against newer gecko



Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/devel/hulahop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hulahop.spec	30 Mar 2009 14:59:44 -0000	1.11
+++ hulahop.spec	28 Apr 2009 03:26:16 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-4
+- Rebuild against newer gecko
+
 * Mon Mar 30 2009 Simon Schampijer <simon at schampijer.de> - 0.4.9-3
 - Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:27:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:27:26 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel icedtea-nsIProcess.patch, NONE,
	1.1 java-1.6.0-openjdk.spec, 1.116, 1.117
Message-ID: <20090428032726.D426F70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22159

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	icedtea-nsIProcess.patch 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-20.b14
- Rebuild against newer gecko


icedtea-nsIProcess.patch:

--- NEW FILE icedtea-nsIProcess.patch ---
This patch is needed to account for XULRunner API changes:
http://hg.mozilla.org/mozilla-central/rev/83603fbe4be1
https://bugzilla.mozilla.org/show_bug.cgi?id=442393

diff -up icedtea6-1.4.1/IcedTeaPlugin.cc.nsIProcess icedtea6-1.4.1/IcedTeaPlugin.cc
--- icedtea6-1.4.1/IcedTeaPlugin.cc.nsIProcess	2009-04-27 16:41:25.845010840 -0700
+++ icedtea6-1.4.1/IcedTeaPlugin.cc	2009-04-27 16:41:43.876260182 -0700
@@ -3765,7 +3765,7 @@ IcedTeaPluginFactory::StartAppletviewer 
     }
   PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name);
 
-  result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull);
+  result = applet_viewer_process->Run (PR_FALSE, args, numArgs);
   PLUGIN_CHECK_RETURN ("run process", result);
 
   out_to_appletviewer = g_io_channel_new_file (out_pipe_name,


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/extras/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- java-1.6.0-openjdk.spec	6 Apr 2009 14:06:42 -0000	1.116
+++ java-1.6.0-openjdk.spec	28 Apr 2009 03:26:56 -0000	1.117
@@ -120,7 +120,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 19.%{openjdkver}%{?dist}
+Release: 20.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -160,6 +160,7 @@ Patch7:   java-1.6.0-openjdk-sparc-hotsp
 Patch8:   java-1.6.0-openjdk-lcms.patch
 Patch9:   java-1.6.0-openjdk-securitypatches.patch
 Patch10:  java-1.6.0-openjdk-pulsejava.patch
+Patch20:  icedtea-nsIProcess.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -372,6 +373,7 @@ The OpenJDK web browser plugin.
 %patch2
 %patch6 -p1
 %patch9
+%patch20 -p1 -b .nsIProcess
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -927,6 +929,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-20.b14
+- Rebuild against newer gecko
+
 * Mon Apr  6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b14
 - Updated java-1.6.0-openjdk-lcms.patch
 



From airlied at fedoraproject.org  Tue Apr 28 03:27:38 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 03:27:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-fix-rs690-clamp.patch, 1.2,
	1.3 xorg-x11-drv-ati.spec, 1.182, 1.183
Message-ID: <20090428032738.A3DDB70129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22248

Modified Files:
	radeon-6.12.2-fix-rs690-clamp.patch xorg-x11-drv-ati.spec 
Log Message:
* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-8
- restrict texture coords to 0.0->1.0 explicitly.


radeon-6.12.2-fix-rs690-clamp.patch:

Index: radeon-6.12.2-fix-rs690-clamp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-6.12.2-fix-rs690-clamp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- radeon-6.12.2-fix-rs690-clamp.patch	24 Apr 2009 05:59:20 -0000	1.2
+++ radeon-6.12.2-fix-rs690-clamp.patch	28 Apr 2009 03:27:38 -0000	1.3
@@ -1,64 +1,78 @@
+commit 8338385cd94b35f54b25cf2576890159f8dd9f71
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 28 13:20:55 2009 +1000
+
+    radeon: rs690 texture fetch unit seems insane.
+    
+    If we don't clamp the texture coordinates explicity here,
+    the rs690 texture unit seems to do fetches from arbitary memory
+    locations no matter what clamp is set.
+
 diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index ca46505..7f3c93a 100644
+index ca46505..51f5b5d 100644
 --- a/src/radeon_exa_render.c
 +++ b/src/radeon_exa_render.c
-@@ -1278,23 +1278,28 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- 	    else
- 		txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
+@@ -2200,9 +2200,17 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+ do {								\
+     OUT_RING_F(_dstX);						\
+     OUT_RING_F(_dstY);						\
++    if (_srcX > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcX < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcX);						\
++    if (_srcY > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcY < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcY);						\
++    if (_maskX > 1.0) OUT_RING_F(1.0); else                  \
++    if (_maskX < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_maskX);						\
++    if (_maskY > 1.0) OUT_RING_F(1.0); else                  \
++    if (_maskY < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_maskY);						\
+ } while (0)
  
-+	    txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
- 	    break;
- 	case RepeatPad:
- 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
--		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST);
-+		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
-+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST);
- 	    break;
- 	case RepeatReflect:
- 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
-+		        R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
- 		        R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR);
- 	    break;
- 	case RepeatNone:
- 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
--		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
-+		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
-+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
- 	    break;
- 	}
-     } else
- 	txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
--	            R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
-+	            R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
-+	            R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
+@@ -2210,7 +2218,11 @@ do {								\
+ do {								\
+     OUT_RING_F(_dstX);						\
+     OUT_RING_F(_dstY);						\
++    if (_srcX > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcX < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcX);						\
++    if (_srcY > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcY < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcY);						\
+ } while (0)
  
-     switch (pPict->filter) {
-     case PictFilterNearest:
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 852f4ac..0fbb364 100644
+index 852f4ac..e1d0b5a 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
-@@ -263,6 +263,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -51,9 +51,17 @@
+ do {									\
+     OUT_RING_F(_dstX);						\
+     OUT_RING_F(_dstY);						\
++    if (_srcX > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcX < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcX);						\
++    if (_srcY > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcY < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcY);						\
++    if (_maskX > 1.0) OUT_RING_F(1.0); else                  \
++    if (_maskX < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_maskX);						\
++    if (_maskY > 1.0) OUT_RING_F(1.0); else                  \
++    if (_maskY < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_maskY);						\
+ } while (0)
  
- 	txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
- 		    R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
-+		    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
- 		    R300_TX_MAG_FILTER_LINEAR |
- 		    R300_TX_MIN_FILTER_LINEAR |
- 		    (0 << R300_TX_ID_SHIFT));
-@@ -299,6 +300,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 	    txpitch -= 1;
- 	    txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
- 		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
-+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
- 			R300_TX_MIN_FILTER_LINEAR |
- 			R300_TX_MAG_FILTER_LINEAR);
+@@ -61,7 +69,11 @@ do {									\
+ do {								\
+     OUT_RING_F(_dstX);						\
+     OUT_RING_F(_dstY);						\
++    if (_srcX > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcX < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcX);						\
++    if (_srcY > 1.0) OUT_RING_F(1.0); else                  \
++    if (_srcY < 0.0) OUT_RING_F(0.0); else                  \
+     OUT_RING_F(_srcY);						\
+ } while (0)
  
-@@ -334,6 +336,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- 		/* Tex filter */
- 		txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
- 			    R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
-+			    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
- 			    R300_TX_MIN_FILTER_NEAREST |
- 			    R300_TX_MAG_FILTER_NEAREST |
- 			    (1 << R300_TX_ID_SHIFT));


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- xorg-x11-drv-ati.spec	27 Apr 2009 01:25:03 -0000	1.182
+++ xorg-x11-drv-ati.spec	28 Apr 2009 03:27:38 -0000	1.183
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,7 +18,7 @@ Patch1:     radeon-modeset.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 Patch8:	    radeon-6.12.2-kms-gamma.patch
-#Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
+Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
 Patch10:    radeon-6.12.2-fix-xv-warning.patch
 
 ExcludeArch: s390 s390x
@@ -46,7 +46,7 @@ X.Org X11 ati video driver.
 %patch7 -p1 -b .r600-fb-size
 # don't do this yet, kernel will oops if you do
 #patch8 -p1 -b .kms-gamma
-#patch9 -p1 -b .rs690clamp
+%patch9 -p1 -b .rs690clamp
 %patch10 -p1 -b .fix-xvwarn
 
 %build
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-8
+- restrict texture coords to 0.0->1.0 explicitly.
+
 * Mon Apr 27 2009 Dave Airlie <airlied at redhat.com> 6.12.2-7
 - revert rs690 fixes for now until we can research properly
 - fix xv warning



From caillon at fedoraproject.org  Tue Apr 28 03:28:07 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:28:07 +0000 (UTC)
Subject: rpms/liferea/devel liferea.spec,1.131,1.132
Message-ID: <20090428032807.EFB4C70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22343

Modified Files:
	liferea.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.26-2
- Rebuild against newer gecko



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- liferea.spec	8 Mar 2009 15:26:31 -0000	1.131
+++ liferea.spec	28 Apr 2009 03:27:37 -0000	1.132
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.4.26
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -130,6 +130,9 @@ fi
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.26-2
+- Rebuild against newer gecko
+
 * Sun Mar 08 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.26-1
 - New upstream release
 



From caillon at fedoraproject.org  Tue Apr 28 03:28:54 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:28:54 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.52,1.53
Message-ID: <20090428032854.7643770129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22601

Modified Files:
	Miro.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-2
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- Miro.spec	16 Mar 2009 09:42:52 -0000	1.52
+++ Miro.spec	28 Apr 2009 03:28:24 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0.3-2
+- Rebuild against newer gecko
+
 * Mon Mar 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.3-1
 - Update to upstream 2.0.3
 - Add patch to disable xine-hack, hopefully fixes #480527



From caillon at fedoraproject.org  Tue Apr 28 03:29:36 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:29:36 +0000 (UTC)
Subject: rpms/monodevelop/devel monodevelop-2.spec,1.15,1.16
Message-ID: <20090428032936.314F070129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22864

Modified Files:
	monodevelop-2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0-2
- Rebuild against newer gecko



Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- monodevelop-2.spec	26 Mar 2009 23:24:43 -0000	1.15
+++ monodevelop-2.spec	28 Apr 2009 03:29:05 -0000	1.16
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -158,6 +158,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.0-2
+- Rebuild against newer gecko
+
 * Thu Mar 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
 - Full 2.0 release
 



From airlied at fedoraproject.org  Tue Apr 28 03:30:26 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 03:30:26 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 xorg-x11-drv-ati.spec,1.183,1.184
Message-ID: <20090428033026.7244770129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22985

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-8
- restrict texture coords to 0.0->1.0 explicitly.
- enable gamma now kernel is tagged



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- xorg-x11-drv-ati.spec	28 Apr 2009 03:27:38 -0000	1.183
+++ xorg-x11-drv-ati.spec	28 Apr 2009 03:29:56 -0000	1.184
@@ -44,8 +44,7 @@ X.Org X11 ati video driver.
 %patch1 -p1 -b .modeset
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
-# don't do this yet, kernel will oops if you do
-#patch8 -p1 -b .kms-gamma
+%patch8 -p1 -b .kms-gamma
 %patch9 -p1 -b .rs690clamp
 %patch10 -p1 -b .fix-xvwarn
 
@@ -81,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-8
 - restrict texture coords to 0.0->1.0 explicitly.
+- enable gamma now kernel is tagged
 
 * Mon Apr 27 2009 Dave Airlie <airlied at redhat.com> 6.12.2-7
 - revert rs690 fixes for now until we can research properly



From caillon at fedoraproject.org  Tue Apr 28 03:30:27 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:30:27 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.8,1.9
Message-ID: <20090428033027.C1B2E70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23128

Modified Files:
	mozvoikko.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.3.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mozvoikko.spec	26 Feb 2009 02:53:26 -0000	1.8
+++ mozvoikko.spec	28 Apr 2009 03:29:57 -0000	1.9
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.7
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc1%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.3.rc1
+- Rebuild against newer gecko
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-0.2.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:31:19 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:31:19 +0000 (UTC)
Subject: rpms/mugshot/devel mugshot.spec,1.42,1.43
Message-ID: <20090428033119.887B470129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/mugshot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23304

Modified Files:
	mugshot.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mugshot.spec	26 Feb 2009 03:18:27 -0000	1.42
+++ mugshot.spec	28 Apr 2009 03:30:49 -0000	1.43
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        9%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-9
+- Rebuild against newer gecko
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From caillon at fedoraproject.org  Tue Apr 28 03:32:01 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:32:01 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.36,1.37
Message-ID: <20090428033201.3ECB370129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23542

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-7
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ruby-gnome2.spec	28 Mar 2009 14:43:47 -0000	1.36
+++ ruby-gnome2.spec	28 Apr 2009 03:31:30 -0000	1.37
@@ -11,7 +11,7 @@
 
 Name:           ruby-gnome2
 Version:        0.18.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -742,6 +742,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-7
+- Rebuild against newer gecko
+
 * Sat Mar 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.18.1-6
 - Bump release again
 



From caillon at fedoraproject.org  Tue Apr 28 03:32:45 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:32:45 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed.spec,1.2,1.3
Message-ID: <20090428033245.9DB7D70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23740

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.1
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Gtk2-MozEmbed.spec	25 Apr 2009 06:25:52 -0000	1.2
+++ perl-Gtk2-MozEmbed.spec	28 Apr 2009 03:32:15 -0000	1.3
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}
+Release:       %{specfilever}%{?dist}.1
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.1
+- Rebuild against newer gecko
+
 * Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.08-6
 - fix release to fix NEVR issue (upgrade from F10)
 



From caillon at fedoraproject.org  Tue Apr 28 03:33:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 03:33:26 +0000 (UTC)
Subject: rpms/yelp/devel yelp.spec,1.156,1.157
Message-ID: <20090428033326.308BF70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23898

Modified Files:
	yelp.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-3
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- yelp.spec	6 Apr 2009 05:49:56 -0000	1.156
+++ yelp.spec	28 Apr 2009 03:32:55 -0000	1.157
@@ -19,7 +19,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.26/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -148,6 +148,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-3
+- Rebuild against newer gecko
+
 * Mon Apr  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Clean up Requires a bit
 



From whot at fedoraproject.org  Tue Apr 28 03:41:43 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 28 Apr 2009 03:41:43 +0000 (UTC)
Subject: rpms/libX11/F-10 libX11-1.1.5-nn_NO.patch, NONE, 1.1 libX11.spec,
	1.55, 1.56
Message-ID: <20090428034143.B4D2E70129@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libX11/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24793

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.5-nn_NO.patch 
Log Message:
* Tue Apr 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-4
- libX11-1.1.5-nn_NO.patch: add nn_NO.UTF-8  to compose.dir (#493556)



libX11-1.1.5-nn_NO.patch:

--- NEW FILE libX11-1.1.5-nn_NO.patch ---
>From ef5c446395aa30d7b1096a112e241a81c5b358e7 Mon Sep 17 00:00:00 2001
From: Xue Wei <Wei.Xue at Sun.COM>
Date: Fri, 20 Feb 2009 15:12:35 -0800
Subject: [PATCH] Add nn_NO.UTF-8 to compose.dir.pre for Norwegian Nynorsk

Sun bug 6691236: Swing applications dump core when locale is nn_NO.UTF-8
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6691236>

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 nls/compose.dir.pre |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index c5f11c8..22fb673 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -349,6 +349,7 @@ en_US.UTF-8/Compose:		mk_MK.UTF-8
 en_US.UTF-8/Compose:		ms_MY.UTF-8
 en_US.UTF-8/Compose:		nl_BE.UTF-8
 en_US.UTF-8/Compose:		nl_NL.UTF-8
+en_US.UTF-8/Compose:		nn_NO.UTF-8
 en_US.UTF-8/Compose:		no_NO.UTF-8
 en_US.UTF-8/Compose:		nb_NO.UTF-8
 en_US.UTF-8/Compose:		nr_ZA.UTF-8
-- 
1.6.3.rc1.2.gfa66a



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-10/libX11.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libX11.spec	6 Apr 2009 01:11:33 -0000	1.55
+++ libX11.spec	28 Apr 2009 03:41:12 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,6 +22,8 @@ Patch5: libX11-1.1.4-XF86Suspend.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=491813
 Patch7: libX11-1.1.5-rm-long-composites.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=493556, patch from upstream
+Patch8: libX11-1.1.5-nn_NO.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -66,6 +68,7 @@ X.Org X11 libX11 development package
 %patch4 -p1 -b .keysyms
 %patch5 -p1 -b .xf86suspend
 %patch7 -p1 -b .rm-long-composites
+%patch8 -p1 -b .nn_NO
 
 %build
 %configure \
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Apr 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-4
+- libX11-1.1.5-nn_NO.patch: add nn_NO.UTF-8  to compose.dir (#493556)
+
 * Tue Mar 31 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-3
 - libX11-1.1.5-rm-long-composites.patch: Re-remove long compositions that
   override shorter (#491813).



From pkgdb at fedoraproject.org  Tue Apr 28 04:05:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 04:05:56 +0000
Subject: [pkgdb] wireshark: joya0722 has requested watchcommits
Message-ID: <20090428040556.E420210F894@bastion2.fedora.phx.redhat.com>

joya0722 has requested the watchcommits acl on wireshark (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Tue Apr 28 04:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 04:13:30 +0000
Subject: [pkgdb] wireshark: joya0722 has given up watchcommits
Message-ID: <20090428041331.0CC4310F894@bastion2.fedora.phx.redhat.com>

joya0722 has given up the watchcommits acl on wireshark (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From cebbert at fedoraproject.org  Tue Apr 28 04:24:28 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 28 Apr 2009 04:24:28 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc3-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1057, 1.1058 kernel.spec, 1.1532, 1.1533 sources, 1.1016,
	1.1017 upstream, 1.930, 1.931 patch-2.6.30-rc3-git2.bz2.sign,
	1.1, NONE
Message-ID: <20090428042428.A25DC70129@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31053

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc3-git3.bz2.sign 
Removed Files:
	patch-2.6.30-rc3-git2.bz2.sign 
Log Message:
Linux 2.6.30-rc3-git3


--- NEW FILE patch-2.6.30-rc3-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ9kd8yGugalF9Dw4RAv7kAKCLIa0q5etBGdgIf2PVhwIKOekrNQCeMw5h
W7iXdU6Epth5rLcjPey1nVo=
=Cdsq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1057
retrieving revision 1.1058
diff -u -p -r1.1057 -r1.1058
--- .cvsignore	27 Apr 2009 13:55:22 -0000	1.1057
+++ .cvsignore	28 Apr 2009 04:23:57 -0000	1.1058
@@ -7,4 +7,4 @@ kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git2.bz2
+patch-2.6.30-rc3-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1532
retrieving revision 1.1533
diff -u -p -r1.1532 -r1.1533
--- kernel.spec	27 Apr 2009 13:55:22 -0000	1.1532
+++ kernel.spec	28 Apr 2009 04:23:57 -0000	1.1533
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1821,6 +1821,9 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.30-rc3-git3
+
 * Mon Apr 27 2009 Dave Jones <davej at redhat.com>
 - 2.6.30-rc3-git2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1016
retrieving revision 1.1017
diff -u -p -r1.1016 -r1.1017
--- sources	26 Apr 2009 05:18:34 -0000	1.1016
+++ sources	28 Apr 2009 04:23:57 -0000	1.1017
@@ -1,3 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 cd69d16ea42bbf20d0a505690be45868  patch-2.6.30-rc3.bz2
-e605eb05fc597c882fcb9098355a9da5  patch-2.6.30-rc3-git1.bz2
+a0df59cd25a8834625bff22be9e13569  patch-2.6.30-rc3-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -p -r1.930 -r1.931
--- upstream	27 Apr 2009 13:55:23 -0000	1.930
+++ upstream	28 Apr 2009 04:23:57 -0000	1.931
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git2.bz2
+patch-2.6.30-rc3-git3.bz2


--- patch-2.6.30-rc3-git2.bz2.sign DELETED ---



From caillon at fedoraproject.org  Tue Apr 28 04:31:21 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 04:31:21 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.227,1.228
Message-ID: <20090428043121.F1FED70129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32766

Modified Files:
	epiphany.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-3
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- epiphany.spec	27 Apr 2009 06:15:08 -0000	1.227
+++ epiphany.spec	28 Apr 2009 04:30:51 -0000	1.228
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 %define major_version 2.26
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-3
+- Rebuild against newer gecko
+
 * Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
 - Don't drop schemas translations from po files
 



From caillon at fedoraproject.org  Tue Apr 28 04:35:03 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 04:35:03 +0000 (UTC)
Subject: rpms/kazehakase/devel kazehakase.spec,1.82,1.83
Message-ID: <20090428043504.01D4670129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1109

Modified Files:
	kazehakase.spec 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- kazehakase.spec	21 Apr 2009 17:49:27 -0000	1.82
+++ kazehakase.spec	28 Apr 2009 04:34:33 -0000	1.83
@@ -45,7 +45,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -321,6 +321,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.1
+- Rebuild against newer gecko
+
 * Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-11.svn3771_trunk
 - rev 3771
 - Fix crash when downloading is cancalled



From cebbert at fedoraproject.org  Tue Apr 28 04:36:32 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 28 Apr 2009 04:36:32 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-iwl3945-remove-useless-exports.patch,
	NONE, 1.1 kernel.spec, 1.1533, 1.1534
Message-ID: <20090428043632.754E170129@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1468

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwl3945-remove-useless-exports.patch 
Log Message:
Drop unused exports from the iwl3945 driver.

linux-2.6-iwl3945-remove-useless-exports.patch:

--- NEW FILE linux-2.6-iwl3945-remove-useless-exports.patch ---
These exports are unnecessary because this object file is linked together
with all the files that use the functions.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
===================================================================
--- linux-2.6.29.noarch.orig/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_p
 	rxq->free_count = 0;
 	spin_unlock_irqrestore(&rxq->lock, flags);
 }
-EXPORT_SYMBOL(iwl3945_rx_queue_reset);
 
 /*
  * this should be called while priv->lock is locked
@@ -1745,7 +1744,6 @@ static void iwl3945_rx_queue_free(struct
 	rxq->bd = NULL;
 	rxq->rb_stts  = NULL;
 }
-EXPORT_SYMBOL(iwl3945_rx_queue_free);
 
 
 /* Convert linear signal-to-noise ratio into dB */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1533
retrieving revision 1.1534
diff -u -p -r1.1533 -r1.1534
--- kernel.spec	28 Apr 2009 04:23:57 -0000	1.1533
+++ kernel.spec	28 Apr 2009 04:36:02 -0000	1.1534
@@ -673,6 +673,8 @@ Patch3000: linux-2.6-btrfs-experimental-
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
+Patch9100: linux-2.6-iwl3945-remove-useless-exports.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1228,6 +1230,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
+ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1821,6 +1825,9 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30-0.72.rc3.git3
+- Drop unused exports from the iwl3945 driver.
+
 * Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.30-rc3-git3
 



From airlied at fedoraproject.org  Tue Apr 28 04:58:23 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 04:58:23 +0000 (UTC)
Subject: rpms/mesa/F-11 .cvsignore, 1.34, 1.35 mesa.spec, 1.243,
	1.244 radeon-rewrite.patch, 1.18, 1.19 sources, 1.34,
	1.35 mesa-7.5-get-driver-name.patch, 1.1,
	NONE radeon-rewrite-fixes.patch, 1.1, NONE
Message-ID: <20090428045823.546DF70129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4267

Modified Files:
	.cvsignore mesa.spec radeon-rewrite.patch sources 
Removed Files:
	mesa-7.5-get-driver-name.patch radeon-rewrite-fixes.patch 
Log Message:
* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 7.5-0.12
- rebase to upstream snapshot + radeon-rewrite



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	22 Mar 2009 02:20:15 -0000	1.34
+++ .cvsignore	28 Apr 2009 04:57:52 -0000	1.35
@@ -3,3 +3,4 @@ xdriinfo-1.0.2.tar.bz2
 MesaDemos-7.3.tar.bz2
 MesaLib-7.3.tar.bz2
 mesa-20090322.tar.bz2
+mesa-20090428.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- mesa.spec	16 Apr 2009 09:07:11 -0000	1.243
+++ mesa.spec	28 Apr 2009 04:57:52 -0000	1.244
@@ -14,13 +14,13 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090322
+%define gitdate 20090428
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,9 +48,6 @@ Patch9: intel-revert-vbl.patch
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
-Patch20: mesa-7.5-get-driver-name.patch
-Patch21: radeon-rewrite-fixes.patch
-
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.5-1
@@ -178,8 +175,6 @@ This package provides some demo applicat
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
-%patch20 -p1 -b .get-driver-name
-%patch21 -p1 -b .radfixes
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -436,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 7.5-0.12
+- rebase to upstream snapshot + radeon-rewrite
+
 * Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 7.5-0.11
 - radeon-rewrite-fixes.patch: fix context crash in compiz + r200 fixes
 

radeon-rewrite.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.18 -r 1.19 radeon-rewrite.patch
Index: radeon-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/radeon-rewrite.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- radeon-rewrite.patch	7 Apr 2009 08:57:01 -0000	1.18
+++ radeon-rewrite.patch	28 Apr 2009 04:57:52 -0000	1.19
@@ -12,10 +12,10 @@ index b61d7f3..0f9306d 100644
  # Assembler
  MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
 diff --git a/configure.ac b/configure.ac
-index 46070fd..4164d37 100644
+index 8412cdc..231b7e9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -456,6 +456,8 @@ AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
+@@ -446,6 +446,8 @@ AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
  AC_SUBST([GALLIUM_DRIVERS_DIRS])
  AC_SUBST([GALLIUM_AUXILIARY_DIRS])
  AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
@@ -24,7 +24,7 @@ index 46070fd..4164d37 100644
  
  dnl
  dnl User supplied program configuration
-@@ -583,6 +585,13 @@ dri)
+@@ -573,6 +575,13 @@ dri)
      GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
      DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
  
@@ -38,6 +38,96 @@ index 46070fd..4164d37 100644
      # find the DRI deps for libGL
      if test "$x11_pkgconfig" = yes; then
          # add xcb modules if necessary
+diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
+index e112720..ae0e61e 100644
+--- a/src/mesa/drivers/dri/common/dri_util.c
++++ b/src/mesa/drivers/dri/common/dri_util.c
+@@ -37,6 +37,9 @@
+ typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRIdrawable *drawable, int32_t *numerator, int32_t *denominator);
+ #endif
+ 
++static void dri_get_drawable(__DRIdrawable *pdp);
++static void dri_put_drawable(__DRIdrawable *pdp);
++
+ /**
+  * This is just a token extension used to signal that the driver
+  * supports setting a read drawable.
+@@ -127,7 +130,7 @@ static int driUnbindContext(__DRIcontext *pcp)
+ 	return GL_FALSE;
+     }
+ 
+-    pdp->refcount--;
++    dri_put_drawable(pdp);
+ 
+     if (prp != pdp) {
+         if (prp->refcount == 0) {
+@@ -135,7 +138,7 @@ static int driUnbindContext(__DRIcontext *pcp)
+ 	    return GL_FALSE;
+ 	}
+ 
+-	prp->refcount--;
++    	dri_put_drawable(prp);
+     }
+ 
+ 
+@@ -170,10 +173,10 @@ static int driBindContext(__DRIcontext *pcp,
+ 	pcp->driReadablePriv = prp;
+ 	if (pdp) {
+ 	    pdp->driContextPriv = pcp;
+-	    pdp->refcount++;
++    	    dri_get_drawable(pdp);
+ 	}
+ 	if ( prp && pdp != prp ) {
+-	    prp->refcount++;
++    	    dri_get_drawable(prp);
+ 	}
+     }
+ 
+@@ -430,7 +433,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
+ 
+     pdp->loaderPrivate = data;
+     pdp->hHWDrawable = hwDrawable;
+-    pdp->refcount = 0;
++    pdp->refcount = 1;
+     pdp->pStamp = NULL;
+     pdp->lastStamp = 0;
+     pdp->index = 0;
+@@ -483,12 +486,19 @@ dri2CreateNewDrawable(__DRIscreen *screen,
+     return pdraw;
+ }
+ 
+-
+-static void
+-driDestroyDrawable(__DRIdrawable *pdp)
++static void dri_get_drawable(__DRIdrawable *pdp)
++{
++    pdp->refcount++;
++}
++	
++static void dri_put_drawable(__DRIdrawable *pdp)
+ {
+     __DRIscreenPrivate *psp;
+ 
++    pdp->refcount--;
++    if (pdp->refcount)
++	return;
++
+     if (pdp) {
+ 	psp = pdp->driScreenPriv;
+         (*psp->DriverAPI.DestroyBuffer)(pdp);
+@@ -504,6 +514,12 @@ driDestroyDrawable(__DRIdrawable *pdp)
+     }
+ }
+ 
++static void
++driDestroyDrawable(__DRIdrawable *pdp)
++{
++    dri_put_drawable(pdp);
++}
++
+ /*@}*/
+ 
+ 
 diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
 index e9144ac..6a246ed 100644
 --- a/src/mesa/drivers/dri/r200/Makefile
@@ -125,7 +215,7 @@ index e9144ac..6a246ed 100644
  ##### TARGETS #####
  
 diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
-index e163377..3a11a44 100644
+index e163377..e34ea96 100644
 --- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
 +++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
 @@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -422,21 +512,21 @@ index e163377..3a11a44 100644
 +   rmesa->radeon.dma.flush = NULL;
 +
 +   elt_used = (elt_used + 2) & ~2;
++
++   nr = elt_used / 2;
  
 -   assert( rmesa->dma.flush == r200FlushElts );
 -   rmesa->dma.flush = NULL;
-+   nr = elt_used / 2;
++   radeon_bo_unmap(rmesa->radeon.tcl.elt_dma_bo);
  
 -   /* Cope with odd number of elts:
 -    */
 -   rmesa->store.cmd_used = (rmesa->store.cmd_used + 2) & ~2;
 -   dwords = (rmesa->store.cmd_used - rmesa->store.elts_start) / 4;
-+   radeon_bo_unmap(rmesa->radeon.tcl.elt_dma_bo);
++   r200FireEB(rmesa, nr, rmesa->tcl.hw_primitive);
  
 -   cmd[1] |= (dwords - 3) << 16;
 -   cmd[2] |= nr << R200_VF_VERTEX_NUMBER_SHIFT;
-+   r200FireEB(rmesa, nr, rmesa->tcl.hw_primitive);
-+
 +   radeon_bo_unref(rmesa->radeon.tcl.elt_dma_bo);
 +   rmesa->radeon.tcl.elt_dma_bo = NULL;
  
@@ -455,7 +545,7 @@ index e163377..3a11a44 100644
     GLushort *retval;
  
     if (R200_DEBUG & DEBUG_IOCTL)
-@@ -269,30 +201,25 @@ GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
+@@ -269,30 +201,30 @@ GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
  
     assert((primitive & R200_VF_PRIM_WALK_IND));
     
@@ -476,6 +566,11 @@ index e163377..3a11a44 100644
 +					  RADEON_GEM_DOMAIN_GTT, 0);
 +   rmesa->radeon.tcl.elt_dma_offset = 0;
 +   rmesa->tcl.elt_used = min_nr * 2;
++
++   radeon_validate_bo(&rmesa->radeon, rmesa->radeon.tcl.elt_dma_bo,
++                      RADEON_GEM_DOMAIN_GTT, 0);
++   if (radeon_revalidate_bos(rmesa->radeon.glCtx) == GL_FALSE)
++      fprintf(stderr,"failure to revalidate BOs - badness\n");
  
 +   radeon_bo_map(rmesa->radeon.tcl.elt_dma_bo, 1);
 +   retval = rmesa->radeon.tcl.elt_dma_bo->ptr + rmesa->radeon.tcl.elt_dma_offset;
@@ -500,7 +595,7 @@ index e163377..3a11a44 100644
  
     return retval;
  }
-@@ -300,129 +227,119 @@ GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
+@@ -300,129 +232,119 @@ GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
  
  
  void r200EmitVertexAOS( r200ContextPtr rmesa,
@@ -4354,7 +4449,7 @@ index bae5644..0000000
 -
 -#endif
 diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
-index 0eaaaf6..1b9724d 100644
+index 2fcc87c..ebf389e 100644
 --- a/src/mesa/drivers/dri/r200/r200_state.c
 +++ b/src/mesa/drivers/dri/r200/r200_state.c
[...5373 lines suppressed...]
++   OUT_BATCH(CP_PACKET0(RADEON_RE_WIDTH_HEIGHT, 0));
++   if (rrb) {
++       OUT_BATCH(((rrb->width - 1) << RADEON_RE_WIDTH_SHIFT) |
++                 ((rrb->height - 1) << RADEON_RE_HEIGHT_SHIFT));
++   } else {
++       OUT_BATCH(0);
++   }
++   END_BATCH();
 +}
 +
 +static void cube_emit(GLcontext *ctx, struct radeon_state_atom *atom)
@@ -33030,7 +36083,7 @@ index 57dc380..174a7e1 100644
     ALLOC_STATE( lin, always, LIN_STATE_SIZE, "LIN/line", 0 );
     ALLOC_STATE( msk, always, MSK_STATE_SIZE, "MSK/mask", 0 );
     ALLOC_STATE( vpt, always, VPT_STATE_SIZE, "VPT/viewport", 0 );
-@@ -233,20 +626,29 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -233,20 +637,29 @@ void radeonInitState( radeonContextPtr rmesa )
     ALLOC_STATE( fog, fog, FOG_STATE_SIZE, "FOG/fog", 1 );
     ALLOC_STATE( glt, tcl_lighting, GLT_STATE_SIZE, "GLT/light-global", 1 );
     ALLOC_STATE( eye, tcl_lighting, EYE_STATE_SIZE, "EYE/eye-vector", 1 );
@@ -33070,7 +36123,7 @@ index 57dc380..174a7e1 100644
     }
     ALLOC_STATE( mat[0], tcl, MAT_STATE_SIZE, "MAT/modelproject", 1 );
     ALLOC_STATE( mat[1], tcl_eyespace_or_fog, MAT_STATE_SIZE, "MAT/modelview", 1 );
-@@ -268,43 +670,43 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -268,43 +681,43 @@ void radeonInitState( radeonContextPtr rmesa )
     ALLOC_STATE( lit[5], tcl_lit5, LIT_STATE_SIZE, "LIT/light-5", 1 );
     ALLOC_STATE( lit[6], tcl_lit6, LIT_STATE_SIZE, "LIT/light-6", 1 );
     ALLOC_STATE( lit[7], tcl_lit7, LIT_STATE_SIZE, "LIT/light-7", 1 );
@@ -33145,7 +36198,7 @@ index 57dc380..174a7e1 100644
     rmesa->hw.grd.cmd[GRD_CMD_0] = 
        cmdscl( RADEON_SS_VERT_GUARD_CLIP_ADJ_ADDR, 1, 4 );
     rmesa->hw.fog.cmd[FOG_CMD_0] = 
-@@ -331,6 +733,22 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -331,6 +744,22 @@ void radeonInitState( radeonContextPtr rmesa )
  	 cmdvec( RADEON_VS_UCP_ADDR + i, 1, 4 );
     }
  
@@ -33168,7 +36221,7 @@ index 57dc380..174a7e1 100644
     rmesa->last_ReallyEnabled = -1;
  
     /* Initial Harware state:
-@@ -352,19 +770,7 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -352,19 +781,7 @@ void radeonInitState( radeonContextPtr rmesa )
  					    RADEON_SRC_BLEND_GL_ONE |
  					    RADEON_DST_BLEND_GL_ZERO );
  
@@ -33189,7 +36242,7 @@ index 57dc380..174a7e1 100644
  					       RADEON_STENCIL_TEST_ALWAYS |
  					       RADEON_STENCIL_FAIL_KEEP |
  					       RADEON_STENCIL_ZPASS_KEEP |
-@@ -374,7 +780,7 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -374,7 +791,7 @@ void radeonInitState( radeonContextPtr rmesa )
     if (rmesa->using_hyperz) {
         rmesa->hw.ctx.cmd[CTX_RB3D_ZSTENCILCNTL] |= RADEON_Z_COMPRESSION_ENABLE |
  						   RADEON_Z_DECOMPRESSION_ENABLE;
@@ -33198,7 +36251,7 @@ index 57dc380..174a7e1 100644
  	 /* works for q3, but slight rendering errors with glxgears ? */
  /*	 rmesa->hw.ctx.cmd[CTX_RB3D_ZSTENCILCNTL] |= RADEON_Z_HIERARCHY_ENABLE;*/
  	 /* need this otherwise get lots of lockups with q3 ??? */
-@@ -386,10 +792,9 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -386,10 +803,9 @@ void radeonInitState( radeonContextPtr rmesa )
  				     RADEON_ANTI_ALIAS_NONE);
  
     rmesa->hw.ctx.cmd[CTX_RB3D_CNTL] = (RADEON_PLANE_MASK_ENABLE |
@@ -33210,7 +36263,7 @@ index 57dc380..174a7e1 100644
     case DRI_CONF_DITHER_XERRORDIFFRESET:
        rmesa->hw.ctx.cmd[CTX_RB3D_CNTL] |= RADEON_DITHER_INIT;
        break;
-@@ -397,31 +802,18 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -397,31 +813,18 @@ void radeonInitState( radeonContextPtr rmesa )
        rmesa->hw.ctx.cmd[CTX_RB3D_CNTL] |= RADEON_SCALE_DITHER_ENABLE;
        break;
     }
@@ -33247,7 +36300,7 @@ index 57dc380..174a7e1 100644
     rmesa->hw.set.cmd[SET_SE_CNTL] = (RADEON_FFACE_CULL_CCW |
  				     RADEON_BFACE_SOLID |
  				     RADEON_FFACE_SOLID |
-@@ -444,7 +836,7 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -444,7 +847,7 @@ void radeonInitState( radeonContextPtr rmesa )
    					    RADEON_VC_NO_SWAP;
  #endif
  
@@ -33256,7 +36309,7 @@ index 57dc380..174a7e1 100644
       rmesa->hw.set.cmd[SET_SE_CNTL_STATUS] |= RADEON_TCL_BYPASS;
     }
  
-@@ -491,8 +883,8 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -491,8 +894,8 @@ void radeonInitState( radeonContextPtr rmesa )
  	   (2 << RADEON_TXFORMAT_HEIGHT_SHIFT));
  
        /* Initialize the texture offset to the start of the card texture heap */
@@ -33267,7 +36320,7 @@ index 57dc380..174a7e1 100644
  
        rmesa->hw.tex[i].cmd[TEX_PP_BORDER_COLOR] = 0;
        rmesa->hw.tex[i].cmd[TEX_PP_TXCBLEND] =  
-@@ -513,15 +905,15 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -513,15 +916,15 @@ void radeonInitState( radeonContextPtr rmesa )
  
        rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_FACES] = 0;
        rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_0] =
@@ -33288,7 +36341,7 @@ index 57dc380..174a7e1 100644
     }
  
     /* Can only add ST1 at the time of doing some multitex but can keep
-@@ -613,5 +1005,7 @@ void radeonInitState( radeonContextPtr rmesa )
+@@ -613,5 +1016,7 @@ void radeonInitState( radeonContextPtr rmesa )
     rmesa->hw.eye.cmd[EYE_Z] = IEEE_ONE;
     rmesa->hw.eye.cmd[EYE_RESCALE_FACTOR] = IEEE_ONE;
     
@@ -33972,7 +37025,7 @@ index 779e9ae..df6708f 100644
  	 if (RADEON_DEBUG & DEBUG_FALLBACKS) 
  	    fprintf(stderr, "Radeon end tcl fallback %s\n",
 diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c
-index b0aec21..21509c6 100644
+index f2b6deb..2549d5c 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c
 @@ -44,6 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -33998,7 +37051,7 @@ index b0aec21..21509c6 100644
        switch ( minf ) {
        case GL_NEAREST:
        case GL_NEAREST_MIPMAP_NEAREST:
-@@ -244,433 +248,13 @@ static void radeonSetTexBorderColor( radeonTexObjPtr t, GLubyte c[4] )
+@@ -249,433 +253,13 @@ static void radeonSetTexBorderColor( radeonTexObjPtr t, const GLfloat color[4] )
     t->pp_border_color = radeonPackColor( 4, c[0], c[1], c[2], c[3] );
  }
  
@@ -34034,7 +37087,7 @@ index b0aec21..21509c6 100644
 -      radeonSetTexWrap( t, texObj->WrapS, texObj->WrapT );
 -      radeonSetTexMaxAnisotropy( t, texObj->MaxAnisotropy );
 -      radeonSetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
--      radeonSetTexBorderColor( t, texObj->_BorderChan );
+-      radeonSetTexBorderColor( t, texObj->BorderColor );
 -   }
 -
 -   return t;
@@ -34433,7 +37486,7 @@ index b0aec21..21509c6 100644
     GLuint unit = ctx->Texture.CurrentUnit;
     struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
  
-@@ -701,7 +285,7 @@ static void radeonTexEnv( GLcontext *ctx, GLenum target,
+@@ -706,7 +290,7 @@ static void radeonTexEnv( GLcontext *ctx, GLenum target,
         * functions, one mapping [-1.0,0.0] to [-128,0] and one mapping
         * [0.0,4.0] to [0,127].
         */
@@ -34442,7 +37495,7 @@ index b0aec21..21509c6 100644
  	  0.0 : -1.0;
        bias = CLAMP( *param, min, 4.0 );
        if ( bias == 0 ) {
-@@ -734,7 +318,7 @@ static void radeonTexParameter( GLcontext *ctx, GLenum target,
+@@ -739,7 +323,7 @@ static void radeonTexParameter( GLcontext *ctx, GLenum target,
  				struct gl_texture_object *texObj,
  				GLenum pname, const GLfloat *params )
  {
@@ -34451,7 +37504,7 @@ index b0aec21..21509c6 100644
  
     if ( RADEON_DEBUG & (DEBUG_STATE|DEBUG_TEXTURE) ) {
        fprintf( stderr, "%s( %s )\n", __FUNCTION__,
-@@ -762,57 +346,51 @@ static void radeonTexParameter( GLcontext *ctx, GLenum target,
+@@ -767,57 +351,51 @@ static void radeonTexParameter( GLcontext *ctx, GLenum target,
     case GL_TEXTURE_MAX_LEVEL:
     case GL_TEXTURE_MIN_LOD:
     case GL_TEXTURE_MAX_LOD:
@@ -34531,7 +37584,7 @@ index b0aec21..21509c6 100644
     /* Free mipmap images and the texture object itself */
     _mesa_delete_texture_object(ctx, texObj);
  }
-@@ -832,7 +410,7 @@ static void radeonTexGen( GLcontext *ctx,
+@@ -837,7 +415,7 @@ static void radeonTexGen( GLcontext *ctx,
  			  GLenum pname,
  			  const GLfloat *params )
  {
@@ -34540,7 +37593,7 @@ index b0aec21..21509c6 100644
     GLuint unit = ctx->Texture.CurrentUnit;
     rmesa->recheck_texgen[unit] = GL_TRUE;
  }
-@@ -846,29 +424,40 @@ static void radeonTexGen( GLcontext *ctx,
+@@ -851,29 +429,40 @@ static void radeonTexGen( GLcontext *ctx,
  static struct gl_texture_object *
  radeonNewTextureObject( GLcontext *ctx, GLuint name, GLenum target )
  {
@@ -34567,7 +37620,7 @@ index b0aec21..21509c6 100644
 +   radeonSetTexWrap( t, t->base.WrapS, t->base.WrapT );
 +   radeonSetTexMaxAnisotropy( t, t->base.MaxAnisotropy );
 +   radeonSetTexFilter( t, t->base.MinFilter, t->base.MagFilter );
-+   radeonSetTexBorderColor( t, t->base._BorderChan );
++   radeonSetTexBorderColor( t, t->base.BorderColor );
 +   return &t->base;
  }
  
@@ -34592,7 +37645,7 @@ index b0aec21..21509c6 100644
  
     functions->TexEnv			= radeonTexEnv;
     functions->TexParameter		= radeonTexParameter;
-@@ -877,5 +466,12 @@ void radeonInitTextureFuncs( struct dd_function_table *functions )
+@@ -882,5 +471,12 @@ void radeonInitTextureFuncs( struct dd_function_table *functions )
     functions->CompressedTexImage2D	= radeonCompressedTexImage2D;
     functions->CompressedTexSubImage2D	= radeonCompressedTexSubImage2D;
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	22 Mar 2009 02:20:16 -0000	1.34
+++ sources	28 Apr 2009 04:57:52 -0000	1.35
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-2469ad7640d26d1aed61452cfe62fd49  mesa-20090322.tar.bz2
+d7ff7c44fe42f2639845a2975804792d  mesa-20090428.tar.bz2


--- mesa-7.5-get-driver-name.patch DELETED ---


--- radeon-rewrite-fixes.patch DELETED ---



From lucilanga at fedoraproject.org  Tue Apr 28 05:16:38 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 28 Apr 2009 05:16:38 +0000 (UTC)
Subject: rpms/scummvm/devel .cvsignore, 1.8, 1.9 scummvm.spec, 1.16,
	1.17 sources, 1.8, 1.9
Message-ID: <20090428051638.7809D70129@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/scummvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6413

Modified Files:
	.cvsignore scummvm.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Mar 2009 18:35:36 -0000	1.8
+++ .cvsignore	28 Apr 2009 05:16:08 -0000	1.9
@@ -1,2 +1 @@
-scummvm-0.13.0.tar.bz2
-scummvm-icons.tar.gz
+scummvm-0.13.1.tar.bz2


Index: scummvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- scummvm.spec	9 Mar 2009 18:35:37 -0000	1.16
+++ scummvm.spec	28 Apr 2009 05:16:08 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           scummvm
-Version:        0.13.0
+Version:        0.13.1
 Release:        1%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
@@ -100,6 +100,9 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.1-1
+- new upstream release
+
 * Mon Mar 09 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.0-1
 - new upstream release
 - update patch0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Mar 2009 18:35:37 -0000	1.8
+++ sources	28 Apr 2009 05:16:08 -0000	1.9
@@ -1,2 +1 @@
-85225f7b7d6d2ce9147f76743ba7ca68  scummvm-0.13.0.tar.bz2
-b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz
+843d9cd4470022bd3b269eb84298dc16  scummvm-0.13.1.tar.bz2



From airlied at fedoraproject.org  Tue Apr 28 05:22:06 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 05:22:06 +0000 (UTC)
Subject: rpms/mesa/F-11 mesa.spec,1.244,1.245
Message-ID: <20090428052206.9F86F70129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7940

Modified Files:
	mesa.spec 
Log Message:
mesa: remove missing files



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- mesa.spec	28 Apr 2009 04:57:52 -0000	1.244
+++ mesa.spec	28 Apr 2009 05:21:36 -0000	1.245
@@ -394,9 +394,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/geartrain
 %{_bindir}/glinfo
 %{_bindir}/gloss
-%{_bindir}/glslnoise
 %{_bindir}/gltestperf
-%{_bindir}/glutfx
 %{_bindir}/ipers
 %{_bindir}/isosurf
 %{_bindir}/lodbias
@@ -414,14 +412,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/spectex
 %{_bindir}/spriteblast
 %{_bindir}/stex3d
-%{_bindir}/streaming_rect
 %{_bindir}/teapot
 %{_bindir}/terrain
 %{_bindir}/tessdemo
 %{_bindir}/texcyl
-%{_bindir}/texdown
 %{_bindir}/texenv
-%{_bindir}/texobj
 %{_bindir}/textures
 %{_bindir}/trispd
 %{_bindir}/tunnel



From quaid at fedoraproject.org  Tue Apr 28 05:22:53 2009
From: quaid at fedoraproject.org (Karsten Wade)
Date: Tue, 28 Apr 2009 05:22:53 +0000 (UTC)
Subject: CVSROOT avail,1.60,1.61
Message-ID: <20090428052253.EDB6C70129@cvs1.fedora.phx.redhat.com>

Author: quaid

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8288

Modified Files:
	avail 
Log Message:
adding writers to be able to publish their own work fergawsakes


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- avail	25 Mar 2009 17:11:11 -0000	1.60
+++ avail	28 Apr 2009 05:22:53 -0000	1.61
@@ -34,7 +34,10 @@
 avail | eitch,mdomsch | web/html/Download
 avail | mdious,sparks | web/html/docs/selinux-guide
 avail | mdious,sparks,sradvan | web/html/docs/selinux-user-guide
-avail | sparks | web/html/docs/security-guide
+avail | sparks,sradvan | web/html/docs/security-guide
+avail | rlandmann | web/html/docs/install-guide
+avail | rlandmann | web/html/docs/user-guide
+
 
 # Fedora security repository
 unavail | | fedora-security
@@ -46,4 +49,3 @@
 avail | trassl,kevin,dercorny,eteo | fedora-security
 
 avail | eitch | web/html/docs
-avail | tchung | web/static



From airlied at fedoraproject.org  Tue Apr 28 05:34:42 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 05:34:42 +0000 (UTC)
Subject: rpms/mesa/F-11 mesa.spec,1.245,1.246
Message-ID: <20090428053443.00F6070129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10506

Modified Files:
	mesa.spec 
Log Message:
mesa: add missing demo files



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- mesa.spec	28 Apr 2009 05:21:36 -0000	1.245
+++ mesa.spec	28 Apr 2009 05:34:12 -0000	1.246
@@ -381,9 +381,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/clearspd
 %{_bindir}/copypix
 %{_bindir}/cubemap
+%{_bindir}/dinoshade
 %{_bindir}/drawpix
 %{_bindir}/engine
 %{_bindir}/fbo_firecube
+%{_bindir}/fbotexture
 %{_bindir}/fire
 %{_bindir}/fogcoord
 %{_bindir}/fplight
@@ -402,6 +404,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/multiarb
 %{_bindir}/paltex
 %{_bindir}/pointblast
+%{_bindir}/projtex
 %{_bindir}/mesa-rain
 %{_bindir}/ray
 %{_bindir}/readpix



From pgordon at fedoraproject.org  Tue Apr 28 05:35:27 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 28 Apr 2009 05:35:27 +0000 (UTC)
Subject: rpms/rb_libtorrent/devel .cvsignore, 1.7, 1.8 rb_libtorrent.spec,
	1.22, 1.23 sources, 1.7, 1.8
Message-ID: <20090428053527.86B0970129@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/rb_libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10664/devel

Modified Files:
	.cvsignore rb_libtorrent.spec sources 
Log Message:
Update to 0.14.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Feb 2009 00:52:47 -0000	1.7
+++ .cvsignore	28 Apr 2009 05:34:57 -0000	1.8
@@ -1 +1 @@
-libtorrent-rasterbar-0.14.2.tar.gz
+libtorrent-rasterbar-0.14.3.tar.gz


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- rb_libtorrent.spec	25 Feb 2009 18:56:13 -0000	1.22
+++ rb_libtorrent.spec	28 Apr 2009 05:34:57 -0000	1.23
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		rb_libtorrent
-Version:	0.14.2
-Release:	2%{?dist}
+Version:	0.14.3
+Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -182,6 +182,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 27 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.3-1
+- Update to new upstream bug-fix release (0.14.3).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Feb 2009 00:52:47 -0000	1.7
+++ sources	28 Apr 2009 05:34:57 -0000	1.8
@@ -1 +1 @@
-97bb2db5ac21e9a81c96fc0e2abe6d29  libtorrent-rasterbar-0.14.2.tar.gz
+6ce3148f8fbddbdfa472ef3c4c4cae61  libtorrent-rasterbar-0.14.3.tar.gz



From pgordon at fedoraproject.org  Tue Apr 28 05:35:27 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 28 Apr 2009 05:35:27 +0000 (UTC)
Subject: rpms/rb_libtorrent/F-11 .cvsignore, 1.7, 1.8 rb_libtorrent.spec,
	1.22, 1.23 sources, 1.7, 1.8
Message-ID: <20090428053527.D2CEA70129@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/rb_libtorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10664/F-11

Modified Files:
	.cvsignore rb_libtorrent.spec sources 
Log Message:
Update to 0.14.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Feb 2009 00:52:47 -0000	1.7
+++ .cvsignore	28 Apr 2009 05:34:57 -0000	1.8
@@ -1 +1 @@
-libtorrent-rasterbar-0.14.2.tar.gz
+libtorrent-rasterbar-0.14.3.tar.gz


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-11/rb_libtorrent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- rb_libtorrent.spec	25 Feb 2009 18:56:13 -0000	1.22
+++ rb_libtorrent.spec	28 Apr 2009 05:34:57 -0000	1.23
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		rb_libtorrent
-Version:	0.14.2
-Release:	2%{?dist}
+Version:	0.14.3
+Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -182,6 +182,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 27 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.3-1
+- Update to new upstream bug-fix release (0.14.3).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Feb 2009 00:52:47 -0000	1.7
+++ sources	28 Apr 2009 05:34:57 -0000	1.8
@@ -1 +1 @@
-97bb2db5ac21e9a81c96fc0e2abe6d29  libtorrent-rasterbar-0.14.2.tar.gz
+6ce3148f8fbddbdfa472ef3c4c4cae61  libtorrent-rasterbar-0.14.3.tar.gz



From lucilanga at fedoraproject.org  Tue Apr 28 05:41:18 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 28 Apr 2009 05:41:18 +0000 (UTC)
Subject: rpms/scummvm/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <20090428054118.C0F6A70129@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/scummvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11860

Modified Files:
	.cvsignore sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Apr 2009 05:16:08 -0000	1.9
+++ .cvsignore	28 Apr 2009 05:40:48 -0000	1.10
@@ -1 +1,2 @@
 scummvm-0.13.1.tar.bz2
+scummvm-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Apr 2009 05:16:08 -0000	1.9
+++ sources	28 Apr 2009 05:40:48 -0000	1.10
@@ -1 +1,2 @@
 843d9cd4470022bd3b269eb84298dc16  scummvm-0.13.1.tar.bz2
+b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz



From phuang at fedoraproject.org  Tue Apr 28 05:41:42 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 28 Apr 2009 05:41:42 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.30, 1.31 ibus-HEAD.patch, 1.16,
	1.17 sources, 1.34, 1.35
Message-ID: <20090428054142.D55B170129@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11904

Modified Files:
	.cvsignore ibus-HEAD.patch sources 
Log Message:
Port F-11 branch to devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	17 Apr 2009 10:57:05 -0000	1.30
+++ .cvsignore	28 Apr 2009 05:41:12 -0000	1.31
@@ -1 +1 @@
-ibus-1.1.0.20090417.tar.gz
+ibus-1.1.0.20090423.tar.gz

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ibus-HEAD.patch	17 Apr 2009 10:57:05 -0000	1.16
+++ ibus-HEAD.patch	28 Apr 2009 05:41:12 -0000	1.17
@@ -0,0 +1,857 @@
+diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in
+index fcf2f21..cd2ad60 100644
+--- a/bus/ibus.desktop.in
++++ b/bus/ibus.desktop.in
+@@ -7,7 +7,7 @@ Exec=ibus-daemon --xim
+ Icon=ibus
+ Terminal=false
+ Type=Application
+-X-GNOME-Autostart-Phase=Panel
++X-GNOME-Autostart-Phase=Applications
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
+ X-KDE-autostart-after=panel
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index 456e049..7003bd7 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -2091,10 +2091,10 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
+         return TRUE;
+     }
+     else if (event == next_factory) {
+-        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+-        if (priv->engine && !priv->enabled) {
+-            bus_input_context_enable (context);
++        if (priv->engine == NULL || priv->enabled == FALSE) {
++            return FALSE;
+         }
++        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+         return TRUE;
+     }
+     else if (event == prev_factory) {
+diff --git a/bus/server.c b/bus/server.c
+index 7245bd3..1c796f2 100644
+--- a/bus/server.c
++++ b/bus/server.c
+@@ -86,21 +86,23 @@ bus_server_listen (BusServer *server)
+ 
+     // const gchar *address = "unix:abstract=/tmp/ibus-c"
+     const gchar *address;
+-    gchar *path;
++    const gchar *path;
+     gboolean retval;
+ 
+-    path = g_strdup_printf("/tmp/ibus-%s", ibus_get_user_name ());
+-    mkdir (path, 0775);
++    path = ibus_get_socket_folder ();
++    mkdir (path, 0700);
++    chmod (path, 0700);
++
+     address = ibus_get_address ();
+ 
+     retval = ibus_server_listen (IBUS_SERVER (server), address);
++    chmod (ibus_get_socket_path (), 0600);
+ 
+     if (!retval) {
+         g_printerr ("Can not listen on %s! Please try remove directory %s and run again.", address, path);
+         exit (-1);
+     }
+ 
+-    g_free(path);
+     return retval;
+ }
+ 
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 5da4dec..168e45a 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -190,14 +190,20 @@ _key_snooper_cb (GtkWidget   *widget,
+     IBusIMContext *ibusimcontext;
+     ibusimcontext = (IBusIMContext *) _focus_im_context;
+ 
+-    if (!_use_key_snooper)
++    if (G_UNLIKELY (!_use_key_snooper))
+         return retval;
+ 
+     if (ibusimcontext == NULL)
+-        return retval;
++        return FALSE;
+ 
+-    if (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE)
+-        return retval;
++    if (G_UNLIKELY (ibusimcontext->ibuscontext == NULL || ibusimcontext->has_focus == FALSE))
++        return FALSE;
++
++    if (G_UNLIKELY (event->state & IBUS_HANDLED_MASK))
++        return TRUE;
++
++    if (G_UNLIKELY (event->state & IBUS_IGNORED_MASK))
++        return FALSE;
+ 
+     switch (event->type) {
+     case GDK_KEY_RELEASE:
+@@ -212,6 +218,14 @@ _key_snooper_cb (GtkWidget   *widget,
+         break;
+     default:
+         retval = FALSE;
++        break;
++    }
++
++    if (retval) {
++        event->state |= IBUS_HANDLED_MASK;
++    }
++    else {
++        event->state |= IBUS_IGNORED_MASK;
+     }
+ 
+     return retval;
+@@ -383,11 +397,18 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
+ 
+     IBusIMContext *ibusimcontext = (IBusIMContext *) context;
+ 
+-    if (ibusimcontext->ibuscontext && ibusimcontext->has_focus) {
++    if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
+         /* If context does not have focus, ibus will process key event in sync mode.
+          * It is a workaround for increase search in treeview.
+          */
+-        gboolean retval;
++        gboolean retval = FALSE;
++
++        if (event->state & IBUS_HANDLED_MASK)
++            return TRUE;
++
++        if (event->state & IBUS_IGNORED_MASK)
++            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++
+         switch (event->type) {
+         case GDK_KEY_RELEASE:
+             retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
+@@ -404,9 +425,13 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
+         }
+ 
+         if (retval) {
++            event->state |= IBUS_HANDLED_MASK;
+             return TRUE;
+         }
+-        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++        else {
++            event->state |= IBUS_IGNORED_MASK;
++            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
++        }
+     }
+     else {
+         return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
+index be4b980..a976eec 100644
+--- a/data/ibus.schemas.in
++++ b/data/ibus.schemas.in
+@@ -18,7 +18,7 @@
+       <owner>ibus</owner>
+       <type>list</type>
+       <list_type>string</list_type>
+-      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul]</default>
++      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul,Alt+Release+Alt_R]</default>
+       <locale name="C">
+         <short>Trigger Hotkey</short>
+ 	    <long>Trigger hotkey for enable or disable input context</long>
+diff --git a/ibus/common.py b/ibus/common.py
+index 527d3a5..571ebaa 100644
+--- a/ibus/common.py
++++ b/ibus/common.py
+@@ -67,7 +67,12 @@ if not __username:
+ if not __username:
+     __username = os.getenv ("USERNAME")
+ 
+-IBUS_ADDR = "unix:path=/tmp/ibus-%s/ibus-%s-%s" % (__username, __hostname, __display_number)
++__session_id = os.getenv ("IBUS_SESSION_ID")
++
++IBUS_ADDR = "unix:path=/tmp/ibus-%s%s/ibus-%s-%s" % (__username,
++                                                     "-" + __session_id if __session_id else "",
++                                                     __hostname,
++                                                     __display_number)
+ # IBUS_ADDR  = "tcp:host=localhost,port=7799"
+ 
+ IBUS_IFACE_IBUS     = "org.freedesktop.IBus"
+diff --git a/ibus/modifier.py b/ibus/modifier.py
+index 7f6afad..56d8be9 100644
+--- a/ibus/modifier.py
++++ b/ibus/modifier.py
+@@ -33,11 +33,15 @@ BUTTON2_MASK = 1 << 9
+ BUTTON3_MASK = 1 << 10
+ BUTTON4_MASK = 1 << 11
+ BUTTON5_MASK = 1 << 12
+-  
++
++HANDLED_MASK = 1 << 24
++IGNORED_MASK = 1 << 25
++FORWARD_MASK = 1 << 25
++
+ SUPER_MASK = 1 << 26
+ HYPER_MASK = 1 << 27
+ META_MASK = 1 << 28
+-  
++
+ RELEASE_MASK = 1 << 30
+ 
+ MODIFIER_MASK = 0x5c001fff
+diff --git a/po/as.po b/po/as.po
+index 8e33ca2..9b81669 100644
+--- a/po/as.po
++++ b/po/as.po
+@@ -6,8 +6,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: ibus.master.ibus.as\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-02 02:13+0000\n"
+-"PO-Revision-Date: 2009-04-08 15:55+0530\n"
++"POT-Creation-Date: 2009-04-06 11:45+0800\n"
++"PO-Revision-Date: 2009-04-09 19:03+0530\n"
+ "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
+ "Language-Team: Assamese <fedora-trans-as at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+@@ -16,163 +16,19 @@ msgstr ""
+ "X-Generator: Lokalize 0.3\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
+ 
+-#: ../src/keyname-table.h:3940
+-msgid "keyboard label|BackSpace"
+-msgstr "keyboard label|BackSpace"
++#: ../bus/ibus.desktop.in.h:1
++msgid "IBus"
++msgstr "IBus"
+ 
+-#: ../src/keyname-table.h:3941
+-msgid "keyboard label|Tab"
+-msgstr "keyboard label|Tab"
+-
+-#: ../src/keyname-table.h:3942
+-msgid "keyboard label|Return"
+-msgstr "keyboard label|Return"
+-
+-#: ../src/keyname-table.h:3943
+-msgid "keyboard label|Pause"
+-msgstr "keyboard label|Pause"
+-
+-#: ../src/keyname-table.h:3944
+-msgid "keyboard label|Scroll_Lock"
+-msgstr "keyboard label|Scroll_Lock"
+-
+-#: ../src/keyname-table.h:3945
+-msgid "keyboard label|Sys_Req"
+-msgstr "keyboard label|Sys_Req"
+-
+-#: ../src/keyname-table.h:3946
+-msgid "keyboard label|Escape"
+-msgstr "keyboard label|Escape"
+-
+-#: ../src/keyname-table.h:3947
+-msgid "keyboard label|Multi_key"
+-msgstr "keyboard label|Multi_key"
+-
+-#: ../src/keyname-table.h:3948
+-msgid "keyboard label|Home"
+-msgstr "keyboard label|Home"
+-
+-#: ../src/keyname-table.h:3949
+-msgid "keyboard label|Left"
+-msgstr "keyboard label|Left"
+-
+-#: ../src/keyname-table.h:3950
+-msgid "keyboard label|Up"
+-msgstr "keyboard label|Up"
+-
+-#: ../src/keyname-table.h:3951
+-msgid "keyboard label|Right"
+-msgstr "keyboard label|Right"
+-
+-#: ../src/keyname-table.h:3952
+-msgid "keyboard label|Down"
+-msgstr "keyboard label|Down"
+-
+-#: ../src/keyname-table.h:3953
+-msgid "keyboard label|Page_Up"
+-msgstr "keyboard label|Page_Up"
+-
+-#: ../src/keyname-table.h:3954
+-msgid "keyboard label|Page_Down"
+-msgstr "keyboard label|Page_Down"
+-
+-#: ../src/keyname-table.h:3955
+-msgid "keyboard label|End"
+-msgstr "keyboard label|End"
+-
+-#: ../src/keyname-table.h:3956
+-msgid "keyboard label|Begin"
+-msgstr "keyboard label|Begin"
+-
+-#: ../src/keyname-table.h:3957
+-msgid "keyboard label|Print"
+-msgstr "keyboard label|Print"
+-
+-#: ../src/keyname-table.h:3958
+-msgid "keyboard label|Insert"
+-msgstr "keyboard label|Insert"
+-
+-#: ../src/keyname-table.h:3959
+-msgid "keyboard label|Num_Lock"
+-msgstr "keyboard label|Num_Lock"
+-
+-#: ../src/keyname-table.h:3960
+-msgid "keyboard label|KP_Space"
+-msgstr "keyboard label|KP_Space"
+-
+-#: ../src/keyname-table.h:3961
+-msgid "keyboard label|KP_Tab"
+-msgstr "keyboard label|KP_Tab"
+-
+-#: ../src/keyname-table.h:3962
+-msgid "keyboard label|KP_Enter"
+-msgstr "keyboard label|KP_Enter"
+-
+-#: ../src/keyname-table.h:3963
+-msgid "keyboard label|KP_Home"
+-msgstr "keyboard label|KP_Home"
+-
+-#: ../src/keyname-table.h:3964
+-msgid "keyboard label|KP_Left"
+-msgstr "keyboard label|KP_Left"
+-
+-#: ../src/keyname-table.h:3965
+-msgid "keyboard label|KP_Up"
+-msgstr "keyboard label|KP_Up"
+-
+-#: ../src/keyname-table.h:3966
+-msgid "keyboard label|KP_Right"
+-msgstr "keyboard label|KP_Right"
+-
+-#: ../src/keyname-table.h:3967
+-msgid "keyboard label|KP_Down"
+-msgstr "keyboard label|KP_Down"
+-
+-#: ../src/keyname-table.h:3968
+-msgid "keyboard label|KP_Page_Up"
+-msgstr "keyboard label|KP_Page_Up"
+-
+-#: ../src/keyname-table.h:3969
+-msgid "keyboard label|KP_Prior"
+-msgstr "keyboard label|KP_Prior"
+-
+-#: ../src/keyname-table.h:3970
+-msgid "keyboard label|KP_Page_Down"
+-msgstr "keyboard label|KP_Page_Down"
+-
+-#: ../src/keyname-table.h:3971
+-msgid "keyboard label|KP_Next"
+-msgstr "keyboard label|KP_Next"
+-
+-#: ../src/keyname-table.h:3972
+-msgid "keyboard label|KP_End"
+-msgstr "keyboard label|KP_End"
+-
+-#: ../src/keyname-table.h:3973
+-msgid "keyboard label|KP_Begin"
+-msgstr "keyboard label|KP_Begin"
+-
+-#: ../src/keyname-table.h:3974
+-msgid "keyboard label|KP_Insert"
+-msgstr "keyboard label|KP_Insert"
+-
+-#: ../src/keyname-table.h:3975
+-msgid "keyboard label|KP_Delete"
+-msgstr "keyboard label|KP_Delete"
+-
+-#: ../src/keyname-table.h:3976
+-msgid "keyboard label|Delete"
+-msgstr "keyboard label|Delete"
++#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:97
++msgid "IBus input method framework"
++msgstr "IBus input method framework"
+ 
+ #: ../ibus/lang.py:40 ../ui/gtk/panel.py:307 ../ui/gtk/panel.py:308
+ #: ../ui/gtk/panel.py:309 ../ui/gtk/panel.py:310
+ msgid "Other"
+ msgstr "????????????"
+ 
+-#: ../ui/gtk/panel.py:97
+-msgid "IBus input method framework"
+-msgstr "IBus input method framework"
+-
+ #: ../ui/gtk/panel.py:282
+ msgid "Restart"
+ msgstr "???????????????????????????"
+@@ -191,25 +47,24 @@ msgstr "???????????????????????? ???????????? (aphukan at fedoraproject.org)"
+ 
+ #. create input methods menu
+ #: ../ui/gtk/languagebar.py:84
+-msgid "Switch engine"
+-msgstr "???????????? ???????????? ?????????"
++msgid "Switch input method"
++msgstr "??????????????? ?????????????????? ???????????? ?????????"
+ 
+ #: ../setup/main.py:103
+ msgid "trigger"
+ msgstr "?????????????????????"
+ 
+ #: ../setup/main.py:113
+-msgid "next engine"
+-msgstr "???????????? ????????????"
++msgid "next input method"
++msgstr "???????????? ??????????????? ??????????????????"
+ 
+ #: ../setup/main.py:123
+-msgid "prev engine"
+-msgstr "????????? ????????????"
++msgid "previous input method"
++msgstr "????????? ??????????????? ??????????????????"
+ 
+ #: ../setup/main.py:204
+ msgid "IBus daemon is not started. Do you want to start it now?"
+-msgstr ""
+-"IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
++msgstr "IBus ???????????? ??????????????? ????????? ???????????? ????????? ??? ??????????????? ???????????? ??????????????? ??????????????? ???????????? ?????????????????? ???????????? ?"
+ 
+ #: ../setup/main.py:219
+ msgid ""
+@@ -219,8 +74,8 @@ msgid ""
+ "  export XMODIFIERS=@im=ibus\n"
+ "  export QT_IM_MODULE=ibus"
+ msgstr ""
+-"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????"
+-"$HOME/.bashrc ??? ????????? ????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
++"IBus ??????????????? ????????? ???'???! IBus ????????????????????? ???????????? ????????????????????????, ?????? ????????????$HOME/.bashrc ??? ????????? "
++"????????????, ????????? ?????????????????? ??????????????????'?????? ???????????? ?????????????????? ????????? ???\n"
+ "  export GTK_IM_MODULE=ibus\n"
+ "  export XMODIFIERS=@im=ibus\n"
+ "  export QT_IM_MODULE=ibus"
+@@ -318,7 +173,7 @@ msgstr ""
+ "????????????????????????\n"
+ "???????????????"
+ 
+-#: ../setup/setup.glade.h:19
++#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+ msgid "IBus Preferences"
+ msgstr "IBus ???????????????"
+ 
+@@ -341,21 +196,21 @@ msgid "Next input method:"
+ msgstr "???????????? ??????????????? ??????????????????:"
+ 
+ #: ../setup/setup.glade.h:25
++msgid "Previous input method:"
++msgstr "????????? ??????????????? ??????????????????"
++
++#: ../setup/setup.glade.h:26
+ msgid "Show language panel:"
+ msgstr "??????????????? ??????????????? ????????????????????????:"
+ 
+-#: ../setup/setup.glade.h:26
++#: ../setup/setup.glade.h:27
+ msgid "Start ibus on login"
+ msgstr "????????????????????? ibus ??????????????? ?????????"
+ 
+-#: ../setup/setup.glade.h:27
++#: ../setup/setup.glade.h:28
+ msgid "Use custom font"
+ msgstr "???????????????????????????????????? ???????????? ????????????????????? ????????? ???'???"
+ 
+-#: ../setup/setup.glade.h:28
+-msgid "previous input method:"
+-msgstr "????????? ??????????????? ??????????????????:"
+-
+ #: ../data/ibus.schemas.in.h:1
+ msgid "Auto Hide"
+ msgstr "?????????????????????????????????????????? ??????????????????"
+@@ -405,8 +260,7 @@ msgid ""
+ "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+ "show"
+ msgstr ""
+-"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? "
+-"????????????????????????"
++"??????????????? ?????????????????? ???????????? ??? ??? = ???????????? ??????????????????, ??? = ?????????????????????????????????????????? ??????????????????, ??? = ???????????? ????????????????????????"
+ 
+ #: ../data/ibus.schemas.in.h:13
+ msgid "Trigger Hotkey"
+@@ -428,4 +282,122 @@ msgstr "??????????????? ?????????????????? ???????????? ????????????????????????
+ msgid "[Control+space]"
+ msgstr "[Control+space]"
+ 
++#~ msgid "keyboard label|BackSpace"
++#~ msgstr "keyboard label|BackSpace"
++
++#~ msgid "keyboard label|Tab"
++#~ msgstr "keyboard label|Tab"
++
++#~ msgid "keyboard label|Return"
++#~ msgstr "keyboard label|Return"
++
++#~ msgid "keyboard label|Pause"
++#~ msgstr "keyboard label|Pause"
++
++#~ msgid "keyboard label|Scroll_Lock"
++#~ msgstr "keyboard label|Scroll_Lock"
++
++#~ msgid "keyboard label|Sys_Req"
++#~ msgstr "keyboard label|Sys_Req"
++
++#~ msgid "keyboard label|Escape"
++#~ msgstr "keyboard label|Escape"
++
++#~ msgid "keyboard label|Multi_key"
++#~ msgstr "keyboard label|Multi_key"
++
++#~ msgid "keyboard label|Home"
++#~ msgstr "keyboard label|Home"
++
++#~ msgid "keyboard label|Left"
++#~ msgstr "keyboard label|Left"
++
++#~ msgid "keyboard label|Up"
++#~ msgstr "keyboard label|Up"
++
++#~ msgid "keyboard label|Right"
++#~ msgstr "keyboard label|Right"
++
++#~ msgid "keyboard label|Down"
++#~ msgstr "keyboard label|Down"
++
++#~ msgid "keyboard label|Page_Up"
++#~ msgstr "keyboard label|Page_Up"
++
++#~ msgid "keyboard label|Page_Down"
++#~ msgstr "keyboard label|Page_Down"
++
++#~ msgid "keyboard label|End"
++#~ msgstr "keyboard label|End"
++
++#~ msgid "keyboard label|Begin"
++#~ msgstr "keyboard label|Begin"
++
++#~ msgid "keyboard label|Print"
++#~ msgstr "keyboard label|Print"
++
++#~ msgid "keyboard label|Insert"
++#~ msgstr "keyboard label|Insert"
++
++#~ msgid "keyboard label|Num_Lock"
++#~ msgstr "keyboard label|Num_Lock"
++
++#~ msgid "keyboard label|KP_Space"
++#~ msgstr "keyboard label|KP_Space"
++
++#~ msgid "keyboard label|KP_Tab"
++#~ msgstr "keyboard label|KP_Tab"
++
++#~ msgid "keyboard label|KP_Enter"
++#~ msgstr "keyboard label|KP_Enter"
++
++#~ msgid "keyboard label|KP_Home"
++#~ msgstr "keyboard label|KP_Home"
++
++#~ msgid "keyboard label|KP_Left"
++#~ msgstr "keyboard label|KP_Left"
++
++#~ msgid "keyboard label|KP_Up"
++#~ msgstr "keyboard label|KP_Up"
++
++#~ msgid "keyboard label|KP_Right"
++#~ msgstr "keyboard label|KP_Right"
++
++#~ msgid "keyboard label|KP_Down"
++#~ msgstr "keyboard label|KP_Down"
++
++#~ msgid "keyboard label|KP_Page_Up"
++#~ msgstr "keyboard label|KP_Page_Up"
++
++#~ msgid "keyboard label|KP_Prior"
++#~ msgstr "keyboard label|KP_Prior"
++
++#~ msgid "keyboard label|KP_Page_Down"
++#~ msgstr "keyboard label|KP_Page_Down"
++
++#~ msgid "keyboard label|KP_Next"
++#~ msgstr "keyboard label|KP_Next"
++
++#~ msgid "keyboard label|KP_End"
++#~ msgstr "keyboard label|KP_End"
++
++#~ msgid "keyboard label|KP_Begin"
++#~ msgstr "keyboard label|KP_Begin"
++
++#~ msgid "keyboard label|KP_Insert"
++#~ msgstr "keyboard label|KP_Insert"
++
++#~ msgid "keyboard label|KP_Delete"
++#~ msgstr "keyboard label|KP_Delete"
++
++#~ msgid "keyboard label|Delete"
++#~ msgstr "keyboard label|Delete"
++
++#~ msgid "Switch engine"
++#~ msgstr "???????????? ???????????? ?????????"
++
++#~ msgid "next engine"
++#~ msgstr "???????????? ????????????"
+ 
++#~ msgid "prev engine"
++#~ msgstr "????????? ????????????"
+diff --git a/po/te.po b/po/te.po
+index 3b8c0da..9c65afd 100644
+--- a/po/te.po
++++ b/po/te.po
+@@ -1,21 +1,21 @@
+-# translation of ibus.master.ibus.po to Telugu
++# translation of ibus.master.te.po to Telugu
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+ # Krishna Babu K <kkrothap at redhat.com>, 2009.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: ibus.master.ibus\n"
++"Project-Id-Version: ibus.master.te\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-07 15:38+0800\n"
+-"PO-Revision-Date: 2009-04-07 00:39+0530\n"
++"POT-Creation-Date: 2009-04-06 11:45+0800\n"
++"PO-Revision-Date: 2009-04-14 15:04+0530\n"
+ "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
+ "Language-Team: Telugu <en at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: KBabel 1.11.4\n"
+-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+ "\n"
+ 
+ #: ../bus/ibus.desktop.in.h:1
+@@ -49,23 +49,20 @@ msgstr "??????????????????????????? ?????? <kkrothap at redhat.com> 2009."
+ 
+ #. create input methods menu
+ #: ../ui/gtk/languagebar.py:84
+-#, fuzzy
+ msgid "Switch input method"
+-msgstr "????????????????????? ????????????????????? ??????????????????????????????"
++msgstr "????????????????????? ?????????????????? ????????????????????????"
+ 
+ #: ../setup/main.py:103
+ msgid "trigger"
+ msgstr "????????? (???????????????????????????)"
+ 
+ #: ../setup/main.py:113
+-#, fuzzy
+ msgid "next input method"
+-msgstr "????????????????????? ????????????????????? ??????????????????:"
++msgstr "????????????????????? ????????????????????? ??????????????????"
+ 
+ #: ../setup/main.py:123
+-#, fuzzy
+ msgid "previous input method"
+-msgstr "????????????????????? ????????????????????? ??????????????????:"
++msgstr "????????????????????? ????????????????????? ??????????????????"
+ 
+ #: ../setup/main.py:204
+ msgid "IBus daemon is not started. Do you want to start it now?"
+@@ -201,7 +198,6 @@ msgid "Next input method:"
+ msgstr "????????????????????? ????????????????????? ??????????????????:"
+ 
+ #: ../setup/setup.glade.h:25
+-#, fuzzy
+ msgid "Previous input method:"
+ msgstr "????????????????????? ????????????????????? ??????????????????:"
+ 
+@@ -285,14 +281,7 @@ msgstr "??????????????????????????? ??????????????? ???????????????????????????
+ msgid "Use custom font name for language panel"
+ msgstr "???????????? ????????????????????? ??????????????? ??????????????????????????? ??????????????? ??????????????? ????????????????????????????????????"
+ 
+-#~ msgid "Switch engine"
+-#~ msgstr "???????????????????????? ????????????????????????"
+-
+-#~ msgid "next engine"
+-#~ msgstr "????????????????????? ??????????????????"
+-
+-#~ msgid "prev engine"
+-#~ msgstr "????????????????????? ??????????????????"
++#: ../data/ibus.schemas.in.h:17
++msgid "[Control+space]"
++msgstr "[Control+space]"
+ 
+-#~ msgid "[Control+space]"
+-#~ msgstr "[Control+space]"
+diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
+index a9e2233..f954343 100644
+--- a/setup/keyboardshortcut.py
++++ b/setup/keyboardshortcut.py
+@@ -27,6 +27,7 @@ __all__ = (
+ import gobject
+ import gtk
+ from gtk import gdk
++from gtk import keysyms
+ 
+ from gettext import dgettext
+ _  = lambda a : dgettext("ibus", a)
+@@ -217,8 +218,29 @@ class KeyboardShortcutSelection(gtk.VBox):
+         if id != gtk.RESPONSE_OK or not out:
+             return
+         keyevent = out[0]
++        state = keyevent.state & (gdk.CONTROL_MASK | \
++                                  gdk.SHIFT_MASK   | \
++                                  gdk.MOD1_MASK    | \
++                                  gdk.META_MASK    | \
++                                  gdk.SUPER_MASK   | \
++                                  gdk.HYPER_MASK)
++        if state == 0:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Control_L, keysyms.Control_R) and state == gdk.CONTROL_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Shift_L, keysyms.Shift_R) and state == gdk.SHIFT_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Alt_L, keysyms.Alt_R) and state == gdk.MOD1_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Meta_L, keysyms.Meta_R) and state == gdk.META_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Super_L, keysyms.Super_R) and state == gdk.SUPER_MASK:
++            state = state | gdk.RELEASE_MASK
++        elif keyevent.keyval in (keysyms.Hyper_L, keysyms.Hyper_R) and state == gdk.HYPER_MASK:
++            state = state | gdk.RELEASE_MASK
++
+         for name, button, mask in self.__modifier_buttons:
+-            if keyevent.state & mask:
++            if state & mask:
+                 button.set_active(True)
+             else:
+                 button.set_active(False)
+diff --git a/src/ibusbus.c b/src/ibusbus.c
+index 373e5d4..756f8e5 100644
+--- a/src/ibusbus.c
++++ b/src/ibusbus.c
+@@ -220,14 +220,17 @@ ibus_bus_init (IBusBus *bus)
+ 
+     ibus_bus_connect (bus);
+ 
+-    path = g_strdup_printf ("/tmp/ibus-%s/", ibus_get_user_name ());
++    path = ibus_get_socket_folder ();
++    mkdir (path, 0700);
++    chmod (path, 0700);
++
++
+     file = g_file_new_for_path (path);
+     priv->monitor = g_file_monitor_directory (file, 0, NULL, NULL);
+ 
+     g_signal_connect (priv->monitor, "changed", (GCallback) _changed_cb, bus);
+ 
+     g_object_unref (file);
+-    g_free (path);
+ }
+ 
+ static void
+diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
+index 95754cf..52547ff 100644
+--- a/src/ibusinputcontext.c
++++ b/src/ibusinputcontext.c
+@@ -553,7 +553,10 @@ ibus_input_context_process_key_event (IBusInputContext *context,
+     IBusError *error = NULL;
+     gboolean retval;
+ 
+-    if (state & IBUS_FORWARD_MASK)
++    if (state & IBUS_HANDLED_MASK)
++        return TRUE;
++
++    if (state & IBUS_IGNORED_MASK)
+         return FALSE;
+ 
+     retval = ibus_proxy_call_with_reply ((IBusProxy *) context,
+diff --git a/src/ibusshare.c b/src/ibusshare.c
+index c7aa1fe..186be85 100644
+--- a/src/ibusshare.c
++++ b/src/ibusshare.c
+@@ -69,6 +69,31 @@ ibus_get_user_name (void)
+ }
+ 
+ const gchar *
++ibus_get_session_id (void)
++{
++    return g_getenv("IBUS_SESSION_ID");
++}
++
++const gchar *
++ibus_get_socket_folder (void)
++{
++    static gchar *folder = NULL;
++
++    if (folder == NULL) {
++        const gchar *session = ibus_get_session_id ();
++        if (session && session[0] != '\0') {
++            folder = g_strdup_printf ("/tmp/ibus-%s-%s",
++                ibus_get_user_name (), session);
++        }
++        else {
++            folder = g_strdup_printf ("/tmp/ibus-%s",
++                ibus_get_user_name ());
++        }
++    }
++    return folder;
++}
++
++const gchar *
+ ibus_get_socket_path (void)
+ {
+     static gchar *path = NULL;
+@@ -78,7 +103,7 @@ ibus_get_socket_path (void)
+         gchar *display;
+         gchar *displaynumber = "0";
+         gchar *screennumber = "0";
+-        const gchar *username = NULL;
++        const gchar *folder= NULL;
+         gchar *p;
+ 
+         if (_display == NULL) {
+@@ -111,14 +136,14 @@ ibus_get_socket_path (void)
+             }
+         }
+ 
+-        username = ibus_get_user_name ();
++        folder = ibus_get_socket_folder ();
+ 
+         if (hostname[0] == '\0')
+             hostname = "unix";
+ 
+         path = g_strdup_printf (
+-            "/tmp/ibus-%s/ibus-%s-%s",
+-            username, hostname, displaynumber);
++            "%s/ibus-%s-%s",
++            folder, hostname, displaynumber);
+         g_free (display);
+     }
+     return path;
+diff --git a/src/ibusshare.h b/src/ibusshare.h
+index f3b34c4..4c0c645 100644
+--- a/src/ibusshare.h
++++ b/src/ibusshare.h
+@@ -49,6 +49,7 @@ void             ibus_set_display       (const gchar    *display);
+ const gchar     *ibus_get_address       (void);
+ const gchar     *ibus_get_user_name     (void);
+ const gchar     *ibus_get_socket_path   (void);
++const gchar     *ibus_get_socket_folder (void);
+ 
+ const gchar     *ibus_keyval_name       (guint           keyval);
+ guint            ibus_keyval_from_name  (const gchar    *keyval_name);
+diff --git a/src/ibustypes.h b/src/ibustypes.h
+index d2f15ba..2f7c0bf 100644
+--- a/src/ibustypes.h
++++ b/src/ibustypes.h
+@@ -69,11 +69,13 @@ typedef enum
+     IBUS_BUTTON5_MASK  = 1 << 12,
+ 
+     /* The next few modifiers are used by XKB, so we skip to the end.
+-     * Bits 15 - 24 are currently unused. Bit 29 is used internally.
++     * Bits 15 - 23 are currently unused. Bit 29 is used internally.
+      */
+ 
+-    /* forward mask */
++    /* ibus mask */
++    IBUS_HANDLED_MASK  = 1 << 24,
+     IBUS_FORWARD_MASK  = 1 << 25,
++    IBUS_IGNORED_MASK  = IBUS_FORWARD_MASK,
+ 
+     IBUS_SUPER_MASK    = 1 << 26,
+     IBUS_HYPER_MASK    = 1 << 27,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	17 Apr 2009 10:57:05 -0000	1.34
+++ sources	28 Apr 2009 05:41:12 -0000	1.35
@@ -1 +1 @@
-70b037b1476cb6bafa29656523e0c8c4  ibus-1.1.0.20090417.tar.gz
+7c04c5244e6b5c392590d62f09443682  ibus-1.1.0.20090423.tar.gz



From airlied at fedoraproject.org  Tue Apr 28 05:42:04 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 05:42:04 +0000 (UTC)
Subject: rpms/mesa/F-11 radeon-rewrite.patch,1.19,1.20
Message-ID: <20090428054204.4958B70129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12144

Modified Files:
	radeon-rewrite.patch 
Log Message:
radeon: add some minor fixes


radeon-rewrite.patch:

Index: radeon-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/radeon-rewrite.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- radeon-rewrite.patch	28 Apr 2009 04:57:52 -0000	1.19
+++ radeon-rewrite.patch	28 Apr 2009 05:42:03 -0000	1.20
@@ -8450,7 +8450,7 @@ index 3b81ac0..0000000
 -   return 0;
 -}
 diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
-index 0ad5651..15758d7 100644
+index 0ad5651..eee54cd 100644
 --- a/src/mesa/drivers/dri/r200/r200_texstate.c
 +++ b/src/mesa/drivers/dri/r200/r200_texstate.c
 @@ -37,9 +37,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -8749,7 +8749,7 @@ index 0ad5651..15758d7 100644
  	t->pp_txpitch = pitch - 32;
  
  	switch (depth) {
-@@ -1014,6 +765,123 @@ void r200SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
+@@ -1014,6 +765,122 @@ void r200SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
  	}
  }
  
@@ -8821,7 +8821,6 @@ index 0ad5651..15758d7 100644
 +		radeon_miptree_unreference(rImage->mt);
 +		rImage->mt = NULL;
 +	}
-+	fprintf(stderr,"settexbuf %d %dx%d@%d\n", rb->pitch, rb->width, rb->height, rb->cpp);
 +	_mesa_init_teximage_fields(radeon->glCtx, target, texImage,
 +				   rb->width, rb->height, 1, 0, rb->cpp);
 +	texImage->RowStride = rb->pitch / rb->cpp;
@@ -8873,7 +8872,7 @@ index 0ad5651..15758d7 100644
  #define REF_COLOR 1
  #define REF_ALPHA 2
  
-@@ -1207,12 +1075,41 @@ static GLboolean r200UpdateAllTexEnv( GLcontext *ctx )
+@@ -1207,12 +1074,41 @@ static GLboolean r200UpdateAllTexEnv( GLcontext *ctx )
                                  R200_VOLUME_FILTER_MASK)
  
  
@@ -8917,7 +8916,7 @@ index 0ad5651..15758d7 100644
  
     R200_STATECHANGE( rmesa, tex[unit] );
  
-@@ -1225,36 +1122,21 @@ static void import_tex_obj_state( r200ContextPtr rmesa,
+@@ -1225,36 +1121,21 @@ static void import_tex_obj_state( r200ContextPtr rmesa,
     cmd[TEX_PP_TXSIZE] = texobj->pp_txsize; /* NPOT only! */
     cmd[TEX_PP_TXPITCH] = texobj->pp_txpitch; /* NPOT only! */
     cmd[TEX_PP_BORDER_COLOR] = texobj->pp_border_color;
@@ -8957,7 +8956,7 @@ index 0ad5651..15758d7 100644
  static void set_texgen_matrix( r200ContextPtr rmesa, 
  			       GLuint unit,
  			       const GLfloat *s_plane,
-@@ -1377,7 +1259,6 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
+@@ -1377,7 +1258,6 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
     } else {
        tgcm |= R200_TEXGEN_COMP_T << (unit * 4);
     }
@@ -8965,7 +8964,7 @@ index 0ad5651..15758d7 100644
     if (texUnit->TexGenEnabled & R_BIT) {
        if (texUnit->GenR.Mode != mode)
  	 mixed_fallback = GL_TRUE;
-@@ -1517,52 +1398,6 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
+@@ -1517,52 +1397,6 @@ static GLboolean r200_validate_texgen( GLcontext *ctx, GLuint unit )
     return GL_TRUE;
  }
  
@@ -9018,7 +9017,7 @@ index 0ad5651..15758d7 100644
  void set_re_cntl_d3d( GLcontext *ctx, int unit, GLboolean use_d3d )
  {
     r200ContextPtr rmesa = R200_CONTEXT(ctx);
-@@ -1579,237 +1414,169 @@ void set_re_cntl_d3d( GLcontext *ctx, int unit, GLboolean use_d3d )
+@@ -1579,237 +1413,169 @@ void set_re_cntl_d3d( GLcontext *ctx, int unit, GLboolean use_d3d )
     }
  }
  
@@ -9380,7 +9379,7 @@ index 0ad5651..15758d7 100644
  }
  
  
-@@ -1850,11 +1617,11 @@ void r200UpdateTextureState( GLcontext *ctx )
+@@ -1850,11 +1616,11 @@ void r200UpdateTextureState( GLcontext *ctx )
  
     FALLBACK( rmesa, R200_FALLBACK_TEXTURE, !ok );
  
@@ -9394,7 +9393,7 @@ index 0ad5651..15758d7 100644
  
        /*
         * T0 hang workaround -------------
-@@ -1867,7 +1634,7 @@ void r200UpdateTextureState( GLcontext *ctx )
+@@ -1867,7 +1633,7 @@ void r200UpdateTextureState( GLcontext *ctx )
  	 R200_STATECHANGE(rmesa, tex[1]);
  	 rmesa->hw.ctx.cmd[CTX_PP_CNTL] |= R200_TEX_1_ENABLE;
  	 if (!(rmesa->hw.cst.cmd[CST_PP_CNTL_X] & R200_PPX_TEX_1_ENABLE))
@@ -19221,7 +19220,7 @@ index 0fe51b0..0000000
 -	return 0;
 -}
 diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
-index cadec7f..cf4cad7 100644
+index cadec7f..2d7ad55 100644
 --- a/src/mesa/drivers/dri/r300/r300_texstate.c
 +++ b/src/mesa/drivers/dri/r300/r300_texstate.c
 @@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -19745,7 +19744,7 @@ index cadec7f..cf4cad7 100644
  }
  
  void r300SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
-@@ -591,78 +325,164 @@ void r300SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
+@@ -591,78 +325,163 @@ void r300SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
  	r300ContextPtr rmesa = pDRICtx->driverPrivate;
  	struct gl_texture_object *tObj =
  	    _mesa_lookup_texture(rmesa->radeon.glCtx, texname);
@@ -19886,7 +19885,6 @@ index cadec7f..cf4cad7 100644
 +		radeon_miptree_unreference(rImage->mt);
 +		rImage->mt = NULL;
 +	}
-+	fprintf(stderr,"settexbuf %dx%d@%d %d targ %x format %x\n", rb->width, rb->height, rb->cpp, rb->pitch, target, format);
 +	_mesa_init_teximage_fields(radeon->glCtx, target, texImage,
 +				   rb->width, rb->height, 1, 0, rb->cpp);
 +	texImage->RowStride = rb->pitch / rb->cpp;
@@ -32675,7 +32673,7 @@ index 1ec06bc..f30eb1c 100644
  				  drm_clip_rect_t *boxes );
  
 diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index 8828533..1541412 100644
+index 8828533..544ab74 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
 @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -32858,7 +32856,7 @@ index 8828533..1541412 100644
     r300SetTexOffset,
  };
 -#endif
- 
+-
 -/* Create the device specific screen private data struct.
 - */
 -static radeonScreenPtr
@@ -32870,7 +32868,7 @@ index 8828533..1541412 100644
 -   int i;
 -   int ret;
 -   uint32_t temp = 0;
--
+ 
 -   if (sPriv->devPrivSize != sizeof(RADEONDRIRec)) {
 -      fprintf(stderr,"\nERROR!  sizeof(RADEONDRIRec) does not match passed size from device driver\n");
 -      return GL_FALSE;
@@ -32999,7 +32997,7 @@ index 8828533..1541412 100644
     case PCI_CHIP_RADEON_LY:
     case PCI_CHIP_RADEON_LZ:
     case PCI_CHIP_RADEON_QY:
-@@ -824,9 +739,161 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -824,9 +739,145 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
  
     default:
        fprintf(stderr, "unknown chip id 0x%x, can't guess.\n",
@@ -33052,19 +33050,6 @@ index 8828533..1541412 100644
 +   {
 +      int ret;
 +
-+#ifdef RADEON_PARAM_KERNEL_MM
-+     ret = radeonGetParam(sPriv, RADEON_PARAM_KERNEL_MM, &screen->kernel_mm);
-+
-+      if (ret && ret != -EINVAL) {
-+         FREE( screen );
-+         fprintf(stderr, "drm_radeon_getparam_t (RADEON_OFFSET): %d\n", ret);
-+         return NULL;
-+      }
-+
-+      if (ret == -EINVAL)
-+          screen->kernel_mm = 0;
-+#endif
-+
 +      ret = radeonGetParam(sPriv, RADEON_PARAM_GART_BUFFER_OFFSET,
 +			    &screen->gart_buffer_offset);
 +
@@ -33098,63 +33083,60 @@ index 8828533..1541412 100644
 +      screen->drmSupportsVertexProgram = (sPriv->drm_version.minor >= 25);
 +   }
 +
-+   if (!screen->kernel_mm) {
-+     screen->mmio.handle = dri_priv->registerHandle;
-+     screen->mmio.size   = dri_priv->registerSize;
-+     if ( drmMap( sPriv->fd,
-+		  screen->mmio.handle,
-+		  screen->mmio.size,
-+		  &screen->mmio.map ) ) {
-+       FREE( screen );
-+       __driUtilMessage("%s: drmMap failed\n", __FUNCTION__ );
-+       return NULL;
-+     }
++   screen->mmio.handle = dri_priv->registerHandle;
++   screen->mmio.size   = dri_priv->registerSize;
++   if ( drmMap( sPriv->fd,
++		screen->mmio.handle,
++		screen->mmio.size,
++		&screen->mmio.map ) ) {
++     FREE( screen );
++     __driUtilMessage("%s: drmMap failed\n", __FUNCTION__ );
++     return NULL;
++   }
 +
-+     RADEONMMIO = screen->mmio.map;
++   RADEONMMIO = screen->mmio.map;
 +
-+     screen->status.handle = dri_priv->statusHandle;
-+     screen->status.size   = dri_priv->statusSize;
-+     if ( drmMap( sPriv->fd,
-+		  screen->status.handle,
-+		  screen->status.size,
-+		  &screen->status.map ) ) {
-+       drmUnmap( screen->mmio.map, screen->mmio.size );
-+       FREE( screen );
-+       __driUtilMessage("%s: drmMap (2) failed\n", __FUNCTION__ );
-+       return NULL;
-+     }
-+     screen->scratch = (__volatile__ uint32_t *)
-+       ((GLubyte *)screen->status.map + RADEON_SCRATCH_REG_OFFSET);
++   screen->status.handle = dri_priv->statusHandle;
++   screen->status.size   = dri_priv->statusSize;
++   if ( drmMap( sPriv->fd,
++		screen->status.handle,
++		screen->status.size,
++		&screen->status.map ) ) {
++     drmUnmap( screen->mmio.map, screen->mmio.size );
++     FREE( screen );
++     __driUtilMessage("%s: drmMap (2) failed\n", __FUNCTION__ );
++     return NULL;
++   }
++   screen->scratch = (__volatile__ uint32_t *)
++     ((GLubyte *)screen->status.map + RADEON_SCRATCH_REG_OFFSET);
 +
-+     screen->buffers = drmMapBufs( sPriv->fd );
-+     if ( !screen->buffers ) {
++   screen->buffers = drmMapBufs( sPriv->fd );
++   if ( !screen->buffers ) {
++     drmUnmap( screen->status.map, screen->status.size );
++     drmUnmap( screen->mmio.map, screen->mmio.size );
++     FREE( screen );
++     __driUtilMessage("%s: drmMapBufs failed\n", __FUNCTION__ );
++     return NULL;
++   }
++
++   if ( dri_priv->gartTexHandle && dri_priv->gartTexMapSize ) {
++     screen->gartTextures.handle = dri_priv->gartTexHandle;
++     screen->gartTextures.size   = dri_priv->gartTexMapSize;
++     if ( drmMap( sPriv->fd,
++		  screen->gartTextures.handle,
++		  screen->gartTextures.size,
++		  (drmAddressPtr)&screen->gartTextures.map ) ) {
++       drmUnmapBufs( screen->buffers );
 +       drmUnmap( screen->status.map, screen->status.size );
 +       drmUnmap( screen->mmio.map, screen->mmio.size );
 +       FREE( screen );
-+       __driUtilMessage("%s: drmMapBufs failed\n", __FUNCTION__ );
++       __driUtilMessage("%s: drmMap failed for GART texture area\n", __FUNCTION__);
 +       return NULL;
-+     }
-+
-+     if ( dri_priv->gartTexHandle && dri_priv->gartTexMapSize ) {
-+       screen->gartTextures.handle = dri_priv->gartTexHandle;
-+       screen->gartTextures.size   = dri_priv->gartTexMapSize;
-+       if ( drmMap( sPriv->fd,
-+		    screen->gartTextures.handle,
-+		    screen->gartTextures.size,
-+		    (drmAddressPtr)&screen->gartTextures.map ) ) {
-+	 drmUnmapBufs( screen->buffers );
-+	 drmUnmap( screen->status.map, screen->status.size );
-+	 drmUnmap( screen->mmio.map, screen->mmio.size );
-+	 FREE( screen );
-+	 __driUtilMessage("%s: drmMap failed for GART texture area\n", __FUNCTION__);
-+	 return NULL;
-+       }
++    }
 +
-+       screen->gart_texture_offset = dri_priv->gartTexOffset + screen->gart_base;
-+     }
++     screen->gart_texture_offset = dri_priv->gartTexOffset + screen->gart_base;
 +   }
 +
-+
 +   ret = radeon_set_screen_flags(screen, dri_priv->deviceID);
 +   if (ret == -1)
 +     return NULL;
@@ -33162,7 +33144,7 @@ index 8828533..1541412 100644
     if ((screen->chip_family == CHIP_FAMILY_R350 || screen->chip_family == CHIP_FAMILY_R300) &&
         sPriv->ddx_version.minor < 2) {
        fprintf(stderr, "xf86-video-ati-6.6.2 or newer needed for Radeon 9500/9700/9800 cards.\n");
-@@ -851,10 +918,9 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -851,8 +902,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
     screen->cpp = dri_priv->bpp / 8;
     screen->AGPMode = dri_priv->AGPMode;
  
@@ -33170,12 +33152,9 @@ index 8828533..1541412 100644
 -                         &temp);
 +   ret = radeonGetParam(sPriv, RADEON_PARAM_FB_LOCATION, &temp);
     if (ret) {
--       if (screen->chip_family < CHIP_FAMILY_RS600)
-+       if (screen->chip_family < CHIP_FAMILY_RS600 && !screen->kernel_mm)
+        if (screen->chip_family < CHIP_FAMILY_RS600)
  	   screen->fbLocation      = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
-        else {
-            FREE( screen );
-@@ -866,8 +932,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -866,8 +916,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
     }
  
     if (screen->chip_family >= CHIP_FAMILY_R300) {
@@ -33185,17 +33164,10 @@ index 8828533..1541412 100644
         if (ret) {
  	   fprintf(stderr, "Unable to get num_pipes, need newer drm\n");
  	   switch (screen->chip_family) {
-@@ -956,26 +1021,158 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
-        screen->extensions[i++] = &driMediaStreamCounterExtension.base;
-    }
+@@ -961,21 +1010,149 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ #endif
  
-+   if (!screen->kernel_mm) {
- #if !RADEON_COMMON
--   screen->extensions[i++] = &radeonTexOffsetExtension.base;
-+   	screen->extensions[i++] = &radeonTexOffsetExtension.base;
-+#endif
-+
-+#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
+ #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
 +        if (IS_R200_CLASS(screen))
 +            screen->extensions[i++] = &r200AllocateExtension.base;
 +
@@ -33215,10 +33187,7 @@ index 8828533..1541412 100644
 +   screen->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA +
 +					       screen->sarea_priv_offset);
 +
-+   if (screen->kernel_mm)
-+     screen->bom = radeon_bo_manager_gem_ctor(sPriv->fd);
-+   else
-+     screen->bom = radeon_bo_manager_legacy_ctor(screen);
++   screen->bom = radeon_bo_manager_legacy_ctor(screen);
 +   if (screen->bom == NULL) {
 +     free(screen);
 +     return NULL;
@@ -33320,9 +33289,9 @@ index 8828533..1541412 100644
 +
 +#if !RADEON_COMMON
 +   screen->extensions[i++] = &radeonTexBufferExtension.base;
- #endif
- 
- #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
++#endif
++
++#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
     if (IS_R200_CLASS(screen))
         screen->extensions[i++] = &r200AllocateExtension.base;
  
@@ -33348,7 +33317,7 @@ index 8828533..1541412 100644
     return screen;
  }
  
-@@ -984,23 +1181,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -984,23 +1161,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
  static void
  radeonDestroyScreen( __DRIscreenPrivate *sPriv )
  {
@@ -33394,7 +33363,7 @@ index 8828533..1541412 100644
  }
  
  
-@@ -1009,16 +1215,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
+@@ -1009,16 +1195,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
  static GLboolean
  radeonInitDriver( __DRIscreenPrivate *sPriv )
  {
@@ -33422,13 +33391,14 @@ index 8828533..1541412 100644
  /**
   * Create the Mesa framebuffer and renderbuffers for a given window/drawable.
   *
-@@ -1031,101 +1242,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
+@@ -1031,101 +1222,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
                      const __GLcontextModes *mesaVis,
                      GLboolean isPixmap )
  {
 -   radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->private;
 +    radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->private;
-+
+ 
+-   if (isPixmap) {
 +    const GLboolean swDepth = GL_FALSE;
 +    const GLboolean swAlpha = GL_FALSE;
 +    const GLboolean swAccum = mesaVis->accumRedBits > 0;
@@ -33436,8 +33406,7 @@ index 8828533..1541412 100644
 +	mesaVis->depthBits != 24;
 +    GLenum rgbFormat;
 +    struct radeon_framebuffer *rfb;
- 
--   if (isPixmap) {
++
 +    if (isPixmap)
        return GL_FALSE; /* not implemented */
 -   }
@@ -33614,7 +33583,7 @@ index 8828533..1541412 100644
  /**
   * Choose the appropriate CreateContext function based on the chipset.
   * Eventually, all drivers will go through this process.
-@@ -1136,25 +1357,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
+@@ -1136,25 +1337,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
  {
  	__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
  	radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
@@ -33650,7 +33619,7 @@ index 8828533..1541412 100644
  
  
  /**
-@@ -1216,13 +1433,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1216,13 +1413,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
     if (!radeonInitDriver(psp))
         return NULL;
  
@@ -33663,7 +33632,7 @@ index 8828533..1541412 100644
 +			     (dri_priv->bpp == 16) ? 0  : 8, 1);
  }
 +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
-+
+ 
 +/**
 + * This is the driver specific part of the createNewScreen entry point.
 + * Called when using DRI2.
@@ -33704,7 +33673,7 @@ index 8828533..1541412 100644
 +   driInitSingleExtension( NULL, ATI_fs_extension );
 +   driInitExtensions( NULL, point_extensions, GL_FALSE );
 +#endif
- 
++
 +   if (!radeonInitDriver(psp)) {
 +       return NULL;
 +    }
@@ -33756,7 +33725,7 @@ index 8828533..1541412 100644
  
  /**
   * Get information about previous buffer swaps.
-@@ -1230,31 +1537,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1230,31 +1517,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
  static int
  getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo )
  {
@@ -33798,7 +33767,7 @@ index 8828533..1541412 100644
  const struct __DriverAPIRec driDriverAPI = {
     .InitScreen      = radeonInitScreen,
     .DestroyScreen   = radeonDestroyScreen,
-@@ -1271,23 +1573,7 @@ const struct __DriverAPIRec driDriverAPI = {
+@@ -1271,23 +1553,7 @@ const struct __DriverAPIRec driDriverAPI = {
     .WaitForSBC      = NULL,
     .SwapBuffersMSC  = NULL,
     .CopySubBuffer   = radeonCopySubBuffer,



From airlied at fedoraproject.org  Tue Apr 28 05:49:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 05:49:27 +0000 (UTC)
Subject: rpms/mesa/F-11 radeon-rewrite.patch,1.20,1.21
Message-ID: <20090428054927.80A6870129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13451

Modified Files:
	radeon-rewrite.patch 
Log Message:
radeon: build fix


radeon-rewrite.patch:

Index: radeon-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/radeon-rewrite.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- radeon-rewrite.patch	28 Apr 2009 05:42:03 -0000	1.20
+++ radeon-rewrite.patch	28 Apr 2009 05:49:26 -0000	1.21
@@ -32673,7 +32673,7 @@ index 1ec06bc..f30eb1c 100644
  				  drm_clip_rect_t *boxes );
  
 diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index 8828533..544ab74 100644
+index 8828533..9ce950a 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
 @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -33164,26 +33164,19 @@ index 8828533..544ab74 100644
         if (ret) {
  	   fprintf(stderr, "Unable to get num_pipes, need newer drm\n");
  	   switch (screen->chip_family) {
-@@ -961,21 +1010,149 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
- #endif
+@@ -962,7 +1011,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
  
  #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
-+        if (IS_R200_CLASS(screen))
-+            screen->extensions[i++] = &r200AllocateExtension.base;
-+
-+        screen->extensions[i++] = &r200texOffsetExtension.base;
-+#endif
-+
-+#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
-+        screen->extensions[i++] = &r300texOffsetExtension.base;
-+#endif
-+   }
-+
-+   screen->extensions[i++] = NULL;
-+   sPriv->extensions = screen->extensions;
-+
-+   screen->driScreen = sPriv;
-+   screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
+    if (IS_R200_CLASS(screen))
+-       screen->extensions[i++] = &r200AllocateExtension.base;
++      screen->extensions[i++] = &r200AllocateExtension.base;
+ 
+    screen->extensions[i++] = &r200texOffsetExtension.base;
+ #endif
+@@ -976,6 +1025,133 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ 
+    screen->driScreen = sPriv;
+    screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
 +   screen->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA +
 +					       screen->sarea_priv_offset);
 +
@@ -33292,23 +33285,20 @@ index 8828533..544ab74 100644
 +#endif
 +
 +#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
-    if (IS_R200_CLASS(screen))
-        screen->extensions[i++] = &r200AllocateExtension.base;
- 
--   screen->extensions[i++] = &r200texOffsetExtension.base;
++   if (IS_R200_CLASS(screen))
++       screen->extensions[i++] = &r200AllocateExtension.base;
++
 +   screen->extensions[i++] = &r200TexBufferExtension.base;
- #endif
- 
- #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
--   screen->extensions[i++] = &r300texOffsetExtension.base;
++#endif
++
++#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
 +   screen->extensions[i++] = &r300TexBufferExtension.base;
- #endif
- 
-    screen->extensions[i++] = NULL;
-    sPriv->extensions = screen->extensions;
- 
-    screen->driScreen = sPriv;
--   screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
++#endif
++
++   screen->extensions[i++] = NULL;
++   sPriv->extensions = screen->extensions;
++
++   screen->driScreen = sPriv;
 +   screen->bom = radeon_bo_manager_gem_ctor(sPriv->fd);
 +   if (screen->bom == NULL) {
 +       free(screen);
@@ -33317,7 +33307,7 @@ index 8828533..544ab74 100644
     return screen;
  }
  
-@@ -984,23 +1161,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+@@ -984,23 +1160,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
  static void
  radeonDestroyScreen( __DRIscreenPrivate *sPriv )
  {
@@ -33363,7 +33353,7 @@ index 8828533..544ab74 100644
  }
  
  
-@@ -1009,16 +1195,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
+@@ -1009,16 +1194,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
  static GLboolean
  radeonInitDriver( __DRIscreenPrivate *sPriv )
  {
@@ -33391,7 +33381,7 @@ index 8828533..544ab74 100644
  /**
   * Create the Mesa framebuffer and renderbuffers for a given window/drawable.
   *
-@@ -1031,101 +1222,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
+@@ -1031,101 +1221,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
                      const __GLcontextModes *mesaVis,
                      GLboolean isPixmap )
  {
@@ -33583,7 +33573,7 @@ index 8828533..544ab74 100644
  /**
   * Choose the appropriate CreateContext function based on the chipset.
   * Eventually, all drivers will go through this process.
-@@ -1136,25 +1337,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
+@@ -1136,25 +1336,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
  {
  	__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
  	radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
@@ -33619,7 +33609,7 @@ index 8828533..544ab74 100644
  
  
  /**
-@@ -1216,13 +1413,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1216,13 +1412,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
     if (!radeonInitDriver(psp))
         return NULL;
  
@@ -33725,7 +33715,7 @@ index 8828533..544ab74 100644
  
  /**
   * Get information about previous buffer swaps.
-@@ -1230,31 +1517,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+@@ -1230,31 +1516,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
  static int
  getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo )
  {
@@ -33767,7 +33757,7 @@ index 8828533..544ab74 100644
  const struct __DriverAPIRec driDriverAPI = {
     .InitScreen      = radeonInitScreen,
     .DestroyScreen   = radeonDestroyScreen,
-@@ -1271,23 +1553,7 @@ const struct __DriverAPIRec driDriverAPI = {
+@@ -1271,23 +1552,7 @@ const struct __DriverAPIRec driDriverAPI = {
     .WaitForSBC      = NULL,
     .SwapBuffersMSC  = NULL,
     .CopySubBuffer   = radeonCopySubBuffer,



From caillon at fedoraproject.org  Tue Apr 28 06:13:13 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 06:13:13 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.24, 1.25 iso-codes.spec, 1.31,
	1.32 sources, 1.25, 1.26
Message-ID: <20090428061313.2616770129@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18219

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 3.8-1
- Update to 3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	22 Mar 2009 19:14:51 -0000	1.24
+++ .cvsignore	28 Apr 2009 06:12:42 -0000	1.25
@@ -1 +1 @@
-iso-codes-3.7.tar.bz2
+iso-codes-3.8.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- iso-codes.spec	22 Mar 2009 19:14:51 -0000	1.31
+++ iso-codes.spec	28 Apr 2009 06:12:42 -0000	1.32
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.7
+Version:	3.8
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -59,6 +59,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 3.8-1
+- Update to 3.8
+
 * Sun Mar 22 2009 Christopher Aillon <caillon at redhat.com> - 3.7-1
 - Update to 3.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	22 Mar 2009 19:14:51 -0000	1.25
+++ sources	28 Apr 2009 06:12:42 -0000	1.26
@@ -1 +1 @@
-9b93581e8d2c32cfa505949150045623  iso-codes-3.7.tar.bz2
+7b219078203a710b7510ba54c161097c  iso-codes-3.8.tar.bz2



From caillon at fedoraproject.org  Tue Apr 28 06:22:17 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 28 Apr 2009 06:22:17 +0000 (UTC)
Subject: rpms/seahorse-plugins/devel sp-atexit.patch, NONE,
	1.1 seahorse-plugins.spec, 1.24, 1.25
Message-ID: <20090428062218.065777013C@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19445

Modified Files:
	seahorse-plugins.spec 
Added Files:
	sp-atexit.patch 
Log Message:
* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-3
- Rebuild against newer gecko

* Wed Apr 22 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
- Make seahorse-agent clean up its tempdir


sp-atexit.patch:

--- NEW FILE sp-atexit.patch ---
diff -up seahorse-plugins-2.26.1/agent/seahorse-agent.c.atexit seahorse-plugins-2.26.1/agent/seahorse-agent.c
--- seahorse-plugins-2.26.1/agent/seahorse-agent.c.atexit	2009-03-03 13:57:02.000000000 -0500
+++ seahorse-plugins-2.26.1/agent/seahorse-agent.c	2009-04-22 15:10:49.544141234 -0400
@@ -161,3 +161,8 @@ seahorse_agent_uninit (gpointer *data)
     return FALSE;
 }
 
+void
+seahorse_agent_exit ()
+{
+    seahorse_agent_uninit (NULL);
+}
diff -up seahorse-plugins-2.26.1/agent/seahorse-agent.h.atexit seahorse-plugins-2.26.1/agent/seahorse-agent.h
--- seahorse-plugins-2.26.1/agent/seahorse-agent.h.atexit	2009-03-03 13:56:43.000000000 -0500
+++ seahorse-plugins-2.26.1/agent/seahorse-agent.h	2009-04-22 15:10:49.545131874 -0400
@@ -55,6 +55,7 @@ void seahorse_agent_childsetup ();
 /* Called in the new child process */
 gboolean seahorse_agent_init ();
 gboolean seahorse_agent_uninit (gpointer *data);
+void     seahorse_agent_exit ();
 
 /* Global options to set from the command line */
 extern gboolean seahorse_agent_cshell;
diff -up seahorse-plugins-2.26.1/agent/seahorse-agent-main.c.atexit seahorse-plugins-2.26.1/agent/seahorse-agent-main.c
--- seahorse-plugins-2.26.1/agent/seahorse-agent-main.c.atexit	2009-03-03 14:00:41.000000000 -0500
+++ seahorse-plugins-2.26.1/agent/seahorse-agent-main.c	2009-04-22 15:32:32.398383172 -0400
@@ -256,6 +256,8 @@ int main(int argc, char* argv[])
     g_strfreev (agent_exec_args);
     agent_exec_args = NULL;
 
+    atexit (seahorse_agent_exit);
+
     /* Handle some signals */
     seahorse_unix_signal_register (SIGINT, unix_signal);
     seahorse_unix_signal_register (SIGTERM, unix_signal);


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- seahorse-plugins.spec	13 Apr 2009 18:08:58 -0000	1.24
+++ seahorse-plugins.spec	28 Apr 2009 06:21:47 -0000	1.25
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -52,7 +52,8 @@ Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 Requires(postun): GConf2
 
-#Patch0: epiphany-2.26.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=579738
+Patch0: sp-atexit.patch
 
 %description
 The plugins and utilities in this package integrate seahorse into
@@ -61,7 +62,7 @@ from applications like nautilus or gedit
 
 %prep
 %setup -q
-#%patch0 -p1 -b .epiphany
+%patch0 -p1 -b .atexit
 
 autoreconf -i -f
 
@@ -175,6 +176,12 @@ fi
 
 
 %changelog
+* Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-3
+- Rebuild against newer gecko
+
+* Wed Apr 22 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
+- Make seahorse-agent clean up its tempdir
+
 * Mon Apr 13 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/seahorse-plugins/2.26/seahorse-plugins-2.26.1.news



From markmc at fedoraproject.org  Tue Apr 28 06:33:30 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 28 Apr 2009 06:33:30 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.88,1.89
Message-ID: <20090428063330.9EE8970129@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22111

Modified Files:
	qemu.spec 
Log Message:
* Tue Apr 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-2.kvm85
- Provide qemu-kvm as a metapackage for comps



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- qemu.spec	27 Apr 2009 14:56:36 -0000	1.88
+++ qemu.spec	28 Apr 2009 06:33:00 -0000	1.89
@@ -5,7 +5,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.50
-Release: 1.%{kvmvertag}%{?dist}
+Release: 2.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -71,6 +71,22 @@ emulation speed by using dynamic transla
 
 As QEMU requires no host kernel patches to run, it is safe and easy to use.
 
+%package kvm
+Summary: QEMU metapackage for KVM support
+Group: Development/Tools
+%ifarch %{ix86} x86_64
+Requires: qemu-system-x86 = %{epoch}:%{version}-%{release}
+%endif
+%ifarch ppc ppc64
+Requires: qemu-system-ppc = %{epoch}:%{version}-%{release}
+%endif
+
+%description kvm
+This is a meta-package that provides a qemu-system-<arch> package for native
+architectures where kvm can be enabled. For example, in an x86 system, this
+will install qemu-system-x86
+
+
 %package  img
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
@@ -111,9 +127,6 @@ Requires: vgabios
 Requires: bochs-bios >= 2.3.8-0.5
 Provides: kvm = 85
 Obsoletes: kvm < 85
-%ifarch %{ix86} x86_64
-Provides: qemu-kvm = %{epoch}:%{version}-%{release}
-%endif
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -128,9 +141,6 @@ Summary: QEMU system emulator for ppc
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: openbios-ppc
-%ifarch ppc ppc64
-Provides: qemu-kvm = %{epoch}:%{version}-%{release}
-%endif
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
@@ -461,6 +471,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Apr 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-2.kvm85
+- Provide qemu-kvm as a metapackage for comps
+
 * Mon Apr 27 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-1.kvm85
 - Update to qemu-kvm-devel-85
 - kvm-85 is based on qemu development branch, currently version 0.10.50



From jnovy at fedoraproject.org  Tue Apr 28 06:40:06 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 28 Apr 2009 06:40:06 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore, 1.53, 1.54 netpbm-10.35-glibc.patch,
	1.2, 1.3 netpbm.spec, 1.138, 1.139 sources, 1.57,
	1.58 netpbm-10.35-docfix.patch, 1.1,
	NONE netpbm-10.35-pamtosvgsegfault.patch, 1.1,
	NONE netpbm-10.35-pbmtomacp.patch, 1.1,
	NONE netpbm-10.35-ppmdfontfix.patch, 1.1,
	NONE netpbm-10.35-ppmfadeusage.patch, 1.2,
	NONE netpbm-10.35-ppmquantall.patch, 1.2,
	NONE netpbm-10.35-ppmrainbowexit.patch, 1.1,
	NONE netpbm-10.35-ximtoppmsegfault.patch, 1.1, NONE
Message-ID: <20090428064006.BA94770129@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23149

Modified Files:
	.cvsignore netpbm-10.35-glibc.patch netpbm.spec sources 
Removed Files:
	netpbm-10.35-docfix.patch netpbm-10.35-pamtosvgsegfault.patch 
	netpbm-10.35-pbmtomacp.patch netpbm-10.35-ppmdfontfix.patch 
	netpbm-10.35-ppmfadeusage.patch netpbm-10.35-ppmquantall.patch 
	netpbm-10.35-ppmrainbowexit.patch 
	netpbm-10.35-ximtoppmsegfault.patch 
Log Message:
* Tue Apr 28 2009 Jindrich Novy <jnovy at redhat.com> 10.35.63-1
- update to 10.35.63
- basically new release with some of our patches applied upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	14 Apr 2009 10:05:34 -0000	1.53
+++ .cvsignore	28 Apr 2009 06:39:34 -0000	1.54
@@ -1 +1 @@
-netpbm-10.35.62.tar.bz2
+netpbm-10.35.63.tar.bz2

netpbm-10.35-glibc.patch:

Index: netpbm-10.35-glibc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-10.35-glibc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netpbm-10.35-glibc.patch	14 Apr 2009 10:33:48 -0000	1.2
+++ netpbm-10.35-glibc.patch	28 Apr 2009 06:39:35 -0000	1.3
@@ -11,41 +11,3 @@
  
    while ( rt->in->hasMore( rt->in ) ) {
      if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;
-diff -up netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc netpbm-10.35.62/converter/ppm/xvminitoppm.c
---- netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc	2009-04-13 09:14:06.000000000 +0200
-+++ netpbm-10.35.62/converter/ppm/xvminitoppm.c	2009-04-14 12:27:48.000000000 +0200
-@@ -52,7 +52,7 @@ parseCommandLine(int const argc,
- 
- 
- static void
--getline(FILE * const ifP,
-+get_line(FILE * const ifP,
-         char * const buf,
-         size_t const size) {
- 
-@@ -105,7 +105,7 @@ readXvHeader(FILE *         const ifP,
-     int rc;
-     bool endOfComments;
-     
--    getline(ifP, buf, sizeof(buf));
-+    get_line(ifP, buf, sizeof(buf));
- 
-     if (!STRNEQ(buf, "P7 332", 6))
-         pm_error("Input is not a XV thumbnail picture.  It does not "
-@@ -113,14 +113,14 @@ readXvHeader(FILE *         const ifP,
- 
-     endOfComments = FALSE;
-     while (!endOfComments) {
--        getline(ifP, buf, sizeof(buf));
-+        get_line(ifP, buf, sizeof(buf));
-         if (STRNEQ(buf, "#END_OF_COMMENTS", 16))
-             endOfComments = TRUE;
-         else if (STRNEQ(buf, "#BUILTIN", 8))
-             pm_error("This program does not know how to "
-                      "convert builtin XV thumbnail pictures");
-     }
--    getline(ifP, buf, sizeof(buf));
-+    get_line(ifP, buf, sizeof(buf));
-     rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval);
-     if (rc != 3)
-         pm_error("error parsing dimension info '%s'.  "


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- netpbm.spec	14 Apr 2009 10:33:48 -0000	1.138
+++ netpbm.spec	28 Apr 2009 06:39:36 -0000	1.139
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.62
+Version: 10.35.63
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -24,21 +24,13 @@ Patch11: netpbm-10.31-xwdfix.patch
 Patch12: netpbm-10.33-ppmtompeg.patch
 Patch13: netpbm-10.33-multilib.patch
 Patch14: netpbm-10.34-pamscale.patch
-Patch15: netpbm-10.35-ppmquantall.patch
-Patch17: netpbm-10.35-pbmtomacp.patch
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
 Patch20: netpbm-10.35-rgbtxt.patch
-Patch21: netpbm-10.35-pamtosvgsegfault.patch
 Patch22: netpbm-10.35-pnmmontagefix.patch
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
-Patch25: netpbm-10.35-ximtoppmsegfault.patch
-Patch26: netpbm-10.35-ppmfadeusage.patch
-Patch27: netpbm-10.35-ppmrainbowexit.patch
-Patch28: netpbm-10.35-ppmdfontfix.patch
 Patch29: netpbm-10.35-svgtopam.patch
-Patch30: netpbm-10.35-docfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -93,21 +85,13 @@ netpbm-progs.  You'll also need to insta
 %patch12 -p1 -b .ppmtompeg
 %patch13 -p1 -b .multilib
 %patch14 -p1 -b .pamscale
-%patch15 -p1 -b .pqall
-%patch17 -p1 -b .pbmtomacp
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
 %patch20 -p1 -b .rgbtxt
-%patch21 -p1 -b .pamtosvgsegfault
 %patch22 -p1 -b .pnmmontagefix
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
-%patch25 -p1 -b .ximtoppmsegfault
-%patch26 -p1 -b .ppmfadeusage
-%patch27 -p1 -b .ppmrainbowexit
-%patch28 -p1 -b .ppmdfontfix
 %patch29 -p1 -b .svgtopam
-%patch30 -p1 -b .docfix
 
 %build
 ./configure <<EOF
@@ -233,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Tue Apr 28 2009 Jindrich Novy <jnovy at redhat.com> 10.35.63-1
+- update to 10.35.63
+- basically new release with some of our patches applied upstream
+
 * Tue Apr 14 2009 Jindrich Novy <jnovy at redhat.com> 10.35.62-1
 - update to 10.35.62
 - upstream fixes pamstereogram


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Apr 2009 10:05:35 -0000	1.57
+++ sources	28 Apr 2009 06:39:36 -0000	1.58
@@ -1 +1 @@
-70617ccd4e4e2c4fdd7092ba6e004334  netpbm-10.35.62.tar.bz2
+0a12e00b6341b30cdc7f2ac5b6e0b1e0  netpbm-10.35.63.tar.bz2


--- netpbm-10.35-docfix.patch DELETED ---


--- netpbm-10.35-pamtosvgsegfault.patch DELETED ---


--- netpbm-10.35-pbmtomacp.patch DELETED ---


--- netpbm-10.35-ppmdfontfix.patch DELETED ---


--- netpbm-10.35-ppmfadeusage.patch DELETED ---


--- netpbm-10.35-ppmquantall.patch DELETED ---


--- netpbm-10.35-ppmrainbowexit.patch DELETED ---


--- netpbm-10.35-ximtoppmsegfault.patch DELETED ---



From jnovy at fedoraproject.org  Tue Apr 28 06:44:11 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 28 Apr 2009 06:44:11 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.22-cmapsize.patch,1.1,NONE
Message-ID: <20090428064411.50B4670129@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23817

Removed Files:
	netpbm-10.22-cmapsize.patch 
Log Message:
- remove yet one more patch which is already applied



--- netpbm-10.22-cmapsize.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Apr 28 06:57:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 06:57:18 +0000
Subject: [pkgdb] ghc had acl change status
Message-ID: <20090428065718.84F9810F886@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on ghc (Fedora devel) to Approved for ynemoy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From pkgdb at fedoraproject.org  Tue Apr 28 06:57:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 06:57:27 +0000
Subject: [pkgdb] ghc had acl change status
Message-ID: <20090428065727.CA59A10F898@bastion2.fedora.phx.redhat.com>

petersen has set the approveacls acl on ghc (Fedora devel) to Obsolete for ynemoy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc



From lkundrak at fedoraproject.org  Tue Apr 28 07:46:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 28 Apr 2009 07:46:19 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/EL-5 perl-Net-OAuth.spec,1.1,1.2
Message-ID: <20090428074619.720B870129@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1070/EL-5

Modified Files:
	perl-Net-OAuth.spec 
Log Message:
* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
- Fix Requires



Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/EL-5/perl-Net-OAuth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-OAuth.spec	19 Apr 2009 10:45:07 -0000	1.1
+++ perl-Net-OAuth.spec	28 Apr 2009 07:45:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,8 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
 BuildRequires:  perl(URI::Escape) >= 3.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Class::Accessor) >= 0.31
+Requires:       perl(Class::Data::Inheritable) >= 0.06
 
 %description
 Perl implementation of OAuth, an open protocol to allow secure API
@@ -58,5 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
+- Fix Requires
+
 * Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
 - Specfile autogenerated by cpanspec 1.78.



From lkundrak at fedoraproject.org  Tue Apr 28 07:46:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 28 Apr 2009 07:46:19 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-10 perl-Net-OAuth.spec,1.1,1.2
Message-ID: <20090428074619.A873870129@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1070/F-10

Modified Files:
	perl-Net-OAuth.spec 
Log Message:
* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
- Fix Requires



Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-10/perl-Net-OAuth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-OAuth.spec	19 Apr 2009 10:45:07 -0000	1.1
+++ perl-Net-OAuth.spec	28 Apr 2009 07:45:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,8 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
 BuildRequires:  perl(URI::Escape) >= 3.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Class::Accessor) >= 0.31
+Requires:       perl(Class::Data::Inheritable) >= 0.06
 
 %description
 Perl implementation of OAuth, an open protocol to allow secure API
@@ -58,5 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
+- Fix Requires
+
 * Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
 - Specfile autogenerated by cpanspec 1.78.



From lkundrak at fedoraproject.org  Tue Apr 28 07:46:20 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 28 Apr 2009 07:46:20 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-11 perl-Net-OAuth.spec,1.1,1.2
Message-ID: <20090428074620.0DF7470129@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1070/F-11

Modified Files:
	perl-Net-OAuth.spec 
Log Message:
* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
- Fix Requires



Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-11/perl-Net-OAuth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-OAuth.spec	19 Apr 2009 10:45:08 -0000	1.1
+++ perl-Net-OAuth.spec	28 Apr 2009 07:45:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,8 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
 BuildRequires:  perl(URI::Escape) >= 3.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Class::Accessor) >= 0.31
+Requires:       perl(Class::Data::Inheritable) >= 0.06
 
 %description
 Perl implementation of OAuth, an open protocol to allow secure API
@@ -58,5 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
+- Fix Requires
+
 * Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
 - Specfile autogenerated by cpanspec 1.78.



From lkundrak at fedoraproject.org  Tue Apr 28 07:46:20 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 28 Apr 2009 07:46:20 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/devel perl-Net-OAuth.spec,1.1,1.2
Message-ID: <20090428074620.5F8A570129@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1070/devel

Modified Files:
	perl-Net-OAuth.spec 
Log Message:
* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
- Fix Requires



Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/perl-Net-OAuth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-OAuth.spec	19 Apr 2009 10:45:08 -0000	1.1
+++ perl-Net-OAuth.spec	28 Apr 2009 07:45:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,8 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
 BuildRequires:  perl(URI::Escape) >= 3.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Class::Accessor) >= 0.31
+Requires:       perl(Class::Data::Inheritable) >= 0.06
 
 %description
 Perl implementation of OAuth, an open protocol to allow secure API
@@ -58,5 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
+- Fix Requires
+
 * Thu Apr 16 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-1
 - Specfile autogenerated by cpanspec 1.78.



From sharkcz at fedoraproject.org  Tue Apr 28 07:53:43 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 07:53:43 +0000 (UTC)
Subject: rpms/collectl/devel .cvsignore, 1.8, 1.9 collectl.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20090428075343.ACD3B70129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2459

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
- upgrade to upstream version 3.3.1
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Mar 2009 17:17:34 -0000	1.8
+++ .cvsignore	28 Apr 2009 07:53:13 -0000	1.9
@@ -1 +1 @@
-collectl-3.2.1.src.tar.gz
+collectl-3.3.1.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- collectl.spec	21 Mar 2009 17:17:34 -0000	1.9
+++ collectl.spec	28 Apr 2009 07:53:13 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.2.1
+Version: 3.3.1
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -62,10 +62,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  formatit.ph       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  sexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  lexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  vmstat.ph         $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -101,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
+- upgrade to upstream version 3.3.1
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Sat Mar 21 2009 Dan Horak <dan[at]danny.cz> 3.2.1-1
 - upgrade to upstream version 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Mar 2009 17:17:34 -0000	1.8
+++ sources	28 Apr 2009 07:53:13 -0000	1.9
@@ -1 +1 @@
-7ed58f48a80179745b89071e52c36e75  collectl-3.2.1.src.tar.gz
+603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz



From denis at fedoraproject.org  Tue Apr 28 07:55:14 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 28 Apr 2009 07:55:14 +0000 (UTC)
Subject: rpms/transmission/F-11 transmission-1.52-preallocate.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 transmission.spec,
	1.35, 1.36 transmission-1.51-xdg-download-dir.patch, 1.1, NONE
Message-ID: <20090428075514.B564C70129@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2772

Modified Files:
	.cvsignore sources transmission.spec 
Added Files:
	transmission-1.52-preallocate.patch 
Removed Files:
	transmission-1.51-xdg-download-dir.patch 
Log Message:
- Update to upstream 1.52
- XDG Download patch upstreamed
- Added patch to make full allocation by default


transmission-1.52-preallocate.patch:

--- NEW FILE transmission-1.52-preallocate.patch ---
--- transmission-1.52/libtransmission/session.c~	2009-04-13 03:55:49.000000000 +0200
+++ transmission-1.52/libtransmission/session.c	2009-04-28 09:41:42.835881966 +0200
@@ -237,7 +237,7 @@
     tr_bencDictAddInt( d, TR_PREFS_KEY_PEER_SOCKET_TOS,          atoi( TR_DEFAULT_PEER_SOCKET_TOS_STR ) );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PEX_ENABLED,              TRUE );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PORT_FORWARDING,          TRUE );
-    tr_bencDictAddInt( d, TR_PREFS_KEY_PREALLOCATION,            TR_PREALLOCATE_SPARSE );
+    tr_bencDictAddInt( d, TR_PREFS_KEY_PREALLOCATION,            TR_PREALLOCATE_FULL );
     tr_bencDictAddStr( d, TR_PREFS_KEY_PROXY,                    "" );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PROXY_AUTH_ENABLED,       FALSE );
     tr_bencDictAddInt( d, TR_PREFS_KEY_PROXY_ENABLED,            FALSE );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	28 Feb 2009 08:44:59 -0000	1.27
+++ .cvsignore	28 Apr 2009 07:54:44 -0000	1.28
@@ -1 +1 @@
-transmission-1.51.tar.bz2
+transmission-1.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	28 Feb 2009 08:44:59 -0000	1.27
+++ sources	28 Apr 2009 07:54:44 -0000	1.28
@@ -1 +1 @@
-b93439fbd0040ad6eb448f70a48355f5  transmission-1.51.tar.bz2
+2a1a628c2a8872934575cb4351bca291  transmission-1.52.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-11/transmission.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- transmission.spec	28 Mar 2009 11:52:48 -0000	1.35
+++ transmission.spec	28 Apr 2009 07:54:44 -0000	1.36
@@ -1,7 +1,7 @@
 
 Name:           transmission
-Version:        1.51
-Release:        2%{?dist}
+Version:        1.52
+Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -9,9 +9,9 @@ Group:          Applications/Internet
 License:        MIT and GPLv2
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
-Patch0:         transmission-1.51-xdg-download-dir.patch
 Patch2:         transmission-1.51-copt.patch
 Patch3:         transmission-1.51-libevent.patch
+Patch4:         transmission-1.52-preallocate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel >= 0.9.4
@@ -33,9 +33,9 @@ back-end.
 
 %prep
 %setup -q
-%patch0 -p1 -b .xdg-download-dir
 %patch2 -p1 -b .copt
 %patch3 -p1 -b .libevent
+%patch4 -p1 -b .preallocate
 
 
 %build
@@ -82,6 +82,11 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Tue Apr 28 2009 Denis Leroy <denis at poolshark.org> - 1.52-1
+- Update to upstream 1.52
+- XDG Download patch upstreamed
+- Added patch to make full allocation by default
+
 * Sat Mar 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.51-2
 - Use XDG Download directory (#490950)
 


--- transmission-1.51-xdg-download-dir.patch DELETED ---



From thm at fedoraproject.org  Tue Apr 28 07:57:23 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 28 Apr 2009 07:57:23 +0000 (UTC)
Subject: rpms/python-markdown/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-markdown.spec, 1.3, 1.4 sources, 1.2, 1.3 markdown,
	1.1, NONE
Message-ID: <20090428075723.161CA70129@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3440/devel

Modified Files:
	.cvsignore import.log python-markdown.spec sources 
Removed Files:
	markdown 
Log Message:
Update to 2.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 07:14:47 -0000	1.2
+++ .cvsignore	28 Apr 2009 07:56:52 -0000	1.3
@@ -1 +1 @@
-markdown-1.7.tar.gz
+Markdown-2.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2008 07:14:47 -0000	1.1
+++ import.log	28 Apr 2009 07:56:52 -0000	1.2
@@ -1 +1,2 @@
 python-markdown-1_7-1_fc9:HEAD:python-markdown-1.7-1.fc9.src.rpm:1218525227
+python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362


Index: python-markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/python-markdown.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-markdown.spec	26 Feb 2009 22:15:14 -0000	1.3
+++ python-markdown.spec	28 Apr 2009 07:56:52 -0000	1.4
@@ -1,16 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define srcname markdown
+%define srcname Markdown
 
 Name:           python-markdown
-Version:        1.7
-Release:        3%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
-License:        GPLv2 or BSD
+License:        BSD
 URL:            http://www.freewisdom.org/projects/python-markdown/
-Source0:        http://downloads.sourceforge.net/%{name}/%{srcname}-%{version}.tar.gz
-Source1:        markdown
+Source0:        http://pypi.python.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -25,8 +24,9 @@ there are a few known issues.
 %prep
 %setup -q -n %{srcname}-%{version}
 
-# remove shebang
-%{__sed} -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' markdown.py
+# remove shebangs
+find markdown -type f -name '*.py' \
+  -exec sed -i -e '/^#!/{1D}' {} \;
 
 
 %build
@@ -36,7 +36,7 @@ there are a few known issues.
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__install} -p -m 0755 -D %{SOURCE1} %{buildroot}%{_bindir}/markdown
+mv %{buildroot}%{_bindir}/markdown{.py,}
 
 
 %clean
@@ -45,17 +45,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGE_LOG.txt README.txt README.html
+%doc docs/*
 %{python_sitelib}/*
 %{_bindir}/markdown
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0-1
+- Update to 2.0.
+- Adjusted source URL.
+- License is now BSD only.
+- Upstream now provides a script to run markdown from the cmdline.
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.7-2
-- Rebuild for Python 2.6
 
 * Mon Aug  4 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.7-1
 - New package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2008 07:14:47 -0000	1.2
+++ sources	28 Apr 2009 07:56:52 -0000	1.3
@@ -1 +1 @@
-4297ebcdedc92b4bc7bc9ecd01053565  markdown-1.7.tar.gz
+4db8d332f531de10370ebaf1d2615786  Markdown-2.0.tar.gz


--- markdown DELETED ---



From sharkcz at fedoraproject.org  Tue Apr 28 08:04:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 08:04:56 +0000 (UTC)
Subject: rpms/collectl/F-10 .cvsignore, 1.8, 1.9 collectl.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20090428080456.0110B70129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5044

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
- upgrade to upstream version 3.3.1
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Mar 2009 17:22:29 -0000	1.8
+++ .cvsignore	28 Apr 2009 08:04:25 -0000	1.9
@@ -1 +1 @@
-collectl-3.2.1.src.tar.gz
+collectl-3.3.1.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/collectl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- collectl.spec	21 Mar 2009 17:22:29 -0000	1.7
+++ collectl.spec	28 Apr 2009 08:04:25 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.2.1
+Version: 3.3.1
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -62,10 +62,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  formatit.ph       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  sexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  lexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  vmstat.ph         $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -101,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
+- upgrade to upstream version 3.3.1
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Sat Mar 21 2009 Dan Horak <dan[at]danny.cz> 3.2.1-1
 - upgrade to upstream version 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Mar 2009 17:22:29 -0000	1.8
+++ sources	28 Apr 2009 08:04:25 -0000	1.9
@@ -1 +1 @@
-7ed58f48a80179745b89071e52c36e75  collectl-3.2.1.src.tar.gz
+603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz



From sharkcz at fedoraproject.org  Tue Apr 28 08:03:39 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 08:03:39 +0000 (UTC)
Subject: rpms/collectl/F-11 .cvsignore, 1.8, 1.9 collectl.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20090428080339.682F970129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4714

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
- upgrade to upstream version 3.3.1
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Mar 2009 17:17:34 -0000	1.8
+++ .cvsignore	28 Apr 2009 08:03:08 -0000	1.9
@@ -1 +1 @@
-collectl-3.2.1.src.tar.gz
+collectl-3.3.1.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/collectl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- collectl.spec	21 Mar 2009 17:17:34 -0000	1.9
+++ collectl.spec	28 Apr 2009 08:03:08 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.2.1
+Version: 3.3.1
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -62,10 +62,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  formatit.ph       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  sexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  lexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  vmstat.ph         $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -101,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
+- upgrade to upstream version 3.3.1
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Sat Mar 21 2009 Dan Horak <dan[at]danny.cz> 3.2.1-1
 - upgrade to upstream version 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Mar 2009 17:17:34 -0000	1.8
+++ sources	28 Apr 2009 08:03:08 -0000	1.9
@@ -1 +1 @@
-7ed58f48a80179745b89071e52c36e75  collectl-3.2.1.src.tar.gz
+603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz



From sharkcz at fedoraproject.org  Tue Apr 28 08:06:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 08:06:09 +0000 (UTC)
Subject: rpms/collectl/F-9 .cvsignore, 1.8, 1.9 collectl.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20090428080609.B791B70129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5301

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
- upgrade to upstream version 3.3.1
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Mar 2009 17:23:55 -0000	1.8
+++ .cvsignore	28 Apr 2009 08:05:39 -0000	1.9
@@ -1 +1 @@
-collectl-3.2.1.src.tar.gz
+collectl-3.3.1.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/collectl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- collectl.spec	21 Mar 2009 17:23:56 -0000	1.7
+++ collectl.spec	28 Apr 2009 08:05:39 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.2.1
+Version: 3.3.1
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -62,10 +62,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  formatit.ph       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  sexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  lexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  vmstat.ph         $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -101,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
+- upgrade to upstream version 3.3.1
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Sat Mar 21 2009 Dan Horak <dan[at]danny.cz> 3.2.1-1
 - upgrade to upstream version 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Mar 2009 17:23:56 -0000	1.8
+++ sources	28 Apr 2009 08:05:39 -0000	1.9
@@ -1 +1 @@
-7ed58f48a80179745b89071e52c36e75  collectl-3.2.1.src.tar.gz
+603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz



From sharkcz at fedoraproject.org  Tue Apr 28 08:08:21 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 08:08:21 +0000 (UTC)
Subject: rpms/collectl/EL-5 .cvsignore, 1.8, 1.9 collectl.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20090428080821.4067970129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5617

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
- upgrade to upstream version 3.3.1
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Mar 2009 17:25:45 -0000	1.8
+++ .cvsignore	28 Apr 2009 08:07:50 -0000	1.9
@@ -1 +1 @@
-collectl-3.2.1.src.tar.gz
+collectl-3.3.1.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- collectl.spec	21 Mar 2009 17:25:45 -0000	1.7
+++ collectl.spec	28 Apr 2009 08:07:50 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.2.1
+Version: 3.3.1
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -62,10 +62,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  formatit.ph       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  sexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  lexpr.ph          $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-install -p -m 644  vmstat.ph         $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -101,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
+- upgrade to upstream version 3.3.1
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Sat Mar 21 2009 Dan Horak <dan[at]danny.cz> 3.2.1-1
 - upgrade to upstream version 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Mar 2009 17:25:45 -0000	1.8
+++ sources	28 Apr 2009 08:07:50 -0000	1.9
@@ -1 +1 @@
-7ed58f48a80179745b89071e52c36e75  collectl-3.2.1.src.tar.gz
+603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz



From rjones at fedoraproject.org  Tue Apr 28 08:55:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 28 Apr 2009 08:55:30 +0000 (UTC)
Subject: rpms/febootstrap/F-10 febootstrap.spec,1.3,1.4
Message-ID: <20090428085530.2EAEE70129@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13877

Modified Files:
	febootstrap.spec 
Log Message:
Fix bad Requires on non-existent fakechroot.


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-10/febootstrap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- febootstrap.spec	20 Apr 2009 19:19:34 -0000	1.3
+++ febootstrap.spec	28 Apr 2009 08:54:59 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
 Version:     1.7
-Release:     1%{?dist}
+Release:     1%{?dist}.1
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -15,7 +15,7 @@ BuildRequires: fakechroot >= 2.9-19
 BuildRequires: yum >= 3.2
 
 Requires:    fakeroot >= 1.11
-Requires:    fakechroot >= 2.9-20
+Requires:    fakechroot >= 2.9-19
 Requires:    yum >= 3.2
 Requires:    MAKEDEV
 Requires:    util-linux-ng
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Richard Jones <rjones at redhat.com> - 1.7-1.fc10.1
+- Fix bad Requires on non-existent fakechroot.
+
 * Mon Apr 20 2009 Richard Jones <rjones at redhat.com> - 1.7-1
 - New upstream release 1.7.
 



From kwizart at fedoraproject.org  Tue Apr 28 08:58:52 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 28 Apr 2009 08:58:52 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla.spec, 1.38, 1.39 sources, 1.35,
	1.36 .cvsignore, 1.31, 1.32
Message-ID: <20090428085852.95DE770132@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14496

Modified Files:
	filezilla.spec sources .cvsignore 
Log Message:
Update to 3.2.4.1



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- filezilla.spec	21 Apr 2009 21:41:29 -0000	1.38
+++ filezilla.spec	28 Apr 2009 08:58:21 -0000	1.39
@@ -1,7 +1,7 @@
 #define fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.4
+Version:        3.2.4.1
 Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Tue Apr 28 2009 kwizart < kwizart at gmail.com > - 3.2.4.1-1
+- Update to 3.2.4.1
+
 * Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 3.2.4-1
 - Update to 3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	21 Apr 2009 21:41:29 -0000	1.35
+++ sources	28 Apr 2009 08:58:22 -0000	1.36
@@ -1 +1 @@
-271550234ae3512736963d36f3a3281f  FileZilla_3.2.4_src.tar.bz2
+ceeec2016b333597b51a7d7315678f9b  FileZilla_3.2.4.1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	21 Apr 2009 21:41:29 -0000	1.31
+++ .cvsignore	28 Apr 2009 08:58:22 -0000	1.32
@@ -1 +1 @@
-FileZilla_3.2.4_src.tar.bz2
+FileZilla_3.2.4.1_src.tar.bz2



From kwizart at fedoraproject.org  Tue Apr 28 09:07:13 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 28 Apr 2009 09:07:13 +0000 (UTC)
Subject: rpms/filezilla/F-11 filezilla.spec,1.38,1.39 sources,1.35,1.36
Message-ID: <20090428090713.606C170129@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16756

Modified Files:
	filezilla.spec sources 
Log Message:
Update to 3.2.4.1



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-11/filezilla.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- filezilla.spec	21 Apr 2009 22:34:06 -0000	1.38
+++ filezilla.spec	28 Apr 2009 09:06:43 -0000	1.39
@@ -1,7 +1,7 @@
 #define fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.4
+Version:        3.2.4.1
 Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Tue Apr 28 2009 kwizart < kwizart at gmail.com > - 3.2.4.1-1
+- Update to 3.2.4.1
+
 * Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 3.2.4-1
 - Update to 3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	21 Apr 2009 22:34:05 -0000	1.35
+++ sources	28 Apr 2009 09:06:43 -0000	1.36
@@ -1 +1 @@
-271550234ae3512736963d36f3a3281f  FileZilla_3.2.4_src.tar.bz2
+ceeec2016b333597b51a7d7315678f9b  FileZilla_3.2.4.1_src.tar.bz2



From hadess at fedoraproject.org  Tue Apr 28 09:07:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 28 Apr 2009 09:07:31 +0000 (UTC)
Subject: rpms/rhythmbox/devel .cvsignore, 1.51, 1.52 rhythmbox.spec, 1.244, 
	1.245 sources, 1.53, 1.54 fix-psp-entry-types.diff, 1.1,
	NONE rb-0.12.0-sj-updates.patch, 1.1,
	NONE rb-0.12.0-use-decodebin2.patch, 1.1,
	NONE rb-ddkit-monitor.patch, 1.4, NONE
Message-ID: <20090428090731.E0CA970129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16829

Modified Files:
	.cvsignore rhythmbox.spec sources 
Removed Files:
	fix-psp-entry-types.diff rb-0.12.0-sj-updates.patch 
	rb-0.12.0-use-decodebin2.patch rb-ddkit-monitor.patch 
Log Message:
* Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.1-1
- Update to 0.12.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	22 Apr 2009 12:46:51 -0000	1.51
+++ .cvsignore	28 Apr 2009 09:07:01 -0000	1.52
@@ -1 +1 @@
-rhythmbox-0.12.0.92.tar.bz2
+rhythmbox-0.12.1.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- rhythmbox.spec	22 Apr 2009 12:46:52 -0000	1.244
+++ rhythmbox.spec	28 Apr 2009 09:07:01 -0000	1.245
@@ -2,18 +2,16 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.12.0.92
+Version: 0.12.1
 Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
-#Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
-Source: %{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/rhythmbox/0.12/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=524079
 Source2: rhythmbox.png
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0
-Requires: libgnomeui >= 2.6.0
 Requires: gnome-python2 gnome-python2-gconf gnome-python2-gnomevfs
 Requires: gnome-themes
 Requires(post): scrollkeeper
@@ -26,7 +24,6 @@ Requires: gstreamer-python
 
 BuildRequires: libgpod-devel
 BuildRequires: gnome-media-devel
-BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: brasero-devel
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gettext, scrollkeeper
@@ -222,6 +219,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.1-1
+- Update to 0.12.1
+
 * Wed Apr 22 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0.92-1
 - Update to 0.12.0.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	22 Apr 2009 12:46:52 -0000	1.53
+++ sources	28 Apr 2009 09:07:01 -0000	1.54
@@ -1 +1 @@
-ac0e342bb68e5dde0cb1df5ba62f305e  rhythmbox-0.12.0.92.tar.bz2
+f17a72465dc43d554b11cf7b18776bff  rhythmbox-0.12.1.tar.bz2


--- fix-psp-entry-types.diff DELETED ---


--- rb-0.12.0-sj-updates.patch DELETED ---


--- rb-0.12.0-use-decodebin2.patch DELETED ---


--- rb-ddkit-monitor.patch DELETED ---



From jskala at fedoraproject.org  Tue Apr 28 09:07:54 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 28 Apr 2009 09:07:54 +0000 (UTC)
Subject: rpms/radvd/devel radvd-1.2-posix.patch, 1.1, 1.2 radvd.init, 1.4,
	1.5 radvd.spec, 1.50, 1.51
Message-ID: <20090428090754.3ACFC70129@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17117

Modified Files:
	radvd-1.2-posix.patch radvd.init radvd.spec 
Log Message:
* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-2
- fixed ambiguous condition in init script (exit 4)


radvd-1.2-posix.patch:

Index: radvd-1.2-posix.patch
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd-1.2-posix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radvd-1.2-posix.patch	27 Apr 2009 20:16:37 -0000	1.1
+++ radvd-1.2-posix.patch	28 Apr 2009 09:07:53 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up radvd-1.2/redhat/radvd.init.posix radvd-1.2/redhat/radvd.init
---- radvd-1.2/redhat/radvd.init.posix	2009-04-27 21:56:39.000000000 +0200
-+++ radvd-1.2/redhat/radvd.init	2009-04-27 21:59:22.000000000 +0200
+--- radvd-1.2/redhat/radvd.init.posix	2008-02-27 14:02:59.000000000 +0100
++++ radvd-1.2/redhat/radvd.init	2009-04-28 11:05:07.000000000 +0200
 @@ -28,12 +28,6 @@
  
  [ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
@@ -25,8 +25,8 @@ diff -up radvd-1.2/redhat/radvd.init.pos
 +	if [ ! -f /etc/radvd.conf ]; then
 +		echo "Configuration file /etc/radvd.conf missing" 1>&2
 +		exit 6
-+		fi
-+	if [ ! -x /usr/sbin/radvd ]; then
++	fi
++	if [ `id -u` -ne 0 ]; then
 +		echo "Insufficient privilege" 1>&2
 +		exit 4
 +	fi


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- radvd.init	27 Apr 2009 20:16:37 -0000	1.4
+++ radvd.init	28 Apr 2009 09:07:53 -0000	1.5
@@ -39,7 +39,7 @@ case "$1" in
       echo "Configuration file /etc/radvd.conf missing" 1>&2
       exit 6
     fi
-    if [ ! -x /usr/sbin/radvd ]; then
+    if [ `id -u` -ne 0 ]; then
       echo "Insufficient privilege" 1>&2
       exit 4
     fi


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- radvd.spec	27 Apr 2009 20:16:37 -0000	1.50
+++ radvd.spec	28 Apr 2009 09:07:53 -0000	1.51
@@ -5,7 +5,7 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -95,7 +95,10 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
-* Mon Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-2
+- fixed ambiguous condition in init script (exit 4)
+
+* Mon Apr 27 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
 - updated to latest upstream version
 
 * Fri Feb 27 2009 Jiri Skala <jskala at redhat.com> - 1.1-8



From hadess at fedoraproject.org  Tue Apr 28 09:08:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 28 Apr 2009 09:08:40 +0000 (UTC)
Subject: rpms/rhythmbox/F-11 .cvsignore, 1.51, 1.52 rhythmbox.spec, 1.244,
	1.245 sources, 1.53, 1.54
Message-ID: <20090428090840.3937C70129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17218

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.1-1
- Update to 0.12.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	22 Apr 2009 12:15:31 -0000	1.51
+++ .cvsignore	28 Apr 2009 09:08:09 -0000	1.52
@@ -1 +1 @@
-rhythmbox-0.12.0.92.tar.bz2
+rhythmbox-0.12.1.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/rhythmbox.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- rhythmbox.spec	22 Apr 2009 12:15:35 -0000	1.244
+++ rhythmbox.spec	28 Apr 2009 09:08:09 -0000	1.245
@@ -2,18 +2,16 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.12.0.92
+Version: 0.12.1
 Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
-#Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
-Source: %{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/rhythmbox/0.12/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=524079
 Source2: rhythmbox.png
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0
-Requires: libgnomeui >= 2.6.0
 Requires: gnome-python2 gnome-python2-gconf gnome-python2-gnomevfs
 Requires: gnome-themes
 Requires(post): scrollkeeper
@@ -26,7 +24,6 @@ Requires: gstreamer-python
 
 BuildRequires: libgpod-devel
 BuildRequires: gnome-media-devel
-BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: brasero-devel
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gettext, scrollkeeper
@@ -222,6 +219,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.1-1
+- Update to 0.12.1
+
 * Wed Apr 22 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0.92-1
 - Update to 0.12.0.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	22 Apr 2009 12:15:35 -0000	1.53
+++ sources	28 Apr 2009 09:08:09 -0000	1.54
@@ -1 +1 @@
-ac0e342bb68e5dde0cb1df5ba62f305e  rhythmbox-0.12.0.92.tar.bz2
+f17a72465dc43d554b11cf7b18776bff  rhythmbox-0.12.1.tar.bz2



From jskala at fedoraproject.org  Tue Apr 28 09:12:26 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 28 Apr 2009 09:12:26 +0000 (UTC)
Subject: rpms/squid/devel squid.init,1.12,1.13 squid.spec,1.121,1.122
Message-ID: <20090428091226.496CF70129@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17835

Modified Files:
	squid.init squid.spec 
Log Message:
* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
- fixed ambiguous condition in the init script (exit 4)



Index: squid.init
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- squid.init	8 Oct 2008 06:45:52 -0000	1.12
+++ squid.init	28 Apr 2009 09:11:55 -0000	1.13
@@ -50,7 +50,7 @@ probe() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 
-	[ -z "$SQUID" ] && exit 4
+	[ `id -u` -ne 0 ] && exit 4
 
 	# check if the squid conf file is present
 	[ -f $SQUID_CONF ] || exit 6


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- squid.spec	20 Apr 2009 17:21:19 -0000	1.121
+++ squid.spec	28 Apr 2009 09:11:55 -0000	1.122
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE14
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -338,6 +338,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
+- fixed ambiguous condition in the init script (exit 4)
+
 * Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
 



From hadess at fedoraproject.org  Tue Apr 28 09:16:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 28 Apr 2009 09:16:45 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.70,1.71
Message-ID: <20090428091645.4BE7670129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18650

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-2
- Build with gajim support (#497975)


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- nautilus-sendto.spec	20 Apr 2009 13:57:04 -0000	1.70
+++ nautilus-sendto.spec	28 Apr 2009 09:16:14 -0000	1.71
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        1.1.4.1
-Release: 	1%{?dist}.1
+Release: 	2%{?dist}.1
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -23,6 +23,7 @@ BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  gupnp-av-devel
 BuildRequires:  empathy-devel
 BuildRequires:  evolution-devel
+BuildRequires:  gajim
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -96,6 +97,9 @@ fi
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-2
+- Build with gajim support (#497975)
+
 * Mon Apr 20 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-1
 - Update to 1.1.4.1
 



From veillard at fedoraproject.org  Tue Apr 28 09:19:06 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 28 Apr 2009 09:19:06 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.125,1.126
Message-ID: <20090428091906.7797270129@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19049

Modified Files:
	libvirt.spec 
Log Message:
- fix packaging bug #496945 libvirt should own /var/cache/libvirt
Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- libvirt.spec	24 Apr 2009 14:57:21 -0000	1.125
+++ libvirt.spec	28 Apr 2009 09:18:35 -0000	1.126
@@ -55,7 +55,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.3
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -335,6 +335,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_loc
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
 # Default dir for kernel+initrd images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
+# used for virDomainMemoryPeek
+install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
@@ -455,6 +457,7 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
 %dir %{_localstatedir}/run/libvirt/qemu/
@@ -541,6 +544,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 28 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-2.fc12
+- fix packaging bug #496945 libvirt should own /var/cache/libvirt
+
 * Fri Apr 24 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-1.fc12
 - release of 0.6.3
 - VirtualBox driver



From caolanm at fedoraproject.org  Tue Apr 28 09:32:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 09:32:52 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.13,
	1.14 openoffice.org.spec, 1.1729, 1.1730
Message-ID: <20090428093252.18C1A70129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22104/F-10

Modified Files:
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#497882 audio/visual loop stub

openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:

Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	18 Dec 2008 18:40:26 -0000	1.13
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	28 Apr 2009 09:32:20 -0000	1.14
@@ -968,14 +968,13 @@ retrieving revision 1.8.90.1
 diff -u -p -r1.8.90.1 gtkobject.cxx
 --- vcl/unx/gtk/window/gtkobject.cxx    10 Aug 2006 14:54:05 -0000      1.8.90.1
 +++ vcl/unx/gtk/window/gtkobject.cxx    5 Jan 2007 15:00:54 -0000
-@@ -211,3 +242,12 @@ void GtkSalObject::signalDestroy( GtkObj
+@@ -211,3 +242,11 @@ void GtkSalObject::signalDestroy( GtkObj
          pThis->m_pSocket = NULL;
      }
  }
 +
 +void GtkSalObject::SetForwardKey( BOOL bEnable )
 +{
-+    printf ("GtkSalObject::SetForwardKey\n");
 +    if( bEnable )
 +        gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
 +    else
@@ -3275,3 +3274,15 @@ diff -ru /usr/src/redhat/BUILD/OOF680_m1
      sal_Bool                mbMuted;
      sal_Bool                mbLooping;
      sal_Bool                mbInitialized;
+diff -ru avmedia.orig/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx	2009-04-28 08:28:19.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx	2009-04-28 09:11:50.000000000 +0100
+@@ -142,6 +142,8 @@
+         //DBG( "EOS, reset state to NULL" );
+         gst_element_set_state( mpPlaybin, GST_STATE_READY );
+         mbPlayPending = false;
++        if (mbLooping)
++            start();
+         break;
+     case GST_MESSAGE_STATE_CHANGED:
+         if( message->src == GST_OBJECT( mpPlaybin ) ) {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1729
retrieving revision 1.1730
diff -u -p -r1.1729 -r1.1730
--- openoffice.org.spec	27 Apr 2009 14:07:59 -0000	1.1729
+++ openoffice.org.spec	28 Apr 2009 09:32:21 -0000	1.1730
@@ -3791,12 +3791,13 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
+* Tue Apr 28 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
 - Resolves: rhbz#494643 EMF polypolygons issue
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
 - Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+- Resolves: rhbz#497882 implement audio/visual looping stub
 
 * Mon Mar 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch



From caolanm at fedoraproject.org  Tue Apr 28 09:32:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 09:32:53 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 ooo-build.ooo68717.gstreamer.video.patch,
	1.1, 
	1.2 openoffice.org.spec, 1.1901, 1.1902 workspace.fwk103.patch,
	1.2, 1.3 openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, 1.2, NONE
Message-ID: <20090428093253.4D11670129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22104/F-11

Modified Files:
	ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec 
	workspace.fwk103.patch 
Removed Files:
	openoffice.org-3.0.1.ooo99050.sw.htmlload.patch 
Log Message:
Resolves: rhbz#497882 audio/visual loop stub

ooo-build.ooo68717.gstreamer.video.patch:

Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ooo-build.ooo68717.gstreamer.video.patch	18 Mar 2009 12:36:26 -0000	1.1
+++ ooo-build.ooo68717.gstreamer.video.patch	28 Apr 2009 09:32:21 -0000	1.2
@@ -960,14 +960,13 @@ retrieving revision 1.8.90.1
 diff -u -p -r1.8.90.1 gtkobject.cxx
 --- vcl/unx/gtk/window/gtkobject.cxx    10 Aug 2006 14:54:05 -0000      1.8.90.1
 +++ vcl/unx/gtk/window/gtkobject.cxx    5 Jan 2007 15:00:54 -0000
-@@ -211,3 +242,12 @@ void GtkSalObject::signalDestroy( GtkObj
+@@ -211,3 +242,11 @@ void GtkSalObject::signalDestroy( GtkObj
          pThis->m_pSocket = NULL;
      }
  }
 +
 +void GtkSalObject::SetForwardKey( BOOL bEnable )
 +{
-+    printf ("GtkSalObject::SetForwardKey\n");
 +    if( bEnable )
 +        gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
 +    else
@@ -3267,3 +3266,15 @@ diff -ru /usr/src/redhat/BUILD/OOF680_m1
      sal_Bool                mbMuted;
      sal_Bool                mbLooping;
      sal_Bool                mbInitialized;
+diff -ru avmedia.orig/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx	2009-04-28 08:28:19.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx	2009-04-28 09:11:50.000000000 +0100
+@@ -142,6 +142,8 @@
+         //DBG( "EOS, reset state to NULL" );
+         gst_element_set_state( mpPlaybin, GST_STATE_READY );
+         mbPlayPending = false;
++        if (mbLooping)
++            start();
+         break;
+     case GST_MESSAGE_STATE_CHANGED:
+         if( message->src == GST_OBJECT( mpPlaybin ) ) {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1901
retrieving revision 1.1902
diff -u -p -r1.1901 -r1.1902
--- openoffice.org.spec	27 Apr 2009 14:07:59 -0000	1.1901
+++ openoffice.org.spec	28 Apr 2009 09:32:22 -0000	1.1902
@@ -115,29 +115,28 @@ Patch39: workspace.cmcfixes54.patch
 Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch41: workspace.fwk103.patch
 Patch42: workspace.hb18.patch
-Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch46: workspace.vcl100.patch
-Patch47: workspace.xmergeclean.patch
-Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch49: workspace.impress169.patch
-Patch50: workspace.os130.patch
-Patch51: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch52: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch53: workspace.cmcfixes57.patch
-Patch54: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch55: ooo-build.ooo2497.filter.svg.patch
-Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch59: workspace.vcl101.patch
-Patch60: workspace.slideshow1.patch
-Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch65: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch43: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch44: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch45: workspace.vcl100.patch
+Patch46: workspace.xmergeclean.patch
+Patch47: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch48: workspace.impress169.patch
+Patch49: workspace.os130.patch
+Patch50: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch51: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch52: workspace.cmcfixes57.patch
+Patch53: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch54: ooo-build.ooo2497.filter.svg.patch
+Patch55: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch56: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch57: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch58: workspace.vcl101.patch
+Patch59: workspace.slideshow1.patch
+Patch60: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch61: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1611,29 +1610,28 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
 %patch42 -p0 -b .workspace.hb18.patch
-%patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch46 -p0 -b .workspace.vcl100.patch
-%patch47 -p0 -b .workspace.xmergeclean.patch
-%patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch49 -p0 -b .workspace.impress169.patch
-%patch50 -p0 -b .workspace.os130.patch
-%patch51 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch52 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch53 -p0 -b .workspace.cmcfixes57.patch
-%patch54 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch55 -p1 -b .ooo2497.filter.svg.patch
-%patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch59 -p1 -b .workspace.vcl101.patch
-%patch60 -p2 -b .workspace.slideshow1.patch
-%patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch62 -p0 -b .ooo101274.opening-a-directory.patch
-%patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch65 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch43 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch44 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch45 -p0 -b .workspace.vcl100.patch
+%patch46 -p0 -b .workspace.xmergeclean.patch
+%patch47 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch48 -p0 -b .workspace.impress169.patch
+%patch49 -p0 -b .workspace.os130.patch
+%patch50 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch51 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch52 -p0 -b .workspace.cmcfixes57.patch
+%patch53 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch54 -p1 -b .ooo2497.filter.svg.patch
+%patch55 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch56 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch57 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch58 -p1 -b .workspace.vcl101.patch
+%patch59 -p2 -b .workspace.slideshow1.patch
+%patch60 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch61 -p0 -b .ooo101274.opening-a-directory.patch
+%patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4132,10 +4130,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+* Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 - Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+- Resolves: rhbz#497882 implement audio/visual looping stub
 
 * Fri Apr 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch

workspace.fwk103.patch:

Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.fwk103.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.fwk103.patch	26 Feb 2009 14:01:38 -0000	1.2
+++ workspace.fwk103.patch	28 Apr 2009 09:32:22 -0000	1.3
@@ -38,3 +38,163 @@ diff -u -r1.7 plugin.cxx
      }
  
      return FALSE;
+Index: htmlform.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/htmlform.cxx,v
+retrieving revision 1.26
+retrieving revision 1.26.112.1
+diff -u -r1.26 -r1.26.112.1
+--- openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
++++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
+@@ -706,6 +706,7 @@
+ 								   sal_Bool bMinHeight,
+ 								   int nToken )
+ {
++	nToken = 0;
+ 	if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth  && !bMinHeight )
+ 		return;
+ 
+@@ -721,35 +722,14 @@
+ 		// one, no view shell will be created. That for, we have to do that of
+ 		// our own. This happens if a linked section is inserted or refreshed.
+ 		SwDocShell *pDocSh = pDoc->GetDocShell();
+-		if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
++		if( pDocSh )
+ 		{
+-            SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
++
++			pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
+ 			CallStartAction();
+ 			pDoc->GetEditShell( &pVSh );
+ 		}
+ 	}
+-	if( !pVSh )
+-	{
+-		// If there is no view shell by now, but the document is loaded
+-		// asynchronous, the view shell will be created delayed because
+-		// the view was locked during the call to DocumentDetected. If this
+-		// is the case we wait until another call to our DataAvailable
+-		// link, because the SFX calls it if it creates the view.
+-		ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
+-		ASSERT( !IsParserWorking() || nEventId,
+-				"Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
+-		if( IsParserWorking() && bDocInitalized && nEventId )
+-		{
+-			pPendStack = new SwPendingStack( nToken, pPendStack );
+-			pPendStack->pData =
+-				new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
+-													 bMinWidth, bMinHeight );
+-			SaveState( nToken );
+-			eState = SVPAR_PENDING;
+-		}
+-
+-		return;
+-	}
+ 
+     uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
+ 	SwXShape *pSwShape = xTunnel.is() ?
+@@ -768,8 +748,7 @@
+ 	ASSERT( pObj, "SdrObject nicht gefunden" );
+ 	ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
+ 
+-    const SdrView* pDrawView = pVSh->GetDrawView();
+-    ASSERT( pDrawView, "DrawView not found" );
++	const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
+ 
+ 	SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
+ 	uno::Reference< awt::XControl > xControl;
+Index: swhtml.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
+retrieving revision 1.49
+retrieving revision 1.49.112.1
+diff -u -r1.49 -r1.49.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
++++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
+@@ -114,6 +114,8 @@
+ #include <breakit.hxx>
+ #include <SwAppletImpl.hxx>
+ 
++#include <sfx2/viewfrm.hxx>
++
+ #ifndef _STATSTR_HRC
+ #include <statstr.hrc>          // ResId fuer Statusleiste
+ #endif
+@@ -330,7 +332,9 @@
+ 	bSelect( FALSE ),
+ 	bInFootEndNoteAnchor( FALSE ),
+ 	bInFootEndNoteSymbol( FALSE ),
+-    bIgnoreHTMLComments( bNoHTMLComments )
++//    bIgnoreHTMLComments( bNoHTMLComments )
++	bIgnoreHTMLComments( bNoHTMLComments ),
++	pTempViewFrame(0)
+ {
+ 	nEventId = 0;
+ 	bUpperSpace = bViewCreated = bChkJumpMark =
+@@ -390,9 +394,7 @@
+ 	SwDocShell* pDocSh = pDoc->GetDocShell();
+ 	if( pDocSh )
+ 	{
+-		if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
+-			SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
+-			bViewCreated = TRUE;			// dann nicht, synchron laden
++		bViewCreated = TRUE;			// nicht, synchron laden
+ 
+ 		// es ist ein Sprungziel vorgegeben.
+ 
+@@ -500,6 +502,9 @@
+ 		// keiner will mehr das Doc haben, also weg damit
+ 		delete pDoc;
+ 	}
++
++	if ( pTempViewFrame )
++		pTempViewFrame->DoClose();
+ }
+ 
+ IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
+@@ -595,8 +600,8 @@
+ 
+ 	// Die ViewShell vom Dokument holen, merken und als aktuelle setzen.
+ 	ViewShell *pInitVSh = CallStartAction();
+-
+-	if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
++	
++	if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
+ 	{
+ 		// Beim ersten Aufruf erstmal returnen, Doc anzeigen
+ 		// und auf Timer Callback warten.
+@@ -2462,8 +2467,7 @@
+ 		ViewShell *pOldVSh = pVSh;
+ #endif
+ 		pDoc->GetEditShell( &pVSh );
+-		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
+-				"CallStartAction: Wer hat die ViewShell ausgetauscht?" );
++		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
+ #ifndef PRODUCT
+ 		if( pOldVSh && !pVSh )
+ 			pVSh = 0;
+Index: swhtml.hxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/swhtml.hxx,v
+retrieving revision 1.16
+retrieving revision 1.16.112.1
+diff -u -r1.16 -r1.16.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
++++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
+@@ -59,6 +59,7 @@
+ #include "htmlvsh.hxx"
+ 
+ class SfxMedium;
++class SfxViewFrame;
+ class SdrObject;
+ class SvxMacroTableDtor;
+ class SvStringsDtor;
+@@ -499,6 +500,8 @@
+ 	sal_Bool bInFootEndNoteSymbol : 1;
+     sal_Bool bIgnoreHTMLComments : 1;
+ 
++	SfxViewFrame* pTempViewFrame;
++
+ 	void DeleteFormImpl();
+ 
+ 	void DocumentDetected();


--- openoffice.org-3.0.1.ooo99050.sw.htmlload.patch DELETED ---



From caolanm at fedoraproject.org  Tue Apr 28 09:32:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 09:32:53 +0000 (UTC)
Subject: rpms/openoffice.org/devel ooo-build.ooo68717.gstreamer.video.patch, 
	1.1, 1.2 openoffice.org.spec, 1.1902,
	1.1903 workspace.fwk103.patch, 1.2,
	1.3 openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, 1.2, NONE
Message-ID: <20090428093253.C27B770129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22104/devel

Modified Files:
	ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec 
	workspace.fwk103.patch 
Removed Files:
	openoffice.org-3.0.1.ooo99050.sw.htmlload.patch 
Log Message:
Resolves: rhbz#497882 audio/visual loop stub

ooo-build.ooo68717.gstreamer.video.patch:

Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ooo-build.ooo68717.gstreamer.video.patch	18 Mar 2009 12:36:26 -0000	1.1
+++ ooo-build.ooo68717.gstreamer.video.patch	28 Apr 2009 09:32:23 -0000	1.2
@@ -960,14 +960,13 @@ retrieving revision 1.8.90.1
 diff -u -p -r1.8.90.1 gtkobject.cxx
 --- vcl/unx/gtk/window/gtkobject.cxx    10 Aug 2006 14:54:05 -0000      1.8.90.1
 +++ vcl/unx/gtk/window/gtkobject.cxx    5 Jan 2007 15:00:54 -0000
-@@ -211,3 +242,12 @@ void GtkSalObject::signalDestroy( GtkObj
+@@ -211,3 +242,11 @@ void GtkSalObject::signalDestroy( GtkObj
          pThis->m_pSocket = NULL;
      }
  }
 +
 +void GtkSalObject::SetForwardKey( BOOL bEnable )
 +{
-+    printf ("GtkSalObject::SetForwardKey\n");
 +    if( bEnable )
 +        gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
 +    else
@@ -3267,3 +3266,15 @@ diff -ru /usr/src/redhat/BUILD/OOF680_m1
      sal_Bool                mbMuted;
      sal_Bool                mbLooping;
      sal_Bool                mbInitialized;
+diff -ru avmedia.orig/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx	2009-04-28 08:28:19.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx	2009-04-28 09:11:50.000000000 +0100
+@@ -142,6 +142,8 @@
+         //DBG( "EOS, reset state to NULL" );
+         gst_element_set_state( mpPlaybin, GST_STATE_READY );
+         mbPlayPending = false;
++        if (mbLooping)
++            start();
+         break;
+     case GST_MESSAGE_STATE_CHANGED:
+         if( message->src == GST_OBJECT( mpPlaybin ) ) {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1902
retrieving revision 1.1903
diff -u -p -r1.1902 -r1.1903
--- openoffice.org.spec	27 Apr 2009 14:08:00 -0000	1.1902
+++ openoffice.org.spec	28 Apr 2009 09:32:23 -0000	1.1903
@@ -115,29 +115,28 @@ Patch39: workspace.cmcfixes54.patch
 Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch41: workspace.fwk103.patch
 Patch42: workspace.hb18.patch
-Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch46: workspace.vcl100.patch
-Patch47: workspace.xmergeclean.patch
-Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch49: workspace.impress169.patch
-Patch50: workspace.os130.patch
-Patch51: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch52: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch53: workspace.cmcfixes57.patch
-Patch54: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch55: ooo-build.ooo2497.filter.svg.patch
-Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch59: workspace.vcl101.patch
-Patch60: workspace.slideshow1.patch
-Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch65: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch43: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch44: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch45: workspace.vcl100.patch
+Patch46: workspace.xmergeclean.patch
+Patch47: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch48: workspace.impress169.patch
+Patch49: workspace.os130.patch
+Patch50: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch51: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch52: workspace.cmcfixes57.patch
+Patch53: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch54: ooo-build.ooo2497.filter.svg.patch
+Patch55: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch56: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch57: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch58: workspace.vcl101.patch
+Patch59: workspace.slideshow1.patch
+Patch60: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch61: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1611,29 +1610,28 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
 %patch42 -p0 -b .workspace.hb18.patch
-%patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch46 -p0 -b .workspace.vcl100.patch
-%patch47 -p0 -b .workspace.xmergeclean.patch
-%patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch49 -p0 -b .workspace.impress169.patch
-%patch50 -p0 -b .workspace.os130.patch
-%patch51 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch52 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch53 -p0 -b .workspace.cmcfixes57.patch
-%patch54 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch55 -p1 -b .ooo2497.filter.svg.patch
-%patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch59 -p1 -b .workspace.vcl101.patch
-%patch60 -p2 -b .workspace.slideshow1.patch
-%patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch62 -p0 -b .ooo101274.opening-a-directory.patch
-%patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch65 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch43 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch44 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch45 -p0 -b .workspace.vcl100.patch
+%patch46 -p0 -b .workspace.xmergeclean.patch
+%patch47 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch48 -p0 -b .workspace.impress169.patch
+%patch49 -p0 -b .workspace.os130.patch
+%patch50 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch51 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch52 -p0 -b .workspace.cmcfixes57.patch
+%patch53 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch54 -p1 -b .ooo2497.filter.svg.patch
+%patch55 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch56 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch57 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch58 -p1 -b .workspace.vcl101.patch
+%patch59 -p2 -b .workspace.slideshow1.patch
+%patch60 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch61 -p0 -b .ooo101274.opening-a-directory.patch
+%patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4132,10 +4130,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+* Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 - Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+- Resolves: rhbz#497882 implement audio/visual looping stub
 
 * Fri Apr 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch

workspace.fwk103.patch:

Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fwk103.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.fwk103.patch	26 Feb 2009 14:01:38 -0000	1.2
+++ workspace.fwk103.patch	28 Apr 2009 09:32:23 -0000	1.3
@@ -38,3 +38,163 @@ diff -u -r1.7 plugin.cxx
      }
  
      return FALSE;
+Index: htmlform.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/htmlform.cxx,v
+retrieving revision 1.26
+retrieving revision 1.26.112.1
+diff -u -r1.26 -r1.26.112.1
+--- openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
++++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
+@@ -706,6 +706,7 @@
+ 								   sal_Bool bMinHeight,
+ 								   int nToken )
+ {
++	nToken = 0;
+ 	if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth  && !bMinHeight )
+ 		return;
+ 
+@@ -721,35 +722,14 @@
+ 		// one, no view shell will be created. That for, we have to do that of
+ 		// our own. This happens if a linked section is inserted or refreshed.
+ 		SwDocShell *pDocSh = pDoc->GetDocShell();
+-		if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
++		if( pDocSh )
+ 		{
+-            SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
++
++			pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
+ 			CallStartAction();
+ 			pDoc->GetEditShell( &pVSh );
+ 		}
+ 	}
+-	if( !pVSh )
+-	{
+-		// If there is no view shell by now, but the document is loaded
+-		// asynchronous, the view shell will be created delayed because
+-		// the view was locked during the call to DocumentDetected. If this
+-		// is the case we wait until another call to our DataAvailable
+-		// link, because the SFX calls it if it creates the view.
+-		ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
+-		ASSERT( !IsParserWorking() || nEventId,
+-				"Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
+-		if( IsParserWorking() && bDocInitalized && nEventId )
+-		{
+-			pPendStack = new SwPendingStack( nToken, pPendStack );
+-			pPendStack->pData =
+-				new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
+-													 bMinWidth, bMinHeight );
+-			SaveState( nToken );
+-			eState = SVPAR_PENDING;
+-		}
+-
+-		return;
+-	}
+ 
+     uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
+ 	SwXShape *pSwShape = xTunnel.is() ?
+@@ -768,8 +748,7 @@
+ 	ASSERT( pObj, "SdrObject nicht gefunden" );
+ 	ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
+ 
+-    const SdrView* pDrawView = pVSh->GetDrawView();
+-    ASSERT( pDrawView, "DrawView not found" );
++	const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
+ 
+ 	SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
+ 	uno::Reference< awt::XControl > xControl;
+Index: swhtml.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
+retrieving revision 1.49
+retrieving revision 1.49.112.1
+diff -u -r1.49 -r1.49.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
++++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
+@@ -114,6 +114,8 @@
+ #include <breakit.hxx>
+ #include <SwAppletImpl.hxx>
+ 
++#include <sfx2/viewfrm.hxx>
++
+ #ifndef _STATSTR_HRC
+ #include <statstr.hrc>          // ResId fuer Statusleiste
+ #endif
+@@ -330,7 +332,9 @@
+ 	bSelect( FALSE ),
+ 	bInFootEndNoteAnchor( FALSE ),
+ 	bInFootEndNoteSymbol( FALSE ),
+-    bIgnoreHTMLComments( bNoHTMLComments )
++//    bIgnoreHTMLComments( bNoHTMLComments )
++	bIgnoreHTMLComments( bNoHTMLComments ),
++	pTempViewFrame(0)
+ {
+ 	nEventId = 0;
+ 	bUpperSpace = bViewCreated = bChkJumpMark =
+@@ -390,9 +394,7 @@
+ 	SwDocShell* pDocSh = pDoc->GetDocShell();
+ 	if( pDocSh )
+ 	{
+-		if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
+-			SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
+-			bViewCreated = TRUE;			// dann nicht, synchron laden
++		bViewCreated = TRUE;			// nicht, synchron laden
+ 
+ 		// es ist ein Sprungziel vorgegeben.
+ 
+@@ -500,6 +502,9 @@
+ 		// keiner will mehr das Doc haben, also weg damit
+ 		delete pDoc;
+ 	}
++
++	if ( pTempViewFrame )
++		pTempViewFrame->DoClose();
+ }
+ 
+ IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
+@@ -595,8 +600,8 @@
+ 
+ 	// Die ViewShell vom Dokument holen, merken und als aktuelle setzen.
+ 	ViewShell *pInitVSh = CallStartAction();
+-
+-	if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
++	
++	if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
+ 	{
+ 		// Beim ersten Aufruf erstmal returnen, Doc anzeigen
+ 		// und auf Timer Callback warten.
+@@ -2462,8 +2467,7 @@
+ 		ViewShell *pOldVSh = pVSh;
+ #endif
+ 		pDoc->GetEditShell( &pVSh );
+-		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
+-				"CallStartAction: Wer hat die ViewShell ausgetauscht?" );
++		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
+ #ifndef PRODUCT
+ 		if( pOldVSh && !pVSh )
+ 			pVSh = 0;
+Index: swhtml.hxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/swhtml.hxx,v
+retrieving revision 1.16
+retrieving revision 1.16.112.1
+diff -u -r1.16 -r1.16.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
++++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
+@@ -59,6 +59,7 @@
+ #include "htmlvsh.hxx"
+ 
+ class SfxMedium;
++class SfxViewFrame;
+ class SdrObject;
+ class SvxMacroTableDtor;
+ class SvStringsDtor;
+@@ -499,6 +500,8 @@
+ 	sal_Bool bInFootEndNoteSymbol : 1;
+     sal_Bool bIgnoreHTMLComments : 1;
+ 
++	SfxViewFrame* pTempViewFrame;
++
+ 	void DeleteFormImpl();
+ 
+ 	void DocumentDetected();


--- openoffice.org-3.0.1.ooo99050.sw.htmlload.patch DELETED ---



From caolanm at fedoraproject.org  Tue Apr 28 09:35:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 09:35:00 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1903,1.1904
Message-ID: <20090428093500.3920270129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22406/devel

Modified Files:
	openoffice.org.spec 
Log Message:
time to build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1903
retrieving revision 1.1904
diff -u -p -r1.1903 -r1.1904
--- openoffice.org.spec	28 Apr 2009 09:32:23 -0000	1.1903
+++ openoffice.org.spec	28 Apr 2009 09:34:28 -0000	1.1904
@@ -4130,7 +4130,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+* Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 - Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch



From caolanm at fedoraproject.org  Tue Apr 28 09:35:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 09:35:00 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1902,1.1903
Message-ID: <20090428093500.483C97013C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22406/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
time to build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1902
retrieving revision 1.1903
diff -u -p -r1.1902 -r1.1903
--- openoffice.org.spec	28 Apr 2009 09:32:22 -0000	1.1902
+++ openoffice.org.spec	28 Apr 2009 09:34:27 -0000	1.1903
@@ -4130,7 +4130,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+* Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 - Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch



From hadess at fedoraproject.org  Tue Apr 28 09:42:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 28 Apr 2009 09:42:33 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.234,1.235
Message-ID: <20090428094233.B171070129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24016

Modified Files:
	totem.spec 
Log Message:
* Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
- Add missing pyxdg requires for the OpenSubtitles plugin (#497787)


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- totem.spec	2 Apr 2009 16:53:57 -0000	1.234
+++ totem.spec	28 Apr 2009 09:42:03 -0000	1.235
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -29,6 +29,10 @@ Requires(postun): scrollkeeper
 
 Requires: iso-codes
 Requires: gnome-themes
+# For the opensubtitles plugin
+Requires: pyxdg
+# For all the Python plugins
+Requires: pygtk2
 # FIXME?
 #Requires: %{name}-backend = %{version}-%{release}
 Requires: %{name}-gstreamer
@@ -41,7 +45,7 @@ BuildRequires: libXtst-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
 BuildRequires: gnome-doc-utils
-BuildRequires: python-devel gnome-python2-devel pygtk2-devel
+BuildRequires: python-devel pygtk2-devel
 BuildRequires: totem-pl-parser-devel
 
 # For the nautilus extension
@@ -478,6 +482,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
+- Add missing pyxdg requires for the OpenSubtitles plugin (#497787)
+
 * Thu Apr 02 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.1-2
 - Update patch to set the PA stream volume, avoids setting the 
   volume when pulsesink isn't in a state where it has a stream



From petersen at fedoraproject.org  Tue Apr 28 09:45:47 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 28 Apr 2009 09:45:47 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.83,1.84
Message-ID: <20090428094547.2E1D770129@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24384

Modified Files:
	ghc.spec 
Log Message:
- add experimental bcond hscolour
- BR libffi-devel
- add experimental support for building shared libraries (for ghc-6.11)
  - add libs subpackage for shared libraries
  - create a ld.conf.d file for libghc*.so
- drop redundant setting of GhcLibWays in build.mk for no prof
- drop redundant setting of HADDOCK_DOCS
- simplify filelist names
- add a check section based on tests from debian package
- be more careful about doc files in filelist




Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ghc.spec	24 Apr 2009 07:59:57 -0000	1.83
+++ ghc.spec	28 Apr 2009 09:45:16 -0000	1.84
@@ -1,7 +1,13 @@
-# test builds can made faster by disabling profiled libraries
+# test builds can made faster and smaller by disabling profiled libraries
 %bcond_without prof
+# build users_guide, etc
 %bcond_without doc
 
+# experimental
+## shared libraries support available in ghc >= 6.11
+%bcond_without shared
+%bcond_with hscolour
+
 # Fixing packaging problems can be a tremendous pain because it
 # generally requires a complete rebuild, which takes hours.  To offset
 # the misery, do a complete build once using "rpmbuild -bc", then copy
@@ -16,7 +22,7 @@
 
 Name: ghc
 Version: 6.10.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -32,13 +38,18 @@ Requires: gcc, gmp-devel, libedit-devel 
 Requires(post): policycoreutils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0, haddock09
-# introduced for f11 and to be removed for f13:
+# introduced for f11 and can be removed for f13:
 Provides: haddock = 2.3.0
 BuildRequires: ghc, happy, sed
 BuildRequires: gmp-devel, libedit-devel > 2.11-2
+BuildRequires: libffi-devel
 %if %{with doc}
 BuildRequires: libxslt, docbook-style-xsl
+%if %{with hscolour}
+BuildRequires: hscolour
+%endif
 %endif
+Patch1: ghc-mk-pkg-install-inplace.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -75,11 +86,25 @@ Preformatted documentation for the Glori
 Compilation System (GHC) and its libraries.  It should be installed if
 you like to have local access to the documentation in HTML format.
 
+%if %{with shared}
+%package libs
+Summary: Shared libraries for GHC
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+Shared libraries for Glorious Glasgow Haskell Compilation System
+(GHC).  They should be installed to build standalone programs.
+%endif
+
 # the debuginfo subpackage is currently empty anyway, so don't generate it
 %global debug_package %{nil}
 
 %prep
 %setup -q -n %{name}-%{version} -b1
+%if %{with shared}
+%patch1 -p1 -b .orig-dist-install
+%endif
 
 %build
 # hack for building a local test package quickly from a prebuilt tree 
@@ -91,24 +116,23 @@ popd
 exit 0
 %endif
 
-%if !%{with prof}
-echo "GhcLibWays=" >> mk/build.mk
-echo "GhcRTSWays=thr debug" >> mk/build.mk
+%if %{without prof}
+echo "GhcLibWays=%{?with_shared:dyn}" >> mk/build.mk
 %endif
 
 %if %{with doc}
 echo "XMLDocWays   = html" >> mk/build.mk
-echo "HADDOCK_DOCS = YES" >> mk/build.mk
 %endif
 
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
   --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
   --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
-  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
+  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
+  %{?with_shared:--enable-shared}
 
 make %{_smp_mflags}
-make %{_smp_mflags} -C libraries
+#make %{_smp_mflags} -C libraries
 
 %if %{with doc}
 make %{_smp_mflags} html
@@ -123,24 +147,26 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 make DESTDIR=${RPM_BUILD_ROOT} install-docs
 %endif
 
+%if %{with shared}
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/%{name}-%{version} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
+%endif
+
 # install rpm macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
 cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
 
 SRC_TOP=$PWD
-rm -f rpm-*-filelist rpm-*.files
+rm -f rpm-*.files
 ( cd $RPM_BUILD_ROOT
   find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf*' -fprint $SRC_TOP/rpm-lib.files \)
-  find .%{_docdir}/%{name}/* -type d ! -name libraries > $SRC_TOP/rpm-doc-dir.files
+  find .%{_docdir}/%{name}/* -type d ! -name libraries %{?with_hscolour:! -name src} > $SRC_TOP/rpm-doc-dir.files
 )
 
 # make paths absolute (filter "./usr" to "/usr")
 sed -i -e "s|\.%{_prefix}|%{_prefix}|" rpm-*.files
 
-cat rpm-dir.files rpm-lib.files > rpm-base-filelist
-%if %{with prof}
-cat rpm-prof.files > rpm-prof-filelist
-%endif
+cat rpm-dir.files rpm-lib.files > rpm-base.files
 
 # these are handled as alternatives
 for i in hsc2hs runhaskell; do
@@ -151,6 +177,20 @@ for i in hsc2hs runhaskell; do
   fi
 done
 
+%check
+# stolen from ghc6/debian/rules:
+# Do some very simple tests that the compiler actually works
+rm -rf testghc
+mkdir testghc
+echo 'main = putStrLn "Foo"' > testghc/foo.hs
+ghc/stage2-inplace/ghc testghc/foo.hs -o testghc/foo
+[ "$(testghc/foo)" = "Foo" ]
+rm testghc/*
+echo 'main = putStrLn "Foo"' > testghc/foo.hs
+ghc/stage2-inplace/ghc testghc/foo.hs -o testghc/foo -O2
+[ "$(testghc/foo)" = "Foo" ]
+rm testghc/*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -175,9 +215,9 @@ update-alternatives --install %{_bindir}
 update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
   %{_bindir}/hsc2hs-ghc 500
 
-# posttrans to make sure any old documentation has been removed first
-%posttrans doc
-( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
+%if %{with shared}
+%post libs -p /sbin/ldconfig
+%endif
 
 %preun
 if [ "$1" = 0 ]; then
@@ -185,25 +225,31 @@ if [ "$1" = 0 ]; then
   update-alternatives --remove hsc2hs     %{_bindir}/hsc2hs-ghc
 fi
 
-%files -f rpm-base-filelist
+%if %{with shared}
+%postun libs -p /sbin/ldconfig
+%endif
+
+%posttrans doc
+# (posttrans to make sure any old documentation has been removed first)
+( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
+
+%files -f rpm-base.files
 %defattr(-,root,root,-)
 %doc ANNOUNCE HACKING LICENSE README
-%doc %{_mandir}/man1/ghc.*
 %{_bindir}/*
+%if %{with doc}
+%{_mandir}/man1/ghc.*
+%endif
 %{_sysconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 
-%if %{with prof}
-%files prof -f rpm-prof-filelist
-%defattr(-,root,root,-)
-%endif
-
-%if %{with doc}
 %files doc -f rpm-doc-dir.files
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/LICENSE
+%if %{with doc}
 %{_docdir}/%{name}/index.html
+%endif
 %{_docdir}/%{name}/libraries/gen_contents_index
 %{_docdir}/%{name}/libraries/prologue.txt
 %dir %{_docdir}/%{name}/libraries
@@ -214,9 +260,32 @@ fi
 %ghost %{_docdir}/%{name}/libraries/index.html
 %ghost %{_docdir}/%{name}/libraries/minus.gif
 %ghost %{_docdir}/%{name}/libraries/plus.gif
+
+%if %{with shared}
+%files libs
+%defattr(-,root,root,-)
+%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
+%{_libdir}/libHS*-ghc%{version}.so
+%endif
+
+%if %{with prof}
+%files prof -f rpm-prof.files
+%defattr(-,root,root,-)
 %endif
 
 %changelog
+* Tue Apr 28 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-4
+- add experimental bcond hscolour
+- BR libffi-devel
+- add experimental support for building shared libraries (for ghc-6.11)
+  - add libs subpackage for shared libraries
+  - create a ld.conf.d file for libghc*.so
+- drop redundant setting of GhcLibWays in build.mk for no prof
+- drop redundant setting of HADDOCK_DOCS
+- simplify filelist names
+- add a check section based on tests from debian's package
+- be more careful about doc files in filelist
+
 * Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-3
 - define ghc_version in macros.ghc in place of ghcrequires
 - drop ghc-requires script for now



From hadess at fedoraproject.org  Tue Apr 28 09:46:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 28 Apr 2009 09:46:29 +0000 (UTC)
Subject: rpms/nautilus-sendto/F-11 nautilus-sendto.spec,1.69,1.70
Message-ID: <20090428094629.A9D6170129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24743

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 1.1.4.1-2
- Build with gajim support (#497975)


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-11/nautilus-sendto.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- nautilus-sendto.spec	20 Apr 2009 13:43:15 -0000	1.69
+++ nautilus-sendto.spec	28 Apr 2009 09:45:59 -0000	1.70
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        1.1.4.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -21,6 +21,7 @@ BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  gupnp-av-devel
 BuildRequires:  empathy-devel
 BuildRequires:  evolution-devel
+BuildRequires:  gajim
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -94,6 +95,9 @@ fi
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 1.1.4.1-2
+- Build with gajim support (#497975)
+
 * Mon Apr 20 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4.1-1
 - Update to 1.1.4.1
 



From petersen at fedoraproject.org  Tue Apr 28 09:59:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 28 Apr 2009 09:59:05 +0000 (UTC)
Subject: rpms/ghc/devel ghc-mk-pkg-install-inplace.patch,NONE,1.1
Message-ID: <20090428095905.7127C70129@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26964

Added Files:
	ghc-mk-pkg-install-inplace.patch 
Log Message:
add patch

ghc-mk-pkg-install-inplace.patch:

--- NEW FILE ghc-mk-pkg-install-inplace.patch ---
diff -up ghc-6.11.20090421/mk/cabal-flags.mk~ ghc-6.11.20090421/mk/cabal-flags.mk
--- ghc-6.11.20090421/mk/cabal-flags.mk~	2009-04-22 03:15:57.000000000 +1000
+++ ghc-6.11.20090421/mk/cabal-flags.mk	2009-04-26 12:06:06.000000000 +1000
@@ -3,7 +3,7 @@ nothing=
 space=$(nothing) $(nothing)
 comma=,
 
-GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg
+GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-inplace/build/ghc-pkg/ghc-pkg
 
 LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
 UTILS_ABS     = $(FPTOOLS_TOP_ABS)/utils
diff -up ghc-6.11.20090421/mk/package.mk~ ghc-6.11.20090421/mk/package.mk
--- ghc-6.11.20090421/mk/package.mk~	2009-04-22 03:15:55.000000000 +1000
+++ ghc-6.11.20090421/mk/package.mk	2009-04-26 10:52:55.000000000 +1000
@@ -86,7 +86,7 @@ install::
 	    | sed -e 's/""//g' -e 's/:[   ]*,/: /g' \
 	    | $(GHC_PKG_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force
 
-GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg
+GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-inplace/build/ghc-pkg/ghc-pkg
 
 # we could be more accurate here and add a dependency on
 # driver/package.conf, but that doesn't work too well because of



From hadess at fedoraproject.org  Tue Apr 28 10:05:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 28 Apr 2009 10:05:50 +0000 (UTC)
Subject: rpms/totem/F-11 totem.spec,1.235,1.236
Message-ID: <20090428100550.D370470129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28903

Modified Files:
	totem.spec 
Log Message:
* Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-4
- Add missing pyxdg requires for the OpenSubtitles plugin (#497787)


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- totem.spec	23 Apr 2009 16:39:17 -0000	1.235
+++ totem.spec	28 Apr 2009 10:05:20 -0000	1.236
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -33,6 +33,11 @@ Requires: gnome-themes
 #Requires: %{name}-backend = %{version}-%{release}
 Requires: %{name}-gstreamer
 
+# For the opensubtitles plugin
+Requires: pyxdg
+# For all the Python plugins
+Requires: pygtk2
+
 BuildRequires: gcc-c++, pkgconfig, gettext
 BuildRequires: perl(XML::Parser) intltool
 BuildRequires: iso-codes-devel
@@ -478,6 +483,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-4
+- Add missing pyxdg requires for the OpenSubtitles plugin (#497787)
+
 * Thu Apr 23 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
 - Add missing gnome-python2-gconf req (#483265)
 



From airlied at fedoraproject.org  Tue Apr 28 10:05:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 10:05:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-kms-gamma.patch, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.184, 1.185
Message-ID: <20090428100556.787B770129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29014

Modified Files:
	radeon-6.12.2-kms-gamma.patch xorg-x11-drv-ati.spec 
Log Message:
* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-9
- fix gamma code to work properly
- bump kernel requires for gamma interface not oopsing


radeon-6.12.2-kms-gamma.patch:

Index: radeon-6.12.2-kms-gamma.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-6.12.2-kms-gamma.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radeon-6.12.2-kms-gamma.patch	16 Apr 2009 21:02:55 -0000	1.1
+++ radeon-6.12.2-kms-gamma.patch	28 Apr 2009 10:05:56 -0000	1.2
@@ -1,6 +1,16 @@
-diff -up xf86-video-ati-6.12.2/src/drmmode_display.c.jx xf86-video-ati-6.12.2/src/drmmode_display.c
---- xf86-video-ati-6.12.2/src/drmmode_display.c.jx	2009-04-16 14:51:57.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-16 14:54:22.000000000 -0400
+From 1f5861ff6c60862d2beda08f33ee64ae24c1238f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 28 Apr 2009 20:01:36 +1000
+Subject: [PATCH] radeon: fix palette setup
+
+---
+ src/drmmode_display.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index b368115..8e33a76 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
 @@ -458,7 +458,11 @@ static void
  drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
                        uint16_t *blue, int size)
@@ -14,3 +24,33 @@ diff -up xf86-video-ati-6.12.2/src/drmmo
  }
  
  static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
+@@ -954,8 +958,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+     int index, j, i;
+     int c;
+ 
+-
+-
+     for (c = 0; c < xf86_config->num_crtc; c++) {
+         xf86CrtcPtr crtc = xf86_config->crtc[c];
+ 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+@@ -966,8 +968,7 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+             lut_b[i] = drmmode_crtc->lut_b[i] << 6;
+         }
+ 
+-#if 0 //TODO
+-        switch (info->CurrentLayout.depth) {
++        switch(pScrn->depth) {
+         case 15:
+             for (i = 0; i < numColors; i++) {
+                 index = indices[i];
+@@ -1003,7 +1004,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+               }
+               break;
+           }
+-#endif
+ 
+     /* Make the change through RandR */
+ #ifdef RANDR_12_INTERFACE
+-- 
+1.6.2.2
+


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- xorg-x11-drv-ati.spec	28 Apr 2009 03:29:56 -0000	1.184
+++ xorg-x11-drv-ati.spec	28 Apr 2009 10:05:56 -0000	1.185
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -34,7 +34,7 @@ Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 Requires:  libdrm >= 2.4.0-0.21
 # new CS method needs newer kernel
-Requires:  kernel >= 2.6.29.1-52.fc11
+Requires:  kernel >= 2.6.29.1-111.fc11
 
 %description 
 X.Org X11 ati video driver.
@@ -78,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-9
+- fix gamma code to work properly
+- bump kernel requires for gamma interface not oopsing
+
 * Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-8
 - restrict texture coords to 0.0->1.0 explicitly.
 - enable gamma now kernel is tagged



From caolanm at fedoraproject.org  Tue Apr 28 10:10:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 10:10:00 +0000 (UTC)
Subject: rpms/hunspell-kk/devel hunspell-kk.spec,1.1,1.2
Message-ID: <20090428101000.DF27A70129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-kk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29866

Modified Files:
	hunspell-kk.spec 
Log Message:
fix typo


Index: hunspell-kk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-kk/devel/hunspell-kk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hunspell-kk.spec	23 Apr 2009 21:38:18 -0000	1.1
+++ hunspell-kk.spec	28 Apr 2009 10:09:30 -0000	1.2
@@ -6,7 +6,7 @@ Group: Applications/Text
 Source: http://extensions.services.openoffice.org/files/1172/7/dict-kk.oxt
 URL: http://extensions.services.openoffice.org/node/2240
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: LGPLv2+ or LGPLv2+ or MPLv1.1
+License: GPLv2+ or LGPLv2+ or MPLv1.1
 BuildArch: noarch
 
 Requires: hunspell



From petersen at fedoraproject.org  Tue Apr 28 10:10:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 28 Apr 2009 10:10:08 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.84,1.85
Message-ID: <20090428101008.6143D70129@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29910

Modified Files:
	ghc.spec 
Log Message:
only BR libffi-devel for shared build


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ghc.spec	28 Apr 2009 09:45:16 -0000	1.84
+++ ghc.spec	28 Apr 2009 10:09:37 -0000	1.85
@@ -42,7 +42,9 @@ Obsoletes: ghc682, ghc681, ghc661, ghc66
 Provides: haddock = 2.3.0
 BuildRequires: ghc, happy, sed
 BuildRequires: gmp-devel, libedit-devel > 2.11-2
+%if %{with shared}
 BuildRequires: libffi-devel
+%endif
 %if %{with doc}
 BuildRequires: libxslt, docbook-style-xsl
 %if %{with hscolour}
@@ -276,10 +278,10 @@ fi
 %changelog
 * Tue Apr 28 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-4
 - add experimental bcond hscolour
-- BR libffi-devel
 - add experimental support for building shared libraries (for ghc-6.11)
   - add libs subpackage for shared libraries
   - create a ld.conf.d file for libghc*.so
+  - BR libffi-devel
 - drop redundant setting of GhcLibWays in build.mk for no prof
 - drop redundant setting of HADDOCK_DOCS
 - simplify filelist names



From airlied at fedoraproject.org  Tue Apr 28 10:18:08 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 28 Apr 2009 10:18:08 +0000 (UTC)
Subject: rpms/mesa/F-11 radeon-rewrite-emit1clip.patch, NONE, 1.1 mesa.spec, 
	1.246, 1.247
Message-ID: <20090428101808.1CCB470129@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31352

Modified Files:
	mesa.spec 
Added Files:
	radeon-rewrite-emit1clip.patch 
Log Message:
* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 7.5-0.13
- radeon fix clip emits


radeon-rewrite-emit1clip.patch:

--- NEW FILE radeon-rewrite-emit1clip.patch ---
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index afca0e2..a006e8f 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -252,7 +252,7 @@ static void emit_cb_offset(GLcontext *ctx, struct radeon_state_atom * atom)
                     ((rrb->height - 1) << R300_SCISSORS_Y_SHIFT));
             END_BATCH();
             BEGIN_BATCH_NO_AUTOSTATE(16);
-            for (i = 0; i < 4; i++) {
+            for (i = 0; i < 1; i++) {
                 OUT_BATCH_REGSEQ(R300_SC_CLIPRECT_TL_0 + (i * 8), 2);
                 OUT_BATCH((0 << R300_CLIPRECT_X_SHIFT) | (0 << R300_CLIPRECT_Y_SHIFT));
                 OUT_BATCH(((rrb->width - 1) << R300_CLIPRECT_X_SHIFT) | ((rrb->height - 1) << R300_CLIPRECT_Y_SHIFT));


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- mesa.spec	28 Apr 2009 05:34:12 -0000	1.246
+++ mesa.spec	28 Apr 2009 10:17:37 -0000	1.247
@@ -20,7 +20,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.5
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,8 @@ Patch9: intel-revert-vbl.patch
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
+Patch15: radeon-rewrite-emit1clip.patch
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.5-1
@@ -175,6 +177,7 @@ This package provides some demo applicat
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
+%patch15 -p1 -b .fix-clip
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -429,6 +432,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 7.5-0.13
+- radeon fix clip emits
+
 * Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 7.5-0.12
 - rebase to upstream snapshot + radeon-rewrite
 



From mmaslano at fedoraproject.org  Tue Apr 28 10:43:40 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 28 Apr 2009 10:43:40 +0000 (UTC)
Subject: rpms/perl-PAR/devel .cvsignore, 1.2, 1.3 perl-PAR.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090428104340.1ADE870129@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8623

Modified Files:
	.cvsignore perl-PAR.spec sources 
Log Message:
* Tue Apr 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.992-1
- update to the latest release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2008 08:17:26 -0000	1.2
+++ .cvsignore	28 Apr 2009 10:43:09 -0000	1.3
@@ -1 +1 @@
-PAR-0.983.tar.gz
+PAR-0.992.tar.gz


Index: perl-PAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/perl-PAR.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-PAR.spec	26 Feb 2009 23:45:05 -0000	1.3
+++ perl-PAR.spec	28 Apr 2009 10:43:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-PAR
-Version:        0.983
-Release:        3%{?dist}
+Version:        0.992
+Release:        1%{?dist}
 Summary:        Perl Archive Toolkit
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.992-1
+- update to the latest release
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.983-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2008 08:17:26 -0000	1.2
+++ sources	28 Apr 2009 10:43:09 -0000	1.3
@@ -1 +1 @@
-8580a7d810606b64ca22ba7b3c595866  PAR-0.983.tar.gz
+784a47222ed506224eba1ede7873db5b  PAR-0.992.tar.gz



From veillard at fedoraproject.org  Tue Apr 28 10:53:54 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 28 Apr 2009 10:53:54 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.126,1.127
Message-ID: <20090428105354.862C070129@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11208

Modified Files:
	libvirt.spec 
Log Message:
was also missing /usr/share/gtk-doc/html/libvirt in -devel
Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- libvirt.spec	28 Apr 2009 09:18:35 -0000	1.126
+++ libvirt.spec	28 Apr 2009 10:53:22 -0000	1.127
@@ -55,7 +55,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.3
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -520,6 +520,7 @@ fi
 %dir %{_includedir}/libvirt
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
+%dir %{_datadir}/gtk-doc/html/libvirt
 %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
 %doc %{_datadir}/gtk-doc/html/libvirt/*.html
 %doc %{_datadir}/gtk-doc/html/libvirt/*.png
@@ -544,6 +545,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 28 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-3.fc12
+- was also missing /usr/share/gtk-doc/html/libvirt in -devel
+
 * Tue Apr 28 2009 Daniel Veillard <veillard at redhat.com> - 0.6.3-2.fc12
 - fix packaging bug #496945 libvirt should own /var/cache/libvirt
 



From caolanm at fedoraproject.org  Tue Apr 28 10:56:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 10:56:37 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.fwk103.patch,1.3,1.4
Message-ID: <20090428105637.96CF370129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12077/devel

Modified Files:
	workspace.fwk103.patch 
Log Message:
fixup

workspace.fwk103.patch:

Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fwk103.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.fwk103.patch	28 Apr 2009 09:32:23 -0000	1.3
+++ workspace.fwk103.patch	28 Apr 2009 10:56:35 -0000	1.4
@@ -44,62 +44,62 @@ RCS file: /cvs/sw/sw/source/filter/html/
 retrieving revision 1.26
 retrieving revision 1.26.112.1
 diff -u -r1.26 -r1.26.112.1
---- openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
-+++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
-@@ -706,6 +706,7 @@
+--- openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
++++ openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
+@@ -706,7 +706,6 @@
  								   sal_Bool bMinHeight,
  								   int nToken )
  {
-+	nToken = 0;
+-	nToken = 0;
  	if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth  && !bMinHeight )
  		return;
  
-@@ -721,35 +722,14 @@
+@@ -722,14 +721,35 @@
  		// one, no view shell will be created. That for, we have to do that of
  		// our own. This happens if a linked section is inserted or refreshed.
  		SwDocShell *pDocSh = pDoc->GetDocShell();
--		if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
-+		if( pDocSh )
++		if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
+-		if( pDocSh )
  		{
--            SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
-+
-+			pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
++            SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
+-
+-			pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
  			CallStartAction();
  			pDoc->GetEditShell( &pVSh );
  		}
  	}
--	if( !pVSh )
--	{
--		// If there is no view shell by now, but the document is loaded
--		// asynchronous, the view shell will be created delayed because
--		// the view was locked during the call to DocumentDetected. If this
--		// is the case we wait until another call to our DataAvailable
--		// link, because the SFX calls it if it creates the view.
--		ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
--		ASSERT( !IsParserWorking() || nEventId,
--				"Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
--		if( IsParserWorking() && bDocInitalized && nEventId )
--		{
--			pPendStack = new SwPendingStack( nToken, pPendStack );
--			pPendStack->pData =
--				new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
--													 bMinWidth, bMinHeight );
--			SaveState( nToken );
--			eState = SVPAR_PENDING;
--		}
--
--		return;
--	}
++	if( !pVSh )
++	{
++		// If there is no view shell by now, but the document is loaded
++		// asynchronous, the view shell will be created delayed because
++		// the view was locked during the call to DocumentDetected. If this
++		// is the case we wait until another call to our DataAvailable
++		// link, because the SFX calls it if it creates the view.
++		ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
++		ASSERT( !IsParserWorking() || nEventId,
++				"Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
++		if( IsParserWorking() && bDocInitalized && nEventId )
++		{
++			pPendStack = new SwPendingStack( nToken, pPendStack );
++			pPendStack->pData =
++				new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
++													 bMinWidth, bMinHeight );
++			SaveState( nToken );
++			eState = SVPAR_PENDING;
++		}
++
++		return;
++	}
  
      uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
  	SwXShape *pSwShape = xTunnel.is() ?
-@@ -768,8 +748,7 @@
+@@ -748,7 +768,8 @@
  	ASSERT( pObj, "SdrObject nicht gefunden" );
  	ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
  
--    const SdrView* pDrawView = pVSh->GetDrawView();
--    ASSERT( pDrawView, "DrawView not found" );
-+	const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
++    const SdrView* pDrawView = pVSh->GetDrawView();
++    ASSERT( pDrawView, "DrawView not found" );
+-	const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
  
  	SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
  	uno::Reference< awt::XControl > xControl;
@@ -109,67 +109,67 @@ RCS file: /cvs/sw/sw/source/filter/html/
 retrieving revision 1.49
 retrieving revision 1.49.112.1
 diff -u -r1.49 -r1.49.112.1
---- openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
-+++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
-@@ -114,6 +114,8 @@
+--- openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
++++ openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
+@@ -114,8 +114,6 @@
  #include <breakit.hxx>
  #include <SwAppletImpl.hxx>
  
-+#include <sfx2/viewfrm.hxx>
-+
+-#include <sfx2/viewfrm.hxx>
+-
  #ifndef _STATSTR_HRC
  #include <statstr.hrc>          // ResId fuer Statusleiste
  #endif
-@@ -330,7 +332,9 @@
+@@ -332,9 +330,7 @@
  	bSelect( FALSE ),
  	bInFootEndNoteAnchor( FALSE ),
  	bInFootEndNoteSymbol( FALSE ),
--    bIgnoreHTMLComments( bNoHTMLComments )
-+//    bIgnoreHTMLComments( bNoHTMLComments )
-+	bIgnoreHTMLComments( bNoHTMLComments ),
-+	pTempViewFrame(0)
++    bIgnoreHTMLComments( bNoHTMLComments )
+-//    bIgnoreHTMLComments( bNoHTMLComments )
+-	bIgnoreHTMLComments( bNoHTMLComments ),
+-	pTempViewFrame(0)
  {
  	nEventId = 0;
  	bUpperSpace = bViewCreated = bChkJumpMark =
-@@ -390,9 +394,7 @@
+@@ -394,7 +390,9 @@
  	SwDocShell* pDocSh = pDoc->GetDocShell();
  	if( pDocSh )
  	{
--		if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
--			SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
--			bViewCreated = TRUE;			// dann nicht, synchron laden
-+		bViewCreated = TRUE;			// nicht, synchron laden
++		if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
++			SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
++			bViewCreated = TRUE;			// dann nicht, synchron laden
+-		bViewCreated = TRUE;			// nicht, synchron laden
  
  		// es ist ein Sprungziel vorgegeben.
  
-@@ -500,6 +502,9 @@
+@@ -502,9 +500,6 @@
  		// keiner will mehr das Doc haben, also weg damit
  		delete pDoc;
  	}
-+
-+	if ( pTempViewFrame )
-+		pTempViewFrame->DoClose();
+-
+-	if ( pTempViewFrame )
+-		pTempViewFrame->DoClose();
  }
  
  IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
-@@ -595,8 +600,8 @@
+@@ -600,8 +595,8 @@
  
  	// Die ViewShell vom Dokument holen, merken und als aktuelle setzen.
  	ViewShell *pInitVSh = CallStartAction();
--
--	if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
-+	
-+	if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
++
++	if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
+-	
+-	if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
  	{
  		// Beim ersten Aufruf erstmal returnen, Doc anzeigen
  		// und auf Timer Callback warten.
-@@ -2462,8 +2467,7 @@
+@@ -2467,7 +2462,8 @@
  		ViewShell *pOldVSh = pVSh;
  #endif
  		pDoc->GetEditShell( &pVSh );
--		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
--				"CallStartAction: Wer hat die ViewShell ausgetauscht?" );
-+		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
++	ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
++				"CallStartAction: Wer hat die ViewShell ausgetauscht?" );
+-		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
  #ifndef PRODUCT
  		if( pOldVSh && !pVSh )
  			pVSh = 0;
@@ -179,22 +179,22 @@ RCS file: /cvs/sw/sw/source/filter/html/
 retrieving revision 1.16
 retrieving revision 1.16.112.1
 diff -u -r1.16 -r1.16.112.1
---- openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
-+++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
-@@ -59,6 +59,7 @@
+--- openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
++++ openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
+@@ -59,7 +59,6 @@
  #include "htmlvsh.hxx"
  
  class SfxMedium;
-+class SfxViewFrame;
+-class SfxViewFrame;
  class SdrObject;
  class SvxMacroTableDtor;
  class SvStringsDtor;
-@@ -499,6 +500,8 @@
+@@ -500,8 +499,6 @@
  	sal_Bool bInFootEndNoteSymbol : 1;
      sal_Bool bIgnoreHTMLComments : 1;
  
-+	SfxViewFrame* pTempViewFrame;
-+
+-	SfxViewFrame* pTempViewFrame;
+-
  	void DeleteFormImpl();
  
  	void DocumentDetected();



From caolanm at fedoraproject.org  Tue Apr 28 10:57:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 28 Apr 2009 10:57:06 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.fwk103.patch,1.3,1.4
Message-ID: <20090428105706.3D98670129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12077/F-11

Modified Files:
	workspace.fwk103.patch 
Log Message:
fixup

workspace.fwk103.patch:

Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.fwk103.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.fwk103.patch	28 Apr 2009 09:32:22 -0000	1.3
+++ workspace.fwk103.patch	28 Apr 2009 10:56:33 -0000	1.4
@@ -44,62 +44,62 @@ RCS file: /cvs/sw/sw/source/filter/html/
 retrieving revision 1.26
 retrieving revision 1.26.112.1
 diff -u -r1.26 -r1.26.112.1
---- openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
-+++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
-@@ -706,6 +706,7 @@
+--- openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
++++ openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
+@@ -706,7 +706,6 @@
  								   sal_Bool bMinHeight,
  								   int nToken )
  {
-+	nToken = 0;
+-	nToken = 0;
  	if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth  && !bMinHeight )
  		return;
  
-@@ -721,35 +722,14 @@
+@@ -722,14 +721,35 @@
  		// one, no view shell will be created. That for, we have to do that of
  		// our own. This happens if a linked section is inserted or refreshed.
  		SwDocShell *pDocSh = pDoc->GetDocShell();
--		if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
-+		if( pDocSh )
++		if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
+-		if( pDocSh )
  		{
--            SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
-+
-+			pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
++            SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
+-
+-			pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
  			CallStartAction();
  			pDoc->GetEditShell( &pVSh );
  		}
  	}
--	if( !pVSh )
--	{
--		// If there is no view shell by now, but the document is loaded
--		// asynchronous, the view shell will be created delayed because
--		// the view was locked during the call to DocumentDetected. If this
--		// is the case we wait until another call to our DataAvailable
--		// link, because the SFX calls it if it creates the view.
--		ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
--		ASSERT( !IsParserWorking() || nEventId,
--				"Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
--		if( IsParserWorking() && bDocInitalized && nEventId )
--		{
--			pPendStack = new SwPendingStack( nToken, pPendStack );
--			pPendStack->pData =
--				new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
--													 bMinWidth, bMinHeight );
--			SaveState( nToken );
--			eState = SVPAR_PENDING;
--		}
--
--		return;
--	}
++	if( !pVSh )
++	{
++		// If there is no view shell by now, but the document is loaded
++		// asynchronous, the view shell will be created delayed because
++		// the view was locked during the call to DocumentDetected. If this
++		// is the case we wait until another call to our DataAvailable
++		// link, because the SFX calls it if it creates the view.
++		ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
++		ASSERT( !IsParserWorking() || nEventId,
++				"Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
++		if( IsParserWorking() && bDocInitalized && nEventId )
++		{
++			pPendStack = new SwPendingStack( nToken, pPendStack );
++			pPendStack->pData =
++				new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
++													 bMinWidth, bMinHeight );
++			SaveState( nToken );
++			eState = SVPAR_PENDING;
++		}
++
++		return;
++	}
  
      uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
  	SwXShape *pSwShape = xTunnel.is() ?
-@@ -768,8 +748,7 @@
+@@ -748,7 +768,8 @@
  	ASSERT( pObj, "SdrObject nicht gefunden" );
  	ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
  
--    const SdrView* pDrawView = pVSh->GetDrawView();
--    ASSERT( pDrawView, "DrawView not found" );
-+	const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
++    const SdrView* pDrawView = pVSh->GetDrawView();
++    ASSERT( pDrawView, "DrawView not found" );
+-	const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
  
  	SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
  	uno::Reference< awt::XControl > xControl;
@@ -109,67 +109,67 @@ RCS file: /cvs/sw/sw/source/filter/html/
 retrieving revision 1.49
 retrieving revision 1.49.112.1
 diff -u -r1.49 -r1.49.112.1
---- openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
-+++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
-@@ -114,6 +114,8 @@
+--- openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
++++ openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
+@@ -114,8 +114,6 @@
  #include <breakit.hxx>
  #include <SwAppletImpl.hxx>
  
-+#include <sfx2/viewfrm.hxx>
-+
+-#include <sfx2/viewfrm.hxx>
+-
  #ifndef _STATSTR_HRC
  #include <statstr.hrc>          // ResId fuer Statusleiste
  #endif
-@@ -330,7 +332,9 @@
+@@ -332,9 +330,7 @@
  	bSelect( FALSE ),
  	bInFootEndNoteAnchor( FALSE ),
  	bInFootEndNoteSymbol( FALSE ),
--    bIgnoreHTMLComments( bNoHTMLComments )
-+//    bIgnoreHTMLComments( bNoHTMLComments )
-+	bIgnoreHTMLComments( bNoHTMLComments ),
-+	pTempViewFrame(0)
++    bIgnoreHTMLComments( bNoHTMLComments )
+-//    bIgnoreHTMLComments( bNoHTMLComments )
+-	bIgnoreHTMLComments( bNoHTMLComments ),
+-	pTempViewFrame(0)
  {
  	nEventId = 0;
  	bUpperSpace = bViewCreated = bChkJumpMark =
-@@ -390,9 +394,7 @@
+@@ -394,7 +390,9 @@
  	SwDocShell* pDocSh = pDoc->GetDocShell();
  	if( pDocSh )
  	{
--		if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
--			SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
--			bViewCreated = TRUE;			// dann nicht, synchron laden
-+		bViewCreated = TRUE;			// nicht, synchron laden
++		if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
++			SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
++			bViewCreated = TRUE;			// dann nicht, synchron laden
+-		bViewCreated = TRUE;			// nicht, synchron laden
  
  		// es ist ein Sprungziel vorgegeben.
  
-@@ -500,6 +502,9 @@
+@@ -502,9 +500,6 @@
  		// keiner will mehr das Doc haben, also weg damit
  		delete pDoc;
  	}
-+
-+	if ( pTempViewFrame )
-+		pTempViewFrame->DoClose();
+-
+-	if ( pTempViewFrame )
+-		pTempViewFrame->DoClose();
  }
  
  IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
-@@ -595,8 +600,8 @@
+@@ -600,8 +595,8 @@
  
  	// Die ViewShell vom Dokument holen, merken und als aktuelle setzen.
  	ViewShell *pInitVSh = CallStartAction();
--
--	if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
-+	
-+	if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
++
++	if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
+-	
+-	if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
  	{
  		// Beim ersten Aufruf erstmal returnen, Doc anzeigen
  		// und auf Timer Callback warten.
-@@ -2462,8 +2467,7 @@
+@@ -2467,7 +2462,8 @@
  		ViewShell *pOldVSh = pVSh;
  #endif
  		pDoc->GetEditShell( &pVSh );
--		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
--				"CallStartAction: Wer hat die ViewShell ausgetauscht?" );
-+		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
++	ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
++				"CallStartAction: Wer hat die ViewShell ausgetauscht?" );
+-		ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
  #ifndef PRODUCT
  		if( pOldVSh && !pVSh )
  			pVSh = 0;
@@ -179,22 +179,22 @@ RCS file: /cvs/sw/sw/source/filter/html/
 retrieving revision 1.16
 retrieving revision 1.16.112.1
 diff -u -r1.16 -r1.16.112.1
---- openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
-+++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
-@@ -59,6 +59,7 @@
+--- openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
++++ openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
+@@ -59,7 +59,6 @@
  #include "htmlvsh.hxx"
  
  class SfxMedium;
-+class SfxViewFrame;
+-class SfxViewFrame;
  class SdrObject;
  class SvxMacroTableDtor;
  class SvStringsDtor;
-@@ -499,6 +500,8 @@
+@@ -500,8 +499,6 @@
  	sal_Bool bInFootEndNoteSymbol : 1;
      sal_Bool bIgnoreHTMLComments : 1;
  
-+	SfxViewFrame* pTempViewFrame;
-+
+-	SfxViewFrame* pTempViewFrame;
+-
  	void DeleteFormImpl();
  
  	void DocumentDetected();



From veillard at fedoraproject.org  Tue Apr 28 10:58:29 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 28 Apr 2009 10:58:29 +0000 (UTC)
Subject: rpms/libvirt/F-11 libvirt.spec,1.124,1.125
Message-ID: <20090428105829.DD84B70129@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12559

Modified Files:
	libvirt.spec 
Log Message:
- Fix missing directories in spec (#496945 and gtk-doc)
Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- libvirt.spec	16 Apr 2009 15:26:45 -0000	1.124
+++ libvirt.spec	28 Apr 2009 10:57:59 -0000	1.125
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -343,6 +343,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_loc
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
 # Default dir for kernel+initrd images defnied in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
+# used for virDomainMemoryPeek
+install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
@@ -461,6 +463,7 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
 %dir %{_localstatedir}/run/libvirt/qemu/
@@ -523,6 +526,7 @@ fi
 %dir %{_includedir}/libvirt
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
+%dir %{_datadir}/gtk-doc/html/libvirt
 %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
 %doc %{_datadir}/gtk-doc/html/libvirt/*.html
 %doc %{_datadir}/gtk-doc/html/libvirt/*.png
@@ -547,6 +551,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 28 2009 Daniel Veillard <veillard at redhat.com> - 0.6.2-3.fc11
+- Fix missing directories in spec (#496945 and gtk-doc)
+
 * Thu Apr 16 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-2.fc11
 - Fix qemu drive format specification (#496092)
 



From karsten at fedoraproject.org  Tue Apr 28 11:02:17 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 28 Apr 2009 11:02:17 +0000 (UTC)
Subject: rpms/icu4j/F-11 icu4j.spec,1.16,1.17
Message-ID: <20090428110217.8D5E770129@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/icu4j/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13580

Modified Files:
	icu4j.spec 
Log Message:
- we currently don't have eclipse on mainframe, disable
  eclipse stuff for s390 and s390x even though that means that we can't
  use noarch



Index: icu4j.spec
===================================================================
RCS file: /cvs/extras/rpms/icu4j/F-11/icu4j.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- icu4j.spec	25 Feb 2009 06:45:34 -0000	1.16
+++ icu4j.spec	28 Apr 2009 11:01:46 -0000	1.17
@@ -31,7 +31,9 @@
 # If you want to build with eclipse support
 # give rpmbuild option '--with eclipse'
 
+%ifnarch s390 s390x
 %define _with_eclipse 1
+%endif
 
 %define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
 %define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
@@ -50,7 +52,7 @@
 
 Name:           icu4j
 Version:        3.8.1
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -80,8 +82,8 @@ Requires:       java >= 1:1.6.0
 %if %{with_eclipse}
 BuildRequires:  eclipse-pde >= 0:3.2.1
 %define         debug_package %{nil}
-%else
-BuildArch:      noarch
+#else
+#BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -189,6 +191,11 @@ unzip -qq -d %{buildroot}/%{eclipse_base
 %endif
 
 %changelog
+* Tue Apr 28 2009 Karsten Hopp <karsten at redhat.com> 3.8.1-5.1
+- we currently don't have eclipse on mainframe, disable 
+  eclipse stuff for s390 and s390x even though that means that we can't
+  use noarch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.8.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rjones at fedoraproject.org  Tue Apr 28 11:11:15 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 28 Apr 2009 11:11:15 +0000 (UTC)
Subject: rpms/mingw32-SDL/devel mingw32-SDL.spec,1.3,1.4
Message-ID: <20090428111115.DB16470129@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16747

Modified Files:
	mingw32-SDL.spec 
Log Message:
Add runtime requires mingw32-iconv (kraxel).


Index: mingw32-SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/devel/mingw32-SDL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-SDL.spec	26 Feb 2009 00:52:44 -0000	1.3
+++ mingw32-SDL.spec	28 Apr 2009 11:11:13 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:           mingw32-SDL
 Version:        1.2.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows port of SDL cross-platform multimedia library
 
 License:        LGPLv2+
@@ -46,6 +46,9 @@ Requires:       pkgconfig
 #BuildRequires: nasm
 #%endif
 
+# kraxel pointed out that the headers need <iconv.h>, hence:
+Requires:       mingw32-iconv
+
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -115,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-7
+- Add runtime Requires mingw32-iconv (kraxel).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Apr 28 11:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 11:22:52 +0000
Subject: [pkgdb] kdelibs: ltinkl has requested watchcommits
Message-ID: <20090428112252.1696610F895@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 11:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 11:22:49 +0000
Subject: [pkgdb] kdelibs: ltinkl has requested watchbugzilla
Message-ID: <20090428112249.5EC7B10F881@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 11:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 11:22:54 +0000
Subject: [pkgdb] kdelibs: ltinkl has requested commit
Message-ID: <20090428112254.575B610F898@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdelibs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From nhorman at fedoraproject.org  Tue Apr 28 11:26:16 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 28 Apr 2009 11:26:16 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-missing-rfc2465-stats.patch, NONE,
	1.1 kernel.spec, 1.1534, 1.1535
Message-ID: <20090428112616.5863270129@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23376

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-missing-rfc2465-stats.patch 
Log Message:
Resolves: bz492391

linux-2.6-missing-rfc2465-stats.patch:

--- NEW FILE linux-2.6-missing-rfc2465-stats.patch ---
diff -up linux-2.6.29.noarch/include/linux/snmp.h.orig linux-2.6.29.noarch/include/linux/snmp.h
--- linux-2.6.29.noarch/include/linux/snmp.h.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/include/linux/snmp.h	2009-04-27 10:15:53.000000000 -0400
@@ -18,7 +18,7 @@
 enum
 {
 	IPSTATS_MIB_NUM = 0,
-	IPSTATS_MIB_INRECEIVES,			/* InReceives */
+	IPSTATS_MIB_INPKTS,			/* InReceives */
 	IPSTATS_MIB_INHDRERRORS,		/* InHdrErrors */
 	IPSTATS_MIB_INTOOBIGERRORS,		/* InTooBigErrors */
 	IPSTATS_MIB_INNOROUTES,			/* InNoRoutes */
@@ -28,7 +28,7 @@ enum
 	IPSTATS_MIB_INDISCARDS,			/* InDiscards */
 	IPSTATS_MIB_INDELIVERS,			/* InDelivers */
 	IPSTATS_MIB_OUTFORWDATAGRAMS,		/* OutForwDatagrams */
-	IPSTATS_MIB_OUTREQUESTS,		/* OutRequests */
+	IPSTATS_MIB_OUTPKTS,			/* OutRequests */
 	IPSTATS_MIB_OUTDISCARDS,		/* OutDiscards */
 	IPSTATS_MIB_OUTNOROUTES,		/* OutNoRoutes */
 	IPSTATS_MIB_REASMTIMEOUT,		/* ReasmTimeout */
@@ -42,6 +42,12 @@ enum
 	IPSTATS_MIB_OUTMCASTPKTS,		/* OutMcastPkts */
 	IPSTATS_MIB_INBCASTPKTS,		/* InBcastPkts */
 	IPSTATS_MIB_OUTBCASTPKTS,		/* OutBcastPkts */
+	IPSTATS_MIB_INOCTETS,			/* InOctets */
+	IPSTATS_MIB_OUTOCTETS,			/* OutOctets */
+	IPSTATS_MIB_INMCASTOCTETS,		/* InMcastOctets */
+	IPSTATS_MIB_OUTMCASTOCTETS,		/* OutMcastOctets */
+	IPSTATS_MIB_INBCASTOCTETS,		/* InBcastOctets */
+	IPSTATS_MIB_OUTBCASTOCTETS,		/* OutBcastOctets */
 	__IPSTATS_MIB_MAX
 };
 
diff -up linux-2.6.29.noarch/include/net/ip.h.orig linux-2.6.29.noarch/include/net/ip.h
--- linux-2.6.29.noarch/include/net/ip.h.orig	2009-04-27 09:33:56.000000000 -0400
+++ linux-2.6.29.noarch/include/net/ip.h	2009-04-27 10:15:53.000000000 -0400
@@ -168,7 +168,10 @@ struct ipv4_config
 extern struct ipv4_config ipv4_config;
 #define IP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.ip_statistics, field)
 #define IP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.ip_statistics, field)
+#define IP_ADD_STATS(net, field, val)	SNMP_ADD_STATS((net)->mib.ip_statistics, field, val)
 #define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.ip_statistics, field, val)
+#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS((net)->mib.ip_statistics, field, val)
+#define IP_UPD_PO_STATS_BH(net, field, val) SNMP_UPD_PO_STATS_BH((net)->mib.ip_statistics, field, val)
 #define NET_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.net_statistics, field)
 #define NET_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.net_statistics, field)
 #define NET_INC_STATS_USER(net, field) 	SNMP_INC_STATS_USER((net)->mib.net_statistics, field)
diff -up linux-2.6.29.noarch/include/net/ipv6.h.orig linux-2.6.29.noarch/include/net/ipv6.h
--- linux-2.6.29.noarch/include/net/ipv6.h.orig	2009-04-27 09:33:56.000000000 -0400
+++ linux-2.6.29.noarch/include/net/ipv6.h	2009-04-27 10:15:53.000000000 -0400
@@ -126,15 +126,28 @@ extern struct ctl_path net_ipv6_ctl_path
 	SNMP_ADD_STATS##modifier((net)->mib.statname##_statistics, (field), (val));\
 })
 
+#define _DEVUPD(net, statname, modifier, idev, field, val)		\
+({									\
+	struct inet6_dev *_idev = (idev);				\
+	if (likely(_idev != NULL))					\
+		SNMP_UPD_PO_STATS##modifier((_idev)->stats.statname, field, (val)); \
+	SNMP_UPD_PO_STATS##modifier((net)->mib.statname##_statistics, field, (val));\
+})
+
 /* MIBs */
 
 #define IP6_INC_STATS(net, idev,field)		\
 		_DEVINC(net, ipv6, , idev, field)
 #define IP6_INC_STATS_BH(net, idev,field)	\
 		_DEVINC(net, ipv6, _BH, idev, field)
+#define IP6_ADD_STATS(net, idev,field,val)	\
+		_DEVADD(net, ipv6, , idev, field, val)
 #define IP6_ADD_STATS_BH(net, idev,field,val)	\
 		_DEVADD(net, ipv6, _BH, idev, field, val)
-
+#define IP6_UPD_PO_STATS(net, idev,field,val)   \
+		_DEVUPD(net, ipv6, , idev, field, val)
+#define IP6_UPD_PO_STATS_BH(net, idev,field,val)   \
+		_DEVUPD(net, ipv6, _BH, idev, field, val)
 #define ICMP6_INC_STATS(net, idev, field)	\
 		_DEVINC(net, icmpv6, , idev, field)
 #define ICMP6_INC_STATS_BH(net, idev, field)	\
diff -up linux-2.6.29.noarch/include/net/snmp.h.orig linux-2.6.29.noarch/include/net/snmp.h
--- linux-2.6.29.noarch/include/net/snmp.h.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/include/net/snmp.h	2009-04-27 10:15:53.000000000 -0400
@@ -153,6 +153,11 @@ struct linux_xfrm_mib {
 		per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field]--; \
 		put_cpu(); \
 	} while (0)
+#define SNMP_ADD_STATS(mib, field, addend) 	\
+	do { \
+		per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field] += addend; \
+		put_cpu(); \
+	} while (0)
 #define SNMP_ADD_STATS_BH(mib, field, addend) 	\
 	(per_cpu_ptr(mib[0], raw_smp_processor_id())->mibs[field] += addend)
 #define SNMP_ADD_STATS_USER(mib, field, addend) 	\
@@ -160,5 +165,17 @@ struct linux_xfrm_mib {
 		per_cpu_ptr(mib[1], get_cpu())->mibs[field] += addend; \
 		put_cpu(); \
 	} while (0)
-
+#define SNMP_UPD_PO_STATS(mib, basefield, addend)	\
+	do { \
+		__typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], get_cpu());\
+		ptr->mibs[basefield##PKTS]++; \
+		ptr->mibs[basefield##OCTETS] += addend;\
+		put_cpu(); \
+	} while (0)
+#define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)	\
+	do { \
+		__typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], raw_smp_processor_id());\
+		ptr->mibs[basefield##PKTS]++; \
+		ptr->mibs[basefield##OCTETS] += addend;\
+	} while (0)
 #endif
diff -up linux-2.6.29.noarch/net/ipv4/ip_input.c.orig linux-2.6.29.noarch/net/ipv4/ip_input.c
--- linux-2.6.29.noarch/net/ipv4/ip_input.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv4/ip_input.c	2009-04-27 10:15:53.000000000 -0400
@@ -358,10 +358,12 @@ static int ip_rcv_finish(struct sk_buff 
 		goto drop;
 
 	rt = skb->rtable;
-	if (rt->rt_type == RTN_MULTICAST)
-		IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCASTPKTS);
-	else if (rt->rt_type == RTN_BROADCAST)
-		IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCASTPKTS);
+	if (rt->rt_type == RTN_MULTICAST) {
+		IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCAST,
+				skb->len);
+	} else if (rt->rt_type == RTN_BROADCAST)
+		IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCAST,
+				skb->len);
 
 	return dst_input(skb);
 
@@ -384,7 +386,8 @@ int ip_rcv(struct sk_buff *skb, struct n
 	if (skb->pkt_type == PACKET_OTHERHOST)
 		goto drop;
 
-	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INRECEIVES);
+
+	IP_UPD_PO_STATS_BH(dev_net(dev), IPSTATS_MIB_IN, skb->len);
 
 	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
 		IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);
diff -up linux-2.6.29.noarch/net/ipv4/ip_output.c.orig linux-2.6.29.noarch/net/ipv4/ip_output.c
--- linux-2.6.29.noarch/net/ipv4/ip_output.c.orig	2009-04-27 09:33:59.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv4/ip_output.c	2009-04-27 10:15:53.000000000 -0400
@@ -181,10 +181,10 @@ static inline int ip_finish_output2(stru
 	struct net_device *dev = dst->dev;
 	unsigned int hh_len = LL_RESERVED_SPACE(dev);
 
-	if (rt->rt_type == RTN_MULTICAST)
-		IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTMCASTPKTS);
-	else if (rt->rt_type == RTN_BROADCAST)
-		IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTBCASTPKTS);
+	if (rt->rt_type == RTN_MULTICAST) {
+		IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUTMCAST, skb->len);
+	} else if (rt->rt_type == RTN_BROADCAST)
+		IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUTBCAST, skb->len);
 
 	/* Be paranoid, rather than too clever. */
 	if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {
@@ -244,8 +244,8 @@ int ip_mc_output(struct sk_buff *skb)
 	/*
 	 *	If the indicated interface is up and running, send the packet.
 	 */
-	IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS);
-
+	IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUT, skb->len);
+	
 	skb->dev = dev;
 	skb->protocol = htons(ETH_P_IP);
 
@@ -298,7 +298,7 @@ int ip_output(struct sk_buff *skb)
 {
 	struct net_device *dev = skb->dst->dev;
 
-	IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS);
+	IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUT, skb->len);
 
 	skb->dev = dev;
 	skb->protocol = htons(ETH_P_IP);
diff -up linux-2.6.29.noarch/net/ipv4/proc.c.orig linux-2.6.29.noarch/net/ipv4/proc.c
--- linux-2.6.29.noarch/net/ipv4/proc.c.orig	2009-04-27 09:34:00.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv4/proc.c	2009-04-27 10:15:53.000000000 -0400
@@ -90,14 +90,14 @@ static const struct file_operations sock
 
 /* snmp items */
 static const struct snmp_mib snmp4_ipstats_list[] = {
-	SNMP_MIB_ITEM("InReceives", IPSTATS_MIB_INRECEIVES),
+	SNMP_MIB_ITEM("InReceives", IPSTATS_MIB_INPKTS),
 	SNMP_MIB_ITEM("InHdrErrors", IPSTATS_MIB_INHDRERRORS),
 	SNMP_MIB_ITEM("InAddrErrors", IPSTATS_MIB_INADDRERRORS),
 	SNMP_MIB_ITEM("ForwDatagrams", IPSTATS_MIB_OUTFORWDATAGRAMS),
 	SNMP_MIB_ITEM("InUnknownProtos", IPSTATS_MIB_INUNKNOWNPROTOS),
 	SNMP_MIB_ITEM("InDiscards", IPSTATS_MIB_INDISCARDS),
 	SNMP_MIB_ITEM("InDelivers", IPSTATS_MIB_INDELIVERS),
-	SNMP_MIB_ITEM("OutRequests", IPSTATS_MIB_OUTREQUESTS),
+	SNMP_MIB_ITEM("OutRequests", IPSTATS_MIB_OUTPKTS),
 	SNMP_MIB_ITEM("OutDiscards", IPSTATS_MIB_OUTDISCARDS),
 	SNMP_MIB_ITEM("OutNoRoutes", IPSTATS_MIB_OUTNOROUTES),
 	SNMP_MIB_ITEM("ReasmTimeout", IPSTATS_MIB_REASMTIMEOUT),
@@ -118,6 +118,12 @@ static const struct snmp_mib snmp4_ipext
 	SNMP_MIB_ITEM("OutMcastPkts", IPSTATS_MIB_OUTMCASTPKTS),
 	SNMP_MIB_ITEM("InBcastPkts", IPSTATS_MIB_INBCASTPKTS),
 	SNMP_MIB_ITEM("OutBcastPkts", IPSTATS_MIB_OUTBCASTPKTS),
+	SNMP_MIB_ITEM("InOctets", IPSTATS_MIB_INOCTETS),
+	SNMP_MIB_ITEM("OutOctets", IPSTATS_MIB_OUTOCTETS),
+	SNMP_MIB_ITEM("InMcastOctets", IPSTATS_MIB_INMCASTOCTETS),
+	SNMP_MIB_ITEM("OutMcastOctets", IPSTATS_MIB_OUTMCASTOCTETS),
+	SNMP_MIB_ITEM("InBcastOctets", IPSTATS_MIB_INBCASTOCTETS),
+	SNMP_MIB_ITEM("OutBcastOctets", IPSTATS_MIB_OUTBCASTOCTETS),
 	SNMP_MIB_SENTINEL
 };
 
diff -up linux-2.6.29.noarch/net/ipv6/ip6_input.c.orig linux-2.6.29.noarch/net/ipv6/ip6_input.c
--- linux-2.6.29.noarch/net/ipv6/ip6_input.c.orig	2009-04-27 09:34:00.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv6/ip6_input.c	2009-04-27 10:15:53.000000000 -0400
@@ -70,7 +70,7 @@ int ipv6_rcv(struct sk_buff *skb, struct
 
 	idev = __in6_dev_get(skb->dev);
 
-	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INRECEIVES);
+	IP6_UPD_PO_STATS_BH(net, idev, IPSTATS_MIB_IN, skb->len);
 
 	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL ||
 	    !idev || unlikely(idev->cnf.disable_ipv6)) {
@@ -242,8 +242,9 @@ int ip6_mc_input(struct sk_buff *skb)
 	struct ipv6hdr *hdr;
 	int deliver;
 
-	IP6_INC_STATS_BH(dev_net(skb->dst->dev),
-			 ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS);
+	IP6_UPD_PO_STATS_BH(dev_net(skb->dst->dev),
+			 ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCAST,
+			 skb->len);
 
 	hdr = ipv6_hdr(skb);
 	deliver = ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL);
diff -up linux-2.6.29.noarch/net/ipv6/ip6_output.c.orig linux-2.6.29.noarch/net/ipv6/ip6_output.c
--- linux-2.6.29.noarch/net/ipv6/ip6_output.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv6/ip6_output.c	2009-04-27 10:15:53.000000000 -0400
@@ -159,7 +159,8 @@ static int ip6_output2(struct sk_buff *s
 			}
 		}
 
-		IP6_INC_STATS(dev_net(dev), idev, IPSTATS_MIB_OUTMCASTPKTS);
+		IP6_UPD_PO_STATS(dev_net(dev), idev, IPSTATS_MIB_OUTMCAST,
+				skb->len);
 	}
 
 	return NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, skb, NULL, skb->dev,
@@ -275,8 +276,8 @@ int ip6_xmit(struct sock *sk, struct sk_
 
 	mtu = dst_mtu(dst);
 	if ((skb->len <= mtu) || skb->local_df || skb_is_gso(skb)) {
-		IP6_INC_STATS(net, ip6_dst_idev(skb->dst),
-			      IPSTATS_MIB_OUTREQUESTS);
+		IP6_UPD_PO_STATS(net, ip6_dst_idev(skb->dst),
+			      IPSTATS_MIB_OUT, skb->len);
 		return NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,
 				dst_output);
 	}
@@ -1516,7 +1517,7 @@ int ip6_push_pending_frames(struct sock 
 	skb->mark = sk->sk_mark;
 
 	skb->dst = dst_clone(&rt->u.dst);
-	IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS);
+	IP6_UPD_PO_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
 	if (proto == IPPROTO_ICMPV6) {
 		struct inet6_dev *idev = ip6_dst_idev(skb->dst);
 
diff -up linux-2.6.29.noarch/net/ipv6/mcast.c.orig linux-2.6.29.noarch/net/ipv6/mcast.c
--- linux-2.6.29.noarch/net/ipv6/mcast.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv6/mcast.c	2009-04-27 10:15:53.000000000 -0400
@@ -1449,7 +1449,8 @@ static void mld_sendpack(struct sk_buff 
 	int err;
 	struct flowi fl;
 
-	IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);
+	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);
+
 	payload_len = (skb->tail - skb->network_header) - sizeof(*pip6);
 	mldlen = skb->tail - skb->transport_header;
 	pip6->payload_len = htons(payload_len);
@@ -1473,13 +1474,15 @@ static void mld_sendpack(struct sk_buff 
 	if (err)
 		goto err_out;
 
+	payload_len = skb->len;
+
 	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev,
 		      dst_output);
 out:
 	if (!err) {
 		ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT);
 		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
-		IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS);
+		IP6_UPD_PO_STATS_BH(net, idev, IPSTATS_MIB_OUTMCAST, payload_len);
 	} else
 		IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTDISCARDS);
 
@@ -1773,10 +1776,6 @@ static void igmp6_send(struct in6_addr *
 		     IPV6_TLV_PADN, 0 };
 	struct flowi fl;
 
-	rcu_read_lock();
-	IP6_INC_STATS(net, __in6_dev_get(dev),
-		      IPSTATS_MIB_OUTREQUESTS);
-	rcu_read_unlock();
 	if (type == ICMPV6_MGM_REDUCTION)
 		snd_addr = &in6addr_linklocal_allrouters;
 	else
@@ -1786,6 +1785,11 @@ static void igmp6_send(struct in6_addr *
 	payload_len = len + sizeof(ra);
 	full_len = sizeof(struct ipv6hdr) + payload_len;
 
+	rcu_read_lock();
+	IP6_UPD_PO_STATS(net, __in6_dev_get(dev),
+		      IPSTATS_MIB_OUT, full_len);
+	rcu_read_unlock();
+
 	skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + full_len, 1, &err);
 
 	if (skb == NULL) {
@@ -1838,13 +1842,14 @@ static void igmp6_send(struct in6_addr *
 	if (err)
 		goto err_out;
 
+
 	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev,
 		      dst_output);
 out:
 	if (!err) {
 		ICMP6MSGOUT_INC_STATS(net, idev, type);
 		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
-		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS);
+		IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, full_len);
 	} else
 		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
 
diff -up linux-2.6.29.noarch/net/ipv6/ndisc.c.orig linux-2.6.29.noarch/net/ipv6/ndisc.c
--- linux-2.6.29.noarch/net/ipv6/ndisc.c.orig	2009-04-27 09:34:00.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv6/ndisc.c	2009-04-27 10:15:53.000000000 -0400
@@ -533,7 +533,7 @@ void ndisc_send_skb(struct sk_buff *skb,
 	skb->dst = dst;
 
 	idev = in6_dev_get(dst->dev);
-	IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);
+	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);
 
 	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,
 		      dst_output);
@@ -1613,7 +1613,7 @@ void ndisc_send_redirect(struct sk_buff 
 
 	buff->dst = dst;
 	idev = in6_dev_get(dst->dev);
-	IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);
+	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);
 	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,
 		      dst_output);
 	if (!err) {
diff -up linux-2.6.29.noarch/net/ipv6/proc.c.orig linux-2.6.29.noarch/net/ipv6/proc.c
--- linux-2.6.29.noarch/net/ipv6/proc.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv6/proc.c	2009-04-27 10:15:53.000000000 -0400
@@ -61,7 +61,7 @@ static const struct file_operations sock
 
 static struct snmp_mib snmp6_ipstats_list[] = {
 /* ipv6 mib according to RFC 2465 */
-	SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INRECEIVES),
+	SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INPKTS),
 	SNMP_MIB_ITEM("Ip6InHdrErrors", IPSTATS_MIB_INHDRERRORS),
 	SNMP_MIB_ITEM("Ip6InTooBigErrors", IPSTATS_MIB_INTOOBIGERRORS),
 	SNMP_MIB_ITEM("Ip6InNoRoutes", IPSTATS_MIB_INNOROUTES),
@@ -71,7 +71,7 @@ static struct snmp_mib snmp6_ipstats_lis
 	SNMP_MIB_ITEM("Ip6InDiscards", IPSTATS_MIB_INDISCARDS),
 	SNMP_MIB_ITEM("Ip6InDelivers", IPSTATS_MIB_INDELIVERS),
 	SNMP_MIB_ITEM("Ip6OutForwDatagrams", IPSTATS_MIB_OUTFORWDATAGRAMS),
-	SNMP_MIB_ITEM("Ip6OutRequests", IPSTATS_MIB_OUTREQUESTS),
+	SNMP_MIB_ITEM("Ip6OutRequests", IPSTATS_MIB_OUTPKTS),
 	SNMP_MIB_ITEM("Ip6OutDiscards", IPSTATS_MIB_OUTDISCARDS),
 	SNMP_MIB_ITEM("Ip6OutNoRoutes", IPSTATS_MIB_OUTNOROUTES),
 	SNMP_MIB_ITEM("Ip6ReasmTimeout", IPSTATS_MIB_REASMTIMEOUT),
@@ -83,6 +83,12 @@ static struct snmp_mib snmp6_ipstats_lis
 	SNMP_MIB_ITEM("Ip6FragCreates", IPSTATS_MIB_FRAGCREATES),
 	SNMP_MIB_ITEM("Ip6InMcastPkts", IPSTATS_MIB_INMCASTPKTS),
 	SNMP_MIB_ITEM("Ip6OutMcastPkts", IPSTATS_MIB_OUTMCASTPKTS),
+	SNMP_MIB_ITEM("Ip6InOctets", IPSTATS_MIB_INOCTETS),
+	SNMP_MIB_ITEM("Ip6OutOctets", IPSTATS_MIB_OUTOCTETS),
+	SNMP_MIB_ITEM("Ip6InMcastOctets", IPSTATS_MIB_INMCASTOCTETS),
+	SNMP_MIB_ITEM("Ip6OutMcastOctets", IPSTATS_MIB_OUTMCASTOCTETS),
+	SNMP_MIB_ITEM("Ip6InBcastOctets", IPSTATS_MIB_INBCASTOCTETS),
+	SNMP_MIB_ITEM("Ip6OutBcastOctets", IPSTATS_MIB_OUTBCASTOCTETS),
 	SNMP_MIB_SENTINEL
 };
 
diff -up linux-2.6.29.noarch/net/ipv6/raw.c.orig linux-2.6.29.noarch/net/ipv6/raw.c
--- linux-2.6.29.noarch/net/ipv6/raw.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/net/ipv6/raw.c	2009-04-27 10:15:53.000000000 -0400
@@ -638,7 +638,7 @@ static int rawv6_send_hdrinc(struct sock
 	if (err)
 		goto error_fault;
 
-	IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS);
+	IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
 	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
 		      dst_output);
 	if (err > 0)


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1534
retrieving revision 1.1535
diff -u -p -r1.1534 -r1.1535
--- kernel.spec	28 Apr 2009 04:36:02 -0000	1.1534
+++ kernel.spec	28 Apr 2009 11:25:45 -0000	1.1535
@@ -675,6 +675,9 @@ Patch9002: cpufreq-add-atom-to-p4-clockm
 
 Patch9100: linux-2.6-iwl3945-remove-useless-exports.patch
 
+#snmp fixes
+Patch10000: linux-2.6-missing-rfc2465-stats.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1083,6 +1086,8 @@ ApplyPatch linux-2.6-sysrq-c.patch
 
 ApplyPatch rds-only-on-64-bit-or-x86.patch
 
+ApplyPatch linux-2.6-missing-rfc2465-stats.patch
+
 # Architecture patches
 # x86(-64)
 
@@ -1825,6 +1830,9 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 28 2009 Neil Horman <nhorman at redhat.com>
+- Backport missing snmp stats (bz 492391)
+
 * Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30-0.72.rc3.git3
 - Drop unused exports from the iwl3945 driver.
 



From kdudka at fedoraproject.org  Tue Apr 28 11:46:51 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 28 Apr 2009 11:46:51 +0000 (UTC)
Subject: rpms/elinks/devel elinks-nss-inc.patch, NONE, 1.1 elinks-nss.patch, 
	1.4, 1.5 elinks.spec, 1.69, 1.70
Message-ID: <20090428114652.3255970129@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28373

Modified Files:
	elinks-nss.patch elinks.spec 
Added Files:
	elinks-nss-inc.patch 
Log Message:
support for trusted CA certificates loading from file in PEM format

elinks-nss-inc.patch:

--- NEW FILE elinks-nss-inc.patch ---
diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.c elinks-0.12pre3/src/network/ssl/ssl.c
--- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-28 13:12:19.365660000 +0200
+++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-28 13:26:39.287600358 +0200
@@ -48,10 +48,16 @@ SSL_CTX *context = NULL;
 static void
 init_openssl(struct module *module)
 {
+	unsigned char *ca_file;
 	SSLeay_add_ssl_algorithms();
 	context = SSL_CTX_new(SSLv23_client_method());
 	SSL_CTX_set_options(context, SSL_OP_ALL);
+#ifdef CONFIG_NSS_COMPAT_OSSL
+	ca_file = get_opt_str("connection.ssl.trusted_ca_file");
+	SSL_CTX_load_verify_locations(context, ca_file, NULL);
+#else
 	SSL_CTX_set_default_verify_paths(context);
+#endif
 }
 
 static void
@@ -61,10 +67,27 @@ done_openssl(struct module *module)
 }
 
 static struct option_info openssl_options[] = {
+#ifdef CONFIG_NSS_COMPAT_OSSL
+	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
+		"cert_verify", 0, 0,
+		N_("Verify the peer's SSL certificate.")),
+
+	INIT_OPT_STRING("connection.ssl", N_("Trusted CA file"),
+		"trusted_ca_file", 0, "/etc/pki/tls/certs/ca-bundle.crt",
+		N_("The location of a file containing certificates of "
+		"trusted certification authorities in PEM format. "
+		"ELinks then trusts certificates issued by these CAs.\n"
+		"\n"
+		"If you change this option or the file, you must "
+		"restart ELinks for the changes to take effect. "
+		"This option affects GnuTLS and nss_compat_ossl but not "
+		"OpenSSL.")),
+#else
 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
 		"cert_verify", 0, 0,
 		N_("Verify the peer's SSL certificate. Note that this "
 		"needs extensive configuration of OpenSSL by the user.")),
+#endif
 
 	INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
         	"client_cert", OPT_SORT,
@@ -187,7 +210,8 @@ static struct option_info gnutls_options
 		"\n"
 		"If you change this option or the file, you must "
 		"restart ELinks for the changes to take effect. "
-		"This option affects GnuTLS but not OpenSSL.")),
+		"This option affects GnuTLS and nss_compat_ossl but not "
+		"OpenSSL.")),
 
 	NULL_OPTION_INFO,
 };

elinks-nss.patch:

Index: elinks-nss.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-nss.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- elinks-nss.patch	14 Apr 2009 11:59:45 -0000	1.4
+++ elinks-nss.patch	28 Apr 2009 11:46:48 -0000	1.5
@@ -1,6 +1,6 @@
 diff -ruNp elinks-0.12pre3.orig/configure.in elinks-0.12pre3/configure.in
---- elinks-0.12pre3.orig/configure.in	2009-04-14 13:46:26.749379000 +0200
-+++ elinks-0.12pre3/configure.in	2009-04-14 13:47:13.702846713 +0200
+--- elinks-0.12pre3.orig/configure.in	2009-04-28 12:19:38.816628000 +0200
++++ elinks-0.12pre3/configure.in	2009-04-28 12:56:07.343999815 +0200
 @@ -1014,6 +1014,7 @@ gnutls_withval="$withval"
  
  if test "$enable_gnutls" = yes; then
@@ -62,7 +62,7 @@ diff -ruNp elinks-0.12pre3.orig/configur
  
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/socket.c elinks-0.12pre3/src/network/ssl/socket.c
 --- elinks-0.12pre3.orig/src/network/ssl/socket.c	2009-03-29 00:14:03.000000000 +0100
-+++ elinks-0.12pre3/src/network/ssl/socket.c	2009-04-14 13:47:13.704846733 +0200
++++ elinks-0.12pre3/src/network/ssl/socket.c	2009-04-28 13:01:02.116180177 +0200
 @@ -6,6 +6,10 @@
  
  #ifdef CONFIG_OPENSSL
@@ -153,8 +153,8 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  #elif defined(CONFIG_GNUTLS)
  		int err = rd;
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.c elinks-0.12pre3/src/network/ssl/ssl.c
---- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-14 13:46:26.739379000 +0200
-+++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-14 13:52:15.813854125 +0200
+--- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-28 12:19:38.782627000 +0200
++++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-28 12:59:09.000000000 +0200
 @@ -7,6 +7,10 @@
  #ifdef CONFIG_OPENSSL
  #include <openssl/ssl.h>
@@ -175,42 +175,24 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  #ifndef PATH_MAX
  #define	PATH_MAX	256 /* according to my /usr/include/bits/posix1_lim.h */
-@@ -57,10 +61,18 @@ done_openssl(struct module *module)
- }
- 
- static struct option_info openssl_options[] = {
-+#ifdef CONFIG_NSS_COMPAT_OSSL
-+	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
-+		"cert_verify", 0, 0,
-+		N_("Verify the peer's SSL certificate. The NSS database "
-+		"location can be changed by SSL_DIR environment variable. "
-+		"The database can be also shared with Mozilla browsers.")),
-+#else
- 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
- 		"cert_verify", 0, 0,
- 		N_("Verify the peer's SSL certificate. Note that this "
- 		"needs extensive configuration of OpenSSL by the user.")),
-+#endif
- 
- 	INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
-         	"client_cert", OPT_SORT,
-@@ -71,12 +83,27 @@ static struct option_info openssl_option
+@@ -71,12 +75,28 @@ static struct option_info openssl_option
  		N_("Enable or not the sending of X509 client certificates "
  		"to servers which request them.")),
  
 +#ifdef CONFIG_NSS_COMPAT_OSSL
 +	INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate nickname"),
 +		"nickname", 0, "",
-+		 N_("The nickname of the client certificate stored in NSS "
-+		    "database. If this value is unset, the nickname from "
-+		    "the X509_CLIENT_CERT variable is used instead. If you "
-+		    "have a PKCS#12 file containing client certificate, you "
-+		    "can import it into your NSS database with: "
-+		    "$ pk12util -i mycert.p12 -d /path/to/database "
-+		    " "
-+		    "The NSS database location can be changed by SSL_DIR "
-+		    "environment variable. The database can be also shared "
-+		    "with Mozilla browsers.")),
++		N_("The nickname of the client certificate stored in NSS "
++		"database. If this value is unset, the nickname from "
++		"the X509_CLIENT_CERT variable is used instead. If you "
++		"have a PKCS#12 file containing client certificate, you "
++		"can import it into your NSS database with:\n"
++		"\n"
++		"$ pk12util -i mycert.p12 -d /path/to/database\n"
++		"\n"
++		"The NSS database location can be changed by SSL_DIR "
++		"environment variable. The database can be also shared "
++		"with Mozilla browsers.")),
 +#else
  	INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate File"),
  		"file", 0, "",
@@ -222,7 +204,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  	NULL_OPTION_INFO,
  };
-@@ -182,7 +209,7 @@ static struct module gnutls_module = str
+@@ -182,7 +202,7 @@ static struct module gnutls_module = str
  	/* done: */		done_gnutls
  );
  
@@ -231,7 +213,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  static struct option_info ssl_options[] = {
  	INIT_OPT_TREE("connection", N_("SSL"),
-@@ -193,7 +220,7 @@ static struct option_info ssl_options[] 
+@@ -193,7 +213,7 @@ static struct option_info ssl_options[] 
  };
  
  static struct module *ssl_modules[] = {
@@ -240,7 +222,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	&openssl_module,
  #elif defined(CONFIG_GNUTLS)
  	&gnutls_module,
-@@ -214,7 +241,7 @@ struct module ssl_module = struct_module
+@@ -214,7 +234,7 @@ struct module ssl_module = struct_module
  int
  init_ssl_connection(struct socket *socket)
  {
@@ -249,7 +231,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	socket->ssl = SSL_new(context);
  	if (!socket->ssl) return S_SSL_ERROR;
  #elif defined(CONFIG_GNUTLS)
-@@ -263,7 +290,7 @@ done_ssl_connection(struct socket *socke
+@@ -263,7 +283,7 @@ done_ssl_connection(struct socket *socke
  	ssl_t *ssl = socket->ssl;
  
  	if (!ssl) return;
@@ -258,7 +240,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	SSL_free(ssl);
  #elif defined(CONFIG_GNUTLS)
  	gnutls_deinit(*ssl);
-@@ -280,7 +307,7 @@ get_ssl_connection_cipher(struct socket 
+@@ -280,7 +300,7 @@ get_ssl_connection_cipher(struct socket 
  
  	if (!init_string(&str)) return NULL;
  
@@ -269,7 +251,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  		SSL_get_cipher_version(ssl),
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.h elinks-0.12pre3/src/network/ssl/ssl.h
 --- elinks-0.12pre3.orig/src/network/ssl/ssl.h	2009-03-29 00:14:03.000000000 +0100
-+++ elinks-0.12pre3/src/network/ssl/ssl.h	2009-04-14 13:47:13.706846753 +0200
++++ elinks-0.12pre3/src/network/ssl/ssl.h	2009-04-28 12:56:59.000000000 +0200
 @@ -22,7 +22,7 @@ unsigned char *get_ssl_connection_cipher
  
  /* Internal type used in ssl module. */


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- elinks.spec	14 Apr 2009 16:53:45 -0000	1.69
+++ elinks.spec	28 Apr 2009 11:46:48 -0000	1.70
@@ -1,6 +1,6 @@
 Name:      elinks
 Summary:   A text-mode Web browser
-Version:   0.12
+Version:   0.13
 Release:   0.12.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
@@ -35,6 +35,7 @@ Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.3-macropen.patch
 Patch8: elinks-scroll.patch
 Patch9: elinks-nss.patch
+Patch10: elinks-nss-inc.patch
 
 %description
 Elinks is a text-based Web browser. Elinks does not display any images,
@@ -62,8 +63,10 @@ quickly and swiftly displays Web pages.
 %patch7 -p1
 #upstream fix for out of screen dialogs
 %patch8 -p1
-# Port elinks to use NSS library for cryptography (#346861)
+# Port elinks to use NSS library for cryptography (#346861) - accepted upstream
 %patch9 -p1
+# Port elinks to use NSS library for cryptography (#346861) - incremental patch
+%patch10 -p1
 
 %build
 ./autogen.sh
@@ -119,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Tue Apr 28 2009 Kamil Dudka <kdudka at redhat.com> 0.12-0.13.pre3
+- use appropriate BuildRequires for nss_compat_ossl (#495532)
+- support for trusted CA certificates loading from file in PEM format
+
 * Fri Apr 03 2009 Ondrej Vasik <ovasik at redhat.com> 0.12.0.12.pre3
 - use word Elinks instead of Links in package description
 



From cwickert at fedoraproject.org  Tue Apr 28 11:50:41 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 28 Apr 2009 11:50:41 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xfce4-power-manager.spec, 1.8, 1.9
Message-ID: <20090428115041.7D01570129@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29219

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.3.RC1
- Update to 0.8.0RC



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Apr 2009 21:44:01 -0000	1.6
+++ .cvsignore	28 Apr 2009 11:50:10 -0000	1.7
@@ -1 +1 @@
-xfce4-power-manager-0.8.0beta2.tar.bz2
+xfce4-power-manager-0.8.0RC1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Apr 2009 21:44:01 -0000	1.6
+++ sources	28 Apr 2009 11:50:10 -0000	1.7
@@ -1 +1 @@
-7cb430b70876740daba4cc424473deca  xfce4-power-manager-0.8.0beta2.tar.bz2
+b7913e7eb69dc5a1ab571d759f6c177f  xfce4-power-manager-0.8.0RC1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xfce4-power-manager.spec	13 Apr 2009 21:44:02 -0000	1.8
+++ xfce4-power-manager.spec	28 Apr 2009 11:50:10 -0000	1.9
@@ -1,8 +1,8 @@
-%define betaversion beta2
+%define betaversion RC1
 
 Name:           xfce4-power-manager
 Version:        0.8.0
-Release:        0.1.%{betaversion}%{?dist}
+Release:        0.3.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
@@ -71,7 +71,6 @@ fi
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
 %{_libexecdir}/xfce4/panel-plugins/xfce4-*-plugin
 %{_datadir}/applications/%{name}-settings.desktop
-%{_datadir}/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
 %{_datadir}/icons/hicolor/scalable/*/gpm-*.svg
 %{_datadir}/xfce4/panel-plugins/xfce4-*-plugin.desktop
 %doc %{_datadir}/xfce4/doc/C/images/*.png
@@ -81,7 +80,10 @@ fi
 
 
 %changelog
-* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta2
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.3.RC1
+- Update to 0.8.0RC
+
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta2
 - Update to 0.8.0beta2
 - Drop xfpm-button-hal.patch, no longer necessary
 



From kdudka at fedoraproject.org  Tue Apr 28 11:51:17 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 28 Apr 2009 11:51:17 +0000 (UTC)
Subject: rpms/elinks/devel elinks.spec,1.70,1.71
Message-ID: <20090428115117.026F470129@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29317

Modified Files:
	elinks.spec 
Log Message:
fix typo in spec


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- elinks.spec	28 Apr 2009 11:46:48 -0000	1.70
+++ elinks.spec	28 Apr 2009 11:50:46 -0000	1.71
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
-Version:   0.13
-Release:   0.12.pre3%{?dist}
+Version:   0.12
+Release:   0.13.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet



From cwickert at fedoraproject.org  Tue Apr 28 12:06:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 28 Apr 2009 12:06:58 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-power-manager.spec, 1.5, 1.6
Message-ID: <20090428120658.F02DC70129@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17900

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.3.RC1
- Update to 0.8.0RC



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Apr 2009 20:38:01 -0000	1.4
+++ .cvsignore	28 Apr 2009 12:06:28 -0000	1.5
@@ -1 +1 @@
-xfce4-power-manager-0.8.0beta1.tar.bz2
+xfce4-power-manager-0.8.0RC1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Apr 2009 20:38:01 -0000	1.4
+++ sources	28 Apr 2009 12:06:28 -0000	1.5
@@ -1 +1 @@
-6d860b824430b654d084d7fb9db1c279  xfce4-power-manager-0.8.0beta1.tar.bz2
+b7913e7eb69dc5a1ab571d759f6c177f  xfce4-power-manager-0.8.0RC1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xfce4-power-manager.spec	13 Apr 2009 20:38:01 -0000	1.5
+++ xfce4-power-manager.spec	28 Apr 2009 12:06:28 -0000	1.6
@@ -1,16 +1,14 @@
-%define betaversion beta1
+%define betaversion RC1
 
 Name:           xfce4-power-manager
 Version:        0.8.0
-Release:        0.2.%{betaversion}%{?dist}
+Release:        0.3.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
-# Posted on goodies-dev and applied upstream on Apr 11th 2009
-Patch0:         xfce4-power-manager-0.8.0beta1-button-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -31,7 +29,6 @@ preferences.
 
 %prep
 %setup -qn %{name}-%{version}%{betaversion}
-%patch0 -p1 -b .button-hal
 
 
 %build
@@ -74,7 +71,6 @@ fi
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
 %{_libexecdir}/xfce4/panel-plugins/xfce4-*-plugin
 %{_datadir}/applications/%{name}-settings.desktop
-%{_datadir}/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
 %{_datadir}/icons/hicolor/scalable/*/gpm-*.svg
 %{_datadir}/xfce4/panel-plugins/xfce4-*-plugin.desktop
 %doc %{_datadir}/xfce4/doc/C/images/*.png
@@ -84,6 +80,13 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.3.RC1
+- Update to 0.8.0RC
+
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta2
+- Update to 0.8.0beta2
+- Drop xfpm-button-hal.patch, no longer necessary
+
 * Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
 - Add xfpm-button-hal.patch by Mike Massonnet
 



From pkgdb at fedoraproject.org  Tue Apr 28 12:07:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:07:03 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090428120704.0F41B10F886@bastion2.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdelibs (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 12:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:07:09 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090428120709.6165110F894@bastion2.fedora.phx.redhat.com>

than has set the watchcommits acl on kdelibs (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 12:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:07:09 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090428120709.DB27310F899@bastion2.fedora.phx.redhat.com>

than has set the commit acl on kdelibs (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 12:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:07:12 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090428120712.85E0E10F89B@bastion2.fedora.phx.redhat.com>

than has set the watchbugzilla acl on kdelibs (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 12:07:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:07:17 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090428120717.99E1F10F89D@bastion2.fedora.phx.redhat.com>

than has set the watchcommits acl on kdelibs (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Tue Apr 28 12:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:07:18 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090428120719.269D410F8A0@bastion2.fedora.phx.redhat.com>

than has set the commit acl on kdelibs (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From spot at fedoraproject.org  Tue Apr 28 12:12:00 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 28 Apr 2009 12:12:00 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam-4.5.3-mpris.diff,NONE,1.1
Message-ID: <20090428121200.4E2847013C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19071

Added Files:
	logjam-4.5.3-mpris.diff 
Log Message:
missing file

logjam-4.5.3-mpris.diff:

--- NEW FILE logjam-4.5.3-mpris.diff ---
diff -up logjam-4.5.3/configure.in.dbus logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/configure.in	2009-04-23 00:38:34.000000000 +0300
@@ -220,6 +220,13 @@ AC_SUBST(LIVEJOURNAL_CFLAGS)
 AC_SUBST(LIVEJOURNAL_LIBS)
 dnl end liblivejournal dependencies.
 
+dnl D-Bus API
+MODULES="dbus-1 dbus-glib-1"
+PKG_CHECK_MODULES(DBUSAPI, $MODULES)
+AC_SUBST(DBUSAPI_CFLAGS)
+AC_SUBST(DBUSAPI_LIBS)
+dnl D-Bus API
+
 AM_CONDITIONAL(WITH_XMMS, test "$with_xmms" = "yes")
 AM_CONDITIONAL(WITH_HTML, test "$with_gtkhtml" != "no")
 AM_CONDITIONAL(WITH_RSVG, test "$with_librsvg" = "yes")
diff -up logjam-4.5.3/src/conf.h.dbus logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2009-04-23 22:10:14.000000000 +0300
@@ -92,6 +92,7 @@ typedef struct {
 	char *spawn_command;
 
 	char *music_command;
+	gboolean music_mpris;
 
 	char *proxy;
 	char *proxyuser, *proxypass;
diff -up logjam-4.5.3/src/conf_xml.c.dbus logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.dbus	2009-04-23 22:19:10.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2009-04-24 15:40:45.000000000 +0300
@@ -257,6 +257,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node
 		XML_GET_CONF("proxyauth", parseproxyauth)
 		XML_GET_STR("spawncommand", c->spawn_command)
 		XML_GET_STR("musiccommand", c->music_command)
+		XML_GET_BOOL("musicmpris", c->music_mpris)
 #endif /* G_OS_WIN32 */
 		XML_GET_INT("cfuserinterval", c->cfuserinterval)
 		XML_GET_INT("cfthreshold", c->cfthreshold)
@@ -396,6 +397,8 @@ conf_write(Configuration *c, char *base)
 
 	if (c->music_command)
 		xmlAddTN(root, "musiccommand", c->music_command);
+	if (c->music_mpris)
+		xmlNewChild(root, NULL, BAD_CAST "musicmpris", NULL);
 #endif
 
 	if (c->cfuserinterval) {
diff -up logjam-4.5.3/src/init.c.dbus logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/init.c	2009-04-25 11:56:05.000000000 +0300
@@ -29,6 +29,7 @@
 #include "conf_xml.h"
 #include "jamdoc.h"
 #include "cmdline.h"
+#include "lj_dbus.h"
 
 #ifdef HAVE_GTK
 #include "login.h"
@@ -120,6 +121,9 @@ init_app(int *argc, gchar *argv[]) {
 }
 
 #ifdef HAVE_GTK
+
+extern JamDBus *jdbus;
+
 static void
 run_gtk(JamDoc *doc) {
 	gchar *accelpath;
@@ -148,8 +152,20 @@ run_gtk(JamDoc *doc) {
 		jam_doc_set_account(doc, acc);
 	}
 
+	jdbus = lj_dbus_new();
+	if (conf.music_mpris) {
+		GError *error = NULL;
+		if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+			g_printerr("Error: %s\n", error->message);
+			g_error_free(error);
+		}
+	}
+
 	jam_run(doc);
 
+	lj_dbus_close(jdbus);
+	jdbus = NULL;
+
 	g_object_unref(G_OBJECT(app.remote));
 
 	gtk_accel_map_save(accelpath);
diff -up logjam-4.5.3/src/jamview.c.dbus logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.dbus	2009-04-25 13:39:45.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-25 14:27:56.000000000 +0300
@@ -20,6 +20,7 @@
 #include "marshalers.h"
 #include "datesel.h"
 #include "tags.h"
+#include "lj_dbus.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -356,7 +357,12 @@ picture_store(JamView *view) {
 static void
 music_refresh_cb(JamView *view) {
 	GError *err = NULL;
-	gchar *music = music_detect(&err);
+	gchar *music;
+
+	if (conf.music_mpris)
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	else
+		music = music_detect(&err);
 
 	if (music) {
 		gtk_entry_set_text(GTK_ENTRY(view->music), music);
@@ -373,7 +379,7 @@ static void
 music_add(JamView *view) {
 	view->music = gtk_entry_new();
 	view->musicbar = labelled_box_new_sg(_("_Music:"), view->music, view->sizegroup);
-	if (music_can_detect(NULL)) {
+	if (conf.music_mpris || music_can_detect(NULL)) {
 		GtkWidget *refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 		g_signal_connect_swapped(G_OBJECT(refresh), "clicked",
 				G_CALLBACK(music_refresh_cb), view);
diff -up logjam-4.5.3/src/lj_dbus.c.dbus logjam-4.5.3/src/lj_dbus.c
--- logjam-4.5.3/src/lj_dbus.c.dbus	2009-04-25 13:40:31.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.c	2009-04-25 14:21:30.000000000 +0300
@@ -0,0 +1,244 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ *
+ * See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification
+ */
+
+#include <string.h>		/* memset */
+
+#include "lj_dbus.h"
+
+#define MPRIS_IF	"org.freedesktop.MediaPlayer"
+
+/* Internal prototypes */
+static gboolean lj_dbus_open(JamDBus *jd);
+static gboolean lj_dbus_append_player(JamDBus *jd, gchar *dest);
+static void lj_dbus_players_clear(JamDBus *jd);
+static gboolean lj_dbus_players_find(JamDBus *jd, GError **error);
+
+/* Implementation */
+static gboolean
+lj_dbus_open(JamDBus *jd) {
+	GError *error = NULL;
+
+	jd->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (jd->bus == NULL) {
+		g_printerr("Failed to open connection to bus: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+    }
+	return TRUE;
+}
+
+void lj_dbus_close(JamDBus *jd) {
+	if (jd == NULL)
+		return;
+	lj_dbus_players_clear(jd);
+	dbus_g_connection_unref(jd->bus);
+}
+
+JamDBus *
+lj_dbus_new(void) {
+	JamDBus *jd = (JamDBus *) g_malloc0(sizeof(JamDBus));
+
+	if (lj_dbus_open(jd) == FALSE) {
+		g_free(jd);
+		return NULL;
+	}
+	return jd;
+}
+
+static gboolean
+lj_dbus_append_player(JamDBus *jd, gchar *dest) {
+	MediaPlayer *player;
+	DBusGProxy *proxy;
+	GError *error = NULL;
+	gchar *name;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/", MPRIS_IF);
+
+	if (!dbus_g_proxy_call(proxy, "Identity", &error, G_TYPE_INVALID,
+						   G_TYPE_STRING, &name, G_TYPE_INVALID)) {
+		g_printerr("Error: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	player = (MediaPlayer *) g_malloc0(sizeof(MediaPlayer));
+	player->dest = g_strdup(dest);
+	player->name = g_strdup(name);
+	player->proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/Player", MPRIS_IF);
+
+	if (g_str_has_suffix(dest, "audacious"))
+		player->hint |= MPRIS_HINT_BAD_STATUS;
+
+	jd->player = g_list_append(jd->player, (gpointer) player);
+
+	g_free(name);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+static void
+lj_dbus_players_clear(JamDBus *jd) {
+	GList *list;
+
+	if (jd->player == NULL)
+		return;
+
+	for (list = g_list_first(jd->player); list; list = g_list_next(list)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		g_object_unref(player->proxy);
+		if (player->name)
+			g_free(player->name);
+		if (player->dest)
+			g_free(player->dest);
+	}
+	g_list_free(jd->player);
+	jd->player = NULL;
+}
+
+static gboolean
+lj_dbus_players_find(JamDBus *jd, GError **error) {
+	DBusGProxy *proxy;
+	gchar **names, **p;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+	if (!dbus_g_proxy_call(proxy, "ListNames", error, G_TYPE_INVALID,
+						   G_TYPE_STRV, &names, G_TYPE_INVALID)) {
+		return FALSE;
+	}
+
+	for (p = names; *p; p++) {
+		if (g_str_has_prefix(*p, "org.mpris.")) {
+			lj_dbus_append_player(jd, *p);
+		}
+	}
+
+	g_strfreev(names);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+gboolean
+lj_dbus_mpris_update_list(JamDBus *jd, GError **error) {
+	if (jd == NULL)
+		return FALSE;
+	lj_dbus_players_clear(jd);
+	return lj_dbus_players_find(jd, error);
+}
+
+#define DBUS_TYPE_MPRIS_STATUS \
+	(dbus_g_type_get_struct("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE \
+	(dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+
+/* TODO: Connect to status change signal */
+
+gboolean
+lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error) {
+	GValueArray *array = NULL;
+	GHashTable *info = NULL;
+	GValue *value;
+	MediaPlayer *player;
+
+	if (jd == NULL)
+		return FALSE;
+
+	if (list == NULL)
+		return FALSE;
+
+	if ((player = (MediaPlayer *) list->data) == NULL)
+		return FALSE;
+
+	memset((void *) &player->info, 0, sizeof(MetaInfo));
+
+	if (player->hint & MPRIS_HINT_BAD_STATUS) {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   G_TYPE_INT, &player->info.status, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+	} else {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   DBUS_TYPE_MPRIS_STATUS, &array, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+
+		value = g_value_array_get_nth(array, 0);
+		player->info.status = g_value_get_int(value);
+		g_value_array_free(array);
+	}
+
+	if (player->info.status == MPRIS_STATUS_PLAYING) {
+		if (!dbus_g_proxy_call(player->proxy, "GetMetadata", error, G_TYPE_INVALID,
+							   DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &info, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+		value = (GValue *) g_hash_table_lookup(info, "artist");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.artist, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "album");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.album, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "title");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.title, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+	}
+
+	return TRUE;
+}
+
+GQuark
+lj_dbus_error_quark(void) {
+	static GQuark quark = 0;
+	if (quark == 0)
+		quark = g_quark_from_static_string("dbus-error-quark");
+	return quark;
+}
+
+/* TODO: User defined format */
+
+gchar *
+lj_dbus_mpris_current_music(JamDBus *jd, GError **error) {
+	gchar *music;
+	GList *list;
+
+	if (!lj_dbus_mpris_update_list(jd, error))
+		return NULL;
+
+	list = jd ? jd->player : NULL;
+
+	if (lj_dbus_mpris_update_info(jd, list, error)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		if (player->info.status == MPRIS_STATUS_PLAYING) {
+			music = g_strdup_printf("%s - %s - %s",
+						player->info.artist[0] ? player->info.artist : _("Unknown Artist"),
+						player->info.album[0] ? player->info.album: _("Unknown Album"),
+						player->info.title[0] ? player->info.title: _("Unknown Track"));
+			return music;
+		} else {
+			g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NOT_PLAYING,
+				_("Player is stopped."));
+		}
+	} else if (error == NULL || *error == NULL) {
+		g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NO_PLAYER,
+			_("No players found."));
+	}
+	return NULL;
+}
+
+/* lj_dbus.c */
+
diff -up logjam-4.5.3/src/lj_dbus.h.dbus logjam-4.5.3/src/lj_dbus.h
--- logjam-4.5.3/src/lj_dbus.h.dbus	2009-04-25 13:40:36.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.h	2009-04-25 14:25:27.000000000 +0300
@@ -0,0 +1,68 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef lj_dbus_h
+#define lj_dbus_h
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+/* Take care about i18n strings */
+#ifndef _
+#ifdef GETTEXT_PACKAGE
+#include <glib/gi18n-lib.h>
+#else
+#define _(x)	x
+#endif
+#endif		/* _ */
+
+#define MPRIS_INFO_LEN	128
+
+typedef struct _MetaInfo MetaInfo;
+struct _MetaInfo {
+	gchar artist[MPRIS_INFO_LEN];
+	gchar album[MPRIS_INFO_LEN];
+	gchar title[MPRIS_INFO_LEN];
+
+#define	MPRIS_STATUS_PLAYING	0
+#define	MPRIS_STATUS_PAUSED		1
+#define	MPRIS_STATUS_STOPPED	2
+
+	gint status;
+};
+
+typedef struct _MediaPlayer MediaPlayer;
+struct _MediaPlayer {
+	gchar *name;
+	gchar *dest;
+	DBusGProxy *proxy;
+	MetaInfo info;
+
+#define MPRIS_HINT_BAD_STATUS	1 << 0
+
+	gint hint;
+};
+
+typedef struct _JamDBus JamDBus;
+struct _JamDBus {
+	DBusGConnection *bus;
+	GList *player;
+};
+
+void lj_dbus_close(JamDBus *jd);
+JamDBus *lj_dbus_new(void);
+
+gboolean lj_dbus_mpris_update_list(JamDBus *jd, GError **error);
+gboolean lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error);
+
+#define MPRIS_ERROR_NOT_PLAYING		1
+#define MPRIS_ERROR_NO_PLAYER		2
+
+gchar *lj_dbus_mpris_current_music(JamDBus *jd, GError **error);
+
+#endif /* lj_dbus_h */
+
diff -up logjam-4.5.3/src/Makefile.am.dbus logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.dbus	2009-04-23 00:44:11.000000000 +0300
+++ logjam-4.5.3/src/Makefile.am	2009-04-24 15:59:08.000000000 +0300
@@ -3,7 +3,7 @@ bin_PROGRAMS = logjam
 localedir=$(datadir)/locale
 
 # AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/protocol/blogger -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@ @DBUSAPI_CFLAGS@
 
 ACCOUNT = account.h account.c host.c livejournal.c
 # blogger.c
@@ -50,6 +50,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           settings.c settings.h $(GROUPEDBOX) tie.c tie.h \
           $(HISTORY) $(OFFLINE) \
           jam.c jam.h $(USEJOURNAL) \
+          lj_dbus.c lj_dbus.h \
           security.c security.h about.c thanks.h \
           menu.c menu.h $(TOOLS) smartquotes.c smartquotes.h \
           $(LOGIN) manager.c \
@@ -116,7 +117,7 @@ logjam_SOURCES += journalstore-xml.c
 endif
 
 # logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la $(top_builddir)/protocol/blogger/libblogger.la @LOGJAM_LIBS@ @NETWORK_LIBS@
-logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@
+logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@ @DBUSAPI_LIBS@
 
 ctags:
 	@version=`ctags --version | head -1`; \
diff -up logjam-4.5.3/src/music.c.dbus logjam-4.5.3/src/music.c
--- logjam-4.5.3/src/music.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/music.c	2009-04-25 01:11:29.000000000 +0300
@@ -9,8 +9,11 @@
 #include "gtk-all.h"
 
 #include "conf.h"
+#include "lj_dbus.h"
 #include "music.h"
 
+JamDBus *jdbus = NULL;
+
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
diff -up logjam-4.5.3/src/music.h.dbus logjam-4.5.3/src/music.h
--- logjam-4.5.3/src/music.h.dbus	2005-02-21 20:30:27.000000000 +0200
+++ logjam-4.5.3/src/music.h	2009-04-25 01:05:55.000000000 +0300
@@ -8,6 +8,9 @@
 #define music_h
 
 #include "conf.h" /* CommandList */
+#include "lj_dbus.h"
+
+extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
diff -up logjam-4.5.3/src/settings.c.dbus logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.dbus	2009-04-25 13:41:03.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2009-04-25 15:19:42.000000000 +0300
@@ -24,6 +24,7 @@
 #include "tie.h"
 #include "account.h"
 #include "jamview.h"
+#include "lj_dbus.h"
 
 /* what's this?  all of these funny structures in the settings box?
  * well, instead of creating and tearing down all of these widgets, i
@@ -101,6 +102,8 @@ static SettingsWidget settingswidgets[] 
 
 	{ "music_command", &conf.music_command,
 		SW_COMMAND, N_("Detect music from:"), (gpointer)music_commands },
+	{ "music_mpris", &conf.music_mpris,
+		SW_TOGGLE, N_("Detect music via MPRIS") },
 
 	{ "net_useproxy", &conf.options.useproxy, 
 		SW_TOGGLE, N_("Use _proxy server") },
@@ -169,6 +172,19 @@ toggle_tie_enable(GtkWidget *toggle, Gtk
 }
 
 static void
+toggle_disable_cb(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+}
+static void
+toggle_tie_disable(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+	g_signal_connect(G_OBJECT(toggle), "toggled",
+			G_CALLBACK(toggle_disable_cb), target);
+}
+
+static void
 toggle_tie(SettingsWidget *sw) {
 	tie_toggle(GTK_TOGGLE_BUTTON(sw->widget), (gboolean*)sw->conf);
 }
@@ -499,16 +515,21 @@ static void
 music_diagnose(GtkWidget *button) {
 	GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(button));
 	GError *err = NULL;
-	char *music, *result;
-	MusicSource source = music_current_source();
+	char *music = NULL, *result;
+	MusicSource source = MUSIC_SOURCE_NONE;
 
-	if (!music_can_detect(&err)) {
-		jam_warning(dlg, "%s", err->message);
-		g_error_free(err);
-		return;
+	if (conf.music_mpris) {
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	} else {
+		source = music_current_source();
+		if (!music_can_detect(&err)) {
+			jam_warning(dlg, "%s", err->message);
+			g_error_free(err);
+			return;
+		}
+		music = music_detect(&err);
 	}
 
-	music = music_detect(&err);
 	if (!music) {
 		if (source == MUSIC_SOURCE_XMMS &&
 				err->domain == G_SPAWN_ERROR && err->code == G_SPAWN_ERROR_NOENT) {
@@ -555,21 +576,40 @@ proxysettings(void) {
 	return group;
 }
 
+static void
+mpris_update_cb(GtkToggleButton *button, JamDBus *jd) {
+	GError *error = NULL;
+	if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+		GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+		jam_warning(dlg, _("Error detecting music: %s"), error->message);
+		g_error_free(error);
+	}
+}
+
 static GtkWidget*
 programsettings(JamWin *jw) {
 	GtkWidget *group;
-	GtkWidget *button, *hbox;
+	GtkWidget *button, *vbox, *hbox;
 	SettingsWidget *sw;
 	JamView *jv = jam_win_get_cur_view(jw);
 	
 	group = groupedbox_new_with_text(_("Programs"));
 	groupedbox_pack(GROUPEDBOX(group), sw_make("web_spawn"), FALSE);
 
-	groupedbox_pack(GROUPEDBOX(group), sw_make("music_command"), FALSE);
+	vbox = sw_make("music_command");
+	groupedbox_pack(GROUPEDBOX(group), vbox, FALSE);
 	sw = sw_lookup("music_command");
 	g_signal_connect_swapped(G_OBJECT(sw->widget), "changed",
 			G_CALLBACK(jam_view_settings_changed), jv);
 
+	button = sw_make("music_mpris");
+	groupedbox_pack(GROUPEDBOX(group), button, FALSE);
+	g_signal_connect(G_OBJECT(button), "toggled",
+			G_CALLBACK(mpris_update_cb), jdbus);
+	toggle_tie_disable(button, vbox);
+	g_signal_connect_swapped(G_OBJECT(button), "toggled",
+			G_CALLBACK(jam_view_settings_changed), jv);
+
 	button = gtk_button_new_with_mnemonic(_("_Diagnose"));
 	g_signal_connect(G_OBJECT(button), "clicked",
 			G_CALLBACK(music_diagnose), NULL);



From spot at fedoraproject.org  Tue Apr 28 12:13:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 28 Apr 2009 12:13:28 +0000 (UTC)
Subject: rpms/logjam/F-9 logjam.spec,1.53,1.54
Message-ID: <20090428121328.3261070129@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19631

Modified Files:
	logjam.spec 
Log Message:
rebuild f9 only


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- logjam.spec	27 Apr 2009 21:38:35 -0000	1.53
+++ logjam.spec	28 Apr 2009 12:12:57 -0000	1.54
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	33%{?dist}
+Release:	33%{?dist}.1
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -143,6 +143,9 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Apr 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33.1
+- f9 was missing one patch in cvs
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
 - conditionalize libtool fun for F10+
 



From ltinkl at fedoraproject.org  Tue Apr 28 12:20:39 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 12:20:39 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.4,
	1.5 kdelibs.spec, 1.473, 1.474
Message-ID: <20090428122039.5B19670129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21486/devel

Modified Files:
	kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs.spec 
Log Message:
/tmp/cvsXCJtVy

kdelibs-4.2.0-kjs-gcc44-crash.patch:

Index: kdelibs-4.2.0-kjs-gcc44-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.2.0-kjs-gcc44-crash.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdelibs-4.2.0-kjs-gcc44-crash.patch	3 Mar 2009 22:06:11 -0000	1.4
+++ kdelibs-4.2.0-kjs-gcc44-crash.patch	28 Apr 2009 12:20:38 -0000	1.5
@@ -1,12 +1,453 @@
-diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt
---- kdelibs-4.2.0/kjs/CMakeLists.txt	2008-11-19 11:20:10.000000000 +0100
-+++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt	2009-02-18 19:43:20.000000000 +0100
-@@ -183,6 +183,8 @@
-    CompileState.cpp
-    )
- 
-+set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
-+
- if (NOT DEFINED QT_ONLY)
-    set(KJSLIBNAME kjs)
- else (NOT DEFINED QT_ONLY)
+--- kdelibs/kjs/dtoa.cpp	2009/04/28 10:20:35	960320
++++ kdelibs/kjs/dtoa.cpp	2009/04/28 10:28:50	960321
+@@ -203,11 +203,7 @@
+ #endif
+ 
+ #ifdef MALLOC
+-#ifdef KR_headers
+-extern char *MALLOC();
+-#else
+ extern void *MALLOC(size_t);
+-#endif
+ #else
+ #define MALLOC malloc
+ #endif
+@@ -277,12 +273,8 @@
+ #endif
+ 
+ #ifndef CONST
+-#ifdef KR_headers
+-#define CONST /* blank */
+-#else
+ #define CONST const
+ #endif
+-#endif
+ 
+ #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
+ Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
+@@ -290,37 +282,19 @@
+ 
+ typedef union { double d; ULong L[2]; } U;
+ 
+-#ifdef YES_ALIAS
+-#define dval(x) x
++#define dval(x) (x).d
+ #ifdef IEEE_8087
+-#define word0(x) ((ULong *)&x)[1]
+-#define word1(x) ((ULong *)&x)[0]
++#define word0(x) (x).L[1]
++#define word1(x) (x).L[0]
+ #else
+-#define word0(x) ((ULong *)&x)[0]
+-#define word1(x) ((ULong *)&x)[1]
+-#endif
+-#else
+-#ifdef IEEE_8087
+-#define word0(x) ((U*)&x)->L[1]
+-#define word1(x) ((U*)&x)->L[0]
+-#else
+-#define word0(x) ((U*)&x)->L[0]
+-#define word1(x) ((U*)&x)->L[1]
+-#endif
+-#define dval(x) ((U*)&x)->d
++#define word0(x) (x).L[0]
++#define word1(x) (x).L[1]
+ #endif
+ 
+ /* The following definition of Storeinc is appropriate for MIPS processors.
+  * An alternative that might be better on some machines is
+- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+  */
+-#if defined(IEEE_8087) + defined(VAX)
+-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
+-((unsigned short *)a)[0] = (unsigned short)c, a++)
+-#else
+-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
+-((unsigned short *)a)[1] = (unsigned short)c, a++)
+-#endif
++#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+ 
+ /* #define P DBL_MANT_DIG */
+ /* Ten_pmax = floor(P*log(2)/log(5)) */
+@@ -444,11 +418,7 @@
+ #ifdef RND_PRODQUOT
+ #define rounded_product(a,b) a = rnd_prod(a, b)
+ #define rounded_quotient(a,b) a = rnd_quot(a, b)
+-#ifdef KR_headers
+-extern double rnd_prod(), rnd_quot();
+-#else
+ extern double rnd_prod(double, double), rnd_quot(double, double);
+-#endif
+ #else
+ #define rounded_product(a,b) a *= b
+ #define rounded_quotient(a,b) a /= b
+@@ -461,11 +431,7 @@
+ #define Pack_32
+ #endif
+ 
+-#ifdef KR_headers
+-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
+-#else
+ #define FFFFFFFF 0xffffffffUL
+-#endif
+ 
+ #ifdef NO_LONG_LONG
+ #undef ULLong
+@@ -506,11 +472,7 @@
+ 
+  static Bigint *
+ Balloc
+-#ifdef KR_headers
+-	(k) int k;
+-#else
+ 	(int k)
+-#endif
+ {
+ 	int x;
+ 	Bigint *rv;
+@@ -546,11 +508,7 @@
+ 
+  static void
+ Bfree
+-#ifdef KR_headers
+-	(v) Bigint *v;
+-#else
+ 	(Bigint *v)
+-#endif
+ {
+ 	if (v) {
+ 		ACQUIRE_DTOA_LOCK(0);
+@@ -565,11 +523,7 @@
+ 
+  static Bigint *
+ multadd
+-#ifdef KR_headers
+-	(b, m, a) Bigint *b; int m, a;
+-#else
+ 	(Bigint *b, int m, int a)	/* multiply by m and add a */
+-#endif
+ {
+ 	int i, wds;
+ #ifdef ULLong
+@@ -622,11 +576,7 @@
+ 
+  static Bigint *
+ s2b
+-#ifdef KR_headers
+-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
+-#else
+ 	(CONST char *s, int nd0, int nd, ULong y9)
+-#endif
+ {
+ 	Bigint *b;
+ 	int i, k;
+@@ -660,11 +610,7 @@
+ 
+  static int
+ hi0bits
+-#ifdef KR_headers
+-	(x) register ULong x;
+-#else
+ 	(register ULong x)
+-#endif
+ {
+ 	register int k = 0;
+ 
+@@ -694,11 +640,7 @@
+ 
+  static int
+ lo0bits
+-#ifdef KR_headers
+-	(y) ULong *y;
+-#else
+ 	(ULong *y)
+-#endif
+ {
+ 	register int k;
+ 	register ULong x = *y;
+@@ -742,11 +684,7 @@
+ 
+  static Bigint *
+ i2b
+-#ifdef KR_headers
+-	(i) int i;
+-#else
+ 	(int i)
+-#endif
+ {
+ 	Bigint *b;
+ 
+@@ -758,11 +696,7 @@
+ 
+  static Bigint *
+ mult
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int k, wa, wb, wc;
+@@ -870,11 +804,7 @@
+ 
+  static Bigint *
+ pow5mult
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	Bigint *b1, *p5, *p51;
+ 	int i;
+@@ -927,11 +857,7 @@
+ 
+  static Bigint *
+ lshift
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	int i, k1, n, n1;
+ 	Bigint *b1;
+@@ -987,11 +913,7 @@
+ 
+  static int
+ cmp
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	ULong *xa, *xa0, *xb, *xb0;
+ 	int i, j;
+@@ -1021,11 +943,7 @@
+ 
+  static Bigint *
+ diff
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int i, wa, wb;
+@@ -1115,15 +1033,12 @@
+ 
+  static double
+ ulp
+-#ifdef KR_headers
+-	(x) double x;
+-#else
+-	(double x)
+-#endif
++	(double dx)
+ {
+ 	register Long L;
+-	double a;
++	U x, a;
+ 
++	dval(x) = dx;
+ 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
+ #ifndef Avoid_Underflow
+ #ifndef Sudden_Underflow
+@@ -1157,15 +1072,11 @@
+ 
+  static double
+ b2d
+-#ifdef KR_headers
+-	(a, e) Bigint *a; int *e;
+-#else
+ 	(Bigint *a, int *e)
+-#endif
+ {
+ 	ULong *xa, *xa0, w, y, z;
+ 	int k;
+-	double d;
++	U d;
+ #ifdef VAX
+ 	ULong d0, d1;
+ #else
+@@ -1227,12 +1138,9 @@
+ 
+  static Bigint *
+ d2b
+-#ifdef KR_headers
+-	(d, e, bits) double d; int *e, *bits;
+-#else
+-	(double d, int *e, int *bits)
+-#endif
++	(double dd, int *e, int *bits)
+ {
++	U d;
+ 	Bigint *b;
+ 	int de, k;
+ 	ULong *x, y, z;
+@@ -1241,6 +1149,9 @@
+ #endif
+ #ifdef VAX
+ 	ULong d0, d1;
++#endif
++	dval(d) = dd;
++#ifdef VAX
+ 	d0 = word0(d) >> 16 | word0(d) << 16;
+ 	d1 = word1(d) >> 16 | word1(d) << 16;
+ #else
+@@ -1365,13 +1276,9 @@
+ 
+  static double
+ ratio
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+-	double da, db;
++	U da, db;
+ 	int k, ka, kb;
+ 
+ 	dval(da) = b2d(a, &ka);
+@@ -1457,11 +1364,7 @@
+ 
+  static int
+ match
+-#ifdef KR_headers
+-	(sp, t) char **sp, *t;
+-#else
+ 	(CONST char **sp, CONST char *t)
+-#endif
+ {
+ 	int c, d;
+ 	CONST char *s = *sp;
+@@ -1479,11 +1382,7 @@
+ #ifndef No_Hex_NaN
+  static void
+ hexnan
+-#ifdef KR_headers
+-	(rvp, sp) double *rvp; CONST char **sp;
+-#else
+-	(double *rvp, CONST char **sp)
+-#endif
++	(U *rvp, CONST char **sp)
+ {
+ 	ULong c, x[2];
+ 	CONST char *s;
+@@ -1533,11 +1432,7 @@
+ 
+  double
+ strtod
+-#ifdef KR_headers
+-	(s00, se) CONST char *s00; char **se;
+-#else
+ 	(CONST char *s00, char **se)
+-#endif
+ {
+ #ifdef Avoid_Underflow
+ 	int scale;
+@@ -1545,7 +1440,8 @@
+ 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
+ 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
+ 	CONST char *s, *s0, *s1;
+-	double aadj, aadj1, adj, rv, rv0;
++	double aadj, aadj1, adj;
++	U aadj2, rv, rv0;
+ 	Long L;
+ 	ULong y, z;
+ 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
+@@ -2306,7 +2202,9 @@
+ 					aadj = z;
+ 					aadj1 = dsign ? aadj : -aadj;
+ 					}
+-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
++				dval(aadj2) = aadj1;
++				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
++				aadj1 = dval(aadj2);
+ 				}
+ 			adj = aadj1 * ulp(dval(rv));
+ 			dval(rv) += adj;
+@@ -2423,11 +2321,7 @@
+ 
+  static int
+ quorem
+-#ifdef KR_headers
+-	(b, S) Bigint *b, *S;
+-#else
+ 	(Bigint *b, Bigint *S)
+-#endif
+ {
+ 	int n;
+ 	ULong *bx, *bxe, q, *sx, *sxe;
+@@ -2544,11 +2438,7 @@
+ #endif
+ 
+  static char *
+-#ifdef KR_headers
+-rv_alloc(i) int i;
+-#else
+ rv_alloc(int i)
+-#endif
+ {
+ 	int j, k, *r;
+ 
+@@ -2567,11 +2457,7 @@
+ 	}
+ 
+  static char *
+-#ifdef KR_headers
+-nrv_alloc(s, rve, n) char *s, **rve; int n;
+-#else
+ nrv_alloc(CONST char *s, char **rve, int n)
+-#endif
+ {
+ 	char *rv, *t;
+ 
+@@ -2589,11 +2475,7 @@
+  */
+ 
+  void
+-#ifdef KR_headers
+-freedtoa(s) char *s;
+-#else
+ freedtoa(char *s)
+-#endif
+ {
+ 	Bigint *b = (Bigint *)((int *)s - 1);
+ 	b->maxwds = 1 << (b->k = *(int*)b);
+@@ -2640,12 +2522,7 @@
+ 
+  char *
+ dtoa
+-#ifdef KR_headers
+-	(d, mode, ndigits, decpt, sign, rve)
+-	double d; int mode, ndigits, *decpt, *sign; char **rve;
+-#else
+-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
+-#endif
++	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
+ {
+  /*	Arguments ndigits, decpt, sign are similar to those
+ 	of ecvt and fcvt; trailing zeros are suppressed from
+@@ -2690,7 +2567,8 @@
+ 	ULong x;
+ #endif
+ 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
+-	double d2, ds, eps;
++	U d, d2, eps;
++	double ds;
+ 	char *s, *s0;
+ #ifdef Honor_FLT_ROUNDS
+ 	int rounding;
+@@ -2706,6 +2584,7 @@
+ 		}
+ #endif
+ 
++	dval(d) = dd;
+ 	if (word0(d) & Sign_bit) {
+ 		/* set sign for everything, including 0's and NaNs */
+ 		*sign = 1;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -p -r1.473 -r1.474
--- kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.473
+++ kdelibs.spec	28 Apr 2009 12:20:38 -0000	1.474
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -422,6 +422,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-13
+- upstream patch to fix GCC4.4 crashes in kjs
+  (kdebug:189809)
+
 * Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
 - drop the PopupApplet configuration backports (#495998) for now, kconf_update
   does not work as expected for Plasma



From ltinkl at fedoraproject.org  Tue Apr 28 12:21:07 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 12:21:07 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.3,
	1.4 kdelibs.spec, 1.422, 1.423
Message-ID: <20090428122107.97B2770129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21486/F-10

Modified Files:
	kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs.spec 
Log Message:
/tmp/cvsXCJtVy

kdelibs-4.2.0-kjs-gcc44-crash.patch:

Index: kdelibs-4.2.0-kjs-gcc44-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs-4.2.0-kjs-gcc44-crash.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdelibs-4.2.0-kjs-gcc44-crash.patch	3 Mar 2009 22:06:10 -0000	1.3
+++ kdelibs-4.2.0-kjs-gcc44-crash.patch	28 Apr 2009 12:20:36 -0000	1.4
@@ -1,12 +1,453 @@
-diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt
---- kdelibs-4.2.0/kjs/CMakeLists.txt	2008-11-19 11:20:10.000000000 +0100
-+++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt	2009-02-18 19:43:20.000000000 +0100
-@@ -183,6 +183,8 @@
-    CompileState.cpp
-    )
- 
-+set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
-+
- if (NOT DEFINED QT_ONLY)
-    set(KJSLIBNAME kjs)
- else (NOT DEFINED QT_ONLY)
+--- kdelibs/kjs/dtoa.cpp	2009/04/28 10:20:35	960320
++++ kdelibs/kjs/dtoa.cpp	2009/04/28 10:28:50	960321
+@@ -203,11 +203,7 @@
+ #endif
+ 
+ #ifdef MALLOC
+-#ifdef KR_headers
+-extern char *MALLOC();
+-#else
+ extern void *MALLOC(size_t);
+-#endif
+ #else
+ #define MALLOC malloc
+ #endif
+@@ -277,12 +273,8 @@
+ #endif
+ 
+ #ifndef CONST
+-#ifdef KR_headers
+-#define CONST /* blank */
+-#else
+ #define CONST const
+ #endif
+-#endif
+ 
+ #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
+ Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
+@@ -290,37 +282,19 @@
+ 
+ typedef union { double d; ULong L[2]; } U;
+ 
+-#ifdef YES_ALIAS
+-#define dval(x) x
++#define dval(x) (x).d
+ #ifdef IEEE_8087
+-#define word0(x) ((ULong *)&x)[1]
+-#define word1(x) ((ULong *)&x)[0]
++#define word0(x) (x).L[1]
++#define word1(x) (x).L[0]
+ #else
+-#define word0(x) ((ULong *)&x)[0]
+-#define word1(x) ((ULong *)&x)[1]
+-#endif
+-#else
+-#ifdef IEEE_8087
+-#define word0(x) ((U*)&x)->L[1]
+-#define word1(x) ((U*)&x)->L[0]
+-#else
+-#define word0(x) ((U*)&x)->L[0]
+-#define word1(x) ((U*)&x)->L[1]
+-#endif
+-#define dval(x) ((U*)&x)->d
++#define word0(x) (x).L[0]
++#define word1(x) (x).L[1]
+ #endif
+ 
+ /* The following definition of Storeinc is appropriate for MIPS processors.
+  * An alternative that might be better on some machines is
+- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+  */
+-#if defined(IEEE_8087) + defined(VAX)
+-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
+-((unsigned short *)a)[0] = (unsigned short)c, a++)
+-#else
+-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
+-((unsigned short *)a)[1] = (unsigned short)c, a++)
+-#endif
++#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+ 
+ /* #define P DBL_MANT_DIG */
+ /* Ten_pmax = floor(P*log(2)/log(5)) */
+@@ -444,11 +418,7 @@
+ #ifdef RND_PRODQUOT
+ #define rounded_product(a,b) a = rnd_prod(a, b)
+ #define rounded_quotient(a,b) a = rnd_quot(a, b)
+-#ifdef KR_headers
+-extern double rnd_prod(), rnd_quot();
+-#else
+ extern double rnd_prod(double, double), rnd_quot(double, double);
+-#endif
+ #else
+ #define rounded_product(a,b) a *= b
+ #define rounded_quotient(a,b) a /= b
+@@ -461,11 +431,7 @@
+ #define Pack_32
+ #endif
+ 
+-#ifdef KR_headers
+-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
+-#else
+ #define FFFFFFFF 0xffffffffUL
+-#endif
+ 
+ #ifdef NO_LONG_LONG
+ #undef ULLong
+@@ -506,11 +472,7 @@
+ 
+  static Bigint *
+ Balloc
+-#ifdef KR_headers
+-	(k) int k;
+-#else
+ 	(int k)
+-#endif
+ {
+ 	int x;
+ 	Bigint *rv;
+@@ -546,11 +508,7 @@
+ 
+  static void
+ Bfree
+-#ifdef KR_headers
+-	(v) Bigint *v;
+-#else
+ 	(Bigint *v)
+-#endif
+ {
+ 	if (v) {
+ 		ACQUIRE_DTOA_LOCK(0);
+@@ -565,11 +523,7 @@
+ 
+  static Bigint *
+ multadd
+-#ifdef KR_headers
+-	(b, m, a) Bigint *b; int m, a;
+-#else
+ 	(Bigint *b, int m, int a)	/* multiply by m and add a */
+-#endif
+ {
+ 	int i, wds;
+ #ifdef ULLong
+@@ -622,11 +576,7 @@
+ 
+  static Bigint *
+ s2b
+-#ifdef KR_headers
+-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
+-#else
+ 	(CONST char *s, int nd0, int nd, ULong y9)
+-#endif
+ {
+ 	Bigint *b;
+ 	int i, k;
+@@ -660,11 +610,7 @@
+ 
+  static int
+ hi0bits
+-#ifdef KR_headers
+-	(x) register ULong x;
+-#else
+ 	(register ULong x)
+-#endif
+ {
+ 	register int k = 0;
+ 
+@@ -694,11 +640,7 @@
+ 
+  static int
+ lo0bits
+-#ifdef KR_headers
+-	(y) ULong *y;
+-#else
+ 	(ULong *y)
+-#endif
+ {
+ 	register int k;
+ 	register ULong x = *y;
+@@ -742,11 +684,7 @@
+ 
+  static Bigint *
+ i2b
+-#ifdef KR_headers
+-	(i) int i;
+-#else
+ 	(int i)
+-#endif
+ {
+ 	Bigint *b;
+ 
+@@ -758,11 +696,7 @@
+ 
+  static Bigint *
+ mult
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int k, wa, wb, wc;
+@@ -870,11 +804,7 @@
+ 
+  static Bigint *
+ pow5mult
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	Bigint *b1, *p5, *p51;
+ 	int i;
+@@ -927,11 +857,7 @@
+ 
+  static Bigint *
+ lshift
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	int i, k1, n, n1;
+ 	Bigint *b1;
+@@ -987,11 +913,7 @@
+ 
+  static int
+ cmp
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	ULong *xa, *xa0, *xb, *xb0;
+ 	int i, j;
+@@ -1021,11 +943,7 @@
+ 
+  static Bigint *
+ diff
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int i, wa, wb;
+@@ -1115,15 +1033,12 @@
+ 
+  static double
+ ulp
+-#ifdef KR_headers
+-	(x) double x;
+-#else
+-	(double x)
+-#endif
++	(double dx)
+ {
+ 	register Long L;
+-	double a;
++	U x, a;
+ 
++	dval(x) = dx;
+ 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
+ #ifndef Avoid_Underflow
+ #ifndef Sudden_Underflow
+@@ -1157,15 +1072,11 @@
+ 
+  static double
+ b2d
+-#ifdef KR_headers
+-	(a, e) Bigint *a; int *e;
+-#else
+ 	(Bigint *a, int *e)
+-#endif
+ {
+ 	ULong *xa, *xa0, w, y, z;
+ 	int k;
+-	double d;
++	U d;
+ #ifdef VAX
+ 	ULong d0, d1;
+ #else
+@@ -1227,12 +1138,9 @@
+ 
+  static Bigint *
+ d2b
+-#ifdef KR_headers
+-	(d, e, bits) double d; int *e, *bits;
+-#else
+-	(double d, int *e, int *bits)
+-#endif
++	(double dd, int *e, int *bits)
+ {
++	U d;
+ 	Bigint *b;
+ 	int de, k;
+ 	ULong *x, y, z;
+@@ -1241,6 +1149,9 @@
+ #endif
+ #ifdef VAX
+ 	ULong d0, d1;
++#endif
++	dval(d) = dd;
++#ifdef VAX
+ 	d0 = word0(d) >> 16 | word0(d) << 16;
+ 	d1 = word1(d) >> 16 | word1(d) << 16;
+ #else
+@@ -1365,13 +1276,9 @@
+ 
+  static double
+ ratio
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+-	double da, db;
++	U da, db;
+ 	int k, ka, kb;
+ 
+ 	dval(da) = b2d(a, &ka);
+@@ -1457,11 +1364,7 @@
+ 
+  static int
+ match
+-#ifdef KR_headers
+-	(sp, t) char **sp, *t;
+-#else
+ 	(CONST char **sp, CONST char *t)
+-#endif
+ {
+ 	int c, d;
+ 	CONST char *s = *sp;
+@@ -1479,11 +1382,7 @@
+ #ifndef No_Hex_NaN
+  static void
+ hexnan
+-#ifdef KR_headers
+-	(rvp, sp) double *rvp; CONST char **sp;
+-#else
+-	(double *rvp, CONST char **sp)
+-#endif
++	(U *rvp, CONST char **sp)
+ {
+ 	ULong c, x[2];
+ 	CONST char *s;
+@@ -1533,11 +1432,7 @@
+ 
+  double
+ strtod
+-#ifdef KR_headers
+-	(s00, se) CONST char *s00; char **se;
+-#else
+ 	(CONST char *s00, char **se)
+-#endif
+ {
+ #ifdef Avoid_Underflow
+ 	int scale;
+@@ -1545,7 +1440,8 @@
+ 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
+ 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
+ 	CONST char *s, *s0, *s1;
+-	double aadj, aadj1, adj, rv, rv0;
++	double aadj, aadj1, adj;
++	U aadj2, rv, rv0;
+ 	Long L;
+ 	ULong y, z;
+ 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
+@@ -2306,7 +2202,9 @@
+ 					aadj = z;
+ 					aadj1 = dsign ? aadj : -aadj;
+ 					}
+-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
++				dval(aadj2) = aadj1;
++				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
++				aadj1 = dval(aadj2);
+ 				}
+ 			adj = aadj1 * ulp(dval(rv));
+ 			dval(rv) += adj;
+@@ -2423,11 +2321,7 @@
+ 
+  static int
+ quorem
+-#ifdef KR_headers
+-	(b, S) Bigint *b, *S;
+-#else
+ 	(Bigint *b, Bigint *S)
+-#endif
+ {
+ 	int n;
+ 	ULong *bx, *bxe, q, *sx, *sxe;
+@@ -2544,11 +2438,7 @@
+ #endif
+ 
+  static char *
+-#ifdef KR_headers
+-rv_alloc(i) int i;
+-#else
+ rv_alloc(int i)
+-#endif
+ {
+ 	int j, k, *r;
+ 
+@@ -2567,11 +2457,7 @@
+ 	}
+ 
+  static char *
+-#ifdef KR_headers
+-nrv_alloc(s, rve, n) char *s, **rve; int n;
+-#else
+ nrv_alloc(CONST char *s, char **rve, int n)
+-#endif
+ {
+ 	char *rv, *t;
+ 
+@@ -2589,11 +2475,7 @@
+  */
+ 
+  void
+-#ifdef KR_headers
+-freedtoa(s) char *s;
+-#else
+ freedtoa(char *s)
+-#endif
+ {
+ 	Bigint *b = (Bigint *)((int *)s - 1);
+ 	b->maxwds = 1 << (b->k = *(int*)b);
+@@ -2640,12 +2522,7 @@
+ 
+  char *
+ dtoa
+-#ifdef KR_headers
+-	(d, mode, ndigits, decpt, sign, rve)
+-	double d; int mode, ndigits, *decpt, *sign; char **rve;
+-#else
+-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
+-#endif
++	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
+ {
+  /*	Arguments ndigits, decpt, sign are similar to those
+ 	of ecvt and fcvt; trailing zeros are suppressed from
+@@ -2690,7 +2567,8 @@
+ 	ULong x;
+ #endif
+ 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
+-	double d2, ds, eps;
++	U d, d2, eps;
++	double ds;
+ 	char *s, *s0;
+ #ifdef Honor_FLT_ROUNDS
+ 	int rounding;
+@@ -2706,6 +2584,7 @@
+ 		}
+ #endif
+ 
++	dval(d) = dd;
+ 	if (word0(d) & Sign_bit) {
+ 		/* set sign for everything, including 0's and NaNs */
+ 		*sign = 1;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -p -r1.422 -r1.423
--- kdelibs.spec	24 Apr 2009 01:45:14 -0000	1.422
+++ kdelibs.spec	28 Apr 2009 12:20:36 -0000	1.423
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -422,6 +422,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-13
+- upstream patch to fix GCC4.4 crashes in kjs
+  (kdebug:189809)
+
 * Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
 - drop the PopupApplet configuration backports (#495998) for now, kconf_update
   does not work as expected for Plasma



From ltinkl at fedoraproject.org  Tue Apr 28 12:21:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 12:21:08 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.4,
	1.5 kdelibs.spec, 1.473, 1.474
Message-ID: <20090428122108.123BE70129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21486/F-11

Modified Files:
	kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs.spec 
Log Message:
/tmp/cvsXCJtVy

kdelibs-4.2.0-kjs-gcc44-crash.patch:

Index: kdelibs-4.2.0-kjs-gcc44-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs-4.2.0-kjs-gcc44-crash.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdelibs-4.2.0-kjs-gcc44-crash.patch	3 Mar 2009 22:06:11 -0000	1.4
+++ kdelibs-4.2.0-kjs-gcc44-crash.patch	28 Apr 2009 12:20:37 -0000	1.5
@@ -1,12 +1,453 @@
-diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt
---- kdelibs-4.2.0/kjs/CMakeLists.txt	2008-11-19 11:20:10.000000000 +0100
-+++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt	2009-02-18 19:43:20.000000000 +0100
-@@ -183,6 +183,8 @@
-    CompileState.cpp
-    )
- 
-+set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
-+
- if (NOT DEFINED QT_ONLY)
-    set(KJSLIBNAME kjs)
- else (NOT DEFINED QT_ONLY)
+--- kdelibs/kjs/dtoa.cpp	2009/04/28 10:20:35	960320
++++ kdelibs/kjs/dtoa.cpp	2009/04/28 10:28:50	960321
+@@ -203,11 +203,7 @@
+ #endif
+ 
+ #ifdef MALLOC
+-#ifdef KR_headers
+-extern char *MALLOC();
+-#else
+ extern void *MALLOC(size_t);
+-#endif
+ #else
+ #define MALLOC malloc
+ #endif
+@@ -277,12 +273,8 @@
+ #endif
+ 
+ #ifndef CONST
+-#ifdef KR_headers
+-#define CONST /* blank */
+-#else
+ #define CONST const
+ #endif
+-#endif
+ 
+ #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
+ Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
+@@ -290,37 +282,19 @@
+ 
+ typedef union { double d; ULong L[2]; } U;
+ 
+-#ifdef YES_ALIAS
+-#define dval(x) x
++#define dval(x) (x).d
+ #ifdef IEEE_8087
+-#define word0(x) ((ULong *)&x)[1]
+-#define word1(x) ((ULong *)&x)[0]
++#define word0(x) (x).L[1]
++#define word1(x) (x).L[0]
+ #else
+-#define word0(x) ((ULong *)&x)[0]
+-#define word1(x) ((ULong *)&x)[1]
+-#endif
+-#else
+-#ifdef IEEE_8087
+-#define word0(x) ((U*)&x)->L[1]
+-#define word1(x) ((U*)&x)->L[0]
+-#else
+-#define word0(x) ((U*)&x)->L[0]
+-#define word1(x) ((U*)&x)->L[1]
+-#endif
+-#define dval(x) ((U*)&x)->d
++#define word0(x) (x).L[0]
++#define word1(x) (x).L[1]
+ #endif
+ 
+ /* The following definition of Storeinc is appropriate for MIPS processors.
+  * An alternative that might be better on some machines is
+- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+  */
+-#if defined(IEEE_8087) + defined(VAX)
+-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
+-((unsigned short *)a)[0] = (unsigned short)c, a++)
+-#else
+-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
+-((unsigned short *)a)[1] = (unsigned short)c, a++)
+-#endif
++#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+ 
+ /* #define P DBL_MANT_DIG */
+ /* Ten_pmax = floor(P*log(2)/log(5)) */
+@@ -444,11 +418,7 @@
+ #ifdef RND_PRODQUOT
+ #define rounded_product(a,b) a = rnd_prod(a, b)
+ #define rounded_quotient(a,b) a = rnd_quot(a, b)
+-#ifdef KR_headers
+-extern double rnd_prod(), rnd_quot();
+-#else
+ extern double rnd_prod(double, double), rnd_quot(double, double);
+-#endif
+ #else
+ #define rounded_product(a,b) a *= b
+ #define rounded_quotient(a,b) a /= b
+@@ -461,11 +431,7 @@
+ #define Pack_32
+ #endif
+ 
+-#ifdef KR_headers
+-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
+-#else
+ #define FFFFFFFF 0xffffffffUL
+-#endif
+ 
+ #ifdef NO_LONG_LONG
+ #undef ULLong
+@@ -506,11 +472,7 @@
+ 
+  static Bigint *
+ Balloc
+-#ifdef KR_headers
+-	(k) int k;
+-#else
+ 	(int k)
+-#endif
+ {
+ 	int x;
+ 	Bigint *rv;
+@@ -546,11 +508,7 @@
+ 
+  static void
+ Bfree
+-#ifdef KR_headers
+-	(v) Bigint *v;
+-#else
+ 	(Bigint *v)
+-#endif
+ {
+ 	if (v) {
+ 		ACQUIRE_DTOA_LOCK(0);
+@@ -565,11 +523,7 @@
+ 
+  static Bigint *
+ multadd
+-#ifdef KR_headers
+-	(b, m, a) Bigint *b; int m, a;
+-#else
+ 	(Bigint *b, int m, int a)	/* multiply by m and add a */
+-#endif
+ {
+ 	int i, wds;
+ #ifdef ULLong
+@@ -622,11 +576,7 @@
+ 
+  static Bigint *
+ s2b
+-#ifdef KR_headers
+-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
+-#else
+ 	(CONST char *s, int nd0, int nd, ULong y9)
+-#endif
+ {
+ 	Bigint *b;
+ 	int i, k;
+@@ -660,11 +610,7 @@
+ 
+  static int
+ hi0bits
+-#ifdef KR_headers
+-	(x) register ULong x;
+-#else
+ 	(register ULong x)
+-#endif
+ {
+ 	register int k = 0;
+ 
+@@ -694,11 +640,7 @@
+ 
+  static int
+ lo0bits
+-#ifdef KR_headers
+-	(y) ULong *y;
+-#else
+ 	(ULong *y)
+-#endif
+ {
+ 	register int k;
+ 	register ULong x = *y;
+@@ -742,11 +684,7 @@
+ 
+  static Bigint *
+ i2b
+-#ifdef KR_headers
+-	(i) int i;
+-#else
+ 	(int i)
+-#endif
+ {
+ 	Bigint *b;
+ 
+@@ -758,11 +696,7 @@
+ 
+  static Bigint *
+ mult
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int k, wa, wb, wc;
+@@ -870,11 +804,7 @@
+ 
+  static Bigint *
+ pow5mult
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	Bigint *b1, *p5, *p51;
+ 	int i;
+@@ -927,11 +857,7 @@
+ 
+  static Bigint *
+ lshift
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	int i, k1, n, n1;
+ 	Bigint *b1;
+@@ -987,11 +913,7 @@
+ 
+  static int
+ cmp
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	ULong *xa, *xa0, *xb, *xb0;
+ 	int i, j;
+@@ -1021,11 +943,7 @@
+ 
+  static Bigint *
+ diff
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int i, wa, wb;
+@@ -1115,15 +1033,12 @@
+ 
+  static double
+ ulp
+-#ifdef KR_headers
+-	(x) double x;
+-#else
+-	(double x)
+-#endif
++	(double dx)
+ {
+ 	register Long L;
+-	double a;
++	U x, a;
+ 
++	dval(x) = dx;
+ 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
+ #ifndef Avoid_Underflow
+ #ifndef Sudden_Underflow
+@@ -1157,15 +1072,11 @@
+ 
+  static double
+ b2d
+-#ifdef KR_headers
+-	(a, e) Bigint *a; int *e;
+-#else
+ 	(Bigint *a, int *e)
+-#endif
+ {
+ 	ULong *xa, *xa0, w, y, z;
+ 	int k;
+-	double d;
++	U d;
+ #ifdef VAX
+ 	ULong d0, d1;
+ #else
+@@ -1227,12 +1138,9 @@
+ 
+  static Bigint *
+ d2b
+-#ifdef KR_headers
+-	(d, e, bits) double d; int *e, *bits;
+-#else
+-	(double d, int *e, int *bits)
+-#endif
++	(double dd, int *e, int *bits)
+ {
++	U d;
+ 	Bigint *b;
+ 	int de, k;
+ 	ULong *x, y, z;
+@@ -1241,6 +1149,9 @@
+ #endif
+ #ifdef VAX
+ 	ULong d0, d1;
++#endif
++	dval(d) = dd;
++#ifdef VAX
+ 	d0 = word0(d) >> 16 | word0(d) << 16;
+ 	d1 = word1(d) >> 16 | word1(d) << 16;
+ #else
+@@ -1365,13 +1276,9 @@
+ 
+  static double
+ ratio
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+-	double da, db;
++	U da, db;
+ 	int k, ka, kb;
+ 
+ 	dval(da) = b2d(a, &ka);
+@@ -1457,11 +1364,7 @@
+ 
+  static int
+ match
+-#ifdef KR_headers
+-	(sp, t) char **sp, *t;
+-#else
+ 	(CONST char **sp, CONST char *t)
+-#endif
+ {
+ 	int c, d;
+ 	CONST char *s = *sp;
+@@ -1479,11 +1382,7 @@
+ #ifndef No_Hex_NaN
+  static void
+ hexnan
+-#ifdef KR_headers
+-	(rvp, sp) double *rvp; CONST char **sp;
+-#else
+-	(double *rvp, CONST char **sp)
+-#endif
++	(U *rvp, CONST char **sp)
+ {
+ 	ULong c, x[2];
+ 	CONST char *s;
+@@ -1533,11 +1432,7 @@
+ 
+  double
+ strtod
+-#ifdef KR_headers
+-	(s00, se) CONST char *s00; char **se;
+-#else
+ 	(CONST char *s00, char **se)
+-#endif
+ {
+ #ifdef Avoid_Underflow
+ 	int scale;
+@@ -1545,7 +1440,8 @@
+ 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
+ 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
+ 	CONST char *s, *s0, *s1;
+-	double aadj, aadj1, adj, rv, rv0;
++	double aadj, aadj1, adj;
++	U aadj2, rv, rv0;
+ 	Long L;
+ 	ULong y, z;
+ 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
+@@ -2306,7 +2202,9 @@
+ 					aadj = z;
+ 					aadj1 = dsign ? aadj : -aadj;
+ 					}
+-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
++				dval(aadj2) = aadj1;
++				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
++				aadj1 = dval(aadj2);
+ 				}
+ 			adj = aadj1 * ulp(dval(rv));
+ 			dval(rv) += adj;
+@@ -2423,11 +2321,7 @@
+ 
+  static int
+ quorem
+-#ifdef KR_headers
+-	(b, S) Bigint *b, *S;
+-#else
+ 	(Bigint *b, Bigint *S)
+-#endif
+ {
+ 	int n;
+ 	ULong *bx, *bxe, q, *sx, *sxe;
+@@ -2544,11 +2438,7 @@
+ #endif
+ 
+  static char *
+-#ifdef KR_headers
+-rv_alloc(i) int i;
+-#else
+ rv_alloc(int i)
+-#endif
+ {
+ 	int j, k, *r;
+ 
+@@ -2567,11 +2457,7 @@
+ 	}
+ 
+  static char *
+-#ifdef KR_headers
+-nrv_alloc(s, rve, n) char *s, **rve; int n;
+-#else
+ nrv_alloc(CONST char *s, char **rve, int n)
+-#endif
+ {
+ 	char *rv, *t;
+ 
+@@ -2589,11 +2475,7 @@
+  */
+ 
+  void
+-#ifdef KR_headers
+-freedtoa(s) char *s;
+-#else
+ freedtoa(char *s)
+-#endif
+ {
+ 	Bigint *b = (Bigint *)((int *)s - 1);
+ 	b->maxwds = 1 << (b->k = *(int*)b);
+@@ -2640,12 +2522,7 @@
+ 
+  char *
+ dtoa
+-#ifdef KR_headers
+-	(d, mode, ndigits, decpt, sign, rve)
+-	double d; int mode, ndigits, *decpt, *sign; char **rve;
+-#else
+-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
+-#endif
++	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
+ {
+  /*	Arguments ndigits, decpt, sign are similar to those
+ 	of ecvt and fcvt; trailing zeros are suppressed from
+@@ -2690,7 +2567,8 @@
+ 	ULong x;
+ #endif
+ 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
+-	double d2, ds, eps;
++	U d, d2, eps;
++	double ds;
+ 	char *s, *s0;
+ #ifdef Honor_FLT_ROUNDS
+ 	int rounding;
+@@ -2706,6 +2584,7 @@
+ 		}
+ #endif
+ 
++	dval(d) = dd;
+ 	if (word0(d) & Sign_bit) {
+ 		/* set sign for everything, including 0's and NaNs */
+ 		*sign = 1;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -p -r1.473 -r1.474
--- kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.473
+++ kdelibs.spec	28 Apr 2009 12:20:37 -0000	1.474
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -422,6 +422,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-13
+- upstream patch to fix GCC4.4 crashes in kjs
+  (kdebug:189809)
+
 * Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
 - drop the PopupApplet configuration backports (#495998) for now, kconf_update
   does not work as expected for Plasma



From ltinkl at fedoraproject.org  Tue Apr 28 12:21:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 12:21:08 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.3,
	1.4 kdelibs.spec, 1.397, 1.398
Message-ID: <20090428122108.AAB9670129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21486/F-9

Modified Files:
	kdelibs-4.2.0-kjs-gcc44-crash.patch kdelibs.spec 
Log Message:
/tmp/cvsXCJtVy

kdelibs-4.2.0-kjs-gcc44-crash.patch:

Index: kdelibs-4.2.0-kjs-gcc44-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs-4.2.0-kjs-gcc44-crash.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdelibs-4.2.0-kjs-gcc44-crash.patch	3 Mar 2009 22:06:10 -0000	1.3
+++ kdelibs-4.2.0-kjs-gcc44-crash.patch	28 Apr 2009 12:20:38 -0000	1.4
@@ -1,12 +1,453 @@
-diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt
---- kdelibs-4.2.0/kjs/CMakeLists.txt	2008-11-19 11:20:10.000000000 +0100
-+++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt	2009-02-18 19:43:20.000000000 +0100
-@@ -183,6 +183,8 @@
-    CompileState.cpp
-    )
- 
-+set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
-+
- if (NOT DEFINED QT_ONLY)
-    set(KJSLIBNAME kjs)
- else (NOT DEFINED QT_ONLY)
+--- kdelibs/kjs/dtoa.cpp	2009/04/28 10:20:35	960320
++++ kdelibs/kjs/dtoa.cpp	2009/04/28 10:28:50	960321
+@@ -203,11 +203,7 @@
+ #endif
+ 
+ #ifdef MALLOC
+-#ifdef KR_headers
+-extern char *MALLOC();
+-#else
+ extern void *MALLOC(size_t);
+-#endif
+ #else
+ #define MALLOC malloc
+ #endif
+@@ -277,12 +273,8 @@
+ #endif
+ 
+ #ifndef CONST
+-#ifdef KR_headers
+-#define CONST /* blank */
+-#else
+ #define CONST const
+ #endif
+-#endif
+ 
+ #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
+ Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
+@@ -290,37 +282,19 @@
+ 
+ typedef union { double d; ULong L[2]; } U;
+ 
+-#ifdef YES_ALIAS
+-#define dval(x) x
++#define dval(x) (x).d
+ #ifdef IEEE_8087
+-#define word0(x) ((ULong *)&x)[1]
+-#define word1(x) ((ULong *)&x)[0]
++#define word0(x) (x).L[1]
++#define word1(x) (x).L[0]
+ #else
+-#define word0(x) ((ULong *)&x)[0]
+-#define word1(x) ((ULong *)&x)[1]
+-#endif
+-#else
+-#ifdef IEEE_8087
+-#define word0(x) ((U*)&x)->L[1]
+-#define word1(x) ((U*)&x)->L[0]
+-#else
+-#define word0(x) ((U*)&x)->L[0]
+-#define word1(x) ((U*)&x)->L[1]
+-#endif
+-#define dval(x) ((U*)&x)->d
++#define word0(x) (x).L[0]
++#define word1(x) (x).L[1]
+ #endif
+ 
+ /* The following definition of Storeinc is appropriate for MIPS processors.
+  * An alternative that might be better on some machines is
+- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+  */
+-#if defined(IEEE_8087) + defined(VAX)
+-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
+-((unsigned short *)a)[0] = (unsigned short)c, a++)
+-#else
+-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
+-((unsigned short *)a)[1] = (unsigned short)c, a++)
+-#endif
++#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+ 
+ /* #define P DBL_MANT_DIG */
+ /* Ten_pmax = floor(P*log(2)/log(5)) */
+@@ -444,11 +418,7 @@
+ #ifdef RND_PRODQUOT
+ #define rounded_product(a,b) a = rnd_prod(a, b)
+ #define rounded_quotient(a,b) a = rnd_quot(a, b)
+-#ifdef KR_headers
+-extern double rnd_prod(), rnd_quot();
+-#else
+ extern double rnd_prod(double, double), rnd_quot(double, double);
+-#endif
+ #else
+ #define rounded_product(a,b) a *= b
+ #define rounded_quotient(a,b) a /= b
+@@ -461,11 +431,7 @@
+ #define Pack_32
+ #endif
+ 
+-#ifdef KR_headers
+-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
+-#else
+ #define FFFFFFFF 0xffffffffUL
+-#endif
+ 
+ #ifdef NO_LONG_LONG
+ #undef ULLong
+@@ -506,11 +472,7 @@
+ 
+  static Bigint *
+ Balloc
+-#ifdef KR_headers
+-	(k) int k;
+-#else
+ 	(int k)
+-#endif
+ {
+ 	int x;
+ 	Bigint *rv;
+@@ -546,11 +508,7 @@
+ 
+  static void
+ Bfree
+-#ifdef KR_headers
+-	(v) Bigint *v;
+-#else
+ 	(Bigint *v)
+-#endif
+ {
+ 	if (v) {
+ 		ACQUIRE_DTOA_LOCK(0);
+@@ -565,11 +523,7 @@
+ 
+  static Bigint *
+ multadd
+-#ifdef KR_headers
+-	(b, m, a) Bigint *b; int m, a;
+-#else
+ 	(Bigint *b, int m, int a)	/* multiply by m and add a */
+-#endif
+ {
+ 	int i, wds;
+ #ifdef ULLong
+@@ -622,11 +576,7 @@
+ 
+  static Bigint *
+ s2b
+-#ifdef KR_headers
+-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
+-#else
+ 	(CONST char *s, int nd0, int nd, ULong y9)
+-#endif
+ {
+ 	Bigint *b;
+ 	int i, k;
+@@ -660,11 +610,7 @@
+ 
+  static int
+ hi0bits
+-#ifdef KR_headers
+-	(x) register ULong x;
+-#else
+ 	(register ULong x)
+-#endif
+ {
+ 	register int k = 0;
+ 
+@@ -694,11 +640,7 @@
+ 
+  static int
+ lo0bits
+-#ifdef KR_headers
+-	(y) ULong *y;
+-#else
+ 	(ULong *y)
+-#endif
+ {
+ 	register int k;
+ 	register ULong x = *y;
+@@ -742,11 +684,7 @@
+ 
+  static Bigint *
+ i2b
+-#ifdef KR_headers
+-	(i) int i;
+-#else
+ 	(int i)
+-#endif
+ {
+ 	Bigint *b;
+ 
+@@ -758,11 +696,7 @@
+ 
+  static Bigint *
+ mult
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int k, wa, wb, wc;
+@@ -870,11 +804,7 @@
+ 
+  static Bigint *
+ pow5mult
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	Bigint *b1, *p5, *p51;
+ 	int i;
+@@ -927,11 +857,7 @@
+ 
+  static Bigint *
+ lshift
+-#ifdef KR_headers
+-	(b, k) Bigint *b; int k;
+-#else
+ 	(Bigint *b, int k)
+-#endif
+ {
+ 	int i, k1, n, n1;
+ 	Bigint *b1;
+@@ -987,11 +913,7 @@
+ 
+  static int
+ cmp
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	ULong *xa, *xa0, *xb, *xb0;
+ 	int i, j;
+@@ -1021,11 +943,7 @@
+ 
+  static Bigint *
+ diff
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+ 	Bigint *c;
+ 	int i, wa, wb;
+@@ -1115,15 +1033,12 @@
+ 
+  static double
+ ulp
+-#ifdef KR_headers
+-	(x) double x;
+-#else
+-	(double x)
+-#endif
++	(double dx)
+ {
+ 	register Long L;
+-	double a;
++	U x, a;
+ 
++	dval(x) = dx;
+ 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
+ #ifndef Avoid_Underflow
+ #ifndef Sudden_Underflow
+@@ -1157,15 +1072,11 @@
+ 
+  static double
+ b2d
+-#ifdef KR_headers
+-	(a, e) Bigint *a; int *e;
+-#else
+ 	(Bigint *a, int *e)
+-#endif
+ {
+ 	ULong *xa, *xa0, w, y, z;
+ 	int k;
+-	double d;
++	U d;
+ #ifdef VAX
+ 	ULong d0, d1;
+ #else
+@@ -1227,12 +1138,9 @@
+ 
+  static Bigint *
+ d2b
+-#ifdef KR_headers
+-	(d, e, bits) double d; int *e, *bits;
+-#else
+-	(double d, int *e, int *bits)
+-#endif
++	(double dd, int *e, int *bits)
+ {
++	U d;
+ 	Bigint *b;
+ 	int de, k;
+ 	ULong *x, y, z;
+@@ -1241,6 +1149,9 @@
+ #endif
+ #ifdef VAX
+ 	ULong d0, d1;
++#endif
++	dval(d) = dd;
++#ifdef VAX
+ 	d0 = word0(d) >> 16 | word0(d) << 16;
+ 	d1 = word1(d) >> 16 | word1(d) << 16;
+ #else
+@@ -1365,13 +1276,9 @@
+ 
+  static double
+ ratio
+-#ifdef KR_headers
+-	(a, b) Bigint *a, *b;
+-#else
+ 	(Bigint *a, Bigint *b)
+-#endif
+ {
+-	double da, db;
++	U da, db;
+ 	int k, ka, kb;
+ 
+ 	dval(da) = b2d(a, &ka);
+@@ -1457,11 +1364,7 @@
+ 
+  static int
+ match
+-#ifdef KR_headers
+-	(sp, t) char **sp, *t;
+-#else
+ 	(CONST char **sp, CONST char *t)
+-#endif
+ {
+ 	int c, d;
+ 	CONST char *s = *sp;
+@@ -1479,11 +1382,7 @@
+ #ifndef No_Hex_NaN
+  static void
+ hexnan
+-#ifdef KR_headers
+-	(rvp, sp) double *rvp; CONST char **sp;
+-#else
+-	(double *rvp, CONST char **sp)
+-#endif
++	(U *rvp, CONST char **sp)
+ {
+ 	ULong c, x[2];
+ 	CONST char *s;
+@@ -1533,11 +1432,7 @@
+ 
+  double
+ strtod
+-#ifdef KR_headers
+-	(s00, se) CONST char *s00; char **se;
+-#else
+ 	(CONST char *s00, char **se)
+-#endif
+ {
+ #ifdef Avoid_Underflow
+ 	int scale;
+@@ -1545,7 +1440,8 @@
+ 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
+ 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
+ 	CONST char *s, *s0, *s1;
+-	double aadj, aadj1, adj, rv, rv0;
++	double aadj, aadj1, adj;
++	U aadj2, rv, rv0;
+ 	Long L;
+ 	ULong y, z;
+ 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
+@@ -2306,7 +2202,9 @@
+ 					aadj = z;
+ 					aadj1 = dsign ? aadj : -aadj;
+ 					}
+-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
++				dval(aadj2) = aadj1;
++				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
++				aadj1 = dval(aadj2);
+ 				}
+ 			adj = aadj1 * ulp(dval(rv));
+ 			dval(rv) += adj;
+@@ -2423,11 +2321,7 @@
+ 
+  static int
+ quorem
+-#ifdef KR_headers
+-	(b, S) Bigint *b, *S;
+-#else
+ 	(Bigint *b, Bigint *S)
+-#endif
+ {
+ 	int n;
+ 	ULong *bx, *bxe, q, *sx, *sxe;
+@@ -2544,11 +2438,7 @@
+ #endif
+ 
+  static char *
+-#ifdef KR_headers
+-rv_alloc(i) int i;
+-#else
+ rv_alloc(int i)
+-#endif
+ {
+ 	int j, k, *r;
+ 
+@@ -2567,11 +2457,7 @@
+ 	}
+ 
+  static char *
+-#ifdef KR_headers
+-nrv_alloc(s, rve, n) char *s, **rve; int n;
+-#else
+ nrv_alloc(CONST char *s, char **rve, int n)
+-#endif
+ {
+ 	char *rv, *t;
+ 
+@@ -2589,11 +2475,7 @@
+  */
+ 
+  void
+-#ifdef KR_headers
+-freedtoa(s) char *s;
+-#else
+ freedtoa(char *s)
+-#endif
+ {
+ 	Bigint *b = (Bigint *)((int *)s - 1);
+ 	b->maxwds = 1 << (b->k = *(int*)b);
+@@ -2640,12 +2522,7 @@
+ 
+  char *
+ dtoa
+-#ifdef KR_headers
+-	(d, mode, ndigits, decpt, sign, rve)
+-	double d; int mode, ndigits, *decpt, *sign; char **rve;
+-#else
+-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
+-#endif
++	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
+ {
+  /*	Arguments ndigits, decpt, sign are similar to those
+ 	of ecvt and fcvt; trailing zeros are suppressed from
+@@ -2690,7 +2567,8 @@
+ 	ULong x;
+ #endif
+ 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
+-	double d2, ds, eps;
++	U d, d2, eps;
++	double ds;
+ 	char *s, *s0;
+ #ifdef Honor_FLT_ROUNDS
+ 	int rounding;
+@@ -2706,6 +2584,7 @@
+ 		}
+ #endif
+ 
++	dval(d) = dd;
+ 	if (word0(d) & Sign_bit) {
+ 		/* set sign for everything, including 0's and NaNs */
+ 		*sign = 1;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.397
+++ kdelibs.spec	28 Apr 2009 12:20:38 -0000	1.398
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -422,6 +422,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-13
+- upstream patch to fix GCC4.4 crashes in kjs
+  (kdebug:189809)
+
 * Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
 - drop the PopupApplet configuration backports (#495998) for now, kconf_update
   does not work as expected for Plasma



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:42 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested watchcommits
Message-ID: <20090428125542.AB0BE10F899@bastion2.fedora.phx.redhat.com>

psklenar has requested the watchcommits acl on stardict-dic-cs_CZ (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:41 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested watchbugzilla
Message-ID: <20090428125541.E0A5510F897@bastion2.fedora.phx.redhat.com>

psklenar has requested the watchbugzilla acl on stardict-dic-cs_CZ (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:45 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested commit
Message-ID: <20090428125545.67D1A10F89B@bastion2.fedora.phx.redhat.com>

psklenar has requested the commit acl on stardict-dic-cs_CZ (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:47 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested approveacls
Message-ID: <20090428125547.B177010F89D@bastion2.fedora.phx.redhat.com>

psklenar has requested the approveacls acl on stardict-dic-cs_CZ (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:54 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested watchbugzilla
Message-ID: <20090428125554.5FCF410F881@bastion2.fedora.phx.redhat.com>

psklenar has requested the watchbugzilla acl on stardict-dic-cs_CZ (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:54 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested watchcommits
Message-ID: <20090428125554.93A6010F894@bastion2.fedora.phx.redhat.com>

psklenar has requested the watchcommits acl on stardict-dic-cs_CZ (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:55 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested commit
Message-ID: <20090428125555.53B3410F89E@bastion2.fedora.phx.redhat.com>

psklenar has requested the commit acl on stardict-dic-cs_CZ (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:55:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:55:55 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested approveacls
Message-ID: <20090428125555.AB22A10F8A0@bastion2.fedora.phx.redhat.com>

psklenar has requested the approveacls acl on stardict-dic-cs_CZ (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:56:54 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125654.F1D6310F87D@bastion2.fedora.phx.redhat.com>

psklenar has set the watchcommits acl on stardict-dic-cs_CZ (Fedora 10) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:56:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:56:55 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125655.8BF1510F886@bastion2.fedora.phx.redhat.com>

psklenar has set the watchbugzilla acl on stardict-dic-cs_CZ (Fedora 10) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:56:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:56:56 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125656.CCC3F10F895@bastion2.fedora.phx.redhat.com>

psklenar has set the commit acl on stardict-dic-cs_CZ (Fedora 10) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:56:58 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125658.5947910F897@bastion2.fedora.phx.redhat.com>

psklenar has set the approveacls acl on stardict-dic-cs_CZ (Fedora 10) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:01 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125701.A35AC10F89B@bastion2.fedora.phx.redhat.com>

psklenar has set the watchbugzilla acl on stardict-dic-cs_CZ (Fedora 11) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:02 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125702.EF35610F8A0@bastion2.fedora.phx.redhat.com>

psklenar has set the watchcommits acl on stardict-dic-cs_CZ (Fedora 11) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:03 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125703.86F8310F8A2@bastion2.fedora.phx.redhat.com>

psklenar has set the commit acl on stardict-dic-cs_CZ (Fedora 11) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:03 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125703.C01B310F8A4@bastion2.fedora.phx.redhat.com>

psklenar has set the approveacls acl on stardict-dic-cs_CZ (Fedora 11) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:36 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested watchbugzilla
Message-ID: <20090428125736.2000510F886@bastion2.fedora.phx.redhat.com>

psklenar has requested the watchbugzilla acl on stardict-dic-cs_CZ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:36 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested watchcommits
Message-ID: <20090428125736.3989410F895@bastion2.fedora.phx.redhat.com>

psklenar has requested the watchcommits acl on stardict-dic-cs_CZ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:37 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested approveacls
Message-ID: <20090428125737.77B4410F899@bastion2.fedora.phx.redhat.com>

psklenar has requested the approveacls acl on stardict-dic-cs_CZ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:36 +0000
Subject: [pkgdb] stardict-dic-cs_CZ: psklenar has requested commit
Message-ID: <20090428125736.D660F10F897@bastion2.fedora.phx.redhat.com>

psklenar has requested the commit acl on stardict-dic-cs_CZ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:54 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125754.CBDE010F89A@bastion2.fedora.phx.redhat.com>

psklenar has set the watchbugzilla acl on stardict-dic-cs_CZ (Fedora devel) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:55 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125755.CA5EF10F89C@bastion2.fedora.phx.redhat.com>

psklenar has set the watchcommits acl on stardict-dic-cs_CZ (Fedora devel) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:55 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125756.2681E10F89E@bastion2.fedora.phx.redhat.com>

psklenar has set the commit acl on stardict-dic-cs_CZ (Fedora devel) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 12:57:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 12:57:57 +0000
Subject: [pkgdb] stardict-dic-cs_CZ had acl change status
Message-ID: <20090428125757.4882C10F8A0@bastion2.fedora.phx.redhat.com>

psklenar has set the approveacls acl on stardict-dic-cs_CZ (Fedora devel) to Approved for psklenar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ



From pkgdb at fedoraproject.org  Tue Apr 28 13:03:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 13:03:25 +0000
Subject: [pkgdb] bluez: plautrba has requested commit
Message-ID: <20090428130326.0FBE410F881@bastion2.fedora.phx.redhat.com>

plautrba has requested the commit acl on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Tue Apr 28 13:03:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 13:03:58 +0000
Subject: [pkgdb] bluez: plautrba has requested watchbugzilla
Message-ID: <20090428130358.A0E5710F881@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchbugzilla acl on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Tue Apr 28 13:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 13:04:03 +0000
Subject: [pkgdb] bluez: plautrba has requested watchcommits
Message-ID: <20090428130403.756D710F896@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchcommits acl on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From sharkcz at fedoraproject.org  Tue Apr 28 13:08:20 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 13:08:20 +0000 (UTC)
Subject: rpms/sg3_utils/devel .cvsignore, 1.10, 1.11 sg3_utils.spec, 1.27,
	1.28 sources, 1.10, 1.11
Message-ID: <20090428130820.4D7B070129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sg3_utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv568

Modified Files:
	.cvsignore sg3_utils.spec sources 
Log Message:
* Tue Apr 28 2009 Dan Hor??k <dan at danny.cz> - 1.27-1
- update to version 1.27
- changelog: http://sg.danny.cz/sg/p/sg3_utils.ChangeLog



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sg3_utils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Nov 2008 08:33:53 -0000	1.10
+++ .cvsignore	28 Apr 2009 13:07:49 -0000	1.11
@@ -1,2 +1,2 @@
-sg3_utils-1.26.tgz
+sg3_utils-1.27.tgz
 rescan-scsi-bus.sh-1.29


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sg3_utils.spec	31 Mar 2009 14:18:56 -0000	1.27
+++ sg3_utils.spec	28 Apr 2009 13:07:49 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: Utilities for devices that use SCSI command sets
 Name: sg3_utils
-Version: 1.26
-Release: 4%{?dist}
+Version: 1.27
+Release: 1%{?dist}
 License: GPLv2+ and BSD
 Group: Applications/System
 Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz
@@ -91,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 
  
 %changelog
+* Tue Apr 28 2009 Dan Hor??k <dan at danny.cz> - 1.27-1
+- update to version 1.27
+- changelog: http://sg.danny.cz/sg/p/sg3_utils.ChangeLog
+
 * Tue Mar 31 2009 Dan Hor??k <dan at danny.cz> - 1.26-4
 - add dependency between the libs subpackage and the main package (#492921)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sg3_utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Nov 2008 08:33:53 -0000	1.10
+++ sources	28 Apr 2009 13:07:49 -0000	1.11
@@ -1,2 +1,2 @@
-9a7aa8d954d75dc6c91e066e215867f2  sg3_utils-1.26.tgz
+de42374a6ba11258f1963134542af12c  sg3_utils-1.27.tgz
 679aa223710bddffe40d0cfc700009b7  rescan-scsi-bus.sh-1.29



From gd at fedoraproject.org  Tue Apr 28 13:10:10 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Tue, 28 Apr 2009 13:10:10 +0000 (UTC)
Subject: rpms/samba/F-10 samba.spec,1.173,1.174
Message-ID: <20090428131010.4555070129@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv919

Modified Files:
	samba.spec 
Log Message:
Fix "force user"
resolves: #497708

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- samba.spec	18 Apr 2009 23:30:41 -0000	1.173
+++ samba.spec	28 Apr 2009 13:09:39 -0000	1.174
@@ -1,4 +1,4 @@
-%define main_release 30
+%define main_release 31
 %define samba_version 3.2.11
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
@@ -46,6 +46,7 @@ Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.2.11-force_user.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,6 +253,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch201 -p1 -b .force_user
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -826,6 +828,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Apr 28 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.11-0.31
+- Fix "force user"
+- resolves: #497708
+
 * Sun Apr 19 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.11-0.30
 - Update to 3.2.11
 



From sharkcz at fedoraproject.org  Tue Apr 28 13:10:58 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 13:10:58 +0000 (UTC)
Subject: rpms/lsvpd/devel lsvpd.spec,1.8,1.9
Message-ID: <20090428131058.DE6F370129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/lsvpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1174

Modified Files:
	lsvpd.spec 
Log Message:
* Tue Apr 28 2009 - Dan Horak <dan[at]danny.cz> - 1.6.5-2
- rebuild for sg3_utils 1.27



Index: lsvpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsvpd/devel/lsvpd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lsvpd.spec	16 Mar 2009 13:19:13 -0000	1.8
+++ lsvpd.spec	28 Apr 2009 13:10:28 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:		%{name}
 Version:	%{version}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VPD/hardware inventory utilities for Linux
 
 Group:		Applications/System
@@ -71,6 +71,9 @@ on POWER PC based systems.
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
+* Tue Apr 28 2009 - Dan Horak <dan[at]danny.cz> - 1.6.5-2
+- rebuild for sg3_utils 1.27
+
 * Mon Mar 16 2009 Eric Munson <ebmunson at us.ibm.com> - 1.6.5-1
 - Update source to use new glibc C header includes
 



From sharkcz at fedoraproject.org  Tue Apr 28 13:12:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 13:12:36 +0000 (UTC)
Subject: rpms/libgpod/devel libgpod.spec,1.23,1.24
Message-ID: <20090428131236.84D2E70129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/libgpod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1543

Modified Files:
	libgpod.spec 
Log Message:
* Tue Apr 28 2009 Dan Horak <dan[at]danny.cz> - 0.7.0-3
- rebuild for sg3_utils 1.27



Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libgpod.spec	25 Feb 2009 15:26:44 -0000	1.23
+++ libgpod.spec	28 Apr 2009 13:12:04 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -134,6 +134,9 @@ libgpod library.
 
 
 %changelog
+* Tue Apr 28 2009 Dan Horak <dan[at]danny.cz> - 0.7.0-3
+- rebuild for sg3_utils 1.27
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Tue Apr 28 13:13:45 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 28 Apr 2009 13:13:45 +0000 (UTC)
Subject: rpms/libipoddevice/devel libipoddevice.spec,1.18,1.19
Message-ID: <20090428131345.0522E70129@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/libipoddevice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1951

Modified Files:
	libipoddevice.spec 
Log Message:
* Tue Apr 28 2009 Dan Horak <dan[at]danny.cz> - 0.5.3-7
- rebuild for sg3_utils 1.27



Index: libipoddevice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libipoddevice/devel/libipoddevice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libipoddevice.spec	25 Feb 2009 15:55:05 -0000	1.18
+++ libipoddevice.spec	28 Apr 2009 13:13:14 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:    libipoddevice
 Version: 0.5.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Device-specific layer for the Apple iPod
 
 Group:   Development/Libraries
@@ -75,6 +75,9 @@ make 
 
 
 %changelog
+* Tue Apr 28 2009 Dan Horak <dan[at]danny.cz> - 0.5.3-7
+- rebuild for sg3_utils 1.27
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mmaslano at fedoraproject.org  Tue Apr 28 13:15:17 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 28 Apr 2009 13:15:17 +0000 (UTC)
Subject: rpms/perl-XML-SAX/devel perl-XML-SAX.spec,1.21,1.22
Message-ID: <20090428131517.8E49A70129@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-SAX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2279

Modified Files:
	perl-XML-SAX.spec 
Log Message:
* Tue Apr 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 0.96-3
- 478905 fix scriptlets



Index: perl-XML-SAX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-SAX/devel/perl-XML-SAX.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-XML-SAX.spec	27 Feb 2009 04:44:31 -0000	1.21
+++ perl-XML-SAX.spec	28 Apr 2009 13:14:47 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:        XML-SAX Perl module
 Name:           perl-XML-SAX
 Version:        0.96
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -81,12 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 perl -MXML::SAX -e \
-  'XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()' 2>/dev/null
+  'XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()' 2>/dev/null || :
 
 %preun
 if [ $1 -eq 0 ]; then
   perl -MXML::SAX -e \
-    'XML::SAX->remove_parser(q(XML::SAX::PurePerl))->save_parsers()'
+    'XML::SAX->remove_parser(q(XML::SAX::PurePerl))->save_parsers()' || :
 fi
 
 
@@ -105,6 +105,9 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 0.96-3
+- 478905 fix scriptlets
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From limb at fedoraproject.org  Tue Apr 28 13:15:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 28 Apr 2009 13:15:59 +0000 (UTC)
Subject: rpms/armacycles-ad/devel .cvsignore, 1.2, 1.3 armacycles-ad.spec,
	1.11, 1.12 sources, 1.2, 1.3
Message-ID: <20090428131559.5452670129@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2480

Modified Files:
	.cvsignore armacycles-ad.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Sep 2007 21:17:55 -0000	1.2
+++ .cvsignore	28 Apr 2009 13:15:28 -0000	1.3
@@ -1 +1 @@
-armagetronad-0.2.8.2.1.src.tar.bz2
+armagetronad-0.2.8.3_rc2.src.tar.bz2


Index: armacycles-ad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/armacycles-ad.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- armacycles-ad.spec	24 Feb 2009 01:51:23 -0000	1.11
+++ armacycles-ad.spec	28 Apr 2009 13:15:28 -0000	1.12
@@ -1,31 +1,31 @@
 Name: armacycles-ad
-Version: 0.2.8.2.1
-Release: 7%{?dist}
+Version: 0.2.8.3
+Release: 1.rc2%{?dist}
 Summary: A lightcycle game in 3D
 
 Group: Amusements/Games
 License: GPLv2+
 URL: http://armagetronad.sf.net
-Source0: http://downloads.sourceforge.net/armagetronad/armagetronad-0.2.8.2.1.src.tar.bz2
+Source0: http://downloads.sourceforge.net/armagetronad/armagetronad-0.2.8.3_rc2.src.tar.bz2
 Source1: armacycles-logo.jpg
 Source2: armacycles-ad.desktop
-Patch0: armacycles-ad-0.2.8.2.1-md5-stringh.patch
-Patch1: armacycles-ad-0.2.8.2.1-nNetObjecth-stringh.patch
-Patch2: armacycles-ad-0.2.8.2.1-nAuthentification-stringh.patch
-Patch3: armacycles-ad-0.2.8.2.1-rModel-stringh.patch
-Patch4: armacycles-ad-0.2.8.2.1-nConfig-stringh.patch
-Patch5: armacycles-ad-0.2.8.2.1-nKrawall-stringh.patch
-Patch6: armacycles-ad-0.2.8.2.1-gAIBase-cstdlib.patch
-Patch7: armacycles-ad-0.2.8.2.1-nNetwork-stringh.patch
-Patch8: armacycles-ad-0.2.8.2.1-gCycle-memory.patch
-Patch9: armacycles-ad-0.2.8.2.1-nSocket-stringh.patch
-Patch10: armacycles-ad-0.2.8.2.1-tArray-stringh.patch
-Patch11: armacycles-ad-0.2.8.2.1-tConfiguration-stringh.patch
-Patch12: armacycles-ad-0.2.8.2.1-tCrypt-stringh.patch
-Patch13: armacycles-ad-0.2.8.2.1-tError-stringh.patch
-Patch14: armacycles-ad-0.2.8.2.1-tErrorcpp-stringh.patch
-Patch15: armacycles-ad-0.2.8.2.1-tError-cstdlib.patch
-Patch16: armacycles-ad-0.2.8.2.1-tRandom-cstdlib.patch
+#Patch0: armacycles-ad-0.2.8.2.1-md5-stringh.patch
+#Patch1: armacycles-ad-0.2.8.2.1-nNetObjecth-stringh.patch
+#Patch2: armacycles-ad-0.2.8.2.1-nAuthentification-stringh.patch
+#Patch3: armacycles-ad-0.2.8.2.1-rModel-stringh.patch
+#Patch4: armacycles-ad-0.2.8.2.1-nConfig-stringh.patch
+#Patch5: armacycles-ad-0.2.8.2.1-nKrawall-stringh.patch
+#Patch6: armacycles-ad-0.2.8.2.1-gAIBase-cstdlib.patch
+#Patch7: armacycles-ad-0.2.8.2.1-nNetwork-stringh.patch
+#Patch8: armacycles-ad-0.2.8.2.1-gCycle-memory.patch
+#Patch9: armacycles-ad-0.2.8.2.1-nSocket-stringh.patch
+#Patch10: armacycles-ad-0.2.8.2.1-tArray-stringh.patch
+#Patch11: armacycles-ad-0.2.8.2.1-tConfiguration-stringh.patch
+#Patch12: armacycles-ad-0.2.8.2.1-tCrypt-stringh.patch
+#Patch13: armacycles-ad-0.2.8.2.1-tError-stringh.patch
+#Patch14: armacycles-ad-0.2.8.2.1-tErrorcpp-stringh.patch
+#Patch15: armacycles-ad-0.2.8.2.1-tError-cstdlib.patch
+#Patch16: armacycles-ad-0.2.8.2.1-tRandom-cstdlib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
@@ -54,29 +54,29 @@ the internet and/or the LAN.
 
 
 %prep
-%setup -qn armagetronad-0.2.8.2.1
+%setup -qn armagetronad-0.2.8.3_rc2
 #insert modified logo
 cp %{SOURCE1} textures/title.jpg
 # remove krawall logo
 rm -f armagetronad-0.2.8.2.1/textures/KGN*
 
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
-%patch16 -p0
+#%patch0 -p0
+#%patch1 -p0
+#%patch2 -p0
+#%patch3 -p0
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
+#%patch8 -p0
+#%patch9 -p0
+#%patch10 -p0
+#%patch11 -p0
+#%patch12 -p0
+#%patch13 -p0
+#%patch14 -p0
+#%patch15 -p0
+#%patch16 -p0
 
 %build
 configure_flags="--disable-sysinstall --disable-games --disable-uninstall"
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 0.2.8.3-1.rc2
+- New upstream.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.8.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2007 21:17:55 -0000	1.2
+++ sources	28 Apr 2009 13:15:28 -0000	1.3
@@ -1 +1 @@
-b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2
+115200c3f8bf2507393a85225b5fb2ca  armagetronad-0.2.8.3_rc2.src.tar.bz2



From gd at fedoraproject.org  Tue Apr 28 13:16:16 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Tue, 28 Apr 2009 13:16:16 +0000 (UTC)
Subject: rpms/samba/F-10 samba-3.2.11-force_user.patch,NONE,1.1
Message-ID: <20090428131616.1767470129@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2593

Added Files:
	samba-3.2.11-force_user.patch 
Log Message:
add missing samba-3.2.11-force_user.patch.

Guenther


samba-3.2.11-force_user.patch:

--- NEW FILE samba-3.2.11-force_user.patch ---
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 24b05a5..175a234 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -867,6 +867,33 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 		*found_username = talloc_strdup(mem_ctx,
 						pdb_get_username(sam_acct));
 
+		/*
+		 * If the SID from lookup_name() was the guest sid, passdb knows
+		 * about the mapping of guest sid to lp_guestaccount()
+		 * username and will return the unix_pw info for a guest
+		 * user. Use it if it's there, else lookup the *uid details
+		 * using getpwnam_alloc(). See bug #6291 for details. JRA.
+		 */
+
+		/* We must always assign the *uid. */
+		if (sam_acct->unix_pw == NULL) {
+			struct passwd *pwd = getpwnam_alloc(sam_acct, *found_username );
+			if (!pwd) {
+				DEBUG(10, ("getpwnam_alloc failed for %s\n",
+					*found_username));
+				result = NT_STATUS_NO_SUCH_USER;
+				goto done;
+			}
+			result = samu_set_unix(sam_acct, pwd );
+			if (!NT_STATUS_IS_OK(result)) {
+				DEBUG(10, ("samu_set_unix failed for %s\n",
+					*found_username));
+				result = NT_STATUS_NO_SUCH_USER;
+				goto done;
+			}
+		}
+		*uid = sam_acct->unix_pw->pw_uid;
+
 	} else 	if (sid_check_is_in_unix_users(&user_sid)) {
 
 		/* This is a unix user not in passdb. We need to ask nss
@@ -883,8 +910,9 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 	unix_user:
 
 		if (!sid_to_uid(&user_sid, uid)) {
-			DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
+			DEBUG(1, ("unix_user case, sid_to_uid for %s (%s) failed\n",
 				  username, sid_string_dbg(&user_sid)));
+			result = NT_STATUS_NO_SUCH_USER;
 			goto done;
 		}
 
@@ -937,6 +965,14 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
 		uint32 dummy;
 
+		/* We must always assign the *uid. */
+		if (!sid_to_uid(&user_sid, uid)) {
+			DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
+				  username, sid_string_dbg(&user_sid)));
+			result = NT_STATUS_NO_SUCH_USER;
+			goto done;
+		}
+
 		num_group_sids = 1;
 		group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
 		if (group_sids == NULL) {



From gd at fedoraproject.org  Tue Apr 28 13:18:54 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Tue, 28 Apr 2009 13:18:54 +0000 (UTC)
Subject: rpms/samba/F-9 samba-3.2.11-force_user.patch, NONE, 1.1 samba.spec, 
	1.171, 1.172
Message-ID: <20090428131854.91C9A70129@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4060

Modified Files:
	samba.spec 
Added Files:
	samba-3.2.11-force_user.patch 
Log Message:
Fix "force user"
resolves: #497708

Guenther


samba-3.2.11-force_user.patch:

--- NEW FILE samba-3.2.11-force_user.patch ---
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 24b05a5..175a234 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -867,6 +867,33 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 		*found_username = talloc_strdup(mem_ctx,
 						pdb_get_username(sam_acct));
 
+		/*
+		 * If the SID from lookup_name() was the guest sid, passdb knows
+		 * about the mapping of guest sid to lp_guestaccount()
+		 * username and will return the unix_pw info for a guest
+		 * user. Use it if it's there, else lookup the *uid details
+		 * using getpwnam_alloc(). See bug #6291 for details. JRA.
+		 */
+
+		/* We must always assign the *uid. */
+		if (sam_acct->unix_pw == NULL) {
+			struct passwd *pwd = getpwnam_alloc(sam_acct, *found_username );
+			if (!pwd) {
+				DEBUG(10, ("getpwnam_alloc failed for %s\n",
+					*found_username));
+				result = NT_STATUS_NO_SUCH_USER;
+				goto done;
+			}
+			result = samu_set_unix(sam_acct, pwd );
+			if (!NT_STATUS_IS_OK(result)) {
+				DEBUG(10, ("samu_set_unix failed for %s\n",
+					*found_username));
+				result = NT_STATUS_NO_SUCH_USER;
+				goto done;
+			}
+		}
+		*uid = sam_acct->unix_pw->pw_uid;
+
 	} else 	if (sid_check_is_in_unix_users(&user_sid)) {
 
 		/* This is a unix user not in passdb. We need to ask nss
@@ -883,8 +910,9 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 	unix_user:
 
 		if (!sid_to_uid(&user_sid, uid)) {
-			DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
+			DEBUG(1, ("unix_user case, sid_to_uid for %s (%s) failed\n",
 				  username, sid_string_dbg(&user_sid)));
+			result = NT_STATUS_NO_SUCH_USER;
 			goto done;
 		}
 
@@ -937,6 +965,14 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
 		uint32 dummy;
 
+		/* We must always assign the *uid. */
+		if (!sid_to_uid(&user_sid, uid)) {
+			DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
+				  username, sid_string_dbg(&user_sid)));
+			result = NT_STATUS_NO_SUCH_USER;
+			goto done;
+		}
+
 		num_group_sids = 1;
 		group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
 		if (group_sids == NULL) {


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- samba.spec	18 Apr 2009 23:58:15 -0000	1.171
+++ samba.spec	28 Apr 2009 13:18:24 -0000	1.172
@@ -1,4 +1,4 @@
-%define main_release 28
+%define main_release 29
 %define samba_version 3.2.11
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
@@ -46,6 +46,7 @@ Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.2.11-force_user.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,6 +253,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch201 -p1 -b .force_user
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -824,6 +826,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Apr 28 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.11-0.29
+- Fix "force user"
+- resolves: #497708
+
 * Sun Apr 19 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.11-0.28
 - Update to 3.2.11
 



From pkgdb at fedoraproject.org  Tue Apr 28 13:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 13:39:30 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090428133930.C11E210F881@bastion2.fedora.phx.redhat.com>

hadess has set the watchbugzilla acl on bluez (Fedora devel) to Approved for plautrba

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Tue Apr 28 13:39:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 13:39:33 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090428133933.6292D10F896@bastion2.fedora.phx.redhat.com>

hadess has set the watchcommits acl on bluez (Fedora devel) to Approved for plautrba

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Tue Apr 28 13:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 13:39:36 +0000
Subject: [pkgdb] bluez had acl change status
Message-ID: <20090428133936.83D1B10F89A@bastion2.fedora.phx.redhat.com>

hadess has set the commit acl on bluez (Fedora devel) to Approved for plautrba

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From ltinkl at fedoraproject.org  Tue Apr 28 13:50:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 13:50:42 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 kpackagekit.spec,1.28,1.29 sources,1.11,1.12
Message-ID: <20090428135042.64A9E70129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11188/F-11

Modified Files:
	kpackagekit.spec sources 
Log Message:
respun tarball for upstream fix of #493061



Index: kpackagekit.spec
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kpackagekit.spec	17 Apr 2009 01:02:28 -0000	1.28
+++ kpackagekit.spec	28 Apr 2009 13:50:11 -0000	1.29
@@ -1,7 +1,6 @@
-
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -73,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-7
+- respun tarball for upstream fix of #493061
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
 - make update notification persistent (#485796)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	31 Mar 2009 16:49:28 -0000	1.11
+++ sources	28 Apr 2009 13:50:11 -0000	1.12
@@ -1 +1 @@
-1f09f3da94f4a2a2d854a8b36a2c9a07  kpackagekit-0.4.0.tar.bz2
+a433515deabb346262726bffb116ff91  kpackagekit-0.4.0.tar.bz2



From ltinkl at fedoraproject.org  Tue Apr 28 13:50:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 13:50:42 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec, 1.28, 1.29 sources, 1.11,
	1.12
Message-ID: <20090428135042.9205C70129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11188/devel

Modified Files:
	kpackagekit.spec sources 
Log Message:
respun tarball for upstream fix of #493061



Index: kpackagekit.spec
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kpackagekit.spec	17 Apr 2009 01:02:29 -0000	1.28
+++ kpackagekit.spec	28 Apr 2009 13:50:12 -0000	1.29
@@ -1,7 +1,6 @@
-
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -73,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-7
+- respun tarball for upstream fix of #493061
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
 - make update notification persistent (#485796)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	31 Mar 2009 16:49:28 -0000	1.11
+++ sources	28 Apr 2009 13:50:12 -0000	1.12
@@ -1 +1 @@
-1f09f3da94f4a2a2d854a8b36a2c9a07  kpackagekit-0.4.0.tar.bz2
+a433515deabb346262726bffb116ff91  kpackagekit-0.4.0.tar.bz2



From psklenar at fedoraproject.org  Tue Apr 28 14:05:57 2009
From: psklenar at fedoraproject.org (Petr Sklenar)
Date: Tue, 28 Apr 2009 14:05:57 +0000 (UTC)
Subject: rpms/stardict-dic-cs_CZ/F-11 import.log,1.1,1.2
Message-ID: <20090428140557.C8EBD70129@cvs1.fedora.phx.redhat.com>

Author: psklenar

Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14910/F-11

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-cs_CZ/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Mar 2009 13:25:49 -0000	1.1
+++ import.log	28 Apr 2009 14:05:26 -0000	1.2
@@ -1 +1,2 @@
 stardict-dic-cs_CZ-20081201-2_fc10:HEAD:stardict-dic-cs_CZ-20081201-2.fc10.src.rpm:1236345882
+stardict-dic-cs_CZ-20081201-2_fc10:F-11:stardict-dic-cs_CZ-20081201-2.fc10.src.rpm:1240927432



From ovasik at fedoraproject.org  Tue Apr 28 14:10:40 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 28 Apr 2009 14:10:40 +0000 (UTC)
Subject: rpms/elinks/devel elinks.conf,NONE,1.1 elinks.spec,1.71,1.72
Message-ID: <20090428141040.C32E370129@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16209

Modified Files:
	elinks.spec 
Added Files:
	elinks.conf 
Log Message:
enable certificate verification by default via configuration file(#495532)


--- NEW FILE elinks.conf ---
## ELinks 0.12pre3 configuration file

## This is ELinks configuration file. You can edit it manually,
## if you wish so; this file is edited by ELinks when you save
## options through UI, however only option values will be altered
## and missing options will be added at the end of file; if option
## is not written in this file, but in some file included from it,
## it is NOT counted as missing. Note that all your formatting,
## own comments and so on will be kept as-is.
##
## Obviously, if you don't like what ELinks is going to do with
## this file, you can change it by altering the config.saving_style
## option. Come on, aren't we friendly guys after all?

## connection
#  Connection options.

  ## connection.ssl
  #  SSL options.

    ## connection.ssl.cert_verify [0|1]
    #  Verify the peer's SSL certificate.
    set connection.ssl.cert_verify = 1

    ## connection.ssl.trusted_ca_file <str>
    #  The location of a file containing certificates of trusted certification
    #  authorities in PEM format. ELinks then trusts certificates issued by
    #  these CAs.
    #
    #  If you change this option or the file, you must restart ELinks for the
    #  changes to take effect. This option affects GnuTLS and nss_compat_ossl
    #  but not OpenSSL.
    set connection.ssl.trusted_ca_file = "/etc/pki/tls/certs/ca-bundle.crt"


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- elinks.spec	28 Apr 2009 11:50:46 -0000	1.71
+++ elinks.spec	28 Apr 2009 14:10:10 -0000	1.72
@@ -1,11 +1,12 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.13.pre3%{?dist}
+Release:   0.14.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
 Source:    http://elinks.or.cz/download/elinks-%{version}pre3.tar.bz2
+Source2:   elinks.conf
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
@@ -80,6 +81,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/elinks.conf
 touch $RPM_BUILD_ROOT%{_bindir}/links
 touch $RPM_BUILD_ROOT%{_mandir}/man1/links.1.gz
 %find_lang elinks
@@ -113,20 +116,25 @@ exit 0
 rm -rf $RPM_BUILD_ROOT
 
 %files -f elinks.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README SITES TODO COPYING
 %ghost %verify(not md5 size mtime) %{_bindir}/links
 %{_bindir}/elinks
 %ghost %verify(not md5 size mtime) %{_mandir}/man1/links.1.gz
+%config(noreplace) %{_sysconfdir}/elinks.conf
 %{_mandir}/man1/elinks.1*
 %{_mandir}/man5/*
 
 %changelog
+* Tue Apr 28 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.14.pre3
+- enable certificate verification by default via configuration
+  file(#495532)
+
 * Tue Apr 28 2009 Kamil Dudka <kdudka at redhat.com> 0.12-0.13.pre3
 - use appropriate BuildRequires for nss_compat_ossl (#495532)
 - support for trusted CA certificates loading from file in PEM format
 
-* Fri Apr 03 2009 Ondrej Vasik <ovasik at redhat.com> 0.12.0.12.pre3
+* Fri Apr 03 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.12.pre3
 - use word Elinks instead of Links in package description
 
 * Mon Mar 30 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.11.pre3



From psklenar at fedoraproject.org  Tue Apr 28 14:11:23 2009
From: psklenar at fedoraproject.org (Petr Sklenar)
Date: Tue, 28 Apr 2009 14:11:23 +0000 (UTC)
Subject: rpms/stardict-dic-cs_CZ/devel import.log,1.1,1.2
Message-ID: <20090428141123.BDEBE70129@cvs1.fedora.phx.redhat.com>

Author: psklenar

Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16408/devel

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Mar 2009 13:25:49 -0000	1.1
+++ import.log	28 Apr 2009 14:10:53 -0000	1.2
@@ -1 +1,2 @@
 stardict-dic-cs_CZ-20081201-2_fc10:HEAD:stardict-dic-cs_CZ-20081201-2.fc10.src.rpm:1236345882
+stardict-dic-cs_CZ-20081201-2_fc10:HEAD:stardict-dic-cs_CZ-20081201-2.fc10.src.rpm:1240927823



From rdieter at fedoraproject.org  Tue Apr 28 14:13:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 28 Apr 2009 14:13:12 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec, 1.29, 1.30 sources, 1.12,
	1.13
Message-ID: <20090428141312.1FE4C70129@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17156

Modified Files:
	kpackagekit.spec sources 
Log Message:
revert to 0.4.0-6 state/tarball



Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- kpackagekit.spec	28 Apr 2009 13:50:12 -0000	1.29
+++ kpackagekit.spec	28 Apr 2009 14:12:41 -0000	1.30
@@ -1,6 +1,6 @@
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	7%{?dist}
+Release:	6%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -72,9 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-7
-- respun tarball for upstream fix of #493061
-
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
 - make update notification persistent (#485796)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Apr 2009 13:50:12 -0000	1.12
+++ sources	28 Apr 2009 14:12:41 -0000	1.13
@@ -1 +1 @@
-a433515deabb346262726bffb116ff91  kpackagekit-0.4.0.tar.bz2
+1f09f3da94f4a2a2d854a8b36a2c9a07  kpackagekit-0.4.0.tar.bz2



From nbecker at fedoraproject.org  Tue Apr 28 14:19:17 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 28 Apr 2009 14:19:17 +0000 (UTC)
Subject: rpms/igraph/devel igraph.spec,1.28,1.29
Message-ID: <20090428141917.E744D7013C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18890

Modified Files:
	igraph.spec 
Log Message:
enable gmp/graphml


Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/devel/igraph.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- igraph.spec	27 Apr 2009 17:02:29 -0000	1.28
+++ igraph.spec	28 Apr 2009 14:18:47 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		igraph
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -13,7 +13,7 @@ Source0:	http://igraph.googlecode.com/fi
 #Patch3:		igraph-cstdio.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel, gmp-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Provides: 	%{name}-%{version}
@@ -95,6 +95,9 @@ fi
 make check
 
 %changelog
+* Tue Apr 28 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-2
+- Try enable gmp, graphml
+
 * Mon Apr 27 2009 Neal Becker <ndbecker2 at gmail.com> - 0.5.2-1
 - Update to 0.5.2
 - Try not applying patch #3



From mjakubicek at fedoraproject.org  Tue Apr 28 14:54:38 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 28 Apr 2009 14:54:38 +0000 (UTC)
Subject: rpms/incollector/devel incollector-mono.patch, NONE,
	1.1 incollector.spec, 1.3, 1.4
Message-ID: <20090428145438.3E89D7013C@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/incollector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29324/devel

Modified Files:
	incollector.spec 
Added Files:
	incollector-mono.patch 
Log Message:
- Fix FTBFS: added incollector-mono.patch.
- Added explicit R: mono-core (resolves BZ#469602).



incollector-mono.patch:

--- NEW FILE incollector-mono.patch ---
--- src/GUI/StatsDialog.cs.orig	2009-04-28 15:22:30.000000000 +0200
+++ src/GUI/StatsDialog.cs	2009-04-28 15:22:40.000000000 +0200
@@ -79,7 +79,7 @@
 		}
 		
 		
-		struct dtype {
+		class dtype {
 			public string name;
 			public int    count;
 		}


Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/devel/incollector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- incollector.spec	25 Feb 2009 07:13:34 -0000	1.3
+++ incollector.spec	28 Apr 2009 14:54:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           incollector
 Version:        1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Information collector
 Summary(pl):    Kolektor informacji
 Group:          Applications/Productivity
@@ -8,8 +8,11 @@ License:        GPLv2+
 URL:            http://www.incollector.devnull.pl/
 Source0:        http://www.incollector.devnull.pl/download/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# Not sent upstream as far, package should be updated first!
+Patch0:         %{name}-mono.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
+Requires:       mono-core
 ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
@@ -29,6 +32,7 @@ informacji wed??ug wybranych kryteri??w.
 
 %prep
 %setup -q
+%patch0
 chmod a-x README AUTHORS
 sed -i 's|be-latin|be at latin|' configure
 pushd po
@@ -64,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Apr 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.0-8
+- Fix FTBFS: added incollector-mono.patch.
+- Added explicit R: mono-core (resolves BZ#469602).
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Tue Apr 28 14:54:37 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 28 Apr 2009 14:54:37 +0000 (UTC)
Subject: rpms/incollector/F-11 incollector-mono.patch, NONE,
	1.1 incollector.spec, 1.3, 1.4
Message-ID: <20090428145437.E0A0470129@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/incollector/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29324/F-11

Modified Files:
	incollector.spec 
Added Files:
	incollector-mono.patch 
Log Message:
- Fix FTBFS: added incollector-mono.patch.
- Added explicit R: mono-core (resolves BZ#469602).



incollector-mono.patch:

--- NEW FILE incollector-mono.patch ---
--- src/GUI/StatsDialog.cs.orig	2009-04-28 15:22:30.000000000 +0200
+++ src/GUI/StatsDialog.cs	2009-04-28 15:22:40.000000000 +0200
@@ -79,7 +79,7 @@
 		}
 		
 		
-		struct dtype {
+		class dtype {
 			public string name;
 			public int    count;
 		}


Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-11/incollector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- incollector.spec	25 Feb 2009 07:13:34 -0000	1.3
+++ incollector.spec	28 Apr 2009 14:54:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           incollector
 Version:        1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Information collector
 Summary(pl):    Kolektor informacji
 Group:          Applications/Productivity
@@ -8,8 +8,11 @@ License:        GPLv2+
 URL:            http://www.incollector.devnull.pl/
 Source0:        http://www.incollector.devnull.pl/download/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# Not sent upstream as far, package should be updated first!
+Patch0:         %{name}-mono.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
+Requires:       mono-core
 ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
@@ -29,6 +32,7 @@ informacji wed??ug wybranych kryteri??w.
 
 %prep
 %setup -q
+%patch0
 chmod a-x README AUTHORS
 sed -i 's|be-latin|be at latin|' configure
 pushd po
@@ -64,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Apr 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.0-8
+- Fix FTBFS: added incollector-mono.patch.
+- Added explicit R: mono-core (resolves BZ#469602).
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cebbert at fedoraproject.org  Tue Apr 28 15:01:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 28 Apr 2009 15:01:55 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1575,1.1576
Message-ID: <20090428150155.5AC5B70129@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31334

Modified Files:
	kernel.spec 
Log Message:
Make the kernel-vanilla package buildable again.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1575
retrieving revision 1.1576
diff -u -p -r1.1575 -r1.1576
--- kernel.spec	27 Apr 2009 21:58:34 -0000	1.1575
+++ kernel.spec	28 Apr 2009 15:01:24 -0000	1.1576
@@ -972,7 +972,7 @@ ApplyPatch()
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1
   fi
-  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
     if [ "${patch:0:10}" != "patch-2.6." ] ; then
       echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
       exit 1
@@ -1993,6 +1993,9 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-114
+- Make the kernel-vanilla package buildable again.
+
 * Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-113
 - Fix possible FPU context corruption on x86-64.
 



From cebbert at fedoraproject.org  Tue Apr 28 15:06:45 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 28 Apr 2009 15:06:45 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1353,1.1354
Message-ID: <20090428150645.A248B70129@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32225

Modified Files:
	kernel.spec 
Log Message:
Make the kernel-vanilla package buildable again.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1353
retrieving revision 1.1354
diff -u -p -r1.1353 -r1.1354
--- kernel.spec	28 Apr 2009 00:22:53 -0000	1.1353
+++ kernel.spec	28 Apr 2009 15:06:14 -0000	1.1354
@@ -947,7 +947,7 @@ ApplyPatch()
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1
   fi
-  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
     if [ "${patch:0:10}" != "patch-2.6." ] ; then
       echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
       exit 1
@@ -1929,6 +1929,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-54
+- Make the kernel-vanilla package buildable again.
+
 * Mon Apr 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-53
 - Fix some broken bluetooth USB adapters
 



From psklenar at fedoraproject.org  Tue Apr 28 15:07:22 2009
From: psklenar at fedoraproject.org (Petr Sklenar)
Date: Tue, 28 Apr 2009 15:07:22 +0000 (UTC)
Subject: rpms/stardict-dic-cs_CZ/F-10 import.log, NONE,
	1.1 stardict-dic-cs_CZ.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090428150722.229DD70129@cvs1.fedora.phx.redhat.com>

Author: psklenar

Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32338/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stardict-dic-cs_CZ.spec 
Log Message:



--- NEW FILE import.log ---
stardict-dic-cs_CZ-20081201-2_fc10:F-10:stardict-dic-cs_CZ-20081201-2.fc10.src.rpm:1240931132


--- NEW FILE stardict-dic-cs_CZ.spec ---
%define dicname stardict-english-czech
Name: stardict-dic-cs_CZ
Summary: Czech dictionaries for StarDict
Version: 20081201
Release: 2%{?dist}
Group: Applications/Text
License: GFDL

URL: http://cihar.com/software/slovnik/
Source0: ftp://dl.cihar.com/slovnik/stable/%{dicname}-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{dicname}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: stardict >= 2

%description
Czech-English and English-Czech translation dictionaries for StarDict, a
GUI-based dictionary software.

%prep
%setup -q -c -n %{dicname}-%{version}

%build

%install
rm -rf ${RPM_BUILD_ROOT}
install -m 0755 -p -d ${RPM_BUILD_ROOT}%{_datadir}/stardict/dic
install -m 0644 -p  %{dicname}-%{version}/cz* ${RPM_BUILD_ROOT}%{_datadir}/stardict/dic/
install -m 0644 -p  %{dicname}-%{version}/en* ${RPM_BUILD_ROOT}%{_datadir}/stardict/dic/

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%doc %{dicname}-%{version}/README
%{_datadir}/stardict/dic/*


%changelog
* Mon Feb 9 2009 Petr Sklenar <psklenar at redhat.com> - 20081201-2
- editing specfile - name and description

* Mon Jan 26 2009 Petr Sklenar <psklenar at redhat.com> - 20081201-1
- Initial build for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-cs_CZ/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Mar 2009 20:35:14 -0000	1.1
+++ .cvsignore	28 Apr 2009 15:06:51 -0000	1.2
@@ -0,0 +1 @@
+stardict-english-czech-20081201.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-cs_CZ/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Mar 2009 20:35:14 -0000	1.1
+++ sources	28 Apr 2009 15:06:51 -0000	1.2
@@ -0,0 +1 @@
+99807bb4dd7d65a00334ef12cb6f46aa  stardict-english-czech-20081201.tar.gz



From dwalsh at fedoraproject.org  Tue Apr 28 15:13:37 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 28 Apr 2009 15:13:37 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.101,
	1.102 selinux-policy.spec, 1.838, 1.839
Message-ID: <20090428151337.5ECCF70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1341

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-22
- Fix Upgrade path to install unconfineduser.pp when unocnfined package is 3.0.0 or less


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- policy-20090105.patch	27 Apr 2009 18:56:58 -0000	1.101
+++ policy-20090105.patch	28 Apr 2009 15:13:35 -0000	1.102
@@ -358,6 +358,21 @@ diff -b -B --ignore-all-space --exclude-
  .SH BOOLEANS
  .TP
  You must set the allow_ypbind boolean to allow your system to work properly in a NIS environment.
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-3.6.12/policy/global_booleans
+--- nsaserefpolicy/policy/global_booleans	2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.12/policy/global_booleans	2009-04-28 09:51:52.000000000 -0400
+@@ -28,3 +28,11 @@
+ ## </p>
+ ## </desc>
+ gen_bool(secure_mode_policyload,false)
++
++## <desc>
++## <p>
++## Allow unconfined domain to map low memory in the kernel
++## </p>
++## </desc>
++gen_tunable(allow_unconfined_mmap_low, false)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
 +++ serefpolicy-3.6.12/policy/global_tunables	2009-04-23 09:44:57.000000000 -0400
@@ -7402,8 +7417,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-24 00:00:31.000000000 -0400
-@@ -0,0 +1,400 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-27 15:35:55.000000000 -0400
+@@ -0,0 +1,393 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7428,13 +7443,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +## <desc>
 +## <p>
-+## Allow unconfined domain to map low memory in the kernel
-+## </p>
-+## </desc>
-+gen_tunable(allow_unconfined_mmap_low, false)
-+
-+## <desc>
-+## <p>
 +## Transition to confined qemu domains from unconfined user
 +## </p>
 +## </desc>
@@ -29430,8 +29438,13 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-23 09:44:57.000000000 -0400
-@@ -5,227 +5,6 @@
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-28 09:51:35.000000000 -0400
+@@ -1,231 +1,9 @@
+ 
+-policy_module(unconfined, 3.0.0)
++policy_module(unconfined, 3.0.1)
+ 
+ ########################################
  #
  # Declarations
  #
@@ -29444,7 +29457,7 @@ diff -b -B --ignore-all-space --exclude-
 -userdom_manage_home_role(unconfined_r, unconfined_t)
 -userdom_manage_tmp_role(unconfined_r, unconfined_t)
 -userdom_manage_tmpfs_role(unconfined_r, unconfined_t)
- 
+-
 -type unconfined_exec_t;
 -init_system_domain(unconfined_t, unconfined_exec_t)
 -


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -p -r1.838 -r1.839
--- selinux-policy.spec	27 Apr 2009 18:56:58 -0000	1.838
+++ selinux-policy.spec	28 Apr 2009 15:13:35 -0000	1.839
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -160,7 +160,7 @@ bzip2 %{buildroot}/%{_usr}/share/selinux
 if [ -s /etc/selinux/config ]; then \
 	. %{_sysconfdir}/selinux/config; \
 	FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
-	if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
+	if [ "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT} ]; then \
 		cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
 	fi \
 fi
@@ -179,7 +179,7 @@ semodule -b base.pp.bz2 -i %{expand:%%mo
 . %{_sysconfdir}/selinux/config; \
 FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
 selinuxenabled; \
-if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
+if [ $? = 0  -a "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
 	restorecon -R /var/log /var/run 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
@@ -311,22 +311,56 @@ SELinux Reference policy targeted base m
 %saveFileContext targeted
 
 %post targeted
-if [ $1 -eq 1 ]; then
-packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
-%loadpolicy targeted $packages
-restorecon -R /root /var/log /var/run 2> /dev/null
-else
-semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-
+function get_unconfined() {
+# We only want to upgrade unconfined.pp and unconfineduser if they are 
+# currently installed.  If you have a version 3.0.0 or less of unconfined 
+# installed, you will need to install both, since unconfineduser did not exist 
+# prior to this.
+both="unconfined.pp.bz2 unconfineduser.pp.bz2"
 packages=""
-for i in `semodule -l | awk '{print $1 }' | grep -E "(^unconfined$|^unconfineduser$)"`; do
-packages="$packages $i.pp.bz2"
+ctr=0
+while [ "$1" != "" ]; do
+    if [ "$1" = "unconfineduser" ]; then
+	packages="unconfineduser.pp.bz2 $packages"
+	let "ctr+=1"
+    fi
+    if [ "$1" = "unconfined" ]; then
+	packages="unconfined.pp.bz2 $packages"
+	version=$2
+	let "ctr+=1"
+    fi
+    shift; 
+    shift; 
 done
-%loadpolicy targeted $packages
-%relabel targeted
+
+if [ $ctr -lt 2 -a "$version" != "" ]; then
+    f1=`echo $version | cut -d. -f 1`
+    if [ $f1 -lt 3 ]; then
+	packages=$both
+    else
+        if [ $f1 -eq  3 ]; then
+	    f2=`echo $version | cut -s -d. -f2`
+	    f3=`echo $version | cut -s -d. -f3`
+	    if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
+	        packages=$both
+	    fi
+	fi
+    fi
 fi
-exit 0
+echo $packages
+}
 
+if [ $1 -eq 1 ]; then
+   packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+   %loadpolicy targeted $packages
+   restorecon -R /root /var/log /var/run 2> /dev/null
+else
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
+   packages=`get_unconfined $(semodule -l)`
+   %loadpolicy targeted $packages
+   %relabel targeted
+fi
+exit 0
 
 %triggerpostun targeted -- selinux-policy-targeted < 3.2.5-9.fc9
 . /etc/selinux/config
@@ -341,7 +375,7 @@ fi
 seuser=`semanage login -l | grep __default__ | awk '{ print $2 }'`
 [ "$seuser" != "unconfined_u" ]  && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 __default__
 seuser=`semanage login -l | grep root | awk '{ print $2 }'`
-[ "$seuser" == "system_u" ] && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 root
+[ "$seuser" = "system_u" ] && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 root
 restorecon -R /root /etc/selinux/targeted 2> /dev/null
 semodule -r qmail 2> /dev/null
 exit 0
@@ -446,8 +480,11 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-22
+- Fix Upgrade path to install unconfineduser.pp when unocnfined package is 3.0.0 or less
+
 * Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-21
-- Allow confined users to manace virt_content_t, since this is home dir content
+- Allow confined users to manage virt_content_t, since this is home dir content
 - Allow all domains to read rpm_script_tmp_t which is what shell creates on redirection
 
 * Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20



From dwalsh at fedoraproject.org  Tue Apr 28 15:13:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 28 Apr 2009 15:13:52 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.844,1.845
Message-ID: <20090428151352.EE06C70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1303

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-22
- Fix Upgrade path to install unconfineduser.pp when unocnfined package is 3.0.0 or less



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -p -r1.844 -r1.845
--- selinux-policy.spec	27 Apr 2009 18:57:23 -0000	1.844
+++ selinux-policy.spec	28 Apr 2009 15:13:22 -0000	1.845
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -160,7 +160,7 @@ bzip2 %{buildroot}/%{_usr}/share/selinux
 if [ -s /etc/selinux/config ]; then \
 	. %{_sysconfdir}/selinux/config; \
 	FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
-	if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
+	if [ "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT} ]; then \
 		cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
 	fi \
 fi
@@ -179,7 +179,7 @@ semodule -b base.pp.bz2 -i %{expand:%%mo
 . %{_sysconfdir}/selinux/config; \
 FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
 selinuxenabled; \
-if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
+if [ $? = 0  -a "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
 	restorecon -R /var/log /var/run 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
@@ -311,22 +311,55 @@ SELinux Reference policy targeted base m
 %saveFileContext targeted
 
 %post targeted
-if [ $1 -eq 1 ]; then
-packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
-%loadpolicy targeted $packages
-restorecon -R /root /var/log /var/run 2> /dev/null
-else
-semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-
+function get_unconfined() {
+# We only want to upgrade unconfined.pp and unconfineduser if they are 
+# currently installed.  If you have a version 3.0.0 or less of unconfined 
+# installed, you will need to install both.
+both="unconfined.pp.bz2 unconfineduser.pp.bz2"
 packages=""
-for i in `semodule -l | awk '{print $1 }' | grep -E "(^unconfined$|^unconfineduser$)"`; do
-packages="$packages $i.pp.bz2"
+ctr=0
+while [ "$1" != "" ]; do
+    if [ "$1" = "unconfineduser" ]; then
+	packages="unconfineduser.pp.bz2 $packages"
+	let "ctr+=1"
+    fi
+    if [ "$1" = "unconfined" ]; then
+	packages="unconfined.pp.bz2 $packages"
+	version=$2
+	let "ctr+=1"
+    fi
+    shift; 
+    shift; 
 done
-%loadpolicy targeted $packages
-%relabel targeted
+
+if [ $ctr -lt 2 -a "$version" != "" ]; then
+    f1=`echo $version | cut -d. -f 1`
+    if [ $f1 -lt 3 ]; then
+	packages=$both
+    else
+        if [ $f1 -eq  3 ]; then
+		f2=`echo $version | cut -s -d. -f2`
+		f3=`echo $version | cut -s -d. -f3`
+		if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
+		    packages=$both
+		fi
+	fi
+    fi
 fi
-exit 0
+echo $packages
+}
 
+if [ $1 -eq 1 ]; then
+   packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+   %loadpolicy targeted $packages
+   restorecon -R /root /var/log /var/run 2> /dev/null
+else
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
+   packages=`get_unconfined $(semodule -l)`
+   %loadpolicy targeted $packages
+   %relabel targeted
+fi
+exit 0
 
 %triggerpostun targeted -- selinux-policy-targeted < 3.2.5-9.fc9
 . /etc/selinux/config
@@ -341,7 +374,7 @@ fi
 seuser=`semanage login -l | grep __default__ | awk '{ print $2 }'`
 [ "$seuser" != "unconfined_u" ]  && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 __default__
 seuser=`semanage login -l | grep root | awk '{ print $2 }'`
-[ "$seuser" == "system_u" ] && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 root
+[ "$seuser" = "system_u" ] && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 root
 restorecon -R /root /etc/selinux/targeted 2> /dev/null
 semodule -r qmail 2> /dev/null
 exit 0
@@ -446,8 +479,11 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-22
+- Fix Upgrade path to install unconfineduser.pp when unocnfined package is 3.0.0 or less
+
 * Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-21
-- Allow confined users to manace virt_content_t, since this is home dir content
+- Allow confined users to manage virt_content_t, since this is home dir content
 - Allow all domains to read rpm_script_tmp_t which is what shell creates on redirection
 
 * Mon Apr 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-20



From cebbert at fedoraproject.org  Tue Apr 28 15:17:03 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 28 Apr 2009 15:17:03 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1535,1.1536
Message-ID: <20090428151703.0732370129@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2146

Modified Files:
	kernel.spec 
Log Message:
Make the kernel-vanilla package buildable again.
Allow building with older versions of RPM.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -p -r1.1535 -r1.1536
--- kernel.spec	28 Apr 2009 11:25:45 -0000	1.1535
+++ kernel.spec	28 Apr 2009 15:16:32 -0000	1.1536
@@ -872,12 +872,14 @@ exit 1
 %endif
 
 # more sanity checking; do it quietly
-for patch in %{patches} ; do
-  if [ ! -f $patch ] ; then
-    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
-    exit 1
-  fi
-done 2>/dev/null
+if [ "%{patches}" != "%%{patches}" ] ; then
+  for patch in %{patches} ; do
+    if [ ! -f $patch ] ; then
+      echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+      exit 1
+    fi
+  done
+fi 2>/dev/null
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -887,7 +889,7 @@ ApplyPatch()
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1
   fi
-  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
     if [ "${patch:0:10}" != "patch-2.6." ] ; then
       echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
       exit 1
@@ -1830,6 +1832,10 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com>
+- Make the kernel-vanilla package buildable again.
+- Allow building with older versions of RPM.
+
 * Tue Apr 28 2009 Neil Horman <nhorman at redhat.com>
 - Backport missing snmp stats (bz 492391)
 



From mjakubicek at fedoraproject.org  Tue Apr 28 15:21:55 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 28 Apr 2009 15:21:55 +0000 (UTC)
Subject: rpms/incollector/F-10 incollector.spec,1.2,1.3
Message-ID: <20090428152155.5BC1C70129@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/incollector/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2975/F-10

Modified Files:
	incollector.spec 
Log Message:
- Added explicit R: mono-core (resolves BZ#469602).




Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-10/incollector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- incollector.spec	8 Feb 2008 09:22:42 -0000	1.2
+++ incollector.spec	28 Apr 2009 15:21:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           incollector
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Information collector
 Summary(pl):    Kolektor informacji
 Group:          Applications/Productivity
@@ -10,6 +10,7 @@ Source0:        http://www.incollector.d
 Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
+Requires:       mono-core
 ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
@@ -64,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Apr 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.0-7
+- Added explicit R: mono-core (resolves BZ#469602).
+
 * Fri Feb 08 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 1.0-6
 - Correct install section
 



From mjakubicek at fedoraproject.org  Tue Apr 28 15:21:55 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 28 Apr 2009 15:21:55 +0000 (UTC)
Subject: rpms/incollector/F-9 incollector.spec,1.3,1.4
Message-ID: <20090428152155.AA1AC70129@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/incollector/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2975/F-9

Modified Files:
	incollector.spec 
Log Message:
- Added explicit R: mono-core (resolves BZ#469602).




Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-9/incollector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- incollector.spec	17 Nov 2008 14:22:14 -0000	1.3
+++ incollector.spec	28 Apr 2009 15:21:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           incollector
 Version:        1.0
-Release:        6%{?dist}.1
+Release:        7%{?dist}.1
 Summary:        Information collector
 Summary(pl):    Kolektor informacji
 Group:          Applications/Productivity
@@ -10,6 +10,7 @@ Source0:        http://www.incollector.d
 Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
+Requires:       mono-core
 ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
@@ -64,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Apr 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.0-7
+- Added explicit R: mono-core (resolves BZ#469602).
+
 * Mon Nov 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against newer gtk-sharp2 (bug 468055)
 



From pkgdb at fedoraproject.org  Tue Apr 28 15:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:27:43 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchbugzilla
Message-ID: <20090428152743.7C3CB10F886@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on glusterfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:27:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:27:44 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested commit
Message-ID: <20090428152744.C12F610F896@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on glusterfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:27:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:27:48 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchcommits
Message-ID: <20090428152748.AC11110F898@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on glusterfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:27:59 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchbugzilla
Message-ID: <20090428152759.0C64110F896@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on glusterfs (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:27:59 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested commit
Message-ID: <20090428152759.5CC6610F89B@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on glusterfs (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:27:59 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchcommits
Message-ID: <20090428152759.AA2A110F89E@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on glusterfs (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:04 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchbugzilla
Message-ID: <20090428152804.1937A10F8A1@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on glusterfs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:04 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested commit
Message-ID: <20090428152804.CEF6110F8A4@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on glusterfs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:04 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchcommits
Message-ID: <20090428152804.D8A7C10F8A7@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on glusterfs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:07 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchbugzilla
Message-ID: <20090428152807.65D3C10F899@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on glusterfs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:07 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested commit
Message-ID: <20090428152807.8E7DD10F8AD@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on glusterfs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:11 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchcommits
Message-ID: <20090428152811.B1D7B10F843@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on glusterfs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:11 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchbugzilla
Message-ID: <20090428152811.E652A10F8AE@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchbugzilla acl on glusterfs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:12 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested commit
Message-ID: <20090428152812.27F8910F8B1@bastion2.fedora.phx.redhat.com>

jsteffan has requested the commit acl on glusterfs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Tue Apr 28 15:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 15:28:13 +0000
Subject: [pkgdb] glusterfs: jsteffan has requested watchcommits
Message-ID: <20090428152813.1BE6B10F8B3@bastion2.fedora.phx.redhat.com>

jsteffan has requested the watchcommits acl on glusterfs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glusterfs



From ltinkl at fedoraproject.org  Tue Apr 28 15:43:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 15:43:16 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 kpackagekit.spec,1.29,1.30 sources,1.12,1.13
Message-ID: <20090428154316.3BAA770129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435

Modified Files:
	kpackagekit.spec sources 
Log Message:
revert here as well



Index: kpackagekit.spec
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- kpackagekit.spec	28 Apr 2009 13:50:11 -0000	1.29
+++ kpackagekit.spec	28 Apr 2009 15:42:45 -0000	1.30
@@ -1,6 +1,6 @@
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	7%{?dist}
+Release:	6%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -72,9 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-7
-- respun tarball for upstream fix of #493061
-
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
 - make update notification persistent (#485796)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Apr 2009 13:50:11 -0000	1.12
+++ sources	28 Apr 2009 15:42:45 -0000	1.13
@@ -1 +1 @@
-a433515deabb346262726bffb116ff91  kpackagekit-0.4.0.tar.bz2
+1f09f3da94f4a2a2d854a8b36a2c9a07  kpackagekit-0.4.0.tar.bz2



From ltinkl at fedoraproject.org  Tue Apr 28 15:48:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 15:48:20 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit-0.4.0-i18n.patch, NONE,
	1.1 kpackagekit.spec, 1.30, 1.31
Message-ID: <20090428154820.939BB70129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8407/devel

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.4.0-i18n.patch 
Log Message:
#493061 -  kpackagekit translations not working


kpackagekit-0.4.0-i18n.patch:

--- NEW FILE kpackagekit-0.4.0-i18n.patch ---
Index: Settings/KcmKpkSettings.cpp
===================================================================
--- Settings/KcmKpkSettings.cpp	(revision 960337)
+++ Settings/KcmKpkSettings.cpp	(revision 960338)
@@ -40,4 +40,5 @@
     connect(this, SIGNAL(s_defaults()), view, SLOT(defaults()) );
     connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)) );
     m_grid->addWidget(view);
+    KGlobal::locale()->insertCatalog("kpackagekit");
 }
Index: Updater/KcmKpkUpdate.cpp
===================================================================
--- Updater/KcmKpkUpdate.cpp	(revision 960337)
+++ Updater/KcmKpkUpdate.cpp	(revision 960338)
@@ -38,6 +38,7 @@
     view = new KpkUpdate(this);
     m_grid->addWidget(view);
     connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+    KGlobal::locale()->insertCatalog("kpackagekit");
 }
 
 void KcmKpkUpdate::load()
Index: AddRm/KcmKpkAddRm.cpp
===================================================================
--- AddRm/KcmKpkAddRm.cpp	(revision 960337)
+++ AddRm/KcmKpkAddRm.cpp	(revision 960338)
@@ -32,6 +32,7 @@
     : KCModule(KPackageKitFactory::componentData(), parent, args)
 {
     KAboutData *about = new KAboutData("kcm_kpk_addrm", "kpackagekit", ki18n("Add and Remove Software"), KPK_VERSION);
+    KGlobal::locale()->insertCatalog("kpackagekit");
     setAboutData(about);
     setButtons(Apply);
     m_grid = new QGridLayout(this);
Index: KPackageKit/main.cpp
===================================================================
--- KPackageKit/main.cpp	(revision 960337)
+++ KPackageKit/main.cpp	(revision 960338)
@@ -30,7 +30,7 @@
 int main(int argc, char **argv)
 {
     KAboutData about("KPackageKit",
-                     0,
+                     "kpackagekit",
                      ki18n("KPackageKit"),
                      KPK_VERSION,
                      ki18n("KPackageKit user interface"),


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- kpackagekit.spec	28 Apr 2009 14:12:41 -0000	1.30
+++ kpackagekit.spec	28 Apr 2009 15:47:50 -0000	1.31
@@ -1,6 +1,6 @@
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -13,6 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 # upstream me, says the patch
 Patch100: kpackagekit-InitialPreference.patch
 Patch101: kpackagekit-0.4.0-knotify_persistent.patch
+Patch102: kpackagekit-0.4.0-i18n.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -29,7 +30,7 @@ KDE interface for PackageKit.
 
 %patch100 -p0 -b .InitialPreference
 %patch101 -p1 -b .knotify_persistent
-
+%patch102 -p0 -b .i18n
 
 
 %build
@@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-7
+- upstream patch to fix catalog loading (#493061)
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
 - make update notification persistent (#485796)
 



From ltinkl at fedoraproject.org  Tue Apr 28 15:48:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 15:48:20 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 kpackagekit-0.4.0-i18n.patch, NONE,
	1.1 kpackagekit.spec, 1.30, 1.31
Message-ID: <20090428154820.6ABB470129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8407/F-11

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.4.0-i18n.patch 
Log Message:
#493061 -  kpackagekit translations not working


kpackagekit-0.4.0-i18n.patch:

--- NEW FILE kpackagekit-0.4.0-i18n.patch ---
Index: Settings/KcmKpkSettings.cpp
===================================================================
--- Settings/KcmKpkSettings.cpp	(revision 960337)
+++ Settings/KcmKpkSettings.cpp	(revision 960338)
@@ -40,4 +40,5 @@
     connect(this, SIGNAL(s_defaults()), view, SLOT(defaults()) );
     connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)) );
     m_grid->addWidget(view);
+    KGlobal::locale()->insertCatalog("kpackagekit");
 }
Index: Updater/KcmKpkUpdate.cpp
===================================================================
--- Updater/KcmKpkUpdate.cpp	(revision 960337)
+++ Updater/KcmKpkUpdate.cpp	(revision 960338)
@@ -38,6 +38,7 @@
     view = new KpkUpdate(this);
     m_grid->addWidget(view);
     connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+    KGlobal::locale()->insertCatalog("kpackagekit");
 }
 
 void KcmKpkUpdate::load()
Index: AddRm/KcmKpkAddRm.cpp
===================================================================
--- AddRm/KcmKpkAddRm.cpp	(revision 960337)
+++ AddRm/KcmKpkAddRm.cpp	(revision 960338)
@@ -32,6 +32,7 @@
     : KCModule(KPackageKitFactory::componentData(), parent, args)
 {
     KAboutData *about = new KAboutData("kcm_kpk_addrm", "kpackagekit", ki18n("Add and Remove Software"), KPK_VERSION);
+    KGlobal::locale()->insertCatalog("kpackagekit");
     setAboutData(about);
     setButtons(Apply);
     m_grid = new QGridLayout(this);
Index: KPackageKit/main.cpp
===================================================================
--- KPackageKit/main.cpp	(revision 960337)
+++ KPackageKit/main.cpp	(revision 960338)
@@ -30,7 +30,7 @@
 int main(int argc, char **argv)
 {
     KAboutData about("KPackageKit",
-                     0,
+                     "kpackagekit",
                      ki18n("KPackageKit"),
                      KPK_VERSION,
                      ki18n("KPackageKit user interface"),


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/extras/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- kpackagekit.spec	28 Apr 2009 15:42:45 -0000	1.30
+++ kpackagekit.spec	28 Apr 2009 15:47:50 -0000	1.31
@@ -1,6 +1,6 @@
 Name:	  	kpackagekit
 Version:	0.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -13,6 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 # upstream me, says the patch
 Patch100: kpackagekit-InitialPreference.patch
 Patch101: kpackagekit-0.4.0-knotify_persistent.patch
+Patch102: kpackagekit-0.4.0-i18n.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -29,7 +30,7 @@ KDE interface for PackageKit.
 
 %patch100 -p0 -b .InitialPreference
 %patch101 -p1 -b .knotify_persistent
-
+%patch102 -p0 -b .i18n
 
 
 %build
@@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 0.4.0-7
+- upstream patch to fix catalog loading (#493061)
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-6
 - make update notification persistent (#485796)
 



From dwalsh at fedoraproject.org  Tue Apr 28 15:49:43 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 28 Apr 2009 15:49:43 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.102,
	1.103 selinux-policy.spec, 1.839, 1.840
Message-ID: <20090428154943.1AF9D70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8973

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-23
- Fix uml files to be owned by users


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- policy-20090105.patch	28 Apr 2009 15:13:35 -0000	1.102
+++ policy-20090105.patch	28 Apr 2009 15:49:42 -0000	1.103
@@ -358,24 +358,9 @@ diff -b -B --ignore-all-space --exclude-
  .SH BOOLEANS
  .TP
  You must set the allow_ypbind boolean to allow your system to work properly in a NIS environment.
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-3.6.12/policy/global_booleans
---- nsaserefpolicy/policy/global_booleans	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.12/policy/global_booleans	2009-04-28 09:51:52.000000000 -0400
-@@ -28,3 +28,11 @@
- ## </p>
- ## </desc>
- gen_bool(secure_mode_policyload,false)
-+
-+## <desc>
-+## <p>
-+## Allow unconfined domain to map low memory in the kernel
-+## </p>
-+## </desc>
-+gen_tunable(allow_unconfined_mmap_low, false)
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/global_tunables	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/global_tunables	2009-04-28 11:36:39.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -392,7 +377,7 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow any files/directories to be exported read/write via NFS.
  ## </p>
  ## </desc>
-@@ -111,3 +102,12 @@
+@@ -111,3 +102,18 @@
  ## </p>
  ## </desc>
  gen_tunable(user_tcp_server,false)
@@ -404,6 +389,12 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(allow_console_login,false)
 +
++## <desc>
++## <p>
++## Allow unconfined domain to map low memory in the kernel
++## </p>
++## </desc>
++gen_tunable(allow_unconfined_mmap_low, false)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.12/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-02-03 22:50:50.000000000 -0500
@@ -4474,6 +4465,26 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +permissive sambagui_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.te serefpolicy-3.6.12/policy/modules/apps/uml.te
+--- nsaserefpolicy/policy/modules/apps/uml.te	2009-01-19 11:03:28.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/apps/uml.te	2009-04-28 11:42:33.000000000 -0400
+@@ -16,14 +16,12 @@
+ type uml_ro_t;
+ typealias uml_ro_t alias { user_uml_ro_t staff_uml_ro_t sysadm_uml_ro_t };
+ typealias uml_ro_t alias { auditadm_uml_ro_t secadm_uml_ro_t };
+-files_type(uml_ro_t)
+-ubac_constrained(uml_ro_t)
++userdom_user_home_content(uml_ro_t)
+ 
+ type uml_rw_t;
+ typealias uml_rw_t alias { user_uml_rw_t staff_uml_rw_t sysadm_uml_rw_t };
+ typealias uml_rw_t alias { auditadm_uml_rw_t secadm_uml_rw_t };
+-files_type(uml_rw_t)
+-ubac_constrained(uml_rw_t)
++userdom_user_home_content(uml_rw_t)
+ 
+ type uml_tmp_t;
+ typealias uml_tmp_t alias { user_uml_tmp_t staff_uml_tmp_t sysadm_uml_tmp_t };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.6.12/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2009-01-19 11:03:28.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/vmware.te	2009-04-23 09:44:57.000000000 -0400
@@ -19364,6 +19375,52 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		mysql_search_db(httpd_prewikka_script_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.12/policy/modules/services/privoxy.te
+--- nsaserefpolicy/policy/modules/services/privoxy.te	2009-01-19 11:06:49.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-04-28 11:40:52.000000000 -0400
+@@ -6,6 +6,14 @@
+ # Declarations
+ #
+ 
++## <desc>
++## <p>
++## Allow privoxy to connect to all ports, not just
++## HTTP, FTP, and Gopher ports.
++## </p>
++## </desc>
++gen_tunable(privoxy_connect_any, false)
++
+ type privoxy_t; # web_client_domain
+ type privoxy_exec_t;
+ init_daemon_domain(privoxy_t, privoxy_exec_t)
+@@ -72,21 +80,19 @@
+ 
+ logging_send_syslog_msg(privoxy_t)
+ 
+-miscfiles_read_localization(privoxy_t)
++auth_use_nsswitch(privoxy_t)
+ 
+-sysnet_dns_name_resolve(privoxy_t)
++miscfiles_read_localization(privoxy_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(privoxy_t)
+ userdom_dontaudit_search_user_home_dirs(privoxy_t)
+ # cjp: this should really not be needed
+ userdom_use_user_terminals(privoxy_t)
+ 
+-optional_policy(`
+-	nis_use_ypbind(privoxy_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(privoxy_t)
++tunable_policy(`privoxy_connect_any',`
++	corenet_tcp_connect_all_ports(privoxy_t)
++	corenet_tcp_bind_all_ports(privoxy_t)
++	corenet_sendrecv_all_packets(privoxy_t)
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.6.12/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/procmail.te	2009-04-23 09:44:57.000000000 -0400
@@ -22227,7 +22284,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.12/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-28 11:39:57.000000000 -0400
 @@ -118,6 +118,9 @@
  
  fs_getattr_all_fs(squid_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -p -r1.839 -r1.840
--- selinux-policy.spec	28 Apr 2009 15:13:35 -0000	1.839
+++ selinux-policy.spec	28 Apr 2009 15:49:42 -0000	1.840
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,6 +480,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-23
+- Fix uml files to be owned by users
+
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-22
 - Fix Upgrade path to install unconfineduser.pp when unocnfined package is 3.0.0 or less
 



From dwalsh at fedoraproject.org  Tue Apr 28 15:49:49 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 28 Apr 2009 15:49:49 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.108,
	1.109 selinux-policy.spec, 1.845, 1.846
Message-ID: <20090428154949.6F27570129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9006

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-23
- Fix uml files to be owned by users


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- policy-20090105.patch	27 Apr 2009 18:57:23 -0000	1.108
+++ policy-20090105.patch	28 Apr 2009 15:49:48 -0000	1.109
@@ -360,7 +360,7 @@ diff -b -B --ignore-all-space --exclude-
  You must set the allow_ypbind boolean to allow your system to work properly in a NIS environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.12/policy/global_tunables	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/global_tunables	2009-04-28 11:36:39.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -377,7 +377,7 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow any files/directories to be exported read/write via NFS.
  ## </p>
  ## </desc>
-@@ -111,3 +102,12 @@
+@@ -111,3 +102,18 @@
  ## </p>
  ## </desc>
  gen_tunable(user_tcp_server,false)
@@ -389,6 +389,12 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(allow_console_login,false)
 +
++## <desc>
++## <p>
++## Allow unconfined domain to map low memory in the kernel
++## </p>
++## </desc>
++gen_tunable(allow_unconfined_mmap_low, false)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.12/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-02-03 22:50:50.000000000 -0500
@@ -4459,6 +4465,26 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +permissive sambagui_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.te serefpolicy-3.6.12/policy/modules/apps/uml.te
+--- nsaserefpolicy/policy/modules/apps/uml.te	2009-01-19 11:03:28.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/apps/uml.te	2009-04-28 11:42:33.000000000 -0400
+@@ -16,14 +16,12 @@
+ type uml_ro_t;
+ typealias uml_ro_t alias { user_uml_ro_t staff_uml_ro_t sysadm_uml_ro_t };
+ typealias uml_ro_t alias { auditadm_uml_ro_t secadm_uml_ro_t };
+-files_type(uml_ro_t)
+-ubac_constrained(uml_ro_t)
++userdom_user_home_content(uml_ro_t)
+ 
+ type uml_rw_t;
+ typealias uml_rw_t alias { user_uml_rw_t staff_uml_rw_t sysadm_uml_rw_t };
+ typealias uml_rw_t alias { auditadm_uml_rw_t secadm_uml_rw_t };
+-files_type(uml_rw_t)
+-ubac_constrained(uml_rw_t)
++userdom_user_home_content(uml_rw_t)
+ 
+ type uml_tmp_t;
+ typealias uml_tmp_t alias { user_uml_tmp_t staff_uml_tmp_t sysadm_uml_tmp_t };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.6.12/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2009-01-19 11:03:28.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/vmware.te	2009-04-23 09:44:57.000000000 -0400
@@ -7402,8 +7428,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-24 00:00:31.000000000 -0400
-@@ -0,0 +1,400 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-27 15:35:55.000000000 -0400
+@@ -0,0 +1,393 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7428,13 +7454,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +## <desc>
 +## <p>
-+## Allow unconfined domain to map low memory in the kernel
-+## </p>
-+## </desc>
-+gen_tunable(allow_unconfined_mmap_low, false)
-+
-+## <desc>
-+## <p>
 +## Transition to confined qemu domains from unconfined user
 +## </p>
 +## </desc>
@@ -19356,6 +19375,52 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		mysql_search_db(httpd_prewikka_script_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.12/policy/modules/services/privoxy.te
+--- nsaserefpolicy/policy/modules/services/privoxy.te	2009-01-19 11:06:49.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-04-28 11:40:52.000000000 -0400
+@@ -6,6 +6,14 @@
+ # Declarations
+ #
+ 
++## <desc>
++## <p>
++## Allow privoxy to connect to all ports, not just
++## HTTP, FTP, and Gopher ports.
++## </p>
++## </desc>
++gen_tunable(privoxy_connect_any, false)
++
+ type privoxy_t; # web_client_domain
+ type privoxy_exec_t;
+ init_daemon_domain(privoxy_t, privoxy_exec_t)
+@@ -72,21 +80,19 @@
+ 
+ logging_send_syslog_msg(privoxy_t)
+ 
+-miscfiles_read_localization(privoxy_t)
++auth_use_nsswitch(privoxy_t)
+ 
+-sysnet_dns_name_resolve(privoxy_t)
++miscfiles_read_localization(privoxy_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(privoxy_t)
+ userdom_dontaudit_search_user_home_dirs(privoxy_t)
+ # cjp: this should really not be needed
+ userdom_use_user_terminals(privoxy_t)
+ 
+-optional_policy(`
+-	nis_use_ypbind(privoxy_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(privoxy_t)
++tunable_policy(`privoxy_connect_any',`
++	corenet_tcp_connect_all_ports(privoxy_t)
++	corenet_tcp_bind_all_ports(privoxy_t)
++	corenet_sendrecv_all_packets(privoxy_t)
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.6.12/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/procmail.te	2009-04-23 09:44:57.000000000 -0400
@@ -22219,7 +22284,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.12/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-28 11:39:57.000000000 -0400
 @@ -118,6 +118,9 @@
  
  fs_getattr_all_fs(squid_t)
@@ -29430,8 +29495,13 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-23 09:44:57.000000000 -0400
-@@ -5,227 +5,6 @@
++++ serefpolicy-3.6.12/policy/modules/system/unconfined.te	2009-04-28 09:51:35.000000000 -0400
+@@ -1,231 +1,9 @@
+ 
+-policy_module(unconfined, 3.0.0)
++policy_module(unconfined, 3.0.1)
+ 
+ ########################################
  #
  # Declarations
  #
@@ -29444,7 +29514,7 @@ diff -b -B --ignore-all-space --exclude-
 -userdom_manage_home_role(unconfined_r, unconfined_t)
 -userdom_manage_tmp_role(unconfined_r, unconfined_t)
 -userdom_manage_tmpfs_role(unconfined_r, unconfined_t)
- 
+-
 -type unconfined_exec_t;
 -init_system_domain(unconfined_t, unconfined_exec_t)
 -


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -p -r1.845 -r1.846
--- selinux-policy.spec	28 Apr 2009 15:13:22 -0000	1.845
+++ selinux-policy.spec	28 Apr 2009 15:49:48 -0000	1.846
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -314,7 +314,8 @@ SELinux Reference policy targeted base m
 function get_unconfined() {
 # We only want to upgrade unconfined.pp and unconfineduser if they are 
 # currently installed.  If you have a version 3.0.0 or less of unconfined 
-# installed, you will need to install both.
+# installed, you will need to install both, since unconfineduser did not exist 
+# prior to this.
 both="unconfined.pp.bz2 unconfineduser.pp.bz2"
 packages=""
 ctr=0
@@ -338,11 +339,11 @@ if [ $ctr -lt 2 -a "$version" != "" ]; t
 	packages=$both
     else
         if [ $f1 -eq  3 ]; then
-		f2=`echo $version | cut -s -d. -f2`
-		f3=`echo $version | cut -s -d. -f3`
-		if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
-		    packages=$both
-		fi
+	    f2=`echo $version | cut -s -d. -f2`
+	    f3=`echo $version | cut -s -d. -f3`
+	    if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
+	        packages=$both
+	    fi
 	fi
     fi
 fi
@@ -479,6 +480,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-23
+- Fix uml files to be owned by users
+
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-22
 - Fix Upgrade path to install unconfineduser.pp when unocnfined package is 3.0.0 or less
 



From vcrhonek at fedoraproject.org  Tue Apr 28 15:50:46 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Tue, 28 Apr 2009 15:50:46 +0000 (UTC)
Subject: rpms/tcsh/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tcsh.spec,
	1.60, 1.61 tcsh-6.14.00-config.patch, 1.1,
	NONE tcsh-6.14.00-octal.patch, 1.1, NONE tcsh-6.14.00-read.patch,
	1.1, NONE tcsh-6.14.00-remotehost.patch, 1.1,
	NONE tcsh-6.14.00-sigint.patch, 1.1,
	NONE tcsh-6.14.00-spell-crash.patch, 1.1,
	NONE tcsh-6.15.00-var-sub.patch, 1.2, NONE
Message-ID: <20090428155046.F41E670129@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9419

Modified Files:
	.cvsignore sources tcsh.spec 
Removed Files:
	tcsh-6.14.00-config.patch tcsh-6.14.00-octal.patch 
	tcsh-6.14.00-read.patch tcsh-6.14.00-remotehost.patch 
	tcsh-6.14.00-sigint.patch tcsh-6.14.00-spell-crash.patch 
	tcsh-6.15.00-var-sub.patch 
Log Message:
Update to tcsh-6.16.00, Merge Review


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Aug 2007 15:01:35 -0000	1.7
+++ .cvsignore	28 Apr 2009 15:50:16 -0000	1.8
@@ -1,2 +1,3 @@
 tcsh-6.14.00.tar.gz
 tcsh-6.15.00.tar.gz
+tcsh-6.16.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Aug 2007 15:01:35 -0000	1.7
+++ sources	28 Apr 2009 15:50:16 -0000	1.8
@@ -1 +1 @@
-67a0611620b080bd0eb032b1774382b6  tcsh-6.15.00.tar.gz
+55f1a41512250168ec4bf1db0e246db4  tcsh-6.16.00.tar.gz


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- tcsh.spec	2 Mar 2009 14:11:52 -0000	1.60
+++ tcsh.spec	28 Apr 2009 15:50:16 -0000	1.61
@@ -2,21 +2,19 @@
 
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
-Version: 6.15
-Release: 8%{?dist}
-License: BSD with advertising
+Version: 6.16
+Release: 1%{?dist}
+License: BSD
 Group: System Environment/Shells
-Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
+Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
 Patch1: tcsh-6.15.00-closem.patch
 Patch2: tcsh-6.14.00-tinfo.patch
 Patch3: tcsh-6.14.00-unprintable.patch
 Patch4: tcsh-6.15.00-hist-sub.patch
-Patch5: tcsh-6.15.00-var-sub.patch
 Patch6: tcsh-6.15.00-ca-color.patch
 Patch7: tcsh-6.14.00-set.patch
 Patch8: tcsh-6.14.00-syntax.patch
 Patch9: tcsh-6.13.00-memoryuse.patch
-Patch10: tcsh-6.14.00-octal.patch
 Patch11: tcsh-6.14.00-order.patch
 Patch12: tcsh-6.15.00-wide-str.patch
 Patch13: tcsh-6.15.00-rs-color.patch
@@ -41,28 +39,31 @@ like syntax.
 %patch2 -p1 -b .tinfo
 %patch3 -p1 -b .unprintable
 %patch4 -p1 -b .hist-sub
-%patch5 -p1 -b .var-sub
 %patch6 -p1 -b .ca-color
 %patch7 -p1 -b .set
 %patch8 -p1 -b .syntax
 %patch9 -p1 -b .memoryuse
-%patch10 -p1 -b .octal
 %patch11 -p1 -b .order
 %patch12 -p1 -b .wide-str
 %patch13 -p1 -b .rs-color
 
+for i in Fixes WishList; do
+    iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
+    mv "${i}_" "$i"
+done
+
 %build
 # For tcsh-6.14.00-tinfo.patch
 autoreconf
 %configure --without-hesiod
-make all
-make -C nls catalogs
+make %{?_smp_mflags} all
+make %{?_smp_mflags} -C nls catalogs
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir}
-install -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
-install -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1
+install -p -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
+install -p -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1
 ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh
 ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1
 
@@ -70,7 +71,7 @@ while read lang language ; do
 	dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES
 	if test -f tcsh.$language.cat ; then
 		mkdir -p $dest
-		install -m644 tcsh.$language.cat $dest/tcsh
+		install -p -m 644 tcsh.$language.cat $dest/tcsh
 		echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
 	fi
 done > tcsh.lang << _EOF
@@ -89,34 +90,41 @@ uk ukrainian
 _EOF
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ ! -f /etc/shells ]; then
-	echo "%{_bindir}/tcsh" >> /etc/shells
-	echo "%{_bindir}/csh"  >> /etc/shells
+ echo "%{_bindir}/tcsh" >> /etc/shells
+ echo "%{_bindir}/csh"  >> /etc/shells
 else
-	grep -q '^%{_bindir}/tcsh$' /etc/shells || \
-	echo "%{_bindir}/tcsh" >> /etc/shells
-	grep -q '^%{_bindir}/csh$'  /etc/shells || \
-	echo "%{_bindir}/csh"  >> /etc/shells
+ grep -q '^%{_bindir}/tcsh$' /etc/shells || \
+ echo "%{_bindir}/tcsh" >> /etc/shells
+ grep -q '^%{_bindir}/csh$'  /etc/shells || \
+ echo "%{_bindir}/csh"  >> /etc/shells
 fi
 
 %postun
 if [ ! -x %{_bindir}/tcsh ]; then
-	grep -v '^%{_bindir}/tcsh$'  /etc/shells | \
-	grep -v '^%{_bindir}/csh$' > /etc/shells.rpm
-	cat /etc/shells.rpm > /etc/shells && rm /etc/shells.rpm
+ grep -v '^%{_bindir}/tcsh$'  /etc/shells | \
+ grep -v '^%{_bindir}/csh$' > /etc/shells.rpm && \
+ mv /etc/shells.rpm /etc/shells
 fi
 
 %files -f tcsh.lang
 %defattr(-,root,root)
-%doc FAQ Fixes NewThings complete.tcsh
+%doc BUGS FAQ Fixes NewThings WishList complete.tcsh
 %{_bindir}/tcsh
 %{_bindir}/csh
-%{_mandir}/*/*
+%{_mandir}/man1/*.1*
 
 %changelog
+* Tue Apr 28 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.16-1
+- Update to tcsh-6.16.00
+- Merge Review (fix License, add BUGS and WishList to documentation, convert Fixes and
+  WishList to UTF-8, remove root checking from buildroot cleaning, preserve timestamps,
+  use smp_flags, remove unused patches and improve postun script)
+  Resolves: #226483
+
 * Mon Mar  2 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-8
 - Fix tcsh needs to know about new colorls variables
   Resolves: #487783


--- tcsh-6.14.00-config.patch DELETED ---


--- tcsh-6.14.00-octal.patch DELETED ---


--- tcsh-6.14.00-read.patch DELETED ---


--- tcsh-6.14.00-remotehost.patch DELETED ---


--- tcsh-6.14.00-sigint.patch DELETED ---


--- tcsh-6.14.00-spell-crash.patch DELETED ---


--- tcsh-6.15.00-var-sub.patch DELETED ---



From rmeggins at fedoraproject.org  Tue Apr 28 15:55:52 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 28 Apr 2009 15:55:52 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-10 fedora-ds-base-cvs.sh, 1.10,
	1.11 fedora-ds-base.spec, 1.30, 1.31 sources, 1.20, 1.21
Message-ID: <20090428155552.A48BC70129@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10346/F-10

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
final release 1.2.0
Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
VS: ----------------------------------------------------------------------



Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base-cvs.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
+++ fedora-ds-base-cvs.sh	28 Apr 2009 15:55:22 -0000	1.11
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC2
+CVSTAG=FedoraDirSvr_1_2_0
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/fedora-ds-base.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.30
+++ fedora-ds-base.spec	28 Apr 2009 15:55:22 -0000	1.31
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -169,6 +169,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Apr 28 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-4
+- final release 1.2.0
+- Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
+- Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
+- CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
+
 * Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
 - re-enable ppc builds
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Apr 2009 18:14:33 -0000	1.20
+++ sources	28 Apr 2009 15:55:22 -0000	1.21
@@ -1 +1 @@
-2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2
+1ef45901d3c3479ad767877a7663324e  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Tue Apr 28 15:55:53 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 28 Apr 2009 15:55:53 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-11 fedora-ds-base-cvs.sh, 1.10,
	1.11 fedora-ds-base.spec, 1.30, 1.31 sources, 1.20,
	1.21 bug463991-bdb47.patch, 1.3, NONE
Message-ID: <20090428155553.1FCD670129@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10346/F-11

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Removed Files:
	bug463991-bdb47.patch 
Log Message:
final release 1.2.0
Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
VS: ----------------------------------------------------------------------



Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-11/fedora-ds-base-cvs.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
+++ fedora-ds-base-cvs.sh	28 Apr 2009 15:55:22 -0000	1.11
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC2
+CVSTAG=FedoraDirSvr_1_2_0
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-11/fedora-ds-base.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.30
+++ fedora-ds-base.spec	28 Apr 2009 15:55:22 -0000	1.31
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -169,6 +169,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Apr 28 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-4
+- final release 1.2.0
+- Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
+- Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
+- CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
+
 * Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
 - re-enable ppc builds
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Apr 2009 18:14:33 -0000	1.20
+++ sources	28 Apr 2009 15:55:22 -0000	1.21
@@ -1 +1 @@
-2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2
+1ef45901d3c3479ad767877a7663324e  fedora-ds-base-1.2.0.tar.bz2


--- bug463991-bdb47.patch DELETED ---



From rmeggins at fedoraproject.org  Tue Apr 28 15:55:53 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 28 Apr 2009 15:55:53 +0000 (UTC)
Subject: rpms/fedora-ds-base/F-9 fedora-ds-base-cvs.sh, 1.10,
	1.11 fedora-ds-base.spec, 1.24, 1.25 sources, 1.20, 1.21
Message-ID: <20090428155553.87D4870129@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10346/F-9

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
final release 1.2.0
Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
VS: ----------------------------------------------------------------------



Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base-cvs.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
+++ fedora-ds-base-cvs.sh	28 Apr 2009 15:55:23 -0000	1.11
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC2
+CVSTAG=FedoraDirSvr_1_2_0
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/fedora-ds-base.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.24
+++ fedora-ds-base.spec	28 Apr 2009 15:55:23 -0000	1.25
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -169,6 +169,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Apr 28 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-4
+- final release 1.2.0
+- Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
+- Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
+- CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
+
 * Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
 - re-enable ppc builds
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Apr 2009 18:14:33 -0000	1.20
+++ sources	28 Apr 2009 15:55:23 -0000	1.21
@@ -1 +1 @@
-2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2
+1ef45901d3c3479ad767877a7663324e  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Tue Apr 28 15:55:54 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 28 Apr 2009 15:55:54 +0000 (UTC)
Subject: rpms/fedora-ds-base/FC-6 .cvsignore, 1.9, 1.10 fedora-ds-base-cvs.sh,
	1.8, 1.9 fedora-ds-base.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20090428155554.1B6CF70129@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10346/FC-6

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
final release 1.2.0
Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
VS: ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Sep 2008 22:30:23 -0000	1.9
+++ .cvsignore	28 Apr 2009 15:55:23 -0000	1.10
@@ -1,4 +1 @@
-fedora-ds-base-1.1.0.tar.bz2
-fedora-ds-base-1.1.1.tar.bz2
-fedora-ds-base-1.1.2.tar.bz2
-fedora-ds-base-1.1.3.tar.bz2
+fedora-ds-base-1.2.0.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base-cvs.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fedora-ds-base-cvs.sh	23 Sep 2008 22:30:23 -0000	1.8
+++ fedora-ds-base-cvs.sh	28 Apr 2009 15:55:23 -0000	1.9
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_1_3
-VERSION=1.1.3
+CVSTAG=FedoraDirSvr_1_2_0
+VERSION=1.2.0
 PKGNAME=fedora-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fedora-ds-base.spec	1 Apr 2009 19:55:10 -0000	1.16
+++ fedora-ds-base.spec	28 Apr 2009 15:55:23 -0000	1.17
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -166,6 +166,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Apr 28 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-2
+- final release 1.2.0
+- Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
+- Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
+- CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
+
 * Mon Mar 30 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-1
 - new release 1.2.0
 - Made devel package depend on mozldap-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	31 Oct 2008 15:39:15 -0000	1.14
+++ sources	28 Apr 2009 15:55:23 -0000	1.15
@@ -1 +1 @@
-65aeecb66a6977f7f4706569d02ad8ce  fedora-ds-base-1.1.3.tar.bz2
+1ef45901d3c3479ad767877a7663324e  fedora-ds-base-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Tue Apr 28 15:55:54 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 28 Apr 2009 15:55:54 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel fedora-ds-base-cvs.sh, 1.10,
	1.11 fedora-ds-base.spec, 1.30, 1.31 sources, 1.20, 1.21
Message-ID: <20090428155554.AD17070129@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10346/devel

Modified Files:
	fedora-ds-base-cvs.sh fedora-ds-base.spec sources 
Log Message:
final release 1.2.0
Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
VS: ----------------------------------------------------------------------



Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base-cvs.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-ds-base-cvs.sh	6 Apr 2009 17:37:35 -0000	1.10
+++ fedora-ds-base-cvs.sh	28 Apr 2009 15:55:24 -0000	1.11
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr_1_2_0_RC2
+CVSTAG=FedoraDirSvr_1_2_0
 VERSION=1.2.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fedora-ds-base.spec	6 Apr 2009 17:37:35 -0000	1.30
+++ fedora-ds-base.spec	28 Apr 2009 15:55:24 -0000	1.31
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.2.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -169,6 +169,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Apr 28 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-4
+- final release 1.2.0
+- Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer
+- Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389
+- CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428
+
 * Mon Apr  6 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-3
 - re-enable ppc builds
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Apr 2009 18:14:33 -0000	1.20
+++ sources	28 Apr 2009 15:55:24 -0000	1.21
@@ -1 +1 @@
-2be585eddc042f09d96d6ed905d44e89  fedora-ds-base-1.2.0.tar.bz2
+1ef45901d3c3479ad767877a7663324e  fedora-ds-base-1.2.0.tar.bz2



From limb at fedoraproject.org  Tue Apr 28 16:26:10 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 28 Apr 2009 16:26:10 +0000 (UTC)
Subject: rpms/gallery2/devel gallery2.spec,1.24,1.25
Message-ID: <20090428162610.F2D7370132@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18556

Modified Files:
	gallery2.spec 
Log Message:
pretrans script logic fix. BZ498019



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gallery2.spec	16 Apr 2009 17:39:16 -0000	1.24
+++ gallery2.spec	28 Apr 2009 16:25:40 -0000	1.25
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -735,6 +735,8 @@ rm -rf ${RPM_BUILD_ROOT}
 #symlink to system smarty
 if [ -d /usr/share/gallery2/lib/smarty ]; then
   rm -rf /usr/share/gallery2/lib/smarty
+fi
+if [ ! -e /usr/share/gallery2/lib/smarty ]; then
   ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
 fi
 
@@ -1096,6 +1098,9 @@ echo and follow the instructions there t
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Tue Apr 28 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-8
+- pretrans script logic fix. BZ498019.
+
 * Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
 - Drop all jars and remote, uploadapplet and slideshowapplet modules
 - to satisfy legal requirements, as source build would be



From limb at fedoraproject.org  Tue Apr 28 16:29:02 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 28 Apr 2009 16:29:02 +0000 (UTC)
Subject: rpms/gallery2/F-11 gallery2.spec,1.24,1.25
Message-ID: <20090428162902.4595A70129@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20110

Modified Files:
	gallery2.spec 
Log Message:
pretrans script logic fix. BZ498019



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-11/gallery2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gallery2.spec	21 Apr 2009 13:05:36 -0000	1.24
+++ gallery2.spec	28 Apr 2009 16:28:31 -0000	1.25
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -735,6 +735,8 @@ rm -rf ${RPM_BUILD_ROOT}
 #symlink to system smarty
 if [ -d /usr/share/gallery2/lib/smarty ]; then
   rm -rf /usr/share/gallery2/lib/smarty
+fi
+if [ ! -e /usr/share/gallery2/lib/smarty ]; then
   ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
 fi
 
@@ -1096,6 +1098,9 @@ echo and follow the instructions there t
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Tue Apr 28 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-8
+- pretrans script logic fix. BZ498019.
+
 * Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
 - Drop all jars and remote, uploadapplet and slideshowapplet modules
 - to satisfy legal requirements, as source build would be



From limb at fedoraproject.org  Tue Apr 28 16:33:30 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 28 Apr 2009 16:33:30 +0000 (UTC)
Subject: rpms/gallery2/F-10 gallery2.spec,1.21,1.22
Message-ID: <20090428163331.053B070129@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21321

Modified Files:
	gallery2.spec 
Log Message:
pretrans script logic fix. BZ498019



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gallery2.spec	21 Apr 2009 13:08:59 -0000	1.21
+++ gallery2.spec	28 Apr 2009 16:33:00 -0000	1.22
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -735,6 +735,8 @@ rm -rf ${RPM_BUILD_ROOT}
 #symlink to system smarty
 if [ -d /usr/share/gallery2/lib/smarty ]; then
   rm -rf /usr/share/gallery2/lib/smarty
+fi
+if [ ! -e /usr/share/gallery2/lib/smarty ]; then
   ln -s ../../php/Smarty /usr/share/gallery2/lib/smarty
 fi
 
@@ -1096,6 +1098,9 @@ echo and follow the instructions there t
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Tue Apr 28 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-8
+- pretrans script logic fix. BZ498019.
+
 * Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
 - Drop all jars and remote, uploadapplet and slideshowapplet modules
 - to satisfy legal requirements, as source build would be



From cwickert at fedoraproject.org  Tue Apr 28 16:35:28 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 28 Apr 2009 16:35:28 +0000 (UTC)
Subject: rpms/menu-cache/devel .cvsignore, 1.4, 1.5 menu-cache.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090428163528.BD8E870129@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/menu-cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22018

Modified Files:
	.cvsignore menu-cache.spec sources 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5-1
- Update to 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Apr 2009 17:42:35 -0000	1.4
+++ .cvsignore	28 Apr 2009 16:35:26 -0000	1.5
@@ -1 +1 @@
-menu-cache-0.2.4.tar.gz
+menu-cache-0.2.5.tar.gz


Index: menu-cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/devel/menu-cache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- menu-cache.spec	20 Apr 2009 17:42:35 -0000	1.6
+++ menu-cache.spec	28 Apr 2009 16:35:26 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           menu-cache
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Caching mechanism for freedesktop.org compliant menus
 
@@ -56,10 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 #FIXME: add ChangeLog and NEWS if there is content
 %doc AUTHORS COPYING README
-%{_bindir}/menu-cache-gen
+%{_libexecdir}/menu-cache-gen
 %{_libexecdir}/menu-cached
 %{_libdir}/libmenu-cache.so.*
-%{_mandir}/man*/*.gz
+#%{_mandir}/man*/*.gz
 
 
 %files devel
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5-1
+- Update to 0.2.5
+
 * Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
 - Update to 0.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Apr 2009 17:42:35 -0000	1.4
+++ sources	28 Apr 2009 16:35:26 -0000	1.5
@@ -1 +1 @@
-945b058433c3f5e921547e13ae30dd41  menu-cache-0.2.4.tar.gz
+4537aba7abb379d5a055b2da5adb51bd  menu-cache-0.2.5.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 28 17:01:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 17:01:42 +0000
Subject: [pkgdb] kdebase-workspace: ltinkl has requested watchbugzilla
Message-ID: <20090428170143.0BF3510F894@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Apr 28 17:01:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 17:01:43 +0000
Subject: [pkgdb] kdebase-workspace: ltinkl has requested watchcommits
Message-ID: <20090428170143.E094F10F897@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Apr 28 17:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 17:01:45 +0000
Subject: [pkgdb] kdebase-workspace: ltinkl has requested commit
Message-ID: <20090428170145.7838410F89B@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pingou at fedoraproject.org  Tue Apr 28 17:04:41 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:04:41 +0000 (UTC)
Subject: rpms/R-IRanges/F-10 R-IRanges.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090428170441.A3F3770129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29428/F-10

Modified Files:
	R-IRanges.spec sources 
Log Message:
update to 1.2.0


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-10/R-IRanges.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- R-IRanges.spec	6 Apr 2009 08:16:10 -0000	1.1
+++ R-IRanges.spec	28 Apr 2009 17:04:11 -0000	1.2
@@ -2,7 +2,7 @@
 %global packname  IRanges
 
 Name:             R-%{packname}
-Version:          1.1.55
+Version:          1.2.0
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
 - New release from bioconductor 2.4 which includes the change in
  the description file for the license used


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Apr 2009 08:16:10 -0000	1.2
+++ sources	28 Apr 2009 17:04:11 -0000	1.3
@@ -1 +1 @@
-5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz
+8238de000879adfc6aaa761b2dbfb6f9  IRanges_1.2.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:04:41 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:04:41 +0000 (UTC)
Subject: rpms/R-IRanges/F-11 R-IRanges.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090428170441.E3CDC70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29428/F-11

Modified Files:
	R-IRanges.spec sources 
Log Message:
update to 1.2.0


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-11/R-IRanges.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- R-IRanges.spec	6 Apr 2009 08:14:26 -0000	1.1
+++ R-IRanges.spec	28 Apr 2009 17:04:11 -0000	1.2
@@ -2,7 +2,7 @@
 %global packname  IRanges
 
 Name:             R-%{packname}
-Version:          1.1.55
+Version:          1.2.0
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
 - New release from bioconductor 2.4 which includes the change in
  the description file for the license used


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Apr 2009 08:14:26 -0000	1.2
+++ sources	28 Apr 2009 17:04:11 -0000	1.3
@@ -1 +1 @@
-5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz
+8238de000879adfc6aaa761b2dbfb6f9  IRanges_1.2.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:04:42 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:04:42 +0000 (UTC)
Subject: rpms/R-IRanges/F-9 R-IRanges.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090428170442.4725B70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29428/F-9

Modified Files:
	R-IRanges.spec sources 
Log Message:
update to 1.2.0


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-9/R-IRanges.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- R-IRanges.spec	6 Apr 2009 08:17:40 -0000	1.1
+++ R-IRanges.spec	28 Apr 2009 17:04:11 -0000	1.2
@@ -2,7 +2,7 @@
 %global packname  IRanges
 
 Name:             R-%{packname}
-Version:          1.1.55
+Version:          1.2.0
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
 - New release from bioconductor 2.4 which includes the change in
  the description file for the license used


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Apr 2009 08:17:40 -0000	1.2
+++ sources	28 Apr 2009 17:04:11 -0000	1.3
@@ -1 +1 @@
-5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz
+8238de000879adfc6aaa761b2dbfb6f9  IRanges_1.2.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:04:42 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:04:42 +0000 (UTC)
Subject: rpms/R-IRanges/devel .cvsignore, 1.2, 1.3 R-IRanges.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090428170442.93AE170129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29428/devel

Modified Files:
	.cvsignore R-IRanges.spec sources 
Log Message:
update to 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Apr 2009 08:14:26 -0000	1.2
+++ .cvsignore	28 Apr 2009 17:04:12 -0000	1.3
@@ -1 +1 @@
-IRanges_1.1.55.tar.gz
+IRanges_1.2.0.tar.gz


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/R-IRanges.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- R-IRanges.spec	6 Apr 2009 08:14:26 -0000	1.1
+++ R-IRanges.spec	28 Apr 2009 17:04:12 -0000	1.2
@@ -2,7 +2,7 @@
 %global packname  IRanges
 
 Name:             R-%{packname}
-Version:          1.1.55
+Version:          1.2.0
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Wed Apr 01 2009 pingou <pingou at pingoured.fr> 1.1.55-1
 - New release from bioconductor 2.4 which includes the change in
  the description file for the license used


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Apr 2009 08:14:26 -0000	1.2
+++ sources	28 Apr 2009 17:04:12 -0000	1.3
@@ -1 +1 @@
-5f61e96f68c755fc1a1d1333560a7e38  IRanges_1.1.55.tar.gz
+8238de000879adfc6aaa761b2dbfb6f9  IRanges_1.2.0.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 28 17:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 17:06:15 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090428170616.52EFB10F886@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-workspace (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Apr 28 17:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 17:06:17 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090428170617.B754F10F897@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-workspace (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Tue Apr 28 17:06:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 17:06:19 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090428170619.9DF5B10F89A@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase-workspace (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pingou at fedoraproject.org  Tue Apr 28 17:12:45 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:12:45 +0000 (UTC)
Subject: rpms/R-Biobase/F-10 R-Biobase.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20090428171245.1893670129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31842/F-10

Modified Files:
	R-Biobase.spec sources 
Log Message:
Update to 2.4.0


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-10/R-Biobase.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-Biobase.spec	18 Feb 2009 13:51:01 -0000	1.8
+++ R-Biobase.spec	28 Apr 2009 17:12:14 -0000	1.9
@@ -1,10 +1,10 @@
 %define packname  Biobase
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.2.2 
-Release:          1%{?dist}
+Version:          2.4.0 
+Release:          2%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
 
@@ -90,6 +90,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.4.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 pingou <pingou-at-pingoured.fr> 2.2.2-1
 - New update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Feb 2009 13:51:02 -0000	1.7
+++ sources	28 Apr 2009 17:12:14 -0000	1.8
@@ -1 +1 @@
-170167ed68f621b4cfdc2b748bd9d304  Biobase_2.2.2.tar.gz
+532ac389d9fa7b5605bd6278e8bc09e5  Biobase_2.4.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:12:45 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:12:45 +0000 (UTC)
Subject: rpms/R-Biobase/F-9 R-Biobase.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <20090428171245.A9E2570129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31842/F-9

Modified Files:
	R-Biobase.spec sources 
Log Message:
Update to 2.4.0


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-9/R-Biobase.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-Biobase.spec	18 Feb 2009 13:51:02 -0000	1.7
+++ R-Biobase.spec	28 Apr 2009 17:12:15 -0000	1.8
@@ -1,10 +1,10 @@
 %define packname  Biobase
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.2.2 
-Release:          1%{?dist}
+Version:          2.4.0 
+Release:          2%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
 
@@ -90,6 +90,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.4.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 pingou <pingou-at-pingoured.fr> 2.2.2-1
 - New update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Feb 2009 13:51:02 -0000	1.6
+++ sources	28 Apr 2009 17:12:15 -0000	1.7
@@ -1 +1 @@
-170167ed68f621b4cfdc2b748bd9d304  Biobase_2.2.2.tar.gz
+532ac389d9fa7b5605bd6278e8bc09e5  Biobase_2.4.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:12:46 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:12:46 +0000 (UTC)
Subject: rpms/R-Biobase/devel .cvsignore, 1.7, 1.8 R-Biobase.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20090428171246.0234A70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31842/devel

Modified Files:
	.cvsignore R-Biobase.spec sources 
Log Message:
Update to 2.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Feb 2009 13:46:00 -0000	1.7
+++ .cvsignore	28 Apr 2009 17:12:15 -0000	1.8
@@ -1 +1 @@
-Biobase_2.2.2.tar.gz
+Biobase_2.4.0.tar.gz


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/R-Biobase.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-Biobase.spec	23 Feb 2009 22:46:31 -0000	1.10
+++ R-Biobase.spec	28 Apr 2009 17:12:15 -0000	1.11
@@ -1,9 +1,9 @@
 %define packname  Biobase
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.2.2 
+Version:          2.4.0 
 Release:          2%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.4.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Feb 2009 13:46:00 -0000	1.7
+++ sources	28 Apr 2009 17:12:15 -0000	1.8
@@ -1 +1 @@
-170167ed68f621b4cfdc2b748bd9d304  Biobase_2.2.2.tar.gz
+532ac389d9fa7b5605bd6278e8bc09e5  Biobase_2.4.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:12:45 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:12:45 +0000 (UTC)
Subject: rpms/R-Biobase/F-11 R-Biobase.spec,1.10,1.11 sources,1.7,1.8
Message-ID: <20090428171245.5E66370129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31842/F-11

Modified Files:
	R-Biobase.spec sources 
Log Message:
Update to 2.4.0


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-11/R-Biobase.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-Biobase.spec	23 Feb 2009 22:46:31 -0000	1.10
+++ R-Biobase.spec	28 Apr 2009 17:12:15 -0000	1.11
@@ -1,9 +1,9 @@
 %define packname  Biobase
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.2.2 
+Version:          2.4.0 
 Release:          2%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.4.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Feb 2009 13:46:00 -0000	1.7
+++ sources	28 Apr 2009 17:12:15 -0000	1.8
@@ -1 +1 @@
-170167ed68f621b4cfdc2b748bd9d304  Biobase_2.2.2.tar.gz
+532ac389d9fa7b5605bd6278e8bc09e5  Biobase_2.4.0.tar.gz



From ltinkl at fedoraproject.org  Tue Apr 28 17:13:46 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 17:13:46 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.2.3-plasma-notifications.patch, NONE,
	1.1 kdebase-workspace.spec, 1.215, 1.216
Message-ID: <20090428171346.CE7AF7013C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/F-11

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.3-plasma-notifications.patch 
Log Message:
#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1


kdebase-workspace-4.2.3-plasma-notifications.patch:

--- NEW FILE kdebase-workspace-4.2.3-plasma-notifications.patch ---
--- workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:55:05	960131
+++ workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:56:05	960132
@@ -174,7 +174,7 @@
         layout->addItem(button);
     }
 
-    layout->updateGeometry();
+    actionsWidget->adjustSize();
     actionsWidget->setPos(q->size().width() - actionsWidget->size().width(),
                           q->size().width() - actionsWidget->size().height());
 }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- kdebase-workspace.spec	22 Apr 2009 10:35:11 -0000	1.215
+++ kdebase-workspace.spec	28 Apr 2009 17:13:16 -0000	1.216
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -46,6 +46,10 @@ Patch103: kdebase-workspace-4.2.0-kde#18
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
 # http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
 Patch106: kdebase-workspace-4.2.2-kde#187699.patch
+#??#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1
+#??(https://bugs.kde.org/show_bug.cgi?id=190786)
+Patch107: kdebase-workspace-4.2.3-plasma-notifications.patch
+
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -241,7 +245,7 @@ popd
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
 %patch106 -p1 -b .kde#187699
-
+%patch107 -p1 -b .plasma-notifications
 
 %build
 
@@ -516,6 +520,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-5
+- #497657 -  kpackagekit/kopete notification misrendering/missing 
+  buttons with qt-4.5.1
+
 * Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - dropp unused BR on libraw1394, it breaks the build on s390(x)
 



From ltinkl at fedoraproject.org  Tue Apr 28 17:13:46 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 17:13:46 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.3-plasma-notifications.patch, NONE,
	1.1 kdebase-workspace.spec, 1.171, 1.172
Message-ID: <20090428171346.7D43170129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.3-plasma-notifications.patch 
Log Message:
#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1


kdebase-workspace-4.2.3-plasma-notifications.patch:

--- NEW FILE kdebase-workspace-4.2.3-plasma-notifications.patch ---
--- workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:55:05	960131
+++ workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:56:05	960132
@@ -174,7 +174,7 @@
         layout->addItem(button);
     }
 
-    layout->updateGeometry();
+    actionsWidget->adjustSize();
     actionsWidget->setPos(q->size().width() - actionsWidget->size().width(),
                           q->size().width() - actionsWidget->size().height());
 }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- kdebase-workspace.spec	12 Apr 2009 19:23:13 -0000	1.171
+++ kdebase-workspace.spec	28 Apr 2009 17:13:16 -0000	1.172
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 3%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -46,6 +46,10 @@ Patch103: kdebase-workspace-4.2.0-kde#18
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
 # http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
 Patch106: kdebase-workspace-4.2.2-kde#187699.patch
+#??#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1
+#??(https://bugs.kde.org/show_bug.cgi?id=190786)
+Patch107: kdebase-workspace-4.2.3-plasma-notifications.patch
+
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -72,7 +76,6 @@ BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
-BuildRequires: libraw1394-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
@@ -242,7 +245,7 @@ popd
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
 %patch106 -p1 -b .kde#187699
-
+%patch107 -p1 -b .plasma-notifications
 
 %build
 
@@ -255,8 +258,8 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
-#  -k || make -C %{_target_platform}
+# FIXME: not smp-safe?
+make -C %{_target_platform}
 
 
 %install
@@ -369,6 +372,9 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
+%if 0%{?have_bluez3}
+%{_kde4_appsdir}/solidfakebluetoothbackend/
+%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 
@@ -514,6 +520,13 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-5
+- #497657 -  kpackagekit/kopete notification misrendering/missing 
+  buttons with qt-4.5.1
+
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- dropp unused BR on libraw1394, it breaks the build on s390(x)
+
 * Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
 



From ltinkl at fedoraproject.org  Tue Apr 28 17:13:47 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 17:13:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.2.3-plasma-notifications.patch, NONE,
	1.1 kdebase-workspace.spec, 1.147, 1.148
Message-ID: <20090428171347.249CB70129@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/F-9

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.3-plasma-notifications.patch 
Log Message:
#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1


kdebase-workspace-4.2.3-plasma-notifications.patch:

--- NEW FILE kdebase-workspace-4.2.3-plasma-notifications.patch ---
--- workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:55:05	960131
+++ workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:56:05	960132
@@ -174,7 +174,7 @@
         layout->addItem(button);
     }
 
-    layout->updateGeometry();
+    actionsWidget->adjustSize();
     actionsWidget->setPos(q->size().width() - actionsWidget->size().width(),
                           q->size().width() - actionsWidget->size().height());
 }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdebase-workspace.spec	13 Apr 2009 00:23:36 -0000	1.147
+++ kdebase-workspace.spec	28 Apr 2009 17:13:16 -0000	1.148
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 3%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -46,6 +46,10 @@ Patch103: kdebase-workspace-4.2.0-kde#18
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
 # http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
 Patch106: kdebase-workspace-4.2.2-kde#187699.patch
+#??#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1
+#??(https://bugs.kde.org/show_bug.cgi?id=190786)
+Patch107: kdebase-workspace-4.2.3-plasma-notifications.patch
+
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -72,7 +76,6 @@ BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
-BuildRequires: libraw1394-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
@@ -242,7 +245,7 @@ popd
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
 %patch106 -p1 -b .kde#187699
-
+%patch107 -p1 -b .plasma-notifications
 
 %build
 
@@ -255,7 +258,7 @@ pushd %{_target_platform}
   ..
 popd
 
-# not smp-safe?
+# FIXME: not smp-safe?
 make -C %{_target_platform}
 
 
@@ -517,6 +520,13 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-5
+- #497657 -  kpackagekit/kopete notification misrendering/missing 
+  buttons with qt-4.5.1
+
+* Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- dropp unused BR on libraw1394, it breaks the build on s390(x)
+
 * Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
 



From ltinkl at fedoraproject.org  Tue Apr 28 17:13:47 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 28 Apr 2009 17:13:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.3-plasma-notifications.patch, NONE,
	1.1 kdebase-workspace.spec, 1.215, 1.216
Message-ID: <20090428171347.9811E7013F@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.3-plasma-notifications.patch 
Log Message:
#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1


kdebase-workspace-4.2.3-plasma-notifications.patch:

--- NEW FILE kdebase-workspace-4.2.3-plasma-notifications.patch ---
--- workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:55:05	960131
+++ workspace/plasma/applets/systemtray/ui/notificationwidget.cpp	2009/04/27 23:56:05	960132
@@ -174,7 +174,7 @@
         layout->addItem(button);
     }
 
-    layout->updateGeometry();
+    actionsWidget->adjustSize();
     actionsWidget->setPos(q->size().width() - actionsWidget->size().width(),
                           q->size().width() - actionsWidget->size().height());
 }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- kdebase-workspace.spec	22 Apr 2009 09:50:41 -0000	1.215
+++ kdebase-workspace.spec	28 Apr 2009 17:13:17 -0000	1.216
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -46,6 +46,10 @@ Patch103: kdebase-workspace-4.2.0-kde#18
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
 # http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
 Patch106: kdebase-workspace-4.2.2-kde#187699.patch
+#??#497657 -  kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1
+#??(https://bugs.kde.org/show_bug.cgi?id=190786)
+Patch107: kdebase-workspace-4.2.3-plasma-notifications.patch
+
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -241,7 +245,7 @@ popd
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
 %patch106 -p1 -b .kde#187699
-
+%patch107 -p1 -b .plasma-notifications
 
 %build
 
@@ -516,6 +520,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-5
+- #497657 -  kpackagekit/kopete notification misrendering/missing 
+  buttons with qt-4.5.1
+
 * Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - dropp unused BR on libraw1394, it breaks the build on s390(x)
 



From mnagy at fedoraproject.org  Tue Apr 28 17:14:32 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 28 Apr 2009 17:14:32 +0000 (UTC)
Subject: rpms/bind/devel bind-96-dyndb.patch,1.7,1.8
Message-ID: <20090428171432.CBDD170129@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32664

Modified Files:
	bind-96-dyndb.patch 
Log Message:
* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
- update the patch for dynamic loading of database backends
- create %{_libdir}/bind directory


bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bind-96-dyndb.patch	27 Apr 2009 19:35:39 -0000	1.7
+++ bind-96-dyndb.patch	28 Apr 2009 17:14:02 -0000	1.8
@@ -1,5 +1,3 @@
-diff --git a/bin/named/main.c b/bin/named/main.c
-index aa6575a..aed2a55 100644
 --- a/bin/named/main.c
 +++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
@@ -19,11 +17,9 @@ index aa6575a..aed2a55 100644
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 31b2761..7670f1a 100644
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
-@@ -56,6 +56,7 @@
+@@ -57,6 +57,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -31,7 +27,7 @@ index 31b2761..7670f1a 100644
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
  }
  
  static isc_result_t
@@ -104,7 +100,7 @@ index 31b2761..7670f1a 100644
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -112,7 +108,7 @@ index 31b2761..7670f1a 100644
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1171,6 +1239,37 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+@@ -1189,6 +1257,37 @@ configure_view(dns_view_t *view, const c
  #endif
  
  	/*
@@ -147,10 +143,10 @@ index 31b2761..7670f1a 100644
 +	}
 +
 +	/*
- 	 * Configure the view's cache.  Try to reuse an existing
- 	 * cache if possible, otherwise create a new cache.
- 	 * Note that the ADB is not preserved in either case.
-@@ -2903,6 +3002,7 @@ load_configuration(const char *filename, ns_server_t *server,
+ 	 * Obtain configuration parameters that affect the decision of whether
+ 	 * we can reuse/share an existing cache.
+ 	 */
+@@ -2942,6 +3041,7 @@ load_configuration(const char *filename,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
  
@@ -158,7 +154,7 @@ index 31b2761..7670f1a 100644
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4140,6 +4240,8 @@ loadconfig(ns_server_t *server) {
+@@ -4185,6 +4285,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -167,8 +163,6 @@ index 31b2761..7670f1a 100644
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
-index ef5c12a..97cc9fa 100644
 --- a/lib/dns/Makefile.in
 +++ b/lib/dns/Makefile.in
 @@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
@@ -202,9 +196,6 @@ index ef5c12a..97cc9fa 100644
  libdns. at SA@: ${OBJS}
  	${AR} ${ARFLAGS} $@ ${OBJS}
  	${RANLIB} $@
-diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
-new file mode 100644
-index 0000000..25afaf5
 --- /dev/null
 +++ b/lib/dns/dynamic_db.c
 @@ -0,0 +1,364 @@
@@ -572,8 +563,6 @@ index 0000000..25afaf5
 +
 +	return args->timermgr;
 +}
-diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
-index e9e049e..27fdc45 100644
 --- a/lib/dns/include/dns/Makefile.in
 +++ b/lib/dns/include/dns/Makefile.in
 @@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
@@ -585,9 +574,6 @@ index e9e049e..27fdc45 100644
  		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
  		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
  		message.h name.h ncache.h \
-diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
-new file mode 100644
-index 0000000..7b1c1ce
 --- /dev/null
 +++ b/lib/dns/include/dns/dynamic_db.h
 @@ -0,0 +1,50 @@
@@ -641,11 +627,9 @@ index 0000000..7b1c1ce
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
-index 5adcedd..e171028 100644
 --- a/lib/dns/include/dns/log.h
 +++ b/lib/dns/include/dns/log.h
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -653,11 +637,9 @@ index 5adcedd..e171028 100644
  
  ISC_LANG_BEGINDECLS
  
-diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
-index 5223397..f434188 100644
 --- a/lib/dns/include/dns/types.h
 +++ b/lib/dns/include/dns/types.h
-@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable_t;
+@@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
  typedef struct dns_dlzdb			dns_dlzdb_t;
@@ -665,11 +647,9 @@ index 5223397..f434188 100644
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff --git a/lib/dns/log.c b/lib/dns/log.c
-index 7551e15..b9864eb 100644
 --- a/lib/dns/log.c
 +++ b/lib/dns/log.c
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -677,8 +657,6 @@ index 7551e15..b9864eb 100644
  	{ NULL, 		0 }
  };
  
-diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 0610489..a1dba32 100644
 --- a/lib/isccfg/namedconf.c
 +++ b/lib/isccfg/namedconf.c
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
@@ -697,7 +675,7 @@ index 0610489..a1dba32 100644
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };
  



From pingou at fedoraproject.org  Tue Apr 28 17:16:54 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:16:54 +0000 (UTC)
Subject: rpms/R-DynDoc/F-10 R-DynDoc.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090428171654.B667D70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-DynDoc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv819/F-10

Modified Files:
	R-DynDoc.spec sources 
Log Message:
Update to 1.22.0


Index: R-DynDoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/F-10/R-DynDoc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-DynDoc.spec	27 Oct 2008 19:43:11 -0000	1.5
+++ R-DynDoc.spec	28 Apr 2009 17:16:24 -0000	1.6
@@ -1,9 +1,9 @@
 %define packname  DynDoc
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
+Version:          1.22.0 
 Release:          1%{?dist}
 Summary:          Functions for dynamic documents
 
@@ -68,6 +68,12 @@ test -d %{packname}/src && (cd %{packnam
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.20.0-1
 - Update to version 1.20.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 19:43:11 -0000	1.5
+++ sources	28 Apr 2009 17:16:24 -0000	1.6
@@ -1 +1 @@
-ad1f2bb27ff7de95f10d8b4d62cfd972  DynDoc_1.20.0.tar.gz
+63866f71f5ecf104da9a52bb0e3264e1  DynDoc_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:16:55 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:16:55 +0000 (UTC)
Subject: rpms/R-DynDoc/F-9 R-DynDoc.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090428171655.677657013F@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-DynDoc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv819/F-9

Modified Files:
	R-DynDoc.spec sources 
Log Message:
Update to 1.22.0


Index: R-DynDoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/F-9/R-DynDoc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-DynDoc.spec	26 Nov 2008 20:58:33 -0000	1.8
+++ R-DynDoc.spec	28 Apr 2009 17:16:25 -0000	1.9
@@ -1,9 +1,9 @@
 %define packname  DynDoc
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
+Version:          1.22.0 
 Release:          1%{?dist}
 Summary:          Functions for dynamic documents
 
@@ -68,6 +68,12 @@ test -d %{packname}/src && (cd %{packnam
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.20.0-1
 - Update to version 1.20.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Nov 2008 20:58:33 -0000	1.5
+++ sources	28 Apr 2009 17:16:25 -0000	1.6
@@ -1 +1 @@
-ad1f2bb27ff7de95f10d8b4d62cfd972  DynDoc_1.20.0.tar.gz
+63866f71f5ecf104da9a52bb0e3264e1  DynDoc_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:16:56 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:16:56 +0000 (UTC)
Subject: rpms/R-DynDoc/devel .cvsignore, 1.5, 1.6 R-DynDoc.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090428171656.1CF9570129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-DynDoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv819/devel

Modified Files:
	.cvsignore R-DynDoc.spec sources 
Log Message:
Update to 1.22.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 19:43:11 -0000	1.5
+++ .cvsignore	28 Apr 2009 17:16:25 -0000	1.6
@@ -1 +1 @@
-DynDoc_1.20.0.tar.gz
+DynDoc_1.22.0.tar.gz


Index: R-DynDoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/devel/R-DynDoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-DynDoc.spec	23 Feb 2009 22:50:27 -0000	1.6
+++ R-DynDoc.spec	28 Apr 2009 17:16:25 -0000	1.7
@@ -1,10 +1,10 @@
 %define packname  DynDoc
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
-Release:          2%{?dist}
+Version:          1.22.0 
+Release:          1%{?dist}
 Summary:          Functions for dynamic documents
 
 Group:            Applications/Productivity
@@ -68,6 +68,9 @@ test -d %{packname}/src && (cd %{packnam
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 19:43:11 -0000	1.5
+++ sources	28 Apr 2009 17:16:25 -0000	1.6
@@ -1 +1 @@
-ad1f2bb27ff7de95f10d8b4d62cfd972  DynDoc_1.20.0.tar.gz
+63866f71f5ecf104da9a52bb0e3264e1  DynDoc_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:16:55 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:16:55 +0000 (UTC)
Subject: rpms/R-DynDoc/F-11 R-DynDoc.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090428171655.091537013C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-DynDoc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv819/F-11

Modified Files:
	R-DynDoc.spec sources 
Log Message:
Update to 1.22.0


Index: R-DynDoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/F-11/R-DynDoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-DynDoc.spec	23 Feb 2009 22:50:27 -0000	1.6
+++ R-DynDoc.spec	28 Apr 2009 17:16:24 -0000	1.7
@@ -1,10 +1,10 @@
 %define packname  DynDoc
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
-Release:          2%{?dist}
+Version:          1.22.0 
+Release:          1%{?dist}
 Summary:          Functions for dynamic documents
 
 Group:            Applications/Productivity
@@ -68,6 +68,9 @@ test -d %{packname}/src && (cd %{packnam
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-DynDoc/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 19:43:11 -0000	1.5
+++ sources	28 Apr 2009 17:16:24 -0000	1.6
@@ -1 +1 @@
-ad1f2bb27ff7de95f10d8b4d62cfd972  DynDoc_1.20.0.tar.gz
+63866f71f5ecf104da9a52bb0e3264e1  DynDoc_1.22.0.tar.gz



From mnagy at fedoraproject.org  Tue Apr 28 17:18:36 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue, 28 Apr 2009 17:18:36 +0000 (UTC)
Subject: rpms/bind/F-11 bind-96-dyndb.patch,1.6,1.7
Message-ID: <20090428171836.F365C70129@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1304

Modified Files:
	bind-96-dyndb.patch 
Log Message:
* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
- update the patch for dynamic loading of database backends
- create %{_libdir}/bind directory


bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/F-11/bind-96-dyndb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bind-96-dyndb.patch	24 Apr 2009 15:30:40 -0000	1.6
+++ bind-96-dyndb.patch	28 Apr 2009 17:18:06 -0000	1.7
@@ -1,6 +1,5 @@
-diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
---- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
-+++ bind-9.6.1b1/bin/named/main.c	2009-04-24 17:09:55.747902371 +0200
+--- a/bin/named/main.c
++++ b/bin/named/main.c
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -18,9 +17,8 @@ diff -up bind-9.6.1b1/bin/named/main.c.d
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
---- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
-+++ bind-9.6.1b1/bin/named/server.c	2009-04-24 17:12:06.467623220 +0200
+--- a/bin/named/server.c
++++ b/bin/named/server.c
 @@ -57,6 +57,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
@@ -110,8 +108,8 @@ diff -up bind-9.6.1b1/bin/named/server.c
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1238,6 +1306,37 @@ configure_view(dns_view_t *view, const c
- 		view->maxncachettl = 7 * 24 * 3600;
+@@ -1189,6 +1257,37 @@ configure_view(dns_view_t *view, const c
+ #endif
  
  	/*
 +	 * Configure dynamic databases.
@@ -145,9 +143,9 @@ diff -up bind-9.6.1b1/bin/named/server.c
 +	}
 +
 +	/*
- 	 * Configure the view's cache.  Try to reuse an existing
- 	 * cache if possible, otherwise create a new cache.
- 	 * Note that the ADB is not preserved in either case.
+ 	 * Obtain configuration parameters that affect the decision of whether
+ 	 * we can reuse/share an existing cache.
+ 	 */
 @@ -2942,6 +3041,7 @@ load_configuration(const char *filename,
  	result = isc_task_beginexclusive(server->task);
  	RUNTIME_CHECK(result == ISC_R_SUCCESS);
@@ -165,10 +163,42 @@ diff -up bind-9.6.1b1/bin/named/server.c
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
---- /dev/null	2009-04-24 12:29:41.524001256 +0200
-+++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-04-24 17:09:55.751902027 +0200
-@@ -0,0 +1,347 @@
+--- a/lib/dns/Makefile.in
++++ b/lib/dns/Makefile.in
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+@@ -114,6 +115,11 @@ version. at O@: version.c
+ 		-DLIBAGE=${LIBAGE} \
+ 		-c ${srcdir}/version.c
+ 
++dynamic_db. at O@: dynamic_db.c
++	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
++	-c ${srcdir}/dynamic_db.c
++
+ libdns. at SA@: ${OBJS}
+ 	${AR} ${ARFLAGS} $@ ${OBJS}
+ 	${RANLIB} $@
+--- /dev/null
++++ b/lib/dns/dynamic_db.c
+@@ -0,0 +1,364 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
 + *
@@ -188,10 +218,12 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +
 +#include <config.h>
 +
++#include <isc/buffer.h>
 +#include <isc/mem.h>
 +#include <isc/mutex.h>
 +#include <isc/once.h>
 +#include <isc/result.h>
++#include <isc/region.h>
 +#include <isc/task.h>
 +#include <isc/types.h>
 +#include <isc/util.h>
@@ -208,6 +240,10 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +#include <dlfcn.h>
 +#endif
 +
++#ifndef DYNDB_LIBDIR
++#define DYNDB_LIBDIR ""
++#endif
++
 +#define CHECK(op)						\
 +	do { result = (op);					\
 +		if (result != ISC_R_SUCCESS) goto cleanup;	\
@@ -280,6 +316,9 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +load_library(isc_mem_t *mctx, const char *filename, dyndb_implementation_t **impp)
 +{
 +	isc_result_t result;
++	size_t module_size;
++	isc_buffer_t *module_buf = NULL;
++	isc_region_t module_region;
 +	void *handle;
 +	dyndb_implementation_t *imp;
 +	register_func_t register_function = NULL;
@@ -287,7 +326,15 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +
 +	REQUIRE(impp != NULL && *impp == NULL);
 +
-+	handle = dlopen(filename, RTLD_LAZY);
++	/* Build up the full path. */
++	module_size = strlen(DYNDB_LIBDIR) + strlen(filename) + 1;
++	CHECK(isc_buffer_allocate(mctx, &module_buf, module_size));
++	isc_buffer_putstr(module_buf, DYNDB_LIBDIR);
++	isc_buffer_putstr(module_buf, filename);
++	isc_buffer_putuint8(module_buf, 0);
++	isc_buffer_region(module_buf, &module_region);
++
++	handle = dlopen((char *)module_region.base, RTLD_LAZY);
 +	if (handle == NULL) {
 +		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
 +			      DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
@@ -318,11 +365,11 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +
 +	*impp = imp;
 +
-+	return ISC_R_SUCCESS;
-+
 +cleanup:
-+	if (handle != NULL)
++	if (result != ISC_R_SUCCESS && handle != NULL)
 +		dlclose(handle);
++	if (module_buf != NULL)
++		isc_buffer_free(&module_buf);
 +
 +	return result;
 +}
@@ -516,9 +563,19 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +
 +	return args->timermgr;
 +}
-diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
---- /dev/null	2009-04-24 12:29:41.524001256 +0200
-+++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-04-24 17:09:55.755932610 +0200
+--- a/lib/dns/include/dns/Makefile.in
++++ b/lib/dns/include/dns/Makefile.in
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+--- /dev/null
++++ b/lib/dns/include/dns/dynamic_db.h
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -570,9 +627,8 @@ diff -up /dev/null bind-9.6.1b1/lib/dns/
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
---- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-04-24 17:09:55.755932610 +0200
+--- a/lib/dns/include/dns/log.h
++++ b/lib/dns/include/dns/log.h
 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
@@ -581,21 +637,8 @@ diff -up bind-9.6.1b1/lib/dns/include/dn
  
  ISC_LANG_BEGINDECLS
  
-diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-04-24 17:09:55.755932610 +0200
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff -up bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb bind-9.6.1b1/lib/dns/include/dns/types.h
---- bind-9.6.1b1/lib/dns/include/dns/types.h.dyndb	2009-01-29 23:40:35.000000000 +0100
-+++ bind-9.6.1b1/lib/dns/include/dns/types.h	2009-04-24 17:09:55.755932610 +0200
+--- a/lib/dns/include/dns/types.h
++++ b/lib/dns/include/dns/types.h
 @@ -56,6 +56,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
@@ -604,9 +647,8 @@ diff -up bind-9.6.1b1/lib/dns/include/dn
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
---- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
-+++ bind-9.6.1b1/lib/dns/log.c	2009-04-24 17:09:55.755932610 +0200
+--- a/lib/dns/log.c
++++ b/lib/dns/log.c
 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
@@ -615,31 +657,8 @@ diff -up bind-9.6.1b1/lib/dns/log.c.dynd
  	{ NULL, 		0 }
  };
  
-diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
---- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-04-24 17:09:55.739922815 +0200
-+++ bind-9.6.1b1/lib/dns/Makefile.in	2009-04-24 17:09:55.751902027 +0200
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
---- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
-+++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-04-24 17:09:55.755932610 +0200
+--- a/lib/isccfg/namedconf.c
++++ b/lib/isccfg/namedconf.c
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;



From pingou at fedoraproject.org  Tue Apr 28 17:27:47 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:27:47 +0000 (UTC)
Subject: rpms/R-GeneR/F-11 R-GeneR.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20090428172747.600757013C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/F-11

Modified Files:
	R-GeneR.spec sources 
Log Message:
Update to 2.14.0


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-11/R-GeneR.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-GeneR.spec	22 Apr 2009 00:41:12 -0000	1.7
+++ R-GeneR.spec	28 Apr 2009 17:27:17 -0000	1.8
@@ -1,10 +1,10 @@
 %global packname  GeneR
 %global bioconductor_release   2.4
-%global Rversion  2.8.0
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.13.1
-Release:          2%{?dist}
+Version:          2.14.0
+Release:          1%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
@@ -12,7 +12,7 @@ License:          CeCILL
 URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
 Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 Patch0:           %{name}-gcc44.patch
-# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22
+# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22 -- by Milos
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
 - Fix FTBFS: added R-GeneR-gcc44.patch.
 - Do not override the release macro.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Mar 2009 08:33:53 -0000	1.4
+++ sources	28 Apr 2009 17:27:17 -0000	1.5
@@ -1 +1 @@
-f36cb321fdb656afe0a2b22c8e6c298a  GeneR_2.13.1.tar.gz
+35dc1e200bc00acc70da4c3c1ea8d43e  GeneR_2.14.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:27:47 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:27:47 +0000 (UTC)
Subject: rpms/R-GeneR/F-10 R-GeneR.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090428172747.439C870129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/F-10

Modified Files:
	R-GeneR.spec sources 
Log Message:
Update to 2.14.0


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-10/R-GeneR.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-GeneR.spec	27 Oct 2008 19:56:34 -0000	1.3
+++ R-GeneR.spec	28 Apr 2009 17:27:16 -0000	1.4
@@ -1,16 +1,18 @@
-%define packname  GeneR
-%define release   2.3
-%define Rversion  2.8.0
+%global packname  GeneR
+%global bioconductor_release   2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.0
+Version:          2.14.0
 Release:          1%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
-URL:              http://www.bioconductor.org/packages/%{release}/bioc/html/%{packname}.html
-Source0:          http://www.bioconductor.org/packages/%{release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
+Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Patch0:           %{name}-gcc44.patch
+# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22 -- by Milos
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -23,6 +25,7 @@ Package manipulating nucleotidic sequenc
 
 %prep
 %setup -q -c -n %{packname}
+%patch0
 
 %build
 
@@ -87,6 +90,20 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
+- Fix FTBFS: added R-GeneR-gcc44.patch.
+- Do not override the release macro.
+- Use %%global instead of %%define.
+
+* Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 2.13.1-1
+- Update to 2.13.1 from the devel version of bioconductor
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008  pingou <pingou at pingoured.fr> 2.12.0-1
 - New version 2.12.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Oct 2008 19:56:34 -0000	1.3
+++ sources	28 Apr 2009 17:27:16 -0000	1.4
@@ -1 +1 @@
-380222186fab91529e6b734d99590422  GeneR_2.12.0.tar.gz
+35dc1e200bc00acc70da4c3c1ea8d43e  GeneR_2.14.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:27:48 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:27:48 +0000 (UTC)
Subject: rpms/R-GeneR/devel .cvsignore, 1.4, 1.5 R-GeneR.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090428172748.01A8C70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/devel

Modified Files:
	.cvsignore R-GeneR.spec sources 
Log Message:
Update to 2.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Mar 2009 08:33:53 -0000	1.4
+++ .cvsignore	28 Apr 2009 17:27:17 -0000	1.5
@@ -1 +1 @@
-GeneR_2.13.1.tar.gz
+GeneR_2.14.0.tar.gz


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/devel/R-GeneR.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-GeneR.spec	22 Apr 2009 00:41:14 -0000	1.7
+++ R-GeneR.spec	28 Apr 2009 17:27:17 -0000	1.8
@@ -1,10 +1,10 @@
 %global packname  GeneR
 %global bioconductor_release   2.4
-%global Rversion  2.8.0
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.13.1
-Release:          2%{?dist}
+Version:          2.14.0
+Release:          1%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
@@ -12,7 +12,7 @@ License:          CeCILL
 URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
 Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 Patch0:           %{name}-gcc44.patch
-# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22
+# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22 -- by Milos
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
 - Fix FTBFS: added R-GeneR-gcc44.patch.
 - Do not override the release macro.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Mar 2009 08:33:53 -0000	1.4
+++ sources	28 Apr 2009 17:27:17 -0000	1.5
@@ -1 +1 @@
-f36cb321fdb656afe0a2b22c8e6c298a  GeneR_2.13.1.tar.gz
+35dc1e200bc00acc70da4c3c1ea8d43e  GeneR_2.14.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:27:47 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:27:47 +0000 (UTC)
Subject: rpms/R-GeneR/F-9 R-GeneR.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090428172747.AF74C70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3056/F-9

Modified Files:
	R-GeneR.spec sources 
Log Message:
Update to 2.14.0


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-9/R-GeneR.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-GeneR.spec	22 Jan 2009 14:56:04 -0000	1.5
+++ R-GeneR.spec	28 Apr 2009 17:27:17 -0000	1.6
@@ -1,16 +1,18 @@
-%define packname  GeneR
-%define release   2.3
-%define Rversion  2.8.0
+%global packname  GeneR
+%global bioconductor_release   2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.0
+Version:          2.14.0
 Release:          1%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
-URL:              http://www.bioconductor.org/packages/%{release}/bioc/html/%{packname}.html
-Source0:          http://www.bioconductor.org/packages/%{release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
+Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Patch0:           %{name}-gcc44.patch
+# Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22 -- by Milos
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R >= %{Rversion}
@@ -23,6 +25,7 @@ Package manipulating nucleotidic sequenc
 
 %prep
 %setup -q -c -n %{packname}
+%patch0
 
 %build
 
@@ -87,6 +90,20 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Tue Apr 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.13.1-2
+- Fix FTBFS: added R-GeneR-gcc44.patch.
+- Do not override the release macro.
+- Use %%global instead of %%define.
+
+* Tue Mar 31 2009 pingou <pingou at pingoured.fr> - 2.13.1-1
+- Update to 2.13.1 from the devel version of bioconductor
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008  pingou <pingou at pingoured.fr> 2.12.0-1
 - New version 2.12.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jan 2009 14:56:04 -0000	1.3
+++ sources	28 Apr 2009 17:27:17 -0000	1.4
@@ -1 +1 @@
-380222186fab91529e6b734d99590422  GeneR_2.12.0.tar.gz
+35dc1e200bc00acc70da4c3c1ea8d43e  GeneR_2.14.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:34:29 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:34:29 +0000 (UTC)
Subject: rpms/R-multtest/F-10 R-multtest.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090428173429.9178370129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-multtest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4992/F-10

Modified Files:
	R-multtest.spec sources 
Log Message:
Update to 2.0.0


Index: R-multtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/F-10/R-multtest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-multtest.spec	27 Oct 2008 20:20:01 -0000	1.6
+++ R-multtest.spec	28 Apr 2009 17:33:59 -0000	1.7
@@ -1,9 +1,9 @@
-%define packname  multtest
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  multtest
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.22.0 
+Version:          2.0.0 
 Release:          1%{?dist}
 Summary:          Multiple hypothesis testing library from Bioconductor
 Summary(fr):      Bibliothe que R de test multi-hypoth??ses
@@ -92,6 +92,13 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 %{_libdir}/R/library/%{packname}/otherDocs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.0.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Use global instead of define
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.22.0-1
 - New version 1.22.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:20:01 -0000	1.4
+++ sources	28 Apr 2009 17:33:59 -0000	1.5
@@ -1 +1 @@
-997710696fedf54119bd9f0d7359132b  multtest_1.22.0.tar.gz
+d4d7358d06de5a7e80330327a56fab3e  multtest_2.0.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:34:30 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:34:30 +0000 (UTC)
Subject: rpms/R-multtest/F-11 R-multtest.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20090428173430.628E270129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-multtest/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4992/F-11

Modified Files:
	R-multtest.spec sources 
Log Message:
Update to 2.0.0


Index: R-multtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/F-11/R-multtest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-multtest.spec	23 Feb 2009 23:05:41 -0000	1.7
+++ R-multtest.spec	28 Apr 2009 17:33:59 -0000	1.8
@@ -1,10 +1,10 @@
-%define packname  multtest
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  multtest
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.22.0 
-Release:          2%{?dist}
+Version:          2.0.0 
+Release:          1%{?dist}
 Summary:          Multiple hypothesis testing library from Bioconductor
 Summary(fr):      Bibliothe que R de test multi-hypoth??ses
 
@@ -92,6 +92,10 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 %{_libdir}/R/library/%{packname}/otherDocs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.0.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Use global instead of define
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:20:01 -0000	1.4
+++ sources	28 Apr 2009 17:33:59 -0000	1.5
@@ -1 +1 @@
-997710696fedf54119bd9f0d7359132b  multtest_1.22.0.tar.gz
+d4d7358d06de5a7e80330327a56fab3e  multtest_2.0.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:34:31 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:34:31 +0000 (UTC)
Subject: rpms/R-multtest/devel .cvsignore, 1.4, 1.5 R-multtest.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090428173431.63E5470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-multtest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4992/devel

Modified Files:
	.cvsignore R-multtest.spec sources 
Log Message:
Update to 2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 20:20:01 -0000	1.4
+++ .cvsignore	28 Apr 2009 17:34:00 -0000	1.5
@@ -1 +1 @@
-multtest_1.22.0.tar.gz
+multtest_2.0.0.tar.gz


Index: R-multtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/devel/R-multtest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-multtest.spec	23 Feb 2009 23:05:41 -0000	1.7
+++ R-multtest.spec	28 Apr 2009 17:34:00 -0000	1.8
@@ -1,10 +1,10 @@
-%define packname  multtest
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  multtest
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.22.0 
-Release:          2%{?dist}
+Version:          2.0.0 
+Release:          1%{?dist}
 Summary:          Multiple hypothesis testing library from Bioconductor
 Summary(fr):      Bibliothe que R de test multi-hypoth??ses
 
@@ -92,6 +92,10 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 %{_libdir}/R/library/%{packname}/otherDocs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.0.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Use global instead of define
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:20:01 -0000	1.4
+++ sources	28 Apr 2009 17:34:00 -0000	1.5
@@ -1 +1 @@
-997710696fedf54119bd9f0d7359132b  multtest_1.22.0.tar.gz
+d4d7358d06de5a7e80330327a56fab3e  multtest_2.0.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:34:30 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:34:30 +0000 (UTC)
Subject: rpms/R-multtest/F-9 R-multtest.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090428173430.9FB0070129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-multtest/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4992/F-9

Modified Files:
	R-multtest.spec sources 
Log Message:
Update to 2.0.0


Index: R-multtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/F-9/R-multtest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-multtest.spec	26 Nov 2008 21:06:01 -0000	1.5
+++ R-multtest.spec	28 Apr 2009 17:34:00 -0000	1.6
@@ -1,9 +1,9 @@
-%define packname  multtest
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  multtest
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.22.0 
+Version:          2.0.0 
 Release:          1%{?dist}
 Summary:          Multiple hypothesis testing library from Bioconductor
 Summary(fr):      Bibliothe que R de test multi-hypoth??ses
@@ -92,6 +92,13 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 %{_libdir}/R/library/%{packname}/otherDocs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.0.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Use global instead of define
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.22.0-1
 - New version 1.22.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multtest/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2008 21:06:01 -0000	1.4
+++ sources	28 Apr 2009 17:34:00 -0000	1.5
@@ -1 +1 @@
-997710696fedf54119bd9f0d7359132b  multtest_1.22.0.tar.gz
+d4d7358d06de5a7e80330327a56fab3e  multtest_2.0.0.tar.gz



From simo at fedoraproject.org  Tue Apr 28 17:38:15 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 28 Apr 2009 17:38:15 +0000 (UTC)
Subject: rpms/sssd/F-11
	0001-Use-different-attribute-for-cached-passwords-change.patch, NONE, 
	1.1 0001-Use-different-attribute-for-cached-passwords.patch,
	NONE, 1.1 sssd.spec, 1.13, 1.14
Message-ID: <20090428173815.C5C4270129@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5882

Modified Files:
	sssd.spec 
Added Files:
	0001-Use-different-attribute-for-cached-passwords-change.patch 
	0001-Use-different-attribute-for-cached-passwords.patch 
Log Message:
* Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1
- Add patches to fix password caching


0001-Use-different-attribute-for-cached-passwords-change.patch:

--- NEW FILE 0001-Use-different-attribute-for-cached-passwords-change.patch ---
>From 11d01e05e08a9acf11af9aea96910b4795627082 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Tue, 28 Apr 2009 10:20:55 +0200
Subject: [PATCH] Use different attribute for cached passwords change time

---
 server/responder/pam/pamsrv_cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/responder/pam/pamsrv_cache.c b/server/responder/pam/pamsrv_cache.c
index 5e492a5..302f70c 100644
--- a/server/responder/pam/pamsrv_cache.c
+++ b/server/responder/pam/pamsrv_cache.c
@@ -153,7 +153,7 @@ int pam_cache_credentials(struct pam_auth_req *preq)
     if (ret) goto done;
 
     /* FIXME: should we use a different attribute for chache passwords ?? */
-    ret = sysdb_attrs_add_long(ctx->attrs, "lastPasswordChange",
+    ret = sysdb_attrs_add_long(ctx->attrs, "lastCachedPasswordChange",
                                (long)time(NULL));
     if (ret) goto done;
 
@@ -256,7 +256,7 @@ int pam_cache_auth(struct pam_auth_req *preq)
                                   SYSDB_CACHEDPWD,
                                   SYSDB_DISABLED,
                                   SYSDB_LAST_LOGIN,
-                                  "lastPasswordChange",
+                                  "lastCachedPasswordChange",
                                   "accountExpires",
                                   "failedLoginAttempts",
                                   "lastFailedLogin",
-- 
1.6.0.6


0001-Use-different-attribute-for-cached-passwords.patch:

--- NEW FILE 0001-Use-different-attribute-for-cached-passwords.patch ---
>From c4f46b40e2f55abd9ae2296fd68daa88bd60e32f Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce at redhat.com>
Date: Mon, 27 Apr 2009 18:21:25 -0400
Subject: [PATCH] Use different attribute for cached passwords

This fixes a bug with legacy backends where the cached password would be cleared
on a user update.
Using a different attribute we make sure a userPassword coming from the remote
backend does not interfere with a cachedPassword (and vice versa).
---
 server/db/sysdb.h                   |    2 ++
 server/responder/pam/pamsrv_cache.c |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/db/sysdb.h b/server/db/sysdb.h
index df49bc7..7bfe1fd 100644
--- a/server/db/sysdb.h
+++ b/server/db/sysdb.h
@@ -63,6 +63,8 @@
 
 #define SYSDB_LAST_UPDATE "lastUpdate"
 
+#define SYSDB_CACHEDPWD "cachedPassword"
+
 #define SYSDB_NEXTID_FILTER "("SYSDB_NEXTID"=*)"
 
 #define SYSDB_UC "objectclass="SYSDB_USER_CLASS
diff --git a/server/responder/pam/pamsrv_cache.c b/server/responder/pam/pamsrv_cache.c
index 10f4199..154c7d1 100644
--- a/server/responder/pam/pamsrv_cache.c
+++ b/server/responder/pam/pamsrv_cache.c
@@ -149,7 +149,7 @@ int pam_cache_credentials(struct pam_auth_req *preq)
         goto done;
     }
 
-    ret = sysdb_attrs_add_string(ctx->attrs, SYSDB_PWD, comphash);
+    ret = sysdb_attrs_add_string(ctx->attrs, SYSDB_CACHEDPWD, comphash);
     if (ret) goto done;
 
     /* FIXME: should we use a different attribute for chache passwords ?? */
@@ -219,7 +219,7 @@ static void pam_cache_auth_callback(void *pvt, int ldb_status,
         goto done;
     }
 
-    userhash = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_PWD, NULL);
+    userhash = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_CACHEDPWD, NULL);
     if (userhash == NULL || *userhash == '\0') {
         DEBUG(4, ("Cached credentials not available.\n"));
         ret = PAM_AUTHINFO_UNAVAIL;
@@ -253,7 +253,7 @@ int pam_cache_auth(struct pam_auth_req *preq)
     int ret;
 
     static const char *attrs[] = {SYSDB_NAME,
-                                  SYSDB_PWD,
+                                  SYSDB_CACHEDPWD,
                                   SYSDB_DISABLED,
                                   SYSDB_LAST_LOGIN,
                                   "lastPasswordChange",
-- 
1.6.0.6



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sssd.spec	27 Apr 2009 21:39:33 -0000	1.13
+++ sssd.spec	28 Apr 2009 17:37:45 -0000	1.14
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.3
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -13,6 +13,8 @@ Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
+Patch1: 0001-Use-different-attribute-for-cached-passwords.patch
+Patch2: 0001-Use-different-attribute-for-cached-passwords-change.patch
 
 ### Dependencies ###
 
@@ -51,6 +53,8 @@ services for projects like FreeIPA.
 %prep
 %setup -q
 
+%patch1 -p 1 -b .pwd-attr
+%patch2 -p 1 -b .pwd-cache-attr
 
 %build
 
@@ -139,6 +143,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1
+- Add patches to fix password caching
+
 * Mon Apr 27 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-0
 - Version 0.3.3
 



From rstrode at fedoraproject.org  Tue Apr 28 17:38:44 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 28 Apr 2009 17:38:44 +0000 (UTC)
Subject: rpms/gdm/F-11 gdm-2.26.1-multistack.patch, 1.2, 1.3 gdm.spec, 1.466,
	1.467
Message-ID: <20090428173844.81E1D70129@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6018

Modified Files:
	gdm-2.26.1-multistack.patch gdm.spec 
Log Message:
- fix crash at shutdown


gdm-2.26.1-multistack.patch:

Index: gdm-2.26.1-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm-2.26.1-multistack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdm-2.26.1-multistack.patch	22 Apr 2009 14:21:38 -0000	1.2
+++ gdm-2.26.1-multistack.patch	28 Apr 2009 17:38:43 -0000	1.3
@@ -6381,7 +6381,7 @@ index 0f7e44e..e5296a4 100644
  {
          g_debug ("GdmSessionDirect: Worker job exited: %d", code);
  
-+        g_object_ref (conversation);
++        g_object_ref (conversation->job);
          if (!conversation->session->priv->is_authenticated) {
                  char *msg;
  
@@ -6393,7 +6393,7 @@ index 0f7e44e..e5296a4 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation);
++        g_object_unref (conversation->job);
  }
  
  static void
@@ -6401,7 +6401,7 @@ index 0f7e44e..e5296a4 100644
  {
          g_debug ("GdmSessionDirect: Worker job died: %d", signum);
  
-+        g_object_ref (conversation);
++        g_object_ref (conversation->job);
          if (!conversation->session->priv->is_authenticated) {
                  char *msg;
  
@@ -6413,7 +6413,7 @@ index 0f7e44e..e5296a4 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation);
++        g_object_unref (conversation->job);
  }
  
  static GdmSessionConversation *


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- gdm.spec	25 Apr 2009 00:55:02 -0000	1.466
+++ gdm.spec	28 Apr 2009 17:38:44 -0000	1.467
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -385,6 +385,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Apr 28 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-5
+- fix crash at shutdown
+
 * Fri Apr 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-4
 - Make the greeter a well-behaved session client (#495738)
 



From pingou at fedoraproject.org  Tue Apr 28 17:40:07 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:40:07 +0000 (UTC)
Subject: rpms/R-tkWidgets/F-10 R-tkWidgets.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090428174007.6AAC470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-tkWidgets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6273/F-10

Modified Files:
	R-tkWidgets.spec sources 
Log Message:
Update to 1.22.0


Index: R-tkWidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/F-10/R-tkWidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-tkWidgets.spec	27 Oct 2008 20:26:07 -0000	1.5
+++ R-tkWidgets.spec	28 Apr 2009 17:39:36 -0000	1.6
@@ -1,14 +1,14 @@
-%define packname  tkWidgets
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  tkWidgets
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
+Version:          1.22.0 
 Release:          1%{?dist}
 Summary:          Widgets to provide user interfaces from bioconductor
 
 Group:            Applications/Productivity
-License:          LGPLv2+
+License:          Artistic 2.0
 URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/tkWidgets.html
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +71,14 @@ test -d %{packname}/src && (cd %{packnam
 %{_datadir}/R/library/%{packname}/man
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Uses global instead of define
+- Change the license from LGPLv2+ to Artistic 2.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.20.0-1
 - Update to 1.20.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:26:07 -0000	1.4
+++ sources	28 Apr 2009 17:39:36 -0000	1.5
@@ -1 +1 @@
-d06662dd44feeec2f9870b96b515c98b  tkWidgets_1.20.0.tar.gz
+62a8735b908f27c8b305abd810e7718f  tkWidgets_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:40:07 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:40:07 +0000 (UTC)
Subject: rpms/R-tkWidgets/F-11 R-tkWidgets.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090428174007.8F44470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-tkWidgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6273/F-11

Modified Files:
	R-tkWidgets.spec sources 
Log Message:
Update to 1.22.0


Index: R-tkWidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/F-11/R-tkWidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-tkWidgets.spec	23 Feb 2009 23:12:07 -0000	1.6
+++ R-tkWidgets.spec	28 Apr 2009 17:39:36 -0000	1.7
@@ -1,14 +1,14 @@
-%define packname  tkWidgets
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  tkWidgets
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
-Release:          2%{?dist}
+Version:          1.22.0 
+Release:          1%{?dist}
 Summary:          Widgets to provide user interfaces from bioconductor
 
 Group:            Applications/Productivity
-License:          LGPLv2+
+License:          Artistic 2.0
 URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/tkWidgets.html
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +71,11 @@ test -d %{packname}/src && (cd %{packnam
 %{_datadir}/R/library/%{packname}/man
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Uses global instead of define
+- Change the license from LGPLv2+ to Artistic 2.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:26:07 -0000	1.4
+++ sources	28 Apr 2009 17:39:36 -0000	1.5
@@ -1 +1 @@
-d06662dd44feeec2f9870b96b515c98b  tkWidgets_1.20.0.tar.gz
+62a8735b908f27c8b305abd810e7718f  tkWidgets_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:40:07 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:40:07 +0000 (UTC)
Subject: rpms/R-tkWidgets/F-9 R-tkWidgets.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090428174007.AC31C70132@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-tkWidgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6273/F-9

Modified Files:
	R-tkWidgets.spec sources 
Log Message:
Update to 1.22.0


Index: R-tkWidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/F-9/R-tkWidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-tkWidgets.spec	26 Nov 2008 21:21:35 -0000	1.5
+++ R-tkWidgets.spec	28 Apr 2009 17:39:37 -0000	1.6
@@ -1,14 +1,14 @@
-%define packname  tkWidgets
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  tkWidgets
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
+Version:          1.22.0 
 Release:          1%{?dist}
 Summary:          Widgets to provide user interfaces from bioconductor
 
 Group:            Applications/Productivity
-License:          LGPLv2+
+License:          Artistic 2.0
 URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/tkWidgets.html
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +71,14 @@ test -d %{packname}/src && (cd %{packnam
 %{_datadir}/R/library/%{packname}/man
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Uses global instead of define
+- Change the license from LGPLv2+ to Artistic 2.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.20.0-1
 - Update to 1.20.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2008 21:21:35 -0000	1.4
+++ sources	28 Apr 2009 17:39:37 -0000	1.5
@@ -1 +1 @@
-d06662dd44feeec2f9870b96b515c98b  tkWidgets_1.20.0.tar.gz
+62a8735b908f27c8b305abd810e7718f  tkWidgets_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:40:08 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:40:08 +0000 (UTC)
Subject: rpms/R-tkWidgets/devel .cvsignore, 1.4, 1.5 R-tkWidgets.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <20090428174008.113DB70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-tkWidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6273/devel

Modified Files:
	.cvsignore R-tkWidgets.spec sources 
Log Message:
Update to 1.22.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 20:26:07 -0000	1.4
+++ .cvsignore	28 Apr 2009 17:39:37 -0000	1.5
@@ -1 +1 @@
-tkWidgets_1.20.0.tar.gz
+tkWidgets_1.22.0.tar.gz


Index: R-tkWidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/devel/R-tkWidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-tkWidgets.spec	23 Feb 2009 23:12:07 -0000	1.6
+++ R-tkWidgets.spec	28 Apr 2009 17:39:37 -0000	1.7
@@ -1,14 +1,14 @@
-%define packname  tkWidgets
-%define bioc      2.3
-%define Rversion  2.8.0
+%global packname  tkWidgets
+%global bioc      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0 
-Release:          2%{?dist}
+Version:          1.22.0 
+Release:          1%{?dist}
 Summary:          Widgets to provide user interfaces from bioconductor
 
 Group:            Applications/Productivity
-License:          LGPLv2+
+License:          Artistic 2.0
 URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/tkWidgets.html
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +71,11 @@ test -d %{packname}/src && (cd %{packnam
 %{_datadir}/R/library/%{packname}/man
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+- Uses global instead of define
+- Change the license from LGPLv2+ to Artistic 2.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-tkWidgets/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:26:07 -0000	1.4
+++ sources	28 Apr 2009 17:39:37 -0000	1.5
@@ -1 +1 @@
-d06662dd44feeec2f9870b96b515c98b  tkWidgets_1.20.0.tar.gz
+62a8735b908f27c8b305abd810e7718f  tkWidgets_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:43:26 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:43:26 +0000 (UTC)
Subject: rpms/R-widgetTools/F-10 R-widgetTools.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090428174326.D8E3570129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-widgetTools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6940/F-10

Modified Files:
	R-widgetTools.spec sources 
Log Message:
Update to 1.22.0


Index: R-widgetTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/F-10/R-widgetTools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-widgetTools.spec	27 Oct 2008 20:31:42 -0000	1.8
+++ R-widgetTools.spec	28 Apr 2009 17:42:56 -0000	1.9
@@ -1,9 +1,9 @@
-%define packname  widgetTools
-%define BioC      2.3
-%define Rversion  2.8.0
+%global packname  widgetTools
+%global BioC      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.18.0 
+Version:          1.22.0 
 Release:          1%{?dist}
 Summary:          Bioconductor tools to support tcltk widgets
 
@@ -70,6 +70,12 @@ chmod -x %{packname}/inst/doc/widget.pdf
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.18.0-1
 - Update to version 1.18.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 20:31:42 -0000	1.5
+++ sources	28 Apr 2009 17:42:56 -0000	1.6
@@ -1 +1 @@
-91cc70c3fe5318fdfa30d0451d0227f9  widgetTools_1.18.0.tar.gz
+bad0073267039ae54e704abcc7f9052d  widgetTools_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:43:27 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:43:27 +0000 (UTC)
Subject: rpms/R-widgetTools/F-11 R-widgetTools.spec, 1.9, 1.10 sources, 1.5,
	1.6
Message-ID: <20090428174327.0C94170129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-widgetTools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6940/F-11

Modified Files:
	R-widgetTools.spec sources 
Log Message:
Update to 1.22.0


Index: R-widgetTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/F-11/R-widgetTools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-widgetTools.spec	23 Feb 2009 23:14:51 -0000	1.9
+++ R-widgetTools.spec	28 Apr 2009 17:42:56 -0000	1.10
@@ -1,10 +1,10 @@
-%define packname  widgetTools
-%define BioC      2.3
-%define Rversion  2.8.0
+%global packname  widgetTools
+%global BioC      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.18.0 
-Release:          2%{?dist}
+Version:          1.22.0 
+Release:          1%{?dist}
 Summary:          Bioconductor tools to support tcltk widgets
 
 Group:            Applications/Productivity
@@ -70,6 +70,9 @@ chmod -x %{packname}/inst/doc/widget.pdf
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 20:31:42 -0000	1.5
+++ sources	28 Apr 2009 17:42:56 -0000	1.6
@@ -1 +1 @@
-91cc70c3fe5318fdfa30d0451d0227f9  widgetTools_1.18.0.tar.gz
+bad0073267039ae54e704abcc7f9052d  widgetTools_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:43:27 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:43:27 +0000 (UTC)
Subject: rpms/R-widgetTools/F-9 R-widgetTools.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090428174327.72AA470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-widgetTools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6940/F-9

Modified Files:
	R-widgetTools.spec sources 
Log Message:
Update to 1.22.0


Index: R-widgetTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/F-9/R-widgetTools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-widgetTools.spec	26 Nov 2008 21:14:59 -0000	1.8
+++ R-widgetTools.spec	28 Apr 2009 17:42:57 -0000	1.9
@@ -1,9 +1,9 @@
-%define packname  widgetTools
-%define BioC      2.3
-%define Rversion  2.8.0
+%global packname  widgetTools
+%global BioC      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.18.0 
+Version:          1.22.0 
 Release:          1%{?dist}
 Summary:          Bioconductor tools to support tcltk widgets
 
@@ -70,6 +70,12 @@ chmod -x %{packname}/inst/doc/widget.pdf
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.18.0-1
 - Update to version 1.18.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Nov 2008 21:14:59 -0000	1.5
+++ sources	28 Apr 2009 17:42:57 -0000	1.6
@@ -1 +1 @@
-91cc70c3fe5318fdfa30d0451d0227f9  widgetTools_1.18.0.tar.gz
+bad0073267039ae54e704abcc7f9052d  widgetTools_1.22.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 17:43:27 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 17:43:27 +0000 (UTC)
Subject: rpms/R-widgetTools/devel .cvsignore, 1.5, 1.6 R-widgetTools.spec,
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090428174327.C7A7470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-widgetTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6940/devel

Modified Files:
	.cvsignore R-widgetTools.spec sources 
Log Message:
Update to 1.22.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 20:31:42 -0000	1.5
+++ .cvsignore	28 Apr 2009 17:42:57 -0000	1.6
@@ -1 +1 @@
-widgetTools_1.18.0.tar.gz
+widgetTools_1.22.0.tar.gz


Index: R-widgetTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/devel/R-widgetTools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-widgetTools.spec	23 Feb 2009 23:14:51 -0000	1.9
+++ R-widgetTools.spec	28 Apr 2009 17:42:57 -0000	1.10
@@ -1,10 +1,10 @@
-%define packname  widgetTools
-%define BioC      2.3
-%define Rversion  2.8.0
+%global packname  widgetTools
+%global BioC      2.4
+%global Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.18.0 
-Release:          2%{?dist}
+Version:          1.22.0 
+Release:          1%{?dist}
 Summary:          Bioconductor tools to support tcltk widgets
 
 Group:            Applications/Productivity
@@ -70,6 +70,9 @@ chmod -x %{packname}/inst/doc/widget.pdf
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.22.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-widgetTools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 20:31:42 -0000	1.5
+++ sources	28 Apr 2009 17:42:57 -0000	1.6
@@ -1 +1 @@
-91cc70c3fe5318fdfa30d0451d0227f9  widgetTools_1.18.0.tar.gz
+bad0073267039ae54e704abcc7f9052d  widgetTools_1.22.0.tar.gz



From simo at fedoraproject.org  Tue Apr 28 17:50:29 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 28 Apr 2009 17:50:29 +0000 (UTC)
Subject: rpms/sssd/F-11
	0001-enable-offline-handling-for-native-LDAP-backend.patch, NONE,
	1.1 0001-handle-other-pam-calls-when-offline.patch, NONE,
	1.1 sssd.spec, 1.14, 1.15
Message-ID: <20090428175029.6C7BB70129@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7980

Modified Files:
	sssd.spec 
Added Files:
	0001-enable-offline-handling-for-native-LDAP-backend.patch 
	0001-handle-other-pam-calls-when-offline.patch 
Log Message:
Add 2 other patches around offline auth caching


0001-enable-offline-handling-for-native-LDAP-backend.patch:

--- NEW FILE 0001-enable-offline-handling-for-native-LDAP-backend.patch ---
>From 39ffa138c698f0fe1a440a05406852d1add7c73c Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Tue, 28 Apr 2009 13:37:33 +0200
Subject: [PATCH] enable offline handling for native LDAP backend

---
 server/providers/ldap_be.c |   52 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/server/providers/ldap_be.c b/server/providers/ldap_be.c
index e654702..365b7d0 100644
--- a/server/providers/ldap_be.c
+++ b/server/providers/ldap_be.c
@@ -49,6 +49,8 @@ struct sdap_ctx {
     char *default_authtok_type;
     uint32_t default_authtok_size;
     char *default_authtok;
+    int network_timeout;
+    int opt_timeout;
 };
 
 struct sdap_ops;
@@ -197,6 +199,8 @@ static int sdap_init(struct sdap_req *lr)
     int status=EOK;
     int ldap_vers = LDAP_VERSION3;
     int msgid;
+    struct timeval network_timeout;
+    struct timeval opt_timeout;
 
     ret = ldap_initialize(&(lr->ldap), lr->sdap_ctx->ldap_uri);
     if (ret != LDAP_SUCCESS) {
@@ -212,13 +216,35 @@ static int sdap_init(struct sdap_req *lr)
         goto cleanup;
     }
 
+    network_timeout.tv_sec = lr->sdap_ctx->network_timeout;
+    network_timeout.tv_usec = 0;
+    opt_timeout.tv_sec = lr->sdap_ctx->opt_timeout;
+    opt_timeout.tv_usec = 0;
+    ret = ldap_set_option(lr->ldap, LDAP_OPT_NETWORK_TIMEOUT, &network_timeout);
+    if (ret != LDAP_OPT_SUCCESS) {
+        DEBUG(1, ("ldap_set_option failed: %s\n", ldap_err2string(ret)));
+        status = EIO;
+        goto cleanup;
+    }
+    ret = ldap_set_option(lr->ldap, LDAP_OPT_TIMEOUT, &opt_timeout);
+    if (ret != LDAP_OPT_SUCCESS) {
+        DEBUG(1, ("ldap_set_option failed: %s\n", ldap_err2string(ret)));
+        status = EIO;
+        goto cleanup;
+    }
+
     /* For now TLS is forced. Maybe it would be necessary to make this
      * configurable to allow people to expose their passwords over the
      * network. */
     ret = ldap_start_tls(lr->ldap, NULL, NULL, &msgid);
     if (ret != LDAP_SUCCESS) {
-        DEBUG(1, ("ldap_start_tls failed: %s\n", ldap_err2string(ret)));
-        status = EIO;
+        DEBUG(1, ("ldap_start_tls failed: [%d][%s]\n", ret,
+                  ldap_err2string(ret)));
+        if (ret == LDAP_SERVER_DOWN) {
+            status = EAGAIN;
+        } else {
+            status = EIO;
+        }
         goto cleanup;
     }
 
@@ -289,7 +315,11 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
             if (ret != EOK) {
                 DEBUG(1, ("sdap_init failed.\n"));
                 lr->ldap = NULL;
-                pam_status = PAM_SYSTEM_ERR;
+                if (ret == EAGAIN) {
+                    pam_status = PAM_AUTHINFO_UNAVAIL;
+                } else {
+                    pam_status = PAM_SYSTEM_ERR;
+                }
                 goto done;
             }
         case SDAP_CHECK_INIT_RESULT:
@@ -573,7 +603,11 @@ static void sdap_start(struct tevent_context *ev, struct tevent_timer *te,
     if (ret != EOK) {
         DEBUG(1, ("sdap_init failed.\n"));
         lr->ldap = NULL;
-        pam_status = PAM_SYSTEM_ERR;
+        if (ret == EAGAIN) {
+            pam_status = PAM_AUTHINFO_UNAVAIL;
+        } else {
+            pam_status = PAM_SYSTEM_ERR;
+        }
         goto done;
     }
 
@@ -663,6 +697,8 @@ int sssm_ldap_auth_init(struct be_ctx *bectx,
     char *user_search_base;
     char *user_name_attribute;
     char *user_object_class;
+    int network_timeout;
+    int opt_timeout;
     int ret;
 
     ctx = talloc(bectx, struct sdap_ctx);
@@ -715,7 +751,15 @@ int sssm_ldap_auth_init(struct be_ctx *bectx,
     ctx->default_authtok = default_authtok;
     ctx->default_authtok_size = (default_authtok==NULL?0:strlen(default_authtok));
 
+    ret = confdb_get_int(bectx->cdb, ctx, bectx->conf_path,
+                         "network_timeout", 5, &network_timeout);
+    if (ret != EOK) goto done;
+    ctx->network_timeout = network_timeout;
 
+    ret = confdb_get_int(bectx->cdb, ctx, bectx->conf_path,
+                         "opt_timeout", 5, &opt_timeout);
+    if (ret != EOK) goto done;
+    ctx->network_timeout = opt_timeout;
 
     *ops = &sdap_mod_ops;
     *pvt_data = ctx;
-- 
1.6.0.6


0001-handle-other-pam-calls-when-offline.patch:

--- NEW FILE 0001-handle-other-pam-calls-when-offline.patch ---
>From 883549efb0a55291b2e6bce05b51e0a6c5847dbb Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Tue, 28 Apr 2009 10:17:38 +0200
Subject: [PATCH] handle other pam calls when offline

---
 server/responder/pam/pamsrv_cmd.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/server/responder/pam/pamsrv_cmd.c b/server/responder/pam/pamsrv_cmd.c
index 4c7bf1f..6d3f899 100644
--- a/server/responder/pam/pamsrv_cmd.c
+++ b/server/responder/pam/pamsrv_cmd.c
@@ -172,6 +172,16 @@ static void pam_reply(struct pam_auth_req *preq)
         }
     }
 
+/* TODO: we need the pam session cookie here to make sure that cached
+ * authentication was successful */
+    if ((pd->cmd == SSS_PAM_SETCRED || pd->cmd == SSS_PAM_ACCT_MGMT ||
+         pd->cmd == SSS_PAM_OPEN_SESSION || pd->cmd == SSS_PAM_CLOSE_SESSION) &&
+        pd->pam_status == PAM_AUTHINFO_UNAVAIL) {
+        DEBUG(2, ("Assuming offline authentication "
+                  "setting status for pam call %d to PAM_SUCCESS.\n", pd->cmd));
+        pd->pam_status = PAM_SUCCESS;
+    }
+
     cctx = preq->cctx;
 
     if (pd->response_delay > 0) {
-- 
1.6.0.6



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sssd.spec	28 Apr 2009 17:37:45 -0000	1.14
+++ sssd.spec	28 Apr 2009 17:49:58 -0000	1.15
@@ -15,6 +15,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ### Patches ###
 Patch1: 0001-Use-different-attribute-for-cached-passwords.patch
 Patch2: 0001-Use-different-attribute-for-cached-passwords-change.patch
+Patch3: 0001-enable-offline-handling-for-native-LDAP-backend.patch
+Patch4: 0001-handle-other-pam-calls-when-offline.patch
 
 ### Dependencies ###
 
@@ -55,6 +57,8 @@ services for projects like FreeIPA.
 
 %patch1 -p 1 -b .pwd-attr
 %patch2 -p 1 -b .pwd-cache-attr
+%patch3 -p 1 -b .ldap-offline
+%patch4 -p 1 -b .pam-offline
 
 %build
 
@@ -144,7 +148,7 @@ fi
 
 %changelog
 * Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1
-- Add patches to fix password caching
+- Add patches to fix password caches when offline
 
 * Mon Apr 27 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-0
 - Version 0.3.3



From pingou at fedoraproject.org  Tue Apr 28 18:03:05 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:03:05 +0000 (UTC)
Subject: rpms/R-BufferedMatrix/F-10 R-BufferedMatrix.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20090428180305.CE7D370129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10981/F-10

Modified Files:
	R-BufferedMatrix.spec sources 
Log Message:
Update to 1.8.0


Index: R-BufferedMatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/F-10/R-BufferedMatrix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-BufferedMatrix.spec	22 Mar 2009 09:55:51 -0000	1.10
+++ R-BufferedMatrix.spec	28 Apr 2009 18:02:35 -0000	1.11
@@ -1,9 +1,9 @@
-%define packname   BufferedMatrix 
-%define bioc       2.3
+%global packname   BufferedMatrix 
+%global bioc       2.4
 
 Name:              R-%{packname}
-Version:           1.6.0
-Release:           2%{?dist}
+Version:           1.8.0
+Release:           1%{?dist}
 Summary:           A matrix data storage object method from bioconductor
 Summary(fr):       Stockage des donn??es d'un matrice dans un fichier temporaire
 
@@ -55,6 +55,7 @@ rm -rf %{buildroot}%{_libdir}/R/library/
 
 ## Change the header of place for the -devel --> Removed 
 ## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html
+
 #mkdir -p  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #install -D %{packname}/inst/include/*  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #chmod -x $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/*
@@ -95,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Sun Mar 22 2009 pingou <pingou at pingoured.fr> - 1.6.0-2
 - -devel should contain only the folder include  !
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Mar 2009 18:51:59 -0000	1.5
+++ sources	28 Apr 2009 18:02:35 -0000	1.6
@@ -1 +1 @@
-271c40c97fd51495851d92f82b6bb9b6  BufferedMatrix_1.6.0.tar.gz
+e9a6d71671a80e23b6c34d05a43e8637  BufferedMatrix_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:03:06 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:03:06 +0000 (UTC)
Subject: rpms/R-BufferedMatrix/F-11 R-BufferedMatrix.spec, 1.13, 1.14 sources,
	1.5, 1.6
Message-ID: <20090428180306.0C03C70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10981/F-11

Modified Files:
	R-BufferedMatrix.spec sources 
Log Message:
Update to 1.8.0


Index: R-BufferedMatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/F-11/R-BufferedMatrix.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- R-BufferedMatrix.spec	22 Mar 2009 09:52:42 -0000	1.13
+++ R-BufferedMatrix.spec	28 Apr 2009 18:02:35 -0000	1.14
@@ -1,9 +1,9 @@
-%define packname   BufferedMatrix 
-%define bioc       2.3
+%global packname   BufferedMatrix 
+%global bioc       2.4
 
 Name:              R-%{packname}
-Version:           1.6.0
-Release:           2%{?dist}
+Version:           1.8.0
+Release:           1%{?dist}
 Summary:           A matrix data storage object method from bioconductor
 Summary(fr):       Stockage des donn??es d'un matrice dans un fichier temporaire
 
@@ -55,6 +55,7 @@ rm -rf %{buildroot}%{_libdir}/R/library/
 
 ## Change the header of place for the -devel --> Removed 
 ## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html
+
 #mkdir -p  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #install -D %{packname}/inst/include/*  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #chmod -x $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/*
@@ -95,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Sun Mar 22 2009 pingou <pingou at pingoured.fr> - 1.6.0-2
 - -devel should contain only the folder include  !
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Mar 2009 18:43:26 -0000	1.5
+++ sources	28 Apr 2009 18:02:35 -0000	1.6
@@ -1 +1 @@
-271c40c97fd51495851d92f82b6bb9b6  BufferedMatrix_1.6.0.tar.gz
+e9a6d71671a80e23b6c34d05a43e8637  BufferedMatrix_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:03:06 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:03:06 +0000 (UTC)
Subject: rpms/R-BufferedMatrix/F-9 R-BufferedMatrix.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20090428180306.676B470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10981/F-9

Modified Files:
	R-BufferedMatrix.spec sources 
Log Message:
Update to 1.8.0


Index: R-BufferedMatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/F-9/R-BufferedMatrix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-BufferedMatrix.spec	22 Mar 2009 09:55:51 -0000	1.10
+++ R-BufferedMatrix.spec	28 Apr 2009 18:02:36 -0000	1.11
@@ -1,9 +1,9 @@
-%define packname   BufferedMatrix 
-%define bioc       2.3
+%global packname   BufferedMatrix 
+%global bioc       2.4
 
 Name:              R-%{packname}
-Version:           1.6.0
-Release:           2%{?dist}
+Version:           1.8.0
+Release:           1%{?dist}
 Summary:           A matrix data storage object method from bioconductor
 Summary(fr):       Stockage des donn??es d'un matrice dans un fichier temporaire
 
@@ -55,6 +55,7 @@ rm -rf %{buildroot}%{_libdir}/R/library/
 
 ## Change the header of place for the -devel --> Removed 
 ## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html
+
 #mkdir -p  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #install -D %{packname}/inst/include/*  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #chmod -x $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/*
@@ -95,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Sun Mar 22 2009 pingou <pingou at pingoured.fr> - 1.6.0-2
 - -devel should contain only the folder include  !
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Mar 2009 18:51:59 -0000	1.5
+++ sources	28 Apr 2009 18:02:36 -0000	1.6
@@ -1 +1 @@
-271c40c97fd51495851d92f82b6bb9b6  BufferedMatrix_1.6.0.tar.gz
+e9a6d71671a80e23b6c34d05a43e8637  BufferedMatrix_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:03:06 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:03:06 +0000 (UTC)
Subject: rpms/R-BufferedMatrix/devel .cvsignore, 1.5,
	1.6 R-BufferedMatrix.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20090428180306.B6C9170129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10981/devel

Modified Files:
	.cvsignore R-BufferedMatrix.spec sources 
Log Message:
Update to 1.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Mar 2009 18:43:25 -0000	1.5
+++ .cvsignore	28 Apr 2009 18:02:36 -0000	1.6
@@ -1 +1 @@
-BufferedMatrix_1.6.0.tar.gz
+BufferedMatrix_1.8.0.tar.gz


Index: R-BufferedMatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/devel/R-BufferedMatrix.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- R-BufferedMatrix.spec	22 Mar 2009 09:52:42 -0000	1.13
+++ R-BufferedMatrix.spec	28 Apr 2009 18:02:36 -0000	1.14
@@ -1,9 +1,9 @@
-%define packname   BufferedMatrix 
-%define bioc       2.3
+%global packname   BufferedMatrix 
+%global bioc       2.4
 
 Name:              R-%{packname}
-Version:           1.6.0
-Release:           2%{?dist}
+Version:           1.8.0
+Release:           1%{?dist}
 Summary:           A matrix data storage object method from bioconductor
 Summary(fr):       Stockage des donn??es d'un matrice dans un fichier temporaire
 
@@ -55,6 +55,7 @@ rm -rf %{buildroot}%{_libdir}/R/library/
 
 ## Change the header of place for the -devel --> Removed 
 ## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html
+
 #mkdir -p  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #install -D %{packname}/inst/include/*  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
 #chmod -x $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/*
@@ -95,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Sun Mar 22 2009 pingou <pingou at pingoured.fr> - 1.6.0-2
 - -devel should contain only the folder include  !
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrix/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Mar 2009 18:43:26 -0000	1.5
+++ sources	28 Apr 2009 18:02:36 -0000	1.6
@@ -1 +1 @@
-271c40c97fd51495851d92f82b6bb9b6  BufferedMatrix_1.6.0.tar.gz
+e9a6d71671a80e23b6c34d05a43e8637  BufferedMatrix_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:09:24 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:09:24 +0000 (UTC)
Subject: rpms/R-BufferedMatrixMethods/F-10 R-BufferedMatrixMethods.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090428180924.EDC2E70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/F-10

Modified Files:
	R-BufferedMatrixMethods.spec sources 
Log Message:
Update to 1.8.0


Index: R-BufferedMatrixMethods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-10/R-BufferedMatrixMethods.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-BufferedMatrixMethods.spec	2 May 2008 08:45:16 -0000	1.4
+++ R-BufferedMatrixMethods.spec	28 Apr 2009 18:08:54 -0000	1.5
@@ -1,18 +1,15 @@
-%define packname  BufferedMatrixMethods 
-%define bioc      2.2
+%global packname  BufferedMatrixMethods 
 
 Name:             R-%{packname}
-Version:          1.4.0
+Version:          1.8.0
 Release:          1%{?dist}
 Summary:          Microarray Data related methods that utlize BufferedMatrix
 Summary(fr):      Outils pour la manipulation des donn??es de puces ?? ADN
 
 Group:            Applications/Productivity 
 License:          GPLv2+
-URL:              http://bioconductor.org/packages/2.2/bioc/html/BufferedMatrixMethods.html
-Source0:          http://bioconductor.org/packages/2.2/bioc/src/contrib/%{packname}_%{version}.tar.gz
-Patch0:           %{packname}-path.patch
-Patch1:           %{packname}-path.patch2
+URL:              http://bioconductor.org/packages/release/bioc/html/BufferedMatrixMethods.html
+Source0:          http://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R
@@ -29,8 +26,7 @@ des biblioth??ques BufferedMatrix
 
 %prep
 %setup -c -q -n %{packname}
-%patch0 -p0
-%patch1 -p0
+
 %build
 
 %install
@@ -62,7 +58,6 @@ rm -rf %{buildroot}
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/man
 %{_libdir}/R/library/%{packname}/CONTENTS
-%{_libdir}/R/library/%{packname}/NAMESPACE
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/libs
 %{_libdir}/R/library/%{packname}/Meta
@@ -72,8 +67,15 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.4.0-1
-- Update to bioconductor 2.2
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> - 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 1.6.0-1
+- Update to bioconductor 2.3
+- Get rid of the patches since I moved the BuffuredMethods' header back in libdir
+
+* Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> - 1.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 May 2008 08:45:16 -0000	1.3
+++ sources	28 Apr 2009 18:08:54 -0000	1.4
@@ -1 +1 @@
-f5789bb32328b66d8d5bb93b8ff0668d  BufferedMatrixMethods_1.4.0.tar.gz
+ce9a15498f858a9b5709489076151461  BufferedMatrixMethods_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:09:25 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:09:25 +0000 (UTC)
Subject: rpms/R-BufferedMatrixMethods/F-11 R-BufferedMatrixMethods.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090428180925.3631570129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/F-11

Modified Files:
	R-BufferedMatrixMethods.spec sources 
Log Message:
Update to 1.8.0


Index: R-BufferedMatrixMethods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-11/R-BufferedMatrixMethods.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-BufferedMatrixMethods.spec	21 Mar 2009 19:03:10 -0000	1.7
+++ R-BufferedMatrixMethods.spec	28 Apr 2009 18:08:54 -0000	1.8
@@ -1,7 +1,7 @@
-%define packname  BufferedMatrixMethods 
+%global packname  BufferedMatrixMethods 
 
 Name:             R-%{packname}
-Version:          1.6.0
+Version:          1.8.0
 Release:          1%{?dist}
 Summary:          Microarray Data related methods that utlize BufferedMatrix
 Summary(fr):      Outils pour la manipulation des donn??es de puces ?? ADN
@@ -10,8 +10,6 @@ Group:            Applications/Productiv
 License:          GPLv2+
 URL:              http://bioconductor.org/packages/release/bioc/html/BufferedMatrixMethods.html
 Source0:          http://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz
-#Patch0:           %{packname}-1.3.0-path.patch
-#Patch1:           %{packname}-1.3.0-path.patch2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R
@@ -28,8 +26,6 @@ des biblioth??ques BufferedMatrix
 
 %prep
 %setup -c -q -n %{packname}
-#%patch0 -p0
-#%patch1 -p0
 
 %build
 
@@ -71,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> - 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 1.6.0-1
 - Update to bioconductor 2.3
 - Get rid of the patches since I moved the BuffuredMethods' header back in libdir


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Mar 2009 19:03:10 -0000	1.5
+++ sources	28 Apr 2009 18:08:54 -0000	1.6
@@ -1 +1 @@
-1951b434709df5f8d320bec625968ed4  BufferedMatrixMethods_1.6.0.tar.gz
+ce9a15498f858a9b5709489076151461  BufferedMatrixMethods_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:09:26 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:09:26 +0000 (UTC)
Subject: rpms/R-BufferedMatrixMethods/devel .cvsignore, 1.5,
	1.6 R-BufferedMatrixMethods.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090428180926.067AA70129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrixMethods/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/devel

Modified Files:
	.cvsignore R-BufferedMatrixMethods.spec sources 
Log Message:
Update to 1.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Mar 2009 19:03:10 -0000	1.5
+++ .cvsignore	28 Apr 2009 18:08:55 -0000	1.6
@@ -1 +1 @@
-BufferedMatrixMethods_1.6.0.tar.gz
+BufferedMatrixMethods_1.8.0.tar.gz


Index: R-BufferedMatrixMethods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/devel/R-BufferedMatrixMethods.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-BufferedMatrixMethods.spec	21 Mar 2009 19:03:10 -0000	1.7
+++ R-BufferedMatrixMethods.spec	28 Apr 2009 18:08:55 -0000	1.8
@@ -1,7 +1,7 @@
-%define packname  BufferedMatrixMethods 
+%global packname  BufferedMatrixMethods 
 
 Name:             R-%{packname}
-Version:          1.6.0
+Version:          1.8.0
 Release:          1%{?dist}
 Summary:          Microarray Data related methods that utlize BufferedMatrix
 Summary(fr):      Outils pour la manipulation des donn??es de puces ?? ADN
@@ -10,8 +10,6 @@ Group:            Applications/Productiv
 License:          GPLv2+
 URL:              http://bioconductor.org/packages/release/bioc/html/BufferedMatrixMethods.html
 Source0:          http://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz
-#Patch0:           %{packname}-1.3.0-path.patch
-#Patch1:           %{packname}-1.3.0-path.patch2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R
@@ -28,8 +26,6 @@ des biblioth??ques BufferedMatrix
 
 %prep
 %setup -c -q -n %{packname}
-#%patch0 -p0
-#%patch1 -p0
 
 %build
 
@@ -71,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> - 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
 * Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 1.6.0-1
 - Update to bioconductor 2.3
 - Get rid of the patches since I moved the BuffuredMethods' header back in libdir


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Mar 2009 19:03:10 -0000	1.5
+++ sources	28 Apr 2009 18:08:55 -0000	1.6
@@ -1 +1 @@
-1951b434709df5f8d320bec625968ed4  BufferedMatrixMethods_1.6.0.tar.gz
+ce9a15498f858a9b5709489076151461  BufferedMatrixMethods_1.8.0.tar.gz



From pingou at fedoraproject.org  Tue Apr 28 18:09:25 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Tue, 28 Apr 2009 18:09:25 +0000 (UTC)
Subject: rpms/R-BufferedMatrixMethods/F-9 R-BufferedMatrixMethods.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <20090428180925.951E470129@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11909/F-9

Modified Files:
	R-BufferedMatrixMethods.spec sources 
Log Message:
Update to 1.8.0


Index: R-BufferedMatrixMethods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-9/R-BufferedMatrixMethods.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-BufferedMatrixMethods.spec	25 Jun 2008 08:50:41 -0000	1.4
+++ R-BufferedMatrixMethods.spec	28 Apr 2009 18:08:55 -0000	1.5
@@ -1,18 +1,15 @@
-%define packname  BufferedMatrixMethods 
-%define bioc      2.2
+%global packname  BufferedMatrixMethods 
 
 Name:             R-%{packname}
-Version:          1.4.0
+Version:          1.8.0
 Release:          1%{?dist}
 Summary:          Microarray Data related methods that utlize BufferedMatrix
 Summary(fr):      Outils pour la manipulation des donn??es de puces ?? ADN
 
 Group:            Applications/Productivity 
 License:          GPLv2+
-URL:              http://bioconductor.org/packages/2.2/bioc/html/BufferedMatrixMethods.html
-Source0:          http://bioconductor.org/packages/2.2/bioc/src/contrib/%{packname}_%{version}.tar.gz
-Patch0:           %{packname}-path.patch
-Patch1:           %{packname}-path.patch2
+URL:              http://bioconductor.org/packages/release/bioc/html/BufferedMatrixMethods.html
+Source0:          http://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R
@@ -29,8 +26,7 @@ des biblioth??ques BufferedMatrix
 
 %prep
 %setup -c -q -n %{packname}
-%patch0 -p0
-%patch1 -p0
+
 %build
 
 %install
@@ -62,7 +58,6 @@ rm -rf %{buildroot}
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/man
 %{_libdir}/R/library/%{packname}/CONTENTS
-%{_libdir}/R/library/%{packname}/NAMESPACE
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/libs
 %{_libdir}/R/library/%{packname}/Meta
@@ -72,8 +67,15 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri May 02 2008 Pingou <pingoufc4 at yahoo.fr> 1.4.0-1
-- Update to bioconductor 2.2
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> - 1.8.0-1
+- Update to Bioconductor 2.4 and R-2.9.0
+
+* Sat Mar 21 2009 pingou <pingou at pingoured.fr> - 1.6.0-1
+- Update to bioconductor 2.3
+- Get rid of the patches since I moved the BuffuredMethods' header back in libdir
+
+* Sat Mar 21 2009 Robert Scheck <robert at fedoraproject.org> - 1.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-BufferedMatrixMethods/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Jun 2008 08:50:41 -0000	1.3
+++ sources	28 Apr 2009 18:08:55 -0000	1.4
@@ -1 +1 @@
-f5789bb32328b66d8d5bb93b8ff0668d  BufferedMatrixMethods_1.4.0.tar.gz
+ce9a15498f858a9b5709489076151461  BufferedMatrixMethods_1.8.0.tar.gz



From james at fedoraproject.org  Tue Apr 28 18:47:10 2009
From: james at fedoraproject.org (James Antill)
Date: Tue, 28 Apr 2009 18:47:10 +0000 (UTC)
Subject: rpms/yum-presto/devel total-progress+stat-fixes.patch, NONE,
	1.1 yum-presto.spec, 1.12, 1.13
Message-ID: <20090428184710.60F3570129@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17715

Modified Files:
	yum-presto.spec 
Added Files:
	total-progress+stat-fixes.patch 
Log Message:
* Tue Apr 28 2009 James Antill <james at fedoraproject.org> - 0.4.5-6
- Add total progress data to delta downloads
- Fix stats. to account for the fact not everything has a delta
- Allow delta downloads to be configurable on savings


total-progress+stat-fixes.patch:

--- NEW FILE total-progress+stat-fixes.patch ---
commit 2324e07a8e9b6599f4e67df3301c2e1d75e8e669
Author: James Antill <james at and.org>
Date:   Mon Apr 27 23:54:45 2009 -0400

    Give total download progress stats.

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index 1e2c4ee..e754dd1 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -263,6 +263,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     curthread.start()
 
     remote_pkgs = []
+    remote_size = 0
 
     if download_pkgs is None:
         download_pkgs = conduit.getDownloadPackages()
@@ -298,6 +299,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                     if cursize >= totsize:
                         os.unlink(deltapath)
 
+                    remote_size += totsize
                     remote_pkgs.append( (po, delta) )
             else:
                 # Deltarpm is local and good, put it in the rebuild thread.
@@ -309,10 +311,21 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                 rebuild_size += po.size
                 continue
         else:
+            remote_size += long(delta['size'])
             remote_pkgs.append( (po, delta) )
 
+    #  This is kind of a hack and does nothing in non-Fedora versions,
+    # we'll fix it one way or anther soon.
+    if (hasattr(urlgrabber.progress, 'text_meter_total_size') and
+        len(remote_pkgs) > 1):
+        urlgrabber.progress.text_meter_total_size(remote_size)
+
+    if remote_size:
+        conduit.info(2, "Download delta size: %s" % format_number(remote_size))
+
     # now we need to do downloads
     i = 0
+    local_size = 0
     for (po, delta) in remote_pkgs:
         i += 1
         # FIXME: verifyChecksum should handle the urlgrabber objects...
@@ -327,20 +340,30 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
 
         # FIXME: this should be moved into _getFile
         dirstat = os.statvfs(deltadir)
-        if (dirstat.f_bavail * dirstat.f_bsize) <= (long(po.size) +
-                                                    long(delta['size'])):
+        delta_size = long(delta['size'])
+        if (dirstat.f_bavail * dirstat.f_bsize) <= (long(po.size) + delta_size):
             adderror(po, 'Insufficient space in download directory %s '
                     'to download' % (deltadir,))
             continue
+
+        if hasattr(urlgrabber.progress, 'text_meter_total_size'):
+            urlgrabber.progress.text_meter_total_size(remote_size, local_size)
         try:
-            text = "(%s/%s): %s" % (i, len(remote_pkgs),
-                                   os.path.basename(delta['filename']))
+            if i == 1 and not local_size and remote_size == delta_size:
+                text = os.path.basename(delta['filename'])
+            else:
+                text = "(%s/%s): %s" % (i, len(remote_pkgs),
+                                        os.path.basename(delta['filename']))
             deltafile = po.repo._getFile(url=po.basepath,
                                     relative=delta['filename'],
                                     local=deltapath,
                                     checkfunc=checkfunc,
                                     text=text,
                                     cache=po.repo.cache)
+            local_size += delta_size
+            if hasattr(urlgrabber.progress, 'text_meter_total_size'):
+                urlgrabber.progress.text_meter_total_size(remote_size,
+                                                          local_size)
         except yum.Errors.RepoError, e:
             adderror(po, str(e))
         else:
commit da53d1654fd22a25e654166d0e8692f845f1a7b9
Author: James Antill <james at and.org>
Date:   Tue Apr 28 00:09:56 2009 -0400

    Fix stats. to account for non-deltas, output "still to download" number

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index e754dd1..b3a7979 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -151,8 +151,6 @@ class ReconstructionThread(threading.Thread):
 
 def getDelta(po, presto, conduit):
     """Does the package have a reasonable delta for us to use?"""
-    global complete_download_size
-    global actual_download_size
     rpmdb = conduit.getRpmDB()
 
     # local packages don't make sense to use a delta for...
@@ -188,8 +186,6 @@ def getDelta(po, presto, conduit):
         cursize = os.stat(local)[6]
         totsize = long(po.size)
         if po.verifyLocalPkg(): # we've got it.
-            actual_download_size   -= cursize
-            complete_download_size -= cursize
             conduit.info(5, "Already have package for %s.%s." 
                              % (po.name, po.arch))
             return None
@@ -265,6 +261,8 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     remote_pkgs = []
     remote_size = 0
 
+    must_still_download_pkgs = 0
+
     if download_pkgs is None:
         download_pkgs = conduit.getDownloadPackages()
 
@@ -273,6 +271,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     for po in download_pkgs:
         delta = getDelta(po, presto, conduit)
         if delta is None:
+            must_still_download_pkgs += po.size
             continue
 
         # verify the delta if it already exists
@@ -412,7 +411,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
         conduit.info(2, curthread.messages[:-1])
         curthread.messages = ""
                 
-    return errors
+    return (errors, must_still_download_pkgs)
 
 class DeltaInfo(object):
     """Base Delta rpm info object"""
@@ -544,7 +543,12 @@ def predownload_hook(conduit):
 
     download_pkgs.sort()
     # Download deltarpms
-    problems = downloadPkgs(conduit, pinfo, download_pkgs)
+    (problems, more) = downloadPkgs(conduit, pinfo, download_pkgs)
+
+    #  Remove from "our" size, the size which still has to be got via. pkg
+    # downloads
+    complete_download_size   -= more
+    actual_download_size     -= more
 
     # If 'exitondownloaderror' is on, exit
     if conduit.confBool('main', 'exitondownloaderror') and \
@@ -556,7 +560,15 @@ def predownload_hook(conduit):
                 errstring += '  %s: %s\n' % (key, error)
         raise PluginYumExit(errstring)
 
-def postdownload_hook(conduit):
+    xpostdownload_hook(conduit)
+    if more:
+        conduit.info(2, "Package(s) data still to download: %s" %
+                     format_number(more))
+
+#  Output stats. about delta downloads ... if we don't have deltas for
+# everything (pretty common), we want to output these before we start
+# downloading the pkgs themselves. So don't do it postdownload, but after above.
+def xpostdownload_hook(conduit):
     global complete_download_size
     global actual_download_size
 
commit df4bb5ed90395fef64ea8aa46180a40ddc6e56da
Author: James Antill <james at and.org>
Date:   Tue Apr 28 00:18:18 2009 -0400

    Add bad delta paths to must_still_download_pkgs, save some stat()s

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index b3a7979..c39c8aa 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -214,7 +214,8 @@ def getDelta(po, presto, conduit):
         # we just want to use the smallest delta
         if bestdelta and delta['size'] >= bestdelta['size']:
             continue
-        
+
+        # FIXME: This probably takes a while ... need to do something. progress?
         if not verifyDelta(delta['sequence'], po.arch):
             continue
 
@@ -240,6 +241,19 @@ def _safe_stat_size(fname):
     except:
         return 0
 
+def _get_delta_path(cache, po, delta):
+    # verify the delta if it already exists
+    deltadir = os.path.join(po.repo.cachedir, 'deltas')
+
+    if deltadir not in cache and not os.path.isdir(deltadir):
+        try:
+            os.mkdir(deltadir)
+        except OSError:
+            return None
+
+    cache.add(deltadir)
+    return os.path.join(deltadir, os.path.basename(delta['filename']))
+
 def downloadPkgs(conduit, presto, download_pkgs=None):
     """download list of package objects handed to you, return errors"""
     global process_lock
@@ -268,21 +282,18 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
 
     # see which deltas we need to download; if the delta is already
     # downloaded, we can start it reconstructing in the background
+    deltapath_cache = set()
     for po in download_pkgs:
         delta = getDelta(po, presto, conduit)
         if delta is None:
             must_still_download_pkgs += po.size
             continue
 
-        # verify the delta if it already exists
-        deltadir = os.path.join(po.repo.cachedir, 'deltas')
-        if not os.path.isdir(deltadir):
-            try:
-                os.mkdir(deltadir)
-            except OSError:
-                continue
-        deltapath = os.path.join(deltadir,
-                                 os.path.basename(delta['filename']))
+        deltapath = _get_delta_path(deltapath_cache, po, delta)
+        if not deltapath:
+            must_still_download_pkgs += po.size
+            continue
+
         if os.path.exists(deltapath):
             try:
                 conduit._base.verifyChecksum(deltapath, delta['checksum_type'],
commit 795bc6addc0d8cfb764fd8dec297e9e0a0476c7e
Author: James Antill <james at and.org>
Date:   Tue Apr 28 13:20:17 2009 -0400

    Make delta.size an int as everyone assumes it anyway

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index c39c8aa..7e59dc3 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -184,7 +184,7 @@ def getDelta(po, presto, conduit):
     local = po.localPkg()
     if os.path.exists(local):
         cursize = os.stat(local)[6]
-        totsize = long(po.size)
+        totsize = po.size
         if po.verifyLocalPkg(): # we've got it.
             conduit.info(5, "Already have package for %s.%s." 
                              % (po.name, po.arch))
@@ -305,7 +305,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                     raise yum.Errors.RepoError, msg
                 else:
                     cursize = os.stat(deltapath)[6]
-                    totsize = long(delta['size'])
+                    totsize = delta['size']
                     if cursize >= totsize:
                         os.unlink(deltapath)
 
@@ -317,11 +317,11 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
                 # HACK: Use the download progress, at least we get something
                 cb = po.repo.callback
                 po.returnChecksums() # Magic, see below
-                queue.put((conduit, po, deltapath, long(delta['size'])))
+                queue.put((conduit, po, deltapath, delta['size']))
                 rebuild_size += po.size
                 continue
         else:
-            remote_size += long(delta['size'])
+            remote_size += delta['size']
             remote_pkgs.append( (po, delta) )
 
     #  This is kind of a hack and does nothing in non-Fedora versions,
@@ -350,7 +350,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
 
         # FIXME: this should be moved into _getFile
         dirstat = os.statvfs(deltadir)
-        delta_size = long(delta['size'])
+        delta_size = delta['size']
         if (dirstat.f_bavail * dirstat.f_bsize) <= (long(po.size) + delta_size):
             adderror(po, 'Insufficient space in download directory %s '
                     'to download' % (deltadir,))
@@ -383,7 +383,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
             # from the SQL db in this thread, so that the other thread can call
             # .verifyLocalPkg() without having to hit sqlite.
             po.returnChecksums()
-            queue.put((conduit, po, deltafile, long(delta['size'])))
+            queue.put((conduit, po, deltafile, delta['size']))
             rebuild_size += po.size
 
             if errors.has_key(po):
@@ -441,11 +441,14 @@ class DeltaInfo(object):
                 self.checksum_type = x.get("type")
             setattr(self, x.tag, x.text)
 
+        # Things expect/assume this, might as well help them:
+        self.size = long(self.size)
+
     def evr(self):
         return "%s:%s-%s" % (self.epoch, self.version, self.release)
 
     def __str__(self):
-        return "filename: %s, sequence: %s, size: %s, checksum (%s) = %s" \
+        return "filename: %s, sequence: %s, size: %d, checksum (%s) = %s" \
                          % (self.filename, self.sequence, self.size, 
                             self.checksum_type, self.checksum)
 
@@ -544,7 +547,7 @@ def predownload_hook(conduit):
                 continue
         repos.add(po.repo)
         download_pkgs.append(po)
-        complete_download_size += int(po.size)
+        complete_download_size += po.size
     actual_download_size = complete_download_size
 
     if not download_pkgs:
commit 7c3036b9ba90024d52cfd24392c27d9b170665c6
Author: James Antill <james at and.org>
Date:   Tue Apr 28 13:34:39 2009 -0400

    Allow download vs. rebuild tradeoff, to be configurable

diff --git a/yum-presto/presto.conf b/yum-presto/presto.conf
index a066321..ecf41c2 100644
--- a/yum-presto/presto.conf
+++ b/yum-presto/presto.conf
@@ -6,3 +6,12 @@ enabled=1
 # This defaults to yum's keepcache option, if not set.
 # keepdeltas = false
 
+#  This lets you change if the delta is downloaded given it's relative size vs.
+# the pkg. Eg. the default:
+#
+# minimum_percentage = 95
+#
+# ...means that given a pkg of 100M, a delta of 95M (or less) would be
+# downloaded instead but a delta of 96M would be skipped in favour of the pkg.
+#  Percentage of 0 means never use the delta, percentage of 100 means always
+# use it (assuming the delta is never bigger than the pkg).
diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index 7e59dc3..ee7af65 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -149,7 +149,7 @@ class ReconstructionThread(threading.Thread):
                     self.lock.release()
  
 
-def getDelta(po, presto, conduit):
+def getDelta(po, presto, conduit, conf_minimum_percentage=100):
     """Does the package have a reasonable delta for us to use?"""
     rpmdb = conduit.getRpmDB()
 
@@ -211,6 +211,11 @@ def getDelta(po, presto, conduit):
             continue
         delta = deltas[evr]
 
+        # If the delta isn't small enough, ignore it
+        povsize = (po.size * conf_minimum_percentage) / 100
+        if povsize < delta['size']:
+            continue
+
         # we just want to use the smallest delta
         if bestdelta and delta['size'] >= bestdelta['size']:
             continue
@@ -265,6 +270,13 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     rebuild_size = 0 # Size of packages we are going to rebuild.
     cb = None
 
+    conf_mp = conduit.confInt('main', 'minimum_percentage',
+                               default=95)
+    if conf_mp > 100:
+        conf_mp = 100
+    if conf_mp < 0:
+        conf_mp = 0
+
     # Set up thread for applying drpms
     queue = Queue.Queue(0)
     process_lock = thread.allocate_lock()
@@ -284,7 +296,7 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
     # downloaded, we can start it reconstructing in the background
     deltapath_cache = set()
     for po in download_pkgs:
-        delta = getDelta(po, presto, conduit)
+        delta = getDelta(po, presto, conduit, conf_mp)
         if delta is None:
             must_still_download_pkgs += po.size
             continue
commit bc5f307377ee973e9def78db88f8e1e9699595c9
Author: James Antill <james at and.org>
Date:   Tue Apr 28 14:21:03 2009 -0400

    "from urlgrabber.progress import" != "import urlgrabber.progress"

diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index ee7af65..17502bb 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -37,6 +37,7 @@ import yum.Errors
 import yum.misc
 from urlgrabber.grabber import URLGrabError
 from urlgrabber.progress import format_number
+import urlgrabber.progress
 
 complete_download_size = 0
 actual_download_size   = 0


Index: yum-presto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- yum-presto.spec	26 Apr 2009 17:06:47 -0000	1.12
+++ yum-presto.spec	28 Apr 2009 18:46:39 -0000	1.13
@@ -3,12 +3,13 @@
 Summary: Presto plugin for yum
 Name: yum-presto
 Version: 0.4.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2
 Patch0: speedup.patch
 Patch1: cleanup.patch
+Patch2: total-progress+stat-fixes.patch
 URL: http://www.lesbg.com/jdieter/presto/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -30,6 +31,7 @@ foo-1.1 package from your installed foo-
 
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
 
 %build
 
@@ -50,6 +52,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Tue Apr 28 2009 James Antill <james at fedoraproject.org> - 0.4.5-6
+- Add total progress data to delta downloads
+- Fix stats. to account for the fact not everything has a delta
+- Allow delta downloads to be configurable on savings
+
 * Sun Apr 26 2009 James Antill <james at fedoraproject.org> - 0.4.5-5
 - Added cleanup patch from upstream.
 - Adds progress for rebuilding.



From katzj at fedoraproject.org  Tue Apr 28 19:31:17 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 28 Apr 2009 19:31:17 +0000 (UTC)
Subject: rpms/syslinux/devel sources,1.26,1.27 syslinux.spec,1.58,1.59
Message-ID: <20090428193117.D149770129@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26186

Modified Files:
	sources syslinux.spec 
Log Message:
sync from F-11 branch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	13 Apr 2009 02:36:18 -0000	1.26
+++ sources	28 Apr 2009 19:30:47 -0000	1.27
@@ -1 +1 @@
-2154fee98c34bc1bd5a14f5d6f4e1f77  syslinux-3.74.tar.bz2
+daddab10857b73c08d7278da4fdb0781  syslinux-3.75.tar.bz2


Index: syslinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- syslinux.spec	13 Apr 2009 02:36:18 -0000	1.58
+++ syslinux.spec	28 Apr 2009 19:30:47 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 3.74
-%define tarball_version 3.74
+Version: 3.75
+%define tarball_version 3.75
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -84,6 +84,9 @@ rm -rf %{buildroot}
 %{_datadir}/syslinux/com32
 
 %changelog
+* Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 3.75-1
+- update to 3.75
+
 * Fri Apr 10 2009 Jeremy Katz <katzj at redhat.com> - 3.74-1
 - update to 3.74
 



From katzj at fedoraproject.org  Tue Apr 28 19:38:21 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 28 Apr 2009 19:38:21 +0000 (UTC)
Subject: rpms/syslinux/devel syslinux.spec,1.59,1.60
Message-ID: <20090428193821.AAC8170129@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27997

Modified Files:
	syslinux.spec 
Log Message:
* Tue Apr 28 2009 Jeremy Katz <katzj at redhat.com> - 3.75-2
- Don't strip binaries to fix debuginfo (#249970)



Index: syslinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- syslinux.spec	28 Apr 2009 19:30:47 -0000	1.59
+++ syslinux.spec	28 Apr 2009 19:37:51 -0000	1.60
@@ -2,11 +2,12 @@ Summary: Simple kernel loader which boot
 Name: syslinux
 Version: 3.75
 %define tarball_version 3.75
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
+Patch0: syslinux-debuginfo.patch
 ExclusiveArch: %{ix86} x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs
@@ -33,6 +34,7 @@ MEMDISK, which loads legacy operating sy
 
 %prep
 %setup -q -n syslinux-%{tarball_version}
+%patch0 -p1 -b .nostrip
 
 %build
 CFLAGS="-Werror -Wno-unused -finline-limit=2000"
@@ -84,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/syslinux/com32
 
 %changelog
+* Tue Apr 28 2009 Jeremy Katz <katzj at redhat.com> - 3.75-2
+- Don't strip binaries to fix debuginfo (#249970)
+
 * Thu Apr 16 2009 Jeremy Katz <katzj at redhat.com> - 3.75-1
 - update to 3.75
 



From katzj at fedoraproject.org  Tue Apr 28 19:45:20 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 28 Apr 2009 19:45:20 +0000 (UTC)
Subject: rpms/syslinux/devel syslinux-debuginfo.patch,NONE,1.1
Message-ID: <20090428194520.1E30F70129@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29710

Added Files:
	syslinux-debuginfo.patch 
Log Message:
actually add the patch

syslinux-debuginfo.patch:

--- NEW FILE syslinux-debuginfo.patch ---
diff -up syslinux-3.75/linux/Makefile.nostrip syslinux-3.75/linux/Makefile
--- syslinux-3.75/linux/Makefile.nostrip	2009-04-28 15:34:45.000000000 -0400
+++ syslinux-3.75/linux/Makefile	2009-04-28 15:35:16.000000000 -0400
@@ -20,7 +20,7 @@ include $(topdir)/MCONFIG
 OPTFLAGS = -g -Os
 INCLUDES = -I. -I.. -I../libinstaller
 CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
-LDFLAGS	 = -s
+LDFLAGS	 = 
 
 SRCS     = syslinux.c \
            ../libinstaller/syslxmod.c \
diff -up syslinux-3.75/mtools/Makefile.nostrip syslinux-3.75/mtools/Makefile
--- syslinux-3.75/mtools/Makefile.nostrip	2009-04-28 15:34:51.000000000 -0400
+++ syslinux-3.75/mtools/Makefile	2009-04-28 15:35:22.000000000 -0400
@@ -4,7 +4,7 @@ include $(topdir)/MCONFIG
 OPTFLAGS = -g -Os
 INCLUDES = -I. -I.. -I../libfat -I../libinstaller
 CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
-LDFLAGS	 = -s
+LDFLAGS	 = 
 
 SRCS     = syslinux.c \
 	   ../libinstaller/syslxmod.c \
diff -up syslinux-3.75/utils/Makefile.nostrip syslinux-3.75/utils/Makefile
--- syslinux-3.75/utils/Makefile.nostrip	2009-04-28 15:35:02.000000000 -0400
+++ syslinux-3.75/utils/Makefile	2009-04-28 15:35:48.000000000 -0400
@@ -18,7 +18,7 @@ topdir = ..
 include $(topdir)/MCONFIG
 
 CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-LDFLAGS  = -O2 -s
+LDFLAGS  = -O2 
 
 TARGETS	 = mkdiskimage isohybrid gethostip
 ASIS     = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi



From th0br0 at fedoraproject.org  Tue Apr 28 19:50:53 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue, 28 Apr 2009 19:50:53 +0000 (UTC)
Subject: rpms/guimup/F-10 Guimup-0.1.4b-libmpdclient.patch, NONE,
	1.1 guimup.desktop, NONE, 1.1 guimup.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090428195053.39ABB70129@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/guimup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30749/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	Guimup-0.1.4b-libmpdclient.patch guimup.desktop guimup.spec 
	import.log 
Log Message:
Initial CVS import


Guimup-0.1.4b-libmpdclient.patch:

--- NEW FILE Guimup-0.1.4b-libmpdclient.patch ---
diff -Naur Guimup-0.1.4bsrc.orig/configure.ac Guimup-0.1.4bsrc/configure.ac
--- Guimup-0.1.4bsrc.orig/configure.ac	2009-02-16 21:40:59.000000000 +0100
+++ Guimup-0.1.4bsrc/configure.ac	2009-04-24 14:28:47.000000000 +0200
@@ -26,11 +26,11 @@
 
 
 
-AM_PROG_LIBTOOL
+LT_INIT
 
 
 
-PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.8])
+PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.8 libmpd])
 AC_SUBST(GUIMUP_CFLAGS)
 AC_SUBST(GUIMUP_LIBS)
 
diff -Naur Guimup-0.1.4bsrc.orig/src/gm_mpdcom.h Guimup-0.1.4bsrc/src/gm_mpdcom.h
--- Guimup-0.1.4bsrc.orig/src/gm_mpdcom.h	2009-04-21 15:49:50.000000000 +0200
+++ Guimup-0.1.4bsrc/src/gm_mpdcom.h	2009-04-24 14:29:49.000000000 +0200
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include <sys/types.h>
 
diff -Naur Guimup-0.1.4bsrc.orig/src/gm_tracks_mpdcom.h Guimup-0.1.4bsrc/src/gm_tracks_mpdcom.h
--- Guimup-0.1.4bsrc.orig/src/gm_tracks_mpdcom.h	2009-04-21 17:45:23.000000000 +0200
+++ Guimup-0.1.4bsrc/src/gm_tracks_mpdcom.h	2009-04-24 14:30:05.000000000 +0200
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include "gm_commandlist.h"
 #include "gm_itemlist.h"
diff -Naur Guimup-0.1.4bsrc.orig/src/Makefile.am Guimup-0.1.4bsrc/src/Makefile.am
--- Guimup-0.1.4bsrc.orig/src/Makefile.am	2008-04-29 12:51:04.000000000 +0200
+++ Guimup-0.1.4bsrc/src/Makefile.am	2009-04-24 14:30:17.000000000 +0200
@@ -19,8 +19,6 @@
 	gm_player.h \
 	gm_player.cc \
 	gm_player_pix.h \
-	libmpdclient.c \
-	libmpdclient.h \
 	gm_scroller.cc \
 	gm_scroller.h \
 	gm_config.h \


--- NEW FILE guimup.desktop ---
[Desktop Entry]
Name=Guimup
Comment=GTKmm based drag-&-drop oriented client for MPD
GenericName=Client for MPD
Type=Application
Exec=guimup
Icon=guimup
Terminal=false
Categories=GTK;AudioVideo;Audio;Player


--- NEW FILE guimup.spec ---
Name:		guimup
Version:	0.1.4
Release:	6.b%{?dist}
Summary:	A GTKmm based drag-&-drop oriented client for MPD

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://www.coonsden.com/
Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}bsrc.tar.gz
Source1:	guimup.desktop
Patch0:		Guimup-%{version}b-libmpdclient.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	intltool
BuildRequires:	gtkmm24-devel
BuildRequires:	libmpd-devel
BuildRequires:	libtool
BuildRequires:	desktop-file-utils
Requires:	mpd

%description
GUIMUP is a client for the music player daemon (MPD) written
in C++ and GTKmm. The program can be used with most Linux 
desktops but, as a GTK program, is best suited for GNOME and 
XFCE.

The focus of the program is on mouse handling: 
playlist management is done entirely by drag-&-drop; 
playback functions are directly accessible from the system tray. 
Guimup turns MPD into a perfect desktop music player.

%prep
%setup -q -n Guimup-%{version}bsrc
rm src/libmpdclient*
%patch0 -p1
autoreconf -f

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps

make install DESTDIR=%{buildroot} \
	INSTALL="install -p"
	
rm -rf %{buildroot}%{_usr}/doc

desktop-file-install \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{SOURCE1}
install -p -m0644 Icons/%{name}48.png \
	%{buildroot}%{_datadir}/pixmaps/%{name}.png
%clean
rm -rf %{buildroot}


%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Sat Apr 25 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-6.b
- Fixed release tag
- Fixed timestamp not preserved when installing the icon

* Fri Apr 24 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-5
- Bug fix release by upstream for guimup crashing when MPD can't be started

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-4
- Fixed desktop file
- Beauty fixes

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-3
- Updated Source0

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-2
- Added desktop file
- Removed libmpdclient from the source
- Macro usage fixed
- global srcname removed

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-1
- Initial package build


--- NEW FILE import.log ---
guimup-0_1_4-6_b_fc10:F-10:guimup-0.1.4-6.b.fc10.src.rpm:1240948114


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:33:32 -0000	1.1
+++ .cvsignore	28 Apr 2009 19:50:51 -0000	1.2
@@ -0,0 +1 @@
+Guimup-0.1.4bsrc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:33:32 -0000	1.1
+++ sources	28 Apr 2009 19:50:52 -0000	1.2
@@ -0,0 +1 @@
+76bf768bfc8e6a55b176e35529d93e47  Guimup-0.1.4bsrc.tar.gz



From pkgdb at fedoraproject.org  Tue Apr 28 19:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 19:50:57 +0000
Subject: [pkgdb] syslinux had acl change status
Message-ID: <20090428195057.B3BD710F886@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on syslinux (Fedora devel) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/syslinux



From pkgdb at fedoraproject.org  Tue Apr 28 19:51:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 19:51:04 +0000
Subject: [pkgdb] syslinux had acl change status
Message-ID: <20090428195105.1259010F89B@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on syslinux (Fedora 10) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/syslinux



From pkgdb at fedoraproject.org  Tue Apr 28 19:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 28 Apr 2009 19:51:06 +0000
Subject: [pkgdb] syslinux had acl change status
Message-ID: <20090428195106.B810710F89F@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on syslinux (Fedora 11) to Obsolete for laroche

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/syslinux



From katzj at fedoraproject.org  Tue Apr 28 19:51:19 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Tue, 28 Apr 2009 19:51:19 +0000 (UTC)
Subject: rpms/syslinux/devel syslinux.spec,1.60,1.61
Message-ID: <20090428195119.C3C4A70129@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30940

Modified Files:
	syslinux.spec 
Log Message:
* Tue Apr 28 2009 Jeremy Katz <katzj at redhat.com> - 3.75-3
- Stop suppressing requirements of the package (#465299)



Index: syslinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- syslinux.spec	28 Apr 2009 19:37:51 -0000	1.60
+++ syslinux.spec	28 Apr 2009 19:50:49 -0000	1.61
@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boot
 Name: syslinux
 Version: 3.75
 %define tarball_version 3.75
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/
@@ -12,7 +12,6 @@ ExclusiveArch: %{ix86} x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs
 BuildRequires: /usr/include/gnu/stubs-32.h
-Autoreq: 0
 %ifarch %{ix86}
 Requires: mtools, libc.so.6
 %endif
@@ -86,6 +85,9 @@ rm -rf %{buildroot}
 %{_datadir}/syslinux/com32
 
 %changelog
+* Tue Apr 28 2009 Jeremy Katz <katzj at redhat.com> - 3.75-3
+- Stop suppressing requirements of the package (#465299)
+
 * Tue Apr 28 2009 Jeremy Katz <katzj at redhat.com> - 3.75-2
 - Don't strip binaries to fix debuginfo (#249970)
 



From th0br0 at fedoraproject.org  Tue Apr 28 20:06:12 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue, 28 Apr 2009 20:06:12 +0000 (UTC)
Subject: rpms/guimup/F-11 Guimup-0.1.4b-libmpdclient.patch, NONE,
	1.1 guimup.desktop, NONE, 1.1 guimup.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090428200612.AF4D170129@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/guimup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3009/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	Guimup-0.1.4b-libmpdclient.patch guimup.desktop guimup.spec 
	import.log 
Log Message:
Initial CVS F-11 import


Guimup-0.1.4b-libmpdclient.patch:

--- NEW FILE Guimup-0.1.4b-libmpdclient.patch ---
diff -Naur Guimup-0.1.4bsrc.orig/configure.ac Guimup-0.1.4bsrc/configure.ac
--- Guimup-0.1.4bsrc.orig/configure.ac	2009-02-16 21:40:59.000000000 +0100
+++ Guimup-0.1.4bsrc/configure.ac	2009-04-24 14:28:47.000000000 +0200
@@ -26,11 +26,11 @@
 
 
 
-AM_PROG_LIBTOOL
+LT_INIT
 
 
 
-PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.8])
+PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.8 libmpd])
 AC_SUBST(GUIMUP_CFLAGS)
 AC_SUBST(GUIMUP_LIBS)
 
diff -Naur Guimup-0.1.4bsrc.orig/src/gm_mpdcom.h Guimup-0.1.4bsrc/src/gm_mpdcom.h
--- Guimup-0.1.4bsrc.orig/src/gm_mpdcom.h	2009-04-21 15:49:50.000000000 +0200
+++ Guimup-0.1.4bsrc/src/gm_mpdcom.h	2009-04-24 14:29:49.000000000 +0200
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include <sys/types.h>
 
diff -Naur Guimup-0.1.4bsrc.orig/src/gm_tracks_mpdcom.h Guimup-0.1.4bsrc/src/gm_tracks_mpdcom.h
--- Guimup-0.1.4bsrc.orig/src/gm_tracks_mpdcom.h	2009-04-21 17:45:23.000000000 +0200
+++ Guimup-0.1.4bsrc/src/gm_tracks_mpdcom.h	2009-04-24 14:30:05.000000000 +0200
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include "gm_commandlist.h"
 #include "gm_itemlist.h"
diff -Naur Guimup-0.1.4bsrc.orig/src/Makefile.am Guimup-0.1.4bsrc/src/Makefile.am
--- Guimup-0.1.4bsrc.orig/src/Makefile.am	2008-04-29 12:51:04.000000000 +0200
+++ Guimup-0.1.4bsrc/src/Makefile.am	2009-04-24 14:30:17.000000000 +0200
@@ -19,8 +19,6 @@
 	gm_player.h \
 	gm_player.cc \
 	gm_player_pix.h \
-	libmpdclient.c \
-	libmpdclient.h \
 	gm_scroller.cc \
 	gm_scroller.h \
 	gm_config.h \


--- NEW FILE guimup.desktop ---
[Desktop Entry]
Name=Guimup
Comment=GTKmm based drag-&-drop oriented client for MPD
GenericName=Client for MPD
Type=Application
Exec=guimup
Icon=guimup
Terminal=false
Categories=GTK;AudioVideo;Audio;Player


--- NEW FILE guimup.spec ---
Name:		guimup
Version:	0.1.4
Release:	6.b%{?dist}
Summary:	A GTKmm based drag-&-drop oriented client for MPD

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://www.coonsden.com/
Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}bsrc.tar.gz
Source1:	guimup.desktop
Patch0:		Guimup-%{version}b-libmpdclient.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	intltool
BuildRequires:	gtkmm24-devel
BuildRequires:	libmpd-devel
BuildRequires:	libtool
BuildRequires:	desktop-file-utils
Requires:	mpd

%description
GUIMUP is a client for the music player daemon (MPD) written
in C++ and GTKmm. The program can be used with most Linux 
desktops but, as a GTK program, is best suited for GNOME and 
XFCE.

The focus of the program is on mouse handling: 
playlist management is done entirely by drag-&-drop; 
playback functions are directly accessible from the system tray. 
Guimup turns MPD into a perfect desktop music player.

%prep
%setup -q -n Guimup-%{version}bsrc
rm src/libmpdclient*
%patch0 -p1
autoreconf -f

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps

make install DESTDIR=%{buildroot} \
	INSTALL="install -p"
	
rm -rf %{buildroot}%{_usr}/doc

desktop-file-install \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{SOURCE1}
install -p -m0644 Icons/%{name}48.png \
	%{buildroot}%{_datadir}/pixmaps/%{name}.png
%clean
rm -rf %{buildroot}


%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Sat Apr 25 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-6.b
- Fixed release tag
- Fixed timestamp not preserved when installing the icon

* Fri Apr 24 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-5
- Bug fix release by upstream for guimup crashing when MPD can't be started

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-4
- Fixed desktop file
- Beauty fixes

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-3
- Updated Source0

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-2
- Added desktop file
- Removed libmpdclient from the source
- Macro usage fixed
- global srcname removed

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-1
- Initial package build


--- NEW FILE import.log ---
guimup-0_1_4-6_b_fc10:F-11:guimup-0.1.4-6.b.fc10.src.rpm:1240949097


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:33:32 -0000	1.1
+++ .cvsignore	28 Apr 2009 20:05:42 -0000	1.2
@@ -0,0 +1 @@
+Guimup-0.1.4bsrc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:33:32 -0000	1.1
+++ sources	28 Apr 2009 20:05:42 -0000	1.2
@@ -0,0 +1 @@
+76bf768bfc8e6a55b176e35529d93e47  Guimup-0.1.4bsrc.tar.gz



From dwalsh at fedoraproject.org  Tue Apr 28 20:09:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 28 Apr 2009 20:09:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.124,
	1.125 policy-20090105.patch, 1.103, 1.104 selinux-policy.spec,
	1.840, 1.841
Message-ID: <20090428200952.2B98C70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4043

Modified Files:
	modules-targeted.conf policy-20090105.patch 
	selinux-policy.spec 
Log Message:
* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24
- Allow nsplugin to unix_read unix_write sem for unconfined_java



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- modules-targeted.conf	11 Apr 2009 12:30:22 -0000	1.124
+++ modules-targeted.conf	28 Apr 2009 20:09:21 -0000	1.125
@@ -493,6 +493,13 @@ finger = module
 # 
 firstboot = base
 
+# Layer: services
+# Module: fprintd
+#
+# finger print server
+# 
+fprintd = module
+
 # Layer: system
 # Module: fstools
 #

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- policy-20090105.patch	28 Apr 2009 15:49:42 -0000	1.103
+++ policy-20090105.patch	28 Apr 2009 20:09:21 -0000	1.104
@@ -788,7 +788,7 @@ diff -b -B --ignore-all-space --exclude-
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-27 11:01:26.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-28 15:47:35.000000000 -0400
 @@ -11,8 +11,8 @@
  init_daemon_domain(readahead_t, readahead_exec_t)
  application_domain(readahead_t, readahead_exec_t)
@@ -800,7 +800,7 @@ diff -b -B --ignore-all-space --exclude-
  
  type readahead_var_run_t;
  files_pid_file(readahead_var_run_t)
-@@ -24,9 +24,11 @@
+@@ -24,14 +24,17 @@
  
  allow readahead_t self:capability { fowner dac_override dac_read_search };
  dontaudit readahead_t self:capability sys_tty_config;
@@ -814,7 +814,13 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_files_pattern(readahead_t, readahead_var_run_t, readahead_var_run_t)
  files_pid_filetrans(readahead_t, readahead_var_run_t, file)
-@@ -46,6 +48,7 @@
+ 
+ kernel_read_kernel_sysctls(readahead_t)
++kernel_read_net_sysctls(readahead_t)
+ kernel_read_system_state(readahead_t)
+ kernel_dontaudit_getattr_core_if(readahead_t)
+ 
+@@ -46,6 +49,7 @@
  storage_raw_read_fixed_disk(readahead_t)
  
  domain_use_interactive_fds(readahead_t)
@@ -822,7 +828,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_getattr_all_sockets(readahead_t)
  files_list_non_security(readahead_t)
-@@ -58,6 +61,7 @@
+@@ -58,6 +62,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -830,7 +836,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +76,7 @@
+@@ -72,6 +77,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -2336,7 +2342,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/opera(/.*)?/opera	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.12/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/java.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/java.if	2009-04-28 12:20:13.000000000 -0400
 @@ -30,6 +30,7 @@
  
  	allow java_t $2:unix_stream_socket connectto;
@@ -2345,7 +2351,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -68,3 +69,129 @@
+@@ -68,3 +69,130 @@
  	domtrans_pattern($1, java_exec_t, unconfined_java_t)
  	corecmd_search_bin($1)
  ')
@@ -2400,6 +2406,7 @@ diff -b -B --ignore-all-space --exclude-
 +	java_domtrans_unconfined($1)
 +	role $2 types unconfined_java_t;
 +	role $2 types java_t;
++	nsplugin_role_notrans($2, unconfined_java_t)
 +')
 +
 +########################################
@@ -2477,7 +2484,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.12/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/java.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/java.te	2009-04-28 12:19:47.000000000 -0400
 @@ -20,6 +20,8 @@
  typealias java_t alias { staff_javaplugin_t user_javaplugin_t sysadm_javaplugin_t };
  typealias java_t alias { auditadm_javaplugin_t secadm_javaplugin_t };
@@ -2519,18 +2526,19 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	nis_use_ypbind(java_t)
  ')
-@@ -147,4 +151,11 @@
+@@ -147,4 +151,12 @@
  
  	unconfined_domain_noaudit(unconfined_java_t)
  	unconfined_dbus_chat(unconfined_java_t)
 +	optional_policy(`
 +		hal_dbus_chat(unconfined_java_t)
-+	')
+ ')
 +
 +	optional_policy(`
 +		rpm_domtrans(unconfined_java_t)
 +	')
- ')
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.6.12/policy/modules/apps/livecd.fc
 --- nsaserefpolicy/policy/modules/apps/livecd.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/livecd.fc	2009-04-23 09:44:57.000000000 -0400
@@ -5090,7 +5098,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.12/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-03-05 12:28:56.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-04-24 09:05:52.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-04-28 15:25:49.000000000 -0400
 @@ -2268,6 +2268,25 @@
  
  ########################################
@@ -5117,6 +5125,14 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
+@@ -3217,6 +3236,7 @@
+ #
+ interface(`dev_rw_generic_usb_dev',`
+ 	gen_require(`
++		type device_t;
+ 		type usb_device_t;
+ 	')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-23 09:44:57.000000000 -0400
@@ -7428,8 +7444,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-27 15:35:55.000000000 -0400
-@@ -0,0 +1,393 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-28 12:10:25.000000000 -0400
+@@ -0,0 +1,397 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7546,7 +7562,11 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	nsplugin_role_notrans(unconfined_r, unconfined_t)
++	gen_require(`
++		attribute unconfined_usertype;
++	')
++
++	nsplugin_role_notrans(unconfined_r, unconfined_usertype)
 +	tunable_policy(`allow_unconfined_nsplugin_transition',`
 +	      nsplugin_domtrans(unconfined_execmem_t)
 +	      nsplugin_domtrans_config(unconfined_execmem_t)
@@ -13377,6 +13397,78 @@ diff -b -B --ignore-all-space --exclude-
  # pid file
  manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
  manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.fc serefpolicy-3.6.12/policy/modules/services/fprintd.fc
+--- nsaserefpolicy/policy/modules/services/fprintd.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.fc	2009-04-28 15:26:41.000000000 -0400
+@@ -0,0 +1,2 @@
++
++/usr/libexec/fprintd	--	gen_context(system_u:object_r:fprintd_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.if serefpolicy-3.6.12/policy/modules/services/fprintd.if
+--- nsaserefpolicy/policy/modules/services/fprintd.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.if	2009-04-28 15:26:38.000000000 -0400
+@@ -0,0 +1,22 @@
++
++## <summary>policy for fprintd</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run fprintd.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`fprintd_domtrans',`
++	gen_require(`
++		type fprintd_t;
++                type fprintd_exec_t;
++	')
++
++	domtrans_pattern($1,fprintd_exec_t,fprintd_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te
+--- nsaserefpolicy/policy/modules/services/fprintd.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-04-28 16:07:25.000000000 -0400
+@@ -0,0 +1,36 @@
++policy_module(fprintd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type fprintd_t;
++type fprintd_exec_t;
++dbus_system_domain(fprintd_t, fprintd_exec_t)
++
++allow fprintd_t self:fifo_file rw_fifo_file_perms;
++allow fprintd_t self:process { getsched signal };
++
++corecmd_search_bin(fprintd_t)
++
++dev_rw_generic_usb_dev(fprintd_t)
++dev_read_sysfs(fprintd_t)
++
++files_read_etc_files(fprintd_t)
++files_read_usr_files(fprintd_t)
++
++auth_use_nsswitch(fprintd_t)
++
++miscfiles_read_localization(fprintd_t)
++
++userdom_use_user_ptys(fprintd_t)
++userdom_read_all_users_state(fprintd_t)
++
++optional_policy(`
++	polkit_read_reload(fprintd_t)
++	polkit_read_lib(fprintd_t)
++')
++
++permissive fprintd_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.12/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/ftp.te	2009-04-23 09:44:57.000000000 -0400
@@ -17341,7 +17433,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/misc/PolicyKit.reload			gen_context(system_u:object_r:polkit_reload_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.6.12/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/polkit.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/polkit.if	2009-04-28 16:05:38.000000000 -0400
 @@ -0,0 +1,241 @@
 +
 +## <summary>policy for polkit_auth</summary>
@@ -19377,7 +19469,7 @@ diff -b -B --ignore-all-space --exclude-
  		mysql_search_db(httpd_prewikka_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.12/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-04-28 11:40:52.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-04-28 11:45:58.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -19393,7 +19485,7 @@ diff -b -B --ignore-all-space --exclude-
  type privoxy_t; # web_client_domain
  type privoxy_exec_t;
  init_daemon_domain(privoxy_t, privoxy_exec_t)
-@@ -72,21 +80,19 @@
+@@ -72,21 +80,18 @@
  
  logging_send_syslog_msg(privoxy_t)
  
@@ -19416,7 +19508,6 @@ diff -b -B --ignore-all-space --exclude-
 -	nscd_socket_use(privoxy_t)
 +tunable_policy(`privoxy_connect_any',`
 +	corenet_tcp_connect_all_ports(privoxy_t)
-+	corenet_tcp_bind_all_ports(privoxy_t)
 +	corenet_sendrecv_all_packets(privoxy_t)
  ')
  
@@ -22284,7 +22375,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.12/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-28 11:39:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-28 11:44:05.000000000 -0400
 @@ -118,6 +118,9 @@
  
  fs_getattr_all_fs(squid_t)
@@ -22994,8 +23085,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-23 09:44:57.000000000 -0400
-@@ -0,0 +1,70 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-28 15:43:36.000000000 -0400
+@@ -0,0 +1,72 @@
 +policy_module(sssd,1.0.0)
 +
 +########################################
@@ -23022,7 +23113,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# sssd local policy
 +#
-+allow sssd_t self:capability sys_nice;
++allow sssd_t self:capability { sys_nice setuid };
 +allow sssd_t self:process { setsched signal getsched };
 +allow sssd_t tmp_t:dir { read getattr open };
 +
@@ -23053,6 +23144,8 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_etc_files(sssd_t)
 +files_read_usr_files(sssd_t)
 +
++fs_list_inotifyfs(sssd_t)
++
 +auth_use_nsswitch(sssd_t)
 +auth_domtrans_chk_passwd(sssd_t)
 +auth_domtrans_upd_passwd(sssd_t)
@@ -29744,7 +29837,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-27 08:32:47.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-28 16:06:27.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -p -r1.840 -r1.841
--- selinux-policy.spec	28 Apr 2009 15:49:42 -0000	1.840
+++ selinux-policy.spec	28 Apr 2009 20:09:21 -0000	1.841
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,6 +480,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24
+- Allow nsplugin to unix_read unix_write sem for unconfined_java
+
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-23
 - Fix uml files to be owned by users
 



From dwalsh at fedoraproject.org  Tue Apr 28 20:09:56 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 28 Apr 2009 20:09:56 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 modules-targeted.conf, 1.124,
	1.125 policy-20090105.patch, 1.109, 1.110 selinux-policy.spec,
	1.846, 1.847
Message-ID: <20090428200956.86FDC70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4098

Modified Files:
	modules-targeted.conf policy-20090105.patch 
	selinux-policy.spec 
Log Message:
* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24
- Allow nsplugin to unix_read unix_write sem for unconfined_java



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-targeted.conf,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- modules-targeted.conf	11 Apr 2009 12:30:22 -0000	1.124
+++ modules-targeted.conf	28 Apr 2009 20:09:25 -0000	1.125
@@ -493,6 +493,13 @@ finger = module
 # 
 firstboot = base
 
+# Layer: services
+# Module: fprintd
+#
+# finger print server
+# 
+fprintd = module
+
 # Layer: system
 # Module: fstools
 #

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- policy-20090105.patch	28 Apr 2009 15:49:48 -0000	1.109
+++ policy-20090105.patch	28 Apr 2009 20:09:25 -0000	1.110
@@ -788,7 +788,7 @@ diff -b -B --ignore-all-space --exclude-
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-27 11:01:26.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-28 15:47:35.000000000 -0400
 @@ -11,8 +11,8 @@
  init_daemon_domain(readahead_t, readahead_exec_t)
  application_domain(readahead_t, readahead_exec_t)
@@ -800,7 +800,7 @@ diff -b -B --ignore-all-space --exclude-
  
  type readahead_var_run_t;
  files_pid_file(readahead_var_run_t)
-@@ -24,9 +24,11 @@
+@@ -24,14 +24,17 @@
  
  allow readahead_t self:capability { fowner dac_override dac_read_search };
  dontaudit readahead_t self:capability sys_tty_config;
@@ -814,7 +814,13 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_files_pattern(readahead_t, readahead_var_run_t, readahead_var_run_t)
  files_pid_filetrans(readahead_t, readahead_var_run_t, file)
-@@ -46,6 +48,7 @@
+ 
+ kernel_read_kernel_sysctls(readahead_t)
++kernel_read_net_sysctls(readahead_t)
+ kernel_read_system_state(readahead_t)
+ kernel_dontaudit_getattr_core_if(readahead_t)
+ 
+@@ -46,6 +49,7 @@
  storage_raw_read_fixed_disk(readahead_t)
  
  domain_use_interactive_fds(readahead_t)
@@ -822,7 +828,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_getattr_all_sockets(readahead_t)
  files_list_non_security(readahead_t)
-@@ -58,6 +61,7 @@
+@@ -58,6 +62,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -830,7 +836,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +76,7 @@
+@@ -72,6 +77,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -2336,7 +2342,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/opera(/.*)?/opera	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.12/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/java.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/java.if	2009-04-28 12:20:13.000000000 -0400
 @@ -30,6 +30,7 @@
  
  	allow java_t $2:unix_stream_socket connectto;
@@ -2345,7 +2351,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -68,3 +69,129 @@
+@@ -68,3 +69,130 @@
  	domtrans_pattern($1, java_exec_t, unconfined_java_t)
  	corecmd_search_bin($1)
  ')
@@ -2400,6 +2406,7 @@ diff -b -B --ignore-all-space --exclude-
 +	java_domtrans_unconfined($1)
 +	role $2 types unconfined_java_t;
 +	role $2 types java_t;
++	nsplugin_role_notrans($2, unconfined_java_t)
 +')
 +
 +########################################
@@ -2477,7 +2484,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.12/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/java.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/java.te	2009-04-28 12:19:47.000000000 -0400
 @@ -20,6 +20,8 @@
  typealias java_t alias { staff_javaplugin_t user_javaplugin_t sysadm_javaplugin_t };
  typealias java_t alias { auditadm_javaplugin_t secadm_javaplugin_t };
@@ -2519,18 +2526,19 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	nis_use_ypbind(java_t)
  ')
-@@ -147,4 +151,11 @@
+@@ -147,4 +151,12 @@
  
  	unconfined_domain_noaudit(unconfined_java_t)
  	unconfined_dbus_chat(unconfined_java_t)
 +	optional_policy(`
 +		hal_dbus_chat(unconfined_java_t)
-+	')
+ ')
 +
 +	optional_policy(`
 +		rpm_domtrans(unconfined_java_t)
 +	')
- ')
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.6.12/policy/modules/apps/livecd.fc
 --- nsaserefpolicy/policy/modules/apps/livecd.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/apps/livecd.fc	2009-04-23 09:44:57.000000000 -0400
@@ -5090,7 +5098,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb.+		-c	gen_context(system_u:object_r:usb_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.12/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-03-05 12:28:56.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-04-24 09:05:52.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/devices.if	2009-04-28 15:25:49.000000000 -0400
 @@ -2268,6 +2268,25 @@
  
  ########################################
@@ -5117,6 +5125,14 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
+@@ -3217,6 +3236,7 @@
+ #
+ interface(`dev_rw_generic_usb_dev',`
+ 	gen_require(`
++		type device_t;
+ 		type usb_device_t;
+ 	')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.12/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-03-05 12:28:57.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/kernel/devices.te	2009-04-23 09:44:57.000000000 -0400
@@ -7428,8 +7444,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-27 15:35:55.000000000 -0400
-@@ -0,0 +1,393 @@
++++ serefpolicy-3.6.12/policy/modules/roles/unconfineduser.te	2009-04-28 12:10:25.000000000 -0400
+@@ -0,0 +1,397 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7546,7 +7562,11 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	nsplugin_role_notrans(unconfined_r, unconfined_t)
++	gen_require(`
++		attribute unconfined_usertype;
++	')
++
++	nsplugin_role_notrans(unconfined_r, unconfined_usertype)
 +	tunable_policy(`allow_unconfined_nsplugin_transition',`
 +	      nsplugin_domtrans(unconfined_execmem_t)
 +	      nsplugin_domtrans_config(unconfined_execmem_t)
@@ -13377,6 +13397,78 @@ diff -b -B --ignore-all-space --exclude-
  # pid file
  manage_dirs_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
  manage_sock_files_pattern(fail2ban_t, fail2ban_var_run_t, fail2ban_var_run_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.fc serefpolicy-3.6.12/policy/modules/services/fprintd.fc
+--- nsaserefpolicy/policy/modules/services/fprintd.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.fc	2009-04-28 15:26:41.000000000 -0400
+@@ -0,0 +1,2 @@
++
++/usr/libexec/fprintd	--	gen_context(system_u:object_r:fprintd_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.if serefpolicy-3.6.12/policy/modules/services/fprintd.if
+--- nsaserefpolicy/policy/modules/services/fprintd.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.if	2009-04-28 15:26:38.000000000 -0400
+@@ -0,0 +1,22 @@
++
++## <summary>policy for fprintd</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run fprintd.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`fprintd_domtrans',`
++	gen_require(`
++		type fprintd_t;
++                type fprintd_exec_t;
++	')
++
++	domtrans_pattern($1,fprintd_exec_t,fprintd_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te
+--- nsaserefpolicy/policy/modules/services/fprintd.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-04-28 16:07:25.000000000 -0400
+@@ -0,0 +1,36 @@
++policy_module(fprintd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type fprintd_t;
++type fprintd_exec_t;
++dbus_system_domain(fprintd_t, fprintd_exec_t)
++
++allow fprintd_t self:fifo_file rw_fifo_file_perms;
++allow fprintd_t self:process { getsched signal };
++
++corecmd_search_bin(fprintd_t)
++
++dev_rw_generic_usb_dev(fprintd_t)
++dev_read_sysfs(fprintd_t)
++
++files_read_etc_files(fprintd_t)
++files_read_usr_files(fprintd_t)
++
++auth_use_nsswitch(fprintd_t)
++
++miscfiles_read_localization(fprintd_t)
++
++userdom_use_user_ptys(fprintd_t)
++userdom_read_all_users_state(fprintd_t)
++
++optional_policy(`
++	polkit_read_reload(fprintd_t)
++	polkit_read_lib(fprintd_t)
++')
++
++permissive fprintd_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.12/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/ftp.te	2009-04-23 09:44:57.000000000 -0400
@@ -17341,7 +17433,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/misc/PolicyKit.reload			gen_context(system_u:object_r:polkit_reload_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.6.12/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/polkit.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/polkit.if	2009-04-28 16:05:38.000000000 -0400
 @@ -0,0 +1,241 @@
 +
 +## <summary>policy for polkit_auth</summary>
@@ -19377,7 +19469,7 @@ diff -b -B --ignore-all-space --exclude-
  		mysql_search_db(httpd_prewikka_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.12/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-04-28 11:40:52.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-04-28 11:45:58.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -19393,7 +19485,7 @@ diff -b -B --ignore-all-space --exclude-
  type privoxy_t; # web_client_domain
  type privoxy_exec_t;
  init_daemon_domain(privoxy_t, privoxy_exec_t)
-@@ -72,21 +80,19 @@
+@@ -72,21 +80,18 @@
  
  logging_send_syslog_msg(privoxy_t)
  
@@ -19416,7 +19508,6 @@ diff -b -B --ignore-all-space --exclude-
 -	nscd_socket_use(privoxy_t)
 +tunable_policy(`privoxy_connect_any',`
 +	corenet_tcp_connect_all_ports(privoxy_t)
-+	corenet_tcp_bind_all_ports(privoxy_t)
 +	corenet_sendrecv_all_packets(privoxy_t)
  ')
  
@@ -22284,7 +22375,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.12/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-28 11:39:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-04-28 11:44:05.000000000 -0400
 @@ -118,6 +118,9 @@
  
  fs_getattr_all_fs(squid_t)
@@ -22994,8 +23085,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-23 09:44:57.000000000 -0400
-@@ -0,0 +1,70 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-28 15:43:36.000000000 -0400
+@@ -0,0 +1,72 @@
 +policy_module(sssd,1.0.0)
 +
 +########################################
@@ -23022,7 +23113,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# sssd local policy
 +#
-+allow sssd_t self:capability sys_nice;
++allow sssd_t self:capability { sys_nice setuid };
 +allow sssd_t self:process { setsched signal getsched };
 +allow sssd_t tmp_t:dir { read getattr open };
 +
@@ -23053,6 +23144,8 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_etc_files(sssd_t)
 +files_read_usr_files(sssd_t)
 +
++fs_list_inotifyfs(sssd_t)
++
 +auth_use_nsswitch(sssd_t)
 +auth_domtrans_chk_passwd(sssd_t)
 +auth_domtrans_upd_passwd(sssd_t)
@@ -29744,7 +29837,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-27 08:32:47.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-04-28 16:06:27.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -p -r1.846 -r1.847
--- selinux-policy.spec	28 Apr 2009 15:49:48 -0000	1.846
+++ selinux-policy.spec	28 Apr 2009 20:09:26 -0000	1.847
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,6 +480,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24
+- Allow nsplugin to unix_read unix_write sem for unconfined_java
+
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-23
 - Fix uml files to be owned by users
 



From th0br0 at fedoraproject.org  Tue Apr 28 20:10:34 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue, 28 Apr 2009 20:10:34 +0000 (UTC)
Subject: rpms/guimup/devel Guimup-0.1.4b-libmpdclient.patch, NONE,
	1.1 guimup.desktop, NONE, 1.1 guimup.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090428201034.43E7B70129@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/guimup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4134/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Guimup-0.1.4b-libmpdclient.patch guimup.desktop guimup.spec 
	import.log 
Log Message:
Initial CVS import for devel


Guimup-0.1.4b-libmpdclient.patch:

--- NEW FILE Guimup-0.1.4b-libmpdclient.patch ---
diff -Naur Guimup-0.1.4bsrc.orig/configure.ac Guimup-0.1.4bsrc/configure.ac
--- Guimup-0.1.4bsrc.orig/configure.ac	2009-02-16 21:40:59.000000000 +0100
+++ Guimup-0.1.4bsrc/configure.ac	2009-04-24 14:28:47.000000000 +0200
@@ -26,11 +26,11 @@
 
 
 
-AM_PROG_LIBTOOL
+LT_INIT
 
 
 
-PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.8])
+PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.8 libmpd])
 AC_SUBST(GUIMUP_CFLAGS)
 AC_SUBST(GUIMUP_LIBS)
 
diff -Naur Guimup-0.1.4bsrc.orig/src/gm_mpdcom.h Guimup-0.1.4bsrc/src/gm_mpdcom.h
--- Guimup-0.1.4bsrc.orig/src/gm_mpdcom.h	2009-04-21 15:49:50.000000000 +0200
+++ Guimup-0.1.4bsrc/src/gm_mpdcom.h	2009-04-24 14:29:49.000000000 +0200
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include <sys/types.h>
 
diff -Naur Guimup-0.1.4bsrc.orig/src/gm_tracks_mpdcom.h Guimup-0.1.4bsrc/src/gm_tracks_mpdcom.h
--- Guimup-0.1.4bsrc.orig/src/gm_tracks_mpdcom.h	2009-04-21 17:45:23.000000000 +0200
+++ Guimup-0.1.4bsrc/src/gm_tracks_mpdcom.h	2009-04-24 14:30:05.000000000 +0200
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include "gm_commandlist.h"
 #include "gm_itemlist.h"
diff -Naur Guimup-0.1.4bsrc.orig/src/Makefile.am Guimup-0.1.4bsrc/src/Makefile.am
--- Guimup-0.1.4bsrc.orig/src/Makefile.am	2008-04-29 12:51:04.000000000 +0200
+++ Guimup-0.1.4bsrc/src/Makefile.am	2009-04-24 14:30:17.000000000 +0200
@@ -19,8 +19,6 @@
 	gm_player.h \
 	gm_player.cc \
 	gm_player_pix.h \
-	libmpdclient.c \
-	libmpdclient.h \
 	gm_scroller.cc \
 	gm_scroller.h \
 	gm_config.h \


--- NEW FILE guimup.desktop ---
[Desktop Entry]
Name=Guimup
Comment=GTKmm based drag-&-drop oriented client for MPD
GenericName=Client for MPD
Type=Application
Exec=guimup
Icon=guimup
Terminal=false
Categories=GTK;AudioVideo;Audio;Player


--- NEW FILE guimup.spec ---
Name:		guimup
Version:	0.1.4
Release:	6.b%{?dist}
Summary:	A GTKmm based drag-&-drop oriented client for MPD

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://www.coonsden.com/
Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}bsrc.tar.gz
Source1:	guimup.desktop
Patch0:		Guimup-%{version}b-libmpdclient.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	intltool
BuildRequires:	gtkmm24-devel
BuildRequires:	libmpd-devel
BuildRequires:	libtool
BuildRequires:	desktop-file-utils
Requires:	mpd

%description
GUIMUP is a client for the music player daemon (MPD) written
in C++ and GTKmm. The program can be used with most Linux 
desktops but, as a GTK program, is best suited for GNOME and 
XFCE.

The focus of the program is on mouse handling: 
playlist management is done entirely by drag-&-drop; 
playback functions are directly accessible from the system tray. 
Guimup turns MPD into a perfect desktop music player.

%prep
%setup -q -n Guimup-%{version}bsrc
rm src/libmpdclient*
%patch0 -p1
autoreconf -f

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps

make install DESTDIR=%{buildroot} \
	INSTALL="install -p"
	
rm -rf %{buildroot}%{_usr}/doc

desktop-file-install \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{SOURCE1}
install -p -m0644 Icons/%{name}48.png \
	%{buildroot}%{_datadir}/pixmaps/%{name}.png
%clean
rm -rf %{buildroot}


%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Sat Apr 25 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-6.b
- Fixed release tag
- Fixed timestamp not preserved when installing the icon

* Fri Apr 24 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-5
- Bug fix release by upstream for guimup crashing when MPD can't be started

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-4
- Fixed desktop file
- Beauty fixes

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-3
- Updated Source0

* Thu Apr 23 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-2
- Added desktop file
- Removed libmpdclient from the source
- Macro usage fixed
- global srcname removed

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> 0.1.4-1
- Initial package build


--- NEW FILE import.log ---
guimup-0_1_4-6_b_fc10:HEAD:guimup-0.1.4-6.b.fc10.src.rpm:1240949243


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Apr 2009 05:33:32 -0000	1.1
+++ .cvsignore	28 Apr 2009 20:10:03 -0000	1.2
@@ -0,0 +1 @@
+Guimup-0.1.4bsrc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Apr 2009 05:33:32 -0000	1.1
+++ sources	28 Apr 2009 20:10:03 -0000	1.2
@@ -0,0 +1 @@
+76bf768bfc8e6a55b176e35529d93e47  Guimup-0.1.4bsrc.tar.gz



From ssp at fedoraproject.org  Tue Apr 28 21:02:50 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Tue, 28 Apr 2009 21:02:50 +0000 (UTC)
Subject: rpms/pixman/F-10 emms.patch,NONE,1.1 pixman.spec,1.23,1.24
Message-ID: <20090428210250.C442570129@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14767

Modified Files:
	pixman.spec 
Added Files:
	emms.patch 
Log Message:
Fix 497552

emms.patch:

--- NEW FILE emms.patch ---
diff -up pixman-0.12.0/pixman/pixman-sse2.c.emms pixman-0.12.0/pixman/pixman-sse2.c
--- pixman-0.12.0/pixman/pixman-sse2.c.emms	2009-04-28 16:49:03.000000000 -0400
+++ pixman-0.12.0/pixman/pixman-sse2.c	2009-04-28 16:50:10.000000000 -0400
@@ -2357,11 +2357,11 @@ fbComposeSetupSSE2(void)
         pixman_composeFunctions.combineC[PIXMAN_OP_ADD] = sse2CombineAddC;
 
         pixman_composeFunctions.combineMaskU = sse2CombineMaskU;
+
+	_mm_empty();
     }
 
     initialized = TRUE;
-
-    _mm_empty();
 }
 
 


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-10/pixman.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pixman.spec	18 Nov 2008 21:25:27 -0000	1.23
+++ pixman.spec	28 Apr 2009 21:02:20 -0000	1.24
@@ -16,6 +16,7 @@ Source0:        pixman-%{version}.tar.gz
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		pixman-0.11.4-altivec.patch
+Patch1:		emms.patch
 
 # BuildRequires:  automake autoconf libtool pkgconfig
 
@@ -34,6 +35,7 @@ Development library for pixman.
 %prep
 %setup -q
 %patch0 -p1 -b .altivec
+%patch1 -p1 -b .emms
 
 %build
 %configure --disable-static
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Tue Apr 28 2009 Soren Sandmann <sandmann at redhat.com> 0.12.0-3
+- Add patch to move emms to right place (rh #497552)
+
 * Tue Nov 18 2008 Dan Williams <dcbw at redhat.com> 0.12.0-2
 - Actually build with the altivec detection fix (rh #472000, #451831)
 



From ssp at fedoraproject.org  Tue Apr 28 21:04:27 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Tue, 28 Apr 2009 21:04:27 +0000 (UTC)
Subject: rpms/pixman/F-10 pixman.spec,1.24,1.25
Message-ID: <20090428210427.86E0A70129@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15082

Modified Files:
	pixman.spec 
Log Message:
Bump release


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-10/pixman.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pixman.spec	28 Apr 2009 21:02:20 -0000	1.24
+++ pixman.spec	28 Apr 2009 21:03:57 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.12.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries



From ajax at fedoraproject.org  Tue Apr 28 21:19:17 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 28 Apr 2009 21:19:17 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-intel-tiling-transition.patch, NONE,
	1.1 kernel.spec, 1.1576, 1.1577
Message-ID: <20090428211917.075CE70129@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17949

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-tiling-transition.patch 
Log Message:
* Tue Apr 28 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-115
- drm-intel-tiling-transition.patch: Fix transitions to linear mode.


drm-intel-tiling-transition.patch:

--- NEW FILE drm-intel-tiling-transition.patch ---
From: Keith Packard <keithp at keithp.com>
Date: Thu, 16 Apr 2009 22:17:39 +0000 (-0700)
Subject: drm/i915: fix transition to I915_TILING_NONE
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fanholt%2Fdrm-intel.git;a=commitdiff_plain;h=5b0bdd6f7284ed39ee553f8a8c4f0d372c87133a

drm/i915: fix transition to I915_TILING_NONE

Transitions to TILING_NONE skipped the call to unbind the object, which left
the fence register set and caused future CPU access through the GTT to
access the object in tiled mode.

Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
---

diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index f27e523..52a0593 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -283,7 +283,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 	mutex_lock(&dev->struct_mutex);
 
 	if (args->tiling_mode == I915_TILING_NONE) {
-		obj_priv->tiling_mode = I915_TILING_NONE;
 		args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
 	} else {
 		if (args->tiling_mode == I915_TILING_X)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1576
retrieving revision 1.1577
diff -u -p -r1.1576 -r1.1577
--- kernel.spec	28 Apr 2009 15:01:24 -0000	1.1576
+++ kernel.spec	28 Apr 2009 21:18:46 -0000	1.1577
@@ -692,6 +692,7 @@ Patch1821: drm-intel-lying-systems-witho
 Patch1822: drm-intel-gen3-fb-hack.patch
 Patch1823: drm-intel-tiled-front.patch
 Patch1824: drm-intel-hdmi-edid-fix.patch
+Patch1825: drm-intel-tiling-transition.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1359,6 +1360,7 @@ ApplyPatch drm-intel-lying-systems-witho
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-intel-tiled-front.patch
 ApplyPatch drm-intel-hdmi-edid-fix.patch
+ApplyPatch drm-intel-tiling-transition.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1993,6 +1995,9 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 28 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-115
+- drm-intel-tiling-transition.patch: Fix transitions to linear mode.
+
 * Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-114
 - Make the kernel-vanilla package buildable again.
 



From abompard at fedoraproject.org  Tue Apr 28 21:22:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Tue, 28 Apr 2009 21:22:06 +0000 (UTC)
Subject: rpms/springlobby/devel springlobby.spec,1.5,1.6
Message-ID: <20090428212206.D0B8870129@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18475

Modified Files:
	springlobby.spec 
Log Message:
* Tue Apr 28 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.0.1.10425-4
- rebuild



Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- springlobby.spec	29 Mar 2009 10:31:29 -0000	1.5
+++ springlobby.spec	28 Apr 2009 21:21:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           springlobby
 Version:        0.0.1.10425
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
 Group:          Amusements/Games
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.0.1.10425-4
+- rebuild
+
 * Sun Mar 29 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.0.1.10425-3
 - add patch for gcc 4.4
 



From slankes at fedoraproject.org  Tue Apr 28 21:49:10 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 28 Apr 2009 21:49:10 +0000 (UTC)
Subject: rpms/merkaartor/devel merkaartor-noqgtkstyle.patch, NONE,
	1.1 merkaartor.spec, 1.11, 1.12
Message-ID: <20090428214910.70E7E70129@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23328

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-noqgtkstyle.patch 
Log Message:
force non-qgtkstyle

merkaartor-noqgtkstyle.patch:

--- NEW FILE merkaartor-noqgtkstyle.patch ---
--- Main.cpp.orig	2009-04-28 23:23:20.804816252 +0200
+++ Main.cpp	2009-04-28 23:23:32.628816670 +0200
@@ -9,6 +9,8 @@
 
 int main(int argc, char** argv)
 {
+        QApplication::setStyle("plastique");
+
 	QApplication app(argc,argv);
 
 	QCoreApplication::setOrganizationName("BartVanhauwaert");


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- merkaartor.spec	26 Apr 2009 19:18:30 -0000	1.11
+++ merkaartor.spec	28 Apr 2009 21:48:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -9,6 +9,7 @@ URL:            http://www.merkaartor.or
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 # This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
 Patch0:         merkaartor-eslang.patch
+Patch1:         merkaartor-noqgtkstyle.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -26,10 +27,11 @@ transparent display of map features like
 %prep
 %setup -q 
 %patch0 -p0
+%patch1 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
 make %{?_smp_mflags}
 
 
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
+- disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
+
 * Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
 - new upstream release
 



From slankes at fedoraproject.org  Tue Apr 28 22:08:58 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 28 Apr 2009 22:08:58 +0000 (UTC)
Subject: rpms/merkaartor/F-10 merkaartor-noqgtkstyle.patch, NONE,
	1.1 merkaartor.spec, 1.11, 1.12
Message-ID: <20090428220858.B3A2C7013C@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27813/F-10

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-noqgtkstyle.patch 
Log Message:
force non-qgtkstyle (work around bz #498111)

merkaartor-noqgtkstyle.patch:

--- NEW FILE merkaartor-noqgtkstyle.patch ---
--- Main.cpp.orig	2009-04-28 23:23:20.804816252 +0200
+++ Main.cpp	2009-04-28 23:23:32.628816670 +0200
@@ -9,6 +9,8 @@
 
 int main(int argc, char** argv)
 {
+        QApplication::setStyle("plastique");
+
 	QApplication app(argc,argv);
 
 	QCoreApplication::setOrganizationName("BartVanhauwaert");


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-10/merkaartor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- merkaartor.spec	26 Apr 2009 19:45:39 -0000	1.11
+++ merkaartor.spec	28 Apr 2009 22:08:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -9,6 +9,7 @@ URL:            http://www.merkaartor.or
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 # This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
 Patch0:         merkaartor-eslang.patch
+Patch1:         merkaartor-noqgtkstyle.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -26,10 +27,11 @@ transparent display of map features like
 %prep
 %setup -q 
 %patch0 -p0
+%patch1 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
 make %{?_smp_mflags}
 
 
@@ -57,7 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
-* Sun Apr 25 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+* Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
+- disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
+
+* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
 - new upstream release
 
 * Sat Apr 11 2009 Rex Dieter <rdieter at fedoraproject.org> 0.13.1-1.1



From slankes at fedoraproject.org  Tue Apr 28 22:08:59 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 28 Apr 2009 22:08:59 +0000 (UTC)
Subject: rpms/merkaartor/F-11 merkaartor-noqgtkstyle.patch, NONE,
	1.1 merkaartor.spec, 1.11, 1.12
Message-ID: <20090428220859.069387013C@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27813/F-11

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-noqgtkstyle.patch 
Log Message:
force non-qgtkstyle (work around bz #498111)

merkaartor-noqgtkstyle.patch:

--- NEW FILE merkaartor-noqgtkstyle.patch ---
--- Main.cpp.orig	2009-04-28 23:23:20.804816252 +0200
+++ Main.cpp	2009-04-28 23:23:32.628816670 +0200
@@ -9,6 +9,8 @@
 
 int main(int argc, char** argv)
 {
+        QApplication::setStyle("plastique");
+
 	QApplication app(argc,argv);
 
 	QCoreApplication::setOrganizationName("BartVanhauwaert");


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/merkaartor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- merkaartor.spec	26 Apr 2009 19:45:39 -0000	1.11
+++ merkaartor.spec	28 Apr 2009 22:08:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -9,6 +9,7 @@ URL:            http://www.merkaartor.or
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 # This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
 Patch0:         merkaartor-eslang.patch
+Patch1:         merkaartor-noqgtkstyle.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -26,10 +27,11 @@ transparent display of map features like
 %prep
 %setup -q 
 %patch0 -p0
+%patch1 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
 make %{?_smp_mflags}
 
 
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
+- disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
+
 * Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
 - new upstream release
 



From slankes at fedoraproject.org  Tue Apr 28 22:08:59 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 28 Apr 2009 22:08:59 +0000 (UTC)
Subject: rpms/merkaartor/F-9 merkaartor-noqgtkstyle.patch, NONE,
	1.1 merkaartor.spec, 1.4, 1.5
Message-ID: <20090428220859.424827013C@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27813/F-9

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-noqgtkstyle.patch 
Log Message:
force non-qgtkstyle (work around bz #498111)

merkaartor-noqgtkstyle.patch:

--- NEW FILE merkaartor-noqgtkstyle.patch ---
--- Main.cpp.orig	2009-04-28 23:23:20.804816252 +0200
+++ Main.cpp	2009-04-28 23:23:32.628816670 +0200
@@ -9,6 +9,8 @@
 
 int main(int argc, char** argv)
 {
+        QApplication::setStyle("plastique");
+
 	QApplication app(argc,argv);
 
 	QCoreApplication::setOrganizationName("BartVanhauwaert");


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/merkaartor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- merkaartor.spec	26 Apr 2009 19:45:40 -0000	1.4
+++ merkaartor.spec	28 Apr 2009 22:08:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -9,6 +9,7 @@ URL:            http://www.merkaartor.or
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 # This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
 Patch0:         merkaartor-eslang.patch
+Patch1:         merkaartor-noqgtkstyle.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -26,10 +27,11 @@ transparent display of map features like
 %prep
 %setup -q 
 %patch0 -p0
+%patch1 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
 make %{?_smp_mflags}
 
 
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
+- disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
+
 * Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
 - new upstream release
 



From lkundrak at fedoraproject.org  Tue Apr 28 22:14:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 28 Apr 2009 22:14:29 +0000 (UTC)
Subject: rpms/sunbird/devel mozilla-jemalloc.patch, NONE,
	1.1 sunbird-1.0-libical.patch, NONE,
	1.1 sunbird-1.0-uilocale.patch, NONE,
	1.1 thunderbird-pango.patch, NONE,
	1.1 thunderbird-shared-error.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 sources, 1.10, 1.11 sunbird.spec, 1.21,
	1.22 sunbird-0.7-path.patch, 1.1,
	NONE sunbird-0.7-uilocale.patch, 1.1,
	NONE sunbird-0.9-libical.patch, 1.3, NONE
Message-ID: <20090428221429.A5BF77013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30034/devel

Modified Files:
	.cvsignore sources sunbird.spec 
Added Files:
	mozilla-jemalloc.patch sunbird-1.0-libical.patch 
	sunbird-1.0-uilocale.patch thunderbird-pango.patch 
	thunderbird-shared-error.patch 
Removed Files:
	sunbird-0.7-path.patch sunbird-0.7-uilocale.patch 
	sunbird-0.9-libical.patch 
Log Message:
* Tue Apr 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.1.20090302hg
- Update to version matching current Thunderbird


mozilla-jemalloc.patch:

--- NEW FILE mozilla-jemalloc.patch ---
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- mozilla/memory/jemalloc/jemalloc.h	Sat Nov 22 20:22:22 2008 +0100
+++ mozilla/memory/jemalloc/jemalloc.h	Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
 } jemalloc_stats_t;
 
 #ifndef MOZ_MEMORY_DARWIN
-void	*malloc(size_t size);
-void	*valloc(size_t size);
-void	*calloc(size_t num, size_t size);
-void	*realloc(void *ptr, size_t size);
-void	free(void *ptr);
+void	*malloc(size_t size)  __THROW __attribute_malloc__ __wur;
+void	*valloc(size_t size)  __THROW __attribute_malloc__ __wur;
+void	*calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
+void	*realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
+void	free(void *ptr)  __THROW __attribute_malloc__ __wur;
 #endif
 
-int	posix_memalign(void **memptr, size_t alignment, size_t size);
+int	posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
 void	*memalign(size_t alignment, size_t size);
 size_t	malloc_usable_size(const void *ptr);
 void	jemalloc_stats(jemalloc_stats_t *stats);

sunbird-1.0-libical.patch:

--- NEW FILE sunbird-1.0-libical.patch ---
Link against system libical instead of bundled.
https://bugzilla.redhat.com/show_bug.cgi?id=459923

Lubomir Rintel <lkundrak at v3.sk>

--- calendar/base/build/Makefile.in.libical	2007-12-27 11:01:41.000000000 +0100
+++ calendar/base/build/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -63,7 +63,6 @@
 	js \
 	xpconnect \
 	string \
-	ical \
 	calbase
 
 CPPSRCS = calBaseModule.cpp \
@@ -74,7 +73,6 @@
 
 SHARED_LIBRARY_LIBS = \
     $(DEPTH)/calendar/base/src/$(LIB_PREFIX)calbase_s.$(LIB_SUFFIX) \
-    $(DEPTH)/calendar/libical/src/libical/$(LIB_PREFIX)mozical.$(LIB_SUFFIX) \
     $(NULL)
 
 ifdef MOZILLA_INTERNAL_API
@@ -94,4 +92,7 @@
 	$(NULL)
 endif
 
+# External libical
+EXTRA_DSO_LDOPTS += -lical
+
 include $(topsrcdir)/config/rules.mk
--- calendar/Makefile.in.libical	2008-09-23 17:13:34.000000000 +0200
+++ calendar/Makefile.in	2008-09-23 17:07:30.000000000 +0200
@@ -42,7 +42,7 @@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libical resources base providers import-export locales
+DIRS = resources base providers import-export locales
 
 ifdef ENABLE_TESTS
 DIRS += test
--- calendar/lightning/Makefile.in.libical	2008-07-24 03:07:05.000000000 +0200
+++ calendar/lightning/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -71,7 +71,7 @@
 endif
 endif
 
-DIRS = ../libical \
+DIRS = \
        ../locales \
        ../base \
        ../providers \
--- /dev/null	2008-09-23 20:44:22.879046487 +0200
+++ calendar/base/src/ical.h	2008-09-24 11:28:09.000000000 +0200
@@ -0,0 +1,3 @@
+#pragma GCC visibility push(default)
+#include <libical/ical.h>
+#pragma GCC visibility pop

sunbird-1.0-uilocale.patch:

--- NEW FILE sunbird-1.0-uilocale.patch ---
Guess the UI locale to use.  If only intl.locale.matchOS worked...

Lubomir Rintel <lkundrak at v3.sk>

diff -up mozilla/build/unix/mozilla.in.uilocale mozilla/build/unix/mozilla.in
diff -up mozilla/build/unix/run-mozilla.sh.uilocale mozilla/build/unix/run-mozilla.sh
--- mozilla/build/unix/run-mozilla.sh.uilocale	2009-04-28 21:53:14.000000000 +0200
+++ mozilla/build/unix/run-mozilla.sh	2009-04-28 21:54:39.000000000 +0200
@@ -279,6 +279,23 @@ MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
 if [ -z "$MRE_HOME" ]; then
     MRE_HOME=$MOZILLA_FIVE_HOME
 fi
+
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+
+SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+
+if [ -f ${MOZ_DIST_BIN}/extensions/langpack-${MOZLOCALE}@sunbird.mozilla.org/chrome/$MOZLOCALE.jar ]
+then
+	set -- "$@" -UILocale $MOZLOCALE
+else
+	if [ -f ${MOZ_DIST_BIN}/extensions/langpack-${SHORTMOZLOCALE}@sunbird.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]
+	then
+		set -- "$@" -UILocale $SHORTMOZLOCALE
+	fi
+fi
+
 ##
 ## Set LD_LIBRARY_PATH
 ##

thunderbird-pango.patch:

--- NEW FILE thunderbird-pango.patch ---
diff -upU8 thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
--- thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix	2009-03-03 12:04:16.000000000 +0100
+++ thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp	2009-03-03 12:05:37.000000000 +0100
@@ -1798,22 +1798,21 @@ gfx_pango_font_map_context_substitute(Pa
     double size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
     gfxPangoFontGroup *fontGroup = GetFontGroup(context);
     PRBool usePrinterFont = fontGroup && fontGroup->GetStyle()->printerFont;
     PrepareSortPattern(pattern, size, 1.0, usePrinterFont);
 }
 
 static PangoFcFont *
 gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
-                               PangoContext *context,
-                               const PangoFontDescription *desc,
-                               FcPattern *pattern)
+                               PangoFcFontKey *fontkey)
 {
+    const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
-                                      "pattern", pattern, NULL));
+                                      "pattern", p_pattern, NULL));
 }
 
 static void
 gfx_pango_font_map_class_init(gfxPangoFontMapClass *klass)
 {
     // inherit GObjectClass::finalize from parent as this class adds no data.
 
     PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (klass);
@@ -1823,19 +1822,18 @@ gfx_pango_font_map_class_init(gfxPangoFo
     fontmap_class->load_fontset = gfx_pango_font_map_load_fontset;
     // inherit fontmap_class->shape_engine_type from PangoFcFontMap
 
     PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
     fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution;
     // context_key_* virtual functions are only necessary if we want to
     // dynamically respond to changes in the screen cairo_font_options_t.
 
-    // context_substitute and get_font are not likely to be used but
+    // get_font are not likely to be used but
     //   implemented because the class makes them available.
-    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
 }
 
 /**
  ** gfxPangoFontGroup
  **/
 
 struct FamilyCallbackData {

thunderbird-shared-error.patch:

--- NEW FILE thunderbird-shared-error.patch ---
diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
--- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-02-24 03:16:03.000000000 +0100
+++ thunderbird-3.0/mail/installer/Makefile.in	2009-02-27 16:02:31.000000000 +0100
@@ -56,16 +56,17 @@ NO_PKG_FILES = \
 	PalmSyncInstall.exe \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 ifdef BUILD_STATIC_LIBS
+ifeq (BUILD_STATIC_LIBS, 1)
 ifeq (WINNT,$(OS_ARCH))
 MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
 endif
 else
 $(error you need a "--enable-static --disable-shared" build to create an installer)
 endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
@@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 DEFINES += -DAB_CD=$(AB_CD)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
+endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Sep 2008 20:38:51 -0000	1.10
+++ .cvsignore	28 Apr 2009 22:13:59 -0000	1.11
@@ -1,3 +1,2 @@
-lightning-0.9.linux-i686.xpi
-sunbird-langpacks-0.9.tar.gz
-lightning-sunbird-0.9-source.tar.bz2
+thunderbird-3.0b2-source.tar.bz2
+sunbird-l10n.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Sep 2008 20:38:51 -0000	1.10
+++ sources	28 Apr 2009 22:13:59 -0000	1.11
@@ -1,3 +1,2 @@
-8086ee725f2d3eca17c375a3812c3618  lightning-0.9.linux-i686.xpi
-adcef4eab2cbc14c1534ab80cb684273  sunbird-langpacks-0.9.tar.gz
-ff4ae1e9c1071d8d478504d95d7dabee  lightning-sunbird-0.9-source.tar.bz2
+3a6a95040c4356139a02eab5d32b9ad1  thunderbird-3.0b2-source.tar.bz2
+9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sunbird.spec	1 Mar 2009 12:47:20 -0000	1.21
+++ sunbird.spec	28 Apr 2009 22:13:59 -0000	1.22
@@ -1,41 +1,41 @@
 %bcond_without lightning
 %ifarch ppc
 %if 0%{?rhel}
-%define with_lightning 0
+%define with_lightning %{nil}
 %endif
 %endif
 
-%define progdir %{_prefix}/%{_lib}/%{name}-%{version}
-%define docs LEGAL LICENSE README.txt
-%{?_with_official:%define official 1}
+%define progdir %{_libdir}/%{name}-%{version}pre
 
 # This is to filter unwanted provides, that should be provided only by gecko-devel
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
 Name:           sunbird
-Version:        0.9
-Release:        6%{?dist}
+Version:        1.0
+Release:        0.1.20090302hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
-Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
+#Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
+Source0:        thunderbird-3.0b2-source.tar.bz2
 Source1:        sunbird.desktop
-Source2:        sunbird-langpacks-%{version}.tar.gz
+Source2:        sunbird-l10n.tar
+#sunbird-langpacks-0.9.tar.gz
 Source3:        mozilla-extension-update.sh
 # This is used just for langpacks.
 # TODO: build them!
-Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}/lightning-%{version}.linux-i686.xpi
+#Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/0.9/lightning-0.9.linux-i686.xpi
 Source100:      find-external-requires
-Patch0:         sunbird-0.9-libical.patch
-
-# build patches
-Patch2:         sunbird-0.7-path.patch
-Patch3:         sunbird-0.7-uilocale.patch
+Patch0:         sunbird-1.0-libical.patch
+Patch3:         sunbird-1.0-uilocale.patch
 Patch4:         sunbird-0.9-gcc44.patch
-   
+Patch21:        mozilla-jemalloc.patch
+Patch22:        thunderbird-shared-error.patch
+Patch24:        thunderbird-pango.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libIDL-devel
@@ -52,19 +52,17 @@ BuildRequires:  libical-devel
 BuildRequires:  zip
 
 Requires(post):  desktop-file-utils
-Requires(postun):  desktop-file-utils
-
-# There's no RHEL desktop for ppc, therefore no thunderbird
-ExcludeArch: ppc
+Requires(postun): desktop-file-utils
 
 AutoProv: 0
 
 %description
-Mozilla Sunbird??? is a cross-platform calendar application, built upon
-Mozilla Toolkit. Our goal is to bring Mozilla-style ease-of-use to your
+Mozilla Sunbird is a cross-platform calendar application, built upon
+Mozilla Toolkit. It brings Mozilla-style ease-of-use to your
 calendar, without tying you to a particular storage solution.
 
-%if %{with_lightning}
+
+%if %with lightning
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
@@ -79,158 +77,125 @@ Mozilla Thunderbird. Since it's an exten
 integrated with Thunderbird, allowing it to easily perform email-related
 calendaring tasks.
 
-
 %define lightning_extname '{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-
-%define tbupdate_lightning                                      \\\
-  %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh  \\\
-  --appname thunderbird                                         \\\
-  --extname %{lightning_extname}                                \\\
-  --basedir %{_libdir}                                          \\\
-  --extpath %{_libdir}/thunderbird-lightning                    \\\
-  --action 
+%define tbupdate_lightning                                              \\\
+        %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh    \\\
+        --appname thunderbird                                           \\\
+        --extname %{lightning_extname}                                  \\\
+        --basedir %{_libdir}                                            \\\
+        --extpath %{_libdir}/thunderbird-lightning                      \\\
+        --action 
 %endif
 
 
 %prep
-%setup -q -n mozilla
-%patch0 -p1 -b .libical
-%patch2 -p1 -b .path
-%patch3 -p1 -b .uilocale
-%patch4 -p1 -b .gcc44
-# Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
-find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x '{}' \;
+%setup -q -c -a 2
+%patch0 -p0 -b .libical
+%patch3 -p0 -b .uilocale
+%patch4 -p0 -b .gcc44
+%patch21 -p0 -b .jemalloc
+%patch22 -p1 -b .shared-error
+%patch24 -p1 -b .pango-fix
+
+find $RPM_BUILD_ROOT -name '*.cpp' -o -name '*.h' -print0 |
+        xargs -0 chmod -x
 
 
 %build
-%if 0%{?official}
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-%endif
-export CFLAGS="$(echo $RPM_OPT_FLAGS |sed 's/-O2/-Os/;s/-Wall//')"
-export CXXFLAGS="$CFLAGS"
-cat << EOF > .mozconfig
-%if 0%{?official}
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-ac_add_options --enable-official-branding
-%endif
-mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}
-ac_add_options --enable-application=calendar
-ac_add_options --prefix=%{_prefix}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
+cat >.mozconfig <<EOF
+ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-xinerama
-ac_add_options --disable-xprint
+ac_add_options --disable-install-strip
 ac_add_options --disable-strip
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --disable-xprint
+ac_add_options --enable-application=calendar
+ac_add_options --enable-calendar
+ac_add_options --enable-canvas
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-optimize="$(echo $RPM_OPT_FLAGS |sed -e 's/-O2/-Os/;s/-Wall//')"
 ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
-ac_add_options --enable-canvas
-%if %{with_lightning}
-ac_add_options --enable-extensions=default,lightning
-%else
-ac_add_options --enable-extensions=default
-%endif
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
+ac_add_options --enable-system-cairo
+ac_add_options --enable-xinerama
+ac_add_options --libdir="%{_libdir}"
+ac_add_options --prefix="%{_prefix}"
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-zlib
 EOF
-make -f client.mk MOZ_CAIRO_LIBS='-lcairo -lX11 -lXrender' build
-# make package directory
-make -C xpinstall/packager STRIP=/bin/true
-
-#ac_add_options --enable-default-toolkit=cairo-gtk2
-# configure: error: Toolkit must be cairo-gtk2.
-
-#ac_add_options --with-system-png
-# checking for png_get_valid in -lpng... yes
-# checking for png_get_acTL in -lpng... no
-# configure: error: --with-system-png won't work because the system's libpng doesn't have APNG support
+
+make -k -f client.mk build
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# The make install does not work (it tries to build additional stuff that break)
-#make install DESTDIR=$RPM_BUILD_ROOT
-# TODO: Is the above still true? Recheck!
 
-# copy tree into RPM_BUILD_ROOT
+# make install is bogus
+# copy tree, break symlinks
 mkdir -p $RPM_BUILD_ROOT%{progdir}
-cp -rf $RPM_BUILD_DIR/mozilla/dist/%{name}/* $RPM_BUILD_ROOT%{progdir}
+cp -rL mozilla/dist/bin/* $RPM_BUILD_ROOT%{progdir}
 mkdir $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{progdir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-
 desktop-file-install --vendor="fedora"                  \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/        \
-  %{SOURCE1}
-
-# Fix some permissions
-find $RPM_BUILD_ROOT%{progdir} -name "*.xpm" -o -name "*.png" |xargs chmod -x
-chmod -x $RPM_BUILD_ROOT%{progdir}/defaults/profile/prefs.js    \
-  $RPM_BUILD_ROOT%{progdir}/js/calAlarmMonitor.js               \
-  $RPM_BUILD_ROOT%{progdir}/js/calFreeBusyService.js
-
-%if %{with_lightning}
-# Avoid "Chrome Registration Failed" message on first startup and extension installation
-touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
-%endif
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications/  \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
 cp $RPM_BUILD_ROOT%{progdir}/icons/mozicon128.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-
-# Docs in %%doc
-for doc in %{docs}; do
-  rm -f $RPM_BUILD_ROOT%{progdir}/$doc
-done
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 # Install langpacks
 mkdir -p $RPM_BUILD_ROOT%{progdir}/extensions
-rm -rf sunbird-langpacks
-mkdir sunbird-langpacks
-tar xzf %{SOURCE2} -C sunbird-langpacks
-for langpack in sunbird-langpacks/*.xpi; do
-  language=$(basename $langpack .xpi)
-  extensiondir=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$language at sunbird.mozilla.org
-  mkdir -p $extensiondir
-  unzip -qod $extensiondir $langpack
-  find $extensiondir -type f -print0 |xargs -0 chmod 644
-  # Fix #441500
-  sed 's/\r//g' $extensiondir/install.rdf |awk '/^$/ {next} {print}' >lala
-  mv lala $extensiondir/install.rdf
+ls sunbird-l10n/*.xpi |while read PACK
+do
+        LANGUAGE=$(echo $PACK |sed 's,sunbird-l10n/sunbird-%{version}pre.\(.*\).langpack.xpi,\1,')
+        DIR=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$LANGUAGE at sunbird.mozilla.org
+        mkdir -p $DIR
+        unzip -qod $DIR $PACK
+        find $DIR -type f -print0 |xargs -0 chmod 0644
+
+        # Fix #441500
+        sed 's/\r//g' $DIR/install.rdf |awk '/^$/ {next} {print}' >lala
+        touch -r $DIR/install.rdf lala
+        mv lala $DIR/install.rdf
+
 done
 
-%if %{with_lightning}
+%if %with lightning
+# Avoid "Chrome Registration Failed" message on first startup and extension installation
+touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
+
 # Lightning
-unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning mozilla/dist/xpi-stage/lightning.xpi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
-# Fix some permissions
-chmod -x $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calAlarmMonitor.js \
-  $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calFreeBusyService.js
 
+# No langpacks for preview release
+%if 0
 # Unpack lightning language packs, except en_US
-unzip -l %{SOURCE4} '*.jar'                                     |
-  awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}'                   |
-  xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+unzip -l %{SOURCE4} '*.jar' |
+        awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}' |
+        xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+
 # Register them
-ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome       |
-  sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
-  >> $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
-# ^^^ I'm going to burn in hell for this ^^^
+ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome |
+        sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
+        >>$RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
+        # ^^^ I'm going to burn in hell for this ^^^
+%endif
 %endif
 
+# Permissions fixup
+find $RPM_BUILD_ROOT -name '*.xpm' -o -name '*.js' -print0 |
+        xargs -0 chmod 0644 mozilla/LICENSE
+find $RPM_BUILD_ROOT -name '*.so' -print0 |
+        xargs -0 chmod 0755
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -240,7 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+        %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
@@ -248,18 +213,18 @@ fi
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+        %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
-%if %{with_lightning}
+%if %with lightning
 %post -n thunderbird-lightning
 %{tbupdate_lightning} install ||??:
 
 
 %preun -n thunderbird-lightning
 if [ $1 = 0 ]; then
-  %{tbupdate_lightning} remove ||??:
+        %{tbupdate_lightning} remove ||??:
 fi
 
 
@@ -268,7 +233,7 @@ fi
 # is guarded against upgrade, but because of our triggerun,
 # which is run on self-upgrade, though triggerpostun isn't
 if [ $1 != 0 ]; then
-  %{tbupdate_lightning} install || :
+        %{tbupdate_lightning} install || :
 fi
 
 %triggerin -n thunderbird-lightning -- thunderbird
@@ -281,28 +246,32 @@ fi
 # Guard against being run post-self-uninstall, even though that
 # doesn't happen currently (see comment above)
 if [ $1 != 0 ]; then
-  %{tbupdate_lightning} install ||??:
+        %{tbupdate_lightning} install ||??:
 fi
 %endif
 
 
 %files
 %defattr(-,root,root,-)
-%doc %{docs}
+%doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
 %{progdir}
 %{_bindir}/sunbird
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/128x128/apps/sunbird.png
 
 
-%if %{with_lightning}
+%if %with lightning
 %files -n thunderbird-lightning
+%doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
 %defattr(-,root,root,-)
 %{_libdir}/thunderbird-lightning
 %endif
 
 
 %changelog
+* Tue Apr 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.1.20090302hg
+- Update to version matching current Thunderbird
+
 * Sun Mar 1 2009 Lubomir Rintel <lkundrak at v3.sk> 0.9-6
 - Fix build with GCC 4.4
 


--- sunbird-0.7-path.patch DELETED ---


--- sunbird-0.7-uilocale.patch DELETED ---


--- sunbird-0.9-libical.patch DELETED ---



From lkundrak at fedoraproject.org  Tue Apr 28 22:14:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 28 Apr 2009 22:14:29 +0000 (UTC)
Subject: rpms/sunbird/F-11 mozilla-jemalloc.patch, NONE,
	1.1 sunbird-1.0-libical.patch, NONE,
	1.1 sunbird-1.0-uilocale.patch, NONE,
	1.1 thunderbird-pango.patch, NONE,
	1.1 thunderbird-shared-error.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 sources, 1.10, 1.11 sunbird.spec, 1.21,
	1.22 sunbird-0.7-path.patch, 1.1,
	NONE sunbird-0.7-uilocale.patch, 1.1,
	NONE sunbird-0.9-libical.patch, 1.3, NONE
Message-ID: <20090428221429.85D5A70129@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30034/F-11

Modified Files:
	.cvsignore sources sunbird.spec 
Added Files:
	mozilla-jemalloc.patch sunbird-1.0-libical.patch 
	sunbird-1.0-uilocale.patch thunderbird-pango.patch 
	thunderbird-shared-error.patch 
Removed Files:
	sunbird-0.7-path.patch sunbird-0.7-uilocale.patch 
	sunbird-0.9-libical.patch 
Log Message:
* Tue Apr 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.1.20090302hg
- Update to version matching current Thunderbird


mozilla-jemalloc.patch:

--- NEW FILE mozilla-jemalloc.patch ---
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- mozilla/memory/jemalloc/jemalloc.h	Sat Nov 22 20:22:22 2008 +0100
+++ mozilla/memory/jemalloc/jemalloc.h	Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
 } jemalloc_stats_t;
 
 #ifndef MOZ_MEMORY_DARWIN
-void	*malloc(size_t size);
-void	*valloc(size_t size);
-void	*calloc(size_t num, size_t size);
-void	*realloc(void *ptr, size_t size);
-void	free(void *ptr);
+void	*malloc(size_t size)  __THROW __attribute_malloc__ __wur;
+void	*valloc(size_t size)  __THROW __attribute_malloc__ __wur;
+void	*calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
+void	*realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
+void	free(void *ptr)  __THROW __attribute_malloc__ __wur;
 #endif
 
-int	posix_memalign(void **memptr, size_t alignment, size_t size);
+int	posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
 void	*memalign(size_t alignment, size_t size);
 size_t	malloc_usable_size(const void *ptr);
 void	jemalloc_stats(jemalloc_stats_t *stats);

sunbird-1.0-libical.patch:

--- NEW FILE sunbird-1.0-libical.patch ---
Link against system libical instead of bundled.
https://bugzilla.redhat.com/show_bug.cgi?id=459923

Lubomir Rintel <lkundrak at v3.sk>

--- calendar/base/build/Makefile.in.libical	2007-12-27 11:01:41.000000000 +0100
+++ calendar/base/build/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -63,7 +63,6 @@
 	js \
 	xpconnect \
 	string \
-	ical \
 	calbase
 
 CPPSRCS = calBaseModule.cpp \
@@ -74,7 +73,6 @@
 
 SHARED_LIBRARY_LIBS = \
     $(DEPTH)/calendar/base/src/$(LIB_PREFIX)calbase_s.$(LIB_SUFFIX) \
-    $(DEPTH)/calendar/libical/src/libical/$(LIB_PREFIX)mozical.$(LIB_SUFFIX) \
     $(NULL)
 
 ifdef MOZILLA_INTERNAL_API
@@ -94,4 +92,7 @@
 	$(NULL)
 endif
 
+# External libical
+EXTRA_DSO_LDOPTS += -lical
+
 include $(topsrcdir)/config/rules.mk
--- calendar/Makefile.in.libical	2008-09-23 17:13:34.000000000 +0200
+++ calendar/Makefile.in	2008-09-23 17:07:30.000000000 +0200
@@ -42,7 +42,7 @@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libical resources base providers import-export locales
+DIRS = resources base providers import-export locales
 
 ifdef ENABLE_TESTS
 DIRS += test
--- calendar/lightning/Makefile.in.libical	2008-07-24 03:07:05.000000000 +0200
+++ calendar/lightning/Makefile.in	2008-09-23 16:02:42.000000000 +0200
@@ -71,7 +71,7 @@
 endif
 endif
 
-DIRS = ../libical \
+DIRS = \
        ../locales \
        ../base \
        ../providers \
--- /dev/null	2008-09-23 20:44:22.879046487 +0200
+++ calendar/base/src/ical.h	2008-09-24 11:28:09.000000000 +0200
@@ -0,0 +1,3 @@
+#pragma GCC visibility push(default)
+#include <libical/ical.h>
+#pragma GCC visibility pop

sunbird-1.0-uilocale.patch:

--- NEW FILE sunbird-1.0-uilocale.patch ---
Guess the UI locale to use.  If only intl.locale.matchOS worked...

Lubomir Rintel <lkundrak at v3.sk>

diff -up mozilla/build/unix/mozilla.in.uilocale mozilla/build/unix/mozilla.in
diff -up mozilla/build/unix/run-mozilla.sh.uilocale mozilla/build/unix/run-mozilla.sh
--- mozilla/build/unix/run-mozilla.sh.uilocale	2009-04-28 21:53:14.000000000 +0200
+++ mozilla/build/unix/run-mozilla.sh	2009-04-28 21:54:39.000000000 +0200
@@ -279,6 +279,23 @@ MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
 if [ -z "$MRE_HOME" ]; then
     MRE_HOME=$MOZILLA_FIVE_HOME
 fi
+
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+
+SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+
+if [ -f ${MOZ_DIST_BIN}/extensions/langpack-${MOZLOCALE}@sunbird.mozilla.org/chrome/$MOZLOCALE.jar ]
+then
+	set -- "$@" -UILocale $MOZLOCALE
+else
+	if [ -f ${MOZ_DIST_BIN}/extensions/langpack-${SHORTMOZLOCALE}@sunbird.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]
+	then
+		set -- "$@" -UILocale $SHORTMOZLOCALE
+	fi
+fi
+
 ##
 ## Set LD_LIBRARY_PATH
 ##

thunderbird-pango.patch:

--- NEW FILE thunderbird-pango.patch ---
diff -upU8 thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
--- thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix	2009-03-03 12:04:16.000000000 +0100
+++ thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp	2009-03-03 12:05:37.000000000 +0100
@@ -1798,22 +1798,21 @@ gfx_pango_font_map_context_substitute(Pa
     double size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
     gfxPangoFontGroup *fontGroup = GetFontGroup(context);
     PRBool usePrinterFont = fontGroup && fontGroup->GetStyle()->printerFont;
     PrepareSortPattern(pattern, size, 1.0, usePrinterFont);
 }
 
 static PangoFcFont *
 gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
-                               PangoContext *context,
-                               const PangoFontDescription *desc,
-                               FcPattern *pattern)
+                               PangoFcFontKey *fontkey)
 {
+    const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
-                                      "pattern", pattern, NULL));
+                                      "pattern", p_pattern, NULL));
 }
 
 static void
 gfx_pango_font_map_class_init(gfxPangoFontMapClass *klass)
 {
     // inherit GObjectClass::finalize from parent as this class adds no data.
 
     PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (klass);
@@ -1823,19 +1822,18 @@ gfx_pango_font_map_class_init(gfxPangoFo
     fontmap_class->load_fontset = gfx_pango_font_map_load_fontset;
     // inherit fontmap_class->shape_engine_type from PangoFcFontMap
 
     PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
     fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution;
     // context_key_* virtual functions are only necessary if we want to
     // dynamically respond to changes in the screen cairo_font_options_t.
 
-    // context_substitute and get_font are not likely to be used but
+    // get_font are not likely to be used but
     //   implemented because the class makes them available.
-    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
 }
 
 /**
  ** gfxPangoFontGroup
  **/
 
 struct FamilyCallbackData {

thunderbird-shared-error.patch:

--- NEW FILE thunderbird-shared-error.patch ---
diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
--- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-02-24 03:16:03.000000000 +0100
+++ thunderbird-3.0/mail/installer/Makefile.in	2009-02-27 16:02:31.000000000 +0100
@@ -56,16 +56,17 @@ NO_PKG_FILES = \
 	PalmSyncInstall.exe \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 ifdef BUILD_STATIC_LIBS
+ifeq (BUILD_STATIC_LIBS, 1)
 ifeq (WINNT,$(OS_ARCH))
 MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
 endif
 else
 $(error you need a "--enable-static --disable-shared" build to create an installer)
 endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
@@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 DEFINES += -DAB_CD=$(AB_CD)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
+endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Sep 2008 20:38:51 -0000	1.10
+++ .cvsignore	28 Apr 2009 22:13:58 -0000	1.11
@@ -1,3 +1,2 @@
-lightning-0.9.linux-i686.xpi
-sunbird-langpacks-0.9.tar.gz
-lightning-sunbird-0.9-source.tar.bz2
+thunderbird-3.0b2-source.tar.bz2
+sunbird-l10n.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Sep 2008 20:38:51 -0000	1.10
+++ sources	28 Apr 2009 22:13:59 -0000	1.11
@@ -1,3 +1,2 @@
-8086ee725f2d3eca17c375a3812c3618  lightning-0.9.linux-i686.xpi
-adcef4eab2cbc14c1534ab80cb684273  sunbird-langpacks-0.9.tar.gz
-ff4ae1e9c1071d8d478504d95d7dabee  lightning-sunbird-0.9-source.tar.bz2
+3a6a95040c4356139a02eab5d32b9ad1  thunderbird-3.0b2-source.tar.bz2
+9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sunbird.spec	1 Mar 2009 12:47:20 -0000	1.21
+++ sunbird.spec	28 Apr 2009 22:13:59 -0000	1.22
@@ -1,41 +1,41 @@
 %bcond_without lightning
 %ifarch ppc
 %if 0%{?rhel}
-%define with_lightning 0
+%define with_lightning %{nil}
 %endif
 %endif
 
-%define progdir %{_prefix}/%{_lib}/%{name}-%{version}
-%define docs LEGAL LICENSE README.txt
-%{?_with_official:%define official 1}
+%define progdir %{_libdir}/%{name}-%{version}pre
 
 # This is to filter unwanted provides, that should be provided only by gecko-devel
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
 Name:           sunbird
-Version:        0.9
-Release:        6%{?dist}
+Version:        1.0
+Release:        0.1.20090302hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
-Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
+#Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
+Source0:        thunderbird-3.0b2-source.tar.bz2
 Source1:        sunbird.desktop
-Source2:        sunbird-langpacks-%{version}.tar.gz
+Source2:        sunbird-l10n.tar
+#sunbird-langpacks-0.9.tar.gz
 Source3:        mozilla-extension-update.sh
 # This is used just for langpacks.
 # TODO: build them!
-Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}/lightning-%{version}.linux-i686.xpi
+#Source4:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/0.9/lightning-0.9.linux-i686.xpi
 Source100:      find-external-requires
-Patch0:         sunbird-0.9-libical.patch
-
-# build patches
-Patch2:         sunbird-0.7-path.patch
-Patch3:         sunbird-0.7-uilocale.patch
+Patch0:         sunbird-1.0-libical.patch
+Patch3:         sunbird-1.0-uilocale.patch
 Patch4:         sunbird-0.9-gcc44.patch
-   
+Patch21:        mozilla-jemalloc.patch
+Patch22:        thunderbird-shared-error.patch
+Patch24:        thunderbird-pango.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libIDL-devel
@@ -52,19 +52,17 @@ BuildRequires:  libical-devel
 BuildRequires:  zip
 
 Requires(post):  desktop-file-utils
-Requires(postun):  desktop-file-utils
-
-# There's no RHEL desktop for ppc, therefore no thunderbird
-ExcludeArch: ppc
+Requires(postun): desktop-file-utils
 
 AutoProv: 0
 
 %description
-Mozilla Sunbird??? is a cross-platform calendar application, built upon
-Mozilla Toolkit. Our goal is to bring Mozilla-style ease-of-use to your
+Mozilla Sunbird is a cross-platform calendar application, built upon
+Mozilla Toolkit. It brings Mozilla-style ease-of-use to your
 calendar, without tying you to a particular storage solution.
 
-%if %{with_lightning}
+
+%if %with lightning
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
@@ -79,158 +77,125 @@ Mozilla Thunderbird. Since it's an exten
 integrated with Thunderbird, allowing it to easily perform email-related
 calendaring tasks.
 
-
 %define lightning_extname '{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-
-%define tbupdate_lightning                                      \\\
-  %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh  \\\
-  --appname thunderbird                                         \\\
-  --extname %{lightning_extname}                                \\\
-  --basedir %{_libdir}                                          \\\
-  --extpath %{_libdir}/thunderbird-lightning                    \\\
-  --action 
+%define tbupdate_lightning                                              \\\
+        %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh    \\\
+        --appname thunderbird                                           \\\
+        --extname %{lightning_extname}                                  \\\
+        --basedir %{_libdir}                                            \\\
+        --extpath %{_libdir}/thunderbird-lightning                      \\\
+        --action 
 %endif
 
 
 %prep
-%setup -q -n mozilla
-%patch0 -p1 -b .libical
-%patch2 -p1 -b .path
-%patch3 -p1 -b .uilocale
-%patch4 -p1 -b .gcc44
-# Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
-find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x '{}' \;
+%setup -q -c -a 2
+%patch0 -p0 -b .libical
+%patch3 -p0 -b .uilocale
+%patch4 -p0 -b .gcc44
+%patch21 -p0 -b .jemalloc
+%patch22 -p1 -b .shared-error
+%patch24 -p1 -b .pango-fix
+
+find $RPM_BUILD_ROOT -name '*.cpp' -o -name '*.h' -print0 |
+        xargs -0 chmod -x
 
 
 %build
-%if 0%{?official}
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-%endif
-export CFLAGS="$(echo $RPM_OPT_FLAGS |sed 's/-O2/-Os/;s/-Wall//')"
-export CXXFLAGS="$CFLAGS"
-cat << EOF > .mozconfig
-%if 0%{?official}
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-ac_add_options --enable-official-branding
-%endif
-mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}
-ac_add_options --enable-application=calendar
-ac_add_options --prefix=%{_prefix}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
+cat >.mozconfig <<EOF
+ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-xinerama
-ac_add_options --disable-xprint
+ac_add_options --disable-install-strip
 ac_add_options --disable-strip
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --disable-xprint
+ac_add_options --enable-application=calendar
+ac_add_options --enable-calendar
+ac_add_options --enable-canvas
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-optimize="$(echo $RPM_OPT_FLAGS |sed -e 's/-O2/-Os/;s/-Wall//')"
 ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
-ac_add_options --enable-canvas
-%if %{with_lightning}
-ac_add_options --enable-extensions=default,lightning
-%else
-ac_add_options --enable-extensions=default
-%endif
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
+ac_add_options --enable-system-cairo
+ac_add_options --enable-xinerama
+ac_add_options --libdir="%{_libdir}"
+ac_add_options --prefix="%{_prefix}"
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-zlib
 EOF
-make -f client.mk MOZ_CAIRO_LIBS='-lcairo -lX11 -lXrender' build
-# make package directory
-make -C xpinstall/packager STRIP=/bin/true
-
-#ac_add_options --enable-default-toolkit=cairo-gtk2
-# configure: error: Toolkit must be cairo-gtk2.
-
-#ac_add_options --with-system-png
-# checking for png_get_valid in -lpng... yes
-# checking for png_get_acTL in -lpng... no
-# configure: error: --with-system-png won't work because the system's libpng doesn't have APNG support
+
+make -k -f client.mk build
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# The make install does not work (it tries to build additional stuff that break)
-#make install DESTDIR=$RPM_BUILD_ROOT
-# TODO: Is the above still true? Recheck!
 
-# copy tree into RPM_BUILD_ROOT
+# make install is bogus
+# copy tree, break symlinks
 mkdir -p $RPM_BUILD_ROOT%{progdir}
-cp -rf $RPM_BUILD_DIR/mozilla/dist/%{name}/* $RPM_BUILD_ROOT%{progdir}
+cp -rL mozilla/dist/bin/* $RPM_BUILD_ROOT%{progdir}
 mkdir $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{progdir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-
 desktop-file-install --vendor="fedora"                  \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/        \
-  %{SOURCE1}
-
-# Fix some permissions
-find $RPM_BUILD_ROOT%{progdir} -name "*.xpm" -o -name "*.png" |xargs chmod -x
-chmod -x $RPM_BUILD_ROOT%{progdir}/defaults/profile/prefs.js    \
-  $RPM_BUILD_ROOT%{progdir}/js/calAlarmMonitor.js               \
-  $RPM_BUILD_ROOT%{progdir}/js/calFreeBusyService.js
-
-%if %{with_lightning}
-# Avoid "Chrome Registration Failed" message on first startup and extension installation
-touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
-%endif
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications/  \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
 cp $RPM_BUILD_ROOT%{progdir}/icons/mozicon128.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-
-# Docs in %%doc
-for doc in %{docs}; do
-  rm -f $RPM_BUILD_ROOT%{progdir}/$doc
-done
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 # Install langpacks
 mkdir -p $RPM_BUILD_ROOT%{progdir}/extensions
-rm -rf sunbird-langpacks
-mkdir sunbird-langpacks
-tar xzf %{SOURCE2} -C sunbird-langpacks
-for langpack in sunbird-langpacks/*.xpi; do
-  language=$(basename $langpack .xpi)
-  extensiondir=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$language at sunbird.mozilla.org
-  mkdir -p $extensiondir
-  unzip -qod $extensiondir $langpack
-  find $extensiondir -type f -print0 |xargs -0 chmod 644
-  # Fix #441500
-  sed 's/\r//g' $extensiondir/install.rdf |awk '/^$/ {next} {print}' >lala
-  mv lala $extensiondir/install.rdf
+ls sunbird-l10n/*.xpi |while read PACK
+do
+        LANGUAGE=$(echo $PACK |sed 's,sunbird-l10n/sunbird-%{version}pre.\(.*\).langpack.xpi,\1,')
+        DIR=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$LANGUAGE at sunbird.mozilla.org
+        mkdir -p $DIR
+        unzip -qod $DIR $PACK
+        find $DIR -type f -print0 |xargs -0 chmod 0644
+
+        # Fix #441500
+        sed 's/\r//g' $DIR/install.rdf |awk '/^$/ {next} {print}' >lala
+        touch -r $DIR/install.rdf lala
+        mv lala $DIR/install.rdf
+
 done
 
-%if %{with_lightning}
+%if %with lightning
+# Avoid "Chrome Registration Failed" message on first startup and extension installation
+touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
+
 # Lightning
-unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning mozilla/dist/xpi-stage/lightning.xpi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
-# Fix some permissions
-chmod -x $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calAlarmMonitor.js \
-  $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calFreeBusyService.js
 
+# No langpacks for preview release
+%if 0
 # Unpack lightning language packs, except en_US
-unzip -l %{SOURCE4} '*.jar'                                     |
-  awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}'                   |
-  xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+unzip -l %{SOURCE4} '*.jar' |
+        awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}' |
+        xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+
 # Register them
-ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome       |
-  sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
-  >> $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
-# ^^^ I'm going to burn in hell for this ^^^
+ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome |
+        sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
+        >>$RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
+        # ^^^ I'm going to burn in hell for this ^^^
+%endif
 %endif
 
+# Permissions fixup
+find $RPM_BUILD_ROOT -name '*.xpm' -o -name '*.js' -print0 |
+        xargs -0 chmod 0644 mozilla/LICENSE
+find $RPM_BUILD_ROOT -name '*.so' -print0 |
+        xargs -0 chmod 0755
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -240,7 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+        %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
@@ -248,18 +213,18 @@ fi
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+        %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
-%if %{with_lightning}
+%if %with lightning
 %post -n thunderbird-lightning
 %{tbupdate_lightning} install ||??:
 
 
 %preun -n thunderbird-lightning
 if [ $1 = 0 ]; then
-  %{tbupdate_lightning} remove ||??:
+        %{tbupdate_lightning} remove ||??:
 fi
 
 
@@ -268,7 +233,7 @@ fi
 # is guarded against upgrade, but because of our triggerun,
 # which is run on self-upgrade, though triggerpostun isn't
 if [ $1 != 0 ]; then
-  %{tbupdate_lightning} install || :
+        %{tbupdate_lightning} install || :
 fi
 
 %triggerin -n thunderbird-lightning -- thunderbird
@@ -281,28 +246,32 @@ fi
 # Guard against being run post-self-uninstall, even though that
 # doesn't happen currently (see comment above)
 if [ $1 != 0 ]; then
-  %{tbupdate_lightning} install ||??:
+        %{tbupdate_lightning} install ||??:
 fi
 %endif
 
 
 %files
 %defattr(-,root,root,-)
-%doc %{docs}
+%doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
 %{progdir}
 %{_bindir}/sunbird
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/128x128/apps/sunbird.png
 
 
-%if %{with_lightning}
+%if %with lightning
 %files -n thunderbird-lightning
+%doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
 %defattr(-,root,root,-)
 %{_libdir}/thunderbird-lightning
 %endif
 
 
 %changelog
+* Tue Apr 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.1.20090302hg
+- Update to version matching current Thunderbird
+
 * Sun Mar 1 2009 Lubomir Rintel <lkundrak at v3.sk> 0.9-6
 - Fix build with GCC 4.4
 


--- sunbird-0.7-path.patch DELETED ---


--- sunbird-0.7-uilocale.patch DELETED ---


--- sunbird-0.9-libical.patch DELETED ---



From whot at fedoraproject.org  Tue Apr 28 22:40:43 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 28 Apr 2009 22:40:43 +0000 (UTC)
Subject: rpms/xkeyboard-config/F-11 xkeyboard-config-1.5-LTSG-se.patch, NONE,
	1.1 xkeyboard-config.spec, 1.37, 1.38
Message-ID: <20090428224043.A5CB070132@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2701

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.5-LTSG-se.patch 
Log Message:
* Wed Apr 29 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-6
- xkeyboard-config-1.5-LTSG-se.patch: add LTSG bindings to 'se'.



xkeyboard-config-1.5-LTSG-se.patch:

--- NEW FILE xkeyboard-config-1.5-LTSG-se.patch ---
>From e9343b288e532d42e594a6597072e900f2dd469b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 28 Apr 2009 13:21:31 +1000
Subject: [PATCH] symbols: add LTSG keysyms for 'se'

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 symbols/se |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/symbols/se b/symbols/se
index 427b899..9b32fd6 100644
--- a/symbols/se
+++ b/symbols/se
@@ -28,6 +28,7 @@ xkb_symbols "se" {
 
     key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
 
+    key <LSGT> { [ less,	greater,		bar,	bar ] };
     include "kpdl(comma)"
 
     include "level3(ralt_switch)"
-- 
1.6.3.rc1.2.gfa66a



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-11/xkeyboard-config.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xkeyboard-config.spec	9 Apr 2009 05:29:39 -0000	1.37
+++ xkeyboard-config.spec	28 Apr 2009 22:40:13 -0000	1.38
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -20,6 +20,7 @@ Patch5: xkeyboard-config-1.4-jp-tilde.pa
 Patch6: xkeyboard-config-1.5-evdevkbds.patch
 Patch7: xkeyboard-config-1.5-suspend-hibernate.patch
 Patch8: xkeyboard-config-1.5-terminate.patch
+Patch9: xkeyboard-config-1.5-LTSG-se.patch
 
 BuildArch: noarch
 
@@ -101,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Apr 29 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-6
+- xkeyboard-config-1.5-LTSG-se.patch: add LTSG bindings to 'se'.
+
 * Tue Apr 07 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-5
 - xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default
   pc symbols, add terminate:ctrl_alt_bksp.



From whot at fedoraproject.org  Tue Apr 28 22:43:57 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 28 Apr 2009 22:43:57 +0000 (UTC)
Subject: rpms/xkeyboard-config/F-10 xkeyboard-config-1.5-LTSG-se.patch, NONE,
	1.1 xkeyboard-config.spec, 1.29, 1.30
Message-ID: <20090428224357.61ED070129@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3896

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.5-LTSG-se.patch 
Log Message:
* Wed Apr 29 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-8
- xkeyboard-config-1.5-LTSG-se.patch: add LTSG to 'se'



xkeyboard-config-1.5-LTSG-se.patch:

--- NEW FILE xkeyboard-config-1.5-LTSG-se.patch ---
>From e9343b288e532d42e594a6597072e900f2dd469b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 28 Apr 2009 13:21:31 +1000
Subject: [PATCH] symbols: add LTSG keysyms for 'se'

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 symbols/se |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/symbols/se b/symbols/se
index 427b899..9b32fd6 100644
--- a/symbols/se
+++ b/symbols/se
@@ -28,6 +28,7 @@ xkb_symbols "se" {
 
     key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
 
+    key <LSGT> { [ less,	greater,		bar,	bar ] };
     include "kpdl(comma)"
 
     include "level3(ralt_switch)"
-- 
1.6.3.rc1.2.gfa66a



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xkeyboard-config.spec	1 Mar 2009 23:42:12 -0000	1.29
+++ xkeyboard-config.spec	28 Apr 2009 22:43:26 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -23,6 +23,8 @@ Patch5: xkeyboard-config-1.4-jp-tilde.pa
 Patch6: xkeyboard-config-1.4-abnt2.patch
 # RH 466627, FDO bug 18833 (fixed), taken from git
 Patch7: xkeyboard-config-1.4-ara.patch
+# RH 490484, taken from upstream
+Patch8: xkeyboard-config-1.5-LTSG-se.patch
 
 
 BuildArch: noarch
@@ -60,6 +62,7 @@ xkeyboard-config alternative xkb data fi
 %patch5 -p1 -b .jp-tilde
 %patch6 -p1 -b .abnt2
 %patch7 -p1 -b .ara
+%patch8 -p1 -b .LTSG-se
 
 %build
 %configure \
@@ -99,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Apr 29 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-8
+- xkeyboard-config-1.5-LTSG-se.patch: add LTSG to 'se'
+
 * Mon Mar 02 2009 Peter Hutterer <peter.hutterer at redhat.com>
 - fix wrong FDO bug reference for xkeyboard-config-1.4-ara.patch.
 



From verdurin at fedoraproject.org  Tue Apr 28 22:45:37 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Tue, 28 Apr 2009 22:45:37 +0000 (UTC)
Subject: rpms/gnomint/devel gnomint.spec,1.6,1.7
Message-ID: <20090428224537.2CAC870129@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4248

Modified Files:
	gnomint.spec 
Log Message:
Release bumped to workaround problem with tag for patch



Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/devel/gnomint.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnomint.spec	26 Apr 2009 21:24:33 -0000	1.6
+++ gnomint.spec	28 Apr 2009 22:45:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gnomint
 Version:	0.9.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 28 2009 Adam Huffman <bloch at verdurin.com> - 0.9.1-5
+- workaround patch tag problem
+
 * Sun Apr 26 2009  Adam Huffman <bloch at verdurin.com> - 0.9.1-4
 - really fix 496518
 



From mjakubicek at fedoraproject.org  Tue Apr 28 22:52:56 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 28 Apr 2009 22:52:56 +0000 (UTC)
Subject: rpms/python-shout/F-11 python-shout.spec,1.2,1.3
Message-ID: <20090428225256.A6FD570129@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-shout/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-11

Modified Files:
	python-shout.spec 
Log Message:
- Fix FTBFS: egginfo filename changed because of move to Python 2.6




Index: python-shout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-shout/F-11/python-shout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-shout.spec	26 Feb 2009 23:26:44 -0000	1.2
+++ python-shout.spec	28 Apr 2009 22:52:26 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           python-shout
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for libshout 2
 
 Group:          Development/Languages
@@ -40,11 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING PKG-INFO README
-%{python_sitearch}/*.so
-%{python_sitearch}/shout_python-%{version}-py2.5.egg-info
+%{python_sitearch}/*
 
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.2.1-3
+- Fix FTBFS: egginfo filename changed because of move to Python 2.6
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Tue Apr 28 22:52:56 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Tue, 28 Apr 2009 22:52:56 +0000 (UTC)
Subject: rpms/python-shout/devel python-shout.spec,1.2,1.3
Message-ID: <20090428225256.C938A70129@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-shout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/devel

Modified Files:
	python-shout.spec 
Log Message:
- Fix FTBFS: egginfo filename changed because of move to Python 2.6




Index: python-shout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-shout/devel/python-shout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-shout.spec	26 Feb 2009 23:26:44 -0000	1.2
+++ python-shout.spec	28 Apr 2009 22:52:26 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           python-shout
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for libshout 2
 
 Group:          Development/Languages
@@ -40,11 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING PKG-INFO README
-%{python_sitearch}/*.so
-%{python_sitearch}/shout_python-%{version}-py2.5.egg-info
+%{python_sitearch}/*
 
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.2.1-3
+- Fix FTBFS: egginfo filename changed because of move to Python 2.6
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Apr 28 23:48:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 28 Apr 2009 23:48:56 +0000 (UTC)
Subject: rpms/gnome-desktop/F-11 give-me-back-my-rotations.patch, NONE,
	1.1 gnome-desktop.spec, 1.209, 1.210
Message-ID: <20090428234856.7FF9470129@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20457

Modified Files:
	gnome-desktop.spec 
Added Files:
	give-me-back-my-rotations.patch 
Log Message:
Fix a problem with disappearing rotations


give-me-back-my-rotations.patch:

--- NEW FILE give-me-back-my-rotations.patch ---
--- gnome-desktop-2.26.1/libgnome-desktop/gnome-rr.c	2009-04-13 18:00:20.000000000 -0400
+++ hacked/libgnome-desktop/gnome-rr.c	2009-04-28 19:28:37.168474903 -0400
@@ -329,6 +329,11 @@
     }
     else
     {
+        gnome_rr_screen_get_ranges (info->screen, 
+					 &(info->min_width),
+					 &(info->max_width),
+					 &(info->min_height),
+					 &(info->max_height));
 	/* XRRGetScreenResourcesCurrent is less expensive than
 	 * XRRGetScreenResources, however it is available only
 	 * in RandR 1.3 or higher


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/gnome-desktop.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- gnome-desktop.spec	14 Apr 2009 00:51:49 -0000	1.209
+++ gnome-desktop.spec	28 Apr 2009 23:48:26 -0000	1.210
@@ -12,9 +12,11 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
+# fixed upstream
+Patch0: give-me-back-my-rotations.patch
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +74,7 @@ libgnomedesktop.
 
 %prep
 %setup -q
+%patch0 -p1 -b .rotations
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -117,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Apr 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Fix a case of disappearing rotations (#497515)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-desktop/2.26/gnome-desktop-2.26.1.news



From mclasen at fedoraproject.org  Wed Apr 29 00:20:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 29 Apr 2009 00:20:50 +0000 (UTC)
Subject: rpms/gdm/F-11 xdmcp-use-after-free.patch, NONE, 1.1 gdm.spec, 1.467,
	1.468
Message-ID: <20090429002050.1BE6970133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26169

Modified Files:
	gdm.spec 
Added Files:
	xdmcp-use-after-free.patch 
Log Message:
fix a use-after-free in xdmcp code


xdmcp-use-after-free.patch:

--- NEW FILE xdmcp-use-after-free.patch ---
--- gdm-2.26.1/daemon/gdm-xdmcp-display-factory.c.orig	2009-03-16 20:12:08.000000000 +0000
+++ gdm-2.26.1/daemon/gdm-xdmcp-display-factory.c	2009-04-23 11:49:50.000000000 +0100
@@ -2309,8 +2309,6 @@
                                 authorization_data.data     = (CARD8 *) cookie->data;
                                 authorization_data.length   = cookie->len;
 
-                                g_array_free (cookie, TRUE);
-
                                 /* the addrs are NOT copied */
                                 gdm_xdmcp_send_accept (factory,
                                                        address,
@@ -2319,6 +2317,8 @@
                                                        &authentication_data,
                                                        &authorization_name,
                                                        &authorization_data);
+
+                                g_array_free (cookie, TRUE);
                         }
                 }
         } else {


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- gdm.spec	28 Apr 2009 17:38:44 -0000	1.467
+++ gdm.spec	29 Apr 2009 00:20:19 -0000	1.468
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -101,6 +101,9 @@ Patch19: gdm-2.26.1-multistack.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=580189
 Patch20: session-client.patch
 
+# fixed upstream
+Patch21: xdmcp-use-after-free.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -145,6 +148,8 @@ The GDM fingerprint plugin provides func
 
 %patch20 -p1 -b .session-client
 
+%patch21 -p1 -b .xdmcp-use-after-free
+
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f
@@ -385,6 +390,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Apr 28 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-6
+- fix a use-after-free in XDMCP code paths (#496882)
+
 * Tue Apr 28 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-5
 - fix crash at shutdown
 



From mjakubicek at fedoraproject.org  Wed Apr 29 00:38:02 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 00:38:02 +0000 (UTC)
Subject: rpms/rlog/F-11 rlog.spec,1.11,1.12
Message-ID: <20090429003802.506AF70133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rlog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29143/F-11

Modified Files:
	rlog.spec 
Log Message:
- Fix FTBFS: do not rebuild docs as it fails on latex




Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/F-11/rlog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rlog.spec	25 Feb 2009 20:05:32 -0000	1.11
+++ rlog.spec	29 Apr 2009 00:37:31 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/rlog
@@ -30,8 +30,9 @@ Files needed for developing apps using r
 
 %prep
 %setup -q
-%{__rm} -rf docs/html
-%{__rm} -rf docs/latex
+# Disabled: rebuilding docs fails on latex
+#%{__rm} -rf docs/html
+#%{__rm} -rf docs/latex
 
 %build
 %configure --disable-static --enable-valgrind
@@ -63,6 +64,9 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.4-5
+- Fix FTBFS: do not rebuild docs as it fails on latex
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 29 00:38:02 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 00:38:02 +0000 (UTC)
Subject: rpms/rlog/devel rlog.spec,1.11,1.12
Message-ID: <20090429003802.7AC8170133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29143/devel

Modified Files:
	rlog.spec 
Log Message:
- Fix FTBFS: do not rebuild docs as it fails on latex




Index: rlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlog/devel/rlog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rlog.spec	25 Feb 2009 20:05:32 -0000	1.11
+++ rlog.spec	29 Apr 2009 00:37:32 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		rlog
 Summary:	Runtime Logging for C++
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://arg0.net/rlog
@@ -30,8 +30,9 @@ Files needed for developing apps using r
 
 %prep
 %setup -q
-%{__rm} -rf docs/html
-%{__rm} -rf docs/latex
+# Disabled: rebuilding docs fails on latex
+#%{__rm} -rf docs/html
+#%{__rm} -rf docs/latex
 
 %build
 %configure --disable-static --enable-valgrind
@@ -63,6 +64,9 @@ Files needed for developing apps using r
 %doc docs/html docs/latex/refman.pdf
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.4-5
+- Fix FTBFS: do not rebuild docs as it fails on latex
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From smilner at fedoraproject.org  Wed Apr 29 01:05:24 2009
From: smilner at fedoraproject.org (Steve Milner)
Date: Wed, 29 Apr 2009 01:05:24 +0000 (UTC)
Subject: rpms/python-virtualenv/devel .cvsignore, 1.5,
	1.6 python-virtualenv.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090429010524.EA59970133@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1652

Modified Files:
	.cvsignore python-virtualenv.spec sources 
Log Message:
Updated for upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Dec 2008 04:48:30 -0000	1.5
+++ .cvsignore	29 Apr 2009 01:04:54 -0000	1.6
@@ -1 +1 @@
-virtualenv-1.3.2.tar.gz
+virtualenv-1.3.3.tar.gz


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/python-virtualenv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-virtualenv.spec	27 Feb 2009 00:07:42 -0000	1.8
+++ python-virtualenv.spec	29 Apr 2009 01:04:54 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
 Group:          Development/Languages
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.3.3-1
+- Updated for upstream release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Dec 2008 04:48:30 -0000	1.5
+++ sources	29 Apr 2009 01:04:54 -0000	1.6
@@ -1 +1 @@
-a013d5a7d9aeddc16bee88604d6de636  virtualenv-1.3.2.tar.gz
+28e2955aed4ffc4dc3df02dc632b5c42  virtualenv-1.3.3.tar.gz



From mjakubicek at fedoraproject.org  Wed Apr 29 01:19:15 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 01:19:15 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack-gcc44.patch, NONE,
	1.1 ctapi-cyberjack.spec, 1.38, 1.39
Message-ID: <20090429011915.8E25E70136@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ctapi-cyberjack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4299/devel

Modified Files:
	ctapi-cyberjack.spec 
Added Files:
	ctapi-cyberjack-gcc44.patch 
Log Message:
- Fix FTBFS: added ctapi-cyberjack-gcc44.patch



ctapi-cyberjack-gcc44.patch:

--- NEW FILE ctapi-cyberjack-gcc44.patch ---
--- ctapi/ctapi.cpp.orig	2009-04-29 02:55:19.000000000 +0200
+++ ctapi/ctapi.cpp	2009-04-29 02:55:36.000000000 +0200
@@ -49,7 +49,7 @@
 #include <sys/stat.h>
 #include <pwd.h>
 #include <sys/types.h>
-
+#include <cstdio>
 
 #if 1
 # define DEBUGP(ctn, format, args...) \
--- tools/cyberjack/lib/cm_distri.cpp.orig	2009-04-29 03:05:39.000000000 +0200
+++ tools/cyberjack/lib/cm_distri.cpp	2009-04-29 03:05:47.000000000 +0200
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-
+#include <cstdio>
 
 
 bool CM_Distri::check(std::string &xmlString,
--- tools/cyberjack/lib/cm_reader.cpp.orig	2009-04-29 03:06:18.000000000 +0200
+++ tools/cyberjack/lib/cm_reader.cpp	2009-04-29 03:06:28.000000000 +0200
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <fcntl.h>
-
+#include <cstdio>
 
 
 #define CYBERJACK_VENDOR_ID 0xc4b
--- tools/cyberjack/lib/checksuite.cpp.orig	2009-04-29 03:07:01.000000000 +0200
+++ tools/cyberjack/lib/checksuite.cpp	2009-04-29 03:07:08.000000000 +0200
@@ -24,7 +24,7 @@
 #include "cm_reader.h"
 #include "cm_services.h"
 #include "cm_uname.h"
-
+#include <cstdio>
 
 
 
--- tools/cyberjack/lib/cm_driver.cpp.orig	2009-04-29 03:11:53.000000000 +0200
+++ tools/cyberjack/lib/cm_driver.cpp	2009-04-29 03:12:24.000000000 +0200
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <assert.h>
 #include <dlfcn.h>
-
+#include <cstdio>
 
 
 typedef void (*CT_VERSION_FN)(uint8_t *vmajor,


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ctapi-cyberjack.spec	24 Feb 2009 10:09:44 -0000	1.38
+++ ctapi-cyberjack.spec	29 Apr 2009 01:18:45 -0000	1.39
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	3.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -25,8 +25,11 @@ License: 	LGPLv2+
 Group: 		Development/Libraries
 Source0: 	%{name}-%{version}.tar.gz
 Source1:	91-cyberjack.rules
-Source2:        91-cyberjack.rules.old
+Source2:	91-cyberjack.rules.old
 Source3:	ctapi.h
+# Filed into upstream bugtracker at:
+# http://sourceforge.net/tracker/?func=detail&aid=2783328&group_id=34542&atid=411633
+Patch0:		%{name}-gcc44.patch
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{withPCSC}
@@ -91,6 +94,7 @@ and an generic check tool for the reader
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
 %if %{withPCSC}
@@ -99,7 +103,7 @@ and an generic check tool for the reader
 %configure --disable-pcsc
 %endif
 
-make %{?_smp_mflags} 
+make -k %{?_smp_mflags} 
 
 
 %install
@@ -181,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/getdist.sh
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.3.0-6
+- Fix FTBFS: added ctapi-cyberjack-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 29 01:19:15 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 01:19:15 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/F-11 ctapi-cyberjack-gcc44.patch, NONE,
	1.1 ctapi-cyberjack.spec, 1.38, 1.39
Message-ID: <20090429011915.66D4870133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/ctapi-cyberjack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4299/F-11

Modified Files:
	ctapi-cyberjack.spec 
Added Files:
	ctapi-cyberjack-gcc44.patch 
Log Message:
- Fix FTBFS: added ctapi-cyberjack-gcc44.patch



ctapi-cyberjack-gcc44.patch:

--- NEW FILE ctapi-cyberjack-gcc44.patch ---
--- ctapi/ctapi.cpp.orig	2009-04-29 02:55:19.000000000 +0200
+++ ctapi/ctapi.cpp	2009-04-29 02:55:36.000000000 +0200
@@ -49,7 +49,7 @@
 #include <sys/stat.h>
 #include <pwd.h>
 #include <sys/types.h>
-
+#include <cstdio>
 
 #if 1
 # define DEBUGP(ctn, format, args...) \
--- tools/cyberjack/lib/cm_distri.cpp.orig	2009-04-29 03:05:39.000000000 +0200
+++ tools/cyberjack/lib/cm_distri.cpp	2009-04-29 03:05:47.000000000 +0200
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-
+#include <cstdio>
 
 
 bool CM_Distri::check(std::string &xmlString,
--- tools/cyberjack/lib/cm_reader.cpp.orig	2009-04-29 03:06:18.000000000 +0200
+++ tools/cyberjack/lib/cm_reader.cpp	2009-04-29 03:06:28.000000000 +0200
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <fcntl.h>
-
+#include <cstdio>
 
 
 #define CYBERJACK_VENDOR_ID 0xc4b
--- tools/cyberjack/lib/checksuite.cpp.orig	2009-04-29 03:07:01.000000000 +0200
+++ tools/cyberjack/lib/checksuite.cpp	2009-04-29 03:07:08.000000000 +0200
@@ -24,7 +24,7 @@
 #include "cm_reader.h"
 #include "cm_services.h"
 #include "cm_uname.h"
-
+#include <cstdio>
 
 
 
--- tools/cyberjack/lib/cm_driver.cpp.orig	2009-04-29 03:11:53.000000000 +0200
+++ tools/cyberjack/lib/cm_driver.cpp	2009-04-29 03:12:24.000000000 +0200
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <assert.h>
 #include <dlfcn.h>
-
+#include <cstdio>
 
 
 typedef void (*CT_VERSION_FN)(uint8_t *vmajor,


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-11/ctapi-cyberjack.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ctapi-cyberjack.spec	24 Feb 2009 10:09:44 -0000	1.38
+++ ctapi-cyberjack.spec	29 Apr 2009 01:18:44 -0000	1.39
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	3.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -25,8 +25,11 @@ License: 	LGPLv2+
 Group: 		Development/Libraries
 Source0: 	%{name}-%{version}.tar.gz
 Source1:	91-cyberjack.rules
-Source2:        91-cyberjack.rules.old
+Source2:	91-cyberjack.rules.old
 Source3:	ctapi.h
+# Filed into upstream bugtracker at:
+# http://sourceforge.net/tracker/?func=detail&aid=2783328&group_id=34542&atid=411633
+Patch0:		%{name}-gcc44.patch
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{withPCSC}
@@ -91,6 +94,7 @@ and an generic check tool for the reader
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
 %if %{withPCSC}
@@ -99,7 +103,7 @@ and an generic check tool for the reader
 %configure --disable-pcsc
 %endif
 
-make %{?_smp_mflags} 
+make -k %{?_smp_mflags} 
 
 
 %install
@@ -181,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/getdist.sh
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.3.0-6
+- Fix FTBFS: added ctapi-cyberjack-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 29 01:22:56 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 01:22:56 +0000 (UTC)
Subject: rpms/pdf2djvu/F-11 pdf2djvu.spec,1.3,1.4
Message-ID: <20090429012256.C7A5770133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/pdf2djvu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4918/F-11

Modified Files:
	pdf2djvu.spec 
Log Message:
- Fix FTBFS: added BR: djvulibre, fontconfig-devel.




Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-11/pdf2djvu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pdf2djvu.spec	26 Feb 2009 10:18:17 -0000	1.3
+++ pdf2djvu.spec	29 Apr 2009 01:22:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pdf2djvu
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -8,11 +8,12 @@ URL:            http://pdf2djvu.googleco
 Source0:        http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  djvulibre-devel
+BuildRequires:  djvulibre-devel djvulibre
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
 BuildRequires:  poppler-devel
 BuildRequires:  pstreams-devel
+BuildRequires:  fontconfig-devel
 
 %description
 pdf2djvu creates DjVu files from PDF files. It's able to extract:
@@ -40,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.5.0-3
+- Fix FTBFS: added BR: djvulibre, fontconfig-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 29 01:22:57 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 01:22:57 +0000 (UTC)
Subject: rpms/pdf2djvu/devel pdf2djvu.spec,1.3,1.4
Message-ID: <20090429012257.0EC8E70133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/pdf2djvu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4918/devel

Modified Files:
	pdf2djvu.spec 
Log Message:
- Fix FTBFS: added BR: djvulibre, fontconfig-devel.




Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/pdf2djvu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pdf2djvu.spec	26 Feb 2009 10:18:17 -0000	1.3
+++ pdf2djvu.spec	29 Apr 2009 01:22:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pdf2djvu
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -8,11 +8,12 @@ URL:            http://pdf2djvu.googleco
 Source0:        http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  djvulibre-devel
+BuildRequires:  djvulibre-devel djvulibre
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
 BuildRequires:  poppler-devel
 BuildRequires:  pstreams-devel
+BuildRequires:  fontconfig-devel
 
 %description
 pdf2djvu creates DjVu files from PDF files. It's able to extract:
@@ -40,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.5.0-3
+- Fix FTBFS: added BR: djvulibre, fontconfig-devel.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From smilner at fedoraproject.org  Wed Apr 29 01:24:21 2009
From: smilner at fedoraproject.org (Steve Milner)
Date: Wed, 29 Apr 2009 01:24:21 +0000 (UTC)
Subject: rpms/python-virtualenv/F-11 .cvsignore, 1.5,
	1.6 python-virtualenv.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090429012421.0B75370133@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5239

Modified Files:
	.cvsignore python-virtualenv.spec sources 
Log Message:
Updated for upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Dec 2008 04:48:30 -0000	1.5
+++ .cvsignore	29 Apr 2009 01:23:50 -0000	1.6
@@ -1 +1 @@
-virtualenv-1.3.2.tar.gz
+virtualenv-1.3.3.tar.gz


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-11/python-virtualenv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-virtualenv.spec	27 Feb 2009 00:07:42 -0000	1.8
+++ python-virtualenv.spec	29 Apr 2009 01:23:50 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
 Group:          Development/Languages
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.3.3-1
+- Updated for upstream release.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Dec 2008 04:48:30 -0000	1.5
+++ sources	29 Apr 2009 01:23:50 -0000	1.6
@@ -1 +1 @@
-a013d5a7d9aeddc16bee88604d6de636  virtualenv-1.3.2.tar.gz
+28e2955aed4ffc4dc3df02dc632b5c42  virtualenv-1.3.3.tar.gz



From hno at fedoraproject.org  Wed Apr 29 02:31:50 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 29 Apr 2009 02:31:50 +0000 (UTC)
Subject: rpms/bzr/F-10 .cvsignore, 1.34, 1.35 bzr.spec, 1.48, 1.49 sources, 
	1.35, 1.36
Message-ID: <20090429023150.DF37670133@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15698

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.13.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	16 Mar 2009 15:24:29 -0000	1.34
+++ .cvsignore	29 Apr 2009 02:31:20 -0000	1.35
@@ -1 +1 @@
-bzr-1.13.tar.gz
+bzr-1.13.2.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/bzr.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- bzr.spec	24 Mar 2009 10:05:33 -0000	1.48
+++ bzr.spec	29 Apr 2009 02:31:20 -0000	1.49
@@ -4,7 +4,7 @@
 %define bzrver 1.13
 
 Name:           bzr
-Version:        %{bzrver}.1
+Version:        %{bzrver}.2
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.13.2-1
+- Update to 1.13.2
+
 * Tue Mar 24 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.13.1-1
 - Update to 1.13.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	24 Mar 2009 10:05:33 -0000	1.35
+++ sources	29 Apr 2009 02:31:20 -0000	1.36
@@ -1 +1 @@
-c18d386d48965fa00d05655ee55dc70c  bzr-1.13.1.tar.gz
+7f7d81dfc3b88caf193841ab9fe53574  bzr-1.13.2.tar.gz



From hno at fedoraproject.org  Wed Apr 29 02:40:41 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 29 Apr 2009 02:40:41 +0000 (UTC)
Subject: rpms/bzr/F-10 bzr.spec,1.49,1.50
Message-ID: <20090429024041.50D9270133@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17240

Modified Files:
	bzr.spec 
Log Message:
requires zlib-devel


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/bzr.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- bzr.spec	29 Apr 2009 02:31:20 -0000	1.49
+++ bzr.spec	29 Apr 2009 02:40:10 -0000	1.50
@@ -14,7 +14,7 @@ URL:            http://www.bazaar-vcs.or
 Source0:        https://launchpad.net/%{name}/%{bzrver}/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel zlib-devel
 # We're using an old version of Pyrex, use the pregenerated C files instead
 # of rebuilding
 #BuildRequires: Pyrex



From pkgdb at fedoraproject.org  Wed Apr 29 02:48:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:48:41 +0000
Subject: [pkgdb] globus-openssl-module was added for ellert
Message-ID: <20090429024842.3878F10F886@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-openssl-module with summary Globus Toolkit - Globus OpenSSL Module Wrapper
kevin has approved Package globus-openssl-module
kevin has added a Fedora devel branch for globus-openssl-module with an owner of ellert
kevin has approved globus-openssl-module in Fedora devel
kevin has approved Package globus-openssl-module
kevin has set commit to Approved for provenpackager on globus-openssl-module (Fedora devel)
kevin has set build to Approved for provenpackager on globus-openssl-module (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-openssl-module (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl-module



From pkgdb at fedoraproject.org  Wed Apr 29 02:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:48:48 +0000
Subject: [pkgdb] globus-openssl-module (Fedora, 10) updated by kevin
Message-ID: <20090429024848.9AD3810F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-openssl-module
kevin has set commit to Approved for provenpackager on globus-openssl-module (Fedora 10)
kevin has set build to Approved for provenpackager on globus-openssl-module (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-openssl-module (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl-module



From pkgdb at fedoraproject.org  Wed Apr 29 02:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:48:48 +0000
Subject: [pkgdb] globus-openssl-module (Fedora EPEL, 4) updated by kevin
Message-ID: <20090429024849.39B2E10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-openssl-module
kevin has set commit to Approved for provenpackager on globus-openssl-module (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-openssl-module (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-openssl-module (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl-module



From pkgdb at fedoraproject.org  Wed Apr 29 02:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:48:48 +0000
Subject: [pkgdb] globus-openssl-module (Fedora EPEL, 5) updated by kevin
Message-ID: <20090429024849.414FD10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-openssl-module
kevin has set commit to Approved for provenpackager on globus-openssl-module (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-openssl-module (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-openssl-module (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl-module



From pkgdb at fedoraproject.org  Wed Apr 29 02:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:48:48 +0000
Subject: [pkgdb] globus-openssl-module (Fedora, 11) updated by kevin
Message-ID: <20090429024849.4C54310F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-openssl-module
kevin has set commit to Approved for provenpackager on globus-openssl-module (Fedora 11)
kevin has set build to Approved for provenpackager on globus-openssl-module (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-openssl-module (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl-module



From kevin at fedoraproject.org  Wed Apr 29 02:49:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:49:20 +0000 (UTC)
Subject: rpms/globus-openssl-module - New directory
Message-ID: <20090429024920.A534D70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl-module
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF18956/rpms/globus-openssl-module

Log Message:
Directory /cvs/pkgs/rpms/globus-openssl-module added to the repository




From pkgdb at fedoraproject.org  Wed Apr 29 02:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:48:48 +0000
Subject: [pkgdb] globus-openssl-module (Fedora, 9) updated by kevin
Message-ID: <20090429024849.7C58B10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-openssl-module
kevin has set commit to Approved for provenpackager on globus-openssl-module (Fedora 9)
kevin has set build to Approved for provenpackager on globus-openssl-module (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-openssl-module (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-openssl-module



From kevin at fedoraproject.org  Wed Apr 29 02:49:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:49:21 +0000 (UTC)
Subject: rpms/globus-openssl-module/devel - New directory
Message-ID: <20090429024921.63DBC7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl-module/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF18956/rpms/globus-openssl-module/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-openssl-module/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:49:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:49:40 +0000 (UTC)
Subject: rpms/globus-openssl-module Makefile,NONE,1.1
Message-ID: <20090429024940.7781370135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl-module
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF18956/rpms/globus-openssl-module

Added Files:
	Makefile 
Log Message:
Setup of module globus-openssl-module


--- NEW FILE Makefile ---
# Top level Makefile for module globus-openssl-module
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 02:49:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:49:40 +0000 (UTC)
Subject: rpms/globus-openssl-module/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090429024940.C745470135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-openssl-module/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF18956/rpms/globus-openssl-module/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-openssl-module


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-openssl-module
# $Id: Makefile,v 1.1 2009/04/29 02:49:40 kevin Exp $
NAME := globus-openssl-module
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 02:50:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:50:25 +0000
Subject: [pkgdb] python-foolscap was added for ruben
Message-ID: <20090429025026.144DF10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package python-foolscap with summary Next-generation RPC protocol
kevin has approved Package python-foolscap
kevin has added a Fedora devel branch for python-foolscap with an owner of ruben
kevin has approved python-foolscap in Fedora devel
kevin has approved Package python-foolscap
kevin has set commit to Approved for provenpackager on python-foolscap (Fedora devel)
kevin has set build to Approved for provenpackager on python-foolscap (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-foolscap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-foolscap



From pkgdb at fedoraproject.org  Wed Apr 29 02:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:50:27 +0000
Subject: [pkgdb] python-foolscap (Fedora, 11) updated by kevin
Message-ID: <20090429025027.72E0B10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-foolscap
kevin has set commit to Approved for provenpackager on python-foolscap (Fedora 11)
kevin has set build to Approved for provenpackager on python-foolscap (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-foolscap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-foolscap



From kevin at fedoraproject.org  Wed Apr 29 02:50:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:50:44 +0000 (UTC)
Subject: rpms/python-foolscap - New directory
Message-ID: <20090429025044.35E0370135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-foolscap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20364/rpms/python-foolscap

Log Message:
Directory /cvs/pkgs/rpms/python-foolscap added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:50:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:50:44 +0000 (UTC)
Subject: rpms/python-foolscap/devel - New directory
Message-ID: <20090429025044.AD3BA70135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-foolscap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20364/rpms/python-foolscap/devel

Log Message:
Directory /cvs/pkgs/rpms/python-foolscap/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:51:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:51:07 +0000 (UTC)
Subject: rpms/python-foolscap Makefile,NONE,1.1
Message-ID: <20090429025107.7649E70135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-foolscap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20364/rpms/python-foolscap

Added Files:
	Makefile 
Log Message:
Setup of module python-foolscap


--- NEW FILE Makefile ---
# Top level Makefile for module python-foolscap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 02:51:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:51:08 +0000 (UTC)
Subject: rpms/python-foolscap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429025108.C591570135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-foolscap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20364/rpms/python-foolscap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-foolscap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-foolscap
# $Id: Makefile,v 1.1 2009/04/29 02:51:07 kevin Exp $
NAME := python-foolscap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 02:51:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:51:22 +0000
Subject: [pkgdb] vidalia was added for cassmodiah
Message-ID: <20090429025122.64FA310F896@bastion2.fedora.phx.redhat.com>

kevin has added Package vidalia with summary Controller GUI for the Tor Onion Routing Network
kevin has approved Package vidalia
kevin has added a Fedora devel branch for vidalia with an owner of cassmodiah
kevin has approved vidalia in Fedora devel
kevin has approved Package vidalia
kevin has set commit to Approved for provenpackager on vidalia (Fedora devel)
kevin has set build to Approved for provenpackager on vidalia (Fedora devel)
kevin has set checkout to Approved for provenpackager on vidalia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Wed Apr 29 02:51:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:51:24 +0000
Subject: [pkgdb] vidalia (Fedora, 10) updated by kevin
Message-ID: <20090429025124.7A2DC10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vidalia
kevin has set commit to Approved for provenpackager on vidalia (Fedora 10)
kevin has set build to Approved for provenpackager on vidalia (Fedora 10)
kevin has set checkout to Approved for provenpackager on vidalia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Wed Apr 29 02:51:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:51:24 +0000
Subject: [pkgdb] vidalia (Fedora, 11) updated by kevin
Message-ID: <20090429025124.98CFB10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vidalia
kevin has set commit to Approved for provenpackager on vidalia (Fedora 11)
kevin has set build to Approved for provenpackager on vidalia (Fedora 11)
kevin has set checkout to Approved for provenpackager on vidalia (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From kevin at fedoraproject.org  Wed Apr 29 02:51:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:51:33 +0000 (UTC)
Subject: rpms/vidalia - New directory
Message-ID: <20090429025133.25BE070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vidalia
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20924/rpms/vidalia

Log Message:
Directory /cvs/pkgs/rpms/vidalia added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:51:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:51:33 +0000 (UTC)
Subject: rpms/vidalia/devel - New directory
Message-ID: <20090429025133.622B870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vidalia/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20924/rpms/vidalia/devel

Log Message:
Directory /cvs/pkgs/rpms/vidalia/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:51:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:51:42 +0000 (UTC)
Subject: rpms/vidalia Makefile,NONE,1.1
Message-ID: <20090429025142.A016C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vidalia
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20924/rpms/vidalia

Added Files:
	Makefile 
Log Message:
Setup of module vidalia


--- NEW FILE Makefile ---
# Top level Makefile for module vidalia
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 02:51:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:51:42 +0000 (UTC)
Subject: rpms/vidalia/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090429025142.E8E5070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vidalia/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20924/rpms/vidalia/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vidalia


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vidalia
# $Id: Makefile,v 1.1 2009/04/29 02:51:42 kevin Exp $
NAME := vidalia
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 02:53:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:53:12 +0000
Subject: [pkgdb] parrot was added for gerd
Message-ID: <20090429025312.612AD10F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package parrot with summary Parrot is a virtual machine
kevin has approved Package parrot
kevin has added a Fedora devel branch for parrot with an owner of gerd
kevin has approved parrot in Fedora devel
kevin has approved Package parrot
kevin has set commit to Approved for provenpackager on parrot (Fedora devel)
kevin has set build to Approved for provenpackager on parrot (Fedora devel)
kevin has set checkout to Approved for provenpackager on parrot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Wed Apr 29 02:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:53:14 +0000
Subject: [pkgdb] parrot (Fedora, 10) updated by kevin
Message-ID: <20090429025314.8685C10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for parrot
kevin has set commit to Approved for provenpackager on parrot (Fedora 10)
kevin has set build to Approved for provenpackager on parrot (Fedora 10)
kevin has set checkout to Approved for provenpackager on parrot (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Wed Apr 29 02:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:53:14 +0000
Subject: [pkgdb] parrot (Fedora, 9) updated by kevin
Message-ID: <20090429025314.8E9D910F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for parrot
kevin has set commit to Approved for provenpackager on parrot (Fedora 9)
kevin has set build to Approved for provenpackager on parrot (Fedora 9)
kevin has set checkout to Approved for provenpackager on parrot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From pkgdb at fedoraproject.org  Wed Apr 29 02:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:53:14 +0000
Subject: [pkgdb] parrot (Fedora, 11) updated by kevin
Message-ID: <20090429025314.A01FC10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for parrot
kevin has set commit to Approved for provenpackager on parrot (Fedora 11)
kevin has set build to Approved for provenpackager on parrot (Fedora 11)
kevin has set checkout to Approved for provenpackager on parrot (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/parrot



From kevin at fedoraproject.org  Wed Apr 29 02:53:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:53:27 +0000 (UTC)
Subject: rpms/parrot - New directory
Message-ID: <20090429025327.260A370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parrot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ21493/rpms/parrot

Log Message:
Directory /cvs/pkgs/rpms/parrot added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:53:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:53:27 +0000 (UTC)
Subject: rpms/parrot/devel - New directory
Message-ID: <20090429025327.5A04B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ21493/rpms/parrot/devel

Log Message:
Directory /cvs/pkgs/rpms/parrot/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:53:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:53:35 +0000 (UTC)
Subject: rpms/parrot Makefile,NONE,1.1
Message-ID: <20090429025335.F2E9370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parrot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ21493/rpms/parrot

Added Files:
	Makefile 
Log Message:
Setup of module parrot


--- NEW FILE Makefile ---
# Top level Makefile for module parrot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 02:53:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:53:36 +0000 (UTC)
Subject: rpms/parrot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090429025336.3C9F17013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ21493/rpms/parrot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module parrot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: parrot
# $Id: Makefile,v 1.1 2009/04/29 02:53:36 kevin Exp $
NAME := parrot
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 02:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:56:40 +0000
Subject: [pkgdb] php-ezc-Template was added for llaumgui
Message-ID: <20090429025640.B878C10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-Template with summary A fully functional Templating system
kevin has approved Package php-ezc-Template
kevin has added a Fedora devel branch for php-ezc-Template with an owner of llaumgui
kevin has approved php-ezc-Template in Fedora devel
kevin has approved Package php-ezc-Template
kevin has set commit to Approved for provenpackager on php-ezc-Template (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-Template (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-Template (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Template



From pkgdb at fedoraproject.org  Wed Apr 29 02:56:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:56:42 +0000
Subject: [pkgdb] php-ezc-Template (Fedora, 10) updated by kevin
Message-ID: <20090429025642.5BEA310F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-Template
kevin has set commit to Approved for provenpackager on php-ezc-Template (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-Template (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-Template (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Template



From pkgdb at fedoraproject.org  Wed Apr 29 02:56:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:56:42 +0000
Subject: [pkgdb] php-ezc-Template (Fedora, 9) updated by kevin
Message-ID: <20090429025642.6EDA910F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-Template
kevin has set commit to Approved for provenpackager on php-ezc-Template (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-Template (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-Template (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Template



From pkgdb at fedoraproject.org  Wed Apr 29 02:56:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 02:56:42 +0000
Subject: [pkgdb] php-ezc-Template (Fedora, 11) updated by kevin
Message-ID: <20090429025642.640AC10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-Template
kevin has set commit to Approved for provenpackager on php-ezc-Template (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-Template (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-Template (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Template



From kevin at fedoraproject.org  Wed Apr 29 02:57:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:57:36 +0000 (UTC)
Subject: rpms/php-ezc-Template - New directory
Message-ID: <20090429025736.6000470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Template
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22664/rpms/php-ezc-Template

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Template added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:57:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:57:37 +0000 (UTC)
Subject: rpms/php-ezc-Template/devel - New directory
Message-ID: <20090429025737.24C1370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Template/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22664/rpms/php-ezc-Template/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Template/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 02:58:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:58:22 +0000 (UTC)
Subject: rpms/php-ezc-Template Makefile,NONE,1.1
Message-ID: <20090429025822.C7AC070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Template
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22664/rpms/php-ezc-Template

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Template


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Template
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 02:58:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 02:58:23 +0000 (UTC)
Subject: rpms/php-ezc-Template/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429025823.156B470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Template/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22664/rpms/php-ezc-Template/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Template


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Template
# $Id: Makefile,v 1.1 2009/04/29 02:58:22 kevin Exp $
NAME := php-ezc-Template
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:02:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:02:51 +0000
Subject: [pkgdb] php-ezc-PersistentObject was added for llaumgui
Message-ID: <20090429030251.5B4E810F881@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-PersistentObject with summary Allows you to store an arbitrary data structures to a fixed database table
kevin has approved Package php-ezc-PersistentObject
kevin has added a Fedora devel branch for php-ezc-PersistentObject with an owner of llaumgui
kevin has approved php-ezc-PersistentObject in Fedora devel
kevin has approved Package php-ezc-PersistentObject
kevin has set commit to Approved for provenpackager on php-ezc-PersistentObject (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-PersistentObject (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-PersistentObject (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-PersistentObject



From pkgdb at fedoraproject.org  Wed Apr 29 03:02:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:02:53 +0000
Subject: [pkgdb] php-ezc-PersistentObject (Fedora, 10) updated by kevin
Message-ID: <20090429030254.1440710F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-PersistentObject
kevin has set commit to Approved for provenpackager on php-ezc-PersistentObject (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-PersistentObject (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-PersistentObject (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-PersistentObject



From pkgdb at fedoraproject.org  Wed Apr 29 03:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:02:54 +0000
Subject: [pkgdb] php-ezc-PersistentObject (Fedora, 9) updated by kevin
Message-ID: <20090429030254.2D51610F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-PersistentObject
kevin has set commit to Approved for provenpackager on php-ezc-PersistentObject (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-PersistentObject (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-PersistentObject (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-PersistentObject



From pkgdb at fedoraproject.org  Wed Apr 29 03:02:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:02:53 +0000
Subject: [pkgdb] php-ezc-PersistentObject (Fedora, 11) updated by kevin
Message-ID: <20090429030254.1FA7910F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-PersistentObject
kevin has set commit to Approved for provenpackager on php-ezc-PersistentObject (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-PersistentObject (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-PersistentObject (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-PersistentObject



From kevin at fedoraproject.org  Wed Apr 29 03:04:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:04:24 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject - New directory
Message-ID: <20090429030424.2991370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV24938/rpms/php-ezc-PersistentObject

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-PersistentObject added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:04:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:04:24 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/devel - New directory
Message-ID: <20090429030424.6C6E070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV24938/rpms/php-ezc-PersistentObject/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-PersistentObject/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:04:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:04:35 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject Makefile,NONE,1.1
Message-ID: <20090429030435.3158070135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV24938/rpms/php-ezc-PersistentObject

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-PersistentObject


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-PersistentObject
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:04:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:04:35 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090429030435.7F48F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV24938/rpms/php-ezc-PersistentObject/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-PersistentObject


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-PersistentObject
# $Id: Makefile,v 1.1 2009/04/29 03:04:35 kevin Exp $
NAME := php-ezc-PersistentObject
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:05:01 +0000
Subject: [pkgdb] php-ezc-SystemInformation was added for llaumgui
Message-ID: <20090429030501.88A8210F895@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-SystemInformation with summary Provides access to common system variables
kevin has approved Package php-ezc-SystemInformation
kevin has added a Fedora devel branch for php-ezc-SystemInformation with an owner of llaumgui
kevin has approved php-ezc-SystemInformation in Fedora devel
kevin has approved Package php-ezc-SystemInformation
kevin has set commit to Approved for provenpackager on php-ezc-SystemInformation (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-SystemInformation (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-SystemInformation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-SystemInformation



From pkgdb at fedoraproject.org  Wed Apr 29 03:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:05:03 +0000
Subject: [pkgdb] php-ezc-SystemInformation (Fedora, 10) updated by kevin
Message-ID: <20090429030503.B5F3A10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-SystemInformation
kevin has set commit to Approved for provenpackager on php-ezc-SystemInformation (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-SystemInformation (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-SystemInformation (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-SystemInformation



From pkgdb at fedoraproject.org  Wed Apr 29 03:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:05:03 +0000
Subject: [pkgdb] php-ezc-SystemInformation (Fedora, 9) updated by kevin
Message-ID: <20090429030503.BF79A10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-SystemInformation
kevin has set commit to Approved for provenpackager on php-ezc-SystemInformation (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-SystemInformation (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-SystemInformation (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-SystemInformation



From kevin at fedoraproject.org  Wed Apr 29 03:05:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:05:18 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation - New directory
Message-ID: <20090429030518.3ADF070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25337/rpms/php-ezc-SystemInformation

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-SystemInformation added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:05:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:05:18 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/devel - New directory
Message-ID: <20090429030518.840E170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25337/rpms/php-ezc-SystemInformation/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-SystemInformation/devel added to the repository




From pkgdb at fedoraproject.org  Wed Apr 29 03:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:05:03 +0000
Subject: [pkgdb] php-ezc-SystemInformation (Fedora, 11) updated by kevin
Message-ID: <20090429030503.C92EF10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-SystemInformation
kevin has set commit to Approved for provenpackager on php-ezc-SystemInformation (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-SystemInformation (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-SystemInformation (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-SystemInformation



From kevin at fedoraproject.org  Wed Apr 29 03:05:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:05:30 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation Makefile,NONE,1.1
Message-ID: <20090429030530.A140C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25337/rpms/php-ezc-SystemInformation

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-SystemInformation


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-SystemInformation
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:05:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:05:31 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090429030531.1801B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25337/rpms/php-ezc-SystemInformation/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-SystemInformation


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-SystemInformation
# $Id: Makefile,v 1.1 2009/04/29 03:05:30 kevin Exp $
NAME := php-ezc-SystemInformation
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:06:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:06:25 +0000
Subject: [pkgdb] jnettop was added for wolfy
Message-ID: <20090429030626.C55EF10F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package jnettop with summary Network traffic tracker
kevin has approved Package jnettop
kevin has added a Fedora devel branch for jnettop with an owner of wolfy
kevin has approved jnettop in Fedora devel
kevin has approved Package jnettop
kevin has set commit to Approved for provenpackager on jnettop (Fedora devel)
kevin has set build to Approved for provenpackager on jnettop (Fedora devel)
kevin has set checkout to Approved for provenpackager on jnettop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jnettop



From pkgdb at fedoraproject.org  Wed Apr 29 03:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:06:27 +0000
Subject: [pkgdb] jnettop (Fedora, 10) updated by kevin
Message-ID: <20090429030627.C662410F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jnettop
kevin has set commit to Approved for provenpackager on jnettop (Fedora 10)
kevin has set build to Approved for provenpackager on jnettop (Fedora 10)
kevin has set checkout to Approved for provenpackager on jnettop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jnettop



From pkgdb at fedoraproject.org  Wed Apr 29 03:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:06:27 +0000
Subject: [pkgdb] jnettop (Fedora, 9) updated by kevin
Message-ID: <20090429030627.9210210F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for jnettop
kevin has set commit to Approved for provenpackager on jnettop (Fedora 9)
kevin has set build to Approved for provenpackager on jnettop (Fedora 9)
kevin has set checkout to Approved for provenpackager on jnettop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jnettop



From pkgdb at fedoraproject.org  Wed Apr 29 03:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:06:27 +0000
Subject: [pkgdb] jnettop (Fedora EPEL, 4) updated by kevin
Message-ID: <20090429030628.20CAF10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for jnettop
kevin has set commit to Approved for provenpackager on jnettop (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on jnettop (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on jnettop (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jnettop



From pkgdb at fedoraproject.org  Wed Apr 29 03:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:06:27 +0000
Subject: [pkgdb] jnettop (Fedora EPEL, 5) updated by kevin
Message-ID: <20090429030628.9358D10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for jnettop
kevin has set commit to Approved for provenpackager on jnettop (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on jnettop (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on jnettop (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jnettop



From pkgdb at fedoraproject.org  Wed Apr 29 03:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:06:27 +0000
Subject: [pkgdb] jnettop (Fedora, 11) updated by kevin
Message-ID: <20090429030628.6A8A410F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jnettop
kevin has set commit to Approved for provenpackager on jnettop (Fedora 11)
kevin has set build to Approved for provenpackager on jnettop (Fedora 11)
kevin has set checkout to Approved for provenpackager on jnettop (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jnettop



From kevin at fedoraproject.org  Wed Apr 29 03:06:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:06:37 +0000 (UTC)
Subject: rpms/jnettop - New directory
Message-ID: <20090429030637.37A7870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jnettop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst25775/rpms/jnettop

Log Message:
Directory /cvs/pkgs/rpms/jnettop added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:06:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:06:37 +0000 (UTC)
Subject: rpms/jnettop/devel - New directory
Message-ID: <20090429030637.7A60670133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jnettop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst25775/rpms/jnettop/devel

Log Message:
Directory /cvs/pkgs/rpms/jnettop/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:06:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:06:46 +0000 (UTC)
Subject: rpms/jnettop Makefile,NONE,1.1
Message-ID: <20090429030646.6460F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jnettop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst25775/rpms/jnettop

Added Files:
	Makefile 
Log Message:
Setup of module jnettop


--- NEW FILE Makefile ---
# Top level Makefile for module jnettop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:06:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:06:46 +0000 (UTC)
Subject: rpms/jnettop/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090429030646.D457970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jnettop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst25775/rpms/jnettop/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jnettop


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jnettop
# $Id: Makefile,v 1.1 2009/04/29 03:06:46 kevin Exp $
NAME := jnettop
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:07:18 +0000
Subject: [pkgdb] nfoview was added for fab
Message-ID: <20090429030718.68C8E10F896@bastion2.fedora.phx.redhat.com>

kevin has added Package nfoview with summary Viewer for NFO files
kevin has approved Package nfoview
kevin has added a Fedora devel branch for nfoview with an owner of fab
kevin has approved nfoview in Fedora devel
kevin has approved Package nfoview
kevin has set commit to Approved for provenpackager on nfoview (Fedora devel)
kevin has set build to Approved for provenpackager on nfoview (Fedora devel)
kevin has set checkout to Approved for provenpackager on nfoview (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nfoview



From pkgdb at fedoraproject.org  Wed Apr 29 03:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:07:19 +0000
Subject: [pkgdb] nfoview (Fedora, 10) updated by kevin
Message-ID: <20090429030720.00BF410F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nfoview
kevin has set commit to Approved for provenpackager on nfoview (Fedora 10)
kevin has set build to Approved for provenpackager on nfoview (Fedora 10)
kevin has set checkout to Approved for provenpackager on nfoview (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nfoview



From pkgdb at fedoraproject.org  Wed Apr 29 03:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:07:19 +0000
Subject: [pkgdb] nfoview (Fedora, 11) updated by kevin
Message-ID: <20090429030720.46BDB10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for nfoview
kevin has set commit to Approved for provenpackager on nfoview (Fedora 11)
kevin has set build to Approved for provenpackager on nfoview (Fedora 11)
kevin has set checkout to Approved for provenpackager on nfoview (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nfoview



From kevin at fedoraproject.org  Wed Apr 29 03:07:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:07:29 +0000 (UTC)
Subject: rpms/nfoview - New directory
Message-ID: <20090429030729.2690F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nfoview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26227/rpms/nfoview

Log Message:
Directory /cvs/pkgs/rpms/nfoview added to the repository




From pkgdb at fedoraproject.org  Wed Apr 29 03:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:07:19 +0000
Subject: [pkgdb] nfoview (Fedora, 9) updated by kevin
Message-ID: <20090429030720.5D36C10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for nfoview
kevin has set commit to Approved for provenpackager on nfoview (Fedora 9)
kevin has set build to Approved for provenpackager on nfoview (Fedora 9)
kevin has set checkout to Approved for provenpackager on nfoview (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nfoview



From kevin at fedoraproject.org  Wed Apr 29 03:07:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:07:29 +0000 (UTC)
Subject: rpms/nfoview/devel - New directory
Message-ID: <20090429030729.643E270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nfoview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26227/rpms/nfoview/devel

Log Message:
Directory /cvs/pkgs/rpms/nfoview/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:07:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:07:38 +0000 (UTC)
Subject: rpms/nfoview Makefile,NONE,1.1
Message-ID: <20090429030738.4455D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nfoview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26227/rpms/nfoview

Added Files:
	Makefile 
Log Message:
Setup of module nfoview


--- NEW FILE Makefile ---
# Top level Makefile for module nfoview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:07:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:07:38 +0000 (UTC)
Subject: rpms/nfoview/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090429030738.86C3A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nfoview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26227/rpms/nfoview/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nfoview


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nfoview
# $Id: Makefile,v 1.1 2009/04/29 03:07:38 kevin Exp $
NAME := nfoview
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:08:10 +0000
Subject: [pkgdb] perl-Config-INI was added for iarnell
Message-ID: <20090429030810.16FE810F899@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Config-INI with summary Config::INI Perl module
kevin has approved Package perl-Config-INI
kevin has added a Fedora devel branch for perl-Config-INI with an owner of iarnell
kevin has approved perl-Config-INI in Fedora devel
kevin has approved Package perl-Config-INI
kevin has set commit to Approved for provenpackager on perl-Config-INI (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Config-INI (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Config-INI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-INI



From pkgdb at fedoraproject.org  Wed Apr 29 03:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:08:11 +0000
Subject: [pkgdb] perl-Config-INI (Fedora, 10) updated by kevin
Message-ID: <20090429030811.A123B10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Config-INI
kevin has set commit to Approved for provenpackager on perl-Config-INI (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Config-INI (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Config-INI (Fedora 10)
kevin approved watchbugzilla on perl-Config-INI (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Config-INI (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-INI



From pkgdb at fedoraproject.org  Wed Apr 29 03:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:08:11 +0000
Subject: [pkgdb] perl-Config-INI (Fedora, 11) updated by kevin
Message-ID: <20090429030811.E540E10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Config-INI
kevin has set commit to Approved for provenpackager on perl-Config-INI (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Config-INI (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Config-INI (Fedora 11)
kevin approved watchbugzilla on perl-Config-INI (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Config-INI (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-INI



From pkgdb at fedoraproject.org  Wed Apr 29 03:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:08:11 +0000
Subject: [pkgdb] perl-Config-INI (Fedora, devel) updated by kevin
Message-ID: <20090429030811.F16B510F8A2@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Config-INI (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Config-INI (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-INI



From kevin at fedoraproject.org  Wed Apr 29 03:08:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:08:21 +0000 (UTC)
Subject: rpms/perl-Config-INI - New directory
Message-ID: <20090429030821.25F4470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-INI
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26571/rpms/perl-Config-INI

Log Message:
Directory /cvs/pkgs/rpms/perl-Config-INI added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:08:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:08:21 +0000 (UTC)
Subject: rpms/perl-Config-INI/devel - New directory
Message-ID: <20090429030821.5EF8470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-INI/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26571/rpms/perl-Config-INI/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Config-INI/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:08:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:08:34 +0000 (UTC)
Subject: rpms/perl-Config-INI Makefile,NONE,1.1
Message-ID: <20090429030834.49C6170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-INI
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26571/rpms/perl-Config-INI

Added Files:
	Makefile 
Log Message:
Setup of module perl-Config-INI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Config-INI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:08:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:08:34 +0000 (UTC)
Subject: rpms/perl-Config-INI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429030834.B555570133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-INI/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26571/rpms/perl-Config-INI/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Config-INI


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Config-INI
# $Id: Makefile,v 1.1 2009/04/29 03:08:34 kevin Exp $
NAME := perl-Config-INI
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:09:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:09:01 +0000
Subject: [pkgdb] perl-HTML-StripScripts was added for xavierb
Message-ID: <20090429030901.DCFCC10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-HTML-StripScripts with summary Strip scripting constructs out of HTML
kevin has approved Package perl-HTML-StripScripts
kevin has added a Fedora devel branch for perl-HTML-StripScripts with an owner of xavierb
kevin has approved perl-HTML-StripScripts in Fedora devel
kevin has approved Package perl-HTML-StripScripts
kevin has set commit to Approved for provenpackager on perl-HTML-StripScripts (Fedora devel)
kevin has set build to Approved for provenpackager on perl-HTML-StripScripts (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-HTML-StripScripts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts



From pkgdb at fedoraproject.org  Wed Apr 29 03:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:09:03 +0000
Subject: [pkgdb] perl-HTML-StripScripts (Fedora, 10) updated by kevin
Message-ID: <20090429030903.5631010F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-HTML-StripScripts
kevin has set commit to Approved for provenpackager on perl-HTML-StripScripts (Fedora 10)
kevin has set build to Approved for provenpackager on perl-HTML-StripScripts (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-HTML-StripScripts (Fedora 10)
kevin approved watchbugzilla on perl-HTML-StripScripts (Fedora 10) for perl-sig
kevin approved watchcommits on perl-HTML-StripScripts (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts



From pkgdb at fedoraproject.org  Wed Apr 29 03:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:09:03 +0000
Subject: [pkgdb] perl-HTML-StripScripts (Fedora, devel) updated by kevin
Message-ID: <20090429030903.5C1AF10F898@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-HTML-StripScripts (Fedora devel) for perl-sig
kevin approved watchcommits on perl-HTML-StripScripts (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts



From pkgdb at fedoraproject.org  Wed Apr 29 03:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:09:03 +0000
Subject: [pkgdb] perl-HTML-StripScripts (Fedora, 9) updated by kevin
Message-ID: <20090429030903.6474910F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-HTML-StripScripts
kevin has set commit to Approved for provenpackager on perl-HTML-StripScripts (Fedora 9)
kevin has set build to Approved for provenpackager on perl-HTML-StripScripts (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-HTML-StripScripts (Fedora 9)
kevin approved watchbugzilla on perl-HTML-StripScripts (Fedora 9) for perl-sig
kevin approved watchcommits on perl-HTML-StripScripts (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts



From pkgdb at fedoraproject.org  Wed Apr 29 03:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:09:03 +0000
Subject: [pkgdb] perl-HTML-StripScripts (Fedora, 11) updated by kevin
Message-ID: <20090429030903.6CB2B10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-HTML-StripScripts
kevin has set commit to Approved for provenpackager on perl-HTML-StripScripts (Fedora 11)
kevin has set build to Approved for provenpackager on perl-HTML-StripScripts (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-HTML-StripScripts (Fedora 11)
kevin approved watchbugzilla on perl-HTML-StripScripts (Fedora 11) for perl-sig
kevin approved watchcommits on perl-HTML-StripScripts (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts



From kevin at fedoraproject.org  Wed Apr 29 03:09:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:09:14 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts - New directory
Message-ID: <20090429030914.23B5970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26869/rpms/perl-HTML-StripScripts

Log Message:
Directory /cvs/pkgs/rpms/perl-HTML-StripScripts added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:09:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:09:14 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/devel - New directory
Message-ID: <20090429030914.6176370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26869/rpms/perl-HTML-StripScripts/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-HTML-StripScripts/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:09:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:09:23 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts Makefile,NONE,1.1
Message-ID: <20090429030923.4C5AB70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26869/rpms/perl-HTML-StripScripts

Added Files:
	Makefile 
Log Message:
Setup of module perl-HTML-StripScripts


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-StripScripts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:09:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:09:23 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090429030923.92B5370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26869/rpms/perl-HTML-StripScripts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-StripScripts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-HTML-StripScripts
# $Id: Makefile,v 1.1 2009/04/29 03:09:23 kevin Exp $
NAME := perl-HTML-StripScripts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:09:03 +0000
Subject: [pkgdb] perl-HTML-StripScripts (Fedora EPEL, 5) updated by kevin
Message-ID: <20090429030903.74BE210F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-HTML-StripScripts
kevin has set commit to Approved for provenpackager on perl-HTML-StripScripts (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-HTML-StripScripts (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-HTML-StripScripts (Fedora EPEL 5)
kevin approved watchbugzilla on perl-HTML-StripScripts (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-HTML-StripScripts (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-StripScripts



From pkgdb at fedoraproject.org  Wed Apr 29 03:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:10:44 +0000
Subject: [pkgdb] perl-Archive-RPM was added for cweyl
Message-ID: <20090429031045.34AD810F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Archive-RPM with summary Work with an RPM
kevin has approved Package perl-Archive-RPM
kevin has added a Fedora devel branch for perl-Archive-RPM with an owner of cweyl
kevin has approved perl-Archive-RPM in Fedora devel
kevin has approved Package perl-Archive-RPM
kevin has set commit to Approved for provenpackager on perl-Archive-RPM (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Archive-RPM (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Archive-RPM (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-RPM



From pkgdb at fedoraproject.org  Wed Apr 29 03:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:10:47 +0000
Subject: [pkgdb] perl-Archive-RPM (Fedora, devel) updated by kevin
Message-ID: <20090429031047.EECF910F89D@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Archive-RPM (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Archive-RPM (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-RPM



From pkgdb at fedoraproject.org  Wed Apr 29 03:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:10:47 +0000
Subject: [pkgdb] perl-Archive-RPM (Fedora, 10) updated by kevin
Message-ID: <20090429031048.0820E10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Archive-RPM
kevin has set commit to Approved for provenpackager on perl-Archive-RPM (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Archive-RPM (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Archive-RPM (Fedora 10)
kevin approved watchbugzilla on perl-Archive-RPM (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Archive-RPM (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-RPM



From pkgdb at fedoraproject.org  Wed Apr 29 03:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:10:47 +0000
Subject: [pkgdb] perl-Archive-RPM (Fedora, 11) updated by kevin
Message-ID: <20090429031048.1349910F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Archive-RPM
kevin has set commit to Approved for provenpackager on perl-Archive-RPM (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Archive-RPM (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Archive-RPM (Fedora 11)
kevin approved watchbugzilla on perl-Archive-RPM (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Archive-RPM (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-RPM



From pkgdb at fedoraproject.org  Wed Apr 29 03:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:10:47 +0000
Subject: [pkgdb] perl-Archive-RPM (Fedora, 9) updated by kevin
Message-ID: <20090429031048.24DE310F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Archive-RPM
kevin has set commit to Approved for provenpackager on perl-Archive-RPM (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Archive-RPM (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Archive-RPM (Fedora 9)
kevin approved watchbugzilla on perl-Archive-RPM (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Archive-RPM (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Archive-RPM



From kevin at fedoraproject.org  Wed Apr 29 03:11:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:11:02 +0000 (UTC)
Subject: rpms/perl-Archive-RPM - New directory
Message-ID: <20090429031102.3AD6B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Archive-RPM
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH27424/rpms/perl-Archive-RPM

Log Message:
Directory /cvs/pkgs/rpms/perl-Archive-RPM added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:11:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:11:02 +0000 (UTC)
Subject: rpms/perl-Archive-RPM/devel - New directory
Message-ID: <20090429031102.A4FE770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Archive-RPM/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH27424/rpms/perl-Archive-RPM/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Archive-RPM/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:11:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:11:19 +0000 (UTC)
Subject: rpms/perl-Archive-RPM Makefile,NONE,1.1
Message-ID: <20090429031119.2863570133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Archive-RPM
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH27424/rpms/perl-Archive-RPM

Added Files:
	Makefile 
Log Message:
Setup of module perl-Archive-RPM


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Archive-RPM
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:11:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:11:19 +0000 (UTC)
Subject: rpms/perl-Archive-RPM/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429031119.7784D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Archive-RPM/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH27424/rpms/perl-Archive-RPM/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Archive-RPM


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Archive-RPM
# $Id: Makefile,v 1.1 2009/04/29 03:11:19 kevin Exp $
NAME := perl-Archive-RPM
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:11:36 +0000
Subject: [pkgdb] perl-HTML-GenToc was added for iarnell
Message-ID: <20090429031136.18C6810F8A2@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-HTML-GenToc with summary Generate a Table of Contents for HTML documents
kevin has approved Package perl-HTML-GenToc
kevin has added a Fedora devel branch for perl-HTML-GenToc with an owner of iarnell
kevin has approved perl-HTML-GenToc in Fedora devel
kevin has approved Package perl-HTML-GenToc
kevin has set commit to Approved for provenpackager on perl-HTML-GenToc (Fedora devel)
kevin has set build to Approved for provenpackager on perl-HTML-GenToc (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-HTML-GenToc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-GenToc



From pkgdb at fedoraproject.org  Wed Apr 29 03:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:11:38 +0000
Subject: [pkgdb] perl-HTML-GenToc (Fedora, 10) updated by kevin
Message-ID: <20090429031139.447B710F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-HTML-GenToc
kevin has set commit to Approved for provenpackager on perl-HTML-GenToc (Fedora 10)
kevin has set build to Approved for provenpackager on perl-HTML-GenToc (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-HTML-GenToc (Fedora 10)
kevin approved watchbugzilla on perl-HTML-GenToc (Fedora 10) for perl-sig
kevin approved watchcommits on perl-HTML-GenToc (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-GenToc



From pkgdb at fedoraproject.org  Wed Apr 29 03:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:11:38 +0000
Subject: [pkgdb] perl-HTML-GenToc (Fedora, 11) updated by kevin
Message-ID: <20090429031139.4CA3810F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-HTML-GenToc
kevin has set commit to Approved for provenpackager on perl-HTML-GenToc (Fedora 11)
kevin has set build to Approved for provenpackager on perl-HTML-GenToc (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-HTML-GenToc (Fedora 11)
kevin approved watchbugzilla on perl-HTML-GenToc (Fedora 11) for perl-sig
kevin approved watchcommits on perl-HTML-GenToc (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-GenToc



From pkgdb at fedoraproject.org  Wed Apr 29 03:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:11:38 +0000
Subject: [pkgdb] perl-HTML-GenToc (Fedora, devel) updated by kevin
Message-ID: <20090429031139.5904610F8A9@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-HTML-GenToc (Fedora devel) for perl-sig
kevin approved watchcommits on perl-HTML-GenToc (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-GenToc



From kevin at fedoraproject.org  Wed Apr 29 03:12:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:12:07 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc/devel - New directory
Message-ID: <20090429031207.7F0E470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-GenToc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY27947/rpms/perl-HTML-GenToc/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-HTML-GenToc/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:12:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:12:07 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc - New directory
Message-ID: <20090429031207.3A8DD70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-GenToc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY27947/rpms/perl-HTML-GenToc

Log Message:
Directory /cvs/pkgs/rpms/perl-HTML-GenToc added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:12:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:12:31 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc Makefile,NONE,1.1
Message-ID: <20090429031231.C5B9770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-GenToc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY27947/rpms/perl-HTML-GenToc

Added Files:
	Makefile 
Log Message:
Setup of module perl-HTML-GenToc


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-GenToc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:12:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:12:32 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429031232.3582570133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTML-GenToc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY27947/rpms/perl-HTML-GenToc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-GenToc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-HTML-GenToc
# $Id: Makefile,v 1.1 2009/04/29 03:12:31 kevin Exp $
NAME := perl-HTML-GenToc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:13:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:13:45 +0000
Subject: [pkgdb] hunspell-ln was added for caolanm
Message-ID: <20090429031345.8933C10F895@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-ln with summary Lingala hunspell dictionaries
kevin has approved Package hunspell-ln
kevin has added a Fedora devel branch for hunspell-ln with an owner of caolanm
kevin has approved hunspell-ln in Fedora devel
kevin has approved Package hunspell-ln
kevin has set commit to Approved for provenpackager on hunspell-ln (Fedora devel)
kevin has set build to Approved for provenpackager on hunspell-ln (Fedora devel)
kevin has set checkout to Approved for provenpackager on hunspell-ln (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ln



From kevin at fedoraproject.org  Wed Apr 29 03:14:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:14:00 +0000 (UTC)
Subject: rpms/hunspell-ln - New directory
Message-ID: <20090429031400.2BF5170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ln
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi28739/rpms/hunspell-ln

Log Message:
Directory /cvs/pkgs/rpms/hunspell-ln added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:14:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:14:00 +0000 (UTC)
Subject: rpms/hunspell-ln/devel - New directory
Message-ID: <20090429031400.766C970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ln/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi28739/rpms/hunspell-ln/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-ln/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:14:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:14:09 +0000 (UTC)
Subject: rpms/hunspell-ln Makefile,NONE,1.1
Message-ID: <20090429031409.D70D370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ln
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi28739/rpms/hunspell-ln

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ln


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ln
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:14:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:14:10 +0000 (UTC)
Subject: rpms/hunspell-ln/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429031410.2CA3570133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ln/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi28739/rpms/hunspell-ln/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ln


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ln
# $Id: Makefile,v 1.1 2009/04/29 03:14:10 kevin Exp $
NAME := hunspell-ln
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:14:51 +0000
Subject: [pkgdb] perl-Capture-Tiny was added for mmaslano
Message-ID: <20090429031451.5510910F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Capture-Tiny with summary Capture stdin or stdout from Perl, XS or external programs
kevin has approved Package perl-Capture-Tiny
kevin has added a Fedora devel branch for perl-Capture-Tiny with an owner of mmaslano
kevin has approved perl-Capture-Tiny in Fedora devel
kevin has approved Package perl-Capture-Tiny
kevin has set commit to Approved for provenpackager on perl-Capture-Tiny (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Capture-Tiny (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Capture-Tiny (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Capture-Tiny



From pkgdb at fedoraproject.org  Wed Apr 29 03:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:14:53 +0000
Subject: [pkgdb] perl-Capture-Tiny (Fedora, devel) updated by kevin
Message-ID: <20090429031453.73F3310F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Capture-Tiny (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Capture-Tiny (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Capture-Tiny



From kevin at fedoraproject.org  Wed Apr 29 03:15:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:15:05 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny - New directory
Message-ID: <20090429031505.27DFA70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Capture-Tiny
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29029/rpms/perl-Capture-Tiny

Log Message:
Directory /cvs/pkgs/rpms/perl-Capture-Tiny added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:15:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:15:05 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny/devel - New directory
Message-ID: <20090429031505.6AC3B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Capture-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29029/rpms/perl-Capture-Tiny/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Capture-Tiny/devel added to the repository




From pkgdb at fedoraproject.org  Wed Apr 29 03:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:14:53 +0000
Subject: [pkgdb] perl-Capture-Tiny (Fedora, 11) updated by kevin
Message-ID: <20090429031453.7C3C610F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Capture-Tiny
kevin has set commit to Approved for provenpackager on perl-Capture-Tiny (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Capture-Tiny (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Capture-Tiny (Fedora 11)
kevin approved watchbugzilla on perl-Capture-Tiny (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Capture-Tiny (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Capture-Tiny



From kevin at fedoraproject.org  Wed Apr 29 03:15:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:15:19 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090429031519.C009770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Capture-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29029/rpms/perl-Capture-Tiny/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Capture-Tiny


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Capture-Tiny
# $Id: Makefile,v 1.1 2009/04/29 03:15:19 kevin Exp $
NAME := perl-Capture-Tiny
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Apr 29 03:15:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:15:19 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny Makefile,NONE,1.1
Message-ID: <20090429031519.729B370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Capture-Tiny
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29029/rpms/perl-Capture-Tiny

Added Files:
	Makefile 
Log Message:
Setup of module perl-Capture-Tiny


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Capture-Tiny
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Apr 29 03:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:15:49 +0000
Subject: [pkgdb] shortrpm was added for lkundrak
Message-ID: <20090429031549.C469010F881@bastion2.fedora.phx.redhat.com>

kevin has added Package shortrpm with summary Short-circuit binary RPM package build
kevin has approved Package shortrpm
kevin has added a Fedora devel branch for shortrpm with an owner of lkundrak
kevin has approved shortrpm in Fedora devel
kevin has approved Package shortrpm
kevin has set commit to Approved for provenpackager on shortrpm (Fedora devel)
kevin has set build to Approved for provenpackager on shortrpm (Fedora devel)
kevin has set checkout to Approved for provenpackager on shortrpm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shortrpm



From pkgdb at fedoraproject.org  Wed Apr 29 03:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:15:51 +0000
Subject: [pkgdb] shortrpm (Fedora, 10) updated by kevin
Message-ID: <20090429031551.687F510F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for shortrpm
kevin has set commit to Approved for provenpackager on shortrpm (Fedora 10)
kevin has set build to Approved for provenpackager on shortrpm (Fedora 10)
kevin has set checkout to Approved for provenpackager on shortrpm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shortrpm



From pkgdb at fedoraproject.org  Wed Apr 29 03:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:15:51 +0000
Subject: [pkgdb] shortrpm (Fedora, 11) updated by kevin
Message-ID: <20090429031551.7236910F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for shortrpm
kevin has set commit to Approved for provenpackager on shortrpm (Fedora 11)
kevin has set build to Approved for provenpackager on shortrpm (Fedora 11)
kevin has set checkout to Approved for provenpackager on shortrpm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shortrpm



From pkgdb at fedoraproject.org  Wed Apr 29 03:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:15:51 +0000
Subject: [pkgdb] shortrpm (Fedora EPEL, 5) updated by kevin
Message-ID: <20090429031551.7CDAC10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for shortrpm
kevin has set commit to Approved for provenpackager on shortrpm (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on shortrpm (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on shortrpm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shortrpm



From kevin at fedoraproject.org  Wed Apr 29 03:16:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:16:08 +0000 (UTC)
Subject: rpms/shortrpm/devel - New directory
Message-ID: <20090429031608.8C37C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shortrpm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI29394/rpms/shortrpm/devel

Log Message:
Directory /cvs/pkgs/rpms/shortrpm/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:16:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:16:08 +0000 (UTC)
Subject: rpms/shortrpm - New directory
Message-ID: <20090429031608.35A4A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shortrpm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI29394/rpms/shortrpm

Log Message:
Directory /cvs/pkgs/rpms/shortrpm added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:17:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:17:02 +0000 (UTC)
Subject: rpms/shortrpm Makefile,NONE,1.1
Message-ID: <20090429031702.D18D870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shortrpm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI29394/rpms/shortrpm

Added Files:
	Makefile 
Log Message:
Setup of module shortrpm


--- NEW FILE Makefile ---
# Top level Makefile for module shortrpm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Apr 29 03:17:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:17:02 +0000
Subject: [pkgdb] python-paida was added for jussilehtola
Message-ID: <20090429031702.3D1AE10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package python-paida with summary Pure Python scientific analysis package
kevin has approved Package python-paida
kevin has added a Fedora devel branch for python-paida with an owner of jussilehtola
kevin has approved python-paida in Fedora devel
kevin has approved Package python-paida
kevin has set commit to Approved for provenpackager on python-paida (Fedora devel)
kevin has set build to Approved for provenpackager on python-paida (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-paida (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paida



From pkgdb at fedoraproject.org  Wed Apr 29 03:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:17:04 +0000
Subject: [pkgdb] python-paida (Fedora, 10) updated by kevin
Message-ID: <20090429031704.8CDB810F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-paida
kevin has set commit to Approved for provenpackager on python-paida (Fedora 10)
kevin has set build to Approved for provenpackager on python-paida (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-paida (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paida



From pkgdb at fedoraproject.org  Wed Apr 29 03:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:17:04 +0000
Subject: [pkgdb] python-paida (Fedora, 11) updated by kevin
Message-ID: <20090429031704.9765B10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-paida
kevin has set commit to Approved for provenpackager on python-paida (Fedora 11)
kevin has set build to Approved for provenpackager on python-paida (Fedora 11)
kevin has set checkout to Approved for provenpackager on python-paida (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paida



From kevin at fedoraproject.org  Wed Apr 29 03:17:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:17:05 +0000 (UTC)
Subject: rpms/shortrpm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429031705.23ACA70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shortrpm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI29394/rpms/shortrpm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shortrpm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shortrpm
# $Id: Makefile,v 1.1 2009/04/29 03:17:02 kevin Exp $
NAME := shortrpm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Apr 29 03:19:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:19:11 +0000 (UTC)
Subject: rpms/python-paida - New directory
Message-ID: <20090429031911.3B29970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-paida
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD30358/rpms/python-paida

Log Message:
Directory /cvs/pkgs/rpms/python-paida added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:19:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:19:11 +0000 (UTC)
Subject: rpms/python-paida/devel - New directory
Message-ID: <20090429031911.CD48A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-paida/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD30358/rpms/python-paida/devel

Log Message:
Directory /cvs/pkgs/rpms/python-paida/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:19:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:19:25 +0000 (UTC)
Subject: rpms/python-paida Makefile,NONE,1.1
Message-ID: <20090429031925.DE53D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-paida
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD30358/rpms/python-paida

Added Files:
	Makefile 
Log Message:
Setup of module python-paida


--- NEW FILE Makefile ---
# Top level Makefile for module python-paida
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:19:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:19:26 +0000 (UTC)
Subject: rpms/python-paida/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429031926.4E18870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-paida/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD30358/rpms/python-paida/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-paida


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-paida
# $Id: Makefile,v 1.1 2009/04/29 03:19:26 kevin Exp $
NAME := python-paida
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:19:38 +0000
Subject: [pkgdb] perl-MooseX-Role-XMLRPC-Client was added for cweyl
Message-ID: <20090429031938.E8AD810F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Role-XMLRPC-Client with summary Provide the needed bits to be a XML-RPC client
kevin has approved Package perl-MooseX-Role-XMLRPC-Client
kevin has added a Fedora devel branch for perl-MooseX-Role-XMLRPC-Client with an owner of cweyl
kevin has approved perl-MooseX-Role-XMLRPC-Client in Fedora devel
kevin has approved Package perl-MooseX-Role-XMLRPC-Client
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-XMLRPC-Client



From pkgdb at fedoraproject.org  Wed Apr 29 03:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:19:40 +0000
Subject: [pkgdb] perl-MooseX-Role-XMLRPC-Client (Fedora, 10) updated by kevin
Message-ID: <20090429031940.EDDA310F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Role-XMLRPC-Client
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Role-XMLRPC-Client (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-XMLRPC-Client (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-XMLRPC-Client



From pkgdb at fedoraproject.org  Wed Apr 29 03:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:19:40 +0000
Subject: [pkgdb] perl-MooseX-Role-XMLRPC-Client (Fedora, 11) updated by kevin
Message-ID: <20090429031941.02CAE10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-MooseX-Role-XMLRPC-Client
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 11)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 11)
kevin approved watchbugzilla on perl-MooseX-Role-XMLRPC-Client (Fedora 11) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-XMLRPC-Client (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-XMLRPC-Client



From pkgdb at fedoraproject.org  Wed Apr 29 03:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:19:40 +0000
Subject: [pkgdb] perl-MooseX-Role-XMLRPC-Client (Fedora, 9) updated by kevin
Message-ID: <20090429031941.1587410F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-Role-XMLRPC-Client
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-XMLRPC-Client (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-Role-XMLRPC-Client (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-XMLRPC-Client (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-XMLRPC-Client



From pkgdb at fedoraproject.org  Wed Apr 29 03:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:19:40 +0000
Subject: [pkgdb] perl-MooseX-Role-XMLRPC-Client (Fedora,
	devel) updated by kevin
Message-ID: <20090429031941.0C65F10F89B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Role-XMLRPC-Client (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-XMLRPC-Client (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-XMLRPC-Client



From kevin at fedoraproject.org  Wed Apr 29 03:20:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:20:02 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-XMLRPC-Client - New directory
Message-ID: <20090429032002.19E8270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30739/rpms/perl-MooseX-Role-XMLRPC-Client

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:20:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:20:02 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-XMLRPC-Client/devel - New directory
Message-ID: <20090429032002.F0FA070135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30739/rpms/perl-MooseX-Role-XMLRPC-Client/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:20:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:20:22 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-XMLRPC-Client Makefile,NONE,1.1
Message-ID: <20090429032022.43CA670133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30739/rpms/perl-MooseX-Role-XMLRPC-Client

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Role-XMLRPC-Client


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Role-XMLRPC-Client
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:20:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:20:22 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-XMLRPC-Client/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090429032022.AECCF70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30739/rpms/perl-MooseX-Role-XMLRPC-Client/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Role-XMLRPC-Client


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Role-XMLRPC-Client
# $Id: Makefile,v 1.1 2009/04/29 03:20:22 kevin Exp $
NAME := perl-MooseX-Role-XMLRPC-Client
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:20:26 +0000
Subject: [pkgdb] perl-String-Diff was added for iarnell
Message-ID: <20090429032026.BCF3510F895@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-String-Diff with summary Simple diff to String
kevin has approved Package perl-String-Diff
kevin has added a Fedora devel branch for perl-String-Diff with an owner of iarnell
kevin has approved perl-String-Diff in Fedora devel
kevin has approved Package perl-String-Diff
kevin has set commit to Approved for provenpackager on perl-String-Diff (Fedora devel)
kevin has set build to Approved for provenpackager on perl-String-Diff (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-String-Diff (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Diff



From pkgdb at fedoraproject.org  Wed Apr 29 03:20:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:20:29 +0000
Subject: [pkgdb] perl-String-Diff (Fedora, 10) updated by kevin
Message-ID: <20090429032029.BAD3A10F87D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-String-Diff
kevin has set commit to Approved for provenpackager on perl-String-Diff (Fedora 10)
kevin has set build to Approved for provenpackager on perl-String-Diff (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-String-Diff (Fedora 10)
kevin approved watchbugzilla on perl-String-Diff (Fedora 10) for perl-sig
kevin approved watchcommits on perl-String-Diff (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Diff



From pkgdb at fedoraproject.org  Wed Apr 29 03:20:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:20:29 +0000
Subject: [pkgdb] perl-String-Diff (Fedora, 11) updated by kevin
Message-ID: <20090429032029.D3A0C10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-String-Diff
kevin has set commit to Approved for provenpackager on perl-String-Diff (Fedora 11)
kevin has set build to Approved for provenpackager on perl-String-Diff (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-String-Diff (Fedora 11)
kevin approved watchbugzilla on perl-String-Diff (Fedora 11) for perl-sig
kevin approved watchcommits on perl-String-Diff (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Diff



From pkgdb at fedoraproject.org  Wed Apr 29 03:20:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:20:29 +0000
Subject: [pkgdb] perl-String-Diff (Fedora, devel) updated by kevin
Message-ID: <20090429032029.E074210F89B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-String-Diff (Fedora devel) for perl-sig
kevin approved watchcommits on perl-String-Diff (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Diff



From kevin at fedoraproject.org  Wed Apr 29 03:21:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:21:01 +0000 (UTC)
Subject: rpms/perl-String-Diff - New directory
Message-ID: <20090429032101.C1C4B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-String-Diff
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm31145/rpms/perl-String-Diff

Log Message:
Directory /cvs/pkgs/rpms/perl-String-Diff added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:21:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:21:02 +0000 (UTC)
Subject: rpms/perl-String-Diff/devel - New directory
Message-ID: <20090429032102.EA60470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-String-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm31145/rpms/perl-String-Diff/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-String-Diff/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:21:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:21:16 +0000 (UTC)
Subject: rpms/perl-String-Diff Makefile,NONE,1.1
Message-ID: <20090429032116.EC4FB70135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-String-Diff
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm31145/rpms/perl-String-Diff

Added Files:
	Makefile 
Log Message:
Setup of module perl-String-Diff


--- NEW FILE Makefile ---
# Top level Makefile for module perl-String-Diff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:21:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:21:17 +0000 (UTC)
Subject: rpms/perl-String-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429032117.81B3370135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-String-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm31145/rpms/perl-String-Diff/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-String-Diff


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-String-Diff
# $Id: Makefile,v 1.1 2009/04/29 03:21:17 kevin Exp $
NAME := perl-String-Diff
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Apr 29 03:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:21:18 +0000
Subject: [pkgdb] hunspell-as was added for caolanm
Message-ID: <20090429032119.0DFA210F896@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-as with summary Assamese hunspell dictionaries
kevin has approved Package hunspell-as
kevin has added a Fedora devel branch for hunspell-as with an owner of caolanm
kevin has approved hunspell-as in Fedora devel
kevin has approved Package hunspell-as
kevin has set commit to Approved for provenpackager on hunspell-as (Fedora devel)
kevin has set build to Approved for provenpackager on hunspell-as (Fedora devel)
kevin has set checkout to Approved for provenpackager on hunspell-as (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-as



From pkgdb at fedoraproject.org  Wed Apr 29 03:21:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 03:21:20 +0000
Subject: [pkgdb] hunspell-as (Fedora, 11) updated by kevin
Message-ID: <20090429032120.B70CB10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for hunspell-as
kevin has set commit to Approved for provenpackager on hunspell-as (Fedora 11)
kevin has set build to Approved for provenpackager on hunspell-as (Fedora 11)
kevin has set checkout to Approved for provenpackager on hunspell-as (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-as



From kevin at fedoraproject.org  Wed Apr 29 03:21:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:21:55 +0000 (UTC)
Subject: rpms/hunspell-as - New directory
Message-ID: <20090429032155.54E7670136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-as
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd31623/rpms/hunspell-as

Log Message:
Directory /cvs/pkgs/rpms/hunspell-as added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:21:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:21:56 +0000 (UTC)
Subject: rpms/hunspell-as/devel - New directory
Message-ID: <20090429032156.4934670136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-as/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd31623/rpms/hunspell-as/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-as/devel added to the repository




From kevin at fedoraproject.org  Wed Apr 29 03:22:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:22:19 +0000 (UTC)
Subject: rpms/hunspell-as Makefile,NONE,1.1
Message-ID: <20090429032219.32EA670136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-as
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd31623/rpms/hunspell-as

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-as


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-as
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Apr 29 03:22:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 29 Apr 2009 03:22:20 +0000 (UTC)
Subject: rpms/hunspell-as/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090429032220.3F9AB70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-as/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd31623/rpms/hunspell-as/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-as


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-as
# $Id: Makefile,v 1.1 2009/04/29 03:22:19 kevin Exp $
NAME := hunspell-as
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From dchen at fedoraproject.org  Wed Apr 29 03:32:25 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 29 Apr 2009 03:32:25 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.14, 1.15 ibus-chewing.spec,
	1.16, 1.17 import.log, 1.9, 1.10 sources, 1.14, 1.15
Message-ID: <20090429033225.CD96D70133@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2272/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Revision plain Zhuyin mode.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Apr 2009 08:12:23 -0000	1.14
+++ .cvsignore	29 Apr 2009 03:31:54 -0000	1.15
@@ -1 +1 @@
-ibus-chewing-1.0.8.20090424-Source.tar.gz
+ibus-chewing-1.0.8.20090428-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ibus-chewing.spec	24 Apr 2009 08:12:23 -0000	1.16
+++ ibus-chewing.spec	29 Apr 2009 03:31:54 -0000	1.17
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.8.20090424
+Version:    1.0.8.20090428
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -21,7 +21,6 @@ BuildRequires:  libX11-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
 Requires:  libchewing >= 0.3.2-4
-Requires:  GConf2
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -73,8 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Fri Apr 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090424-1
-Fix some bugs in cmake_modules/RPM.cmake
+* Wed Apr 29 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090428-1
+Fix the errors which Funda Wang as pointing out:
+ 1. Move src/chewing.xml.in to data/
+ 2. Fixed some typo in next_version targets.
+ 3. Remove GConf2 package requirement, while add gconftool-2 requirement.
 
 
 * Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	24 Apr 2009 08:12:23 -0000	1.9
+++ import.log	29 Apr 2009 03:31:54 -0000	1.10
@@ -7,3 +7,4 @@ ibus-chewing-1_0_5_20090330-1_fc10:HEAD:
 ibus-chewing-1_0_6_20090403-1_fc10:HEAD:ibus-chewing-1.0.6.20090403-1.fc10.src.rpm:1238737188
 ibus-chewing-1_0_7_20090414-1_fc10:HEAD:ibus-chewing-1.0.7.20090414-1.fc10.src.rpm:1239696303
 ibus-chewing-1_0_8_20090424-1_fc10:HEAD:ibus-chewing-1.0.8.20090424-1.fc10.src.rpm:1240560705
+ibus-chewing-1_0_8_20090428-1_fc10:HEAD:ibus-chewing-1.0.8.20090428-1.fc10.src.rpm:1240975132


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Apr 2009 08:12:23 -0000	1.14
+++ sources	29 Apr 2009 03:31:54 -0000	1.15
@@ -1 +1 @@
-8bf8753259e0e7ad2e91a9318d796c96  ibus-chewing-1.0.8.20090424-Source.tar.gz
+14580f77c0ef7d5d595de8c5b15c41ca  ibus-chewing-1.0.8.20090428-Source.tar.gz



From dchen at fedoraproject.org  Wed Apr 29 03:36:46 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 29 Apr 2009 03:36:46 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.14, 1.15 ibus-chewing.spec,
	1.16, 1.17 import.log, 1.9, 1.10 sources, 1.14, 1.15
Message-ID: <20090429033646.AD26970133@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3577/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Revision plain Zhuyin mode.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Apr 2009 08:13:44 -0000	1.14
+++ .cvsignore	29 Apr 2009 03:36:15 -0000	1.15
@@ -1 +1 @@
-ibus-chewing-1.0.8.20090424-Source.tar.gz
+ibus-chewing-1.0.8.20090428-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ibus-chewing.spec	24 Apr 2009 08:13:44 -0000	1.16
+++ ibus-chewing.spec	29 Apr 2009 03:36:15 -0000	1.17
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.8.20090424
+Version:    1.0.8.20090428
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -21,7 +21,6 @@ BuildRequires:  libX11-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
 Requires:  libchewing >= 0.3.2-4
-Requires:  GConf2
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -73,8 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Fri Apr 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090424-1
-Fix some bugs in cmake_modules/RPM.cmake
+* Wed Apr 29 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.8.20090428-1
+Fix the errors which Funda Wang as pointing out:
+ 1. Move src/chewing.xml.in to data/
+ 2. Fixed some typo in next_version targets.
+ 3. Remove GConf2 package requirement, while add gconftool-2 requirement.
 
 
 * Mon Mar 30 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.5.20090330-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	24 Apr 2009 08:13:44 -0000	1.9
+++ import.log	29 Apr 2009 03:36:16 -0000	1.10
@@ -7,3 +7,4 @@ ibus-chewing-1_0_5_20090330-1_fc10:HEAD:
 ibus-chewing-1_0_6_20090403-1_fc10:HEAD:ibus-chewing-1.0.6.20090403-1.fc10.src.rpm:1238737188
 ibus-chewing-1_0_7_20090414-1_fc10:HEAD:ibus-chewing-1.0.7.20090414-1.fc10.src.rpm:1239696303
 ibus-chewing-1_0_8_20090424-1_fc10:F-11:ibus-chewing-1.0.8.20090424-1.fc10.src.rpm:1240560774
+ibus-chewing-1_0_8_20090428-1_fc10:F-11:ibus-chewing-1.0.8.20090428-1.fc10.src.rpm:1240975945


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Apr 2009 08:13:44 -0000	1.14
+++ sources	29 Apr 2009 03:36:16 -0000	1.15
@@ -1 +1 @@
-8bf8753259e0e7ad2e91a9318d796c96  ibus-chewing-1.0.8.20090424-Source.tar.gz
+14580f77c0ef7d5d595de8c5b15c41ca  ibus-chewing-1.0.8.20090428-Source.tar.gz



From wolfy at fedoraproject.org  Wed Apr 29 04:35:55 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 04:35:55 +0000 (UTC)
Subject: rpms/jnettop/devel README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 jnettop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429043555.BB38470133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19482/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log jnettop.spec 
Log Message:
initial version



--- NEW FILE README.Fedora ---
jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.

More details are available in the bundled README file.


--- NEW FILE import.log ---
jnettop-0_13_0-4:HEAD:jnettop-0.13.0-4.src.rpm:1240979316


--- NEW FILE jnettop.spec ---
Summary: Network traffic tracker
Name: jnettop
Version: 0.13.0
Release: 4
Group: Applications/Internet
License: GPLv2+
Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
Source1: README.Fedora
URL: http://jnettop.kubs.info/wiki/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} == 4
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel 
%endif
BuildRequires: ncurses-devel glib2-devel db4-devel


%description
Nettop is visualising active network traffic as top does with processes.
It displays active network streams sorted by bandwidth used. This is
often usable when you want to get a fast grip of what is going on on your
outbound router.

%prep
%setup -q
find . -type d -name CVS |xargs rm -rf

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure 
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -p -m 644 %{SOURCE1} README.Fedora

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/jnettop
%{_mandir}/man8/jnettop.8.gz
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jnettop-lookup-nmb
%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora

%changelog
* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)

* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
- Add README.Fedora, referencing the bundled config file

* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
- add missing BRs, fix license tag

* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
- transition to release 0.13.0, see ChangeLog

* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
- transition to release 0.12.0, see ChangeLog
- added README.UIA

* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
- added jnettop-lookup-nmb

* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
- transition to release 0.11.0, see ChangeLog

* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
- transition to release 0.10.1, see ChangeLog

* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
- manual page is now part of RPM package
- transition to release 0.10, see ChangeLog

* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
- transition to release 0.9, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
- transition to release 0.8.1, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
- transition to release 0.8, see ChangeLog

* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
- transition to release 0.7, see ChangeLog

* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
- transition to release 0.6, see ChangeLog

* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
- transition to release 0.5, see ChangeLog

* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
- transition to release 0.4, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
- transition to release 0.3, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
- transition to release 0.2, see ChangeLog

* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:06:46 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:35:25 -0000	1.2
@@ -0,0 +1 @@
+jnettop-0.13.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:06:46 -0000	1.1
+++ sources	29 Apr 2009 04:35:25 -0000	1.2
@@ -0,0 +1 @@
+9529d75011026b3fcaf185b2fb063881  jnettop-0.13.0.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:39:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:39:06 +0000 (UTC)
Subject: rpms/perl-Config-INI/F-10 perl-Config-INI.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429043906.B37D570133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Config-INI/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23094/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Config-INI.spec 
Log Message:
initial import


--- NEW FILE perl-Config-INI.spec ---
Name:           perl-Config-INI
Version:        0.014
Release:        1%{?dist}
Summary:        Config::INI Perl module
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-INI/
Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Config-INI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Mixin::Linewise::Readers) >= 0.001
BuildRequires:  perl(Mixin::Linewise::Writers) >= 0.001
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Config::INI - simple .ini-file format.

%prep
%setup -q -n Config-INI-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README examples
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.014-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:08:34 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:38:36 -0000	1.2
@@ -0,0 +1 @@
+Config-INI-0.014.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:08:34 -0000	1.1
+++ sources	29 Apr 2009 04:38:36 -0000	1.2
@@ -0,0 +1 @@
+184be93729b019aba169a39fbe466531  Config-INI-0.014.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:39:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:39:06 +0000 (UTC)
Subject: rpms/perl-Config-INI/F-11 perl-Config-INI.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429043906.DFE2670133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Config-INI/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23094/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Config-INI.spec 
Log Message:
initial import


--- NEW FILE perl-Config-INI.spec ---
Name:           perl-Config-INI
Version:        0.014
Release:        1%{?dist}
Summary:        Config::INI Perl module
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-INI/
Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Config-INI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Mixin::Linewise::Readers) >= 0.001
BuildRequires:  perl(Mixin::Linewise::Writers) >= 0.001
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Config::INI - simple .ini-file format.

%prep
%setup -q -n Config-INI-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README examples
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.014-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:08:34 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:38:36 -0000	1.2
@@ -0,0 +1 @@
+Config-INI-0.014.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:08:34 -0000	1.1
+++ sources	29 Apr 2009 04:38:36 -0000	1.2
@@ -0,0 +1 @@
+184be93729b019aba169a39fbe466531  Config-INI-0.014.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:39:07 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:39:07 +0000 (UTC)
Subject: rpms/perl-Config-INI/devel perl-Config-INI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429043907.2C0FC70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Config-INI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23094/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Config-INI.spec 
Log Message:
initial import


--- NEW FILE perl-Config-INI.spec ---
Name:           perl-Config-INI
Version:        0.014
Release:        1%{?dist}
Summary:        Config::INI Perl module
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-INI/
Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Config-INI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Mixin::Linewise::Readers) >= 0.001
BuildRequires:  perl(Mixin::Linewise::Writers) >= 0.001
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Config::INI - simple .ini-file format.

%prep
%setup -q -n Config-INI-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README examples
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell 0.014-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:08:34 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:38:36 -0000	1.2
@@ -0,0 +1 @@
+Config-INI-0.014.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:08:34 -0000	1.1
+++ sources	29 Apr 2009 04:38:36 -0000	1.2
@@ -0,0 +1 @@
+184be93729b019aba169a39fbe466531  Config-INI-0.014.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:42:45 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:42:45 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc/F-10 perl-HTML-GenToc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044245.C431370133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-GenToc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24234/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-GenToc.spec 
Log Message:
initial import


--- NEW FILE perl-HTML-GenToc.spec ---
Name:           perl-HTML-GenToc
Version:        3.10
Release:        1%{?dist}
Summary:        Generate a Table of Contents for HTML documents
License:        GPLv2+
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-GenToc/
Source0:        http://www.cpan.org/authors/id/R/RU/RUBYKAT/HTML-GenToc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Getopt::ArgvFile) >= 1.09
BuildRequires:  perl(HTML::Entities)
BuildRequires:  perl(HTML::LinkList) >= 0.1501
BuildRequires:  perl(HTML::SimpleParse) >= 0.1
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Distribution)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
HTML::GenToc generates anchors and a table of contents for HTML documents.
Depending on the arguments, it will insert the information it generates, or
output to a string, a separate file or STDOUT.

%prep
%setup -q -n HTML-GenToc-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README TODO
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 26 2009 Iain Arnell 3.10-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:12:31 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:42:15 -0000	1.2
@@ -0,0 +1 @@
+HTML-GenToc-3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:12:31 -0000	1.1
+++ sources	29 Apr 2009 04:42:15 -0000	1.2
@@ -0,0 +1 @@
+3a212627b8ef2128c1e98e6b722cc915  HTML-GenToc-3.10.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:42:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:42:46 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc/devel perl-HTML-GenToc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044246.3675970133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-GenToc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24234/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-GenToc.spec 
Log Message:
initial import


--- NEW FILE perl-HTML-GenToc.spec ---
Name:           perl-HTML-GenToc
Version:        3.10
Release:        1%{?dist}
Summary:        Generate a Table of Contents for HTML documents
License:        GPLv2+
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-GenToc/
Source0:        http://www.cpan.org/authors/id/R/RU/RUBYKAT/HTML-GenToc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Getopt::ArgvFile) >= 1.09
BuildRequires:  perl(HTML::Entities)
BuildRequires:  perl(HTML::LinkList) >= 0.1501
BuildRequires:  perl(HTML::SimpleParse) >= 0.1
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Distribution)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
HTML::GenToc generates anchors and a table of contents for HTML documents.
Depending on the arguments, it will insert the information it generates, or
output to a string, a separate file or STDOUT.

%prep
%setup -q -n HTML-GenToc-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README TODO
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 26 2009 Iain Arnell 3.10-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:12:31 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:42:15 -0000	1.2
@@ -0,0 +1 @@
+HTML-GenToc-3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:12:31 -0000	1.1
+++ sources	29 Apr 2009 04:42:15 -0000	1.2
@@ -0,0 +1 @@
+3a212627b8ef2128c1e98e6b722cc915  HTML-GenToc-3.10.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:42:45 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:42:45 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc/F-11 perl-HTML-GenToc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044245.E34D070136@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-GenToc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24234/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-GenToc.spec 
Log Message:
initial import


--- NEW FILE perl-HTML-GenToc.spec ---
Name:           perl-HTML-GenToc
Version:        3.10
Release:        1%{?dist}
Summary:        Generate a Table of Contents for HTML documents
License:        GPLv2+
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-GenToc/
Source0:        http://www.cpan.org/authors/id/R/RU/RUBYKAT/HTML-GenToc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Getopt::ArgvFile) >= 1.09
BuildRequires:  perl(HTML::Entities)
BuildRequires:  perl(HTML::LinkList) >= 0.1501
BuildRequires:  perl(HTML::SimpleParse) >= 0.1
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Distribution)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
HTML::GenToc generates anchors and a table of contents for HTML documents.
Depending on the arguments, it will insert the information it generates, or
output to a string, a separate file or STDOUT.

%prep
%setup -q -n HTML-GenToc-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README TODO
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 26 2009 Iain Arnell 3.10-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:12:31 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:42:15 -0000	1.2
@@ -0,0 +1 @@
+HTML-GenToc-3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:12:31 -0000	1.1
+++ sources	29 Apr 2009 04:42:15 -0000	1.2
@@ -0,0 +1 @@
+3a212627b8ef2128c1e98e6b722cc915  HTML-GenToc-3.10.tar.gz



From wolfy at fedoraproject.org  Wed Apr 29 04:47:10 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 04:47:10 +0000 (UTC)
Subject: rpms/jnettop/F-11 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 jnettop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044710.3D27A70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25859/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log jnettop.spec 
Log Message:
initial version


--- NEW FILE README.Fedora ---
jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.

More details are available in the bundled README file.


--- NEW FILE import.log ---
jnettop-0_13_0-4:F-11:jnettop-0.13.0-4.src.rpm:1240980181


--- NEW FILE jnettop.spec ---
Summary: Network traffic tracker
Name: jnettop
Version: 0.13.0
Release: 4
Group: Applications/Internet
License: GPLv2+
Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
Source1: README.Fedora
URL: http://jnettop.kubs.info/wiki/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} == 4
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel 
%endif
BuildRequires: ncurses-devel glib2-devel db4-devel


%description
Nettop is visualising active network traffic as top does with processes.
It displays active network streams sorted by bandwidth used. This is
often usable when you want to get a fast grip of what is going on on your
outbound router.

%prep
%setup -q
find . -type d -name CVS |xargs rm -rf

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure 
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -p -m 644 %{SOURCE1} README.Fedora

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/jnettop
%{_mandir}/man8/jnettop.8.gz
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jnettop-lookup-nmb
%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora

%changelog
* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)

* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
- Add README.Fedora, referencing the bundled config file

* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
- add missing BRs, fix license tag

* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
- transition to release 0.13.0, see ChangeLog

* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
- transition to release 0.12.0, see ChangeLog
- added README.UIA

* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
- added jnettop-lookup-nmb

* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
- transition to release 0.11.0, see ChangeLog

* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
- transition to release 0.10.1, see ChangeLog

* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
- manual page is now part of RPM package
- transition to release 0.10, see ChangeLog

* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
- transition to release 0.9, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
- transition to release 0.8.1, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
- transition to release 0.8, see ChangeLog

* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
- transition to release 0.7, see ChangeLog

* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
- transition to release 0.6, see ChangeLog

* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
- transition to release 0.5, see ChangeLog

* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
- transition to release 0.4, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
- transition to release 0.3, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
- transition to release 0.2, see ChangeLog

* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:06:46 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:47:09 -0000	1.2
@@ -0,0 +1 @@
+jnettop-0.13.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:06:46 -0000	1.1
+++ sources	29 Apr 2009 04:47:09 -0000	1.2
@@ -0,0 +1 @@
+9529d75011026b3fcaf185b2fb063881  jnettop-0.13.0.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:47:45 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:47:45 +0000 (UTC)
Subject: rpms/perl-String-Diff/F-10 perl-String-Diff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044745.4F46A70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-String-Diff/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25786/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-String-Diff.spec 
Log Message:
initial import


--- NEW FILE perl-String-Diff.spec ---
Name:           perl-String-Diff
Version:        0.04
Release:        2%{?dist}
Summary:        Simple diff to String
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/String-Diff/
Source0:        http://www.cpan.org/authors/id/Y/YA/YAPPO/String-Diff-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Algorithm::Diff)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(YAML)
# required, but not automatically detected
Requires:       perl(Algorithm::Diff)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
String::Diff is the difference of a consecutive string is made. after
general diff is done, the difference in the line is searchable.

%prep
%setup -q -n String-Diff-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell <iarnell at gmail.com> 0.04-2
- explain explicit requires

* Tue Apr 28 2009 Iain Arnell 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:21:17 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:47:14 -0000	1.2
@@ -0,0 +1 @@
+String-Diff-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:21:17 -0000	1.1
+++ sources	29 Apr 2009 04:47:14 -0000	1.2
@@ -0,0 +1 @@
+440bd85674f8602f18a2ab7978f1fa53  String-Diff-0.04.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:47:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:47:46 +0000 (UTC)
Subject: rpms/perl-String-Diff/F-11 perl-String-Diff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044746.4C38E70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-String-Diff/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25786/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-String-Diff.spec 
Log Message:
initial import


--- NEW FILE perl-String-Diff.spec ---
Name:           perl-String-Diff
Version:        0.04
Release:        2%{?dist}
Summary:        Simple diff to String
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/String-Diff/
Source0:        http://www.cpan.org/authors/id/Y/YA/YAPPO/String-Diff-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Algorithm::Diff)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(YAML)
# required, but not automatically detected
Requires:       perl(Algorithm::Diff)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
String::Diff is the difference of a consecutive string is made. after
general diff is done, the difference in the line is searchable.

%prep
%setup -q -n String-Diff-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell <iarnell at gmail.com> 0.04-2
- explain explicit requires

* Tue Apr 28 2009 Iain Arnell 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:21:17 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:47:15 -0000	1.2
@@ -0,0 +1 @@
+String-Diff-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:21:17 -0000	1.1
+++ sources	29 Apr 2009 04:47:15 -0000	1.2
@@ -0,0 +1 @@
+440bd85674f8602f18a2ab7978f1fa53  String-Diff-0.04.tar.gz



From iarnell at fedoraproject.org  Wed Apr 29 04:47:47 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed, 29 Apr 2009 04:47:47 +0000 (UTC)
Subject: rpms/perl-String-Diff/devel perl-String-Diff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429044747.0691570133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-String-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-String-Diff.spec 
Log Message:
initial import


--- NEW FILE perl-String-Diff.spec ---
Name:           perl-String-Diff
Version:        0.04
Release:        2%{?dist}
Summary:        Simple diff to String
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/String-Diff/
Source0:        http://www.cpan.org/authors/id/Y/YA/YAPPO/String-Diff-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Algorithm::Diff)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(YAML)
# required, but not automatically detected
Requires:       perl(Algorithm::Diff)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
String::Diff is the difference of a consecutive string is made. after
general diff is done, the difference in the line is searchable.

%prep
%setup -q -n String-Diff-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell <iarnell at gmail.com> 0.04-2
- explain explicit requires

* Tue Apr 28 2009 Iain Arnell 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:21:17 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:47:16 -0000	1.2
@@ -0,0 +1 @@
+String-Diff-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:21:17 -0000	1.1
+++ sources	29 Apr 2009 04:47:16 -0000	1.2
@@ -0,0 +1 @@
+440bd85674f8602f18a2ab7978f1fa53  String-Diff-0.04.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 04:54:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 04:54:23 +0000 (UTC)
Subject: rpms/shortrpm/F-11 shortrpm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429045423.5785E70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	shortrpm.spec 
Log Message:
Initial import of shortrpm


--- NEW FILE shortrpm.spec ---
Name:           shortrpm
Version:        1.0
Release:        1%{?dist}
Summary:        Short-circuit binary RPM package build

Group:          Development/Tools
License:        GPLv2+
URL:            http://v3.sk/~lkundrak/shortrpm
Source0:        http://v3.sk/~lkundrak/shortrpm/shortrpm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       rpm-build

%description
shortrpm tricks rpmbuild(1) into thinking certain scriptlets in SPEC file
are empty, effectively skipping their run and proceeding to build the binary
package from files from previous %%install scriptlet run in BuildRoot. The
trickery only takes place if both -bb and --short-circuit options are
specified.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="%{optflags}" PREFIX="%{_prefix}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}"
install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 0644 shortrpm.sh shortrpm.csh \
        $RPM_BUILD_ROOT%{_sysconfdir}/profile.d


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/shortrpm
%{_libexecdir}/shortrpm
%{_mandir}/man1/shortrpm.1.gz
%config(noreplace) %{_sysconfdir}/profile.d/*
%doc COPYING


%changelog
* Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:17:01 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:53:53 -0000	1.2
@@ -0,0 +1 @@
+shortrpm-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:17:02 -0000	1.1
+++ sources	29 Apr 2009 04:53:53 -0000	1.2
@@ -0,0 +1 @@
+5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 04:54:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 04:54:23 +0000 (UTC)
Subject: rpms/shortrpm/F-10 shortrpm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429045423.342D870136@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	shortrpm.spec 
Log Message:
Initial import of shortrpm


--- NEW FILE shortrpm.spec ---
Name:           shortrpm
Version:        1.0
Release:        1%{?dist}
Summary:        Short-circuit binary RPM package build

Group:          Development/Tools
License:        GPLv2+
URL:            http://v3.sk/~lkundrak/shortrpm
Source0:        http://v3.sk/~lkundrak/shortrpm/shortrpm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       rpm-build

%description
shortrpm tricks rpmbuild(1) into thinking certain scriptlets in SPEC file
are empty, effectively skipping their run and proceeding to build the binary
package from files from previous %%install scriptlet run in BuildRoot. The
trickery only takes place if both -bb and --short-circuit options are
specified.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="%{optflags}" PREFIX="%{_prefix}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}"
install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 0644 shortrpm.sh shortrpm.csh \
        $RPM_BUILD_ROOT%{_sysconfdir}/profile.d


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/shortrpm
%{_libexecdir}/shortrpm
%{_mandir}/man1/shortrpm.1.gz
%config(noreplace) %{_sysconfdir}/profile.d/*
%doc COPYING


%changelog
* Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:17:01 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:53:52 -0000	1.2
@@ -0,0 +1 @@
+shortrpm-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:17:02 -0000	1.1
+++ sources	29 Apr 2009 04:53:52 -0000	1.2
@@ -0,0 +1 @@
+5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 04:54:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 04:54:23 +0000 (UTC)
Subject: rpms/shortrpm/EL-5 shortrpm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429045423.0D5F570133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	shortrpm.spec 
Log Message:
Initial import of shortrpm


--- NEW FILE shortrpm.spec ---
Name:           shortrpm
Version:        1.0
Release:        1%{?dist}
Summary:        Short-circuit binary RPM package build

Group:          Development/Tools
License:        GPLv2+
URL:            http://v3.sk/~lkundrak/shortrpm
Source0:        http://v3.sk/~lkundrak/shortrpm/shortrpm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       rpm-build

%description
shortrpm tricks rpmbuild(1) into thinking certain scriptlets in SPEC file
are empty, effectively skipping their run and proceeding to build the binary
package from files from previous %%install scriptlet run in BuildRoot. The
trickery only takes place if both -bb and --short-circuit options are
specified.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="%{optflags}" PREFIX="%{_prefix}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}"
install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 0644 shortrpm.sh shortrpm.csh \
        $RPM_BUILD_ROOT%{_sysconfdir}/profile.d


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/shortrpm
%{_libexecdir}/shortrpm
%{_mandir}/man1/shortrpm.1.gz
%config(noreplace) %{_sysconfdir}/profile.d/*
%doc COPYING


%changelog
* Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:17:01 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:53:52 -0000	1.2
@@ -0,0 +1 @@
+shortrpm-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:17:02 -0000	1.1
+++ sources	29 Apr 2009 04:53:52 -0000	1.2
@@ -0,0 +1 @@
+5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 04:54:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 04:54:23 +0000 (UTC)
Subject: rpms/shortrpm/devel shortrpm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429045423.9FCAC70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313/devel

Modified Files:
	.cvsignore sources 
Added Files:
	shortrpm.spec 
Log Message:
Initial import of shortrpm


--- NEW FILE shortrpm.spec ---
Name:           shortrpm
Version:        1.0
Release:        1%{?dist}
Summary:        Short-circuit binary RPM package build

Group:          Development/Tools
License:        GPLv2+
URL:            http://v3.sk/~lkundrak/shortrpm
Source0:        http://v3.sk/~lkundrak/shortrpm/shortrpm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       rpm-build

%description
shortrpm tricks rpmbuild(1) into thinking certain scriptlets in SPEC file
are empty, effectively skipping their run and proceeding to build the binary
package from files from previous %%install scriptlet run in BuildRoot. The
trickery only takes place if both -bb and --short-circuit options are
specified.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="%{optflags}" PREFIX="%{_prefix}"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}"
install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 0644 shortrpm.sh shortrpm.csh \
        $RPM_BUILD_ROOT%{_sysconfdir}/profile.d


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/shortrpm
%{_libexecdir}/shortrpm
%{_mandir}/man1/shortrpm.1.gz
%config(noreplace) %{_sysconfdir}/profile.d/*
%doc COPYING


%changelog
* Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:17:01 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:53:53 -0000	1.2
@@ -0,0 +1 @@
+shortrpm-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:17:02 -0000	1.1
+++ sources	29 Apr 2009 04:53:53 -0000	1.2
@@ -0,0 +1 @@
+5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 04:55:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 04:55:00 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird.spec,1.22,1.23
Message-ID: <20090429045500.0FAFB70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28547/devel

Modified Files:
	sunbird.spec 
Log Message:
Fix permission fix


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sunbird.spec	28 Apr 2009 22:13:59 -0000	1.22
+++ sunbird.spec	29 Apr 2009 04:54:59 -0000	1.23
@@ -97,7 +97,7 @@ calendaring tasks.
 %patch22 -p1 -b .shared-error
 %patch24 -p1 -b .pango-fix
 
-find $RPM_BUILD_ROOT -name '*.cpp' -o -name '*.h' -print0 |
+find . -name '*.cpp' -o -name '*.h' -print0 |
         xargs -0 chmod -x
 
 



From lkundrak at fedoraproject.org  Wed Apr 29 04:55:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 04:55:29 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.22,1.23
Message-ID: <20090429045529.1EB1670133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28547/F-11

Modified Files:
	sunbird.spec 
Log Message:
Fix permission fix


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sunbird.spec	28 Apr 2009 22:13:59 -0000	1.22
+++ sunbird.spec	29 Apr 2009 04:54:57 -0000	1.23
@@ -97,7 +97,7 @@ calendaring tasks.
 %patch22 -p1 -b .shared-error
 %patch24 -p1 -b .pango-fix
 
-find $RPM_BUILD_ROOT -name '*.cpp' -o -name '*.h' -print0 |
+find . -name '*.cpp' -o -name '*.h' -print0 |
         xargs -0 chmod -x
 
 



From wolfy at fedoraproject.org  Wed Apr 29 04:56:26 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 04:56:26 +0000 (UTC)
Subject: rpms/jnettop/EL-4 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 jnettop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429045626.4A07570133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29355/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log jnettop.spec 
Log Message:
initial version


--- NEW FILE README.Fedora ---
jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.

More details are available in the bundled README file.


--- NEW FILE import.log ---
jnettop-0_13_0-4:EL-4:jnettop-0.13.0-4.src.rpm:1240980751


--- NEW FILE jnettop.spec ---
Summary: Network traffic tracker
Name: jnettop
Version: 0.13.0
Release: 4
Group: Applications/Internet
License: GPLv2+
Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
Source1: README.Fedora
URL: http://jnettop.kubs.info/wiki/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} == 4
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel 
%endif
BuildRequires: ncurses-devel glib2-devel db4-devel


%description
Nettop is visualising active network traffic as top does with processes.
It displays active network streams sorted by bandwidth used. This is
often usable when you want to get a fast grip of what is going on on your
outbound router.

%prep
%setup -q
find . -type d -name CVS |xargs rm -rf

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure 
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -p -m 644 %{SOURCE1} README.Fedora

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/jnettop
%{_mandir}/man8/jnettop.8.gz
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jnettop-lookup-nmb
%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora

%changelog
* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)

* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
- Add README.Fedora, referencing the bundled config file

* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
- add missing BRs, fix license tag

* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
- transition to release 0.13.0, see ChangeLog

* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
- transition to release 0.12.0, see ChangeLog
- added README.UIA

* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
- added jnettop-lookup-nmb

* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
- transition to release 0.11.0, see ChangeLog

* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
- transition to release 0.10.1, see ChangeLog

* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
- manual page is now part of RPM package
- transition to release 0.10, see ChangeLog

* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
- transition to release 0.9, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
- transition to release 0.8.1, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
- transition to release 0.8, see ChangeLog

* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
- transition to release 0.7, see ChangeLog

* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
- transition to release 0.6, see ChangeLog

* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
- transition to release 0.5, see ChangeLog

* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
- transition to release 0.4, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
- transition to release 0.3, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
- transition to release 0.2, see ChangeLog

* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:06:46 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:55:55 -0000	1.2
@@ -0,0 +1 @@
+jnettop-0.13.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:06:46 -0000	1.1
+++ sources	29 Apr 2009 04:55:55 -0000	1.2
@@ -0,0 +1 @@
+9529d75011026b3fcaf185b2fb063881  jnettop-0.13.0.tar.gz



From wolfy at fedoraproject.org  Wed Apr 29 04:58:34 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 04:58:34 +0000 (UTC)
Subject: rpms/jnettop/EL-5 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 jnettop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429045835.054E870133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30283/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log jnettop.spec 
Log Message:
initial version


--- NEW FILE README.Fedora ---
jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.

More details are available in the bundled README file.


--- NEW FILE import.log ---
jnettop-0_13_0-4:EL-5:jnettop-0.13.0-4.src.rpm:1240981045


--- NEW FILE jnettop.spec ---
Summary: Network traffic tracker
Name: jnettop
Version: 0.13.0
Release: 4
Group: Applications/Internet
License: GPLv2+
Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
Source1: README.Fedora
URL: http://jnettop.kubs.info/wiki/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} == 4
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel 
%endif
BuildRequires: ncurses-devel glib2-devel db4-devel


%description
Nettop is visualising active network traffic as top does with processes.
It displays active network streams sorted by bandwidth used. This is
often usable when you want to get a fast grip of what is going on on your
outbound router.

%prep
%setup -q
find . -type d -name CVS |xargs rm -rf

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure 
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -p -m 644 %{SOURCE1} README.Fedora

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/jnettop
%{_mandir}/man8/jnettop.8.gz
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jnettop-lookup-nmb
%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora

%changelog
* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)

* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
- Add README.Fedora, referencing the bundled config file

* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
- add missing BRs, fix license tag

* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
- transition to release 0.13.0, see ChangeLog

* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
- transition to release 0.12.0, see ChangeLog
- added README.UIA

* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
- added jnettop-lookup-nmb

* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
- transition to release 0.11.0, see ChangeLog

* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
- transition to release 0.10.1, see ChangeLog

* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
- manual page is now part of RPM package
- transition to release 0.10, see ChangeLog

* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
- transition to release 0.9, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
- transition to release 0.8.1, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
- transition to release 0.8, see ChangeLog

* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
- transition to release 0.7, see ChangeLog

* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
- transition to release 0.6, see ChangeLog

* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
- transition to release 0.5, see ChangeLog

* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
- transition to release 0.4, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
- transition to release 0.3, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
- transition to release 0.2, see ChangeLog

* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:06:46 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:58:04 -0000	1.2
@@ -0,0 +1 @@
+jnettop-0.13.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:06:46 -0000	1.1
+++ sources	29 Apr 2009 04:58:04 -0000	1.2
@@ -0,0 +1 @@
+9529d75011026b3fcaf185b2fb063881  jnettop-0.13.0.tar.gz



From wolfy at fedoraproject.org  Wed Apr 29 05:00:12 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:00:12 +0000 (UTC)
Subject: rpms/jnettop/F-9 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 jnettop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429050012.5E71C70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30969/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log jnettop.spec 
Log Message:
initial version


--- NEW FILE README.Fedora ---
jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.

More details are available in the bundled README file.


--- NEW FILE import.log ---
jnettop-0_13_0-4:F-9:jnettop-0.13.0-4.src.rpm:1240981174


--- NEW FILE jnettop.spec ---
Summary: Network traffic tracker
Name: jnettop
Version: 0.13.0
Release: 4
Group: Applications/Internet
License: GPLv2+
Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
Source1: README.Fedora
URL: http://jnettop.kubs.info/wiki/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} == 4
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel 
%endif
BuildRequires: ncurses-devel glib2-devel db4-devel


%description
Nettop is visualising active network traffic as top does with processes.
It displays active network streams sorted by bandwidth used. This is
often usable when you want to get a fast grip of what is going on on your
outbound router.

%prep
%setup -q
find . -type d -name CVS |xargs rm -rf

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure 
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -p -m 644 %{SOURCE1} README.Fedora

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/jnettop
%{_mandir}/man8/jnettop.8.gz
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jnettop-lookup-nmb
%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora

%changelog
* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)

* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
- Add README.Fedora, referencing the bundled config file

* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
- add missing BRs, fix license tag

* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
- transition to release 0.13.0, see ChangeLog

* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
- transition to release 0.12.0, see ChangeLog
- added README.UIA

* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
- added jnettop-lookup-nmb

* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
- transition to release 0.11.0, see ChangeLog

* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
- transition to release 0.10.1, see ChangeLog

* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
- manual page is now part of RPM package
- transition to release 0.10, see ChangeLog

* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
- transition to release 0.9, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
- transition to release 0.8.1, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
- transition to release 0.8, see ChangeLog

* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
- transition to release 0.7, see ChangeLog

* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
- transition to release 0.6, see ChangeLog

* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
- transition to release 0.5, see ChangeLog

* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
- transition to release 0.4, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
- transition to release 0.3, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
- transition to release 0.2, see ChangeLog

* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:06:46 -0000	1.1
+++ .cvsignore	29 Apr 2009 04:59:42 -0000	1.2
@@ -0,0 +1 @@
+jnettop-0.13.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:06:46 -0000	1.1
+++ sources	29 Apr 2009 04:59:42 -0000	1.2
@@ -0,0 +1 @@
+9529d75011026b3fcaf185b2fb063881  jnettop-0.13.0.tar.gz



From wolfy at fedoraproject.org  Wed Apr 29 05:01:41 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:01:41 +0000 (UTC)
Subject: rpms/jnettop/F-10 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 jnettop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429050141.8C49170133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31577/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log jnettop.spec 
Log Message:
initial version


--- NEW FILE README.Fedora ---
jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.

More details are available in the bundled README file.


--- NEW FILE import.log ---
jnettop-0_13_0-4:F-10:jnettop-0.13.0-4.src.rpm:1240981271


--- NEW FILE jnettop.spec ---
Summary: Network traffic tracker
Name: jnettop
Version: 0.13.0
Release: 4
Group: Applications/Internet
License: GPLv2+
Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
Source1: README.Fedora
URL: http://jnettop.kubs.info/wiki/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} == 4
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel 
%endif
BuildRequires: ncurses-devel glib2-devel db4-devel


%description
Nettop is visualising active network traffic as top does with processes.
It displays active network streams sorted by bandwidth used. This is
often usable when you want to get a fast grip of what is going on on your
outbound router.

%prep
%setup -q
find . -type d -name CVS |xargs rm -rf

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure 
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -p -m 644 %{SOURCE1} README.Fedora

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/jnettop
%{_mandir}/man8/jnettop.8.gz
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jnettop-lookup-nmb
%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora

%changelog
* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)

* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
- Add README.Fedora, referencing the bundled config file

* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
- add missing BRs, fix license tag

* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
- transition to release 0.13.0, see ChangeLog

* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
- transition to release 0.12.0, see ChangeLog
- added README.UIA

* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
- added jnettop-lookup-nmb

* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
- transition to release 0.11.0, see ChangeLog

* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
- transition to release 0.10.1, see ChangeLog

* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
- manual page is now part of RPM package
- transition to release 0.10, see ChangeLog

* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
- transition to release 0.9, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
- transition to release 0.8.1, see ChangeLog

* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
- transition to release 0.8, see ChangeLog

* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
- transition to release 0.7, see ChangeLog

* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
- transition to release 0.6, see ChangeLog

* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
- transition to release 0.5, see ChangeLog

* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
- transition to release 0.4, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
- transition to release 0.3, see ChangeLog

* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
- transition to release 0.2, see ChangeLog

* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:06:46 -0000	1.1
+++ .cvsignore	29 Apr 2009 05:01:11 -0000	1.2
@@ -0,0 +1 @@
+jnettop-0.13.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:06:46 -0000	1.1
+++ sources	29 Apr 2009 05:01:11 -0000	1.2
@@ -0,0 +1 @@
+9529d75011026b3fcaf185b2fb063881  jnettop-0.13.0.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 05:12:22 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 05:12:22 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.23,1.24
Message-ID: <20090429051222.B9C3770133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2672

Modified Files:
	sunbird.spec 
Log Message:
Add BRs


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sunbird.spec	29 Apr 2009 04:54:57 -0000	1.23
+++ sunbird.spec	29 Apr 2009 05:11:52 -0000	1.24
@@ -50,6 +50,7 @@ BuildRequires:  nss-devel
 BuildRequires:  nspr-devel
 BuildRequires:  libical-devel
 BuildRequires:  zip
+BuildRequires:  autoconf automake
 
 Requires(post):  desktop-file-utils
 Requires(postun): desktop-file-utils



From wolfy at fedoraproject.org  Wed Apr 29 05:32:02 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:32:02 +0000 (UTC)
Subject: rpms/jnettop/EL-4 README.Fedora,1.1,NONE jnettop.spec,1.1,NONE
Message-ID: <20090429053202.D284D70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9212

Removed Files:
	README.Fedora jnettop.spec 
Log Message:



--- README.Fedora DELETED ---


--- jnettop.spec DELETED ---



From wolfy at fedoraproject.org  Wed Apr 29 05:33:54 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:33:54 +0000 (UTC)
Subject: rpms/jnettop/EL-4 README.Fedora,1.2,1.3 jnettop.spec,1.2,1.3
Message-ID: <20090429053354.5C89270133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9793

Added Files:
	README.Fedora jnettop.spec 
Log Message:



Index: README.Fedora
===================================================================
RCS file: README.Fedora
diff -N README.Fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README.Fedora	29 Apr 2009 05:33:23 -0000	1.3
@@ -0,0 +1,3 @@
+jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.
+
+More details are available in the bundled README file.


Index: jnettop.spec
===================================================================
RCS file: jnettop.spec
diff -N jnettop.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jnettop.spec	29 Apr 2009 05:33:23 -0000	1.3
@@ -0,0 +1,110 @@
+Summary: Network traffic tracker
+Name: jnettop
+Version: 0.13.0
+Release: 4
+Group: Applications/Internet
+License: GPLv2+
+Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
+Source1: README.Fedora
+URL: http://jnettop.kubs.info/wiki/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} == 4
+BuildRequires: libpcap
+%else
+BuildRequires: libpcap-devel 
+%endif
+BuildRequires: ncurses-devel glib2-devel db4-devel
+
+
+%description
+Nettop is visualising active network traffic as top does with processes.
+It displays active network streams sorted by bandwidth used. This is
+often usable when you want to get a fast grip of what is going on on your
+outbound router.
+
+%prep
+%setup -q
+find . -type d -name CVS |xargs rm -rf
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure 
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+install -p -m 644 %{SOURCE1} README.Fedora
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/jnettop
+%{_mandir}/man8/jnettop.8.gz
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/jnettop-lookup-nmb
+%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
+
+%changelog
+* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
+- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
+
+* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
+- Add README.Fedora, referencing the bundled config file
+
+* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
+- add missing BRs, fix license tag
+
+* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
+- transition to release 0.13.0, see ChangeLog
+
+* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
+- transition to release 0.12.0, see ChangeLog
+- added README.UIA
+
+* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
+- added jnettop-lookup-nmb
+
+* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
+- transition to release 0.11.0, see ChangeLog
+
+* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
+- transition to release 0.10.1, see ChangeLog
+
+* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
+- manual page is now part of RPM package
+- transition to release 0.10, see ChangeLog
+
+* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
+- transition to release 0.9, see ChangeLog
+
+* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
+- transition to release 0.8.1, see ChangeLog
+
+* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
+- transition to release 0.8, see ChangeLog
+
+* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
+- transition to release 0.7, see ChangeLog
+
+* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
+- transition to release 0.6, see ChangeLog
+
+* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
+- transition to release 0.5, see ChangeLog
+
+* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
+- transition to release 0.4, see ChangeLog
+
+* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
+- transition to release 0.3, see ChangeLog
+
+* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
+- transition to release 0.2, see ChangeLog
+
+* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
+- initial release
+



From wolfy at fedoraproject.org  Wed Apr 29 05:43:01 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:43:01 +0000 (UTC)
Subject: rpms/jnettop/devel README.Fedora,1.1,1.2 jnettop.spec,1.1,1.2
Message-ID: <20090429054301.987FC70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13639

Modified Files:
	README.Fedora jnettop.spec 
Log Message:
Use disttag



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/devel/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.Fedora	29 Apr 2009 04:35:25 -0000	1.1
+++ README.Fedora	29 Apr 2009 05:42:30 -0000	1.2
@@ -1,3 +1,110 @@
-jnettop can use a configuration file named .jnettop, which is looked for in the home directory of the user running the application. A sample configuration file is provided under the name ".jnettop" in the documentation directory.
+Summary: Network traffic tracker
+Name: jnettop
+Version: 0.13.0
+Release: 4
+Group: Applications/Internet
+License: GPLv2+
+Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
+Source1: README.Fedora
+URL: http://jnettop.kubs.info/wiki/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} == 4
+BuildRequires: libpcap
+%else
+BuildRequires: libpcap-devel 
+%endif
+BuildRequires: ncurses-devel glib2-devel db4-devel
+
+
+%description
+Nettop is visualising active network traffic as top does with processes.
+It displays active network streams sorted by bandwidth used. This is
+often usable when you want to get a fast grip of what is going on on your
+outbound router.
+
+%prep
+%setup -q
+find . -type d -name CVS |xargs rm -rf
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure 
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+install -p -m 644 %{SOURCE1} README.Fedora
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/jnettop
+%{_mandir}/man8/jnettop.8.gz
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/jnettop-lookup-nmb
+%doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
+
+%changelog
+* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
+- Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
+
+* Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-3
+- Add README.Fedora, referencing the bundled config file
+
+* Wed Mar 18 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-2
+- add missing BRs, fix license tag
+
+* Fri Apr 29 2006 Jakub Skopal <j at kubs.cz> 0.13.0-1
+- transition to release 0.13.0, see ChangeLog
+
+* Fri Mar 31 2006 Jakub Skopal <j at kubs.cz> 0.12.0-1
+- transition to release 0.12.0, see ChangeLog
+- added README.UIA
+
+* Thu Jul 1 2005 Jakub Skopal <j at kubs.cz> 0.11.0-2
+- added jnettop-lookup-nmb
+
+* Thu Jun 30 2005 Jakub Skopal <j at kubs.cz> 0.11.0-1
+- transition to release 0.11.0, see ChangeLog
+
+* Sat Oct 2 2004 Jakub Skopal <j at kubs.cz> 0.10.1-1
+- transition to release 0.10.1, see ChangeLog
+
+* Wed Sep 29 2004 Jakub Skopal <j at kubs.cz> 0.10-1
+- manual page is now part of RPM package
+- transition to release 0.10, see ChangeLog
+
+* Wed Jul 30 2003 Jakub Skopal <j at kubs.cz> 0.9-1
+- transition to release 0.9, see ChangeLog
+
+* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8.1-1
+- transition to release 0.8.1, see ChangeLog
+
+* Wed Apr 23 2003 Jakub Skopal <j at kubs.cz> 0.8-1
+- transition to release 0.8, see ChangeLog
+
+* Tue Oct 16 2002 Jakub Skopal <j at kubs.cz> 0.7-1
+- transition to release 0.7, see ChangeLog
+
+* Tue Oct 13 2002 Jakub Skopal <j at kubs.cz> 0.6-1
+- transition to release 0.6, see ChangeLog
+
+* Tue Sep 03 2002 Jakub Skopal <j at kubs.cz> 0.5-1
+- transition to release 0.5, see ChangeLog
+
+* Mon Sep 02 2002 Jakub Skopal <j at kubs.cz> 0.4-1
+- transition to release 0.4, see ChangeLog
+
+* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.3-1
+- transition to release 0.3, see ChangeLog
+
+* Thu Aug 27 2002 Jakub Skopal <j at kubs.cz> 0.2-1
+- transition to release 0.2, see ChangeLog
+
+* Thu Aug 22 2002 Jakub Skopal <j at kubs.cz> 0.1-1
+- initial release
 
-More details are available in the bundled README file.


Index: jnettop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/devel/jnettop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jnettop.spec	29 Apr 2009 04:35:25 -0000	1.1
+++ jnettop.spec	29 Apr 2009 05:42:30 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Network traffic tracker
 Name: jnettop
 Version: 0.13.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
 
 %changelog
+* Wed Apr 29 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-5
+- Use disttag in release field
+
 * Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
 - Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
 



From wolfy at fedoraproject.org  Wed Apr 29 05:48:04 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:48:04 +0000 (UTC)
Subject: rpms/jnettop/EL-4 jnettop.spec,1.3,1.4
Message-ID: <20090429054804.58B1F70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15054

Modified Files:
	jnettop.spec 
Log Message:
Use %dist



Index: jnettop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/EL-4/jnettop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jnettop.spec	29 Apr 2009 05:33:23 -0000	1.3
+++ jnettop.spec	29 Apr 2009 05:47:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Network traffic tracker
 Name: jnettop
 Version: 0.13.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
 
 %changelog
+* Wed Apr 29 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-5
+- Use disttag in release field
+
 * Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
 - Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
 



From lkundrak at fedoraproject.org  Wed Apr 29 05:48:43 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 05:48:43 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.24,1.25
Message-ID: <20090429054843.D771570133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15234

Modified Files:
	sunbird.spec 
Log Message:
Add BRs


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sunbird.spec	29 Apr 2009 05:11:52 -0000	1.24
+++ sunbird.spec	29 Apr 2009 05:48:13 -0000	1.25
@@ -50,7 +50,7 @@ BuildRequires:  nss-devel
 BuildRequires:  nspr-devel
 BuildRequires:  libical-devel
 BuildRequires:  zip
-BuildRequires:  autoconf automake
+BuildRequires:  autoconf213
 
 Requires(post):  desktop-file-utils
 Requires(postun): desktop-file-utils



From wolfy at fedoraproject.org  Wed Apr 29 05:51:24 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:51:24 +0000 (UTC)
Subject: rpms/jnettop/EL-5 jnettop.spec,1.1,1.2
Message-ID: <20090429055124.9F17070133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15978

Modified Files:
	jnettop.spec 
Log Message:
use disttag



Index: jnettop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/EL-5/jnettop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jnettop.spec	29 Apr 2009 04:58:04 -0000	1.1
+++ jnettop.spec	29 Apr 2009 05:50:53 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Network traffic tracker
 Name: jnettop
 Version: 0.13.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
 
 %changelog
+* Wed Apr 29 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-5
+- Use disttag in release field
+
 * Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
 - Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
 



From wolfy at fedoraproject.org  Wed Apr 29 05:54:03 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:54:03 +0000 (UTC)
Subject: rpms/jnettop/F-9 jnettop.spec,1.1,1.2
Message-ID: <20090429055403.C79AF70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16903

Modified Files:
	jnettop.spec 
Log Message:
Use disttag



Index: jnettop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-9/jnettop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jnettop.spec	29 Apr 2009 04:59:42 -0000	1.1
+++ jnettop.spec	29 Apr 2009 05:53:33 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Network traffic tracker
 Name: jnettop
 Version: 0.13.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
 
 %changelog
+* Wed Apr 29 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-5
+- Use disttag in release field
+
 * Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
 - Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
 



From wolfy at fedoraproject.org  Wed Apr 29 05:55:30 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 05:55:30 +0000 (UTC)
Subject: rpms/jnettop/F-10 jnettop.spec,1.1,1.2
Message-ID: <20090429055530.E2C3E70133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17376

Modified Files:
	jnettop.spec 
Log Message:
Use disttag



Index: jnettop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-10/jnettop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jnettop.spec	29 Apr 2009 05:01:11 -0000	1.1
+++ jnettop.spec	29 Apr 2009 05:55:00 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Network traffic tracker
 Name: jnettop
 Version: 0.13.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
 
 %changelog
+* Wed Apr 29 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-5
+- Use disttag in release field
+
 * Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
 - Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
 



From wolfy at fedoraproject.org  Wed Apr 29 06:00:45 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Wed, 29 Apr 2009 06:00:45 +0000 (UTC)
Subject: rpms/jnettop/F-11 jnettop.spec,1.1,1.2
Message-ID: <20090429060045.2422770133@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/jnettop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18946

Modified Files:
	jnettop.spec 
Log Message:
Use disttag



Index: jnettop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jnettop/F-11/jnettop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jnettop.spec	29 Apr 2009 04:47:09 -0000	1.1
+++ jnettop.spec	29 Apr 2009 06:00:14 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Network traffic tracker
 Name: jnettop
 Version: 0.13.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source: http://www.kubs.cz/jnettop/dist/jnettop-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README README.UIA .jnettop PORTING README.Fedora
 
 %changelog
+* Wed Apr 29 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-5
+- Use disttag in release field
+
 * Mon Apr 27 2009 Manuel <lonely wolf> Wolfshant <wolfy at fedoraproject.org> 0.13.0-4
 - Add conditional BR for EL-4 (libpcap instead of libpcap-devel)
 



From lkundrak at fedoraproject.org  Wed Apr 29 06:01:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 06:01:51 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.25,1.26
Message-ID: <20090429060151.5A23B70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19428

Modified Files:
	sunbird.spec 
Log Message:
Add BRs


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sunbird.spec	29 Apr 2009 05:48:13 -0000	1.25
+++ sunbird.spec	29 Apr 2009 06:01:21 -0000	1.26
@@ -51,6 +51,7 @@ BuildRequires:  nspr-devel
 BuildRequires:  libical-devel
 BuildRequires:  zip
 BuildRequires:  autoconf213
+BuildRequires:  alsa-lib-devel
 
 Requires(post):  desktop-file-utils
 Requires(postun): desktop-file-utils



From llaumgui at fedoraproject.org  Wed Apr 29 06:08:09 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 06:08:09 +0000 (UTC)
Subject: rpms/php-ezc-Template/devel import.log, NONE,
	1.1 php-ezc-Template.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429060809.4330D70133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22784/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Template.spec 
Log Message:
Initial import branch devel


--- NEW FILE import.log ---
php-ezc-Template-1_3_2-1_fc10:HEAD:php-ezc-Template-1.3.2-1.fc10.src.rpm:1240984829


--- NEW FILE php-ezc-Template.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Template
%define channel components.ez.no

Name:           php-ezc-Template
Version:        1.3.2
Release:        1%{?dist}
Summary:        A fully functional Templating system

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A fully functional Templating system, supporting template compilation in
different levels, user defined functions and operators, an optimizer, output
escaping for different output handlers to prevent XSS and other security
problems and a plug in system for extra functionality (such as a Translation
system).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# rpmlint: wrong-file-end-of-line-encoding
sed -i -e 's|\r||g' ./docdir/examples/brainfuck/brainfuck.out

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/template_autoload.php


%changelog
* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:58:22 -0000	1.1
+++ .cvsignore	29 Apr 2009 06:08:08 -0000	1.2
@@ -0,0 +1 @@
+Template-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:58:22 -0000	1.1
+++ sources	29 Apr 2009 06:08:08 -0000	1.2
@@ -0,0 +1 @@
+2a6c226f185f884bbca084ba95576aba  Template-1.3.2.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 06:08:40 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 06:08:40 +0000 (UTC)
Subject: rpms/php-ezc-Template/F-9 import.log, NONE,
	1.1 php-ezc-Template.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429060840.C2DDE70133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22811/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Template.spec 
Log Message:
Initial import branch F-9


--- NEW FILE import.log ---
php-ezc-Template-1_3_2-1_fc10:F-9:php-ezc-Template-1.3.2-1.fc10.src.rpm:1240984957


--- NEW FILE php-ezc-Template.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Template
%define channel components.ez.no

Name:           php-ezc-Template
Version:        1.3.2
Release:        1%{?dist}
Summary:        A fully functional Templating system

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A fully functional Templating system, supporting template compilation in
different levels, user defined functions and operators, an optimizer, output
escaping for different output handlers to prevent XSS and other security
problems and a plug in system for extra functionality (such as a Translation
system).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# rpmlint: wrong-file-end-of-line-encoding
sed -i -e 's|\r||g' ./docdir/examples/brainfuck/brainfuck.out

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/template_autoload.php


%changelog
* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:58:22 -0000	1.1
+++ .cvsignore	29 Apr 2009 06:08:10 -0000	1.2
@@ -0,0 +1 @@
+Template-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:58:22 -0000	1.1
+++ sources	29 Apr 2009 06:08:10 -0000	1.2
@@ -0,0 +1 @@
+2a6c226f185f884bbca084ba95576aba  Template-1.3.2.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 06:08:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 06:08:41 +0000 (UTC)
Subject: rpms/php-ezc-Template/F-10 import.log, NONE,
	1.1 php-ezc-Template.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429060841.92A6470133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22835/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Template.spec 
Log Message:
Initial import branch F-10


--- NEW FILE import.log ---
php-ezc-Template-1_3_2-1_fc10:F-10:php-ezc-Template-1.3.2-1.fc10.src.rpm:1240984932


--- NEW FILE php-ezc-Template.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Template
%define channel components.ez.no

Name:           php-ezc-Template
Version:        1.3.2
Release:        1%{?dist}
Summary:        A fully functional Templating system

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A fully functional Templating system, supporting template compilation in
different levels, user defined functions and operators, an optimizer, output
escaping for different output handlers to prevent XSS and other security
problems and a plug in system for extra functionality (such as a Translation
system).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# rpmlint: wrong-file-end-of-line-encoding
sed -i -e 's|\r||g' ./docdir/examples/brainfuck/brainfuck.out

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/template_autoload.php


%changelog
* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:58:22 -0000	1.1
+++ .cvsignore	29 Apr 2009 06:08:11 -0000	1.2
@@ -0,0 +1 @@
+Template-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:58:22 -0000	1.1
+++ sources	29 Apr 2009 06:08:11 -0000	1.2
@@ -0,0 +1 @@
+2a6c226f185f884bbca084ba95576aba  Template-1.3.2.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 06:08:43 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 06:08:43 +0000 (UTC)
Subject: rpms/php-ezc-Template/F-11 import.log, NONE,
	1.1 php-ezc-Template.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429060843.0796F70133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22867/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Template.spec 
Log Message:
Initial import branch F-11


--- NEW FILE import.log ---
php-ezc-Template-1_3_2-1_fc10:F-11:php-ezc-Template-1.3.2-1.fc10.src.rpm:1240984961


--- NEW FILE php-ezc-Template.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Template
%define channel components.ez.no

Name:           php-ezc-Template
Version:        1.3.2
Release:        1%{?dist}
Summary:        A fully functional Templating system

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
A fully functional Templating system, supporting template compilation in
different levels, user defined functions and operators, an optimizer, output
escaping for different output handlers to prevent XSS and other security
problems and a plug in system for extra functionality (such as a Translation
system).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# rpmlint: wrong-file-end-of-line-encoding
sed -i -e 's|\r||g' ./docdir/examples/brainfuck/brainfuck.out

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/template_autoload.php


%changelog
* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:58:22 -0000	1.1
+++ .cvsignore	29 Apr 2009 06:08:12 -0000	1.2
@@ -0,0 +1 @@
+Template-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:58:22 -0000	1.1
+++ sources	29 Apr 2009 06:08:12 -0000	1.2
@@ -0,0 +1 @@
+2a6c226f185f884bbca084ba95576aba  Template-1.3.2.tgz



From pkgdb at fedoraproject.org  Wed Apr 29 06:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 06:10:26 +0000
Subject: [pkgdb] hunspell-as (Fedora, 11) updated by kevin
Message-ID: <20090429061027.59AE310F895@bastion2.fedora.phx.redhat.com>

kevin changed owner of hunspell-as in Fedora 11 to pnemade
kevin approved watchbugzilla on hunspell-as (Fedora 11) for caolanm
kevin approved watchcommits on hunspell-as (Fedora 11) for caolanm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-as



From pkgdb at fedoraproject.org  Wed Apr 29 06:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 06:10:26 +0000
Subject: [pkgdb] hunspell-as (Fedora, devel) updated by kevin
Message-ID: <20090429061027.6DCAF10F898@bastion2.fedora.phx.redhat.com>

kevin changed owner of hunspell-as in Fedora devel to pnemade
kevin approved watchbugzilla on hunspell-as (Fedora devel) for caolanm
kevin approved watchcommits on hunspell-as (Fedora devel) for caolanm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-as



From sharkcz at fedoraproject.org  Wed Apr 29 06:11:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 29 Apr 2009 06:11:09 +0000 (UTC)
Subject: rpms/collectl/devel .cvsignore, 1.9, 1.10 collectl.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090429061109.871E870133@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23737

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
- upgrade to upstream version 3.3.2
- install missing file
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Apr 2009 07:53:13 -0000	1.9
+++ .cvsignore	29 Apr 2009 06:10:39 -0000	1.10
@@ -1 +1 @@
-collectl-3.3.1.src.tar.gz
+collectl-3.3.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- collectl.spec	28 Apr 2009 07:53:13 -0000	1.10
+++ collectl.spec	29 Apr 2009 06:10:39 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.1
+Version: 3.3.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -63,6 +63,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -98,6 +99,11 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
+- upgrade to upstream version 3.3.2
+- install missing file
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
 - upgrade to upstream version 3.3.1
 - changelog: http://collectl.sourceforge.net/Releases.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Apr 2009 07:53:13 -0000	1.9
+++ sources	29 Apr 2009 06:10:39 -0000	1.10
@@ -1 +1 @@
-603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz
+f2eae70adfee68cf65ab2f4ab007d940  collectl-3.3.2.src.tar.gz



From jussilehtola at fedoraproject.org  Wed Apr 29 06:21:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 29 Apr 2009 06:21:34 +0000 (UTC)
Subject: rpms/python-paida/devel import.log, NONE, 1.1 python-paida.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429062134.8065370133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-paida/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26276/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-paida.spec 
Log Message:
Import to Fedora.



--- NEW FILE import.log ---
python-paida-3_2_1_2_10_1-2_fc10:HEAD:python-paida-3.2.1_2.10.1-2.fc10.src.rpm:1240985976


--- NEW FILE python-paida.spec ---
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global oname paida

Name:		python-paida
Version:	3.2.1_2.10.1
Release:	2%{?dist}
Summary:	Pure Python scientific analysis package
Group:		Development/Languages
License:	Python
URL:		http://paida.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{oname}/%{oname}-%{version}.tar.gz   
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	python-devel
Requires:	tkinter

%description
PAIDA is pure Python scientific analysis package and
supports AIDA (Abstract Interfaces for Data Analysis).

%prep
%setup -q -n %{oname}-%{version}

%build
python setup.py build


%install
rm -rf %{buildroot}
python setup.py install -O1 --skip-build --root %{buildroot} 

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGES PKG-INFO README
%{python_sitelib}/%{oname}/
%{python_sitelib}/%{oname}-*.egg-info


%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 3.2.1_2.10.1-2
- Review fix.

* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 3.2.1_2.10.1-1
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paida/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:19:26 -0000	1.1
+++ .cvsignore	29 Apr 2009 06:21:03 -0000	1.2
@@ -0,0 +1 @@
+paida-3.2.1_2.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paida/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:19:26 -0000	1.1
+++ sources	29 Apr 2009 06:21:04 -0000	1.2
@@ -0,0 +1 @@
+8a56bfbf037891d542f771cf50da13ed  paida-3.2.1_2.10.1.tar.gz



From sharkcz at fedoraproject.org  Wed Apr 29 06:21:41 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 29 Apr 2009 06:21:41 +0000 (UTC)
Subject: rpms/collectl/F-10 .cvsignore, 1.9, 1.10 collectl.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20090429062141.3801D70133@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26502

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
- upgrade to upstream version 3.3.2
- install missing file
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Apr 2009 08:04:25 -0000	1.9
+++ .cvsignore	29 Apr 2009 06:21:10 -0000	1.10
@@ -1 +1 @@
-collectl-3.3.1.src.tar.gz
+collectl-3.3.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/collectl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- collectl.spec	28 Apr 2009 08:04:25 -0000	1.8
+++ collectl.spec	29 Apr 2009 06:21:10 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.1
+Version: 3.3.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -63,6 +63,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -98,6 +99,11 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
+- upgrade to upstream version 3.3.2
+- install missing file
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
 - upgrade to upstream version 3.3.1
 - changelog: http://collectl.sourceforge.net/Releases.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Apr 2009 08:04:25 -0000	1.9
+++ sources	29 Apr 2009 06:21:10 -0000	1.10
@@ -1 +1 @@
-603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz
+f2eae70adfee68cf65ab2f4ab007d940  collectl-3.3.2.src.tar.gz



From sharkcz at fedoraproject.org  Wed Apr 29 06:22:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 29 Apr 2009 06:22:56 +0000 (UTC)
Subject: rpms/collectl/F-11 .cvsignore, 1.9, 1.10 collectl.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090429062256.B25DD70133@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26899

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
- upgrade to upstream version 3.3.2
- install missing file
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Apr 2009 08:03:08 -0000	1.9
+++ .cvsignore	29 Apr 2009 06:22:26 -0000	1.10
@@ -1 +1 @@
-collectl-3.3.1.src.tar.gz
+collectl-3.3.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/collectl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- collectl.spec	28 Apr 2009 08:03:08 -0000	1.10
+++ collectl.spec	29 Apr 2009 06:22:26 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.1
+Version: 3.3.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -63,6 +63,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -98,6 +99,11 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
+- upgrade to upstream version 3.3.2
+- install missing file
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
 - upgrade to upstream version 3.3.1
 - changelog: http://collectl.sourceforge.net/Releases.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Apr 2009 08:03:08 -0000	1.9
+++ sources	29 Apr 2009 06:22:26 -0000	1.10
@@ -1 +1 @@
-603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz
+f2eae70adfee68cf65ab2f4ab007d940  collectl-3.3.2.src.tar.gz



From sharkcz at fedoraproject.org  Wed Apr 29 06:24:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 29 Apr 2009 06:24:09 +0000 (UTC)
Subject: rpms/collectl/F-9 .cvsignore, 1.9, 1.10 collectl.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20090429062409.E550870133@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27279

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
- upgrade to upstream version 3.3.2
- install missing file
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Apr 2009 08:05:39 -0000	1.9
+++ .cvsignore	29 Apr 2009 06:23:39 -0000	1.10
@@ -1 +1 @@
-collectl-3.3.1.src.tar.gz
+collectl-3.3.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/collectl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- collectl.spec	28 Apr 2009 08:05:39 -0000	1.8
+++ collectl.spec	29 Apr 2009 06:23:39 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.1
+Version: 3.3.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -63,6 +63,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -98,6 +99,11 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
+- upgrade to upstream version 3.3.2
+- install missing file
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
 - upgrade to upstream version 3.3.1
 - changelog: http://collectl.sourceforge.net/Releases.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Apr 2009 08:05:39 -0000	1.9
+++ sources	29 Apr 2009 06:23:39 -0000	1.10
@@ -1 +1 @@
-603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz
+f2eae70adfee68cf65ab2f4ab007d940  collectl-3.3.2.src.tar.gz



From jussilehtola at fedoraproject.org  Wed Apr 29 06:25:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 29 Apr 2009 06:25:26 +0000 (UTC)
Subject: rpms/python-paida/F-10 sources,1.1,1.2
Message-ID: <20090429062526.1485970133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-paida/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27680/F-10

Modified Files:
	sources 
Log Message:
Import to Fedora.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paida/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:19:26 -0000	1.1
+++ sources	29 Apr 2009 06:24:53 -0000	1.2
@@ -0,0 +1 @@
+8a56bfbf037891d542f771cf50da13ed  paida-3.2.1_2.10.1.tar.gz



From jussilehtola at fedoraproject.org  Wed Apr 29 06:25:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 29 Apr 2009 06:25:28 +0000 (UTC)
Subject: rpms/python-paida/F-11 sources,1.1,1.2
Message-ID: <20090429062528.0461C70133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-paida/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27680/F-11

Modified Files:
	sources 
Log Message:
Import to Fedora.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paida/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:19:26 -0000	1.1
+++ sources	29 Apr 2009 06:24:53 -0000	1.2
@@ -0,0 +1 @@
+8a56bfbf037891d542f771cf50da13ed  paida-3.2.1_2.10.1.tar.gz



From sharkcz at fedoraproject.org  Wed Apr 29 06:25:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 29 Apr 2009 06:25:36 +0000 (UTC)
Subject: rpms/collectl/EL-5 .cvsignore, 1.9, 1.10 collectl.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20090429062536.9AFBC70133@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27816

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
- upgrade to upstream version 3.3.2
- install missing file
- changelog: http://collectl.sourceforge.net/Releases.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Apr 2009 08:07:50 -0000	1.9
+++ .cvsignore	29 Apr 2009 06:24:59 -0000	1.10
@@ -1 +1 @@
-collectl-3.3.1.src.tar.gz
+collectl-3.3.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- collectl.spec	28 Apr 2009 08:07:50 -0000	1.8
+++ collectl.spec	29 Apr 2009 06:24:59 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.1
+Version: 3.3.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -63,6 +63,7 @@ mkdir -p        $RPM_BUILD_ROOT%{_initrd
 install -p -m 755  collectl          $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755  collectl.pl       $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 644  *.ph              $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p -m 644  envrules.std      $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 install -p -m 755  readS             $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644  man1/collectl*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644  collectl.conf     $RPM_BUILD_ROOT%{_sysconfdir}
@@ -98,6 +99,11 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Dan Hor??k <dan[at]danny.cz> 3.3.2-1
+- upgrade to upstream version 3.3.2
+- install missing file
+- changelog: http://collectl.sourceforge.net/Releases.html
+
 * Tue Apr 28 2009 Dan Hor??k <dan[at]danny.cz> 3.3.1-1
 - upgrade to upstream version 3.3.1
 - changelog: http://collectl.sourceforge.net/Releases.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Apr 2009 08:07:50 -0000	1.9
+++ sources	29 Apr 2009 06:24:59 -0000	1.10
@@ -1 +1 @@
-603af25a2c882abe45f3641ef7aa3dde  collectl-3.3.1.src.tar.gz
+f2eae70adfee68cf65ab2f4ab007d940  collectl-3.3.2.src.tar.gz



From jussilehtola at fedoraproject.org  Wed Apr 29 06:27:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 29 Apr 2009 06:27:32 +0000 (UTC)
Subject: rpms/python-paida/F-10 python-paida.spec,NONE,1.1
Message-ID: <20090429062732.89D8B70133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-paida/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28540/F-10

Added Files:
	python-paida.spec 
Log Message:
Import to Fedora.



--- NEW FILE python-paida.spec ---
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global oname paida

Name:		python-paida
Version:	3.2.1_2.10.1
Release:	2%{?dist}
Summary:	Pure Python scientific analysis package
Group:		Development/Languages
License:	Python
URL:		http://paida.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{oname}/%{oname}-%{version}.tar.gz   
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	python-devel
Requires:	tkinter

%description
PAIDA is pure Python scientific analysis package and
supports AIDA (Abstract Interfaces for Data Analysis).

%prep
%setup -q -n %{oname}-%{version}

%build
python setup.py build


%install
rm -rf %{buildroot}
python setup.py install -O1 --skip-build --root %{buildroot} 

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGES PKG-INFO README
%{python_sitelib}/%{oname}/
%{python_sitelib}/%{oname}-*.egg-info


%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 3.2.1_2.10.1-2
- Review fix.

* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 3.2.1_2.10.1-1
- First release.



From jussilehtola at fedoraproject.org  Wed Apr 29 06:27:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 29 Apr 2009 06:27:32 +0000 (UTC)
Subject: rpms/python-paida/F-11 python-paida.spec,NONE,1.1
Message-ID: <20090429062732.A8ED970135@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-paida/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28540/F-11

Added Files:
	python-paida.spec 
Log Message:
Import to Fedora.



--- NEW FILE python-paida.spec ---
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global oname paida

Name:		python-paida
Version:	3.2.1_2.10.1
Release:	2%{?dist}
Summary:	Pure Python scientific analysis package
Group:		Development/Languages
License:	Python
URL:		http://paida.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{oname}/%{oname}-%{version}.tar.gz   
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	python-devel
Requires:	tkinter

%description
PAIDA is pure Python scientific analysis package and
supports AIDA (Abstract Interfaces for Data Analysis).

%prep
%setup -q -n %{oname}-%{version}

%build
python setup.py build


%install
rm -rf %{buildroot}
python setup.py install -O1 --skip-build --root %{buildroot} 

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGES PKG-INFO README
%{python_sitelib}/%{oname}/
%{python_sitelib}/%{oname}-*.egg-info


%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 3.2.1_2.10.1-2
- Review fix.

* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 3.2.1_2.10.1-1
- First release.



From lkundrak at fedoraproject.org  Wed Apr 29 07:08:17 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:08:17 +0000 (UTC)
Subject: rpms/shortrpm/F-10 .cvsignore, 1.2, 1.3 shortrpm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090429070817.E946070136@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6905/F-10

Modified Files:
	.cvsignore shortrpm.spec sources 
Log Message:
devel/clog


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 04:53:52 -0000	1.2
+++ .cvsignore	29 Apr 2009 07:07:45 -0000	1.3
@@ -1 +1 @@
-shortrpm-1.0.tar.gz
+shortrpm-1.1.tar.gz


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-10/shortrpm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shortrpm.spec	29 Apr 2009 04:53:52 -0000	1.1
+++ shortrpm.spec	29 Apr 2009 07:07:45 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           shortrpm
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Short-circuit binary RPM package build
 
@@ -53,5 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1
+- New upstream release
+- Fix mis-compilation with newer glibc
+
 * Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 04:53:52 -0000	1.2
+++ sources	29 Apr 2009 07:07:45 -0000	1.3
@@ -1 +1 @@
-5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz
+f6da9946e844dc0cd2e0146af100253f  shortrpm-1.1.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 07:08:17 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:08:17 +0000 (UTC)
Subject: rpms/shortrpm/EL-5 .cvsignore, 1.2, 1.3 shortrpm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090429070817.DFAC170133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6905/EL-5

Modified Files:
	.cvsignore shortrpm.spec sources 
Log Message:
devel/clog


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 04:53:52 -0000	1.2
+++ .cvsignore	29 Apr 2009 07:07:44 -0000	1.3
@@ -1 +1 @@
-shortrpm-1.0.tar.gz
+shortrpm-1.1.tar.gz


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/shortrpm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shortrpm.spec	29 Apr 2009 04:53:52 -0000	1.1
+++ shortrpm.spec	29 Apr 2009 07:07:44 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           shortrpm
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Short-circuit binary RPM package build
 
@@ -53,5 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1
+- New upstream release
+- Fix mis-compilation with newer glibc
+
 * Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 04:53:52 -0000	1.2
+++ sources	29 Apr 2009 07:07:44 -0000	1.3
@@ -1 +1 @@
-5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz
+f6da9946e844dc0cd2e0146af100253f  shortrpm-1.1.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 07:08:17 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:08:17 +0000 (UTC)
Subject: rpms/shortrpm/devel .cvsignore, 1.2, 1.3 shortrpm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090429070817.EEA4A7013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6905/devel

Modified Files:
	.cvsignore shortrpm.spec sources 
Log Message:
devel/clog


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 04:53:53 -0000	1.2
+++ .cvsignore	29 Apr 2009 07:07:46 -0000	1.3
@@ -1 +1 @@
-shortrpm-1.0.tar.gz
+shortrpm-1.1.tar.gz


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/shortrpm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shortrpm.spec	29 Apr 2009 04:53:53 -0000	1.1
+++ shortrpm.spec	29 Apr 2009 07:07:46 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           shortrpm
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Short-circuit binary RPM package build
 
@@ -53,5 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1
+- New upstream release
+- Fix mis-compilation with newer glibc
+
 * Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 04:53:53 -0000	1.2
+++ sources	29 Apr 2009 07:07:46 -0000	1.3
@@ -1 +1 @@
-5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz
+f6da9946e844dc0cd2e0146af100253f  shortrpm-1.1.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 07:08:17 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:08:17 +0000 (UTC)
Subject: rpms/shortrpm/F-11 .cvsignore, 1.2, 1.3 shortrpm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090429070817.EBE607013C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6905/F-11

Modified Files:
	.cvsignore shortrpm.spec sources 
Log Message:
devel/clog


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 04:53:53 -0000	1.2
+++ .cvsignore	29 Apr 2009 07:07:45 -0000	1.3
@@ -1 +1 @@
-shortrpm-1.0.tar.gz
+shortrpm-1.1.tar.gz


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/shortrpm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shortrpm.spec	29 Apr 2009 04:53:53 -0000	1.1
+++ shortrpm.spec	29 Apr 2009 07:07:46 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           shortrpm
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Short-circuit binary RPM package build
 
@@ -53,5 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1
+- New upstream release
+- Fix mis-compilation with newer glibc
+
 * Mon Apr 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 04:53:53 -0000	1.2
+++ sources	29 Apr 2009 07:07:46 -0000	1.3
@@ -1 +1 @@
-5ce79f81c50159dfc8c9d20503809df8  shortrpm-1.0.tar.gz
+f6da9946e844dc0cd2e0146af100253f  shortrpm-1.1.tar.gz



From caolanm at fedoraproject.org  Wed Apr 29 07:08:19 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 29 Apr 2009 07:08:19 +0000 (UTC)
Subject: rpms/hunspell-ln/devel hunspell-ln.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429070819.0457770133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ln/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-ln.spec import.log 
Log Message:



--- NEW FILE hunspell-ln.spec ---
Name: hunspell-ln
Summary: Lingala hunspell dictionaries
Version: 0.02
Release: 1%{?dist}
Group: Applications/Text
Source: http://downloads.sourceforge.net/lingala/hunspell-ln-0.02.zip
URL: http://lingala.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch
Requires: hunspell

%description
Lingala hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p ln_CD.* $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_ln_CD.txt
%{_datadir}/myspell/*

%changelog
* Sun Apr 26 2009 Caolan McNamara <caolanm at redhat.com> - 0.02-1
- initial version


--- NEW FILE import.log ---
hunspell-ln-0_02-1_fc11:HEAD:hunspell-ln-0.02-1.fc11.src.rpm:1240988843


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ln/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:14:10 -0000	1.1
+++ .cvsignore	29 Apr 2009 07:07:48 -0000	1.2
@@ -0,0 +1 @@
+hunspell-ln-0.02.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ln/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:14:10 -0000	1.1
+++ sources	29 Apr 2009 07:07:48 -0000	1.2
@@ -0,0 +1 @@
+5ad7bc5fba5f6815aadcead1368929d8  hunspell-ln-0.02.zip



From lkundrak at fedoraproject.org  Wed Apr 29 07:12:01 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:12:01 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.26,1.27
Message-ID: <20090429071201.9A72870133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9011/F-11

Modified Files:
	sunbird.spec 
Log Message:
* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.2.20090302hg
- Fix the permissions for real now



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sunbird.spec	29 Apr 2009 06:01:21 -0000	1.26
+++ sunbird.spec	29 Apr 2009 07:11:30 -0000	1.27
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.1.20090302hg%{?dist}
+Release:        0.2.20090302hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -99,8 +99,7 @@ calendaring tasks.
 %patch22 -p1 -b .shared-error
 %patch24 -p1 -b .pango-fix
 
-find . -name '*.cpp' -o -name '*.h' -print0 |
-        xargs -0 chmod -x
+find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
 
 
 %build
@@ -161,7 +160,7 @@ do
         DIR=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$LANGUAGE at sunbird.mozilla.org
         mkdir -p $DIR
         unzip -qod $DIR $PACK
-        find $DIR -type f -print0 |xargs -0 chmod 0644
+        find $DIR -type f |xargs chmod 0644
 
         # Fix #441500
         sed 's/\r//g' $DIR/install.rdf |awk '/^$/ {next} {print}' >lala
@@ -194,10 +193,9 @@ ls $RPM_BUILD_ROOT%{_libdir}/thunderbird
 %endif
 
 # Permissions fixup
-find $RPM_BUILD_ROOT -name '*.xpm' -o -name '*.js' -print0 |
-        xargs -0 chmod 0644 mozilla/LICENSE
-find $RPM_BUILD_ROOT -name '*.so' -print0 |
-        xargs -0 chmod 0755
+find $RPM_BUILD_ROOT -name '*.xpm' -o -name '*.js' |
+        xargs chmod 0644 mozilla/LICENSE
+find $RPM_BUILD_ROOT -name '*.so' |xargs chmod 0755
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -271,6 +269,9 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.2.20090302hg
+- Fix the permissions for real now
+
 * Tue Apr 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.1.20090302hg
 - Update to version matching current Thunderbird
 



From lkundrak at fedoraproject.org  Wed Apr 29 07:12:02 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:12:02 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird.spec,1.23,1.24
Message-ID: <20090429071202.6672670133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9011/devel

Modified Files:
	sunbird.spec 
Log Message:
* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.2.20090302hg
- Fix the permissions for real now



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sunbird.spec	29 Apr 2009 04:54:59 -0000	1.23
+++ sunbird.spec	29 Apr 2009 07:11:31 -0000	1.24
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.1.20090302hg%{?dist}
+Release:        0.2.20090302hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -50,6 +50,8 @@ BuildRequires:  nss-devel
 BuildRequires:  nspr-devel
 BuildRequires:  libical-devel
 BuildRequires:  zip
+BuildRequires:  autoconf213
+BuildRequires:  alsa-lib-devel
 
 Requires(post):  desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -97,8 +99,7 @@ calendaring tasks.
 %patch22 -p1 -b .shared-error
 %patch24 -p1 -b .pango-fix
 
-find . -name '*.cpp' -o -name '*.h' -print0 |
-        xargs -0 chmod -x
+find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
 
 
 %build
@@ -159,7 +160,7 @@ do
         DIR=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$LANGUAGE at sunbird.mozilla.org
         mkdir -p $DIR
         unzip -qod $DIR $PACK
-        find $DIR -type f -print0 |xargs -0 chmod 0644
+        find $DIR -type f |xargs chmod 0644
 
         # Fix #441500
         sed 's/\r//g' $DIR/install.rdf |awk '/^$/ {next} {print}' >lala
@@ -192,10 +193,9 @@ ls $RPM_BUILD_ROOT%{_libdir}/thunderbird
 %endif
 
 # Permissions fixup
-find $RPM_BUILD_ROOT -name '*.xpm' -o -name '*.js' -print0 |
-        xargs -0 chmod 0644 mozilla/LICENSE
-find $RPM_BUILD_ROOT -name '*.so' -print0 |
-        xargs -0 chmod 0755
+find $RPM_BUILD_ROOT -name '*.xpm' -o -name '*.js' |
+        xargs chmod 0644 mozilla/LICENSE
+find $RPM_BUILD_ROOT -name '*.so' |xargs chmod 0755
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -269,6 +269,9 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.2.20090302hg
+- Fix the permissions for real now
+
 * Tue Apr 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.1.20090302hg
 - Update to version matching current Thunderbird
 



From lkundrak at fedoraproject.org  Wed Apr 29 07:16:33 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:16:33 +0000 (UTC)
Subject: rpms/shortrpm/EL-5 shortrpm.spec,1.2,1.3
Message-ID: <20090429071633.A84FE70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10168

Modified Files:
	shortrpm.spec 
Log Message:
* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1.1
- Disable test suite on EL-5, <() doesn't work on builders



Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/shortrpm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- shortrpm.spec	29 Apr 2009 07:07:44 -0000	1.2
+++ shortrpm.spec	29 Apr 2009 07:16:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           shortrpm
 Version:        1.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Short-circuit binary RPM package build
 
 Group:          Development/Tools
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1.1
+- Disable test suite on EL-5, <() doesn't work on builders
+
 * Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1
 - New upstream release
 - Fix mis-compilation with newer glibc



From pingou at fedoraproject.org  Wed Apr 29 07:22:51 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:22:51 +0000 (UTC)
Subject: rpms/R-IRanges/F-10 R-IRanges.spec,1.2,1.3
Message-ID: <20090429072251.0DBC470133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12248/F-10

Modified Files:
	R-IRanges.spec 
Log Message:
Correct build


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-10/R-IRanges.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-IRanges.spec	28 Apr 2009 17:04:11 -0000	1.2
+++ R-IRanges.spec	29 Apr 2009 07:22:20 -0000	1.3
@@ -1,9 +1,10 @@
-%global BioC      2.4
 %global packname  IRanges
+%global BioC      2.4
+%global Rvers     2.9.0
 
 Name:             R-%{packname}
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
 Group:            Applications/Engineering 
@@ -13,10 +14,10 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
+Requires:         R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 
+BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix 
 
 %description
 The IRanges class and its extensions are low-level containers
@@ -69,6 +70,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}/
 %doc %{_libdir}/R/library/%{packname}/latex
+%doc %{_libdir}/R/library/%{packname}/doc
 %doc %{_libdir}/R/library/%{packname}/html
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/man
@@ -87,6 +89,10 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> 1.2.0-2
+- Update the file section to package doc
+- Update the Requires and BR to take into account R version
+
 * Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
 - Update to Bioconductor 2.4 and R-2.9.0
 



From pingou at fedoraproject.org  Wed Apr 29 07:22:51 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:22:51 +0000 (UTC)
Subject: rpms/R-IRanges/F-11 R-IRanges.spec,1.2,1.3
Message-ID: <20090429072251.42BC170133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12248/F-11

Modified Files:
	R-IRanges.spec 
Log Message:
Correct build


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-11/R-IRanges.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-IRanges.spec	28 Apr 2009 17:04:11 -0000	1.2
+++ R-IRanges.spec	29 Apr 2009 07:22:20 -0000	1.3
@@ -1,9 +1,10 @@
-%global BioC      2.4
 %global packname  IRanges
+%global BioC      2.4
+%global Rvers     2.9.0
 
 Name:             R-%{packname}
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
 Group:            Applications/Engineering 
@@ -13,10 +14,10 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
+Requires:         R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 
+BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix 
 
 %description
 The IRanges class and its extensions are low-level containers
@@ -69,6 +70,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}/
 %doc %{_libdir}/R/library/%{packname}/latex
+%doc %{_libdir}/R/library/%{packname}/doc
 %doc %{_libdir}/R/library/%{packname}/html
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/man
@@ -87,6 +89,10 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> 1.2.0-2
+- Update the file section to package doc
+- Update the Requires and BR to take into account R version
+
 * Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
 - Update to Bioconductor 2.4 and R-2.9.0
 



From pingou at fedoraproject.org  Wed Apr 29 07:22:51 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:22:51 +0000 (UTC)
Subject: rpms/R-IRanges/devel R-IRanges.spec,1.2,1.3
Message-ID: <20090429072251.F009670133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12248/devel

Modified Files:
	R-IRanges.spec 
Log Message:
Correct build


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/R-IRanges.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-IRanges.spec	28 Apr 2009 17:04:12 -0000	1.2
+++ R-IRanges.spec	29 Apr 2009 07:22:21 -0000	1.3
@@ -1,9 +1,10 @@
-%global BioC      2.4
 %global packname  IRanges
+%global BioC      2.4
+%global Rvers     2.9.0
 
 Name:             R-%{packname}
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
 Group:            Applications/Engineering 
@@ -13,10 +14,10 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
+Requires:         R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 
+BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix 
 
 %description
 The IRanges class and its extensions are low-level containers
@@ -69,6 +70,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}/
 %doc %{_libdir}/R/library/%{packname}/latex
+%doc %{_libdir}/R/library/%{packname}/doc
 %doc %{_libdir}/R/library/%{packname}/html
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/man
@@ -87,6 +89,10 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> 1.2.0-2
+- Update the file section to package doc
+- Update the Requires and BR to take into account R version
+
 * Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
 - Update to Bioconductor 2.4 and R-2.9.0
 



From pingou at fedoraproject.org  Wed Apr 29 07:22:51 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:22:51 +0000 (UTC)
Subject: rpms/R-IRanges/F-9 R-IRanges.spec,1.2,1.3
Message-ID: <20090429072251.8AB6B70133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12248/F-9

Modified Files:
	R-IRanges.spec 
Log Message:
Correct build


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-9/R-IRanges.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-IRanges.spec	28 Apr 2009 17:04:11 -0000	1.2
+++ R-IRanges.spec	29 Apr 2009 07:22:21 -0000	1.3
@@ -1,9 +1,10 @@
-%global BioC      2.4
 %global packname  IRanges
+%global BioC      2.4
+%global Rvers     2.9.0
 
 Name:             R-%{packname}
 Version:          1.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
 Group:            Applications/Engineering 
@@ -13,10 +14,10 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{BioC}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:         R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix
+Requires:         R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex R >= 2.8.0 R-methods R-stats R-RUnit R-Matrix 
+BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods R-stats R-RUnit R-Matrix 
 
 %description
 The IRanges class and its extensions are low-level containers
@@ -69,6 +70,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}/
 %doc %{_libdir}/R/library/%{packname}/latex
+%doc %{_libdir}/R/library/%{packname}/doc
 %doc %{_libdir}/R/library/%{packname}/html
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/man
@@ -87,6 +89,10 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> 1.2.0-2
+- Update the file section to package doc
+- Update the Requires and BR to take into account R version
+
 * Tue Apr 28 2009 pingou <pingou at pingoured.fr> 1.2.0-1
 - Update to Bioconductor 2.4 and R-2.9.0
 



From lkundrak at fedoraproject.org  Wed Apr 29 07:24:28 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 07:24:28 +0000 (UTC)
Subject: rpms/shortrpm/EL-5 shortrpm.spec,1.3,1.4
Message-ID: <20090429072428.892A370133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12870

Modified Files:
	shortrpm.spec 
Log Message:
Disable tests this time for real


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/EL-5/shortrpm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shortrpm.spec	29 Apr 2009 07:16:03 -0000	1.3
+++ shortrpm.spec	29 Apr 2009 07:23:58 -0000	1.4
@@ -36,7 +36,7 @@ install -pm 0644 shortrpm.sh shortrpm.cs
 
 
 %check
-make test
+make test ||:
 
 
 %clean



From petersen at fedoraproject.org  Wed Apr 29 07:34:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 29 Apr 2009 07:34:25 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.85,1.86
Message-ID: <20090429073425.7327270133@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15340

Modified Files:
	ghc.spec 
Log Message:
remember to actually turn off shared libs for now


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ghc.spec	28 Apr 2009 10:09:37 -0000	1.85
+++ ghc.spec	29 Apr 2009 07:33:54 -0000	1.86
@@ -5,7 +5,7 @@
 
 # experimental
 ## shared libraries support available in ghc >= 6.11
-%bcond_without shared
+%bcond_with shared
 %bcond_with hscolour
 
 # Fixing packaging problems can be a tremendous pain because it
@@ -43,6 +43,7 @@ Provides: haddock = 2.3.0
 BuildRequires: ghc, happy, sed
 BuildRequires: gmp-devel, libedit-devel > 2.11-2
 %if %{with shared}
+# not sure if this is actually needed
 BuildRequires: libffi-devel
 %endif
 %if %{with doc}



From pingou at fedoraproject.org  Wed Apr 29 07:37:08 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:37:08 +0000 (UTC)
Subject: rpms/R-qvalue/F-10 R-qvalue.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090429073708.491A770133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-qvalue/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15688/F-10

Modified Files:
	R-qvalue.spec sources 
Log Message:
Update to 1.18.0


Index: R-qvalue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/F-10/R-qvalue.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-qvalue.spec	27 Oct 2008 20:17:39 -0000	1.5
+++ R-qvalue.spec	29 Apr 2009 07:36:36 -0000	1.6
@@ -1,9 +1,9 @@
 %define packname  qvalue
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.16.0
+Version:          1.18.0
 Release:          1%{?dist}
 Summary:          Q-value estimation for false discovery rate control 
 
@@ -85,6 +85,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.18.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.16.0-1
 - Update to version 1.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:17:39 -0000	1.4
+++ sources	29 Apr 2009 07:36:36 -0000	1.5
@@ -1 +1 @@
-44e896e74aa18a2d4da36c6cb31cbd4e  qvalue_1.16.0.tar.gz
+2fce52fab3ce705b69a0b4bdec891d4c  qvalue_1.18.0.tar.gz



From pingou at fedoraproject.org  Wed Apr 29 07:37:10 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:37:10 +0000 (UTC)
Subject: rpms/R-qvalue/F-9 R-qvalue.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090429073710.9F5F770133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-qvalue/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15688/F-9

Modified Files:
	R-qvalue.spec sources 
Log Message:
Update to 1.18.0


Index: R-qvalue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/F-9/R-qvalue.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-qvalue.spec	26 Nov 2008 21:08:25 -0000	1.4
+++ R-qvalue.spec	29 Apr 2009 07:36:39 -0000	1.5
@@ -1,9 +1,9 @@
 %define packname  qvalue
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.16.0
+Version:          1.18.0
 Release:          1%{?dist}
 Summary:          Q-value estimation for false discovery rate control 
 
@@ -85,6 +85,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.18.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.16.0-1
 - Update to version 1.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2008 21:08:25 -0000	1.4
+++ sources	29 Apr 2009 07:36:39 -0000	1.5
@@ -1 +1 @@
-44e896e74aa18a2d4da36c6cb31cbd4e  qvalue_1.16.0.tar.gz
+2fce52fab3ce705b69a0b4bdec891d4c  qvalue_1.18.0.tar.gz



From pingou at fedoraproject.org  Wed Apr 29 07:37:09 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:37:09 +0000 (UTC)
Subject: rpms/R-qvalue/F-11 R-qvalue.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090429073709.E1CB370133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-qvalue/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15688/F-11

Modified Files:
	R-qvalue.spec sources 
Log Message:
Update to 1.18.0


Index: R-qvalue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/F-11/R-qvalue.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-qvalue.spec	23 Feb 2009 23:09:19 -0000	1.6
+++ R-qvalue.spec	29 Apr 2009 07:36:37 -0000	1.7
@@ -1,10 +1,10 @@
 %define packname  qvalue
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.16.0
-Release:          2%{?dist}
+Version:          1.18.0
+Release:          1%{?dist}
 Summary:          Q-value estimation for false discovery rate control 
 
 Group:            Applications/Engineering 
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.18.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:17:39 -0000	1.4
+++ sources	29 Apr 2009 07:36:38 -0000	1.5
@@ -1 +1 @@
-44e896e74aa18a2d4da36c6cb31cbd4e  qvalue_1.16.0.tar.gz
+2fce52fab3ce705b69a0b4bdec891d4c  qvalue_1.18.0.tar.gz



From pingou at fedoraproject.org  Wed Apr 29 07:37:11 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 07:37:11 +0000 (UTC)
Subject: rpms/R-qvalue/devel .cvsignore, 1.4, 1.5 R-qvalue.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090429073711.32DB670133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-qvalue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15688/devel

Modified Files:
	.cvsignore R-qvalue.spec sources 
Log Message:
Update to 1.18.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 20:17:39 -0000	1.4
+++ .cvsignore	29 Apr 2009 07:36:40 -0000	1.5
@@ -1 +1 @@
-qvalue_1.16.0.tar.gz
+qvalue_1.18.0.tar.gz


Index: R-qvalue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/devel/R-qvalue.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-qvalue.spec	23 Feb 2009 23:09:19 -0000	1.6
+++ R-qvalue.spec	29 Apr 2009 07:36:40 -0000	1.7
@@ -1,10 +1,10 @@
 %define packname  qvalue
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.16.0
-Release:          2%{?dist}
+Version:          1.18.0
+Release:          1%{?dist}
 Summary:          Q-value estimation for false discovery rate control 
 
 Group:            Applications/Engineering 
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.18.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qvalue/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:17:39 -0000	1.4
+++ sources	29 Apr 2009 07:36:40 -0000	1.5
@@ -1 +1 @@
-44e896e74aa18a2d4da36c6cb31cbd4e  qvalue_1.16.0.tar.gz
+2fce52fab3ce705b69a0b4bdec891d4c  qvalue_1.18.0.tar.gz



From pnemade at fedoraproject.org  Wed Apr 29 07:54:41 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed, 29 Apr 2009 07:54:41 +0000 (UTC)
Subject: rpms/hunspell-as/devel as_IN.oxt, NONE, 1.1 hunspell-as.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20090429075441.D376170133@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-as/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19640/devel

Added Files:
	as_IN.oxt hunspell-as.spec import.log 
Log Message:

Initial Fedora Release




--- NEW FILE as_IN.oxt ---
PK
?!?Q[?'_???u???E;?3??`q*?J3?C4???NE?x?????C??	?Ps*J)8p???????D???9?BY?(?B??f:?a9?F?Q???x]?~}?	}??	=@I???qRB?bk???^%?o$?	K??O??"?
?HaP!
u??
????=c??Qc'@?C~?=V<?P?'?[o;SB?(?4?-[*!??J???Y6}???????Q????D?X???_o}?e??)e4???????J???????}?ni???????8?Z??I
?M??????,?_?%?
???#?q?
PK
4?


;C??O???!&???F>??b?X#?v0?Dka?Xk?\~W?z??PK
??gg??_f?*].u??7?ln
k???7kS?????|?/Y???????i??of?S$ ??ce??,7$=]O??eY?5q????[???a?~??????M??$?E??7v????m??i}?%???J-?W?Z||?0U???fFK?;?b7+jS,d??&?R???R?[K?;?y~??Y?O??cX4l?????Q?hucI[z?DfU?5?YK7?????Y>|??7???w6?`??I??.??Jo???J??mU?rS?????????j??t:)???vLG;????.$??Vya?e?*????????&]???~.=O??V3,z???,????????1?H???9I?8???T?Cp?@'????i?D?0gvO??3Mkh?Z??r??vD?#&???>u?S??*(?'R?WZZgK??o?]?%a)???d? ?Ts?^??T,?C?V+?")-???g??v??^'????\??B?M??r?%????[??(A??2????LK?Z?y-??>???&?ee ?9??
y?,[(RV?'?l?n??????|U?T*n???zj*?tV!??yZ3?????6LOl??l??Y?9??"Qu?DcI&???].?%??EqC_??)?t??8H?6??N??IV+?S?S????g??!B?NC~?%s?G???????J??
3????X???????
,	??}?"?#:}R???]?J?3k?U????(?+?????9?%???J?ot?????????%	?]??Z??g$??s?&Qdz[e$T?????y!3??g9>????'L4??0????\?sK?Y?'??????
??XhC??l?^???)??Q?????^??(??%?_!
myI?]'??A?{1??????k?ULn%lRk?+??7??????????7??@>?c???$+?<?5dK2$
?k??U?h???.i'?k?q?8???r??=?ij?0?.7?:?&?H???R?"HA????pY?Bx?.8n?u?8Kz??????????S
,K???????
????`|??????z]????D?<???????c?????xx???????????????=FN???SG6?@p?[Y}q?
??????A??
?L?>??qB??'??*
^????j?@??!
?e??3???}?/H?W?]Hm?????a????<9Zr?QN(?????tRB??????d???!???E?
??C?.???p(????OEQ6?]PtA??????A??2
??????????#???
????Y[???[|?E??????????0j???/??????53o;>????t?un?]??
;?p??%4|R???^Hu% ??"y??
aZ?cSz1??????up?NN?
)????g?Q??????8??????
?@???s?????p?,7?*?)s \?e?z?`&@?IH?l?[mTT??X???;?9Q+?i???7?0?	t?]?????w?{b????4???,'?\s?M??5i???6?`??a?8@?T?v??i?10r.?! ???cm'?X_??"{??+?(F?N??I

Z????RIyGO???3?>A ?N?l?:??	/???X??????s??nfF????
'
1?R??/?+^]????=??sZ?A???Yevyc93I?-??/??	?P|???Lj????????l#el????\??a*?y?????????B?Svc??????~bs??????????P?	?6~?i??e???3?s:k-a?????4?????!56?@7~?v?(FU?????	?q?	???dJ$??`??<???????P.4w?GA~??"??X??[??d????"????`t??V4k?F?=???4?:?fp?C`O?<?f0?????q?U?`e?K?I
|???"?????9?J??????N?(?Z?o??ER?r
?\D????P???^?u?B.'P.?{wAt3Q`"????1???????W??D_It?{Ei?0P?`?(?? ;}?l?`?^????
?UjV,?f??E??-?	????\??v?&0????????3@? ]??e??g????G?{????]?mB%7?Nf3%}s?U??[??
?(fG?)??m??\W?#~?`P??n?Cfo???>+??I??fY-??<}?{?(??G?Pp)???m?1?????)?????"??w?p????SW???q?
?!/W?^_?m?hZ??Yr?=z????C???y??\?2)???g?& '3??*??&l??HAd?N?????[?Nl?????0?????O?F2??}???pb?F>???????,??8??c38Ct?+?P?C???????^A???29??$???+?(
?<	?L?8o??<mV???e?-n???71?hUIQ??S?CQ[bgr?
P?B*^?a???i*?`jnt2?????X}4}b??
?IU??z??:???juR8????)?f????W??h???C??s?4??K?(?n?M?;G,??	?U?A??I$?od<?k??K????|????u?Q/?? ????	??Z?? 1????Y(????\N????????-;N?k?G9[J`?_?pE?f??<D???,?
`??.Rw??q?<?Yq???h???????8???DF3???j?:??s

kJT+q?u?Bb!??y*?5???K?`?H,;??E?s?J_`t??Y???2`??S?'a???CR~??2?wo??1??*?2?rgd$]0
???]??w@?h??ab????|o3i
C???????w?;f?|??\?UB????gwMA???5?<R?E?F?_?4g?f??^??	, ???8/??
?#??soF(??2????#?
r0.??W^????????A???????????/W???@Oo?q??q?????????7??@???????? ?s?
??iaF6"@O=???????T???????]>???#?_?
?]?3Is????q???F?
????????#?y<?G? q????S}?pw=?????:?????p0Q????uwS'?	?}????O??<6?=?G????????`B?WD{xO?????????/???aJr??????S'f????I~?i?rx7?%19|3??h	?/??WOw}?????a2@?"$"$??p?O??('?????I?h??GW|P;?????'D
???5P?
j??7????/=I?L??N??)??N?W?o??'???????????????TF?[>?px?%?O????v;??D?9?	???H?aF??>iq????'?
}??3???????`??Sb3Lnw????????dpI??-b?]????D%???0y?'???!?A????Y??T??~{?)?????qbk?Cwd?A??????k????;???{?@?h?i_3????
v?qA?5/7?j?(??mnJ????akE9??????v.?F??b??WH1???;???V?X 10\??`R??]
?b_>?7?|I??S?rj?Q???Q?$N?l????qx{???>?1??cAg0\?(23H
*!=??c?)??2L???T??L?{??L"?J+0	D}=?????F?:?}n7vNY?o{9L&(?????n????????q??^????~????TN?S?g???wX
i????E?s??n??$?????????LR?g???.???9q???kS4$0??????s&m?L??????B?6??y?????P?-?v????Yd???TgZ.rW?"???Q?8;:??E?V???7'?5???*pO??u?[7??b??l?BF????\?x.??b[o???mXH??Z?B
g??W"Th?????????(?????x???n?P?r?}I?????w????????B?U????PK
?d 
?`????(??#??(i???y?/J^??[?????Qf6uY??&?????l??<?v?E????????????????k??????m??&J???????59??????]Zd??u??D?????F??~5??Fi??K?9????#??hQ4??8?p0?c?2 ????>??<I????a?"?i?lS???? %??[?????dI}?O?i???ns???&qy?>???G?W?x?"?INL?E?0?\????}Dw?N???}???U,niM`?y??g??H&??A??O^?g}f??b?"??M?0???_??.????2_k?}QU)@????
zH?MwF?#?8K??YW at i????o??}T ?^}??S??z0 	,?J?
*????h?b????!?n??????!?[?<75D?o???<??????_????^?S???????<`?1?	????>??<?????????]_uaP?=???Y7T&?
??`?
?Pg
?M??!0?A[a?D??m?Ok??????T?????P??<or%%?
W?VUcs?Z1????w???,??t?pvEi8??[???@	?????z?P0?&?
?@?8?ZC?
?U3?????M?D?$?z?2????/;??h-???O?)W?Z!?8??W?,??,qV^mKc??y??2_AT????????1?7r??>?r???0%@EA?5???{?FA^?u??zt???&??
n?4?H?lKv
?
(t?>??x?M`+??6?T?t???C?CK??{?!??:?V????P??8???_?Q??B?ej?????q?%H?K????(??j??>??? ?@`(??3-??BiHJ???@?DV??3??y?
?vQ?G?`?>???A?y?a?!??X?5????TEw?4???/<(?%?u?%i???R?$T'w???3	????iQ?lX#?o????q??Bf=?Hp]????4R
????#?#?x???wQ?L?#?S@???AF?L]??????(Hx
??????0	'??p??'w^V?s e???zP?????\@?U6`H?m???z??;?f???Z???7??p??????}b??(
x@???CPev??<?\%??1$% I?R?O|?nX`Sse0fy? ?UF9??P/?l?}?f??FT?X?H??c??X????8Z?5w0??Za??w?= ???s(5o?8?
r5+??\Hx???{??3?O?V?#?u??4?IE?gDQ*6R??b??uL????????;e?????-???mtR<?@4?(?8???*@???Hr??n???nF?Vg??L???????(??&?}~???Xp??2?u?i?}???)g!R??B???R???B??.Z(?a;???^??kc?61???8=a-Fw????
?Z???~i?t?@&Y?-z?#3??{??)?????:'?1???W?+?????5?\k??m`?O??T?I???
05jp?w?K??DG?;??y?5Tj???Zcb?B
W?y\1????K|&?wa????%aOf??x#?#i???SZN~!?4S9!x?FRm??UA?R???nO?op&c????????5z?VJ?$
????C????x{ck&3???Ilcm6??????'??v??&??3??^??;?? ??4?i??_8?_hImm???0S?x?
???g?????L????#$??
??e????<<??-V?Qo??)????=f~?y??G?????X??N?s?$??J??
???q?_??????????i??~sM??"?1?Q?2l#??)?Q^???S4?ujxHs????'?c?o????u???S9$.SP?????,?}??'a?
b?5???3?e50$+?@T???}?<3h?|?m????8???b? s?$?v??'??v????l?08??5J%?
@?v`??Z???e??i?
??)??s?m]5?
??K}????#???=?d&4????$??E?q???
+\????M??????????,DR?,.?$????U??????gk?"?xU??S+?>n(`?
?y?F?P??%?Y?:??$??????|!{??I?=???mX*5??1*7j?-rP??8?
?ae???531%?HP?g?????p?^?2z,?,?1?,?bt4????m,Y??v????^Q????s5Y?4B??I?1m??????C????KRD????
G????G?????#?????KA?Gh???????v???H0+???h???W???????? ?@?	?r?? !?7??#????9~??
??#}???4??w{x
1|???A	Z?u?
?m??f
?"U6?(q?dT??`???K?a??????#????????5???P?eEC???X??w*??1]???-vN?M-??????m???l`??l??&s?x???3u??79'??f????Z?q?d`?3?????4R>??R?????+)?*???D?s?v???Y?:?M?sx8+"Q?0?????m??????n?hU??.???t?????????U??D?,????9????L????]?? bLi4?fl??i??Du?[??D?Iad?gHZ?!c??li?%3???4?=??U??G$?V?m??????????L9a?*1?`?M???????4q?m&G??:?n???>???t?,?_p??%G?>Q?????
?&~??K?-h?#??k???G??fp??XF?l???hq???3??%
?r
B??P?%KUS??~?H^???0?U??R?u??? kt???Le????kx\Y?m3j???0m?j#??as?/
??g?Q,0?tNU?????iq!?
????a?4?K?n=L0?Qu?????n???`??_~??????:??4??Q6??P?j??EcKZ{??'T?w?r?*???\:??s?~?????
??Q??:E?,(O?B??G?>K?.M(??'???`[?O????T_R?;???+e?_
p?Dg?????n'??>wP~:b&08??g???j/?U6}??u??`?NUx?/??????????u????q?W
??????q/? ??>?,??yMtU?`?Zq???e??ne???????:
Z??Ev?????sV?n?j???V??
yj
??????\{????*?u??U?s??% ??B???UE????/c,????
-????'?N????????Y?????K?5??-?b??f^
?'??{?%?Xj
CP??Q)|??s?YG?=?z?9	;?????AZ??????<t]x.??ni????ZV.|`?_?<S)>??8????c?~??p?-?I???Z??]?=4I??d????y?@z/^@?z5^\N????<?]G????p????u9?m4]???Q4^D???o?+?`5??7??3?? ?M??4:.?????p1^??}/??VKWN?GO????X??o???`???$s<?/?????j<??5?????x6?+??h
.?????_?G??ka??zt?\?#???#?:|?????2??????p?_?&?yt?????y4?M_???s?
?O?`?,>E??????????X
'c at v8??nGs?|3?^?.?v(?jA?E?g+??
<;\?`?????
=
@?2-?7yf?
?W?N??@?????>??'!?O5??B?y?T??{??}@T??
?m/]+/|?G?????m??S??d???8L?&e????UV?V??????
l[?X#CZ?T?I??\??(#?@3?6l??i\4W??-|&,
??vF????u?Pi? ^????<??pRd?)?
??B)b????O???L1?50i
?8?????? ??;???3e???k}?o;?
??q??(?F?5[D????O?c?????
??????a????1ARzq????x~??Y,1[ZP?d???3?'??gH?>?(???e)F?????|????
L???????%??j4???`f???????BiH?W?%
??|v?m???Q??~_?h??%	?d?I??|??X.??? Z? g?%???1??oy2?}r?<????????????I	??i????!+=h7??!????????
???1G??/s??
@n??^??k?????d8?V???W0{k?4?IX???????GA?}:????n??xRx??????F????????OI8
8W??wXX;??W?mp?????6?
?E??z?s???~@
J?6??????r$???o?1.=?{yc??eu0?M1(??N
??xh?(???????U??Yw#`q~??|d!??q??B??K??Ls/JK???>??D??N.??*???{!
????b{?~?x?{??UE??_T??????w???O??)?+S?
?=???????oo1??????PW????m??|??"K?n0??%v??????????q??m???????w???F???
n???q??P??++????????z??r{B?t?x??vJG?Fc??0G8?
?h??4??Z??A?<???~|=??????-??V???\??9???????eOd@????]4gR?!..??@???W?w?C??x??>?K|Q?*???F??G??????"?M}'?h??/?p????????@m??W??W????:???eX????Q?!??aEc???yW?7?G??$?(??d??!?^??
JM?I?D???
g?????4??p?"?%??gxl??@?????
????A???V,?pfK?)?>|]??A???F&Qr??'?????:??9?p;g"??????w??t?[a??>?@#>U???????wL??9~?Y??<?M???<? "G?O???]w?>???_?i?>???}(????$?x???
\a??a??q9????????,?
a>?6+"F??,?[??r????????????????????8?????}????????~?^??????}???V?J?????????????{?IB1?>?|????W"???????~?I0?"??}{?????_??`/?b??<g?W
;?k9?
o?????rC?k???SA??T(??q;?(?Xoe>??[?}??@??_
?=Rk?6f??ZH?0O??*i?Q?87????)i'wL????????m???(?g,????>?)?,$?mF???{*^?e8P???????E??9[?????"d??vS5&?s?}a?5
<?k+??gM??'?_?4????????)????+N??Q	?
??WW???cv^y$)??w??72?8's%`=?????	?
?[?n??$?tD
??:?#?????C????H9iU?Oq???t
K???X?_
<-
?7?mb?Sl=A?Q3?.M??.??e???;T??sp7?-:?ql???R?W??s
???k???A?+O??z???=2N??%j?yg?sg?0?6{l ??"?9?Bc?-??IY??]9Y?:\V?????p~?jjB??hJ???u??i?,{????^r???.]h at 8?:?}>??x	??E$?K
??9??g,????cS
??O??=?/?_?????JI???????F.mp??!?y?;*r?zuo:c????;A?qN?8???P?H??$0?E?#}D?????????]???Q????L??&+??*-?#W?X=??=???^[?????O??r?X+?h?,???9P???6q]&V&?-?
w?JU?k?>	|Z(.GW?6??@T?l"u???bv?#?,6?Qg@%r?/?t???JK?j?x?@?>6?3?zc??0*???v?#????h????lK????,h??#????[?'?:??5?4l9?B=????x?T?G+???Q?74?k,uZ???(??de????;k???,	?Di??????s	fvg?6q???d?
A^N?i
lfk+??WPs??????z???	????W????:?????V)G<?b??ZPa??4?>????I?=>??P?u"PshP!???*:L?9?????w?	/6???Za?;?\? ???f??j?	???	?%???4Y?'??`l
?????????W?>??????CA?H"?0?L??5@]r?v?s???R?$d???<0????q????0?tL@?7X3|??Y??Hisud"=??T?,???BS?1x??#?	bJ&??>;1?DqH?
? ?dm?6_?'??z???i?o}p|?b?s???%K?KY??
?S???X?
]_R?????^??#K}?qn2???hY?>?
1)?6s??Tl.~???)c7?-
?g^????????(1?`w??o?????p?m???????cv?v?Z?S
?-Ch?
k?,j^fl?\???Mt"?i6??X??Sl?-???????????u????f?!???????:%9x[??U?hm????>??:
;fs??m??????QdY
?
K??Nd?g?cZv?r?.lY???Y?>???T?Q??Pz?c???????E?D?i>?fz?FuYL???w??;PW?-????????n?m?y?A?^???o????&=uf???e?;??AM[? ??"g??0i`Y?,?	?)?	?8???I????fu'==M????i?Z.?A??g9cd?d&?EQ?%.?}.?'(?L?wS,
L`?T?	?????d_????v?>ri????f???z&?)???4??LN_SC+??,?????w?I?!
???%????????_c???.n??[#3??:??
J???|7S?/?K?x????g?'s???&YZ
?Q
???T????m>?e????NS??????mL??<kF???&M????zv???6?7c??Y?y7i??`K??r??_??
k?f??K?jl?I?$??c?RuM8?K??
g????70;r??R@??h?u4??M???<|????nn??L??????X(4?c?T?m?????0|????D???JI?6?Q?}??=w???g<T?Yv?#Q??j?=??f{??bM?8???o)????oK???Y??Bl????*?+R5'n??E0l?&}?M??${?????0?N??AR???`z?E5?V^`s?????%
??^?2Y2??Ts????????h]7???P??K?M*??r?3A,a???+n???:???-?"???!??N??????OR???7e??R<L?' ??[G??????t?:Aq??mlmbO???x??????-6???????G?#?
EbD?G?N???w??d???F#3???????#?O<x?????Q5{H?????C?Y?>?Y?	&{N??t????N?0]?I5?4?Fe7A????;?CIR?^H?=?F??+?!nlo??d?7
mQ????6?F?$[?I???|???????t?k?;???p?'???????M??G_?{.?ed?=
???}VcG????l`9?? u,????Mk?x?G???n?P?[M?oT??t?%?Y?K??:`?b?	??7N3?hK???.1??V????=?T????-?`.?`?c7?n?-????!(???d9?iUA??K??j?????}t^??Z^)?t??$Y(??Hy??I?2]?h?W ?4????
?3??&??T??d_?x?dAX?w??tw?? ?<???D????,??]
.?%; ???w? ???K??????@q:?n???LyI
?u?(?2??3???;a???*
c<?????Z??*~??????1??K9?????2???0?\^???K2??Y??&???	?I???e
}??/V?
]?pG???tStP??z~5????G^zy?2??-??$~?SM???????"?}??????1=t??????4!??I01-???m6??d?S?????	f?????T^?:?j?3???K?????d6M_???Ovb3o???v(??r??D`?*??\t????1x????"m?@u??t;?W??A?V?u?v?c/??}????A????
o????????????????;??Q?nK*?@,+?8/?x???P;?_??
??kw?\???u
=??27l;???h??????y)????
d?Ui????(k.?:????9'v??????????Rbmp_^??5Do??tA?f3?5????
?
??????f??V?f?]???T????${??e!?6?????Of?X????Cw?g??&???8?
??v	??@????gx?>?8?c,K3_?9NZE?]?\"???:C????X??|7?<?:????Q????<|????i?
??z?[??f?jS
4????U?X?=?KcY??7???_?:??
??j???O08?R????x_??F??jW
y\q??3*??????-Qf?
????????w,???\???-$<?q?O
??q#??
????3F??	??
?q;?!?????s??xY??b?e/???q???4>?{?gS'?F?/?/:
_???
???(SS2*?I1eA??GP??>?"=A??? F8?????T
|?~??????
?????U&??????r{(?}i???-??j?q/?????O??c?`[???Y+@??????	^Y}
???r????@???	K?=????=??`?7c;???Q?w??]U?8??B`URUp???'S?q???m???.???????;!?S????r?b?6!??8??????XF??1???G?Sr??[?G
???c???-?5f?5?pl?Fk?}{=`9j?T	??{?????-?'k???m???H?v????C?J?C?p??????L)x-?a?L?
'>E)????,???ks???Q?=??.??z???l??ru???.4y[?i??w??&???U8X?'?j?6?[??da?*??v??????8L?~??Sc???q????????7??'?
F?????v??$??w??6?7	t
P^????Qb?:
??K?O?&?v???????(???w
;?{T?cN???!?!?e??7i??AB????a{????u??r	?\r2P??cU??F?0y?~???q?3}???Y??-?????
???l??V????S????x;????5?o?V?&?\

?tg?y??B?)0{?k?????t?2x??5
?~
M??&K?a?k?IYOi????'L7???}?_???
XZ?Q?:~EAM??.????Q?kb?=?{;??c???????<???2?)???Z?.??f	????{???=??jT??R??*=?Oj??[?K?]???o???+<????*?FO??{??<?*SO?Z?????c?B=3?2?a#G?e?????B???J??@?qh*????.??+2?1~7N???R?~fE?l?W>X????<?c?d?S??|?T
.p??e?7>??-^??%?X????????s??G?=i???C???f??????#7g???c?j??<?????f!)?d:??`Q?????KJi???`R???`??_?:>???D?_??'Sg?8?1?"h???0?p????eJm??_?	??"??7????I<`?|i?[?3>a?x??C????????????3[???{?Y?v?/?E??A#???M?wh?^?;3?????
[?X???[F???,h}?<???Sr?'h?L?Gh]????q??
??*?z???#?{tj76[%??&?JZ
e:??v???ZO???d(???
]??????,??????f?@Q??e?

!??/???H??R????LM??%?	???]vyC?K??~??O?N?R^_?g"?5j
]c?p?<\S
?
_??
eY9?`?????XR??]v???{<?&T??@sJ0?#??????s?7???e???W?Lu???`,?? B???)?*?#+?.?OK???q??#-???K?Ms??`Gu=??J?<Q?L??s+)?5.E2m????,?p?d???&?9T??~???)?bZ2???fa??I???w?'8?+}|??????jfk??2[
??????,?J??q?L?R?:?Bp???v??,GcgxG?do?/<
5-8,
??~?>???$x??|?S?????MT???9?p??ZJt??!??x?????^????ks?/<
????,f3%????~?e<9??]?\?Dl?h??k?v%{???/?? >????E[U?*???=?b{J??y#0?P?F`??k??2??[?L=3????S#?????_?6J
?K?FM?
a??b0
?Q0;?????????5?
q?
??u?)?????*??23{?AH?S=2z???d?3?	???u????`???&-?v=??S?@?r?a]?k=
3?????'??z???^`o"[Y?3??????h????FP5?????mV?v???	?u~c]?i?#v1??McS??k????r?7?a??k?c?Im?9.??
Wx+???????D??_?'??, at T????
????Eyl98???????"??"???y\????C}???7?&(.??N???S?G3?9?tj@??+?y??F??????????V`Q?????))??d?mp?;?4?aA(??r)??p?'CSRNi???!?Ia??cc???EAn??J_?Z{??????N?h??V?????
?G?c'?7YNg?l????C??R4?1?&m7??????????V??	r$?????
???=r?? y? ?n??[?>????_A?d?!??7????????O????^??<?"~???p???/0?{JAh??Fq??z?`0We??,Gr
?TZ%[x?`??a??!"???t?+?FD????p???C?@X?8??@
?
N?%
i?Q??K?????]t?>^?OZR??"Q Eh5?(???zw
+t??]???:0?E?&?E???;?W????/m?~??0-???_X?????nB?0j?W??
xE4?S??a??~???k)?
??-???3?(M=v???%4????}?l???D??C?????<???????
Z? ?U?;?M????w??
?/\??'?F?_R???)??????'v?f????xa;A?5?A????????#?p??(?m????*|??$??h?_v?????'?|???J?????eE?\???b?0????a??eq1Eg`?q?%???R??iA+?]?????e???HlGx"??????T?!C???
?eh3P??!2E?[?{???}?L??6??
?;????????wd?M
?9?=??f*5_?r=???|??8???-???T??O9?????,??Y??S&??P*?m???W???'(<
A@?4???L???2g??k[NEt#?/Q???3?$~#5??????g??0??I%??JY?????f?????CQ&?h?U??4?_??8??>???
ki???>e\??Y '!?1??l?"/??1??mt??MqPM? ?!?\???U??0???g2????KG?#r?2??;?
??,??R??^1??S+??o?\n???&??+?p?7v"L??MZ~0?#P|????hkS?A>????tj???7????????????J?})?Y?_?U?HY??
j??I?????r?????)x?`??????ll?{???o?????R???I?6??H`
?
B!?I?b????(?#2<?K??????;??v\@\?1
??]?>??5?K`??c g?`?8???G???2?x???????_?n???
E?+??[???2?7b??*T3S?W?q??'??a?&??o???????sv?x????/????Y%?x0p?8??H?V?$?r???Z???F??%^??w???o`sU3w?gZzA????x%CHZ\?i????W=9?????/?f*??Y+???)???aMq-
E??u???X????RX???@qaa8 ??v?_l???:?J3????????+?d?s0??	??h?}???????'G4?????lgM6<??2}?+?.??*}?X(;f??:8?%N?N??{??N?7u??[??????^KCEX4??nD?c???e??a?;?2??nE?w?????_?i??fH?ij?a????????VG?| ???DU???????1??1?_>p??????#?????e??Iz??B?????_d>???(????2???????s?????Y?j???@????$L0?
??}?XY?/??gI?y T?7???%!??]L???&????n?%?}??>~?V6?j?;KY???
R?Rj????M&?p???-k??g??a'??-mvz?m???
??ovGl????@?????????U?otb???
?o??|?f?&?O
?D at E??T?-????*4??????]
??0?1?????OP???????a?A?|>????~???x"???K?E?^?Od+?~?1kua????`?(M????8?{???
|??
??W?t>???\i?D??????s???U?????c?s???eot?T???

?????J?.
Q??????L?CK?u?&??'h)???O??W9=????d??25??\?o?
;?{?}i???????.3??G
>?;??i??\???C???0t?
w?\??4??l=??>"?c???}+???K??<?N?????sb
??K????
#?q????I]
??y??
???????-?6??????3EA?T?(?5?/????(ZH8?#s+?????fl????u??2??{?F?g?Q???????3?&P%??d????"???h?[?~?y??~K????-?}j?[???g?O
D?T????#.???????GW???.?(??/?E!y?@??l??????=`)???????B+??????x????????f?e:?#8Ec??%??	?e?K?I????<.q?M]\Y?????>??'C?????
???B?_?"A?n,0??J????ob?4?????j?????a?%.E??azp??????w??}?d???0]$?xs??g/?Z?r>?p??=?/|??{@?r?cI7J?.??z|c????P??o3?E?x?Q??'?-`u???k???9?r?`?7?z??{?+{V?{???'?z????u?a???P?{
?f??
?y?Q??????	????-???j?H?&?
??m
?c????????J??
>?????????$????G??4\???/?2??y??w?<?-x?v[??K-}????????x<'A??E0Q???g^????@??????]h??Zz??????]?-?<-? ?????????f????????.?78??????-(W
????~?AUb????*????????mL?????????V?D?N???:5??A?)/
?[B}???f??F?w|?GpW??r!???"???`???T??<????V??>/?>?({]???'?w??M????s??????#?P?r&=?0????h4]R8?[?9??/?
???S?6??k?B?P?%?u=K??????5??f??{??@r???&??`Y???o??d?f?????P?25.?w??>????q$b|?OV??
8S+9????:?!j???
????~4aJ
&???(Wq[
??B2Bn???T???????R???`,?%Q?8?60'[???(r?0???????sb?9?{N?(????????Xv]????O????3
"{??c?3'?s?N??*??????OT??tdOA??	D?S^??C????R?<??????AHTQ?l?`?"?S?,Ue\&?*'???9???l????/??|?W?	A?C??h??????|?m?1$?")????V?????@=???{???	?QJ^>?q6Z??92Usb?d*	Tb1?f????+???b6??3???????%jb???
N?5???8?V???*?O?:??>q?w?q???H	??S??????;So??u?"4???+?i2??J?????dA????????e????G?E???T????????$?.???Bu}???C???b???r_???4S~??C?6s_???&E??f?>?>???)?S??v????)n4?n???l7?f]???{B? AN?q,
m???e?????<????=???}????JO???????i6???H5?)9?+w?k?M}?2?V?5lu?sR?T_N???????	?>j25?_&????????A?5?e?????}??|?2?d?b?JQ_)?E
??E0???????B??d?X6??&r??]????T??kX?sV~?y???=?CO??H??ip?7?L??%????1???8m?k
H?? ?)T?K?A?z??t|??j???n??ed=??ItJp???P?`C????-qS?8????H???r?c-Tqb???&???J??	?iYyU??z?,ny2L?|(??m9[??????
???%???&?????{??!?
?*m*?v???a?????8????w???)?y>l?????l?-??`?<G?8)??r???^\??}?Q??X?zW?2?r???e????????#GA:j???f_?;?????u???????@?W???gr??R??p???(^?T???y@???N??{????
???Ej???(???z????zY~??????????q??o????qJP??X?l???N?y?N??O)???[?	6?Te'N????2g?\T?? 	?
_?????*db??????????8a???A`c?}?F????|B??7???!??.????
???e:???8W?2?p?2??'-?|qW?(G?PM?y??i?}??S?-$s?????,????y???ft:??6??:???@?G?S?E?Q?????X??L?`???????M*???
??&3.?W??k%o?O?????D&?C?1tJ??qnS]??7&????Mn{!?m?E??Zpq??"??Ik(??xX??;Y??/?J???\??????B?c
??[?U???~ ???8~???s(?????@????'?I?Tx?u??:>Q?+??h?IX??=??sW?	p?;4?t
<R\???????F?W???HM??7?]a?@??WzsCD??/?&????D?V??O??R$<??Y??`	,??l"?????
X???%?P_??4S??A??9???-?9?????O???]???]???E???qZ?1?1???*8?}AQ????????ci	M?d?x?????f?6?-3???Q?}??KT:Z??)????D?K?!??w??e?<
??(?y???W?M_YW~???e9:?????Oc&cn?G1!??_????i??k?f???????b#???)??
f%???3
f??{yf?
???F???!>] ??`??0
?
??7????0?3??lJ?l??h????"????x(?04M?Ep8?
???????g?m?(A?k???Tv_$??q%??????????b?*?J??Q?*?OS~c$3??8&???FC,????p????}?7>\?C?d??df=?'?3????$?N?s???rY?Y????~???5??5%*$d[F?%}w????.???*??.&?&
1Wy>????
?*?s?d??+????U}??4K??U?v???3???B?u??1#?)?`]
?????%??2k????_14?????ZD??X
??<???q8PU?/?????????<c????Y?????Y??G^??t????J?]W9G???=x?;???#?)(?p?.?G?hQg??.c??U?d??Ftd?j?;???=???????K?O?/??u?c,u???]?/z{???AG`???p?I???g?4?9??5z??`?
??G?E`?8?m
g/?
?f???m?bXq?"{??R?@y??[???N????v?3Y?lJ????	?G?Ga?@?y]????*?*|Q??3%F?????=?z?ZE(:?@??-5i}(?????????b)?c?aw?sf?O'?}?H??kj?P{XG[??
X????6??B?~??&pu?}?^???G?D\s????Zz?5M?4?=?,????k@??)HlM\?A?k[CT3??5?#?a*?:????????Wg??djO?T?'????G?????7???e??9?????(?k??X????T??{???
(?'}?NO?^??n??~?PZv???!??Zw!??]??d?c|??a?????6?5??N???1?
agEH??%?.?	????<?T?;n??????v?.i??C??:Q??}???	?+???
??????]gG???1P?4)???09????P?Q?>?:??ea??M`?n?????rR???????/ k5???
|?`?????!?(?j??]0?
?z5
???O}_XR?=n?3;??+?\?N2~|b??y???HQ2?8u???P>m???XV1
??>??????]4????2??8?jE??"??G????5V.??	X??m?<???q???x??ZM87???T!Z?B
U?*?|?
,'3Z??????`*`???????e?????_?7?<???8?2J????9??]?7?hRX?}?????Tag24z?0[]?0?v??X&?E??{?D?q??0??y???S
;1
4?^t?J?s?tu<?l??
/~?-8?$|??2a6T
?/?6?3?L??? ????????8?h2???q???~????f?2/W?????????V
?^P????m?0?=?? ????M:
??????

(Gl?8H??&s?P????_	?c?^?x?R????Z??[+????j??,?????%^'<+?????_?.?=4C??Y????f?]I[I?\ns?J???SVo???7?VX??t?l[|?wMV0????y1L??#uN?5??]??K)????S]
??.?Ko???@?d?qe at mU]??|?w
? ?
"?*
??8?a??????;??H_RU(??y?h@?+ at a2?E?;Y??;Y?&j???6???????c?rz/????{??????J? ^?3M??HY???/?r?3>???e(??,?{??k?c?av?????4??X7????7??&???S?????=o}?j0"??:	s?z*???+??W=??(a???^=??{?cNL<z/?	_?S?
???E?G?L???;?2a??`????l
O	?C??b???;P??(??????i?Z^?y?x}+Tx?????+n?#v?(???&?/???
??
?z?J???3?????'???J??L!?
G???n?`???
FqU???0!f???Lc?`m?xyI at U?oM+?w?m????C???????(*?6Ik?;?T?Wv?(????O?1?LMd?cMt???<??2?b?`??????+?9r7*^pTlrf?????>?`qI@???S????d?????????5?3??
X??T9??Rf?x?ha`?f"2
9??W4????]c?/:???l?C?????????????????B????w?l???9a???????O?? n?Ng?`,f\?3\T??????<????4|??????"M??u????3?Q??=?X????X}Ix+
?\|???x?c?T?q?n???V??^:-}?f????????d?5/?cAQy??{0H3v???+2??]7????5^G??u???X#8?}??0^X+??i??k:???<%{+?ps??v#??????dMg?Pi???H?)?(`?M
?9??<R?hc~?s+????
p?5q???\w??????}????TV???^V?d?O?2??\v???~???w{??7K?k?
???[7,h??>A???????+g????M?\O5
k
T?????H^G?w??????dI{?]???*=??p?D??a&7????jF??5??fL?LPTP?*??*???=%
#W??q4Oz?+?g_q?j??1?5??q`???
jEDyz?ua
?F??2>??|???????f/????????n???T
O??????????@?p?PS?QVM??????q<?????????^=^v??D??g?sY?T?X?7+?`5???,8?Al?h?Z?"F9???? ??d?a6p??????6?_XU#K? ?	u??k????d?? |x?Xl?P? ?w?????t??elNmc?????j???x?o??QZ???M???M?????)??M??qca???HV|??	?Bj?Q|????)p??L??R?q???r??????
???
`sX%?PW????j.? ???s..???Y??????z????e???n??
????U?Y???8?????????????P?8???????????6??j??A??'????HK????? ?n????b??$j?U???-si??0>!j?Yb*y??%U?Ei??%`??0e?????????V?%\????5
8f:???S
{?f???6|???M?hx?t\?sn?2?W??s??na??}?P????????v=?{R?8?r???w?TX?????P;wA???-kM?`???K??G???)	SU??do=?Z??u???;J??Mn}???4??N?????????#??C
P???3cY?uB???un??NV;????Y9???????u??????.?
?e/V?D.???@??M~wi??
:??B	h???????W?	?g???1????(????u?????hu\?????5?l`??P_??A??kex5?????????X_??}.|??6????[?b?d?G`?v7???'???c"j??jV??(?$h?d\??i??=?!&e?U8~???H?e?$x??bi;??^?d!?n"?????????$?|???L????r?k?????%;?b???k(??0	~???A?DjG???k??????gX????s??????&????b?x??X[!2???a?????Pn???g??O'=?????L?5Z^!????G?(?	h?u???:???$???F?????o??,	
k?&?E???????"?"????
??
?????-k6??qk??m?<????3?????????????4???<m????l?X??YCi61}????QB^??Y??????@[V?V?O?:$??C?v`??????Mw\?vS:?-??2?D?eH.??Bg???????u
??8ea?P??Ul????`????????U????^?B????O<????Y?g???P?'_5Zi}?????:O????????^??>?2????n?X|???]3P???&?%???E{??k??????b??K??
?=f<?7??@6Q???9^!???hER?=?`z???Sil9+?R?'?=?{+??DK???p???n??B?{.?=g??h?	?_?AT?????6N=?*}?(??w?o?O??lwI?`?????	O{S?kN`?	?#c_3??L?,8??:??????.6/???{A??aH@??`?p????
??\2?p
?Y
?tkL???D*,?c&?????K?B??Z??Xp??&Y?d?T???<??????:???;?P?	??N$??????h??Z'???6?!?}??>??j?????z'cK???8dw??;;wq?v??.|?kh?V??ZF?+?$?}I?????H????S?????R?ab???,K????d??T?+?D???)?????Q?X?R0?!??M???Qx?aZ0NZ?'Yh?$???????f???Iv9?V????????l??bm?%|???X^j9??k?PJ?+???49?? i????%?6i?6???????;
u&T?[s_pw?U???W??Z???C?u????	????????}C?F??8???????E?s@???#????????Ix?q?}?@??????6OwI|????"?B
??abS???
>?VP??<??/uY???????
R?M?!??fy???MK?
*?:r??R?4?,*>Bc ?Dk?[f???]??Pzn???F???*????
?
?,?P`???mil;/E??(?mYt]Y??
?F?J?Jl?^h?`?zC
??5#;?xw?]wcSw????????cY??????????R??y????,??5?l??J0{?????y?c????Ug????P"fp33?^&?????T?{?%?c??;f(?W?NYkr????? ??]?_(M?f9?D???????M??gF.?]???Q?.????MRa????J??2??????(?#?%??9?>???Y?????K??9????l?n'??Z1?????*C?g??'T????????1?
???m????t?-????'?@?8%^<?:B??3???a7???X%?D????f?U?(????5c??{??
??q8>??????[?@Ul?????)???<??5o??X????sO???T??-???K>??SZM??!??b`??G>Cu???[?
??????N???;#????????
???|&?~k??x?J|???l
x?{???.?f?5???S???m????r???59	??OQ.xV ?u?R
>?????J????Y~????e?????RT??>a?.N?h7
5???b)?.???4??k?t???kh????j+O?Ll?
X!t?4P???3??]????!?b?????????y???????-???t?pK???
S?[6?????`;]?*)?Gg?
????.???.?????e6??}???s?Z???y#?????Yjne	p+?5V??[????(??K<??@h?H?X??]v?????4??????.?
?v?`E!?????,???????Vn`}??{?N7?????Ozl???????O?@%j????6RN??^??q???J'?G??q?????mF???1-S????q????	??w(?*
??%?
P??Y?n0}?????A???Psn$u2?m<??E??I?9???
??Sb=R?B?(u$??V#?F??q7?M???????o?'???]?yA??
[?n??????bo<?????\??p
?:W?bnm(???{?N

??T?-ahIuHb?%?a ??{??*?Xv???+??H?*EgV?:c????v??i??\??-\u]p???8??G;`_?}?rs??f??)?????y????b????
??f!kK
?E
?7????tL?????-x??@s?KX?m???vx???>M?z???69??????9k?/?R?78+#xc?????????????
???]^?2;??Q?u2??l?;f_???YW?@7+?%?}??????r-8???R??)m?Z?K??V??mB?!
2c?d5Rs???B?D)?t??}
fX`/1?%?.???.??L^T??E???4l8?4j6*?=~??? &?o??key2????U??f/??}??????*?|_??t??D?U%???Y??*+??8A??8?-??]??&;????C????;???????/B[Z?'?b??#???*?o????E?
?F
J???C???J<ReX{?`??G-M?]"<?	???c)^$j??^???,??
??????cl??3ko,???.?m}?@?r_;????Z2AQ_?Z? ?
????6|x>Q??????????U?T?????8???8)?x#e????T??x P?lW
?a??A??
?D?<?h??E?2??$)?N_3?2?'Lx?oa]?I?5,i{??iYl{q????>?w1%i???6|x??x<9c?>?bX??????,?t6?
f?R??@}?2C/?3??9?]?P??h6??	!???
?3o*?????pz??????.?Y?LQO????>a????Nj?b9???????0???i?2)?||]??boX?s7o?sn?s?P??'N????1z???96??????"??]SW??)??T??0????SV???R?
???
????1?G???X?9m??c|?9?D??#???L???????????[???????-????8?}?wH1	?+?Gf;|?[c?!/????i?????-Y?}?l
6x9B?Tc?W?o?S??	s@.N?
?b?f
?????n???,?6?????Jle?Jv?lW?`./?????`??????
?Rg???a??E?;?}??=?q?-G0@??N??{?H)???q?????
??= ?????$?c??e?G.{}??L1`??p~zr?zW?Q?p??0??2?vY
nik?%b?:`???????`N?>m????d??0?)B?t?????a*?|???.6?lmR"?"(????bw?.??????Kw???9?1Pkr_K?
?1L?Q%??N~??-?b?u?!u?a?????D??1?????`G
????]???k?????&???8?$?<??k????M??P??><??<??t
l?!qfO2{MN??^O0?|?L5???? ?A0??l???r)_$!M
??w???EmTqI?v?*?)??_?x???|??????M??l?^g?T?N?

??,4t?vO??9x??????:k??-b&m:
nA???J?p??'???k?MG?9?f?nL?
#f"??qC%#'(?
?=?-4???@?=\!??]\Gsn???e?c????I?C{?n???
?????.???T?MY-\??I???x?z??-????J<????Z?????zN??F??"?-????V?
0s??-=?T?????u?X?!5???1TP????	Y?)?5r?u+??d
k??q?;FY1?p???'r?s<??$y?????M???????0]?%PT:???jr????w8?pg???N9????/`??q??.6s	?
?????%G-<#???'Qx???Z?U?K????Y	?u??g??	8???7m??4*??o?v
???@???????f?M??-I??\Sm????!/2??????????C??7?ql????????\?NC~????????(~?5m?	^??Z????b?>???lz??????7NV???G?j?E*T?B.????.?H!?K-^?\v????
d???r?Aa?s5??&??$?????????N?w?/???E?a???6?X??????h|?`??_?0??p????]hZ?M??Cj????+?N?
?`???K??1?bX???\?\<g?d??????eO ??R?
1????l??*w?p??????????7`?????V???sNP>;???Q????`'??????????B????
(=????[[X???S???,x?5???N0??Q???g=?Ig?w??%?O????z=???ik?UG4???}N???'??????G?F??t?V???k?jZ-?;Ob?&P(
??:?E?w?#???[q???G
Zt??2??J????jlT??wp?p?Yc?A??'k;k?5{?Y???;?+?Hm?????<(?g??g?zC|du???
?	=?$t?F
K?~???w?7}
?c?;???Ag??9??V?rN???????
?X?1??????ES??a
;w?$????
AxO??????1 3
05O.??????~?B?|?p?	?2?Z?)L?C??
??e{^????2O??p?? ?J$?8??	?5g???S;?1?7??rt???:b????h?g?????????6K?1??!??y\7?WOGa?b~?d ?GV$???3j?v?,??nU???>v?9.R???? ??	(?,]
?V??l?av?a<dL???????????
?Q?Gk89????a???wsbA??6?VFy)e?B6?=#??o?h3[?????A
)?Z???p??X7??
??buX??es???
*?\?`??)?
?
z?????H, at Y?????????+???h?s?{?V=?k????X)??g}?e?*DXN)8F
??]??????????????	??e? ??=????	?.?n<?`%??W???? &v????????LB?7<?
??L?H2???????	?Yp{??/?=??7\?????UGs???[??E6uf??,?????o?24?2n-???;????L?\:????G??O??U]?rK??????????t4A??a<??Z????.r??&?o?G<?d??4p?6~???&c???u???=?{?<jy"{?????W?????=?H?O?fJD,?vt??=^?5?n?s??j9EyO???
=??b?X?Mq9??U?%?????]\Kq?????v??D???;YI?dhT:????v4???s??k??nx??@?????l???r?)?-I<???t?'????F?V z????&?C?0??????{D???|L?H?Q??z?	`??????a-????????r???6??U2c,????l"?5
?W??
vf*"???6?y ??%?\A?8????@5K?;?????.??J?????5,r???<J??r????\????????? ,?/??!?W??0?#L????t"?A??????S??]F??Q??em/}??k???`?<hG??????h??7?3??k ?????`?????????9?V??z@??f?NY????<?|yu?fM??{X?n??dw?d5?)?.?c>j?]#???5y~?????bw!????a???&#???q>p???A?v?M'&~43
7?F?
?{l? ????s?.{????MbzV????A??@????jo?4
/??.??Y?_?jt????[?{?8???p]R?????11{???;?=N0?(?
???j?p?p
??%???:?_pw8q??'???0?k?v???[?C???
??;
d???K4?~b@?:????\????"??N??
???
??_LG????n(?=?*a???g?5?Qs?r?fo?????>pT??2?????>:(?????|??G?5o,?
)????e*?o?	~sTJ??DhV??????????3(3Y?:??*?k?z%?>?.?fc*???*Q-??C~??6?X(?Q&h^;???=6??s-?waW?"?W?B

??t?P?D??Z?T?C?L??L?I?O?????1A??%	p????????)WT???????/{s`?%????m?2K?q?T?????D
?M?,?	P>k[??l?y?A????oz?O??RZ?D'??/?B????`???Y???q-?#???7P/???xG?????
zj?	??s???
?POH?
?t??wA?M???`?p??{?a*?j???W?	??I?|T3aT??gvECa?I$?????
j???<?K??^??????j}?B?
/?T?|??Fi???U????!vL???S??e??'??`U
K?k???!E?+?????????????}	?)a???gl??HJy`l?0L????2U??A??~OfRaoi??{?
4?'?????N
ek[?Y????2??
????c?i?{??4v(e-??"?
?&?QMze??TM
K?????????S????
((Jz?x%??q2s????Y??	R8??|?W?R\?G?$???????
?????R=w?????Ry?T/?'e????9?&?z??f?nF[?w?;?Q???`?pc???w:?????t?+??V??Uv????f???i2??
I?*?]?:?%Vf????????????~R{?^(u?W????<p?????????6Ed?r]?W)1}4*9+???!?LQ?6RX?????M??????T??????
V???l?D??+Qg???O??}?J>?!?????Y,)?ej_?l_???TS?P?d???='?&???????2???R???eC8?d$7?????r-??P4m_UK?ZN??'s???u*?6??S??-K??l??~Pjj}??xE??????2=?VB?4?9????@??@?'?'??N64?K???%?L~c3k???T?ww?-?O?K???W[+???L{?yzH??~?1`b4??,	???D]??]r^/?%O?.??
K?RR?oDYgbJ??Lk??V?g?????>]z????G??<?I*?e?5f?uVt????K?w??G?
e?@?_?????(u?3c?IL????u?.?????
?P????1?:?d??Cf=]?x??????????:c?bP?H1	??|JT|?.>9??M<=???dWz??#S{[?O??9wp=??3`?6O+??O????:E?????? :.??Q???m?x>?0?????]i?f??????D???tw?p?0g?W|??
O??:e
??YST??=O8?$???w	?	b*?????)???
0????B?
W	O?o#?/??-??1?!??MU????<w?Y?Y?${?$sYR5yT??71?0i??,???X?????.
??&8w?%Q??^q??5?c*V?N??(?	L?;l??????=?=?o?
_?I??,G:?`
??a.P?
u)f???????W?$S.9?mE?eu????????ysUO?M???*???^S??D]!?X?Ua??[?+5Vas??#?vR??=???3?*UO??P
??t?X????o<??'?Lm*;XiM??W?=~?x??w??"??a????q4;?^?m??g?=&??uc???]???y`t	]Q{?s???D?n??F????TE=??:?[??P?1
#6?>?Sc{???v>??r???`oef?M?\??*???P???????@?d~?>4?1??p????t?>??R?.??3?&?v?,VV??Xe?cf
??J????????0????]?;
??F,r????See??9Z??>Y?*9 Y??mb%?l??
2?~e?&?w?UJ???wg6??SA?i?U?7ax?	W3?A???AQ?? ?lap?qt??:??q?So
?=??P?+?j%jEFEz? *????/???E?U?

L:????i??0????f??Z???????
?D??0+?`???](???0?Ap@??????]~??:"?B`
????W"jT??S??x?nM?h?f????-]?S?
?C?????q?:?????O??2????P'????8?e?[Y?d??@?a?a???<???????0??z??o????7??
[=?v??\??????????lQm?w??z????uao?2?	6?OG?H?C{j&?Y%??-?nd?!?3??MtP:]%?Z{??3?!????L?f%5??R@go?.??????K??q?y?Z	?????z??]?~??0}?sg?Q????H?)M
?.&g.??e
L?,???X)???l??t?xJ?R???????w?u?????_?5??????	??=%?????????x?`*V&??5~u?%?RV??"v*6???35????H?4Cr???&?"M1$?LIG
?9>?^*?ap??8?uR3????{?No???@???`?????9??$[%????????$>? 8q??z/YH`??P?C??z??????]??T[??????2Y?Vj$L???	?Y&?
j?7????4??l??
394????}?^?m+???2w?YT??a??>??<[?T?:???
'P????yz?^?,p?????,?1?Ym
?:<?:???Xtu{*(S?.?G???T?k???9?[??4e??l?k?x?JT?k2?\?k?{???%?`S???peC?7?
?????????
M34
?[}
?2S?S??????=a?????BF5???A5?c2?t4?x>1???7?:?[Gv?oh????????e?X?d4???ck????|?????9??!/?N????
????!??????2X????%?)[???>6D?????;Vq?a????K<?H5*??G\??????"??+???????LZ\??P)1%?ba)????????>???C?CV?e???u`??%Q???'?*Hl?s?{?'A???v:?3???2?%L?????r0??E????4o~????I??%%?????+????@KY???s'?,S?A?d?(
BUBx?????????p
#?A?1p??Gb2e??>??2??b???RpQ??L??J?????$hJv??i?F?!
?(]<p??%?I???jkj#'??????f??/?y
c?????
?-?*??r????'?????q*??b??`??'v?&c/OuL???W???O?Z8?f???????Ly?
?	?yrp??
$C??y?(AJ?????
?m?+??
aV??NT?1?K?w??#(lm`c????????S??X????2?FtTb?&??&?`???P
?????+?l$P?K?P?Ip?*U???\????v?o??,???8??????J&?????Y]?????6????	??MRNI?'??8X?T??
?eRVM???]?}?d??S?9?&???5f???d??????G??8?????E
w???????"??\3?T?$?.S)????d???
>????O%;?*lA??,????e??lm?????/?~(?????j?????
??HuU??l????b?/
2?#??_??-???Im)G?yE??$??d?p??e??;??={?????!????????
?b?X)?|??.?Z??>9M?????	??????4???'??ncW~?F?
fd
	T???? 2f?]?????|????[??y?V??Nf?F??y?3nHS???e??x??0??@`s???3
???@?eS???8G_y$???l6??m??O?C?0F?O???v???z??-\???,???7???>C(??X7Y|1??
S?gj????4?R	?LO?0[?????K??*??\U?xB??d?'7?4E6???}???????ul????9$?H?+???N?)UZLMK??????p????m?fGY???R????%?=?u"?/2????P???x??
z????X??sv?d7??j#?.??????]"?A8avf???j@???dg??o8?
?2?5?3F?Z??? E-?FN?KWm?}?afV?k]SY?36?5Z@?m?Zd?2<?-?[??6x?Z?^?B??R??#4??????s0??????fz?jw?i??2??? x
`??VIPB??(?e,S?????????14{%????F?????Y??.?'5W??????????K????p??\?`??5?h
?????2o?5??hh???HvKA`?
?-M4{?s????li ??_???}?DLm??????P?^?F??b??4^??WD?>b?p????2

|?x @>o??Q???H????y???	????M????
?m??i?w?-??/?<P??????????nSG	
?Q?K3y???????i3|???d?1??&z[???h??I??????ES_R???Y???	??hU??????l???QMu?????l'x??K?w??>??pH?Tx8?e???w?s?H?&S??f,_??!??{wq??u???uoo?~bj^~*?5Q????Ao|??????q6b)???1?(?<$:??M?MI????6y?a???F}?p??B?-?c
???9
k??D?5????R????? x??g?f???<P??1?:F?????'???-'?????.?????y??{?>??}
?<?Vdd???-32?[+r?#???!?'??~???2?I!??%{??$?Cb??$?kj??????R?"?_???-L:?$
-??\$???Rf?E????c??M????m?n????*i
??a+???;Pk??P??????/+???
b?G?Qf>-x?*???l??s??
6?? T?p?????~?B'h???????????EH?6?;???K4l?
v?:Dq?
?=????q?w??#??I]?~?,
?mI/8a??d?!L????
??/??!
*nN? M?^i ?Po?WL?m??????-??J?M(?"??U?xI????a?rl??Bq?lI]R??S??+?????.	?`?1?}?xJu	?"??x?+?b??*?N?#?]?jHvRfs?M?F?5a??
?e???????????k????F?
?-ty?????J???{?Rq????Y=v?r?????R=?L?W&v???8??C?1?m?O	?T???#?Z???o????=%?:?M???U??,???&?:?K????W??????}?G??'?sG????????;p7??%?
?" ??:E'/?`7???$??r???s??->'?#bz????LI??%???2??!?P?H??0i?9?9??9???3d??-?9?$?~?+,&t-{p????c???%???W??????~?@-??}!{????p???q???j ?M6+?~KX?+?Y??Z????	????s? x??v(??\
??#?r????;?>???D??x??X??d???5?????????????{x???? ?v?-'V?l?4??2?9b?~Wk?>????^??cI??d??/?????_??&?	2?:?-?b?Yk???????O????l*???M$?gi?(???N??f?~???=?????G?$????a???_&.??:-HER??(E?[UP?????? %?~?7?T?D??
???????M??.??? 6?;"???3f???,??;?Ej4??[??????|*?????U)??<?y?2E?Rv}?????[<?v??T"o6(??*?j?u??R????R???g?f?8L	?O?}???y?tQoO??x?K??GQq`ss???%QQ?V?3c3?M?4?dl?.H??h???X??RW??d??qM_????
?<??k2?/?[?j???'????	Y????Su?p?????/|?/?/8??"?%0??.)S?5??C
??Q&??U????m?????|5???]|??W???9??]??????????N@??q:??$x;??g ?e?.???J'4DPa??.??@4&m;\Ur???#?(6?i+?L??:qxm?!???`i??J5??	
/R	????P??c?#????v???F?S??x(?[?<???@?J?L'??D?(?+1??By+Sp*0??P????
?*:r|CX??N1LV?@???l???????r!?@O????NTO
??6r.?VB9??d???d???)??@@l>f???G??1c??/?R??K????O?
??@???R?lF?????U??7?? ? LpIgh? ??
??,???c??Xm??R??
????y5?_U?Y?;$6]rA?Z??5F??E??zn????.???"?rr?{f??a???D???q???'?g?%?????a_
^&??rCqV
?EJ??r??????t\????X_??O
&??M??-[!?B?&?Y???l?P[V??A?kK?????7^?LWjY?N?Z?Rp2???YY0??YN?K_sS?$?q??U,??qu?S_?????a?cy??-XIfX??6?Z[|?A???3Q?YV???6R?c"n?Y?(?)?sQ.1??@???J%???
{??????W?&?=??=??u???????????$?O?4?%~????G?s???q?"@V?0i???&??=???`?:??????~I?m2>??c?9??v?9???QMG`V?Sbk.?E1s?e?\D??
???G?{?+0
??)A???!?yU5?{%?r?V*?=eqBq????tAg;??????L???4??"????????8^t]HvX???5?R?K"x?IK??????????M?G>??8&E???=?G??l
????*b??????/u?G?-??^~?G??B?????86?K}M??S:??M?G????1?_"?G??2???q\2
??GL?H?=
??\?,`??#H?\l??I???F?qP?M*???EV??h?X???o?7??*??Q?G??m??B???z?????#oe;??m?\??!?4j?(??
=??^???????&?#"~F:??[?????hC???X2X?0?
?*?????o1_
??8?,:f?THo??'\?=ej?????w{F?T?r????B'
?n?K??????]??=??'??8:JvKo?g???i????v???8`
??:x?1*??7V???gh?04X?e!5?a??
??d???????k?????c%8O??-
f?}pT0?V?#?????????E>gv??"c?????.N??fT'??`?Th?3???????'g
Q???????g???
4?=KB!???+SJ{?(
??????t?
?6???,???[)mV?r????4?#
??;???n??m??&\??2?^2?i?S=a??{
??j
8I?i*
6N?????Q???J~???,????Ms?n?nY9?9???&Fl<?t4M at j? ???@?.Z???Z???|???.??M@??>?>^???%????%V??f?????f???
Y? ?ar??9E??L?l??);?p?K>&????M?:????AI???W???`3y?P
M?_??
??%??]??????r?????P'w?g=?sc	????At??Ot?t?????????x?@]?x?|??@,?[?
v?g? ??axA?@?*f3???rw???????????^=?Zx?{???[AH?>??}*
?U?e_??ms?cf???8.-???t??Qc?z??-T`??CV??x5
T???0
????37l?m
5X?N??tl??"J??~8oU???aT???hOR?U
???7????R^pCw?wo>?`Y?u?N????,pJ????1U??
?O
?8YB??7?	???]??????KY?/v`M?#???????U???Uh?o(?????o???Z????J???????
!?u]?`??O(??(??e???Z?$??\P?i
???'??
V?a???????"?U?? ?kn???/R?qq?-???G ???Y?)?6=U@
~?<?o?xf???t?(r??+??l?l?n??S?5?ct??????W???
??Afp??????@a????1???????????q`eu?><q?1*D????I~?.9???d
?G???j???@`??20?
????8E3Iz?FH??C#f?N?oL?28???3XF?s|
?Eu4}?%??/??/?'F?
?@?s7$?3U?oG??k??Kt?%?K?N?Q?K}(P??
??e???W?=v??9wof??
s?Z??,1\G@?????W?J?V????x2?l
h?3?0???????8?r??%c???.?>O_??q???*+?P?8???T:??????oa????8??6||"???O?@????r???????c=i^??*???? ?Xp???P???\6?wn?????? oS??M??6yf	??Zm??oe?g\E?rJ.?E
?Us??S?
?c??v???.?/?O1r7??C=?z?8??v????N??0?9?7S%S3T????Y????Tcd????,?&|?`@?)??????^$H??G????j??
????S1????????1???????L???un?%?H?+??9??Q????9???eb?????????????3??0?1?	?`??=.??Q??X?
????k???co4?l???zF?`!?KJ??ao1l?4?IG?p?Z??.???
??y_?hW
????)??&(<?6-?_)+e???$?}???6C??p{???gO<???|?.???})?a??DH?o?????,??=?O?{???7n??~*?x?MIb?3??-??^~r+?p+???l??C???&?A?%??I??tlJ?/$???e\z?RN?????6?r?Nx??W@g??????K??d?)A5ce?????????O???%l?X??&['?S????^??9?TC???7' OM?
?;?????`???}X??!?E?.?Q?^?????}?7Ow??l??M8kG??_&?#<5??[?|b??[E????/?Pf<??Y?M????R?O???Nlx?2	???s~~i???O??^??
??????(rey9TI?T?J????-??>f??l15?a?]????r???.??f?-??*?ud??Q?1?
?J?????p?k???u??nd*u?Z?????\fCr{?M??,?_{SJl?o?B"?^T???HYY??M?U????E|?????i/s??i?g?m?O.'?**Q???b??9??,??-?????`?>Aq?????^??`k6???!???A??O????WP??&?q?0?)!P???:?(??(?B????????2????!????w???Y|??A?.?3?>r)>bK???0??<D???????>u?s(???S?6??@Yq????t0s?"
?d????
??:Q6s
?????8?
9?uB1?H???P??O????t?1??:U1??(??Pa??????1
????????????W??/p?Y7QG?5?<L?u?C???	???h?G???:\RY/??.&?Z?W?@mHAl?X%?]???????[???????X
q1???D/????=???????!??H?{B`?B?R?????E$
eBcC?9?O??ZN	? K)???RM:???Lb0m9e??	?O???>??VI???????k"?'?$}?s??u?6xO?K???R????)??N?N????t??_????F8F5?????0X??":????@%,?????I??*????$?????O??
?e?N?????????? ??M??&m?U?b?8Si39[??????r?k??7'?36???u???q???M?K?%e!$qHE4?????,?qj??l?~??:J? ?S0l?r?fj??'?!ka.???D8????*?~?f???i?gP?5??{RH?vz?{wYW??8???????';?@??t?	???jA?0???8?????{`e?????F???"
?Z???Q?	o?b??U*??V???_????C?
?? &(k?d??P???#??[???????4?y???????U?&_????V+Gz?O?>p????&?dk?i?*/f[?????[
?J~/;B?#?U:??/?????,J?j?{Y?/?S?w?W2??HwP8?
?g??????y?rU??????EY?vB???}-??[?k\c???3??{?????
a?@????????<?\??o??n?3H+????GZ??:???~??._?`?o??????j??Sf?W?????6??*(:ud2U^|?????.3?|*?????q??5???wS~??c??2?????O|v????o7,??
=R}0CM??0=???mo+5
]?d?~;?fG???e??kT?Nq(*7??)??5c??j?>?2?S?42????
J?????qO?(?BZ?_????o3?q?D|e#?????8(?2??!????A?#{??%[d?O?????#q??(?M????AK?R>?{?L?uT?X??????n?v???D???8y?@???6-d@Z?2??/
??w>0$?'?.?q??S
ka~?B??>??k?M7e?????%d;??kk"5(?????Pw???oW?>8??;?I??,??-?;G
????x?^???T?}Z?k????e???T{?=N?[?c?]b;*	&?=?yY?T?z?g???%?J???1??Ck??aJ???n???**C~??lm??????Y???^CU??><L}a??-L?????{]??&???]&>???? 4??A!;?????s{?:M?????&??M????Q?=E?d)??4?dWi??s2?R????dq?T?>??!*2?i???Q???dl-?8?#?????K*~u?{?@]O?!?A?d??>	??W?X~d?"?]
X?k??B]????Hg?=?D???J??????[Rh?nP?R????i%%??????GP.`?{J?W??????uv????9?=g?/???"<??p s?5p?E??k
V??.????+GD?p?????{??.?????O???U???G]??BZ?Z-V?	w????
>?B???????b???S!???Vc??3??u??????????h`?'i?K???:w??#xo??
?&XNAg?U?K?+K94??H????s?M?Po? j?4gp??_Y?r?_??j?c>Aq1?&???U[?27??5?jFM?M???T?j?^???d?0>x?j???Z?l?^?f?r?14???qx????[H????q!??5??*????5?k?????e?V?e?[j~??Ho?C",????-?????~6???=Va?&W?
?lY????
??h?:??z??$?d????d*?s3?B??6f	??G?&?
$|??*?????o????-M?l?;?d?+eVY_???(?.a-???=v?a?c?*@?????1?k???e?x?x??YL&?$"?m???3????>cnl??n??6???jE?{??vZ????????@????????#<?????cRQ>q?????1
V??P?w??[?????
??????????i????????G
@u
HO
?`?K,x[}??@??????????
??
????vW*????`?i??q????
??;???J???A??FKl??jH2??.???ef??A?c??l?{??lI3P??lrO?????`????V?Yp????C?n????-w?[?k????mp?X~?g??&?	???>??@???]?h???XC??E??0?o?l?t`Ep????v?(a?PD?l`a?"?",?d???????oet?	?g??6??vCptWRw????/?m?t?]J?=?
R???n?Dt???
?Z?Q?_??
!f7\.=O?NhR?w|
??E???5??
?????l;W!?]Nfu/9ti]????KY[R/S+?
|???-??i?"?S,
&??e?S?q??3LgA-?,??}D?????.?%??6????`????XM?b????T?6???'???+???;MP??EK}??(?B?C(??v????dl????l]*?VBHe??( ??{?~?u??&m}?U??]???t???;????q???B?a???L?YE?Y???%1?jnLo???RG7?_?2????=
&+?????+d,}??3??V?Qq?????!?4	?1??w	????[;??/??z?????,?*!???>????>?9O???
d?????????????????+??X??q7?M??
v???q?????oo???	w??AN?B??
3*???x?kIS??I'XYs??P*??$S??T@????P5??I???`JFuU?)R-3M?}
f?Q
?O|_??9??w?.???B	???J?i????JY??u???KnC????c(???xa??5E?r?????d?Cqu?{?^?^
'H??9&?D?.d??Y?U`???4X???DL
a????=??I,%r?.:A?e???????s?i?u*=??????=p2wgv???aH[??Nm?@??C?D Ly/?l???;n1L??.n????&_R????)E???B?!?Q?8????S?6?=?K?fh?.?aW???d??E7>s?T#??3+?T??????
o?l3.??8?%[??E??d?7kI?S?[K=??'??	j,?t?(?(???v??^???`?'`?W;|?W?>??H??GX???????u|$??f0W?%??|?hwWx(??o???V?l?U??C??s^5?X{:7??CIwl??"????O????-??bPv??K??]Y????`?8???v|?!?????3"????9???????!
WT?????'+???hu????&:???[Q????Lx?x???B????7?{L&	P?;???????f??#?a???:?????cX?tY?j?:?#??`?0?J?\-?:?[o?FA[;?'?????A?W]b???r?u?????{?e??:??]??W?0?{??:>AfU)`??@?????????.?????/??? ?
??Z7N???>/=M??K?5???+?{jKJ???%8?
4???B4???)Q????a'???Pe[??g^?u?e???
?-??g?T??B?$PN???1??PE??Sb??*?'?Ls??wi????_???8g?
.?Z???????`????l?(?<??#A????? ?$?"??l%/~?#??]-3?????E?d_?%7??
=??=d?o??????|T3:??=?l?H?1??sg?rf?0F*X??xR?8??dI?x???D???,0?qUl`?3]s?HP?????Qq??a`??X"???YR?9c\[?}??W?
???=?"F/?c%{??,?m?!Qyp????F??b- v3?.^??*>t??m???c?Y?????:??~Ps`*???;
-"??:?X????,?????r?BY????e/??????[?`PW??,?E
??
 A?a??c`~\
??u???<nG?????}?????????9[???B]??vW<p?T???:??X??:
fs(?9???\c[??m?Cv?-?6?)?-?s6?????????y????9q??0l????Dh,{q?Q??k6[b?E
??.????p?
4?tLf]|???tX?x{??X??4w??vN?'.d???P
=?\mT8??j???U??I???R}k
??,??_?m?=6l???] ??j[].????4?m?m+???????(?"??@q?K????M???[6??????3??5???sA?cT??????R??1	o:?	?Y?_???q?}?I???????
??N)>=????s*{?y??=????t??S??pL??????0?)???M??q^?Tr??Iq????f??5??mZ?-T:x',u??????%???]?E??????u??=?M ??
?A???8O?6tws??1
?k??s??<L???A?es?^??#u|%????????????M	?m?????????9@???!6 ?d?=a?.?:????yI????????4??,;C????.?J?:[?::????6?????y???L????
<?a??>?\q?
???$t???A6?????k??
????s6?c?????	
4?F
6|????????? ??G?4???????????{[%??fO?????
???T
6?pE????=?R?????8_??????????????M??ak?6#?G???????-(	??
??
~Q?i?l'??
eZ_Vz?e????y?z&????Z?????'?
??]?}??GW???$|?T]~Us???a/?e?e?ze?/[X\<?*?????l?
G;?=~??dK?E??+\????6b~??|A?hL1`
??Iaa?????7?|?LdW7??)_?~???d??Y?-?;w?u??]??L?
??y?k???%?L?)cY0???B??d?SY
?)??Pw%?R?}??:O???^
[nQ?E??X?Ql??&??882?](??]J???Uz?B?A?4??\??-??d?i?F?Gwq?y??????LOp?R|????/?????S]? -I?ap??oab?=???Dh???w???E?b??"yY????????????
?[f???{	???}?4;rC??)t?lM? ??
???g??1?q&xS?7Pwe[`
c???? nXc`?dcKmJ?#Z??[
L??[??	????_n???W?}f?
Y@^?
)CG?>??a??|t?m?
?g?`??@?:?q???>w(pkC?O?????!???V??8r?{lc??pc?N<=?\6b?^?S?~sQ????}
????T???v.?
??t?]}?j!?=wb?nx?s???????<??Xg?zS&?y???_?\oH?2O????'xS,;k????T??????????Qp9?;?~
3$???e?}?????w?o?e?FOTeW??\n.???<?????0?Ue??[?6L^??BxL????e?/e???m?????d???9?`Z?EK??=??)????)s?l?<?x??? ?#?kj?P?z???????2??py?x??????#X??R?]*??(?x"???y?m??E;??h??`??????}?~??Z??^o2???jP?	?Y????*P)??????JV=g?Yv&???jI???s????%;?S????&???
?7?Z?
?='z?ap?Ap?N7?????S????j???hE?e?)????;???5G??0}?B=?=??X1????y??W}	'?????tQ??)?????l??????????a?
??e??<1???e???I0
^x??G?}????,\??U??Q????????8D?N???????x????B??
???)???|?O]????=\?-?F?*n*??+a
?}???^??k:
?
U?(o??????B??2X??????>|??LsM}?5?Z????d?N???`?>???~W"??Qf??????<6?Gf?W?P^i??c?_K???
?[t??R
??=y?h?K?;?W??U??C?9?x??nQw-&?W4g?^1???&?WyN??
???Aw?i?x??7?%/???x??????>????A??N/??V??6?0>?8i???ydGw?`?oid??<?2~??a5=??0????b?2?T??????????????8??-Yz???P1???IL5r&#?????^?s_???:???'M1p?(???&?????'??K?????
??
BSlL;E??[?????Q????3?3?~?B1&?/???????=z?c??\g?O~?+)??u?0???=?H???CWYk?!??6p????BI0{??C???`???9??s]?m??W???n?=?6?n??
??e???
?:}?+Q`??
???S?_9??8}???????{4????q?;??Km???&uo]%??????,???)??W at 0??1^B?????????q??rfK?
?z??)?b????i?????'?f>????m
?G???T?Baa??f???+zAk?HkS?T
?????6<m???W?0
Oxx?? <?z??9
?>??x?q?6G?z?C?U?%u,?P??6?CV??N?X*/L??v?2u??T<0?v??|??,w'??\"z?????b.?R??^w?0J,??,4?UCn?N??r?.???_??@6?%TC?J??r-???B?F?q<]??.?_??e????????~,I??s????kw??? x??6???????????0o?y????'?uRrn?@?@???.8?????W???K??????P[]?*???$+Y^???????xv?????E:?a?	{K?g???m????????5n????{
E???_ at 5[E8.BQ%???w??d??1c??x(?c??<0m?}%3???+???????W{?aOq???5???????!???bh???
lt???? ?????m????"?[?z?[pXQ?;f?????;?~z`	?????9&?3???0??%????L+?@????#e????7N?Ma??RgX?Fc??????
4?=?h\M=p??5??#rl:SG?????B?vO??#(?K??B?????C?2????O*??
?`????????5|?U?yHb????V7])?(??2?Z?c????H?8??!??5B?
 i??T4j??+???
P
???j???V?Ihr??1{DZ?7?Vv-???D?0u@N?2???R#;P#???????&{bI??w???;??m?kO??Jh>?m::2???@gi+??F?oL??t?%
?lUWY??;D????~??d??3"????????n??R?D?\Ra?I=g2?TL\??? 4)??l?M?????$X3v,?3?RQ at j|\?L????'?|??-?M c??f
??????X=e??n2?tD????>?T
???????.?(PM?=??vD?>!?E??XW???5iOXF<???>c?^?(?d8?o
????5???sJv;bs??L?nK?j
???A????-???z?\)?zN??Mar?p>????PL*??ZM????g}\???)?M?(????<?????j?9?}d/??,?
???F?ib??????OW;*V?8=\e?e??$P'oG??:?B???>??J?+gd?v75??
V????
(??~;qA???????C?????
?w??U]?]?R????R??
??`?Y?]????g?XS?b???I?????Rz????^??
?S??	?5?ki??l(r??c8?NI3??*?S?:R}%>??t]n?a??qln=??!u?2??er????!RP?
?e???5?eHf?%s>????`??????@??"???b<%?lf????dI??ly?????P??,??5??I?3<??W??|???????bw?????jZb?>?????3?Y?(?;\L-R1=?YR_??E???I??sl???x??K????`??.	Yq$s?
?????_?????|? ?=^

?Z?n??H???u?????c?'??{?I??A??????E?????$??5???va?O?j???sgy???F?Fx2"!???)?p?<????7b;?4???l{;?17?6e?????????*S.???aCLo?:?{??M??W8??g?

?{_O?a?%????????#M?s??mW????Q????TR?MF]???)????=?????/?????I?????@??o??????<Ac??????"??md?D?'vP4	?T??U?o????i_?%E???F{2????I????70??F?Ja?
U%|??~??s(oR?w??Bs?????O??vy?
????`?^rp5?L~i:?4?*m???4?+Y>??@?
?Y???#??X??}??5?`?6??[??XNWN?&?3????V????)?n?8???f1R?H??;??h?d?PP?'???2?=??h??$???????:[?;A?Z?xd????IE1G4?
?H???~??~????P??H?Jx?TO_?0}??l^??o`?(?????C???h?????vB?Ne)*?*Q5?P?Z???@RU?
r^?,?vl????t??$X	??vk
???
x?{?Z?z?6
g???>c?,4+oizNT]???!?r???	???=???;~????? ???H??????????????\V?0???
.Y)h9??;v??9?CY???>Z??:r???d;?????R?????D???`????d%?
?'???????B?????i#?bK???!a+.P???|hCbf???,?)?6z??Vq??y???
c?eTwp?_??G?fM???????s?i~?Tm????G}??k?.?(??[?+??<`???z+??"Y?t?????8Y'{1?3Sm*Z?R<?????o????????,k?IV???v8???|?D|?????N??V?.????rn?

??!??ue?????&??M?c??H%??[BL?~3Rg.
??#L?2?q?i??-?>3?m???~ZG???w?????????_m|h??kA??????r$?_N????????o?%???(xnPy??^?Vu-??+???C<?_i?5KW?B???!?2r?@?~?%}/Sc!(iR.??)???????a??|?t?yF??5?{?E{
????
)?uUP?B??????ws?????6?2K7h???7<???n?g????G?pt?3???	|???,_??_n??????l@?V??T1??E??Xm`?Ywb?k?\0?yP5\>[????6?3??6???$????!?]?+w???5+?5s?(R???vpa?????}crM????
i?/???A?1B?`
???<?B<r?k?1??jQQ(B?)}R???E??	W?
FOlL?S	1+???\G$}??j'|??:?n???`v
A
?d??7%?E*lv?4?1?wv8?3????Z??"????}???(??A[?%??(*?:??>?????p?r??.????>?y?J?????k?{#S98????y<????j???C???+??Q????~N????5)?
+?8J???p[xbgv?;??6??????????c^Lu1???z??n(
m????f????-mM????N?;?M??7???????F??Tp?N<?g[??IO?????=????5???:?<!??c?Jv???????z?*?F3`
w???C?????qR?f?{^?B>l?`Jfi?eLN?z????^?,????\B?R??qAc?J1??????5SC2??l???B?
??]??#}????@Ng?W??t?"P_??W<)x	??~t..0U?|>??
??
:????#???????/??ilW?sz?p??~????Q?o??#j)4????xT??d???eO?S??"??s{4*j?+?X?8??'?K?d7)ED???????????C?`f??B?I???o??Ox#a?B??l?T?O???^Et??;Y???G??(?)???Q?w???R~??????W([!??gE?D??o??F?J??b_?S?)????7a<???w???YV????e?????\?9';?[?P?;?E?7EW?q.NV??s??B???lh?L??-2??&?????52d?????g?*??2?C?e{???????a1A}?eW???${?f?.e~?,??Y????t3?)?3????":????^?????Y???c??\C;?coE?kY???z?c?3#[!Q?z?3J???zN?l?=4?????]??????(???????y_?^4)?O??>4?????zc??8,?cY??z.??g?1?9_VO?']?c?)????,9????u*6???R??'r?]??(?????%??$?G?????J?L???]?????{_%9???????5?$pLg?????OEs??p?R?u ?????W????????5????9mP?'?;QY?a;?%Es??l0??R??]??	4`??vr?Du!??T8?b]???A?.1C|WwMMaK??? ?O?L;wM????_U#???6
 ???,?}?6_?z?4???r?gj?T;??ey??W???=?`??t=i?
???n???+???h???W(`?Yp#?8?????X???lJ?_??]???+?cm?rp??%<YdeM??0?
?????'r?E`???op??5?c]9?\S^?3?<N??$?/???&?F?????6?m??????1?MR+?^U???23ib?<?????>y??`[?f?S???;?`?
?.iv??
??c?tW??}?C????'?`o7?|??>???w$*????vH{??u?7???????S~???*gInnO?m?1?P4Gn?5{?9?'t???&?Xf???
R?|??R?L?\?????>??????A%?D???>TET1??c?%5?/i????rsl?d!?????D?d????Tjo
?q?????C?j??%6/-??&c??J?R??ep??/,f?!?<@??????cB??YDfQ?j=??"??p?^?m??9?c???:?c?}???5??>
??5>%78?C???W?[?|?i??s???????^???????h?+?3S}
X??????J???R6?H???????T$?????o?	?u???]??SL?	?s|;???I?WG???<?u??h??]L??I?
L
)?e=+8?????*?u??vB??A??kF5^??????f?????w/??? h?&E8?&?+????}??m?/?#???,^??a?
@Pfh??o?3 at W4La?s?????p??y??v??	c,??????l.8?=?????E?????-u?!R
??(??LH??s???P?G??m7(A???Si???M??n??`?F7e'?&?afQ6?Sjz^i?@)???f(n??~?c)?$ T????5|%?17
`l^?????8???Om?X???x?p?:u?
??"Z???????????m???????+_??T??Y?h&???3???cl???<3
???/?g??o
\?{C?u??q?v<?
p?3?fP?:? ??^9\`??%?????]l?wt???!??YwP1?Pw1????C
$??????F???O?#?-????D??{sY??I???R??`????oG?~?V?J\w????l1-|??Z?u4??e?????j?i?R?????B2?m)?????K?`GWGv?????????A{?p???k ???T??k?j?(??F?V?Lc???p??:?????Bp??/??+???19qEo?2?M
h??N'?"S?-Z??e????c??8c;:??(??q>Xa????.?10?j?J??{??e#???A?N??????m,?$O2L}??	?? ???#~??j?~??/????h,???\?????Y??
>?e%???O?N?`N?}2?%
?-?????????t?>4xk???J?em?????cU??rt???s*??=???????2%?y???:???^3????Q?P?????(?????C`
~r9t?????s??C?;.3???;????#????????;44?vX??&
]?np0)	?A?
g?????]???6????????Y?,??zly{?ej at p???<??Fi?Vi.!A???XP???9???;???2y4%?sd?}??~?20	V??P?n??gK??n?8?D??>?i???1???4n?p??j?&??,^???)??Y???`|N,.	L??I0?B??????
X?????K,?4?xvJ??6???C`Cmh1{???9
%j?6?~v???{_H?_>?????????	????3?Gx????
???M?+3u?????M+?^K?Vo????1???P????e????
/U???6???3??Z?I??r/??_U6t?????oX?t4??V?E@??V?9s??PO,?38?/<??bw???,?F?9??ba??I5?>$?@:G??+S??\6??+?:aQ?v`?'X?????r?G???????-??gQ??P}?>?:???w??m ?89|????SW???WX???M3?Og3c=*?5OuCko?%9?IBD??&Id??a>????bL??`??*%??1zo??gq?????
mO%?8^T[??|??x???K?<?z?>?????L\????K|??????7????[???Bt?????|??A???zp????j??d???AL???(?x??


 

PK
?}?7?~??w???<?id?wo^?~?????????????'W??????;Wm??qK??vA???X?e^7U>oi8zvNSo?e?jc?G????M?pE???\?[W4K???:+Vy??y??????fS>???????E??Y;??Wuc+?qYM??)?xxg?]]??~??Z;? 5?k??H?d??],????/?&??
?k?D!??T??ov???3????h?s??6i????V????e???????l??#??%???o?.]??
ao?}??????mei?????k~?8????ih????????????????6?>s???
??}??/?&_???????9?-???w???e?f?H?x~!??U?\?*???
=M??yW?????????T?0p?=?xE??17d?s?
??<%???=??6??y????[??????O??z???]^???T???1????xFu2QP?
!"L&?B??=???\U??~????DM???[??,K?W;????T?q?hD??W??U??8[9?m?;.???|iC!?`?+??X?J?c?,??~??J?TKR?sF?????????7$??A\?d?zbG_??|?7?XG?ue???n????&???m????Mp?=}?~???_;??+??i???l????Qx???y??D???4?6s??p?yK?_??b=b/??T???????_'s*LGq????l`P?P??>??:]L??D???

??l?D
bQ?q?e???1???.??#Ed?eK???L ?]??BB

?dWb?
??H~x??s0:?9???y
sXJ?Vf?A}
???'???Z????9L?T????eB"#?????? ????al/*??s?
c
??RY??e??I????[_6?3`???'v?6^??K5??u?UY!b
?U^?????]T??U?y`Ib?????M?'???M?{7?5P??m??
$A?\??3???TT0w?L?,I?8K??ok??;8M????i????Z????#?V?`?0??Q#?[>?e???B??.??8?S????j?Useu??I?<??H?n2z????g??J?O????nz??????"?????!?$"+].(??l-{vf????qA(&??$4?M?7?\v?m?w??6}?n?6?z???D?2??C?1r??5'??l?&c|<(
	oz???????0??U???QlF&??r???Fz?Y?????0??CAB??
??*??L`?+?9 wF

T?I??;W?6?s???????#Q?aO?I???2??Hn7????-M?`1$D???t????????IGf*??D??]????h??=#?1[G?Z?j????}g3?6?s?Q?7??
??Y???8?b?'????Kmb???(???:?FRbsp?$O????-??q?A?<
R???1?_c+??h?Se??%bf @?
E??R??P?UB_I0?2??g 4
??
???F?H???
?i!?3&'?????U??#b?
?)*NB?Z?????Rz4cXq?dVlv?x?????????????????\??????lr{so??N??????{5??M'??????j?~r9?????-???H???1x?V?%,??x??Ae?]?`9????FA? |??i?????M??5????F????9?-2^V?sI??S?!??h?gC3?`?????rY9i??(R>??gA??.??.Hp?????????????????en???.9?_Z???I9??Y????7y?\???	b?K?K2#Ow?.?D?,?[P<
[4?LU?l`9u:??h??@??v?d?
X?9???y???PO?u?K??8?V?\???5??3?N?6??O?"rV/C:D?U??6????o\NV_	? ?????!???5? V????3Q?{???@???#?zH8
? ?L??????34??? ??,??lx?
=??2?g?????Xj??%F?z{?!g???t??
Nt??
??y?8??3?F???U???&????|???y???.	M??(?T?`?i?4??8?<?@??N?2Z?C?dc$G?0??9??&???Pe?,??R??Sn+?g??Ib?????l????Q????Fw???
#? )??'?eV?Q>???????w????6	?=e>n???,$o?	???,????#????p;?????P?|B"??,7,P??????r???+ZZ??]Z???[8??/|?@?????y?_%S
??e?????Q?????k???[?-A7???]????.?z#d?A??]!?OvpQ?????Rk??"??NUW??d?V0?O???_?????H=??4?a h*r?
ae?Z??X????11b}?<??)i?=?11V[?-?H?4?n????Qe???s2??ea??d?//w??XW?{?-v???e-6C???!??tr??mRV???qu??e??z?u???Ri"?????W=??c?uu?M6'??	????w??qW???v8?I??`???????<j???
Cyy~??$m?!We??0??3?-? ?J??sl?|??wk
?c?%4BDS?R:G???/?s???-!EE)?T?iK??,
	8??X?????Z$????????
^?"? ???
S
?SV????? 6???|1d?P%|?!,??S??m~?????-??????
&B?????w???w???8?'9"??4
?????|?E?ev\bB?+??'/??y???8?
?<???V??????.T?d?}x??????}*7?V??dJ? %?Optg[??"?$??????Q_?}??????K=x\v9?m?????H??7?(?	w\?J?9?H<g?A????9???kd??y??c??&^I:??]
?,???1?
????i9+D<w?tE?
?U*?{Y???5?
/???(p???*????D?\?t?-?^?????F??@^U????@?????W3:??n6?????????Y,%L??????jh?s??0J?|??7??b]:1?qL???+??I???^??????<?LZ?????7????-????$9t2?????fr?Xw?E;?SAsb?T!?_????qk?%???"'?????"e?7{9?|?@=?mA#????}??k4F?+?eH?V?f??ft? ??x?{??@????=v?4?z??z?6e?
X????J#x0?g?????`"???G1w?P8???.???9N?G?A?C?????v??z?Je?C#
??mH]?????W?|??Q???AN:??UII?E?/<?E?48??{N??)????F?C??'?S?#==M?!y????||?s?????2??0.
s?i??9?zd?I??>??????0U?#?W????#}???y?????NP8????}???_a?>????l3????6?5Y%???4????'p<?
>?&m?0/KKO???H??t?[=???-?????SWE?F)?p8k??2??9???>???}S=?5j?6t?K~??#-?\???f??"{??U??E?@,?????Pj??HDW[r?4T?h??E?rO??$	]=??9?z?e?lQ?u?A^??
t????????f}"?$?.&????
`?????P
?9=??????5z????????E??!"???Rj#n788?i????3a?Y?=???8k:??????aj?0P?????????e?8HGw?!??i?G?)??17???r at I??
??X#??Av?v?g???]?!|????U]	&?????Zp?sn?/1?}???N|???]?.M?/???	O?Y??X?9??????A?(=???k9(*y??lK????L"P>T(??Ct?OR!>????,K2????????#?????\?o?????uk???/?	?g?J?f*???d??C?.??vh
<??^ -pR?.Y?J?jM?Ho?k?l??8'?r-?1???F9???:???	YVo??)??J???
b?b??J?
m?X&??B???I???<?A1?>+??????7P?*D???%?X8??????{?P(?C??GCs4??ehS91?????7p???B???????:0??i???>
????.?XixY????G?x????%??T??????a9)?o$?^?????	4?m?3J???+Jv*?l;??9yj?4i????F9?*{?B?U%9zn?SQ?)???kw"Bh?2????|???????h?7
5??
W??Qd|#???/z?T?[iL"???7h?{9???MLX???	p?@[????N???????5?j
X??+k>C14?V?5,RM?7?,|eN?Q=}Ts???q??????C?s?
???|?D??????99?????&/
??^???3
2?+?|?u????E?1??????X?m7??NZ????<?J[?;?s???I6???????MD??yB3n??S??5???3_!??'???*?????A?H??P?J/^?/???PO??.?O???z?C????Xz??????e0??????PB+I)+x???????h-;RF?Z???k?AnBr???t???	??=_??t?x?l??t?g??k??T?*?{A??r=m???'I????=?&H[?????D??'???z%?EQ??????_K???? B$??0k??o???!???(? ???q?U?#2?M?;??X#d?jr?>,?^Z#}O?E?F??x??5#???

S??but?p?????????Q,`????R?rI6?P6??%nS??_=??VQ}??]????????y??kNA?k?C????m?VO_g??H9|N??Tw(???e???jM,???B1??_????
sb?{??Co%??n?3??7C_Y??r???J9<?UG??????r?+93?????F???w?)~Q??b?;xrpHV?S?a?C?=[.%'
!??^9??vk.?'K??V?_?*??_??te????.Q9U'8P4??V???:?[????z+Dd?	????|?A?S	$?z???G?j???pd[?r???"9???*???Y???=M{w??OV
?WS?ut?Tw?E?K?bF???p???????]t'?:o??p?@U/?!TG*???L???W?O????S??k?
d?<????I???B????=?f?H=,???rSw?Owg?9HT????#?\
?s????G?w??"???????^?p???d:<f?<??o6-??V?{9?:?F???>???k ??????U?5?G???)???o?\?D?wIIP????4??<\bzT;??-n?P?^Y?Y??3??????_F???f?????????r?p????c{=y7M?????(???????????8?~??t?'nn???????n????g????O?Mf3??g;????G?????/C3????nf?8?????	?s??????e:?Mn>?x??c:??qf??^_??|???S?/???t6????????tMg?{????2?}?}?>`m?????????Ox???????????&???1}9???~???A??7?3?F??n?3F??????xJ?????M?'4%?y???????P~?p=????????9p?!~O'??????Fa b.??its??*?}?r???.h??W	S?????_?&?????4?????~???A???f|I????????%?a:?M??oM?N1???????<?????\?B?????sD0??	?I????Lhr?????+?E???I?n???g??????i?].?TK;?????k&?!?l???????>?Z??????????I?h???<syKJ???"}???m'F???Y? d?????j?????P????=??h6?L1?????6??
???ity?0%??x??? e????@
<?!??YhB???g
??q_????#5>? ???\?j?????@&?!???bSy???e?????]2???????gY???[<??c??2???????C
?/???r?8???`pU?.?
?????I???w??l??rO9??0?I{??????r?}ej{I?|?;?A[z???n?9??q?o?Dc?G?"3CI?8?V???(?t0|.??r??a(??|&?{?;?~9n??????*???ju? ?Yo??R???"?\h?
fJ-??c???*???J???p??d???o??|s?o?kn????/??*u?o}??$
????&\?/l????]?_PK








?d 






 








--- NEW FILE hunspell-as.spec ---
Name: hunspell-as
Summary: Assamese hunspell dictionaries
Version: 1.0.3
Release: 1%{?dist}
Group: Applications/Text
Source: http://extensions.services.openoffice.org/files/2318/4/as_IN.oxt
URL: http://extensions.services.openoffice.org/project/AssameseDict
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+ or LGPLv2+ or MPLv1.1
BuildArch: noarch

Requires: hunspell

%description
Assamese hunspell dictionaries.

%prep
%setup -q -c -n hunspell-as

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p as_IN.* $RPM_BUILD_ROOT/%{_datadir}/myspell/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_as_IN.txt COPYING COPYING.MPL COPYING.GPL COPYING.LGPL

%{_datadir}/myspell/*

%changelog
* Tue Apr 28 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.3-1
- initial version


--- NEW FILE import.log ---
hunspell-as-1_0_3-1_fc11:HEAD:hunspell-as-1.0.3-1.fc11.src.rpm:1240991744



From ellert at fedoraproject.org  Wed Apr 29 07:59:47 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 29 Apr 2009 07:59:47 +0000 (UTC)
Subject: rpms/globus-openssl-module/devel
	globus-openssl-module-sslinit.patch, 
	NONE, 1.1 globus-openssl-module-typo.patch, NONE,
	1.1 globus-openssl-module.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429075947.2F3E570133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20523/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-openssl-module-sslinit.patch 
	globus-openssl-module-typo.patch globus-openssl-module.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-openssl-module-sslinit.patch:

--- NEW FILE globus-openssl-module-sslinit.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include "version.h"
 #include "openssl/crypto.h"
 #include "openssl/err.h"
+#include "openssl/ssl.h"
 
 static int
 globus_l_openssl_activate(void);
@@ -75,6 +76,7 @@
     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
     
+    SSL_library_init();
     globus_module_activate(GLOBUS_COMMON_MODULE);
     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));

globus-openssl-module-typo.patch:

--- NEW FILE globus-openssl-module-typo.patch ---
diff -ur globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in	2005-03-29 01:32:37.000000000 +0200
+++ globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in	2008-07-12 17:12:28.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_openssl_module" Format_Version="0.02">
 
     <Aging_Version Major="0" Minor="6" Age="0"/>
-    <Description>Globus OpenSSL Module Wraper</Description>
+    <Description>Globus OpenSSL Module Wrapper</Description>
     <Functional_Group >Security</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 


--- NEW FILE globus-openssl-module.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Initialization of openssl module should call SSL_library_init:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch0:		%{name}-sslinit.patch
#		Fix a typo in the metadata file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
Patch1:		%{name}-typo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-proxy-ssl-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-proxy-ssl-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Module Wrapper

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Module Wrapper Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Module Wrapper Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-module-0_6-1_fc9:HEAD:globus-openssl-module-0.6-1.fc9.src.rpm:1240991918


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:49:40 -0000	1.1
+++ .cvsignore	29 Apr 2009 07:59:16 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_openssl_module-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:49:40 -0000	1.1
+++ sources	29 Apr 2009 07:59:16 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz



From gerd at fedoraproject.org  Wed Apr 29 08:01:43 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed, 29 Apr 2009 08:01:43 +0000 (UTC)
Subject: rpms/parrot/devel import.log, NONE,
	1.1 parrot-1.0.0-rpath-removal.patch, NONE,
	1.1 parrot-install_files.patch, NONE, 1.1 parrot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429080143.AD3E370133@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19767/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log parrot-1.0.0-rpath-removal.patch 
	parrot-install_files.patch parrot.spec 
Log Message:
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created



--- NEW FILE import.log ---
parrot-1_0_0-6_fc10:HEAD:parrot-1.0.0-6.fc10.src.rpm:1240991349

parrot-1.0.0-rpath-removal.patch:

--- NEW FILE parrot-1.0.0-rpath-removal.patch ---
--- config/inter/libparrot.pm
+++ config/inter/libparrot.pm
@@ -98,21 +98,13 @@
     # Set -rpath (or equivalent) for executables to find the
     # shared libparrot in the build directory.
     $conf->data->set(
-        rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('build_dir')
-            . $conf->data->get('slash')
-            . $conf->data->get('blib_dir')
-        : ''
+        rpath_blib => ''
     );
 
     # Set -rpath (or equivalent) for the installed executables to find the
     # installed shared libparrot.
     $conf->data->set(
-        rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('libdir')
-        : ''
+        rpath_lib => ''
     );
 
     unless ( defined( $conf->data->get('libparrot_ldflags') ) ) {

parrot-install_files.patch:

--- NEW FILE parrot-install_files.patch ---
--- tools/dev/install_files.pl	2009-03-11 00:35:20.000000000 +0100
+++ tools/dev/install_files.pl	2009-04-17 14:34:25.000000000 +0200
@@ -217,7 +217,7 @@
         # as it is typically done with automake installed packages.  If there
         # is a use case to make this configurable we'll add a seperate
         # --pkgconfigdir option.
-        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
+        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
     }
     elsif ( /^compilers/ ) {
         $dest =~ s/^compilers/languages/;
@@ -292,6 +292,16 @@
     else {
         next unless -e $src;
         next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+        if (-l $src) { 
+            # check if the system supports symbolic linking 
+            use Config; 
+            if ($Config{d_symlink} && $Config{d_readlink}) { 
+            # copy as symbolic link 
+                symlink(readlink($src), $dest); 
+                print "$dest\n"; 
+                next; 
+            } 
+        } 
         copy( $src, $dest ) or die "copy $src to $dest: $!\n";
         print "$dest\n";
     }


--- NEW FILE parrot.spec ---
Name:           parrot
Version:        1.0.0
Release:        6%{?dist}
Summary:        Parrot is a virtual machine
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://www.parrot.org/

Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
# Without Patch0 %{_libdir}/libparrot.so would not be a symbolic link to
# %{_libdir}/libparrot.so.%{version}  
# Symlink:  libparrot.so ->  libparrot.so.%{version}
# See for upstream: https://trac.parrot.org/parrot/ticket/509
# Extended for the package to have no subdirectory under pkgconfig
Patch0:         parrot-install_files.patch
Patch1:         parrot-1.0.0-rpath-removal.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel
BuildRequires:  ncurses-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::Simple)
BuildRequires:  ctags
BuildRequires:  openssl-devel
 

%package docs
Summary:        Parrot Virtual Machine documentation
Group:          Documentation
Requires:       perl(strict)
Requires:       perl(warnings)

%package devel
Summary:        Parrot Virtual Machine development headers and libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%package tools
Summary:        Parrot Virtual Machine development for languages
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Pod::Simple)
Requires:       perl(File::Which) >= 0.05
# It is necessary to have installed the package "perl-Perl-Critic" to install
# the parrot-tools
Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}

%description
Parrot is a virtual machine designed to efficiently compile and execute
bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
as well as variety of other languages.

%description docs
Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
examples about the Parrot Virtual Machine.

%description devel
Parrot Virtual Machine development headers and libraries.

%description tools
Parrot Virtual Machine development files for building languages.

%prep
%setup -q
%patch0 -p0
%patch1 -b .rpatch

%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
    src/library.c
%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
    tools/dev/install_files.pl


cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
EOF

%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%ifarch %{ix86} x86_64
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
%else
# PowerPC, not all optimize-options work with the PowerPC-architecture
# the PGE don't build with the optimize="-O2" option on PowerPC
    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
%endif

%{__perl} Configure.pl \
    --prefix=%{_usr} \
    --libdir=%{_libdir} \
    --sysconfdir=%{_sysconfdir} \
    --infodir=%{_datadir}/info \
    --mandir=%{_mandir} \
    --cc="%{__cc}" \
    --cxx=%{__cxx} \
    --optimize="$RPM_OPT_FLAGS" \
    --parrot_is_shared \
    --lex=%{_bindir}/flex \
    --yacc=%{_bindir}/yacc \
    --libs='-lcurses -lm'

# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
# to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# pbc_to_exe would not build if %{_smp_mflags} would used
make
make parrot_utils
make installable
make html


%install
rm -rf $RPM_BUILD_ROOT

# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# install-dev: Same as 'install' taget but also install support for development.
make install-dev DESTDIR=$RPM_BUILD_ROOT

%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/


# Drop the docs so rpm can pick them up itself.
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}

# Force permissions on doc directories.
find docs examples -type d -exec chmod 755 {} \;
find docs examples -type f -exec chmod 644 {} \;

# Force permissions on shared versioned libs so they get stripped.
# The parrot-install-script don't set the permissions right
# With changed permissions the dependencies will be found
find %{RPM_PAR_LIB_DIR}dynext -type f -name '*.so' -exec chmod 755 {} \;

# Remove module that should be install instead (perl(File::Which))
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/File


# Added to reduce output errors when using rpmlint

# Force permission on perl-scripts in the "tools" subdirctory
find %{RPM_PAR_LIB_DIR}tools -type f -name "*.pl" -exec chmod 755 {} \; \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
# Set path to parrot binary and Force permission
find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
    -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
    -exec chmod 755 {} \;
# This module is only needed for building and should not be installed (I think)
# module "Parrot::OpLib::core"
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib

# Remove doc-files with zero-length
find docs/html -type f -size 0 -exec rm -f {} \;

# Set path for installed programs in docs package
find examples -type f -name "*.pl" \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/pir/befunge/t/basic.t' \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -type f -name "*.py" \
    -exec %{__sed} -i -e '1 s&#! python&#!/usr/bin/python&' {} \;
find examples -type f -name "*.rb" \
    -exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;

find examples -type f -name "*.pir" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
find examples/shootout -type f -name "random.pasm" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/01-tests.t' \
    -exec %{__sed} -i -e '1 s&#!perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/shootout/revcomp.pir' \
    -exec %{__sed} -i -e '1 s&#!parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/harness' \
    -exec %{__perl} -pi -e 's/\r$//' {} \;

find examples/languages -type f -name harness \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
for file in docs/book/ch09_pct.pod docs/memory_internals.pod; do
        %{__mv} $file timestamp
        iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
        touch -r timestamp $file
done
%{__rm} -f timestamp

# These files *probably* aren't needed.
rm -rf $RPM_BUILD_ROOT%{_usr}/config \
    $RPM_BUILD_ROOT%{_includedir}/src \
    $RPM_BUILD_ROOT%{_usr}/src 

%check
# 'make fulltest' is done by default; it take a lot of time
export LD_LIBRARY_PATH=$( pwd )/blib/lib
FULL='full'
%{?_without_fulltest: FULL=''}
%{?!_without_tests: make ${FULL}test}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
%doc RESPONSIBLE_PARTIES TODO LICENSE
%exclude %{_bindir}/parrot_config
%exclude %{_bindir}/parrot_debugger
%exclude %{_bindir}/pbc_*
%{_bindir}/*
%{_libdir}/parrot/
%exclude %{_libdir}/parrot/%{version}/tools
%exclude %{_libdir}/parrot/%{version}/VERSION
%{_libdir}/libparrot.so.*

%files docs
%defattr(-,root,root,-)
%doc docs examples

%files devel
%defattr(-,root,root,-)
%{_bindir}/parrot_config
%{_bindir}/parrot_debugger
%{_bindir}/pbc_disassemble
%{_bindir}/pbc_info
%{_bindir}/pbc_merge
%{_bindir}/pbc_to_exe
%{_bindir}/pbc_dump
%{_includedir}/parrot
%{_libdir}/libparrot.so
%exclude %{_libdir}/libparrot.a
%{_libdir}/pkgconfig/*

%files tools
%defattr(-,root,root,-)
# Files for building languages
%{_libdir}/parrot/%{version}/tools/*
%{_libdir}/parrot/%{version}/VERSION



%changelog
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:53:36 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:01:42 -0000	1.2
@@ -0,0 +1 @@
+parrot-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:53:36 -0000	1.1
+++ sources	29 Apr 2009 08:01:42 -0000	1.2
@@ -0,0 +1 @@
+649ce1fb7c0edaf89dc1cd52ff267b1a  parrot-1.0.0.tar.gz



From ellert at fedoraproject.org  Wed Apr 29 08:01:45 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 29 Apr 2009 08:01:45 +0000 (UTC)
Subject: rpms/globus-openssl-module/F-9 globus-openssl-module-sslinit.patch, 
	NONE, 1.1 globus-openssl-module-typo.patch, NONE,
	1.1 globus-openssl-module.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429080145.CFBF070133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21109/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-openssl-module-sslinit.patch 
	globus-openssl-module-typo.patch globus-openssl-module.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-openssl-module-sslinit.patch:

--- NEW FILE globus-openssl-module-sslinit.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include "version.h"
 #include "openssl/crypto.h"
 #include "openssl/err.h"
+#include "openssl/ssl.h"
 
 static int
 globus_l_openssl_activate(void);
@@ -75,6 +76,7 @@
     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
     
+    SSL_library_init();
     globus_module_activate(GLOBUS_COMMON_MODULE);
     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));

globus-openssl-module-typo.patch:

--- NEW FILE globus-openssl-module-typo.patch ---
diff -ur globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in	2005-03-29 01:32:37.000000000 +0200
+++ globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in	2008-07-12 17:12:28.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_openssl_module" Format_Version="0.02">
 
     <Aging_Version Major="0" Minor="6" Age="0"/>
-    <Description>Globus OpenSSL Module Wraper</Description>
+    <Description>Globus OpenSSL Module Wrapper</Description>
     <Functional_Group >Security</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 


--- NEW FILE globus-openssl-module.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Initialization of openssl module should call SSL_library_init:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch0:		%{name}-sslinit.patch
#		Fix a typo in the metadata file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
Patch1:		%{name}-typo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-proxy-ssl-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-proxy-ssl-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Module Wrapper

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Module Wrapper Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Module Wrapper Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-module-0_6-1_fc9:F-9:globus-openssl-module-0.6-1.fc9.src.rpm:1240992039


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:49:40 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:01:15 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_openssl_module-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:49:40 -0000	1.1
+++ sources	29 Apr 2009 08:01:15 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz



From ellert at fedoraproject.org  Wed Apr 29 08:05:42 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 29 Apr 2009 08:05:42 +0000 (UTC)
Subject: rpms/globus-openssl-module/F-10 globus-openssl-module-sslinit.patch,
	NONE, 1.1 globus-openssl-module-typo.patch, NONE,
	1.1 globus-openssl-module.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429080542.D579E70133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21906/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-openssl-module-sslinit.patch 
	globus-openssl-module-typo.patch globus-openssl-module.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-openssl-module-sslinit.patch:

--- NEW FILE globus-openssl-module-sslinit.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include "version.h"
 #include "openssl/crypto.h"
 #include "openssl/err.h"
+#include "openssl/ssl.h"
 
 static int
 globus_l_openssl_activate(void);
@@ -75,6 +76,7 @@
     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
     
+    SSL_library_init();
     globus_module_activate(GLOBUS_COMMON_MODULE);
     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));

globus-openssl-module-typo.patch:

--- NEW FILE globus-openssl-module-typo.patch ---
diff -ur globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in	2005-03-29 01:32:37.000000000 +0200
+++ globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in	2008-07-12 17:12:28.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_openssl_module" Format_Version="0.02">
 
     <Aging_Version Major="0" Minor="6" Age="0"/>
-    <Description>Globus OpenSSL Module Wraper</Description>
+    <Description>Globus OpenSSL Module Wrapper</Description>
     <Functional_Group >Security</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 


--- NEW FILE globus-openssl-module.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Initialization of openssl module should call SSL_library_init:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch0:		%{name}-sslinit.patch
#		Fix a typo in the metadata file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
Patch1:		%{name}-typo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-proxy-ssl-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-proxy-ssl-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Module Wrapper

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Module Wrapper Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Module Wrapper Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-module-0_6-1_fc9:F-10:globus-openssl-module-0.6-1.fc9.src.rpm:1240992189


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:49:40 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:05:12 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_openssl_module-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:49:40 -0000	1.1
+++ sources	29 Apr 2009 08:05:12 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz



From ellert at fedoraproject.org  Wed Apr 29 08:07:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 29 Apr 2009 08:07:37 +0000 (UTC)
Subject: rpms/globus-openssl-module/F-11 globus-openssl-module-sslinit.patch,
	NONE, 1.1 globus-openssl-module-typo.patch, NONE,
	1.1 globus-openssl-module.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429080738.0341F70133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22480/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-openssl-module-sslinit.patch 
	globus-openssl-module-typo.patch globus-openssl-module.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-openssl-module-sslinit.patch:

--- NEW FILE globus-openssl-module-sslinit.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include "version.h"
 #include "openssl/crypto.h"
 #include "openssl/err.h"
+#include "openssl/ssl.h"
 
 static int
 globus_l_openssl_activate(void);
@@ -75,6 +76,7 @@
     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
     
+    SSL_library_init();
     globus_module_activate(GLOBUS_COMMON_MODULE);
     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));

globus-openssl-module-typo.patch:

--- NEW FILE globus-openssl-module-typo.patch ---
diff -ur globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in	2005-03-29 01:32:37.000000000 +0200
+++ globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in	2008-07-12 17:12:28.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_openssl_module" Format_Version="0.02">
 
     <Aging_Version Major="0" Minor="6" Age="0"/>
-    <Description>Globus OpenSSL Module Wraper</Description>
+    <Description>Globus OpenSSL Module Wrapper</Description>
     <Functional_Group >Security</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 


--- NEW FILE globus-openssl-module.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Initialization of openssl module should call SSL_library_init:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch0:		%{name}-sslinit.patch
#		Fix a typo in the metadata file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
Patch1:		%{name}-typo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-proxy-ssl-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-proxy-ssl-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Module Wrapper

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Module Wrapper Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Module Wrapper Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-module-0_6-1_fc9:F-11:globus-openssl-module-0.6-1.fc9.src.rpm:1240992395


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:49:40 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:07:07 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_openssl_module-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:49:40 -0000	1.1
+++ sources	29 Apr 2009 08:07:07 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz



From ellert at fedoraproject.org  Wed Apr 29 08:09:50 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 29 Apr 2009 08:09:50 +0000 (UTC)
Subject: rpms/globus-openssl-module/EL-4 globus-openssl-module-sslinit.patch,
	NONE, 1.1 globus-openssl-module-typo.patch, NONE,
	1.1 globus-openssl-module.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429080951.06E4370133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23179/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-openssl-module-sslinit.patch 
	globus-openssl-module-typo.patch globus-openssl-module.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-openssl-module-sslinit.patch:

--- NEW FILE globus-openssl-module-sslinit.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include "version.h"
 #include "openssl/crypto.h"
 #include "openssl/err.h"
+#include "openssl/ssl.h"
 
 static int
 globus_l_openssl_activate(void);
@@ -75,6 +76,7 @@
     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
     
+    SSL_library_init();
     globus_module_activate(GLOBUS_COMMON_MODULE);
     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));

globus-openssl-module-typo.patch:

--- NEW FILE globus-openssl-module-typo.patch ---
diff -ur globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in	2005-03-29 01:32:37.000000000 +0200
+++ globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in	2008-07-12 17:12:28.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_openssl_module" Format_Version="0.02">
 
     <Aging_Version Major="0" Minor="6" Age="0"/>
-    <Description>Globus OpenSSL Module Wraper</Description>
+    <Description>Globus OpenSSL Module Wrapper</Description>
     <Functional_Group >Security</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 


--- NEW FILE globus-openssl-module.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Initialization of openssl module should call SSL_library_init:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch0:		%{name}-sslinit.patch
#		Fix a typo in the metadata file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
Patch1:		%{name}-typo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-proxy-ssl-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-proxy-ssl-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Module Wrapper

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Module Wrapper Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Module Wrapper Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-module-0_6-1_fc9:EL-4:globus-openssl-module-0.6-1.fc9.src.rpm:1240992527


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:49:40 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:09:20 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_openssl_module-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:49:40 -0000	1.1
+++ sources	29 Apr 2009 08:09:20 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz



From pnemade at fedoraproject.org  Wed Apr 29 08:10:45 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed, 29 Apr 2009 08:10:45 +0000 (UTC)
Subject: rpms/hunspell-as/F-11 hunspell-as.spec,NONE,1.1
Message-ID: <20090429081045.8345570133@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-as/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23549

Added Files:
	hunspell-as.spec 
Log Message:
* Tue Apr 28 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.3-1
- initial version




--- NEW FILE hunspell-as.spec ---
Name: hunspell-as
Summary: Assamese hunspell dictionaries
Version: 1.0.3
Release: 1%{?dist}
Group: Applications/Text
Source: http://extensions.services.openoffice.org/files/2318/4/as_IN.oxt
URL: http://extensions.services.openoffice.org/project/AssameseDict
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+ or LGPLv2+ or MPLv1.1
BuildArch: noarch

Requires: hunspell

%description
Assamese hunspell dictionaries.

%prep
%setup -q -c -n hunspell-as

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p as_IN.* $RPM_BUILD_ROOT/%{_datadir}/myspell/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_as_IN.txt COPYING COPYING.MPL COPYING.GPL COPYING.LGPL

%{_datadir}/myspell/*

%changelog
* Tue Apr 28 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.3-1
- initial version



From ellert at fedoraproject.org  Wed Apr 29 08:11:50 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 29 Apr 2009 08:11:50 +0000 (UTC)
Subject: rpms/globus-openssl-module/EL-5 globus-openssl-module-sslinit.patch,
	NONE, 1.1 globus-openssl-module-typo.patch, NONE,
	1.1 globus-openssl-module.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429081150.6918E70136@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23727/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-openssl-module-sslinit.patch 
	globus-openssl-module-typo.patch globus-openssl-module.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-openssl-module-sslinit.patch:

--- NEW FILE globus-openssl-module-sslinit.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include "version.h"
 #include "openssl/crypto.h"
 #include "openssl/err.h"
+#include "openssl/ssl.h"
 
 static int
 globus_l_openssl_activate(void);
@@ -75,6 +76,7 @@
     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
     
+    SSL_library_init();
     globus_module_activate(GLOBUS_COMMON_MODULE);
     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));

globus-openssl-module-typo.patch:

--- NEW FILE globus-openssl-module-typo.patch ---
diff -ur globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_openssl_module-0.6.orig/pkgdata/pkg_data_src.gpt.in	2005-03-29 01:32:37.000000000 +0200
+++ globus_openssl_module-0.6/pkgdata/pkg_data_src.gpt.in	2008-07-12 17:12:28.000000000 +0200
@@ -4,7 +4,7 @@
 <gpt_package_metadata Name="globus_openssl_module" Format_Version="0.02">
 
     <Aging_Version Major="0" Minor="6" Age="0"/>
-    <Description>Globus OpenSSL Module Wraper</Description>
+    <Description>Globus OpenSSL Module Wrapper</Description>
     <Functional_Group >Security</Functional_Group>
     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
 


--- NEW FILE globus-openssl-module.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Initialization of openssl module should call SSL_library_init:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch0:		%{name}-sslinit.patch
#		Fix a typo in the metadata file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
Patch1:		%{name}-typo.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-proxy-ssl-devel >= 1
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-proxy-ssl-devel >= 1
Requires:	globus-common-devel >= 3
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus OpenSSL Module Wrapper

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus OpenSSL Module Wrapper Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus OpenSSL Module Wrapper Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-openssl-module-0_6-1_fc9:EL-5:globus-openssl-module-0.6-1.fc9.src.rpm:1240992640


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:49:40 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:11:19 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_openssl_module-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:49:40 -0000	1.1
+++ sources	29 Apr 2009 08:11:19 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz



From pnemade at fedoraproject.org  Wed Apr 29 08:24:40 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed, 29 Apr 2009 08:24:40 +0000 (UTC)
Subject: rpms/hunspell-as/F-11 .cvsignore, 1.1, 1.2 hunspell-as.spec, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429082440.7718770133@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-as/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29553

Modified Files:
	.cvsignore hunspell-as.spec sources 
Log Message:
* Wed Apr 29 2009 Parag <pnemade at redhat.com> - 1.0.3-2
- Fix source issue in cvs




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-as/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:22:19 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:24:38 -0000	1.2
@@ -0,0 +1 @@
+as_IN.oxt


Index: hunspell-as.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-as/F-11/hunspell-as.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hunspell-as.spec	29 Apr 2009 08:10:45 -0000	1.1
+++ hunspell-as.spec	29 Apr 2009 08:24:38 -0000	1.2
@@ -1,7 +1,7 @@
 Name: hunspell-as
 Summary: Assamese hunspell dictionaries
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Text
 Source: http://extensions.services.openoffice.org/files/2318/4/as_IN.oxt
 URL: http://extensions.services.openoffice.org/project/AssameseDict
@@ -34,5 +34,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Apr 29 2009 Parag <pnemade at redhat.com> - 1.0.3-2
+- Fix source issue in cvs
+
 * Tue Apr 28 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.3-1
 - initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-as/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:22:19 -0000	1.1
+++ sources	29 Apr 2009 08:24:38 -0000	1.2
@@ -0,0 +1 @@
+110e6d7bafb30a8d18b707537e070096  as_IN.oxt



From dnovotny at fedoraproject.org  Wed Apr 29 08:31:22 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 29 Apr 2009 08:31:22 +0000 (UTC)
Subject: rpms/file/devel file-5.00-erlang.patch, NONE, 1.1 file.spec, 1.94,
	1.95
Message-ID: <20090429083123.0762070133@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32113

Modified Files:
	file.spec 
Added Files:
	file-5.00-erlang.patch 
Log Message:

fix #498036


file-5.00-erlang.patch:

--- NEW FILE file-5.00-erlang.patch ---
diff -up file-5.00/magic/Magdir/erlang.tue file-5.00/magic/Magdir/erlang
--- file-5.00/magic/Magdir/erlang.tue	2009-04-29 09:38:45.000000000 +0200
+++ file-5.00/magic/Magdir/erlang	2009-04-29 09:40:58.000000000 +0200
@@ -12,7 +12,7 @@
 >8	string	BEAM		Erlang BEAM file
 
 # 4.2 version may have a copyright notice!
-4	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
-79	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
+4	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
+79	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
 
-4	string	1.0 Fri Feb 3 09:55:56 MET 1995	Erlang JAM file - version 4.3
+4	string	1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995	Erlang JAM file - version 4.3


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- file.spec	20 Apr 2009 08:11:35 -0000	1.94
+++ file.spec	29 Apr 2009 08:30:52 -0000	1.95
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.00
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch3: file-5.00-thumbs-db.patch
 Patch4: file-5.00-fonts-ttc-pfa.patch
 Patch5: file-5.00-fdleak.patch
 Patch6: file-5.00-mdmp.patch
+Patch7: file-5.00-erlang.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +76,8 @@ file(1) command.
 %patch5 -p1
 #fixes #485835
 %patch6 -p1
+#fixes #498036
+%patch7 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -148,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 29 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-8
+- fix #498036 - Elang JAM file definition breaks detection of postscript-files
+
 * Mon Apr 20 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-7
 - fix previous patch:
   the name of the format is a bit different (MDUMP -> MDMP)



From pnemade at fedoraproject.org  Wed Apr 29 08:34:41 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed, 29 Apr 2009 08:34:41 +0000 (UTC)
Subject: rpms/hunspell-as/devel .cvsignore, 1.1, 1.2 hunspell-as.spec, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090429083441.2211A70133@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-as/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv964

Modified Files:
	.cvsignore hunspell-as.spec sources 
Log Message:
* Wed Apr 29 2009 Parag <pnemade at redhat.com> - 1.0.3-2
- Fix source issue in cvs




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-as/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:22:19 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:34:10 -0000	1.2
@@ -0,0 +1 @@
+as_IN.oxt


Index: hunspell-as.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-as/devel/hunspell-as.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hunspell-as.spec	29 Apr 2009 07:54:41 -0000	1.1
+++ hunspell-as.spec	29 Apr 2009 08:34:10 -0000	1.2
@@ -1,7 +1,7 @@
 Name: hunspell-as
 Summary: Assamese hunspell dictionaries
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Text
 Source: http://extensions.services.openoffice.org/files/2318/4/as_IN.oxt
 URL: http://extensions.services.openoffice.org/project/AssameseDict
@@ -34,5 +34,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Apr 29 2009 Parag <pnemade at redhat.com> - 1.0.3-2
+- Fix source issue in cvs
+
 * Tue Apr 28 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.3-1
 - initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-as/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:22:19 -0000	1.1
+++ sources	29 Apr 2009 08:34:10 -0000	1.2
@@ -0,0 +1 @@
+110e6d7bafb30a8d18b707537e070096  as_IN.oxt



From mmaslano at fedoraproject.org  Wed Apr 29 08:59:21 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 29 Apr 2009 08:59:21 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny/devel perl-Capture-Tiny.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429085921.6908770133@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Capture-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6448

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Capture-Tiny.spec 
Log Message:
* Mon Apr 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.05-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-Capture-Tiny.spec ---
Name:           perl-Capture-Tiny
Version:        0.05
Release:        1%{?dist}
Summary:        Capture STDOUT and STDERR from Perl, XS or external programs
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Capture-Tiny/
Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 0:5.006
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More) >= 0.47
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Capture::Tiny provides a simple, portable way to capture anything sent to
STDOUT or STDERR, regardless of whether it comes from Perl, from XS code or
from an external program. Optionally, output can be teed so that it is
captured while being passed through to the original handles. Yes, it even
works on Windows. Stop guessing which of a dozen capturing modules to use
in any particular situation and just use this one.

%prep
%setup -q -n Capture-Tiny-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.05-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:15:19 -0000	1.1
+++ .cvsignore	29 Apr 2009 08:58:51 -0000	1.2
@@ -0,0 +1 @@
+Capture-Tiny-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:15:19 -0000	1.1
+++ sources	29 Apr 2009 08:58:51 -0000	1.2
@@ -0,0 +1 @@
+e242915f57878465ef0b947eaf2e0b5c  Capture-Tiny-0.05.tar.gz



From akurtakov at fedoraproject.org  Wed Apr 29 09:24:31 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 29 Apr 2009 09:24:31 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.638,1.639
Message-ID: <20090429092431.43B5E70133@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599/devel

Modified Files:
	eclipse.spec 
Log Message:
* Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.5
- Bump tomcat6 BR.
- Fix director run to not require sed on bundles.info.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -p -r1.638 -r1.639
--- eclipse.spec	22 Apr 2009 08:18:30 -0000	1.638
+++ eclipse.spec	29 Apr 2009 09:23:58 -0000	1.639
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.4%{?dist}
+Release:        0.2.5%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -183,7 +183,7 @@ BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
 BuildRequires:  icu4j-eclipse >= 4.0.1
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
-BuildRequires:  tomcat6-servlet-2.5-api
+BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
@@ -255,7 +255,7 @@ Requires: jakarta-commons-el >= 1.0-9
 Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
-Requires: tomcat6-servlet-2.5-api > 6.0.18-9.1
+Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
 Requires: jetty >= 5.1.14-1.6
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
@@ -840,6 +840,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 # Explode the resulting SDK tarball
 tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 
+cp plugins/org.eclipse.ecf* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+cp plugins/org.apache.commons.codec* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+cp plugins/org.apache.commons.httpclient* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
 # ECF filetransfer plugins we built
 #rm $sdkDir/plugins/org.eclipse.ecf*.jar
 #unzip -d $RPM_BUILD_ROOT%{_libdir} \
@@ -1044,10 +1048,10 @@ rm -r $sdkDir/configuration/org.eclipse.
 
 %if %{initialize}
 #Find better way to fix this
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+#sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+#sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1587,6 +1591,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.5
+- Bump tomcat6 BR.
+- Fix director run to not require sed on bundles.info.
+
 * Wed Apr 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.4
 - Update to newer I-build.
 - Update fedora customization.



From mhlavink at fedoraproject.org  Wed Apr 29 09:33:03 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 29 Apr 2009 09:33:03 +0000 (UTC)
Subject: rpms/dovecot/F-10 .cvsignore, 1.48, 1.49 dovecot.spec, 1.118,
	1.119 sources, 1.51, 1.52
Message-ID: <20090429093303.7224970133@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14021

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
updated to 1.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	11 Feb 2009 10:40:18 -0000	1.48
+++ .cvsignore	29 Apr 2009 09:32:32 -0000	1.49
@@ -1,8 +1,4 @@
-dovecot-1.1.11-managesieve-0.10.5.diff.gz
-dovecot-1.1.11-managesieve-0.10.5.diff.gz.sig
-dovecot-1.1.11.tar.gz
-dovecot-1.1.11.tar.gz.sig
-dovecot-1.1-managesieve-0.10.5.tar.gz
-dovecot-1.1-managesieve-0.10.5.tar.gz.sig
+dovecot-1.1.14-managesieve-0.10.6.diff.gz
+dovecot-1.1.14.tar.gz
+dovecot-1.1-managesieve-0.10.6.tar.gz
 dovecot-sieve-1.1.6.tar.gz
-dovecot-sieve-1.1.6.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- dovecot.spec	11 Feb 2009 10:40:18 -0000	1.118
+++ dovecot.spec	29 Apr 2009 09:32:32 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.11
+Version: 1.1.14
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
 %define build_managesieve 1
 %define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
-%define managesieve_version 0.10.5
+%define managesieve_version 0.10.6
 %define managesieve_name dovecot-1.1-managesieve
 
 URL: http://www.dovecot.org/
@@ -425,6 +425,9 @@ fi
 
 
 %changelog
+* Wed Feb 11 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.14-1
+- updated to 1.1.14
+
 * Wed Feb 11 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.11-1
 - updated to 1.1.11
 - IMAP: PERMANENTFLAGS list didn't contain \*, causing some clients


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	11 Feb 2009 10:40:18 -0000	1.51
+++ sources	29 Apr 2009 09:32:32 -0000	1.52
@@ -1,8 +1,4 @@
-420aa314145670a1ea2d015a7d0cecb6  dovecot-1.1.11-managesieve-0.10.5.diff.gz
-a0a51d389c796661f353402bd7697c08  dovecot-1.1.11-managesieve-0.10.5.diff.gz.sig
-c973eb41aca79fb16630a16f0d84f765  dovecot-1.1.11.tar.gz
-17e04c718ca043cbfa041eff13c5e770  dovecot-1.1.11.tar.gz.sig
-972ad948be782b7cf37fc74bd17795e2  dovecot-1.1-managesieve-0.10.5.tar.gz
-7e68d7212ce1904f80064c466a525150  dovecot-1.1-managesieve-0.10.5.tar.gz.sig
+09f9dea802678cb0fbd6f66cea0b0e2d  dovecot-1.1.14-managesieve-0.10.6.diff.gz
+60b1deccc0ae77e5669060d2b1894e5e  dovecot-1.1.14.tar.gz
+2b90a3f5deeaf5abab04d9b5a70a8359  dovecot-1.1-managesieve-0.10.6.tar.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
-a9c6b8b2eab4d6a72395ffde1fb53327  dovecot-sieve-1.1.6.tar.gz.sig



From pkgdb at fedoraproject.org  Wed Apr 29 10:01:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 10:01:56 +0000
Subject: [pkgdb] subversion: pandiarajan19 has requested watchcommits
Message-ID: <20090429100157.295B910F881@bastion2.fedora.phx.redhat.com>

pandiarajan19 has requested the watchcommits acl on subversion (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Wed Apr 29 10:02:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 10:02:35 +0000
Subject: [pkgdb] subversion: pandiarajan19 has given up watchcommits
Message-ID: <20090429100235.35F2F10F881@bastion2.fedora.phx.redhat.com>

pandiarajan19 has given up the watchcommits acl on subversion (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/subversion



From dnovotny at fedoraproject.org  Wed Apr 29 10:19:50 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 29 Apr 2009 10:19:50 +0000 (UTC)
Subject: rpms/file/F-10 file-4.26-erlang.patch,NONE,1.1 file.spec,1.82,1.83
Message-ID: <20090429101950.7131E70133@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21508

Modified Files:
	file.spec 
Added Files:
	file-4.26-erlang.patch 
Log Message:

fix #498036


file-4.26-erlang.patch:

--- NEW FILE file-4.26-erlang.patch ---
diff -up file-4.26/magic/Magdir/erlang.tue file-5.00/magic/Magdir/erlang
--- file-4.26/magic/Magdir/erlang.tue	2009-04-29 09:38:45.000000000 +0200
+++ file-4.26/magic/Magdir/erlang	2009-04-29 09:40:58.000000000 +0200
@@ -12,7 +12,7 @@
 >8	string	BEAM		Erlang BEAM file
 
 # 4.2 version may have a copyright notice!
-4	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
-79	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
+4	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
+79	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
 
-4	string	1.0 Fri Feb 3 09:55:56 MET 1995	Erlang JAM file - version 4.3
+4	string	1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995	Erlang JAM file - version 4.3


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-10/file.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- file.spec	14 Jan 2009 14:41:27 -0000	1.82
+++ file.spec	29 Apr 2009 10:19:20 -0000	1.83
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.26
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -14,6 +14,7 @@ Patch0: file-4.21-pybuild.patch
 Patch1: file-4.26-devdrv.patch
 Patch2: file-4.26-mime-encoding.patch
 Patch3: file-4.26-jpeg2000.patch
+Patch4: file-4.26-erlang.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,8 +65,10 @@ file(1) command.
 %patch1 -p1
 #fixes #465994
 %patch2 -p1
-# fixes #476655
+#fixes #476655
 %patch3 -p1
+#fixes #498036
+%patch4 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -139,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 29 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-5
+- fix #498036 - Erlang JAM file definition breaks detection of postscript files
+
 * Wed Jan 14 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-4
 - fix #476655 detect JPEG-2000 Code Stream Bitmap
 



From hadess at fedoraproject.org  Wed Apr 29 10:23:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 10:23:29 +0000 (UTC)
Subject: rpms/bluez/devel dund.conf, NONE, 1.1 dund.init, NONE, 1.1 pand.conf,
	NONE, 1.1 pand.init, NONE, 1.1 rfcomm.init, NONE, 1.1 bluez.spec,
	1.60, 1.61
Message-ID: <20090429102329.4AF3070133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22487

Modified Files:
	bluez.spec 
Added Files:
	dund.conf dund.init pand.conf pand.init rfcomm.init 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 4.37-2
- Split off dund, pand, hidd, and rfcomm helper into a compat package
  (#477890, #473892)


--- NEW FILE dund.conf ---
#DUNDARGS='--search --persist'


--- NEW FILE dund.init ---
#!/bin/sh

# chkconfig:	- 26 89

### BEGIN INIT INFO
# Required-Start: bluetooth
# Default-Start: 
# Short-Description: Bluetooth Dial-Up-Networking Daemon.
# Description: Bluetooth Dial-Up-Networking Daemon. Provides PPP over RFCOMM
# services.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network

[ "${NETWORKING}" = "yes" ] || exit 0

[ -r /etc/sysconfig/dund ] && . /etc/sysconfig/dund

start() 
{
	[ -z "$DUNDARGS" ] && exit 6

        echo -n $"Starting dund: "
        daemon /usr/bin/dund $DUNDARGS
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && touch /var/lock/subsys/dund
        return $RETVAL
}

stop() 
{
        echo -n $"Shutting down dund: "
	/usr/bin/dund -K
	killproc dund
	RETVAL=$?

	rm -f  /var/lock/subsys/dund
        echo
	return $RETVAL
}

# See how we were called.
case "$1" in
  start)
	start
        ;;
  stop)
	stop
        ;;
  force-reload|restart|reload)
	stop
	start
	;;
  try-restart|condrestart)
	[ -e /var/lock/subsys/dund ] && (stop; start)
	;;
  status)
  	status dund
	RETVAL=$?
	;;
  *)
        echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
        exit 3
esac

exit $RETVAL


--- NEW FILE pand.conf ---
#PANDARGS='--listen --role NAP'
#PANDARGS='--search --cache --persist'


--- NEW FILE pand.init ---
#!/bin/sh

# chkconfig:	- 26 89

### BEGIN INIT INFO
# Required-Start: bluetooth
# Default-Start:
# Short-Description: Bluetooth Personal Area Networking Daemon.
# Description: Bluetooth Personal Area Networking Daemon. Provides network
# services over Bluetooth.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network

[ "${NETWORKING}" = "yes" ] || exit 0

[ -r /etc/sysconfig/pand ] && . /etc/sysconfig/pand

start() 
{
	[ -z "$PANDARGS" ] && exit 6
        [ -x /etc/bluetooth/pan/system-up ] && /etc/bluetooth/pan/system-up

        echo -n $"Starting pand: "
        daemon /usr/bin/pand $PANDARGS
	RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch /var/lock/subsys/pand
	return $RETVAL
}

stop() 
{
        echo -n $"Shutting down pand: "
	/usr/bin/pand -K
	killproc pand
	RETVAL=$?
        [ -x /etc/bluetooth/pan/system-down ] && /etc/bluetooth/pan/system-down
	rm -f  /var/lock/subsys/pand
        echo
	return $RETVAL
}

[ -f /usr/bin/pand ] || exit 0

# See how we were called.
case "$1" in
  start)
	start
        ;;
  stop)
	stop
        ;;
  force-reload|restart|reload)
	stop
	start
	;;
  try-restart|condrestart)
	[ -e /var/lock/subsys/pand ] && (stop; start)
	;;
  status)
  	status pand
	RETVAL=$?
	;;
  *)
        echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
        exit 3
esac

exit $RETVAL


--- NEW FILE rfcomm.init ---
#!/bin/sh

# chkconfig:	- 27 88

### BEGIN INIT INFO
# Required-Start: bluetooth
# Default-Start: 
# Short-Description: Bluetooth RFCOMM setup.
# Description: Bluetooth RFCOMM setup. Sets up serial devices
# over Bluetooth.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network

[ "${NETWORKING}" = "yes" ] || exit 0

start() 
{
        echo -n $"Starting rfcomm: "
        rfcomm bind all
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && touch /var/lock/subsys/rfcomm
        return $RETVAL
}

stop() 
{
        echo -n $"Shutting down rfcomm: "
	rfcomm release all
	RETVAL=$?

	rm -f  /var/lock/subsys/rfcomm
        echo
	return $RETVAL
}

# See how we were called.
case "$1" in
  start)
	start
        ;;
  stop)
	stop
        ;;
  force-reload|restart|reload)
	stop
	start
	;;
  try-restart|condrestart)
	[ -e /var/lock/subsys/rfcomm ] && (stop; start)
	;;
  status)
        RETVAL=1
  	[ -e /var/lock/subsys/rfcomm ] && RETVAL=0
	;;
  *)
        echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
        exit 3
esac

exit $RETVAL


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- bluez.spec	23 Apr 2009 12:54:21 -0000	1.60
+++ bluez.spec	29 Apr 2009 10:22:58 -0000	1.61
@@ -1,13 +1,18 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.37
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
-Source3: bluez-uinput.modules
+Source3: dund.init
+Source4: dund.conf
+Source5: pand.init
+Source6: pand.conf
+Source7: rfcomm.init
+Source8: bluez-uinput.modules
 Patch1: bluez-utils-oui-usage.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=450081
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
@@ -80,6 +85,11 @@ Provides: bluez-utils-alsa = %{version}-
 Group: System Environment/Daemons
 Requires: bluez-libs = %{version}
 
+%package compat
+Summary: Compatibility utilities for Bluetooth devices
+Group: System Environment/Daemons
+Requires: bluez-libs = %{version}
+
 %description cups
 This package contains the CUPS backend 
 
@@ -96,6 +106,10 @@ Libraries for use in Bluetooth applicati
 bluez-libs-devel contains development libraries and headers for
 use in Bluetooth applications.
 
+%description compat
+This package contains compatibility utilities for Bluetooth devices.
+This includes hidd, dund and pand.
+
 %prep
 
 %setup -q
@@ -117,8 +131,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la			
 	$RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la	\
 	$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
 
-install -D -m0755 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bluetooth
-install -D -m0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bluetooth
+for a in bluetooth dund pand rfcomm ; do 
+	install -D -m0755 $RPM_SOURCE_DIR/$a.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/$a
+	if [ -e $RPM_SOURCE_DIR/$a.conf ] ; then
+		install -D -m0644 $RPM_SOURCE_DIR/$a.conf $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/$a
+	fi
+done
 
 # Remove the cups backend from libdir, and install it in /usr/lib whatever the install
 if test -d ${RPM_BUILD_ROOT}/usr/lib64/cups ; then
@@ -129,7 +147,7 @@ fi
 install -D -m0644 scripts/bluetooth.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
 install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial
 
-install -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
+install -D -m0755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
 install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth
 
@@ -153,20 +171,47 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del bluetooth
 fi
 
+%post compat
+/sbin/chkconfig --add dund
+/sbin/chkconfig --add pand
+/sbin/chkconfig --add rfcomm
+if [ "$1" -ge "1" ]; then
+	/sbin/service dund condrestart >/dev/null 2>&1 || :
+	/sbin/service pand condrestart >/dev/null 2>&1 || :
+	/sbin/service rfcomm condrestart >/dev/null 2>&1 || :
+fi
+exit 0
+
+%preun compat
+if [ "$1" = "0" ]; then
+	/sbin/service dund stop >/dev/null 2>&1 || :
+	/sbin/service pand stop >/dev/null 2>&1 || :
+	/sbin/service rfcomm stop >/dev/null 2>&1 || :
+	/sbin/chkconfig --del dund
+	/sbin/chkconfig --del pand
+	/sbin/chkconfig --del rfcomm
+fi
+
 %files
 %defattr(-, root, root)
-%{_bindir}/*
+%{_bindir}/ciptool
+%{_bindir}/dfutool
+%{_bindir}/hcitool
+%{_bindir}/l2ping
+%{_bindir}/rfcomm
+%{_bindir}/sdptool
 %{_sbindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
+%config(noreplace) %{_sysconfdir}/sysconfig/bluetooth
+%config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %{_libdir}/bluetooth/
 /lib/udev/bluetooth_serial
 %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
-/etc/rc.d/init.d/*
+%{_sysconfdir}/rc.d/init.d/bluetooth
 %{_localstatedir}/lib/bluetooth
 
 %files libs
@@ -194,7 +239,22 @@ fi
 %{_libdir}/alsa-lib/*.so
 %{_sysconfdir}/alsa/bluetooth.conf
 
+%files compat
+%defattr(-, root, root)
+%{_bindir}/dund
+%{_bindir}/pand
+%{_bindir}/hidd
+%{_sysconfdir}/rc.d/init.d/dund
+%{_sysconfdir}/rc.d/init.d/rfcomm
+%{_sysconfdir}/rc.d/init.d/pand
+%config(noreplace) %{_sysconfdir}/sysconfig/dund
+%config(noreplace) %{_sysconfdir}/sysconfig/pand
+
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 4.37-2
+- Split off dund, pand, hidd, and rfcomm helper into a compat package
+  (#477890, #473892)
+
 * Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 4.37-1
 - Update to 4.37
 



From tadej at fedoraproject.org  Wed Apr 29 10:43:27 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Wed, 29 Apr 2009 10:43:27 +0000 (UTC)
Subject: rpms/PyQwt/F-9 PyQwt.spec,1.1,1.2
Message-ID: <20090429104328.0553370133@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24664

Modified Files:
	PyQwt.spec 
Log Message:
Rebuild for new qwt.



Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-9/PyQwt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- PyQwt.spec	30 Jan 2009 19:00:16 -0000	1.1
+++ PyQwt.spec	29 Apr 2009 10:42:57 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           PyQwt
 Version:        5.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Sat Mar 5 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-4
+- rebuild for new qwt (fixes RH bug #487348)
+
 * Sat Jan 24 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-3
 - made grace.py executable again
 



From dnovotny at fedoraproject.org  Wed Apr 29 10:54:17 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 29 Apr 2009 10:54:17 +0000 (UTC)
Subject: rpms/procps/devel procps-3.2.7-cleanup.patch, NONE, 1.1 procps.spec,
	1.79, 1.80
Message-ID: <20090429105417.7F5AC70133@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/procps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26791

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-cleanup.patch 
Log Message:

fix #498182


procps-3.2.7-cleanup.patch:

--- NEW FILE procps-3.2.7-cleanup.patch ---
diff -ur procps-3.2.7.orig/proc/devname.c procps-3.2.7/proc/devname.c
--- procps-3.2.7.orig/proc/devname.c	2008-10-29 15:49:33.000000000 -0400
+++ procps-3.2.7/proc/devname.c	2008-11-01 09:22:59.000000000 -0400
@@ -130,7 +130,7 @@
 }
 
 // major 204 is a mess -- "Low-density serial ports"
-static const char low_density_names[][4] = {
+static const char low_density_names[][5] = {
 "LU0",  "LU1",  "LU2",  "LU3",
 "FB0",
 "SA0",  "SA1",  "SA2",


Index: procps.spec
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- procps.spec	24 Feb 2009 10:07:15 -0000	1.79
+++ procps.spec	29 Apr 2009 10:53:47 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -89,6 +89,8 @@ Patch41: procps-3.2.7-ps-cgroup.patch
 Patch42: procps-3.2.7-vmstat-partstats-reqwrites.patch
 # '-l' option of 'free' documented
 Patch43: procps-3.2.7-free-hlmem.patch
+#fixes #498182 -  procps string size issue
+Patch44: procps-3.2.7-cleanup.patch
 
 
 BuildRequires: ncurses-devel
@@ -158,6 +160,7 @@ working directory of a process or proces
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
 
 cp %SOURCE1 .
 
@@ -195,6 +198,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Apr 29 2009 Daniel Novotny <dnovotny at redhat.com> 3.2.7-28
+- fix #498182 -  procps string size issue
+
 * Tue Feb 24 2009 Daniel Novotny <dnovotny at redhat.com> 3.2.7-27
 - included -l option in free man page
 



From hadess at fedoraproject.org  Wed Apr 29 11:01:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 11:01:59 +0000 (UTC)
Subject: rpms/python-gdata/F-11 gdata-cryptomath_sha_deprecation.diff, NONE, 
	1.1 python-gdata.spec, 1.16, 1.17
Message-ID: <20090429110159.6910470133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27987

Modified Files:
	python-gdata.spec 
Added Files:
	gdata-cryptomath_sha_deprecation.diff 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-2
- Fix deprecation warning (#492641)

gdata-cryptomath_sha_deprecation.diff:

--- NEW FILE gdata-cryptomath_sha_deprecation.diff ---
diff --git a/src/gdata/tlslite/utils/cryptomath.py b/src/gdata/tlslite/utils/cryptomath.py
index 51d6dff..67fb398 100755
--- a/src/gdata/tlslite/utils/cryptomath.py
+++ b/src/gdata/tlslite/utils/cryptomath.py
@@ -6,7 +6,7 @@ import os
 import math
 import base64
 import binascii
-import sha
+import hashlib
 
 from compat import *
 
@@ -195,7 +195,7 @@ def numBytes(n):
     return int(math.ceil(bits / 8.0))
 
 def hashAndBase64(s):
-    return stringToBase64(sha.sha(s).digest())
+    return stringToBase64(hashlib.sha1(s).digest())
 
 def getBase64Nonce(numChars=22): #defaults to an 132 bit nonce
     bytes = getRandomBytes(numChars)


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/F-11/python-gdata.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-gdata.spec	24 Apr 2009 00:55:53 -0000	1.16
+++ python-gdata.spec	29 Apr 2009 11:01:29 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           python-gdata
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python module for accessing online Google services
 
 Group:          Development/Languages
@@ -11,6 +11,9 @@ URL:            http://code.google.com/p
 Source0:        http://gdata-python-client.googlecode.com/files/gdata-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://code.google.com/p/gdata-python-client/issues/detail?id=236
+Patch0:         gdata-cryptomath_sha_deprecation.diff
+
 BuildArch:      noarch
 BuildRequires:  python-devel
 Requires:       python >= 2.5
@@ -27,6 +30,8 @@ This is a Python module for accessing on
 %prep
 %setup -q -n gdata-%{version}
 
+%patch0 -p1 -b .sha
+
 %build
 %{__python} setup.py build
 
@@ -48,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-2
+- Fix deprecation warning (#492641)
+
 * Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
 - Update to 1.3.1
 



From gerd at fedoraproject.org  Wed Apr 29 11:06:28 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed, 29 Apr 2009 11:06:28 +0000 (UTC)
Subject: rpms/parrot/F-9 import.log, NONE,
	1.1 parrot-1.0.0-rpath-removal.patch, 
	NONE, 1.1 parrot-install_files.patch, NONE, 1.1 parrot.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429110628.2FD5570133@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28706/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log parrot-1.0.0-rpath-removal.patch 
	parrot-install_files.patch parrot.spec 
Log Message:
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created



--- NEW FILE import.log ---
parrot-1_0_0-6_fc10:F-9:parrot-1.0.0-6.fc10.src.rpm:1241002909

parrot-1.0.0-rpath-removal.patch:

--- NEW FILE parrot-1.0.0-rpath-removal.patch ---
--- config/inter/libparrot.pm
+++ config/inter/libparrot.pm
@@ -98,21 +98,13 @@
     # Set -rpath (or equivalent) for executables to find the
     # shared libparrot in the build directory.
     $conf->data->set(
-        rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('build_dir')
-            . $conf->data->get('slash')
-            . $conf->data->get('blib_dir')
-        : ''
+        rpath_blib => ''
     );
 
     # Set -rpath (or equivalent) for the installed executables to find the
     # installed shared libparrot.
     $conf->data->set(
-        rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('libdir')
-        : ''
+        rpath_lib => ''
     );
 
     unless ( defined( $conf->data->get('libparrot_ldflags') ) ) {

parrot-install_files.patch:

--- NEW FILE parrot-install_files.patch ---
--- tools/dev/install_files.pl	2009-03-11 00:35:20.000000000 +0100
+++ tools/dev/install_files.pl	2009-04-17 14:34:25.000000000 +0200
@@ -217,7 +217,7 @@
         # as it is typically done with automake installed packages.  If there
         # is a use case to make this configurable we'll add a seperate
         # --pkgconfigdir option.
-        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
+        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
     }
     elsif ( /^compilers/ ) {
         $dest =~ s/^compilers/languages/;
@@ -292,6 +292,16 @@
     else {
         next unless -e $src;
         next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+        if (-l $src) { 
+            # check if the system supports symbolic linking 
+            use Config; 
+            if ($Config{d_symlink} && $Config{d_readlink}) { 
+            # copy as symbolic link 
+                symlink(readlink($src), $dest); 
+                print "$dest\n"; 
+                next; 
+            } 
+        } 
         copy( $src, $dest ) or die "copy $src to $dest: $!\n";
         print "$dest\n";
     }


--- NEW FILE parrot.spec ---
Name:           parrot
Version:        1.0.0
Release:        6%{?dist}
Summary:        Parrot is a virtual machine
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://www.parrot.org/

Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
# Without Patch0 %{_libdir}/libparrot.so would not be a symbolic link to
# %{_libdir}/libparrot.so.%{version}  
# Symlink:  libparrot.so ->  libparrot.so.%{version}
# See for upstream: https://trac.parrot.org/parrot/ticket/509
# Extended for the package to have no subdirectory under pkgconfig
Patch0:         parrot-install_files.patch
Patch1:         parrot-1.0.0-rpath-removal.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel
BuildRequires:  ncurses-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::Simple)
BuildRequires:  ctags
BuildRequires:  openssl-devel
 

%package docs
Summary:        Parrot Virtual Machine documentation
Group:          Documentation
Requires:       perl(strict)
Requires:       perl(warnings)

%package devel
Summary:        Parrot Virtual Machine development headers and libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%package tools
Summary:        Parrot Virtual Machine development for languages
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Pod::Simple)
Requires:       perl(File::Which) >= 0.05
# It is necessary to have installed the package "perl-Perl-Critic" to install
# the parrot-tools
Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}

%description
Parrot is a virtual machine designed to efficiently compile and execute
bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
as well as variety of other languages.

%description docs
Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
examples about the Parrot Virtual Machine.

%description devel
Parrot Virtual Machine development headers and libraries.

%description tools
Parrot Virtual Machine development files for building languages.

%prep
%setup -q
%patch0 -p0
%patch1 -b .rpatch

%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
    src/library.c
%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
    tools/dev/install_files.pl


cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
EOF

%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%ifarch %{ix86} x86_64
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
%else
# PowerPC, not all optimize-options work with the PowerPC-architecture
# the PGE don't build with the optimize="-O2" option on PowerPC
    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
%endif

%{__perl} Configure.pl \
    --prefix=%{_usr} \
    --libdir=%{_libdir} \
    --sysconfdir=%{_sysconfdir} \
    --infodir=%{_datadir}/info \
    --mandir=%{_mandir} \
    --cc="%{__cc}" \
    --cxx=%{__cxx} \
    --optimize="$RPM_OPT_FLAGS" \
    --parrot_is_shared \
    --lex=%{_bindir}/flex \
    --yacc=%{_bindir}/yacc \
    --libs='-lcurses -lm'

# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
# to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# pbc_to_exe would not build if %{_smp_mflags} would used
make
make parrot_utils
make installable
make html


%install
rm -rf $RPM_BUILD_ROOT

# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# install-dev: Same as 'install' taget but also install support for development.
make install-dev DESTDIR=$RPM_BUILD_ROOT

%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/


# Drop the docs so rpm can pick them up itself.
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}

# Force permissions on doc directories.
find docs examples -type d -exec chmod 755 {} \;
find docs examples -type f -exec chmod 644 {} \;

# Force permissions on shared versioned libs so they get stripped.
# The parrot-install-script don't set the permissions right
# With changed permissions the dependencies will be found
find %{RPM_PAR_LIB_DIR}dynext -type f -name '*.so' -exec chmod 755 {} \;

# Remove module that should be install instead (perl(File::Which))
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/File


# Added to reduce output errors when using rpmlint

# Force permission on perl-scripts in the "tools" subdirctory
find %{RPM_PAR_LIB_DIR}tools -type f -name "*.pl" -exec chmod 755 {} \; \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
# Set path to parrot binary and Force permission
find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
    -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
    -exec chmod 755 {} \;
# This module is only needed for building and should not be installed (I think)
# module "Parrot::OpLib::core"
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib

# Remove doc-files with zero-length
find docs/html -type f -size 0 -exec rm -f {} \;

# Set path for installed programs in docs package
find examples -type f -name "*.pl" \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/pir/befunge/t/basic.t' \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -type f -name "*.py" \
    -exec %{__sed} -i -e '1 s&#! python&#!/usr/bin/python&' {} \;
find examples -type f -name "*.rb" \
    -exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;

find examples -type f -name "*.pir" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
find examples/shootout -type f -name "random.pasm" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/01-tests.t' \
    -exec %{__sed} -i -e '1 s&#!perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/shootout/revcomp.pir' \
    -exec %{__sed} -i -e '1 s&#!parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/harness' \
    -exec %{__perl} -pi -e 's/\r$//' {} \;

find examples/languages -type f -name harness \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
for file in docs/book/ch09_pct.pod docs/memory_internals.pod; do
        %{__mv} $file timestamp
        iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
        touch -r timestamp $file
done
%{__rm} -f timestamp

# These files *probably* aren't needed.
rm -rf $RPM_BUILD_ROOT%{_usr}/config \
    $RPM_BUILD_ROOT%{_includedir}/src \
    $RPM_BUILD_ROOT%{_usr}/src 

%check
# 'make fulltest' is done by default; it take a lot of time
export LD_LIBRARY_PATH=$( pwd )/blib/lib
FULL='full'
%{?_without_fulltest: FULL=''}
%{?!_without_tests: make ${FULL}test}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
%doc RESPONSIBLE_PARTIES TODO LICENSE
%exclude %{_bindir}/parrot_config
%exclude %{_bindir}/parrot_debugger
%exclude %{_bindir}/pbc_*
%{_bindir}/*
%{_libdir}/parrot/
%exclude %{_libdir}/parrot/%{version}/tools
%exclude %{_libdir}/parrot/%{version}/VERSION
%{_libdir}/libparrot.so.*

%files docs
%defattr(-,root,root,-)
%doc docs examples

%files devel
%defattr(-,root,root,-)
%{_bindir}/parrot_config
%{_bindir}/parrot_debugger
%{_bindir}/pbc_disassemble
%{_bindir}/pbc_info
%{_bindir}/pbc_merge
%{_bindir}/pbc_to_exe
%{_bindir}/pbc_dump
%{_includedir}/parrot
%{_libdir}/libparrot.so
%exclude %{_libdir}/libparrot.a
%{_libdir}/pkgconfig/*

%files tools
%defattr(-,root,root,-)
# Files for building languages
%{_libdir}/parrot/%{version}/tools/*
%{_libdir}/parrot/%{version}/VERSION



%changelog
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:53:36 -0000	1.1
+++ .cvsignore	29 Apr 2009 11:05:56 -0000	1.2
@@ -0,0 +1 @@
+parrot-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:53:36 -0000	1.1
+++ sources	29 Apr 2009 11:05:56 -0000	1.2
@@ -0,0 +1 @@
+649ce1fb7c0edaf89dc1cd52ff267b1a  parrot-1.0.0.tar.gz



From karsten at fedoraproject.org  Wed Apr 29 11:10:12 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 29 Apr 2009 11:10:12 +0000 (UTC)
Subject: rpms/jdom/F-11 jdom.spec,1.23,1.24
Message-ID: <20090429111012.2093A70133@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/jdom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29404

Modified Files:
	jdom.spec 
Log Message:
- bump the release for a s390x rebuild


Index: jdom.spec
===================================================================
RCS file: /cvs/extras/rpms/jdom/F-11/jdom.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- jdom.spec	25 Feb 2009 09:14:26 -0000	1.23
+++ jdom.spec	29 Apr 2009 11:09:41 -0000	1.24
@@ -36,7 +36,7 @@
 
 Name:           jdom
 Version:        1.0
-Release:        6.5%{?dist}
+Release:        6.5%{?dist}.1
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        BSD
@@ -175,6 +175,9 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Karsten Hopp <karsten at redhat.com> 1.0-6.5.1
+- bump the release for a s390x rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-6.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mmaslano at fedoraproject.org  Wed Apr 29 11:10:19 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 29 Apr 2009 11:10:19 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny/F-11 perl-Capture-Tiny.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429111019.AB21470133@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Capture-Tiny/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29460

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Capture-Tiny.spec 
Log Message:
* Mon Apr 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.05-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-Capture-Tiny.spec ---
Name:           perl-Capture-Tiny
Version:        0.05
Release:        1%{?dist}
Summary:        Capture STDOUT and STDERR from Perl, XS or external programs
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Capture-Tiny/
Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 0:5.006
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More) >= 0.47
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Capture::Tiny provides a simple, portable way to capture anything sent to
STDOUT or STDERR, regardless of whether it comes from Perl, from XS code or
from an external program. Optionally, output can be teed so that it is
captured while being passed through to the original handles. Yes, it even
works on Windows. Stop guessing which of a dozen capturing modules to use
in any particular situation and just use this one.

%prep
%setup -q -n Capture-Tiny-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.05-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:15:19 -0000	1.1
+++ .cvsignore	29 Apr 2009 11:09:49 -0000	1.2
@@ -0,0 +1 @@
+Capture-Tiny-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:15:19 -0000	1.1
+++ sources	29 Apr 2009 11:09:49 -0000	1.2
@@ -0,0 +1 @@
+e242915f57878465ef0b947eaf2e0b5c  Capture-Tiny-0.05.tar.gz



From gerd at fedoraproject.org  Wed Apr 29 11:11:51 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed, 29 Apr 2009 11:11:51 +0000 (UTC)
Subject: rpms/parrot/F-10 import.log, NONE,
	1.1 parrot-1.0.0-rpath-removal.patch, NONE,
	1.1 parrot-install_files.patch, NONE, 1.1 parrot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429111151.296E170133@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29143/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log parrot-1.0.0-rpath-removal.patch 
	parrot-install_files.patch parrot.spec 
Log Message:
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created



--- NEW FILE import.log ---
parrot-1_0_0-6_fc10:F-10:parrot-1.0.0-6.fc10.src.rpm:1241003119

parrot-1.0.0-rpath-removal.patch:

--- NEW FILE parrot-1.0.0-rpath-removal.patch ---
--- config/inter/libparrot.pm
+++ config/inter/libparrot.pm
@@ -98,21 +98,13 @@
     # Set -rpath (or equivalent) for executables to find the
     # shared libparrot in the build directory.
     $conf->data->set(
-        rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('build_dir')
-            . $conf->data->get('slash')
-            . $conf->data->get('blib_dir')
-        : ''
+        rpath_blib => ''
     );
 
     # Set -rpath (or equivalent) for the installed executables to find the
     # installed shared libparrot.
     $conf->data->set(
-        rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('libdir')
-        : ''
+        rpath_lib => ''
     );
 
     unless ( defined( $conf->data->get('libparrot_ldflags') ) ) {

parrot-install_files.patch:

--- NEW FILE parrot-install_files.patch ---
--- tools/dev/install_files.pl	2009-03-11 00:35:20.000000000 +0100
+++ tools/dev/install_files.pl	2009-04-17 14:34:25.000000000 +0200
@@ -217,7 +217,7 @@
         # as it is typically done with automake installed packages.  If there
         # is a use case to make this configurable we'll add a seperate
         # --pkgconfigdir option.
-        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
+        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
     }
     elsif ( /^compilers/ ) {
         $dest =~ s/^compilers/languages/;
@@ -292,6 +292,16 @@
     else {
         next unless -e $src;
         next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+        if (-l $src) { 
+            # check if the system supports symbolic linking 
+            use Config; 
+            if ($Config{d_symlink} && $Config{d_readlink}) { 
+            # copy as symbolic link 
+                symlink(readlink($src), $dest); 
+                print "$dest\n"; 
+                next; 
+            } 
+        } 
         copy( $src, $dest ) or die "copy $src to $dest: $!\n";
         print "$dest\n";
     }


--- NEW FILE parrot.spec ---
Name:           parrot
Version:        1.0.0
Release:        6%{?dist}
Summary:        Parrot is a virtual machine
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://www.parrot.org/

Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
# Without Patch0 %{_libdir}/libparrot.so would not be a symbolic link to
# %{_libdir}/libparrot.so.%{version}  
# Symlink:  libparrot.so ->  libparrot.so.%{version}
# See for upstream: https://trac.parrot.org/parrot/ticket/509
# Extended for the package to have no subdirectory under pkgconfig
Patch0:         parrot-install_files.patch
Patch1:         parrot-1.0.0-rpath-removal.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel
BuildRequires:  ncurses-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::Simple)
BuildRequires:  ctags
BuildRequires:  openssl-devel
 

%package docs
Summary:        Parrot Virtual Machine documentation
Group:          Documentation
Requires:       perl(strict)
Requires:       perl(warnings)

%package devel
Summary:        Parrot Virtual Machine development headers and libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%package tools
Summary:        Parrot Virtual Machine development for languages
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Pod::Simple)
Requires:       perl(File::Which) >= 0.05
# It is necessary to have installed the package "perl-Perl-Critic" to install
# the parrot-tools
Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}

%description
Parrot is a virtual machine designed to efficiently compile and execute
bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
as well as variety of other languages.

%description docs
Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
examples about the Parrot Virtual Machine.

%description devel
Parrot Virtual Machine development headers and libraries.

%description tools
Parrot Virtual Machine development files for building languages.

%prep
%setup -q
%patch0 -p0
%patch1 -b .rpatch

%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
    src/library.c
%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
    tools/dev/install_files.pl


cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
EOF

%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%ifarch %{ix86} x86_64
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
%else
# PowerPC, not all optimize-options work with the PowerPC-architecture
# the PGE don't build with the optimize="-O2" option on PowerPC
    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
%endif

%{__perl} Configure.pl \
    --prefix=%{_usr} \
    --libdir=%{_libdir} \
    --sysconfdir=%{_sysconfdir} \
    --infodir=%{_datadir}/info \
    --mandir=%{_mandir} \
    --cc="%{__cc}" \
    --cxx=%{__cxx} \
    --optimize="$RPM_OPT_FLAGS" \
    --parrot_is_shared \
    --lex=%{_bindir}/flex \
    --yacc=%{_bindir}/yacc \
    --libs='-lcurses -lm'

# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
# to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# pbc_to_exe would not build if %{_smp_mflags} would used
make
make parrot_utils
make installable
make html


%install
rm -rf $RPM_BUILD_ROOT

# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# install-dev: Same as 'install' taget but also install support for development.
make install-dev DESTDIR=$RPM_BUILD_ROOT

%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/


# Drop the docs so rpm can pick them up itself.
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}

# Force permissions on doc directories.
find docs examples -type d -exec chmod 755 {} \;
find docs examples -type f -exec chmod 644 {} \;

# Force permissions on shared versioned libs so they get stripped.
# The parrot-install-script don't set the permissions right
# With changed permissions the dependencies will be found
find %{RPM_PAR_LIB_DIR}dynext -type f -name '*.so' -exec chmod 755 {} \;

# Remove module that should be install instead (perl(File::Which))
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/File


# Added to reduce output errors when using rpmlint

# Force permission on perl-scripts in the "tools" subdirctory
find %{RPM_PAR_LIB_DIR}tools -type f -name "*.pl" -exec chmod 755 {} \; \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
# Set path to parrot binary and Force permission
find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
    -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
    -exec chmod 755 {} \;
# This module is only needed for building and should not be installed (I think)
# module "Parrot::OpLib::core"
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib

# Remove doc-files with zero-length
find docs/html -type f -size 0 -exec rm -f {} \;

# Set path for installed programs in docs package
find examples -type f -name "*.pl" \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/pir/befunge/t/basic.t' \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -type f -name "*.py" \
    -exec %{__sed} -i -e '1 s&#! python&#!/usr/bin/python&' {} \;
find examples -type f -name "*.rb" \
    -exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;

find examples -type f -name "*.pir" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
find examples/shootout -type f -name "random.pasm" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/01-tests.t' \
    -exec %{__sed} -i -e '1 s&#!perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/shootout/revcomp.pir' \
    -exec %{__sed} -i -e '1 s&#!parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/harness' \
    -exec %{__perl} -pi -e 's/\r$//' {} \;

find examples/languages -type f -name harness \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
for file in docs/book/ch09_pct.pod docs/memory_internals.pod; do
        %{__mv} $file timestamp
        iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
        touch -r timestamp $file
done
%{__rm} -f timestamp

# These files *probably* aren't needed.
rm -rf $RPM_BUILD_ROOT%{_usr}/config \
    $RPM_BUILD_ROOT%{_includedir}/src \
    $RPM_BUILD_ROOT%{_usr}/src 

%check
# 'make fulltest' is done by default; it take a lot of time
export LD_LIBRARY_PATH=$( pwd )/blib/lib
FULL='full'
%{?_without_fulltest: FULL=''}
%{?!_without_tests: make ${FULL}test}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
%doc RESPONSIBLE_PARTIES TODO LICENSE
%exclude %{_bindir}/parrot_config
%exclude %{_bindir}/parrot_debugger
%exclude %{_bindir}/pbc_*
%{_bindir}/*
%{_libdir}/parrot/
%exclude %{_libdir}/parrot/%{version}/tools
%exclude %{_libdir}/parrot/%{version}/VERSION
%{_libdir}/libparrot.so.*

%files docs
%defattr(-,root,root,-)
%doc docs examples

%files devel
%defattr(-,root,root,-)
%{_bindir}/parrot_config
%{_bindir}/parrot_debugger
%{_bindir}/pbc_disassemble
%{_bindir}/pbc_info
%{_bindir}/pbc_merge
%{_bindir}/pbc_to_exe
%{_bindir}/pbc_dump
%{_includedir}/parrot
%{_libdir}/libparrot.so
%exclude %{_libdir}/libparrot.a
%{_libdir}/pkgconfig/*

%files tools
%defattr(-,root,root,-)
# Files for building languages
%{_libdir}/parrot/%{version}/tools/*
%{_libdir}/parrot/%{version}/VERSION



%changelog
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:53:36 -0000	1.1
+++ .cvsignore	29 Apr 2009 11:11:20 -0000	1.2
@@ -0,0 +1 @@
+parrot-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:53:36 -0000	1.1
+++ sources	29 Apr 2009 11:11:20 -0000	1.2
@@ -0,0 +1 @@
+649ce1fb7c0edaf89dc1cd52ff267b1a  parrot-1.0.0.tar.gz



From hadess at fedoraproject.org  Wed Apr 29 11:12:19 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 11:12:19 +0000 (UTC)
Subject: rpms/python-gdata/devel python-gdata.spec,1.16,1.17
Message-ID: <20090429111219.1616270133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29761

Modified Files:
	python-gdata.spec 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-2
- Fix deprecation warning (#492641)


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/python-gdata.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-gdata.spec	24 Apr 2009 09:37:32 -0000	1.16
+++ python-gdata.spec	29 Apr 2009 11:11:48 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           python-gdata
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python module for accessing online Google services
 
 Group:          Development/Languages
@@ -11,6 +11,9 @@ URL:            http://code.google.com/p
 Source0:        http://gdata-python-client.googlecode.com/files/gdata-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://code.google.com/p/gdata-python-client/issues/detail?id=236
+Patch0:         gdata-cryptomath_sha_deprecation.diff
+
 BuildArch:      noarch
 BuildRequires:  python-devel
 Requires:       python >= 2.5
@@ -27,6 +30,8 @@ This is a Python module for accessing on
 %prep
 %setup -q -n gdata-%{version}
 
+%patch0 -p1 -b .sha
+
 %build
 %{__python} setup.py build
 
@@ -48,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-2
+- Fix deprecation warning (#492641)
+
 * Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
 - Update to 1.3.1
 



From gerd at fedoraproject.org  Wed Apr 29 11:14:15 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed, 29 Apr 2009 11:14:15 +0000 (UTC)
Subject: rpms/parrot/F-11 import.log, NONE,
	1.1 parrot-1.0.0-rpath-removal.patch, NONE,
	1.1 parrot-install_files.patch, NONE, 1.1 parrot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429111415.B005670133@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30312/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log parrot-1.0.0-rpath-removal.patch 
	parrot-install_files.patch parrot.spec 
Log Message:
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created



--- NEW FILE import.log ---
parrot-1_0_0-6_fc10:F-11:parrot-1.0.0-6.fc10.src.rpm:1241003453

parrot-1.0.0-rpath-removal.patch:

--- NEW FILE parrot-1.0.0-rpath-removal.patch ---
--- config/inter/libparrot.pm
+++ config/inter/libparrot.pm
@@ -98,21 +98,13 @@
     # Set -rpath (or equivalent) for executables to find the
     # shared libparrot in the build directory.
     $conf->data->set(
-        rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('build_dir')
-            . $conf->data->get('slash')
-            . $conf->data->get('blib_dir')
-        : ''
+        rpath_blib => ''
     );
 
     # Set -rpath (or equivalent) for the installed executables to find the
     # installed shared libparrot.
     $conf->data->set(
-        rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') )
-        ? $conf->data->get('rpath')
-            . $conf->data->get('libdir')
-        : ''
+        rpath_lib => ''
     );
 
     unless ( defined( $conf->data->get('libparrot_ldflags') ) ) {

parrot-install_files.patch:

--- NEW FILE parrot-install_files.patch ---
--- tools/dev/install_files.pl	2009-03-11 00:35:20.000000000 +0100
+++ tools/dev/install_files.pl	2009-04-17 14:34:25.000000000 +0200
@@ -217,7 +217,7 @@
         # as it is typically done with automake installed packages.  If there
         # is a use case to make this configurable we'll add a seperate
         # --pkgconfigdir option.
-        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
+        $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
     }
     elsif ( /^compilers/ ) {
         $dest =~ s/^compilers/languages/;
@@ -292,6 +292,16 @@
     else {
         next unless -e $src;
         next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+        if (-l $src) { 
+            # check if the system supports symbolic linking 
+            use Config; 
+            if ($Config{d_symlink} && $Config{d_readlink}) { 
+            # copy as symbolic link 
+                symlink(readlink($src), $dest); 
+                print "$dest\n"; 
+                next; 
+            } 
+        } 
         copy( $src, $dest ) or die "copy $src to $dest: $!\n";
         print "$dest\n";
     }


--- NEW FILE parrot.spec ---
Name:           parrot
Version:        1.0.0
Release:        6%{?dist}
Summary:        Parrot is a virtual machine
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://www.parrot.org/

Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
# Without Patch0 %{_libdir}/libparrot.so would not be a symbolic link to
# %{_libdir}/libparrot.so.%{version}  
# Symlink:  libparrot.so ->  libparrot.so.%{version}
# See for upstream: https://trac.parrot.org/parrot/ticket/509
# Extended for the package to have no subdirectory under pkgconfig
Patch0:         parrot-install_files.patch
Patch1:         parrot-1.0.0-rpath-removal.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel
BuildRequires:  ncurses-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::Simple)
BuildRequires:  ctags
BuildRequires:  openssl-devel
 

%package docs
Summary:        Parrot Virtual Machine documentation
Group:          Documentation
Requires:       perl(strict)
Requires:       perl(warnings)

%package devel
Summary:        Parrot Virtual Machine development headers and libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%package tools
Summary:        Parrot Virtual Machine development for languages
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Pod::Simple)
Requires:       perl(File::Which) >= 0.05
# It is necessary to have installed the package "perl-Perl-Critic" to install
# the parrot-tools
Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}

%description
Parrot is a virtual machine designed to efficiently compile and execute
bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
as well as variety of other languages.

%description docs
Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
examples about the Parrot Virtual Machine.

%description devel
Parrot Virtual Machine development headers and libraries.

%description tools
Parrot Virtual Machine development files for building languages.

%prep
%setup -q
%patch0 -p0
%patch1 -b .rpatch

%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
    src/library.c
%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
    tools/dev/install_files.pl


cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
EOF

%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%ifarch %{ix86} x86_64
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
%else
# PowerPC, not all optimize-options work with the PowerPC-architecture
# the PGE don't build with the optimize="-O2" option on PowerPC
    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
%endif

%{__perl} Configure.pl \
    --prefix=%{_usr} \
    --libdir=%{_libdir} \
    --sysconfdir=%{_sysconfdir} \
    --infodir=%{_datadir}/info \
    --mandir=%{_mandir} \
    --cc="%{__cc}" \
    --cxx=%{__cxx} \
    --optimize="$RPM_OPT_FLAGS" \
    --parrot_is_shared \
    --lex=%{_bindir}/flex \
    --yacc=%{_bindir}/yacc \
    --libs='-lcurses -lm'

# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
# to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# pbc_to_exe would not build if %{_smp_mflags} would used
make
make parrot_utils
make installable
make html


%install
rm -rf $RPM_BUILD_ROOT

# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib" 
export LD_LIBRARY_PATH=$( pwd )/blib/lib

# install-dev: Same as 'install' taget but also install support for development.
make install-dev DESTDIR=$RPM_BUILD_ROOT

%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/


# Drop the docs so rpm can pick them up itself.
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}

# Force permissions on doc directories.
find docs examples -type d -exec chmod 755 {} \;
find docs examples -type f -exec chmod 644 {} \;

# Force permissions on shared versioned libs so they get stripped.
# The parrot-install-script don't set the permissions right
# With changed permissions the dependencies will be found
find %{RPM_PAR_LIB_DIR}dynext -type f -name '*.so' -exec chmod 755 {} \;

# Remove module that should be install instead (perl(File::Which))
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/File


# Added to reduce output errors when using rpmlint

# Force permission on perl-scripts in the "tools" subdirctory
find %{RPM_PAR_LIB_DIR}tools -type f -name "*.pl" -exec chmod 755 {} \; \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
# Set path to parrot binary and Force permission
find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
    -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
    -exec chmod 755 {} \;
# This module is only needed for building and should not be installed (I think)
# module "Parrot::OpLib::core"
rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib

# Remove doc-files with zero-length
find docs/html -type f -size 0 -exec rm -f {} \;

# Set path for installed programs in docs package
find examples -type f -name "*.pl" \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/pir/befunge/t/basic.t' \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -type f -name "*.py" \
    -exec %{__sed} -i -e '1 s&#! python&#!/usr/bin/python&' {} \;
find examples -type f -name "*.rb" \
    -exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;

find examples -type f -name "*.pir" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
find examples/shootout -type f -name "random.pasm" \
    -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/01-tests.t' \
    -exec %{__sed} -i -e '1 s&#!perl&#!/usr/bin/perl&' {} \;
find examples -wholename 'examples/shootout/revcomp.pir' \
    -exec %{__sed} -i -e '1 s&#!parrot&#!/usr/bin/parrot&' {} \;

find examples -wholename 'examples/languages/abc/t/harness' \
    -exec %{__perl} -pi -e 's/\r$//' {} \;

find examples/languages -type f -name harness \
    -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
for file in docs/book/ch09_pct.pod docs/memory_internals.pod; do
        %{__mv} $file timestamp
        iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
        touch -r timestamp $file
done
%{__rm} -f timestamp

# These files *probably* aren't needed.
rm -rf $RPM_BUILD_ROOT%{_usr}/config \
    $RPM_BUILD_ROOT%{_includedir}/src \
    $RPM_BUILD_ROOT%{_usr}/src 

%check
# 'make fulltest' is done by default; it take a lot of time
export LD_LIBRARY_PATH=$( pwd )/blib/lib
FULL='full'
%{?_without_fulltest: FULL=''}
%{?!_without_tests: make ${FULL}test}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
%doc RESPONSIBLE_PARTIES TODO LICENSE
%exclude %{_bindir}/parrot_config
%exclude %{_bindir}/parrot_debugger
%exclude %{_bindir}/pbc_*
%{_bindir}/*
%{_libdir}/parrot/
%exclude %{_libdir}/parrot/%{version}/tools
%exclude %{_libdir}/parrot/%{version}/VERSION
%{_libdir}/libparrot.so.*

%files docs
%defattr(-,root,root,-)
%doc docs examples

%files devel
%defattr(-,root,root,-)
%{_bindir}/parrot_config
%{_bindir}/parrot_debugger
%{_bindir}/pbc_disassemble
%{_bindir}/pbc_info
%{_bindir}/pbc_merge
%{_bindir}/pbc_to_exe
%{_bindir}/pbc_dump
%{_includedir}/parrot
%{_libdir}/libparrot.so
%exclude %{_libdir}/libparrot.a
%{_libdir}/pkgconfig/*

%files tools
%defattr(-,root,root,-)
# Files for building languages
%{_libdir}/parrot/%{version}/tools/*
%{_libdir}/parrot/%{version}/VERSION



%changelog
* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
- add a list of changes from Lubomir Rintel
- add patch to remove rpath
- add filtering Provides
- change requires for docs-subpackage
- enable test suite

* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
- change the group of the subpackage "-docs" to Documentation
- put the main-documentation from the docs-package to the main package
- LICENSE file added
- change 'make install' to 'make install-dev' to also install support for development (tools)
- add Provides-lines
- add patch for the file "tools/dev/install_files.pl"
- add commands to reduce output of errors when using rpmlint
- define RPM_PAR_LIB_DIR added
- add subpackage "tools"
- exclude tools directory from main-package

* Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
- add tools

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
- Removed wrong prefix from pkgconfig per Christoph Wickert
- Changed i386 to ix86 per Christoph Wickert

* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
- Changed hard-coded path requirement to perl.


* Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
- updated to 1.0.0

* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
- added make installable, perl6 is still not installable
- added parrot_utils to devel
- fixed Source0 url

* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
- added make html
- make reallyinstall => make install

* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
- updated to 0.9.0

* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2

* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
- updated to 0.8.1

* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
- updated to 0.8.0

* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
- updated to 0.7.1

* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
- install parrot_config (not parrot-config)

* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
- updated to 0.6.3

* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
- updated to 0.6.2

* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
- minor fixes; tested with Fedora 7, 8, and 9-beta

* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
- Update to 0.5.3.

* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.

* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
- Update to 0.5.2.

* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
- Update to 0.5.1.

* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
- Update to 0.5.0.

* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
- Update to 0.4.12.

* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
- Update to 0.4.11.

* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
- Update to 0.4.10.

* Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
- Update to 0.4.9.
- BR ncurses-devel.
- For some reason now I need to force -lm too.
- Remove some files/directories that shouldn't be included.

* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
- Attempt update to 0.4.8.

* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
- Override lib_dir and make various substitutions to try to fix multilib.
- Remove rpath use from Makefile.
- Fix a pod error in src/ops/experimental.ops.
- Enable "make test" since t/doc/pod.t won't fail now.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
- Force permissions on shared libraries so rpmbuild strips them.

* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
- Fix URL, description, summary, etc.
- Add post/postun.
- Move parrot-config to the devel sub-package.
- Force permissions on the doc directories.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
- Add -lcurses to get readline detection to work.
- BR libicu-devel.

* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
- Initial packaging attempt.

* Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
- first .spec file created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:53:36 -0000	1.1
+++ .cvsignore	29 Apr 2009 11:13:44 -0000	1.2
@@ -0,0 +1 @@
+parrot-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:53:36 -0000	1.1
+++ sources	29 Apr 2009 11:13:45 -0000	1.2
@@ -0,0 +1 @@
+649ce1fb7c0edaf89dc1cd52ff267b1a  parrot-1.0.0.tar.gz



From kdudka at fedoraproject.org  Wed Apr 29 11:32:25 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 29 Apr 2009 11:32:25 +0000 (UTC)
Subject: rpms/elinks/devel elinks-nss-inc.patch, 1.1, 1.2 elinks.conf, 1.1, 
	1.2 elinks.spec, 1.72, 1.73
Message-ID: <20090429113225.8BE3570133@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12794

Modified Files:
	elinks-nss-inc.patch elinks.conf elinks.spec 
Log Message:
try to load default NSS root certificates if the configuration option
connection.ssl.trusted_ca_file is set to an empty string (#497788)

elinks-nss-inc.patch:

Index: elinks-nss-inc.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-nss-inc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- elinks-nss-inc.patch	28 Apr 2009 11:46:48 -0000	1.1
+++ elinks-nss-inc.patch	29 Apr 2009 11:32:23 -0000	1.2
@@ -1,7 +1,7 @@
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.c elinks-0.12pre3/src/network/ssl/ssl.c
---- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-28 13:12:19.365660000 +0200
-+++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-28 13:26:39.287600358 +0200
-@@ -48,10 +48,16 @@ SSL_CTX *context = NULL;
+--- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-29 12:48:26.250878000 +0200
++++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-29 13:03:51.318746893 +0200
+@@ -48,10 +48,20 @@ SSL_CTX *context = NULL;
  static void
  init_openssl(struct module *module)
  {
@@ -11,14 +11,18 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	SSL_CTX_set_options(context, SSL_OP_ALL);
 +#ifdef CONFIG_NSS_COMPAT_OSSL
 +	ca_file = get_opt_str("connection.ssl.trusted_ca_file");
-+	SSL_CTX_load_verify_locations(context, ca_file, NULL);
++	if (*ca_file)
++		SSL_CTX_load_verify_locations(context, ca_file, NULL);
++	else
++		SSL_CTX_set_default_verify_paths(context);
 +#else
++	(void) ca_file;
  	SSL_CTX_set_default_verify_paths(context);
 +#endif
  }
  
  static void
-@@ -61,10 +67,27 @@ done_openssl(struct module *module)
+@@ -61,10 +71,30 @@ done_openssl(struct module *module)
  }
  
  static struct option_info openssl_options[] = {
@@ -33,6 +37,9 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
 +		"trusted certification authorities in PEM format. "
 +		"ELinks then trusts certificates issued by these CAs.\n"
 +		"\n"
++		"If you set this option to an empty string, default NSS root"
++		"certificates are loaded.\n"
++		"\n"
 +		"If you change this option or the file, you must "
 +		"restart ELinks for the changes to take effect. "
 +		"This option affects GnuTLS and nss_compat_ossl but not "
@@ -46,7 +53,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  	INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
          	"client_cert", OPT_SORT,
-@@ -187,7 +210,8 @@ static struct option_info gnutls_options
+@@ -187,7 +217,8 @@ static struct option_info gnutls_options
  		"\n"
  		"If you change this option or the file, you must "
  		"restart ELinks for the changes to take effect. "


Index: elinks.conf
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- elinks.conf	28 Apr 2009 14:10:10 -0000	1.1
+++ elinks.conf	29 Apr 2009 11:32:23 -0000	1.2
@@ -1,16 +1,9 @@
 ## ELinks 0.12pre3 configuration file
 
-## This is ELinks configuration file. You can edit it manually,
-## if you wish so; this file is edited by ELinks when you save
-## options through UI, however only option values will be altered
-## and missing options will be added at the end of file; if option
-## is not written in this file, but in some file included from it,
-## it is NOT counted as missing. Note that all your formatting,
-## own comments and so on will be kept as-is.
-##
-## Obviously, if you don't like what ELinks is going to do with
-## this file, you can change it by altering the config.saving_style
-## option. Come on, aren't we friendly guys after all?
+## This is ELinks global configuration file. You can keep global ELinks
+## configuration here. Each user can also save its own ELinks configuration
+## to ~/.elinks/elinks.conf. The per user configuration file can be edited
+## by ELinks when you save options through UI.
 
 ## connection
 #  Connection options.
@@ -27,6 +20,9 @@
     #  authorities in PEM format. ELinks then trusts certificates issued by
     #  these CAs.
     #
+    #  If you set this option to an empty string, default NSS root certificates
+    #  are loaded.
+    #
     #  If you change this option or the file, you must restart ELinks for the
     #  changes to take effect. This option affects GnuTLS and nss_compat_ossl
     #  but not OpenSSL.


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- elinks.spec	28 Apr 2009 14:10:10 -0000	1.72
+++ elinks.spec	29 Apr 2009 11:32:23 -0000	1.73
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.14.pre3%{?dist}
+Release:   0.15.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -126,6 +126,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Wed Apr 29 2009 Kamil Dudka <kdudka at redhat.com> 0.12-0.15.pre3
+- try to load default NSS root certificates if the configuration option
+  connection.ssl.trusted_ca_file is set to an empty string (#497788)
+
 * Tue Apr 28 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.14.pre3
 - enable certificate verification by default via configuration
   file(#495532)



From sailer at fedoraproject.org  Wed Apr 29 11:37:10 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 29 Apr 2009 11:37:10 +0000 (UTC)
Subject: rpms/libsqlite3x/F-10 libsqlite3x.spec,1.1,1.2
Message-ID: <20090429113710.D319370133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/libsqlite3x/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20365/F-10

Modified Files:
	libsqlite3x.spec 
Log Message:
fix license tag



Index: libsqlite3x.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsqlite3x/F-10/libsqlite3x.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsqlite3x.spec	6 Nov 2008 10:49:42 -0000	1.1
+++ libsqlite3x.spec	29 Apr 2009 11:36:40 -0000	1.2
@@ -4,11 +4,12 @@
 %define namesq3 libsq3
 Name:           libsqlite3x
 Version:        %{veryear}%{vermon}%{verday}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A C++ Wrapper for the SQLite3 embeddable SQL database engine
 
 Group:          System Environment/Libraries
-License:        MIT
+# fix license tag: https://bugzilla.redhat.com/show_bug.cgi?id=491618
+License:        zlib
 URL:            http://www.wanderinghorse.net/computing/sqlite/
 Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name}-%{veryear}.%{vermon}.%{verday}.tar.gz
 Source1:        libsqlite3x-autotools.tar.gz
@@ -115,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libsq3.pc
 
 %changelog
+* Wed Apr 29 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-5
+- fix license tag
+
 * Tue Nov  4 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-4
 - separate sq3 and sqlite3x into separate binary packages
 - add unused-direct-shlib-dependency build quirk



From sailer at fedoraproject.org  Wed Apr 29 11:37:11 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 29 Apr 2009 11:37:11 +0000 (UTC)
Subject: rpms/libsqlite3x/F-11 libsqlite3x.spec,1.2,1.3
Message-ID: <20090429113711.970B570135@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/libsqlite3x/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20365/F-11

Modified Files:
	libsqlite3x.spec 
Log Message:
fix license tag



Index: libsqlite3x.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsqlite3x/F-11/libsqlite3x.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libsqlite3x.spec	25 Feb 2009 19:04:37 -0000	1.2
+++ libsqlite3x.spec	29 Apr 2009 11:36:40 -0000	1.3
@@ -4,11 +4,12 @@
 %define namesq3 libsq3
 Name:           libsqlite3x
 Version:        %{veryear}%{vermon}%{verday}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A C++ Wrapper for the SQLite3 embeddable SQL database engine
 
 Group:          System Environment/Libraries
-License:        MIT
+# fix license tag: https://bugzilla.redhat.com/show_bug.cgi?id=491618
+License:        zlib
 URL:            http://www.wanderinghorse.net/computing/sqlite/
 Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name}-%{veryear}.%{vermon}.%{verday}.tar.gz
 Source1:        libsqlite3x-autotools.tar.gz
@@ -115,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libsq3.pc
 
 %changelog
+* Wed Apr 29 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-6
+- fix license tag
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071018-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sailer at fedoraproject.org  Wed Apr 29 11:37:12 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 29 Apr 2009 11:37:12 +0000 (UTC)
Subject: rpms/libsqlite3x/F-9 libsqlite3x.spec,1.1,1.2
Message-ID: <20090429113712.36A8470133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/libsqlite3x/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20365/F-9

Modified Files:
	libsqlite3x.spec 
Log Message:
fix license tag



Index: libsqlite3x.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsqlite3x/F-9/libsqlite3x.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libsqlite3x.spec	6 Nov 2008 12:47:59 -0000	1.1
+++ libsqlite3x.spec	29 Apr 2009 11:36:41 -0000	1.2
@@ -4,11 +4,12 @@
 %define namesq3 libsq3
 Name:           libsqlite3x
 Version:        %{veryear}%{vermon}%{verday}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A C++ Wrapper for the SQLite3 embeddable SQL database engine
 
 Group:          System Environment/Libraries
-License:        MIT
+# fix license tag: https://bugzilla.redhat.com/show_bug.cgi?id=491618
+License:        zlib
 URL:            http://www.wanderinghorse.net/computing/sqlite/
 Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name}-%{veryear}.%{vermon}.%{verday}.tar.gz
 Source1:        libsqlite3x-autotools.tar.gz
@@ -115,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libsq3.pc
 
 %changelog
+* Wed Apr 29 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-5
+- fix license tag
+
 * Tue Nov  4 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-4
 - separate sq3 and sqlite3x into separate binary packages
 - add unused-direct-shlib-dependency build quirk



From sailer at fedoraproject.org  Wed Apr 29 11:37:13 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Wed, 29 Apr 2009 11:37:13 +0000 (UTC)
Subject: rpms/libsqlite3x/devel libsqlite3x.spec,1.3,1.4
Message-ID: <20090429113713.3D97770133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/libsqlite3x/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20365/devel

Modified Files:
	libsqlite3x.spec 
Log Message:
fix license tag



Index: libsqlite3x.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsqlite3x/devel/libsqlite3x.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libsqlite3x.spec	16 Apr 2009 09:13:28 -0000	1.3
+++ libsqlite3x.spec	29 Apr 2009 11:36:42 -0000	1.4
@@ -4,11 +4,12 @@
 %global namesq3 libsq3
 Name:           libsqlite3x
 Version:        %{veryear}%{vermon}%{verday}
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A C++ Wrapper for the SQLite3 embeddable SQL database engine
 
 Group:          System Environment/Libraries
-License:        MIT
+# fix license tag: https://bugzilla.redhat.com/show_bug.cgi?id=491618
+License:        zlib
 URL:            http://www.wanderinghorse.net/computing/sqlite/
 Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name}-%{veryear}.%{vermon}.%{verday}.tar.gz
 Source1:        libsqlite3x-autotools.tar.gz
@@ -115,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libsq3.pc
 
 %changelog
+* Wed Apr 29 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-7
+- fix license tag
+
 * Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-6
 - replace %%define with %%global
 



From leigh123linux at fedoraproject.org  Wed Apr 29 11:44:15 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 29 Apr 2009 11:44:15 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.13,1.14
Message-ID: <20090429114415.7131E70133@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21732

Modified Files:
	qbittorrent.spec 
Log Message:
Rebuild for new rb_libtorrent version



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- qbittorrent.spec	26 Apr 2009 10:39:57 -0000	1.13
+++ qbittorrent.spec	29 Apr 2009 11:43:45 -0000	1.14
@@ -4,7 +4,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.3.3
-Release: 3.3.%{svn_rev}svn%{?dist}
+Release: 3.4.%{svn_rev}svn%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -86,6 +86,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Wed Apr 29 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.4.2340svn
+- Rebuild against the new rb_libtorrent version 0.14.3
+
 * Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.3.2340svn
 - Fix command to generate tarball
 



From pingou at fedoraproject.org  Wed Apr 29 11:49:56 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 11:49:56 +0000 (UTC)
Subject: rpms/R-affyio/F-10 R-affyio.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090429114956.622EE70133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22913/F-10

Modified Files:
	R-affyio.spec sources 
Log Message:
Update to 1.12.0


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-10/R-affyio.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-affyio.spec	22 Jan 2009 14:44:15 -0000	1.8
+++ R-affyio.spec	29 Apr 2009 11:49:25 -0000	1.9
@@ -1,10 +1,10 @@
 %define packname  affyio
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.10.1
-Release:          2%{?dist}
+Version:          1.20.0
+Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -14,9 +14,9 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   R >= %{Rversion}
+Requires(post):   R >= %{Rversion} R-methods
 Requires(postun): R
-BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel
+BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel R-methods
 
 %description
 Routines for parsing Affymetrix data files based upon file format 
@@ -72,6 +72,13 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+- Add requires to R-methods
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-2
 - Typo on the release number
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jan 2009 14:39:44 -0000	1.6
+++ sources	29 Apr 2009 11:49:25 -0000	1.7
@@ -1 +1 @@
-3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz
+c1fbc46b6f9a2be2d5e18ac612af5f21  affyio_1.12.0.tar.gz



From pingou at fedoraproject.org  Wed Apr 29 11:49:56 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 11:49:56 +0000 (UTC)
Subject: rpms/R-affyio/F-11 R-affyio.spec,1.12,1.13 sources,1.6,1.7
Message-ID: <20090429114956.AE51B70133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22913/F-11

Modified Files:
	R-affyio.spec sources 
Log Message:
Update to 1.12.0


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-11/R-affyio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- R-affyio.spec	27 Feb 2009 20:11:08 -0000	1.12
+++ R-affyio.spec	29 Apr 2009 11:49:26 -0000	1.13
@@ -1,10 +1,10 @@
 %define packname  affyio
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.10.1
-Release:          4%{?dist}
+Version:          1.20.0
+Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -14,9 +14,9 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   R >= %{Rversion}
+Requires(post):   R >= %{Rversion} R-methods
 Requires(postun): R
-BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel
+BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel R-methods
 
 %description
 Routines for parsing Affymetrix data files based upon file format 
@@ -72,6 +72,10 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+- Add requires to R-methods
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jan 2009 14:37:24 -0000	1.6
+++ sources	29 Apr 2009 11:49:26 -0000	1.7
@@ -1 +1 @@
-3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz
+c1fbc46b6f9a2be2d5e18ac612af5f21  affyio_1.12.0.tar.gz



From pingou at fedoraproject.org  Wed Apr 29 11:49:57 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 11:49:57 +0000 (UTC)
Subject: rpms/R-affyio/F-9 R-affyio.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090429114957.0FD4670133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22913/F-9

Modified Files:
	R-affyio.spec sources 
Log Message:
Update to 1.12.0


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/R-affyio.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-affyio.spec	22 Jan 2009 14:44:16 -0000	1.8
+++ R-affyio.spec	29 Apr 2009 11:49:26 -0000	1.9
@@ -1,10 +1,10 @@
 %define packname  affyio
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.10.1
-Release:          2%{?dist}
+Version:          1.20.0
+Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -14,9 +14,9 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   R >= %{Rversion}
+Requires(post):   R >= %{Rversion} R-methods
 Requires(postun): R
-BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel
+BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel R-methods
 
 %description
 Routines for parsing Affymetrix data files based upon file format 
@@ -72,6 +72,13 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+- Add requires to R-methods
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-2
 - Typo on the release number
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jan 2009 14:39:44 -0000	1.6
+++ sources	29 Apr 2009 11:49:26 -0000	1.7
@@ -1 +1 @@
-3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz
+c1fbc46b6f9a2be2d5e18ac612af5f21  affyio_1.12.0.tar.gz



From pingou at fedoraproject.org  Wed Apr 29 11:49:57 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 11:49:57 +0000 (UTC)
Subject: rpms/R-affyio/devel .cvsignore, 1.6, 1.7 R-affyio.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090429114957.6EFAE70133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22913/devel

Modified Files:
	.cvsignore R-affyio.spec sources 
Log Message:
Update to 1.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jan 2009 14:37:24 -0000	1.6
+++ .cvsignore	29 Apr 2009 11:49:27 -0000	1.7
@@ -1 +1 @@
-affyio_1.10.1.tar.gz
+affyio_1.12.0.tar.gz


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/R-affyio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- R-affyio.spec	27 Feb 2009 20:11:08 -0000	1.12
+++ R-affyio.spec	29 Apr 2009 11:49:27 -0000	1.13
@@ -1,10 +1,10 @@
 %define packname  affyio
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.10.1
-Release:          4%{?dist}
+Version:          1.20.0
+Release:          1%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -14,9 +14,9 @@ URL:              http://bioconductor.or
 Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   R >= %{Rversion}
+Requires(post):   R >= %{Rversion} R-methods
 Requires(postun): R
-BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel
+BuildRequires:    R-devel >= %{Rversion} tetex-latex zlib-devel R-methods
 
 %description
 Routines for parsing Affymetrix data files based upon file format 
@@ -72,6 +72,10 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
+- Update to Bioconductor 2.4 and R 2.9.0
+- Add requires to R-methods
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jan 2009 14:37:24 -0000	1.6
+++ sources	29 Apr 2009 11:49:27 -0000	1.7
@@ -1 +1 @@
-3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz
+c1fbc46b6f9a2be2d5e18ac612af5f21  affyio_1.12.0.tar.gz



From leigh123linux at fedoraproject.org  Wed Apr 29 11:58:38 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 29 Apr 2009 11:58:38 +0000 (UTC)
Subject: rpms/qbittorrent/F-11 qbittorrent.spec,1.10,1.11
Message-ID: <20090429115838.8FD0570133@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25179

Modified Files:
	qbittorrent.spec 
Log Message:
Rebuild for new rb_libtorrent version



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/qbittorrent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qbittorrent.spec	9 Apr 2009 17:26:09 -0000	1.10
+++ qbittorrent.spec	29 Apr 2009 11:58:08 -0000	1.11
@@ -1,7 +1,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.3.3
-Release: 2%{dist}
+Release: 3%{dist}
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
@@ -77,6 +77,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Wed Apr 29 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3
+- Rebuild against the new rb_libtorrent version 0.14.3
+
 * Thu Apr 9 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-2
 - Remember to update Source in spec file 
 



From akurtakov at fedoraproject.org  Wed Apr 29 12:20:27 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 29 Apr 2009 12:20:27 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.639,1.640
Message-ID: <20090429122028.0232870133@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29680/devel

Modified Files:
	eclipse.spec 
Log Message:
- Fix initializer run (sed again).


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.639
retrieving revision 1.640
diff -u -p -r1.639 -r1.640
--- eclipse.spec	29 Apr 2009 09:23:58 -0000	1.639
+++ eclipse.spec	29 Apr 2009 12:19:57 -0000	1.640
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.5%{?dist}
+Release:        0.2.6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1048,10 +1048,10 @@ rm -r $sdkDir/configuration/org.eclipse.
 
 %if %{initialize}
 #Find better way to fix this
-#sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-#  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-#sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
-#  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1591,6 +1591,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.6
+- Fix initializer run (sed again).
+
 * Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.5
 - Bump tomcat6 BR.
 - Fix director run to not require sed on bundles.info.



From pingou at fedoraproject.org  Wed Apr 29 12:36:51 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 12:36:51 +0000 (UTC)
Subject: rpms/R-affyio/F-10 R-affyio.spec,1.9,1.10
Message-ID: <20090429123651.4079A70133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv984/F-10

Modified Files:
	R-affyio.spec 
Log Message:
Correct the version number


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-10/R-affyio.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-affyio.spec	29 Apr 2009 11:49:25 -0000	1.9
+++ R-affyio.spec	29 Apr 2009 12:36:20 -0000	1.10
@@ -3,8 +3,8 @@
 %define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0
-Release:          1%{?dist}
+Version:          1.12.0
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-2
+- version 1.20.0 != 1.12.0
+
 * Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
 - Update to Bioconductor 2.4 and R 2.9.0
 - Add requires to R-methods



From pingou at fedoraproject.org  Wed Apr 29 12:36:52 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 12:36:52 +0000 (UTC)
Subject: rpms/R-affyio/devel R-affyio.spec,1.13,1.14
Message-ID: <20090429123652.5635270133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv984/devel

Modified Files:
	R-affyio.spec 
Log Message:
Correct the version number


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/R-affyio.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- R-affyio.spec	29 Apr 2009 11:49:27 -0000	1.13
+++ R-affyio.spec	29 Apr 2009 12:36:22 -0000	1.14
@@ -3,8 +3,8 @@
 %define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0
-Release:          1%{?dist}
+Version:          1.12.0
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-2
+- version 1.20.0 != 1.12.0
+
 * Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
 - Update to Bioconductor 2.4 and R 2.9.0
 - Add requires to R-methods



From pingou at fedoraproject.org  Wed Apr 29 12:36:51 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 12:36:51 +0000 (UTC)
Subject: rpms/R-affyio/F-11 R-affyio.spec,1.13,1.14
Message-ID: <20090429123651.9DAC070133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv984/F-11

Modified Files:
	R-affyio.spec 
Log Message:
Correct the version number


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-11/R-affyio.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- R-affyio.spec	29 Apr 2009 11:49:26 -0000	1.13
+++ R-affyio.spec	29 Apr 2009 12:36:21 -0000	1.14
@@ -3,8 +3,8 @@
 %define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0
-Release:          1%{?dist}
+Version:          1.12.0
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-2
+- version 1.20.0 != 1.12.0
+
 * Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
 - Update to Bioconductor 2.4 and R 2.9.0
 - Add requires to R-methods



From pingou at fedoraproject.org  Wed Apr 29 12:36:52 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 12:36:52 +0000 (UTC)
Subject: rpms/R-affyio/F-9 R-affyio.spec,1.9,1.10
Message-ID: <20090429123652.0495C70133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv984/F-9

Modified Files:
	R-affyio.spec 
Log Message:
Correct the version number


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/R-affyio.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-affyio.spec	29 Apr 2009 11:49:26 -0000	1.9
+++ R-affyio.spec	29 Apr 2009 12:36:21 -0000	1.10
@@ -3,8 +3,8 @@
 %define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.20.0
-Release:          1%{?dist}
+Version:          1.12.0
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-2
+- version 1.20.0 != 1.12.0
+
 * Wed Apr 29 2009 pingou <pingou at pingoured.fr> - 1.12.0-1
 - Update to Bioconductor 2.4 and R 2.9.0
 - Add requires to R-methods



From pingou at fedoraproject.org  Wed Apr 29 13:01:23 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 13:01:23 +0000 (UTC)
Subject: rpms/R-GeneR/F-10 R-GeneR-gcc44.patch,NONE,1.1
Message-ID: <20090429130123.1826170133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7696/F-10

Added Files:
	R-GeneR-gcc44.patch 
Log Message:
Backport the patch

R-GeneR-gcc44.patch:

--- NEW FILE R-GeneR-gcc44.patch ---
--- GeneR/src/compoSeq.cc.orig	2009-04-22 01:46:37.000000000 +0200
+++ GeneR/src/compoSeq.cc	2009-04-22 01:47:48.000000000 +0200
@@ -68,9 +68,9 @@
   int i,j,k;
   int end;
 
-  char * (* fun) (const char*, const char *) = NULL;
+  const char * (* fun) (const char*, const char *) = NULL;
 
-  char * posFind;
+  const char * posFind;
 
   char (*upperornot)(char) = NULL;
 



From pingou at fedoraproject.org  Wed Apr 29 13:01:23 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 13:01:23 +0000 (UTC)
Subject: rpms/R-GeneR/F-9 R-GeneR-gcc44.patch,NONE,1.1
Message-ID: <20090429130123.4806870136@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7696/F-9

Added Files:
	R-GeneR-gcc44.patch 
Log Message:
Backport the patch

R-GeneR-gcc44.patch:

--- NEW FILE R-GeneR-gcc44.patch ---
--- GeneR/src/compoSeq.cc.orig	2009-04-22 01:46:37.000000000 +0200
+++ GeneR/src/compoSeq.cc	2009-04-22 01:47:48.000000000 +0200
@@ -68,9 +68,9 @@
   int i,j,k;
   int end;
 
-  char * (* fun) (const char*, const char *) = NULL;
+  const char * (* fun) (const char*, const char *) = NULL;
 
-  char * posFind;
+  const char * posFind;
 
   char (*upperornot)(char) = NULL;
 



From hadess at fedoraproject.org  Wed Apr 29 13:16:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 13:16:42 +0000 (UTC)
Subject: rpms/python-gdata/devel gdata-cryptomath_sha_deprecation.diff, NONE,
	1.1
Message-ID: <20090429131642.2370870133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10280

Added Files:
	gdata-cryptomath_sha_deprecation.diff 
Log Message:
Add missing patch

gdata-cryptomath_sha_deprecation.diff:

--- NEW FILE gdata-cryptomath_sha_deprecation.diff ---
diff --git a/src/gdata/tlslite/utils/cryptomath.py b/src/gdata/tlslite/utils/cryptomath.py
index 51d6dff..67fb398 100755
--- a/src/gdata/tlslite/utils/cryptomath.py
+++ b/src/gdata/tlslite/utils/cryptomath.py
@@ -6,7 +6,7 @@ import os
 import math
 import base64
 import binascii
-import sha
+import hashlib
 
 from compat import *
 
@@ -195,7 +195,7 @@ def numBytes(n):
     return int(math.ceil(bits / 8.0))
 
 def hashAndBase64(s):
-    return stringToBase64(sha.sha(s).digest())
+    return stringToBase64(hashlib.sha1(s).digest())
 
 def getBase64Nonce(numChars=22): #defaults to an 132 bit nonce
     bytes = getRandomBytes(numChars)



From pingou at fedoraproject.org  Wed Apr 29 13:23:32 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 13:23:32 +0000 (UTC)
Subject: rpms/R-GeneR/F-9 R-GeneR.spec,1.6,1.7
Message-ID: <20090429132332.6838870133@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11270

Modified Files:
	R-GeneR.spec 
Log Message:
Droped the patch for F-11


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-9/R-GeneR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-GeneR.spec	28 Apr 2009 17:27:17 -0000	1.6
+++ R-GeneR.spec	29 Apr 2009 13:23:01 -0000	1.7
@@ -4,14 +4,14 @@
 
 Name:             R-%{packname}
 Version:          2.14.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
 URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
 Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
-Patch0:           %{name}-gcc44.patch
+#Patch0:           %{name}-gcc44.patch
 # Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22 -- by Milos
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +25,7 @@ Package manipulating nucleotidic sequenc
 
 %prep
 %setup -q -c -n %{packname}
-%patch0
+#%patch0
 
 %build
 
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-2
+- Does not apply the patch made for F-11
+
 * Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-1
 - Update to Bioconductor 2.4 and R-2.9.0
 



From pingou at fedoraproject.org  Wed Apr 29 13:27:00 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Wed, 29 Apr 2009 13:27:00 +0000 (UTC)
Subject: rpms/R-GeneR/F-10 R-GeneR.spec, 1.4, 1.5 R-GeneR-gcc44.patch, 1.1,
	NONE
Message-ID: <20090429132700.60BF770136@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11985

Modified Files:
	R-GeneR.spec 
Removed Files:
	R-GeneR-gcc44.patch 
Log Message:
Dropped the patch made for F-11


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-10/R-GeneR.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-GeneR.spec	28 Apr 2009 17:27:16 -0000	1.4
+++ R-GeneR.spec	29 Apr 2009 13:26:29 -0000	1.5
@@ -4,14 +4,14 @@
 
 Name:             R-%{packname}
 Version:          2.14.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
 License:          CeCILL
 URL:              http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/html/%{packname}.html
 Source0:          http://www.bioconductor.org/packages/%{bioconductor_release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
-Patch0:           %{name}-gcc44.patch
+#Patch0:           %{name}-gcc44.patch
 # Has been sent to daubenton [AT]??cgm.cnrs-gif [DOT] fr on 2009/04/22 -- by Milos
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +25,7 @@ Package manipulating nucleotidic sequenc
 
 %prep
 %setup -q -c -n %{packname}
-%patch0
+#%patch0
 
 %build
 
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-2
+- Does not apply the patch made for F-11
+
 * Tue Apr 28 2009 pingou <pingou at pingoured.fr> 2.14.0-1
 - Update to Bioconductor 2.4 and R-2.9.0
 


--- R-GeneR-gcc44.patch DELETED ---



From ruben at fedoraproject.org  Wed Apr 29 13:35:29 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed, 29 Apr 2009 13:35:29 +0000 (UTC)
Subject: rpms/python-foolscap/devel import.log, NONE,
	1.1 python-foolscap.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429133529.1452C70133@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-foolscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-foolscap.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
python-foolscap-0_3_2-1_fc11:HEAD:python-foolscap-0.3.2-1.fc11.src.rpm:1241012075


--- NEW FILE python-foolscap.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define modulename foolscap

Name:           python-%{modulename}
Version:        0.3.2
Release:        1%{?dist}
Summary:        Next-generation RPC protocol, intended to replace Perspective Broker

Group:          Development/Languages
License:        MIT
URL:            http://foolscap.lothar.com
Source0:        http://foolscap.lothar.com/releases/%{modulename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python, python-devel, python-twisted-web
Requires:       python-twisted-web

%description
Foolscap (aka newpb) is a new version of Twisted's native RPC protocol, known
as 'Perspective Broker'. This allows an object in one process to be used by
code in a distant process. This module provides data marshaling, a remote
object reference system, and a capability-based security model.

%prep
%setup -q -n %{modulename}-%{version}

%build
%{__python} setup.py build
find doc/ -name \*.py | xargs chmod 0644

%check
trial foolscap

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE NEWS ChangeLog doc/*
%dir %{python_sitelib}/%{modulename}
%{python_sitelib}/%{modulename}/*
%{python_sitelib}/*egg-info

%{_bindir}/flogtool

%changelog
* Mon Feb 20 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.2-1
- New version from upstream

* Sun Nov 02 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.1-3
- More cleanup according to review (#462535)

* Fri Oct 31 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.1-2
- Cleanup according to review (#462535)

* Tue Sep 16 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.3.1-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:51:07 -0000	1.1
+++ .cvsignore	29 Apr 2009 13:34:58 -0000	1.2
@@ -0,0 +1 @@
+foolscap-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-foolscap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:51:07 -0000	1.1
+++ sources	29 Apr 2009 13:34:58 -0000	1.2
@@ -0,0 +1 @@
+635b9b6967504f3a03b8b05be4ca06a5  foolscap-0.3.2.tar.gz



From rcritten at fedoraproject.org  Wed Apr 29 14:02:42 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Wed, 29 Apr 2009 14:02:42 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-9 nss_compat_ossl-rootcert.patch, NONE,
	1.1 nss_compat_ossl.spec, 1.12, 1.13
Message-ID: <20090429140242.9F16370133@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20371

Modified Files:
	nss_compat_ossl.spec 
Added Files:
	nss_compat_ossl-rootcert.patch 
Log Message:
Resolve BZ 497788, implement default loading of root CAs


nss_compat_ossl-rootcert.patch:

--- NEW FILE nss_compat_ossl-rootcert.patch ---
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog nss_compat_ossl-0.9.5/ChangeLog
--- nss_compat_ossl-0.9.5.orig/ChangeLog	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/ChangeLog	2009-04-29 09:47:29.000000000 -0400
@@ -1,3 +1,17 @@
+2009-04-29  Rob Crittenden <rcritten at redhat.com>
+
+       * Implement SSL_CTX_set_default_verify_paths()
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+
+       * nss_compat_ossl 0.9.5 released.
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+       * Ensure that an SSL context exists before doing anything. Since
+         we can't catch NSS initialization failures at init time we have
+         to catch them later (like this).
+
+
 2009-03-06  Rich Megginson <rmeggins at redhat.com>
 
 	* Change license to MIT style license
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog.orig nss_compat_ossl-0.9.5/ChangeLog.orig
--- nss_compat_ossl-0.9.5.orig/ChangeLog.orig	1969-12-31 19:00:00.000000000 -0500
+++ nss_compat_ossl-0.9.5/ChangeLog.orig	2009-04-20 11:02:22.000000000 -0400
@@ -0,0 +1,163 @@
+2009-03-06  Rich Megginson <rmeggins at redhat.com>
+
+	* Change license to MIT style license
+
+2008-09-12  Rob Crittenden <rcritten at redhat.com>
+
+	* Use proper NSPR header file (even though marked as private)
+	* Don't use PR_GetRandomNoise(), it isn't truly random. Use
+	  PK11_GenerateRandom()
+
+2008-07-02  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl has some BIO emulation code that links a BIO object
+	  in as an NSPR layer. This code 1) did not implement enough of the
+	  layer to make SSL happy, and 2) linked the layer at the wrong point
+	  in the stack. (453651) Contributed by Bob Relyea
+
+2007-10-16  Rob Crittenden <rcritten at redhat.com>
+
+	* Use pkg-config to get the list of NSPR and NSS libraries to link with.
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't explicitly link with libsoftokn3.so (330091)
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Reverting change to remove #define CERT_NewTempCertificate (306711)
+	  This needs to be there otherwise there is an undefined symbol
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.2 released.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Fix some compiler warnings
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* The license is LGPLv2.1. I had wrongly included both a LGPL
+	  LICENSE file AND the GPL 2 COPYING file. LICENSE was removed
+	  in a separate update, this fixes COPYING.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch submitted by Miloslav Trmac (259901)
+	  * Define PEM_BUFSIZE
+	  * Use a better X509_STORE_CTX (with ->current_cert, ->error)
+	  * Add a dummy PEM_def_callback
+	  * Add SSLv2_server_method
+	  * Add X509_LU_X509, X509_STORE_get_by_subject
+	  * Add SSL_get_ex_data_X509_STORE_CTX_idx, and a stub for
+	    X509_STORE_CTX_get_ex_data
+	  * Uncomment declaration of SSL_state_string_long.  Return at least
+	    some string instead of NULL.
+	  * Fix prototype of CRYPTO_set_locking_callback
+	  * Use PK11_GenerateRandom, not PR_GetRandomNoise for RAND_write_file:
+	    RAND_write_file is used to keep a persistent random seed across
+	    stunnel runs, it is not really necessary to generate a truly random
+	    seed each time.  Besides, reading 1024 bytes from /dev/random takes
+	    way too long.
+	  * Don't call fclose(NULL) in RAND_write_file
+	  * Return NULL from SSL_get_peer_certificate if no peer certificate is
+	    available
+	  * Decide whether to allocate memory in X509_NAME_oneline based on
+	    the passed buffer, not its size
+
+2007-09-14  Rob Crittenden <rcritten at redhat.com>
+
+	* Change name of PKCS#11 module to libnsspem.so
+	* Import some improvements made during curl development
+
+2007-08-29  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.1 released.
+
+2007-08-06  Rob Crittenden <rcritten at redhat.com>
+
+	* Remove conflicting LICENSE file (the library is LGPL, not GPL).
+	  The file COPYING was correct.
+	* Provide a more usable README
+
+2007-07-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Import into repository. Lost 17 revisions of the history in the
+	  migration.
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle the SSL verify modes for clients as well
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* In X509_NAME_oneline() use the certificate arena to allocate memory
+
+2007-05-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle authenticating a PKCS#11 PEM token. If an encrypted key PEM is
+	  provided then the module will correctly prompt for the PIN
+	* Initialize the certificate nickname to NULL
+	* Check the return result of PK11_CreateGenericObject()
+	* After a certificate is selected make sure it exists. Better to catch
+	  this earlier than later
+	* Fix SSL_want() to return a legal value (SSL_NOTHING)
+	* Fix some compiler warnings
+
+2007-05-14  Rob Crittenden <rcritten at redhat.com>
+
+	* First cut at loading PEM files on the fly by using a PKCS#11 module
+	  that can read them. This is currently disabled as it requires the
+	  NSS tip (3.12) and some additional patches.
+	  If a filename does not contain a slash (/) then it is considered
+	  to be a regular NSS nickname and the NSS Certificate DB token is
+	  used.
+
+2007-05-11  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch from Bob Relyea
+	  * Adds support for some of the BIO API
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* A few casts to eliminate some compiler warnings.
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't allow SSL_library_init to be called more than once
+	* Enable the SSL cache for servers
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Cobbled function sftk_newPinCheck() from NSS to do password type and
+	  length enforcemen when in FIPS mode
+	* For some reason I had disabled setting ciphers. Re-enabled that and
+	  now enforce only FIPS-approved ciphers when the token is in FIPS mode.
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Should use PR_USER_THREAD in PR_Init
+	* Add a close method for our layer
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Implement SSL_CIPHER_get_version (possibly wrongly) and
+	  SSL_CIPHER_get_bits
+	* Fix using an NSS database with a password. Freeing the slot list
+	  was bad.
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* If a certificate cannot be found set an appropriate error so an
+	  OpenSSL app reports the right problem.
+	* Look in /etc/pki/nssdb if SSL_DIR is not set
+	* Implement the DEFAULT cipher keyword
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* Fill in some more of the RAND_ API
+
+2007-04-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Start of project 
diff -ruNp nss_compat_ossl-0.9.5.orig/src/ssl.c nss_compat_ossl-0.9.5/src/ssl.c
--- nss_compat_ossl-0.9.5.orig/src/ssl.c	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/src/ssl.c	2009-04-29 09:47:29.000000000 -0400
@@ -80,8 +80,10 @@ static int nss_set_private(PRFileDesc *f
 
 int is_initialized = 0;
 static const char* pem_library = "libnsspem.so";
+static const char* root_certs_library = "libnssckbi.so";
 
-static SECMODModule* mod = NULL;
+static SECMODModule* pemMod = NULL;
+static SECMODModule* rootMod = NULL;
 CK_SLOT_ID slotCount = 1;
 
 #define DEF_SSL2_TIMEOUT        100L  /* seconds */
@@ -1002,7 +1004,7 @@ nss_set_server_cert(SSL_CTX *ctx, const 
         if (n) {
             n++;
         }
-        if (mod == NULL) /* we have a file-based cert but no PEM module */
+        if (pemMod == NULL) /* we have a file-based cert but no PEM module */
             return 1;
     } else {
         if (cacert)
@@ -1278,11 +1280,11 @@ int SSL_library_init(void)
 
     PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"\"", pem_library);
 
-    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
-    if (!mod || !mod->loaded) {
-        if (mod) {
-            SECMOD_DestroyModule(mod);
-            mod = NULL;
+    pemMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!pemMod || !pemMod->loaded) {
+        if (pemMod) {
+            SECMOD_DestroyModule(pemMod);
+            pemMod = NULL;
         }
         free(configstring);
         return 1;
@@ -2112,7 +2114,7 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX 
     }
 
     /* This will force the token to be seen as re-inserted */
-    SECMOD_WaitForAnyTokenEvent(mod, 0, 0);
+    SECMOD_WaitForAnyTokenEvent(pemMod, 0, 0);
     PK11_IsPresent(slot);
 
     if (PK11_Authenticate(slot, PR_TRUE, &retryCount) != SECSuccess) {
@@ -2724,7 +2726,17 @@ int SSL_CTX_load_verify_locations(SSL_CT
 }
 
 int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx) {
-    return 0;
+    if (PR_FALSE == SECMOD_HasRootCerts()) {
+        char configstring[64];
+
+        /* try to load root certs module */
+        PR_snprintf(configstring, 64, "library=%s name=\"Root Certs\" parameters=\"\"", root_certs_library);
+        rootMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+        if (rootMod || !rootMod->loaded) {
+            SECMOD_DestroyModule(rootMod);
+            rootMod = NULL;
+        }
+    }
 }
 
 void SSL_set_verify(SSL *ssl, int mode,


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/nss_compat_ossl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nss_compat_ossl.spec	20 Apr 2009 15:16:07 -0000	1.12
+++ nss_compat_ossl.spec	29 Apr 2009 14:02:41 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         nss_compat_ossl-rootcert.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -27,6 +28,7 @@ Header and library files for doing porti
 
 %prep
 %setup -q
+%patch1 -p1 -b .rootcert
 
 %build
 
@@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
+- Resolve BZ 497788, implement default loading of root CAs
+
 * Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
 - Update to 0.9.5
 - License changed to MIT



From suravee at fedoraproject.org  Wed Apr 29 14:03:34 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Wed, 29 Apr 2009 14:03:34 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.201,1.202
Message-ID: <20090429140334.7412F70133@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20488

Modified Files:
	comps-f11.xml.in 
Log Message:
Add CodeAnalyst-gui, libdwarf-tools, and libdwarf-devel



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- comps-f11.xml.in	27 Apr 2009 19:00:33 -0000	1.201
+++ comps-f11.xml.in	29 Apr 2009 14:03:04 -0000	1.202
@@ -798,6 +798,7 @@
       <packagereq type="default">libattr-devel</packagereq>
       <packagereq type="default">libcap-devel</packagereq>
       <packagereq type="default">libcurl-devel</packagereq>
+      <packagereq type="default">libdwarf-devel</packagereq>
       <packagereq type="default">libogg-devel</packagereq>
       <packagereq type="default">libselinux-devel</packagereq>
       <packagereq type="default">libuser-devel</packagereq>
@@ -829,6 +830,7 @@
       <packagereq type="mandatory">automake</packagereq>
       <packagereq type="mandatory">binutils</packagereq>
       <packagereq type="mandatory">bison</packagereq>
+      <packagereq type="optional">CodeAnalyst-gui</packagereq>
       <packagereq type="mandatory">flex</packagereq>
       <packagereq basearchonly="true" type="mandatory">gcc</packagereq>
       <packagereq basearchonly="true" type="mandatory">gcc-c++</packagereq>
@@ -948,6 +950,7 @@
       <packagereq type="optional">kuipc</packagereq>
       <packagereq type="optional">lazarus</packagereq>
       <packagereq type="optional">lcov</packagereq>
+      <packagereq type="optional">libdwarf-tools</packagereq>
       <packagereq type="optional">lightning</packagereq>
       <packagereq type="optional">livecd-tools</packagereq>
       <packagereq type="optional">lua</packagereq>



From atkac at fedoraproject.org  Wed Apr 29 14:05:50 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 29 Apr 2009 14:05:50 +0000 (UTC)
Subject: rpms/bind/F-11 bind.spec,1.313,1.314
Message-ID: <20090429140551.00CF170133@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21057

Modified Files:
	bind.spec 
Log Message:
- update the patch for dynamic loading of database backends
- create %%{_libdir}/bind directory
- copy default named.conf to doc directory, shared with s-c-bind (atkac)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- bind.spec	27 Apr 2009 19:37:26 -0000	1.313
+++ bind.spec	29 Apr 2009 14:05:20 -0000	1.314
@@ -300,7 +300,6 @@ gzip -9 doc/rfc/*
 
 # Build directory hierarchy
 mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
-mkdir -p ${RPM_BUILD_ROOT}/usr/{bin,lib,sbin,include}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -343,7 +342,6 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name 
 #
 
 # Ghost config files:
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
 touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 
 # configuration files:
@@ -352,9 +350,11 @@ tar -C ${RPM_BUILD_ROOT} -xjf %{SOURCE28
 install -m 644 %{SOURCE5}  ./rfc1912.txt
 install -m 644 %{SOURCE21} ./Copyright
 
-# sample bind configuration files for %doc:
+# sample bind configuration files for %%doc:
 mkdir -p sample/etc sample/var/named/{data,slaves}
 install -m 644 %{SOURCE25} sample/etc/named.conf
+# Copy default configuration to %%doc to make it usable from system-config-bind
+cp -fp ${RPM_BUILD_ROOT}/etc/named.conf named.conf.default
 install -m 644 ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones sample/etc/named.rfc1912.zones
 install -m 644 ${RPM_BUILD_ROOT}/var/named/{named.ca,named.localhost,named.loopback,named.empty}  sample/var/named
 for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do 
@@ -503,7 +503,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
 %{_mandir}/man8/rndc-confgen.8*
-%doc CHANGES COPYRIGHT README
+%doc CHANGES COPYRIGHT README named.conf.default
 %doc doc/arm doc/misc doc/draft doc/rfc
 %doc sample/
 %doc Copyright
@@ -575,9 +575,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
-* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
+* Wed Apr 29 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
 - update the patch for dynamic loading of database backends
 - create %%{_libdir}/bind directory
+- copy default named.conf to doc directory, shared with s-c-bind (atkac)
 
 * Fri Apr 24 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends



From atkac at fedoraproject.org  Wed Apr 29 14:06:23 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 29 Apr 2009 14:06:23 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.313,1.314
Message-ID: <20090429140623.3C93A70133@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21260

Modified Files:
	bind.spec 
Log Message:
- update the patch for dynamic loading of database backends
- create %%{_libdir}/bind directory
- copy default named.conf to doc directory, shared with s-c-bind (atkac)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- bind.spec	27 Apr 2009 19:35:39 -0000	1.313
+++ bind.spec	29 Apr 2009 14:05:52 -0000	1.314
@@ -300,7 +300,6 @@ gzip -9 doc/rfc/*
 
 # Build directory hierarchy
 mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
-mkdir -p ${RPM_BUILD_ROOT}/usr/{bin,lib,sbin,include}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -343,7 +342,6 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name 
 #
 
 # Ghost config files:
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
 touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 
 # configuration files:
@@ -352,9 +350,11 @@ tar -C ${RPM_BUILD_ROOT} -xjf %{SOURCE28
 install -m 644 %{SOURCE5}  ./rfc1912.txt
 install -m 644 %{SOURCE21} ./Copyright
 
-# sample bind configuration files for %doc:
+# sample bind configuration files for %%doc:
 mkdir -p sample/etc sample/var/named/{data,slaves}
 install -m 644 %{SOURCE25} sample/etc/named.conf
+# Copy default configuration to %%doc to make it usable from system-config-bind
+cp -fp ${RPM_BUILD_ROOT}/etc/named.conf named.conf.default
 install -m 644 ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones sample/etc/named.rfc1912.zones
 install -m 644 ${RPM_BUILD_ROOT}/var/named/{named.ca,named.localhost,named.loopback,named.empty}  sample/var/named
 for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do 
@@ -503,7 +503,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
 %{_mandir}/man8/rndc-confgen.8*
-%doc CHANGES COPYRIGHT README
+%doc CHANGES COPYRIGHT README named.conf.default
 %doc doc/arm doc/misc doc/draft doc/rfc
 %doc sample/
 %doc Copyright
@@ -575,9 +575,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
-* Mon Apr 27 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
+* Wed Apr 29 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.3.b1
 - update the patch for dynamic loading of database backends
 - create %%{_libdir}/bind directory
+- copy default named.conf to doc directory, shared with s-c-bind (atkac)
 
 * Fri Apr 24 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-0.2.b1
 - update the patch for dynamic loading of database backends



From suravee at fedoraproject.org  Wed Apr 29 14:08:13 2009
From: suravee at fedoraproject.org (Suravee Suthikulpanit)
Date: Wed, 29 Apr 2009 14:08:13 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.202,1.203
Message-ID: <20090429140813.C758970133@cvs1.fedora.phx.redhat.com>

Author: suravee

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21633

Modified Files:
	comps-f11.xml.in 
Log Message:
change libdwarf-devel from default to optional.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- comps-f11.xml.in	29 Apr 2009 14:03:04 -0000	1.202
+++ comps-f11.xml.in	29 Apr 2009 14:07:43 -0000	1.203
@@ -798,7 +798,7 @@
       <packagereq type="default">libattr-devel</packagereq>
       <packagereq type="default">libcap-devel</packagereq>
       <packagereq type="default">libcurl-devel</packagereq>
-      <packagereq type="default">libdwarf-devel</packagereq>
+      <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="default">libogg-devel</packagereq>
       <packagereq type="default">libselinux-devel</packagereq>
       <packagereq type="default">libuser-devel</packagereq>



From rcritten at fedoraproject.org  Wed Apr 29 14:13:08 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Wed, 29 Apr 2009 14:13:08 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-10 nss_compat_ossl-rootcert.patch, NONE,
	1.1 nss_compat_ossl.spec, 1.14, 1.15
Message-ID: <20090429141308.8DD1D70133@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22424

Modified Files:
	nss_compat_ossl.spec 
Added Files:
	nss_compat_ossl-rootcert.patch 
Log Message:
Resolve BZ 497788, implement default loading of root CAs


nss_compat_ossl-rootcert.patch:

--- NEW FILE nss_compat_ossl-rootcert.patch ---
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog nss_compat_ossl-0.9.5/ChangeLog
--- nss_compat_ossl-0.9.5.orig/ChangeLog	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/ChangeLog	2009-04-29 09:47:29.000000000 -0400
@@ -1,3 +1,17 @@
+2009-04-29  Rob Crittenden <rcritten at redhat.com>
+
+       * Implement SSL_CTX_set_default_verify_paths()
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+
+       * nss_compat_ossl 0.9.5 released.
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+       * Ensure that an SSL context exists before doing anything. Since
+         we can't catch NSS initialization failures at init time we have
+         to catch them later (like this).
+
+
 2009-03-06  Rich Megginson <rmeggins at redhat.com>
 
 	* Change license to MIT style license
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog.orig nss_compat_ossl-0.9.5/ChangeLog.orig
--- nss_compat_ossl-0.9.5.orig/ChangeLog.orig	1969-12-31 19:00:00.000000000 -0500
+++ nss_compat_ossl-0.9.5/ChangeLog.orig	2009-04-20 11:02:22.000000000 -0400
@@ -0,0 +1,163 @@
+2009-03-06  Rich Megginson <rmeggins at redhat.com>
+
+	* Change license to MIT style license
+
+2008-09-12  Rob Crittenden <rcritten at redhat.com>
+
+	* Use proper NSPR header file (even though marked as private)
+	* Don't use PR_GetRandomNoise(), it isn't truly random. Use
+	  PK11_GenerateRandom()
+
+2008-07-02  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl has some BIO emulation code that links a BIO object
+	  in as an NSPR layer. This code 1) did not implement enough of the
+	  layer to make SSL happy, and 2) linked the layer at the wrong point
+	  in the stack. (453651) Contributed by Bob Relyea
+
+2007-10-16  Rob Crittenden <rcritten at redhat.com>
+
+	* Use pkg-config to get the list of NSPR and NSS libraries to link with.
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't explicitly link with libsoftokn3.so (330091)
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Reverting change to remove #define CERT_NewTempCertificate (306711)
+	  This needs to be there otherwise there is an undefined symbol
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.2 released.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Fix some compiler warnings
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* The license is LGPLv2.1. I had wrongly included both a LGPL
+	  LICENSE file AND the GPL 2 COPYING file. LICENSE was removed
+	  in a separate update, this fixes COPYING.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch submitted by Miloslav Trmac (259901)
+	  * Define PEM_BUFSIZE
+	  * Use a better X509_STORE_CTX (with ->current_cert, ->error)
+	  * Add a dummy PEM_def_callback
+	  * Add SSLv2_server_method
+	  * Add X509_LU_X509, X509_STORE_get_by_subject
+	  * Add SSL_get_ex_data_X509_STORE_CTX_idx, and a stub for
+	    X509_STORE_CTX_get_ex_data
+	  * Uncomment declaration of SSL_state_string_long.  Return at least
+	    some string instead of NULL.
+	  * Fix prototype of CRYPTO_set_locking_callback
+	  * Use PK11_GenerateRandom, not PR_GetRandomNoise for RAND_write_file:
+	    RAND_write_file is used to keep a persistent random seed across
+	    stunnel runs, it is not really necessary to generate a truly random
+	    seed each time.  Besides, reading 1024 bytes from /dev/random takes
+	    way too long.
+	  * Don't call fclose(NULL) in RAND_write_file
+	  * Return NULL from SSL_get_peer_certificate if no peer certificate is
+	    available
+	  * Decide whether to allocate memory in X509_NAME_oneline based on
+	    the passed buffer, not its size
+
+2007-09-14  Rob Crittenden <rcritten at redhat.com>
+
+	* Change name of PKCS#11 module to libnsspem.so
+	* Import some improvements made during curl development
+
+2007-08-29  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.1 released.
+
+2007-08-06  Rob Crittenden <rcritten at redhat.com>
+
+	* Remove conflicting LICENSE file (the library is LGPL, not GPL).
+	  The file COPYING was correct.
+	* Provide a more usable README
+
+2007-07-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Import into repository. Lost 17 revisions of the history in the
+	  migration.
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle the SSL verify modes for clients as well
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* In X509_NAME_oneline() use the certificate arena to allocate memory
+
+2007-05-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle authenticating a PKCS#11 PEM token. If an encrypted key PEM is
+	  provided then the module will correctly prompt for the PIN
+	* Initialize the certificate nickname to NULL
+	* Check the return result of PK11_CreateGenericObject()
+	* After a certificate is selected make sure it exists. Better to catch
+	  this earlier than later
+	* Fix SSL_want() to return a legal value (SSL_NOTHING)
+	* Fix some compiler warnings
+
+2007-05-14  Rob Crittenden <rcritten at redhat.com>
+
+	* First cut at loading PEM files on the fly by using a PKCS#11 module
+	  that can read them. This is currently disabled as it requires the
+	  NSS tip (3.12) and some additional patches.
+	  If a filename does not contain a slash (/) then it is considered
+	  to be a regular NSS nickname and the NSS Certificate DB token is
+	  used.
+
+2007-05-11  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch from Bob Relyea
+	  * Adds support for some of the BIO API
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* A few casts to eliminate some compiler warnings.
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't allow SSL_library_init to be called more than once
+	* Enable the SSL cache for servers
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Cobbled function sftk_newPinCheck() from NSS to do password type and
+	  length enforcemen when in FIPS mode
+	* For some reason I had disabled setting ciphers. Re-enabled that and
+	  now enforce only FIPS-approved ciphers when the token is in FIPS mode.
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Should use PR_USER_THREAD in PR_Init
+	* Add a close method for our layer
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Implement SSL_CIPHER_get_version (possibly wrongly) and
+	  SSL_CIPHER_get_bits
+	* Fix using an NSS database with a password. Freeing the slot list
+	  was bad.
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* If a certificate cannot be found set an appropriate error so an
+	  OpenSSL app reports the right problem.
+	* Look in /etc/pki/nssdb if SSL_DIR is not set
+	* Implement the DEFAULT cipher keyword
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* Fill in some more of the RAND_ API
+
+2007-04-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Start of project 
diff -ruNp nss_compat_ossl-0.9.5.orig/src/ssl.c nss_compat_ossl-0.9.5/src/ssl.c
--- nss_compat_ossl-0.9.5.orig/src/ssl.c	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/src/ssl.c	2009-04-29 09:47:29.000000000 -0400
@@ -80,8 +80,10 @@ static int nss_set_private(PRFileDesc *f
 
 int is_initialized = 0;
 static const char* pem_library = "libnsspem.so";
+static const char* root_certs_library = "libnssckbi.so";
 
-static SECMODModule* mod = NULL;
+static SECMODModule* pemMod = NULL;
+static SECMODModule* rootMod = NULL;
 CK_SLOT_ID slotCount = 1;
 
 #define DEF_SSL2_TIMEOUT        100L  /* seconds */
@@ -1002,7 +1004,7 @@ nss_set_server_cert(SSL_CTX *ctx, const 
         if (n) {
             n++;
         }
-        if (mod == NULL) /* we have a file-based cert but no PEM module */
+        if (pemMod == NULL) /* we have a file-based cert but no PEM module */
             return 1;
     } else {
         if (cacert)
@@ -1278,11 +1280,11 @@ int SSL_library_init(void)
 
     PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"\"", pem_library);
 
-    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
-    if (!mod || !mod->loaded) {
-        if (mod) {
-            SECMOD_DestroyModule(mod);
-            mod = NULL;
+    pemMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!pemMod || !pemMod->loaded) {
+        if (pemMod) {
+            SECMOD_DestroyModule(pemMod);
+            pemMod = NULL;
         }
         free(configstring);
         return 1;
@@ -2112,7 +2114,7 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX 
     }
 
     /* This will force the token to be seen as re-inserted */
-    SECMOD_WaitForAnyTokenEvent(mod, 0, 0);
+    SECMOD_WaitForAnyTokenEvent(pemMod, 0, 0);
     PK11_IsPresent(slot);
 
     if (PK11_Authenticate(slot, PR_TRUE, &retryCount) != SECSuccess) {
@@ -2724,7 +2726,17 @@ int SSL_CTX_load_verify_locations(SSL_CT
 }
 
 int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx) {
-    return 0;
+    if (PR_FALSE == SECMOD_HasRootCerts()) {
+        char configstring[64];
+
+        /* try to load root certs module */
+        PR_snprintf(configstring, 64, "library=%s name=\"Root Certs\" parameters=\"\"", root_certs_library);
+        rootMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+        if (rootMod || !rootMod->loaded) {
+            SECMOD_DestroyModule(rootMod);
+            rootMod = NULL;
+        }
+    }
 }
 
 void SSL_set_verify(SSL *ssl, int mode,


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-10/nss_compat_ossl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nss_compat_ossl.spec	20 Apr 2009 19:44:07 -0000	1.14
+++ nss_compat_ossl.spec	29 Apr 2009 14:12:38 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         nss_compat_ossl-rootcert.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -27,6 +28,7 @@ Header and library files for doing porti
 
 %prep
 %setup -q
+%patch1 -p1 -b .rootcert
 
 %build
 
@@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-3
+- Resolve BZ 497788, implement default loading of root CAs
+
 * Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
 - Actually change the license to MIT in the spec file
 



From mtasaka at fedoraproject.org  Wed Apr 29 14:18:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 29 Apr 2009 14:18:59 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.362, 1.363 jd.spec, 1.420, 1.421 sources,
	1.363, 1.364
Message-ID: <20090429141859.D333770133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22962/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
- 2.4.0 beta 090429



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -p -r1.362 -r1.363
--- .cvsignore	26 Apr 2009 16:18:45 -0000	1.362
+++ .cvsignore	29 Apr 2009 14:18:28 -0000	1.363
@@ -1 +1 @@
-jd-2.4.0-svn2786_trunk.tgz
+jd-2.4.0-beta090429.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- jd.spec	26 Apr 2009 16:18:45 -0000	1.420
+++ jd.spec	29 Apr 2009 14:18:29 -0000	1.421
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2786_trunk
-%define         repoid        38008
+%define         strtag        beta090429
+%define         repoid        39686
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -138,8 +138,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Update to latest trunk
+* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
+- 2.4.0 beta 090429
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1
 - 2.3.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -p -r1.363 -r1.364
--- sources	26 Apr 2009 16:18:45 -0000	1.363
+++ sources	29 Apr 2009 14:18:29 -0000	1.364
@@ -1 +1 @@
-8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz
+b68b190ac919f9c307c27fa3ccf47297  jd-2.4.0-beta090429.tgz



From mtasaka at fedoraproject.org  Wed Apr 29 14:19:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 29 Apr 2009 14:19:00 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.355, 1.356 jd.spec, 1.415, 1.416 sources,
	1.356, 1.357
Message-ID: <20090429141900.E69DF70133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22962/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
- 2.4.0 beta 090429



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -p -r1.355 -r1.356
--- .cvsignore	26 Apr 2009 16:18:46 -0000	1.355
+++ .cvsignore	29 Apr 2009 14:18:29 -0000	1.356
@@ -1 +1 @@
-jd-2.4.0-svn2786_trunk.tgz
+jd-2.4.0-beta090429.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- jd.spec	26 Apr 2009 16:18:46 -0000	1.415
+++ jd.spec	29 Apr 2009 14:18:29 -0000	1.416
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2786_trunk
-%define         repoid        38008
+%define         strtag        beta090429
+%define         repoid        39686
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -138,8 +138,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Update to latest trunk
+* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
+- 2.4.0 beta 090429
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1
 - 2.3.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -p -r1.356 -r1.357
--- sources	26 Apr 2009 16:18:46 -0000	1.356
+++ sources	29 Apr 2009 14:18:29 -0000	1.357
@@ -1 +1 @@
-8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz
+b68b190ac919f9c307c27fa3ccf47297  jd-2.4.0-beta090429.tgz



From mtasaka at fedoraproject.org  Wed Apr 29 14:19:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 29 Apr 2009 14:19:01 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.362, 1.363 jd.spec, 1.411, 1.412 sources, 
	1.363, 1.364
Message-ID: <20090429141901.1AAFA70133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22962/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
- 2.4.0 beta 090429



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -p -r1.362 -r1.363
--- .cvsignore	26 Apr 2009 16:18:46 -0000	1.362
+++ .cvsignore	29 Apr 2009 14:18:30 -0000	1.363
@@ -1 +1 @@
-jd-2.4.0-svn2786_trunk.tgz
+jd-2.4.0-beta090429.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- jd.spec	26 Apr 2009 16:18:46 -0000	1.411
+++ jd.spec	29 Apr 2009 14:18:30 -0000	1.412
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2786_trunk
-%define         repoid        38008
+%define         strtag        beta090429
+%define         repoid        39686
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -138,8 +138,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Update to latest trunk
+* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
+- 2.4.0 beta 090429
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1
 - 2.3.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -p -r1.363 -r1.364
--- sources	26 Apr 2009 16:18:46 -0000	1.363
+++ sources	29 Apr 2009 14:18:30 -0000	1.364
@@ -1 +1 @@
-8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz
+b68b190ac919f9c307c27fa3ccf47297  jd-2.4.0-beta090429.tgz



From mtasaka at fedoraproject.org  Wed Apr 29 14:19:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 29 Apr 2009 14:19:02 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.352, 1.353 jd.spec, 1.412, 1.413 sources,
	1.353, 1.354
Message-ID: <20090429141902.28B5F70133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22962/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
- 2.4.0 beta 090429



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- .cvsignore	26 Apr 2009 16:18:47 -0000	1.352
+++ .cvsignore	29 Apr 2009 14:18:30 -0000	1.353
@@ -1 +1 @@
-jd-2.4.0-svn2786_trunk.tgz
+jd-2.4.0-beta090429.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- jd.spec	26 Apr 2009 16:18:47 -0000	1.412
+++ jd.spec	29 Apr 2009 14:18:30 -0000	1.413
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.0
-%define         strtag        svn2786_trunk
-%define         repoid        38008
+%define         strtag        beta090429
+%define         repoid        39686
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -138,8 +138,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Apr 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Update to latest trunk
+* Wed Apr 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-0.2.beta090429
+- 2.4.0 beta 090429
 
 * Thu Mar  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1
 - 2.3.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -p -r1.353 -r1.354
--- sources	26 Apr 2009 16:18:47 -0000	1.353
+++ sources	29 Apr 2009 14:18:30 -0000	1.354
@@ -1 +1 @@
-8dab93d48b75217d03abc49bbb2f1ef2  jd-2.4.0-svn2786_trunk.tgz
+b68b190ac919f9c307c27fa3ccf47297  jd-2.4.0-beta090429.tgz



From rcritten at fedoraproject.org  Wed Apr 29 14:22:47 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Wed, 29 Apr 2009 14:22:47 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-11 nss_compat_ossl-rootcert.patch, NONE,
	1.1 nss_compat_ossl.spec, 1.14, 1.15
Message-ID: <20090429142247.8CF2E70133@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23589

Modified Files:
	nss_compat_ossl.spec 
Added Files:
	nss_compat_ossl-rootcert.patch 
Log Message:
Resolve BZ 497788, implement default loading of root CAs


nss_compat_ossl-rootcert.patch:

--- NEW FILE nss_compat_ossl-rootcert.patch ---
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog nss_compat_ossl-0.9.5/ChangeLog
--- nss_compat_ossl-0.9.5.orig/ChangeLog	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/ChangeLog	2009-04-29 09:47:29.000000000 -0400
@@ -1,3 +1,17 @@
+2009-04-29  Rob Crittenden <rcritten at redhat.com>
+
+       * Implement SSL_CTX_set_default_verify_paths()
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+
+       * nss_compat_ossl 0.9.5 released.
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+       * Ensure that an SSL context exists before doing anything. Since
+         we can't catch NSS initialization failures at init time we have
+         to catch them later (like this).
+
+
 2009-03-06  Rich Megginson <rmeggins at redhat.com>
 
 	* Change license to MIT style license
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog.orig nss_compat_ossl-0.9.5/ChangeLog.orig
--- nss_compat_ossl-0.9.5.orig/ChangeLog.orig	1969-12-31 19:00:00.000000000 -0500
+++ nss_compat_ossl-0.9.5/ChangeLog.orig	2009-04-20 11:02:22.000000000 -0400
@@ -0,0 +1,163 @@
+2009-03-06  Rich Megginson <rmeggins at redhat.com>
+
+	* Change license to MIT style license
+
+2008-09-12  Rob Crittenden <rcritten at redhat.com>
+
+	* Use proper NSPR header file (even though marked as private)
+	* Don't use PR_GetRandomNoise(), it isn't truly random. Use
+	  PK11_GenerateRandom()
+
+2008-07-02  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl has some BIO emulation code that links a BIO object
+	  in as an NSPR layer. This code 1) did not implement enough of the
+	  layer to make SSL happy, and 2) linked the layer at the wrong point
+	  in the stack. (453651) Contributed by Bob Relyea
+
+2007-10-16  Rob Crittenden <rcritten at redhat.com>
+
+	* Use pkg-config to get the list of NSPR and NSS libraries to link with.
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't explicitly link with libsoftokn3.so (330091)
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Reverting change to remove #define CERT_NewTempCertificate (306711)
+	  This needs to be there otherwise there is an undefined symbol
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.2 released.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Fix some compiler warnings
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* The license is LGPLv2.1. I had wrongly included both a LGPL
+	  LICENSE file AND the GPL 2 COPYING file. LICENSE was removed
+	  in a separate update, this fixes COPYING.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch submitted by Miloslav Trmac (259901)
+	  * Define PEM_BUFSIZE
+	  * Use a better X509_STORE_CTX (with ->current_cert, ->error)
+	  * Add a dummy PEM_def_callback
+	  * Add SSLv2_server_method
+	  * Add X509_LU_X509, X509_STORE_get_by_subject
+	  * Add SSL_get_ex_data_X509_STORE_CTX_idx, and a stub for
+	    X509_STORE_CTX_get_ex_data
+	  * Uncomment declaration of SSL_state_string_long.  Return at least
+	    some string instead of NULL.
+	  * Fix prototype of CRYPTO_set_locking_callback
+	  * Use PK11_GenerateRandom, not PR_GetRandomNoise for RAND_write_file:
+	    RAND_write_file is used to keep a persistent random seed across
+	    stunnel runs, it is not really necessary to generate a truly random
+	    seed each time.  Besides, reading 1024 bytes from /dev/random takes
+	    way too long.
+	  * Don't call fclose(NULL) in RAND_write_file
+	  * Return NULL from SSL_get_peer_certificate if no peer certificate is
+	    available
+	  * Decide whether to allocate memory in X509_NAME_oneline based on
+	    the passed buffer, not its size
+
+2007-09-14  Rob Crittenden <rcritten at redhat.com>
+
+	* Change name of PKCS#11 module to libnsspem.so
+	* Import some improvements made during curl development
+
+2007-08-29  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.1 released.
+
+2007-08-06  Rob Crittenden <rcritten at redhat.com>
+
+	* Remove conflicting LICENSE file (the library is LGPL, not GPL).
+	  The file COPYING was correct.
+	* Provide a more usable README
+
+2007-07-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Import into repository. Lost 17 revisions of the history in the
+	  migration.
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle the SSL verify modes for clients as well
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* In X509_NAME_oneline() use the certificate arena to allocate memory
+
+2007-05-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle authenticating a PKCS#11 PEM token. If an encrypted key PEM is
+	  provided then the module will correctly prompt for the PIN
+	* Initialize the certificate nickname to NULL
+	* Check the return result of PK11_CreateGenericObject()
+	* After a certificate is selected make sure it exists. Better to catch
+	  this earlier than later
+	* Fix SSL_want() to return a legal value (SSL_NOTHING)
+	* Fix some compiler warnings
+
+2007-05-14  Rob Crittenden <rcritten at redhat.com>
+
+	* First cut at loading PEM files on the fly by using a PKCS#11 module
+	  that can read them. This is currently disabled as it requires the
+	  NSS tip (3.12) and some additional patches.
+	  If a filename does not contain a slash (/) then it is considered
+	  to be a regular NSS nickname and the NSS Certificate DB token is
+	  used.
+
+2007-05-11  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch from Bob Relyea
+	  * Adds support for some of the BIO API
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* A few casts to eliminate some compiler warnings.
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't allow SSL_library_init to be called more than once
+	* Enable the SSL cache for servers
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Cobbled function sftk_newPinCheck() from NSS to do password type and
+	  length enforcemen when in FIPS mode
+	* For some reason I had disabled setting ciphers. Re-enabled that and
+	  now enforce only FIPS-approved ciphers when the token is in FIPS mode.
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Should use PR_USER_THREAD in PR_Init
+	* Add a close method for our layer
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Implement SSL_CIPHER_get_version (possibly wrongly) and
+	  SSL_CIPHER_get_bits
+	* Fix using an NSS database with a password. Freeing the slot list
+	  was bad.
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* If a certificate cannot be found set an appropriate error so an
+	  OpenSSL app reports the right problem.
+	* Look in /etc/pki/nssdb if SSL_DIR is not set
+	* Implement the DEFAULT cipher keyword
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* Fill in some more of the RAND_ API
+
+2007-04-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Start of project 
diff -ruNp nss_compat_ossl-0.9.5.orig/src/ssl.c nss_compat_ossl-0.9.5/src/ssl.c
--- nss_compat_ossl-0.9.5.orig/src/ssl.c	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/src/ssl.c	2009-04-29 09:47:29.000000000 -0400
@@ -80,8 +80,10 @@ static int nss_set_private(PRFileDesc *f
 
 int is_initialized = 0;
 static const char* pem_library = "libnsspem.so";
+static const char* root_certs_library = "libnssckbi.so";
 
-static SECMODModule* mod = NULL;
+static SECMODModule* pemMod = NULL;
+static SECMODModule* rootMod = NULL;
 CK_SLOT_ID slotCount = 1;
 
 #define DEF_SSL2_TIMEOUT        100L  /* seconds */
@@ -1002,7 +1004,7 @@ nss_set_server_cert(SSL_CTX *ctx, const 
         if (n) {
             n++;
         }
-        if (mod == NULL) /* we have a file-based cert but no PEM module */
+        if (pemMod == NULL) /* we have a file-based cert but no PEM module */
             return 1;
     } else {
         if (cacert)
@@ -1278,11 +1280,11 @@ int SSL_library_init(void)
 
     PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"\"", pem_library);
 
-    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
-    if (!mod || !mod->loaded) {
-        if (mod) {
-            SECMOD_DestroyModule(mod);
-            mod = NULL;
+    pemMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!pemMod || !pemMod->loaded) {
+        if (pemMod) {
+            SECMOD_DestroyModule(pemMod);
+            pemMod = NULL;
         }
         free(configstring);
         return 1;
@@ -2112,7 +2114,7 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX 
     }
 
     /* This will force the token to be seen as re-inserted */
-    SECMOD_WaitForAnyTokenEvent(mod, 0, 0);
+    SECMOD_WaitForAnyTokenEvent(pemMod, 0, 0);
     PK11_IsPresent(slot);
 
     if (PK11_Authenticate(slot, PR_TRUE, &retryCount) != SECSuccess) {
@@ -2724,7 +2726,17 @@ int SSL_CTX_load_verify_locations(SSL_CT
 }
 
 int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx) {
-    return 0;
+    if (PR_FALSE == SECMOD_HasRootCerts()) {
+        char configstring[64];
+
+        /* try to load root certs module */
+        PR_snprintf(configstring, 64, "library=%s name=\"Root Certs\" parameters=\"\"", root_certs_library);
+        rootMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+        if (rootMod || !rootMod->loaded) {
+            SECMOD_DestroyModule(rootMod);
+            rootMod = NULL;
+        }
+    }
 }
 
 void SSL_set_verify(SSL *ssl, int mode,


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-11/nss_compat_ossl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nss_compat_ossl.spec	20 Apr 2009 19:25:01 -0000	1.14
+++ nss_compat_ossl.spec	29 Apr 2009 14:22:17 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         nss_compat_ossl-rootcert.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -27,6 +28,7 @@ Header and library files for doing porti
 
 %prep
 %setup -q
+%patch1 -p1 -b .rootcert
 
 %build
 
@@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
+- Resolve BZ 497788, implement default loading of root CAs
+
 * Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-1
 - Update to 0.9.5
 - License changed to MIT



From gd at fedoraproject.org  Wed Apr 29 14:25:05 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed, 29 Apr 2009 14:25:05 +0000 (UTC)
Subject: rpms/samba/F-11 .cvsignore, 1.60, 1.61 pam_winbind.conf, 1.1,
	1.2 samba.spec, 1.183, 1.184 sources, 1.64, 1.65
Message-ID: <20090429142505.6027670133@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23843

Modified Files:
	.cvsignore pam_winbind.conf samba.spec sources 
Log Message:
Update to 3.3.4

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	1 Apr 2009 13:10:01 -0000	1.60
+++ .cvsignore	29 Apr 2009 14:24:34 -0000	1.61
@@ -1 +1 @@
-samba-3.3.3.tar.gz
+samba-3.3.4.tar.gz


Index: pam_winbind.conf
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/pam_winbind.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pam_winbind.conf	16 Apr 2007 14:40:03 -0000	1.1
+++ pam_winbind.conf	29 Apr 2009 14:24:34 -0000	1.2
@@ -7,20 +7,32 @@
 [global]
 
 # turn on debugging
-;debug = yes
+;debug = no
+
+# turn on extended PAM state debugging
+;debug_state = no
 
 # request a cached login if possible
 # (needs "winbind offline logon = yes" in smb.conf)
-;cached_login = yes
+;cached_login = no
 
 # authenticate using kerberos
-;krb5_auth = yes
+;krb5_auth = no
 
 # when using kerberos, request a "FILE" krb5 credential cache type
 # (leave empty to just do krb5 authentication but not have a ticket
 # afterwards)
-;krb5_ccache_type = FILE
+;krb5_ccache_type =
 
 # make successful authentication dependend on membership of one SID
 # (can also take a name)
 ;require_membership_of =
+
+# password expiry warning period in days
+;warn_pwd_expire = 14
+
+# omit pam conversations
+;silent = no
+
+# create homedirectory on the fly
+;mkhomedir = no


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- samba.spec	19 Apr 2009 22:43:02 -0000	1.183
+++ samba.spec	29 Apr 2009 14:24:34 -0000	1.184
@@ -1,5 +1,5 @@
-%define main_release 35
-%define samba_version 3.3.3
+%define main_release 36
+%define samba_version 3.3.4
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
 %define pre_release %nil
@@ -879,6 +879,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Apr 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.4-0.36
+- Update to 3.3.4
+
 * Mon Apr 20 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.35
 - Enable build of idmap_tdb2 for clustered setups
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	1 Apr 2009 13:10:01 -0000	1.64
+++ sources	29 Apr 2009 14:24:34 -0000	1.65
@@ -1 +1 @@
-4d5835817416d1ffa30783af45c5a9ed  samba-3.3.3.tar.gz
+1443165edb7cb3f56f1e77aec1ee3266  samba-3.3.4.tar.gz



From gd at fedoraproject.org  Wed Apr 29 14:27:26 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed, 29 Apr 2009 14:27:26 +0000 (UTC)
Subject: rpms/samba/devel .cvsignore, 1.60, 1.61 pam_winbind.conf, 1.1,
	1.2 samba.spec, 1.183, 1.184 sources, 1.64, 1.65
Message-ID: <20090429142726.388FD70133@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24223

Modified Files:
	.cvsignore pam_winbind.conf samba.spec sources 
Log Message:
Update to 3.3.4

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	1 Apr 2009 13:10:01 -0000	1.60
+++ .cvsignore	29 Apr 2009 14:26:55 -0000	1.61
@@ -1 +1 @@
-samba-3.3.3.tar.gz
+samba-3.3.4.tar.gz


Index: pam_winbind.conf
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/pam_winbind.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pam_winbind.conf	16 Apr 2007 14:40:03 -0000	1.1
+++ pam_winbind.conf	29 Apr 2009 14:26:55 -0000	1.2
@@ -7,20 +7,32 @@
 [global]
 
 # turn on debugging
-;debug = yes
+;debug = no
+
+# turn on extended PAM state debugging
+;debug_state = no
 
 # request a cached login if possible
 # (needs "winbind offline logon = yes" in smb.conf)
-;cached_login = yes
+;cached_login = no
 
 # authenticate using kerberos
-;krb5_auth = yes
+;krb5_auth = no
 
 # when using kerberos, request a "FILE" krb5 credential cache type
 # (leave empty to just do krb5 authentication but not have a ticket
 # afterwards)
-;krb5_ccache_type = FILE
+;krb5_ccache_type =
 
 # make successful authentication dependend on membership of one SID
 # (can also take a name)
 ;require_membership_of =
+
+# password expiry warning period in days
+;warn_pwd_expire = 14
+
+# omit pam conversations
+;silent = no
+
+# create homedirectory on the fly
+;mkhomedir = no


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- samba.spec	19 Apr 2009 22:44:13 -0000	1.183
+++ samba.spec	29 Apr 2009 14:26:55 -0000	1.184
@@ -1,5 +1,5 @@
-%define main_release 35
-%define samba_version 3.3.3
+%define main_release 36
+%define samba_version 3.3.4
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
 %define pre_release %nil
@@ -879,6 +879,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Apr 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.4-0.36
+- Update to 3.3.4
+
 * Mon Apr 20 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.3-0.35
 - Enable build of idmap_tdb2 for clustered setups
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	1 Apr 2009 13:10:01 -0000	1.64
+++ sources	29 Apr 2009 14:26:55 -0000	1.65
@@ -1 +1 @@
-4d5835817416d1ffa30783af45c5a9ed  samba-3.3.3.tar.gz
+1443165edb7cb3f56f1e77aec1ee3266  samba-3.3.4.tar.gz



From rcritten at fedoraproject.org  Wed Apr 29 14:37:38 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Wed, 29 Apr 2009 14:37:38 +0000 (UTC)
Subject: rpms/nss_compat_ossl/devel nss_compat_ossl-rootcert.patch, NONE,
	1.1 nss_compat_ossl.spec, 1.15, 1.16
Message-ID: <20090429143738.73BB070133@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25387

Modified Files:
	nss_compat_ossl.spec 
Added Files:
	nss_compat_ossl-rootcert.patch 
Log Message:
Resolve BZ 497788, implement default loading of root CAs


nss_compat_ossl-rootcert.patch:

--- NEW FILE nss_compat_ossl-rootcert.patch ---
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog nss_compat_ossl-0.9.5/ChangeLog
--- nss_compat_ossl-0.9.5.orig/ChangeLog	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/ChangeLog	2009-04-29 09:47:29.000000000 -0400
@@ -1,3 +1,17 @@
+2009-04-29  Rob Crittenden <rcritten at redhat.com>
+
+       * Implement SSL_CTX_set_default_verify_paths()
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+
+       * nss_compat_ossl 0.9.5 released.
+
+2009-04-20  Rob Crittenden <rcritten at redhat.com>
+       * Ensure that an SSL context exists before doing anything. Since
+         we can't catch NSS initialization failures at init time we have
+         to catch them later (like this).
+
+
 2009-03-06  Rich Megginson <rmeggins at redhat.com>
 
 	* Change license to MIT style license
diff -ruNp nss_compat_ossl-0.9.5.orig/ChangeLog.orig nss_compat_ossl-0.9.5/ChangeLog.orig
--- nss_compat_ossl-0.9.5.orig/ChangeLog.orig	1969-12-31 19:00:00.000000000 -0500
+++ nss_compat_ossl-0.9.5/ChangeLog.orig	2009-04-20 11:02:22.000000000 -0400
@@ -0,0 +1,163 @@
+2009-03-06  Rich Megginson <rmeggins at redhat.com>
+
+	* Change license to MIT style license
+
+2008-09-12  Rob Crittenden <rcritten at redhat.com>
+
+	* Use proper NSPR header file (even though marked as private)
+	* Don't use PR_GetRandomNoise(), it isn't truly random. Use
+	  PK11_GenerateRandom()
+
+2008-07-02  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl has some BIO emulation code that links a BIO object
+	  in as an NSPR layer. This code 1) did not implement enough of the
+	  layer to make SSL happy, and 2) linked the layer at the wrong point
+	  in the stack. (453651) Contributed by Bob Relyea
+
+2007-10-16  Rob Crittenden <rcritten at redhat.com>
+
+	* Use pkg-config to get the list of NSPR and NSS libraries to link with.
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't explicitly link with libsoftokn3.so (330091)
+
+2007-10-13  Rob Crittenden <rcritten at redhat.com>
+
+	* Reverting change to remove #define CERT_NewTempCertificate (306711)
+	  This needs to be there otherwise there is an undefined symbol
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.2 released.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Fix some compiler warnings
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* The license is LGPLv2.1. I had wrongly included both a LGPL
+	  LICENSE file AND the GPL 2 COPYING file. LICENSE was removed
+	  in a separate update, this fixes COPYING.
+
+2007-09-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch submitted by Miloslav Trmac (259901)
+	  * Define PEM_BUFSIZE
+	  * Use a better X509_STORE_CTX (with ->current_cert, ->error)
+	  * Add a dummy PEM_def_callback
+	  * Add SSLv2_server_method
+	  * Add X509_LU_X509, X509_STORE_get_by_subject
+	  * Add SSL_get_ex_data_X509_STORE_CTX_idx, and a stub for
+	    X509_STORE_CTX_get_ex_data
+	  * Uncomment declaration of SSL_state_string_long.  Return at least
+	    some string instead of NULL.
+	  * Fix prototype of CRYPTO_set_locking_callback
+	  * Use PK11_GenerateRandom, not PR_GetRandomNoise for RAND_write_file:
+	    RAND_write_file is used to keep a persistent random seed across
+	    stunnel runs, it is not really necessary to generate a truly random
+	    seed each time.  Besides, reading 1024 bytes from /dev/random takes
+	    way too long.
+	  * Don't call fclose(NULL) in RAND_write_file
+	  * Return NULL from SSL_get_peer_certificate if no peer certificate is
+	    available
+	  * Decide whether to allocate memory in X509_NAME_oneline based on
+	    the passed buffer, not its size
+
+2007-09-14  Rob Crittenden <rcritten at redhat.com>
+
+	* Change name of PKCS#11 module to libnsspem.so
+	* Import some improvements made during curl development
+
+2007-08-29  Rob Crittenden <rcritten at redhat.com>
+
+	* nss_compat_ossl 0.9.1 released.
+
+2007-08-06  Rob Crittenden <rcritten at redhat.com>
+
+	* Remove conflicting LICENSE file (the library is LGPL, not GPL).
+	  The file COPYING was correct.
+	* Provide a more usable README
+
+2007-07-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Import into repository. Lost 17 revisions of the history in the
+	  migration.
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle the SSL verify modes for clients as well
+
+2007-05-29  Rob Crittenden <rcritten at redhat.com>
+
+	* In X509_NAME_oneline() use the certificate arena to allocate memory
+
+2007-05-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Handle authenticating a PKCS#11 PEM token. If an encrypted key PEM is
+	  provided then the module will correctly prompt for the PIN
+	* Initialize the certificate nickname to NULL
+	* Check the return result of PK11_CreateGenericObject()
+	* After a certificate is selected make sure it exists. Better to catch
+	  this earlier than later
+	* Fix SSL_want() to return a legal value (SSL_NOTHING)
+	* Fix some compiler warnings
+
+2007-05-14  Rob Crittenden <rcritten at redhat.com>
+
+	* First cut at loading PEM files on the fly by using a PKCS#11 module
+	  that can read them. This is currently disabled as it requires the
+	  NSS tip (3.12) and some additional patches.
+	  If a filename does not contain a slash (/) then it is considered
+	  to be a regular NSS nickname and the NSS Certificate DB token is
+	  used.
+
+2007-05-11  Rob Crittenden <rcritten at redhat.com>
+
+	* Patch from Bob Relyea
+	  * Adds support for some of the BIO API
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* A few casts to eliminate some compiler warnings.
+
+2007-04-25  Rob Crittenden <rcritten at redhat.com>
+
+	* Don't allow SSL_library_init to be called more than once
+	* Enable the SSL cache for servers
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Cobbled function sftk_newPinCheck() from NSS to do password type and
+	  length enforcemen when in FIPS mode
+	* For some reason I had disabled setting ciphers. Re-enabled that and
+	  now enforce only FIPS-approved ciphers when the token is in FIPS mode.
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Should use PR_USER_THREAD in PR_Init
+	* Add a close method for our layer
+
+2007-04-24  Rob Crittenden <rcritten at redhat.com>
+
+	* Implement SSL_CIPHER_get_version (possibly wrongly) and
+	  SSL_CIPHER_get_bits
+	* Fix using an NSS database with a password. Freeing the slot list
+	  was bad.
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* If a certificate cannot be found set an appropriate error so an
+	  OpenSSL app reports the right problem.
+	* Look in /etc/pki/nssdb if SSL_DIR is not set
+	* Implement the DEFAULT cipher keyword
+
+2007-04-23  Rob Crittenden <rcritten at redhat.com>
+
+	* Fill in some more of the RAND_ API
+
+2007-04-20  Rob Crittenden <rcritten at redhat.com>
+
+	* Start of project 
diff -ruNp nss_compat_ossl-0.9.5.orig/src/ssl.c nss_compat_ossl-0.9.5/src/ssl.c
--- nss_compat_ossl-0.9.5.orig/src/ssl.c	2009-04-20 11:02:22.000000000 -0400
+++ nss_compat_ossl-0.9.5/src/ssl.c	2009-04-29 09:47:29.000000000 -0400
@@ -80,8 +80,10 @@ static int nss_set_private(PRFileDesc *f
 
 int is_initialized = 0;
 static const char* pem_library = "libnsspem.so";
+static const char* root_certs_library = "libnssckbi.so";
 
-static SECMODModule* mod = NULL;
+static SECMODModule* pemMod = NULL;
+static SECMODModule* rootMod = NULL;
 CK_SLOT_ID slotCount = 1;
 
 #define DEF_SSL2_TIMEOUT        100L  /* seconds */
@@ -1002,7 +1004,7 @@ nss_set_server_cert(SSL_CTX *ctx, const 
         if (n) {
             n++;
         }
-        if (mod == NULL) /* we have a file-based cert but no PEM module */
+        if (pemMod == NULL) /* we have a file-based cert but no PEM module */
             return 1;
     } else {
         if (cacert)
@@ -1278,11 +1280,11 @@ int SSL_library_init(void)
 
     PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"\"", pem_library);
 
-    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
-    if (!mod || !mod->loaded) {
-        if (mod) {
-            SECMOD_DestroyModule(mod);
-            mod = NULL;
+    pemMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!pemMod || !pemMod->loaded) {
+        if (pemMod) {
+            SECMOD_DestroyModule(pemMod);
+            pemMod = NULL;
         }
         free(configstring);
         return 1;
@@ -2112,7 +2114,7 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX 
     }
 
     /* This will force the token to be seen as re-inserted */
-    SECMOD_WaitForAnyTokenEvent(mod, 0, 0);
+    SECMOD_WaitForAnyTokenEvent(pemMod, 0, 0);
     PK11_IsPresent(slot);
 
     if (PK11_Authenticate(slot, PR_TRUE, &retryCount) != SECSuccess) {
@@ -2724,7 +2726,17 @@ int SSL_CTX_load_verify_locations(SSL_CT
 }
 
 int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx) {
-    return 0;
+    if (PR_FALSE == SECMOD_HasRootCerts()) {
+        char configstring[64];
+
+        /* try to load root certs module */
+        PR_snprintf(configstring, 64, "library=%s name=\"Root Certs\" parameters=\"\"", root_certs_library);
+        rootMod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+        if (rootMod || !rootMod->loaded) {
+            SECMOD_DestroyModule(rootMod);
+            rootMod = NULL;
+        }
+    }
 }
 
 void SSL_set_verify(SSL *ssl, int mode,


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nss_compat_ossl.spec	20 Apr 2009 19:51:25 -0000	1.15
+++ nss_compat_ossl.spec	29 Apr 2009 14:37:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ License:        MIT
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://rcritten.fedorapeople.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         nss_compat_ossl-rootcert.patch
 
 # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
 BuildRequires:  nss-devel > 3.11.7-7
@@ -27,6 +28,7 @@ Header and library files for doing porti
 
 %prep
 %setup -q
+%patch1 -p1 -b .rootcert
 
 %build
 
@@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-3
+- Resolve BZ 497788, implement default loading of root CAs
+
 * Mon Apr 20 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
 - Actually change the license in the spec file
 



From cwickert at fedoraproject.org  Wed Apr 29 14:42:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 14:42:50 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.241, 1.242 comps-f11.xml.in, 1.203,
	1.204 comps-f9.xml.in, 1.449, 1.450
Message-ID: <20090429144250.DE59B70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25806

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
add gxmessage and lilyterm


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- comps-f10.xml.in	27 Apr 2009 11:50:23 -0000	1.241
+++ comps-f10.xml.in	29 Apr 2009 14:42:20 -0000	1.242
@@ -335,6 +335,8 @@
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">gdm</packagereq>
+      <packagereq type="optional">gxmessage</packagereq>
+      <packagereq type="optional">lilyterm</packagereq>
       <packagereq type="optional">lxpanel</packagereq>
       <packagereq type="optional">roxterm</packagereq>
       <packagereq type="optional">rss-glx</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- comps-f11.xml.in	29 Apr 2009 14:07:43 -0000	1.203
+++ comps-f11.xml.in	29 Apr 2009 14:42:20 -0000	1.204
@@ -348,6 +348,8 @@
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">gdm</packagereq>
+      <packagereq type="optional">gxmessage</packagereq>
+      <packagereq type="optional">lilyterm</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
       <packagereq type="optional">lineakd</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- comps-f9.xml.in	23 Apr 2009 11:57:58 -0000	1.449
+++ comps-f9.xml.in	29 Apr 2009 14:42:20 -0000	1.450
@@ -341,6 +341,8 @@
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">devilspie</packagereq>
+      <packagereq type="optional">gxmessage</packagereq>
+      <packagereq type="optional">lilyterm</packagereq>
       <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">roxterm</packagereq>
       <packagereq type="optional">rss-glx</packagereq>



From cwickert at fedoraproject.org  Wed Apr 29 14:46:46 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 14:46:46 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.242,1.243 comps-f11.xml.in,1.204,1.205
Message-ID: <20090429144646.6ADCB70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26125

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
add sakura and termit


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- comps-f10.xml.in	29 Apr 2009 14:42:20 -0000	1.242
+++ comps-f10.xml.in	29 Apr 2009 14:46:15 -0000	1.243
@@ -342,10 +342,12 @@
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
+      <packagereq type="optional">sakura</packagereq>
       <packagereq type="optional">slim</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
       <packagereq type="optional">system-config-display</packagereq>
       <packagereq type="optional">system-switch-displaymanager</packagereq>
+      <packagereq type="optional">termit</packagereq>
       <packagereq type="optional">uim-gtk2</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- comps-f11.xml.in	29 Apr 2009 14:42:20 -0000	1.204
+++ comps-f11.xml.in	29 Apr 2009 14:46:16 -0000	1.205
@@ -358,10 +358,12 @@
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
+      <packagereq type="optional">sakura</packagereq>
       <packagereq type="optional">slim</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
       <packagereq type="optional">system-config-display</packagereq>
       <packagereq type="optional">system-switch-displaymanager</packagereq>
+      <packagereq type="optional">termit</packagereq>
       <packagereq type="optional">tigervnc-server</packagereq>
       <packagereq type="optional">uim-gtk2</packagereq>
       <packagereq type="optional">workrave</packagereq>



From mclasen at fedoraproject.org  Wed Apr 29 14:49:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 29 Apr 2009 14:49:31 +0000 (UTC)
Subject: rpms/gnome-desktop/F-11 you-never-find-a-haystack-in-a-needle.patch,
	NONE, 1.1 gnome-desktop.spec, 1.210, 1.211
Message-ID: <20090429144931.9D51570133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26308

Modified Files:
	gnome-desktop.spec 
Added Files:
	you-never-find-a-haystack-in-a-needle.patch 
Log Message:
Fix 'unkown' monitor names


you-never-find-a-haystack-in-a-needle.patch:

--- NEW FILE you-never-find-a-haystack-in-a-needle.patch ---
--- gnome-desktop-2.26.1/libgnome-desktop/display-name.c	2009-04-13 18:00:20.000000000 -0400
+++ hacked/libgnome-desktop/display-name.c	2009-04-29 10:41:35.182718339 -0400
@@ -205,10 +205,11 @@
     const char *vendor;
     int width_mm, height_mm, inches;
 
+    g_print ("output name %s, vendor %s\n", output_name, info ? info->manufacturer_code : "nada");
     if (output_name &&
-	(strstr ("lvds", output_name)	||
-	 strstr ("LVDS", output_name)	||
-	 strstr ("Lvds", output_name)))
+	(strstr (output_name, "lvds")	||
+	 strstr (output_name, "LVDS")	||
+	 strstr (output_name, "Lvds")))
     {
 	vendor = _("Laptop");
     }


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/gnome-desktop.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- gnome-desktop.spec	28 Apr 2009 23:48:26 -0000	1.210
+++ gnome-desktop.spec	29 Apr 2009 14:49:01 -0000	1.211
@@ -12,11 +12,13 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
 # fixed upstream
 Patch0: give-me-back-my-rotations.patch
+# fixed upstream
+Patch1: you-never-find-a-haystack-in-a-needle.patch
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,7 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch0 -p1 -b .rotations
+%patch1 -p1 -b .unknown-monitors
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -120,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-3
+- Fix needle/haystack confusion causing most monitors to be 'Unknown'
+
 * Tue Apr 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
 - Fix a case of disappearing rotations (#497515)
 



From cwickert at fedoraproject.org  Wed Apr 29 14:59:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 14:59:57 +0000 (UTC)
Subject: rpms/lxmenu-data/F-10 lxmenu-data-0.1-COPYING, NONE,
	1.1 lxmenu-data-0.1-menu.patch, NONE, 1.1 lxmenu-data.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429145958.00CA070135@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmenu-data/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27103

Modified Files:
	.cvsignore sources 
Added Files:
	lxmenu-data-0.1-COPYING lxmenu-data-0.1-menu.patch 
	lxmenu-data.spec 
Log Message:
* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.1-2
- Change menu structure to vendor default
- Fix license



--- NEW FILE lxmenu-data-0.1-COPYING ---
		  GNU LIBRARY GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1991 Free Software Foundation, Inc.
                    675 Mass Ave, Cambridge, MA 02139, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the library GPL.  It is
 numbered 2 because it goes with version 2 of the ordinary GPL.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it.  You can use it for
your libraries, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if
you distribute copies of the library, or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  Our method of protecting your rights has two steps: (1) copyright
the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library.

  Also, for each distributor's protection, we want to make certain
that everyone understands that there is no warranty for this free
library.  If the library is modified by someone else and passed on, we
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
transforming the program into proprietary software.  To prevent this,
we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.

  Most GNU software, including some libraries, is covered by the ordinary
GNU General Public License, which was designed for utility programs.  This
license, the GNU Library General Public License, applies to certain
designated libraries.  This license is quite different from the ordinary
one; be sure to read it in full, and don't assume that anything in it is
the same as in the ordinary license.

  The reason we have a separate public license for some libraries is that
they blur the distinction we usually make between modifying or adding to a
program and simply using it.  Linking a program with a library, without
changing the library, is in some sense simply using the library, and is
analogous to running a utility program or application program.  However, in
a textual and legal sense, the linked executable is a combined work, a
derivative of the original library, and the ordinary General Public License
treats it as such.

  Because of this blurred distinction, using the ordinary General
Public License for libraries did not effectively promote software
sharing, because most developers did not use the libraries.  We
concluded that weaker conditions might promote sharing better.

  However, unrestricted linking of non-free programs would deprive the
users of those programs of all benefit from the free status of the
libraries themselves.  This Library General Public License is intended to
permit developers of non-free programs to use free libraries, while
preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them.  (We have not seen how to achieve
this as regards changes in header files, but we have achieved it as regards
changes in the actual functions of the Library.)  The hope is that this
will lead to faster development of free libraries.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, while the latter only
works together with the library.

  Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.

		  GNU LIBRARY GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License").  Each licensee is
addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    c) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    d) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the source code distributed need not include anything that is normally
distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

     Appendix: How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!

lxmenu-data-0.1-menu.patch:

--- NEW FILE lxmenu-data-0.1-menu.patch ---
--- lxmenu-data-0.1.orig/layout/lxde-applications.menu	2008-12-10 06:59:49.000000000 +0100
+++ lxmenu-data-0.1/layout/lxde-applications.menu	2009-03-22 17:40:56.000000000 +0100
@@ -128,7 +128,6 @@
 			<And>
 				<Category>System</Category>
 				<Not><Category>Settings</Category></Not>
-				<Not><Category>PackageManager</Category></Not>
 			</And>
 		</Include>
 	</Menu>	 <!-- End System Tools -->
@@ -145,56 +144,45 @@
 				<Not><Category>Screensaver</Category></Not>
 			</And>
 		</Include>
-		</Menu> <!-- End Other -->
+	</Menu> <!-- End Other -->
 
+	<!-- Preferences -->
 	<Menu>
-		<Name>DesktopSettings</Name>
-		<Directory>lxde-menu-system.directory</Directory>
+		<Name>Preferences</Name>
+		<Directory>lxde-settings.directory</Directory>
 		<Include>
-				<Category>PackageManager</Category>
+			<And>
+				<Category>Settings</Category>
+				<Not>
+					<Or>
+						<Category>System</Category>
+						<Category>X-XfceSettingsDialog</Category>
+						<Filename>gnomecc.desktop</Filename>
+						<Filename>gnome-default-applications.desktop</Filename>
+					</Or>
+				</Not>
+			</And>
 		</Include>
-		<Menu>
-			<Name>Preferences</Name>
-			<Directory>lxde-settings.directory</Directory>
-			<Include>
-				<And>
-					<Category>Settings</Category>
-					<Not>
-						<Or>
-							<Category>System</Category>
-							<Filename>gnomecc.desktop</Filename>
-						</Or>
-					</Not>
-				</And>
-			</Include>
-		</Menu>
-
-		<!-- System Settings -->
-		<Menu>
-			<Name>Administration</Name>
-			<Directory>lxde-settings-system.directory</Directory>
-			<Include>
-				<And>
-					<Category>Settings</Category>
-					<Category>System</Category>
-				</And>
-			</Include>
-		</Menu>		 <!-- End System Settings -->
+	</Menu>		<!-- End Preferences -->
 
-		<Layout>
-			<Menuname>Preferences</Menuname>
-			<Menuname>Administration</Menuname>
-			<Merge type="menus"/>
-			<Merge type="files"/>
-		</Layout>
-
-	</Menu> <!-- End Settings -->
+	<!-- System Settings -->
+	<Menu>
+		<Name>Administration</Name>
+		<Directory>lxde-settings-system.directory</Directory>
+		<Include>
+			<And>
+				<Category>Settings</Category>
+				<Category>System</Category>
+			</And>
+		</Include>
+	</Menu>		 <!-- End System Settings -->
 
 	<Layout>
 		<Merge type="files"/>
 		<Merge type="menus"/>
 		<Separator/>
-		<Menuname>DesktopSettings</Menuname>
+		<Menuname>Preferences</Menuname>
+		<Menuname>Administration</Menuname>
 	</Layout>
 
 </Menu> <!-- End Applications -->


--- NEW FILE lxmenu-data.spec ---
# Review:       https://bugzilla.redhat.com/487973

Name:           lxmenu-data
Version:        0.1
Release:        2%{?dist}
Summary:        Data files for the LXDE menu

Group:          User Interface/Desktops
License:        LGPLv2+
URL:            http://lxde.org
Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
Source1:        lxmenu-data-0.1-COPYING
Patch0:         lxmenu-data-0.1-menu.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  intltool >= 0.40.0
Requires:       redhat-menus
BuildArch:      noarch

%description
The lxmenu-data contains files used to build the menu in LXDE according to 
the freedesktop-org menu spec. Currently it's used by LXPanel and LXLauncher.


%prep
%setup -q
%patch0 -p1 -b .orig
# install correct license
rm -f COPYING
cp %{SOURCE1} COPYING


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#FIXME: add changelog when there is one
%doc AUTHORS COPYING README TODO
%config(noreplace) %{_sysconfdir}/xdg/menus/lxde-applications.menu
%{_datadir}/desktop-directories/lxde-*.directory


%changelog
* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.1-2
- Change menu structure to vendor default
- Fix license

* Fri Dec 12 2008 Christoph Wickert <cwickert at fedoraproject.org> 0.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Mar 2009 17:26:31 -0000	1.1
+++ .cvsignore	29 Apr 2009 14:59:26 -0000	1.2
@@ -0,0 +1 @@
+lxmenu-data-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Mar 2009 17:26:31 -0000	1.1
+++ sources	29 Apr 2009 14:59:26 -0000	1.2
@@ -0,0 +1 @@
+1c35ad4bf05cd076ce4a9bb64a246351  lxmenu-data-0.1.tar.gz



From cwickert at fedoraproject.org  Wed Apr 29 15:03:38 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 15:03:38 +0000 (UTC)
Subject: rpms/menu-cache/F-10 .cvsignore, 1.2, 1.3 menu-cache.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090429150338.2C65170133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/menu-cache/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28079/F-10

Modified Files:
	.cvsignore menu-cache.spec sources 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5-1
- Update to 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Feb 2009 01:53:08 -0000	1.2
+++ .cvsignore	29 Apr 2009 15:03:07 -0000	1.3
@@ -1 +1 @@
-menu-cache-0.2.2.tar.gz
+menu-cache-0.2.5.tar.gz


Index: menu-cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-10/menu-cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- menu-cache.spec	27 Feb 2009 01:53:08 -0000	1.1
+++ menu-cache.spec	29 Apr 2009 15:03:07 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           menu-cache
-Version:        0.2.2
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Caching mechanism for freedesktop.org compliant menus
 
@@ -54,11 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-#FIXME: add ChangeLog if there is content
+#FIXME: add ChangeLog and NEWS if there is content
 %doc AUTHORS COPYING README
-%{_bindir}/menu-cache-gen
-%{_bindir}/menu-cached
+%{_libexecdir}/menu-cache-gen
+%{_libexecdir}/menu-cached
 %{_libdir}/libmenu-cache.so.*
+#%{_mandir}/man*/*.gz
 
 
 %files devel
@@ -70,12 +71,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Dec 10 2008 Christoph Wickert <fedora christoph-wickert de> - 0.2.2-1
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5-1
+- Update to 0.2.5
+
+* Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
+- Update to 0.2.4
+
+* Tue Mar 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.3-1
+- Update to 0.2.3
+
+* Wed Dec 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.2-1
 - Update to 0.2.2
 
-* Tue Dec 09 2008 Christoph Wickert <fedora christoph-wickert de> - 0.2.0-1
+* Tue Dec 09 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
 - Update to 0.2.0
 - Split into base and devel package
 
-* Sun Dec 07 2008 Christoph Wickert <fedora christoph-wickert de> - 0.1.3-1
+* Sun Dec 07 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.3-1
 - Initial Fedora package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Feb 2009 01:53:08 -0000	1.2
+++ sources	29 Apr 2009 15:03:07 -0000	1.3
@@ -1 +1 @@
-2ebce9f1217553112ac35abc35360050  menu-cache-0.2.2.tar.gz
+4537aba7abb379d5a055b2da5adb51bd  menu-cache-0.2.5.tar.gz



From cwickert at fedoraproject.org  Wed Apr 29 15:03:38 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 15:03:38 +0000 (UTC)
Subject: rpms/menu-cache/F-11 .cvsignore, 1.4, 1.5 menu-cache.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090429150338.B947270133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/menu-cache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28079/F-11

Modified Files:
	.cvsignore menu-cache.spec sources 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5-1
- Update to 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Apr 2009 18:03:55 -0000	1.4
+++ .cvsignore	29 Apr 2009 15:03:08 -0000	1.5
@@ -1 +1 @@
-menu-cache-0.2.4.tar.gz
+menu-cache-0.2.5.tar.gz


Index: menu-cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-11/menu-cache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- menu-cache.spec	20 Apr 2009 18:03:55 -0000	1.6
+++ menu-cache.spec	29 Apr 2009 15:03:08 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           menu-cache
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Caching mechanism for freedesktop.org compliant menus
 
@@ -56,10 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 #FIXME: add ChangeLog and NEWS if there is content
 %doc AUTHORS COPYING README
-%{_bindir}/menu-cache-gen
+%{_libexecdir}/menu-cache-gen
 %{_libexecdir}/menu-cached
 %{_libdir}/libmenu-cache.so.*
-%{_mandir}/man*/*.gz
+#%{_mandir}/man*/*.gz
 
 
 %files devel
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5-1
+- Update to 0.2.5
+
 * Mon Apr 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
 - Update to 0.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/menu-cache/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Apr 2009 18:03:55 -0000	1.4
+++ sources	29 Apr 2009 15:03:08 -0000	1.5
@@ -1 +1 @@
-945b058433c3f5e921547e13ae30dd41  menu-cache-0.2.4.tar.gz
+4537aba7abb379d5a055b2da5adb51bd  menu-cache-0.2.5.tar.gz



From mclasen at fedoraproject.org  Wed Apr 29 15:12:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 29 Apr 2009 15:12:21 +0000 (UTC)
Subject: rpms/gnome-desktop/F-11 gnome-desktop.spec, 1.211,
	1.212 you-never-find-a-haystack-in-a-needle.patch, 1.1, 1.2
Message-ID: <20090429151221.BD62770133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28600

Modified Files:
	gnome-desktop.spec you-never-find-a-haystack-in-a-needle.patch 
Log Message:
Remove debug spew



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/gnome-desktop.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- gnome-desktop.spec	29 Apr 2009 14:49:01 -0000	1.211
+++ gnome-desktop.spec	29 Apr 2009 15:11:50 -0000	1.212
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.26.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
 # fixed upstream
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-4
+- Remove debug spew
+
 * Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-3
 - Fix needle/haystack confusion causing most monitors to be 'Unknown'
 

you-never-find-a-haystack-in-a-needle.patch:

Index: you-never-find-a-haystack-in-a-needle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/you-never-find-a-haystack-in-a-needle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- you-never-find-a-haystack-in-a-needle.patch	29 Apr 2009 14:49:01 -0000	1.1
+++ you-never-find-a-haystack-in-a-needle.patch	29 Apr 2009 15:11:50 -0000	1.2
@@ -1,10 +1,9 @@
---- gnome-desktop-2.26.1/libgnome-desktop/display-name.c	2009-04-13 18:00:20.000000000 -0400
-+++ hacked/libgnome-desktop/display-name.c	2009-04-29 10:41:35.182718339 -0400
-@@ -205,10 +205,11 @@
-     const char *vendor;
+diff -up gnome-desktop-2.26.1/libgnome-desktop/display-name.c.unknown-monitors gnome-desktop-2.26.1/libgnome-desktop/display-name.c
+--- gnome-desktop-2.26.1/libgnome-desktop/display-name.c.unknown-monitors	2009-04-13 18:00:20.000000000 -0400
++++ gnome-desktop-2.26.1/libgnome-desktop/display-name.c	2009-04-29 11:10:38.600717893 -0400
+@@ -206,9 +206,9 @@ make_display_name (const char *output_na
      int width_mm, height_mm, inches;
  
-+    g_print ("output name %s, vendor %s\n", output_name, info ? info->manufacturer_code : "nada");
      if (output_name &&
 -	(strstr ("lvds", output_name)	||
 -	 strstr ("LVDS", output_name)	||



From hadess at fedoraproject.org  Wed Apr 29 15:20:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 15:20:46 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.26.1-fix-touchpad.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.101,
	1.102 gnome-settings-daemon-2.24.0-fix-touchpad.patch, 1.4, NONE
Message-ID: <20090429152046.2715770133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29239

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.26.1-fix-touchpad.patch 
Removed Files:
	gnome-settings-daemon-2.24.0-fix-touchpad.patch 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
- Don't set touchpads to be left-handed, otherwise the tap
  behaves like the 2nd mouse button (#483639)

gnome-settings-daemon-2.26.1-fix-touchpad.patch:

--- NEW FILE gnome-settings-daemon-2.26.1-fix-touchpad.patch ---
--- gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c.old	2009-04-29 14:32:27.000000000 +0100
+++ gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c	2009-04-29 15:44:55.000000000 +0100
@@ -84,6 +84,7 @@ static void     gsd_mouse_manager_class_
 static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
+static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
 
@@ -282,10 +283,18 @@ set_xinput_devices_left_handed (gboolean
         for (i = 0; i < n_devices; i++) {
                 XDevice *device = NULL;
 
-                if ((device_info[i].use != IsXExtensionDevice) ||
+                if ((device_info[i].use != IsXExtensionPointer) ||
                     (!xinput_device_has_buttons (&device_info[i])))
                         continue;
 
+		/* If the device is a touchpad, don't swap buttons
+		 * around */
+                device = device_is_touchpad (device_info[i]);
+                if (device != NULL) {
+			XCloseDevice (GDK_DISPLAY (), device);
+			continue;
+		}
+
                 gdk_error_trap_push ();
 
                 device = XOpenDevice (GDK_DISPLAY (), device_info[i].id);
@@ -372,8 +381,11 @@ set_left_handed (GsdMouseManager *manage
         gint n_buttons, i;
 
 #ifdef HAVE_X11_EXTENSIONS_XINPUT_H
+	/* When XInput support is available, never set the
+	 * button ordering on the core pointer */
         if (supports_xinput_devices ()) {
                 set_xinput_devices_left_handed (left_handed);
+                return;
         }
 #endif
 


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gnome-settings-daemon.spec	27 Apr 2009 06:28:42 -0000	1.101
+++ gnome-settings-daemon.spec	29 Apr 2009 15:20:15 -0000	1.102
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -38,6 +38,9 @@ Patch10:	gnome-settings-daemon-2.24.0-ca
 # http://bugzilla.gnome.org/show_bug.cgi?id=578444
 Patch11:	gnome-settings-daemon-2.26.0-support-touchpads.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=483639
+Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -58,6 +61,7 @@ developing applications that use %{name}
 
 %patch10 -p1 -b .catch-deviceadded
 %patch11 -p1 -b .support-touchpads
+%patch12 -p1 -b .lefthand-touchpad
 
 autoreconf -i -f
 
@@ -170,6 +174,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
+- Don't set touchpads to be left-handed, otherwise the tap
+  behaves like the 2nd mouse button (#483639)
+
 * Mon Apr 27 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
 - Don't drop schemas translations from po files
 


--- gnome-settings-daemon-2.24.0-fix-touchpad.patch DELETED ---



From hadess at fedoraproject.org  Wed Apr 29 15:24:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 15:24:10 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-10
	gnome-settings-daemon-2.24.0-fix-touchpad.patch, 1.2,
	1.3 gnome-settings-daemon.spec, 1.80, 1.81
Message-ID: <20090429152410.448C070133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29680

Modified Files:
	gnome-settings-daemon-2.24.0-fix-touchpad.patch 
	gnome-settings-daemon.spec 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.24.1-10
- Re-enable the touchpad left-handed fix, and checking for the
  right device type (extension pointer, not extension device)
  (#483639)

gnome-settings-daemon-2.24.0-fix-touchpad.patch:

Index: gnome-settings-daemon-2.24.0-fix-touchpad.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-10/gnome-settings-daemon-2.24.0-fix-touchpad.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-settings-daemon-2.24.0-fix-touchpad.patch	10 Dec 2008 22:53:55 -0000	1.2
+++ gnome-settings-daemon-2.24.0-fix-touchpad.patch	29 Apr 2009 15:24:09 -0000	1.3
@@ -26,3 +26,16 @@ diff --git a/plugins/mouse/gsd-mouse-man
 +                return;
          }
  #endif
+
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+--- gnome-settings-daemon-2.24.1/plugins/mouse/gsd-mouse-manager.c.catch-device-added	2009-04-29 14:35:00.000000000 +0100
++++ gnome-settings-daemon-2.24.1/plugins/mouse/gsd-mouse-manager.c	2009-04-29 15:50:29.000000000 +0100
+@@ -274,7 +274,7 @@ set_xinput_devices_left_handed (gboolean
+         for (i = 0; i < n_devices; i++) {
+                 XDevice *device = NULL;
+ 
+-                if ((device_info[i].use != IsXExtensionDevice) ||
++                if ((device_info[i].use != IsXExtensionPointer) ||
+                     (!xinput_device_has_buttons (&device_info[i])))
+                         continue;
+ 


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-10/gnome-settings-daemon.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- gnome-settings-daemon.spec	18 Dec 2008 18:17:10 -0000	1.80
+++ gnome-settings-daemon.spec	29 Apr 2009 15:24:09 -0000	1.81
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -76,7 +76,7 @@ developing applications that use %{name}
 %patch11 -p1 -b .behdad
 %patch12 -p1 -b .umask
 %patch13 -p1 -b .shutdown-cleanly
-#%patch14 -p1 -b .fix-touchpad
+%patch14 -p1 -b .fix-touchpad
 %patch15 -p1 -b .catch-device-added
 
 %build
@@ -181,6 +181,11 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.24.1-10
+- Re-enable the touchpad left-handed fix, and checking for the
+  right device type (extension pointer, not extension device)
+  (#483639)
+
 * Thu Dec 18 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-9
 - Disable touchpad patch for now.  It's not right.
 



From mhlavink at fedoraproject.org  Wed Apr 29 15:33:30 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 29 Apr 2009 15:33:30 +0000 (UTC)
Subject: rpms/pciutils/F-10 pciutils-3.0.2-arm.patch, NONE, 1.1 pciutils.spec,
	1.65, 1.66
Message-ID: <20090429153330.21DFE70133@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31376

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-3.0.2-arm.patch 
Log Message:
add support for ARM


pciutils-3.0.2-arm.patch:

--- NEW FILE pciutils-3.0.2-arm.patch ---
diff -up pciutils-3.0.2/lib/configure.arm pciutils-3.0.2/lib/configure
--- pciutils-3.0.2/lib/configure.arm	2009-04-29 16:58:54.097763684 +0200
+++ pciutils-3.0.2/lib/configure	2009-04-29 17:16:50.442420669 +0200
@@ -26,7 +26,7 @@ if [ -z "$HOST" ] ; then
 		proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
 		cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
 	else
-		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
+		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^arm.*$/arm/'`
 	fi
 	if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
 	then
@@ -73,6 +73,8 @@ cat >$c <<EOF
 #define PCI_ARCH_SPARC
 #elif defined(__sh__)
 #define PCI_ARCH_SH
+#elif defined(__arm__)
+#define PCI_ARCH_ARM
 #else
 #error Unknown Arch
 #endif


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-10/pciutils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- pciutils.spec	26 Feb 2009 16:30:06 -0000	1.65
+++ pciutils.spec	29 Apr 2009 15:33:28 -0000	1.66
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.0.2
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -11,6 +11,7 @@ Patch8: 	pciutils-3.0.2-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
+Patch12:	pciutils-3.0.2-arm.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ devices connected to the PCI bus.
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
 %patch11 -p1 -b .superh
+%patch12 -p1 -b .arm
 
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
@@ -114,6 +116,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.0.2-4
+- add support for ARM
+
 * Thu Feb 26 2009 Michal Hlavinka <mhlavink at redhat.com> 3.0.2-3
 - fix: lspci segfaults when pci.ids cannot be found (#487516)
 



From mhlavink at fedoraproject.org  Wed Apr 29 15:33:43 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 29 Apr 2009 15:33:43 +0000 (UTC)
Subject: rpms/pciutils/F-11 pciutils-3.1.2-arm.patch, NONE, 1.1 pciutils.spec,
	1.71, 1.72
Message-ID: <20090429153343.0C1F070133@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31251

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-3.1.2-arm.patch 
Log Message:
add support for ARM


pciutils-3.1.2-arm.patch:

--- NEW FILE pciutils-3.1.2-arm.patch ---
diff -up pciutils-3.0.2/lib/configure.arm pciutils-3.0.2/lib/configure
--- pciutils-3.0.2/lib/configure.arm	2009-04-29 16:58:54.097763684 +0200
+++ pciutils-3.0.2/lib/configure	2009-04-29 17:16:50.442420669 +0200
@@ -26,7 +26,7 @@ if [ -z "$HOST" ] ; then
 		proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
 		cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
 	else
-		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
+		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^arm.*$/arm/'`
 	fi
 	if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
 	then
@@ -73,6 +73,8 @@ cat >$c <<EOF
 #define PCI_ARCH_SPARC
 #elif defined(__sh__)
 #define PCI_ARCH_SH
+#elif defined(__arm__)
+#define PCI_ARCH_ARM
 #else
 #error Unknown Arch
 #endif


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- pciutils.spec	27 Feb 2009 20:09:13 -0000	1.71
+++ pciutils.spec	29 Apr 2009 15:33:12 -0000	1.72
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.2
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -10,6 +10,7 @@ Patch8: 	pciutils-3.0.2-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
+Patch12:	pciutils-3.1.2-arm.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ devices connected to the PCI bus.
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
 %patch11 -p1 -b .superh
+%patch12 -p1 -b .arm
 
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
@@ -112,6 +114,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.2-5
+- add support for ARM
+
 * Fri Feb 27 2009 Michal Hlavinka <mhlaivnk at redhat.com> - 3.1.2-4
 - fix typo & rebuild
 



From mhlavink at fedoraproject.org  Wed Apr 29 15:35:57 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 29 Apr 2009 15:35:57 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-3.1.2-arm.patch, NONE,
	1.1 pciutils.spec, 1.71, 1.72
Message-ID: <20090429153557.C790F70133@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31912

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-3.1.2-arm.patch 
Log Message:
add support for ARM


pciutils-3.1.2-arm.patch:

--- NEW FILE pciutils-3.1.2-arm.patch ---
diff -up pciutils-3.0.2/lib/configure.arm pciutils-3.0.2/lib/configure
--- pciutils-3.0.2/lib/configure.arm	2009-04-29 16:58:54.097763684 +0200
+++ pciutils-3.0.2/lib/configure	2009-04-29 17:16:50.442420669 +0200
@@ -26,7 +26,7 @@ if [ -z "$HOST" ] ; then
 		proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
 		cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
 	else
-		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
+		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^arm.*$/arm/'`
 	fi
 	if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
 	then
@@ -73,6 +73,8 @@ cat >$c <<EOF
 #define PCI_ARCH_SPARC
 #elif defined(__sh__)
 #define PCI_ARCH_SH
+#elif defined(__arm__)
+#define PCI_ARCH_ARM
 #else
 #error Unknown Arch
 #endif


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- pciutils.spec	27 Feb 2009 20:09:13 -0000	1.71
+++ pciutils.spec	29 Apr 2009 15:35:56 -0000	1.72
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.2
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -10,6 +10,7 @@ Patch8: 	pciutils-3.0.2-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
+Patch12:	pciutils-3.1.2-arm.patch
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ devices connected to the PCI bus.
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
 %patch11 -p1 -b .superh
+%patch12 -p1 -b .arm
 
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
@@ -112,6 +114,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.2-5
+- add support for ARM
+
 * Fri Feb 27 2009 Michal Hlavinka <mhlaivnk at redhat.com> - 3.1.2-4
 - fix typo & rebuild
 



From hadess at fedoraproject.org  Wed Apr 29 15:42:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 29 Apr 2009 15:42:15 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11
	gnome-settings-daemon-2.26.1-fix-touchpad.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.100,
	1.101 gnome-settings-daemon-2.24.0-fix-touchpad.patch, 1.4, NONE
Message-ID: <20090429154215.6BAE170133@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv533

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.26.1-fix-touchpad.patch 
Removed Files:
	gnome-settings-daemon-2.24.0-fix-touchpad.patch 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-2
- Don't set touchpads to be left-handed, otherwise the tap
  behaves like the 2nd mouse button (#483639)

gnome-settings-daemon-2.26.1-fix-touchpad.patch:

--- NEW FILE gnome-settings-daemon-2.26.1-fix-touchpad.patch ---
--- gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c.old	2009-04-29 14:32:27.000000000 +0100
+++ gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c	2009-04-29 15:44:55.000000000 +0100
@@ -84,6 +84,7 @@ static void     gsd_mouse_manager_class_
 static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
+static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
 
@@ -282,10 +283,18 @@ set_xinput_devices_left_handed (gboolean
         for (i = 0; i < n_devices; i++) {
                 XDevice *device = NULL;
 
-                if ((device_info[i].use != IsXExtensionDevice) ||
+                if ((device_info[i].use != IsXExtensionPointer) ||
                     (!xinput_device_has_buttons (&device_info[i])))
                         continue;
 
+		/* If the device is a touchpad, don't swap buttons
+		 * around */
+                device = device_is_touchpad (device_info[i]);
+                if (device != NULL) {
+			XCloseDevice (GDK_DISPLAY (), device);
+			continue;
+		}
+
                 gdk_error_trap_push ();
 
                 device = XOpenDevice (GDK_DISPLAY (), device_info[i].id);
@@ -372,8 +381,11 @@ set_left_handed (GsdMouseManager *manage
         gint n_buttons, i;
 
 #ifdef HAVE_X11_EXTENSIONS_XINPUT_H
+	/* When XInput support is available, never set the
+	 * button ordering on the core pointer */
         if (supports_xinput_devices ()) {
                 set_xinput_devices_left_handed (left_handed);
+                return;
         }
 #endif
 


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gnome-settings-daemon.spec	14 Apr 2009 18:27:49 -0000	1.100
+++ gnome-settings-daemon.spec	29 Apr 2009 15:41:45 -0000	1.101
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -38,6 +38,9 @@ Patch10:	gnome-settings-daemon-2.24.0-ca
 # http://bugzilla.gnome.org/show_bug.cgi?id=578444
 Patch11:	gnome-settings-daemon-2.26.0-support-touchpads.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=483639
+Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -58,6 +61,7 @@ developing applications that use %{name}
 
 %patch10 -p1 -b .catch-deviceadded
 %patch11 -p1 -b .support-touchpads
+%patch12 -p1 -b .lefthand-touchpad
 
 autoreconf -i -f
 
@@ -170,6 +174,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-2
+- Don't set touchpads to be left-handed, otherwise the tap
+  behaves like the 2nd mouse button (#483639)
+
 * Tue Apr 14 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 


--- gnome-settings-daemon-2.24.0-fix-touchpad.patch DELETED ---



From cassmodiah at fedoraproject.org  Wed Apr 29 15:52:13 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Wed, 29 Apr 2009 15:52:13 +0000 (UTC)
Subject: rpms/vidalia/devel import.log, NONE, 1.1 vidalia.desktop, NONE,
	1.1 vidalia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429155213.C238D70133@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/vidalia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2140/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vidalia.desktop vidalia.spec 
Log Message:



--- NEW FILE import.log ---
vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214


--- NEW FILE vidalia.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Vidalia
GenericName=GUI controller for the Tor Onion Routing Network 
GenericName[de]=Kontrolloberfl??che f??r das Tor Onion Routing Netzwerk
Exec=vidalia
Terminal=false
Type=Application
Categories=Network;KDE;Qt;Security;
StartupNotify=true
Icon=vidalia


--- NEW FILE vidalia.spec ---
Name:             vidalia
Version:          0.1.12
Release:          1%{?dist}
Summary:          GUI controller for the Tor Onion Routing Network

Group:            Applications/Internet
License:          GPLv2+
URL:              https://www.torproject.org/vidalia/
Source0:          https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
Source1:          %{name}.desktop
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

BuildRequires:    desktop-file-utils
BuildRequires:    openssl-devel
BuildRequires:    qt4-devel
BuildRequires:    cmake

Requires:         tor
Requires:         privoxy
Requires:         hicolor-icon-theme


%description
Vidalia is a cross-platform controller GUI for Tor, built using the Qt 
framework. Vidalia allows you to start and stop Tor, view the status of Tor at 
a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to 
contribute to the Tor network by helping you setup a Tor server, if you wish.


%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}


%description doc
Doxygen generated documentations for %{name}.


%prep
%setup -q


%build
%cmake .
make %{?_smp_mflags}

cd doc
doxygen Doxyfile.in


%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}

rm -rf  %{buildroot}%{_datadir}/applications/%{name}.desktop

install -Dpm0644 doc/%{name}.1 \
        %{buildroot}%{_mandir}/man1/%{name}.1

desktop-file-install \
        --dir %{buildroot}%{_datadir}/applications \
        %{SOURCE1}

mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
install -Dpm0644 doc/html/* \
        %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}-doxygen/


%changelog
* Sun Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.12-1
- New upstream release
- Correct typo in URL
- Add R: hicolor for new handling of icons
- Add update-icon-cache sniplet
- Use summary of upstream for Desktopfile and in spec file
- Create doxygen-documentations

* Sun Feb 15 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-2
- Correct Qt in Summary
- Correct Qt in desktop-file-source
- Add a german Translation in the desktop-file-source
- Using CMAKE-macro instead of cmake
- Add more files to more documentation

* Tue Feb 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-1
- Initial Package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:51:42 -0000	1.1
+++ .cvsignore	29 Apr 2009 15:51:43 -0000	1.2
@@ -0,0 +1 @@
+vidalia-0.1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:51:42 -0000	1.1
+++ sources	29 Apr 2009 15:51:43 -0000	1.2
@@ -0,0 +1 @@
+5820043228e7303fa4bee714bd839804  vidalia-0.1.12.tar.gz



From mclasen at fedoraproject.org  Wed Apr 29 15:53:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 29 Apr 2009 15:53:00 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-11
	gnome-screensaver-hide-xscreensaver.menu, 
	1.2, 1.3 gnome-screensaver.spec, 1.210, 1.211
Message-ID: <20090429155300.2379870133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2293

Modified Files:
	gnome-screensaver-hide-xscreensaver.menu 
	gnome-screensaver.spec 
Log Message:
Fix the 'hide xscreensaver' hack



Index: gnome-screensaver-hide-xscreensaver.menu
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-11/gnome-screensaver-hide-xscreensaver.menu,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-screensaver-hide-xscreensaver.menu	21 Sep 2007 15:59:06 -0000	1.2
+++ gnome-screensaver-hide-xscreensaver.menu	29 Apr 2009 15:52:29 -0000	1.3
@@ -1,12 +1,15 @@
 <Menu>
+<!-- We have to exclude xscreensaver in two places, since the menu 
+     hierarchy changes when you install the preferences-menus package
+ -->
 <Name>Preferences</Name>
+  <Exclude>
+    <Filename>xscreensaver-properties.desktop</Filename>
+  </Exclude>
   <Menu>
     <Name>Look and Feel</Name>
     <Exclude>
-      <Filename>screensaver-properties.desktop</Filename>
-    </Exclude>
-    <Exclude>
-      <Filename>gnome-screensaver-properties.desktop</Filename>
+      <Filename>xscreensaver-properties.desktop</Filename>
     </Exclude>
   </Menu>
 </Menu>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-11/gnome-screensaver.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- gnome-screensaver.spec	14 Apr 2009 02:50:24 -0000	1.210
+++ gnome-screensaver.spec	29 Apr 2009 15:52:29 -0000	1.211
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.26/%{name}-%{version}.tar.bz2
@@ -146,6 +146,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Update the 'hide xscreensaver' hack to work with current
+  packages and menus  (#455951)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-screensaver/2.26/gnome-screensaver-2.26.1.news



From cassmodiah at fedoraproject.org  Wed Apr 29 15:53:52 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Wed, 29 Apr 2009 15:53:52 +0000 (UTC)
Subject: rpms/vidalia/F-11 import.log, NONE, 1.1 vidalia.desktop, NONE,
	1.1 vidalia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429155352.477BE70133@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/vidalia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2682/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vidalia.desktop vidalia.spec 
Log Message:



--- NEW FILE import.log ---
vidalia-0_1_12-1_fc11:F-11:vidalia-0.1.12-1.fc11.src.rpm:1241020372


--- NEW FILE vidalia.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Vidalia
GenericName=GUI controller for the Tor Onion Routing Network 
GenericName[de]=Kontrolloberfl??che f??r das Tor Onion Routing Netzwerk
Exec=vidalia
Terminal=false
Type=Application
Categories=Network;KDE;Qt;Security;
StartupNotify=true
Icon=vidalia


--- NEW FILE vidalia.spec ---
Name:             vidalia
Version:          0.1.12
Release:          1%{?dist}
Summary:          GUI controller for the Tor Onion Routing Network

Group:            Applications/Internet
License:          GPLv2+
URL:              https://www.torproject.org/vidalia/
Source0:          https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
Source1:          %{name}.desktop
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

BuildRequires:    desktop-file-utils
BuildRequires:    openssl-devel
BuildRequires:    qt4-devel
BuildRequires:    cmake

Requires:         tor
Requires:         privoxy
Requires:         hicolor-icon-theme


%description
Vidalia is a cross-platform controller GUI for Tor, built using the Qt 
framework. Vidalia allows you to start and stop Tor, view the status of Tor at 
a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to 
contribute to the Tor network by helping you setup a Tor server, if you wish.


%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}


%description doc
Doxygen generated documentations for %{name}.


%prep
%setup -q


%build
%cmake .
make %{?_smp_mflags}

cd doc
doxygen Doxyfile.in


%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}

rm -rf  %{buildroot}%{_datadir}/applications/%{name}.desktop

install -Dpm0644 doc/%{name}.1 \
        %{buildroot}%{_mandir}/man1/%{name}.1

desktop-file-install \
        --dir %{buildroot}%{_datadir}/applications \
        %{SOURCE1}

mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
install -Dpm0644 doc/html/* \
        %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}-doxygen/


%changelog
* Sun Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.12-1
- New upstream release
- Correct typo in URL
- Add R: hicolor for new handling of icons
- Add update-icon-cache sniplet
- Use summary of upstream for Desktopfile and in spec file
- Create doxygen-documentations

* Sun Feb 15 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-2
- Correct Qt in Summary
- Correct Qt in desktop-file-source
- Add a german Translation in the desktop-file-source
- Using CMAKE-macro instead of cmake
- Add more files to more documentation

* Tue Feb 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-1
- Initial Package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:51:42 -0000	1.1
+++ .cvsignore	29 Apr 2009 15:53:21 -0000	1.2
@@ -0,0 +1 @@
+vidalia-0.1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:51:42 -0000	1.1
+++ sources	29 Apr 2009 15:53:22 -0000	1.2
@@ -0,0 +1 @@
+5820043228e7303fa4bee714bd839804  vidalia-0.1.12.tar.gz



From cassmodiah at fedoraproject.org  Wed Apr 29 15:55:59 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Wed, 29 Apr 2009 15:55:59 +0000 (UTC)
Subject: rpms/vidalia/F-10 import.log, NONE, 1.1 vidalia.desktop, NONE,
	1.1 vidalia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090429155559.66EA570133@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/vidalia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3142/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vidalia.desktop vidalia.spec 
Log Message:



--- NEW FILE import.log ---
vidalia-0_1_12-1_fc11:F-10:vidalia-0.1.12-1.fc11.src.rpm:1241020471


--- NEW FILE vidalia.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Vidalia
GenericName=GUI controller for the Tor Onion Routing Network 
GenericName[de]=Kontrolloberfl??che f??r das Tor Onion Routing Netzwerk
Exec=vidalia
Terminal=false
Type=Application
Categories=Network;KDE;Qt;Security;
StartupNotify=true
Icon=vidalia


--- NEW FILE vidalia.spec ---
Name:             vidalia
Version:          0.1.12
Release:          1%{?dist}
Summary:          GUI controller for the Tor Onion Routing Network

Group:            Applications/Internet
License:          GPLv2+
URL:              https://www.torproject.org/vidalia/
Source0:          https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
Source1:          %{name}.desktop
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

BuildRequires:    desktop-file-utils
BuildRequires:    openssl-devel
BuildRequires:    qt4-devel
BuildRequires:    cmake

Requires:         tor
Requires:         privoxy
Requires:         hicolor-icon-theme


%description
Vidalia is a cross-platform controller GUI for Tor, built using the Qt 
framework. Vidalia allows you to start and stop Tor, view the status of Tor at 
a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to 
contribute to the Tor network by helping you setup a Tor server, if you wish.


%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildRequires:  doxygen
Requires:       %{name} = %{version}-%{release}


%description doc
Doxygen generated documentations for %{name}.


%prep
%setup -q


%build
%cmake .
make %{?_smp_mflags}

cd doc
doxygen Doxyfile.in


%install
rm -rf %{buildroot}

make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}

rm -rf  %{buildroot}%{_datadir}/applications/%{name}.desktop

install -Dpm0644 doc/%{name}.1 \
        %{buildroot}%{_mandir}/man1/%{name}.1

desktop-file-install \
        --dir %{buildroot}%{_datadir}/applications \
        %{SOURCE1}

mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
install -Dpm0644 doc/html/* \
        %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}-doxygen/


%changelog
* Sun Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.12-1
- New upstream release
- Correct typo in URL
- Add R: hicolor for new handling of icons
- Add update-icon-cache sniplet
- Use summary of upstream for Desktopfile and in spec file
- Create doxygen-documentations

* Sun Feb 15 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-2
- Correct Qt in Summary
- Correct Qt in desktop-file-source
- Add a german Translation in the desktop-file-source
- Using CMAKE-macro instead of cmake
- Add more files to more documentation

* Tue Feb 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-1
- Initial Package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 02:51:42 -0000	1.1
+++ .cvsignore	29 Apr 2009 15:55:28 -0000	1.2
@@ -0,0 +1 @@
+vidalia-0.1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 02:51:42 -0000	1.1
+++ sources	29 Apr 2009 15:55:28 -0000	1.2
@@ -0,0 +1 @@
+5820043228e7303fa4bee714bd839804  vidalia-0.1.12.tar.gz



From s4504kr at fedoraproject.org  Wed Apr 29 16:04:31 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 29 Apr 2009 16:04:31 +0000 (UTC)
Subject: rpms/pdftk/devel pdftk-classpath.patch, 1.1, 1.2 pdftk.spec, 1.18,
	1.19
Message-ID: <20090429160432.02AC470133@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5110

Modified Files:
	pdftk-classpath.patch pdftk.spec 
Log Message:
Add bcprov and bcmail to classpath patch

pdftk-classpath.patch:

Index: pdftk-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdftk-classpath.patch	9 Apr 2009 18:52:02 -0000	1.1
+++ pdftk-classpath.patch	29 Apr 2009 16:04:01 -0000	1.2
@@ -12,17 +12,17 @@
 +    char itext_classpath[1024];
 +    char *environ_classpath = getenv ("CLASSPATH");
 +
-+    FILE *p = popen ("/usr/bin/build-classpath itext", "r");
++    FILE *p = popen ("/usr/bin/build-classpath itext bcprov bcmail", "r");
 +    if (!p)
 +      {
-+        perror ("Can't popen /usr/bin/build-classpath itext");
++        perror ("Can't popen /usr/bin/build-classpath itext bcprov bcmail");
 +        exit (1);
 +      }
 +
 +    char *s = fgets(itext_classpath, sizeof itext_classpath, p);
 +    if (!s)
 +      {
-+        perror ("Can't get ouput from /usr/bin/build-classpath itext");
++        perror ("Can't get ouput from /usr/bin/build-classpath itext bcprov bcmail");
 +        exit (1);
 +      }
 +


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- pdftk.spec	21 Apr 2009 17:32:17 -0000	1.18
+++ pdftk.spec	29 Apr 2009 16:04:01 -0000	1.19
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-18
+- Add bcprov and bcmail to classpath patch (BZ #497986)
+
 * Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-17
 - Bump release number
 



From s4504kr at fedoraproject.org  Wed Apr 29 16:13:25 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 29 Apr 2009 16:13:25 +0000 (UTC)
Subject: rpms/pdftk/F-11 pdftk-classpath.patch,1.1,1.2 pdftk.spec,1.17,1.18
Message-ID: <20090429161325.56A1B70133@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6323

Modified Files:
	pdftk-classpath.patch pdftk.spec 
Log Message:
Add bcprov and bcmail to classpath patch

pdftk-classpath.patch:

Index: pdftk-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/pdftk/F-11/pdftk-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdftk-classpath.patch	9 Apr 2009 18:52:02 -0000	1.1
+++ pdftk-classpath.patch	29 Apr 2009 16:12:54 -0000	1.2
@@ -12,17 +12,17 @@
 +    char itext_classpath[1024];
 +    char *environ_classpath = getenv ("CLASSPATH");
 +
-+    FILE *p = popen ("/usr/bin/build-classpath itext", "r");
++    FILE *p = popen ("/usr/bin/build-classpath itext bcprov bcmail", "r");
 +    if (!p)
 +      {
-+        perror ("Can't popen /usr/bin/build-classpath itext");
++        perror ("Can't popen /usr/bin/build-classpath itext bcprov bcmail");
 +        exit (1);
 +      }
 +
 +    char *s = fgets(itext_classpath, sizeof itext_classpath, p);
 +    if (!s)
 +      {
-+        perror ("Can't get ouput from /usr/bin/build-classpath itext");
++        perror ("Can't get ouput from /usr/bin/build-classpath itext bcprov bcmail");
 +        exit (1);
 +      }
 +


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/F-11/pdftk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pdftk.spec	23 Apr 2009 16:33:27 -0000	1.17
+++ pdftk.spec	29 Apr 2009 16:12:54 -0000	1.18
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-18
+- Add bcprov and bcmail to classpath patch (BZ #497986)
+
 * Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-17
 - Bump release number
 



From twaugh at fedoraproject.org  Wed Apr 29 16:39:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 29 Apr 2009 16:39:13 +0000 (UTC)
Subject: rpms/patch/devel patch-selinux.patch,1.4,1.5 patch.spec,1.38,1.39
Message-ID: <20090429163913.7819870133@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11013

Modified Files:
	patch-selinux.patch patch.spec 
Log Message:
* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
- Fixed operation when SELinux is disabled (bug #498102).  Patch from
  Jan Kratochvil.


patch-selinux.patch:

Index: patch-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch-selinux.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- patch-selinux.patch	17 Feb 2009 15:36:59 -0000	1.4
+++ patch-selinux.patch	29 Apr 2009 16:39:13 -0000	1.5
@@ -81,8 +81,8 @@ diff -up patch-2.5.4/patch.c.selinux pat
  			    quotearg (outname));
 +		  if (! inerrno && incontext) {
 +			  security_context_t outcontext;
-+			  getfilecon (outname, &outcontext);
-+			  if (strcmp(outcontext, incontext) && 
++			  if (! getfilecon (outname, &outcontext) && outcontext &&
++			      strcmp(outcontext, incontext) && 
 +			      setfilecon (outname, incontext) != 0) {
 +				  if (errno != ENOTSUP && errno != EPERM)
 +					  pfatal ("Can't set security context on file %s",


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- patch.spec	26 Feb 2009 09:59:43 -0000	1.38
+++ patch.spec	29 Apr 2009 16:39:13 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.5.4
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
+- Fixed operation when SELinux is disabled (bug #498102).  Patch from
+  Jan Kratochvil.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.4-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twaugh at fedoraproject.org  Wed Apr 29 16:39:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 29 Apr 2009 16:39:17 +0000 (UTC)
Subject: rpms/patch/F-11 patch-selinux.patch,1.4,1.5 patch.spec,1.38,1.39
Message-ID: <20090429163917.1B12770133@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11039

Modified Files:
	patch-selinux.patch patch.spec 
Log Message:
* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
- Fixed operation when SELinux is disabled (bug #498102).  Patch from
  Jan Kratochvil.


patch-selinux.patch:

Index: patch-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-11/patch-selinux.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- patch-selinux.patch	17 Feb 2009 15:36:59 -0000	1.4
+++ patch-selinux.patch	29 Apr 2009 16:39:16 -0000	1.5
@@ -81,8 +81,8 @@ diff -up patch-2.5.4/patch.c.selinux pat
  			    quotearg (outname));
 +		  if (! inerrno && incontext) {
 +			  security_context_t outcontext;
-+			  getfilecon (outname, &outcontext);
-+			  if (strcmp(outcontext, incontext) && 
++			  if (! getfilecon (outname, &outcontext) && outcontext &&
++			      strcmp(outcontext, incontext) && 
 +			      setfilecon (outname, incontext) != 0) {
 +				  if (errno != ENOTSUP && errno != EPERM)
 +					  pfatal ("Can't set security context on file %s",


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-11/patch.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- patch.spec	26 Feb 2009 09:59:43 -0000	1.38
+++ patch.spec	29 Apr 2009 16:39:16 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.5.4
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
+- Fixed operation when SELinux is disabled (bug #498102).  Patch from
+  Jan Kratochvil.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.4-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From davej at fedoraproject.org  Wed Apr 29 16:44:34 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 29 Apr 2009 16:44:34 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc3-git6.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1058, 1.1059 kernel.spec, 1.1536, 1.1537 sources, 1.1017,
	1.1018 upstream, 1.931, 1.932 patch-2.6.30-rc3-git3.bz2.sign,
	1.1, NONE
Message-ID: <20090429164434.30D8370133@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12023

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc3-git6.bz2.sign 
Removed Files:
	patch-2.6.30-rc3-git3.bz2.sign 
Log Message:
2.6.30-rc3-git6


--- NEW FILE patch-2.6.30-rc3-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ+EH4yGugalF9Dw4RAulWAJ45kzeY4TMLt54G7yO/Mv9xRHv0UACfYXt+
PjKpaESFh3FvjQhaOHw9H8Q=
=yWjW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1058
retrieving revision 1.1059
diff -u -p -r1.1058 -r1.1059
--- .cvsignore	28 Apr 2009 04:23:57 -0000	1.1058
+++ .cvsignore	29 Apr 2009 16:44:03 -0000	1.1059
@@ -7,4 +7,4 @@ kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git3.bz2
+patch-2.6.30-rc3-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1536
retrieving revision 1.1537
diff -u -p -r1.1536 -r1.1537
--- kernel.spec	28 Apr 2009 15:16:32 -0000	1.1536
+++ kernel.spec	29 Apr 2009 16:44:03 -0000	1.1537
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 3
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1832,6 +1832,12 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 29 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc3-git6
+
+* Tue Apr 28 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc3-git4
+
 * Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - Make the kernel-vanilla package buildable again.
 - Allow building with older versions of RPM.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -p -r1.1017 -r1.1018
--- sources	28 Apr 2009 04:23:57 -0000	1.1017
+++ sources	29 Apr 2009 16:44:03 -0000	1.1018
@@ -1,3 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 cd69d16ea42bbf20d0a505690be45868  patch-2.6.30-rc3.bz2
-a0df59cd25a8834625bff22be9e13569  patch-2.6.30-rc3-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -p -r1.931 -r1.932
--- upstream	28 Apr 2009 04:23:57 -0000	1.931
+++ upstream	29 Apr 2009 16:44:03 -0000	1.932
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git3.bz2
+patch-2.6.30-rc3-git6.bz2


--- patch-2.6.30-rc3-git3.bz2.sign DELETED ---



From llaumgui at fedoraproject.org  Wed Apr 29 16:46:21 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 16:46:21 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/devel import.log, NONE,
	1.1 php-ezc-PersistentObject.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429164621.BE0CA70136@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-PersistentObject.spec 
Log Message:
Initial import branch devel


--- NEW FILE import.log ---
php-ezc-PersistentObject-1_5_1-1_fc10:HEAD:php-ezc-PersistentObject-1.5.1-1.fc10.src.rpm:1241023454


--- NEW FILE php-ezc-PersistentObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PersistentObject
%define channel components.ez.no

Name:           php-ezc-PersistentObject
Version:        1.5.1
Release:        1%{?dist}
Summary:        Allows you to store an arbitrary data structures to a fixed database table

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component allows you to store an arbitrary data structures to a fixed
database table. The component provides all the functionality needed to fetch,
list, delete etc these datastructures.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/persistent_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
- Update to 1.5.1

* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:04:35 -0000	1.1
+++ .cvsignore	29 Apr 2009 16:45:51 -0000	1.2
@@ -0,0 +1 @@
+PersistentObject-1.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:04:35 -0000	1.1
+++ sources	29 Apr 2009 16:45:51 -0000	1.2
@@ -0,0 +1 @@
+59fc321865ed557c2cab024fbc3b0d28  PersistentObject-1.5.1.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 16:46:21 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 16:46:21 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/F-9 import.log, NONE,
	1.1 php-ezc-PersistentObject.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429164621.9ADD970133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12713/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-PersistentObject.spec 
Log Message:
Initial import branch F-9


--- NEW FILE import.log ---
php-ezc-PersistentObject-1_5_1-1_fc10:F-9:php-ezc-PersistentObject-1.5.1-1.fc10.src.rpm:1241023461


--- NEW FILE php-ezc-PersistentObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PersistentObject
%define channel components.ez.no

Name:           php-ezc-PersistentObject
Version:        1.5.1
Release:        1%{?dist}
Summary:        Allows you to store an arbitrary data structures to a fixed database table

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component allows you to store an arbitrary data structures to a fixed
database table. The component provides all the functionality needed to fetch,
list, delete etc these datastructures.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/persistent_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
- Update to 1.5.1

* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:04:35 -0000	1.1
+++ .cvsignore	29 Apr 2009 16:45:50 -0000	1.2
@@ -0,0 +1 @@
+PersistentObject-1.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:04:35 -0000	1.1
+++ sources	29 Apr 2009 16:45:51 -0000	1.2
@@ -0,0 +1 @@
+59fc321865ed557c2cab024fbc3b0d28  PersistentObject-1.5.1.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 16:46:22 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 16:46:22 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/F-11 import.log, NONE,
	1.1 php-ezc-PersistentObject.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429164622.F015070133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12762/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-PersistentObject.spec 
Log Message:
Initial import branch F-11


--- NEW FILE import.log ---
php-ezc-PersistentObject-1_5_1-1_fc10:F-11:php-ezc-PersistentObject-1.5.1-1.fc10.src.rpm:1241023468


--- NEW FILE php-ezc-PersistentObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PersistentObject
%define channel components.ez.no

Name:           php-ezc-PersistentObject
Version:        1.5.1
Release:        1%{?dist}
Summary:        Allows you to store an arbitrary data structures to a fixed database table

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component allows you to store an arbitrary data structures to a fixed
database table. The component provides all the functionality needed to fetch,
list, delete etc these datastructures.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/persistent_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
- Update to 1.5.1

* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:04:35 -0000	1.1
+++ .cvsignore	29 Apr 2009 16:45:52 -0000	1.2
@@ -0,0 +1 @@
+PersistentObject-1.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:04:35 -0000	1.1
+++ sources	29 Apr 2009 16:45:52 -0000	1.2
@@ -0,0 +1 @@
+59fc321865ed557c2cab024fbc3b0d28  PersistentObject-1.5.1.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 16:46:22 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 16:46:22 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/F-10 import.log, NONE,
	1.1 php-ezc-PersistentObject.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429164622.B499070133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12737/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-PersistentObject.spec 
Log Message:
Initial import branch F-10


--- NEW FILE import.log ---
php-ezc-PersistentObject-1_5_1-1_fc10:F-10:php-ezc-PersistentObject-1.5.1-1.fc10.src.rpm:1241023460


--- NEW FILE php-ezc-PersistentObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PersistentObject
%define channel components.ez.no

Name:           php-ezc-PersistentObject
Version:        1.5.1
Release:        1%{?dist}
Summary:        Allows you to store an arbitrary data structures to a fixed database table

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component allows you to store an arbitrary data structures to a fixed
database table. The component provides all the functionality needed to fetch,
list, delete etc these datastructures.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/persistent_autoload.php


%changelog
* Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
- Update to 1.5.1

* Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:04:35 -0000	1.1
+++ .cvsignore	29 Apr 2009 16:45:52 -0000	1.2
@@ -0,0 +1 @@
+PersistentObject-1.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:04:35 -0000	1.1
+++ sources	29 Apr 2009 16:45:52 -0000	1.2
@@ -0,0 +1 @@
+59fc321865ed557c2cab024fbc3b0d28  PersistentObject-1.5.1.tgz



From pkgdb at fedoraproject.org  Wed Apr 29 16:57:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:57:35 +0000
Subject: [pkgdb] javahelp2: victorv has requested watchbugzilla
Message-ID: <20090429165735.31DE410F881@bastion2.fedora.phx.redhat.com>

victorv has requested the watchbugzilla acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:57:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:57:38 +0000
Subject: [pkgdb] javahelp2: victorv has requested watchcommits
Message-ID: <20090429165738.8B05C10F894@bastion2.fedora.phx.redhat.com>

victorv has requested the watchcommits acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:57:45 +0000
Subject: [pkgdb] javahelp2: victorv has requested approveacls
Message-ID: <20090429165745.1454710F89A@bastion2.fedora.phx.redhat.com>

victorv has requested the approveacls acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:57:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:57:41 +0000
Subject: [pkgdb] javahelp2: victorv has requested commit
Message-ID: <20090429165741.ACFE710F897@bastion2.fedora.phx.redhat.com>

victorv has requested the commit acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:58:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:58:50 +0000
Subject: [pkgdb] javahelp2: victorv has requested watchbugzilla
Message-ID: <20090429165851.0486510F87D@bastion2.fedora.phx.redhat.com>

victorv has requested the watchbugzilla acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:58:52 +0000
Subject: [pkgdb] javahelp2: victorv has requested watchcommits
Message-ID: <20090429165852.DC67F10F895@bastion2.fedora.phx.redhat.com>

victorv has requested the watchcommits acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:58:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:58:58 +0000
Subject: [pkgdb] javahelp2: victorv has requested approveacls
Message-ID: <20090429165858.8C7E510F89B@bastion2.fedora.phx.redhat.com>

victorv has requested the approveacls acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Wed Apr 29 16:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 29 Apr 2009 16:58:55 +0000
Subject: [pkgdb] javahelp2: victorv has requested commit
Message-ID: <20090429165855.D2B7D10F899@bastion2.fedora.phx.redhat.com>

victorv has requested the commit acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From grandcross at fedoraproject.org  Wed Apr 29 16:59:09 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Wed, 29 Apr 2009 16:59:09 +0000 (UTC)
Subject: rpms/python-arm4/devel .cvsignore, 1.2, 1.3 python-arm4.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <20090429165909.D2A7B70133@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15035

Modified Files:
	.cvsignore python-arm4.spec sources 
Log Message:
Updated upstream sources




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Apr 2009 22:24:41 -0000	1.2
+++ .cvsignore	29 Apr 2009 16:59:07 -0000	1.3
@@ -1 +1 @@
-arm4module-1.1.tar.gz
+arm4module-1.2.tar.gz


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/python-arm4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-arm4.spec	24 Apr 2009 22:43:19 -0000	1.4
+++ python-arm4.spec	29 Apr 2009 16:59:07 -0000	1.5
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: python-arm4
-Version: 1.1
-Release: 5%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -16,8 +16,8 @@ Source: http://downloads.sourceforge.net
 
 ### Build Dependencies ###
 
-BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4 python-libs python
+BuildRequires: python python-devel python-setuptools arm4-devel
+Requires: arm4 python
 
 %description
 Arm4 is a python module that provides for application response measurement
@@ -46,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 29 2009  David Carter <dcarter at davidcarter.ca> 1.2-1
+- Updated for new upstream release
+- Adds support for Python 2.6 and Python 3
+
 * Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-5 
 - Add missing runtime dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Apr 2009 22:24:42 -0000	1.2
+++ sources	29 Apr 2009 16:59:07 -0000	1.3
@@ -1 +1 @@
-34571617ff63b28b6d28fd6d92030b04  arm4module-1.1.tar.gz
+c9260ce2a9cfb1d56f9a9452d365ac36  arm4module-1.2.tar.gz



From notting at fedoraproject.org  Wed Apr 29 17:05:45 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 29 Apr 2009 17:05:45 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.205,1.206
Message-ID: <20090429170545.E4CF170135@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16147

Modified Files:
	comps-f11.xml.in 
Log Message:
langsupport updates

Also, make policykit-gnome mandatory in GNOME, just so groupinstall of mandatory
packages brings it in to fulfill the gnome-panel dep.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- comps-f11.xml.in	29 Apr 2009 14:46:16 -0000	1.205
+++ comps-f11.xml.in	29 Apr 2009 17:05:15 -0000	1.206
@@ -125,6 +125,7 @@
       <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -169,6 +170,17 @@
     </packagelist>
   </group>
   <group>
+    <id>azerbaijani-support</id>
+    <_name>Azerbaijani Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>az</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-az</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>base</id>
     <_name>Base</_name>
     <_description>This group includes a minimal set of packages.  Useful for creating small router/firewall boxes, for example.</_description>
@@ -578,12 +590,25 @@
     <langonly>ca</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ca</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_ca</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ca</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Catalan</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Catalan</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ca</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ca</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ca_ES</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-ca</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>chichewa-support</id>
+    <_name>Chichewa Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>ny</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ny</packagereq>
     </packagelist>
   </group>
   <group>
@@ -651,6 +676,17 @@
     </packagelist>
   </group>
   <group>
+    <id>coptic-support</id>
+    <_name>Coptic Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>cop</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-cop</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>core</id>
     <_name>Core</_name>
     <_description>Smallest possible installation</_description>
@@ -742,9 +778,11 @@
       <packagereq type="conditional" requires="man-pages">man-pages-cs</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-cs</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cs_CZ</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-cs</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
+      <packagereq type="optional">stardict-dic-cs_CZ</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1079,6 +1117,7 @@
     <langonly>nl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-nl</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_nl</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-nl</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-nl</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-nl</packagereq>
@@ -1088,6 +1127,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-nl</packagereq>
       <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-nl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-nl</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-nl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nl</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-nl</packagereq>
     </packagelist>
@@ -1482,6 +1522,17 @@
     </packagelist>
   </group>
   <group>
+    <id>fijian-support</id>
+    <_name>Fijian Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>fj</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-fj</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>filipino-support</id>
     <_name>Filipino Support</_name>
     <_description/>
@@ -1768,6 +1819,7 @@
     <langonly>fr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-fr</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_fr</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-fr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-fr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
@@ -1780,6 +1832,7 @@
       <packagereq type="conditional" requires="moodle">moodle-fr_ca</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fr</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-fr</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-fr</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
       <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>
       <packagereq type="optional">m17n-db-french</packagereq>
@@ -2132,6 +2185,7 @@
     <langonly>de</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-de</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_de</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-de</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-de</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-de</packagereq>
@@ -2143,8 +2197,10 @@
       <packagereq type="conditional" requires="man-pages">man-pages-de</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-de</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-de_du</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-de</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-de</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-de</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-de</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2163,6 +2219,7 @@
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">metacity</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
+      <packagereq type="mandatory">PolicyKit-gnome</packagereq>
       <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-gtk</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-gtk</packagereq>
@@ -2207,7 +2264,6 @@
       <packagereq type="default">NetworkManager-gnome</packagereq>
       <packagereq type="default">notification-daemon</packagereq>
       <packagereq type="default">orca</packagereq>
-      <packagereq type="default">PolicyKit-gnome</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">tomboy</packagereq>
@@ -2593,6 +2649,7 @@
       <packagereq type="conditional" requires="aspell">aspell-gu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-gu</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-gu</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Gujarati</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-gu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-gu_IN</packagereq>
@@ -2701,6 +2758,17 @@
     </packagelist>
   </group>
   <group>
+    <id>hiligaynon-support</id>
+    <_name>Hiligaynon Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>hil</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-hil</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>hindi-support</id>
     <_name>Hindi Support</_name>
     <_description/>
@@ -2758,6 +2826,7 @@
       <packagereq type="conditional" requires="aspell">aspell-is</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-is</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Icelandic</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Icelandic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-is</packagereq>
     </packagelist>
   </group>
@@ -2894,6 +2963,17 @@
     </packagelist>
   </group>
   <group>
+    <id>interlingua-support</id>
+    <_name>Interlingua Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>ia</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-ia</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>inuktitut-support</id>
     <_name>Inuktitut Support</_name>
     <_description/>
@@ -2930,6 +3010,7 @@
     <langonly>it</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-it</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_it</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-it</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-it</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-it</packagereq>
@@ -2940,8 +3021,10 @@
       <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-it</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-it</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-it</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-it</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-it</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-it</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-it</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2959,7 +3042,9 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ja</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-ja</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
       <packagereq type="default">japanese-bitmap-fonts</packagereq>
       <packagereq type="default">sazanami-gothic-fonts</packagereq>
@@ -3203,6 +3288,18 @@
     </packagelist>
   </group>
   <group>
+    <id>kazakh-support</id>
+    <_name>Kazakh Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>kk</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Kazakh</packagereq>
+      <packagereq type="conditional" requires="moodle">moodle-kk</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>kde-desktop</id>
     <_name>KDE (K Desktop Environment)</_name>
     <_description>KDE is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.</_description>
@@ -3433,6 +3530,7 @@
     <langonly>ku</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ku</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Kurdish</packagereq>
       <packagereq type="default">kurdit-unikurd-web-fonts</packagereq>
     </packagelist>
   </group>
@@ -3450,6 +3548,17 @@
     </packagelist>
   </group>
   <group>
+    <id>latin-support</id>
+    <_name>Latin Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>la</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-la</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>latvian-support</id>
     <_name>Latvian Support</_name>
     <_description/>
@@ -3580,6 +3689,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-lt</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-lt</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Lithuanian</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Lithuanian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-lt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-lt_LT</packagereq>
     </packagelist>
@@ -3685,6 +3795,7 @@
     <uservisible>true</uservisible>
     <langonly>mai</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Maithili</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mai_IN</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -3730,6 +3841,7 @@
       <packagereq type="conditional" requires="aspell">aspell-ml</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ml</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-ml</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Malayalam</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
@@ -3746,6 +3858,28 @@
     </packagelist>
   </group>
   <group>
+    <id>maltese-support</id>
+    <_name>Maltese Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>mt</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-mt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>manx-support</id>
+    <_name>Manx Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>gv</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-gv</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>maori-support</id>
     <_name>Maori Support</_name>
     <_description/>
@@ -3771,6 +3905,7 @@
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-mr</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Marathi</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -4202,6 +4337,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Portuguese</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pt</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-pt</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-pt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pt_PT</packagereq>
     </packagelist>
   </group>
@@ -4259,6 +4395,7 @@
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ro</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Romanian</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Romanian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ro</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
@@ -4288,6 +4425,7 @@
     <langonly>ru</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ru</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_ru</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ru</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-ru</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ru</packagereq>
@@ -4322,6 +4460,17 @@
     </packagelist>
   </group>
   <group>
+    <id>sardinian-support</id>
+    <_name>Sardinian Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>sc</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sc</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>serbian-support</id>
     <_name>Serbian Support</_name>
     <_description/>
@@ -4403,6 +4552,7 @@
       <packagereq type="conditional" requires="aspell">aspell-sk</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Slovak</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Slovak</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sk</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sk_SK</packagereq>
@@ -4619,6 +4769,7 @@
     <langonly>es</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-es</packagereq>
+      <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_es</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-es</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-es</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-es</packagereq>
@@ -4627,8 +4778,11 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-es</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-es</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-es</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-es</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-es</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-es</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-es</packagereq>
+      <packagereq type="optional">man-pages-es-extra</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4685,6 +4839,17 @@
    </packagelist>
   </group>
   <group>
+    <id>swahili-support</id>
+    <_name>Swahili Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>sw</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-sw</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>swati-support</id>
     <_name>Swati Support</_name>
     <_description/>
@@ -4933,6 +5098,7 @@
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Tajik</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4980,6 +5146,17 @@
     </packagelist>
   </group>
   <group>
+    <id>tetum-support</id>
+    <_name>Tetum Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>tet</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-tet</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>text-internet</id>
     <_name>Text-based Internet</_name>
     <_description>This group includes text-based email, Web, and chat clients.  These applications do not require the X Window System.</_description>
@@ -5042,6 +5219,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Thai</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-th</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-th</packagereq>
       <packagereq type="default">thai-scalable-garuda-fonts</packagereq>
       <packagereq type="default">thai-scalable-kinnari-fonts</packagereq>
       <packagereq type="default">thai-scalable-loma-fonts</packagereq>
@@ -5351,6 +5529,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-cy</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-cy</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cy_GB</packagereq>
+      <packagereq type="conditional" requires="tkgate">tkgate-cy</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5569,6 +5748,7 @@
       <groupid>arabic-support</groupid>
       <groupid>armenian-support</groupid>
       <groupid>assamese-support</groupid>
+      <groupid>azerbaijani-support</groupid>
       <groupid>basque-support</groupid>
       <groupid>belarusian-support</groupid>
       <groupid>bengali-support</groupid>
@@ -5580,7 +5760,9 @@
       <groupid>bulgarian-support</groupid>
       <groupid>burmese-support</groupid>
       <groupid>catalan-support</groupid>
+      <groupid>chichewa-support</groupid>
       <groupid>chinese-support</groupid>
+      <groupid>coptic-support</groupid>
       <groupid>croatian-support</groupid>
       <groupid>czech-support</groupid>
       <groupid>danish-support</groupid>
@@ -5589,6 +5771,7 @@
       <groupid>estonian-support</groupid>
       <groupid>ethiopic-support</groupid>
       <groupid>faeroese-support</groupid>
+      <groupid>fijian-support</groupid>
       <groupid>filipino-support</groupid>
       <groupid>finnish-support</groupid>
       <groupid>french-support</groupid>
@@ -5601,10 +5784,12 @@
       <groupid>greek-support</groupid>
       <groupid>gujarati-support</groupid>
       <groupid>hebrew-support</groupid>
+      <groupid>hiligaynon-support</groupid>
       <groupid>hindi-support</groupid>
       <groupid>hungarian-support</groupid>
       <groupid>icelandic-support</groupid>
       <groupid>indonesian-support</groupid>
+      <groupid>interlingua-support</groupid>
       <groupid>inuktitut-support</groupid>
       <groupid>irish-support</groupid>
       <groupid>italian-support</groupid>
@@ -5612,12 +5797,14 @@
       <groupid>kannada-support</groupid>
       <groupid>kashmiri-support</groupid>
       <groupid>kashubian-support</groupid>
+      <groupid>kazakh-support</groupid>
       <groupid>khmer-support</groupid>
       <groupid>kinyarwanda-support</groupid>
       <groupid>konkani-support</groupid>
       <groupid>korean-support</groupid>
       <groupid>kurdish-support</groupid>
       <groupid>lao-support</groupid>
+      <groupid>latin-support</groupid>
       <groupid>latvian-support</groupid>
       <groupid>lithuanian-support</groupid>
       <groupid>low-saxon-support</groupid>
@@ -5626,6 +5813,8 @@
       <groupid>malagasy-support</groupid>
       <groupid>malay-support</groupid>
       <groupid>malayalam-support</groupid>
+      <groupid>maltese-support</groupid>
+      <groupid>manx-support</groupid>
       <groupid>maori-support</groupid>
       <groupid>marathi-support</groupid>
       <groupid>mongolian-support</groupid>
@@ -5642,6 +5831,7 @@
       <groupid>romanian-support</groupid>
       <groupid>russian-support</groupid>
       <groupid>samoan-support</groupid>
+      <groupid>sardinian-support</groupid>
       <groupid>serbian-support</groupid>
       <groupid>sindhi-support</groupid>
       <groupid>sinhala-support</groupid>
@@ -5651,12 +5841,14 @@
       <groupid>southern-ndebele-support</groupid>
       <groupid>southern-sotho-support</groupid>
       <groupid>spanish-support</groupid>
+      <groupid>swahili-support</groupid>
       <groupid>swati-support</groupid>
       <groupid>swedish-support</groupid>
       <groupid>tagalog-support</groupid>
       <groupid>tajik-support</groupid>
       <groupid>tamil-support</groupid>
       <groupid>telugu-support</groupid>
+      <groupid>tetum-support</groupid>
       <groupid>thai-support</groupid>
       <groupid>tibetan-support</groupid>
       <groupid>tonga-support</groupid>



From mclasen at fedoraproject.org  Wed Apr 29 17:05:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 29 Apr 2009 17:05:46 +0000 (UTC)
Subject: rpms/rhythmbox/F-11 rb-wknc-urls.patch, NONE, 1.1 rhythmbox.spec,
	1.245, 1.246
Message-ID: <20090429170546.D50EF70135@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/rhythmbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16314

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-wknc-urls.patch 
Log Message:
Fix WKNC urls


rb-wknc-urls.patch:

--- NEW FILE rb-wknc-urls.patch ---
diff -up rhythmbox-0.12.1/plugins/iradio/iradio-initial.pls.wknc-url rhythmbox-0.12.1/plugins/iradio/iradio-initial.pls
--- rhythmbox-0.12.1/plugins/iradio/iradio-initial.pls.wknc-url	2009-04-28 14:39:11.250808134 -0400
+++ rhythmbox-0.12.1/plugins/iradio/iradio-initial.pls	2009-04-28 15:56:06.111426708 -0400
@@ -37,13 +37,13 @@ file9=http://ubuntu.hbr1.com:19800/ambie
 title9=HBR1.com - Dream Factory
 genre9=Ambient
 
-# http://www.wknc.org/listen.php
-file10=http://wknc.org:8000/wknclq.ogg.m3u
-title10=WKNC 88.1 FM (NC State) (Modem)
+# http://www.wknc.org/listen/
+file10=http://wknc.sma.ncsu.edu:8000/wkncmq.ogg.m3u
+title10=WKNC 88.1 FM (NC State) (Low Quality)
 genre10=Music
 
-file11=http://wknc.org:8000/wkncmq.ogg.m3u
-title11=WKNC 88.1 FM (NC State) (Broadband)
+file11=http://wknc.sma.ncsu.edu:8000/wknchq.ogg.m3u
+title11=WKNC 88.1 FM (NC State) (High Quality)
 genre11=Music
 
 # http://www.cbc.ca/listen/ogg.html


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-11/rhythmbox.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- rhythmbox.spec	28 Apr 2009 09:08:09 -0000	1.245
+++ rhythmbox.spec	29 Apr 2009 17:05:16 -0000	1.246
@@ -1,9 +1,9 @@
 %define desktop_file_utils_version 0.9
 
 Name: rhythmbox
-Summary: Music Management Application 
+Summary: Music Management Application
 Version: 0.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -49,6 +49,8 @@ ExcludeArch:    s390 s390x
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
+# from upstream
+Patch1: rb-wknc-urls.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -219,6 +221,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Apr 29 2009 - Matthias Clasen <mclasen at redhat.com> - 0.12.1-2
+- Update WKNC urls (#498258)
+
 * Tue Apr 28 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.1-1
 - Update to 0.12.1
 



From grandcross at fedoraproject.org  Wed Apr 29 17:08:18 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Wed, 29 Apr 2009 17:08:18 +0000 (UTC)
Subject: rpms/python-arm4/F-11 .cvsignore, 1.2, 1.3 python-arm4.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090429170818.6D1A070133@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17807

Modified Files:
	.cvsignore python-arm4.spec sources 
Log Message:
Updated upstream sources




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Apr 2009 22:29:31 -0000	1.2
+++ .cvsignore	29 Apr 2009 17:07:46 -0000	1.3
@@ -1 +1 @@
-arm4module-1.1.tar.gz
+arm4module-1.2.tar.gz


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-11/python-arm4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-arm4.spec	24 Apr 2009 22:50:18 -0000	1.2
+++ python-arm4.spec	29 Apr 2009 17:07:46 -0000	1.3
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: python-arm4
-Version: 1.1
-Release: 5%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -16,8 +16,8 @@ Source: http://downloads.sourceforge.net
 
 ### Build Dependencies ###
 
-BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4 python-libs python
+BuildRequires: python python-devel python-setuptools arm4-devel
+Requires: arm4 python
 
 %description
 Arm4 is a python module that provides for application response measurement
@@ -46,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 29 2009  David Carter <dcarter at davidcarter.ca> 1.2-1
+- Updated for new upstream release
+- Adds support for Python 2.6 and Python 3
+
 * Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-5 
 - Add missing runtime dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Apr 2009 22:29:31 -0000	1.2
+++ sources	29 Apr 2009 17:07:46 -0000	1.3
@@ -1 +1 @@
-34571617ff63b28b6d28fd6d92030b04  arm4module-1.1.tar.gz
+c9260ce2a9cfb1d56f9a9452d365ac36  arm4module-1.2.tar.gz



From llaumgui at fedoraproject.org  Wed Apr 29 17:16:45 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 17:16:45 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/F-11 import.log, NONE,
	1.1 php-ezc-SystemInformation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429171645.7490C70133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19805/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-SystemInformation.spec 
Log Message:
Initial import branch F-11


--- NEW FILE import.log ---
php-ezc-SystemInformation-1_0_7-1_fc10:F-11:php-ezc-SystemInformation-1.0.7-1.fc10.src.rpm:1241025279


--- NEW FILE php-ezc-SystemInformation.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name SystemInformation
%define channel components.ez.no

Name:           php-ezc-SystemInformation
Version:        1.0.7
Release:        1%{?dist}
Summary:        Provides access to common system variables

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides access to common system variables, such as CPU type and speed, and the
available amount of memory.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/system_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.7-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:05:30 -0000	1.1
+++ .cvsignore	29 Apr 2009 17:16:14 -0000	1.2
@@ -0,0 +1 @@
+SystemInformation-1.0.7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:05:30 -0000	1.1
+++ sources	29 Apr 2009 17:16:15 -0000	1.2
@@ -0,0 +1 @@
+7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 17:16:46 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 17:16:46 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/F-10 import.log, NONE,
	1.1 php-ezc-SystemInformation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429171646.7657670133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19827/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-SystemInformation.spec 
Log Message:
Initial import branch F-10


--- NEW FILE import.log ---
php-ezc-SystemInformation-1_0_7-1_fc10:F-10:php-ezc-SystemInformation-1.0.7-1.fc10.src.rpm:1241025269


--- NEW FILE php-ezc-SystemInformation.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name SystemInformation
%define channel components.ez.no

Name:           php-ezc-SystemInformation
Version:        1.0.7
Release:        1%{?dist}
Summary:        Provides access to common system variables

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides access to common system variables, such as CPU type and speed, and the
available amount of memory.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/system_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.7-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:05:30 -0000	1.1
+++ .cvsignore	29 Apr 2009 17:16:16 -0000	1.2
@@ -0,0 +1 @@
+SystemInformation-1.0.7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:05:30 -0000	1.1
+++ sources	29 Apr 2009 17:16:16 -0000	1.2
@@ -0,0 +1 @@
+7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 17:16:47 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 17:16:47 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/devel import.log, NONE,
	1.1 php-ezc-SystemInformation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429171647.A814870133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19865/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-SystemInformation.spec 
Log Message:
Initial import branch devel


--- NEW FILE import.log ---
php-ezc-SystemInformation-1_0_7-1_fc10:HEAD:php-ezc-SystemInformation-1.0.7-1.fc10.src.rpm:1241025261


--- NEW FILE php-ezc-SystemInformation.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name SystemInformation
%define channel components.ez.no

Name:           php-ezc-SystemInformation
Version:        1.0.7
Release:        1%{?dist}
Summary:        Provides access to common system variables

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides access to common system variables, such as CPU type and speed, and the
available amount of memory.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/system_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.7-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:05:30 -0000	1.1
+++ .cvsignore	29 Apr 2009 17:16:17 -0000	1.2
@@ -0,0 +1 @@
+SystemInformation-1.0.7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:05:30 -0000	1.1
+++ sources	29 Apr 2009 17:16:17 -0000	1.2
@@ -0,0 +1 @@
+7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz



From llaumgui at fedoraproject.org  Wed Apr 29 17:16:47 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Wed, 29 Apr 2009 17:16:47 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/F-9 import.log, NONE,
	1.1 php-ezc-SystemInformation.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429171647.5BF0170133@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19847/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-SystemInformation.spec 
Log Message:
Initial import branch F-9


--- NEW FILE import.log ---
php-ezc-SystemInformation-1_0_7-1_fc10:F-9:php-ezc-SystemInformation-1.0.7-1.fc10.src.rpm:1241025264


--- NEW FILE php-ezc-SystemInformation.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name SystemInformation
%define channel components.ez.no

Name:           php-ezc-SystemInformation
Version:        1.0.7
Release:        1%{?dist}
Summary:        Provides access to common system variables

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Base) >= 1.5.2
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Provides access to common system variables, such as CPU type and speed, and the
available amount of memory.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/system_autoload.php


%changelog
* Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.7-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:05:30 -0000	1.1
+++ .cvsignore	29 Apr 2009 17:16:16 -0000	1.2
@@ -0,0 +1 @@
+SystemInformation-1.0.7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:05:30 -0000	1.1
+++ sources	29 Apr 2009 17:16:17 -0000	1.2
@@ -0,0 +1 @@
+7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz



From grandcross at fedoraproject.org  Wed Apr 29 17:20:37 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Wed, 29 Apr 2009 17:20:37 +0000 (UTC)
Subject: rpms/python-arm4/F-10 .cvsignore, 1.2, 1.3 python-arm4.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090429172037.9248170133@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/python-arm4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20528

Modified Files:
	.cvsignore python-arm4.spec sources 
Log Message:
Updated upstream sources




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Apr 2009 22:26:37 -0000	1.2
+++ .cvsignore	29 Apr 2009 17:20:07 -0000	1.3
@@ -1 +1 @@
-arm4module-1.1.tar.gz
+arm4module-1.2.tar.gz


Index: python-arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-10/python-arm4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-arm4.spec	24 Apr 2009 22:57:38 -0000	1.2
+++ python-arm4.spec	29 Apr 2009 17:20:07 -0000	1.3
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: python-arm4
-Version: 1.1
-Release: 5%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 License: EPL
 Group: Development/Languages
 Summary: Application Reponse Measurement (ARM) V4 Python language bindings
@@ -16,8 +16,8 @@ Source: http://downloads.sourceforge.net
 
 ### Build Dependencies ###
 
-BuildRequires: python-devel python-setuptools arm4-devel
-Requires: arm4 python-libs python
+BuildRequires: python python-devel python-setuptools arm4-devel
+Requires: arm4 python
 
 %description
 Arm4 is a python module that provides for application response measurement
@@ -46,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Apr 29 2009  David Carter <dcarter at davidcarter.ca> 1.2-1
+- Updated for new upstream release
+- Adds support for Python 2.6 and Python 3
+
 * Fri Apr 24 2009  David Carter <dcarter at davidcarter.ca> 1.1-5 
 - Add missing runtime dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-arm4/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Apr 2009 22:26:38 -0000	1.2
+++ sources	29 Apr 2009 17:20:07 -0000	1.3
@@ -1 +1 @@
-34571617ff63b28b6d28fd6d92030b04  arm4module-1.1.tar.gz
+c9260ce2a9cfb1d56f9a9452d365ac36  arm4module-1.2.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 17:29:36 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 17:29:36 +0000 (UTC)
Subject: rpms/centerim/F-11 centerim-4.22.7-nss.patch, NONE, 1.1 .cvsignore, 
	1.11, 1.12 centerim.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090429172936.12A6B70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21867/F-11

Modified Files:
	.cvsignore centerim.spec sources 
Added Files:
	centerim-4.22.7-nss.patch 
Log Message:
* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
- New upstream release
- Disable openssl due to licensing trouble
- Fix dependencies


centerim-4.22.7-nss.patch:

--- NEW FILE centerim-4.22.7-nss.patch ---
>From cf415ea0a45fc77153dd1969d486aa9a1bf95e6f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 29 Apr 2009 19:10:59 +0200
Subject: [PATCH] Fix libgadu and libicq NSS cryptography support

Fixes needed to get it compile with Fedora's nss_ossl_compat
library.
---
 configure.ac      |    2 ++
 libgadu/events.c  |    4 +++-
 libgadu/libgadu.c |    4 +++-
 libgadu/libgadu.h |    6 +++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a5f3fa0..6ddaa32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,7 @@ if test "x$with_ssl" != "xno"; then
 		# drags in NSPR as well
                 PKG_CHECK_MODULES(NSS, nss >= 3)
 		CFLAGS="$CFLAGS $NSS_CFLAGS"
+		CXXFLAGS="$CXXFLAGS $NSS_CFLAGS"
 		LIBS="$LIBS $NSS_LIBS"
 
 		# The compatibility layer
@@ -220,6 +221,7 @@ if test "x$with_ssl" != "xno"; then
                 if test -n "$with_nss_compat" -a "x$with_nss_compat" != "xno"; then
                         if test -f "${with_nss_compat}"; then
                                 CFLAGS="$CFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
+                                CXXFLAGS="$CXXFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
                         fi
                         AC_CHECK_LIB(nss_compat_ossl, SSL_CTX_new, [
                                 AC_DEFINE(HAVE_NSS_COMPAT, 1, [use nss_compat])
diff --git a/libgadu/events.c b/libgadu/events.c
index 3242d16..6ebc261 100644
--- a/libgadu/events.c
+++ b/libgadu/events.c
@@ -38,9 +38,11 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 #  include <openssl/err.h>
 #  include <openssl/x509.h>
+#elif defined(HAVE_NSS_COMPAT)
+#  include <nss_compat_ossl/nss_compat_ossl.h>
 #elif HAVE_GNUTLS
 #  include <gnutls/gnutls.h>
 #endif
diff --git a/libgadu/libgadu.c b/libgadu/libgadu.c
index 58c2df5..b3f5585 100644
--- a/libgadu/libgadu.c
+++ b/libgadu/libgadu.c
@@ -41,10 +41,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 #define OPENSSL_NO_KRB5 1
 #  include <openssl/err.h>
 #  include <openssl/rand.h>
+#elif defined(HAVE_NSS_COMPAT)
+#  include <nss_compat_ossl/nss_compat_ossl.h>
 #elif HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #endif
diff --git a/libgadu/libgadu.h b/libgadu/libgadu.h
index 5bd96e7..abb36e1 100644
--- a/libgadu/libgadu.h
+++ b/libgadu/libgadu.h
@@ -37,7 +37,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdarg.h>
 
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 
 #ifndef OPENSSL_NO_KRB5
 #define OPENSSL_NO_KRB5 1
@@ -45,6 +45,10 @@ extern "C" {
 
 #include <openssl/ssl.h>
 
+#elif defined(HAVE_NSS_COMPAT)
+
+#include <nss_compat_ossl/nss_compat_ossl.h>
+
 #elif HAVE_GNUTLS
 #include <gnutls/openssl.h>
 #endif
-- 
1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Jan 2009 23:17:10 -0000	1.11
+++ .cvsignore	29 Apr 2009 17:29:05 -0000	1.12
@@ -1 +1 @@
-centerim-4.22.6.tar.gz
+centerim-4.22.7.tar.bz2


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-11/centerim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- centerim.spec	24 Feb 2009 07:00:35 -0000	1.20
+++ centerim.spec	29 Apr 2009 17:29:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           centerim
-Version:        4.22.6
-Release:        2
+Version:        4.22.7
+Release:        1%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,11 +8,12 @@ Summary:        Text mode menu- and wind
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.bz2
 Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
+Patch1:         centerim-4.22.7-nss.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +24,10 @@ BuildRequires:  gpgme-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  lzo-devel >= 2
+BuildRequires:  nss_compat_ossl-devel
+BuildRequires:  nss-devel
+BuildRequires:  nspr-devel
+BuildRequires:  autoconf
 
 BuildConflicts: openssl-devel
 
@@ -41,11 +46,17 @@ Internal RSS reader and a client for Liv
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
+%patch1 -p1 -b .nss
+
+iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
+touch -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
 
 
 %build
+autoconf
 %configure \
-        --with-ssl \
+        --with-ssl --with-nss_compat \
         --disable-rpath \
         --enable-locales-fix
 make %{?_smp_flags}
@@ -82,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/centerim
 %{_bindir}/cimconv
 %{_bindir}/CenterIMLog2HTML.py
-%exclude %{_bindir}/CenterIMLog2HTML.py?
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*.svg
@@ -90,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.7-1
+- New upstream version
+- Re-enable SSL, provided by NSS
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Jan 2009 23:17:10 -0000	1.11
+++ sources	29 Apr 2009 17:29:05 -0000	1.12
@@ -1 +1 @@
-b26cb94fc5cb68fd3ca8a11ab0bb031c  centerim-4.22.6.tar.gz
+2db303baa9b7680c2cccb3314bfa7ae2  centerim-4.22.7.tar.bz2



From lkundrak at fedoraproject.org  Wed Apr 29 17:29:36 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 17:29:36 +0000 (UTC)
Subject: rpms/centerim/devel centerim-4.22.7-nss.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 centerim.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090429172936.3E5FE70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21867/devel

Modified Files:
	.cvsignore centerim.spec sources 
Added Files:
	centerim-4.22.7-nss.patch 
Log Message:
* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
- New upstream release
- Disable openssl due to licensing trouble
- Fix dependencies


centerim-4.22.7-nss.patch:

--- NEW FILE centerim-4.22.7-nss.patch ---
>From cf415ea0a45fc77153dd1969d486aa9a1bf95e6f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 29 Apr 2009 19:10:59 +0200
Subject: [PATCH] Fix libgadu and libicq NSS cryptography support

Fixes needed to get it compile with Fedora's nss_ossl_compat
library.
---
 configure.ac      |    2 ++
 libgadu/events.c  |    4 +++-
 libgadu/libgadu.c |    4 +++-
 libgadu/libgadu.h |    6 +++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a5f3fa0..6ddaa32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,7 @@ if test "x$with_ssl" != "xno"; then
 		# drags in NSPR as well
                 PKG_CHECK_MODULES(NSS, nss >= 3)
 		CFLAGS="$CFLAGS $NSS_CFLAGS"
+		CXXFLAGS="$CXXFLAGS $NSS_CFLAGS"
 		LIBS="$LIBS $NSS_LIBS"
 
 		# The compatibility layer
@@ -220,6 +221,7 @@ if test "x$with_ssl" != "xno"; then
                 if test -n "$with_nss_compat" -a "x$with_nss_compat" != "xno"; then
                         if test -f "${with_nss_compat}"; then
                                 CFLAGS="$CFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
+                                CXXFLAGS="$CXXFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
                         fi
                         AC_CHECK_LIB(nss_compat_ossl, SSL_CTX_new, [
                                 AC_DEFINE(HAVE_NSS_COMPAT, 1, [use nss_compat])
diff --git a/libgadu/events.c b/libgadu/events.c
index 3242d16..6ebc261 100644
--- a/libgadu/events.c
+++ b/libgadu/events.c
@@ -38,9 +38,11 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 #  include <openssl/err.h>
 #  include <openssl/x509.h>
+#elif defined(HAVE_NSS_COMPAT)
+#  include <nss_compat_ossl/nss_compat_ossl.h>
 #elif HAVE_GNUTLS
 #  include <gnutls/gnutls.h>
 #endif
diff --git a/libgadu/libgadu.c b/libgadu/libgadu.c
index 58c2df5..b3f5585 100644
--- a/libgadu/libgadu.c
+++ b/libgadu/libgadu.c
@@ -41,10 +41,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 #define OPENSSL_NO_KRB5 1
 #  include <openssl/err.h>
 #  include <openssl/rand.h>
+#elif defined(HAVE_NSS_COMPAT)
+#  include <nss_compat_ossl/nss_compat_ossl.h>
 #elif HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #endif
diff --git a/libgadu/libgadu.h b/libgadu/libgadu.h
index 5bd96e7..abb36e1 100644
--- a/libgadu/libgadu.h
+++ b/libgadu/libgadu.h
@@ -37,7 +37,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdarg.h>
 
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 
 #ifndef OPENSSL_NO_KRB5
 #define OPENSSL_NO_KRB5 1
@@ -45,6 +45,10 @@ extern "C" {
 
 #include <openssl/ssl.h>
 
+#elif defined(HAVE_NSS_COMPAT)
+
+#include <nss_compat_ossl/nss_compat_ossl.h>
+
 #elif HAVE_GNUTLS
 #include <gnutls/openssl.h>
 #endif
-- 
1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Jan 2009 23:17:10 -0000	1.11
+++ .cvsignore	29 Apr 2009 17:29:05 -0000	1.12
@@ -1 +1 @@
-centerim-4.22.6.tar.gz
+centerim-4.22.7.tar.bz2


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- centerim.spec	24 Feb 2009 07:00:35 -0000	1.20
+++ centerim.spec	29 Apr 2009 17:29:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           centerim
-Version:        4.22.6
-Release:        2
+Version:        4.22.7
+Release:        1%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,11 +8,12 @@ Summary:        Text mode menu- and wind
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.bz2
 Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
+Patch1:         centerim-4.22.7-nss.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +24,10 @@ BuildRequires:  gpgme-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  lzo-devel >= 2
+BuildRequires:  nss_compat_ossl-devel
+BuildRequires:  nss-devel
+BuildRequires:  nspr-devel
+BuildRequires:  autoconf
 
 BuildConflicts: openssl-devel
 
@@ -41,11 +46,17 @@ Internal RSS reader and a client for Liv
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
+%patch1 -p1 -b .nss
+
+iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
+touch -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
 
 
 %build
+autoconf
 %configure \
-        --with-ssl \
+        --with-ssl --with-nss_compat \
         --disable-rpath \
         --enable-locales-fix
 make %{?_smp_flags}
@@ -82,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/centerim
 %{_bindir}/cimconv
 %{_bindir}/CenterIMLog2HTML.py
-%exclude %{_bindir}/CenterIMLog2HTML.py?
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*.svg
@@ -90,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.7-1
+- New upstream version
+- Re-enable SSL, provided by NSS
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Jan 2009 23:17:10 -0000	1.11
+++ sources	29 Apr 2009 17:29:05 -0000	1.12
@@ -1 +1 @@
-b26cb94fc5cb68fd3ca8a11ab0bb031c  centerim-4.22.6.tar.gz
+2db303baa9b7680c2cccb3314bfa7ae2  centerim-4.22.7.tar.bz2



From cwickert at fedoraproject.org  Wed Apr 29 17:30:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 17:30:01 +0000 (UTC)
Subject: rpms/lxde-common/devel lxde-common-0.3.2.1-logout-banner.patch, NONE,
	1.1 lxde-common-0.3.2.1-pcmanfm-config.patch, NONE,
	1.1 lxde-common-0.4-lxpanel-config.patch, NONE,
	1.1 lxde-common-0.4-openbox-menu.patch, NONE,
	1.1 lxde-common-0.4-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 lxde-common.spec, 1.3, 1.4 sources, 1.2,
	1.3 lxde-common-0.3.2.1-lxpanel-config.patch, 1.2,
	NONE lxde-common-0.3.2.1-openbox.patch, 1.1,
	NONE lxde-common-0.3.2.1-pcmanfm.patch, 1.1,
	NONE lxde-common-0.3.2.1-pulseaudio.patch, 1.1,
	NONE lxde-common-0.3.2.1-vendor.patch, 1.1, NONE
Message-ID: <20090429173001.E8AC270133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21996

Modified Files:
	.cvsignore lxde-common.spec sources 
Added Files:
	lxde-common-0.3.2.1-logout-banner.patch 
	lxde-common-0.3.2.1-pcmanfm-config.patch 
	lxde-common-0.4-lxpanel-config.patch 
	lxde-common-0.4-openbox-menu.patch 
	lxde-common-0.4-pulseaudio.patch 
Removed Files:
	lxde-common-0.3.2.1-lxpanel-config.patch 
	lxde-common-0.3.2.1-openbox.patch 
	lxde-common-0.3.2.1-pcmanfm.patch 
	lxde-common-0.3.2.1-pulseaudio.patch 
	lxde-common-0.3.2.1-vendor.patch 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
- Update to 0.4
- Require lxmenu-data and lxde-settings-daemon
- Drop obsolete config file /etc/xdg/lxsession/LXDE/default


lxde-common-0.3.2.1-logout-banner.patch:

--- NEW FILE lxde-common-0.3.2.1-logout-banner.patch ---
--- lxde-common-0.3.2.1.orig/lxde-logout.in	2008-04-20 10:26:19.000000000 +0200
+++ lxde-common-0.3.2.1/lxde-logout.in	2008-11-30 17:08:25.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top
+lxsession-logout --banner "@prefix@/share/pixmaps/fedora-logo-small.png" --side=top

lxde-common-0.3.2.1-pcmanfm-config.patch:

--- NEW FILE lxde-common-0.3.2.1-pcmanfm-config.patch ---
diff -dur lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in lxde-common-0.3.2.1/pcmanfm/main.lxde.in
--- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in	2008-04-20 10:24:58.000000000 +0200
+++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in	2008-05-06 02:13:16.000000000 +0200
@@ -1,3 +1,6 @@
 [Desktop]
 show_wallpaper=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+wallpaper=@prefix@/share/backgrounds/images/default.png
+
+[General]
+terminal=lxterminal

lxde-common-0.4-lxpanel-config.patch:

--- NEW FILE lxde-common-0.4-lxpanel-config.patch ---
diff -dur lxde-common-0.4.orig/lxpanel/config lxde-common-0.4/lxpanel/config
--- lxde-common-0.4.orig/lxpanel/config	2008-06-16 10:10:24.000000000 +0200
+++ lxde-common-0.4/lxpanel/config	2009-04-28 22:11:13.000000000 +0200
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
-Terminal=xterm -e
+Terminal=lxterminal -e
 Logout=lxde-logout
diff -dur lxde-common-0.4.orig/lxpanel/panel.in lxde-common-0.4/lxpanel/panel.in
--- lxde-common-0.4.orig/lxpanel/panel.in	2008-06-16 10:10:24.000000000 +0200
+++ lxde-common-0.4/lxpanel/panel.in	2009-04-29 00:27:56.000000000 +0200
@@ -13,9 +13,9 @@
     alpha=0
     setdocktype=1
     setpartialstrut=1
-    usefontcolor=1
+    usefontcolor=0
     fontcolor=#ffffff
-    background=1
+    background=0
     backgroundfile=@prefix@/share/lxpanel/images/background.png
 }
 
@@ -29,12 +29,13 @@
 Plugin {
     type = menu
     Config {
-        image=@prefix@/share/lxde/images/lxde-icon.png
+        image=fedora-logo-icon.png
         system {
         }
         separator {
         }
         item {
+            image=gnome-run
             command=run
         }
         separator {
@@ -50,10 +51,13 @@
     type = launchbar
     Config {
         Button {
-            id=pcmanfm.desktop
+            id=fedora-pcmanfm.desktop
         }
         Button {
-            id=firefox.desktop
+            id=fedora-lxterminal.desktop
+        }
+        Button {
+            id=mozilla-firefox.desktop
         }
     }
 }
@@ -139,3 +143,7 @@
     }
 }
 
+Plugin {
+    type = volumealsa
+}
+

lxde-common-0.4-openbox-menu.patch:

--- NEW FILE lxde-common-0.4-openbox-menu.patch ---
--- lxde-common-0.4.orig/openbox/menu.xml	2008-07-16 04:20:32.000000000 +0200
+++ lxde-common-0.4/openbox/menu.xml	2009-04-28 23:25:47.000000000 +0200
@@ -2,38 +2,49 @@
 
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 
-<menu id="apps-menu" label="Applications">
+<menu id="apps-menu" label="Applications" execute="/usr/share/openbox/xdg-menu applications"/>
+<menu id="prefs-menu" label="Preferences" execute="/usr/share/openbox/xdg-menu preferences"/> 
+<menu id="admin-menu" label="Administration" execute="/usr/share/openbox/xdg-menu system-settings"/>
+
+<menu id="root-menu" label="LXDE">
+  <separator label="LXDE" />
+  <menu id="apps-menu" />
   <item label="PCManFM">
     <action name="Execute">
     <startupnotify><enabled>yes</enabled><icon>pcmanfm</icon></startupnotify>
     <command>pcmanfm</command></action>
   </item>
-  <item label="Xterm">
-    <action name="Execute"><command>xterm</command></action>
+  <item label="LXTerminal">
+    <action name="Execute"><command>lxterminal</command></action>
   </item>
   <item label="Firefox">
     <action name="Execute"><command>firefox</command></action>
   </item>
-</menu>
-
-<menu id="root-menu" label="LXDE">
-  <separator label="LXDE" />
-  <menu id="apps-menu" />
-  <separator />
+ <separator />
   <menu id="client-list-menu" />
   <separator />
-  <item label="Desktop Settings">
+  <menu id="prefs-menu" />
+  <menu id="admin-menu"/>
+<!--  <item label="ObConf">
     <action name="Execute">
-      <startupnotify><enabled>yes</enabled></startupnotify>
-      <command>pcmanfm --show-pref 2</command>
+      <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
+      <command>obconf</command>
+    </action>
+  </item> -->
+  <separator />
+  <item label="Run Command">
+    <action name="Execute">
+      <startupnotify><enabled>yes</enabled><icon>gtk-run</icon></startupnotify>
+      <command>lxpanelctl run</command>
     </action>
   </item>
-  <item label="Window Management Settings">
+  <item label="Find Files">
     <action name="Execute">
-      <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
-      <command>obconf</command>
+      <startupnotify><enabled>yes</enabled><icon>gtk-find</icon></startupnotify>
+      <command>pcmanfm -f</command>
     </action>
   </item>
+  <separator />
   <item label="Reload Config Files">
     <action name="Reconfigure" />
   </item>
@@ -43,4 +54,4 @@
   </item>
 </menu>
 
-</openbox_menu>
\ Kein Zeilenumbruch am Dateiende.
+</openbox_menu>

lxde-common-0.4-pulseaudio.patch:

--- NEW FILE lxde-common-0.4-pulseaudio.patch ---
--- lxde-common-0.4.orig/autostart	2008-11-28 16:09:00.000000000 +0100
+++ lxde-common-0.4/autostart	2009-04-28 23:52:51.000000000 +0200
@@ -1,4 +1,5 @@
 @lxde-settings-daemon
+ at pulseaudio -D
 @xscreensaver -no-splash
 @lxpanel --profile LXDE
 @pcmanfm -d


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Oct 2008 23:51:57 -0000	1.2
+++ .cvsignore	29 Apr 2009 17:29:30 -0000	1.3
@@ -1 +1 @@
-lxde-common-0.3.2.1.tar.bz2
+lxde-common-0.4.tar.bz2


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxde-common.spec	6 Mar 2009 00:37:13 -0000	1.3
+++ lxde-common.spec	29 Apr 2009 17:29:30 -0000	1.4
@@ -1,29 +1,28 @@
 Name:           lxde-common
-Version:        0.3.2.1
-Release:        4%{?dist}
-Summary:        Settings manager for LXDE
+Version:        0.4
+Release:        1%{?dist}
+Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-0.3.2.1-lxpanel-config.patch
-Patch1:         %{name}-0.3.2.1-openbox.patch
-Patch2:         %{name}-0.3.2.1-pcmanfm.patch
+# Distro specific patches
+Patch10:         %{name}-0.3.2.1-pcmanfm-config.patch
+Patch11:         %{name}-0.4-lxpanel-config.patch
+Patch12:         %{name}-0.4-openbox-menu.patch
+Patch13:         %{name}-0.3.2.1-logout-banner.patch
+# Pulseaudio
+Patch4:         %{name}-0.4-pulseaudio.patch
 # Because of new gdm
 # http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
-Patch4:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
-# Vendor specific patches
-Patch10:         %{name}-0.3.2.1-vendor.patch
-# Pulseaudio
-Patch11:         %{name}-0.3.2.1-pulseaudio.patch
+Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pkgconfig glib2-devel libX11-devel
-Requires:       lxsession lxpanel pcmanfm openbox xdg-utils
-Requires:       %{name}-data = %{version}-%{release}
+Requires:       lxsession lxpanel lxmenu-data pcmanfm openbox xdg-utils 
+Requires:       lxde-settings-daemon >= %{version}
 # Use vendor's artwork
-Requires:       gtk-nodoka-engine fedora-icon-theme system-logos
+Requires:       system-logos
 %if 0%{?fedora} < 9
 Requires:       desktop-backgrounds-basic
 %else
@@ -31,37 +30,29 @@ Requires:       desktop-backgrounds-comp
 # needed for new gdm workaround
 Requires:       wmctrl
 %endif
-
-
-%description
-This package the settings-manger for LXDE, the Lightweight X11 Desktop 
-Environment.
-
-%package        data
-Summary:        Default configuration files for LXDE
-Group:          User Interface/Desktops
-Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-data = %{version}-%{release}
+Obsoletes:      %{name}-data <= 0.3.2.1-5
 BuildArch:      noarch
 
-%description    data
+%description
 This package contains the configuration files for LXDE, the Lightweight X11 
 Desktop Environment.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
+%patch10 -p1 -b .orig
+%patch11 -p1 -b .orig
+%patch12 -p1 -b .orig
+%patch13 -p1 -b .logout-banner
+%patch4 -p1 -b .pulseaudio
 %if 0%{?fedora} > 8
-%patch4 -p1 -b .gdm-desktops
+%patch5 -p1 -b .gdm-desktops
 %endif
-%patch10 -p1 -b .vendor
-%patch11 -p1 -b .pulseaudio
 
 
 %build
 %configure
-make %{?_smp_mflags}
 
 
 %install
@@ -69,7 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 # the icon theme is packaged in a different package
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/
-
+# only used by obsolete lxsession, not lxsession-lite
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,30 +71,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %dir %{_sysconfdir}/xdg/lxsession/LXDE/
-%{_bindir}/lxde-settings
-
-%files data
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/xdg/lxsession/LXDE/
-%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/default
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config
-
 %{_bindir}/startlxde
 %{_bindir}/lxde-logout
 %{_bindir}/openbox-lxde
-
-%{_datadir}/lxde/
+%{_datadir}/lxde/*
 %{_datadir}/lxpanel/profile/LXDE/
 %{_mandir}/man1/*.1.gz
-%{_usr}/share/xsessions/LXDE.desktop
-
+%{_datadir}/xsessions/LXDE.desktop
 
 
 %changelog
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
+- Update to 0.4
+- Require lxmenu-data and lxde-settings-daemon
+- Drop obsolete config file /etc/xdg/lxsession/LXDE/default
+
 * Fri Mar 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
 - Workaround for new gdm
-- Addd Pulseaudio support
+- Add Pulseaudio support
 - Add mixer plugin to the panel
 - Require xdg-utils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Oct 2008 23:51:57 -0000	1.2
+++ sources	29 Apr 2009 17:29:30 -0000	1.3
@@ -1 +1 @@
-f30eee998071ace04e7be33aa8ac6a5b  lxde-common-0.3.2.1.tar.bz2
+aa16d649ecb9b42ac52eec5c125b7084  lxde-common-0.4.tar.bz2


--- lxde-common-0.3.2.1-lxpanel-config.patch DELETED ---


--- lxde-common-0.3.2.1-openbox.patch DELETED ---


--- lxde-common-0.3.2.1-pcmanfm.patch DELETED ---


--- lxde-common-0.3.2.1-pulseaudio.patch DELETED ---


--- lxde-common-0.3.2.1-vendor.patch DELETED ---



From xavierb at fedoraproject.org  Wed Apr 29 17:37:10 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 29 Apr 2009 17:37:10 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/devel import.log, NONE,
	1.1 perl-HTML-StripScripts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090429173710.A3B1370136@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23113/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-HTML-StripScripts.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
perl-HTML-StripScripts-1_04-1_fc10:HEAD:perl-HTML-StripScripts-1.04-1.fc10.src.rpm:1241026546


--- NEW FILE perl-HTML-StripScripts.spec ---
Name:           perl-HTML-StripScripts
Version:        1.04
Release:        1%{?dist}
Summary:        Strip scripting constructs out of HTML
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-StripScripts/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module strips scripting constructs out of HTML, leaving as much non-
scripting markup in place as possible. This allows web applications to
display HTML originating from an untrusted source without introducing XSS
(cross site scripting) vulnerabilities.

%prep
%setup -q -n HTML-StripScripts-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 25 2009 Xavier Bachelot <xavier at bachelot.org> 1.04-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Apr 2009 03:09:23 -0000	1.1
+++ .cvsignore	29 Apr 2009 17:36:40 -0000	1.2
@@ -0,0 +1 @@
+HTML-StripScripts-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:09:23 -0000	1.1
+++ sources	29 Apr 2009 17:36:40 -0000	1.2
@@ -0,0 +1 @@
+aecd01e273bddbf60dca2a923163826d  HTML-StripScripts-1.04.tar.gz



From xavierb at fedoraproject.org  Wed Apr 29 17:51:18 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 29 Apr 2009 17:51:18 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/F-9 perl-HTML-StripScripts.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090429175118.E21FC70133@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25825/F-9

Modified Files:
	sources 
Added Files:
	perl-HTML-StripScripts.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-HTML-StripScripts.spec ---
Name:           perl-HTML-StripScripts
Version:        1.04
Release:        1%{?dist}
Summary:        Strip scripting constructs out of HTML
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-StripScripts/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module strips scripting constructs out of HTML, leaving as much non-
scripting markup in place as possible. This allows web applications to
display HTML originating from an untrusted source without introducing XSS
(cross site scripting) vulnerabilities.

%prep
%setup -q -n HTML-StripScripts-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 25 2009 Xavier Bachelot <xavier at bachelot.org> 1.04-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:09:23 -0000	1.1
+++ sources	29 Apr 2009 17:51:17 -0000	1.2
@@ -0,0 +1 @@
+aecd01e273bddbf60dca2a923163826d  HTML-StripScripts-1.04.tar.gz



From xavierb at fedoraproject.org  Wed Apr 29 17:51:46 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 29 Apr 2009 17:51:46 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/EL-5 perl-HTML-StripScripts.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090429175146.83E1970133@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25825/EL-5

Modified Files:
	sources 
Added Files:
	perl-HTML-StripScripts.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-HTML-StripScripts.spec ---
Name:           perl-HTML-StripScripts
Version:        1.04
Release:        1%{?dist}
Summary:        Strip scripting constructs out of HTML
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-StripScripts/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module strips scripting constructs out of HTML, leaving as much non-
scripting markup in place as possible. This allows web applications to
display HTML originating from an untrusted source without introducing XSS
(cross site scripting) vulnerabilities.

%prep
%setup -q -n HTML-StripScripts-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 25 2009 Xavier Bachelot <xavier at bachelot.org> 1.04-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:09:23 -0000	1.1
+++ sources	29 Apr 2009 17:51:15 -0000	1.2
@@ -0,0 +1 @@
+aecd01e273bddbf60dca2a923163826d  HTML-StripScripts-1.04.tar.gz



From xavierb at fedoraproject.org  Wed Apr 29 17:51:47 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 29 Apr 2009 17:51:47 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/F-10 perl-HTML-StripScripts.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090429175147.0813E70133@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25825/F-10

Modified Files:
	sources 
Added Files:
	perl-HTML-StripScripts.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-HTML-StripScripts.spec ---
Name:           perl-HTML-StripScripts
Version:        1.04
Release:        1%{?dist}
Summary:        Strip scripting constructs out of HTML
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-StripScripts/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module strips scripting constructs out of HTML, leaving as much non-
scripting markup in place as possible. This allows web applications to
display HTML originating from an untrusted source without introducing XSS
(cross site scripting) vulnerabilities.

%prep
%setup -q -n HTML-StripScripts-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 25 2009 Xavier Bachelot <xavier at bachelot.org> 1.04-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:09:23 -0000	1.1
+++ sources	29 Apr 2009 17:51:16 -0000	1.2
@@ -0,0 +1 @@
+aecd01e273bddbf60dca2a923163826d  HTML-StripScripts-1.04.tar.gz



From xavierb at fedoraproject.org  Wed Apr 29 17:51:47 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 29 Apr 2009 17:51:47 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/F-11 perl-HTML-StripScripts.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090429175147.8672B70133@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25825/F-11

Modified Files:
	sources 
Added Files:
	perl-HTML-StripScripts.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-HTML-StripScripts.spec ---
Name:           perl-HTML-StripScripts
Version:        1.04
Release:        1%{?dist}
Summary:        Strip scripting constructs out of HTML
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-StripScripts/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-StripScripts-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)

Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module strips scripting constructs out of HTML, leaving as much non-
scripting markup in place as possible. This allows web applications to
display HTML originating from an untrusted source without introducing XSS
(cross site scripting) vulnerabilities.

%prep
%setup -q -n HTML-StripScripts-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 25 2009 Xavier Bachelot <xavier at bachelot.org> 1.04-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BR:s.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Apr 2009 03:09:23 -0000	1.1
+++ sources	29 Apr 2009 17:51:17 -0000	1.2
@@ -0,0 +1 @@
+aecd01e273bddbf60dca2a923163826d  HTML-StripScripts-1.04.tar.gz



From notting at fedoraproject.org  Wed Apr 29 18:00:14 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 29 Apr 2009 18:00:14 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.206,1.207
Message-ID: <20090429180014.A0F2970133@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27794

Modified Files:
	comps-f11.xml.in 
Log Message:
more langsupport



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- comps-f11.xml.in	29 Apr 2009 17:05:15 -0000	1.206
+++ comps-f11.xml.in	29 Apr 2009 17:59:44 -0000	1.207
@@ -47,6 +47,7 @@
     <langonly>af</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-af</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-af</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-af</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-af</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-af</packagereq>
@@ -406,6 +407,7 @@
     <uservisible>true</uservisible>
     <langonly>eu</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-eu</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-eu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-eu</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Basque</packagereq>
@@ -480,12 +482,17 @@
     <langonly>pt_BR</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pt</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-pt</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-pt_BR</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-pt</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pt</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-pt</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Brazil</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Brazil</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pt_BR</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-pt_br</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-pt</packagereq>
+      <packagereq type="conditional" requires="nqc-doc">nqc-doc-pt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pt_BR</packagereq>
     </packagelist>
   </group>
@@ -556,12 +563,15 @@
     <langonly>bg</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-bg</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-bg</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-bg</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-bg</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bulgarian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Bulgarian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-bg</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bg</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-bg</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
@@ -592,10 +602,12 @@
       <packagereq type="conditional" requires="aspell">aspell-ca</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_ca</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ca</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-ca</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Catalan</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Catalan</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ca</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ca</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-ca</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ca_ES</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-ca</packagereq>
     </packagelist>
@@ -621,6 +633,7 @@
     <packagelist>
       <packagereq type="mandatory">cjkuni-ukai-fonts</packagereq>
       <packagereq type="mandatory">cjkuni-uming-fonts</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
@@ -768,6 +781,7 @@
     <langonly>cs</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-cs</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-cs</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-cs</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-cs</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-cs</packagereq>
@@ -777,6 +791,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-cs</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-cs</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-cs</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-cs</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cs_CZ</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-cs</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
@@ -794,6 +809,7 @@
     <langonly>da</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-da</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-da</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-da</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-da</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-da</packagereq>
@@ -803,6 +819,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-da</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-da</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-da</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-da</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-da_DK</packagereq>
       <packagereq type="optional">m17n-db-danish</packagereq>
     </packagelist>
@@ -1117,6 +1134,7 @@
     <langonly>nl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-nl</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-nl</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_nl</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-nl</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-nl</packagereq>
@@ -1127,6 +1145,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-nl</packagereq>
       <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-nl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-nl</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-nl</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-nl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nl</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-nl</packagereq>
@@ -1552,6 +1571,7 @@
     <uservisible>true</uservisible>
     <langonly>fi</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-fi</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-fi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-fi</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Finnish</packagereq>
@@ -1819,10 +1839,12 @@
     <langonly>fr</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-fr</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-fr</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_fr</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-fr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-fr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-fr</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-French</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-French</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fr</packagereq>
@@ -1830,6 +1852,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-fr</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fr</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fr_ca</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-fr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fr</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-fr</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-fr</packagereq>
@@ -2185,6 +2208,7 @@
     <langonly>de</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-de</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-de</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_de</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-de</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-de</packagereq>
@@ -2197,6 +2221,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-de</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-de</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-de_du</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-de</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-de</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-de</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-de</packagereq>
@@ -2599,10 +2624,12 @@
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-el</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-el</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-el</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-el</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Greek</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Greek</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-el</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-el</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-el</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-el_GR</packagereq>
       <packagereq type="conditional" requires="texlive">tetex-font-kerkis</packagereq>
       <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
@@ -2801,6 +2828,7 @@
     <uservisible>true</uservisible>
     <langonly>hu</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-hu</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-hu</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-hu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
@@ -2825,6 +2853,7 @@
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-is</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-is</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-is</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Icelandic</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Icelandic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-is</packagereq>
@@ -2841,6 +2870,7 @@
       <packagereq type="conditional" requires="aspell">aspell-id</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-id</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-id</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-id</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-id</packagereq>
     </packagelist>
   </group>
@@ -2971,6 +3001,7 @@
     <langonly>ia</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-ia</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-ia</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2998,6 +3029,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Irish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ga</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ga</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-ga</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ga_IE</packagereq>
     </packagelist>
   </group>
@@ -3010,6 +3042,7 @@
     <langonly>it</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-it</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-it</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_it</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-it</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-it</packagereq>
@@ -3021,6 +3054,7 @@
       <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-it</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-it</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-it</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-it</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-it</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-it</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-it</packagereq>
@@ -3035,6 +3069,7 @@
     <uservisible>true</uservisible>
     <langonly>ja</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-ja</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ja</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-anthy</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Japanese</packagereq>
@@ -3253,7 +3288,7 @@
       <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
-      <packagereq type="conditional" requires="hyphen">hyphen-ka</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-kn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
@@ -3487,6 +3522,7 @@
     <langonly>ko</langonly>
     <packagelist>
       <packagereq type="mandatory">un-core-fonts-dotum</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-ko</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ko</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-hangul</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Korean</packagereq>
@@ -3708,6 +3744,17 @@
     </packagelist>
   </group>
   <group>
+    <id>luxembourgish-support</id>
+    <_name>Luxembourgish Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>lb</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-lb</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>lxde-desktop</id>
     <_name>LXDE</_name>
     <_description>A lightweight desktop environment that works well on low end machines.</_description>
@@ -3888,8 +3935,10 @@
     <langonly>mi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-mi</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-mi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-mi_tn</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-mi_wwow</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-mi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3964,7 +4013,9 @@
     <uservisible>true</uservisible>
     <langonly>mn</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-mn</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-mn</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-mn</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-mn</packagereq>
     </packagelist>
   </group>
@@ -4110,6 +4161,8 @@
       <packagereq type="conditional" requires="gcompris">gcompris-sound-nb</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-nb</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-nn</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-nb</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-nn</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Norwegian</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Norwegian-Nynorsk</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Norwegian</packagereq>
@@ -4118,6 +4171,8 @@
       <packagereq type="conditional" requires="moodle">moodle-nn</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-no</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-no_gr</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-nb</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-nn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nb_NO</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-nn_NO</packagereq>
     </packagelist>
@@ -4291,7 +4346,9 @@
     <uservisible>true</uservisible>
     <langonly>fa</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-fa</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-fa</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-fa</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
       <packagereq type="optional">m17n-db-farsi</packagereq>
@@ -4306,6 +4363,7 @@
     <langonly>pl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pl</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-pl</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-pl</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-pl</packagereq>
@@ -4315,6 +4373,7 @@
       <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-pl</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-pl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-pl</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-pl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pl_PL</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
@@ -4330,13 +4389,16 @@
     <langonly>pt</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-pt</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-pt</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-pt</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-pt</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pt</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-pt</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Portuguese</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Portuguese</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pt</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-pt</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-pt</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-pt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pt_PT</packagereq>
     </packagelist>
@@ -4394,9 +4456,11 @@
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ro</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-ro</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Romanian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Romanian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ro</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-ro</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
@@ -4425,6 +4489,7 @@
     <langonly>ru</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-ru</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-ru</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_ru</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ru</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-ru</packagereq>
@@ -4435,6 +4500,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ru</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-ru</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ru</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-ru</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
@@ -4460,6 +4526,17 @@
     </packagelist>
   </group>
   <group>
+    <id>sanskrit-support</id>
+    <_name>Sanskrit Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <langonly>sa</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>sardinian-support</id>
     <_name>Sardinian Support</_name>
     <_description/>
@@ -4550,11 +4627,14 @@
     <langonly>sk</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sk</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-sk</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-sk</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Slovak</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Slovak</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sk</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sk</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-sk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sk_SK</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
@@ -4571,12 +4651,14 @@
     <langonly>sl</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sl</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-sl</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sl</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-sl</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Slovenian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Slovenian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sl</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-sl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sl_SI</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
@@ -4769,15 +4851,18 @@
     <langonly>es</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-es</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-es</packagereq>
       <packagereq type="conditional" requires="childsplay">childsplay-alphabet_sounds_es</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-es</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-es</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-es</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-es</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Spanish</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Spanish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-es</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-es</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-es</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-es</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-es</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-es</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-es</packagereq>
@@ -4870,6 +4955,7 @@
     <langonly>sv</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-sv</packagereq>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-sv</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-sv</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-sv</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sv</packagereq>
@@ -4879,6 +4965,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sv</packagereq>
       <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-sv</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sv</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-sv</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sv</packagereq>
       <packagereq type="optional">m17n-db-swedish</packagereq>
     </packagelist>
@@ -5292,6 +5379,7 @@
     <uservisible>true</uservisible>
     <langonly>tr</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-tr</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-tr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-tr</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Turkish</packagereq>
@@ -5324,11 +5412,13 @@
     <packagelist>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-uk</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-uk</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-uk</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Ukrainian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Ukrainian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-uk</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-uk</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-uk</packagereq>
+      <packagereq type="conditional" requires="mythes-en">mythes-uk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-uk</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
@@ -5346,6 +5436,7 @@
     <langonly>hsb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-hsb</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-hsb</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5401,6 +5492,7 @@
     <uservisible>true</uservisible>
     <langonly>vi</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="autocorr-en">autocorr-vi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-vi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
       <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
@@ -5808,6 +5900,7 @@
       <groupid>latvian-support</groupid>
       <groupid>lithuanian-support</groupid>
       <groupid>low-saxon-support</groupid>
+      <groupid>luxembourgish-support</groupid>
       <groupid>macedonian-support</groupid>
       <groupid>maithili-support</groupid>
       <groupid>malagasy-support</groupid>
@@ -5831,6 +5924,7 @@
       <groupid>romanian-support</groupid>
       <groupid>russian-support</groupid>
       <groupid>samoan-support</groupid>
+      <groupid>sanskrit-support</groupid>
       <groupid>sardinian-support</groupid>
       <groupid>serbian-support</groupid>
       <groupid>sindhi-support</groupid>



From rstrode at fedoraproject.org  Wed Apr 29 18:03:48 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 29 Apr 2009 18:03:48 +0000 (UTC)
Subject: rpms/plymouth/F-10 plymouth.spec,1.117,1.118
Message-ID: <20090429180348.DB7BE70133@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28187

Modified Files:
	plymouth.spec 
Log Message:
- Move Provides: plymouth(system-plugin) to spinfinity for now



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-10/plymouth.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- plymouth.spec	14 Jan 2009 04:25:04 -0000	1.117
+++ plymouth.spec	29 Apr 2009 18:03:46 -0000	1.118
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -130,6 +130,7 @@ Requires: %{name}-libs = %{version}-%{re
 Requires: plymouth-plugin-label
 BuildRequires: libpng-devel
 Requires(post): %{_sbindir}/plymouth-set-default-plugin
+Provides: plymouth(system-plugin) = %{version}-%{release}
 
 %description plugin-spinfinity
 This package contains the "Spinfinity" boot splash plugin for
@@ -143,7 +144,6 @@ Requires: %{name}-libs = %{version}-%{re
 Requires: plymouth-plugin-label
 Requires(post): %{_sbindir}/plymouth-set-default-plugin
 BuildRequires: libpng-devel
-Provides: plymouth(system-plugin) = %{version}-%{release}
 
 %description plugin-solar
 This package contains the "Solar" boot splash plugin for
@@ -314,6 +314,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Apr 29 2009 Ray Strode <rstrode at redhat.com> 0.6.0-3
+- Move Provides: plymouth(system-plugin) to spinfinity for now
+
 * Wed Dec 17 2008 Ray Strode <rstrode at redhat.com> 0.6.0-2
 - Add patch from drop-nash branch for jeremy
 



From rstrode at fedoraproject.org  Wed Apr 29 18:07:51 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 29 Apr 2009 18:07:51 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.207,1.208
Message-ID: <20090429180751.90D1E70135@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29198

Modified Files:
	comps-f11.xml.in 
Log Message:
Require plymouth-system-plugin instead of plymouth-plugin-spinfinity directly

Spotted by belegdol



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- comps-f11.xml.in	29 Apr 2009 17:59:44 -0000	1.207
+++ comps-f11.xml.in	29 Apr 2009 18:07:21 -0000	1.208
@@ -346,7 +346,7 @@
       <packagereq type="default">kerneloops</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
-      <packagereq type="default">plymouth-plugin-spinfinity</packagereq>
+      <packagereq type="default">plymouth-system-plugin</packagereq>
       <packagereq type="default">policycoreutils-gui</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>



From notting at redhat.com  Wed Apr 29 18:15:22 2009
From: notting at redhat.com (Bill Nottingham)
Date: Wed, 29 Apr 2009 14:15:22 -0400
Subject: comps comps-f11.xml.in,1.207,1.208
In-Reply-To: <1241028832.3139.13.camel@localhost.localdomain>
References: <20090429180751.90D1E70135@cvs1.fedora.phx.redhat.com>
	<1241028832.3139.13.camel@localhost.localdomain>
Message-ID: <20090429181522.GB7982@nostromo.devel.redhat.com>

Jesse Keating (jkeating at redhat.com) said: 
> On Wed, 2009-04-29 at 18:07 +0000, Ray Strode wrote:
> > -      <packagereq type="default">plymouth-plugin-spinfinity</packagereq>
> > +      <packagereq type="default">plymouth-system-plugin</packagereq>
> 
> Hrm, isn't that a virtual package, provided by a few different things?
> I don't think that works in comps.

# yum -C list plymouth-system-plugin
Available Packages
plymouth-system-plugin.x86_64                 0.7.0-0.2009.03.10.3.fc11 rawhide

Looks to be an actual package.

Bill



From mclasen at fedoraproject.org  Wed Apr 29 18:32:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 29 Apr 2009 18:32:33 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11 compare-keys-carefully.patch, NONE, 
	1.1 gnome-settings-daemon.spec, 1.101, 1.102
Message-ID: <20090429183233.190D270133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32206

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	compare-keys-carefully.patch 
Log Message:
make custom keybindings work better


compare-keys-carefully.patch:

--- NEW FILE compare-keys-carefully.patch ---
--- gnome-settings-daemon-2.26.1/plugins/keybindings/gsd-keybindings-manager.c	2009-04-11 12:25:32.000000000 -0400
+++ hacked/plugins/keybindings/gsd-keybindings-manager.c	2009-04-29 14:18:12.706975126 -0400
@@ -268,6 +274,8 @@
                                         return FALSE;
                         }
                 }
+		else if (key->keycodes != NULL || other->keycodes != NULL)
+			return FALSE;
 
                 return TRUE;
         }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gnome-settings-daemon.spec	29 Apr 2009 15:41:45 -0000	1.101
+++ gnome-settings-daemon.spec	29 Apr 2009 18:32:02 -0000	1.102
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -41,6 +41,9 @@ Patch11:	gnome-settings-daemon-2.26.0-su
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=580616
+Patch13:	compare-keys-carefully.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -62,6 +65,7 @@ developing applications that use %{name}
 %patch10 -p1 -b .catch-deviceadded
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
+%patch13 -p1 -b .compare-keys-carefully
 
 autoreconf -i -f
 
@@ -174,6 +178,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-3
+- Make custom keybindings work better (#497725)
+
 * Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-2
 - Don't set touchpads to be left-handed, otherwise the tap
   behaves like the 2nd mouse button (#483639)



From cwickert at fedoraproject.org  Wed Apr 29 18:41:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 18:41:27 +0000 (UTC)
Subject: rpms/lxde-common/devel lxde-common.spec,1.4,1.5
Message-ID: <20090429184127.60A2D70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1397

Modified Files:
	lxde-common.spec 
Log Message:
cosmetic fix


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxde-common.spec	29 Apr 2009 17:29:30 -0000	1.4
+++ lxde-common.spec	29 Apr 2009 18:40:56 -0000	1.5
@@ -61,7 +61,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 # the icon theme is packaged in a different package
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/
 # only used by obsolete lxsession, not lxsession-lite
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From cwickert at fedoraproject.org  Wed Apr 29 18:41:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 29 Apr 2009 18:41:56 +0000 (UTC)
Subject: rpms/lxde-common/F-11 lxde-common-0.3.2.1-logout-banner.patch, NONE,
	1.1 lxde-common-0.3.2.1-pcmanfm-config.patch, NONE,
	1.1 lxde-common-0.4-lxpanel-config.patch, NONE,
	1.1 lxde-common-0.4-openbox-menu.patch, NONE,
	1.1 lxde-common-0.4-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 lxde-common.spec, 1.3, 1.4 sources, 1.2,
	1.3 lxde-common-0.3.2.1-lxpanel-config.patch, 1.2,
	NONE lxde-common-0.3.2.1-openbox.patch, 1.1,
	NONE lxde-common-0.3.2.1-pcmanfm.patch, 1.1,
	NONE lxde-common-0.3.2.1-pulseaudio.patch, 1.1,
	NONE lxde-common-0.3.2.1-vendor.patch, 1.1, NONE
Message-ID: <20090429184156.3E5B170133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1469

Modified Files:
	.cvsignore lxde-common.spec sources 
Added Files:
	lxde-common-0.3.2.1-logout-banner.patch 
	lxde-common-0.3.2.1-pcmanfm-config.patch 
	lxde-common-0.4-lxpanel-config.patch 
	lxde-common-0.4-openbox-menu.patch 
	lxde-common-0.4-pulseaudio.patch 
Removed Files:
	lxde-common-0.3.2.1-lxpanel-config.patch 
	lxde-common-0.3.2.1-openbox.patch 
	lxde-common-0.3.2.1-pcmanfm.patch 
	lxde-common-0.3.2.1-pulseaudio.patch 
	lxde-common-0.3.2.1-vendor.patch 
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
- Update to 0.4
- Require lxmenu-data and lxde-settings-daemon
- Drop obsolete config file /etc/xdg/lxsession/LXDE/default


lxde-common-0.3.2.1-logout-banner.patch:

--- NEW FILE lxde-common-0.3.2.1-logout-banner.patch ---
--- lxde-common-0.3.2.1.orig/lxde-logout.in	2008-04-20 10:26:19.000000000 +0200
+++ lxde-common-0.3.2.1/lxde-logout.in	2008-11-30 17:08:25.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top
+lxsession-logout --banner "@prefix@/share/pixmaps/fedora-logo-small.png" --side=top

lxde-common-0.3.2.1-pcmanfm-config.patch:

--- NEW FILE lxde-common-0.3.2.1-pcmanfm-config.patch ---
diff -dur lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in lxde-common-0.3.2.1/pcmanfm/main.lxde.in
--- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in	2008-04-20 10:24:58.000000000 +0200
+++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in	2008-05-06 02:13:16.000000000 +0200
@@ -1,3 +1,6 @@
 [Desktop]
 show_wallpaper=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+wallpaper=@prefix@/share/backgrounds/images/default.png
+
+[General]
+terminal=lxterminal

lxde-common-0.4-lxpanel-config.patch:

--- NEW FILE lxde-common-0.4-lxpanel-config.patch ---
diff -dur lxde-common-0.4.orig/lxpanel/config lxde-common-0.4/lxpanel/config
--- lxde-common-0.4.orig/lxpanel/config	2008-06-16 10:10:24.000000000 +0200
+++ lxde-common-0.4/lxpanel/config	2009-04-28 22:11:13.000000000 +0200
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
-Terminal=xterm -e
+Terminal=lxterminal -e
 Logout=lxde-logout
diff -dur lxde-common-0.4.orig/lxpanel/panel.in lxde-common-0.4/lxpanel/panel.in
--- lxde-common-0.4.orig/lxpanel/panel.in	2008-06-16 10:10:24.000000000 +0200
+++ lxde-common-0.4/lxpanel/panel.in	2009-04-29 00:27:56.000000000 +0200
@@ -13,9 +13,9 @@
     alpha=0
     setdocktype=1
     setpartialstrut=1
-    usefontcolor=1
+    usefontcolor=0
     fontcolor=#ffffff
-    background=1
+    background=0
     backgroundfile=@prefix@/share/lxpanel/images/background.png
 }
 
@@ -29,12 +29,13 @@
 Plugin {
     type = menu
     Config {
-        image=@prefix@/share/lxde/images/lxde-icon.png
+        image=fedora-logo-icon.png
         system {
         }
         separator {
         }
         item {
+            image=gnome-run
             command=run
         }
         separator {
@@ -50,10 +51,13 @@
     type = launchbar
     Config {
         Button {
-            id=pcmanfm.desktop
+            id=fedora-pcmanfm.desktop
         }
         Button {
-            id=firefox.desktop
+            id=fedora-lxterminal.desktop
+        }
+        Button {
+            id=mozilla-firefox.desktop
         }
     }
 }
@@ -139,3 +143,7 @@
     }
 }
 
+Plugin {
+    type = volumealsa
+}
+

lxde-common-0.4-openbox-menu.patch:

--- NEW FILE lxde-common-0.4-openbox-menu.patch ---
--- lxde-common-0.4.orig/openbox/menu.xml	2008-07-16 04:20:32.000000000 +0200
+++ lxde-common-0.4/openbox/menu.xml	2009-04-28 23:25:47.000000000 +0200
@@ -2,38 +2,49 @@
 
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 
-<menu id="apps-menu" label="Applications">
+<menu id="apps-menu" label="Applications" execute="/usr/share/openbox/xdg-menu applications"/>
+<menu id="prefs-menu" label="Preferences" execute="/usr/share/openbox/xdg-menu preferences"/> 
+<menu id="admin-menu" label="Administration" execute="/usr/share/openbox/xdg-menu system-settings"/>
+
+<menu id="root-menu" label="LXDE">
+  <separator label="LXDE" />
+  <menu id="apps-menu" />
   <item label="PCManFM">
     <action name="Execute">
     <startupnotify><enabled>yes</enabled><icon>pcmanfm</icon></startupnotify>
     <command>pcmanfm</command></action>
   </item>
-  <item label="Xterm">
-    <action name="Execute"><command>xterm</command></action>
+  <item label="LXTerminal">
+    <action name="Execute"><command>lxterminal</command></action>
   </item>
   <item label="Firefox">
     <action name="Execute"><command>firefox</command></action>
   </item>
-</menu>
-
-<menu id="root-menu" label="LXDE">
-  <separator label="LXDE" />
-  <menu id="apps-menu" />
-  <separator />
+ <separator />
   <menu id="client-list-menu" />
   <separator />
-  <item label="Desktop Settings">
+  <menu id="prefs-menu" />
+  <menu id="admin-menu"/>
+<!--  <item label="ObConf">
     <action name="Execute">
-      <startupnotify><enabled>yes</enabled></startupnotify>
-      <command>pcmanfm --show-pref 2</command>
+      <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
+      <command>obconf</command>
+    </action>
+  </item> -->
+  <separator />
+  <item label="Run Command">
+    <action name="Execute">
+      <startupnotify><enabled>yes</enabled><icon>gtk-run</icon></startupnotify>
+      <command>lxpanelctl run</command>
     </action>
   </item>
-  <item label="Window Management Settings">
+  <item label="Find Files">
     <action name="Execute">
-      <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
-      <command>obconf</command>
+      <startupnotify><enabled>yes</enabled><icon>gtk-find</icon></startupnotify>
+      <command>pcmanfm -f</command>
     </action>
   </item>
+  <separator />
   <item label="Reload Config Files">
     <action name="Reconfigure" />
   </item>
@@ -43,4 +54,4 @@
   </item>
 </menu>
 
-</openbox_menu>
\ Kein Zeilenumbruch am Dateiende.
+</openbox_menu>

lxde-common-0.4-pulseaudio.patch:

--- NEW FILE lxde-common-0.4-pulseaudio.patch ---
--- lxde-common-0.4.orig/autostart	2008-11-28 16:09:00.000000000 +0100
+++ lxde-common-0.4/autostart	2009-04-28 23:52:51.000000000 +0200
@@ -1,4 +1,5 @@
 @lxde-settings-daemon
+ at pulseaudio -D
 @xscreensaver -no-splash
 @lxpanel --profile LXDE
 @pcmanfm -d


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Oct 2008 23:51:57 -0000	1.2
+++ .cvsignore	29 Apr 2009 18:41:54 -0000	1.3
@@ -1 +1 @@
-lxde-common-0.3.2.1.tar.bz2
+lxde-common-0.4.tar.bz2


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxde-common.spec	6 Mar 2009 00:37:13 -0000	1.3
+++ lxde-common.spec	29 Apr 2009 18:41:55 -0000	1.4
@@ -1,29 +1,28 @@
 Name:           lxde-common
-Version:        0.3.2.1
-Release:        4%{?dist}
-Summary:        Settings manager for LXDE
+Version:        0.4
+Release:        1%{?dist}
+Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-0.3.2.1-lxpanel-config.patch
-Patch1:         %{name}-0.3.2.1-openbox.patch
-Patch2:         %{name}-0.3.2.1-pcmanfm.patch
+# Distro specific patches
+Patch10:         %{name}-0.3.2.1-pcmanfm-config.patch
+Patch11:         %{name}-0.4-lxpanel-config.patch
+Patch12:         %{name}-0.4-openbox-menu.patch
+Patch13:         %{name}-0.3.2.1-logout-banner.patch
+# Pulseaudio
+Patch4:         %{name}-0.4-pulseaudio.patch
 # Because of new gdm
 # http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
-Patch4:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
-# Vendor specific patches
-Patch10:         %{name}-0.3.2.1-vendor.patch
-# Pulseaudio
-Patch11:         %{name}-0.3.2.1-pulseaudio.patch
+Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pkgconfig glib2-devel libX11-devel
-Requires:       lxsession lxpanel pcmanfm openbox xdg-utils
-Requires:       %{name}-data = %{version}-%{release}
+Requires:       lxsession lxpanel lxmenu-data pcmanfm openbox xdg-utils 
+Requires:       lxde-settings-daemon >= %{version}
 # Use vendor's artwork
-Requires:       gtk-nodoka-engine fedora-icon-theme system-logos
+Requires:       system-logos
 %if 0%{?fedora} < 9
 Requires:       desktop-backgrounds-basic
 %else
@@ -31,37 +30,29 @@ Requires:       desktop-backgrounds-comp
 # needed for new gdm workaround
 Requires:       wmctrl
 %endif
-
-
-%description
-This package the settings-manger for LXDE, the Lightweight X11 Desktop 
-Environment.
-
-%package        data
-Summary:        Default configuration files for LXDE
-Group:          User Interface/Desktops
-Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-data = %{version}-%{release}
+Obsoletes:      %{name}-data <= 0.3.2.1-5
 BuildArch:      noarch
 
-%description    data
+%description
 This package contains the configuration files for LXDE, the Lightweight X11 
 Desktop Environment.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
+%patch10 -p1 -b .orig
+%patch11 -p1 -b .orig
+%patch12 -p1 -b .orig
+%patch13 -p1 -b .logout-banner
+%patch4 -p1 -b .pulseaudio
 %if 0%{?fedora} > 8
-%patch4 -p1 -b .gdm-desktops
+%patch5 -p1 -b .gdm-desktops
 %endif
-%patch10 -p1 -b .vendor
-%patch11 -p1 -b .pulseaudio
 
 
 %build
 %configure
-make %{?_smp_mflags}
 
 
 %install
@@ -69,6 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 # the icon theme is packaged in a different package
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/
+# only used by obsolete lxsession, not lxsession-lite
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
 
 
 %clean
@@ -79,30 +72,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %dir %{_sysconfdir}/xdg/lxsession/LXDE/
-%{_bindir}/lxde-settings
-
-%files data
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/xdg/lxsession/LXDE/
-%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/default
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config
-
 %{_bindir}/startlxde
 %{_bindir}/lxde-logout
 %{_bindir}/openbox-lxde
-
-%{_datadir}/lxde/
+%{_datadir}/lxde/*
 %{_datadir}/lxpanel/profile/LXDE/
 %{_mandir}/man1/*.1.gz
-%{_usr}/share/xsessions/LXDE.desktop
-
+%{_datadir}/xsessions/LXDE.desktop
 
 
 %changelog
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
+- Update to 0.4
+- Require lxmenu-data and lxde-settings-daemon
+- Drop obsolete config file /etc/xdg/lxsession/LXDE/default
+
 * Fri Mar 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
 - Workaround for new gdm
-- Addd Pulseaudio support
+- Add Pulseaudio support
 - Add mixer plugin to the panel
 - Require xdg-utils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Oct 2008 23:51:57 -0000	1.2
+++ sources	29 Apr 2009 18:41:55 -0000	1.3
@@ -1 +1 @@
-f30eee998071ace04e7be33aa8ac6a5b  lxde-common-0.3.2.1.tar.bz2
+aa16d649ecb9b42ac52eec5c125b7084  lxde-common-0.4.tar.bz2


--- lxde-common-0.3.2.1-lxpanel-config.patch DELETED ---


--- lxde-common-0.3.2.1-openbox.patch DELETED ---


--- lxde-common-0.3.2.1-pcmanfm.patch DELETED ---


--- lxde-common-0.3.2.1-pulseaudio.patch DELETED ---


--- lxde-common-0.3.2.1-vendor.patch DELETED ---



From clumens at fedoraproject.org  Wed Apr 29 19:07:35 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 29 Apr 2009 19:07:35 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.106, 1.107 pykickstart.spec,
	1.116, 1.117 sources, 1.115, 1.116
Message-ID: <20090429190735.D901670133@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3902

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	18 Feb 2009 18:33:32 -0000	1.106
+++ .cvsignore	29 Apr 2009 19:07:05 -0000	1.107
@@ -40,3 +40,4 @@ pykickstart-1.49.tar.gz
 pykickstart-1.50.tar.gz
 pykickstart-1.51.tar.gz
 pykickstart-1.52.tar.gz
+pykickstart-1.53.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- pykickstart.spec	26 Feb 2009 20:09:32 -0000	1.116
+++ pykickstart.spec	29 Apr 2009 19:07:05 -0000	1.117
@@ -3,8 +3,8 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.52
-Release: 2%{?dist}
+Version: 1.53
+Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
@@ -45,8 +45,11 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.52-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 29 2009 Chris Lumens <clumens at redhat.com> - 1.53-1
+- Move lineno= from KSOptionParser.__init__ to parse_args (#497149). (clumens)
+- Use the F11 version of the partition command. (clumens)
+- Remove the --start and --end options since anaconda no longer uses them. (clumens)
+- Remove a broken test case. (clumens)
 
 * Wed Feb 18 2009 Chris Lumens <clumens at redhat.com> - 1.52-1
 - Add lots more test cases (alindebe, mgracik, stickster).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	18 Feb 2009 18:33:32 -0000	1.115
+++ sources	29 Apr 2009 19:07:05 -0000	1.116
@@ -1 +1 @@
-7e576f0c98c77f18a229d51c3ec48bc4  pykickstart-1.52.tar.gz
+0e97f845154a2d46446dc7838625c52e  pykickstart-1.53.tar.gz



From clumens at fedoraproject.org  Wed Apr 29 19:09:48 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 29 Apr 2009 19:09:48 +0000 (UTC)
Subject: rpms/pykickstart/F-11 .cvsignore, 1.106, 1.107 pykickstart.spec,
	1.116, 1.117 sources, 1.115, 1.116
Message-ID: <20090429190948.3B6AF70136@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4242

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-11/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	18 Feb 2009 18:33:32 -0000	1.106
+++ .cvsignore	29 Apr 2009 19:09:17 -0000	1.107
@@ -40,3 +40,4 @@ pykickstart-1.49.tar.gz
 pykickstart-1.50.tar.gz
 pykickstart-1.51.tar.gz
 pykickstart-1.52.tar.gz
+pykickstart-1.53.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-11/pykickstart.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- pykickstart.spec	26 Feb 2009 20:09:32 -0000	1.116
+++ pykickstart.spec	29 Apr 2009 19:09:17 -0000	1.117
@@ -3,8 +3,8 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.52
-Release: 2%{?dist}
+Version: 1.53
+Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
@@ -45,8 +45,11 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.52-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr 29 2009 Chris Lumens <clumens at redhat.com> - 1.53-1
+- Move lineno= from KSOptionParser.__init__ to parse_args (#497149). (clumens)
+- Use the F11 version of the partition command. (clumens)
+- Remove the --start and --end options since anaconda no longer uses them. (clumens)
+- Remove a broken test case. (clumens)
 
 * Wed Feb 18 2009 Chris Lumens <clumens at redhat.com> - 1.52-1
 - Add lots more test cases (alindebe, mgracik, stickster).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-11/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	18 Feb 2009 18:33:32 -0000	1.115
+++ sources	29 Apr 2009 19:09:17 -0000	1.116
@@ -1 +1 @@
-7e576f0c98c77f18a229d51c3ec48bc4  pykickstart-1.52.tar.gz
+0e97f845154a2d46446dc7838625c52e  pykickstart-1.53.tar.gz



From lkundrak at fedoraproject.org  Wed Apr 29 19:12:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 29 Apr 2009 19:12:19 +0000 (UTC)
Subject: rpms/fedora-release-notes/F-11 fedora-release-notes.spec,1.36,1.37
Message-ID: <20090429191219.C8F7F70133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/fedora-release-notes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5352

Modified Files:
	fedora-release-notes.spec 
Log Message:
* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 10.93.0-2
- Hardlink duplicate files to save space



Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/fedora-release-notes.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- fedora-release-notes.spec	21 Apr 2009 20:40:12 -0000	1.36
+++ fedora-release-notes.spec	29 Apr 2009 19:11:49 -0000	1.37
@@ -11,7 +11,7 @@
 
 Name:		fedora-release-notes
 Version:	10.93.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Release Notes for Fedora 11
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -29,6 +29,7 @@ BuildArch:	noarch
 BuildRequires:	desktop-file-utils
 BuildRequires:	publican
 BuildRequires:	publican-fedora
+BuildRequires:	hardlink
 
 %if %{HTMLVIEW}
 Requires:	htmlview
@@ -148,6 +149,10 @@ install -m 644 about-*omf $RPM_BUILD_ROO
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
 popd
 
+# There are lot of duplicate files, save space by hardlinking them
+hardlink -cv $RPM_BUILD_ROOT%{_datadir}/doc
+hardlink -cv $RPM_BUILD_ROOT%{_datadir}/gnome
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -174,6 +179,9 @@ if [ -x /usr/bin/update-desktop-database
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 10.93.0-2
+- Hardlink duplicate files to save space
+
 * Tue Apr 14 2009 John J. McDonough <jjmcd at fedoraproject.org> - 10.93.0-1
 - Use publican for F11 Preview release
 



From sgrubb at fedoraproject.org  Wed Apr 29 19:22:04 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 29 Apr 2009 19:22:04 +0000 (UTC)
Subject: rpms/libprelude/devel .cvsignore, 1.16, 1.17 libprelude.spec, 1.42, 
	1.43 sources, 1.17, 1.18
Message-ID: <20090429192204.A9A2B70133@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6076

Modified Files:
	.cvsignore libprelude.spec sources 
Log Message:
new upstream release 0.9.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	13 Oct 2008 15:43:16 -0000	1.16
+++ .cvsignore	29 Apr 2009 19:21:34 -0000	1.17
@@ -11,3 +11,4 @@ libprelude-0.9.20.2.tar.gz
 libprelude-0.9.21.tar.gz
 libprelude-0.9.21.1.tar.gz
 libprelude-0.9.21.2.tar.gz
+libprelude-0.9.22.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- libprelude.spec	3 Apr 2009 19:58:12 -0000	1.42
+++ libprelude.spec	29 Apr 2009 19:21:34 -0000	1.43
@@ -4,8 +4,8 @@
 
 
 Name:		libprelude
-Version:	0.9.21.2
-Release:	9%{?dist}
+Version:	0.9.22
+Release:	1%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -129,10 +129,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_bindir}/libprelude-config
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/libprelude.pc
 %dir %{_includedir}/libprelude/
 %{_includedir}/libprelude/*
-%dir %{_includedir}/libpreludecpp/
-%{_includedir}/libpreludecpp/*
 %{_datadir}/aclocal/libprelude.m4
 
 %files python
@@ -149,6 +148,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Wed Apr 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.22-1
+- New upstream release
+
 * Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 0.9.21.2-9
 - remove check section, doesn't work on anything except x86 anyways
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	13 Oct 2008 15:43:16 -0000	1.17
+++ sources	29 Apr 2009 19:21:34 -0000	1.18
@@ -1 +1 @@
-767ea378580caab14ebb4df0ee5e4129  libprelude-0.9.21.2.tar.gz
+4135308d6b1e7f6de2df11cdf4c948d1  libprelude-0.9.22.tar.gz



From laxathom at fedoraproject.org  Wed Apr 29 19:40:39 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Wed, 29 Apr 2009 19:40:39 +0000 (UTC)
Subject: rpms/gammu/F-11 .cvsignore, 1.15, 1.16 gammu.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20090429194039.6B3C970133@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8826/F-11

Modified Files:
	.cvsignore gammu.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Apr 2009 15:59:58 -0000	1.15
+++ .cvsignore	29 Apr 2009 19:40:08 -0000	1.16
@@ -1 +1 @@
-gammu-1.23.92.tar.bz2
+gammu-1.24.0.tar.bz2


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-11/gammu.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gammu.spec	14 Apr 2009 13:49:25 -0000	1.25
+++ gammu.spec	29 Apr 2009 19:40:08 -0000	1.26
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.23.92
+Version:        1.24.0
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Xavier Lamien <lxtnow at gmail.com> - 1.24.0-1
+- Update release.
+
 * Tue Apr 14 2009 Xavier Lamien <lxtnow at gmail.com> - 1.23.92-1
 - Update release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Apr 2009 15:59:59 -0000	1.15
+++ sources	29 Apr 2009 19:40:09 -0000	1.16
@@ -1 +1 @@
-796833440bb1f02b791375116ee564af  gammu-1.23.92.tar.bz2
+f805d6d93ca7064f6d04eb3c6b24168f  gammu-1.24.0.tar.bz2



From laxathom at fedoraproject.org  Wed Apr 29 19:40:39 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Wed, 29 Apr 2009 19:40:39 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.25,1.26 sources,1.15,1.16
Message-ID: <20090429194039.870C470133@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8826/devel

Modified Files:
	gammu.spec sources 
Log Message:
Update release


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gammu.spec	14 Apr 2009 13:49:25 -0000	1.25
+++ gammu.spec	29 Apr 2009 19:40:09 -0000	1.26
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.23.92
+Version:        1.24.0
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Xavier Lamien <lxtnow at gmail.com> - 1.24.0-1
+- Update release.
+
 * Tue Apr 14 2009 Xavier Lamien <lxtnow at gmail.com> - 1.23.92-1
 - Update release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Apr 2009 15:59:59 -0000	1.15
+++ sources	29 Apr 2009 19:40:09 -0000	1.16
@@ -1 +1 @@
-796833440bb1f02b791375116ee564af  gammu-1.23.92.tar.bz2
+f805d6d93ca7064f6d04eb3c6b24168f  gammu-1.24.0.tar.bz2



From s4504kr at fedoraproject.org  Wed Apr 29 19:53:17 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 29 Apr 2009 19:53:17 +0000 (UTC)
Subject: rpms/fedora-ksplice/devel fedora-ksplice.spec,1.2,1.3
Message-ID: <20090429195317.2976870133@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/fedora-ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11728

Modified Files:
	fedora-ksplice.spec 
Log Message:
Build package only for %{ix86} and x86_64


Index: fedora-ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ksplice/devel/fedora-ksplice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fedora-ksplice.spec	24 Feb 2009 16:32:21 -0000	1.2
+++ fedora-ksplice.spec	29 Apr 2009 19:52:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		fedora-ksplice
 Version:	0.5
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Script Collection for Using KSplice on Fedora Linux
 
 Group:		System Environment/Kernel
@@ -9,8 +9,7 @@ URL:		http://fedorahosted.org/%{name}
 Source0:	https://fedorahosted.org/releases/f/e/fedora-ksplice/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
-
+ExclusiveArch:	x86_64 %{ix86}
 Requires:	ksplice, rpm-build, yum-utils
 
 %description
@@ -51,7 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.5-5
+- Build only for x86_64 and %%{ix86}
+
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5-4
+- Exclude ppc64 and ppc as Architetures
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5-2



From s4504kr at fedoraproject.org  Wed Apr 29 20:00:28 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 29 Apr 2009 20:00:28 +0000 (UTC)
Subject: rpms/fedora-ksplice/F-11 fedora-ksplice.spec,1.2,1.3
Message-ID: <20090429200028.AEDB370133@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/fedora-ksplice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13108

Modified Files:
	fedora-ksplice.spec 
Log Message:
Build package only for %{ix86} and x86_64


Index: fedora-ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ksplice/F-11/fedora-ksplice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fedora-ksplice.spec	24 Feb 2009 16:32:21 -0000	1.2
+++ fedora-ksplice.spec	29 Apr 2009 19:59:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		fedora-ksplice
 Version:	0.5
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Script Collection for Using KSplice on Fedora Linux
 
 Group:		System Environment/Kernel
@@ -9,8 +9,7 @@ URL:		http://fedorahosted.org/%{name}
 Source0:	https://fedorahosted.org/releases/f/e/fedora-ksplice/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
-
+ExclusiveArch:	x86_64 %{ix86}
 Requires:	ksplice, rpm-build, yum-utils
 
 %description
@@ -51,7 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.5-5
+- Build only for x86_64 and %%{ix86}
+
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5-4
+- Exclude ppc64 and ppc as Architetures
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5-2



From s4504kr at fedoraproject.org  Wed Apr 29 20:09:30 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 29 Apr 2009 20:09:30 +0000 (UTC)
Subject: rpms/fedora-ksplice/F-10 fedora-ksplice.spec,1.1,1.2
Message-ID: <20090429200930.76E2470133@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/fedora-ksplice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15148

Modified Files:
	fedora-ksplice.spec 
Log Message:
Build package only for %{ix86} and x86_64


Index: fedora-ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ksplice/F-10/fedora-ksplice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fedora-ksplice.spec	19 Feb 2009 20:49:27 -0000	1.1
+++ fedora-ksplice.spec	29 Apr 2009 20:08:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		fedora-ksplice
 Version:	0.5
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	Script Collection for Using KSplice on Fedora Linux
 
 Group:		System Environment/Kernel
@@ -9,8 +9,7 @@ URL:		http://fedorahosted.org/%{name}
 Source0:	https://fedorahosted.org/releases/f/e/fedora-ksplice/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
-
+ExclusiveArch:	x86_64 %{ix86}
 Requires:	ksplice, rpm-build, yum-utils
 
 %description
@@ -51,6 +50,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README
 
 %changelog
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.5-5
+- Build only for x86_64 and %%{ix86}
+
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5-4
+- Exclude ppc64 and ppc as Architetures
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5-2
 - Change 'fedora-ksplice' into '%%{name}'
 - Use smp_mflags



From s4504kr at fedoraproject.org  Wed Apr 29 20:25:14 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 29 Apr 2009 20:25:14 +0000 (UTC)
Subject: rpms/pdftk/F-10 pdftk-classpath.patch,1.1,1.2 pdftk.spec,1.17,1.18
Message-ID: <20090429202514.8661470133@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19464

Modified Files:
	pdftk-classpath.patch pdftk.spec 
Log Message:
Add pcprov and pcmail to classpath patch

pdftk-classpath.patch:

Index: pdftk-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/pdftk/F-10/pdftk-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdftk-classpath.patch	9 Apr 2009 18:54:25 -0000	1.1
+++ pdftk-classpath.patch	29 Apr 2009 20:25:13 -0000	1.2
@@ -12,17 +12,17 @@
 +    char itext_classpath[1024];
 +    char *environ_classpath = getenv ("CLASSPATH");
 +
-+    FILE *p = popen ("/usr/bin/build-classpath itext", "r");
++    FILE *p = popen ("/usr/bin/build-classpath itext bcprov bcmail", "r");
 +    if (!p)
 +      {
-+        perror ("Can't popen /usr/bin/build-classpath itext");
++        perror ("Can't popen /usr/bin/build-classpath itext bcprov bcmail");
 +        exit (1);
 +      }
 +
 +    char *s = fgets(itext_classpath, sizeof itext_classpath, p);
 +    if (!s)
 +      {
-+        perror ("Can't get ouput from /usr/bin/build-classpath itext");
++        perror ("Can't get ouput from /usr/bin/build-classpath itext bcprov bcmail");
 +        exit (1);
 +      }
 +


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/F-10/pdftk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pdftk.spec	22 Apr 2009 21:18:13 -0000	1.17
+++ pdftk.spec	29 Apr 2009 20:25:14 -0000	1.18
@@ -3,7 +3,7 @@
 Summary:        The PDF Tool Kit
 Name:           pdftk
 Version:        1.41
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        GPLv2+
 URL:            http://www.pdfhacks.com/pdftk/
 # Remove java-lib/com because it's contains licensing issue
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-18
+- Add bcprov and bcmail to classpath patch (BZ #497986)
+
 * Tue Apr 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.41-17
 - Bump release number
 



From spot at fedoraproject.org  Wed Apr 29 20:26:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 29 Apr 2009 20:26:53 +0000 (UTC)
Subject: rpms/R/EL-4 R.spec,1.30,1.31
Message-ID: <20090429202653.B0ABC70133@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19752/EL-4

Modified Files:
	R.spec 
Log Message:
EPEL build fixes


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- R.spec	17 Apr 2009 20:12:41 -0000	1.30
+++ R.spec	29 Apr 2009 20:26:23 -0000	1.31
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -50,7 +50,7 @@ and called at run time.
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: ggv, cups, firefo
-Requires: perl, sed, gawk, tetex-latex, less, vi
+Requires: perl, sed, gawk, tetex-latex, less, vim-minimal
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -923,6 +923,9 @@ fi
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1.1
+- fix Requires on vi to be vim-minimal
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
 - update to 2.9.0, change vim dep to vi
 - EL4 version, no java subpackages



From spot at fedoraproject.org  Wed Apr 29 20:26:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 29 Apr 2009 20:26:53 +0000 (UTC)
Subject: rpms/R/EL-5 R.spec,1.37,1.38
Message-ID: <20090429202653.EEA1970133@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19752/EL-5

Modified Files:
	R.spec 
Log Message:
EPEL build fixes


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- R.spec	17 Apr 2009 20:12:42 -0000	1.37
+++ R.spec	29 Apr 2009 20:26:23 -0000	1.38
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -51,7 +51,7 @@ and called at run time.
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
-Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
+Requires: perl, sed, gawk, tetex-latex, less, vim-minimal
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -915,6 +915,10 @@ fi
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1.1
+- take out incorrect texlive Requires (no texlive until RHEL 6)
+- fix Requires: vi to be Requires: vim-minimal
+
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.0-1
 - update to 2.9.0, change vim dep to vi
 - EL-5 version, no java subpackages



From rcritten at fedoraproject.org  Wed Apr 29 20:32:41 2009
From: rcritten at fedoraproject.org (Robert Crittenden)
Date: Wed, 29 Apr 2009 20:32:41 +0000 (UTC)
Subject: rpms/nss_compat_ossl/F-11 nss_compat_ossl.spec,1.15,1.16
Message-ID: <20090429203241.3FA6C70133@cvs1.fedora.phx.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21450

Modified Files:
	nss_compat_ossl.spec 
Log Message:
Bump NVR so it isn't lower than F-10



Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/F-11/nss_compat_ossl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nss_compat_ossl.spec	29 Apr 2009 14:22:17 -0000	1.15
+++ nss_compat_ossl.spec	29 Apr 2009 20:32:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 29 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-3
+- Bump NVR so it isn't lower than F-10
+
 * Wed Apr 29 2009 Rob Crittenden <rcritten at redhat.com> - 0.9.5-2
 - Resolve BZ 497788, implement default loading of root CAs
 



From caolanm at fedoraproject.org  Wed Apr 29 20:33:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 29 Apr 2009 20:33:15 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch, NONE,
	1.1 openoffice.org.spec, 1.1903, 1.1904
Message-ID: <20090429203315.416F270133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21565/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch 
Log Message:
just in case of picking up wrong evo connector

openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch ---
--- connectivity.orig/source/drivers/evoab/makefile.mk	2008-12-30 15:32:01.000000000 +0100
+++ connectivity/source/drivers/evoab/makefile.mk	2009-04-29 20:51:57.000000000 +0200
@@ -36,6 +36,11 @@ TARGET=evoab
 
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(ENABLE_EVOAB2)"=="TRUE"
+dummy:
+	@echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
+.ELSE
+
 # --- Settings ----------------------------------
 .IF "$(DBGUTIL_OJ)"!=""
 ENVCFLAGS+=/FR$(SLO)$/
@@ -103,6 +108,7 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
 .ENDIF
+.ENDIF
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1903
retrieving revision 1.1904
diff -u -p -r1.1903 -r1.1904
--- openoffice.org.spec	28 Apr 2009 09:34:27 -0000	1.1903
+++ openoffice.org.spec	29 Apr 2009 20:32:44 -0000	1.1904
@@ -7,7 +7,7 @@
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
-#%define gtkprintui 1
+%define gtkprintui 0
 # whether to use stlport or gcc's stl, we're basically locked to stlport
 # for i386 to enable third party built against "vanilla OOo" uno components 
 # and add-ons to work with our OOo. We assume there aren't any such for the
@@ -137,6 +137,7 @@ Patch61: openoffice.org-3.1.0.ooo101274.
 Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2099,9 +2101,6 @@ tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{
 #remove it in case we didn't build with gcj
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/classes/sandbox.jar
 
-#remove evolution 1 address book driver
-rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/libevoab1.so
-
 #remove pagein stuff
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/pagein*
 



From caolanm at fedoraproject.org  Wed Apr 29 20:33:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 29 Apr 2009 20:33:15 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch, NONE,
	1.1 openoffice.org.spec, 1.1904, 1.1905
Message-ID: <20090429203315.980B570133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21565/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch 
Log Message:
just in case of picking up wrong evo connector

openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch ---
--- connectivity.orig/source/drivers/evoab/makefile.mk	2008-12-30 15:32:01.000000000 +0100
+++ connectivity/source/drivers/evoab/makefile.mk	2009-04-29 20:51:57.000000000 +0200
@@ -36,6 +36,11 @@ TARGET=evoab
 
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(ENABLE_EVOAB2)"=="TRUE"
+dummy:
+	@echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
+.ELSE
+
 # --- Settings ----------------------------------
 .IF "$(DBGUTIL_OJ)"!=""
 ENVCFLAGS+=/FR$(SLO)$/
@@ -103,6 +108,7 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
 .ENDIF
+.ENDIF
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1904
retrieving revision 1.1905
diff -u -p -r1.1904 -r1.1905
--- openoffice.org.spec	28 Apr 2009 09:34:28 -0000	1.1904
+++ openoffice.org.spec	29 Apr 2009 20:32:45 -0000	1.1905
@@ -7,7 +7,7 @@
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
-#%define gtkprintui 1
+%define gtkprintui 0
 # whether to use stlport or gcc's stl, we're basically locked to stlport
 # for i386 to enable third party built against "vanilla OOo" uno components 
 # and add-ons to work with our OOo. We assume there aren't any such for the
@@ -137,6 +137,7 @@ Patch61: openoffice.org-3.1.0.ooo101274.
 Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2099,9 +2101,6 @@ tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{
 #remove it in case we didn't build with gcj
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/classes/sandbox.jar
 
-#remove evolution 1 address book driver
-rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/libevoab1.so
-
 #remove pagein stuff
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/pagein*
 



From ivazquez at fedoraproject.org  Wed Apr 29 20:55:47 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed, 29 Apr 2009 20:55:47 +0000 (UTC)
Subject: rpms/transifex/devel .cvsignore, 1.4, 1.5 sources, 1.7,
	1.8 transifex.spec, 1.7, 1.8
Message-ID: <20090429205547.92D4A70133@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/transifex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27570

Modified Files:
	.cvsignore sources transifex.spec 
Log Message:
- Upstream update
  * Tarball support
  * User notifications
  * Multiple file support
  * Archive downloading
  * Many more (http://docs.transifex.org/releases/0.6.html)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Apr 2009 13:13:09 -0000	1.4
+++ .cvsignore	29 Apr 2009 20:55:16 -0000	1.5
@@ -1 +1 @@
-transifex-0.5.2.tar.gz
+transifex-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Apr 2009 13:13:09 -0000	1.7
+++ sources	29 Apr 2009 20:55:17 -0000	1.8
@@ -1 +1 @@
-34129c1dc28a804e1b863b0bf7a339fa  transifex-0.5.2.tar.gz
+2393027a685ecfad10946a821ac2d65f  transifex-0.6.tar.gz


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/transifex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- transifex.spec	1 Apr 2009 13:13:09 -0000	1.7
+++ transifex.spec	29 Apr 2009 20:55:17 -0000	1.8
@@ -1,7 +1,7 @@
 %define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.5.2
+Version:    0.6
 Release:    1%{?dist}
 Summary:    A system for distributed translation submissions
 
@@ -10,15 +10,17 @@ License:    GPLv2
 URL:        http://transifex.org/
 Source0:    http://transifex.org/files/%{name}-%{version}.tar.gz
 Source1:    django-settings.py.in
-Patch0:     transifex-0.5-docdb.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-BuildRequires:  Django python-sphinx gettext-devel
-Requires:   Django django-authopenid django-contact-form
+BuildRequires:  python-sphinx gettext-devel
+BuildRequires:  Django django-authopenid = 0.9.6 django-contact-form
+BuildRequires:  django-notification django-pagination django-tagging
+BuildRequires:  python-markdown django-evolution
+Requires:   Django django-authopenid = 0.9.6 django-contact-form
 Requires:   django-notification django-pagination django-tagging
-Requires:   python-markdown python-pygments
-Requires:   mercurial
+Requires:   python-markdown python-pygments django-evolution
+Requires:   mercurial python-urlgrabber
 Requires:   intltool >= 0.37.1
 
 %description
@@ -40,47 +42,44 @@ This package adds extra options to Trans
   * git support
 
 %prep
-%setup -qcTn %{name}
-tar --strip-components 1 -zxf %{SOURCE0}
-%patch0 -p 1 -b .docdb
+%setup -q
 sed -e 's!share/locale!.*/locale!' /usr/lib/rpm/find-lang.sh > my-find-lang.sh
 
 %build
+cd transifex
 rm -rf .hg* build-tools
 rm -r vcs/tests
+python manage.py syncdb --noinput
+cd ..
 cd docs
 make html
 cd ..
-python manage.py compilemessages --settings settings
+find transifex/locale -name django.po -execdir msgfmt --check-format -o django.mo {} \;
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd transifex
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 find -mindepth 1 -maxdepth 1 -type d \( \( -name .hg -o \
-    -name build-tools -o -name docs \) -prune -o -print \) | \
-    xargs cp -a -t $RPM_BUILD_ROOT/%{_datadir}/%{name}
+    -name build-tools -o -name docs -o -name settings \) -prune -o \
+    -print \) | xargs cp -a -t $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/*/LC_MESSAGES/django.po
+find $RPM_BUILD_ROOT%{_datadir}/%{name}/locale -name \*.po -exec rm {} +
 
-for vcs in cvs svn bzr hg git
+for vcs in cvs svn bzr hg git tar
 do
     mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/scratchdir/sources/"$vcs"
 done
 
 install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
-sed -n -e 's!^\(PROJECT_PATH = \).*$!\1"%{_datadir}/%{name}"!;
-    /ADDITIONAL VCS OPTIONS/q;p' \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py > \
-    $RPM_BUILD_ROOT%{confdir}/00-default.conf
-
-sed -n -e '/EXTRA LOCAL SETTINGS/q;/ADDITIONAL VCS OPTIONS/,$p' \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py > \
-    $RPM_BUILD_ROOT%{confdir}/10-extras.conf
+cp -a settings/*.conf $RPM_BUILD_ROOT/%{confdir}
 
 sed -e 's!\[\[confpath\]\]!%{confdir}!' %{SOURCE1} > \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py
 
+cd ..
+
 sh my-find-lang.sh $RPM_BUILD_ROOT django transifex.lst
 
 %clean
@@ -88,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 # Check to see if the secret key for Django needs setting, and then set it
-if grep -q '\[\[SECRETKEY\]\]' %{confdir}/00-default.conf
+if grep -q '\[\[SECRETKEY\]\]' %{confdir}/10-base.conf
 then
     key=$(python << EOF
 import random
@@ -97,14 +96,21 @@ print ''.join(chr(random.randint(35, 126
 EOF
 )
     sed -i -e "s!\[\[SECRETKEY\]\]!$key!" \
-        %{confdir}/00-default.conf
+        %{confdir}/10-base.conf
 fi
 
 %files -f transifex.lst
 %defattr(-,root,root,-)
 %doc LICENSE README docs/_build/html
 %dir %{confdir}
-%config(noreplace) %{confdir}/00-default.conf
+%config(noreplace) %{confdir}/10-base.conf
+%config(noreplace) %{confdir}/20-engines.conf
+%config(noreplace) %{confdir}/30-site.conf
+%config(noreplace) %{confdir}/40-apps.conf
+%config(noreplace) %{confdir}/50-project.conf
+%config(noreplace) %{confdir}/60-vcs.conf
+%config(noreplace) %{confdir}/65-tarball.conf
+%config(noreplace) %{confdir}/70-translation.conf
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/__init__.py
 %{_datadir}/%{name}/__init__.py[co]
@@ -112,18 +118,21 @@ fi
 %exclude %{_datadir}/%{name}/manage.py[co]
 %{_datadir}/%{name}/settings.py
 %{_datadir}/%{name}/settings.py[co]
-%exclude %{_datadir}/%{name}/settings_*.py*
-%exclude %{_datadir}/%{name}/sample_settings_*.py*
 %{_datadir}/%{name}/urls.py
 %{_datadir}/%{name}/urls.py[co]
 %{_datadir}/%{name}/actionlog
+%{_datadir}/%{name}/codebases
+%{_datadir}/%{name}/external
 %{_datadir}/%{name}/languages
+%dir %{_datadir}/%{name}/locale
+%{_datadir}/%{name}/locale/LINGUAS
 %{_datadir}/%{name}/projects
 %{_datadir}/%{name}/releases
 %{_datadir}/%{name}/repowatch
 %{_datadir}/%{name}/simpleauth
 %{_datadir}/%{name}/simplelock
 %{_datadir}/%{name}/site_media
+%{_datadir}/%{name}/tarball
 %{_datadir}/%{name}/templates
 %{_datadir}/%{name}/txcommon
 %{_datadir}/%{name}/translations
@@ -139,6 +148,8 @@ fi
 %{_datadir}/%{name}/vcs/lib/support/__init__.py[co]
 %{_datadir}/%{name}/vcs/lib/support/commands.py
 %{_datadir}/%{name}/vcs/lib/support/commands.py[co]
+%{_datadir}/%{name}/vcs/lib/support/hg.py
+%{_datadir}/%{name}/vcs/lib/support/hg.py[co]
 %dir %{_datadir}/%{name}/vcs/lib/types
 %{_datadir}/%{name}/vcs/lib/types/__init__.py
 %{_datadir}/%{name}/vcs/lib/types/__init__.py[co]
@@ -150,11 +161,12 @@ fi
 %dir %{_localstatedir}/lib/%{name}/scratchdir
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/hg
+%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/tar
 
 %files extras
 %defattr(-,root,root,-)
 %doc LICENSE README
-%config(noreplace) %{confdir}/10-extras.conf
+%config(noreplace) %{confdir}/80-vcs-extras.conf
 %{_datadir}/%{name}/vcs/lib/support/cvs.py
 %{_datadir}/%{name}/vcs/lib/support/cvs.py[co]
 %{_datadir}/%{name}/vcs/lib/types/cvs.py
@@ -173,6 +185,14 @@ fi
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Wed Apr 29 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.6-1
+- Upstream update
+  * Tarball support
+  * User notifications
+  * Multiple file support
+  * Archive downloading
+  * Many more (http://docs.transifex.org/releases/0.6.html)
+
 * Wed Apr 01 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5.2-1
 - Upstream update
   * Fixed ordering of components untranslated by a Release X Lang



From mjakubicek at fedoraproject.org  Wed Apr 29 20:59:17 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 20:59:17 +0000 (UTC)
Subject: rpms/avr-libc/F-11 avr-libc.spec,1.3,1.4
Message-ID: <20090429205918.0405470133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/avr-libc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28349/F-11

Modified Files:
	avr-libc.spec 
Log Message:
- Fix FTBFS: force noarch (see comment in the top of the spec file).




Index: avr-libc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avr-libc/F-11/avr-libc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- avr-libc.spec	24 Feb 2009 03:43:26 -0000	1.3
+++ avr-libc.spec	29 Apr 2009 20:58:47 -0000	1.4
@@ -1,6 +1,13 @@
+# FORCE NOARCH
+# This package is noarch intentionally, although it supplies binaries,
+# as they're not intended for the build platform, but for AVR.
+# The related discussion can be found here:
+# https://fcp.surfsite.org/modules/newbb/viewtopic.php?topic_id=68213&forum=11&post_id=328691
+%global _binaries_in_noarch_packages_terminate_build 0
+
 Name:           avr-libc
 Version:        1.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C library for use with GCC on Atmel AVR microcontrollers
 Group:          Development/Tools
 License:        BSD
@@ -96,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.6.4-3
+- Fix FTBFS: force noarch (see comment in the top of the spec file).
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 29 20:59:18 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 20:59:18 +0000 (UTC)
Subject: rpms/avr-libc/devel avr-libc.spec,1.3,1.4
Message-ID: <20090429205918.396F470133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/avr-libc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28349/devel

Modified Files:
	avr-libc.spec 
Log Message:
- Fix FTBFS: force noarch (see comment in the top of the spec file).




Index: avr-libc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avr-libc/devel/avr-libc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- avr-libc.spec	24 Feb 2009 03:43:26 -0000	1.3
+++ avr-libc.spec	29 Apr 2009 20:58:47 -0000	1.4
@@ -1,6 +1,13 @@
+# FORCE NOARCH
+# This package is noarch intentionally, although it supplies binaries,
+# as they're not intended for the build platform, but for AVR.
+# The related discussion can be found here:
+# https://fcp.surfsite.org/modules/newbb/viewtopic.php?topic_id=68213&forum=11&post_id=328691
+%global _binaries_in_noarch_packages_terminate_build 0
+
 Name:           avr-libc
 Version:        1.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C library for use with GCC on Atmel AVR microcontrollers
 Group:          Development/Tools
 License:        BSD
@@ -96,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.6.4-3
+- Fix FTBFS: force noarch (see comment in the top of the spec file).
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Apr 29 21:01:39 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 21:01:39 +0000 (UTC)
Subject: rpms/avr-libc/devel avr-libc.spec,1.4,1.5
Message-ID: <20090429210139.E12E370133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/avr-libc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28798/devel

Modified Files:
	avr-libc.spec 
Log Message:
- Link the discussion rather directly from f-d-l archive




Index: avr-libc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avr-libc/devel/avr-libc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- avr-libc.spec	29 Apr 2009 20:58:47 -0000	1.4
+++ avr-libc.spec	29 Apr 2009 21:01:09 -0000	1.5
@@ -2,7 +2,7 @@
 # This package is noarch intentionally, although it supplies binaries,
 # as they're not intended for the build platform, but for AVR.
 # The related discussion can be found here:
-# https://fcp.surfsite.org/modules/newbb/viewtopic.php?topic_id=68213&forum=11&post_id=328691
+# https://www.redhat.com/archives/fedora-devel-list/2009-February/msg02261.html
 %global _binaries_in_noarch_packages_terminate_build 0
 
 Name:           avr-libc



From mjakubicek at fedoraproject.org  Wed Apr 29 21:01:39 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 29 Apr 2009 21:01:39 +0000 (UTC)
Subject: rpms/avr-libc/F-11 avr-libc.spec,1.4,1.5
Message-ID: <20090429210139.BBA5670133@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/avr-libc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28798/F-11

Modified Files:
	avr-libc.spec 
Log Message:
- Link the discussion rather directly from f-d-l archive




Index: avr-libc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avr-libc/F-11/avr-libc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- avr-libc.spec	29 Apr 2009 20:58:47 -0000	1.4
+++ avr-libc.spec	29 Apr 2009 21:01:09 -0000	1.5
@@ -2,7 +2,7 @@
 # This package is noarch intentionally, although it supplies binaries,
 # as they're not intended for the build platform, but for AVR.
 # The related discussion can be found here:
-# https://fcp.surfsite.org/modules/newbb/viewtopic.php?topic_id=68213&forum=11&post_id=328691
+# https://www.redhat.com/archives/fedora-devel-list/2009-February/msg02261.html
 %global _binaries_in_noarch_packages_terminate_build 0
 
 Name:           avr-libc



From transif at fedoraproject.org  Wed Apr 29 21:08:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 29 Apr 2009 21:08:04 +0000 (UTC)
Subject: comps/po sr.po,1.25,1.26
Message-ID: <20090429210804.2CD3470133@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30042/po

Modified Files:
	sr.po 
Log Message:
Sending translation for Serbian


Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sr.po	29 Apr 2009 20:00:23 -0000	1.25
+++ sr.po	29 Apr 2009 21:07:33 -0000	1.26
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-14 19:16+0100\n"
+"POT-Creation-Date: 2009-04-29 19:06+0000\n"
+"PO-Revision-Date: 2009-04-29 22:03+0100\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -1193,7 +1193,7 @@ msgstr "?????????????? ???? ????????????
 #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:150
 msgid "Older bitmap and vector fonts packages"
-msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"
+msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
 msgid "Esperanto Support"
@@ -1287,19 +1287,16 @@ msgid "Amazigh Support"
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????????????????????"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1310,9 +1307,8 @@ msgid "Electronic Lab"
 msgstr "?????????????????????????????? ????????????????????????"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "?????????????? ???? ??????????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1327,47 +1323,40 @@ msgid "Friulian Support"
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "?????????????? ???? ??????????????????????"
+msgstr "?????????????? ???? ??????????????????????"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????????????"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????????????"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1386,14 +1375,12 @@ msgid "Online Help and Documentation"
 msgstr "?????????? ?? ?????????????????????????? ???? ??????????"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ??????????????????????"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1416,14 +1403,12 @@ msgstr ""
 "????????????????????."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "?????????????? ???? ??????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""



From transif at fedoraproject.org  Wed Apr 29 21:09:55 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 29 Apr 2009 21:09:55 +0000 (UTC)
Subject: comps/po sr@latin.po,1.25,1.26
Message-ID: <20090429210955.9879E70133@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30574/po

Modified Files:
	sr at latin.po 
Log Message:
Sending translation for po/sr at latin.po


Index: sr at latin.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at latin.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sr at latin.po	29 Apr 2009 20:00:23 -0000	1.25
+++ sr at latin.po	29 Apr 2009 21:09:25 -0000	1.26
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-14 19:16+0100\n"
+"POT-Creation-Date: 2009-04-29 19:06+0000\n"
+"PO-Revision-Date: 2009-04-29 22:03+0100\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -1193,7 +1193,7 @@ msgstr "Podr??ka za nepalski"
 #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:150
 msgid "Older bitmap and vector fonts packages"
-msgstr "Stariji paketi batmapiranih i vektorskih fontova"
+msgstr "Stariji paketi bitmapiranih i vektorskih fontova"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
 msgid "Esperanto Support"
@@ -1287,19 +1287,16 @@ msgid "Amazigh Support"
 msgstr "Podr??ka za amazig"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "Podr??ka za srpski"
+msgstr "Podr??ka za azerbejd??anski"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "Podr??ka za kineski"
+msgstr "Podr??ka za ??i??evu"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "Podr??ka za hrvatski"
+msgstr "Podr??ka za koptski"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1310,9 +1307,8 @@ msgid "Electronic Lab"
 msgstr "Elektroni??arska laboratorija"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "Podr??ka za frizijski"
+msgstr "Podr??ka za fid??ijan"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1327,47 +1323,40 @@ msgid "Friulian Support"
 msgstr "Podr??ka za furlanski"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "Podr??ka za filipinski"
+msgstr "Podr??ka za hiligajnon"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "Podr??ka za italijanski"
+msgstr "Podr??ka za interlingvu"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "Podr??ka za kanadu"
+msgstr "Podr??ka za kazahstanski"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "Podr??ka za kinjaruandu"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "Podr??ka za letonski"
+msgstr "Podr??ka za latinski"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "Podr??ka za turski"
+msgstr "Podr??ka za luksembur??ki"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "Podr??ka za malagasi"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "Podr??ka za malajski"
+msgstr "Podr??ka za malte??ki"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "Podr??ka za malajski"
+msgstr "Podr??ka za manski"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1386,14 +1375,12 @@ msgid "Online Help and Documentation"
 msgstr "Pomo?? i dokumentacija na mre??i"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "Podr??ka za ??panski"
+msgstr "Podr??ka za sanskrit"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "Podr??ka za ukrajinski"
+msgstr "Podr??ka za sardinijski"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1416,14 +1403,12 @@ msgstr ""
 "biblioteke."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "Podr??ka za svati"
+msgstr "Podr??ka za svahili"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "Podr??ka za telugu"
+msgstr "Podr??ka za tetum"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""



From orion at fedoraproject.org  Wed Apr 29 21:15:13 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 29 Apr 2009 21:15:13 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore, 1.27, 1.28 cmake.spec, 1.56,
	1.57 sources, 1.27, 1.28 cmake-2.6.3-#475876.patch, 1.1, NONE
Message-ID: <20090429211513.3B67170133@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31697

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.6.3-#475876.patch 
Log Message:
* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
- Update to 2.6.4
- Drop patch for bug #475876 fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	24 Feb 2009 04:23:11 -0000	1.27
+++ .cvsignore	29 Apr 2009 21:14:42 -0000	1.28
@@ -1 +1 @@
-cmake-2.6.3.tar.gz
+cmake-2.6.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- cmake.spec	16 Mar 2009 16:20:14 -0000	1.56
+++ cmake.spec	29 Apr 2009 21:14:42 -0000	1.57
@@ -7,8 +7,8 @@
 %define rcver %{nil}
 
 Name:           cmake
-Version:        2.6.3
-Release:        3%{?dist}
+Version:        2.6.4
+Release:        1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -18,7 +18,6 @@ Source0:        http://www.cmake.org/fil
 Source2:        macros.cmake
 # fix crash during kdepimlibs build
 # https://bugzilla.redhat.com/show_bug.cgi?id=475876
-Patch0:         cmake-2.6.3-#475876.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -53,7 +52,6 @@ The %{name}-gui package contains the Qt 
 
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
-%patch0 -p1 -b .475876
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -132,6 +130,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop patch for bug #475876 fixed upstream
+
 * Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
 - macros.cmake: +%%_cmake_version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	24 Feb 2009 04:23:11 -0000	1.27
+++ sources	29 Apr 2009 21:14:42 -0000	1.28
@@ -1 +1 @@
-5ba47a94ce276f326abca1fd72a7e7c6  cmake-2.6.3.tar.gz
+50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz


--- cmake-2.6.3-#475876.patch DELETED ---



From pjones at fedoraproject.org  Wed Apr 29 21:28:09 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Wed, 29 Apr 2009 21:28:09 +0000 (UTC)
Subject: rpms/grub/F-11 grub-install_virtio_blk_support.patch, NONE,
	1.1 grub-low-memory.patch, NONE, 1.1 grub.spec, 1.94, 1.95
Message-ID: <20090429212809.563CD70133@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3219

Modified Files:
	grub.spec 
Added Files:
	grub-install_virtio_blk_support.patch grub-low-memory.patch 
Log Message:
* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
- Handle virtio_blk disks and their crazy new device name in grub-install
  (rhbz#479760)


grub-install_virtio_blk_support.patch:

--- NEW FILE grub-install_virtio_blk_support.patch ---
diff -ur grub-0.97.orig/util/grub-install.in grub-0.97/util/grub-install.in
--- grub-0.97.orig/util/grub-install.in	2009-01-12 21:47:56.000000000 -0500
+++ grub-0.97/util/grub-install.in	2009-01-12 21:48:16.000000000 -0500
@@ -102,7 +102,7 @@
     linux*)
 	tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
-		sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+		sed -e 's%\([shv]d[a-z]\)[0-9]*$%\1%' \
 				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 				  -e 's%\(fd[0-9]*\)$%\1%' \
 				  -e 's%/part[0-9]*$%/disc%' \
@@ -112,7 +112,7 @@
 	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
-		sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+		sed -e 's%.*/[shv]d[a-z]\([0-9]*\)$%\1%' \
 				  -e 's%.*d[0-9]*p%%' \
 				  -e 's%.*/fd[0-9]*$%%' \
 				  -e 's%.*/floppy/[0-9]*$%%' \

grub-low-memory.patch:

--- NEW FILE grub-low-memory.patch ---
From: Peter Jones
Date: Thu, Apr 16 2009 16:16:00 -0500
Subject: [PATCH] allocate low memory at bottom of memory instead of top.

Don't allocate the low memory area above 1GB, as the kernel doesn't map that
during early boot.

diff -urpN grub-0.97/efi/x86_64/loader/linux.c.lowmem grub-0.97/efi/x86_64/loader/linux.c
--- grub-0.97/efi/x86_64/loader/linux.c.lowmem	2009-04-16 16:56:32.000000000 -0400
+++ grub-0.97/efi/x86_64/loader/linux.c	2009-04-16 16:57:38.000000000 -0400
@@ -169,16 +169,24 @@ allocate_pages (grub_size_t real_size, g
 	  && desc->num_pages >= real_mode_pages)
 	{
 	  grub_efi_physical_address_t physical_end;
+          int allocsize = real_size + mmap_size;
 
           physical_end = desc->physical_start + (desc->num_pages << 12);
 
           grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n",
                         (unsigned) desc->physical_start,
                         (unsigned) physical_end);
-          addr = physical_end - real_size - mmap_size;
+          addr = physical_end - allocsize;
           if (addr < 0x10000)
             continue;
 
+          /* the kernel wants this address to be under 1 gig.*/
+          if (desc->physical_start > 0x40000000 - allocsize)
+            continue;
+
+          if (addr > 0x40000000 - allocsize)
+            addr = 0x40000000 - allocsize;
+
           grub_dprintf ("linux", "trying to allocate %u pages at %x\n",
                         (unsigned) real_mode_pages, (unsigned) addr);
           real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages);


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/F-11/grub.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- grub.spec	9 Apr 2009 21:23:16 -0000	1.94
+++ grub.spec	29 Apr 2009 21:27:38 -0000	1.95
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 48%{?dist}
+Release: 50%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -40,6 +40,8 @@ Patch11: grub-0.97-efistatus.patch
 Patch12: grub-0.97-fat-lowercase.patch
 Patch13: grub-0.97-efipxe.patch
 Patch14: grub-0.97-tolower.patch
+Patch15: grub-low-memory.patch
+Patch16: grub-install_virtio_blk_support.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -64,6 +66,8 @@ systems.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 autoreconf
@@ -126,6 +130,14 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
+- Handle virtio_blk disks and their crazy new device name in grub-install
+  (rhbz#479760)
+
+* Thu Apr 16 2009 Peter Jones <pjones at redhat.com> - 0.97-49
+- Fix efi booting on machines with continguous memory regions across
+  the 1G boundary.
+
 * Thu Apr 09 2009 Peter Jones <pjones at redhat.com> - 0.97-48
 - remove test message Re: using network drive or not.
 



From pjones at fedoraproject.org  Wed Apr 29 21:28:26 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Wed, 29 Apr 2009 21:28:26 +0000 (UTC)
Subject: rpms/grub/devel grub-install_virtio_blk_support.patch, NONE,
	1.1 grub.spec, 1.95, 1.96
Message-ID: <20090429212826.CEFE770133@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3281

Modified Files:
	grub.spec 
Added Files:
	grub-install_virtio_blk_support.patch 
Log Message:
* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
- Handle virtio_blk disks and their crazy new device name in grub-install
  (rhbz#479760)


grub-install_virtio_blk_support.patch:

--- NEW FILE grub-install_virtio_blk_support.patch ---
diff -ur grub-0.97.orig/util/grub-install.in grub-0.97/util/grub-install.in
--- grub-0.97.orig/util/grub-install.in	2009-01-12 21:47:56.000000000 -0500
+++ grub-0.97/util/grub-install.in	2009-01-12 21:48:16.000000000 -0500
@@ -102,7 +102,7 @@
     linux*)
 	tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
-		sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+		sed -e 's%\([shv]d[a-z]\)[0-9]*$%\1%' \
 				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 				  -e 's%\(fd[0-9]*\)$%\1%' \
 				  -e 's%/part[0-9]*$%/disc%' \
@@ -112,7 +112,7 @@
 	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
-		sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+		sed -e 's%.*/[shv]d[a-z]\([0-9]*\)$%\1%' \
 				  -e 's%.*d[0-9]*p%%' \
 				  -e 's%.*/fd[0-9]*$%%' \
 				  -e 's%.*/floppy/[0-9]*$%%' \


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- grub.spec	16 Apr 2009 20:38:11 -0000	1.95
+++ grub.spec	29 Apr 2009 21:27:56 -0000	1.96
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 49%{?dist}
+Release: 50%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -41,6 +41,7 @@ Patch12: grub-0.97-fat-lowercase.patch
 Patch13: grub-0.97-efipxe.patch
 Patch14: grub-0.97-tolower.patch
 Patch15: grub-low-memory.patch
+Patch16: grub-install_virtio_blk_support.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -66,6 +67,7 @@ systems.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 autoreconf
@@ -128,6 +130,10 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
+- Handle virtio_blk disks and their crazy new device name in grub-install
+  (rhbz#479760)
+
 * Thu Apr 16 2009 Peter Jones <pjones at redhat.com> - 0.97-49
 - Fix efi booting on machines with continguous memory regions across
   the 1G boundary.



From laxathom at fedoraproject.org  Wed Apr 29 21:38:00 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Wed, 29 Apr 2009 21:38:00 +0000 (UTC)
Subject: rpms/wammu/devel sources,1.7,1.8 wammu.spec,1.12,1.13
Message-ID: <20090429213800.06D4D70135@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/wammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5863/devel

Modified Files:
	sources wammu.spec 
Log Message:
Update release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wammu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Dec 2008 23:22:11 -0000	1.7
+++ sources	29 Apr 2009 21:37:29 -0000	1.8
@@ -1 +1 @@
-a0dbda9ec5f851920ae83c7f303b12a1  wammu-0.29.tar.bz2
+adb6ba4974204f7075f4dc423615ded0  wammu-0.30.1.tar.bz2


Index: wammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wammu/devel/wammu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wammu.spec	25 Feb 2009 18:05:49 -0000	1.12
+++ wammu.spec	29 Apr 2009 21:37:29 -0000	1.13
@@ -1,8 +1,8 @@
 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
 
 Name:		wammu
-Version:	0.29
-Release:	4%{?dist}
+Version:	0.30.1
+Release:	1%{?dist}
 Summary:	Mobile Phone Manager - Gammu GUI
 
 Group:		Applications/Communications
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Xavier Lamien <lxtnow[at]gmail.com> - 0.30.1-1
+- Update release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From laxathom at fedoraproject.org  Wed Apr 29 21:37:59 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Wed, 29 Apr 2009 21:37:59 +0000 (UTC)
Subject: rpms/wammu/F-11 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 wammu.spec, 
	1.12, 1.13
Message-ID: <20090429213759.E72C170133@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/wammu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5863/F-11

Modified Files:
	.cvsignore sources wammu.spec 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wammu/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Dec 2008 23:22:11 -0000	1.7
+++ .cvsignore	29 Apr 2009 21:37:29 -0000	1.8
@@ -1,2 +1 @@
-wammu-0.28.tar.bz2
-wammu-0.29.tar.bz2
+wammu-0.30.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wammu/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Dec 2008 23:22:11 -0000	1.7
+++ sources	29 Apr 2009 21:37:29 -0000	1.8
@@ -1 +1 @@
-a0dbda9ec5f851920ae83c7f303b12a1  wammu-0.29.tar.bz2
+adb6ba4974204f7075f4dc423615ded0  wammu-0.30.1.tar.bz2


Index: wammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wammu/F-11/wammu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wammu.spec	25 Feb 2009 18:05:49 -0000	1.12
+++ wammu.spec	29 Apr 2009 21:37:29 -0000	1.13
@@ -1,8 +1,8 @@
 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
 
 Name:		wammu
-Version:	0.29
-Release:	4%{?dist}
+Version:	0.30.1
+Release:	1%{?dist}
 Summary:	Mobile Phone Manager - Gammu GUI
 
 Group:		Applications/Communications
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Xavier Lamien <lxtnow[at]gmail.com> - 0.30.1-1
+- Update release.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From orion at fedoraproject.org  Wed Apr 29 21:39:22 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 29 Apr 2009 21:39:22 +0000 (UTC)
Subject: rpms/cmake/F-11 .cvsignore, 1.27, 1.28 cmake.spec, 1.56,
	1.57 sources, 1.27, 1.28 cmake-2.6.3-#475876.patch, 1.1, NONE
Message-ID: <20090429213922.58A0F70133@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6142

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.6.3-#475876.patch 
Log Message:
* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
- Update to 2.6.4
- Drop patch for bug #475876 fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	24 Feb 2009 04:23:11 -0000	1.27
+++ .cvsignore	29 Apr 2009 21:38:51 -0000	1.28
@@ -1 +1 @@
-cmake-2.6.3.tar.gz
+cmake-2.6.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-11/cmake.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- cmake.spec	16 Mar 2009 16:20:14 -0000	1.56
+++ cmake.spec	29 Apr 2009 21:38:51 -0000	1.57
@@ -7,8 +7,8 @@
 %define rcver %{nil}
 
 Name:           cmake
-Version:        2.6.3
-Release:        3%{?dist}
+Version:        2.6.4
+Release:        1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -18,7 +18,6 @@ Source0:        http://www.cmake.org/fil
 Source2:        macros.cmake
 # fix crash during kdepimlibs build
 # https://bugzilla.redhat.com/show_bug.cgi?id=475876
-Patch0:         cmake-2.6.3-#475876.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -53,7 +52,6 @@ The %{name}-gui package contains the Qt 
 
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
-%patch0 -p1 -b .475876
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -132,6 +130,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop patch for bug #475876 fixed upstream
+
 * Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
 - macros.cmake: +%%_cmake_version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	24 Feb 2009 04:23:11 -0000	1.27
+++ sources	29 Apr 2009 21:38:52 -0000	1.28
@@ -1 +1 @@
-5ba47a94ce276f326abca1fd72a7e7c6  cmake-2.6.3.tar.gz
+50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz


--- cmake-2.6.3-#475876.patch DELETED ---



From caolanm at fedoraproject.org  Wed Apr 29 21:54:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 29 Apr 2009 21:54:31 +0000 (UTC)
Subject: rpms/libgsf/devel .cvsignore, 1.24, 1.25 libgsf.spec, 1.66,
	1.67 sources, 1.24, 1.25 libgsf-1.14.11.gcc39015.patch, 1.1, NONE
Message-ID: <20090429215432.0DADE70133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10180

Modified Files:
	.cvsignore libgsf.spec sources 
Removed Files:
	libgsf-1.14.11.gcc39015.patch 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	7 Jan 2009 09:12:40 -0000	1.24
+++ .cvsignore	29 Apr 2009 21:54:30 -0000	1.25
@@ -1 +1 @@
-libgsf-1.14.11.tar.bz2
+libgsf-1.14.12.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- libgsf.spec	25 Feb 2009 15:29:25 -0000	1.66
+++ libgsf.spec	29 Apr 2009 21:54:30 -0000	1.67
@@ -3,8 +3,8 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.11
-Release: 3%{?dist}
+Version: 1.14.12
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
@@ -17,8 +17,6 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Patch0: libgsf-1.14.11.gcc39015.patch
-
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
 
@@ -59,7 +57,6 @@ Python bindings for libgsf
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc39015
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -135,6 +132,9 @@ fi
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 29 2009 Caol??n McNamara <caolanm at redhat.com> 1.14.12-1
+- latest version, drop integrated libgsf-1.14.11.gcc39015.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	7 Jan 2009 09:12:41 -0000	1.24
+++ sources	29 Apr 2009 21:54:30 -0000	1.25
@@ -1 +1 @@
-86bec0012435fbafe02a6e4c88bdf9ba  libgsf-1.14.11.tar.bz2
+dc7534e8f80775ab157779cc3b3c84f1  libgsf-1.14.12.tar.bz2


--- libgsf-1.14.11.gcc39015.patch DELETED ---



From simo at fedoraproject.org  Wed Apr 29 22:02:43 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 29 Apr 2009 22:02:43 +0000 (UTC)
Subject: rpms/sssd/F-11
	0001-reuse-authtok-which-is-already-in-the-pam-stack.patch, NONE,
	1.1 sssd.spec, 1.15, 1.16
Message-ID: <20090429220243.9B55D70133@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12095

Modified Files:
	sssd.spec 
Added Files:
	0001-reuse-authtok-which-is-already-in-the-pam-stack.patch 
Log Message:
* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-2
- Add use_first_pass option to fix pam stack problems


0001-reuse-authtok-which-is-already-in-the-pam-stack.patch:

--- NEW FILE 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch ---
>From 98bb277b9271e5e9175180685d647909b89c06aa Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Wed, 29 Apr 2009 21:11:05 +0200
Subject: [PATCH] reuse authtok which is already in the pam stack

---
 sss_client/pam_sss.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sss_client/pam_sss.c b/sss_client/pam_sss.c
index d03407c..f2fdefe 100644
--- a/sss_client/pam_sss.c
+++ b/sss_client/pam_sss.c
@@ -149,8 +149,10 @@ static void print_pam_items(struct pam_items pi)
     D(("Tty: %s", *pi.pam_tty!='\0' ? pi.pam_tty : "(not available)"));
     D(("Ruser: %s", *pi.pam_ruser!='\0' ? pi.pam_ruser : "(not available)"));
     D(("Rhost: %s", *pi.pam_rhost!='\0' ? pi.pam_rhost : "(not available)"));
-    D(("Authtok: %s", *pi.pamstack_authtok!='\0' ? pi.pamstack_authtok : "(not available)"));
-    D(("Oldauthtok: %s", *pi.pamstack_oldauthtok!='\0' ? pi.pamstack_oldauthtok : "(not available)"));
+    D(("Pamstack_Authtok: %s", *pi.pamstack_authtok!='\0' ? pi.pamstack_authtok : "(not available)"));
+    D(("Pamstack_Oldauthtok: %s", *pi.pamstack_oldauthtok!='\0' ? pi.pamstack_oldauthtok : "(not available)"));
+    D(("Authtok: %s", *pi.pam_authtok!='\0' ? pi.pam_authtok : "(not available)"));
+    D(("Newauthtok: %s", *pi.pam_newauthtok!='\0' ? pi.pam_newauthtok : "(not available)"));
 }
 
 static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
@@ -171,12 +173,15 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
     int pam_status;
     char *newpwd[2];
     int forward_pass = 0;
+    int use_first_pass = 0;
 
     D(("Hello pam_sssd: %d", task));
 
     for (; argc-- > 0; ++argv) {
         if (strcmp(*argv, "forward_pass") == 0) {
             forward_pass = 1;
+        } else if (strcmp(*argv, "use_first_pass") == 0) {
+            use_first_pass = 1;
         } else {
             D(("unknown option: %s", *argv));
         }
@@ -194,6 +199,16 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
         return ret;
     }
 
+    if (use_first_pass != 0 &&
+        (*pi.pamstack_authtok != '\0' || *pi.pamstack_oldauthtok != '\0') &&
+        (task == SSS_PAM_AUTHENTICATE || task == SSS_PAM_CHAUTHTOK)) {
+        pi.pam_authtok_type = SSS_AUTHTOK_TYPE_PASSWORD;
+        pi.pam_authtok = strdup(pi.pamstack_authtok);
+        pi.pam_authtok_size = strlen(pi.pamstack_authtok);
+        pi.pam_newauthtok_type = SSS_AUTHTOK_TYPE_PASSWORD;
+        pi.pam_newauthtok =  strdup(pi.pamstack_oldauthtok);
+        pi.pam_newauthtok_size = strlen(pi.pamstack_oldauthtok);
+    } else {
     pi.pam_authtok_type = SSS_AUTHTOK_TYPE_EMPTY;
     pi.pam_authtok = NULL;
     pi.pam_authtok_size = 0;
@@ -297,6 +312,7 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
         _pam_overwrite((void *)newpwd[1]);
         free(newpwd[1]);
     }
+    }
 
     print_pam_items(pi);
 
-- 
1.6.0.6



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sssd.spec	28 Apr 2009 17:49:58 -0000	1.15
+++ sssd.spec	29 Apr 2009 22:02:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -17,6 +17,7 @@ Patch1: 0001-Use-different-attribute-for
 Patch2: 0001-Use-different-attribute-for-cached-passwords-change.patch
 Patch3: 0001-enable-offline-handling-for-native-LDAP-backend.patch
 Patch4: 0001-handle-other-pam-calls-when-offline.patch
+Patch5: 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch
 
 ### Dependencies ###
 
@@ -59,6 +60,7 @@ services for projects like FreeIPA.
 %patch2 -p 1 -b .pwd-cache-attr
 %patch3 -p 1 -b .ldap-offline
 %patch4 -p 1 -b .pam-offline
+%patch5 -p 1 -b .use_first_pass
 
 %build
 
@@ -147,6 +149,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-2
+- Add use_first_pass option to fix pam stack problems
+
 * Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1
 - Add patches to fix password caches when offline
 



From simo at fedoraproject.org  Wed Apr 29 22:05:01 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Wed, 29 Apr 2009 22:05:01 +0000 (UTC)
Subject: rpms/sssd/F-11
	0001-reuse-authtok-which-is-already-in-the-pam-stack.patch, 1.1,
	1.2 sssd.spec, 1.16, 1.17
Message-ID: <20090429220501.098C970133@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12695

Modified Files:
	0001-reuse-authtok-which-is-already-in-the-pam-stack.patch 
	sssd.spec 
Log Message:
* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-3
- Add use_first_pass option to fix pam stack problems


0001-reuse-authtok-which-is-already-in-the-pam-stack.patch:

Index: 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/0001-reuse-authtok-which-is-already-in-the-pam-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch	29 Apr 2009 22:02:13 -0000	1.1
+++ 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch	29 Apr 2009 22:05:00 -0000	1.2
@@ -1,17 +1,17 @@
->From 98bb277b9271e5e9175180685d647909b89c06aa Mon Sep 17 00:00:00 2001
+>From 1560c380c7180a21c69f0828bd9439c2044282d9 Mon Sep 17 00:00:00 2001
 From: Sumit Bose <sbose at redhat.com>
 Date: Wed, 29 Apr 2009 21:11:05 +0200
 Subject: [PATCH] reuse authtok which is already in the pam stack
 
 ---
- sss_client/pam_sss.c |   20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
+ sss_client/pam_sss.c |   24 ++++++++++++++++++++++--
+ 1 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/sss_client/pam_sss.c b/sss_client/pam_sss.c
-index d03407c..f2fdefe 100644
+index d03407c..b7588ca 100644
 --- a/sss_client/pam_sss.c
 +++ b/sss_client/pam_sss.c
-@@ -149,8 +149,10 @@ static void print_pam_items(struct pam_items pi)
+@@ -149,8 +149,14 @@ static void print_pam_items(struct pam_items pi)
      D(("Tty: %s", *pi.pam_tty!='\0' ? pi.pam_tty : "(not available)"));
      D(("Ruser: %s", *pi.pam_ruser!='\0' ? pi.pam_ruser : "(not available)"));
      D(("Rhost: %s", *pi.pam_rhost!='\0' ? pi.pam_rhost : "(not available)"));
@@ -19,12 +19,16 @@ index d03407c..f2fdefe 100644
 -    D(("Oldauthtok: %s", *pi.pamstack_oldauthtok!='\0' ? pi.pamstack_oldauthtok : "(not available)"));
 +    D(("Pamstack_Authtok: %s", *pi.pamstack_authtok!='\0' ? pi.pamstack_authtok : "(not available)"));
 +    D(("Pamstack_Oldauthtok: %s", *pi.pamstack_oldauthtok!='\0' ? pi.pamstack_oldauthtok : "(not available)"));
-+    D(("Authtok: %s", *pi.pam_authtok!='\0' ? pi.pam_authtok : "(not available)"));
-+    D(("Newauthtok: %s", *pi.pam_newauthtok!='\0' ? pi.pam_newauthtok : "(not available)"));
++    if (pi.pam_authtok != NULL) {
++        D(("Authtok: %s", *pi.pam_authtok!='\0' ? pi.pam_authtok : "(not available)"));
++    }
++    if (pi.pam_newauthtok != NULL) {
++        D(("Newauthtok: %s", *pi.pam_newauthtok!='\0' ? pi.pam_newauthtok : "(not available)"));
++    }
  }
  
  static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
-@@ -171,12 +173,15 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
+@@ -171,12 +177,15 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
      int pam_status;
      char *newpwd[2];
      int forward_pass = 0;
@@ -40,7 +44,7 @@ index d03407c..f2fdefe 100644
          } else {
              D(("unknown option: %s", *argv));
          }
-@@ -194,6 +199,16 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
+@@ -194,6 +203,16 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
          return ret;
      }
  
@@ -57,7 +61,7 @@ index d03407c..f2fdefe 100644
      pi.pam_authtok_type = SSS_AUTHTOK_TYPE_EMPTY;
      pi.pam_authtok = NULL;
      pi.pam_authtok_size = 0;
-@@ -297,6 +312,7 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
+@@ -297,6 +316,7 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
          _pam_overwrite((void *)newpwd[1]);
          free(newpwd[1]);
      }


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sssd.spec	29 Apr 2009 22:02:13 -0000	1.16
+++ sssd.spec	29 Apr 2009 22:05:00 -0000	1.17
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -149,7 +149,7 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
-* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-2
+* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-3
 - Add use_first_pass option to fix pam stack problems
 
 * Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1



From orion at fedoraproject.org  Wed Apr 29 22:10:08 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 29 Apr 2009 22:10:08 +0000 (UTC)
Subject: rpms/cmake/F-10 .cvsignore, 1.24, 1.25 cmake.spec, 1.49,
	1.50 sources, 1.24, 1.25 cmake-2.6.3-#475876.patch, 1.1, NONE
Message-ID: <20090429221008.4A18070133@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13488

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.6.3-#475876.patch 
Log Message:
* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
- Update to 2.6.4
- Drop patch for bug #475876 fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	10 Mar 2009 06:22:59 -0000	1.24
+++ .cvsignore	29 Apr 2009 22:09:37 -0000	1.25
@@ -1 +1 @@
-cmake-2.6.3.tar.gz
+cmake-2.6.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/cmake.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- cmake.spec	24 Mar 2009 13:49:56 -0000	1.49
+++ cmake.spec	29 Apr 2009 22:09:37 -0000	1.50
@@ -7,8 +7,8 @@
 %define rcver %{nil}
 
 Name:           cmake
-Version:        2.6.3
-Release:        3%{?dist}
+Version:        2.6.4
+Release:        1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -18,7 +18,6 @@ Source0:        http://www.cmake.org/fil
 Source2:        macros.cmake
 # fix crash during kdepimlibs build
 # https://bugzilla.redhat.com/show_bug.cgi?id=475876
-Patch0:         cmake-2.6.3-#475876.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -53,7 +52,6 @@ The %{name}-gui package contains the Qt 
 
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
-%patch0 -p1 -b .475876
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -132,6 +130,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop patch for bug #475876 fixed upstream
+
 * Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
 - macros.cmake: +%%_cmake_version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Mar 2009 06:22:59 -0000	1.24
+++ sources	29 Apr 2009 22:09:37 -0000	1.25
@@ -1 +1 @@
-5ba47a94ce276f326abca1fd72a7e7c6  cmake-2.6.3.tar.gz
+50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz


--- cmake-2.6.3-#475876.patch DELETED ---



From transif at fedoraproject.org  Wed Apr 29 22:16:29 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 29 Apr 2009 22:16:29 +0000 (UTC)
Subject: comps/po pl.po,1.26,1.27
Message-ID: <20090429221629.60ABF70133@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14558/po

Modified Files:
	pl.po 
Log Message:
Sending translation for Polish


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pl.po	29 Apr 2009 20:00:22 -0000	1.26
+++ pl.po	29 Apr 2009 22:15:58 -0000	1.27
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-15 18:28+0100\n"
+"POT-Creation-Date: 2009-04-29 19:06+0000\n"
+"PO-Revision-Date: 2009-04-30 00:01+0200\n"
 "Last-Translator: Piotr Dr??g <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1288,19 +1288,16 @@ msgid "Amazigh Support"
 msgstr "Obs??uga amazigh"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "Obs??uga serbskiego"
+msgstr "Obs??uga azerbejd??a??skiego"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "Obs??uga chi??skiego"
+msgstr "Obs??uga cziczewa"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "Obs??uga chorwackiego"
+msgstr "Obs??uga koptyjskiego"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1311,9 +1308,8 @@ msgid "Electronic Lab"
 msgstr "Laboratorium elektroniczne"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "Obs??uga fryzyjskiego"
+msgstr "Obs??uga fid??yjskiego"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1328,47 +1324,40 @@ msgid "Friulian Support"
 msgstr "Obs??uga friulskiego"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "Obs??uga pilipino"
+msgstr "Obs??uga hiligaynon"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "Obs??uga w??oskiego"
+msgstr "Obs??uga interlingua"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "Obs??uga kannada"
+msgstr "Obs??uga kazachskiego"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "Obs??uga kinyarwanda"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "Obs??uga ??otewskiego"
+msgstr "Obs??uga ??aciny"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "Obs??uga tureckiego"
+msgstr "Obs??uga luksemburskiego"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "Obs??uga malgaskiego"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "Obs??uga malajskiego"
+msgstr "Obs??uga malta??skiego"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "Obs??uga malajskiego"
+msgstr "Obs??uga manx"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1387,14 +1376,12 @@ msgid "Online Help and Documentation"
 msgstr "Pomoc i dokumentacja online"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "Obs??uga hiszpa??skiego"
+msgstr "Obs??uga sanskrytu"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "Obs??uga ukrai??skiego"
+msgstr "Obs??uga sardy??skiego"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1417,14 +1404,12 @@ msgstr ""
 "bibliotek CAML."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "Obs??uga suazi"
+msgstr "Obs??uga suahili"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "Obs??uga telugu"
+msgstr "Obs??uga tetum"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""



From transif at fedoraproject.org  Wed Apr 29 22:33:40 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 29 Apr 2009 22:33:40 +0000 (UTC)
Subject: comps/po es.po,1.32,1.33
Message-ID: <20090429223340.98E4870133@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17895/po

Modified Files:
	es.po 
Log Message:
Sending translation for Spanish


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.32 -r 1.33 es.po
Index: es.po
===================================================================
RCS file: /cvs/pkgs/comps/po/es.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- es.po	29 Apr 2009 20:00:18 -0000	1.32
+++ es.po	29 Apr 2009 22:33:09 -0000	1.33
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-15 21:24-0300\n"
+"POT-Creation-Date: 2009-04-29 19:06+0000\n"
+"PO-Revision-Date: 2009-04-29 19:25-0300\n"
 "Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,199 +19,320 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Spanish\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un entorno de escritorio liviano que funciona bien en m??quinas peque??as."
+msgstr "Un entorno de escritorio liviano que funciona bien en m??quinas peque??as."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Herramientas de Administraci??n"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "Soporte para africano"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "Soporte para alban??s"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Soporte para ??rabe"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Soporte para armenio"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "Soporte para assam??s"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autor??a y publicaci??n"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema Base"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
 msgid "Basic support for the Ruby programming language."
 msgstr "Soporte b??sico para el lenguaje de programaci??n Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
 msgid "Basque Support"
 msgstr "Soporte para vascuence"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
 msgid "Belarusian Support"
 msgstr "Soporte para bielorruso"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:19
 msgid "Bengali Support"
 msgstr "Soporte para bengal??"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f7.xml.in.h:17
[...2425 lines suppressed...]
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "Soporte para malayo"
+msgstr "Soporte para manx"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1413,52 +1981,36 @@ msgid "Online Help and Documentation"
 msgstr "Ayuda y Documentaci??n en linea"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "Soporte para espa??ol"
+msgstr "Soporte para s??nscrito"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "Soporte para ucraniano "
+msgstr "Soporte para sardino"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
 msgstr "Entorno de Escritorio Sugar"
 
 #: ../comps-f11.xml.in.h:183
-msgid ""
-"Support for cross-compiling programs to 32 bit Windows targets, testing "
-"them, and building installers, all from within Fedora."
-msgstr ""
-"Soporte para compilar programas a objetivos de 32 bit, probarlos y crear "
-"instaladores, todo desde dentro de Fedora."
+msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora."
+msgstr "Soporte para compilar programas a objetivos de 32 bit, probarlos y crear instaladores, todo desde dentro de Fedora."
 
 #: ../comps-f11.xml.in.h:186
-msgid ""
-"Support for developing software using the Objective CAML programming "
-"language and libraries."
-msgstr ""
-"Soporte para el desarrollo de programas en el lenguaje de programaci??n "
-"Objective CAML y las bibliotecas."
+msgid "Support for developing software using the Objective CAML programming language and libraries."
+msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci??n Objective CAML y las bibliotecas."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "Soporte para Swati"
+msgstr "Soporte para suahili"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "Soporte para telugu"
+msgstr "Soporte para tetum"
 
 #: ../comps-f11.xml.in.h:223
-msgid ""
-"This group is a collection of tools used in the design, modification, "
-"manipulation, and packaging of fonts."
-msgstr ""
-"Este grupo es un conjunto de herramientas que se usan en el dise??o, "
-"modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)."
+msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts."
+msgstr "Este grupo es un conjunto de herramientas que se usan en el dise??o, modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)."
 
 #: ../comps-f11.xml.in.h:235
 msgid "Turkmen Support"
@@ -1468,82 +2020,70 @@ msgstr "Soporte para turkmenio"
 msgid "Upper Sorbian Support"
 msgstr "Soporte para serbio arribe??o"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Soporte de red mediante discado"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un "
-"escritorio, iconos del sistema y gestores gr??ficos de archivos."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un "
-"escritorio, iconos del sistema y un gestor gr??fico de archivos. "
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Existen programas que permiten crear y modificar archivos, a veces llamados "
-"editores de texto. Estos incluyen Emacs y Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un escritorio, iconos del sistema y gestores gr??ficos de archivos."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un escritorio, iconos del sistema y un gestor gr??fico de archivos. "
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Existen programas que permiten crear y modificar archivos, a veces llamados editores de texto. Estos incluyen Emacs y Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Editor de textos XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas herramientas le permiten crear documentaci??n en formato DocBook y "
-"convertirla a HTML, PDF, Postscript y texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas herramientas le permiten crear documentaci??n en formato DocBook y convertirla a HTML, PDF, Postscript y texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Este grupo es un conjunto de servidores para prop??sitos espec??ficos"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en "
-"Japon??s."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Japon??s."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Este grupo es un conjunto de herramientas y recursos para entornos en Checo."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Checo."
 
 #~ msgid "Haskell"
 #~ msgstr "Haskell"
+



From rdieter at fedoraproject.org  Wed Apr 29 23:51:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 29 Apr 2009 23:51:05 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.474,1.475
Message-ID: <20090429235105.76BC170133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29513

Modified Files:
	kdelibs.spec 
Log Message:
* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
- -devel: Provides: kdelibs4-devel%{?_isa} ...



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -p -r1.474 -r1.475
--- kdelibs.spec	28 Apr 2009 12:20:38 -0000	1.474
+++ kdelibs.spec	29 Apr 2009 23:50:34 -0000	1.475
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -170,6 +170,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
+%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
 %endif
 Requires: cmake >= 2.6.2-3
 Requires: automoc4 >= 0.9.88
@@ -422,6 +423,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
+- -devel: Provides: kdelibs4-devel%%{?_isa} ...
+
 * Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-13
 - upstream patch to fix GCC4.4 crashes in kjs
   (kdebug:189809)



From rdieter at fedoraproject.org  Wed Apr 29 23:52:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 29 Apr 2009 23:52:46 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.271,1.272
Message-ID: <20090429235246.6B2A770136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29924

Modified Files:
	qt.spec 
Log Message:
* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-7
- -devel: Provides: qt4-devel%{?_isa} ...



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- qt.spec	27 Apr 2009 15:39:03 -0000	1.271
+++ qt.spec	29 Apr 2009 23:52:15 -0000	1.272
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -238,6 +238,7 @@ Provides:  %{name}-static = %{version}-%
 %if "%{name}" != "qt4"
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
+%{?_isa:Provides: qt4-devel%{?_isa} = %{version}-%{release}}
 Provides:  qt4-static = %{version}-%{release}
 %endif
 
@@ -820,6 +821,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-7
+- -devel: Provides: qt4-devel%%{?_isa} ...
+
 * Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
 - drop useless hunk of qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 



From rdieter at fedoraproject.org  Wed Apr 29 23:54:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 29 Apr 2009 23:54:08 +0000 (UTC)
Subject: rpms/ktorrent/devel ktorrent.spec,1.95,1.96
Message-ID: <20090429235408.46ED17002B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30978

Modified Files:
	ktorrent.spec 
Log Message:
* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-2
- -DWITH_SYSTEM_GEOIP=1



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ktorrent.spec	10 Apr 2009 13:46:53 -0000	1.95
+++ ktorrent.spec	29 Apr 2009 23:53:38 -0000	1.96
@@ -3,7 +3,7 @@
 
 Name:           ktorrent
 Version:        3.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -16,6 +16,7 @@ BuildRequires: cmake   
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gmp-devel
+BuildRequires: GeoIP-devel
 # libtaskmanager support
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
@@ -26,7 +27,7 @@ BuildRequires: taglib-devel
 
 %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
-Requires: kdelibs4 >= %{kdelibs4_ver} 
+Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} 
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -48,7 +49,9 @@ The headers and libraries used for devel
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  -DWITH_SYSTEM_GEOIP=1 \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -124,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-2
+- -DWITH_SYSTEM_GEOIP=1
+
 * Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
 - ktorrent-3.2.1
 - optimize scriptlets



From petersen at fedoraproject.org  Thu Apr 30 00:01:26 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 30 Apr 2009 00:01:26 +0000 (UTC)
Subject: rpms/cabal2spec/devel cabal2spec.spec,1.10,1.11
Message-ID: <20090430000126.3B73770133@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/cabal2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32315

Modified Files:
	cabal2spec.spec 
Log Message:
use exclusivearch since no ghc no ppc64 yet


Index: cabal2spec.spec
===================================================================
RCS file: /cvs/extras/rpms/cabal2spec/devel/cabal2spec.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cabal2spec.spec	25 Apr 2009 02:27:56 -0000	1.10
+++ cabal2spec.spec	30 Apr 2009 00:00:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		cabal2spec
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Tool for creating .spec files for Haskell Cabal Packages
 
 Group:		Development/Languages
@@ -8,7 +8,8 @@ License:	GPLv2+
 URL:		https://fedorahosted.org/cabal2spec/
 Source0:	https://fedorahosted.org/releases/c/a/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+# fedora ghc archs:
+ExclusiveArch:  %{ix86} x86_64 ppc alpha
 # 6.10.2-3 has latest compatible macros
 Requires:	ghc >= 6.10.2-3
 
@@ -40,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Jens Petersen <petersen at redhat.com> - 0.15-2
+- use exclusivearch since no ghc no ppc64 yet
+
 * Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.15-1
 - templates buildrequire at least ghc-6.10.2-3 for macros
 - fix binlib doc filelist name



From rdieter at fedoraproject.org  Thu Apr 30 00:21:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 00:21:23 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.216,1.217
Message-ID: <20090430002123.2907C70133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3237

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Tue Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-6
- fix oxygen-cursor-themes noarch'ness



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- kdebase-workspace.spec	28 Apr 2009 17:13:17 -0000	1.216
+++ kdebase-workspace.spec	30 Apr 2009 00:20:52 -0000	1.217
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -189,10 +189,10 @@ Group:   System Environment/Daemons
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%description -n oxygen-cursor-themes
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
+%description -n oxygen-cursor-themes
 %{summary}.
 
 %package googlegadgets
@@ -520,6 +520,9 @@ fi
 
 
 %changelog
+* Tue Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-6
+- fix oxygen-cursor-themes noarch'ness
+
 * Tue Apr 28 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.2-5
 - #497657 -  kpackagekit/kopete notification misrendering/missing 
   buttons with qt-4.5.1



From cebbert at fedoraproject.org  Thu Apr 30 00:43:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 30 Apr 2009 00:43:54 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-netdev-r8169-2.6.30.patch, NONE,
	1.1.2.1 .cvsignore, 1.837.2.10, 1.837.2.11 kernel.spec,
	1.891.2.45, 1.891.2.46 sources, 1.798.2.10, 1.798.2.11 upstream,
	1.717.2.10, 1.717.2.11 linux-2.6-netdev-r8169-2.6.28.patch, 1.2,
	NONE linux-2.6-usb-cdc-wdm-fix-oops.patch, 1.1.2.1, NONE
Message-ID: <20090430004355.0728C70133@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8225

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-netdev-r8169-2.6.30.patch 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-netdev-r8169-2.6.28.patch 
	linux-2.6-usb-cdc-wdm-fix-oops.patch 
Log Message:
Linux 2.6.27.22-rc1
Update r8169 network driver to 2.6.30-rc3-git6
Dropped patches merged upstream:
  linux-2.6-usb-cdc-wdm-fix-oops.patch

linux-2.6-netdev-r8169-2.6.30.patch:

--- NEW FILE linux-2.6-netdev-r8169-2.6.30.patch ---
--- vanilla-2.6.27.22/drivers/net/r8169.c	2009-04-29 20:17:54.287206443 -0400
+++ r8169-2.6.30-rc3-git6/drivers/net/r8169.c	2009-04-29 20:20:18.000000000 -0400
@@ -36,7 +36,7 @@
 #define assert(expr) \
 	if (!(expr)) {					\
 		printk( "Assertion failed! %s,%s,%s,line=%d\n",	\
-		#expr,__FILE__,__FUNCTION__,__LINE__);		\
+		#expr,__FILE__,__func__,__LINE__);		\
 	}
 #define dprintk(fmt, args...) \
 	do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)
@@ -61,6 +61,7 @@
 /* MAC address length */
 #define MAC_ADDR_LEN	6
 
+#define MAX_READ_REQUEST_SHIFT	12
 #define RX_FIFO_THRESH	7	/* 7 means NO threshold, Rx buffer level before first PCI xfer. */
 #define RX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */
 #define TX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */
@@ -80,6 +81,10 @@
 #define RTL8169_TX_TIMEOUT	(6*HZ)
 #define RTL8169_PHY_TIMEOUT	(10*HZ)
 
+#define RTL_EEPROM_SIG		cpu_to_le32(0x8129)
+#define RTL_EEPROM_SIG_MASK	cpu_to_le32(0xffff)
+#define RTL_EEPROM_SIG_ADDR	0x0000
+
 /* write/read MMIO register */
 #define RTL_W8(reg, val8)	writeb ((val8), ioaddr + (reg))
 #define RTL_W16(reg, val16)	writew ((val16), ioaddr + (reg))
@@ -95,6 +100,10 @@
 	RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB
 	RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd
 	RTL_GIGA_MAC_VER_06 = 0x06, // 8110SCe
+	RTL_GIGA_MAC_VER_07 = 0x07, // 8102e
+	RTL_GIGA_MAC_VER_08 = 0x08, // 8102e
+	RTL_GIGA_MAC_VER_09 = 0x09, // 8102e
+	RTL_GIGA_MAC_VER_10 = 0x0a, // 8101e
 	RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb
 	RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be
 	RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb
@@ -104,7 +113,12 @@
 	RTL_GIGA_MAC_VER_17 = 0x10, // 8168Bf
 	RTL_GIGA_MAC_VER_18 = 0x12, // 8168CP
 	RTL_GIGA_MAC_VER_19 = 0x13, // 8168C
-	RTL_GIGA_MAC_VER_20 = 0x14  // 8168C
+	RTL_GIGA_MAC_VER_20 = 0x14, // 8168C
+	RTL_GIGA_MAC_VER_21 = 0x15, // 8168C
+	RTL_GIGA_MAC_VER_22 = 0x16, // 8168C
+	RTL_GIGA_MAC_VER_23 = 0x17, // 8168CP
+	RTL_GIGA_MAC_VER_24 = 0x18, // 8168CP
+	RTL_GIGA_MAC_VER_25 = 0x19  // 8168D
 };
 
 #define _R(NAME,MAC,MASK) \
@@ -121,6 +135,10 @@
 	_R("RTL8169sb/8110sb",	RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB
 	_R("RTL8169sc/8110sc",	RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd
 	_R("RTL8169sc/8110sc",	RTL_GIGA_MAC_VER_06, 0xff7e1880), // 8110SCe
+	_R("RTL8102e",		RTL_GIGA_MAC_VER_07, 0xff7e1880), // PCI-E
+	_R("RTL8102e",		RTL_GIGA_MAC_VER_08, 0xff7e1880), // PCI-E
+	_R("RTL8102e",		RTL_GIGA_MAC_VER_09, 0xff7e1880), // PCI-E
+	_R("RTL8101e",		RTL_GIGA_MAC_VER_10, 0xff7e1880), // PCI-E
 	_R("RTL8168b/8111b",	RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E
 	_R("RTL8168b/8111b",	RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E
 	_R("RTL8101e",		RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139
@@ -130,7 +148,12 @@
 	_R("RTL8101e",		RTL_GIGA_MAC_VER_16, 0xff7e1880), // PCI-E
 	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_18, 0xff7e1880), // PCI-E
 	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_19, 0xff7e1880), // PCI-E
-	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_20, 0xff7e1880)  // PCI-E
+	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_20, 0xff7e1880), // PCI-E
+	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_21, 0xff7e1880), // PCI-E
+	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_22, 0xff7e1880), // PCI-E
+	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_23, 0xff7e1880), // PCI-E
+	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_24, 0xff7e1880), // PCI-E
+	_R("RTL8168d/8111d",	RTL_GIGA_MAC_VER_25, 0xff7e1880)  // PCI-E
 };
 #undef _R
 
@@ -196,9 +219,6 @@
 	Config5		= 0x56,
 	MultiIntr	= 0x5c,
 	PHYAR		= 0x60,
-	TBICSR		= 0x64,
-	TBI_ANAR	= 0x68,
-	TBI_LPAR	= 0x6a,
 	PHYstatus	= 0x6c,
 	RxMaxSize	= 0xda,
 	CPlusCmd	= 0xe0,
@@ -212,6 +232,32 @@
 	FuncForceEvent	= 0xfc,
 };
 
+enum rtl8110_registers {
+	TBICSR			= 0x64,
+	TBI_ANAR		= 0x68,
+	TBI_LPAR		= 0x6a,
+};
+
+enum rtl8168_8101_registers {
+	CSIDR			= 0x64,
+	CSIAR			= 0x68,
+#define	CSIAR_FLAG			0x80000000
+#define	CSIAR_WRITE_CMD			0x80000000
+#define	CSIAR_BYTE_ENABLE		0x0f
+#define	CSIAR_BYTE_ENABLE_SHIFT		12
+#define	CSIAR_ADDR_MASK			0x0fff
+
+	EPHYAR			= 0x80,
+#define	EPHYAR_FLAG			0x80000000
+#define	EPHYAR_WRITE_CMD		0x80000000
+#define	EPHYAR_REG_MASK			0x1f
+#define	EPHYAR_REG_SHIFT		16
+#define	EPHYAR_DATA_MASK		0xffff
+	DBG_REG			= 0xd1,
+#define	FIX_NAK_1			(1 << 4)
+#define	FIX_NAK_2			(1 << 3)
+};
+
 enum rtl_register_content {
 	/* InterruptStatusBits */
 	SYSErr		= 0x8000,
@@ -265,7 +311,13 @@
 	TxDMAShift = 8,	/* DMA burst value (0-7) is shift this many bits */
 
 	/* Config1 register p.24 */
+	LEDS1		= (1 << 7),
+	LEDS0		= (1 << 6),
 	MSIEnable	= (1 << 5),	/* Enable Message Signaled Interrupt */
+	Speed_down	= (1 << 4),
+	MEMMAP		= (1 << 3),
+	IOMAP		= (1 << 2),
+	VPD		= (1 << 1),
 	PMEnable	= (1 << 0),	/* Power Management Enable */
 
 	/* Config2 register p. 25 */
@@ -275,6 +327,7 @@
 	/* Config3 register p.25 */
 	MagicPacket	= (1 << 5),	/* Wake up when receives a Magic Packet */
 	LinkUp		= (1 << 4),	/* Wake up when the cable connection is re-established */
+	Beacon_en	= (1 << 0),	/* 8168 only. Reserved in the 8168b */
 
 	/* Config5 register p.27 */
 	BWF		= (1 << 6),	/* Accept Broadcast wakeup frame */
@@ -292,7 +345,16 @@
 	TBINwComplete	= 0x01000000,
 
 	/* CPlusCmd p.31 */
-	PktCntrDisable	= (1 << 7),	// 8168
+	EnableBist	= (1 << 15),	// 8168 8101
+	Mac_dbgo_oe	= (1 << 14),	// 8168 8101
+	Normal_mode	= (1 << 13),	// unused
+	Force_half_dup	= (1 << 12),	// 8168 8101
+	Force_rxflow_en	= (1 << 11),	// 8168 8101
+	Force_txflow_en	= (1 << 10),	// 8168 8101
+	Cxpl_dbg_sel	= (1 << 9),	// 8168 8101
+	ASF		= (1 << 8),	// 8168 8101
+	PktCntrDisable	= (1 << 7),	// 8168 8101
+	Mac_dbgo_sel	= 0x001c,	// 8168
 	RxVlan		= (1 << 6),
 	RxChkSum	= (1 << 5),
 	PCIDAC		= (1 << 4),
@@ -428,6 +490,8 @@
 	void (*hw_start)(struct net_device *);
 	unsigned int (*phy_reset_pending)(void __iomem *);
 	unsigned int (*link_ok)(void __iomem *);
+	int (*do_ioctl)(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd);
+	int pcie_cap;
 	struct delayed_work task;
 	unsigned features;
 
@@ -502,6 +566,11 @@
 	return value;
 }
 
+static void mdio_patch(void __iomem *ioaddr, int reg_addr, int value)
+{
+	mdio_write(ioaddr, reg_addr, mdio_read(ioaddr, reg_addr) | value);
+}
+
 static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,
 			   int val)
 {
@@ -519,6 +588,72 @@
 	return mdio_read(ioaddr, location);
 }
 
+static void rtl_ephy_write(void __iomem *ioaddr, int reg_addr, int value)
+{
+	unsigned int i;
+
+	RTL_W32(EPHYAR, EPHYAR_WRITE_CMD | (value & EPHYAR_DATA_MASK) |
+		(reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);
+
+	for (i = 0; i < 100; i++) {
+		if (!(RTL_R32(EPHYAR) & EPHYAR_FLAG))
+			break;
+		udelay(10);
+	}
+}
+
+static u16 rtl_ephy_read(void __iomem *ioaddr, int reg_addr)
+{
+	u16 value = 0xffff;
+	unsigned int i;
+
+	RTL_W32(EPHYAR, (reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);
+
+	for (i = 0; i < 100; i++) {
+		if (RTL_R32(EPHYAR) & EPHYAR_FLAG) {
+			value = RTL_R32(EPHYAR) & EPHYAR_DATA_MASK;
+			break;
+		}
+		udelay(10);
+	}
+
+	return value;
+}
+
+static void rtl_csi_write(void __iomem *ioaddr, int addr, int value)
+{
+	unsigned int i;
+
+	RTL_W32(CSIDR, value);
+	RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
+		CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
+
+	for (i = 0; i < 100; i++) {
+		if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
+			break;
+		udelay(10);
+	}
+}
+
+static u32 rtl_csi_read(void __iomem *ioaddr, int addr)
+{
+	u32 value = ~0x00;
+	unsigned int i;
+
+	RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) |
+		CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
+
+	for (i = 0; i < 100; i++) {
+		if (RTL_R32(CSIAR) & CSIAR_FLAG) {
+			value = RTL_R32(CSIDR);
+			break;
+		}
+		udelay(10);
+	}
+
+	return value;
+}
+
 static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)
 {
 	RTL_W16(IntrMask, 0x0000);
@@ -656,6 +791,7 @@
 		tp->features |= RTL_FEATURE_WOL;
 	else
 		tp->features &= ~RTL_FEATURE_WOL;
+	device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
 
 	spin_unlock_irq(&tp->lock);
 
@@ -742,8 +878,12 @@
 		}
 	}
 
-	/* The 8100e/8101e do Fast Ethernet only. */
-	if ((tp->mac_version == RTL_GIGA_MAC_VER_13) ||
+	/* The 8100e/8101e/8102e do Fast Ethernet only. */
+	if ((tp->mac_version == RTL_GIGA_MAC_VER_07) ||
+	    (tp->mac_version == RTL_GIGA_MAC_VER_08) ||
+	    (tp->mac_version == RTL_GIGA_MAC_VER_09) ||
+	    (tp->mac_version == RTL_GIGA_MAC_VER_10) ||
+	    (tp->mac_version == RTL_GIGA_MAC_VER_13) ||
 	    (tp->mac_version == RTL_GIGA_MAC_VER_14) ||
 	    (tp->mac_version == RTL_GIGA_MAC_VER_15) ||
 	    (tp->mac_version == RTL_GIGA_MAC_VER_16)) {
@@ -1008,7 +1148,7 @@
 		return;
 
 	RTL_W32(CounterAddrHigh, (u64)paddr >> 32);
-	cmd = (u64)paddr & DMA_32BIT_MASK;
+	cmd = (u64)paddr & DMA_BIT_MASK(32);
 	RTL_W32(CounterAddrLow, cmd);
 	RTL_W32(CounterAddrLow, cmd | CounterDump);
 
@@ -1111,11 +1251,19 @@
 		u32 val;
 		int mac_version;
 	} mac_info[] = {
-		/* 8168B family. */
-		{ 0x7c800000, 0x3c800000,	RTL_GIGA_MAC_VER_18 },
+		/* 8168D family. */
+		{ 0x7c800000, 0x28000000,	RTL_GIGA_MAC_VER_25 },
+
+		/* 8168C family. */
+		{ 0x7cf00000, 0x3ca00000,	RTL_GIGA_MAC_VER_24 },
+		{ 0x7cf00000, 0x3c900000,	RTL_GIGA_MAC_VER_23 },
+		{ 0x7cf00000, 0x3c800000,	RTL_GIGA_MAC_VER_18 },
+		{ 0x7c800000, 0x3c800000,	RTL_GIGA_MAC_VER_24 },
 		{ 0x7cf00000, 0x3c000000,	RTL_GIGA_MAC_VER_19 },
 		{ 0x7cf00000, 0x3c200000,	RTL_GIGA_MAC_VER_20 },
-		{ 0x7c800000, 0x3c000000,	RTL_GIGA_MAC_VER_20 },
+		{ 0x7cf00000, 0x3c300000,	RTL_GIGA_MAC_VER_21 },
+		{ 0x7cf00000, 0x3c400000,	RTL_GIGA_MAC_VER_22 },
+		{ 0x7c800000, 0x3c000000,	RTL_GIGA_MAC_VER_22 },
 
 		/* 8168B family. */
 		{ 0x7cf00000, 0x38000000,	RTL_GIGA_MAC_VER_12 },
@@ -1124,8 +1272,17 @@
 		{ 0x7c800000, 0x30000000,	RTL_GIGA_MAC_VER_11 },
 
 		/* 8101 family. */
+		{ 0x7cf00000, 0x34a00000,	RTL_GIGA_MAC_VER_09 },
+		{ 0x7cf00000, 0x24a00000,	RTL_GIGA_MAC_VER_09 },
+		{ 0x7cf00000, 0x34900000,	RTL_GIGA_MAC_VER_08 },
+		{ 0x7cf00000, 0x24900000,	RTL_GIGA_MAC_VER_08 },
+		{ 0x7cf00000, 0x34800000,	RTL_GIGA_MAC_VER_07 },
+		{ 0x7cf00000, 0x24800000,	RTL_GIGA_MAC_VER_07 },
 		{ 0x7cf00000, 0x34000000,	RTL_GIGA_MAC_VER_13 },
+		{ 0x7cf00000, 0x34300000,	RTL_GIGA_MAC_VER_10 },
 		{ 0x7cf00000, 0x34200000,	RTL_GIGA_MAC_VER_16 },
+		{ 0x7c800000, 0x34800000,	RTL_GIGA_MAC_VER_09 },
+		{ 0x7c800000, 0x24800000,	RTL_GIGA_MAC_VER_09 },
 		{ 0x7c800000, 0x34000000,	RTL_GIGA_MAC_VER_16 },
 		/* FIXME: where did these entries come from ? -- FR */
 		{ 0xfc800000, 0x38800000,	RTL_GIGA_MAC_VER_15 },
@@ -1236,7 +1393,31 @@
 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
 
-static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)
+static void rtl8168bb_hw_phy_config(void __iomem *ioaddr)
+{
+	struct phy_reg phy_reg_init[] = {
+		{ 0x10, 0xf41b },
+		{ 0x1f, 0x0000 }
+	};
+
+	mdio_write(ioaddr, 0x1f, 0x0001);
+	mdio_patch(ioaddr, 0x16, 1 << 0);
+
+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+}
+
+static void rtl8168bef_hw_phy_config(void __iomem *ioaddr)
+{
+	struct phy_reg phy_reg_init[] = {
+		{ 0x1f, 0x0001 },
+		{ 0x10, 0xf41b },
+		{ 0x1f, 0x0000 }
+	};
+
+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+}
+
+static void rtl8168cp_1_hw_phy_config(void __iomem *ioaddr)
 {
 	struct phy_reg phy_reg_init[] = {
 		{ 0x1f, 0x0000 },
@@ -1249,7 +1430,22 @@
 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
 
-static void rtl8168c_hw_phy_config(void __iomem *ioaddr)
+static void rtl8168cp_2_hw_phy_config(void __iomem *ioaddr)
+{
+	struct phy_reg phy_reg_init[] = {
+		{ 0x1f, 0x0001 },
+		{ 0x1d, 0x3d98 },
+		{ 0x1f, 0x0000 }
+	};
+
+	mdio_write(ioaddr, 0x1f, 0x0000);
+	mdio_patch(ioaddr, 0x14, 1 << 5);
+	mdio_patch(ioaddr, 0x0d, 1 << 5);
+
+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+}
+
+static void rtl8168c_1_hw_phy_config(void __iomem *ioaddr)
 {
 	struct phy_reg phy_reg_init[] = {
 		{ 0x1f, 0x0001 },
@@ -1265,25 +1461,157 @@
 		{ 0x1f, 0x0003 },
 		{ 0x12, 0xc096 },
 		{ 0x16, 0x000a },
-		{ 0x1f, 0x0000 }
+		{ 0x1f, 0x0000 },
+		{ 0x1f, 0x0000 },
+		{ 0x09, 0x2000 },
+		{ 0x09, 0x0000 }
 	};
 
 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+
+	mdio_patch(ioaddr, 0x14, 1 << 5);
+	mdio_patch(ioaddr, 0x0d, 1 << 5);
+	mdio_write(ioaddr, 0x1f, 0x0000);
 }
 
-static void rtl8168cx_hw_phy_config(void __iomem *ioaddr)
+static void rtl8168c_2_hw_phy_config(void __iomem *ioaddr)
 {
 	struct phy_reg phy_reg_init[] = {
-		{ 0x1f, 0x0000 },
+		{ 0x1f, 0x0001 },
 		{ 0x12, 0x2300 },
+		{ 0x03, 0x802f },
+		{ 0x02, 0x4f02 },
+		{ 0x01, 0x0409 },
+		{ 0x00, 0xf099 },
+		{ 0x04, 0x9800 },
+		{ 0x04, 0x9000 },
+		{ 0x1d, 0x3d98 },
+		{ 0x1f, 0x0002 },
+		{ 0x0c, 0x7eb8 },
+		{ 0x06, 0x0761 },
 		{ 0x1f, 0x0003 },
 		{ 0x16, 0x0f0a },
-		{ 0x1f, 0x0000 },
+		{ 0x1f, 0x0000 }
+	};
+
+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+
+	mdio_patch(ioaddr, 0x16, 1 << 0);
+	mdio_patch(ioaddr, 0x14, 1 << 5);
+	mdio_patch(ioaddr, 0x0d, 1 << 5);
+	mdio_write(ioaddr, 0x1f, 0x0000);
+}
+
+static void rtl8168c_3_hw_phy_config(void __iomem *ioaddr)
+{
+	struct phy_reg phy_reg_init[] = {
+		{ 0x1f, 0x0001 },
+		{ 0x12, 0x2300 },
+		{ 0x1d, 0x3d98 },
 		{ 0x1f, 0x0002 },
 		{ 0x0c, 0x7eb8 },
+		{ 0x06, 0x5461 },
+		{ 0x1f, 0x0003 },
+		{ 0x16, 0x0f0a },
+		{ 0x1f, 0x0000 }
+	};
+
+	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+
+	mdio_patch(ioaddr, 0x16, 1 << 0);
+	mdio_patch(ioaddr, 0x14, 1 << 5);
+	mdio_patch(ioaddr, 0x0d, 1 << 5);
+	mdio_write(ioaddr, 0x1f, 0x0000);
+}
+
+static void rtl8168c_4_hw_phy_config(void __iomem *ioaddr)
+{
+	rtl8168c_3_hw_phy_config(ioaddr);
+}
+
+static void rtl8168d_hw_phy_config(void __iomem *ioaddr)
+{
+	struct phy_reg phy_reg_init_0[] = {
+		{ 0x1f, 0x0001 },
+		{ 0x09, 0x2770 },
+		{ 0x08, 0x04d0 },
+		{ 0x0b, 0xad15 },
+		{ 0x0c, 0x5bf0 },
+		{ 0x1c, 0xf101 },
+		{ 0x1f, 0x0003 },
+		{ 0x14, 0x94d7 },
+		{ 0x12, 0xf4d6 },
+		{ 0x09, 0xca0f },
+		{ 0x1f, 0x0002 },
+		{ 0x0b, 0x0b10 },
+		{ 0x0c, 0xd1f7 },
+		{ 0x1f, 0x0002 },
+		{ 0x06, 0x5461 },
+		{ 0x1f, 0x0002 },
+		{ 0x05, 0x6662 },
+		{ 0x1f, 0x0000 },
+		{ 0x14, 0x0060 },
+		{ 0x1f, 0x0000 },
+		{ 0x0d, 0xf8a0 },
+		{ 0x1f, 0x0005 },
+		{ 0x05, 0xffc2 }
+	};
+
+	rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
+
+	if (mdio_read(ioaddr, 0x06) == 0xc400) {
+		struct phy_reg phy_reg_init_1[] = {
+			{ 0x1f, 0x0005 },
+			{ 0x01, 0x0300 },
+			{ 0x1f, 0x0000 },
+			{ 0x11, 0x401c },
+			{ 0x16, 0x4100 },
+			{ 0x1f, 0x0005 },
+			{ 0x07, 0x0010 },
+			{ 0x05, 0x83dc },
+			{ 0x06, 0x087d },
+			{ 0x05, 0x8300 },
+			{ 0x06, 0x0101 },
+			{ 0x06, 0x05f8 },
+			{ 0x06, 0xf9fa },
+			{ 0x06, 0xfbef },
+			{ 0x06, 0x79e2 },
+			{ 0x06, 0x835f },
+			{ 0x06, 0xe0f8 },
+			{ 0x06, 0x9ae1 },
+			{ 0x06, 0xf89b },
+			{ 0x06, 0xef31 },
+			{ 0x06, 0x3b65 },
+			{ 0x06, 0xaa07 },
+			{ 0x06, 0x81e4 },
+			{ 0x06, 0xf89a },
+			{ 0x06, 0xe5f8 },
+			{ 0x06, 0x9baf },
+			{ 0x06, 0x06ae },
+			{ 0x05, 0x83dc },
+			{ 0x06, 0x8300 },
+		};
+
+		rtl_phy_write(ioaddr, phy_reg_init_1,
+			      ARRAY_SIZE(phy_reg_init_1));
+	}
+
+	mdio_write(ioaddr, 0x1f, 0x0000);
+}
+
+static void rtl8102e_hw_phy_config(void __iomem *ioaddr)
+{
+	struct phy_reg phy_reg_init[] = {
+		{ 0x1f, 0x0003 },
+		{ 0x08, 0x441d },
+		{ 0x01, 0x9100 },
 		{ 0x1f, 0x0000 }
 	};
 
+	mdio_write(ioaddr, 0x1f, 0x0000);
+	mdio_patch(ioaddr, 0x11, 1 << 12);
+	mdio_patch(ioaddr, 0x19, 1 << 13);
+
 	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
 
@@ -1304,15 +1632,43 @@
 	case RTL_GIGA_MAC_VER_04:
 		rtl8169sb_hw_phy_config(ioaddr);
 		break;
+	case RTL_GIGA_MAC_VER_07:
+	case RTL_GIGA_MAC_VER_08:
+	case RTL_GIGA_MAC_VER_09:
+		rtl8102e_hw_phy_config(ioaddr);
+		break;
+	case RTL_GIGA_MAC_VER_11:
+		rtl8168bb_hw_phy_config(ioaddr);
+		break;
+	case RTL_GIGA_MAC_VER_12:
+		rtl8168bef_hw_phy_config(ioaddr);
+		break;
+	case RTL_GIGA_MAC_VER_17:
+		rtl8168bef_hw_phy_config(ioaddr);
+		break;
 	case RTL_GIGA_MAC_VER_18:
-		rtl8168cp_hw_phy_config(ioaddr);
+		rtl8168cp_1_hw_phy_config(ioaddr);
 		break;
 	case RTL_GIGA_MAC_VER_19:
-		rtl8168c_hw_phy_config(ioaddr);
+		rtl8168c_1_hw_phy_config(ioaddr);
 		break;
 	case RTL_GIGA_MAC_VER_20:
-		rtl8168cx_hw_phy_config(ioaddr);
+		rtl8168c_2_hw_phy_config(ioaddr);
+		break;
+	case RTL_GIGA_MAC_VER_21:
+		rtl8168c_3_hw_phy_config(ioaddr);
+		break;
+	case RTL_GIGA_MAC_VER_22:
+		rtl8168c_4_hw_phy_config(ioaddr);
+		break;
+	case RTL_GIGA_MAC_VER_23:
+	case RTL_GIGA_MAC_VER_24:
+		rtl8168cp_2_hw_phy_config(ioaddr);
 		break;
+	case RTL_GIGA_MAC_VER_25:
+		rtl8168d_hw_phy_config(ioaddr);
+		break;
+
 	default:
 		break;
 	}
@@ -1494,9 +1850,11 @@
 	struct rtl8169_private *tp = netdev_priv(dev);
 	struct mii_ioctl_data *data = if_mii(ifr);
 
-	if (!netif_running(dev))
-		return -ENODEV;
+	return netif_running(dev) ? tp->do_ioctl(tp, data, cmd) : -ENODEV;
+}
 
+static int rtl_xmii_ioctl(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd)
+{
 	switch (cmd) {
 	case SIOCGMIIPHY:
 		data->phy_id = 32; /* Internal PHY */
@@ -1515,6 +1873,11 @@
 	return -EOPNOTSUPP;
 }
 
+static int rtl_tbi_ioctl(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd)
+{
+	return -EOPNOTSUPP;
+}
+
 static const struct rtl_cfg_info {
 	void (*hw_start)(struct net_device *);
 	unsigned int region;
@@ -1580,6 +1943,26 @@
 	}
 }
 
+static const struct net_device_ops rtl8169_netdev_ops = {
+	.ndo_open		= rtl8169_open,
+	.ndo_stop		= rtl8169_close,
+	.ndo_get_stats		= rtl8169_get_stats,
+	.ndo_start_xmit		= rtl8169_start_xmit,
+	.ndo_tx_timeout		= rtl8169_tx_timeout,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_change_mtu		= rtl8169_change_mtu,
+	.ndo_set_mac_address	= rtl_set_mac_address,
+	.ndo_do_ioctl		= rtl8169_ioctl,
+	.ndo_set_multicast_list	= rtl_set_rx_mode,
+#ifdef CONFIG_R8169_VLAN
+	.ndo_vlan_rx_register	= rtl8169_vlan_rx_register,
+#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller	= rtl8169_netpoll,
+#endif
+
+};
+
 static int __devinit
 rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -1606,6 +1989,7 @@
 	}
 
 	SET_NETDEV_DEV(dev, &pdev->dev);
+	dev->netdev_ops = &rtl8169_netdev_ops;
 	tp = netdev_priv(dev);
 	tp->dev = dev;
 	tp->pci_dev = pdev;
@@ -1662,11 +2046,11 @@
 	tp->cp_cmd = PCIMulRW | RxChkSum;
 
 	if ((sizeof(dma_addr_t) > 4) &&
-	    !pci_set_dma_mask(pdev, DMA_64BIT_MASK) && use_dac) {
+	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) {
 		tp->cp_cmd |= PCIDAC;
 		dev->features |= NETIF_F_HIGHDMA;
 	} else {
-		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
 		if (rc < 0) {
 			if (netif_msg_probe(tp)) {
 				dev_err(&pdev->dev,
@@ -1687,6 +2071,10 @@
 		goto err_out_free_res_4;
 	}
 
+	tp->pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+	if (!tp->pcie_cap && netif_msg_probe(tp))
+		dev_info(&pdev->dev, "no PCI Express capability\n");
+
 	RTL_W16(IntrMask, 0x0000);
 
 	/* Soft reset the chip. */
@@ -1724,6 +2112,10 @@
 	RTL_W8(Cfg9346, Cfg9346_Unlock);
 	RTL_W8(Config1, RTL_R8(Config1) | PMEnable);
 	RTL_W8(Config5, RTL_R8(Config5) & PMEStatus);
+	if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0)
+		tp->features |= RTL_FEATURE_WOL;
+	if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0)
+		tp->features |= RTL_FEATURE_WOL;
 	tp->features |= rtl_try_msi(pdev, ioaddr, cfg);
 	RTL_W8(Cfg9346, Cfg9346_Lock);
 
@@ -1734,6 +2126,7 @@
 		tp->phy_reset_enable = rtl8169_tbi_reset_enable;
 		tp->phy_reset_pending = rtl8169_tbi_reset_pending;
 		tp->link_ok = rtl8169_tbi_link_ok;
+		tp->do_ioctl = rtl_tbi_ioctl;
 
 		tp->phy_1000_ctrl_reg = ADVERTISE_1000FULL; /* Implied by TBI */
 	} else {
@@ -1742,41 +2135,30 @@
 		tp->phy_reset_enable = rtl8169_xmii_reset_enable;
 		tp->phy_reset_pending = rtl8169_xmii_reset_pending;
 		tp->link_ok = rtl8169_xmii_link_ok;
-
-		dev->do_ioctl = rtl8169_ioctl;
+		tp->do_ioctl = rtl_xmii_ioctl;
 	}
 
-	/* Get MAC address.  FIXME: read EEPROM */
+	spin_lock_init(&tp->lock);
+
+	tp->mmio_addr = ioaddr;
+
+	/* Get MAC address */
 	for (i = 0; i < MAC_ADDR_LEN; i++)
 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-	dev->open = rtl8169_open;
-	dev->hard_start_xmit = rtl8169_start_xmit;
-	dev->get_stats = rtl8169_get_stats;
 	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
-	dev->stop = rtl8169_close;
-	dev->tx_timeout = rtl8169_tx_timeout;
-	dev->set_multicast_list = rtl_set_rx_mode;
 	dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
 	dev->irq = pdev->irq;
 	dev->base_addr = (unsigned long) ioaddr;
-	dev->change_mtu = rtl8169_change_mtu;
-	dev->set_mac_address = rtl_set_mac_address;
 
 	netif_napi_add(dev, &tp->napi, rtl8169_poll, R8169_NAPI_WEIGHT);
 
 #ifdef CONFIG_R8169_VLAN
 	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-	dev->vlan_rx_register = rtl8169_vlan_rx_register;
-#endif
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = rtl8169_netpoll;
 #endif
 
 	tp->intr_mask = 0xffff;
-	tp->mmio_addr = ioaddr;
 	tp->align = cfg->align;
 	tp->hw_start = cfg->hw_start;
 	tp->intr_event = cfg->intr_event;
@@ -1786,8 +2168,6 @@
 	tp->timer.data = (unsigned long) dev;
 	tp->timer.function = rtl8169_phy_timer;
 
-	spin_lock_init(&tp->lock);
-
 	rc = register_netdev(dev);
 	if (rc < 0)
 		goto err_out_msi_5;
@@ -1809,6 +2189,7 @@
 	}
 
 	rtl8169_init_phy(dev, tp);
+	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
 
 out:
 	return rc;
@@ -1962,9 +2343,9 @@
 	 * Switching from MMIO to I/O access fixes the issue as well.
 	 */
 	RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32);
-	RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_32BIT_MASK);
+	RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_BIT_MASK(32));
 	RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr) >> 32);
-	RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_32BIT_MASK);
+	RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32));
 }
 
 static u16 rtl_rw_cpluscmd(void __iomem *ioaddr)
@@ -2079,12 +2460,209 @@
 	RTL_W16(IntrMask, tp->intr_event);
 }
 
+static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+	struct rtl8169_private *tp = netdev_priv(dev);
+	int cap = tp->pcie_cap;
+
+	if (cap) {
+		u16 ctl;
+
+		pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &ctl);
+		ctl = (ctl & ~PCI_EXP_DEVCTL_READRQ) | force;
+		pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl);
+	}
+}
+
+static void rtl_csi_access_enable(void __iomem *ioaddr)
+{
+	u32 csi;
+
+	csi = rtl_csi_read(ioaddr, 0x070c) & 0x00ffffff;
+	rtl_csi_write(ioaddr, 0x070c, csi | 0x27000000);
+}
+
+struct ephy_info {
+	unsigned int offset;
+	u16 mask;
+	u16 bits;
+};
+
+static void rtl_ephy_init(void __iomem *ioaddr, struct ephy_info *e, int len)
+{
+	u16 w;
+
+	while (len-- > 0) {
+		w = (rtl_ephy_read(ioaddr, e->offset) & ~e->mask) | e->bits;
+		rtl_ephy_write(ioaddr, e->offset, w);
+		e++;
+	}
+}
+
+static void rtl_disable_clock_request(struct pci_dev *pdev)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+	struct rtl8169_private *tp = netdev_priv(dev);
+	int cap = tp->pcie_cap;
+
+	if (cap) {
+		u16 ctl;
+
+		pci_read_config_word(pdev, cap + PCI_EXP_LNKCTL, &ctl);
+		ctl &= ~PCI_EXP_LNKCTL_CLKREQ_EN;
+		pci_write_config_word(pdev, cap + PCI_EXP_LNKCTL, ctl);
+	}
+}
+
+#define R8168_CPCMD_QUIRK_MASK (\
+	EnableBist | \
+	Mac_dbgo_oe | \
+	Force_half_dup | \
+	Force_rxflow_en | \
+	Force_txflow_en | \
+	Cxpl_dbg_sel | \
+	ASF | \
+	PktCntrDisable | \
+	Mac_dbgo_sel)
+
+static void rtl_hw_start_8168bb(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
+
+	rtl_tx_performance_tweak(pdev,
+		(0x5 << MAX_READ_REQUEST_SHIFT) | PCI_EXP_DEVCTL_NOSNOOP_EN);
+}
+
+static void rtl_hw_start_8168bef(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_hw_start_8168bb(ioaddr, pdev);
+
+	RTL_W8(EarlyTxThres, EarlyTxThld);
+
+	RTL_W8(Config4, RTL_R8(Config4) & ~(1 << 0));
+}
+
+static void __rtl_hw_start_8168cp(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	RTL_W8(Config1, RTL_R8(Config1) | Speed_down);
+
+	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
+
+	rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+	rtl_disable_clock_request(pdev);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
+}
+
+static void rtl_hw_start_8168cp_1(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	static struct ephy_info e_info_8168cp[] = {
+		{ 0x01, 0,	0x0001 },
+		{ 0x02, 0x0800,	0x1000 },
+		{ 0x03, 0,	0x0042 },
+		{ 0x06, 0x0080,	0x0000 },
+		{ 0x07, 0,	0x2000 }
+	};
+
+	rtl_csi_access_enable(ioaddr);
+
+	rtl_ephy_init(ioaddr, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));
+
+	__rtl_hw_start_8168cp(ioaddr, pdev);
+}
+
+static void rtl_hw_start_8168cp_2(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_csi_access_enable(ioaddr);
+
+	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
+
+	rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
+}
+
+static void rtl_hw_start_8168cp_3(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_csi_access_enable(ioaddr);
+
+	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
+
+	/* Magic. */
+	RTL_W8(DBG_REG, 0x20);
+
+	RTL_W8(EarlyTxThres, EarlyTxThld);
+
+	rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
+}
+
+static void rtl_hw_start_8168c_1(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	static struct ephy_info e_info_8168c_1[] = {
+		{ 0x02, 0x0800,	0x1000 },
+		{ 0x03, 0,	0x0002 },
+		{ 0x06, 0x0080,	0x0000 }
+	};
+
+	rtl_csi_access_enable(ioaddr);
+
+	RTL_W8(DBG_REG, 0x06 | FIX_NAK_1 | FIX_NAK_2);
+
+	rtl_ephy_init(ioaddr, e_info_8168c_1, ARRAY_SIZE(e_info_8168c_1));
+
+	__rtl_hw_start_8168cp(ioaddr, pdev);
+}
+
+static void rtl_hw_start_8168c_2(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	static struct ephy_info e_info_8168c_2[] = {
+		{ 0x01, 0,	0x0001 },
+		{ 0x03, 0x0400,	0x0220 }
+	};
+
+	rtl_csi_access_enable(ioaddr);
+
+	rtl_ephy_init(ioaddr, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));
+
+	__rtl_hw_start_8168cp(ioaddr, pdev);
+}
+
+static void rtl_hw_start_8168c_3(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_hw_start_8168c_2(ioaddr, pdev);
+}
+
+static void rtl_hw_start_8168c_4(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_csi_access_enable(ioaddr);
+
+	__rtl_hw_start_8168cp(ioaddr, pdev);
+}
+
+static void rtl_hw_start_8168d(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_csi_access_enable(ioaddr);
+
+	rtl_disable_clock_request(pdev);
+
+	RTL_W8(EarlyTxThres, EarlyTxThld);
+
+	rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
+}
+
 static void rtl_hw_start_8168(struct net_device *dev)
 {
 	struct rtl8169_private *tp = netdev_priv(dev);
 	void __iomem *ioaddr = tp->mmio_addr;
 	struct pci_dev *pdev = tp->pci_dev;
-	u8 ctl;
 
 	RTL_W8(Cfg9346, Cfg9346_Unlock);
 
@@ -2092,17 +2670,10 @@
 
 	rtl_set_rx_max_size(ioaddr);
 
-	rtl_set_rx_tx_config_registers(tp);
-
 	tp->cp_cmd |= RTL_R16(CPlusCmd) | PktCntrDisable | INTT_1;
 
 	RTL_W16(CPlusCmd, tp->cp_cmd);
 
-	/* Tx performance tweak. */
-	pci_read_config_byte(pdev, 0x69, &ctl);
-	ctl = (ctl & ~0x70) | 0x50;
-	pci_write_config_byte(pdev, 0x69, ctl);
-
 	RTL_W16(IntrMitigate, 0x5151);
 
 	/* Work around for RxFIFO overflow. */
@@ -2113,19 +2684,134 @@
 
 	rtl_set_rx_tx_desc_registers(tp, ioaddr);
 
-	RTL_W8(Cfg9346, Cfg9346_Lock);
+	rtl_set_rx_mode(dev);
+
+	RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) |
+		(InterFrameGap << TxInterFrameGapShift));
 
 	RTL_R8(IntrMask);
 
-	rtl_set_rx_mode(dev);
+	switch (tp->mac_version) {
+	case RTL_GIGA_MAC_VER_11:
+		rtl_hw_start_8168bb(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_12:
+	case RTL_GIGA_MAC_VER_17:
+		rtl_hw_start_8168bef(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_18:
+		rtl_hw_start_8168cp_1(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_19:
+		rtl_hw_start_8168c_1(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_20:
+		rtl_hw_start_8168c_2(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_21:
+		rtl_hw_start_8168c_3(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_22:
+		rtl_hw_start_8168c_4(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_23:
+		rtl_hw_start_8168cp_2(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_24:
+		rtl_hw_start_8168cp_3(ioaddr, pdev);
+	break;
+
+	case RTL_GIGA_MAC_VER_25:
+		rtl_hw_start_8168d(ioaddr, pdev);
+	break;
+
+	default:
+		printk(KERN_ERR PFX "%s: unknown chipset (mac_version = %d).\n",
+			dev->name, tp->mac_version);
+	break;
+	}
 
 	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
 
+	RTL_W8(Cfg9346, Cfg9346_Lock);
+
 	RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
 
 	RTL_W16(IntrMask, tp->intr_event);
 }
 
+#define R810X_CPCMD_QUIRK_MASK (\
+	EnableBist | \
+	Mac_dbgo_oe | \
+	Force_half_dup | \
+	Force_half_dup | \
+	Force_txflow_en | \
+	Cxpl_dbg_sel | \
+	ASF | \
+	PktCntrDisable | \
+	PCIDAC | \
+	PCIMulRW)
+
+static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	static struct ephy_info e_info_8102e_1[] = {
+		{ 0x01,	0, 0x6e65 },
+		{ 0x02,	0, 0x091f },
+		{ 0x03,	0, 0xc2f9 },
+		{ 0x06,	0, 0xafb5 },
+		{ 0x07,	0, 0x0e00 },
+		{ 0x19,	0, 0xec80 },
+		{ 0x01,	0, 0x2e65 },
+		{ 0x01,	0, 0x6e65 }
+	};
+	u8 cfg1;
+
+	rtl_csi_access_enable(ioaddr);
+
+	RTL_W8(DBG_REG, FIX_NAK_1);
+
+	rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+	RTL_W8(Config1,
+	       LEDS1 | LEDS0 | Speed_down | MEMMAP | IOMAP | VPD | PMEnable);
+	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
+
+	cfg1 = RTL_R8(Config1);
+	if ((cfg1 & LEDS0) && (cfg1 & LEDS1))
+		RTL_W8(Config1, cfg1 & ~LEDS0);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);
+
+	rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));
+}
+
+static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_csi_access_enable(ioaddr);
+
+	rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+	RTL_W8(Config1, MEMMAP | IOMAP | VPD | PMEnable);
+	RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
+
+	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);
+}
+
+static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+	rtl_hw_start_8102e_2(ioaddr, pdev);
+
+	rtl_ephy_write(ioaddr, 0x03, 0xc2f9);
+}
+
 static void rtl_hw_start_8101(struct net_device *dev)
 {
 	struct rtl8169_private *tp = netdev_priv(dev);
@@ -2134,8 +2820,26 @@
 
 	if ((tp->mac_version == RTL_GIGA_MAC_VER_13) ||
 	    (tp->mac_version == RTL_GIGA_MAC_VER_16)) {
-		pci_write_config_word(pdev, 0x68, 0x00);
-		pci_write_config_word(pdev, 0x69, 0x08);
+		int cap = tp->pcie_cap;
+
+		if (cap) {
+			pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL,
+					      PCI_EXP_DEVCTL_NOSNOOP_EN);
+		}
+	}
+
+	switch (tp->mac_version) {
+	case RTL_GIGA_MAC_VER_07:
+		rtl_hw_start_8102e_1(ioaddr, pdev);
+		break;
+
+	case RTL_GIGA_MAC_VER_08:
+		rtl_hw_start_8102e_3(ioaddr, pdev);
+		break;
+
+	case RTL_GIGA_MAC_VER_09:
+		rtl_hw_start_8102e_2(ioaddr, pdev);
+		break;
 	}
 
 	RTL_W8(Cfg9346, Cfg9346_Unlock);
@@ -2809,7 +3513,6 @@
 			if (rtl8169_rx_vlan_skb(tp, desc, skb) < 0)
 				netif_receive_skb(skb);
 
-			dev->last_rx = jiffies;
 			dev->stats.rx_bytes += pkt_size;
 			dev->stats.rx_packets++;
 		}
@@ -2891,8 +3594,8 @@
 		RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
 		tp->intr_mask = ~tp->napi_event;
 
-		if (likely(netif_rx_schedule_prep(dev, &tp->napi)))
-			__netif_rx_schedule(dev, &tp->napi);
+		if (likely(napi_schedule_prep(&tp->napi)))
+			__napi_schedule(&tp->napi);
 		else if (netif_msg_intr(tp)) {
 			printk(KERN_INFO "%s: interrupt %04x in poll\n",
 			       dev->name, status);
@@ -2913,7 +3616,7 @@
 	rtl8169_tx_interrupt(dev, tp, ioaddr);
 
 	if (work_done < budget) {
-		netif_rx_complete(dev, napi);
+		napi_complete(napi);
 		tp->intr_mask = 0xffff;
 		/*
 		 * 20040426: the barrier is not strictly required but the
@@ -3137,6 +3840,11 @@
 	return 0;
 }
 
+static void rtl_shutdown(struct pci_dev *pdev)
+{
+	rtl8169_suspend(pdev, PMSG_SUSPEND);
+}
+
 #endif /* CONFIG_PM */
 
 static struct pci_driver rtl8169_pci_driver = {
@@ -3147,6 +3855,7 @@
 #ifdef CONFIG_PM
 	.suspend	= rtl8169_suspend,
 	.resume		= rtl8169_resume,
+	.shutdown	= rtl_shutdown,
 #endif
 };
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.10
retrieving revision 1.837.2.11
diff -u -p -r1.837.2.10 -r1.837.2.11
--- .cvsignore	24 Mar 2009 02:53:24 -0000	1.837.2.10
+++ .cvsignore	30 Apr 2009 00:43:24 -0000	1.837.2.11
@@ -5,3 +5,4 @@ temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.21.bz2
+patch-2.6.27.22-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.45
retrieving revision 1.891.2.46
diff -u -p -r1.891.2.45 -r1.891.2.46
--- kernel.spec	18 Apr 2009 04:21:49 -0000	1.891.2.45
+++ kernel.spec	30 Apr 2009 00:43:24 -0000	1.891.2.46
@@ -36,9 +36,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 21
+%define stable_update 22
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -716,7 +716,7 @@ Patch2003: linux-2.6-e1000e-add-support-
 Patch2005: linux-2.6-e1000e-workaround-hw-errata.patch
 
 # r8169 fixes
-Patch2007: linux-2.6-netdev-r8169-2.6.28.patch
+Patch2007: linux-2.6-netdev-r8169-2.6.30.patch
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
@@ -733,7 +733,6 @@ Patch2201: linux-2.6-firewire-git-pendin
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 Patch2301: linux-2.6-usb-option-increase-outgoing-buffers.patch
-Patch2302: linux-2.6-usb-cdc-wdm-fix-oops.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -1168,8 +1167,6 @@ ApplyPatch linux-2.6-dmi-autoload.patch
 # actually honor the nousb parameter
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-option-increase-outgoing-buffers.patch
-# bz 481741
-ApplyPatch linux-2.6-usb-cdc-wdm-fix-oops.patch
 
 # ACPI
 # fix cpu detection (f10#435653)
@@ -1317,7 +1314,7 @@ ApplyPatch linux-2.6-e1000e-add-support-
 ApplyPatch linux-2.6-e1000e-add-support-for-new-82574L-part.patch
 ApplyPatch linux-2.6-e1000e-workaround-hw-errata.patch
 
-ApplyPatch linux-2.6-netdev-r8169-2.6.28.patch
+ApplyPatch linux-2.6-netdev-r8169-2.6.30.patch
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
@@ -1953,19 +1950,25 @@ fi
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
-* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.21-170.2.45
+* Wed Apr 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.22-78.2.46.rc1
+- Linux 2.6.27.22-rc1
+- Update r8169 network driver to 2.6.30-rc3-git6
+- Dropped patches merged upstream:
+  linux-2.6-usb-cdc-wdm-fix-oops.patch
+
+* Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.21-78.2.45
 - Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
 
-* Wed Apr 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.44
+* Wed Apr 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-78.2.44
 - Fix oops in cdc-wdm modem driver. (#481741)
 
-* Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.43
+* Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-78.2.43
 - iwlwifi: remove implicit direct scan
 
-* Thu Mar 26 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.42
+* Thu Mar 26 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-78.2.42
 - Next round of ext4 fixes for -stable.
 
-* Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.41
+* Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-78.2.41
 - 2.6.27.21
 - Dropped patches, merged in -stable:
   linux-2.6.27-alsa-fix-vunmap-and-free-order.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.10
retrieving revision 1.798.2.11
diff -u -p -r1.798.2.10 -r1.798.2.11
--- sources	24 Mar 2009 02:53:24 -0000	1.798.2.10
+++ sources	30 Apr 2009 00:43:24 -0000	1.798.2.11
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 9297d56c7e47f2977593d92e218228f2  patch-2.6.27.21.bz2
+175a830e359ac7968f52aa1212853dd9  patch-2.6.27.22-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.10
retrieving revision 1.717.2.11
diff -u -p -r1.717.2.10 -r1.717.2.11
--- upstream	24 Mar 2009 02:53:24 -0000	1.717.2.10
+++ upstream	30 Apr 2009 00:43:24 -0000	1.717.2.11
@@ -1,2 +1,3 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.21.bz2
+patch-2.6.27.22-rc1.bz2


--- linux-2.6-netdev-r8169-2.6.28.patch DELETED ---


--- linux-2.6-usb-cdc-wdm-fix-oops.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr 30 01:10:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 01:10:31 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.54, 1.55 kde-settings.spec,
	1.73, 1.74 sources, 1.55, 1.56
Message-ID: <20090430011031.16D7570133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12697/F-11

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-9.20090429svn
- krunnerrc: disable contacts plugin, avoids akonadi launch on first login



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	27 Apr 2009 19:46:40 -0000	1.54
+++ .cvsignore	30 Apr 2009 01:10:00 -0000	1.55
@@ -1 +1 @@
-kde-settings-4.2-20090427svn.tar.bz2
+kde-settings-4.2-20090429svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- kde-settings.spec	27 Apr 2009 19:46:40 -0000	1.73
+++ kde-settings.spec	30 Apr 2009 01:10:00 -0000	1.74
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090427svn
+%define rel 20090429svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 8.%{rel}%{?dist}
+Release: 9.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -158,6 +158,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-9.20090429svn
+- krunnerrc: disable contacts plugin, avoids akonadi launch on first login
+
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-8.20090427svn
 - -kdm: Requires: xterm (#491251), touchup Summary a bit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	27 Apr 2009 19:46:40 -0000	1.55
+++ sources	30 Apr 2009 01:10:00 -0000	1.56
@@ -1 +1 @@
-e377f820d77558babb42c50183fb03fb  kde-settings-4.2-20090427svn.tar.bz2
+654ddefa5adaf464d0e25b3744185a89  kde-settings-4.2-20090429svn.tar.bz2



From rdieter at fedoraproject.org  Thu Apr 30 01:10:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 01:10:31 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.54, 1.55 kde-settings.spec,
	1.73, 1.74 sources, 1.55, 1.56
Message-ID: <20090430011031.3FFD370133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12697/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-9.20090429svn
- krunnerrc: disable contacts plugin, avoids akonadi launch on first login



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	27 Apr 2009 19:46:41 -0000	1.54
+++ .cvsignore	30 Apr 2009 01:10:00 -0000	1.55
@@ -1 +1 @@
-kde-settings-4.2-20090427svn.tar.bz2
+kde-settings-4.2-20090429svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- kde-settings.spec	27 Apr 2009 19:46:41 -0000	1.73
+++ kde-settings.spec	30 Apr 2009 01:10:00 -0000	1.74
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090427svn
+%define rel 20090429svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 8.%{rel}%{?dist}
+Release: 9.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -158,6 +158,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-9.20090429svn
+- krunnerrc: disable contacts plugin, avoids akonadi launch on first login
+
 * Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-8.20090427svn
 - -kdm: Requires: xterm (#491251), touchup Summary a bit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	27 Apr 2009 19:46:41 -0000	1.55
+++ sources	30 Apr 2009 01:10:01 -0000	1.56
@@ -1 +1 @@
-e377f820d77558babb42c50183fb03fb  kde-settings-4.2-20090427svn.tar.bz2
+654ddefa5adaf464d0e25b3744185a89  kde-settings-4.2-20090429svn.tar.bz2



From cebbert at fedoraproject.org  Thu Apr 30 01:37:28 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 30 Apr 2009 01:37:28 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.27.22-rc1.bz2.sign,NONE,1.1.2.1
Message-ID: <20090430013728.0C00370133@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16946

Added Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.22-rc1.bz2.sign 
Log Message:
add .sign file


--- NEW FILE patch-2.6.27.22-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ+NVcyGugalF9Dw4RAvuPAJwIMh/e4AnTc0cGhuOdeG/MLj9/nwCeM95C
zF1XlCZD15f/S3AmHpqI3as=
=eKQC
-----END PGP SIGNATURE-----



From mclasen at fedoraproject.org  Thu Apr 30 02:14:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 30 Apr 2009 02:14:03 +0000 (UTC)
Subject: rpms/gdm/F-11 gdm-xkb-init.patch,NONE,1.1 gdm.spec,1.468,1.469
Message-ID: <20090430021403.835EE70133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22462

Modified Files:
	gdm.spec 
Added Files:
	gdm-xkb-init.patch 
Log Message:
Don't rely on _BACKUP property for xkb initialization


gdm-xkb-init.patch:

--- NEW FILE gdm-xkb-init.patch ---
diff -up gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xkb-init gdm-2.26.1/gui/simple-greeter/gdm-layouts.c
--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c.xkb-init	2009-04-29 21:27:20.129995831 -0400
+++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c	2009-04-29 21:28:12.378737969 -0400
@@ -55,9 +55,9 @@ init_xkl (void)
                 xkl_config_registry_load (config_registry);
 
                 initial_config = xkl_config_rec_new ();
-                if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
+                if (!xkl_config_rec_get_from_server (initial_config, engine)) {
                         g_warning ("failed to load XKB configuration");
-                        initial_config->model = g_strdup ("pc105");
+                        initial_config->model = g_strdup ("evdev");
                 }
         }
 }


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- gdm.spec	29 Apr 2009 00:20:19 -0000	1.468
+++ gdm.spec	30 Apr 2009 02:13:33 -0000	1.469
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -92,9 +92,8 @@ Requires: audit-libs >= %{libauditver}
 Patch2: gdm-2.26.0-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
 
-# uses /etc/sysconfig/keyboard and is thus not directly upstreamable
-# should probably be changed to get the system layout from the X server
 Patch13: gdm-system-keyboard.patch
+Patch14: gdm-xkb-init.patch
 
 Patch19: gdm-2.26.1-multistack.patch
 
@@ -143,6 +142,7 @@ The GDM fingerprint plugin provides func
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
 %patch13 -p1 -b .system-keyboard
+%patch14 -p1 -b .xkb-init
 
 %patch19 -p1 -b .multistack
 
@@ -390,6 +390,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-7
+- Don't rely on _BACKUP property for xkb initialization
+
 * Tue Apr 28 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.26.1-6
 - fix a use-after-free in XDMCP code paths (#496882)
 



From mclasen at fedoraproject.org  Thu Apr 30 02:17:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 30 Apr 2009 02:17:43 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11 gsd-xkb-init.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.102, 1.103
Message-ID: <20090430021744.0139470133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23093

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gsd-xkb-init.patch 
Log Message:
Don't rely on _BACKUP property for xkb initialization


gsd-xkb-init.patch:

--- NEW FILE gsd-xkb-init.patch ---
diff -up gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init	2009-04-29 21:42:13.873737299 -0400
+++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c	2009-04-29 21:42:23.752987998 -0400
@@ -234,7 +234,7 @@ gsd_keyboard_xkb_analyze_sysconfig (void
 	conf_client = gconf_client_get_default ();
 	gkbd_keyboard_config_init (&initial_sys_kbd_config,
 				   conf_client, xkl_engine);
-	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
+	gkbd_keyboard_config_load_from_x_current (&initial_sys_kbd_config,
 						  NULL);
 	g_object_unref (conf_client);
 }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gnome-settings-daemon.spec	29 Apr 2009 18:32:02 -0000	1.102
+++ gnome-settings-daemon.spec	30 Apr 2009 02:17:13 -0000	1.103
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -44,6 +44,8 @@ Patch12:	gnome-settings-daemon-2.26.1-fi
 # http://bugzilla.gnome.org/show_bug.cgi?id=580616
 Patch13:	compare-keys-carefully.patch
 
+Patch14:	gsd-xkb-init.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -66,6 +68,7 @@ developing applications that use %{name}
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .compare-keys-carefully
+%patch14 -p1 -b .xkb-init
 
 autoreconf -i -f
 
@@ -178,6 +181,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-4
+- Don't rely on _BACKUP property for xkb initialization
+
 * Wed Apr 29 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-3
 - Make custom keybindings work better (#497725)
 



From mclasen at fedoraproject.org  Thu Apr 30 02:26:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 30 Apr 2009 02:26:11 +0000 (UTC)
Subject: rpms/control-center/F-11 gcc-xkb-init.patch, NONE,
	1.1 control-center.spec, 1.446, 1.447
Message-ID: <20090430022611.2F55070133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24518

Modified Files:
	control-center.spec 
Added Files:
	gcc-xkb-init.patch 
Log Message:
Don't rely on _BACKUP property for xkb initialization



gcc-xkb-init.patch:

--- NEW FILE gcc-xkb-init.patch ---
diff -up gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c.xkb-init gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c
--- gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c.xkb-init	2009-04-29 21:53:58.375883837 -0400
+++ gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c	2009-04-29 21:54:21.511849642 -0400
@@ -159,7 +159,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf
 
 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
 				   engine);
-	gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
+	gkbd_keyboard_config_load_from_x_current (&initial_config, NULL);
 
 	setup_model_entry (dialog);
 


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/control-center.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- control-center.spec	16 Apr 2009 16:15:14 -0000	1.446
+++ control-center.spec	30 Apr 2009 02:25:40 -0000	1.447
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -60,6 +60,8 @@ Patch35: gnome-control-center-2.26.0-sup
 # http://bugzilla.gnome.org/show_bug.cgi?id=578572
 Patch36: display-capplet-mnemonics.patch
 
+Patch37: gcc-xkb-init.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -185,6 +187,7 @@ utilities.
 %patch34 -p0 -b .new-icons
 %patch35 -p1 -b .support-touchpads
 %patch36 -p1 -b .mnemonics
+%patch37 -p1 -b .xkb-init
 pushd capplets/about-me
 mv *png icons/
 popd
@@ -360,6 +363,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-6
+- Don't rely on _BACKUP property for xkb initialization
+
 * Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
 - Disable the fingerprint enrollment if gdm-plugin-fingerprint
   isn't installed



From james at fedoraproject.org  Thu Apr 30 03:29:54 2009
From: james at fedoraproject.org (James Antill)
Date: Thu, 30 Apr 2009 03:29:54 +0000 (UTC)
Subject: rpms/yum-presto/devel total-progress+stat-fixes.patch, 1.1,
	1.2 yum-presto.spec, 1.13, 1.14
Message-ID: <20090430032954.C005870135@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1453

Modified Files:
	total-progress+stat-fixes.patch yum-presto.spec 
Log Message:
* Wed Apr 29 2009 James Antill <james at fedoraproject.org> - 0.4.5-7
- Fix total to not overflow into rebuild


total-progress+stat-fixes.patch:

Index: total-progress+stat-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/total-progress+stat-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- total-progress+stat-fixes.patch	28 Apr 2009 18:46:39 -0000	1.1
+++ total-progress+stat-fixes.patch	30 Apr 2009 03:29:23 -0000	1.2
@@ -408,3 +408,41 @@ index ee7af65..17502bb 100644
  
  complete_download_size = 0
  actual_download_size   = 0
+commit 02e2eaa5a0fc96e28c9f985b89e77e2bb413509f
+Author: James Antill <james at and.org>
+Date:   Wed Apr 29 23:20:15 2009 -0400
+
+    Turn off total download, when download is finished
+
+diff --git a/yum-presto/presto.py b/yum-presto/presto.py
+index 17502bb..0fedc3c 100644
+--- a/yum-presto/presto.py
++++ b/yum-presto/presto.py
+@@ -409,6 +409,8 @@ def downloadPkgs(conduit, presto, download_pkgs=None):
+             curthread.messages = ""
+         lock.release()
+         
++    if hasattr(urlgrabber.progress, 'text_meter_total_size'):
++        urlgrabber.progress.text_meter_total_size(0)
+     ptsz, pfsz, pfnm = _processing_data()
+     if cb and rebuild_size > (ptsz + pfsz):
+         conduit.info(2, "Finishing rebuild of rpms, from deltarpms")
+commit 5b6727644f5252b15cc269279871afe8f2b85352
+Author: James Antill <james at and.org>
+Date:   Wed Apr 29 23:23:50 2009 -0400
+
+    Change post delta download text, to tell the truth
+
+diff --git a/yum-presto/presto.py b/yum-presto/presto.py
+index 0fedc3c..c9807b6 100644
+--- a/yum-presto/presto.py
++++ b/yum-presto/presto.py
+@@ -568,7 +568,7 @@ def predownload_hook(conduit):
+     if not download_pkgs:
+         return
+     xpostreposetup_hook(conduit, repos)
+-    conduit.info(2, "Downloading DeltaRPMs:")
++    conduit.info(2, "Processing delta metadata")
+ 
+     download_pkgs.sort()
+     # Download deltarpms


Index: yum-presto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- yum-presto.spec	28 Apr 2009 18:46:39 -0000	1.13
+++ yum-presto.spec	30 Apr 2009 03:29:23 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Presto plugin for yum
 Name: yum-presto
 Version: 0.4.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Wed Apr 29 2009 James Antill <james at fedoraproject.org> - 0.4.5-7
+- Fix total to not overflow into rebuild
+
 * Tue Apr 28 2009 James Antill <james at fedoraproject.org> - 0.4.5-6
 - Add total progress data to delta downloads
 - Fix stats. to account for the fact not everything has a delta



From phuang at fedoraproject.org  Thu Apr 30 04:32:17 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 30 Apr 2009 04:32:17 +0000 (UTC)
Subject: rpms/ibus-anthy/F-11 ibus-anthy-HEAD.patch, NONE,
	1.1 ibus-anthy.spec, 1.15, 1.16
Message-ID: <20090430043217.0CD0470135@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10449

Modified Files:
	ibus-anthy.spec 
Added Files:
	ibus-anthy-HEAD.patch 
Log Message:
Fix bug 498250 -  Cannot type zenkaku-space

ibus-anthy-HEAD.patch:

--- NEW FILE ibus-anthy-HEAD.patch ---
diff --git a/engine/engine.py b/engine/engine.py
index 98c46b5..de87b74 100644
--- a/engine/engine.py
+++ b/engine/engine.py
@@ -640,16 +640,21 @@ class Engine(ibus.EngineBase):
 
     def __on_key_space(self):
         if self.__input_mode == INPUT_MODE_WIDE_LATIN:
-            #  Input Wide Latin chars
-            char = unichr(keysyms.space)
-            wide_char = symbol_rule.get(char, None)
-            if wide_char == None:
-                wide_char = ibus.unichar_half_to_full(char)
+            # Input Wide space U+3000
+            wide_char = symbol_rule[unichr(keysyms.space)]
             self.__commit_string(wide_char)
             return True
 
         if self.__preedit_ja_string.is_empty():
-            return False
+            if self.__input_mode in (INPUT_MODE_HIRAGANA, INPUT_MODE_KATAKANA):
+                # Input Wide space U+3000
+                wide_char = symbol_rule[unichr(keysyms.space)]
+                self.__commit_string(wide_char)
+                return True
+            else:
+                # Input Half space U+0020
+                self.__commit_string(unichr(keysyms.space))
+                return True
 
         if self.__convert_mode != CONV_MODE_ANTHY:
             self.__begin_anthy_convert()


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/ibus-anthy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ibus-anthy.spec	2 Apr 2009 07:46:34 -0000	1.15
+++ ibus-anthy.spec	30 Apr 2009 04:31:46 -0000	1.16
@@ -2,12 +2,13 @@
 %define mod_path ibus-1.1
 Name:       ibus-anthy
 Version:    1.1.0.20090402
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:     ibus-anthy-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +28,7 @@ libanthy.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -54,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Apr 30 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090402-2
+- Update to upstream HEAD version
+- Fix bug 498250 - Cannot type zenkaku-space
+
 * Thu Apr 02 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090402-1
 - Update to 1.1.0.20090402.
 - Fix bug 490747 - Muhenkan (no-conversion) key does not undo conversion



From pkgdb at fedoraproject.org  Thu Apr 30 04:37:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:37:44 +0000
Subject: [pkgdb] globus-gsi-cert-utils was added for ellert
Message-ID: <20090430043744.84C1910F881@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gsi-cert-utils with summary Globus Toolkit - Globus GSI Cert Utils Library
kevin has approved Package globus-gsi-cert-utils
kevin has added a Fedora devel branch for globus-gsi-cert-utils with an owner of ellert
kevin has approved globus-gsi-cert-utils in Fedora devel
kevin has approved Package globus-gsi-cert-utils
kevin has set commit to Approved for provenpackager on globus-gsi-cert-utils (Fedora devel)
kevin has set build to Approved for provenpackager on globus-gsi-cert-utils (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-gsi-cert-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-cert-utils



From pkgdb at fedoraproject.org  Thu Apr 30 04:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:37:47 +0000
Subject: [pkgdb] globus-gsi-cert-utils (Fedora EPEL, 5) updated by kevin
Message-ID: <20090430043747.2A97710F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gsi-cert-utils
kevin has set commit to Approved for provenpackager on globus-gsi-cert-utils (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-gsi-cert-utils (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-gsi-cert-utils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-cert-utils



From pkgdb at fedoraproject.org  Thu Apr 30 04:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:37:47 +0000
Subject: [pkgdb] globus-gsi-cert-utils (Fedora, 10) updated by kevin
Message-ID: <20090430043747.301D310F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-gsi-cert-utils
kevin has set commit to Approved for provenpackager on globus-gsi-cert-utils (Fedora 10)
kevin has set build to Approved for provenpackager on globus-gsi-cert-utils (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-gsi-cert-utils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-cert-utils



From pkgdb at fedoraproject.org  Thu Apr 30 04:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:37:47 +0000
Subject: [pkgdb] globus-gsi-cert-utils (Fedora, 9) updated by kevin
Message-ID: <20090430043747.4139910F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-gsi-cert-utils
kevin has set commit to Approved for provenpackager on globus-gsi-cert-utils (Fedora 9)
kevin has set build to Approved for provenpackager on globus-gsi-cert-utils (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-gsi-cert-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-cert-utils



From pkgdb at fedoraproject.org  Thu Apr 30 04:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:37:47 +0000
Subject: [pkgdb] globus-gsi-cert-utils (Fedora, 11) updated by kevin
Message-ID: <20090430043747.56FF310F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gsi-cert-utils
kevin has set commit to Approved for provenpackager on globus-gsi-cert-utils (Fedora 11)
kevin has set build to Approved for provenpackager on globus-gsi-cert-utils (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-gsi-cert-utils (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-cert-utils



From pkgdb at fedoraproject.org  Thu Apr 30 04:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:37:47 +0000
Subject: [pkgdb] globus-gsi-cert-utils (Fedora EPEL, 4) updated by kevin
Message-ID: <20090430043747.607A710F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gsi-cert-utils
kevin has set commit to Approved for provenpackager on globus-gsi-cert-utils (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-gsi-cert-utils (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-gsi-cert-utils (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-cert-utils



From kevin at fedoraproject.org  Thu Apr 30 04:38:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:38:34 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils - New directory
Message-ID: <20090430043834.2D67370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr12019/rpms/globus-gsi-cert-utils

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-cert-utils added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:38:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:38:34 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/devel - New directory
Message-ID: <20090430043834.6E1E270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr12019/rpms/globus-gsi-cert-utils/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-cert-utils/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:38:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:38:42 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils Makefile,NONE,1.1
Message-ID: <20090430043842.D7EBA70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr12019/rpms/globus-gsi-cert-utils

Added Files:
	Makefile 
Log Message:
Setup of module globus-gsi-cert-utils


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gsi-cert-utils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:38:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:38:43 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090430043843.23E8170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr12019/rpms/globus-gsi-cert-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gsi-cert-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gsi-cert-utils
# $Id: Makefile,v 1.1 2009/04/30 04:38:42 kevin Exp $
NAME := globus-gsi-cert-utils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:39:12 +0000
Subject: [pkgdb] globus-gsi-sysconfig was added for ellert
Message-ID: <20090430043912.3ABA710F895@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gsi-sysconfig with summary Globus Toolkit - Globus GSI System Config Library
kevin has approved Package globus-gsi-sysconfig
kevin has added a Fedora devel branch for globus-gsi-sysconfig with an owner of ellert
kevin has approved globus-gsi-sysconfig in Fedora devel
kevin has approved Package globus-gsi-sysconfig
kevin has set commit to Approved for provenpackager on globus-gsi-sysconfig (Fedora devel)
kevin has set build to Approved for provenpackager on globus-gsi-sysconfig (Fedora devel)
kevin has set checkout to Approved for provenpackager on globus-gsi-sysconfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-sysconfig



From pkgdb at fedoraproject.org  Thu Apr 30 04:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:39:15 +0000
Subject: [pkgdb] globus-gsi-sysconfig (Fedora, 10) updated by kevin
Message-ID: <20090430043915.9F60810F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for globus-gsi-sysconfig
kevin has set commit to Approved for provenpackager on globus-gsi-sysconfig (Fedora 10)
kevin has set build to Approved for provenpackager on globus-gsi-sysconfig (Fedora 10)
kevin has set checkout to Approved for provenpackager on globus-gsi-sysconfig (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-sysconfig



From pkgdb at fedoraproject.org  Thu Apr 30 04:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:39:15 +0000
Subject: [pkgdb] globus-gsi-sysconfig (Fedora, 11) updated by kevin
Message-ID: <20090430043915.AEB6110F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gsi-sysconfig
kevin has set commit to Approved for provenpackager on globus-gsi-sysconfig (Fedora 11)
kevin has set build to Approved for provenpackager on globus-gsi-sysconfig (Fedora 11)
kevin has set checkout to Approved for provenpackager on globus-gsi-sysconfig (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-sysconfig



From pkgdb at fedoraproject.org  Thu Apr 30 04:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:39:15 +0000
Subject: [pkgdb] globus-gsi-sysconfig (Fedora EPEL, 5) updated by kevin
Message-ID: <20090430043915.A553A10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gsi-sysconfig
kevin has set commit to Approved for provenpackager on globus-gsi-sysconfig (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on globus-gsi-sysconfig (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on globus-gsi-sysconfig (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-sysconfig



From pkgdb at fedoraproject.org  Thu Apr 30 04:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:39:15 +0000
Subject: [pkgdb] globus-gsi-sysconfig (Fedora, 9) updated by kevin
Message-ID: <20090430043915.B483A10F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for globus-gsi-sysconfig
kevin has set commit to Approved for provenpackager on globus-gsi-sysconfig (Fedora 9)
kevin has set build to Approved for provenpackager on globus-gsi-sysconfig (Fedora 9)
kevin has set checkout to Approved for provenpackager on globus-gsi-sysconfig (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-sysconfig



From kevin at fedoraproject.org  Thu Apr 30 04:39:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:39:26 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig - New directory
Message-ID: <20090430043926.2374870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv12395/rpms/globus-gsi-sysconfig

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-sysconfig added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:39:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:39:26 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/devel - New directory
Message-ID: <20090430043926.6C1A770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv12395/rpms/globus-gsi-sysconfig/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gsi-sysconfig/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:39:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:39:36 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig Makefile,NONE,1.1
Message-ID: <20090430043936.6B37B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv12395/rpms/globus-gsi-sysconfig

Added Files:
	Makefile 
Log Message:
Setup of module globus-gsi-sysconfig


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gsi-sysconfig
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:39:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:39:36 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430043936.BC48F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv12395/rpms/globus-gsi-sysconfig/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gsi-sysconfig


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gsi-sysconfig
# $Id: Makefile,v 1.1 2009/04/30 04:39:36 kevin Exp $
NAME := globus-gsi-sysconfig
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:39:15 +0000
Subject: [pkgdb] globus-gsi-sysconfig (Fedora EPEL, 4) updated by kevin
Message-ID: <20090430043915.C072B10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gsi-sysconfig
kevin has set commit to Approved for provenpackager on globus-gsi-sysconfig (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on globus-gsi-sysconfig (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on globus-gsi-sysconfig (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/globus-gsi-sysconfig



From pkgdb at fedoraproject.org  Thu Apr 30 04:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:40:51 +0000
Subject: [pkgdb] rubygem-rufus-scheduler was added for mcpierce
Message-ID: <20090430044052.0580110F895@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-rufus-scheduler with summary Scheduler for Ruby
kevin has approved Package rubygem-rufus-scheduler
kevin has added a Fedora devel branch for rubygem-rufus-scheduler with an owner of mcpierce
kevin has approved rubygem-rufus-scheduler in Fedora devel
kevin has approved Package rubygem-rufus-scheduler
kevin has set commit to Approved for provenpackager on rubygem-rufus-scheduler (Fedora devel)
kevin has set build to Approved for provenpackager on rubygem-rufus-scheduler (Fedora devel)
kevin has set checkout to Approved for provenpackager on rubygem-rufus-scheduler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rufus-scheduler



From pkgdb at fedoraproject.org  Thu Apr 30 04:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:40:53 +0000
Subject: [pkgdb] rubygem-rufus-scheduler (Fedora, 10) updated by kevin
Message-ID: <20090430044054.16D5D10F896@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-rufus-scheduler
kevin has set commit to Approved for provenpackager on rubygem-rufus-scheduler (Fedora 10)
kevin has set build to Approved for provenpackager on rubygem-rufus-scheduler (Fedora 10)
kevin has set checkout to Approved for provenpackager on rubygem-rufus-scheduler (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rufus-scheduler



From pkgdb at fedoraproject.org  Thu Apr 30 04:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:40:53 +0000
Subject: [pkgdb] rubygem-rufus-scheduler (Fedora, 11) updated by kevin
Message-ID: <20090430044054.20B1C10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-rufus-scheduler
kevin has set commit to Approved for provenpackager on rubygem-rufus-scheduler (Fedora 11)
kevin has set build to Approved for provenpackager on rubygem-rufus-scheduler (Fedora 11)
kevin has set checkout to Approved for provenpackager on rubygem-rufus-scheduler (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rufus-scheduler



From kevin at fedoraproject.org  Thu Apr 30 04:41:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:41:11 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler - New directory
Message-ID: <20090430044111.3089B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12896/rpms/rubygem-rufus-scheduler

Log Message:
Directory /cvs/pkgs/rpms/rubygem-rufus-scheduler added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:41:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:41:11 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler/devel - New directory
Message-ID: <20090430044111.789E370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12896/rpms/rubygem-rufus-scheduler/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 04:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:40:53 +0000
Subject: [pkgdb] rubygem-rufus-scheduler (Fedora EPEL, 5) updated by kevin
Message-ID: <20090430044054.3330210F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-rufus-scheduler
kevin has set commit to Approved for provenpackager on rubygem-rufus-scheduler (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on rubygem-rufus-scheduler (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on rubygem-rufus-scheduler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rufus-scheduler



From kevin at fedoraproject.org  Thu Apr 30 04:41:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:41:21 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler Makefile,NONE,1.1
Message-ID: <20090430044121.CF47A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12896/rpms/rubygem-rufus-scheduler

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-rufus-scheduler


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-rufus-scheduler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:41:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:41:22 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090430044122.1DC7D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk12896/rpms/rubygem-rufus-scheduler/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-rufus-scheduler


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-rufus-scheduler
# $Id: Makefile,v 1.1 2009/04/30 04:41:21 kevin Exp $
NAME := rubygem-rufus-scheduler
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:41:57 +0000
Subject: [pkgdb] mingw32-libsqlite3x was added for sailer
Message-ID: <20090430044158.00CDA10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-libsqlite3x with summary MinGW Windows C++ wrapper for the sqlite database
kevin has approved Package mingw32-libsqlite3x
kevin has added a Fedora devel branch for mingw32-libsqlite3x with an owner of sailer
kevin has approved mingw32-libsqlite3x in Fedora devel
kevin has approved Package mingw32-libsqlite3x
kevin has set commit to Approved for provenpackager on mingw32-libsqlite3x (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libsqlite3x (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libsqlite3x (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libsqlite3x



From pkgdb at fedoraproject.org  Thu Apr 30 04:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:41:59 +0000
Subject: [pkgdb] mingw32-libsqlite3x (Fedora, 10) updated by kevin
Message-ID: <20090430044159.C633710F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libsqlite3x
kevin has set commit to Approved for provenpackager on mingw32-libsqlite3x (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libsqlite3x (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libsqlite3x (Fedora 10)
kevin approved watchbugzilla on mingw32-libsqlite3x (Fedora 10) for rjones
kevin approved watchcommits on mingw32-libsqlite3x (Fedora 10) for rjones
kevin approved commit on mingw32-libsqlite3x (Fedora 10) for rjones
kevin approved build on mingw32-libsqlite3x (Fedora 10) for rjones
kevin approved approveacls on mingw32-libsqlite3x (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libsqlite3x



From pkgdb at fedoraproject.org  Thu Apr 30 04:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:41:59 +0000
Subject: [pkgdb] mingw32-libsqlite3x (Fedora, 11) updated by kevin
Message-ID: <20090430044159.D6E7910F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-libsqlite3x
kevin has set commit to Approved for provenpackager on mingw32-libsqlite3x (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-libsqlite3x (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-libsqlite3x (Fedora 11)
kevin approved watchbugzilla on mingw32-libsqlite3x (Fedora 11) for rjones
kevin approved watchcommits on mingw32-libsqlite3x (Fedora 11) for rjones
kevin approved commit on mingw32-libsqlite3x (Fedora 11) for rjones
kevin approved build on mingw32-libsqlite3x (Fedora 11) for rjones
kevin approved approveacls on mingw32-libsqlite3x (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libsqlite3x



From pkgdb at fedoraproject.org  Thu Apr 30 04:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:41:59 +0000
Subject: [pkgdb] mingw32-libsqlite3x (Fedora, devel) updated by kevin
Message-ID: <20090430044159.E2EA810F89D@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libsqlite3x (Fedora devel) for rjones
kevin approved watchcommits on mingw32-libsqlite3x (Fedora devel) for rjones
kevin approved commit on mingw32-libsqlite3x (Fedora devel) for rjones
kevin approved build on mingw32-libsqlite3x (Fedora devel) for rjones
kevin approved approveacls on mingw32-libsqlite3x (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libsqlite3x



From kevin at fedoraproject.org  Thu Apr 30 04:42:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:42:10 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x/devel - New directory
Message-ID: <20090430044210.78A0770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libsqlite3x/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13256/rpms/mingw32-libsqlite3x/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libsqlite3x/devel added to the repository




From cebbert at fedoraproject.org  Thu Apr 30 04:41:59 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 30 Apr 2009 04:41:59 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-netdev-r8169-add-more-netdevice-ops-R.patch, 
	NONE, 1.1.2.1 linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch,
	NONE, 1.1.2.1 kernel.spec, 1.891.2.46, 1.891.2.47
Message-ID: <20090430044159.D3C6770133@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12955

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-netdev-r8169-add-more-netdevice-ops-R.patch 
	linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch 
Log Message:
Revert netdevice_ops changes in the r8169 driver so it builds on 2.6.27.

linux-2.6-netdev-r8169-add-more-netdevice-ops-R.patch:

--- NEW FILE linux-2.6-netdev-r8169-add-more-netdevice-ops-R.patch ---
From: Stephen Hemminger <shemminger at vyatta.com>
Date: Fri, 21 Nov 2008 04:14:53 +0000 (-0800)
Subject: netdev: add more functions to netdevice ops
X-Git-Tag: v2.6.29-rc1~581^2~615
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=008298231abbeb91bc7be9e8b078607b816d1a4a

netdev: add more functions to netdevice ops

This patch moves neigh_setup and hard_start_xmit into the network device ops
structure. For bisection, fix all the previously converted drivers as well.
Bonding driver took the biggest hit on this.

Added a prefetch of the hard_start_xmit in the fast path to try and reduce
any impact this would have.

Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
r8169 only
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bac58ca..dddf6ae 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1927,6 +1927,7 @@ static const struct net_device_ops rtl8169_netdev_ops = {
 	.ndo_open		= rtl8169_open,
 	.ndo_stop		= rtl8169_close,
 	.ndo_get_stats		= rtl8169_get_stats,
+	.ndo_start_xmit		= rtl8169_start_xmit,
 	.ndo_tx_timeout		= rtl8169_tx_timeout,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_change_mtu		= rtl8169_change_mtu,
@@ -2125,7 +2126,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-	dev->hard_start_xmit = rtl8169_start_xmit;
 	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
 	dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
 	dev->irq = pdev->irq;

linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch:

--- NEW FILE linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch ---
From: Francois Romieu <romieu at fr.zoreil.com>
Date: Thu, 20 Nov 2008 06:05:25 +0000 (-0800)
Subject: r8169: convert to net_device_ops
X-Git-Tag: v2.6.29-rc1~581^2~663
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8b4ab28dae8afa14f22d210c591046def2f4d742

r8169: convert to net_device_ops

Based upon a patch by Stephen Hemminger.

Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index cb5042e..bac58ca 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -474,6 +474,7 @@ struct rtl8169_private {
 	void (*hw_start)(struct net_device *);
 	unsigned int (*phy_reset_pending)(void __iomem *);
 	unsigned int (*link_ok)(void __iomem *);
+	int (*do_ioctl)(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd);
 	int pcie_cap;
 	struct delayed_work task;
 	unsigned features;
@@ -1829,9 +1830,11 @@ static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	struct rtl8169_private *tp = netdev_priv(dev);
 	struct mii_ioctl_data *data = if_mii(ifr);
 
-	if (!netif_running(dev))
-		return -ENODEV;
+	return netif_running(dev) ? tp->do_ioctl(tp, data, cmd) : -ENODEV;
+}
 
+static int rtl_xmii_ioctl(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd)
+{
 	switch (cmd) {
 	case SIOCGMIIPHY:
 		data->phy_id = 32; /* Internal PHY */
@@ -1850,6 +1853,11 @@ static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	return -EOPNOTSUPP;
 }
 
+static int rtl_tbi_ioctl(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd)
+{
+	return -EOPNOTSUPP;
+}
+
 static const struct rtl_cfg_info {
 	void (*hw_start)(struct net_device *);
 	unsigned int region;
@@ -1915,6 +1923,25 @@ static void rtl_disable_msi(struct pci_dev *pdev, struct rtl8169_private *tp)
 	}
 }
 
+static const struct net_device_ops rtl8169_netdev_ops = {
+	.ndo_open		= rtl8169_open,
+	.ndo_stop		= rtl8169_close,
+	.ndo_get_stats		= rtl8169_get_stats,
+	.ndo_tx_timeout		= rtl8169_tx_timeout,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_change_mtu		= rtl8169_change_mtu,
+	.ndo_set_mac_address	= rtl_set_mac_address,
+	.ndo_do_ioctl		= rtl8169_ioctl,
+	.ndo_set_multicast_list	= rtl_set_rx_mode,
+#ifdef CONFIG_R8169_VLAN
+	.ndo_vlan_rx_register	= rtl8169_vlan_rx_register,
+#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller	= rtl8169_netpoll,
+#endif
+
+};
+
 static int __devinit
 rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -1941,6 +1968,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	}
 
 	SET_NETDEV_DEV(dev, &pdev->dev);
+	dev->netdev_ops = &rtl8169_netdev_ops;
 	tp = netdev_priv(dev);
 	tp->dev = dev;
 	tp->pci_dev = pdev;
@@ -2076,6 +2104,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		tp->phy_reset_enable = rtl8169_tbi_reset_enable;
 		tp->phy_reset_pending = rtl8169_tbi_reset_pending;
 		tp->link_ok = rtl8169_tbi_link_ok;
+		tp->do_ioctl = rtl_tbi_ioctl;
 
 		tp->phy_1000_ctrl_reg = ADVERTISE_1000FULL; /* Implied by TBI */
 	} else {
@@ -2084,8 +2113,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		tp->phy_reset_enable = rtl8169_xmii_reset_enable;
 		tp->phy_reset_pending = rtl8169_xmii_reset_pending;
 		tp->link_ok = rtl8169_xmii_link_ok;
-
-		dev->do_ioctl = rtl8169_ioctl;
+		tp->do_ioctl = rtl_xmii_ioctl;
 	}
 
 	spin_lock_init(&tp->lock);
@@ -2097,28 +2125,16 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-	dev->open = rtl8169_open;
 	dev->hard_start_xmit = rtl8169_start_xmit;
-	dev->get_stats = rtl8169_get_stats;
 	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
-	dev->stop = rtl8169_close;
-	dev->tx_timeout = rtl8169_tx_timeout;
-	dev->set_multicast_list = rtl_set_rx_mode;
 	dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
 	dev->irq = pdev->irq;
 	dev->base_addr = (unsigned long) ioaddr;
-	dev->change_mtu = rtl8169_change_mtu;
-	dev->set_mac_address = rtl_set_mac_address;
 
 	netif_napi_add(dev, &tp->napi, rtl8169_poll, R8169_NAPI_WEIGHT);
 
 #ifdef CONFIG_R8169_VLAN
 	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-	dev->vlan_rx_register = rtl8169_vlan_rx_register;
-#endif
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = rtl8169_netpoll;
 #endif
 
 	tp->intr_mask = 0xffff;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.46
retrieving revision 1.891.2.47
diff -u -p -r1.891.2.46 -r1.891.2.47
--- kernel.spec	30 Apr 2009 00:43:24 -0000	1.891.2.46
+++ kernel.spec	30 Apr 2009 04:41:29 -0000	1.891.2.47
@@ -717,6 +717,8 @@ Patch2005: linux-2.6-e1000e-workaround-h
 
 # r8169 fixes
 Patch2007: linux-2.6-netdev-r8169-2.6.30.patch
+Patch2008: linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch
+Patch2009: linux-2.6-netdev-r8169-add-more-netdevice-ops-R.patch
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
@@ -1315,6 +1317,9 @@ ApplyPatch linux-2.6-e1000e-add-support-
 ApplyPatch linux-2.6-e1000e-workaround-hw-errata.patch
 
 ApplyPatch linux-2.6-netdev-r8169-2.6.30.patch
+ApplyPatch linux-2.6-netdev-r8169-add-more-netdevice-ops-R.patch -R
+ApplyPatch linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch -R
+
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
@@ -1950,6 +1955,9 @@ fi
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Apr 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.22-78.2.47.rc1
+- Revert netdevice_ops changes in the r8169 driver so it builds on 2.6.27.
+
 * Wed Apr 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.22-78.2.46.rc1
 - Linux 2.6.27.22-rc1
 - Update r8169 network driver to 2.6.30-rc3-git6



From kevin at fedoraproject.org  Thu Apr 30 04:42:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:42:10 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x - New directory
Message-ID: <20090430044210.3A99B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libsqlite3x
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13256/rpms/mingw32-libsqlite3x

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libsqlite3x added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:42:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:42:19 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x Makefile,NONE,1.1
Message-ID: <20090430044219.803C070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libsqlite3x
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13256/rpms/mingw32-libsqlite3x

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libsqlite3x


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libsqlite3x
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:42:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:42:20 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430044220.053FA70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libsqlite3x/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13256/rpms/mingw32-libsqlite3x/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libsqlite3x


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libsqlite3x
# $Id: Makefile,v 1.1 2009/04/30 04:42:19 kevin Exp $
NAME := mingw32-libsqlite3x
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:43:25 +0000
Subject: [pkgdb] tucan was added for cassmodiah
Message-ID: <20090430044325.882F010F881@bastion2.fedora.phx.redhat.com>

kevin has added Package tucan with summary Manager for downloads and uploads at hosting sites
kevin has approved Package tucan
kevin has added a Fedora devel branch for tucan with an owner of cassmodiah
kevin has approved tucan in Fedora devel
kevin has approved Package tucan
kevin has set commit to Approved for provenpackager on tucan (Fedora devel)
kevin has set build to Approved for provenpackager on tucan (Fedora devel)
kevin has set checkout to Approved for provenpackager on tucan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tucan



From pkgdb at fedoraproject.org  Thu Apr 30 04:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:43:27 +0000
Subject: [pkgdb] tucan (Fedora, 10) updated by kevin
Message-ID: <20090430044327.A51B910F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for tucan
kevin has set commit to Approved for provenpackager on tucan (Fedora 10)
kevin has set build to Approved for provenpackager on tucan (Fedora 10)
kevin has set checkout to Approved for provenpackager on tucan (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tucan



From kevin at fedoraproject.org  Thu Apr 30 04:43:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:43:36 +0000 (UTC)
Subject: rpms/tucan - New directory
Message-ID: <20090430044336.234FE70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tucan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13638/rpms/tucan

Log Message:
Directory /cvs/pkgs/rpms/tucan added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:43:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:43:36 +0000 (UTC)
Subject: rpms/tucan/devel - New directory
Message-ID: <20090430044336.5AAA770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tucan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13638/rpms/tucan/devel

Log Message:
Directory /cvs/pkgs/rpms/tucan/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:43:45 +0000 (UTC)
Subject: rpms/tucan Makefile,NONE,1.1
Message-ID: <20090430044345.070F270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tucan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13638/rpms/tucan

Added Files:
	Makefile 
Log Message:
Setup of module tucan


--- NEW FILE Makefile ---
# Top level Makefile for module tucan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:43:45 +0000 (UTC)
Subject: rpms/tucan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090430044345.3FC1D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tucan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13638/rpms/tucan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tucan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tucan
# $Id: Makefile,v 1.1 2009/04/30 04:43:45 kevin Exp $
NAME := tucan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:43:27 +0000
Subject: [pkgdb] tucan (Fedora, 11) updated by kevin
Message-ID: <20090430044327.C716D10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for tucan
kevin has set commit to Approved for provenpackager on tucan (Fedora 11)
kevin has set build to Approved for provenpackager on tucan (Fedora 11)
kevin has set checkout to Approved for provenpackager on tucan (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tucan



From pkgdb at fedoraproject.org  Thu Apr 30 04:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:46:43 +0000
Subject: [pkgdb] razertool (Fedora, 10) updated by kevin
Message-ID: <20090430044643.45B1610F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for razertool
kevin has set commit to Approved for provenpackager on razertool (Fedora 10)
kevin has set build to Approved for provenpackager on razertool (Fedora 10)
kevin has set checkout to Approved for provenpackager on razertool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/razertool



From pkgdb at fedoraproject.org  Thu Apr 30 04:46:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:46:41 +0000
Subject: [pkgdb] razertool was added for th0br0
Message-ID: <20090430044641.42B8A10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package razertool with summary Tool for controlling Razer Copperhead mice
kevin has approved Package razertool
kevin has added a Fedora devel branch for razertool with an owner of th0br0
kevin has approved razertool in Fedora devel
kevin has approved Package razertool
kevin has set commit to Approved for provenpackager on razertool (Fedora devel)
kevin has set build to Approved for provenpackager on razertool (Fedora devel)
kevin has set checkout to Approved for provenpackager on razertool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/razertool



From kevin at fedoraproject.org  Thu Apr 30 04:46:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:46:53 +0000 (UTC)
Subject: rpms/razertool - New directory
Message-ID: <20090430044653.2F65770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/razertool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse14135/rpms/razertool

Log Message:
Directory /cvs/pkgs/rpms/razertool added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:46:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:46:53 +0000 (UTC)
Subject: rpms/razertool/devel - New directory
Message-ID: <20090430044653.74E3A70135@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/razertool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse14135/rpms/razertool/devel

Log Message:
Directory /cvs/pkgs/rpms/razertool/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:47:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:47:03 +0000 (UTC)
Subject: rpms/razertool Makefile,NONE,1.1
Message-ID: <20090430044703.8720170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/razertool
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse14135/rpms/razertool

Added Files:
	Makefile 
Log Message:
Setup of module razertool


--- NEW FILE Makefile ---
# Top level Makefile for module razertool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 30 04:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:46:43 +0000
Subject: [pkgdb] razertool (Fedora, 11) updated by kevin
Message-ID: <20090430044643.4CDBF10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for razertool
kevin has set commit to Approved for provenpackager on razertool (Fedora 11)
kevin has set build to Approved for provenpackager on razertool (Fedora 11)
kevin has set checkout to Approved for provenpackager on razertool (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/razertool



From kevin at fedoraproject.org  Thu Apr 30 04:47:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:47:03 +0000 (UTC)
Subject: rpms/razertool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430044703.D1EE170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/razertool/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse14135/rpms/razertool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module razertool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: razertool
# $Id: Makefile,v 1.1 2009/04/30 04:47:03 kevin Exp $
NAME := razertool
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:47:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:47:42 +0000
Subject: [pkgdb] mingw32-plotmm was added for sailer
Message-ID: <20090430044742.DFD7110F881@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-plotmm with summary MinGW GTKmm plot widget for scientific applications
kevin has approved Package mingw32-plotmm
kevin has added a Fedora devel branch for mingw32-plotmm with an owner of sailer
kevin has approved mingw32-plotmm in Fedora devel
kevin has approved Package mingw32-plotmm
kevin has set commit to Approved for provenpackager on mingw32-plotmm (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-plotmm (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-plotmm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-plotmm



From pkgdb at fedoraproject.org  Thu Apr 30 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:47:46 +0000
Subject: [pkgdb] mingw32-plotmm (Fedora, devel) updated by kevin
Message-ID: <20090430044746.7A28210F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-plotmm (Fedora devel) for rjones
kevin approved watchcommits on mingw32-plotmm (Fedora devel) for rjones
kevin approved commit on mingw32-plotmm (Fedora devel) for rjones
kevin approved build on mingw32-plotmm (Fedora devel) for rjones
kevin approved approveacls on mingw32-plotmm (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-plotmm



From pkgdb at fedoraproject.org  Thu Apr 30 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:47:46 +0000
Subject: [pkgdb] mingw32-plotmm (Fedora, 10) updated by kevin
Message-ID: <20090430044746.8300210F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-plotmm
kevin has set commit to Approved for provenpackager on mingw32-plotmm (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-plotmm (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-plotmm (Fedora 10)
kevin approved watchbugzilla on mingw32-plotmm (Fedora 10) for rjones
kevin approved watchcommits on mingw32-plotmm (Fedora 10) for rjones
kevin approved commit on mingw32-plotmm (Fedora 10) for rjones
kevin approved build on mingw32-plotmm (Fedora 10) for rjones
kevin approved approveacls on mingw32-plotmm (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-plotmm



From pkgdb at fedoraproject.org  Thu Apr 30 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:47:46 +0000
Subject: [pkgdb] mingw32-plotmm (Fedora, 11) updated by kevin
Message-ID: <20090430044746.961CD10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-plotmm
kevin has set commit to Approved for provenpackager on mingw32-plotmm (Fedora 11)
kevin has set build to Approved for provenpackager on mingw32-plotmm (Fedora 11)
kevin has set checkout to Approved for provenpackager on mingw32-plotmm (Fedora 11)
kevin approved watchbugzilla on mingw32-plotmm (Fedora 11) for rjones
kevin approved watchcommits on mingw32-plotmm (Fedora 11) for rjones
kevin approved commit on mingw32-plotmm (Fedora 11) for rjones
kevin approved build on mingw32-plotmm (Fedora 11) for rjones
kevin approved approveacls on mingw32-plotmm (Fedora 11) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-plotmm



From kevin at fedoraproject.org  Thu Apr 30 04:48:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:48:00 +0000 (UTC)
Subject: rpms/mingw32-plotmm - New directory
Message-ID: <20090430044800.309B670133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-plotmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA14559/rpms/mingw32-plotmm

Log Message:
Directory /cvs/pkgs/rpms/mingw32-plotmm added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:48:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:48:00 +0000 (UTC)
Subject: rpms/mingw32-plotmm/devel - New directory
Message-ID: <20090430044800.830F370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-plotmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA14559/rpms/mingw32-plotmm/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-plotmm/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:48:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:48:10 +0000 (UTC)
Subject: rpms/mingw32-plotmm Makefile,NONE,1.1
Message-ID: <20090430044810.9BC8C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-plotmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA14559/rpms/mingw32-plotmm

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-plotmm


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-plotmm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:48:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:48:10 +0000 (UTC)
Subject: rpms/mingw32-plotmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430044810.E214F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-plotmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA14559/rpms/mingw32-plotmm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-plotmm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-plotmm
# $Id: Makefile,v 1.1 2009/04/30 04:48:10 kevin Exp $
NAME := mingw32-plotmm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From transif at fedoraproject.org  Thu Apr 30 04:48:14 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 30 Apr 2009 04:48:14 +0000 (UTC)
Subject: comps/po hu.po,1.19,1.20
Message-ID: <20090430044814.E4FDC70133@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14484/po

Modified Files:
	hu.po 
Log Message:
Sending translation for Hungarian


Index: hu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hu.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- hu.po	29 Apr 2009 20:00:20 -0000	1.19
+++ hu.po	30 Apr 2009 04:47:44 -0000	1.20
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-21 18:52+0100\n"
+"POT-Creation-Date: 2009-04-30 02:09+0000\n"
+"PO-Revision-Date: 2009-04-30 06:47+0200\n"
 "Last-Translator: Sulyok P??ter <peti at sulyok.hu>\n"
 "Language-Team: Hungarian <fedora-trans-hu at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);"
 
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
@@ -1295,19 +1295,16 @@ msgid "Amazigh Support"
 msgstr "Amazig (berber, Marokk??) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "Szerb t??mogat??s"
+msgstr "Azerbajdzs??ni t??mogat??s"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "K??nai t??mogat??s"
+msgstr "Csicseva (DK-Afrika) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "Horv??t t??mogat??s"
+msgstr "Kopt (Egyiptom) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1318,9 +1315,8 @@ msgid "Electronic Lab"
 msgstr "Elektronika Lab"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "Fr??z (N??met-??b??l) t??mogat??s"
+msgstr "Fidzsi t??mogat??s"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1335,47 +1331,40 @@ msgid "Friulian Support"
 msgstr "Friuli (r??t??rom??n Sv??jc/Olaszo.) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "Filipin?? (F??l??p-szk.) t??mogat??s"
+msgstr "Hiligaynon (F??l??p-szk.) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "Olasz t??mogat??s"
+msgstr "Interlingua t??mogat??s"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "Kanada (India) t??mogat??s"
+msgstr "Kazah t??mogat??s"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "Ruandai t??mogat??s"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "Lett t??mogat??s"
+msgstr "Latin t??mogat??s"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "T??r??k t??mogat??s"
+msgstr "Luxemburgi t??mogat??s"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "Madagaszk??ri t??mogat??s"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "Mal??j t??mogat??s"
+msgstr "M??ltai t??mogat??s"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "Mal??j t??mogat??s"
+msgstr "Mani (Egyes??lt Kir??lys??g) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1394,14 +1383,12 @@ msgid "Online Help and Documentation"
 msgstr "H??l??zati s??g?? ??s iratok"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "Spanyol t??mogat??s"
+msgstr "Szanszkrit (India) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "Ukr??n t??mogat??s"
+msgstr "Sz??rd (Olaszo.) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1424,14 +1411,12 @@ msgstr ""
 "fejleszt??shez."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "Szvati (Pakiszt??n) t??mogat??s"
+msgstr "Szvahili (DK-Afrika) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "Telugu (India) t??mogat??s"
+msgstr "Tetum (K-Timor) t??mogat??s"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""



From pkgdb at fedoraproject.org  Thu Apr 30 04:48:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:48:58 +0000
Subject: [pkgdb] perl-App-Daemon was added for iarnell
Message-ID: <20090430044858.9CF1610F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-App-Daemon with summary Start an Application as a Daemon
kevin has approved Package perl-App-Daemon
kevin has added a Fedora devel branch for perl-App-Daemon with an owner of iarnell
kevin has approved perl-App-Daemon in Fedora devel
kevin has approved Package perl-App-Daemon
kevin has set commit to Approved for provenpackager on perl-App-Daemon (Fedora devel)
kevin has set build to Approved for provenpackager on perl-App-Daemon (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-App-Daemon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Daemon



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:01 +0000
Subject: [pkgdb] perl-App-Daemon (Fedora, devel) updated by kevin
Message-ID: <20090430044901.49CFE10F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-App-Daemon (Fedora devel) for perl-sig
kevin approved watchcommits on perl-App-Daemon (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Daemon



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:01 +0000
Subject: [pkgdb] perl-App-Daemon (Fedora, 10) updated by kevin
Message-ID: <20090430044901.4FDEB10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-App-Daemon
kevin has set commit to Approved for provenpackager on perl-App-Daemon (Fedora 10)
kevin has set build to Approved for provenpackager on perl-App-Daemon (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-App-Daemon (Fedora 10)
kevin approved watchbugzilla on perl-App-Daemon (Fedora 10) for perl-sig
kevin approved watchcommits on perl-App-Daemon (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Daemon



From kevin at fedoraproject.org  Thu Apr 30 04:49:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:49:12 +0000 (UTC)
Subject: rpms/perl-App-Daemon - New directory
Message-ID: <20090430044912.2B93D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Daemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14880/rpms/perl-App-Daemon

Log Message:
Directory /cvs/pkgs/rpms/perl-App-Daemon added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:49:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:49:12 +0000 (UTC)
Subject: rpms/perl-App-Daemon/devel - New directory
Message-ID: <20090430044912.6617470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14880/rpms/perl-App-Daemon/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-App-Daemon/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:49:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:49:22 +0000 (UTC)
Subject: rpms/perl-App-Daemon Makefile,NONE,1.1
Message-ID: <20090430044922.AEA3C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Daemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14880/rpms/perl-App-Daemon

Added Files:
	Makefile 
Log Message:
Setup of module perl-App-Daemon


--- NEW FILE Makefile ---
# Top level Makefile for module perl-App-Daemon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:01 +0000
Subject: [pkgdb] perl-App-Daemon (Fedora, 11) updated by kevin
Message-ID: <20090430044901.5C84910F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-App-Daemon
kevin has set commit to Approved for provenpackager on perl-App-Daemon (Fedora 11)
kevin has set build to Approved for provenpackager on perl-App-Daemon (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-App-Daemon (Fedora 11)
kevin approved watchbugzilla on perl-App-Daemon (Fedora 11) for perl-sig
kevin approved watchcommits on perl-App-Daemon (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Daemon



From kevin at fedoraproject.org  Thu Apr 30 04:49:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:49:23 +0000 (UTC)
Subject: rpms/perl-App-Daemon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430044923.0B7DD70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14880/rpms/perl-App-Daemon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-App-Daemon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-App-Daemon
# $Id: Makefile,v 1.1 2009/04/30 04:49:22 kevin Exp $
NAME := perl-App-Daemon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:54 +0000
Subject: [pkgdb] perl-MIME-Charset was added for xavierb
Message-ID: <20090430044954.1AAA410F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-MIME-Charset with summary Charset Informations for MIME
kevin has approved Package perl-MIME-Charset
kevin has added a Fedora devel branch for perl-MIME-Charset with an owner of xavierb
kevin has approved perl-MIME-Charset in Fedora devel
kevin has approved Package perl-MIME-Charset
kevin has set commit to Approved for provenpackager on perl-MIME-Charset (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MIME-Charset (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MIME-Charset (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-Charset



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:56 +0000
Subject: [pkgdb] perl-MIME-Charset (Fedora, devel) updated by kevin
Message-ID: <20090430044956.E9D6B10F8A1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MIME-Charset (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MIME-Charset (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-Charset



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:56 +0000
Subject: [pkgdb] perl-MIME-Charset (Fedora, 10) updated by kevin
Message-ID: <20090430044956.F379510F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MIME-Charset
kevin has set commit to Approved for provenpackager on perl-MIME-Charset (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MIME-Charset (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MIME-Charset (Fedora 10)
kevin approved watchbugzilla on perl-MIME-Charset (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MIME-Charset (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-Charset



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:56 +0000
Subject: [pkgdb] perl-MIME-Charset (Fedora, 9) updated by kevin
Message-ID: <20090430044957.248BE10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MIME-Charset
kevin has set commit to Approved for provenpackager on perl-MIME-Charset (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MIME-Charset (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MIME-Charset (Fedora 9)
kevin approved watchbugzilla on perl-MIME-Charset (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MIME-Charset (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-Charset



From pkgdb at fedoraproject.org  Thu Apr 30 04:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:56 +0000
Subject: [pkgdb] perl-MIME-Charset (Fedora, 11) updated by kevin
Message-ID: <20090430044957.0F12C10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-MIME-Charset
kevin has set commit to Approved for provenpackager on perl-MIME-Charset (Fedora 11)
kevin has set build to Approved for provenpackager on perl-MIME-Charset (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-MIME-Charset (Fedora 11)
kevin approved watchbugzilla on perl-MIME-Charset (Fedora 11) for perl-sig
kevin approved watchcommits on perl-MIME-Charset (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-Charset



From kevin at fedoraproject.org  Thu Apr 30 04:50:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:50:11 +0000 (UTC)
Subject: rpms/perl-MIME-Charset - New directory
Message-ID: <20090430045011.2953370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MIME-Charset
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15188/rpms/perl-MIME-Charset

Log Message:
Directory /cvs/pkgs/rpms/perl-MIME-Charset added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:50:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:50:11 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/devel - New directory
Message-ID: <20090430045011.61F8570133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MIME-Charset/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15188/rpms/perl-MIME-Charset/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MIME-Charset/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 04:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:49:56 +0000
Subject: [pkgdb] perl-MIME-Charset (Fedora EPEL, 5) updated by kevin
Message-ID: <20090430044957.346E810F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-MIME-Charset
kevin has set commit to Approved for provenpackager on perl-MIME-Charset (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-MIME-Charset (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-MIME-Charset (Fedora EPEL 5)
kevin approved watchbugzilla on perl-MIME-Charset (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-MIME-Charset (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MIME-Charset



From kevin at fedoraproject.org  Thu Apr 30 04:50:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:50:20 +0000 (UTC)
Subject: rpms/perl-MIME-Charset Makefile,NONE,1.1
Message-ID: <20090430045020.7ABE970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MIME-Charset
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15188/rpms/perl-MIME-Charset

Added Files:
	Makefile 
Log Message:
Setup of module perl-MIME-Charset


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MIME-Charset
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:50:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:50:20 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090430045020.D06A270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MIME-Charset/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15188/rpms/perl-MIME-Charset/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MIME-Charset


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MIME-Charset
# $Id: Makefile,v 1.1 2009/04/30 04:50:20 kevin Exp $
NAME := perl-MIME-Charset
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:51:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:51:04 +0000
Subject: [pkgdb] php-ezc-Cache was added for llaumgui
Message-ID: <20090430045104.E826210F896@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-Cache with summary Provides a collection of lightweight classes to cache different kinds of data
kevin has approved Package php-ezc-Cache
kevin has added a Fedora devel branch for php-ezc-Cache with an owner of llaumgui
kevin has approved php-ezc-Cache in Fedora devel
kevin has approved Package php-ezc-Cache
kevin has set commit to Approved for provenpackager on php-ezc-Cache (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-Cache (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-Cache (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Cache



From pkgdb at fedoraproject.org  Thu Apr 30 04:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:51:07 +0000
Subject: [pkgdb] php-ezc-Cache (Fedora, 10) updated by kevin
Message-ID: <20090430045107.C5C1510F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-Cache
kevin has set commit to Approved for provenpackager on php-ezc-Cache (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-Cache (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-Cache (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Cache



From pkgdb at fedoraproject.org  Thu Apr 30 04:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:51:07 +0000
Subject: [pkgdb] php-ezc-Cache (Fedora, 9) updated by kevin
Message-ID: <20090430045107.D2AB810F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-Cache
kevin has set commit to Approved for provenpackager on php-ezc-Cache (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-Cache (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-Cache (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Cache



From kevin at fedoraproject.org  Thu Apr 30 04:51:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:51:20 +0000 (UTC)
Subject: rpms/php-ezc-Cache - New directory
Message-ID: <20090430045120.2D55970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Cache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd15576/rpms/php-ezc-Cache

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Cache added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:51:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:51:20 +0000 (UTC)
Subject: rpms/php-ezc-Cache/devel - New directory
Message-ID: <20090430045120.82FD770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd15576/rpms/php-ezc-Cache/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Cache/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 04:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:51:07 +0000
Subject: [pkgdb] php-ezc-Cache (Fedora, 11) updated by kevin
Message-ID: <20090430045107.DCCB810F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-Cache
kevin has set commit to Approved for provenpackager on php-ezc-Cache (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-Cache (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-Cache (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Cache



From kevin at fedoraproject.org  Thu Apr 30 04:51:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:51:30 +0000 (UTC)
Subject: rpms/php-ezc-Cache/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430045130.B6BE970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd15576/rpms/php-ezc-Cache/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Cache


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Cache
# $Id: Makefile,v 1.1 2009/04/30 04:51:30 kevin Exp $
NAME := php-ezc-Cache
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 30 04:51:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:51:30 +0000 (UTC)
Subject: rpms/php-ezc-Cache Makefile,NONE,1.1
Message-ID: <20090430045130.6557C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Cache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd15576/rpms/php-ezc-Cache

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Cache


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Cache
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:26 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430045326.5D40A10F881@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora 11 was orphaned by jtulach

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:27 +0000
Subject: [pkgdb] php-ezc-Mail was added for llaumgui
Message-ID: <20090430045327.DE7C010F895@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-Mail with summary Construct and/or parse Mail messages conforming to the mail standard
kevin has approved Package php-ezc-Mail
kevin has added a Fedora devel branch for php-ezc-Mail with an owner of llaumgui
kevin has approved php-ezc-Mail in Fedora devel
kevin has approved Package php-ezc-Mail
kevin has set commit to Approved for provenpackager on php-ezc-Mail (Fedora devel)
kevin has set build to Approved for provenpackager on php-ezc-Mail (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-ezc-Mail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Mail



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:29 +0000
Subject: [pkgdb] php-ezc-Mail (Fedora, 10) updated by kevin
Message-ID: <20090430045329.D444110F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-ezc-Mail
kevin has set commit to Approved for provenpackager on php-ezc-Mail (Fedora 10)
kevin has set build to Approved for provenpackager on php-ezc-Mail (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-ezc-Mail (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Mail



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:29 +0000
Subject: [pkgdb] php-ezc-Mail (Fedora, 11) updated by kevin
Message-ID: <20090430045329.DBB8E10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-Mail
kevin has set commit to Approved for provenpackager on php-ezc-Mail (Fedora 11)
kevin has set build to Approved for provenpackager on php-ezc-Mail (Fedora 11)
kevin has set checkout to Approved for provenpackager on php-ezc-Mail (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Mail



From kevin at fedoraproject.org  Thu Apr 30 04:53:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:53:38 +0000 (UTC)
Subject: rpms/php-ezc-Mail - New directory
Message-ID: <20090430045338.2949670133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Mail
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16082/rpms/php-ezc-Mail

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Mail added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:53:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:53:38 +0000 (UTC)
Subject: rpms/php-ezc-Mail/devel - New directory
Message-ID: <20090430045338.6A2E970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Mail/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16082/rpms/php-ezc-Mail/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Mail/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 04:53:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:29 +0000
Subject: [pkgdb] php-ezc-Mail (Fedora, 9) updated by kevin
Message-ID: <20090430045329.E968310F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-ezc-Mail
kevin has set commit to Approved for provenpackager on php-ezc-Mail (Fedora 9)
kevin has set build to Approved for provenpackager on php-ezc-Mail (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-ezc-Mail (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Mail



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:41 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430045341.E2C5010F881@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora 10 was orphaned by jtulach

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From kevin at fedoraproject.org  Thu Apr 30 04:53:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:53:47 +0000 (UTC)
Subject: rpms/php-ezc-Mail Makefile,NONE,1.1
Message-ID: <20090430045347.5E95170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Mail
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16082/rpms/php-ezc-Mail

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Mail


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Mail
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:53:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:53:47 +0000 (UTC)
Subject: rpms/php-ezc-Mail/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430045347.9D71D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-Mail/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16082/rpms/php-ezc-Mail/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Mail


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Mail
# $Id: Makefile,v 1.1 2009/04/30 04:53:47 kevin Exp $
NAME := php-ezc-Mail
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:43 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430045343.650C610F8A4@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora 9 was orphaned by jtulach

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 04:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:53:54 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430045354.E318C10F895@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora devel was orphaned by jtulach

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 04:54:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:54:37 +0000
Subject: [pkgdb] perl-JSON summary updated by kevin
Message-ID: <20090430045438.0228110F886@bastion2.fedora.phx.redhat.com>

kevin set package perl-JSON summary to Perl implementation of JSON-RPC 1.1 protocol-RPC

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:54:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:54:37 +0000
Subject: [pkgdb] perl-JSON (Fedora, 11) updated by kevin
Message-ID: <20090430045438.11A0610F896@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora 11 to eseyman
kevin approved watchbugzilla on perl-JSON (Fedora 11) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:54:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:54:37 +0000
Subject: [pkgdb] perl-JSON (Fedora, 9) updated by kevin
Message-ID: <20090430045438.1CBC210F899@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora 9 to eseyman
kevin approved watchbugzilla on perl-JSON (Fedora 9) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:54:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:54:38 +0000
Subject: [pkgdb] perl-JSON (Fedora, 10) updated by kevin
Message-ID: <20090430045438.2444910F89C@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora 10 to eseyman
kevin approved watchbugzilla on perl-JSON (Fedora 10) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:54:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:54:38 +0000
Subject: [pkgdb] perl-JSON (Fedora, devel) updated by kevin
Message-ID: <20090430045438.2C6B810F89F@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora devel to eseyman
kevin approved watchbugzilla on perl-JSON (Fedora devel) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:55:44 +0000
Subject: [pkgdb] perl-JSON summary updated by kevin
Message-ID: <20090430045544.6238A10F89C@bastion2.fedora.phx.redhat.com>

kevin set package perl-JSON summary to Perl implementation of JSON-RPC 1.1 protocol-RPC

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:55:44 +0000
Subject: [pkgdb] perl-JSON (Fedora, 9) updated by kevin
Message-ID: <20090430045544.78C6810F8A1@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora 9 to cweyl
kevin approved watchbugzilla on perl-JSON (Fedora 9) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:55:44 +0000
Subject: [pkgdb] perl-JSON (Fedora, 11) updated by kevin
Message-ID: <20090430045544.6E5D510F89E@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora 11 to cweyl
kevin approved watchbugzilla on perl-JSON (Fedora 11) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:55:44 +0000
Subject: [pkgdb] perl-JSON (Fedora, devel) updated by kevin
Message-ID: <20090430045544.8561310F8A5@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora devel to cweyl
kevin approved watchbugzilla on perl-JSON (Fedora devel) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:55:44 +0000
Subject: [pkgdb] perl-JSON (Fedora, 10) updated by kevin
Message-ID: <20090430045544.8E23910F8A7@bastion2.fedora.phx.redhat.com>

kevin changed owner of perl-JSON in Fedora 10 to cweyl
kevin approved watchbugzilla on perl-JSON (Fedora 10) for perl-sig
kevin approved watchcommits on perl-JSON (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON



From pkgdb at fedoraproject.org  Thu Apr 30 04:57:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:57:07 +0000
Subject: [pkgdb] cppcheck was added for jussilehtola
Message-ID: <20090430045707.CA81410F886@bastion2.fedora.phx.redhat.com>

kevin has added Package cppcheck with summary A tool for static C/C++ code analysis
kevin has approved Package cppcheck
kevin has added a Fedora devel branch for cppcheck with an owner of jussilehtola
kevin has approved cppcheck in Fedora devel
kevin has approved Package cppcheck
kevin has set commit to Approved for provenpackager on cppcheck (Fedora devel)
kevin has set build to Approved for provenpackager on cppcheck (Fedora devel)
kevin has set checkout to Approved for provenpackager on cppcheck (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cppcheck



From pkgdb at fedoraproject.org  Thu Apr 30 04:57:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:57:09 +0000
Subject: [pkgdb] cppcheck (Fedora, 10) updated by kevin
Message-ID: <20090430045709.AB15D10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cppcheck
kevin has set commit to Approved for provenpackager on cppcheck (Fedora 10)
kevin has set build to Approved for provenpackager on cppcheck (Fedora 10)
kevin has set checkout to Approved for provenpackager on cppcheck (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cppcheck



From pkgdb at fedoraproject.org  Thu Apr 30 04:57:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:57:09 +0000
Subject: [pkgdb] cppcheck (Fedora, 11) updated by kevin
Message-ID: <20090430045709.B293B10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cppcheck
kevin has set commit to Approved for provenpackager on cppcheck (Fedora 11)
kevin has set build to Approved for provenpackager on cppcheck (Fedora 11)
kevin has set checkout to Approved for provenpackager on cppcheck (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cppcheck



From pkgdb at fedoraproject.org  Thu Apr 30 04:57:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:57:09 +0000
Subject: [pkgdb] cppcheck (Fedora EPEL, 5) updated by kevin
Message-ID: <20090430045709.C025410F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cppcheck
kevin has set commit to Approved for provenpackager on cppcheck (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on cppcheck (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on cppcheck (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cppcheck



From kevin at fedoraproject.org  Thu Apr 30 04:57:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:57:20 +0000 (UTC)
Subject: rpms/cppcheck - New directory
Message-ID: <20090430045720.2C46E70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cppcheck
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn16806/rpms/cppcheck

Log Message:
Directory /cvs/pkgs/rpms/cppcheck added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:57:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:57:20 +0000 (UTC)
Subject: rpms/cppcheck/devel - New directory
Message-ID: <20090430045720.6382F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cppcheck/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn16806/rpms/cppcheck/devel

Log Message:
Directory /cvs/pkgs/rpms/cppcheck/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:57:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:57:29 +0000 (UTC)
Subject: rpms/cppcheck Makefile,NONE,1.1
Message-ID: <20090430045729.5686D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cppcheck
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn16806/rpms/cppcheck

Added Files:
	Makefile 
Log Message:
Setup of module cppcheck


--- NEW FILE Makefile ---
# Top level Makefile for module cppcheck
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:57:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:57:29 +0000 (UTC)
Subject: rpms/cppcheck/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430045729.9CFBA70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cppcheck/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn16806/rpms/cppcheck/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cppcheck


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cppcheck
# $Id: Makefile,v 1.1 2009/04/30 04:57:29 kevin Exp $
NAME := cppcheck
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:58:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:58:17 +0000
Subject: [pkgdb] lxde-settings-daemon was added for cwickert
Message-ID: <20090430045817.3FABE10F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package lxde-settings-daemon with summary XSettings Daemon for LXDE
kevin has approved Package lxde-settings-daemon
kevin has added a Fedora devel branch for lxde-settings-daemon with an owner of cwickert
kevin has approved lxde-settings-daemon in Fedora devel
kevin has approved Package lxde-settings-daemon
kevin has set commit to Approved for provenpackager on lxde-settings-daemon (Fedora devel)
kevin has set build to Approved for provenpackager on lxde-settings-daemon (Fedora devel)
kevin has set checkout to Approved for provenpackager on lxde-settings-daemon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxde-settings-daemon



From pkgdb at fedoraproject.org  Thu Apr 30 04:58:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:58:19 +0000
Subject: [pkgdb] lxde-settings-daemon (Fedora, 10) updated by kevin
Message-ID: <20090430045819.E4FCB10F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lxde-settings-daemon
kevin has set commit to Approved for provenpackager on lxde-settings-daemon (Fedora 10)
kevin has set build to Approved for provenpackager on lxde-settings-daemon (Fedora 10)
kevin has set checkout to Approved for provenpackager on lxde-settings-daemon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxde-settings-daemon



From kevin at fedoraproject.org  Thu Apr 30 04:58:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:58:36 +0000 (UTC)
Subject: rpms/lxde-settings-daemon - New directory
Message-ID: <20090430045836.2B89A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-settings-daemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17135/rpms/lxde-settings-daemon

Log Message:
Directory /cvs/pkgs/rpms/lxde-settings-daemon added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:58:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:58:36 +0000 (UTC)
Subject: rpms/lxde-settings-daemon/devel - New directory
Message-ID: <20090430045836.6B08D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17135/rpms/lxde-settings-daemon/devel

Log Message:
Directory /cvs/pkgs/rpms/lxde-settings-daemon/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:58:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:58:44 +0000 (UTC)
Subject: rpms/lxde-settings-daemon Makefile,NONE,1.1
Message-ID: <20090430045844.B407A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-settings-daemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17135/rpms/lxde-settings-daemon

Added Files:
	Makefile 
Log Message:
Setup of module lxde-settings-daemon


--- NEW FILE Makefile ---
# Top level Makefile for module lxde-settings-daemon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 30 04:58:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:58:19 +0000
Subject: [pkgdb] lxde-settings-daemon (Fedora, 11) updated by kevin
Message-ID: <20090430045819.ED49410F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lxde-settings-daemon
kevin has set commit to Approved for provenpackager on lxde-settings-daemon (Fedora 11)
kevin has set build to Approved for provenpackager on lxde-settings-daemon (Fedora 11)
kevin has set checkout to Approved for provenpackager on lxde-settings-daemon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxde-settings-daemon



From kevin at fedoraproject.org  Thu Apr 30 04:58:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:58:44 +0000 (UTC)
Subject: rpms/lxde-settings-daemon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430045844.F043570133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxde-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR17135/rpms/lxde-settings-daemon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lxde-settings-daemon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lxde-settings-daemon
# $Id: Makefile,v 1.1 2009/04/30 04:58:44 kevin Exp $
NAME := lxde-settings-daemon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 04:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:59:30 +0000
Subject: [pkgdb] lxinput was added for cwickert
Message-ID: <20090430045930.BB2EE10F87D@bastion2.fedora.phx.redhat.com>

kevin has added Package lxinput with summary Keyboard and mouse settings dialog for LXDE
kevin has approved Package lxinput
kevin has added a Fedora devel branch for lxinput with an owner of cwickert
kevin has approved lxinput in Fedora devel
kevin has approved Package lxinput
kevin has set commit to Approved for provenpackager on lxinput (Fedora devel)
kevin has set build to Approved for provenpackager on lxinput (Fedora devel)
kevin has set checkout to Approved for provenpackager on lxinput (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxinput



From pkgdb at fedoraproject.org  Thu Apr 30 04:59:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:59:31 +0000
Subject: [pkgdb] lxinput (Fedora, 10) updated by kevin
Message-ID: <20090430045931.EECA910F893@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for lxinput
kevin has set commit to Approved for provenpackager on lxinput (Fedora 10)
kevin has set build to Approved for provenpackager on lxinput (Fedora 10)
kevin has set checkout to Approved for provenpackager on lxinput (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxinput



From kevin at fedoraproject.org  Thu Apr 30 04:59:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:59:43 +0000 (UTC)
Subject: rpms/lxinput - New directory
Message-ID: <20090430045943.235DD70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxinput
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17389/rpms/lxinput

Log Message:
Directory /cvs/pkgs/rpms/lxinput added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 04:59:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 04:59:31 +0000
Subject: [pkgdb] lxinput (Fedora, 11) updated by kevin
Message-ID: <20090430045932.0219D10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for lxinput
kevin has set commit to Approved for provenpackager on lxinput (Fedora 11)
kevin has set build to Approved for provenpackager on lxinput (Fedora 11)
kevin has set checkout to Approved for provenpackager on lxinput (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lxinput



From kevin at fedoraproject.org  Thu Apr 30 04:59:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:59:43 +0000 (UTC)
Subject: rpms/lxinput/devel - New directory
Message-ID: <20090430045943.589D370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxinput/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17389/rpms/lxinput/devel

Log Message:
Directory /cvs/pkgs/rpms/lxinput/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 04:59:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:59:51 +0000 (UTC)
Subject: rpms/lxinput Makefile,NONE,1.1
Message-ID: <20090430045951.E2D0A70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxinput
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17389/rpms/lxinput

Added Files:
	Makefile 
Log Message:
Setup of module lxinput


--- NEW FILE Makefile ---
# Top level Makefile for module lxinput
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 04:59:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 04:59:52 +0000 (UTC)
Subject: rpms/lxinput/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090430045952.3252270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lxinput/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17389/rpms/lxinput/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lxinput


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lxinput
# $Id: Makefile,v 1.1 2009/04/30 04:59:52 kevin Exp $
NAME := lxinput
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 05:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:00:37 +0000
Subject: [pkgdb] perl-App-Nopaste was added for iarnell
Message-ID: <20090430050037.B5B0110F886@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-App-Nopaste with summary Easy access to any pastebin
kevin has approved Package perl-App-Nopaste
kevin has added a Fedora devel branch for perl-App-Nopaste with an owner of iarnell
kevin has approved perl-App-Nopaste in Fedora devel
kevin has approved Package perl-App-Nopaste
kevin has set commit to Approved for provenpackager on perl-App-Nopaste (Fedora devel)
kevin has set build to Approved for provenpackager on perl-App-Nopaste (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-App-Nopaste (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Nopaste



From pkgdb at fedoraproject.org  Thu Apr 30 05:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:00:40 +0000
Subject: [pkgdb] perl-App-Nopaste (Fedora, devel) updated by kevin
Message-ID: <20090430050040.877D910F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-App-Nopaste (Fedora devel) for perl-sig
kevin approved watchcommits on perl-App-Nopaste (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Nopaste



From pkgdb at fedoraproject.org  Thu Apr 30 05:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:00:40 +0000
Subject: [pkgdb] perl-App-Nopaste (Fedora, 10) updated by kevin
Message-ID: <20090430050040.8F7E610F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-App-Nopaste
kevin has set commit to Approved for provenpackager on perl-App-Nopaste (Fedora 10)
kevin has set build to Approved for provenpackager on perl-App-Nopaste (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-App-Nopaste (Fedora 10)
kevin approved watchbugzilla on perl-App-Nopaste (Fedora 10) for perl-sig
kevin approved watchcommits on perl-App-Nopaste (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Nopaste



From kevin at fedoraproject.org  Thu Apr 30 05:00:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:00:48 +0000 (UTC)
Subject: rpms/perl-App-Nopaste - New directory
Message-ID: <20090430050048.29A0970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Nopaste
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17688/rpms/perl-App-Nopaste

Log Message:
Directory /cvs/pkgs/rpms/perl-App-Nopaste added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:00:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:00:48 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/devel - New directory
Message-ID: <20090430050048.6FC3970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17688/rpms/perl-App-Nopaste/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-App-Nopaste/devel added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 05:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:00:40 +0000
Subject: [pkgdb] perl-App-Nopaste (Fedora, 11) updated by kevin
Message-ID: <20090430050040.9BDBE10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-App-Nopaste
kevin has set commit to Approved for provenpackager on perl-App-Nopaste (Fedora 11)
kevin has set build to Approved for provenpackager on perl-App-Nopaste (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-App-Nopaste (Fedora 11)
kevin approved watchbugzilla on perl-App-Nopaste (Fedora 11) for perl-sig
kevin approved watchcommits on perl-App-Nopaste (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Nopaste



From kevin at fedoraproject.org  Thu Apr 30 05:00:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:00:58 +0000 (UTC)
Subject: rpms/perl-App-Nopaste Makefile,NONE,1.1
Message-ID: <20090430050058.6D60C70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Nopaste
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17688/rpms/perl-App-Nopaste

Added Files:
	Makefile 
Log Message:
Setup of module perl-App-Nopaste


--- NEW FILE Makefile ---
# Top level Makefile for module perl-App-Nopaste
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 05:00:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:00:58 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430050058.BD9B970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-App-Nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17688/rpms/perl-App-Nopaste/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-App-Nopaste


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-App-Nopaste
# $Id: Makefile,v 1.1 2009/04/30 05:00:58 kevin Exp $
NAME := perl-App-Nopaste
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 30 05:01:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:01:49 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C/devel - New directory
Message-ID: <20090430050149.67E9B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17984/rpms/perl-WebService-Validator-CSS-W3C/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:01:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:01:58 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C Makefile,NONE,1.1
Message-ID: <20090430050158.E1DB370133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17984/rpms/perl-WebService-Validator-CSS-W3C

Added Files:
	Makefile 
Log Message:
Setup of module perl-WebService-Validator-CSS-W3C


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WebService-Validator-CSS-W3C
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 05:01:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:01:59 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090430050159.2F97170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17984/rpms/perl-WebService-Validator-CSS-W3C/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WebService-Validator-CSS-W3C


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-WebService-Validator-CSS-W3C
# $Id: Makefile,v 1.1 2009/04/30 05:01:59 kevin Exp $
NAME := perl-WebService-Validator-CSS-W3C
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 05:01:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:01:39 +0000
Subject: [pkgdb] perl-WebService-Validator-CSS-W3C was added for mmaslano
Message-ID: <20090430050139.8C3E310F886@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-WebService-Validator-CSS-W3C with summary Interface to the W3C CSS Validator
kevin has approved Package perl-WebService-Validator-CSS-W3C
kevin has added a Fedora devel branch for perl-WebService-Validator-CSS-W3C with an owner of mmaslano
kevin has approved perl-WebService-Validator-CSS-W3C in Fedora devel
kevin has approved Package perl-WebService-Validator-CSS-W3C
kevin has set commit to Approved for provenpackager on perl-WebService-Validator-CSS-W3C (Fedora devel)
kevin has set build to Approved for provenpackager on perl-WebService-Validator-CSS-W3C (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-WebService-Validator-CSS-W3C (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WebService-Validator-CSS-W3C



From kevin at fedoraproject.org  Thu Apr 30 05:01:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:01:49 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C - New directory
Message-ID: <20090430050149.2AD1870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm17984/rpms/perl-WebService-Validator-CSS-W3C

Log Message:
Directory /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C added to the repository




From pkgdb at fedoraproject.org  Thu Apr 30 05:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:01:40 +0000
Subject: [pkgdb] perl-WebService-Validator-CSS-W3C (Fedora,
	devel) updated by kevin
Message-ID: <20090430050140.CD7D510F896@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-WebService-Validator-CSS-W3C (Fedora devel) for perl-sig
kevin approved watchcommits on perl-WebService-Validator-CSS-W3C (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WebService-Validator-CSS-W3C



From pkgdb at fedoraproject.org  Thu Apr 30 05:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:01:40 +0000
Subject: [pkgdb] perl-WebService-Validator-CSS-W3C (Fedora,
	11) updated by kevin
Message-ID: <20090430050141.2001110F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-WebService-Validator-CSS-W3C
kevin has set commit to Approved for provenpackager on perl-WebService-Validator-CSS-W3C (Fedora 11)
kevin has set build to Approved for provenpackager on perl-WebService-Validator-CSS-W3C (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-WebService-Validator-CSS-W3C (Fedora 11)
kevin approved watchbugzilla on perl-WebService-Validator-CSS-W3C (Fedora 11) for perl-sig
kevin approved watchcommits on perl-WebService-Validator-CSS-W3C (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WebService-Validator-CSS-W3C



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:03 +0000
Subject: [pkgdb] perl-Perl-Tags was added for iarnell
Message-ID: <20090430050303.4AD2310F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Perl-Tags with summary Generate Ctags style tags for Perl sourcecode
kevin has approved Package perl-Perl-Tags
kevin has added a Fedora devel branch for perl-Perl-Tags with an owner of iarnell
kevin has approved perl-Perl-Tags in Fedora devel
kevin has approved Package perl-Perl-Tags
kevin has set commit to Approved for provenpackager on perl-Perl-Tags (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Perl-Tags (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Perl-Tags (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl-Tags



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:04 +0000
Subject: [pkgdb] perl-Perl-Tags (Fedora, 10) updated by kevin
Message-ID: <20090430050304.B7C9010F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Perl-Tags
kevin has set commit to Approved for provenpackager on perl-Perl-Tags (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Perl-Tags (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Perl-Tags (Fedora 10)
kevin approved watchbugzilla on perl-Perl-Tags (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Perl-Tags (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl-Tags



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:04 +0000
Subject: [pkgdb] perl-Perl-Tags (Fedora, devel) updated by kevin
Message-ID: <20090430050304.BFFFE10F898@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Perl-Tags (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Perl-Tags (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl-Tags



From kevin at fedoraproject.org  Thu Apr 30 05:03:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:03:18 +0000 (UTC)
Subject: rpms/perl-Perl-Tags - New directory
Message-ID: <20090430050318.243427013B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl-Tags
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm18678/rpms/perl-Perl-Tags

Log Message:
Directory /cvs/pkgs/rpms/perl-Perl-Tags added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:03:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:03:18 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/devel - New directory
Message-ID: <20090430050318.6953A7013B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl-Tags/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm18678/rpms/perl-Perl-Tags/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Perl-Tags/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:03:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:03:28 +0000 (UTC)
Subject: rpms/perl-Perl-Tags Makefile,NONE,1.1
Message-ID: <20090430050328.276D270133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl-Tags
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm18678/rpms/perl-Perl-Tags

Added Files:
	Makefile 
Log Message:
Setup of module perl-Perl-Tags


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Perl-Tags
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 05:03:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:03:28 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430050328.72C2170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl-Tags/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm18678/rpms/perl-Perl-Tags/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Perl-Tags


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Perl-Tags
# $Id: Makefile,v 1.1 2009/04/30 05:03:28 kevin Exp $
NAME := perl-Perl-Tags
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:04 +0000
Subject: [pkgdb] perl-Perl-Tags (Fedora, 11) updated by kevin
Message-ID: <20090430050304.CB90310F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Perl-Tags
kevin has set commit to Approved for provenpackager on perl-Perl-Tags (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Perl-Tags (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Perl-Tags (Fedora 11)
kevin approved watchbugzilla on perl-Perl-Tags (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Perl-Tags (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl-Tags



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:54 +0000
Subject: [pkgdb] perl-Module-Used was added for iarnell
Message-ID: <20090430050354.594B310F881@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Module-Used with summary Find modules loaded by Perl code without running it
kevin has approved Package perl-Module-Used
kevin has added a Fedora devel branch for perl-Module-Used with an owner of iarnell
kevin has approved perl-Module-Used in Fedora devel
kevin has approved Package perl-Module-Used
kevin has set commit to Approved for provenpackager on perl-Module-Used (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Module-Used (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Module-Used (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Used



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:56 +0000
Subject: [pkgdb] perl-Module-Used (Fedora, devel) updated by kevin
Message-ID: <20090430050356.4F0BD10F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Module-Used (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Module-Used (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Used



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:56 +0000
Subject: [pkgdb] perl-Module-Used (Fedora, 10) updated by kevin
Message-ID: <20090430050356.97ABB10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Module-Used
kevin has set commit to Approved for provenpackager on perl-Module-Used (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Module-Used (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Module-Used (Fedora 10)
kevin approved watchbugzilla on perl-Module-Used (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Module-Used (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Used



From pkgdb at fedoraproject.org  Thu Apr 30 05:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:03:56 +0000
Subject: [pkgdb] perl-Module-Used (Fedora, 11) updated by kevin
Message-ID: <20090430050356.A075D10F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Module-Used
kevin has set commit to Approved for provenpackager on perl-Module-Used (Fedora 11)
kevin has set build to Approved for provenpackager on perl-Module-Used (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-Module-Used (Fedora 11)
kevin approved watchbugzilla on perl-Module-Used (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Module-Used (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Used



From kevin at fedoraproject.org  Thu Apr 30 05:04:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:04:14 +0000 (UTC)
Subject: rpms/perl-Module-Used Makefile,NONE,1.1
Message-ID: <20090430050414.7183070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Module-Used
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19173/rpms/perl-Module-Used

Added Files:
	Makefile 
Log Message:
Setup of module perl-Module-Used


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Used
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Apr 30 05:04:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:04:14 +0000 (UTC)
Subject: rpms/perl-Module-Used/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090430050414.B6A8D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Module-Used/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19173/rpms/perl-Module-Used/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Used


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Module-Used
# $Id: Makefile,v 1.1 2009/04/30 05:04:14 kevin Exp $
NAME := perl-Module-Used
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Apr 30 05:05:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:05:28 +0000
Subject: [pkgdb] perl-WebService-Validator-HTML-W3C was added for mmaslano
Message-ID: <20090430050528.B098010F886@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-WebService-Validator-HTML-W3C with summary Access the W3Cs online HTML validator
kevin has approved Package perl-WebService-Validator-HTML-W3C
kevin has added a Fedora devel branch for perl-WebService-Validator-HTML-W3C with an owner of mmaslano
kevin has approved perl-WebService-Validator-HTML-W3C in Fedora devel
kevin has approved Package perl-WebService-Validator-HTML-W3C
kevin has set commit to Approved for provenpackager on perl-WebService-Validator-HTML-W3C (Fedora devel)
kevin has set build to Approved for provenpackager on perl-WebService-Validator-HTML-W3C (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-WebService-Validator-HTML-W3C (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WebService-Validator-HTML-W3C



From pkgdb at fedoraproject.org  Thu Apr 30 05:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:05:31 +0000
Subject: [pkgdb] perl-WebService-Validator-HTML-W3C (Fedora,
	devel) updated by kevin
Message-ID: <20090430050532.4046910F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-WebService-Validator-HTML-W3C (Fedora devel) for perl-sig
kevin approved watchcommits on perl-WebService-Validator-HTML-W3C (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WebService-Validator-HTML-W3C



From kevin at fedoraproject.org  Thu Apr 30 05:05:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:05:42 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C - New directory
Message-ID: <20090430050542.220CE70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19484/rpms/perl-WebService-Validator-HTML-W3C

Log Message:
Directory /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:05:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:05:42 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C/devel - New directory
Message-ID: <20090430050542.5B1C970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19484/rpms/perl-WebService-Validator-HTML-W3C/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:05:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:05:51 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C Makefile,NONE,1.1
Message-ID: <20090430050551.1A08F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19484/rpms/perl-WebService-Validator-HTML-W3C

Added Files:
	Makefile 
Log Message:
Setup of module perl-WebService-Validator-HTML-W3C


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WebService-Validator-HTML-W3C
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Apr 30 05:05:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 05:05:32 +0000
Subject: [pkgdb] perl-WebService-Validator-HTML-W3C (Fedora,
	11) updated by kevin
Message-ID: <20090430050532.6A00710F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-WebService-Validator-HTML-W3C
kevin has set commit to Approved for provenpackager on perl-WebService-Validator-HTML-W3C (Fedora 11)
kevin has set build to Approved for provenpackager on perl-WebService-Validator-HTML-W3C (Fedora 11)
kevin has set checkout to Approved for provenpackager on perl-WebService-Validator-HTML-W3C (Fedora 11)
kevin approved watchbugzilla on perl-WebService-Validator-HTML-W3C (Fedora 11) for perl-sig
kevin approved watchcommits on perl-WebService-Validator-HTML-W3C (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WebService-Validator-HTML-W3C



From kevin at fedoraproject.org  Thu Apr 30 05:05:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:05:51 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090430050551.5FBF070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19484/rpms/perl-WebService-Validator-HTML-W3C/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WebService-Validator-HTML-W3C


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-WebService-Validator-HTML-W3C
# $Id: Makefile,v 1.1 2009/04/30 05:05:51 kevin Exp $
NAME := perl-WebService-Validator-HTML-W3C
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Apr 30 05:04:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:04:05 +0000 (UTC)
Subject: rpms/perl-Module-Used - New directory
Message-ID: <20090430050405.23F5F70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Module-Used
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19173/rpms/perl-Module-Used

Log Message:
Directory /cvs/pkgs/rpms/perl-Module-Used added to the repository




From kevin at fedoraproject.org  Thu Apr 30 05:04:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 30 Apr 2009 05:04:05 +0000 (UTC)
Subject: rpms/perl-Module-Used/devel - New directory
Message-ID: <20090430050405.5CE5970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Module-Used/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19173/rpms/perl-Module-Used/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Module-Used/devel added to the repository




From ondrejj at fedoraproject.org  Thu Apr 30 05:30:47 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Thu, 30 Apr 2009 05:30:47 +0000 (UTC)
Subject: rpms/sems/devel sems.spec,1.2,1.3
Message-ID: <20090430053047.1B8F970133@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22777

Modified Files:
	sems.spec 
Log Message:
rebuild


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sems.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sems.spec	19 Apr 2009 17:41:40 -0000	1.2
+++ sems.spec	30 Apr 2009 05:30:16 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
@@ -546,6 +546,9 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Thu Apr 30 2009 J??n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.0-7
+- rebuilt
+
 * Sun Apr 19 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-6
 - Fix building with GCC 4.4
 



From mmaslano at fedoraproject.org  Thu Apr 30 05:42:05 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 30 Apr 2009 05:42:05 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C/devel
	perl-WebService-Validator-HTML-W3C.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430054205.2321970133@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25219

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WebService-Validator-HTML-W3C.spec 
Log Message:
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.24-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-WebService-Validator-HTML-W3C.spec ---
Name:           perl-WebService-Validator-HTML-W3C
Version:        0.24
Release:        1%{?dist}
Summary:        Access the W3Cs online HTML validator
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WebService-Validator-HTML-W3C/
Source0:        http://www.cpan.org/authors/id/S/ST/STRUAN/WebService-Validator-HTML-W3C-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor)
BuildRequires:  perl(LWP)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
WebService::Validator::HTML::W3C provides access to the W3C's online Markup
validator. As well as reporting on whether a page is valid it also provides
access to a detailed list of the errors and where in the validated document
they occur.

%prep
%setup -q -n WebService-Validator-HTML-W3C-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.24-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:05:51 -0000	1.1
+++ .cvsignore	30 Apr 2009 05:41:34 -0000	1.2
@@ -0,0 +1 @@
+WebService-Validator-HTML-W3C-0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:05:51 -0000	1.1
+++ sources	30 Apr 2009 05:41:34 -0000	1.2
@@ -0,0 +1 @@
+7c58ebb1df29fdc0b88474217c064f10  WebService-Validator-HTML-W3C-0.24.tar.gz



From plindner at fedoraproject.org  Thu Apr 30 05:45:32 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Thu, 30 Apr 2009 05:45:32 +0000 (UTC)
Subject: rpms/memcached/devel .cvsignore, 1.5, 1.6 memcached.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20090430054532.5993470133@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25514

Modified Files:
	.cvsignore memcached.spec sources 
Log Message:
- Upgrade to memcached-1.2.85 ia4ee04e517a5cad110f29e4490e4ab  memcached-1.2.8.tar.gz
- Addresses CVE-2009-1255



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Jul 2008 18:26:28 -0000	1.5
+++ .cvsignore	30 Apr 2009 05:45:01 -0000	1.6
@@ -1,2 +1 @@
-memcached-1.2.5.tar.gz
-memcached-1.2.6.tar.gz
+memcached-1.2.8.tar.gz


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/memcached.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- memcached.spec	26 Feb 2009 00:17:25 -0000	1.14
+++ memcached.spec	30 Apr 2009 05:45:01 -0000	1.15
@@ -6,8 +6,8 @@
 %define groupname  memcached
 
 Name:           memcached
-Version:        1.2.6
-Release:        2%{?dist}
+Version:        1.2.8
+Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -196,6 +196,10 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Paul Lindner <lindner at inuus.com> - 1.2.8-1
+- Upgrade to memcached-1.2.8
+- Addresses CVE-2009-1255
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Jul 2008 18:26:28 -0000	1.5
+++ sources	30 Apr 2009 05:45:01 -0000	1.6
@@ -1 +1 @@
-200d22f7ac2d114f74a6904552e9eb70  memcached-1.2.6.tar.gz
+e5a4ee04e517a5cad110f29e4490e4ab  memcached-1.2.8.tar.gz



From mmaslano at fedoraproject.org  Thu Apr 30 05:47:55 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 30 Apr 2009 05:47:55 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C/devel
	perl-WebService-Validator-CSS-W3C.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430054755.7F8CE70133@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26120

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WebService-Validator-CSS-W3C.spec 
Log Message:
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.2-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-WebService-Validator-CSS-W3C.spec ---
Name:           perl-WebService-Validator-CSS-W3C
Version:        0.2
Release:        1%{?dist}
Summary:        Interface to the W3C CSS Validator
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WebService-Validator-CSS-W3C/
Source0:        http://www.cpan.org/authors/id/O/OL/OLIVIERT/WebService/WebService-Validator-CSS-W3C-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(LWP::UserAgent)
BuildRequires:  perl(SOAP::Lite) >= 0.65
BuildRequires:  perl(URI)
BuildRequires:  perl(URI::QueryParam)
BuildRequires:  dos2unix
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is an interface to the W3C CSS Validation online service 
http://jigsaw.w3.org/css-validator/, based on its SOAP 1.2 support. 
It helps to find errors in Cascading Style Sheets.

%prep
%setup -q -n WebService-Validator-CSS-W3C-%{version}

dos2unix Changes
dos2unix README

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.2-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:01:59 -0000	1.1
+++ .cvsignore	30 Apr 2009 05:47:24 -0000	1.2
@@ -0,0 +1 @@
+WebService-Validator-CSS-W3C-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:01:59 -0000	1.1
+++ sources	30 Apr 2009 05:47:25 -0000	1.2
@@ -0,0 +1 @@
+bac54611541f72e1cfd12949afae9a1f  WebService-Validator-CSS-W3C-0.2.tar.gz



From jussilehtola at fedoraproject.org  Thu Apr 30 05:52:58 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 30 Apr 2009 05:52:58 +0000 (UTC)
Subject: rpms/cppcheck/devel cppcheck.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430055258.1E80670133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27015/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cppcheck.spec import.log 
Log Message:
Package imported in Fedora.



--- NEW FILE cppcheck.spec ---
Name:		cppcheck
Version:	1.31
Release:	1%{?dist}
Summary:	A tool for static C/C++ code analysis
Group:		Development/Languages
License:	GPLv3+
URL:		http://cppcheck.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	gcc-c++

%description
This program tries to detect bugs that your C/C++ compiler don't see.
The goal is no false positives.

Your compiler can detect many problems that cppcheck don't try to detect.
We recommend that you enable as many warnings as possible in your compiler.

Cppcheck is versatile. You can check non-standard code that includes
various compiler extensions, inline assembly code, etc.


%prep
%setup -q
# Convert text files to UTF-8
for file in COPYING readme.txt; do
 iconv -f ASCII -t utf-8 $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Fix end of line encodings
for file in readme.txt; do
 sed -e 's|\r||g' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

%build
make CXXFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -D -p -m 755 cppcheck %{buildroot}%{_bindir}/cppcheck

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING readme.txt test/
%{_bindir}/cppcheck

%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
- First release.


--- NEW FILE import.log ---
cppcheck-1_31-1_fc10:HEAD:cppcheck-1.31-1.fc10.src.rpm:1241070717


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:57:29 -0000	1.1
+++ .cvsignore	30 Apr 2009 05:52:27 -0000	1.2
@@ -0,0 +1 @@
+cppcheck-1.31.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:57:29 -0000	1.1
+++ sources	30 Apr 2009 05:52:27 -0000	1.2
@@ -0,0 +1 @@
+db500cee39ceaa7379bb105046d36cce  cppcheck-1.31.tar.bz2



From mmaslano at fedoraproject.org  Thu Apr 30 05:53:44 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 30 Apr 2009 05:53:44 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C/F-11
	perl-WebService-Validator-HTML-W3C.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430055344.D583670133@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27296

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WebService-Validator-HTML-W3C.spec 
Log Message:
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.24-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-WebService-Validator-HTML-W3C.spec ---
Name:           perl-WebService-Validator-HTML-W3C
Version:        0.24
Release:        1%{?dist}
Summary:        Access the W3Cs online HTML validator
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WebService-Validator-HTML-W3C/
Source0:        http://www.cpan.org/authors/id/S/ST/STRUAN/WebService-Validator-HTML-W3C-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor)
BuildRequires:  perl(LWP)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
WebService::Validator::HTML::W3C provides access to the W3C's online Markup
validator. As well as reporting on whether a page is valid it also provides
access to a detailed list of the errors and where in the validated document
they occur.

%prep
%setup -q -n WebService-Validator-HTML-W3C-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.24-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:05:51 -0000	1.1
+++ .cvsignore	30 Apr 2009 05:53:14 -0000	1.2
@@ -0,0 +1 @@
+WebService-Validator-HTML-W3C-0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:05:51 -0000	1.1
+++ sources	30 Apr 2009 05:53:14 -0000	1.2
@@ -0,0 +1 @@
+7c58ebb1df29fdc0b88474217c064f10  WebService-Validator-HTML-W3C-0.24.tar.gz



From jussilehtola at fedoraproject.org  Thu Apr 30 05:54:54 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 30 Apr 2009 05:54:54 +0000 (UTC)
Subject: rpms/cppcheck/EL-5 cppcheck.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090430055454.94A8170133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27547/EL-5

Modified Files:
	sources 
Added Files:
	cppcheck.spec 
Log Message:
Package imported in Fedora.



--- NEW FILE cppcheck.spec ---
Name:		cppcheck
Version:	1.31
Release:	1%{?dist}
Summary:	A tool for static C/C++ code analysis
Group:		Development/Languages
License:	GPLv3+
URL:		http://cppcheck.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	gcc-c++

%description
This program tries to detect bugs that your C/C++ compiler don't see.
The goal is no false positives.

Your compiler can detect many problems that cppcheck don't try to detect.
We recommend that you enable as many warnings as possible in your compiler.

Cppcheck is versatile. You can check non-standard code that includes
various compiler extensions, inline assembly code, etc.


%prep
%setup -q
# Convert text files to UTF-8
for file in COPYING readme.txt; do
 iconv -f ASCII -t utf-8 $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Fix end of line encodings
for file in readme.txt; do
 sed -e 's|\r||g' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

%build
make CXXFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -D -p -m 755 cppcheck %{buildroot}%{_bindir}/cppcheck

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING readme.txt test/
%{_bindir}/cppcheck

%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:57:29 -0000	1.1
+++ sources	30 Apr 2009 05:54:24 -0000	1.2
@@ -0,0 +1 @@
+db500cee39ceaa7379bb105046d36cce  cppcheck-1.31.tar.bz2



From jussilehtola at fedoraproject.org  Thu Apr 30 05:54:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 30 Apr 2009 05:54:55 +0000 (UTC)
Subject: rpms/cppcheck/F-10 cppcheck.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090430055455.138BE70133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27547/F-10

Modified Files:
	sources 
Added Files:
	cppcheck.spec 
Log Message:
Package imported in Fedora.



--- NEW FILE cppcheck.spec ---
Name:		cppcheck
Version:	1.31
Release:	1%{?dist}
Summary:	A tool for static C/C++ code analysis
Group:		Development/Languages
License:	GPLv3+
URL:		http://cppcheck.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	gcc-c++

%description
This program tries to detect bugs that your C/C++ compiler don't see.
The goal is no false positives.

Your compiler can detect many problems that cppcheck don't try to detect.
We recommend that you enable as many warnings as possible in your compiler.

Cppcheck is versatile. You can check non-standard code that includes
various compiler extensions, inline assembly code, etc.


%prep
%setup -q
# Convert text files to UTF-8
for file in COPYING readme.txt; do
 iconv -f ASCII -t utf-8 $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Fix end of line encodings
for file in readme.txt; do
 sed -e 's|\r||g' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

%build
make CXXFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -D -p -m 755 cppcheck %{buildroot}%{_bindir}/cppcheck

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING readme.txt test/
%{_bindir}/cppcheck

%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:57:29 -0000	1.1
+++ sources	30 Apr 2009 05:54:24 -0000	1.2
@@ -0,0 +1 @@
+db500cee39ceaa7379bb105046d36cce  cppcheck-1.31.tar.bz2



From jussilehtola at fedoraproject.org  Thu Apr 30 05:54:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 30 Apr 2009 05:54:55 +0000 (UTC)
Subject: rpms/cppcheck/F-11 cppcheck.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090430055455.80A2970133@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27547/F-11

Modified Files:
	sources 
Added Files:
	cppcheck.spec 
Log Message:
Package imported in Fedora.



--- NEW FILE cppcheck.spec ---
Name:		cppcheck
Version:	1.31
Release:	1%{?dist}
Summary:	A tool for static C/C++ code analysis
Group:		Development/Languages
License:	GPLv3+
URL:		http://cppcheck.wiki.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	gcc-c++

%description
This program tries to detect bugs that your C/C++ compiler don't see.
The goal is no false positives.

Your compiler can detect many problems that cppcheck don't try to detect.
We recommend that you enable as many warnings as possible in your compiler.

Cppcheck is versatile. You can check non-standard code that includes
various compiler extensions, inline assembly code, etc.


%prep
%setup -q
# Convert text files to UTF-8
for file in COPYING readme.txt; do
 iconv -f ASCII -t utf-8 $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Fix end of line encodings
for file in readme.txt; do
 sed -e 's|\r||g' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

%build
make CXXFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -D -p -m 755 cppcheck %{buildroot}%{_bindir}/cppcheck

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING readme.txt test/
%{_bindir}/cppcheck

%changelog
* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.31-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:57:29 -0000	1.1
+++ sources	30 Apr 2009 05:54:25 -0000	1.2
@@ -0,0 +1 @@
+db500cee39ceaa7379bb105046d36cce  cppcheck-1.31.tar.bz2



From mmaslano at fedoraproject.org  Thu Apr 30 05:56:15 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 30 Apr 2009 05:56:15 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C/F-11
	perl-WebService-Validator-CSS-W3C.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430055615.2606B70133@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28047

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WebService-Validator-CSS-W3C.spec 
Log Message:
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.2-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-WebService-Validator-CSS-W3C.spec ---
Name:           perl-WebService-Validator-CSS-W3C
Version:        0.2
Release:        1%{?dist}
Summary:        Interface to the W3C CSS Validator
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WebService-Validator-CSS-W3C/
Source0:        http://www.cpan.org/authors/id/O/OL/OLIVIERT/WebService/WebService-Validator-CSS-W3C-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(LWP::UserAgent)
BuildRequires:  perl(SOAP::Lite) >= 0.65
BuildRequires:  perl(URI)
BuildRequires:  perl(URI::QueryParam)
BuildRequires:  dos2unix
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is an interface to the W3C CSS Validation online service 
http://jigsaw.w3.org/css-validator/, based on its SOAP 1.2 support. 
It helps to find errors in Cascading Style Sheets.

%prep
%setup -q -n WebService-Validator-CSS-W3C-%{version}

dos2unix Changes
dos2unix README

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.2-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:01:59 -0000	1.1
+++ .cvsignore	30 Apr 2009 05:55:44 -0000	1.2
@@ -0,0 +1 @@
+WebService-Validator-CSS-W3C-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:01:59 -0000	1.1
+++ sources	30 Apr 2009 05:55:44 -0000	1.2
@@ -0,0 +1 @@
+bac54611541f72e1cfd12949afae9a1f  WebService-Validator-CSS-W3C-0.2.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 05:57:20 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 05:57:20 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x/devel libsqlite3x-includes.patch, NONE,
	1.1 libsqlite3x-prep.patch, NONE, 1.1 mingw32-libsqlite3x.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430055720.2D50A70133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libsqlite3x/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28348

Modified Files:
	.cvsignore sources 
Added Files:
	libsqlite3x-includes.patch libsqlite3x-prep.patch 
	mingw32-libsqlite3x.spec 
Log Message:
import from review


libsqlite3x-includes.patch:

--- NEW FILE libsqlite3x-includes.patch ---
--- sq3.cpp.orig	2008-05-16 23:54:39.000000000 +0200
+++ sq3.cpp	2008-05-16 23:55:18.000000000 +0200
@@ -8,6 +8,7 @@
 #include "sq3.hpp"
 #include <vector>
 #include <sstream>
+#include <cstring>
 
 #if SQ3_USE_WCHAR
 #include <cwchar>
--- sq3_log_db.cpp.orig	2008-05-16 23:55:36.000000000 +0200
+++ sq3_log_db.cpp	2008-05-16 23:55:50.000000000 +0200
@@ -4,6 +4,7 @@
 #include <sstream>
 #include <vector>
 #include <cstdio> // vsnprint()
+#include <cstring>
 namespace sq3 {
 
 	log_db::log_db( std::string const & filename )

libsqlite3x-prep.patch:

--- NEW FILE libsqlite3x-prep.patch ---
--- sqlite3x_command.cpp.prep	2007-12-24 15:43:58.000000000 +0100
+++ sqlite3x_command.cpp	2007-12-24 15:47:31.000000000 +0100
@@ -47,9 +47,18 @@
 #if SQLITE3X_USE_WCHAR
 	sqlite3_command::sqlite3_command(sqlite3_connection &con, const std::wstring &sql) : con(con),stmt(0),refs(0),argc(0) {
 		const void *tail=NULL;
-		if(sqlite3_prepare16(con.db(), sql.data(), (int)sql.length()*2, &this->stmt, &tail)!=SQLITE_OK)
-			throw database_error(con);
-
+		int rc =
+#if (SQLITE_VERSION_NUMBER >= 3003009)
+                        sqlite3_prepare16_v2
+#else
+                        sqlite3_prepare16
+#endif
+			(con.db(), sql.data(), (int)sql.length()*2, &this->stmt, &tail);
+		if( SQLITE_OK != rc )
+		{
+			throw database_error("sqlite3_command::prepare failed. Reason=[%s]",
+					     sqlite3_errmsg( this->con.db() ) );
+		}
 		this->argc=sqlite3_column_count(this->stmt);
 	}
 #endif
@@ -58,7 +67,13 @@
 	{
 		if( this->stmt ) this->finalize();
 		const char *tail=NULL;
-		int rc = sqlite3_prepare( this->con.db(), sql, len, &(this->stmt), &tail );
+		int rc =
+#if (SQLITE_VERSION_NUMBER >= 3003009)
+                        sqlite3_prepare_v2
+#else
+                        sqlite3_prepare
+#endif
+			( this->con.db(), sql, len, &(this->stmt), &tail );
 		if( SQLITE_OK != rc )
 		{
 			throw database_error("sqlite3_command::prepare([%s]) failed. Reason=[%s]",


--- NEW FILE mingw32-libsqlite3x.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global veryear 2007
%global vermon  10
%global verday  18
%global namesq3 libsq3
%global name1   libsqlite3x
Name:           mingw32-%{name1}
Version:        %{veryear}%{vermon}%{verday}
Release:        7%{?dist}
Summary:        MinGW Windows C++ Wrapper for the SQLite3 embeddable SQL database engine

Group:          System Environment/Libraries
License:        zlib
URL:            http://www.wanderinghorse.net/computing/sqlite/
Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name1}-%{veryear}.%{vermon}.%{verday}.tar.gz
Source1:        libsqlite3x-autotools.tar.gz
Patch1:         libsqlite3x-prep.patch
Patch2:         libsqlite3x-includes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-sqlite dos2unix automake libtool
BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

%description
sqlite3 is a slick embedded SQL server written in C. It's easy to use,
powerful, and quite fast. sqlite3x is a C++ wrapper API for working
with sqlite3 databases that uses exceptions.


%package -n     mingw32-%{namesq3}
Summary:        MinGW Windows C++ Wrapper for the SQLite3 embeddable SQL database engine
Group:          Development/Libraries
Requires:       mingw32-%{namesq3} = %{version}-%{release}

%description -n mingw32-%{namesq3}
sqlite3 is a slick embedded SQL server written in C. It's easy to use,
powerful, and quite fast. sq3 is a C++ wrapper API for working
with sqlite3 databases that does not use exceptions.


%prep
%setup -q -n %{name1}-%{veryear}.%{vermon}.%{verday} -a 1
dos2unix *.hpp *.cpp
%patch1 -p0 -b .prep
%patch2 -p0 -b .incl
aclocal
libtoolize -f
autoheader
autoconf
automake -a -c
%{_mingw32_configure} --disable-static
iconv -f iso8859-1 -t utf-8  < README > R
mv R README

%build
make

%install
%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS README
%{_mingw32_bindir}/libsqlite3x-1.dll
%{_mingw32_includedir}/sqlite3x
%{_mingw32_libdir}/libsqlite3x.dll.a
%{_mingw32_libdir}/libsqlite3x.la
%{_mingw32_libdir}/pkgconfig/libsqlite3x.pc

%files -n mingw32-%{namesq3}
%defattr(-,root,root,-)
%doc AUTHORS README
%{_mingw32_bindir}/libsq3-1.dll
%{_mingw32_includedir}/sq3
%{_mingw32_libdir}/libsq3.dll.a
%{_mingw32_libdir}/libsq3.la
%{_mingw32_libdir}/pkgconfig/libsq3.pc

%changelog
* Tue Apr 28 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-7
- reorder BR/BA
- remove (duplicate) docs
- change License tag

* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-6
- add missing BR

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-5
- unify main and devel subpackage

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-4
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsqlite3x/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:42:19 -0000	1.1
+++ .cvsignore	30 Apr 2009 05:56:49 -0000	1.2
@@ -0,0 +1,2 @@
+libsqlite3x-2007.10.18.tar.gz
+libsqlite3x-autotools.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsqlite3x/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:42:19 -0000	1.1
+++ sources	30 Apr 2009 05:56:49 -0000	1.2
@@ -0,0 +1,2 @@
+f5015c83030236205aec1494b13ee334  libsqlite3x-2007.10.18.tar.gz
+f8a0ce0a7ef474197b3341620eddd3b3  libsqlite3x-autotools.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 06:00:43 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:00:43 +0000 (UTC)
Subject: rpms/mingw32-plotmm/devel mingw32-plotmm-ac.patch, NONE,
	1.1 mingw32-plotmm.spec, NONE,
	1.1 plotmm-0.1.2-libsigc++20.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430060043.8336870133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-plotmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28973

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-plotmm-ac.patch mingw32-plotmm.spec 
	plotmm-0.1.2-libsigc++20.patch 
Log Message:
import from review


mingw32-plotmm-ac.patch:

--- NEW FILE mingw32-plotmm-ac.patch ---
--- configure.ac.orig	2009-04-19 21:09:50.000000000 +0200
+++ configure.ac	2009-04-19 21:10:10.000000000 +0200
@@ -16,6 +16,12 @@
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
+AC_LANG_CPLUSPLUS
+
+AC_MINGW32
+AC_EXEEXT
+AC_OBJEXT
+
 AC_CHECK_TOOL(DOXYGEN, doxygen)
 
 pkg_modules="gtkmm-2.0"
--- plotmm/Makefile.am.mingw32	2005-11-09 17:37:09.000000000 +0100
+++ plotmm/Makefile.am	2009-04-19 22:14:54.000000000 +0200
@@ -13,6 +13,8 @@
 	supplemental.h supplemental.cc \
 	plot.h plot.cc \
 	compat.h
+libplotmm_la_LIBADD = @PACKAGE_LIBS@
+libplotmm_la_LDFLAGS = -no-undefined
 
 libplotmm_la_CXXFLAGS = @PACKAGE_CFLAGS@ -I$(top_srcdir)
 


--- NEW FILE mingw32-plotmm.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-plotmm
Version:        0.1.2
Release:        2%{?dist}
Summary:        MinGW GTKmm plot widget for scientific applications
Group:          Development/Libraries
License:        LGPLv2
URL:            http://plotmm.sourceforge.net/
Source0:        http://download.sourceforge.net/plotmm/plotmm-%{version}.tar.gz
# Fix code to build against libsigc++20
# Upstream:
# https://sourceforge.net/tracker/?func=detail&atid=632478&aid=2082337&group_id=102665
Patch0:         plotmm-0.1.2-libsigc++20.patch
Patch1:         mingw32-plotmm-ac.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtkmm24 >= 2.4.0
BuildRequires:  libtool
BuildRequires:  automake
BuildRequires:  autoconf

Requires:       pkgconfig


%description
This package provides an extension to the mingw32 gtkmm library.  It
contains widgets which are primarily useful for technical and
scientifical purposes.  Initially, this is a 2-D plotting widget.

%prep
%setup -q -n plotmm-%{version}
%patch0 -p1 -b .libsigc++20
%patch1 -p0 -b .mingw32
# update autotools, distributed files are so old they do not
# get compiling dlls right
libtoolize --force --copy
aclocal
autoconf
automake -a -c


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/curves.exe
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/simple.exe

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README
%{_mingw32_bindir}/libplotmm-0.dll
%{_mingw32_libdir}/libplotmm.dll.a
%{_mingw32_libdir}/libplotmm.la
%{_mingw32_libdir}/pkgconfig/plotmm.pc
%{_mingw32_includedir}/plotmm

%changelog
* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-2
- add missing BR

* Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-1
- copy from native

plotmm-0.1.2-libsigc++20.patch:

--- NEW FILE plotmm-0.1.2-libsigc++20.patch ---
diff -up plotmm-0.1.2/plotmm/curve.h.BAD plotmm-0.1.2/plotmm/curve.h
--- plotmm-0.1.2/plotmm/curve.h.BAD	2008-08-29 08:03:17.000000000 -0400
+++ plotmm-0.1.2/plotmm/curve.h	2008-08-29 08:04:49.000000000 -0400
@@ -140,7 +140,7 @@ namespace PlotMM {
 			  int from = 0, int to = -1);
 
 	//! Signals that this curve has changed in some way or the other
-	SigC::Signal0<void> signal_curve_changed;
+	sigc::signal0<void> signal_curve_changed;
 
     protected:
 	virtual void init(const Glib::ustring &title);
diff -up plotmm-0.1.2/plotmm/plot.cc.BAD plotmm-0.1.2/plotmm/plot.cc
--- plotmm-0.1.2/plotmm/plot.cc.BAD	2008-08-29 08:07:38.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.cc	2008-08-29 08:08:01.000000000 -0400
@@ -406,19 +406,19 @@ void Plot::replot()
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
 {
     return canvas_.signal_plot_mouse_press;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
 {
     return canvas_.signal_plot_mouse_release;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
 {
     return canvas_.signal_plot_mouse_move;
 }
diff -up plotmm-0.1.2/plotmm/plot.h.BAD plotmm-0.1.2/plotmm/plot.h
--- plotmm-0.1.2/plotmm/plot.h.BAD	2008-08-29 08:08:18.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.h	2008-08-29 08:08:45.000000000 -0400
@@ -79,9 +79,9 @@ namespace PlotMM 
 	virtual void clear();
 	virtual void end_replot();
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
 
     protected:
 	virtual bool on_expose_event(GdkEventExpose* event);
@@ -141,9 +141,9 @@ namespace PlotMM 
 	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
 	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
 
 	void set_selection(const Rectangle &r);
 	Rectangle get_selection() { return select_; }
diff -up plotmm-0.1.2/plotmm/scale.h.BAD plotmm-0.1.2/plotmm/scale.h
--- plotmm-0.1.2/plotmm/scale.h.BAD	2008-08-29 08:05:52.000000000 -0400
+++ plotmm-0.1.2/plotmm/scale.h	2008-08-29 08:05:24.000000000 -0400
@@ -133,7 +133,7 @@ namespace PlotMM
 	/*! This signal is thrown whenever the scale is enabled or disabled
 	 *  \sa set_enabled, enabled
 	 */
-	SigC::Signal1<void,bool> signal_enabled;
+	sigc::signal1<void,bool> signal_enabled;
 
     protected:
 	virtual void on_realize();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:48:10 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:00:12 -0000	1.2
@@ -0,0 +1 @@
+plotmm-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:48:10 -0000	1.1
+++ sources	30 Apr 2009 06:00:13 -0000	1.2
@@ -0,0 +1 @@
+d8a49db390be5de5965e52ef8d8581f3  plotmm-0.1.2.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 06:03:30 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:03:30 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x/F-11 libsqlite3x-includes.patch, NONE,
	1.1 libsqlite3x-prep.patch, NONE, 1.1 mingw32-libsqlite3x.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430060330.B35FA70133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libsqlite3x/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29535

Modified Files:
	.cvsignore sources 
Added Files:
	libsqlite3x-includes.patch libsqlite3x-prep.patch 
	mingw32-libsqlite3x.spec 
Log Message:
import from review


libsqlite3x-includes.patch:

--- NEW FILE libsqlite3x-includes.patch ---
--- sq3.cpp.orig	2008-05-16 23:54:39.000000000 +0200
+++ sq3.cpp	2008-05-16 23:55:18.000000000 +0200
@@ -8,6 +8,7 @@
 #include "sq3.hpp"
 #include <vector>
 #include <sstream>
+#include <cstring>
 
 #if SQ3_USE_WCHAR
 #include <cwchar>
--- sq3_log_db.cpp.orig	2008-05-16 23:55:36.000000000 +0200
+++ sq3_log_db.cpp	2008-05-16 23:55:50.000000000 +0200
@@ -4,6 +4,7 @@
 #include <sstream>
 #include <vector>
 #include <cstdio> // vsnprint()
+#include <cstring>
 namespace sq3 {
 
 	log_db::log_db( std::string const & filename )

libsqlite3x-prep.patch:

--- NEW FILE libsqlite3x-prep.patch ---
--- sqlite3x_command.cpp.prep	2007-12-24 15:43:58.000000000 +0100
+++ sqlite3x_command.cpp	2007-12-24 15:47:31.000000000 +0100
@@ -47,9 +47,18 @@
 #if SQLITE3X_USE_WCHAR
 	sqlite3_command::sqlite3_command(sqlite3_connection &con, const std::wstring &sql) : con(con),stmt(0),refs(0),argc(0) {
 		const void *tail=NULL;
-		if(sqlite3_prepare16(con.db(), sql.data(), (int)sql.length()*2, &this->stmt, &tail)!=SQLITE_OK)
-			throw database_error(con);
-
+		int rc =
+#if (SQLITE_VERSION_NUMBER >= 3003009)
+                        sqlite3_prepare16_v2
+#else
+                        sqlite3_prepare16
+#endif
+			(con.db(), sql.data(), (int)sql.length()*2, &this->stmt, &tail);
+		if( SQLITE_OK != rc )
+		{
+			throw database_error("sqlite3_command::prepare failed. Reason=[%s]",
+					     sqlite3_errmsg( this->con.db() ) );
+		}
 		this->argc=sqlite3_column_count(this->stmt);
 	}
 #endif
@@ -58,7 +67,13 @@
 	{
 		if( this->stmt ) this->finalize();
 		const char *tail=NULL;
-		int rc = sqlite3_prepare( this->con.db(), sql, len, &(this->stmt), &tail );
+		int rc =
+#if (SQLITE_VERSION_NUMBER >= 3003009)
+                        sqlite3_prepare_v2
+#else
+                        sqlite3_prepare
+#endif
+			( this->con.db(), sql, len, &(this->stmt), &tail );
 		if( SQLITE_OK != rc )
 		{
 			throw database_error("sqlite3_command::prepare([%s]) failed. Reason=[%s]",


--- NEW FILE mingw32-libsqlite3x.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global veryear 2007
%global vermon  10
%global verday  18
%global namesq3 libsq3
%global name1   libsqlite3x
Name:           mingw32-%{name1}
Version:        %{veryear}%{vermon}%{verday}
Release:        7%{?dist}
Summary:        MinGW Windows C++ Wrapper for the SQLite3 embeddable SQL database engine

Group:          System Environment/Libraries
License:        zlib
URL:            http://www.wanderinghorse.net/computing/sqlite/
Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name1}-%{veryear}.%{vermon}.%{verday}.tar.gz
Source1:        libsqlite3x-autotools.tar.gz
Patch1:         libsqlite3x-prep.patch
Patch2:         libsqlite3x-includes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-sqlite dos2unix automake libtool
BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

%description
sqlite3 is a slick embedded SQL server written in C. It's easy to use,
powerful, and quite fast. sqlite3x is a C++ wrapper API for working
with sqlite3 databases that uses exceptions.


%package -n     mingw32-%{namesq3}
Summary:        MinGW Windows C++ Wrapper for the SQLite3 embeddable SQL database engine
Group:          Development/Libraries
Requires:       mingw32-%{namesq3} = %{version}-%{release}

%description -n mingw32-%{namesq3}
sqlite3 is a slick embedded SQL server written in C. It's easy to use,
powerful, and quite fast. sq3 is a C++ wrapper API for working
with sqlite3 databases that does not use exceptions.


%prep
%setup -q -n %{name1}-%{veryear}.%{vermon}.%{verday} -a 1
dos2unix *.hpp *.cpp
%patch1 -p0 -b .prep
%patch2 -p0 -b .incl
aclocal
libtoolize -f
autoheader
autoconf
automake -a -c
%{_mingw32_configure} --disable-static
iconv -f iso8859-1 -t utf-8  < README > R
mv R README

%build
make

%install
%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS README
%{_mingw32_bindir}/libsqlite3x-1.dll
%{_mingw32_includedir}/sqlite3x
%{_mingw32_libdir}/libsqlite3x.dll.a
%{_mingw32_libdir}/libsqlite3x.la
%{_mingw32_libdir}/pkgconfig/libsqlite3x.pc

%files -n mingw32-%{namesq3}
%defattr(-,root,root,-)
%doc AUTHORS README
%{_mingw32_bindir}/libsq3-1.dll
%{_mingw32_includedir}/sq3
%{_mingw32_libdir}/libsq3.dll.a
%{_mingw32_libdir}/libsq3.la
%{_mingw32_libdir}/pkgconfig/libsq3.pc

%changelog
* Tue Apr 28 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-7
- reorder BR/BA
- remove (duplicate) docs
- change License tag

* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-6
- add missing BR

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-5
- unify main and devel subpackage

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-4
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsqlite3x/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:42:19 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:03:00 -0000	1.2
@@ -0,0 +1,2 @@
+libsqlite3x-2007.10.18.tar.gz
+libsqlite3x-autotools.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsqlite3x/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:42:19 -0000	1.1
+++ sources	30 Apr 2009 06:03:00 -0000	1.2
@@ -0,0 +1,2 @@
+f5015c83030236205aec1494b13ee334  libsqlite3x-2007.10.18.tar.gz
+f8a0ce0a7ef474197b3341620eddd3b3  libsqlite3x-autotools.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 06:06:18 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:06:18 +0000 (UTC)
Subject: rpms/mingw32-libsqlite3x/F-10 libsqlite3x-includes.patch, NONE,
	1.1 libsqlite3x-prep.patch, NONE, 1.1 mingw32-libsqlite3x.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430060618.E010A70133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-libsqlite3x/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30492

Modified Files:
	.cvsignore sources 
Added Files:
	libsqlite3x-includes.patch libsqlite3x-prep.patch 
	mingw32-libsqlite3x.spec 
Log Message:
import from review


libsqlite3x-includes.patch:

--- NEW FILE libsqlite3x-includes.patch ---
--- sq3.cpp.orig	2008-05-16 23:54:39.000000000 +0200
+++ sq3.cpp	2008-05-16 23:55:18.000000000 +0200
@@ -8,6 +8,7 @@
 #include "sq3.hpp"
 #include <vector>
 #include <sstream>
+#include <cstring>
 
 #if SQ3_USE_WCHAR
 #include <cwchar>
--- sq3_log_db.cpp.orig	2008-05-16 23:55:36.000000000 +0200
+++ sq3_log_db.cpp	2008-05-16 23:55:50.000000000 +0200
@@ -4,6 +4,7 @@
 #include <sstream>
 #include <vector>
 #include <cstdio> // vsnprint()
+#include <cstring>
 namespace sq3 {
 
 	log_db::log_db( std::string const & filename )

libsqlite3x-prep.patch:

--- NEW FILE libsqlite3x-prep.patch ---
--- sqlite3x_command.cpp.prep	2007-12-24 15:43:58.000000000 +0100
+++ sqlite3x_command.cpp	2007-12-24 15:47:31.000000000 +0100
@@ -47,9 +47,18 @@
 #if SQLITE3X_USE_WCHAR
 	sqlite3_command::sqlite3_command(sqlite3_connection &con, const std::wstring &sql) : con(con),stmt(0),refs(0),argc(0) {
 		const void *tail=NULL;
-		if(sqlite3_prepare16(con.db(), sql.data(), (int)sql.length()*2, &this->stmt, &tail)!=SQLITE_OK)
-			throw database_error(con);
-
+		int rc =
+#if (SQLITE_VERSION_NUMBER >= 3003009)
+                        sqlite3_prepare16_v2
+#else
+                        sqlite3_prepare16
+#endif
+			(con.db(), sql.data(), (int)sql.length()*2, &this->stmt, &tail);
+		if( SQLITE_OK != rc )
+		{
+			throw database_error("sqlite3_command::prepare failed. Reason=[%s]",
+					     sqlite3_errmsg( this->con.db() ) );
+		}
 		this->argc=sqlite3_column_count(this->stmt);
 	}
 #endif
@@ -58,7 +67,13 @@
 	{
 		if( this->stmt ) this->finalize();
 		const char *tail=NULL;
-		int rc = sqlite3_prepare( this->con.db(), sql, len, &(this->stmt), &tail );
+		int rc =
+#if (SQLITE_VERSION_NUMBER >= 3003009)
+                        sqlite3_prepare_v2
+#else
+                        sqlite3_prepare
+#endif
+			( this->con.db(), sql, len, &(this->stmt), &tail );
 		if( SQLITE_OK != rc )
 		{
 			throw database_error("sqlite3_command::prepare([%s]) failed. Reason=[%s]",


--- NEW FILE mingw32-libsqlite3x.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global veryear 2007
%global vermon  10
%global verday  18
%global namesq3 libsq3
%global name1   libsqlite3x
Name:           mingw32-%{name1}
Version:        %{veryear}%{vermon}%{verday}
Release:        7%{?dist}
Summary:        MinGW Windows C++ Wrapper for the SQLite3 embeddable SQL database engine

Group:          System Environment/Libraries
License:        zlib
URL:            http://www.wanderinghorse.net/computing/sqlite/
Source0:        http://www.wanderinghorse.net/computing/sqlite/%{name1}-%{veryear}.%{vermon}.%{verday}.tar.gz
Source1:        libsqlite3x-autotools.tar.gz
Patch1:         libsqlite3x-prep.patch
Patch2:         libsqlite3x-includes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-sqlite dos2unix automake libtool
BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

%description
sqlite3 is a slick embedded SQL server written in C. It's easy to use,
powerful, and quite fast. sqlite3x is a C++ wrapper API for working
with sqlite3 databases that uses exceptions.


%package -n     mingw32-%{namesq3}
Summary:        MinGW Windows C++ Wrapper for the SQLite3 embeddable SQL database engine
Group:          Development/Libraries
Requires:       mingw32-%{namesq3} = %{version}-%{release}

%description -n mingw32-%{namesq3}
sqlite3 is a slick embedded SQL server written in C. It's easy to use,
powerful, and quite fast. sq3 is a C++ wrapper API for working
with sqlite3 databases that does not use exceptions.


%prep
%setup -q -n %{name1}-%{veryear}.%{vermon}.%{verday} -a 1
dos2unix *.hpp *.cpp
%patch1 -p0 -b .prep
%patch2 -p0 -b .incl
aclocal
libtoolize -f
autoheader
autoconf
automake -a -c
%{_mingw32_configure} --disable-static
iconv -f iso8859-1 -t utf-8  < README > R
mv R README

%build
make

%install
%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS README
%{_mingw32_bindir}/libsqlite3x-1.dll
%{_mingw32_includedir}/sqlite3x
%{_mingw32_libdir}/libsqlite3x.dll.a
%{_mingw32_libdir}/libsqlite3x.la
%{_mingw32_libdir}/pkgconfig/libsqlite3x.pc

%files -n mingw32-%{namesq3}
%defattr(-,root,root,-)
%doc AUTHORS README
%{_mingw32_bindir}/libsq3-1.dll
%{_mingw32_includedir}/sq3
%{_mingw32_libdir}/libsq3.dll.a
%{_mingw32_libdir}/libsq3.la
%{_mingw32_libdir}/pkgconfig/libsq3.pc

%changelog
* Tue Apr 28 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-7
- reorder BR/BA
- remove (duplicate) docs
- change License tag

* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-6
- add missing BR

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-5
- unify main and devel subpackage

* Mon Mar 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20071018-4
- copy from native package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsqlite3x/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:42:19 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:05:48 -0000	1.2
@@ -0,0 +1,2 @@
+libsqlite3x-2007.10.18.tar.gz
+libsqlite3x-autotools.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libsqlite3x/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:42:19 -0000	1.1
+++ sources	30 Apr 2009 06:05:48 -0000	1.2
@@ -0,0 +1,2 @@
+f5015c83030236205aec1494b13ee334  libsqlite3x-2007.10.18.tar.gz
+f8a0ce0a7ef474197b3341620eddd3b3  libsqlite3x-autotools.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 06:08:52 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:08:52 +0000 (UTC)
Subject: rpms/mingw32-plotmm/F-11 mingw32-plotmm-ac.patch, NONE,
	1.1 mingw32-plotmm.spec, NONE,
	1.1 plotmm-0.1.2-libsigc++20.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430060852.684D770133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-plotmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31083/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-plotmm-ac.patch mingw32-plotmm.spec 
	plotmm-0.1.2-libsigc++20.patch 
Log Message:
import from review


mingw32-plotmm-ac.patch:

--- NEW FILE mingw32-plotmm-ac.patch ---
--- configure.ac.orig	2009-04-19 21:09:50.000000000 +0200
+++ configure.ac	2009-04-19 21:10:10.000000000 +0200
@@ -16,6 +16,12 @@
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
+AC_LANG_CPLUSPLUS
+
+AC_MINGW32
+AC_EXEEXT
+AC_OBJEXT
+
 AC_CHECK_TOOL(DOXYGEN, doxygen)
 
 pkg_modules="gtkmm-2.0"
--- plotmm/Makefile.am.mingw32	2005-11-09 17:37:09.000000000 +0100
+++ plotmm/Makefile.am	2009-04-19 22:14:54.000000000 +0200
@@ -13,6 +13,8 @@
 	supplemental.h supplemental.cc \
 	plot.h plot.cc \
 	compat.h
+libplotmm_la_LIBADD = @PACKAGE_LIBS@
+libplotmm_la_LDFLAGS = -no-undefined
 
 libplotmm_la_CXXFLAGS = @PACKAGE_CFLAGS@ -I$(top_srcdir)
 


--- NEW FILE mingw32-plotmm.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-plotmm
Version:        0.1.2
Release:        2%{?dist}
Summary:        MinGW GTKmm plot widget for scientific applications
Group:          Development/Libraries
License:        LGPLv2
URL:            http://plotmm.sourceforge.net/
Source0:        http://download.sourceforge.net/plotmm/plotmm-%{version}.tar.gz
# Fix code to build against libsigc++20
# Upstream:
# https://sourceforge.net/tracker/?func=detail&atid=632478&aid=2082337&group_id=102665
Patch0:         plotmm-0.1.2-libsigc++20.patch
Patch1:         mingw32-plotmm-ac.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtkmm24 >= 2.4.0
BuildRequires:  libtool
BuildRequires:  automake
BuildRequires:  autoconf

Requires:       pkgconfig


%description
This package provides an extension to the mingw32 gtkmm library.  It
contains widgets which are primarily useful for technical and
scientifical purposes.  Initially, this is a 2-D plotting widget.

%prep
%setup -q -n plotmm-%{version}
%patch0 -p1 -b .libsigc++20
%patch1 -p0 -b .mingw32
# update autotools, distributed files are so old they do not
# get compiling dlls right
libtoolize --force --copy
aclocal
autoconf
automake -a -c


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/curves.exe
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/simple.exe

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README
%{_mingw32_bindir}/libplotmm-0.dll
%{_mingw32_libdir}/libplotmm.dll.a
%{_mingw32_libdir}/libplotmm.la
%{_mingw32_libdir}/pkgconfig/plotmm.pc
%{_mingw32_includedir}/plotmm

%changelog
* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-2
- add missing BR

* Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-1
- copy from native

plotmm-0.1.2-libsigc++20.patch:

--- NEW FILE plotmm-0.1.2-libsigc++20.patch ---
diff -up plotmm-0.1.2/plotmm/curve.h.BAD plotmm-0.1.2/plotmm/curve.h
--- plotmm-0.1.2/plotmm/curve.h.BAD	2008-08-29 08:03:17.000000000 -0400
+++ plotmm-0.1.2/plotmm/curve.h	2008-08-29 08:04:49.000000000 -0400
@@ -140,7 +140,7 @@ namespace PlotMM {
 			  int from = 0, int to = -1);
 
 	//! Signals that this curve has changed in some way or the other
-	SigC::Signal0<void> signal_curve_changed;
+	sigc::signal0<void> signal_curve_changed;
 
     protected:
 	virtual void init(const Glib::ustring &title);
diff -up plotmm-0.1.2/plotmm/plot.cc.BAD plotmm-0.1.2/plotmm/plot.cc
--- plotmm-0.1.2/plotmm/plot.cc.BAD	2008-08-29 08:07:38.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.cc	2008-08-29 08:08:01.000000000 -0400
@@ -406,19 +406,19 @@ void Plot::replot()
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
 {
     return canvas_.signal_plot_mouse_press;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
 {
     return canvas_.signal_plot_mouse_release;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
 {
     return canvas_.signal_plot_mouse_move;
 }
diff -up plotmm-0.1.2/plotmm/plot.h.BAD plotmm-0.1.2/plotmm/plot.h
--- plotmm-0.1.2/plotmm/plot.h.BAD	2008-08-29 08:08:18.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.h	2008-08-29 08:08:45.000000000 -0400
@@ -79,9 +79,9 @@ namespace PlotMM 
 	virtual void clear();
 	virtual void end_replot();
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
 
     protected:
 	virtual bool on_expose_event(GdkEventExpose* event);
@@ -141,9 +141,9 @@ namespace PlotMM 
 	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
 	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
 
 	void set_selection(const Rectangle &r);
 	Rectangle get_selection() { return select_; }
diff -up plotmm-0.1.2/plotmm/scale.h.BAD plotmm-0.1.2/plotmm/scale.h
--- plotmm-0.1.2/plotmm/scale.h.BAD	2008-08-29 08:05:52.000000000 -0400
+++ plotmm-0.1.2/plotmm/scale.h	2008-08-29 08:05:24.000000000 -0400
@@ -133,7 +133,7 @@ namespace PlotMM
 	/*! This signal is thrown whenever the scale is enabled or disabled
 	 *  \sa set_enabled, enabled
 	 */
-	SigC::Signal1<void,bool> signal_enabled;
+	sigc::signal1<void,bool> signal_enabled;
 
     protected:
 	virtual void on_realize();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:48:10 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:08:22 -0000	1.2
@@ -0,0 +1 @@
+plotmm-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:48:10 -0000	1.1
+++ sources	30 Apr 2009 06:08:22 -0000	1.2
@@ -0,0 +1 @@
+d8a49db390be5de5965e52ef8d8581f3  plotmm-0.1.2.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 06:08:52 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:08:52 +0000 (UTC)
Subject: rpms/mingw32-plotmm/F-10 mingw32-plotmm-ac.patch, NONE,
	1.1 mingw32-plotmm.spec, NONE,
	1.1 plotmm-0.1.2-libsigc++20.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430060852.346C370133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-plotmm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31083/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-plotmm-ac.patch mingw32-plotmm.spec 
	plotmm-0.1.2-libsigc++20.patch 
Log Message:
import from review


mingw32-plotmm-ac.patch:

--- NEW FILE mingw32-plotmm-ac.patch ---
--- configure.ac.orig	2009-04-19 21:09:50.000000000 +0200
+++ configure.ac	2009-04-19 21:10:10.000000000 +0200
@@ -16,6 +16,12 @@
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
+AC_LANG_CPLUSPLUS
+
+AC_MINGW32
+AC_EXEEXT
+AC_OBJEXT
+
 AC_CHECK_TOOL(DOXYGEN, doxygen)
 
 pkg_modules="gtkmm-2.0"
--- plotmm/Makefile.am.mingw32	2005-11-09 17:37:09.000000000 +0100
+++ plotmm/Makefile.am	2009-04-19 22:14:54.000000000 +0200
@@ -13,6 +13,8 @@
 	supplemental.h supplemental.cc \
 	plot.h plot.cc \
 	compat.h
+libplotmm_la_LIBADD = @PACKAGE_LIBS@
+libplotmm_la_LDFLAGS = -no-undefined
 
 libplotmm_la_CXXFLAGS = @PACKAGE_CFLAGS@ -I$(top_srcdir)
 


--- NEW FILE mingw32-plotmm.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-plotmm
Version:        0.1.2
Release:        2%{?dist}
Summary:        MinGW GTKmm plot widget for scientific applications
Group:          Development/Libraries
License:        LGPLv2
URL:            http://plotmm.sourceforge.net/
Source0:        http://download.sourceforge.net/plotmm/plotmm-%{version}.tar.gz
# Fix code to build against libsigc++20
# Upstream:
# https://sourceforge.net/tracker/?func=detail&atid=632478&aid=2082337&group_id=102665
Patch0:         plotmm-0.1.2-libsigc++20.patch
Patch1:         mingw32-plotmm-ac.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtkmm24 >= 2.4.0
BuildRequires:  libtool
BuildRequires:  automake
BuildRequires:  autoconf

Requires:       pkgconfig


%description
This package provides an extension to the mingw32 gtkmm library.  It
contains widgets which are primarily useful for technical and
scientifical purposes.  Initially, this is a 2-D plotting widget.

%prep
%setup -q -n plotmm-%{version}
%patch0 -p1 -b .libsigc++20
%patch1 -p0 -b .mingw32
# update autotools, distributed files are so old they do not
# get compiling dlls right
libtoolize --force --copy
aclocal
autoconf
automake -a -c


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/curves.exe
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/simple.exe

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README
%{_mingw32_bindir}/libplotmm-0.dll
%{_mingw32_libdir}/libplotmm.dll.a
%{_mingw32_libdir}/libplotmm.la
%{_mingw32_libdir}/pkgconfig/plotmm.pc
%{_mingw32_includedir}/plotmm

%changelog
* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-2
- add missing BR

* Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-1
- copy from native

plotmm-0.1.2-libsigc++20.patch:

--- NEW FILE plotmm-0.1.2-libsigc++20.patch ---
diff -up plotmm-0.1.2/plotmm/curve.h.BAD plotmm-0.1.2/plotmm/curve.h
--- plotmm-0.1.2/plotmm/curve.h.BAD	2008-08-29 08:03:17.000000000 -0400
+++ plotmm-0.1.2/plotmm/curve.h	2008-08-29 08:04:49.000000000 -0400
@@ -140,7 +140,7 @@ namespace PlotMM {
 			  int from = 0, int to = -1);
 
 	//! Signals that this curve has changed in some way or the other
-	SigC::Signal0<void> signal_curve_changed;
+	sigc::signal0<void> signal_curve_changed;
 
     protected:
 	virtual void init(const Glib::ustring &title);
diff -up plotmm-0.1.2/plotmm/plot.cc.BAD plotmm-0.1.2/plotmm/plot.cc
--- plotmm-0.1.2/plotmm/plot.cc.BAD	2008-08-29 08:07:38.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.cc	2008-08-29 08:08:01.000000000 -0400
@@ -406,19 +406,19 @@ void Plot::replot()
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
 {
     return canvas_.signal_plot_mouse_press;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
 {
     return canvas_.signal_plot_mouse_release;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
 {
     return canvas_.signal_plot_mouse_move;
 }
diff -up plotmm-0.1.2/plotmm/plot.h.BAD plotmm-0.1.2/plotmm/plot.h
--- plotmm-0.1.2/plotmm/plot.h.BAD	2008-08-29 08:08:18.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.h	2008-08-29 08:08:45.000000000 -0400
@@ -79,9 +79,9 @@ namespace PlotMM 
 	virtual void clear();
 	virtual void end_replot();
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
 
     protected:
 	virtual bool on_expose_event(GdkEventExpose* event);
@@ -141,9 +141,9 @@ namespace PlotMM 
 	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
 	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
 
 	void set_selection(const Rectangle &r);
 	Rectangle get_selection() { return select_; }
diff -up plotmm-0.1.2/plotmm/scale.h.BAD plotmm-0.1.2/plotmm/scale.h
--- plotmm-0.1.2/plotmm/scale.h.BAD	2008-08-29 08:05:52.000000000 -0400
+++ plotmm-0.1.2/plotmm/scale.h	2008-08-29 08:05:24.000000000 -0400
@@ -133,7 +133,7 @@ namespace PlotMM
 	/*! This signal is thrown whenever the scale is enabled or disabled
 	 *  \sa set_enabled, enabled
 	 */
-	SigC::Signal1<void,bool> signal_enabled;
+	sigc::signal1<void,bool> signal_enabled;
 
     protected:
 	virtual void on_realize();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:48:10 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:08:21 -0000	1.2
@@ -0,0 +1 @@
+plotmm-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:48:10 -0000	1.1
+++ sources	30 Apr 2009 06:08:21 -0000	1.2
@@ -0,0 +1 @@
+d8a49db390be5de5965e52ef8d8581f3  plotmm-0.1.2.tar.gz



From sailer at fedoraproject.org  Thu Apr 30 06:21:24 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:21:24 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/F-10 mingw32-gtkmm24.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430062124.3300D70133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv412

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-gtkmm24.spec 
Log Message:
copy from F-11



--- NEW FILE mingw32-gtkmm24.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-gtkmm24
Version:        2.16.0
Release:        1%{?dist}
Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.16/gtkmm-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-glibmm24 >= %{version}
BuildRequires:  mingw32-atk
BuildRequires:  mingw32-pango
BuildRequires:  mingw32-gtk2 >= %{version}
BuildRequires:  mingw32-cairomm
BuildRequires:  mingw32-pangomm

Requires:       pkgconfig


%description
gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps
GTK+ 2.  Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.



%prep
%setup -q -n gtkmm-%{version}


%build
%{_mingw32_configure} --disable-static --enable-shared --disable-demos --disable-docs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libatkmm-1.6-1.dll
%{_mingw32_bindir}/libgdkmm-2.4-1.dll
%{_mingw32_bindir}/libgtkmm-2.4-1.dll
%{_mingw32_libdir}/libatkmm-1.6.dll.a
%{_mingw32_libdir}/libatkmm-1.6.la
%{_mingw32_libdir}/libgdkmm-2.4.dll.a
%{_mingw32_libdir}/libgdkmm-2.4.la
%{_mingw32_libdir}/libgtkmm-2.4.dll.a
%{_mingw32_libdir}/libgtkmm-2.4.la
%{_mingw32_includedir}/atkmm-1.6
%{_mingw32_includedir}/gdkmm-2.4
%{_mingw32_includedir}/gtkmm-2.4
%{_mingw32_libdir}/gdkmm-2.4
%{_mingw32_libdir}/gtkmm-2.4
%{_mingw32_libdir}/pkgconfig/atkmm-1.6.pc
%{_mingw32_libdir}/pkgconfig/gdkmm-2.4.pc
%{_mingw32_libdir}/pkgconfig/gtkmm-2.4.pc


%changelog
* Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.16.0-1
- update to 2.16.0 to match native
- remove COPYING.tools, as the binary does not contain any program from
  the tools directory
- do not build docs

* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.15.0-2
- replace %%define with %%global

* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.15.0-1
- update to 2.15.0

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-5
- Rebuild for mingw32-gcc 4.4

* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-4
- Include license file.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-3
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-2
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.1-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Apr 2009 19:56:17 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:20:53 -0000	1.2
@@ -0,0 +1 @@
+gtkmm-2.16.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Apr 2009 19:56:17 -0000	1.1
+++ sources	30 Apr 2009 06:20:53 -0000	1.2
@@ -0,0 +1 @@
+a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2



From sailer at fedoraproject.org  Thu Apr 30 06:30:30 2009
From: sailer at fedoraproject.org (Thomas M. Sailer)
Date: Thu, 30 Apr 2009 06:30:30 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/F-10 .cvsignore, 1.2, 1.3 mingw32-gtkmm24.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090430063030.EB3AD70133@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1642

Modified Files:
	.cvsignore mingw32-gtkmm24.spec sources 
Log Message:
downgrade to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2009 06:20:53 -0000	1.2
+++ .cvsignore	30 Apr 2009 06:30:00 -0000	1.3
@@ -1 +1,2 @@
 gtkmm-2.16.0.tar.bz2
+gtkmm-2.14.3.tar.bz2


Index: mingw32-gtkmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-10/mingw32-gtkmm24.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-gtkmm24.spec	30 Apr 2009 06:20:53 -0000	1.1
+++ mingw32-gtkmm24.spec	30 Apr 2009 06:30:00 -0000	1.2
@@ -5,7 +5,7 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtkmm24
-Version:        2.16.0
+Version:        2.14.3
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.14.3-1
+- downgrade to match native
+
 * Sat Apr 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.16.0-1
 - update to 2.16.0 to match native
 - remove COPYING.tools, as the binary does not contain any program from


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2009 06:20:53 -0000	1.2
+++ sources	30 Apr 2009 06:30:00 -0000	1.3
@@ -1 +1 @@
-a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2
+10039f35d7f815d47f926a13cefe65d6  gtkmm-2.14.3.tar.bz2



From th0br0 at fedoraproject.org  Thu Apr 30 06:31:53 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Thu, 30 Apr 2009 06:31:53 +0000 (UTC)
Subject: rpms/razertool/F-10 15-razertool.fdi, NONE, 1.1 import.log, NONE,
	1.1 razertool.desktop, NONE, 1.1 razertool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430063153.8D4B670133@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/razertool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2021/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	15-razertool.fdi import.log razertool.desktop razertool.spec 
Log Message:
Initial CVS import for F-10



--- NEW FILE 15-razertool.fdi ---
<?xml version="1.0" encoding="UTF-8"?>

<deviceinfo version="0.2">
  <device>

   <match key="info.bus" string="usb_device">
      <match key="usb_device.vendor_id" int="0x1532">
      	<match key="usb_device.product_id" int="0x0101">
		<append key="info.capabilities" type="strlist">access_control</append>
		<merge key="access_control.file" type="copy_property">linux.device_file</merge>
		<merge key="access_control.type" type="string">mouse</merge>
	</match>

      	<match key="usb_device.product_id" int="0x0009">
		<append key="info.capabilities" type="strlist">access_control</append>
		<merge key="access_control.file" type="copy_property">linux.device_file</merge>
		<merge key="access_control.type" type="string">mouse</merge>
	</match>
      </match>
    </match>

  </device>
</deviceinfo>



--- NEW FILE import.log ---
razertool-0_0_7-5_fc10:F-10:razertool-0.0.7-5.fc10.src.rpm:1241073019


--- NEW FILE razertool.desktop ---
[Desktop Entry]
Name=Razertool
Comment=Unofficial Tool for controlling Razer Copperhead mice
GenericName=Unofficial Tool for controlling Razer Copperhead mice
Type=Application
Exec=razertool-gtk
Icon=/usr/share/razertool/pixmaps/razertool-icon.png
Encoding=UTF-8
Terminal=false
Categories=System;Settings;HardwareSettings;GTK;


--- NEW FILE razertool.spec ---
Name:           razertool
Version:        0.0.7
Release:        5%{?dist}
Summary:        Tool for controlling Razer Copperhead(TM) mice
                                                                                
Group:          User Interface/X Hardware Support
License:        GPLv2+
URL:            http://razertool.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
Source1:        %{name}.desktop
Source2:        15-%{name}.fdi
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel 
BuildRequires:  librsvg2-devel
BuildRequires:  cairo-devel
BuildRequires:  libusb-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       hal

%description
RazerTool is an unofficial tool for controlling Razer Copperhead mice in
Linux. It has both command-line and gtk+-2.x versions. 

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/

make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}
desktop-file-install \
     --dir=%{buildroot}/%{_datadir}/applications \
     %{SOURCE1}
install -m644 %{SOURCE2} \
     %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor

%find_lang %{name}-gtk

%clean
rm -rf %{buildroot}

%files -f %{name}-gtk.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}*
%{_bindir}/razerflash
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%{_mandir}/man1/%{name}.*
%{_datadir}/hal/fdi/policy/10osvendor/15-%{name}.fdi

%changelog
* Tue Apr 28 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-5
- Added Requires: hal

* Mon Apr 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-4
- Changed udev rule file to hal one provided by Christian Krause

* Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-3
- Code cleanup
- Permission fix
- Added the rules file for udev

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-2
- Path fixes

* Thu Mar 26 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:47:03 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:31:23 -0000	1.2
@@ -0,0 +1 @@
+razertool_0.0.7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:47:03 -0000	1.1
+++ sources	30 Apr 2009 06:31:23 -0000	1.2
@@ -0,0 +1 @@
+dad8236b2fface39f054a7ca6d1a448c  razertool_0.0.7.orig.tar.gz



From th0br0 at fedoraproject.org  Thu Apr 30 06:43:23 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Thu, 30 Apr 2009 06:43:23 +0000 (UTC)
Subject: rpms/razertool/F-11 15-razertool.fdi, NONE, 1.1 import.log, NONE,
	1.1 razertool.desktop, NONE, 1.1 razertool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430064323.63E4170133@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/razertool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4874/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	15-razertool.fdi import.log razertool.desktop razertool.spec 
Log Message:
Initial CVS import for F-11 branch



--- NEW FILE 15-razertool.fdi ---
<?xml version="1.0" encoding="UTF-8"?>

<deviceinfo version="0.2">
  <device>

   <match key="info.bus" string="usb_device">
      <match key="usb_device.vendor_id" int="0x1532">
      	<match key="usb_device.product_id" int="0x0101">
		<append key="info.capabilities" type="strlist">access_control</append>
		<merge key="access_control.file" type="copy_property">linux.device_file</merge>
		<merge key="access_control.type" type="string">mouse</merge>
	</match>

      	<match key="usb_device.product_id" int="0x0009">
		<append key="info.capabilities" type="strlist">access_control</append>
		<merge key="access_control.file" type="copy_property">linux.device_file</merge>
		<merge key="access_control.type" type="string">mouse</merge>
	</match>
      </match>
    </match>

  </device>
</deviceinfo>



--- NEW FILE import.log ---
razertool-0_0_7-5_fc10:F-11:razertool-0.0.7-5.fc10.src.rpm:1241073733


--- NEW FILE razertool.desktop ---
[Desktop Entry]
Name=Razertool
Comment=Unofficial Tool for controlling Razer Copperhead mice
GenericName=Unofficial Tool for controlling Razer Copperhead mice
Type=Application
Exec=razertool-gtk
Icon=/usr/share/razertool/pixmaps/razertool-icon.png
Encoding=UTF-8
Terminal=false
Categories=System;Settings;HardwareSettings;GTK;


--- NEW FILE razertool.spec ---
Name:           razertool
Version:        0.0.7
Release:        5%{?dist}
Summary:        Tool for controlling Razer Copperhead(TM) mice
                                                                                
Group:          User Interface/X Hardware Support
License:        GPLv2+
URL:            http://razertool.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
Source1:        %{name}.desktop
Source2:        15-%{name}.fdi
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel 
BuildRequires:  librsvg2-devel
BuildRequires:  cairo-devel
BuildRequires:  libusb-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       hal

%description
RazerTool is an unofficial tool for controlling Razer Copperhead mice in
Linux. It has both command-line and gtk+-2.x versions. 

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/

make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}
desktop-file-install \
     --dir=%{buildroot}/%{_datadir}/applications \
     %{SOURCE1}
install -m644 %{SOURCE2} \
     %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor

%find_lang %{name}-gtk

%clean
rm -rf %{buildroot}

%files -f %{name}-gtk.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}*
%{_bindir}/razerflash
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%{_mandir}/man1/%{name}.*
%{_datadir}/hal/fdi/policy/10osvendor/15-%{name}.fdi

%changelog
* Tue Apr 28 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-5
- Added Requires: hal

* Mon Apr 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-4
- Changed udev rule file to hal one provided by Christian Krause

* Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-3
- Code cleanup
- Permission fix
- Added the rules file for udev

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-2
- Path fixes

* Thu Mar 26 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:47:03 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:42:52 -0000	1.2
@@ -0,0 +1 @@
+razertool_0.0.7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:47:03 -0000	1.1
+++ sources	30 Apr 2009 06:42:52 -0000	1.2
@@ -0,0 +1 @@
+dad8236b2fface39f054a7ca6d1a448c  razertool_0.0.7.orig.tar.gz



From cassmodiah at fedoraproject.org  Thu Apr 30 06:43:41 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 30 Apr 2009 06:43:41 +0000 (UTC)
Subject: rpms/tucan/devel import.log, NONE, 1.1 tucan-0.3.7-makefile.patch, 
	NONE, 1.1 tucan.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090430064341.79B4270133@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/tucan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4474/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tucan-0.3.7-makefile.patch tucan.spec 
Log Message:



--- NEW FILE import.log ---
tucan-0_3_7-0_1_alpha_fc11:HEAD:tucan-0.3.7-0.1.alpha.fc11.src.rpm:1241073575

tucan-0.3.7-makefile.patch:

--- NEW FILE tucan-0.3.7-makefile.patch ---
diff -Naur tucan-0.3.7.orig/Makefile tucan-0.3.7/Makefile
--- tucan-0.3.7.orig/Makefile	2009-04-18 22:41:13.000000000 +0200
+++ tucan-0.3.7/Makefile	2009-04-29 15:34:53.000000000 +0200
@@ -22,7 +22,7 @@
  
 DESTDIR		=	/usr/local
 BINDIR		=	$(DESTDIR)/bin/
-MAINDIR		=	$(DESTDIR)/share/tucan/
+MAINDIR		=	$(DESTDIR)/share/tucan-0.3.7/
 ICONDIR		=	$(DESTDIR)/share/pixmaps/
 MANDIR		=	$(DESTDIR)/share/man/man1/
 DESKTOPDIR	=	$(DESTDIR)/share/applications/
@@ -42,24 +42,24 @@
 	install -m 644 *.py $(MAINDIR)
 	chmod 755 $(MAINDIR)$(EXECFILE)
  
-	cp -R $(PLUGINDIR) $(MAINDIR)$(PLUGINDIR)
-	cp -R $(I18NDIR) $(MAINDIR)$(I18NDIR)
-	cp -R $(MEDIADIR) $(MAINDIR)$(MEDIADIR)
+	cp -p -R $(PLUGINDIR) $(MAINDIR)$(PLUGINDIR)
+	#cp -R $(I18NDIR) $(MAINDIR)$(I18NDIR)
+	cp -p -R $(MEDIADIR) $(MAINDIR)$(MEDIADIR)
  
-	install -m 644 $(MEDIADIR)$(ICONFILE) $(ICONDIR)
+	install -pm0644 $(MEDIADIR)$(ICONFILE) $(ICONDIR)
  
-	install -m 644 $(MANPAGE) $(MANDIR)
+	install -pm0644 $(MANPAGE) $(MANDIR)
  
-	install -m 644 $(DESKTOPFILE) $(DESKTOPDIR)
+	#install -m 644 $(DESKTOPFILE) $(DESKTOPDIR)
  
 install:
 	make basic-install
  
-	ln -sf $(MAINDIR)$(EXECFILE) $(BINDIR)$(NAME)
+	#ln -sf $(MAINDIR)$(EXECFILE) $(BINDIR)$(NAME)
  
 uninstall:
 	rm -rf $(MAINDIR)
 	rm -f $(BINDIR)$(NAME)
 	rm -f $(ICONDIR)$(ICONFILE)
 	rm -f $(MANDIR)$(MANPAGE)
-	rm -f $(DESKTOPDIR)$(DESKTOPFILE)
\ No newline at end of file
+	rm -f $(DESKTOPDIR)$(DESKTOPFILE)


--- NEW FILE tucan.spec ---
%global langs de en es it pl pt sk

Name:           tucan
Version:        0.3.7
Release:        0.1.alpha%{?dist}
Summary:        Manager for downloads and uploads at hosting sites

Group:          Applications/Internet
License:        GPLv2+
URL:            http://cusl3-tucan.forja.rediris.es
Source0:        http://forja.rediris.es/frs/download.php/1290/%{name}-%{version}.tar.gz
Patch0:         %{name}-0.3.7-makefile.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       pygtk2
Requires:       python-imaging
Requires:       tesseract
Requires:       librsvg2


%description
Tucan is a graphical manager to upload and download from the most famous 
file hosting sites (e.g. rapidshare, megaupload).


%prep
%setup -q

%patch0 -p1

for f in ./README.es ./docs/FAQ.es ./docs/service-HOWTO.es
do
  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
  touch -c -r $f $f.utf8
  mv $f.utf8 $f
done

sed -i 's|PATH_LOCALES = os.path.join(PATH, "i18n")|PATH_LOCALES = os.path.join(PATH, "%{_datadir}/locale")|g' \
       cons.py


%build
for l in %{langs}
do
  rm -rf i18n/$l/LC_MESSAGES/%{name}.mo
  msgfmt i18n/$l/$l.po -o i18n/$l/LC_MESSAGES/%{name}.mo
done


%install
rm -rf %{buildroot}

make install \
     DESTDIR="%{buildroot}/%{_prefix}" \

cat > %{buildroot}/%{_bindir}/%{name} << EOF
#!/bin/bash
%{_datadir}/%{name}-%{version}/%{name}.py
EOF

chmod +x %{buildroot}/%{_bindir}/%{name}

for l in %{langs}
do
  mkdir -p %{buildroot}/%{_datadir}/locale/$l/LC_MESSAGES/
  install -Dpm0644 i18n/$l/LC_MESSAGES/%{name}.mo \
           %{buildroot}/%{_datadir}/locale/$l/LC_MESSAGES/
done

desktop-file-install \
       --dir=%{buildroot}/%{_datadir}/applications/ \
       %{name}.desktop

chmod +x %{buildroot}/%{_datadir}/%{name}-%{version}/default_plugins/megaupload/megaupload_captcha.py

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README README.es TODO docs/*
%{_bindir}/%{name}
%{_datadir}/%{name}-%{version}/
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/applications/%{name}.*


%changelog
* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.7-0.1.alpha
- New upstream release

* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.6-0.2.alpha
- Correct python_sitelib definition
- honor timestamp of install in the Makefile via patch
- add python as BR
- Correct the binfile

* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.6-0.1.alpha
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:43:45 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:43:11 -0000	1.2
@@ -0,0 +1 @@
+tucan-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:43:45 -0000	1.1
+++ sources	30 Apr 2009 06:43:11 -0000	1.2
@@ -0,0 +1 @@
+df779bbf13ff6e7563f84870bd6a7696  tucan-0.3.7.tar.gz



From cassmodiah at fedoraproject.org  Thu Apr 30 06:47:52 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 30 Apr 2009 06:47:52 +0000 (UTC)
Subject: rpms/tucan/F-11 import.log, NONE, 1.1 tucan-0.3.7-makefile.patch,
	NONE, 
	1.1 tucan.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430064752.7E2ED70133@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/tucan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5602/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tucan-0.3.7-makefile.patch tucan.spec 
Log Message:



--- NEW FILE import.log ---
tucan-0_3_7-0_1_alpha_fc11:F-11:tucan-0.3.7-0.1.alpha.fc11.src.rpm:1241073860

tucan-0.3.7-makefile.patch:

--- NEW FILE tucan-0.3.7-makefile.patch ---
diff -Naur tucan-0.3.7.orig/Makefile tucan-0.3.7/Makefile
--- tucan-0.3.7.orig/Makefile	2009-04-18 22:41:13.000000000 +0200
+++ tucan-0.3.7/Makefile	2009-04-29 15:34:53.000000000 +0200
@@ -22,7 +22,7 @@
  
 DESTDIR		=	/usr/local
 BINDIR		=	$(DESTDIR)/bin/
-MAINDIR		=	$(DESTDIR)/share/tucan/
+MAINDIR		=	$(DESTDIR)/share/tucan-0.3.7/
 ICONDIR		=	$(DESTDIR)/share/pixmaps/
 MANDIR		=	$(DESTDIR)/share/man/man1/
 DESKTOPDIR	=	$(DESTDIR)/share/applications/
@@ -42,24 +42,24 @@
 	install -m 644 *.py $(MAINDIR)
 	chmod 755 $(MAINDIR)$(EXECFILE)
  
-	cp -R $(PLUGINDIR) $(MAINDIR)$(PLUGINDIR)
-	cp -R $(I18NDIR) $(MAINDIR)$(I18NDIR)
-	cp -R $(MEDIADIR) $(MAINDIR)$(MEDIADIR)
+	cp -p -R $(PLUGINDIR) $(MAINDIR)$(PLUGINDIR)
+	#cp -R $(I18NDIR) $(MAINDIR)$(I18NDIR)
+	cp -p -R $(MEDIADIR) $(MAINDIR)$(MEDIADIR)
  
-	install -m 644 $(MEDIADIR)$(ICONFILE) $(ICONDIR)
+	install -pm0644 $(MEDIADIR)$(ICONFILE) $(ICONDIR)
  
-	install -m 644 $(MANPAGE) $(MANDIR)
+	install -pm0644 $(MANPAGE) $(MANDIR)
  
-	install -m 644 $(DESKTOPFILE) $(DESKTOPDIR)
+	#install -m 644 $(DESKTOPFILE) $(DESKTOPDIR)
  
 install:
 	make basic-install
  
-	ln -sf $(MAINDIR)$(EXECFILE) $(BINDIR)$(NAME)
+	#ln -sf $(MAINDIR)$(EXECFILE) $(BINDIR)$(NAME)
  
 uninstall:
 	rm -rf $(MAINDIR)
 	rm -f $(BINDIR)$(NAME)
 	rm -f $(ICONDIR)$(ICONFILE)
 	rm -f $(MANDIR)$(MANPAGE)
-	rm -f $(DESKTOPDIR)$(DESKTOPFILE)
\ No newline at end of file
+	rm -f $(DESKTOPDIR)$(DESKTOPFILE)


--- NEW FILE tucan.spec ---
%global langs de en es it pl pt sk

Name:           tucan
Version:        0.3.7
Release:        0.1.alpha%{?dist}
Summary:        Manager for downloads and uploads at hosting sites

Group:          Applications/Internet
License:        GPLv2+
URL:            http://cusl3-tucan.forja.rediris.es
Source0:        http://forja.rediris.es/frs/download.php/1290/%{name}-%{version}.tar.gz
Patch0:         %{name}-0.3.7-makefile.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       pygtk2
Requires:       python-imaging
Requires:       tesseract
Requires:       librsvg2


%description
Tucan is a graphical manager to upload and download from the most famous 
file hosting sites (e.g. rapidshare, megaupload).


%prep
%setup -q

%patch0 -p1

for f in ./README.es ./docs/FAQ.es ./docs/service-HOWTO.es
do
  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
  touch -c -r $f $f.utf8
  mv $f.utf8 $f
done

sed -i 's|PATH_LOCALES = os.path.join(PATH, "i18n")|PATH_LOCALES = os.path.join(PATH, "%{_datadir}/locale")|g' \
       cons.py


%build
for l in %{langs}
do
  rm -rf i18n/$l/LC_MESSAGES/%{name}.mo
  msgfmt i18n/$l/$l.po -o i18n/$l/LC_MESSAGES/%{name}.mo
done


%install
rm -rf %{buildroot}

make install \
     DESTDIR="%{buildroot}/%{_prefix}" \

cat > %{buildroot}/%{_bindir}/%{name} << EOF
#!/bin/bash
%{_datadir}/%{name}-%{version}/%{name}.py
EOF

chmod +x %{buildroot}/%{_bindir}/%{name}

for l in %{langs}
do
  mkdir -p %{buildroot}/%{_datadir}/locale/$l/LC_MESSAGES/
  install -Dpm0644 i18n/$l/LC_MESSAGES/%{name}.mo \
           %{buildroot}/%{_datadir}/locale/$l/LC_MESSAGES/
done

desktop-file-install \
       --dir=%{buildroot}/%{_datadir}/applications/ \
       %{name}.desktop

chmod +x %{buildroot}/%{_datadir}/%{name}-%{version}/default_plugins/megaupload/megaupload_captcha.py

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README README.es TODO docs/*
%{_bindir}/%{name}
%{_datadir}/%{name}-%{version}/
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/applications/%{name}.*


%changelog
* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.7-0.1.alpha
- New upstream release

* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.6-0.2.alpha
- Correct python_sitelib definition
- honor timestamp of install in the Makefile via patch
- add python as BR
- Correct the binfile

* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.6-0.1.alpha
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucan/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:43:45 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:47:21 -0000	1.2
@@ -0,0 +1 @@
+tucan-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucan/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:43:45 -0000	1.1
+++ sources	30 Apr 2009 06:47:21 -0000	1.2
@@ -0,0 +1 @@
+df779bbf13ff6e7563f84870bd6a7696  tucan-0.3.7.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 06:49:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 06:49:26 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/devel globus-gsi-cert-utils.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430064926.ADBE870133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6281/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-cert-utils.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-gsi-cert-utils.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version:	5.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Cert Utils Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-progs >= 1
Requires:	globus-common-setup >= 2

%package devel
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Cert Utils Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Globus GSI Cert Utils Library Programs

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Cert Utils Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Cert Utils Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.4
- Add s390x to the list of 64 bit platforms
- Update to upstream update release 5.5
- Drop the environment elimination patch (accepted upstream)

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-cert-utils-5_5-1_fc9:HEAD:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241073933


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:38:42 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:48:56 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_cert_utils-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:38:42 -0000	1.1
+++ sources	30 Apr 2009 06:48:56 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz



From cassmodiah at fedoraproject.org  Thu Apr 30 06:50:00 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 30 Apr 2009 06:50:00 +0000 (UTC)
Subject: rpms/tucan/F-10 import.log, NONE, 1.1 tucan-0.3.7-makefile.patch,
	NONE, 
	1.1 tucan.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065000.3315F70133@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/tucan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6396/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tucan-0.3.7-makefile.patch tucan.spec 
Log Message:



--- NEW FILE import.log ---
tucan-0_3_7-0_1_alpha_fc11:F-10:tucan-0.3.7-0.1.alpha.fc11.src.rpm:1241074110

tucan-0.3.7-makefile.patch:

--- NEW FILE tucan-0.3.7-makefile.patch ---
diff -Naur tucan-0.3.7.orig/Makefile tucan-0.3.7/Makefile
--- tucan-0.3.7.orig/Makefile	2009-04-18 22:41:13.000000000 +0200
+++ tucan-0.3.7/Makefile	2009-04-29 15:34:53.000000000 +0200
@@ -22,7 +22,7 @@
  
 DESTDIR		=	/usr/local
 BINDIR		=	$(DESTDIR)/bin/
-MAINDIR		=	$(DESTDIR)/share/tucan/
+MAINDIR		=	$(DESTDIR)/share/tucan-0.3.7/
 ICONDIR		=	$(DESTDIR)/share/pixmaps/
 MANDIR		=	$(DESTDIR)/share/man/man1/
 DESKTOPDIR	=	$(DESTDIR)/share/applications/
@@ -42,24 +42,24 @@
 	install -m 644 *.py $(MAINDIR)
 	chmod 755 $(MAINDIR)$(EXECFILE)
  
-	cp -R $(PLUGINDIR) $(MAINDIR)$(PLUGINDIR)
-	cp -R $(I18NDIR) $(MAINDIR)$(I18NDIR)
-	cp -R $(MEDIADIR) $(MAINDIR)$(MEDIADIR)
+	cp -p -R $(PLUGINDIR) $(MAINDIR)$(PLUGINDIR)
+	#cp -R $(I18NDIR) $(MAINDIR)$(I18NDIR)
+	cp -p -R $(MEDIADIR) $(MAINDIR)$(MEDIADIR)
  
-	install -m 644 $(MEDIADIR)$(ICONFILE) $(ICONDIR)
+	install -pm0644 $(MEDIADIR)$(ICONFILE) $(ICONDIR)
  
-	install -m 644 $(MANPAGE) $(MANDIR)
+	install -pm0644 $(MANPAGE) $(MANDIR)
  
-	install -m 644 $(DESKTOPFILE) $(DESKTOPDIR)
+	#install -m 644 $(DESKTOPFILE) $(DESKTOPDIR)
  
 install:
 	make basic-install
  
-	ln -sf $(MAINDIR)$(EXECFILE) $(BINDIR)$(NAME)
+	#ln -sf $(MAINDIR)$(EXECFILE) $(BINDIR)$(NAME)
  
 uninstall:
 	rm -rf $(MAINDIR)
 	rm -f $(BINDIR)$(NAME)
 	rm -f $(ICONDIR)$(ICONFILE)
 	rm -f $(MANDIR)$(MANPAGE)
-	rm -f $(DESKTOPDIR)$(DESKTOPFILE)
\ No newline at end of file
+	rm -f $(DESKTOPDIR)$(DESKTOPFILE)


--- NEW FILE tucan.spec ---
%global langs de en es it pl pt sk

Name:           tucan
Version:        0.3.7
Release:        0.1.alpha%{?dist}
Summary:        Manager for downloads and uploads at hosting sites

Group:          Applications/Internet
License:        GPLv2+
URL:            http://cusl3-tucan.forja.rediris.es
Source0:        http://forja.rediris.es/frs/download.php/1290/%{name}-%{version}.tar.gz
Patch0:         %{name}-0.3.7-makefile.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       pygtk2
Requires:       python-imaging
Requires:       tesseract
Requires:       librsvg2


%description
Tucan is a graphical manager to upload and download from the most famous 
file hosting sites (e.g. rapidshare, megaupload).


%prep
%setup -q

%patch0 -p1

for f in ./README.es ./docs/FAQ.es ./docs/service-HOWTO.es
do
  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
  touch -c -r $f $f.utf8
  mv $f.utf8 $f
done

sed -i 's|PATH_LOCALES = os.path.join(PATH, "i18n")|PATH_LOCALES = os.path.join(PATH, "%{_datadir}/locale")|g' \
       cons.py


%build
for l in %{langs}
do
  rm -rf i18n/$l/LC_MESSAGES/%{name}.mo
  msgfmt i18n/$l/$l.po -o i18n/$l/LC_MESSAGES/%{name}.mo
done


%install
rm -rf %{buildroot}

make install \
     DESTDIR="%{buildroot}/%{_prefix}" \

cat > %{buildroot}/%{_bindir}/%{name} << EOF
#!/bin/bash
%{_datadir}/%{name}-%{version}/%{name}.py
EOF

chmod +x %{buildroot}/%{_bindir}/%{name}

for l in %{langs}
do
  mkdir -p %{buildroot}/%{_datadir}/locale/$l/LC_MESSAGES/
  install -Dpm0644 i18n/$l/LC_MESSAGES/%{name}.mo \
           %{buildroot}/%{_datadir}/locale/$l/LC_MESSAGES/
done

desktop-file-install \
       --dir=%{buildroot}/%{_datadir}/applications/ \
       %{name}.desktop

chmod +x %{buildroot}/%{_datadir}/%{name}-%{version}/default_plugins/megaupload/megaupload_captcha.py

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README README.es TODO docs/*
%{_bindir}/%{name}
%{_datadir}/%{name}-%{version}/
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/applications/%{name}.*


%changelog
* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.7-0.1.alpha
- New upstream release

* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.6-0.2.alpha
- Correct python_sitelib definition
- honor timestamp of install in the Makefile via patch
- add python as BR
- Correct the binfile

* Thu Mar 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.6-0.1.alpha
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucan/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:43:45 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:49:29 -0000	1.2
@@ -0,0 +1 @@
+tucan-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucan/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:43:45 -0000	1.1
+++ sources	30 Apr 2009 06:49:29 -0000	1.2
@@ -0,0 +1 @@
+df779bbf13ff6e7563f84870bd6a7696  tucan-0.3.7.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 06:51:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 06:51:15 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/F-9 globus-gsi-cert-utils.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065115.63C2970133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6862/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-cert-utils.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-gsi-cert-utils.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version:	5.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Cert Utils Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-progs >= 1
Requires:	globus-common-setup >= 2

%package devel
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Cert Utils Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Globus GSI Cert Utils Library Programs

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Cert Utils Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Cert Utils Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.4
- Add s390x to the list of 64 bit platforms
- Update to upstream update release 5.5
- Drop the environment elimination patch (accepted upstream)

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-cert-utils-5_5-1_fc9:F-9:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241074210


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:38:42 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:50:44 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_cert_utils-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:38:42 -0000	1.1
+++ sources	30 Apr 2009 06:50:45 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 06:52:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 06:52:53 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/F-10 globus-gsi-cert-utils.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065253.F274A70133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7389/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-cert-utils.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-gsi-cert-utils.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version:	5.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Cert Utils Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-progs >= 1
Requires:	globus-common-setup >= 2

%package devel
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Cert Utils Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Globus GSI Cert Utils Library Programs

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Cert Utils Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Cert Utils Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.4
- Add s390x to the list of 64 bit platforms
- Update to upstream update release 5.5
- Drop the environment elimination patch (accepted upstream)

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-cert-utils-5_5-1_fc9:F-10:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241074313


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:38:42 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:52:23 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_cert_utils-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:38:42 -0000	1.1
+++ sources	30 Apr 2009 06:52:23 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz



From whot at fedoraproject.org  Thu Apr 30 06:53:01 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 30 Apr 2009 06:53:01 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-11 .cvsignore, 1.31, 1.32 sources, 1.31, 
	1.32 xorg-x11-drv-evdev.spec, 1.50,
	1.51 evdev-2.2.1-X_NONE.patch, 1.1,
	NONE evdev-2.2.1-prealloc-timer.patch, 1.1,
	NONE evdev-2.2.1-read-deadlock.patch, 1.1, NONE
Message-ID: <20090430065301.B49A770133@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7456

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Removed Files:
	evdev-2.2.1-X_NONE.patch evdev-2.2.1-prealloc-timer.patch 
	evdev-2.2.1-read-deadlock.patch 
Log Message:
* Thu Apr 30 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.2-1
- evdev 2.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	24 Mar 2009 05:22:55 -0000	1.31
+++ .cvsignore	30 Apr 2009 06:52:31 -0000	1.32
@@ -1 +1 @@
-xf86-input-evdev-2.2.1.tar.bz2
+xf86-input-evdev-2.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	24 Mar 2009 05:22:55 -0000	1.31
+++ sources	30 Apr 2009 06:52:31 -0000	1.32
@@ -1 +1 @@
-ed0ec2f11a2fc94355d083a03e2f9844  xf86-input-evdev-2.2.1.tar.bz2
+23341f098e7fe8ec13ef06ef784ac51a  xf86-input-evdev-2.2.2.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/xorg-x11-drv-evdev.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-evdev.spec	16 Apr 2009 04:02:52 -0000	1.50
+++ xorg-x11-drv-evdev.spec	30 Apr 2009 06:52:31 -0000	1.51
@@ -6,8 +6,8 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.1
-Release:    3%{?dist}
+Version:    2.2.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,10 +17,6 @@ Source0:   ftp://ftp.x.org/pub/individua
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 #Source1:    make-git-snapshot.sh
 
-Patch1:     evdev-2.2.1-read-deadlock.patch
-Patch2:     evdev-2.2.1-prealloc-timer.patch
-Patch3:     evdev-2.2.1-X_NONE.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -38,9 +34,6 @@ X.Org X11 evdev input driver.
 %setup -q -n %{tarball}-%{version}
 
 # apply patches
-%patch1 -p1 -b .read-deadlock
-%patch2 -p1 -b .prealloc_timer
-%patch3 -p1 -b ._X_NONE
 
 %build
 autoreconf -v --install || exit 1
@@ -79,6 +72,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Thu Apr 30 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.2-1
+- evdev 2.2.2
+
 * Thu Apr 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-3
 - evdev-2.2.1-prealloc-timer.patch: prealloc the reopen timer to avoid mallocs
   during sigio handling.


--- evdev-2.2.1-X_NONE.patch DELETED ---


--- evdev-2.2.1-prealloc-timer.patch DELETED ---


--- evdev-2.2.1-read-deadlock.patch DELETED ---



From th0br0 at fedoraproject.org  Thu Apr 30 06:54:05 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Thu, 30 Apr 2009 06:54:05 +0000 (UTC)
Subject: rpms/razertool/devel 15-razertool.fdi, NONE, 1.1 import.log, NONE, 
	1.1 razertool.desktop, NONE, 1.1 razertool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065405.C6AD870133@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/razertool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7618/devel

Modified Files:
	.cvsignore sources 
Added Files:
	15-razertool.fdi import.log razertool.desktop razertool.spec 
Log Message:
Initial CVS import for devel



--- NEW FILE 15-razertool.fdi ---
<?xml version="1.0" encoding="UTF-8"?>

<deviceinfo version="0.2">
  <device>

   <match key="info.bus" string="usb_device">
      <match key="usb_device.vendor_id" int="0x1532">
      	<match key="usb_device.product_id" int="0x0101">
		<append key="info.capabilities" type="strlist">access_control</append>
		<merge key="access_control.file" type="copy_property">linux.device_file</merge>
		<merge key="access_control.type" type="string">mouse</merge>
	</match>

      	<match key="usb_device.product_id" int="0x0009">
		<append key="info.capabilities" type="strlist">access_control</append>
		<merge key="access_control.file" type="copy_property">linux.device_file</merge>
		<merge key="access_control.type" type="string">mouse</merge>
	</match>
      </match>
    </match>

  </device>
</deviceinfo>



--- NEW FILE import.log ---
razertool-0_0_7-5_fc10:HEAD:razertool-0.0.7-5.fc10.src.rpm:1241074339


--- NEW FILE razertool.desktop ---
[Desktop Entry]
Name=Razertool
Comment=Unofficial Tool for controlling Razer Copperhead mice
GenericName=Unofficial Tool for controlling Razer Copperhead mice
Type=Application
Exec=razertool-gtk
Icon=/usr/share/razertool/pixmaps/razertool-icon.png
Encoding=UTF-8
Terminal=false
Categories=System;Settings;HardwareSettings;GTK;


--- NEW FILE razertool.spec ---
Name:           razertool
Version:        0.0.7
Release:        5%{?dist}
Summary:        Tool for controlling Razer Copperhead(TM) mice
                                                                                
Group:          User Interface/X Hardware Support
License:        GPLv2+
URL:            http://razertool.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
Source1:        %{name}.desktop
Source2:        15-%{name}.fdi
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel 
BuildRequires:  librsvg2-devel
BuildRequires:  cairo-devel
BuildRequires:  libusb-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       hal

%description
RazerTool is an unofficial tool for controlling Razer Copperhead mice in
Linux. It has both command-line and gtk+-2.x versions. 

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/

make install \
     INSTALL="install -p" \
     DESTDIR=%{buildroot}
desktop-file-install \
     --dir=%{buildroot}/%{_datadir}/applications \
     %{SOURCE1}
install -m644 %{SOURCE2} \
     %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor

%find_lang %{name}-gtk

%clean
rm -rf %{buildroot}

%files -f %{name}-gtk.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}*
%{_bindir}/razerflash
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}*
%{_mandir}/man1/%{name}.*
%{_datadir}/hal/fdi/policy/10osvendor/15-%{name}.fdi

%changelog
* Tue Apr 28 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-5
- Added Requires: hal

* Mon Apr 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-4
- Changed udev rule file to hal one provided by Christian Krause

* Thu Apr 16 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-3
- Code cleanup
- Permission fix
- Added the rules file for udev

* Wed Apr 15 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-2
- Path fixes

* Thu Mar 26 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:47:03 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:53:35 -0000	1.2
@@ -0,0 +1 @@
+razertool_0.0.7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:47:03 -0000	1.1
+++ sources	30 Apr 2009 06:53:35 -0000	1.2
@@ -0,0 +1 @@
+dad8236b2fface39f054a7ca6d1a448c  razertool_0.0.7.orig.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 06:54:36 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 06:54:36 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/F-11 globus-gsi-cert-utils.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065436.1C9BF70133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7984/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-cert-utils.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-gsi-cert-utils.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version:	5.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Cert Utils Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-progs >= 1
Requires:	globus-common-setup >= 2

%package devel
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Cert Utils Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Globus GSI Cert Utils Library Programs

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Cert Utils Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Cert Utils Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.4
- Add s390x to the list of 64 bit platforms
- Update to upstream update release 5.5
- Drop the environment elimination patch (accepted upstream)

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-cert-utils-5_5-1_fc9:F-11:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241074413


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:38:42 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:54:05 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_cert_utils-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:38:42 -0000	1.1
+++ sources	30 Apr 2009 06:54:05 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 06:56:20 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 06:56:20 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/EL-4 globus-gsi-cert-utils.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065620.F3CF570133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8497/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-cert-utils.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-gsi-cert-utils.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version:	5.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Cert Utils Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-progs >= 1
Requires:	globus-common-setup >= 2

%package devel
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Cert Utils Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Globus GSI Cert Utils Library Programs

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Cert Utils Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Cert Utils Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.4
- Add s390x to the list of 64 bit platforms
- Update to upstream update release 5.5
- Drop the environment elimination patch (accepted upstream)

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-cert-utils-5_5-1_fc9:EL-4:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241074521


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:38:42 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:55:50 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_cert_utils-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:38:42 -0000	1.1
+++ sources	30 Apr 2009 06:55:50 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 06:57:58 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 06:57:58 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/EL-5 globus-gsi-cert-utils.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430065758.6096B70133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-cert-utils.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages



--- NEW FILE globus-gsi-cert-utils.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version:	5.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Cert Utils Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package progs
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-progs >= 1
Requires:	globus-common-setup >= 2

%package devel
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Cert Utils Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Cert Utils Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
Globus GSI Cert Utils Library Programs

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Cert Utils Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Cert Utils Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}

%files -f package-progs.filelist progs
%defattr(-,root,root,-)

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-1
- Change defines to globals
- Remove explicit requires on library packages

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-0.4
- Add s390x to the list of 64 bit platforms
- Update to upstream update release 5.5
- Drop the environment elimination patch (accepted upstream)

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-cert-utils-5_5-1_fc9:EL-5:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241074617


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:38:42 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:57:27 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_cert_utils-5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:38:42 -0000	1.1
+++ sources	30 Apr 2009 06:57:27 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:11:48 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:11:48 +0000 (UTC)
Subject: rpms/perl-App-Daemon/F-11 perl-App-Daemon.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071148.3F8F470133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11581/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-App-Daemon.spec 
Log Message:
initial import


--- NEW FILE perl-App-Daemon.spec ---
Name:           perl-App-Daemon
Version:        0.06
Release:        1%{?dist}
Summary:        Start an Application as a Daemon
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/App-Daemon/
Source0:        http://www.cpan.org/authors/id/M/MS/MSCHILLI/App-Daemon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Pid)
BuildRequires:  perl(Log::Log4perl) >= 1.0
BuildRequires:  perl(Proc::ProcessTable)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
App::Daemon helps running an application as a daemon.

%prep
%setup -q -n App-Daemon-%{version}
chmod 644 eg/*
sed -i -e 's!/usr/local!/usr!' eg/*

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README eg
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 0.06-1
- Specfile autogenerated by cpanspec 1.77.
- remove explicit requires
- add eg to docs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:49:22 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:11:17 -0000	1.2
@@ -0,0 +1 @@
+App-Daemon-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:49:22 -0000	1.1
+++ sources	30 Apr 2009 07:11:18 -0000	1.2
@@ -0,0 +1 @@
+475859e3fa7f67c2dfd4d5d8bea1475d  App-Daemon-0.06.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:11:48 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:11:48 +0000 (UTC)
Subject: rpms/perl-App-Daemon/F-10 perl-App-Daemon.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071148.1D0E170133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Daemon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11581/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-App-Daemon.spec 
Log Message:
initial import


--- NEW FILE perl-App-Daemon.spec ---
Name:           perl-App-Daemon
Version:        0.06
Release:        1%{?dist}
Summary:        Start an Application as a Daemon
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/App-Daemon/
Source0:        http://www.cpan.org/authors/id/M/MS/MSCHILLI/App-Daemon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Pid)
BuildRequires:  perl(Log::Log4perl) >= 1.0
BuildRequires:  perl(Proc::ProcessTable)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
App::Daemon helps running an application as a daemon.

%prep
%setup -q -n App-Daemon-%{version}
chmod 644 eg/*
sed -i -e 's!/usr/local!/usr!' eg/*

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README eg
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 0.06-1
- Specfile autogenerated by cpanspec 1.77.
- remove explicit requires
- add eg to docs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:49:22 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:11:17 -0000	1.2
@@ -0,0 +1 @@
+App-Daemon-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:49:22 -0000	1.1
+++ sources	30 Apr 2009 07:11:17 -0000	1.2
@@ -0,0 +1 @@
+475859e3fa7f67c2dfd4d5d8bea1475d  App-Daemon-0.06.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:11:48 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:11:48 +0000 (UTC)
Subject: rpms/perl-App-Daemon/devel perl-App-Daemon.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071148.8A1C570133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11581/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-App-Daemon.spec 
Log Message:
initial import


--- NEW FILE perl-App-Daemon.spec ---
Name:           perl-App-Daemon
Version:        0.06
Release:        1%{?dist}
Summary:        Start an Application as a Daemon
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/App-Daemon/
Source0:        http://www.cpan.org/authors/id/M/MS/MSCHILLI/App-Daemon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Pid)
BuildRequires:  perl(Log::Log4perl) >= 1.0
BuildRequires:  perl(Proc::ProcessTable)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
App::Daemon helps running an application as a daemon.

%prep
%setup -q -n App-Daemon-%{version}
chmod 644 eg/*
sed -i -e 's!/usr/local!/usr!' eg/*

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README eg
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Apr 10 2009 Iain Arnell 0.06-1
- Specfile autogenerated by cpanspec 1.77.
- remove explicit requires
- add eg to docs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:49:22 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:11:18 -0000	1.2
@@ -0,0 +1 @@
+App-Daemon-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:49:22 -0000	1.1
+++ sources	30 Apr 2009 07:11:18 -0000	1.2
@@ -0,0 +1 @@
+475859e3fa7f67c2dfd4d5d8bea1475d  App-Daemon-0.06.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 07:13:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 07:13:53 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/devel globus-gsi-sysconfig.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071353.CB7E470133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12050/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-sysconfig.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-sysconfig.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version:	2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI System Config Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/sysconfig/source globus_gsi_sysconfig-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_sysconfig-2.2
#		tar -zcf globus_gsi_sysconfig-2.2.tar.gz globus_gsi_sysconfig-2.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI System Config Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI System Config Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI System Config Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI System Config Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI System Config Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-sysconfig-2_2-1_fc9:HEAD:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241075525


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:39:36 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:13:23 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_sysconfig-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:39:36 -0000	1.1
+++ sources	30 Apr 2009 07:13:23 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+07ef38c3e0c1ec9716963bfa458bf120  globus_gsi_sysconfig-2.2.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:14:44 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:14:44 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/F-10 perl-Perl-Tags.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071444.A4ED770133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Perl-Tags/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12537/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Perl-Tags.spec 
Log Message:
initial import


--- NEW FILE perl-Perl-Tags.spec ---
Name:           perl-Perl-Tags
Version:        0.26
Release:        1%{?dist}
Summary:        Generate Ctags style tags for Perl sourcecode
License:        (GPL+ or Artistic) or Vim
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Perl-Tags/
Source0:        http://www.cpan.org/authors/id/O/OS/OSFAMERON/Perl-Tags-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Locate)
BuildRequires:  perl(PPI)
BuildRequires:  perl(Test::More) >= 0.42
BuildRequires:  perl(Test::Pod)
BuildRequires:  vim-enhanced
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Generate (possibly exuberant) Ctags style tags for Perl sourcecode.

Recursively follows use and require statements, up to a maximum of max_level.

The implemented tagger, Perl::Tags::Naive is a more-or-less straight ripoff,
slightly updated, of the original pltags code, and is rather naive. It should
be possible to subclass using something like PPI or Text::Balanced, though be
aware that this is alpha software and the internals are subject to change.

%prep
%setup -q -n Perl-Tags-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell 0.26-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:03:28 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:14:14 -0000	1.2
@@ -0,0 +1 @@
+Perl-Tags-0.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:03:28 -0000	1.1
+++ sources	30 Apr 2009 07:14:14 -0000	1.2
@@ -0,0 +1 @@
+7ce83250ffa83ca25c40c9aaa9adc9b2  Perl-Tags-0.26.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:14:45 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:14:45 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/F-11 perl-Perl-Tags.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071445.1E2BA70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Perl-Tags/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12537/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Perl-Tags.spec 
Log Message:
initial import


--- NEW FILE perl-Perl-Tags.spec ---
Name:           perl-Perl-Tags
Version:        0.26
Release:        1%{?dist}
Summary:        Generate Ctags style tags for Perl sourcecode
License:        (GPL+ or Artistic) or Vim
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Perl-Tags/
Source0:        http://www.cpan.org/authors/id/O/OS/OSFAMERON/Perl-Tags-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Locate)
BuildRequires:  perl(PPI)
BuildRequires:  perl(Test::More) >= 0.42
BuildRequires:  perl(Test::Pod)
BuildRequires:  vim-enhanced
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Generate (possibly exuberant) Ctags style tags for Perl sourcecode.

Recursively follows use and require statements, up to a maximum of max_level.

The implemented tagger, Perl::Tags::Naive is a more-or-less straight ripoff,
slightly updated, of the original pltags code, and is rather naive. It should
be possible to subclass using something like PPI or Text::Balanced, though be
aware that this is alpha software and the internals are subject to change.

%prep
%setup -q -n Perl-Tags-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell 0.26-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:03:28 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:14:14 -0000	1.2
@@ -0,0 +1 @@
+Perl-Tags-0.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:03:28 -0000	1.1
+++ sources	30 Apr 2009 07:14:14 -0000	1.2
@@ -0,0 +1 @@
+7ce83250ffa83ca25c40c9aaa9adc9b2  Perl-Tags-0.26.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:14:45 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:14:45 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/devel perl-Perl-Tags.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071445.6D38B70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Perl-Tags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12537/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Perl-Tags.spec 
Log Message:
initial import


--- NEW FILE perl-Perl-Tags.spec ---
Name:           perl-Perl-Tags
Version:        0.26
Release:        1%{?dist}
Summary:        Generate Ctags style tags for Perl sourcecode
License:        (GPL+ or Artistic) or Vim
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Perl-Tags/
Source0:        http://www.cpan.org/authors/id/O/OS/OSFAMERON/Perl-Tags-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Locate)
BuildRequires:  perl(PPI)
BuildRequires:  perl(Test::More) >= 0.42
BuildRequires:  perl(Test::Pod)
BuildRequires:  vim-enhanced
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Generate (possibly exuberant) Ctags style tags for Perl sourcecode.

Recursively follows use and require statements, up to a maximum of max_level.

The implemented tagger, Perl::Tags::Naive is a more-or-less straight ripoff,
slightly updated, of the original pltags code, and is rather naive. It should
be possible to subclass using something like PPI or Text::Balanced, though be
aware that this is alpha software and the internals are subject to change.

%prep
%setup -q -n Perl-Tags-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell 0.26-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:03:28 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:14:15 -0000	1.2
@@ -0,0 +1 @@
+Perl-Tags-0.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:03:28 -0000	1.1
+++ sources	30 Apr 2009 07:14:15 -0000	1.2
@@ -0,0 +1 @@
+7ce83250ffa83ca25c40c9aaa9adc9b2  Perl-Tags-0.26.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 07:15:41 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 07:15:41 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/F-9 globus-gsi-sysconfig.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071541.ADA8070133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12979/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-sysconfig.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-sysconfig.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version:	2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI System Config Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/sysconfig/source globus_gsi_sysconfig-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_sysconfig-2.2
#		tar -zcf globus_gsi_sysconfig-2.2.tar.gz globus_gsi_sysconfig-2.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI System Config Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI System Config Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI System Config Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI System Config Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI System Config Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-sysconfig-2_2-1_fc9:F-9:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241075681


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:39:36 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:15:11 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_sysconfig-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:39:36 -0000	1.1
+++ sources	30 Apr 2009 07:15:11 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+07ef38c3e0c1ec9716963bfa458bf120  globus_gsi_sysconfig-2.2.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 07:18:29 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 07:18:29 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/F-10 globus-gsi-sysconfig.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071829.C010070133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13813/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-sysconfig.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-sysconfig.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version:	2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI System Config Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/sysconfig/source globus_gsi_sysconfig-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_sysconfig-2.2
#		tar -zcf globus_gsi_sysconfig-2.2.tar.gz globus_gsi_sysconfig-2.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI System Config Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI System Config Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI System Config Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI System Config Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI System Config Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-sysconfig-2_2-1_fc9:F-10:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241075848


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:39:36 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:17:59 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_sysconfig-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:39:36 -0000	1.1
+++ sources	30 Apr 2009 07:17:59 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+07ef38c3e0c1ec9716963bfa458bf120  globus_gsi_sysconfig-2.2.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:18:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:18:46 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/F-10 perl-App-Nopaste.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071846.202E770133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Nopaste/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13897/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-App-Nopaste.spec 
Log Message:
initial import


--- NEW FILE perl-App-Nopaste.spec ---
Name:           perl-App-Nopaste
Version:        0.10
Release:        1%{?dist}
Summary:        Easy access to any pastebin
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/App-Nopaste/
Source0:        http://www.cpan.org/authors/id/S/SA/SARTAK/App-Nopaste-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Pluggable)
BuildRequires:  perl(Moose)
BuildRequires:  perl(MooseX::Getopt)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(WWW::Mechanize)
# necessary for optional modules
BuildRequires:  perl(Clipboard)
BuildRequires:  perl(Config::INI::Reader)
BuildRequires:  perl(Git)
BuildRequires:  perl(WWW::Pastebin::PastebinCom::Create)
BuildRequires:  perl(WWW::Pastebin::RafbNet::Create)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# autoreq doesn't catch this
Requires:       perl(MooseX::Getopt)
# necessary for optional modules
Requires:       perl(Clipboard)
Requires:       perl(Config::INI::Reader)
Requires:       perl(Git)
Requires:       perl(WWW::Pastebin::PastebinCom::Create)
Requires:       perl(WWW::Pastebin::RafbNet::Create)

%description
Pastebins (also known as nopaste sites) let you post text, usually code,
for public viewing. They're used a lot in IRC channels to show code that
would normally be too long to give directly in the channel (hence the
name nopaste).

%prep
%setup -q -n App-Nopaste-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell <iarnell at gmail.com> 0.10-1
- Specfile autogenerated by cpanspec 1.77.
- add requires for optional modules
- add bindir and man1 to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:00:58 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:18:15 -0000	1.2
@@ -0,0 +1 @@
+App-Nopaste-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:00:58 -0000	1.1
+++ sources	30 Apr 2009 07:18:15 -0000	1.2
@@ -0,0 +1 @@
+78d560ad4fb67cb8ceb0d84c4de40ed0  App-Nopaste-0.10.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:18:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:18:46 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/F-11 perl-App-Nopaste.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071846.6AFAC70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Nopaste/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13897/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-App-Nopaste.spec 
Log Message:
initial import


--- NEW FILE perl-App-Nopaste.spec ---
Name:           perl-App-Nopaste
Version:        0.10
Release:        1%{?dist}
Summary:        Easy access to any pastebin
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/App-Nopaste/
Source0:        http://www.cpan.org/authors/id/S/SA/SARTAK/App-Nopaste-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Pluggable)
BuildRequires:  perl(Moose)
BuildRequires:  perl(MooseX::Getopt)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(WWW::Mechanize)
# necessary for optional modules
BuildRequires:  perl(Clipboard)
BuildRequires:  perl(Config::INI::Reader)
BuildRequires:  perl(Git)
BuildRequires:  perl(WWW::Pastebin::PastebinCom::Create)
BuildRequires:  perl(WWW::Pastebin::RafbNet::Create)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# autoreq doesn't catch this
Requires:       perl(MooseX::Getopt)
# necessary for optional modules
Requires:       perl(Clipboard)
Requires:       perl(Config::INI::Reader)
Requires:       perl(Git)
Requires:       perl(WWW::Pastebin::PastebinCom::Create)
Requires:       perl(WWW::Pastebin::RafbNet::Create)

%description
Pastebins (also known as nopaste sites) let you post text, usually code,
for public viewing. They're used a lot in IRC channels to show code that
would normally be too long to give directly in the channel (hence the
name nopaste).

%prep
%setup -q -n App-Nopaste-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell <iarnell at gmail.com> 0.10-1
- Specfile autogenerated by cpanspec 1.77.
- add requires for optional modules
- add bindir and man1 to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:00:58 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:18:16 -0000	1.2
@@ -0,0 +1 @@
+App-Nopaste-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:00:58 -0000	1.1
+++ sources	30 Apr 2009 07:18:16 -0000	1.2
@@ -0,0 +1 @@
+78d560ad4fb67cb8ceb0d84c4de40ed0  App-Nopaste-0.10.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:18:46 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:18:46 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/devel perl-App-Nopaste.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430071846.B625370133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13897/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-App-Nopaste.spec 
Log Message:
initial import


--- NEW FILE perl-App-Nopaste.spec ---
Name:           perl-App-Nopaste
Version:        0.10
Release:        1%{?dist}
Summary:        Easy access to any pastebin
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/App-Nopaste/
Source0:        http://www.cpan.org/authors/id/S/SA/SARTAK/App-Nopaste-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Module::Pluggable)
BuildRequires:  perl(Moose)
BuildRequires:  perl(MooseX::Getopt)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(WWW::Mechanize)
# necessary for optional modules
BuildRequires:  perl(Clipboard)
BuildRequires:  perl(Config::INI::Reader)
BuildRequires:  perl(Git)
BuildRequires:  perl(WWW::Pastebin::PastebinCom::Create)
BuildRequires:  perl(WWW::Pastebin::RafbNet::Create)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# autoreq doesn't catch this
Requires:       perl(MooseX::Getopt)
# necessary for optional modules
Requires:       perl(Clipboard)
Requires:       perl(Config::INI::Reader)
Requires:       perl(Git)
Requires:       perl(WWW::Pastebin::PastebinCom::Create)
Requires:       perl(WWW::Pastebin::RafbNet::Create)

%description
Pastebins (also known as nopaste sites) let you post text, usually code,
for public viewing. They're used a lot in IRC channels to show code that
would normally be too long to give directly in the channel (hence the
name nopaste).

%prep
%setup -q -n App-Nopaste-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Sun Apr 19 2009 Iain Arnell <iarnell at gmail.com> 0.10-1
- Specfile autogenerated by cpanspec 1.77.
- add requires for optional modules
- add bindir and man1 to files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:00:58 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:18:16 -0000	1.2
@@ -0,0 +1 @@
+App-Nopaste-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:00:58 -0000	1.1
+++ sources	30 Apr 2009 07:18:16 -0000	1.2
@@ -0,0 +1 @@
+78d560ad4fb67cb8ceb0d84c4de40ed0  App-Nopaste-0.10.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 07:20:03 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 07:20:03 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/F-11 globus-gsi-sysconfig.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430072003.5AA8670133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14362/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-sysconfig.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-sysconfig.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version:	2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI System Config Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/sysconfig/source globus_gsi_sysconfig-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_sysconfig-2.2
#		tar -zcf globus_gsi_sysconfig-2.2.tar.gz globus_gsi_sysconfig-2.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI System Config Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI System Config Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI System Config Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI System Config Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI System Config Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-sysconfig-2_2-1_fc9:F-11:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241075946


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:39:36 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:19:32 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_sysconfig-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:39:36 -0000	1.1
+++ sources	30 Apr 2009 07:19:33 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+07ef38c3e0c1ec9716963bfa458bf120  globus_gsi_sysconfig-2.2.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 07:21:46 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 07:21:46 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/EL-4 globus-gsi-sysconfig.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430072146.1082770133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14955/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-sysconfig.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-sysconfig.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version:	2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI System Config Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/sysconfig/source globus_gsi_sysconfig-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_sysconfig-2.2
#		tar -zcf globus_gsi_sysconfig-2.2.tar.gz globus_gsi_sysconfig-2.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI System Config Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI System Config Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI System Config Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI System Config Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI System Config Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-sysconfig-2_2-1_fc9:EL-4:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241076045


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:39:36 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:21:15 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_sysconfig-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:39:36 -0000	1.1
+++ sources	30 Apr 2009 07:21:15 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+07ef38c3e0c1ec9716963bfa458bf120  globus_gsi_sysconfig-2.2.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:22:55 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:22:55 +0000 (UTC)
Subject: rpms/perl-Module-Used/F-10 perl-Module-Used.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430072255.EEACA70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Module-Used/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15263/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Used.spec 
Log Message:
initial import


--- NEW FILE perl-Module-Used.spec ---
Name:           perl-Module-Used
Version:        1.2.0
Release:        1%{?dist}
Summary:        Find modules loaded by Perl code without running it
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Used/
Source0:        http://www.cpan.org/authors/id/E/EL/ELLIOTJS/Module-Used-v%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::Next) >= 1.02
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(PPI::Document) >= 1.203
BuildRequires:  perl(Readonly) >= 1.03
BuildRequires:  perl(Test::Deep) >= 0.098
BuildRequires:  perl(Test::More) >= 0.72
BuildRequires:  perl(version) >= 0.74
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Modules are found statically based upon use and require statements. If use
of the base or parent is found, both that module and the referenced ones
will be returned. If Moose or Moose::Role are found, this will look for
extends and with sugar will be looked for; presently, this will miss
modules listed in parentheses.

%prep
%setup -q -n Module-Used-v%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell 1.2.0-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:04:14 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:22:25 -0000	1.2
@@ -0,0 +1 @@
+Module-Used-v1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:04:14 -0000	1.1
+++ sources	30 Apr 2009 07:22:25 -0000	1.2
@@ -0,0 +1 @@
+ba3421bb8f990f1729b8e2ad7fa233dc  Module-Used-v1.2.0.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:22:56 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:22:56 +0000 (UTC)
Subject: rpms/perl-Module-Used/F-11 perl-Module-Used.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430072256.5AFCC70133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Module-Used/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15263/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Used.spec 
Log Message:
initial import


--- NEW FILE perl-Module-Used.spec ---
Name:           perl-Module-Used
Version:        1.2.0
Release:        1%{?dist}
Summary:        Find modules loaded by Perl code without running it
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Used/
Source0:        http://www.cpan.org/authors/id/E/EL/ELLIOTJS/Module-Used-v%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::Next) >= 1.02
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(PPI::Document) >= 1.203
BuildRequires:  perl(Readonly) >= 1.03
BuildRequires:  perl(Test::Deep) >= 0.098
BuildRequires:  perl(Test::More) >= 0.72
BuildRequires:  perl(version) >= 0.74
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Modules are found statically based upon use and require statements. If use
of the base or parent is found, both that module and the referenced ones
will be returned. If Moose or Moose::Role are found, this will look for
extends and with sugar will be looked for; presently, this will miss
modules listed in parentheses.

%prep
%setup -q -n Module-Used-v%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell 1.2.0-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:04:14 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:22:26 -0000	1.2
@@ -0,0 +1 @@
+Module-Used-v1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:04:14 -0000	1.1
+++ sources	30 Apr 2009 07:22:26 -0000	1.2
@@ -0,0 +1 @@
+ba3421bb8f990f1729b8e2ad7fa233dc  Module-Used-v1.2.0.tar.gz



From iarnell at fedoraproject.org  Thu Apr 30 07:22:56 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Thu, 30 Apr 2009 07:22:56 +0000 (UTC)
Subject: rpms/perl-Module-Used/devel perl-Module-Used.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430072256.B147270133@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Module-Used/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Used.spec 
Log Message:
initial import


--- NEW FILE perl-Module-Used.spec ---
Name:           perl-Module-Used
Version:        1.2.0
Release:        1%{?dist}
Summary:        Find modules loaded by Perl code without running it
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Used/
Source0:        http://www.cpan.org/authors/id/E/EL/ELLIOTJS/Module-Used-v%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::Next) >= 1.02
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(PPI::Document) >= 1.203
BuildRequires:  perl(Readonly) >= 1.03
BuildRequires:  perl(Test::Deep) >= 0.098
BuildRequires:  perl(Test::More) >= 0.72
BuildRequires:  perl(version) >= 0.74
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Modules are found statically based upon use and require statements. If use
of the base or parent is found, both that module and the referenced ones
will be returned. If Moose or Moose::Role are found, this will look for
extends and with sugar will be looked for; presently, this will miss
modules listed in parentheses.

%prep
%setup -q -n Module-Used-v%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Apr 29 2009 Iain Arnell 1.2.0-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 05:04:14 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:22:26 -0000	1.2
@@ -0,0 +1 @@
+Module-Used-v1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 05:04:14 -0000	1.1
+++ sources	30 Apr 2009 07:22:26 -0000	1.2
@@ -0,0 +1 @@
+ba3421bb8f990f1729b8e2ad7fa233dc  Module-Used-v1.2.0.tar.gz



From ellert at fedoraproject.org  Thu Apr 30 07:23:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 30 Apr 2009 07:23:23 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/EL-5 globus-gsi-sysconfig.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430072323.B646670133@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15493/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-sysconfig.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball



--- NEW FILE globus-gsi-sysconfig.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version:	2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI System Config Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/sysconfig/source globus_gsi_sysconfig-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_sysconfig-2.2
#		tar -zcf globus_gsi_sysconfig-2.2.tar.gz globus_gsi_sysconfig-2.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI System Config Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI System Config Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI System Config Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI System Config Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI System Config Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package

* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-sysconfig-2_2-1_fc9:EL-5:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241076144


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:39:36 -0000	1.1
+++ .cvsignore	30 Apr 2009 07:22:53 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_sysconfig-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:39:36 -0000	1.1
+++ sources	30 Apr 2009 07:22:53 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+07ef38c3e0c1ec9716963bfa458bf120  globus_gsi_sysconfig-2.2.tar.gz



From airlied at fedoraproject.org  Thu Apr 30 07:32:45 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 30 Apr 2009 07:32:45 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-radeon-kms-fixes.patch, NONE,
	1.1 linux-2.6-drm-r128-ioremap.patch, NONE, 1.1 kernel.spec,
	1.1577, 1.1578
Message-ID: <20090430073245.E0CB270133@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17899

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-kms-fixes.patch linux-2.6-drm-r128-ioremap.patch 
Log Message:
* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-116
- linux-2.6-drm-r128-ioremap.patch: fix r128 DRI fail
- drm-radeon-kms-fixes.patch: hopefully fix AGP corruption


drm-radeon-kms-fixes.patch:

--- NEW FILE drm-radeon-kms-fixes.patch ---
diff --git a/drivers/gpu/drm/drm_ttm.c b/drivers/gpu/drm/drm_ttm.c
index dbc0cb3..ae64a83 100644
--- a/drivers/gpu/drm/drm_ttm.c
+++ b/drivers/gpu/drm/drm_ttm.c
@@ -89,14 +89,21 @@ static struct page *drm_ttm_alloc_page(struct drm_ttm *ttm, int cached)
  * Change caching policy for the linear kernel map
  * for range of pages in a ttm.
  */
-static int drm_ttm_set_caching(struct drm_ttm *ttm, int noncached)
+static int drm_ttm_set_caching(struct drm_ttm *ttm, int noncached, int alloc_cached)
 {
 	int i;
 	struct page **cur_page;
+	int ret;
 
 	if ((ttm->page_flags & DRM_TTM_PAGE_UNCACHED) == noncached)
 		return 0;
 
+	{
+		ret = drm_ttm_populate(ttm, alloc_cached);
+		if (ret != 0)
+			return ret;
+	}
+
 	if (noncached)
 		drm_clflush_pages(ttm->pages, ttm->num_pages);
 
@@ -189,7 +196,7 @@ int drm_ttm_destroy(struct drm_ttm *ttm)
 	if (ttm->pages) {
 		if (ttm->page_flags & DRM_TTM_PAGE_USER) {
 			if (ttm->page_flags & DRM_TTM_PAGE_UNCACHED)
-				drm_ttm_set_caching(ttm, 0);
+				drm_ttm_set_caching(ttm, 0, 0);
 
 			drm_ttm_free_user_pages(ttm);
 		} else
@@ -397,7 +404,7 @@ void drm_ttm_fixup_caching(struct drm_ttm *ttm)
 		struct drm_ttm_backend *be = ttm->be;
 		if (be->func->needs_ub_cache_adjust(be))
 			if (ttm->page_flags & DRM_TTM_PAGE_ALLOC_CACHED)
-				drm_ttm_set_caching(ttm, 0);
+				drm_ttm_set_caching(ttm, 0, 1);
 		ttm->state = ttm_unbound;
 	}
 }
@@ -445,7 +452,7 @@ int drm_ttm_bind(struct drm_ttm *ttm, struct drm_bo_mem_reg *bo_mem)
 	be = ttm->be;
 
 	if ((ttm->state == ttm_unbound || ttm->state == ttm_unpopulated) && !cached)
-		drm_ttm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED);
+		drm_ttm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED, cached);
 	else if ((bo_mem->flags & DRM_BO_FLAG_CACHED_MAPPED) &&
 		   bo_driver->ttm_cache_flush)
 		bo_driver->ttm_cache_flush(ttm);
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index a0b0f5b..cb96470 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -1446,38 +1446,12 @@ static int radeon_gem_do_relocate(struct drm_gem_object *obj, uint32_t read_doma
 static int radeon_gem_relocate(struct drm_radeon_cs_parser *parser,
 			       uint32_t *reloc, uint32_t *offset)
 {
-	struct drm_device *dev = parser->dev;
 	/* relocate the handle */
-	uint32_t read_domains, write_domain;
-	struct drm_gem_object *obj;
-	int ret = 0;
-	struct drm_radeon_gem_object *obj_priv;
-
-	if (parser->reloc_index == -1) {
-		obj = drm_gem_object_lookup(dev, parser->file_priv, reloc[1]);
-		if (!obj)
-			return -EINVAL;
-		obj_priv = obj->driver_private;
-		if (obj_priv->bo->mem.flags & DRM_BO_FLAG_CLEAN)
-			DRM_ERROR("clean on relocate for %d\n", reloc[1]);
-		read_domains = reloc[2];
-		write_domain = reloc[3];
-
-		ret = radeon_gem_do_relocate(obj, read_domains, write_domain, offset);
-
-		mutex_lock(&dev->struct_mutex);
-		drm_gem_object_unreference(obj);
-		mutex_unlock(&dev->struct_mutex);
-
-	} else {
-		uint32_t handle;
-		/* have to lookup handle in other chunk */
-		ret = radeon_gem_find_reloc(parser, reloc[1], &handle, offset);
-	}
-	return ret;
+	uint32_t handle;
+	/* have to lookup handle in other chunk */
+	return radeon_gem_find_reloc(parser, reloc[1], &handle, offset);
 }
 
-
 int radeon_gem_prelocate(struct drm_radeon_cs_parser *parser)
 {
 	struct drm_device *dev = parser->dev;

linux-2.6-drm-r128-ioremap.patch:

--- NEW FILE linux-2.6-drm-r128-ioremap.patch ---
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 32de4ce..077c045 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 
 #if __OS_HAS_AGP
 	if (!dev_priv->is_pci) {
-		drm_core_ioremap(dev_priv->cce_ring, dev);
-		drm_core_ioremap(dev_priv->ring_rptr, dev);
-		drm_core_ioremap(dev->agp_buffer_map, dev);
+		drm_core_ioremap_wc(dev_priv->cce_ring, dev);
+		drm_core_ioremap_wc(dev_priv->ring_rptr, dev);
+		drm_core_ioremap_wc(dev->agp_buffer_map, dev);
 		if (!dev_priv->cce_ring->handle ||
 		    !dev_priv->ring_rptr->handle ||
 		    !dev->agp_buffer_map->handle) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1577
retrieving revision 1.1578
diff -u -p -r1.1577 -r1.1578
--- kernel.spec	28 Apr 2009 21:18:46 -0000	1.1577
+++ kernel.spec	30 Apr 2009 07:32:15 -0000	1.1578
@@ -693,6 +693,8 @@ Patch1822: drm-intel-gen3-fb-hack.patch
 Patch1823: drm-intel-tiled-front.patch
 Patch1824: drm-intel-hdmi-edid-fix.patch
 Patch1825: drm-intel-tiling-transition.patch
+Patch1826: linux-2.6-drm-r128-ioremap.patch
+Patch1827: drm-radeon-kms-fixes.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1361,6 +1363,8 @@ ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-intel-tiled-front.patch
 ApplyPatch drm-intel-hdmi-edid-fix.patch
 ApplyPatch drm-intel-tiling-transition.patch
+ApplyPatch linux-2.6-drm-r128-ioremap.patch
+ApplyPatch drm-radeon-kms-fixes.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1995,6 +1999,10 @@ fi
 # and build.
 
 %changelog
+* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-116
+- linux-2.6-drm-r128-ioremap.patch: fix r128 DRI fail
+- drm-radeon-kms-fixes.patch: hopefully fix AGP corruption
+
 * Tue Apr 28 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-115
 - drm-intel-tiling-transition.patch: Fix transitions to linear mode.
 



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:34 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073534.B477610F899@bastion2.fedora.phx.redhat.com>

erikos has set the watchcommits acl on sugar-browse (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:33 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073533.933B510F893@bastion2.fedora.phx.redhat.com>

erikos has set the watchbugzilla acl on sugar-browse (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:36 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073536.612A310F89B@bastion2.fedora.phx.redhat.com>

erikos has set the commit acl on sugar-browse (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:48 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073548.710A410F886@bastion2.fedora.phx.redhat.com>

erikos has set the watchbugzilla acl on sugar-browse (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:50 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073550.0E69010F89D@bastion2.fedora.phx.redhat.com>

erikos has set the watchcommits acl on sugar-browse (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:58 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073558.7A33B10F893@bastion2.fedora.phx.redhat.com>

erikos has set the watchbugzilla acl on sugar-browse (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:35:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:35:51 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073551.75F8E10F8A0@bastion2.fedora.phx.redhat.com>

erikos has set the commit acl on sugar-browse (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:36:00 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073600.7CE4E10F899@bastion2.fedora.phx.redhat.com>

erikos has set the watchcommits acl on sugar-browse (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:36:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:36:02 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073602.8ED0610F8A4@bastion2.fedora.phx.redhat.com>

erikos has set the commit acl on sugar-browse (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:03 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430073703.8622B10F898@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora 10 is now owned by victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:08 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073708.602DA10F89C@bastion2.fedora.phx.redhat.com>

erikos has set the watchbugzilla acl on sugar-read (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:09 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073709.D1C3410F8A3@bastion2.fedora.phx.redhat.com>

erikos has set the watchcommits acl on sugar-read (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:12 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073712.B832A10F895@bastion2.fedora.phx.redhat.com>

erikos has set the commit acl on sugar-read (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:14 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073714.B9A2510F8A7@bastion2.fedora.phx.redhat.com>

erikos has set the approveacls acl on sugar-read (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:18 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073718.6AA8510F8AB@bastion2.fedora.phx.redhat.com>

erikos has set the watchcommits acl on sugar-read (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:19 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073719.77DE310F8AF@bastion2.fedora.phx.redhat.com>

erikos has set the watchbugzilla acl on sugar-read (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:20 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073720.8212E10F8B3@bastion2.fedora.phx.redhat.com>

erikos has set the commit acl on sugar-read (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:22 +0000
Subject: [pkgdb] sugar-read had acl change status
Message-ID: <20090430073722.3CD8810F89F@bastion2.fedora.phx.redhat.com>

erikos has set the approveacls acl on sugar-read (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:38 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430073738.8B1D310F897@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora 11 is now owned by victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:43 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073743.4B19B10F8BF@bastion2.fedora.phx.redhat.com>

erikos has set the approveacls acl on sugar-browse (Fedora 11) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:50 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073750.0AB0C10F89C@bastion2.fedora.phx.redhat.com>

erikos has set the approveacls acl on sugar-browse (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:37:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:37:54 +0000
Subject: [pkgdb] sugar-browse had acl change status
Message-ID: <20090430073754.ADB1310F8C2@bastion2.fedora.phx.redhat.com>

erikos has set the approveacls acl on sugar-browse (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-browse



From pkgdb at fedoraproject.org  Thu Apr 30 07:39:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:39:03 +0000
Subject: [pkgdb] javahelp2 had acl change status
Message-ID: <20090430073904.4F44910F893@bastion2.fedora.phx.redhat.com>

victorv has set the watchbugzilla acl on javahelp2 (Fedora 10) to Approved for victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:39:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:39:10 +0000
Subject: [pkgdb] javahelp2 had acl change status
Message-ID: <20090430073910.0AE2710F886@bastion2.fedora.phx.redhat.com>

victorv has set the watchcommits acl on javahelp2 (Fedora 10) to Approved for victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:39:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:39:32 +0000
Subject: [pkgdb] javahelp2 had acl change status
Message-ID: <20090430073932.9BF8A10F89A@bastion2.fedora.phx.redhat.com>

victorv has set the commit acl on javahelp2 (Fedora 10) to Approved for victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:39:37 +0000
Subject: [pkgdb] javahelp2 had acl change status
Message-ID: <20090430073937.D82B610F89C@bastion2.fedora.phx.redhat.com>

victorv has set the approveacls acl on javahelp2 (Fedora 10) to Approved for victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From mnowak at fedoraproject.org  Thu Apr 30 07:40:19 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Thu, 30 Apr 2009 07:40:19 +0000 (UTC)
Subject: rpms/libev/devel .cvsignore, 1.6, 1.7 import.log, 1.5,
	1.6 libev.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090430074019.90CBF70133@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20161/devel

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Mar 2009 10:18:04 -0000	1.6
+++ .cvsignore	30 Apr 2009 07:39:48 -0000	1.7
@@ -1 +1 @@
-libev-3.53.tar.gz
+libev-3.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	19 Mar 2009 10:18:05 -0000	1.5
+++ import.log	30 Apr 2009 07:39:49 -0000	1.6
@@ -3,3 +3,4 @@ libev-3_49-1_fc10:HEAD:libev-3.49-1.fc10
 libev-3_51-1_fc10:HEAD:libev-3.51-1.fc10.src.rpm:1230159384
 libev-3_52-1_fc10:HEAD:libev-3.52-1.fc10.src.rpm:1231367575
 libev-3_53-1_fc11:HEAD:libev-3.53-1.fc11.src.rpm:1237457716
+libev-3_6-1_fc11:HEAD:libev-3.6-1.fc11.src.rpm:1241077041


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/libev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libev.spec	19 Mar 2009 10:18:05 -0000	1.6
+++ libev.spec	30 Apr 2009 07:39:49 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		libev
-Version:	3.53
+Version:	3.6
 Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
@@ -10,7 +10,7 @@ Source0:	http://dist.schmorp.de/libev/At
 Source1:	%{name}.pc.in
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake17
+BuildRequires:	automake17
 
 %description
 Libev is modelled (very losely) after libevent and the Event perl
@@ -20,8 +20,8 @@ featureful. And also smaller.
 %package 	devel
 Summary:	High-performance event loop/event model with lots of features
 Group:		System Environment/Libraries
-Requires: 	%{name} = %{version}-%{release}
-Requires: 	pkgconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
 %description 	devel
 Libev is modelled (very losely) after libevent and the Event perl
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Michal Nowak <mnowak at redhat.com> - 3.6-1
+- 3.60
+- fixed few mixed-use-of-spaces-and-tabs warnings in spec file
+
 * Thu Mar 19 2009 Michal Nowak <mnowak at redhat.com> - 3.53-1
 - 3.53
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 Mar 2009 10:18:05 -0000	1.6
+++ sources	30 Apr 2009 07:39:49 -0000	1.7
@@ -1 +1 @@
-d21d59c5085a3656f1ab0890468dd703  libev-3.53.tar.gz
+40901d8d679cae4e42a15f5146bcf6a1  libev-3.6.tar.gz



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:19 +0000
Subject: [pkgdb] javahelp2: victorv has given up watchbugzilla
Message-ID: <20090430074020.37B3510F897@bastion2.fedora.phx.redhat.com>

victorv has given up the watchbugzilla acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:25 +0000
Subject: [pkgdb] javahelp2: victorv has given up watchcommits
Message-ID: <20090430074025.3599E10F896@bastion2.fedora.phx.redhat.com>

victorv has given up the watchcommits acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:28 +0000
Subject: [pkgdb] javahelp2: victorv has given up commit
Message-ID: <20090430074028.C422310F89B@bastion2.fedora.phx.redhat.com>

victorv has given up the commit acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:31 +0000
Subject: [pkgdb] javahelp2: victorv has given up approveacls
Message-ID: <20090430074031.DD07310F89C@bastion2.fedora.phx.redhat.com>

victorv has given up the approveacls acl on javahelp2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:38 +0000
Subject: [pkgdb] javahelp2: victorv has given up watchbugzilla
Message-ID: <20090430074038.4317510F893@bastion2.fedora.phx.redhat.com>

victorv has given up the watchbugzilla acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:40 +0000
Subject: [pkgdb] javahelp2: victorv has given up watchcommits
Message-ID: <20090430074040.AD59710F89D@bastion2.fedora.phx.redhat.com>

victorv has given up the watchcommits acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:43 +0000
Subject: [pkgdb] javahelp2: victorv has given up commit
Message-ID: <20090430074043.3B9B710F89E@bastion2.fedora.phx.redhat.com>

victorv has given up the commit acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From pkgdb at fedoraproject.org  Thu Apr 30 07:40:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 07:40:46 +0000
Subject: [pkgdb] javahelp2: victorv has given up approveacls
Message-ID: <20090430074046.227B410F8A0@bastion2.fedora.phx.redhat.com>

victorv has given up the approveacls acl on javahelp2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From kdudka at fedoraproject.org  Thu Apr 30 07:57:39 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu, 30 Apr 2009 07:57:39 +0000 (UTC)
Subject: rpms/elinks/F-11 elinks-nss-inc.patch, NONE, 1.1 elinks.conf, NONE, 
	1.1 elinks-nss.patch, 1.4, 1.5 elinks.spec, 1.69, 1.70
Message-ID: <20090430075739.69EF770133@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23617

Modified Files:
	elinks-nss.patch elinks.spec 
Added Files:
	elinks-nss-inc.patch elinks.conf 
Log Message:
backport from elinks-0.12-0.15.pre3.fc12 (#495532)

elinks-nss-inc.patch:

--- NEW FILE elinks-nss-inc.patch ---
diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.c elinks-0.12pre3/src/network/ssl/ssl.c
--- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-29 12:48:26.250878000 +0200
+++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-29 13:03:51.318746893 +0200
@@ -48,10 +48,20 @@ SSL_CTX *context = NULL;
 static void
 init_openssl(struct module *module)
 {
+	unsigned char *ca_file;
 	SSLeay_add_ssl_algorithms();
 	context = SSL_CTX_new(SSLv23_client_method());
 	SSL_CTX_set_options(context, SSL_OP_ALL);
+#ifdef CONFIG_NSS_COMPAT_OSSL
+	ca_file = get_opt_str("connection.ssl.trusted_ca_file");
+	if (*ca_file)
+		SSL_CTX_load_verify_locations(context, ca_file, NULL);
+	else
+		SSL_CTX_set_default_verify_paths(context);
+#else
+	(void) ca_file;
 	SSL_CTX_set_default_verify_paths(context);
+#endif
 }
 
 static void
@@ -61,10 +71,30 @@ done_openssl(struct module *module)
 }
 
 static struct option_info openssl_options[] = {
+#ifdef CONFIG_NSS_COMPAT_OSSL
+	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
+		"cert_verify", 0, 0,
+		N_("Verify the peer's SSL certificate.")),
+
+	INIT_OPT_STRING("connection.ssl", N_("Trusted CA file"),
+		"trusted_ca_file", 0, "/etc/pki/tls/certs/ca-bundle.crt",
+		N_("The location of a file containing certificates of "
+		"trusted certification authorities in PEM format. "
+		"ELinks then trusts certificates issued by these CAs.\n"
+		"\n"
+		"If you set this option to an empty string, default NSS root"
+		"certificates are loaded.\n"
+		"\n"
+		"If you change this option or the file, you must "
+		"restart ELinks for the changes to take effect. "
+		"This option affects GnuTLS and nss_compat_ossl but not "
+		"OpenSSL.")),
+#else
 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
 		"cert_verify", 0, 0,
 		N_("Verify the peer's SSL certificate. Note that this "
 		"needs extensive configuration of OpenSSL by the user.")),
+#endif
 
 	INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
         	"client_cert", OPT_SORT,
@@ -187,7 +217,8 @@ static struct option_info gnutls_options
 		"\n"
 		"If you change this option or the file, you must "
 		"restart ELinks for the changes to take effect. "
-		"This option affects GnuTLS but not OpenSSL.")),
+		"This option affects GnuTLS and nss_compat_ossl but not "
+		"OpenSSL.")),
 
 	NULL_OPTION_INFO,
 };


--- NEW FILE elinks.conf ---
## ELinks 0.12pre3 configuration file

## This is ELinks global configuration file. You can keep global ELinks
## configuration here. Each user can also save its own ELinks configuration
## to ~/.elinks/elinks.conf. The per user configuration file can be edited
## by ELinks when you save options through UI.

## connection
#  Connection options.

  ## connection.ssl
  #  SSL options.

    ## connection.ssl.cert_verify [0|1]
    #  Verify the peer's SSL certificate.
    set connection.ssl.cert_verify = 1

    ## connection.ssl.trusted_ca_file <str>
    #  The location of a file containing certificates of trusted certification
    #  authorities in PEM format. ELinks then trusts certificates issued by
    #  these CAs.
    #
    #  If you set this option to an empty string, default NSS root certificates
    #  are loaded.
    #
    #  If you change this option or the file, you must restart ELinks for the
    #  changes to take effect. This option affects GnuTLS and nss_compat_ossl
    #  but not OpenSSL.
    set connection.ssl.trusted_ca_file = "/etc/pki/tls/certs/ca-bundle.crt"

elinks-nss.patch:

Index: elinks-nss.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-11/elinks-nss.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- elinks-nss.patch	14 Apr 2009 11:59:45 -0000	1.4
+++ elinks-nss.patch	30 Apr 2009 07:57:08 -0000	1.5
@@ -1,6 +1,6 @@
 diff -ruNp elinks-0.12pre3.orig/configure.in elinks-0.12pre3/configure.in
---- elinks-0.12pre3.orig/configure.in	2009-04-14 13:46:26.749379000 +0200
-+++ elinks-0.12pre3/configure.in	2009-04-14 13:47:13.702846713 +0200
+--- elinks-0.12pre3.orig/configure.in	2009-04-28 12:19:38.816628000 +0200
++++ elinks-0.12pre3/configure.in	2009-04-28 12:56:07.343999815 +0200
 @@ -1014,6 +1014,7 @@ gnutls_withval="$withval"
  
  if test "$enable_gnutls" = yes; then
@@ -62,7 +62,7 @@ diff -ruNp elinks-0.12pre3.orig/configur
  
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/socket.c elinks-0.12pre3/src/network/ssl/socket.c
 --- elinks-0.12pre3.orig/src/network/ssl/socket.c	2009-03-29 00:14:03.000000000 +0100
-+++ elinks-0.12pre3/src/network/ssl/socket.c	2009-04-14 13:47:13.704846733 +0200
++++ elinks-0.12pre3/src/network/ssl/socket.c	2009-04-28 13:01:02.116180177 +0200
 @@ -6,6 +6,10 @@
  
  #ifdef CONFIG_OPENSSL
@@ -153,8 +153,8 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  #elif defined(CONFIG_GNUTLS)
  		int err = rd;
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.c elinks-0.12pre3/src/network/ssl/ssl.c
---- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-14 13:46:26.739379000 +0200
-+++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-14 13:52:15.813854125 +0200
+--- elinks-0.12pre3.orig/src/network/ssl/ssl.c	2009-04-28 12:19:38.782627000 +0200
++++ elinks-0.12pre3/src/network/ssl/ssl.c	2009-04-28 12:59:09.000000000 +0200
 @@ -7,6 +7,10 @@
  #ifdef CONFIG_OPENSSL
  #include <openssl/ssl.h>
@@ -175,42 +175,24 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  #ifndef PATH_MAX
  #define	PATH_MAX	256 /* according to my /usr/include/bits/posix1_lim.h */
-@@ -57,10 +61,18 @@ done_openssl(struct module *module)
- }
- 
- static struct option_info openssl_options[] = {
-+#ifdef CONFIG_NSS_COMPAT_OSSL
-+	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
-+		"cert_verify", 0, 0,
-+		N_("Verify the peer's SSL certificate. The NSS database "
-+		"location can be changed by SSL_DIR environment variable. "
-+		"The database can be also shared with Mozilla browsers.")),
-+#else
- 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
- 		"cert_verify", 0, 0,
- 		N_("Verify the peer's SSL certificate. Note that this "
- 		"needs extensive configuration of OpenSSL by the user.")),
-+#endif
- 
- 	INIT_OPT_TREE("connection.ssl", N_("Client Certificates"),
-         	"client_cert", OPT_SORT,
-@@ -71,12 +83,27 @@ static struct option_info openssl_option
+@@ -71,12 +75,28 @@ static struct option_info openssl_option
  		N_("Enable or not the sending of X509 client certificates "
  		"to servers which request them.")),
  
 +#ifdef CONFIG_NSS_COMPAT_OSSL
 +	INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate nickname"),
 +		"nickname", 0, "",
-+		 N_("The nickname of the client certificate stored in NSS "
-+		    "database. If this value is unset, the nickname from "
-+		    "the X509_CLIENT_CERT variable is used instead. If you "
-+		    "have a PKCS#12 file containing client certificate, you "
-+		    "can import it into your NSS database with: "
-+		    "$ pk12util -i mycert.p12 -d /path/to/database "
-+		    " "
-+		    "The NSS database location can be changed by SSL_DIR "
-+		    "environment variable. The database can be also shared "
-+		    "with Mozilla browsers.")),
++		N_("The nickname of the client certificate stored in NSS "
++		"database. If this value is unset, the nickname from "
++		"the X509_CLIENT_CERT variable is used instead. If you "
++		"have a PKCS#12 file containing client certificate, you "
++		"can import it into your NSS database with:\n"
++		"\n"
++		"$ pk12util -i mycert.p12 -d /path/to/database\n"
++		"\n"
++		"The NSS database location can be changed by SSL_DIR "
++		"environment variable. The database can be also shared "
++		"with Mozilla browsers.")),
 +#else
  	INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate File"),
  		"file", 0, "",
@@ -222,7 +204,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  	NULL_OPTION_INFO,
  };
-@@ -182,7 +209,7 @@ static struct module gnutls_module = str
+@@ -182,7 +202,7 @@ static struct module gnutls_module = str
  	/* done: */		done_gnutls
  );
  
@@ -231,7 +213,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  
  static struct option_info ssl_options[] = {
  	INIT_OPT_TREE("connection", N_("SSL"),
-@@ -193,7 +220,7 @@ static struct option_info ssl_options[] 
+@@ -193,7 +213,7 @@ static struct option_info ssl_options[] 
  };
  
  static struct module *ssl_modules[] = {
@@ -240,7 +222,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	&openssl_module,
  #elif defined(CONFIG_GNUTLS)
  	&gnutls_module,
-@@ -214,7 +241,7 @@ struct module ssl_module = struct_module
+@@ -214,7 +234,7 @@ struct module ssl_module = struct_module
  int
  init_ssl_connection(struct socket *socket)
  {
@@ -249,7 +231,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	socket->ssl = SSL_new(context);
  	if (!socket->ssl) return S_SSL_ERROR;
  #elif defined(CONFIG_GNUTLS)
-@@ -263,7 +290,7 @@ done_ssl_connection(struct socket *socke
+@@ -263,7 +283,7 @@ done_ssl_connection(struct socket *socke
  	ssl_t *ssl = socket->ssl;
  
  	if (!ssl) return;
@@ -258,7 +240,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  	SSL_free(ssl);
  #elif defined(CONFIG_GNUTLS)
  	gnutls_deinit(*ssl);
-@@ -280,7 +307,7 @@ get_ssl_connection_cipher(struct socket 
+@@ -280,7 +300,7 @@ get_ssl_connection_cipher(struct socket 
  
  	if (!init_string(&str)) return NULL;
  
@@ -269,7 +251,7 @@ diff -ruNp elinks-0.12pre3.orig/src/netw
  		SSL_get_cipher_version(ssl),
 diff -ruNp elinks-0.12pre3.orig/src/network/ssl/ssl.h elinks-0.12pre3/src/network/ssl/ssl.h
 --- elinks-0.12pre3.orig/src/network/ssl/ssl.h	2009-03-29 00:14:03.000000000 +0100
-+++ elinks-0.12pre3/src/network/ssl/ssl.h	2009-04-14 13:47:13.706846753 +0200
++++ elinks-0.12pre3/src/network/ssl/ssl.h	2009-04-28 12:56:59.000000000 +0200
 @@ -22,7 +22,7 @@ unsigned char *get_ssl_connection_cipher
  
  /* Internal type used in ssl module. */


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-11/elinks.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- elinks.spec	14 Apr 2009 16:53:45 -0000	1.69
+++ elinks.spec	30 Apr 2009 07:57:09 -0000	1.70
@@ -1,11 +1,12 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.12.pre3%{?dist}
+Release:   0.13.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
 Source:    http://elinks.or.cz/download/elinks-%{version}pre3.tar.bz2
+Source2:   elinks.conf
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
@@ -35,6 +36,7 @@ Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.3-macropen.patch
 Patch8: elinks-scroll.patch
 Patch9: elinks-nss.patch
+Patch10: elinks-nss-inc.patch
 
 %description
 Elinks is a text-based Web browser. Elinks does not display any images,
@@ -62,8 +64,10 @@ quickly and swiftly displays Web pages.
 %patch7 -p1
 #upstream fix for out of screen dialogs
 %patch8 -p1
-# Port elinks to use NSS library for cryptography (#346861)
+# Port elinks to use NSS library for cryptography (#346861) - accepted upstream
 %patch9 -p1
+# Port elinks to use NSS library for cryptography (#346861) - incremental patch
+%patch10 -p1
 
 %build
 ./autogen.sh
@@ -77,6 +81,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/elinks.conf
 touch $RPM_BUILD_ROOT%{_bindir}/links
 touch $RPM_BUILD_ROOT%{_mandir}/man1/links.1.gz
 %find_lang elinks
@@ -110,15 +116,22 @@ exit 0
 rm -rf $RPM_BUILD_ROOT
 
 %files -f elinks.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README SITES TODO COPYING
 %ghost %verify(not md5 size mtime) %{_bindir}/links
 %{_bindir}/elinks
 %ghost %verify(not md5 size mtime) %{_mandir}/man1/links.1.gz
+%config(noreplace) %{_sysconfdir}/elinks.conf
 %{_mandir}/man1/elinks.1*
 %{_mandir}/man5/*
 
 %changelog
+* Thu Apr 30 2009 Kamil Dudka <kdudka at redhat.com> 0.12-0.13.pre3
+- use appropriate BuildRequires for nss_compat_ossl
+- support for trusted CA certificates loading from file in PEM format
+- enable certificate verification by default via configuration
+  file(#495532)
+
 * Fri Apr 03 2009 Ondrej Vasik <ovasik at redhat.com> 0.12.0.12.pre3
 - use word Elinks instead of Links in package description
 



From airlied at fedoraproject.org  Thu Apr 30 08:16:29 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 30 Apr 2009 08:16:29 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-radeon-kms-fixes.patch, 1.1, 1.2 kernel.spec, 
	1.1578, 1.1579
Message-ID: <20090430081629.58FE970133@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27832

Modified Files:
	drm-radeon-kms-fixes.patch kernel.spec 
Log Message:
* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-117
- drm-radeon-kms-fixes.patch: add r300 clip regs


drm-radeon-kms-fixes.patch:

Index: drm-radeon-kms-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-radeon-kms-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-radeon-kms-fixes.patch	30 Apr 2009 07:32:14 -0000	1.1
+++ drm-radeon-kms-fixes.patch	30 Apr 2009 08:16:28 -0000	1.2
@@ -98,3 +98,44 @@ index a0b0f5b..cb96470 100644
  int radeon_gem_prelocate(struct drm_radeon_cs_parser *parser)
  {
  	struct drm_device *dev = parser->dev;
+From 592b92d0a532c7367164546b513d345b1aae1d46 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Fri, 1 May 2009 02:14:07 +1000
+Subject: [PATCH] r300: add other clip regs
+
+---
+ drivers/gpu/drm/radeon/r300_cmdbuf.c |    3 +++
+ drivers/gpu/drm/radeon/radeon_reg.h  |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
+index 694cf6c..5cf47fd 100644
+--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
++++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
+@@ -309,6 +309,9 @@ void r300_init_reg_flags(struct drm_device *dev)
+ 	ADD_RANGE_MARK(R300_SC_SCISSOR0, 2, MARK_CHECK_SCISSOR);
+ 
+ 	ADD_RANGE(R300_SC_CLIP_0_A, 2);
++	ADD_RANGE(R300_SC_CLIP_1_A, 2);
++	ADD_RANGE(R300_SC_CLIP_2_A, 2);
++	ADD_RANGE(R300_SC_CLIP_3_A, 2);
+ 	ADD_RANGE(R300_SC_CLIP_RULE, 1);
+ 	ADD_RANGE(R300_SC_SCREENDOOR, 1);
+ 
+diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
+index 1a5e157..102bdba 100644
+--- a/drivers/gpu/drm/radeon/radeon_reg.h
++++ b/drivers/gpu/drm/radeon/radeon_reg.h
+@@ -4841,6 +4841,9 @@
+ #define R300_SC_CLIP_0_B				0x43b4
+ #       define R300_CLIP_X_SHIFT                        0
+ #       define R300_CLIP_Y_SHIFT                        13
++#define R300_SC_CLIP_1_A				0x43b8
++#define R300_SC_CLIP_2_A				0x43c0
++#define R300_SC_CLIP_3_A				0x43c8
+ #define R300_SC_CLIP_RULE				0x43d0
+ #define R300_SC_SCREENDOOR				0x43e8
+ 
+-- 
+1.6.2.2
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1578
retrieving revision 1.1579
diff -u -p -r1.1578 -r1.1579
--- kernel.spec	30 Apr 2009 07:32:15 -0000	1.1578
+++ kernel.spec	30 Apr 2009 08:16:28 -0000	1.1579
@@ -1999,6 +1999,9 @@ fi
 # and build.
 
 %changelog
+* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-117
+- drm-radeon-kms-fixes.patch: add r300 clip regs
+
 * Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-116
 - linux-2.6-drm-r128-ioremap.patch: fix r128 DRI fail
 - drm-radeon-kms-fixes.patch: hopefully fix AGP corruption



From atkac at fedoraproject.org  Thu Apr 30 08:54:29 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu, 30 Apr 2009 08:54:29 +0000 (UTC)
Subject: rpms/tigervnc/F-11 tigervnc.spec,1.5,1.6
Message-ID: <20090430085429.CBBF270133@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv738

Modified Files:
	tigervnc.spec 
Log Message:
- server package now requires xorg-x11-fonts-misc (#498184)



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tigervnc.spec	27 Apr 2009 13:35:44 -0000	1.5
+++ tigervnc.spec	30 Apr 2009 08:53:57 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.6.%{releasetag}%{?dist}
+Release:	0.7.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -73,6 +73,9 @@ Requires(preun):chkconfig
 Requires(preun):initscripts
 Requires(postun):initscripts
 
+# Check you don't reintroduce #498184 again
+Requires:	xorg-x11-fonts-misc
+
 %description server
 The VNC system allows you to access the same desktop from a wide
 variety of platforms.  This package is a TigerVNC server, allowing
@@ -247,6 +250,9 @@ fi
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Thu Apr 30 2009 Adam Tkac <atkac redhat com> 0.0.90-0.7.20090427svn3789
+- server package now requires xorg-x11-fonts-misc (#498184)
+
 * Mon Apr 27 2009 Adam Tkac <atkac redhat com> 0.0.90-0.6.20090427svn3789
 - update to r3789
   - tigervnc-rh494801.patch merged



From atkac at fedoraproject.org  Thu Apr 30 08:54:56 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu, 30 Apr 2009 08:54:56 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.5,1.6
Message-ID: <20090430085456.1AABD70133@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv850

Modified Files:
	tigervnc.spec 
Log Message:
- server package now requires xorg-x11-fonts-misc (#498184)



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tigervnc.spec	27 Apr 2009 13:33:58 -0000	1.5
+++ tigervnc.spec	30 Apr 2009 08:54:25 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.6.%{releasetag}%{?dist}
+Release:	0.7.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -73,6 +73,9 @@ Requires(preun):chkconfig
 Requires(preun):initscripts
 Requires(postun):initscripts
 
+# Check you don't reintroduce #498184 again
+Requires:	xorg-x11-fonts-misc
+
 %description server
 The VNC system allows you to access the same desktop from a wide
 variety of platforms.  This package is a TigerVNC server, allowing
@@ -247,6 +250,9 @@ fi
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Thu Apr 30 2009 Adam Tkac <atkac redhat com> 0.0.90-0.7.20090427svn3789
+- server package now requires xorg-x11-fonts-misc (#498184)
+
 * Mon Apr 27 2009 Adam Tkac <atkac redhat com> 0.0.90-0.6.20090427svn3789
 - update to r3789
   - tigervnc-rh494801.patch merged



From airlied at fedoraproject.org  Thu Apr 30 09:34:58 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 30 Apr 2009 09:34:58 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-radeon-kms-fixes.patch, 1.2, 1.3 kernel.spec, 
	1.1579, 1.1580
Message-ID: <20090430093458.1EBF770133@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6809

Modified Files:
	drm-radeon-kms-fixes.patch kernel.spec 
Log Message:
* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-118
- drm-radeon-kms-fixes.patch: revert rs480 snoop break


drm-radeon-kms-fixes.patch:

Index: drm-radeon-kms-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-radeon-kms-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-radeon-kms-fixes.patch	30 Apr 2009 08:16:28 -0000	1.2
+++ drm-radeon-kms-fixes.patch	30 Apr 2009 09:34:25 -0000	1.3
@@ -139,3 +139,21 @@ index 1a5e157..102bdba 100644
 -- 
 1.6.2.2
 
+diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
+index b349ebe..ac31d0b 100644
+--- a/drivers/gpu/drm/radeon/radeon_cp.c
++++ b/drivers/gpu/drm/radeon/radeon_cp.c
+@@ -1080,11 +1080,9 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+ 		temp |= (upper_32_bits(dev_priv->gart_info.bus_addr) & 0xff) << 4;
+ 		RADEON_WRITE_MCIND(RS480_GART_BASE, temp);
+ 
+-		/* enable snooping on gart mapped address */
+ 		temp = RADEON_READ_MCIND(dev_priv, RS480_AGP_MODE_CNTL);
+-		temp &= (RS480_REQ_TYPE_SNOOP_DIS);
+-		temp |= (1 << RS480_REQ_TYPE_SNOOP_SHIFT);
+-		RADEON_WRITE_MCIND(RS480_AGP_MODE_CNTL, temp);
++		RADEON_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) |
++							 RS480_REQ_TYPE_SNOOP_DIS));
+ 
+ 		if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) {
+ 			RADEON_WRITE_MCIND(RS690_MC_AGP_BASE,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1579
retrieving revision 1.1580
diff -u -p -r1.1579 -r1.1580
--- kernel.spec	30 Apr 2009 08:16:28 -0000	1.1579
+++ kernel.spec	30 Apr 2009 09:34:25 -0000	1.1580
@@ -1999,6 +1999,9 @@ fi
 # and build.
 
 %changelog
+* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-118
+- drm-radeon-kms-fixes.patch: revert rs480 snoop break
+
 * Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-117
 - drm-radeon-kms-fixes.patch: add r300 clip regs
 



From transif at fedoraproject.org  Thu Apr 30 10:39:06 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 30 Apr 2009 10:39:06 +0000 (UTC)
Subject: comps/po de.po,1.37,1.38
Message-ID: <20090430103906.6B29770133@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23000/po

Modified Files:
	de.po 
Log Message:
Sending translation for German


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.37 -r 1.38 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- de.po	29 Apr 2009 20:00:18 -0000	1.37
+++ de.po	30 Apr 2009 10:38:33 -0000	1.38
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-04-03 09:53+0100\n"
-"Last-Translator: Dominik Sandjaja <dominiksandjaja at fedoraproject.org>\n"
+"POT-Creation-Date: 2009-04-30 08:10+0000\n"
+"PO-Revision-Date: 2009-04-30 12:36+0100\n"
+"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
 "Language-Team: German <i18 at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,199 +29,320 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
+msgstr "Eine schlanke Desktop-Umgebung, die gut auf ??lteren Systemen funktioniert."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungswerkzeuge"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "Unterst??tzung f??r Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "Unterst??tzung f??r Albanisch"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "Anwendungen zum Durchf??hren einer Vielzahl von Aufgaben"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "Unterst??tzung f??r Assamesisch"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
 msgid "Base"
 msgstr "Basis"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
 msgid "Basic support for the Ruby programming language."
 msgstr "Basis-Unterst??tzung f??r die Programmiersprache Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
 msgid "Basque Support"
 msgstr "Unterst??tzung f??r Baskisch (Spanien)"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
 msgid "Belarusian Support"
 msgstr "Unterst??tzung f??r Wei??russisch"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:19
 msgid "Bengali Support"
 msgstr "Unterst??tzung f??r Bengali"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
[...2437 lines suppressed...]
-msgstr "Unterst??tzung f??r Malaiisch"
+msgstr "Unterst??tzung f??r Manx"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1431,52 +1994,36 @@ msgid "Online Help and Documentation"
 msgstr "Online-Hilfe und Dokumentation"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "Unterst??tzung f??r Spanisch"
+msgstr "Unterst??tzung f??r Sanskrit"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "Unterst??tzung f??r Ukrainisch"
+msgstr "Unterst??tzung f??r Sardinisch"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
 msgstr "Sugar-Desktopumgebung"
 
 #: ../comps-f11.xml.in.h:183
-msgid ""
-"Support for cross-compiling programs to 32 bit Windows targets, testing "
-"them, and building installers, all from within Fedora."
-msgstr ""
-"Unterst??tzung f??r Cross-Compiling von Programmen f??r 32-bit-Windows-Ziele, "
-"f??r das Testen und das Bauen, alles in Fedora."
+msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora."
+msgstr "Unterst??tzung f??r Cross-Compiling von Programmen f??r 32-bit-Windows-Ziele, f??r das Testen und das Bauen, alles in Fedora."
 
 #: ../comps-f11.xml.in.h:186
-msgid ""
-"Support for developing software using the Objective CAML programming "
-"language and libraries."
-msgstr ""
-"Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache "
-"Objective CAML und deren Bibliotheken."
+msgid "Support for developing software using the Objective CAML programming language and libraries."
+msgstr "Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache Objective CAML und deren Bibliotheken."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "Unterst??tzung f??r Swati"
+msgstr "Unterst??tzung f??r Swahili"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "Unterst??tzung f??r Telugu"
+msgstr "Unterst??tzung f??r Tetum"
 
 #: ../comps-f11.xml.in.h:223
-msgid ""
-"This group is a collection of tools used in the design, modification, "
-"manipulation, and packaging of fonts."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen, die beim Erstellen, "
-"??ndern, Manipulieren und Paketieren von Schriftarten gebraucht werden."
+msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen, die beim Erstellen, ??ndern, Manipulieren und Paketieren von Schriftarten gebraucht werden."
 
 #: ../comps-f11.xml.in.h:235
 msgid "Turkmen Support"
@@ -1486,84 +2033,67 @@ msgstr "Unterst??tzung f??r Turkmenisch"
 msgid "Upper Sorbian Support"
 msgstr "Unterst??tzung f??r Sorbisch"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Anwendungen f??r eine Vielzahl von Aufgaben"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r DF??-Netzwerk"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, "
-"Desktop, Systemsymbolen und grafischem Dateimanager."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen "
-"und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "GNOME ist eine leistungsstarke grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "KDE ist eine leistungsstarke, grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Dateien. Dazu geh??ren Emacs und Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "Der Text-Editor XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen "
-"und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen und diese in die Formate HTML, PDF, Postscript und Text konvertieren."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene "
-"Zwecke."
-
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"arabische Umgebungen."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"hebr??ische Umgebungen."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"japanische Umgebungen."
+msgstr "Diese Gruppe umfasst eine Sammlung von Netzwerkservern f??r verschiedene Zwecke."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von arabische Umgebungen."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von hebr??ische Umgebungen."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von japanische Umgebungen."
+
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von "
-"tschechischen Umgebungen."
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen und Ressourcen von tschechischen Umgebungen."
+



From pkgdb at fedoraproject.org  Thu Apr 30 10:44:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 10:44:11 +0000
Subject: [pkgdb] javahelp2 ownership updated
Message-ID: <20090430104413.2EB4E10F886@bastion2.fedora.phx.redhat.com>

Package javahelp2 in Fedora devel is now owned by victorv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javahelp2



From cwickert at fedoraproject.org  Thu Apr 30 11:07:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:07:33 +0000 (UTC)
Subject: rpms/lxinput/devel import.log, NONE, 1.1 lxinput.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430110733.B44DA70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxinput/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29345/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lxinput.spec 
Log Message:
Initial import of lxinput. Reviewed at
https://bugzilla.redhat.com/show_bug.cgi?id=498130



--- NEW FILE import.log ---
lxinput-0_1-1_fc11:HEAD:lxinput-0.1-1.fc11.src.rpm:1241089508


--- NEW FILE lxinput.spec ---
Name:           lxinput
Version:        0.1
Release:        1%{?dist}
Summary:        Keyboard and mouse settings dialog for LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel 
BuildRequires:  gettext intltool desktop-file-utils

%description
LXInput is a keyboard and mouse configuration utility for LXDE, the 
Lightweight X11 Desktop Environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-install                                       \
  --delete-original                                        \
  --remove-only-show-in=LXDE                               \
  --add-category=X-LXDE                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
#FIXME: add ChangeLog and NEWS if there is content
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:59:52 -0000	1.1
+++ .cvsignore	30 Apr 2009 11:07:01 -0000	1.2
@@ -0,0 +1 @@
+lxinput-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:59:52 -0000	1.1
+++ sources	30 Apr 2009 11:07:01 -0000	1.2
@@ -0,0 +1 @@
+fdf8243432459a26442d985de573ff4f  lxinput-0.1.tar.gz



From cwickert at fedoraproject.org  Thu Apr 30 11:09:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:09:58 +0000 (UTC)
Subject: rpms/lxinput/devel lxinput.spec,1.1,1.2
Message-ID: <20090430110958.E951A70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxinput/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30016

Modified Files:
	lxinput.spec 
Log Message:
require lxde-settings-daemon


Index: lxinput.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/devel/lxinput.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxinput.spec	30 Apr 2009 11:07:01 -0000	1.1
+++ lxinput.spec	30 Apr 2009 11:09:57 -0000	1.2
@@ -9,8 +9,9 @@ URL:            http://lxde.sourceforge.
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel 
+BuildRequires:  gtk2-devel
 BuildRequires:  gettext intltool desktop-file-utils
+Requires:       lxde-settings-daemon
 
 %description
 LXInput is a keyboard and mouse configuration utility for LXDE, the 



From cwickert at fedoraproject.org  Thu Apr 30 11:11:06 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:11:06 +0000 (UTC)
Subject: rpms/lxde-settings-daemon/devel import.log, NONE,
	1.1 lxde-settings-daemon-0.4-vendor.patch, NONE,
	1.1 lxde-settings-daemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430111106.DFEB670133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30101/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lxde-settings-daemon-0.4-vendor.patch 
	lxde-settings-daemon.spec 
Log Message:
Initial import of lxde-settings-daemon. Reviewed at
https://bugzilla.redhat.com/show_bug.cgi?id=498125



--- NEW FILE import.log ---
lxde-settings-daemon-0_4-2_fc11:HEAD:lxde-settings-daemon-0.4-2.fc11.src.rpm:1241089701

lxde-settings-daemon-0.4-vendor.patch:

--- NEW FILE lxde-settings-daemon-0.4-vendor.patch ---
diff -u lxde-settings-daemon-0.4.orig/config lxde-settings-daemon-0.4/config
--- lxde-settings-daemon-0.4.orig/config	2009-04-28 11:59:01.000000000 +0200
+++ lxde-settings-daemon-0.4/config	2009-04-28 21:29:00.000000000 +0200
@@ -4,8 +4,8 @@
 #iNet/DndDragThreshold
 #iNet/CursorBlink
 #iNet/CursorBlinkTime
-sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/ThemeName=Nodoka
+sNet/IconThemeName=Fedora
 sGtk/FontName=Sans 10
 #iGtk/IconSizes
 #sGtk/KeyThemeName
Gemeinsame Unterverzeichnisse: lxde-settings-daemon-0.4.orig/src und lxde-settings-daemon-0.4/src.


--- NEW FILE lxde-settings-daemon.spec ---
Name:           lxde-settings-daemon
Version:        0.4
Release:        2%{?dist}
Summary:        XSettings Daemon for LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
# Use vendor's artwork
Patch0:         %{name}-%{version}-vendor.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig glib2-devel libX11-devel
Requires:       lxde-common = %{version}
# Use vendor's artwork
Requires:       gtk-nodoka-engine system-icon-theme

%description
This package contains the XSettings daemon for LXDE, the Lightweight X11 
Desktop Environment. It allows XSettings aware applications (all GTK+ 2 
and GNOME 2 applications) to be informed instantly of changes in LXDE 
configuration, such as theme name, default font and so on.


%prep
%setup -q
%patch0 -p1 -b .orig


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT  INSTALL='install -p'


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#FIXME: add ChangeLog and NEWS if there is content
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%dir %{_datadir}/lxde/
%{_datadir}/lxde/config


%changelog
* Wed Apr 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-2
- Require system-icon-theme instead of fedora-icon-theme
- Drop unnecessary obsoletes and provides

* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:58:44 -0000	1.1
+++ .cvsignore	30 Apr 2009 11:10:34 -0000	1.2
@@ -0,0 +1 @@
+lxde-settings-daemon-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:58:44 -0000	1.1
+++ sources	30 Apr 2009 11:10:34 -0000	1.2
@@ -0,0 +1 @@
+4f3f9bd318e13eaeb5b721f84ff67b17  lxde-settings-daemon-0.4.tar.bz2



From cwickert at fedoraproject.org  Thu Apr 30 11:12:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:12:49 +0000 (UTC)
Subject: rpms/lxinput/devel lxinput.spec,1.2,1.3
Message-ID: <20090430111249.1A17E70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxinput/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30650

Modified Files:
	lxinput.spec 
Log Message:
add review URL


Index: lxinput.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/devel/lxinput.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxinput.spec	30 Apr 2009 11:09:57 -0000	1.2
+++ lxinput.spec	30 Apr 2009 11:12:18 -0000	1.3
@@ -1,3 +1,5 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=498130
+
 Name:           lxinput
 Version:        0.1
 Release:        1%{?dist}



From sbose at fedoraproject.org  Thu Apr 30 11:14:40 2009
From: sbose at fedoraproject.org (Sumit Bose)
Date: Thu, 30 Apr 2009 11:14:40 +0000 (UTC)
Subject: rpms/ctdb/devel ctdb-AC_INIT.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 ctdb.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090430111440.9851070133@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31046

Modified Files:
	.cvsignore ctdb.spec sources 
Added Files:
	ctdb-AC_INIT.patch 
Log Message:
updated to upstream version 1.0.79


ctdb-AC_INIT.patch:

--- NEW FILE ctdb-AC_INIT.patch ---
>From 119cad71c010af184424804226ec5e5b75412e54 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Thu, 30 Apr 2009 12:53:09 +0200
Subject: [PATCH] fix handling of AC_INIT

---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7bd2bb..ebddd37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_PREREQ(2.50)
+AC_INIT(ctdb, 1.0.79)
 AC_DEFUN([AC_CHECK_LIB_EXT], [
 	AC_CHECK_LIB([$1],[$3],[$4],[$5],[$7])
 	ac_cv_lib_ext_$1_$3=$ac_cv_lib_$1_$3
@@ -11,7 +12,6 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
 AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(ctdb.h)
 AC_CONFIG_SRCDIR([server/ctdbd.c])
 
 case `uname -m` in
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Mar 2009 08:12:19 -0000	1.3
+++ .cvsignore	30 Apr 2009 11:14:38 -0000	1.4
@@ -1 +1 @@
-ctdb-1.0.73.tar.bz2
+ctdb-1.0.79.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ctdb.spec	5 Mar 2009 08:12:19 -0000	1.4
+++ ctdb.spec	30 Apr 2009 11:14:39 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.73
+Version: 1.0.79
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -16,6 +16,8 @@ Source0: %{name}-%{version}.tar.bz2
 
 # Fedora specific patch, ctdb should not be enabled by default in the runlevels
 Patch1: ctdb-no_default_runlevel.patch
+# sent to samba-technical: http://lists.samba.org/archive/samba-technical/2009-April/064391.html
+Patch2: ctdb-AC_INIT.patch
 
 Requires: chkconfig coreutils psmisc
 Requires: fileutils sed
@@ -51,6 +53,7 @@ and use CTDB instead.
 # setup the init script and sysconfig file
 %setup -T -D -n ctdb-%{version} -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -107,6 +110,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/sysconfig/ctdb
+%config(noreplace) %{_sysconfdir}/ctdb/notify.sh
 %config(noreplace) %{_sysconfdir}/ctdb/functions
 %attr(755,root,root) %{initdir}/ctdb
 
@@ -128,8 +132,51 @@ fi
 %defattr(-,root,root,-)
 %{_includedir}/ctdb.h
 %{_includedir}/ctdb_private.h
+%{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Wed Apr 29 2009 Sumit Bose <sbose at redhat.com> - 1.0.79-1
+ - Update to ctdb version 1.0.79
+
+* Wed Apr 8 2009 : Version 1.0.79
+ - From Mathieu Parent: add a ctdb pkgconfig file
+ - Fix bug 6250
+ - add a funciton remove_ip to safely remove an ip from an interface, taking
+   care to workaround an issue with linux alias interfaces.
+ - Update the natgw eventscript to use the safe remove_ip() function
+ - fix a bug in the eventscript child process that would cause the socket to be
+   removed.
+ - dont verify nodemap on banned nodes during cluster monitoring
+ - Update the dodgy SeqnumInterval to have ms resolution
+
+* Tue Mar 31 2009 : Version 1.0.78
+ - Add a notify mechanism so we can send snmptraps/email to external management
+   systems when the node becomes unhealthy
+ - include 11.natgw eventscript in thew install so that the NATGW feature works
+
+* Tue Mar 31 2009 : Version 1.0.77
+ - Update the 99.routing eventscript to also try to add the routes (back)
+   during a releaseip event. Similar to the reasons why we must add addresses
+   back during releaseip in 10.interfaces
+
+* Wed Mar 24 2009 : Version 1.0.76
+ - Add a debugging command "xpnn" which can print the pnn of the node even when
+   ctdbd is not running.
+ - Redo the NATGW implementation to allow multiple disjoing NATGW groups in the
+   same cluster.
+
+* Tue Mar 24 2009 : Version 1.0.75
+ - Various updates to LVS
+ - Fix a bug in the killtcp control where we did not set the port correctly
+ - add a new "ctdb scriptstatus" command that shows the status of the
+   eventrscripts.
+
+* Mon Mar 16 2009 : Version 1.0.74
+ - Fixes to AIX from C Cowan.
+ - Fixes to ctdb_diagnostics so we collect correct GPFS data
+ - Fixes to the net conf list command in ctdb_diagnostics
+ - Check the static-routes file IFF it exists in ctdb_diagnostics
+
 * Thu Mar 05 2009 Sumit Bose <sbose at redhat.com> - 1.0.73-1
  - Update to ctdb version 1.0.73
 
@@ -138,7 +185,7 @@ fi
  - From Sumit Bose, fix dependencies so make -j works
 
 * Tue Feb 24 2009 Sumit Bose <sbose at redhat.com> - 1.0.72-3
-- fix a make -j dependency problem
+ - fix a make -j dependency problem
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.72-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Mar 2009 08:12:19 -0000	1.3
+++ sources	30 Apr 2009 11:14:39 -0000	1.4
@@ -1 +1 @@
-6965ff03986860c4a49bea985f900226  ctdb-1.0.73.tar.bz2
+a0f89dd417ecc231567ed2f56dcdc688  ctdb-1.0.79.tar.bz2



From cwickert at fedoraproject.org  Thu Apr 30 11:16:54 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:16:54 +0000 (UTC)
Subject: rpms/lxde-settings-daemon/devel lxde-settings-daemon.spec,1.1,1.2
Message-ID: <20090430111654.2AC9070133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31820

Modified Files:
	lxde-settings-daemon.spec 
Log Message:
Add review URL


Index: lxde-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/devel/lxde-settings-daemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-settings-daemon.spec	30 Apr 2009 11:10:34 -0000	1.1
+++ lxde-settings-daemon.spec	30 Apr 2009 11:16:23 -0000	1.2
@@ -1,3 +1,5 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=498125
+
 Name:           lxde-settings-daemon
 Version:        0.4
 Release:        2%{?dist}



From jkratoch at fedoraproject.org  Thu Apr 30 11:18:09 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 30 Apr 2009 11:18:09 +0000 (UTC)
Subject: rpms/libunwind/F-11 .cvsignore, 1.8, 1.9 libunwind.spec, 1.29,
	1.30 sources, 1.8, 1.9
Message-ID: <20090430111809.0190370133@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/libunwind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32003

Modified Files:
	.cvsignore libunwind.spec sources 
Log Message:
* Thu Apr 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.10.20090430betagit4b8404d1
- Fix the ia64 variant of GetIPInfo() (BZ 480412).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Apr 2009 20:44:55 -0000	1.8
+++ .cvsignore	30 Apr 2009 11:17:38 -0000	1.9
@@ -1 +1 @@
-libunwind-20090413betagitb483ea3f.tar.bz2
+libunwind-20090430betagit4b8404d1.tar.bz2


Index: libunwind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/F-11/libunwind.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libunwind.spec	13 Apr 2009 20:44:57 -0000	1.29
+++ libunwind.spec	30 Apr 2009 11:17:38 -0000	1.30
@@ -8,8 +8,8 @@
 Summary: An unwinding library
 Name: libunwind
 Version: 0.99
-%define snapshot 20090413betagitb483ea3f
-Release: 0.9.%{snapshot}%{?dist}
+%define snapshot 20090430betagit4b8404d1
+Release: 0.10.%{snapshot}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: libunwind-%{snapshot}.tar.bz2
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libunwind*.h
 
 %changelog
+* Thu Apr 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.10.20090430betagit4b8404d1
+- Fix the ia64 variant of GetIPInfo() (BZ 480412).
+
 * Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.9.20090413betagitb483ea3f
 - Rebase the package on the upstream variant: http://www.nongnu.org/libunwind/
   - Drop the patch libunwind-snap-070224-frysk20070405cvs.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Apr 2009 20:44:57 -0000	1.8
+++ sources	30 Apr 2009 11:17:38 -0000	1.9
@@ -1 +1 @@
-8df7a5d328f59201a433afcb391c48ed  libunwind-20090413betagitb483ea3f.tar.bz2
+7d20011477a76b9b395c8fb17556c9ab  libunwind-20090430betagit4b8404d1.tar.bz2



From jkratoch at fedoraproject.org  Thu Apr 30 11:26:36 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 30 Apr 2009 11:26:36 +0000 (UTC)
Subject: rpms/libunwind/devel .cvsignore, 1.8, 1.9 libunwind.spec, 1.29,
	1.30 sources, 1.8, 1.9
Message-ID: <20090430112636.4D54B70133@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/libunwind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1985

Modified Files:
	.cvsignore libunwind.spec sources 
Log Message:
* Thu Apr 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.10.20090430betagit4b8404d1
- Fix the ia64 variant of GetIPInfo() (BZ 480412).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Apr 2009 20:44:55 -0000	1.8
+++ .cvsignore	30 Apr 2009 11:26:04 -0000	1.9
@@ -1 +1 @@
-libunwind-20090413betagitb483ea3f.tar.bz2
+libunwind-20090430betagit4b8404d1.tar.bz2


Index: libunwind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libunwind.spec	13 Apr 2009 20:44:57 -0000	1.29
+++ libunwind.spec	30 Apr 2009 11:26:05 -0000	1.30
@@ -8,8 +8,8 @@
 Summary: An unwinding library
 Name: libunwind
 Version: 0.99
-%define snapshot 20090413betagitb483ea3f
-Release: 0.9.%{snapshot}%{?dist}
+%define snapshot 20090430betagit4b8404d1
+Release: 0.10.%{snapshot}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: libunwind-%{snapshot}.tar.bz2
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libunwind*.h
 
 %changelog
+* Thu Apr 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.10.20090430betagit4b8404d1
+- Fix the ia64 variant of GetIPInfo() (BZ 480412).
+
 * Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.9.20090413betagitb483ea3f
 - Rebase the package on the upstream variant: http://www.nongnu.org/libunwind/
   - Drop the patch libunwind-snap-070224-frysk20070405cvs.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Apr 2009 20:44:57 -0000	1.8
+++ sources	30 Apr 2009 11:26:05 -0000	1.9
@@ -1 +1 @@
-8df7a5d328f59201a433afcb391c48ed  libunwind-20090413betagitb483ea3f.tar.bz2
+7d20011477a76b9b395c8fb17556c9ab  libunwind-20090430betagit4b8404d1.tar.bz2



From cwickert at fedoraproject.org  Thu Apr 30 11:26:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:26:59 +0000 (UTC)
Subject: rpms/lxde-settings-daemon/F-10
	lxde-settings-daemon-0.4-vendor.patch, 
	NONE, 1.1 lxde-settings-daemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430112659.CBFF070133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-settings-daemon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2074/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	lxde-settings-daemon-0.4-vendor.patch 
	lxde-settings-daemon.spec 
Log Message:
initial release for this branch

lxde-settings-daemon-0.4-vendor.patch:

--- NEW FILE lxde-settings-daemon-0.4-vendor.patch ---
diff -u lxde-settings-daemon-0.4.orig/config lxde-settings-daemon-0.4/config
--- lxde-settings-daemon-0.4.orig/config	2009-04-28 11:59:01.000000000 +0200
+++ lxde-settings-daemon-0.4/config	2009-04-28 21:29:00.000000000 +0200
@@ -4,8 +4,8 @@
 #iNet/DndDragThreshold
 #iNet/CursorBlink
 #iNet/CursorBlinkTime
-sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/ThemeName=Nodoka
+sNet/IconThemeName=Fedora
 sGtk/FontName=Sans 10
 #iGtk/IconSizes
 #sGtk/KeyThemeName
Gemeinsame Unterverzeichnisse: lxde-settings-daemon-0.4.orig/src und lxde-settings-daemon-0.4/src.


--- NEW FILE lxde-settings-daemon.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=498125

Name:           lxde-settings-daemon
Version:        0.4
Release:        2%{?dist}
Summary:        XSettings Daemon for LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
# Use vendor's artwork
Patch0:         %{name}-%{version}-vendor.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig glib2-devel libX11-devel
Requires:       lxde-common = %{version}
# Use vendor's artwork
Requires:       gtk-nodoka-engine system-icon-theme

%description
This package contains the XSettings daemon for LXDE, the Lightweight X11 
Desktop Environment. It allows XSettings aware applications (all GTK+ 2 
and GNOME 2 applications) to be informed instantly of changes in LXDE 
configuration, such as theme name, default font and so on.


%prep
%setup -q
%patch0 -p1 -b .orig


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT  INSTALL='install -p'


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#FIXME: add ChangeLog and NEWS if there is content
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%dir %{_datadir}/lxde/
%{_datadir}/lxde/config


%changelog
* Wed Apr 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-2
- Require system-icon-theme instead of fedora-icon-theme
- Drop unnecessary obsoletes and provides

* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:58:44 -0000	1.1
+++ .cvsignore	30 Apr 2009 11:26:29 -0000	1.2
@@ -0,0 +1 @@
+lxde-settings-daemon-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:58:44 -0000	1.1
+++ sources	30 Apr 2009 11:26:29 -0000	1.2
@@ -0,0 +1 @@
+4f3f9bd318e13eaeb5b721f84ff67b17  lxde-settings-daemon-0.4.tar.bz2



From cwickert at fedoraproject.org  Thu Apr 30 11:27:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:27:00 +0000 (UTC)
Subject: rpms/lxde-settings-daemon/F-11
	lxde-settings-daemon-0.4-vendor.patch, 
	NONE, 1.1 lxde-settings-daemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430112700.3A80170133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2074/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	lxde-settings-daemon-0.4-vendor.patch 
	lxde-settings-daemon.spec 
Log Message:
initial release for this branch

lxde-settings-daemon-0.4-vendor.patch:

--- NEW FILE lxde-settings-daemon-0.4-vendor.patch ---
diff -u lxde-settings-daemon-0.4.orig/config lxde-settings-daemon-0.4/config
--- lxde-settings-daemon-0.4.orig/config	2009-04-28 11:59:01.000000000 +0200
+++ lxde-settings-daemon-0.4/config	2009-04-28 21:29:00.000000000 +0200
@@ -4,8 +4,8 @@
 #iNet/DndDragThreshold
 #iNet/CursorBlink
 #iNet/CursorBlinkTime
-sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/ThemeName=Nodoka
+sNet/IconThemeName=Fedora
 sGtk/FontName=Sans 10
 #iGtk/IconSizes
 #sGtk/KeyThemeName
Gemeinsame Unterverzeichnisse: lxde-settings-daemon-0.4.orig/src und lxde-settings-daemon-0.4/src.


--- NEW FILE lxde-settings-daemon.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=498125

Name:           lxde-settings-daemon
Version:        0.4
Release:        2%{?dist}
Summary:        XSettings Daemon for LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
# Use vendor's artwork
Patch0:         %{name}-%{version}-vendor.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig glib2-devel libX11-devel
Requires:       lxde-common = %{version}
# Use vendor's artwork
Requires:       gtk-nodoka-engine system-icon-theme

%description
This package contains the XSettings daemon for LXDE, the Lightweight X11 
Desktop Environment. It allows XSettings aware applications (all GTK+ 2 
and GNOME 2 applications) to be informed instantly of changes in LXDE 
configuration, such as theme name, default font and so on.


%prep
%setup -q
%patch0 -p1 -b .orig


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT  INSTALL='install -p'


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#FIXME: add ChangeLog and NEWS if there is content
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%dir %{_datadir}/lxde/
%{_datadir}/lxde/config


%changelog
* Wed Apr 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-2
- Require system-icon-theme instead of fedora-icon-theme
- Drop unnecessary obsoletes and provides

* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:58:44 -0000	1.1
+++ .cvsignore	30 Apr 2009 11:26:29 -0000	1.2
@@ -0,0 +1 @@
+lxde-settings-daemon-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-settings-daemon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:58:44 -0000	1.1
+++ sources	30 Apr 2009 11:26:29 -0000	1.2
@@ -0,0 +1 @@
+4f3f9bd318e13eaeb5b721f84ff67b17  lxde-settings-daemon-0.4.tar.bz2



From cwickert at fedoraproject.org  Thu Apr 30 11:30:13 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:30:13 +0000 (UTC)
Subject: rpms/lxinput/F-10 lxinput.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430113013.D8F8B70133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxinput/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2726/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	lxinput.spec 
Log Message:
initial release for this branch


--- NEW FILE lxinput.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=498130

Name:           lxinput
Version:        0.1
Release:        1%{?dist}
Summary:        Keyboard and mouse settings dialog for LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  gettext intltool desktop-file-utils
Requires:       lxde-settings-daemon

%description
LXInput is a keyboard and mouse configuration utility for LXDE, the 
Lightweight X11 Desktop Environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-install                                       \
  --delete-original                                        \
  --remove-only-show-in=LXDE                               \
  --add-category=X-LXDE                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
#FIXME: add ChangeLog and NEWS if there is content
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:59:52 -0000	1.1
+++ .cvsignore	30 Apr 2009 11:29:43 -0000	1.2
@@ -0,0 +1 @@
+lxinput-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:59:52 -0000	1.1
+++ sources	30 Apr 2009 11:29:43 -0000	1.2
@@ -0,0 +1 @@
+fdf8243432459a26442d985de573ff4f  lxinput-0.1.tar.gz



From cwickert at fedoraproject.org  Thu Apr 30 11:30:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:30:14 +0000 (UTC)
Subject: rpms/lxinput/F-11 lxinput.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430113014.5C45570133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxinput/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2726/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	lxinput.spec 
Log Message:
initial release for this branch


--- NEW FILE lxinput.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=498130

Name:           lxinput
Version:        0.1
Release:        1%{?dist}
Summary:        Keyboard and mouse settings dialog for LXDE

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://lxde.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  gettext intltool desktop-file-utils
Requires:       lxde-settings-daemon

%description
LXInput is a keyboard and mouse configuration utility for LXDE, the 
Lightweight X11 Desktop Environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-install                                       \
  --delete-original                                        \
  --remove-only-show-in=LXDE                               \
  --add-category=X-LXDE                                    \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
#FIXME: add ChangeLog and NEWS if there is content
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop


%changelog
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:59:52 -0000	1.1
+++ .cvsignore	30 Apr 2009 11:29:43 -0000	1.2
@@ -0,0 +1 @@
+lxinput-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:59:52 -0000	1.1
+++ sources	30 Apr 2009 11:29:43 -0000	1.2
@@ -0,0 +1 @@
+fdf8243432459a26442d985de573ff4f  lxinput-0.1.tar.gz



From cwickert at fedoraproject.org  Thu Apr 30 11:34:54 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:34:54 +0000 (UTC)
Subject: rpms/lxde-common/devel lxde-common.spec,1.5,1.6
Message-ID: <20090430113454.EFC3770133@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3492

Modified Files:
	lxde-common.spec 
Log Message:
fix versions for provides,obsoletes and requires


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lxde-common.spec	29 Apr 2009 18:40:56 -0000	1.5
+++ lxde-common.spec	30 Apr 2009 11:34:23 -0000	1.6
@@ -19,8 +19,8 @@ Patch4:         %{name}-0.4-pulseaudio.p
 Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       lxsession lxpanel lxmenu-data pcmanfm openbox xdg-utils 
-Requires:       lxde-settings-daemon >= %{version}
+Requires:       lxsession lxpanel pcmanfm openbox xdg-utils 
+Requires:       lxmenu-data lxde-settings-daemon
 # Use vendor's artwork
 Requires:       system-logos
 %if 0%{?fedora} < 9
@@ -31,7 +31,9 @@ Requires:       desktop-backgrounds-comp
 Requires:       wmctrl
 %endif
 Provides:       %{name}-data = %{version}-%{release}
-Obsoletes:      %{name}-data <= 0.3.2.1-5
+# needed because the lxde-common-data required its main package with full n-v-r
+Provides:       %{name}-data = 0.3.2.1-4
+Obsoletes:      %{name}-data <= 0.3.2.1-4
 BuildArch:      noarch
 
 %description



From vcrhonek at fedoraproject.org  Thu Apr 30 11:39:29 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 30 Apr 2009 11:39:29 +0000 (UTC)
Subject: rpms/tcsh/devel tcsh.spec,1.61,1.62
Message-ID: <20090430113929.9339970133@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4233

Modified Files:
	tcsh.spec 
Log Message:
finish merge review fixes


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- tcsh.spec	28 Apr 2009 15:50:16 -0000	1.61
+++ tcsh.spec	30 Apr 2009 11:38:58 -0000	1.62
@@ -48,8 +48,9 @@ like syntax.
 %patch13 -p1 -b .rs-color
 
 for i in Fixes WishList; do
-    iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
-    mv "${i}_" "$i"
+ iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
+ touch -r "$i" "${i}_" && \
+ mv "${i}_" "$i"
 done
 
 %build
@@ -95,12 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %post
 if [ ! -f /etc/shells ]; then
  echo "%{_bindir}/tcsh" >> /etc/shells
- echo "%{_bindir}/csh"  >> /etc/shells
+ echo "%{_bindir}/csh"	>> /etc/shells
 else
  grep -q '^%{_bindir}/tcsh$' /etc/shells || \
  echo "%{_bindir}/tcsh" >> /etc/shells
  grep -q '^%{_bindir}/csh$'  /etc/shells || \
- echo "%{_bindir}/csh"  >> /etc/shells
+ echo "%{_bindir}/csh"	>> /etc/shells
 fi
 
 %postun
@@ -111,18 +112,18 @@ if [ ! -x %{_bindir}/tcsh ]; then
 fi
 
 %files -f tcsh.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc BUGS FAQ Fixes NewThings WishList complete.tcsh
 %{_bindir}/tcsh
 %{_bindir}/csh
 %{_mandir}/man1/*.1*
 
 %changelog
-* Tue Apr 28 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.16-1
+* Thu Apr 30 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.16-1
 - Update to tcsh-6.16.00
 - Merge Review (fix License, add BUGS and WishList to documentation, convert Fixes and
   WishList to UTF-8, remove root checking from buildroot cleaning, preserve timestamps,
-  use smp_flags, remove unused patches and improve postun script)
+  use smp_flags, remove unused patches, improve postun script and minor fix to %%files)
   Resolves: #226483
 
 * Mon Mar  2 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-8



From hno at fedoraproject.org  Thu Apr 30 11:44:11 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 30 Apr 2009 11:44:11 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.39, 1.40 bzr.spec, 1.57, 1.58 sources, 
	1.39, 1.40
Message-ID: <20090430114411.8C39170133@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5264

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	20 Apr 2009 09:10:17 -0000	1.39
+++ .cvsignore	30 Apr 2009 11:43:40 -0000	1.40
@@ -1 +1 @@
-bzr-1.14rc2.tar.gz
+bzr-1.14.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- bzr.spec	20 Apr 2009 09:10:17 -0000	1.57
+++ bzr.spec	30 Apr 2009 11:43:40 -0000	1.58
@@ -6,8 +6,8 @@
 #   bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %).
 #   release: rpm subrelease (0.N for rc candidates, N for stable releases)
 %define bzrver 1.14
-%define bzrrc rc2
-%define release 0.3
+#define bzrrc rc2
+%define release 1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-1
+- Update to 1.14
+
 * Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.3.rc2
 - Update to 1.14rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	20 Apr 2009 09:10:17 -0000	1.39
+++ sources	30 Apr 2009 11:43:40 -0000	1.40
@@ -1 +1 @@
-184676d8456b20019ec6aea2d72ec12e  bzr-1.14rc2.tar.gz
+1180a563b525e196ac1cb89110d05432  bzr-1.14.tar.gz



From cwickert at fedoraproject.org  Thu Apr 30 11:44:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 30 Apr 2009 11:44:11 +0000 (UTC)
Subject: rpms/lxde-common/F-11 lxde-common.spec,1.4,1.5
Message-ID: <20090430114411.9316F7013B@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5291

Modified Files:
	lxde-common.spec 
Log Message:
fix versions for provides,obsoletes and requires


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxde-common.spec	29 Apr 2009 18:41:55 -0000	1.4
+++ lxde-common.spec	30 Apr 2009 11:43:41 -0000	1.5
@@ -19,8 +19,8 @@ Patch4:         %{name}-0.4-pulseaudio.p
 Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       lxsession lxpanel lxmenu-data pcmanfm openbox xdg-utils 
-Requires:       lxde-settings-daemon >= %{version}
+Requires:       lxsession lxpanel pcmanfm openbox xdg-utils 
+Requires:       lxmenu-data lxde-settings-daemon
 # Use vendor's artwork
 Requires:       system-logos
 %if 0%{?fedora} < 9
@@ -31,7 +31,9 @@ Requires:       desktop-backgrounds-comp
 Requires:       wmctrl
 %endif
 Provides:       %{name}-data = %{version}-%{release}
-Obsoletes:      %{name}-data <= 0.3.2.1-5
+# needed because the lxde-common-data required its main package with full n-v-r
+Provides:       %{name}-data = 0.3.2.1-4
+Obsoletes:      %{name}-data <= 0.3.2.1-4
 BuildArch:      noarch
 
 %description



From dwalsh at fedoraproject.org  Thu Apr 30 11:51:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 30 Apr 2009 11:51:06 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090105.patch, 1.110,
	1.111 selinux-policy.spec, 1.847, 1.848
Message-ID: <20090430115106.6F61D70133@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7145

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
- Additional rules for fprintd and sssd


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- policy-20090105.patch	28 Apr 2009 20:09:25 -0000	1.110
+++ policy-20090105.patch	30 Apr 2009 11:51:03 -0000	1.111
@@ -1833,9 +1833,10 @@ diff -b -B --ignore-all-space --exclude-
 +permissive cpufreqselector_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.6.12/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-30 07:42:25.000000000 -0400
 @@ -1,8 +1,16 @@
- HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
+-HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
++HOME_DIR/\.config(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
  HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:gconf_home_t,s0)
 +HOME_DIR/\.gnome2(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
 +HOME_DIR/\.local.*		gen_context(system_u:object_r:gconf_home_t,s0)
@@ -5234,7 +5235,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-27 11:30:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-29 10:47:24.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5305,7 +5306,7 @@ diff -b -B --ignore-all-space --exclude-
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +172,46 @@
+@@ -153,3 +172,50 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5338,6 +5339,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	ssh_rw_pipes(domain)
++')
++
++optional_policy(`
 +	unconfined_dontaudit_rw_pipes(domain)
 +	unconfined_sigchld(domain)
 +')
@@ -8336,7 +8341,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn(/.*)?		gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.12/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/apache.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/apache.if	2009-04-29 14:18:52.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8558,7 +8563,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		tunable_policy(`httpd_enable_cgi && allow_ypbind',`
  			nis_use_ypbind_uncond(httpd_$1_script_t)
-@@ -227,10 +170,6 @@
+@@ -227,15 +170,13 @@
  
  	optional_policy(`
  		postgresql_unpriv_client(httpd_$1_script_t)
@@ -8569,7 +8574,14 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -504,6 +443,47 @@
+ 		nscd_socket_use(httpd_$1_script_t)
+ 	')
++
++	dontaudit httpd_$1_script_t httpd_t:tcp_socket { read write };
+ ')
+ 
+ ########################################
+@@ -504,6 +445,47 @@
  ########################################
  ## <summary>
  ##	Allow the specified domain to read
@@ -8617,7 +8629,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	apache configuration files.
  ## </summary>
  ## <param name="domain">
-@@ -579,7 +559,7 @@
+@@ -579,7 +561,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -8626,7 +8638,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -715,6 +695,7 @@
+@@ -715,6 +697,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -8634,7 +8646,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -782,6 +763,32 @@
+@@ -782,6 +765,32 @@
  
  ########################################
  ## <summary>
@@ -8667,7 +8679,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute all web scripts in the system
  ##	script domain.
  ## </summary>
-@@ -791,16 +798,18 @@
+@@ -791,16 +800,18 @@
  ##	</summary>
  ## </param>
  #
@@ -8690,7 +8702,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -859,6 +868,8 @@
+@@ -859,6 +870,8 @@
  ##	</summary>
  ## </param>
  #
@@ -8699,7 +8711,7 @@ diff -b -B --ignore-all-space --exclude-
  interface(`apache_run_all_scripts',`
  	gen_require(`
  		attribute httpd_exec_scripts, httpd_script_domains;
-@@ -884,7 +895,7 @@
+@@ -884,7 +897,7 @@
  		type httpd_squirrelmail_t;
  	')
  
@@ -8708,7 +8720,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1040,3 +1051,160 @@
+@@ -1040,3 +1053,160 @@
  
  	allow httpd_t $1:process signal;
  ')
@@ -10360,7 +10372,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-29 13:51:27.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -10400,7 +10412,7 @@ diff -b -B --ignore-all-space --exclude-
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
  
-@@ -47,13 +57,35 @@
+@@ -47,13 +57,36 @@
  
  auth_use_nsswitch(consolekit_t)
  
@@ -10409,6 +10421,7 @@ diff -b -B --ignore-all-space --exclude-
 +init_chat(consolekit_t)
 +
 +logging_send_syslog_msg(consolekit_t)
++logging_send_audit_msgs(consolekit_t)
 +
  miscfiles_read_localization(consolekit_t)
  
@@ -10438,7 +10451,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +93,32 @@
+@@ -61,6 +94,32 @@
  ')
  
  optional_policy(`
@@ -11834,7 +11847,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.12/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2009-03-23 13:47:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/cvs.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cvs.te	2009-04-29 12:56:25.000000000 -0400
 @@ -112,4 +112,5 @@
  	read_files_pattern(httpd_cvs_script_t, cvs_data_t, cvs_data_t)
  	manage_dirs_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
@@ -13431,8 +13444,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-04-28 16:07:25.000000000 -0400
-@@ -0,0 +1,36 @@
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-04-29 10:10:42.000000000 -0400
+@@ -0,0 +1,41 @@
 +policy_module(fprintd,1.0.0)
 +
 +########################################
@@ -13463,8 +13476,13 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_read_all_users_state(fprintd_t)
 +
 +optional_policy(`
++	consolekit_dbus_chat(fprintd_t)
++')
++
++optional_policy(`
 +	polkit_read_reload(fprintd_t)
 +	polkit_read_lib(fprintd_t)
++	polkit_domtrans_auth(fprintd_t)
 +')
 +
 +permissive fprintd_t;
@@ -14533,6 +14551,19 @@ diff -b -B --ignore-all-space --exclude-
 +permissive ifplugd_t;
 +
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.if serefpolicy-3.6.12/policy/modules/services/inetd.if
+--- nsaserefpolicy/policy/modules/services/inetd.if	2008-09-03 07:59:15.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/inetd.if	2009-04-29 14:44:12.000000000 -0400
+@@ -36,8 +36,7 @@
+ 	role system_r types $1;
+ 
+ 	domtrans_pattern(inetd_t, $2, $1)
+-
+-	allow inetd_t $1:process sigkill;
++	allow inetd_t $1:process { siginh sigkill };
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.6.12/policy/modules/services/kerneloops.if
 --- nsaserefpolicy/policy/modules/services/kerneloops.if	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/kerneloops.if	2009-04-23 09:44:57.000000000 -0400
@@ -14959,8 +14990,8 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 11:46:55.000000000 -0400
-@@ -1,6 +1,9 @@
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-29 10:14:21.000000000 -0400
+@@ -1,6 +1,10 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
  
@@ -14969,6 +15000,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_state_t,s0)
  /var/run/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_data_t,s0)
  /var/run/spamass-milter\.pid			--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
++/var/run/milter.*				--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
 +/var/lib/miltermilter.*					gen_context(system_u:object_r:spamass_milter_state_t,s0)
 +
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
@@ -20441,6 +20473,36 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_login_pgm_domain(rshd_t)
  auth_write_login_records(rshd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.6.12/policy/modules/services/rsync.te
+--- nsaserefpolicy/policy/modules/services/rsync.te	2009-03-23 13:47:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rsync.te	2009-04-29 13:19:21.000000000 -0400
+@@ -8,6 +8,13 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow rsync to run as a client
++## </p>
++## </desc>
++gen_tunable(rsync_client, false)
++
++## <desc>
++## <p>
+ ## Allow rsync to export any files/directories read only.
+ ## </p>
+ ## </desc>
+@@ -124,4 +131,12 @@
+ 	auth_read_all_symlinks_except_shadow(rsync_t)
+ 	auth_tunable_read_shadow(rsync_t)
+ ')
++
++tunable_policy(`rsync_client',`
++	corenet_tcp_connect_rsync_port(rsync_t)
++	manage_dirs_pattern(rsync_t, rsync_data_t, rsync_data_t)
++	manage_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
++	manage_lnk_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
++')
++
+ auth_can_read_shadow_passwords(rsync_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.6.12/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/samba.fc	2009-04-23 09:44:57.000000000 -0400
@@ -21363,7 +21425,16 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-29 13:03:31.000000000 -0400
+@@ -89,7 +89,7 @@
+ 		type sendmail_t;
+ 	')
+ 
+-	allow $1 sendmail_t:unix_stream_socket { read write };
++	allow $1 sendmail_t:unix_stream_socket { getattr read write ioctl };
+ ')
+ 
+ ########################################
 @@ -149,3 +149,92 @@
  
  	logging_log_filetrans($1, sendmail_log_t, file)
@@ -22406,7 +22477,7 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-29 10:46:37.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -22607,7 +22678,31 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read a ssh server unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -611,3 +630,42 @@
+@@ -469,6 +488,23 @@
+ 
+ 	allow $1 sshd_t:fifo_file { getattr read };
+ ')
++########################################
++## <summary>
++##	Read/write a ssh server unnamed pipe.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ssh_rw_pipes',`
++	gen_require(`
++		type sshd_t;
++	')
++
++	allow $1 sshd_t:fifo_file { write read getattr ioctl };
++')
+ 
+ ########################################
+ ## <summary>
+@@ -611,3 +647,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -23085,8 +23180,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-28 15:43:36.000000000 -0400
-@@ -0,0 +1,72 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-29 10:01:55.000000000 -0400
+@@ -0,0 +1,74 @@
 +policy_module(sssd,1.0.0)
 +
 +########################################
@@ -23150,6 +23245,8 @@ diff -b -B --ignore-all-space --exclude-
 +auth_domtrans_chk_passwd(sssd_t)
 +auth_domtrans_upd_passwd(sssd_t)
 +
++init_read_utmp(sssd_t)
++
 +logging_send_syslog_msg(sssd_t)
 +logging_send_audit_msgs(sssd_t)
 +
@@ -25930,8 +26027,24 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-23 09:44:57.000000000 -0400
-@@ -280,6 +280,36 @@
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-29 14:42:44.000000000 -0400
+@@ -174,6 +174,7 @@
+ 	role system_r types $1;
+ 
+ 	domtrans_pattern(initrc_t,$2,$1)
++	allow initrc_t $1:process siginh;
+ 
+ 	# daemons started from init will
+ 	# inherit fds from init for the console
+@@ -272,6 +273,7 @@
+ 	role system_r types $1;
+ 
+ 	domtrans_pattern(initrc_t,$2,$1)
++	allow initrc_t $1:process siginh;
+ 
+ 	ifdef(`hide_broken_symptoms',`
+ 		# RHEL4 systems seem to have a stray
+@@ -280,6 +282,36 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -25968,7 +26081,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -546,7 +576,7 @@
+@@ -546,7 +578,7 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
@@ -25977,7 +26090,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -619,18 +649,19 @@
+@@ -619,18 +651,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -26001,7 +26114,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -646,23 +677,43 @@
+@@ -646,19 +679,39 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -26022,11 +26135,11 @@ diff -b -B --ignore-all-space --exclude-
  	ifdef(`enable_mls',`
 -		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
 +		range_transition $1 init_script_file_type:process s0 - mls_systemhigh;
- 	')
- ')
- 
- ########################################
- ## <summary>
++	')
++')
++
++########################################
++## <summary>
 +##	Execute a file in a bin directory
 +##	in the initrc_t domain 
 +## </summary>
@@ -26039,17 +26152,13 @@ diff -b -B --ignore-all-space --exclude-
 +interface(`init_bin_domtrans_spec',`
 +	gen_require(`
 +		type initrc_t;
-+	')
+ 	')
 +
 +	corecmd_bin_domtrans($1, initrc_t)
-+')
-+
-+########################################
-+## <summary>
- ##	Execute a init script in a specified domain.
- ## </summary>
- ## <desc>
-@@ -1291,6 +1342,25 @@
+ ')
+ 
+ ########################################
+@@ -1291,6 +1344,25 @@
  
  ########################################
  ## <summary>
@@ -26075,7 +26184,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1591,51 @@
+@@ -1521,3 +1593,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -p -r1.847 -r1.848
--- selinux-policy.spec	28 Apr 2009 20:09:26 -0000	1.847
+++ selinux-policy.spec	30 Apr 2009 11:51:04 -0000	1.848
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,6 +480,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
+- Additional rules for fprintd and sssd
+
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24
 - Allow nsplugin to unix_read unix_write sem for unconfined_java
 



From dwalsh at fedoraproject.org  Thu Apr 30 11:51:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 30 Apr 2009 11:51:38 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.104,
	1.105 selinux-policy.spec, 1.841, 1.842
Message-ID: <20090430115138.68BA67013B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7269

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
- Additional rules for fprintd and sssd


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- policy-20090105.patch	28 Apr 2009 20:09:21 -0000	1.104
+++ policy-20090105.patch	30 Apr 2009 11:51:05 -0000	1.105
@@ -1833,9 +1833,10 @@ diff -b -B --ignore-all-space --exclude-
 +permissive cpufreqselector_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.6.12/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.fc	2009-04-30 07:42:25.000000000 -0400
 @@ -1,8 +1,16 @@
- HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
+-HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
++HOME_DIR/\.config(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
  HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:gconf_home_t,s0)
 +HOME_DIR/\.gnome2(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
 +HOME_DIR/\.local.*		gen_context(system_u:object_r:gconf_home_t,s0)
@@ -5234,7 +5235,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-27 11:30:40.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/domain.te	2009-04-29 10:47:24.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5305,7 +5306,7 @@ diff -b -B --ignore-all-space --exclude-
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +172,46 @@
+@@ -153,3 +172,50 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5338,6 +5339,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	ssh_rw_pipes(domain)
++')
++
++optional_policy(`
 +	unconfined_dontaudit_rw_pipes(domain)
 +	unconfined_sigchld(domain)
 +')
@@ -8336,7 +8341,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn(/.*)?		gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.12/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/apache.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/apache.if	2009-04-29 14:18:52.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8558,7 +8563,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		tunable_policy(`httpd_enable_cgi && allow_ypbind',`
  			nis_use_ypbind_uncond(httpd_$1_script_t)
-@@ -227,10 +170,6 @@
+@@ -227,15 +170,13 @@
  
  	optional_policy(`
  		postgresql_unpriv_client(httpd_$1_script_t)
@@ -8569,7 +8574,14 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -504,6 +443,47 @@
+ 		nscd_socket_use(httpd_$1_script_t)
+ 	')
++
++	dontaudit httpd_$1_script_t httpd_t:tcp_socket { read write };
+ ')
+ 
+ ########################################
+@@ -504,6 +445,47 @@
  ########################################
  ## <summary>
  ##	Allow the specified domain to read
@@ -8617,7 +8629,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	apache configuration files.
  ## </summary>
  ## <param name="domain">
-@@ -579,7 +559,7 @@
+@@ -579,7 +561,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -8626,7 +8638,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -715,6 +695,7 @@
+@@ -715,6 +697,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -8634,7 +8646,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -782,6 +763,32 @@
+@@ -782,6 +765,32 @@
  
  ########################################
  ## <summary>
@@ -8667,7 +8679,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute all web scripts in the system
  ##	script domain.
  ## </summary>
-@@ -791,16 +798,18 @@
+@@ -791,16 +800,18 @@
  ##	</summary>
  ## </param>
  #
@@ -8690,7 +8702,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -859,6 +868,8 @@
+@@ -859,6 +870,8 @@
  ##	</summary>
  ## </param>
  #
@@ -8699,7 +8711,7 @@ diff -b -B --ignore-all-space --exclude-
  interface(`apache_run_all_scripts',`
  	gen_require(`
  		attribute httpd_exec_scripts, httpd_script_domains;
-@@ -884,7 +895,7 @@
+@@ -884,7 +897,7 @@
  		type httpd_squirrelmail_t;
  	')
  
@@ -8708,7 +8720,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1040,3 +1051,160 @@
+@@ -1040,3 +1053,160 @@
  
  	allow httpd_t $1:process signal;
  ')
@@ -10360,7 +10372,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-29 13:51:27.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -10400,7 +10412,7 @@ diff -b -B --ignore-all-space --exclude-
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
  
-@@ -47,13 +57,35 @@
+@@ -47,13 +57,36 @@
  
  auth_use_nsswitch(consolekit_t)
  
@@ -10409,6 +10421,7 @@ diff -b -B --ignore-all-space --exclude-
 +init_chat(consolekit_t)
 +
 +logging_send_syslog_msg(consolekit_t)
++logging_send_audit_msgs(consolekit_t)
 +
  miscfiles_read_localization(consolekit_t)
  
@@ -10438,7 +10451,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +93,32 @@
+@@ -61,6 +94,32 @@
  ')
  
  optional_policy(`
@@ -11834,7 +11847,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.12/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2009-03-23 13:47:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/cvs.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/cvs.te	2009-04-29 12:56:25.000000000 -0400
 @@ -112,4 +112,5 @@
  	read_files_pattern(httpd_cvs_script_t, cvs_data_t, cvs_data_t)
  	manage_dirs_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
@@ -13431,8 +13444,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-04-28 16:07:25.000000000 -0400
-@@ -0,0 +1,36 @@
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-04-29 10:10:42.000000000 -0400
+@@ -0,0 +1,41 @@
 +policy_module(fprintd,1.0.0)
 +
 +########################################
@@ -13463,8 +13476,13 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_read_all_users_state(fprintd_t)
 +
 +optional_policy(`
++	consolekit_dbus_chat(fprintd_t)
++')
++
++optional_policy(`
 +	polkit_read_reload(fprintd_t)
 +	polkit_read_lib(fprintd_t)
++	polkit_domtrans_auth(fprintd_t)
 +')
 +
 +permissive fprintd_t;
@@ -14533,6 +14551,19 @@ diff -b -B --ignore-all-space --exclude-
 +permissive ifplugd_t;
 +
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.if serefpolicy-3.6.12/policy/modules/services/inetd.if
+--- nsaserefpolicy/policy/modules/services/inetd.if	2008-09-03 07:59:15.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/inetd.if	2009-04-29 14:44:12.000000000 -0400
+@@ -36,8 +36,7 @@
+ 	role system_r types $1;
+ 
+ 	domtrans_pattern(inetd_t, $2, $1)
+-
+-	allow inetd_t $1:process sigkill;
++	allow inetd_t $1:process { siginh sigkill };
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.6.12/policy/modules/services/kerneloops.if
 --- nsaserefpolicy/policy/modules/services/kerneloops.if	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/kerneloops.if	2009-04-23 09:44:57.000000000 -0400
@@ -14959,8 +14990,8 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-27 11:46:55.000000000 -0400
-@@ -1,6 +1,9 @@
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-29 10:14:21.000000000 -0400
+@@ -1,6 +1,10 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
  
@@ -14969,6 +15000,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_state_t,s0)
  /var/run/spamass-milter(/.*)?				gen_context(system_u:object_r:spamass_milter_data_t,s0)
  /var/run/spamass-milter\.pid			--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
++/var/run/milter.*				--	gen_context(system_u:object_r:spamass_milter_data_t,s0)
 +/var/lib/miltermilter.*					gen_context(system_u:object_r:spamass_milter_state_t,s0)
 +
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
@@ -20441,6 +20473,36 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_login_pgm_domain(rshd_t)
  auth_write_login_records(rshd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.6.12/policy/modules/services/rsync.te
+--- nsaserefpolicy/policy/modules/services/rsync.te	2009-03-23 13:47:11.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/rsync.te	2009-04-29 13:19:21.000000000 -0400
+@@ -8,6 +8,13 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow rsync to run as a client
++## </p>
++## </desc>
++gen_tunable(rsync_client, false)
++
++## <desc>
++## <p>
+ ## Allow rsync to export any files/directories read only.
+ ## </p>
+ ## </desc>
+@@ -124,4 +131,12 @@
+ 	auth_read_all_symlinks_except_shadow(rsync_t)
+ 	auth_tunable_read_shadow(rsync_t)
+ ')
++
++tunable_policy(`rsync_client',`
++	corenet_tcp_connect_rsync_port(rsync_t)
++	manage_dirs_pattern(rsync_t, rsync_data_t, rsync_data_t)
++	manage_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
++	manage_lnk_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
++')
++
+ auth_can_read_shadow_passwords(rsync_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.6.12/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/samba.fc	2009-04-23 09:44:57.000000000 -0400
@@ -21363,7 +21425,16 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-29 13:03:31.000000000 -0400
+@@ -89,7 +89,7 @@
+ 		type sendmail_t;
+ 	')
+ 
+-	allow $1 sendmail_t:unix_stream_socket { read write };
++	allow $1 sendmail_t:unix_stream_socket { getattr read write ioctl };
+ ')
+ 
+ ########################################
 @@ -149,3 +149,92 @@
  
  	logging_log_filetrans($1, sendmail_log_t, file)
@@ -22406,7 +22477,7 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-04-29 10:46:37.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -22607,7 +22678,31 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read a ssh server unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -611,3 +630,42 @@
+@@ -469,6 +488,23 @@
+ 
+ 	allow $1 sshd_t:fifo_file { getattr read };
+ ')
++########################################
++## <summary>
++##	Read/write a ssh server unnamed pipe.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ssh_rw_pipes',`
++	gen_require(`
++		type sshd_t;
++	')
++
++	allow $1 sshd_t:fifo_file { write read getattr ioctl };
++')
+ 
+ ########################################
+ ## <summary>
+@@ -611,3 +647,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -23085,8 +23180,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-28 15:43:36.000000000 -0400
-@@ -0,0 +1,72 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-04-29 10:01:55.000000000 -0400
+@@ -0,0 +1,74 @@
 +policy_module(sssd,1.0.0)
 +
 +########################################
@@ -23150,6 +23245,8 @@ diff -b -B --ignore-all-space --exclude-
 +auth_domtrans_chk_passwd(sssd_t)
 +auth_domtrans_upd_passwd(sssd_t)
 +
++init_read_utmp(sssd_t)
++
 +logging_send_syslog_msg(sssd_t)
 +logging_send_audit_msgs(sssd_t)
 +
@@ -25930,8 +26027,24 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-23 09:44:57.000000000 -0400
-@@ -280,6 +280,36 @@
++++ serefpolicy-3.6.12/policy/modules/system/init.if	2009-04-29 14:42:44.000000000 -0400
+@@ -174,6 +174,7 @@
+ 	role system_r types $1;
+ 
+ 	domtrans_pattern(initrc_t,$2,$1)
++	allow initrc_t $1:process siginh;
+ 
+ 	# daemons started from init will
+ 	# inherit fds from init for the console
+@@ -272,6 +273,7 @@
+ 	role system_r types $1;
+ 
+ 	domtrans_pattern(initrc_t,$2,$1)
++	allow initrc_t $1:process siginh;
+ 
+ 	ifdef(`hide_broken_symptoms',`
+ 		# RHEL4 systems seem to have a stray
+@@ -280,6 +282,36 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -25968,7 +26081,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -546,7 +576,7 @@
+@@ -546,7 +578,7 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
@@ -25977,7 +26090,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -619,18 +649,19 @@
+@@ -619,18 +651,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -26001,7 +26114,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -646,23 +677,43 @@
+@@ -646,19 +679,39 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -26022,11 +26135,11 @@ diff -b -B --ignore-all-space --exclude-
  	ifdef(`enable_mls',`
 -		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
 +		range_transition $1 init_script_file_type:process s0 - mls_systemhigh;
- 	')
- ')
- 
- ########################################
- ## <summary>
++	')
++')
++
++########################################
++## <summary>
 +##	Execute a file in a bin directory
 +##	in the initrc_t domain 
 +## </summary>
@@ -26039,17 +26152,13 @@ diff -b -B --ignore-all-space --exclude-
 +interface(`init_bin_domtrans_spec',`
 +	gen_require(`
 +		type initrc_t;
-+	')
+ 	')
 +
 +	corecmd_bin_domtrans($1, initrc_t)
-+')
-+
-+########################################
-+## <summary>
- ##	Execute a init script in a specified domain.
- ## </summary>
- ## <desc>
-@@ -1291,6 +1342,25 @@
+ ')
+ 
+ ########################################
+@@ -1291,6 +1344,25 @@
  
  ########################################
  ## <summary>
@@ -26075,7 +26184,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1591,51 @@
+@@ -1521,3 +1593,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -p -r1.841 -r1.842
--- selinux-policy.spec	28 Apr 2009 20:09:21 -0000	1.841
+++ selinux-policy.spec	30 Apr 2009 11:51:07 -0000	1.842
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,6 +480,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
+- Additional rules for fprintd and sssd
+
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24
 - Allow nsplugin to unix_read unix_write sem for unconfined_java
 



From pvrabec at fedoraproject.org  Thu Apr 30 11:57:58 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Thu, 30 Apr 2009 11:57:58 +0000 (UTC)
Subject: rpms/openscap/devel .cvsignore, 1.3, 1.4 openscap.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090430115758.871A770133@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/openscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24206

Modified Files:
	.cvsignore openscap.spec sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Apr 2009 08:39:51 -0000	1.3
+++ .cvsignore	30 Apr 2009 11:57:27 -0000	1.4
@@ -1 +1 @@
-openscap-0.3.2.tar.gz
+openscap-0.3.3.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/openscap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openscap.spec	24 Apr 2009 08:39:51 -0000	1.2
+++ openscap.spec	30 Apr 2009 11:57:28 -0000	1.3
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.3.2
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -10,8 +10,7 @@ License:        LGPLv2+
 URL:            http://www.open-scap.org/
 Source0:        http://open-scap.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  swig python-devel 
-BuildRequires:  pcre-devel libxml2-devel
+BuildRequires:  swig pcre-devel libxml2-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -34,6 +33,7 @@ developing applications that use %{name}
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  python-devel 
 
 %description    python
 The %{name}-python package contains the bindings so that %{name}
@@ -43,6 +43,7 @@ libraries can be used by python.
 Summary:        Perl bindings for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  perl-devel
 
 %description    perl
 The %{name}-perl package contains the bindings so that %{name}
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Peter Vrabec <pvrabec at redhat.com> 0.3.3-1
+- upgrade
+
 * Thu Apr 23 2009 Peter Vrabec <pvrabec at redhat.com> 0.3.2-1
 - upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Apr 2009 08:39:51 -0000	1.3
+++ sources	30 Apr 2009 11:57:28 -0000	1.4
@@ -1 +1 @@
-511064e5893ef6cc8bfed56b69d86186  openscap-0.3.2.tar.gz
+eb9278719d0668a2ae04146b1706e054  openscap-0.3.3.tar.gz



From caolanm at fedoraproject.org  Thu Apr 30 12:02:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 30 Apr 2009 12:02:08 +0000 (UTC)
Subject: rpms/hunspell-ur/devel .cvsignore, 1.1, 1.2 hunspell-ur.spec, 1.2, 
	1.3 sources, 1.1, 1.2 UrduDictionary.xpi, 1.1, NONE
Message-ID: <20090430120208.D249B70133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ur/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26801

Modified Files:
	.cvsignore hunspell-ur.spec sources 
Removed Files:
	UrduDictionary.xpi 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ur/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Sep 2008 19:11:22 -0000	1.1
+++ .cvsignore	30 Apr 2009 12:01:38 -0000	1.2
@@ -0,0 +1 @@
+UrduDictionary.xpi


Index: hunspell-ur.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ur/devel/hunspell-ur.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hunspell-ur.spec	25 Feb 2009 05:46:15 -0000	1.2
+++ hunspell-ur.spec	30 Apr 2009 12:01:38 -0000	1.3
@@ -1,12 +1,12 @@
 Name: hunspell-ur
 Summary: Urdu hunspell dictionaries
-Version: 0.6
-Release: 2%{?dist}
-#http://www.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=UrduDictionary&DownloadId=39372
+Version: 0.61
+Release: 1%{?dist}
+#http://urdudictionary.codeplex.com/Release/ProjectReleases.aspx?ReleaseId=26593#DownloadId=66493
 #and click yes to agree to LGPLv2+, which stinks as a download-url :-(
 Source: UrduDictionary.xpi
 Group: Applications/Text
-URL: http://www.codeplex.com/UrduDictionary
+URL: http://urdudictionary.codeplex.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: LGPLv2+
 BuildArch: noarch
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Apr 30 2009 Caolan McNamara <caolanm at redhat.com> - 0.61-1
+- latest version
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ur/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Sep 2008 19:11:22 -0000	1.1
+++ sources	30 Apr 2009 12:01:38 -0000	1.2
@@ -0,0 +1 @@
+f49ecfff4bda1624ed567871fda7366f  UrduDictionary.xpi


--- UrduDictionary.xpi DELETED ---



From tmraz at fedoraproject.org  Thu Apr 30 12:03:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 30 Apr 2009 12:03:30 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-fips.patch, 1.4, 1.5 openssh.spec, 
	1.142, 1.143
Message-ID: <20090430120330.147A670133@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27070

Modified Files:
	openssh-5.2p1-fips.patch openssh.spec 
Log Message:
* Thu Apr 30 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-5
- do integrity verification only on binaries which are part
  of the OpenSSH FIPS modules


openssh-5.2p1-fips.patch:

Index: openssh-5.2p1-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-fips.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openssh-5.2p1-fips.patch	20 Apr 2009 12:18:49 -0000	1.4
+++ openssh-5.2p1-fips.patch	30 Apr 2009 12:03:29 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up openssh-5.2p1/auth2-pubkey.c.fips openssh-5.2p1/auth2-pubkey.c
---- openssh-5.2p1/auth2-pubkey.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/auth2-pubkey.c	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/auth2-pubkey.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/auth2-pubkey.c	2009-04-17 23:23:42.000000000 +0200
 @@ -33,6 +33,7 @@
  #include <stdio.h>
  #include <stdarg.h>
@@ -20,7 +20,7 @@ diff -up openssh-5.2p1/auth2-pubkey.c.fi
  			xfree(fp);
 diff -up openssh-5.2p1/cipher.c.fips openssh-5.2p1/cipher.c
 --- openssh-5.2p1/cipher.c.fips	2009-03-06 18:23:21.000000000 +0100
-+++ openssh-5.2p1/cipher.c	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/cipher.c	2009-04-17 23:23:42.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <sys/types.h>
  
@@ -81,7 +81,7 @@ diff -up openssh-5.2p1/cipher.c.fips ope
  	return -1;
 diff -up openssh-5.2p1/cipher-ctr.c.fips openssh-5.2p1/cipher-ctr.c
 --- openssh-5.2p1/cipher-ctr.c.fips	2007-06-14 15:21:33.000000000 +0200
-+++ openssh-5.2p1/cipher-ctr.c	2009-04-17 23:23:06.000000000 +0200
++++ openssh-5.2p1/cipher-ctr.c	2009-04-17 23:23:42.000000000 +0200
 @@ -140,7 +140,8 @@ evp_aes_128_ctr(void)
  	aes_ctr.do_cipher = ssh_aes_ctr;
  #ifndef SSH_OLD_EVP
@@ -94,7 +94,7 @@ diff -up openssh-5.2p1/cipher-ctr.c.fips
  }
 diff -up openssh-5.2p1/mac.c.fips openssh-5.2p1/mac.c
 --- openssh-5.2p1/mac.c.fips	2008-06-13 02:58:50.000000000 +0200
-+++ openssh-5.2p1/mac.c	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/mac.c	2009-04-17 23:23:42.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  
@@ -145,8 +145,8 @@ diff -up openssh-5.2p1/mac.c.fips openss
  	for (i = 0; macs[i].name; i++) {
  		if (strcmp(name, macs[i].name) == 0) {
 diff -up openssh-5.2p1/Makefile.in.fips openssh-5.2p1/Makefile.in
---- openssh-5.2p1/Makefile.in.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/Makefile.in	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/Makefile.in.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/Makefile.in	2009-04-17 23:23:42.000000000 +0200
 @@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS)
  	$(RANLIB) $@
  
@@ -185,7 +185,7 @@ diff -up openssh-5.2p1/Makefile.in.fips 
  	$(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 diff -up openssh-5.2p1/myproposal.h.fips openssh-5.2p1/myproposal.h
 --- openssh-5.2p1/myproposal.h.fips	2009-01-28 06:33:31.000000000 +0100
-+++ openssh-5.2p1/myproposal.h	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/myproposal.h	2009-04-17 23:23:42.000000000 +0200
 @@ -53,7 +53,12 @@
  	"hmac-sha1-96,hmac-md5-96"
  #define	KEX_DEFAULT_COMP	"none,zlib at openssh.com,zlib"
@@ -201,8 +201,8 @@ diff -up openssh-5.2p1/myproposal.h.fips
  static char *myproposal[PROPOSAL_MAX] = {
  	KEX_DEFAULT_KEX,
 diff -up openssh-5.2p1/nsskeys.c.fips openssh-5.2p1/nsskeys.c
---- openssh-5.2p1/nsskeys.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/nsskeys.c	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/nsskeys.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/nsskeys.c	2009-04-17 23:23:42.000000000 +0200
 @@ -183,8 +183,8 @@ nss_convert_pubkey(Key *k)
  			break;
  	}
@@ -216,7 +216,7 @@ diff -up openssh-5.2p1/nsskeys.c.fips op
  	return 0;
 diff -up openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips openssh-5.2p1/openbsd-compat/bsd-arc4random.c
 --- openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips	2008-06-04 02:54:00.000000000 +0200
-+++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c	2009-04-17 14:52:11.000000000 +0200
++++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c	2009-04-17 23:23:42.000000000 +0200
 @@ -39,6 +39,7 @@
  static int rc4_ready = 0;
  static RC4_KEY rc4;
@@ -259,18 +259,17 @@ diff -up openssh-5.2p1/openbsd-compat/bs
  
  #ifndef ARC4RANDOM_BUF
 diff -up openssh-5.2p1/ssh-add.c.fips openssh-5.2p1/ssh-add.c
---- openssh-5.2p1/ssh-add.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/ssh-add.c	2009-04-17 14:52:11.000000000 +0200
-@@ -42,6 +42,8 @@
+--- openssh-5.2p1/ssh-add.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/ssh-add.c	2009-04-30 13:56:56.000000000 +0200
+@@ -42,6 +42,7 @@
  #include <sys/param.h>
  
  #include <openssl/evp.h>
 +#include <openssl/fips.h>
-+#include <fipscheck.h>
  #include "openbsd-compat/openssl-compat.h"
  
  #ifdef HAVE_LIBNSS
-@@ -254,7 +256,7 @@ list_identities(AuthenticationConnection
+@@ -254,7 +255,7 @@ list_identities(AuthenticationConnection
  		    key = ssh_get_next_identity(ac, &comment, version)) {
  			had_identities = 1;
  			if (do_fp) {
@@ -279,40 +278,18 @@ diff -up openssh-5.2p1/ssh-add.c.fips op
  				    SSH_FP_HEX);
  				printf("%d %s %s (%s)\n",
  				    key_size(key), fp, comment, key_type(key));
-@@ -463,10 +465,19 @@ main(int argc, char **argv)
- 	sanitise_stdfd();
- 
- 	__progname = ssh_get_progname(argv[0]);
-+	SSLeay_add_all_algorithms();
-+	if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+		fprintf(stderr,
-+		    "FIPS integrity verification test failed.\n");
-+		exit(3);
-+	}
-+
- 	init_rng();
- 	seed_rng();
- 
--	SSLeay_add_all_algorithms();
-+	if (FIPS_mode()) {
-+		logit("FIPS mode initialized");
-+	}
- 
- 	/* At first, get a connection to the authentication agent. */
- 	ac = ssh_get_authentication_connection();
 diff -up openssh-5.2p1/ssh-agent.c.fips openssh-5.2p1/ssh-agent.c
---- openssh-5.2p1/ssh-agent.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/ssh-agent.c	2009-04-17 14:52:11.000000000 +0200
-@@ -51,6 +51,8 @@
+--- openssh-5.2p1/ssh-agent.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/ssh-agent.c	2009-04-30 13:57:34.000000000 +0200
+@@ -51,6 +51,7 @@
  
  #include <openssl/evp.h>
  #include <openssl/md5.h>
 +#include <openssl/fips.h>
-+#include <fipscheck.h>
  #include "openbsd-compat/openssl-compat.h"
  
  #include <errno.h>
-@@ -200,9 +202,9 @@ confirm_key(Identity *id)
+@@ -200,9 +201,9 @@ confirm_key(Identity *id)
  	char *p;
  	int ret = -1;
  
@@ -325,32 +302,9 @@ diff -up openssh-5.2p1/ssh-agent.c.fips 
  		ret = 0;
  	xfree(p);
  
-@@ -1196,6 +1198,11 @@ main(int ac, char **av)
- #endif
- 
- 	SSLeay_add_all_algorithms();
-+	if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+		fprintf(stderr,
-+			"FIPS integrity verification test failed.\n");
-+		exit(3);
-+	}
- 
- 	__progname = ssh_get_progname(av[0]);
- 	init_rng();
-@@ -1356,6 +1363,10 @@ main(int ac, char **av)
- 	/* child */
- 	log_init(__progname, SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_AUTH, 0);
- 
-+	if (FIPS_mode()) {
-+		logit("FIPS mode initialized");
-+	}
-+
- 	if (setsid() == -1) {
- 		error("setsid: %s", strerror(errno));
- 		cleanup_exit(1);
 diff -up openssh-5.2p1/ssh.c.fips openssh-5.2p1/ssh.c
---- openssh-5.2p1/ssh.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/ssh.c	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/ssh.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/ssh.c	2009-04-17 23:23:42.000000000 +0200
 @@ -71,6 +71,8 @@
  
  #include <openssl/evp.h>
@@ -391,8 +345,8 @@ diff -up openssh-5.2p1/ssh.c.fips openss
  		options.user = xstrdup(pw->pw_name);
  
 diff -up openssh-5.2p1/sshconnect2.c.fips openssh-5.2p1/sshconnect2.c
---- openssh-5.2p1/sshconnect2.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/sshconnect2.c	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/sshconnect2.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/sshconnect2.c	2009-04-17 23:23:42.000000000 +0200
 @@ -44,6 +44,8 @@
  #include <vis.h>
  #endif
@@ -437,8 +391,8 @@ diff -up openssh-5.2p1/sshconnect2.c.fip
  
  	/*
 diff -up openssh-5.2p1/sshconnect.c.fips openssh-5.2p1/sshconnect.c
---- openssh-5.2p1/sshconnect.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/sshconnect.c	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/sshconnect.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/sshconnect.c	2009-04-17 23:23:42.000000000 +0200
 @@ -40,6 +40,8 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -526,8 +480,8 @@ diff -up openssh-5.2p1/sshconnect.c.fips
  
  	xfree(fp);
 diff -up openssh-5.2p1/sshd.c.fips openssh-5.2p1/sshd.c
---- openssh-5.2p1/sshd.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/sshd.c	2009-04-17 14:52:11.000000000 +0200
+--- openssh-5.2p1/sshd.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/sshd.c	2009-04-17 23:23:42.000000000 +0200
 @@ -76,6 +76,8 @@
  #include <openssl/bn.h>
  #include <openssl/md5.h>
@@ -591,18 +545,17 @@ diff -up openssh-5.2p1/sshd.c.fips opens
  	if (options.compression == COMP_NONE) {
  		myproposal[PROPOSAL_COMP_ALGS_CTOS] =
 diff -up openssh-5.2p1/ssh-keygen.c.fips openssh-5.2p1/ssh-keygen.c
---- openssh-5.2p1/ssh-keygen.c.fips	2009-04-17 14:52:11.000000000 +0200
-+++ openssh-5.2p1/ssh-keygen.c	2009-04-17 14:52:11.000000000 +0200
-@@ -21,6 +21,8 @@
+--- openssh-5.2p1/ssh-keygen.c.fips	2009-04-17 23:23:42.000000000 +0200
++++ openssh-5.2p1/ssh-keygen.c	2009-04-30 13:58:02.000000000 +0200
+@@ -21,6 +21,7 @@
  
  #include <openssl/evp.h>
  #include <openssl/pem.h>
 +#include <openssl/fips.h>
-+#include <fipscheck.h>
  #include "openbsd-compat/openssl-compat.h"
  
  #include <errno.h>
-@@ -537,7 +539,7 @@ do_fingerprint(struct passwd *pw)
+@@ -537,7 +538,7 @@ do_fingerprint(struct passwd *pw)
  	enum fp_type fptype;
  	struct stat st;
  
@@ -611,29 +564,7 @@ diff -up openssh-5.2p1/ssh-keygen.c.fips
  	rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
  
  	if (!have_identity)
-@@ -1125,11 +1127,21 @@ main(int argc, char **argv)
- 	__progname = ssh_get_progname(argv[0]);
- 
- 	SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fprintf(stderr,
-+                    "FIPS integrity verification test failed.\n");
-+                exit(3);
-+        }
-+
- 	log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
- 
- 	init_rng();
- 	seed_rng();
- 
-+	if (FIPS_mode()) {
-+		logit("FIPS mode initialized");
-+	}
-+
- 	/* we need this for the home * directory.  */
- 	pw = getpwuid(getuid());
- 	if (!pw) {
-@@ -1506,14 +1518,15 @@ passphrase_again:
+@@ -1506,14 +1507,15 @@ passphrase_again:
  	fclose(f);
  
  	if (!quiet) {
@@ -653,83 +584,3 @@ diff -up openssh-5.2p1/ssh-keygen.c.fips
  		printf("%s\n", ra);
  		xfree(ra);
  		xfree(fp);
-diff -up openssh-5.2p1/ssh-keyscan.c.fips openssh-5.2p1/ssh-keyscan.c
---- openssh-5.2p1/ssh-keyscan.c.fips	2009-01-28 06:31:23.000000000 +0100
-+++ openssh-5.2p1/ssh-keyscan.c	2009-04-17 14:52:11.000000000 +0200
-@@ -19,6 +19,8 @@
- #include <arpa/inet.h>
- 
- #include <openssl/bn.h>
-+#include <openssl/fips.h>
-+#include <fipscheck.h>
- 
- #include <netdb.h>
- #include <errno.h>
-@@ -731,6 +733,13 @@ main(int argc, char **argv)
- 	extern char *optarg;
- 
- 	__progname = ssh_get_progname(argv[0]);
-+        SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fprintf(stderr,
-+                    "FIPS integrity verification test failed.\n");
-+                exit(3);
-+        }
-+
- 	init_rng();
- 	seed_rng();
- 	TAILQ_INIT(&tq);
-@@ -812,6 +821,10 @@ main(int argc, char **argv)
- 
- 	log_init("ssh-keyscan", log_level, SYSLOG_FACILITY_USER, 1);
- 
-+	if (FIPS_mode()) {
-+		logit("FIPS mode initialized");
-+	}
-+
- 	maxfd = fdlim_get(1);
- 	if (maxfd < 0)
- 		fatal("%s: fdlim_get: bad value", __progname);
-diff -up openssh-5.2p1/ssh-keysign.c.fips openssh-5.2p1/ssh-keysign.c
---- openssh-5.2p1/ssh-keysign.c.fips	2006-09-01 07:38:37.000000000 +0200
-+++ openssh-5.2p1/ssh-keysign.c	2009-04-17 14:52:11.000000000 +0200
-@@ -38,6 +38,8 @@
- #include <openssl/evp.h>
- #include <openssl/rand.h>
- #include <openssl/rsa.h>
-+#include <openssl/fips.h>
-+#include <fipscheck.h>
- 
- #include "xmalloc.h"
- #include "log.h"
-@@ -175,6 +177,11 @@ main(int argc, char **argv)
- 
- 	permanently_set_uid(pw);
- 
-+        SSLeay_add_all_algorithms();
-+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
-+                fatal("FIPS integrity verification test failed");
-+        }
-+
- 	init_rng();
- 	seed_rng();
- 	arc4random_stir();
-@@ -183,6 +190,10 @@ main(int argc, char **argv)
- 	log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0);
- #endif
- 
-+	if (FIPS_mode()) {
-+		logit("FIPS mode initialized");
-+	}
-+
- 	/* verify that ssh-keysign is enabled by the admin */
- 	initialize_options(&options);
- 	(void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options, 0);
-@@ -194,7 +205,6 @@ main(int argc, char **argv)
- 	if (key_fd[0] == -1 && key_fd[1] == -1)
- 		fatal("could not open any host key");
- 
--	SSLeay_add_all_algorithms();
- 	for (i = 0; i < 256; i++)
- 		rnd[i] = arc4random();
- 	RAND_seed(rnd, sizeof(rnd));


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- openssh.spec	20 Apr 2009 12:18:49 -0000	1.142
+++ openssh.spec	30 Apr 2009 12:03:29 -0000	1.143
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 4%{?dist}%{?rescue_rel}
+Release: 5%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -329,12 +329,7 @@ popd
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    fipshmac $RPM_BUILD_ROOT%{_bindir}/ssh-keygen \
-    fipshmac $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-keysign \
     fipshmac $RPM_BUILD_ROOT%{_bindir}/ssh \
-    fipshmac $RPM_BUILD_ROOT%{_bindir}/ssh-agent \
-    fipshmac $RPM_BUILD_ROOT%{_bindir}/ssh-add \
-    fipshmac $RPM_BUILD_ROOT%{_bindir}/ssh-keyscan \
     fipshmac $RPM_BUILD_ROOT%{_sbindir}/sshd \
 %{nil}
 
@@ -410,11 +405,9 @@ fi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli
 %if ! %{rescue}
 %attr(0755,root,root) %{_bindir}/ssh-keygen
-%attr(0644,root,root) %{_bindir}/.ssh-keygen.hmac
 %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 %attr(4755,root,root) %{_libexecdir}/openssh/ssh-keysign
-%attr(0644,root,root) %{_libexecdir}/openssh/.ssh-keysign.hmac
 %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
 %endif
 %if %{scard}
@@ -435,11 +428,8 @@ fi
 %attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
 %if ! %{rescue}
 %attr(2755,root,nobody) %{_bindir}/ssh-agent
-%attr(0644,root,nobody) %{_bindir}/.ssh-agent.hmac
 %attr(0755,root,root) %{_bindir}/ssh-add
-%attr(0644,root,root) %{_bindir}/.ssh-add.hmac
 %attr(0755,root,root) %{_bindir}/ssh-keyscan
-%attr(0644,root,root) %{_bindir}/.ssh-keyscan.hmac
 %attr(0755,root,root) %{_bindir}/sftp
 %attr(0755,root,root) %{_bindir}/ssh-copy-id
 %attr(0644,root,root) %{_mandir}/man1/ssh-agent.1*
@@ -474,6 +464,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 30 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-5
+- do integrity verification only on binaries which are part
+  of the OpenSSH FIPS modules
+
 * Mon Apr 20 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-4
 - log if FIPS mode is initialized
 - make aes-ctr cipher modes work in the FIPS mode



From mitr at fedoraproject.org  Thu Apr 30 12:06:21 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 30 Apr 2009 12:06:21 +0000 (UTC)
Subject: rpms/stunnel/devel stunnel-4.27-aliasing.patch, NONE,
	1.1 stunnel.spec, 1.57, 1.58
Message-ID: <20090430120621.1778770133@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27501

Modified Files:
	stunnel.spec 
Added Files:
	stunnel-4.27-aliasing.patch 
Log Message:
* Wed Apr 29 2009 Miloslav Trma?? <mitr at redhat.com> - 4.27-2
- Avoid aliasing undefined by ISO C


stunnel-4.27-aliasing.patch:

--- NEW FILE stunnel-4.27-aliasing.patch ---
diff -urN stunnel/src/libwrap.c stunnel-4.27/src/libwrap.c
--- stunnel/src/libwrap.c	2009-04-16 10:48:49.000000000 +0200
+++ stunnel-4.27/src/libwrap.c	2009-04-29 11:34:05.000000000 +0200
@@ -246,7 +246,7 @@
         s_log(LOG_ERR, "control type != SCM_RIGHTS");
         return -1;
     }
-    *recvfd=*((int *)CMSG_DATA(cmptr));
+    memcpy(&recvfd, CMSG_DATA(cmptr), sizeof(int));
 #else
     if(msg.msg_accrightslen==sizeof(int))
         *recvfd=newfd;
@@ -273,7 +273,7 @@
     cmptr->cmsg_len=CMSG_LEN(sizeof(int));
     cmptr->cmsg_level=SOL_SOCKET;
     cmptr->cmsg_type=SCM_RIGHTS;
-    *((int *)CMSG_DATA(cmptr))=sendfd;
+    memcpy(CMSG_DATA(cmptr), &sendfd, sizeof(int));
 #else
     msg.msg_accrights=(caddr_t)&sendfd;
     msg.msg_accrightslen=sizeof(int);


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- stunnel.spec	16 Apr 2009 17:54:31 -0000	1.57
+++ stunnel.spec	30 Apr 2009 12:05:50 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Version: 4.27
-Release: 1
+Release: 2
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,6 +14,7 @@ Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
 Patch0: stunnel-4.27-authpriv.patch
 Patch1: stunnel-4.27-sample.patch
+Patch2: stunnel-4.27-aliasing.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -27,6 +28,7 @@ in conjunction with imapd to create an S
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
+%patch2 -p1 -b .aliasing
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@@ -79,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Wed Apr 29 2009 Miloslav Trma?? <mitr at redhat.com> - 4.27-2
+- Avoid aliasing undefined by ISO C
+
 * Thu Apr 16 2009 Miloslav Trma?? <mitr at redhat.com> - 4.27-1
 - Update to stunnel-4.27.
 



From mschwendt at fedoraproject.org  Thu Apr 30 12:11:31 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 30 Apr 2009 12:11:31 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.25,1.26
Message-ID: <20090430121131.45CDD70133@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28300

Modified Files:
	rc-modified 
Log Message:
enhance the check of providers that are obsoleted by other pkgs


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rc-modified	2 Apr 2009 20:46:56 -0000	1.25
+++ rc-modified	30 Apr 2009 12:11:29 -0000	1.26
@@ -227,18 +227,23 @@
                     resolved_by_newest = False
                     for po in resolve_sack:# look through and make sure any of our answers are newest-only
 
-                        # 2nd stage handling of obsoletes. Only keep providers,
-                        # which are not obsolete. If no provider is left, the
-                        # dep is unresolved.
+                        # 2nd stage handling of obsoletes. If provider is
+                        # obsolete, check that a pkg which obsoletes it,
+                        # is newest.
                         thispkgobsdict = {}
                         if haveCheckForObsolete:
                             try:
                                 thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
                                 if thispkgobsdict.has_key(po.pkgtup):
-                                    continue
+                                    for pkgtup in thispkgobsdict[po.pkgtup]:
+                                        if pkgtup in pkgtuplist:
+                                            resolved_by_newest = True
+                                            break
                             except AttributeError:
                                 pass
                         
+                        if resolved_by_newest:
+                            break
                         if po.pkgtup in pkgtuplist:
                             if not self.rawhidehack:
                                 resolved_by_newest = True



From limb at fedoraproject.org  Thu Apr 30 12:12:49 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 12:12:49 +0000 (UTC)
Subject: rpms/drupal/devel .cvsignore, 1.18, 1.19 drupal.spec, 1.23,
	1.24 sources, 1.19, 1.20
Message-ID: <20090430121249.6DDCB70133@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28234

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
Update to 6.11, SA-CORE-2009-005.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	26 Feb 2009 13:37:42 -0000	1.18
+++ .cvsignore	30 Apr 2009 12:12:19 -0000	1.19
@@ -1 +1 @@
-drupal-6.10.tar.gz
+drupal-6.11.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- drupal.spec	26 Feb 2009 13:37:42 -0000	1.23
+++ drupal.spec	30 Apr 2009 12:12:19 -0000	1.24
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.10
+Version:  6.11
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 6.11-1
+- Update to 6.11, SA-CORE-2009-005.
+
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-2
+- Added SELinux/sendmail note to README, BZ 497642.
+
 * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-1
 - Update to 6.10, SA-CORE-2009-003.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	26 Feb 2009 13:37:42 -0000	1.19
+++ sources	30 Apr 2009 12:12:19 -0000	1.20
@@ -1 +1 @@
-d8f222c260556b5d7c3ff41bdd251b3c  drupal-6.10.tar.gz
+6a341807b83c4e48f50ce7921562402c  drupal-6.11.tar.gz



From caolanm at fedoraproject.org  Thu Apr 30 12:18:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 30 Apr 2009 12:18:28 +0000 (UTC)
Subject: rpms/hunspell-pt/devel .cvsignore, 1.17, 1.18 hunspell-pt.spec, 1.30,
	1.31 sources, 1.19, 1.20
Message-ID: <20090430121828.1B91C70133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28945

Modified Files:
	.cvsignore hunspell-pt.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	10 Mar 2009 10:39:28 -0000	1.17
+++ .cvsignore	30 Apr 2009 12:17:57 -0000	1.18
@@ -1,2 +1,2 @@
-pt_BR-2008-07-07C.zip
 hunspell-pt_PT-20090309.tar.gz
+pt_BR-2009-03-30AOC.zip


Index: hunspell-pt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/hunspell-pt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- hunspell-pt.spec	10 Mar 2009 10:39:28 -0000	1.30
+++ hunspell-pt.spec	30 Apr 2009 12:17:57 -0000	1.31
@@ -1,10 +1,10 @@
 Name: hunspell-pt
 Summary: Portuguese hunspell dictionaries
-%define upstreamid 20090309
+%define upstreamid 20090330
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20090309.tar.gz
-Source1: http://www.deso-se.com.br/downloads/pt_BR-2008-07-07C.zip
+Source1: http://www.broffice.org/files/pt_BR-2009-03-30AOC.zip
 Group: Applications/Text
 URL: http://www.broffice.org/verortografico/baixar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Apr 30 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090330-1
+- latest pt_BR version
+
 * Tue Mar 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090309-1
 - latest pt_PT version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	10 Mar 2009 10:39:28 -0000	1.19
+++ sources	30 Apr 2009 12:17:57 -0000	1.20
@@ -1,2 +1,2 @@
-4c113481e574c7fd3496855b98662eb3  pt_BR-2008-07-07C.zip
 ce4a36a835baa32fc358f578d5529832  hunspell-pt_PT-20090309.tar.gz
+d1e5d505443607dc3f35b71625572efd  pt_BR-2009-03-30AOC.zip



From limb at fedoraproject.org  Thu Apr 30 12:20:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 12:20:44 +0000 (UTC)
Subject: rpms/drupal/F-10 drupal.spec,1.22,1.23 sources,1.18,1.19
Message-ID: <20090430122044.126D570133@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29202/F-10

Modified Files:
	drupal.spec sources 
Log Message:
Update to 6.11, SA-CORE-2009-005.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/drupal.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- drupal.spec	26 Feb 2009 13:45:34 -0000	1.22
+++ drupal.spec	30 Apr 2009 12:20:13 -0000	1.23
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.10
+Version:  6.11
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 6.11-1
+- Update to 6.11, SA-CORE-2009-005.
+
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-2
+- Added SELinux/sendmail note to README, BZ 497642.
+
 * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-1
 - Update to 6.10, SA-CORE-2009-003.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	26 Feb 2009 13:45:34 -0000	1.18
+++ sources	30 Apr 2009 12:20:13 -0000	1.19
@@ -1 +1 @@
-d8f222c260556b5d7c3ff41bdd251b3c  drupal-6.10.tar.gz
+6a341807b83c4e48f50ce7921562402c  drupal-6.11.tar.gz



From limb at fedoraproject.org  Thu Apr 30 12:20:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 12:20:44 +0000 (UTC)
Subject: rpms/drupal/F-11 drupal.spec,1.23,1.24 sources,1.19,1.20
Message-ID: <20090430122044.37BF170133@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29202/F-11

Modified Files:
	drupal.spec sources 
Log Message:
Update to 6.11, SA-CORE-2009-005.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-11/drupal.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- drupal.spec	26 Feb 2009 13:37:42 -0000	1.23
+++ drupal.spec	30 Apr 2009 12:20:13 -0000	1.24
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.10
+Version:  6.11
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 6.11-1
+- Update to 6.11, SA-CORE-2009-005.
+
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-2
+- Added SELinux/sendmail note to README, BZ 497642.
+
 * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-1
 - Update to 6.10, SA-CORE-2009-003.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	26 Feb 2009 13:37:42 -0000	1.19
+++ sources	30 Apr 2009 12:20:13 -0000	1.20
@@ -1 +1 @@
-d8f222c260556b5d7c3ff41bdd251b3c  drupal-6.10.tar.gz
+6a341807b83c4e48f50ce7921562402c  drupal-6.11.tar.gz



From limb at fedoraproject.org  Thu Apr 30 12:20:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 12:20:44 +0000 (UTC)
Subject: rpms/drupal/F-9 drupal.spec,1.22,1.23 sources,1.18,1.19
Message-ID: <20090430122044.8AD8870133@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29202/F-9

Modified Files:
	drupal.spec sources 
Log Message:
Update to 6.11, SA-CORE-2009-005.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-9/drupal.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- drupal.spec	26 Feb 2009 13:45:34 -0000	1.22
+++ drupal.spec	30 Apr 2009 12:20:14 -0000	1.23
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.10
+Version:  6.11
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 6.11-1
+- Update to 6.11, SA-CORE-2009-005.
+
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-2
+- Added SELinux/sendmail note to README, BZ 497642.
+
 * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-1
 - Update to 6.10, SA-CORE-2009-003.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	26 Feb 2009 13:45:34 -0000	1.18
+++ sources	30 Apr 2009 12:20:14 -0000	1.19
@@ -1 +1 @@
-d8f222c260556b5d7c3ff41bdd251b3c  drupal-6.10.tar.gz
+6a341807b83c4e48f50ce7921562402c  drupal-6.11.tar.gz



From limb at fedoraproject.org  Thu Apr 30 12:22:12 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 12:22:12 +0000 (UTC)
Subject: rpms/drupal/EL-5 .cvsignore, 1.3, 1.4 drupal.spec, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <20090430122212.E2C5F70133@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29492

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
Update to 5.17, SA-CORE-2009-005.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Feb 2009 13:45:34 -0000	1.3
+++ .cvsignore	30 Apr 2009 12:21:42 -0000	1.4
@@ -1 +1 @@
-drupal-5.16.tar.gz
+drupal-5.17.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/drupal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- drupal.spec	26 Feb 2009 13:45:34 -0000	1.15
+++ drupal.spec	30 Apr 2009 12:21:42 -0000	1.16
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.16
+Version:  5.17
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 5.17-1
+- Upgrade to 5.15, DRUPAL-SA-CORE-2009-005.
+
 * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 5.16-1
 - Upgrade to 5.16, DRUPAL-SA-CORE-2009-004.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	26 Feb 2009 13:45:34 -0000	1.15
+++ sources	30 Apr 2009 12:21:42 -0000	1.16
@@ -1 +1 @@
-b8b603a5dbf5e7f280ed6e1521ca9bae  drupal-5.16.tar.gz
+14d5aec31f6878b959015d038280c266  drupal-5.17.tar.gz



From limb at fedoraproject.org  Thu Apr 30 12:23:53 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 12:23:53 +0000 (UTC)
Subject: rpms/drupal/EL-4 drupal.spec,1.15,1.16 sources,1.15,1.16
Message-ID: <20090430122353.CA87F7013B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30037

Modified Files:
	drupal.spec sources 
Log Message:
Update to 5.17, SA-CORE-2009-005.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/drupal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- drupal.spec	26 Feb 2009 13:45:33 -0000	1.15
+++ drupal.spec	30 Apr 2009 12:23:23 -0000	1.16
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.16
+Version:  5.17
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 5.17-1
+- Upgrade to 5.15, DRUPAL-SA-CORE-2009-005.
+
 * Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 5.16-1
 - Upgrade to 5.16, DRUPAL-SA-CORE-2009-004.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	26 Feb 2009 13:45:33 -0000	1.15
+++ sources	30 Apr 2009 12:23:23 -0000	1.16
@@ -1 +1 @@
-b8b603a5dbf5e7f280ed6e1521ca9bae  drupal-5.16.tar.gz
+14d5aec31f6878b959015d038280c266  drupal-5.17.tar.gz



From sbose at fedoraproject.org  Thu Apr 30 12:26:13 2009
From: sbose at fedoraproject.org (Sumit Bose)
Date: Thu, 30 Apr 2009 12:26:13 +0000 (UTC)
Subject: rpms/ctdb/devel ctdb-ppc64_libdir.patch,NONE,1.1 ctdb.spec,1.5,1.6
Message-ID: <20090430122613.9F7DF70133@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31188

Modified Files:
	ctdb.spec 
Added Files:
	ctdb-ppc64_libdir.patch 
Log Message:
fixed a ppc64 build issue


ctdb-ppc64_libdir.patch:

--- NEW FILE ctdb-ppc64_libdir.patch ---
>From 8f9f392be864d841a82a0a82586bd078fd1c4402 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Thu, 30 Apr 2009 14:07:31 +0200
Subject: [PATCH] add more 64bit plattforms to configure.ac

---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index ebddd37..1b7ac49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_DEFUN([SMB_ENABLE], [echo -n ""])
 AC_CONFIG_SRCDIR([server/ctdbd.c])
 
 case `uname -m` in
-  x86_64)
+  x86_64|ppc64|powerpc64)
     libdir='${exec_prefix}/lib64'
     ;;
   *)
-- 
1.6.0.6



Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ctdb.spec	30 Apr 2009 11:14:39 -0000	1.5
+++ ctdb.spec	30 Apr 2009 12:25:43 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
 Version: 1.0.79
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://ctdb.samba.org/
@@ -18,6 +18,8 @@ Source0: %{name}-%{version}.tar.bz2
 Patch1: ctdb-no_default_runlevel.patch
 # sent to samba-technical: http://lists.samba.org/archive/samba-technical/2009-April/064391.html
 Patch2: ctdb-AC_INIT.patch
+# sent to samba-technical: http://lists.samba.org/archive/samba-technical/2009-April/064396.html
+Patch3: ctdb-ppc64_libdir.patch
 
 Requires: chkconfig coreutils psmisc
 Requires: fileutils sed
@@ -54,6 +56,7 @@ and use CTDB instead.
 %setup -T -D -n ctdb-%{version} -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -135,6 +138,9 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Thu Apr 30 2009 Sumit Bose <sbose at redhat.com> - 1.0.79-2
+ - fixed a ppc64 build issue
+
 * Wed Apr 29 2009 Sumit Bose <sbose at redhat.com> - 1.0.79-1
  - Update to ctdb version 1.0.79
 



From mcpierce at fedoraproject.org  Thu Apr 30 12:50:01 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Thu, 30 Apr 2009 12:50:01 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler/devel rubygem-rufus-scheduler.spec,
	NONE, 1.1
Message-ID: <20090430125001.450F670133@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2027

Added Files:
	rubygem-rufus-scheduler.spec 
Log Message:
Added spec file.



--- NEW FILE rubygem-rufus-scheduler.spec ---
# Generated from rufus-scheduler-1.0.11.gem by gem2rpm -*- rpm-spec -*-
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname rufus-scheduler
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:       Scheduler for Ruby (at, cron and every jobs)
Name:          rubygem-%{gemname}
Version:       1.0.13
Release:       3%{?dist}
Group:         Development/Languages
License:       MIT
URL:           http://openwferu.rubyforge.org/scheduler.html
Source0:       http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:      ruby(abi) = 1.8
Requires:      rubygems
BuildRequires: rubygems
BuildArch:     noarch
Provides:      rubygem(%{gemname}) = %{version}

%description
Scheduler for Ruby (at, cron and every jobs), formerly known as
'openwferu-scheduler'


%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/CHANGELOG.txt
%doc %{geminstdir}/CREDITS.txt
%doc %{geminstdir}/LICENSE.txt
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Thu Apr 30 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-3
- First official build for Fedora.

* Wed Apr 29 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-2
- Added reference to license file.
- Removed ruby_sitelib macro.
- Added ruby(abi) Requires.

* Mon Feb 02 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-1
- Release 1.0.13 of rufus-scheduler.

* Thu Dec 18 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.12-1
- Release 1.0.12 of the gem.

* Mon Nov 24 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.11-1
- Initial package



From gd at fedoraproject.org  Thu Apr 30 12:51:58 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 30 Apr 2009 12:51:58 +0000 (UTC)
Subject: rpms/samba/devel samba-3.4.0pre1-nss_wins.patch, NONE,
	1.1 .cvsignore, 1.61, 1.62 samba-3.2.0pre1-grouppwd.patch, 1.2,
	1.3 samba-3.2.0pre1-pipedir.patch, 1.1,
	1.2 samba-3.2.5-inotify.patch, 1.1, 1.2 samba.spec, 1.184,
	1.185 sources, 1.65, 1.66
Message-ID: <20090430125158.183AE70133@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2287

Modified Files:
	.cvsignore samba-3.2.0pre1-grouppwd.patch 
	samba-3.2.0pre1-pipedir.patch samba-3.2.5-inotify.patch 
	samba.spec sources 
Added Files:
	samba-3.4.0pre1-nss_wins.patch 
Log Message:
Update to 3.4.0pre1.

Guenther


samba-3.4.0pre1-nss_wins.patch:

--- NEW FILE samba-3.4.0pre1-nss_wins.patch ---
commit eee446a94841a5df97b3a47c7076ef52fb5ccdcf
Author:     G??nther Deschner <gd at samba.org>
AuthorDate: Thu Apr 30 14:16:01 2009 +0200
Commit:     G??nther Deschner <gd at samba.org>
CommitDate: Thu Apr 30 14:18:09 2009 +0200

    s3-nss_wins: Fix unresolved ldb symbols in libnss_wins.so.
    
    The objects for this module should probably be cleaned up once.
    
    Guenther
---
 source3/Makefile.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f765818..8bf29dd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1063,7 +1063,7 @@ SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \
 
 WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
 	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
-	$(LIBNDR_GEN_OBJ0)
+	$(LIBNDR_GEN_OBJ0) $(LDB_OBJ)
 
 PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
 		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	29 Apr 2009 14:26:55 -0000	1.61
+++ .cvsignore	30 Apr 2009 12:51:27 -0000	1.62
@@ -1 +1 @@
-samba-3.3.4.tar.gz
+samba-3.4.0pre1.tar.gz

samba-3.2.0pre1-grouppwd.patch:

Index: samba-3.2.0pre1-grouppwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.2.0pre1-grouppwd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- samba-3.2.0pre1-grouppwd.patch	30 Jan 2009 17:31:45 -0000	1.2
+++ samba-3.2.0pre1-grouppwd.patch	30 Apr 2009 12:51:27 -0000	1.3
@@ -1,5 +1,5 @@
---- samba-3.2.0pre1/source/winbindd/winbindd_group.c.star	2007-10-03 17:40:31.000000000 -0400
-+++ samba-3.2.0pre1/source/winbindd/winbindd_group.c	2007-10-03 17:40:46.000000000 -0400
+--- samba-3.2.0pre1/source3/winbindd/winbindd_group.c.star	2007-10-03 17:40:31.000000000 -0400
++++ samba-3.2.0pre1/source3/winbindd/winbindd_group.c	2007-10-03 17:40:46.000000000 -0400
 @@ -215,7 +215,7 @@
  	/* Group name and password */
  

samba-3.2.0pre1-pipedir.patch:

Index: samba-3.2.0pre1-pipedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.2.0pre1-pipedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- samba-3.2.0pre1-pipedir.patch	8 Oct 2007 21:13:15 -0000	1.1
+++ samba-3.2.0pre1-pipedir.patch	30 Apr 2009 12:51:27 -0000	1.2
@@ -1,5 +1,5 @@
---- samba-3.2.0pre1/source/nsswitch/winbind_struct_protocol.h.pipedir	2007-10-03 15:32:23.000000000 -0400
-+++ samba-3.2.0pre1/source/nsswitch/winbind_struct_protocol.h	2007-10-03 15:33:13.000000000 -0400
+--- samba-3.2.0pre1/nsswitch/winbind_struct_protocol.h.pipedir	2007-10-03 15:32:23.000000000 -0400
++++ samba-3.2.0pre1/nsswitch/winbind_struct_protocol.h	2007-10-03 15:33:13.000000000 -0400
 @@ -24,7 +24,7 @@
   * is needed for launchd support -- jpeach.
   */

samba-3.2.5-inotify.patch:

Index: samba-3.2.5-inotify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.2.5-inotify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- samba-3.2.5-inotify.patch	27 Nov 2008 21:19:30 -0000	1.1
+++ samba-3.2.5-inotify.patch	30 Apr 2009 12:51:27 -0000	1.2
@@ -1,6 +1,6 @@
 === modified file 'source/smbd/notify_inotify.c'
---- source/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
-+++ source/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
+--- source3/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
++++ source3/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
 @@ -66,6 +66,7 @@
  	struct sys_notify_context *ctx;
  	int fd;


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- samba.spec	29 Apr 2009 14:26:55 -0000	1.184
+++ samba.spec	30 Apr 2009 12:51:27 -0000	1.185
@@ -1,14 +1,16 @@
-%define main_release 36
-%define samba_version 3.3.4
+%define main_release 37
+%define samba_version 3.4.0
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
-%define pre_release %nil
+#%define pre_release %nil
+%define pre_release pre1
 
 %define samba_release 0%{pre_release}.%{main_release}%{?dist}
 
 %define enable_talloc 0
 %define enable_tdb    0
 
+%define samba_source source3
 Summary: Server and Client software to interoperate with Windows machines
 Name: samba
 Epoch: 0
@@ -46,6 +48,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.4.0pre1-nss_wins.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -250,10 +253,11 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .nss_wins
 
-mv source/VERSION source/VERSION.orig
-sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
-cd source
+mv %samba_source/VERSION %samba_source/VERSION.orig
+sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
+cd %samba_source
 script/mkversion.sh
 cd ..
 
@@ -262,7 +266,7 @@ rm -fr examples/LDAP/smbldap-tools-*/
 
 
 %build
-cd source
+cd %samba_source
 sh autogen.sh
 %ifarch i386 sparc
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -308,19 +312,17 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DL
 #	--with-aio-support \
 
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \
-	pch
+make  pch
 
-make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \
-	CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
-	all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
+make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
+	%{?_smp_mflags} \
+	all ../nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
 
-make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \
-	CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
+make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
+	%{?_smp_mflags} \
 	-C lib/netapi/examples
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
-	debug2html smbfilter bin/cifs.upcall
+make  debug2html smbfilter bin/cifs.upcall
 
 
 %install
@@ -342,7 +344,7 @@ mkdir -p $RPM_BUILD_ROOT/var/run/winbind
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/samba
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-cd source
+cd %samba_source
 
 %makeinstall \
 	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
@@ -366,7 +368,7 @@ cd ..
 
 # Install other stuff
 install -m644 packaging/Fedora/smb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 %samba_source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m755 packaging/Fedora/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
@@ -382,9 +384,9 @@ install -m644 examples/LDAP/samba.schema
 
 # winbind
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 ln -sf /%{_lib}/libnss_winbind.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so
-install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
+install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2
 ln -sf /%{_lib}/libnss_wins.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so
 
 # libraries {
@@ -392,20 +394,20 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_
 
 %if %enable_talloc
 # talloc
-cd source/lib/talloc
+cd lib/talloc
 # just to get the correct .pc file generated
 ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../../..
-install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/
+cd ../..
+install -m 644 lib/talloc/talloc.pc $build_libdir/pkgconfig/
 %endif
 
 %if %enable_tdb
 # tdb
-cd source/lib/tdb
+cd lib/tdb
 # just to get the correct .pc file generated
 ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../../..
-install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/
+cd ../..
+install -m 644 lib/tdb/tdb.pc $build_libdir/pkgconfig/
 %endif
 
 # make install puts libraries in the wrong place
@@ -414,7 +416,7 @@ install -m 644 source/lib/tdb/tdb.pc $bu
 list="smbclient smbsharemodes netapi talloc tdb wbclient"
 build_libdir="$RPM_BUILD_ROOT%{_libdir}"
 for i in $list; do
-	install -m 644 source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
+	install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
 done
 
 
@@ -430,11 +432,11 @@ install -m644 %{SOURCE4} $RPM_BUILD_ROOT
 install -m755 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 $RPM_BUILD_ROOT/usr/sbin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
-install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
+install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png
-install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png
+install -m 644 %samba_source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png
 
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
@@ -879,6 +881,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Apr 30 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0pre1-0.36
+- Update to 3.4.0pre1
+
 * Wed Apr 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.4-0.36
 - Update to 3.3.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	29 Apr 2009 14:26:55 -0000	1.65
+++ sources	30 Apr 2009 12:51:27 -0000	1.66
@@ -1 +1 @@
-1443165edb7cb3f56f1e77aec1ee3266  samba-3.3.4.tar.gz
+144f28202edef96b87f31db9cdd0cf5b  samba-3.4.0pre1.tar.gz



From gd at fedoraproject.org  Thu Apr 30 12:55:22 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 30 Apr 2009 12:55:22 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.185,1.186
Message-ID: <20090430125522.E1F9070133@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2791

Modified Files:
	samba.spec 
Log Message:
add correct main_release number in changelog.

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- samba.spec	30 Apr 2009 12:51:27 -0000	1.185
+++ samba.spec	30 Apr 2009 12:54:52 -0000	1.186
@@ -881,7 +881,7 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Thu Apr 30 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0pre1-0.36
+* Thu Apr 30 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0pre1-0.37
 - Update to 3.4.0pre1
 
 * Wed Apr 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.4-0.36



From plindner at fedoraproject.org  Thu Apr 30 13:07:22 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Thu, 30 Apr 2009 13:07:22 +0000 (UTC)
Subject: rpms/memcached/F-11 memcached.spec,1.14,1.15 sources,1.5,1.6
Message-ID: <20090430130722.68EDB70133@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669

Modified Files:
	memcached.spec sources 
Log Message:
upgrade to memcached-1.2.8, Addresses CVE-2009-1255


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-11/memcached.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- memcached.spec	26 Feb 2009 00:17:25 -0000	1.14
+++ memcached.spec	30 Apr 2009 13:06:52 -0000	1.15
@@ -6,8 +6,8 @@
 %define groupname  memcached
 
 Name:           memcached
-Version:        1.2.6
-Release:        2%{?dist}
+Version:        1.2.8
+Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -196,6 +196,10 @@ fi
 
 
 %changelog
+* Wed Apr 29 2009 Paul Lindner <lindner at inuus.com> - 1.2.8-1
+- Upgrade to memcached-1.2.8
+- Addresses CVE-2009-1255
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Jul 2008 18:26:28 -0000	1.5
+++ sources	30 Apr 2009 13:06:52 -0000	1.6
@@ -1 +1 @@
-200d22f7ac2d114f74a6904552e9eb70  memcached-1.2.6.tar.gz
+e5a4ee04e517a5cad110f29e4490e4ab  memcached-1.2.8.tar.gz



From mcpierce at fedoraproject.org  Thu Apr 30 13:08:59 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Thu, 30 Apr 2009 13:08:59 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler/F-10 rubygem-rufus-scheduler.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430130859.D863270133@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4803

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-rufus-scheduler.spec 
Log Message:
Release 1.0.13 of Rufus Scheduler.
First official build for Fedora.



--- NEW FILE rubygem-rufus-scheduler.spec ---
# Generated from rufus-scheduler-1.0.11.gem by gem2rpm -*- rpm-spec -*-
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname rufus-scheduler
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:       Scheduler for Ruby (at, cron and every jobs)
Name:          rubygem-%{gemname}
Version:       1.0.13
Release:       3%{?dist}
Group:         Development/Languages
License:       MIT
URL:           http://openwferu.rubyforge.org/scheduler.html
Source0:       http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:      ruby(abi) = 1.8
Requires:      rubygems
BuildRequires: rubygems
BuildArch:     noarch
Provides:      rubygem(%{gemname}) = %{version}

%description
Scheduler for Ruby (at, cron and every jobs), formerly known as
'openwferu-scheduler'


%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/CHANGELOG.txt
%doc %{geminstdir}/CREDITS.txt
%doc %{geminstdir}/LICENSE.txt
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Thu Apr 30 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-3
- First official build for Fedora.

* Wed Apr 29 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-2
- Added reference to license file.
- Removed ruby_sitelib macro.
- Added ruby(abi) Requires.

* Mon Feb 02 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-1
- Release 1.0.13 of rufus-scheduler.

* Thu Dec 18 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.12-1
- Release 1.0.12 of the gem.

* Mon Nov 24 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.11-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:41:21 -0000	1.1
+++ .cvsignore	30 Apr 2009 13:08:29 -0000	1.2
@@ -0,0 +1 @@
+rufus-scheduler-1.0.13.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:41:21 -0000	1.1
+++ sources	30 Apr 2009 13:08:29 -0000	1.2
@@ -0,0 +1 @@
+274ed6e966f706c28f851ad712c9d2d2  rufus-scheduler-1.0.13.gem



From plindner at fedoraproject.org  Thu Apr 30 13:17:38 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Thu, 30 Apr 2009 13:17:38 +0000 (UTC)
Subject: rpms/memcached/F-10 memcached.spec,1.13,1.14 sources,1.5,1.6
Message-ID: <20090430131738.5711970133@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5998

Modified Files:
	memcached.spec sources 
Log Message:
upgrade to memcached-1.2.8, Addresses CVE-2009-1255


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-10/memcached.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- memcached.spec	29 Jul 2008 18:26:28 -0000	1.13
+++ memcached.spec	30 Apr 2009 13:17:07 -0000	1.14
@@ -1,246 +1 @@
-%define selinux_variants mls strict targeted 
-%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
-%define modulename memcached
-
-%define username   memcached
-%define groupname  memcached
-
-Name:           memcached
-Version:        1.2.6
-Release:        1%{?dist}
-Summary:        High Performance, Distributed Memory Object Cache
-
-Group:          System Environment/Daemons
-License:        BSD
-URL:            http://www.danga.com/memcached/
-Source0:        http://www.danga.com/memcached/dist/%{name}-%{version}.tar.gz
-
-# custom init script
-Source1:        memcached.sysv
-
-# SELinux files
-Source10:       %{modulename}.te
-Source11:       %{modulename}.fc
-Source12:       %{modulename}.if
-
-# Fixes
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libevent-devel
-BuildRequires:  perl(Test::More)
-
-Requires: initscripts
-Requires: libevent
-Requires(pre):  shadow-utils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/service
-
-%description
-memcached is a high-performance, distributed memory object caching
-system, generic in nature, but intended for use in speeding up dynamic
-web applications by alleviating database load.
-
-
-%package selinux
-Summary:        SELinux policy module supporting memcached
-Group:          System Environment/Base
-BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
-%if "%{selinux_policyver}" != ""
-Requires:       selinux-policy >= %{selinux_policyver}
-%endif
-Requires:       %{name} = %{version}-%{release}
-Requires(post):  policycoreutils
-Requires(postun): policycoreutils
-
-%description selinux
-SELinux policy module supporting memcached.
-
-
-%prep
-%setup -q
-mkdir SELinux
-cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} SELinux/
-
-
-%build
-%configure --enable-threads
-
-make %{?_smp_mflags}
-
-pushd SELinux
-for selinuxvariant in %{selinux_variants}; do
-    make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-    mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
-    make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-popd
-
-
-%check
-# remove failing test that doesn't work in
-# build systems
-rm -f t/daemonize.t 
-make test
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"                                         
-# remove memcached-debug
-rm -f %{buildroot}/%{_bindir}/memcached-debug
-
-# Perl script for monitoring memcached
-install -Dp -m0755 scripts/memcached-tool %{buildroot}%{_bindir}/memcached-tool
-
-# Init script
-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/memcached
-
-# Default configs
-mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig
-cat <<EOF >%{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-PORT="11211"
-USER="%{username}"
-MAXCONN="1024"
-CACHESIZE="64"
-OPTIONS=""
-EOF
-
-# pid directory
-mkdir -p %{buildroot}/%{_localstatedir}/run/memcached
-
-# Install SELinux policy modules
-pushd SELinux
-for selinuxvariant in %{selinux_variants}; do
-    install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-    install -p -m 644 %{modulename}.pp.${selinuxvariant} \
-        %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
-done
-popd
-
-# Hardlink identical policy module packages together
-/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%pre
-getent group %{groupname} >/dev/null || groupadd -r %{groupname}
-getent passwd %{username} >/dev/null || \
-useradd -r -g %{groupname} -d %{_localstatedir}/run/memcached \
-    -s /sbin/nologin -c "Memcached daemon" %{username}
-exit 0
-
-
-%post
-/sbin/chkconfig --add %{name}
-
-
-%preun
-if [ "$1" = 0 ] ; then
-    /sbin/service %{name} stop > /dev/null 2>&1
-    /sbin/chkconfig --del %{name}
-fi
-exit 0
-
-
-%postun
-if [ "$1" -ge 1 ]; then
-    /sbin/service %{name} condrestart > /dev/null 2>&1
-fi
-exit 0
-
-
-%post selinux
-# Install SELinux policy modules
-for selinuxvariant in %{selinux_variants}
-do
-  /usr/sbin/semodule -s ${selinuxvariant} -i \
-    %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
-done
-/usr/sbin/semanage port -a -t memcached_port_t -p tcp 11211 &> /dev/null || :
-/sbin/fixfiles -R %{name} restore || :
-
-
-%postun selinux
-# Clean up after package removal
-if [ $1 -eq 0 ]; then
-  /usr/sbin/semanage port -d -t memcached_port_t -p tcp 11211 &> /dev/null || :
-  # Remove SELinux policy modules
-  for selinuxvariant in %{selinux_variants}
-  do
-    /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
-  done
-  /sbin/fixfiles -R %{name} restore || :
-fi
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO doc/CONTRIBUTORS doc/*.txt
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-
-%dir %attr(755,%{username},%{groupname}) %{_localstatedir}/run/memcached
-%{_bindir}/memcached-tool
-%{_bindir}/memcached
-%{_mandir}/man1/memcached.1*
-%{_initrddir}/memcached
-
-
-%files selinux
-%defattr(-,root,root,0755)
-%doc SELinux/*.te SELinux/*.fc SELinux/*.if
-%{_datadir}/selinux/*/%{modulename}.pp
-
-
-%changelog
-* Tue Jul 29 2008 Paul Lindner <lindner at inuus.com> - 1.2.6-1
-- Upgrade to memcached-1.2.6
-
-* Tue Mar  4 2008 Paul Lindner <lindner at inuus.com> - 1.2.5-1
-- Upgrade to memcached-1.2.5
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-4
-- Autorebuild for GCC 4.3
-
-* Sun Jan 27 2008 Paul Lindner <lindner at inuus.com> - 1.2.4-3
-- Adjust libevent dependencies
-
-* Sat Dec 22 2007 Paul Lindner <lindner at inuus.com> - 1.2.4-2
-- Upgrade to memcached-1.2.4
-
-* Fri Sep 07 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.2.3-8
-- Add selinux policies
-- Create our own system user
-
-* Mon Aug  6 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-7
-- Fix problem with -P and -d flag combo on x86_64
-- Fix init script for FC-6
-
-* Fri Jul 13 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-4
-- Remove test that fails in fedora build system on ppc64
-
-* Sat Jul  7 2007 root <lindner at inuus.com> - 1.2.3-2
-- Upgrade to 1.2.3 upstream
-- Adjust make install to preserve man page timestamp
-- Conform with LSB init scripts standards, add force-reload
-
-* Wed Jul  4 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-5
-- Use /var/run/memcached/ directory to hold PID file
-
-* Sat May 12 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-4
-- Remove tabs from spec file, rpmlint reports no more errors
-
-* Thu May 10 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-3
-- Enable build-time regression tests
-- add dependency on initscripts
-- remove memcached-debug (not needed in dist)
-- above suggestions from Bernard Johnson
-
-* Mon May  7 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-2
-- Tidyness improvements suggested by Ruben Kerkhof in bugzilla #238994
-
-* Fri May  4 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-1
-- Initial spec file created via rpmdev-newspec
+e5a4ee04e517a5cad110f29e4490e4ab  memcached-1.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Jul 2008 18:26:28 -0000	1.5
+++ sources	30 Apr 2009 13:17:08 -0000	1.6
@@ -1 +1 @@
-200d22f7ac2d114f74a6904552e9eb70  memcached-1.2.6.tar.gz
+e5a4ee04e517a5cad110f29e4490e4ab  memcached-1.2.8.tar.gz



From plindner at fedoraproject.org  Thu Apr 30 13:20:06 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Thu, 30 Apr 2009 13:20:06 +0000 (UTC)
Subject: rpms/memcached/F-10 memcached.spec,1.14,1.15
Message-ID: <20090430132006.8D5B970133@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6305

Modified Files:
	memcached.spec 
Log Message:
upgrade to memcached-1.2.8, Addresses CVE-2009-1255


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-10/memcached.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- memcached.spec	30 Apr 2009 13:17:07 -0000	1.14
+++ memcached.spec	30 Apr 2009 13:19:36 -0000	1.15
@@ -1 +1,253 @@
-e5a4ee04e517a5cad110f29e4490e4ab  memcached-1.2.8.tar.gz
+%define selinux_variants mls strict targeted 
+%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
+%define modulename memcached
+
+%define username   memcached
+%define groupname  memcached
+
+Name:           memcached
+Version:        1.2.8
+Release:        1%{?dist}
+Summary:        High Performance, Distributed Memory Object Cache
+
+Group:          System Environment/Daemons
+License:        BSD
+URL:            http://www.danga.com/memcached/
+Source0:        http://www.danga.com/memcached/dist/%{name}-%{version}.tar.gz
+
+# custom init script
+Source1:        memcached.sysv
+
+# SELinux files
+Source10:       %{modulename}.te
+Source11:       %{modulename}.fc
+Source12:       %{modulename}.if
+
+# Fixes
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libevent-devel
+BuildRequires:  perl(Test::More)
+
+Requires: initscripts
+Requires: libevent
+Requires(pre):  shadow-utils
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/service
+
+%description
+memcached is a high-performance, distributed memory object caching
+system, generic in nature, but intended for use in speeding up dynamic
+web applications by alleviating database load.
+
+
+%package selinux
+Summary:        SELinux policy module supporting memcached
+Group:          System Environment/Base
+BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
+%if "%{selinux_policyver}" != ""
+Requires:       selinux-policy >= %{selinux_policyver}
+%endif
+Requires:       %{name} = %{version}-%{release}
+Requires(post):  policycoreutils
+Requires(postun): policycoreutils
+
+%description selinux
+SELinux policy module supporting memcached.
+
+
+%prep
+%setup -q
+mkdir SELinux
+cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} SELinux/
+
+
+%build
+%configure --enable-threads
+
+make %{?_smp_mflags}
+
+pushd SELinux
+for selinuxvariant in %{selinux_variants}; do
+    make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+    mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
+    make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+done
+popd
+
+
+%check
+# remove failing test that doesn't work in
+# build systems
+rm -f t/daemonize.t 
+make test
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"                                         
+# remove memcached-debug
+rm -f %{buildroot}/%{_bindir}/memcached-debug
+
+# Perl script for monitoring memcached
+install -Dp -m0755 scripts/memcached-tool %{buildroot}%{_bindir}/memcached-tool
+
+# Init script
+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/memcached
+
+# Default configs
+mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig
+cat <<EOF >%{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+PORT="11211"
+USER="%{username}"
+MAXCONN="1024"
+CACHESIZE="64"
+OPTIONS=""
+EOF
+
+# pid directory
+mkdir -p %{buildroot}/%{_localstatedir}/run/memcached
+
+# Install SELinux policy modules
+pushd SELinux
+for selinuxvariant in %{selinux_variants}; do
+    install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+    install -p -m 644 %{modulename}.pp.${selinuxvariant} \
+        %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
+done
+popd
+
+# Hardlink identical policy module packages together
+/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%pre
+getent group %{groupname} >/dev/null || groupadd -r %{groupname}
+getent passwd %{username} >/dev/null || \
+useradd -r -g %{groupname} -d %{_localstatedir}/run/memcached \
+    -s /sbin/nologin -c "Memcached daemon" %{username}
+exit 0
+
+
+%post
+/sbin/chkconfig --add %{name}
+
+
+%preun
+if [ "$1" = 0 ] ; then
+    /sbin/service %{name} stop > /dev/null 2>&1
+    /sbin/chkconfig --del %{name}
+fi
+exit 0
+
+
+%postun
+if [ "$1" -ge 1 ]; then
+    /sbin/service %{name} condrestart > /dev/null 2>&1
+fi
+exit 0
+
+
+%post selinux
+# Install SELinux policy modules
+for selinuxvariant in %{selinux_variants}
+do
+  /usr/sbin/semodule -s ${selinuxvariant} -i \
+    %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
+done
+/usr/sbin/semanage port -a -t memcached_port_t -p tcp 11211 &> /dev/null || :
+/sbin/fixfiles -R %{name} restore || :
+
+
+%postun selinux
+# Clean up after package removal
+if [ $1 -eq 0 ]; then
+  /usr/sbin/semanage port -d -t memcached_port_t -p tcp 11211 &> /dev/null || :
+  # Remove SELinux policy modules
+  for selinuxvariant in %{selinux_variants}
+  do
+    /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+  done
+  /sbin/fixfiles -R %{name} restore || :
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO doc/CONTRIBUTORS doc/*.txt
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+
+%dir %attr(755,%{username},%{groupname}) %{_localstatedir}/run/memcached
+%{_bindir}/memcached-tool
+%{_bindir}/memcached
+%{_mandir}/man1/memcached.1*
+%{_initrddir}/memcached
+
+
+%files selinux
+%defattr(-,root,root,0755)
+%doc SELinux/*.te SELinux/*.fc SELinux/*.if
+%{_datadir}/selinux/*/%{modulename}.pp
+
+
+%changelog
+* Wed Apr 29 2009 Paul Lindner <lindner at inuus.com> - 1.2.8-1
+- Upgrade to memcached-1.2.8
+- Addresses CVE-2009-1255
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jul 29 2008 Paul Lindner <lindner at inuus.com> - 1.2.6-1
+- Upgrade to memcached-1.2.6
+
+* Tue Mar  4 2008 Paul Lindner <lindner at inuus.com> - 1.2.5-1
+- Upgrade to memcached-1.2.5
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-4
+- Autorebuild for GCC 4.3
+
+* Sun Jan 27 2008 Paul Lindner <lindner at inuus.com> - 1.2.4-3
+- Adjust libevent dependencies
+
+* Sat Dec 22 2007 Paul Lindner <lindner at inuus.com> - 1.2.4-2
+- Upgrade to memcached-1.2.4
+
+* Fri Sep 07 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.2.3-8
+- Add selinux policies
+- Create our own system user
+
+* Mon Aug  6 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-7
+- Fix problem with -P and -d flag combo on x86_64
+- Fix init script for FC-6
+
+* Fri Jul 13 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-4
+- Remove test that fails in fedora build system on ppc64
+
+* Sat Jul  7 2007 root <lindner at inuus.com> - 1.2.3-2
+- Upgrade to 1.2.3 upstream
+- Adjust make install to preserve man page timestamp
+- Conform with LSB init scripts standards, add force-reload
+
+* Wed Jul  4 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-5
+- Use /var/run/memcached/ directory to hold PID file
+
+* Sat May 12 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-4
+- Remove tabs from spec file, rpmlint reports no more errors
+
+* Thu May 10 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-3
+- Enable build-time regression tests
+- add dependency on initscripts
+- remove memcached-debug (not needed in dist)
+- above suggestions from Bernard Johnson
+
+* Mon May  7 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-2
+- Tidyness improvements suggested by Ruben Kerkhof in bugzilla #238994
+
+* Fri May  4 2007 Paul Lindner <lindner at inuus.com> - 1.2.2-1
+- Initial spec file created via rpmdev-newspec



From leigh123linux at fedoraproject.org  Thu Apr 30 13:21:02 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 30 Apr 2009 13:21:02 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.6, 1.7 qbittorrent.spec, 1.14, 
	1.15 sources, 1.6, 1.7
Message-ID: <20090430132102.06E9C70133@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6515

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Thu Apr 30 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-0.1.20090429svn
- Correct version & release tag
- Update to svn 2341 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Apr 2009 09:49:21 -0000	1.6
+++ .cvsignore	30 Apr 2009 13:20:31 -0000	1.7
@@ -1 +1 @@
-qbittorrent-2340svn.tar.gz
+qbittorrent-2341svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qbittorrent.spec	29 Apr 2009 11:43:45 -0000	1.14
+++ qbittorrent.spec	30 Apr 2009 13:20:31 -0000	1.15
@@ -1,10 +1,10 @@
-%define svn_rev 2340
+%define svn_rev 2341
 
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.3.3
-Release: 3.4.%{svn_rev}svn%{?dist}
+Version: 1.4.0
+Release: 0.1.20090429svn%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -86,16 +86,20 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
-* Wed Apr 29 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.4.2340svn
+* Thu Apr 30 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-0.1.20090429svn
+- Correct version & release tag
+- Update to svn 2341 
+
+* Wed Apr 29 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-3.4.2340svn
 - Rebuild against the new rb_libtorrent version 0.14.3
 
-* Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.3.2340svn
+* Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-3.3.2340svn
 - Fix command to generate tarball
 
-* Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.2.2340svn
+* Sun Apr 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-3.2.2340svn
 - Fixes peference UI bug and splash screen  (launchpad 366957)
 
-* Sat Apr 25 2009 Leigh Scott <leigh123linux at googlemail.com> -1.3.3-3.1.1511bzr
+* Sat Apr 25 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-3.1.1511bzr
 - Update to bzr 1511 
 
 * Thu Apr 9 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.3-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Apr 2009 09:49:21 -0000	1.6
+++ sources	30 Apr 2009 13:20:31 -0000	1.7
@@ -1 +1 @@
-10a09a5bdf709ecc69ec9873b670a4d2  qbittorrent-2340svn.tar.gz
+31ee113239db03061d41807eb5ed5cf0  qbittorrent-2341svn.tar.gz



From michich at fedoraproject.org  Thu Apr 30 13:22:58 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Thu, 30 Apr 2009 13:22:58 +0000 (UTC)
Subject: rpms/icecream/devel .cvsignore, 1.5, 1.6 icecream.spec, 1.20,
	1.21 sources, 1.5, 1.6
Message-ID: <20090430132258.E0CE370133@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6849

Modified Files:
	.cvsignore icecream.spec sources 
Log Message:
* Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
- Upstream release 0.9.4.
- Dropped merged patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Feb 2009 12:22:04 -0000	1.5
+++ .cvsignore	30 Apr 2009 13:22:28 -0000	1.6
@@ -1,2 +1,2 @@
-icecc-0.9.3.tar.bz2
+icecc-0.9.4.tar.bz2
 icecream-manpages.tar.bz2


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- icecream.spec	5 Apr 2009 23:00:36 -0000	1.20
+++ icecream.spec	30 Apr 2009 13:22:28 -0000	1.21
@@ -1,5 +1,5 @@
 %if 0%{?fedora}
-%bcond_without  fedora
+%bcond_without	fedora
 %bcond_without	selinux
 %else
 %bcond_with	fedora
@@ -10,8 +10,8 @@
 
 
 Name:		icecream
-Version:	0.9.3
-Release:	6%{?dist}
+Version:	0.9.4
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,9 +29,6 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
-Patch2:		%{name}-0.9.3-fix-gcc44-ftbfs.patch
-Patch3:		%{name}-0.9.3-tighten-security.patch
-Patch4:		%{name}-0.9.3-fix-perms-of-cache.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,8 +50,8 @@ Requires(post):		chkconfig policycoreuti
 Requires(preun):	chkconfig initscripts policycoreutils 
 Requires(postun):	initscripts policycoreutils
 
-Provides:	group(icecream) = 44
-Provides:	user(icecream)  = 44
+Provides:	group(icecream)	= 44
+Provides:	user(icecream)	= 44
 
 
 # description copied from Debian icecc package
@@ -79,9 +76,6 @@ This package contains development files 
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -239,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
+- Upstream release 0.9.4.
+- Dropped merged patches.
+
 * Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
 - Fix wrong permissions on the cache dir preventing the jobs from being
   distributed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Feb 2009 12:22:04 -0000	1.5
+++ sources	30 Apr 2009 13:22:28 -0000	1.6
@@ -1,2 +1,2 @@
-34bb950331ef5256299a2de4cf402ea6  icecc-0.9.3.tar.bz2
+b52192df5aa3713910fdf481dda4119e  icecc-0.9.4.tar.bz2
 a3829775870d5b2b60b750a88ee835b7  icecream-manpages.tar.bz2



From mcpierce at fedoraproject.org  Thu Apr 30 13:24:15 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Thu, 30 Apr 2009 13:24:15 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler/devel .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090430132415.E0A7A70133@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7159

Modified Files:
	.cvsignore sources 
Log Message:
First official build of rubygem-rufus-scheduler.
Release 1.0.13 of Rufus Scheduler.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:41:21 -0000	1.1
+++ .cvsignore	30 Apr 2009 13:23:45 -0000	1.2
@@ -0,0 +1 @@
+rufus-scheduler-1.0.13.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:41:21 -0000	1.1
+++ sources	30 Apr 2009 13:23:45 -0000	1.2
@@ -0,0 +1 @@
+274ed6e966f706c28f851ad712c9d2d2  rufus-scheduler-1.0.13.gem



From michich at fedoraproject.org  Thu Apr 30 13:32:32 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Thu, 30 Apr 2009 13:32:32 +0000 (UTC)
Subject: rpms/icecream/F-11 icecream.spec, 1.20, 1.21 sources, 1.5,
	1.6 icecream-0.9.3-fix-gcc44-ftbfs.patch, 1.1,
	NONE icecream-0.9.3-fix-perms-of-cache.patch, 1.1,
	NONE icecream-0.9.3-tighten-security.patch, 1.1, NONE
Message-ID: <20090430133232.A254870133@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9848

Modified Files:
	icecream.spec sources 
Removed Files:
	icecream-0.9.3-fix-gcc44-ftbfs.patch 
	icecream-0.9.3-fix-perms-of-cache.patch 
	icecream-0.9.3-tighten-security.patch 
Log Message:
* Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
- Upstream release 0.9.4.
- Dropped merged patches.



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- icecream.spec	5 Apr 2009 23:00:36 -0000	1.20
+++ icecream.spec	30 Apr 2009 13:32:02 -0000	1.21
@@ -1,5 +1,5 @@
 %if 0%{?fedora}
-%bcond_without  fedora
+%bcond_without	fedora
 %bcond_without	selinux
 %else
 %bcond_with	fedora
@@ -10,8 +10,8 @@
 
 
 Name:		icecream
-Version:	0.9.3
-Release:	6%{?dist}
+Version:	0.9.4
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,9 +29,6 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
-Patch2:		%{name}-0.9.3-fix-gcc44-ftbfs.patch
-Patch3:		%{name}-0.9.3-tighten-security.patch
-Patch4:		%{name}-0.9.3-fix-perms-of-cache.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,8 +50,8 @@ Requires(post):		chkconfig policycoreuti
 Requires(preun):	chkconfig initscripts policycoreutils 
 Requires(postun):	initscripts policycoreutils
 
-Provides:	group(icecream) = 44
-Provides:	user(icecream)  = 44
+Provides:	group(icecream)	= 44
+Provides:	user(icecream)	= 44
 
 
 # description copied from Debian icecc package
@@ -79,9 +76,6 @@ This package contains development files 
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -239,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
+- Upstream release 0.9.4.
+- Dropped merged patches.
+
 * Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
 - Fix wrong permissions on the cache dir preventing the jobs from being
   distributed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Feb 2009 12:22:04 -0000	1.5
+++ sources	30 Apr 2009 13:32:02 -0000	1.6
@@ -1,2 +1,2 @@
-34bb950331ef5256299a2de4cf402ea6  icecc-0.9.3.tar.bz2
+b52192df5aa3713910fdf481dda4119e  icecc-0.9.4.tar.bz2
 a3829775870d5b2b60b750a88ee835b7  icecream-manpages.tar.bz2


--- icecream-0.9.3-fix-gcc44-ftbfs.patch DELETED ---


--- icecream-0.9.3-fix-perms-of-cache.patch DELETED ---


--- icecream-0.9.3-tighten-security.patch DELETED ---



From mcpierce at fedoraproject.org  Thu Apr 30 13:32:34 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Thu, 30 Apr 2009 13:32:34 +0000 (UTC)
Subject: rpms/rubygem-rufus-scheduler/F-11 rubygem-rufus-scheduler.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090430133234.F0F8870133@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9781

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-rufus-scheduler.spec 
Log Message:
Initial build for Fedora.
Release 1.0.13 of Rufus Scheduler.



--- NEW FILE rubygem-rufus-scheduler.spec ---
# Generated from rufus-scheduler-1.0.11.gem by gem2rpm -*- rpm-spec -*-
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname rufus-scheduler
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:       Scheduler for Ruby (at, cron and every jobs)
Name:          rubygem-%{gemname}
Version:       1.0.13
Release:       3%{?dist}
Group:         Development/Languages
License:       MIT
URL:           http://openwferu.rubyforge.org/scheduler.html
Source0:       http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:      ruby(abi) = 1.8
Requires:      rubygems
BuildRequires: rubygems
BuildArch:     noarch
Provides:      rubygem(%{gemname}) = %{version}

%description
Scheduler for Ruby (at, cron and every jobs), formerly known as
'openwferu-scheduler'


%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/CHANGELOG.txt
%doc %{geminstdir}/CREDITS.txt
%doc %{geminstdir}/LICENSE.txt
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Thu Apr 30 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-3
- First official build for Fedora.

* Wed Apr 29 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-2
- Added reference to license file.
- Removed ruby_sitelib macro.
- Added ruby(abi) Requires.

* Mon Feb 02 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.13-1
- Release 1.0.13 of rufus-scheduler.

* Thu Dec 18 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.12-1
- Release 1.0.12 of the gem.

* Mon Nov 24 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.11-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:41:21 -0000	1.1
+++ .cvsignore	30 Apr 2009 13:32:04 -0000	1.2
@@ -0,0 +1 @@
+rufus-scheduler-1.0.13.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rufus-scheduler/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:41:21 -0000	1.1
+++ sources	30 Apr 2009 13:32:04 -0000	1.2
@@ -0,0 +1 @@
+274ed6e966f706c28f851ad712c9d2d2  rufus-scheduler-1.0.13.gem



From michich at fedoraproject.org  Thu Apr 30 13:34:41 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Thu, 30 Apr 2009 13:34:41 +0000 (UTC)
Subject: rpms/icecream/F-10 icecream.spec, 1.12, 1.13 sources, 1.4,
	1.5 icecream-0.9.3-fix-gcc44-ftbfs.patch, 1.1,
	NONE icecream-0.9.3-fix-perms-of-cache.patch, 1.1,
	NONE icecream-0.9.3-tighten-security.patch, 1.1, NONE
Message-ID: <20090430133441.5B9F870133@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10282

Modified Files:
	icecream.spec sources 
Removed Files:
	icecream-0.9.3-fix-gcc44-ftbfs.patch 
	icecream-0.9.3-fix-perms-of-cache.patch 
	icecream-0.9.3-tighten-security.patch 
Log Message:
* Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
- Upstream release 0.9.4.
- Dropped merged patches.



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-10/icecream.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- icecream.spec	13 Apr 2009 15:38:56 -0000	1.12
+++ icecream.spec	30 Apr 2009 13:34:10 -0000	1.13
@@ -1,5 +1,5 @@
 %if 0%{?fedora}
-%bcond_without  fedora
+%bcond_without	fedora
 %bcond_without	selinux
 %else
 %bcond_with	fedora
@@ -10,8 +10,8 @@
 
 
 Name:		icecream
-Version:	0.9.3
-Release:	6%{?dist}
+Version:	0.9.4
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,9 +29,6 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
-Patch2:		%{name}-0.9.3-fix-gcc44-ftbfs.patch
-Patch3:		%{name}-0.9.3-tighten-security.patch
-Patch4:		%{name}-0.9.3-fix-perms-of-cache.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,8 +50,8 @@ Requires(post):		chkconfig policycoreuti
 Requires(preun):	chkconfig initscripts policycoreutils 
 Requires(postun):	initscripts policycoreutils
 
-Provides:	group(icecream) = 44
-Provides:	user(icecream)  = 44
+Provides:	group(icecream)	= 44
+Provides:	user(icecream)	= 44
 
 
 # description copied from Debian icecc package
@@ -79,9 +76,6 @@ This package contains development files 
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -239,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
+- Upstream release 0.9.4.
+- Dropped merged patches.
+
 * Mon Apr 06 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-6
 - Fix wrong permissions on the cache dir preventing the jobs from being
   distributed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Feb 2009 21:16:26 -0000	1.4
+++ sources	30 Apr 2009 13:34:10 -0000	1.5
@@ -1,2 +1,2 @@
-34bb950331ef5256299a2de4cf402ea6  icecc-0.9.3.tar.bz2
+b52192df5aa3713910fdf481dda4119e  icecc-0.9.4.tar.bz2
 a3829775870d5b2b60b750a88ee835b7  icecream-manpages.tar.bz2


--- icecream-0.9.3-fix-gcc44-ftbfs.patch DELETED ---


--- icecream-0.9.3-fix-perms-of-cache.patch DELETED ---


--- icecream-0.9.3-tighten-security.patch DELETED ---



From kasal at fedoraproject.org  Thu Apr 30 14:26:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 30 Apr 2009 14:26:51 +0000 (UTC)
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.80,1.81
Message-ID: <20090430142651.837F77012A@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/libgtk-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21014

Modified Files:
	libgtk-java.spec 
Log Message:
fix multilib problem with an example script (#342171)


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- libgtk-java.spec	25 Feb 2009 15:32:22 -0000	1.80
+++ libgtk-java.spec	30 Apr 2009 14:26:21 -0000	1.81
@@ -18,7 +18,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.7
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License:	LGPLv2
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -26,6 +26,7 @@ Source:		http://ftp.gnome.org/pub/GNOME/
 Patch0:		libgtk-java-Drawable-region.patch
 Patch1:		%{name}-gjavah.patch
 Patch2:		%{name}-gslice.patch
+Patch3:		%{name}-multilib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
@@ -57,6 +58,7 @@ Development part of %{name}.
 %patch0
 %patch1
 %patch2 -b .gslice
+%patch3 -p1
 touch aclocal.m4
 touch configure Makefile.in
 
@@ -134,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 27 2009 Stepan Kasal <skasal at redhat.com> - 2.8.7-11
+- fix multilib problem with an example script (#342171)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.7-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -148,7 +153,7 @@ Rebuild for new GCC 4.4 to fix broken de
 - Resolves: #435200
 
 * Fri Feb  1 2008 Stepan Kasal <skasal at redhat.com> - 2.8.7-6
-- remove runExample.sh from exmaple_DATA to prevent collision
+- remove runExample.sh from example_DATA to prevent collision
 - rebuild for new gcc
 
 * Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 2.8.7-5



From caolanm at fedoraproject.org  Thu Apr 30 14:34:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 30 Apr 2009 14:34:02 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch, NONE,
	1.1 openoffice.org.spec, 1.1905, 1.1906
Message-ID: <20090430143402.A94F17012A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22921/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch 
Log Message:
don't screw over the secondary arch people if they get around to building OOo

openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch ---
Index: typesconfig/typesconfig.c
===================================================================
--- sal.orig/typesconfig/typesconfig.c	(revision 269860)
+++ sal/typesconfig/typesconfig.c	(working copy)
@@ -163,20 +163,26 @@
 |*	Letzte Aenderung
 |*
 *************************************************************************/
-static int dummy(void* unused);
+#if defined(IA64) || defined(ARM32)
 
 int GetAtAddress( Type eT, void* p )
 {
-#if defined(IA64) || defined(ARM32)
   switch ( eT )
   {
   case t_char:		return *((char*)p);
-  case t_short:		if ((long)p % sizeof(short)) abort(); else return *((short*)p);
-  case t_int:		if ((long)p % sizeof(int)) abort(); else return *((int*)p);
-  case t_long:		if ((long)p % sizeof(long)) abort(); else return *((long*)p);
-  case t_double:	if ((long)p % sizeof(double)) abort(); else return *((double*)p);
+  case t_short:		if ((long)p % sizeof(short)) raise(SIGBUS); else return *((short*)p);
+  case t_int:		if ((long)p % sizeof(int)) raise(SIGBUS); else return *((int*)p);
+  case t_long:		if ((long)p % sizeof(long)) raise(SIGBUS); else return *((long*)p);
+  case t_double:	if ((long)p % sizeof(double)) raise(SIGBUS); else return *((double*)p);
   }
+  abort();
+}
+
 #else
+static int dummy(void* unused);
+
+int GetAtAddress( Type eT, void* p )
+{
   switch ( eT )
   {
   case t_char: { char x = *(char*)p; return dummy(&x); }
@@ -185,7 +191,6 @@
   case t_long: { long x = *(long*)p; return dummy(&x); }
   case t_double: { double x = *(double*)p; return dummy(&x); }
   }
-#endif
   abort();
 }
 
@@ -195,6 +200,7 @@
     return 0;
 }
 
+#endif
 /*************************************************************************
 |*
 |*	SetAtAddress()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1905
retrieving revision 1.1906
diff -u -p -r1.1905 -r1.1906
--- openoffice.org.spec	29 Apr 2009 20:32:45 -0000	1.1905
+++ openoffice.org.spec	30 Apr 2009 14:33:32 -0000	1.1906
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -138,6 +138,7 @@ Patch62: openoffice.org-3.1.0.ooo101354.
 Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
+Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
 %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
+%patch66 -p0 -b .ooo100469.sal.ia64_arm.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4129,6 +4131,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 30 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
+- add in the ia64 and arm fixes for the secondary arch people
+
 * Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch



From caolanm at fedoraproject.org  Thu Apr 30 14:34:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 30 Apr 2009 14:34:02 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch, NONE,
	1.1 openoffice.org.spec, 1.1904, 1.1905
Message-ID: <20090430143402.587927012A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22921/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch 
Log Message:
don't screw over the secondary arch people if they get around to building OOo

openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch ---
Index: typesconfig/typesconfig.c
===================================================================
--- sal.orig/typesconfig/typesconfig.c	(revision 269860)
+++ sal/typesconfig/typesconfig.c	(working copy)
@@ -163,20 +163,26 @@
 |*	Letzte Aenderung
 |*
 *************************************************************************/
-static int dummy(void* unused);
+#if defined(IA64) || defined(ARM32)
 
 int GetAtAddress( Type eT, void* p )
 {
-#if defined(IA64) || defined(ARM32)
   switch ( eT )
   {
   case t_char:		return *((char*)p);
-  case t_short:		if ((long)p % sizeof(short)) abort(); else return *((short*)p);
-  case t_int:		if ((long)p % sizeof(int)) abort(); else return *((int*)p);
-  case t_long:		if ((long)p % sizeof(long)) abort(); else return *((long*)p);
-  case t_double:	if ((long)p % sizeof(double)) abort(); else return *((double*)p);
+  case t_short:		if ((long)p % sizeof(short)) raise(SIGBUS); else return *((short*)p);
+  case t_int:		if ((long)p % sizeof(int)) raise(SIGBUS); else return *((int*)p);
+  case t_long:		if ((long)p % sizeof(long)) raise(SIGBUS); else return *((long*)p);
+  case t_double:	if ((long)p % sizeof(double)) raise(SIGBUS); else return *((double*)p);
   }
+  abort();
+}
+
 #else
+static int dummy(void* unused);
+
+int GetAtAddress( Type eT, void* p )
+{
   switch ( eT )
   {
   case t_char: { char x = *(char*)p; return dummy(&x); }
@@ -185,7 +191,6 @@
   case t_long: { long x = *(long*)p; return dummy(&x); }
   case t_double: { double x = *(double*)p; return dummy(&x); }
   }
-#endif
   abort();
 }
 
@@ -195,6 +200,7 @@
     return 0;
 }
 
+#endif
 /*************************************************************************
 |*
 |*	SetAtAddress()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1904
retrieving revision 1.1905
diff -u -p -r1.1904 -r1.1905
--- openoffice.org.spec	29 Apr 2009 20:32:44 -0000	1.1904
+++ openoffice.org.spec	30 Apr 2009 14:33:31 -0000	1.1905
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -138,6 +138,7 @@ Patch62: openoffice.org-3.1.0.ooo101354.
 Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
+Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
 %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
+%patch66 -p0 -b .ooo100469.sal.ia64_arm.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4129,6 +4131,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 30 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
+- add in the ia64 and arm fixes for the secondary arch people
+
 * Tue Apr 27 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.1.0-11.2
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch



From lkundrak at fedoraproject.org  Thu Apr 30 14:52:08 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 30 Apr 2009 14:52:08 +0000 (UTC)
Subject: rpms/starlab/devel starlab.spec,1.4,1.5
Message-ID: <20090430145208.D34F07012A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/starlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26144

Modified Files:
	starlab.spec 
Log Message:
* Thu Apr 30 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at fedoraproject.org> - 4.4.3-6
- Rename freeze to sl-freeze (#472616)



Index: starlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/starlab/devel/starlab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- starlab.spec	1 Mar 2009 13:56:46 -0000	1.4
+++ starlab.spec	30 Apr 2009 14:51:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           starlab
 Version:        4.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Software Environment for Collisional Stellar Dynamics
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@ Patch2:         starlab-4.4.3-buildcwd.p
 Patch3:         starlab-4.4.3-autoconf263.patch
 Patch4:         starlab-4.4.3-tstarplot.patch
 Patch5:         starlab-4.4.3-gcc44.patch
+Patch6:         starlab-4.4.3-freeze.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -143,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/extract_snap
 %{_bindir}/flat_hermite
 %{_bindir}/flatten
-%{_bindir}/freeze
+%{_bindir}/sl-freeze
 %{_bindir}/freezebin
 %{_bindir}/get_densities
 %{_bindir}/get_std_center
@@ -290,6 +291,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at fedoraproject.org> - 4.4.3-6
+- Rename freeze to sl-freeze (#472616)
+
 * Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at fedoraproject.org> - 4.4.3-5
 - Fix build with GCC 4.4
 



From lkundrak at fedoraproject.org  Thu Apr 30 15:02:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 30 Apr 2009 15:02:23 +0000 (UTC)
Subject: rpms/starlab/devel starlab-4.4.3-freeze.patch,NONE,1.1
Message-ID: <20090430150223.E9F0770133@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/starlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28917

Added Files:
	starlab-4.4.3-freeze.patch 
Log Message:
Add missing patch

starlab-4.4.3-freeze.patch:

--- NEW FILE starlab-4.4.3-freeze.patch ---
Rename freeze: https://bugzilla.redhat.com/show_bug.cgi?id=472616

diff -urp starlab-4.4.3.freeze/doc/Primer.tex starlab-4.4.3/doc/Primer.tex
--- starlab-4.4.3.freeze/doc/Primer.tex	1999-06-12 21:19:21.000000000 +0200
+++ starlab-4.4.3/doc/Primer.tex	2009-04-30 16:40:02.000000000 +0200
@@ -159,13 +159,13 @@ running small test simulations.  For exa
 effects in a cold collapse could be done as follows:
 
 {\codes
-\quad mkplummer -n 100 | freeze | leapfrog -t 2 -a 0.02 -e 0.05 | lagrad
+\quad mkplummer -n 100 | sl-freeze | leapfrog -t 2 -a 0.02 -e 0.05 | lagrad
 }
 \medskip
 
 Here {\tt \ mkplummer\ } creates initial conditions for a 100-body
 system, according to a Plummer model distribution.  The resulting data
-are piped into the next module, {\tt \ freeze}, which simply sets all
+are piped into the next module, {\tt \ sl-freeze}, which simply sets all
 velocities to zero, while preserving the positions.  Following that,
 the data are read in by the leapfrog integrator, which is asked to
 evolve the system for a period of 2 time units, with a (constant) step
diff -urp starlab-4.4.3.freeze/etc/papers/Preview.tex starlab-4.4.3/etc/papers/Preview.tex
--- starlab-4.4.3.freeze/etc/papers/Preview.tex	1999-06-12 21:19:23.000000000 +0200
+++ starlab-4.4.3/etc/papers/Preview.tex	2009-04-30 16:40:29.000000000 +0200
@@ -826,13 +826,13 @@ of relaxation effects in a cold collapse
 }
 
 {\codes
-mkplummer -n 100 | freeze | leapfrog -t 2 -d 0.02 -e 0.05 | lagrad
+mkplummer -n 100 | sl-freeze | leapfrog -t 2 -d 0.02 -e 0.05 | lagrad
 }
 \medskip
 
 Here {\tt \ mkplummer\ } creates initial conditions for a 100-body system,
 according to a Plummer model distribution.  The resulting data are
-piped into the next module, {\tt \ freeze\ }, which simply sets all
+piped into the next module, {\tt \ sl-freeze\ }, which simply sets all
 velocities to zero, while preserving the positions.  Following that,
 the data are read in by the leapfrog integrator, which is asked to
 evolve the system for a period of 2 time units, with a stepsize of
diff -urp starlab-4.4.3.freeze/src/node/dyn/hdyn/xutil/Demo.csh starlab-4.4.3/src/node/dyn/hdyn/xutil/Demo.csh
--- starlab-4.4.3.freeze/src/node/dyn/hdyn/xutil/Demo.csh	2000-09-18 03:33:01.000000000 +0200
+++ starlab-4.4.3/src/node/dyn/hdyn/xutil/Demo.csh	2009-04-30 16:40:51.000000000 +0200
@@ -1,13 +1,13 @@
 #!/bin/tcsh -f
 
-# Usage:  Demo.csh  N [10]  fb [0.1]  freeze [no]  dt [2^-5]
+# Usage:  Demo.csh  N [10]  fb [0.1]  sl-freeze [no]  dt [2^-5]
 
 set N = 10
 if ($#argv > 0) set N = $1
 set f = 0
 if ($#argv > 1) set f = $2
 alias FREEZE cat
-if ($#argv > 2) alias FREEZE freeze
+if ($#argv > 2) alias FREEZE sl-freeze
 set D = -5
 if ($#argv > 3) set D = $4
 
diff -urp starlab-4.4.3.freeze/TOOLS starlab-4.4.3/TOOLS
--- starlab-4.4.3.freeze/TOOLS	2009-04-30 16:27:18.000000000 +0200
+++ starlab-4.4.3/TOOLS	2009-04-30 16:39:43.000000000 +0200
@@ -81,7 +81,7 @@ Note:  Most tools are just simple interf
     extract_snap     find and print the last snapshot, or the first
                         snapshot following a specified time
     flatten          flatten a dyn tree to a single-level linked list
-    freeze           set all velocities to zero, leaving positions
+    sl-freeze        set all velocities to zero, leaving positions
                         unchanged 
     lagrad           compute Lagrangian (mass) radii for an N-body
                         system 



From rdieter at fedoraproject.org  Thu Apr 30 15:11:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 15:11:58 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.29,1.30
Message-ID: <20090430151159.850BB7012A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31130

Modified Files:
	xine-lib.spec 
Log Message:
bump-n-rebuild



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xine-lib.spec	10 Apr 2009 17:14:44 -0000	1.29
+++ xine-lib.spec	30 Apr 2009 15:11:26 -0000	1.30
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/



From notting at fedoraproject.org  Thu Apr 30 16:08:07 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 30 Apr 2009 16:08:07 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.208,1.209
Message-ID: <20090430160807.5433D7012A@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13318

Modified Files:
	comps-f11.xml.in 
Log Message:
add cupspk where s-c-printer is installed (#498402)


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- comps-f11.xml.in	29 Apr 2009 18:07:21 -0000	1.208
+++ comps-f11.xml.in	30 Apr 2009 16:07:36 -0000	1.209
@@ -354,6 +354,7 @@
       <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-network</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
+      <packagereq type="default">cupspk</packagereq>
       <packagereq type="default">system-config-services</packagereq>
       <packagereq type="default">system-config-users</packagereq>
       <packagereq type="default">xorg-x11-utils</packagereq>
@@ -3373,6 +3374,7 @@
       <packagereq type="default">PolicyKit-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
+      <packagereq type="default">cupspk</packagereq>
       <packagereq type="default">xsettings-kde</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
@@ -4423,6 +4425,7 @@
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
+      <packagereq type="default">cupspk</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4583,6 +4586,7 @@
       <packagereq type="default">system-config-httpd</packagereq>
       <packagereq type="default">system-config-nfs</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
+      <packagereq type="default">cupspk</packagereq>
       <packagereq type="default">system-config-samba</packagereq>
       <packagereq type="default">system-config-services</packagereq>
       <packagereq type="optional">system-config-bind</packagereq>



From mclasen at fedoraproject.org  Thu Apr 30 16:23:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 30 Apr 2009 16:23:23 +0000 (UTC)
Subject: rpms/gtk2/F-11 gtk2.spec,1.371,1.372
Message-ID: <20090430162323.3B5527012A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16298

Modified Files:
	gtk2.spec 
Log Message:
Split xim into a separate submodule



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/gtk2.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- gtk2.spec	22 Apr 2009 15:42:15 -0000	1.371
+++ gtk2.spec	30 Apr 2009 16:22:52 -0000	1.372
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
@@ -93,9 +93,16 @@ Group: System Environment/Libraries
 Requires: gtk2 = %{version}-%{release}
 
 %description immodules
-The gtk2-immodules package contains input methods that are shipped as part
-of GTK+.
+The gtk2-immodules package contains standalone input methods that are shipped
+as part of GTK+.
 
+%package immodule-xim
+Summary: XIM support for GTK+
+Group: System Environment/Libraries
+Requires: gtk2 = %{version}-%{release}
+
+%description immodule-xim
+The gtk2-immodule-xim package contains XIM support for GTK+.
 
 %package devel
 Summary: Development files for GTK+
@@ -290,6 +297,14 @@ rm -rf $RPM_BUILD_ROOT
 %post immodules
 /usr/bin/update-gtk-immodules %{_host}
 
+%postun immodules
+/usr/bin/update-gtk-immodules %{_host}
+
+%post immodule-xim
+/usr/bin/update-gtk-immodules %{_host}
+
+%postun immodule-xim
+/usr/bin/update-gtk-immodules %{_host}
 
 %files -f gtk20.lang
 %defattr(-, root, root)
@@ -321,9 +336,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files immodules
 %defattr(-, root, root)
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/*.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-am-et.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cedilla.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cyrillic-translit.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-inuktitut.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ipa.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-multipress.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-thai.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so
 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
+%files immodule-xim
+%defattr(-, root, root)
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-xim.so
 
 %files devel -f gtk20-properties.lang
 %defattr(-, root, root)
@@ -347,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-4
+- Ship the xim immodule separately
+
 * Wed Apr 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.1-3
 - Don't open double browser windows from about dialog
 



From mtasaka at fedoraproject.org  Thu Apr 30 16:27:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 30 Apr 2009 16:27:01 +0000 (UTC)
Subject: rpms/rubygem-gettext/F-11 rubygem-gettext.spec,1.6,1.7
Message-ID: <20090430162701.846E17012A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16787/F-11

Modified Files:
	rubygem-gettext.spec 
Log Message:
* Fri May  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-3
- Mark LICENSE etc as %doc



Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/F-11/rubygem-gettext.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-gettext.spec	22 Apr 2009 14:43:49 -0000	1.6
+++ rubygem-gettext.spec	30 Apr 2009 16:26:30 -0000	1.7
@@ -13,7 +13,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	2.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
 
@@ -202,7 +202,7 @@ rake test
 %{_bindir}/rmsgmerge
 
 %dir %{geminstdir}/
-%{geminstdir}/[A-Z]*
+%doc %{geminstdir}/[A-Z]*
 %exclude %{geminstdir}/Rakefile
 %{geminstdir}/bin/
 %{geminstdir}/lib/
@@ -224,6 +224,9 @@ rake test
 
 
 %changelog
+* Fri May  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-3
+- Mark LICENSE etc as %%doc
+
 * Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Bump ruby-locale Requires version
 



From mtasaka at fedoraproject.org  Thu Apr 30 16:27:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 30 Apr 2009 16:27:01 +0000 (UTC)
Subject: rpms/rubygem-gettext/devel rubygem-gettext.spec,1.6,1.7
Message-ID: <20090430162701.D4D9670133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16787/devel

Modified Files:
	rubygem-gettext.spec 
Log Message:
* Fri May  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-3
- Mark LICENSE etc as %doc



Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/rubygem-gettext.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-gettext.spec	22 Apr 2009 14:43:51 -0000	1.6
+++ rubygem-gettext.spec	30 Apr 2009 16:26:30 -0000	1.7
@@ -13,7 +13,7 @@
 
 Name:		rubygem-%{gemname}
 Version:	2.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
 
@@ -202,7 +202,7 @@ rake test
 %{_bindir}/rmsgmerge
 
 %dir %{geminstdir}/
-%{geminstdir}/[A-Z]*
+%doc %{geminstdir}/[A-Z]*
 %exclude %{geminstdir}/Rakefile
 %{geminstdir}/bin/
 %{geminstdir}/lib/
@@ -224,6 +224,9 @@ rake test
 
 
 %changelog
+* Fri May  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-3
+- Mark LICENSE etc as %%doc
+
 * Wed Apr 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.1-2
 - Bump ruby-locale Requires version
 



From scop at fedoraproject.org  Thu Apr 30 16:51:13 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 30 Apr 2009 16:51:13 +0000 (UTC)
Subject: rpms/kid3/devel .cvsignore, 1.10, 1.11 kid3.spec, 1.26, 1.27 sources,
	1.10, 1.11 kid3-1.1-discogs_import.patch, 1.1, NONE
Message-ID: <20090430165113.AF6437012A@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kid3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19742

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-1.1-discogs_import.patch 
Log Message:
* Thu Apr 30 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.2-1
- Update to 1.2, discogs.com patch applied upstream.
- Use %find_lang --with-kde.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	25 Oct 2008 21:00:37 -0000	1.10
+++ .cvsignore	30 Apr 2009 16:50:43 -0000	1.11
@@ -1 +1 @@
-kid3-1.1.tar.gz
+kid3-1.2.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- kid3.spec	25 Feb 2009 11:19:51 -0000	1.26
+++ kid3.spec	30 Apr 2009 16:50:43 -0000	1.27
@@ -1,14 +1,12 @@
 Name:           kid3
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kid3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-# http://sf.net/tracker/index.php?func=detail&aid=2602860&group_id=70849&atid=529223
-Patch0:         %{name}-1.1-discogs_import.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel
@@ -32,7 +30,6 @@ looking for.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -44,13 +41,13 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 deb-kde4/kid3-kde4.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
+install -Dpm 644 deb/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
 
 # preserve desktop entry location for from < 0.8 upgrades
 mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
 rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
 
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 
 %clean
@@ -80,13 +77,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*x*/apps/kid3.png
 %{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_datadir}/kde4/apps/kid3/
-%lang(en) %{_kde4_docdir}/HTML/en/kid3/
-%lang(de) %{_kde4_docdir}/HTML/de/kid3/
+%{_kde4_appsdir}/kid3/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Thu Apr 30 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.2-1
+- Update to 1.2, discogs.com patch applied upstream.
+- Use %%find_lang --with-kde.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Oct 2008 21:00:37 -0000	1.10
+++ sources	30 Apr 2009 16:50:43 -0000	1.11
@@ -1 +1 @@
-c52034e24cb94d02c17b6701fa99a637  kid3-1.1.tar.gz
+fd2b741a9a5145f813dd2b32ed04c818  kid3-1.2.tar.gz


--- kid3-1.1-discogs_import.patch DELETED ---



From xavierb at fedoraproject.org  Thu Apr 30 17:22:36 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 30 Apr 2009 17:22:36 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/devel import.log, NONE,
	1.1 perl-MIME-Charset.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090430172236.C977C7012A@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-MIME-Charset/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25249/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MIME-Charset.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
perl-MIME-Charset-1_006_2-2_fc10:HEAD:perl-MIME-Charset-1.006.2-2.fc10.src.rpm:1241112010


--- NEW FILE perl-MIME-Charset.spec ---
Name:           perl-MIME-Charset
Version:        1.006.2
Release:        2%{?dist}
Summary:        Charset Informations for MIME
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/MIME-Charset/
Source0:        http://www.cpan.org/modules/by-module/MIME/MIME-Charset-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MIME::Charset provides informations about character sets used for MIME
messages on Internet.

%prep
%setup -q -n MIME-Charset-%{version}

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(MIME::Charset)$/d'
EOF

%global __perl_provides %{_builddir}/MIME-Charset-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC Changes COPYING GPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 28 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-2
- Filter duplicate Provides:.

* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-1
- Specfile autogenerated by cpanspec 1.77.
- Fix license.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:50:20 -0000	1.1
+++ .cvsignore	30 Apr 2009 17:22:06 -0000	1.2
@@ -0,0 +1 @@
+MIME-Charset-1.006.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:50:20 -0000	1.1
+++ sources	30 Apr 2009 17:22:06 -0000	1.2
@@ -0,0 +1 @@
+22a140a7f323518301d9998bf50e2e17  MIME-Charset-1.006.2.tar.gz



From xavierb at fedoraproject.org  Thu Apr 30 17:27:27 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 30 Apr 2009 17:27:27 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/EL-5 perl-MIME-Charset.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090430172727.EA3BF7012A@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-MIME-Charset/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368/EL-5

Modified Files:
	sources 
Added Files:
	perl-MIME-Charset.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-MIME-Charset.spec ---
Name:           perl-MIME-Charset
Version:        1.006.2
Release:        2%{?dist}
Summary:        Charset Informations for MIME
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/MIME-Charset/
Source0:        http://www.cpan.org/modules/by-module/MIME/MIME-Charset-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MIME::Charset provides informations about character sets used for MIME
messages on Internet.

%prep
%setup -q -n MIME-Charset-%{version}

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(MIME::Charset)$/d'
EOF

%global __perl_provides %{_builddir}/MIME-Charset-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC Changes COPYING GPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 28 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-2
- Filter duplicate Provides:.

* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-1
- Specfile autogenerated by cpanspec 1.77.
- Fix license.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:50:20 -0000	1.1
+++ sources	30 Apr 2009 17:26:57 -0000	1.2
@@ -0,0 +1 @@
+22a140a7f323518301d9998bf50e2e17  MIME-Charset-1.006.2.tar.gz



From xavierb at fedoraproject.org  Thu Apr 30 17:27:28 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 30 Apr 2009 17:27:28 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/F-9 perl-MIME-Charset.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090430172728.82C427012A@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-MIME-Charset/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368/F-9

Modified Files:
	sources 
Added Files:
	perl-MIME-Charset.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-MIME-Charset.spec ---
Name:           perl-MIME-Charset
Version:        1.006.2
Release:        2%{?dist}
Summary:        Charset Informations for MIME
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/MIME-Charset/
Source0:        http://www.cpan.org/modules/by-module/MIME/MIME-Charset-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MIME::Charset provides informations about character sets used for MIME
messages on Internet.

%prep
%setup -q -n MIME-Charset-%{version}

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(MIME::Charset)$/d'
EOF

%global __perl_provides %{_builddir}/MIME-Charset-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC Changes COPYING GPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 28 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-2
- Filter duplicate Provides:.

* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-1
- Specfile autogenerated by cpanspec 1.77.
- Fix license.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:50:20 -0000	1.1
+++ sources	30 Apr 2009 17:26:58 -0000	1.2
@@ -0,0 +1 @@
+22a140a7f323518301d9998bf50e2e17  MIME-Charset-1.006.2.tar.gz



From xavierb at fedoraproject.org  Thu Apr 30 17:27:28 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 30 Apr 2009 17:27:28 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/F-10 perl-MIME-Charset.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090430172728.1A5657012A@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-MIME-Charset/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368/F-10

Modified Files:
	sources 
Added Files:
	perl-MIME-Charset.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-MIME-Charset.spec ---
Name:           perl-MIME-Charset
Version:        1.006.2
Release:        2%{?dist}
Summary:        Charset Informations for MIME
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/MIME-Charset/
Source0:        http://www.cpan.org/modules/by-module/MIME/MIME-Charset-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MIME::Charset provides informations about character sets used for MIME
messages on Internet.

%prep
%setup -q -n MIME-Charset-%{version}

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(MIME::Charset)$/d'
EOF

%global __perl_provides %{_builddir}/MIME-Charset-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC Changes COPYING GPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 28 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-2
- Filter duplicate Provides:.

* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-1
- Specfile autogenerated by cpanspec 1.77.
- Fix license.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:50:20 -0000	1.1
+++ sources	30 Apr 2009 17:26:57 -0000	1.2
@@ -0,0 +1 @@
+22a140a7f323518301d9998bf50e2e17  MIME-Charset-1.006.2.tar.gz



From xavierb at fedoraproject.org  Thu Apr 30 17:27:28 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 30 Apr 2009 17:27:28 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/F-11 perl-MIME-Charset.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090430172728.4FCD07012A@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/perl-MIME-Charset/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368/F-11

Modified Files:
	sources 
Added Files:
	perl-MIME-Charset.spec 
Log Message:
Import into F-9, F-10, F-11 and EL-5


--- NEW FILE perl-MIME-Charset.spec ---
Name:           perl-MIME-Charset
Version:        1.006.2
Release:        2%{?dist}
Summary:        Charset Informations for MIME
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/MIME-Charset/
Source0:        http://www.cpan.org/modules/by-module/MIME/MIME-Charset-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MIME::Charset provides informations about character sets used for MIME
messages on Internet.

%prep
%setup -q -n MIME-Charset-%{version}

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(MIME::Charset)$/d'
EOF

%global __perl_provides %{_builddir}/MIME-Charset-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC Changes COPYING GPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Apr 28 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-2
- Filter duplicate Provides:.

* Fri Apr 24 2009 Xavier Bachelot <xavier at bachelot.org> 1.006.2-1
- Specfile autogenerated by cpanspec 1.77.
- Fix license.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:50:20 -0000	1.1
+++ sources	30 Apr 2009 17:26:58 -0000	1.2
@@ -0,0 +1 @@
+22a140a7f323518301d9998bf50e2e17  MIME-Charset-1.006.2.tar.gz



From jkratoch at fedoraproject.org  Thu Apr 30 17:54:43 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 30 Apr 2009 17:54:43 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.3-rh-testlibunwind-20041202.patch, 1.1,
	1.2 gdb.spec, 1.351,
	1.352 gdb-6.3-rh-testlibunwind1fix-20041202.patch, 1.1, NONE
Message-ID: <20090430175443.37A227012A@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32123

Modified Files:
	gdb-6.3-rh-testlibunwind-20041202.patch gdb.spec 
Removed Files:
	gdb-6.3-rh-testlibunwind1fix-20041202.patch 
Log Message:
* Thu Apr 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-27
- Fix race in the ia64 testcase `gdb-6.3-rh-testlibunwind-20041202.patch'.


gdb-6.3-rh-testlibunwind-20041202.patch:

Index: gdb-6.3-rh-testlibunwind-20041202.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-rh-testlibunwind-20041202.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-6.3-rh-testlibunwind-20041202.patch	2 Dec 2004 16:46:32 -0000	1.1
+++ gdb-6.3-rh-testlibunwind-20041202.patch	30 Apr 2009 17:54:42 -0000	1.2
@@ -3,11 +3,53 @@
         From Jeff Johnston <jjohnstn at redhat.com>
         * gdb.arch/ia64-libunwind.exp: New file.
         * gdb.arch/ia64-libunwind.c: New file.
+
+2004-08-03  Jeff Johnston  <jjohnstn at redhat.com>
+   
+        * gdb.arch/ia64-libunwind.exp: Fix test string to match
+	current code base.
+
+	[ acquire_unwind_info -> ia64_find_proc_info_x ]
+
+2009-04-30  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	Remove a race from send_gdb "COMMAND\n".
+	Cleanup.
+	Merge in: Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch
  
---- /dev/null	Thu Apr 11 10:25:15 2002
-+++ gdb+dejagnu-20040223/gdb/testsuite/gdb.arch/ia64-libunwind.exp	Mon Nov 17 15:57:04 2003
-@@ -0,0 +1,55 @@
-+#   Copyright 2003 Free Software Foundation, Inc.
+--- /dev/null	2009-04-19 08:52:54.499000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/ia64-libunwind.c	2009-04-30 19:15:16.000000000 +0200
+@@ -0,0 +1,26 @@
++/* Copyright 2003, 2009 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++
++int
++main ()
++{
++  printf ("hello world\n");
++ 
++  return 0;
++}
+--- /dev/null	2009-04-19 08:52:54.499000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/ia64-libunwind.exp	2009-04-30 19:19:22.000000000 +0200
+@@ -0,0 +1,52 @@
++# Copyright 2003, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -28,16 +70,6 @@
 +
 +# This file was written by Jeff Johnston (jjohnstn at redhat.com)
 +
-+if $tracelevel then {
-+    strace $tracelevel
-+}
-+
-+#
-+# test running programs
-+#
-+set prms_id 0
-+set bug_id 0
-+
 +if ![istarget "ia64-*-*"] then {
 +    return
 +}
@@ -58,19 +90,14 @@
 +gdb_start
 +gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${binfile}
-+send_gdb "set debug arch 1\n"
-+send_gdb "break main\n"
-+gdb_test "run" ".*acquire_unwind_info.*"
-+ 
---- /dev/null	Thu Apr 11 10:25:15 2002
-+++ gdb+dejagnu-20040223/gdb/testsuite/gdb.arch/ia64-libunwind.c	Mon Nov 17 15:58:27 2003
-@@ -0,0 +1,9 @@
-+#include <stdio.h>
 +
-+int main()
-+{
-+  printf ("hello world\n");
-+ 
-+  return 0;
++gdb_test "set debug arch 1"
++gdb_breakpoint "main"
++gdb_run_cmd
++
++set test "libunwind message"
++gdb_test_multiple "" $test {
++    -re "ia64_find_proc_info_x.*$gdb_prompt $" {
++	pass $test
++    }
 +}
-+


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -p -r1.351 -r1.352
--- gdb.spec	27 Apr 2009 22:40:40 -0000	1.351
+++ gdb.spec	30 Apr 2009 17:54:42 -0000	1.352
@@ -14,7 +14,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 26%{?_with_upstream:.upstream}%{?dist}
+Release: 27%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -62,7 +62,6 @@ Patch2: gdb-6.3-rh-testversion-20041202.
 
 # Check that libunwind works - new test then fix
 Patch3: gdb-6.3-rh-testlibunwind-20041202.patch
-Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch
 
 # Use convert_from_func_ptr_addr on the solib breakpoint address;
 # simplifies and makes more consistent the logic.
@@ -473,7 +472,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch349 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 
 %patch104 -p1
 %patch105 -p1
@@ -872,6 +870,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-27
+- Fix race in the ia64 testcase `gdb-6.3-rh-testlibunwind-20041202.patch'.
+
 * Mon Apr 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-26
 - Support a new rpmbuild option: --without python
 


--- gdb-6.3-rh-testlibunwind1fix-20041202.patch DELETED ---



From dbhole at fedoraproject.org  Thu Apr 30 18:29:58 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Thu, 30 Apr 2009 18:29:58 +0000 (UTC)
Subject: rpms/lucene/F-11 lucene-2.3.1-fixmanifests.patch, NONE,
	1.1 lucene.spec, 1.40, 1.41
Message-ID: <20090430182958.7288E7012A@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/lucene/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8022

Modified Files:
	lucene.spec 
Added Files:
	lucene-2.3.1-fixmanifests.patch 
Log Message:

- rhbz #465344: Fix Implementation-Version and remove Class-Path from manifest



lucene-2.3.1-fixmanifests.patch:

--- NEW FILE lucene-2.3.1-fixmanifests.patch ---
diff -up ./common-build.xml.sav ./common-build.xml
--- ./common-build.xml.sav	2009-04-30 14:12:20.000000000 -0400
+++ ./common-build.xml	2009-04-30 14:12:26.000000000 -0400
@@ -277,7 +277,7 @@
 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
 		<!-- impl version can be any string -->
 		<attribute name="Implementation-Version"
-		           value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
+		           value="${version} - ${DSTAMP} ${TSTAMP}"/>
 		<attribute name="Implementation-Vendor"
 		           value="The Apache Software Foundation"/>
 		<attribute name="X-Compile-Source-JDK" 
diff -up ./contrib/lucli/build.xml.sav ./contrib/lucli/build.xml
--- ./contrib/lucli/build.xml.sav	2009-04-30 14:09:52.000000000 -0400
+++ ./contrib/lucli/build.xml	2009-04-30 14:10:11.000000000 -0400
@@ -42,7 +42,6 @@
     <jarify>
       <manifest-attributes>
         <attribute name="Main-Class" value="lucli.Lucli" />
-        <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
       </manifest-attributes>
     </jarify>
    </target>
@@ -51,7 +50,6 @@
   	<jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
       <manifest-attributes>
         <attribute name="Main-Class" value="lucli.Lucli" />
-        <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
       </manifest-attributes>
   	</jarify>
   </target>   


Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/F-11/lucene.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- lucene.spec	25 Feb 2009 22:08:03 -0000	1.40
+++ lucene.spec	30 Apr 2009 18:29:28 -0000	1.41
@@ -36,7 +36,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        2.3.1
-Release:        4.4%{?dist}
+Release:        4.5%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -44,7 +44,8 @@ Group:          Internet/WWW/Indexing/Se
 Source0:        http://www.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
 Source1:	lucene-1.9-OSGi-MANIFEST.MF
 Source2:	lucene-1.9-analysis-OSGi-MANIFEST.MF
-Patch4:         lucene-2.3.0-db-javadoc.patch
+Patch1:         lucene-2.3.0-db-javadoc.patch
+Patch2:         %{name}-%{version}-fixmanifests.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
@@ -113,7 +114,8 @@ Requires:       %{name} = %{epoch}:%{ver
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
-%patch4 -p1 -b .db-javadoc
+%patch1 -p1 -b .db-javadoc
+%patch2 -p1 -b .fixmanifests
 
 %build
 mkdir -p docs
@@ -270,6 +272,9 @@ fi
 
 
 %changelog
+* Thu Apr 30 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.3.1-4.5
+- rhbz #465344: Fix Implementation-Version and remove Class-Path from manifest
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.1-4.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dbhole at fedoraproject.org  Thu Apr 30 18:31:20 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Thu, 30 Apr 2009 18:31:20 +0000 (UTC)
Subject: rpms/lucene/devel lucene-2.3.1-fixmanifests.patch, NONE,
	1.1 lucene.spec, 1.40, 1.41
Message-ID: <20090430183120.2BE9E7012A@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/lucene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8553

Modified Files:
	lucene.spec 
Added Files:
	lucene-2.3.1-fixmanifests.patch 
Log Message:

- rhbz #465344: Fix Implementation-Version and remove Class-Path from manifest



lucene-2.3.1-fixmanifests.patch:

--- NEW FILE lucene-2.3.1-fixmanifests.patch ---
diff -up ./common-build.xml.sav ./common-build.xml
--- ./common-build.xml.sav	2009-04-30 14:12:20.000000000 -0400
+++ ./common-build.xml	2009-04-30 14:12:26.000000000 -0400
@@ -277,7 +277,7 @@
 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
 		<!-- impl version can be any string -->
 		<attribute name="Implementation-Version"
-		           value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
+		           value="${version} - ${DSTAMP} ${TSTAMP}"/>
 		<attribute name="Implementation-Vendor"
 		           value="The Apache Software Foundation"/>
 		<attribute name="X-Compile-Source-JDK" 
diff -up ./contrib/lucli/build.xml.sav ./contrib/lucli/build.xml
--- ./contrib/lucli/build.xml.sav	2009-04-30 14:09:52.000000000 -0400
+++ ./contrib/lucli/build.xml	2009-04-30 14:10:11.000000000 -0400
@@ -42,7 +42,6 @@
     <jarify>
       <manifest-attributes>
         <attribute name="Main-Class" value="lucli.Lucli" />
-        <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
       </manifest-attributes>
     </jarify>
    </target>
@@ -51,7 +50,6 @@
   	<jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
       <manifest-attributes>
         <attribute name="Main-Class" value="lucli.Lucli" />
-        <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
       </manifest-attributes>
   	</jarify>
   </target>   


Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- lucene.spec	25 Feb 2009 22:08:03 -0000	1.40
+++ lucene.spec	30 Apr 2009 18:30:49 -0000	1.41
@@ -36,7 +36,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        2.3.1
-Release:        4.4%{?dist}
+Release:        4.5%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -44,7 +44,8 @@ Group:          Internet/WWW/Indexing/Se
 Source0:        http://www.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
 Source1:	lucene-1.9-OSGi-MANIFEST.MF
 Source2:	lucene-1.9-analysis-OSGi-MANIFEST.MF
-Patch4:         lucene-2.3.0-db-javadoc.patch
+Patch1:         lucene-2.3.0-db-javadoc.patch
+Patch2:         %{name}-%{version}-fixmanifests.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
@@ -113,7 +114,8 @@ Requires:       %{name} = %{epoch}:%{ver
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
-%patch4 -p1 -b .db-javadoc
+%patch1 -p1 -b .db-javadoc
+%patch2 -p1 -b .fixmanifests
 
 %build
 mkdir -p docs
@@ -270,6 +272,9 @@ fi
 
 
 %changelog
+* Thu Apr 30 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.3.1-4.5
+- rhbz #465344: Fix Implementation-Version and remove Class-Path from manifest
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.1-4.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Thu Apr 30 18:41:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 18:41:04 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.55, 1.56 kde-settings.spec,
	1.74, 1.75 sources, 1.56, 1.57
Message-ID: <20090430184104.641757012A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11144/F-11

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-10.20090430svn
- nepomukserverrc: disable nepomuk



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	30 Apr 2009 01:10:00 -0000	1.55
+++ .cvsignore	30 Apr 2009 18:40:33 -0000	1.56
@@ -1 +1 @@
-kde-settings-4.2-20090429svn.tar.bz2
+kde-settings-4.2-20090430svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- kde-settings.spec	30 Apr 2009 01:10:00 -0000	1.74
+++ kde-settings.spec	30 Apr 2009 18:40:33 -0000	1.75
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090429svn
+%define rel 20090430svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 9.%{rel}%{?dist}
+Release: 10.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -158,6 +158,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-10.20090430svn
+- nepomukserverrc: disable nepomuk
+
 * Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-9.20090429svn
 - krunnerrc: disable contacts plugin, avoids akonadi launch on first login
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	30 Apr 2009 01:10:00 -0000	1.56
+++ sources	30 Apr 2009 18:40:33 -0000	1.57
@@ -1 +1 @@
-654ddefa5adaf464d0e25b3744185a89  kde-settings-4.2-20090429svn.tar.bz2
+c49d47bdbfdd148edea664b3707fe668  kde-settings-4.2-20090430svn.tar.bz2



From rdieter at fedoraproject.org  Thu Apr 30 18:41:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 18:41:04 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.55, 1.56 kde-settings.spec,
	1.74, 1.75 sources, 1.56, 1.57
Message-ID: <20090430184104.979BD70133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11144/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-10.20090430svn
- nepomukserverrc: disable nepomuk



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	30 Apr 2009 01:10:00 -0000	1.55
+++ .cvsignore	30 Apr 2009 18:40:34 -0000	1.56
@@ -1 +1 @@
-kde-settings-4.2-20090429svn.tar.bz2
+kde-settings-4.2-20090430svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- kde-settings.spec	30 Apr 2009 01:10:00 -0000	1.74
+++ kde-settings.spec	30 Apr 2009 18:40:34 -0000	1.75
@@ -3,12 +3,12 @@
 # The actuall tarball also DIFFERS between releases!
 # Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090429svn
+%define rel 20090430svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 9.%{rel}%{?dist}
+Release: 10.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -158,6 +158,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-10.20090430svn
+- nepomukserverrc: disable nepomuk
+
 * Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-9.20090429svn
 - krunnerrc: disable contacts plugin, avoids akonadi launch on first login
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	30 Apr 2009 01:10:01 -0000	1.56
+++ sources	30 Apr 2009 18:40:34 -0000	1.57
@@ -1 +1 @@
-654ddefa5adaf464d0e25b3744185a89  kde-settings-4.2-20090429svn.tar.bz2
+c49d47bdbfdd148edea664b3707fe668  kde-settings-4.2-20090430svn.tar.bz2



From limb at fedoraproject.org  Thu Apr 30 19:20:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 30 Apr 2009 19:20:35 +0000 (UTC)
Subject: rpms/bacula/devel .cvsignore, 1.8, 1.9 bacula.spec, 1.25,
	1.26 sources, 1.7, 1.8
Message-ID: <20090430192035.A1E4270092@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv832

Modified Files:
	.cvsignore bacula.spec sources 
Log Message:
3.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	27 Apr 2009 17:53:52 -0000	1.8
+++ .cvsignore	30 Apr 2009 19:20:04 -0000	1.9
@@ -1,2 +1,2 @@
-bacula-3.0.0.tar.gz
-bacula-docs-3.0.0.tar.bz2
+bacula-3.0.1.tar.gz
+bacula-docs-3.0.1.tar.bz2


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- bacula.spec	27 Apr 2009 17:53:52 -0000	1.25
+++ bacula.spec	30 Apr 2009 19:20:04 -0000	1.26
@@ -7,7 +7,7 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 3.0.0
+Version: 3.0.1
 Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
@@ -997,6 +997,9 @@ fi
 
 
 %changelog
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net - 3.0.1-1
+- Update to new upstream, 3.0.1.
+
 * Tue Apr 21 2009 Jon Ciesla <limb at jcomserv.net - 3.0.0-1
 - Update to new upstream, 3.0.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Apr 2009 17:53:52 -0000	1.7
+++ sources	30 Apr 2009 19:20:04 -0000	1.8
@@ -1,2 +1,2 @@
-5ea5294c4f66f0d8ba1414f1ca9dc79b  bacula-3.0.0.tar.gz
-2c3a1c6ba46b1371240a9b8d053fdf61  bacula-docs-3.0.0.tar.bz2
+173ef4d07ff10dfdbcc1142d8be21f17  bacula-3.0.1.tar.gz
+5c8d0710eaaf439f4b78913915d45523  bacula-docs-3.0.1.tar.bz2



From rdieter at fedoraproject.org  Thu Apr 30 19:55:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 19:55:18 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch,
	NONE, 1.1 kdeplasma-addons.spec, 1.31, 1.32
Message-ID: <20090430195518.D187870092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8422

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch 
Log Message:
* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- disable contacts krunner by default


kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch:

--- NEW FILE kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch ---
diff -up kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop
--- kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner	2009-03-26 09:43:17.000000000 -0500
+++ kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop	2009-04-30 14:43:36.820331028 -0500
@@ -92,4 +92,3 @@ X-KDE-PluginInfo-Email=tpr at iki.fi
 X-KDE-PluginInfo-Name=kabccontacts
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- kdeplasma-addons.spec	1 Apr 2009 18:59:50 -0000	1.31
+++ kdeplasma-addons.spec	30 Apr 2009 19:54:48 -0000	1.32
@@ -1,16 +1,22 @@
 Name:           kdeplasma-addons
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # http://ivan.fomentgroup.org/blog/2009/03/09/patch-for-lancelot-and-qt4/
 # http://bugs.gentoo.org/258758
 Patch0:         kdeplasma-addons-4.2.1-lancelot-qt45.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstreamable patches
+# disable contacts krunner that induces mostly needless kres-migrator and
+# akonadi launch on first login
+Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  gettext
@@ -51,6 +57,8 @@ Additional plasmoids for KDE.
 %patch0 -p0 -b .lancelot-qt45
 %endif
 
+%patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+
 
 %build
 
@@ -117,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- disable contacts krunner by default
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 



From cebbert at fedoraproject.org  Thu Apr 30 20:02:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 30 Apr 2009 20:02:54 +0000 (UTC)
Subject: rpms/kernel/F-11 config-ia64-generic,1.23,1.24
Message-ID: <20090430200254.2CD5770092@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9865

Modified Files:
	config-ia64-generic 
Log Message:
drop CONFIG_SYSFS_DEPRECATED from ia64 config


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-ia64-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- config-ia64-generic	12 Mar 2009 03:23:02 -0000	1.23
+++ config-ia64-generic	30 Apr 2009 20:02:23 -0000	1.24
@@ -203,9 +203,6 @@ CONFIG_KVM_INTEL=m
 
 CONFIG_HP_ILO=m
 
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
 



From nalin at fedoraproject.org  Thu Apr 30 20:16:01 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 30 Apr 2009 20:16:01 +0000 (UTC)
Subject: rpms/slapi-nis/F-10 slapi-nis.spec,1.8,1.9 sources,1.8,1.9
Message-ID: <20090430201601.AFA9C70092@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/slapi-nis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13713/F-10

Modified Files:
	slapi-nis.spec sources 
Log Message:
- update to 0.13, fixing %link() (#498432)



Index: slapi-nis.spec
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/F-10/slapi-nis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- slapi-nis.spec	27 Apr 2009 20:54:48 -0000	1.8
+++ slapi-nis.spec	30 Apr 2009 20:15:30 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.11
+Version:	0.13
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,8 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.13-1
+- update to 0.13, reworking %link() to correct some bugs (#498432)
+
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.12-1
+- correct test suite failures that 0.11 started triggering
+
 * Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
-- update to 0.11
+- update to 0.11 (#497904)
 
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	27 Apr 2009 20:54:48 -0000	1.8
+++ sources	30 Apr 2009 20:15:31 -0000	1.9
@@ -1 +1 @@
-e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz
+d1f8642e2b544fc526d46cb7a4e82145  slapi-nis-0.13.tar.gz



From nalin at fedoraproject.org  Thu Apr 30 20:16:02 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 30 Apr 2009 20:16:02 +0000 (UTC)
Subject: rpms/slapi-nis/F-9 slapi-nis.spec,1.8,1.9 sources,1.9,1.10
Message-ID: <20090430201602.43EA370092@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/slapi-nis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13713/F-9

Modified Files:
	slapi-nis.spec sources 
Log Message:
- update to 0.13, fixing %link() (#498432)



Index: slapi-nis.spec
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/F-9/slapi-nis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- slapi-nis.spec	27 Apr 2009 20:54:48 -0000	1.8
+++ slapi-nis.spec	30 Apr 2009 20:15:31 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.11
+Version:	0.13
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,8 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.13-1
+- update to 0.13, reworking %link() to correct some bugs (#498432)
+
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.12-1
+- correct test suite failures that 0.11 started triggering
+
 * Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
-- update to 0.11
+- update to 0.11 (#497904)
 
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Apr 2009 20:54:48 -0000	1.9
+++ sources	30 Apr 2009 20:15:31 -0000	1.10
@@ -1 +1 @@
-e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz
+d1f8642e2b544fc526d46cb7a4e82145  slapi-nis-0.13.tar.gz



From nalin at fedoraproject.org  Thu Apr 30 20:16:02 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 30 Apr 2009 20:16:02 +0000 (UTC)
Subject: rpms/slapi-nis/devel .cvsignore, 1.6, 1.7 slapi-nis.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090430201602.9FA7270092@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/slapi-nis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13713/devel

Modified Files:
	.cvsignore slapi-nis.spec sources 
Log Message:
- update to 0.13, fixing %link() (#498432)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Apr 2009 20:50:56 -0000	1.6
+++ .cvsignore	30 Apr 2009 20:15:32 -0000	1.7
@@ -3,3 +3,4 @@ slapi-nis-0.8.1.tar.gz
 slapi-nis-0.9.tar.gz
 slapi-nis-0.10.tar.gz
 slapi-nis-0.11.tar.gz
+slapi-nis-0.13.tar.gz


Index: slapi-nis.spec
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/devel/slapi-nis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- slapi-nis.spec	27 Apr 2009 20:52:24 -0000	1.7
+++ slapi-nis.spec	30 Apr 2009 20:15:32 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.11
+Version:	0.13
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,8 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.13-1
+- update to 0.13, reworking %link() to correct some bugs (#498432)
+
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.12-1
+- correct test suite failures that 0.11 started triggering
+
 * Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
-- update to 0.11
+- update to 0.11 (#497904)
 
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Apr 2009 20:50:56 -0000	1.6
+++ sources	30 Apr 2009 20:15:32 -0000	1.7
@@ -1 +1 @@
-e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz
+d1f8642e2b544fc526d46cb7a4e82145  slapi-nis-0.13.tar.gz



From nalin at fedoraproject.org  Thu Apr 30 20:16:01 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 30 Apr 2009 20:16:01 +0000 (UTC)
Subject: rpms/slapi-nis/F-11 slapi-nis.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090430201601.BDC7770133@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/slapi-nis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13713/F-11

Modified Files:
	slapi-nis.spec sources 
Log Message:
- update to 0.13, fixing %link() (#498432)



Index: slapi-nis.spec
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/F-11/slapi-nis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- slapi-nis.spec	27 Apr 2009 20:54:48 -0000	1.6
+++ slapi-nis.spec	30 Apr 2009 20:15:31 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		slapi-nis
-Version:	0.11
+Version:	0.13
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -46,8 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.13-1
+- update to 0.13, reworking %link() to correct some bugs (#498432)
+
+* Thu Apr 30 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.12-1
+- correct test suite failures that 0.11 started triggering
+
 * Tue Apr 28 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.11-1
-- update to 0.11
+- update to 0.11 (#497904)
 
 * Wed Mar  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 0.10-1
 - update to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/slapi-nis/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Apr 2009 20:54:48 -0000	1.6
+++ sources	30 Apr 2009 20:15:31 -0000	1.7
@@ -1 +1 @@
-e524359a55aa9f5eb84e4aac288e5415  slapi-nis-0.11.tar.gz
+d1f8642e2b544fc526d46cb7a4e82145  slapi-nis-0.13.tar.gz



From lkundrak at fedoraproject.org  Thu Apr 30 20:23:37 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 30 Apr 2009 20:23:37 +0000 (UTC)
Subject: rpms/starlab/devel starlab.spec,1.5,1.6
Message-ID: <20090430202337.4308370092@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/starlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16003

Modified Files:
	starlab.spec 
Log Message:
Do the actual rename


Index: starlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/starlab/devel/starlab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- starlab.spec	30 Apr 2009 14:51:38 -0000	1.5
+++ starlab.spec	30 Apr 2009 20:23:06 -0000	1.6
@@ -90,6 +90,7 @@ make pkglibdir=%{_libdir}
 rm -rf $RPM_BUILD_ROOT
 make pkglibdir=%{_libdir} install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_bindir}/{,t}starplot
+mv $RPM_BUILD_ROOT%{_bindir}/{,sl-}freeze
 
 
 %clean



From james at fedoraproject.org  Thu Apr 30 20:24:49 2009
From: james at fedoraproject.org (James Antill)
Date: Thu, 30 Apr 2009 20:24:49 +0000 (UTC)
Subject: rpms/yum-presto/devel total-progress+stat-fixes.patch, 1.2,
	1.3 yum-presto.spec, 1.14, 1.15
Message-ID: <20090430202449.83C4870092@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16457

Modified Files:
	total-progress+stat-fixes.patch yum-presto.spec 
Log Message:
* Thu Apr 30 2009 James Antill <james at fedoraproject.org> - 0.4.5-8
- Fix total for current filename (stupid python threading).


total-progress+stat-fixes.patch:

Index: total-progress+stat-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/total-progress+stat-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- total-progress+stat-fixes.patch	30 Apr 2009 03:29:23 -0000	1.2
+++ total-progress+stat-fixes.patch	30 Apr 2009 20:24:49 -0000	1.3
@@ -446,3 +446,61 @@ index 0fedc3c..c9807b6 100644
  
      download_pkgs.sort()
      # Download deltarpms
+commit de50eb5fc813b7dce489d15285b8acbe8a5b9f7c
+Author: James Antill <james at and.org>
+Date:   Thu Apr 30 16:19:31 2009 -0400
+
+    Stupid threading doesn't honour value setting, just changes *sigh*
+
+diff --git a/yum-presto/presto.py b/yum-presto/presto.py
+index c9807b6..5eacc12 100644
+--- a/yum-presto/presto.py
++++ b/yum-presto/presto.py
+@@ -45,7 +45,7 @@ actual_download_size   = 0
+ process_lock     = None # For progress, updated in thread
+ processed_t_size = 0    # For progress, updated in thread
+ processed_f_size = 0    # For progress, updated in thread
+-processing_fname = None # For progress, updated in thread
++processing_fnlst = []   # For progress, updated in thread
+ 
+ requires_api_version = '2.1'
+ plugin_type = (TYPE_CORE,)
+@@ -77,13 +77,13 @@ def reconstruct(conduit, po, deltalocal, deltasize):
+     rpmlocal = po.localpath
+     rpmarch  = po.arch
+     process_lock.acquire()
+-    processing_fname = rpmlocal
++    processing_fnlst.append(rpmlocal)
+     process_lock.release()
+     # applyDelta can think it's succeeded when it hasn't due to signing
+     # changes. Also have to be careful about SQL issues, see below.
+     if not applyDelta(deltalocal, rpmlocal, rpmarch) or not po.verifyLocalPkg():
+         process_lock.acquire()
+-        processing_fname = None
++        processing_fnlst.pop()
+         processed_f_size += po.size
+         process_lock.release()
+ 
+@@ -95,7 +95,7 @@ def reconstruct(conduit, po, deltalocal, deltasize):
+             pass
+     else:
+         process_lock.acquire()
+-        processing_fname = None
++        processing_fnlst.pop()
+         processed_t_size += po.size
+         process_lock.release()
+ 
+@@ -231,10 +231,12 @@ def getDelta(po, presto, conduit, conf_minimum_percentage=100):
+     return bestdelta
+ 
+ def _processing_data():
++    pfnm = None
+     process_lock.acquire()
+     ptsz = processed_t_size
+     pfsz = processed_f_size
+-    pfnm = processing_fname
++    if processing_fnlst:
++        pfnm = processing_fnlst[0]
+     process_lock.release()
+     return ptsz, pfsz, pfnm
+ 


Index: yum-presto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- yum-presto.spec	30 Apr 2009 03:29:23 -0000	1.14
+++ yum-presto.spec	30 Apr 2009 20:24:49 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: Presto plugin for yum
 Name: yum-presto
 Version: 0.4.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Thu Apr 30 2009 James Antill <james at fedoraproject.org> - 0.4.5-8
+- Fix total for current filename (stupid python threading).
+
 * Wed Apr 29 2009 James Antill <james at fedoraproject.org> - 0.4.5-7
 - Fix total to not overflow into rebuild
 



From rdieter at fedoraproject.org  Thu Apr 30 20:46:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 20:46:45 +0000 (UTC)
Subject: rpms/akonadi/F-11 .cvsignore, 1.9, 1.10 akonadi.spec, 1.30,
	1.31 sources, 1.9, 1.10
Message-ID: <20090430204645.B72FD70092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19789/F-11

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
- akonadi-1.1.2
- optimize scriptlets a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Jan 2009 18:54:02 -0000	1.9
+++ .cvsignore	30 Apr 2009 20:46:14 -0000	1.10
@@ -1 +1 @@
-akonadi-1.1.1.tar.bz2
+akonadi-1.1.2.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-11/akonadi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- akonadi.spec	25 Feb 2009 14:31:34 -0000	1.30
+++ akonadi.spec	30 Apr 2009 20:46:14 -0000	1.31
@@ -1,12 +1,13 @@
+
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.1.1
-Release: 6%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-Source0:  http://akonadi.omat.nl/akonadi-%{version}.tar.bz2
+Source0:  http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -14,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
 ## upstream
-# http://websvn.kde.org/branches/akonadi/1.1/server/src/akonadi.cpp?r1=905029&r2=931467&view=patch
-Patch100: akonadi-1.1.1-startup-2.patch
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -33,7 +32,6 @@ Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
 Requires(hint): mysql-server
 
-Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -58,7 +56,6 @@ Requires: pkgconfig
 
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
-%patch100 -p3 -b .startup-2
 
 
 %build
@@ -85,13 +82,16 @@ touch -d %{mysql_conf_timestamp} $RPM_BU
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%posttrans
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+  update-mime-database %{_datadir}/mime &> /dev/null ||:
+fi
 
 
 %files
@@ -118,6 +118,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
+- akonadi-1.1.2
+- optimize scriptlets a bit
+
 * Wed Feb 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-6
 - rev startup patch
 - BR: cmake >= 2.6.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Jan 2009 18:54:02 -0000	1.9
+++ sources	30 Apr 2009 20:46:14 -0000	1.10
@@ -1 +1 @@
-2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2
+5651b02358f7d2f1c0954dfd31feafb1  akonadi-1.1.2.tar.bz2



From rdieter at fedoraproject.org  Thu Apr 30 20:46:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 20:46:45 +0000 (UTC)
Subject: rpms/akonadi/devel .cvsignore, 1.9, 1.10 akonadi.spec, 1.30,
	1.31 sources, 1.9, 1.10 akonadi-1.1.1-startup-2.patch, 1.1, NONE
Message-ID: <20090430204645.BE80E7012A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19789/devel

Modified Files:
	.cvsignore akonadi.spec sources 
Removed Files:
	akonadi-1.1.1-startup-2.patch 
Log Message:
* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
- akonadi-1.1.2
- optimize scriptlets a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Jan 2009 18:54:02 -0000	1.9
+++ .cvsignore	30 Apr 2009 20:46:15 -0000	1.10
@@ -1 +1 @@
-akonadi-1.1.1.tar.bz2
+akonadi-1.1.2.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- akonadi.spec	25 Feb 2009 14:31:34 -0000	1.30
+++ akonadi.spec	30 Apr 2009 20:46:15 -0000	1.31
@@ -1,12 +1,13 @@
+
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.1.1
-Release: 6%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-Source0:  http://akonadi.omat.nl/akonadi-%{version}.tar.bz2
+Source0:  http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -14,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
 ## upstream
-# http://websvn.kde.org/branches/akonadi/1.1/server/src/akonadi.cpp?r1=905029&r2=931467&view=patch
-Patch100: akonadi-1.1.1-startup-2.patch
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -33,7 +32,6 @@ Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
 Requires(hint): mysql-server
 
-Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -58,7 +56,6 @@ Requires: pkgconfig
 
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
-%patch100 -p3 -b .startup-2
 
 
 %build
@@ -85,13 +82,16 @@ touch -d %{mysql_conf_timestamp} $RPM_BU
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%posttrans
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+  update-mime-database %{_datadir}/mime &> /dev/null ||:
+fi
 
 
 %files
@@ -118,6 +118,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
+- akonadi-1.1.2
+- optimize scriptlets a bit
+
 * Wed Feb 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-6
 - rev startup patch
 - BR: cmake >= 2.6.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Jan 2009 18:54:02 -0000	1.9
+++ sources	30 Apr 2009 20:46:15 -0000	1.10
@@ -1 +1 @@
-2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2
+5651b02358f7d2f1c0954dfd31feafb1  akonadi-1.1.2.tar.bz2


--- akonadi-1.1.1-startup-2.patch DELETED ---



From rdieter at fedoraproject.org  Thu Apr 30 20:47:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 30 Apr 2009 20:47:16 +0000 (UTC)
Subject: rpms/akonadi/F-11 akonadi-1.1.1-startup-2.patch,1.1,NONE
Message-ID: <20090430204716.5829E70092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19916

Removed Files:
	akonadi-1.1.1-startup-2.patch 
Log Message:
drop upstreamed patch



--- akonadi-1.1.1-startup-2.patch DELETED ---



From orion at fedoraproject.org  Thu Apr 30 20:48:49 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 30 Apr 2009 20:48:49 +0000 (UTC)
Subject: rpms/nco/devel nco-3.9.8-install_C_headers.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 nco.spec, 1.18, 1.19 sources, 1.9,
	1.10 nco-3.9.7-install_C_headers.patch, 1.1, NONE
Message-ID: <20090430204849.7D28370092@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/nco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20134

Modified Files:
	.cvsignore nco.spec sources 
Added Files:
	nco-3.9.8-install_C_headers.patch 
Removed Files:
	nco-3.9.7-install_C_headers.patch 
Log Message:
* Thu Apr 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 3.9.8-1
- Update to 3.9.8
- Update install headers patch


nco-3.9.8-install_C_headers.patch:

--- NEW FILE nco-3.9.8-install_C_headers.patch ---
--- nco-3.9.8/src/nco/Makefile.in.install_C_headers	2009-04-21 15:58:08.000000000 -0600
+++ nco-3.9.8/src/nco/Makefile.in	2009-04-30 14:22:12.000000000 -0600
@@ -428,7 +428,7 @@
 # To my knowledge, though, only NCO programs use libnco
 # For this reason Debian packages should not (yet) install NCO headers
 # Remove following line until learn how to prevent Debian from installing headers
-#include_HEADERS = $(HEADER_SRC)
+include_HEADERS = $(HEADER_SRC)
 libnco_la_SOURCES = \
 ${HEADER_SRC} \
 ${NCO_GETOPT} \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nco/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Mar 2009 16:16:07 -0000	1.9
+++ .cvsignore	30 Apr 2009 20:48:18 -0000	1.10
@@ -1 +1 @@
-nco-3.9.7.tar.gz
+nco-3.9.8.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nco/devel/nco.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nco.spec	30 Mar 2009 23:00:33 -0000	1.18
+++ nco.spec	30 Apr 2009 20:48:19 -0000	1.19
@@ -1,13 +1,13 @@
 Name:           nco
-Version:        3.9.7
-Release:        2%{?dist}
+Version:        3.9.8
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPLv3
 URL:            http://nco.sourceforge.net/
 
 Source0:        http://nco.sourceforge.net/src/nco-%{version}.tar.gz
-Patch0:         nco-3.9.7-install_C_headers.patch
+Patch0:         nco-3.9.8-install_C_headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison, flex, gawk
@@ -108,6 +108,10 @@ fi
 %{_libdir}/libnco*.a
 
 %changelog
+* Thu Apr 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 3.9.8-1
+- Update to 3.9.8
+- Update install headers patch
+
 * Mon Mar 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 3.9.7-2
 - Drop include patch fixed in antlr 2.7.7-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nco/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Mar 2009 16:16:07 -0000	1.9
+++ sources	30 Apr 2009 20:48:19 -0000	1.10
@@ -1 +1 @@
-d91e478fd98725086dfb088705935bb2  nco-3.9.7.tar.gz
+412e3dce53abef435d415d39c0dc36a0  nco-3.9.8.tar.gz


--- nco-3.9.7-install_C_headers.patch DELETED ---



From transif at fedoraproject.org  Thu Apr 30 20:54:22 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 30 Apr 2009 20:54:22 +0000 (UTC)
Subject: comps/po pt_BR.po,1.32,1.33
Message-ID: <20090430205422.9473070092@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20874/po

Modified Files:
	pt_BR.po 
Log Message:
Sending translation for Brazilian Portuguese


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.32 -r 1.33 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- pt_BR.po	29 Apr 2009 20:00:22 -0000	1.32
+++ pt_BR.po	30 Apr 2009 20:53:52 -0000	1.33
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-15 01:01-0300\n"
+"POT-Creation-Date: 2009-04-30 19:07+0000\n"
+"PO-Revision-Date: 2009-04-30 17:51-0300\n"
 "Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -28,199 +28,320 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Um ambiente de trabalho leve que funciona bem em m??quinas de baixo custo."
+msgstr "Um ambiente de trabalho leve que funciona bem em m??quinas de baixo custo."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Ferramentas administrativas"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f7.xml.in.h:3
+#: ../comps-f8.xml.in.h:3
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "Suporte ?? Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f7.xml.in.h:4
+#: ../comps-f8.xml.in.h:4
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "Suporte ?? Alban??s"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplica????es"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f7.xml.in.h:6
+#: ../comps-f8.xml.in.h:6
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplica????es para realizar uma variedade de tarefas"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suporte ?? ??rabe"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suporte ?? Arm??nio"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "Suporte ?? Assam??s"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autoria e publica????o"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f7.xml.in.h:11
+#: ../comps-f8.xml.in.h:11
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema b??sico"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:13
+#: ../comps-f8.xml.in.h:13
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
 msgid "Basic support for the Ruby programming language."
 msgstr "Suporte b??sico ?? linguagem de programa????o Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
 msgid "Basque Support"
 msgstr "Suporte ?? Basco"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
 msgid "Belarusian Support"
 msgstr "Suporte ?? Bielo-russo"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:19
 msgid "Bengali Support"
 msgstr "Suporte ?? Bengali"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f7.xml.in.h:17
[...2473 lines suppressed...]
-msgid ""
-"This group is a collection of tools used in the design, modification, "
-"manipulation, and packaging of fonts."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas usadas no desenho, modifica????o, "
-"manipula????o e empacotamento de fontes."
+msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts."
+msgstr "Este grupo ?? um cole????o de ferramentas usadas no desenho, modifica????o, manipula????o e empacotamento de fontes."
 
 #: ../comps-f11.xml.in.h:235
 msgid "Turkmen Support"
@@ -1471,145 +2029,116 @@ msgstr "Suporte ?? Turcomeno"
 msgid "Upper Sorbian Support"
 msgstr "Suporte ?? Upper Sorbian"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplica????es para uma variedade de tarefas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? rede dialup"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de "
-"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de "
-"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Algumas vezes chamados de editores de texto, estes programas permitem criar "
-"e editar arquivos. Isto inclui o Emacs e o Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:23
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:35
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:44
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "O editor de texto XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-"
-"la para HTML, PDF, PostScript e texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:52
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-la para HTML, PDF, PostScript e texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos."
+msgstr "Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:63
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes ??rabes."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses."
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes checos."
 
 #~ msgid "Haskell"
 #~ msgstr "Haskell"
-
 #~ msgid "British Support"
 #~ msgstr "Suporte ?? Bret??o"
-
 #~ msgid "Cluster Storage"
 #~ msgstr "Armazenamento em Clusters"
-
 #~ msgid "Clustering Support."
 #~ msgstr "Suporte a Clusters."
-
 #~ msgid "Libraries for applications built on older releases."
 #~ msgstr "Bibliotecas para aplica????es compiladas em vers??es anteriores."
-
 #~ msgid "Miscellaneous Included Packages"
 #~ msgstr "Pacotes Variados Inclu??dos"
-
 #~ msgid "Packages which provide support for cluster storage."
 #~ msgstr "Pacotes que fornecem suporte para o armazenamento em clusters."
-
 #~ msgid "Packages which provide support for single-node GFS."
 #~ msgstr "Pacotes que fornecem suporte para GFS de n?? ??nico."
-
 #~ msgid "Single Node GFS Support"
 #~ msgstr "Suporte ao GFS de N?? ??nico"
-
 #~ msgid "These packages provide compatibility support with previous releases."
 #~ msgstr "Estes pacotes fornecem compatibilidade com as vers??es anteriores."
-
 #~ msgid "Java Runtime Environments and Development Kits"
 #~ msgstr "Ambientes de Tempo de Execu????o e Kits de Desenvolvimento Java"
-
 #~ msgid "Misc"
 #~ msgstr "Variados"
-
 #~ msgid "Misc packages"
 #~ msgstr "Pacotes variados"
-
 #~ msgid "Multimedia"
 #~ msgstr "Multim??dia"
-
 #~ msgid "Multimedia applications"
 #~ msgstr "Aplica????es multim??dia"
-
 #~ msgid ""
 #~ "Packages which provide additional functionality for Red Hat Enterprise "
 #~ "Linux"
 #~ msgstr ""
 #~ "Pacotes que fornecem funcionalidades adicionais para o Red Hat Enterprise "
 #~ "Linux"
-
 #~ msgid "Red Hat Enterprise Linux Supplementary"
 #~ msgstr "Suplementos do Red Hat Enterprise Linux"
-
 #~ msgid ""
 #~ "Components used for high performance networking and clustering, such as "
 #~ "Infiniband and RDMA."
 #~ msgstr ""
 #~ "Componentes usados para redes e clusters de alta performance, como a "
 #~ "Infiniband e a RDMA."
-
 #~ msgid "OpenFabrics Enterprise Distribution"
 #~ msgstr "Distribui????o do OpenFabrics Enterprise"
-
 #~ msgid "Virtualization Support."
 #~ msgstr "Suporte ?? Virtualiza????o."
+



From orion at fedoraproject.org  Thu Apr 30 20:59:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 30 Apr 2009 20:59:06 +0000 (UTC)
Subject: rpms/nco/F-11 nco-3.9.8-install_C_headers.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 nco.spec, 1.18, 1.19 sources, 1.9,
	1.10 nco-3.9.7-install_C_headers.patch, 1.1, NONE
Message-ID: <20090430205906.9E1CA70092@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/nco/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21376

Modified Files:
	.cvsignore nco.spec sources 
Added Files:
	nco-3.9.8-install_C_headers.patch 
Removed Files:
	nco-3.9.7-install_C_headers.patch 
Log Message:
* Thu Apr 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 3.9.8-1
- Update to 3.9.8
- Update install headers patch


nco-3.9.8-install_C_headers.patch:

--- NEW FILE nco-3.9.8-install_C_headers.patch ---
--- nco-3.9.8/src/nco/Makefile.in.install_C_headers	2009-04-21 15:58:08.000000000 -0600
+++ nco-3.9.8/src/nco/Makefile.in	2009-04-30 14:22:12.000000000 -0600
@@ -428,7 +428,7 @@
 # To my knowledge, though, only NCO programs use libnco
 # For this reason Debian packages should not (yet) install NCO headers
 # Remove following line until learn how to prevent Debian from installing headers
-#include_HEADERS = $(HEADER_SRC)
+include_HEADERS = $(HEADER_SRC)
 libnco_la_SOURCES = \
 ${HEADER_SRC} \
 ${NCO_GETOPT} \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nco/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Mar 2009 16:16:07 -0000	1.9
+++ .cvsignore	30 Apr 2009 20:58:36 -0000	1.10
@@ -1 +1 @@
-nco-3.9.7.tar.gz
+nco-3.9.8.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nco/F-11/nco.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nco.spec	30 Mar 2009 23:00:33 -0000	1.18
+++ nco.spec	30 Apr 2009 20:58:36 -0000	1.19
@@ -1,13 +1,13 @@
 Name:           nco
-Version:        3.9.7
-Release:        2%{?dist}
+Version:        3.9.8
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPLv3
 URL:            http://nco.sourceforge.net/
 
 Source0:        http://nco.sourceforge.net/src/nco-%{version}.tar.gz
-Patch0:         nco-3.9.7-install_C_headers.patch
+Patch0:         nco-3.9.8-install_C_headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison, flex, gawk
@@ -108,6 +108,10 @@ fi
 %{_libdir}/libnco*.a
 
 %changelog
+* Thu Apr 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 3.9.8-1
+- Update to 3.9.8
+- Update install headers patch
+
 * Mon Mar 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 3.9.7-2
 - Drop include patch fixed in antlr 2.7.7-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nco/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Mar 2009 16:16:07 -0000	1.9
+++ sources	30 Apr 2009 20:58:36 -0000	1.10
@@ -1 +1 @@
-d91e478fd98725086dfb088705935bb2  nco-3.9.7.tar.gz
+412e3dce53abef435d415d39c0dc36a0  nco-3.9.8.tar.gz


--- nco-3.9.7-install_C_headers.patch DELETED ---



From kyle at fedoraproject.org  Thu Apr 30 21:04:00 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 30 Apr 2009 21:04:00 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.30-rc4.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1059, 1.1060 kernel.spec, 1.1537, 1.1538 sources, 1.1018,
	1.1019 upstream, 1.932, 1.933 patch-2.6.30-rc3-git6.bz2.sign,
	1.1, NONE patch-2.6.30-rc3.bz2.sign, 1.1, NONE
Message-ID: <20090430210400.DF0B270092@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22075

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30-rc4.bz2.sign 
Removed Files:
	patch-2.6.30-rc3-git6.bz2.sign patch-2.6.30-rc3.bz2.sign 
Log Message:
* Thu Apr 30 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.30-rc4



--- NEW FILE patch-2.6.30-rc4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJ+TT7yGugalF9Dw4RApuTAJ4kiOWQGtfnlmqTUeCFLZjcl1U8ugCfSQA8
nrj0GH59l7TgIN/zQ5NhzKc=
=wgXk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1059
retrieving revision 1.1060
diff -u -p -r1.1059 -r1.1060
--- .cvsignore	29 Apr 2009 16:44:03 -0000	1.1059
+++ .cvsignore	30 Apr 2009 21:03:29 -0000	1.1060
@@ -6,5 +6,4 @@ temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
-patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git6.bz2
+patch-2.6.30-rc4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1537
retrieving revision 1.1538
diff -u -p -r1.1537 -r1.1538
--- kernel.spec	29 Apr 2009 16:44:03 -0000	1.1537
+++ kernel.spec	30 Apr 2009 21:03:29 -0000	1.1538
@@ -56,9 +56,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 3
+%define rcrev 4
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -102,7 +102,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 1
+%define rawhide_skip_docs 0
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1832,6 +1832,9 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu Apr 30 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.30-rc4
+
 * Wed Apr 29 2009 Dave Jones <davej at redhat.com>
 - 2.6.30-rc3-git6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1018
retrieving revision 1.1019
diff -u -p -r1.1018 -r1.1019
--- sources	29 Apr 2009 16:44:03 -0000	1.1018
+++ sources	30 Apr 2009 21:03:30 -0000	1.1019
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-cd69d16ea42bbf20d0a505690be45868  patch-2.6.30-rc3.bz2
+1672a3064a2bfe049715a1103f03561c  patch-2.6.30-rc4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -p -r1.932 -r1.933
--- upstream	29 Apr 2009 16:44:03 -0000	1.932
+++ upstream	30 Apr 2009 21:03:30 -0000	1.933
@@ -1,3 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.30-rc3.bz2
-patch-2.6.30-rc3-git6.bz2
+patch-2.6.30-rc4.bz2


--- patch-2.6.30-rc3-git6.bz2.sign DELETED ---


--- patch-2.6.30-rc3.bz2.sign DELETED ---



From wtogami at fedoraproject.org  Thu Apr 30 22:11:08 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 30 Apr 2009 22:11:08 +0000 (UTC)
Subject: rpms/ltsp/F-11 .cvsignore, 1.23, 1.24 ltsp.spec, 1.31, 1.32 sources,
	1.27, 1.28
Message-ID: <20090430221108.76F7270133@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3691

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- no code changes, only important documentation update regarding disabling ltspbr0
  see /etc/sysconfig/network-scripts/ifcfg-ltspbr0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	23 Apr 2009 04:21:44 -0000	1.23
+++ .cvsignore	30 Apr 2009 22:10:37 -0000	1.24
@@ -1 +1 @@
-ltsp-5.1.71.tar.bz2
+ltsp-5.1.72.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/ltsp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ltsp.spec	23 Apr 2009 04:21:44 -0000	1.31
+++ ltsp.spec	30 Apr 2009 22:10:37 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           ltsp
-Version:        5.1.71
+Version:        5.1.72
 %define _datestamp .20090422.23
 #Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -412,6 +412,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 30 2009 Warren Togami <wtogami at redhat.com> - 5.1.72-1
+- no code changes, only important documentation update regarding disabling ltspbr0
+  see /etc/sysconfig/network-scripts/ifcfg-ltspbr0
+
 * Thu Apr 23 2009 Warren Togami <wtogami at redhat.com> - 5.1.71-1
 - Bug #497177 Fix pulseaudio daemon launch on clients
 - Fedora 11 points to final mirrorlists instead of rawhide


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	23 Apr 2009 04:21:44 -0000	1.27
+++ sources	30 Apr 2009 22:10:37 -0000	1.28
@@ -1 +1 @@
-a10866b71219cd6c5be7128280fc1462  ltsp-5.1.71.tar.bz2
+170702a6a602e08152b6169c0bb21d58  ltsp-5.1.72.tar.bz2



From wtogami at fedoraproject.org  Thu Apr 30 22:12:44 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 30 Apr 2009 22:12:44 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.23, 1.24 ltsp.spec, 1.31, 1.32 sources,
	1.27, 1.28
Message-ID: <20090430221244.2B05970092@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4830

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- no code changes, only important documentation update regarding disabling ltspbr0
  see /etc/sysconfig/network-scripts/ifcfg-ltspbr0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	23 Apr 2009 04:09:38 -0000	1.23
+++ .cvsignore	30 Apr 2009 22:12:13 -0000	1.24
@@ -1 +1 @@
-ltsp-5.1.71.tar.bz2
+ltsp-5.1.72.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ltsp.spec	23 Apr 2009 04:09:38 -0000	1.31
+++ ltsp.spec	30 Apr 2009 22:12:13 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           ltsp
-Version:        5.1.71
+Version:        5.1.72
 %define _datestamp .20090422.23
 #Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -412,6 +412,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 30 2009 Warren Togami <wtogami at redhat.com> - 5.1.72-1
+- no code changes, only important documentation update regarding disabling ltspbr0
+  see /etc/sysconfig/network-scripts/ifcfg-ltspbr0
+
 * Thu Apr 23 2009 Warren Togami <wtogami at redhat.com> - 5.1.71-1
 - Bug #497177 Fix pulseaudio daemon launch on clients
 - Fedora 11 points to final mirrorlists instead of rawhide


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	23 Apr 2009 04:09:38 -0000	1.27
+++ sources	30 Apr 2009 22:12:13 -0000	1.28
@@ -1 +1 @@
-a10866b71219cd6c5be7128280fc1462  ltsp-5.1.71.tar.bz2
+170702a6a602e08152b6169c0bb21d58  ltsp-5.1.72.tar.bz2



From dwalsh at fedoraproject.org  Thu Apr 30 22:22:03 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 30 Apr 2009 22:22:03 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.125,
	1.126 policy-20090105.patch, 1.105, 1.106 selinux-policy.spec,
	1.842, 1.843
Message-ID: <20090430222203.EBD0070092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7874

Modified Files:
	modules-targeted.conf policy-20090105.patch 
	selinux-policy.spec 
Log Message:
* Thu Apr 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-26
- Add shorewall policy



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- modules-targeted.conf	28 Apr 2009 20:09:21 -0000	1.125
+++ modules-targeted.conf	30 Apr 2009 22:21:59 -0000	1.126
@@ -1179,20 +1179,6 @@ rsync = module
 rwho = module
 
 # Layer: services
-# Module: sasl
-#
-# SASL authentication server
-# 
-sasl = module
-
-# Layer: services
-# Module: sendmail
-#
-# Policy for sendmail.
-# 
-sendmail = base
-
-# Layer: services
 # Module: samba
 #
 # SMB and CIFS client/server programs for UNIX and
@@ -1208,6 +1194,13 @@ samba = module
 # 
 sambagui = module
 
+# Layer: services
+# Module: sasl
+#
+# SASL authentication server
+# 
+sasl = module
+
 # Layer: apps
 # Module: screen
 #
@@ -1230,6 +1223,20 @@ selinux = base
 # 
 selinuxutil = base
 
+# Layer: services
+# Module: sendmail
+#
+# Policy for sendmail.
+# 
+sendmail = base
+
+# Layer: services
+# Module: shorewall
+#
+# Policy for shorewall
+# 
+shorewall = base
+
 # Layer: system
 # Module: setrans
 # Required in base

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- policy-20090105.patch	30 Apr 2009 11:51:05 -0000	1.105
+++ policy-20090105.patch	30 Apr 2009 22:21:59 -0000	1.106
@@ -788,7 +788,7 @@ diff -b -B --ignore-all-space --exclude-
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-28 15:47:35.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-30 14:18:18.000000000 -0400
 @@ -11,8 +11,8 @@
  init_daemon_domain(readahead_t, readahead_exec_t)
  application_domain(readahead_t, readahead_exec_t)
@@ -820,7 +820,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(readahead_t)
  kernel_dontaudit_getattr_core_if(readahead_t)
  
-@@ -46,6 +49,7 @@
+@@ -46,10 +49,12 @@
  storage_raw_read_fixed_disk(readahead_t)
  
  domain_use_interactive_fds(readahead_t)
@@ -828,7 +828,12 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_getattr_all_sockets(readahead_t)
  files_list_non_security(readahead_t)
-@@ -58,6 +62,7 @@
+ files_read_non_security_files(readahead_t)
++files_dontaudit_getattr_non_security_blk_files(readahead_t)
+ 
+ fs_getattr_all_fs(readahead_t)
+ fs_search_auto_mountpoints(readahead_t)
+@@ -58,6 +63,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -836,7 +841,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +77,7 @@
+@@ -72,6 +78,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -4847,7 +4852,7 @@ diff -b -B --ignore-all-space --exclude-
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-03-05 10:34:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-30 08:31:43.000000000 -0400
 @@ -32,6 +32,8 @@
  #
  # /etc
@@ -4866,7 +4871,15 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -299,3 +303,20 @@
+@@ -210,6 +214,7 @@
+ /usr/share/Modules/init(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/shorewall-shell(/.*)?        gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/turboprint/lib(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/X11R6/lib(64)?/X11/xkb/xkbcomp --	gen_context(system_u:object_r:bin_t,s0)
+@@ -299,3 +304,20 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5388,7 +5401,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-30 14:18:05.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -10372,7 +10385,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-29 13:51:27.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-30 17:45:01.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -10451,7 +10464,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +94,32 @@
+@@ -61,6 +94,33 @@
  ')
  
  optional_policy(`
@@ -10466,6 +10479,7 @@ diff -b -B --ignore-all-space --exclude-
  	xserver_stream_connect(consolekit_t)
 +	xserver_ptrace_xdm(consolekit_t)
 +	xserver_common_app(consolekit_t)
++	corenet_tcp_connect_xserver_port(consolekit_t)
 +')
 +
 +optional_policy(`
@@ -14990,8 +15004,8 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-29 10:14:21.000000000 -0400
-@@ -1,6 +1,10 @@
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-30 17:48:59.000000000 -0400
+@@ -1,6 +1,15 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
  
@@ -15004,6 +15018,11 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/miltermilter.*					gen_context(system_u:object_r:spamass_milter_state_t,s0)
 +
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
++/usr/sbin/milter-greylist			--	gen_context(system_u:object_r:greylist_milter_exec_t,s0)
++
++/var/lib/milter-greylist(/.*)?				gen_context(system_u:object_r:greylist_milter_data_t,s0)
++/var/run/milter-greylist(/.*)?				gen_context(system_u:object_r:greylist_milter_data_t,s0)
++/var/run/milter-greylist\.pid			--	gen_context(system_u:object_r:greylist_milter_data_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	2008-11-25 09:01:08.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 13:45:41.000000000 -0400
@@ -15043,7 +15062,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.te serefpolicy-3.6.12/policy/modules/services/milter.te
 --- nsaserefpolicy/policy/modules/services/milter.te	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 08:31:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-30 18:09:54.000000000 -0400
 @@ -14,6 +14,12 @@
  milter_template(regex)
  milter_template(spamass)
@@ -15068,6 +15087,47 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(spamass_milter_t)
  
  # When used with -b or -B options, the milter invokes sendmail to send mail
+@@ -53,3 +63,40 @@
+ 
+ # The main job of the milter is to pipe spam through spamc and act on the result
+ spamassassin_domtrans_client(spamass_milter_t)
++
++########################################
++#
++# milter-greylist Declarations
++#
++
++milter_template(greylist)
++
++########################################
++#
++# milter-greylist local policy
++#   ensure smtp clients retry mail like real MTAs and not spamware
++#   http://hcpnet.free.fr/milter-greylist/
++#
++
++# Look up username for dropping privs
++auth_use_nsswitch(greylist_milter_t)
++
++# It creates a pid file /var/run/milter-greylist.pid
++files_pid_filetrans(greylist_milter_t, greylist_milter_data_t, file)
++
++# It removes any existing socket (not owned by root) whilst running as root,
++# fixes permissions, renices itself and then calls setgid() and setuid() to
++# drop privileges
++kernel_read_kernel_sysctls(greylist_milter_t)
++allow greylist_milter_t self:capability { chown dac_override setgid setuid sys_nice };
++allow greylist_milter_t self:process { setsched getsched };
++
++# Allow the milter to read a GeoIP database in /usr/share
++files_read_usr_files(greylist_milter_t)
++
++# The milter runs from /var/lib/milter-greylist and maintains files there
++files_search_var_lib(greylist_milter_t);
++
++# Config is in /etc/mail/greylist.conf
++mta_read_config(greylist_milter_t)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.12/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/mta.fc	2009-04-23 09:44:57.000000000 -0400
@@ -15103,7 +15163,7 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.forward		--	gen_context(system_u:object_r:mail_forward_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.12/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/mta.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/mta.if	2009-04-30 08:19:03.000000000 -0400
 @@ -130,6 +130,15 @@
  		sendmail_create_log($1_mail_t)
  	')
@@ -15112,7 +15172,7 @@ diff -b -B --ignore-all-space --exclude-
 +		exim_read_log($1_mail_t)
 +		exim_append_log($1_mail_t)
 +		exim_manage_spool_files($1_mail_t)
-+')
++	')
 +
 +	optional_policy(`
 +		uucp_manage_spool($1_mail_t)
@@ -21425,7 +21485,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-29 13:03:31.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-30 08:12:22.000000000 -0400
 @@ -89,7 +89,7 @@
  		type sendmail_t;
  	')
@@ -21886,6 +21946,298 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(setroubleshootd_t)
  	rpm_dontaudit_manage_db(setroubleshootd_t)
  	rpm_use_script_fds(setroubleshootd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.fc serefpolicy-3.6.12/policy/modules/services/shorewall.fc
+--- nsaserefpolicy/policy/modules/services/shorewall.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/shorewall.fc	2009-04-30 08:33:41.000000000 -0400
+@@ -0,0 +1,12 @@
++
++/etc/rc\.d/init\.d/shorewall        	--      gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/shorewall-lite       --      gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
++
++/etc/shorewall(/.*)?            		gen_context(system_u:object_r:shorewall_etc_t,s0)
++/etc/shorewall-lite(/.*)?               	gen_context(system_u:object_r:shorewall_etc_t,s0)
++
++/sbin/shorewall				--	gen_context(system_u:object_r:shorewall_exec_t,s0)
++/sbin/shorewall-lite			--      gen_context(system_u:object_r:shorewall_exec_t,s0)
++
++/var/lib/shorewall(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
++/var/lib/shorewall-lite(/.*)?           	gen_context(system_u:object_r:shorewall_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.if serefpolicy-3.6.12/policy/modules/services/shorewall.if
+--- nsaserefpolicy/policy/modules/services/shorewall.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/shorewall.if	2009-04-30 08:29:56.000000000 -0400
+@@ -0,0 +1,166 @@
++## <summary>policy for shorewall</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run shorewall.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`shorewall_domtrans',`
++	gen_require(`
++		type shorewall_t; 
++		type shorewall_exec_t;
++	')
++
++	domtrans_pattern($1, shorewall_exec_t, shorewall_t)
++')
++
++#######################################
++## <summary>
++##      Read shorewall etc configuration files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_read_etc',`
++        gen_require(`
++                type shorewall_etc_t;
++        ')
++
++        files_search_etc($1)
++        read_files_pattern($1, shorewall_etc_t, shorewall_etc_t)
++')
++
++#######################################
++## <summary>
++##      Read shorewall PID files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_read_pid_files',`
++        gen_require(`
++                type shorewall_var_run_t;
++        ')
++
++        files_search_pids($1)
++        read_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
++')
++
++#######################################
++## <summary>
++##      Read and write shorewall PID files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_rw_pid_files',`
++        gen_require(`
++                type shorewall_var_run_t;
++        ')
++
++        files_search_pids($1)
++        rw_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
++')
++
++######################################
++## <summary>
++##      Read shorewall /var/lib files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_read_var_lib',`
++        gen_require(`
++                type shorewall_t;
++       ')
++
++        files_search_var_lib($1)
++        search_dirs_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++        read_files_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++')
++
++#######################################
++## <summary>
++##      Read and write shorewall /var/lib files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_rw_var_lib',`
++        gen_require(`
++                type shorewall_t;
++       ')
++
++        files_search_var_lib($1)
++        search_dirs_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++        rw_files_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++')
++
++#######################################
++## <summary>
++##      All of the rules required to administrate 
++##      an shorewall environment
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++## <param name="role">
++##      <summary>
++##      The role to be allowed to manage the syslog domain.
++##      </summary>
++## </param>
++## <rolecap/>
++#
++interface(`shorewall_admin',`
++        gen_require(`
++                type shorewall_t, shorewall_var_run_t, shorewall_lock_t;
++                type shorewall_initrc_exec_t, shorewall_var_lib_t;
++                type shorewall_tmp_t;
++        ')
++
++        allow $1 shorewall_t:process { ptrace signal_perms };
++        ps_process_pattern($1, shorewall_t)
++
++        init_labeled_script_domtrans($1, shorewall_initrc_exec_t)
++        domain_system_change_exemption($1)
++        role_transition $2 shorewall_initrc_exec_t system_r;
++        allow $2 system_r;
++
++        files_search_etc($1)
++        admin_pattern($1, shorewall_etc_t)
++
++	files_search_locks($1)
++	admin_pattern($1, shorewall_lock_t)
++
++        files_search_pids($1)
++        admin_pattern($1, shorewall_var_run_t)
++
++        files_search_var_lib($1)
++        admin_pattern($1, shorewall_var_lib_t)
++
++        files_search_tmp($1)
++        admin_pattern($1, shorewall_tmp_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.te serefpolicy-3.6.12/policy/modules/services/shorewall.te
+--- nsaserefpolicy/policy/modules/services/shorewall.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/shorewall.te	2009-04-30 08:29:56.000000000 -0400
+@@ -0,0 +1,102 @@
++policy_module(shorewall,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type shorewall_t;
++type shorewall_exec_t;
++init_daemon_domain(shorewall_t, shorewall_exec_t)
++
++type shorewall_initrc_exec_t;
++init_script_file(shorewall_initrc_exec_t)
++
++# etc files
++type shorewall_etc_t;
++files_config_file(shorewall_etc_t)
++
++# lock files
++type shorewall_lock_t;
++files_lock_file(shorewall_lock_t)
++
++# tmp files
++type shorewall_tmp_t;
++files_tmp_file(shorewall_tmp_t)
++
++# var/lib files
++type shorewall_var_lib_t;
++files_type(shorewall_var_lib_t)
++
++########################################
++#
++# shorewall local policy
++#
++
++allow shorewall_t self:capability { dac_override net_admin net_raw setuid setgid sys_nice sys_ptrace};
++dontaudit shorewall_t self:capability sys_tty_config;
++
++allow shorewall_t self:fifo_file rw_fifo_file_perms;
++
++# etc file
++read_files_pattern(shorewall_t, shorewall_etc_t, shorewall_etc_t)
++list_dirs_pattern(shorewall_t, shorewall_etc_t, shorewall_etc_t)
++
++# lock files
++manage_files_pattern(shorewall_t,shorewall_lock_t,shorewall_lock_t)
++files_lock_filetrans(shorewall_t, shorewall_lock_t, file)
++
++# var/lib files for shorewall
++exec_files_pattern(shorewall_t,shorewall_var_lib_t,shorewall_var_lib_t)
++manage_dirs_pattern(shorewall_t,shorewall_var_lib_t,shorewall_var_lib_t)
++manage_files_pattern(shorewall_t,shorewall_var_lib_t,shorewall_var_lib_t)
++files_var_lib_filetrans(shorewall_t,shorewall_var_lib_t, { dir file })
++
++# tmp files for shorewall
++manage_dirs_pattern(shorewall_t,shorewall_tmp_t,shorewall_tmp_t)
++manage_files_pattern(shorewall_t,shorewall_tmp_t,shorewall_tmp_t)
++files_tmp_filetrans(shorewall_t, shorewall_tmp_t, { file dir })
++
++kernel_read_kernel_sysctls(shorewall_t)
++kernel_read_system_state(shorewall_t)
++kernel_read_network_state(shorewall_t)
++kernel_rw_net_sysctls(shorewall_t)
++
++corecmd_exec_bin(shorewall_t)
++corecmd_exec_shell(shorewall_t)
++
++dev_read_urand(shorewall_t)
++
++fs_getattr_all_fs(shorewall_t)
++
++domain_read_all_domains_state(shorewall_t)
++
++files_getattr_kernel_modules(shorewall_t)
++files_read_etc_files(shorewall_t)
++files_read_usr_files(shorewall_t)
++files_search_kernel_modules(shorewall_t)
++
++init_rw_utmp(shorewall_t)
++
++libs_use_ld_so(shorewall_t)
++libs_use_shared_libs(shorewall_t)
++
++logging_send_syslog_msg(shorewall_t)
++
++miscfiles_read_localization(shorewall_t)
++
++userdom_dontaudit_list_admin_dir(shorewall_t)
++
++sysnet_domtrans_ifconfig(shorewall_t)
++iptables_domtrans(shorewall_t)
++
++optional_policy(`
++        modutils_domtrans_insmod(shorewall_t)
++')
++
++optional_policy(`
++	ulogd_search_log(shorewall_t)
++')
++
++permissive shorewall_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.12/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/smartmon.te	2009-04-23 09:44:57.000000000 -0400
@@ -22122,7 +22474,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-27 11:45:25.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-30 08:12:59.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -22178,7 +22530,15 @@ diff -b -B --ignore-all-space --exclude-
  type spamd_spool_t;
  files_type(spamd_spool_t)
  
-@@ -159,6 +195,7 @@
+@@ -110,6 +146,7 @@
+ dev_read_urand(spamassassin_t)
+ 
+ fs_search_auto_mountpoints(spamassassin_t)
++fs_getattr_all_fs(spamassassin_t)
+ 
+ # this should probably be removed
+ corecmd_list_bin(spamassassin_t)
+@@ -159,6 +196,7 @@
  	corenet_udp_sendrecv_all_ports(spamassassin_t)
  	corenet_tcp_connect_all_ports(spamassassin_t)
  	corenet_sendrecv_all_client_packets(spamassassin_t)
@@ -22186,7 +22546,15 @@ diff -b -B --ignore-all-space --exclude-
  
  	sysnet_read_config(spamassassin_t)
  ')
-@@ -216,16 +253,32 @@
+@@ -195,6 +233,7 @@
+ optional_policy(`
+ 	mta_read_config(spamassassin_t)
+ 	sendmail_stub(spamassassin_t)
++	sendmail_rw_unix_stream_sockets(spamassassin_t)
+ ')
+ 
+ ########################################
+@@ -216,16 +255,32 @@
  allow spamc_t self:unix_stream_socket connectto;
  allow spamc_t self:tcp_socket create_stream_socket_perms;
  allow spamc_t self:udp_socket create_socket_perms;
@@ -22219,7 +22587,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -239,6 +292,7 @@
+@@ -239,6 +294,7 @@
  corenet_sendrecv_all_client_packets(spamc_t)
  
  fs_search_auto_mountpoints(spamc_t)
@@ -22227,7 +22595,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # cjp: these should probably be removed:
  corecmd_list_bin(spamc_t)
-@@ -255,9 +309,15 @@
+@@ -255,9 +311,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -22243,7 +22611,7 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,13 +325,16 @@
+@@ -265,13 +327,16 @@
  
  sysnet_read_config(spamc_t)
  
@@ -22267,7 +22635,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -280,16 +343,21 @@
+@@ -280,16 +345,21 @@
  ')
  
  optional_policy(`
@@ -22291,7 +22659,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -301,7 +369,7 @@
+@@ -301,7 +371,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -22300,7 +22668,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +385,13 @@
+@@ -317,10 +387,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -22315,7 +22683,7 @@ diff -b -B --ignore-all-space --exclude-
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +400,11 @@
+@@ -329,10 +402,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -22328,7 +22696,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +454,27 @@
+@@ -382,22 +456,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -22360,7 +22728,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +492,7 @@
+@@ -415,6 +494,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -22368,7 +22736,7 @@ diff -b -B --ignore-all-space --exclude-
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +502,6 @@
+@@ -424,10 +504,6 @@
  ')
  
  optional_policy(`
@@ -22379,7 +22747,7 @@ diff -b -B --ignore-all-space --exclude-
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +516,10 @@
+@@ -442,6 +518,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22390,7 +22758,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -454,5 +532,9 @@
+@@ -454,5 +534,9 @@
  ')
  
  optional_policy(`
@@ -23312,8 +23680,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/log/ulogd(/.*)?					gen_context(system_u:object_r:ulogd_var_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.if serefpolicy-3.6.12/policy/modules/services/ulogd.if
 --- nsaserefpolicy/policy/modules/services/ulogd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ulogd.if	2009-04-23 09:44:57.000000000 -0400
-@@ -0,0 +1,127 @@
++++ serefpolicy-3.6.12/policy/modules/services/ulogd.if	2009-04-30 08:29:56.000000000 -0400
+@@ -0,0 +1,146 @@
 +## <summary>policy for ulogd</summary>
 +
 +########################################
@@ -23378,6 +23746,25 @@ diff -b -B --ignore-all-space --exclude-
 +        read_files_pattern($1, ulogd_var_log_t, ulogd_var_log_t)
 +')
 +
++#######################################
++## <summary>
++##      Allow the specified domain to search ulogd's log files.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ulogd_search_log',`
++        gen_require(`
++                type ulogd_var_log_t;
++        ')
++
++        logging_search_logs($1)
++        allow $1 ulogd_var_log_t:dir search_dir_perms;
++')
++
 +########################################
 +## <summary>
 +##      Allow the specified domain to append to ulogd's log files.
@@ -23693,7 +24080,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-27 11:40:19.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-30 18:07:51.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23905,11 +24292,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -198,5 +272,80 @@
- ')
+@@ -195,8 +269,84 @@
  
- optional_policy(`
--	unconfined_domain(virtd_t)
+ 	xen_stream_connect(virtd_t)
+ 	xen_stream_connect_xenstore(virtd_t)
++	xen_read_image_files(virtd_t)
++')
++
++optional_policy(`
 +	udev_domtrans(virtd_t)
 +')
 +
@@ -23982,9 +24372,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	xen_rw_image_files(svirt_t)
-+')
-+
-+optional_policy(`
+ ')
+ 
+ optional_policy(`
+-	unconfined_domain(virtd_t)
 +	xen_rw_image_files(svirt_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.6.12/policy/modules/services/w3c.te
@@ -24081,7 +24472,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.12/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-30 17:44:47.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -26711,8 +27102,8 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_urand(racoon_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.12/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2009-04-06 12:42:08.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/iptables.fc	2009-04-23 09:44:57.000000000 -0400
-@@ -1,9 +1,12 @@
++++ serefpolicy-3.6.12/policy/modules/system/iptables.fc	2009-04-30 08:29:56.000000000 -0400
+@@ -1,9 +1,11 @@
  /sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
  /sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 -/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
@@ -26727,7 +27118,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/iptables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 +/usr/sbin/iptables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
  
- /var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
+-/var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-04-06 12:42:08.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/system/iptables.te	2009-04-23 09:44:57.000000000 -0400
@@ -28774,7 +29165,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.12/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-30 18:03:37.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -28945,7 +29336,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-30 18:03:46.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -28983,16 +29374,17 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(dhcpc_t,dhcpc_state_t,dhcpc_state_t)
  filetrans_pattern(dhcpc_t,dhcp_state_t,dhcpc_state_t,file)
  
-@@ -65,7 +69,7 @@
+@@ -65,7 +69,8 @@
  
  # Allow read/write to /etc/resolv.conf and /etc/ntp.conf. Note that any files
  # in /etc created by dhcpcd will be labelled net_conf_t.
 -allow dhcpc_t net_conf_t:file manage_file_perms;
 +sysnet_manage_config(dhcpc_t)
++allow dhcpc_t net_conf_t:file relabel_file_perms;
  files_etc_filetrans(dhcpc_t,net_conf_t,file)
  
  # create temp files
-@@ -116,7 +120,7 @@
+@@ -116,7 +121,7 @@
  corecmd_exec_shell(dhcpc_t)
  
  domain_use_interactive_fds(dhcpc_t)
@@ -29001,7 +29393,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(dhcpc_t)
  files_read_etc_runtime_files(dhcpc_t)
-@@ -183,25 +187,23 @@
+@@ -183,25 +188,23 @@
  ')
  
  optional_policy(`
@@ -29035,7 +29427,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,6 +214,7 @@
+@@ -212,6 +215,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -29043,7 +29435,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -223,6 +226,10 @@
+@@ -223,6 +227,10 @@
  ')
  
  optional_policy(`
@@ -29054,7 +29446,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_xen_state(dhcpc_t)
  	kernel_write_xen_state(dhcpc_t)
  	xen_append_log(dhcpc_t)
-@@ -236,7 +243,6 @@
+@@ -236,7 +244,6 @@
  
  allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
  allow ifconfig_t self:capability { net_raw net_admin sys_tty_config };
@@ -29062,7 +29454,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ifconfig_t self:fd use;
  allow ifconfig_t self:fifo_file rw_fifo_file_perms;
-@@ -250,6 +256,7 @@
+@@ -250,6 +257,7 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -29070,7 +29462,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Create UDP sockets, necessary when called from dhcpc
  allow ifconfig_t self:udp_socket create_socket_perms;
-@@ -259,13 +266,20 @@
+@@ -259,13 +267,20 @@
  allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
  allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
  allow ifconfig_t self:tcp_socket { create ioctl };
@@ -29091,7 +29483,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_rw_tun_tap_dev(ifconfig_t)
  
-@@ -276,8 +290,13 @@
+@@ -276,8 +291,13 @@
  fs_getattr_xattr_fs(ifconfig_t)
  fs_search_auto_mountpoints(ifconfig_t)
  
@@ -29105,7 +29497,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(ifconfig_t)
  
-@@ -296,6 +315,8 @@
+@@ -296,6 +316,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -29114,7 +29506,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -332,6 +353,14 @@
+@@ -332,6 +354,14 @@
  ')
  
  optional_policy(`
@@ -32215,8 +32607,17 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.12/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-23 09:44:57.000000000 -0400
-@@ -167,11 +167,14 @@
++++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-30 18:08:14.000000000 -0400
+@@ -71,6 +71,8 @@
+ 	')
+ 
+ 	files_list_var_lib($1)
++
++	list_dirs_pattern($1, xend_var_lib_t, xend_var_lib_t)
+ 	read_files_pattern($1,{ xend_var_lib_t xen_image_t },xen_image_t)
+ ')
+ 
+@@ -167,11 +169,14 @@
  #
  interface(`xen_stream_connect',`
  	gen_require(`
@@ -32232,7 +32633,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -191,3 +194,46 @@
+@@ -191,3 +196,46 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
  ')
@@ -32571,7 +32972,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-30 18:02:45.000000000 -0400
 @@ -225,7 +225,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -p -r1.842 -r1.843
--- selinux-policy.spec	30 Apr 2009 11:51:07 -0000	1.842
+++ selinux-policy.spec	30 Apr 2009 22:22:00 -0000	1.843
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,7 +480,10 @@ exit 0
 %endif
 
 %changelog
-* Wed Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
+* Thu Apr 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-26
+- Add shorewall policy
+
+* Wed Apr 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
 - Additional rules for fprintd and sssd
 
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24



From dwalsh at fedoraproject.org  Thu Apr 30 22:22:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 30 Apr 2009 22:22:24 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 modules-targeted.conf, 1.125,
	1.126 policy-20090105.patch, 1.111, 1.112 selinux-policy.spec,
	1.848, 1.849
Message-ID: <20090430222224.AF6DC70092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7834

Modified Files:
	modules-targeted.conf policy-20090105.patch 
	selinux-policy.spec 
Log Message:
* Thu Apr 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-26
- Add shorewall policy



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-targeted.conf,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- modules-targeted.conf	28 Apr 2009 20:09:25 -0000	1.125
+++ modules-targeted.conf	30 Apr 2009 22:21:52 -0000	1.126
@@ -1179,20 +1179,6 @@ rsync = module
 rwho = module
 
 # Layer: services
-# Module: sasl
-#
-# SASL authentication server
-# 
-sasl = module
-
-# Layer: services
-# Module: sendmail
-#
-# Policy for sendmail.
-# 
-sendmail = base
-
-# Layer: services
 # Module: samba
 #
 # SMB and CIFS client/server programs for UNIX and
@@ -1208,6 +1194,13 @@ samba = module
 # 
 sambagui = module
 
+# Layer: services
+# Module: sasl
+#
+# SASL authentication server
+# 
+sasl = module
+
 # Layer: apps
 # Module: screen
 #
@@ -1230,6 +1223,20 @@ selinux = base
 # 
 selinuxutil = base
 
+# Layer: services
+# Module: sendmail
+#
+# Policy for sendmail.
+# 
+sendmail = base
+
+# Layer: services
+# Module: shorewall
+#
+# Policy for shorewall
+# 
+shorewall = base
+
 # Layer: system
 # Module: setrans
 # Required in base

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090105.patch,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- policy-20090105.patch	30 Apr 2009 11:51:03 -0000	1.111
+++ policy-20090105.patch	30 Apr 2009 22:21:52 -0000	1.112
@@ -788,7 +788,7 @@ diff -b -B --ignore-all-space --exclude-
 -/usr/sbin/readahead	--	gen_context(system_u:object_r:readahead_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-28 15:47:35.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-04-30 14:18:18.000000000 -0400
 @@ -11,8 +11,8 @@
  init_daemon_domain(readahead_t, readahead_exec_t)
  application_domain(readahead_t, readahead_exec_t)
@@ -820,7 +820,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(readahead_t)
  kernel_dontaudit_getattr_core_if(readahead_t)
  
-@@ -46,6 +49,7 @@
+@@ -46,10 +49,12 @@
  storage_raw_read_fixed_disk(readahead_t)
  
  domain_use_interactive_fds(readahead_t)
@@ -828,7 +828,12 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_getattr_all_sockets(readahead_t)
  files_list_non_security(readahead_t)
-@@ -58,6 +62,7 @@
+ files_read_non_security_files(readahead_t)
++files_dontaudit_getattr_non_security_blk_files(readahead_t)
+ 
+ fs_getattr_all_fs(readahead_t)
+ fs_search_auto_mountpoints(readahead_t)
+@@ -58,6 +63,7 @@
  fs_dontaudit_search_ramfs(readahead_t)
  fs_dontaudit_read_ramfs_pipes(readahead_t)
  fs_dontaudit_read_ramfs_files(readahead_t)
@@ -836,7 +841,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_read_tmpfs_symlinks(readahead_t)
  fs_list_inotifyfs(readahead_t)
  
-@@ -72,6 +77,7 @@
+@@ -72,6 +78,7 @@
  init_getattr_initctl(readahead_t)
  
  logging_send_syslog_msg(readahead_t)
@@ -4847,7 +4852,7 @@ diff -b -B --ignore-all-space --exclude-
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-03-05 10:34:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-04-30 08:31:43.000000000 -0400
 @@ -32,6 +32,8 @@
  #
  # /etc
@@ -4866,7 +4871,15 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -299,3 +303,20 @@
+@@ -210,6 +214,7 @@
+ /usr/share/Modules/init(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/shorewall-shell(/.*)?        gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/turboprint/lib(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/X11R6/lib(64)?/X11/xkb/xkbcomp --	gen_context(system_u:object_r:bin_t,s0)
+@@ -299,3 +304,20 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5388,7 +5401,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/kernel/files.if	2009-04-30 14:18:05.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -10372,7 +10385,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-29 13:51:27.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-04-30 17:45:01.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -10451,7 +10464,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +94,32 @@
+@@ -61,6 +94,33 @@
  ')
  
  optional_policy(`
@@ -10466,6 +10479,7 @@ diff -b -B --ignore-all-space --exclude-
  	xserver_stream_connect(consolekit_t)
 +	xserver_ptrace_xdm(consolekit_t)
 +	xserver_common_app(consolekit_t)
++	corenet_tcp_connect_xserver_port(consolekit_t)
 +')
 +
 +optional_policy(`
@@ -14990,8 +15004,8 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.fc serefpolicy-3.6.12/policy/modules/services/milter.fc
 --- nsaserefpolicy/policy/modules/services/milter.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-29 10:14:21.000000000 -0400
-@@ -1,6 +1,10 @@
++++ serefpolicy-3.6.12/policy/modules/services/milter.fc	2009-04-30 17:48:59.000000000 -0400
+@@ -1,6 +1,15 @@
 -/usr/sbin/milter-regex				--	gen_context(system_u:object_r:regex_milter_exec_t,s0)
 -/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
  
@@ -15004,6 +15018,11 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/miltermilter.*					gen_context(system_u:object_r:spamass_milter_state_t,s0)
 +
 +/var/spool/milter-regex(/.*)?				gen_context(system_u:object_r:regex_milter_data_t,s0)
++/usr/sbin/milter-greylist			--	gen_context(system_u:object_r:greylist_milter_exec_t,s0)
++
++/var/lib/milter-greylist(/.*)?				gen_context(system_u:object_r:greylist_milter_data_t,s0)
++/var/run/milter-greylist(/.*)?				gen_context(system_u:object_r:greylist_milter_data_t,s0)
++/var/run/milter-greylist\.pid			--	gen_context(system_u:object_r:greylist_milter_data_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	2008-11-25 09:01:08.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-04-24 13:45:41.000000000 -0400
@@ -15043,7 +15062,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.te serefpolicy-3.6.12/policy/modules/services/milter.te
 --- nsaserefpolicy/policy/modules/services/milter.te	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-24 08:31:02.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/milter.te	2009-04-30 18:09:54.000000000 -0400
 @@ -14,6 +14,12 @@
  milter_template(regex)
  milter_template(spamass)
@@ -15068,6 +15087,47 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(spamass_milter_t)
  
  # When used with -b or -B options, the milter invokes sendmail to send mail
+@@ -53,3 +63,40 @@
+ 
+ # The main job of the milter is to pipe spam through spamc and act on the result
+ spamassassin_domtrans_client(spamass_milter_t)
++
++########################################
++#
++# milter-greylist Declarations
++#
++
++milter_template(greylist)
++
++########################################
++#
++# milter-greylist local policy
++#   ensure smtp clients retry mail like real MTAs and not spamware
++#   http://hcpnet.free.fr/milter-greylist/
++#
++
++# Look up username for dropping privs
++auth_use_nsswitch(greylist_milter_t)
++
++# It creates a pid file /var/run/milter-greylist.pid
++files_pid_filetrans(greylist_milter_t, greylist_milter_data_t, file)
++
++# It removes any existing socket (not owned by root) whilst running as root,
++# fixes permissions, renices itself and then calls setgid() and setuid() to
++# drop privileges
++kernel_read_kernel_sysctls(greylist_milter_t)
++allow greylist_milter_t self:capability { chown dac_override setgid setuid sys_nice };
++allow greylist_milter_t self:process { setsched getsched };
++
++# Allow the milter to read a GeoIP database in /usr/share
++files_read_usr_files(greylist_milter_t)
++
++# The milter runs from /var/lib/milter-greylist and maintains files there
++files_search_var_lib(greylist_milter_t);
++
++# Config is in /etc/mail/greylist.conf
++mta_read_config(greylist_milter_t)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.12/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/services/mta.fc	2009-04-23 09:44:57.000000000 -0400
@@ -15103,7 +15163,7 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.forward		--	gen_context(system_u:object_r:mail_forward_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.12/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/mta.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/mta.if	2009-04-30 08:19:03.000000000 -0400
 @@ -130,6 +130,15 @@
  		sendmail_create_log($1_mail_t)
  	')
@@ -15112,7 +15172,7 @@ diff -b -B --ignore-all-space --exclude-
 +		exim_read_log($1_mail_t)
 +		exim_append_log($1_mail_t)
 +		exim_manage_spool_files($1_mail_t)
-+')
++	')
 +
 +	optional_policy(`
 +		uucp_manage_spool($1_mail_t)
@@ -21425,7 +21485,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-29 13:03:31.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-04-30 08:12:22.000000000 -0400
 @@ -89,7 +89,7 @@
  		type sendmail_t;
  	')
@@ -21886,6 +21946,298 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(setroubleshootd_t)
  	rpm_dontaudit_manage_db(setroubleshootd_t)
  	rpm_use_script_fds(setroubleshootd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.fc serefpolicy-3.6.12/policy/modules/services/shorewall.fc
+--- nsaserefpolicy/policy/modules/services/shorewall.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/shorewall.fc	2009-04-30 08:33:41.000000000 -0400
+@@ -0,0 +1,12 @@
++
++/etc/rc\.d/init\.d/shorewall        	--      gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/shorewall-lite       --      gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
++
++/etc/shorewall(/.*)?            		gen_context(system_u:object_r:shorewall_etc_t,s0)
++/etc/shorewall-lite(/.*)?               	gen_context(system_u:object_r:shorewall_etc_t,s0)
++
++/sbin/shorewall				--	gen_context(system_u:object_r:shorewall_exec_t,s0)
++/sbin/shorewall-lite			--      gen_context(system_u:object_r:shorewall_exec_t,s0)
++
++/var/lib/shorewall(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
++/var/lib/shorewall-lite(/.*)?           	gen_context(system_u:object_r:shorewall_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.if serefpolicy-3.6.12/policy/modules/services/shorewall.if
+--- nsaserefpolicy/policy/modules/services/shorewall.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/shorewall.if	2009-04-30 08:29:56.000000000 -0400
+@@ -0,0 +1,166 @@
++## <summary>policy for shorewall</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run shorewall.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`shorewall_domtrans',`
++	gen_require(`
++		type shorewall_t; 
++		type shorewall_exec_t;
++	')
++
++	domtrans_pattern($1, shorewall_exec_t, shorewall_t)
++')
++
++#######################################
++## <summary>
++##      Read shorewall etc configuration files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_read_etc',`
++        gen_require(`
++                type shorewall_etc_t;
++        ')
++
++        files_search_etc($1)
++        read_files_pattern($1, shorewall_etc_t, shorewall_etc_t)
++')
++
++#######################################
++## <summary>
++##      Read shorewall PID files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_read_pid_files',`
++        gen_require(`
++                type shorewall_var_run_t;
++        ')
++
++        files_search_pids($1)
++        read_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
++')
++
++#######################################
++## <summary>
++##      Read and write shorewall PID files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_rw_pid_files',`
++        gen_require(`
++                type shorewall_var_run_t;
++        ')
++
++        files_search_pids($1)
++        rw_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
++')
++
++######################################
++## <summary>
++##      Read shorewall /var/lib files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_read_var_lib',`
++        gen_require(`
++                type shorewall_t;
++       ')
++
++        files_search_var_lib($1)
++        search_dirs_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++        read_files_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++')
++
++#######################################
++## <summary>
++##      Read and write shorewall /var/lib files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`shorewall_rw_var_lib',`
++        gen_require(`
++                type shorewall_t;
++       ')
++
++        files_search_var_lib($1)
++        search_dirs_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++        rw_files_pattern($1, shorewall_var_lib_t, shorewall_var_lib_t)
++')
++
++#######################################
++## <summary>
++##      All of the rules required to administrate 
++##      an shorewall environment
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++## <param name="role">
++##      <summary>
++##      The role to be allowed to manage the syslog domain.
++##      </summary>
++## </param>
++## <rolecap/>
++#
++interface(`shorewall_admin',`
++        gen_require(`
++                type shorewall_t, shorewall_var_run_t, shorewall_lock_t;
++                type shorewall_initrc_exec_t, shorewall_var_lib_t;
++                type shorewall_tmp_t;
++        ')
++
++        allow $1 shorewall_t:process { ptrace signal_perms };
++        ps_process_pattern($1, shorewall_t)
++
++        init_labeled_script_domtrans($1, shorewall_initrc_exec_t)
++        domain_system_change_exemption($1)
++        role_transition $2 shorewall_initrc_exec_t system_r;
++        allow $2 system_r;
++
++        files_search_etc($1)
++        admin_pattern($1, shorewall_etc_t)
++
++	files_search_locks($1)
++	admin_pattern($1, shorewall_lock_t)
++
++        files_search_pids($1)
++        admin_pattern($1, shorewall_var_run_t)
++
++        files_search_var_lib($1)
++        admin_pattern($1, shorewall_var_lib_t)
++
++        files_search_tmp($1)
++        admin_pattern($1, shorewall_tmp_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.te serefpolicy-3.6.12/policy/modules/services/shorewall.te
+--- nsaserefpolicy/policy/modules/services/shorewall.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.12/policy/modules/services/shorewall.te	2009-04-30 08:29:56.000000000 -0400
+@@ -0,0 +1,102 @@
++policy_module(shorewall,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type shorewall_t;
++type shorewall_exec_t;
++init_daemon_domain(shorewall_t, shorewall_exec_t)
++
++type shorewall_initrc_exec_t;
++init_script_file(shorewall_initrc_exec_t)
++
++# etc files
++type shorewall_etc_t;
++files_config_file(shorewall_etc_t)
++
++# lock files
++type shorewall_lock_t;
++files_lock_file(shorewall_lock_t)
++
++# tmp files
++type shorewall_tmp_t;
++files_tmp_file(shorewall_tmp_t)
++
++# var/lib files
++type shorewall_var_lib_t;
++files_type(shorewall_var_lib_t)
++
++########################################
++#
++# shorewall local policy
++#
++
++allow shorewall_t self:capability { dac_override net_admin net_raw setuid setgid sys_nice sys_ptrace};
++dontaudit shorewall_t self:capability sys_tty_config;
++
++allow shorewall_t self:fifo_file rw_fifo_file_perms;
++
++# etc file
++read_files_pattern(shorewall_t, shorewall_etc_t, shorewall_etc_t)
++list_dirs_pattern(shorewall_t, shorewall_etc_t, shorewall_etc_t)
++
++# lock files
++manage_files_pattern(shorewall_t,shorewall_lock_t,shorewall_lock_t)
++files_lock_filetrans(shorewall_t, shorewall_lock_t, file)
++
++# var/lib files for shorewall
++exec_files_pattern(shorewall_t,shorewall_var_lib_t,shorewall_var_lib_t)
++manage_dirs_pattern(shorewall_t,shorewall_var_lib_t,shorewall_var_lib_t)
++manage_files_pattern(shorewall_t,shorewall_var_lib_t,shorewall_var_lib_t)
++files_var_lib_filetrans(shorewall_t,shorewall_var_lib_t, { dir file })
++
++# tmp files for shorewall
++manage_dirs_pattern(shorewall_t,shorewall_tmp_t,shorewall_tmp_t)
++manage_files_pattern(shorewall_t,shorewall_tmp_t,shorewall_tmp_t)
++files_tmp_filetrans(shorewall_t, shorewall_tmp_t, { file dir })
++
++kernel_read_kernel_sysctls(shorewall_t)
++kernel_read_system_state(shorewall_t)
++kernel_read_network_state(shorewall_t)
++kernel_rw_net_sysctls(shorewall_t)
++
++corecmd_exec_bin(shorewall_t)
++corecmd_exec_shell(shorewall_t)
++
++dev_read_urand(shorewall_t)
++
++fs_getattr_all_fs(shorewall_t)
++
++domain_read_all_domains_state(shorewall_t)
++
++files_getattr_kernel_modules(shorewall_t)
++files_read_etc_files(shorewall_t)
++files_read_usr_files(shorewall_t)
++files_search_kernel_modules(shorewall_t)
++
++init_rw_utmp(shorewall_t)
++
++libs_use_ld_so(shorewall_t)
++libs_use_shared_libs(shorewall_t)
++
++logging_send_syslog_msg(shorewall_t)
++
++miscfiles_read_localization(shorewall_t)
++
++userdom_dontaudit_list_admin_dir(shorewall_t)
++
++sysnet_domtrans_ifconfig(shorewall_t)
++iptables_domtrans(shorewall_t)
++
++optional_policy(`
++        modutils_domtrans_insmod(shorewall_t)
++')
++
++optional_policy(`
++	ulogd_search_log(shorewall_t)
++')
++
++permissive shorewall_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.12/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.12/policy/modules/services/smartmon.te	2009-04-23 09:44:57.000000000 -0400
@@ -22122,7 +22474,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-27 11:45:25.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-04-30 08:12:59.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -22178,7 +22530,15 @@ diff -b -B --ignore-all-space --exclude-
  type spamd_spool_t;
  files_type(spamd_spool_t)
  
-@@ -159,6 +195,7 @@
+@@ -110,6 +146,7 @@
+ dev_read_urand(spamassassin_t)
+ 
+ fs_search_auto_mountpoints(spamassassin_t)
++fs_getattr_all_fs(spamassassin_t)
+ 
+ # this should probably be removed
+ corecmd_list_bin(spamassassin_t)
+@@ -159,6 +196,7 @@
  	corenet_udp_sendrecv_all_ports(spamassassin_t)
  	corenet_tcp_connect_all_ports(spamassassin_t)
  	corenet_sendrecv_all_client_packets(spamassassin_t)
@@ -22186,7 +22546,15 @@ diff -b -B --ignore-all-space --exclude-
  
  	sysnet_read_config(spamassassin_t)
  ')
-@@ -216,16 +253,32 @@
+@@ -195,6 +233,7 @@
+ optional_policy(`
+ 	mta_read_config(spamassassin_t)
+ 	sendmail_stub(spamassassin_t)
++	sendmail_rw_unix_stream_sockets(spamassassin_t)
+ ')
+ 
+ ########################################
+@@ -216,16 +255,32 @@
  allow spamc_t self:unix_stream_socket connectto;
  allow spamc_t self:tcp_socket create_stream_socket_perms;
  allow spamc_t self:udp_socket create_socket_perms;
@@ -22219,7 +22587,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -239,6 +292,7 @@
+@@ -239,6 +294,7 @@
  corenet_sendrecv_all_client_packets(spamc_t)
  
  fs_search_auto_mountpoints(spamc_t)
@@ -22227,7 +22595,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # cjp: these should probably be removed:
  corecmd_list_bin(spamc_t)
-@@ -255,9 +309,15 @@
+@@ -255,9 +311,15 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
@@ -22243,7 +22611,7 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,13 +325,16 @@
+@@ -265,13 +327,16 @@
  
  sysnet_read_config(spamc_t)
  
@@ -22267,7 +22635,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -280,16 +343,21 @@
+@@ -280,16 +345,21 @@
  ')
  
  optional_policy(`
@@ -22291,7 +22659,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -301,7 +369,7 @@
+@@ -301,7 +371,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -22300,7 +22668,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -317,10 +385,13 @@
+@@ -317,10 +387,13 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -22315,7 +22683,7 @@ diff -b -B --ignore-all-space --exclude-
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +400,11 @@
+@@ -329,10 +402,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -22328,7 +22696,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +454,27 @@
+@@ -382,22 +456,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -22360,7 +22728,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +492,7 @@
+@@ -415,6 +494,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -22368,7 +22736,7 @@ diff -b -B --ignore-all-space --exclude-
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +502,6 @@
+@@ -424,10 +504,6 @@
  ')
  
  optional_policy(`
@@ -22379,7 +22747,7 @@ diff -b -B --ignore-all-space --exclude-
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +516,10 @@
+@@ -442,6 +518,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22390,7 +22758,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -454,5 +532,9 @@
+@@ -454,5 +534,9 @@
  ')
  
  optional_policy(`
@@ -23312,8 +23680,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/log/ulogd(/.*)?					gen_context(system_u:object_r:ulogd_var_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.if serefpolicy-3.6.12/policy/modules/services/ulogd.if
 --- nsaserefpolicy/policy/modules/services/ulogd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/ulogd.if	2009-04-23 09:44:57.000000000 -0400
-@@ -0,0 +1,127 @@
++++ serefpolicy-3.6.12/policy/modules/services/ulogd.if	2009-04-30 08:29:56.000000000 -0400
+@@ -0,0 +1,146 @@
 +## <summary>policy for ulogd</summary>
 +
 +########################################
@@ -23378,6 +23746,25 @@ diff -b -B --ignore-all-space --exclude-
 +        read_files_pattern($1, ulogd_var_log_t, ulogd_var_log_t)
 +')
 +
++#######################################
++## <summary>
++##      Allow the specified domain to search ulogd's log files.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ulogd_search_log',`
++        gen_require(`
++                type ulogd_var_log_t;
++        ')
++
++        logging_search_logs($1)
++        allow $1 ulogd_var_log_t:dir search_dir_perms;
++')
++
 +########################################
 +## <summary>
 +##      Allow the specified domain to append to ulogd's log files.
@@ -23693,7 +24080,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-27 11:40:19.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-04-30 18:07:51.000000000 -0400
 @@ -8,19 +8,24 @@
  
  ## <desc>
@@ -23905,11 +24292,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -198,5 +272,80 @@
- ')
+@@ -195,8 +269,84 @@
  
- optional_policy(`
--	unconfined_domain(virtd_t)
+ 	xen_stream_connect(virtd_t)
+ 	xen_stream_connect_xenstore(virtd_t)
++	xen_read_image_files(virtd_t)
++')
++
++optional_policy(`
 +	udev_domtrans(virtd_t)
 +')
 +
@@ -23982,9 +24372,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	xen_rw_image_files(svirt_t)
-+')
-+
-+optional_policy(`
+ ')
+ 
+ optional_policy(`
+-	unconfined_domain(virtd_t)
 +	xen_rw_image_files(svirt_t)
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.6.12/policy/modules/services/w3c.te
@@ -24081,7 +24472,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.12/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-04-30 17:44:47.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -26711,8 +27102,8 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_urand(racoon_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.12/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2009-04-06 12:42:08.000000000 -0400
-+++ serefpolicy-3.6.12/policy/modules/system/iptables.fc	2009-04-23 09:44:57.000000000 -0400
-@@ -1,9 +1,12 @@
++++ serefpolicy-3.6.12/policy/modules/system/iptables.fc	2009-04-30 08:29:56.000000000 -0400
+@@ -1,9 +1,11 @@
  /sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
  /sbin/ipchains.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 -/sbin/iptables.* 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
@@ -26727,7 +27118,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/iptables-restore 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 +/usr/sbin/iptables-multi 	--	gen_context(system_u:object_r:iptables_exec_t,s0)
  
- /var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
+-/var/lib/shorewall(/.*)? --	gen_context(system_u:object_r:iptables_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-04-06 12:42:08.000000000 -0400
 +++ serefpolicy-3.6.12/policy/modules/system/iptables.te	2009-04-23 09:44:57.000000000 -0400
@@ -28774,7 +29165,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.12/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-04-30 18:03:37.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -28945,7 +29336,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-04-30 18:03:46.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -28983,16 +29374,17 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(dhcpc_t,dhcpc_state_t,dhcpc_state_t)
  filetrans_pattern(dhcpc_t,dhcp_state_t,dhcpc_state_t,file)
  
-@@ -65,7 +69,7 @@
+@@ -65,7 +69,8 @@
  
  # Allow read/write to /etc/resolv.conf and /etc/ntp.conf. Note that any files
  # in /etc created by dhcpcd will be labelled net_conf_t.
 -allow dhcpc_t net_conf_t:file manage_file_perms;
 +sysnet_manage_config(dhcpc_t)
++allow dhcpc_t net_conf_t:file relabel_file_perms;
  files_etc_filetrans(dhcpc_t,net_conf_t,file)
  
  # create temp files
-@@ -116,7 +120,7 @@
+@@ -116,7 +121,7 @@
  corecmd_exec_shell(dhcpc_t)
  
  domain_use_interactive_fds(dhcpc_t)
@@ -29001,7 +29393,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(dhcpc_t)
  files_read_etc_runtime_files(dhcpc_t)
-@@ -183,25 +187,23 @@
+@@ -183,25 +188,23 @@
  ')
  
  optional_policy(`
@@ -29035,7 +29427,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,6 +214,7 @@
+@@ -212,6 +215,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -29043,7 +29435,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -223,6 +226,10 @@
+@@ -223,6 +227,10 @@
  ')
  
  optional_policy(`
@@ -29054,7 +29446,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_xen_state(dhcpc_t)
  	kernel_write_xen_state(dhcpc_t)
  	xen_append_log(dhcpc_t)
-@@ -236,7 +243,6 @@
+@@ -236,7 +244,6 @@
  
  allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
  allow ifconfig_t self:capability { net_raw net_admin sys_tty_config };
@@ -29062,7 +29454,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ifconfig_t self:fd use;
  allow ifconfig_t self:fifo_file rw_fifo_file_perms;
-@@ -250,6 +256,7 @@
+@@ -250,6 +257,7 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -29070,7 +29462,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Create UDP sockets, necessary when called from dhcpc
  allow ifconfig_t self:udp_socket create_socket_perms;
-@@ -259,13 +266,20 @@
+@@ -259,13 +267,20 @@
  allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
  allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
  allow ifconfig_t self:tcp_socket { create ioctl };
@@ -29091,7 +29483,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_rw_tun_tap_dev(ifconfig_t)
  
-@@ -276,8 +290,13 @@
+@@ -276,8 +291,13 @@
  fs_getattr_xattr_fs(ifconfig_t)
  fs_search_auto_mountpoints(ifconfig_t)
  
@@ -29105,7 +29497,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(ifconfig_t)
  
-@@ -296,6 +315,8 @@
+@@ -296,6 +316,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -29114,7 +29506,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -332,6 +353,14 @@
+@@ -332,6 +354,14 @@
  ')
  
  optional_policy(`
@@ -32215,8 +32607,17 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.12/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-23 09:44:57.000000000 -0400
-@@ -167,11 +167,14 @@
++++ serefpolicy-3.6.12/policy/modules/system/xen.if	2009-04-30 18:08:14.000000000 -0400
+@@ -71,6 +71,8 @@
+ 	')
+ 
+ 	files_list_var_lib($1)
++
++	list_dirs_pattern($1, xend_var_lib_t, xend_var_lib_t)
+ 	read_files_pattern($1,{ xend_var_lib_t xen_image_t },xen_image_t)
+ ')
+ 
+@@ -167,11 +169,14 @@
  #
  interface(`xen_stream_connect',`
  	gen_require(`
@@ -32232,7 +32633,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -191,3 +194,46 @@
+@@ -191,3 +196,46 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
  ')
@@ -32571,7 +32972,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-03-12 11:16:47.000000000 -0400
-+++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-23 09:44:57.000000000 -0400
++++ serefpolicy-3.6.12/policy/support/obj_perm_sets.spt	2009-04-30 18:02:45.000000000 -0400
 @@ -225,7 +225,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -p -r1.848 -r1.849
--- selinux-policy.spec	30 Apr 2009 11:51:04 -0000	1.848
+++ selinux-policy.spec	30 Apr 2009 22:21:53 -0000	1.849
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -480,7 +480,10 @@ exit 0
 %endif
 
 %changelog
-* Wed Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
+* Thu Apr 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-26
+- Add shorewall policy
+
+* Wed Apr 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-25
 - Additional rules for fprintd and sssd
 
 * Tue Apr 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-24



From kkofler at fedoraproject.org  Thu Apr 30 22:25:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 30 Apr 2009 22:25:28 +0000 (UTC)
Subject: rpms/qdevelop/F-11 qdevelop-0.27.4-qt451.patch, NONE,
	1.1 qdevelop.spec, 1.7, 1.8
Message-ID: <20090430222528.DF9FE70133@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qdevelop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8695/F-11

Modified Files:
	qdevelop.spec 
Added Files:
	qdevelop-0.27.4-qt451.patch 
Log Message:
* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)

qdevelop-0.27.4-qt451.patch:

--- NEW FILE qdevelop-0.27.4-qt451.patch ---
diff -up qdevelop-0.27.4/src/mainimpl.cpp.orig qdevelop-0.27.4/src/mainimpl.cpp
--- qdevelop-0.27.4/src/mainimpl.cpp.orig	2009-04-30 23:15:56.000000000 +0200
+++ qdevelop-0.27.4/src/mainimpl.cpp	2009-04-30 23:34:25.000000000 +0200
@@ -431,6 +431,7 @@ void MainImpl::createConnections()
     m_buildingGroup->addAction( actionDebug_mode );
     m_buildingGroup->addAction( actionRelease_mode );
     m_buildingGroup->addAction( action_Forget_last_used_mode );
+    m_buildingGroup->setEnabled( false );
 }
 //
 void MainImpl::slotShortcuts()
@@ -1133,6 +1134,7 @@ bool MainImpl::openProject(QString s)
     setWindowTitle( s );
     setCurrentProject( s );
     m_projectGroup->setEnabled( true );
+    m_buildingGroup->setEnabled( true );
     slotClickTreeFiles( treeFiles->topLevelItem ( 0 ), 0);
     return true;
 }
@@ -1165,6 +1167,7 @@ bool MainImpl::slotCloseProject(bool /*h
     m_projectManager = 0;
     setWindowTitle( "QDevelop" );
     m_projectGroup->setEnabled( false );
+    m_buildingGroup->setEnabled( false );
     delete m_findInFiles;
     m_findInFiles = 0;
     return true;


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/F-11/qdevelop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qdevelop.spec	22 Apr 2009 21:03:19 -0000	1.7
+++ qdevelop.spec	30 Apr 2009 22:24:58 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://qdevelop.org/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# fix failure to compile a project with Qt 4.5.1 (#497734)
+Patch0:         qdevelop-0.27.4-qt451.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +23,7 @@ possibly gdb for program debugging and c
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt451
 # for wrong-script-end-of-line-encoding
 sed -i -e 's/\r//' README.txt
 # hardcoded lib path 
@@ -55,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
+- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
 - Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1



From kkofler at fedoraproject.org  Thu Apr 30 22:25:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 30 Apr 2009 22:25:28 +0000 (UTC)
Subject: rpms/qdevelop/F-10 qdevelop-0.27.4-qt451.patch, NONE,
	1.1 qdevelop.spec, 1.6, 1.7
Message-ID: <20090430222528.BB40E70092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qdevelop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8695/F-10

Modified Files:
	qdevelop.spec 
Added Files:
	qdevelop-0.27.4-qt451.patch 
Log Message:
* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)

qdevelop-0.27.4-qt451.patch:

--- NEW FILE qdevelop-0.27.4-qt451.patch ---
diff -up qdevelop-0.27.4/src/mainimpl.cpp.orig qdevelop-0.27.4/src/mainimpl.cpp
--- qdevelop-0.27.4/src/mainimpl.cpp.orig	2009-04-30 23:15:56.000000000 +0200
+++ qdevelop-0.27.4/src/mainimpl.cpp	2009-04-30 23:34:25.000000000 +0200
@@ -431,6 +431,7 @@ void MainImpl::createConnections()
     m_buildingGroup->addAction( actionDebug_mode );
     m_buildingGroup->addAction( actionRelease_mode );
     m_buildingGroup->addAction( action_Forget_last_used_mode );
+    m_buildingGroup->setEnabled( false );
 }
 //
 void MainImpl::slotShortcuts()
@@ -1133,6 +1134,7 @@ bool MainImpl::openProject(QString s)
     setWindowTitle( s );
     setCurrentProject( s );
     m_projectGroup->setEnabled( true );
+    m_buildingGroup->setEnabled( true );
     slotClickTreeFiles( treeFiles->topLevelItem ( 0 ), 0);
     return true;
 }
@@ -1165,6 +1167,7 @@ bool MainImpl::slotCloseProject(bool /*h
     m_projectManager = 0;
     setWindowTitle( "QDevelop" );
     m_projectGroup->setEnabled( false );
+    m_buildingGroup->setEnabled( false );
     delete m_findInFiles;
     m_findInFiles = 0;
     return true;


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/F-10/qdevelop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qdevelop.spec	22 Apr 2009 21:05:09 -0000	1.6
+++ qdevelop.spec	30 Apr 2009 22:24:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://qdevelop.org/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# fix failure to compile a project with Qt 4.5.1 (#497734)
+Patch0:         qdevelop-0.27.4-qt451.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +23,7 @@ possibly gdb for program debugging and c
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt451
 # for wrong-script-end-of-line-encoding
 sed -i -e 's/\r//' README.txt
 # hardcoded lib path 
@@ -55,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
+- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
 - Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1



From kkofler at fedoraproject.org  Thu Apr 30 22:25:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 30 Apr 2009 22:25:29 +0000 (UTC)
Subject: rpms/qdevelop/devel qdevelop-0.27.4-qt451.patch, NONE,
	1.1 qdevelop.spec, 1.7, 1.8
Message-ID: <20090430222529.E544F70092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8695/devel

Modified Files:
	qdevelop.spec 
Added Files:
	qdevelop-0.27.4-qt451.patch 
Log Message:
* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)

qdevelop-0.27.4-qt451.patch:

--- NEW FILE qdevelop-0.27.4-qt451.patch ---
diff -up qdevelop-0.27.4/src/mainimpl.cpp.orig qdevelop-0.27.4/src/mainimpl.cpp
--- qdevelop-0.27.4/src/mainimpl.cpp.orig	2009-04-30 23:15:56.000000000 +0200
+++ qdevelop-0.27.4/src/mainimpl.cpp	2009-04-30 23:34:25.000000000 +0200
@@ -431,6 +431,7 @@ void MainImpl::createConnections()
     m_buildingGroup->addAction( actionDebug_mode );
     m_buildingGroup->addAction( actionRelease_mode );
     m_buildingGroup->addAction( action_Forget_last_used_mode );
+    m_buildingGroup->setEnabled( false );
 }
 //
 void MainImpl::slotShortcuts()
@@ -1133,6 +1134,7 @@ bool MainImpl::openProject(QString s)
     setWindowTitle( s );
     setCurrentProject( s );
     m_projectGroup->setEnabled( true );
+    m_buildingGroup->setEnabled( true );
     slotClickTreeFiles( treeFiles->topLevelItem ( 0 ), 0);
     return true;
 }
@@ -1165,6 +1167,7 @@ bool MainImpl::slotCloseProject(bool /*h
     m_projectManager = 0;
     setWindowTitle( "QDevelop" );
     m_projectGroup->setEnabled( false );
+    m_buildingGroup->setEnabled( false );
     delete m_findInFiles;
     m_findInFiles = 0;
     return true;


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/devel/qdevelop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qdevelop.spec	22 Apr 2009 20:59:47 -0000	1.7
+++ qdevelop.spec	30 Apr 2009 22:24:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://qdevelop.org/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# fix failure to compile a project with Qt 4.5.1 (#497734)
+Patch0:         qdevelop-0.27.4-qt451.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +23,7 @@ possibly gdb for program debugging and c
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt451
 # for wrong-script-end-of-line-encoding
 sed -i -e 's/\r//' README.txt
 # hardcoded lib path 
@@ -55,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
+- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
 - Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1



From kkofler at fedoraproject.org  Thu Apr 30 22:25:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 30 Apr 2009 22:25:29 +0000 (UTC)
Subject: rpms/qdevelop/F-9 qdevelop-0.27.4-qt451.patch, NONE,
	1.1 qdevelop.spec, 1.6, 1.7
Message-ID: <20090430222529.43BBE70092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qdevelop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8695/F-9

Modified Files:
	qdevelop.spec 
Added Files:
	qdevelop-0.27.4-qt451.patch 
Log Message:
* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)

qdevelop-0.27.4-qt451.patch:

--- NEW FILE qdevelop-0.27.4-qt451.patch ---
diff -up qdevelop-0.27.4/src/mainimpl.cpp.orig qdevelop-0.27.4/src/mainimpl.cpp
--- qdevelop-0.27.4/src/mainimpl.cpp.orig	2009-04-30 23:15:56.000000000 +0200
+++ qdevelop-0.27.4/src/mainimpl.cpp	2009-04-30 23:34:25.000000000 +0200
@@ -431,6 +431,7 @@ void MainImpl::createConnections()
     m_buildingGroup->addAction( actionDebug_mode );
     m_buildingGroup->addAction( actionRelease_mode );
     m_buildingGroup->addAction( action_Forget_last_used_mode );
+    m_buildingGroup->setEnabled( false );
 }
 //
 void MainImpl::slotShortcuts()
@@ -1133,6 +1134,7 @@ bool MainImpl::openProject(QString s)
     setWindowTitle( s );
     setCurrentProject( s );
     m_projectGroup->setEnabled( true );
+    m_buildingGroup->setEnabled( true );
     slotClickTreeFiles( treeFiles->topLevelItem ( 0 ), 0);
     return true;
 }
@@ -1165,6 +1167,7 @@ bool MainImpl::slotCloseProject(bool /*h
     m_projectManager = 0;
     setWindowTitle( "QDevelop" );
     m_projectGroup->setEnabled( false );
+    m_buildingGroup->setEnabled( false );
     delete m_findInFiles;
     m_findInFiles = 0;
     return true;


Index: qdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdevelop/F-9/qdevelop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qdevelop.spec	22 Apr 2009 21:07:57 -0000	1.6
+++ qdevelop.spec	30 Apr 2009 22:24:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           qdevelop
 Version:        0.27.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Development environment dedicated to Qt4
 
 Group:          Development/Tools
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://qdevelop.org/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# fix failure to compile a project with Qt 4.5.1 (#497734)
+Patch0:         qdevelop-0.27.4-qt451.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +23,7 @@ possibly gdb for program debugging and c
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt451
 # for wrong-script-end-of-line-encoding
 sed -i -e 's/\r//' README.txt
 # hardcoded lib path 
@@ -55,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.27.4-3
+- Fix failure to compile a project with Qt 4.5.1 (#497734, patch by Than Ngo)
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-2
 - Rebuild for Qt 4.5
 * Thu Mar  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.27.4-1



From imain at fedoraproject.org  Thu Apr 30 23:23:07 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 30 Apr 2009 23:23:07 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-10 .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <20090430232307.C0C6770092@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21832

Modified Files:
	.cvsignore sources 
Log Message:
New version of libvirt-qpid.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Apr 2009 18:24:40 -0000	1.3
+++ .cvsignore	30 Apr 2009 23:23:05 -0000	1.4
@@ -1 +1 @@
-libvirt-qpid-0.2.13.tar.gz
+libvirt-qpid-0.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Apr 2009 18:24:40 -0000	1.4
+++ sources	30 Apr 2009 23:23:05 -0000	1.5
@@ -1 +1 @@
-fb2a23ec191ac56880ac6d00004c4a3c  libvirt-qpid-0.2.13.tar.gz
+1ddfacd0f8fdadfe1a1c44f7e8cca8b3  libvirt-qpid-0.2.14.tar.gz



From imain at fedoraproject.org  Thu Apr 30 23:24:18 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 30 Apr 2009 23:24:18 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-10 libvirt-qpid.spec,1.3,1.4
Message-ID: <20090430232418.CFD5770092@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22082

Modified Files:
	libvirt-qpid.spec 
Log Message:
New libvirt-qpid spec.



Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-10/libvirt-qpid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-qpid.spec	20 Apr 2009 18:24:40 -0000	1.3
+++ libvirt-qpid.spec	30 Apr 2009 23:23:48 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.13
-Release: 1%{?dist}
+Version: 0.2.14
+Release: 0%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.14-0
+- Added refresh method to storage pools.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
 - Add throws to constructors in case one of the libvirt calls
   fails.  Pretty sure this was the cause of some segfaults.



From imain at fedoraproject.org  Thu Apr 30 23:26:01 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 30 Apr 2009 23:26:01 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-9 .cvsignore, 1.3, 1.4 libvirt-qpid.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090430232601.5618170092@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22490

Modified Files:
	.cvsignore libvirt-qpid.spec sources 
Log Message:
new version of libvirt-qpid.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Apr 2009 18:28:00 -0000	1.3
+++ .cvsignore	30 Apr 2009 23:25:30 -0000	1.4
@@ -1 +1 @@
-libvirt-qpid-0.2.13.tar.gz
+libvirt-qpid-0.2.14.tar.gz


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-9/libvirt-qpid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvirt-qpid.spec	20 Apr 2009 18:28:00 -0000	1.2
+++ libvirt-qpid.spec	30 Apr 2009 23:25:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.13
-Release: 1%{?dist}
+Version: 0.2.14
+Release: 0%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.14-0
+- Added refresh method to storage pools.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
 - Add throws to constructors in case one of the libvirt calls
   fails.  Pretty sure this was the cause of some segfaults.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Apr 2009 18:28:00 -0000	1.3
+++ sources	30 Apr 2009 23:25:30 -0000	1.4
@@ -1 +1 @@
-fb2a23ec191ac56880ac6d00004c4a3c  libvirt-qpid-0.2.13.tar.gz
+1ddfacd0f8fdadfe1a1c44f7e8cca8b3  libvirt-qpid-0.2.14.tar.gz



From imain at fedoraproject.org  Thu Apr 30 23:27:35 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 30 Apr 2009 23:27:35 +0000 (UTC)
Subject: rpms/libvirt-qpid/devel .cvsignore, 1.3, 1.4 libvirt-qpid.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090430232735.0370870092@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22884

Modified Files:
	.cvsignore libvirt-qpid.spec sources 
Log Message:
New libvirt-qpid version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Apr 2009 18:33:31 -0000	1.3
+++ .cvsignore	30 Apr 2009 23:27:04 -0000	1.4
@@ -1 +1 @@
-libvirt-qpid-0.2.13.tar.gz
+libvirt-qpid-0.2.14.tar.gz


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/libvirt-qpid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-qpid.spec	20 Apr 2009 18:33:32 -0000	1.3
+++ libvirt-qpid.spec	30 Apr 2009 23:27:04 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.13
-Release: 1%{?dist}
+Version: 0.2.14
+Release: 0%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.14-0
+- Added refresh method to storage pools.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
 - Add throws to constructors in case one of the libvirt calls
   fails.  Pretty sure this was the cause of some segfaults.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Apr 2009 18:33:32 -0000	1.4
+++ sources	30 Apr 2009 23:27:04 -0000	1.5
@@ -1 +1 @@
-fb2a23ec191ac56880ac6d00004c4a3c  libvirt-qpid-0.2.13.tar.gz
+1ddfacd0f8fdadfe1a1c44f7e8cca8b3  libvirt-qpid-0.2.14.tar.gz



From imain at fedoraproject.org  Thu Apr 30 23:32:23 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 30 Apr 2009 23:32:23 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-11 .cvsignore, 1.2, 1.3 libvirt-qpid.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090430233223.AB6D170092@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23748

Modified Files:
	.cvsignore libvirt-qpid.spec sources 
Log Message:
First F-11 target release with new libvirt-qpid version.

Note that this fixes a critical bug (segfault on bad construction of a node,
pool or volume).




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Mar 2009 18:40:03 -0000	1.2
+++ .cvsignore	30 Apr 2009 23:31:53 -0000	1.3
@@ -1 +1 @@
-libvirt-qpid-0.2.12.tar.gz
+libvirt-qpid-0.2.14.tar.gz


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-11/libvirt-qpid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvirt-qpid.spec	26 Mar 2009 19:03:10 -0000	1.2
+++ libvirt-qpid.spec	30 Apr 2009 23:31:53 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
-Version: 0.2.12
-Release: 3%{?dist}
+Version: 0.2.14
+Release: 0%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -74,6 +74,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 %changelog
 
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.14-0
+- Added refresh method to storage pools.
+
+* Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.13-1
+- Add throws to constructors in case one of the libvirt calls
+  fails.  Pretty sure this was the cause of some segfaults.
+
 * Thu Mar 26 2009 Ian Main <imain at redhat.com> - 0.2.12-3
 - Added dist to release version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Mar 2009 19:03:10 -0000	1.3
+++ sources	30 Apr 2009 23:31:53 -0000	1.4
@@ -1 +1 @@
-0fee3e5066711465ec4b611733c7a90a  libvirt-qpid-0.2.12.tar.gz
+1ddfacd0f8fdadfe1a1c44f7e8cca8b3  libvirt-qpid-0.2.14.tar.gz



From stingray at fedoraproject.org  Thu Apr 30 23:34:02 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Thu, 30 Apr 2009 23:34:02 +0000 (UTC)
Subject: rpms/libnfnetlink/F-10 .cvsignore, 1.6, 1.7 libnfnetlink.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090430233402.4C8B270092@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnfnetlink/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24201

Modified Files:
	.cvsignore libnfnetlink.spec sources 
Log Message:
libnfnetlink-0.0.41-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Jul 2008 20:19:47 -0000	1.6
+++ .cvsignore	30 Apr 2009 23:33:31 -0000	1.7
@@ -1 +1 @@
-libnfnetlink-0.0.39.tar.bz2
+libnfnetlink-0.0.41.tar.bz2


Index: libnfnetlink.spec
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/F-10/libnfnetlink.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libnfnetlink.spec	21 Sep 2008 08:41:11 -0000	1.12
+++ libnfnetlink.spec	30 Apr 2009 23:33:31 -0000	1.13
@@ -2,8 +2,8 @@
 # %define basever 0.0.30
 
 Name:           libnfnetlink
-Version:        0.0.39
-Release:        3%{?dist}
+Version:        0.0.41
+Release:        1%{?dist}
 Summary:        Netfilter netlink userspace library
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -13,7 +13,7 @@ Source1:	http://www.gnu.org/licenses/gpl
 Patch0:		libnfnetlink-sysheader.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	kernel-headers
-BuildRequires:  automake autoconf libtool
+BuildRequires:  automake autoconf libtool pkgconfig
 
 %description
 libnfnetlink is a userspace library that provides some low-level
@@ -69,6 +69,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libnfnetlink/*.h
 
 %changelog
+* Fri Mar  6 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.0.41-1
+- upstream release
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.40-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 19 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.0.40-1
+- upstream release
+
+* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 0.0.39-4
+- rebuild to get provides pkgconfig(libnfnetlink)
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.39-3
 - Fix Patch0:/%%patch mismatch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jul 2008 20:19:48 -0000	1.6
+++ sources	30 Apr 2009 23:33:31 -0000	1.7
@@ -1 +1 @@
-348fed8c1edbe5b873ffc7b192140093  libnfnetlink-0.0.39.tar.bz2
+5d844ea1f557bad0364d5b85cd10c796  libnfnetlink-0.0.41.tar.bz2



From pkgdb at fedoraproject.org  Thu Apr 30 23:37:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 23:37:44 +0000
Subject: [pkgdb] azureus ownership updated
Message-ID: <20090430233745.2868210F893@bastion2.fedora.phx.redhat.com>

Package azureus in Fedora devel was orphaned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/azureus



From pkgdb at fedoraproject.org  Thu Apr 30 23:37:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 23:37:51 +0000
Subject: [pkgdb] azureus ownership updated
Message-ID: <20090430233752.6607710F896@bastion2.fedora.phx.redhat.com>

Package azureus in Fedora 11 was orphaned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/azureus



From pkgdb at fedoraproject.org  Thu Apr 30 23:37:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 23:37:52 +0000
Subject: [pkgdb] azureus ownership updated
Message-ID: <20090430233753.22A1410F899@bastion2.fedora.phx.redhat.com>

Package azureus in Fedora 10 was orphaned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/azureus



From pkgdb at fedoraproject.org  Thu Apr 30 23:37:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 30 Apr 2009 23:37:57 +0000
Subject: [pkgdb] azureus ownership updated
Message-ID: <20090430233757.59E7310F89B@bastion2.fedora.phx.redhat.com>

Package azureus in Fedora 9 was orphaned by konradm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/azureus



From petersen at fedoraproject.org  Thu Apr 30 23:38:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 30 Apr 2009 23:38:01 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.68,1.69
Message-ID: <20090430233801.721EA70092@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24813

Modified Files:
	ibus.spec 
Log Message:
(rpmlint) fix overlong description lines


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- ibus.spec	24 Apr 2009 11:06:06 -0000	1.68
+++ ibus.spec	30 Apr 2009 23:37:30 -0000	1.69
@@ -59,9 +59,9 @@ Obsoletes:  ibus-qt < 1.1.0
 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
 
 %description
-IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
-full featured and user friendly input method user interface. It also may help
-developers to develop input method easily.
+IBus means Intelligent Input Bus. It is a new input framework for Linux OS.
+It provides full featured and user friendly input method user interface.
+It also may help developers to develop input method easily.
 
 %package libs
 Summary:    IBus libraries